diff --git a/.ci/build-freebsd.sh b/.ci/build-freebsd.sh
index 7f35412b58..66a7319380 100755
--- a/.ci/build-freebsd.sh
+++ b/.ci/build-freebsd.sh
@@ -1,26 +1,26 @@
 #!/bin/sh -ex
 
-# Pull all the submodules except some
+# Pull all the submodules except llvm
 # Note: Tried to use git submodule status, but it takes over 20 seconds
 # shellcheck disable=SC2046
-git config --global --add safe.directory .
-git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ && !/opencv/ && !/libpng/ && !/libsdl-org/ && !/curl/ && !/zlib/ && !/libusb/ { print $3 }' .gitmodules)
+git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules)
+
+# Prefer newer Clang than in base system (see also .ci/install-freebsd.sh)
+# libc++ isn't in llvm* packages, so download manually
+fetch https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/libcxx-12.0.0.src.tar.xz
+tar xf libcxx-12.0.0.src.tar.xz
+export CC=clang12 CXX=clang++12
+export CXXFLAGS="$CXXFLAGS -nostdinc++ -D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS -isystem $PWD/libcxx-12.0.0.src/include"
 
 CONFIGURE_ARGS="
-	-DWITH_LLVM=ON
-	-DUSE_SDL=OFF
+	-DWITH_LLVM=OFF
 	-DUSE_PRECOMPILED_HEADERS=OFF
 	-DUSE_NATIVE_INSTRUCTIONS=OFF
 	-DUSE_SYSTEM_FFMPEG=ON
 	-DUSE_SYSTEM_CURL=ON
 	-DUSE_SYSTEM_LIBPNG=ON
- 	-DUSE_SYSTEM_LIBUSB=ON
-	-DUSE_SYSTEM_OPENCV=ON
 "
 
-# base Clang workaround (missing clang-scan-deps)
-CONFIGURE_ARGS="$CONFIGURE_ARGS -DCMAKE_CXX_SCAN_FOR_MODULES=OFF"
-
 # shellcheck disable=SC2086
 cmake -B build -G Ninja $CONFIGURE_ARGS
 cmake --build build
diff --git a/.ci/build-linux-aarch64.sh b/.ci/build-linux-aarch64.sh
deleted file mode 100755
index 1fe640809c..0000000000
--- a/.ci/build-linux-aarch64.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh -ex
-
-cd rpcs3 || exit 1
-
-shellcheck .ci/*.sh
-
-git config --global --add safe.directory '*'
-
-# Pull all the submodules except some
-# shellcheck disable=SC2046
-git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ && !/libsdl-org/ && !/curl/ && !/zlib/ { print $3 }' .gitmodules)
-
-mkdir build && cd build || exit 1
-
-if [ "$COMPILER" = "gcc" ]; then
-    # These are set in the dockerfile
-    export CC="${GCC_BINARY}"
-    export CXX="${GXX_BINARY}"
-    export LINKER=gold
-else
-    export CC="${CLANG_BINARY}"
-    export CXX="${CLANGXX_BINARY}"
-    export LINKER="${LLD_BINARY}"
-fi
-
-export LINKER_FLAG="-fuse-ld=${LINKER}"
-
-cmake ..                                               \
-    -DCMAKE_INSTALL_PREFIX=/usr                        \
-    -DUSE_NATIVE_INSTRUCTIONS=OFF                      \
-    -DUSE_PRECOMPILED_HEADERS=OFF                      \
-    -DCMAKE_EXE_LINKER_FLAGS="${LINKER_FLAG}"          \
-    -DCMAKE_MODULE_LINKER_FLAGS="${LINKER_FLAG}"       \
-    -DCMAKE_SHARED_LINKER_FLAGS="${LINKER_FLAG}"       \
-    -DUSE_SYSTEM_CURL=ON                               \
-    -DUSE_SDL=ON                                       \
-    -DUSE_SYSTEM_SDL=ON                                \
-    -DUSE_SYSTEM_FFMPEG=OFF                            \
-    -DUSE_SYSTEM_OPENCV=ON                             \
-    -DUSE_DISCORD_RPC=ON                               \
-    -DOpenGL_GL_PREFERENCE=LEGACY                      \
-    -DLLVM_DIR=/opt/llvm/lib/cmake/llvm                \
-    -DSTATIC_LINK_LLVM=ON                              \
-    -DBUILD_RPCS3_TESTS="${RUN_UNIT_TESTS}"            \
-    -DRUN_RPCS3_TESTS="${RUN_UNIT_TESTS}"              \
-    -G Ninja
-
-ninja; build_status=$?;
-
-cd ..
-
-# If it compiled succesfully let's deploy.
-if [ "$build_status" -eq 0 ]; then
-    .ci/deploy-linux.sh "aarch64"
-fi
diff --git a/.ci/build-linux.sh b/.ci/build-linux.sh
index 13a9e802f3..3da5ff8184 100755
--- a/.ci/build-linux.sh
+++ b/.ci/build-linux.sh
@@ -1,66 +1,70 @@
 #!/bin/sh -ex
 
-cd rpcs3 || exit 1
+# 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
 
-shellcheck .ci/*.sh
+if [ -z "$CIRRUS_CI" ]; then
+   cd rpcs3 || exit 1
+fi
 
-git config --global --add safe.directory '*'
-
-# Pull all the submodules except some
+# 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/ && !/opencv/ && !/libsdl-org/ && !/curl/ && !/zlib/ { print $3 }' .gitmodules)
+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 CC=${GCC_BINARY}
+    export CXX=${GXX_BINARY}
     export LINKER=gold
     # We need to set the following variables for LTO to link properly
-    export AR=/usr/bin/gcc-ar-"$GCCVER"
-    export RANLIB=/usr/bin/gcc-ranlib-"$GCCVER"
+    export AR=/usr/bin/gcc-ar-$GCCVER
+    export RANLIB=/usr/bin/gcc-ranlib-$GCCVER
     export CFLAGS="-fuse-linker-plugin"
 else
-    export CC="${CLANG_BINARY}"
-    export CXX="${CLANGXX_BINARY}"
+    export CC=${CLANG_BINARY}
+    export CXX=${CLANGXX_BINARY}
     export LINKER=lld
-    export AR=/usr/bin/llvm-ar-"$LLVMVER"
-    export RANLIB=/usr/bin/llvm-ranlib-"$LLVMVER"
+    export AR=/usr/bin/llvm-ar-$LLVMVER
+    export RANLIB=/usr/bin/llvm-ranlib-$LLVMVER
 fi
 
-export LINKER_FLAG="-fuse-ld=${LINKER}"
+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_EXE_LINKER_FLAGS="${LINKER_FLAG}"          \
-    -DCMAKE_MODULE_LINKER_FLAGS="${LINKER_FLAG}"       \
-    -DCMAKE_SHARED_LINKER_FLAGS="${LINKER_FLAG}"       \
     -DCMAKE_AR="$AR"                                   \
     -DCMAKE_RANLIB="$RANLIB"                           \
     -DUSE_SYSTEM_CURL=ON                               \
-    -DUSE_SDL=ON                                       \
-    -DUSE_SYSTEM_SDL=ON                                \
-    -DUSE_SYSTEM_FFMPEG=OFF                            \
-    -DUSE_SYSTEM_OPENCV=ON                             \
-    -DUSE_DISCORD_RPC=ON                               \
     -DOpenGL_GL_PREFERENCE=LEGACY                      \
-    -DLLVM_DIR=/opt/llvm/lib/cmake/llvm                \
-    -DSTATIC_LINK_LLVM=ON                              \
-    -DBUILD_RPCS3_TESTS="${RUN_UNIT_TESTS}"            \
-    -DRUN_RPCS3_TESTS="${RUN_UNIT_TESTS}"              \
     -G Ninja
 
 ninja; build_status=$?;
 
 cd ..
 
+shellcheck .ci/*.sh
+
 # If it compiled succesfully let's deploy.
-if [ "$build_status" -eq 0 ]; then
-    .ci/deploy-linux.sh "x86_64"
+# Azure and Cirrus publish PRs as artifacts only.
+{   [ "$CI_HAS_ARTIFACTS" = "true" ];
+} && SHOULD_DEPLOY="true" || SHOULD_DEPLOY="false"
+
+if [ "$build_status" -eq 0 ] && [ "$SHOULD_DEPLOY" = "true" ]; then
+    .ci/deploy-linux.sh
 fi
diff --git a/.ci/build-mac-arm64.sh b/.ci/build-mac-arm64.sh
deleted file mode 100755
index 3c9c864031..0000000000
--- a/.ci/build-mac-arm64.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh -ex
-
-# shellcheck disable=SC2086
-export HOMEBREW_NO_AUTO_UPDATE=1
-export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
-export HOMEBREW_NO_ENV_HINTS=1
-export HOMEBREW_NO_INSTALL_CLEANUP=1
-
-/opt/homebrew/bin/brew install -f --overwrite --quiet nasm ninja p7zip ccache pipenv gnutls freetype googletest #create-dmg
-/opt/homebrew/bin/brew install -f --quiet ffmpeg@5
-/opt/homebrew/bin/brew install --quiet "llvm@$LLVM_COMPILER_VER" glew cmake sdl3 vulkan-headers coreutils
-/opt/homebrew/bin/brew link -f --quiet "llvm@$LLVM_COMPILER_VER" ffmpeg@5
-
-# moltenvk based on commit for 1.3.0 release
-wget https://raw.githubusercontent.com/Homebrew/homebrew-core/7255441cbcafabaa8950f67c7ec55ff499dbb2d3/Formula/m/molten-vk.rb
-/opt/homebrew/bin/brew install -f --overwrite --formula --quiet ./molten-vk.rb
-export CXX=clang++
-export CC=clang
-
-export BREW_PATH;
-BREW_PATH="$(brew --prefix)"
-export BREW_BIN="/opt/homebrew/bin"
-export BREW_SBIN="/opt/homebrew/sbin"
-export CMAKE_EXTRA_OPTS='-DLLVM_TARGETS_TO_BUILD=arm64'
-
-export WORKDIR;
-WORKDIR="$(pwd)"
-
-# Get Qt
-if [ ! -d "/tmp/Qt/$QT_VER" ]; then
-  mkdir -p "/tmp/Qt"
-  git clone https://github.com/engnr/qt-downloader.git
-  cd qt-downloader
-  git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597
-  # nested Qt 6.9.1 URL workaround
-  # sed -i '' "s/'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/'qt{0}_{0}{1}{2}'.format(major, minor, patch), 'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/g" qt-downloader
-  # sed -i '' "s/'{}\/{}\/qt{}_{}\/'/'{0}\/{1}\/qt{2}_{3}\/qt{2}_{3}\/'/g" qt-downloader
-  # archived Qt 6.7.3 URL workaround
-  sed -i '' "s/official_releases/archive/g" qt-downloader
-  cd "/tmp/Qt"
-  arch -arm64 "$BREW_PATH/bin/pipenv" run pip3 uninstall py7zr requests semantic_version lxml
-  arch -arm64 "$BREW_PATH/bin/pipenv" run pip3 install py7zr requests semantic_version lxml  --no-cache
-  mkdir -p "$QT_VER/macos" ; ln -s "macos" "$QT_VER/clang_64"
-  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.9.1 workaround
-  arch -arm64 "$BREW_PATH/bin/pipenv" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats # -o "$QT_VER/clang_64"
-fi
-
-cd "$WORKDIR"
-ditto "/tmp/Qt/$QT_VER" "qt-downloader/$QT_VER"
-
-export Qt6_DIR="$WORKDIR/qt-downloader/$QT_VER/clang_64/lib/cmake/Qt$QT_VER_MAIN"
-export SDL3_DIR="$BREW_PATH/opt/sdl3/lib/cmake/SDL3"
-
-export PATH="$BREW_PATH/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH"
-export LDFLAGS="-L$BREW_PATH/lib $BREW_PATH/opt/ffmpeg@5/lib/libavcodec.dylib $BREW_PATH/opt/ffmpeg@5/lib/libavformat.dylib $BREW_PATH/opt/ffmpeg@5/lib/libavutil.dylib $BREW_PATH/opt/ffmpeg@5/lib/libswscale.dylib $BREW_PATH/opt/ffmpeg@5/lib/libswresample.dylib $BREW_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++.1.dylib $BREW_PATH/lib/libSDL3.dylib $BREW_PATH/lib/libGLEW.dylib $BREW_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/unwind/libunwind.1.dylib -Wl,-rpath,$BREW_PATH/lib"
-export CPPFLAGS="-I$BREW_PATH/include -I$BREW_PATH/include -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=140000"
-export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000"
-export LIBRARY_PATH="$BREW_PATH/lib"
-export LD_LIBRARY_PATH="$BREW_PATH/lib"
-
-export VULKAN_SDK
-VULKAN_SDK="$BREW_PATH/opt/molten-vk"
-ln -s "$VULKAN_SDK/lib/libMoltenVK.dylib" "$VULKAN_SDK/lib/libvulkan.dylib" || true
-export VK_ICD_FILENAMES="$VULKAN_SDK/share/vulkan/icd.d/MoltenVK_icd.json"
-
-export LLVM_DIR
-LLVM_DIR="$BREW_PATH/opt/llvm@$LLVM_COMPILER_VER"
-# exclude ffmpeg, LLVM, opencv, and sdl from submodule update
-# shellcheck disable=SC2046
-git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ && !/llvm/ && !/opencv/ && !/SDL/ { print $3 }' .gitmodules)
-
-# 3rdparty fixes
-sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c
-
-mkdir build && cd build || exit 1
-
-export MACOSX_DEPLOYMENT_TARGET=14.0
-
-"$BREW_PATH/bin/cmake" .. \
-    -DBUILD_RPCS3_TESTS="${RUN_UNIT_TESTS}" \
-    -DRUN_RPCS3_TESTS="${RUN_UNIT_TESTS}" \
-    -DUSE_SDL=ON \
-    -DUSE_DISCORD_RPC=ON \
-    -DUSE_VULKAN=ON \
-    -DUSE_ALSA=OFF \
-    -DUSE_PULSE=OFF \
-    -DUSE_AUDIOUNIT=ON \
-    -DUSE_SYSTEM_FFMPEG=ON \
-    -DLLVM_CCACHE_BUILD=OFF \
-    -DLLVM_BUILD_RUNTIME=OFF \
-    -DLLVM_BUILD_TOOLS=OFF \
-    -DLLVM_INCLUDE_DOCS=OFF \
-    -DLLVM_INCLUDE_EXAMPLES=OFF \
-    -DLLVM_INCLUDE_TESTS=OFF \
-    -DLLVM_INCLUDE_TOOLS=OFF \
-    -DLLVM_INCLUDE_UTILS=OFF \
-    -DLLVM_USE_PERF=OFF \
-    -DLLVM_ENABLE_Z3_SOLVER=OFF \
-    -DUSE_NATIVE_INSTRUCTIONS=OFF \
-    -DUSE_SYSTEM_MVK=ON \
-    -DUSE_SYSTEM_FAUDIO=OFF \
-    -DUSE_SYSTEM_SDL=ON \
-    -DUSE_SYSTEM_OPENCV=ON \
-    "$CMAKE_EXTRA_OPTS" \
-    -DLLVM_TARGET_ARCH=arm64 \
-    -DCMAKE_OSX_ARCHITECTURES=arm64 \
-    -DCMAKE_IGNORE_PATH="$BREW_PATH/lib" \
-    -DCMAKE_IGNORE_PREFIX_PATH=/opt/homebrew/opt \
-    -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \
-    -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-    -DCMAKE_OSX_SYSROOT="$(xcrun --sdk macosx --show-sdk-path)" \
-    -G Ninja
-
-"$BREW_PATH/bin/ninja"; build_status=$?;
-
-cd ..
-
-# If it compiled succesfully let's deploy.
-if [ "$build_status" -eq 0 ]; then
-    .ci/deploy-mac-arm64.sh
-fi
diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh
index 1e6bae01a1..5c2cf57e19 100755
--- a/.ci/build-mac.sh
+++ b/.ci/build-mac.sh
@@ -1,124 +1,27 @@
 #!/bin/sh -ex
 
-# shellcheck disable=SC2086
-export HOMEBREW_NO_AUTO_UPDATE=1
-export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
-export HOMEBREW_NO_ENV_HINTS=1
-export HOMEBREW_NO_INSTALL_CLEANUP=1
+export CCACHE_SLOPPINESS=pch_defines,time_macros
+export CMAKE_PREFIX_PATH=/usr/local/opt/qt5/
+export PATH="/usr/local/opt/ccache/libexec:$PATH"
 
-#/usr/sbin/softwareupdate --install-rosetta --agree-to-license
-arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-arch -x86_64 /usr/local/bin/brew update
-arch -x86_64 /usr/local/bin/brew install -f --overwrite --quiet python || arch -x86_64 /usr/local/bin/brew link --overwrite python
-arch -x86_64 /usr/local/bin/brew install -f --overwrite --quiet nasm ninja p7zip ccache pipenv gnutls freetype #create-dmg
-arch -x86_64 /usr/local/bin/brew install -f --quiet ffmpeg@5
-arch -x86_64 /usr/local/bin/brew install --quiet "llvm@$LLVM_COMPILER_VER" glew cmake sdl3 vulkan-headers coreutils
-arch -x86_64 /usr/local/bin/brew link -f --quiet "llvm@$LLVM_COMPILER_VER" ffmpeg@5
+# Setup vulkan and gfx-rs/portability
+curl -sLO https://github.com/gfx-rs/portability/releases/download/latest/gfx-portability-macos-latest.zip
+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
+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"
 
-# moltenvk based on commit for 1.3.0 release
-wget https://raw.githubusercontent.com/Homebrew/homebrew-core/7255441cbcafabaa8950f67c7ec55ff499dbb2d3/Formula/m/molten-vk.rb
-arch -x86_64 /usr/local/bin/brew install -f --overwrite --formula --quiet ./molten-vk.rb
-export CXX=clang++
-export CC=clang
-
-export BREW_X64_PATH;
-BREW_X64_PATH="$("/usr/local/bin/brew" --prefix)"
-export BREW_BIN="/usr/local/bin"
-export BREW_SBIN="/usr/local/sbin"
-export CMAKE_EXTRA_OPTS='-DLLVM_TARGETS_TO_BUILD=X86'
-
-export WORKDIR;
-WORKDIR="$(pwd)"
-
-# Get Qt
-if [ ! -d "/tmp/Qt/$QT_VER" ]; then
-  mkdir -p "/tmp/Qt"
-  git clone https://github.com/engnr/qt-downloader.git
-  cd qt-downloader
-  git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597
-  # nested Qt 6.9.1 URL workaround
-  # sed -i '' "s/'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/'qt{0}_{0}{1}{2}'.format(major, minor, patch), 'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/g" qt-downloader
-  # sed -i '' "s/'{}\/{}\/qt{}_{}\/'/'{0}\/{1}\/qt{2}_{3}\/qt{2}_{3}\/'/g" qt-downloader
-  # archived Qt 6.7.3 URL workaround
-  sed -i '' "s/official_releases/archive/g" qt-downloader
-  cd "/tmp/Qt"
-  arch -x86_64 "$BREW_X64_PATH/bin/pipenv" --python "$BREW_X64_PATH/bin/python3" run pip3 install py7zr requests semantic_version lxml
-  mkdir -p "$QT_VER/macos" ; ln -s "macos" "$QT_VER/clang_64"
-  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.9.1 workaround
-  arch -x86_64 "$BREW_X64_PATH/bin/pipenv"  --python "$BREW_X64_PATH/bin/python3" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats # -o "$QT_VER/clang_64"
-fi
-
-cd "$WORKDIR"
-ditto "/tmp/Qt/$QT_VER" "qt-downloader/$QT_VER"
-
-export Qt6_DIR="$WORKDIR/qt-downloader/$QT_VER/clang_64/lib/cmake/Qt$QT_VER_MAIN"
-export SDL3_DIR="$BREW_X64_PATH/opt/sdl3/lib/cmake/SDL3"
-
-export PATH="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH"
-export LDFLAGS="-L$BREW_X64_PATH/lib -Wl,-rpath,$BREW_X64_PATH/lib"
-export CPPFLAGS="-I$BREW_X64_PATH/include -msse -msse2 -mcx16 -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=140000"
-export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000"
-export LIBRARY_PATH="$BREW_X64_PATH/lib"
-export LD_LIBRARY_PATH="$BREW_X64_PATH/lib"
-
-export VULKAN_SDK
-VULKAN_SDK="$BREW_X64_PATH/opt/molten-vk"
-ln -s "$VULKAN_SDK/lib/libMoltenVK.dylib" "$VULKAN_SDK/lib/libvulkan.dylib"
-export VK_ICD_FILENAMES="$VULKAN_SDK/share/vulkan/icd.d/MoltenVK_icd.json"
-
-export LLVM_DIR
-LLVM_DIR="BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER"
-# exclude ffmpeg, LLVM, opencv, and sdl from submodule update
+# Pull all the submodules except llvm
+# Note: Tried to use git submodule status, but it takes over 20 seconds
 # shellcheck disable=SC2046
-git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ && !/llvm/ && !/opencv/ && !/SDL/ { print $3 }' .gitmodules)
-
-# 3rdparty fixes
-sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c
+git submodule -q update --init $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules)
 
 mkdir build && cd build || exit 1
-
-export MACOSX_DEPLOYMENT_TARGET=14.0
-
-"$BREW_X64_PATH/bin/cmake" .. \
-    -DBUILD_RPCS3_TESTS=OFF \
-    -DRUN_RPCS3_TESTS=OFF \
-    -DUSE_SDL=ON \
-    -DUSE_DISCORD_RPC=ON \
-    -DUSE_VULKAN=ON \
-    -DUSE_ALSA=OFF \
-    -DUSE_PULSE=OFF \
-    -DUSE_AUDIOUNIT=ON \
-    -DUSE_SYSTEM_FFMPEG=ON \
-    -DLLVM_CCACHE_BUILD=OFF \
-    -DLLVM_BUILD_RUNTIME=OFF \
-    -DLLVM_BUILD_TOOLS=OFF \
-    -DLLVM_INCLUDE_DOCS=OFF \
-    -DLLVM_INCLUDE_EXAMPLES=OFF \
-    -DLLVM_INCLUDE_TESTS=OFF \
-    -DLLVM_INCLUDE_TOOLS=OFF \
-    -DLLVM_INCLUDE_UTILS=OFF \
-    -DLLVM_USE_PERF=OFF \
-    -DLLVM_ENABLE_Z3_SOLVER=OFF \
-    -DUSE_NATIVE_INSTRUCTIONS=OFF \
-    -DUSE_SYSTEM_MVK=ON \
-    -DUSE_SYSTEM_FAUDIO=OFF \
-    -DUSE_SYSTEM_SDL=ON \
-    -DUSE_SYSTEM_OPENCV=ON \
-    "$CMAKE_EXTRA_OPTS" \
-    -DLLVM_TARGET_ARCH=X86_64 \
-    -DCMAKE_OSX_ARCHITECTURES=x86_64 \
-    -DCMAKE_IGNORE_PATH="$BREW_X64_PATH/lib" \
-    -DCMAKE_IGNORE_PREFIX_PATH=/usr/local/opt \
-    -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \
-    -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-    -DCMAKE_OSX_SYSROOT="$(xcrun --sdk macosx --show-sdk-path)" \
-    -G Ninja
-
-"$BREW_X64_PATH/bin/ninja"; build_status=$?;
-
-cd ..
-
-# If it compiled succesfully let's deploy.
-if [ "$build_status" -eq 0 ]; then
-    .ci/deploy-mac.sh
-fi
+cmake .. -DWITH_LLVM=OFF -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja
+ninja
diff --git a/.ci/build-windows-clang.sh b/.ci/build-windows-clang.sh
deleted file mode 100644
index 0880e7f5ed..0000000000
--- a/.ci/build-windows-clang.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh -ex
-
-git config --global --add safe.directory '*'
-
-# Pull all the submodules except some
-# Note: Tried to use git submodule status, but it takes over 20 seconds
-# shellcheck disable=SC2046
-git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ && !/ffmpeg/ && !/curl/ && !/FAudio/ && !/zlib/ { print $3 }' .gitmodules)
-
-mkdir build && cd build || exit 1
-
-export CC="clang"
-export CXX="clang++"
-export LINKER=lld
-export LINKER_FLAG="-fuse-ld=${LINKER}"
-
-if [ -n "$LLVMVER" ]; then
-  export AR="llvm-ar-$LLVMVER"
-  export RANLIB="llvm-ranlib-$LLVMVER"
-else
-  export AR="llvm-ar"
-  export RANLIB="llvm-ranlib"
-fi
-
-cmake ..                                               \
-    -DCMAKE_PREFIX_PATH=/clang64                       \
-    -DCMAKE_INSTALL_PREFIX=/usr                        \
-    -DUSE_NATIVE_INSTRUCTIONS=OFF                      \
-    -DUSE_PRECOMPILED_HEADERS=OFF                      \
-    -DCMAKE_C_FLAGS="$CFLAGS"                          \
-    -DCMAKE_CXX_FLAGS="$CFLAGS"                        \
-    -DCMAKE_EXE_LINKER_FLAGS="${LINKER_FLAG}"          \
-    -DCMAKE_MODULE_LINKER_FLAGS="${LINKER_FLAG}"       \
-    -DCMAKE_SHARED_LINKER_FLAGS="${LINKER_FLAG}"       \
-    -DCMAKE_AR="$AR"                                   \
-    -DCMAKE_RANLIB="$RANLIB"                           \
-    -DUSE_SYSTEM_CURL=ON                               \
-    -DUSE_FAUDIO=OFF                                   \
-    -DUSE_SDL=ON                                       \
-    -DUSE_SYSTEM_SDL=OFF                               \
-    -DUSE_SYSTEM_FFMPEG=ON                             \
-    -DUSE_SYSTEM_OPENCV=ON                             \
-    -DUSE_SYSTEM_OPENAL=OFF                            \
-    -DUSE_DISCORD_RPC=ON                               \
-    -DOpenGL_GL_PREFERENCE=LEGACY                      \
-    -DWITH_LLVM=ON                                     \
-    -DLLVM_DIR=/clang64/lib/cmake/llvm                 \
-    -DVulkan_LIBRARY=/clang64/lib/libvulkan-1.dll.a    \
-    -DSTATIC_LINK_LLVM=ON                              \
-    -DBUILD_RPCS3_TESTS=OFF                            \
-    -DRUN_RPCS3_TESTS=OFF                              \
-    -G Ninja
-
-ninja; build_status=$?;
-
-cd ..
-
-# If it compiled succesfully let's deploy.
-if [ "$build_status" -eq 0 ]; then
-    .ci/deploy-windows-clang.sh "x86_64"
-fi
diff --git a/.ci/deploy-linux.sh b/.ci/deploy-linux.sh
index f8c3d849c3..286e25b9f6 100755
--- a/.ci/deploy-linux.sh
+++ b/.ci/deploy-linux.sh
@@ -2,51 +2,45 @@
 
 cd build || exit 1
 
-CPU_ARCH="${1:-x86_64}"
-
 if [ "$DEPLOY_APPIMAGE" = "true" ]; then
-    DESTDIR=AppDir ninja install
+    DESTDIR=appdir ninja install
+    QT_APPIMAGE="linuxdeployqt.AppImage"
 
-    curl -fsSLo /usr/bin/linuxdeploy "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-$CPU_ARCH.AppImage"
-    chmod +x /usr/bin/linuxdeploy
-    curl -fsSLo /usr/bin/linuxdeploy-plugin-qt "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-$CPU_ARCH.AppImage"
-    chmod +x /usr/bin/linuxdeploy-plugin-qt
-    curl -fsSLo linuxdeploy-plugin-checkrt.sh https://github.com/darealshinji/linuxdeploy-plugin-checkrt/releases/download/continuous/linuxdeploy-plugin-checkrt.sh
-    chmod +x ./linuxdeploy-plugin-checkrt.sh
+    curl -sL "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" > "$QT_APPIMAGE"
+    chmod a+x "$QT_APPIMAGE"
+    "./$QT_APPIMAGE" --appimage-extract
+    ./squashfs-root/AppRun ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs
+    ls ./appdir/usr/lib/
+    rm -r ./appdir/usr/share/doc
+    cp "$(readlink -f /lib/x86_64-linux-gnu/libnsl.so.1)" ./appdir/usr/lib/libnsl.so.1
+    export PATH=/rpcs3/build/squashfs-root/usr/bin/:${PATH}
 
-    export EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so"
-    export EXTRA_QT_PLUGINS="svg;wayland-decoration-client;wayland-graphics-integration-client;wayland-shell-integration;waylandcompositor"
+    # 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
 
-    APPIMAGE_EXTRACT_AND_RUN=1 linuxdeploy --appdir AppDir --plugin qt --plugin checkrt
+    # Compile checker binary for AppImageKit-checkrt
 
-    # Remove libwayland-client because it has platform-dependent exports and breaks other OSes
-    rm -f ./AppDir/usr/lib/libwayland-client.so*
+    # This may need updating if you update the compiler or rpcs3 uses newer c++ features
+    # See https://github.com/gcc-mirror/gcc/blob/master/libstdc%2B%2B-v3/config/abi/pre/gnu.ver
+    # for which definitions correlate to which CXXABI version.
+    # Currently we target a minimum of GLIBCXX_3.4.29 and CXXABI_1.3.11
+    printf "#include <sstream>\n#include <exception>\n#include <memory_resource>\nint main(){auto x = std::stringbuf();x.get_allocator();std::make_exception_ptr(0);std::pmr::get_default_resource();}" \
+     | $CXX -x c++ -std=c++2a -o ./appdir/usr/optional/checker -
 
-    # Remove libvulkan because it causes issues with gamescope
-    rm -f ./AppDir/usr/lib/libvulkan.so*
+    # Package it up and send it off
+    ./squashfs-root/usr/bin/appimagetool "$APPDIR"
+    
+    ls
 
-    # Remove unused Qt6 libraries
-    rm -f ./AppDir/usr/lib/libQt6VirtualKeyboard.so*
-    rm -f ./AppDir/usr/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so*
-
-    # Remove git directory containing local commit history file
-    rm -rf ./AppDir/usr/share/rpcs3/git
-
-    curl -fsSLo /uruntime "https://github.com/VHSgunzo/uruntime/releases/download/v0.3.4/uruntime-appimage-dwarfs-$CPU_ARCH"
-    chmod +x /uruntime
-    /uruntime --appimage-mkdwarfs -f --set-owner 0 --set-group 0 --no-history --no-create-timestamp \
-    --compression zstd:level=22 -S26 -B32 --header /uruntime -i AppDir -o RPCS3.AppImage
-
-    APPIMAGE_SUFFIX="linux_${CPU_ARCH}"
-    if [ "$CPU_ARCH" = "x86_64" ]; then
-        # Preserve back compat. Previous versions never included the full arch.
-        APPIMAGE_SUFFIX="linux64"
-    fi
-
-    COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ../rpcs3/rpcs3_version.cpp)
+    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}_${APPIMAGE_SUFFIX}.AppImage"
+    RPCS3_APPIMAGE="rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_linux64.AppImage"
 
     mv ./RPCS3*.AppImage "$RPCS3_APPIMAGE"
 
@@ -58,4 +52,9 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then
     FILESIZE=$(stat -c %s ./rpcs3*.AppImage)
     SHA256SUM=$(sha256sum ./rpcs3*.AppImage | awk '{ print $1 }')
     echo "${SHA256SUM};${FILESIZE}B" > "$RELEASE_MESSAGE"
+    
+fi
+
+if [ "$DEPLOY_PPA" = "true" ]; then
+    export DEBFULLNAME="RPCS3 Build Bot"
 fi
diff --git a/.ci/deploy-llvm.sh b/.ci/deploy-llvm.sh
deleted file mode 100644
index 35e5d780af..0000000000
--- a/.ci/deploy-llvm.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -ex
-
-# First let's print some info about our caches
-"$(cygpath -u "$CCACHE_BIN_DIR")"/ccache.exe --show-stats -v
-
-# BUILD_blablabla is Azure specific, so we wrap it for portability
-ARTIFACT_DIR="$BUILD_ARTIFACTSTAGINGDIRECTORY"
-BUILD="llvmlibs_mt.7z"
-
-# Package artifacts
-7z a -m0=LZMA2 -mx9 "$BUILD" ./build/lib/Release-x64/llvm_build
-
-# 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
-cp -- "$BUILD" "$ARTIFACT_DIR"
-cp -- "$BUILD.sha256" "$ARTIFACT_DIR"
diff --git a/.ci/deploy-mac-arm64.sh b/.ci/deploy-mac-arm64.sh
deleted file mode 100755
index e7de472378..0000000000
--- a/.ci/deploy-mac-arm64.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh -ex
-
-# shellcheck disable=SC2086
-cd build || exit 1
-
-# 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)
-
-AVVER="${COMM_TAG}-${COMM_COUNT}"
-
-# AVVER is used for GitHub releases, it is the version number.
-echo "AVVER=$AVVER" >> ../.ci/ci-vars.env
-
-cd bin
-mkdir "rpcs3.app/Contents/lib/" || true
-
-cp "$(realpath /opt/homebrew/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++abi.1.0.dylib)" "rpcs3.app/Contents/Frameworks/libc++abi.1.dylib"
-cp "$(realpath /opt/homebrew/lib/libsharpyuv.0.dylib)" "rpcs3.app/Contents/lib/libsharpyuv.0.dylib"
-cp "$(realpath /opt/homebrew/lib/libintl.8.dylib)" "rpcs3.app/Contents/lib/libintl.8.dylib"
-
-rm -rf "rpcs3.app/Contents/Frameworks/QtPdf.framework" \
-"rpcs3.app/Contents/Frameworks/QtQml.framework" \
-"rpcs3.app/Contents/Frameworks/QtQmlModels.framework" \
-"rpcs3.app/Contents/Frameworks/QtQuick.framework" \
-"rpcs3.app/Contents/Frameworks/QtVirtualKeyboard.framework" \
-"rpcs3.app/Contents/Plugins/platforminputcontexts" \
-"rpcs3.app/Contents/Plugins/virtualkeyboard" \
-"rpcs3.app/Contents/Resources/git"
-
-../../.ci/optimize-mac.sh rpcs3.app
-
-# Hack
-install_name_tool \
--delete_rpath /opt/homebrew/lib \
--delete_rpath /opt/homebrew/opt/llvm@$LLVM_COMPILER_VER/lib RPCS3.app/Contents/MacOS/rpcs3
-#-delete_rpath /opt/homebrew1/Cellar/sdl3/3.2.8/lib
-
-# Need to do this rename hack due to case insensitive filesystem
-mv rpcs3.app RPCS3_.app
-mv RPCS3_.app RPCS3.app
-
-# NOTE: "--deep" is deprecated
-codesign --deep -fs - RPCS3.app
-
-echo "[InternetShortcut]" > Quickstart.url
-echo "URL=https://rpcs3.net/quickstart" >> Quickstart.url
-echo "IconIndex=0" >> Quickstart.url
-
-#DMG_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos_arm64.dmg"
-#"$BREW_X64_PATH/bin/create-dmg" --volname RPCS3 \
-#--window-size 800 400 \
-#--icon-size 100 \
-#--icon rpcs3.app 200 190 \
-#--add-file Quickstart.url Quickstart.url 400 20 \
-#--hide-extension rpcs3.app \
-#--hide-extension Quickstart.url \
-#--app-drop-link 600 185 \
-#--skip-jenkins \
-#--format ULMO \
-#"$DMG_FILEPATH" \
-#RPCS3.app
-#FILESIZE=$(stat -f %z "$DMG_FILEPATH")
-#SHA256SUM=$(shasum -a 256 "$DMG_FILEPATH" | awk '{ print $1 }')
-
-ARCHIVE_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos_arm64.7z"
-"$BREW_PATH/bin/7z" a -mx9 "$ARCHIVE_FILEPATH" RPCS3.app Quickstart.url
-FILESIZE=$(stat -f %z "$ARCHIVE_FILEPATH")
-SHA256SUM=$(shasum -a 256 "$ARCHIVE_FILEPATH" | awk '{ print $1 }')
-
-cd ..
-echo "${SHA256SUM};${FILESIZE}B" > "$RELEASE_MESSAGE"
-cd bin
diff --git a/.ci/deploy-mac.sh b/.ci/deploy-mac.sh
deleted file mode 100755
index c293358748..0000000000
--- a/.ci/deploy-mac.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh -ex
-
-# shellcheck disable=SC2086
-cd build || exit 1
-
-# 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)
-
-AVVER="${COMM_TAG}-${COMM_COUNT}"
-
-# AVVER is used for GitHub releases, it is the version number.
-echo "AVVER=$AVVER" >> ../.ci/ci-vars.env
-
-cd bin
-mkdir "rpcs3.app/Contents/lib/"
-
-cp "/usr/local/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++abi.1.0.dylib" "rpcs3.app/Contents/lib/libc++abi.1.dylib"
-cp "$(realpath /usr/local/lib/libsharpyuv.0.dylib)" "rpcs3.app/Contents/lib/libsharpyuv.0.dylib"
-cp "$(realpath /usr/local/lib/libintl.8.dylib)" "rpcs3.app/Contents/lib/libintl.8.dylib"
-
-rm -rf "rpcs3.app/Contents/Frameworks/QtPdf.framework" \
-"rpcs3.app/Contents/Frameworks/QtQml.framework" \
-"rpcs3.app/Contents/Frameworks/QtQmlModels.framework" \
-"rpcs3.app/Contents/Frameworks/QtQuick.framework" \
-"rpcs3.app/Contents/Frameworks/QtVirtualKeyboard.framework" \
-"rpcs3.app/Contents/Plugins/platforminputcontexts" \
-"rpcs3.app/Contents/Plugins/virtualkeyboard" \
-"rpcs3.app/Contents/Resources/git"
-
-../../.ci/optimize-mac.sh rpcs3.app
-
-# Need to do this rename hack due to case insensitive filesystem
-mv rpcs3.app RPCS3_.app
-mv RPCS3_.app RPCS3.app
-
-# Hack
-install_name_tool \
--delete_rpath /usr/local/lib \
--delete_rpath /usr/local/opt/llvm@$LLVM_COMPILER_VER/lib RPCS3.app/Contents/MacOS/rpcs3
-#-delete_rpath /usr/local/Cellar/sdl3/3.2.8/lib
-
-# NOTE: "--deep" is deprecated
-codesign --deep -fs - RPCS3.app
-
-echo "[InternetShortcut]" > Quickstart.url
-echo "URL=https://rpcs3.net/quickstart" >> Quickstart.url
-echo "IconIndex=0" >> Quickstart.url
-
-#DMG_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos.dmg"
-#"$BREW_X64_PATH/bin/create-dmg" --volname RPCS3 \
-#--window-size 800 400 \
-#--icon-size 100 \
-#--icon rpcs3.app 200 190 \
-#--add-file Quickstart.url Quickstart.url 400 20 \
-#--hide-extension rpcs3.app \
-#--hide-extension Quickstart.url \
-#--app-drop-link 600 185 \
-#--skip-jenkins \
-#--format ULMO \
-#"$DMG_FILEPATH" \
-#RPCS3.app
-#FILESIZE=$(stat -f %z "$DMG_FILEPATH")
-#SHA256SUM=$(shasum -a 256 "$DMG_FILEPATH" | awk '{ print $1 }')
-
-ARCHIVE_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos.7z"
-"$BREW_X64_PATH/bin/7z" a -mx9 "$ARCHIVE_FILEPATH" RPCS3.app Quickstart.url
-FILESIZE=$(stat -f %z "$ARCHIVE_FILEPATH")
-SHA256SUM=$(shasum -a 256 "$ARCHIVE_FILEPATH" | awk '{ print $1 }')
-
-cd ..
-echo "${SHA256SUM};${FILESIZE}B" > "$RELEASE_MESSAGE"
-cd bin
diff --git a/.ci/deploy-windows-clang.sh b/.ci/deploy-windows-clang.sh
deleted file mode 100644
index d45cb45acf..0000000000
--- a/.ci/deploy-windows-clang.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh -ex
-
-# source ci-vars.env
-# shellcheck disable=SC1091
-. .ci/ci-vars.env
-
-cd build || exit 1
-
-CPU_ARCH="${1:-x86_64}"
-
-echo "Deploying rpcs3 windows clang $CPU_ARCH"
-
-# BUILD_blablabla is CI specific, so we wrap it for portability
-ARTIFACT_DIR=$(cygpath -u "$BUILD_ARTIFACTSTAGINGDIRECTORY")
-MSYS2_CLANG_BIN=$(cygpath -w /clang64/bin)
-MSYS2_USR_BIN=$(cygpath -w /usr/bin)
-
-echo "Installing dependencies of: ./bin/rpcs3.exe (MSYS2 dir is '$MSYS2_CLANG_BIN', usr dir is '$MSYS2_USR_BIN')"
-cmake -DMSYS2_CLANG_BIN="$MSYS2_CLANG_BIN" -DMSYS2_USR_BIN="$MSYS2_USR_BIN" -Dexe=./bin/rpcs3.exe -P ../buildfiles/cmake/CopyRuntimeDependencies.cmake
-
-# Prepare compatibility and SDL database for packaging
-mkdir ./bin/config
-mkdir ./bin/config/input_configs
-curl -fsSL 'https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt' 1> ./bin/config/input_configs/gamecontrollerdb.txt
-curl -fsSL 'https://rpcs3.net/compatibility?api=v1&export' | iconv -t UTF-8 1> ./bin/GuiConfigs/compat_database.dat
-
-# 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
-mkdir -p "$ARTIFACT_DIR"
-cp -- "$BUILD" "$ARTIFACT_DIR"
-cp -- "$BUILD.sha256" "$ARTIFACT_DIR"
diff --git a/.ci/deploy-windows.sh b/.ci/deploy-windows.sh
index b885831511..f269fe45d4 100755
--- a/.ci/deploy-windows.sh
+++ b/.ci/deploy-windows.sh
@@ -1,22 +1,15 @@
 #!/bin/sh -ex
 
-# First let's print some info about our caches
-"$(cygpath -u "$CCACHE_BIN_DIR")"/ccache.exe --show-stats -v
-
-# BUILD_blablabla is CI specific, so we wrap it for portability
+# 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 ./bin/vc_redist.x64.exe
 
-# Prepare compatibility and SDL database for packaging
-mkdir ./bin/config
-mkdir ./bin/config/input_configs
-curl -fsSL 'https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt' 1> ./bin/config/input_configs/gamecontrollerdb.txt
-curl -fsSL 'https://rpcs3.net/compatibility?api=v1&export' | iconv -t UTF-8 1> ./bin/GuiConfigs/compat_database.dat
-
-# Download SSL certificate (not needed with CURLSSLOPT_NATIVE_CA)
-#curl -fsSL 'https://curl.haxx.se/ca/cacert.pem' 1> ./bin/cacert.pem
+# 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/*
diff --git a/.ci/docker.env b/.ci/docker.env
index eb70b68c18..2b36fb34c0 100644
--- a/.ci/docker.env
+++ b/.ci/docker.env
@@ -1,4 +1,5 @@
-# Variables set by CI
+# Variables set by Azure Pipelines
+CI_HAS_ARTIFACTS
 BUILD_REASON
 BUILD_SOURCEVERSION
 BUILD_ARTIFACTSTAGINGDIRECTORY
@@ -7,7 +8,6 @@ BUILD_SOURCEBRANCHNAME
 APPDIR
 ARTDIR
 RELEASE_MESSAGE
-RUN_UNIT_TESTS
 # Variables for build matrix
 COMPILER
 DEPLOY_APPIMAGE
diff --git a/.ci/export-azure-vars.sh b/.ci/export-azure-vars.sh
new file mode 100755
index 0000000000..7ab0515200
--- /dev/null
+++ b/.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"
diff --git a/.ci/export-cirrus-vars.sh b/.ci/export-cirrus-vars.sh
new file mode 100644
index 0000000000..9269ea89aa
--- /dev/null
+++ b/.ci/export-cirrus-vars.sh
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+# Export variables for later stages of the Cirrus 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
+    export "$key"="$val"
+done < ".ci/azure-vars.env"
diff --git a/.ci/generate-qt-ts.sh b/.ci/generate-qt-ts.sh
deleted file mode 100755
index a9fc139a93..0000000000
--- a/.ci/generate-qt-ts.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -ex
-
-mkdir -p ../translations
-
-LUPDATE_PATH=$(find /usr -name lupdate -type f 2>/dev/null | head -n 1)
-if [ -z "$LUPDATE_PATH" ]; then
-  echo "Error: lupdate not found!"
-  exit 1
-else
-  echo "lupdate found at: $LUPDATE_PATH"
-  $LUPDATE_PATH -recursive . -ts ../translations/rpcs3_template.ts
-  sed -i 's|filename="\.\./|filename="./|g' ../translations/rpcs3_template.ts
-fi
\ No newline at end of file
diff --git a/.ci/get_keys-windows.sh b/.ci/get_keys-windows.sh
old mode 100755
new mode 100644
index 8384b4de5d..1f6efc379c
--- a/.ci/get_keys-windows.sh
+++ b/.ci/get_keys-windows.sh
@@ -1,3 +1,4 @@
 #!/bin/sh -ex
 
-curl -fLo "./llvm.lock" "https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-${LLVM_VER}/llvmlibs_mt.7z.sha256"
+curl -L -o "./llvm.lock" "https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win/llvmlibs_mt.7z.sha256"
+curl -L -o "./glslang.lock" "https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z.sha256"
diff --git a/.ci/github-upload.sh b/.ci/github-upload.sh
index 8cc89314d5..53d3d09895 100755
--- a/.ci/github-upload.sh
+++ b/.ci/github-upload.sh
@@ -16,7 +16,7 @@ generate_post_data()
 EOF
 }
 
-curl -fsS \
+curl -s \
     -H "Authorization: token ${RPCS3_TOKEN}" \
     -H "Accept: application/vnd.github.v3+json" \
     --data "$(generate_post_data)" "https://api.github.com/repos/$UPLOAD_REPO_FULL_NAME/releases" >> release.json
@@ -28,7 +28,7 @@ echo "${id:?}"
 
 upload_file()
 {
-    curl -fsS \
+    curl -s \
         -H "Authorization: token ${RPCS3_TOKEN}" \
         -H "Accept: application/vnd.github.v3+json" \
         -H "Content-Type: application/octet-stream" \
diff --git a/.ci/install-freebsd.sh b/.ci/install-freebsd.sh
index 04efc6c0e9..55ed346a97 100755
--- a/.ci/install-freebsd.sh
+++ b/.ci/install-freebsd.sh
@@ -2,17 +2,17 @@
 # NOTE: this script is run under root permissions
 # shellcheck shell=sh disable=SC2096
 
-# RPCS3 often needs recent Qt and Vulkan-Headers
+# RPCS3 often needs recent Qt5 and Vulkan-Headers
 sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
 
 export ASSUME_ALWAYS_YES=true
 pkg info # debug
 
-# WITH_LLVM
-pkg install "llvm$LLVM_COMPILER_VER"
+# Prefer newer Clang than in base system (see also .ci/build-freebsd.sh)
+pkg install llvm12
 
-# Mandatory dependencies (qtX-base is pulled via qtX-multimedia)
-pkg install git ccache cmake ninja "qt$QT_VER_MAIN-multimedia" "qt$QT_VER_MAIN-svg" glew openal-soft ffmpeg
+# Mandatory dependencies (qt5-dbus and qt5-gui are pulled via qt5-widgets)
+pkg install git ccache cmake ninja qt5-qmake qt5-buildtools qt5-widgets qt5-concurrent glew openal-soft ffmpeg
 
-# Optional dependencies (libevdev is pulled by qtX-base)
-pkg install pkgconf alsa-lib pulseaudio sdl3 evdev-proto vulkan-headers vulkan-loader opencv
+# Optional dependencies (libevdev is pulled by qt5-gui)
+pkg install pkgconf alsa-lib pulseaudio sdl2 evdev-proto vulkan-headers vulkan-loader
diff --git a/.ci/optimize-mac.sh b/.ci/optimize-mac.sh
deleted file mode 100755
index 5fea7877f4..0000000000
--- a/.ci/optimize-mac.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-file_path=$(find "$1/Contents/MacOS" -type f -print0 | head -n 1)
-
-if [ -z "$file_path" ]; then
-    echo "No executable file found in $1/Contents/MacOS" >&2
-    exit 1
-fi
-
-
-target_architecture="$(lipo "$file_path" -archs)"
-
-if [ -z "$target_architecture" ]; then
-    exit 1
-fi
-
-# shellcheck disable=SC3045
-find "$1" -type f -print0 | while IFS= read -r -d '' file; do
-    echo Thinning "$file" -> "$target_architecture"
-    lipo "$file" -thin "$target_architecture" -output "$file" || true
-done
diff --git a/.ci/setup-llvm.sh b/.ci/setup-llvm.sh
deleted file mode 100644
index a54901309e..0000000000
--- a/.ci/setup-llvm.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh -ex
-
-# Resource/dependency URLs
-CCACHE_URL="https://github.com/ccache/ccache/releases/download/v4.11.2/ccache-4.11.2-windows-x86_64.zip"
-
-DEP_URLS="         \
-    $CCACHE_URL"
-
-# CI doesn't make a cache dir if it doesn't exist, so we do it manually
-[ -d "$DEPS_CACHE_DIR" ] || mkdir "$DEPS_CACHE_DIR"
-
-# Pull the llvm submodule
-# shellcheck disable=SC2046
-git submodule -q update --init --depth=1 -- 3rdparty/llvm
-
-# 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 "$DEPS_CACHE_DIR/$fileName" ] || curl -fLo "$DEPS_CACHE_DIR/$fileName" "$url"
-        fileChecksum=$("${algo}sum" "$DEPS_CACHE_DIR/$fileName" | awk '{ print $1 }')
-        [ "$fileChecksum" = "$correctChecksum" ] && return 0
-    done
-
-    return 1;
-}
-
-# Some dependencies install here
-[ -d "./build/lib_ext/Release-x64" ] || mkdir -p "./build/lib_ext/Release-x64"
-
-for url in $DEP_URLS; do
-    # Get the filename from the URL and remove query strings (?arg=something).
-    fileName="$(rev "$(rev "$url" | cut -d'/' -f1)" | cut -d'?' -f1)"
-    [ -z "$fileName" ] && echo "Unable to parse url: $url" && exit 1
-
-    # shellcheck disable=SC1003
-    case "$url" in
-    *ccache*) checksum=$CCACHE_SHA; algo="sha256"; outDir="$CCACHE_BIN_DIR" ;;
-    *) echo "Unknown url resource: $url"; exit 1 ;;
-    esac
-
-    download_and_verify "$url" "$checksum" "$algo" "$fileName"
-    7z x -y "$DEPS_CACHE_DIR/$fileName" -aos -o"$outDir"
-done
-
-# Setup ccache tool
-[ -d "$CCACHE_DIR" ] || mkdir -p "$(cygpath -u "$CCACHE_DIR")"
-CCACHE_SH_DIR=$(cygpath -u "$CCACHE_BIN_DIR")
-mv "$CCACHE_SH_DIR"/ccache-*/* "$CCACHE_SH_DIR"
-cp "$CCACHE_SH_DIR"/ccache.exe "$CCACHE_SH_DIR"/cl.exe
diff --git a/.ci/setup-windows-ci-vars.sh b/.ci/setup-windows-ci-vars.sh
deleted file mode 100644
index 11373e0716..0000000000
--- a/.ci/setup-windows-ci-vars.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh -ex
-
-CPU_ARCH="${1:-win64}"
-COMPILER="${2:-msvc}"
-
-# These are CI specific, so we wrap them for portability
-REPO_NAME="$BUILD_REPOSITORY_NAME"
-REPO_BRANCH="$BUILD_SOURCEBRANCHNAME"
-PR_NUMBER="$BUILD_PR_NUMBER"
-
-# 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_RAW="rpcs3-v${AVVER}_${CPU_ARCH}_${COMPILER}"
-    BUILD="${BUILD_RAW}.7z"
-else
-    AVVER="${COMM_TAG}-${COMM_COUNT}"
-    BUILD_RAW="rpcs3-v${AVVER}-${COMM_HASH}_${CPU_ARCH}_${COMPILER}"
-    BUILD="${BUILD_RAW}.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
-# BUILD_RAW is just filename
-# AVVER is used for GitHub releases, it is the version number.
-BRANCH="${REPO_NAME}/${REPO_BRANCH}"
-
-# SC2129
-{
-    echo "BRANCH=$BRANCH"
-    echo "BUILD=$BUILD"
-    echo "BUILD_RAW=$BUILD_RAW"
-    echo "AVVER=$AVVER"
-} >> .ci/ci-vars.env
diff --git a/.ci/setup-windows.sh b/.ci/setup-windows.sh
index 11a68367b8..bd4db40159 100755
--- a/.ci/setup-windows.sh
+++ b/.ci/setup-windows.sh
@@ -1,40 +1,42 @@
 #!/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_HOST="http://mirrors.ocf.berkeley.edu/qt/"
+#QT_HOST="http://qt.mirror.constant.com/"
 QT_URL_VER=$(echo "$QT_VER" | sed "s/\.//g")
 QT_VER_MSVC_UP=$(echo "${QT_VER_MSVC}" | tr '[:lower:]' '[:upper:]')
-QT_PREFIX="online/qtsdkrepository/windows_x86/desktop/qt${QT_VER_MAIN}_${QT_URL_VER}/qt${QT_VER_MAIN}_${QT_URL_VER}/qt.qt${QT_VER_MAIN}.${QT_URL_VER}."
-QT_PREFIX_2="win64_${QT_VER_MSVC}_64/${QT_VER}-0-${QT_DATE}"
-QT_SUFFIX="-Windows-Windows_11_23H2-${QT_VER_MSVC_UP}-Windows-Windows_11_23H2-X86_64.7z"
-QT_BASE_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtbase${QT_SUFFIX}"
-QT_DECL_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtdeclarative${QT_SUFFIX}"
-QT_TOOL_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qttools${QT_SUFFIX}"
-QT_MM_URL="${QT_HOST}${QT_PREFIX}addons.qtmultimedia.${QT_PREFIX_2}qtmultimedia${QT_SUFFIX}"
-QT_SVG_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtsvg${QT_SUFFIX}"
-LLVMLIBS_URL="https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-${LLVM_VER}/llvmlibs_mt.7z"
-VULKAN_SDK_URL="https://www.dropbox.com/scl/fi/sjjh0fc4ld281pjbl2xzu/VulkanSDK-${VULKAN_VER}-Installer.exe?rlkey=f6wzc0lvms5vwkt2z3qabfv9d&dl=1"
-CCACHE_URL="https://github.com/ccache/ccache/releases/download/v4.11.2/ccache-4.11.2-windows-x86_64.zip"
+QT_PREFIX="online/qtsdkrepository/windows_x86/desktop/qt${QT_VER_MAIN}_${QT_URL_VER}/qt.qt${QT_VER_MAIN}.${QT_URL_VER}.win64_${QT_VER_MSVC}_64/${QT_VER}-0-${QT_DATE}"
+QT_SUFFIX="-Windows-Windows_10-${QT_VER_MSVC_UP}-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://www.dropbox.com/s/fjlh97hrz0crqxv/VulkanSDK-1.2.182.0-Installer.exe"
 
 DEP_URLS="         \
     $QT_BASE_URL   \
+    $QT_WINE_URL   \
     $QT_DECL_URL   \
     $QT_TOOL_URL   \
-    $QT_MM_URL     \
-    $QT_SVG_URL    \
     $LLVMLIBS_URL  \
-    $VULKAN_SDK_URL\
-    $CCACHE_URL"
+    $GLSLANG_URL   \
+    $VULKAN_SDK_URL"
 
-# CI doesn't make a cache dir if it doesn't exist, so we do it manually
-[ -d "$DEPS_CACHE_DIR" ] || mkdir "$DEPS_CACHE_DIR"
+# 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 --depth=1 --jobs=8 $(awk '/path/ && !/FAudio/ && !/llvm/ { print $3 }' .gitmodules)
+git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules)
 
 # Git bash doesn't have rev, so here it is
 rev()
@@ -53,44 +55,61 @@ download_and_verify()
     fileName="$4"
 
     for _ in 1 2 3; do
-        [ -e "$DEPS_CACHE_DIR/$fileName" ] || curl -fLo "$DEPS_CACHE_DIR/$fileName" "$url"
-        fileChecksum=$("${algo}sum" "$DEPS_CACHE_DIR/$fileName" | awk '{ print $1 }')
+        [ -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 "./build/lib_ext/Release-x64" ] || mkdir -p "./build/lib_ext/Release-x64"
+[ -d "./lib" ] || mkdir "./lib"
 
 for url in $DEP_URLS; do
-    # Get the filename from the URL and remove query strings (?arg=something).
-    fileName="$(rev "$(rev "$url" | cut -d'/' -f1)" | cut -d'?' -f1)"
+    # 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 -fL "${url}.sha1"); algo="sha1"; outDir="$QTDIR/" ;;
-    *llvm*) checksum=$(curl -fL "${url}.sha256"); algo="sha256"; outDir="./build/lib_ext/Release-x64" ;;
-    *ccache*) checksum=$CCACHE_SHA; algo="sha256"; outDir="$CCACHE_BIN_DIR" ;;
+    *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-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 "$DEPS_CACHE_DIR/$fileName" .
-        _=$(echo "$fileName --accept-licenses --default-answer --confirm-command install" | cmd)
+        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 "$DEPS_CACHE_DIR/$fileName" -aos -o"$outDir"
+    7z x -y "$CACHE_DIR/$fileName" -aos -o"$outDir"
 done
 
-# Setup ccache tool
-[ -d "$CCACHE_DIR" ] || mkdir -p "$(cygpath -u "$CCACHE_DIR")"
-CCACHE_SH_DIR=$(cygpath -u "$CCACHE_BIN_DIR")
-mv "$CCACHE_SH_DIR"/ccache-*/* "$CCACHE_SH_DIR"
-cp "$CCACHE_SH_DIR"/ccache.exe "$CCACHE_SH_DIR"/cl.exe
+# 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
diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index 0000000000..efdf6364e7
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1,113 @@
+env:
+  CIRRUS_CLONE_DEPTH: 0 # Unshallow clone to obtain proper GIT_VERSION
+  BUILD_REPOSITORY_NAME: $CIRRUS_REPO_FULL_NAME
+  SYSTEM_PULLREQUEST_SOURCEBRANCH: $CIRRUS_BRANCH
+  SYSTEM_PULLREQUEST_PULLREQUESTID: $CIRRUS_PR
+  BUILD_SOURCEVERSION: $CIRRUS_CHANGE_IN_REPO
+#  RPCS3_TOKEN: ENCRYPTED[13a0f18de9285e6c880e3aecbb54258245a74872af7d0fcb92447fa1200ceb6a4dc8acc880ddbf5e653d46336563ca72] # Replace this when we're using Cirrus for master releases!!
+
+windows_task:
+  matrix:
+    - name: Cirrus Windows
+      windows_container:
+        image: cirrusci/windowsservercore:visualstudio2019
+        cpu: 8
+        memory: 16G
+  env:
+    CIRRUS_SHELL: "bash"
+    COMPILER: msvc
+    QT_VER_MAIN: '5'
+    BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\
+    QT_VER: '5.15.2'
+    QT_VER_MSVC: 'msvc2019'
+    QT_DATE: '202011130602'
+    QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64
+    VULKAN_VER: '1.2.182.0'
+    VULKAN_SDK_SHA: '7089d48011f06c4a02a593913c6a9385d1652ab7765c25d2666d5d6ef4e24af8'
+    VULKAN_SDK: C:\VulkanSDK\${VULKAN_VER}
+    CACHE_DIR: "./cache"
+    UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
+    UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-win"
+  deps_cache:
+    folder: "./cache"
+  #obj_cache:
+  #  folder: "./tmp"
+  #obj2_cache:
+  #  folder: "./rpcs3/x64"
+  setup_script:
+    - './.ci/get_keys-windows.sh'
+    - './.ci/setup-windows.sh'
+#   - choco install -y python # Needed for SPIRV, use either this or make a new Docker image
+#  spirv_script:
+#   - export PATH=${PATH}:"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
+#   - cd "${CIRRUS_WORKING_DIR}/3rdparty/SPIRV"
+#   - msbuild.exe spirv.vcxproj //p:Configuration=Release //m
+  rpcs3_script:
+    - export PATH=${PATH}:"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
+    - msbuild.exe rpcs3.sln //p:Configuration=Release //m
+  deploy_script:
+    - mkdir artifacts
+    - source './.ci/export-cirrus-vars.sh'
+    - './.ci/deploy-windows.sh'
+  artifacts:
+    name: Artifact
+    path: "*.7z*"
+#  push_script: |
+#    if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ]; then
+#      source './.ci/export-cirrus-vars.sh'
+#      './.ci/github-upload.sh'
+#    fi;
+
+linux_task:
+  container:
+    image: rpcs3/rpcs3-ci-bionic:1.1
+    cpu: 4
+    memory: 16G
+  env:
+    BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}/artifacts
+    CCACHE_DIR: "/tmp/ccache_dir"
+    CCACHE_MAXSIZE: 300M
+    CI_HAS_ARTIFACTS: true
+    UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f
+    UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux"
+    DEPLOY_APPIMAGE: true
+    APPDIR: "./appdir"
+    ARTDIR: ${CIRRUS_WORKING_DIR}/artifacts/
+    RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
+  ccache_cache:
+    folder: "/tmp/ccache_dir"
+  matrix:
+    - name: Cirrus Linux GCC
+      env:
+        COMPILER: gcc
+      gcc_script:
+        - mkdir artifacts
+        - ".ci/build-linux.sh"
+    - name: Cirrus Linux Clang
+      env:
+        COMPILER: clang
+      clang_script:
+        - mkdir artifacts
+        - ".ci/build-linux.sh"
+  artifacts:
+    name: Artifact
+    path: "artifacts/*"
+#  push_script: |
+#    if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ] && [ "$COMPILER" = "gcc" ]; then
+#      '.ci/github-upload.sh'
+#    fi;
+
+freebsd_task:
+  matrix:
+    - name: Cirrus FreeBSD
+      freebsd_instance:
+        image_family: freebsd-13-0
+        cpu: 8
+        memory: 8G
+  env:
+    CCACHE_MAXSIZE: 300M # 3x clean build, rounded
+    CCACHE_DIR: /tmp/ccache_dir
+  ccache_cache:
+    folder: /tmp/ccache_dir
+  install_script: "sh -ex ./.ci/install-freebsd.sh"
+  script: "./.ci/build-freebsd.sh"
diff --git a/.clang-format b/.clang-format
index 08b2119b34..99b39f193e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,5 +1,5 @@
 Standard: c++20
-UseTab: AlignWithSpaces
+UseTab: ForIndentation
 TabWidth: 4
 IndentWidth: 4
 AccessModifierOffset: -4
@@ -16,12 +16,11 @@ AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: Empty
 AllowShortLoopsOnASingleLine: false
-AllowShortLambdasOnASingleLine: Empty
 Cpp11BracedListStyle: true
 IndentCaseLabels: false
 SortIncludes: false
 ReflowComments: true
-AlignConsecutiveAssignments: false
+AlignConsecutiveAssignments: true
 AlignTrailingComments: true
 AlignAfterOpenBracket: DontAlign
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index d719944078..a0453b46bc 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -16,4 +16,4 @@ Submitting your test results for Commercial Games must be done on our forums. Pl
 
 # Contributing
 
-Check the [Coding Style Guidelines](https://github.com/RPCS3/rpcs3/wiki/Coding-Style) and [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information). If you have any questions, hit us up on our [Discord Server](https://discord.gg/rpcs3) in the **#development** channel.
+Check the [Coding Style Guidelines](https://github.com/RPCS3/rpcs3/wiki/Coding-Style) and [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information). If you have any questions, hit us up on our [Discord Server](https://discord.me/RPCS3) in the **#development** channel.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index f41f7323c4..76a7ca9a61 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1,2 @@
 patreon: Nekotekina
+custom: https://rpcs3.net/alipay
diff --git a/.github/ISSUE_TEMPLATE/1-regression-report.md b/.github/ISSUE_TEMPLATE/1-regression-report.md
new file mode 100644
index 0000000000..b7cca103e9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-regression-report.md
@@ -0,0 +1,66 @@
+---
+name: Regression report
+about: If something used to work before, but now it doesn't
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
+
+## Quick summary
+Please briefly describe what has stopped working correctly.
+
+## Details
+Please describe the regression as accurately as possible.
+
+#### 0. Make sure you're running with settings as close to default as possible
+* **Do NOT enable any emulator game patches when reporting issues**
+* Only change settings that are required for the game to work
+
+#### 1. Please provide _exact_ build (or commit) information that introduced the regression you're reporting.
+* Please see [How to find the build that caused a regression](https://wiki.rpcs3.net/index.php?title=Help:Using_different_versions_of_RPCS3#How_to_find_the_build_that_caused_a_regression.3F) in our wiki.
+* You can find [History of RPCS3 builds](https://rpcs3.net/compatibility?b) here.
+
+#### 2. Please attach TWO logs:
+* One for the build with regression.
+* One for the build that works as expected.
+
+##### How to obtain RPCS3's log:
+* Run the game until you find the regression.
+* Completely close RPCS3, or move to the next step in case it has crashed.
+* Locate RPCS3's log file:
+	+ ```RPCS3.log``` (It can show up as just RPCS3 and have a notepad icon)
+	or
+	+ ```RPCS3.log.gz``` (It can show up as RPCS3.log and have a zip or rar icon)
+![image](https://user-images.githubusercontent.com/44116740/84433247-aa15fa80-ac36-11ea-913e-6fe25a1d040e.png)
+	On Linux it will be in ```~/.cache/rpcs3/```.
+	On Windows it will be near the executable.
+* Attach the log:
+	+ Drag and drop your log file into the issue.
+	+ Or upload it to the cloud, such as Dropbox, Mega etc.
+
+#### 3. If you describe graphical regression, please provide an RSX capture and a RenderDoc capture that demonstrate it.
+* To create an RSX capture, use _Create_ _RSX_ _Capture_ under _Utilities_.
+Captures will be stored in RPCS3 folder → captures.
+	+ Compress your capture with 7z, Rar etc.
+	And drag and drop it into the issue.
+	+ Or upload it to the cloud, such as Dropbox, Mega etc.
+* To create a RenderDoc capture, please refer to [RenderDoc's documentation](https://renderdoc.org/docs/how/how_capture_frame.html).
+
+#### 4. Please attach screenshots of your problem.
+* Enable performance overlay with at least medium level of detail.
+You can find it in _Emulator_ tab in _Settings_.
+
+#### 5. Please provide comparison with real PS3.
+
+#### 6. Please provide your system configuration:
+* OS
+* CPU
+* GPU
+* Driver version
+* etc.
+
+#### Please include.
+* Anything else you deem to be important
diff --git a/.github/ISSUE_TEMPLATE/1-regression-report.yml b/.github/ISSUE_TEMPLATE/1-regression-report.yml
deleted file mode 100644
index 7c8659b62e..0000000000
--- a/.github/ISSUE_TEMPLATE/1-regression-report.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-name: Regression report
-description: If something used to work before, but now it doesn't
-title: "[Regression] Enter a title here"
-labels: []
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # Summary
-        Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.gg/rpcs3) or [forums](https://forums.rpcs3.net/) instead.
-  - type: textarea
-    id: quick-summary
-    attributes:
-      label: Quick summary
-      description: Please briefly describe what has stopped working correctly.
-    validations:
-      required: true
-  - type: textarea
-    id: details
-    attributes:
-      label: Details
-      description: Please describe the regression as accurately as possible. Include screenshots if neccessary.
-    validations:
-      required: false
-  - type: markdown
-    attributes:
-      value: |
-        # Identify the regressed build
-        Please provide the _exact_ build (or commit) information that introduced the regression you're reporting.
-        * Please see [How to find the build that caused a regression](https://wiki.rpcs3.net/index.php?title=Help:Using_different_versions_of_RPCS3#How_to_find_the_build_that_caused_a_regression.3F) in our wiki.
-        * You can find [History of RPCS3 builds](https://rpcs3.net/compatibility?b) here.
-
-        Make sure you're running with settings as close to default as possible
-        * **Do NOT enable any emulator game patches when reporting issues**
-        * Only change settings that are required for the game to work
-  - type: input
-    id: regressed-build
-    attributes:
-      label: Build with regression
-      description: Provide _exact_ build (or commit) information that introduced the regression you're reporting.
-      placeholder: v0.0.23-13948-31df99f7
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: |
-        # Log files
-        Obtaining the log file:
-        * Run the game until you find the regression.
-        * Completely close RPCS3 and locate the log file.
-
-        RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon).
-        * On Windows it will be in the ```log``` folder inside your RPCS3 folder.
-        * On Linux it will be in ```~/.cache/rpcs3/```
-        * On MacOS it will be in ```~/Library/Caches/rpcs3```. If you're unable to locate it copy paste the path in Spotlight and hit enter.
-  - type: textarea
-    id: logs
-    attributes:
-      label: Attach two log files
-      description: |
-        Attach one file for the build with regression and another for a build that works.
-        Drag & drop the files into this input field, or upload them to another service (f.ex. Dropbox, Mega) and provide a link.
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: |
-        # Other details
-        If you describe a graphical regression, please provide an RSX capture and/or a RenderDoc capture that demonstrate it.
-        * To create an RSX capture, use _Create_ _RSX_ _Capture_ under _Utilities_.
-        * Captures will be stored in RPCS3 folder → captures.
-        * To create a RenderDoc capture, please refer to [RenderDoc's documentation](https://renderdoc.org/docs/how/how_capture_frame.html).
-  - type: textarea
-    id: captures
-    attributes:
-      label: Attach capture files for visual issues
-      description: Compress your capture with 7z, Rar etc. and attach it here, or upload it to the cloud (Dropbox, Mega etc) and add a link to it.
-    validations:
-      required: false
-  - type: textarea
-    id: system-info
-    attributes:
-      label: System configuration
-      description: Provide information about your system, such as operating system, CPU and GPU model, GPU driver version and other information that describes your system configuration.
-    validations:
-      required: false
-  - type: textarea
-    id: other-details
-    attributes:
-      label: Other details
-      description: Include anything else you deem to be important.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/2-bug-report.md b/.github/ISSUE_TEMPLATE/2-bug-report.md
new file mode 100644
index 0000000000..9019e16326
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-bug-report.md
@@ -0,0 +1,59 @@
+---
+name: Bug report
+about: If something doesn't work correctly in RPCS3
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
+
+## Quick summary
+Please briefly describe what is not working correctly.
+
+## Details
+
+Please describe the problem as accurately as possible.
+
+#### 0. Make sure you're running with settings as close to default as possible
+* **Do NOT enable any emulator game patches when reporting issues**
+* Only change settings that are required for the game to work
+
+#### 1. Please attach RPCS3's log.
+* Run the game until you find the issue.
+* Completely close RPCS3, or move to the next step in case it has crashed.
+* Locate RPCS3's log file:
+	+ ```RPCS3.log``` (It can show up as just RPCS3 and have a notepad icon)
+	or
+	+ ```RPCS3.log.gz``` (It can show up as RPCS3.log and have a zip or rar icon)
+![image](https://user-images.githubusercontent.com/44116740/84433247-aa15fa80-ac36-11ea-913e-6fe25a1d040e.png)
+	On Linux it will be in ```~/.cache/rpcs3/```.
+	On Windows it will be near the executable.
+* Attach the log:
+	+ Drag and drop your log file into the issue.
+	+ Or upload it to the cloud, such as Dropbox, Mega etc.
+
+#### 2. If you describe graphical issue, please provide an RSX capture and a RenderDoc capture that demonstrate it.
+* To create an RSX capture, use _Create_ _RSX_ _Capture_ under _Utilities_.
+Captures will be stored in RPCS3 folder → captures.
+	+ Compress your capture with 7z, Rar etc.
+	And	drag and drop it into the issue.
+	+ Or upload it to the cloud, such as Dropbox, Mega etc.
+* To create a RenderDoc capture, please refer to [RenderDoc's documentation](https://renderdoc.org/docs/how/how_capture_frame.html).
+
+#### 3. Please attach screenshots of your problem.
+* Enable performance overlay with at least medium level of detail.
+You can find it in _Emulator_ tab in _Settings_.
+
+#### 4. Please provide comparison with real PS3.
+
+#### 5. Please provide your system configuration:
+* OS
+* CPU
+* GPU
+* Driver version
+* etc.
+
+#### Please include.
+* Anything else you deem to be important
diff --git a/.github/ISSUE_TEMPLATE/2-bug-report.yml b/.github/ISSUE_TEMPLATE/2-bug-report.yml
deleted file mode 100644
index 4a82a03008..0000000000
--- a/.github/ISSUE_TEMPLATE/2-bug-report.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-name: Bug report
-description: If something doesn't work correctly in RPCS3
-title: "Enter a title here"
-labels: []
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # Summary
-        Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.gg/rpcs3) or [forums](https://forums.rpcs3.net/) instead.
-  - type: textarea
-    id: quick-summary
-    attributes:
-      label: Quick summary
-      description: Please briefly describe what is not working correctly.
-    validations:
-      required: true
-  - type: textarea
-    id: details
-    attributes:
-      label: Details
-      description: |
-        Please describe the problem as accurately as possible.
-        Provide a comparison with a real PS3, if possible.
-    validations:
-      required: false
-  - type: markdown
-    attributes:
-      value: |
-        # Log files
-
-        Provide a log file that includes the bug you're reporting.
-
-        Obtaining the log file:
-        * Run the game until you find the regression.
-        * Completely close RPCS3 and locate the log file.
-
-        RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon).
-        * On Windows it will be in the ```log``` folder inside your RPCS3 folder.
-        * On Linux it will be in ```~/.cache/rpcs3/```
-        * On MacOS it will be in ```~/Library/Caches/rpcs3```. If you're unable to locate it copy paste the path in Spotlight and hit enter.
-  - type: textarea
-    id: logs
-    attributes:
-      label: Attach a log file
-      description: |
-        Drag & drop the files into this input field, or upload them to another service (f.ex. Dropbox, Mega) and provide a link.
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: |
-        # Other details
-        If you describe a graphical issue, please provide an RSX capture and/or a RenderDoc capture that demonstrate it.
-        * To create an RSX capture, use _Create_ _RSX_ _Capture_ under _Utilities_.
-        * Captures will be stored in RPCS3 folder → captures.
-        * To create a RenderDoc capture, please refer to [RenderDoc's documentation](https://renderdoc.org/docs/how/how_capture_frame.html).
-  - type: textarea
-    id: captures
-    attributes:
-      label: Attach capture files for visual issues
-      description: Compress your capture with 7z, Rar etc. and attach it here, or upload it to the cloud (Dropbox, Mega etc) and add a link to it.
-    validations:
-      required: false
-  - type: textarea
-    id: system-info
-    attributes:
-      label: System configuration
-      description: Provide information about your system, such as operating system, CPU and GPU model, GPU driver version and other information that describes your system configuration.
-    validations:
-      required: false
-  - type: textarea
-    id: other-details
-    attributes:
-      label: Other details
-      description: Include anything else you deem to be important.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/3-feature-request.md b/.github/ISSUE_TEMPLATE/3-feature-request.md
new file mode 100644
index 0000000000..93bc14ce2d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3-feature-request.md
@@ -0,0 +1,41 @@
+---
+name: Feature Request
+about: If RPCS3 lacks a feature you would like to see
+title: '[Feature Request] Enter Feature Title Here'
+labels: ''
+assignees: ''
+
+---
+
+## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
+
+## Quick summary
+Please briefly describe what feature you would like RPCS3 to have.
+
+## Details
+
+Please describe the feature as accurately as possible.
+
+#### 1. Please describe, what part of RPCS3 would be affected by your feature:
+* Gameplay
+* Debugging
+* UI
+* Patches
+* Installation
+* Github
+* CI
+* etc.
+
+#### 2. Please tell us, why your feature is important to RPCS3.
+
+#### 3. Please attach screenshots of the feature implemented in other projects.
+
+#### 4. Please provide your system configuration:
+* OS
+* CPU
+* GPU
+* Driver version
+* etc.
+
+#### Please include.
+* Anything else you deem to be important
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/3-feature-request.yml b/.github/ISSUE_TEMPLATE/3-feature-request.yml
deleted file mode 100644
index 153c44c41c..0000000000
--- a/.github/ISSUE_TEMPLATE/3-feature-request.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Feature request
-description: If RPCS3 lacks a feature you would like to see
-title: "[Feature request] Enter a title here"
-labels: []
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.gg/rpcs3) or [forums](https://forums.rpcs3.net/) instead.
-  - type: textarea
-    id: quick-summary
-    attributes:
-      label: Quick summary
-      description: Please briefly describe what feature you would like RPCS3 to have.
-    validations:
-      required: true
-  - type: textarea
-    id: details
-    attributes:
-      label: Details
-      description: Please describe the feature as accurately as possible.
-    validations:
-      required: false
-  - type: markdown
-    attributes:
-      value: |
-        Please include the following information:
-        * What part of RPCS3 would be affected by your feature? (Gameplay, Debugging, UI, Patches, Installation, CI etc.)
-        * Why your feature is important to RPCS3.
-        * If the feature is implemented in other projects, attach screenshots.
-        * If this feature is something that a game is trying to use, upload a log file for it.
-
-        RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon).
-        * On Windows it will be in the ```log``` folder inside your RPCS3 folder.
-        * On Linux it will be in ```~/.cache/rpcs3/```
-        * On MacOS it will be in ```~/Library/Caches/rpcs3```. If you're unable to locate it copy paste the path in Spotlight and hit enter.
diff --git a/.github/ISSUE_TEMPLATE/4-advanced.md b/.github/ISSUE_TEMPLATE/4-advanced.md
deleted file mode 100644
index 78a9d96178..0000000000
--- a/.github/ISSUE_TEMPLATE/4-advanced.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Advanced
-about: For developers and experienced users only
-title: ''
-labels: ''
-assignees: ''
-
----
-
-## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.gg/rpcs3) or [forums](https://forums.rpcs3.net/) instead.
-
-You're using the advanced template. You're expected to know what to write in order to fill in all the required information for proper report.
-
-If you're unsure on what to do, please return back to the issue type selection and choose different category.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 1dd094e1dc..137afb75a2 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,7 +4,7 @@ contact_links:
     url: https://rpcs3.net/quickstart
     about: Everything you need to know to install and configure emulator, and add games
   - name: Ask for help
-    url: https://discord.gg/rpcs3
+    url: https://discord.me/RPCS3
     about: If you have some questions or need help, please use our Discord server instead of GitHub
   - name: Report game compatibility
     url: https://forums.rpcs3.net/thread-196671.html
diff --git a/.github/PR-BUILD.md b/.github/PR-BUILD.md
new file mode 100644
index 0000000000..fb9a0aeb17
--- /dev/null
+++ b/.github/PR-BUILD.md
@@ -0,0 +1,18 @@
+## How to test a PR build
+
+Please take into account, that RPCS3 build usually takes some time (about 15 mins), so you can't access a build if a PR was just submitted.
+
+- Open a PR you want to test
+- Scroll to the very bottom and locate the **Checks** section
+- Click on **Show all checks**
+	You are supposed to see something like this
+	![image](https://user-images.githubusercontent.com/10283761/116630952-2cd99e00-a94c-11eb-933e-986d6020ca92.png)
+- Click on __Details__ on either **Cirrus Linux GCC** or **Cirrus Windows**
+- Click **View more details on Cirrus CI** at the very bottom
+	![image](https://user-images.githubusercontent.com/10283761/116631111-5e526980-a94c-11eb-95f7-751e6f15e1ea.png)
+- Click on the download button for **Artifact** on the **Artifacts** block
+	![image](https://user-images.githubusercontent.com/10283761/116631322-bee1a680-a94c-11eb-89a3-be365783582e.png)
+
+- Congratulations! You are now downloading an RPCS3 build for that specific PR.
+
+__Please note that PR builds are not supposed to be stable because they contain new changesets.__
diff --git a/.github/PULL_REQUEST_TEMPLATE/1-default.md b/.github/PULL_REQUEST_TEMPLATE/1-default.md
new file mode 100644
index 0000000000..710d07ae2a
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/1-default.md
@@ -0,0 +1,3 @@
+<!-- Please include a summary of the change and which issue is fixed. -->
+
+[How to test this PR](.github/PR-BUILD.md)
\ No newline at end of file
diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml
deleted file mode 100644
index e3e3e76c50..0000000000
--- a/.github/workflows/llvm.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-name: Build LLVM
-
-defaults:
-  run:
-    shell: bash
-on:
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.ref }}-${{ github.event_name }}
-  cancel-in-progress: true
-
-env:
-  BUILD_ARTIFACTSTAGINGDIRECTORY: ${{ github.workspace }}/artifacts/
-
-jobs:
-  Windows_Build:
-    if: github.event_name == 'workflow_dispatch'
-    name: LLVM Windows (MSVC)
-    runs-on: windows-2025
-    env:
-      COMPILER: msvc
-      CCACHE_SHA: '1f39f3ad5aae3fe915e99ad1302633bc8f6718e58fa7c0de2b0ba7e080f0f08c'
-      CCACHE_BIN_DIR: 'C:\ccache_bin'
-      CCACHE_DIR: 'C:\ccache'
-      CCACHE_INODECACHE: 'true'
-      CCACHE_SLOPPINESS: 'time_macros'
-      DEPS_CACHE_DIR: ./dependency_cache
-    steps:
-
-      - name: Checkout repository
-        uses: actions/checkout@main
-        with:
-          fetch-depth: 0
-
-      - name: Restore Dependencies Cache
-        uses: actions/cache/restore@main
-        id: restore-dependencies-cache
-        with:
-          path: ${{ env.DEPS_CACHE_DIR }}
-          key: "${{ runner.os }}-${{ env.COMPILER }}-llvm-${{ env.CCACHE_SHA }}"
-          restore-keys: ${{ runner.os }}-${{ env.COMPILER }}-llvm
-
-      - name: Download and unpack dependencies
-        run: .ci/setup-llvm.sh
-
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@main
-
-      - name: Compile LLVM
-        shell: pwsh
-        run: msbuild 3rdparty\llvm\llvm_build.vcxproj /p:SolutionDir="$(pwd)/" /p:Configuration=Release /v:minimal /p:Platform=x64 /p:PreferredToolArchitecture=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_only.targets"
-
-      - name: Pack up build artifacts
-        run: |
-          mkdir -p "${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}"
-          .ci/deploy-llvm.sh
-
-      - name: Upload artifacts (7z)
-        uses: actions/upload-artifact@main
-        with:
-          name: LLVM for Windows (MSVC)
-          path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}
-          compression-level: 0
-          if-no-files-found: error
-
-      - name: Save Dependencies Cache
-        if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@main
-        with:
-          path: ${{ env.DEPS_CACHE_DIR }}
-          key: ${{ steps.restore-dependencies-cache.outputs.cache-primary-key }}
diff --git a/.github/workflows/qt-ts.yml b/.github/workflows/qt-ts.yml
deleted file mode 100644
index 4596be29e0..0000000000
--- a/.github/workflows/qt-ts.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Generate Translation Template
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-    paths:
-      - 'rpcs3/**'
-
-jobs:
-  Generate_Translation_Template:
-    name: Generate Translation Template
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@main
-
-      - name: Install Qt Tools
-        run: |
-          sudo apt update
-          sudo apt install -y qt6-l10n-tools
-
-      - name: Generate .ts file using lupdate (Qt)
-        working-directory: rpcs3
-        run: |
-          ../.ci/generate-qt-ts.sh
-
-      - name: Upload translation template
-        uses: actions/upload-artifact@main
-        with:
-          name: RPCS3_Translation_Template
-          path: translations/rpcs3_template.ts
-          compression-level: 0
\ No newline at end of file
diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml
deleted file mode 100644
index 1981f78edb..0000000000
--- a/.github/workflows/rpcs3.yml
+++ /dev/null
@@ -1,444 +0,0 @@
-name: Build RPCS3
-
-defaults:
-  run:
-    shell: bash
-on:
-  push:
-    branches:
-      - master # Only trigger push event on 'master' branch
-  pull_request:
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.ref }}-${{ github.event_name }}
-  cancel-in-progress: true
-
-env:
-  BUILD_REPOSITORY_NAME: ${{ github.repository }}
-  BUILD_SOURCEBRANCHNAME: ${{ github.ref_name }}
-  BUILD_PR_NUMBER: ${{ github.event.pull_request.number }}
-  BUILD_SOURCEVERSION: ${{ github.sha }}
-  BUILD_ARTIFACTSTAGINGDIRECTORY: ${{ github.workspace }}/artifacts/
-
-jobs:
-  Linux_Build:
-    # Only run push event on master branch of main repo, but run all PRs
-    if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master')
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-24.04
-            docker_img: "rpcs3/rpcs3-ci-jammy:1.6"
-            build_sh: "/rpcs3/.ci/build-linux.sh"
-            compiler: clang
-            UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f
-            UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux"
-          - os: ubuntu-24.04
-            docker_img: "rpcs3/rpcs3-ci-jammy:1.6"
-            build_sh: "/rpcs3/.ci/build-linux.sh"
-            compiler: gcc
-          - os: ubuntu-24.04-arm
-            docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.6"
-            build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
-            compiler: clang
-            UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1
-            UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux-arm64"
-          - os: ubuntu-24.04-arm
-            docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.6"
-            build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
-            compiler: gcc
-    name: RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }}
-    runs-on: ${{ matrix.os }}
-    env:
-      CCACHE_DIR: ${{ github.workspace }}/ccache
-      DEPLOY_APPIMAGE: true
-      APPDIR: "/rpcs3/build/appdir"
-      ARTDIR: "/root/artifacts"
-      RELEASE_MESSAGE: "/rpcs3/GitHubReleaseMessage.txt"
-      COMPILER: ${{ matrix.compiler }}
-      UPLOAD_COMMIT_HASH: ${{ matrix.UPLOAD_COMMIT_HASH }}
-      UPLOAD_REPO_FULL_NAME: ${{ matrix.UPLOAD_REPO_FULL_NAME }}
-      RUN_UNIT_TESTS: github.event_name == 'pull_request' && 'ON' || 'OFF'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@main
-        with:
-          fetch-depth: 0
-
-      - name: Restore build Ccache
-        uses: actions/cache/restore@main
-        id: restore-build-ccache
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ${{ runner.os }}-ccache-${{ matrix.compiler }}-${{ runner.arch }}-${{github.run_id}}
-          restore-keys: ${{ runner.os }}-ccache-${{ matrix.compiler }}-${{ runner.arch }}-
-
-      - name: Docker setup and build
-        run: |
-          docker pull --quiet ${{ matrix.docker_img }}
-          docker run \
-            -v $PWD:/rpcs3 \
-            --env-file .ci/docker.env \
-            -v ${{ env.CCACHE_DIR }}:/root/.ccache  \
-            -v ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}:${{ env.ARTDIR }} \
-            ${{ matrix.docker_img }} \
-            ${{ matrix.build_sh }}
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@main
-        with:
-          name: RPCS3 for Linux (${{ runner.arch }}, ${{ matrix.compiler }})
-          path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}/*.AppImage
-          compression-level: 0
-
-      - name: Deploy master build to GitHub Releases
-        if: |
-          github.event_name != 'pull_request' &&
-          github.repository == 'RPCS3/rpcs3' &&
-          github.ref == 'refs/heads/master' &&
-          matrix.compiler == 'clang'
-        env:
-          RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }}
-        run: |
-          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)
-          export AVVER="${COMM_TAG}-${COMM_COUNT}"
-          .ci/github-upload.sh
-
-      - name: Save build Ccache
-        if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@main
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ${{ steps.restore-build-ccache.outputs.cache-primary-key }}
-
-  Mac_Build:
-    # Only run push event on master branch of main repo, but run all PRs
-    if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master')
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: Intel
-            build_sh: "arch -X86_64 .ci/build-mac.sh"
-            UPLOAD_COMMIT_HASH: 51ae32f468089a8169aaf1567de355ff4a3e0842
-            UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac
-          - name: Apple Silicon
-            build_sh: .ci/build-mac-arm64.sh
-            UPLOAD_COMMIT_HASH: 8e21bdbc40711a3fccd18fbf17b742348b0f4281
-            UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac-arm64
-    name: RPCS3 Mac ${{ matrix.name }} 
-    runs-on: macos-14
-    env:
-      CCACHE_DIR: /tmp/ccache_dir
-      QT_VER: '6.7.3'
-      QT_VER_MAIN: '6'
-      LLVM_COMPILER_VER: '19'
-      RELEASE_MESSAGE: ../GitHubReleaseMessage.txt
-      UPLOAD_COMMIT_HASH: ${{ matrix.UPLOAD_COMMIT_HASH }}
-      UPLOAD_REPO_FULL_NAME: ${{ matrix.UPLOAD_REPO_FULL_NAME }}
-      RUN_UNIT_TESTS: github.event_name == 'pull_request' && 'ON' || 'OFF'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@main
-        with:
-          fetch-depth: 0
-
-      - name: Restore Build Ccache
-        uses: actions/cache/restore@main
-        id: restore-build-ccache
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ${{ runner.os }}-ccache-${{ matrix.name }}-${{github.run_id}}
-          restore-keys: ${{ runner.os }}-ccache-${{ matrix.name }}-
-
-      - name: Restore Qt Cache
-        uses: actions/cache/restore@main
-        id: restore-qt-cache
-        with:
-          path: /tmp/Qt
-          key: ${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }}
-          restore-keys: ${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }}
-
-      - name: Build
-        run: ${{ matrix.build_sh }}
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@main
-        with:
-          name: RPCS3 for Mac (${{ matrix.name }})
-          path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}
-          compression-level: 0
-
-      - name: Export Variables
-        run: |
-          while IFS='=' read -r key val; do
-            # Skip lines that are empty or start with '#'
-            [[ -z "$key" || "$key" =~ ^# ]] && continue
-            echo "$key=$val" >> "${{ github.env }}"
-          done < .ci/ci-vars.env
-
-      - name: Deploy master build to GitHub Releases
-        if: |
-          github.event_name != 'pull_request' &&
-          github.repository == 'RPCS3/rpcs3' &&
-          github.ref == 'refs/heads/master'
-        env:
-          RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }}
-        run: .ci/github-upload.sh
-
-      - name: Save Build Ccache
-        if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@main
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ${{ steps.restore-build-ccache.outputs.cache-primary-key }}
-
-      - name: Save Qt Cache
-        if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@main
-        with:
-          path: /tmp/Qt
-          key: ${{ steps.restore-qt-cache.outputs.cache-primary-key }}
-
-  Windows_Build:
-    # Only run push event on master branch of main repo, but run all PRs
-    if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master')
-    name: RPCS3 Windows
-    runs-on: windows-2025
-    env:
-      COMPILER: msvc
-      QT_VER_MAIN: '6'
-      QT_VER: '6.9.1'
-      QT_VER_MSVC: 'msvc2022'
-      QT_DATE: '202505291653'
-      LLVM_VER: '19.1.7'
-      VULKAN_VER: '1.3.268.0'
-      VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
-      CCACHE_SHA: '1f39f3ad5aae3fe915e99ad1302633bc8f6718e58fa7c0de2b0ba7e080f0f08c'
-      CCACHE_BIN_DIR: 'C:\ccache_bin'
-      CCACHE_DIR: 'C:\ccache'
-      CCACHE_INODECACHE: 'true'
-      CCACHE_SLOPPINESS: 'time_macros'
-      DEPS_CACHE_DIR: ./dependency_cache
-      UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
-      UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-win"
-    steps:
-
-      - name: Checkout repository
-        uses: actions/checkout@main
-        with:
-          fetch-depth: 0
-
-      - name: Setup NuGet
-        uses: nuget/setup-nuget@v2
-
-      - name: Restore NuGet packages
-        run: nuget restore rpcs3.sln
-
-      - name: Setup env
-        shell: pwsh
-        run: |
-          echo "QTDIR=C:\Qt\${{ env.QT_VER }}\${{ env.QT_VER_MSVC }}_64" >> ${{ github.env }}
-          echo "VULKAN_SDK=C:\VulkanSDK\${{ env.VULKAN_VER }}" >> ${{ github.env }}
-
-      - name: Get Cache Keys
-        run: .ci/get_keys-windows.sh
-
-      - name: Restore Build Ccache
-        uses: actions/cache/restore@main
-        id: restore-build-ccache
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: "${{ runner.os }}-ccache-${{ env.COMPILER }}-${{github.run_id}}"
-          restore-keys: ${{ runner.os }}-ccache-${{ env.COMPILER }}-
-
-      - name: Restore Dependencies Cache
-        uses: actions/cache/restore@main
-        id: restore-dependencies-cache
-        with:
-          path: ${{ env.DEPS_CACHE_DIR }}
-          key: "${{ runner.os }}-${{ env.COMPILER }}-${{ env.QT_VER }}-${{ env.VULKAN_SDK_SHA }}-${{ env.CCACHE_SHA }}-${{ hashFiles('llvm.lock') }}"
-          restore-keys: ${{ runner.os }}-${{ env.COMPILER }}-
-
-      - name: Download and unpack dependencies
-        run: |
-          .ci/setup-windows.sh
-          .ci/setup-windows-ci-vars.sh win64 msvc
-
-      - name: Export Variables
-        run: |
-          while IFS='=' read -r key val; do
-            # Skip lines that are empty or start with '#'
-            [[ -z "$key" || "$key" =~ ^# ]] && continue
-            echo "$key=$val" >> "${{ github.env }}"
-          done < .ci/ci-vars.env
-
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@main
-
-      - name: Compile RPCS3
-        shell: pwsh
-        run: msbuild rpcs3.sln /p:Configuration=Release /v:minimal /p:Platform=x64 /p:PreferredToolArchitecture=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_only.targets"
-
-      - name: Run Unit Tests
-        if: github.event_name == 'pull_request'
-        shell: pwsh
-        run: build\lib\Release-x64\rpcs3_test.exe
-
-      - name: Pack up build artifacts
-        run: |
-          mkdir -p "${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}"
-          .ci/deploy-windows.sh
-
-      - name: Upload artifacts (7z)
-        uses: actions/upload-artifact@main
-        with:
-          name: RPCS3 for Windows (MSVC)
-          path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}
-          compression-level: 0
-          if-no-files-found: error
-
-      - name: Deploy master build to GitHub Releases
-        if: |
-          github.event_name != 'pull_request' &&
-          github.repository == 'RPCS3/rpcs3' &&
-          github.ref == 'refs/heads/master'
-        env:
-          RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }}
-        run: .ci/github-upload.sh
-
-      - name: Save Build Ccache
-        if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@main
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ${{ steps.restore-build-ccache.outputs.cache-primary-key }}
-
-      - name: Save Dependencies Cache
-        if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@main
-        with:
-          path: ${{ env.DEPS_CACHE_DIR }}
-          key: ${{ steps.restore-dependencies-cache.outputs.cache-primary-key }}
-
-  Windows_Build_Clang:
-    # Only run push event on master branch of main repo, but run all PRs
-    if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master')
-    name: RPCS3 Windows Clang
-    runs-on: windows-2025
-    strategy:
-      matrix:
-        include:
-          - msys2: clang64
-            compiler: clang
-            arch: win64
-    env:
-      CCACHE_DIR: 'C:\ccache'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@main
-        with:
-          fetch-depth: 0
-
-      - name: Setup msys2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: ${{ matrix.msys2 }}
-          update: true
-          cache: true
-          install: |
-            mingw-w64-clang-x86_64-clang
-            mingw-w64-clang-x86_64-ccache
-            mingw-w64-clang-x86_64-cmake
-            mingw-w64-clang-x86_64-lld
-            mingw-w64-clang-x86_64-ninja
-            mingw-w64-clang-x86_64-llvm
-            mingw-w64-clang-x86_64-ffmpeg
-            mingw-w64-clang-x86_64-opencv
-            mingw-w64-clang-x86_64-glew
-            mingw-w64-clang-x86_64-vulkan
-            mingw-w64-clang-x86_64-vulkan-headers
-            mingw-w64-clang-x86_64-vulkan-loader
-            mingw-w64-clang-x86_64-gtest
-            mingw-w64-clang-x86_64-qt6-base
-            mingw-w64-clang-x86_64-qt6-declarative
-            mingw-w64-clang-x86_64-qt6-multimedia
-            mingw-w64-clang-x86_64-qt6-svg
-            base-devel
-            curl
-            git
-            p7zip
-
-      - name: Restore build Ccache
-        uses: actions/cache/restore@main
-        id: restore-build-ccache
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ${{ runner.os }}-ccache-${{ matrix.compiler }}-${{ runner.arch }}-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-ccache-${{ matrix.compiler }}-${{ runner.arch }}-
-
-      - name: Build RPCS3
-        shell: msys2 {0}
-        run: |
-          export CCACHE_DIR=$(cygpath -u "$CCACHE_DIR")
-          echo "CCACHE_DIR=$CCACHE_DIR"
-          .ci/setup-windows-ci-vars.sh ${{ matrix.arch }} ${{ matrix.compiler }}
-          .ci/build-windows-clang.sh
-
-      - name: Save build Ccache
-        if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@main
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ${{ steps.restore-build-ccache.outputs.cache-primary-key }}
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@main
-        with:
-          name: RPCS3 for Windows (${{ runner.arch }}, ${{ matrix.compiler }})
-          path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}
-          compression-level: 0
-          if-no-files-found: error
-
-  FreeBSD_Build:
-      # Only run push event on master branch of main repo, but run all PRs
-    if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master')
-    name: RPCS3 FreeBSD 
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    env:
-      CCACHE_DIR: ${{ github.workspace }}/ccache
-      QT_VER_MAIN: '6'
-      LLVM_COMPILER_VER: '19'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@main
-        with:
-          fetch-depth: 0
-
-      - name: Restore Build Ccache
-        uses: actions/cache/restore@main
-        id: restore-build-ccache
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: FreeBSD-ccache-${{github.run_id}}
-          restore-keys: FreeBSD-ccache-
-
-      - name: FreeBSD build
-        id: root
-        uses: vmactions/freebsd-vm@v1
-        with:
-          envs: 'QT_VER_MAIN LLVM_COMPILER_VER CCACHE_DIR'
-          usesh: true
-          run: .ci/install-freebsd.sh && .ci/build-freebsd.sh
-
-      - name: Save Build Ccache
-        if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@main
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ${{ steps.restore-build-ccache.outputs.cache-primary-key }}
diff --git a/.gitignore b/.gitignore
index 4688d5fa52..70a607bbd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,13 +31,12 @@
 *.wav
 
 /build
-/build-*
 /lib
 /tmp
 /ipch
-/packages
 /rpcs3/Debug
 /rpcs3/Release
+/llvm_build
 
 !/bin
 /bin/*
@@ -46,9 +45,6 @@
 !/bin/soft_oal.dll
 !/bin/xaudio2_9redist.dll
 
-# Test Programs
-!/bin/test/
-
 # Themes
 !/bin/GuiConfigs/
 /bin/GuiConfigs/*.ini
@@ -56,6 +52,9 @@
 /bin/GuiConfigs/*.dat
 /bin/GuiConfigs/*.dat.*
 
+# Some data from git
+!/bin/git/
+
 # Visual Studio Files
 .vs/*
 .vscode/*
@@ -102,11 +101,6 @@ rpcs3/rpcs3_autogen/*
 
 # QtCreator
 CMakeLists.txt.user
-*.autosave
-
-# Sublime Text
-*.sublime-project
-*.sublime-workspace
 
 # CLion
 /.idea/*
@@ -115,11 +109,17 @@ CMakeLists.txt.user
 # macOS
 .DS_Store
 
+# 7zlib
+/3rdparty/7z/**/*.lib
+
 # yaml-cpp
 yaml-cpp.pc
 
-_ReSharper.*/
-CMakeUserPresets.json
+# libusb
+/3rdparty/libusb_cmake/config.h
+/3rdparty/libusb_cmake/libusb-1.0.pc
 
-.cache/
-.lldbinit
+# ssl certificate
+cacert.pem
+
+_ReSharper.*/
diff --git a/.gitmodules b/.gitmodules
index 427c61ffbd..4097c40040 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,16 +5,24 @@
 [submodule "asmjit"]
 	path = 3rdparty/asmjit/asmjit
 	url = ../../asmjit/asmjit.git
-	branch = master
+	branch = oldstable
 	ignore = dirty
-[submodule "3rdparty/llvm/llvm"]
-	path = 3rdparty/llvm/llvm
-	url = ../../llvm/llvm-project.git
+[submodule "llvm"]
+	path = llvm
+	url = ../../RPCS3/llvm-mirror.git
 	ignore = dirty
 [submodule "3rdparty/glslang"]
 	path = 3rdparty/glslang/glslang
 	url = ../../KhronosGroup/glslang.git
 	ignore = dirty
+[submodule "3rdparty/SPIRV-Tools"]
+	path = 3rdparty/SPIRV/SPIRV-Tools
+	url = ../../KhronosGroup/SPIRV-Tools.git
+	ignore = dirty
+[submodule "3rdparty/SPIRV-Headers"]
+	path = 3rdparty/SPIRV/SPIRV-Headers
+	url = ../../KhronosGroup/SPIRV-Headers.git
+	ignore = dirty
 [submodule "3rdparty/zlib"]
 	path = 3rdparty/zlib/zlib
 	url = ../../madler/zlib
@@ -28,6 +36,10 @@
 	path = 3rdparty/pugixml
 	url = ../../zeux/pugixml.git
 	ignore = dirty
+[submodule "3rdparty/xxHash"]
+	path = 3rdparty/xxHash
+	url = ../../Cyan4973/xxHash.git
+	ignore = dirty
 [submodule "3rdparty/yaml-cpp"]
 	path = 3rdparty/yaml-cpp/yaml-cpp
 	url = ../../RPCS3/yaml-cpp.git
@@ -49,62 +61,10 @@
 	url = ../../curl/curl.git
 	ignore = dirty
 [submodule "3rdparty/wolfssl"]
-	path = 3rdparty/wolfssl/wolfssl
+	path = 3rdparty/wolfssl
 	url = ../../wolfSSL/wolfssl.git
 	ignore = dirty
 [submodule "3rdparty/flatbuffers"]
 	path = 3rdparty/flatbuffers
 	url = ../../google/flatbuffers.git
 	ignore = dirty
-[submodule "3rdparty/cubeb/cubeb"]
-	path = 3rdparty/cubeb/cubeb
-	url = ../../mozilla/cubeb.git
-	ignore = dirty
-[submodule "3rdparty/SoundTouch/soundtouch"]
-	path = 3rdparty/SoundTouch/soundtouch
-	url = ../../RPCS3/soundtouch.git
-	ignore = dirty
-[submodule "3rdparty/libsdl-org/SDL"]
-	path = 3rdparty/libsdl-org/SDL
-	url = ../../libsdl-org/SDL.git
-	ignore = dirty
-[submodule "3rdparty/miniupnp/miniupnp"]
-	path = 3rdparty/miniupnp/miniupnp
-	url = ../../miniupnp/miniupnp.git
-	ignore = dirty
-[submodule "3rdparty/rtmidi/rtmidi"]
-	path = 3rdparty/rtmidi/rtmidi
-	url = ../../thestk/rtmidi
-	ignore = dirty
-[submodule "3rdparty/zstd/zstd"]
-	path = 3rdparty/zstd/zstd
-	url = ../../facebook/zstd
-	ignore = dirty
-[submodule "3rdparty/7zip/7zip"]
-	path = 3rdparty/7zip/7zip
-	url = ../../ip7z/7zip.git
-	ignore = dirty
-[submodule "3rdparty/OpenAL/openal-soft"]
-	path = 3rdparty/OpenAL/openal-soft
-	url = ../../kcat/openal-soft.git
-	ignore = dirty
-[submodule "3rdparty/stblib/stb"]
-	path = 3rdparty/stblib/stb
-	url = ../../nothings/stb.git
-	ignore = dirty
-[submodule "3rdparty/opencv/opencv"]
-	path = 3rdparty/opencv/opencv
-	url = ../../Megamouse/opencv_minimal.git
-	ignore = dirty
-[submodule "3rdparty/fusion/fusion"]
-	path = 3rdparty/fusion/fusion
-	url = ../../xioTechnologies/Fusion.git
-	ignore = dirty
-[submodule "3rdparty/discord-rpc/discord-rpc"]
-	path = 3rdparty/discord-rpc/discord-rpc
-	url = ../../Vestrel/discord-rpc
-	ignore = dirty
-[submodule "3rdparty/GPUOpen/VulkanMemoryAllocator"]
-	path = 3rdparty/GPUOpen/VulkanMemoryAllocator
-	url = ../../GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
-	ignore = dirty
diff --git a/3rdparty/7zip/7zip.vcxproj b/3rdparty/7z/7zlib.vcxproj
similarity index 61%
rename from 3rdparty/7zip/7zip.vcxproj
rename to 3rdparty/7z/7zlib.vcxproj
index f8420f7b10..db3421ee9c 100644
--- a/3rdparty/7zip/7zip.vcxproj
+++ b/3rdparty/7z/7zlib.vcxproj
@@ -19,112 +19,89 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="7zip\C\7z.h" />
-    <ClInclude Include="7zip\C\7zAlloc.h" />
-    <ClInclude Include="7zip\C\7zBuf.h" />
-    <ClInclude Include="7zip\C\7zCrc.h" />
-    <ClInclude Include="7zip\C\7zFile.h" />
-    <ClInclude Include="7zip\C\7zTypes.h" />
-    <ClInclude Include="7zip\C\7zVersion.h" />
-    <ClInclude Include="7zip\C\7zWindows.h" />
-    <ClInclude Include="7zip\C\Aes.h" />
-    <ClInclude Include="7zip\C\Alloc.h" />
-    <ClInclude Include="7zip\C\Bcj2.h" />
-    <ClInclude Include="7zip\C\Blake2.h" />
-    <ClInclude Include="7zip\C\Bra.h" />
-    <ClInclude Include="7zip\C\BwtSort.h" />
-    <ClInclude Include="7zip\C\Compiler.h" />
-    <ClInclude Include="7zip\C\CpuArch.h" />
-    <ClInclude Include="7zip\C\Delta.h" />
-    <ClInclude Include="7zip\C\DllSecur.h" />
-    <ClInclude Include="7zip\C\HuffEnc.h" />
-    <ClInclude Include="7zip\C\LzFind.h" />
-    <ClInclude Include="7zip\C\LzFindMt.h" />
-    <ClInclude Include="7zip\C\LzHash.h" />
-    <ClInclude Include="7zip\C\Lzma2Dec.h" />
-    <ClInclude Include="7zip\C\Lzma2DecMt.h" />
-    <ClInclude Include="7zip\C\Lzma2Enc.h" />
-    <ClInclude Include="7zip\C\Lzma86.h" />
-    <ClInclude Include="7zip\C\LzmaDec.h" />
-    <ClInclude Include="7zip\C\LzmaEnc.h" />
-    <ClInclude Include="7zip\C\LzmaLib.h" />
-    <ClInclude Include="7zip\C\MtCoder.h" />
-    <ClInclude Include="7zip\C\MtDec.h" />
-    <ClInclude Include="7zip\C\Ppmd.h" />
-    <ClInclude Include="7zip\C\Ppmd7.h" />
-    <ClInclude Include="7zip\C\Ppmd8.h" />
-    <ClInclude Include="7zip\C\Precomp.h" />
-    <ClInclude Include="7zip\C\RotateDefs.h" />
-    <ClInclude Include="7zip\C\Sha1.h" />
-    <ClInclude Include="7zip\C\Sha256.h" />
-    <ClInclude Include="7zip\C\Sort.h" />
-    <ClInclude Include="7zip\C\SwapBytes.h" />
-    <ClInclude Include="7zip\C\Threads.h" />
-    <ClInclude Include="7zip\C\Xxh64.h" />
-    <ClInclude Include="7zip\C\Xz.h" />
-    <ClInclude Include="7zip\C\XzCrc64.h" />
-    <ClInclude Include="7zip\C\XzEnc.h" />
-    <ClInclude Include="7zip\C\ZstdDec.h" />
+    <ClInclude Include="src\7z.h" />
+    <ClInclude Include="src\7zAlloc.h" />
+    <ClInclude Include="src\7zBuf.h" />
+    <ClInclude Include="src\7zCrc.h" />
+    <ClInclude Include="src\7zFile.h" />
+    <ClInclude Include="src\7zTypes.h" />
+    <ClInclude Include="src\7zVersion.h" />
+    <ClInclude Include="src\Aes.h" />
+    <ClInclude Include="src\Alloc.h" />
+    <ClInclude Include="src\Bcj2.h" />
+    <ClInclude Include="src\Bra.h" />
+    <ClInclude Include="src\Compiler.h" />
+    <ClInclude Include="src\CpuArch.h" />
+    <ClInclude Include="src\Delta.h" />
+    <ClInclude Include="src\DllSecur.h" />
+    <ClInclude Include="src\LzFind.h" />
+    <ClInclude Include="src\LzFindMt.h" />
+    <ClInclude Include="src\LzHash.h" />
+    <ClInclude Include="src\Lzma2Dec.h" />
+    <ClInclude Include="src\Lzma2DecMt.h" />
+    <ClInclude Include="src\Lzma2Enc.h" />
+    <ClInclude Include="src\Lzma86.h" />
+    <ClInclude Include="src\LzmaDec.h" />
+    <ClInclude Include="src\LzmaEnc.h" />
+    <ClInclude Include="src\LzmaLib.h" />
+    <ClInclude Include="src\MtCoder.h" />
+    <ClInclude Include="src\MtDec.h" />
+    <ClInclude Include="src\Ppmd.h" />
+    <ClInclude Include="src\Ppmd7.h" />
+    <ClInclude Include="src\Precomp.h" />
+    <ClInclude Include="src\RotateDefs.h" />
+    <ClInclude Include="src\Sha256.h" />
+    <ClInclude Include="src\Sort.h" />
+    <ClInclude Include="src\Threads.h" />
+    <ClInclude Include="src\Xz.h" />
+    <ClInclude Include="src\XzCrc64.h" />
+    <ClInclude Include="src\XzEnc.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="7zip\C\7zAlloc.c" />
-    <ClCompile Include="7zip\C\7zArcIn.c" />
-    <ClCompile Include="7zip\C\7zBuf.c" />
-    <ClCompile Include="7zip\C\7zBuf2.c" />
-    <ClCompile Include="7zip\C\7zCrc.c" />
-    <ClCompile Include="7zip\C\7zCrcOpt.c" />
-    <ClCompile Include="7zip\C\7zDec.c" />
-    <ClCompile Include="7zip\C\7zFile.c" />
-    <ClCompile Include="7zip\C\7zStream.c" />
-    <ClCompile Include="7zip\C\Aes.c" />
-    <ClCompile Include="7zip\C\AesOpt.c" />
-    <ClCompile Include="7zip\C\Alloc.c" />
-    <ClCompile Include="7zip\C\Bcj2.c" />
-    <ClCompile Include="7zip\C\Bcj2Enc.c" />
-    <ClCompile Include="7zip\C\Blake2s.c" />
-    <ClCompile Include="7zip\C\Bra.c" />
-    <ClCompile Include="7zip\C\Bra86.c" />
-    <ClCompile Include="7zip\C\BraIA64.c" />
-    <ClCompile Include="7zip\C\BwtSort.c" />
-    <ClCompile Include="7zip\C\CpuArch.c" />
-    <ClCompile Include="7zip\C\Delta.c" />
-    <ClCompile Include="7zip\C\DllSecur.c" />
-    <ClCompile Include="7zip\C\HuffEnc.c" />
-    <ClCompile Include="7zip\C\LzFind.c" />
-    <ClCompile Include="7zip\C\LzFindMt.c" />
-    <ClCompile Include="7zip\C\LzFindOpt.c" />
-    <ClCompile Include="7zip\C\Lzma2Dec.c" />
-    <ClCompile Include="7zip\C\Lzma2DecMt.c" />
-    <ClCompile Include="7zip\C\Lzma2Enc.c" />
-    <ClCompile Include="7zip\C\Lzma86Dec.c" />
-    <ClCompile Include="7zip\C\Lzma86Enc.c" />
-    <ClCompile Include="7zip\C\LzmaDec.c" />
-    <ClCompile Include="7zip\C\LzmaEnc.c" />
-    <ClCompile Include="7zip\C\LzmaLib.c" />
-    <ClCompile Include="7zip\C\MtCoder.c" />
-    <ClCompile Include="7zip\C\MtDec.c" />
-    <ClCompile Include="7zip\C\Ppmd7.c" />
-    <ClCompile Include="7zip\C\Ppmd7aDec.c" />
-    <ClCompile Include="7zip\C\Ppmd7Dec.c" />
-    <ClCompile Include="7zip\C\Ppmd7Enc.c" />
-    <ClCompile Include="7zip\C\Ppmd8.c" />
-    <ClCompile Include="7zip\C\Ppmd8Dec.c" />
-    <ClCompile Include="7zip\C\Ppmd8Enc.c" />
-    <ClCompile Include="7zip\C\Sha1.c" />
-    <ClCompile Include="7zip\C\Sha1Opt.c" />
-    <ClCompile Include="7zip\C\Sha256.c" />
-    <ClCompile Include="7zip\C\Sha256Opt.c" />
-    <ClCompile Include="7zip\C\Sort.c" />
-    <ClCompile Include="7zip\C\SwapBytes.c" />
-    <ClCompile Include="7zip\C\Threads.c" />
-    <ClCompile Include="7zip\C\Xxh64.c" />
-    <ClCompile Include="7zip\C\Xz.c" />
-    <ClCompile Include="7zip\C\XzCrc64.c" />
-    <ClCompile Include="7zip\C\XzCrc64Opt.c" />
-    <ClCompile Include="7zip\C\XzDec.c" />
-    <ClCompile Include="7zip\C\XzEnc.c" />
-    <ClCompile Include="7zip\C\XzIn.c" />
-    <ClCompile Include="7zip\C\ZstdDec.c" />
+    <ClCompile Include="src\7zAlloc.c" />
+    <ClCompile Include="src\7zArcIn.c" />
+    <ClCompile Include="src\7zBuf.c" />
+    <ClCompile Include="src\7zBuf2.c" />
+    <ClCompile Include="src\7zCrc.c" />
+    <ClCompile Include="src\7zCrcOpt.c" />
+    <ClCompile Include="src\7zDec.c" />
+    <ClCompile Include="src\7zFile.c" />
+    <ClCompile Include="src\7zStream.c" />
+    <ClCompile Include="src\Aes.c" />
+    <ClCompile Include="src\AesOpt.c" />
+    <ClCompile Include="src\Alloc.c" />
+    <ClCompile Include="src\Bcj2.c" />
+    <ClCompile Include="src\Bcj2Enc.c" />
+    <ClCompile Include="src\Bra.c" />
+    <ClCompile Include="src\Bra86.c" />
+    <ClCompile Include="src\BraIA64.c" />
+    <ClCompile Include="src\CpuArch.c" />
+    <ClCompile Include="src\Delta.c" />
+    <ClCompile Include="src\DllSecur.c" />
+    <ClCompile Include="src\LzFind.c" />
+    <ClCompile Include="src\LzFindMt.c" />
+    <ClCompile Include="src\Lzma2Dec.c" />
+    <ClCompile Include="src\Lzma2DecMt.c" />
+    <ClCompile Include="src\Lzma2Enc.c" />
+    <ClCompile Include="src\Lzma86Dec.c" />
+    <ClCompile Include="src\Lzma86Enc.c" />
+    <ClCompile Include="src\LzmaDec.c" />
+    <ClCompile Include="src\LzmaEnc.c" />
+    <ClCompile Include="src\LzmaLib.c" />
+    <ClCompile Include="src\MtCoder.c" />
+    <ClCompile Include="src\MtDec.c" />
+    <ClCompile Include="src\Ppmd7.c" />
+    <ClCompile Include="src\Ppmd7Dec.c" />
+    <ClCompile Include="src\Ppmd7Enc.c" />
+    <ClCompile Include="src\Sha256.c" />
+    <ClCompile Include="src\Sort.c" />
+    <ClCompile Include="src\Threads.c" />
+    <ClCompile Include="src\Xz.c" />
+    <ClCompile Include="src\XzCrc64.c" />
+    <ClCompile Include="src\XzCrc64Opt.c" />
+    <ClCompile Include="src\XzDec.c" />
+    <ClCompile Include="src\XzEnc.c" />
+    <ClCompile Include="src\XzIn.c" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -179,8 +156,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)lib/$(Configuration)-$(Platform)/</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
diff --git a/3rdparty/7z/7zlib.vcxproj.filters b/3rdparty/7z/7zlib.vcxproj.filters
new file mode 100644
index 0000000000..59e30f6cff
--- /dev/null
+++ b/3rdparty/7z/7zlib.vcxproj.filters
@@ -0,0 +1,264 @@
+<?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;ipp;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>
+    <ClInclude Include"src\7z.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\7zAlloc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\7zBuf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\7zCrc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\7zFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\7zTypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\7zVersion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Aes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Alloc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Bcj2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Bra.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Compiler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\CpuArch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Delta.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\DllSecur.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\LzFind.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\LzFindMt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\LzHash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Lzma2Dec.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Lzma2DecMt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Lzma2Enc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Lzma86.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\LzmaDec.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\LzmaEnc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\LzmaLib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\MtCoder.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\MtDec.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Ppmd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Ppmd7.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Precomp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\RotateDefs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Sha256.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Sort.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Threads.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\Xz.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\XzCrc64.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include"src\XzEnc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include"src\7zAlloc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\7zArcIn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\7zBuf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\7zBuf2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\7zCrc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\7zCrcOpt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\7zDec.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\7zFile.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\7zStream.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Aes.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\AesOpt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Alloc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Bcj2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Bcj2Enc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Bra.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Bra86.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\BraIA64.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\CpuArch.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Delta.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\DllSecur.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\LzFind.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\LzFindMt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Lzma2Dec.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Lzma2DecMt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Lzma2Enc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Lzma86Dec.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Lzma86Enc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\LzmaDec.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\LzmaEnc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\LzmaLib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\MtCoder.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\MtDec.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Ppmd7.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Ppmd7Dec.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Ppmd7Enc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Sha256.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Sort.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Threads.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\Xz.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\XzCrc64.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\XzCrc64Opt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\XzDec.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\XzEnc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include"src\XzIn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/3rdparty/7z/CMakeLists.txt b/3rdparty/7z/CMakeLists.txt
new file mode 100644
index 0000000000..80979cfafd
--- /dev/null
+++ b/3rdparty/7z/CMakeLists.txt
@@ -0,0 +1,51 @@
+# 7z sdk
+if(WIN32)
+	add_library(3rdparty_7z STATIC EXCLUDE_FROM_ALL
+		src/Sha256.c
+		src/Ppmd7Dec.c
+		src/XzDec.c
+		src/XzEnc.c
+		src/Lzma2Dec.c
+		src/XzCrc64.c
+		src/DllSecur.c
+		src/Lzma2DecMt.c
+		src/BraIA64.c
+		src/7zFile.c
+		src/7zStream.c
+		src/Lzma86Enc.c
+		src/Threads.c
+		src/7zAlloc.c
+		src/LzmaEnc.c
+		src/MtCoder.c
+		src/Lzma86Dec.c
+		src/Sort.c
+		src/LzFindMt.c
+		src/7zDec.c
+		src/Bcj2.c
+		src/Ppmd7.c
+		src/Bra86.c
+		src/Bcj2Enc.c
+		src/7zBuf.c
+		src/Aes.c
+		src/AesOpt.c
+		src/XzCrc64Opt.c
+		src/7zArcIn.c
+		src/Lzma2Enc.c
+		src/Bra.c
+		src/7zCrcOpt.c
+		src/7zBuf2.c
+		src/LzFind.c
+		src/Ppmd7Enc.c
+		src/CpuArch.c
+		src/Delta.c
+		src/XzIn.c
+		src/Alloc.c
+		src/Xz.c
+		src/LzmaDec.c
+		src/LzmaLib.c
+		src/7zCrc.c
+		src/MtDec.c)
+	target_include_directories(3rdparty_7z INTERFACE 7z)
+else()
+	add_library(3rdparty_7z INTERFACE)
+endif()
diff --git a/3rdparty/7z/src/7z.h b/3rdparty/7z/src/7z.h
new file mode 100644
index 0000000000..82813c298b
--- /dev/null
+++ b/3rdparty/7z/src/7z.h
@@ -0,0 +1,202 @@
+/* 7z.h -- 7z interface
+2017-04-03 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_H
+#define __7Z_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+#define k7zStartHeaderSize 0x20
+#define k7zSignatureSize 6
+
+extern const Byte k7zSignature[k7zSignatureSize];
+
+typedef struct
+{
+  const Byte *Data;
+  size_t Size;
+} CSzData;
+
+/* CSzCoderInfo & CSzFolder support only default methods */
+
+typedef struct
+{
+  size_t PropsOffset;
+  UInt32 MethodID;
+  Byte NumStreams;
+  Byte PropsSize;
+} CSzCoderInfo;
+
+typedef struct
+{
+  UInt32 InIndex;
+  UInt32 OutIndex;
+} CSzBond;
+
+#define SZ_NUM_CODERS_IN_FOLDER_MAX 4
+#define SZ_NUM_BONDS_IN_FOLDER_MAX 3
+#define SZ_NUM_PACK_STREAMS_IN_FOLDER_MAX 4
+
+typedef struct
+{
+  UInt32 NumCoders;
+  UInt32 NumBonds;
+  UInt32 NumPackStreams;
+  UInt32 UnpackStream;
+  UInt32 PackStreams[SZ_NUM_PACK_STREAMS_IN_FOLDER_MAX];
+  CSzBond Bonds[SZ_NUM_BONDS_IN_FOLDER_MAX];
+  CSzCoderInfo Coders[SZ_NUM_CODERS_IN_FOLDER_MAX];
+} CSzFolder;
+
+
+SRes SzGetNextFolderItem(CSzFolder *f, CSzData *sd);
+
+typedef struct
+{
+  UInt32 Low;
+  UInt32 High;
+} CNtfsFileTime;
+
+typedef struct
+{
+  Byte *Defs; /* MSB 0 bit numbering */
+  UInt32 *Vals;
+} CSzBitUi32s;
+
+typedef struct
+{
+  Byte *Defs; /* MSB 0 bit numbering */
+  // UInt64 *Vals;
+  CNtfsFileTime *Vals;
+} CSzBitUi64s;
+
+#define SzBitArray_Check(p, i) (((p)[(i) >> 3] & (0x80 >> ((i) & 7))) != 0)
+
+#define SzBitWithVals_Check(p, i) ((p)->Defs && ((p)->Defs[(i) >> 3] & (0x80 >> ((i) & 7))) != 0)
+
+typedef struct
+{
+  UInt32 NumPackStreams;
+  UInt32 NumFolders;
+
+  UInt64 *PackPositions;          // NumPackStreams + 1
+  CSzBitUi32s FolderCRCs;         // NumFolders
+
+  size_t *FoCodersOffsets;        // NumFolders + 1
+  UInt32 *FoStartPackStreamIndex; // NumFolders + 1
+  UInt32 *FoToCoderUnpackSizes;   // NumFolders + 1
+  Byte *FoToMainUnpackSizeIndex;  // NumFolders
+  UInt64 *CoderUnpackSizes;       // for all coders in all folders
+
+  Byte *CodersData;
+} CSzAr;
+
+UInt64 SzAr_GetFolderUnpackSize(const CSzAr *p, UInt32 folderIndex);
+
+SRes SzAr_DecodeFolder(const CSzAr *p, UInt32 folderIndex,
+    ILookInStream *stream, UInt64 startPos,
+    Byte *outBuffer, size_t outSize,
+    ISzAllocPtr allocMain);
+
+typedef struct
+{
+  CSzAr db;
+
+  UInt64 startPosAfterHeader;
+  UInt64 dataPos;
+  
+  UInt32 NumFiles;
+
+  UInt64 *UnpackPositions;  // NumFiles + 1
+  // Byte *IsEmptyFiles;
+  Byte *IsDirs;
+  CSzBitUi32s CRCs;
+
+  CSzBitUi32s Attribs;
+  // CSzBitUi32s Parents;
+  CSzBitUi64s MTime;
+  CSzBitUi64s CTime;
+
+  UInt32 *FolderToFile;   // NumFolders + 1
+  UInt32 *FileToFolder;   // NumFiles
+
+  size_t *FileNameOffsets; /* in 2-byte steps */
+  Byte *FileNames;  /* UTF-16-LE */
+} CSzArEx;
+
+#define SzArEx_IsDir(p, i) (SzBitArray_Check((p)->IsDirs, i))
+
+#define SzArEx_GetFileSize(p, i) ((p)->UnpackPositions[(i) + 1] - (p)->UnpackPositions[i])
+
+void SzArEx_Init(CSzArEx *p);
+void SzArEx_Free(CSzArEx *p, ISzAllocPtr alloc);
+UInt64 SzArEx_GetFolderStreamPos(const CSzArEx *p, UInt32 folderIndex, UInt32 indexInFolder);
+int SzArEx_GetFolderFullPackSize(const CSzArEx *p, UInt32 folderIndex, UInt64 *resSize);
+
+/*
+if dest == NULL, the return value specifies the required size of the buffer,
+  in 16-bit characters, including the null-terminating character.
+if dest != NULL, the return value specifies the number of 16-bit characters that
+  are written to the dest, including the null-terminating character. */
+
+size_t SzArEx_GetFileNameUtf16(const CSzArEx *p, size_t fileIndex, UInt16 *dest);
+
+/*
+size_t SzArEx_GetFullNameLen(const CSzArEx *p, size_t fileIndex);
+UInt16 *SzArEx_GetFullNameUtf16_Back(const CSzArEx *p, size_t fileIndex, UInt16 *dest);
+*/
+
+
+
+/*
+  SzArEx_Extract extracts file from archive
+
+  *outBuffer must be 0 before first call for each new archive.
+
+  Extracting cache:
+    If you need to decompress more than one file, you can send
+    these values from previous call:
+      *blockIndex,
+      *outBuffer,
+      *outBufferSize
+    You can consider "*outBuffer" as cache of solid block. If your archive is solid,
+    it will increase decompression speed.
+  
+    If you use external function, you can declare these 3 cache variables
+    (blockIndex, outBuffer, outBufferSize) as static in that external function.
+    
+    Free *outBuffer and set *outBuffer to 0, if you want to flush cache.
+*/
+
+SRes SzArEx_Extract(
+    const CSzArEx *db,
+    ILookInStream *inStream,
+    UInt32 fileIndex,         /* index of file */
+    UInt32 *blockIndex,       /* index of solid block */
+    Byte **outBuffer,         /* pointer to pointer to output buffer (allocated with allocMain) */
+    size_t *outBufferSize,    /* buffer size for output buffer */
+    size_t *offset,           /* offset of stream for required file in *outBuffer */
+    size_t *outSizeProcessed, /* size of file in *outBuffer */
+    ISzAllocPtr allocMain,
+    ISzAllocPtr allocTemp);
+
+
+/*
+SzArEx_Open Errors:
+SZ_ERROR_NO_ARCHIVE
+SZ_ERROR_ARCHIVE
+SZ_ERROR_UNSUPPORTED
+SZ_ERROR_MEM
+SZ_ERROR_CRC
+SZ_ERROR_INPUT_EOF
+SZ_ERROR_FAIL
+*/
+
+SRes SzArEx_Open(CSzArEx *p, ILookInStream *inStream,
+    ISzAllocPtr allocMain, ISzAllocPtr allocTemp);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/7zAlloc.c b/3rdparty/7z/src/7zAlloc.c
new file mode 100644
index 0000000000..ea32809c65
--- /dev/null
+++ b/3rdparty/7z/src/7zAlloc.c
@@ -0,0 +1,80 @@
+/* 7zAlloc.c -- Allocation functions
+2017-04-03 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <stdlib.h>
+
+#include "7zAlloc.h"
+
+/* #define _SZ_ALLOC_DEBUG */
+/* use _SZ_ALLOC_DEBUG to debug alloc/free operations */
+
+#ifdef _SZ_ALLOC_DEBUG
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#include <stdio.h>
+int g_allocCount = 0;
+int g_allocCountTemp = 0;
+
+#endif
+
+void *SzAlloc(ISzAllocPtr p, size_t size)
+{
+  UNUSED_VAR(p);
+  if (size == 0)
+    return 0;
+  #ifdef _SZ_ALLOC_DEBUG
+  fprintf(stderr, "\nAlloc %10u bytes; count = %10d", (unsigned)size, g_allocCount);
+  g_allocCount++;
+  #endif
+  return malloc(size);
+}
+
+void SzFree(ISzAllocPtr p, void *address)
+{
+  UNUSED_VAR(p);
+  #ifdef _SZ_ALLOC_DEBUG
+  if (address != 0)
+  {
+    g_allocCount--;
+    fprintf(stderr, "\nFree; count = %10d", g_allocCount);
+  }
+  #endif
+  free(address);
+}
+
+void *SzAllocTemp(ISzAllocPtr p, size_t size)
+{
+  UNUSED_VAR(p);
+  if (size == 0)
+    return 0;
+  #ifdef _SZ_ALLOC_DEBUG
+  fprintf(stderr, "\nAlloc_temp %10u bytes;  count = %10d", (unsigned)size, g_allocCountTemp);
+  g_allocCountTemp++;
+  #ifdef _WIN32
+  return HeapAlloc(GetProcessHeap(), 0, size);
+  #endif
+  #endif
+  return malloc(size);
+}
+
+void SzFreeTemp(ISzAllocPtr p, void *address)
+{
+  UNUSED_VAR(p);
+  #ifdef _SZ_ALLOC_DEBUG
+  if (address != 0)
+  {
+    g_allocCountTemp--;
+    fprintf(stderr, "\nFree_temp; count = %10d", g_allocCountTemp);
+  }
+  #ifdef _WIN32
+  HeapFree(GetProcessHeap(), 0, address);
+  return;
+  #endif
+  #endif
+  free(address);
+}
diff --git a/3rdparty/7z/src/7zAlloc.h b/3rdparty/7z/src/7zAlloc.h
new file mode 100644
index 0000000000..c0f89d73cb
--- /dev/null
+++ b/3rdparty/7z/src/7zAlloc.h
@@ -0,0 +1,19 @@
+/* 7zAlloc.h -- Allocation functions
+2017-04-03 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_ALLOC_H
+#define __7Z_ALLOC_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+void *SzAlloc(ISzAllocPtr p, size_t size);
+void SzFree(ISzAllocPtr p, void *address);
+
+void *SzAllocTemp(ISzAllocPtr p, size_t size);
+void SzFreeTemp(ISzAllocPtr p, void *address);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/7zArcIn.c b/3rdparty/7z/src/7zArcIn.c
new file mode 100644
index 0000000000..68cc12ff45
--- /dev/null
+++ b/3rdparty/7z/src/7zArcIn.c
@@ -0,0 +1,1771 @@
+/* 7zArcIn.c -- 7z Input functions
+2018-12-31 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <string.h>
+
+#include "7z.h"
+#include "7zBuf.h"
+#include "7zCrc.h"
+#include "CpuArch.h"
+
+#define MY_ALLOC(T, p, size, alloc) { \
+  if ((p = (T *)ISzAlloc_Alloc(alloc, (size) * sizeof(T))) == NULL) return SZ_ERROR_MEM; }
+
+#define MY_ALLOC_ZE(T, p, size, alloc) { if ((size) == 0) p = NULL; else MY_ALLOC(T, p, size, alloc) }
+
+#define MY_ALLOC_AND_CPY(to, size, from, alloc) \
+  { MY_ALLOC(Byte, to, size, alloc); memcpy(to, from, size); }
+
+#define MY_ALLOC_ZE_AND_CPY(to, size, from, alloc) \
+  { if ((size) == 0) to = NULL; else { MY_ALLOC_AND_CPY(to, size, from, alloc) } }
+
+#define k7zMajorVersion 0
+
+enum EIdEnum
+{
+  k7zIdEnd,
+  k7zIdHeader,
+  k7zIdArchiveProperties,
+  k7zIdAdditionalStreamsInfo,
+  k7zIdMainStreamsInfo,
+  k7zIdFilesInfo,
+  k7zIdPackInfo,
+  k7zIdUnpackInfo,
+  k7zIdSubStreamsInfo,
+  k7zIdSize,
+  k7zIdCRC,
+  k7zIdFolder,
+  k7zIdCodersUnpackSize,
+  k7zIdNumUnpackStream,
+  k7zIdEmptyStream,
+  k7zIdEmptyFile,
+  k7zIdAnti,
+  k7zIdName,
+  k7zIdCTime,
+  k7zIdATime,
+  k7zIdMTime,
+  k7zIdWinAttrib,
+  k7zIdComment,
+  k7zIdEncodedHeader,
+  k7zIdStartPos,
+  k7zIdDummy
+  // k7zNtSecure,
+  // k7zParent,
+  // k7zIsReal
+};
+
+const Byte k7zSignature[k7zSignatureSize] = {'7', 'z', 0xBC, 0xAF, 0x27, 0x1C};
+
+#define SzBitUi32s_Init(p) { (p)->Defs = NULL; (p)->Vals = NULL; }
+
+static SRes SzBitUi32s_Alloc(CSzBitUi32s *p, size_t num, ISzAllocPtr alloc)
+{
+  if (num == 0)
+  {
+    p->Defs = NULL;
+    p->Vals = NULL;
+  }
+  else
+  {
+    MY_ALLOC(Byte, p->Defs, (num + 7) >> 3, alloc);
+    MY_ALLOC(UInt32, p->Vals, num, alloc);
+  }
+  return SZ_OK;
+}
+
+void SzBitUi32s_Free(CSzBitUi32s *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->Defs); p->Defs = NULL;
+  ISzAlloc_Free(alloc, p->Vals); p->Vals = NULL;
+}
+
+#define SzBitUi64s_Init(p) { (p)->Defs = NULL; (p)->Vals = NULL; }
+
+void SzBitUi64s_Free(CSzBitUi64s *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->Defs); p->Defs = NULL;
+  ISzAlloc_Free(alloc, p->Vals); p->Vals = NULL;
+}
+
+
+static void SzAr_Init(CSzAr *p)
+{
+  p->NumPackStreams = 0;
+  p->NumFolders = 0;
+  
+  p->PackPositions = NULL;
+  SzBitUi32s_Init(&p->FolderCRCs);
+
+  p->FoCodersOffsets = NULL;
+  p->FoStartPackStreamIndex = NULL;
+  p->FoToCoderUnpackSizes = NULL;
+  p->FoToMainUnpackSizeIndex = NULL;
+  p->CoderUnpackSizes = NULL;
+
+  p->CodersData = NULL;
+}
+
+static void SzAr_Free(CSzAr *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->PackPositions);
+  SzBitUi32s_Free(&p->FolderCRCs, alloc);
+ 
+  ISzAlloc_Free(alloc, p->FoCodersOffsets);
+  ISzAlloc_Free(alloc, p->FoStartPackStreamIndex);
+  ISzAlloc_Free(alloc, p->FoToCoderUnpackSizes);
+  ISzAlloc_Free(alloc, p->FoToMainUnpackSizeIndex);
+  ISzAlloc_Free(alloc, p->CoderUnpackSizes);
+  
+  ISzAlloc_Free(alloc, p->CodersData);
+
+  SzAr_Init(p);
+}
+
+
+void SzArEx_Init(CSzArEx *p)
+{
+  SzAr_Init(&p->db);
+  
+  p->NumFiles = 0;
+  p->dataPos = 0;
+  
+  p->UnpackPositions = NULL;
+  p->IsDirs = NULL;
+  
+  p->FolderToFile = NULL;
+  p->FileToFolder = NULL;
+  
+  p->FileNameOffsets = NULL;
+  p->FileNames = NULL;
+  
+  SzBitUi32s_Init(&p->CRCs);
+  SzBitUi32s_Init(&p->Attribs);
+  // SzBitUi32s_Init(&p->Parents);
+  SzBitUi64s_Init(&p->MTime);
+  SzBitUi64s_Init(&p->CTime);
+}
+
+void SzArEx_Free(CSzArEx *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->UnpackPositions);
+  ISzAlloc_Free(alloc, p->IsDirs);
+
+  ISzAlloc_Free(alloc, p->FolderToFile);
+  ISzAlloc_Free(alloc, p->FileToFolder);
+
+  ISzAlloc_Free(alloc, p->FileNameOffsets);
+  ISzAlloc_Free(alloc, p->FileNames);
+
+  SzBitUi32s_Free(&p->CRCs, alloc);
+  SzBitUi32s_Free(&p->Attribs, alloc);
+  // SzBitUi32s_Free(&p->Parents, alloc);
+  SzBitUi64s_Free(&p->MTime, alloc);
+  SzBitUi64s_Free(&p->CTime, alloc);
+  
+  SzAr_Free(&p->db, alloc);
+  SzArEx_Init(p);
+}
+
+
+static int TestSignatureCandidate(const Byte *testBytes)
+{
+  unsigned i;
+  for (i = 0; i < k7zSignatureSize; i++)
+    if (testBytes[i] != k7zSignature[i])
+      return 0;
+  return 1;
+}
+
+#define SzData_Clear(p) { (p)->Data = NULL; (p)->Size = 0; }
+
+#define SZ_READ_BYTE_SD(_sd_, dest) if ((_sd_)->Size == 0) return SZ_ERROR_ARCHIVE; (_sd_)->Size--; dest = *(_sd_)->Data++;
+#define SZ_READ_BYTE(dest) SZ_READ_BYTE_SD(sd, dest)
+#define SZ_READ_BYTE_2(dest) if (sd.Size == 0) return SZ_ERROR_ARCHIVE; sd.Size--; dest = *sd.Data++;
+
+#define SKIP_DATA(sd, size) { sd->Size -= (size_t)(size); sd->Data += (size_t)(size); }
+#define SKIP_DATA2(sd, size) { sd.Size -= (size_t)(size); sd.Data += (size_t)(size); }
+
+#define SZ_READ_32(dest) if (sd.Size < 4) return SZ_ERROR_ARCHIVE; \
+   dest = GetUi32(sd.Data); SKIP_DATA2(sd, 4);
+
+static MY_NO_INLINE SRes ReadNumber(CSzData *sd, UInt64 *value)
+{
+  Byte firstByte, mask;
+  unsigned i;
+  UInt32 v;
+
+  SZ_READ_BYTE(firstByte);
+  if ((firstByte & 0x80) == 0)
+  {
+    *value = firstByte;
+    return SZ_OK;
+  }
+  SZ_READ_BYTE(v);
+  if ((firstByte & 0x40) == 0)
+  {
+    *value = (((UInt32)firstByte & 0x3F) << 8) | v;
+    return SZ_OK;
+  }
+  SZ_READ_BYTE(mask);
+  *value = v | ((UInt32)mask << 8);
+  mask = 0x20;
+  for (i = 2; i < 8; i++)
+  {
+    Byte b;
+    if ((firstByte & mask) == 0)
+    {
+      UInt64 highPart = (unsigned)firstByte & (unsigned)(mask - 1);
+      *value |= (highPart << (8 * i));
+      return SZ_OK;
+    }
+    SZ_READ_BYTE(b);
+    *value |= ((UInt64)b << (8 * i));
+    mask >>= 1;
+  }
+  return SZ_OK;
+}
+
+
+static MY_NO_INLINE SRes SzReadNumber32(CSzData *sd, UInt32 *value)
+{
+  Byte firstByte;
+  UInt64 value64;
+  if (sd->Size == 0)
+    return SZ_ERROR_ARCHIVE;
+  firstByte = *sd->Data;
+  if ((firstByte & 0x80) == 0)
+  {
+    *value = firstByte;
+    sd->Data++;
+    sd->Size--;
+    return SZ_OK;
+  }
+  RINOK(ReadNumber(sd, &value64));
+  if (value64 >= (UInt32)0x80000000 - 1)
+    return SZ_ERROR_UNSUPPORTED;
+  if (value64 >= ((UInt64)(1) << ((sizeof(size_t) - 1) * 8 + 4)))
+    return SZ_ERROR_UNSUPPORTED;
+  *value = (UInt32)value64;
+  return SZ_OK;
+}
+
+#define ReadID(sd, value) ReadNumber(sd, value)
+
+static SRes SkipData(CSzData *sd)
+{
+  UInt64 size;
+  RINOK(ReadNumber(sd, &size));
+  if (size > sd->Size)
+    return SZ_ERROR_ARCHIVE;
+  SKIP_DATA(sd, size);
+  return SZ_OK;
+}
+
+static SRes WaitId(CSzData *sd, UInt32 id)
+{
+  for (;;)
+  {
+    UInt64 type;
+    RINOK(ReadID(sd, &type));
+    if (type == id)
+      return SZ_OK;
+    if (type == k7zIdEnd)
+      return SZ_ERROR_ARCHIVE;
+    RINOK(SkipData(sd));
+  }
+}
+
+static SRes RememberBitVector(CSzData *sd, UInt32 numItems, const Byte **v)
+{
+  UInt32 numBytes = (numItems + 7) >> 3;
+  if (numBytes > sd->Size)
+    return SZ_ERROR_ARCHIVE;
+  *v = sd->Data;
+  SKIP_DATA(sd, numBytes);
+  return SZ_OK;
+}
+
+static UInt32 CountDefinedBits(const Byte *bits, UInt32 numItems)
+{
+  Byte b = 0;
+  unsigned m = 0;
+  UInt32 sum = 0;
+  for (; numItems != 0; numItems--)
+  {
+    if (m == 0)
+    {
+      b = *bits++;
+      m = 8;
+    }
+    m--;
+    sum += ((b >> m) & 1);
+  }
+  return sum;
+}
+
+static MY_NO_INLINE SRes ReadBitVector(CSzData *sd, UInt32 numItems, Byte **v, ISzAllocPtr alloc)
+{
+  Byte allAreDefined;
+  Byte *v2;
+  UInt32 numBytes = (numItems + 7) >> 3;
+  *v = NULL;
+  SZ_READ_BYTE(allAreDefined);
+  if (numBytes == 0)
+    return SZ_OK;
+  if (allAreDefined == 0)
+  {
+    if (numBytes > sd->Size)
+      return SZ_ERROR_ARCHIVE;
+    MY_ALLOC_AND_CPY(*v, numBytes, sd->Data, alloc);
+    SKIP_DATA(sd, numBytes);
+    return SZ_OK;
+  }
+  MY_ALLOC(Byte, *v, numBytes, alloc);
+  v2 = *v;
+  memset(v2, 0xFF, (size_t)numBytes);
+  {
+    unsigned numBits = (unsigned)numItems & 7;
+    if (numBits != 0)
+      v2[(size_t)numBytes - 1] = (Byte)((((UInt32)1 << numBits) - 1) << (8 - numBits));
+  }
+  return SZ_OK;
+}
+
+static MY_NO_INLINE SRes ReadUi32s(CSzData *sd2, UInt32 numItems, CSzBitUi32s *crcs, ISzAllocPtr alloc)
+{
+  UInt32 i;
+  CSzData sd;
+  UInt32 *vals;
+  const Byte *defs;
+  MY_ALLOC_ZE(UInt32, crcs->Vals, numItems, alloc);
+  sd = *sd2;
+  defs = crcs->Defs;
+  vals = crcs->Vals;
+  for (i = 0; i < numItems; i++)
+    if (SzBitArray_Check(defs, i))
+    {
+      SZ_READ_32(vals[i]);
+    }
+    else
+      vals[i] = 0;
+  *sd2 = sd;
+  return SZ_OK;
+}
+
+static SRes ReadBitUi32s(CSzData *sd, UInt32 numItems, CSzBitUi32s *crcs, ISzAllocPtr alloc)
+{
+  SzBitUi32s_Free(crcs, alloc);
+  RINOK(ReadBitVector(sd, numItems, &crcs->Defs, alloc));
+  return ReadUi32s(sd, numItems, crcs, alloc);
+}
+
+static SRes SkipBitUi32s(CSzData *sd, UInt32 numItems)
+{
+  Byte allAreDefined;
+  UInt32 numDefined = numItems;
+  SZ_READ_BYTE(allAreDefined);
+  if (!allAreDefined)
+  {
+    size_t numBytes = (numItems + 7) >> 3;
+    if (numBytes > sd->Size)
+      return SZ_ERROR_ARCHIVE;
+    numDefined = CountDefinedBits(sd->Data, numItems);
+    SKIP_DATA(sd, numBytes);
+  }
+  if (numDefined > (sd->Size >> 2))
+    return SZ_ERROR_ARCHIVE;
+  SKIP_DATA(sd, (size_t)numDefined * 4);
+  return SZ_OK;
+}
+
+static SRes ReadPackInfo(CSzAr *p, CSzData *sd, ISzAllocPtr alloc)
+{
+  RINOK(SzReadNumber32(sd, &p->NumPackStreams));
+
+  RINOK(WaitId(sd, k7zIdSize));
+  MY_ALLOC(UInt64, p->PackPositions, (size_t)p->NumPackStreams + 1, alloc);
+  {
+    UInt64 sum = 0;
+    UInt32 i;
+    UInt32 numPackStreams = p->NumPackStreams;
+    for (i = 0; i < numPackStreams; i++)
+    {
+      UInt64 packSize;
+      p->PackPositions[i] = sum;
+      RINOK(ReadNumber(sd, &packSize));
+      sum += packSize;
+      if (sum < packSize)
+        return SZ_ERROR_ARCHIVE;
+    }
+    p->PackPositions[i] = sum;
+  }
+
+  for (;;)
+  {
+    UInt64 type;
+    RINOK(ReadID(sd, &type));
+    if (type == k7zIdEnd)
+      return SZ_OK;
+    if (type == k7zIdCRC)
+    {
+      /* CRC of packed streams is unused now */
+      RINOK(SkipBitUi32s(sd, p->NumPackStreams));
+      continue;
+    }
+    RINOK(SkipData(sd));
+  }
+}
+
+/*
+static SRes SzReadSwitch(CSzData *sd)
+{
+  Byte external;
+  RINOK(SzReadByte(sd, &external));
+  return (external == 0) ? SZ_OK: SZ_ERROR_UNSUPPORTED;
+}
+*/
+
+#define k_NumCodersStreams_in_Folder_MAX (SZ_NUM_BONDS_IN_FOLDER_MAX + SZ_NUM_PACK_STREAMS_IN_FOLDER_MAX)
+
+SRes SzGetNextFolderItem(CSzFolder *f, CSzData *sd)
+{
+  UInt32 numCoders, i;
+  UInt32 numInStreams = 0;
+  const Byte *dataStart = sd->Data;
+
+  f->NumCoders = 0;
+  f->NumBonds = 0;
+  f->NumPackStreams = 0;
+  f->UnpackStream = 0;
+  
+  RINOK(SzReadNumber32(sd, &numCoders));
+  if (numCoders == 0 || numCoders > SZ_NUM_CODERS_IN_FOLDER_MAX)
+    return SZ_ERROR_UNSUPPORTED;
+  
+  for (i = 0; i < numCoders; i++)
+  {
+    Byte mainByte;
+    CSzCoderInfo *coder = f->Coders + i;
+    unsigned idSize, j;
+    UInt64 id;
+    
+    SZ_READ_BYTE(mainByte);
+    if ((mainByte & 0xC0) != 0)
+      return SZ_ERROR_UNSUPPORTED;
+    
+    idSize = (unsigned)(mainByte & 0xF);
+    if (idSize > sizeof(id))
+      return SZ_ERROR_UNSUPPORTED;
+    if (idSize > sd->Size)
+      return SZ_ERROR_ARCHIVE;
+    id = 0;
+    for (j = 0; j < idSize; j++)
+    {
+      id = ((id << 8) | *sd->Data);
+      sd->Data++;
+      sd->Size--;
+    }
+    if (id > (UInt32)0xFFFFFFFF)
+      return SZ_ERROR_UNSUPPORTED;
+    coder->MethodID = (UInt32)id;
+    
+    coder->NumStreams = 1;
+    coder->PropsOffset = 0;
+    coder->PropsSize = 0;
+    
+    if ((mainByte & 0x10) != 0)
+    {
+      UInt32 numStreams;
+      
+      RINOK(SzReadNumber32(sd, &numStreams));
+      if (numStreams > k_NumCodersStreams_in_Folder_MAX)
+        return SZ_ERROR_UNSUPPORTED;
+      coder->NumStreams = (Byte)numStreams;
+
+      RINOK(SzReadNumber32(sd, &numStreams));
+      if (numStreams != 1)
+        return SZ_ERROR_UNSUPPORTED;
+    }
+
+    numInStreams += coder->NumStreams;
+
+    if (numInStreams > k_NumCodersStreams_in_Folder_MAX)
+      return SZ_ERROR_UNSUPPORTED;
+
+    if ((mainByte & 0x20) != 0)
+    {
+      UInt32 propsSize = 0;
+      RINOK(SzReadNumber32(sd, &propsSize));
+      if (propsSize > sd->Size)
+        return SZ_ERROR_ARCHIVE;
+      if (propsSize >= 0x80)
+        return SZ_ERROR_UNSUPPORTED;
+      coder->PropsOffset = sd->Data - dataStart;
+      coder->PropsSize = (Byte)propsSize;
+      sd->Data += (size_t)propsSize;
+      sd->Size -= (size_t)propsSize;
+    }
+  }
+
+  /*
+  if (numInStreams == 1 && numCoders == 1)
+  {
+    f->NumPackStreams = 1;
+    f->PackStreams[0] = 0;
+  }
+  else
+  */
+  {
+    Byte streamUsed[k_NumCodersStreams_in_Folder_MAX];
+    UInt32 numBonds, numPackStreams;
+    
+    numBonds = numCoders - 1;
+    if (numInStreams < numBonds)
+      return SZ_ERROR_ARCHIVE;
+    if (numBonds > SZ_NUM_BONDS_IN_FOLDER_MAX)
+      return SZ_ERROR_UNSUPPORTED;
+    f->NumBonds = numBonds;
+    
+    numPackStreams = numInStreams - numBonds;
+    if (numPackStreams > SZ_NUM_PACK_STREAMS_IN_FOLDER_MAX)
+      return SZ_ERROR_UNSUPPORTED;
+    f->NumPackStreams = numPackStreams;
+  
+    for (i = 0; i < numInStreams; i++)
+      streamUsed[i] = False;
+    
+    if (numBonds != 0)
+    {
+      Byte coderUsed[SZ_NUM_CODERS_IN_FOLDER_MAX];
+
+      for (i = 0; i < numCoders; i++)
+        coderUsed[i] = False;
+      
+      for (i = 0; i < numBonds; i++)
+      {
+        CSzBond *bp = f->Bonds + i;
+        
+        RINOK(SzReadNumber32(sd, &bp->InIndex));
+        if (bp->InIndex >= numInStreams || streamUsed[bp->InIndex])
+          return SZ_ERROR_ARCHIVE;
+        streamUsed[bp->InIndex] = True;
+        
+        RINOK(SzReadNumber32(sd, &bp->OutIndex));
+        if (bp->OutIndex >= numCoders || coderUsed[bp->OutIndex])
+          return SZ_ERROR_ARCHIVE;
+        coderUsed[bp->OutIndex] = True;
+      }
+      
+      for (i = 0; i < numCoders; i++)
+        if (!coderUsed[i])
+        {
+          f->UnpackStream = i;
+          break;
+        }
+      
+      if (i == numCoders)
+        return SZ_ERROR_ARCHIVE;
+    }
+    
+    if (numPackStreams == 1)
+    {
+      for (i = 0; i < numInStreams; i++)
+        if (!streamUsed[i])
+          break;
+      if (i == numInStreams)
+        return SZ_ERROR_ARCHIVE;
+      f->PackStreams[0] = i;
+    }
+    else
+      for (i = 0; i < numPackStreams; i++)
+      {
+        UInt32 index;
+        RINOK(SzReadNumber32(sd, &index));
+        if (index >= numInStreams || streamUsed[index])
+          return SZ_ERROR_ARCHIVE;
+        streamUsed[index] = True;
+        f->PackStreams[i] = index;
+      }
+  }
+
+  f->NumCoders = numCoders;
+
+  return SZ_OK;
+}
+
+
+static MY_NO_INLINE SRes SkipNumbers(CSzData *sd2, UInt32 num)
+{
+  CSzData sd;
+  sd = *sd2;
+  for (; num != 0; num--)
+  {
+    Byte firstByte, mask;
+    unsigned i;
+    SZ_READ_BYTE_2(firstByte);
+    if ((firstByte & 0x80) == 0)
+      continue;
+    if ((firstByte & 0x40) == 0)
+    {
+      if (sd.Size == 0)
+        return SZ_ERROR_ARCHIVE;
+      sd.Size--;
+      sd.Data++;
+      continue;
+    }
+    mask = 0x20;
+    for (i = 2; i < 8 && (firstByte & mask) != 0; i++)
+      mask >>= 1;
+    if (i > sd.Size)
+      return SZ_ERROR_ARCHIVE;
+    SKIP_DATA2(sd, i);
+  }
+  *sd2 = sd;
+  return SZ_OK;
+}
+
+
+#define k_Scan_NumCoders_MAX 64
+#define k_Scan_NumCodersStreams_in_Folder_MAX 64
+
+
+static SRes ReadUnpackInfo(CSzAr *p,
+    CSzData *sd2,
+    UInt32 numFoldersMax,
+    const CBuf *tempBufs, UInt32 numTempBufs,
+    ISzAllocPtr alloc)
+{
+  CSzData sd;
+  
+  UInt32 fo, numFolders, numCodersOutStreams, packStreamIndex;
+  const Byte *startBufPtr;
+  Byte external;
+  
+  RINOK(WaitId(sd2, k7zIdFolder));
+  
+  RINOK(SzReadNumber32(sd2, &numFolders));
+  if (numFolders > numFoldersMax)
+    return SZ_ERROR_UNSUPPORTED;
+  p->NumFolders = numFolders;
+
+  SZ_READ_BYTE_SD(sd2, external);
+  if (external == 0)
+    sd = *sd2;
+  else
+  {
+    UInt32 index;
+    RINOK(SzReadNumber32(sd2, &index));
+    if (index >= numTempBufs)
+      return SZ_ERROR_ARCHIVE;
+    sd.Data = tempBufs[index].data;
+    sd.Size = tempBufs[index].size;
+  }
+  
+  MY_ALLOC(size_t, p->FoCodersOffsets, (size_t)numFolders + 1, alloc);
+  MY_ALLOC(UInt32, p->FoStartPackStreamIndex, (size_t)numFolders + 1, alloc);
+  MY_ALLOC(UInt32, p->FoToCoderUnpackSizes, (size_t)numFolders + 1, alloc);
+  MY_ALLOC_ZE(Byte, p->FoToMainUnpackSizeIndex, (size_t)numFolders, alloc);
+  
+  startBufPtr = sd.Data;
+  
+  packStreamIndex = 0;
+  numCodersOutStreams = 0;
+
+  for (fo = 0; fo < numFolders; fo++)
+  {
+    UInt32 numCoders, ci, numInStreams = 0;
+    
+    p->FoCodersOffsets[fo] = sd.Data - startBufPtr;
+    
+    RINOK(SzReadNumber32(&sd, &numCoders));
+    if (numCoders == 0 || numCoders > k_Scan_NumCoders_MAX)
+      return SZ_ERROR_UNSUPPORTED;
+    
+    for (ci = 0; ci < numCoders; ci++)
+    {
+      Byte mainByte;
+      unsigned idSize;
+      UInt32 coderInStreams;
+      
+      SZ_READ_BYTE_2(mainByte);
+      if ((mainByte & 0xC0) != 0)
+        return SZ_ERROR_UNSUPPORTED;
+      idSize = (mainByte & 0xF);
+      if (idSize > 8)
+        return SZ_ERROR_UNSUPPORTED;
+      if (idSize > sd.Size)
+        return SZ_ERROR_ARCHIVE;
+      SKIP_DATA2(sd, idSize);
+      
+      coderInStreams = 1;
+      
+      if ((mainByte & 0x10) != 0)
+      {
+        UInt32 coderOutStreams;
+        RINOK(SzReadNumber32(&sd, &coderInStreams));
+        RINOK(SzReadNumber32(&sd, &coderOutStreams));
+        if (coderInStreams > k_Scan_NumCodersStreams_in_Folder_MAX || coderOutStreams != 1)
+          return SZ_ERROR_UNSUPPORTED;
+      }
+      
+      numInStreams += coderInStreams;
+
+      if ((mainByte & 0x20) != 0)
+      {
+        UInt32 propsSize;
+        RINOK(SzReadNumber32(&sd, &propsSize));
+        if (propsSize > sd.Size)
+          return SZ_ERROR_ARCHIVE;
+        SKIP_DATA2(sd, propsSize);
+      }
+    }
+    
+    {
+      UInt32 indexOfMainStream = 0;
+      UInt32 numPackStreams = 1;
+      
+      if (numCoders != 1 || numInStreams != 1)
+      {
+        Byte streamUsed[k_Scan_NumCodersStreams_in_Folder_MAX];
+        Byte coderUsed[k_Scan_NumCoders_MAX];
+    
+        UInt32 i;
+        UInt32 numBonds = numCoders - 1;
+        if (numInStreams < numBonds)
+          return SZ_ERROR_ARCHIVE;
+        
+        if (numInStreams > k_Scan_NumCodersStreams_in_Folder_MAX)
+          return SZ_ERROR_UNSUPPORTED;
+        
+        for (i = 0; i < numInStreams; i++)
+          streamUsed[i] = False;
+        for (i = 0; i < numCoders; i++)
+          coderUsed[i] = False;
+        
+        for (i = 0; i < numBonds; i++)
+        {
+          UInt32 index;
+          
+          RINOK(SzReadNumber32(&sd, &index));
+          if (index >= numInStreams || streamUsed[index])
+            return SZ_ERROR_ARCHIVE;
+          streamUsed[index] = True;
+          
+          RINOK(SzReadNumber32(&sd, &index));
+          if (index >= numCoders || coderUsed[index])
+            return SZ_ERROR_ARCHIVE;
+          coderUsed[index] = True;
+        }
+        
+        numPackStreams = numInStreams - numBonds;
+        
+        if (numPackStreams != 1)
+          for (i = 0; i < numPackStreams; i++)
+          {
+            UInt32 index;
+            RINOK(SzReadNumber32(&sd, &index));
+            if (index >= numInStreams || streamUsed[index])
+              return SZ_ERROR_ARCHIVE;
+            streamUsed[index] = True;
+          }
+          
+        for (i = 0; i < numCoders; i++)
+          if (!coderUsed[i])
+          {
+            indexOfMainStream = i;
+            break;
+          }
+ 
+        if (i == numCoders)
+          return SZ_ERROR_ARCHIVE;
+      }
+      
+      p->FoStartPackStreamIndex[fo] = packStreamIndex;
+      p->FoToCoderUnpackSizes[fo] = numCodersOutStreams;
+      p->FoToMainUnpackSizeIndex[fo] = (Byte)indexOfMainStream;
+      numCodersOutStreams += numCoders;
+      if (numCodersOutStreams < numCoders)
+        return SZ_ERROR_UNSUPPORTED;
+      if (numPackStreams > p->NumPackStreams - packStreamIndex)
+        return SZ_ERROR_ARCHIVE;
+      packStreamIndex += numPackStreams;
+    }
+  }
+
+  p->FoToCoderUnpackSizes[fo] = numCodersOutStreams;
+  
+  {
+    size_t dataSize = sd.Data - startBufPtr;
+    p->FoStartPackStreamIndex[fo] = packStreamIndex;
+    p->FoCodersOffsets[fo] = dataSize;
+    MY_ALLOC_ZE_AND_CPY(p->CodersData, dataSize, startBufPtr, alloc);
+  }
+  
+  if (external != 0)
+  {
+    if (sd.Size != 0)
+      return SZ_ERROR_ARCHIVE;
+    sd = *sd2;
+  }
+  
+  RINOK(WaitId(&sd, k7zIdCodersUnpackSize));
+  
+  MY_ALLOC_ZE(UInt64, p->CoderUnpackSizes, (size_t)numCodersOutStreams, alloc);
+  {
+    UInt32 i;
+    for (i = 0; i < numCodersOutStreams; i++)
+    {
+      RINOK(ReadNumber(&sd, p->CoderUnpackSizes + i));
+    }
+  }
+
+  for (;;)
+  {
+    UInt64 type;
+    RINOK(ReadID(&sd, &type));
+    if (type == k7zIdEnd)
+    {
+      *sd2 = sd;
+      return SZ_OK;
+    }
+    if (type == k7zIdCRC)
+    {
+      RINOK(ReadBitUi32s(&sd, numFolders, &p->FolderCRCs, alloc));
+      continue;
+    }
+    RINOK(SkipData(&sd));
+  }
+}
+
+
+UInt64 SzAr_GetFolderUnpackSize(const CSzAr *p, UInt32 folderIndex)
+{
+  return p->CoderUnpackSizes[p->FoToCoderUnpackSizes[folderIndex] + p->FoToMainUnpackSizeIndex[folderIndex]];
+}
+
+
+typedef struct
+{
+  UInt32 NumTotalSubStreams;
+  UInt32 NumSubDigests;
+  CSzData sdNumSubStreams;
+  CSzData sdSizes;
+  CSzData sdCRCs;
+} CSubStreamInfo;
+
+
+static SRes ReadSubStreamsInfo(CSzAr *p, CSzData *sd, CSubStreamInfo *ssi)
+{
+  UInt64 type = 0;
+  UInt32 numSubDigests = 0;
+  UInt32 numFolders = p->NumFolders;
+  UInt32 numUnpackStreams = numFolders;
+  UInt32 numUnpackSizesInData = 0;
+
+  for (;;)
+  {
+    RINOK(ReadID(sd, &type));
+    if (type == k7zIdNumUnpackStream)
+    {
+      UInt32 i;
+      ssi->sdNumSubStreams.Data = sd->Data;
+      numUnpackStreams = 0;
+      numSubDigests = 0;
+      for (i = 0; i < numFolders; i++)
+      {
+        UInt32 numStreams;
+        RINOK(SzReadNumber32(sd, &numStreams));
+        if (numUnpackStreams > numUnpackStreams + numStreams)
+          return SZ_ERROR_UNSUPPORTED;
+        numUnpackStreams += numStreams;
+        if (numStreams != 0)
+          numUnpackSizesInData += (numStreams - 1);
+        if (numStreams != 1 || !SzBitWithVals_Check(&p->FolderCRCs, i))
+          numSubDigests += numStreams;
+      }
+      ssi->sdNumSubStreams.Size = sd->Data - ssi->sdNumSubStreams.Data;
+      continue;
+    }
+    if (type == k7zIdCRC || type == k7zIdSize || type == k7zIdEnd)
+      break;
+    RINOK(SkipData(sd));
+  }
+
+  if (!ssi->sdNumSubStreams.Data)
+  {
+    numSubDigests = numFolders;
+    if (p->FolderCRCs.Defs)
+      numSubDigests = numFolders - CountDefinedBits(p->FolderCRCs.Defs, numFolders);
+  }
+  
+  ssi->NumTotalSubStreams = numUnpackStreams;
+  ssi->NumSubDigests = numSubDigests;
+
+  if (type == k7zIdSize)
+  {
+    ssi->sdSizes.Data = sd->Data;
+    RINOK(SkipNumbers(sd, numUnpackSizesInData));
+    ssi->sdSizes.Size = sd->Data - ssi->sdSizes.Data;
+    RINOK(ReadID(sd, &type));
+  }
+
+  for (;;)
+  {
+    if (type == k7zIdEnd)
+      return SZ_OK;
+    if (type == k7zIdCRC)
+    {
+      ssi->sdCRCs.Data = sd->Data;
+      RINOK(SkipBitUi32s(sd, numSubDigests));
+      ssi->sdCRCs.Size = sd->Data - ssi->sdCRCs.Data;
+    }
+    else
+    {
+      RINOK(SkipData(sd));
+    }
+    RINOK(ReadID(sd, &type));
+  }
+}
+
+static SRes SzReadStreamsInfo(CSzAr *p,
+    CSzData *sd,
+    UInt32 numFoldersMax, const CBuf *tempBufs, UInt32 numTempBufs,
+    UInt64 *dataOffset,
+    CSubStreamInfo *ssi,
+    ISzAllocPtr alloc)
+{
+  UInt64 type;
+
+  SzData_Clear(&ssi->sdSizes);
+  SzData_Clear(&ssi->sdCRCs);
+  SzData_Clear(&ssi->sdNumSubStreams);
+
+  *dataOffset = 0;
+  RINOK(ReadID(sd, &type));
+  if (type == k7zIdPackInfo)
+  {
+    RINOK(ReadNumber(sd, dataOffset));
+    RINOK(ReadPackInfo(p, sd, alloc));
+    RINOK(ReadID(sd, &type));
+  }
+  if (type == k7zIdUnpackInfo)
+  {
+    RINOK(ReadUnpackInfo(p, sd, numFoldersMax, tempBufs, numTempBufs, alloc));
+    RINOK(ReadID(sd, &type));
+  }
+  if (type == k7zIdSubStreamsInfo)
+  {
+    RINOK(ReadSubStreamsInfo(p, sd, ssi));
+    RINOK(ReadID(sd, &type));
+  }
+  else
+  {
+    ssi->NumTotalSubStreams = p->NumFolders;
+    // ssi->NumSubDigests = 0;
+  }
+
+  return (type == k7zIdEnd ? SZ_OK : SZ_ERROR_UNSUPPORTED);
+}
+
+static SRes SzReadAndDecodePackedStreams(
+    ILookInStream *inStream,
+    CSzData *sd,
+    CBuf *tempBufs,
+    UInt32 numFoldersMax,
+    UInt64 baseOffset,
+    CSzAr *p,
+    ISzAllocPtr allocTemp)
+{
+  UInt64 dataStartPos;
+  UInt32 fo;
+  CSubStreamInfo ssi;
+
+  RINOK(SzReadStreamsInfo(p, sd, numFoldersMax, NULL, 0, &dataStartPos, &ssi, allocTemp));
+  
+  dataStartPos += baseOffset;
+  if (p->NumFolders == 0)
+    return SZ_ERROR_ARCHIVE;
+ 
+  for (fo = 0; fo < p->NumFolders; fo++)
+    Buf_Init(tempBufs + fo);
+  
+  for (fo = 0; fo < p->NumFolders; fo++)
+  {
+    CBuf *tempBuf = tempBufs + fo;
+    UInt64 unpackSize = SzAr_GetFolderUnpackSize(p, fo);
+    if ((size_t)unpackSize != unpackSize)
+      return SZ_ERROR_MEM;
+    if (!Buf_Create(tempBuf, (size_t)unpackSize, allocTemp))
+      return SZ_ERROR_MEM;
+  }
+  
+  for (fo = 0; fo < p->NumFolders; fo++)
+  {
+    const CBuf *tempBuf = tempBufs + fo;
+    RINOK(LookInStream_SeekTo(inStream, dataStartPos));
+    RINOK(SzAr_DecodeFolder(p, fo, inStream, dataStartPos, tempBuf->data, tempBuf->size, allocTemp));
+  }
+  
+  return SZ_OK;
+}
+
+static SRes SzReadFileNames(const Byte *data, size_t size, UInt32 numFiles, size_t *offsets)
+{
+  size_t pos = 0;
+  *offsets++ = 0;
+  if (numFiles == 0)
+    return (size == 0) ? SZ_OK : SZ_ERROR_ARCHIVE;
+  if (size < 2)
+    return SZ_ERROR_ARCHIVE;
+  if (data[size - 2] != 0 || data[size - 1] != 0)
+    return SZ_ERROR_ARCHIVE;
+  do
+  {
+    const Byte *p;
+    if (pos == size)
+      return SZ_ERROR_ARCHIVE;
+    for (p = data + pos;
+      #ifdef _WIN32
+      *(const UInt16 *)p != 0
+      #else
+      p[0] != 0 || p[1] != 0
+      #endif
+      ; p += 2);
+    pos = p - data + 2;
+    *offsets++ = (pos >> 1);
+  }
+  while (--numFiles);
+  return (pos == size) ? SZ_OK : SZ_ERROR_ARCHIVE;
+}
+
+static MY_NO_INLINE SRes ReadTime(CSzBitUi64s *p, UInt32 num,
+    CSzData *sd2,
+    const CBuf *tempBufs, UInt32 numTempBufs,
+    ISzAllocPtr alloc)
+{
+  CSzData sd;
+  UInt32 i;
+  CNtfsFileTime *vals;
+  Byte *defs;
+  Byte external;
+  
+  RINOK(ReadBitVector(sd2, num, &p->Defs, alloc));
+  
+  SZ_READ_BYTE_SD(sd2, external);
+  if (external == 0)
+    sd = *sd2;
+  else
+  {
+    UInt32 index;
+    RINOK(SzReadNumber32(sd2, &index));
+    if (index >= numTempBufs)
+      return SZ_ERROR_ARCHIVE;
+    sd.Data = tempBufs[index].data;
+    sd.Size = tempBufs[index].size;
+  }
+  
+  MY_ALLOC_ZE(CNtfsFileTime, p->Vals, num, alloc);
+  vals = p->Vals;
+  defs = p->Defs;
+  for (i = 0; i < num; i++)
+    if (SzBitArray_Check(defs, i))
+    {
+      if (sd.Size < 8)
+        return SZ_ERROR_ARCHIVE;
+      vals[i].Low = GetUi32(sd.Data);
+      vals[i].High = GetUi32(sd.Data + 4);
+      SKIP_DATA2(sd, 8);
+    }
+    else
+      vals[i].High = vals[i].Low = 0;
+  
+  if (external == 0)
+    *sd2 = sd;
+  
+  return SZ_OK;
+}
+
+
+#define NUM_ADDITIONAL_STREAMS_MAX 8
+
+
+static SRes SzReadHeader2(
+    CSzArEx *p,   /* allocMain */
+    CSzData *sd,
+    ILookInStream *inStream,
+    CBuf *tempBufs, UInt32 *numTempBufs,
+    ISzAllocPtr allocMain,
+    ISzAllocPtr allocTemp
+    )
+{
+  CSubStreamInfo ssi;
+
+{
+  UInt64 type;
+  
+  SzData_Clear(&ssi.sdSizes);
+  SzData_Clear(&ssi.sdCRCs);
+  SzData_Clear(&ssi.sdNumSubStreams);
+
+  ssi.NumSubDigests = 0;
+  ssi.NumTotalSubStreams = 0;
+
+  RINOK(ReadID(sd, &type));
+
+  if (type == k7zIdArchiveProperties)
+  {
+    for (;;)
+    {
+      UInt64 type2;
+      RINOK(ReadID(sd, &type2));
+      if (type2 == k7zIdEnd)
+        break;
+      RINOK(SkipData(sd));
+    }
+    RINOK(ReadID(sd, &type));
+  }
+
+  if (type == k7zIdAdditionalStreamsInfo)
+  {
+    CSzAr tempAr;
+    SRes res;
+    
+    SzAr_Init(&tempAr);
+    res = SzReadAndDecodePackedStreams(inStream, sd, tempBufs, NUM_ADDITIONAL_STREAMS_MAX,
+        p->startPosAfterHeader, &tempAr, allocTemp);
+    *numTempBufs = tempAr.NumFolders;
+    SzAr_Free(&tempAr, allocTemp);
+    
+    if (res != SZ_OK)
+      return res;
+    RINOK(ReadID(sd, &type));
+  }
+
+  if (type == k7zIdMainStreamsInfo)
+  {
+    RINOK(SzReadStreamsInfo(&p->db, sd, (UInt32)1 << 30, tempBufs, *numTempBufs,
+        &p->dataPos, &ssi, allocMain));
+    p->dataPos += p->startPosAfterHeader;
+    RINOK(ReadID(sd, &type));
+  }
+
+  if (type == k7zIdEnd)
+  {
+    return SZ_OK;
+  }
+
+  if (type != k7zIdFilesInfo)
+    return SZ_ERROR_ARCHIVE;
+}
+
+{
+  UInt32 numFiles = 0;
+  UInt32 numEmptyStreams = 0;
+  const Byte *emptyStreams = NULL;
+  const Byte *emptyFiles = NULL;
+  
+  RINOK(SzReadNumber32(sd, &numFiles));
+  p->NumFiles = numFiles;
+
+  for (;;)
+  {
+    UInt64 type;
+    UInt64 size;
+    RINOK(ReadID(sd, &type));
+    if (type == k7zIdEnd)
+      break;
+    RINOK(ReadNumber(sd, &size));
+    if (size > sd->Size)
+      return SZ_ERROR_ARCHIVE;
+    
+    if (type >= ((UInt32)1 << 8))
+    {
+      SKIP_DATA(sd, size);
+    }
+    else switch ((unsigned)type)
+    {
+      case k7zIdName:
+      {
+        size_t namesSize;
+        const Byte *namesData;
+        Byte external;
+
+        SZ_READ_BYTE(external);
+        if (external == 0)
+        {
+          namesSize = (size_t)size - 1;
+          namesData = sd->Data;
+        }
+        else
+        {
+          UInt32 index;
+          RINOK(SzReadNumber32(sd, &index));
+          if (index >= *numTempBufs)
+            return SZ_ERROR_ARCHIVE;
+          namesData = (tempBufs)[index].data;
+          namesSize = (tempBufs)[index].size;
+        }
+
+        if ((namesSize & 1) != 0)
+          return SZ_ERROR_ARCHIVE;
+        MY_ALLOC(size_t, p->FileNameOffsets, numFiles + 1, allocMain);
+        MY_ALLOC_ZE_AND_CPY(p->FileNames, namesSize, namesData, allocMain);
+        RINOK(SzReadFileNames(p->FileNames, namesSize, numFiles, p->FileNameOffsets))
+        if (external == 0)
+        {
+          SKIP_DATA(sd, namesSize);
+        }
+        break;
+      }
+      case k7zIdEmptyStream:
+      {
+        RINOK(RememberBitVector(sd, numFiles, &emptyStreams));
+        numEmptyStreams = CountDefinedBits(emptyStreams, numFiles);
+        emptyFiles = NULL;
+        break;
+      }
+      case k7zIdEmptyFile:
+      {
+        RINOK(RememberBitVector(sd, numEmptyStreams, &emptyFiles));
+        break;
+      }
+      case k7zIdWinAttrib:
+      {
+        Byte external;
+        CSzData sdSwitch;
+        CSzData *sdPtr;
+        SzBitUi32s_Free(&p->Attribs, allocMain);
+        RINOK(ReadBitVector(sd, numFiles, &p->Attribs.Defs, allocMain));
+
+        SZ_READ_BYTE(external);
+        if (external == 0)
+          sdPtr = sd;
+        else
+        {
+          UInt32 index;
+          RINOK(SzReadNumber32(sd, &index));
+          if (index >= *numTempBufs)
+            return SZ_ERROR_ARCHIVE;
+          sdSwitch.Data = (tempBufs)[index].data;
+          sdSwitch.Size = (tempBufs)[index].size;
+          sdPtr = &sdSwitch;
+        }
+        RINOK(ReadUi32s(sdPtr, numFiles, &p->Attribs, allocMain));
+        break;
+      }
+      /*
+      case k7zParent:
+      {
+        SzBitUi32s_Free(&p->Parents, allocMain);
+        RINOK(ReadBitVector(sd, numFiles, &p->Parents.Defs, allocMain));
+        RINOK(SzReadSwitch(sd));
+        RINOK(ReadUi32s(sd, numFiles, &p->Parents, allocMain));
+        break;
+      }
+      */
+      case k7zIdMTime: RINOK(ReadTime(&p->MTime, numFiles, sd, tempBufs, *numTempBufs, allocMain)); break;
+      case k7zIdCTime: RINOK(ReadTime(&p->CTime, numFiles, sd, tempBufs, *numTempBufs, allocMain)); break;
+      default:
+      {
+        SKIP_DATA(sd, size);
+      }
+    }
+  }
+
+  if (numFiles - numEmptyStreams != ssi.NumTotalSubStreams)
+    return SZ_ERROR_ARCHIVE;
+
+  for (;;)
+  {
+    UInt64 type;
+    RINOK(ReadID(sd, &type));
+    if (type == k7zIdEnd)
+      break;
+    RINOK(SkipData(sd));
+  }
+
+  {
+    UInt32 i;
+    UInt32 emptyFileIndex = 0;
+    UInt32 folderIndex = 0;
+    UInt32 remSubStreams = 0;
+    UInt32 numSubStreams = 0;
+    UInt64 unpackPos = 0;
+    const Byte *digestsDefs = NULL;
+    const Byte *digestsVals = NULL;
+    UInt32 digestsValsIndex = 0;
+    UInt32 digestIndex;
+    Byte allDigestsDefined = 0;
+    Byte isDirMask = 0;
+    Byte crcMask = 0;
+    Byte mask = 0x80;
+    
+    MY_ALLOC(UInt32, p->FolderToFile, p->db.NumFolders + 1, allocMain);
+    MY_ALLOC_ZE(UInt32, p->FileToFolder, p->NumFiles, allocMain);
+    MY_ALLOC(UInt64, p->UnpackPositions, p->NumFiles + 1, allocMain);
+    MY_ALLOC_ZE(Byte, p->IsDirs, (p->NumFiles + 7) >> 3, allocMain);
+
+    RINOK(SzBitUi32s_Alloc(&p->CRCs, p->NumFiles, allocMain));
+
+    if (ssi.sdCRCs.Size != 0)
+    {
+      SZ_READ_BYTE_SD(&ssi.sdCRCs, allDigestsDefined);
+      if (allDigestsDefined)
+        digestsVals = ssi.sdCRCs.Data;
+      else
+      {
+        size_t numBytes = (ssi.NumSubDigests + 7) >> 3;
+        digestsDefs = ssi.sdCRCs.Data;
+        digestsVals = digestsDefs + numBytes;
+      }
+    }
+
+    digestIndex = 0;
+    
+    for (i = 0; i < numFiles; i++, mask >>= 1)
+    {
+      if (mask == 0)
+      {
+        UInt32 byteIndex = (i - 1) >> 3;
+        p->IsDirs[byteIndex] = isDirMask;
+        p->CRCs.Defs[byteIndex] = crcMask;
+        isDirMask = 0;
+        crcMask = 0;
+        mask = 0x80;
+      }
+
+      p->UnpackPositions[i] = unpackPos;
+      p->CRCs.Vals[i] = 0;
+      
+      if (emptyStreams && SzBitArray_Check(emptyStreams, i))
+      {
+        if (emptyFiles)
+        {
+          if (!SzBitArray_Check(emptyFiles, emptyFileIndex))
+            isDirMask |= mask;
+          emptyFileIndex++;
+        }
+        else
+          isDirMask |= mask;
+        if (remSubStreams == 0)
+        {
+          p->FileToFolder[i] = (UInt32)-1;
+          continue;
+        }
+      }
+      
+      if (remSubStreams == 0)
+      {
+        for (;;)
+        {
+          if (folderIndex >= p->db.NumFolders)
+            return SZ_ERROR_ARCHIVE;
+          p->FolderToFile[folderIndex] = i;
+          numSubStreams = 1;
+          if (ssi.sdNumSubStreams.Data)
+          {
+            RINOK(SzReadNumber32(&ssi.sdNumSubStreams, &numSubStreams));
+          }
+          remSubStreams = numSubStreams;
+          if (numSubStreams != 0)
+            break;
+          {
+            UInt64 folderUnpackSize = SzAr_GetFolderUnpackSize(&p->db, folderIndex);
+            unpackPos += folderUnpackSize;
+            if (unpackPos < folderUnpackSize)
+              return SZ_ERROR_ARCHIVE;
+          }
+
+          folderIndex++;
+        }
+      }
+      
+      p->FileToFolder[i] = folderIndex;
+      
+      if (emptyStreams && SzBitArray_Check(emptyStreams, i))
+        continue;
+      
+      if (--remSubStreams == 0)
+      {
+        UInt64 folderUnpackSize = SzAr_GetFolderUnpackSize(&p->db, folderIndex);
+        UInt64 startFolderUnpackPos = p->UnpackPositions[p->FolderToFile[folderIndex]];
+        if (folderUnpackSize < unpackPos - startFolderUnpackPos)
+          return SZ_ERROR_ARCHIVE;
+        unpackPos = startFolderUnpackPos + folderUnpackSize;
+        if (unpackPos < folderUnpackSize)
+          return SZ_ERROR_ARCHIVE;
+
+        if (numSubStreams == 1 && SzBitWithVals_Check(&p->db.FolderCRCs, i))
+        {
+          p->CRCs.Vals[i] = p->db.FolderCRCs.Vals[folderIndex];
+          crcMask |= mask;
+        }
+        else if (allDigestsDefined || (digestsDefs && SzBitArray_Check(digestsDefs, digestIndex)))
+        {
+          p->CRCs.Vals[i] = GetUi32(digestsVals + (size_t)digestsValsIndex * 4);
+          digestsValsIndex++;
+          crcMask |= mask;
+        }
+        
+        folderIndex++;
+      }
+      else
+      {
+        UInt64 v;
+        RINOK(ReadNumber(&ssi.sdSizes, &v));
+        unpackPos += v;
+        if (unpackPos < v)
+          return SZ_ERROR_ARCHIVE;
+        if (allDigestsDefined || (digestsDefs && SzBitArray_Check(digestsDefs, digestIndex)))
+        {
+          p->CRCs.Vals[i] = GetUi32(digestsVals + (size_t)digestsValsIndex * 4);
+          digestsValsIndex++;
+          crcMask |= mask;
+        }
+      }
+    }
+
+    if (mask != 0x80)
+    {
+      UInt32 byteIndex = (i - 1) >> 3;
+      p->IsDirs[byteIndex] = isDirMask;
+      p->CRCs.Defs[byteIndex] = crcMask;
+    }
+    
+    p->UnpackPositions[i] = unpackPos;
+
+    if (remSubStreams != 0)
+      return SZ_ERROR_ARCHIVE;
+
+    for (;;)
+    {
+      p->FolderToFile[folderIndex] = i;
+      if (folderIndex >= p->db.NumFolders)
+        break;
+      if (!ssi.sdNumSubStreams.Data)
+        return SZ_ERROR_ARCHIVE;
+      RINOK(SzReadNumber32(&ssi.sdNumSubStreams, &numSubStreams));
+      if (numSubStreams != 0)
+        return SZ_ERROR_ARCHIVE;
+      /*
+      {
+        UInt64 folderUnpackSize = SzAr_GetFolderUnpackSize(&p->db, folderIndex);
+        unpackPos += folderUnpackSize;
+        if (unpackPos < folderUnpackSize)
+          return SZ_ERROR_ARCHIVE;
+      }
+      */
+      folderIndex++;
+    }
+
+    if (ssi.sdNumSubStreams.Data && ssi.sdNumSubStreams.Size != 0)
+      return SZ_ERROR_ARCHIVE;
+  }
+}
+  return SZ_OK;
+}
+
+
+static SRes SzReadHeader(
+    CSzArEx *p,
+    CSzData *sd,
+    ILookInStream *inStream,
+    ISzAllocPtr allocMain,
+    ISzAllocPtr allocTemp)
+{
+  UInt32 i;
+  UInt32 numTempBufs = 0;
+  SRes res;
+  CBuf tempBufs[NUM_ADDITIONAL_STREAMS_MAX];
+
+  for (i = 0; i < NUM_ADDITIONAL_STREAMS_MAX; i++)
+    Buf_Init(tempBufs + i);
+  
+  res = SzReadHeader2(p, sd, inStream,
+      tempBufs, &numTempBufs,
+      allocMain, allocTemp);
+  
+  for (i = 0; i < NUM_ADDITIONAL_STREAMS_MAX; i++)
+    Buf_Free(tempBufs + i, allocTemp);
+
+  RINOK(res);
+
+  if (sd->Size != 0)
+    return SZ_ERROR_FAIL;
+
+  return res;
+}
+
+static SRes SzArEx_Open2(
+    CSzArEx *p,
+    ILookInStream *inStream,
+    ISzAllocPtr allocMain,
+    ISzAllocPtr allocTemp)
+{
+  Byte header[k7zStartHeaderSize];
+  Int64 startArcPos;
+  UInt64 nextHeaderOffset, nextHeaderSize;
+  size_t nextHeaderSizeT;
+  UInt32 nextHeaderCRC;
+  CBuf buf;
+  SRes res;
+
+  startArcPos = 0;
+  RINOK(ILookInStream_Seek(inStream, &startArcPos, SZ_SEEK_CUR));
+
+  RINOK(LookInStream_Read2(inStream, header, k7zStartHeaderSize, SZ_ERROR_NO_ARCHIVE));
+
+  if (!TestSignatureCandidate(header))
+    return SZ_ERROR_NO_ARCHIVE;
+  if (header[6] != k7zMajorVersion)
+    return SZ_ERROR_UNSUPPORTED;
+
+  nextHeaderOffset = GetUi64(header + 12);
+  nextHeaderSize = GetUi64(header + 20);
+  nextHeaderCRC = GetUi32(header + 28);
+
+  p->startPosAfterHeader = startArcPos + k7zStartHeaderSize;
+  
+  if (CrcCalc(header + 12, 20) != GetUi32(header + 8))
+    return SZ_ERROR_CRC;
+
+  nextHeaderSizeT = (size_t)nextHeaderSize;
+  if (nextHeaderSizeT != nextHeaderSize)
+    return SZ_ERROR_MEM;
+  if (nextHeaderSizeT == 0)
+    return SZ_OK;
+  if (nextHeaderOffset > nextHeaderOffset + nextHeaderSize ||
+      nextHeaderOffset > nextHeaderOffset + nextHeaderSize + k7zStartHeaderSize)
+    return SZ_ERROR_NO_ARCHIVE;
+
+  {
+    Int64 pos = 0;
+    RINOK(ILookInStream_Seek(inStream, &pos, SZ_SEEK_END));
+    if ((UInt64)pos < startArcPos + nextHeaderOffset ||
+        (UInt64)pos < startArcPos + k7zStartHeaderSize + nextHeaderOffset ||
+        (UInt64)pos < startArcPos + k7zStartHeaderSize + nextHeaderOffset + nextHeaderSize)
+      return SZ_ERROR_INPUT_EOF;
+  }
+
+  RINOK(LookInStream_SeekTo(inStream, startArcPos + k7zStartHeaderSize + nextHeaderOffset));
+
+  if (!Buf_Create(&buf, nextHeaderSizeT, allocTemp))
+    return SZ_ERROR_MEM;
+
+  res = LookInStream_Read(inStream, buf.data, nextHeaderSizeT);
+  
+  if (res == SZ_OK)
+  {
+    res = SZ_ERROR_ARCHIVE;
+    if (CrcCalc(buf.data, nextHeaderSizeT) == nextHeaderCRC)
+    {
+      CSzData sd;
+      UInt64 type;
+      sd.Data = buf.data;
+      sd.Size = buf.size;
+      
+      res = ReadID(&sd, &type);
+      
+      if (res == SZ_OK && type == k7zIdEncodedHeader)
+      {
+        CSzAr tempAr;
+        CBuf tempBuf;
+        Buf_Init(&tempBuf);
+        
+        SzAr_Init(&tempAr);
+        res = SzReadAndDecodePackedStreams(inStream, &sd, &tempBuf, 1, p->startPosAfterHeader, &tempAr, allocTemp);
+        SzAr_Free(&tempAr, allocTemp);
+       
+        if (res != SZ_OK)
+        {
+          Buf_Free(&tempBuf, allocTemp);
+        }
+        else
+        {
+          Buf_Free(&buf, allocTemp);
+          buf.data = tempBuf.data;
+          buf.size = tempBuf.size;
+          sd.Data = buf.data;
+          sd.Size = buf.size;
+          res = ReadID(&sd, &type);
+        }
+      }
+  
+      if (res == SZ_OK)
+      {
+        if (type == k7zIdHeader)
+        {
+          /*
+          CSzData sd2;
+          unsigned ttt;
+          for (ttt = 0; ttt < 40000; ttt++)
+          {
+            SzArEx_Free(p, allocMain);
+            sd2 = sd;
+            res = SzReadHeader(p, &sd2, inStream, allocMain, allocTemp);
+            if (res != SZ_OK)
+              break;
+          }
+          */
+          res = SzReadHeader(p, &sd, inStream, allocMain, allocTemp);
+        }
+        else
+          res = SZ_ERROR_UNSUPPORTED;
+      }
+    }
+  }
+ 
+  Buf_Free(&buf, allocTemp);
+  return res;
+}
+
+
+SRes SzArEx_Open(CSzArEx *p, ILookInStream *inStream,
+    ISzAllocPtr allocMain, ISzAllocPtr allocTemp)
+{
+  SRes res = SzArEx_Open2(p, inStream, allocMain, allocTemp);
+  if (res != SZ_OK)
+    SzArEx_Free(p, allocMain);
+  return res;
+}
+
+
+SRes SzArEx_Extract(
+    const CSzArEx *p,
+    ILookInStream *inStream,
+    UInt32 fileIndex,
+    UInt32 *blockIndex,
+    Byte **tempBuf,
+    size_t *outBufferSize,
+    size_t *offset,
+    size_t *outSizeProcessed,
+    ISzAllocPtr allocMain,
+    ISzAllocPtr allocTemp)
+{
+  UInt32 folderIndex = p->FileToFolder[fileIndex];
+  SRes res = SZ_OK;
+  
+  *offset = 0;
+  *outSizeProcessed = 0;
+  
+  if (folderIndex == (UInt32)-1)
+  {
+    ISzAlloc_Free(allocMain, *tempBuf);
+    *blockIndex = folderIndex;
+    *tempBuf = NULL;
+    *outBufferSize = 0;
+    return SZ_OK;
+  }
+
+  if (*tempBuf == NULL || *blockIndex != folderIndex)
+  {
+    UInt64 unpackSizeSpec = SzAr_GetFolderUnpackSize(&p->db, folderIndex);
+    /*
+    UInt64 unpackSizeSpec =
+        p->UnpackPositions[p->FolderToFile[(size_t)folderIndex + 1]] -
+        p->UnpackPositions[p->FolderToFile[folderIndex]];
+    */
+    size_t unpackSize = (size_t)unpackSizeSpec;
+
+    if (unpackSize != unpackSizeSpec)
+      return SZ_ERROR_MEM;
+    *blockIndex = folderIndex;
+    ISzAlloc_Free(allocMain, *tempBuf);
+    *tempBuf = NULL;
+    
+    if (res == SZ_OK)
+    {
+      *outBufferSize = unpackSize;
+      if (unpackSize != 0)
+      {
+        *tempBuf = (Byte *)ISzAlloc_Alloc(allocMain, unpackSize);
+        if (*tempBuf == NULL)
+          res = SZ_ERROR_MEM;
+      }
+  
+      if (res == SZ_OK)
+      {
+        res = SzAr_DecodeFolder(&p->db, folderIndex,
+            inStream, p->dataPos, *tempBuf, unpackSize, allocTemp);
+      }
+    }
+  }
+
+  if (res == SZ_OK)
+  {
+    UInt64 unpackPos = p->UnpackPositions[fileIndex];
+    *offset = (size_t)(unpackPos - p->UnpackPositions[p->FolderToFile[folderIndex]]);
+    *outSizeProcessed = (size_t)(p->UnpackPositions[(size_t)fileIndex + 1] - unpackPos);
+    if (*offset + *outSizeProcessed > *outBufferSize)
+      return SZ_ERROR_FAIL;
+    if (SzBitWithVals_Check(&p->CRCs, fileIndex))
+      if (CrcCalc(*tempBuf + *offset, *outSizeProcessed) != p->CRCs.Vals[fileIndex])
+        res = SZ_ERROR_CRC;
+  }
+
+  return res;
+}
+
+
+size_t SzArEx_GetFileNameUtf16(const CSzArEx *p, size_t fileIndex, UInt16 *dest)
+{
+  size_t offs = p->FileNameOffsets[fileIndex];
+  size_t len = p->FileNameOffsets[fileIndex + 1] - offs;
+  if (dest != 0)
+  {
+    size_t i;
+    const Byte *src = p->FileNames + offs * 2;
+    for (i = 0; i < len; i++)
+      dest[i] = GetUi16(src + i * 2);
+  }
+  return len;
+}
+
+/*
+size_t SzArEx_GetFullNameLen(const CSzArEx *p, size_t fileIndex)
+{
+  size_t len;
+  if (!p->FileNameOffsets)
+    return 1;
+  len = 0;
+  for (;;)
+  {
+    UInt32 parent = (UInt32)(Int32)-1;
+    len += p->FileNameOffsets[fileIndex + 1] - p->FileNameOffsets[fileIndex];
+    if SzBitWithVals_Check(&p->Parents, fileIndex)
+      parent = p->Parents.Vals[fileIndex];
+    if (parent == (UInt32)(Int32)-1)
+      return len;
+    fileIndex = parent;
+  }
+}
+
+UInt16 *SzArEx_GetFullNameUtf16_Back(const CSzArEx *p, size_t fileIndex, UInt16 *dest)
+{
+  BoolInt needSlash;
+  if (!p->FileNameOffsets)
+  {
+    *(--dest) = 0;
+    return dest;
+  }
+  needSlash = False;
+  for (;;)
+  {
+    UInt32 parent = (UInt32)(Int32)-1;
+    size_t curLen = p->FileNameOffsets[fileIndex + 1] - p->FileNameOffsets[fileIndex];
+    SzArEx_GetFileNameUtf16(p, fileIndex, dest - curLen);
+    if (needSlash)
+      *(dest - 1) = '/';
+    needSlash = True;
+    dest -= curLen;
+
+    if SzBitWithVals_Check(&p->Parents, fileIndex)
+      parent = p->Parents.Vals[fileIndex];
+    if (parent == (UInt32)(Int32)-1)
+      return dest;
+    fileIndex = parent;
+  }
+}
+*/
diff --git a/3rdparty/7z/src/7zBuf.c b/3rdparty/7z/src/7zBuf.c
new file mode 100644
index 0000000000..438bba68bd
--- /dev/null
+++ b/3rdparty/7z/src/7zBuf.c
@@ -0,0 +1,36 @@
+/* 7zBuf.c -- Byte Buffer
+2017-04-03 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "7zBuf.h"
+
+void Buf_Init(CBuf *p)
+{
+  p->data = 0;
+  p->size = 0;
+}
+
+int Buf_Create(CBuf *p, size_t size, ISzAllocPtr alloc)
+{
+  p->size = 0;
+  if (size == 0)
+  {
+    p->data = 0;
+    return 1;
+  }
+  p->data = (Byte *)ISzAlloc_Alloc(alloc, size);
+  if (p->data)
+  {
+    p->size = size;
+    return 1;
+  }
+  return 0;
+}
+
+void Buf_Free(CBuf *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->data);
+  p->data = 0;
+  p->size = 0;
+}
diff --git a/3rdparty/7z/src/7zBuf.h b/3rdparty/7z/src/7zBuf.h
new file mode 100644
index 0000000000..5942d6e623
--- /dev/null
+++ b/3rdparty/7z/src/7zBuf.h
@@ -0,0 +1,35 @@
+/* 7zBuf.h -- Byte Buffer
+2017-04-03 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_BUF_H
+#define __7Z_BUF_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+typedef struct
+{
+  Byte *data;
+  size_t size;
+} CBuf;
+
+void Buf_Init(CBuf *p);
+int Buf_Create(CBuf *p, size_t size, ISzAllocPtr alloc);
+void Buf_Free(CBuf *p, ISzAllocPtr alloc);
+
+typedef struct
+{
+  Byte *data;
+  size_t size;
+  size_t pos;
+} CDynBuf;
+
+void DynBuf_Construct(CDynBuf *p);
+void DynBuf_SeekToBeg(CDynBuf *p);
+int DynBuf_Write(CDynBuf *p, const Byte *buf, size_t size, ISzAllocPtr alloc);
+void DynBuf_Free(CDynBuf *p, ISzAllocPtr alloc);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/7zBuf2.c b/3rdparty/7z/src/7zBuf2.c
new file mode 100644
index 0000000000..49b4343b67
--- /dev/null
+++ b/3rdparty/7z/src/7zBuf2.c
@@ -0,0 +1,52 @@
+/* 7zBuf2.c -- Byte Buffer
+2017-04-03 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <string.h>
+
+#include "7zBuf.h"
+
+void DynBuf_Construct(CDynBuf *p)
+{
+  p->data = 0;
+  p->size = 0;
+  p->pos = 0;
+}
+
+void DynBuf_SeekToBeg(CDynBuf *p)
+{
+  p->pos = 0;
+}
+
+int DynBuf_Write(CDynBuf *p, const Byte *buf, size_t size, ISzAllocPtr alloc)
+{
+  if (size > p->size - p->pos)
+  {
+    size_t newSize = p->pos + size;
+    Byte *data;
+    newSize += newSize / 4;
+    data = (Byte *)ISzAlloc_Alloc(alloc, newSize);
+    if (!data)
+      return 0;
+    p->size = newSize;
+    if (p->pos != 0)
+      memcpy(data, p->data, p->pos);
+    ISzAlloc_Free(alloc, p->data);
+    p->data = data;
+  }
+  if (size != 0)
+  {
+    memcpy(p->data + p->pos, buf, size);
+    p->pos += size;
+  }
+  return 1;
+}
+
+void DynBuf_Free(CDynBuf *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->data);
+  p->data = 0;
+  p->size = 0;
+  p->pos = 0;
+}
diff --git a/3rdparty/7z/src/7zCrc.c b/3rdparty/7z/src/7zCrc.c
new file mode 100644
index 0000000000..40ab75952a
--- /dev/null
+++ b/3rdparty/7z/src/7zCrc.c
@@ -0,0 +1,128 @@
+/* 7zCrc.c -- CRC32 init
+2017-06-06 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "7zCrc.h"
+#include "CpuArch.h"
+
+#define kCrcPoly 0xEDB88320
+
+#ifdef MY_CPU_LE
+  #define CRC_NUM_TABLES 8
+#else
+  #define CRC_NUM_TABLES 9
+
+  #define CRC_UINT32_SWAP(v) ((v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | (v << 24))
+
+  UInt32 MY_FAST_CALL CrcUpdateT1_BeT4(UInt32 v, const void *data, size_t size, const UInt32 *table);
+  UInt32 MY_FAST_CALL CrcUpdateT1_BeT8(UInt32 v, const void *data, size_t size, const UInt32 *table);
+#endif
+
+#ifndef MY_CPU_BE
+  UInt32 MY_FAST_CALL CrcUpdateT4(UInt32 v, const void *data, size_t size, const UInt32 *table);
+  UInt32 MY_FAST_CALL CrcUpdateT8(UInt32 v, const void *data, size_t size, const UInt32 *table);
+#endif
+
+typedef UInt32 (MY_FAST_CALL *CRC_FUNC)(UInt32 v, const void *data, size_t size, const UInt32 *table);
+
+CRC_FUNC g_CrcUpdateT4;
+CRC_FUNC g_CrcUpdateT8;
+CRC_FUNC g_CrcUpdate;
+
+UInt32 g_CrcTable[256 * CRC_NUM_TABLES];
+
+UInt32 MY_FAST_CALL CrcUpdate(UInt32 v, const void *data, size_t size)
+{
+  return g_CrcUpdate(v, data, size, g_CrcTable);
+}
+
+UInt32 MY_FAST_CALL CrcCalc(const void *data, size_t size)
+{
+  return g_CrcUpdate(CRC_INIT_VAL, data, size, g_CrcTable) ^ CRC_INIT_VAL;
+}
+
+#define CRC_UPDATE_BYTE_2(crc, b) (table[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
+
+UInt32 MY_FAST_CALL CrcUpdateT1(UInt32 v, const void *data, size_t size, const UInt32 *table)
+{
+  const Byte *p = (const Byte *)data;
+  const Byte *pEnd = p + size;
+  for (; p != pEnd; p++)
+    v = CRC_UPDATE_BYTE_2(v, *p);
+  return v;
+}
+
+void MY_FAST_CALL CrcGenerateTable()
+{
+  UInt32 i;
+  for (i = 0; i < 256; i++)
+  {
+    UInt32 r = i;
+    unsigned j;
+    for (j = 0; j < 8; j++)
+      r = (r >> 1) ^ (kCrcPoly & ((UInt32)0 - (r & 1)));
+    g_CrcTable[i] = r;
+  }
+  for (i = 256; i < 256 * CRC_NUM_TABLES; i++)
+  {
+    UInt32 r = g_CrcTable[(size_t)i - 256];
+    g_CrcTable[i] = g_CrcTable[r & 0xFF] ^ (r >> 8);
+  }
+
+  #if CRC_NUM_TABLES < 4
+  
+  g_CrcUpdate = CrcUpdateT1;
+  
+  #else
+ 
+  #ifdef MY_CPU_LE
+
+    g_CrcUpdateT4 = CrcUpdateT4;
+    g_CrcUpdate = CrcUpdateT4;
+
+    #if CRC_NUM_TABLES >= 8
+      g_CrcUpdateT8 = CrcUpdateT8;
+  
+      #ifdef MY_CPU_X86_OR_AMD64
+      if (!CPU_Is_InOrder())
+      #endif
+        g_CrcUpdate = CrcUpdateT8;
+    #endif
+
+  #else
+  {
+    #ifndef MY_CPU_BE
+    UInt32 k = 0x01020304;
+    const Byte *p = (const Byte *)&k;
+    if (p[0] == 4 && p[1] == 3)
+    {
+      g_CrcUpdateT4 = CrcUpdateT4;
+      g_CrcUpdate = CrcUpdateT4;
+      #if CRC_NUM_TABLES >= 8
+      g_CrcUpdateT8 = CrcUpdateT8;
+      g_CrcUpdate = CrcUpdateT8;
+      #endif
+    }
+    else if (p[0] != 1 || p[1] != 2)
+      g_CrcUpdate = CrcUpdateT1;
+    else
+    #endif
+    {
+      for (i = 256 * CRC_NUM_TABLES - 1; i >= 256; i--)
+      {
+        UInt32 x = g_CrcTable[(size_t)i - 256];
+        g_CrcTable[i] = CRC_UINT32_SWAP(x);
+      }
+      g_CrcUpdateT4 = CrcUpdateT1_BeT4;
+      g_CrcUpdate = CrcUpdateT1_BeT4;
+      #if CRC_NUM_TABLES >= 8
+      g_CrcUpdateT8 = CrcUpdateT1_BeT8;
+      g_CrcUpdate = CrcUpdateT1_BeT8;
+      #endif
+    }
+  }
+  #endif
+
+  #endif
+}
diff --git a/3rdparty/7z/src/7zCrc.h b/3rdparty/7z/src/7zCrc.h
new file mode 100644
index 0000000000..3b0459402b
--- /dev/null
+++ b/3rdparty/7z/src/7zCrc.h
@@ -0,0 +1,25 @@
+/* 7zCrc.h -- CRC32 calculation
+2013-01-18 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_CRC_H
+#define __7Z_CRC_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+extern UInt32 g_CrcTable[];
+
+/* Call CrcGenerateTable one time before other CRC functions */
+void MY_FAST_CALL CrcGenerateTable(void);
+
+#define CRC_INIT_VAL 0xFFFFFFFF
+#define CRC_GET_DIGEST(crc) ((crc) ^ CRC_INIT_VAL)
+#define CRC_UPDATE_BYTE(crc, b) (g_CrcTable[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
+
+UInt32 MY_FAST_CALL CrcUpdate(UInt32 crc, const void *data, size_t size);
+UInt32 MY_FAST_CALL CrcCalc(const void *data, size_t size);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/7zCrcOpt.c b/3rdparty/7z/src/7zCrcOpt.c
new file mode 100644
index 0000000000..2ee0de8459
--- /dev/null
+++ b/3rdparty/7z/src/7zCrcOpt.c
@@ -0,0 +1,115 @@
+/* 7zCrcOpt.c -- CRC32 calculation
+2017-04-03 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "CpuArch.h"
+
+#ifndef MY_CPU_BE
+
+#define CRC_UPDATE_BYTE_2(crc, b) (table[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
+
+UInt32 MY_FAST_CALL CrcUpdateT4(UInt32 v, const void *data, size_t size, const UInt32 *table)
+{
+  const Byte *p = (const Byte *)data;
+  for (; size > 0 && ((unsigned)(ptrdiff_t)p & 3) != 0; size--, p++)
+    v = CRC_UPDATE_BYTE_2(v, *p);
+  for (; size >= 4; size -= 4, p += 4)
+  {
+    v ^= *(const UInt32 *)p;
+    v =
+          (table + 0x300)[((v      ) & 0xFF)]
+        ^ (table + 0x200)[((v >>  8) & 0xFF)]
+        ^ (table + 0x100)[((v >> 16) & 0xFF)]
+        ^ (table + 0x000)[((v >> 24))];
+  }
+  for (; size > 0; size--, p++)
+    v = CRC_UPDATE_BYTE_2(v, *p);
+  return v;
+}
+
+UInt32 MY_FAST_CALL CrcUpdateT8(UInt32 v, const void *data, size_t size, const UInt32 *table)
+{
+  const Byte *p = (const Byte *)data;
+  for (; size > 0 && ((unsigned)(ptrdiff_t)p & 7) != 0; size--, p++)
+    v = CRC_UPDATE_BYTE_2(v, *p);
+  for (; size >= 8; size -= 8, p += 8)
+  {
+    UInt32 d;
+    v ^= *(const UInt32 *)p;
+    v =
+          (table + 0x700)[((v      ) & 0xFF)]
+        ^ (table + 0x600)[((v >>  8) & 0xFF)]
+        ^ (table + 0x500)[((v >> 16) & 0xFF)]
+        ^ (table + 0x400)[((v >> 24))];
+    d = *((const UInt32 *)p + 1);
+    v ^=
+          (table + 0x300)[((d      ) & 0xFF)]
+        ^ (table + 0x200)[((d >>  8) & 0xFF)]
+        ^ (table + 0x100)[((d >> 16) & 0xFF)]
+        ^ (table + 0x000)[((d >> 24))];
+  }
+  for (; size > 0; size--, p++)
+    v = CRC_UPDATE_BYTE_2(v, *p);
+  return v;
+}
+
+#endif
+
+
+#ifndef MY_CPU_LE
+
+#define CRC_UINT32_SWAP(v) ((v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | (v << 24))
+
+#define CRC_UPDATE_BYTE_2_BE(crc, b) (table[(((crc) >> 24) ^ (b))] ^ ((crc) << 8))
+
+UInt32 MY_FAST_CALL CrcUpdateT1_BeT4(UInt32 v, const void *data, size_t size, const UInt32 *table)
+{
+  const Byte *p = (const Byte *)data;
+  table += 0x100;
+  v = CRC_UINT32_SWAP(v);
+  for (; size > 0 && ((unsigned)(ptrdiff_t)p & 3) != 0; size--, p++)
+    v = CRC_UPDATE_BYTE_2_BE(v, *p);
+  for (; size >= 4; size -= 4, p += 4)
+  {
+    v ^= *(const UInt32 *)p;
+    v =
+          (table + 0x000)[((v      ) & 0xFF)]
+        ^ (table + 0x100)[((v >>  8) & 0xFF)]
+        ^ (table + 0x200)[((v >> 16) & 0xFF)]
+        ^ (table + 0x300)[((v >> 24))];
+  }
+  for (; size > 0; size--, p++)
+    v = CRC_UPDATE_BYTE_2_BE(v, *p);
+  return CRC_UINT32_SWAP(v);
+}
+
+UInt32 MY_FAST_CALL CrcUpdateT1_BeT8(UInt32 v, const void *data, size_t size, const UInt32 *table)
+{
+  const Byte *p = (const Byte *)data;
+  table += 0x100;
+  v = CRC_UINT32_SWAP(v);
+  for (; size > 0 && ((unsigned)(ptrdiff_t)p & 7) != 0; size--, p++)
+    v = CRC_UPDATE_BYTE_2_BE(v, *p);
+  for (; size >= 8; size -= 8, p += 8)
+  {
+    UInt32 d;
+    v ^= *(const UInt32 *)p;
+    v =
+          (table + 0x400)[((v      ) & 0xFF)]
+        ^ (table + 0x500)[((v >>  8) & 0xFF)]
+        ^ (table + 0x600)[((v >> 16) & 0xFF)]
+        ^ (table + 0x700)[((v >> 24))];
+    d = *((const UInt32 *)p + 1);
+    v ^=
+          (table + 0x000)[((d      ) & 0xFF)]
+        ^ (table + 0x100)[((d >>  8) & 0xFF)]
+        ^ (table + 0x200)[((d >> 16) & 0xFF)]
+        ^ (table + 0x300)[((d >> 24))];
+  }
+  for (; size > 0; size--, p++)
+    v = CRC_UPDATE_BYTE_2_BE(v, *p);
+  return CRC_UINT32_SWAP(v);
+}
+
+#endif
diff --git a/3rdparty/7z/src/7zDec.c b/3rdparty/7z/src/7zDec.c
new file mode 100644
index 0000000000..2a7b09030e
--- /dev/null
+++ b/3rdparty/7z/src/7zDec.c
@@ -0,0 +1,591 @@
+/* 7zDec.c -- Decoding from 7z folder
+2019-02-02 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <string.h>
+
+/* #define _7ZIP_PPMD_SUPPPORT */
+
+#include "7z.h"
+#include "7zCrc.h"
+
+#include "Bcj2.h"
+#include "Bra.h"
+#include "CpuArch.h"
+#include "Delta.h"
+#include "LzmaDec.h"
+#include "Lzma2Dec.h"
+#ifdef _7ZIP_PPMD_SUPPPORT
+#include "Ppmd7.h"
+#endif
+
+#define k_Copy 0
+#define k_Delta 3
+#define k_LZMA2 0x21
+#define k_LZMA  0x30101
+#define k_BCJ   0x3030103
+#define k_BCJ2  0x303011B
+#define k_PPC   0x3030205
+#define k_IA64  0x3030401
+#define k_ARM   0x3030501
+#define k_ARMT  0x3030701
+#define k_SPARC 0x3030805
+
+
+#ifdef _7ZIP_PPMD_SUPPPORT
+
+#define k_PPMD 0x30401
+
+typedef struct
+{
+  IByteIn vt;
+  const Byte *cur;
+  const Byte *end;
+  const Byte *begin;
+  UInt64 processed;
+  BoolInt extra;
+  SRes res;
+  const ILookInStream *inStream;
+} CByteInToLook;
+
+static Byte ReadByte(const IByteIn *pp)
+{
+  CByteInToLook *p = CONTAINER_FROM_VTBL(pp, CByteInToLook, vt);
+  if (p->cur != p->end)
+    return *p->cur++;
+  if (p->res == SZ_OK)
+  {
+    size_t size = p->cur - p->begin;
+    p->processed += size;
+    p->res = ILookInStream_Skip(p->inStream, size);
+    size = (1 << 25);
+    p->res = ILookInStream_Look(p->inStream, (const void **)&p->begin, &size);
+    p->cur = p->begin;
+    p->end = p->begin + size;
+    if (size != 0)
+      return *p->cur++;;
+  }
+  p->extra = True;
+  return 0;
+}
+
+static SRes SzDecodePpmd(const Byte *props, unsigned propsSize, UInt64 inSize, const ILookInStream *inStream,
+    Byte *outBuffer, SizeT outSize, ISzAllocPtr allocMain)
+{
+  CPpmd7 ppmd;
+  CByteInToLook s;
+  SRes res = SZ_OK;
+
+  s.vt.Read = ReadByte;
+  s.inStream = inStream;
+  s.begin = s.end = s.cur = NULL;
+  s.extra = False;
+  s.res = SZ_OK;
+  s.processed = 0;
+
+  if (propsSize != 5)
+    return SZ_ERROR_UNSUPPORTED;
+
+  {
+    unsigned order = props[0];
+    UInt32 memSize = GetUi32(props + 1);
+    if (order < PPMD7_MIN_ORDER ||
+        order > PPMD7_MAX_ORDER ||
+        memSize < PPMD7_MIN_MEM_SIZE ||
+        memSize > PPMD7_MAX_MEM_SIZE)
+      return SZ_ERROR_UNSUPPORTED;
+    Ppmd7_Construct(&ppmd);
+    if (!Ppmd7_Alloc(&ppmd, memSize, allocMain))
+      return SZ_ERROR_MEM;
+    Ppmd7_Init(&ppmd, order);
+  }
+  {
+    CPpmd7z_RangeDec rc;
+    Ppmd7z_RangeDec_CreateVTable(&rc);
+    rc.Stream = &s.vt;
+    if (!Ppmd7z_RangeDec_Init(&rc))
+      res = SZ_ERROR_DATA;
+    else if (s.extra)
+      res = (s.res != SZ_OK ? s.res : SZ_ERROR_DATA);
+    else
+    {
+      SizeT i;
+      for (i = 0; i < outSize; i++)
+      {
+        int sym = Ppmd7_DecodeSymbol(&ppmd, &rc.vt);
+        if (s.extra || sym < 0)
+          break;
+        outBuffer[i] = (Byte)sym;
+      }
+      if (i != outSize)
+        res = (s.res != SZ_OK ? s.res : SZ_ERROR_DATA);
+      else if (s.processed + (s.cur - s.begin) != inSize || !Ppmd7z_RangeDec_IsFinishedOK(&rc))
+        res = SZ_ERROR_DATA;
+    }
+  }
+  Ppmd7_Free(&ppmd, allocMain);
+  return res;
+}
+
+#endif
+
+
+static SRes SzDecodeLzma(const Byte *props, unsigned propsSize, UInt64 inSize, ILookInStream *inStream,
+    Byte *outBuffer, SizeT outSize, ISzAllocPtr allocMain)
+{
+  CLzmaDec state;
+  SRes res = SZ_OK;
+
+  LzmaDec_Construct(&state);
+  RINOK(LzmaDec_AllocateProbs(&state, props, propsSize, allocMain));
+  state.dic = outBuffer;
+  state.dicBufSize = outSize;
+  LzmaDec_Init(&state);
+
+  for (;;)
+  {
+    const void *inBuf = NULL;
+    size_t lookahead = (1 << 18);
+    if (lookahead > inSize)
+      lookahead = (size_t)inSize;
+    res = ILookInStream_Look(inStream, &inBuf, &lookahead);
+    if (res != SZ_OK)
+      break;
+
+    {
+      SizeT inProcessed = (SizeT)lookahead, dicPos = state.dicPos;
+      ELzmaStatus status;
+      res = LzmaDec_DecodeToDic(&state, outSize, (const Byte *)inBuf, &inProcessed, LZMA_FINISH_END, &status);
+      lookahead -= inProcessed;
+      inSize -= inProcessed;
+      if (res != SZ_OK)
+        break;
+
+      if (status == LZMA_STATUS_FINISHED_WITH_MARK)
+      {
+        if (outSize != state.dicPos || inSize != 0)
+          res = SZ_ERROR_DATA;
+        break;
+      }
+
+      if (outSize == state.dicPos && inSize == 0 && status == LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK)
+        break;
+
+      if (inProcessed == 0 && dicPos == state.dicPos)
+      {
+        res = SZ_ERROR_DATA;
+        break;
+      }
+
+      res = ILookInStream_Skip(inStream, inProcessed);
+      if (res != SZ_OK)
+        break;
+    }
+  }
+
+  LzmaDec_FreeProbs(&state, allocMain);
+  return res;
+}
+
+
+#ifndef _7Z_NO_METHOD_LZMA2
+
+static SRes SzDecodeLzma2(const Byte *props, unsigned propsSize, UInt64 inSize, ILookInStream *inStream,
+    Byte *outBuffer, SizeT outSize, ISzAllocPtr allocMain)
+{
+  CLzma2Dec state;
+  SRes res = SZ_OK;
+
+  Lzma2Dec_Construct(&state);
+  if (propsSize != 1)
+    return SZ_ERROR_DATA;
+  RINOK(Lzma2Dec_AllocateProbs(&state, props[0], allocMain));
+  state.decoder.dic = outBuffer;
+  state.decoder.dicBufSize = outSize;
+  Lzma2Dec_Init(&state);
+
+  for (;;)
+  {
+    const void *inBuf = NULL;
+    size_t lookahead = (1 << 18);
+    if (lookahead > inSize)
+      lookahead = (size_t)inSize;
+    res = ILookInStream_Look(inStream, &inBuf, &lookahead);
+    if (res != SZ_OK)
+      break;
+
+    {
+      SizeT inProcessed = (SizeT)lookahead, dicPos = state.decoder.dicPos;
+      ELzmaStatus status;
+      res = Lzma2Dec_DecodeToDic(&state, outSize, (const Byte *)inBuf, &inProcessed, LZMA_FINISH_END, &status);
+      lookahead -= inProcessed;
+      inSize -= inProcessed;
+      if (res != SZ_OK)
+        break;
+
+      if (status == LZMA_STATUS_FINISHED_WITH_MARK)
+      {
+        if (outSize != state.decoder.dicPos || inSize != 0)
+          res = SZ_ERROR_DATA;
+        break;
+      }
+
+      if (inProcessed == 0 && dicPos == state.decoder.dicPos)
+      {
+        res = SZ_ERROR_DATA;
+        break;
+      }
+
+      res = ILookInStream_Skip(inStream, inProcessed);
+      if (res != SZ_OK)
+        break;
+    }
+  }
+
+  Lzma2Dec_FreeProbs(&state, allocMain);
+  return res;
+}
+
+#endif
+
+
+static SRes SzDecodeCopy(UInt64 inSize, ILookInStream *inStream, Byte *outBuffer)
+{
+  while (inSize > 0)
+  {
+    const void *inBuf;
+    size_t curSize = (1 << 18);
+    if (curSize > inSize)
+      curSize = (size_t)inSize;
+    RINOK(ILookInStream_Look(inStream, &inBuf, &curSize));
+    if (curSize == 0)
+      return SZ_ERROR_INPUT_EOF;
+    memcpy(outBuffer, inBuf, curSize);
+    outBuffer += curSize;
+    inSize -= curSize;
+    RINOK(ILookInStream_Skip(inStream, curSize));
+  }
+  return SZ_OK;
+}
+
+static BoolInt IS_MAIN_METHOD(UInt32 m)
+{
+  switch (m)
+  {
+    case k_Copy:
+    case k_LZMA:
+    #ifndef _7Z_NO_METHOD_LZMA2
+    case k_LZMA2:
+    #endif
+    #ifdef _7ZIP_PPMD_SUPPPORT
+    case k_PPMD:
+    #endif
+      return True;
+  }
+  return False;
+}
+
+static BoolInt IS_SUPPORTED_CODER(const CSzCoderInfo *c)
+{
+  return
+      c->NumStreams == 1
+      /* && c->MethodID <= (UInt32)0xFFFFFFFF */
+      && IS_MAIN_METHOD((UInt32)c->MethodID);
+}
+
+#define IS_BCJ2(c) ((c)->MethodID == k_BCJ2 && (c)->NumStreams == 4)
+
+static SRes CheckSupportedFolder(const CSzFolder *f)
+{
+  if (f->NumCoders < 1 || f->NumCoders > 4)
+    return SZ_ERROR_UNSUPPORTED;
+  if (!IS_SUPPORTED_CODER(&f->Coders[0]))
+    return SZ_ERROR_UNSUPPORTED;
+  if (f->NumCoders == 1)
+  {
+    if (f->NumPackStreams != 1 || f->PackStreams[0] != 0 || f->NumBonds != 0)
+      return SZ_ERROR_UNSUPPORTED;
+    return SZ_OK;
+  }
+  
+  
+  #ifndef _7Z_NO_METHODS_FILTERS
+
+  if (f->NumCoders == 2)
+  {
+    const CSzCoderInfo *c = &f->Coders[1];
+    if (
+        /* c->MethodID > (UInt32)0xFFFFFFFF || */
+        c->NumStreams != 1
+        || f->NumPackStreams != 1
+        || f->PackStreams[0] != 0
+        || f->NumBonds != 1
+        || f->Bonds[0].InIndex != 1
+        || f->Bonds[0].OutIndex != 0)
+      return SZ_ERROR_UNSUPPORTED;
+    switch ((UInt32)c->MethodID)
+    {
+      case k_Delta:
+      case k_BCJ:
+      case k_PPC:
+      case k_IA64:
+      case k_SPARC:
+      case k_ARM:
+      case k_ARMT:
+        break;
+      default:
+        return SZ_ERROR_UNSUPPORTED;
+    }
+    return SZ_OK;
+  }
+
+  #endif
+
+  
+  if (f->NumCoders == 4)
+  {
+    if (!IS_SUPPORTED_CODER(&f->Coders[1])
+        || !IS_SUPPORTED_CODER(&f->Coders[2])
+        || !IS_BCJ2(&f->Coders[3]))
+      return SZ_ERROR_UNSUPPORTED;
+    if (f->NumPackStreams != 4
+        || f->PackStreams[0] != 2
+        || f->PackStreams[1] != 6
+        || f->PackStreams[2] != 1
+        || f->PackStreams[3] != 0
+        || f->NumBonds != 3
+        || f->Bonds[0].InIndex != 5 || f->Bonds[0].OutIndex != 0
+        || f->Bonds[1].InIndex != 4 || f->Bonds[1].OutIndex != 1
+        || f->Bonds[2].InIndex != 3 || f->Bonds[2].OutIndex != 2)
+      return SZ_ERROR_UNSUPPORTED;
+    return SZ_OK;
+  }
+  
+  return SZ_ERROR_UNSUPPORTED;
+}
+
+#define CASE_BRA_CONV(isa) case k_ ## isa: isa ## _Convert(outBuffer, outSize, 0, 0); break;
+
+static SRes SzFolder_Decode2(const CSzFolder *folder,
+    const Byte *propsData,
+    const UInt64 *unpackSizes,
+    const UInt64 *packPositions,
+    ILookInStream *inStream, UInt64 startPos,
+    Byte *outBuffer, SizeT outSize, ISzAllocPtr allocMain,
+    Byte *tempBuf[])
+{
+  UInt32 ci;
+  SizeT tempSizes[3] = { 0, 0, 0};
+  SizeT tempSize3 = 0;
+  Byte *tempBuf3 = 0;
+
+  RINOK(CheckSupportedFolder(folder));
+
+  for (ci = 0; ci < folder->NumCoders; ci++)
+  {
+    const CSzCoderInfo *coder = &folder->Coders[ci];
+
+    if (IS_MAIN_METHOD((UInt32)coder->MethodID))
+    {
+      UInt32 si = 0;
+      UInt64 offset;
+      UInt64 inSize;
+      Byte *outBufCur = outBuffer;
+      SizeT outSizeCur = outSize;
+      if (folder->NumCoders == 4)
+      {
+        UInt32 indices[] = { 3, 2, 0 };
+        UInt64 unpackSize = unpackSizes[ci];
+        si = indices[ci];
+        if (ci < 2)
+        {
+          Byte *temp;
+          outSizeCur = (SizeT)unpackSize;
+          if (outSizeCur != unpackSize)
+            return SZ_ERROR_MEM;
+          temp = (Byte *)ISzAlloc_Alloc(allocMain, outSizeCur);
+          if (!temp && outSizeCur != 0)
+            return SZ_ERROR_MEM;
+          outBufCur = tempBuf[1 - ci] = temp;
+          tempSizes[1 - ci] = outSizeCur;
+        }
+        else if (ci == 2)
+        {
+          if (unpackSize > outSize) /* check it */
+            return SZ_ERROR_PARAM;
+          tempBuf3 = outBufCur = outBuffer + (outSize - (size_t)unpackSize);
+          tempSize3 = outSizeCur = (SizeT)unpackSize;
+        }
+        else
+          return SZ_ERROR_UNSUPPORTED;
+      }
+      offset = packPositions[si];
+      inSize = packPositions[(size_t)si + 1] - offset;
+      RINOK(LookInStream_SeekTo(inStream, startPos + offset));
+
+      if (coder->MethodID == k_Copy)
+      {
+        if (inSize != outSizeCur) /* check it */
+          return SZ_ERROR_DATA;
+        RINOK(SzDecodeCopy(inSize, inStream, outBufCur));
+      }
+      else if (coder->MethodID == k_LZMA)
+      {
+        RINOK(SzDecodeLzma(propsData + coder->PropsOffset, coder->PropsSize, inSize, inStream, outBufCur, outSizeCur, allocMain));
+      }
+      #ifndef _7Z_NO_METHOD_LZMA2
+      else if (coder->MethodID == k_LZMA2)
+      {
+        RINOK(SzDecodeLzma2(propsData + coder->PropsOffset, coder->PropsSize, inSize, inStream, outBufCur, outSizeCur, allocMain));
+      }
+      #endif
+      #ifdef _7ZIP_PPMD_SUPPPORT
+      else if (coder->MethodID == k_PPMD)
+      {
+        RINOK(SzDecodePpmd(propsData + coder->PropsOffset, coder->PropsSize, inSize, inStream, outBufCur, outSizeCur, allocMain));
+      }
+      #endif
+      else
+        return SZ_ERROR_UNSUPPORTED;
+    }
+    else if (coder->MethodID == k_BCJ2)
+    {
+      UInt64 offset = packPositions[1];
+      UInt64 s3Size = packPositions[2] - offset;
+      
+      if (ci != 3)
+        return SZ_ERROR_UNSUPPORTED;
+      
+      tempSizes[2] = (SizeT)s3Size;
+      if (tempSizes[2] != s3Size)
+        return SZ_ERROR_MEM;
+      tempBuf[2] = (Byte *)ISzAlloc_Alloc(allocMain, tempSizes[2]);
+      if (!tempBuf[2] && tempSizes[2] != 0)
+        return SZ_ERROR_MEM;
+      
+      RINOK(LookInStream_SeekTo(inStream, startPos + offset));
+      RINOK(SzDecodeCopy(s3Size, inStream, tempBuf[2]));
+
+      if ((tempSizes[0] & 3) != 0 ||
+          (tempSizes[1] & 3) != 0 ||
+          tempSize3 + tempSizes[0] + tempSizes[1] != outSize)
+        return SZ_ERROR_DATA;
+
+      {
+        CBcj2Dec p;
+        
+        p.bufs[0] = tempBuf3;   p.lims[0] = tempBuf3 + tempSize3;
+        p.bufs[1] = tempBuf[0]; p.lims[1] = tempBuf[0] + tempSizes[0];
+        p.bufs[2] = tempBuf[1]; p.lims[2] = tempBuf[1] + tempSizes[1];
+        p.bufs[3] = tempBuf[2]; p.lims[3] = tempBuf[2] + tempSizes[2];
+        
+        p.dest = outBuffer;
+        p.destLim = outBuffer + outSize;
+        
+        Bcj2Dec_Init(&p);
+        RINOK(Bcj2Dec_Decode(&p));
+
+        {
+          unsigned i;
+          for (i = 0; i < 4; i++)
+            if (p.bufs[i] != p.lims[i])
+              return SZ_ERROR_DATA;
+          
+          if (!Bcj2Dec_IsFinished(&p))
+            return SZ_ERROR_DATA;
+
+          if (p.dest != p.destLim
+             || p.state != BCJ2_STREAM_MAIN)
+            return SZ_ERROR_DATA;
+        }
+      }
+    }
+    #ifndef _7Z_NO_METHODS_FILTERS
+    else if (ci == 1)
+    {
+      if (coder->MethodID == k_Delta)
+      {
+        if (coder->PropsSize != 1)
+          return SZ_ERROR_UNSUPPORTED;
+        {
+          Byte state[DELTA_STATE_SIZE];
+          Delta_Init(state);
+          Delta_Decode(state, (unsigned)(propsData[coder->PropsOffset]) + 1, outBuffer, outSize);
+        }
+      }
+      else
+      {
+        if (coder->PropsSize != 0)
+          return SZ_ERROR_UNSUPPORTED;
+        switch (coder->MethodID)
+        {
+          case k_BCJ:
+          {
+            UInt32 state;
+            x86_Convert_Init(state);
+            x86_Convert(outBuffer, outSize, 0, &state, 0);
+            break;
+          }
+          CASE_BRA_CONV(PPC)
+          CASE_BRA_CONV(IA64)
+          CASE_BRA_CONV(SPARC)
+          CASE_BRA_CONV(ARM)
+          CASE_BRA_CONV(ARMT)
+          default:
+            return SZ_ERROR_UNSUPPORTED;
+        }
+      }
+    }
+    #endif
+    else
+      return SZ_ERROR_UNSUPPORTED;
+  }
+
+  return SZ_OK;
+}
+
+
+SRes SzAr_DecodeFolder(const CSzAr *p, UInt32 folderIndex,
+    ILookInStream *inStream, UInt64 startPos,
+    Byte *outBuffer, size_t outSize,
+    ISzAllocPtr allocMain)
+{
+  SRes res;
+  CSzFolder folder;
+  CSzData sd;
+  
+  const Byte *data = p->CodersData + p->FoCodersOffsets[folderIndex];
+  sd.Data = data;
+  sd.Size = p->FoCodersOffsets[(size_t)folderIndex + 1] - p->FoCodersOffsets[folderIndex];
+  
+  res = SzGetNextFolderItem(&folder, &sd);
+  
+  if (res != SZ_OK)
+    return res;
+
+  if (sd.Size != 0
+      || folder.UnpackStream != p->FoToMainUnpackSizeIndex[folderIndex]
+      || outSize != SzAr_GetFolderUnpackSize(p, folderIndex))
+    return SZ_ERROR_FAIL;
+  {
+    unsigned i;
+    Byte *tempBuf[3] = { 0, 0, 0};
+
+    res = SzFolder_Decode2(&folder, data,
+        &p->CoderUnpackSizes[p->FoToCoderUnpackSizes[folderIndex]],
+        p->PackPositions + p->FoStartPackStreamIndex[folderIndex],
+        inStream, startPos,
+        outBuffer, (SizeT)outSize, allocMain, tempBuf);
+    
+    for (i = 0; i < 3; i++)
+      ISzAlloc_Free(allocMain, tempBuf[i]);
+
+    if (res == SZ_OK)
+      if (SzBitWithVals_Check(&p->FolderCRCs, folderIndex))
+        if (CrcCalc(outBuffer, outSize) != p->FolderCRCs.Vals[folderIndex])
+          res = SZ_ERROR_CRC;
+
+    return res;
+  }
+}
diff --git a/3rdparty/7z/src/7zFile.c b/3rdparty/7z/src/7zFile.c
new file mode 100644
index 0000000000..e486901e30
--- /dev/null
+++ b/3rdparty/7z/src/7zFile.c
@@ -0,0 +1,286 @@
+/* 7zFile.c -- File IO
+2017-04-03 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "7zFile.h"
+
+#ifndef USE_WINDOWS_FILE
+
+#ifndef UNDER_CE
+#include <errno.h>
+#endif
+
+#else
+
+/*
+   ReadFile and WriteFile functions in Windows have BUG:
+   If you Read or Write 64MB or more (probably min_failure_size = 64MB - 32KB + 1)
+   from/to Network file, it returns ERROR_NO_SYSTEM_RESOURCES
+   (Insufficient system resources exist to complete the requested service).
+   Probably in some version of Windows there are problems with other sizes:
+   for 32 MB (maybe also for 16 MB).
+   And message can be "Network connection was lost"
+*/
+
+#define kChunkSizeMax (1 << 22)
+
+#endif
+
+void File_Construct(CSzFile *p)
+{
+  #ifdef USE_WINDOWS_FILE
+  p->handle = INVALID_HANDLE_VALUE;
+  #else
+  p->file = NULL;
+  #endif
+}
+
+#if !defined(UNDER_CE) || !defined(USE_WINDOWS_FILE)
+static WRes File_Open(CSzFile *p, const char *name, int writeMode)
+{
+  #ifdef USE_WINDOWS_FILE
+  p->handle = CreateFileA(name,
+      writeMode ? GENERIC_WRITE : GENERIC_READ,
+      FILE_SHARE_READ, NULL,
+      writeMode ? CREATE_ALWAYS : OPEN_EXISTING,
+      FILE_ATTRIBUTE_NORMAL, NULL);
+  return (p->handle != INVALID_HANDLE_VALUE) ? 0 : GetLastError();
+  #else
+  p->file = fopen(name, writeMode ? "wb+" : "rb");
+  return (p->file != 0) ? 0 :
+    #ifdef UNDER_CE
+    2; /* ENOENT */
+    #else
+    errno;
+    #endif
+  #endif
+}
+
+WRes InFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 0); }
+WRes OutFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 1); }
+#endif
+
+#ifdef USE_WINDOWS_FILE
+static WRes File_OpenW(CSzFile *p, const WCHAR *name, int writeMode)
+{
+  p->handle = CreateFileW(name,
+      writeMode ? GENERIC_WRITE : GENERIC_READ,
+      FILE_SHARE_READ, NULL,
+      writeMode ? CREATE_ALWAYS : OPEN_EXISTING,
+      FILE_ATTRIBUTE_NORMAL, NULL);
+  return (p->handle != INVALID_HANDLE_VALUE) ? 0 : GetLastError();
+}
+WRes InFile_OpenW(CSzFile *p, const WCHAR *name) { return File_OpenW(p, name, 0); }
+WRes OutFile_OpenW(CSzFile *p, const WCHAR *name) { return File_OpenW(p, name, 1); }
+#endif
+
+WRes File_Close(CSzFile *p)
+{
+  #ifdef USE_WINDOWS_FILE
+  if (p->handle != INVALID_HANDLE_VALUE)
+  {
+    if (!CloseHandle(p->handle))
+      return GetLastError();
+    p->handle = INVALID_HANDLE_VALUE;
+  }
+  #else
+  if (p->file != NULL)
+  {
+    int res = fclose(p->file);
+    if (res != 0)
+      return res;
+    p->file = NULL;
+  }
+  #endif
+  return 0;
+}
+
+WRes File_Read(CSzFile *p, void *data, size_t *size)
+{
+  size_t originalSize = *size;
+  if (originalSize == 0)
+    return 0;
+
+  #ifdef USE_WINDOWS_FILE
+
+  *size = 0;
+  do
+  {
+    DWORD curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : (DWORD)originalSize;
+    DWORD processed = 0;
+    BOOL res = ReadFile(p->handle, data, curSize, &processed, NULL);
+    data = (void *)((Byte *)data + processed);
+    originalSize -= processed;
+    *size += processed;
+    if (!res)
+      return GetLastError();
+    if (processed == 0)
+      break;
+  }
+  while (originalSize > 0);
+  return 0;
+
+  #else
+  
+  *size = fread(data, 1, originalSize, p->file);
+  if (*size == originalSize)
+    return 0;
+  return ferror(p->file);
+  
+  #endif
+}
+
+WRes File_Write(CSzFile *p, const void *data, size_t *size)
+{
+  size_t originalSize = *size;
+  if (originalSize == 0)
+    return 0;
+  
+  #ifdef USE_WINDOWS_FILE
+
+  *size = 0;
+  do
+  {
+    DWORD curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : (DWORD)originalSize;
+    DWORD processed = 0;
+    BOOL res = WriteFile(p->handle, data, curSize, &processed, NULL);
+    data = (void *)((Byte *)data + processed);
+    originalSize -= processed;
+    *size += processed;
+    if (!res)
+      return GetLastError();
+    if (processed == 0)
+      break;
+  }
+  while (originalSize > 0);
+  return 0;
+
+  #else
+
+  *size = fwrite(data, 1, originalSize, p->file);
+  if (*size == originalSize)
+    return 0;
+  return ferror(p->file);
+  
+  #endif
+}
+
+WRes File_Seek(CSzFile *p, Int64 *pos, ESzSeek origin)
+{
+  #ifdef USE_WINDOWS_FILE
+
+  LARGE_INTEGER value;
+  DWORD moveMethod;
+  value.LowPart = (DWORD)*pos;
+  value.HighPart = (LONG)((UInt64)*pos >> 16 >> 16); /* for case when UInt64 is 32-bit only */
+  switch (origin)
+  {
+    case SZ_SEEK_SET: moveMethod = FILE_BEGIN; break;
+    case SZ_SEEK_CUR: moveMethod = FILE_CURRENT; break;
+    case SZ_SEEK_END: moveMethod = FILE_END; break;
+    default: return ERROR_INVALID_PARAMETER;
+  }
+  value.LowPart = SetFilePointer(p->handle, value.LowPart, &value.HighPart, moveMethod);
+  if (value.LowPart == 0xFFFFFFFF)
+  {
+    WRes res = GetLastError();
+    if (res != NO_ERROR)
+      return res;
+  }
+  *pos = ((Int64)value.HighPart << 32) | value.LowPart;
+  return 0;
+
+  #else
+  
+  int moveMethod;
+  int res;
+  switch (origin)
+  {
+    case SZ_SEEK_SET: moveMethod = SEEK_SET; break;
+    case SZ_SEEK_CUR: moveMethod = SEEK_CUR; break;
+    case SZ_SEEK_END: moveMethod = SEEK_END; break;
+    default: return 1;
+  }
+  res = fseek(p->file, (long)*pos, moveMethod);
+  *pos = ftell(p->file);
+  return res;
+  
+  #endif
+}
+
+WRes File_GetLength(CSzFile *p, UInt64 *length)
+{
+  #ifdef USE_WINDOWS_FILE
+  
+  DWORD sizeHigh;
+  DWORD sizeLow = GetFileSize(p->handle, &sizeHigh);
+  if (sizeLow == 0xFFFFFFFF)
+  {
+    DWORD res = GetLastError();
+    if (res != NO_ERROR)
+      return res;
+  }
+  *length = (((UInt64)sizeHigh) << 32) + sizeLow;
+  return 0;
+  
+  #else
+  
+  long pos = ftell(p->file);
+  int res = fseek(p->file, 0, SEEK_END);
+  *length = ftell(p->file);
+  fseek(p->file, pos, SEEK_SET);
+  return res;
+  
+  #endif
+}
+
+
+/* ---------- FileSeqInStream ---------- */
+
+static SRes FileSeqInStream_Read(const ISeqInStream *pp, void *buf, size_t *size)
+{
+  CFileSeqInStream *p = CONTAINER_FROM_VTBL(pp, CFileSeqInStream, vt);
+  return File_Read(&p->file, buf, size) == 0 ? SZ_OK : SZ_ERROR_READ;
+}
+
+void FileSeqInStream_CreateVTable(CFileSeqInStream *p)
+{
+  p->vt.Read = FileSeqInStream_Read;
+}
+
+
+/* ---------- FileInStream ---------- */
+
+static SRes FileInStream_Read(const ISeekInStream *pp, void *buf, size_t *size)
+{
+  CFileInStream *p = CONTAINER_FROM_VTBL(pp, CFileInStream, vt);
+  return (File_Read(&p->file, buf, size) == 0) ? SZ_OK : SZ_ERROR_READ;
+}
+
+static SRes FileInStream_Seek(const ISeekInStream *pp, Int64 *pos, ESzSeek origin)
+{
+  CFileInStream *p = CONTAINER_FROM_VTBL(pp, CFileInStream, vt);
+  return File_Seek(&p->file, pos, origin);
+}
+
+void FileInStream_CreateVTable(CFileInStream *p)
+{
+  p->vt.Read = FileInStream_Read;
+  p->vt.Seek = FileInStream_Seek;
+}
+
+
+/* ---------- FileOutStream ---------- */
+
+static size_t FileOutStream_Write(const ISeqOutStream *pp, const void *data, size_t size)
+{
+  CFileOutStream *p = CONTAINER_FROM_VTBL(pp, CFileOutStream, vt);
+  File_Write(&p->file, data, &size);
+  return size;
+}
+
+void FileOutStream_CreateVTable(CFileOutStream *p)
+{
+  p->vt.Write = FileOutStream_Write;
+}
diff --git a/3rdparty/7z/src/7zFile.h b/3rdparty/7z/src/7zFile.h
new file mode 100644
index 0000000000..7e263bea1b
--- /dev/null
+++ b/3rdparty/7z/src/7zFile.h
@@ -0,0 +1,83 @@
+/* 7zFile.h -- File IO
+2017-04-03 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_FILE_H
+#define __7Z_FILE_H
+
+#ifdef _WIN32
+#define USE_WINDOWS_FILE
+#endif
+
+#ifdef USE_WINDOWS_FILE
+#include <windows.h>
+#else
+#include <stdio.h>
+#endif
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+/* ---------- File ---------- */
+
+typedef struct
+{
+  #ifdef USE_WINDOWS_FILE
+  HANDLE handle;
+  #else
+  FILE *file;
+  #endif
+} CSzFile;
+
+void File_Construct(CSzFile *p);
+#if !defined(UNDER_CE) || !defined(USE_WINDOWS_FILE)
+WRes InFile_Open(CSzFile *p, const char *name);
+WRes OutFile_Open(CSzFile *p, const char *name);
+#endif
+#ifdef USE_WINDOWS_FILE
+WRes InFile_OpenW(CSzFile *p, const WCHAR *name);
+WRes OutFile_OpenW(CSzFile *p, const WCHAR *name);
+#endif
+WRes File_Close(CSzFile *p);
+
+/* reads max(*size, remain file's size) bytes */
+WRes File_Read(CSzFile *p, void *data, size_t *size);
+
+/* writes *size bytes */
+WRes File_Write(CSzFile *p, const void *data, size_t *size);
+
+WRes File_Seek(CSzFile *p, Int64 *pos, ESzSeek origin);
+WRes File_GetLength(CSzFile *p, UInt64 *length);
+
+
+/* ---------- FileInStream ---------- */
+
+typedef struct
+{
+  ISeqInStream vt;
+  CSzFile file;
+} CFileSeqInStream;
+
+void FileSeqInStream_CreateVTable(CFileSeqInStream *p);
+
+
+typedef struct
+{
+  ISeekInStream vt;
+  CSzFile file;
+} CFileInStream;
+
+void FileInStream_CreateVTable(CFileInStream *p);
+
+
+typedef struct
+{
+  ISeqOutStream vt;
+  CSzFile file;
+} CFileOutStream;
+
+void FileOutStream_CreateVTable(CFileOutStream *p);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/7zStream.c b/3rdparty/7z/src/7zStream.c
new file mode 100644
index 0000000000..579741fadc
--- /dev/null
+++ b/3rdparty/7z/src/7zStream.c
@@ -0,0 +1,176 @@
+/* 7zStream.c -- 7z Stream functions
+2017-04-03 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <string.h>
+
+#include "7zTypes.h"
+
+SRes SeqInStream_Read2(const ISeqInStream *stream, void *buf, size_t size, SRes errorType)
+{
+  while (size != 0)
+  {
+    size_t processed = size;
+    RINOK(ISeqInStream_Read(stream, buf, &processed));
+    if (processed == 0)
+      return errorType;
+    buf = (void *)((Byte *)buf + processed);
+    size -= processed;
+  }
+  return SZ_OK;
+}
+
+SRes SeqInStream_Read(const ISeqInStream *stream, void *buf, size_t size)
+{
+  return SeqInStream_Read2(stream, buf, size, SZ_ERROR_INPUT_EOF);
+}
+
+SRes SeqInStream_ReadByte(const ISeqInStream *stream, Byte *buf)
+{
+  size_t processed = 1;
+  RINOK(ISeqInStream_Read(stream, buf, &processed));
+  return (processed == 1) ? SZ_OK : SZ_ERROR_INPUT_EOF;
+}
+
+
+
+SRes LookInStream_SeekTo(const ILookInStream *stream, UInt64 offset)
+{
+  Int64 t = offset;
+  return ILookInStream_Seek(stream, &t, SZ_SEEK_SET);
+}
+
+SRes LookInStream_LookRead(const ILookInStream *stream, void *buf, size_t *size)
+{
+  const void *lookBuf;
+  if (*size == 0)
+    return SZ_OK;
+  RINOK(ILookInStream_Look(stream, &lookBuf, size));
+  memcpy(buf, lookBuf, *size);
+  return ILookInStream_Skip(stream, *size);
+}
+
+SRes LookInStream_Read2(const ILookInStream *stream, void *buf, size_t size, SRes errorType)
+{
+  while (size != 0)
+  {
+    size_t processed = size;
+    RINOK(ILookInStream_Read(stream, buf, &processed));
+    if (processed == 0)
+      return errorType;
+    buf = (void *)((Byte *)buf + processed);
+    size -= processed;
+  }
+  return SZ_OK;
+}
+
+SRes LookInStream_Read(const ILookInStream *stream, void *buf, size_t size)
+{
+  return LookInStream_Read2(stream, buf, size, SZ_ERROR_INPUT_EOF);
+}
+
+
+
+#define GET_LookToRead2 CLookToRead2 *p = CONTAINER_FROM_VTBL(pp, CLookToRead2, vt);
+
+static SRes LookToRead2_Look_Lookahead(const ILookInStream *pp, const void **buf, size_t *size)
+{
+  SRes res = SZ_OK;
+  GET_LookToRead2
+  size_t size2 = p->size - p->pos;
+  if (size2 == 0 && *size != 0)
+  {
+    p->pos = 0;
+    p->size = 0;
+    size2 = p->bufSize;
+    res = ISeekInStream_Read(p->realStream, p->buf, &size2);
+    p->size = size2;
+  }
+  if (*size > size2)
+    *size = size2;
+  *buf = p->buf + p->pos;
+  return res;
+}
+
+static SRes LookToRead2_Look_Exact(const ILookInStream *pp, const void **buf, size_t *size)
+{
+  SRes res = SZ_OK;
+  GET_LookToRead2
+  size_t size2 = p->size - p->pos;
+  if (size2 == 0 && *size != 0)
+  {
+    p->pos = 0;
+    p->size = 0;
+    if (*size > p->bufSize)
+      *size = p->bufSize;
+    res = ISeekInStream_Read(p->realStream, p->buf, size);
+    size2 = p->size = *size;
+  }
+  if (*size > size2)
+    *size = size2;
+  *buf = p->buf + p->pos;
+  return res;
+}
+
+static SRes LookToRead2_Skip(const ILookInStream *pp, size_t offset)
+{
+  GET_LookToRead2
+  p->pos += offset;
+  return SZ_OK;
+}
+
+static SRes LookToRead2_Read(const ILookInStream *pp, void *buf, size_t *size)
+{
+  GET_LookToRead2
+  size_t rem = p->size - p->pos;
+  if (rem == 0)
+    return ISeekInStream_Read(p->realStream, buf, size);
+  if (rem > *size)
+    rem = *size;
+  memcpy(buf, p->buf + p->pos, rem);
+  p->pos += rem;
+  *size = rem;
+  return SZ_OK;
+}
+
+static SRes LookToRead2_Seek(const ILookInStream *pp, Int64 *pos, ESzSeek origin)
+{
+  GET_LookToRead2
+  p->pos = p->size = 0;
+  return ISeekInStream_Seek(p->realStream, pos, origin);
+}
+
+void LookToRead2_CreateVTable(CLookToRead2 *p, int lookahead)
+{
+  p->vt.Look = lookahead ?
+      LookToRead2_Look_Lookahead :
+      LookToRead2_Look_Exact;
+  p->vt.Skip = LookToRead2_Skip;
+  p->vt.Read = LookToRead2_Read;
+  p->vt.Seek = LookToRead2_Seek;
+}
+
+
+
+static SRes SecToLook_Read(const ISeqInStream *pp, void *buf, size_t *size)
+{
+  CSecToLook *p = CONTAINER_FROM_VTBL(pp, CSecToLook, vt);
+  return LookInStream_LookRead(p->realStream, buf, size);
+}
+
+void SecToLook_CreateVTable(CSecToLook *p)
+{
+  p->vt.Read = SecToLook_Read;
+}
+
+static SRes SecToRead_Read(const ISeqInStream *pp, void *buf, size_t *size)
+{
+  CSecToRead *p = CONTAINER_FROM_VTBL(pp, CSecToRead, vt);
+  return ILookInStream_Read(p->realStream, buf, size);
+}
+
+void SecToRead_CreateVTable(CSecToRead *p)
+{
+  p->vt.Read = SecToRead_Read;
+}
diff --git a/3rdparty/7z/src/7zTypes.h b/3rdparty/7z/src/7zTypes.h
new file mode 100644
index 0000000000..593f5aa259
--- /dev/null
+++ b/3rdparty/7z/src/7zTypes.h
@@ -0,0 +1,375 @@
+/* 7zTypes.h -- Basic types
+2018-08-04 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_TYPES_H
+#define __7Z_TYPES_H
+
+#ifdef _WIN32
+/* #include <windows.h> */
+#endif
+
+#include <stddef.h>
+
+#ifndef EXTERN_C_BEGIN
+#ifdef __cplusplus
+#define EXTERN_C_BEGIN extern "C" {
+#define EXTERN_C_END }
+#else
+#define EXTERN_C_BEGIN
+#define EXTERN_C_END
+#endif
+#endif
+
+EXTERN_C_BEGIN
+
+#define SZ_OK 0
+
+#define SZ_ERROR_DATA 1
+#define SZ_ERROR_MEM 2
+#define SZ_ERROR_CRC 3
+#define SZ_ERROR_UNSUPPORTED 4
+#define SZ_ERROR_PARAM 5
+#define SZ_ERROR_INPUT_EOF 6
+#define SZ_ERROR_OUTPUT_EOF 7
+#define SZ_ERROR_READ 8
+#define SZ_ERROR_WRITE 9
+#define SZ_ERROR_PROGRESS 10
+#define SZ_ERROR_FAIL 11
+#define SZ_ERROR_THREAD 12
+
+#define SZ_ERROR_ARCHIVE 16
+#define SZ_ERROR_NO_ARCHIVE 17
+
+typedef int SRes;
+
+
+#ifdef _WIN32
+
+/* typedef DWORD WRes; */
+typedef unsigned WRes;
+#define MY_SRes_HRESULT_FROM_WRes(x) HRESULT_FROM_WIN32(x)
+
+#else
+
+typedef int WRes;
+#define MY__FACILITY_WIN32 7
+#define MY__FACILITY__WRes MY__FACILITY_WIN32
+#define MY_SRes_HRESULT_FROM_WRes(x) ((HRESULT)(x) <= 0 ? ((HRESULT)(x)) : ((HRESULT) (((x) & 0x0000FFFF) | (MY__FACILITY__WRes << 16) | 0x80000000)))
+
+#endif
+
+
+#ifndef RINOK
+#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
+#endif
+
+typedef unsigned char Byte;
+typedef short Int16;
+typedef unsigned short UInt16;
+
+#ifdef _LZMA_UINT32_IS_ULONG
+typedef long Int32;
+typedef unsigned long UInt32;
+#else
+typedef int Int32;
+typedef unsigned int UInt32;
+#endif
+
+#ifdef _SZ_NO_INT_64
+
+/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
+   NOTES: Some code will work incorrectly in that case! */
+
+typedef long Int64;
+typedef unsigned long UInt64;
+
+#else
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+typedef __int64 Int64;
+typedef unsigned __int64 UInt64;
+#define UINT64_CONST(n) n
+#else
+typedef long long int Int64;
+typedef unsigned long long int UInt64;
+#define UINT64_CONST(n) n ## ULL
+#endif
+
+#endif
+
+#ifdef _LZMA_NO_SYSTEM_SIZE_T
+typedef UInt32 SizeT;
+#else
+typedef size_t SizeT;
+#endif
+
+typedef int BoolInt;
+/* typedef BoolInt Bool; */
+#define True 1
+#define False 0
+
+
+#ifdef _WIN32
+#define MY_STD_CALL __stdcall
+#else
+#define MY_STD_CALL
+#endif
+
+#ifdef _MSC_VER
+
+#if _MSC_VER >= 1300
+#define MY_NO_INLINE __declspec(noinline)
+#else
+#define MY_NO_INLINE
+#endif
+
+#define MY_FORCE_INLINE __forceinline
+
+#define MY_CDECL __cdecl
+#define MY_FAST_CALL __fastcall
+
+#else
+
+#define MY_NO_INLINE
+#define MY_FORCE_INLINE
+#define MY_CDECL
+#define MY_FAST_CALL
+
+/* inline keyword : for C++ / C99 */
+
+/* GCC, clang: */
+/*
+#if defined (__GNUC__) && (__GNUC__ >= 4)
+#define MY_FORCE_INLINE __attribute__((always_inline))
+#define MY_NO_INLINE __attribute__((noinline))
+#endif
+*/
+
+#endif
+
+
+/* The following interfaces use first parameter as pointer to structure */
+
+typedef struct IByteIn IByteIn;
+struct IByteIn
+{
+  Byte (*Read)(const IByteIn *p); /* reads one byte, returns 0 in case of EOF or error */
+};
+#define IByteIn_Read(p) (p)->Read(p)
+
+
+typedef struct IByteOut IByteOut;
+struct IByteOut
+{
+  void (*Write)(const IByteOut *p, Byte b);
+};
+#define IByteOut_Write(p, b) (p)->Write(p, b)
+
+
+typedef struct ISeqInStream ISeqInStream;
+struct ISeqInStream
+{
+  SRes (*Read)(const ISeqInStream *p, void *buf, size_t *size);
+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
+       (output(*size) < input(*size)) is allowed */
+};
+#define ISeqInStream_Read(p, buf, size) (p)->Read(p, buf, size)
+
+/* it can return SZ_ERROR_INPUT_EOF */
+SRes SeqInStream_Read(const ISeqInStream *stream, void *buf, size_t size);
+SRes SeqInStream_Read2(const ISeqInStream *stream, void *buf, size_t size, SRes errorType);
+SRes SeqInStream_ReadByte(const ISeqInStream *stream, Byte *buf);
+
+
+typedef struct ISeqOutStream ISeqOutStream;
+struct ISeqOutStream
+{
+  size_t (*Write)(const ISeqOutStream *p, const void *buf, size_t size);
+    /* Returns: result - the number of actually written bytes.
+       (result < size) means error */
+};
+#define ISeqOutStream_Write(p, buf, size) (p)->Write(p, buf, size)
+
+typedef enum
+{
+  SZ_SEEK_SET = 0,
+  SZ_SEEK_CUR = 1,
+  SZ_SEEK_END = 2
+} ESzSeek;
+
+
+typedef struct ISeekInStream ISeekInStream;
+struct ISeekInStream
+{
+  SRes (*Read)(const ISeekInStream *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
+  SRes (*Seek)(const ISeekInStream *p, Int64 *pos, ESzSeek origin);
+};
+#define ISeekInStream_Read(p, buf, size)   (p)->Read(p, buf, size)
+#define ISeekInStream_Seek(p, pos, origin) (p)->Seek(p, pos, origin)
+
+
+typedef struct ILookInStream ILookInStream;
+struct ILookInStream
+{
+  SRes (*Look)(const ILookInStream *p, const void **buf, size_t *size);
+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
+       (output(*size) > input(*size)) is not allowed
+       (output(*size) < input(*size)) is allowed */
+  SRes (*Skip)(const ILookInStream *p, size_t offset);
+    /* offset must be <= output(*size) of Look */
+
+  SRes (*Read)(const ILookInStream *p, void *buf, size_t *size);
+    /* reads directly (without buffer). It's same as ISeqInStream::Read */
+  SRes (*Seek)(const ILookInStream *p, Int64 *pos, ESzSeek origin);
+};
+
+#define ILookInStream_Look(p, buf, size)   (p)->Look(p, buf, size)
+#define ILookInStream_Skip(p, offset)      (p)->Skip(p, offset)
+#define ILookInStream_Read(p, buf, size)   (p)->Read(p, buf, size)
+#define ILookInStream_Seek(p, pos, origin) (p)->Seek(p, pos, origin)
+
+
+SRes LookInStream_LookRead(const ILookInStream *stream, void *buf, size_t *size);
+SRes LookInStream_SeekTo(const ILookInStream *stream, UInt64 offset);
+
+/* reads via ILookInStream::Read */
+SRes LookInStream_Read2(const ILookInStream *stream, void *buf, size_t size, SRes errorType);
+SRes LookInStream_Read(const ILookInStream *stream, void *buf, size_t size);
+
+
+
+typedef struct
+{
+  ILookInStream vt;
+  const ISeekInStream *realStream;
+ 
+  size_t pos;
+  size_t size; /* it's data size */
+  
+  /* the following variables must be set outside */
+  Byte *buf;
+  size_t bufSize;
+} CLookToRead2;
+
+void LookToRead2_CreateVTable(CLookToRead2 *p, int lookahead);
+
+#define LookToRead2_Init(p) { (p)->pos = (p)->size = 0; }
+
+
+typedef struct
+{
+  ISeqInStream vt;
+  const ILookInStream *realStream;
+} CSecToLook;
+
+void SecToLook_CreateVTable(CSecToLook *p);
+
+
+
+typedef struct
+{
+  ISeqInStream vt;
+  const ILookInStream *realStream;
+} CSecToRead;
+
+void SecToRead_CreateVTable(CSecToRead *p);
+
+
+typedef struct ICompressProgress ICompressProgress;
+
+struct ICompressProgress
+{
+  SRes (*Progress)(const ICompressProgress *p, UInt64 inSize, UInt64 outSize);
+    /* Returns: result. (result != SZ_OK) means break.
+       Value (UInt64)(Int64)-1 for size means unknown value. */
+};
+#define ICompressProgress_Progress(p, inSize, outSize) (p)->Progress(p, inSize, outSize)
+
+
+
+typedef struct ISzAlloc ISzAlloc;
+typedef const ISzAlloc * ISzAllocPtr;
+
+struct ISzAlloc
+{
+  void *(*Alloc)(ISzAllocPtr p, size_t size);
+  void (*Free)(ISzAllocPtr p, void *address); /* address can be 0 */
+};
+
+#define ISzAlloc_Alloc(p, size) (p)->Alloc(p, size)
+#define ISzAlloc_Free(p, a) (p)->Free(p, a)
+
+/* deprecated */
+#define IAlloc_Alloc(p, size) ISzAlloc_Alloc(p, size)
+#define IAlloc_Free(p, a) ISzAlloc_Free(p, a)
+
+
+
+
+
+#ifndef MY_offsetof
+  #ifdef offsetof
+    #define MY_offsetof(type, m) offsetof(type, m)
+    /*
+    #define MY_offsetof(type, m) FIELD_OFFSET(type, m)
+    */
+  #else
+    #define MY_offsetof(type, m) ((size_t)&(((type *)0)->m))
+  #endif
+#endif
+
+
+
+#ifndef MY_container_of
+
+/*
+#define MY_container_of(ptr, type, m) container_of(ptr, type, m)
+#define MY_container_of(ptr, type, m) CONTAINING_RECORD(ptr, type, m)
+#define MY_container_of(ptr, type, m) ((type *)((char *)(ptr) - offsetof(type, m)))
+#define MY_container_of(ptr, type, m) (&((type *)0)->m == (ptr), ((type *)(((char *)(ptr)) - MY_offsetof(type, m))))
+*/
+
+/*
+  GCC shows warning: "perhaps the 'offsetof' macro was used incorrectly"
+    GCC 3.4.4 : classes with constructor
+    GCC 4.8.1 : classes with non-public variable members"
+*/
+
+#define MY_container_of(ptr, type, m) ((type *)((char *)(1 ? (ptr) : &((type *)0)->m) - MY_offsetof(type, m)))
+
+
+#endif
+
+#define CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m) ((type *)(ptr))
+
+/*
+#define CONTAINER_FROM_VTBL(ptr, type, m) CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m)
+*/
+#define CONTAINER_FROM_VTBL(ptr, type, m) MY_container_of(ptr, type, m)
+
+#define CONTAINER_FROM_VTBL_CLS(ptr, type, m) CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m)
+/*
+#define CONTAINER_FROM_VTBL_CLS(ptr, type, m) CONTAINER_FROM_VTBL(ptr, type, m)
+*/
+
+
+
+#ifdef _WIN32
+
+#define CHAR_PATH_SEPARATOR '\\'
+#define WCHAR_PATH_SEPARATOR L'\\'
+#define STRING_PATH_SEPARATOR "\\"
+#define WSTRING_PATH_SEPARATOR L"\\"
+
+#else
+
+#define CHAR_PATH_SEPARATOR '/'
+#define WCHAR_PATH_SEPARATOR L'/'
+#define STRING_PATH_SEPARATOR "/"
+#define WSTRING_PATH_SEPARATOR L"/"
+
+#endif
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/7zVersion.h b/3rdparty/7z/src/7zVersion.h
new file mode 100644
index 0000000000..0074c64be9
--- /dev/null
+++ b/3rdparty/7z/src/7zVersion.h
@@ -0,0 +1,27 @@
+#define MY_VER_MAJOR 19
+#define MY_VER_MINOR 00
+#define MY_VER_BUILD 0
+#define MY_VERSION_NUMBERS "19.00"
+#define MY_VERSION MY_VERSION_NUMBERS
+
+#ifdef MY_CPU_NAME
+  #define MY_VERSION_CPU MY_VERSION " (" MY_CPU_NAME ")"
+#else
+  #define MY_VERSION_CPU MY_VERSION
+#endif
+
+#define MY_DATE "2019-02-21"
+#undef MY_COPYRIGHT
+#undef MY_VERSION_COPYRIGHT_DATE
+#define MY_AUTHOR_NAME "Igor Pavlov"
+#define MY_COPYRIGHT_PD "Igor Pavlov : Public domain"
+#define MY_COPYRIGHT_CR "Copyright (c) 1999-2018 Igor Pavlov"
+
+#ifdef USE_COPYRIGHT_CR
+  #define MY_COPYRIGHT MY_COPYRIGHT_CR
+#else
+  #define MY_COPYRIGHT MY_COPYRIGHT_PD
+#endif
+
+#define MY_COPYRIGHT_DATE MY_COPYRIGHT " : " MY_DATE
+#define MY_VERSION_COPYRIGHT_DATE MY_VERSION_CPU " : " MY_COPYRIGHT " : " MY_DATE
diff --git a/3rdparty/7z/src/7zVersion.rc b/3rdparty/7z/src/7zVersion.rc
new file mode 100644
index 0000000000..6ed26de744
--- /dev/null
+++ b/3rdparty/7z/src/7zVersion.rc
@@ -0,0 +1,55 @@
+#define MY_VS_FFI_FILEFLAGSMASK  0x0000003FL
+#define MY_VOS_NT_WINDOWS32  0x00040004L
+#define MY_VOS_CE_WINDOWS32  0x00050004L
+
+#define MY_VFT_APP  0x00000001L
+#define MY_VFT_DLL  0x00000002L
+
+// #include <WinVer.h>
+
+#ifndef MY_VERSION
+#include "7zVersion.h"
+#endif
+
+#define MY_VER MY_VER_MAJOR,MY_VER_MINOR,MY_VER_BUILD,0
+
+#ifdef DEBUG
+#define DBG_FL VS_FF_DEBUG
+#else
+#define DBG_FL 0
+#endif
+
+#define MY_VERSION_INFO(fileType, descr, intName, origName)  \
+LANGUAGE 9, 1 \
+1 VERSIONINFO \
+  FILEVERSION MY_VER \
+  PRODUCTVERSION MY_VER \
+  FILEFLAGSMASK MY_VS_FFI_FILEFLAGSMASK \
+  FILEFLAGS DBG_FL \
+  FILEOS MY_VOS_NT_WINDOWS32 \
+  FILETYPE fileType \
+  FILESUBTYPE 0x0L \
+BEGIN \
+    BLOCK "StringFileInfo" \
+    BEGIN  \
+        BLOCK "040904b0" \
+        BEGIN \
+            VALUE "CompanyName", "Igor Pavlov" \
+            VALUE "FileDescription", descr \
+            VALUE "FileVersion", MY_VERSION  \
+            VALUE "InternalName", intName \
+            VALUE "LegalCopyright", MY_COPYRIGHT \
+            VALUE "OriginalFilename", origName \
+            VALUE "ProductName", "7-Zip" \
+            VALUE "ProductVersion", MY_VERSION \
+        END \
+    END \
+    BLOCK "VarFileInfo" \
+    BEGIN \
+        VALUE "Translation", 0x409, 1200 \
+    END \
+END
+
+#define MY_VERSION_INFO_APP(descr, intName) MY_VERSION_INFO(MY_VFT_APP, descr, intName, intName ".exe")
+
+#define MY_VERSION_INFO_DLL(descr, intName) MY_VERSION_INFO(MY_VFT_DLL, descr, intName, intName ".dll")
diff --git a/3rdparty/7z/src/Aes.c b/3rdparty/7z/src/Aes.c
new file mode 100644
index 0000000000..8f7d50ea24
--- /dev/null
+++ b/3rdparty/7z/src/Aes.c
@@ -0,0 +1,306 @@
+/* Aes.c -- AES encryption / decryption
+2017-01-24 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "Aes.h"
+#include "CpuArch.h"
+
+static UInt32 T[256 * 4];
+static const Byte Sbox[256] = {
+  0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+  0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+  0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+  0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+  0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+  0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+  0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+  0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+  0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+  0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+  0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+  0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+  0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+  0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+  0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+  0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16};
+
+void MY_FAST_CALL AesCbc_Encode(UInt32 *ivAes, Byte *data, size_t numBlocks);
+void MY_FAST_CALL AesCbc_Decode(UInt32 *ivAes, Byte *data, size_t numBlocks);
+void MY_FAST_CALL AesCtr_Code(UInt32 *ivAes, Byte *data, size_t numBlocks);
+
+void MY_FAST_CALL AesCbc_Encode_Intel(UInt32 *ivAes, Byte *data, size_t numBlocks);
+void MY_FAST_CALL AesCbc_Decode_Intel(UInt32 *ivAes, Byte *data, size_t numBlocks);
+void MY_FAST_CALL AesCtr_Code_Intel(UInt32 *ivAes, Byte *data, size_t numBlocks);
+
+AES_CODE_FUNC g_AesCbc_Encode;
+AES_CODE_FUNC g_AesCbc_Decode;
+AES_CODE_FUNC g_AesCtr_Code;
+
+static UInt32 D[256 * 4];
+static Byte InvS[256];
+
+static const Byte Rcon[11] = { 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36 };
+
+#define xtime(x) ((((x) << 1) ^ (((x) & 0x80) != 0 ? 0x1B : 0)) & 0xFF)
+
+#define Ui32(a0, a1, a2, a3) ((UInt32)(a0) | ((UInt32)(a1) << 8) | ((UInt32)(a2) << 16) | ((UInt32)(a3) << 24))
+
+#define gb0(x) ( (x)          & 0xFF)
+#define gb1(x) (((x) >> ( 8)) & 0xFF)
+#define gb2(x) (((x) >> (16)) & 0xFF)
+#define gb3(x) (((x) >> (24)))
+
+#define gb(n, x) gb ## n(x)
+
+#define TT(x) (T + (x << 8))
+#define DD(x) (D + (x << 8))
+
+
+void AesGenTables(void)
+{
+  unsigned i;
+  for (i = 0; i < 256; i++)
+    InvS[Sbox[i]] = (Byte)i;
+  
+  for (i = 0; i < 256; i++)
+  {
+    {
+      UInt32 a1 = Sbox[i];
+      UInt32 a2 = xtime(a1);
+      UInt32 a3 = a2 ^ a1;
+      TT(0)[i] = Ui32(a2, a1, a1, a3);
+      TT(1)[i] = Ui32(a3, a2, a1, a1);
+      TT(2)[i] = Ui32(a1, a3, a2, a1);
+      TT(3)[i] = Ui32(a1, a1, a3, a2);
+    }
+    {
+      UInt32 a1 = InvS[i];
+      UInt32 a2 = xtime(a1);
+      UInt32 a4 = xtime(a2);
+      UInt32 a8 = xtime(a4);
+      UInt32 a9 = a8 ^ a1;
+      UInt32 aB = a8 ^ a2 ^ a1;
+      UInt32 aD = a8 ^ a4 ^ a1;
+      UInt32 aE = a8 ^ a4 ^ a2;
+      DD(0)[i] = Ui32(aE, a9, aD, aB);
+      DD(1)[i] = Ui32(aB, aE, a9, aD);
+      DD(2)[i] = Ui32(aD, aB, aE, a9);
+      DD(3)[i] = Ui32(a9, aD, aB, aE);
+    }
+  }
+  
+  g_AesCbc_Encode = AesCbc_Encode;
+  g_AesCbc_Decode = AesCbc_Decode;
+  g_AesCtr_Code = AesCtr_Code;
+  
+  #ifdef MY_CPU_X86_OR_AMD64
+  if (CPU_Is_Aes_Supported())
+  {
+    g_AesCbc_Encode = AesCbc_Encode_Intel;
+    g_AesCbc_Decode = AesCbc_Decode_Intel;
+    g_AesCtr_Code = AesCtr_Code_Intel;
+  }
+  #endif
+}
+
+
+#define HT(i, x, s) TT(x)[gb(x, s[(i + x) & 3])]
+
+#define HT4(m, i, s, p) m[i] = \
+    HT(i, 0, s) ^ \
+    HT(i, 1, s) ^ \
+    HT(i, 2, s) ^ \
+    HT(i, 3, s) ^ w[p + i]
+
+#define HT16(m, s, p) \
+    HT4(m, 0, s, p); \
+    HT4(m, 1, s, p); \
+    HT4(m, 2, s, p); \
+    HT4(m, 3, s, p); \
+
+#define FT(i, x) Sbox[gb(x, m[(i + x) & 3])]
+#define FT4(i) dest[i] = Ui32(FT(i, 0), FT(i, 1), FT(i, 2), FT(i, 3)) ^ w[i];
+
+
+#define HD(i, x, s) DD(x)[gb(x, s[(i - x) & 3])]
+
+#define HD4(m, i, s, p) m[i] = \
+    HD(i, 0, s) ^ \
+    HD(i, 1, s) ^ \
+    HD(i, 2, s) ^ \
+    HD(i, 3, s) ^ w[p + i];
+
+#define HD16(m, s, p) \
+    HD4(m, 0, s, p); \
+    HD4(m, 1, s, p); \
+    HD4(m, 2, s, p); \
+    HD4(m, 3, s, p); \
+
+#define FD(i, x) InvS[gb(x, m[(i - x) & 3])]
+#define FD4(i) dest[i] = Ui32(FD(i, 0), FD(i, 1), FD(i, 2), FD(i, 3)) ^ w[i];
+
+void MY_FAST_CALL Aes_SetKey_Enc(UInt32 *w, const Byte *key, unsigned keySize)
+{
+  unsigned i, wSize;
+  wSize = keySize + 28;
+  keySize /= 4;
+  w[0] = ((UInt32)keySize / 2) + 3;
+  w += 4;
+
+  for (i = 0; i < keySize; i++, key += 4)
+    w[i] = GetUi32(key);
+
+  for (; i < wSize; i++)
+  {
+    UInt32 t = w[(size_t)i - 1];
+    unsigned rem = i % keySize;
+    if (rem == 0)
+      t = Ui32(Sbox[gb1(t)] ^ Rcon[i / keySize], Sbox[gb2(t)], Sbox[gb3(t)], Sbox[gb0(t)]);
+    else if (keySize > 6 && rem == 4)
+      t = Ui32(Sbox[gb0(t)], Sbox[gb1(t)], Sbox[gb2(t)], Sbox[gb3(t)]);
+    w[i] = w[i - keySize] ^ t;
+  }
+}
+
+void MY_FAST_CALL Aes_SetKey_Dec(UInt32 *w, const Byte *key, unsigned keySize)
+{
+  unsigned i, num;
+  Aes_SetKey_Enc(w, key, keySize);
+  num = keySize + 20;
+  w += 8;
+  for (i = 0; i < num; i++)
+  {
+    UInt32 r = w[i];
+    w[i] =
+      DD(0)[Sbox[gb0(r)]] ^
+      DD(1)[Sbox[gb1(r)]] ^
+      DD(2)[Sbox[gb2(r)]] ^
+      DD(3)[Sbox[gb3(r)]];
+  }
+}
+
+/* Aes_Encode and Aes_Decode functions work with little-endian words.
+  src and dest are pointers to 4 UInt32 words.
+  src and dest can point to same block */
+
+static void Aes_Encode(const UInt32 *w, UInt32 *dest, const UInt32 *src)
+{
+  UInt32 s[4];
+  UInt32 m[4];
+  UInt32 numRounds2 = w[0];
+  w += 4;
+  s[0] = src[0] ^ w[0];
+  s[1] = src[1] ^ w[1];
+  s[2] = src[2] ^ w[2];
+  s[3] = src[3] ^ w[3];
+  w += 4;
+  for (;;)
+  {
+    HT16(m, s, 0);
+    if (--numRounds2 == 0)
+      break;
+    HT16(s, m, 4);
+    w += 8;
+  }
+  w += 4;
+  FT4(0); FT4(1); FT4(2); FT4(3);
+}
+
+static void Aes_Decode(const UInt32 *w, UInt32 *dest, const UInt32 *src)
+{
+  UInt32 s[4];
+  UInt32 m[4];
+  UInt32 numRounds2 = w[0];
+  w += 4 + numRounds2 * 8;
+  s[0] = src[0] ^ w[0];
+  s[1] = src[1] ^ w[1];
+  s[2] = src[2] ^ w[2];
+  s[3] = src[3] ^ w[3];
+  for (;;)
+  {
+    w -= 8;
+    HD16(m, s, 4);
+    if (--numRounds2 == 0)
+      break;
+    HD16(s, m, 0);
+  }
+  FD4(0); FD4(1); FD4(2); FD4(3);
+}
+
+void AesCbc_Init(UInt32 *p, const Byte *iv)
+{
+  unsigned i;
+  for (i = 0; i < 4; i++)
+    p[i] = GetUi32(iv + i * 4);
+}
+
+void MY_FAST_CALL AesCbc_Encode(UInt32 *p, Byte *data, size_t numBlocks)
+{
+  for (; numBlocks != 0; numBlocks--, data += AES_BLOCK_SIZE)
+  {
+    p[0] ^= GetUi32(data);
+    p[1] ^= GetUi32(data + 4);
+    p[2] ^= GetUi32(data + 8);
+    p[3] ^= GetUi32(data + 12);
+    
+    Aes_Encode(p + 4, p, p);
+    
+    SetUi32(data,      p[0]);
+    SetUi32(data + 4,  p[1]);
+    SetUi32(data + 8,  p[2]);
+    SetUi32(data + 12, p[3]);
+  }
+}
+
+void MY_FAST_CALL AesCbc_Decode(UInt32 *p, Byte *data, size_t numBlocks)
+{
+  UInt32 in[4], out[4];
+  for (; numBlocks != 0; numBlocks--, data += AES_BLOCK_SIZE)
+  {
+    in[0] = GetUi32(data);
+    in[1] = GetUi32(data + 4);
+    in[2] = GetUi32(data + 8);
+    in[3] = GetUi32(data + 12);
+
+    Aes_Decode(p + 4, out, in);
+
+    SetUi32(data,      p[0] ^ out[0]);
+    SetUi32(data + 4,  p[1] ^ out[1]);
+    SetUi32(data + 8,  p[2] ^ out[2]);
+    SetUi32(data + 12, p[3] ^ out[3]);
+    
+    p[0] = in[0];
+    p[1] = in[1];
+    p[2] = in[2];
+    p[3] = in[3];
+  }
+}
+
+void MY_FAST_CALL AesCtr_Code(UInt32 *p, Byte *data, size_t numBlocks)
+{
+  for (; numBlocks != 0; numBlocks--)
+  {
+    UInt32 temp[4];
+    unsigned i;
+
+    if (++p[0] == 0)
+      p[1]++;
+    
+    Aes_Encode(p + 4, temp, p);
+    
+    for (i = 0; i < 4; i++, data += 4)
+    {
+      UInt32 t = temp[i];
+
+      #ifdef MY_CPU_LE_UNALIGN
+        *((UInt32 *)data) ^= t;
+      #else
+        data[0] ^= (t & 0xFF);
+        data[1] ^= ((t >> 8) & 0xFF);
+        data[2] ^= ((t >> 16) & 0xFF);
+        data[3] ^= ((t >> 24));
+      #endif
+    }
+  }
+}
diff --git a/3rdparty/7z/src/Aes.h b/3rdparty/7z/src/Aes.h
new file mode 100644
index 0000000000..381e979d1b
--- /dev/null
+++ b/3rdparty/7z/src/Aes.h
@@ -0,0 +1,38 @@
+/* Aes.h -- AES encryption / decryption
+2013-01-18 : Igor Pavlov : Public domain */
+
+#ifndef __AES_H
+#define __AES_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+#define AES_BLOCK_SIZE 16
+
+/* Call AesGenTables one time before other AES functions */
+void AesGenTables(void);
+
+/* UInt32 pointers must be 16-byte aligned */
+
+/* 16-byte (4 * 32-bit words) blocks: 1 (IV) + 1 (keyMode) + 15 (AES-256 roundKeys) */
+#define AES_NUM_IVMRK_WORDS ((1 + 1 + 15) * 4)
+
+/* aes - 16-byte aligned pointer to keyMode+roundKeys sequence */
+/* keySize = 16 or 24 or 32 (bytes) */
+typedef void (MY_FAST_CALL *AES_SET_KEY_FUNC)(UInt32 *aes, const Byte *key, unsigned keySize);
+void MY_FAST_CALL Aes_SetKey_Enc(UInt32 *aes, const Byte *key, unsigned keySize);
+void MY_FAST_CALL Aes_SetKey_Dec(UInt32 *aes, const Byte *key, unsigned keySize);
+
+/* ivAes - 16-byte aligned pointer to iv+keyMode+roundKeys sequence: UInt32[AES_NUM_IVMRK_WORDS] */
+void AesCbc_Init(UInt32 *ivAes, const Byte *iv); /* iv size is AES_BLOCK_SIZE */
+/* data - 16-byte aligned pointer to data */
+/* numBlocks - the number of 16-byte blocks in data array */
+typedef void (MY_FAST_CALL *AES_CODE_FUNC)(UInt32 *ivAes, Byte *data, size_t numBlocks);
+extern AES_CODE_FUNC g_AesCbc_Encode;
+extern AES_CODE_FUNC g_AesCbc_Decode;
+extern AES_CODE_FUNC g_AesCtr_Code;
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/AesOpt.c b/3rdparty/7z/src/AesOpt.c
new file mode 100644
index 0000000000..0e7f49a1b0
--- /dev/null
+++ b/3rdparty/7z/src/AesOpt.c
@@ -0,0 +1,184 @@
+/* AesOpt.c -- Intel's AES
+2017-06-08 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "CpuArch.h"
+
+#ifdef MY_CPU_X86_OR_AMD64
+#if (_MSC_VER > 1500) || (_MSC_FULL_VER >= 150030729)
+#define USE_INTEL_AES
+#endif
+#endif
+
+#ifdef USE_INTEL_AES
+
+#include <wmmintrin.h>
+
+void MY_FAST_CALL AesCbc_Encode_Intel(__m128i *p, __m128i *data, size_t numBlocks)
+{
+  __m128i m = *p;
+  for (; numBlocks != 0; numBlocks--, data++)
+  {
+    UInt32 numRounds2 = *(const UInt32 *)(p + 1) - 1;
+    const __m128i *w = p + 3;
+    m = _mm_xor_si128(m, *data);
+    m = _mm_xor_si128(m, p[2]);
+    do
+    {
+      m = _mm_aesenc_si128(m, w[0]);
+      m = _mm_aesenc_si128(m, w[1]);
+      w += 2;
+    }
+    while (--numRounds2 != 0);
+    m = _mm_aesenc_si128(m, w[0]);
+    m = _mm_aesenclast_si128(m, w[1]);
+    *data = m;
+  }
+  *p = m;
+}
+
+#define NUM_WAYS 3
+
+#define AES_OP_W(op, n) { \
+    const __m128i t = w[n]; \
+    m0 = op(m0, t); \
+    m1 = op(m1, t); \
+    m2 = op(m2, t); \
+    }
+
+#define AES_DEC(n) AES_OP_W(_mm_aesdec_si128, n)
+#define AES_DEC_LAST(n) AES_OP_W(_mm_aesdeclast_si128, n)
+#define AES_ENC(n) AES_OP_W(_mm_aesenc_si128, n)
+#define AES_ENC_LAST(n) AES_OP_W(_mm_aesenclast_si128, n)
+
+void MY_FAST_CALL AesCbc_Decode_Intel(__m128i *p, __m128i *data, size_t numBlocks)
+{
+  __m128i iv = *p;
+  for (; numBlocks >= NUM_WAYS; numBlocks -= NUM_WAYS, data += NUM_WAYS)
+  {
+    UInt32 numRounds2 = *(const UInt32 *)(p + 1);
+    const __m128i *w = p + numRounds2 * 2;
+    __m128i m0, m1, m2;
+    {
+      const __m128i t = w[2];
+      m0 = _mm_xor_si128(t, data[0]);
+      m1 = _mm_xor_si128(t, data[1]);
+      m2 = _mm_xor_si128(t, data[2]);
+    }
+    numRounds2--;
+    do
+    {
+      AES_DEC(1)
+      AES_DEC(0)
+      w -= 2;
+    }
+    while (--numRounds2 != 0);
+    AES_DEC(1)
+    AES_DEC_LAST(0)
+
+    {
+      __m128i t;
+      t = _mm_xor_si128(m0, iv); iv = data[0]; data[0] = t;
+      t = _mm_xor_si128(m1, iv); iv = data[1]; data[1] = t;
+      t = _mm_xor_si128(m2, iv); iv = data[2]; data[2] = t;
+    }
+  }
+  for (; numBlocks != 0; numBlocks--, data++)
+  {
+    UInt32 numRounds2 = *(const UInt32 *)(p + 1);
+    const __m128i *w = p + numRounds2 * 2;
+    __m128i m = _mm_xor_si128(w[2], *data);
+    numRounds2--;
+    do
+    {
+      m = _mm_aesdec_si128(m, w[1]);
+      m = _mm_aesdec_si128(m, w[0]);
+      w -= 2;
+    }
+    while (--numRounds2 != 0);
+    m = _mm_aesdec_si128(m, w[1]);
+    m = _mm_aesdeclast_si128(m, w[0]);
+
+    m = _mm_xor_si128(m, iv);
+    iv = *data;
+    *data = m;
+  }
+  *p = iv;
+}
+
+void MY_FAST_CALL AesCtr_Code_Intel(__m128i *p, __m128i *data, size_t numBlocks)
+{
+  __m128i ctr = *p;
+  __m128i one;
+  one.m128i_u64[0] = 1;
+  one.m128i_u64[1] = 0;
+  for (; numBlocks >= NUM_WAYS; numBlocks -= NUM_WAYS, data += NUM_WAYS)
+  {
+    UInt32 numRounds2 = *(const UInt32 *)(p + 1) - 1;
+    const __m128i *w = p;
+    __m128i m0, m1, m2;
+    {
+      const __m128i t = w[2];
+      ctr = _mm_add_epi64(ctr, one); m0 = _mm_xor_si128(ctr, t);
+      ctr = _mm_add_epi64(ctr, one); m1 = _mm_xor_si128(ctr, t);
+      ctr = _mm_add_epi64(ctr, one); m2 = _mm_xor_si128(ctr, t);
+    }
+    w += 3;
+    do
+    {
+      AES_ENC(0)
+      AES_ENC(1)
+      w += 2;
+    }
+    while (--numRounds2 != 0);
+    AES_ENC(0)
+    AES_ENC_LAST(1)
+    data[0] = _mm_xor_si128(data[0], m0);
+    data[1] = _mm_xor_si128(data[1], m1);
+    data[2] = _mm_xor_si128(data[2], m2);
+  }
+  for (; numBlocks != 0; numBlocks--, data++)
+  {
+    UInt32 numRounds2 = *(const UInt32 *)(p + 1) - 1;
+    const __m128i *w = p;
+    __m128i m;
+    ctr = _mm_add_epi64(ctr, one);
+    m = _mm_xor_si128(ctr, p[2]);
+    w += 3;
+    do
+    {
+      m = _mm_aesenc_si128(m, w[0]);
+      m = _mm_aesenc_si128(m, w[1]);
+      w += 2;
+    }
+    while (--numRounds2 != 0);
+    m = _mm_aesenc_si128(m, w[0]);
+    m = _mm_aesenclast_si128(m, w[1]);
+    *data = _mm_xor_si128(*data, m);
+  }
+  *p = ctr;
+}
+
+#else
+
+void MY_FAST_CALL AesCbc_Encode(UInt32 *ivAes, Byte *data, size_t numBlocks);
+void MY_FAST_CALL AesCbc_Decode(UInt32 *ivAes, Byte *data, size_t numBlocks);
+void MY_FAST_CALL AesCtr_Code(UInt32 *ivAes, Byte *data, size_t numBlocks);
+
+void MY_FAST_CALL AesCbc_Encode_Intel(UInt32 *p, Byte *data, size_t numBlocks)
+{
+  AesCbc_Encode(p, data, numBlocks);
+}
+
+void MY_FAST_CALL AesCbc_Decode_Intel(UInt32 *p, Byte *data, size_t numBlocks)
+{
+  AesCbc_Decode(p, data, numBlocks);
+}
+
+void MY_FAST_CALL AesCtr_Code_Intel(UInt32 *p, Byte *data, size_t numBlocks)
+{
+  AesCtr_Code(p, data, numBlocks);
+}
+
+#endif
diff --git a/3rdparty/7z/src/Alloc.c b/3rdparty/7z/src/Alloc.c
new file mode 100644
index 0000000000..30b499e5ff
--- /dev/null
+++ b/3rdparty/7z/src/Alloc.c
@@ -0,0 +1,455 @@
+/* Alloc.c -- Memory allocation functions
+2018-04-27 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <stdio.h>
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+#include <stdlib.h>
+
+#include "Alloc.h"
+
+/* #define _SZ_ALLOC_DEBUG */
+
+/* use _SZ_ALLOC_DEBUG to debug alloc/free operations */
+#ifdef _SZ_ALLOC_DEBUG
+
+#include <stdio.h>
+int g_allocCount = 0;
+int g_allocCountMid = 0;
+int g_allocCountBig = 0;
+
+
+#define CONVERT_INT_TO_STR(charType, tempSize) \
+  unsigned char temp[tempSize]; unsigned i = 0; \
+  while (val >= 10) { temp[i++] = (unsigned char)('0' + (unsigned)(val % 10)); val /= 10; } \
+  *s++ = (charType)('0' + (unsigned)val); \
+  while (i != 0) { i--; *s++ = temp[i]; } \
+  *s = 0;
+
+static void ConvertUInt64ToString(UInt64 val, char *s)
+{
+  CONVERT_INT_TO_STR(char, 24);
+}
+
+#define GET_HEX_CHAR(t) ((char)(((t < 10) ? ('0' + t) : ('A' + (t - 10)))))
+
+static void ConvertUInt64ToHex(UInt64 val, char *s)
+{
+  UInt64 v = val;
+  unsigned i;
+  for (i = 1;; i++)
+  {
+    v >>= 4;
+    if (v == 0)
+      break;
+  }
+  s[i] = 0;
+  do
+  {
+    unsigned t = (unsigned)(val & 0xF);
+    val >>= 4;
+    s[--i] = GET_HEX_CHAR(t);
+  }
+  while (i);
+}
+
+#define DEBUG_OUT_STREAM stderr
+
+static void Print(const char *s)
+{
+  fputs(s, DEBUG_OUT_STREAM);
+}
+
+static void PrintAligned(const char *s, size_t align)
+{
+  size_t len = strlen(s);
+  for(;;)
+  {
+    fputc(' ', DEBUG_OUT_STREAM);
+    if (len >= align)
+      break;
+    ++len;
+  }
+  Print(s);
+}
+
+static void PrintLn()
+{
+  Print("\n");
+}
+
+static void PrintHex(UInt64 v, size_t align)
+{
+  char s[32];
+  ConvertUInt64ToHex(v, s);
+  PrintAligned(s, align);
+}
+
+static void PrintDec(UInt64 v, size_t align)
+{
+  char s[32];
+  ConvertUInt64ToString(v, s);
+  PrintAligned(s, align);
+}
+
+static void PrintAddr(void *p)
+{
+  PrintHex((UInt64)(size_t)(ptrdiff_t)p, 12);
+}
+
+
+#define PRINT_ALLOC(name, cnt, size, ptr) \
+    Print(name " "); \
+    PrintDec(cnt++, 10); \
+    PrintHex(size, 10); \
+    PrintAddr(ptr); \
+    PrintLn();
+ 
+#define PRINT_FREE(name, cnt, ptr) if (ptr) { \
+    Print(name " "); \
+    PrintDec(--cnt, 10); \
+    PrintAddr(ptr); \
+    PrintLn(); }
+ 
+#else
+
+#define PRINT_ALLOC(name, cnt, size, ptr)
+#define PRINT_FREE(name, cnt, ptr)
+#define Print(s)
+#define PrintLn()
+#define PrintHex(v, align)
+#define PrintDec(v, align)
+#define PrintAddr(p)
+
+#endif
+
+
+
+void *MyAlloc(size_t size)
+{
+  if (size == 0)
+    return NULL;
+  #ifdef _SZ_ALLOC_DEBUG
+  {
+    void *p = malloc(size);
+    PRINT_ALLOC("Alloc    ", g_allocCount, size, p);
+    return p;
+  }
+  #else
+  return malloc(size);
+  #endif
+}
+
+void MyFree(void *address)
+{
+  PRINT_FREE("Free    ", g_allocCount, address);
+  
+  free(address);
+}
+
+#ifdef _WIN32
+
+void *MidAlloc(size_t size)
+{
+  if (size == 0)
+    return NULL;
+  
+  PRINT_ALLOC("Alloc-Mid", g_allocCountMid, size, NULL);
+  
+  return VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE);
+}
+
+void MidFree(void *address)
+{
+  PRINT_FREE("Free-Mid", g_allocCountMid, address);
+
+  if (!address)
+    return;
+  VirtualFree(address, 0, MEM_RELEASE);
+}
+
+#ifndef MEM_LARGE_PAGES
+#undef _7ZIP_LARGE_PAGES
+#endif
+
+#ifdef _7ZIP_LARGE_PAGES
+SIZE_T g_LargePageSize = 0;
+typedef SIZE_T (WINAPI *GetLargePageMinimumP)();
+#endif
+
+void SetLargePageSize()
+{
+  #ifdef _7ZIP_LARGE_PAGES
+  SIZE_T size;
+  GetLargePageMinimumP largePageMinimum = (GetLargePageMinimumP)
+        GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetLargePageMinimum");
+  if (!largePageMinimum)
+    return;
+  size = largePageMinimum();
+  if (size == 0 || (size & (size - 1)) != 0)
+    return;
+  g_LargePageSize = size;
+  #endif
+}
+
+
+void *BigAlloc(size_t size)
+{
+  if (size == 0)
+    return NULL;
+
+  PRINT_ALLOC("Alloc-Big", g_allocCountBig, size, NULL);
+  
+  #ifdef _7ZIP_LARGE_PAGES
+  {
+    SIZE_T ps = g_LargePageSize;
+    if (ps != 0 && ps <= (1 << 30) && size > (ps / 2))
+    {
+      size_t size2;
+      ps--;
+      size2 = (size + ps) & ~ps;
+      if (size2 >= size)
+      {
+        void *res = VirtualAlloc(NULL, size2, MEM_COMMIT | MEM_LARGE_PAGES, PAGE_READWRITE);
+        if (res)
+          return res;
+      }
+    }
+  }
+  #endif
+
+  return VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE);
+}
+
+void BigFree(void *address)
+{
+  PRINT_FREE("Free-Big", g_allocCountBig, address);
+  
+  if (!address)
+    return;
+  VirtualFree(address, 0, MEM_RELEASE);
+}
+
+#endif
+
+
+static void *SzAlloc(ISzAllocPtr p, size_t size) { UNUSED_VAR(p); return MyAlloc(size); }
+static void SzFree(ISzAllocPtr p, void *address) { UNUSED_VAR(p); MyFree(address); }
+const ISzAlloc g_Alloc = { SzAlloc, SzFree };
+
+static void *SzMidAlloc(ISzAllocPtr p, size_t size) { UNUSED_VAR(p); return MidAlloc(size); }
+static void SzMidFree(ISzAllocPtr p, void *address) { UNUSED_VAR(p); MidFree(address); }
+const ISzAlloc g_MidAlloc = { SzMidAlloc, SzMidFree };
+
+static void *SzBigAlloc(ISzAllocPtr p, size_t size) { UNUSED_VAR(p); return BigAlloc(size); }
+static void SzBigFree(ISzAllocPtr p, void *address) { UNUSED_VAR(p); BigFree(address); }
+const ISzAlloc g_BigAlloc = { SzBigAlloc, SzBigFree };
+
+
+/*
+  uintptr_t : <stdint.h> C99 (optional)
+            : unsupported in VS6
+*/
+
+#ifdef _WIN32
+  typedef UINT_PTR UIntPtr;
+#else
+  /*
+  typedef uintptr_t UIntPtr;
+  */
+  typedef ptrdiff_t UIntPtr;
+#endif
+
+
+#define ADJUST_ALLOC_SIZE 0
+/*
+#define ADJUST_ALLOC_SIZE (sizeof(void *) - 1)
+*/
+/*
+  Use (ADJUST_ALLOC_SIZE = (sizeof(void *) - 1)), if
+     MyAlloc() can return address that is NOT multiple of sizeof(void *).
+*/
+
+
+/*
+#define MY_ALIGN_PTR_DOWN(p, align) ((void *)((char *)(p) - ((size_t)(UIntPtr)(p) & ((align) - 1))))
+*/
+#define MY_ALIGN_PTR_DOWN(p, align) ((void *)((((UIntPtr)(p)) & ~((UIntPtr)(align) - 1))))
+
+#define MY_ALIGN_PTR_UP_PLUS(p, align) MY_ALIGN_PTR_DOWN(((char *)(p) + (align) + ADJUST_ALLOC_SIZE), align)
+
+
+#if (_POSIX_C_SOURCE >= 200112L) && !defined(_WIN32)
+  #define USE_posix_memalign
+#endif
+
+/*
+  This posix_memalign() is for test purposes only.
+  We also need special Free() function instead of free(),
+  if this posix_memalign() is used.
+*/
+
+/*
+static int posix_memalign(void **ptr, size_t align, size_t size)
+{
+  size_t newSize = size + align;
+  void *p;
+  void *pAligned;
+  *ptr = NULL;
+  if (newSize < size)
+    return 12; // ENOMEM
+  p = MyAlloc(newSize);
+  if (!p)
+    return 12; // ENOMEM
+  pAligned = MY_ALIGN_PTR_UP_PLUS(p, align);
+  ((void **)pAligned)[-1] = p;
+  *ptr = pAligned;
+  return 0;
+}
+*/
+
+/*
+  ALLOC_ALIGN_SIZE >= sizeof(void *)
+  ALLOC_ALIGN_SIZE >= cache_line_size
+*/
+
+#define ALLOC_ALIGN_SIZE ((size_t)1 << 7)
+
+static void *SzAlignedAlloc(ISzAllocPtr pp, size_t size)
+{
+  #ifndef USE_posix_memalign
+  
+  void *p;
+  void *pAligned;
+  size_t newSize;
+  UNUSED_VAR(pp);
+
+  /* also we can allocate additional dummy ALLOC_ALIGN_SIZE bytes after aligned
+     block to prevent cache line sharing with another allocated blocks */
+
+  newSize = size + ALLOC_ALIGN_SIZE * 1 + ADJUST_ALLOC_SIZE;
+  if (newSize < size)
+    return NULL;
+
+  p = MyAlloc(newSize);
+  
+  if (!p)
+    return NULL;
+  pAligned = MY_ALIGN_PTR_UP_PLUS(p, ALLOC_ALIGN_SIZE);
+
+  Print(" size="); PrintHex(size, 8);
+  Print(" a_size="); PrintHex(newSize, 8);
+  Print(" ptr="); PrintAddr(p);
+  Print(" a_ptr="); PrintAddr(pAligned);
+  PrintLn();
+
+  ((void **)pAligned)[-1] = p;
+
+  return pAligned;
+
+  #else
+
+  void *p;
+  UNUSED_VAR(pp);
+  if (posix_memalign(&p, ALLOC_ALIGN_SIZE, size))
+    return NULL;
+
+  Print(" posix_memalign="); PrintAddr(p);
+  PrintLn();
+
+  return p;
+
+  #endif
+}
+
+
+static void SzAlignedFree(ISzAllocPtr pp, void *address)
+{
+  UNUSED_VAR(pp);
+  #ifndef USE_posix_memalign
+  if (address)
+    MyFree(((void **)address)[-1]);
+  #else
+  free(address);
+  #endif
+}
+
+
+const ISzAlloc g_AlignedAlloc = { SzAlignedAlloc, SzAlignedFree };
+
+
+
+#define MY_ALIGN_PTR_DOWN_1(p) MY_ALIGN_PTR_DOWN(p, sizeof(void *))
+
+/* we align ptr to support cases where CAlignOffsetAlloc::offset is not multiply of sizeof(void *) */
+#define REAL_BLOCK_PTR_VAR(p) ((void **)MY_ALIGN_PTR_DOWN_1(p))[-1]
+/*
+#define REAL_BLOCK_PTR_VAR(p) ((void **)(p))[-1]
+*/
+
+static void *AlignOffsetAlloc_Alloc(ISzAllocPtr pp, size_t size)
+{
+  CAlignOffsetAlloc *p = CONTAINER_FROM_VTBL(pp, CAlignOffsetAlloc, vt);
+  void *adr;
+  void *pAligned;
+  size_t newSize;
+  size_t extra;
+  size_t alignSize = (size_t)1 << p->numAlignBits;
+
+  if (alignSize < sizeof(void *))
+    alignSize = sizeof(void *);
+  
+  if (p->offset >= alignSize)
+    return NULL;
+
+  /* also we can allocate additional dummy ALLOC_ALIGN_SIZE bytes after aligned
+     block to prevent cache line sharing with another allocated blocks */
+  extra = p->offset & (sizeof(void *) - 1);
+  newSize = size + alignSize + extra + ADJUST_ALLOC_SIZE;
+  if (newSize < size)
+    return NULL;
+
+  adr = ISzAlloc_Alloc(p->baseAlloc, newSize);
+  
+  if (!adr)
+    return NULL;
+
+  pAligned = (char *)MY_ALIGN_PTR_DOWN((char *)adr +
+      alignSize - p->offset + extra + ADJUST_ALLOC_SIZE, alignSize) + p->offset;
+
+  PrintLn();
+  Print("- Aligned: ");
+  Print(" size="); PrintHex(size, 8);
+  Print(" a_size="); PrintHex(newSize, 8);
+  Print(" ptr="); PrintAddr(adr);
+  Print(" a_ptr="); PrintAddr(pAligned);
+  PrintLn();
+
+  REAL_BLOCK_PTR_VAR(pAligned) = adr;
+
+  return pAligned;
+}
+
+
+static void AlignOffsetAlloc_Free(ISzAllocPtr pp, void *address)
+{
+  if (address)
+  {
+    CAlignOffsetAlloc *p = CONTAINER_FROM_VTBL(pp, CAlignOffsetAlloc, vt);
+    PrintLn();
+    Print("- Aligned Free: ");
+    PrintLn();
+    ISzAlloc_Free(p->baseAlloc, REAL_BLOCK_PTR_VAR(address));
+  }
+}
+
+
+void AlignOffsetAlloc_CreateVTable(CAlignOffsetAlloc *p)
+{
+  p->vt.Alloc = AlignOffsetAlloc_Alloc;
+  p->vt.Free = AlignOffsetAlloc_Free;
+}
diff --git a/3rdparty/7z/src/Alloc.h b/3rdparty/7z/src/Alloc.h
new file mode 100644
index 0000000000..3d796e5eee
--- /dev/null
+++ b/3rdparty/7z/src/Alloc.h
@@ -0,0 +1,51 @@
+/* Alloc.h -- Memory allocation functions
+2018-02-19 : Igor Pavlov : Public domain */
+
+#ifndef __COMMON_ALLOC_H
+#define __COMMON_ALLOC_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+void *MyAlloc(size_t size);
+void MyFree(void *address);
+
+#ifdef _WIN32
+
+void SetLargePageSize();
+
+void *MidAlloc(size_t size);
+void MidFree(void *address);
+void *BigAlloc(size_t size);
+void BigFree(void *address);
+
+#else
+
+#define MidAlloc(size) MyAlloc(size)
+#define MidFree(address) MyFree(address)
+#define BigAlloc(size) MyAlloc(size)
+#define BigFree(address) MyFree(address)
+
+#endif
+
+extern const ISzAlloc g_Alloc;
+extern const ISzAlloc g_BigAlloc;
+extern const ISzAlloc g_MidAlloc;
+extern const ISzAlloc g_AlignedAlloc;
+
+
+typedef struct
+{
+  ISzAlloc vt;
+  ISzAllocPtr baseAlloc;
+  unsigned numAlignBits; /* ((1 << numAlignBits) >= sizeof(void *)) */
+  size_t offset;         /* (offset == (k * sizeof(void *)) && offset < (1 << numAlignBits) */
+} CAlignOffsetAlloc;
+
+void AlignOffsetAlloc_CreateVTable(CAlignOffsetAlloc *p);
+
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/Bcj2.c b/3rdparty/7z/src/Bcj2.c
new file mode 100644
index 0000000000..da93985cf6
--- /dev/null
+++ b/3rdparty/7z/src/Bcj2.c
@@ -0,0 +1,257 @@
+/* Bcj2.c -- BCJ2 Decoder (Converter for x86 code)
+2018-04-28 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "Bcj2.h"
+#include "CpuArch.h"
+
+#define CProb UInt16
+
+#define kTopValue ((UInt32)1 << 24)
+#define kNumModelBits 11
+#define kBitModelTotal (1 << kNumModelBits)
+#define kNumMoveBits 5
+
+#define _IF_BIT_0 ttt = *prob; bound = (p->range >> kNumModelBits) * ttt; if (p->code < bound)
+#define _UPDATE_0 p->range = bound; *prob = (CProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
+#define _UPDATE_1 p->range -= bound; p->code -= bound; *prob = (CProb)(ttt - (ttt >> kNumMoveBits));
+
+void Bcj2Dec_Init(CBcj2Dec *p)
+{
+  unsigned i;
+
+  p->state = BCJ2_DEC_STATE_OK;
+  p->ip = 0;
+  p->temp[3] = 0;
+  p->range = 0;
+  p->code = 0;
+  for (i = 0; i < sizeof(p->probs) / sizeof(p->probs[0]); i++)
+    p->probs[i] = kBitModelTotal >> 1;
+}
+
+SRes Bcj2Dec_Decode(CBcj2Dec *p)
+{
+  if (p->range <= 5)
+  {
+    p->state = BCJ2_DEC_STATE_OK;
+    for (; p->range != 5; p->range++)
+    {
+      if (p->range == 1 && p->code != 0)
+        return SZ_ERROR_DATA;
+      
+      if (p->bufs[BCJ2_STREAM_RC] == p->lims[BCJ2_STREAM_RC])
+      {
+        p->state = BCJ2_STREAM_RC;
+        return SZ_OK;
+      }
+
+      p->code = (p->code << 8) | *(p->bufs[BCJ2_STREAM_RC])++;
+    }
+    
+    if (p->code == 0xFFFFFFFF)
+      return SZ_ERROR_DATA;
+    
+    p->range = 0xFFFFFFFF;
+  }
+  else if (p->state >= BCJ2_DEC_STATE_ORIG_0)
+  {
+    while (p->state <= BCJ2_DEC_STATE_ORIG_3)
+    {
+      Byte *dest = p->dest;
+      if (dest == p->destLim)
+        return SZ_OK;
+      *dest = p->temp[(size_t)p->state - BCJ2_DEC_STATE_ORIG_0];
+      p->state++;
+      p->dest = dest + 1;
+    }
+  }
+
+  /*
+  if (BCJ2_IS_32BIT_STREAM(p->state))
+  {
+    const Byte *cur = p->bufs[p->state];
+    if (cur == p->lims[p->state])
+      return SZ_OK;
+    p->bufs[p->state] = cur + 4;
+    
+    {
+      UInt32 val;
+      Byte *dest;
+      SizeT rem;
+      
+      p->ip += 4;
+      val = GetBe32(cur) - p->ip;
+      dest = p->dest;
+      rem = p->destLim - dest;
+      if (rem < 4)
+      {
+        SizeT i;
+        SetUi32(p->temp, val);
+        for (i = 0; i < rem; i++)
+          dest[i] = p->temp[i];
+        p->dest = dest + rem;
+        p->state = BCJ2_DEC_STATE_ORIG_0 + (unsigned)rem;
+        return SZ_OK;
+      }
+      SetUi32(dest, val);
+      p->temp[3] = (Byte)(val >> 24);
+      p->dest = dest + 4;
+      p->state = BCJ2_DEC_STATE_OK;
+    }
+  }
+  */
+
+  for (;;)
+  {
+    if (BCJ2_IS_32BIT_STREAM(p->state))
+      p->state = BCJ2_DEC_STATE_OK;
+    else
+    {
+      if (p->range < kTopValue)
+      {
+        if (p->bufs[BCJ2_STREAM_RC] == p->lims[BCJ2_STREAM_RC])
+        {
+          p->state = BCJ2_STREAM_RC;
+          return SZ_OK;
+        }
+        p->range <<= 8;
+        p->code = (p->code << 8) | *(p->bufs[BCJ2_STREAM_RC])++;
+      }
+
+      {
+        const Byte *src = p->bufs[BCJ2_STREAM_MAIN];
+        const Byte *srcLim;
+        Byte *dest;
+        SizeT num = p->lims[BCJ2_STREAM_MAIN] - src;
+        
+        if (num == 0)
+        {
+          p->state = BCJ2_STREAM_MAIN;
+          return SZ_OK;
+        }
+        
+        dest = p->dest;
+        if (num > (SizeT)(p->destLim - dest))
+        {
+          num = p->destLim - dest;
+          if (num == 0)
+          {
+            p->state = BCJ2_DEC_STATE_ORIG;
+            return SZ_OK;
+          }
+        }
+       
+        srcLim = src + num;
+
+        if (p->temp[3] == 0x0F && (src[0] & 0xF0) == 0x80)
+          *dest = src[0];
+        else for (;;)
+        {
+          Byte b = *src;
+          *dest = b;
+          if (b != 0x0F)
+          {
+            if ((b & 0xFE) == 0xE8)
+              break;
+            dest++;
+            if (++src != srcLim)
+              continue;
+            break;
+          }
+          dest++;
+          if (++src == srcLim)
+            break;
+          if ((*src & 0xF0) != 0x80)
+            continue;
+          *dest = *src;
+          break;
+        }
+        
+        num = src - p->bufs[BCJ2_STREAM_MAIN];
+        
+        if (src == srcLim)
+        {
+          p->temp[3] = src[-1];
+          p->bufs[BCJ2_STREAM_MAIN] = src;
+          p->ip += (UInt32)num;
+          p->dest += num;
+          p->state =
+            p->bufs[BCJ2_STREAM_MAIN] ==
+            p->lims[BCJ2_STREAM_MAIN] ?
+              (unsigned)BCJ2_STREAM_MAIN :
+              (unsigned)BCJ2_DEC_STATE_ORIG;
+          return SZ_OK;
+        }
+        
+        {
+          UInt32 bound, ttt;
+          CProb *prob;
+          Byte b = src[0];
+          Byte prev = (Byte)(num == 0 ? p->temp[3] : src[-1]);
+          
+          p->temp[3] = b;
+          p->bufs[BCJ2_STREAM_MAIN] = src + 1;
+          num++;
+          p->ip += (UInt32)num;
+          p->dest += num;
+          
+          prob = p->probs + (unsigned)(b == 0xE8 ? 2 + (unsigned)prev : (b == 0xE9 ? 1 : 0));
+          
+          _IF_BIT_0
+          {
+            _UPDATE_0
+            continue;
+          }
+          _UPDATE_1
+            
+        }
+      }
+    }
+
+    {
+      UInt32 val;
+      unsigned cj = (p->temp[3] == 0xE8) ? BCJ2_STREAM_CALL : BCJ2_STREAM_JUMP;
+      const Byte *cur = p->bufs[cj];
+      Byte *dest;
+      SizeT rem;
+      
+      if (cur == p->lims[cj])
+      {
+        p->state = cj;
+        break;
+      }
+      
+      val = GetBe32(cur);
+      p->bufs[cj] = cur + 4;
+
+      p->ip += 4;
+      val -= p->ip;
+      dest = p->dest;
+      rem = p->destLim - dest;
+      
+      if (rem < 4)
+      {
+        p->temp[0] = (Byte)val; if (rem > 0) dest[0] = (Byte)val; val >>= 8;
+        p->temp[1] = (Byte)val; if (rem > 1) dest[1] = (Byte)val; val >>= 8;
+        p->temp[2] = (Byte)val; if (rem > 2) dest[2] = (Byte)val; val >>= 8;
+        p->temp[3] = (Byte)val;
+        p->dest = dest + rem;
+        p->state = BCJ2_DEC_STATE_ORIG_0 + (unsigned)rem;
+        break;
+      }
+      
+      SetUi32(dest, val);
+      p->temp[3] = (Byte)(val >> 24);
+      p->dest = dest + 4;
+    }
+  }
+
+  if (p->range < kTopValue && p->bufs[BCJ2_STREAM_RC] != p->lims[BCJ2_STREAM_RC])
+  {
+    p->range <<= 8;
+    p->code = (p->code << 8) | *(p->bufs[BCJ2_STREAM_RC])++;
+  }
+
+  return SZ_OK;
+}
diff --git a/3rdparty/7z/src/Bcj2.h b/3rdparty/7z/src/Bcj2.h
new file mode 100644
index 0000000000..68893d2d12
--- /dev/null
+++ b/3rdparty/7z/src/Bcj2.h
@@ -0,0 +1,146 @@
+/* Bcj2.h -- BCJ2 Converter for x86 code
+2014-11-10 : Igor Pavlov : Public domain */
+
+#ifndef __BCJ2_H
+#define __BCJ2_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+#define BCJ2_NUM_STREAMS 4
+
+enum
+{
+  BCJ2_STREAM_MAIN,
+  BCJ2_STREAM_CALL,
+  BCJ2_STREAM_JUMP,
+  BCJ2_STREAM_RC
+};
+
+enum
+{
+  BCJ2_DEC_STATE_ORIG_0 = BCJ2_NUM_STREAMS,
+  BCJ2_DEC_STATE_ORIG_1,
+  BCJ2_DEC_STATE_ORIG_2,
+  BCJ2_DEC_STATE_ORIG_3,
+  
+  BCJ2_DEC_STATE_ORIG,
+  BCJ2_DEC_STATE_OK
+};
+
+enum
+{
+  BCJ2_ENC_STATE_ORIG = BCJ2_NUM_STREAMS,
+  BCJ2_ENC_STATE_OK
+};
+
+
+#define BCJ2_IS_32BIT_STREAM(s) ((s) == BCJ2_STREAM_CALL || (s) == BCJ2_STREAM_JUMP)
+
+/*
+CBcj2Dec / CBcj2Enc
+bufs sizes:
+  BUF_SIZE(n) = lims[n] - bufs[n]
+bufs sizes for BCJ2_STREAM_CALL and BCJ2_STREAM_JUMP must be mutliply of 4:
+    (BUF_SIZE(BCJ2_STREAM_CALL) & 3) == 0
+    (BUF_SIZE(BCJ2_STREAM_JUMP) & 3) == 0
+*/
+
+/*
+CBcj2Dec:
+dest is allowed to overlap with bufs[BCJ2_STREAM_MAIN], with the following conditions:
+  bufs[BCJ2_STREAM_MAIN] >= dest &&
+  bufs[BCJ2_STREAM_MAIN] - dest >= tempReserv +
+        BUF_SIZE(BCJ2_STREAM_CALL) +
+        BUF_SIZE(BCJ2_STREAM_JUMP)
+     tempReserv = 0 : for first call of Bcj2Dec_Decode
+     tempReserv = 4 : for any other calls of Bcj2Dec_Decode
+  overlap with offset = 1 is not allowed
+*/
+
+typedef struct
+{
+  const Byte *bufs[BCJ2_NUM_STREAMS];
+  const Byte *lims[BCJ2_NUM_STREAMS];
+  Byte *dest;
+  const Byte *destLim;
+
+  unsigned state; /* BCJ2_STREAM_MAIN has more priority than BCJ2_STATE_ORIG */
+
+  UInt32 ip;
+  Byte temp[4];
+  UInt32 range;
+  UInt32 code;
+  UInt16 probs[2 + 256];
+} CBcj2Dec;
+
+void Bcj2Dec_Init(CBcj2Dec *p);
+
+/* Returns: SZ_OK or SZ_ERROR_DATA */
+SRes Bcj2Dec_Decode(CBcj2Dec *p);
+
+#define Bcj2Dec_IsFinished(_p_) ((_p_)->code == 0)
+
+
+
+typedef enum
+{
+  BCJ2_ENC_FINISH_MODE_CONTINUE,
+  BCJ2_ENC_FINISH_MODE_END_BLOCK,
+  BCJ2_ENC_FINISH_MODE_END_STREAM
+} EBcj2Enc_FinishMode;
+
+typedef struct
+{
+  Byte *bufs[BCJ2_NUM_STREAMS];
+  const Byte *lims[BCJ2_NUM_STREAMS];
+  const Byte *src;
+  const Byte *srcLim;
+
+  unsigned state;
+  EBcj2Enc_FinishMode finishMode;
+
+  Byte prevByte;
+
+  Byte cache;
+  UInt32 range;
+  UInt64 low;
+  UInt64 cacheSize;
+
+  UInt32 ip;
+
+  /* 32-bit ralative offset in JUMP/CALL commands is
+       - (mod 4 GB)   in 32-bit mode
+       - signed Int32 in 64-bit mode
+     We use (mod 4 GB) check for fileSize.
+     Use fileSize up to 2 GB, if you want to support 32-bit and 64-bit code conversion. */
+  UInt32 fileIp;
+  UInt32 fileSize;    /* (fileSize <= ((UInt32)1 << 31)), 0 means no_limit */
+  UInt32 relatLimit;  /* (relatLimit <= ((UInt32)1 << 31)), 0 means desable_conversion */
+
+  UInt32 tempTarget;
+  unsigned tempPos;
+  Byte temp[4 * 2];
+
+  unsigned flushPos;
+  
+  UInt16 probs[2 + 256];
+} CBcj2Enc;
+
+void Bcj2Enc_Init(CBcj2Enc *p);
+void Bcj2Enc_Encode(CBcj2Enc *p);
+
+#define Bcj2Enc_Get_InputData_Size(p) ((SizeT)((p)->srcLim - (p)->src) + (p)->tempPos)
+#define Bcj2Enc_IsFinished(p) ((p)->flushPos == 5)
+
+
+#define BCJ2_RELAT_LIMIT_NUM_BITS 26
+#define BCJ2_RELAT_LIMIT ((UInt32)1 << BCJ2_RELAT_LIMIT_NUM_BITS)
+
+/* limit for CBcj2Enc::fileSize variable */
+#define BCJ2_FileSize_MAX ((UInt32)1 << 31)
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/Bcj2Enc.c b/3rdparty/7z/src/Bcj2Enc.c
new file mode 100644
index 0000000000..7a02ecde25
--- /dev/null
+++ b/3rdparty/7z/src/Bcj2Enc.c
@@ -0,0 +1,311 @@
+/* Bcj2Enc.c -- BCJ2 Encoder (Converter for x86 code)
+2019-02-02 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+/* #define SHOW_STAT */
+
+#ifdef SHOW_STAT
+#include <stdio.h>
+#define PRF(x) x
+#else
+#define PRF(x)
+#endif
+
+#include <string.h>
+
+#include "Bcj2.h"
+#include "CpuArch.h"
+
+#define CProb UInt16
+
+#define kTopValue ((UInt32)1 << 24)
+#define kNumModelBits 11
+#define kBitModelTotal (1 << kNumModelBits)
+#define kNumMoveBits 5
+
+void Bcj2Enc_Init(CBcj2Enc *p)
+{
+  unsigned i;
+
+  p->state = BCJ2_ENC_STATE_OK;
+  p->finishMode = BCJ2_ENC_FINISH_MODE_CONTINUE;
+
+  p->prevByte = 0;
+
+  p->cache = 0;
+  p->range = 0xFFFFFFFF;
+  p->low = 0;
+  p->cacheSize = 1;
+
+  p->ip = 0;
+
+  p->fileIp = 0;
+  p->fileSize = 0;
+  p->relatLimit = BCJ2_RELAT_LIMIT;
+
+  p->tempPos = 0;
+
+  p->flushPos = 0;
+
+  for (i = 0; i < sizeof(p->probs) / sizeof(p->probs[0]); i++)
+    p->probs[i] = kBitModelTotal >> 1;
+}
+
+static BoolInt MY_FAST_CALL RangeEnc_ShiftLow(CBcj2Enc *p)
+{
+  if ((UInt32)p->low < (UInt32)0xFF000000 || (UInt32)(p->low >> 32) != 0)
+  {
+    Byte *buf = p->bufs[BCJ2_STREAM_RC];
+    do
+    {
+      if (buf == p->lims[BCJ2_STREAM_RC])
+      {
+        p->state = BCJ2_STREAM_RC;
+        p->bufs[BCJ2_STREAM_RC] = buf;
+        return True;
+      }
+      *buf++ = (Byte)(p->cache + (Byte)(p->low >> 32));
+      p->cache = 0xFF;
+    }
+    while (--p->cacheSize);
+    p->bufs[BCJ2_STREAM_RC] = buf;
+    p->cache = (Byte)((UInt32)p->low >> 24);
+  }
+  p->cacheSize++;
+  p->low = (UInt32)p->low << 8;
+  return False;
+}
+
+static void Bcj2Enc_Encode_2(CBcj2Enc *p)
+{
+  if (BCJ2_IS_32BIT_STREAM(p->state))
+  {
+    Byte *cur = p->bufs[p->state];
+    if (cur == p->lims[p->state])
+      return;
+    SetBe32(cur, p->tempTarget);
+    p->bufs[p->state] = cur + 4;
+  }
+
+  p->state = BCJ2_ENC_STATE_ORIG;
+
+  for (;;)
+  {
+    if (p->range < kTopValue)
+    {
+      if (RangeEnc_ShiftLow(p))
+        return;
+      p->range <<= 8;
+    }
+
+    {
+      {
+        const Byte *src = p->src;
+        const Byte *srcLim;
+        Byte *dest;
+        SizeT num = p->srcLim - src;
+
+        if (p->finishMode == BCJ2_ENC_FINISH_MODE_CONTINUE)
+        {
+          if (num <= 4)
+            return;
+          num -= 4;
+        }
+        else if (num == 0)
+          break;
+
+        dest = p->bufs[BCJ2_STREAM_MAIN];
+        if (num > (SizeT)(p->lims[BCJ2_STREAM_MAIN] - dest))
+        {
+          num = p->lims[BCJ2_STREAM_MAIN] - dest;
+          if (num == 0)
+          {
+            p->state = BCJ2_STREAM_MAIN;
+            return;
+          }
+        }
+       
+        srcLim = src + num;
+
+        if (p->prevByte == 0x0F && (src[0] & 0xF0) == 0x80)
+          *dest = src[0];
+        else for (;;)
+        {
+          Byte b = *src;
+          *dest = b;
+          if (b != 0x0F)
+          {
+            if ((b & 0xFE) == 0xE8)
+              break;
+            dest++;
+            if (++src != srcLim)
+              continue;
+            break;
+          }
+          dest++;
+          if (++src == srcLim)
+            break;
+          if ((*src & 0xF0) != 0x80)
+            continue;
+          *dest = *src;
+          break;
+        }
+        
+        num = src - p->src;
+        
+        if (src == srcLim)
+        {
+          p->prevByte = src[-1];
+          p->bufs[BCJ2_STREAM_MAIN] = dest;
+          p->src = src;
+          p->ip += (UInt32)num;
+          continue;
+        }
+ 
+        {
+          Byte context = (Byte)(num == 0 ? p->prevByte : src[-1]);
+          BoolInt needConvert;
+
+          p->bufs[BCJ2_STREAM_MAIN] = dest + 1;
+          p->ip += (UInt32)num + 1;
+          src++;
+          
+          needConvert = False;
+
+          if ((SizeT)(p->srcLim - src) >= 4)
+          {
+            UInt32 relatVal = GetUi32(src);
+            if ((p->fileSize == 0 || (UInt32)(p->ip + 4 + relatVal - p->fileIp) < p->fileSize)
+                && ((relatVal + p->relatLimit) >> 1) < p->relatLimit)
+              needConvert = True;
+          }
+
+          {
+            UInt32 bound;
+            unsigned ttt;
+            Byte b = src[-1];
+            CProb *prob = p->probs + (unsigned)(b == 0xE8 ? 2 + (unsigned)context : (b == 0xE9 ? 1 : 0));
+
+            ttt = *prob;
+            bound = (p->range >> kNumModelBits) * ttt;
+            
+            if (!needConvert)
+            {
+              p->range = bound;
+              *prob = (CProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
+              p->src = src;
+              p->prevByte = b;
+              continue;
+            }
+            
+            p->low += bound;
+            p->range -= bound;
+            *prob = (CProb)(ttt - (ttt >> kNumMoveBits));
+
+            {
+              UInt32 relatVal = GetUi32(src);
+              UInt32 absVal;
+              p->ip += 4;
+              absVal = p->ip + relatVal;
+              p->prevByte = src[3];
+              src += 4;
+              p->src = src;
+              {
+                unsigned cj = (b == 0xE8) ? BCJ2_STREAM_CALL : BCJ2_STREAM_JUMP;
+                Byte *cur = p->bufs[cj];
+                if (cur == p->lims[cj])
+                {
+                  p->state = cj;
+                  p->tempTarget = absVal;
+                  return;
+                }
+                SetBe32(cur, absVal);
+                p->bufs[cj] = cur + 4;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  if (p->finishMode != BCJ2_ENC_FINISH_MODE_END_STREAM)
+    return;
+
+  for (; p->flushPos < 5; p->flushPos++)
+    if (RangeEnc_ShiftLow(p))
+      return;
+  p->state = BCJ2_ENC_STATE_OK;
+}
+
+
+void Bcj2Enc_Encode(CBcj2Enc *p)
+{
+  PRF(printf("\n"));
+  PRF(printf("---- ip = %8d   tempPos = %8d   src = %8d\n", p->ip, p->tempPos, p->srcLim - p->src));
+
+  if (p->tempPos != 0)
+  {
+    unsigned extra = 0;
+   
+    for (;;)
+    {
+      const Byte *src = p->src;
+      const Byte *srcLim = p->srcLim;
+      EBcj2Enc_FinishMode finishMode = p->finishMode;
+      
+      p->src = p->temp;
+      p->srcLim = p->temp + p->tempPos;
+      if (src != srcLim)
+        p->finishMode = BCJ2_ENC_FINISH_MODE_CONTINUE;
+      
+      PRF(printf("     ip = %8d   tempPos = %8d   src = %8d\n", p->ip, p->tempPos, p->srcLim - p->src));
+
+      Bcj2Enc_Encode_2(p);
+      
+      {
+        unsigned num = (unsigned)(p->src - p->temp);
+        unsigned tempPos = p->tempPos - num;
+        unsigned i;
+        p->tempPos = tempPos;
+        for (i = 0; i < tempPos; i++)
+          p->temp[i] = p->temp[(size_t)i + num];
+      
+        p->src = src;
+        p->srcLim = srcLim;
+        p->finishMode = finishMode;
+        
+        if (p->state != BCJ2_ENC_STATE_ORIG || src == srcLim)
+          return;
+        
+        if (extra >= tempPos)
+        {
+          p->src = src - tempPos;
+          p->tempPos = 0;
+          break;
+        }
+        
+        p->temp[tempPos] = src[0];
+        p->tempPos = tempPos + 1;
+        p->src = src + 1;
+        extra++;
+      }
+    }
+  }
+
+  PRF(printf("++++ ip = %8d   tempPos = %8d   src = %8d\n", p->ip, p->tempPos, p->srcLim - p->src));
+
+  Bcj2Enc_Encode_2(p);
+  
+  if (p->state == BCJ2_ENC_STATE_ORIG)
+  {
+    const Byte *src = p->src;
+    unsigned rem = (unsigned)(p->srcLim - src);
+    unsigned i;
+    for (i = 0; i < rem; i++)
+      p->temp[i] = src[i];
+    p->tempPos = rem;
+    p->src = src + rem;
+  }
+}
diff --git a/3rdparty/7z/src/Bra.c b/3rdparty/7z/src/Bra.c
new file mode 100644
index 0000000000..cbdcb290df
--- /dev/null
+++ b/3rdparty/7z/src/Bra.c
@@ -0,0 +1,230 @@
+/* Bra.c -- Converters for RISC code
+2017-04-04 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "CpuArch.h"
+#include "Bra.h"
+
+SizeT ARM_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
+{
+  Byte *p;
+  const Byte *lim;
+  size &= ~(size_t)3;
+  ip += 4;
+  p = data;
+  lim = data + size;
+
+  if (encoding)
+
+  for (;;)
+  {
+    for (;;)
+    {
+      if (p >= lim)
+        return p - data;
+      p += 4;
+      if (p[-1] == 0xEB)
+        break;
+    }
+    {
+      UInt32 v = GetUi32(p - 4);
+      v <<= 2;
+        v += ip + (UInt32)(p - data);
+      v >>= 2;
+      v &= 0x00FFFFFF;
+      v |= 0xEB000000;
+      SetUi32(p - 4, v);
+    }
+  }
+
+  for (;;)
+  {
+    for (;;)
+    {
+      if (p >= lim)
+        return p - data;
+      p += 4;
+      if (p[-1] == 0xEB)
+        break;
+    }
+    {
+      UInt32 v = GetUi32(p - 4);
+      v <<= 2;
+        v -= ip + (UInt32)(p - data);
+      v >>= 2;
+      v &= 0x00FFFFFF;
+      v |= 0xEB000000;
+      SetUi32(p - 4, v);
+    }
+  }
+}
+
+
+SizeT ARMT_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
+{
+  Byte *p;
+  const Byte *lim;
+  size &= ~(size_t)1;
+  p = data;
+  lim = data + size - 4;
+
+  if (encoding)
+  
+  for (;;)
+  {
+    UInt32 b1;
+    for (;;)
+    {
+      UInt32 b3;
+      if (p > lim)
+        return p - data;
+      b1 = p[1];
+      b3 = p[3];
+      p += 2;
+      b1 ^= 8;
+      if ((b3 & b1) >= 0xF8)
+        break;
+    }
+    {
+      UInt32 v =
+             ((UInt32)b1 << 19)
+          + (((UInt32)p[1] & 0x7) << 8)
+          + (((UInt32)p[-2] << 11))
+          + (p[0]);
+
+      p += 2;
+      {
+        UInt32 cur = (ip + (UInt32)(p - data)) >> 1;
+          v += cur;
+      }
+
+      p[-4] = (Byte)(v >> 11);
+      p[-3] = (Byte)(0xF0 | ((v >> 19) & 0x7));
+      p[-2] = (Byte)v;
+      p[-1] = (Byte)(0xF8 | (v >> 8));
+    }
+  }
+  
+  for (;;)
+  {
+    UInt32 b1;
+    for (;;)
+    {
+      UInt32 b3;
+      if (p > lim)
+        return p - data;
+      b1 = p[1];
+      b3 = p[3];
+      p += 2;
+      b1 ^= 8;
+      if ((b3 & b1) >= 0xF8)
+        break;
+    }
+    {
+      UInt32 v =
+             ((UInt32)b1 << 19)
+          + (((UInt32)p[1] & 0x7) << 8)
+          + (((UInt32)p[-2] << 11))
+          + (p[0]);
+
+      p += 2;
+      {
+        UInt32 cur = (ip + (UInt32)(p - data)) >> 1;
+          v -= cur;
+      }
+
+      /*
+      SetUi16(p - 4, (UInt16)(((v >> 11) & 0x7FF) | 0xF000));
+      SetUi16(p - 2, (UInt16)(v | 0xF800));
+      */
+      
+      p[-4] = (Byte)(v >> 11);
+      p[-3] = (Byte)(0xF0 | ((v >> 19) & 0x7));
+      p[-2] = (Byte)v;
+      p[-1] = (Byte)(0xF8 | (v >> 8));
+    }
+  }
+}
+
+
+SizeT PPC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
+{
+  Byte *p;
+  const Byte *lim;
+  size &= ~(size_t)3;
+  ip -= 4;
+  p = data;
+  lim = data + size;
+
+  for (;;)
+  {
+    for (;;)
+    {
+      if (p >= lim)
+        return p - data;
+      p += 4;
+      /* if ((v & 0xFC000003) == 0x48000001) */
+      if ((p[-4] & 0xFC) == 0x48 && (p[-1] & 3) == 1)
+        break;
+    }
+    {
+      UInt32 v = GetBe32(p - 4);
+      if (encoding)
+        v += ip + (UInt32)(p - data);
+      else
+        v -= ip + (UInt32)(p - data);
+      v &= 0x03FFFFFF;
+      v |= 0x48000000;
+      SetBe32(p - 4, v);
+    }
+  }
+}
+
+
+SizeT SPARC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
+{
+  Byte *p;
+  const Byte *lim;
+  size &= ~(size_t)3;
+  ip -= 4;
+  p = data;
+  lim = data + size;
+
+  for (;;)
+  {
+    for (;;)
+    {
+      if (p >= lim)
+        return p - data;
+      /*
+      v = GetBe32(p);
+      p += 4;
+      m = v + ((UInt32)5 << 29);
+      m ^= (UInt32)7 << 29;
+      m += (UInt32)1 << 22;
+      if ((m & ((UInt32)0x1FF << 23)) == 0)
+        break;
+      */
+      p += 4;
+      if ((p[-4] == 0x40 && (p[-3] & 0xC0) == 0) ||
+          (p[-4] == 0x7F && (p[-3] >= 0xC0)))
+        break;
+    }
+    {
+      UInt32 v = GetBe32(p - 4);
+      v <<= 2;
+      if (encoding)
+        v += ip + (UInt32)(p - data);
+      else
+        v -= ip + (UInt32)(p - data);
+      
+      v &= 0x01FFFFFF;
+      v -= (UInt32)1 << 24;
+      v ^= 0xFF000000;
+      v >>= 2;
+      v |= 0x40000000;
+      SetBe32(p - 4, v);
+    }
+  }
+}
diff --git a/3rdparty/7z/src/Bra.h b/3rdparty/7z/src/Bra.h
new file mode 100644
index 0000000000..aba8dce14f
--- /dev/null
+++ b/3rdparty/7z/src/Bra.h
@@ -0,0 +1,64 @@
+/* Bra.h -- Branch converters for executables
+2013-01-18 : Igor Pavlov : Public domain */
+
+#ifndef __BRA_H
+#define __BRA_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+/*
+These functions convert relative addresses to absolute addresses
+in CALL instructions to increase the compression ratio.
+  
+  In:
+    data     - data buffer
+    size     - size of data
+    ip       - current virtual Instruction Pinter (IP) value
+    state    - state variable for x86 converter
+    encoding - 0 (for decoding), 1 (for encoding)
+  
+  Out:
+    state    - state variable for x86 converter
+
+  Returns:
+    The number of processed bytes. If you call these functions with multiple calls,
+    you must start next call with first byte after block of processed bytes.
+  
+  Type   Endian  Alignment  LookAhead
+  
+  x86    little      1          4
+  ARMT   little      2          2
+  ARM    little      4          0
+  PPC     big        4          0
+  SPARC   big        4          0
+  IA64   little     16          0
+
+  size must be >= Alignment + LookAhead, if it's not last block.
+  If (size < Alignment + LookAhead), converter returns 0.
+
+  Example:
+
+    UInt32 ip = 0;
+    for ()
+    {
+      ; size must be >= Alignment + LookAhead, if it's not last block
+      SizeT processed = Convert(data, size, ip, 1);
+      data += processed;
+      size -= processed;
+      ip += processed;
+    }
+*/
+
+#define x86_Convert_Init(state) { state = 0; }
+SizeT x86_Convert(Byte *data, SizeT size, UInt32 ip, UInt32 *state, int encoding);
+SizeT ARM_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+SizeT ARMT_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+SizeT PPC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+SizeT SPARC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+SizeT IA64_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/Bra86.c b/3rdparty/7z/src/Bra86.c
new file mode 100644
index 0000000000..a6463c63ba
--- /dev/null
+++ b/3rdparty/7z/src/Bra86.c
@@ -0,0 +1,82 @@
+/* Bra86.c -- Converter for x86 code (BCJ)
+2017-04-03 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "Bra.h"
+
+#define Test86MSByte(b) ((((b) + 1) & 0xFE) == 0)
+
+SizeT x86_Convert(Byte *data, SizeT size, UInt32 ip, UInt32 *state, int encoding)
+{
+  SizeT pos = 0;
+  UInt32 mask = *state & 7;
+  if (size < 5)
+    return 0;
+  size -= 4;
+  ip += 5;
+
+  for (;;)
+  {
+    Byte *p = data + pos;
+    const Byte *limit = data + size;
+    for (; p < limit; p++)
+      if ((*p & 0xFE) == 0xE8)
+        break;
+
+    {
+      SizeT d = (SizeT)(p - data - pos);
+      pos = (SizeT)(p - data);
+      if (p >= limit)
+      {
+        *state = (d > 2 ? 0 : mask >> (unsigned)d);
+        return pos;
+      }
+      if (d > 2)
+        mask = 0;
+      else
+      {
+        mask >>= (unsigned)d;
+        if (mask != 0 && (mask > 4 || mask == 3 || Test86MSByte(p[(size_t)(mask >> 1) + 1])))
+        {
+          mask = (mask >> 1) | 4;
+          pos++;
+          continue;
+        }
+      }
+    }
+
+    if (Test86MSByte(p[4]))
+    {
+      UInt32 v = ((UInt32)p[4] << 24) | ((UInt32)p[3] << 16) | ((UInt32)p[2] << 8) | ((UInt32)p[1]);
+      UInt32 cur = ip + (UInt32)pos;
+      pos += 5;
+      if (encoding)
+        v += cur;
+      else
+        v -= cur;
+      if (mask != 0)
+      {
+        unsigned sh = (mask & 6) << 2;
+        if (Test86MSByte((Byte)(v >> sh)))
+        {
+          v ^= (((UInt32)0x100 << sh) - 1);
+          if (encoding)
+            v += cur;
+          else
+            v -= cur;
+        }
+        mask = 0;
+      }
+      p[1] = (Byte)v;
+      p[2] = (Byte)(v >> 8);
+      p[3] = (Byte)(v >> 16);
+      p[4] = (Byte)(0 - ((v >> 24) & 1));
+    }
+    else
+    {
+      mask = (mask >> 1) | 4;
+      pos++;
+    }
+  }
+}
diff --git a/3rdparty/7z/src/BraIA64.c b/3rdparty/7z/src/BraIA64.c
new file mode 100644
index 0000000000..2656907a0b
--- /dev/null
+++ b/3rdparty/7z/src/BraIA64.c
@@ -0,0 +1,53 @@
+/* BraIA64.c -- Converter for IA-64 code
+2017-01-26 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "CpuArch.h"
+#include "Bra.h"
+
+SizeT IA64_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
+{
+  SizeT i;
+  if (size < 16)
+    return 0;
+  size -= 16;
+  i = 0;
+  do
+  {
+    unsigned m = ((UInt32)0x334B0000 >> (data[i] & 0x1E)) & 3;
+    if (m)
+    {
+      m++;
+      do
+      {
+        Byte *p = data + (i + (size_t)m * 5 - 8);
+        if (((p[3] >> m) & 15) == 5
+            && (((p[-1] | ((UInt32)p[0] << 8)) >> m) & 0x70) == 0)
+        {
+          unsigned raw = GetUi32(p);
+          unsigned v = raw >> m;
+          v = (v & 0xFFFFF) | ((v & (1 << 23)) >> 3);
+          
+          v <<= 4;
+          if (encoding)
+            v += ip + (UInt32)i;
+          else
+            v -= ip + (UInt32)i;
+          v >>= 4;
+          
+          v &= 0x1FFFFF;
+          v += 0x700000;
+          v &= 0x8FFFFF;
+          raw &= ~((UInt32)0x8FFFFF << m);
+          raw |= (v << m);
+          SetUi32(p, raw);
+        }
+      }
+      while (++m <= 4);
+    }
+    i += 16;
+  }
+  while (i <= size);
+  return i;
+}
diff --git a/3rdparty/7z/src/Compiler.h b/3rdparty/7z/src/Compiler.h
new file mode 100644
index 0000000000..c788648cd2
--- /dev/null
+++ b/3rdparty/7z/src/Compiler.h
@@ -0,0 +1,33 @@
+/* Compiler.h
+2017-04-03 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_COMPILER_H
+#define __7Z_COMPILER_H
+
+#ifdef _MSC_VER
+
+  #ifdef UNDER_CE
+    #define RPC_NO_WINDOWS_H
+    /* #pragma warning(disable : 4115) // '_RPC_ASYNC_STATE' : named type definition in parentheses */
+    #pragma warning(disable : 4201) // nonstandard extension used : nameless struct/union
+    #pragma warning(disable : 4214) // nonstandard extension used : bit field types other than int
+  #endif
+
+  #if _MSC_VER >= 1300
+    #pragma warning(disable : 4996) // This function or variable may be unsafe
+  #else
+    #pragma warning(disable : 4511) // copy constructor could not be generated
+    #pragma warning(disable : 4512) // assignment operator could not be generated
+    #pragma warning(disable : 4514) // unreferenced inline function has been removed
+    #pragma warning(disable : 4702) // unreachable code
+    #pragma warning(disable : 4710) // not inlined
+    #pragma warning(disable : 4714) // function marked as __forceinline not inlined
+    #pragma warning(disable : 4786) // identifier was truncated to '255' characters in the debug information
+  #endif
+
+#endif
+
+#define UNUSED_VAR(x) (void)x;
+/* #define UNUSED_VAR(x) x=x; */
+
+#endif
diff --git a/3rdparty/7z/src/CpuArch.c b/3rdparty/7z/src/CpuArch.c
new file mode 100644
index 0000000000..ff1890e7fe
--- /dev/null
+++ b/3rdparty/7z/src/CpuArch.c
@@ -0,0 +1,218 @@
+/* CpuArch.c -- CPU specific code
+2018-02-18: Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "CpuArch.h"
+
+#ifdef MY_CPU_X86_OR_AMD64
+
+#if (defined(_MSC_VER) && !defined(MY_CPU_AMD64)) || defined(__GNUC__)
+#define USE_ASM
+#endif
+
+#if !defined(USE_ASM) && _MSC_VER >= 1500
+#include <intrin.h>
+#endif
+
+#if defined(USE_ASM) && !defined(MY_CPU_AMD64)
+static UInt32 CheckFlag(UInt32 flag)
+{
+  #ifdef _MSC_VER
+  __asm pushfd;
+  __asm pop EAX;
+  __asm mov EDX, EAX;
+  __asm xor EAX, flag;
+  __asm push EAX;
+  __asm popfd;
+  __asm pushfd;
+  __asm pop EAX;
+  __asm xor EAX, EDX;
+  __asm push EDX;
+  __asm popfd;
+  __asm and flag, EAX;
+  #else
+  __asm__ __volatile__ (
+    "pushf\n\t"
+    "pop  %%EAX\n\t"
+    "movl %%EAX,%%EDX\n\t"
+    "xorl %0,%%EAX\n\t"
+    "push %%EAX\n\t"
+    "popf\n\t"
+    "pushf\n\t"
+    "pop  %%EAX\n\t"
+    "xorl %%EDX,%%EAX\n\t"
+    "push %%EDX\n\t"
+    "popf\n\t"
+    "andl %%EAX, %0\n\t":
+    "=c" (flag) : "c" (flag) :
+    "%eax", "%edx");
+  #endif
+  return flag;
+}
+#define CHECK_CPUID_IS_SUPPORTED if (CheckFlag(1 << 18) == 0 || CheckFlag(1 << 21) == 0) return False;
+#else
+#define CHECK_CPUID_IS_SUPPORTED
+#endif
+
+void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d)
+{
+  #ifdef USE_ASM
+
+  #ifdef _MSC_VER
+
+  UInt32 a2, b2, c2, d2;
+  __asm xor EBX, EBX;
+  __asm xor ECX, ECX;
+  __asm xor EDX, EDX;
+  __asm mov EAX, function;
+  __asm cpuid;
+  __asm mov a2, EAX;
+  __asm mov b2, EBX;
+  __asm mov c2, ECX;
+  __asm mov d2, EDX;
+
+  *a = a2;
+  *b = b2;
+  *c = c2;
+  *d = d2;
+
+  #else
+
+  __asm__ __volatile__ (
+  #if defined(MY_CPU_AMD64) && defined(__PIC__)
+    "mov %%rbx, %%rdi;"
+    "cpuid;"
+    "xchg %%rbx, %%rdi;"
+    : "=a" (*a) ,
+      "=D" (*b) ,
+  #elif defined(MY_CPU_X86) && defined(__PIC__)
+    "mov %%ebx, %%edi;"
+    "cpuid;"
+    "xchgl %%ebx, %%edi;"
+    : "=a" (*a) ,
+      "=D" (*b) ,
+  #else
+    "cpuid"
+    : "=a" (*a) ,
+      "=b" (*b) ,
+  #endif
+      "=c" (*c) ,
+      "=d" (*d)
+    : "0" (function)) ;
+
+  #endif
+  
+  #else
+
+  int CPUInfo[4];
+  __cpuid(CPUInfo, function);
+  *a = CPUInfo[0];
+  *b = CPUInfo[1];
+  *c = CPUInfo[2];
+  *d = CPUInfo[3];
+
+  #endif
+}
+
+BoolInt x86cpuid_CheckAndRead(Cx86cpuid *p)
+{
+  CHECK_CPUID_IS_SUPPORTED
+  MyCPUID(0, &p->maxFunc, &p->vendor[0], &p->vendor[2], &p->vendor[1]);
+  MyCPUID(1, &p->ver, &p->b, &p->c, &p->d);
+  return True;
+}
+
+static const UInt32 kVendors[][3] =
+{
+  { 0x756E6547, 0x49656E69, 0x6C65746E},
+  { 0x68747541, 0x69746E65, 0x444D4163},
+  { 0x746E6543, 0x48727561, 0x736C7561}
+};
+
+int x86cpuid_GetFirm(const Cx86cpuid *p)
+{
+  unsigned i;
+  for (i = 0; i < sizeof(kVendors) / sizeof(kVendors[i]); i++)
+  {
+    const UInt32 *v = kVendors[i];
+    if (v[0] == p->vendor[0] &&
+        v[1] == p->vendor[1] &&
+        v[2] == p->vendor[2])
+      return (int)i;
+  }
+  return -1;
+}
+
+BoolInt CPU_Is_InOrder()
+{
+  Cx86cpuid p;
+  int firm;
+  UInt32 family, model;
+  if (!x86cpuid_CheckAndRead(&p))
+    return True;
+
+  family = x86cpuid_GetFamily(p.ver);
+  model = x86cpuid_GetModel(p.ver);
+  
+  firm = x86cpuid_GetFirm(&p);
+
+  switch (firm)
+  {
+    case CPU_FIRM_INTEL: return (family < 6 || (family == 6 && (
+        /* In-Order Atom CPU */
+           model == 0x1C  /* 45 nm, N4xx, D4xx, N5xx, D5xx, 230, 330 */
+        || model == 0x26  /* 45 nm, Z6xx */
+        || model == 0x27  /* 32 nm, Z2460 */
+        || model == 0x35  /* 32 nm, Z2760 */
+        || model == 0x36  /* 32 nm, N2xxx, D2xxx */
+        )));
+    case CPU_FIRM_AMD: return (family < 5 || (family == 5 && (model < 6 || model == 0xA)));
+    case CPU_FIRM_VIA: return (family < 6 || (family == 6 && model < 0xF));
+  }
+  return True;
+}
+
+#if !defined(MY_CPU_AMD64) && defined(_WIN32)
+#include <windows.h>
+static BoolInt CPU_Sys_Is_SSE_Supported()
+{
+  OSVERSIONINFO vi;
+  vi.dwOSVersionInfoSize = sizeof(vi);
+  if (!GetVersionEx(&vi))
+    return False;
+  return (vi.dwMajorVersion >= 5);
+}
+#define CHECK_SYS_SSE_SUPPORT if (!CPU_Sys_Is_SSE_Supported()) return False;
+#else
+#define CHECK_SYS_SSE_SUPPORT
+#endif
+
+BoolInt CPU_Is_Aes_Supported()
+{
+  Cx86cpuid p;
+  CHECK_SYS_SSE_SUPPORT
+  if (!x86cpuid_CheckAndRead(&p))
+    return False;
+  return (p.c >> 25) & 1;
+}
+
+BoolInt CPU_IsSupported_PageGB()
+{
+  Cx86cpuid cpuid;
+  if (!x86cpuid_CheckAndRead(&cpuid))
+    return False;
+  {
+    UInt32 d[4] = { 0 };
+    MyCPUID(0x80000000, &d[0], &d[1], &d[2], &d[3]);
+    if (d[0] < 0x80000001)
+      return False;
+  }
+  {
+    UInt32 d[4] = { 0 };
+    MyCPUID(0x80000001, &d[0], &d[1], &d[2], &d[3]);
+    return (d[3] >> 26) & 1;
+  }
+}
+
+#endif
diff --git a/3rdparty/7z/src/CpuArch.h b/3rdparty/7z/src/CpuArch.h
new file mode 100644
index 0000000000..5f74c1c0cb
--- /dev/null
+++ b/3rdparty/7z/src/CpuArch.h
@@ -0,0 +1,336 @@
+/* CpuArch.h -- CPU specific code
+2018-02-18 : Igor Pavlov : Public domain */
+
+#ifndef __CPU_ARCH_H
+#define __CPU_ARCH_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+/*
+MY_CPU_LE means that CPU is LITTLE ENDIAN.
+MY_CPU_BE means that CPU is BIG ENDIAN.
+If MY_CPU_LE and MY_CPU_BE are not defined, we don't know about ENDIANNESS of platform.
+
+MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned memory accesses.
+*/
+
+#if  defined(_M_X64) \
+  || defined(_M_AMD64) \
+  || defined(__x86_64__) \
+  || defined(__AMD64__) \
+  || defined(__amd64__)
+  #define MY_CPU_AMD64
+  #ifdef __ILP32__
+    #define MY_CPU_NAME "x32"
+  #else
+    #define MY_CPU_NAME "x64"
+  #endif
+  #define MY_CPU_64BIT
+#endif
+
+
+#if  defined(_M_IX86) \
+  || defined(__i386__)
+  #define MY_CPU_X86
+  #define MY_CPU_NAME "x86"
+  #define MY_CPU_32BIT
+#endif
+
+
+#if  defined(_M_ARM64) \
+  || defined(__AARCH64EL__) \
+  || defined(__AARCH64EB__) \
+  || defined(__aarch64__)
+  #define MY_CPU_ARM64
+  #define MY_CPU_NAME "arm64"
+  #define MY_CPU_64BIT
+#endif
+
+
+#if  defined(_M_ARM) \
+  || defined(_M_ARM_NT) \
+  || defined(_M_ARMT) \
+  || defined(__arm__) \
+  || defined(__thumb__) \
+  || defined(__ARMEL__) \
+  || defined(__ARMEB__) \
+  || defined(__THUMBEL__) \
+  || defined(__THUMBEB__)
+  #define MY_CPU_ARM
+  #define MY_CPU_NAME "arm"
+  #define MY_CPU_32BIT
+#endif
+
+
+#if  defined(_M_IA64) \
+  || defined(__ia64__)
+  #define MY_CPU_IA64
+  #define MY_CPU_NAME "ia64"
+  #define MY_CPU_64BIT
+#endif
+
+
+#if  defined(__mips64) \
+  || defined(__mips64__) \
+  || (defined(__mips) && (__mips == 64 || __mips == 4 || __mips == 3))
+  #define MY_CPU_NAME "mips64"
+  #define MY_CPU_64BIT
+#elif defined(__mips__)
+  #define MY_CPU_NAME "mips"
+  /* #define MY_CPU_32BIT */
+#endif
+
+
+#if  defined(__ppc64__) \
+  || defined(__powerpc64__)
+  #ifdef __ILP32__
+    #define MY_CPU_NAME "ppc64-32"
+  #else
+    #define MY_CPU_NAME "ppc64"
+  #endif
+  #define MY_CPU_64BIT
+#elif defined(__ppc__) \
+  || defined(__powerpc__)
+  #define MY_CPU_NAME "ppc"
+  #define MY_CPU_32BIT
+#endif
+
+
+#if  defined(__sparc64__)
+  #define MY_CPU_NAME "sparc64"
+  #define MY_CPU_64BIT
+#elif defined(__sparc__)
+  #define MY_CPU_NAME "sparc"
+  /* #define MY_CPU_32BIT */
+#endif
+
+
+#if defined(MY_CPU_X86) || defined(MY_CPU_AMD64)
+#define MY_CPU_X86_OR_AMD64
+#endif
+
+
+#ifdef _WIN32
+
+  #ifdef MY_CPU_ARM
+  #define MY_CPU_ARM_LE
+  #endif
+
+  #ifdef MY_CPU_ARM64
+  #define MY_CPU_ARM64_LE
+  #endif
+
+  #ifdef _M_IA64
+  #define MY_CPU_IA64_LE
+  #endif
+
+#endif
+
+
+#if defined(MY_CPU_X86_OR_AMD64) \
+    || defined(MY_CPU_ARM_LE) \
+    || defined(MY_CPU_ARM64_LE) \
+    || defined(MY_CPU_IA64_LE) \
+    || defined(__LITTLE_ENDIAN__) \
+    || defined(__ARMEL__) \
+    || defined(__THUMBEL__) \
+    || defined(__AARCH64EL__) \
+    || defined(__MIPSEL__) \
+    || defined(__MIPSEL) \
+    || defined(_MIPSEL) \
+    || defined(__BFIN__) \
+    || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
+  #define MY_CPU_LE
+#endif
+
+#if defined(__BIG_ENDIAN__) \
+    || defined(__ARMEB__) \
+    || defined(__THUMBEB__) \
+    || defined(__AARCH64EB__) \
+    || defined(__MIPSEB__) \
+    || defined(__MIPSEB) \
+    || defined(_MIPSEB) \
+    || defined(__m68k__) \
+    || defined(__s390__) \
+    || defined(__s390x__) \
+    || defined(__zarch__) \
+    || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
+  #define MY_CPU_BE
+#endif
+
+
+#if defined(MY_CPU_LE) && defined(MY_CPU_BE)
+  #error Stop_Compiling_Bad_Endian
+#endif
+
+
+#if defined(MY_CPU_32BIT) && defined(MY_CPU_64BIT)
+  #error Stop_Compiling_Bad_32_64_BIT
+#endif
+
+
+#ifndef MY_CPU_NAME
+  #ifdef MY_CPU_LE
+    #define MY_CPU_NAME "LE"
+  #elif defined(MY_CPU_BE)
+    #define MY_CPU_NAME "BE"
+  #else
+    /*
+    #define MY_CPU_NAME ""
+    */
+  #endif
+#endif
+
+
+
+
+
+#ifdef MY_CPU_LE
+  #if defined(MY_CPU_X86_OR_AMD64) \
+      || defined(MY_CPU_ARM64) \
+      || defined(__ARM_FEATURE_UNALIGNED)
+    #define MY_CPU_LE_UNALIGN
+  #endif
+#endif
+
+
+#ifdef MY_CPU_LE_UNALIGN
+
+#define GetUi16(p) (*(const UInt16 *)(const void *)(p))
+#define GetUi32(p) (*(const UInt32 *)(const void *)(p))
+#define GetUi64(p) (*(const UInt64 *)(const void *)(p))
+
+#define SetUi16(p, v) { *(UInt16 *)(p) = (v); }
+#define SetUi32(p, v) { *(UInt32 *)(p) = (v); }
+#define SetUi64(p, v) { *(UInt64 *)(p) = (v); }
+
+#else
+
+#define GetUi16(p) ( (UInt16) ( \
+             ((const Byte *)(p))[0] | \
+    ((UInt16)((const Byte *)(p))[1] << 8) ))
+
+#define GetUi32(p) ( \
+             ((const Byte *)(p))[0]        | \
+    ((UInt32)((const Byte *)(p))[1] <<  8) | \
+    ((UInt32)((const Byte *)(p))[2] << 16) | \
+    ((UInt32)((const Byte *)(p))[3] << 24))
+
+#define GetUi64(p) (GetUi32(p) | ((UInt64)GetUi32(((const Byte *)(p)) + 4) << 32))
+
+#define SetUi16(p, v) { Byte *_ppp_ = (Byte *)(p); UInt32 _vvv_ = (v); \
+    _ppp_[0] = (Byte)_vvv_; \
+    _ppp_[1] = (Byte)(_vvv_ >> 8); }
+
+#define SetUi32(p, v) { Byte *_ppp_ = (Byte *)(p); UInt32 _vvv_ = (v); \
+    _ppp_[0] = (Byte)_vvv_; \
+    _ppp_[1] = (Byte)(_vvv_ >> 8); \
+    _ppp_[2] = (Byte)(_vvv_ >> 16); \
+    _ppp_[3] = (Byte)(_vvv_ >> 24); }
+
+#define SetUi64(p, v) { Byte *_ppp2_ = (Byte *)(p); UInt64 _vvv2_ = (v); \
+    SetUi32(_ppp2_    , (UInt32)_vvv2_); \
+    SetUi32(_ppp2_ + 4, (UInt32)(_vvv2_ >> 32)); }
+
+#endif
+
+#ifdef __has_builtin
+  #define MY__has_builtin(x) __has_builtin(x)
+#else
+  #define MY__has_builtin(x) 0
+#endif
+
+#if defined(MY_CPU_LE_UNALIGN) && /* defined(_WIN64) && */ (_MSC_VER >= 1300)
+
+/* Note: we use bswap instruction, that is unsupported in 386 cpu */
+
+#include <stdlib.h>
+
+#pragma intrinsic(_byteswap_ushort)
+#pragma intrinsic(_byteswap_ulong)
+#pragma intrinsic(_byteswap_uint64)
+
+/* #define GetBe16(p) _byteswap_ushort(*(const UInt16 *)(const Byte *)(p)) */
+#define GetBe32(p) _byteswap_ulong(*(const UInt32 *)(const Byte *)(p))
+#define GetBe64(p) _byteswap_uint64(*(const UInt64 *)(const Byte *)(p))
+
+#define SetBe32(p, v) (*(UInt32 *)(void *)(p)) = _byteswap_ulong(v)
+
+#elif defined(MY_CPU_LE_UNALIGN) && ( \
+       (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) \
+    || (defined(__clang__) && MY__has_builtin(__builtin_bswap16)) )
+
+/* #define GetBe16(p) __builtin_bswap16(*(const UInt16 *)(const Byte *)(p)) */
+#define GetBe32(p) __builtin_bswap32(*(const UInt32 *)(const Byte *)(p))
+#define GetBe64(p) __builtin_bswap64(*(const UInt64 *)(const Byte *)(p))
+
+#define SetBe32(p, v) (*(UInt32 *)(void *)(p)) = __builtin_bswap32(v)
+
+#else
+
+#define GetBe32(p) ( \
+    ((UInt32)((const Byte *)(p))[0] << 24) | \
+    ((UInt32)((const Byte *)(p))[1] << 16) | \
+    ((UInt32)((const Byte *)(p))[2] <<  8) | \
+             ((const Byte *)(p))[3] )
+
+#define GetBe64(p) (((UInt64)GetBe32(p) << 32) | GetBe32(((const Byte *)(p)) + 4))
+
+#define SetBe32(p, v) { Byte *_ppp_ = (Byte *)(p); UInt32 _vvv_ = (v); \
+    _ppp_[0] = (Byte)(_vvv_ >> 24); \
+    _ppp_[1] = (Byte)(_vvv_ >> 16); \
+    _ppp_[2] = (Byte)(_vvv_ >> 8); \
+    _ppp_[3] = (Byte)_vvv_; }
+
+#endif
+
+
+#ifndef GetBe16
+
+#define GetBe16(p) ( (UInt16) ( \
+    ((UInt16)((const Byte *)(p))[0] << 8) | \
+             ((const Byte *)(p))[1] ))
+
+#endif
+
+
+
+#ifdef MY_CPU_X86_OR_AMD64
+
+typedef struct
+{
+  UInt32 maxFunc;
+  UInt32 vendor[3];
+  UInt32 ver;
+  UInt32 b;
+  UInt32 c;
+  UInt32 d;
+} Cx86cpuid;
+
+enum
+{
+  CPU_FIRM_INTEL,
+  CPU_FIRM_AMD,
+  CPU_FIRM_VIA
+};
+
+void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d);
+
+BoolInt x86cpuid_CheckAndRead(Cx86cpuid *p);
+int x86cpuid_GetFirm(const Cx86cpuid *p);
+
+#define x86cpuid_GetFamily(ver) (((ver >> 16) & 0xFF0) | ((ver >> 8) & 0xF))
+#define x86cpuid_GetModel(ver)  (((ver >> 12) &  0xF0) | ((ver >> 4) & 0xF))
+#define x86cpuid_GetStepping(ver) (ver & 0xF)
+
+BoolInt CPU_Is_InOrder();
+BoolInt CPU_Is_Aes_Supported();
+BoolInt CPU_IsSupported_PageGB();
+
+#endif
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/Delta.c b/3rdparty/7z/src/Delta.c
new file mode 100644
index 0000000000..6cbbe46012
--- /dev/null
+++ b/3rdparty/7z/src/Delta.c
@@ -0,0 +1,64 @@
+/* Delta.c -- Delta converter
+2009-05-26 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "Delta.h"
+
+void Delta_Init(Byte *state)
+{
+  unsigned i;
+  for (i = 0; i < DELTA_STATE_SIZE; i++)
+    state[i] = 0;
+}
+
+static void MyMemCpy(Byte *dest, const Byte *src, unsigned size)
+{
+  unsigned i;
+  for (i = 0; i < size; i++)
+    dest[i] = src[i];
+}
+
+void Delta_Encode(Byte *state, unsigned delta, Byte *data, SizeT size)
+{
+  Byte buf[DELTA_STATE_SIZE];
+  unsigned j = 0;
+  MyMemCpy(buf, state, delta);
+  {
+    SizeT i;
+    for (i = 0; i < size;)
+    {
+      for (j = 0; j < delta && i < size; i++, j++)
+      {
+        Byte b = data[i];
+        data[i] = (Byte)(b - buf[j]);
+        buf[j] = b;
+      }
+    }
+  }
+  if (j == delta)
+    j = 0;
+  MyMemCpy(state, buf + j, delta - j);
+  MyMemCpy(state + delta - j, buf, j);
+}
+
+void Delta_Decode(Byte *state, unsigned delta, Byte *data, SizeT size)
+{
+  Byte buf[DELTA_STATE_SIZE];
+  unsigned j = 0;
+  MyMemCpy(buf, state, delta);
+  {
+    SizeT i;
+    for (i = 0; i < size;)
+    {
+      for (j = 0; j < delta && i < size; i++, j++)
+      {
+        buf[j] = data[i] = (Byte)(buf[j] + data[i]);
+      }
+    }
+  }
+  if (j == delta)
+    j = 0;
+  MyMemCpy(state, buf + j, delta - j);
+  MyMemCpy(state + delta - j, buf, j);
+}
diff --git a/3rdparty/7z/src/Delta.h b/3rdparty/7z/src/Delta.h
new file mode 100644
index 0000000000..e59d5a252b
--- /dev/null
+++ b/3rdparty/7z/src/Delta.h
@@ -0,0 +1,19 @@
+/* Delta.h -- Delta converter
+2013-01-18 : Igor Pavlov : Public domain */
+
+#ifndef __DELTA_H
+#define __DELTA_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+#define DELTA_STATE_SIZE 256
+
+void Delta_Init(Byte *state);
+void Delta_Encode(Byte *state, unsigned delta, Byte *data, SizeT size);
+void Delta_Decode(Byte *state, unsigned delta, Byte *data, SizeT size);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/DllSecur.c b/3rdparty/7z/src/DllSecur.c
new file mode 100644
index 0000000000..19a22a9f05
--- /dev/null
+++ b/3rdparty/7z/src/DllSecur.c
@@ -0,0 +1,108 @@
+/* DllSecur.c -- DLL loading security
+2018-02-21 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#ifdef _WIN32
+
+#include <windows.h>
+
+#include "DllSecur.h"
+
+#ifndef UNDER_CE
+
+typedef BOOL (WINAPI *Func_SetDefaultDllDirectories)(DWORD DirectoryFlags);
+
+#define MY_LOAD_LIBRARY_SEARCH_USER_DIRS 0x400
+#define MY_LOAD_LIBRARY_SEARCH_SYSTEM32  0x800
+
+static const char * const g_Dlls =
+  #ifndef _CONSOLE
+  "UXTHEME\0"
+  #endif
+  "USERENV\0"
+  "SETUPAPI\0"
+  "APPHELP\0"
+  "PROPSYS\0"
+  "DWMAPI\0"
+  "CRYPTBASE\0"
+  "OLEACC\0"
+  "CLBCATQ\0"
+  "VERSION\0"
+  ;
+
+#endif
+
+void My_SetDefaultDllDirectories()
+{
+  #ifndef UNDER_CE
+  
+    OSVERSIONINFO vi;
+    vi.dwOSVersionInfoSize = sizeof(vi);
+    GetVersionEx(&vi);
+    if (!GetVersionEx(&vi) || vi.dwMajorVersion != 6 || vi.dwMinorVersion != 0)
+    {
+      Func_SetDefaultDllDirectories setDllDirs = (Func_SetDefaultDllDirectories)
+          GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "SetDefaultDllDirectories");
+      if (setDllDirs)
+        if (setDllDirs(MY_LOAD_LIBRARY_SEARCH_SYSTEM32 | MY_LOAD_LIBRARY_SEARCH_USER_DIRS))
+          return;
+    }
+
+  #endif
+}
+
+
+void LoadSecurityDlls()
+{
+  #ifndef UNDER_CE
+  
+  wchar_t buf[MAX_PATH + 100];
+
+  {
+    // at Vista (ver 6.0) : CoCreateInstance(CLSID_ShellLink, ...) doesn't work after SetDefaultDllDirectories() : Check it ???
+    OSVERSIONINFO vi;
+    vi.dwOSVersionInfoSize = sizeof(vi);
+    if (!GetVersionEx(&vi) || vi.dwMajorVersion != 6 || vi.dwMinorVersion != 0)
+    {
+      Func_SetDefaultDllDirectories setDllDirs = (Func_SetDefaultDllDirectories)
+          GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "SetDefaultDllDirectories");
+      if (setDllDirs)
+        if (setDllDirs(MY_LOAD_LIBRARY_SEARCH_SYSTEM32 | MY_LOAD_LIBRARY_SEARCH_USER_DIRS))
+          return;
+    }
+  }
+
+  {
+    unsigned len = GetSystemDirectoryW(buf, MAX_PATH + 2);
+    if (len == 0 || len > MAX_PATH)
+      return;
+  }
+  {
+    const char *dll;
+    unsigned pos = (unsigned)lstrlenW(buf);
+
+    if (buf[pos - 1] != '\\')
+      buf[pos++] = '\\';
+    
+    for (dll = g_Dlls; dll[0] != 0;)
+    {
+      unsigned k = 0;
+      for (;;)
+      {
+        char c = *dll++;
+        buf[pos + k] = (Byte)c;
+        k++;
+        if (c == 0)
+          break;
+      }
+
+      lstrcatW(buf, L".dll");
+      LoadLibraryExW(buf, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+    }
+  }
+  
+  #endif
+}
+
+#endif
diff --git a/3rdparty/7z/src/DllSecur.h b/3rdparty/7z/src/DllSecur.h
new file mode 100644
index 0000000000..4c113568e6
--- /dev/null
+++ b/3rdparty/7z/src/DllSecur.h
@@ -0,0 +1,20 @@
+/* DllSecur.h -- DLL loading for security
+2018-02-19 : Igor Pavlov : Public domain */
+
+#ifndef __DLL_SECUR_H
+#define __DLL_SECUR_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+#ifdef _WIN32
+
+void My_SetDefaultDllDirectories();
+void LoadSecurityDlls();
+
+#endif
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/LzFind.c b/3rdparty/7z/src/LzFind.c
new file mode 100644
index 0000000000..4eefc17dd2
--- /dev/null
+++ b/3rdparty/7z/src/LzFind.c
@@ -0,0 +1,1127 @@
+/* LzFind.c -- Match finder for LZ algorithms
+2018-07-08 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <string.h>
+
+#include "LzFind.h"
+#include "LzHash.h"
+
+#define kEmptyHashValue 0
+#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
+#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
+#define kNormalizeMask (~(UInt32)(kNormalizeStepMin - 1))
+#define kMaxHistorySize ((UInt32)7 << 29)
+
+#define kStartMaxLen 3
+
+static void LzInWindow_Free(CMatchFinder *p, ISzAllocPtr alloc)
+{
+  if (!p->directInput)
+  {
+    ISzAlloc_Free(alloc, p->bufferBase);
+    p->bufferBase = NULL;
+  }
+}
+
+/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
+
+static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAllocPtr alloc)
+{
+  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
+  if (p->directInput)
+  {
+    p->blockSize = blockSize;
+    return 1;
+  }
+  if (!p->bufferBase || p->blockSize != blockSize)
+  {
+    LzInWindow_Free(p, alloc);
+    p->blockSize = blockSize;
+    p->bufferBase = (Byte *)ISzAlloc_Alloc(alloc, (size_t)blockSize);
+  }
+  return (p->bufferBase != NULL);
+}
+
+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
+
+UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
+
+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
+{
+  p->posLimit -= subValue;
+  p->pos -= subValue;
+  p->streamPos -= subValue;
+}
+
+static void MatchFinder_ReadBlock(CMatchFinder *p)
+{
+  if (p->streamEndWasReached || p->result != SZ_OK)
+    return;
+
+  /* We use (p->streamPos - p->pos) value. (p->streamPos < p->pos) is allowed. */
+
+  if (p->directInput)
+  {
+    UInt32 curSize = 0xFFFFFFFF - (p->streamPos - p->pos);
+    if (curSize > p->directInputRem)
+      curSize = (UInt32)p->directInputRem;
+    p->directInputRem -= curSize;
+    p->streamPos += curSize;
+    if (p->directInputRem == 0)
+      p->streamEndWasReached = 1;
+    return;
+  }
+  
+  for (;;)
+  {
+    Byte *dest = p->buffer + (p->streamPos - p->pos);
+    size_t size = (p->bufferBase + p->blockSize - dest);
+    if (size == 0)
+      return;
+
+    p->result = ISeqInStream_Read(p->stream, dest, &size);
+    if (p->result != SZ_OK)
+      return;
+    if (size == 0)
+    {
+      p->streamEndWasReached = 1;
+      return;
+    }
+    p->streamPos += (UInt32)size;
+    if (p->streamPos - p->pos > p->keepSizeAfter)
+      return;
+  }
+}
+
+void MatchFinder_MoveBlock(CMatchFinder *p)
+{
+  memmove(p->bufferBase,
+      p->buffer - p->keepSizeBefore,
+      (size_t)(p->streamPos - p->pos) + p->keepSizeBefore);
+  p->buffer = p->bufferBase + p->keepSizeBefore;
+}
+
+int MatchFinder_NeedMove(CMatchFinder *p)
+{
+  if (p->directInput)
+    return 0;
+  /* if (p->streamEndWasReached) return 0; */
+  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
+}
+
+void MatchFinder_ReadIfRequired(CMatchFinder *p)
+{
+  if (p->streamEndWasReached)
+    return;
+  if (p->keepSizeAfter >= p->streamPos - p->pos)
+    MatchFinder_ReadBlock(p);
+}
+
+static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
+{
+  if (MatchFinder_NeedMove(p))
+    MatchFinder_MoveBlock(p);
+  MatchFinder_ReadBlock(p);
+}
+
+static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
+{
+  p->cutValue = 32;
+  p->btMode = 1;
+  p->numHashBytes = 4;
+  p->bigHash = 0;
+}
+
+#define kCrcPoly 0xEDB88320
+
+void MatchFinder_Construct(CMatchFinder *p)
+{
+  unsigned i;
+  p->bufferBase = NULL;
+  p->directInput = 0;
+  p->hash = NULL;
+  p->expectedDataSize = (UInt64)(Int64)-1;
+  MatchFinder_SetDefaultSettings(p);
+
+  for (i = 0; i < 256; i++)
+  {
+    UInt32 r = (UInt32)i;
+    unsigned j;
+    for (j = 0; j < 8; j++)
+      r = (r >> 1) ^ (kCrcPoly & ((UInt32)0 - (r & 1)));
+    p->crc[i] = r;
+  }
+}
+
+static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->hash);
+  p->hash = NULL;
+}
+
+void MatchFinder_Free(CMatchFinder *p, ISzAllocPtr alloc)
+{
+  MatchFinder_FreeThisClassMemory(p, alloc);
+  LzInWindow_Free(p, alloc);
+}
+
+static CLzRef* AllocRefs(size_t num, ISzAllocPtr alloc)
+{
+  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
+  if (sizeInBytes / sizeof(CLzRef) != num)
+    return NULL;
+  return (CLzRef *)ISzAlloc_Alloc(alloc, sizeInBytes);
+}
+
+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
+    ISzAllocPtr alloc)
+{
+  UInt32 sizeReserv;
+  
+  if (historySize > kMaxHistorySize)
+  {
+    MatchFinder_Free(p, alloc);
+    return 0;
+  }
+  
+  sizeReserv = historySize >> 1;
+       if (historySize >= ((UInt32)3 << 30)) sizeReserv = historySize >> 3;
+  else if (historySize >= ((UInt32)2 << 30)) sizeReserv = historySize >> 2;
+  
+  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
+
+  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
+  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
+  
+  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
+  
+  if (LzInWindow_Create(p, sizeReserv, alloc))
+  {
+    UInt32 newCyclicBufferSize = historySize + 1;
+    UInt32 hs;
+    p->matchMaxLen = matchMaxLen;
+    {
+      p->fixedHashSize = 0;
+      if (p->numHashBytes == 2)
+        hs = (1 << 16) - 1;
+      else
+      {
+        hs = historySize;
+        if (hs > p->expectedDataSize)
+          hs = (UInt32)p->expectedDataSize;
+        if (hs != 0)
+          hs--;
+        hs |= (hs >> 1);
+        hs |= (hs >> 2);
+        hs |= (hs >> 4);
+        hs |= (hs >> 8);
+        hs >>= 1;
+        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
+        if (hs > (1 << 24))
+        {
+          if (p->numHashBytes == 3)
+            hs = (1 << 24) - 1;
+          else
+            hs >>= 1;
+          /* if (bigHash) mode, GetHeads4b() in LzFindMt.c needs (hs >= ((1 << 24) - 1))) */
+        }
+      }
+      p->hashMask = hs;
+      hs++;
+      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
+      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
+      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
+      hs += p->fixedHashSize;
+    }
+
+    {
+      size_t newSize;
+      size_t numSons;
+      p->historySize = historySize;
+      p->hashSizeSum = hs;
+      p->cyclicBufferSize = newCyclicBufferSize;
+      
+      numSons = newCyclicBufferSize;
+      if (p->btMode)
+        numSons <<= 1;
+      newSize = hs + numSons;
+
+      if (p->hash && p->numRefs == newSize)
+        return 1;
+      
+      MatchFinder_FreeThisClassMemory(p, alloc);
+      p->numRefs = newSize;
+      p->hash = AllocRefs(newSize, alloc);
+      
+      if (p->hash)
+      {
+        p->son = p->hash + p->hashSizeSum;
+        return 1;
+      }
+    }
+  }
+
+  MatchFinder_Free(p, alloc);
+  return 0;
+}
+
+static void MatchFinder_SetLimits(CMatchFinder *p)
+{
+  UInt32 limit = kMaxValForNormalize - p->pos;
+  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
+  
+  if (limit2 < limit)
+    limit = limit2;
+  limit2 = p->streamPos - p->pos;
+  
+  if (limit2 <= p->keepSizeAfter)
+  {
+    if (limit2 > 0)
+      limit2 = 1;
+  }
+  else
+    limit2 -= p->keepSizeAfter;
+  
+  if (limit2 < limit)
+    limit = limit2;
+  
+  {
+    UInt32 lenLimit = p->streamPos - p->pos;
+    if (lenLimit > p->matchMaxLen)
+      lenLimit = p->matchMaxLen;
+    p->lenLimit = lenLimit;
+  }
+  p->posLimit = p->pos + limit;
+}
+
+
+void MatchFinder_Init_LowHash(CMatchFinder *p)
+{
+  size_t i;
+  CLzRef *items = p->hash;
+  size_t numItems = p->fixedHashSize;
+  for (i = 0; i < numItems; i++)
+    items[i] = kEmptyHashValue;
+}
+
+
+void MatchFinder_Init_HighHash(CMatchFinder *p)
+{
+  size_t i;
+  CLzRef *items = p->hash + p->fixedHashSize;
+  size_t numItems = (size_t)p->hashMask + 1;
+  for (i = 0; i < numItems; i++)
+    items[i] = kEmptyHashValue;
+}
+
+
+void MatchFinder_Init_3(CMatchFinder *p, int readData)
+{
+  p->cyclicBufferPos = 0;
+  p->buffer = p->bufferBase;
+  p->pos =
+  p->streamPos = p->cyclicBufferSize;
+  p->result = SZ_OK;
+  p->streamEndWasReached = 0;
+  
+  if (readData)
+    MatchFinder_ReadBlock(p);
+  
+  MatchFinder_SetLimits(p);
+}
+
+
+void MatchFinder_Init(CMatchFinder *p)
+{
+  MatchFinder_Init_HighHash(p);
+  MatchFinder_Init_LowHash(p);
+  MatchFinder_Init_3(p, True);
+}
+
+  
+static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
+{
+  return (p->pos - p->historySize - 1) & kNormalizeMask;
+}
+
+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, size_t numItems)
+{
+  size_t i;
+  for (i = 0; i < numItems; i++)
+  {
+    UInt32 value = items[i];
+    if (value <= subValue)
+      value = kEmptyHashValue;
+    else
+      value -= subValue;
+    items[i] = value;
+  }
+}
+
+static void MatchFinder_Normalize(CMatchFinder *p)
+{
+  UInt32 subValue = MatchFinder_GetSubValue(p);
+  MatchFinder_Normalize3(subValue, p->hash, p->numRefs);
+  MatchFinder_ReduceOffsets(p, subValue);
+}
+
+
+MY_NO_INLINE
+static void MatchFinder_CheckLimits(CMatchFinder *p)
+{
+  if (p->pos == kMaxValForNormalize)
+    MatchFinder_Normalize(p);
+  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
+    MatchFinder_CheckAndMoveAndRead(p);
+  if (p->cyclicBufferPos == p->cyclicBufferSize)
+    p->cyclicBufferPos = 0;
+  MatchFinder_SetLimits(p);
+}
+
+
+/*
+  (lenLimit > maxLen)
+*/
+MY_FORCE_INLINE
+static UInt32 * Hc_GetMatchesSpec(unsigned lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+    UInt32 *distances, unsigned maxLen)
+{
+  /*
+  son[_cyclicBufferPos] = curMatch;
+  for (;;)
+  {
+    UInt32 delta = pos - curMatch;
+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
+      return distances;
+    {
+      const Byte *pb = cur - delta;
+      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
+      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
+      {
+        UInt32 len = 0;
+        while (++len != lenLimit)
+          if (pb[len] != cur[len])
+            break;
+        if (maxLen < len)
+        {
+          maxLen = len;
+          *distances++ = len;
+          *distances++ = delta - 1;
+          if (len == lenLimit)
+            return distances;
+        }
+      }
+    }
+  }
+  */
+
+  const Byte *lim = cur + lenLimit;
+  son[_cyclicBufferPos] = curMatch;
+  do
+  {
+    UInt32 delta = pos - curMatch;
+    if (delta >= _cyclicBufferSize)
+      break;
+    {
+      ptrdiff_t diff;
+      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
+      diff = (ptrdiff_t)0 - delta;
+      if (cur[maxLen] == cur[maxLen + diff])
+      {
+        const Byte *c = cur;
+        while (*c == c[diff])
+        {
+          if (++c == lim)
+          {
+            distances[0] = (UInt32)(lim - cur);
+            distances[1] = delta - 1;
+            return distances + 2;
+          }
+        }
+        {
+          unsigned len = (unsigned)(c - cur);
+          if (maxLen < len)
+          {
+            maxLen = len;
+            distances[0] = (UInt32)len;
+            distances[1] = delta - 1;
+            distances += 2;
+          }
+        }
+      }
+    }
+  }
+  while (--cutValue);
+  
+  return distances;
+}
+
+
+MY_FORCE_INLINE
+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
+    UInt32 *distances, UInt32 maxLen)
+{
+  CLzRef *ptr0 = son + ((size_t)_cyclicBufferPos << 1) + 1;
+  CLzRef *ptr1 = son + ((size_t)_cyclicBufferPos << 1);
+  unsigned len0 = 0, len1 = 0;
+  for (;;)
+  {
+    UInt32 delta = pos - curMatch;
+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
+    {
+      *ptr0 = *ptr1 = kEmptyHashValue;
+      return distances;
+    }
+    {
+      CLzRef *pair = son + ((size_t)(_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
+      const Byte *pb = cur - delta;
+      unsigned len = (len0 < len1 ? len0 : len1);
+      UInt32 pair0 = pair[0];
+      if (pb[len] == cur[len])
+      {
+        if (++len != lenLimit && pb[len] == cur[len])
+          while (++len != lenLimit)
+            if (pb[len] != cur[len])
+              break;
+        if (maxLen < len)
+        {
+          maxLen = (UInt32)len;
+          *distances++ = (UInt32)len;
+          *distances++ = delta - 1;
+          if (len == lenLimit)
+          {
+            *ptr1 = pair0;
+            *ptr0 = pair[1];
+            return distances;
+          }
+        }
+      }
+      if (pb[len] < cur[len])
+      {
+        *ptr1 = curMatch;
+        ptr1 = pair + 1;
+        curMatch = *ptr1;
+        len1 = len;
+      }
+      else
+      {
+        *ptr0 = curMatch;
+        ptr0 = pair;
+        curMatch = *ptr0;
+        len0 = len;
+      }
+    }
+  }
+}
+
+static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
+{
+  CLzRef *ptr0 = son + ((size_t)_cyclicBufferPos << 1) + 1;
+  CLzRef *ptr1 = son + ((size_t)_cyclicBufferPos << 1);
+  unsigned len0 = 0, len1 = 0;
+  for (;;)
+  {
+    UInt32 delta = pos - curMatch;
+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
+    {
+      *ptr0 = *ptr1 = kEmptyHashValue;
+      return;
+    }
+    {
+      CLzRef *pair = son + ((size_t)(_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
+      const Byte *pb = cur - delta;
+      unsigned len = (len0 < len1 ? len0 : len1);
+      if (pb[len] == cur[len])
+      {
+        while (++len != lenLimit)
+          if (pb[len] != cur[len])
+            break;
+        {
+          if (len == lenLimit)
+          {
+            *ptr1 = pair[0];
+            *ptr0 = pair[1];
+            return;
+          }
+        }
+      }
+      if (pb[len] < cur[len])
+      {
+        *ptr1 = curMatch;
+        ptr1 = pair + 1;
+        curMatch = *ptr1;
+        len1 = len;
+      }
+      else
+      {
+        *ptr0 = curMatch;
+        ptr0 = pair;
+        curMatch = *ptr0;
+        len0 = len;
+      }
+    }
+  }
+}
+
+#define MOVE_POS \
+  ++p->cyclicBufferPos; \
+  p->buffer++; \
+  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
+
+#define MOVE_POS_RET MOVE_POS return (UInt32)offset;
+
+static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
+
+#define GET_MATCHES_HEADER2(minLen, ret_op) \
+  unsigned lenLimit; UInt32 hv; const Byte *cur; UInt32 curMatch; \
+  lenLimit = (unsigned)p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
+  cur = p->buffer;
+
+#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
+#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
+
+#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
+
+#define GET_MATCHES_FOOTER(offset, maxLen) \
+  offset = (unsigned)(GetMatchesSpec1((UInt32)lenLimit, curMatch, MF_PARAMS(p), \
+  distances + offset, (UInt32)maxLen) - distances); MOVE_POS_RET;
+
+#define SKIP_FOOTER \
+  SkipMatchesSpec((UInt32)lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
+
+#define UPDATE_maxLen { \
+    ptrdiff_t diff = (ptrdiff_t)0 - d2; \
+    const Byte *c = cur + maxLen; \
+    const Byte *lim = cur + lenLimit; \
+    for (; c != lim; c++) if (*(c + diff) != *c) break; \
+    maxLen = (unsigned)(c - cur); }
+
+static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  unsigned offset;
+  GET_MATCHES_HEADER(2)
+  HASH2_CALC;
+  curMatch = p->hash[hv];
+  p->hash[hv] = p->pos;
+  offset = 0;
+  GET_MATCHES_FOOTER(offset, 1)
+}
+
+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  unsigned offset;
+  GET_MATCHES_HEADER(3)
+  HASH_ZIP_CALC;
+  curMatch = p->hash[hv];
+  p->hash[hv] = p->pos;
+  offset = 0;
+  GET_MATCHES_FOOTER(offset, 2)
+}
+
+static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  UInt32 h2, d2, pos;
+  unsigned maxLen, offset;
+  UInt32 *hash;
+  GET_MATCHES_HEADER(3)
+
+  HASH3_CALC;
+
+  hash = p->hash;
+  pos = p->pos;
+
+  d2 = pos - hash[h2];
+
+  curMatch = (hash + kFix3HashSize)[hv];
+  
+  hash[h2] = pos;
+  (hash + kFix3HashSize)[hv] = pos;
+
+  maxLen = 2;
+  offset = 0;
+
+  if (d2 < p->cyclicBufferSize && *(cur - d2) == *cur)
+  {
+    UPDATE_maxLen
+    distances[0] = (UInt32)maxLen;
+    distances[1] = d2 - 1;
+    offset = 2;
+    if (maxLen == lenLimit)
+    {
+      SkipMatchesSpec((UInt32)lenLimit, curMatch, MF_PARAMS(p));
+      MOVE_POS_RET;
+    }
+  }
+  
+  GET_MATCHES_FOOTER(offset, maxLen)
+}
+
+static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  UInt32 h2, h3, d2, d3, pos;
+  unsigned maxLen, offset;
+  UInt32 *hash;
+  GET_MATCHES_HEADER(4)
+
+  HASH4_CALC;
+
+  hash = p->hash;
+  pos = p->pos;
+
+  d2 = pos - hash                  [h2];
+  d3 = pos - (hash + kFix3HashSize)[h3];
+
+  curMatch = (hash + kFix4HashSize)[hv];
+
+  hash                  [h2] = pos;
+  (hash + kFix3HashSize)[h3] = pos;
+  (hash + kFix4HashSize)[hv] = pos;
+
+  maxLen = 0;
+  offset = 0;
+  
+  if (d2 < p->cyclicBufferSize && *(cur - d2) == *cur)
+  {
+    maxLen = 2;
+    distances[0] = 2;
+    distances[1] = d2 - 1;
+    offset = 2;
+  }
+  
+  if (d2 != d3 && d3 < p->cyclicBufferSize && *(cur - d3) == *cur)
+  {
+    maxLen = 3;
+    distances[(size_t)offset + 1] = d3 - 1;
+    offset += 2;
+    d2 = d3;
+  }
+  
+  if (offset != 0)
+  {
+    UPDATE_maxLen
+    distances[(size_t)offset - 2] = (UInt32)maxLen;
+    if (maxLen == lenLimit)
+    {
+      SkipMatchesSpec((UInt32)lenLimit, curMatch, MF_PARAMS(p));
+      MOVE_POS_RET;
+    }
+  }
+  
+  if (maxLen < 3)
+    maxLen = 3;
+  
+  GET_MATCHES_FOOTER(offset, maxLen)
+}
+
+/*
+static UInt32 Bt5_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  UInt32 h2, h3, h4, d2, d3, d4, maxLen, offset, pos;
+  UInt32 *hash;
+  GET_MATCHES_HEADER(5)
+
+  HASH5_CALC;
+
+  hash = p->hash;
+  pos = p->pos;
+
+  d2 = pos - hash                  [h2];
+  d3 = pos - (hash + kFix3HashSize)[h3];
+  d4 = pos - (hash + kFix4HashSize)[h4];
+
+  curMatch = (hash + kFix5HashSize)[hv];
+
+  hash                  [h2] = pos;
+  (hash + kFix3HashSize)[h3] = pos;
+  (hash + kFix4HashSize)[h4] = pos;
+  (hash + kFix5HashSize)[hv] = pos;
+
+  maxLen = 0;
+  offset = 0;
+
+  if (d2 < p->cyclicBufferSize && *(cur - d2) == *cur)
+  {
+    distances[0] = maxLen = 2;
+    distances[1] = d2 - 1;
+    offset = 2;
+    if (*(cur - d2 + 2) == cur[2])
+      distances[0] = maxLen = 3;
+    else if (d3 < p->cyclicBufferSize && *(cur - d3) == *cur)
+    {
+      distances[2] = maxLen = 3;
+      distances[3] = d3 - 1;
+      offset = 4;
+      d2 = d3;
+    }
+  }
+  else if (d3 < p->cyclicBufferSize && *(cur - d3) == *cur)
+  {
+    distances[0] = maxLen = 3;
+    distances[1] = d3 - 1;
+    offset = 2;
+    d2 = d3;
+  }
+  
+  if (d2 != d4 && d4 < p->cyclicBufferSize
+      && *(cur - d4) == *cur
+      && *(cur - d4 + 3) == *(cur + 3))
+  {
+    maxLen = 4;
+    distances[(size_t)offset + 1] = d4 - 1;
+    offset += 2;
+    d2 = d4;
+  }
+  
+  if (offset != 0)
+  {
+    UPDATE_maxLen
+    distances[(size_t)offset - 2] = maxLen;
+    if (maxLen == lenLimit)
+    {
+      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
+      MOVE_POS_RET;
+    }
+  }
+
+  if (maxLen < 4)
+    maxLen = 4;
+  
+  GET_MATCHES_FOOTER(offset, maxLen)
+}
+*/
+
+static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  UInt32 h2, h3, d2, d3, pos;
+  unsigned maxLen, offset;
+  UInt32 *hash;
+  GET_MATCHES_HEADER(4)
+
+  HASH4_CALC;
+
+  hash = p->hash;
+  pos = p->pos;
+  
+  d2 = pos - hash                  [h2];
+  d3 = pos - (hash + kFix3HashSize)[h3];
+  curMatch = (hash + kFix4HashSize)[hv];
+
+  hash                  [h2] = pos;
+  (hash + kFix3HashSize)[h3] = pos;
+  (hash + kFix4HashSize)[hv] = pos;
+
+  maxLen = 0;
+  offset = 0;
+
+  if (d2 < p->cyclicBufferSize && *(cur - d2) == *cur)
+  {
+    maxLen = 2;
+    distances[0] = 2;
+    distances[1] = d2 - 1;
+    offset = 2;
+  }
+  
+  if (d2 != d3 && d3 < p->cyclicBufferSize && *(cur - d3) == *cur)
+  {
+    maxLen = 3;
+    distances[(size_t)offset + 1] = d3 - 1;
+    offset += 2;
+    d2 = d3;
+  }
+  
+  if (offset != 0)
+  {
+    UPDATE_maxLen
+    distances[(size_t)offset - 2] = (UInt32)maxLen;
+    if (maxLen == lenLimit)
+    {
+      p->son[p->cyclicBufferPos] = curMatch;
+      MOVE_POS_RET;
+    }
+  }
+  
+  if (maxLen < 3)
+    maxLen = 3;
+
+  offset = (unsigned)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+      distances + offset, maxLen) - (distances));
+  MOVE_POS_RET
+}
+
+/*
+static UInt32 Hc5_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  UInt32 h2, h3, h4, d2, d3, d4, maxLen, offset, pos
+  UInt32 *hash;
+  GET_MATCHES_HEADER(5)
+
+  HASH5_CALC;
+
+  hash = p->hash;
+  pos = p->pos;
+  
+  d2 = pos - hash                  [h2];
+  d3 = pos - (hash + kFix3HashSize)[h3];
+  d4 = pos - (hash + kFix4HashSize)[h4];
+
+  curMatch = (hash + kFix5HashSize)[hv];
+
+  hash                  [h2] = pos;
+  (hash + kFix3HashSize)[h3] = pos;
+  (hash + kFix4HashSize)[h4] = pos;
+  (hash + kFix5HashSize)[hv] = pos;
+
+  maxLen = 0;
+  offset = 0;
+
+  if (d2 < p->cyclicBufferSize && *(cur - d2) == *cur)
+  {
+    distances[0] = maxLen = 2;
+    distances[1] = d2 - 1;
+    offset = 2;
+    if (*(cur - d2 + 2) == cur[2])
+      distances[0] = maxLen = 3;
+    else if (d3 < p->cyclicBufferSize && *(cur - d3) == *cur)
+    {
+      distances[2] = maxLen = 3;
+      distances[3] = d3 - 1;
+      offset = 4;
+      d2 = d3;
+    }
+  }
+  else if (d3 < p->cyclicBufferSize && *(cur - d3) == *cur)
+  {
+    distances[0] = maxLen = 3;
+    distances[1] = d3 - 1;
+    offset = 2;
+    d2 = d3;
+  }
+  
+  if (d2 != d4 && d4 < p->cyclicBufferSize
+      && *(cur - d4) == *cur
+      && *(cur - d4 + 3) == *(cur + 3))
+  {
+    maxLen = 4;
+    distances[(size_t)offset + 1] = d4 - 1;
+    offset += 2;
+    d2 = d4;
+  }
+  
+  if (offset != 0)
+  {
+    UPDATE_maxLen
+    distances[(size_t)offset - 2] = maxLen;
+    if (maxLen == lenLimit)
+    {
+      p->son[p->cyclicBufferPos] = curMatch;
+      MOVE_POS_RET;
+    }
+  }
+  
+  if (maxLen < 4)
+    maxLen = 4;
+
+  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+      distances + offset, maxLen) - (distances));
+  MOVE_POS_RET
+}
+*/
+
+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
+{
+  unsigned offset;
+  GET_MATCHES_HEADER(3)
+  HASH_ZIP_CALC;
+  curMatch = p->hash[hv];
+  p->hash[hv] = p->pos;
+  offset = (unsigned)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
+      distances, 2) - (distances));
+  MOVE_POS_RET
+}
+
+static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    SKIP_HEADER(2)
+    HASH2_CALC;
+    curMatch = p->hash[hv];
+    p->hash[hv] = p->pos;
+    SKIP_FOOTER
+  }
+  while (--num != 0);
+}
+
+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    SKIP_HEADER(3)
+    HASH_ZIP_CALC;
+    curMatch = p->hash[hv];
+    p->hash[hv] = p->pos;
+    SKIP_FOOTER
+  }
+  while (--num != 0);
+}
+
+static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    UInt32 h2;
+    UInt32 *hash;
+    SKIP_HEADER(3)
+    HASH3_CALC;
+    hash = p->hash;
+    curMatch = (hash + kFix3HashSize)[hv];
+    hash[h2] =
+    (hash + kFix3HashSize)[hv] = p->pos;
+    SKIP_FOOTER
+  }
+  while (--num != 0);
+}
+
+static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    UInt32 h2, h3;
+    UInt32 *hash;
+    SKIP_HEADER(4)
+    HASH4_CALC;
+    hash = p->hash;
+    curMatch = (hash + kFix4HashSize)[hv];
+    hash                  [h2] =
+    (hash + kFix3HashSize)[h3] =
+    (hash + kFix4HashSize)[hv] = p->pos;
+    SKIP_FOOTER
+  }
+  while (--num != 0);
+}
+
+/*
+static void Bt5_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    UInt32 h2, h3, h4;
+    UInt32 *hash;
+    SKIP_HEADER(5)
+    HASH5_CALC;
+    hash = p->hash;
+    curMatch = (hash + kFix5HashSize)[hv];
+    hash                  [h2] =
+    (hash + kFix3HashSize)[h3] =
+    (hash + kFix4HashSize)[h4] =
+    (hash + kFix5HashSize)[hv] = p->pos;
+    SKIP_FOOTER
+  }
+  while (--num != 0);
+}
+*/
+
+static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    UInt32 h2, h3;
+    UInt32 *hash;
+    SKIP_HEADER(4)
+    HASH4_CALC;
+    hash = p->hash;
+    curMatch = (hash + kFix4HashSize)[hv];
+    hash                  [h2] =
+    (hash + kFix3HashSize)[h3] =
+    (hash + kFix4HashSize)[hv] = p->pos;
+    p->son[p->cyclicBufferPos] = curMatch;
+    MOVE_POS
+  }
+  while (--num != 0);
+}
+
+/*
+static void Hc5_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    UInt32 h2, h3, h4;
+    UInt32 *hash;
+    SKIP_HEADER(5)
+    HASH5_CALC;
+    hash = p->hash;
+    curMatch = hash + kFix5HashSize)[hv];
+    hash                  [h2] =
+    (hash + kFix3HashSize)[h3] =
+    (hash + kFix4HashSize)[h4] =
+    (hash + kFix5HashSize)[hv] = p->pos;
+    p->son[p->cyclicBufferPos] = curMatch;
+    MOVE_POS
+  }
+  while (--num != 0);
+}
+*/
+
+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
+{
+  do
+  {
+    SKIP_HEADER(3)
+    HASH_ZIP_CALC;
+    curMatch = p->hash[hv];
+    p->hash[hv] = p->pos;
+    p->son[p->cyclicBufferPos] = curMatch;
+    MOVE_POS
+  }
+  while (--num != 0);
+}
+
+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
+{
+  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
+  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
+  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
+  if (!p->btMode)
+  {
+    /* if (p->numHashBytes <= 4) */
+    {
+      vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
+      vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
+    }
+    /*
+    else
+    {
+      vTable->GetMatches = (Mf_GetMatches_Func)Hc5_MatchFinder_GetMatches;
+      vTable->Skip = (Mf_Skip_Func)Hc5_MatchFinder_Skip;
+    }
+    */
+  }
+  else if (p->numHashBytes == 2)
+  {
+    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
+    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
+  }
+  else if (p->numHashBytes == 3)
+  {
+    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
+    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
+  }
+  else /* if (p->numHashBytes == 4) */
+  {
+    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
+    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+  }
+  /*
+  else
+  {
+    vTable->GetMatches = (Mf_GetMatches_Func)Bt5_MatchFinder_GetMatches;
+    vTable->Skip = (Mf_Skip_Func)Bt5_MatchFinder_Skip;
+  }
+  */
+}
diff --git a/3rdparty/7z/src/LzFind.h b/3rdparty/7z/src/LzFind.h
new file mode 100644
index 0000000000..c77added7b
--- /dev/null
+++ b/3rdparty/7z/src/LzFind.h
@@ -0,0 +1,121 @@
+/* LzFind.h -- Match finder for LZ algorithms
+2017-06-10 : Igor Pavlov : Public domain */
+
+#ifndef __LZ_FIND_H
+#define __LZ_FIND_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+typedef UInt32 CLzRef;
+
+typedef struct _CMatchFinder
+{
+  Byte *buffer;
+  UInt32 pos;
+  UInt32 posLimit;
+  UInt32 streamPos;
+  UInt32 lenLimit;
+
+  UInt32 cyclicBufferPos;
+  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
+
+  Byte streamEndWasReached;
+  Byte btMode;
+  Byte bigHash;
+  Byte directInput;
+
+  UInt32 matchMaxLen;
+  CLzRef *hash;
+  CLzRef *son;
+  UInt32 hashMask;
+  UInt32 cutValue;
+
+  Byte *bufferBase;
+  ISeqInStream *stream;
+  
+  UInt32 blockSize;
+  UInt32 keepSizeBefore;
+  UInt32 keepSizeAfter;
+
+  UInt32 numHashBytes;
+  size_t directInputRem;
+  UInt32 historySize;
+  UInt32 fixedHashSize;
+  UInt32 hashSizeSum;
+  SRes result;
+  UInt32 crc[256];
+  size_t numRefs;
+
+  UInt64 expectedDataSize;
+} CMatchFinder;
+
+#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
+
+#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
+
+#define Inline_MatchFinder_IsFinishedOK(p) \
+    ((p)->streamEndWasReached \
+        && (p)->streamPos == (p)->pos \
+        && (!(p)->directInput || (p)->directInputRem == 0))
+      
+int MatchFinder_NeedMove(CMatchFinder *p);
+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
+void MatchFinder_MoveBlock(CMatchFinder *p);
+void MatchFinder_ReadIfRequired(CMatchFinder *p);
+
+void MatchFinder_Construct(CMatchFinder *p);
+
+/* Conditions:
+     historySize <= 3 GB
+     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
+*/
+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
+    ISzAllocPtr alloc);
+void MatchFinder_Free(CMatchFinder *p, ISzAllocPtr alloc);
+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, size_t numItems);
+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
+
+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
+    UInt32 *distances, UInt32 maxLen);
+
+/*
+Conditions:
+  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
+  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
+*/
+
+typedef void (*Mf_Init_Func)(void *object);
+typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
+typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
+typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
+typedef void (*Mf_Skip_Func)(void *object, UInt32);
+
+typedef struct _IMatchFinder
+{
+  Mf_Init_Func Init;
+  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
+  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
+  Mf_GetMatches_Func GetMatches;
+  Mf_Skip_Func Skip;
+} IMatchFinder;
+
+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
+
+void MatchFinder_Init_LowHash(CMatchFinder *p);
+void MatchFinder_Init_HighHash(CMatchFinder *p);
+void MatchFinder_Init_3(CMatchFinder *p, int readData);
+void MatchFinder_Init(CMatchFinder *p);
+
+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
+
+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/LzFindMt.c b/3rdparty/7z/src/LzFindMt.c
new file mode 100644
index 0000000000..df32146f92
--- /dev/null
+++ b/3rdparty/7z/src/LzFindMt.c
@@ -0,0 +1,853 @@
+/* LzFindMt.c -- multithreaded Match finder for LZ algorithms
+2018-12-29 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "LzHash.h"
+
+#include "LzFindMt.h"
+
+static void MtSync_Construct(CMtSync *p)
+{
+  p->wasCreated = False;
+  p->csWasInitialized = False;
+  p->csWasEntered = False;
+  Thread_Construct(&p->thread);
+  Event_Construct(&p->canStart);
+  Event_Construct(&p->wasStarted);
+  Event_Construct(&p->wasStopped);
+  Semaphore_Construct(&p->freeSemaphore);
+  Semaphore_Construct(&p->filledSemaphore);
+}
+
+static void MtSync_GetNextBlock(CMtSync *p)
+{
+  if (p->needStart)
+  {
+    p->numProcessedBlocks = 1;
+    p->needStart = False;
+    p->stopWriting = False;
+    p->exit = False;
+    Event_Reset(&p->wasStarted);
+    Event_Reset(&p->wasStopped);
+
+    Event_Set(&p->canStart);
+    Event_Wait(&p->wasStarted);
+
+    // if (mt) MatchFinder_Init_LowHash(mt->MatchFinder);
+  }
+  else
+  {
+    CriticalSection_Leave(&p->cs);
+    p->csWasEntered = False;
+    p->numProcessedBlocks++;
+    Semaphore_Release1(&p->freeSemaphore);
+  }
+  Semaphore_Wait(&p->filledSemaphore);
+  CriticalSection_Enter(&p->cs);
+  p->csWasEntered = True;
+}
+
+/* MtSync_StopWriting must be called if Writing was started */
+
+static void MtSync_StopWriting(CMtSync *p)
+{
+  UInt32 myNumBlocks = p->numProcessedBlocks;
+  if (!Thread_WasCreated(&p->thread) || p->needStart)
+    return;
+  p->stopWriting = True;
+  if (p->csWasEntered)
+  {
+    CriticalSection_Leave(&p->cs);
+    p->csWasEntered = False;
+  }
+  Semaphore_Release1(&p->freeSemaphore);
+ 
+  Event_Wait(&p->wasStopped);
+
+  while (myNumBlocks++ != p->numProcessedBlocks)
+  {
+    Semaphore_Wait(&p->filledSemaphore);
+    Semaphore_Release1(&p->freeSemaphore);
+  }
+  p->needStart = True;
+}
+
+static void MtSync_Destruct(CMtSync *p)
+{
+  if (Thread_WasCreated(&p->thread))
+  {
+    MtSync_StopWriting(p);
+    p->exit = True;
+    if (p->needStart)
+      Event_Set(&p->canStart);
+    Thread_Wait(&p->thread);
+    Thread_Close(&p->thread);
+  }
+  if (p->csWasInitialized)
+  {
+    CriticalSection_Delete(&p->cs);
+    p->csWasInitialized = False;
+  }
+
+  Event_Close(&p->canStart);
+  Event_Close(&p->wasStarted);
+  Event_Close(&p->wasStopped);
+  Semaphore_Close(&p->freeSemaphore);
+  Semaphore_Close(&p->filledSemaphore);
+
+  p->wasCreated = False;
+}
+
+#define RINOK_THREAD(x) { if ((x) != 0) return SZ_ERROR_THREAD; }
+
+static SRes MtSync_Create2(CMtSync *p, THREAD_FUNC_TYPE startAddress, void *obj, UInt32 numBlocks)
+{
+  if (p->wasCreated)
+    return SZ_OK;
+
+  RINOK_THREAD(CriticalSection_Init(&p->cs));
+  p->csWasInitialized = True;
+
+  RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->canStart));
+  RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->wasStarted));
+  RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->wasStopped));
+  
+  RINOK_THREAD(Semaphore_Create(&p->freeSemaphore, numBlocks, numBlocks));
+  RINOK_THREAD(Semaphore_Create(&p->filledSemaphore, 0, numBlocks));
+
+  p->needStart = True;
+  
+  RINOK_THREAD(Thread_Create(&p->thread, startAddress, obj));
+  p->wasCreated = True;
+  return SZ_OK;
+}
+
+static SRes MtSync_Create(CMtSync *p, THREAD_FUNC_TYPE startAddress, void *obj, UInt32 numBlocks)
+{
+  SRes res = MtSync_Create2(p, startAddress, obj, numBlocks);
+  if (res != SZ_OK)
+    MtSync_Destruct(p);
+  return res;
+}
+
+void MtSync_Init(CMtSync *p) { p->needStart = True; }
+
+#define kMtMaxValForNormalize 0xFFFFFFFF
+
+#define DEF_GetHeads2(name, v, action) \
+  static void GetHeads ## name(const Byte *p, UInt32 pos, \
+      UInt32 *hash, UInt32 hashMask, UInt32 *heads, UInt32 numHeads, const UInt32 *crc) \
+    { action; for (; numHeads != 0; numHeads--) { \
+      const UInt32 value = (v); p++; *heads++ = pos - hash[value]; hash[value] = pos++;  } }
+
+#define DEF_GetHeads(name, v) DEF_GetHeads2(name, v, ;)
+
+DEF_GetHeads2(2,  (p[0] | ((UInt32)p[1] << 8)), UNUSED_VAR(hashMask); UNUSED_VAR(crc); )
+DEF_GetHeads(3,  (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8)) & hashMask)
+DEF_GetHeads(4,  (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8) ^ (crc[p[3]] << 5)) & hashMask)
+DEF_GetHeads(4b, (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8) ^ ((UInt32)p[3] << 16)) & hashMask)
+/* DEF_GetHeads(5,  (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8) ^ (crc[p[3]] << 5) ^ (crc[p[4]] << 3)) & hashMask) */
+
+static void HashThreadFunc(CMatchFinderMt *mt)
+{
+  CMtSync *p = &mt->hashSync;
+  for (;;)
+  {
+    UInt32 numProcessedBlocks = 0;
+    Event_Wait(&p->canStart);
+    Event_Set(&p->wasStarted);
+
+    MatchFinder_Init_HighHash(mt->MatchFinder);
+
+    for (;;)
+    {
+      if (p->exit)
+        return;
+      if (p->stopWriting)
+      {
+        p->numProcessedBlocks = numProcessedBlocks;
+        Event_Set(&p->wasStopped);
+        break;
+      }
+
+      {
+        CMatchFinder *mf = mt->MatchFinder;
+        if (MatchFinder_NeedMove(mf))
+        {
+          CriticalSection_Enter(&mt->btSync.cs);
+          CriticalSection_Enter(&mt->hashSync.cs);
+          {
+            const Byte *beforePtr = Inline_MatchFinder_GetPointerToCurrentPos(mf);
+            ptrdiff_t offset;
+            MatchFinder_MoveBlock(mf);
+            offset = beforePtr - Inline_MatchFinder_GetPointerToCurrentPos(mf);
+            mt->pointerToCurPos -= offset;
+            mt->buffer -= offset;
+          }
+          CriticalSection_Leave(&mt->btSync.cs);
+          CriticalSection_Leave(&mt->hashSync.cs);
+          continue;
+        }
+
+        Semaphore_Wait(&p->freeSemaphore);
+
+        MatchFinder_ReadIfRequired(mf);
+        if (mf->pos > (kMtMaxValForNormalize - kMtHashBlockSize))
+        {
+          UInt32 subValue = (mf->pos - mf->historySize - 1);
+          MatchFinder_ReduceOffsets(mf, subValue);
+          MatchFinder_Normalize3(subValue, mf->hash + mf->fixedHashSize, (size_t)mf->hashMask + 1);
+        }
+        {
+          UInt32 *heads = mt->hashBuf + ((numProcessedBlocks++) & kMtHashNumBlocksMask) * kMtHashBlockSize;
+          UInt32 num = mf->streamPos - mf->pos;
+          heads[0] = 2;
+          heads[1] = num;
+          if (num >= mf->numHashBytes)
+          {
+            num = num - mf->numHashBytes + 1;
+            if (num > kMtHashBlockSize - 2)
+              num = kMtHashBlockSize - 2;
+            mt->GetHeadsFunc(mf->buffer, mf->pos, mf->hash + mf->fixedHashSize, mf->hashMask, heads + 2, num, mf->crc);
+            heads[0] = 2 + num;
+          }
+          mf->pos += num;
+          mf->buffer += num;
+        }
+      }
+
+      Semaphore_Release1(&p->filledSemaphore);
+    }
+  }
+}
+
+static void MatchFinderMt_GetNextBlock_Hash(CMatchFinderMt *p)
+{
+  MtSync_GetNextBlock(&p->hashSync);
+  p->hashBufPosLimit = p->hashBufPos = ((p->hashSync.numProcessedBlocks - 1) & kMtHashNumBlocksMask) * kMtHashBlockSize;
+  p->hashBufPosLimit += p->hashBuf[p->hashBufPos++];
+  p->hashNumAvail = p->hashBuf[p->hashBufPos++];
+}
+
+#define kEmptyHashValue 0
+
+#define MFMT_GM_INLINE
+
+#ifdef MFMT_GM_INLINE
+
+/*
+  we use size_t for _cyclicBufferPos instead of UInt32
+  to eliminate "movsx" BUG in old MSVC x64 compiler.
+*/
+
+MY_NO_INLINE
+static UInt32 *GetMatchesSpecN(UInt32 lenLimit, UInt32 pos, const Byte *cur, CLzRef *son,
+    size_t _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
+    UInt32 *distances, UInt32 _maxLen, const UInt32 *hash, const UInt32 *limit, UInt32 size, UInt32 *posRes)
+{
+  do
+  {
+  UInt32 *_distances = ++distances;
+  UInt32 delta = *hash++;
+
+  CLzRef *ptr0 = son + ((size_t)_cyclicBufferPos << 1) + 1;
+  CLzRef *ptr1 = son + ((size_t)_cyclicBufferPos << 1);
+  unsigned len0 = 0, len1 = 0;
+  UInt32 cutValue = _cutValue;
+  unsigned maxLen = (unsigned)_maxLen;
+
+  /*
+  if (size > 1)
+  {
+    UInt32 delta = *hash;
+    if (delta < _cyclicBufferSize)
+    {
+      UInt32 cyc1 = _cyclicBufferPos + 1;
+      CLzRef *pair = son + ((size_t)(cyc1 - delta + ((delta > cyc1) ? _cyclicBufferSize : 0)) << 1);
+      Byte b = *(cur + 1 - delta);
+      _distances[0] = pair[0];
+      _distances[1] = b;
+    }
+  }
+  */
+  if (cutValue == 0 || delta >= _cyclicBufferSize)
+  {
+    *ptr0 = *ptr1 = kEmptyHashValue;
+  }
+  else
+  for(;;)
+  {
+    {
+      CLzRef *pair = son + ((size_t)(_cyclicBufferPos - delta + ((_cyclicBufferPos < delta) ? _cyclicBufferSize : 0)) << 1);
+      const Byte *pb = cur - delta;
+      unsigned len = (len0 < len1 ? len0 : len1);
+      UInt32 pair0 = *pair;
+      if (pb[len] == cur[len])
+      {
+        if (++len != lenLimit && pb[len] == cur[len])
+          while (++len != lenLimit)
+            if (pb[len] != cur[len])
+              break;
+        if (maxLen < len)
+        {
+          maxLen = len;
+          *distances++ = (UInt32)len;
+          *distances++ = delta - 1;
+          if (len == lenLimit)
+          {
+            UInt32 pair1 = pair[1];
+            *ptr1 = pair0;
+            *ptr0 = pair1;
+            break;
+          }
+        }
+      }
+      {
+        UInt32 curMatch = pos - delta;
+        // delta = pos - *pair;
+        // delta = pos - pair[((UInt32)pb[len] - (UInt32)cur[len]) >> 31];
+        if (pb[len] < cur[len])
+        {
+          delta = pos - pair[1];
+          *ptr1 = curMatch;
+          ptr1 = pair + 1;
+          len1 = len;
+        }
+        else
+        {
+          delta = pos - *pair;
+          *ptr0 = curMatch;
+          ptr0 = pair;
+          len0 = len;
+        }
+      }
+    }
+    if (--cutValue == 0 || delta >= _cyclicBufferSize)
+    {
+      *ptr0 = *ptr1 = kEmptyHashValue;
+      break;
+    }
+  }
+  pos++;
+  _cyclicBufferPos++;
+  cur++;
+  {
+    UInt32 num = (UInt32)(distances - _distances);
+    _distances[-1] = num;
+  }
+  }
+  while (distances < limit && --size != 0);
+  *posRes = pos;
+  return distances;
+}
+
+#endif
+
+
+
+static void BtGetMatches(CMatchFinderMt *p, UInt32 *distances)
+{
+  UInt32 numProcessed = 0;
+  UInt32 curPos = 2;
+  UInt32 limit = kMtBtBlockSize - (p->matchMaxLen * 2); //  * 2
+  
+  distances[1] = p->hashNumAvail;
+  
+  while (curPos < limit)
+  {
+    if (p->hashBufPos == p->hashBufPosLimit)
+    {
+      MatchFinderMt_GetNextBlock_Hash(p);
+      distances[1] = numProcessed + p->hashNumAvail;
+      if (p->hashNumAvail >= p->numHashBytes)
+        continue;
+      distances[0] = curPos + p->hashNumAvail;
+      distances += curPos;
+      for (; p->hashNumAvail != 0; p->hashNumAvail--)
+        *distances++ = 0;
+      return;
+    }
+    {
+      UInt32 size = p->hashBufPosLimit - p->hashBufPos;
+      UInt32 lenLimit = p->matchMaxLen;
+      UInt32 pos = p->pos;
+      UInt32 cyclicBufferPos = p->cyclicBufferPos;
+      if (lenLimit >= p->hashNumAvail)
+        lenLimit = p->hashNumAvail;
+      {
+        UInt32 size2 = p->hashNumAvail - lenLimit + 1;
+        if (size2 < size)
+          size = size2;
+        size2 = p->cyclicBufferSize - cyclicBufferPos;
+        if (size2 < size)
+          size = size2;
+      }
+      
+      #ifndef MFMT_GM_INLINE
+      while (curPos < limit && size-- != 0)
+      {
+        UInt32 *startDistances = distances + curPos;
+        UInt32 num = (UInt32)(GetMatchesSpec1(lenLimit, pos - p->hashBuf[p->hashBufPos++],
+            pos, p->buffer, p->son, cyclicBufferPos, p->cyclicBufferSize, p->cutValue,
+            startDistances + 1, p->numHashBytes - 1) - startDistances);
+        *startDistances = num - 1;
+        curPos += num;
+        cyclicBufferPos++;
+        pos++;
+        p->buffer++;
+      }
+      #else
+      {
+        UInt32 posRes;
+        curPos = (UInt32)(GetMatchesSpecN(lenLimit, pos, p->buffer, p->son, cyclicBufferPos, p->cyclicBufferSize, p->cutValue,
+            distances + curPos, p->numHashBytes - 1, p->hashBuf + p->hashBufPos,
+            distances + limit,
+            size, &posRes) - distances);
+        p->hashBufPos += posRes - pos;
+        cyclicBufferPos += posRes - pos;
+        p->buffer += posRes - pos;
+        pos = posRes;
+      }
+      #endif
+
+      numProcessed += pos - p->pos;
+      p->hashNumAvail -= pos - p->pos;
+      p->pos = pos;
+      if (cyclicBufferPos == p->cyclicBufferSize)
+        cyclicBufferPos = 0;
+      p->cyclicBufferPos = cyclicBufferPos;
+    }
+  }
+  
+  distances[0] = curPos;
+}
+
+static void BtFillBlock(CMatchFinderMt *p, UInt32 globalBlockIndex)
+{
+  CMtSync *sync = &p->hashSync;
+  if (!sync->needStart)
+  {
+    CriticalSection_Enter(&sync->cs);
+    sync->csWasEntered = True;
+  }
+  
+  BtGetMatches(p, p->btBuf + (globalBlockIndex & kMtBtNumBlocksMask) * kMtBtBlockSize);
+
+  if (p->pos > kMtMaxValForNormalize - kMtBtBlockSize)
+  {
+    UInt32 subValue = p->pos - p->cyclicBufferSize;
+    MatchFinder_Normalize3(subValue, p->son, (size_t)p->cyclicBufferSize * 2);
+    p->pos -= subValue;
+  }
+
+  if (!sync->needStart)
+  {
+    CriticalSection_Leave(&sync->cs);
+    sync->csWasEntered = False;
+  }
+}
+
+void BtThreadFunc(CMatchFinderMt *mt)
+{
+  CMtSync *p = &mt->btSync;
+  for (;;)
+  {
+    UInt32 blockIndex = 0;
+    Event_Wait(&p->canStart);
+    Event_Set(&p->wasStarted);
+    for (;;)
+    {
+      if (p->exit)
+        return;
+      if (p->stopWriting)
+      {
+        p->numProcessedBlocks = blockIndex;
+        MtSync_StopWriting(&mt->hashSync);
+        Event_Set(&p->wasStopped);
+        break;
+      }
+      Semaphore_Wait(&p->freeSemaphore);
+      BtFillBlock(mt, blockIndex++);
+      Semaphore_Release1(&p->filledSemaphore);
+    }
+  }
+}
+
+void MatchFinderMt_Construct(CMatchFinderMt *p)
+{
+  p->hashBuf = NULL;
+  MtSync_Construct(&p->hashSync);
+  MtSync_Construct(&p->btSync);
+}
+
+static void MatchFinderMt_FreeMem(CMatchFinderMt *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->hashBuf);
+  p->hashBuf = NULL;
+}
+
+void MatchFinderMt_Destruct(CMatchFinderMt *p, ISzAllocPtr alloc)
+{
+  MtSync_Destruct(&p->hashSync);
+  MtSync_Destruct(&p->btSync);
+  MatchFinderMt_FreeMem(p, alloc);
+}
+
+#define kHashBufferSize (kMtHashBlockSize * kMtHashNumBlocks)
+#define kBtBufferSize (kMtBtBlockSize * kMtBtNumBlocks)
+
+static THREAD_FUNC_RET_TYPE THREAD_FUNC_CALL_TYPE HashThreadFunc2(void *p) { HashThreadFunc((CMatchFinderMt *)p);  return 0; }
+static THREAD_FUNC_RET_TYPE THREAD_FUNC_CALL_TYPE BtThreadFunc2(void *p)
+{
+  Byte allocaDummy[0x180];
+  unsigned i = 0;
+  for (i = 0; i < 16; i++)
+    allocaDummy[i] = (Byte)0;
+  if (allocaDummy[0] == 0)
+    BtThreadFunc((CMatchFinderMt *)p);
+  return 0;
+}
+
+SRes MatchFinderMt_Create(CMatchFinderMt *p, UInt32 historySize, UInt32 keepAddBufferBefore,
+    UInt32 matchMaxLen, UInt32 keepAddBufferAfter, ISzAllocPtr alloc)
+{
+  CMatchFinder *mf = p->MatchFinder;
+  p->historySize = historySize;
+  if (kMtBtBlockSize <= matchMaxLen * 4)
+    return SZ_ERROR_PARAM;
+  if (!p->hashBuf)
+  {
+    p->hashBuf = (UInt32 *)ISzAlloc_Alloc(alloc, (kHashBufferSize + kBtBufferSize) * sizeof(UInt32));
+    if (!p->hashBuf)
+      return SZ_ERROR_MEM;
+    p->btBuf = p->hashBuf + kHashBufferSize;
+  }
+  keepAddBufferBefore += (kHashBufferSize + kBtBufferSize);
+  keepAddBufferAfter += kMtHashBlockSize;
+  if (!MatchFinder_Create(mf, historySize, keepAddBufferBefore, matchMaxLen, keepAddBufferAfter, alloc))
+    return SZ_ERROR_MEM;
+
+  RINOK(MtSync_Create(&p->hashSync, HashThreadFunc2, p, kMtHashNumBlocks));
+  RINOK(MtSync_Create(&p->btSync, BtThreadFunc2, p, kMtBtNumBlocks));
+  return SZ_OK;
+}
+
+/* Call it after ReleaseStream / SetStream */
+static void MatchFinderMt_Init(CMatchFinderMt *p)
+{
+  CMatchFinder *mf = p->MatchFinder;
+  
+  p->btBufPos =
+  p->btBufPosLimit = 0;
+  p->hashBufPos =
+  p->hashBufPosLimit = 0;
+
+  /* Init without data reading. We don't want to read data in this thread */
+  MatchFinder_Init_3(mf, False);
+  MatchFinder_Init_LowHash(mf);
+  
+  p->pointerToCurPos = Inline_MatchFinder_GetPointerToCurrentPos(mf);
+  p->btNumAvailBytes = 0;
+  p->lzPos = p->historySize + 1;
+
+  p->hash = mf->hash;
+  p->fixedHashSize = mf->fixedHashSize;
+  p->crc = mf->crc;
+
+  p->son = mf->son;
+  p->matchMaxLen = mf->matchMaxLen;
+  p->numHashBytes = mf->numHashBytes;
+  p->pos = mf->pos;
+  p->buffer = mf->buffer;
+  p->cyclicBufferPos = mf->cyclicBufferPos;
+  p->cyclicBufferSize = mf->cyclicBufferSize;
+  p->cutValue = mf->cutValue;
+}
+
+/* ReleaseStream is required to finish multithreading */
+void MatchFinderMt_ReleaseStream(CMatchFinderMt *p)
+{
+  MtSync_StopWriting(&p->btSync);
+  /* p->MatchFinder->ReleaseStream(); */
+}
+
+static void MatchFinderMt_Normalize(CMatchFinderMt *p)
+{
+  MatchFinder_Normalize3(p->lzPos - p->historySize - 1, p->hash, p->fixedHashSize);
+  p->lzPos = p->historySize + 1;
+}
+
+static void MatchFinderMt_GetNextBlock_Bt(CMatchFinderMt *p)
+{
+  UInt32 blockIndex;
+  MtSync_GetNextBlock(&p->btSync);
+  blockIndex = ((p->btSync.numProcessedBlocks - 1) & kMtBtNumBlocksMask);
+  p->btBufPosLimit = p->btBufPos = blockIndex * kMtBtBlockSize;
+  p->btBufPosLimit += p->btBuf[p->btBufPos++];
+  p->btNumAvailBytes = p->btBuf[p->btBufPos++];
+  if (p->lzPos >= kMtMaxValForNormalize - kMtBtBlockSize)
+    MatchFinderMt_Normalize(p);
+}
+
+static const Byte * MatchFinderMt_GetPointerToCurrentPos(CMatchFinderMt *p)
+{
+  return p->pointerToCurPos;
+}
+
+#define GET_NEXT_BLOCK_IF_REQUIRED if (p->btBufPos == p->btBufPosLimit) MatchFinderMt_GetNextBlock_Bt(p);
+
+static UInt32 MatchFinderMt_GetNumAvailableBytes(CMatchFinderMt *p)
+{
+  GET_NEXT_BLOCK_IF_REQUIRED;
+  return p->btNumAvailBytes;
+}
+
+static UInt32 * MixMatches2(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
+{
+  UInt32 h2, curMatch2;
+  UInt32 *hash = p->hash;
+  const Byte *cur = p->pointerToCurPos;
+  UInt32 lzPos = p->lzPos;
+  MT_HASH2_CALC
+      
+  curMatch2 = hash[h2];
+  hash[h2] = lzPos;
+
+  if (curMatch2 >= matchMinPos)
+    if (cur[(ptrdiff_t)curMatch2 - lzPos] == cur[0])
+    {
+      *distances++ = 2;
+      *distances++ = lzPos - curMatch2 - 1;
+    }
+  
+  return distances;
+}
+
+static UInt32 * MixMatches3(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
+{
+  UInt32 h2, h3, curMatch2, curMatch3;
+  UInt32 *hash = p->hash;
+  const Byte *cur = p->pointerToCurPos;
+  UInt32 lzPos = p->lzPos;
+  MT_HASH3_CALC
+
+  curMatch2 = hash[                h2];
+  curMatch3 = (hash + kFix3HashSize)[h3];
+  
+  hash[                h2] = lzPos;
+  (hash + kFix3HashSize)[h3] = lzPos;
+
+  if (curMatch2 >= matchMinPos && cur[(ptrdiff_t)curMatch2 - lzPos] == cur[0])
+  {
+    distances[1] = lzPos - curMatch2 - 1;
+    if (cur[(ptrdiff_t)curMatch2 - lzPos + 2] == cur[2])
+    {
+      distances[0] = 3;
+      return distances + 2;
+    }
+    distances[0] = 2;
+    distances += 2;
+  }
+  
+  if (curMatch3 >= matchMinPos && cur[(ptrdiff_t)curMatch3 - lzPos] == cur[0])
+  {
+    *distances++ = 3;
+    *distances++ = lzPos - curMatch3 - 1;
+  }
+  
+  return distances;
+}
+
+/*
+static UInt32 *MixMatches4(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
+{
+  UInt32 h2, h3, h4, curMatch2, curMatch3, curMatch4;
+  UInt32 *hash = p->hash;
+  const Byte *cur = p->pointerToCurPos;
+  UInt32 lzPos = p->lzPos;
+  MT_HASH4_CALC
+      
+  curMatch2 = hash[                h2];
+  curMatch3 = (hash + kFix3HashSize)[h3];
+  curMatch4 = (hash + kFix4HashSize)[h4];
+  
+  hash[                h2] = lzPos;
+  (hash + kFix3HashSize)[h3] = lzPos;
+  (hash + kFix4HashSize)[h4] = lzPos;
+
+  if (curMatch2 >= matchMinPos && cur[(ptrdiff_t)curMatch2 - lzPos] == cur[0])
+  {
+    distances[1] = lzPos - curMatch2 - 1;
+    if (cur[(ptrdiff_t)curMatch2 - lzPos + 2] == cur[2])
+    {
+      distances[0] = (cur[(ptrdiff_t)curMatch2 - lzPos + 3] == cur[3]) ? 4 : 3;
+      return distances + 2;
+    }
+    distances[0] = 2;
+    distances += 2;
+  }
+  
+  if (curMatch3 >= matchMinPos && cur[(ptrdiff_t)curMatch3 - lzPos] == cur[0])
+  {
+    distances[1] = lzPos - curMatch3 - 1;
+    if (cur[(ptrdiff_t)curMatch3 - lzPos + 3] == cur[3])
+    {
+      distances[0] = 4;
+      return distances + 2;
+    }
+    distances[0] = 3;
+    distances += 2;
+  }
+
+  if (curMatch4 >= matchMinPos)
+    if (
+      cur[(ptrdiff_t)curMatch4 - lzPos] == cur[0] &&
+      cur[(ptrdiff_t)curMatch4 - lzPos + 3] == cur[3]
+      )
+    {
+      *distances++ = 4;
+      *distances++ = lzPos - curMatch4 - 1;
+    }
+  
+  return distances;
+}
+*/
+
+#define INCREASE_LZ_POS p->lzPos++; p->pointerToCurPos++;
+
+static UInt32 MatchFinderMt2_GetMatches(CMatchFinderMt *p, UInt32 *distances)
+{
+  const UInt32 *btBuf = p->btBuf + p->btBufPos;
+  UInt32 len = *btBuf++;
+  p->btBufPos += 1 + len;
+  p->btNumAvailBytes--;
+  {
+    UInt32 i;
+    for (i = 0; i < len; i += 2)
+    {
+      UInt32 v0 = btBuf[0];
+      UInt32 v1 = btBuf[1];
+      btBuf += 2;
+      distances[0] = v0;
+      distances[1] = v1;
+      distances += 2;
+    }
+  }
+  INCREASE_LZ_POS
+  return len;
+}
+
+static UInt32 MatchFinderMt_GetMatches(CMatchFinderMt *p, UInt32 *distances)
+{
+  const UInt32 *btBuf = p->btBuf + p->btBufPos;
+  UInt32 len = *btBuf++;
+  p->btBufPos += 1 + len;
+
+  if (len == 0)
+  {
+    /* change for bt5 ! */
+    if (p->btNumAvailBytes-- >= 4)
+      len = (UInt32)(p->MixMatchesFunc(p, p->lzPos - p->historySize, distances) - (distances));
+  }
+  else
+  {
+    /* Condition: there are matches in btBuf with length < p->numHashBytes */
+    UInt32 *distances2;
+    p->btNumAvailBytes--;
+    distances2 = p->MixMatchesFunc(p, p->lzPos - btBuf[1], distances);
+    do
+    {
+      UInt32 v0 = btBuf[0];
+      UInt32 v1 = btBuf[1];
+      btBuf += 2;
+      distances2[0] = v0;
+      distances2[1] = v1;
+      distances2 += 2;
+    }
+    while ((len -= 2) != 0);
+    len = (UInt32)(distances2 - (distances));
+  }
+  INCREASE_LZ_POS
+  return len;
+}
+
+#define SKIP_HEADER2_MT  do { GET_NEXT_BLOCK_IF_REQUIRED
+#define SKIP_HEADER_MT(n) SKIP_HEADER2_MT if (p->btNumAvailBytes-- >= (n)) { const Byte *cur = p->pointerToCurPos; UInt32 *hash = p->hash;
+#define SKIP_FOOTER_MT } INCREASE_LZ_POS p->btBufPos += p->btBuf[p->btBufPos] + 1; } while (--num != 0);
+
+static void MatchFinderMt0_Skip(CMatchFinderMt *p, UInt32 num)
+{
+  SKIP_HEADER2_MT { p->btNumAvailBytes--;
+  SKIP_FOOTER_MT
+}
+
+static void MatchFinderMt2_Skip(CMatchFinderMt *p, UInt32 num)
+{
+  SKIP_HEADER_MT(2)
+      UInt32 h2;
+      MT_HASH2_CALC
+      hash[h2] = p->lzPos;
+  SKIP_FOOTER_MT
+}
+
+static void MatchFinderMt3_Skip(CMatchFinderMt *p, UInt32 num)
+{
+  SKIP_HEADER_MT(3)
+      UInt32 h2, h3;
+      MT_HASH3_CALC
+      (hash + kFix3HashSize)[h3] =
+      hash[                h2] =
+        p->lzPos;
+  SKIP_FOOTER_MT
+}
+
+/*
+static void MatchFinderMt4_Skip(CMatchFinderMt *p, UInt32 num)
+{
+  SKIP_HEADER_MT(4)
+      UInt32 h2, h3, h4;
+      MT_HASH4_CALC
+      (hash + kFix4HashSize)[h4] =
+      (hash + kFix3HashSize)[h3] =
+      hash[                h2] =
+        p->lzPos;
+  SKIP_FOOTER_MT
+}
+*/
+
+void MatchFinderMt_CreateVTable(CMatchFinderMt *p, IMatchFinder *vTable)
+{
+  vTable->Init = (Mf_Init_Func)MatchFinderMt_Init;
+  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinderMt_GetNumAvailableBytes;
+  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinderMt_GetPointerToCurrentPos;
+  vTable->GetMatches = (Mf_GetMatches_Func)MatchFinderMt_GetMatches;
+  
+  switch (p->MatchFinder->numHashBytes)
+  {
+    case 2:
+      p->GetHeadsFunc = GetHeads2;
+      p->MixMatchesFunc = (Mf_Mix_Matches)NULL;
+      vTable->Skip = (Mf_Skip_Func)MatchFinderMt0_Skip;
+      vTable->GetMatches = (Mf_GetMatches_Func)MatchFinderMt2_GetMatches;
+      break;
+    case 3:
+      p->GetHeadsFunc = GetHeads3;
+      p->MixMatchesFunc = (Mf_Mix_Matches)MixMatches2;
+      vTable->Skip = (Mf_Skip_Func)MatchFinderMt2_Skip;
+      break;
+    default:
+    /* case 4: */
+      p->GetHeadsFunc = p->MatchFinder->bigHash ? GetHeads4b : GetHeads4;
+      p->MixMatchesFunc = (Mf_Mix_Matches)MixMatches3;
+      vTable->Skip = (Mf_Skip_Func)MatchFinderMt3_Skip;
+      break;
+    /*
+    default:
+      p->GetHeadsFunc = GetHeads5;
+      p->MixMatchesFunc = (Mf_Mix_Matches)MixMatches4;
+      vTable->Skip = (Mf_Skip_Func)MatchFinderMt4_Skip;
+      break;
+    */
+  }
+}
diff --git a/3rdparty/7z/src/LzFindMt.h b/3rdparty/7z/src/LzFindMt.h
new file mode 100644
index 0000000000..fdd17008c2
--- /dev/null
+++ b/3rdparty/7z/src/LzFindMt.h
@@ -0,0 +1,101 @@
+/* LzFindMt.h -- multithreaded Match finder for LZ algorithms
+2018-07-04 : Igor Pavlov : Public domain */
+
+#ifndef __LZ_FIND_MT_H
+#define __LZ_FIND_MT_H
+
+#include "LzFind.h"
+#include "Threads.h"
+
+EXTERN_C_BEGIN
+
+#define kMtHashBlockSize (1 << 13)
+#define kMtHashNumBlocks (1 << 3)
+#define kMtHashNumBlocksMask (kMtHashNumBlocks - 1)
+
+#define kMtBtBlockSize (1 << 14)
+#define kMtBtNumBlocks (1 << 6)
+#define kMtBtNumBlocksMask (kMtBtNumBlocks - 1)
+
+typedef struct _CMtSync
+{
+  BoolInt wasCreated;
+  BoolInt needStart;
+  BoolInt exit;
+  BoolInt stopWriting;
+
+  CThread thread;
+  CAutoResetEvent canStart;
+  CAutoResetEvent wasStarted;
+  CAutoResetEvent wasStopped;
+  CSemaphore freeSemaphore;
+  CSemaphore filledSemaphore;
+  BoolInt csWasInitialized;
+  BoolInt csWasEntered;
+  CCriticalSection cs;
+  UInt32 numProcessedBlocks;
+} CMtSync;
+
+typedef UInt32 * (*Mf_Mix_Matches)(void *p, UInt32 matchMinPos, UInt32 *distances);
+
+/* kMtCacheLineDummy must be >= size_of_CPU_cache_line */
+#define kMtCacheLineDummy 128
+
+typedef void (*Mf_GetHeads)(const Byte *buffer, UInt32 pos,
+  UInt32 *hash, UInt32 hashMask, UInt32 *heads, UInt32 numHeads, const UInt32 *crc);
+
+typedef struct _CMatchFinderMt
+{
+  /* LZ */
+  const Byte *pointerToCurPos;
+  UInt32 *btBuf;
+  UInt32 btBufPos;
+  UInt32 btBufPosLimit;
+  UInt32 lzPos;
+  UInt32 btNumAvailBytes;
+
+  UInt32 *hash;
+  UInt32 fixedHashSize;
+  UInt32 historySize;
+  const UInt32 *crc;
+
+  Mf_Mix_Matches MixMatchesFunc;
+  
+  /* LZ + BT */
+  CMtSync btSync;
+  Byte btDummy[kMtCacheLineDummy];
+
+  /* BT */
+  UInt32 *hashBuf;
+  UInt32 hashBufPos;
+  UInt32 hashBufPosLimit;
+  UInt32 hashNumAvail;
+
+  CLzRef *son;
+  UInt32 matchMaxLen;
+  UInt32 numHashBytes;
+  UInt32 pos;
+  const Byte *buffer;
+  UInt32 cyclicBufferPos;
+  UInt32 cyclicBufferSize; /* it must be historySize + 1 */
+  UInt32 cutValue;
+
+  /* BT + Hash */
+  CMtSync hashSync;
+  /* Byte hashDummy[kMtCacheLineDummy]; */
+  
+  /* Hash */
+  Mf_GetHeads GetHeadsFunc;
+  CMatchFinder *MatchFinder;
+} CMatchFinderMt;
+
+void MatchFinderMt_Construct(CMatchFinderMt *p);
+void MatchFinderMt_Destruct(CMatchFinderMt *p, ISzAllocPtr alloc);
+SRes MatchFinderMt_Create(CMatchFinderMt *p, UInt32 historySize, UInt32 keepAddBufferBefore,
+    UInt32 matchMaxLen, UInt32 keepAddBufferAfter, ISzAllocPtr alloc);
+void MatchFinderMt_CreateVTable(CMatchFinderMt *p, IMatchFinder *vTable);
+void MatchFinderMt_ReleaseStream(CMatchFinderMt *p);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/LzHash.h b/3rdparty/7z/src/LzHash.h
new file mode 100644
index 0000000000..2191444072
--- /dev/null
+++ b/3rdparty/7z/src/LzHash.h
@@ -0,0 +1,57 @@
+/* LzHash.h -- HASH functions for LZ algorithms
+2015-04-12 : Igor Pavlov : Public domain */
+
+#ifndef __LZ_HASH_H
+#define __LZ_HASH_H
+
+#define kHash2Size (1 << 10)
+#define kHash3Size (1 << 16)
+#define kHash4Size (1 << 20)
+
+#define kFix3HashSize (kHash2Size)
+#define kFix4HashSize (kHash2Size + kHash3Size)
+#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
+
+#define HASH2_CALC hv = cur[0] | ((UInt32)cur[1] << 8);
+
+#define HASH3_CALC { \
+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
+  h2 = temp & (kHash2Size - 1); \
+  hv = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
+
+#define HASH4_CALC { \
+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
+  h2 = temp & (kHash2Size - 1); \
+  temp ^= ((UInt32)cur[2] << 8); \
+  h3 = temp & (kHash3Size - 1); \
+  hv = (temp ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
+
+#define HASH5_CALC { \
+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
+  h2 = temp & (kHash2Size - 1); \
+  temp ^= ((UInt32)cur[2] << 8); \
+  h3 = temp & (kHash3Size - 1); \
+  temp ^= (p->crc[cur[3]] << 5); \
+  h4 = temp & (kHash4Size - 1); \
+  hv = (temp ^ (p->crc[cur[4]] << 3)) & p->hashMask; }
+
+/* #define HASH_ZIP_CALC hv = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
+#define HASH_ZIP_CALC hv = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
+
+
+#define MT_HASH2_CALC \
+  h2 = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
+
+#define MT_HASH3_CALC { \
+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
+  h2 = temp & (kHash2Size - 1); \
+  h3 = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
+
+#define MT_HASH4_CALC { \
+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
+  h2 = temp & (kHash2Size - 1); \
+  temp ^= ((UInt32)cur[2] << 8); \
+  h3 = temp & (kHash3Size - 1); \
+  h4 = (temp ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
+
+#endif
diff --git a/3rdparty/7z/src/Lzma2Dec.c b/3rdparty/7z/src/Lzma2Dec.c
new file mode 100644
index 0000000000..2e631051ba
--- /dev/null
+++ b/3rdparty/7z/src/Lzma2Dec.c
@@ -0,0 +1,488 @@
+/* Lzma2Dec.c -- LZMA2 Decoder
+2019-02-02 : Igor Pavlov : Public domain */
+
+/* #define SHOW_DEBUG_INFO */
+
+#include "Precomp.h"
+
+#ifdef SHOW_DEBUG_INFO
+#include <stdio.h>
+#endif
+
+#include <string.h>
+
+#include "Lzma2Dec.h"
+
+/*
+00000000  -  End of data
+00000001 U U  -  Uncompressed, reset dic, need reset state and set new prop
+00000010 U U  -  Uncompressed, no reset
+100uuuuu U U P P  -  LZMA, no reset
+101uuuuu U U P P  -  LZMA, reset state
+110uuuuu U U P P S  -  LZMA, reset state + set new prop
+111uuuuu U U P P S  -  LZMA, reset state + set new prop, reset dic
+
+  u, U - Unpack Size
+  P - Pack Size
+  S - Props
+*/
+
+#define LZMA2_CONTROL_COPY_RESET_DIC 1
+
+#define LZMA2_IS_UNCOMPRESSED_STATE(p) (((p)->control & (1 << 7)) == 0)
+
+#define LZMA2_LCLP_MAX 4
+#define LZMA2_DIC_SIZE_FROM_PROP(p) (((UInt32)2 | ((p) & 1)) << ((p) / 2 + 11))
+
+#ifdef SHOW_DEBUG_INFO
+#define PRF(x) x
+#else
+#define PRF(x)
+#endif
+
+typedef enum
+{
+  LZMA2_STATE_CONTROL,
+  LZMA2_STATE_UNPACK0,
+  LZMA2_STATE_UNPACK1,
+  LZMA2_STATE_PACK0,
+  LZMA2_STATE_PACK1,
+  LZMA2_STATE_PROP,
+  LZMA2_STATE_DATA,
+  LZMA2_STATE_DATA_CONT,
+  LZMA2_STATE_FINISHED,
+  LZMA2_STATE_ERROR
+} ELzma2State;
+
+static SRes Lzma2Dec_GetOldProps(Byte prop, Byte *props)
+{
+  UInt32 dicSize;
+  if (prop > 40)
+    return SZ_ERROR_UNSUPPORTED;
+  dicSize = (prop == 40) ? 0xFFFFFFFF : LZMA2_DIC_SIZE_FROM_PROP(prop);
+  props[0] = (Byte)LZMA2_LCLP_MAX;
+  props[1] = (Byte)(dicSize);
+  props[2] = (Byte)(dicSize >> 8);
+  props[3] = (Byte)(dicSize >> 16);
+  props[4] = (Byte)(dicSize >> 24);
+  return SZ_OK;
+}
+
+SRes Lzma2Dec_AllocateProbs(CLzma2Dec *p, Byte prop, ISzAllocPtr alloc)
+{
+  Byte props[LZMA_PROPS_SIZE];
+  RINOK(Lzma2Dec_GetOldProps(prop, props));
+  return LzmaDec_AllocateProbs(&p->decoder, props, LZMA_PROPS_SIZE, alloc);
+}
+
+SRes Lzma2Dec_Allocate(CLzma2Dec *p, Byte prop, ISzAllocPtr alloc)
+{
+  Byte props[LZMA_PROPS_SIZE];
+  RINOK(Lzma2Dec_GetOldProps(prop, props));
+  return LzmaDec_Allocate(&p->decoder, props, LZMA_PROPS_SIZE, alloc);
+}
+
+void Lzma2Dec_Init(CLzma2Dec *p)
+{
+  p->state = LZMA2_STATE_CONTROL;
+  p->needInitLevel = 0xE0;
+  p->isExtraMode = False;
+  p->unpackSize = 0;
+  
+  // p->decoder.dicPos = 0; // we can use it instead of full init
+  LzmaDec_Init(&p->decoder);
+}
+
+static ELzma2State Lzma2Dec_UpdateState(CLzma2Dec *p, Byte b)
+{
+  switch (p->state)
+  {
+    case LZMA2_STATE_CONTROL:
+      p->isExtraMode = False;
+      p->control = b;
+      PRF(printf("\n %8X", (unsigned)p->decoder.dicPos));
+      PRF(printf(" %02X", (unsigned)b));
+      if (b == 0)
+        return LZMA2_STATE_FINISHED;
+      if (LZMA2_IS_UNCOMPRESSED_STATE(p))
+      {
+        if (b == LZMA2_CONTROL_COPY_RESET_DIC)
+          p->needInitLevel = 0xC0;
+        else if (b > 2 || p->needInitLevel == 0xE0)
+          return LZMA2_STATE_ERROR;
+      }
+      else
+      {
+        if (b < p->needInitLevel)
+          return LZMA2_STATE_ERROR;
+        p->needInitLevel = 0;
+        p->unpackSize = (UInt32)(b & 0x1F) << 16;
+      }
+      return LZMA2_STATE_UNPACK0;
+    
+    case LZMA2_STATE_UNPACK0:
+      p->unpackSize |= (UInt32)b << 8;
+      return LZMA2_STATE_UNPACK1;
+    
+    case LZMA2_STATE_UNPACK1:
+      p->unpackSize |= (UInt32)b;
+      p->unpackSize++;
+      PRF(printf(" %7u", (unsigned)p->unpackSize));
+      return LZMA2_IS_UNCOMPRESSED_STATE(p) ? LZMA2_STATE_DATA : LZMA2_STATE_PACK0;
+    
+    case LZMA2_STATE_PACK0:
+      p->packSize = (UInt32)b << 8;
+      return LZMA2_STATE_PACK1;
+
+    case LZMA2_STATE_PACK1:
+      p->packSize |= (UInt32)b;
+      p->packSize++;
+      // if (p->packSize < 5) return LZMA2_STATE_ERROR;
+      PRF(printf(" %5u", (unsigned)p->packSize));
+      return (p->control & 0x40) ? LZMA2_STATE_PROP : LZMA2_STATE_DATA;
+
+    case LZMA2_STATE_PROP:
+    {
+      unsigned lc, lp;
+      if (b >= (9 * 5 * 5))
+        return LZMA2_STATE_ERROR;
+      lc = b % 9;
+      b /= 9;
+      p->decoder.prop.pb = (Byte)(b / 5);
+      lp = b % 5;
+      if (lc + lp > LZMA2_LCLP_MAX)
+        return LZMA2_STATE_ERROR;
+      p->decoder.prop.lc = (Byte)lc;
+      p->decoder.prop.lp = (Byte)lp;
+      return LZMA2_STATE_DATA;
+    }
+  }
+  return LZMA2_STATE_ERROR;
+}
+
+static void LzmaDec_UpdateWithUncompressed(CLzmaDec *p, const Byte *src, SizeT size)
+{
+  memcpy(p->dic + p->dicPos, src, size);
+  p->dicPos += size;
+  if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= size)
+    p->checkDicSize = p->prop.dicSize;
+  p->processedPos += (UInt32)size;
+}
+
+void LzmaDec_InitDicAndState(CLzmaDec *p, BoolInt initDic, BoolInt initState);
+
+
+SRes Lzma2Dec_DecodeToDic(CLzma2Dec *p, SizeT dicLimit,
+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
+{
+  SizeT inSize = *srcLen;
+  *srcLen = 0;
+  *status = LZMA_STATUS_NOT_SPECIFIED;
+
+  while (p->state != LZMA2_STATE_ERROR)
+  {
+    SizeT dicPos;
+
+    if (p->state == LZMA2_STATE_FINISHED)
+    {
+      *status = LZMA_STATUS_FINISHED_WITH_MARK;
+      return SZ_OK;
+    }
+    
+    dicPos = p->decoder.dicPos;
+    
+    if (dicPos == dicLimit && finishMode == LZMA_FINISH_ANY)
+    {
+      *status = LZMA_STATUS_NOT_FINISHED;
+      return SZ_OK;
+    }
+
+    if (p->state != LZMA2_STATE_DATA && p->state != LZMA2_STATE_DATA_CONT)
+    {
+      if (*srcLen == inSize)
+      {
+        *status = LZMA_STATUS_NEEDS_MORE_INPUT;
+        return SZ_OK;
+      }
+      (*srcLen)++;
+      p->state = Lzma2Dec_UpdateState(p, *src++);
+      if (dicPos == dicLimit && p->state != LZMA2_STATE_FINISHED)
+        break;
+      continue;
+    }
+    
+    {
+      SizeT inCur = inSize - *srcLen;
+      SizeT outCur = dicLimit - dicPos;
+      ELzmaFinishMode curFinishMode = LZMA_FINISH_ANY;
+      
+      if (outCur >= p->unpackSize)
+      {
+        outCur = (SizeT)p->unpackSize;
+        curFinishMode = LZMA_FINISH_END;
+      }
+
+      if (LZMA2_IS_UNCOMPRESSED_STATE(p))
+      {
+        if (inCur == 0)
+        {
+          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
+          return SZ_OK;
+        }
+
+        if (p->state == LZMA2_STATE_DATA)
+        {
+          BoolInt initDic = (p->control == LZMA2_CONTROL_COPY_RESET_DIC);
+          LzmaDec_InitDicAndState(&p->decoder, initDic, False);
+        }
+
+        if (inCur > outCur)
+          inCur = outCur;
+        if (inCur == 0)
+          break;
+
+        LzmaDec_UpdateWithUncompressed(&p->decoder, src, inCur);
+
+        src += inCur;
+        *srcLen += inCur;
+        p->unpackSize -= (UInt32)inCur;
+        p->state = (p->unpackSize == 0) ? LZMA2_STATE_CONTROL : LZMA2_STATE_DATA_CONT;
+      }
+      else
+      {
+        SRes res;
+
+        if (p->state == LZMA2_STATE_DATA)
+        {
+          BoolInt initDic = (p->control >= 0xE0);
+          BoolInt initState = (p->control >= 0xA0);
+          LzmaDec_InitDicAndState(&p->decoder, initDic, initState);
+          p->state = LZMA2_STATE_DATA_CONT;
+        }
+  
+        if (inCur > p->packSize)
+          inCur = (SizeT)p->packSize;
+        
+        res = LzmaDec_DecodeToDic(&p->decoder, dicPos + outCur, src, &inCur, curFinishMode, status);
+
+        src += inCur;
+        *srcLen += inCur;
+        p->packSize -= (UInt32)inCur;
+        outCur = p->decoder.dicPos - dicPos;
+        p->unpackSize -= (UInt32)outCur;
+
+        if (res != 0)
+          break;
+        
+        if (*status == LZMA_STATUS_NEEDS_MORE_INPUT)
+        {
+          if (p->packSize == 0)
+            break;
+          return SZ_OK;
+        }
+
+        if (inCur == 0 && outCur == 0)
+        {
+          if (*status != LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
+              || p->unpackSize != 0
+              || p->packSize != 0)
+            break;
+          p->state = LZMA2_STATE_CONTROL;
+        }
+        
+        *status = LZMA_STATUS_NOT_SPECIFIED;
+      }
+    }
+  }
+  
+  *status = LZMA_STATUS_NOT_SPECIFIED;
+  p->state = LZMA2_STATE_ERROR;
+  return SZ_ERROR_DATA;
+}
+
+
+
+
+ELzma2ParseStatus Lzma2Dec_Parse(CLzma2Dec *p,
+    SizeT outSize,
+    const Byte *src, SizeT *srcLen,
+    int checkFinishBlock)
+{
+  SizeT inSize = *srcLen;
+  *srcLen = 0;
+
+  while (p->state != LZMA2_STATE_ERROR)
+  {
+    if (p->state == LZMA2_STATE_FINISHED)
+      return (ELzma2ParseStatus)LZMA_STATUS_FINISHED_WITH_MARK;
+
+    if (outSize == 0 && !checkFinishBlock)
+      return (ELzma2ParseStatus)LZMA_STATUS_NOT_FINISHED;
+    
+    if (p->state != LZMA2_STATE_DATA && p->state != LZMA2_STATE_DATA_CONT)
+    {
+      if (*srcLen == inSize)
+        return (ELzma2ParseStatus)LZMA_STATUS_NEEDS_MORE_INPUT;
+      (*srcLen)++;
+
+      p->state = Lzma2Dec_UpdateState(p, *src++);
+
+      if (p->state == LZMA2_STATE_UNPACK0)
+      {
+        // if (p->decoder.dicPos != 0)
+        if (p->control == LZMA2_CONTROL_COPY_RESET_DIC || p->control >= 0xE0)
+          return LZMA2_PARSE_STATUS_NEW_BLOCK;
+        // if (outSize == 0) return LZMA_STATUS_NOT_FINISHED;
+      }
+
+      // The following code can be commented.
+      // It's not big problem, if we read additional input bytes.
+      // It will be stopped later in LZMA2_STATE_DATA / LZMA2_STATE_DATA_CONT state.
+
+      if (outSize == 0 && p->state != LZMA2_STATE_FINISHED)
+      {
+        // checkFinishBlock is true. So we expect that block must be finished,
+        // We can return LZMA_STATUS_NOT_SPECIFIED or LZMA_STATUS_NOT_FINISHED here
+        // break;
+        return (ELzma2ParseStatus)LZMA_STATUS_NOT_FINISHED;
+      }
+
+      if (p->state == LZMA2_STATE_DATA)
+        return LZMA2_PARSE_STATUS_NEW_CHUNK;
+
+      continue;
+    }
+
+    if (outSize == 0)
+      return (ELzma2ParseStatus)LZMA_STATUS_NOT_FINISHED;
+
+    {
+      SizeT inCur = inSize - *srcLen;
+
+      if (LZMA2_IS_UNCOMPRESSED_STATE(p))
+      {
+        if (inCur == 0)
+          return (ELzma2ParseStatus)LZMA_STATUS_NEEDS_MORE_INPUT;
+        if (inCur > p->unpackSize)
+          inCur = p->unpackSize;
+        if (inCur > outSize)
+          inCur = outSize;
+        p->decoder.dicPos += inCur;
+        src += inCur;
+        *srcLen += inCur;
+        outSize -= inCur;
+        p->unpackSize -= (UInt32)inCur;
+        p->state = (p->unpackSize == 0) ? LZMA2_STATE_CONTROL : LZMA2_STATE_DATA_CONT;
+      }
+      else
+      {
+        p->isExtraMode = True;
+
+        if (inCur == 0)
+        {
+          if (p->packSize != 0)
+            return (ELzma2ParseStatus)LZMA_STATUS_NEEDS_MORE_INPUT;
+        }
+        else if (p->state == LZMA2_STATE_DATA)
+        {
+          p->state = LZMA2_STATE_DATA_CONT;
+          if (*src != 0)
+          {
+            // first byte of lzma chunk must be Zero
+            *srcLen += 1;
+            p->packSize--;
+            break;
+          }
+        }
+  
+        if (inCur > p->packSize)
+          inCur = (SizeT)p->packSize;
+
+        src += inCur;
+        *srcLen += inCur;
+        p->packSize -= (UInt32)inCur;
+
+        if (p->packSize == 0)
+        {
+          SizeT rem = outSize;
+          if (rem > p->unpackSize)
+            rem = p->unpackSize;
+          p->decoder.dicPos += rem;
+          p->unpackSize -= (UInt32)rem;
+          outSize -= rem;
+          if (p->unpackSize == 0)
+            p->state = LZMA2_STATE_CONTROL;
+        }
+      }
+    }
+  }
+  
+  p->state = LZMA2_STATE_ERROR;
+  return (ELzma2ParseStatus)LZMA_STATUS_NOT_SPECIFIED;
+}
+
+
+
+
+SRes Lzma2Dec_DecodeToBuf(CLzma2Dec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
+{
+  SizeT outSize = *destLen, inSize = *srcLen;
+  *srcLen = *destLen = 0;
+  
+  for (;;)
+  {
+    SizeT inCur = inSize, outCur, dicPos;
+    ELzmaFinishMode curFinishMode;
+    SRes res;
+    
+    if (p->decoder.dicPos == p->decoder.dicBufSize)
+      p->decoder.dicPos = 0;
+    dicPos = p->decoder.dicPos;
+    curFinishMode = LZMA_FINISH_ANY;
+    outCur = p->decoder.dicBufSize - dicPos;
+    
+    if (outCur >= outSize)
+    {
+      outCur = outSize;
+      curFinishMode = finishMode;
+    }
+
+    res = Lzma2Dec_DecodeToDic(p, dicPos + outCur, src, &inCur, curFinishMode, status);
+    
+    src += inCur;
+    inSize -= inCur;
+    *srcLen += inCur;
+    outCur = p->decoder.dicPos - dicPos;
+    memcpy(dest, p->decoder.dic + dicPos, outCur);
+    dest += outCur;
+    outSize -= outCur;
+    *destLen += outCur;
+    if (res != 0)
+      return res;
+    if (outCur == 0 || outSize == 0)
+      return SZ_OK;
+  }
+}
+
+
+SRes Lzma2Decode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+    Byte prop, ELzmaFinishMode finishMode, ELzmaStatus *status, ISzAllocPtr alloc)
+{
+  CLzma2Dec p;
+  SRes res;
+  SizeT outSize = *destLen, inSize = *srcLen;
+  *destLen = *srcLen = 0;
+  *status = LZMA_STATUS_NOT_SPECIFIED;
+  Lzma2Dec_Construct(&p);
+  RINOK(Lzma2Dec_AllocateProbs(&p, prop, alloc));
+  p.decoder.dic = dest;
+  p.decoder.dicBufSize = outSize;
+  Lzma2Dec_Init(&p);
+  *srcLen = inSize;
+  res = Lzma2Dec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
+  *destLen = p.decoder.dicPos;
+  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
+    res = SZ_ERROR_INPUT_EOF;
+  Lzma2Dec_FreeProbs(&p, alloc);
+  return res;
+}
diff --git a/3rdparty/7z/src/Lzma2Dec.h b/3rdparty/7z/src/Lzma2Dec.h
new file mode 100644
index 0000000000..da50387250
--- /dev/null
+++ b/3rdparty/7z/src/Lzma2Dec.h
@@ -0,0 +1,120 @@
+/* Lzma2Dec.h -- LZMA2 Decoder
+2018-02-19 : Igor Pavlov : Public domain */
+
+#ifndef __LZMA2_DEC_H
+#define __LZMA2_DEC_H
+
+#include "LzmaDec.h"
+
+EXTERN_C_BEGIN
+
+/* ---------- State Interface ---------- */
+
+typedef struct
+{
+  unsigned state;
+  Byte control;
+  Byte needInitLevel;
+  Byte isExtraMode;
+  Byte _pad_;
+  UInt32 packSize;
+  UInt32 unpackSize;
+  CLzmaDec decoder;
+} CLzma2Dec;
+
+#define Lzma2Dec_Construct(p) LzmaDec_Construct(&(p)->decoder)
+#define Lzma2Dec_FreeProbs(p, alloc) LzmaDec_FreeProbs(&(p)->decoder, alloc)
+#define Lzma2Dec_Free(p, alloc) LzmaDec_Free(&(p)->decoder, alloc)
+
+SRes Lzma2Dec_AllocateProbs(CLzma2Dec *p, Byte prop, ISzAllocPtr alloc);
+SRes Lzma2Dec_Allocate(CLzma2Dec *p, Byte prop, ISzAllocPtr alloc);
+void Lzma2Dec_Init(CLzma2Dec *p);
+
+/*
+finishMode:
+  It has meaning only if the decoding reaches output limit (*destLen or dicLimit).
+  LZMA_FINISH_ANY - use smallest number of input bytes
+  LZMA_FINISH_END - read EndOfStream marker after decoding
+
+Returns:
+  SZ_OK
+    status:
+      LZMA_STATUS_FINISHED_WITH_MARK
+      LZMA_STATUS_NOT_FINISHED
+      LZMA_STATUS_NEEDS_MORE_INPUT
+  SZ_ERROR_DATA - Data error
+*/
+
+SRes Lzma2Dec_DecodeToDic(CLzma2Dec *p, SizeT dicLimit,
+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+
+SRes Lzma2Dec_DecodeToBuf(CLzma2Dec *p, Byte *dest, SizeT *destLen,
+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+
+
+/* ---------- LZMA2 block and chunk parsing ---------- */
+
+/*
+Lzma2Dec_Parse() parses compressed data stream up to next independent block or next chunk data.
+It can return LZMA_STATUS_* code or LZMA2_PARSE_STATUS_* code:
+  - LZMA2_PARSE_STATUS_NEW_BLOCK - there is new block, and 1 additional byte (control byte of next block header) was read from input.
+  - LZMA2_PARSE_STATUS_NEW_CHUNK - there is new chunk, and only lzma2 header of new chunk was read.
+                                   CLzma2Dec::unpackSize contains unpack size of that chunk
+*/
+
+typedef enum
+{
+/*
+  LZMA_STATUS_NOT_SPECIFIED                 // data error
+  LZMA_STATUS_FINISHED_WITH_MARK
+  LZMA_STATUS_NOT_FINISHED                  //
+  LZMA_STATUS_NEEDS_MORE_INPUT
+  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK   // unused
+*/
+  LZMA2_PARSE_STATUS_NEW_BLOCK = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK + 1,
+  LZMA2_PARSE_STATUS_NEW_CHUNK
+} ELzma2ParseStatus;
+
+ELzma2ParseStatus Lzma2Dec_Parse(CLzma2Dec *p,
+    SizeT outSize,   // output size
+    const Byte *src, SizeT *srcLen,
+    int checkFinishBlock   // set (checkFinishBlock = 1), if it must read full input data, if decoder.dicPos reaches blockMax position.
+    );
+
+/*
+LZMA2 parser doesn't decode LZMA chunks, so we must read
+  full input LZMA chunk to decode some part of LZMA chunk.
+
+Lzma2Dec_GetUnpackExtra() returns the value that shows
+    max possible number of output bytes that can be output by decoder
+    at current input positon.
+*/
+
+#define Lzma2Dec_GetUnpackExtra(p) ((p)->isExtraMode ? (p)->unpackSize : 0);
+
+
+/* ---------- One Call Interface ---------- */
+
+/*
+finishMode:
+  It has meaning only if the decoding reaches output limit (*destLen).
+  LZMA_FINISH_ANY - use smallest number of input bytes
+  LZMA_FINISH_END - read EndOfStream marker after decoding
+
+Returns:
+  SZ_OK
+    status:
+      LZMA_STATUS_FINISHED_WITH_MARK
+      LZMA_STATUS_NOT_FINISHED
+  SZ_ERROR_DATA - Data error
+  SZ_ERROR_MEM  - Memory allocation error
+  SZ_ERROR_UNSUPPORTED - Unsupported properties
+  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
+*/
+
+SRes Lzma2Decode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+    Byte prop, ELzmaFinishMode finishMode, ELzmaStatus *status, ISzAllocPtr alloc);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/Lzma2DecMt.c b/3rdparty/7z/src/Lzma2DecMt.c
new file mode 100644
index 0000000000..87d5567ad4
--- /dev/null
+++ b/3rdparty/7z/src/Lzma2DecMt.c
@@ -0,0 +1,1082 @@
+/* Lzma2DecMt.c -- LZMA2 Decoder Multi-thread
+2019-02-02 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+// #define SHOW_DEBUG_INFO
+
+#ifdef SHOW_DEBUG_INFO
+#include <stdio.h>
+#endif
+
+#ifdef SHOW_DEBUG_INFO
+#define PRF(x) x
+#else
+#define PRF(x)
+#endif
+
+#define PRF_STR(s) PRF(printf("\n" s "\n"))
+#define PRF_STR_INT(s, d) PRF(printf("\n" s " %d\n", (unsigned)d))
+#define PRF_STR_INT_2(s, d1, d2) PRF(printf("\n" s " %d %d\n", (unsigned)d1, (unsigned)d2))
+
+// #define _7ZIP_ST
+
+#include "Alloc.h"
+
+#include "Lzma2Dec.h"
+#include "Lzma2DecMt.h"
+
+#ifndef _7ZIP_ST
+#include "MtDec.h"
+#endif
+
+
+#define LZMA2DECMT_OUT_BLOCK_MAX_DEFAULT (1 << 28)
+
+void Lzma2DecMtProps_Init(CLzma2DecMtProps *p)
+{
+  p->inBufSize_ST = 1 << 20;
+  p->outStep_ST = 1 << 20;
+
+  #ifndef _7ZIP_ST
+  p->numThreads = 1;
+  p->inBufSize_MT = 1 << 18;
+  p->outBlockMax = LZMA2DECMT_OUT_BLOCK_MAX_DEFAULT;
+  p->inBlockMax = p->outBlockMax + p->outBlockMax / 16;
+  #endif
+}
+
+
+
+#ifndef _7ZIP_ST
+
+/* ---------- CLzma2DecMtThread ---------- */
+
+typedef struct
+{
+  CLzma2Dec dec;
+  Byte dec_created;
+  Byte needInit;
+  
+  Byte *outBuf;
+  size_t outBufSize;
+
+  EMtDecParseState state;
+  ELzma2ParseStatus parseStatus;
+
+  size_t inPreSize;
+  size_t outPreSize;
+
+  size_t inCodeSize;
+  size_t outCodeSize;
+  SRes codeRes;
+
+  CAlignOffsetAlloc alloc;
+
+  Byte mtPad[1 << 7];
+} CLzma2DecMtThread;
+
+#endif
+
+
+/* ---------- CLzma2DecMt ---------- */
+
+typedef struct
+{
+  // ISzAllocPtr alloc;
+  ISzAllocPtr allocMid;
+
+  CAlignOffsetAlloc alignOffsetAlloc;
+  CLzma2DecMtProps props;
+  Byte prop;
+  
+  ISeqInStream *inStream;
+  ISeqOutStream *outStream;
+  ICompressProgress *progress;
+
+  BoolInt finishMode;
+  BoolInt outSize_Defined;
+  UInt64 outSize;
+
+  UInt64 outProcessed;
+  UInt64 inProcessed;
+  BoolInt readWasFinished;
+  SRes readRes;
+
+  Byte *inBuf;
+  size_t inBufSize;
+  Byte dec_created;
+  CLzma2Dec dec;
+
+  size_t inPos;
+  size_t inLim;
+
+  #ifndef _7ZIP_ST
+  UInt64 outProcessed_Parse;
+  BoolInt mtc_WasConstructed;
+  CMtDec mtc;
+  CLzma2DecMtThread coders[MTDEC__THREADS_MAX];
+  #endif
+
+} CLzma2DecMt;
+
+
+
+CLzma2DecMtHandle Lzma2DecMt_Create(ISzAllocPtr alloc, ISzAllocPtr allocMid)
+{
+  CLzma2DecMt *p = (CLzma2DecMt *)ISzAlloc_Alloc(alloc, sizeof(CLzma2DecMt));
+  if (!p)
+    return NULL;
+  
+  // p->alloc = alloc;
+  p->allocMid = allocMid;
+
+  AlignOffsetAlloc_CreateVTable(&p->alignOffsetAlloc);
+  p->alignOffsetAlloc.numAlignBits = 7;
+  p->alignOffsetAlloc.offset = 0;
+  p->alignOffsetAlloc.baseAlloc = alloc;
+
+  p->inBuf = NULL;
+  p->inBufSize = 0;
+  p->dec_created = False;
+
+  // Lzma2DecMtProps_Init(&p->props);
+
+  #ifndef _7ZIP_ST
+  p->mtc_WasConstructed = False;
+  {
+    unsigned i;
+    for (i = 0; i < MTDEC__THREADS_MAX; i++)
+    {
+      CLzma2DecMtThread *t = &p->coders[i];
+      t->dec_created = False;
+      t->outBuf = NULL;
+      t->outBufSize = 0;
+    }
+  }
+  #endif
+
+  return p;
+}
+
+
+#ifndef _7ZIP_ST
+
+static void Lzma2DecMt_FreeOutBufs(CLzma2DecMt *p)
+{
+  unsigned i;
+  for (i = 0; i < MTDEC__THREADS_MAX; i++)
+  {
+    CLzma2DecMtThread *t = &p->coders[i];
+    if (t->outBuf)
+    {
+      ISzAlloc_Free(p->allocMid, t->outBuf);
+      t->outBuf = NULL;
+      t->outBufSize = 0;
+    }
+  }
+}
+
+#endif
+
+
+static void Lzma2DecMt_FreeSt(CLzma2DecMt *p)
+{
+  if (p->dec_created)
+  {
+    Lzma2Dec_Free(&p->dec, &p->alignOffsetAlloc.vt);
+    p->dec_created = False;
+  }
+  if (p->inBuf)
+  {
+    ISzAlloc_Free(p->allocMid, p->inBuf);
+    p->inBuf = NULL;
+  }
+  p->inBufSize = 0;
+}
+
+
+void Lzma2DecMt_Destroy(CLzma2DecMtHandle pp)
+{
+  CLzma2DecMt *p = (CLzma2DecMt *)pp;
+
+  Lzma2DecMt_FreeSt(p);
+
+  #ifndef _7ZIP_ST
+
+  if (p->mtc_WasConstructed)
+  {
+    MtDec_Destruct(&p->mtc);
+    p->mtc_WasConstructed = False;
+  }
+  {
+    unsigned i;
+    for (i = 0; i < MTDEC__THREADS_MAX; i++)
+    {
+      CLzma2DecMtThread *t = &p->coders[i];
+      if (t->dec_created)
+      {
+        // we don't need to free dict here
+        Lzma2Dec_FreeProbs(&t->dec, &t->alloc.vt); // p->alloc !!!
+        t->dec_created = False;
+      }
+    }
+  }
+  Lzma2DecMt_FreeOutBufs(p);
+
+  #endif
+
+  ISzAlloc_Free(p->alignOffsetAlloc.baseAlloc, pp);
+}
+
+
+
+#ifndef _7ZIP_ST
+
+static void Lzma2DecMt_MtCallback_Parse(void *obj, unsigned coderIndex, CMtDecCallbackInfo *cc)
+{
+  CLzma2DecMt *me = (CLzma2DecMt *)obj;
+  CLzma2DecMtThread *t = &me->coders[coderIndex];
+
+  PRF_STR_INT_2("Parse", coderIndex, cc->srcSize);
+
+  cc->state = MTDEC_PARSE_CONTINUE;
+
+  if (cc->startCall)
+  {
+    if (!t->dec_created)
+    {
+      Lzma2Dec_Construct(&t->dec);
+      t->dec_created = True;
+      AlignOffsetAlloc_CreateVTable(&t->alloc);
+      {
+        /* (1 << 12) is expected size of one way in data cache.
+           We optimize alignment for cache line size of 128 bytes and smaller */
+        const unsigned kNumAlignBits = 12;
+        const unsigned kNumCacheLineBits = 7; /* <= kNumAlignBits */
+        t->alloc.numAlignBits = kNumAlignBits;
+        t->alloc.offset = ((UInt32)coderIndex * ((1 << 11) + (1 << 8) + (1 << 6))) & ((1 << kNumAlignBits) - (1 << kNumCacheLineBits));
+        t->alloc.baseAlloc = me->alignOffsetAlloc.baseAlloc;
+      }
+    }
+    Lzma2Dec_Init(&t->dec);
+    
+    t->inPreSize = 0;
+    t->outPreSize = 0;
+    // t->blockWasFinished = False;
+    // t->finishedWithMark = False;
+    t->parseStatus = (ELzma2ParseStatus)LZMA_STATUS_NOT_SPECIFIED;
+    t->state = MTDEC_PARSE_CONTINUE;
+
+    t->inCodeSize = 0;
+    t->outCodeSize = 0;
+    t->codeRes = SZ_OK;
+
+    // (cc->srcSize == 0) is allowed
+  }
+
+  {
+    ELzma2ParseStatus status;
+    BoolInt overflow;
+    UInt32 unpackRem = 0;
+    
+    int checkFinishBlock = True;
+    size_t limit = me->props.outBlockMax;
+    if (me->outSize_Defined)
+    {
+      UInt64 rem = me->outSize - me->outProcessed_Parse;
+      if (limit >= rem)
+      {
+        limit = (size_t)rem;
+        if (!me->finishMode)
+          checkFinishBlock = False;
+      }
+    }
+
+    // checkFinishBlock = False, if we want to decode partial data
+    // that must be finished at position <= outBlockMax.
+
+    {
+      const SizeT srcOrig = cc->srcSize;
+      SizeT srcSize_Point = 0;
+      SizeT dicPos_Point = 0;
+      
+      cc->srcSize = 0;
+      overflow = False;
+
+      for (;;)
+      {
+        SizeT srcCur = srcOrig - cc->srcSize;
+        
+        status = Lzma2Dec_Parse(&t->dec,
+            limit - t->dec.decoder.dicPos,
+            cc->src + cc->srcSize, &srcCur,
+            checkFinishBlock);
+
+        cc->srcSize += srcCur;
+
+        if (status == LZMA2_PARSE_STATUS_NEW_CHUNK)
+        {
+          if (t->dec.unpackSize > me->props.outBlockMax - t->dec.decoder.dicPos)
+          {
+            overflow = True;
+            break;
+          }
+          continue;
+        }
+        
+        if (status == LZMA2_PARSE_STATUS_NEW_BLOCK)
+        {
+          if (t->dec.decoder.dicPos == 0)
+            continue;
+          // we decode small blocks in one thread
+          if (t->dec.decoder.dicPos >= (1 << 14))
+            break;
+          dicPos_Point = t->dec.decoder.dicPos;
+          srcSize_Point = cc->srcSize;
+          continue;
+        }
+
+        if ((int)status == LZMA_STATUS_NOT_FINISHED && checkFinishBlock
+            // && limit == t->dec.decoder.dicPos
+            // && limit == me->props.outBlockMax
+            )
+        {
+          overflow = True;
+          break;
+        }
+        
+        unpackRem = Lzma2Dec_GetUnpackExtra(&t->dec);
+        break;
+      }
+
+      if (dicPos_Point != 0
+          && (int)status != LZMA2_PARSE_STATUS_NEW_BLOCK
+          && (int)status != LZMA_STATUS_FINISHED_WITH_MARK
+          && (int)status != LZMA_STATUS_NOT_SPECIFIED)
+      {
+        // we revert to latest newBlock state
+        status = LZMA2_PARSE_STATUS_NEW_BLOCK;
+        unpackRem = 0;
+        t->dec.decoder.dicPos = dicPos_Point;
+        cc->srcSize = srcSize_Point;
+        overflow = False;
+      }
+    }
+
+    t->inPreSize += cc->srcSize;
+    t->parseStatus = status;
+
+    if (overflow)
+      cc->state = MTDEC_PARSE_OVERFLOW;
+    else
+    {
+      size_t dicPos = t->dec.decoder.dicPos;
+
+      if ((int)status != LZMA_STATUS_NEEDS_MORE_INPUT)
+      {
+        if (status == LZMA2_PARSE_STATUS_NEW_BLOCK)
+        {
+          cc->state = MTDEC_PARSE_NEW;
+          cc->srcSize--; // we don't need control byte of next block
+          t->inPreSize--;
+        }
+        else
+        {
+          cc->state = MTDEC_PARSE_END;
+          if ((int)status != LZMA_STATUS_FINISHED_WITH_MARK)
+          {
+            // (status == LZMA_STATUS_NOT_SPECIFIED)
+            // (status == LZMA_STATUS_NOT_FINISHED)
+            if (unpackRem != 0)
+            {
+              /* we also reserve space for max possible number of output bytes of current LZMA chunk */
+              SizeT rem = limit - dicPos;
+              if (rem > unpackRem)
+                rem = unpackRem;
+              dicPos += rem;
+            }
+          }
+        }
+    
+        me->outProcessed_Parse += dicPos;
+      }
+      
+      cc->outPos = dicPos;
+      t->outPreSize = (size_t)dicPos;
+    }
+
+    t->state = cc->state;
+    return;
+  }
+}
+
+
+static SRes Lzma2DecMt_MtCallback_PreCode(void *pp, unsigned coderIndex)
+{
+  CLzma2DecMt *me = (CLzma2DecMt *)pp;
+  CLzma2DecMtThread *t = &me->coders[coderIndex];
+  Byte *dest = t->outBuf;
+
+  if (t->inPreSize == 0)
+  {
+    t->codeRes = SZ_ERROR_DATA;
+    return t->codeRes;
+  }
+
+  if (!dest || t->outBufSize < t->outPreSize)
+  {
+    if (dest)
+    {
+      ISzAlloc_Free(me->allocMid, dest);
+      t->outBuf = NULL;
+      t->outBufSize = 0;
+    }
+
+    dest = (Byte *)ISzAlloc_Alloc(me->allocMid, t->outPreSize
+        // + (1 << 28)
+        );
+    // Sleep(200);
+    if (!dest)
+      return SZ_ERROR_MEM;
+    t->outBuf = dest;
+    t->outBufSize = t->outPreSize;
+  }
+
+  t->dec.decoder.dic = dest;
+  t->dec.decoder.dicBufSize = t->outPreSize;
+
+  t->needInit = True;
+
+  return Lzma2Dec_AllocateProbs(&t->dec, me->prop, &t->alloc.vt); // alloc.vt
+}
+
+
+static SRes Lzma2DecMt_MtCallback_Code(void *pp, unsigned coderIndex,
+    const Byte *src, size_t srcSize, int srcFinished,
+    // int finished, int blockFinished,
+    UInt64 *inCodePos, UInt64 *outCodePos, int *stop)
+{
+  CLzma2DecMt *me = (CLzma2DecMt *)pp;
+  CLzma2DecMtThread *t = &me->coders[coderIndex];
+
+  UNUSED_VAR(srcFinished)
+
+  PRF_STR_INT_2("Code", coderIndex, srcSize);
+
+  *inCodePos = t->inCodeSize;
+  *outCodePos = 0;
+  *stop = True;
+
+  if (t->needInit)
+  {
+    Lzma2Dec_Init(&t->dec);
+    t->needInit = False;
+  }
+
+  {
+    ELzmaStatus status;
+    size_t srcProcessed = srcSize;
+    BoolInt blockWasFinished =
+        ((int)t->parseStatus == LZMA_STATUS_FINISHED_WITH_MARK
+        || t->parseStatus == LZMA2_PARSE_STATUS_NEW_BLOCK);
+    
+    SRes res = Lzma2Dec_DecodeToDic(&t->dec,
+        t->outPreSize,
+        src, &srcProcessed,
+        blockWasFinished ? LZMA_FINISH_END : LZMA_FINISH_ANY,
+        &status);
+
+    t->codeRes = res;
+
+    t->inCodeSize += srcProcessed;
+    *inCodePos = t->inCodeSize;
+    t->outCodeSize = t->dec.decoder.dicPos;
+    *outCodePos = t->dec.decoder.dicPos;
+
+    if (res != SZ_OK)
+      return res;
+
+    if (srcProcessed == srcSize)
+      *stop = False;
+
+    if (blockWasFinished)
+    {
+      if (srcSize != srcProcessed)
+        return SZ_ERROR_FAIL;
+      
+      if (t->inPreSize == t->inCodeSize)
+      {
+        if (t->outPreSize != t->outCodeSize)
+          return SZ_ERROR_FAIL;
+        *stop = True;
+      }
+    }
+    else
+    {
+      if (t->outPreSize == t->outCodeSize)
+        *stop = True;
+    }
+
+    return SZ_OK;
+  }
+}
+
+
+#define LZMA2DECMT_STREAM_WRITE_STEP (1 << 24)
+
+static SRes Lzma2DecMt_MtCallback_Write(void *pp, unsigned coderIndex,
+    BoolInt needWriteToStream,
+    const Byte *src, size_t srcSize,
+    BoolInt *needContinue, BoolInt *canRecode)
+{
+  CLzma2DecMt *me = (CLzma2DecMt *)pp;
+  const CLzma2DecMtThread *t = &me->coders[coderIndex];
+  size_t size = t->outCodeSize;
+  const Byte *data = t->outBuf;
+  BoolInt needContinue2 = True;
+
+  PRF_STR_INT_2("Write", coderIndex, srcSize);
+
+  *needContinue = False;
+  *canRecode = True;
+  UNUSED_VAR(src)
+  UNUSED_VAR(srcSize)
+
+  if (
+      // t->parseStatus == LZMA_STATUS_FINISHED_WITH_MARK
+         t->state == MTDEC_PARSE_OVERFLOW
+      || t->state == MTDEC_PARSE_END)
+    needContinue2 = False;
+
+
+  if (!needWriteToStream)
+    return SZ_OK;
+
+  me->mtc.inProcessed += t->inCodeSize;
+
+  if (t->codeRes == SZ_OK)
+  if ((int)t->parseStatus == LZMA_STATUS_FINISHED_WITH_MARK
+      || t->parseStatus == LZMA2_PARSE_STATUS_NEW_BLOCK)
+  if (t->outPreSize != t->outCodeSize
+      || t->inPreSize != t->inCodeSize)
+    return SZ_ERROR_FAIL;
+
+  *canRecode = False;
+    
+  if (me->outStream)
+  {
+    for (;;)
+    {
+      size_t cur = size;
+      size_t written;
+      if (cur > LZMA2DECMT_STREAM_WRITE_STEP)
+        cur = LZMA2DECMT_STREAM_WRITE_STEP;
+
+      written = ISeqOutStream_Write(me->outStream, data, cur);
+      
+      me->outProcessed += written;
+      // me->mtc.writtenTotal += written;
+      if (written != cur)
+        return SZ_ERROR_WRITE;
+      data += cur;
+      size -= cur;
+      if (size == 0)
+      {
+        *needContinue = needContinue2;
+        return SZ_OK;
+      }
+      RINOK(MtProgress_ProgressAdd(&me->mtc.mtProgress, 0, 0));
+    }
+  }
+  
+  return SZ_ERROR_FAIL;
+  /*
+  if (size > me->outBufSize)
+    return SZ_ERROR_OUTPUT_EOF;
+  memcpy(me->outBuf, data, size);
+  me->outBufSize -= size;
+  me->outBuf += size;
+  *needContinue = needContinue2;
+  return SZ_OK;
+  */
+}
+
+#endif
+
+
+static SRes Lzma2Dec_Prepare_ST(CLzma2DecMt *p)
+{
+  if (!p->dec_created)
+  {
+    Lzma2Dec_Construct(&p->dec);
+    p->dec_created = True;
+  }
+
+  RINOK(Lzma2Dec_Allocate(&p->dec, p->prop, &p->alignOffsetAlloc.vt));
+
+  if (!p->inBuf || p->inBufSize != p->props.inBufSize_ST)
+  {
+    ISzAlloc_Free(p->allocMid, p->inBuf);
+    p->inBufSize = 0;
+    p->inBuf = (Byte *)ISzAlloc_Alloc(p->allocMid, p->props.inBufSize_ST);
+    if (!p->inBuf)
+      return SZ_ERROR_MEM;
+    p->inBufSize = p->props.inBufSize_ST;
+  }
+
+  Lzma2Dec_Init(&p->dec);
+  
+  return SZ_OK;
+}
+
+
+static SRes Lzma2Dec_Decode_ST(CLzma2DecMt *p
+    #ifndef _7ZIP_ST
+    , BoolInt tMode
+    #endif
+    )
+{
+  SizeT wrPos;
+  size_t inPos, inLim;
+  const Byte *inData;
+  UInt64 inPrev, outPrev;
+
+  CLzma2Dec *dec;
+
+  #ifndef _7ZIP_ST
+  if (tMode)
+  {
+    Lzma2DecMt_FreeOutBufs(p);
+    tMode = MtDec_PrepareRead(&p->mtc);
+  }
+  #endif
+
+  RINOK(Lzma2Dec_Prepare_ST(p));
+
+  dec = &p->dec;
+
+  inPrev = p->inProcessed;
+  outPrev = p->outProcessed;
+
+  inPos = 0;
+  inLim = 0;
+  inData = NULL;
+  wrPos = dec->decoder.dicPos;
+
+  for (;;)
+  {
+    SizeT dicPos;
+    SizeT size;
+    ELzmaFinishMode finishMode;
+    SizeT inProcessed;
+    ELzmaStatus status;
+    SRes res;
+
+    SizeT outProcessed;
+    BoolInt outFinished;
+    BoolInt needStop;
+
+    if (inPos == inLim)
+    {
+      #ifndef _7ZIP_ST
+      if (tMode)
+      {
+        inData = MtDec_Read(&p->mtc, &inLim);
+        inPos = 0;
+        if (inData)
+          continue;
+        tMode = False;
+        inLim = 0;
+      }
+      #endif
+      
+      if (!p->readWasFinished)
+      {
+        inPos = 0;
+        inLim = p->inBufSize;
+        inData = p->inBuf;
+        p->readRes = ISeqInStream_Read(p->inStream, (void *)inData, &inLim);
+        // p->readProcessed += inLim;
+        // inLim -= 5; p->readWasFinished = True; // for test
+        if (inLim == 0 || p->readRes != SZ_OK)
+          p->readWasFinished = True;
+      }
+    }
+
+    dicPos = dec->decoder.dicPos;
+    {
+      SizeT next = dec->decoder.dicBufSize;
+      if (next - wrPos > p->props.outStep_ST)
+        next = wrPos + p->props.outStep_ST;
+      size = next - dicPos;
+    }
+
+    finishMode = LZMA_FINISH_ANY;
+    if (p->outSize_Defined)
+    {
+      const UInt64 rem = p->outSize - p->outProcessed;
+      if (size >= rem)
+      {
+        size = (SizeT)rem;
+        if (p->finishMode)
+          finishMode = LZMA_FINISH_END;
+      }
+    }
+
+    inProcessed = inLim - inPos;
+    
+    res = Lzma2Dec_DecodeToDic(dec, dicPos + size, inData + inPos, &inProcessed, finishMode, &status);
+
+    inPos += inProcessed;
+    p->inProcessed += inProcessed;
+    outProcessed = dec->decoder.dicPos - dicPos;
+    p->outProcessed += outProcessed;
+
+    outFinished = (p->outSize_Defined && p->outSize <= p->outProcessed);
+
+    needStop = (res != SZ_OK
+        || (inProcessed == 0 && outProcessed == 0)
+        || status == LZMA_STATUS_FINISHED_WITH_MARK
+        || (!p->finishMode && outFinished));
+
+    if (needStop || outProcessed >= size)
+    {
+      SRes res2;
+      {
+        size_t writeSize = dec->decoder.dicPos - wrPos;
+        size_t written = ISeqOutStream_Write(p->outStream, dec->decoder.dic + wrPos, writeSize);
+        res2 = (written == writeSize) ? SZ_OK : SZ_ERROR_WRITE;
+      }
+
+      if (dec->decoder.dicPos == dec->decoder.dicBufSize)
+        dec->decoder.dicPos = 0;
+      wrPos = dec->decoder.dicPos;
+
+      RINOK(res2);
+
+      if (needStop)
+      {
+        if (res != SZ_OK)
+          return res;
+
+        if (status == LZMA_STATUS_FINISHED_WITH_MARK)
+        {
+          if (p->finishMode)
+          {
+            if (p->outSize_Defined && p->outSize != p->outProcessed)
+              return SZ_ERROR_DATA;
+          }
+          return SZ_OK;
+        }
+
+        if (!p->finishMode && outFinished)
+          return SZ_OK;
+
+        if (status == LZMA_STATUS_NEEDS_MORE_INPUT)
+          return SZ_ERROR_INPUT_EOF;
+        
+        return SZ_ERROR_DATA;
+      }
+    }
+    
+    if (p->progress)
+    {
+      UInt64 inDelta = p->inProcessed - inPrev;
+      UInt64 outDelta = p->outProcessed - outPrev;
+      if (inDelta >= (1 << 22) || outDelta >= (1 << 22))
+      {
+        RINOK(ICompressProgress_Progress(p->progress, p->inProcessed, p->outProcessed));
+        inPrev = p->inProcessed;
+        outPrev = p->outProcessed;
+      }
+    }
+  }
+}
+
+
+
+SRes Lzma2DecMt_Decode(CLzma2DecMtHandle pp,
+    Byte prop,
+    const CLzma2DecMtProps *props,
+    ISeqOutStream *outStream, const UInt64 *outDataSize, int finishMode,
+    // Byte *outBuf, size_t *outBufSize,
+    ISeqInStream *inStream,
+    // const Byte *inData, size_t inDataSize,
+    UInt64 *inProcessed,
+    // UInt64 *outProcessed,
+    int *isMT,
+    ICompressProgress *progress)
+{
+  CLzma2DecMt *p = (CLzma2DecMt *)pp;
+  #ifndef _7ZIP_ST
+  BoolInt tMode;
+  #endif
+
+  *inProcessed = 0;
+
+  if (prop > 40)
+    return SZ_ERROR_UNSUPPORTED;
+
+  p->prop = prop;
+  p->props = *props;
+
+  p->inStream = inStream;
+  p->outStream = outStream;
+  p->progress = progress;
+
+  p->outSize = 0;
+  p->outSize_Defined = False;
+  if (outDataSize)
+  {
+    p->outSize_Defined = True;
+    p->outSize = *outDataSize;
+  }
+  p->finishMode = finishMode;
+
+  p->outProcessed = 0;
+  p->inProcessed = 0;
+
+  p->readWasFinished = False;
+
+  *isMT = False;
+
+  
+  #ifndef _7ZIP_ST
+
+  tMode = False;
+
+  // p->mtc.parseRes = SZ_OK;
+
+  // p->mtc.numFilledThreads = 0;
+  // p->mtc.crossStart = 0;
+  // p->mtc.crossEnd = 0;
+  // p->mtc.allocError_for_Read_BlockIndex = 0;
+  // p->mtc.isAllocError = False;
+
+  if (p->props.numThreads > 1)
+  {
+    IMtDecCallback vt;
+
+    Lzma2DecMt_FreeSt(p);
+
+    p->outProcessed_Parse = 0;
+
+    if (!p->mtc_WasConstructed)
+    {
+      p->mtc_WasConstructed = True;
+      MtDec_Construct(&p->mtc);
+    }
+    
+    p->mtc.progress = progress;
+    p->mtc.inStream = inStream;
+
+    // p->outBuf = NULL;
+    // p->outBufSize = 0;
+    /*
+    if (!outStream)
+    {
+      // p->outBuf = outBuf;
+      // p->outBufSize = *outBufSize;
+      // *outBufSize = 0;
+      return SZ_ERROR_PARAM;
+    }
+    */
+
+    // p->mtc.inBlockMax = p->props.inBlockMax;
+    p->mtc.alloc = &p->alignOffsetAlloc.vt;
+      // p->alignOffsetAlloc.baseAlloc;
+    // p->mtc.inData = inData;
+    // p->mtc.inDataSize = inDataSize;
+    p->mtc.mtCallback = &vt;
+    p->mtc.mtCallbackObject = p;
+
+    p->mtc.inBufSize = p->props.inBufSize_MT;
+
+    p->mtc.numThreadsMax = p->props.numThreads;
+
+    *isMT = True;
+
+    vt.Parse = Lzma2DecMt_MtCallback_Parse;
+    vt.PreCode = Lzma2DecMt_MtCallback_PreCode;
+    vt.Code = Lzma2DecMt_MtCallback_Code;
+    vt.Write = Lzma2DecMt_MtCallback_Write;
+
+    {
+      BoolInt needContinue = False;
+
+      SRes res = MtDec_Code(&p->mtc);
+
+      /*
+      if (!outStream)
+        *outBufSize = p->outBuf - outBuf;
+      */
+
+      *inProcessed = p->mtc.inProcessed;
+
+      needContinue = False;
+
+      if (res == SZ_OK)
+      {
+        if (p->mtc.mtProgress.res != SZ_OK)
+          res = p->mtc.mtProgress.res;
+        else
+          needContinue = p->mtc.needContinue;
+      }
+
+      if (!needContinue)
+      {
+        if (res == SZ_OK)
+          return p->mtc.readRes;
+        return res;
+      }
+
+      tMode = True;
+      p->readRes = p->mtc.readRes;
+      p->readWasFinished = p->mtc.readWasFinished;
+      p->inProcessed = p->mtc.inProcessed;
+      
+      PRF_STR("----- decoding ST -----");
+    }
+  }
+
+  #endif
+
+
+  *isMT = False;
+
+  {
+    SRes res = Lzma2Dec_Decode_ST(p
+        #ifndef _7ZIP_ST
+        , tMode
+        #endif
+        );
+
+    *inProcessed = p->inProcessed;
+
+    // res = SZ_OK; // for test
+    if (res == SZ_OK && p->readRes != SZ_OK)
+      res = p->readRes;
+    
+    /*
+    #ifndef _7ZIP_ST
+    if (res == SZ_OK && tMode && p->mtc.parseRes != SZ_OK)
+      res = p->mtc.parseRes;
+    #endif
+    */
+    
+    return res;
+  }
+}
+
+
+/* ---------- Read from CLzma2DecMtHandle Interface ---------- */
+
+SRes Lzma2DecMt_Init(CLzma2DecMtHandle pp,
+    Byte prop,
+    const CLzma2DecMtProps *props,
+    const UInt64 *outDataSize, int finishMode,
+    ISeqInStream *inStream)
+{
+  CLzma2DecMt *p = (CLzma2DecMt *)pp;
+
+  if (prop > 40)
+    return SZ_ERROR_UNSUPPORTED;
+
+  p->prop = prop;
+  p->props = *props;
+
+  p->inStream = inStream;
+
+  p->outSize = 0;
+  p->outSize_Defined = False;
+  if (outDataSize)
+  {
+    p->outSize_Defined = True;
+    p->outSize = *outDataSize;
+  }
+  p->finishMode = finishMode;
+
+  p->outProcessed = 0;
+  p->inProcessed = 0;
+
+  p->inPos = 0;
+  p->inLim = 0;
+
+  return Lzma2Dec_Prepare_ST(p);
+}
+
+
+SRes Lzma2DecMt_Read(CLzma2DecMtHandle pp,
+    Byte *data, size_t *outSize,
+    UInt64 *inStreamProcessed)
+{
+  CLzma2DecMt *p = (CLzma2DecMt *)pp;
+  ELzmaFinishMode finishMode;
+  SRes readRes;
+  size_t size = *outSize;
+
+  *outSize = 0;
+  *inStreamProcessed = 0;
+
+  finishMode = LZMA_FINISH_ANY;
+  if (p->outSize_Defined)
+  {
+    const UInt64 rem = p->outSize - p->outProcessed;
+    if (size >= rem)
+    {
+      size = (size_t)rem;
+      if (p->finishMode)
+        finishMode = LZMA_FINISH_END;
+    }
+  }
+
+  readRes = SZ_OK;
+
+  for (;;)
+  {
+    SizeT inCur;
+    SizeT outCur;
+    ELzmaStatus status;
+    SRes res;
+
+    if (p->inPos == p->inLim && readRes == SZ_OK)
+    {
+      p->inPos = 0;
+      p->inLim = p->props.inBufSize_ST;
+      readRes = ISeqInStream_Read(p->inStream, p->inBuf, &p->inLim);
+    }
+
+    inCur = p->inLim - p->inPos;
+    outCur = size;
+
+    res = Lzma2Dec_DecodeToBuf(&p->dec, data, &outCur,
+        p->inBuf + p->inPos, &inCur, finishMode, &status);
+    
+    p->inPos += inCur;
+    p->inProcessed += inCur;
+    *inStreamProcessed += inCur;
+    p->outProcessed += outCur;
+    *outSize += outCur;
+    size -= outCur;
+    data += outCur;
+    
+    if (res != 0)
+      return res;
+    
+    /*
+    if (status == LZMA_STATUS_FINISHED_WITH_MARK)
+      return readRes;
+
+    if (size == 0 && status != LZMA_STATUS_NEEDS_MORE_INPUT)
+    {
+      if (p->finishMode && p->outSize_Defined && p->outProcessed >= p->outSize)
+        return SZ_ERROR_DATA;
+      return readRes;
+    }
+    */
+
+    if (inCur == 0 && outCur == 0)
+      return readRes;
+  }
+}
diff --git a/3rdparty/7z/src/Lzma2DecMt.h b/3rdparty/7z/src/Lzma2DecMt.h
new file mode 100644
index 0000000000..96f89a3ca2
--- /dev/null
+++ b/3rdparty/7z/src/Lzma2DecMt.h
@@ -0,0 +1,79 @@
+/* Lzma2DecMt.h -- LZMA2 Decoder Multi-thread
+2018-02-17 : Igor Pavlov : Public domain */
+
+#ifndef __LZMA2_DEC_MT_H
+#define __LZMA2_DEC_MT_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+typedef struct
+{
+  size_t inBufSize_ST;
+  size_t outStep_ST;
+  
+  #ifndef _7ZIP_ST
+  unsigned numThreads;
+  size_t inBufSize_MT;
+  size_t outBlockMax;
+  size_t inBlockMax;
+  #endif
+} CLzma2DecMtProps;
+
+/* init to single-thread mode */
+void Lzma2DecMtProps_Init(CLzma2DecMtProps *p);
+
+
+/* ---------- CLzma2DecMtHandle Interface ---------- */
+
+/* Lzma2DecMt_ * functions can return the following exit codes:
+SRes:
+  SZ_OK           - OK
+  SZ_ERROR_MEM    - Memory allocation error
+  SZ_ERROR_PARAM  - Incorrect paramater in props
+  SZ_ERROR_WRITE  - ISeqOutStream write callback error
+  // SZ_ERROR_OUTPUT_EOF - output buffer overflow - version with (Byte *) output
+  SZ_ERROR_PROGRESS - some break from progress callback
+  SZ_ERROR_THREAD - error in multithreading functions (only for Mt version)
+*/
+
+typedef void * CLzma2DecMtHandle;
+
+CLzma2DecMtHandle Lzma2DecMt_Create(ISzAllocPtr alloc, ISzAllocPtr allocMid);
+void Lzma2DecMt_Destroy(CLzma2DecMtHandle p);
+
+SRes Lzma2DecMt_Decode(CLzma2DecMtHandle p,
+    Byte prop,
+    const CLzma2DecMtProps *props,
+    ISeqOutStream *outStream,
+    const UInt64 *outDataSize, // NULL means undefined
+    int finishMode,            // 0 - partial unpacking is allowed, 1 - if lzma2 stream must be finished
+    // Byte *outBuf, size_t *outBufSize,
+    ISeqInStream *inStream,
+    // const Byte *inData, size_t inDataSize,
+    
+    // out variables:
+    UInt64 *inProcessed,
+    int *isMT,  /* out: (*isMT == 0), if single thread decoding was used */
+
+    // UInt64 *outProcessed,
+    ICompressProgress *progress);
+
+
+/* ---------- Read from CLzma2DecMtHandle Interface ---------- */
+
+SRes Lzma2DecMt_Init(CLzma2DecMtHandle pp,
+    Byte prop,
+    const CLzma2DecMtProps *props,
+    const UInt64 *outDataSize, int finishMode,
+    ISeqInStream *inStream);
+
+SRes Lzma2DecMt_Read(CLzma2DecMtHandle pp,
+    Byte *data, size_t *outSize,
+    UInt64 *inStreamProcessed);
+
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/Lzma2Enc.c b/3rdparty/7z/src/Lzma2Enc.c
new file mode 100644
index 0000000000..d541477527
--- /dev/null
+++ b/3rdparty/7z/src/Lzma2Enc.c
@@ -0,0 +1,803 @@
+/* Lzma2Enc.c -- LZMA2 Encoder
+2018-07-04 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <string.h>
+
+/* #define _7ZIP_ST */
+
+#include "Lzma2Enc.h"
+
+#ifndef _7ZIP_ST
+#include "MtCoder.h"
+#else
+#define MTCODER__THREADS_MAX 1
+#endif
+
+#define LZMA2_CONTROL_LZMA (1 << 7)
+#define LZMA2_CONTROL_COPY_NO_RESET 2
+#define LZMA2_CONTROL_COPY_RESET_DIC 1
+#define LZMA2_CONTROL_EOF 0
+
+#define LZMA2_LCLP_MAX 4
+
+#define LZMA2_DIC_SIZE_FROM_PROP(p) (((UInt32)2 | ((p) & 1)) << ((p) / 2 + 11))
+
+#define LZMA2_PACK_SIZE_MAX (1 << 16)
+#define LZMA2_COPY_CHUNK_SIZE LZMA2_PACK_SIZE_MAX
+#define LZMA2_UNPACK_SIZE_MAX (1 << 21)
+#define LZMA2_KEEP_WINDOW_SIZE LZMA2_UNPACK_SIZE_MAX
+
+#define LZMA2_CHUNK_SIZE_COMPRESSED_MAX ((1 << 16) + 16)
+
+
+#define PRF(x) /* x */
+
+
+/* ---------- CLimitedSeqInStream ---------- */
+
+typedef struct
+{
+  ISeqInStream vt;
+  ISeqInStream *realStream;
+  UInt64 limit;
+  UInt64 processed;
+  int finished;
+} CLimitedSeqInStream;
+
+static void LimitedSeqInStream_Init(CLimitedSeqInStream *p)
+{
+  p->limit = (UInt64)(Int64)-1;
+  p->processed = 0;
+  p->finished = 0;
+}
+
+static SRes LimitedSeqInStream_Read(const ISeqInStream *pp, void *data, size_t *size)
+{
+  CLimitedSeqInStream *p = CONTAINER_FROM_VTBL(pp, CLimitedSeqInStream, vt);
+  size_t size2 = *size;
+  SRes res = SZ_OK;
+  
+  if (p->limit != (UInt64)(Int64)-1)
+  {
+    UInt64 rem = p->limit - p->processed;
+    if (size2 > rem)
+      size2 = (size_t)rem;
+  }
+  if (size2 != 0)
+  {
+    res = ISeqInStream_Read(p->realStream, data, &size2);
+    p->finished = (size2 == 0 ? 1 : 0);
+    p->processed += size2;
+  }
+  *size = size2;
+  return res;
+}
+
+
+/* ---------- CLzma2EncInt ---------- */
+
+typedef struct
+{
+  CLzmaEncHandle enc;
+  Byte propsAreSet;
+  Byte propsByte;
+  Byte needInitState;
+  Byte needInitProp;
+  UInt64 srcPos;
+} CLzma2EncInt;
+
+
+static SRes Lzma2EncInt_InitStream(CLzma2EncInt *p, const CLzma2EncProps *props)
+{
+  if (!p->propsAreSet)
+  {
+    SizeT propsSize = LZMA_PROPS_SIZE;
+    Byte propsEncoded[LZMA_PROPS_SIZE];
+    RINOK(LzmaEnc_SetProps(p->enc, &props->lzmaProps));
+    RINOK(LzmaEnc_WriteProperties(p->enc, propsEncoded, &propsSize));
+    p->propsByte = propsEncoded[0];
+    p->propsAreSet = True;
+  }
+  return SZ_OK;
+}
+
+static void Lzma2EncInt_InitBlock(CLzma2EncInt *p)
+{
+  p->srcPos = 0;
+  p->needInitState = True;
+  p->needInitProp = True;
+}
+
+
+SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp, ISeqInStream *inStream, UInt32 keepWindowSize,
+    ISzAllocPtr alloc, ISzAllocPtr allocBig);
+SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
+    UInt32 keepWindowSize, ISzAllocPtr alloc, ISzAllocPtr allocBig);
+SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, BoolInt reInit,
+    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize);
+const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp);
+void LzmaEnc_Finish(CLzmaEncHandle pp);
+void LzmaEnc_SaveState(CLzmaEncHandle pp);
+void LzmaEnc_RestoreState(CLzmaEncHandle pp);
+
+/*
+UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp);
+*/
+
+static SRes Lzma2EncInt_EncodeSubblock(CLzma2EncInt *p, Byte *outBuf,
+    size_t *packSizeRes, ISeqOutStream *outStream)
+{
+  size_t packSizeLimit = *packSizeRes;
+  size_t packSize = packSizeLimit;
+  UInt32 unpackSize = LZMA2_UNPACK_SIZE_MAX;
+  unsigned lzHeaderSize = 5 + (p->needInitProp ? 1 : 0);
+  BoolInt useCopyBlock;
+  SRes res;
+
+  *packSizeRes = 0;
+  if (packSize < lzHeaderSize)
+    return SZ_ERROR_OUTPUT_EOF;
+  packSize -= lzHeaderSize;
+  
+  LzmaEnc_SaveState(p->enc);
+  res = LzmaEnc_CodeOneMemBlock(p->enc, p->needInitState,
+      outBuf + lzHeaderSize, &packSize, LZMA2_PACK_SIZE_MAX, &unpackSize);
+  
+  PRF(printf("\npackSize = %7d unpackSize = %7d  ", packSize, unpackSize));
+
+  if (unpackSize == 0)
+    return res;
+
+  if (res == SZ_OK)
+    useCopyBlock = (packSize + 2 >= unpackSize || packSize > (1 << 16));
+  else
+  {
+    if (res != SZ_ERROR_OUTPUT_EOF)
+      return res;
+    res = SZ_OK;
+    useCopyBlock = True;
+  }
+
+  if (useCopyBlock)
+  {
+    size_t destPos = 0;
+    PRF(printf("################# COPY           "));
+
+    while (unpackSize > 0)
+    {
+      UInt32 u = (unpackSize < LZMA2_COPY_CHUNK_SIZE) ? unpackSize : LZMA2_COPY_CHUNK_SIZE;
+      if (packSizeLimit - destPos < u + 3)
+        return SZ_ERROR_OUTPUT_EOF;
+      outBuf[destPos++] = (Byte)(p->srcPos == 0 ? LZMA2_CONTROL_COPY_RESET_DIC : LZMA2_CONTROL_COPY_NO_RESET);
+      outBuf[destPos++] = (Byte)((u - 1) >> 8);
+      outBuf[destPos++] = (Byte)(u - 1);
+      memcpy(outBuf + destPos, LzmaEnc_GetCurBuf(p->enc) - unpackSize, u);
+      unpackSize -= u;
+      destPos += u;
+      p->srcPos += u;
+      
+      if (outStream)
+      {
+        *packSizeRes += destPos;
+        if (ISeqOutStream_Write(outStream, outBuf, destPos) != destPos)
+          return SZ_ERROR_WRITE;
+        destPos = 0;
+      }
+      else
+        *packSizeRes = destPos;
+      /* needInitState = True; */
+    }
+    
+    LzmaEnc_RestoreState(p->enc);
+    return SZ_OK;
+  }
+
+  {
+    size_t destPos = 0;
+    UInt32 u = unpackSize - 1;
+    UInt32 pm = (UInt32)(packSize - 1);
+    unsigned mode = (p->srcPos == 0) ? 3 : (p->needInitState ? (p->needInitProp ? 2 : 1) : 0);
+
+    PRF(printf("               "));
+
+    outBuf[destPos++] = (Byte)(LZMA2_CONTROL_LZMA | (mode << 5) | ((u >> 16) & 0x1F));
+    outBuf[destPos++] = (Byte)(u >> 8);
+    outBuf[destPos++] = (Byte)u;
+    outBuf[destPos++] = (Byte)(pm >> 8);
+    outBuf[destPos++] = (Byte)pm;
+    
+    if (p->needInitProp)
+      outBuf[destPos++] = p->propsByte;
+    
+    p->needInitProp = False;
+    p->needInitState = False;
+    destPos += packSize;
+    p->srcPos += unpackSize;
+
+    if (outStream)
+      if (ISeqOutStream_Write(outStream, outBuf, destPos) != destPos)
+        return SZ_ERROR_WRITE;
+    
+    *packSizeRes = destPos;
+    return SZ_OK;
+  }
+}
+
+
+/* ---------- Lzma2 Props ---------- */
+
+void Lzma2EncProps_Init(CLzma2EncProps *p)
+{
+  LzmaEncProps_Init(&p->lzmaProps);
+  p->blockSize = LZMA2_ENC_PROPS__BLOCK_SIZE__AUTO;
+  p->numBlockThreads_Reduced = -1;
+  p->numBlockThreads_Max = -1;
+  p->numTotalThreads = -1;
+}
+
+void Lzma2EncProps_Normalize(CLzma2EncProps *p)
+{
+  UInt64 fileSize;
+  int t1, t1n, t2, t2r, t3;
+  {
+    CLzmaEncProps lzmaProps = p->lzmaProps;
+    LzmaEncProps_Normalize(&lzmaProps);
+    t1n = lzmaProps.numThreads;
+  }
+
+  t1 = p->lzmaProps.numThreads;
+  t2 = p->numBlockThreads_Max;
+  t3 = p->numTotalThreads;
+
+  if (t2 > MTCODER__THREADS_MAX)
+    t2 = MTCODER__THREADS_MAX;
+
+  if (t3 <= 0)
+  {
+    if (t2 <= 0)
+      t2 = 1;
+    t3 = t1n * t2;
+  }
+  else if (t2 <= 0)
+  {
+    t2 = t3 / t1n;
+    if (t2 == 0)
+    {
+      t1 = 1;
+      t2 = t3;
+    }
+    if (t2 > MTCODER__THREADS_MAX)
+      t2 = MTCODER__THREADS_MAX;
+  }
+  else if (t1 <= 0)
+  {
+    t1 = t3 / t2;
+    if (t1 == 0)
+      t1 = 1;
+  }
+  else
+    t3 = t1n * t2;
+
+  p->lzmaProps.numThreads = t1;
+
+  t2r = t2;
+
+  fileSize = p->lzmaProps.reduceSize;
+
+  if (   p->blockSize != LZMA2_ENC_PROPS__BLOCK_SIZE__SOLID
+      && p->blockSize != LZMA2_ENC_PROPS__BLOCK_SIZE__AUTO
+      && (p->blockSize < fileSize || fileSize == (UInt64)(Int64)-1))
+    p->lzmaProps.reduceSize = p->blockSize;
+
+  LzmaEncProps_Normalize(&p->lzmaProps);
+
+  p->lzmaProps.reduceSize = fileSize;
+
+  t1 = p->lzmaProps.numThreads;
+
+  if (p->blockSize == LZMA2_ENC_PROPS__BLOCK_SIZE__SOLID)
+  {
+    t2r = t2 = 1;
+    t3 = t1;
+  }
+  else if (p->blockSize == LZMA2_ENC_PROPS__BLOCK_SIZE__AUTO && t2 <= 1)
+  {
+    /* if there is no block multi-threading, we use SOLID block */
+    p->blockSize = LZMA2_ENC_PROPS__BLOCK_SIZE__SOLID;
+  }
+  else
+  {
+    if (p->blockSize == LZMA2_ENC_PROPS__BLOCK_SIZE__AUTO)
+    {
+      const UInt32 kMinSize = (UInt32)1 << 20;
+      const UInt32 kMaxSize = (UInt32)1 << 28;
+      const UInt32 dictSize = p->lzmaProps.dictSize;
+      UInt64 blockSize = (UInt64)dictSize << 2;
+      if (blockSize < kMinSize) blockSize = kMinSize;
+      if (blockSize > kMaxSize) blockSize = kMaxSize;
+      if (blockSize < dictSize) blockSize = dictSize;
+      blockSize += (kMinSize - 1);
+      blockSize &= ~(UInt64)(kMinSize - 1);
+      p->blockSize = blockSize;
+    }
+    
+    if (t2 > 1 && fileSize != (UInt64)(Int64)-1)
+    {
+      UInt64 numBlocks = fileSize / p->blockSize;
+      if (numBlocks * p->blockSize != fileSize)
+        numBlocks++;
+      if (numBlocks < (unsigned)t2)
+      {
+        t2r = (unsigned)numBlocks;
+        if (t2r == 0)
+          t2r = 1;
+        t3 = t1 * t2r;
+      }
+    }
+  }
+  
+  p->numBlockThreads_Max = t2;
+  p->numBlockThreads_Reduced = t2r;
+  p->numTotalThreads = t3;
+}
+
+
+static SRes Progress(ICompressProgress *p, UInt64 inSize, UInt64 outSize)
+{
+  return (p && ICompressProgress_Progress(p, inSize, outSize) != SZ_OK) ? SZ_ERROR_PROGRESS : SZ_OK;
+}
+
+
+/* ---------- Lzma2 ---------- */
+
+typedef struct
+{
+  Byte propEncoded;
+  CLzma2EncProps props;
+  UInt64 expectedDataSize;
+  
+  Byte *tempBufLzma;
+
+  ISzAllocPtr alloc;
+  ISzAllocPtr allocBig;
+
+  CLzma2EncInt coders[MTCODER__THREADS_MAX];
+
+  #ifndef _7ZIP_ST
+  
+  ISeqOutStream *outStream;
+  Byte *outBuf;
+  size_t outBuf_Rem;   /* remainder in outBuf */
+
+  size_t outBufSize;   /* size of allocated outBufs[i] */
+  size_t outBufsDataSizes[MTCODER__BLOCKS_MAX];
+  BoolInt mtCoder_WasConstructed;
+  CMtCoder mtCoder;
+  Byte *outBufs[MTCODER__BLOCKS_MAX];
+
+  #endif
+
+} CLzma2Enc;
+
+
+
+CLzma2EncHandle Lzma2Enc_Create(ISzAllocPtr alloc, ISzAllocPtr allocBig)
+{
+  CLzma2Enc *p = (CLzma2Enc *)ISzAlloc_Alloc(alloc, sizeof(CLzma2Enc));
+  if (!p)
+    return NULL;
+  Lzma2EncProps_Init(&p->props);
+  Lzma2EncProps_Normalize(&p->props);
+  p->expectedDataSize = (UInt64)(Int64)-1;
+  p->tempBufLzma = NULL;
+  p->alloc = alloc;
+  p->allocBig = allocBig;
+  {
+    unsigned i;
+    for (i = 0; i < MTCODER__THREADS_MAX; i++)
+      p->coders[i].enc = NULL;
+  }
+  
+  #ifndef _7ZIP_ST
+  p->mtCoder_WasConstructed = False;
+  {
+    unsigned i;
+    for (i = 0; i < MTCODER__BLOCKS_MAX; i++)
+      p->outBufs[i] = NULL;
+    p->outBufSize = 0;
+  }
+  #endif
+
+  return p;
+}
+
+
+#ifndef _7ZIP_ST
+
+static void Lzma2Enc_FreeOutBufs(CLzma2Enc *p)
+{
+  unsigned i;
+  for (i = 0; i < MTCODER__BLOCKS_MAX; i++)
+    if (p->outBufs[i])
+    {
+      ISzAlloc_Free(p->alloc, p->outBufs[i]);
+      p->outBufs[i] = NULL;
+    }
+  p->outBufSize = 0;
+}
+
+#endif
+
+
+void Lzma2Enc_Destroy(CLzma2EncHandle pp)
+{
+  CLzma2Enc *p = (CLzma2Enc *)pp;
+  unsigned i;
+  for (i = 0; i < MTCODER__THREADS_MAX; i++)
+  {
+    CLzma2EncInt *t = &p->coders[i];
+    if (t->enc)
+    {
+      LzmaEnc_Destroy(t->enc, p->alloc, p->allocBig);
+      t->enc = NULL;
+    }
+  }
+
+
+  #ifndef _7ZIP_ST
+  if (p->mtCoder_WasConstructed)
+  {
+    MtCoder_Destruct(&p->mtCoder);
+    p->mtCoder_WasConstructed = False;
+  }
+  Lzma2Enc_FreeOutBufs(p);
+  #endif
+
+  ISzAlloc_Free(p->alloc, p->tempBufLzma);
+  p->tempBufLzma = NULL;
+
+  ISzAlloc_Free(p->alloc, pp);
+}
+
+
+SRes Lzma2Enc_SetProps(CLzma2EncHandle pp, const CLzma2EncProps *props)
+{
+  CLzma2Enc *p = (CLzma2Enc *)pp;
+  CLzmaEncProps lzmaProps = props->lzmaProps;
+  LzmaEncProps_Normalize(&lzmaProps);
+  if (lzmaProps.lc + lzmaProps.lp > LZMA2_LCLP_MAX)
+    return SZ_ERROR_PARAM;
+  p->props = *props;
+  Lzma2EncProps_Normalize(&p->props);
+  return SZ_OK;
+}
+
+
+void Lzma2Enc_SetDataSize(CLzmaEncHandle pp, UInt64 expectedDataSiize)
+{
+  CLzma2Enc *p = (CLzma2Enc *)pp;
+  p->expectedDataSize = expectedDataSiize;
+}
+
+
+Byte Lzma2Enc_WriteProperties(CLzma2EncHandle pp)
+{
+  CLzma2Enc *p = (CLzma2Enc *)pp;
+  unsigned i;
+  UInt32 dicSize = LzmaEncProps_GetDictSize(&p->props.lzmaProps);
+  for (i = 0; i < 40; i++)
+    if (dicSize <= LZMA2_DIC_SIZE_FROM_PROP(i))
+      break;
+  return (Byte)i;
+}
+
+
+static SRes Lzma2Enc_EncodeMt1(
+    CLzma2Enc *me,
+    CLzma2EncInt *p,
+    ISeqOutStream *outStream,
+    Byte *outBuf, size_t *outBufSize,
+    ISeqInStream *inStream,
+    const Byte *inData, size_t inDataSize,
+    int finished,
+    ICompressProgress *progress)
+{
+  UInt64 unpackTotal = 0;
+  UInt64 packTotal = 0;
+  size_t outLim = 0;
+  CLimitedSeqInStream limitedInStream;
+
+  if (outBuf)
+  {
+    outLim = *outBufSize;
+    *outBufSize = 0;
+  }
+
+  if (!p->enc)
+  {
+    p->propsAreSet = False;
+    p->enc = LzmaEnc_Create(me->alloc);
+    if (!p->enc)
+      return SZ_ERROR_MEM;
+  }
+
+  limitedInStream.realStream = inStream;
+  if (inStream)
+  {
+    limitedInStream.vt.Read = LimitedSeqInStream_Read;
+  }
+  
+  if (!outBuf)
+  {
+    // outStream version works only in one thread. So we use CLzma2Enc::tempBufLzma
+    if (!me->tempBufLzma)
+    {
+      me->tempBufLzma = (Byte *)ISzAlloc_Alloc(me->alloc, LZMA2_CHUNK_SIZE_COMPRESSED_MAX);
+      if (!me->tempBufLzma)
+        return SZ_ERROR_MEM;
+    }
+  }
+
+  RINOK(Lzma2EncInt_InitStream(p, &me->props));
+
+  for (;;)
+  {
+    SRes res = SZ_OK;
+    size_t inSizeCur = 0;
+
+    Lzma2EncInt_InitBlock(p);
+    
+    LimitedSeqInStream_Init(&limitedInStream);
+    limitedInStream.limit = me->props.blockSize;
+
+    if (inStream)
+    {
+      UInt64 expected = (UInt64)(Int64)-1;
+      // inStream version works only in one thread. So we use CLzma2Enc::expectedDataSize
+      if (me->expectedDataSize != (UInt64)(Int64)-1
+          && me->expectedDataSize >= unpackTotal)
+        expected = me->expectedDataSize - unpackTotal;
+      if (me->props.blockSize != LZMA2_ENC_PROPS__BLOCK_SIZE__SOLID
+          && expected > me->props.blockSize)
+        expected = (size_t)me->props.blockSize;
+
+      LzmaEnc_SetDataSize(p->enc, expected);
+
+      RINOK(LzmaEnc_PrepareForLzma2(p->enc,
+          &limitedInStream.vt,
+          LZMA2_KEEP_WINDOW_SIZE,
+          me->alloc,
+          me->allocBig));
+    }
+    else
+    {
+      inSizeCur = inDataSize - (size_t)unpackTotal;
+      if (me->props.blockSize != LZMA2_ENC_PROPS__BLOCK_SIZE__SOLID
+          && inSizeCur > me->props.blockSize)
+        inSizeCur = (size_t)me->props.blockSize;
+    
+      // LzmaEnc_SetDataSize(p->enc, inSizeCur);
+      
+      RINOK(LzmaEnc_MemPrepare(p->enc,
+          inData + (size_t)unpackTotal, inSizeCur,
+          LZMA2_KEEP_WINDOW_SIZE,
+          me->alloc,
+          me->allocBig));
+    }
+
+    for (;;)
+    {
+      size_t packSize = LZMA2_CHUNK_SIZE_COMPRESSED_MAX;
+      if (outBuf)
+        packSize = outLim - (size_t)packTotal;
+      
+      res = Lzma2EncInt_EncodeSubblock(p,
+          outBuf ? outBuf + (size_t)packTotal : me->tempBufLzma, &packSize,
+          outBuf ? NULL : outStream);
+      
+      if (res != SZ_OK)
+        break;
+
+      packTotal += packSize;
+      if (outBuf)
+        *outBufSize = (size_t)packTotal;
+      
+      res = Progress(progress, unpackTotal + p->srcPos, packTotal);
+      if (res != SZ_OK)
+        break;
+
+      /*
+      if (LzmaEnc_GetNumAvailableBytes(p->enc) == 0)
+        break;
+      */
+
+      if (packSize == 0)
+        break;
+    }
+    
+    LzmaEnc_Finish(p->enc);
+    
+    unpackTotal += p->srcPos;
+    
+    RINOK(res);
+
+    if (p->srcPos != (inStream ? limitedInStream.processed : inSizeCur))
+      return SZ_ERROR_FAIL;
+    
+    if (inStream ? limitedInStream.finished : (unpackTotal == inDataSize))
+    {
+      if (finished)
+      {
+        if (outBuf)
+        {
+          size_t destPos = *outBufSize;
+          if (destPos >= outLim)
+            return SZ_ERROR_OUTPUT_EOF;
+          outBuf[destPos] = 0;
+          *outBufSize = destPos + 1;
+        }
+        else
+        {
+          Byte b = 0;
+          if (ISeqOutStream_Write(outStream, &b, 1) != 1)
+            return SZ_ERROR_WRITE;
+        }
+      }
+      return SZ_OK;
+    }
+  }
+}
+
+
+
+#ifndef _7ZIP_ST
+
+static SRes Lzma2Enc_MtCallback_Code(void *pp, unsigned coderIndex, unsigned outBufIndex,
+    const Byte *src, size_t srcSize, int finished)
+{
+  CLzma2Enc *me = (CLzma2Enc *)pp;
+  size_t destSize = me->outBufSize;
+  SRes res;
+  CMtProgressThunk progressThunk;
+
+  Byte *dest = me->outBufs[outBufIndex];
+
+  me->outBufsDataSizes[outBufIndex] = 0;
+
+  if (!dest)
+  {
+    dest = (Byte *)ISzAlloc_Alloc(me->alloc, me->outBufSize);
+    if (!dest)
+      return SZ_ERROR_MEM;
+    me->outBufs[outBufIndex] = dest;
+  }
+
+  MtProgressThunk_CreateVTable(&progressThunk);
+  progressThunk.mtProgress = &me->mtCoder.mtProgress;
+  progressThunk.inSize = 0;
+  progressThunk.outSize = 0;
+
+  res = Lzma2Enc_EncodeMt1(me,
+      &me->coders[coderIndex],
+      NULL, dest, &destSize,
+      NULL, src, srcSize,
+      finished,
+      &progressThunk.vt);
+
+  me->outBufsDataSizes[outBufIndex] = destSize;
+
+  return res;
+}
+
+
+static SRes Lzma2Enc_MtCallback_Write(void *pp, unsigned outBufIndex)
+{
+  CLzma2Enc *me = (CLzma2Enc *)pp;
+  size_t size = me->outBufsDataSizes[outBufIndex];
+  const Byte *data = me->outBufs[outBufIndex];
+  
+  if (me->outStream)
+    return ISeqOutStream_Write(me->outStream, data, size) == size ? SZ_OK : SZ_ERROR_WRITE;
+  
+  if (size > me->outBuf_Rem)
+    return SZ_ERROR_OUTPUT_EOF;
+  memcpy(me->outBuf, data, size);
+  me->outBuf_Rem -= size;
+  me->outBuf += size;
+  return SZ_OK;
+}
+
+#endif
+
+
+
+SRes Lzma2Enc_Encode2(CLzma2EncHandle pp,
+    ISeqOutStream *outStream,
+    Byte *outBuf, size_t *outBufSize,
+    ISeqInStream *inStream,
+    const Byte *inData, size_t inDataSize,
+    ICompressProgress *progress)
+{
+  CLzma2Enc *p = (CLzma2Enc *)pp;
+
+  if (inStream && inData)
+    return SZ_ERROR_PARAM;
+
+  if (outStream && outBuf)
+    return SZ_ERROR_PARAM;
+
+  {
+    unsigned i;
+    for (i = 0; i < MTCODER__THREADS_MAX; i++)
+      p->coders[i].propsAreSet = False;
+  }
+
+  #ifndef _7ZIP_ST
+  
+  if (p->props.numBlockThreads_Reduced > 1)
+  {
+    IMtCoderCallback2 vt;
+
+    if (!p->mtCoder_WasConstructed)
+    {
+      p->mtCoder_WasConstructed = True;
+      MtCoder_Construct(&p->mtCoder);
+    }
+
+    vt.Code = Lzma2Enc_MtCallback_Code;
+    vt.Write = Lzma2Enc_MtCallback_Write;
+
+    p->outStream = outStream;
+    p->outBuf = NULL;
+    p->outBuf_Rem = 0;
+    if (!outStream)
+    {
+      p->outBuf = outBuf;
+      p->outBuf_Rem = *outBufSize;
+      *outBufSize = 0;
+    }
+
+    p->mtCoder.allocBig = p->allocBig;
+    p->mtCoder.progress = progress;
+    p->mtCoder.inStream = inStream;
+    p->mtCoder.inData = inData;
+    p->mtCoder.inDataSize = inDataSize;
+    p->mtCoder.mtCallback = &vt;
+    p->mtCoder.mtCallbackObject = p;
+
+    p->mtCoder.blockSize = (size_t)p->props.blockSize;
+    if (p->mtCoder.blockSize != p->props.blockSize)
+      return SZ_ERROR_PARAM; /* SZ_ERROR_MEM */
+
+    {
+      size_t destBlockSize = p->mtCoder.blockSize + (p->mtCoder.blockSize >> 10) + 16;
+      if (destBlockSize < p->mtCoder.blockSize)
+        return SZ_ERROR_PARAM;
+      if (p->outBufSize != destBlockSize)
+        Lzma2Enc_FreeOutBufs(p);
+      p->outBufSize = destBlockSize;
+    }
+
+    p->mtCoder.numThreadsMax = p->props.numBlockThreads_Max;
+    p->mtCoder.expectedDataSize = p->expectedDataSize;
+    
+    {
+      SRes res = MtCoder_Code(&p->mtCoder);
+      if (!outStream)
+        *outBufSize = p->outBuf - outBuf;
+      return res;
+    }
+  }
+
+  #endif
+
+
+  return Lzma2Enc_EncodeMt1(p,
+      &p->coders[0],
+      outStream, outBuf, outBufSize,
+      inStream, inData, inDataSize,
+      True, /* finished */
+      progress);
+}
diff --git a/3rdparty/7z/src/Lzma2Enc.h b/3rdparty/7z/src/Lzma2Enc.h
new file mode 100644
index 0000000000..65f2dd145d
--- /dev/null
+++ b/3rdparty/7z/src/Lzma2Enc.h
@@ -0,0 +1,55 @@
+/* Lzma2Enc.h -- LZMA2 Encoder
+2017-07-27 : Igor Pavlov : Public domain */
+
+#ifndef __LZMA2_ENC_H
+#define __LZMA2_ENC_H
+
+#include "LzmaEnc.h"
+
+EXTERN_C_BEGIN
+
+#define LZMA2_ENC_PROPS__BLOCK_SIZE__AUTO 0
+#define LZMA2_ENC_PROPS__BLOCK_SIZE__SOLID ((UInt64)(Int64)-1)
+
+typedef struct
+{
+  CLzmaEncProps lzmaProps;
+  UInt64 blockSize;
+  int numBlockThreads_Reduced;
+  int numBlockThreads_Max;
+  int numTotalThreads;
+} CLzma2EncProps;
+
+void Lzma2EncProps_Init(CLzma2EncProps *p);
+void Lzma2EncProps_Normalize(CLzma2EncProps *p);
+
+/* ---------- CLzmaEnc2Handle Interface ---------- */
+
+/* Lzma2Enc_* functions can return the following exit codes:
+SRes:
+  SZ_OK           - OK
+  SZ_ERROR_MEM    - Memory allocation error
+  SZ_ERROR_PARAM  - Incorrect paramater in props
+  SZ_ERROR_WRITE  - ISeqOutStream write callback error
+  SZ_ERROR_OUTPUT_EOF - output buffer overflow - version with (Byte *) output
+  SZ_ERROR_PROGRESS - some break from progress callback
+  SZ_ERROR_THREAD - error in multithreading functions (only for Mt version)
+*/
+
+typedef void * CLzma2EncHandle;
+
+CLzma2EncHandle Lzma2Enc_Create(ISzAllocPtr alloc, ISzAllocPtr allocBig);
+void Lzma2Enc_Destroy(CLzma2EncHandle p);
+SRes Lzma2Enc_SetProps(CLzma2EncHandle p, const CLzma2EncProps *props);
+void Lzma2Enc_SetDataSize(CLzma2EncHandle p, UInt64 expectedDataSiize);
+Byte Lzma2Enc_WriteProperties(CLzma2EncHandle p);
+SRes Lzma2Enc_Encode2(CLzma2EncHandle p,
+    ISeqOutStream *outStream,
+    Byte *outBuf, size_t *outBufSize,
+    ISeqInStream *inStream,
+    const Byte *inData, size_t inDataSize,
+    ICompressProgress *progress);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/Lzma86.h b/3rdparty/7z/src/Lzma86.h
new file mode 100644
index 0000000000..83057e5983
--- /dev/null
+++ b/3rdparty/7z/src/Lzma86.h
@@ -0,0 +1,111 @@
+/* Lzma86.h -- LZMA + x86 (BCJ) Filter
+2013-01-18 : Igor Pavlov : Public domain */
+
+#ifndef __LZMA86_H
+#define __LZMA86_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+#define LZMA86_SIZE_OFFSET (1 + 5)
+#define LZMA86_HEADER_SIZE (LZMA86_SIZE_OFFSET + 8)
+
+/*
+It's an example for LZMA + x86 Filter use.
+You can use .lzma86 extension, if you write that stream to file.
+.lzma86 header adds one additional byte to standard .lzma header.
+.lzma86 header (14 bytes):
+  Offset Size  Description
+    0     1    = 0 - no filter, pure LZMA
+               = 1 - x86 filter + LZMA
+    1     1    lc, lp and pb in encoded form
+    2     4    dictSize (little endian)
+    6     8    uncompressed size (little endian)
+
+
+Lzma86_Encode
+-------------
+level - compression level: 0 <= level <= 9, the default value for "level" is 5.
+
+dictSize - The dictionary size in bytes. The maximum value is
+        128 MB = (1 << 27) bytes for 32-bit version
+          1 GB = (1 << 30) bytes for 64-bit version
+     The default value is 16 MB = (1 << 24) bytes, for level = 5.
+     It's recommended to use the dictionary that is larger than 4 KB and
+     that can be calculated as (1 << N) or (3 << N) sizes.
+     For better compression ratio dictSize must be >= inSize.
+
+filterMode:
+    SZ_FILTER_NO   - no Filter
+    SZ_FILTER_YES  - x86 Filter
+    SZ_FILTER_AUTO - it tries both alternatives to select best.
+              Encoder will use 2 or 3 passes:
+              2 passes when FILTER_NO provides better compression.
+              3 passes when FILTER_YES provides better compression.
+
+Lzma86Encode allocates Data with MyAlloc functions.
+RAM Requirements for compressing:
+  RamSize = dictionarySize * 11.5 + 6MB + FilterBlockSize
+      filterMode     FilterBlockSize
+     SZ_FILTER_NO         0
+     SZ_FILTER_YES      inSize
+     SZ_FILTER_AUTO     inSize
+
+
+Return code:
+  SZ_OK               - OK
+  SZ_ERROR_MEM        - Memory allocation error
+  SZ_ERROR_PARAM      - Incorrect paramater
+  SZ_ERROR_OUTPUT_EOF - output buffer overflow
+  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
+*/
+
+enum ESzFilterMode
+{
+  SZ_FILTER_NO,
+  SZ_FILTER_YES,
+  SZ_FILTER_AUTO
+};
+
+SRes Lzma86_Encode(Byte *dest, size_t *destLen, const Byte *src, size_t srcLen,
+    int level, UInt32 dictSize, int filterMode);
+
+
+/*
+Lzma86_GetUnpackSize:
+  In:
+    src      - input data
+    srcLen   - input data size
+  Out:
+    unpackSize - size of uncompressed stream
+  Return code:
+    SZ_OK               - OK
+    SZ_ERROR_INPUT_EOF  - Error in headers
+*/
+
+SRes Lzma86_GetUnpackSize(const Byte *src, SizeT srcLen, UInt64 *unpackSize);
+
+/*
+Lzma86_Decode:
+  In:
+    dest     - output data
+    destLen  - output data size
+    src      - input data
+    srcLen   - input data size
+  Out:
+    destLen  - processed output size
+    srcLen   - processed input size
+  Return code:
+    SZ_OK           - OK
+    SZ_ERROR_DATA  - Data error
+    SZ_ERROR_MEM   - Memory allocation error
+    SZ_ERROR_UNSUPPORTED - unsupported file
+    SZ_ERROR_INPUT_EOF - it needs more bytes in input buffer
+*/
+
+SRes Lzma86_Decode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/Lzma86Dec.c b/3rdparty/7z/src/Lzma86Dec.c
new file mode 100644
index 0000000000..20ac5e7a97
--- /dev/null
+++ b/3rdparty/7z/src/Lzma86Dec.c
@@ -0,0 +1,54 @@
+/* Lzma86Dec.c -- LZMA + x86 (BCJ) Filter Decoder
+2016-05-16 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "Lzma86.h"
+
+#include "Alloc.h"
+#include "Bra.h"
+#include "LzmaDec.h"
+
+SRes Lzma86_GetUnpackSize(const Byte *src, SizeT srcLen, UInt64 *unpackSize)
+{
+  unsigned i;
+  if (srcLen < LZMA86_HEADER_SIZE)
+    return SZ_ERROR_INPUT_EOF;
+  *unpackSize = 0;
+  for (i = 0; i < sizeof(UInt64); i++)
+    *unpackSize += ((UInt64)src[LZMA86_SIZE_OFFSET + i]) << (8 * i);
+  return SZ_OK;
+}
+
+SRes Lzma86_Decode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen)
+{
+  SRes res;
+  int useFilter;
+  SizeT inSizePure;
+  ELzmaStatus status;
+
+  if (*srcLen < LZMA86_HEADER_SIZE)
+    return SZ_ERROR_INPUT_EOF;
+
+  useFilter = src[0];
+
+  if (useFilter > 1)
+  {
+    *destLen = 0;
+    return SZ_ERROR_UNSUPPORTED;
+  }
+
+  inSizePure = *srcLen - LZMA86_HEADER_SIZE;
+  res = LzmaDecode(dest, destLen, src + LZMA86_HEADER_SIZE, &inSizePure,
+      src + 1, LZMA_PROPS_SIZE, LZMA_FINISH_ANY, &status, &g_Alloc);
+  *srcLen = inSizePure + LZMA86_HEADER_SIZE;
+  if (res != SZ_OK)
+    return res;
+  if (useFilter == 1)
+  {
+    UInt32 x86State;
+    x86_Convert_Init(x86State);
+    x86_Convert(dest, *destLen, 0, &x86State, 0);
+  }
+  return SZ_OK;
+}
diff --git a/3rdparty/7z/src/Lzma86Enc.c b/3rdparty/7z/src/Lzma86Enc.c
new file mode 100644
index 0000000000..8d35e6dc5e
--- /dev/null
+++ b/3rdparty/7z/src/Lzma86Enc.c
@@ -0,0 +1,106 @@
+/* Lzma86Enc.c -- LZMA + x86 (BCJ) Filter Encoder
+2018-07-04 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <string.h>
+
+#include "Lzma86.h"
+
+#include "Alloc.h"
+#include "Bra.h"
+#include "LzmaEnc.h"
+
+#define SZE_OUT_OVERFLOW SZE_DATA_ERROR
+
+int Lzma86_Encode(Byte *dest, size_t *destLen, const Byte *src, size_t srcLen,
+    int level, UInt32 dictSize, int filterMode)
+{
+  size_t outSize2 = *destLen;
+  Byte *filteredStream;
+  BoolInt useFilter;
+  int mainResult = SZ_ERROR_OUTPUT_EOF;
+  CLzmaEncProps props;
+  LzmaEncProps_Init(&props);
+  props.level = level;
+  props.dictSize = dictSize;
+  
+  *destLen = 0;
+  if (outSize2 < LZMA86_HEADER_SIZE)
+    return SZ_ERROR_OUTPUT_EOF;
+
+  {
+    int i;
+    UInt64 t = srcLen;
+    for (i = 0; i < 8; i++, t >>= 8)
+      dest[LZMA86_SIZE_OFFSET + i] = (Byte)t;
+  }
+
+  filteredStream = 0;
+  useFilter = (filterMode != SZ_FILTER_NO);
+  if (useFilter)
+  {
+    if (srcLen != 0)
+    {
+      filteredStream = (Byte *)MyAlloc(srcLen);
+      if (filteredStream == 0)
+        return SZ_ERROR_MEM;
+      memcpy(filteredStream, src, srcLen);
+    }
+    {
+      UInt32 x86State;
+      x86_Convert_Init(x86State);
+      x86_Convert(filteredStream, srcLen, 0, &x86State, 1);
+    }
+  }
+
+  {
+    size_t minSize = 0;
+    BoolInt bestIsFiltered = False;
+
+    /* passes for SZ_FILTER_AUTO:
+        0 - BCJ + LZMA
+        1 - LZMA
+        2 - BCJ + LZMA agaian, if pass 0 (BCJ + LZMA) is better.
+    */
+    int numPasses = (filterMode == SZ_FILTER_AUTO) ? 3 : 1;
+
+    int i;
+    for (i = 0; i < numPasses; i++)
+    {
+      size_t outSizeProcessed = outSize2 - LZMA86_HEADER_SIZE;
+      size_t outPropsSize = 5;
+      SRes curRes;
+      BoolInt curModeIsFiltered = (numPasses > 1 && i == numPasses - 1);
+      if (curModeIsFiltered && !bestIsFiltered)
+        break;
+      if (useFilter && i == 0)
+        curModeIsFiltered = True;
+      
+      curRes = LzmaEncode(dest + LZMA86_HEADER_SIZE, &outSizeProcessed,
+          curModeIsFiltered ? filteredStream : src, srcLen,
+          &props, dest + 1, &outPropsSize, 0,
+          NULL, &g_Alloc, &g_Alloc);
+      
+      if (curRes != SZ_ERROR_OUTPUT_EOF)
+      {
+        if (curRes != SZ_OK)
+        {
+          mainResult = curRes;
+          break;
+        }
+        if (outSizeProcessed <= minSize || mainResult != SZ_OK)
+        {
+          minSize = outSizeProcessed;
+          bestIsFiltered = curModeIsFiltered;
+          mainResult = SZ_OK;
+        }
+      }
+    }
+    dest[0] = (Byte)(bestIsFiltered ? 1 : 0);
+    *destLen = LZMA86_HEADER_SIZE + minSize;
+  }
+  if (useFilter)
+    MyFree(filteredStream);
+  return mainResult;
+}
diff --git a/3rdparty/7z/src/LzmaDec.c b/3rdparty/7z/src/LzmaDec.c
new file mode 100644
index 0000000000..4d1576419f
--- /dev/null
+++ b/3rdparty/7z/src/LzmaDec.c
@@ -0,0 +1,1185 @@
+/* LzmaDec.c -- LZMA Decoder
+2018-07-04 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <string.h>
+
+/* #include "CpuArch.h" */
+#include "LzmaDec.h"
+
+#define kNumTopBits 24
+#define kTopValue ((UInt32)1 << kNumTopBits)
+
+#define kNumBitModelTotalBits 11
+#define kBitModelTotal (1 << kNumBitModelTotalBits)
+#define kNumMoveBits 5
+
+#define RC_INIT_SIZE 5
+
+#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
+
+#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * (UInt32)ttt; if (code < bound)
+#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
+#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
+#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
+  { UPDATE_0(p); i = (i + i); A0; } else \
+  { UPDATE_1(p); i = (i + i) + 1; A1; }
+
+#define TREE_GET_BIT(probs, i) { GET_BIT2(probs + i, i, ;, ;); }
+
+#define REV_BIT(p, i, A0, A1) IF_BIT_0(p + i) \
+  { UPDATE_0(p + i); A0; } else \
+  { UPDATE_1(p + i); A1; }
+#define REV_BIT_VAR(  p, i, m) REV_BIT(p, i, i += m; m += m, m += m; i += m; )
+#define REV_BIT_CONST(p, i, m) REV_BIT(p, i, i += m;       , i += m * 2; )
+#define REV_BIT_LAST( p, i, m) REV_BIT(p, i, i -= m        , ; )
+
+#define TREE_DECODE(probs, limit, i) \
+  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
+
+/* #define _LZMA_SIZE_OPT */
+
+#ifdef _LZMA_SIZE_OPT
+#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
+#else
+#define TREE_6_DECODE(probs, i) \
+  { i = 1; \
+  TREE_GET_BIT(probs, i); \
+  TREE_GET_BIT(probs, i); \
+  TREE_GET_BIT(probs, i); \
+  TREE_GET_BIT(probs, i); \
+  TREE_GET_BIT(probs, i); \
+  TREE_GET_BIT(probs, i); \
+  i -= 0x40; }
+#endif
+
+#define NORMAL_LITER_DEC TREE_GET_BIT(prob, symbol)
+#define MATCHED_LITER_DEC \
+  matchByte += matchByte; \
+  bit = offs; \
+  offs &= matchByte; \
+  probLit = prob + (offs + bit + symbol); \
+  GET_BIT2(probLit, symbol, offs ^= bit; , ;)
+
+
+
+#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
+
+#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * (UInt32)ttt; if (code < bound)
+#define UPDATE_0_CHECK range = bound;
+#define UPDATE_1_CHECK range -= bound; code -= bound;
+#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
+  { UPDATE_0_CHECK; i = (i + i); A0; } else \
+  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
+#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
+#define TREE_DECODE_CHECK(probs, limit, i) \
+  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
+
+
+#define REV_BIT_CHECK(p, i, m) IF_BIT_0_CHECK(p + i) \
+  { UPDATE_0_CHECK; i += m; m += m; } else \
+  { UPDATE_1_CHECK; m += m; i += m; }
+
+
+#define kNumPosBitsMax 4
+#define kNumPosStatesMax (1 << kNumPosBitsMax)
+
+#define kLenNumLowBits 3
+#define kLenNumLowSymbols (1 << kLenNumLowBits)
+#define kLenNumHighBits 8
+#define kLenNumHighSymbols (1 << kLenNumHighBits)
+
+#define LenLow 0
+#define LenHigh (LenLow + 2 * (kNumPosStatesMax << kLenNumLowBits))
+#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
+
+#define LenChoice LenLow
+#define LenChoice2 (LenLow + (1 << kLenNumLowBits))
+
+#define kNumStates 12
+#define kNumStates2 16
+#define kNumLitStates 7
+
+#define kStartPosModelIndex 4
+#define kEndPosModelIndex 14
+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
+
+#define kNumPosSlotBits 6
+#define kNumLenToPosStates 4
+
+#define kNumAlignBits 4
+#define kAlignTableSize (1 << kNumAlignBits)
+
+#define kMatchMinLen 2
+#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols * 2 + kLenNumHighSymbols)
+
+/* External ASM code needs same CLzmaProb array layout. So don't change it. */
+
+/* (probs_1664) is faster and better for code size at some platforms */
+/*
+#ifdef MY_CPU_X86_OR_AMD64
+*/
+#define kStartOffset 1664
+#define GET_PROBS p->probs_1664
+/*
+#define GET_PROBS p->probs + kStartOffset
+#else
+#define kStartOffset 0
+#define GET_PROBS p->probs
+#endif
+*/
+
+#define SpecPos (-kStartOffset)
+#define IsRep0Long (SpecPos + kNumFullDistances)
+#define RepLenCoder (IsRep0Long + (kNumStates2 << kNumPosBitsMax))
+#define LenCoder (RepLenCoder + kNumLenProbs)
+#define IsMatch (LenCoder + kNumLenProbs)
+#define Align (IsMatch + (kNumStates2 << kNumPosBitsMax))
+#define IsRep (Align + kAlignTableSize)
+#define IsRepG0 (IsRep + kNumStates)
+#define IsRepG1 (IsRepG0 + kNumStates)
+#define IsRepG2 (IsRepG1 + kNumStates)
+#define PosSlot (IsRepG2 + kNumStates)
+#define Literal (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
+#define NUM_BASE_PROBS (Literal + kStartOffset)
+
+#if Align != 0 && kStartOffset != 0
+  #error Stop_Compiling_Bad_LZMA_kAlign
+#endif
+
+#if NUM_BASE_PROBS != 1984
+  #error Stop_Compiling_Bad_LZMA_PROBS
+#endif
+
+
+#define LZMA_LIT_SIZE 0x300
+
+#define LzmaProps_GetNumProbs(p) (NUM_BASE_PROBS + ((UInt32)LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
+
+
+#define CALC_POS_STATE(processedPos, pbMask) (((processedPos) & (pbMask)) << 4)
+#define COMBINED_PS_STATE (posState + state)
+#define GET_LEN_STATE (posState)
+
+#define LZMA_DIC_MIN (1 << 12)
+
+/*
+p->remainLen : shows status of LZMA decoder:
+    < kMatchSpecLenStart : normal remain
+    = kMatchSpecLenStart : finished
+    = kMatchSpecLenStart + 1 : need init range coder
+    = kMatchSpecLenStart + 2 : need init range coder and state
+*/
+
+/* ---------- LZMA_DECODE_REAL ---------- */
+/*
+LzmaDec_DecodeReal_3() can be implemented in external ASM file.
+3 - is the code compatibility version of that function for check at link time.
+*/
+
+#define LZMA_DECODE_REAL LzmaDec_DecodeReal_3
+
+/*
+LZMA_DECODE_REAL()
+In:
+  RangeCoder is normalized
+  if (p->dicPos == limit)
+  {
+    LzmaDec_TryDummy() was called before to exclude LITERAL and MATCH-REP cases.
+    So first symbol can be only MATCH-NON-REP. And if that MATCH-NON-REP symbol
+    is not END_OF_PAYALOAD_MARKER, then function returns error code.
+  }
+
+Processing:
+  first LZMA symbol will be decoded in any case
+  All checks for limits are at the end of main loop,
+  It will decode new LZMA-symbols while (p->buf < bufLimit && dicPos < limit),
+  RangeCoder is still without last normalization when (p->buf < bufLimit) is being checked.
+
+Out:
+  RangeCoder is normalized
+  Result:
+    SZ_OK - OK
+    SZ_ERROR_DATA - Error
+  p->remainLen:
+    < kMatchSpecLenStart : normal remain
+    = kMatchSpecLenStart : finished
+*/
+
+
+#ifdef _LZMA_DEC_OPT
+
+int MY_FAST_CALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit);
+
+#else
+
+static
+int MY_FAST_CALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
+{
+  CLzmaProb *probs = GET_PROBS;
+  unsigned state = (unsigned)p->state;
+  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
+  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
+  unsigned lc = p->prop.lc;
+  unsigned lpMask = ((unsigned)0x100 << p->prop.lp) - ((unsigned)0x100 >> lc);
+
+  Byte *dic = p->dic;
+  SizeT dicBufSize = p->dicBufSize;
+  SizeT dicPos = p->dicPos;
+  
+  UInt32 processedPos = p->processedPos;
+  UInt32 checkDicSize = p->checkDicSize;
+  unsigned len = 0;
+
+  const Byte *buf = p->buf;
+  UInt32 range = p->range;
+  UInt32 code = p->code;
+
+  do
+  {
+    CLzmaProb *prob;
+    UInt32 bound;
+    unsigned ttt;
+    unsigned posState = CALC_POS_STATE(processedPos, pbMask);
+
+    prob = probs + IsMatch + COMBINED_PS_STATE;
+    IF_BIT_0(prob)
+    {
+      unsigned symbol;
+      UPDATE_0(prob);
+      prob = probs + Literal;
+      if (processedPos != 0 || checkDicSize != 0)
+        prob += (UInt32)3 * ((((processedPos << 8) + dic[(dicPos == 0 ? dicBufSize : dicPos) - 1]) & lpMask) << lc);
+      processedPos++;
+
+      if (state < kNumLitStates)
+      {
+        state -= (state < 4) ? state : 3;
+        symbol = 1;
+        #ifdef _LZMA_SIZE_OPT
+        do { NORMAL_LITER_DEC } while (symbol < 0x100);
+        #else
+        NORMAL_LITER_DEC
+        NORMAL_LITER_DEC
+        NORMAL_LITER_DEC
+        NORMAL_LITER_DEC
+        NORMAL_LITER_DEC
+        NORMAL_LITER_DEC
+        NORMAL_LITER_DEC
+        NORMAL_LITER_DEC
+        #endif
+      }
+      else
+      {
+        unsigned matchByte = dic[dicPos - rep0 + (dicPos < rep0 ? dicBufSize : 0)];
+        unsigned offs = 0x100;
+        state -= (state < 10) ? 3 : 6;
+        symbol = 1;
+        #ifdef _LZMA_SIZE_OPT
+        do
+        {
+          unsigned bit;
+          CLzmaProb *probLit;
+          MATCHED_LITER_DEC
+        }
+        while (symbol < 0x100);
+        #else
+        {
+          unsigned bit;
+          CLzmaProb *probLit;
+          MATCHED_LITER_DEC
+          MATCHED_LITER_DEC
+          MATCHED_LITER_DEC
+          MATCHED_LITER_DEC
+          MATCHED_LITER_DEC
+          MATCHED_LITER_DEC
+          MATCHED_LITER_DEC
+          MATCHED_LITER_DEC
+        }
+        #endif
+      }
+
+      dic[dicPos++] = (Byte)symbol;
+      continue;
+    }
+    
+    {
+      UPDATE_1(prob);
+      prob = probs + IsRep + state;
+      IF_BIT_0(prob)
+      {
+        UPDATE_0(prob);
+        state += kNumStates;
+        prob = probs + LenCoder;
+      }
+      else
+      {
+        UPDATE_1(prob);
+        /*
+        // that case was checked before with kBadRepCode
+        if (checkDicSize == 0 && processedPos == 0)
+          return SZ_ERROR_DATA;
+        */
+        prob = probs + IsRepG0 + state;
+        IF_BIT_0(prob)
+        {
+          UPDATE_0(prob);
+          prob = probs + IsRep0Long + COMBINED_PS_STATE;
+          IF_BIT_0(prob)
+          {
+            UPDATE_0(prob);
+            dic[dicPos] = dic[dicPos - rep0 + (dicPos < rep0 ? dicBufSize : 0)];
+            dicPos++;
+            processedPos++;
+            state = state < kNumLitStates ? 9 : 11;
+            continue;
+          }
+          UPDATE_1(prob);
+        }
+        else
+        {
+          UInt32 distance;
+          UPDATE_1(prob);
+          prob = probs + IsRepG1 + state;
+          IF_BIT_0(prob)
+          {
+            UPDATE_0(prob);
+            distance = rep1;
+          }
+          else
+          {
+            UPDATE_1(prob);
+            prob = probs + IsRepG2 + state;
+            IF_BIT_0(prob)
+            {
+              UPDATE_0(prob);
+              distance = rep2;
+            }
+            else
+            {
+              UPDATE_1(prob);
+              distance = rep3;
+              rep3 = rep2;
+            }
+            rep2 = rep1;
+          }
+          rep1 = rep0;
+          rep0 = distance;
+        }
+        state = state < kNumLitStates ? 8 : 11;
+        prob = probs + RepLenCoder;
+      }
+      
+      #ifdef _LZMA_SIZE_OPT
+      {
+        unsigned lim, offset;
+        CLzmaProb *probLen = prob + LenChoice;
+        IF_BIT_0(probLen)
+        {
+          UPDATE_0(probLen);
+          probLen = prob + LenLow + GET_LEN_STATE;
+          offset = 0;
+          lim = (1 << kLenNumLowBits);
+        }
+        else
+        {
+          UPDATE_1(probLen);
+          probLen = prob + LenChoice2;
+          IF_BIT_0(probLen)
+          {
+            UPDATE_0(probLen);
+            probLen = prob + LenLow + GET_LEN_STATE + (1 << kLenNumLowBits);
+            offset = kLenNumLowSymbols;
+            lim = (1 << kLenNumLowBits);
+          }
+          else
+          {
+            UPDATE_1(probLen);
+            probLen = prob + LenHigh;
+            offset = kLenNumLowSymbols * 2;
+            lim = (1 << kLenNumHighBits);
+          }
+        }
+        TREE_DECODE(probLen, lim, len);
+        len += offset;
+      }
+      #else
+      {
+        CLzmaProb *probLen = prob + LenChoice;
+        IF_BIT_0(probLen)
+        {
+          UPDATE_0(probLen);
+          probLen = prob + LenLow + GET_LEN_STATE;
+          len = 1;
+          TREE_GET_BIT(probLen, len);
+          TREE_GET_BIT(probLen, len);
+          TREE_GET_BIT(probLen, len);
+          len -= 8;
+        }
+        else
+        {
+          UPDATE_1(probLen);
+          probLen = prob + LenChoice2;
+          IF_BIT_0(probLen)
+          {
+            UPDATE_0(probLen);
+            probLen = prob + LenLow + GET_LEN_STATE + (1 << kLenNumLowBits);
+            len = 1;
+            TREE_GET_BIT(probLen, len);
+            TREE_GET_BIT(probLen, len);
+            TREE_GET_BIT(probLen, len);
+          }
+          else
+          {
+            UPDATE_1(probLen);
+            probLen = prob + LenHigh;
+            TREE_DECODE(probLen, (1 << kLenNumHighBits), len);
+            len += kLenNumLowSymbols * 2;
+          }
+        }
+      }
+      #endif
+
+      if (state >= kNumStates)
+      {
+        UInt32 distance;
+        prob = probs + PosSlot +
+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
+        TREE_6_DECODE(prob, distance);
+        if (distance >= kStartPosModelIndex)
+        {
+          unsigned posSlot = (unsigned)distance;
+          unsigned numDirectBits = (unsigned)(((distance >> 1) - 1));
+          distance = (2 | (distance & 1));
+          if (posSlot < kEndPosModelIndex)
+          {
+            distance <<= numDirectBits;
+            prob = probs + SpecPos;
+            {
+              UInt32 m = 1;
+              distance++;
+              do
+              {
+                REV_BIT_VAR(prob, distance, m);
+              }
+              while (--numDirectBits);
+              distance -= m;
+            }
+          }
+          else
+          {
+            numDirectBits -= kNumAlignBits;
+            do
+            {
+              NORMALIZE
+              range >>= 1;
+              
+              {
+                UInt32 t;
+                code -= range;
+                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
+                distance = (distance << 1) + (t + 1);
+                code += range & t;
+              }
+              /*
+              distance <<= 1;
+              if (code >= range)
+              {
+                code -= range;
+                distance |= 1;
+              }
+              */
+            }
+            while (--numDirectBits);
+            prob = probs + Align;
+            distance <<= kNumAlignBits;
+            {
+              unsigned i = 1;
+              REV_BIT_CONST(prob, i, 1);
+              REV_BIT_CONST(prob, i, 2);
+              REV_BIT_CONST(prob, i, 4);
+              REV_BIT_LAST (prob, i, 8);
+              distance |= i;
+            }
+            if (distance == (UInt32)0xFFFFFFFF)
+            {
+              len = kMatchSpecLenStart;
+              state -= kNumStates;
+              break;
+            }
+          }
+        }
+        
+        rep3 = rep2;
+        rep2 = rep1;
+        rep1 = rep0;
+        rep0 = distance + 1;
+        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
+        if (distance >= (checkDicSize == 0 ? processedPos: checkDicSize))
+        {
+          p->dicPos = dicPos;
+          return SZ_ERROR_DATA;
+        }
+      }
+
+      len += kMatchMinLen;
+
+      {
+        SizeT rem;
+        unsigned curLen;
+        SizeT pos;
+        
+        if ((rem = limit - dicPos) == 0)
+        {
+          p->dicPos = dicPos;
+          return SZ_ERROR_DATA;
+        }
+        
+        curLen = ((rem < len) ? (unsigned)rem : len);
+        pos = dicPos - rep0 + (dicPos < rep0 ? dicBufSize : 0);
+
+        processedPos += (UInt32)curLen;
+
+        len -= curLen;
+        if (curLen <= dicBufSize - pos)
+        {
+          Byte *dest = dic + dicPos;
+          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
+          const Byte *lim = dest + curLen;
+          dicPos += (SizeT)curLen;
+          do
+            *(dest) = (Byte)*(dest + src);
+          while (++dest != lim);
+        }
+        else
+        {
+          do
+          {
+            dic[dicPos++] = dic[pos];
+            if (++pos == dicBufSize)
+              pos = 0;
+          }
+          while (--curLen != 0);
+        }
+      }
+    }
+  }
+  while (dicPos < limit && buf < bufLimit);
+
+  NORMALIZE;
+  
+  p->buf = buf;
+  p->range = range;
+  p->code = code;
+  p->remainLen = (UInt32)len;
+  p->dicPos = dicPos;
+  p->processedPos = processedPos;
+  p->reps[0] = rep0;
+  p->reps[1] = rep1;
+  p->reps[2] = rep2;
+  p->reps[3] = rep3;
+  p->state = (UInt32)state;
+
+  return SZ_OK;
+}
+#endif
+
+static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
+{
+  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
+  {
+    Byte *dic = p->dic;
+    SizeT dicPos = p->dicPos;
+    SizeT dicBufSize = p->dicBufSize;
+    unsigned len = (unsigned)p->remainLen;
+    SizeT rep0 = p->reps[0]; /* we use SizeT to avoid the BUG of VC14 for AMD64 */
+    SizeT rem = limit - dicPos;
+    if (rem < len)
+      len = (unsigned)(rem);
+
+    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
+      p->checkDicSize = p->prop.dicSize;
+
+    p->processedPos += (UInt32)len;
+    p->remainLen -= (UInt32)len;
+    while (len != 0)
+    {
+      len--;
+      dic[dicPos] = dic[dicPos - rep0 + (dicPos < rep0 ? dicBufSize : 0)];
+      dicPos++;
+    }
+    p->dicPos = dicPos;
+  }
+}
+
+
+#define kRange0 0xFFFFFFFF
+#define kBound0 ((kRange0 >> kNumBitModelTotalBits) << (kNumBitModelTotalBits - 1))
+#define kBadRepCode (kBound0 + (((kRange0 - kBound0) >> kNumBitModelTotalBits) << (kNumBitModelTotalBits - 1)))
+#if kBadRepCode != (0xC0000000 - 0x400)
+  #error Stop_Compiling_Bad_LZMA_Check
+#endif
+
+static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
+{
+  do
+  {
+    SizeT limit2 = limit;
+    if (p->checkDicSize == 0)
+    {
+      UInt32 rem = p->prop.dicSize - p->processedPos;
+      if (limit - p->dicPos > rem)
+        limit2 = p->dicPos + rem;
+
+      if (p->processedPos == 0)
+        if (p->code >= kBadRepCode)
+          return SZ_ERROR_DATA;
+    }
+
+    RINOK(LZMA_DECODE_REAL(p, limit2, bufLimit));
+    
+    if (p->checkDicSize == 0 && p->processedPos >= p->prop.dicSize)
+      p->checkDicSize = p->prop.dicSize;
+    
+    LzmaDec_WriteRem(p, limit);
+  }
+  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
+
+  return 0;
+}
+
+typedef enum
+{
+  DUMMY_ERROR, /* unexpected end of input stream */
+  DUMMY_LIT,
+  DUMMY_MATCH,
+  DUMMY_REP
+} ELzmaDummy;
+
+static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
+{
+  UInt32 range = p->range;
+  UInt32 code = p->code;
+  const Byte *bufLimit = buf + inSize;
+  const CLzmaProb *probs = GET_PROBS;
+  unsigned state = (unsigned)p->state;
+  ELzmaDummy res;
+
+  {
+    const CLzmaProb *prob;
+    UInt32 bound;
+    unsigned ttt;
+    unsigned posState = CALC_POS_STATE(p->processedPos, (1 << p->prop.pb) - 1);
+
+    prob = probs + IsMatch + COMBINED_PS_STATE;
+    IF_BIT_0_CHECK(prob)
+    {
+      UPDATE_0_CHECK
+
+      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
+
+      prob = probs + Literal;
+      if (p->checkDicSize != 0 || p->processedPos != 0)
+        prob += ((UInt32)LZMA_LIT_SIZE *
+            ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
+            (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
+
+      if (state < kNumLitStates)
+      {
+        unsigned symbol = 1;
+        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
+      }
+      else
+      {
+        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
+            (p->dicPos < p->reps[0] ? p->dicBufSize : 0)];
+        unsigned offs = 0x100;
+        unsigned symbol = 1;
+        do
+        {
+          unsigned bit;
+          const CLzmaProb *probLit;
+          matchByte += matchByte;
+          bit = offs;
+          offs &= matchByte;
+          probLit = prob + (offs + bit + symbol);
+          GET_BIT2_CHECK(probLit, symbol, offs ^= bit; , ; )
+        }
+        while (symbol < 0x100);
+      }
+      res = DUMMY_LIT;
+    }
+    else
+    {
+      unsigned len;
+      UPDATE_1_CHECK;
+
+      prob = probs + IsRep + state;
+      IF_BIT_0_CHECK(prob)
+      {
+        UPDATE_0_CHECK;
+        state = 0;
+        prob = probs + LenCoder;
+        res = DUMMY_MATCH;
+      }
+      else
+      {
+        UPDATE_1_CHECK;
+        res = DUMMY_REP;
+        prob = probs + IsRepG0 + state;
+        IF_BIT_0_CHECK(prob)
+        {
+          UPDATE_0_CHECK;
+          prob = probs + IsRep0Long + COMBINED_PS_STATE;
+          IF_BIT_0_CHECK(prob)
+          {
+            UPDATE_0_CHECK;
+            NORMALIZE_CHECK;
+            return DUMMY_REP;
+          }
+          else
+          {
+            UPDATE_1_CHECK;
+          }
+        }
+        else
+        {
+          UPDATE_1_CHECK;
+          prob = probs + IsRepG1 + state;
+          IF_BIT_0_CHECK(prob)
+          {
+            UPDATE_0_CHECK;
+          }
+          else
+          {
+            UPDATE_1_CHECK;
+            prob = probs + IsRepG2 + state;
+            IF_BIT_0_CHECK(prob)
+            {
+              UPDATE_0_CHECK;
+            }
+            else
+            {
+              UPDATE_1_CHECK;
+            }
+          }
+        }
+        state = kNumStates;
+        prob = probs + RepLenCoder;
+      }
+      {
+        unsigned limit, offset;
+        const CLzmaProb *probLen = prob + LenChoice;
+        IF_BIT_0_CHECK(probLen)
+        {
+          UPDATE_0_CHECK;
+          probLen = prob + LenLow + GET_LEN_STATE;
+          offset = 0;
+          limit = 1 << kLenNumLowBits;
+        }
+        else
+        {
+          UPDATE_1_CHECK;
+          probLen = prob + LenChoice2;
+          IF_BIT_0_CHECK(probLen)
+          {
+            UPDATE_0_CHECK;
+            probLen = prob + LenLow + GET_LEN_STATE + (1 << kLenNumLowBits);
+            offset = kLenNumLowSymbols;
+            limit = 1 << kLenNumLowBits;
+          }
+          else
+          {
+            UPDATE_1_CHECK;
+            probLen = prob + LenHigh;
+            offset = kLenNumLowSymbols * 2;
+            limit = 1 << kLenNumHighBits;
+          }
+        }
+        TREE_DECODE_CHECK(probLen, limit, len);
+        len += offset;
+      }
+
+      if (state < 4)
+      {
+        unsigned posSlot;
+        prob = probs + PosSlot +
+            ((len < kNumLenToPosStates - 1 ? len : kNumLenToPosStates - 1) <<
+            kNumPosSlotBits);
+        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
+        if (posSlot >= kStartPosModelIndex)
+        {
+          unsigned numDirectBits = ((posSlot >> 1) - 1);
+
+          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
+
+          if (posSlot < kEndPosModelIndex)
+          {
+            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits);
+          }
+          else
+          {
+            numDirectBits -= kNumAlignBits;
+            do
+            {
+              NORMALIZE_CHECK
+              range >>= 1;
+              code -= range & (((code - range) >> 31) - 1);
+              /* if (code >= range) code -= range; */
+            }
+            while (--numDirectBits);
+            prob = probs + Align;
+            numDirectBits = kNumAlignBits;
+          }
+          {
+            unsigned i = 1;
+            unsigned m = 1;
+            do
+            {
+              REV_BIT_CHECK(prob, i, m);
+            }
+            while (--numDirectBits);
+          }
+        }
+      }
+    }
+  }
+  NORMALIZE_CHECK;
+  return res;
+}
+
+
+void LzmaDec_InitDicAndState(CLzmaDec *p, BoolInt initDic, BoolInt initState)
+{
+  p->remainLen = kMatchSpecLenStart + 1;
+  p->tempBufSize = 0;
+
+  if (initDic)
+  {
+    p->processedPos = 0;
+    p->checkDicSize = 0;
+    p->remainLen = kMatchSpecLenStart + 2;
+  }
+  if (initState)
+    p->remainLen = kMatchSpecLenStart + 2;
+}
+
+void LzmaDec_Init(CLzmaDec *p)
+{
+  p->dicPos = 0;
+  LzmaDec_InitDicAndState(p, True, True);
+}
+
+
+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
+    ELzmaFinishMode finishMode, ELzmaStatus *status)
+{
+  SizeT inSize = *srcLen;
+  (*srcLen) = 0;
+  
+  *status = LZMA_STATUS_NOT_SPECIFIED;
+
+  if (p->remainLen > kMatchSpecLenStart)
+  {
+    for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
+      p->tempBuf[p->tempBufSize++] = *src++;
+    if (p->tempBufSize != 0 && p->tempBuf[0] != 0)
+      return SZ_ERROR_DATA;
+    if (p->tempBufSize < RC_INIT_SIZE)
+    {
+      *status = LZMA_STATUS_NEEDS_MORE_INPUT;
+      return SZ_OK;
+    }
+    p->code =
+        ((UInt32)p->tempBuf[1] << 24)
+      | ((UInt32)p->tempBuf[2] << 16)
+      | ((UInt32)p->tempBuf[3] << 8)
+      | ((UInt32)p->tempBuf[4]);
+    p->range = 0xFFFFFFFF;
+    p->tempBufSize = 0;
+
+    if (p->remainLen > kMatchSpecLenStart + 1)
+    {
+      SizeT numProbs = LzmaProps_GetNumProbs(&p->prop);
+      SizeT i;
+      CLzmaProb *probs = p->probs;
+      for (i = 0; i < numProbs; i++)
+        probs[i] = kBitModelTotal >> 1;
+      p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
+      p->state = 0;
+    }
+
+    p->remainLen = 0;
+  }
+
+  LzmaDec_WriteRem(p, dicLimit);
+
+  while (p->remainLen != kMatchSpecLenStart)
+  {
+      int checkEndMarkNow = 0;
+
+      if (p->dicPos >= dicLimit)
+      {
+        if (p->remainLen == 0 && p->code == 0)
+        {
+          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
+          return SZ_OK;
+        }
+        if (finishMode == LZMA_FINISH_ANY)
+        {
+          *status = LZMA_STATUS_NOT_FINISHED;
+          return SZ_OK;
+        }
+        if (p->remainLen != 0)
+        {
+          *status = LZMA_STATUS_NOT_FINISHED;
+          return SZ_ERROR_DATA;
+        }
+        checkEndMarkNow = 1;
+      }
+
+      if (p->tempBufSize == 0)
+      {
+        SizeT processed;
+        const Byte *bufLimit;
+        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
+        {
+          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
+          if (dummyRes == DUMMY_ERROR)
+          {
+            memcpy(p->tempBuf, src, inSize);
+            p->tempBufSize = (unsigned)inSize;
+            (*srcLen) += inSize;
+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
+            return SZ_OK;
+          }
+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
+          {
+            *status = LZMA_STATUS_NOT_FINISHED;
+            return SZ_ERROR_DATA;
+          }
+          bufLimit = src;
+        }
+        else
+          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
+        p->buf = src;
+        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
+          return SZ_ERROR_DATA;
+        processed = (SizeT)(p->buf - src);
+        (*srcLen) += processed;
+        src += processed;
+        inSize -= processed;
+      }
+      else
+      {
+        unsigned rem = p->tempBufSize, lookAhead = 0;
+        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
+          p->tempBuf[rem++] = src[lookAhead++];
+        p->tempBufSize = rem;
+        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
+        {
+          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, (SizeT)rem);
+          if (dummyRes == DUMMY_ERROR)
+          {
+            (*srcLen) += (SizeT)lookAhead;
+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
+            return SZ_OK;
+          }
+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
+          {
+            *status = LZMA_STATUS_NOT_FINISHED;
+            return SZ_ERROR_DATA;
+          }
+        }
+        p->buf = p->tempBuf;
+        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
+          return SZ_ERROR_DATA;
+        
+        {
+          unsigned kkk = (unsigned)(p->buf - p->tempBuf);
+          if (rem < kkk)
+            return SZ_ERROR_FAIL; /* some internal error */
+          rem -= kkk;
+          if (lookAhead < rem)
+            return SZ_ERROR_FAIL; /* some internal error */
+          lookAhead -= rem;
+        }
+        (*srcLen) += (SizeT)lookAhead;
+        src += lookAhead;
+        inSize -= (SizeT)lookAhead;
+        p->tempBufSize = 0;
+      }
+  }
+  
+  if (p->code != 0)
+    return SZ_ERROR_DATA;
+  *status = LZMA_STATUS_FINISHED_WITH_MARK;
+  return SZ_OK;
+}
+
+
+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
+{
+  SizeT outSize = *destLen;
+  SizeT inSize = *srcLen;
+  *srcLen = *destLen = 0;
+  for (;;)
+  {
+    SizeT inSizeCur = inSize, outSizeCur, dicPos;
+    ELzmaFinishMode curFinishMode;
+    SRes res;
+    if (p->dicPos == p->dicBufSize)
+      p->dicPos = 0;
+    dicPos = p->dicPos;
+    if (outSize > p->dicBufSize - dicPos)
+    {
+      outSizeCur = p->dicBufSize;
+      curFinishMode = LZMA_FINISH_ANY;
+    }
+    else
+    {
+      outSizeCur = dicPos + outSize;
+      curFinishMode = finishMode;
+    }
+
+    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
+    src += inSizeCur;
+    inSize -= inSizeCur;
+    *srcLen += inSizeCur;
+    outSizeCur = p->dicPos - dicPos;
+    memcpy(dest, p->dic + dicPos, outSizeCur);
+    dest += outSizeCur;
+    outSize -= outSizeCur;
+    *destLen += outSizeCur;
+    if (res != 0)
+      return res;
+    if (outSizeCur == 0 || outSize == 0)
+      return SZ_OK;
+  }
+}
+
+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->probs);
+  p->probs = NULL;
+}
+
+static void LzmaDec_FreeDict(CLzmaDec *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->dic);
+  p->dic = NULL;
+}
+
+void LzmaDec_Free(CLzmaDec *p, ISzAllocPtr alloc)
+{
+  LzmaDec_FreeProbs(p, alloc);
+  LzmaDec_FreeDict(p, alloc);
+}
+
+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
+{
+  UInt32 dicSize;
+  Byte d;
+  
+  if (size < LZMA_PROPS_SIZE)
+    return SZ_ERROR_UNSUPPORTED;
+  else
+    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
+ 
+  if (dicSize < LZMA_DIC_MIN)
+    dicSize = LZMA_DIC_MIN;
+  p->dicSize = dicSize;
+
+  d = data[0];
+  if (d >= (9 * 5 * 5))
+    return SZ_ERROR_UNSUPPORTED;
+
+  p->lc = (Byte)(d % 9);
+  d /= 9;
+  p->pb = (Byte)(d / 5);
+  p->lp = (Byte)(d % 5);
+
+  return SZ_OK;
+}
+
+static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAllocPtr alloc)
+{
+  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
+  if (!p->probs || numProbs != p->numProbs)
+  {
+    LzmaDec_FreeProbs(p, alloc);
+    p->probs = (CLzmaProb *)ISzAlloc_Alloc(alloc, numProbs * sizeof(CLzmaProb));
+    if (!p->probs)
+      return SZ_ERROR_MEM;
+    p->probs_1664 = p->probs + 1664;
+    p->numProbs = numProbs;
+  }
+  return SZ_OK;
+}
+
+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAllocPtr alloc)
+{
+  CLzmaProps propNew;
+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+  p->prop = propNew;
+  return SZ_OK;
+}
+
+SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAllocPtr alloc)
+{
+  CLzmaProps propNew;
+  SizeT dicBufSize;
+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+
+  {
+    UInt32 dictSize = propNew.dicSize;
+    SizeT mask = ((UInt32)1 << 12) - 1;
+         if (dictSize >= ((UInt32)1 << 30)) mask = ((UInt32)1 << 22) - 1;
+    else if (dictSize >= ((UInt32)1 << 22)) mask = ((UInt32)1 << 20) - 1;;
+    dicBufSize = ((SizeT)dictSize + mask) & ~mask;
+    if (dicBufSize < dictSize)
+      dicBufSize = dictSize;
+  }
+
+  if (!p->dic || dicBufSize != p->dicBufSize)
+  {
+    LzmaDec_FreeDict(p, alloc);
+    p->dic = (Byte *)ISzAlloc_Alloc(alloc, dicBufSize);
+    if (!p->dic)
+    {
+      LzmaDec_FreeProbs(p, alloc);
+      return SZ_ERROR_MEM;
+    }
+  }
+  p->dicBufSize = dicBufSize;
+  p->prop = propNew;
+  return SZ_OK;
+}
+
+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
+    ELzmaStatus *status, ISzAllocPtr alloc)
+{
+  CLzmaDec p;
+  SRes res;
+  SizeT outSize = *destLen, inSize = *srcLen;
+  *destLen = *srcLen = 0;
+  *status = LZMA_STATUS_NOT_SPECIFIED;
+  if (inSize < RC_INIT_SIZE)
+    return SZ_ERROR_INPUT_EOF;
+  LzmaDec_Construct(&p);
+  RINOK(LzmaDec_AllocateProbs(&p, propData, propSize, alloc));
+  p.dic = dest;
+  p.dicBufSize = outSize;
+  LzmaDec_Init(&p);
+  *srcLen = inSize;
+  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
+  *destLen = p.dicPos;
+  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
+    res = SZ_ERROR_INPUT_EOF;
+  LzmaDec_FreeProbs(&p, alloc);
+  return res;
+}
diff --git a/3rdparty/7z/src/LzmaDec.h b/3rdparty/7z/src/LzmaDec.h
new file mode 100644
index 0000000000..28ce60c3ea
--- /dev/null
+++ b/3rdparty/7z/src/LzmaDec.h
@@ -0,0 +1,234 @@
+/* LzmaDec.h -- LZMA Decoder
+2018-04-21 : Igor Pavlov : Public domain */
+
+#ifndef __LZMA_DEC_H
+#define __LZMA_DEC_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+/* #define _LZMA_PROB32 */
+/* _LZMA_PROB32 can increase the speed on some CPUs,
+   but memory usage for CLzmaDec::probs will be doubled in that case */
+
+typedef
+#ifdef _LZMA_PROB32
+  UInt32
+#else
+  UInt16
+#endif
+  CLzmaProb;
+
+
+/* ---------- LZMA Properties ---------- */
+
+#define LZMA_PROPS_SIZE 5
+
+typedef struct _CLzmaProps
+{
+  Byte lc;
+  Byte lp;
+  Byte pb;
+  Byte _pad_;
+  UInt32 dicSize;
+} CLzmaProps;
+
+/* LzmaProps_Decode - decodes properties
+Returns:
+  SZ_OK
+  SZ_ERROR_UNSUPPORTED - Unsupported properties
+*/
+
+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
+
+
+/* ---------- LZMA Decoder state ---------- */
+
+/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
+   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
+
+#define LZMA_REQUIRED_INPUT_MAX 20
+
+typedef struct
+{
+  /* Don't change this structure. ASM code can use it. */
+  CLzmaProps prop;
+  CLzmaProb *probs;
+  CLzmaProb *probs_1664;
+  Byte *dic;
+  SizeT dicBufSize;
+  SizeT dicPos;
+  const Byte *buf;
+  UInt32 range;
+  UInt32 code;
+  UInt32 processedPos;
+  UInt32 checkDicSize;
+  UInt32 reps[4];
+  UInt32 state;
+  UInt32 remainLen;
+
+  UInt32 numProbs;
+  unsigned tempBufSize;
+  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
+} CLzmaDec;
+
+#define LzmaDec_Construct(p) { (p)->dic = NULL; (p)->probs = NULL; }
+
+void LzmaDec_Init(CLzmaDec *p);
+
+/* There are two types of LZMA streams:
+     - Stream with end mark. That end mark adds about 6 bytes to compressed size.
+     - Stream without end mark. You must know exact uncompressed size to decompress such stream. */
+
+typedef enum
+{
+  LZMA_FINISH_ANY,   /* finish at any point */
+  LZMA_FINISH_END    /* block must be finished at the end */
+} ELzmaFinishMode;
+
+/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
+
+   You must use LZMA_FINISH_END, when you know that current output buffer
+   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
+
+   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
+   and output value of destLen will be less than output buffer size limit.
+   You can check status result also.
+
+   You can use multiple checks to test data integrity after full decompression:
+     1) Check Result and "status" variable.
+     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
+     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
+        You must use correct finish mode in that case. */
+
+typedef enum
+{
+  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
+  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
+  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
+  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
+  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
+} ELzmaStatus;
+
+/* ELzmaStatus is used only as output value for function call */
+
+
+/* ---------- Interfaces ---------- */
+
+/* There are 3 levels of interfaces:
+     1) Dictionary Interface
+     2) Buffer Interface
+     3) One Call Interface
+   You can select any of these interfaces, but don't mix functions from different
+   groups for same object. */
+
+
+/* There are two variants to allocate state for Dictionary Interface:
+     1) LzmaDec_Allocate / LzmaDec_Free
+     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
+   You can use variant 2, if you set dictionary buffer manually.
+   For Buffer Interface you must always use variant 1.
+
+LzmaDec_Allocate* can return:
+  SZ_OK
+  SZ_ERROR_MEM         - Memory allocation error
+  SZ_ERROR_UNSUPPORTED - Unsupported properties
+*/
+   
+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAllocPtr alloc);
+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAllocPtr alloc);
+
+SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAllocPtr alloc);
+void LzmaDec_Free(CLzmaDec *p, ISzAllocPtr alloc);
+
+/* ---------- Dictionary Interface ---------- */
+
+/* You can use it, if you want to eliminate the overhead for data copying from
+   dictionary to some other external buffer.
+   You must work with CLzmaDec variables directly in this interface.
+
+   STEPS:
+     LzmaDec_Construct()
+     LzmaDec_Allocate()
+     for (each new stream)
+     {
+       LzmaDec_Init()
+       while (it needs more decompression)
+       {
+         LzmaDec_DecodeToDic()
+         use data from CLzmaDec::dic and update CLzmaDec::dicPos
+       }
+     }
+     LzmaDec_Free()
+*/
+
+/* LzmaDec_DecodeToDic
+   
+   The decoding to internal dictionary buffer (CLzmaDec::dic).
+   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
+
+finishMode:
+  It has meaning only if the decoding reaches output limit (dicLimit).
+  LZMA_FINISH_ANY - Decode just dicLimit bytes.
+  LZMA_FINISH_END - Stream must be finished after dicLimit.
+
+Returns:
+  SZ_OK
+    status:
+      LZMA_STATUS_FINISHED_WITH_MARK
+      LZMA_STATUS_NOT_FINISHED
+      LZMA_STATUS_NEEDS_MORE_INPUT
+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
+  SZ_ERROR_DATA - Data error
+*/
+
+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+
+
+/* ---------- Buffer Interface ---------- */
+
+/* It's zlib-like interface.
+   See LzmaDec_DecodeToDic description for information about STEPS and return results,
+   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
+   to work with CLzmaDec variables manually.
+
+finishMode:
+  It has meaning only if the decoding reaches output limit (*destLen).
+  LZMA_FINISH_ANY - Decode just destLen bytes.
+  LZMA_FINISH_END - Stream must be finished after (*destLen).
+*/
+
+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
+
+
+/* ---------- One Call Interface ---------- */
+
+/* LzmaDecode
+
+finishMode:
+  It has meaning only if the decoding reaches output limit (*destLen).
+  LZMA_FINISH_ANY - Decode just destLen bytes.
+  LZMA_FINISH_END - Stream must be finished after (*destLen).
+
+Returns:
+  SZ_OK
+    status:
+      LZMA_STATUS_FINISHED_WITH_MARK
+      LZMA_STATUS_NOT_FINISHED
+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
+  SZ_ERROR_DATA - Data error
+  SZ_ERROR_MEM  - Memory allocation error
+  SZ_ERROR_UNSUPPORTED - Unsupported properties
+  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
+*/
+
+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
+    ELzmaStatus *status, ISzAllocPtr alloc);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/LzmaEnc.c b/3rdparty/7z/src/LzmaEnc.c
new file mode 100644
index 0000000000..14086fc4f9
--- /dev/null
+++ b/3rdparty/7z/src/LzmaEnc.c
@@ -0,0 +1,2976 @@
+/* LzmaEnc.c -- LZMA Encoder
+2019-01-10: Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <string.h>
+
+/* #define SHOW_STAT */
+/* #define SHOW_STAT2 */
+
+#if defined(SHOW_STAT) || defined(SHOW_STAT2)
+#include <stdio.h>
+#endif
+
+#include "LzmaEnc.h"
+
+#include "LzFind.h"
+#ifndef _7ZIP_ST
+#include "LzFindMt.h"
+#endif
+
+#ifdef SHOW_STAT
+static unsigned g_STAT_OFFSET = 0;
+#endif
+
+#define kLzmaMaxHistorySize ((UInt32)3 << 29)
+/* #define kLzmaMaxHistorySize ((UInt32)7 << 29) */
+
+#define kNumTopBits 24
+#define kTopValue ((UInt32)1 << kNumTopBits)
+
+#define kNumBitModelTotalBits 11
+#define kBitModelTotal (1 << kNumBitModelTotalBits)
+#define kNumMoveBits 5
+#define kProbInitValue (kBitModelTotal >> 1)
+
+#define kNumMoveReducingBits 4
+#define kNumBitPriceShiftBits 4
+#define kBitPrice (1 << kNumBitPriceShiftBits)
+
+#define REP_LEN_COUNT 64
+
+void LzmaEncProps_Init(CLzmaEncProps *p)
+{
+  p->level = 5;
+  p->dictSize = p->mc = 0;
+  p->reduceSize = (UInt64)(Int64)-1;
+  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
+  p->writeEndMark = 0;
+}
+
+void LzmaEncProps_Normalize(CLzmaEncProps *p)
+{
+  int level = p->level;
+  if (level < 0) level = 5;
+  p->level = level;
+  
+  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level <= 7 ? (1 << 25) : (1 << 26)));
+  if (p->dictSize > p->reduceSize)
+  {
+    unsigned i;
+    UInt32 reduceSize = (UInt32)p->reduceSize;
+    for (i = 11; i <= 30; i++)
+    {
+      if (reduceSize <= ((UInt32)2 << i)) { p->dictSize = ((UInt32)2 << i); break; }
+      if (reduceSize <= ((UInt32)3 << i)) { p->dictSize = ((UInt32)3 << i); break; }
+    }
+  }
+
+  if (p->lc < 0) p->lc = 3;
+  if (p->lp < 0) p->lp = 0;
+  if (p->pb < 0) p->pb = 2;
+
+  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
+  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
+  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
+  if (p->numHashBytes < 0) p->numHashBytes = 4;
+  if (p->mc == 0) p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
+  
+  if (p->numThreads < 0)
+    p->numThreads =
+      #ifndef _7ZIP_ST
+      ((p->btMode && p->algo) ? 2 : 1);
+      #else
+      1;
+      #endif
+}
+
+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
+{
+  CLzmaEncProps props = *props2;
+  LzmaEncProps_Normalize(&props);
+  return props.dictSize;
+}
+
+#if (_MSC_VER >= 1400)
+/* BSR code is fast for some new CPUs */
+/* #define LZMA_LOG_BSR */
+#endif
+
+#ifdef LZMA_LOG_BSR
+
+#define kDicLogSizeMaxCompress 32
+
+#define BSR2_RET(pos, res) { unsigned long zz; _BitScanReverse(&zz, (pos)); res = (zz + zz) + ((pos >> (zz - 1)) & 1); }
+
+static unsigned GetPosSlot1(UInt32 pos)
+{
+  unsigned res;
+  BSR2_RET(pos, res);
+  return res;
+}
+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
+#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
+
+#else
+
+#define kNumLogBits (9 + sizeof(size_t) / 2)
+/* #define kNumLogBits (11 + sizeof(size_t) / 8 * 3) */
+
+#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
+
+static void LzmaEnc_FastPosInit(Byte *g_FastPos)
+{
+  unsigned slot;
+  g_FastPos[0] = 0;
+  g_FastPos[1] = 1;
+  g_FastPos += 2;
+  
+  for (slot = 2; slot < kNumLogBits * 2; slot++)
+  {
+    size_t k = ((size_t)1 << ((slot >> 1) - 1));
+    size_t j;
+    for (j = 0; j < k; j++)
+      g_FastPos[j] = (Byte)slot;
+    g_FastPos += k;
+  }
+}
+
+/* we can use ((limit - pos) >> 31) only if (pos < ((UInt32)1 << 31)) */
+/*
+#define BSR2_RET(pos, res) { unsigned zz = 6 + ((kNumLogBits - 1) & \
+  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
+  res = p->g_FastPos[pos >> zz] + (zz * 2); }
+*/
+
+/*
+#define BSR2_RET(pos, res) { unsigned zz = 6 + ((kNumLogBits - 1) & \
+  (0 - (((((UInt32)1 << (kNumLogBits)) - 1) - (pos >> 6)) >> 31))); \
+  res = p->g_FastPos[pos >> zz] + (zz * 2); }
+*/
+
+#define BSR2_RET(pos, res) { unsigned zz = (pos < (1 << (kNumLogBits + 6))) ? 6 : 6 + kNumLogBits - 1; \
+  res = p->g_FastPos[pos >> zz] + (zz * 2); }
+
+/*
+#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
+  p->g_FastPos[pos >> 6] + 12 : \
+  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
+*/
+
+#define GetPosSlot1(pos) p->g_FastPos[pos]
+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
+#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos & (kNumFullDistances - 1)]; else BSR2_RET(pos, res); }
+
+#endif
+
+
+#define LZMA_NUM_REPS 4
+
+typedef UInt16 CState;
+typedef UInt16 CExtra;
+
+typedef struct
+{
+  UInt32 price;
+  CState state;
+  CExtra extra;
+      // 0   : normal
+      // 1   : LIT : MATCH
+      // > 1 : MATCH (extra-1) : LIT : REP0 (len)
+  UInt32 len;
+  UInt32 dist;
+  UInt32 reps[LZMA_NUM_REPS];
+} COptimal;
+
+
+// 18.06
+#define kNumOpts (1 << 11)
+#define kPackReserve (kNumOpts * 8)
+// #define kNumOpts (1 << 12)
+// #define kPackReserve (1 + kNumOpts * 2)
+
+#define kNumLenToPosStates 4
+#define kNumPosSlotBits 6
+#define kDicLogSizeMin 0
+#define kDicLogSizeMax 32
+#define kDistTableSizeMax (kDicLogSizeMax * 2)
+
+#define kNumAlignBits 4
+#define kAlignTableSize (1 << kNumAlignBits)
+#define kAlignMask (kAlignTableSize - 1)
+
+#define kStartPosModelIndex 4
+#define kEndPosModelIndex 14
+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
+
+typedef
+#ifdef _LZMA_PROB32
+  UInt32
+#else
+  UInt16
+#endif
+  CLzmaProb;
+
+#define LZMA_PB_MAX 4
+#define LZMA_LC_MAX 8
+#define LZMA_LP_MAX 4
+
+#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
+
+#define kLenNumLowBits 3
+#define kLenNumLowSymbols (1 << kLenNumLowBits)
+#define kLenNumHighBits 8
+#define kLenNumHighSymbols (1 << kLenNumHighBits)
+#define kLenNumSymbolsTotal (kLenNumLowSymbols * 2 + kLenNumHighSymbols)
+
+#define LZMA_MATCH_LEN_MIN 2
+#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
+
+#define kNumStates 12
+
+
+typedef struct
+{
+  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << (kLenNumLowBits + 1)];
+  CLzmaProb high[kLenNumHighSymbols];
+} CLenEnc;
+
+
+typedef struct
+{
+  unsigned tableSize;
+  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
+  // UInt32 prices1[LZMA_NUM_PB_STATES_MAX][kLenNumLowSymbols * 2];
+  // UInt32 prices2[kLenNumSymbolsTotal];
+} CLenPriceEnc;
+
+#define GET_PRICE_LEN(p, posState, len) \
+    ((p)->prices[posState][(size_t)(len) - LZMA_MATCH_LEN_MIN])
+
+/*
+#define GET_PRICE_LEN(p, posState, len) \
+    ((p)->prices2[(size_t)(len) - 2] + ((p)->prices1[posState][((len) - 2) & (kLenNumLowSymbols * 2 - 1)] & (((len) - 2 - kLenNumLowSymbols * 2) >> 9)))
+*/
+
+typedef struct
+{
+  UInt32 range;
+  unsigned cache;
+  UInt64 low;
+  UInt64 cacheSize;
+  Byte *buf;
+  Byte *bufLim;
+  Byte *bufBase;
+  ISeqOutStream *outStream;
+  UInt64 processed;
+  SRes res;
+} CRangeEnc;
+
+
+typedef struct
+{
+  CLzmaProb *litProbs;
+
+  unsigned state;
+  UInt32 reps[LZMA_NUM_REPS];
+
+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
+  CLzmaProb isRep[kNumStates];
+  CLzmaProb isRepG0[kNumStates];
+  CLzmaProb isRepG1[kNumStates];
+  CLzmaProb isRepG2[kNumStates];
+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
+
+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
+  CLzmaProb posEncoders[kNumFullDistances];
+  
+  CLenEnc lenProbs;
+  CLenEnc repLenProbs;
+
+} CSaveState;
+
+
+typedef UInt32 CProbPrice;
+
+
+typedef struct
+{
+  void *matchFinderObj;
+  IMatchFinder matchFinder;
+
+  unsigned optCur;
+  unsigned optEnd;
+
+  unsigned longestMatchLen;
+  unsigned numPairs;
+  UInt32 numAvail;
+
+  unsigned state;
+  unsigned numFastBytes;
+  unsigned additionalOffset;
+  UInt32 reps[LZMA_NUM_REPS];
+  unsigned lpMask, pbMask;
+  CLzmaProb *litProbs;
+  CRangeEnc rc;
+
+  UInt32 backRes;
+
+  unsigned lc, lp, pb;
+  unsigned lclp;
+
+  BoolInt fastMode;
+  BoolInt writeEndMark;
+  BoolInt finished;
+  BoolInt multiThread;
+  BoolInt needInit;
+  // BoolInt _maxMode;
+
+  UInt64 nowPos64;
+  
+  unsigned matchPriceCount;
+  // unsigned alignPriceCount;
+  int repLenEncCounter;
+
+  unsigned distTableSize;
+
+  UInt32 dictSize;
+  SRes result;
+
+  #ifndef _7ZIP_ST
+  BoolInt mtMode;
+  // begin of CMatchFinderMt is used in LZ thread
+  CMatchFinderMt matchFinderMt;
+  // end of CMatchFinderMt is used in BT and HASH threads
+  #endif
+
+  CMatchFinder matchFinderBase;
+
+  #ifndef _7ZIP_ST
+  Byte pad[128];
+  #endif
+  
+  // LZ thread
+  CProbPrice ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
+
+  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
+
+  UInt32 alignPrices[kAlignTableSize];
+  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
+  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
+
+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
+  CLzmaProb isRep[kNumStates];
+  CLzmaProb isRepG0[kNumStates];
+  CLzmaProb isRepG1[kNumStates];
+  CLzmaProb isRepG2[kNumStates];
+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
+  CLzmaProb posEncoders[kNumFullDistances];
+  
+  CLenEnc lenProbs;
+  CLenEnc repLenProbs;
+
+  #ifndef LZMA_LOG_BSR
+  Byte g_FastPos[1 << kNumLogBits];
+  #endif
+
+  CLenPriceEnc lenEnc;
+  CLenPriceEnc repLenEnc;
+
+  COptimal opt[kNumOpts];
+
+  CSaveState saveState;
+
+  #ifndef _7ZIP_ST
+  Byte pad2[128];
+  #endif
+} CLzmaEnc;
+
+
+
+#define COPY_ARR(dest, src, arr) memcpy(dest->arr, src->arr, sizeof(src->arr));
+
+void LzmaEnc_SaveState(CLzmaEncHandle pp)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  CSaveState *dest = &p->saveState;
+  
+  dest->state = p->state;
+  
+  dest->lenProbs = p->lenProbs;
+  dest->repLenProbs = p->repLenProbs;
+
+  COPY_ARR(dest, p, reps);
+
+  COPY_ARR(dest, p, posAlignEncoder);
+  COPY_ARR(dest, p, isRep);
+  COPY_ARR(dest, p, isRepG0);
+  COPY_ARR(dest, p, isRepG1);
+  COPY_ARR(dest, p, isRepG2);
+  COPY_ARR(dest, p, isMatch);
+  COPY_ARR(dest, p, isRep0Long);
+  COPY_ARR(dest, p, posSlotEncoder);
+  COPY_ARR(dest, p, posEncoders);
+
+  memcpy(dest->litProbs, p->litProbs, ((UInt32)0x300 << p->lclp) * sizeof(CLzmaProb));
+}
+
+
+void LzmaEnc_RestoreState(CLzmaEncHandle pp)
+{
+  CLzmaEnc *dest = (CLzmaEnc *)pp;
+  const CSaveState *p = &dest->saveState;
+
+  dest->state = p->state;
+
+  dest->lenProbs = p->lenProbs;
+  dest->repLenProbs = p->repLenProbs;
+  
+  COPY_ARR(dest, p, reps);
+  
+  COPY_ARR(dest, p, posAlignEncoder);
+  COPY_ARR(dest, p, isRep);
+  COPY_ARR(dest, p, isRepG0);
+  COPY_ARR(dest, p, isRepG1);
+  COPY_ARR(dest, p, isRepG2);
+  COPY_ARR(dest, p, isMatch);
+  COPY_ARR(dest, p, isRep0Long);
+  COPY_ARR(dest, p, posSlotEncoder);
+  COPY_ARR(dest, p, posEncoders);
+
+  memcpy(dest->litProbs, p->litProbs, ((UInt32)0x300 << dest->lclp) * sizeof(CLzmaProb));
+}
+
+
+
+SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  CLzmaEncProps props = *props2;
+  LzmaEncProps_Normalize(&props);
+
+  if (props.lc > LZMA_LC_MAX
+      || props.lp > LZMA_LP_MAX
+      || props.pb > LZMA_PB_MAX
+      || props.dictSize > ((UInt64)1 << kDicLogSizeMaxCompress)
+      || props.dictSize > kLzmaMaxHistorySize)
+    return SZ_ERROR_PARAM;
+
+  p->dictSize = props.dictSize;
+  {
+    unsigned fb = props.fb;
+    if (fb < 5)
+      fb = 5;
+    if (fb > LZMA_MATCH_LEN_MAX)
+      fb = LZMA_MATCH_LEN_MAX;
+    p->numFastBytes = fb;
+  }
+  p->lc = props.lc;
+  p->lp = props.lp;
+  p->pb = props.pb;
+  p->fastMode = (props.algo == 0);
+  // p->_maxMode = True;
+  p->matchFinderBase.btMode = (Byte)(props.btMode ? 1 : 0);
+  {
+    unsigned numHashBytes = 4;
+    if (props.btMode)
+    {
+      if (props.numHashBytes < 2)
+        numHashBytes = 2;
+      else if (props.numHashBytes < 4)
+        numHashBytes = props.numHashBytes;
+    }
+    p->matchFinderBase.numHashBytes = numHashBytes;
+  }
+
+  p->matchFinderBase.cutValue = props.mc;
+
+  p->writeEndMark = props.writeEndMark;
+
+  #ifndef _7ZIP_ST
+  /*
+  if (newMultiThread != _multiThread)
+  {
+    ReleaseMatchFinder();
+    _multiThread = newMultiThread;
+  }
+  */
+  p->multiThread = (props.numThreads > 1);
+  #endif
+
+  return SZ_OK;
+}
+
+
+void LzmaEnc_SetDataSize(CLzmaEncHandle pp, UInt64 expectedDataSiize)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  p->matchFinderBase.expectedDataSize = expectedDataSiize;
+}
+
+
+#define kState_Start 0
+#define kState_LitAfterMatch 4
+#define kState_LitAfterRep   5
+#define kState_MatchAfterLit 7
+#define kState_RepAfterLit   8
+
+static const Byte kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
+static const Byte kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
+static const Byte kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
+static const Byte kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
+
+#define IsLitState(s) ((s) < 7)
+#define GetLenToPosState2(len) (((len) < kNumLenToPosStates - 1) ? (len) : kNumLenToPosStates - 1)
+#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
+
+#define kInfinityPrice (1 << 30)
+
+static void RangeEnc_Construct(CRangeEnc *p)
+{
+  p->outStream = NULL;
+  p->bufBase = NULL;
+}
+
+#define RangeEnc_GetProcessed(p)       ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
+#define RangeEnc_GetProcessed_sizet(p) ((size_t)(p)->processed + ((p)->buf - (p)->bufBase) + (size_t)(p)->cacheSize)
+
+#define RC_BUF_SIZE (1 << 16)
+
+static int RangeEnc_Alloc(CRangeEnc *p, ISzAllocPtr alloc)
+{
+  if (!p->bufBase)
+  {
+    p->bufBase = (Byte *)ISzAlloc_Alloc(alloc, RC_BUF_SIZE);
+    if (!p->bufBase)
+      return 0;
+    p->bufLim = p->bufBase + RC_BUF_SIZE;
+  }
+  return 1;
+}
+
+static void RangeEnc_Free(CRangeEnc *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->bufBase);
+  p->bufBase = 0;
+}
+
+static void RangeEnc_Init(CRangeEnc *p)
+{
+  /* Stream.Init(); */
+  p->range = 0xFFFFFFFF;
+  p->cache = 0;
+  p->low = 0;
+  p->cacheSize = 0;
+
+  p->buf = p->bufBase;
+
+  p->processed = 0;
+  p->res = SZ_OK;
+}
+
+MY_NO_INLINE static void RangeEnc_FlushStream(CRangeEnc *p)
+{
+  size_t num;
+  if (p->res != SZ_OK)
+    return;
+  num = p->buf - p->bufBase;
+  if (num != ISeqOutStream_Write(p->outStream, p->bufBase, num))
+    p->res = SZ_ERROR_WRITE;
+  p->processed += num;
+  p->buf = p->bufBase;
+}
+
+MY_NO_INLINE static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
+{
+  UInt32 low = (UInt32)p->low;
+  unsigned high = (unsigned)(p->low >> 32);
+  p->low = (UInt32)(low << 8);
+  if (low < (UInt32)0xFF000000 || high != 0)
+  {
+    {
+      Byte *buf = p->buf;
+      *buf++ = (Byte)(p->cache + high);
+      p->cache = (unsigned)(low >> 24);
+      p->buf = buf;
+      if (buf == p->bufLim)
+        RangeEnc_FlushStream(p);
+      if (p->cacheSize == 0)
+        return;
+    }
+    high += 0xFF;
+    for (;;)
+    {
+      Byte *buf = p->buf;
+      *buf++ = (Byte)(high);
+      p->buf = buf;
+      if (buf == p->bufLim)
+        RangeEnc_FlushStream(p);
+      if (--p->cacheSize == 0)
+        return;
+    }
+  }
+  p->cacheSize++;
+}
+
+static void RangeEnc_FlushData(CRangeEnc *p)
+{
+  int i;
+  for (i = 0; i < 5; i++)
+    RangeEnc_ShiftLow(p);
+}
+
+#define RC_NORM(p) if (range < kTopValue) { range <<= 8; RangeEnc_ShiftLow(p); }
+
+#define RC_BIT_PRE(p, prob) \
+  ttt = *(prob); \
+  newBound = (range >> kNumBitModelTotalBits) * ttt;
+
+// #define _LZMA_ENC_USE_BRANCH
+
+#ifdef _LZMA_ENC_USE_BRANCH
+
+#define RC_BIT(p, prob, bit) { \
+  RC_BIT_PRE(p, prob) \
+  if (bit == 0) { range = newBound; ttt += (kBitModelTotal - ttt) >> kNumMoveBits; } \
+  else { (p)->low += newBound; range -= newBound; ttt -= ttt >> kNumMoveBits; } \
+  *(prob) = (CLzmaProb)ttt; \
+  RC_NORM(p) \
+  }
+
+#else
+
+#define RC_BIT(p, prob, bit) { \
+  UInt32 mask; \
+  RC_BIT_PRE(p, prob) \
+  mask = 0 - (UInt32)bit; \
+  range &= mask; \
+  mask &= newBound; \
+  range -= mask; \
+  (p)->low += mask; \
+  mask = (UInt32)bit - 1; \
+  range += newBound & mask; \
+  mask &= (kBitModelTotal - ((1 << kNumMoveBits) - 1)); \
+  mask += ((1 << kNumMoveBits) - 1); \
+  ttt += (Int32)(mask - ttt) >> kNumMoveBits; \
+  *(prob) = (CLzmaProb)ttt; \
+  RC_NORM(p) \
+  }
+
+#endif
+
+
+
+
+#define RC_BIT_0_BASE(p, prob) \
+  range = newBound; *(prob) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
+
+#define RC_BIT_1_BASE(p, prob) \
+  range -= newBound; (p)->low += newBound; *(prob) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits)); \
+
+#define RC_BIT_0(p, prob) \
+  RC_BIT_0_BASE(p, prob) \
+  RC_NORM(p)
+
+#define RC_BIT_1(p, prob) \
+  RC_BIT_1_BASE(p, prob) \
+  RC_NORM(p)
+
+static void RangeEnc_EncodeBit_0(CRangeEnc *p, CLzmaProb *prob)
+{
+  UInt32 range, ttt, newBound;
+  range = p->range;
+  RC_BIT_PRE(p, prob)
+  RC_BIT_0(p, prob)
+  p->range = range;
+}
+
+static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 sym)
+{
+  UInt32 range = p->range;
+  sym |= 0x100;
+  do
+  {
+    UInt32 ttt, newBound;
+    // RangeEnc_EncodeBit(p, probs + (sym >> 8), (sym >> 7) & 1);
+    CLzmaProb *prob = probs + (sym >> 8);
+    UInt32 bit = (sym >> 7) & 1;
+    sym <<= 1;
+    RC_BIT(p, prob, bit);
+  }
+  while (sym < 0x10000);
+  p->range = range;
+}
+
+static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 sym, UInt32 matchByte)
+{
+  UInt32 range = p->range;
+  UInt32 offs = 0x100;
+  sym |= 0x100;
+  do
+  {
+    UInt32 ttt, newBound;
+    CLzmaProb *prob;
+    UInt32 bit;
+    matchByte <<= 1;
+    // RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (sym >> 8)), (sym >> 7) & 1);
+    prob = probs + (offs + (matchByte & offs) + (sym >> 8));
+    bit = (sym >> 7) & 1;
+    sym <<= 1;
+    offs &= ~(matchByte ^ sym);
+    RC_BIT(p, prob, bit);
+  }
+  while (sym < 0x10000);
+  p->range = range;
+}
+
+
+
+static void LzmaEnc_InitPriceTables(CProbPrice *ProbPrices)
+{
+  UInt32 i;
+  for (i = 0; i < (kBitModelTotal >> kNumMoveReducingBits); i++)
+  {
+    const unsigned kCyclesBits = kNumBitPriceShiftBits;
+    UInt32 w = (i << kNumMoveReducingBits) + (1 << (kNumMoveReducingBits - 1));
+    unsigned bitCount = 0;
+    unsigned j;
+    for (j = 0; j < kCyclesBits; j++)
+    {
+      w = w * w;
+      bitCount <<= 1;
+      while (w >= ((UInt32)1 << 16))
+      {
+        w >>= 1;
+        bitCount++;
+      }
+    }
+    ProbPrices[i] = (CProbPrice)((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
+    // printf("\n%3d: %5d", i, ProbPrices[i]);
+  }
+}
+
+
+#define GET_PRICE(prob, bit) \
+  p->ProbPrices[((prob) ^ (unsigned)(((-(int)(bit))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
+
+#define GET_PRICEa(prob, bit) \
+     ProbPrices[((prob) ^ (unsigned)((-((int)(bit))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
+
+#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
+#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
+
+#define GET_PRICEa_0(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
+#define GET_PRICEa_1(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
+
+
+static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 sym, const CProbPrice *ProbPrices)
+{
+  UInt32 price = 0;
+  sym |= 0x100;
+  do
+  {
+    unsigned bit = sym & 1;
+    sym >>= 1;
+    price += GET_PRICEa(probs[sym], bit);
+  }
+  while (sym >= 2);
+  return price;
+}
+
+
+static UInt32 LitEnc_Matched_GetPrice(const CLzmaProb *probs, UInt32 sym, UInt32 matchByte, const CProbPrice *ProbPrices)
+{
+  UInt32 price = 0;
+  UInt32 offs = 0x100;
+  sym |= 0x100;
+  do
+  {
+    matchByte <<= 1;
+    price += GET_PRICEa(probs[offs + (matchByte & offs) + (sym >> 8)], (sym >> 7) & 1);
+    sym <<= 1;
+    offs &= ~(matchByte ^ sym);
+  }
+  while (sym < 0x10000);
+  return price;
+}
+
+
+static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, unsigned numBits, unsigned sym)
+{
+  UInt32 range = rc->range;
+  unsigned m = 1;
+  do
+  {
+    UInt32 ttt, newBound;
+    unsigned bit = sym & 1;
+    // RangeEnc_EncodeBit(rc, probs + m, bit);
+    sym >>= 1;
+    RC_BIT(rc, probs + m, bit);
+    m = (m << 1) | bit;
+  }
+  while (--numBits);
+  rc->range = range;
+}
+
+
+
+static void LenEnc_Init(CLenEnc *p)
+{
+  unsigned i;
+  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << (kLenNumLowBits + 1)); i++)
+    p->low[i] = kProbInitValue;
+  for (i = 0; i < kLenNumHighSymbols; i++)
+    p->high[i] = kProbInitValue;
+}
+
+static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, unsigned sym, unsigned posState)
+{
+  UInt32 range, ttt, newBound;
+  CLzmaProb *probs = p->low;
+  range = rc->range;
+  RC_BIT_PRE(rc, probs);
+  if (sym >= kLenNumLowSymbols)
+  {
+    RC_BIT_1(rc, probs);
+    probs += kLenNumLowSymbols;
+    RC_BIT_PRE(rc, probs);
+    if (sym >= kLenNumLowSymbols * 2)
+    {
+      RC_BIT_1(rc, probs);
+      rc->range = range;
+      // RcTree_Encode(rc, p->high, kLenNumHighBits, sym - kLenNumLowSymbols * 2);
+      LitEnc_Encode(rc, p->high, sym - kLenNumLowSymbols * 2);
+      return;
+    }
+    sym -= kLenNumLowSymbols;
+  }
+
+  // RcTree_Encode(rc, probs + (posState << kLenNumLowBits), kLenNumLowBits, sym);
+  {
+    unsigned m;
+    unsigned bit;
+    RC_BIT_0(rc, probs);
+    probs += (posState << (1 + kLenNumLowBits));
+    bit = (sym >> 2)    ; RC_BIT(rc, probs + 1, bit); m = (1 << 1) + bit;
+    bit = (sym >> 1) & 1; RC_BIT(rc, probs + m, bit); m = (m << 1) + bit;
+    bit =  sym       & 1; RC_BIT(rc, probs + m, bit);
+    rc->range = range;
+  }
+}
+
+static void SetPrices_3(const CLzmaProb *probs, UInt32 startPrice, UInt32 *prices, const CProbPrice *ProbPrices)
+{
+  unsigned i;
+  for (i = 0; i < 8; i += 2)
+  {
+    UInt32 price = startPrice;
+    UInt32 prob;
+    price += GET_PRICEa(probs[1           ], (i >> 2));
+    price += GET_PRICEa(probs[2 + (i >> 2)], (i >> 1) & 1);
+    prob = probs[4 + (i >> 1)];
+    prices[i    ] = price + GET_PRICEa_0(prob);
+    prices[i + 1] = price + GET_PRICEa_1(prob);
+  }
+}
+
+
+MY_NO_INLINE static void MY_FAST_CALL LenPriceEnc_UpdateTables(
+    CLenPriceEnc *p,
+    unsigned numPosStates,
+    const CLenEnc *enc,
+    const CProbPrice *ProbPrices)
+{
+  UInt32 b;
+ 
+  {
+    unsigned prob = enc->low[0];
+    UInt32 a, c;
+    unsigned posState;
+    b = GET_PRICEa_1(prob);
+    a = GET_PRICEa_0(prob);
+    c = b + GET_PRICEa_0(enc->low[kLenNumLowSymbols]);
+    for (posState = 0; posState < numPosStates; posState++)
+    {
+      UInt32 *prices = p->prices[posState];
+      const CLzmaProb *probs = enc->low + (posState << (1 + kLenNumLowBits));
+      SetPrices_3(probs, a, prices, ProbPrices);
+      SetPrices_3(probs + kLenNumLowSymbols, c, prices + kLenNumLowSymbols, ProbPrices);
+    }
+  }
+
+  /*
+  {
+    unsigned i;
+    UInt32 b;
+    a = GET_PRICEa_0(enc->low[0]);
+    for (i = 0; i < kLenNumLowSymbols; i++)
+      p->prices2[i] = a;
+    a = GET_PRICEa_1(enc->low[0]);
+    b = a + GET_PRICEa_0(enc->low[kLenNumLowSymbols]);
+    for (i = kLenNumLowSymbols; i < kLenNumLowSymbols * 2; i++)
+      p->prices2[i] = b;
+    a += GET_PRICEa_1(enc->low[kLenNumLowSymbols]);
+  }
+  */
+ 
+  // p->counter = numSymbols;
+  // p->counter = 64;
+
+  {
+    unsigned i = p->tableSize;
+    
+    if (i > kLenNumLowSymbols * 2)
+    {
+      const CLzmaProb *probs = enc->high;
+      UInt32 *prices = p->prices[0] + kLenNumLowSymbols * 2;
+      i -= kLenNumLowSymbols * 2 - 1;
+      i >>= 1;
+      b += GET_PRICEa_1(enc->low[kLenNumLowSymbols]);
+      do
+      {
+        /*
+        p->prices2[i] = a +
+        // RcTree_GetPrice(enc->high, kLenNumHighBits, i - kLenNumLowSymbols * 2, ProbPrices);
+        LitEnc_GetPrice(probs, i - kLenNumLowSymbols * 2, ProbPrices);
+        */
+        // UInt32 price = a + RcTree_GetPrice(probs, kLenNumHighBits - 1, sym, ProbPrices);
+        unsigned sym = --i + (1 << (kLenNumHighBits - 1));
+        UInt32 price = b;
+        do
+        {
+          unsigned bit = sym & 1;
+          sym >>= 1;
+          price += GET_PRICEa(probs[sym], bit);
+        }
+        while (sym >= 2);
+
+        {
+          unsigned prob = probs[(size_t)i + (1 << (kLenNumHighBits - 1))];
+          prices[(size_t)i * 2    ] = price + GET_PRICEa_0(prob);
+          prices[(size_t)i * 2 + 1] = price + GET_PRICEa_1(prob);
+        }
+      }
+      while (i);
+
+      {
+        unsigned posState;
+        size_t num = (p->tableSize - kLenNumLowSymbols * 2) * sizeof(p->prices[0][0]);
+        for (posState = 1; posState < numPosStates; posState++)
+          memcpy(p->prices[posState] + kLenNumLowSymbols * 2, p->prices[0] + kLenNumLowSymbols * 2, num);
+      }
+    }
+  }
+}
+
+/*
+  #ifdef SHOW_STAT
+  g_STAT_OFFSET += num;
+  printf("\n MovePos %u", num);
+  #endif
+*/
+  
+#define MOVE_POS(p, num) { \
+    p->additionalOffset += (num); \
+    p->matchFinder.Skip(p->matchFinderObj, (UInt32)(num)); }
+
+
+static unsigned ReadMatchDistances(CLzmaEnc *p, unsigned *numPairsRes)
+{
+  unsigned numPairs;
+  
+  p->additionalOffset++;
+  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
+  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
+  *numPairsRes = numPairs;
+  
+  #ifdef SHOW_STAT
+  printf("\n i = %u numPairs = %u    ", g_STAT_OFFSET, numPairs / 2);
+  g_STAT_OFFSET++;
+  {
+    unsigned i;
+    for (i = 0; i < numPairs; i += 2)
+      printf("%2u %6u   | ", p->matches[i], p->matches[i + 1]);
+  }
+  #endif
+  
+  if (numPairs == 0)
+    return 0;
+  {
+    unsigned len = p->matches[(size_t)numPairs - 2];
+    if (len != p->numFastBytes)
+      return len;
+    {
+      UInt32 numAvail = p->numAvail;
+      if (numAvail > LZMA_MATCH_LEN_MAX)
+        numAvail = LZMA_MATCH_LEN_MAX;
+      {
+        const Byte *p1 = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
+        const Byte *p2 = p1 + len;
+        ptrdiff_t dif = (ptrdiff_t)-1 - p->matches[(size_t)numPairs - 1];
+        const Byte *lim = p1 + numAvail;
+        for (; p2 != lim && *p2 == p2[dif]; p2++)
+        {}
+        return (unsigned)(p2 - p1);
+      }
+    }
+  }
+}
+
+#define MARK_LIT ((UInt32)(Int32)-1)
+
+#define MakeAs_Lit(p)       { (p)->dist = MARK_LIT; (p)->extra = 0; }
+#define MakeAs_ShortRep(p)  { (p)->dist = 0; (p)->extra = 0; }
+#define IsShortRep(p)       ((p)->dist == 0)
+
+
+#define GetPrice_ShortRep(p, state, posState) \
+  ( GET_PRICE_0(p->isRepG0[state]) + GET_PRICE_0(p->isRep0Long[state][posState]))
+
+#define GetPrice_Rep_0(p, state, posState) ( \
+    GET_PRICE_1(p->isMatch[state][posState]) \
+  + GET_PRICE_1(p->isRep0Long[state][posState])) \
+  + GET_PRICE_1(p->isRep[state]) \
+  + GET_PRICE_0(p->isRepG0[state])
+  
+MY_FORCE_INLINE
+static UInt32 GetPrice_PureRep(const CLzmaEnc *p, unsigned repIndex, size_t state, size_t posState)
+{
+  UInt32 price;
+  UInt32 prob = p->isRepG0[state];
+  if (repIndex == 0)
+  {
+    price = GET_PRICE_0(prob);
+    price += GET_PRICE_1(p->isRep0Long[state][posState]);
+  }
+  else
+  {
+    price = GET_PRICE_1(prob);
+    prob = p->isRepG1[state];
+    if (repIndex == 1)
+      price += GET_PRICE_0(prob);
+    else
+    {
+      price += GET_PRICE_1(prob);
+      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
+    }
+  }
+  return price;
+}
+
+
+static unsigned Backward(CLzmaEnc *p, unsigned cur)
+{
+  unsigned wr = cur + 1;
+  p->optEnd = wr;
+
+  for (;;)
+  {
+    UInt32 dist = p->opt[cur].dist;
+    unsigned len = (unsigned)p->opt[cur].len;
+    unsigned extra = (unsigned)p->opt[cur].extra;
+    cur -= len;
+
+    if (extra)
+    {
+      wr--;
+      p->opt[wr].len = (UInt32)len;
+      cur -= extra;
+      len = extra;
+      if (extra == 1)
+      {
+        p->opt[wr].dist = dist;
+        dist = MARK_LIT;
+      }
+      else
+      {
+        p->opt[wr].dist = 0;
+        len--;
+        wr--;
+        p->opt[wr].dist = MARK_LIT;
+        p->opt[wr].len = 1;
+      }
+    }
+
+    if (cur == 0)
+    {
+      p->backRes = dist;
+      p->optCur = wr;
+      return len;
+    }
+    
+    wr--;
+    p->opt[wr].dist = dist;
+    p->opt[wr].len = (UInt32)len;
+  }
+}
+
+
+
+#define LIT_PROBS(pos, prevByte) \
+  (p->litProbs + (UInt32)3 * (((((pos) << 8) + (prevByte)) & p->lpMask) << p->lc))
+
+
+static unsigned GetOptimum(CLzmaEnc *p, UInt32 position)
+{
+  unsigned last, cur;
+  UInt32 reps[LZMA_NUM_REPS];
+  unsigned repLens[LZMA_NUM_REPS];
+  UInt32 *matches;
+
+  {
+    UInt32 numAvail;
+    unsigned numPairs, mainLen, repMaxIndex, i, posState;
+    UInt32 matchPrice, repMatchPrice;
+    const Byte *data;
+    Byte curByte, matchByte;
+    
+    p->optCur = p->optEnd = 0;
+    
+    if (p->additionalOffset == 0)
+      mainLen = ReadMatchDistances(p, &numPairs);
+    else
+    {
+      mainLen = p->longestMatchLen;
+      numPairs = p->numPairs;
+    }
+    
+    numAvail = p->numAvail;
+    if (numAvail < 2)
+    {
+      p->backRes = MARK_LIT;
+      return 1;
+    }
+    if (numAvail > LZMA_MATCH_LEN_MAX)
+      numAvail = LZMA_MATCH_LEN_MAX;
+    
+    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
+    repMaxIndex = 0;
+    
+    for (i = 0; i < LZMA_NUM_REPS; i++)
+    {
+      unsigned len;
+      const Byte *data2;
+      reps[i] = p->reps[i];
+      data2 = data - reps[i];
+      if (data[0] != data2[0] || data[1] != data2[1])
+      {
+        repLens[i] = 0;
+        continue;
+      }
+      for (len = 2; len < numAvail && data[len] == data2[len]; len++)
+      {}
+      repLens[i] = len;
+      if (len > repLens[repMaxIndex])
+        repMaxIndex = i;
+    }
+    
+    if (repLens[repMaxIndex] >= p->numFastBytes)
+    {
+      unsigned len;
+      p->backRes = (UInt32)repMaxIndex;
+      len = repLens[repMaxIndex];
+      MOVE_POS(p, len - 1)
+      return len;
+    }
+    
+    matches = p->matches;
+    
+    if (mainLen >= p->numFastBytes)
+    {
+      p->backRes = matches[(size_t)numPairs - 1] + LZMA_NUM_REPS;
+      MOVE_POS(p, mainLen - 1)
+      return mainLen;
+    }
+    
+    curByte = *data;
+    matchByte = *(data - reps[0]);
+
+    last = repLens[repMaxIndex];
+    if (last <= mainLen)
+      last = mainLen;
+    
+    if (last < 2 && curByte != matchByte)
+    {
+      p->backRes = MARK_LIT;
+      return 1;
+    }
+    
+    p->opt[0].state = (CState)p->state;
+    
+    posState = (position & p->pbMask);
+    
+    {
+      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
+      p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
+        (!IsLitState(p->state) ?
+          LitEnc_Matched_GetPrice(probs, curByte, matchByte, p->ProbPrices) :
+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
+    }
+
+    MakeAs_Lit(&p->opt[1]);
+    
+    matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
+    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
+    
+    // 18.06
+    if (matchByte == curByte && repLens[0] == 0)
+    {
+      UInt32 shortRepPrice = repMatchPrice + GetPrice_ShortRep(p, p->state, posState);
+      if (shortRepPrice < p->opt[1].price)
+      {
+        p->opt[1].price = shortRepPrice;
+        MakeAs_ShortRep(&p->opt[1]);
+      }
+      if (last < 2)
+      {
+        p->backRes = p->opt[1].dist;
+        return 1;
+      }
+    }
+   
+    p->opt[1].len = 1;
+    
+    p->opt[0].reps[0] = reps[0];
+    p->opt[0].reps[1] = reps[1];
+    p->opt[0].reps[2] = reps[2];
+    p->opt[0].reps[3] = reps[3];
+    
+    // ---------- REP ----------
+    
+    for (i = 0; i < LZMA_NUM_REPS; i++)
+    {
+      unsigned repLen = repLens[i];
+      UInt32 price;
+      if (repLen < 2)
+        continue;
+      price = repMatchPrice + GetPrice_PureRep(p, i, p->state, posState);
+      do
+      {
+        UInt32 price2 = price + GET_PRICE_LEN(&p->repLenEnc, posState, repLen);
+        COptimal *opt = &p->opt[repLen];
+        if (price2 < opt->price)
+        {
+          opt->price = price2;
+          opt->len = (UInt32)repLen;
+          opt->dist = (UInt32)i;
+          opt->extra = 0;
+        }
+      }
+      while (--repLen >= 2);
+    }
+    
+    
+    // ---------- MATCH ----------
+    {
+      unsigned len = repLens[0] + 1;
+      if (len <= mainLen)
+      {
+        unsigned offs = 0;
+        UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
+
+        if (len < 2)
+          len = 2;
+        else
+          while (len > matches[offs])
+            offs += 2;
+    
+        for (; ; len++)
+        {
+          COptimal *opt;
+          UInt32 dist = matches[(size_t)offs + 1];
+          UInt32 price = normalMatchPrice + GET_PRICE_LEN(&p->lenEnc, posState, len);
+          unsigned lenToPosState = GetLenToPosState(len);
+       
+          if (dist < kNumFullDistances)
+            price += p->distancesPrices[lenToPosState][dist & (kNumFullDistances - 1)];
+          else
+          {
+            unsigned slot;
+            GetPosSlot2(dist, slot);
+            price += p->alignPrices[dist & kAlignMask];
+            price += p->posSlotPrices[lenToPosState][slot];
+          }
+          
+          opt = &p->opt[len];
+          
+          if (price < opt->price)
+          {
+            opt->price = price;
+            opt->len = (UInt32)len;
+            opt->dist = dist + LZMA_NUM_REPS;
+            opt->extra = 0;
+          }
+          
+          if (len == matches[offs])
+          {
+            offs += 2;
+            if (offs == numPairs)
+              break;
+          }
+        }
+      }
+    }
+    
+
+    cur = 0;
+
+    #ifdef SHOW_STAT2
+    /* if (position >= 0) */
+    {
+      unsigned i;
+      printf("\n pos = %4X", position);
+      for (i = cur; i <= last; i++)
+      printf("\nprice[%4X] = %u", position - cur + i, p->opt[i].price);
+    }
+    #endif
+  }
+
+
+  
+  // ---------- Optimal Parsing ----------
+
+  for (;;)
+  {
+    unsigned numAvail;
+    UInt32 numAvailFull;
+    unsigned newLen, numPairs, prev, state, posState, startLen;
+    UInt32 litPrice, matchPrice, repMatchPrice;
+    BoolInt nextIsLit;
+    Byte curByte, matchByte;
+    const Byte *data;
+    COptimal *curOpt, *nextOpt;
+
+    if (++cur == last)
+      break;
+    
+    // 18.06
+    if (cur >= kNumOpts - 64)
+    {
+      unsigned j, best;
+      UInt32 price = p->opt[cur].price;
+      best = cur;
+      for (j = cur + 1; j <= last; j++)
+      {
+        UInt32 price2 = p->opt[j].price;
+        if (price >= price2)
+        {
+          price = price2;
+          best = j;
+        }
+      }
+      {
+        unsigned delta = best - cur;
+        if (delta != 0)
+        {
+          MOVE_POS(p, delta);
+        }
+      }
+      cur = best;
+      break;
+    }
+
+    newLen = ReadMatchDistances(p, &numPairs);
+    
+    if (newLen >= p->numFastBytes)
+    {
+      p->numPairs = numPairs;
+      p->longestMatchLen = newLen;
+      break;
+    }
+    
+    curOpt = &p->opt[cur];
+
+    position++;
+
+    // we need that check here, if skip_items in p->opt are possible
+    /*
+    if (curOpt->price >= kInfinityPrice)
+      continue;
+    */
+
+    prev = cur - curOpt->len;
+
+    if (curOpt->len == 1)
+    {
+      state = (unsigned)p->opt[prev].state;
+      if (IsShortRep(curOpt))
+        state = kShortRepNextStates[state];
+      else
+        state = kLiteralNextStates[state];
+    }
+    else
+    {
+      const COptimal *prevOpt;
+      UInt32 b0;
+      UInt32 dist = curOpt->dist;
+
+      if (curOpt->extra)
+      {
+        prev -= (unsigned)curOpt->extra;
+        state = kState_RepAfterLit;
+        if (curOpt->extra == 1)
+          state = (dist < LZMA_NUM_REPS ? kState_RepAfterLit : kState_MatchAfterLit);
+      }
+      else
+      {
+        state = (unsigned)p->opt[prev].state;
+        if (dist < LZMA_NUM_REPS)
+          state = kRepNextStates[state];
+        else
+          state = kMatchNextStates[state];
+      }
+
+      prevOpt = &p->opt[prev];
+      b0 = prevOpt->reps[0];
+
+      if (dist < LZMA_NUM_REPS)
+      {
+        if (dist == 0)
+        {
+          reps[0] = b0;
+          reps[1] = prevOpt->reps[1];
+          reps[2] = prevOpt->reps[2];
+          reps[3] = prevOpt->reps[3];
+        }
+        else
+        {
+          reps[1] = b0;
+          b0 = prevOpt->reps[1];
+          if (dist == 1)
+          {
+            reps[0] = b0;
+            reps[2] = prevOpt->reps[2];
+            reps[3] = prevOpt->reps[3];
+          }
+          else
+          {
+            reps[2] = b0;
+            reps[0] = prevOpt->reps[dist];
+            reps[3] = prevOpt->reps[dist ^ 1];
+          }
+        }
+      }
+      else
+      {
+        reps[0] = (dist - LZMA_NUM_REPS + 1);
+        reps[1] = b0;
+        reps[2] = prevOpt->reps[1];
+        reps[3] = prevOpt->reps[2];
+      }
+    }
+    
+    curOpt->state = (CState)state;
+    curOpt->reps[0] = reps[0];
+    curOpt->reps[1] = reps[1];
+    curOpt->reps[2] = reps[2];
+    curOpt->reps[3] = reps[3];
+
+    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
+    curByte = *data;
+    matchByte = *(data - reps[0]);
+
+    posState = (position & p->pbMask);
+
+    /*
+    The order of Price checks:
+       <  LIT
+       <= SHORT_REP
+       <  LIT : REP_0
+       <  REP    [ : LIT : REP_0 ]
+       <  MATCH  [ : LIT : REP_0 ]
+    */
+
+    {
+      UInt32 curPrice = curOpt->price;
+      unsigned prob = p->isMatch[state][posState];
+      matchPrice = curPrice + GET_PRICE_1(prob);
+      litPrice = curPrice + GET_PRICE_0(prob);
+    }
+
+    nextOpt = &p->opt[(size_t)cur + 1];
+    nextIsLit = False;
+
+    // here we can allow skip_items in p->opt, if we don't check (nextOpt->price < kInfinityPrice)
+    // 18.new.06
+    if ((nextOpt->price < kInfinityPrice
+        // && !IsLitState(state)
+        && matchByte == curByte)
+        || litPrice > nextOpt->price
+        )
+      litPrice = 0;
+    else
+    {
+      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
+      litPrice += (!IsLitState(state) ?
+          LitEnc_Matched_GetPrice(probs, curByte, matchByte, p->ProbPrices) :
+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
+      
+      if (litPrice < nextOpt->price)
+      {
+        nextOpt->price = litPrice;
+        nextOpt->len = 1;
+        MakeAs_Lit(nextOpt);
+        nextIsLit = True;
+      }
+    }
+
+    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
+    
+    numAvailFull = p->numAvail;
+    {
+      unsigned temp = kNumOpts - 1 - cur;
+      if (numAvailFull > temp)
+        numAvailFull = (UInt32)temp;
+    }
+
+    // 18.06
+    // ---------- SHORT_REP ----------
+    if (IsLitState(state)) // 18.new
+    if (matchByte == curByte)
+    if (repMatchPrice < nextOpt->price) // 18.new
+    // if (numAvailFull < 2 || data[1] != *(data - reps[0] + 1))
+    if (
+        // nextOpt->price >= kInfinityPrice ||
+        nextOpt->len < 2   // we can check nextOpt->len, if skip items are not allowed in p->opt
+        || (nextOpt->dist != 0
+            // && nextOpt->extra <= 1 // 17.old
+            )
+        )
+    {
+      UInt32 shortRepPrice = repMatchPrice + GetPrice_ShortRep(p, state, posState);
+      // if (shortRepPrice <= nextOpt->price) // 17.old
+      if (shortRepPrice < nextOpt->price)  // 18.new
+      {
+        nextOpt->price = shortRepPrice;
+        nextOpt->len = 1;
+        MakeAs_ShortRep(nextOpt);
+        nextIsLit = False;
+      }
+    }
+    
+    if (numAvailFull < 2)
+      continue;
+    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
+
+    // numAvail <= p->numFastBytes
+
+    // ---------- LIT : REP_0 ----------
+
+    if (!nextIsLit
+        && litPrice != 0 // 18.new
+        && matchByte != curByte
+        && numAvailFull > 2)
+    {
+      const Byte *data2 = data - reps[0];
+      if (data[1] == data2[1] && data[2] == data2[2])
+      {
+        unsigned len;
+        unsigned limit = p->numFastBytes + 1;
+        if (limit > numAvailFull)
+          limit = numAvailFull;
+        for (len = 3; len < limit && data[len] == data2[len]; len++)
+        {}
+        
+        {
+          unsigned state2 = kLiteralNextStates[state];
+          unsigned posState2 = (position + 1) & p->pbMask;
+          UInt32 price = litPrice + GetPrice_Rep_0(p, state2, posState2);
+          {
+            unsigned offset = cur + len;
+
+            if (last < offset)
+              last = offset;
+          
+            // do
+            {
+              UInt32 price2;
+              COptimal *opt;
+              len--;
+              // price2 = price + GetPrice_Len_Rep_0(p, len, state2, posState2);
+              price2 = price + GET_PRICE_LEN(&p->repLenEnc, posState2, len);
+
+              opt = &p->opt[offset];
+              // offset--;
+              if (price2 < opt->price)
+              {
+                opt->price = price2;
+                opt->len = (UInt32)len;
+                opt->dist = 0;
+                opt->extra = 1;
+              }
+            }
+            // while (len >= 3);
+          }
+        }
+      }
+    }
+    
+    startLen = 2; /* speed optimization */
+
+    {
+      // ---------- REP ----------
+      unsigned repIndex = 0; // 17.old
+      // unsigned repIndex = IsLitState(state) ? 0 : 1; // 18.notused
+      for (; repIndex < LZMA_NUM_REPS; repIndex++)
+      {
+        unsigned len;
+        UInt32 price;
+        const Byte *data2 = data - reps[repIndex];
+        if (data[0] != data2[0] || data[1] != data2[1])
+          continue;
+        
+        for (len = 2; len < numAvail && data[len] == data2[len]; len++)
+        {}
+        
+        // if (len < startLen) continue; // 18.new: speed optimization
+
+        {
+          unsigned offset = cur + len;
+          if (last < offset)
+            last = offset;
+        }
+        {
+          unsigned len2 = len;
+          price = repMatchPrice + GetPrice_PureRep(p, repIndex, state, posState);
+          do
+          {
+            UInt32 price2 = price + GET_PRICE_LEN(&p->repLenEnc, posState, len2);
+            COptimal *opt = &p->opt[cur + len2];
+            if (price2 < opt->price)
+            {
+              opt->price = price2;
+              opt->len = (UInt32)len2;
+              opt->dist = (UInt32)repIndex;
+              opt->extra = 0;
+            }
+          }
+          while (--len2 >= 2);
+        }
+        
+        if (repIndex == 0) startLen = len + 1;  // 17.old
+        // startLen = len + 1; // 18.new
+
+        /* if (_maxMode) */
+        {
+          // ---------- REP : LIT : REP_0 ----------
+          // numFastBytes + 1 + numFastBytes
+
+          unsigned len2 = len + 1;
+          unsigned limit = len2 + p->numFastBytes;
+          if (limit > numAvailFull)
+            limit = numAvailFull;
+          
+          len2 += 2;
+          if (len2 <= limit)
+          if (data[len2 - 2] == data2[len2 - 2])
+          if (data[len2 - 1] == data2[len2 - 1])
+          {
+            unsigned state2 = kRepNextStates[state];
+            unsigned posState2 = (position + len) & p->pbMask;
+            price += GET_PRICE_LEN(&p->repLenEnc, posState, len)
+                + GET_PRICE_0(p->isMatch[state2][posState2])
+                + LitEnc_Matched_GetPrice(LIT_PROBS(position + len, data[(size_t)len - 1]),
+                    data[len], data2[len], p->ProbPrices);
+            
+            // state2 = kLiteralNextStates[state2];
+            state2 = kState_LitAfterRep;
+            posState2 = (posState2 + 1) & p->pbMask;
+
+
+            price += GetPrice_Rep_0(p, state2, posState2);
+
+          for (; len2 < limit && data[len2] == data2[len2]; len2++)
+          {}
+          
+          len2 -= len;
+          // if (len2 >= 3)
+          {
+            {
+              unsigned offset = cur + len + len2;
+
+              if (last < offset)
+                last = offset;
+              // do
+              {
+                UInt32 price2;
+                COptimal *opt;
+                len2--;
+                // price2 = price + GetPrice_Len_Rep_0(p, len2, state2, posState2);
+                price2 = price + GET_PRICE_LEN(&p->repLenEnc, posState2, len2);
+
+                opt = &p->opt[offset];
+                // offset--;
+                if (price2 < opt->price)
+                {
+                  opt->price = price2;
+                  opt->len = (UInt32)len2;
+                  opt->extra = (CExtra)(len + 1);
+                  opt->dist = (UInt32)repIndex;
+                }
+              }
+              // while (len2 >= 3);
+            }
+          }
+          }
+        }
+      }
+    }
+
+
+    // ---------- MATCH ----------
+    /* for (unsigned len = 2; len <= newLen; len++) */
+    if (newLen > numAvail)
+    {
+      newLen = numAvail;
+      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
+      matches[numPairs] = (UInt32)newLen;
+      numPairs += 2;
+    }
+    
+    // startLen = 2; /* speed optimization */
+
+    if (newLen >= startLen)
+    {
+      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
+      UInt32 dist;
+      unsigned offs, posSlot, len;
+      
+      {
+        unsigned offset = cur + newLen;
+        if (last < offset)
+          last = offset;
+      }
+
+      offs = 0;
+      while (startLen > matches[offs])
+        offs += 2;
+      dist = matches[(size_t)offs + 1];
+      
+      // if (dist >= kNumFullDistances)
+      GetPosSlot2(dist, posSlot);
+      
+      for (len = /*2*/ startLen; ; len++)
+      {
+        UInt32 price = normalMatchPrice + GET_PRICE_LEN(&p->lenEnc, posState, len);
+        {
+          COptimal *opt;
+          unsigned lenNorm = len - 2;
+          lenNorm = GetLenToPosState2(lenNorm);
+          if (dist < kNumFullDistances)
+            price += p->distancesPrices[lenNorm][dist & (kNumFullDistances - 1)];
+          else
+            price += p->posSlotPrices[lenNorm][posSlot] + p->alignPrices[dist & kAlignMask];
+          
+          opt = &p->opt[cur + len];
+          if (price < opt->price)
+          {
+            opt->price = price;
+            opt->len = (UInt32)len;
+            opt->dist = dist + LZMA_NUM_REPS;
+            opt->extra = 0;
+          }
+        }
+
+        if (len == matches[offs])
+        {
+          // if (p->_maxMode) {
+          // MATCH : LIT : REP_0
+
+          const Byte *data2 = data - dist - 1;
+          unsigned len2 = len + 1;
+          unsigned limit = len2 + p->numFastBytes;
+          if (limit > numAvailFull)
+            limit = numAvailFull;
+          
+          len2 += 2;
+          if (len2 <= limit)
+          if (data[len2 - 2] == data2[len2 - 2])
+          if (data[len2 - 1] == data2[len2 - 1])
+          {
+          for (; len2 < limit && data[len2] == data2[len2]; len2++)
+          {}
+          
+          len2 -= len;
+          
+          // if (len2 >= 3)
+          {
+            unsigned state2 = kMatchNextStates[state];
+            unsigned posState2 = (position + len) & p->pbMask;
+            unsigned offset;
+            price += GET_PRICE_0(p->isMatch[state2][posState2]);
+            price += LitEnc_Matched_GetPrice(LIT_PROBS(position + len, data[(size_t)len - 1]),
+                    data[len], data2[len], p->ProbPrices);
+
+            // state2 = kLiteralNextStates[state2];
+            state2 = kState_LitAfterMatch;
+
+            posState2 = (posState2 + 1) & p->pbMask;
+            price += GetPrice_Rep_0(p, state2, posState2);
+
+            offset = cur + len + len2;
+
+            if (last < offset)
+              last = offset;
+            // do
+            {
+              UInt32 price2;
+              COptimal *opt;
+              len2--;
+              // price2 = price + GetPrice_Len_Rep_0(p, len2, state2, posState2);
+              price2 = price + GET_PRICE_LEN(&p->repLenEnc, posState2, len2);
+              opt = &p->opt[offset];
+              // offset--;
+              if (price2 < opt->price)
+              {
+                opt->price = price2;
+                opt->len = (UInt32)len2;
+                opt->extra = (CExtra)(len + 1);
+                opt->dist = dist + LZMA_NUM_REPS;
+              }
+            }
+            // while (len2 >= 3);
+          }
+
+          }
+        
+          offs += 2;
+          if (offs == numPairs)
+            break;
+          dist = matches[(size_t)offs + 1];
+          // if (dist >= kNumFullDistances)
+            GetPosSlot2(dist, posSlot);
+        }
+      }
+    }
+  }
+
+  do
+    p->opt[last].price = kInfinityPrice;
+  while (--last);
+
+  return Backward(p, cur);
+}
+
+
+
+#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
+
+
+
+static unsigned GetOptimumFast(CLzmaEnc *p)
+{
+  UInt32 numAvail, mainDist;
+  unsigned mainLen, numPairs, repIndex, repLen, i;
+  const Byte *data;
+
+  if (p->additionalOffset == 0)
+    mainLen = ReadMatchDistances(p, &numPairs);
+  else
+  {
+    mainLen = p->longestMatchLen;
+    numPairs = p->numPairs;
+  }
+
+  numAvail = p->numAvail;
+  p->backRes = MARK_LIT;
+  if (numAvail < 2)
+    return 1;
+  // if (mainLen < 2 && p->state == 0) return 1; // 18.06.notused
+  if (numAvail > LZMA_MATCH_LEN_MAX)
+    numAvail = LZMA_MATCH_LEN_MAX;
+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
+  repLen = repIndex = 0;
+  
+  for (i = 0; i < LZMA_NUM_REPS; i++)
+  {
+    unsigned len;
+    const Byte *data2 = data - p->reps[i];
+    if (data[0] != data2[0] || data[1] != data2[1])
+      continue;
+    for (len = 2; len < numAvail && data[len] == data2[len]; len++)
+    {}
+    if (len >= p->numFastBytes)
+    {
+      p->backRes = (UInt32)i;
+      MOVE_POS(p, len - 1)
+      return len;
+    }
+    if (len > repLen)
+    {
+      repIndex = i;
+      repLen = len;
+    }
+  }
+
+  if (mainLen >= p->numFastBytes)
+  {
+    p->backRes = p->matches[(size_t)numPairs - 1] + LZMA_NUM_REPS;
+    MOVE_POS(p, mainLen - 1)
+    return mainLen;
+  }
+
+  mainDist = 0; /* for GCC */
+  
+  if (mainLen >= 2)
+  {
+    mainDist = p->matches[(size_t)numPairs - 1];
+    while (numPairs > 2)
+    {
+      UInt32 dist2;
+      if (mainLen != p->matches[(size_t)numPairs - 4] + 1)
+        break;
+      dist2 = p->matches[(size_t)numPairs - 3];
+      if (!ChangePair(dist2, mainDist))
+        break;
+      numPairs -= 2;
+      mainLen--;
+      mainDist = dist2;
+    }
+    if (mainLen == 2 && mainDist >= 0x80)
+      mainLen = 1;
+  }
+
+  if (repLen >= 2)
+    if (    repLen + 1 >= mainLen
+        || (repLen + 2 >= mainLen && mainDist >= (1 << 9))
+        || (repLen + 3 >= mainLen && mainDist >= (1 << 15)))
+  {
+    p->backRes = (UInt32)repIndex;
+    MOVE_POS(p, repLen - 1)
+    return repLen;
+  }
+  
+  if (mainLen < 2 || numAvail <= 2)
+    return 1;
+
+  {
+    unsigned len1 = ReadMatchDistances(p, &p->numPairs);
+    p->longestMatchLen = len1;
+  
+    if (len1 >= 2)
+    {
+      UInt32 newDist = p->matches[(size_t)p->numPairs - 1];
+      if (   (len1 >= mainLen && newDist < mainDist)
+          || (len1 == mainLen + 1 && !ChangePair(mainDist, newDist))
+          || (len1 >  mainLen + 1)
+          || (len1 + 1 >= mainLen && mainLen >= 3 && ChangePair(newDist, mainDist)))
+        return 1;
+    }
+  }
+  
+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
+  
+  for (i = 0; i < LZMA_NUM_REPS; i++)
+  {
+    unsigned len, limit;
+    const Byte *data2 = data - p->reps[i];
+    if (data[0] != data2[0] || data[1] != data2[1])
+      continue;
+    limit = mainLen - 1;
+    for (len = 2;; len++)
+    {
+      if (len >= limit)
+        return 1;
+      if (data[len] != data2[len])
+        break;
+    }
+  }
+  
+  p->backRes = mainDist + LZMA_NUM_REPS;
+  if (mainLen != 2)
+  {
+    MOVE_POS(p, mainLen - 2)
+  }
+  return mainLen;
+}
+
+
+
+
+static void WriteEndMarker(CLzmaEnc *p, unsigned posState)
+{
+  UInt32 range;
+  range = p->rc.range;
+  {
+    UInt32 ttt, newBound;
+    CLzmaProb *prob = &p->isMatch[p->state][posState];
+    RC_BIT_PRE(&p->rc, prob)
+    RC_BIT_1(&p->rc, prob)
+    prob = &p->isRep[p->state];
+    RC_BIT_PRE(&p->rc, prob)
+    RC_BIT_0(&p->rc, prob)
+  }
+  p->state = kMatchNextStates[p->state];
+  
+  p->rc.range = range;
+  LenEnc_Encode(&p->lenProbs, &p->rc, 0, posState);
+  range = p->rc.range;
+
+  {
+    // RcTree_Encode_PosSlot(&p->rc, p->posSlotEncoder[0], (1 << kNumPosSlotBits) - 1);
+    CLzmaProb *probs = p->posSlotEncoder[0];
+    unsigned m = 1;
+    do
+    {
+      UInt32 ttt, newBound;
+      RC_BIT_PRE(p, probs + m)
+      RC_BIT_1(&p->rc, probs + m);
+      m = (m << 1) + 1;
+    }
+    while (m < (1 << kNumPosSlotBits));
+  }
+  {
+    // RangeEnc_EncodeDirectBits(&p->rc, ((UInt32)1 << (30 - kNumAlignBits)) - 1, 30 - kNumAlignBits);    UInt32 range = p->range;
+    unsigned numBits = 30 - kNumAlignBits;
+    do
+    {
+      range >>= 1;
+      p->rc.low += range;
+      RC_NORM(&p->rc)
+    }
+    while (--numBits);
+  }
+   
+  {
+    // RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
+    CLzmaProb *probs = p->posAlignEncoder;
+    unsigned m = 1;
+    do
+    {
+      UInt32 ttt, newBound;
+      RC_BIT_PRE(p, probs + m)
+      RC_BIT_1(&p->rc, probs + m);
+      m = (m << 1) + 1;
+    }
+    while (m < kAlignTableSize);
+  }
+  p->rc.range = range;
+}
+
+
+static SRes CheckErrors(CLzmaEnc *p)
+{
+  if (p->result != SZ_OK)
+    return p->result;
+  if (p->rc.res != SZ_OK)
+    p->result = SZ_ERROR_WRITE;
+  if (p->matchFinderBase.result != SZ_OK)
+    p->result = SZ_ERROR_READ;
+  if (p->result != SZ_OK)
+    p->finished = True;
+  return p->result;
+}
+
+
+MY_NO_INLINE static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
+{
+  /* ReleaseMFStream(); */
+  p->finished = True;
+  if (p->writeEndMark)
+    WriteEndMarker(p, nowPos & p->pbMask);
+  RangeEnc_FlushData(&p->rc);
+  RangeEnc_FlushStream(&p->rc);
+  return CheckErrors(p);
+}
+
+
+MY_NO_INLINE static void FillAlignPrices(CLzmaEnc *p)
+{
+  unsigned i;
+  const CProbPrice *ProbPrices = p->ProbPrices;
+  const CLzmaProb *probs = p->posAlignEncoder;
+  // p->alignPriceCount = 0;
+  for (i = 0; i < kAlignTableSize / 2; i++)
+  {
+    UInt32 price = 0;
+    unsigned sym = i;
+    unsigned m = 1;
+    unsigned bit;
+    UInt32 prob;
+    bit = sym & 1; sym >>= 1; price += GET_PRICEa(probs[m], bit); m = (m << 1) + bit;
+    bit = sym & 1; sym >>= 1; price += GET_PRICEa(probs[m], bit); m = (m << 1) + bit;
+    bit = sym & 1; sym >>= 1; price += GET_PRICEa(probs[m], bit); m = (m << 1) + bit;
+    prob = probs[m];
+    p->alignPrices[i    ] = price + GET_PRICEa_0(prob);
+    p->alignPrices[i + 8] = price + GET_PRICEa_1(prob);
+    // p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
+  }
+}
+
+
+MY_NO_INLINE static void FillDistancesPrices(CLzmaEnc *p)
+{
+  // int y; for (y = 0; y < 100; y++) {
+
+  UInt32 tempPrices[kNumFullDistances];
+  unsigned i, lps;
+
+  const CProbPrice *ProbPrices = p->ProbPrices;
+  p->matchPriceCount = 0;
+
+  for (i = kStartPosModelIndex / 2; i < kNumFullDistances / 2; i++)
+  {
+    unsigned posSlot = GetPosSlot1(i);
+    unsigned footerBits = (posSlot >> 1) - 1;
+    unsigned base = ((2 | (posSlot & 1)) << footerBits);
+    const CLzmaProb *probs = p->posEncoders + (size_t)base * 2;
+    // tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base, footerBits, i - base, p->ProbPrices);
+    UInt32 price = 0;
+    unsigned m = 1;
+    unsigned sym = i;
+    unsigned offset = (unsigned)1 << footerBits;
+    base += i;
+    
+    if (footerBits)
+    do
+    {
+      unsigned bit = sym & 1;
+      sym >>= 1;
+      price += GET_PRICEa(probs[m], bit);
+      m = (m << 1) + bit;
+    }
+    while (--footerBits);
+
+    {
+      unsigned prob = probs[m];
+      tempPrices[base         ] = price + GET_PRICEa_0(prob);
+      tempPrices[base + offset] = price + GET_PRICEa_1(prob);
+    }
+  }
+
+  for (lps = 0; lps < kNumLenToPosStates; lps++)
+  {
+    unsigned slot;
+    unsigned distTableSize2 = (p->distTableSize + 1) >> 1;
+    UInt32 *posSlotPrices = p->posSlotPrices[lps];
+    const CLzmaProb *probs = p->posSlotEncoder[lps];
+    
+    for (slot = 0; slot < distTableSize2; slot++)
+    {
+      // posSlotPrices[slot] = RcTree_GetPrice(encoder, kNumPosSlotBits, slot, p->ProbPrices);
+      UInt32 price;
+      unsigned bit;
+      unsigned sym = slot + (1 << (kNumPosSlotBits - 1));
+      unsigned prob;
+      bit = sym & 1; sym >>= 1; price  = GET_PRICEa(probs[sym], bit);
+      bit = sym & 1; sym >>= 1; price += GET_PRICEa(probs[sym], bit);
+      bit = sym & 1; sym >>= 1; price += GET_PRICEa(probs[sym], bit);
+      bit = sym & 1; sym >>= 1; price += GET_PRICEa(probs[sym], bit);
+      bit = sym & 1; sym >>= 1; price += GET_PRICEa(probs[sym], bit);
+      prob = probs[(size_t)slot + (1 << (kNumPosSlotBits - 1))];
+      posSlotPrices[(size_t)slot * 2    ] = price + GET_PRICEa_0(prob);
+      posSlotPrices[(size_t)slot * 2 + 1] = price + GET_PRICEa_1(prob);
+    }
+    
+    {
+      UInt32 delta = ((UInt32)((kEndPosModelIndex / 2 - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
+      for (slot = kEndPosModelIndex / 2; slot < distTableSize2; slot++)
+      {
+        posSlotPrices[(size_t)slot * 2    ] += delta;
+        posSlotPrices[(size_t)slot * 2 + 1] += delta;
+        delta += ((UInt32)1 << kNumBitPriceShiftBits);
+      }
+    }
+
+    {
+      UInt32 *dp = p->distancesPrices[lps];
+      
+      dp[0] = posSlotPrices[0];
+      dp[1] = posSlotPrices[1];
+      dp[2] = posSlotPrices[2];
+      dp[3] = posSlotPrices[3];
+
+      for (i = 4; i < kNumFullDistances; i += 2)
+      {
+        UInt32 slotPrice = posSlotPrices[GetPosSlot1(i)];
+        dp[i    ] = slotPrice + tempPrices[i];
+        dp[i + 1] = slotPrice + tempPrices[i + 1];
+      }
+    }
+  }
+  // }
+}
+
+
+
+void LzmaEnc_Construct(CLzmaEnc *p)
+{
+  RangeEnc_Construct(&p->rc);
+  MatchFinder_Construct(&p->matchFinderBase);
+  
+  #ifndef _7ZIP_ST
+  MatchFinderMt_Construct(&p->matchFinderMt);
+  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
+  #endif
+
+  {
+    CLzmaEncProps props;
+    LzmaEncProps_Init(&props);
+    LzmaEnc_SetProps(p, &props);
+  }
+
+  #ifndef LZMA_LOG_BSR
+  LzmaEnc_FastPosInit(p->g_FastPos);
+  #endif
+
+  LzmaEnc_InitPriceTables(p->ProbPrices);
+  p->litProbs = NULL;
+  p->saveState.litProbs = NULL;
+
+}
+
+CLzmaEncHandle LzmaEnc_Create(ISzAllocPtr alloc)
+{
+  void *p;
+  p = ISzAlloc_Alloc(alloc, sizeof(CLzmaEnc));
+  if (p)
+    LzmaEnc_Construct((CLzmaEnc *)p);
+  return p;
+}
+
+void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->litProbs);
+  ISzAlloc_Free(alloc, p->saveState.litProbs);
+  p->litProbs = NULL;
+  p->saveState.litProbs = NULL;
+}
+
+void LzmaEnc_Destruct(CLzmaEnc *p, ISzAllocPtr alloc, ISzAllocPtr allocBig)
+{
+  #ifndef _7ZIP_ST
+  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
+  #endif
+  
+  MatchFinder_Free(&p->matchFinderBase, allocBig);
+  LzmaEnc_FreeLits(p, alloc);
+  RangeEnc_Free(&p->rc, alloc);
+}
+
+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAllocPtr alloc, ISzAllocPtr allocBig)
+{
+  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
+  ISzAlloc_Free(alloc, p);
+}
+
+
+static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, UInt32 maxPackSize, UInt32 maxUnpackSize)
+{
+  UInt32 nowPos32, startPos32;
+  if (p->needInit)
+  {
+    p->matchFinder.Init(p->matchFinderObj);
+    p->needInit = 0;
+  }
+
+  if (p->finished)
+    return p->result;
+  RINOK(CheckErrors(p));
+
+  nowPos32 = (UInt32)p->nowPos64;
+  startPos32 = nowPos32;
+
+  if (p->nowPos64 == 0)
+  {
+    unsigned numPairs;
+    Byte curByte;
+    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
+      return Flush(p, nowPos32);
+    ReadMatchDistances(p, &numPairs);
+    RangeEnc_EncodeBit_0(&p->rc, &p->isMatch[kState_Start][0]);
+    // p->state = kLiteralNextStates[p->state];
+    curByte = *(p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset);
+    LitEnc_Encode(&p->rc, p->litProbs, curByte);
+    p->additionalOffset--;
+    nowPos32++;
+  }
+
+  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
+  
+  for (;;)
+  {
+    UInt32 dist;
+    unsigned len, posState;
+    UInt32 range, ttt, newBound;
+    CLzmaProb *probs;
+  
+    if (p->fastMode)
+      len = GetOptimumFast(p);
+    else
+    {
+      unsigned oci = p->optCur;
+      if (p->optEnd == oci)
+        len = GetOptimum(p, nowPos32);
+      else
+      {
+        const COptimal *opt = &p->opt[oci];
+        len = opt->len;
+        p->backRes = opt->dist;
+        p->optCur = oci + 1;
+      }
+    }
+
+    posState = (unsigned)nowPos32 & p->pbMask;
+    range = p->rc.range;
+    probs = &p->isMatch[p->state][posState];
+    
+    RC_BIT_PRE(&p->rc, probs)
+    
+    dist = p->backRes;
+
+    #ifdef SHOW_STAT2
+    printf("\n pos = %6X, len = %3u  pos = %6u", nowPos32, len, dist);
+    #endif
+
+    if (dist == MARK_LIT)
+    {
+      Byte curByte;
+      const Byte *data;
+      unsigned state;
+
+      RC_BIT_0(&p->rc, probs);
+      p->rc.range = range;
+      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
+      probs = LIT_PROBS(nowPos32, *(data - 1));
+      curByte = *data;
+      state = p->state;
+      p->state = kLiteralNextStates[state];
+      if (IsLitState(state))
+        LitEnc_Encode(&p->rc, probs, curByte);
+      else
+        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0]));
+    }
+    else
+    {
+      RC_BIT_1(&p->rc, probs);
+      probs = &p->isRep[p->state];
+      RC_BIT_PRE(&p->rc, probs)
+      
+      if (dist < LZMA_NUM_REPS)
+      {
+        RC_BIT_1(&p->rc, probs);
+        probs = &p->isRepG0[p->state];
+        RC_BIT_PRE(&p->rc, probs)
+        if (dist == 0)
+        {
+          RC_BIT_0(&p->rc, probs);
+          probs = &p->isRep0Long[p->state][posState];
+          RC_BIT_PRE(&p->rc, probs)
+          if (len != 1)
+          {
+            RC_BIT_1_BASE(&p->rc, probs);
+          }
+          else
+          {
+            RC_BIT_0_BASE(&p->rc, probs);
+            p->state = kShortRepNextStates[p->state];
+          }
+        }
+        else
+        {
+          RC_BIT_1(&p->rc, probs);
+          probs = &p->isRepG1[p->state];
+          RC_BIT_PRE(&p->rc, probs)
+          if (dist == 1)
+          {
+            RC_BIT_0_BASE(&p->rc, probs);
+            dist = p->reps[1];
+          }
+          else
+          {
+            RC_BIT_1(&p->rc, probs);
+            probs = &p->isRepG2[p->state];
+            RC_BIT_PRE(&p->rc, probs)
+            if (dist == 2)
+            {
+              RC_BIT_0_BASE(&p->rc, probs);
+              dist = p->reps[2];
+            }
+            else
+            {
+              RC_BIT_1_BASE(&p->rc, probs);
+              dist = p->reps[3];
+              p->reps[3] = p->reps[2];
+            }
+            p->reps[2] = p->reps[1];
+          }
+          p->reps[1] = p->reps[0];
+          p->reps[0] = dist;
+        }
+
+        RC_NORM(&p->rc)
+
+        p->rc.range = range;
+
+        if (len != 1)
+        {
+          LenEnc_Encode(&p->repLenProbs, &p->rc, len - LZMA_MATCH_LEN_MIN, posState);
+          --p->repLenEncCounter;
+          p->state = kRepNextStates[p->state];
+        }
+      }
+      else
+      {
+        unsigned posSlot;
+        RC_BIT_0(&p->rc, probs);
+        p->rc.range = range;
+        p->state = kMatchNextStates[p->state];
+
+        LenEnc_Encode(&p->lenProbs, &p->rc, len - LZMA_MATCH_LEN_MIN, posState);
+        // --p->lenEnc.counter;
+
+        dist -= LZMA_NUM_REPS;
+        p->reps[3] = p->reps[2];
+        p->reps[2] = p->reps[1];
+        p->reps[1] = p->reps[0];
+        p->reps[0] = dist + 1;
+        
+        p->matchPriceCount++;
+        GetPosSlot(dist, posSlot);
+        // RcTree_Encode_PosSlot(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], posSlot);
+        {
+          UInt32 sym = (UInt32)posSlot + (1 << kNumPosSlotBits);
+          range = p->rc.range;
+          probs = p->posSlotEncoder[GetLenToPosState(len)];
+          do
+          {
+            CLzmaProb *prob = probs + (sym >> kNumPosSlotBits);
+            UInt32 bit = (sym >> (kNumPosSlotBits - 1)) & 1;
+            sym <<= 1;
+            RC_BIT(&p->rc, prob, bit);
+          }
+          while (sym < (1 << kNumPosSlotBits * 2));
+          p->rc.range = range;
+        }
+        
+        if (dist >= kStartPosModelIndex)
+        {
+          unsigned footerBits = ((posSlot >> 1) - 1);
+
+          if (dist < kNumFullDistances)
+          {
+            unsigned base = ((2 | (posSlot & 1)) << footerBits);
+            RcTree_ReverseEncode(&p->rc, p->posEncoders + base, footerBits, (unsigned)(dist /* - base */));
+          }
+          else
+          {
+            UInt32 pos2 = (dist | 0xF) << (32 - footerBits);
+            range = p->rc.range;
+            // RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
+            /*
+            do
+            {
+              range >>= 1;
+              p->rc.low += range & (0 - ((dist >> --footerBits) & 1));
+              RC_NORM(&p->rc)
+            }
+            while (footerBits > kNumAlignBits);
+            */
+            do
+            {
+              range >>= 1;
+              p->rc.low += range & (0 - (pos2 >> 31));
+              pos2 += pos2;
+              RC_NORM(&p->rc)
+            }
+            while (pos2 != 0xF0000000);
+
+
+            // RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
+
+            {
+              unsigned m = 1;
+              unsigned bit;
+              bit = dist & 1; dist >>= 1; RC_BIT(&p->rc, p->posAlignEncoder + m, bit); m = (m << 1) + bit;
+              bit = dist & 1; dist >>= 1; RC_BIT(&p->rc, p->posAlignEncoder + m, bit); m = (m << 1) + bit;
+              bit = dist & 1; dist >>= 1; RC_BIT(&p->rc, p->posAlignEncoder + m, bit); m = (m << 1) + bit;
+              bit = dist & 1;             RC_BIT(&p->rc, p->posAlignEncoder + m, bit);
+              p->rc.range = range;
+              // p->alignPriceCount++;
+            }
+          }
+        }
+      }
+    }
+
+    nowPos32 += (UInt32)len;
+    p->additionalOffset -= len;
+    
+    if (p->additionalOffset == 0)
+    {
+      UInt32 processed;
+
+      if (!p->fastMode)
+      {
+        /*
+        if (p->alignPriceCount >= 16) // kAlignTableSize
+          FillAlignPrices(p);
+        if (p->matchPriceCount >= 128)
+          FillDistancesPrices(p);
+        if (p->lenEnc.counter <= 0)
+          LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, &p->lenProbs, p->ProbPrices);
+        */
+        if (p->matchPriceCount >= 64)
+        {
+          FillAlignPrices(p);
+          // { int y; for (y = 0; y < 100; y++) {
+          FillDistancesPrices(p);
+          // }}
+          LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, &p->lenProbs, p->ProbPrices);
+        }
+        if (p->repLenEncCounter <= 0)
+        {
+          p->repLenEncCounter = REP_LEN_COUNT;
+          LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, &p->repLenProbs, p->ProbPrices);
+        }
+      }
+    
+      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
+        break;
+      processed = nowPos32 - startPos32;
+      
+      if (maxPackSize)
+      {
+        if (processed + kNumOpts + 300 >= maxUnpackSize
+            || RangeEnc_GetProcessed_sizet(&p->rc) + kPackReserve >= maxPackSize)
+          break;
+      }
+      else if (processed >= (1 << 17))
+      {
+        p->nowPos64 += nowPos32 - startPos32;
+        return CheckErrors(p);
+      }
+    }
+  }
+
+  p->nowPos64 += nowPos32 - startPos32;
+  return Flush(p, nowPos32);
+}
+
+
+
+#define kBigHashDicLimit ((UInt32)1 << 24)
+
+static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAllocPtr alloc, ISzAllocPtr allocBig)
+{
+  UInt32 beforeSize = kNumOpts;
+  if (!RangeEnc_Alloc(&p->rc, alloc))
+    return SZ_ERROR_MEM;
+
+  #ifndef _7ZIP_ST
+  p->mtMode = (p->multiThread && !p->fastMode && (p->matchFinderBase.btMode != 0));
+  #endif
+
+  {
+    unsigned lclp = p->lc + p->lp;
+    if (!p->litProbs || !p->saveState.litProbs || p->lclp != lclp)
+    {
+      LzmaEnc_FreeLits(p, alloc);
+      p->litProbs = (CLzmaProb *)ISzAlloc_Alloc(alloc, ((UInt32)0x300 << lclp) * sizeof(CLzmaProb));
+      p->saveState.litProbs = (CLzmaProb *)ISzAlloc_Alloc(alloc, ((UInt32)0x300 << lclp) * sizeof(CLzmaProb));
+      if (!p->litProbs || !p->saveState.litProbs)
+      {
+        LzmaEnc_FreeLits(p, alloc);
+        return SZ_ERROR_MEM;
+      }
+      p->lclp = lclp;
+    }
+  }
+
+  p->matchFinderBase.bigHash = (Byte)(p->dictSize > kBigHashDicLimit ? 1 : 0);
+
+  if (beforeSize + p->dictSize < keepWindowSize)
+    beforeSize = keepWindowSize - p->dictSize;
+
+  #ifndef _7ZIP_ST
+  if (p->mtMode)
+  {
+    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes,
+        LZMA_MATCH_LEN_MAX
+        + 1  /* 18.04 */
+        , allocBig));
+    p->matchFinderObj = &p->matchFinderMt;
+    p->matchFinderBase.bigHash = (Byte)(
+        (p->dictSize > kBigHashDicLimit && p->matchFinderBase.hashMask >= 0xFFFFFF) ? 1 : 0);
+    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
+  }
+  else
+  #endif
+  {
+    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
+      return SZ_ERROR_MEM;
+    p->matchFinderObj = &p->matchFinderBase;
+    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
+  }
+  
+  return SZ_OK;
+}
+
+void LzmaEnc_Init(CLzmaEnc *p)
+{
+  unsigned i;
+  p->state = 0;
+  p->reps[0] =
+  p->reps[1] =
+  p->reps[2] =
+  p->reps[3] = 1;
+
+  RangeEnc_Init(&p->rc);
+
+  for (i = 0; i < (1 << kNumAlignBits); i++)
+    p->posAlignEncoder[i] = kProbInitValue;
+
+  for (i = 0; i < kNumStates; i++)
+  {
+    unsigned j;
+    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
+    {
+      p->isMatch[i][j] = kProbInitValue;
+      p->isRep0Long[i][j] = kProbInitValue;
+    }
+    p->isRep[i] = kProbInitValue;
+    p->isRepG0[i] = kProbInitValue;
+    p->isRepG1[i] = kProbInitValue;
+    p->isRepG2[i] = kProbInitValue;
+  }
+
+  {
+    for (i = 0; i < kNumLenToPosStates; i++)
+    {
+      CLzmaProb *probs = p->posSlotEncoder[i];
+      unsigned j;
+      for (j = 0; j < (1 << kNumPosSlotBits); j++)
+        probs[j] = kProbInitValue;
+    }
+  }
+  {
+    for (i = 0; i < kNumFullDistances; i++)
+      p->posEncoders[i] = kProbInitValue;
+  }
+
+  {
+    UInt32 num = (UInt32)0x300 << (p->lp + p->lc);
+    UInt32 k;
+    CLzmaProb *probs = p->litProbs;
+    for (k = 0; k < num; k++)
+      probs[k] = kProbInitValue;
+  }
+
+
+  LenEnc_Init(&p->lenProbs);
+  LenEnc_Init(&p->repLenProbs);
+
+  p->optEnd = 0;
+  p->optCur = 0;
+
+  {
+    for (i = 0; i < kNumOpts; i++)
+      p->opt[i].price = kInfinityPrice;
+  }
+
+  p->additionalOffset = 0;
+
+  p->pbMask = (1 << p->pb) - 1;
+  p->lpMask = ((UInt32)0x100 << p->lp) - ((unsigned)0x100 >> p->lc);
+}
+
+
+void LzmaEnc_InitPrices(CLzmaEnc *p)
+{
+  if (!p->fastMode)
+  {
+    FillDistancesPrices(p);
+    FillAlignPrices(p);
+  }
+
+  p->lenEnc.tableSize =
+  p->repLenEnc.tableSize =
+      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
+
+  p->repLenEncCounter = REP_LEN_COUNT;
+
+  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, &p->lenProbs, p->ProbPrices);
+  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, &p->repLenProbs, p->ProbPrices);
+}
+
+static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAllocPtr alloc, ISzAllocPtr allocBig)
+{
+  unsigned i;
+  for (i = kEndPosModelIndex / 2; i < kDicLogSizeMax; i++)
+    if (p->dictSize <= ((UInt32)1 << i))
+      break;
+  p->distTableSize = i * 2;
+
+  p->finished = False;
+  p->result = SZ_OK;
+  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
+  LzmaEnc_Init(p);
+  LzmaEnc_InitPrices(p);
+  p->nowPos64 = 0;
+  return SZ_OK;
+}
+
+static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
+    ISzAllocPtr alloc, ISzAllocPtr allocBig)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  p->matchFinderBase.stream = inStream;
+  p->needInit = 1;
+  p->rc.outStream = outStream;
+  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
+}
+
+SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
+    ISeqInStream *inStream, UInt32 keepWindowSize,
+    ISzAllocPtr alloc, ISzAllocPtr allocBig)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  p->matchFinderBase.stream = inStream;
+  p->needInit = 1;
+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+}
+
+static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
+{
+  p->matchFinderBase.directInput = 1;
+  p->matchFinderBase.bufferBase = (Byte *)src;
+  p->matchFinderBase.directInputRem = srcLen;
+}
+
+SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
+    UInt32 keepWindowSize, ISzAllocPtr alloc, ISzAllocPtr allocBig)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  LzmaEnc_SetInputBuf(p, src, srcLen);
+  p->needInit = 1;
+
+  LzmaEnc_SetDataSize(pp, srcLen);
+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
+}
+
+void LzmaEnc_Finish(CLzmaEncHandle pp)
+{
+  #ifndef _7ZIP_ST
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  if (p->mtMode)
+    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
+  #else
+  UNUSED_VAR(pp);
+  #endif
+}
+
+
+typedef struct
+{
+  ISeqOutStream vt;
+  Byte *data;
+  SizeT rem;
+  BoolInt overflow;
+} CLzmaEnc_SeqOutStreamBuf;
+
+static size_t SeqOutStreamBuf_Write(const ISeqOutStream *pp, const void *data, size_t size)
+{
+  CLzmaEnc_SeqOutStreamBuf *p = CONTAINER_FROM_VTBL(pp, CLzmaEnc_SeqOutStreamBuf, vt);
+  if (p->rem < size)
+  {
+    size = p->rem;
+    p->overflow = True;
+  }
+  memcpy(p->data, data, size);
+  p->rem -= size;
+  p->data += size;
+  return size;
+}
+
+
+UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
+{
+  const CLzmaEnc *p = (CLzmaEnc *)pp;
+  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
+}
+
+
+const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
+{
+  const CLzmaEnc *p = (CLzmaEnc *)pp;
+  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
+}
+
+
+SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, BoolInt reInit,
+    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  UInt64 nowPos64;
+  SRes res;
+  CLzmaEnc_SeqOutStreamBuf outStream;
+
+  outStream.vt.Write = SeqOutStreamBuf_Write;
+  outStream.data = dest;
+  outStream.rem = *destLen;
+  outStream.overflow = False;
+
+  p->writeEndMark = False;
+  p->finished = False;
+  p->result = SZ_OK;
+
+  if (reInit)
+    LzmaEnc_Init(p);
+  LzmaEnc_InitPrices(p);
+
+  nowPos64 = p->nowPos64;
+  RangeEnc_Init(&p->rc);
+  p->rc.outStream = &outStream.vt;
+
+  if (desiredPackSize == 0)
+    return SZ_ERROR_OUTPUT_EOF;
+
+  res = LzmaEnc_CodeOneBlock(p, desiredPackSize, *unpackSize);
+  
+  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
+  *destLen -= outStream.rem;
+  if (outStream.overflow)
+    return SZ_ERROR_OUTPUT_EOF;
+
+  return res;
+}
+
+
+static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
+{
+  SRes res = SZ_OK;
+
+  #ifndef _7ZIP_ST
+  Byte allocaDummy[0x300];
+  allocaDummy[0] = 0;
+  allocaDummy[1] = allocaDummy[0];
+  #endif
+
+  for (;;)
+  {
+    res = LzmaEnc_CodeOneBlock(p, 0, 0);
+    if (res != SZ_OK || p->finished)
+      break;
+    if (progress)
+    {
+      res = ICompressProgress_Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
+      if (res != SZ_OK)
+      {
+        res = SZ_ERROR_PROGRESS;
+        break;
+      }
+    }
+  }
+  
+  LzmaEnc_Finish(p);
+
+  /*
+  if (res == SZ_OK && !Inline_MatchFinder_IsFinishedOK(&p->matchFinderBase))
+    res = SZ_ERROR_FAIL;
+  }
+  */
+
+  return res;
+}
+
+
+SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
+    ISzAllocPtr alloc, ISzAllocPtr allocBig)
+{
+  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
+  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
+}
+
+
+SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
+{
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+  unsigned i;
+  UInt32 dictSize = p->dictSize;
+  if (*size < LZMA_PROPS_SIZE)
+    return SZ_ERROR_PARAM;
+  *size = LZMA_PROPS_SIZE;
+  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
+
+  if (dictSize >= ((UInt32)1 << 22))
+  {
+    UInt32 kDictMask = ((UInt32)1 << 20) - 1;
+    if (dictSize < (UInt32)0xFFFFFFFF - kDictMask)
+      dictSize = (dictSize + kDictMask) & ~kDictMask;
+  }
+  else for (i = 11; i <= 30; i++)
+  {
+    if (dictSize <= ((UInt32)2 << i)) { dictSize = (2 << i); break; }
+    if (dictSize <= ((UInt32)3 << i)) { dictSize = (3 << i); break; }
+  }
+
+  for (i = 0; i < 4; i++)
+    props[1 + i] = (Byte)(dictSize >> (8 * i));
+  return SZ_OK;
+}
+
+
+unsigned LzmaEnc_IsWriteEndMark(CLzmaEncHandle pp)
+{
+  return ((CLzmaEnc *)pp)->writeEndMark;
+}
+
+
+SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+    int writeEndMark, ICompressProgress *progress, ISzAllocPtr alloc, ISzAllocPtr allocBig)
+{
+  SRes res;
+  CLzmaEnc *p = (CLzmaEnc *)pp;
+
+  CLzmaEnc_SeqOutStreamBuf outStream;
+
+  outStream.vt.Write = SeqOutStreamBuf_Write;
+  outStream.data = dest;
+  outStream.rem = *destLen;
+  outStream.overflow = False;
+
+  p->writeEndMark = writeEndMark;
+  p->rc.outStream = &outStream.vt;
+
+  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
+  
+  if (res == SZ_OK)
+  {
+    res = LzmaEnc_Encode2(p, progress);
+    if (res == SZ_OK && p->nowPos64 != srcLen)
+      res = SZ_ERROR_FAIL;
+  }
+
+  *destLen -= outStream.rem;
+  if (outStream.overflow)
+    return SZ_ERROR_OUTPUT_EOF;
+  return res;
+}
+
+
+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+    ICompressProgress *progress, ISzAllocPtr alloc, ISzAllocPtr allocBig)
+{
+  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
+  SRes res;
+  if (!p)
+    return SZ_ERROR_MEM;
+
+  res = LzmaEnc_SetProps(p, props);
+  if (res == SZ_OK)
+  {
+    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
+    if (res == SZ_OK)
+      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
+          writeEndMark, progress, alloc, allocBig);
+  }
+
+  LzmaEnc_Destroy(p, alloc, allocBig);
+  return res;
+}
diff --git a/3rdparty/7z/src/LzmaEnc.h b/3rdparty/7z/src/LzmaEnc.h
new file mode 100644
index 0000000000..c9938f04bc
--- /dev/null
+++ b/3rdparty/7z/src/LzmaEnc.h
@@ -0,0 +1,76 @@
+/*  LzmaEnc.h -- LZMA Encoder
+2017-07-27 : Igor Pavlov : Public domain */
+
+#ifndef __LZMA_ENC_H
+#define __LZMA_ENC_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+#define LZMA_PROPS_SIZE 5
+
+typedef struct _CLzmaEncProps
+{
+  int level;       /* 0 <= level <= 9 */
+  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
+                      (1 << 12) <= dictSize <= (3 << 29) for 64-bit version
+                      default = (1 << 24) */
+  int lc;          /* 0 <= lc <= 8, default = 3 */
+  int lp;          /* 0 <= lp <= 4, default = 0 */
+  int pb;          /* 0 <= pb <= 4, default = 2 */
+  int algo;        /* 0 - fast, 1 - normal, default = 1 */
+  int fb;          /* 5 <= fb <= 273, default = 32 */
+  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
+  int numHashBytes; /* 2, 3 or 4, default = 4 */
+  UInt32 mc;       /* 1 <= mc <= (1 << 30), default = 32 */
+  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
+  int numThreads;  /* 1 or 2, default = 2 */
+
+  UInt64 reduceSize; /* estimated size of data that will be compressed. default = (UInt64)(Int64)-1.
+                        Encoder uses this value to reduce dictionary size */
+} CLzmaEncProps;
+
+void LzmaEncProps_Init(CLzmaEncProps *p);
+void LzmaEncProps_Normalize(CLzmaEncProps *p);
+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
+
+
+/* ---------- CLzmaEncHandle Interface ---------- */
+
+/* LzmaEnc* functions can return the following exit codes:
+SRes:
+  SZ_OK           - OK
+  SZ_ERROR_MEM    - Memory allocation error
+  SZ_ERROR_PARAM  - Incorrect paramater in props
+  SZ_ERROR_WRITE  - ISeqOutStream write callback error
+  SZ_ERROR_OUTPUT_EOF - output buffer overflow - version with (Byte *) output
+  SZ_ERROR_PROGRESS - some break from progress callback
+  SZ_ERROR_THREAD - error in multithreading functions (only for Mt version)
+*/
+
+typedef void * CLzmaEncHandle;
+
+CLzmaEncHandle LzmaEnc_Create(ISzAllocPtr alloc);
+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAllocPtr alloc, ISzAllocPtr allocBig);
+
+SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
+void LzmaEnc_SetDataSize(CLzmaEncHandle p, UInt64 expectedDataSiize);
+SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
+unsigned LzmaEnc_IsWriteEndMark(CLzmaEncHandle p);
+
+SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
+    ICompressProgress *progress, ISzAllocPtr alloc, ISzAllocPtr allocBig);
+SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+    int writeEndMark, ICompressProgress *progress, ISzAllocPtr alloc, ISzAllocPtr allocBig);
+
+
+/* ---------- One Call Interface ---------- */
+
+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
+    ICompressProgress *progress, ISzAllocPtr alloc, ISzAllocPtr allocBig);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/LzmaLib.c b/3rdparty/7z/src/LzmaLib.c
new file mode 100644
index 0000000000..c10cf1a0f2
--- /dev/null
+++ b/3rdparty/7z/src/LzmaLib.c
@@ -0,0 +1,40 @@
+/* LzmaLib.c -- LZMA library wrapper
+2015-06-13 : Igor Pavlov : Public domain */
+
+#include "Alloc.h"
+#include "LzmaDec.h"
+#include "LzmaEnc.h"
+#include "LzmaLib.h"
+
+MY_STDAPI LzmaCompress(unsigned char *dest, size_t *destLen, const unsigned char *src, size_t srcLen,
+  unsigned char *outProps, size_t *outPropsSize,
+  int level, /* 0 <= level <= 9, default = 5 */
+  unsigned dictSize, /* use (1 << N) or (3 << N). 4 KB < dictSize <= 128 MB */
+  int lc, /* 0 <= lc <= 8, default = 3  */
+  int lp, /* 0 <= lp <= 4, default = 0  */
+  int pb, /* 0 <= pb <= 4, default = 2  */
+  int fb,  /* 5 <= fb <= 273, default = 32 */
+  int numThreads /* 1 or 2, default = 2 */
+)
+{
+  CLzmaEncProps props;
+  LzmaEncProps_Init(&props);
+  props.level = level;
+  props.dictSize = dictSize;
+  props.lc = lc;
+  props.lp = lp;
+  props.pb = pb;
+  props.fb = fb;
+  props.numThreads = numThreads;
+
+  return LzmaEncode(dest, destLen, src, srcLen, &props, outProps, outPropsSize, 0,
+      NULL, &g_Alloc, &g_Alloc);
+}
+
+
+MY_STDAPI LzmaUncompress(unsigned char *dest, size_t *destLen, const unsigned char *src, size_t *srcLen,
+  const unsigned char *props, size_t propsSize)
+{
+  ELzmaStatus status;
+  return LzmaDecode(dest, destLen, src, srcLen, props, (unsigned)propsSize, LZMA_FINISH_ANY, &status, &g_Alloc);
+}
diff --git a/3rdparty/7z/src/LzmaLib.h b/3rdparty/7z/src/LzmaLib.h
new file mode 100644
index 0000000000..5c35e53654
--- /dev/null
+++ b/3rdparty/7z/src/LzmaLib.h
@@ -0,0 +1,131 @@
+/* LzmaLib.h -- LZMA library interface
+2013-01-18 : Igor Pavlov : Public domain */
+
+#ifndef __LZMA_LIB_H
+#define __LZMA_LIB_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+#define MY_STDAPI int MY_STD_CALL
+
+#define LZMA_PROPS_SIZE 5
+
+/*
+RAM requirements for LZMA:
+  for compression:   (dictSize * 11.5 + 6 MB) + state_size
+  for decompression: dictSize + state_size
+    state_size = (4 + (1.5 << (lc + lp))) KB
+    by default (lc=3, lp=0), state_size = 16 KB.
+
+LZMA properties (5 bytes) format
+    Offset Size  Description
+      0     1    lc, lp and pb in encoded form.
+      1     4    dictSize (little endian).
+*/
+
+/*
+LzmaCompress
+------------
+
+outPropsSize -
+     In:  the pointer to the size of outProps buffer; *outPropsSize = LZMA_PROPS_SIZE = 5.
+     Out: the pointer to the size of written properties in outProps buffer; *outPropsSize = LZMA_PROPS_SIZE = 5.
+
+  LZMA Encoder will use defult values for any parameter, if it is
+  -1  for any from: level, loc, lp, pb, fb, numThreads
+   0  for dictSize
+  
+level - compression level: 0 <= level <= 9;
+
+  level dictSize algo  fb
+    0:    16 KB   0    32
+    1:    64 KB   0    32
+    2:   256 KB   0    32
+    3:     1 MB   0    32
+    4:     4 MB   0    32
+    5:    16 MB   1    32
+    6:    32 MB   1    32
+    7+:   64 MB   1    64
+ 
+  The default value for "level" is 5.
+
+  algo = 0 means fast method
+  algo = 1 means normal method
+
+dictSize - The dictionary size in bytes. The maximum value is
+        128 MB = (1 << 27) bytes for 32-bit version
+          1 GB = (1 << 30) bytes for 64-bit version
+     The default value is 16 MB = (1 << 24) bytes.
+     It's recommended to use the dictionary that is larger than 4 KB and
+     that can be calculated as (1 << N) or (3 << N) sizes.
+
+lc - The number of literal context bits (high bits of previous literal).
+     It can be in the range from 0 to 8. The default value is 3.
+     Sometimes lc=4 gives the gain for big files.
+
+lp - The number of literal pos bits (low bits of current position for literals).
+     It can be in the range from 0 to 4. The default value is 0.
+     The lp switch is intended for periodical data when the period is equal to 2^lp.
+     For example, for 32-bit (4 bytes) periodical data you can use lp=2. Often it's
+     better to set lc=0, if you change lp switch.
+
+pb - The number of pos bits (low bits of current position).
+     It can be in the range from 0 to 4. The default value is 2.
+     The pb switch is intended for periodical data when the period is equal 2^pb.
+
+fb - Word size (the number of fast bytes).
+     It can be in the range from 5 to 273. The default value is 32.
+     Usually, a big number gives a little bit better compression ratio and
+     slower compression process.
+
+numThreads - The number of thereads. 1 or 2. The default value is 2.
+     Fast mode (algo = 0) can use only 1 thread.
+
+Out:
+  destLen  - processed output size
+Returns:
+  SZ_OK               - OK
+  SZ_ERROR_MEM        - Memory allocation error
+  SZ_ERROR_PARAM      - Incorrect paramater
+  SZ_ERROR_OUTPUT_EOF - output buffer overflow
+  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
+*/
+
+MY_STDAPI LzmaCompress(unsigned char *dest, size_t *destLen, const unsigned char *src, size_t srcLen,
+  unsigned char *outProps, size_t *outPropsSize, /* *outPropsSize must be = 5 */
+  int level,      /* 0 <= level <= 9, default = 5 */
+  unsigned dictSize,  /* default = (1 << 24) */
+  int lc,        /* 0 <= lc <= 8, default = 3  */
+  int lp,        /* 0 <= lp <= 4, default = 0  */
+  int pb,        /* 0 <= pb <= 4, default = 2  */
+  int fb,        /* 5 <= fb <= 273, default = 32 */
+  int numThreads /* 1 or 2, default = 2 */
+  );
+
+/*
+LzmaUncompress
+--------------
+In:
+  dest     - output data
+  destLen  - output data size
+  src      - input data
+  srcLen   - input data size
+Out:
+  destLen  - processed output size
+  srcLen   - processed input size
+Returns:
+  SZ_OK                - OK
+  SZ_ERROR_DATA        - Data error
+  SZ_ERROR_MEM         - Memory allocation arror
+  SZ_ERROR_UNSUPPORTED - Unsupported properties
+  SZ_ERROR_INPUT_EOF   - it needs more bytes in input buffer (src)
+*/
+
+MY_STDAPI LzmaUncompress(unsigned char *dest, size_t *destLen, const unsigned char *src, SizeT *srcLen,
+  const unsigned char *props, size_t propsSize);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/MtCoder.c b/3rdparty/7z/src/MtCoder.c
new file mode 100644
index 0000000000..5667f2d5b5
--- /dev/null
+++ b/3rdparty/7z/src/MtCoder.c
@@ -0,0 +1,601 @@
+/* MtCoder.c -- Multi-thread Coder
+2018-07-04 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "MtCoder.h"
+
+#ifndef _7ZIP_ST
+
+SRes MtProgressThunk_Progress(const ICompressProgress *pp, UInt64 inSize, UInt64 outSize)
+{
+  CMtProgressThunk *thunk = CONTAINER_FROM_VTBL(pp, CMtProgressThunk, vt);
+  UInt64 inSize2 = 0;
+  UInt64 outSize2 = 0;
+  if (inSize != (UInt64)(Int64)-1)
+  {
+    inSize2 = inSize - thunk->inSize;
+    thunk->inSize = inSize;
+  }
+  if (outSize != (UInt64)(Int64)-1)
+  {
+    outSize2 = outSize - thunk->outSize;
+    thunk->outSize = outSize;
+  }
+  return MtProgress_ProgressAdd(thunk->mtProgress, inSize2, outSize2);
+}
+
+
+void MtProgressThunk_CreateVTable(CMtProgressThunk *p)
+{
+  p->vt.Progress = MtProgressThunk_Progress;
+}
+
+
+
+#define RINOK_THREAD(x) { if ((x) != 0) return SZ_ERROR_THREAD; }
+
+
+static WRes ArEvent_OptCreate_And_Reset(CEvent *p)
+{
+  if (Event_IsCreated(p))
+    return Event_Reset(p);
+  return AutoResetEvent_CreateNotSignaled(p);
+}
+
+
+static THREAD_FUNC_RET_TYPE THREAD_FUNC_CALL_TYPE ThreadFunc(void *pp);
+
+
+static SRes MtCoderThread_CreateAndStart(CMtCoderThread *t)
+{
+  WRes wres = ArEvent_OptCreate_And_Reset(&t->startEvent);
+  if (wres == 0)
+  {
+    t->stop = False;
+    if (!Thread_WasCreated(&t->thread))
+      wres = Thread_Create(&t->thread, ThreadFunc, t);
+    if (wres == 0)
+      wres = Event_Set(&t->startEvent);
+  }
+  if (wres == 0)
+    return SZ_OK;
+  return MY_SRes_HRESULT_FROM_WRes(wres);
+}
+
+
+static void MtCoderThread_Destruct(CMtCoderThread *t)
+{
+  if (Thread_WasCreated(&t->thread))
+  {
+    t->stop = 1;
+    Event_Set(&t->startEvent);
+    Thread_Wait(&t->thread);
+    Thread_Close(&t->thread);
+  }
+
+  Event_Close(&t->startEvent);
+
+  if (t->inBuf)
+  {
+    ISzAlloc_Free(t->mtCoder->allocBig, t->inBuf);
+    t->inBuf = NULL;
+  }
+}
+
+
+
+static SRes FullRead(ISeqInStream *stream, Byte *data, size_t *processedSize)
+{
+  size_t size = *processedSize;
+  *processedSize = 0;
+  while (size != 0)
+  {
+    size_t cur = size;
+    SRes res = ISeqInStream_Read(stream, data, &cur);
+    *processedSize += cur;
+    data += cur;
+    size -= cur;
+    RINOK(res);
+    if (cur == 0)
+      return SZ_OK;
+  }
+  return SZ_OK;
+}
+
+
+/*
+  ThreadFunc2() returns:
+  SZ_OK           - in all normal cases (even for stream error or memory allocation error)
+  SZ_ERROR_THREAD - in case of failure in system synch function
+*/
+
+static SRes ThreadFunc2(CMtCoderThread *t)
+{
+  CMtCoder *mtc = t->mtCoder;
+
+  for (;;)
+  {
+    unsigned bi;
+    SRes res;
+    SRes res2;
+    BoolInt finished;
+    unsigned bufIndex;
+    size_t size;
+    const Byte *inData;
+    UInt64 readProcessed = 0;
+    
+    RINOK_THREAD(Event_Wait(&mtc->readEvent))
+
+    /* after Event_Wait(&mtc->readEvent) we must call Event_Set(&mtc->readEvent) in any case to unlock another threads */
+
+    if (mtc->stopReading)
+    {
+      return Event_Set(&mtc->readEvent) == 0 ? SZ_OK : SZ_ERROR_THREAD;
+    }
+
+    res = MtProgress_GetError(&mtc->mtProgress);
+    
+    size = 0;
+    inData = NULL;
+    finished = True;
+
+    if (res == SZ_OK)
+    {
+      size = mtc->blockSize;
+      if (mtc->inStream)
+      {
+        if (!t->inBuf)
+        {
+          t->inBuf = (Byte *)ISzAlloc_Alloc(mtc->allocBig, mtc->blockSize);
+          if (!t->inBuf)
+            res = SZ_ERROR_MEM;
+        }
+        if (res == SZ_OK)
+        {
+          res = FullRead(mtc->inStream, t->inBuf, &size);
+          readProcessed = mtc->readProcessed + size;
+          mtc->readProcessed = readProcessed;
+        }
+        if (res != SZ_OK)
+        {
+          mtc->readRes = res;
+          /* after reading error - we can stop encoding of previous blocks */
+          MtProgress_SetError(&mtc->mtProgress, res);
+        }
+        else
+          finished = (size != mtc->blockSize);
+      }
+      else
+      {
+        size_t rem;
+        readProcessed = mtc->readProcessed;
+        rem = mtc->inDataSize - (size_t)readProcessed;
+        if (size > rem)
+          size = rem;
+        inData = mtc->inData + (size_t)readProcessed;
+        readProcessed += size;
+        mtc->readProcessed = readProcessed;
+        finished = (mtc->inDataSize == (size_t)readProcessed);
+      }
+    }
+
+    /* we must get some block from blocksSemaphore before Event_Set(&mtc->readEvent) */
+
+    res2 = SZ_OK;
+
+    if (Semaphore_Wait(&mtc->blocksSemaphore) != 0)
+    {
+      res2 = SZ_ERROR_THREAD;
+      if (res == SZ_OK)
+      {
+        res = res2;
+        // MtProgress_SetError(&mtc->mtProgress, res);
+      }
+    }
+
+    bi = mtc->blockIndex;
+
+    if (++mtc->blockIndex >= mtc->numBlocksMax)
+      mtc->blockIndex = 0;
+
+    bufIndex = (unsigned)(int)-1;
+
+    if (res == SZ_OK)
+      res = MtProgress_GetError(&mtc->mtProgress);
+
+    if (res != SZ_OK)
+      finished = True;
+
+    if (!finished)
+    {
+      if (mtc->numStartedThreads < mtc->numStartedThreadsLimit
+          && mtc->expectedDataSize != readProcessed)
+      {
+        res = MtCoderThread_CreateAndStart(&mtc->threads[mtc->numStartedThreads]);
+        if (res == SZ_OK)
+          mtc->numStartedThreads++;
+        else
+        {
+          MtProgress_SetError(&mtc->mtProgress, res);
+          finished = True;
+        }
+      }
+    }
+
+    if (finished)
+      mtc->stopReading = True;
+
+    RINOK_THREAD(Event_Set(&mtc->readEvent))
+
+    if (res2 != SZ_OK)
+      return res2;
+
+    if (res == SZ_OK)
+    {
+      CriticalSection_Enter(&mtc->cs);
+      bufIndex = mtc->freeBlockHead;
+      mtc->freeBlockHead = mtc->freeBlockList[bufIndex];
+      CriticalSection_Leave(&mtc->cs);
+      
+      res = mtc->mtCallback->Code(mtc->mtCallbackObject, t->index, bufIndex,
+          mtc->inStream ? t->inBuf : inData, size, finished);
+      
+      // MtProgress_Reinit(&mtc->mtProgress, t->index);
+
+      if (res != SZ_OK)
+        MtProgress_SetError(&mtc->mtProgress, res);
+    }
+
+    {
+      CMtCoderBlock *block = &mtc->blocks[bi];
+      block->res = res;
+      block->bufIndex = bufIndex;
+      block->finished = finished;
+    }
+    
+    #ifdef MTCODER__USE_WRITE_THREAD
+      RINOK_THREAD(Event_Set(&mtc->writeEvents[bi]))
+    #else
+    {
+      unsigned wi;
+      {
+        CriticalSection_Enter(&mtc->cs);
+        wi = mtc->writeIndex;
+        if (wi == bi)
+          mtc->writeIndex = (unsigned)(int)-1;
+        else
+          mtc->ReadyBlocks[bi] = True;
+        CriticalSection_Leave(&mtc->cs);
+      }
+
+      if (wi != bi)
+      {
+        if (res != SZ_OK || finished)
+          return 0;
+        continue;
+      }
+
+      if (mtc->writeRes != SZ_OK)
+        res = mtc->writeRes;
+
+      for (;;)
+      {
+        if (res == SZ_OK && bufIndex != (unsigned)(int)-1)
+        {
+          res = mtc->mtCallback->Write(mtc->mtCallbackObject, bufIndex);
+          if (res != SZ_OK)
+          {
+            mtc->writeRes = res;
+            MtProgress_SetError(&mtc->mtProgress, res);
+          }
+        }
+
+        if (++wi >= mtc->numBlocksMax)
+          wi = 0;
+        {
+          BoolInt isReady;
+
+          CriticalSection_Enter(&mtc->cs);
+          
+          if (bufIndex != (unsigned)(int)-1)
+          {
+            mtc->freeBlockList[bufIndex] = mtc->freeBlockHead;
+            mtc->freeBlockHead = bufIndex;
+          }
+          
+          isReady = mtc->ReadyBlocks[wi];
+          
+          if (isReady)
+            mtc->ReadyBlocks[wi] = False;
+          else
+            mtc->writeIndex = wi;
+          
+          CriticalSection_Leave(&mtc->cs);
+
+          RINOK_THREAD(Semaphore_Release1(&mtc->blocksSemaphore))
+
+          if (!isReady)
+            break;
+        }
+
+        {
+          CMtCoderBlock *block = &mtc->blocks[wi];
+          if (res == SZ_OK && block->res != SZ_OK)
+            res = block->res;
+          bufIndex = block->bufIndex;
+          finished = block->finished;
+        }
+      }
+    }
+    #endif
+      
+    if (finished || res != SZ_OK)
+      return 0;
+  }
+}
+
+
+static THREAD_FUNC_RET_TYPE THREAD_FUNC_CALL_TYPE ThreadFunc(void *pp)
+{
+  CMtCoderThread *t = (CMtCoderThread *)pp;
+  for (;;)
+  {
+    if (Event_Wait(&t->startEvent) != 0)
+      return SZ_ERROR_THREAD;
+    if (t->stop)
+      return 0;
+    {
+      SRes res = ThreadFunc2(t);
+      CMtCoder *mtc = t->mtCoder;
+      if (res != SZ_OK)
+      {
+        MtProgress_SetError(&mtc->mtProgress, res);
+      }
+      
+      #ifndef MTCODER__USE_WRITE_THREAD
+      {
+        unsigned numFinished = (unsigned)InterlockedIncrement(&mtc->numFinishedThreads);
+        if (numFinished == mtc->numStartedThreads)
+          if (Event_Set(&mtc->finishedEvent) != 0)
+            return SZ_ERROR_THREAD;
+      }
+      #endif
+    }
+  }
+}
+
+
+
+void MtCoder_Construct(CMtCoder *p)
+{
+  unsigned i;
+  
+  p->blockSize = 0;
+  p->numThreadsMax = 0;
+  p->expectedDataSize = (UInt64)(Int64)-1;
+
+  p->inStream = NULL;
+  p->inData = NULL;
+  p->inDataSize = 0;
+
+  p->progress = NULL;
+  p->allocBig = NULL;
+
+  p->mtCallback = NULL;
+  p->mtCallbackObject = NULL;
+
+  p->allocatedBufsSize = 0;
+
+  Event_Construct(&p->readEvent);
+  Semaphore_Construct(&p->blocksSemaphore);
+
+  for (i = 0; i < MTCODER__THREADS_MAX; i++)
+  {
+    CMtCoderThread *t = &p->threads[i];
+    t->mtCoder = p;
+    t->index = i;
+    t->inBuf = NULL;
+    t->stop = False;
+    Event_Construct(&t->startEvent);
+    Thread_Construct(&t->thread);
+  }
+
+  #ifdef MTCODER__USE_WRITE_THREAD
+    for (i = 0; i < MTCODER__BLOCKS_MAX; i++)
+      Event_Construct(&p->writeEvents[i]);
+  #else
+    Event_Construct(&p->finishedEvent);
+  #endif
+
+  CriticalSection_Init(&p->cs);
+  CriticalSection_Init(&p->mtProgress.cs);
+}
+
+
+
+
+static void MtCoder_Free(CMtCoder *p)
+{
+  unsigned i;
+
+  /*
+  p->stopReading = True;
+  if (Event_IsCreated(&p->readEvent))
+    Event_Set(&p->readEvent);
+  */
+
+  for (i = 0; i < MTCODER__THREADS_MAX; i++)
+    MtCoderThread_Destruct(&p->threads[i]);
+
+  Event_Close(&p->readEvent);
+  Semaphore_Close(&p->blocksSemaphore);
+
+  #ifdef MTCODER__USE_WRITE_THREAD
+    for (i = 0; i < MTCODER__BLOCKS_MAX; i++)
+      Event_Close(&p->writeEvents[i]);
+  #else
+    Event_Close(&p->finishedEvent);
+  #endif
+}
+
+
+void MtCoder_Destruct(CMtCoder *p)
+{
+  MtCoder_Free(p);
+
+  CriticalSection_Delete(&p->cs);
+  CriticalSection_Delete(&p->mtProgress.cs);
+}
+
+
+SRes MtCoder_Code(CMtCoder *p)
+{
+  unsigned numThreads = p->numThreadsMax;
+  unsigned numBlocksMax;
+  unsigned i;
+  SRes res = SZ_OK;
+
+  if (numThreads > MTCODER__THREADS_MAX)
+    numThreads = MTCODER__THREADS_MAX;
+  numBlocksMax = MTCODER__GET_NUM_BLOCKS_FROM_THREADS(numThreads);
+  
+  if (p->blockSize < ((UInt32)1 << 26)) numBlocksMax++;
+  if (p->blockSize < ((UInt32)1 << 24)) numBlocksMax++;
+  if (p->blockSize < ((UInt32)1 << 22)) numBlocksMax++;
+
+  if (numBlocksMax > MTCODER__BLOCKS_MAX)
+    numBlocksMax = MTCODER__BLOCKS_MAX;
+
+  if (p->blockSize != p->allocatedBufsSize)
+  {
+    for (i = 0; i < MTCODER__THREADS_MAX; i++)
+    {
+      CMtCoderThread *t = &p->threads[i];
+      if (t->inBuf)
+      {
+        ISzAlloc_Free(p->allocBig, t->inBuf);
+        t->inBuf = NULL;
+      }
+    }
+    p->allocatedBufsSize = p->blockSize;
+  }
+
+  p->readRes = SZ_OK;
+
+  MtProgress_Init(&p->mtProgress, p->progress);
+
+  #ifdef MTCODER__USE_WRITE_THREAD
+    for (i = 0; i < numBlocksMax; i++)
+    {
+      RINOK_THREAD(ArEvent_OptCreate_And_Reset(&p->writeEvents[i]));
+    }
+  #else
+    RINOK_THREAD(ArEvent_OptCreate_And_Reset(&p->finishedEvent));
+  #endif
+
+  {
+    RINOK_THREAD(ArEvent_OptCreate_And_Reset(&p->readEvent));
+
+    if (Semaphore_IsCreated(&p->blocksSemaphore))
+    {
+      RINOK_THREAD(Semaphore_Close(&p->blocksSemaphore));
+    }
+    RINOK_THREAD(Semaphore_Create(&p->blocksSemaphore, numBlocksMax, numBlocksMax));
+  }
+
+  for (i = 0; i < MTCODER__BLOCKS_MAX - 1; i++)
+    p->freeBlockList[i] = i + 1;
+  p->freeBlockList[MTCODER__BLOCKS_MAX - 1] = (unsigned)(int)-1;
+  p->freeBlockHead = 0;
+
+  p->readProcessed = 0;
+  p->blockIndex = 0;
+  p->numBlocksMax = numBlocksMax;
+  p->stopReading = False;
+
+  #ifndef MTCODER__USE_WRITE_THREAD
+    p->writeIndex = 0;
+    p->writeRes = SZ_OK;
+    for (i = 0; i < MTCODER__BLOCKS_MAX; i++)
+      p->ReadyBlocks[i] = False;
+    p->numFinishedThreads = 0;
+  #endif
+
+  p->numStartedThreadsLimit = numThreads;
+  p->numStartedThreads = 0;
+
+  // for (i = 0; i < numThreads; i++)
+  {
+    CMtCoderThread *nextThread = &p->threads[p->numStartedThreads++];
+    RINOK(MtCoderThread_CreateAndStart(nextThread));
+  }
+
+  RINOK_THREAD(Event_Set(&p->readEvent))
+
+  #ifdef MTCODER__USE_WRITE_THREAD
+  {
+    unsigned bi = 0;
+
+    for (;; bi++)
+    {
+      if (bi >= numBlocksMax)
+        bi = 0;
+
+      RINOK_THREAD(Event_Wait(&p->writeEvents[bi]))
+
+      {
+        const CMtCoderBlock *block = &p->blocks[bi];
+        unsigned bufIndex = block->bufIndex;
+        BoolInt finished = block->finished;
+        if (res == SZ_OK && block->res != SZ_OK)
+          res = block->res;
+
+        if (bufIndex != (unsigned)(int)-1)
+        {
+          if (res == SZ_OK)
+          {
+            res = p->mtCallback->Write(p->mtCallbackObject, bufIndex);
+            if (res != SZ_OK)
+              MtProgress_SetError(&p->mtProgress, res);
+          }
+          
+          CriticalSection_Enter(&p->cs);
+          {
+            p->freeBlockList[bufIndex] = p->freeBlockHead;
+            p->freeBlockHead = bufIndex;
+          }
+          CriticalSection_Leave(&p->cs);
+        }
+        
+        RINOK_THREAD(Semaphore_Release1(&p->blocksSemaphore))
+
+        if (finished)
+          break;
+      }
+    }
+  }
+  #else
+  {
+    WRes wres = Event_Wait(&p->finishedEvent);
+    res = MY_SRes_HRESULT_FROM_WRes(wres);
+  }
+  #endif
+
+  if (res == SZ_OK)
+    res = p->readRes;
+
+  if (res == SZ_OK)
+    res = p->mtProgress.res;
+
+  #ifndef MTCODER__USE_WRITE_THREAD
+    if (res == SZ_OK)
+      res = p->writeRes;
+  #endif
+
+  if (res != SZ_OK)
+    MtCoder_Free(p);
+  return res;
+}
+
+#endif
diff --git a/3rdparty/7z/src/MtCoder.h b/3rdparty/7z/src/MtCoder.h
new file mode 100644
index 0000000000..603329d367
--- /dev/null
+++ b/3rdparty/7z/src/MtCoder.h
@@ -0,0 +1,141 @@
+/* MtCoder.h -- Multi-thread Coder
+2018-07-04 : Igor Pavlov : Public domain */
+
+#ifndef __MT_CODER_H
+#define __MT_CODER_H
+
+#include "MtDec.h"
+
+EXTERN_C_BEGIN
+
+/*
+  if (    defined MTCODER__USE_WRITE_THREAD) : main thread writes all data blocks to output stream
+  if (not defined MTCODER__USE_WRITE_THREAD) : any coder thread can write data blocks to output stream
+*/
+/* #define MTCODER__USE_WRITE_THREAD */
+
+#ifndef _7ZIP_ST
+  #define MTCODER__GET_NUM_BLOCKS_FROM_THREADS(numThreads) ((numThreads) + (numThreads) / 8 + 1)
+  #define MTCODER__THREADS_MAX 64
+  #define MTCODER__BLOCKS_MAX (MTCODER__GET_NUM_BLOCKS_FROM_THREADS(MTCODER__THREADS_MAX) + 3)
+#else
+  #define MTCODER__THREADS_MAX 1
+  #define MTCODER__BLOCKS_MAX 1
+#endif
+
+
+#ifndef _7ZIP_ST
+
+
+typedef struct
+{
+  ICompressProgress vt;
+  CMtProgress *mtProgress;
+  UInt64 inSize;
+  UInt64 outSize;
+} CMtProgressThunk;
+
+void MtProgressThunk_CreateVTable(CMtProgressThunk *p);
+    
+#define MtProgressThunk_Init(p) { (p)->inSize = 0; (p)->outSize = 0; }
+
+
+struct _CMtCoder;
+
+
+typedef struct
+{
+  struct _CMtCoder *mtCoder;
+  unsigned index;
+  int stop;
+  Byte *inBuf;
+
+  CAutoResetEvent startEvent;
+  CThread thread;
+} CMtCoderThread;
+
+
+typedef struct
+{
+  SRes (*Code)(void *p, unsigned coderIndex, unsigned outBufIndex,
+      const Byte *src, size_t srcSize, int finished);
+  SRes (*Write)(void *p, unsigned outBufIndex);
+} IMtCoderCallback2;
+
+
+typedef struct
+{
+  SRes res;
+  unsigned bufIndex;
+  BoolInt finished;
+} CMtCoderBlock;
+
+
+typedef struct _CMtCoder
+{
+  /* input variables */
+  
+  size_t blockSize;        /* size of input block */
+  unsigned numThreadsMax;
+  UInt64 expectedDataSize;
+
+  ISeqInStream *inStream;
+  const Byte *inData;
+  size_t inDataSize;
+
+  ICompressProgress *progress;
+  ISzAllocPtr allocBig;
+
+  IMtCoderCallback2 *mtCallback;
+  void *mtCallbackObject;
+
+  
+  /* internal variables */
+  
+  size_t allocatedBufsSize;
+
+  CAutoResetEvent readEvent;
+  CSemaphore blocksSemaphore;
+
+  BoolInt stopReading;
+  SRes readRes;
+
+  #ifdef MTCODER__USE_WRITE_THREAD
+    CAutoResetEvent writeEvents[MTCODER__BLOCKS_MAX];
+  #else
+    CAutoResetEvent finishedEvent;
+    SRes writeRes;
+    unsigned writeIndex;
+    Byte ReadyBlocks[MTCODER__BLOCKS_MAX];
+    LONG numFinishedThreads;
+  #endif
+
+  unsigned numStartedThreadsLimit;
+  unsigned numStartedThreads;
+
+  unsigned numBlocksMax;
+  unsigned blockIndex;
+  UInt64 readProcessed;
+
+  CCriticalSection cs;
+
+  unsigned freeBlockHead;
+  unsigned freeBlockList[MTCODER__BLOCKS_MAX];
+
+  CMtProgress mtProgress;
+  CMtCoderBlock blocks[MTCODER__BLOCKS_MAX];
+  CMtCoderThread threads[MTCODER__THREADS_MAX];
+} CMtCoder;
+
+
+void MtCoder_Construct(CMtCoder *p);
+void MtCoder_Destruct(CMtCoder *p);
+SRes MtCoder_Code(CMtCoder *p);
+
+
+#endif
+
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/MtDec.c b/3rdparty/7z/src/MtDec.c
new file mode 100644
index 0000000000..25a8b046d9
--- /dev/null
+++ b/3rdparty/7z/src/MtDec.c
@@ -0,0 +1,1138 @@
+/* MtDec.c -- Multi-thread Decoder
+2019-02-02 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+// #define SHOW_DEBUG_INFO
+
+// #include <stdio.h>
+
+#ifdef SHOW_DEBUG_INFO
+#include <stdio.h>
+#endif
+
+#ifdef SHOW_DEBUG_INFO
+#define PRF(x) x
+#else
+#define PRF(x)
+#endif
+
+#define PRF_STR_INT(s, d) PRF(printf("\n" s " %d\n", (unsigned)d))
+
+#include "MtDec.h"
+
+#ifndef _7ZIP_ST
+
+void MtProgress_Init(CMtProgress *p, ICompressProgress *progress)
+{
+  p->progress = progress;
+  p->res = SZ_OK;
+  p->totalInSize = 0;
+  p->totalOutSize = 0;
+}
+
+
+SRes MtProgress_Progress_ST(CMtProgress *p)
+{
+  if (p->res == SZ_OK && p->progress)
+    if (ICompressProgress_Progress(p->progress, p->totalInSize, p->totalOutSize) != SZ_OK)
+      p->res = SZ_ERROR_PROGRESS;
+  return p->res;
+}
+
+
+SRes MtProgress_ProgressAdd(CMtProgress *p, UInt64 inSize, UInt64 outSize)
+{
+  SRes res;
+  CriticalSection_Enter(&p->cs);
+  
+  p->totalInSize += inSize;
+  p->totalOutSize += outSize;
+  if (p->res == SZ_OK && p->progress)
+    if (ICompressProgress_Progress(p->progress, p->totalInSize, p->totalOutSize) != SZ_OK)
+      p->res = SZ_ERROR_PROGRESS;
+  res = p->res;
+  
+  CriticalSection_Leave(&p->cs);
+  return res;
+}
+
+
+SRes MtProgress_GetError(CMtProgress *p)
+{
+  SRes res;
+  CriticalSection_Enter(&p->cs);
+  res = p->res;
+  CriticalSection_Leave(&p->cs);
+  return res;
+}
+
+
+void MtProgress_SetError(CMtProgress *p, SRes res)
+{
+  CriticalSection_Enter(&p->cs);
+  if (p->res == SZ_OK)
+    p->res = res;
+  CriticalSection_Leave(&p->cs);
+}
+
+
+#define RINOK_THREAD(x) RINOK(x)
+
+
+static WRes ArEvent_OptCreate_And_Reset(CEvent *p)
+{
+  if (Event_IsCreated(p))
+    return Event_Reset(p);
+  return AutoResetEvent_CreateNotSignaled(p);
+}
+
+
+struct __CMtDecBufLink
+{
+  struct __CMtDecBufLink *next;
+  void *pad[3];
+};
+
+typedef struct __CMtDecBufLink CMtDecBufLink;
+
+#define MTDEC__LINK_DATA_OFFSET sizeof(CMtDecBufLink)
+#define MTDEC__DATA_PTR_FROM_LINK(link) ((Byte *)(link) + MTDEC__LINK_DATA_OFFSET)
+
+
+
+static THREAD_FUNC_RET_TYPE THREAD_FUNC_CALL_TYPE ThreadFunc(void *pp);
+
+
+static WRes MtDecThread_CreateEvents(CMtDecThread *t)
+{
+  WRes wres = ArEvent_OptCreate_And_Reset(&t->canWrite);
+  if (wres == 0)
+  {
+    wres = ArEvent_OptCreate_And_Reset(&t->canRead);
+    if (wres == 0)
+      return SZ_OK;
+  }
+  return wres;
+}
+
+
+static SRes MtDecThread_CreateAndStart(CMtDecThread *t)
+{
+  WRes wres = MtDecThread_CreateEvents(t);
+  // wres = 17; // for test
+  if (wres == 0)
+  {
+    if (Thread_WasCreated(&t->thread))
+      return SZ_OK;
+    wres = Thread_Create(&t->thread, ThreadFunc, t);
+    if (wres == 0)
+      return SZ_OK;
+  }
+  return MY_SRes_HRESULT_FROM_WRes(wres);
+}
+
+
+void MtDecThread_FreeInBufs(CMtDecThread *t)
+{
+  if (t->inBuf)
+  {
+    void *link = t->inBuf;
+    t->inBuf = NULL;
+    do
+    {
+      void *next = ((CMtDecBufLink *)link)->next;
+      ISzAlloc_Free(t->mtDec->alloc, link);
+      link = next;
+    }
+    while (link);
+  }
+}
+
+
+static void MtDecThread_CloseThread(CMtDecThread *t)
+{
+  if (Thread_WasCreated(&t->thread))
+  {
+    Event_Set(&t->canWrite); /* we can disable it. There are no threads waiting canWrite in normal cases */
+    Event_Set(&t->canRead);
+    Thread_Wait(&t->thread);
+    Thread_Close(&t->thread);
+  }
+
+  Event_Close(&t->canRead);
+  Event_Close(&t->canWrite);
+}
+
+static void MtDec_CloseThreads(CMtDec *p)
+{
+  unsigned i;
+  for (i = 0; i < MTDEC__THREADS_MAX; i++)
+    MtDecThread_CloseThread(&p->threads[i]);
+}
+
+static void MtDecThread_Destruct(CMtDecThread *t)
+{
+  MtDecThread_CloseThread(t);
+  MtDecThread_FreeInBufs(t);
+}
+
+
+
+static SRes FullRead(ISeqInStream *stream, Byte *data, size_t *processedSize)
+{
+  size_t size = *processedSize;
+  *processedSize = 0;
+  while (size != 0)
+  {
+    size_t cur = size;
+    SRes res = ISeqInStream_Read(stream, data, &cur);
+    *processedSize += cur;
+    data += cur;
+    size -= cur;
+    RINOK(res);
+    if (cur == 0)
+      return SZ_OK;
+  }
+  return SZ_OK;
+}
+
+
+static SRes MtDec_GetError_Spec(CMtDec *p, UInt64 interruptIndex, BoolInt *wasInterrupted)
+{
+  SRes res;
+  CriticalSection_Enter(&p->mtProgress.cs);
+  *wasInterrupted = (p->needInterrupt && interruptIndex > p->interruptIndex);
+  res = p->mtProgress.res;
+  CriticalSection_Leave(&p->mtProgress.cs);
+  return res;
+}
+
+static SRes MtDec_Progress_GetError_Spec(CMtDec *p, UInt64 inSize, UInt64 outSize, UInt64 interruptIndex, BoolInt *wasInterrupted)
+{
+  SRes res;
+  CriticalSection_Enter(&p->mtProgress.cs);
+
+  p->mtProgress.totalInSize += inSize;
+  p->mtProgress.totalOutSize += outSize;
+  if (p->mtProgress.res == SZ_OK && p->mtProgress.progress)
+    if (ICompressProgress_Progress(p->mtProgress.progress, p->mtProgress.totalInSize, p->mtProgress.totalOutSize) != SZ_OK)
+      p->mtProgress.res = SZ_ERROR_PROGRESS;
+
+  *wasInterrupted = (p->needInterrupt && interruptIndex > p->interruptIndex);
+  res = p->mtProgress.res;
+  
+  CriticalSection_Leave(&p->mtProgress.cs);
+
+  return res;
+}
+
+static void MtDec_Interrupt(CMtDec *p, UInt64 interruptIndex)
+{
+  CriticalSection_Enter(&p->mtProgress.cs);
+  if (!p->needInterrupt || interruptIndex < p->interruptIndex)
+  {
+    p->interruptIndex = interruptIndex;
+    p->needInterrupt = True;
+  }
+  CriticalSection_Leave(&p->mtProgress.cs);
+}
+
+Byte *MtDec_GetCrossBuff(CMtDec *p)
+{
+  Byte *cr = p->crossBlock;
+  if (!cr)
+  {
+    cr = (Byte *)ISzAlloc_Alloc(p->alloc, MTDEC__LINK_DATA_OFFSET + p->inBufSize);
+    if (!cr)
+      return NULL;
+    p->crossBlock = cr;
+  }
+  return MTDEC__DATA_PTR_FROM_LINK(cr);
+}
+
+
+/*
+  ThreadFunc2() returns:
+  0      - in all normal cases (even for stream error or memory allocation error)
+  (!= 0) - WRes error return by system threading function
+*/
+
+// #define MTDEC_ProgessStep (1 << 22)
+#define MTDEC_ProgessStep (1 << 0)
+
+static WRes ThreadFunc2(CMtDecThread *t)
+{
+  CMtDec *p = t->mtDec;
+
+  PRF_STR_INT("ThreadFunc2", t->index);
+
+  // SetThreadAffinityMask(GetCurrentThread(), 1 << t->index);
+
+  for (;;)
+  {
+    SRes res, codeRes;
+    BoolInt wasInterrupted, isAllocError, overflow, finish;
+    SRes threadingErrorSRes;
+    BoolInt needCode, needWrite, needContinue;
+    
+    size_t inDataSize_Start;
+    UInt64 inDataSize;
+    // UInt64 inDataSize_Full;
+    
+    UInt64 blockIndex;
+
+    UInt64 inPrev = 0;
+    UInt64 outPrev = 0;
+    UInt64 inCodePos;
+    UInt64 outCodePos;
+    
+    Byte *afterEndData = NULL;
+    size_t afterEndData_Size = 0;
+
+    BoolInt canCreateNewThread = False;
+    // CMtDecCallbackInfo parse;
+    CMtDecThread *nextThread;
+
+    PRF_STR_INT("Event_Wait(&t->canRead)", t->index);
+
+    RINOK_THREAD(Event_Wait(&t->canRead));
+    if (p->exitThread)
+      return 0;
+
+    PRF_STR_INT("after Event_Wait(&t->canRead)", t->index);
+
+    // if (t->index == 3) return 19; // for test
+
+    blockIndex = p->blockIndex++;
+
+    // PRF(printf("\ncanRead\n"))
+
+    res = MtDec_Progress_GetError_Spec(p, 0, 0, blockIndex, &wasInterrupted);
+
+    finish = p->readWasFinished;
+    needCode = False;
+    needWrite = False;
+    isAllocError = False;
+    overflow = False;
+
+    inDataSize_Start = 0;
+    inDataSize = 0;
+    // inDataSize_Full = 0;
+
+    if (res == SZ_OK && !wasInterrupted)
+    {
+      // if (p->inStream)
+      {
+        CMtDecBufLink *prev = NULL;
+        CMtDecBufLink *link = (CMtDecBufLink *)t->inBuf;
+        size_t crossSize = p->crossEnd - p->crossStart;
+
+        PRF(printf("\ncrossSize = %d\n", crossSize));
+
+        for (;;)
+        {
+          if (!link)
+          {
+            link = (CMtDecBufLink *)ISzAlloc_Alloc(p->alloc, MTDEC__LINK_DATA_OFFSET + p->inBufSize);
+            if (!link)
+            {
+              finish = True;
+              // p->allocError_for_Read_BlockIndex = blockIndex;
+              isAllocError = True;
+              break;
+            }
+            link->next = NULL;
+            if (prev)
+            {
+              // static unsigned g_num = 0;
+              // printf("\n%6d : %x", ++g_num, (unsigned)(size_t)((Byte *)link - (Byte *)prev));
+              prev->next = link;
+            }
+            else
+              t->inBuf = (void *)link;
+          }
+
+          {
+            Byte *data = MTDEC__DATA_PTR_FROM_LINK(link);
+            Byte *parseData = data;
+            size_t size;
+
+            if (crossSize != 0)
+            {
+              inDataSize = crossSize;
+              // inDataSize_Full = inDataSize;
+              inDataSize_Start = crossSize;
+              size = crossSize;
+              parseData = MTDEC__DATA_PTR_FROM_LINK(p->crossBlock) + p->crossStart;
+              PRF(printf("\ncross : crossStart = %7d  crossEnd = %7d finish = %1d",
+                  (int)p->crossStart, (int)p->crossEnd, (int)finish));
+            }
+            else
+            {
+              size = p->inBufSize;
+              
+              res = FullRead(p->inStream, data, &size);
+              
+              // size = 10; // test
+
+              inDataSize += size;
+              // inDataSize_Full = inDataSize;
+              if (!prev)
+                inDataSize_Start = size;
+
+              p->readProcessed += size;
+              finish = (size != p->inBufSize);
+              if (finish)
+                p->readWasFinished = True;
+              
+              // res = E_INVALIDARG; // test
+
+              if (res != SZ_OK)
+              {
+                // PRF(printf("\nRead error = %d\n", res))
+                // we want to decode all data before error
+                p->readRes = res;
+                // p->readError_BlockIndex = blockIndex;
+                p->readWasFinished = True;
+                finish = True;
+                res = SZ_OK;
+                // break;
+              }
+
+              if (inDataSize - inPrev >= MTDEC_ProgessStep)
+              {
+                res = MtDec_Progress_GetError_Spec(p, 0, 0, blockIndex, &wasInterrupted);
+                if (res != SZ_OK || wasInterrupted)
+                  break;
+                inPrev = inDataSize;
+              }
+            }
+
+            {
+              CMtDecCallbackInfo parse;
+
+              parse.startCall = (prev == NULL);
+              parse.src = parseData;
+              parse.srcSize = size;
+              parse.srcFinished = finish;
+              parse.canCreateNewThread = True;
+
+              // PRF(printf("\nParse size = %d\n", (unsigned)size))
+
+              p->mtCallback->Parse(p->mtCallbackObject, t->index, &parse);
+
+              needWrite = True;
+              canCreateNewThread = parse.canCreateNewThread;
+
+              // printf("\n\n%12I64u %12I64u", (UInt64)p->mtProgress.totalInSize, (UInt64)p->mtProgress.totalOutSize);
+              
+              if (
+                  // parseRes != SZ_OK ||
+                  // inDataSize - (size - parse.srcSize) > p->inBlockMax
+                  // ||
+                  parse.state == MTDEC_PARSE_OVERFLOW
+                  // || wasInterrupted
+                  )
+              {
+                // Overflow or Parse error - switch from MT decoding to ST decoding
+                finish = True;
+                overflow = True;
+
+                {
+                  PRF(printf("\n Overflow"));
+                  // PRF(printf("\nisBlockFinished = %d", (unsigned)parse.blockWasFinished));
+                  PRF(printf("\n inDataSize = %d", (unsigned)inDataSize));
+                }
+                
+                if (crossSize != 0)
+                  memcpy(data, parseData, size);
+                p->crossStart = 0;
+                p->crossEnd = 0;
+                break;
+              }
+
+              if (crossSize != 0)
+              {
+                memcpy(data, parseData, parse.srcSize);
+                p->crossStart += parse.srcSize;
+              }
+
+              if (parse.state != MTDEC_PARSE_CONTINUE || finish)
+              {
+                // we don't need to parse in current thread anymore
+
+                if (parse.state == MTDEC_PARSE_END)
+                  finish = True;
+
+                needCode = True;
+                // p->crossFinished = finish;
+
+                if (parse.srcSize == size)
+                {
+                  // full parsed - no cross transfer
+                  p->crossStart = 0;
+                  p->crossEnd = 0;
+                  break;
+                }
+
+                if (parse.state == MTDEC_PARSE_END)
+                {
+                  p->crossStart = 0;
+                  p->crossEnd = 0;
+
+                  if (crossSize != 0)
+                    memcpy(data + parse.srcSize, parseData + parse.srcSize, size - parse.srcSize); // we need all data
+                  afterEndData_Size = size - parse.srcSize;
+                  afterEndData = parseData + parse.srcSize;
+
+                  // we reduce data size to required bytes (parsed only)
+                  inDataSize -= (size - parse.srcSize);
+                  if (!prev)
+                    inDataSize_Start = parse.srcSize;
+                  break;
+                }
+
+                {
+                  // partial parsed - need cross transfer
+                  if (crossSize != 0)
+                    inDataSize = parse.srcSize; // it's only parsed now
+                  else
+                  {
+                    // partial parsed - is not in initial cross block - we need to copy new data to cross block
+                    Byte *cr = MtDec_GetCrossBuff(p);
+                    if (!cr)
+                    {
+                      {
+                        PRF(printf("\ncross alloc error error\n"));
+                        // res = SZ_ERROR_MEM;
+                        finish = True;
+                        // p->allocError_for_Read_BlockIndex = blockIndex;
+                        isAllocError = True;
+                        break;
+                      }
+                    }
+
+                    {
+                      size_t crSize = size - parse.srcSize;
+                      inDataSize -= crSize;
+                      p->crossEnd = crSize;
+                      p->crossStart = 0;
+                      memcpy(cr, parseData + parse.srcSize, crSize);
+                    }
+                  }
+
+                  // inDataSize_Full = inDataSize;
+                  if (!prev)
+                    inDataSize_Start = parse.srcSize; // it's partial size (parsed only)
+
+                  finish = False;
+                  break;
+                }
+              }
+
+              if (parse.srcSize != size)
+              {
+                res = SZ_ERROR_FAIL;
+                PRF(printf("\nfinished error SZ_ERROR_FAIL = %d\n", res));
+                break;
+              }
+            }
+          }
+          
+          prev = link;
+          link = link->next;
+
+          if (crossSize != 0)
+          {
+            crossSize = 0;
+            p->crossStart = 0;
+            p->crossEnd = 0;
+          }
+        }
+      }
+
+      if (res == SZ_OK)
+        res = MtDec_GetError_Spec(p, blockIndex, &wasInterrupted);
+    }
+
+    codeRes = SZ_OK;
+
+    if (res == SZ_OK && needCode && !wasInterrupted)
+    {
+      codeRes = p->mtCallback->PreCode(p->mtCallbackObject, t->index);
+      if (codeRes != SZ_OK)
+      {
+        needCode = False;
+        finish = True;
+        // SZ_ERROR_MEM is expected error here.
+        //   if (codeRes == SZ_ERROR_MEM) - we will try single-thread decoding later.
+        //   if (codeRes != SZ_ERROR_MEM) - we can stop decoding or try single-thread decoding.
+      }
+    }
+    
+    if (res != SZ_OK || wasInterrupted)
+      finish = True;
+    
+    nextThread = NULL;
+    threadingErrorSRes = SZ_OK;
+
+    if (!finish)
+    {
+      if (p->numStartedThreads < p->numStartedThreads_Limit && canCreateNewThread)
+      {
+        SRes res2 = MtDecThread_CreateAndStart(&p->threads[p->numStartedThreads]);
+        if (res2 == SZ_OK)
+        {
+          // if (p->numStartedThreads % 1000 == 0) PRF(printf("\n numStartedThreads=%d\n", p->numStartedThreads));
+          p->numStartedThreads++;
+        }
+        else
+        {
+          PRF(printf("\nERROR: numStartedThreads=%d\n", p->numStartedThreads));
+          if (p->numStartedThreads == 1)
+          {
+            // if only one thread is possible, we leave muti-threading code
+            finish = True;
+            needCode = False;
+            threadingErrorSRes = res2;
+          }
+          else
+            p->numStartedThreads_Limit = p->numStartedThreads;
+        }
+      }
+      
+      if (!finish)
+      {
+        unsigned nextIndex = t->index + 1;
+        nextThread = &p->threads[nextIndex >= p->numStartedThreads ? 0 : nextIndex];
+        RINOK_THREAD(Event_Set(&nextThread->canRead))
+        // We have started executing for new iteration (with next thread)
+        // And that next thread now is responsible for possible exit from decoding (threading_code)
+      }
+    }
+
+    // each call of Event_Set(&nextThread->canRead) must be followed by call of Event_Set(&nextThread->canWrite)
+    // if ( !finish ) we must call Event_Set(&nextThread->canWrite) in any case
+    // if (  finish ) we switch to single-thread mode and there are 2 ways at the end of current iteration (current block):
+    //   - if (needContinue) after Write(&needContinue), we restore decoding with new iteration
+    //   - otherwise we stop decoding and exit from ThreadFunc2()
+
+    // Don't change (finish) variable in the further code
+
+
+    // ---------- CODE ----------
+
+    inPrev = 0;
+    outPrev = 0;
+    inCodePos = 0;
+    outCodePos = 0;
+
+    if (res == SZ_OK && needCode && codeRes == SZ_OK)
+    {
+      BoolInt isStartBlock = True;
+      CMtDecBufLink *link = (CMtDecBufLink *)t->inBuf;
+
+      for (;;)
+      {
+        size_t inSize;
+        int stop;
+
+        if (isStartBlock)
+          inSize = inDataSize_Start;
+        else
+        {
+          UInt64 rem = inDataSize - inCodePos;
+          inSize = p->inBufSize;
+          if (inSize > rem)
+            inSize = (size_t)rem;
+        }
+
+        inCodePos += inSize;
+        stop = True;
+
+        codeRes = p->mtCallback->Code(p->mtCallbackObject, t->index,
+            (const Byte *)MTDEC__DATA_PTR_FROM_LINK(link), inSize,
+            (inCodePos == inDataSize), // srcFinished
+            &inCodePos, &outCodePos, &stop);
+        
+        if (codeRes != SZ_OK)
+        {
+          PRF(printf("\nCode Interrupt error = %x\n", codeRes));
+          // we interrupt only later blocks
+          MtDec_Interrupt(p, blockIndex);
+          break;
+        }
+
+        if (stop || inCodePos == inDataSize)
+          break;
+  
+        {
+          const UInt64 inDelta = inCodePos - inPrev;
+          const UInt64 outDelta = outCodePos - outPrev;
+          if (inDelta >= MTDEC_ProgessStep || outDelta >= MTDEC_ProgessStep)
+          {
+            // Sleep(1);
+            res = MtDec_Progress_GetError_Spec(p, inDelta, outDelta, blockIndex, &wasInterrupted);
+            if (res != SZ_OK || wasInterrupted)
+              break;
+            inPrev = inCodePos;
+            outPrev = outCodePos;
+          }
+        }
+
+        link = link->next;
+        isStartBlock = False;
+      }
+    }
+
+
+    // ---------- WRITE ----------
+   
+    RINOK_THREAD(Event_Wait(&t->canWrite));
+
+  {
+    BoolInt isErrorMode = False;
+    BoolInt canRecode = True;
+    BoolInt needWriteToStream = needWrite;
+
+    if (p->exitThread) return 0; // it's never executed in normal cases
+
+    if (p->wasInterrupted)
+      wasInterrupted = True;
+    else
+    {
+      if (codeRes != SZ_OK) // || !needCode // check it !!!
+      {
+        p->wasInterrupted = True;
+        p->codeRes = codeRes;
+        if (codeRes == SZ_ERROR_MEM)
+          isAllocError = True;
+      }
+      
+      if (threadingErrorSRes)
+      {
+        p->wasInterrupted = True;
+        p->threadingErrorSRes = threadingErrorSRes;
+        needWriteToStream = False;
+      }
+      if (isAllocError)
+      {
+        p->wasInterrupted = True;
+        p->isAllocError = True;
+        needWriteToStream = False;
+      }
+      if (overflow)
+      {
+        p->wasInterrupted = True;
+        p->overflow = True;
+        needWriteToStream = False;
+      }
+    }
+
+    if (needCode)
+    {
+      if (wasInterrupted)
+      {
+        inCodePos = 0;
+        outCodePos = 0;
+      }
+      {
+        const UInt64 inDelta = inCodePos - inPrev;
+        const UInt64 outDelta = outCodePos - outPrev;
+        // if (inDelta != 0 || outDelta != 0)
+        res = MtProgress_ProgressAdd(&p->mtProgress, inDelta, outDelta);
+      }
+    }
+
+    needContinue = (!finish);
+
+    // if (res == SZ_OK && needWrite && !wasInterrupted)
+    if (needWrite)
+    {
+      // p->inProcessed += inCodePos;
+
+      res = p->mtCallback->Write(p->mtCallbackObject, t->index,
+          res == SZ_OK && needWriteToStream && !wasInterrupted, // needWrite
+          afterEndData, afterEndData_Size,
+          &needContinue,
+          &canRecode);
+      
+      // res= E_INVALIDARG; // for test
+
+      PRF(printf("\nAfter Write needContinue = %d\n", (unsigned)needContinue));
+      PRF(printf("\nprocessed = %d\n", (unsigned)p->inProcessed));
+
+      if (res != SZ_OK)
+      {
+        PRF(printf("\nWrite error = %d\n", res));
+        isErrorMode = True;
+        p->wasInterrupted = True;
+      }
+      if (res != SZ_OK
+          || (!needContinue && !finish))
+      {
+        PRF(printf("\nWrite Interrupt error = %x\n", res));
+        MtDec_Interrupt(p, blockIndex);
+      }
+    }
+
+    if (canRecode)
+    if (!needCode
+        || res != SZ_OK
+        || p->wasInterrupted
+        || codeRes != SZ_OK
+        || wasInterrupted
+        || p->numFilledThreads != 0
+        || isErrorMode)
+    {
+      if (p->numFilledThreads == 0)
+        p->filledThreadStart = t->index;
+      if (inDataSize != 0 || !finish)
+      {
+        t->inDataSize_Start = inDataSize_Start;
+        t->inDataSize = inDataSize;
+        p->numFilledThreads++;
+      }
+      PRF(printf("\np->numFilledThreads = %d\n", p->numFilledThreads));
+      PRF(printf("p->filledThreadStart = %d\n", p->filledThreadStart));
+    }
+
+    if (!finish)
+    {
+      RINOK_THREAD(Event_Set(&nextThread->canWrite));
+    }
+    else
+    {
+      if (needContinue)
+      {
+        // we restore decoding with new iteration
+        RINOK_THREAD(Event_Set(&p->threads[0].canWrite));
+      }
+      else
+      {
+        // we exit from decoding
+        if (t->index == 0)
+          return SZ_OK;
+        p->exitThread = True;
+      }
+      RINOK_THREAD(Event_Set(&p->threads[0].canRead));
+    }
+  }
+  }
+}
+
+#ifdef _WIN32
+#define USE_ALLOCA
+#endif
+
+#ifdef USE_ALLOCA
+#ifdef _WIN32
+#include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
+#endif
+
+
+static THREAD_FUNC_RET_TYPE THREAD_FUNC_CALL_TYPE ThreadFunc1(void *pp)
+{
+  WRes res;
+
+  CMtDecThread *t = (CMtDecThread *)pp;
+  CMtDec *p;
+
+  // fprintf(stdout, "\n%d = %p\n", t->index, &t);
+
+  res = ThreadFunc2(t);
+  p = t->mtDec;
+  if (res == 0)
+    return p->exitThreadWRes;
+  {
+    // it's unexpected situation for some threading function error
+    if (p->exitThreadWRes == 0)
+      p->exitThreadWRes = res;
+    PRF(printf("\nthread exit error = %d\n", res));
+    p->exitThread = True;
+    Event_Set(&p->threads[0].canRead);
+    Event_Set(&p->threads[0].canWrite);
+    MtProgress_SetError(&p->mtProgress, MY_SRes_HRESULT_FROM_WRes(res));
+  }
+  return res;
+}
+
+static MY_NO_INLINE THREAD_FUNC_RET_TYPE THREAD_FUNC_CALL_TYPE ThreadFunc(void *pp)
+{
+  CMtDecThread *t = (CMtDecThread *)pp;
+
+  // fprintf(stderr, "\n%d = %p - before", t->index, &t);
+  #ifdef USE_ALLOCA
+  t->allocaPtr = alloca(t->index * 128);
+  #endif
+  return ThreadFunc1(pp);
+}
+
+
+int MtDec_PrepareRead(CMtDec *p)
+{
+  if (p->crossBlock && p->crossStart == p->crossEnd)
+  {
+    ISzAlloc_Free(p->alloc, p->crossBlock);
+    p->crossBlock = NULL;
+  }
+    
+  {
+    unsigned i;
+    for (i = 0; i < MTDEC__THREADS_MAX; i++)
+      if (i > p->numStartedThreads
+          || p->numFilledThreads <=
+            (i >= p->filledThreadStart ?
+              i - p->filledThreadStart :
+              i + p->numStartedThreads - p->filledThreadStart))
+        MtDecThread_FreeInBufs(&p->threads[i]);
+  }
+
+  return (p->numFilledThreads != 0) || (p->crossStart != p->crossEnd);
+}
+
+    
+const Byte *MtDec_Read(CMtDec *p, size_t *inLim)
+{
+  while (p->numFilledThreads != 0)
+  {
+    CMtDecThread *t = &p->threads[p->filledThreadStart];
+    
+    if (*inLim != 0)
+    {
+      {
+        void *link = t->inBuf;
+        void *next = ((CMtDecBufLink *)link)->next;
+        ISzAlloc_Free(p->alloc, link);
+        t->inBuf = next;
+      }
+      
+      if (t->inDataSize == 0)
+      {
+        MtDecThread_FreeInBufs(t);
+        if (--p->numFilledThreads == 0)
+          break;
+        if (++p->filledThreadStart == p->numStartedThreads)
+          p->filledThreadStart = 0;
+        t = &p->threads[p->filledThreadStart];
+      }
+    }
+    
+    {
+      size_t lim = t->inDataSize_Start;
+      if (lim != 0)
+        t->inDataSize_Start = 0;
+      else
+      {
+        UInt64 rem = t->inDataSize;
+        lim = p->inBufSize;
+        if (lim > rem)
+          lim = (size_t)rem;
+      }
+      t->inDataSize -= lim;
+      *inLim = lim;
+      return (const Byte *)MTDEC__DATA_PTR_FROM_LINK(t->inBuf);
+    }
+  }
+
+  {
+    size_t crossSize = p->crossEnd - p->crossStart;
+    if (crossSize != 0)
+    {
+      const Byte *data = MTDEC__DATA_PTR_FROM_LINK(p->crossBlock) + p->crossStart;
+      *inLim = crossSize;
+      p->crossStart = 0;
+      p->crossEnd = 0;
+      return data;
+    }
+    *inLim = 0;
+    if (p->crossBlock)
+    {
+      ISzAlloc_Free(p->alloc, p->crossBlock);
+      p->crossBlock = NULL;
+    }
+    return NULL;
+  }
+}
+
+
+void MtDec_Construct(CMtDec *p)
+{
+  unsigned i;
+  
+  p->inBufSize = (size_t)1 << 18;
+
+  p->numThreadsMax = 0;
+
+  p->inStream = NULL;
+  
+  // p->inData = NULL;
+  // p->inDataSize = 0;
+
+  p->crossBlock = NULL;
+  p->crossStart = 0;
+  p->crossEnd = 0;
+
+  p->numFilledThreads = 0;
+
+  p->progress = NULL;
+  p->alloc = NULL;
+
+  p->mtCallback = NULL;
+  p->mtCallbackObject = NULL;
+
+  p->allocatedBufsSize = 0;
+
+  for (i = 0; i < MTDEC__THREADS_MAX; i++)
+  {
+    CMtDecThread *t = &p->threads[i];
+    t->mtDec = p;
+    t->index = i;
+    t->inBuf = NULL;
+    Event_Construct(&t->canRead);
+    Event_Construct(&t->canWrite);
+    Thread_Construct(&t->thread);
+  }
+
+  // Event_Construct(&p->finishedEvent);
+
+  CriticalSection_Init(&p->mtProgress.cs);
+}
+
+
+static void MtDec_Free(CMtDec *p)
+{
+  unsigned i;
+
+  p->exitThread = True;
+
+  for (i = 0; i < MTDEC__THREADS_MAX; i++)
+    MtDecThread_Destruct(&p->threads[i]);
+
+  // Event_Close(&p->finishedEvent);
+
+  if (p->crossBlock)
+  {
+    ISzAlloc_Free(p->alloc, p->crossBlock);
+    p->crossBlock = NULL;
+  }
+}
+
+
+void MtDec_Destruct(CMtDec *p)
+{
+  MtDec_Free(p);
+
+  CriticalSection_Delete(&p->mtProgress.cs);
+}
+
+
+SRes MtDec_Code(CMtDec *p)
+{
+  unsigned i;
+
+  p->inProcessed = 0;
+
+  p->blockIndex = 1; // it must be larger than not_defined index (0)
+  p->isAllocError = False;
+  p->overflow = False;
+  p->threadingErrorSRes = SZ_OK;
+
+  p->needContinue = True;
+
+  p->readWasFinished = False;
+  p->needInterrupt = False;
+  p->interruptIndex = (UInt64)(Int64)-1;
+
+  p->readProcessed = 0;
+  p->readRes = SZ_OK;
+  p->codeRes = SZ_OK;
+  p->wasInterrupted = False;
+
+  p->crossStart = 0;
+  p->crossEnd = 0;
+
+  p->filledThreadStart = 0;
+  p->numFilledThreads = 0;
+
+  {
+    unsigned numThreads = p->numThreadsMax;
+    if (numThreads > MTDEC__THREADS_MAX)
+      numThreads = MTDEC__THREADS_MAX;
+    p->numStartedThreads_Limit = numThreads;
+    p->numStartedThreads = 0;
+  }
+
+  if (p->inBufSize != p->allocatedBufsSize)
+  {
+    for (i = 0; i < MTDEC__THREADS_MAX; i++)
+    {
+      CMtDecThread *t = &p->threads[i];
+      if (t->inBuf)
+        MtDecThread_FreeInBufs(t);
+    }
+    if (p->crossBlock)
+    {
+      ISzAlloc_Free(p->alloc, p->crossBlock);
+      p->crossBlock = NULL;
+    }
+
+    p->allocatedBufsSize = p->inBufSize;
+  }
+
+  MtProgress_Init(&p->mtProgress, p->progress);
+
+  // RINOK_THREAD(ArEvent_OptCreate_And_Reset(&p->finishedEvent));
+  p->exitThread = False;
+  p->exitThreadWRes = 0;
+
+  {
+    WRes wres;
+    WRes sres;
+    CMtDecThread *nextThread = &p->threads[p->numStartedThreads++];
+    // wres = MtDecThread_CreateAndStart(nextThread);
+    wres = MtDecThread_CreateEvents(nextThread);
+    if (wres == 0) { wres = Event_Set(&nextThread->canWrite);
+    if (wres == 0) { wres = Event_Set(&nextThread->canRead);
+    if (wres == 0) { wres = ThreadFunc(nextThread);
+    if (wres != 0)
+    {
+      p->needContinue = False;
+      MtDec_CloseThreads(p);
+    }}}}
+
+    // wres = 17; // for test
+    // wres = Event_Wait(&p->finishedEvent);
+
+    sres = MY_SRes_HRESULT_FROM_WRes(wres);
+
+    if (sres != 0)
+      p->threadingErrorSRes = sres;
+
+    if (
+        // wres == 0
+        // wres != 0
+        // || p->mtc.codeRes == SZ_ERROR_MEM
+        p->isAllocError
+        || p->threadingErrorSRes != SZ_OK
+        || p->overflow)
+    {
+      // p->needContinue = True;
+    }
+    else
+      p->needContinue = False;
+    
+    if (p->needContinue)
+      return SZ_OK;
+
+    // if (sres != SZ_OK)
+      return sres;
+    // return E_FAIL;
+  }
+}
+
+#endif
diff --git a/3rdparty/7z/src/MtDec.h b/3rdparty/7z/src/MtDec.h
new file mode 100644
index 0000000000..9864cc8741
--- /dev/null
+++ b/3rdparty/7z/src/MtDec.h
@@ -0,0 +1,201 @@
+/* MtDec.h -- Multi-thread Decoder
+2018-07-04 : Igor Pavlov : Public domain */
+
+#ifndef __MT_DEC_H
+#define __MT_DEC_H
+
+#include "7zTypes.h"
+
+#ifndef _7ZIP_ST
+#include "Threads.h"
+#endif
+
+EXTERN_C_BEGIN
+
+#ifndef _7ZIP_ST
+
+#ifndef _7ZIP_ST
+  #define MTDEC__THREADS_MAX 32
+#else
+  #define MTDEC__THREADS_MAX 1
+#endif
+
+
+typedef struct
+{
+  ICompressProgress *progress;
+  SRes res;
+  UInt64 totalInSize;
+  UInt64 totalOutSize;
+  CCriticalSection cs;
+} CMtProgress;
+
+void MtProgress_Init(CMtProgress *p, ICompressProgress *progress);
+SRes MtProgress_Progress_ST(CMtProgress *p);
+SRes MtProgress_ProgressAdd(CMtProgress *p, UInt64 inSize, UInt64 outSize);
+SRes MtProgress_GetError(CMtProgress *p);
+void MtProgress_SetError(CMtProgress *p, SRes res);
+
+struct _CMtDec;
+
+typedef struct
+{
+  struct _CMtDec *mtDec;
+  unsigned index;
+  void *inBuf;
+
+  size_t inDataSize_Start; // size of input data in start block
+  UInt64 inDataSize;       // total size of input data in all blocks
+
+  CThread thread;
+  CAutoResetEvent canRead;
+  CAutoResetEvent canWrite;
+  void  *allocaPtr;
+} CMtDecThread;
+
+void MtDecThread_FreeInBufs(CMtDecThread *t);
+
+
+typedef enum
+{
+  MTDEC_PARSE_CONTINUE, // continue this block with more input data
+  MTDEC_PARSE_OVERFLOW, // MT buffers overflow, need switch to single-thread
+  MTDEC_PARSE_NEW,      // new block
+  MTDEC_PARSE_END       // end of block threading. But we still can return to threading after Write(&needContinue)
+} EMtDecParseState;
+
+typedef struct
+{
+  // in
+  int startCall;
+  const Byte *src;
+  size_t srcSize;
+      // in  : (srcSize == 0) is allowed
+      // out : it's allowed to return less that actually was used ?
+  int srcFinished;
+
+  // out
+  EMtDecParseState state;
+  BoolInt canCreateNewThread;
+  UInt64 outPos; // check it (size_t)
+} CMtDecCallbackInfo;
+
+
+typedef struct
+{
+  void (*Parse)(void *p, unsigned coderIndex, CMtDecCallbackInfo *ci);
+  
+  // PreCode() and Code():
+  // (SRes_return_result != SZ_OK) means stop decoding, no need another blocks
+  SRes (*PreCode)(void *p, unsigned coderIndex);
+  SRes (*Code)(void *p, unsigned coderIndex,
+      const Byte *src, size_t srcSize, int srcFinished,
+      UInt64 *inCodePos, UInt64 *outCodePos, int *stop);
+  // stop - means stop another Code calls
+
+
+  /* Write() must be called, if Parse() was called
+      set (needWrite) if
+      {
+         && (was not interrupted by progress)
+         && (was not interrupted in previous block)
+      }
+
+    out:
+      if (*needContinue), decoder still need to continue decoding with new iteration,
+         even after MTDEC_PARSE_END
+      if (*canRecode), we didn't flush current block data, so we still can decode current block later.
+  */
+  SRes (*Write)(void *p, unsigned coderIndex,
+      BoolInt needWriteToStream,
+      const Byte *src, size_t srcSize,
+      // int srcFinished,
+      BoolInt *needContinue,
+      BoolInt *canRecode);
+} IMtDecCallback;
+
+
+
+typedef struct _CMtDec
+{
+  /* input variables */
+  
+  size_t inBufSize;        /* size of input block */
+  unsigned numThreadsMax;
+  // size_t inBlockMax;
+  unsigned numThreadsMax_2;
+
+  ISeqInStream *inStream;
+  // const Byte *inData;
+  // size_t inDataSize;
+
+  ICompressProgress *progress;
+  ISzAllocPtr alloc;
+
+  IMtDecCallback *mtCallback;
+  void *mtCallbackObject;
+
+  
+  /* internal variables */
+  
+  size_t allocatedBufsSize;
+
+  BoolInt exitThread;
+  WRes exitThreadWRes;
+
+  UInt64 blockIndex;
+  BoolInt isAllocError;
+  BoolInt overflow;
+  SRes threadingErrorSRes;
+
+  BoolInt needContinue;
+
+  // CAutoResetEvent finishedEvent;
+
+  SRes readRes;
+  SRes codeRes;
+
+  BoolInt wasInterrupted;
+
+  unsigned numStartedThreads_Limit;
+  unsigned numStartedThreads;
+
+  Byte *crossBlock;
+  size_t crossStart;
+  size_t crossEnd;
+  UInt64 readProcessed;
+  BoolInt readWasFinished;
+  UInt64 inProcessed;
+
+  unsigned filledThreadStart;
+  unsigned numFilledThreads;
+
+  #ifndef _7ZIP_ST
+  BoolInt needInterrupt;
+  UInt64 interruptIndex;
+  CMtProgress mtProgress;
+  CMtDecThread threads[MTDEC__THREADS_MAX];
+  #endif
+} CMtDec;
+
+
+void MtDec_Construct(CMtDec *p);
+void MtDec_Destruct(CMtDec *p);
+
+/*
+MtDec_Code() returns:
+  SZ_OK - in most cases
+  MY_SRes_HRESULT_FROM_WRes(WRes_error) - in case of unexpected error in threading function
+*/
+  
+SRes MtDec_Code(CMtDec *p);
+Byte *MtDec_GetCrossBuff(CMtDec *p);
+
+int MtDec_PrepareRead(CMtDec *p);
+const Byte *MtDec_Read(CMtDec *p, size_t *inLim);
+
+#endif
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/Ppmd.h b/3rdparty/7z/src/Ppmd.h
new file mode 100644
index 0000000000..4b99415212
--- /dev/null
+++ b/3rdparty/7z/src/Ppmd.h
@@ -0,0 +1,85 @@
+/* Ppmd.h -- PPMD codec common code
+2017-04-03 : Igor Pavlov : Public domain
+This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
+
+#ifndef __PPMD_H
+#define __PPMD_H
+
+#include "CpuArch.h"
+
+EXTERN_C_BEGIN
+
+#ifdef MY_CPU_32BIT
+  #define PPMD_32BIT
+#endif
+
+#define PPMD_INT_BITS 7
+#define PPMD_PERIOD_BITS 7
+#define PPMD_BIN_SCALE (1 << (PPMD_INT_BITS + PPMD_PERIOD_BITS))
+
+#define PPMD_GET_MEAN_SPEC(summ, shift, round) (((summ) + (1 << ((shift) - (round)))) >> (shift))
+#define PPMD_GET_MEAN(summ) PPMD_GET_MEAN_SPEC((summ), PPMD_PERIOD_BITS, 2)
+#define PPMD_UPDATE_PROB_0(prob) ((prob) + (1 << PPMD_INT_BITS) - PPMD_GET_MEAN(prob))
+#define PPMD_UPDATE_PROB_1(prob) ((prob) - PPMD_GET_MEAN(prob))
+
+#define PPMD_N1 4
+#define PPMD_N2 4
+#define PPMD_N3 4
+#define PPMD_N4 ((128 + 3 - 1 * PPMD_N1 - 2 * PPMD_N2 - 3 * PPMD_N3) / 4)
+#define PPMD_NUM_INDEXES (PPMD_N1 + PPMD_N2 + PPMD_N3 + PPMD_N4)
+
+#pragma pack(push, 1)
+/* Most compilers works OK here even without #pragma pack(push, 1), but some GCC compilers need it. */
+
+/* SEE-contexts for PPM-contexts with masked symbols */
+typedef struct
+{
+  UInt16 Summ; /* Freq */
+  Byte Shift;  /* Speed of Freq change; low Shift is for fast change */
+  Byte Count;  /* Count to next change of Shift */
+} CPpmd_See;
+
+#define Ppmd_See_Update(p)  if ((p)->Shift < PPMD_PERIOD_BITS && --(p)->Count == 0) \
+    { (p)->Summ <<= 1; (p)->Count = (Byte)(3 << (p)->Shift++); }
+
+typedef struct
+{
+  Byte Symbol;
+  Byte Freq;
+  UInt16 SuccessorLow;
+  UInt16 SuccessorHigh;
+} CPpmd_State;
+
+#pragma pack(pop)
+
+typedef
+  #ifdef PPMD_32BIT
+    CPpmd_State *
+  #else
+    UInt32
+  #endif
+  CPpmd_State_Ref;
+
+typedef
+  #ifdef PPMD_32BIT
+    void *
+  #else
+    UInt32
+  #endif
+  CPpmd_Void_Ref;
+
+typedef
+  #ifdef PPMD_32BIT
+    Byte *
+  #else
+    UInt32
+  #endif
+  CPpmd_Byte_Ref;
+
+#define PPMD_SetAllBitsIn256Bytes(p) \
+  { size_t z; for (z = 0; z < 256 / sizeof(p[0]); z += 8) { \
+  p[z+7] = p[z+6] = p[z+5] = p[z+4] = p[z+3] = p[z+2] = p[z+1] = p[z+0] = ~(size_t)0; }}
+
+EXTERN_C_END
+ 
+#endif
diff --git a/3rdparty/7z/src/Ppmd7.c b/3rdparty/7z/src/Ppmd7.c
new file mode 100644
index 0000000000..80e7de9a63
--- /dev/null
+++ b/3rdparty/7z/src/Ppmd7.c
@@ -0,0 +1,712 @@
+/* Ppmd7.c -- PPMdH codec
+2018-07-04 : Igor Pavlov : Public domain
+This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
+
+#include "Precomp.h"
+
+#include <string.h>
+
+#include "Ppmd7.h"
+
+const Byte PPMD7_kExpEscape[16] = { 25, 14, 9, 7, 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 2, 2 };
+static const UInt16 kInitBinEsc[] = { 0x3CDD, 0x1F3F, 0x59BF, 0x48F3, 0x64A1, 0x5ABC, 0x6632, 0x6051};
+
+#define MAX_FREQ 124
+#define UNIT_SIZE 12
+
+#define U2B(nu) ((UInt32)(nu) * UNIT_SIZE)
+#define U2I(nu) (p->Units2Indx[(size_t)(nu) - 1])
+#define I2U(indx) (p->Indx2Units[indx])
+
+#ifdef PPMD_32BIT
+  #define REF(ptr) (ptr)
+#else
+  #define REF(ptr) ((UInt32)((Byte *)(ptr) - (p)->Base))
+#endif
+
+#define STATS_REF(ptr) ((CPpmd_State_Ref)REF(ptr))
+
+#define CTX(ref) ((CPpmd7_Context *)Ppmd7_GetContext(p, ref))
+#define STATS(ctx) Ppmd7_GetStats(p, ctx)
+#define ONE_STATE(ctx) Ppmd7Context_OneState(ctx)
+#define SUFFIX(ctx) CTX((ctx)->Suffix)
+
+typedef CPpmd7_Context * CTX_PTR;
+
+struct CPpmd7_Node_;
+
+typedef
+  #ifdef PPMD_32BIT
+    struct CPpmd7_Node_ *
+  #else
+    UInt32
+  #endif
+  CPpmd7_Node_Ref;
+
+typedef struct CPpmd7_Node_
+{
+  UInt16 Stamp; /* must be at offset 0 as CPpmd7_Context::NumStats. Stamp=0 means free */
+  UInt16 NU;
+  CPpmd7_Node_Ref Next; /* must be at offset >= 4 */
+  CPpmd7_Node_Ref Prev;
+} CPpmd7_Node;
+
+#ifdef PPMD_32BIT
+  #define NODE(ptr) (ptr)
+#else
+  #define NODE(offs) ((CPpmd7_Node *)(p->Base + (offs)))
+#endif
+
+void Ppmd7_Construct(CPpmd7 *p)
+{
+  unsigned i, k, m;
+
+  p->Base = 0;
+
+  for (i = 0, k = 0; i < PPMD_NUM_INDEXES; i++)
+  {
+    unsigned step = (i >= 12 ? 4 : (i >> 2) + 1);
+    do { p->Units2Indx[k++] = (Byte)i; } while (--step);
+    p->Indx2Units[i] = (Byte)k;
+  }
+
+  p->NS2BSIndx[0] = (0 << 1);
+  p->NS2BSIndx[1] = (1 << 1);
+  memset(p->NS2BSIndx + 2, (2 << 1), 9);
+  memset(p->NS2BSIndx + 11, (3 << 1), 256 - 11);
+
+  for (i = 0; i < 3; i++)
+    p->NS2Indx[i] = (Byte)i;
+  for (m = i, k = 1; i < 256; i++)
+  {
+    p->NS2Indx[i] = (Byte)m;
+    if (--k == 0)
+      k = (++m) - 2;
+  }
+
+  memset(p->HB2Flag, 0, 0x40);
+  memset(p->HB2Flag + 0x40, 8, 0x100 - 0x40);
+}
+
+void Ppmd7_Free(CPpmd7 *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->Base);
+  p->Size = 0;
+  p->Base = 0;
+}
+
+BoolInt Ppmd7_Alloc(CPpmd7 *p, UInt32 size, ISzAllocPtr alloc)
+{
+  if (!p->Base || p->Size != size)
+  {
+    size_t size2;
+    Ppmd7_Free(p, alloc);
+    size2 = 0
+      #ifndef PPMD_32BIT
+      + UNIT_SIZE
+      #endif
+      ;
+    p->AlignOffset =
+      #ifdef PPMD_32BIT
+        (4 - size) & 3;
+      #else
+        4 - (size & 3);
+      #endif
+    if ((p->Base = (Byte *)ISzAlloc_Alloc(alloc, p->AlignOffset + size + size2)) == 0)
+      return False;
+    p->Size = size;
+  }
+  return True;
+}
+
+static void InsertNode(CPpmd7 *p, void *node, unsigned indx)
+{
+  *((CPpmd_Void_Ref *)node) = p->FreeList[indx];
+  p->FreeList[indx] = REF(node);
+}
+
+static void *RemoveNode(CPpmd7 *p, unsigned indx)
+{
+  CPpmd_Void_Ref *node = (CPpmd_Void_Ref *)Ppmd7_GetPtr(p, p->FreeList[indx]);
+  p->FreeList[indx] = *node;
+  return node;
+}
+
+static void SplitBlock(CPpmd7 *p, void *ptr, unsigned oldIndx, unsigned newIndx)
+{
+  unsigned i, nu = I2U(oldIndx) - I2U(newIndx);
+  ptr = (Byte *)ptr + U2B(I2U(newIndx));
+  if (I2U(i = U2I(nu)) != nu)
+  {
+    unsigned k = I2U(--i);
+    InsertNode(p, ((Byte *)ptr) + U2B(k), nu - k - 1);
+  }
+  InsertNode(p, ptr, i);
+}
+
+static void GlueFreeBlocks(CPpmd7 *p)
+{
+  #ifdef PPMD_32BIT
+  CPpmd7_Node headItem;
+  CPpmd7_Node_Ref head = &headItem;
+  #else
+  CPpmd7_Node_Ref head = p->AlignOffset + p->Size;
+  #endif
+  
+  CPpmd7_Node_Ref n = head;
+  unsigned i;
+
+  p->GlueCount = 255;
+
+  /* create doubly-linked list of free blocks */
+  for (i = 0; i < PPMD_NUM_INDEXES; i++)
+  {
+    UInt16 nu = I2U(i);
+    CPpmd7_Node_Ref next = (CPpmd7_Node_Ref)p->FreeList[i];
+    p->FreeList[i] = 0;
+    while (next != 0)
+    {
+      CPpmd7_Node *node = NODE(next);
+      node->Next = n;
+      n = NODE(n)->Prev = next;
+      next = *(const CPpmd7_Node_Ref *)node;
+      node->Stamp = 0;
+      node->NU = (UInt16)nu;
+    }
+  }
+  NODE(head)->Stamp = 1;
+  NODE(head)->Next = n;
+  NODE(n)->Prev = head;
+  if (p->LoUnit != p->HiUnit)
+    ((CPpmd7_Node *)p->LoUnit)->Stamp = 1;
+  
+  /* Glue free blocks */
+  while (n != head)
+  {
+    CPpmd7_Node *node = NODE(n);
+    UInt32 nu = (UInt32)node->NU;
+    for (;;)
+    {
+      CPpmd7_Node *node2 = NODE(n) + nu;
+      nu += node2->NU;
+      if (node2->Stamp != 0 || nu >= 0x10000)
+        break;
+      NODE(node2->Prev)->Next = node2->Next;
+      NODE(node2->Next)->Prev = node2->Prev;
+      node->NU = (UInt16)nu;
+    }
+    n = node->Next;
+  }
+  
+  /* Fill lists of free blocks */
+  for (n = NODE(head)->Next; n != head;)
+  {
+    CPpmd7_Node *node = NODE(n);
+    unsigned nu;
+    CPpmd7_Node_Ref next = node->Next;
+    for (nu = node->NU; nu > 128; nu -= 128, node += 128)
+      InsertNode(p, node, PPMD_NUM_INDEXES - 1);
+    if (I2U(i = U2I(nu)) != nu)
+    {
+      unsigned k = I2U(--i);
+      InsertNode(p, node + k, nu - k - 1);
+    }
+    InsertNode(p, node, i);
+    n = next;
+  }
+}
+
+static void *AllocUnitsRare(CPpmd7 *p, unsigned indx)
+{
+  unsigned i;
+  void *retVal;
+  if (p->GlueCount == 0)
+  {
+    GlueFreeBlocks(p);
+    if (p->FreeList[indx] != 0)
+      return RemoveNode(p, indx);
+  }
+  i = indx;
+  do
+  {
+    if (++i == PPMD_NUM_INDEXES)
+    {
+      UInt32 numBytes = U2B(I2U(indx));
+      p->GlueCount--;
+      return ((UInt32)(p->UnitsStart - p->Text) > numBytes) ? (p->UnitsStart -= numBytes) : (NULL);
+    }
+  }
+  while (p->FreeList[i] == 0);
+  retVal = RemoveNode(p, i);
+  SplitBlock(p, retVal, i, indx);
+  return retVal;
+}
+
+static void *AllocUnits(CPpmd7 *p, unsigned indx)
+{
+  UInt32 numBytes;
+  if (p->FreeList[indx] != 0)
+    return RemoveNode(p, indx);
+  numBytes = U2B(I2U(indx));
+  if (numBytes <= (UInt32)(p->HiUnit - p->LoUnit))
+  {
+    void *retVal = p->LoUnit;
+    p->LoUnit += numBytes;
+    return retVal;
+  }
+  return AllocUnitsRare(p, indx);
+}
+
+#define MyMem12Cpy(dest, src, num) \
+  { UInt32 *d = (UInt32 *)dest; const UInt32 *s = (const UInt32 *)src; UInt32 n = num; \
+    do { d[0] = s[0]; d[1] = s[1]; d[2] = s[2]; s += 3; d += 3; } while (--n); }
+
+static void *ShrinkUnits(CPpmd7 *p, void *oldPtr, unsigned oldNU, unsigned newNU)
+{
+  unsigned i0 = U2I(oldNU);
+  unsigned i1 = U2I(newNU);
+  if (i0 == i1)
+    return oldPtr;
+  if (p->FreeList[i1] != 0)
+  {
+    void *ptr = RemoveNode(p, i1);
+    MyMem12Cpy(ptr, oldPtr, newNU);
+    InsertNode(p, oldPtr, i0);
+    return ptr;
+  }
+  SplitBlock(p, oldPtr, i0, i1);
+  return oldPtr;
+}
+
+#define SUCCESSOR(p) ((CPpmd_Void_Ref)((p)->SuccessorLow | ((UInt32)(p)->SuccessorHigh << 16)))
+
+static void SetSuccessor(CPpmd_State *p, CPpmd_Void_Ref v)
+{
+  (p)->SuccessorLow = (UInt16)((UInt32)(v) & 0xFFFF);
+  (p)->SuccessorHigh = (UInt16)(((UInt32)(v) >> 16) & 0xFFFF);
+}
+
+static void RestartModel(CPpmd7 *p)
+{
+  unsigned i, k, m;
+
+  memset(p->FreeList, 0, sizeof(p->FreeList));
+  p->Text = p->Base + p->AlignOffset;
+  p->HiUnit = p->Text + p->Size;
+  p->LoUnit = p->UnitsStart = p->HiUnit - p->Size / 8 / UNIT_SIZE * 7 * UNIT_SIZE;
+  p->GlueCount = 0;
+
+  p->OrderFall = p->MaxOrder;
+  p->RunLength = p->InitRL = -(Int32)((p->MaxOrder < 12) ? p->MaxOrder : 12) - 1;
+  p->PrevSuccess = 0;
+
+  p->MinContext = p->MaxContext = (CTX_PTR)(p->HiUnit -= UNIT_SIZE); /* AllocContext(p); */
+  p->MinContext->Suffix = 0;
+  p->MinContext->NumStats = 256;
+  p->MinContext->SummFreq = 256 + 1;
+  p->FoundState = (CPpmd_State *)p->LoUnit; /* AllocUnits(p, PPMD_NUM_INDEXES - 1); */
+  p->LoUnit += U2B(256 / 2);
+  p->MinContext->Stats = REF(p->FoundState);
+  for (i = 0; i < 256; i++)
+  {
+    CPpmd_State *s = &p->FoundState[i];
+    s->Symbol = (Byte)i;
+    s->Freq = 1;
+    SetSuccessor(s, 0);
+  }
+
+  for (i = 0; i < 128; i++)
+    for (k = 0; k < 8; k++)
+    {
+      UInt16 *dest = p->BinSumm[i] + k;
+      UInt16 val = (UInt16)(PPMD_BIN_SCALE - kInitBinEsc[k] / (i + 2));
+      for (m = 0; m < 64; m += 8)
+        dest[m] = val;
+    }
+  
+  for (i = 0; i < 25; i++)
+    for (k = 0; k < 16; k++)
+    {
+      CPpmd_See *s = &p->See[i][k];
+      s->Summ = (UInt16)((5 * i + 10) << (s->Shift = PPMD_PERIOD_BITS - 4));
+      s->Count = 4;
+    }
+}
+
+void Ppmd7_Init(CPpmd7 *p, unsigned maxOrder)
+{
+  p->MaxOrder = maxOrder;
+  RestartModel(p);
+  p->DummySee.Shift = PPMD_PERIOD_BITS;
+  p->DummySee.Summ = 0; /* unused */
+  p->DummySee.Count = 64; /* unused */
+}
+
+static CTX_PTR CreateSuccessors(CPpmd7 *p, BoolInt skip)
+{
+  CPpmd_State upState;
+  CTX_PTR c = p->MinContext;
+  CPpmd_Byte_Ref upBranch = (CPpmd_Byte_Ref)SUCCESSOR(p->FoundState);
+  CPpmd_State *ps[PPMD7_MAX_ORDER];
+  unsigned numPs = 0;
+  
+  if (!skip)
+    ps[numPs++] = p->FoundState;
+  
+  while (c->Suffix)
+  {
+    CPpmd_Void_Ref successor;
+    CPpmd_State *s;
+    c = SUFFIX(c);
+    if (c->NumStats != 1)
+    {
+      for (s = STATS(c); s->Symbol != p->FoundState->Symbol; s++);
+    }
+    else
+      s = ONE_STATE(c);
+    successor = SUCCESSOR(s);
+    if (successor != upBranch)
+    {
+      c = CTX(successor);
+      if (numPs == 0)
+        return c;
+      break;
+    }
+    ps[numPs++] = s;
+  }
+  
+  upState.Symbol = *(const Byte *)Ppmd7_GetPtr(p, upBranch);
+  SetSuccessor(&upState, upBranch + 1);
+  
+  if (c->NumStats == 1)
+    upState.Freq = ONE_STATE(c)->Freq;
+  else
+  {
+    UInt32 cf, s0;
+    CPpmd_State *s;
+    for (s = STATS(c); s->Symbol != upState.Symbol; s++);
+    cf = s->Freq - 1;
+    s0 = c->SummFreq - c->NumStats - cf;
+    upState.Freq = (Byte)(1 + ((2 * cf <= s0) ? (5 * cf > s0) : ((2 * cf + 3 * s0 - 1) / (2 * s0))));
+  }
+
+  do
+  {
+    /* Create Child */
+    CTX_PTR c1; /* = AllocContext(p); */
+    if (p->HiUnit != p->LoUnit)
+      c1 = (CTX_PTR)(p->HiUnit -= UNIT_SIZE);
+    else if (p->FreeList[0] != 0)
+      c1 = (CTX_PTR)RemoveNode(p, 0);
+    else
+    {
+      c1 = (CTX_PTR)AllocUnitsRare(p, 0);
+      if (!c1)
+        return NULL;
+    }
+    c1->NumStats = 1;
+    *ONE_STATE(c1) = upState;
+    c1->Suffix = REF(c);
+    SetSuccessor(ps[--numPs], REF(c1));
+    c = c1;
+  }
+  while (numPs != 0);
+  
+  return c;
+}
+
+static void SwapStates(CPpmd_State *t1, CPpmd_State *t2)
+{
+  CPpmd_State tmp = *t1;
+  *t1 = *t2;
+  *t2 = tmp;
+}
+
+static void UpdateModel(CPpmd7 *p)
+{
+  CPpmd_Void_Ref successor, fSuccessor = SUCCESSOR(p->FoundState);
+  CTX_PTR c;
+  unsigned s0, ns;
+  
+  if (p->FoundState->Freq < MAX_FREQ / 4 && p->MinContext->Suffix != 0)
+  {
+    c = SUFFIX(p->MinContext);
+    
+    if (c->NumStats == 1)
+    {
+      CPpmd_State *s = ONE_STATE(c);
+      if (s->Freq < 32)
+        s->Freq++;
+    }
+    else
+    {
+      CPpmd_State *s = STATS(c);
+      if (s->Symbol != p->FoundState->Symbol)
+      {
+        do { s++; } while (s->Symbol != p->FoundState->Symbol);
+        if (s[0].Freq >= s[-1].Freq)
+        {
+          SwapStates(&s[0], &s[-1]);
+          s--;
+        }
+      }
+      if (s->Freq < MAX_FREQ - 9)
+      {
+        s->Freq += 2;
+        c->SummFreq += 2;
+      }
+    }
+  }
+
+  if (p->OrderFall == 0)
+  {
+    p->MinContext = p->MaxContext = CreateSuccessors(p, True);
+    if (p->MinContext == 0)
+    {
+      RestartModel(p);
+      return;
+    }
+    SetSuccessor(p->FoundState, REF(p->MinContext));
+    return;
+  }
+  
+  *p->Text++ = p->FoundState->Symbol;
+  successor = REF(p->Text);
+  if (p->Text >= p->UnitsStart)
+  {
+    RestartModel(p);
+    return;
+  }
+  
+  if (fSuccessor)
+  {
+    if (fSuccessor <= successor)
+    {
+      CTX_PTR cs = CreateSuccessors(p, False);
+      if (cs == NULL)
+      {
+        RestartModel(p);
+        return;
+      }
+      fSuccessor = REF(cs);
+    }
+    if (--p->OrderFall == 0)
+    {
+      successor = fSuccessor;
+      p->Text -= (p->MaxContext != p->MinContext);
+    }
+  }
+  else
+  {
+    SetSuccessor(p->FoundState, successor);
+    fSuccessor = REF(p->MinContext);
+  }
+  
+  s0 = p->MinContext->SummFreq - (ns = p->MinContext->NumStats) - (p->FoundState->Freq - 1);
+  
+  for (c = p->MaxContext; c != p->MinContext; c = SUFFIX(c))
+  {
+    unsigned ns1;
+    UInt32 cf, sf;
+    if ((ns1 = c->NumStats) != 1)
+    {
+      if ((ns1 & 1) == 0)
+      {
+        /* Expand for one UNIT */
+        unsigned oldNU = ns1 >> 1;
+        unsigned i = U2I(oldNU);
+        if (i != U2I((size_t)oldNU + 1))
+        {
+          void *ptr = AllocUnits(p, i + 1);
+          void *oldPtr;
+          if (!ptr)
+          {
+            RestartModel(p);
+            return;
+          }
+          oldPtr = STATS(c);
+          MyMem12Cpy(ptr, oldPtr, oldNU);
+          InsertNode(p, oldPtr, i);
+          c->Stats = STATS_REF(ptr);
+        }
+      }
+      c->SummFreq = (UInt16)(c->SummFreq + (2 * ns1 < ns) + 2 * ((4 * ns1 <= ns) & (c->SummFreq <= 8 * ns1)));
+    }
+    else
+    {
+      CPpmd_State *s = (CPpmd_State*)AllocUnits(p, 0);
+      if (!s)
+      {
+        RestartModel(p);
+        return;
+      }
+      *s = *ONE_STATE(c);
+      c->Stats = REF(s);
+      if (s->Freq < MAX_FREQ / 4 - 1)
+        s->Freq <<= 1;
+      else
+        s->Freq = MAX_FREQ - 4;
+      c->SummFreq = (UInt16)(s->Freq + p->InitEsc + (ns > 3));
+    }
+    cf = 2 * (UInt32)p->FoundState->Freq * (c->SummFreq + 6);
+    sf = (UInt32)s0 + c->SummFreq;
+    if (cf < 6 * sf)
+    {
+      cf = 1 + (cf > sf) + (cf >= 4 * sf);
+      c->SummFreq += 3;
+    }
+    else
+    {
+      cf = 4 + (cf >= 9 * sf) + (cf >= 12 * sf) + (cf >= 15 * sf);
+      c->SummFreq = (UInt16)(c->SummFreq + cf);
+    }
+    {
+      CPpmd_State *s = STATS(c) + ns1;
+      SetSuccessor(s, successor);
+      s->Symbol = p->FoundState->Symbol;
+      s->Freq = (Byte)cf;
+      c->NumStats = (UInt16)(ns1 + 1);
+    }
+  }
+  p->MaxContext = p->MinContext = CTX(fSuccessor);
+}
+  
+static void Rescale(CPpmd7 *p)
+{
+  unsigned i, adder, sumFreq, escFreq;
+  CPpmd_State *stats = STATS(p->MinContext);
+  CPpmd_State *s = p->FoundState;
+  {
+    CPpmd_State tmp = *s;
+    for (; s != stats; s--)
+      s[0] = s[-1];
+    *s = tmp;
+  }
+  escFreq = p->MinContext->SummFreq - s->Freq;
+  s->Freq += 4;
+  adder = (p->OrderFall != 0);
+  s->Freq = (Byte)((s->Freq + adder) >> 1);
+  sumFreq = s->Freq;
+  
+  i = p->MinContext->NumStats - 1;
+  do
+  {
+    escFreq -= (++s)->Freq;
+    s->Freq = (Byte)((s->Freq + adder) >> 1);
+    sumFreq += s->Freq;
+    if (s[0].Freq > s[-1].Freq)
+    {
+      CPpmd_State *s1 = s;
+      CPpmd_State tmp = *s1;
+      do
+        s1[0] = s1[-1];
+      while (--s1 != stats && tmp.Freq > s1[-1].Freq);
+      *s1 = tmp;
+    }
+  }
+  while (--i);
+  
+  if (s->Freq == 0)
+  {
+    unsigned numStats = p->MinContext->NumStats;
+    unsigned n0, n1;
+    do { i++; } while ((--s)->Freq == 0);
+    escFreq += i;
+    p->MinContext->NumStats = (UInt16)(p->MinContext->NumStats - i);
+    if (p->MinContext->NumStats == 1)
+    {
+      CPpmd_State tmp = *stats;
+      do
+      {
+        tmp.Freq = (Byte)(tmp.Freq - (tmp.Freq >> 1));
+        escFreq >>= 1;
+      }
+      while (escFreq > 1);
+      InsertNode(p, stats, U2I(((numStats + 1) >> 1)));
+      *(p->FoundState = ONE_STATE(p->MinContext)) = tmp;
+      return;
+    }
+    n0 = (numStats + 1) >> 1;
+    n1 = (p->MinContext->NumStats + 1) >> 1;
+    if (n0 != n1)
+      p->MinContext->Stats = STATS_REF(ShrinkUnits(p, stats, n0, n1));
+  }
+  p->MinContext->SummFreq = (UInt16)(sumFreq + escFreq - (escFreq >> 1));
+  p->FoundState = STATS(p->MinContext);
+}
+
+CPpmd_See *Ppmd7_MakeEscFreq(CPpmd7 *p, unsigned numMasked, UInt32 *escFreq)
+{
+  CPpmd_See *see;
+  unsigned nonMasked = p->MinContext->NumStats - numMasked;
+  if (p->MinContext->NumStats != 256)
+  {
+    see = p->See[(unsigned)p->NS2Indx[(size_t)nonMasked - 1]] +
+        (nonMasked < (unsigned)SUFFIX(p->MinContext)->NumStats - p->MinContext->NumStats) +
+        2 * (unsigned)(p->MinContext->SummFreq < 11 * p->MinContext->NumStats) +
+        4 * (unsigned)(numMasked > nonMasked) +
+        p->HiBitsFlag;
+    {
+      unsigned r = (see->Summ >> see->Shift);
+      see->Summ = (UInt16)(see->Summ - r);
+      *escFreq = r + (r == 0);
+    }
+  }
+  else
+  {
+    see = &p->DummySee;
+    *escFreq = 1;
+  }
+  return see;
+}
+
+static void NextContext(CPpmd7 *p)
+{
+  CTX_PTR c = CTX(SUCCESSOR(p->FoundState));
+  if (p->OrderFall == 0 && (Byte *)c > p->Text)
+    p->MinContext = p->MaxContext = c;
+  else
+    UpdateModel(p);
+}
+
+void Ppmd7_Update1(CPpmd7 *p)
+{
+  CPpmd_State *s = p->FoundState;
+  s->Freq += 4;
+  p->MinContext->SummFreq += 4;
+  if (s[0].Freq > s[-1].Freq)
+  {
+    SwapStates(&s[0], &s[-1]);
+    p->FoundState = --s;
+    if (s->Freq > MAX_FREQ)
+      Rescale(p);
+  }
+  NextContext(p);
+}
+
+void Ppmd7_Update1_0(CPpmd7 *p)
+{
+  p->PrevSuccess = (2 * p->FoundState->Freq > p->MinContext->SummFreq);
+  p->RunLength += p->PrevSuccess;
+  p->MinContext->SummFreq += 4;
+  if ((p->FoundState->Freq += 4) > MAX_FREQ)
+    Rescale(p);
+  NextContext(p);
+}
+
+void Ppmd7_UpdateBin(CPpmd7 *p)
+{
+  p->FoundState->Freq = (Byte)(p->FoundState->Freq + (p->FoundState->Freq < 128 ? 1: 0));
+  p->PrevSuccess = 1;
+  p->RunLength++;
+  NextContext(p);
+}
+
+void Ppmd7_Update2(CPpmd7 *p)
+{
+  p->MinContext->SummFreq += 4;
+  if ((p->FoundState->Freq += 4) > MAX_FREQ)
+    Rescale(p);
+  p->RunLength = p->InitRL;
+  UpdateModel(p);
+}
diff --git a/3rdparty/7z/src/Ppmd7.h b/3rdparty/7z/src/Ppmd7.h
new file mode 100644
index 0000000000..cce93f1209
--- /dev/null
+++ b/3rdparty/7z/src/Ppmd7.h
@@ -0,0 +1,142 @@
+/* Ppmd7.h -- PPMdH compression codec
+2018-07-04 : Igor Pavlov : Public domain
+This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
+
+/* This code supports virtual RangeDecoder and includes the implementation
+of RangeCoder from 7z, instead of RangeCoder from original PPMd var.H.
+If you need the compatibility with original PPMd var.H, you can use external RangeDecoder */
+
+#ifndef __PPMD7_H
+#define __PPMD7_H
+
+#include "Ppmd.h"
+
+EXTERN_C_BEGIN
+
+#define PPMD7_MIN_ORDER 2
+#define PPMD7_MAX_ORDER 64
+
+#define PPMD7_MIN_MEM_SIZE (1 << 11)
+#define PPMD7_MAX_MEM_SIZE (0xFFFFFFFF - 12 * 3)
+
+struct CPpmd7_Context_;
+
+typedef
+  #ifdef PPMD_32BIT
+    struct CPpmd7_Context_ *
+  #else
+    UInt32
+  #endif
+  CPpmd7_Context_Ref;
+
+typedef struct CPpmd7_Context_
+{
+  UInt16 NumStats;
+  UInt16 SummFreq;
+  CPpmd_State_Ref Stats;
+  CPpmd7_Context_Ref Suffix;
+} CPpmd7_Context;
+
+#define Ppmd7Context_OneState(p) ((CPpmd_State *)&(p)->SummFreq)
+
+typedef struct
+{
+  CPpmd7_Context *MinContext, *MaxContext;
+  CPpmd_State *FoundState;
+  unsigned OrderFall, InitEsc, PrevSuccess, MaxOrder, HiBitsFlag;
+  Int32 RunLength, InitRL; /* must be 32-bit at least */
+
+  UInt32 Size;
+  UInt32 GlueCount;
+  Byte *Base, *LoUnit, *HiUnit, *Text, *UnitsStart;
+  UInt32 AlignOffset;
+
+  Byte Indx2Units[PPMD_NUM_INDEXES];
+  Byte Units2Indx[128];
+  CPpmd_Void_Ref FreeList[PPMD_NUM_INDEXES];
+  Byte NS2Indx[256], NS2BSIndx[256], HB2Flag[256];
+  CPpmd_See DummySee, See[25][16];
+  UInt16 BinSumm[128][64];
+} CPpmd7;
+
+void Ppmd7_Construct(CPpmd7 *p);
+BoolInt Ppmd7_Alloc(CPpmd7 *p, UInt32 size, ISzAllocPtr alloc);
+void Ppmd7_Free(CPpmd7 *p, ISzAllocPtr alloc);
+void Ppmd7_Init(CPpmd7 *p, unsigned maxOrder);
+#define Ppmd7_WasAllocated(p) ((p)->Base != NULL)
+
+
+/* ---------- Internal Functions ---------- */
+
+extern const Byte PPMD7_kExpEscape[16];
+
+#ifdef PPMD_32BIT
+  #define Ppmd7_GetPtr(p, ptr) (ptr)
+  #define Ppmd7_GetContext(p, ptr) (ptr)
+  #define Ppmd7_GetStats(p, ctx) ((ctx)->Stats)
+#else
+  #define Ppmd7_GetPtr(p, offs) ((void *)((p)->Base + (offs)))
+  #define Ppmd7_GetContext(p, offs) ((CPpmd7_Context *)Ppmd7_GetPtr((p), (offs)))
+  #define Ppmd7_GetStats(p, ctx) ((CPpmd_State *)Ppmd7_GetPtr((p), ((ctx)->Stats)))
+#endif
+
+void Ppmd7_Update1(CPpmd7 *p);
+void Ppmd7_Update1_0(CPpmd7 *p);
+void Ppmd7_Update2(CPpmd7 *p);
+void Ppmd7_UpdateBin(CPpmd7 *p);
+
+#define Ppmd7_GetBinSumm(p) \
+    &p->BinSumm[(size_t)(unsigned)Ppmd7Context_OneState(p->MinContext)->Freq - 1][p->PrevSuccess + \
+    p->NS2BSIndx[(size_t)Ppmd7_GetContext(p, p->MinContext->Suffix)->NumStats - 1] + \
+    (p->HiBitsFlag = p->HB2Flag[p->FoundState->Symbol]) + \
+    2 * p->HB2Flag[(unsigned)Ppmd7Context_OneState(p->MinContext)->Symbol] + \
+    ((p->RunLength >> 26) & 0x20)]
+
+CPpmd_See *Ppmd7_MakeEscFreq(CPpmd7 *p, unsigned numMasked, UInt32 *scale);
+
+
+/* ---------- Decode ---------- */
+
+typedef struct IPpmd7_RangeDec IPpmd7_RangeDec;
+
+struct IPpmd7_RangeDec
+{
+  UInt32 (*GetThreshold)(const IPpmd7_RangeDec *p, UInt32 total);
+  void (*Decode)(const IPpmd7_RangeDec *p, UInt32 start, UInt32 size);
+  UInt32 (*DecodeBit)(const IPpmd7_RangeDec *p, UInt32 size0);
+};
+
+typedef struct
+{
+  IPpmd7_RangeDec vt;
+  UInt32 Range;
+  UInt32 Code;
+  IByteIn *Stream;
+} CPpmd7z_RangeDec;
+
+void Ppmd7z_RangeDec_CreateVTable(CPpmd7z_RangeDec *p);
+BoolInt Ppmd7z_RangeDec_Init(CPpmd7z_RangeDec *p);
+#define Ppmd7z_RangeDec_IsFinishedOK(p) ((p)->Code == 0)
+
+int Ppmd7_DecodeSymbol(CPpmd7 *p, const IPpmd7_RangeDec *rc);
+
+
+/* ---------- Encode ---------- */
+
+typedef struct
+{
+  UInt64 Low;
+  UInt32 Range;
+  Byte Cache;
+  UInt64 CacheSize;
+  IByteOut *Stream;
+} CPpmd7z_RangeEnc;
+
+void Ppmd7z_RangeEnc_Init(CPpmd7z_RangeEnc *p);
+void Ppmd7z_RangeEnc_FlushData(CPpmd7z_RangeEnc *p);
+
+void Ppmd7_EncodeSymbol(CPpmd7 *p, CPpmd7z_RangeEnc *rc, int symbol);
+
+EXTERN_C_END
+ 
+#endif
diff --git a/3rdparty/7z/src/Ppmd7Dec.c b/3rdparty/7z/src/Ppmd7Dec.c
new file mode 100644
index 0000000000..2026407108
--- /dev/null
+++ b/3rdparty/7z/src/Ppmd7Dec.c
@@ -0,0 +1,191 @@
+/* Ppmd7Dec.c -- PPMdH Decoder
+2018-07-04 : Igor Pavlov : Public domain
+This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
+
+#include "Precomp.h"
+
+#include "Ppmd7.h"
+
+#define kTopValue (1 << 24)
+
+BoolInt Ppmd7z_RangeDec_Init(CPpmd7z_RangeDec *p)
+{
+  unsigned i;
+  p->Code = 0;
+  p->Range = 0xFFFFFFFF;
+  if (IByteIn_Read(p->Stream) != 0)
+    return False;
+  for (i = 0; i < 4; i++)
+    p->Code = (p->Code << 8) | IByteIn_Read(p->Stream);
+  return (p->Code < 0xFFFFFFFF);
+}
+
+#define GET_Ppmd7z_RangeDec CPpmd7z_RangeDec *p = CONTAINER_FROM_VTBL(pp, CPpmd7z_RangeDec, vt);
+ 
+static UInt32 Range_GetThreshold(const IPpmd7_RangeDec *pp, UInt32 total)
+{
+  GET_Ppmd7z_RangeDec
+  return p->Code / (p->Range /= total);
+}
+
+static void Range_Normalize(CPpmd7z_RangeDec *p)
+{
+  if (p->Range < kTopValue)
+  {
+    p->Code = (p->Code << 8) | IByteIn_Read(p->Stream);
+    p->Range <<= 8;
+    if (p->Range < kTopValue)
+    {
+      p->Code = (p->Code << 8) | IByteIn_Read(p->Stream);
+      p->Range <<= 8;
+    }
+  }
+}
+
+static void Range_Decode(const IPpmd7_RangeDec *pp, UInt32 start, UInt32 size)
+{
+  GET_Ppmd7z_RangeDec
+  p->Code -= start * p->Range;
+  p->Range *= size;
+  Range_Normalize(p);
+}
+
+static UInt32 Range_DecodeBit(const IPpmd7_RangeDec *pp, UInt32 size0)
+{
+  GET_Ppmd7z_RangeDec
+  UInt32 newBound = (p->Range >> 14) * size0;
+  UInt32 symbol;
+  if (p->Code < newBound)
+  {
+    symbol = 0;
+    p->Range = newBound;
+  }
+  else
+  {
+    symbol = 1;
+    p->Code -= newBound;
+    p->Range -= newBound;
+  }
+  Range_Normalize(p);
+  return symbol;
+}
+
+void Ppmd7z_RangeDec_CreateVTable(CPpmd7z_RangeDec *p)
+{
+  p->vt.GetThreshold = Range_GetThreshold;
+  p->vt.Decode = Range_Decode;
+  p->vt.DecodeBit = Range_DecodeBit;
+}
+
+
+#define MASK(sym) ((signed char *)charMask)[sym]
+
+int Ppmd7_DecodeSymbol(CPpmd7 *p, const IPpmd7_RangeDec *rc)
+{
+  size_t charMask[256 / sizeof(size_t)];
+  if (p->MinContext->NumStats != 1)
+  {
+    CPpmd_State *s = Ppmd7_GetStats(p, p->MinContext);
+    unsigned i;
+    UInt32 count, hiCnt;
+    if ((count = rc->GetThreshold(rc, p->MinContext->SummFreq)) < (hiCnt = s->Freq))
+    {
+      Byte symbol;
+      rc->Decode(rc, 0, s->Freq);
+      p->FoundState = s;
+      symbol = s->Symbol;
+      Ppmd7_Update1_0(p);
+      return symbol;
+    }
+    p->PrevSuccess = 0;
+    i = p->MinContext->NumStats - 1;
+    do
+    {
+      if ((hiCnt += (++s)->Freq) > count)
+      {
+        Byte symbol;
+        rc->Decode(rc, hiCnt - s->Freq, s->Freq);
+        p->FoundState = s;
+        symbol = s->Symbol;
+        Ppmd7_Update1(p);
+        return symbol;
+      }
+    }
+    while (--i);
+    if (count >= p->MinContext->SummFreq)
+      return -2;
+    p->HiBitsFlag = p->HB2Flag[p->FoundState->Symbol];
+    rc->Decode(rc, hiCnt, p->MinContext->SummFreq - hiCnt);
+    PPMD_SetAllBitsIn256Bytes(charMask);
+    MASK(s->Symbol) = 0;
+    i = p->MinContext->NumStats - 1;
+    do { MASK((--s)->Symbol) = 0; } while (--i);
+  }
+  else
+  {
+    UInt16 *prob = Ppmd7_GetBinSumm(p);
+    if (rc->DecodeBit(rc, *prob) == 0)
+    {
+      Byte symbol;
+      *prob = (UInt16)PPMD_UPDATE_PROB_0(*prob);
+      symbol = (p->FoundState = Ppmd7Context_OneState(p->MinContext))->Symbol;
+      Ppmd7_UpdateBin(p);
+      return symbol;
+    }
+    *prob = (UInt16)PPMD_UPDATE_PROB_1(*prob);
+    p->InitEsc = PPMD7_kExpEscape[*prob >> 10];
+    PPMD_SetAllBitsIn256Bytes(charMask);
+    MASK(Ppmd7Context_OneState(p->MinContext)->Symbol) = 0;
+    p->PrevSuccess = 0;
+  }
+  for (;;)
+  {
+    CPpmd_State *ps[256], *s;
+    UInt32 freqSum, count, hiCnt;
+    CPpmd_See *see;
+    unsigned i, num, numMasked = p->MinContext->NumStats;
+    do
+    {
+      p->OrderFall++;
+      if (!p->MinContext->Suffix)
+        return -1;
+      p->MinContext = Ppmd7_GetContext(p, p->MinContext->Suffix);
+    }
+    while (p->MinContext->NumStats == numMasked);
+    hiCnt = 0;
+    s = Ppmd7_GetStats(p, p->MinContext);
+    i = 0;
+    num = p->MinContext->NumStats - numMasked;
+    do
+    {
+      int k = (int)(MASK(s->Symbol));
+      hiCnt += (s->Freq & k);
+      ps[i] = s++;
+      i -= k;
+    }
+    while (i != num);
+    
+    see = Ppmd7_MakeEscFreq(p, numMasked, &freqSum);
+    freqSum += hiCnt;
+    count = rc->GetThreshold(rc, freqSum);
+    
+    if (count < hiCnt)
+    {
+      Byte symbol;
+      CPpmd_State **pps = ps;
+      for (hiCnt = 0; (hiCnt += (*pps)->Freq) <= count; pps++);
+      s = *pps;
+      rc->Decode(rc, hiCnt - s->Freq, s->Freq);
+      Ppmd_See_Update(see);
+      p->FoundState = s;
+      symbol = s->Symbol;
+      Ppmd7_Update2(p);
+      return symbol;
+    }
+    if (count >= freqSum)
+      return -2;
+    rc->Decode(rc, hiCnt, freqSum - hiCnt);
+    see->Summ = (UInt16)(see->Summ + freqSum);
+    do { MASK(ps[--i]->Symbol) = 0; } while (i != 0);
+  }
+}
diff --git a/3rdparty/7z/src/Ppmd7Enc.c b/3rdparty/7z/src/Ppmd7Enc.c
new file mode 100644
index 0000000000..a74d3002b6
--- /dev/null
+++ b/3rdparty/7z/src/Ppmd7Enc.c
@@ -0,0 +1,187 @@
+/* Ppmd7Enc.c -- PPMdH Encoder
+2017-04-03 : Igor Pavlov : Public domain
+This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
+
+#include "Precomp.h"
+
+#include "Ppmd7.h"
+
+#define kTopValue (1 << 24)
+
+void Ppmd7z_RangeEnc_Init(CPpmd7z_RangeEnc *p)
+{
+  p->Low = 0;
+  p->Range = 0xFFFFFFFF;
+  p->Cache = 0;
+  p->CacheSize = 1;
+}
+
+static void RangeEnc_ShiftLow(CPpmd7z_RangeEnc *p)
+{
+  if ((UInt32)p->Low < (UInt32)0xFF000000 || (unsigned)(p->Low >> 32) != 0)
+  {
+    Byte temp = p->Cache;
+    do
+    {
+      IByteOut_Write(p->Stream, (Byte)(temp + (Byte)(p->Low >> 32)));
+      temp = 0xFF;
+    }
+    while (--p->CacheSize != 0);
+    p->Cache = (Byte)((UInt32)p->Low >> 24);
+  }
+  p->CacheSize++;
+  p->Low = (UInt32)p->Low << 8;
+}
+
+static void RangeEnc_Encode(CPpmd7z_RangeEnc *p, UInt32 start, UInt32 size, UInt32 total)
+{
+  p->Low += start * (p->Range /= total);
+  p->Range *= size;
+  while (p->Range < kTopValue)
+  {
+    p->Range <<= 8;
+    RangeEnc_ShiftLow(p);
+  }
+}
+
+static void RangeEnc_EncodeBit_0(CPpmd7z_RangeEnc *p, UInt32 size0)
+{
+  p->Range = (p->Range >> 14) * size0;
+  while (p->Range < kTopValue)
+  {
+    p->Range <<= 8;
+    RangeEnc_ShiftLow(p);
+  }
+}
+
+static void RangeEnc_EncodeBit_1(CPpmd7z_RangeEnc *p, UInt32 size0)
+{
+  UInt32 newBound = (p->Range >> 14) * size0;
+  p->Low += newBound;
+  p->Range -= newBound;
+  while (p->Range < kTopValue)
+  {
+    p->Range <<= 8;
+    RangeEnc_ShiftLow(p);
+  }
+}
+
+void Ppmd7z_RangeEnc_FlushData(CPpmd7z_RangeEnc *p)
+{
+  unsigned i;
+  for (i = 0; i < 5; i++)
+    RangeEnc_ShiftLow(p);
+}
+
+
+#define MASK(sym) ((signed char *)charMask)[sym]
+
+void Ppmd7_EncodeSymbol(CPpmd7 *p, CPpmd7z_RangeEnc *rc, int symbol)
+{
+  size_t charMask[256 / sizeof(size_t)];
+  if (p->MinContext->NumStats != 1)
+  {
+    CPpmd_State *s = Ppmd7_GetStats(p, p->MinContext);
+    UInt32 sum;
+    unsigned i;
+    if (s->Symbol == symbol)
+    {
+      RangeEnc_Encode(rc, 0, s->Freq, p->MinContext->SummFreq);
+      p->FoundState = s;
+      Ppmd7_Update1_0(p);
+      return;
+    }
+    p->PrevSuccess = 0;
+    sum = s->Freq;
+    i = p->MinContext->NumStats - 1;
+    do
+    {
+      if ((++s)->Symbol == symbol)
+      {
+        RangeEnc_Encode(rc, sum, s->Freq, p->MinContext->SummFreq);
+        p->FoundState = s;
+        Ppmd7_Update1(p);
+        return;
+      }
+      sum += s->Freq;
+    }
+    while (--i);
+    
+    p->HiBitsFlag = p->HB2Flag[p->FoundState->Symbol];
+    PPMD_SetAllBitsIn256Bytes(charMask);
+    MASK(s->Symbol) = 0;
+    i = p->MinContext->NumStats - 1;
+    do { MASK((--s)->Symbol) = 0; } while (--i);
+    RangeEnc_Encode(rc, sum, p->MinContext->SummFreq - sum, p->MinContext->SummFreq);
+  }
+  else
+  {
+    UInt16 *prob = Ppmd7_GetBinSumm(p);
+    CPpmd_State *s = Ppmd7Context_OneState(p->MinContext);
+    if (s->Symbol == symbol)
+    {
+      RangeEnc_EncodeBit_0(rc, *prob);
+      *prob = (UInt16)PPMD_UPDATE_PROB_0(*prob);
+      p->FoundState = s;
+      Ppmd7_UpdateBin(p);
+      return;
+    }
+    else
+    {
+      RangeEnc_EncodeBit_1(rc, *prob);
+      *prob = (UInt16)PPMD_UPDATE_PROB_1(*prob);
+      p->InitEsc = PPMD7_kExpEscape[*prob >> 10];
+      PPMD_SetAllBitsIn256Bytes(charMask);
+      MASK(s->Symbol) = 0;
+      p->PrevSuccess = 0;
+    }
+  }
+  for (;;)
+  {
+    UInt32 escFreq;
+    CPpmd_See *see;
+    CPpmd_State *s;
+    UInt32 sum;
+    unsigned i, numMasked = p->MinContext->NumStats;
+    do
+    {
+      p->OrderFall++;
+      if (!p->MinContext->Suffix)
+        return; /* EndMarker (symbol = -1) */
+      p->MinContext = Ppmd7_GetContext(p, p->MinContext->Suffix);
+    }
+    while (p->MinContext->NumStats == numMasked);
+    
+    see = Ppmd7_MakeEscFreq(p, numMasked, &escFreq);
+    s = Ppmd7_GetStats(p, p->MinContext);
+    sum = 0;
+    i = p->MinContext->NumStats;
+    do
+    {
+      int cur = s->Symbol;
+      if (cur == symbol)
+      {
+        UInt32 low = sum;
+        CPpmd_State *s1 = s;
+        do
+        {
+          sum += (s->Freq & (int)(MASK(s->Symbol)));
+          s++;
+        }
+        while (--i);
+        RangeEnc_Encode(rc, low, s1->Freq, sum + escFreq);
+        Ppmd_See_Update(see);
+        p->FoundState = s1;
+        Ppmd7_Update2(p);
+        return;
+      }
+      sum += (s->Freq & (int)(MASK(cur)));
+      MASK(cur) = 0;
+      s++;
+    }
+    while (--i);
+    
+    RangeEnc_Encode(rc, sum, escFreq, sum + escFreq);
+    see->Summ = (UInt16)(see->Summ + sum + escFreq);
+  }
+}
diff --git a/3rdparty/7z/src/Precomp.h b/3rdparty/7z/src/Precomp.h
new file mode 100644
index 0000000000..edb5814439
--- /dev/null
+++ b/3rdparty/7z/src/Precomp.h
@@ -0,0 +1,10 @@
+/* Precomp.h -- StdAfx
+2013-11-12 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_PRECOMP_H
+#define __7Z_PRECOMP_H
+
+#include "Compiler.h"
+/* #include "7zTypes.h" */
+
+#endif
diff --git a/3rdparty/7z/src/RotateDefs.h b/3rdparty/7z/src/RotateDefs.h
new file mode 100644
index 0000000000..6c790e791e
--- /dev/null
+++ b/3rdparty/7z/src/RotateDefs.h
@@ -0,0 +1,30 @@
+/* RotateDefs.h -- Rotate functions
+2015-03-25 : Igor Pavlov : Public domain */
+
+#ifndef __ROTATE_DEFS_H
+#define __ROTATE_DEFS_H
+
+#ifdef _MSC_VER
+
+#include <stdlib.h>
+
+/* don't use _rotl with MINGW. It can insert slow call to function. */
+ 
+/* #if (_MSC_VER >= 1200) */
+#pragma intrinsic(_rotl)
+#pragma intrinsic(_rotr)
+/* #endif */
+
+#define rotlFixed(x, n) _rotl((x), (n))
+#define rotrFixed(x, n) _rotr((x), (n))
+
+#else
+
+/* new compilers can translate these macros to fast commands. */
+
+#define rotlFixed(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
+#define rotrFixed(x, n) (((x) >> (n)) | ((x) << (32 - (n))))
+
+#endif
+
+#endif
diff --git a/3rdparty/7z/src/Sha256.c b/3rdparty/7z/src/Sha256.c
new file mode 100644
index 0000000000..90994e5abb
--- /dev/null
+++ b/3rdparty/7z/src/Sha256.c
@@ -0,0 +1,248 @@
+/* Crypto/Sha256.c -- SHA-256 Hash
+2017-04-03 : Igor Pavlov : Public domain
+This code is based on public domain code from Wei Dai's Crypto++ library. */
+
+#include "Precomp.h"
+
+#include <string.h>
+
+#include "CpuArch.h"
+#include "RotateDefs.h"
+#include "Sha256.h"
+
+/* define it for speed optimization */
+#ifndef _SFX
+#define _SHA256_UNROLL
+#define _SHA256_UNROLL2
+#endif
+
+/* #define _SHA256_UNROLL2 */
+
+void Sha256_Init(CSha256 *p)
+{
+  p->state[0] = 0x6a09e667;
+  p->state[1] = 0xbb67ae85;
+  p->state[2] = 0x3c6ef372;
+  p->state[3] = 0xa54ff53a;
+  p->state[4] = 0x510e527f;
+  p->state[5] = 0x9b05688c;
+  p->state[6] = 0x1f83d9ab;
+  p->state[7] = 0x5be0cd19;
+  p->count = 0;
+}
+
+#define S0(x) (rotrFixed(x, 2) ^ rotrFixed(x,13) ^ rotrFixed(x, 22))
+#define S1(x) (rotrFixed(x, 6) ^ rotrFixed(x,11) ^ rotrFixed(x, 25))
+#define s0(x) (rotrFixed(x, 7) ^ rotrFixed(x,18) ^ (x >> 3))
+#define s1(x) (rotrFixed(x,17) ^ rotrFixed(x,19) ^ (x >> 10))
+
+#define blk0(i) (W[i])
+#define blk2(i) (W[i] += s1(W[((i)-2)&15]) + W[((i)-7)&15] + s0(W[((i)-15)&15]))
+
+#define Ch(x,y,z) (z^(x&(y^z)))
+#define Maj(x,y,z) ((x&y)|(z&(x|y)))
+
+#ifdef _SHA256_UNROLL2
+
+#define R(a,b,c,d,e,f,g,h, i) \
+    h += S1(e) + Ch(e,f,g) + K[(i)+(size_t)(j)] + (j ? blk2(i) : blk0(i)); \
+    d += h; \
+    h += S0(a) + Maj(a, b, c)
+
+#define RX_8(i) \
+  R(a,b,c,d,e,f,g,h, i); \
+  R(h,a,b,c,d,e,f,g, i+1); \
+  R(g,h,a,b,c,d,e,f, i+2); \
+  R(f,g,h,a,b,c,d,e, i+3); \
+  R(e,f,g,h,a,b,c,d, i+4); \
+  R(d,e,f,g,h,a,b,c, i+5); \
+  R(c,d,e,f,g,h,a,b, i+6); \
+  R(b,c,d,e,f,g,h,a, i+7)
+
+#define RX_16  RX_8(0); RX_8(8);
+
+#else
+
+#define a(i) T[(0-(i))&7]
+#define b(i) T[(1-(i))&7]
+#define c(i) T[(2-(i))&7]
+#define d(i) T[(3-(i))&7]
+#define e(i) T[(4-(i))&7]
+#define f(i) T[(5-(i))&7]
+#define g(i) T[(6-(i))&7]
+#define h(i) T[(7-(i))&7]
+
+#define R(i) \
+    h(i) += S1(e(i)) + Ch(e(i),f(i),g(i)) + K[(i)+(size_t)(j)] + (j ? blk2(i) : blk0(i)); \
+    d(i) += h(i); \
+    h(i) += S0(a(i)) + Maj(a(i), b(i), c(i)) \
+
+#ifdef _SHA256_UNROLL
+
+#define RX_8(i)  R(i+0); R(i+1); R(i+2); R(i+3); R(i+4); R(i+5); R(i+6); R(i+7);
+#define RX_16  RX_8(0); RX_8(8);
+
+#else
+
+#define RX_16  unsigned i; for (i = 0; i < 16; i++) { R(i); }
+
+#endif
+
+#endif
+
+static const UInt32 K[64] = {
+  0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
+  0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+  0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
+  0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+  0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
+  0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+  0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
+  0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+  0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
+  0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+  0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
+  0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+  0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
+  0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+  0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
+  0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+};
+
+static void Sha256_WriteByteBlock(CSha256 *p)
+{
+  UInt32 W[16];
+  unsigned j;
+  UInt32 *state;
+
+  #ifdef _SHA256_UNROLL2
+  UInt32 a,b,c,d,e,f,g,h;
+  #else
+  UInt32 T[8];
+  #endif
+
+  for (j = 0; j < 16; j += 4)
+  {
+    const Byte *ccc = p->buffer + j * 4;
+    W[j    ] = GetBe32(ccc);
+    W[j + 1] = GetBe32(ccc + 4);
+    W[j + 2] = GetBe32(ccc + 8);
+    W[j + 3] = GetBe32(ccc + 12);
+  }
+
+  state = p->state;
+
+  #ifdef _SHA256_UNROLL2
+  a = state[0];
+  b = state[1];
+  c = state[2];
+  d = state[3];
+  e = state[4];
+  f = state[5];
+  g = state[6];
+  h = state[7];
+  #else
+  for (j = 0; j < 8; j++)
+    T[j] = state[j];
+  #endif
+
+  for (j = 0; j < 64; j += 16)
+  {
+    RX_16
+  }
+
+  #ifdef _SHA256_UNROLL2
+  state[0] += a;
+  state[1] += b;
+  state[2] += c;
+  state[3] += d;
+  state[4] += e;
+  state[5] += f;
+  state[6] += g;
+  state[7] += h;
+  #else
+  for (j = 0; j < 8; j++)
+    state[j] += T[j];
+  #endif
+  
+  /* Wipe variables */
+  /* memset(W, 0, sizeof(W)); */
+  /* memset(T, 0, sizeof(T)); */
+}
+
+#undef S0
+#undef S1
+#undef s0
+#undef s1
+
+void Sha256_Update(CSha256 *p, const Byte *data, size_t size)
+{
+  if (size == 0)
+    return;
+
+  {
+    unsigned pos = (unsigned)p->count & 0x3F;
+    unsigned num;
+    
+    p->count += size;
+    
+    num = 64 - pos;
+    if (num > size)
+    {
+      memcpy(p->buffer + pos, data, size);
+      return;
+    }
+    
+    size -= num;
+    memcpy(p->buffer + pos, data, num);
+    data += num;
+  }
+
+  for (;;)
+  {
+    Sha256_WriteByteBlock(p);
+    if (size < 64)
+      break;
+    size -= 64;
+    memcpy(p->buffer, data, 64);
+    data += 64;
+  }
+
+  if (size != 0)
+    memcpy(p->buffer, data, size);
+}
+
+void Sha256_Final(CSha256 *p, Byte *digest)
+{
+  unsigned pos = (unsigned)p->count & 0x3F;
+  unsigned i;
+  
+  p->buffer[pos++] = 0x80;
+  
+  while (pos != (64 - 8))
+  {
+    pos &= 0x3F;
+    if (pos == 0)
+      Sha256_WriteByteBlock(p);
+    p->buffer[pos++] = 0;
+  }
+
+  {
+    UInt64 numBits = (p->count << 3);
+    SetBe32(p->buffer + 64 - 8, (UInt32)(numBits >> 32));
+    SetBe32(p->buffer + 64 - 4, (UInt32)(numBits));
+  }
+  
+  Sha256_WriteByteBlock(p);
+
+  for (i = 0; i < 8; i += 2)
+  {
+    UInt32 v0 = p->state[i];
+    UInt32 v1 = p->state[i + 1];
+    SetBe32(digest    , v0);
+    SetBe32(digest + 4, v1);
+    digest += 8;
+  }
+  
+  Sha256_Init(p);
+}
diff --git a/3rdparty/7z/src/Sha256.h b/3rdparty/7z/src/Sha256.h
new file mode 100644
index 0000000000..7f17ccf9c9
--- /dev/null
+++ b/3rdparty/7z/src/Sha256.h
@@ -0,0 +1,26 @@
+/* Sha256.h -- SHA-256 Hash
+2013-01-18 : Igor Pavlov : Public domain */
+
+#ifndef __CRYPTO_SHA256_H
+#define __CRYPTO_SHA256_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+#define SHA256_DIGEST_SIZE 32
+
+typedef struct
+{
+  UInt32 state[8];
+  UInt64 count;
+  Byte buffer[64];
+} CSha256;
+
+void Sha256_Init(CSha256 *p);
+void Sha256_Update(CSha256 *p, const Byte *data, size_t size);
+void Sha256_Final(CSha256 *p, Byte *digest);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/Sort.c b/3rdparty/7z/src/Sort.c
new file mode 100644
index 0000000000..73dcbf0596
--- /dev/null
+++ b/3rdparty/7z/src/Sort.c
@@ -0,0 +1,141 @@
+/* Sort.c -- Sort functions
+2014-04-05 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "Sort.h"
+
+#define HeapSortDown(p, k, size, temp) \
+  { for (;;) { \
+    size_t s = (k << 1); \
+    if (s > size) break; \
+    if (s < size && p[s + 1] > p[s]) s++; \
+    if (temp >= p[s]) break; \
+    p[k] = p[s]; k = s; \
+  } p[k] = temp; }
+
+void HeapSort(UInt32 *p, size_t size)
+{
+  if (size <= 1)
+    return;
+  p--;
+  {
+    size_t i = size / 2;
+    do
+    {
+      UInt32 temp = p[i];
+      size_t k = i;
+      HeapSortDown(p, k, size, temp)
+    }
+    while (--i != 0);
+  }
+  /*
+  do
+  {
+    size_t k = 1;
+    UInt32 temp = p[size];
+    p[size--] = p[1];
+    HeapSortDown(p, k, size, temp)
+  }
+  while (size > 1);
+  */
+  while (size > 3)
+  {
+    UInt32 temp = p[size];
+    size_t k = (p[3] > p[2]) ? 3 : 2;
+    p[size--] = p[1];
+    p[1] = p[k];
+    HeapSortDown(p, k, size, temp)
+  }
+  {
+    UInt32 temp = p[size];
+    p[size] = p[1];
+    if (size > 2 && p[2] < temp)
+    {
+      p[1] = p[2];
+      p[2] = temp;
+    }
+    else
+      p[1] = temp;
+  }
+}
+
+void HeapSort64(UInt64 *p, size_t size)
+{
+  if (size <= 1)
+    return;
+  p--;
+  {
+    size_t i = size / 2;
+    do
+    {
+      UInt64 temp = p[i];
+      size_t k = i;
+      HeapSortDown(p, k, size, temp)
+    }
+    while (--i != 0);
+  }
+  /*
+  do
+  {
+    size_t k = 1;
+    UInt64 temp = p[size];
+    p[size--] = p[1];
+    HeapSortDown(p, k, size, temp)
+  }
+  while (size > 1);
+  */
+  while (size > 3)
+  {
+    UInt64 temp = p[size];
+    size_t k = (p[3] > p[2]) ? 3 : 2;
+    p[size--] = p[1];
+    p[1] = p[k];
+    HeapSortDown(p, k, size, temp)
+  }
+  {
+    UInt64 temp = p[size];
+    p[size] = p[1];
+    if (size > 2 && p[2] < temp)
+    {
+      p[1] = p[2];
+      p[2] = temp;
+    }
+    else
+      p[1] = temp;
+  }
+}
+
+/*
+#define HeapSortRefDown(p, vals, n, size, temp) \
+  { size_t k = n; UInt32 val = vals[temp]; for (;;) { \
+    size_t s = (k << 1); \
+    if (s > size) break; \
+    if (s < size && vals[p[s + 1]] > vals[p[s]]) s++; \
+    if (val >= vals[p[s]]) break; \
+    p[k] = p[s]; k = s; \
+  } p[k] = temp; }
+
+void HeapSortRef(UInt32 *p, UInt32 *vals, size_t size)
+{
+  if (size <= 1)
+    return;
+  p--;
+  {
+    size_t i = size / 2;
+    do
+    {
+      UInt32 temp = p[i];
+      HeapSortRefDown(p, vals, i, size, temp);
+    }
+    while (--i != 0);
+  }
+  do
+  {
+    UInt32 temp = p[size];
+    p[size--] = p[1];
+    HeapSortRefDown(p, vals, 1, size, temp);
+  }
+  while (size > 1);
+}
+*/
diff --git a/3rdparty/7z/src/Sort.h b/3rdparty/7z/src/Sort.h
new file mode 100644
index 0000000000..7209d7824d
--- /dev/null
+++ b/3rdparty/7z/src/Sort.h
@@ -0,0 +1,18 @@
+/* Sort.h -- Sort functions
+2014-04-05 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_SORT_H
+#define __7Z_SORT_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+void HeapSort(UInt32 *p, size_t size);
+void HeapSort64(UInt64 *p, size_t size);
+
+/* void HeapSortRef(UInt32 *p, UInt32 *vals, size_t size); */
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/Threads.c b/3rdparty/7z/src/Threads.c
new file mode 100644
index 0000000000..8fd86f224b
--- /dev/null
+++ b/3rdparty/7z/src/Threads.c
@@ -0,0 +1,95 @@
+/* Threads.c -- multithreading library
+2017-06-26 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#ifndef UNDER_CE
+#include <process.h>
+#endif
+
+#include "Threads.h"
+
+static WRes GetError()
+{
+  DWORD res = GetLastError();
+  return res ? (WRes)res : 1;
+}
+
+static WRes HandleToWRes(HANDLE h) { return (h != NULL) ? 0 : GetError(); }
+static WRes BOOLToWRes(BOOL v) { return v ? 0 : GetError(); }
+
+WRes HandlePtr_Close(HANDLE *p)
+{
+  if (*p != NULL)
+  {
+    if (!CloseHandle(*p))
+      return GetError();
+    *p = NULL;
+  }
+  return 0;
+}
+
+WRes Handle_WaitObject(HANDLE h) { return (WRes)WaitForSingleObject(h, INFINITE); }
+
+WRes Thread_Create(CThread *p, THREAD_FUNC_TYPE func, LPVOID param)
+{
+  /* Windows Me/98/95: threadId parameter may not be NULL in _beginthreadex/CreateThread functions */
+  
+  #ifdef UNDER_CE
+  
+  DWORD threadId;
+  *p = CreateThread(0, 0, func, param, 0, &threadId);
+
+  #else
+
+  unsigned threadId;
+  *p = (HANDLE)_beginthreadex(NULL, 0, func, param, 0, &threadId);
+   
+  #endif
+
+  /* maybe we must use errno here, but probably GetLastError() is also OK. */
+  return HandleToWRes(*p);
+}
+
+static WRes Event_Create(CEvent *p, BOOL manualReset, int signaled)
+{
+  *p = CreateEvent(NULL, manualReset, (signaled ? TRUE : FALSE), NULL);
+  return HandleToWRes(*p);
+}
+
+WRes Event_Set(CEvent *p) { return BOOLToWRes(SetEvent(*p)); }
+WRes Event_Reset(CEvent *p) { return BOOLToWRes(ResetEvent(*p)); }
+
+WRes ManualResetEvent_Create(CManualResetEvent *p, int signaled) { return Event_Create(p, TRUE, signaled); }
+WRes AutoResetEvent_Create(CAutoResetEvent *p, int signaled) { return Event_Create(p, FALSE, signaled); }
+WRes ManualResetEvent_CreateNotSignaled(CManualResetEvent *p) { return ManualResetEvent_Create(p, 0); }
+WRes AutoResetEvent_CreateNotSignaled(CAutoResetEvent *p) { return AutoResetEvent_Create(p, 0); }
+
+
+WRes Semaphore_Create(CSemaphore *p, UInt32 initCount, UInt32 maxCount)
+{
+  *p = CreateSemaphore(NULL, (LONG)initCount, (LONG)maxCount, NULL);
+  return HandleToWRes(*p);
+}
+
+static WRes Semaphore_Release(CSemaphore *p, LONG releaseCount, LONG *previousCount)
+  { return BOOLToWRes(ReleaseSemaphore(*p, releaseCount, previousCount)); }
+WRes Semaphore_ReleaseN(CSemaphore *p, UInt32 num)
+  { return Semaphore_Release(p, (LONG)num, NULL); }
+WRes Semaphore_Release1(CSemaphore *p) { return Semaphore_ReleaseN(p, 1); }
+
+WRes CriticalSection_Init(CCriticalSection *p)
+{
+  /* InitializeCriticalSection can raise only STATUS_NO_MEMORY exception */
+  #ifdef _MSC_VER
+  __try
+  #endif
+  {
+    InitializeCriticalSection(p);
+    /* InitializeCriticalSectionAndSpinCount(p, 0); */
+  }
+  #ifdef _MSC_VER
+  __except (EXCEPTION_EXECUTE_HANDLER) { return 1; }
+  #endif
+  return 0;
+}
diff --git a/3rdparty/7z/src/Threads.h b/3rdparty/7z/src/Threads.h
new file mode 100644
index 0000000000..f913241aea
--- /dev/null
+++ b/3rdparty/7z/src/Threads.h
@@ -0,0 +1,68 @@
+/* Threads.h -- multithreading library
+2017-06-18 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_THREADS_H
+#define __7Z_THREADS_H
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+WRes HandlePtr_Close(HANDLE *h);
+WRes Handle_WaitObject(HANDLE h);
+
+typedef HANDLE CThread;
+#define Thread_Construct(p) *(p) = NULL
+#define Thread_WasCreated(p) (*(p) != NULL)
+#define Thread_Close(p) HandlePtr_Close(p)
+#define Thread_Wait(p) Handle_WaitObject(*(p))
+
+typedef
+#ifdef UNDER_CE
+  DWORD
+#else
+  unsigned
+#endif
+  THREAD_FUNC_RET_TYPE;
+
+#define THREAD_FUNC_CALL_TYPE MY_STD_CALL
+#define THREAD_FUNC_DECL THREAD_FUNC_RET_TYPE THREAD_FUNC_CALL_TYPE
+typedef THREAD_FUNC_RET_TYPE (THREAD_FUNC_CALL_TYPE * THREAD_FUNC_TYPE)(void *);
+WRes Thread_Create(CThread *p, THREAD_FUNC_TYPE func, LPVOID param);
+
+typedef HANDLE CEvent;
+typedef CEvent CAutoResetEvent;
+typedef CEvent CManualResetEvent;
+#define Event_Construct(p) *(p) = NULL
+#define Event_IsCreated(p) (*(p) != NULL)
+#define Event_Close(p) HandlePtr_Close(p)
+#define Event_Wait(p) Handle_WaitObject(*(p))
+WRes Event_Set(CEvent *p);
+WRes Event_Reset(CEvent *p);
+WRes ManualResetEvent_Create(CManualResetEvent *p, int signaled);
+WRes ManualResetEvent_CreateNotSignaled(CManualResetEvent *p);
+WRes AutoResetEvent_Create(CAutoResetEvent *p, int signaled);
+WRes AutoResetEvent_CreateNotSignaled(CAutoResetEvent *p);
+
+typedef HANDLE CSemaphore;
+#define Semaphore_Construct(p) *(p) = NULL
+#define Semaphore_IsCreated(p) (*(p) != NULL)
+#define Semaphore_Close(p) HandlePtr_Close(p)
+#define Semaphore_Wait(p) Handle_WaitObject(*(p))
+WRes Semaphore_Create(CSemaphore *p, UInt32 initCount, UInt32 maxCount);
+WRes Semaphore_ReleaseN(CSemaphore *p, UInt32 num);
+WRes Semaphore_Release1(CSemaphore *p);
+
+typedef CRITICAL_SECTION CCriticalSection;
+WRes CriticalSection_Init(CCriticalSection *p);
+#define CriticalSection_Delete(p) DeleteCriticalSection(p)
+#define CriticalSection_Enter(p) EnterCriticalSection(p)
+#define CriticalSection_Leave(p) LeaveCriticalSection(p)
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/Xz.c b/3rdparty/7z/src/Xz.c
new file mode 100644
index 0000000000..7e061d6e7d
--- /dev/null
+++ b/3rdparty/7z/src/Xz.c
@@ -0,0 +1,90 @@
+/* Xz.c - Xz
+2017-05-12 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "7zCrc.h"
+#include "CpuArch.h"
+#include "Xz.h"
+#include "XzCrc64.h"
+
+const Byte XZ_SIG[XZ_SIG_SIZE] = { 0xFD, '7', 'z', 'X', 'Z', 0 };
+/* const Byte XZ_FOOTER_SIG[XZ_FOOTER_SIG_SIZE] = { 'Y', 'Z' }; */
+
+unsigned Xz_WriteVarInt(Byte *buf, UInt64 v)
+{
+  unsigned i = 0;
+  do
+  {
+    buf[i++] = (Byte)((v & 0x7F) | 0x80);
+    v >>= 7;
+  }
+  while (v != 0);
+  buf[(size_t)i - 1] &= 0x7F;
+  return i;
+}
+
+void Xz_Construct(CXzStream *p)
+{
+  p->numBlocks = 0;
+  p->blocks = NULL;
+  p->flags = 0;
+}
+
+void Xz_Free(CXzStream *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->blocks);
+  p->numBlocks = 0;
+  p->blocks = NULL;
+}
+
+unsigned XzFlags_GetCheckSize(CXzStreamFlags f)
+{
+  unsigned t = XzFlags_GetCheckType(f);
+  return (t == 0) ? 0 : (4 << ((t - 1) / 3));
+}
+
+void XzCheck_Init(CXzCheck *p, unsigned mode)
+{
+  p->mode = mode;
+  switch (mode)
+  {
+    case XZ_CHECK_CRC32: p->crc = CRC_INIT_VAL; break;
+    case XZ_CHECK_CRC64: p->crc64 = CRC64_INIT_VAL; break;
+    case XZ_CHECK_SHA256: Sha256_Init(&p->sha); break;
+  }
+}
+
+void XzCheck_Update(CXzCheck *p, const void *data, size_t size)
+{
+  switch (p->mode)
+  {
+    case XZ_CHECK_CRC32: p->crc = CrcUpdate(p->crc, data, size); break;
+    case XZ_CHECK_CRC64: p->crc64 = Crc64Update(p->crc64, data, size); break;
+    case XZ_CHECK_SHA256: Sha256_Update(&p->sha, (const Byte *)data, size); break;
+  }
+}
+
+int XzCheck_Final(CXzCheck *p, Byte *digest)
+{
+  switch (p->mode)
+  {
+    case XZ_CHECK_CRC32:
+      SetUi32(digest, CRC_GET_DIGEST(p->crc));
+      break;
+    case XZ_CHECK_CRC64:
+    {
+      int i;
+      UInt64 v = CRC64_GET_DIGEST(p->crc64);
+      for (i = 0; i < 8; i++, v >>= 8)
+        digest[i] = (Byte)(v & 0xFF);
+      break;
+    }
+    case XZ_CHECK_SHA256:
+      Sha256_Final(&p->sha, digest);
+      break;
+    default:
+      return 0;
+  }
+  return 1;
+}
diff --git a/3rdparty/7z/src/Xz.h b/3rdparty/7z/src/Xz.h
new file mode 100644
index 0000000000..fad56a3fb7
--- /dev/null
+++ b/3rdparty/7z/src/Xz.h
@@ -0,0 +1,460 @@
+/* Xz.h - Xz interface
+2018-07-04 : Igor Pavlov : Public domain */
+
+#ifndef __XZ_H
+#define __XZ_H
+
+#include "Sha256.h"
+
+EXTERN_C_BEGIN
+
+#define XZ_ID_Subblock 1
+#define XZ_ID_Delta 3
+#define XZ_ID_X86 4
+#define XZ_ID_PPC 5
+#define XZ_ID_IA64 6
+#define XZ_ID_ARM 7
+#define XZ_ID_ARMT 8
+#define XZ_ID_SPARC 9
+#define XZ_ID_LZMA2 0x21
+
+unsigned Xz_ReadVarInt(const Byte *p, size_t maxSize, UInt64 *value);
+unsigned Xz_WriteVarInt(Byte *buf, UInt64 v);
+
+/* ---------- xz block ---------- */
+
+#define XZ_BLOCK_HEADER_SIZE_MAX 1024
+
+#define XZ_NUM_FILTERS_MAX 4
+#define XZ_BF_NUM_FILTERS_MASK 3
+#define XZ_BF_PACK_SIZE (1 << 6)
+#define XZ_BF_UNPACK_SIZE (1 << 7)
+
+#define XZ_FILTER_PROPS_SIZE_MAX 20
+
+typedef struct
+{
+  UInt64 id;
+  UInt32 propsSize;
+  Byte props[XZ_FILTER_PROPS_SIZE_MAX];
+} CXzFilter;
+
+typedef struct
+{
+  UInt64 packSize;
+  UInt64 unpackSize;
+  Byte flags;
+  CXzFilter filters[XZ_NUM_FILTERS_MAX];
+} CXzBlock;
+
+#define XzBlock_GetNumFilters(p) (((p)->flags & XZ_BF_NUM_FILTERS_MASK) + 1)
+#define XzBlock_HasPackSize(p)   (((p)->flags & XZ_BF_PACK_SIZE) != 0)
+#define XzBlock_HasUnpackSize(p) (((p)->flags & XZ_BF_UNPACK_SIZE) != 0)
+#define XzBlock_HasUnsupportedFlags(p) (((p)->flags & ~(XZ_BF_NUM_FILTERS_MASK | XZ_BF_PACK_SIZE | XZ_BF_UNPACK_SIZE)) != 0)
+
+SRes XzBlock_Parse(CXzBlock *p, const Byte *header);
+SRes XzBlock_ReadHeader(CXzBlock *p, ISeqInStream *inStream, BoolInt *isIndex, UInt32 *headerSizeRes);
+
+/* ---------- xz stream ---------- */
+
+#define XZ_SIG_SIZE 6
+#define XZ_FOOTER_SIG_SIZE 2
+
+extern const Byte XZ_SIG[XZ_SIG_SIZE];
+
+/*
+extern const Byte XZ_FOOTER_SIG[XZ_FOOTER_SIG_SIZE];
+*/
+
+#define XZ_FOOTER_SIG_0 'Y'
+#define XZ_FOOTER_SIG_1 'Z'
+
+#define XZ_STREAM_FLAGS_SIZE 2
+#define XZ_STREAM_CRC_SIZE 4
+
+#define XZ_STREAM_HEADER_SIZE (XZ_SIG_SIZE + XZ_STREAM_FLAGS_SIZE + XZ_STREAM_CRC_SIZE)
+#define XZ_STREAM_FOOTER_SIZE (XZ_FOOTER_SIG_SIZE + XZ_STREAM_FLAGS_SIZE + XZ_STREAM_CRC_SIZE + 4)
+
+#define XZ_CHECK_MASK 0xF
+#define XZ_CHECK_NO 0
+#define XZ_CHECK_CRC32 1
+#define XZ_CHECK_CRC64 4
+#define XZ_CHECK_SHA256 10
+
+typedef struct
+{
+  unsigned mode;
+  UInt32 crc;
+  UInt64 crc64;
+  CSha256 sha;
+} CXzCheck;
+
+void XzCheck_Init(CXzCheck *p, unsigned mode);
+void XzCheck_Update(CXzCheck *p, const void *data, size_t size);
+int XzCheck_Final(CXzCheck *p, Byte *digest);
+
+typedef UInt16 CXzStreamFlags;
+
+#define XzFlags_IsSupported(f) ((f) <= XZ_CHECK_MASK)
+#define XzFlags_GetCheckType(f) ((f) & XZ_CHECK_MASK)
+#define XzFlags_HasDataCrc32(f) (Xz_GetCheckType(f) == XZ_CHECK_CRC32)
+unsigned XzFlags_GetCheckSize(CXzStreamFlags f);
+
+SRes Xz_ParseHeader(CXzStreamFlags *p, const Byte *buf);
+SRes Xz_ReadHeader(CXzStreamFlags *p, ISeqInStream *inStream);
+
+typedef struct
+{
+  UInt64 unpackSize;
+  UInt64 totalSize;
+} CXzBlockSizes;
+
+typedef struct
+{
+  CXzStreamFlags flags;
+  size_t numBlocks;
+  CXzBlockSizes *blocks;
+  UInt64 startOffset;
+} CXzStream;
+
+void Xz_Construct(CXzStream *p);
+void Xz_Free(CXzStream *p, ISzAllocPtr alloc);
+
+#define XZ_SIZE_OVERFLOW ((UInt64)(Int64)-1)
+
+UInt64 Xz_GetUnpackSize(const CXzStream *p);
+UInt64 Xz_GetPackSize(const CXzStream *p);
+
+typedef struct
+{
+  size_t num;
+  size_t numAllocated;
+  CXzStream *streams;
+} CXzs;
+
+void Xzs_Construct(CXzs *p);
+void Xzs_Free(CXzs *p, ISzAllocPtr alloc);
+SRes Xzs_ReadBackward(CXzs *p, ILookInStream *inStream, Int64 *startOffset, ICompressProgress *progress, ISzAllocPtr alloc);
+
+UInt64 Xzs_GetNumBlocks(const CXzs *p);
+UInt64 Xzs_GetUnpackSize(const CXzs *p);
+
+
+// ECoderStatus values are identical to ELzmaStatus values of LZMA2 decoder
+
+typedef enum
+{
+  CODER_STATUS_NOT_SPECIFIED,               /* use main error code instead */
+  CODER_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
+  CODER_STATUS_NOT_FINISHED,                /* stream was not finished */
+  CODER_STATUS_NEEDS_MORE_INPUT             /* you must provide more input bytes */
+} ECoderStatus;
+
+
+// ECoderFinishMode values are identical to ELzmaFinishMode
+
+typedef enum
+{
+  CODER_FINISH_ANY,   /* finish at any point */
+  CODER_FINISH_END    /* block must be finished at the end */
+} ECoderFinishMode;
+
+
+typedef struct _IStateCoder
+{
+  void *p;
+  void (*Free)(void *p, ISzAllocPtr alloc);
+  SRes (*SetProps)(void *p, const Byte *props, size_t propSize, ISzAllocPtr alloc);
+  void (*Init)(void *p);
+  SRes (*Code2)(void *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+      int srcWasFinished, ECoderFinishMode finishMode,
+      // int *wasFinished,
+      ECoderStatus *status);
+  SizeT (*Filter)(void *p, Byte *data, SizeT size);
+} IStateCoder;
+
+
+
+#define MIXCODER_NUM_FILTERS_MAX 4
+
+typedef struct
+{
+  ISzAllocPtr alloc;
+  Byte *buf;
+  unsigned numCoders;
+
+  Byte *outBuf;
+  size_t outBufSize;
+  size_t outWritten; // is equal to lzmaDecoder.dicPos (in outBuf mode)
+  BoolInt wasFinished;
+  SRes res;
+  ECoderStatus status;
+  // BoolInt SingleBufMode;
+  
+  int finished[MIXCODER_NUM_FILTERS_MAX - 1];
+  size_t pos[MIXCODER_NUM_FILTERS_MAX - 1];
+  size_t size[MIXCODER_NUM_FILTERS_MAX - 1];
+  UInt64 ids[MIXCODER_NUM_FILTERS_MAX];
+  SRes results[MIXCODER_NUM_FILTERS_MAX];
+  IStateCoder coders[MIXCODER_NUM_FILTERS_MAX];
+} CMixCoder;
+
+
+typedef enum
+{
+  XZ_STATE_STREAM_HEADER,
+  XZ_STATE_STREAM_INDEX,
+  XZ_STATE_STREAM_INDEX_CRC,
+  XZ_STATE_STREAM_FOOTER,
+  XZ_STATE_STREAM_PADDING,
+  XZ_STATE_BLOCK_HEADER,
+  XZ_STATE_BLOCK,
+  XZ_STATE_BLOCK_FOOTER
+} EXzState;
+
+
+typedef struct
+{
+  EXzState state;
+  UInt32 pos;
+  unsigned alignPos;
+  unsigned indexPreSize;
+
+  CXzStreamFlags streamFlags;
+  
+  UInt32 blockHeaderSize;
+  UInt64 packSize;
+  UInt64 unpackSize;
+
+  UInt64 numBlocks; // number of finished blocks in current stream
+  UInt64 indexSize;
+  UInt64 indexPos;
+  UInt64 padSize;
+
+  UInt64 numStartedStreams;
+  UInt64 numFinishedStreams;
+  UInt64 numTotalBlocks;
+
+  UInt32 crc;
+  CMixCoder decoder;
+  CXzBlock block;
+  CXzCheck check;
+  CSha256 sha;
+
+  BoolInt parseMode;
+  BoolInt headerParsedOk;
+  BoolInt decodeToStreamSignature;
+  unsigned decodeOnlyOneBlock;
+
+  Byte *outBuf;
+  size_t outBufSize;
+  size_t outDataWritten; // the size of data in (outBuf) that were fully unpacked
+
+  Byte shaDigest[SHA256_DIGEST_SIZE];
+  Byte buf[XZ_BLOCK_HEADER_SIZE_MAX];
+} CXzUnpacker;
+
+/* alloc : aligned for cache line allocation is better */
+void XzUnpacker_Construct(CXzUnpacker *p, ISzAllocPtr alloc);
+void XzUnpacker_Init(CXzUnpacker *p);
+void XzUnpacker_SetOutBuf(CXzUnpacker *p, Byte *outBuf, size_t outBufSize);
+void XzUnpacker_Free(CXzUnpacker *p);
+
+/*
+  XzUnpacker
+  The sequence for decoding functions:
+  {
+    XzUnpacker_Construct()
+    [Decoding_Calls]
+    XzUnpacker_Free()
+  }
+
+  [Decoding_Calls]
+
+  There are 3 types of interfaces for [Decoding_Calls] calls:
+
+  Interface-1 : Partial output buffers:
+    {
+      XzUnpacker_Init()
+      for()
+        XzUnpacker_Code();
+    }
+    
+  Interface-2 : Direct output buffer:
+    Use it, if you know exact size of decoded data, and you need
+    whole xz unpacked data in one output buffer.
+    xz unpacker doesn't allocate additional buffer for lzma2 dictionary in that mode.
+    {
+      XzUnpacker_Init()
+      XzUnpacker_SetOutBufMode(); // to set output buffer and size
+      for()
+        XzUnpacker_Code(); // (dest = NULL) in XzUnpacker_Code()
+    }
+
+  Interface-3 : Direct output buffer : One call full decoding
+    It unpacks whole input buffer to output buffer in one call.
+    It uses Interface-2 internally.
+    {
+      XzUnpacker_CodeFull()
+    }
+*/
+
+/*
+finishMode:
+  It has meaning only if the decoding reaches output limit (*destLen).
+  CODER_FINISH_ANY - use smallest number of input bytes
+  CODER_FINISH_END - read EndOfStream marker after decoding
+
+Returns:
+  SZ_OK
+    status:
+      CODER_STATUS_NOT_FINISHED,
+      CODER_STATUS_NEEDS_MORE_INPUT - maybe there are more xz streams,
+                                      call XzUnpacker_IsStreamWasFinished to check that current stream was finished
+  SZ_ERROR_MEM  - Memory allocation error
+  SZ_ERROR_DATA - Data error
+  SZ_ERROR_UNSUPPORTED - Unsupported method or method properties
+  SZ_ERROR_CRC  - CRC error
+  // SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
+
+  SZ_ERROR_NO_ARCHIVE - the error with xz Stream Header with one of the following reasons:
+     - xz Stream Signature failure
+     - CRC32 of xz Stream Header is failed
+     - The size of Stream padding is not multiple of four bytes.
+    It's possible to get that error, if xz stream was finished and the stream
+    contains some another data. In that case you can call XzUnpacker_GetExtraSize()
+    function to get real size of xz stream.
+*/
+
+
+SRes XzUnpacker_Code(CXzUnpacker *p, Byte *dest, SizeT *destLen,
+    const Byte *src, SizeT *srcLen, int srcFinished,
+    ECoderFinishMode finishMode, ECoderStatus *status);
+
+SRes XzUnpacker_CodeFull(CXzUnpacker *p, Byte *dest, SizeT *destLen,
+    const Byte *src, SizeT *srcLen,
+    ECoderFinishMode finishMode, ECoderStatus *status);
+
+BoolInt XzUnpacker_IsStreamWasFinished(const CXzUnpacker *p);
+
+/*
+XzUnpacker_GetExtraSize() returns then number of uncofirmed bytes,
+ if it's in (XZ_STATE_STREAM_HEADER) state or in (XZ_STATE_STREAM_PADDING) state.
+These bytes can be some bytes after xz archive, or
+it can be start of new xz stream.
+ 
+Call XzUnpacker_GetExtraSize() after XzUnpacker_Code() function to detect real size of
+xz stream in two cases, if XzUnpacker_Code() returns:
+  res == SZ_OK && status == CODER_STATUS_NEEDS_MORE_INPUT
+  res == SZ_ERROR_NO_ARCHIVE
+*/
+
+UInt64 XzUnpacker_GetExtraSize(const CXzUnpacker *p);
+
+
+/*
+  for random block decoding:
+    XzUnpacker_Init();
+    set CXzUnpacker::streamFlags
+    XzUnpacker_PrepareToRandomBlockDecoding()
+    loop
+    {
+      XzUnpacker_Code()
+      XzUnpacker_IsBlockFinished()
+    }
+*/
+
+void XzUnpacker_PrepareToRandomBlockDecoding(CXzUnpacker *p);
+BoolInt XzUnpacker_IsBlockFinished(const CXzUnpacker *p);
+
+#define XzUnpacker_GetPackSizeForIndex(p) ((p)->packSize + (p)->blockHeaderSize + XzFlags_GetCheckSize((p)->streamFlags))
+
+
+
+/* ---------- Multi Threading Decoding ---------- */
+
+
+typedef struct
+{
+  size_t inBufSize_ST;
+  size_t outStep_ST;
+  BoolInt ignoreErrors;
+  
+  #ifndef _7ZIP_ST
+  unsigned numThreads;
+  size_t inBufSize_MT;
+  size_t memUseMax;
+  #endif
+} CXzDecMtProps;
+
+void XzDecMtProps_Init(CXzDecMtProps *p);
+
+
+typedef void * CXzDecMtHandle;
+
+/*
+  alloc    : XzDecMt uses CAlignOffsetAlloc for addresses allocated by (alloc).
+  allocMid : for big allocations, aligned allocation is better
+*/
+
+CXzDecMtHandle XzDecMt_Create(ISzAllocPtr alloc, ISzAllocPtr allocMid);
+void XzDecMt_Destroy(CXzDecMtHandle p);
+
+
+typedef struct
+{
+  Byte UnpackSize_Defined;
+  Byte NumStreams_Defined;
+  Byte NumBlocks_Defined;
+
+  Byte DataAfterEnd;
+  Byte DecodingTruncated; // Decoding was Truncated, we need only partial output data
+
+  UInt64 InSize;  // pack size processed
+  UInt64 OutSize;
+
+  UInt64 NumStreams;
+  UInt64 NumBlocks;
+
+  SRes DecodeRes;
+  SRes ReadRes;
+  SRes ProgressRes;
+  SRes CombinedRes;
+  SRes CombinedRes_Type;
+
+} CXzStatInfo;
+
+void XzStatInfo_Clear(CXzStatInfo *p);
+
+/*
+XzDecMt_Decode()
+SRes:
+  SZ_OK               - OK
+  SZ_ERROR_MEM        - Memory allocation error
+  SZ_ERROR_NO_ARCHIVE - is not xz archive
+  SZ_ERROR_ARCHIVE    - Headers error
+  SZ_ERROR_DATA       - Data Error
+  SZ_ERROR_CRC        - CRC Error
+  SZ_ERROR_INPUT_EOF  - it needs more input data
+  SZ_ERROR_WRITE      - ISeqOutStream error
+  (SZ_ERROR_READ)     - ISeqInStream errors
+  (SZ_ERROR_PROGRESS) - ICompressProgress errors
+  // SZ_ERROR_THREAD     - error in multi-threading functions
+  MY_SRes_HRESULT_FROM_WRes(WRes_error) - error in multi-threading function
+*/
+
+SRes XzDecMt_Decode(CXzDecMtHandle p,
+    const CXzDecMtProps *props,
+    const UInt64 *outDataSize, // NULL means undefined
+    int finishMode,            // 0 - partial unpacking is allowed, 1 - xz stream(s) must be finished
+    ISeqOutStream *outStream,
+    // Byte *outBuf, size_t *outBufSize,
+    ISeqInStream *inStream,
+    // const Byte *inData, size_t inDataSize,
+    CXzStatInfo *stat,
+    int *isMT,                 // 0 means that ST (Single-Thread) version was used
+    ICompressProgress *progress);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/XzCrc64.c b/3rdparty/7z/src/XzCrc64.c
new file mode 100644
index 0000000000..e9ca9ec265
--- /dev/null
+++ b/3rdparty/7z/src/XzCrc64.c
@@ -0,0 +1,86 @@
+/* XzCrc64.c -- CRC64 calculation
+2017-05-23 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "XzCrc64.h"
+#include "CpuArch.h"
+
+#define kCrc64Poly UINT64_CONST(0xC96C5795D7870F42)
+
+#ifdef MY_CPU_LE
+  #define CRC64_NUM_TABLES 4
+#else
+  #define CRC64_NUM_TABLES 5
+  #define CRC_UINT64_SWAP(v) \
+      ((v >> 56) \
+    | ((v >> 40) & ((UInt64)0xFF <<  8)) \
+    | ((v >> 24) & ((UInt64)0xFF << 16)) \
+    | ((v >>  8) & ((UInt64)0xFF << 24)) \
+    | ((v <<  8) & ((UInt64)0xFF << 32)) \
+    | ((v << 24) & ((UInt64)0xFF << 40)) \
+    | ((v << 40) & ((UInt64)0xFF << 48)) \
+    | ((v << 56)))
+
+  UInt64 MY_FAST_CALL XzCrc64UpdateT1_BeT4(UInt64 v, const void *data, size_t size, const UInt64 *table);
+#endif
+
+#ifndef MY_CPU_BE
+  UInt64 MY_FAST_CALL XzCrc64UpdateT4(UInt64 v, const void *data, size_t size, const UInt64 *table);
+#endif
+
+typedef UInt64 (MY_FAST_CALL *CRC64_FUNC)(UInt64 v, const void *data, size_t size, const UInt64 *table);
+
+static CRC64_FUNC g_Crc64Update;
+UInt64 g_Crc64Table[256 * CRC64_NUM_TABLES];
+
+UInt64 MY_FAST_CALL Crc64Update(UInt64 v, const void *data, size_t size)
+{
+  return g_Crc64Update(v, data, size, g_Crc64Table);
+}
+
+UInt64 MY_FAST_CALL Crc64Calc(const void *data, size_t size)
+{
+  return g_Crc64Update(CRC64_INIT_VAL, data, size, g_Crc64Table) ^ CRC64_INIT_VAL;
+}
+
+void MY_FAST_CALL Crc64GenerateTable()
+{
+  UInt32 i;
+  for (i = 0; i < 256; i++)
+  {
+    UInt64 r = i;
+    unsigned j;
+    for (j = 0; j < 8; j++)
+      r = (r >> 1) ^ (kCrc64Poly & ((UInt64)0 - (r & 1)));
+    g_Crc64Table[i] = r;
+  }
+  for (i = 256; i < 256 * CRC64_NUM_TABLES; i++)
+  {
+    UInt64 r = g_Crc64Table[(size_t)i - 256];
+    g_Crc64Table[i] = g_Crc64Table[r & 0xFF] ^ (r >> 8);
+  }
+  
+  #ifdef MY_CPU_LE
+
+  g_Crc64Update = XzCrc64UpdateT4;
+
+  #else
+  {
+    #ifndef MY_CPU_BE
+    UInt32 k = 1;
+    if (*(const Byte *)&k == 1)
+      g_Crc64Update = XzCrc64UpdateT4;
+    else
+    #endif
+    {
+      for (i = 256 * CRC64_NUM_TABLES - 1; i >= 256; i--)
+      {
+        UInt64 x = g_Crc64Table[(size_t)i - 256];
+        g_Crc64Table[i] = CRC_UINT64_SWAP(x);
+      }
+      g_Crc64Update = XzCrc64UpdateT1_BeT4;
+    }
+  }
+  #endif
+}
diff --git a/3rdparty/7z/src/XzCrc64.h b/3rdparty/7z/src/XzCrc64.h
new file mode 100644
index 0000000000..71b10d57e5
--- /dev/null
+++ b/3rdparty/7z/src/XzCrc64.h
@@ -0,0 +1,26 @@
+/* XzCrc64.h -- CRC64 calculation
+2013-01-18 : Igor Pavlov : Public domain */
+
+#ifndef __XZ_CRC64_H
+#define __XZ_CRC64_H
+
+#include <stddef.h>
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+extern UInt64 g_Crc64Table[];
+
+void MY_FAST_CALL Crc64GenerateTable(void);
+
+#define CRC64_INIT_VAL UINT64_CONST(0xFFFFFFFFFFFFFFFF)
+#define CRC64_GET_DIGEST(crc) ((crc) ^ CRC64_INIT_VAL)
+#define CRC64_UPDATE_BYTE(crc, b) (g_Crc64Table[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
+
+UInt64 MY_FAST_CALL Crc64Update(UInt64 crc, const void *data, size_t size);
+UInt64 MY_FAST_CALL Crc64Calc(const void *data, size_t size);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/XzCrc64Opt.c b/3rdparty/7z/src/XzCrc64Opt.c
new file mode 100644
index 0000000000..9273465d47
--- /dev/null
+++ b/3rdparty/7z/src/XzCrc64Opt.c
@@ -0,0 +1,69 @@
+/* XzCrc64Opt.c -- CRC64 calculation
+2017-06-30 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "CpuArch.h"
+
+#ifndef MY_CPU_BE
+
+#define CRC64_UPDATE_BYTE_2(crc, b) (table[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
+
+UInt64 MY_FAST_CALL XzCrc64UpdateT4(UInt64 v, const void *data, size_t size, const UInt64 *table)
+{
+  const Byte *p = (const Byte *)data;
+  for (; size > 0 && ((unsigned)(ptrdiff_t)p & 3) != 0; size--, p++)
+    v = CRC64_UPDATE_BYTE_2(v, *p);
+  for (; size >= 4; size -= 4, p += 4)
+  {
+    UInt32 d = (UInt32)v ^ *(const UInt32 *)p;
+    v = (v >> 32)
+        ^ (table + 0x300)[((d      ) & 0xFF)]
+        ^ (table + 0x200)[((d >>  8) & 0xFF)]
+        ^ (table + 0x100)[((d >> 16) & 0xFF)]
+        ^ (table + 0x000)[((d >> 24))];
+  }
+  for (; size > 0; size--, p++)
+    v = CRC64_UPDATE_BYTE_2(v, *p);
+  return v;
+}
+
+#endif
+
+
+#ifndef MY_CPU_LE
+
+#define CRC_UINT64_SWAP(v) \
+      ((v >> 56) \
+    | ((v >> 40) & ((UInt64)0xFF <<  8)) \
+    | ((v >> 24) & ((UInt64)0xFF << 16)) \
+    | ((v >>  8) & ((UInt64)0xFF << 24)) \
+    | ((v <<  8) & ((UInt64)0xFF << 32)) \
+    | ((v << 24) & ((UInt64)0xFF << 40)) \
+    | ((v << 40) & ((UInt64)0xFF << 48)) \
+    | ((v << 56)))
+
+#define CRC64_UPDATE_BYTE_2_BE(crc, b) (table[(Byte)((crc) >> 56) ^ (b)] ^ ((crc) << 8))
+
+UInt64 MY_FAST_CALL XzCrc64UpdateT1_BeT4(UInt64 v, const void *data, size_t size, const UInt64 *table)
+{
+  const Byte *p = (const Byte *)data;
+  table += 0x100;
+  v = CRC_UINT64_SWAP(v);
+  for (; size > 0 && ((unsigned)(ptrdiff_t)p & 3) != 0; size--, p++)
+    v = CRC64_UPDATE_BYTE_2_BE(v, *p);
+  for (; size >= 4; size -= 4, p += 4)
+  {
+    UInt32 d = (UInt32)(v >> 32) ^ *(const UInt32 *)p;
+    v = (v << 32)
+        ^ (table + 0x000)[((d      ) & 0xFF)]
+        ^ (table + 0x100)[((d >>  8) & 0xFF)]
+        ^ (table + 0x200)[((d >> 16) & 0xFF)]
+        ^ (table + 0x300)[((d >> 24))];
+  }
+  for (; size > 0; size--, p++)
+    v = CRC64_UPDATE_BYTE_2_BE(v, *p);
+  return CRC_UINT64_SWAP(v);
+}
+
+#endif
diff --git a/3rdparty/7z/src/XzDec.c b/3rdparty/7z/src/XzDec.c
new file mode 100644
index 0000000000..4f53272078
--- /dev/null
+++ b/3rdparty/7z/src/XzDec.c
@@ -0,0 +1,2766 @@
+/* XzDec.c -- Xz Decode
+2019-02-02 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+// #include <stdio.h>
+
+// #define XZ_DUMP
+
+/* #define XZ_DUMP */
+
+#ifdef XZ_DUMP
+#include <stdio.h>
+#endif
+
+// #define SHOW_DEBUG_INFO
+
+#ifdef SHOW_DEBUG_INFO
+#include <stdio.h>
+#endif
+
+#ifdef SHOW_DEBUG_INFO
+#define PRF(x) x
+#else
+#define PRF(x)
+#endif
+
+#define PRF_STR(s) PRF(printf("\n" s "\n"))
+#define PRF_STR_INT(s, d) PRF(printf("\n" s " %d\n", (unsigned)d))
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "7zCrc.h"
+#include "Alloc.h"
+#include "Bra.h"
+#include "CpuArch.h"
+#include "Delta.h"
+#include "Lzma2Dec.h"
+
+// #define USE_SUBBLOCK
+
+#ifdef USE_SUBBLOCK
+#include "Bcj3Dec.c"
+#include "SbDec.h"
+#endif
+
+#include "Xz.h"
+
+#define XZ_CHECK_SIZE_MAX 64
+
+#define CODER_BUF_SIZE ((size_t)1 << 17)
+
+unsigned Xz_ReadVarInt(const Byte *p, size_t maxSize, UInt64 *value)
+{
+  unsigned i, limit;
+  *value = 0;
+  limit = (maxSize > 9) ? 9 : (unsigned)maxSize;
+
+  for (i = 0; i < limit;)
+  {
+    Byte b = p[i];
+    *value |= (UInt64)(b & 0x7F) << (7 * i++);
+    if ((b & 0x80) == 0)
+      return (b == 0 && i != 1) ? 0 : i;
+  }
+  return 0;
+}
+
+/* ---------- BraState ---------- */
+
+#define BRA_BUF_SIZE (1 << 14)
+
+typedef struct
+{
+  size_t bufPos;
+  size_t bufConv;
+  size_t bufTotal;
+
+  int encodeMode;
+
+  UInt32 methodId;
+  UInt32 delta;
+  UInt32 ip;
+  UInt32 x86State;
+  Byte deltaState[DELTA_STATE_SIZE];
+
+  Byte buf[BRA_BUF_SIZE];
+} CBraState;
+
+static void BraState_Free(void *pp, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, pp);
+}
+
+static SRes BraState_SetProps(void *pp, const Byte *props, size_t propSize, ISzAllocPtr alloc)
+{
+  CBraState *p = ((CBraState *)pp);
+  UNUSED_VAR(alloc);
+  p->ip = 0;
+  if (p->methodId == XZ_ID_Delta)
+  {
+    if (propSize != 1)
+      return SZ_ERROR_UNSUPPORTED;
+    p->delta = (unsigned)props[0] + 1;
+  }
+  else
+  {
+    if (propSize == 4)
+    {
+      UInt32 v = GetUi32(props);
+      switch (p->methodId)
+      {
+        case XZ_ID_PPC:
+        case XZ_ID_ARM:
+        case XZ_ID_SPARC:
+          if ((v & 3) != 0)
+            return SZ_ERROR_UNSUPPORTED;
+          break;
+        case XZ_ID_ARMT:
+          if ((v & 1) != 0)
+            return SZ_ERROR_UNSUPPORTED;
+          break;
+        case XZ_ID_IA64:
+          if ((v & 0xF) != 0)
+            return SZ_ERROR_UNSUPPORTED;
+          break;
+      }
+      p->ip = v;
+    }
+    else if (propSize != 0)
+      return SZ_ERROR_UNSUPPORTED;
+  }
+  return SZ_OK;
+}
+
+static void BraState_Init(void *pp)
+{
+  CBraState *p = ((CBraState *)pp);
+  p->bufPos = p->bufConv = p->bufTotal = 0;
+  x86_Convert_Init(p->x86State);
+  if (p->methodId == XZ_ID_Delta)
+    Delta_Init(p->deltaState);
+}
+
+
+#define CASE_BRA_CONV(isa) case XZ_ID_ ## isa: size = isa ## _Convert(data, size, p->ip, p->encodeMode); break;
+
+static SizeT BraState_Filter(void *pp, Byte *data, SizeT size)
+{
+  CBraState *p = ((CBraState *)pp);
+  switch (p->methodId)
+  {
+    case XZ_ID_Delta:
+      if (p->encodeMode)
+        Delta_Encode(p->deltaState, p->delta, data, size);
+      else
+        Delta_Decode(p->deltaState, p->delta, data, size);
+      break;
+    case XZ_ID_X86:
+      size = x86_Convert(data, size, p->ip, &p->x86State, p->encodeMode);
+      break;
+    CASE_BRA_CONV(PPC)
+    CASE_BRA_CONV(IA64)
+    CASE_BRA_CONV(ARM)
+    CASE_BRA_CONV(ARMT)
+    CASE_BRA_CONV(SPARC)
+  }
+  p->ip += (UInt32)size;
+  return size;
+}
+
+
+static SRes BraState_Code2(void *pp,
+    Byte *dest, SizeT *destLen,
+    const Byte *src, SizeT *srcLen, int srcWasFinished,
+    ECoderFinishMode finishMode,
+    // int *wasFinished
+    ECoderStatus *status)
+{
+  CBraState *p = ((CBraState *)pp);
+  SizeT destRem = *destLen;
+  SizeT srcRem = *srcLen;
+  UNUSED_VAR(finishMode);
+
+  *destLen = 0;
+  *srcLen = 0;
+  // *wasFinished = False;
+  *status = CODER_STATUS_NOT_FINISHED;
+  
+  while (destRem > 0)
+  {
+    if (p->bufPos != p->bufConv)
+    {
+      size_t size = p->bufConv - p->bufPos;
+      if (size > destRem)
+        size = destRem;
+      memcpy(dest, p->buf + p->bufPos, size);
+      p->bufPos += size;
+      *destLen += size;
+      dest += size;
+      destRem -= size;
+      continue;
+    }
+    
+    p->bufTotal -= p->bufPos;
+    memmove(p->buf, p->buf + p->bufPos, p->bufTotal);
+    p->bufPos = 0;
+    p->bufConv = 0;
+    {
+      size_t size = BRA_BUF_SIZE - p->bufTotal;
+      if (size > srcRem)
+        size = srcRem;
+      memcpy(p->buf + p->bufTotal, src, size);
+      *srcLen += size;
+      src += size;
+      srcRem -= size;
+      p->bufTotal += size;
+    }
+    if (p->bufTotal == 0)
+      break;
+    
+    p->bufConv = BraState_Filter(pp, p->buf, p->bufTotal);
+
+    if (p->bufConv == 0)
+    {
+      if (!srcWasFinished)
+        break;
+      p->bufConv = p->bufTotal;
+    }
+  }
+
+  if (p->bufTotal == p->bufPos && srcRem == 0 && srcWasFinished)
+  {
+    *status = CODER_STATUS_FINISHED_WITH_MARK;
+    // *wasFinished = 1;
+  }
+
+  return SZ_OK;
+}
+
+
+SRes BraState_SetFromMethod(IStateCoder *p, UInt64 id, int encodeMode, ISzAllocPtr alloc)
+{
+  CBraState *decoder;
+  if (id < XZ_ID_Delta || id > XZ_ID_SPARC)
+    return SZ_ERROR_UNSUPPORTED;
+  decoder = (CBraState *)p->p;
+  if (!decoder)
+  {
+    decoder = (CBraState *)ISzAlloc_Alloc(alloc, sizeof(CBraState));
+    if (!decoder)
+      return SZ_ERROR_MEM;
+    p->p = decoder;
+    p->Free = BraState_Free;
+    p->SetProps = BraState_SetProps;
+    p->Init = BraState_Init;
+    p->Code2 = BraState_Code2;
+    p->Filter = BraState_Filter;
+  }
+  decoder->methodId = (UInt32)id;
+  decoder->encodeMode = encodeMode;
+  return SZ_OK;
+}
+
+
+
+/* ---------- SbState ---------- */
+
+#ifdef USE_SUBBLOCK
+
+static void SbState_Free(void *pp, ISzAllocPtr alloc)
+{
+  CSbDec *p = (CSbDec *)pp;
+  SbDec_Free(p);
+  ISzAlloc_Free(alloc, pp);
+}
+
+static SRes SbState_SetProps(void *pp, const Byte *props, size_t propSize, ISzAllocPtr alloc)
+{
+  UNUSED_VAR(pp);
+  UNUSED_VAR(props);
+  UNUSED_VAR(alloc);
+  return (propSize == 0) ? SZ_OK : SZ_ERROR_UNSUPPORTED;
+}
+
+static void SbState_Init(void *pp)
+{
+  SbDec_Init((CSbDec *)pp);
+}
+
+static SRes SbState_Code2(void *pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+    int srcWasFinished, ECoderFinishMode finishMode,
+    // int *wasFinished
+    ECoderStatus *status)
+{
+  CSbDec *p = (CSbDec *)pp;
+  SRes res;
+  UNUSED_VAR(srcWasFinished);
+  p->dest = dest;
+  p->destLen = *destLen;
+  p->src = src;
+  p->srcLen = *srcLen;
+  p->finish = finishMode; /* change it */
+  res = SbDec_Decode((CSbDec *)pp);
+  *destLen -= p->destLen;
+  *srcLen -= p->srcLen;
+  // *wasFinished = (*destLen == 0 && *srcLen == 0); /* change it */
+  *status = (*destLen == 0 && *srcLen == 0) ?
+      CODER_STATUS_FINISHED_WITH_MARK :
+      CODER_STATUS_NOT_FINISHED;
+  return res;
+}
+
+static SRes SbState_SetFromMethod(IStateCoder *p, ISzAllocPtr alloc)
+{
+  CSbDec *decoder = (CSbDec *)p->p;
+  if (!decoder)
+  {
+    decoder = (CSbDec *)ISzAlloc_Alloc(alloc, sizeof(CSbDec));
+    if (!decoder)
+      return SZ_ERROR_MEM;
+    p->p = decoder;
+    p->Free = SbState_Free;
+    p->SetProps = SbState_SetProps;
+    p->Init = SbState_Init;
+    p->Code2 = SbState_Code2;
+    p->Filter = NULL;
+  }
+  SbDec_Construct(decoder);
+  SbDec_SetAlloc(decoder, alloc);
+  return SZ_OK;
+}
+
+#endif
+
+
+
+/* ---------- Lzma2 ---------- */
+
+typedef struct
+{
+  CLzma2Dec decoder;
+  BoolInt outBufMode;
+} CLzma2Dec_Spec;
+
+
+static void Lzma2State_Free(void *pp, ISzAllocPtr alloc)
+{
+  CLzma2Dec_Spec *p = (CLzma2Dec_Spec *)pp;
+  if (p->outBufMode)
+    Lzma2Dec_FreeProbs(&p->decoder, alloc);
+  else
+    Lzma2Dec_Free(&p->decoder, alloc);
+  ISzAlloc_Free(alloc, pp);
+}
+
+static SRes Lzma2State_SetProps(void *pp, const Byte *props, size_t propSize, ISzAllocPtr alloc)
+{
+  if (propSize != 1)
+    return SZ_ERROR_UNSUPPORTED;
+  {
+    CLzma2Dec_Spec *p = (CLzma2Dec_Spec *)pp;
+    if (p->outBufMode)
+      return Lzma2Dec_AllocateProbs(&p->decoder, props[0], alloc);
+    else
+      return Lzma2Dec_Allocate(&p->decoder, props[0], alloc);
+  }
+}
+
+static void Lzma2State_Init(void *pp)
+{
+  Lzma2Dec_Init(&((CLzma2Dec_Spec *)pp)->decoder);
+}
+
+
+/*
+  if (outBufMode), then (dest) is not used. Use NULL.
+         Data is unpacked to (spec->decoder.decoder.dic) output buffer.
+*/
+
+static SRes Lzma2State_Code2(void *pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+    int srcWasFinished, ECoderFinishMode finishMode,
+    // int *wasFinished,
+    ECoderStatus *status)
+{
+  CLzma2Dec_Spec *spec = (CLzma2Dec_Spec *)pp;
+  ELzmaStatus status2;
+  /* ELzmaFinishMode fm = (finishMode == LZMA_FINISH_ANY) ? LZMA_FINISH_ANY : LZMA_FINISH_END; */
+  SRes res;
+  UNUSED_VAR(srcWasFinished);
+  if (spec->outBufMode)
+  {
+    SizeT dicPos = spec->decoder.decoder.dicPos;
+    SizeT dicLimit = dicPos + *destLen;
+    res = Lzma2Dec_DecodeToDic(&spec->decoder, dicLimit, src, srcLen, (ELzmaFinishMode)finishMode, &status2);
+    *destLen = spec->decoder.decoder.dicPos - dicPos;
+  }
+  else
+    res = Lzma2Dec_DecodeToBuf(&spec->decoder, dest, destLen, src, srcLen, (ELzmaFinishMode)finishMode, &status2);
+  // *wasFinished = (status2 == LZMA_STATUS_FINISHED_WITH_MARK);
+  // ECoderStatus values are identical to ELzmaStatus values of LZMA2 decoder
+  *status = (ECoderStatus)status2;
+  return res;
+}
+
+
+static SRes Lzma2State_SetFromMethod(IStateCoder *p, Byte *outBuf, size_t outBufSize, ISzAllocPtr alloc)
+{
+  CLzma2Dec_Spec *spec = (CLzma2Dec_Spec *)p->p;
+  if (!spec)
+  {
+    spec = (CLzma2Dec_Spec *)ISzAlloc_Alloc(alloc, sizeof(CLzma2Dec_Spec));
+    if (!spec)
+      return SZ_ERROR_MEM;
+    p->p = spec;
+    p->Free = Lzma2State_Free;
+    p->SetProps = Lzma2State_SetProps;
+    p->Init = Lzma2State_Init;
+    p->Code2 = Lzma2State_Code2;
+    p->Filter = NULL;
+    Lzma2Dec_Construct(&spec->decoder);
+  }
+  spec->outBufMode = False;
+  if (outBuf)
+  {
+    spec->outBufMode = True;
+    spec->decoder.decoder.dic = outBuf;
+    spec->decoder.decoder.dicBufSize = outBufSize;
+  }
+  return SZ_OK;
+}
+
+
+static SRes Lzma2State_ResetOutBuf(IStateCoder *p, Byte *outBuf, size_t outBufSize)
+{
+  CLzma2Dec_Spec *spec = (CLzma2Dec_Spec *)p->p;
+  if ((spec->outBufMode && !outBuf) || (!spec->outBufMode && outBuf))
+    return SZ_ERROR_FAIL;
+  if (outBuf)
+  {
+    spec->decoder.decoder.dic = outBuf;
+    spec->decoder.decoder.dicBufSize = outBufSize;
+  }
+  return SZ_OK;
+}
+
+
+
+static void MixCoder_Construct(CMixCoder *p, ISzAllocPtr alloc)
+{
+  unsigned i;
+  p->alloc = alloc;
+  p->buf = NULL;
+  p->numCoders = 0;
+  
+  p->outBufSize = 0;
+  p->outBuf = NULL;
+  // p->SingleBufMode = False;
+
+  for (i = 0; i < MIXCODER_NUM_FILTERS_MAX; i++)
+    p->coders[i].p = NULL;
+}
+
+
+static void MixCoder_Free(CMixCoder *p)
+{
+  unsigned i;
+  p->numCoders = 0;
+  for (i = 0; i < MIXCODER_NUM_FILTERS_MAX; i++)
+  {
+    IStateCoder *sc = &p->coders[i];
+    if (sc->p)
+    {
+      sc->Free(sc->p, p->alloc);
+      sc->p = NULL;
+    }
+  }
+  if (p->buf)
+  {
+    ISzAlloc_Free(p->alloc, p->buf);
+    p->buf = NULL; /* 9.31: the BUG was fixed */
+  }
+}
+
+static void MixCoder_Init(CMixCoder *p)
+{
+  unsigned i;
+  for (i = 0; i < MIXCODER_NUM_FILTERS_MAX - 1; i++)
+  {
+    p->size[i] = 0;
+    p->pos[i] = 0;
+    p->finished[i] = 0;
+  }
+  for (i = 0; i < p->numCoders; i++)
+  {
+    IStateCoder *coder = &p->coders[i];
+    coder->Init(coder->p);
+    p->results[i] = SZ_OK;
+  }
+  p->outWritten = 0;
+  p->wasFinished = False;
+  p->res = SZ_OK;
+  p->status = CODER_STATUS_NOT_SPECIFIED;
+}
+
+
+static SRes MixCoder_SetFromMethod(CMixCoder *p, unsigned coderIndex, UInt64 methodId, Byte *outBuf, size_t outBufSize)
+{
+  IStateCoder *sc = &p->coders[coderIndex];
+  p->ids[coderIndex] = methodId;
+  switch (methodId)
+  {
+    case XZ_ID_LZMA2: return Lzma2State_SetFromMethod(sc, outBuf, outBufSize, p->alloc);
+    #ifdef USE_SUBBLOCK
+    case XZ_ID_Subblock: return SbState_SetFromMethod(sc, p->alloc);
+    #endif
+  }
+  if (coderIndex == 0)
+    return SZ_ERROR_UNSUPPORTED;
+  return BraState_SetFromMethod(sc, methodId, 0, p->alloc);
+}
+
+
+static SRes MixCoder_ResetFromMethod(CMixCoder *p, unsigned coderIndex, UInt64 methodId, Byte *outBuf, size_t outBufSize)
+{
+  IStateCoder *sc = &p->coders[coderIndex];
+  switch (methodId)
+  {
+    case XZ_ID_LZMA2: return Lzma2State_ResetOutBuf(sc, outBuf, outBufSize);
+  }
+  return SZ_ERROR_UNSUPPORTED;
+}
+
+
+
+/*
+ if (destFinish) - then unpack data block is finished at (*destLen) position,
+                   and we can return data that were not processed by filter
+
+output (status) can be :
+  CODER_STATUS_NOT_FINISHED
+  CODER_STATUS_FINISHED_WITH_MARK
+  CODER_STATUS_NEEDS_MORE_INPUT - not implemented still
+*/
+
+static SRes MixCoder_Code(CMixCoder *p,
+    Byte *dest, SizeT *destLen, int destFinish,
+    const Byte *src, SizeT *srcLen, int srcWasFinished,
+    ECoderFinishMode finishMode)
+{
+  SizeT destLenOrig = *destLen;
+  SizeT srcLenOrig = *srcLen;
+
+  *destLen = 0;
+  *srcLen = 0;
+
+  if (p->wasFinished)
+    return p->res;
+  
+  p->status = CODER_STATUS_NOT_FINISHED;
+
+  // if (p->SingleBufMode)
+  if (p->outBuf)
+  {
+    SRes res;
+    SizeT destLen2, srcLen2;
+    int wasFinished;
+    
+    PRF_STR("------- MixCoder Single ----------");
+      
+    srcLen2 = srcLenOrig;
+    destLen2 = destLenOrig;
+    
+    {
+      IStateCoder *coder = &p->coders[0];
+      res = coder->Code2(coder->p, NULL, &destLen2, src, &srcLen2, srcWasFinished, finishMode,
+          // &wasFinished,
+          &p->status);
+      wasFinished = (p->status == CODER_STATUS_FINISHED_WITH_MARK);
+    }
+    
+    p->res = res;
+    
+    /*
+    if (wasFinished)
+      p->status = CODER_STATUS_FINISHED_WITH_MARK;
+    else
+    {
+      if (res == SZ_OK)
+        if (destLen2 != destLenOrig)
+          p->status = CODER_STATUS_NEEDS_MORE_INPUT;
+    }
+    */
+
+    
+    *srcLen = srcLen2;
+    src += srcLen2;
+    p->outWritten += destLen2;
+    
+    if (res != SZ_OK || srcWasFinished || wasFinished)
+      p->wasFinished = True;
+    
+    if (p->numCoders == 1)
+      *destLen = destLen2;
+    else if (p->wasFinished)
+    {
+      unsigned i;
+      size_t processed = p->outWritten;
+      
+      for (i = 1; i < p->numCoders; i++)
+      {
+        IStateCoder *coder = &p->coders[i];
+        processed = coder->Filter(coder->p, p->outBuf, processed);
+        if (wasFinished || (destFinish && p->outWritten == destLenOrig))
+          processed = p->outWritten;
+        PRF_STR_INT("filter", i);
+      }
+      *destLen = processed;
+    }
+    return res;
+  }
+
+  PRF_STR("standard mix");
+
+  if (p->numCoders != 1)
+  {
+    if (!p->buf)
+    {
+      p->buf = (Byte *)ISzAlloc_Alloc(p->alloc, CODER_BUF_SIZE * (MIXCODER_NUM_FILTERS_MAX - 1));
+      if (!p->buf)
+        return SZ_ERROR_MEM;
+    }
+    
+    finishMode = CODER_FINISH_ANY;
+  }
+
+  for (;;)
+  {
+    BoolInt processed = False;
+    BoolInt allFinished = True;
+    SRes resMain = SZ_OK;
+    unsigned i;
+
+    p->status = CODER_STATUS_NOT_FINISHED;
+    /*
+    if (p->numCoders == 1 && *destLen == destLenOrig && finishMode == LZMA_FINISH_ANY)
+      break;
+    */
+
+    for (i = 0; i < p->numCoders; i++)
+    {
+      SRes res;
+      IStateCoder *coder = &p->coders[i];
+      Byte *dest2;
+      SizeT destLen2, srcLen2; // destLen2_Orig;
+      const Byte *src2;
+      int srcFinished2;
+      int encodingWasFinished;
+      ECoderStatus status2;
+      
+      if (i == 0)
+      {
+        src2 = src;
+        srcLen2 = srcLenOrig - *srcLen;
+        srcFinished2 = srcWasFinished;
+      }
+      else
+      {
+        size_t k = i - 1;
+        src2 = p->buf + (CODER_BUF_SIZE * k) + p->pos[k];
+        srcLen2 = p->size[k] - p->pos[k];
+        srcFinished2 = p->finished[k];
+      }
+      
+      if (i == p->numCoders - 1)
+      {
+        dest2 = dest;
+        destLen2 = destLenOrig - *destLen;
+      }
+      else
+      {
+        if (p->pos[i] != p->size[i])
+          continue;
+        dest2 = p->buf + (CODER_BUF_SIZE * i);
+        destLen2 = CODER_BUF_SIZE;
+      }
+      
+      // destLen2_Orig = destLen2;
+      
+      if (p->results[i] != SZ_OK)
+      {
+        if (resMain == SZ_OK)
+          resMain = p->results[i];
+        continue;
+      }
+
+      res = coder->Code2(coder->p,
+          dest2, &destLen2,
+          src2, &srcLen2, srcFinished2,
+          finishMode,
+          // &encodingWasFinished,
+          &status2);
+
+      if (res != SZ_OK)
+      {
+        p->results[i] = res;
+        if (resMain == SZ_OK)
+          resMain = res;
+      }
+
+      encodingWasFinished = (status2 == CODER_STATUS_FINISHED_WITH_MARK);
+      
+      if (!encodingWasFinished)
+      {
+        allFinished = False;
+        if (p->numCoders == 1 && res == SZ_OK)
+          p->status = status2;
+      }
+
+      if (i == 0)
+      {
+        *srcLen += srcLen2;
+        src += srcLen2;
+      }
+      else
+        p->pos[(size_t)i - 1] += srcLen2;
+
+      if (i == p->numCoders - 1)
+      {
+        *destLen += destLen2;
+        dest += destLen2;
+      }
+      else
+      {
+        p->size[i] = destLen2;
+        p->pos[i] = 0;
+        p->finished[i] = encodingWasFinished;
+      }
+      
+      if (destLen2 != 0 || srcLen2 != 0)
+        processed = True;
+    }
+    
+    if (!processed)
+    {
+      if (allFinished)
+        p->status = CODER_STATUS_FINISHED_WITH_MARK;
+      return resMain;
+    }
+  }
+}
+
+
+SRes Xz_ParseHeader(CXzStreamFlags *p, const Byte *buf)
+{
+  *p = (CXzStreamFlags)GetBe16(buf + XZ_SIG_SIZE);
+  if (CrcCalc(buf + XZ_SIG_SIZE, XZ_STREAM_FLAGS_SIZE) !=
+      GetUi32(buf + XZ_SIG_SIZE + XZ_STREAM_FLAGS_SIZE))
+    return SZ_ERROR_NO_ARCHIVE;
+  return XzFlags_IsSupported(*p) ? SZ_OK : SZ_ERROR_UNSUPPORTED;
+}
+
+static BoolInt Xz_CheckFooter(CXzStreamFlags flags, UInt64 indexSize, const Byte *buf)
+{
+  return indexSize == (((UInt64)GetUi32(buf + 4) + 1) << 2)
+      && GetUi32(buf) == CrcCalc(buf + 4, 6)
+      && flags == GetBe16(buf + 8)
+      && buf[10] == XZ_FOOTER_SIG_0
+      && buf[11] == XZ_FOOTER_SIG_1;
+}
+
+#define READ_VARINT_AND_CHECK(buf, pos, size, res) \
+  { unsigned s = Xz_ReadVarInt(buf + pos, size - pos, res); \
+  if (s == 0) return SZ_ERROR_ARCHIVE; pos += s; }
+
+
+static BoolInt XzBlock_AreSupportedFilters(const CXzBlock *p)
+{
+  unsigned numFilters = XzBlock_GetNumFilters(p) - 1;
+  unsigned i;
+  {
+    const CXzFilter *f = &p->filters[numFilters];
+    if (f->id != XZ_ID_LZMA2 || f->propsSize != 1 || f->props[0] > 40)
+      return False;
+  }
+
+  for (i = 0; i < numFilters; i++)
+  {
+    const CXzFilter *f = &p->filters[i];
+    if (f->id == XZ_ID_Delta)
+    {
+      if (f->propsSize != 1)
+        return False;
+    }
+    else if (f->id < XZ_ID_Delta
+        || f->id > XZ_ID_SPARC
+        || (f->propsSize != 0 && f->propsSize != 4))
+      return False;
+  }
+  return True;
+}
+
+
+SRes XzBlock_Parse(CXzBlock *p, const Byte *header)
+{
+  unsigned pos;
+  unsigned numFilters, i;
+  unsigned headerSize = (unsigned)header[0] << 2;
+
+  /* (headerSize != 0) : another code checks */
+
+  if (CrcCalc(header, headerSize) != GetUi32(header + headerSize))
+    return SZ_ERROR_ARCHIVE;
+
+  pos = 1;
+  p->flags = header[pos++];
+
+  p->packSize = (UInt64)(Int64)-1;
+  if (XzBlock_HasPackSize(p))
+  {
+    READ_VARINT_AND_CHECK(header, pos, headerSize, &p->packSize);
+    if (p->packSize == 0 || p->packSize + headerSize >= (UInt64)1 << 63)
+      return SZ_ERROR_ARCHIVE;
+  }
+
+  p->unpackSize = (UInt64)(Int64)-1;
+  if (XzBlock_HasUnpackSize(p))
+    READ_VARINT_AND_CHECK(header, pos, headerSize, &p->unpackSize);
+
+  numFilters = XzBlock_GetNumFilters(p);
+  for (i = 0; i < numFilters; i++)
+  {
+    CXzFilter *filter = p->filters + i;
+    UInt64 size;
+    READ_VARINT_AND_CHECK(header, pos, headerSize, &filter->id);
+    READ_VARINT_AND_CHECK(header, pos, headerSize, &size);
+    if (size > headerSize - pos || size > XZ_FILTER_PROPS_SIZE_MAX)
+      return SZ_ERROR_ARCHIVE;
+    filter->propsSize = (UInt32)size;
+    memcpy(filter->props, header + pos, (size_t)size);
+    pos += (unsigned)size;
+
+    #ifdef XZ_DUMP
+    printf("\nf[%u] = %2X: ", i, (unsigned)filter->id);
+    {
+      unsigned i;
+      for (i = 0; i < size; i++)
+        printf(" %2X", filter->props[i]);
+    }
+    #endif
+  }
+
+  if (XzBlock_HasUnsupportedFlags(p))
+    return SZ_ERROR_UNSUPPORTED;
+
+  while (pos < headerSize)
+    if (header[pos++] != 0)
+      return SZ_ERROR_ARCHIVE;
+  return SZ_OK;
+}
+
+
+
+
+static SRes XzDecMix_Init(CMixCoder *p, const CXzBlock *block, Byte *outBuf, size_t outBufSize)
+{
+  unsigned i;
+  BoolInt needReInit = True;
+  unsigned numFilters = XzBlock_GetNumFilters(block);
+
+  if (numFilters == p->numCoders && ((p->outBuf && outBuf) || (!p->outBuf && !outBuf)))
+  {
+    needReInit = False;
+    for (i = 0; i < numFilters; i++)
+      if (p->ids[i] != block->filters[numFilters - 1 - i].id)
+      {
+        needReInit = True;
+        break;
+      }
+  }
+
+  // p->SingleBufMode = (outBuf != NULL);
+  p->outBuf = outBuf;
+  p->outBufSize = outBufSize;
+
+  // p->SingleBufMode = False;
+  // outBuf = NULL;
+  
+  if (needReInit)
+  {
+    MixCoder_Free(p);
+    for (i = 0; i < numFilters; i++)
+    {
+      RINOK(MixCoder_SetFromMethod(p, i, block->filters[numFilters - 1 - i].id, outBuf, outBufSize));
+    }
+    p->numCoders = numFilters;
+  }
+  else
+  {
+    RINOK(MixCoder_ResetFromMethod(p, 0, block->filters[numFilters - 1].id, outBuf, outBufSize));
+  }
+
+  for (i = 0; i < numFilters; i++)
+  {
+    const CXzFilter *f = &block->filters[numFilters - 1 - i];
+    IStateCoder *sc = &p->coders[i];
+    RINOK(sc->SetProps(sc->p, f->props, f->propsSize, p->alloc));
+  }
+  
+  MixCoder_Init(p);
+  return SZ_OK;
+}
+
+
+
+void XzUnpacker_Init(CXzUnpacker *p)
+{
+  p->state = XZ_STATE_STREAM_HEADER;
+  p->pos = 0;
+  p->numStartedStreams = 0;
+  p->numFinishedStreams = 0;
+  p->numTotalBlocks = 0;
+  p->padSize = 0;
+  p->decodeOnlyOneBlock = 0;
+
+  p->parseMode = False;
+  p->decodeToStreamSignature = False;
+
+  // p->outBuf = NULL;
+  // p->outBufSize = 0;
+  p->outDataWritten = 0;
+}
+
+
+void XzUnpacker_SetOutBuf(CXzUnpacker *p, Byte *outBuf, size_t outBufSize)
+{
+  p->outBuf = outBuf;
+  p->outBufSize = outBufSize;
+}
+
+
+void XzUnpacker_Construct(CXzUnpacker *p, ISzAllocPtr alloc)
+{
+  MixCoder_Construct(&p->decoder, alloc);
+  p->outBuf = NULL;
+  p->outBufSize = 0;
+  XzUnpacker_Init(p);
+}
+
+
+void XzUnpacker_Free(CXzUnpacker *p)
+{
+  MixCoder_Free(&p->decoder);
+}
+
+
+void XzUnpacker_PrepareToRandomBlockDecoding(CXzUnpacker *p)
+{
+  p->indexSize = 0;
+  p->numBlocks = 0;
+  Sha256_Init(&p->sha);
+  p->state = XZ_STATE_BLOCK_HEADER;
+  p->pos = 0;
+  p->decodeOnlyOneBlock = 1;
+}
+
+
+static void XzUnpacker_UpdateIndex(CXzUnpacker *p, UInt64 packSize, UInt64 unpackSize)
+{
+  Byte temp[32];
+  unsigned num = Xz_WriteVarInt(temp, packSize);
+  num += Xz_WriteVarInt(temp + num, unpackSize);
+  Sha256_Update(&p->sha, temp, num);
+  p->indexSize += num;
+  p->numBlocks++;
+}
+
+
+
+SRes XzUnpacker_Code(CXzUnpacker *p, Byte *dest, SizeT *destLen,
+    const Byte *src, SizeT *srcLen, int srcFinished,
+    ECoderFinishMode finishMode, ECoderStatus *status)
+{
+  SizeT destLenOrig = *destLen;
+  SizeT srcLenOrig = *srcLen;
+  *destLen = 0;
+  *srcLen = 0;
+  *status = CODER_STATUS_NOT_SPECIFIED;
+
+  for (;;)
+  {
+    SizeT srcRem;
+
+    if (p->state == XZ_STATE_BLOCK)
+    {
+      SizeT destLen2 = destLenOrig - *destLen;
+      SizeT srcLen2 = srcLenOrig - *srcLen;
+      SRes res;
+
+      ECoderFinishMode finishMode2 = finishMode;
+      BoolInt srcFinished2 = srcFinished;
+      BoolInt destFinish = False;
+
+      if (p->block.packSize != (UInt64)(Int64)-1)
+      {
+        UInt64 rem = p->block.packSize - p->packSize;
+        if (srcLen2 >= rem)
+        {
+          srcFinished2 = True;
+          srcLen2 = (SizeT)rem;
+        }
+        if (rem == 0 && p->block.unpackSize == p->unpackSize)
+          return SZ_ERROR_DATA;
+      }
+
+      if (p->block.unpackSize != (UInt64)(Int64)-1)
+      {
+        UInt64 rem = p->block.unpackSize - p->unpackSize;
+        if (destLen2 >= rem)
+        {
+          destFinish = True;
+          finishMode2 = CODER_FINISH_END;
+          destLen2 = (SizeT)rem;
+        }
+      }
+
+      /*
+      if (srcLen2 == 0 && destLen2 == 0)
+      {
+        *status = CODER_STATUS_NOT_FINISHED;
+        return SZ_OK;
+      }
+      */
+      
+      {
+        res = MixCoder_Code(&p->decoder,
+            (p->outBuf ? NULL : dest), &destLen2, destFinish,
+            src, &srcLen2, srcFinished2,
+            finishMode2);
+        
+        *status = p->decoder.status;
+        XzCheck_Update(&p->check, (p->outBuf ? p->outBuf + p->outDataWritten : dest), destLen2);
+        if (!p->outBuf)
+          dest += destLen2;
+        p->outDataWritten += destLen2;
+      }
+      
+      (*srcLen) += srcLen2;
+      src += srcLen2;
+      p->packSize += srcLen2;
+      (*destLen) += destLen2;
+      p->unpackSize += destLen2;
+
+      RINOK(res);
+
+      if (*status != CODER_STATUS_FINISHED_WITH_MARK)
+      {
+        if (p->block.packSize == p->packSize
+            && *status == CODER_STATUS_NEEDS_MORE_INPUT)
+        {
+          PRF_STR("CODER_STATUS_NEEDS_MORE_INPUT");
+          *status = CODER_STATUS_NOT_SPECIFIED;
+          return SZ_ERROR_DATA;
+        }
+        
+        return SZ_OK;
+      }
+      {
+        XzUnpacker_UpdateIndex(p, XzUnpacker_GetPackSizeForIndex(p), p->unpackSize);
+        p->state = XZ_STATE_BLOCK_FOOTER;
+        p->pos = 0;
+        p->alignPos = 0;
+        *status = CODER_STATUS_NOT_SPECIFIED;
+
+        if ((p->block.packSize != (UInt64)(Int64)-1 && p->block.packSize != p->packSize)
+           || (p->block.unpackSize != (UInt64)(Int64)-1 && p->block.unpackSize != p->unpackSize))
+        {
+          PRF_STR("ERROR: block.size mismatch");
+          return SZ_ERROR_DATA;
+        }
+      }
+      // continue;
+    }
+
+    srcRem = srcLenOrig - *srcLen;
+
+    // XZ_STATE_BLOCK_FOOTER can transit to XZ_STATE_BLOCK_HEADER without input bytes
+    if (srcRem == 0 && p->state != XZ_STATE_BLOCK_FOOTER)
+    {
+      *status = CODER_STATUS_NEEDS_MORE_INPUT;
+      return SZ_OK;
+    }
+
+    switch (p->state)
+    {
+      case XZ_STATE_STREAM_HEADER:
+      {
+        if (p->pos < XZ_STREAM_HEADER_SIZE)
+        {
+          if (p->pos < XZ_SIG_SIZE && *src != XZ_SIG[p->pos])
+            return SZ_ERROR_NO_ARCHIVE;
+          if (p->decodeToStreamSignature)
+            return SZ_OK;
+          p->buf[p->pos++] = *src++;
+          (*srcLen)++;
+        }
+        else
+        {
+          RINOK(Xz_ParseHeader(&p->streamFlags, p->buf));
+          p->numStartedStreams++;
+          p->indexSize = 0;
+          p->numBlocks = 0;
+          Sha256_Init(&p->sha);
+          p->state = XZ_STATE_BLOCK_HEADER;
+          p->pos = 0;
+        }
+        break;
+      }
+
+      case XZ_STATE_BLOCK_HEADER:
+      {
+        if (p->pos == 0)
+        {
+          p->buf[p->pos++] = *src++;
+          (*srcLen)++;
+          if (p->buf[0] == 0)
+          {
+            if (p->decodeOnlyOneBlock)
+              return SZ_ERROR_DATA;
+            p->indexPreSize = 1 + Xz_WriteVarInt(p->buf + 1, p->numBlocks);
+            p->indexPos = p->indexPreSize;
+            p->indexSize += p->indexPreSize;
+            Sha256_Final(&p->sha, p->shaDigest);
+            Sha256_Init(&p->sha);
+            p->crc = CrcUpdate(CRC_INIT_VAL, p->buf, p->indexPreSize);
+            p->state = XZ_STATE_STREAM_INDEX;
+            break;
+          }
+          p->blockHeaderSize = ((UInt32)p->buf[0] << 2) + 4;
+          break;
+        }
+        
+        if (p->pos != p->blockHeaderSize)
+        {
+          UInt32 cur = p->blockHeaderSize - p->pos;
+          if (cur > srcRem)
+            cur = (UInt32)srcRem;
+          memcpy(p->buf + p->pos, src, cur);
+          p->pos += cur;
+          (*srcLen) += cur;
+          src += cur;
+        }
+        else
+        {
+          RINOK(XzBlock_Parse(&p->block, p->buf));
+          if (!XzBlock_AreSupportedFilters(&p->block))
+            return SZ_ERROR_UNSUPPORTED;
+          p->numTotalBlocks++;
+          p->state = XZ_STATE_BLOCK;
+          p->packSize = 0;
+          p->unpackSize = 0;
+          XzCheck_Init(&p->check, XzFlags_GetCheckType(p->streamFlags));
+          if (p->parseMode)
+          {
+            p->headerParsedOk = True;
+            return SZ_OK;
+          }
+          RINOK(XzDecMix_Init(&p->decoder, &p->block, p->outBuf, p->outBufSize));
+        }
+        break;
+      }
+
+      case XZ_STATE_BLOCK_FOOTER:
+      {
+        if ((((unsigned)p->packSize + p->alignPos) & 3) != 0)
+        {
+          if (srcRem == 0)
+          {
+            *status = CODER_STATUS_NEEDS_MORE_INPUT;
+            return SZ_OK;
+          }
+          (*srcLen)++;
+          p->alignPos++;
+          if (*src++ != 0)
+            return SZ_ERROR_CRC;
+        }
+        else
+        {
+          UInt32 checkSize = XzFlags_GetCheckSize(p->streamFlags);
+          UInt32 cur = checkSize - p->pos;
+          if (cur != 0)
+          {
+            if (srcRem == 0)
+            {
+              *status = CODER_STATUS_NEEDS_MORE_INPUT;
+              return SZ_OK;
+            }
+            if (cur > srcRem)
+              cur = (UInt32)srcRem;
+            memcpy(p->buf + p->pos, src, cur);
+            p->pos += cur;
+            (*srcLen) += cur;
+            src += cur;
+            if (checkSize != p->pos)
+              break;
+          }
+          {
+            Byte digest[XZ_CHECK_SIZE_MAX];
+            p->state = XZ_STATE_BLOCK_HEADER;
+            p->pos = 0;
+            if (XzCheck_Final(&p->check, digest) && memcmp(digest, p->buf, checkSize) != 0)
+              return SZ_ERROR_CRC;
+            if (p->decodeOnlyOneBlock)
+            {
+              *status = CODER_STATUS_FINISHED_WITH_MARK;
+              return SZ_OK;
+            }
+          }
+        }
+        break;
+      }
+
+      case XZ_STATE_STREAM_INDEX:
+      {
+        if (p->pos < p->indexPreSize)
+        {
+          (*srcLen)++;
+          if (*src++ != p->buf[p->pos++])
+            return SZ_ERROR_CRC;
+        }
+        else
+        {
+          if (p->indexPos < p->indexSize)
+          {
+            UInt64 cur = p->indexSize - p->indexPos;
+            if (srcRem > cur)
+              srcRem = (SizeT)cur;
+            p->crc = CrcUpdate(p->crc, src, srcRem);
+            Sha256_Update(&p->sha, src, srcRem);
+            (*srcLen) += srcRem;
+            src += srcRem;
+            p->indexPos += srcRem;
+          }
+          else if ((p->indexPos & 3) != 0)
+          {
+            Byte b = *src++;
+            p->crc = CRC_UPDATE_BYTE(p->crc, b);
+            (*srcLen)++;
+            p->indexPos++;
+            p->indexSize++;
+            if (b != 0)
+              return SZ_ERROR_CRC;
+          }
+          else
+          {
+            Byte digest[SHA256_DIGEST_SIZE];
+            p->state = XZ_STATE_STREAM_INDEX_CRC;
+            p->indexSize += 4;
+            p->pos = 0;
+            Sha256_Final(&p->sha, digest);
+            if (memcmp(digest, p->shaDigest, SHA256_DIGEST_SIZE) != 0)
+              return SZ_ERROR_CRC;
+          }
+        }
+        break;
+      }
+
+      case XZ_STATE_STREAM_INDEX_CRC:
+      {
+        if (p->pos < 4)
+        {
+          (*srcLen)++;
+          p->buf[p->pos++] = *src++;
+        }
+        else
+        {
+          p->state = XZ_STATE_STREAM_FOOTER;
+          p->pos = 0;
+          if (CRC_GET_DIGEST(p->crc) != GetUi32(p->buf))
+            return SZ_ERROR_CRC;
+        }
+        break;
+      }
+
+      case XZ_STATE_STREAM_FOOTER:
+      {
+        UInt32 cur = XZ_STREAM_FOOTER_SIZE - p->pos;
+        if (cur > srcRem)
+          cur = (UInt32)srcRem;
+        memcpy(p->buf + p->pos, src, cur);
+        p->pos += cur;
+        (*srcLen) += cur;
+        src += cur;
+        if (p->pos == XZ_STREAM_FOOTER_SIZE)
+        {
+          p->state = XZ_STATE_STREAM_PADDING;
+          p->numFinishedStreams++;
+          p->padSize = 0;
+          if (!Xz_CheckFooter(p->streamFlags, p->indexSize, p->buf))
+            return SZ_ERROR_CRC;
+        }
+        break;
+      }
+
+      case XZ_STATE_STREAM_PADDING:
+      {
+        if (*src != 0)
+        {
+          if (((UInt32)p->padSize & 3) != 0)
+            return SZ_ERROR_NO_ARCHIVE;
+          p->pos = 0;
+          p->state = XZ_STATE_STREAM_HEADER;
+        }
+        else
+        {
+          (*srcLen)++;
+          src++;
+          p->padSize++;
+        }
+        break;
+      }
+      
+      case XZ_STATE_BLOCK: break; /* to disable GCC warning */
+    }
+  }
+  /*
+  if (p->state == XZ_STATE_FINISHED)
+    *status = CODER_STATUS_FINISHED_WITH_MARK;
+  return SZ_OK;
+  */
+}
+
+
+SRes XzUnpacker_CodeFull(CXzUnpacker *p, Byte *dest, SizeT *destLen,
+    const Byte *src, SizeT *srcLen,
+    ECoderFinishMode finishMode, ECoderStatus *status)
+{
+  XzUnpacker_Init(p);
+  XzUnpacker_SetOutBuf(p, dest, *destLen);
+
+  return XzUnpacker_Code(p,
+      NULL, destLen,
+      src, srcLen, True,
+      finishMode, status);
+}
+
+
+BoolInt XzUnpacker_IsBlockFinished(const CXzUnpacker *p)
+{
+  return (p->state == XZ_STATE_BLOCK_HEADER) && (p->pos == 0);
+}
+
+BoolInt XzUnpacker_IsStreamWasFinished(const CXzUnpacker *p)
+{
+  return (p->state == XZ_STATE_STREAM_PADDING) && (((UInt32)p->padSize & 3) == 0);
+}
+
+UInt64 XzUnpacker_GetExtraSize(const CXzUnpacker *p)
+{
+  UInt64 num = 0;
+  if (p->state == XZ_STATE_STREAM_PADDING)
+    num = p->padSize;
+  else if (p->state == XZ_STATE_STREAM_HEADER)
+    num = p->padSize + p->pos;
+  return num;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#ifndef _7ZIP_ST
+#include "MtDec.h"
+#endif
+
+
+void XzDecMtProps_Init(CXzDecMtProps *p)
+{
+  p->inBufSize_ST = 1 << 18;
+  p->outStep_ST = 1 << 20;
+  p->ignoreErrors = False;
+
+  #ifndef _7ZIP_ST
+  p->numThreads = 1;
+  p->inBufSize_MT = 1 << 18;
+  p->memUseMax = sizeof(size_t) << 28;
+  #endif
+}
+
+
+
+#ifndef _7ZIP_ST
+
+/* ---------- CXzDecMtThread ---------- */
+
+typedef struct
+{
+  Byte *outBuf;
+  size_t outBufSize;
+  size_t outPreSize;
+  size_t inPreSize;
+  size_t inPreHeaderSize;
+  size_t blockPackSize_for_Index;  // including block header and checksum.
+  size_t blockPackTotal;  // including stream header, block header and checksum.
+  size_t inCodeSize;
+  size_t outCodeSize;
+  ECoderStatus status;
+  SRes codeRes;
+  BoolInt skipMode;
+  // BoolInt finishedWithMark;
+  EMtDecParseState parseState;
+  BoolInt parsing_Truncated;
+  BoolInt atBlockHeader;
+  CXzStreamFlags streamFlags;
+  // UInt64 numFinishedStreams
+  UInt64 numStreams;
+  UInt64 numTotalBlocks;
+  UInt64 numBlocks;
+
+  BoolInt dec_created;
+  CXzUnpacker dec;
+
+  Byte mtPad[1 << 7];
+} CXzDecMtThread;
+
+#endif
+
+
+/* ---------- CXzDecMt ---------- */
+
+typedef struct
+{
+  CAlignOffsetAlloc alignOffsetAlloc;
+  ISzAllocPtr allocMid;
+
+  CXzDecMtProps props;
+  size_t unpackBlockMaxSize;
+  
+  ISeqInStream *inStream;
+  ISeqOutStream *outStream;
+  ICompressProgress *progress;
+  // CXzStatInfo *stat;
+
+  BoolInt finishMode;
+  BoolInt outSize_Defined;
+  UInt64 outSize;
+
+  UInt64 outProcessed;
+  UInt64 inProcessed;
+  UInt64 readProcessed;
+  BoolInt readWasFinished;
+  SRes readRes;
+  SRes writeRes;
+
+  Byte *outBuf;
+  size_t outBufSize;
+  Byte *inBuf;
+  size_t inBufSize;
+
+  CXzUnpacker dec;
+
+  ECoderStatus status;
+  SRes codeRes;
+
+  #ifndef _7ZIP_ST
+  BoolInt mainDecoderWasCalled;
+  // int statErrorDefined;
+  int finishedDecoderIndex;
+
+  // global values that are used in Parse stage
+  CXzStreamFlags streamFlags;
+  // UInt64 numFinishedStreams
+  UInt64 numStreams;
+  UInt64 numTotalBlocks;
+  UInt64 numBlocks;
+
+  // UInt64 numBadBlocks;
+  SRes mainErrorCode;
+
+  BoolInt isBlockHeaderState_Parse;
+  BoolInt isBlockHeaderState_Write;
+  UInt64 outProcessed_Parse;
+  BoolInt parsing_Truncated;
+
+  BoolInt mtc_WasConstructed;
+  CMtDec mtc;
+  CXzDecMtThread coders[MTDEC__THREADS_MAX];
+  #endif
+
+} CXzDecMt;
+
+
+
+CXzDecMtHandle XzDecMt_Create(ISzAllocPtr alloc, ISzAllocPtr allocMid)
+{
+  CXzDecMt *p = (CXzDecMt *)ISzAlloc_Alloc(alloc, sizeof(CXzDecMt));
+  if (!p)
+    return NULL;
+  
+  AlignOffsetAlloc_CreateVTable(&p->alignOffsetAlloc);
+  p->alignOffsetAlloc.baseAlloc = alloc;
+  p->alignOffsetAlloc.numAlignBits = 7;
+  p->alignOffsetAlloc.offset = 0;
+
+  p->allocMid = allocMid;
+
+  p->outBuf = NULL;
+  p->outBufSize = 0;
+  p->inBuf = NULL;
+  p->inBufSize = 0;
+
+  XzUnpacker_Construct(&p->dec, &p->alignOffsetAlloc.vt);
+
+  p->unpackBlockMaxSize = 0;
+
+  XzDecMtProps_Init(&p->props);
+
+  #ifndef _7ZIP_ST
+  p->mtc_WasConstructed = False;
+  {
+    unsigned i;
+    for (i = 0; i < MTDEC__THREADS_MAX; i++)
+    {
+      CXzDecMtThread *coder = &p->coders[i];
+      coder->dec_created = False;
+      coder->outBuf = NULL;
+      coder->outBufSize = 0;
+    }
+  }
+  #endif
+
+  return p;
+}
+
+
+#ifndef _7ZIP_ST
+
+static void XzDecMt_FreeOutBufs(CXzDecMt *p)
+{
+  unsigned i;
+  for (i = 0; i < MTDEC__THREADS_MAX; i++)
+  {
+    CXzDecMtThread *coder = &p->coders[i];
+    if (coder->outBuf)
+    {
+      ISzAlloc_Free(p->allocMid, coder->outBuf);
+      coder->outBuf = NULL;
+      coder->outBufSize = 0;
+    }
+  }
+  p->unpackBlockMaxSize = 0;
+}
+
+#endif
+
+
+
+static void XzDecMt_FreeSt(CXzDecMt *p)
+{
+  XzUnpacker_Free(&p->dec);
+  
+  if (p->outBuf)
+  {
+    ISzAlloc_Free(p->allocMid, p->outBuf);
+    p->outBuf = NULL;
+  }
+  p->outBufSize = 0;
+  
+  if (p->inBuf)
+  {
+    ISzAlloc_Free(p->allocMid, p->inBuf);
+    p->inBuf = NULL;
+  }
+  p->inBufSize = 0;
+}
+
+
+void XzDecMt_Destroy(CXzDecMtHandle pp)
+{
+  CXzDecMt *p = (CXzDecMt *)pp;
+
+  XzDecMt_FreeSt(p);
+
+  #ifndef _7ZIP_ST
+
+  if (p->mtc_WasConstructed)
+  {
+    MtDec_Destruct(&p->mtc);
+    p->mtc_WasConstructed = False;
+  }
+  {
+    unsigned i;
+    for (i = 0; i < MTDEC__THREADS_MAX; i++)
+    {
+      CXzDecMtThread *t = &p->coders[i];
+      if (t->dec_created)
+      {
+        // we don't need to free dict here
+        XzUnpacker_Free(&t->dec);
+        t->dec_created = False;
+      }
+    }
+  }
+  XzDecMt_FreeOutBufs(p);
+
+  #endif
+
+  ISzAlloc_Free(p->alignOffsetAlloc.baseAlloc, pp);
+}
+
+
+
+#ifndef _7ZIP_ST
+
+static void XzDecMt_Callback_Parse(void *obj, unsigned coderIndex, CMtDecCallbackInfo *cc)
+{
+  CXzDecMt *me = (CXzDecMt *)obj;
+  CXzDecMtThread *coder = &me->coders[coderIndex];
+  size_t srcSize = cc->srcSize;
+
+  cc->srcSize = 0;
+  cc->outPos = 0;
+  cc->state = MTDEC_PARSE_CONTINUE;
+
+  cc->canCreateNewThread = True;
+
+  if (cc->startCall)
+  {
+    coder->outPreSize = 0;
+    coder->inPreSize = 0;
+    coder->inPreHeaderSize = 0;
+    coder->parseState = MTDEC_PARSE_CONTINUE;
+    coder->parsing_Truncated = False;
+    coder->skipMode = False;
+    coder->codeRes = SZ_OK;
+    coder->status = CODER_STATUS_NOT_SPECIFIED;
+    coder->inCodeSize = 0;
+    coder->outCodeSize = 0;
+
+    coder->numStreams = me->numStreams;
+    coder->numTotalBlocks = me->numTotalBlocks;
+    coder->numBlocks = me->numBlocks;
+
+    if (!coder->dec_created)
+    {
+      XzUnpacker_Construct(&coder->dec, &me->alignOffsetAlloc.vt);
+      coder->dec_created = True;
+    }
+    
+    XzUnpacker_Init(&coder->dec);
+
+    if (me->isBlockHeaderState_Parse)
+    {
+      coder->dec.streamFlags = me->streamFlags;
+      coder->atBlockHeader = True;
+      XzUnpacker_PrepareToRandomBlockDecoding(&coder->dec);
+    }
+    else
+    {
+      coder->atBlockHeader = False;
+      me->isBlockHeaderState_Parse = True;
+    }
+
+    coder->dec.numStartedStreams = me->numStreams;
+    coder->dec.numTotalBlocks = me->numTotalBlocks;
+    coder->dec.numBlocks = me->numBlocks;
+  }
+
+  while (!coder->skipMode)
+  {
+    ECoderStatus status;
+    SRes res;
+    size_t srcSize2 = srcSize;
+    size_t destSize = (size_t)0 - 1;
+
+    coder->dec.parseMode = True;
+    coder->dec.headerParsedOk = False;
+    
+    PRF_STR_INT("Parse", srcSize2);
+    
+    res = XzUnpacker_Code(&coder->dec,
+        NULL, &destSize,
+        cc->src, &srcSize2, cc->srcFinished,
+        CODER_FINISH_END, &status);
+    
+    // PRF(printf(" res = %d, srcSize2 = %d", res, (unsigned)srcSize2));
+    
+    coder->codeRes = res;
+    coder->status = status;
+    cc->srcSize += srcSize2;
+    srcSize -= srcSize2;
+    coder->inPreHeaderSize += srcSize2;
+    coder->inPreSize = coder->inPreHeaderSize;
+    
+    if (res != SZ_OK)
+    {
+      cc->state =
+      coder->parseState = MTDEC_PARSE_END;
+      /*
+      if (res == SZ_ERROR_MEM)
+        return res;
+      return SZ_OK;
+      */
+      return; // res;
+    }
+    
+    if (coder->dec.headerParsedOk)
+    {
+      const CXzBlock *block = &coder->dec.block;
+      if (XzBlock_HasUnpackSize(block)
+          // && block->unpackSize <= me->props.outBlockMax
+          && XzBlock_HasPackSize(block))
+      {
+        {
+          if (block->unpackSize * 2 * me->mtc.numStartedThreads > me->props.memUseMax)
+          {
+            cc->state = MTDEC_PARSE_OVERFLOW;
+            return; // SZ_OK;
+          }
+        }
+        {
+        UInt64 packSize = block->packSize;
+        UInt64 packSizeAligned = packSize + ((0 - (unsigned)packSize) & 3);
+        UInt32 checkSize = XzFlags_GetCheckSize(coder->dec.streamFlags);
+        UInt64 blockPackSum = coder->inPreSize + packSizeAligned + checkSize;
+        // if (blockPackSum <= me->props.inBlockMax)
+        // unpackBlockMaxSize
+        {
+          coder->blockPackSize_for_Index = (size_t)(coder->dec.blockHeaderSize + packSize + checkSize);
+          coder->blockPackTotal = (size_t)blockPackSum;
+          coder->outPreSize = (size_t)block->unpackSize;
+          coder->streamFlags = coder->dec.streamFlags;
+          me->streamFlags = coder->dec.streamFlags;
+          coder->skipMode = True;
+          break;
+        }
+        }
+      }
+    }
+    else
+    // if (coder->inPreSize <= me->props.inBlockMax)
+    {
+      if (!cc->srcFinished)
+        return; // SZ_OK;
+      cc->state =
+      coder->parseState = MTDEC_PARSE_END;
+      return; // SZ_OK;
+    }
+    cc->state = MTDEC_PARSE_OVERFLOW;
+    return; // SZ_OK;
+  }
+
+  // ---------- skipMode ----------
+  {
+    UInt64 rem = coder->blockPackTotal - coder->inPreSize;
+    size_t cur = srcSize;
+    if (cur > rem)
+      cur = (size_t)rem;
+    cc->srcSize += cur;
+    coder->inPreSize += cur;
+    srcSize -= cur;
+
+    if (coder->inPreSize == coder->blockPackTotal)
+    {
+      if (srcSize == 0)
+      {
+        if (!cc->srcFinished)
+          return; // SZ_OK;
+        cc->state = MTDEC_PARSE_END;
+      }
+      else if ((cc->src)[cc->srcSize] == 0) // we check control byte of next block
+        cc->state = MTDEC_PARSE_END;
+      else
+      {
+        cc->state = MTDEC_PARSE_NEW;
+
+        {
+          size_t blockMax = me->unpackBlockMaxSize;
+          if (blockMax < coder->outPreSize)
+            blockMax = coder->outPreSize;
+          {
+            UInt64 required = (UInt64)blockMax * (me->mtc.numStartedThreads + 1) * 2;
+            if (me->props.memUseMax < required)
+              cc->canCreateNewThread = False;
+          }
+        }
+
+        if (me->outSize_Defined)
+        {
+          // next block can be zero size
+          const UInt64 rem2 = me->outSize - me->outProcessed_Parse;
+          if (rem2 < coder->outPreSize)
+          {
+            coder->parsing_Truncated = True;
+            cc->state = MTDEC_PARSE_END;
+          }
+          me->outProcessed_Parse += coder->outPreSize;
+        }
+      }
+    }
+    else if (cc->srcFinished)
+      cc->state = MTDEC_PARSE_END;
+    else
+      return; // SZ_OK;
+
+    coder->parseState = cc->state;
+    cc->outPos = coder->outPreSize;
+    
+    me->numStreams = coder->dec.numStartedStreams;
+    me->numTotalBlocks = coder->dec.numTotalBlocks;
+    me->numBlocks = coder->dec.numBlocks + 1;
+    return; // SZ_OK;
+  }
+}
+
+
+static SRes XzDecMt_Callback_PreCode(void *pp, unsigned coderIndex)
+{
+  CXzDecMt *me = (CXzDecMt *)pp;
+  CXzDecMtThread *coder = &me->coders[coderIndex];
+  Byte *dest;
+
+  if (!coder->dec.headerParsedOk)
+    return SZ_OK;
+
+  dest = coder->outBuf;
+
+  if (!dest || coder->outBufSize < coder->outPreSize)
+  {
+    if (dest)
+    {
+      ISzAlloc_Free(me->allocMid, dest);
+      coder->outBuf = NULL;
+      coder->outBufSize = 0;
+    }
+    {
+      size_t outPreSize = coder->outPreSize;
+      if (outPreSize == 0)
+        outPreSize = 1;
+      dest = (Byte *)ISzAlloc_Alloc(me->allocMid, outPreSize);
+    }
+    if (!dest)
+      return SZ_ERROR_MEM;
+    coder->outBuf = dest;
+    coder->outBufSize = coder->outPreSize;
+
+    if (coder->outBufSize > me->unpackBlockMaxSize)
+      me->unpackBlockMaxSize = coder->outBufSize;
+  }
+
+  // return SZ_ERROR_MEM;
+
+  XzUnpacker_SetOutBuf(&coder->dec, coder->outBuf, coder->outBufSize);
+
+  {
+    SRes res = XzDecMix_Init(&coder->dec.decoder, &coder->dec.block, coder->outBuf, coder->outBufSize);
+    // res = SZ_ERROR_UNSUPPORTED; // to test
+    coder->codeRes = res;
+    if (res != SZ_OK)
+    {
+      // if (res == SZ_ERROR_MEM) return res;
+      if (me->props.ignoreErrors && res != SZ_ERROR_MEM)
+        return S_OK;
+      return res;
+    }
+  }
+
+  return SZ_OK;
+}
+
+
+static SRes XzDecMt_Callback_Code(void *pp, unsigned coderIndex,
+    const Byte *src, size_t srcSize, int srcFinished,
+    // int finished, int blockFinished,
+    UInt64 *inCodePos, UInt64 *outCodePos, int *stop)
+{
+  CXzDecMt *me = (CXzDecMt *)pp;
+  CXzDecMtThread *coder = &me->coders[coderIndex];
+
+  *inCodePos = coder->inCodeSize;
+  *outCodePos = coder->outCodeSize;
+  *stop = True;
+
+  if (coder->inCodeSize < coder->inPreHeaderSize)
+  {
+    UInt64 rem = coder->inPreHeaderSize - coder->inCodeSize;
+    size_t step = srcSize;
+    if (step > rem)
+      step = (size_t)rem;
+    src += step;
+    srcSize -= step;
+    coder->inCodeSize += step;
+    if (coder->inCodeSize < coder->inPreHeaderSize)
+    {
+      *stop = False;
+      return SZ_OK;
+    }
+  }
+
+  if (!coder->dec.headerParsedOk)
+    return SZ_OK;
+  if (!coder->outBuf)
+    return SZ_OK;
+
+  if (coder->codeRes == SZ_OK)
+  {
+    ECoderStatus status;
+    SRes res;
+    size_t srcProcessed = srcSize;
+    size_t outSizeCur = coder->outPreSize - coder->dec.outDataWritten;
+
+    // PRF(printf("\nCallback_Code: Code %d %d\n", (unsigned)srcSize, (unsigned)outSizeCur));
+
+    res = XzUnpacker_Code(&coder->dec,
+        NULL, &outSizeCur,
+        src, &srcProcessed, srcFinished,
+        // coder->finishedWithMark ? CODER_FINISH_END : CODER_FINISH_ANY,
+        CODER_FINISH_END,
+        &status);
+
+    // PRF(printf(" res = %d, srcSize2 = %d, outSizeCur = %d", res, (unsigned)srcProcessed, (unsigned)outSizeCur));
+
+    coder->codeRes = res;
+    coder->status = status;
+    coder->inCodeSize += srcProcessed;
+    coder->outCodeSize = coder->dec.outDataWritten;
+    *inCodePos = coder->inCodeSize;
+    *outCodePos = coder->outCodeSize;
+
+    if (res == SZ_OK)
+    {
+      if (srcProcessed == srcSize)
+        *stop = False;
+      return SZ_OK;
+    }
+  }
+
+  if (me->props.ignoreErrors && coder->codeRes != SZ_ERROR_MEM)
+  {
+    *inCodePos = coder->inPreSize;
+    *outCodePos = coder->outPreSize;
+    return S_OK;
+  }
+  return coder->codeRes;
+}
+
+
+#define XZDECMT_STREAM_WRITE_STEP (1 << 24)
+
+static SRes XzDecMt_Callback_Write(void *pp, unsigned coderIndex,
+    BoolInt needWriteToStream,
+    const Byte *src, size_t srcSize,
+    // int srcFinished,
+    BoolInt *needContinue,
+    BoolInt *canRecode)
+{
+  CXzDecMt *me = (CXzDecMt *)pp;
+  const CXzDecMtThread *coder = &me->coders[coderIndex];
+
+  // PRF(printf("\nWrite processed = %d srcSize = %d\n", (unsigned)me->mtc.inProcessed, (unsigned)srcSize));
+  
+  *needContinue = False;
+  *canRecode = True;
+  
+  if (!needWriteToStream)
+    return SZ_OK;
+
+  if (!coder->dec.headerParsedOk || !coder->outBuf)
+  {
+    if (me->finishedDecoderIndex < 0)
+      me->finishedDecoderIndex = coderIndex;
+    return SZ_OK;
+  }
+
+  if (me->finishedDecoderIndex >= 0)
+    return SZ_OK;
+
+  me->mtc.inProcessed += coder->inCodeSize;
+
+  *canRecode = False;
+
+  {
+    SRes res;
+    size_t size = coder->outCodeSize;
+    Byte *data = coder->outBuf;
+    
+    // we use in me->dec: sha, numBlocks, indexSize
+
+    if (!me->isBlockHeaderState_Write)
+    {
+      XzUnpacker_PrepareToRandomBlockDecoding(&me->dec);
+      me->dec.decodeOnlyOneBlock = False;
+      me->dec.numStartedStreams = coder->dec.numStartedStreams;
+      me->dec.streamFlags = coder->streamFlags;
+
+      me->isBlockHeaderState_Write = True;
+    }
+    
+    me->dec.numTotalBlocks = coder->dec.numTotalBlocks;
+    XzUnpacker_UpdateIndex(&me->dec, coder->blockPackSize_for_Index, coder->outPreSize);
+    
+    if (coder->outPreSize != size)
+    {
+      if (me->props.ignoreErrors)
+      {
+        memset(data + size, 0, coder->outPreSize - size);
+        size = coder->outPreSize;
+      }
+      // me->numBadBlocks++;
+      if (me->mainErrorCode == SZ_OK)
+      {
+        if ((int)coder->status == LZMA_STATUS_NEEDS_MORE_INPUT)
+          me->mainErrorCode = SZ_ERROR_INPUT_EOF;
+        else
+          me->mainErrorCode = SZ_ERROR_DATA;
+      }
+    }
+    
+    if (me->writeRes != SZ_OK)
+      return me->writeRes;
+
+    res = SZ_OK;
+    {
+      if (me->outSize_Defined)
+      {
+        const UInt64 rem = me->outSize - me->outProcessed;
+        if (size > rem)
+          size = (SizeT)rem;
+      }
+
+      for (;;)
+      {
+        size_t cur = size;
+        size_t written;
+        if (cur > XZDECMT_STREAM_WRITE_STEP)
+          cur = XZDECMT_STREAM_WRITE_STEP;
+
+        written = ISeqOutStream_Write(me->outStream, data, cur);
+
+        // PRF(printf("\nWritten ask = %d written = %d\n", (unsigned)cur, (unsigned)written));
+        
+        me->outProcessed += written;
+        if (written != cur)
+        {
+          me->writeRes = SZ_ERROR_WRITE;
+          res = me->writeRes;
+          break;
+        }
+        data += cur;
+        size -= cur;
+        // PRF_STR_INT("Written size =", size);
+        if (size == 0)
+          break;
+        res = MtProgress_ProgressAdd(&me->mtc.mtProgress, 0, 0);
+        if (res != SZ_OK)
+          break;
+      }
+    }
+
+    if (coder->codeRes != SZ_OK)
+      if (!me->props.ignoreErrors)
+      {
+        me->finishedDecoderIndex = coderIndex;
+        return res;
+      }
+
+    RINOK(res);
+
+    if (coder->inPreSize != coder->inCodeSize
+        || coder->blockPackTotal != coder->inCodeSize)
+    {
+      me->finishedDecoderIndex = coderIndex;
+      return SZ_OK;
+    }
+
+    if (coder->parseState != MTDEC_PARSE_END)
+    {
+      *needContinue = True;
+      return SZ_OK;
+    }
+  }
+
+  // (coder->state == MTDEC_PARSE_END) means that there are no other working threads
+  // so we can use mtc variables without lock
+
+  PRF_STR_INT("Write MTDEC_PARSE_END", me->mtc.inProcessed);
+
+  me->mtc.mtProgress.totalInSize = me->mtc.inProcessed;
+  {
+    CXzUnpacker *dec = &me->dec;
+    
+    PRF_STR_INT("PostSingle", srcSize);
+    
+    {
+      size_t srcProcessed = srcSize;
+      ECoderStatus status;
+      size_t outSizeCur = 0;
+      SRes res;
+      
+      // dec->decodeOnlyOneBlock = False;
+      dec->decodeToStreamSignature = True;
+
+      me->mainDecoderWasCalled = True;
+
+      if (coder->parsing_Truncated)
+      {
+        me->parsing_Truncated = True;
+        return SZ_OK;
+      }
+      
+      res = XzUnpacker_Code(dec,
+          NULL, &outSizeCur,
+          src, &srcProcessed,
+          me->mtc.readWasFinished, // srcFinished
+          CODER_FINISH_END, // CODER_FINISH_ANY,
+          &status);
+      
+      me->status = status;
+      me->codeRes = res;
+
+      me->mtc.inProcessed += srcProcessed;
+      me->mtc.mtProgress.totalInSize = me->mtc.inProcessed;
+
+      if (res != SZ_OK)
+      {
+        return S_OK;
+        // return res;
+      }
+      
+      if (dec->state == XZ_STATE_STREAM_HEADER)
+      {
+        *needContinue = True;
+        me->isBlockHeaderState_Parse = False;
+        me->isBlockHeaderState_Write = False;
+        {
+          Byte *crossBuf = MtDec_GetCrossBuff(&me->mtc);
+          if (!crossBuf)
+            return SZ_ERROR_MEM;
+          memcpy(crossBuf, src + srcProcessed, srcSize - srcProcessed);
+        }
+        me->mtc.crossStart = 0;
+        me->mtc.crossEnd = srcSize - srcProcessed;
+        return SZ_OK;
+      }
+      
+      if (status != CODER_STATUS_NEEDS_MORE_INPUT)
+      {
+        return E_FAIL;
+      }
+      
+      if (me->mtc.readWasFinished)
+      {
+        return SZ_OK;
+      }
+    }
+    
+    {
+      size_t inPos;
+      size_t inLim;
+      const Byte *inData;
+      UInt64 inProgressPrev = me->mtc.inProcessed;
+      
+      // XzDecMt_Prepare_InBuf_ST(p);
+      Byte *crossBuf = MtDec_GetCrossBuff(&me->mtc);
+      if (!crossBuf)
+        return SZ_ERROR_MEM;
+      
+      inPos = 0;
+      inLim = 0;
+      // outProcessed = 0;
+      
+      inData = crossBuf;
+      
+      for (;;)
+      {
+        SizeT inProcessed;
+        SizeT outProcessed;
+        ECoderStatus status;
+        SRes res;
+        
+        if (inPos == inLim)
+        {
+          if (!me->mtc.readWasFinished)
+          {
+            inPos = 0;
+            inLim = me->mtc.inBufSize;
+            me->mtc.readRes = ISeqInStream_Read(me->inStream, (void *)inData, &inLim);
+            me->mtc.readProcessed += inLim;
+            if (inLim == 0 || me->mtc.readRes != SZ_OK)
+              me->mtc.readWasFinished = True;
+          }
+        }
+        
+        inProcessed = inLim - inPos;
+        outProcessed = 0;
+
+        res = XzUnpacker_Code(dec,
+            NULL, &outProcessed,
+            inData + inPos, &inProcessed,
+            (inProcessed == 0), // srcFinished
+            CODER_FINISH_END, &status);
+        
+        me->codeRes = res;
+        me->status = status;
+        inPos += inProcessed;
+        me->mtc.inProcessed += inProcessed;
+        me->mtc.mtProgress.totalInSize = me->mtc.inProcessed;
+
+        if (res != SZ_OK)
+        {
+          return S_OK;
+          // return res;
+        }
+
+        if (dec->state == XZ_STATE_STREAM_HEADER)
+        {
+          *needContinue = True;
+          me->mtc.crossStart = inPos;
+          me->mtc.crossEnd = inLim;
+          me->isBlockHeaderState_Parse = False;
+          me->isBlockHeaderState_Write = False;
+          return SZ_OK;
+        }
+        
+        if (status != CODER_STATUS_NEEDS_MORE_INPUT)
+          return E_FAIL;
+        
+        if (me->mtc.progress)
+        {
+          UInt64 inDelta = me->mtc.inProcessed - inProgressPrev;
+          if (inDelta >= (1 << 22))
+          {
+            RINOK(MtProgress_Progress_ST(&me->mtc.mtProgress));
+            inProgressPrev = me->mtc.inProcessed;
+          }
+        }
+        if (me->mtc.readWasFinished)
+          return SZ_OK;
+      }
+    }
+  }
+}
+
+
+#endif
+
+
+
+void XzStatInfo_Clear(CXzStatInfo *p)
+{
+  p->InSize = 0;
+  p->OutSize = 0;
+  
+  p->NumStreams = 0;
+  p->NumBlocks = 0;
+  
+  p->UnpackSize_Defined = False;
+  
+  p->NumStreams_Defined = False;
+  p->NumBlocks_Defined = False;
+  
+  // p->IsArc = False;
+  // p->UnexpectedEnd = False;
+  // p->Unsupported = False;
+  // p->HeadersError = False;
+  // p->DataError = False;
+  // p->CrcError = False;
+
+  p->DataAfterEnd = False;
+  p->DecodingTruncated = False;
+  
+  p->DecodeRes = SZ_OK;
+  p->ReadRes = SZ_OK;
+  p->ProgressRes = SZ_OK;
+
+  p->CombinedRes = SZ_OK;
+  p->CombinedRes_Type = SZ_OK;
+}
+
+
+
+
+static SRes XzDecMt_Decode_ST(CXzDecMt *p
+    #ifndef _7ZIP_ST
+    , BoolInt tMode
+    #endif
+    , CXzStatInfo *stat)
+{
+  size_t outPos;
+  size_t inPos, inLim;
+  const Byte *inData;
+  UInt64 inPrev, outPrev;
+
+  CXzUnpacker *dec;
+
+  #ifndef _7ZIP_ST
+  if (tMode)
+  {
+    XzDecMt_FreeOutBufs(p);
+    tMode = MtDec_PrepareRead(&p->mtc);
+  }
+  #endif
+
+  if (!p->outBuf || p->outBufSize != p->props.outStep_ST)
+  {
+    ISzAlloc_Free(p->allocMid, p->outBuf);
+    p->outBufSize = 0;
+    p->outBuf = (Byte *)ISzAlloc_Alloc(p->allocMid, p->props.outStep_ST);
+    if (!p->outBuf)
+      return SZ_ERROR_MEM;
+    p->outBufSize = p->props.outStep_ST;
+  }
+
+  if (!p->inBuf || p->inBufSize != p->props.inBufSize_ST)
+  {
+    ISzAlloc_Free(p->allocMid, p->inBuf);
+    p->inBufSize = 0;
+    p->inBuf = (Byte *)ISzAlloc_Alloc(p->allocMid, p->props.inBufSize_ST);
+    if (!p->inBuf)
+      return SZ_ERROR_MEM;
+    p->inBufSize = p->props.inBufSize_ST;
+  }
+
+  dec = &p->dec;
+  dec->decodeToStreamSignature = False;
+  // dec->decodeOnlyOneBlock = False;
+
+  XzUnpacker_SetOutBuf(dec, NULL, 0);
+
+  inPrev = p->inProcessed;
+  outPrev = p->outProcessed;
+
+  inPos = 0;
+  inLim = 0;
+  inData = NULL;
+  outPos = 0;
+
+  for (;;)
+  {
+    SizeT outSize;
+    BoolInt finished;
+    ECoderFinishMode finishMode;
+    SizeT inProcessed;
+    ECoderStatus status;
+    SRes res;
+
+    SizeT outProcessed;
+
+
+
+    if (inPos == inLim)
+    {
+      #ifndef _7ZIP_ST
+      if (tMode)
+      {
+        inData = MtDec_Read(&p->mtc, &inLim);
+        inPos = 0;
+        if (inData)
+          continue;
+        tMode = False;
+        inLim = 0;
+      }
+      #endif
+      
+      if (!p->readWasFinished)
+      {
+        inPos = 0;
+        inLim = p->inBufSize;
+        inData = p->inBuf;
+        p->readRes = ISeqInStream_Read(p->inStream, (void *)inData, &inLim);
+        p->readProcessed += inLim;
+        if (inLim == 0 || p->readRes != SZ_OK)
+          p->readWasFinished = True;
+      }
+    }
+
+    outSize = p->props.outStep_ST - outPos;
+
+    finishMode = CODER_FINISH_ANY;
+    if (p->outSize_Defined)
+    {
+      const UInt64 rem = p->outSize - p->outProcessed;
+      if (outSize >= rem)
+      {
+        outSize = (SizeT)rem;
+        if (p->finishMode)
+          finishMode = CODER_FINISH_END;
+      }
+    }
+
+    inProcessed = inLim - inPos;
+    outProcessed = outSize;
+
+    res = XzUnpacker_Code(dec, p->outBuf + outPos, &outProcessed,
+        inData + inPos, &inProcessed,
+        (inPos == inLim), // srcFinished
+        finishMode, &status);
+
+    p->codeRes = res;
+    p->status = status;
+
+    inPos += inProcessed;
+    outPos += outProcessed;
+    p->inProcessed += inProcessed;
+    p->outProcessed += outProcessed;
+
+    finished = ((inProcessed == 0 && outProcessed == 0) || res != SZ_OK);
+
+    if (finished || outProcessed >= outSize)
+      if (outPos != 0)
+      {
+        size_t written = ISeqOutStream_Write(p->outStream, p->outBuf, outPos);
+        p->outProcessed += written;
+        if (written != outPos)
+        {
+          stat->CombinedRes_Type = SZ_ERROR_WRITE;
+          return SZ_ERROR_WRITE;
+        }
+        outPos = 0;
+      }
+
+    if (p->progress && res == SZ_OK)
+    {
+      UInt64 inDelta = p->inProcessed - inPrev;
+      UInt64 outDelta = p->outProcessed - outPrev;
+      if (inDelta >= (1 << 22) || outDelta >= (1 << 22))
+      {
+        res = ICompressProgress_Progress(p->progress, p->inProcessed, p->outProcessed);
+        if (res != SZ_OK)
+        {
+          stat->CombinedRes_Type = SZ_ERROR_PROGRESS;
+          stat->ProgressRes = res;
+          return res;
+        }
+        inPrev = p->inProcessed;
+        outPrev = p->outProcessed;
+      }
+    }
+
+    if (finished)
+      return res;
+  }
+}
+
+static SRes XzStatInfo_SetStat(const CXzUnpacker *dec,
+    int finishMode,
+    UInt64 readProcessed, UInt64 inProcessed,
+    SRes res, ECoderStatus status,
+    BoolInt decodingTruncated,
+    CXzStatInfo *stat)
+{
+  UInt64 extraSize;
+  
+  stat->DecodingTruncated = (Byte)(decodingTruncated ? 1 : 0);
+  stat->InSize = inProcessed;
+  stat->NumStreams = dec->numStartedStreams;
+  stat->NumBlocks = dec->numTotalBlocks;
+  
+  stat->UnpackSize_Defined = True;
+  stat->NumStreams_Defined = True;
+  stat->NumBlocks_Defined = True;
+  
+  extraSize = XzUnpacker_GetExtraSize(dec);
+  
+  if (res == SZ_OK)
+  {
+    if (status == CODER_STATUS_NEEDS_MORE_INPUT)
+    {
+      // CODER_STATUS_NEEDS_MORE_INPUT is expected status for correct xz streams
+      extraSize = 0;
+      if (!XzUnpacker_IsStreamWasFinished(dec))
+        res = SZ_ERROR_INPUT_EOF;
+    }
+    else if (!decodingTruncated || finishMode) // (status == CODER_STATUS_NOT_FINISHED)
+      res = SZ_ERROR_DATA;
+  }
+  else if (res == SZ_ERROR_NO_ARCHIVE)
+  {
+    /*
+    SZ_ERROR_NO_ARCHIVE is possible for 2 states:
+      XZ_STATE_STREAM_HEADER  - if bad signature or bad CRC
+      XZ_STATE_STREAM_PADDING - if non-zero padding data
+    extraSize / inProcessed don't include "bad" byte
+    */
+    if (inProcessed != extraSize) // if good streams before error
+      if (extraSize != 0 || readProcessed != inProcessed)
+      {
+        stat->DataAfterEnd = True;
+        // there is some good xz stream before. So we set SZ_OK
+        res = SZ_OK;
+      }
+  }
+  
+  stat->DecodeRes = res;
+
+  stat->InSize -= extraSize;
+  return res;
+}
+
+
+SRes XzDecMt_Decode(CXzDecMtHandle pp,
+    const CXzDecMtProps *props,
+    const UInt64 *outDataSize, int finishMode,
+    ISeqOutStream *outStream,
+    // Byte *outBuf, size_t *outBufSize,
+    ISeqInStream *inStream,
+    // const Byte *inData, size_t inDataSize,
+    CXzStatInfo *stat,
+    int *isMT,
+    ICompressProgress *progress)
+{
+  CXzDecMt *p = (CXzDecMt *)pp;
+  #ifndef _7ZIP_ST
+  BoolInt tMode;
+  #endif
+
+  XzStatInfo_Clear(stat);
+
+  p->props = *props;
+
+  p->inStream = inStream;
+  p->outStream = outStream;
+  p->progress = progress;
+  // p->stat = stat;
+
+  p->outSize = 0;
+  p->outSize_Defined = False;
+  if (outDataSize)
+  {
+    p->outSize_Defined = True;
+    p->outSize = *outDataSize;
+  }
+
+  p->finishMode = finishMode;
+
+  // p->outSize = 457; p->outSize_Defined = True; p->finishMode = False; // for test
+
+  p->writeRes = SZ_OK;
+  p->outProcessed = 0;
+  p->inProcessed = 0;
+  p->readProcessed = 0;
+  p->readWasFinished = False;
+
+  p->codeRes = 0;
+  p->status = CODER_STATUS_NOT_SPECIFIED;
+
+  XzUnpacker_Init(&p->dec);
+
+  *isMT = False;
+
+    /*
+    p->outBuf = NULL;
+    p->outBufSize = 0;
+    if (!outStream)
+    {
+      p->outBuf = outBuf;
+      p->outBufSize = *outBufSize;
+      *outBufSize = 0;
+    }
+    */
+
+  
+  #ifndef _7ZIP_ST
+
+  p->isBlockHeaderState_Parse = False;
+  p->isBlockHeaderState_Write = False;
+  // p->numBadBlocks = 0;
+  p->mainErrorCode = SZ_OK;
+  p->mainDecoderWasCalled = False;
+
+  tMode = False;
+
+  if (p->props.numThreads > 1)
+  {
+    IMtDecCallback vt;
+
+    // we just free ST buffers here
+    // but we still keep state variables, that was set in XzUnpacker_Init()
+    XzDecMt_FreeSt(p);
+
+    p->outProcessed_Parse = 0;
+    p->parsing_Truncated = False;
+
+    p->numStreams = 0;
+    p->numTotalBlocks = 0;
+    p->numBlocks = 0;
+    p->finishedDecoderIndex = -1;
+
+    if (!p->mtc_WasConstructed)
+    {
+      p->mtc_WasConstructed = True;
+      MtDec_Construct(&p->mtc);
+    }
+    
+    p->mtc.mtCallback = &vt;
+    p->mtc.mtCallbackObject = p;
+
+    p->mtc.progress = progress;
+    p->mtc.inStream = inStream;
+    p->mtc.alloc = &p->alignOffsetAlloc.vt;
+    // p->mtc.inData = inData;
+    // p->mtc.inDataSize = inDataSize;
+    p->mtc.inBufSize = p->props.inBufSize_MT;
+    // p->mtc.inBlockMax = p->props.inBlockMax;
+    p->mtc.numThreadsMax = p->props.numThreads;
+
+    *isMT = True;
+
+    vt.Parse = XzDecMt_Callback_Parse;
+    vt.PreCode = XzDecMt_Callback_PreCode;
+    vt.Code = XzDecMt_Callback_Code;
+    vt.Write = XzDecMt_Callback_Write;
+
+    {
+      BoolInt needContinue;
+      
+      SRes res = MtDec_Code(&p->mtc);
+
+      stat->InSize = p->mtc.inProcessed;
+
+      p->inProcessed = p->mtc.inProcessed;
+      p->readRes = p->mtc.readRes;
+      p->readWasFinished = p->mtc.readWasFinished;
+      p->readProcessed = p->mtc.readProcessed;
+
+      tMode = True;
+      needContinue = False;
+
+      if (res == SZ_OK)
+      {
+        if (p->mtc.mtProgress.res != SZ_OK)
+        {
+          res = p->mtc.mtProgress.res;
+          stat->ProgressRes = res;
+          stat->CombinedRes_Type = SZ_ERROR_PROGRESS;
+        }
+        else
+          needContinue = p->mtc.needContinue;
+      }
+
+      if (!needContinue)
+      {
+        SRes codeRes;
+        BoolInt truncated = False;
+        ECoderStatus status;
+        CXzUnpacker *dec;
+
+        stat->OutSize = p->outProcessed;
+       
+        if (p->finishedDecoderIndex >= 0)
+        {
+          CXzDecMtThread *coder = &p->coders[(unsigned)p->finishedDecoderIndex];
+          codeRes = coder->codeRes;
+          dec = &coder->dec;
+          status = coder->status;
+        }
+        else if (p->mainDecoderWasCalled)
+        {
+          codeRes = p->codeRes;
+          dec = &p->dec;
+          status = p->status;
+          truncated = p->parsing_Truncated;
+        }
+        else
+          return E_FAIL;
+
+        XzStatInfo_SetStat(dec, p->finishMode,
+            p->mtc.readProcessed, p->mtc.inProcessed,
+            codeRes, status,
+            truncated,
+            stat);
+
+        if (res == SZ_OK)
+        {
+          if (p->writeRes != SZ_OK)
+          {
+            res = p->writeRes;
+            stat->CombinedRes_Type = SZ_ERROR_WRITE;
+          }
+          else if (p->mtc.readRes != SZ_OK && p->mtc.inProcessed == p->mtc.readProcessed)
+          {
+            res = p->mtc.readRes;
+            stat->ReadRes = res;
+            stat->CombinedRes_Type = SZ_ERROR_READ;
+          }
+          else if (p->mainErrorCode != SZ_OK)
+          {
+            res = p->mainErrorCode;
+          }
+        }
+
+        stat->CombinedRes = res;
+        if (stat->CombinedRes_Type == SZ_OK)
+          stat->CombinedRes_Type = res;
+        return res;
+      }
+
+      PRF_STR("----- decoding ST -----");
+    }
+  }
+
+  #endif
+
+
+  *isMT = False;
+
+  {
+    SRes res = XzDecMt_Decode_ST(p
+        #ifndef _7ZIP_ST
+        , tMode
+        #endif
+        , stat
+        );
+
+    XzStatInfo_SetStat(&p->dec,
+        p->finishMode,
+        p->readProcessed, p->inProcessed,
+        p->codeRes, p->status,
+        False, // truncated
+        stat);
+
+    if (res == SZ_OK)
+    {
+      /*
+      if (p->writeRes != SZ_OK)
+      {
+        res = p->writeRes;
+        stat->CombinedRes_Type = SZ_ERROR_WRITE;
+      }
+      else
+      */
+      if (p->readRes != SZ_OK && p->inProcessed == p->readProcessed)
+      {
+        res = p->readRes;
+        stat->ReadRes = res;
+        stat->CombinedRes_Type = SZ_ERROR_READ;
+      }
+      #ifndef _7ZIP_ST
+      else if (p->mainErrorCode != SZ_OK)
+        res = p->mainErrorCode;
+      #endif
+    }
+
+    stat->CombinedRes = res;
+    if (stat->CombinedRes_Type == SZ_OK)
+      stat->CombinedRes_Type = res;
+    return res;
+  }
+}
diff --git a/3rdparty/7z/src/XzEnc.c b/3rdparty/7z/src/XzEnc.c
new file mode 100644
index 0000000000..309eca949e
--- /dev/null
+++ b/3rdparty/7z/src/XzEnc.c
@@ -0,0 +1,1329 @@
+/* XzEnc.c -- Xz Encode
+2019-02-02 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "7zCrc.h"
+#include "Bra.h"
+#include "CpuArch.h"
+
+#ifdef USE_SUBBLOCK
+#include "Bcj3Enc.c"
+#include "SbFind.c"
+#include "SbEnc.c"
+#endif
+
+#include "XzEnc.h"
+
+// #define _7ZIP_ST
+
+#ifndef _7ZIP_ST
+#include "MtCoder.h"
+#else
+#define MTCODER__THREADS_MAX 1
+#define MTCODER__BLOCKS_MAX 1
+#endif
+
+#define XZ_GET_PAD_SIZE(dataSize) ((4 - ((unsigned)(dataSize) & 3)) & 3)
+
+/* max pack size for LZMA2 block + check-64bytrs: */
+#define XZ_GET_MAX_BLOCK_PACK_SIZE(unpackSize) ((unpackSize) + ((unpackSize) >> 10) + 16 + 64)
+
+#define XZ_GET_ESTIMATED_BLOCK_TOTAL_PACK_SIZE(unpackSize) (XZ_BLOCK_HEADER_SIZE_MAX + XZ_GET_MAX_BLOCK_PACK_SIZE(unpackSize))
+
+
+#define XzBlock_ClearFlags(p)       (p)->flags = 0;
+#define XzBlock_SetNumFilters(p, n) (p)->flags |= ((n) - 1);
+#define XzBlock_SetHasPackSize(p)   (p)->flags |= XZ_BF_PACK_SIZE;
+#define XzBlock_SetHasUnpackSize(p) (p)->flags |= XZ_BF_UNPACK_SIZE;
+
+
+static SRes WriteBytes(ISeqOutStream *s, const void *buf, size_t size)
+{
+  return (ISeqOutStream_Write(s, buf, size) == size) ? SZ_OK : SZ_ERROR_WRITE;
+}
+
+static SRes WriteBytesUpdateCrc(ISeqOutStream *s, const void *buf, size_t size, UInt32 *crc)
+{
+  *crc = CrcUpdate(*crc, buf, size);
+  return WriteBytes(s, buf, size);
+}
+
+
+static SRes Xz_WriteHeader(CXzStreamFlags f, ISeqOutStream *s)
+{
+  UInt32 crc;
+  Byte header[XZ_STREAM_HEADER_SIZE];
+  memcpy(header, XZ_SIG, XZ_SIG_SIZE);
+  header[XZ_SIG_SIZE] = (Byte)(f >> 8);
+  header[XZ_SIG_SIZE + 1] = (Byte)(f & 0xFF);
+  crc = CrcCalc(header + XZ_SIG_SIZE, XZ_STREAM_FLAGS_SIZE);
+  SetUi32(header + XZ_SIG_SIZE + XZ_STREAM_FLAGS_SIZE, crc);
+  return WriteBytes(s, header, XZ_STREAM_HEADER_SIZE);
+}
+
+
+static SRes XzBlock_WriteHeader(const CXzBlock *p, ISeqOutStream *s)
+{
+  Byte header[XZ_BLOCK_HEADER_SIZE_MAX];
+
+  unsigned pos = 1;
+  unsigned numFilters, i;
+  header[pos++] = p->flags;
+
+  if (XzBlock_HasPackSize(p)) pos += Xz_WriteVarInt(header + pos, p->packSize);
+  if (XzBlock_HasUnpackSize(p)) pos += Xz_WriteVarInt(header + pos, p->unpackSize);
+  numFilters = XzBlock_GetNumFilters(p);
+  
+  for (i = 0; i < numFilters; i++)
+  {
+    const CXzFilter *f = &p->filters[i];
+    pos += Xz_WriteVarInt(header + pos, f->id);
+    pos += Xz_WriteVarInt(header + pos, f->propsSize);
+    memcpy(header + pos, f->props, f->propsSize);
+    pos += f->propsSize;
+  }
+
+  while ((pos & 3) != 0)
+    header[pos++] = 0;
+
+  header[0] = (Byte)(pos >> 2);
+  SetUi32(header + pos, CrcCalc(header, pos));
+  return WriteBytes(s, header, pos + 4);
+}
+
+
+
+
+typedef struct
+{
+  size_t numBlocks;
+  size_t size;
+  size_t allocated;
+  Byte *blocks;
+} CXzEncIndex;
+
+
+static void XzEncIndex_Construct(CXzEncIndex *p)
+{
+  p->numBlocks = 0;
+  p->size = 0;
+  p->allocated = 0;
+  p->blocks = NULL;
+}
+
+static void XzEncIndex_Init(CXzEncIndex *p)
+{
+  p->numBlocks = 0;
+  p->size = 0;
+}
+
+static void XzEncIndex_Free(CXzEncIndex *p, ISzAllocPtr alloc)
+{
+  if (p->blocks)
+  {
+    ISzAlloc_Free(alloc, p->blocks);
+    p->blocks = NULL;
+  }
+  p->numBlocks = 0;
+  p->size = 0;
+  p->allocated = 0;
+}
+
+
+static SRes XzEncIndex_ReAlloc(CXzEncIndex *p, size_t newSize, ISzAllocPtr alloc)
+{
+  Byte *blocks = (Byte *)ISzAlloc_Alloc(alloc, newSize);
+  if (!blocks)
+    return SZ_ERROR_MEM;
+  if (p->size != 0)
+    memcpy(blocks, p->blocks, p->size);
+  if (p->blocks)
+    ISzAlloc_Free(alloc, p->blocks);
+  p->blocks = blocks;
+  p->allocated = newSize;
+  return SZ_OK;
+}
+
+
+static SRes XzEncIndex_PreAlloc(CXzEncIndex *p, UInt64 numBlocks, UInt64 unpackSize, UInt64 totalSize, ISzAllocPtr alloc)
+{
+  UInt64 pos;
+  {
+    Byte buf[32];
+    unsigned pos2 = Xz_WriteVarInt(buf, totalSize);
+    pos2 += Xz_WriteVarInt(buf + pos2, unpackSize);
+    pos = numBlocks * pos2;
+  }
+  
+  if (pos <= p->allocated - p->size)
+    return SZ_OK;
+  {
+    UInt64 newSize64 = p->size + pos;
+    size_t newSize = (size_t)newSize64;
+    if (newSize != newSize64)
+      return SZ_ERROR_MEM;
+    return XzEncIndex_ReAlloc(p, newSize, alloc);
+  }
+}
+
+
+static SRes XzEncIndex_AddIndexRecord(CXzEncIndex *p, UInt64 unpackSize, UInt64 totalSize, ISzAllocPtr alloc)
+{
+  Byte buf[32];
+  unsigned pos = Xz_WriteVarInt(buf, totalSize);
+  pos += Xz_WriteVarInt(buf + pos, unpackSize);
+
+  if (pos > p->allocated - p->size)
+  {
+    size_t newSize = p->allocated * 2 + 16 * 2;
+    if (newSize < p->size + pos)
+      return SZ_ERROR_MEM;
+    RINOK(XzEncIndex_ReAlloc(p, newSize, alloc));
+  }
+  memcpy(p->blocks + p->size, buf, pos);
+  p->size += pos;
+  p->numBlocks++;
+  return SZ_OK;
+}
+
+
+static SRes XzEncIndex_WriteFooter(const CXzEncIndex *p, CXzStreamFlags flags, ISeqOutStream *s)
+{
+  Byte buf[32];
+  UInt64 globalPos;
+  UInt32 crc = CRC_INIT_VAL;
+  unsigned pos = 1 + Xz_WriteVarInt(buf + 1, p->numBlocks);
+  
+  globalPos = pos;
+  buf[0] = 0;
+  RINOK(WriteBytesUpdateCrc(s, buf, pos, &crc));
+  RINOK(WriteBytesUpdateCrc(s, p->blocks, p->size, &crc));
+  globalPos += p->size;
+  
+  pos = XZ_GET_PAD_SIZE(globalPos);
+  buf[1] = 0;
+  buf[2] = 0;
+  buf[3] = 0;
+  globalPos += pos;
+  
+  crc = CrcUpdate(crc, buf + 4 - pos, pos);
+  SetUi32(buf + 4, CRC_GET_DIGEST(crc));
+  
+  SetUi32(buf + 8 + 4, (UInt32)(globalPos >> 2));
+  buf[8 + 8] = (Byte)(flags >> 8);
+  buf[8 + 9] = (Byte)(flags & 0xFF);
+  SetUi32(buf + 8, CrcCalc(buf + 8 + 4, 6));
+  buf[8 + 10] = XZ_FOOTER_SIG_0;
+  buf[8 + 11] = XZ_FOOTER_SIG_1;
+  
+  return WriteBytes(s, buf + 4 - pos, pos + 4 + 12);
+}
+
+
+
+/* ---------- CSeqCheckInStream ---------- */
+
+typedef struct
+{
+  ISeqInStream vt;
+  ISeqInStream *realStream;
+  const Byte *data;
+  UInt64 limit;
+  UInt64 processed;
+  int realStreamFinished;
+  CXzCheck check;
+} CSeqCheckInStream;
+
+static void SeqCheckInStream_Init(CSeqCheckInStream *p, unsigned checkMode)
+{
+  p->limit = (UInt64)(Int64)-1;
+  p->processed = 0;
+  p->realStreamFinished = 0;
+  XzCheck_Init(&p->check, checkMode);
+}
+
+static void SeqCheckInStream_GetDigest(CSeqCheckInStream *p, Byte *digest)
+{
+  XzCheck_Final(&p->check, digest);
+}
+
+static SRes SeqCheckInStream_Read(const ISeqInStream *pp, void *data, size_t *size)
+{
+  CSeqCheckInStream *p = CONTAINER_FROM_VTBL(pp, CSeqCheckInStream, vt);
+  size_t size2 = *size;
+  SRes res = SZ_OK;
+  
+  if (p->limit != (UInt64)(Int64)-1)
+  {
+    UInt64 rem = p->limit - p->processed;
+    if (size2 > rem)
+      size2 = (size_t)rem;
+  }
+  if (size2 != 0)
+  {
+    if (p->realStream)
+    {
+      res = ISeqInStream_Read(p->realStream, data, &size2);
+      p->realStreamFinished = (size2 == 0) ? 1 : 0;
+    }
+    else
+      memcpy(data, p->data + (size_t)p->processed, size2);
+    XzCheck_Update(&p->check, data, size2);
+    p->processed += size2;
+  }
+  *size = size2;
+  return res;
+}
+
+
+/* ---------- CSeqSizeOutStream ---------- */
+
+typedef struct
+{
+  ISeqOutStream vt;
+  ISeqOutStream *realStream;
+  Byte *outBuf;
+  size_t outBufLimit;
+  UInt64 processed;
+} CSeqSizeOutStream;
+
+static size_t SeqSizeOutStream_Write(const ISeqOutStream *pp, const void *data, size_t size)
+{
+  CSeqSizeOutStream *p = CONTAINER_FROM_VTBL(pp, CSeqSizeOutStream, vt);
+  if (p->realStream)
+    size = ISeqOutStream_Write(p->realStream, data, size);
+  else
+  {
+    if (size > p->outBufLimit - (size_t)p->processed)
+      return 0;
+    memcpy(p->outBuf + (size_t)p->processed, data, size);
+  }
+  p->processed += size;
+  return size;
+}
+
+
+/* ---------- CSeqInFilter ---------- */
+
+#define FILTER_BUF_SIZE (1 << 20)
+
+typedef struct
+{
+  ISeqInStream p;
+  ISeqInStream *realStream;
+  IStateCoder StateCoder;
+  Byte *buf;
+  size_t curPos;
+  size_t endPos;
+  int srcWasFinished;
+} CSeqInFilter;
+
+
+SRes BraState_SetFromMethod(IStateCoder *p, UInt64 id, int encodeMode, ISzAllocPtr alloc);
+
+static SRes SeqInFilter_Init(CSeqInFilter *p, const CXzFilter *props, ISzAllocPtr alloc)
+{
+  if (!p->buf)
+  {
+    p->buf = (Byte *)ISzAlloc_Alloc(alloc, FILTER_BUF_SIZE);
+    if (!p->buf)
+      return SZ_ERROR_MEM;
+  }
+  p->curPos = p->endPos = 0;
+  p->srcWasFinished = 0;
+  RINOK(BraState_SetFromMethod(&p->StateCoder, props->id, 1, alloc));
+  RINOK(p->StateCoder.SetProps(p->StateCoder.p, props->props, props->propsSize, alloc));
+  p->StateCoder.Init(p->StateCoder.p);
+  return SZ_OK;
+}
+
+
+static SRes SeqInFilter_Read(const ISeqInStream *pp, void *data, size_t *size)
+{
+  CSeqInFilter *p = CONTAINER_FROM_VTBL(pp, CSeqInFilter, p);
+  size_t sizeOriginal = *size;
+  if (sizeOriginal == 0)
+    return SZ_OK;
+  *size = 0;
+  
+  for (;;)
+  {
+    if (!p->srcWasFinished && p->curPos == p->endPos)
+    {
+      p->curPos = 0;
+      p->endPos = FILTER_BUF_SIZE;
+      RINOK(ISeqInStream_Read(p->realStream, p->buf, &p->endPos));
+      if (p->endPos == 0)
+        p->srcWasFinished = 1;
+    }
+    {
+      SizeT srcLen = p->endPos - p->curPos;
+      ECoderStatus status;
+      SRes res;
+      *size = sizeOriginal;
+      res = p->StateCoder.Code2(p->StateCoder.p,
+          (Byte *)data, size,
+          p->buf + p->curPos, &srcLen,
+          p->srcWasFinished, CODER_FINISH_ANY,
+          &status);
+      p->curPos += srcLen;
+      if (*size != 0 || srcLen == 0 || res != SZ_OK)
+        return res;
+    }
+  }
+}
+
+static void SeqInFilter_Construct(CSeqInFilter *p)
+{
+  p->buf = NULL;
+  p->StateCoder.p = NULL;
+  p->p.Read = SeqInFilter_Read;
+}
+
+static void SeqInFilter_Free(CSeqInFilter *p, ISzAllocPtr alloc)
+{
+  if (p->StateCoder.p)
+  {
+    p->StateCoder.Free(p->StateCoder.p, alloc);
+    p->StateCoder.p = NULL;
+  }
+  if (p->buf)
+  {
+    ISzAlloc_Free(alloc, p->buf);
+    p->buf = NULL;
+  }
+}
+
+
+/* ---------- CSbEncInStream ---------- */
+
+#ifdef USE_SUBBLOCK
+
+typedef struct
+{
+  ISeqInStream vt;
+  ISeqInStream *inStream;
+  CSbEnc enc;
+} CSbEncInStream;
+
+static SRes SbEncInStream_Read(const ISeqInStream *pp, void *data, size_t *size)
+{
+  CSbEncInStream *p = CONTAINER_FROM_VTBL(pp, CSbEncInStream, vt);
+  size_t sizeOriginal = *size;
+  if (sizeOriginal == 0)
+    return SZ_OK;
+  
+  for (;;)
+  {
+    if (p->enc.needRead && !p->enc.readWasFinished)
+    {
+      size_t processed = p->enc.needReadSizeMax;
+      RINOK(p->inStream->Read(p->inStream, p->enc.buf + p->enc.readPos, &processed));
+      p->enc.readPos += processed;
+      if (processed == 0)
+      {
+        p->enc.readWasFinished = True;
+        p->enc.isFinalFinished = True;
+      }
+      p->enc.needRead = False;
+    }
+  
+    *size = sizeOriginal;
+    RINOK(SbEnc_Read(&p->enc, data, size));
+    if (*size != 0 || !p->enc.needRead)
+      return SZ_OK;
+  }
+}
+
+void SbEncInStream_Construct(CSbEncInStream *p, ISzAllocPtr alloc)
+{
+  SbEnc_Construct(&p->enc, alloc);
+  p->vt.Read = SbEncInStream_Read;
+}
+
+SRes SbEncInStream_Init(CSbEncInStream *p)
+{
+  return SbEnc_Init(&p->enc);
+}
+
+void SbEncInStream_Free(CSbEncInStream *p)
+{
+  SbEnc_Free(&p->enc);
+}
+
+#endif
+
+
+
+/* ---------- CXzProps ---------- */
+
+
+void XzFilterProps_Init(CXzFilterProps *p)
+{
+  p->id = 0;
+  p->delta = 0;
+  p->ip = 0;
+  p->ipDefined = False;
+}
+
+void XzProps_Init(CXzProps *p)
+{
+  p->checkId = XZ_CHECK_CRC32;
+  p->blockSize = XZ_PROPS__BLOCK_SIZE__AUTO;
+  p->numBlockThreads_Reduced = -1;
+  p->numBlockThreads_Max = -1;
+  p->numTotalThreads = -1;
+  p->reduceSize = (UInt64)(Int64)-1;
+  p->forceWriteSizesInHeader = 0;
+  // p->forceWriteSizesInHeader = 1;
+
+  XzFilterProps_Init(&p->filterProps);
+  Lzma2EncProps_Init(&p->lzma2Props);
+}
+
+
+static void XzEncProps_Normalize_Fixed(CXzProps *p)
+{
+  UInt64 fileSize;
+  int t1, t1n, t2, t2r, t3;
+  {
+    CLzma2EncProps tp = p->lzma2Props;
+    if (tp.numTotalThreads <= 0)
+      tp.numTotalThreads = p->numTotalThreads;
+    Lzma2EncProps_Normalize(&tp);
+    t1n = tp.numTotalThreads;
+  }
+
+  t1 = p->lzma2Props.numTotalThreads;
+  t2 = p->numBlockThreads_Max;
+  t3 = p->numTotalThreads;
+
+  if (t2 > MTCODER__THREADS_MAX)
+    t2 = MTCODER__THREADS_MAX;
+
+  if (t3 <= 0)
+  {
+    if (t2 <= 0)
+      t2 = 1;
+    t3 = t1n * t2;
+  }
+  else if (t2 <= 0)
+  {
+    t2 = t3 / t1n;
+    if (t2 == 0)
+    {
+      t1 = 1;
+      t2 = t3;
+    }
+    if (t2 > MTCODER__THREADS_MAX)
+      t2 = MTCODER__THREADS_MAX;
+  }
+  else if (t1 <= 0)
+  {
+    t1 = t3 / t2;
+    if (t1 == 0)
+      t1 = 1;
+  }
+  else
+    t3 = t1n * t2;
+
+  p->lzma2Props.numTotalThreads = t1;
+
+  t2r = t2;
+
+  fileSize = p->reduceSize;
+
+  if ((p->blockSize < fileSize || fileSize == (UInt64)(Int64)-1))
+    p->lzma2Props.lzmaProps.reduceSize = p->blockSize;
+
+  Lzma2EncProps_Normalize(&p->lzma2Props);
+
+  t1 = p->lzma2Props.numTotalThreads;
+
+  {
+    if (t2 > 1 && fileSize != (UInt64)(Int64)-1)
+    {
+      UInt64 numBlocks = fileSize / p->blockSize;
+      if (numBlocks * p->blockSize != fileSize)
+        numBlocks++;
+      if (numBlocks < (unsigned)t2)
+      {
+        t2r = (unsigned)numBlocks;
+        if (t2r == 0)
+          t2r = 1;
+        t3 = t1 * t2r;
+      }
+    }
+  }
+  
+  p->numBlockThreads_Max = t2;
+  p->numBlockThreads_Reduced = t2r;
+  p->numTotalThreads = t3;
+}
+
+
+static void XzProps_Normalize(CXzProps *p)
+{
+  /* we normalize xzProps properties, but we normalize only some of CXzProps::lzma2Props properties.
+     Lzma2Enc_SetProps() will normalize lzma2Props later. */
+  
+  if (p->blockSize == XZ_PROPS__BLOCK_SIZE__SOLID)
+  {
+    p->lzma2Props.lzmaProps.reduceSize = p->reduceSize;
+    p->numBlockThreads_Reduced = 1;
+    p->numBlockThreads_Max = 1;
+    if (p->lzma2Props.numTotalThreads <= 0)
+      p->lzma2Props.numTotalThreads = p->numTotalThreads;
+    return;
+  }
+  else
+  {
+    CLzma2EncProps *lzma2 = &p->lzma2Props;
+    if (p->blockSize == LZMA2_ENC_PROPS__BLOCK_SIZE__AUTO)
+    {
+      // xz-auto
+      p->lzma2Props.lzmaProps.reduceSize = p->reduceSize;
+
+      if (lzma2->blockSize == LZMA2_ENC_PROPS__BLOCK_SIZE__SOLID)
+      {
+        // if (xz-auto && lzma2-solid) - we use solid for both
+        p->blockSize = XZ_PROPS__BLOCK_SIZE__SOLID;
+        p->numBlockThreads_Reduced = 1;
+        p->numBlockThreads_Max = 1;
+        if (p->lzma2Props.numTotalThreads <= 0)
+          p->lzma2Props.numTotalThreads = p->numTotalThreads;
+      }
+      else
+      {
+        // if (xz-auto && (lzma2-auto || lzma2-fixed_)
+        //   we calculate block size for lzma2 and use that block size for xz, lzma2 uses single-chunk per block
+        CLzma2EncProps tp = p->lzma2Props;
+        if (tp.numTotalThreads <= 0)
+          tp.numTotalThreads = p->numTotalThreads;
+        
+        Lzma2EncProps_Normalize(&tp);
+        
+        p->blockSize = tp.blockSize; // fixed or solid
+        p->numBlockThreads_Reduced = tp.numBlockThreads_Reduced;
+        p->numBlockThreads_Max = tp.numBlockThreads_Max;
+        if (lzma2->blockSize == LZMA2_ENC_PROPS__BLOCK_SIZE__AUTO)
+          lzma2->blockSize = tp.blockSize; // fixed or solid, LZMA2_ENC_PROPS__BLOCK_SIZE__SOLID
+        if (lzma2->lzmaProps.reduceSize > tp.blockSize && tp.blockSize != LZMA2_ENC_PROPS__BLOCK_SIZE__SOLID)
+          lzma2->lzmaProps.reduceSize = tp.blockSize;
+        lzma2->numBlockThreads_Reduced = 1;
+        lzma2->numBlockThreads_Max = 1;
+        return;
+      }
+    }
+    else
+    {
+      // xz-fixed
+      // we can use xz::reduceSize or xz::blockSize as base for lzmaProps::reduceSize
+      
+      p->lzma2Props.lzmaProps.reduceSize = p->reduceSize;
+      {
+        UInt64 r = p->reduceSize;
+        if (r > p->blockSize || r == (UInt64)(Int64)-1)
+          r = p->blockSize;
+        lzma2->lzmaProps.reduceSize = r;
+      }
+      if (lzma2->blockSize == LZMA2_ENC_PROPS__BLOCK_SIZE__AUTO)
+        lzma2->blockSize = LZMA2_ENC_PROPS__BLOCK_SIZE__SOLID;
+      else if (lzma2->blockSize > p->blockSize && lzma2->blockSize != LZMA2_ENC_PROPS__BLOCK_SIZE__SOLID)
+        lzma2->blockSize = p->blockSize;
+      
+      XzEncProps_Normalize_Fixed(p);
+    }
+  }
+}
+
+
+/* ---------- CLzma2WithFilters ---------- */
+
+typedef struct
+{
+  CLzma2EncHandle lzma2;
+  CSeqInFilter filter;
+
+  #ifdef USE_SUBBLOCK
+  CSbEncInStream sb;
+  #endif
+} CLzma2WithFilters;
+
+
+static void Lzma2WithFilters_Construct(CLzma2WithFilters *p)
+{
+  p->lzma2 = NULL;
+  SeqInFilter_Construct(&p->filter);
+
+  #ifdef USE_SUBBLOCK
+  SbEncInStream_Construct(&p->sb, alloc);
+  #endif
+}
+
+
+static SRes Lzma2WithFilters_Create(CLzma2WithFilters *p, ISzAllocPtr alloc, ISzAllocPtr bigAlloc)
+{
+  if (!p->lzma2)
+  {
+    p->lzma2 = Lzma2Enc_Create(alloc, bigAlloc);
+    if (!p->lzma2)
+      return SZ_ERROR_MEM;
+  }
+  return SZ_OK;
+}
+
+
+static void Lzma2WithFilters_Free(CLzma2WithFilters *p, ISzAllocPtr alloc)
+{
+  #ifdef USE_SUBBLOCK
+  SbEncInStream_Free(&p->sb);
+  #endif
+
+  SeqInFilter_Free(&p->filter, alloc);
+  if (p->lzma2)
+  {
+    Lzma2Enc_Destroy(p->lzma2);
+    p->lzma2 = NULL;
+  }
+}
+
+
+typedef struct
+{
+  UInt64 unpackSize;
+  UInt64 totalSize;
+  size_t headerSize;
+} CXzEncBlockInfo;
+
+
+static SRes Xz_CompressBlock(
+    CLzma2WithFilters *lzmaf,
+    
+    ISeqOutStream *outStream,
+    Byte *outBufHeader,
+    Byte *outBufData, size_t outBufDataLimit,
+
+    ISeqInStream *inStream,
+    // UInt64 expectedSize,
+    const Byte *inBuf, // used if (!inStream)
+    size_t inBufSize,  // used if (!inStream), it's block size, props->blockSize is ignored
+
+    const CXzProps *props,
+    ICompressProgress *progress,
+    int *inStreamFinished,  /* only for inStream version */
+    CXzEncBlockInfo *blockSizes,
+    ISzAllocPtr alloc,
+    ISzAllocPtr allocBig)
+{
+  CSeqCheckInStream checkInStream;
+  CSeqSizeOutStream seqSizeOutStream;
+  CXzBlock block;
+  unsigned filterIndex = 0;
+  CXzFilter *filter = NULL;
+  const CXzFilterProps *fp = &props->filterProps;
+  if (fp->id == 0)
+    fp = NULL;
+  
+  *inStreamFinished = False;
+  
+  RINOK(Lzma2WithFilters_Create(lzmaf, alloc, allocBig));
+  
+  RINOK(Lzma2Enc_SetProps(lzmaf->lzma2, &props->lzma2Props));
+  
+  XzBlock_ClearFlags(&block);
+  XzBlock_SetNumFilters(&block, 1 + (fp ? 1 : 0));
+  
+  if (fp)
+  {
+    filter = &block.filters[filterIndex++];
+    filter->id = fp->id;
+    filter->propsSize = 0;
+    
+    if (fp->id == XZ_ID_Delta)
+    {
+      filter->props[0] = (Byte)(fp->delta - 1);
+      filter->propsSize = 1;
+    }
+    else if (fp->ipDefined)
+    {
+      SetUi32(filter->props, fp->ip);
+      filter->propsSize = 4;
+    }
+  }
+  
+  {
+    CXzFilter *f = &block.filters[filterIndex++];
+    f->id = XZ_ID_LZMA2;
+    f->propsSize = 1;
+    f->props[0] = Lzma2Enc_WriteProperties(lzmaf->lzma2);
+  }
+  
+  seqSizeOutStream.vt.Write = SeqSizeOutStream_Write;
+  seqSizeOutStream.realStream = outStream;
+  seqSizeOutStream.outBuf = outBufData;
+  seqSizeOutStream.outBufLimit = outBufDataLimit;
+  seqSizeOutStream.processed = 0;
+    
+  /*
+  if (expectedSize != (UInt64)(Int64)-1)
+  {
+    block.unpackSize = expectedSize;
+    if (props->blockSize != (UInt64)(Int64)-1)
+      if (expectedSize > props->blockSize)
+        block.unpackSize = props->blockSize;
+    XzBlock_SetHasUnpackSize(&block);
+  }
+  */
+
+  if (outStream)
+  {
+    RINOK(XzBlock_WriteHeader(&block, &seqSizeOutStream.vt));
+  }
+  
+  checkInStream.vt.Read = SeqCheckInStream_Read;
+  SeqCheckInStream_Init(&checkInStream, props->checkId);
+  
+  checkInStream.realStream = inStream;
+  checkInStream.data = inBuf;
+  checkInStream.limit = props->blockSize;
+  if (!inStream)
+    checkInStream.limit = inBufSize;
+
+  if (fp)
+  {
+    #ifdef USE_SUBBLOCK
+    if (fp->id == XZ_ID_Subblock)
+    {
+      lzmaf->sb.inStream = &checkInStream.vt;
+      RINOK(SbEncInStream_Init(&lzmaf->sb));
+    }
+    else
+    #endif
+    {
+      lzmaf->filter.realStream = &checkInStream.vt;
+      RINOK(SeqInFilter_Init(&lzmaf->filter, filter, alloc));
+    }
+  }
+
+  {
+    SRes res;
+    Byte *outBuf = NULL;
+    size_t outSize = 0;
+    BoolInt useStream = (fp || inStream);
+    // useStream = True;
+    
+    if (!useStream)
+    {
+      XzCheck_Update(&checkInStream.check, inBuf, inBufSize);
+      checkInStream.processed = inBufSize;
+    }
+    
+    if (!outStream)
+    {
+      outBuf = seqSizeOutStream.outBuf; //  + (size_t)seqSizeOutStream.processed;
+      outSize = seqSizeOutStream.outBufLimit; // - (size_t)seqSizeOutStream.processed;
+    }
+    
+    res = Lzma2Enc_Encode2(lzmaf->lzma2,
+        outBuf ? NULL : &seqSizeOutStream.vt,
+        outBuf,
+        outBuf ? &outSize : NULL,
+      
+        useStream ?
+          (fp ?
+            (
+            #ifdef USE_SUBBLOCK
+            (fp->id == XZ_ID_Subblock) ? &lzmaf->sb.vt:
+            #endif
+            &lzmaf->filter.p) :
+            &checkInStream.vt) : NULL,
+      
+        useStream ? NULL : inBuf,
+        useStream ? 0 : inBufSize,
+        
+        progress);
+    
+    if (outBuf)
+      seqSizeOutStream.processed += outSize;
+    
+    RINOK(res);
+    blockSizes->unpackSize = checkInStream.processed;
+  }
+  {
+    Byte buf[4 + 64];
+    unsigned padSize = XZ_GET_PAD_SIZE(seqSizeOutStream.processed);
+    UInt64 packSize = seqSizeOutStream.processed;
+    
+    buf[0] = 0;
+    buf[1] = 0;
+    buf[2] = 0;
+    buf[3] = 0;
+    
+    SeqCheckInStream_GetDigest(&checkInStream, buf + 4);
+    RINOK(WriteBytes(&seqSizeOutStream.vt, buf + (4 - padSize), padSize + XzFlags_GetCheckSize((CXzStreamFlags)props->checkId)));
+    
+    blockSizes->totalSize = seqSizeOutStream.processed - padSize;
+    
+    if (!outStream)
+    {
+      seqSizeOutStream.outBuf = outBufHeader;
+      seqSizeOutStream.outBufLimit = XZ_BLOCK_HEADER_SIZE_MAX;
+      seqSizeOutStream.processed = 0;
+      
+      block.unpackSize = blockSizes->unpackSize;
+      XzBlock_SetHasUnpackSize(&block);
+      
+      block.packSize = packSize;
+      XzBlock_SetHasPackSize(&block);
+      
+      RINOK(XzBlock_WriteHeader(&block, &seqSizeOutStream.vt));
+      
+      blockSizes->headerSize = (size_t)seqSizeOutStream.processed;
+      blockSizes->totalSize += seqSizeOutStream.processed;
+    }
+  }
+  
+  if (inStream)
+    *inStreamFinished = checkInStream.realStreamFinished;
+  else
+  {
+    *inStreamFinished = False;
+    if (checkInStream.processed != inBufSize)
+      return SZ_ERROR_FAIL;
+  }
+
+  return SZ_OK;
+}
+
+
+
+typedef struct
+{
+  ICompressProgress vt;
+  ICompressProgress *progress;
+  UInt64 inOffset;
+  UInt64 outOffset;
+} CCompressProgress_XzEncOffset;
+
+
+static SRes CompressProgress_XzEncOffset_Progress(const ICompressProgress *pp, UInt64 inSize, UInt64 outSize)
+{
+  const CCompressProgress_XzEncOffset *p = CONTAINER_FROM_VTBL(pp, CCompressProgress_XzEncOffset, vt);
+  inSize += p->inOffset;
+  outSize += p->outOffset;
+  return ICompressProgress_Progress(p->progress, inSize, outSize);
+}
+
+
+
+
+typedef struct
+{
+  ISzAllocPtr alloc;
+  ISzAllocPtr allocBig;
+
+  CXzProps xzProps;
+  UInt64 expectedDataSize;
+
+  CXzEncIndex xzIndex;
+
+  CLzma2WithFilters lzmaf_Items[MTCODER__THREADS_MAX];
+  
+  size_t outBufSize;       /* size of allocated outBufs[i] */
+  Byte *outBufs[MTCODER__BLOCKS_MAX];
+
+  #ifndef _7ZIP_ST
+  unsigned checkType;
+  ISeqOutStream *outStream;
+  BoolInt mtCoder_WasConstructed;
+  CMtCoder mtCoder;
+  CXzEncBlockInfo EncBlocks[MTCODER__BLOCKS_MAX];
+  #endif
+
+} CXzEnc;
+
+
+static void XzEnc_Construct(CXzEnc *p)
+{
+  unsigned i;
+
+  XzEncIndex_Construct(&p->xzIndex);
+
+  for (i = 0; i < MTCODER__THREADS_MAX; i++)
+    Lzma2WithFilters_Construct(&p->lzmaf_Items[i]);
+
+  #ifndef _7ZIP_ST
+  p->mtCoder_WasConstructed = False;
+  {
+    for (i = 0; i < MTCODER__BLOCKS_MAX; i++)
+      p->outBufs[i] = NULL;
+    p->outBufSize = 0;
+  }
+  #endif
+}
+
+
+static void XzEnc_FreeOutBufs(CXzEnc *p)
+{
+  unsigned i;
+  for (i = 0; i < MTCODER__BLOCKS_MAX; i++)
+    if (p->outBufs[i])
+    {
+      ISzAlloc_Free(p->alloc, p->outBufs[i]);
+      p->outBufs[i] = NULL;
+    }
+  p->outBufSize = 0;
+}
+
+
+static void XzEnc_Free(CXzEnc *p, ISzAllocPtr alloc)
+{
+  unsigned i;
+
+  XzEncIndex_Free(&p->xzIndex, alloc);
+
+  for (i = 0; i < MTCODER__THREADS_MAX; i++)
+    Lzma2WithFilters_Free(&p->lzmaf_Items[i], alloc);
+  
+  #ifndef _7ZIP_ST
+  if (p->mtCoder_WasConstructed)
+  {
+    MtCoder_Destruct(&p->mtCoder);
+    p->mtCoder_WasConstructed = False;
+  }
+  XzEnc_FreeOutBufs(p);
+  #endif
+}
+
+
+CXzEncHandle XzEnc_Create(ISzAllocPtr alloc, ISzAllocPtr allocBig)
+{
+  CXzEnc *p = (CXzEnc *)ISzAlloc_Alloc(alloc, sizeof(CXzEnc));
+  if (!p)
+    return NULL;
+  XzEnc_Construct(p);
+  XzProps_Init(&p->xzProps);
+  XzProps_Normalize(&p->xzProps);
+  p->expectedDataSize = (UInt64)(Int64)-1;
+  p->alloc = alloc;
+  p->allocBig = allocBig;
+  return p;
+}
+
+
+void XzEnc_Destroy(CXzEncHandle pp)
+{
+  CXzEnc *p = (CXzEnc *)pp;
+  XzEnc_Free(p, p->alloc);
+  ISzAlloc_Free(p->alloc, p);
+}
+
+
+SRes XzEnc_SetProps(CXzEncHandle pp, const CXzProps *props)
+{
+  CXzEnc *p = (CXzEnc *)pp;
+  p->xzProps = *props;
+  XzProps_Normalize(&p->xzProps);
+  return SZ_OK;
+}
+
+
+void XzEnc_SetDataSize(CXzEncHandle pp, UInt64 expectedDataSiize)
+{
+  CXzEnc *p = (CXzEnc *)pp;
+  p->expectedDataSize = expectedDataSiize;
+}
+
+
+
+
+#ifndef _7ZIP_ST
+
+static SRes XzEnc_MtCallback_Code(void *pp, unsigned coderIndex, unsigned outBufIndex,
+    const Byte *src, size_t srcSize, int finished)
+{
+  CXzEnc *me = (CXzEnc *)pp;
+  SRes res;
+  CMtProgressThunk progressThunk;
+
+  Byte *dest = me->outBufs[outBufIndex];
+
+  UNUSED_VAR(finished)
+
+  {
+    CXzEncBlockInfo *bInfo = &me->EncBlocks[outBufIndex];
+    bInfo->totalSize = 0;
+    bInfo->unpackSize = 0;
+    bInfo->headerSize = 0;
+  }
+
+  if (!dest)
+  {
+    dest = (Byte *)ISzAlloc_Alloc(me->alloc, me->outBufSize);
+    if (!dest)
+      return SZ_ERROR_MEM;
+    me->outBufs[outBufIndex] = dest;
+  }
+  
+  MtProgressThunk_CreateVTable(&progressThunk);
+  progressThunk.mtProgress = &me->mtCoder.mtProgress;
+  MtProgressThunk_Init(&progressThunk);
+
+  {
+    CXzEncBlockInfo blockSizes;
+    int inStreamFinished;
+
+    res = Xz_CompressBlock(
+        &me->lzmaf_Items[coderIndex],
+        
+        NULL,
+        dest,
+        dest + XZ_BLOCK_HEADER_SIZE_MAX, me->outBufSize - XZ_BLOCK_HEADER_SIZE_MAX,
+
+        NULL,
+        // srcSize, // expectedSize
+        src, srcSize,
+
+        &me->xzProps,
+        &progressThunk.vt,
+        &inStreamFinished,
+        &blockSizes,
+        me->alloc,
+        me->allocBig);
+    
+    if (res == SZ_OK)
+      me->EncBlocks[outBufIndex] = blockSizes;
+
+    return res;
+  }
+}
+
+
+static SRes XzEnc_MtCallback_Write(void *pp, unsigned outBufIndex)
+{
+  CXzEnc *me = (CXzEnc *)pp;
+
+  const CXzEncBlockInfo *bInfo = &me->EncBlocks[outBufIndex];
+  const Byte *data = me->outBufs[outBufIndex];
+
+  RINOK(WriteBytes(me->outStream, data, bInfo->headerSize));
+
+  {
+    UInt64 totalPackFull = bInfo->totalSize + XZ_GET_PAD_SIZE(bInfo->totalSize);
+    RINOK(WriteBytes(me->outStream, data + XZ_BLOCK_HEADER_SIZE_MAX, (size_t)totalPackFull - bInfo->headerSize));
+  }
+
+  return XzEncIndex_AddIndexRecord(&me->xzIndex, bInfo->unpackSize, bInfo->totalSize, me->alloc);
+}
+
+#endif
+
+
+
+SRes XzEnc_Encode(CXzEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress)
+{
+  CXzEnc *p = (CXzEnc *)pp;
+
+  const CXzProps *props = &p->xzProps;
+
+  XzEncIndex_Init(&p->xzIndex);
+  {
+    UInt64 numBlocks = 1;
+    UInt64 blockSize = props->blockSize;
+    
+    if (blockSize != XZ_PROPS__BLOCK_SIZE__SOLID
+        && props->reduceSize != (UInt64)(Int64)-1)
+    {
+      numBlocks = props->reduceSize / blockSize;
+      if (numBlocks * blockSize != props->reduceSize)
+        numBlocks++;
+    }
+    else
+      blockSize = (UInt64)1 << 62;
+    
+    RINOK(XzEncIndex_PreAlloc(&p->xzIndex, numBlocks, blockSize, XZ_GET_ESTIMATED_BLOCK_TOTAL_PACK_SIZE(blockSize), p->alloc));
+  }
+
+  RINOK(Xz_WriteHeader((CXzStreamFlags)props->checkId, outStream));
+
+
+  #ifndef _7ZIP_ST
+  if (props->numBlockThreads_Reduced > 1)
+  {
+    IMtCoderCallback2 vt;
+
+    if (!p->mtCoder_WasConstructed)
+    {
+      p->mtCoder_WasConstructed = True;
+      MtCoder_Construct(&p->mtCoder);
+    }
+
+    vt.Code = XzEnc_MtCallback_Code;
+    vt.Write = XzEnc_MtCallback_Write;
+
+    p->checkType = props->checkId;
+    p->xzProps = *props;
+    
+    p->outStream = outStream;
+
+    p->mtCoder.allocBig = p->allocBig;
+    p->mtCoder.progress = progress;
+    p->mtCoder.inStream = inStream;
+    p->mtCoder.inData = NULL;
+    p->mtCoder.inDataSize = 0;
+    p->mtCoder.mtCallback = &vt;
+    p->mtCoder.mtCallbackObject = p;
+
+    if (   props->blockSize == XZ_PROPS__BLOCK_SIZE__SOLID
+        || props->blockSize == XZ_PROPS__BLOCK_SIZE__AUTO)
+      return SZ_ERROR_FAIL;
+
+    p->mtCoder.blockSize = (size_t)props->blockSize;
+    if (p->mtCoder.blockSize != props->blockSize)
+      return SZ_ERROR_PARAM; /* SZ_ERROR_MEM */
+
+    {
+      size_t destBlockSize = XZ_BLOCK_HEADER_SIZE_MAX + XZ_GET_MAX_BLOCK_PACK_SIZE(p->mtCoder.blockSize);
+      if (destBlockSize < p->mtCoder.blockSize)
+        return SZ_ERROR_PARAM;
+      if (p->outBufSize != destBlockSize)
+        XzEnc_FreeOutBufs(p);
+      p->outBufSize = destBlockSize;
+    }
+
+    p->mtCoder.numThreadsMax = props->numBlockThreads_Max;
+    p->mtCoder.expectedDataSize = p->expectedDataSize;
+    
+    RINOK(MtCoder_Code(&p->mtCoder));
+  }
+  else
+  #endif
+  {
+    int writeStartSizes;
+    CCompressProgress_XzEncOffset progress2;
+    Byte *bufData = NULL;
+    size_t bufSize = 0;
+
+    progress2.vt.Progress = CompressProgress_XzEncOffset_Progress;
+    progress2.inOffset = 0;
+    progress2.outOffset = 0;
+    progress2.progress = progress;
+    
+    writeStartSizes = 0;
+    
+    if (props->blockSize != XZ_PROPS__BLOCK_SIZE__SOLID)
+    {
+      writeStartSizes = (props->forceWriteSizesInHeader > 0);
+      
+      if (writeStartSizes)
+      {
+        size_t t2;
+        size_t t = (size_t)props->blockSize;
+        if (t != props->blockSize)
+          return SZ_ERROR_PARAM;
+        t = XZ_GET_MAX_BLOCK_PACK_SIZE(t);
+        if (t < props->blockSize)
+          return SZ_ERROR_PARAM;
+        t2 = XZ_BLOCK_HEADER_SIZE_MAX + t;
+        if (!p->outBufs[0] || t2 != p->outBufSize)
+        {
+          XzEnc_FreeOutBufs(p);
+          p->outBufs[0] = (Byte *)ISzAlloc_Alloc(p->alloc, t2);
+          if (!p->outBufs[0])
+            return SZ_ERROR_MEM;
+          p->outBufSize = t2;
+        }
+        bufData = p->outBufs[0] + XZ_BLOCK_HEADER_SIZE_MAX;
+        bufSize = t;
+      }
+    }
+    
+    for (;;)
+    {
+      CXzEncBlockInfo blockSizes;
+      int inStreamFinished;
+      
+      /*
+      UInt64 rem = (UInt64)(Int64)-1;
+      if (props->reduceSize != (UInt64)(Int64)-1
+          && props->reduceSize >= progress2.inOffset)
+        rem = props->reduceSize - progress2.inOffset;
+      */
+
+      blockSizes.headerSize = 0; // for GCC
+      
+      RINOK(Xz_CompressBlock(
+          &p->lzmaf_Items[0],
+          
+          writeStartSizes ? NULL : outStream,
+          writeStartSizes ? p->outBufs[0] : NULL,
+          bufData, bufSize,
+          
+          inStream,
+          // rem,
+          NULL, 0,
+          
+          props,
+          progress ? &progress2.vt : NULL,
+          &inStreamFinished,
+          &blockSizes,
+          p->alloc,
+          p->allocBig));
+
+      {
+        UInt64 totalPackFull = blockSizes.totalSize + XZ_GET_PAD_SIZE(blockSizes.totalSize);
+      
+        if (writeStartSizes)
+        {
+          RINOK(WriteBytes(outStream, p->outBufs[0], blockSizes.headerSize));
+          RINOK(WriteBytes(outStream, bufData, (size_t)totalPackFull - blockSizes.headerSize));
+        }
+        
+        RINOK(XzEncIndex_AddIndexRecord(&p->xzIndex, blockSizes.unpackSize, blockSizes.totalSize, p->alloc));
+        
+        progress2.inOffset += blockSizes.unpackSize;
+        progress2.outOffset += totalPackFull;
+      }
+        
+      if (inStreamFinished)
+        break;
+    }
+  }
+
+  return XzEncIndex_WriteFooter(&p->xzIndex, (CXzStreamFlags)props->checkId, outStream);
+}
+
+
+#include "Alloc.h"
+
+SRes Xz_Encode(ISeqOutStream *outStream, ISeqInStream *inStream,
+    const CXzProps *props, ICompressProgress *progress)
+{
+  SRes res;
+  CXzEncHandle xz = XzEnc_Create(&g_Alloc, &g_BigAlloc);
+  if (!xz)
+    return SZ_ERROR_MEM;
+  res = XzEnc_SetProps(xz, props);
+  if (res == SZ_OK)
+    res = XzEnc_Encode(xz, outStream, inStream, progress);
+  XzEnc_Destroy(xz);
+  return res;
+}
+
+
+SRes Xz_EncodeEmpty(ISeqOutStream *outStream)
+{
+  SRes res;
+  CXzEncIndex xzIndex;
+  XzEncIndex_Construct(&xzIndex);
+  res = Xz_WriteHeader((CXzStreamFlags)0, outStream);
+  if (res == SZ_OK)
+    res = XzEncIndex_WriteFooter(&xzIndex, (CXzStreamFlags)0, outStream);
+  XzEncIndex_Free(&xzIndex, NULL); // g_Alloc
+  return res;
+}
diff --git a/3rdparty/7z/src/XzEnc.h b/3rdparty/7z/src/XzEnc.h
new file mode 100644
index 0000000000..529ac3fd8c
--- /dev/null
+++ b/3rdparty/7z/src/XzEnc.h
@@ -0,0 +1,60 @@
+/* XzEnc.h -- Xz Encode
+2017-06-27 : Igor Pavlov : Public domain */
+
+#ifndef __XZ_ENC_H
+#define __XZ_ENC_H
+
+#include "Lzma2Enc.h"
+
+#include "Xz.h"
+
+EXTERN_C_BEGIN
+
+
+#define XZ_PROPS__BLOCK_SIZE__AUTO   LZMA2_ENC_PROPS__BLOCK_SIZE__AUTO
+#define XZ_PROPS__BLOCK_SIZE__SOLID  LZMA2_ENC_PROPS__BLOCK_SIZE__SOLID
+
+
+typedef struct
+{
+  UInt32 id;
+  UInt32 delta;
+  UInt32 ip;
+  int ipDefined;
+} CXzFilterProps;
+
+void XzFilterProps_Init(CXzFilterProps *p);
+
+
+typedef struct
+{
+  CLzma2EncProps lzma2Props;
+  CXzFilterProps filterProps;
+  unsigned checkId;
+  UInt64 blockSize;
+  int numBlockThreads_Reduced;
+  int numBlockThreads_Max;
+  int numTotalThreads;
+  int forceWriteSizesInHeader;
+  UInt64 reduceSize;
+} CXzProps;
+
+void XzProps_Init(CXzProps *p);
+
+
+typedef void * CXzEncHandle;
+
+CXzEncHandle XzEnc_Create(ISzAllocPtr alloc, ISzAllocPtr allocBig);
+void XzEnc_Destroy(CXzEncHandle p);
+SRes XzEnc_SetProps(CXzEncHandle p, const CXzProps *props);
+void XzEnc_SetDataSize(CXzEncHandle p, UInt64 expectedDataSiize);
+SRes XzEnc_Encode(CXzEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress);
+
+SRes Xz_Encode(ISeqOutStream *outStream, ISeqInStream *inStream,
+    const CXzProps *props, ICompressProgress *progress);
+
+SRes Xz_EncodeEmpty(ISeqOutStream *outStream);
+
+EXTERN_C_END
+
+#endif
diff --git a/3rdparty/7z/src/XzIn.c b/3rdparty/7z/src/XzIn.c
new file mode 100644
index 0000000000..792a617865
--- /dev/null
+++ b/3rdparty/7z/src/XzIn.c
@@ -0,0 +1,319 @@
+/* XzIn.c - Xz input
+2018-07-04 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <string.h>
+
+#include "7zCrc.h"
+#include "CpuArch.h"
+#include "Xz.h"
+
+/*
+#define XZ_FOOTER_SIG_CHECK(p) (memcmp((p), XZ_FOOTER_SIG, XZ_FOOTER_SIG_SIZE) == 0)
+*/
+#define XZ_FOOTER_SIG_CHECK(p) ((p)[0] == XZ_FOOTER_SIG_0 && (p)[1] == XZ_FOOTER_SIG_1)
+
+
+SRes Xz_ReadHeader(CXzStreamFlags *p, ISeqInStream *inStream)
+{
+  Byte sig[XZ_STREAM_HEADER_SIZE];
+  RINOK(SeqInStream_Read2(inStream, sig, XZ_STREAM_HEADER_SIZE, SZ_ERROR_NO_ARCHIVE));
+  if (memcmp(sig, XZ_SIG, XZ_SIG_SIZE) != 0)
+    return SZ_ERROR_NO_ARCHIVE;
+  return Xz_ParseHeader(p, sig);
+}
+
+#define READ_VARINT_AND_CHECK(buf, pos, size, res) \
+  { unsigned s = Xz_ReadVarInt(buf + pos, size - pos, res); \
+  if (s == 0) return SZ_ERROR_ARCHIVE; pos += s; }
+
+SRes XzBlock_ReadHeader(CXzBlock *p, ISeqInStream *inStream, BoolInt *isIndex, UInt32 *headerSizeRes)
+{
+  Byte header[XZ_BLOCK_HEADER_SIZE_MAX];
+  unsigned headerSize;
+  *headerSizeRes = 0;
+  RINOK(SeqInStream_ReadByte(inStream, &header[0]));
+  headerSize = (unsigned)header[0];
+  if (headerSize == 0)
+  {
+    *headerSizeRes = 1;
+    *isIndex = True;
+    return SZ_OK;
+  }
+
+  *isIndex = False;
+  headerSize = (headerSize << 2) + 4;
+  *headerSizeRes = headerSize;
+  RINOK(SeqInStream_Read(inStream, header + 1, headerSize - 1));
+  return XzBlock_Parse(p, header);
+}
+
+#define ADD_SIZE_CHECK(size, val) \
+  { UInt64 newSize = size + (val); if (newSize < size) return XZ_SIZE_OVERFLOW; size = newSize; }
+
+UInt64 Xz_GetUnpackSize(const CXzStream *p)
+{
+  UInt64 size = 0;
+  size_t i;
+  for (i = 0; i < p->numBlocks; i++)
+    ADD_SIZE_CHECK(size, p->blocks[i].unpackSize);
+  return size;
+}
+
+UInt64 Xz_GetPackSize(const CXzStream *p)
+{
+  UInt64 size = 0;
+  size_t i;
+  for (i = 0; i < p->numBlocks; i++)
+    ADD_SIZE_CHECK(size, (p->blocks[i].totalSize + 3) & ~(UInt64)3);
+  return size;
+}
+
+/*
+SRes XzBlock_ReadFooter(CXzBlock *p, CXzStreamFlags f, ISeqInStream *inStream)
+{
+  return SeqInStream_Read(inStream, p->check, XzFlags_GetCheckSize(f));
+}
+*/
+
+static SRes Xz_ReadIndex2(CXzStream *p, const Byte *buf, size_t size, ISzAllocPtr alloc)
+{
+  size_t numBlocks, pos = 1;
+  UInt32 crc;
+
+  if (size < 5 || buf[0] != 0)
+    return SZ_ERROR_ARCHIVE;
+
+  size -= 4;
+  crc = CrcCalc(buf, size);
+  if (crc != GetUi32(buf + size))
+    return SZ_ERROR_ARCHIVE;
+
+  {
+    UInt64 numBlocks64;
+    READ_VARINT_AND_CHECK(buf, pos, size, &numBlocks64);
+    numBlocks = (size_t)numBlocks64;
+    if (numBlocks != numBlocks64 || numBlocks * 2 > size)
+      return SZ_ERROR_ARCHIVE;
+  }
+  
+  Xz_Free(p, alloc);
+  if (numBlocks != 0)
+  {
+    size_t i;
+    p->numBlocks = numBlocks;
+    p->blocks = (CXzBlockSizes *)ISzAlloc_Alloc(alloc, sizeof(CXzBlockSizes) * numBlocks);
+    if (!p->blocks)
+      return SZ_ERROR_MEM;
+    for (i = 0; i < numBlocks; i++)
+    {
+      CXzBlockSizes *block = &p->blocks[i];
+      READ_VARINT_AND_CHECK(buf, pos, size, &block->totalSize);
+      READ_VARINT_AND_CHECK(buf, pos, size, &block->unpackSize);
+      if (block->totalSize == 0)
+        return SZ_ERROR_ARCHIVE;
+    }
+  }
+  while ((pos & 3) != 0)
+    if (buf[pos++] != 0)
+      return SZ_ERROR_ARCHIVE;
+  return (pos == size) ? SZ_OK : SZ_ERROR_ARCHIVE;
+}
+
+static SRes Xz_ReadIndex(CXzStream *p, ILookInStream *stream, UInt64 indexSize, ISzAllocPtr alloc)
+{
+  SRes res;
+  size_t size;
+  Byte *buf;
+  if (indexSize > ((UInt32)1 << 31))
+    return SZ_ERROR_UNSUPPORTED;
+  size = (size_t)indexSize;
+  if (size != indexSize)
+    return SZ_ERROR_UNSUPPORTED;
+  buf = (Byte *)ISzAlloc_Alloc(alloc, size);
+  if (!buf)
+    return SZ_ERROR_MEM;
+  res = LookInStream_Read2(stream, buf, size, SZ_ERROR_UNSUPPORTED);
+  if (res == SZ_OK)
+    res = Xz_ReadIndex2(p, buf, size, alloc);
+  ISzAlloc_Free(alloc, buf);
+  return res;
+}
+
+static SRes LookInStream_SeekRead_ForArc(ILookInStream *stream, UInt64 offset, void *buf, size_t size)
+{
+  RINOK(LookInStream_SeekTo(stream, offset));
+  return LookInStream_Read(stream, buf, size);
+  /* return LookInStream_Read2(stream, buf, size, SZ_ERROR_NO_ARCHIVE); */
+}
+
+static SRes Xz_ReadBackward(CXzStream *p, ILookInStream *stream, Int64 *startOffset, ISzAllocPtr alloc)
+{
+  UInt64 indexSize;
+  Byte buf[XZ_STREAM_FOOTER_SIZE];
+  UInt64 pos = *startOffset;
+
+  if ((pos & 3) != 0 || pos < XZ_STREAM_FOOTER_SIZE)
+    return SZ_ERROR_NO_ARCHIVE;
+
+  pos -= XZ_STREAM_FOOTER_SIZE;
+  RINOK(LookInStream_SeekRead_ForArc(stream, pos, buf, XZ_STREAM_FOOTER_SIZE));
+  
+  if (!XZ_FOOTER_SIG_CHECK(buf + 10))
+  {
+    UInt32 total = 0;
+    pos += XZ_STREAM_FOOTER_SIZE;
+    
+    for (;;)
+    {
+      size_t i;
+      #define TEMP_BUF_SIZE (1 << 10)
+      Byte temp[TEMP_BUF_SIZE];
+      
+      i = (pos > TEMP_BUF_SIZE) ? TEMP_BUF_SIZE : (size_t)pos;
+      pos -= i;
+      RINOK(LookInStream_SeekRead_ForArc(stream, pos, temp, i));
+      total += (UInt32)i;
+      for (; i != 0; i--)
+        if (temp[i - 1] != 0)
+          break;
+      if (i != 0)
+      {
+        if ((i & 3) != 0)
+          return SZ_ERROR_NO_ARCHIVE;
+        pos += i;
+        break;
+      }
+      if (pos < XZ_STREAM_FOOTER_SIZE || total > (1 << 16))
+        return SZ_ERROR_NO_ARCHIVE;
+    }
+    
+    if (pos < XZ_STREAM_FOOTER_SIZE)
+      return SZ_ERROR_NO_ARCHIVE;
+    pos -= XZ_STREAM_FOOTER_SIZE;
+    RINOK(LookInStream_SeekRead_ForArc(stream, pos, buf, XZ_STREAM_FOOTER_SIZE));
+    if (!XZ_FOOTER_SIG_CHECK(buf + 10))
+      return SZ_ERROR_NO_ARCHIVE;
+  }
+  
+  p->flags = (CXzStreamFlags)GetBe16(buf + 8);
+
+  if (!XzFlags_IsSupported(p->flags))
+    return SZ_ERROR_UNSUPPORTED;
+
+  if (GetUi32(buf) != CrcCalc(buf + 4, 6))
+    return SZ_ERROR_ARCHIVE;
+
+  indexSize = ((UInt64)GetUi32(buf + 4) + 1) << 2;
+
+  if (pos < indexSize)
+    return SZ_ERROR_ARCHIVE;
+
+  pos -= indexSize;
+  RINOK(LookInStream_SeekTo(stream, pos));
+  RINOK(Xz_ReadIndex(p, stream, indexSize, alloc));
+
+  {
+    UInt64 totalSize = Xz_GetPackSize(p);
+    if (totalSize == XZ_SIZE_OVERFLOW
+        || totalSize >= ((UInt64)1 << 63)
+        || pos < totalSize + XZ_STREAM_HEADER_SIZE)
+      return SZ_ERROR_ARCHIVE;
+    pos -= (totalSize + XZ_STREAM_HEADER_SIZE);
+    RINOK(LookInStream_SeekTo(stream, pos));
+    *startOffset = pos;
+  }
+  {
+    CXzStreamFlags headerFlags;
+    CSecToRead secToRead;
+    SecToRead_CreateVTable(&secToRead);
+    secToRead.realStream = stream;
+
+    RINOK(Xz_ReadHeader(&headerFlags, &secToRead.vt));
+    return (p->flags == headerFlags) ? SZ_OK : SZ_ERROR_ARCHIVE;
+  }
+}
+
+
+/* ---------- Xz Streams ---------- */
+
+void Xzs_Construct(CXzs *p)
+{
+  p->num = p->numAllocated = 0;
+  p->streams = 0;
+}
+
+void Xzs_Free(CXzs *p, ISzAllocPtr alloc)
+{
+  size_t i;
+  for (i = 0; i < p->num; i++)
+    Xz_Free(&p->streams[i], alloc);
+  ISzAlloc_Free(alloc, p->streams);
+  p->num = p->numAllocated = 0;
+  p->streams = 0;
+}
+
+UInt64 Xzs_GetNumBlocks(const CXzs *p)
+{
+  UInt64 num = 0;
+  size_t i;
+  for (i = 0; i < p->num; i++)
+    num += p->streams[i].numBlocks;
+  return num;
+}
+
+UInt64 Xzs_GetUnpackSize(const CXzs *p)
+{
+  UInt64 size = 0;
+  size_t i;
+  for (i = 0; i < p->num; i++)
+    ADD_SIZE_CHECK(size, Xz_GetUnpackSize(&p->streams[i]));
+  return size;
+}
+
+/*
+UInt64 Xzs_GetPackSize(const CXzs *p)
+{
+  UInt64 size = 0;
+  size_t i;
+  for (i = 0; i < p->num; i++)
+    ADD_SIZE_CHECK(size, Xz_GetTotalSize(&p->streams[i]));
+  return size;
+}
+*/
+
+SRes Xzs_ReadBackward(CXzs *p, ILookInStream *stream, Int64 *startOffset, ICompressProgress *progress, ISzAllocPtr alloc)
+{
+  Int64 endOffset = 0;
+  RINOK(ILookInStream_Seek(stream, &endOffset, SZ_SEEK_END));
+  *startOffset = endOffset;
+  for (;;)
+  {
+    CXzStream st;
+    SRes res;
+    Xz_Construct(&st);
+    res = Xz_ReadBackward(&st, stream, startOffset, alloc);
+    st.startOffset = *startOffset;
+    RINOK(res);
+    if (p->num == p->numAllocated)
+    {
+      size_t newNum = p->num + p->num / 4 + 1;
+      Byte *data = (Byte *)ISzAlloc_Alloc(alloc, newNum * sizeof(CXzStream));
+      if (!data)
+        return SZ_ERROR_MEM;
+      p->numAllocated = newNum;
+      if (p->num != 0)
+        memcpy(data, p->streams, p->num * sizeof(CXzStream));
+      ISzAlloc_Free(alloc, p->streams);
+      p->streams = (CXzStream *)data;
+    }
+    p->streams[p->num++] = st;
+    if (*startOffset == 0)
+      break;
+    RINOK(LookInStream_SeekTo(stream, *startOffset));
+    if (progress && ICompressProgress_Progress(progress, endOffset - *startOffset, (UInt64)(Int64)-1) != SZ_OK)
+      return SZ_ERROR_PROGRESS;
+  }
+  return SZ_OK;
+}
diff --git a/3rdparty/7zip/7zip b/3rdparty/7zip/7zip
deleted file mode 160000
index e5431fa6f5..0000000000
--- a/3rdparty/7zip/7zip
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e5431fa6f5505e385c6f9367260717e9c47dc2ee
diff --git a/3rdparty/7zip/7zip.filters b/3rdparty/7zip/7zip.filters
deleted file mode 100644
index 1ba9da711a..0000000000
--- a/3rdparty/7zip/7zip.filters
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="7zip\C\7z.h" />
-    <ClInclude Include="7zip\C\7zAlloc.h" />
-    <ClInclude Include="7zip\C\7zBuf.h" />
-    <ClInclude Include="7zip\C\7zCrc.h" />
-    <ClInclude Include="7zip\C\7zFile.h" />
-    <ClInclude Include="7zip\C\7zTypes.h" />
-    <ClInclude Include="7zip\C\7zVersion.h" />
-    <ClInclude Include="7zip\C\7zWindows.h" />
-    <ClInclude Include="7zip\C\Aes.h" />
-    <ClInclude Include="7zip\C\Alloc.h" />
-    <ClInclude Include="7zip\C\Bcj2.h" />
-    <ClInclude Include="7zip\C\Blake2.h" />
-    <ClInclude Include="7zip\C\Bra.h" />
-    <ClInclude Include="7zip\C\BwtSort.h" />
-    <ClInclude Include="7zip\C\Compiler.h" />
-    <ClInclude Include="7zip\C\CpuArch.h" />
-    <ClInclude Include="7zip\C\Delta.h" />
-    <ClInclude Include="7zip\C\DllSecur.h" />
-    <ClInclude Include="7zip\C\HuffEnc.h" />
-    <ClInclude Include="7zip\C\LzFind.h" />
-    <ClInclude Include="7zip\C\LzFindMt.h" />
-    <ClInclude Include="7zip\C\LzHash.h" />
-    <ClInclude Include="7zip\C\Lzma2Dec.h" />
-    <ClInclude Include="7zip\C\Lzma2DecMt.h" />
-    <ClInclude Include="7zip\C\Lzma2Enc.h" />
-    <ClInclude Include="7zip\C\Lzma86.h" />
-    <ClInclude Include="7zip\C\LzmaDec.h" />
-    <ClInclude Include="7zip\C\LzmaEnc.h" />
-    <ClInclude Include="7zip\C\LzmaLib.h" />
-    <ClInclude Include="7zip\C\MtCoder.h" />
-    <ClInclude Include="7zip\C\MtDec.h" />
-    <ClInclude Include="7zip\C\Ppmd.h" />
-    <ClInclude Include="7zip\C\Ppmd7.h" />
-    <ClInclude Include="7zip\C\Ppmd8.h" />
-    <ClInclude Include="7zip\C\Precomp.h" />
-    <ClInclude Include="7zip\C\RotateDefs.h" />
-    <ClInclude Include="7zip\C\Sha1.h" />
-    <ClInclude Include="7zip\C\Sha256.h" />
-    <ClInclude Include="7zip\C\Sort.h" />
-    <ClInclude Include="7zip\C\SwapBytes.h" />
-    <ClInclude Include="7zip\C\Threads.h" />
-    <ClInclude Include="7zip\C\Xz.h" />
-    <ClInclude Include="7zip\C\XzCrc64.h" />
-    <ClInclude Include="7zip\C\XzEnc.h" />
-    <ClInclude Include="7zip\C\Xxh64.h" />
-    <ClInclude Include="7zip\C\ZstdDec.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="7zip\C\7zAlloc.c" />
-    <ClCompile Include="7zip\C\7zArcIn.c" />
-    <ClCompile Include="7zip\C\7zBuf.c" />
-    <ClCompile Include="7zip\C\7zBuf2.c" />
-    <ClCompile Include="7zip\C\7zCrc.c" />
-    <ClCompile Include="7zip\C\7zCrcOpt.c" />
-    <ClCompile Include="7zip\C\7zDec.c" />
-    <ClCompile Include="7zip\C\7zFile.c" />
-    <ClCompile Include="7zip\C\7zStream.c" />
-    <ClCompile Include="7zip\C\Aes.c" />
-    <ClCompile Include="7zip\C\AesOpt.c" />
-    <ClCompile Include="7zip\C\Alloc.c" />
-    <ClCompile Include="7zip\C\Bcj2.c" />
-    <ClCompile Include="7zip\C\Bcj2Enc.c" />
-    <ClCompile Include="7zip\C\Blake2s.c" />
-    <ClCompile Include="7zip\C\Bra.c" />
-    <ClCompile Include="7zip\C\Bra86.c" />
-    <ClCompile Include="7zip\C\BraIA64.c" />
-    <ClCompile Include="7zip\C\BwtSort.c" />
-    <ClCompile Include="7zip\C\CpuArch.c" />
-    <ClCompile Include="7zip\C\Delta.c" />
-    <ClCompile Include="7zip\C\DllSecur.c" />
-    <ClCompile Include="7zip\C\HuffEnc.c" />
-    <ClCompile Include="7zip\C\LzFind.c" />
-    <ClCompile Include="7zip\C\LzFindMt.c" />
-    <ClCompile Include="7zip\C\LzFindOpt.c" />
-    <ClCompile Include="7zip\C\Lzma2Dec.c" />
-    <ClCompile Include="7zip\C\Lzma2DecMt.c" />
-    <ClCompile Include="7zip\C\Lzma2Enc.c" />
-    <ClCompile Include="7zip\C\Lzma86Dec.c" />
-    <ClCompile Include="7zip\C\Lzma86Enc.c" />
-    <ClCompile Include="7zip\C\LzmaDec.c" />
-    <ClCompile Include="7zip\C\LzmaEnc.c" />
-    <ClCompile Include="7zip\C\LzmaLib.c" />
-    <ClCompile Include="7zip\C\MtCoder.c" />
-    <ClCompile Include="7zip\C\MtDec.c" />
-    <ClCompile Include="7zip\C\Ppmd7.c" />
-    <ClCompile Include="7zip\C\Ppmd7aDec.c" />
-    <ClCompile Include="7zip\C\Ppmd7Dec.c" />
-    <ClCompile Include="7zip\C\Ppmd7Enc.c" />
-    <ClCompile Include="7zip\C\Ppmd8.c" />
-    <ClCompile Include="7zip\C\Ppmd8Dec.c" />
-    <ClCompile Include="7zip\C\Ppmd8Enc.c" />
-    <ClCompile Include="7zip\C\Sha1.c" />
-    <ClCompile Include="7zip\C\Sha1Opt.c" />
-    <ClCompile Include="7zip\C\Sha256.c" />
-    <ClCompile Include="7zip\C\Sha256Opt.c" />
-    <ClCompile Include="7zip\C\Sort.c" />
-    <ClCompile Include="7zip\C\SwapBytes.c" />
-    <ClCompile Include="7zip\C\Threads.c" />
-    <ClCompile Include="7zip\C\Xz.c" />
-    <ClCompile Include="7zip\C\XzCrc64.c" />
-    <ClCompile Include="7zip\C\XzCrc64Opt.c" />
-    <ClCompile Include="7zip\C\XzDec.c" />
-    <ClCompile Include="7zip\C\XzEnc.c" />
-    <ClCompile Include="7zip\C\XzIn.c" />
-    <ClCompile Include="7zip\C\Xxh64.c" />
-    <ClCompile Include="7zip\C\ZstdDec.c" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/3rdparty/7zip/CMakeLists.txt b/3rdparty/7zip/CMakeLists.txt
deleted file mode 100644
index 706d869472..0000000000
--- a/3rdparty/7zip/CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-# 7zip sdk
-if(WIN32 OR APPLE)
-	add_library(3rdparty_7zip STATIC EXCLUDE_FROM_ALL
-		7zip/C/7zAlloc.c
-		7zip/C/7zArcIn.c
-		7zip/C/7zBuf.c
-		7zip/C/7zBuf2.c
-		7zip/C/7zCrc.c
-		7zip/C/7zCrcOpt.c
-		7zip/C/7zDec.c
-		7zip/C/7zFile.c
-		7zip/C/7zStream.c
-		7zip/C/Aes.c
-		7zip/C/AesOpt.c
-		7zip/C/Alloc.c
-		7zip/C/Bcj2.c
-		7zip/C/Bcj2Enc.c
-		7zip/C/Blake2s.c
-		7zip/C/Bra.c
-		7zip/C/Bra86.c
-		7zip/C/BraIA64.c
-		7zip/C/BwtSort.c
-		7zip/C/CpuArch.c
-		7zip/C/Delta.c
-		7zip/C/DllSecur.c
-		7zip/C/HuffEnc.c
-		7zip/C/LzFind.c
-		7zip/C/LzFindMt.c
-		7zip/C/LzFindOpt.c
-		7zip/C/Lzma2Dec.c
-		7zip/C/Lzma2DecMt.c
-		7zip/C/Lzma2Enc.c
-		7zip/C/Lzma86Dec.c
-		7zip/C/Lzma86Enc.c
-		7zip/C/LzmaDec.c
-		7zip/C/LzmaEnc.c
-		7zip/C/LzmaLib.c
-		7zip/C/MtCoder.c
-		7zip/C/MtDec.c
-		7zip/C/Ppmd7.c
-		7zip/C/Ppmd7aDec.c
-		7zip/C/Ppmd7Dec.c
-		7zip/C/Ppmd7Enc.c
-		7zip/C/Ppmd8.c
-		7zip/C/Ppmd8Dec.c
-		7zip/C/Ppmd8Enc.c
-		7zip/C/Sha1.c
-		7zip/C/Sha1Opt.c
-		7zip/C/Sha256.c
-		7zip/C/Sha256Opt.c
-		7zip/C/Sort.c
-		7zip/C/SwapBytes.c
-		7zip/C/Threads.c
-		7zip/C/Xxh64.c
-		7zip/C/Xz.c
-		7zip/C/XzCrc64.c
-		7zip/C/XzCrc64Opt.c
-		7zip/C/XzDec.c
-		7zip/C/XzEnc.c
-		7zip/C/XzIn.c
-		7zip/C/ZstdDec.c)
-	target_include_directories(3rdparty_7zip INTERFACE
-		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/7zip/C>
-		$<INSTALL_INTERFACE:/7zip/C>)
-
-	target_include_directories(3rdparty_7zip INTERFACE 7zip)
-
-	set_property(TARGET 3rdparty_7zip PROPERTY FOLDER "3rdparty/")
-
-else()
-	add_library(3rdparty_7zip INTERFACE)
-endif()
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 6c49a889ba..d5bea616c9 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -4,14 +4,6 @@ include(CMakeDependentOption)
 
 set(CMAKE_CXX_STANDARD 20)
 
-# Defines the ARCHITECTURE variable
-include("DetectArchitecture.cmake")
-
-# Warnings are silenced for 3rdparty code
-if(NOT MSVC)
-	add_compile_options("$<$<COMPILE_LANGUAGE:CXX,C>:-w>")
-endif()
-
 # Dummy target to use when lib isn't available
 add_library(3rdparty_dummy_lib INTERFACE)
 
@@ -19,21 +11,13 @@ add_library(3rdparty_dummy_lib INTERFACE)
 # ZLib
 add_subdirectory(zlib EXCLUDE_FROM_ALL)
 
-# ZSTD
-add_subdirectory(zstd EXCLUDE_FROM_ALL)
-
-# 7zip sdk
-add_subdirectory(7zip EXCLUDE_FROM_ALL)
+# 7z sdk
+add_subdirectory(7z EXCLUDE_FROM_ALL)
 
 add_library(3rdparty_flatbuffers INTERFACE)
 if (USE_SYSTEM_FLATBUFFERS)
 	pkg_check_modules(FLATBUFFERS REQUIRED IMPORTED_TARGET flatbuffers>=2.0.0)
 	target_link_libraries(3rdparty_flatbuffers INTERFACE PkgConfig::FLATBUFFERS)
-	set(FBS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../rpcs3/Emu/NP/generated/")
-	execute_process(COMMAND flatc --cpp -o "${FBS_DIR}" "${FBS_DIR}/np2_structs.fbs" RESULT_VARIABLE FBS_CMD_ERROR)
-	if(FBS_CMD_ERROR AND NOT FBS_CMD_ERROR EQUAL 0)
-		message(FATAL_ERROR "flatc failed to regenerate flatbuffers headers.")
-	endif()
 else()
 	target_include_directories(3rdparty_flatbuffers INTERFACE flatbuffers/include)
 endif()
@@ -44,7 +28,7 @@ add_subdirectory(libpng EXCLUDE_FROM_ALL)
 
 # pugixml
 if (USE_SYSTEM_PUGIXML)
-	pkg_check_modules(PUGIXML REQUIRED IMPORTED_TARGET pugixml>=1.15)
+	pkg_check_modules(PUGIXML REQUIRED IMPORTED_TARGET pugixml>=1.11)
 	add_library(pugixml INTERFACE)
 	target_link_libraries(pugixml INTERFACE PkgConfig::PUGIXML)
 else()
@@ -53,16 +37,16 @@ endif()
 
 
 # libusb
-if(CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD")
+if(CMAKE_SYSTEM MATCHES "DragonFly|FreeBSD")
 	pkg_check_modules(LIBUSB REQUIRED IMPORTED_TARGET libusb-1.0>=1.0 )
-	cmake_dependent_option(USE_SYSTEM_LIBUSB "Use system libusb-1.0 as shared library" ON
+	CMAKE_DEPENDENT_OPTION( USE_SYSTEM_LIBUSB "Use system libusb-1.0 as shared library" ON
 			"LIBUSB_FOUND" OFF)
 else()
 	pkg_check_modules(LIBUSB IMPORTED_TARGET libusb-1.0>=1.0 )
-	cmake_dependent_option(USE_SYSTEM_LIBUSB "Use system libusb-1.0 as shared library" OFF
+	CMAKE_DEPENDENT_OPTION( USE_SYSTEM_LIBUSB "Use system libusb-1.0 as shared library" OFF
 			"LIBUSB_FOUND" OFF)
 endif()
-if(CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD")
+if(CMAKE_SYSTEM MATCHES "DragonFly|FreeBSD")
 	# Always use system libusb as reference implementation isn't supported
 	add_library(usb-1.0-shared INTERFACE)
 	target_link_libraries(usb-1.0-shared INTERFACE PkgConfig::LIBUSB)
@@ -79,10 +63,6 @@ else()
 		# we don't have the system libusb, so we compile from submodule
 		unset(LIBUSB_LIBRARIES CACHE)
 		add_subdirectory(libusb EXCLUDE_FROM_ALL)
-
-		if (NOT TARGET usb-1.0 AND TARGET usb-1.0-static)
-			add_library(usb-1.0 ALIAS usb-1.0-static)
-		endif()
 	endif()
 endif()
 
@@ -90,63 +70,101 @@ endif()
 # hidapi
 add_subdirectory(hidapi)
 
-# glslang
+
+# Vulkan
 add_subdirectory(glslang EXCLUDE_FROM_ALL)
-add_library(3rdparty_glslang INTERFACE)
-target_link_libraries(3rdparty_glslang INTERFACE SPIRV)
+add_subdirectory(SPIRV EXCLUDE_FROM_ALL)
 
 
 # yaml-cpp
 add_subdirectory(yaml-cpp)
 
 
-# OpenGL
-
-if (NOT ANDROID)
-	find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL)
-
-	add_library(3rdparty_opengl INTERFACE)
-	target_include_directories(3rdparty_opengl INTERFACE GL)
-
-	if (WIN32)
-		if(NOT MSVC)
-			target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU)
-		else()
-			target_link_libraries(3rdparty_opengl INTERFACE dxgi.lib d2d1.lib dwrite.lib)
-		endif()
-	elseif(APPLE)
-		target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU)
-	else()
-		target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU OpenGL::GLX)
-	endif()
+# xxHash
+if (USE_SYSTEM_XXHASH)
+	pkg_check_modules(XXHASH REQUIRED IMPORTED_TARGET libxxhash)
+	add_library(xxhash INTERFACE)
+	target_link_libraries(xxhash INTERFACE PkgConfig::XXHASH)
 else()
-	add_library(3rdparty_opengl INTERFACE)
-	target_compile_definitions(3rdparty_opengl INTERFACE WITHOUT_OPENGL=1)
+	set(XXHASH_BUNDLED_MODE ON)
+	set(XXHASH_BUILD_XXHSUM OFF)
+	set(BUILD_SHARED_LIBS OFF CACHE BOOL "Make xxHash build static libs")
+	add_subdirectory(xxHash/cmake_unofficial EXCLUDE_FROM_ALL)
+	target_include_directories(xxhash INTERFACE xxHash)
 endif()
 
+# OpenGL
+
+# Prefer GLVND for OpenGL rather than legacy, unless it's been defined elsewhere, in the case of AppImage builds
+if(NOT DEFINED OpenGL_GL_PREFERENCE)
+	set(OpenGL_GL_PREFERENCE GLVND)
+endif()
+find_package(OpenGL REQUIRED)
+
+add_library(3rdparty_opengl INTERFACE)
+target_include_directories(3rdparty_opengl INTERFACE GL)
+
+if (WIN32)
+	if(NOT MSVC)
+		target_link_libraries(3rdparty_opengl INTERFACE ${OPENGL_LIBRARIES} opengl32.lib glu32.lib)
+	else()
+		target_link_libraries(3rdparty_opengl INTERFACE dxgi.lib d2d1.lib dwrite.lib)
+	endif()
+else()
+	target_link_libraries(3rdparty_opengl INTERFACE ${OPENGL_LIBRARIES})
+
+	target_compile_definitions(3rdparty_opengl
+		INTERFACE
+			-DGL_GLEXT_PROTOTYPES
+			-DGLX_GLXEXT_PROTOTYPES)
+endif()
+
+
 # stblib
-add_subdirectory(stblib)
+add_library(3rdparty_stblib INTERFACE)
+target_include_directories(3rdparty_stblib INTERFACE stblib/include)
+
 
 # DiscordRPC
 add_subdirectory(discord-rpc)
 
-# Cubeb
-if(USE_SYSTEM_CUBEB)
-	find_package(cubeb REQUIRED GLOBAL)
-	message(STATUS "Using system cubeb version '${cubeb_VERSION}'")
-	add_library(3rdparty::cubeb ALIAS cubeb::cubeb)
-else()
-	message(STATUS "Using static cubeb from 3rdparty")
-	add_subdirectory(cubeb EXCLUDE_FROM_ALL)
+
+# ALSA
+set(ALSA_TARGET 3rdparty_dummy_lib)
+
+if(USE_ALSA)
+	find_package(ALSA)
+	if(ALSA_FOUND)
+		add_library(3rdparty_alsa INTERFACE)
+		target_compile_definitions(3rdparty_alsa INTERFACE -DHAVE_ALSA)
+		target_include_directories(3rdparty_alsa SYSTEM INTERFACE ${ALSA_INCLUDE_DIRS})
+		target_link_libraries(3rdparty_alsa INTERFACE ${ALSA_LIBRARIES})
+
+		set(ALSA_TARGET 3rdparty_alsa)
+	endif()
 endif()
 
-# SoundTouch
-add_subdirectory(SoundTouch EXCLUDE_FROM_ALL)
+
+# Pulse
+set(PULSE_TARGET 3rdparty_dummy_lib)
+if(USE_PULSE)
+	pkg_check_modules(PULSE libpulse-simple)
+
+	if(PULSE_FOUND)
+		add_library(3rdparty_pulse INTERFACE)
+		target_compile_definitions(3rdparty_pulse INTERFACE -DHAVE_PULSE)
+		target_include_directories(3rdparty_pulse SYSTEM
+			INTERFACE ${PULSE_INCLUDE_DIRS})
+		target_link_libraries(3rdparty_pulse INTERFACE ${PULSE_LDFLAGS})
+
+		set(PULSE_TARGET 3rdparty_pulse)
+	endif()
+endif()
 
 # libevdev
 set(LIBEVDEV_TARGET 3rdparty_dummy_lib)
 if(USE_LIBEVDEV)
-	pkg_check_modules(LIBEVDEV libevdev libudev)
+	pkg_check_modules(LIBEVDEV libevdev)
 	if(LIBEVDEV_FOUND)
 		add_library(3rdparty_libevdev INTERFACE)
 		target_compile_definitions(3rdparty_libevdev INTERFACE -DHAVE_LIBEVDEV)
@@ -162,97 +180,49 @@ endif()
 # Vulkan
 set(VULKAN_TARGET 3rdparty_dummy_lib)
 if(USE_VULKAN)
-	if(APPLE)
-		if(USE_SYSTEM_MVK)
-			message(STATUS "RPCS3: Using system MoltenVK")
-		else()
-			message(STATUS "RPCS3: MoltenVK submodule")
-
-			execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-				WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK"
-			)
-			execute_process(COMMAND "${CMAKE_COMMAND}" --build .
-				WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK"
-			)
-
-			add_library(moltenvk_lib SHARED IMPORTED)
-			add_dependencies(moltenvk_lib moltenvk)
-			set_target_properties(moltenvk_lib
-				PROPERTIES IMPORTED_LOCATION "{Vulkan_LIBRARY}"
-			)
-
-			set(VULKAN_SDK "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/MoltenVK/MoltenVK")
-			set(VK_ICD_FILENAMES "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/MoltenVK/MoltenVK/icd/MoltenVK_icd.json")
-			set(Vulkan_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/MoltenVK/MoltenVK/include")
-			set(Vulkan_LIBRARY "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/MoltenVK/Build/Products/Release/dynamic/libMoltenVK.dylib")
-			set(Vulkan_TOOLS "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/MoltenVK/Build/Products/Release")
-		endif()
-	endif()
-
 	find_package(Vulkan)
 	if(VULKAN_FOUND)
 		add_library(3rdparty_vulkan INTERFACE)
 		target_compile_definitions(3rdparty_vulkan INTERFACE -DHAVE_VULKAN)
-		target_link_libraries(3rdparty_vulkan INTERFACE Vulkan::Vulkan)
+		target_link_libraries(3rdparty_vulkan INTERFACE SPIRV SPIRV-Tools-opt Vulkan::Vulkan)
 
-		if(UNIX AND NOT APPLE AND NOT ANDROID)
+		if(UNIX AND NOT APPLE)
 			find_package(Wayland)
 			if (WAYLAND_FOUND)
 				target_include_directories(3rdparty_vulkan
 					INTERFACE ${WAYLAND_INCLUDE_DIR})
+
+				target_compile_definitions(3rdparty_vulkan
+					INTERFACE -DVK_USE_PLATFORM_WAYLAND_KHR)
 			endif()
 		endif()
 
 		set(VULKAN_TARGET 3rdparty_vulkan)
 	else()
-		message(WARNING "USE_VULKAN was enabled, but libvulkan was not found. RPCS3 will be compiled without Vulkan support.")
-		if(APPLE)
-			message(FATAL_ERROR "To build without Vulkan support on macOS, please disable USE_VULKAN.")
-		endif()
+		message("WARNING! USE_VULKAN was enabled, but libvulkan was not found. RPCS3 will be compiled without Vulkan support.")
 	endif()
 endif()
 
 # AsmJit
 add_subdirectory(asmjit EXCLUDE_FROM_ALL)
 
-# SDL3
-set(SDL3_TARGET 3rdparty_dummy_lib)
-if(USE_SDL)
-	if(USE_SYSTEM_SDL)
-		find_package(SDL3)
-		if(SDL3_FOUND AND SDL3_VERSION VERSION_GREATER_EQUAL 3.2.0)
-			message(STATUS "Using system SDL3 version '${SDL3_VERSION}'")
-			add_library(3rdparty_sdl3 INTERFACE)
-			target_compile_definitions(3rdparty_sdl3 INTERFACE -DHAVE_SDL3=1)
-			target_link_libraries(3rdparty_sdl3 INTERFACE SDL3::SDL3)
-			set(SDL3_TARGET 3rdparty_sdl3)
-		else()
-			message(FATAL_ERROR "SDL3 is not available on this system")
-		endif()
-	else()
-		message(STATUS "Using static SDL3 from 3rdparty")
-		add_subdirectory(libsdl-org EXCLUDE_FROM_ALL)
-		target_compile_definitions(SDL3-static INTERFACE -DHAVE_SDL3=1)
-		set(SDL3_TARGET SDL3-static)
-		set(SDL3_DIR "${CMAKE_CURRENT_BINARY_DIR}/libsdl-org/SDL" CACHE STRING "")
-	endif()
-endif()
-
 # OpenAL
-if (NOT ANDROID)
-	add_subdirectory(OpenAL EXCLUDE_FROM_ALL)
-else()
-	add_library(3rdparty_openal INTERFACE)
-	target_compile_definitions(3rdparty_openal INTERFACE WITHOUT_OPENAL=1)
-endif()
+add_subdirectory(OpenAL EXCLUDE_FROM_ALL)
 
 # FAudio
 set(FAUDIO_TARGET 3rdparty_dummy_lib)
 if(USE_FAUDIO)
-	# FAudio depends on SDL3
-	find_package(SDL3)
-	if (USE_SYSTEM_FAUDIO)
-		if (SDL3_FOUND AND SDL3_VERSION VERSION_GREATER_EQUAL 3.2.0)
+	# FAudio depends on SDL2
+	find_package(SDL2)
+	if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.12)
+		message(WARNING
+			"-- RPCS3: FAudio requires SDL 2.0.9 or newer. Please note, this warning"
+			"can also be displayed with SDL2 versions between 2.0.9-2.0.12, as the"
+			"CMake config files are not correctly installed. Since a valid SDL2"
+			">=2.0.9 version cannot be found, building with FAudio will be skipped.")
+		set(USE_FAUDIO False)
+	else()
+		if (USE_SYSTEM_FAUDIO)
 			message(STATUS "RPCS3: Using system FAudio")
 			find_package(FAudio REQUIRED CONFIGS FAudioConfig.cmake FAudio-config.cmake)
 			add_library(3rdparty_FAudio INTERFACE)
@@ -260,103 +230,135 @@ if(USE_FAUDIO)
 			target_compile_definitions(3rdparty_FAudio INTERFACE -DHAVE_FAUDIO)
 			set(FAUDIO_TARGET 3rdparty_FAudio)
 		else()
-			message(WARNING
-				"RPCS3: System FAudio requires SDL 3.2.0 or newer. Since a valid SDL3"
-				">=3.2.0 version cannot be found, building with FAudio will be skipped.")
-			set(USE_FAUDIO OFF CACHE BOOL "Disabled using system FAudio with SDL < 3.2.0" FORCE)
-		endif()
-	else()
-		if (SDL3_FOUND AND SDL3_VERSION VERSION_GREATER_EQUAL 3.2.0)
 			message(STATUS "RPCS3: Using builtin FAudio")
 			set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library")
 			add_subdirectory(FAudio EXCLUDE_FROM_ALL)
-			target_compile_definitions(FAudio-static INTERFACE -DHAVE_FAUDIO)
-			set(FAUDIO_TARGET FAudio-static)
-		else()
-			message(FATAL_ERROR
-				"-- RPCS3: 3rdparty FAudio requires SDL 3.2.0 or newer. Since a valid SDL3"
-				">=3.2.0 version cannot be found, building with FAudio will be skipped.")
-			set(USE_FAUDIO OFF CACHE BOOL "Disabled FAudio with SDL < 3.2.0" FORCE)
+			target_compile_definitions(FAudio INTERFACE -DHAVE_FAUDIO)
+			set(FAUDIO_TARGET FAudio)
 		endif()
 	endif()
 endif()
 
-set_property(TARGET ${FAUDIO_TARGET} PROPERTY FOLDER "3rdparty/")
-
-
 # FFMPEG
-if(NOT ANDROID)
-	add_library(3rdparty_ffmpeg INTERFACE)
+add_library(3rdparty_ffmpeg INTERFACE)
 
-	# Select the version of ffmpeg to use, default is builtin
-	if(USE_SYSTEM_FFMPEG)
-		message(STATUS "RPCS3: using shared ffmpeg")
-		find_package(FFMPEG REQUIRED)
+# Select the version of ffmpeg to use, default is builtin
+if(USE_SYSTEM_FFMPEG)
+	message("-- RPCS3: using shared ffmpeg")
+	find_package(FFMPEG REQUIRED)
 
-		target_include_directories(3rdparty_ffmpeg INTERFACE ${FFMPEG_INCLUDE_DIR})
-		target_link_libraries(3rdparty_ffmpeg INTERFACE ${FFMPEG_LIBRARIES})
+	target_include_directories(3rdparty_ffmpeg INTERFACE ${FFMPEG_INCLUDE_DIR})
+	target_link_libraries(3rdparty_ffmpeg INTERFACE ${FFMPEG_LIBRARIES})
+else()
+	if (NOT MSVC AND WIN32)
+		message("-- RPCS3: building ffmpeg submodule")
+
+		ExternalProject_Add(ffmpeg-mingw
+			DOWNLOAD_COMMAND ""
+			SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ffmpeg
+			BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg
+			CONFIGURE_COMMAND  ${CMAKE_CURRENT_SOURCE_DIR}/ffmpeg/configure --prefix=./windows/x86_64 --arch=x86_64 --disable-avdevice --disable-programs --disable-avfilter --disable-postproc --disable-doc --disable-pthreads --enable-w32threads --disable-network --disable-everything --disable-encoders --disable-muxers --disable-hwaccels --disable-parsers --disable-protocols --enable-dxva2 --enable-static --disable-shared --enable-decoder=aac --enable-decoder=aac_latm --enable-decoder=atrac3 --enable-decoder=atrac3p --enable-decoder=mp3 --enable-decoder=pcm_s16le --enable-decoder=pcm_s8 --enable-decoder=h264 --enable-decoder=mpeg4 --enable-decoder=mpeg2video --enable-decoder=mjpeg --enable-decoder=mjpegb --enable-encoder=pcm_s16le --enable-encoder=ffv1 --enable-encoder=mpeg4 --enable-parser=h264 --enable-parser=mpeg4video --enable-parser=mpegaudio --enable-parser=mpegvideo --enable-parser=mjpeg --enable-parser=aac --enable-parser=aac_latm --enable-muxer=avi --enable-demuxer=h264 --enable-demuxer=m4v --enable-demuxer=mp3 --enable-demuxer=mpegvideo --enable-demuxer=mpegps --enable-demuxer=mjpeg --enable-demuxer=avi --enable-demuxer=aac --enable-demuxer=pmp --enable-demuxer=oma --enable-demuxer=pcm_s16le --enable-demuxer=pcm_s8 --enable-demuxer=wav --enable-hwaccel=h264_dxva2 --enable-indev=dshow --enable-protocol=file
+			BUILD_COMMAND make -j 4
+			INSTALL_COMMAND make install
+		)
+
+		set(FFMPEG_LIB_AVFORMAT "${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/windows/x86_64/lib/libavformat.a")
+		set(FFMPEG_LIB_AVCODEC "${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/windows/x86_64/lib/libavcodec.a")
+		set(FFMPEG_LIB_AVUTIL "${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/windows/x86_64/lib/libavutil.a")
+		set(FFMPEG_LIB_SWSCALE "${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/windows/x86_64/lib/libswscale.a")
 	else()
-		message(STATUS "RPCS3: using builtin ffmpeg")
-		add_subdirectory(ffmpeg EXCLUDE_FROM_ALL)
-		# ffmpeg-core libraries are extracted to CMAKE_BINARY_DIR
-		set(FFMPEG_LIB_DIR "${CMAKE_BINARY_DIR}/3rdparty/ffmpeg/lib")
+		message("-- RPCS3: using builtin ffmpeg")
 
 		if (WIN32)
+			set(FFMPEG_LIB_DIR "ffmpeg/windows/x86_64")
 			target_link_libraries(3rdparty_ffmpeg INTERFACE "Bcrypt.lib")
+		elseif(CMAKE_SYSTEM MATCHES "Linux")
+			set(FFMPEG_LIB_DIR "ffmpeg/linux/x86_64")
+		elseif(APPLE)
+			set(FFMPEG_LIB_DIR "ffmpeg/macos/x86_64")
+		else()
+			message(FATAL_ERROR "Prebuilt ffmpeg is not available on this platform! Try USE_SYSTEM_FFMPEG=ON.")
 		endif()
 
 		find_library(FFMPEG_LIB_AVFORMAT avformat PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
 		find_library(FFMPEG_LIB_AVCODEC avcodec PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
 		find_library(FFMPEG_LIB_AVUTIL avutil PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
 		find_library(FFMPEG_LIB_SWSCALE swscale PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
-		find_library(FFMPEG_LIB_SWRESAMPLE swresample PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
+	endif()
 
-		if (FFMPEG_LIB_AVFORMAT MATCHES "FFMPEG_LIB_AVFORMAT-NOTFOUND")
-			message(FATAL_ERROR "@#$%! FFMPEG NOT FOUND! ${FFMPEG_LIB_DIR}")
-		endif()
+	target_include_directories(3rdparty_ffmpeg INTERFACE "ffmpeg/include")
 
-		target_link_libraries(3rdparty_ffmpeg
+	target_link_libraries(3rdparty_ffmpeg
 		INTERFACE
 			${FFMPEG_LIB_AVFORMAT}
 			${FFMPEG_LIB_AVCODEC}
 			${FFMPEG_LIB_AVUTIL}
-			${FFMPEG_LIB_SWSCALE}
-			${FFMPEG_LIB_SWRESAMPLE}
-		)
-		target_include_directories(3rdparty_ffmpeg INTERFACE "ffmpeg/include")
-	endif()
+			${FFMPEG_LIB_SWSCALE})
 endif()
 
 
 # GLEW
 add_library(3rdparty_glew INTERFACE)
-if(NOT MSVC AND NOT ANDROID)
-	find_package(GLEW REQUIRED)
+if(NOT MSVC)
+	find_package(GLEW 1.13.0 REQUIRED)
 	target_link_libraries(3rdparty_glew INTERFACE GLEW::GLEW)
 endif()
 
 
 # LLVM
-add_subdirectory(llvm EXCLUDE_FROM_ALL)
+include(llvm.cmake)
 
 # WOLFSSL
-add_subdirectory(wolfssl EXCLUDE_FROM_ALL)
+if(USE_SYSTEM_WOLFSSL)
+	message("-- RPCS3: using shared wolfssl")
+	pkg_check_modules(WolfSSL REQUIRED IMPORTED_TARGET wolfssl>=4.7.0)
+	add_library(wolfssl INTERFACE)
+	target_link_libraries(wolfssl INTERFACE PkgConfig::WolfSSL)
+else()
+	# TODO(cjj19970505@live.cn)
+	# OPENSSL_EXTRA, WOLFSSL_DES_ECB and HAVE_SNI are unconfigurable from CMake cache.
+	# but they do have it in a TODO list (wolfssl/CMakeList, 1021)
+	add_compile_definitions(OPENSSL_EXTRA WOLFSSL_DES_ECB HAVE_SNI)
+
+	set(WOLFSSL_TLS13 "no" CACHE INTERNAL "")
+	set(WOLFSSL_SHA224 "yes" CACHE INTERNAL "")
+	set(WOLFSSL_SHA3 "yes" CACHE INTERNAL "")
+	set(WOLFSSL_SHAKE256 "yes" CACHE INTERNAL "")
+	set(WOLFSSL_BASE64_ENCODE "no" CACHE INTERNAL "")
+	set(WOLFSSL_DES3 "yes" CACHE INTERNAL "")
+	set(WOLFSSL_POLY1305 "yes" CACHE INTERNAL "")
+	set(WOLFSSL_CHACHA "yes" CACHE INTERNAL "")
+	set(WOLFSSL_FILESYSTEM "yes" CACHE INTERNAL "")
+	set(WOLFSSL_PWDBASED "yes" CACHE INTERNAL "")
+	set(WOLFSSL_FAST_MATH "no" CACHE INTERNAL "")
+	set(WOLFSSL_EXAMPLES "no" CACHE INTERNAL "")
+	set(WOLFSSL_CRYPT_TESTS "no" CACHE INTERNAL "")
+	set(WOLFSSL_ASYNC_THREADS "no" CACHE INTERNAL "")
+	set(WOLFSSL_CONFIG_H "no" CACHE INTERNAL "")
+
+	add_subdirectory(wolfssl EXCLUDE_FROM_ALL)
+
+	# TODO(cjj19970505@live.cn)
+	# This only works in single-config generator
+	# For a multi-config generator, we need to provide different wolfssl binaries for different config
+	if (GENERATOR_IS_MULTI_CONFIG)
+		message( FATAL_ERROR "RPCS3 can only be configured using single-config generator." )
+	endif()
+
+	if(MSVC)
+		set(WolfSSL_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/wolfssl/wolfssl.lib")
+	else()
+		set(WolfSSL_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/wolfssl/libwolfssl.a")
+	endif()
+
+	# "${CMAKE_CURRENT_SOURCE_DIR}/wolfssl/wolfssl/" provides openssl headers
+	# So that curl can be built on an environment where openssl headers are not provided
+	set(WolfSSL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/wolfssl/" "${CMAKE_CURRENT_SOURCE_DIR}/wolfssl/wolfssl/" "${CMAKE_CURRENT_BINARY_DIR}/wolfssl/")
+endif()
 
 # CURL
 add_subdirectory(curl EXCLUDE_FROM_ALL)
 
-# MINIUPNP
-add_subdirectory(miniupnp EXCLUDE_FROM_ALL)
-
-# RTMIDI
-add_subdirectory(rtmidi EXCLUDE_FROM_ALL)
-
-# OPENCV
-add_subdirectory(opencv EXCLUDE_FROM_ALL)
-
-# FUSION
-add_subdirectory(fusion EXCLUDE_FROM_ALL)
-
 # add nice ALIAS targets for ease of use
 if(USE_SYSTEM_LIBUSB)
 	add_library(3rdparty::libusb ALIAS usb-1.0-shared)
@@ -364,17 +366,18 @@ else()
 	add_library(3rdparty::libusb ALIAS usb-1.0-static)
 endif()
 add_library(3rdparty::zlib ALIAS 3rdparty_zlib)
-add_library(3rdparty::zstd ALIAS 3rdparty_zstd)
-add_library(3rdparty::7zip ALIAS 3rdparty_7zip)
+add_library(3rdparty::7z ALIAS 3rdparty_7z)
 add_library(3rdparty::flatbuffers ALIAS 3rdparty_flatbuffers)
 add_library(3rdparty::pugixml ALIAS pugixml)
-add_library(3rdparty::glslang ALIAS 3rdparty_glslang)
 add_library(3rdparty::yaml-cpp ALIAS yaml-cpp)
+add_library(3rdparty::xxhash ALIAS xxhash)
 add_library(3rdparty::hidapi ALIAS 3rdparty_hidapi)
 add_library(3rdparty::libpng ALIAS ${LIBPNG_TARGET})
 add_library(3rdparty::opengl ALIAS 3rdparty_opengl)
 add_library(3rdparty::stblib ALIAS 3rdparty_stblib)
 add_library(3rdparty::discordRPC ALIAS 3rdparty_discordRPC)
+add_library(3rdparty::alsa ALIAS ${ALSA_TARGET})
+add_library(3rdparty::pulse ALIAS ${PULSE_TARGET})
 add_library(3rdparty::faudio ALIAS ${FAUDIO_TARGET})
 add_library(3rdparty::libevdev ALIAS ${LIBEVDEV_TARGET})
 add_library(3rdparty::vulkan ALIAS ${VULKAN_TARGET})
@@ -382,10 +385,4 @@ 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)
-add_library(3rdparty::libcurl ALIAS 3rdparty_libcurl)
-add_library(3rdparty::soundtouch ALIAS soundtouch)
-add_library(3rdparty::sdl3 ALIAS ${SDL3_TARGET})
-add_library(3rdparty::miniupnpc ALIAS libminiupnpc-static)
-add_library(3rdparty::rtmidi ALIAS rtmidi)
-add_library(3rdparty::opencv ALIAS ${OPENCV_TARGET})
-add_library(3rdparty::fusion ALIAS Fusion)
+add_library(3rdparty::libcurl ALIAS libcurl)
diff --git a/3rdparty/DetectArchitecture.cmake b/3rdparty/DetectArchitecture.cmake
deleted file mode 100644
index dcdb0e2a70..0000000000
--- a/3rdparty/DetectArchitecture.cmake
+++ /dev/null
@@ -1,63 +0,0 @@
-# From https://github.com/merryhime/dynarmic
-include(CheckSymbolExists)
-
-if (CMAKE_OSX_ARCHITECTURES)
-    set(DYNARMIC_MULTIARCH_BUILD 1)
-    set(ARCHITECTURE "${CMAKE_OSX_ARCHITECTURES}")
-    return()
-endif()
-
-function(detect_architecture symbol arch)
-    if (NOT DEFINED ARCHITECTURE)
-        set(CMAKE_REQUIRED_QUIET YES)
-        check_symbol_exists("${symbol}" "" DETECT_ARCHITECTURE_${arch})
-        unset(CMAKE_REQUIRED_QUIET)
-
-        if (DETECT_ARCHITECTURE_${arch})
-            set(ARCHITECTURE "${arch}" PARENT_SCOPE)
-        endif()
-
-        unset(DETECT_ARCHITECTURE_${arch} CACHE)
-    endif()
-endfunction()
-
-detect_architecture("__ARM64__" arm64)
-detect_architecture("__aarch64__" arm64)
-detect_architecture("_M_ARM64" arm64)
-
-detect_architecture("__arm__" arm)
-detect_architecture("__TARGET_ARCH_ARM" arm)
-detect_architecture("_M_ARM" arm)
-
-detect_architecture("__x86_64" x86_64)
-detect_architecture("__x86_64__" x86_64)
-detect_architecture("__amd64" x86_64)
-detect_architecture("_M_X64" x86_64)
-
-detect_architecture("__i386" x86)
-detect_architecture("__i386__" x86)
-detect_architecture("_M_IX86" x86)
-
-detect_architecture("__ia64" ia64)
-detect_architecture("__ia64__" ia64)
-detect_architecture("_M_IA64" ia64)
-
-detect_architecture("__mips" mips)
-detect_architecture("__mips__" mips)
-detect_architecture("_M_MRX000" mips)
-
-detect_architecture("__ppc64__" ppc64)
-detect_architecture("__powerpc64__" ppc64)
-
-detect_architecture("__ppc__" ppc)
-detect_architecture("__ppc" ppc)
-detect_architecture("__powerpc__" ppc)
-detect_architecture("_ARCH_COM" ppc)
-detect_architecture("_ARCH_PWR" ppc)
-detect_architecture("_ARCH_PPC" ppc)
-detect_architecture("_M_MPPC" ppc)
-detect_architecture("_M_PPC" ppc)
-
-detect_architecture("__riscv" riscv)
-
-detect_architecture("__EMSCRIPTEN__" wasm)
diff --git a/3rdparty/FAudio b/3rdparty/FAudio
index e6ddfabab2..1f6daa2382 160000
--- a/3rdparty/FAudio
+++ b/3rdparty/FAudio
@@ -1 +1 @@
-Subproject commit e6ddfabab2efbc8765750039634fe5e24ac31205
+Subproject commit 1f6daa2382d5ea8217e626ef4908879bdef7c2c6
diff --git a/3rdparty/GL/glext.h b/3rdparty/GL/glext.h
index 276a962a96..a28de762ef 100644
--- a/3rdparty/GL/glext.h
+++ b/3rdparty/GL/glext.h
@@ -32,9 +32,9 @@ extern "C" {
 #define GLAPI extern
 #endif
 
-#define GL_GLEXT_VERSION 20250203
+#define GL_GLEXT_VERSION 20210420
 
-#include <KHR/khrplatform.h>
+#include "khrplatform.h"
 
 /* Generated C header for:
  * API: gl
@@ -5397,12 +5397,12 @@ typedef void (APIENTRY  *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severi
 typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
 typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
 typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, void *userParam);
-typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufSize, GLenum *categories, GLenum *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufSize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
 GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
 GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, void *userParam);
-GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufSize, GLenum *categories, GLenum *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufSize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
 #endif
 #endif /* GL_AMD_debug_output */
 
@@ -7370,16 +7370,6 @@ GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1,
 #endif
 #endif /* GL_EXT_framebuffer_blit */
 
-#ifndef GL_EXT_framebuffer_blit_layers
-#define GL_EXT_framebuffer_blit_layers 1
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERLAYERSEXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERLAYEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint srcLayer, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLint dstLayer, GLbitfield mask, GLenum filter);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlitFramebufferLayersEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-GLAPI void APIENTRY glBlitFramebufferLayerEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint srcLayer, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLint dstLayer, GLbitfield mask, GLenum filter);
-#endif
-#endif /* GL_EXT_framebuffer_blit_layers */
-
 #ifndef GL_EXT_framebuffer_multisample
 #define GL_EXT_framebuffer_multisample 1
 #define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
@@ -8224,10 +8214,6 @@ GLAPI void APIENTRY glMemoryBarrierEXT (GLbitfield barriers);
 #define GL_EXT_shader_integer_mix 1
 #endif /* GL_EXT_shader_integer_mix */
 
-#ifndef GL_EXT_shader_samples_identical
-#define GL_EXT_shader_samples_identical 1
-#endif /* GL_EXT_shader_samples_identical */
-
 #ifndef GL_EXT_shadow_funcs
 #define GL_EXT_shadow_funcs 1
 #endif /* GL_EXT_shadow_funcs */
@@ -8639,36 +8625,6 @@ GLAPI void APIENTRY glTextureNormalEXT (GLenum mode);
 #define GL_RGBA_SNORM                     0x8F93
 #endif /* GL_EXT_texture_snorm */
 
-#ifndef GL_EXT_texture_storage
-#define GL_EXT_texture_storage 1
-#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT   0x912F
-#define GL_RGBA32F_EXT                    0x8814
-#define GL_RGB32F_EXT                     0x8815
-#define GL_ALPHA32F_EXT                   0x8816
-#define GL_LUMINANCE32F_EXT               0x8818
-#define GL_LUMINANCE_ALPHA32F_EXT         0x8819
-#define GL_RGBA16F_EXT                    0x881A
-#define GL_RGB16F_EXT                     0x881B
-#define GL_ALPHA16F_EXT                   0x881C
-#define GL_LUMINANCE16F_EXT               0x881E
-#define GL_LUMINANCE_ALPHA16F_EXT         0x881F
-#define GL_BGRA8_EXT                      0x93A1
-#define GL_R8_EXT                         0x8229
-#define GL_RG8_EXT                        0x822B
-#define GL_R32F_EXT                       0x822E
-#define GL_RG32F_EXT                      0x8230
-#define GL_R16F_EXT                       0x822D
-#define GL_RG16F_EXT                      0x822F
-typedef void (APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-typedef void (APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-GLAPI void APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-#endif
-#endif /* GL_EXT_texture_storage */
-
 #ifndef GL_EXT_texture_swizzle
 #define GL_EXT_texture_swizzle 1
 #define GL_TEXTURE_SWIZZLE_R_EXT          0x8E42
@@ -9404,11 +9360,6 @@ GLAPI void APIENTRY glResizeBuffersMESA (void);
 #define GL_MESA_shader_integer_functions 1
 #endif /* GL_MESA_shader_integer_functions */
 
-#ifndef GL_MESA_texture_const_bandwidth
-#define GL_MESA_texture_const_bandwidth 1
-#define GL_CONST_BW_TILING_MESA           0x8BBE
-#endif /* GL_MESA_texture_const_bandwidth */
-
 #ifndef GL_MESA_tile_raster_order
 #define GL_MESA_tile_raster_order 1
 #define GL_TILE_RASTER_ORDER_FIXED_MESA   0x8BB8
@@ -10263,6 +10214,12 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s,
 typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
 typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
 typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
+typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
 typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
 typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
 typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
@@ -10275,12 +10232,6 @@ typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, c
 typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
 typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
 typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
-typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y);
 GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v);
@@ -10310,6 +10261,12 @@ GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t,
 GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v);
 GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
 GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
+GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
+GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
+GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
 GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x);
 GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v);
 GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y);
@@ -10322,12 +10279,6 @@ GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfN
 GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
 GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
 GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
-GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
-GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
-GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
-GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
 #endif
 #endif /* GL_NV_half_float */
 
@@ -11464,10 +11415,6 @@ GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id);
 #endif
 #endif /* GL_NV_transform_feedback2 */
 
-#ifndef GL_NV_uniform_buffer_std430_layout
-#define GL_NV_uniform_buffer_std430_layout 1
-#endif /* GL_NV_uniform_buffer_std430_layout */
-
 #ifndef GL_NV_uniform_buffer_unified_memory
 #define GL_NV_uniform_buffer_unified_memory 1
 #define GL_UNIFORM_BUFFER_UNIFIED_NV      0x936E
@@ -11983,10 +11930,8 @@ GLAPI void APIENTRY glViewportSwizzleNV (GLuint index, GLenum swizzlex, GLenum s
 #define GL_MAX_VIEWS_OVR                  0x9631
 #define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633
 typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glFramebufferTextureMultiviewOVR (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
-GLAPI void APIENTRY glNamedFramebufferTextureMultiviewOVR (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
 #endif
 #endif /* GL_OVR_multiview */
 
diff --git a/3rdparty/GL/KHR/khrplatform.h b/3rdparty/GL/khrplatform.h
similarity index 92%
rename from 3rdparty/GL/KHR/khrplatform.h
rename to 3rdparty/GL/khrplatform.h
index 01646449ca..dd22d92701 100644
--- a/3rdparty/GL/KHR/khrplatform.h
+++ b/3rdparty/GL/khrplatform.h
@@ -153,20 +153,6 @@ typedef int64_t                 khronos_int64_t;
 typedef uint64_t                khronos_uint64_t;
 #define KHRONOS_SUPPORT_INT64   1
 #define KHRONOS_SUPPORT_FLOAT   1
-/*
- * To support platform where unsigned long cannot be used interchangeably with
- * inptr_t (e.g. CHERI-extended ISAs), we can use the stdint.h intptr_t.
- * Ideally, we could just use (u)intptr_t everywhere, but this could result in
- * ABI breakage if khronos_uintptr_t is changed from unsigned long to
- * unsigned long long or similar (this results in different C++ name mangling).
- * To avoid changes for existing platforms, we restrict usage of intptr_t to
- * platforms where the size of a pointer is larger than the size of long.
- */
-#if defined(__SIZEOF_LONG__) && defined(__SIZEOF_POINTER__)
-#if __SIZEOF_POINTER__ > __SIZEOF_LONG__
-#define KHRONOS_USE_INTPTR_T
-#endif
-#endif
 
 #elif defined(__VMS ) || defined(__sgi)
 
@@ -249,21 +235,14 @@ typedef unsigned short int     khronos_uint16_t;
  * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
  * to be the only LLP64 architecture in current use.
  */
-#ifdef KHRONOS_USE_INTPTR_T
-typedef intptr_t               khronos_intptr_t;
-typedef uintptr_t              khronos_uintptr_t;
-#elif defined(_WIN64)
+#ifdef _WIN64
 typedef signed   long long int khronos_intptr_t;
 typedef unsigned long long int khronos_uintptr_t;
-#else
-typedef signed   long  int     khronos_intptr_t;
-typedef unsigned long  int     khronos_uintptr_t;
-#endif
-
-#if defined(_WIN64)
 typedef signed   long long int khronos_ssize_t;
 typedef unsigned long long int khronos_usize_t;
 #else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
 typedef signed   long  int     khronos_ssize_t;
 typedef unsigned long  int     khronos_usize_t;
 #endif
diff --git a/3rdparty/GPUOpen/VulkanMemoryAllocator b/3rdparty/GPUOpen/VulkanMemoryAllocator
deleted file mode 160000
index 1d8f600fd4..0000000000
--- a/3rdparty/GPUOpen/VulkanMemoryAllocator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1d8f600fd424278486eade7ed3e877c99f0846b1
diff --git a/3rdparty/GPUOpen/include/ffx_fsr1.h b/3rdparty/GPUOpen/include/ffx_fsr1.h
index 4e0b3d5485..15ecfde5c2 100644
--- a/3rdparty/GPUOpen/include/ffx_fsr1.h
+++ b/3rdparty/GPUOpen/include/ffx_fsr1.h
@@ -747,12 +747,12 @@ AF1 sharpness){
   // Immediate constants for peak range.
   AF2 peakC=AF2(1.0,-1.0*4.0);
   // Limiters, these need to be high precision RCPs.
-  AF1 hitMinR=min(mn4R,eR)*ARcpF1(AF1_(4.0)*mx4R);
-  AF1 hitMinG=min(mn4G,eG)*ARcpF1(AF1_(4.0)*mx4G);
-  AF1 hitMinB=min(mn4B,eB)*ARcpF1(AF1_(4.0)*mx4B);
-  AF1 hitMaxR=(peakC.x-max(mx4R,eR))*ARcpF1(AF1_(4.0)*mn4R+peakC.y);
-  AF1 hitMaxG=(peakC.x-max(mx4G,eG))*ARcpF1(AF1_(4.0)*mn4G+peakC.y);
-  AF1 hitMaxB=(peakC.x-max(mx4B,eB))*ARcpF1(AF1_(4.0)*mn4B+peakC.y);
+  AF1 hitMinR=mn4R*ARcpF1(AF1_(4.0)*mx4R);
+  AF1 hitMinG=mn4G*ARcpF1(AF1_(4.0)*mx4G);
+  AF1 hitMinB=mn4B*ARcpF1(AF1_(4.0)*mx4B);
+  AF1 hitMaxR=(peakC.x-mx4R)*ARcpF1(AF1_(4.0)*mn4R+peakC.y);
+  AF1 hitMaxG=(peakC.x-mx4G)*ARcpF1(AF1_(4.0)*mn4G+peakC.y);
+  AF1 hitMaxB=(peakC.x-mx4B)*ARcpF1(AF1_(4.0)*mn4B+peakC.y);
   AF1 lobeR=max(-hitMinR,hitMaxR);
   AF1 lobeG=max(-hitMinG,hitMaxG);
   AF1 lobeB=max(-hitMinB,hitMaxB);
@@ -845,12 +845,12 @@ AF1 sharpness){
   // Immediate constants for peak range.
   AH2 peakC=AH2(1.0,-1.0*4.0);
   // Limiters, these need to be high precision RCPs.
-  AH1 hitMinR=min(mn4R,eR)*ARcpH1(AH1_(4.0)*mx4R);
-  AH1 hitMinG=min(mn4G,eG)*ARcpH1(AH1_(4.0)*mx4G);
-  AH1 hitMinB=min(mn4B,eB)*ARcpH1(AH1_(4.0)*mx4B);
-  AH1 hitMaxR=(peakC.x-max(mx4R,eR))*ARcpH1(AH1_(4.0)*mn4R+peakC.y);
-  AH1 hitMaxG=(peakC.x-max(mx4G,eG))*ARcpH1(AH1_(4.0)*mn4G+peakC.y);
-  AH1 hitMaxB=(peakC.x-max(mx4B,eB))*ARcpH1(AH1_(4.0)*mn4B+peakC.y);
+  AH1 hitMinR=mn4R*ARcpH1(AH1_(4.0)*mx4R);
+  AH1 hitMinG=mn4G*ARcpH1(AH1_(4.0)*mx4G);
+  AH1 hitMinB=mn4B*ARcpH1(AH1_(4.0)*mx4B);
+  AH1 hitMaxR=(peakC.x-mx4R)*ARcpH1(AH1_(4.0)*mn4R+peakC.y);
+  AH1 hitMaxG=(peakC.x-mx4G)*ARcpH1(AH1_(4.0)*mn4G+peakC.y);
+  AH1 hitMaxB=(peakC.x-mx4B)*ARcpH1(AH1_(4.0)*mn4B+peakC.y);
   AH1 lobeR=max(-hitMinR,hitMaxR);
   AH1 lobeG=max(-hitMinG,hitMaxG);
   AH1 lobeB=max(-hitMinB,hitMaxB);
@@ -963,12 +963,12 @@ AF1 sharpness){
   // Immediate constants for peak range.
   AH2 peakC=AH2(1.0,-1.0*4.0);
   // Limiters, these need to be high precision RCPs.
-  AH2 hitMinR=min(mn4R,eR)*ARcpH2(AH2_(4.0)*mx4R);
-  AH2 hitMinG=min(mn4G,eG)*ARcpH2(AH2_(4.0)*mx4G);
-  AH2 hitMinB=min(mn4B,eB)*ARcpH2(AH2_(4.0)*mx4B);
-  AH2 hitMaxR=(peakC.x-max(mx4R,eR))*ARcpH2(AH2_(4.0)*mn4R+peakC.y);
-  AH2 hitMaxG=(peakC.x-max(mx4G,eG))*ARcpH2(AH2_(4.0)*mn4G+peakC.y);
-  AH2 hitMaxB=(peakC.x-max(mx4B,eB))*ARcpH2(AH2_(4.0)*mn4B+peakC.y);
+  AH2 hitMinR=mn4R*ARcpH2(AH2_(4.0)*mx4R);
+  AH2 hitMinG=mn4G*ARcpH2(AH2_(4.0)*mx4G);
+  AH2 hitMinB=mn4B*ARcpH2(AH2_(4.0)*mx4B);
+  AH2 hitMaxR=(peakC.x-mx4R)*ARcpH2(AH2_(4.0)*mn4R+peakC.y);
+  AH2 hitMaxG=(peakC.x-mx4G)*ARcpH2(AH2_(4.0)*mn4G+peakC.y);
+  AH2 hitMaxB=(peakC.x-mx4B)*ARcpH2(AH2_(4.0)*mn4B+peakC.y);
   AH2 lobeR=max(-hitMinR,hitMaxR);
   AH2 lobeG=max(-hitMinG,hitMaxG);
   AH2 lobeB=max(-hitMinB,hitMaxB);
diff --git a/3rdparty/GPUOpen/include/vk_mem_alloc.h b/3rdparty/GPUOpen/include/vk_mem_alloc.h
new file mode 100644
index 0000000000..bb72d53f57
--- /dev/null
+++ b/3rdparty/GPUOpen/include/vk_mem_alloc.h
@@ -0,0 +1,18120 @@
+//
+// Copyright (c) 2017-2019 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+#ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H
+#define AMD_VULKAN_MEMORY_ALLOCATOR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \mainpage Vulkan Memory Allocator
+
+<b>Version 2.3.0</b> (2019-12-04)
+
+Copyright (c) 2017-2019 Advanced Micro Devices, Inc. All rights reserved. \n
+License: MIT
+
+Documentation of all members: vk_mem_alloc.h
+
+\section main_table_of_contents Table of contents
+
+- <b>User guide</b>
+  - \subpage quick_start
+    - [Project setup](@ref quick_start_project_setup)
+    - [Initialization](@ref quick_start_initialization)
+    - [Resource allocation](@ref quick_start_resource_allocation)
+  - \subpage choosing_memory_type
+    - [Usage](@ref choosing_memory_type_usage)
+    - [Required and preferred flags](@ref choosing_memory_type_required_preferred_flags)
+    - [Explicit memory types](@ref choosing_memory_type_explicit_memory_types)
+    - [Custom memory pools](@ref choosing_memory_type_custom_memory_pools)
+    - [Dedicated allocations](@ref choosing_memory_type_dedicated_allocations)
+  - \subpage memory_mapping
+    - [Mapping functions](@ref memory_mapping_mapping_functions)
+    - [Persistently mapped memory](@ref memory_mapping_persistently_mapped_memory)
+    - [Cache flush and invalidate](@ref memory_mapping_cache_control)
+    - [Finding out if memory is mappable](@ref memory_mapping_finding_if_memory_mappable)
+  - \subpage staying_within_budget
+    - [Querying for budget](@ref staying_within_budget_querying_for_budget)
+    - [Controlling memory usage](@ref staying_within_budget_controlling_memory_usage)
+  - \subpage custom_memory_pools
+    - [Choosing memory type index](@ref custom_memory_pools_MemTypeIndex)
+    - [Linear allocation algorithm](@ref linear_algorithm)
+      - [Free-at-once](@ref linear_algorithm_free_at_once)
+      - [Stack](@ref linear_algorithm_stack)
+      - [Double stack](@ref linear_algorithm_double_stack)
+      - [Ring buffer](@ref linear_algorithm_ring_buffer)
+    - [Buddy allocation algorithm](@ref buddy_algorithm)
+  - \subpage defragmentation
+  	- [Defragmenting CPU memory](@ref defragmentation_cpu)
+  	- [Defragmenting GPU memory](@ref defragmentation_gpu)
+  	- [Additional notes](@ref defragmentation_additional_notes)
+  	- [Writing custom allocation algorithm](@ref defragmentation_custom_algorithm)
+  - \subpage lost_allocations
+  - \subpage statistics
+    - [Numeric statistics](@ref statistics_numeric_statistics)
+    - [JSON dump](@ref statistics_json_dump)
+  - \subpage allocation_annotation
+    - [Allocation user data](@ref allocation_user_data)
+    - [Allocation names](@ref allocation_names)
+  - \subpage debugging_memory_usage
+    - [Memory initialization](@ref debugging_memory_usage_initialization)
+    - [Margins](@ref debugging_memory_usage_margins)
+    - [Corruption detection](@ref debugging_memory_usage_corruption_detection)
+  - \subpage record_and_replay
+- \subpage usage_patterns
+  - [Common mistakes](@ref usage_patterns_common_mistakes)
+  - [Simple patterns](@ref usage_patterns_simple)
+  - [Advanced patterns](@ref usage_patterns_advanced)
+- \subpage configuration
+  - [Pointers to Vulkan functions](@ref config_Vulkan_functions)
+  - [Custom host memory allocator](@ref custom_memory_allocator)
+  - [Device memory allocation callbacks](@ref allocation_callbacks)
+  - [Device heap memory limit](@ref heap_memory_limit)
+  - \subpage vk_khr_dedicated_allocation
+- \subpage general_considerations
+  - [Thread safety](@ref general_considerations_thread_safety)
+  - [Validation layer warnings](@ref general_considerations_validation_layer_warnings)
+  - [Allocation algorithm](@ref general_considerations_allocation_algorithm)
+  - [Features not supported](@ref general_considerations_features_not_supported)
+
+\section main_see_also See also
+
+- [Product page on GPUOpen](https://gpuopen.com/gaming-product/vulkan-memory-allocator/)
+- [Source repository on GitHub](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator)
+
+
+
+
+\page quick_start Quick start
+
+\section quick_start_project_setup Project setup
+
+Vulkan Memory Allocator comes in form of a "stb-style" single header file.
+You don't need to build it as a separate library project.
+You can add this file directly to your project and submit it to code repository next to your other source files.
+
+"Single header" doesn't mean that everything is contained in C/C++ declarations,
+like it tends to be in case of inline functions or C++ templates.
+It means that implementation is bundled with interface in a single file and needs to be extracted using preprocessor macro.
+If you don't do it properly, you will get linker errors.
+
+To do it properly:
+
+-# Include "vk_mem_alloc.h" file in each CPP file where you want to use the library.
+   This includes declarations of all members of the library.
+-# In exacly one CPP file define following macro before this include.
+   It enables also internal definitions.
+
+\code
+#define VMA_IMPLEMENTATION
+#include "vk_mem_alloc.h"
+\endcode
+
+It may be a good idea to create dedicated CPP file just for this purpose.
+
+Note on language: This library is written in C++, but has C-compatible interface.
+Thus you can include and use vk_mem_alloc.h in C or C++ code, but full
+implementation with `VMA_IMPLEMENTATION` macro must be compiled as C++, NOT as C.
+
+Please note that this library includes header `<vulkan/vulkan.h>`, which in turn
+includes `<windows.h>` on Windows. If you need some specific macros defined
+before including these headers (like `WIN32_LEAN_AND_MEAN` or
+`WINVER` for Windows, `VK_USE_PLATFORM_WIN32_KHR` for Vulkan), you must define
+them before every `#include` of this library.
+
+
+\section quick_start_initialization Initialization
+
+At program startup:
+
+-# Initialize Vulkan to have `VkPhysicalDevice` and `VkDevice` object.
+-# Fill VmaAllocatorCreateInfo structure and create #VmaAllocator object by
+   calling vmaCreateAllocator().
+
+\code
+VmaAllocatorCreateInfo allocatorInfo = {};
+allocatorInfo.physicalDevice = physicalDevice;
+allocatorInfo.device = device;
+
+VmaAllocator allocator;
+vmaCreateAllocator(&allocatorInfo, &allocator);
+\endcode
+
+\section quick_start_resource_allocation Resource allocation
+
+When you want to create a buffer or image:
+
+-# Fill `VkBufferCreateInfo` / `VkImageCreateInfo` structure.
+-# Fill VmaAllocationCreateInfo structure.
+-# Call vmaCreateBuffer() / vmaCreateImage() to get `VkBuffer`/`VkImage` with memory
+   already allocated and bound to it.
+
+\code
+VkBufferCreateInfo bufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+bufferInfo.size = 65536;
+bufferInfo.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+VmaAllocationCreateInfo allocInfo = {};
+allocInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+
+VkBuffer buffer;
+VmaAllocation allocation;
+vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);
+\endcode
+
+Don't forget to destroy your objects when no longer needed:
+
+\code
+vmaDestroyBuffer(allocator, buffer, allocation);
+vmaDestroyAllocator(allocator);
+\endcode
+
+
+\page choosing_memory_type Choosing memory type
+
+Physical devices in Vulkan support various combinations of memory heaps and
+types. Help with choosing correct and optimal memory type for your specific
+resource is one of the key features of this library. You can use it by filling
+appropriate members of VmaAllocationCreateInfo structure, as described below.
+You can also combine multiple methods.
+
+-# If you just want to find memory type index that meets your requirements, you
+   can use function: vmaFindMemoryTypeIndex(), vmaFindMemoryTypeIndexForBufferInfo(),
+   vmaFindMemoryTypeIndexForImageInfo().
+-# If you want to allocate a region of device memory without association with any
+   specific image or buffer, you can use function vmaAllocateMemory(). Usage of
+   this function is not recommended and usually not needed.
+   vmaAllocateMemoryPages() function is also provided for creating multiple allocations at once,
+   which may be useful for sparse binding.
+-# If you already have a buffer or an image created, you want to allocate memory
+   for it and then you will bind it yourself, you can use function
+   vmaAllocateMemoryForBuffer(), vmaAllocateMemoryForImage().
+   For binding you should use functions: vmaBindBufferMemory(), vmaBindImageMemory()
+   or their extended versions: vmaBindBufferMemory2(), vmaBindImageMemory2().
+-# If you want to create a buffer or an image, allocate memory for it and bind
+   them together, all in one call, you can use function vmaCreateBuffer(),
+   vmaCreateImage(). This is the easiest and recommended way to use this library.
+
+When using 3. or 4., the library internally queries Vulkan for memory types
+supported for that buffer or image (function `vkGetBufferMemoryRequirements()`)
+and uses only one of these types.
+
+If no memory type can be found that meets all the requirements, these functions
+return `VK_ERROR_FEATURE_NOT_PRESENT`.
+
+You can leave VmaAllocationCreateInfo structure completely filled with zeros.
+It means no requirements are specified for memory type.
+It is valid, although not very useful.
+
+\section choosing_memory_type_usage Usage
+
+The easiest way to specify memory requirements is to fill member
+VmaAllocationCreateInfo::usage using one of the values of enum #VmaMemoryUsage.
+It defines high level, common usage types.
+For more details, see description of this enum.
+
+For example, if you want to create a uniform buffer that will be filled using
+transfer only once or infrequently and used for rendering every frame, you can
+do it using following code:
+
+\code
+VkBufferCreateInfo bufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+bufferInfo.size = 65536;
+bufferInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+VmaAllocationCreateInfo allocInfo = {};
+allocInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+
+VkBuffer buffer;
+VmaAllocation allocation;
+vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);
+\endcode
+
+\section choosing_memory_type_required_preferred_flags Required and preferred flags
+
+You can specify more detailed requirements by filling members
+VmaAllocationCreateInfo::requiredFlags and VmaAllocationCreateInfo::preferredFlags
+with a combination of bits from enum `VkMemoryPropertyFlags`. For example,
+if you want to create a buffer that will be persistently mapped on host (so it
+must be `HOST_VISIBLE`) and preferably will also be `HOST_COHERENT` and `HOST_CACHED`,
+use following code:
+
+\code
+VmaAllocationCreateInfo allocInfo = {};
+allocInfo.requiredFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+allocInfo.preferredFlags = VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
+allocInfo.flags = VMA_ALLOCATION_CREATE_MAPPED_BIT;
+
+VkBuffer buffer;
+VmaAllocation allocation;
+vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);
+\endcode
+
+A memory type is chosen that has all the required flags and as many preferred
+flags set as possible.
+
+If you use VmaAllocationCreateInfo::usage, it is just internally converted to
+a set of required and preferred flags.
+
+\section choosing_memory_type_explicit_memory_types Explicit memory types
+
+If you inspected memory types available on the physical device and you have
+a preference for memory types that you want to use, you can fill member
+VmaAllocationCreateInfo::memoryTypeBits. It is a bit mask, where each bit set
+means that a memory type with that index is allowed to be used for the
+allocation. Special value 0, just like `UINT32_MAX`, means there are no
+restrictions to memory type index.
+
+Please note that this member is NOT just a memory type index.
+Still you can use it to choose just one, specific memory type.
+For example, if you already determined that your buffer should be created in
+memory type 2, use following code:
+
+\code
+uint32_t memoryTypeIndex = 2;
+
+VmaAllocationCreateInfo allocInfo = {};
+allocInfo.memoryTypeBits = 1u << memoryTypeIndex;
+
+VkBuffer buffer;
+VmaAllocation allocation;
+vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);
+\endcode
+
+\section choosing_memory_type_custom_memory_pools Custom memory pools
+
+If you allocate from custom memory pool, all the ways of specifying memory
+requirements described above are not applicable and the aforementioned members
+of VmaAllocationCreateInfo structure are ignored. Memory type is selected
+explicitly when creating the pool and then used to make all the allocations from
+that pool. For further details, see \ref custom_memory_pools.
+
+\section choosing_memory_type_dedicated_allocations Dedicated allocations
+
+Memory for allocations is reserved out of larger block of `VkDeviceMemory`
+allocated from Vulkan internally. That's the main feature of this whole library.
+You can still request a separate memory block to be created for an allocation,
+just like you would do in a trivial solution without using any allocator.
+In that case, a buffer or image is always bound to that memory at offset 0.
+This is called a "dedicated allocation".
+You can explicitly request it by using flag #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.
+The library can also internally decide to use dedicated allocation in some cases, e.g.:
+
+- When the size of the allocation is large.
+- When [VK_KHR_dedicated_allocation](@ref vk_khr_dedicated_allocation) extension is enabled
+  and it reports that dedicated allocation is required or recommended for the resource.
+- When allocation of next big memory block fails due to not enough device memory,
+  but allocation with the exact requested size succeeds.
+
+
+\page memory_mapping Memory mapping
+
+To "map memory" in Vulkan means to obtain a CPU pointer to `VkDeviceMemory`,
+to be able to read from it or write to it in CPU code.
+Mapping is possible only of memory allocated from a memory type that has
+`VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` flag.
+Functions `vkMapMemory()`, `vkUnmapMemory()` are designed for this purpose.
+You can use them directly with memory allocated by this library,
+but it is not recommended because of following issue:
+Mapping the same `VkDeviceMemory` block multiple times is illegal - only one mapping at a time is allowed.
+This includes mapping disjoint regions. Mapping is not reference-counted internally by Vulkan.
+Because of this, Vulkan Memory Allocator provides following facilities:
+
+\section memory_mapping_mapping_functions Mapping functions
+
+The library provides following functions for mapping of a specific #VmaAllocation: vmaMapMemory(), vmaUnmapMemory().
+They are safer and more convenient to use than standard Vulkan functions.
+You can map an allocation multiple times simultaneously - mapping is reference-counted internally.
+You can also map different allocations simultaneously regardless of whether they use the same `VkDeviceMemory` block.
+The way it's implemented is that the library always maps entire memory block, not just region of the allocation.
+For further details, see description of vmaMapMemory() function.
+Example:
+
+\code
+// Having these objects initialized:
+
+struct ConstantBuffer
+{
+    ...
+};
+ConstantBuffer constantBufferData;
+
+VmaAllocator allocator;
+VkBuffer constantBuffer;
+VmaAllocation constantBufferAllocation;
+
+// You can map and fill your buffer using following code:
+
+void* mappedData;
+vmaMapMemory(allocator, constantBufferAllocation, &mappedData);
+memcpy(mappedData, &constantBufferData, sizeof(constantBufferData));
+vmaUnmapMemory(allocator, constantBufferAllocation);
+\endcode
+
+When mapping, you may see a warning from Vulkan validation layer similar to this one:
+
+<i>Mapping an image with layout VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL can result in undefined behavior if this memory is used by the device. Only GENERAL or PREINITIALIZED should be used.</i>
+
+It happens because the library maps entire `VkDeviceMemory` block, where different
+types of images and buffers may end up together, especially on GPUs with unified memory like Intel.
+You can safely ignore it if you are sure you access only memory of the intended
+object that you wanted to map.
+
+
+\section memory_mapping_persistently_mapped_memory Persistently mapped memory
+
+Kepping your memory persistently mapped is generally OK in Vulkan.
+You don't need to unmap it before using its data on the GPU.
+The library provides a special feature designed for that:
+Allocations made with #VMA_ALLOCATION_CREATE_MAPPED_BIT flag set in
+VmaAllocationCreateInfo::flags stay mapped all the time,
+so you can just access CPU pointer to it any time
+without a need to call any "map" or "unmap" function.
+Example:
+
+\code
+VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+bufCreateInfo.size = sizeof(ConstantBuffer);
+bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.usage = VMA_MEMORY_USAGE_CPU_ONLY;
+allocCreateInfo.flags = VMA_ALLOCATION_CREATE_MAPPED_BIT;
+
+VkBuffer buf;
+VmaAllocation alloc;
+VmaAllocationInfo allocInfo;
+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);
+
+// Buffer is already mapped. You can access its memory.
+memcpy(allocInfo.pMappedData, &constantBufferData, sizeof(constantBufferData));
+\endcode
+
+There are some exceptions though, when you should consider mapping memory only for a short period of time:
+
+- When operating system is Windows 7 or 8.x (Windows 10 is not affected because it uses WDDM2),
+  device is discrete AMD GPU,
+  and memory type is the special 256 MiB pool of `DEVICE_LOCAL + HOST_VISIBLE` memory
+  (selected when you use #VMA_MEMORY_USAGE_CPU_TO_GPU),
+  then whenever a memory block allocated from this memory type stays mapped
+  for the time of any call to `vkQueueSubmit()` or `vkQueuePresentKHR()`, this
+  block is migrated by WDDM to system RAM, which degrades performance. It doesn't
+  matter if that particular memory block is actually used by the command buffer
+  being submitted.
+- On Mac/MoltenVK there is a known bug - [Issue #175](https://github.com/KhronosGroup/MoltenVK/issues/175)
+  which requires unmapping before GPU can see updated texture.
+- Keeping many large memory blocks mapped may impact performance or stability of some debugging tools.
+
+\section memory_mapping_cache_control Cache flush and invalidate
+  
+Memory in Vulkan doesn't need to be unmapped before using it on GPU,
+but unless a memory types has `VK_MEMORY_PROPERTY_HOST_COHERENT_BIT` flag set,
+you need to manually **invalidate** cache before reading of mapped pointer
+and **flush** cache after writing to mapped pointer.
+Map/unmap operations don't do that automatically.
+Vulkan provides following functions for this purpose `vkFlushMappedMemoryRanges()`,
+`vkInvalidateMappedMemoryRanges()`, but this library provides more convenient
+functions that refer to given allocation object: vmaFlushAllocation(),
+vmaInvalidateAllocation().
+
+Regions of memory specified for flush/invalidate must be aligned to
+`VkPhysicalDeviceLimits::nonCoherentAtomSize`. This is automatically ensured by the library.
+In any memory type that is `HOST_VISIBLE` but not `HOST_COHERENT`, all allocations
+within blocks are aligned to this value, so their offsets are always multiply of
+`nonCoherentAtomSize` and two different allocations never share same "line" of this size.
+
+Please note that memory allocated with #VMA_MEMORY_USAGE_CPU_ONLY is guaranteed to be `HOST_COHERENT`.
+
+Also, Windows drivers from all 3 **PC** GPU vendors (AMD, Intel, NVIDIA)
+currently provide `HOST_COHERENT` flag on all memory types that are
+`HOST_VISIBLE`, so on this platform you may not need to bother.
+
+\section memory_mapping_finding_if_memory_mappable Finding out if memory is mappable
+
+It may happen that your allocation ends up in memory that is `HOST_VISIBLE` (available for mapping)
+despite it wasn't explicitly requested.
+For example, application may work on integrated graphics with unified memory (like Intel) or
+allocation from video memory might have failed, so the library chose system memory as fallback.
+
+You can detect this case and map such allocation to access its memory on CPU directly,
+instead of launching a transfer operation.
+In order to do that: inspect `allocInfo.memoryType`, call vmaGetMemoryTypeProperties(),
+and look for `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` flag in properties of that memory type.
+
+\code
+VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+bufCreateInfo.size = sizeof(ConstantBuffer);
+bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+allocCreateInfo.preferredFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+
+VkBuffer buf;
+VmaAllocation alloc;
+VmaAllocationInfo allocInfo;
+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);
+
+VkMemoryPropertyFlags memFlags;
+vmaGetMemoryTypeProperties(allocator, allocInfo.memoryType, &memFlags);
+if((memFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)
+{
+    // Allocation ended up in mappable memory. You can map it and access it directly.
+    void* mappedData;
+    vmaMapMemory(allocator, alloc, &mappedData);
+    memcpy(mappedData, &constantBufferData, sizeof(constantBufferData));
+    vmaUnmapMemory(allocator, alloc);
+}
+else
+{
+    // Allocation ended up in non-mappable memory.
+    // You need to create CPU-side buffer in VMA_MEMORY_USAGE_CPU_ONLY and make a transfer.
+}
+\endcode
+
+You can even use #VMA_ALLOCATION_CREATE_MAPPED_BIT flag while creating allocations
+that are not necessarily `HOST_VISIBLE` (e.g. using #VMA_MEMORY_USAGE_GPU_ONLY).
+If the allocation ends up in memory type that is `HOST_VISIBLE`, it will be persistently mapped and you can use it directly.
+If not, the flag is just ignored.
+Example:
+
+\code
+VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+bufCreateInfo.size = sizeof(ConstantBuffer);
+bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+allocCreateInfo.flags = VMA_ALLOCATION_CREATE_MAPPED_BIT;
+
+VkBuffer buf;
+VmaAllocation alloc;
+VmaAllocationInfo allocInfo;
+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);
+
+if(allocInfo.pUserData != nullptr)
+{
+    // Allocation ended up in mappable memory.
+    // It's persistently mapped. You can access it directly.
+    memcpy(allocInfo.pMappedData, &constantBufferData, sizeof(constantBufferData));
+}
+else
+{
+    // Allocation ended up in non-mappable memory.
+    // You need to create CPU-side buffer in VMA_MEMORY_USAGE_CPU_ONLY and make a transfer.
+}
+\endcode
+
+
+\page staying_within_budget Staying within budget
+
+When developing a graphics-intensive game or program, it is important to avoid allocating
+more GPU memory than it's physically available. When the memory is over-committed,
+various bad things can happen, depending on the specific GPU, graphics driver, and
+operating system:
+
+- It may just work without any problems.
+- The application may slow down because some memory blocks are moved to system RAM
+  and the GPU has to access them through PCI Express bus.
+- A new allocation may take very long time to complete, even few seconds, and possibly
+  freeze entire system.
+- The new allocation may fail with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.
+- It may even result in GPU crash (TDR), observed as `VK_ERROR_DEVICE_LOST`
+  returned somewhere later.
+
+\section staying_within_budget_querying_for_budget Querying for budget
+
+To query for current memory usage and available budget, use function vmaGetBudget().
+Returned structure #VmaBudget contains quantities expressed in bytes, per Vulkan memory heap.
+
+Please note that this function returns different information and works faster than
+vmaCalculateStats(). vmaGetBudget() can be called every frame or even before every
+allocation, while vmaCalculateStats() is intended to be used rarely,
+only to obtain statistical information, e.g. for debugging purposes.
+
+It is recommended to use <b>VK_EXT_memory_budget</b> device extension to obtain information
+about the budget from Vulkan device. VMA is able to use this extension automatically.
+When not enabled, the allocator behaves same way, but then it estimates current usage
+and available budget based on its internal information and Vulkan memory heap sizes,
+which may be less precise. In order to use this extension:
+
+1. Make sure extensions VK_EXT_memory_budget and VK_KHR_get_physical_device_properties2
+   required by it are available and enable them. Please note that the first is a device
+   extension and the second is instance extension!
+2. Use flag #VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT when creating #VmaAllocator object.
+3. Make sure to call vmaSetCurrentFrameIndex() every frame. Budget is queried from
+   Vulkan inside of it to avoid overhead of querying it with every allocation.
+
+\section staying_within_budget_controlling_memory_usage Controlling memory usage
+
+There are many ways in which you can try to stay within the budget.
+
+First, when making new allocation requires allocating a new memory block, the library
+tries not to exceed the budget automatically. If a block with default recommended size
+(e.g. 256 MB) would go over budget, a smaller block is allocated, possibly even
+dedicated memory for just this resource.
+
+If the size of the requested resource plus current memory usage is more than the
+budget, by default the library still tries to create it, leaving it to the Vulkan
+implementation whether the allocation succeeds or fails. You can change this behavior
+by using #VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT flag. With it, the allocation is
+not made if it would exceed the budget or if the budget is already exceeded.
+Some other allocations become lost instead to make room for it, if the mechanism of
+[lost allocations](@ref lost_allocations) is used.
+If that is not possible, the allocation fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.
+Example usage pattern may be to pass the #VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT flag
+when creating resources that are not essential for the application (e.g. the texture
+of a specific object) and not to pass it when creating critically important resources
+(e.g. render targets).
+
+Finally, you can also use #VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT flag to make sure
+a new allocation is created only when it fits inside one of the existing memory blocks.
+If it would require to allocate a new block, if fails instead with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.
+This also ensures that the function call is very fast because it never goes to Vulkan
+to obtain a new block.
+
+Please note that creating \ref custom_memory_pools with VmaPoolCreateInfo::minBlockCount
+set to more than 0 will try to allocate memory blocks without checking whether they
+fit within budget.
+
+
+\page custom_memory_pools Custom memory pools
+
+A memory pool contains a number of `VkDeviceMemory` blocks.
+The library automatically creates and manages default pool for each memory type available on the device.
+Default memory pool automatically grows in size.
+Size of allocated blocks is also variable and managed automatically.
+
+You can create custom pool and allocate memory out of it.
+It can be useful if you want to:
+
+- Keep certain kind of allocations separate from others.
+- Enforce particular, fixed size of Vulkan memory blocks.
+- Limit maximum amount of Vulkan memory allocated for that pool.
+- Reserve minimum or fixed amount of Vulkan memory always preallocated for that pool.
+
+To use custom memory pools:
+
+-# Fill VmaPoolCreateInfo structure.
+-# Call vmaCreatePool() to obtain #VmaPool handle.
+-# When making an allocation, set VmaAllocationCreateInfo::pool to this handle.
+   You don't need to specify any other parameters of this structure, like `usage`.
+
+Example:
+
+\code
+// Create a pool that can have at most 2 blocks, 128 MiB each.
+VmaPoolCreateInfo poolCreateInfo = {};
+poolCreateInfo.memoryTypeIndex = ...
+poolCreateInfo.blockSize = 128ull * 1024 * 1024;
+poolCreateInfo.maxBlockCount = 2;
+
+VmaPool pool;
+vmaCreatePool(allocator, &poolCreateInfo, &pool);
+
+// Allocate a buffer out of it.
+VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+bufCreateInfo.size = 1024;
+bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.pool = pool;
+
+VkBuffer buf;
+VmaAllocation alloc;
+VmaAllocationInfo allocInfo;
+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);
+\endcode
+
+You have to free all allocations made from this pool before destroying it.
+
+\code
+vmaDestroyBuffer(allocator, buf, alloc);
+vmaDestroyPool(allocator, pool);
+\endcode
+
+\section custom_memory_pools_MemTypeIndex Choosing memory type index
+
+When creating a pool, you must explicitly specify memory type index.
+To find the one suitable for your buffers or images, you can use helper functions
+vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo().
+You need to provide structures with example parameters of buffers or images
+that you are going to create in that pool.
+
+\code
+VkBufferCreateInfo exampleBufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+exampleBufCreateInfo.size = 1024; // Whatever.
+exampleBufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; // Change if needed.
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY; // Change if needed.
+
+uint32_t memTypeIndex;
+vmaFindMemoryTypeIndexForBufferInfo(allocator, &exampleBufCreateInfo, &allocCreateInfo, &memTypeIndex);
+
+VmaPoolCreateInfo poolCreateInfo = {};
+poolCreateInfo.memoryTypeIndex = memTypeIndex;
+// ...
+\endcode
+
+When creating buffers/images allocated in that pool, provide following parameters:
+
+- `VkBufferCreateInfo`: Prefer to pass same parameters as above.
+  Otherwise you risk creating resources in a memory type that is not suitable for them, which may result in undefined behavior.
+  Using different `VK_BUFFER_USAGE_` flags may work, but you shouldn't create images in a pool intended for buffers
+  or the other way around.
+- VmaAllocationCreateInfo: You don't need to pass same parameters. Fill only `pool` member.
+  Other members are ignored anyway.
+
+\section linear_algorithm Linear allocation algorithm
+
+Each Vulkan memory block managed by this library has accompanying metadata that
+keeps track of used and unused regions. By default, the metadata structure and
+algorithm tries to find best place for new allocations among free regions to
+optimize memory usage. This way you can allocate and free objects in any order.
+
+![Default allocation algorithm](../gfx/Linear_allocator_1_algo_default.png)
+
+Sometimes there is a need to use simpler, linear allocation algorithm. You can
+create custom pool that uses such algorithm by adding flag
+#VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT to VmaPoolCreateInfo::flags while creating
+#VmaPool object. Then an alternative metadata management is used. It always
+creates new allocations after last one and doesn't reuse free regions after
+allocations freed in the middle. It results in better allocation performance and
+less memory consumed by metadata.
+
+![Linear allocation algorithm](../gfx/Linear_allocator_2_algo_linear.png)
+
+With this one flag, you can create a custom pool that can be used in many ways:
+free-at-once, stack, double stack, and ring buffer. See below for details.
+
+\subsection linear_algorithm_free_at_once Free-at-once
+
+In a pool that uses linear algorithm, you still need to free all the allocations
+individually, e.g. by using vmaFreeMemory() or vmaDestroyBuffer(). You can free
+them in any order. New allocations are always made after last one - free space
+in the middle is not reused. However, when you release all the allocation and
+the pool becomes empty, allocation starts from the beginning again. This way you
+can use linear algorithm to speed up creation of allocations that you are going
+to release all at once.
+
+![Free-at-once](../gfx/Linear_allocator_3_free_at_once.png)
+
+This mode is also available for pools created with VmaPoolCreateInfo::maxBlockCount
+value that allows multiple memory blocks.
+
+\subsection linear_algorithm_stack Stack
+
+When you free an allocation that was created last, its space can be reused.
+Thanks to this, if you always release allocations in the order opposite to their
+creation (LIFO - Last In First Out), you can achieve behavior of a stack.
+
+![Stack](../gfx/Linear_allocator_4_stack.png)
+
+This mode is also available for pools created with VmaPoolCreateInfo::maxBlockCount
+value that allows multiple memory blocks.
+
+\subsection linear_algorithm_double_stack Double stack
+
+The space reserved by a custom pool with linear algorithm may be used by two
+stacks:
+
+- First, default one, growing up from offset 0.
+- Second, "upper" one, growing down from the end towards lower offsets.
+
+To make allocation from upper stack, add flag #VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT
+to VmaAllocationCreateInfo::flags.
+
+![Double stack](../gfx/Linear_allocator_7_double_stack.png)
+
+Double stack is available only in pools with one memory block -
+VmaPoolCreateInfo::maxBlockCount must be 1. Otherwise behavior is undefined.
+
+When the two stacks' ends meet so there is not enough space between them for a
+new allocation, such allocation fails with usual
+`VK_ERROR_OUT_OF_DEVICE_MEMORY` error.
+
+\subsection linear_algorithm_ring_buffer Ring buffer
+
+When you free some allocations from the beginning and there is not enough free space
+for a new one at the end of a pool, allocator's "cursor" wraps around to the
+beginning and starts allocation there. Thanks to this, if you always release
+allocations in the same order as you created them (FIFO - First In First Out),
+you can achieve behavior of a ring buffer / queue.
+
+![Ring buffer](../gfx/Linear_allocator_5_ring_buffer.png)
+
+Pools with linear algorithm support [lost allocations](@ref lost_allocations) when used as ring buffer.
+If there is not enough free space for a new allocation, but existing allocations
+from the front of the queue can become lost, they become lost and the allocation
+succeeds.
+
+![Ring buffer with lost allocations](../gfx/Linear_allocator_6_ring_buffer_lost.png)
+
+Ring buffer is available only in pools with one memory block -
+VmaPoolCreateInfo::maxBlockCount must be 1. Otherwise behavior is undefined.
+
+\section buddy_algorithm Buddy allocation algorithm
+
+There is another allocation algorithm that can be used with custom pools, called
+"buddy". Its internal data structure is based on a tree of blocks, each having
+size that is a power of two and a half of its parent's size. When you want to
+allocate memory of certain size, a free node in the tree is located. If it's too
+large, it is recursively split into two halves (called "buddies"). However, if
+requested allocation size is not a power of two, the size of a tree node is
+aligned up to the nearest power of two and the remaining space is wasted. When
+two buddy nodes become free, they are merged back into one larger node.
+
+![Buddy allocator](../gfx/Buddy_allocator.png)
+
+The advantage of buddy allocation algorithm over default algorithm is faster
+allocation and deallocation, as well as smaller external fragmentation. The
+disadvantage is more wasted space (internal fragmentation).
+
+For more information, please read ["Buddy memory allocation" on Wikipedia](https://en.wikipedia.org/wiki/Buddy_memory_allocation)
+or other sources that describe this concept in general.
+
+To use buddy allocation algorithm with a custom pool, add flag
+#VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT to VmaPoolCreateInfo::flags while creating
+#VmaPool object.
+
+Several limitations apply to pools that use buddy algorithm:
+
+- It is recommended to use VmaPoolCreateInfo::blockSize that is a power of two.
+  Otherwise, only largest power of two smaller than the size is used for
+  allocations. The remaining space always stays unused.
+- [Margins](@ref debugging_memory_usage_margins) and
+  [corruption detection](@ref debugging_memory_usage_corruption_detection)
+  don't work in such pools.
+- [Lost allocations](@ref lost_allocations) don't work in such pools. You can
+  use them, but they never become lost. Support may be added in the future.
+- [Defragmentation](@ref defragmentation) doesn't work with allocations made from
+  such pool.
+
+\page defragmentation Defragmentation
+
+Interleaved allocations and deallocations of many objects of varying size can
+cause fragmentation over time, which can lead to a situation where the library is unable
+to find a continuous range of free memory for a new allocation despite there is
+enough free space, just scattered across many small free ranges between existing
+allocations.
+
+To mitigate this problem, you can use defragmentation feature:
+structure #VmaDefragmentationInfo2, function vmaDefragmentationBegin(), vmaDefragmentationEnd().
+Given set of allocations, 
+this function can move them to compact used memory, ensure more continuous free
+space and possibly also free some `VkDeviceMemory` blocks.
+
+What the defragmentation does is:
+
+- Updates #VmaAllocation objects to point to new `VkDeviceMemory` and offset.
+  After allocation has been moved, its VmaAllocationInfo::deviceMemory and/or
+  VmaAllocationInfo::offset changes. You must query them again using
+  vmaGetAllocationInfo() if you need them.
+- Moves actual data in memory.
+
+What it doesn't do, so you need to do it yourself:
+
+- Recreate buffers and images that were bound to allocations that were defragmented and
+  bind them with their new places in memory.
+  You must use `vkDestroyBuffer()`, `vkDestroyImage()`,
+  `vkCreateBuffer()`, `vkCreateImage()`, vmaBindBufferMemory(), vmaBindImageMemory()
+  for that purpose and NOT vmaDestroyBuffer(),
+  vmaDestroyImage(), vmaCreateBuffer(), vmaCreateImage(), because you don't need to
+  destroy or create allocation objects!
+- Recreate views and update descriptors that point to these buffers and images.
+
+\section defragmentation_cpu Defragmenting CPU memory
+
+Following example demonstrates how you can run defragmentation on CPU.
+Only allocations created in memory types that are `HOST_VISIBLE` can be defragmented.
+Others are ignored.
+
+The way it works is:
+
+- It temporarily maps entire memory blocks when necessary.
+- It moves data using `memmove()` function.
+
+\code
+// Given following variables already initialized:
+VkDevice device;
+VmaAllocator allocator;
+std::vector<VkBuffer> buffers;
+std::vector<VmaAllocation> allocations;
+
+
+const uint32_t allocCount = (uint32_t)allocations.size();
+std::vector<VkBool32> allocationsChanged(allocCount);
+
+VmaDefragmentationInfo2 defragInfo = {};
+defragInfo.allocationCount = allocCount;
+defragInfo.pAllocations = allocations.data();
+defragInfo.pAllocationsChanged = allocationsChanged.data();
+defragInfo.maxCpuBytesToMove = VK_WHOLE_SIZE; // No limit.
+defragInfo.maxCpuAllocationsToMove = UINT32_MAX; // No limit.
+
+VmaDefragmentationContext defragCtx;
+vmaDefragmentationBegin(allocator, &defragInfo, nullptr, &defragCtx);
+vmaDefragmentationEnd(allocator, defragCtx);
+
+for(uint32_t i = 0; i < allocCount; ++i)
+{
+    if(allocationsChanged[i])
+    {
+        // Destroy buffer that is immutably bound to memory region which is no longer valid.
+        vkDestroyBuffer(device, buffers[i], nullptr);
+
+        // Create new buffer with same parameters.
+        VkBufferCreateInfo bufferInfo = ...;
+        vkCreateBuffer(device, &bufferInfo, nullptr, &buffers[i]);
+            
+        // You can make dummy call to vkGetBufferMemoryRequirements here to silence validation layer warning.
+            
+        // Bind new buffer to new memory region. Data contained in it is already moved.
+        VmaAllocationInfo allocInfo;
+        vmaGetAllocationInfo(allocator, allocations[i], &allocInfo);
+        vmaBindBufferMemory(allocator, allocations[i], buffers[i]);
+    }
+}
+\endcode
+
+Setting VmaDefragmentationInfo2::pAllocationsChanged is optional.
+This output array tells whether particular allocation in VmaDefragmentationInfo2::pAllocations at the same index
+has been modified during defragmentation.
+You can pass null, but you then need to query every allocation passed to defragmentation
+for new parameters using vmaGetAllocationInfo() if you might need to recreate and rebind a buffer or image associated with it.
+
+If you use [Custom memory pools](@ref choosing_memory_type_custom_memory_pools),
+you can fill VmaDefragmentationInfo2::poolCount and VmaDefragmentationInfo2::pPools
+instead of VmaDefragmentationInfo2::allocationCount and VmaDefragmentationInfo2::pAllocations
+to defragment all allocations in given pools.
+You cannot use VmaDefragmentationInfo2::pAllocationsChanged in that case.
+You can also combine both methods.
+
+\section defragmentation_gpu Defragmenting GPU memory
+
+It is also possible to defragment allocations created in memory types that are not `HOST_VISIBLE`.
+To do that, you need to pass a command buffer that meets requirements as described in
+VmaDefragmentationInfo2::commandBuffer. The way it works is:
+
+- It creates temporary buffers and binds them to entire memory blocks when necessary.
+- It issues `vkCmdCopyBuffer()` to passed command buffer.
+
+Example:
+
+\code
+// Given following variables already initialized:
+VkDevice device;
+VmaAllocator allocator;
+VkCommandBuffer commandBuffer;
+std::vector<VkBuffer> buffers;
+std::vector<VmaAllocation> allocations;
+
+
+const uint32_t allocCount = (uint32_t)allocations.size();
+std::vector<VkBool32> allocationsChanged(allocCount);
+
+VkCommandBufferBeginInfo cmdBufBeginInfo = ...;
+vkBeginCommandBuffer(commandBuffer, &cmdBufBeginInfo);
+
+VmaDefragmentationInfo2 defragInfo = {};
+defragInfo.allocationCount = allocCount;
+defragInfo.pAllocations = allocations.data();
+defragInfo.pAllocationsChanged = allocationsChanged.data();
+defragInfo.maxGpuBytesToMove = VK_WHOLE_SIZE; // Notice it's "GPU" this time.
+defragInfo.maxGpuAllocationsToMove = UINT32_MAX; // Notice it's "GPU" this time.
+defragInfo.commandBuffer = commandBuffer;
+
+VmaDefragmentationContext defragCtx;
+vmaDefragmentationBegin(allocator, &defragInfo, nullptr, &defragCtx);
+
+vkEndCommandBuffer(commandBuffer);
+
+// Submit commandBuffer.
+// Wait for a fence that ensures commandBuffer execution finished.
+
+vmaDefragmentationEnd(allocator, defragCtx);
+
+for(uint32_t i = 0; i < allocCount; ++i)
+{
+    if(allocationsChanged[i])
+    {
+        // Destroy buffer that is immutably bound to memory region which is no longer valid.
+        vkDestroyBuffer(device, buffers[i], nullptr);
+
+        // Create new buffer with same parameters.
+        VkBufferCreateInfo bufferInfo = ...;
+        vkCreateBuffer(device, &bufferInfo, nullptr, &buffers[i]);
+            
+        // You can make dummy call to vkGetBufferMemoryRequirements here to silence validation layer warning.
+            
+        // Bind new buffer to new memory region. Data contained in it is already moved.
+        VmaAllocationInfo allocInfo;
+        vmaGetAllocationInfo(allocator, allocations[i], &allocInfo);
+        vmaBindBufferMemory(allocator, allocations[i], buffers[i]);
+    }
+}
+\endcode
+
+You can combine these two methods by specifying non-zero `maxGpu*` as well as `maxCpu*` parameters.
+The library automatically chooses best method to defragment each memory pool.
+
+You may try not to block your entire program to wait until defragmentation finishes,
+but do it in the background, as long as you carefully fullfill requirements described
+in function vmaDefragmentationBegin().
+
+\section defragmentation_additional_notes Additional notes
+
+It is only legal to defragment allocations bound to:
+
+- buffers
+- images created with `VK_IMAGE_CREATE_ALIAS_BIT`, `VK_IMAGE_TILING_LINEAR`, and
+  being currently in `VK_IMAGE_LAYOUT_GENERAL` or `VK_IMAGE_LAYOUT_PREINITIALIZED`.
+
+Defragmentation of images created with `VK_IMAGE_TILING_OPTIMAL` or in any other
+layout may give undefined results.
+
+If you defragment allocations bound to images, new images to be bound to new
+memory region after defragmentation should be created with `VK_IMAGE_LAYOUT_PREINITIALIZED`
+and then transitioned to their original layout from before defragmentation if
+needed using an image memory barrier.
+
+While using defragmentation, you may experience validation layer warnings, which you just need to ignore.
+See [Validation layer warnings](@ref general_considerations_validation_layer_warnings).
+
+Please don't expect memory to be fully compacted after defragmentation.
+Algorithms inside are based on some heuristics that try to maximize number of Vulkan
+memory blocks to make totally empty to release them, as well as to maximimze continuous
+empty space inside remaining blocks, while minimizing the number and size of allocations that
+need to be moved. Some fragmentation may still remain - this is normal.
+
+\section defragmentation_custom_algorithm Writing custom defragmentation algorithm
+
+If you want to implement your own, custom defragmentation algorithm,
+there is infrastructure prepared for that,
+but it is not exposed through the library API - you need to hack its source code.
+Here are steps needed to do this:
+
+-# Main thing you need to do is to define your own class derived from base abstract
+   class `VmaDefragmentationAlgorithm` and implement your version of its pure virtual methods.
+   See definition and comments of this class for details.
+-# Your code needs to interact with device memory block metadata.
+   If you need more access to its data than it's provided by its public interface,
+   declare your new class as a friend class e.g. in class `VmaBlockMetadata_Generic`.
+-# If you want to create a flag that would enable your algorithm or pass some additional
+   flags to configure it, add them to `VmaDefragmentationFlagBits` and use them in
+   VmaDefragmentationInfo2::flags.
+-# Modify function `VmaBlockVectorDefragmentationContext::Begin` to create object
+   of your new class whenever needed.
+
+
+\page lost_allocations Lost allocations
+
+If your game oversubscribes video memory, if may work OK in previous-generation
+graphics APIs (DirectX 9, 10, 11, OpenGL) because resources are automatically
+paged to system RAM. In Vulkan you can't do it because when you run out of
+memory, an allocation just fails. If you have more data (e.g. textures) that can
+fit into VRAM and you don't need it all at once, you may want to upload them to
+GPU on demand and "push out" ones that are not used for a long time to make room
+for the new ones, effectively using VRAM (or a cartain memory pool) as a form of
+cache. Vulkan Memory Allocator can help you with that by supporting a concept of
+"lost allocations".
+
+To create an allocation that can become lost, include #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT
+flag in VmaAllocationCreateInfo::flags. Before using a buffer or image bound to
+such allocation in every new frame, you need to query it if it's not lost.
+To check it, call vmaTouchAllocation().
+If the allocation is lost, you should not use it or buffer/image bound to it.
+You mustn't forget to destroy this allocation and this buffer/image.
+vmaGetAllocationInfo() can also be used for checking status of the allocation.
+Allocation is lost when returned VmaAllocationInfo::deviceMemory == `VK_NULL_HANDLE`.
+
+To create an allocation that can make some other allocations lost to make room
+for it, use #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT flag. You will
+usually use both flags #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT and
+#VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT at the same time.
+
+Warning! Current implementation uses quite naive, brute force algorithm,
+which can make allocation calls that use #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT
+flag quite slow. A new, more optimal algorithm and data structure to speed this
+up is planned for the future.
+
+<b>Q: When interleaving creation of new allocations with usage of existing ones,
+how do you make sure that an allocation won't become lost while it's used in the
+current frame?</b>
+
+It is ensured because vmaTouchAllocation() / vmaGetAllocationInfo() not only returns allocation
+status/parameters and checks whether it's not lost, but when it's not, it also
+atomically marks it as used in the current frame, which makes it impossible to
+become lost in that frame. It uses lockless algorithm, so it works fast and
+doesn't involve locking any internal mutex.
+
+<b>Q: What if my allocation may still be in use by the GPU when it's rendering a
+previous frame while I already submit new frame on the CPU?</b>
+
+You can make sure that allocations "touched" by vmaTouchAllocation() / vmaGetAllocationInfo() will not
+become lost for a number of additional frames back from the current one by
+specifying this number as VmaAllocatorCreateInfo::frameInUseCount (for default
+memory pool) and VmaPoolCreateInfo::frameInUseCount (for custom pool).
+
+<b>Q: How do you inform the library when new frame starts?</b>
+
+You need to call function vmaSetCurrentFrameIndex().
+
+Example code:
+
+\code
+struct MyBuffer
+{
+    VkBuffer m_Buf = nullptr;
+    VmaAllocation m_Alloc = nullptr;
+
+    // Called when the buffer is really needed in the current frame.
+    void EnsureBuffer();
+};
+
+void MyBuffer::EnsureBuffer()
+{
+    // Buffer has been created.
+    if(m_Buf != VK_NULL_HANDLE)
+    {
+        // Check if its allocation is not lost + mark it as used in current frame.
+        if(vmaTouchAllocation(allocator, m_Alloc))
+        {
+            // It's all OK - safe to use m_Buf.
+            return;
+        }
+    }
+
+    // Buffer not yet exists or lost - destroy and recreate it.
+
+    vmaDestroyBuffer(allocator, m_Buf, m_Alloc);
+
+    VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+    bufCreateInfo.size = 1024;
+    bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+
+    VmaAllocationCreateInfo allocCreateInfo = {};
+    allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+    allocCreateInfo.flags = VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT |
+        VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT;
+
+    vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &m_Buf, &m_Alloc, nullptr);
+}
+\endcode
+
+When using lost allocations, you may see some Vulkan validation layer warnings
+about overlapping regions of memory bound to different kinds of buffers and
+images. This is still valid as long as you implement proper handling of lost
+allocations (like in the example above) and don't use them.
+
+You can create an allocation that is already in lost state from the beginning using function
+vmaCreateLostAllocation(). It may be useful if you need a "dummy" allocation that is not null.
+
+You can call function vmaMakePoolAllocationsLost() to set all eligible allocations
+in a specified custom pool to lost state.
+Allocations that have been "touched" in current frame or VmaPoolCreateInfo::frameInUseCount frames back
+cannot become lost.
+
+<b>Q: Can I touch allocation that cannot become lost?</b>
+
+Yes, although it has no visible effect.
+Calls to vmaGetAllocationInfo() and vmaTouchAllocation() update last use frame index
+also for allocations that cannot become lost, but the only way to observe it is to dump
+internal allocator state using vmaBuildStatsString().
+You can use this feature for debugging purposes to explicitly mark allocations that you use
+in current frame and then analyze JSON dump to see for how long each allocation stays unused.
+
+
+\page statistics Statistics
+
+This library contains functions that return information about its internal state,
+especially the amount of memory allocated from Vulkan.
+Please keep in mind that these functions need to traverse all internal data structures
+to gather these information, so they may be quite time-consuming.
+Don't call them too often.
+
+\section statistics_numeric_statistics Numeric statistics
+
+You can query for overall statistics of the allocator using function vmaCalculateStats().
+Information are returned using structure #VmaStats.
+It contains #VmaStatInfo - number of allocated blocks, number of allocations
+(occupied ranges in these blocks), number of unused (free) ranges in these blocks,
+number of bytes used and unused (but still allocated from Vulkan) and other information.
+They are summed across memory heaps, memory types and total for whole allocator.
+
+You can query for statistics of a custom pool using function vmaGetPoolStats().
+Information are returned using structure #VmaPoolStats.
+
+You can query for information about specific allocation using function vmaGetAllocationInfo().
+It fill structure #VmaAllocationInfo.
+
+\section statistics_json_dump JSON dump
+
+You can dump internal state of the allocator to a string in JSON format using function vmaBuildStatsString().
+The result is guaranteed to be correct JSON.
+It uses ANSI encoding.
+Any strings provided by user (see [Allocation names](@ref allocation_names))
+are copied as-is and properly escaped for JSON, so if they use UTF-8, ISO-8859-2 or any other encoding,
+this JSON string can be treated as using this encoding.
+It must be freed using function vmaFreeStatsString().
+
+The format of this JSON string is not part of official documentation of the library,
+but it will not change in backward-incompatible way without increasing library major version number
+and appropriate mention in changelog.
+
+The JSON string contains all the data that can be obtained using vmaCalculateStats().
+It can also contain detailed map of allocated memory blocks and their regions -
+free and occupied by allocations.
+This allows e.g. to visualize the memory or assess fragmentation.
+
+
+\page allocation_annotation Allocation names and user data
+
+\section allocation_user_data Allocation user data
+
+You can annotate allocations with your own information, e.g. for debugging purposes.
+To do that, fill VmaAllocationCreateInfo::pUserData field when creating
+an allocation. It's an opaque `void*` pointer. You can use it e.g. as a pointer,
+some handle, index, key, ordinal number or any other value that would associate
+the allocation with your custom metadata.
+
+\code
+VkBufferCreateInfo bufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+// Fill bufferInfo...
+
+MyBufferMetadata* pMetadata = CreateBufferMetadata();
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+allocCreateInfo.pUserData = pMetadata;
+
+VkBuffer buffer;
+VmaAllocation allocation;
+vmaCreateBuffer(allocator, &bufferInfo, &allocCreateInfo, &buffer, &allocation, nullptr);
+\endcode
+
+The pointer may be later retrieved as VmaAllocationInfo::pUserData:
+
+\code
+VmaAllocationInfo allocInfo;
+vmaGetAllocationInfo(allocator, allocation, &allocInfo);
+MyBufferMetadata* pMetadata = (MyBufferMetadata*)allocInfo.pUserData;
+\endcode
+
+It can also be changed using function vmaSetAllocationUserData().
+
+Values of (non-zero) allocations' `pUserData` are printed in JSON report created by
+vmaBuildStatsString(), in hexadecimal form.
+
+\section allocation_names Allocation names
+
+There is alternative mode available where `pUserData` pointer is used to point to
+a null-terminated string, giving a name to the allocation. To use this mode,
+set #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT flag in VmaAllocationCreateInfo::flags.
+Then `pUserData` passed as VmaAllocationCreateInfo::pUserData or argument to
+vmaSetAllocationUserData() must be either null or pointer to a null-terminated string.
+The library creates internal copy of the string, so the pointer you pass doesn't need
+to be valid for whole lifetime of the allocation. You can free it after the call.
+
+\code
+VkImageCreateInfo imageInfo = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO };
+// Fill imageInfo...
+
+std::string imageName = "Texture: ";
+imageName += fileName;
+
+VmaAllocationCreateInfo allocCreateInfo = {};
+allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
+allocCreateInfo.flags = VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT;
+allocCreateInfo.pUserData = imageName.c_str();
+
+VkImage image;
+VmaAllocation allocation;
+vmaCreateImage(allocator, &imageInfo, &allocCreateInfo, &image, &allocation, nullptr);
+\endcode
+
+The value of `pUserData` pointer of the allocation will be different than the one
+you passed when setting allocation's name - pointing to a buffer managed
+internally that holds copy of the string.
+
+\code
+VmaAllocationInfo allocInfo;
+vmaGetAllocationInfo(allocator, allocation, &allocInfo);
+const char* imageName = (const char*)allocInfo.pUserData;
+printf("Image name: %s\n", imageName);
+\endcode
+
+That string is also printed in JSON report created by vmaBuildStatsString().
+
+\note Passing string name to VMA allocation doesn't automatically set it to the Vulkan buffer or image created with it.
+You must do it manually using an extension like VK_EXT_debug_utils, which is independent of this library.
+
+
+\page debugging_memory_usage Debugging incorrect memory usage
+
+If you suspect a bug with memory usage, like usage of uninitialized memory or
+memory being overwritten out of bounds of an allocation,
+you can use debug features of this library to verify this.
+
+\section debugging_memory_usage_initialization Memory initialization
+
+If you experience a bug with incorrect and nondeterministic data in your program and you suspect uninitialized memory to be used,
+you can enable automatic memory initialization to verify this.
+To do it, define macro `VMA_DEBUG_INITIALIZE_ALLOCATIONS` to 1.
+
+\code
+#define VMA_DEBUG_INITIALIZE_ALLOCATIONS 1
+#include "vk_mem_alloc.h"
+\endcode
+
+It makes memory of all new allocations initialized to bit pattern `0xDCDCDCDC`.
+Before an allocation is destroyed, its memory is filled with bit pattern `0xEFEFEFEF`.
+Memory is automatically mapped and unmapped if necessary.
+
+If you find these values while debugging your program, good chances are that you incorrectly
+read Vulkan memory that is allocated but not initialized, or already freed, respectively.
+
+Memory initialization works only with memory types that are `HOST_VISIBLE`.
+It works also with dedicated allocations.
+It doesn't work with allocations created with #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag,
+as they cannot be mapped.
+
+\section debugging_memory_usage_margins Margins
+
+By default, allocations are laid out in memory blocks next to each other if possible
+(considering required alignment, `bufferImageGranularity`, and `nonCoherentAtomSize`).
+
+![Allocations without margin](../gfx/Margins_1.png)
+
+Define macro `VMA_DEBUG_MARGIN` to some non-zero value (e.g. 16) to enforce specified
+number of bytes as a margin before and after every allocation.
+
+\code
+#define VMA_DEBUG_MARGIN 16
+#include "vk_mem_alloc.h"
+\endcode
+
+![Allocations with margin](../gfx/Margins_2.png)
+
+If your bug goes away after enabling margins, it means it may be caused by memory
+being overwritten outside of allocation boundaries. It is not 100% certain though.
+Change in application behavior may also be caused by different order and distribution
+of allocations across memory blocks after margins are applied.
+
+The margin is applied also before first and after last allocation in a block.
+It may occur only once between two adjacent allocations.
+
+Margins work with all types of memory.
+
+Margin is applied only to allocations made out of memory blocks and not to dedicated
+allocations, which have their own memory block of specific size.
+It is thus not applied to allocations made using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT flag
+or those automatically decided to put into dedicated allocations, e.g. due to its
+large size or recommended by VK_KHR_dedicated_allocation extension.
+Margins are also not active in custom pools created with #VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT flag.
+
+Margins appear in [JSON dump](@ref statistics_json_dump) as part of free space.
+
+Note that enabling margins increases memory usage and fragmentation.
+
+\section debugging_memory_usage_corruption_detection Corruption detection
+
+You can additionally define macro `VMA_DEBUG_DETECT_CORRUPTION` to 1 to enable validation
+of contents of the margins.
+
+\code
+#define VMA_DEBUG_MARGIN 16
+#define VMA_DEBUG_DETECT_CORRUPTION 1
+#include "vk_mem_alloc.h"
+\endcode
+
+When this feature is enabled, number of bytes specified as `VMA_DEBUG_MARGIN`
+(it must be multiply of 4) before and after every allocation is filled with a magic number.
+This idea is also know as "canary".
+Memory is automatically mapped and unmapped if necessary.
+
+This number is validated automatically when the allocation is destroyed.
+If it's not equal to the expected value, `VMA_ASSERT()` is executed.
+It clearly means that either CPU or GPU overwritten the memory outside of boundaries of the allocation,
+which indicates a serious bug.
+
+You can also explicitly request checking margins of all allocations in all memory blocks
+that belong to specified memory types by using function vmaCheckCorruption(),
+or in memory blocks that belong to specified custom pool, by using function 
+vmaCheckPoolCorruption().
+
+Margin validation (corruption detection) works only for memory types that are
+`HOST_VISIBLE` and `HOST_COHERENT`.
+
+
+\page record_and_replay Record and replay
+
+\section record_and_replay_introduction Introduction
+
+While using the library, sequence of calls to its functions together with their
+parameters can be recorded to a file and later replayed using standalone player
+application. It can be useful to:
+
+- Test correctness - check if same sequence of calls will not cause crash or
+  failures on a target platform.
+- Gather statistics - see number of allocations, peak memory usage, number of
+  calls etc.
+- Benchmark performance - see how much time it takes to replay the whole
+  sequence.
+
+\section record_and_replay_usage Usage
+
+Recording functionality is disabled by default.
+To enable it, define following macro before every include of this library:
+
+\code
+#define VMA_RECORDING_ENABLED 1
+\endcode
+
+<b>To record sequence of calls to a file:</b> Fill in
+VmaAllocatorCreateInfo::pRecordSettings member while creating #VmaAllocator
+object. File is opened and written during whole lifetime of the allocator.
+
+<b>To replay file:</b> Use VmaReplay - standalone command-line program.
+Precompiled binary can be found in "bin" directory.
+Its source can be found in "src/VmaReplay" directory.
+Its project is generated by Premake.
+Command line syntax is printed when the program is launched without parameters.
+Basic usage:
+
+    VmaReplay.exe MyRecording.csv
+
+<b>Documentation of file format</b> can be found in file: "docs/Recording file format.md".
+It's a human-readable, text file in CSV format (Comma Separated Values).
+
+\section record_and_replay_additional_considerations Additional considerations
+
+- Replaying file that was recorded on a different GPU (with different parameters
+  like `bufferImageGranularity`, `nonCoherentAtomSize`, and especially different
+  set of memory heaps and types) may give different performance and memory usage
+  results, as well as issue some warnings and errors.
+- Current implementation of recording in VMA, as well as VmaReplay application, is
+  coded and tested only on Windows. Inclusion of recording code is driven by
+  `VMA_RECORDING_ENABLED` macro. Support for other platforms should be easy to
+  add. Contributions are welcomed.
+
+
+\page usage_patterns Recommended usage patterns
+
+See also slides from talk:
+[Sawicki, Adam. Advanced Graphics Techniques Tutorial: Memory management in Vulkan and DX12. Game Developers Conference, 2018](https://www.gdcvault.com/play/1025458/Advanced-Graphics-Techniques-Tutorial-New)
+
+
+\section usage_patterns_common_mistakes Common mistakes
+
+<b>Use of CPU_TO_GPU instead of CPU_ONLY memory</b>
+
+#VMA_MEMORY_USAGE_CPU_TO_GPU is recommended only for resources that will be
+mapped and written by the CPU, as well as read directly by the GPU - like some
+buffers or textures updated every frame (dynamic). If you create a staging copy
+of a resource to be written by CPU and then used as a source of transfer to
+another resource placed in the GPU memory, that staging resource should be
+created with #VMA_MEMORY_USAGE_CPU_ONLY. Please read the descriptions of these
+enums carefully for details.
+
+<b>Unnecessary use of custom pools</b>
+
+\ref custom_memory_pools may be useful for special purposes - when you want to
+keep certain type of resources separate e.g. to reserve minimum amount of memory
+for them, limit maximum amount of memory they can occupy, or make some of them
+push out the other through the mechanism of \ref lost_allocations. For most
+resources this is not needed and so it is not recommended to create #VmaPool
+objects and allocations out of them. Allocating from the default pool is sufficient.
+
+\section usage_patterns_simple Simple patterns
+
+\subsection usage_patterns_simple_render_targets Render targets
+
+<b>When:</b>
+Any resources that you frequently write and read on GPU,
+e.g. images used as color attachments (aka "render targets"), depth-stencil attachments,
+images/buffers used as storage image/buffer (aka "Unordered Access View (UAV)").
+
+<b>What to do:</b>
+Create them in video memory that is fastest to access from GPU using
+#VMA_MEMORY_USAGE_GPU_ONLY.
+
+Consider using [VK_KHR_dedicated_allocation](@ref vk_khr_dedicated_allocation) extension
+and/or manually creating them as dedicated allocations using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT,
+especially if they are large or if you plan to destroy and recreate them e.g. when
+display resolution changes.
+Prefer to create such resources first and all other GPU resources (like textures and vertex buffers) later.
+
+\subsection usage_patterns_simple_immutable_resources Immutable resources
+
+<b>When:</b>
+Any resources that you fill on CPU only once (aka "immutable") or infrequently
+and then read frequently on GPU,
+e.g. textures, vertex and index buffers, constant buffers that don't change often.
+
+<b>What to do:</b>
+Create them in video memory that is fastest to access from GPU using
+#VMA_MEMORY_USAGE_GPU_ONLY.
+
+To initialize content of such resource, create a CPU-side (aka "staging") copy of it
+in system memory - #VMA_MEMORY_USAGE_CPU_ONLY, map it, fill it,
+and submit a transfer from it to the GPU resource.
+You can keep the staging copy if you need it for another upload transfer in the future.
+If you don't, you can destroy it or reuse this buffer for uploading different resource
+after the transfer finishes.
+
+Prefer to create just buffers in system memory rather than images, even for uploading textures.
+Use `vkCmdCopyBufferToImage()`.
+Dont use images with `VK_IMAGE_TILING_LINEAR`.
+
+\subsection usage_patterns_dynamic_resources Dynamic resources
+
+<b>When:</b>
+Any resources that change frequently (aka "dynamic"), e.g. every frame or every draw call,
+written on CPU, read on GPU.
+
+<b>What to do:</b>
+Create them using #VMA_MEMORY_USAGE_CPU_TO_GPU.
+You can map it and write to it directly on CPU, as well as read from it on GPU.
+
+This is a more complex situation. Different solutions are possible,
+and the best one depends on specific GPU type, but you can use this simple approach for the start.
+Prefer to write to such resource sequentially (e.g. using `memcpy`).
+Don't perform random access or any reads from it on CPU, as it may be very slow.
+
+\subsection usage_patterns_readback Readback
+
+<b>When:</b>
+Resources that contain data written by GPU that you want to read back on CPU,
+e.g. results of some computations.
+
+<b>What to do:</b>
+Create them using #VMA_MEMORY_USAGE_GPU_TO_CPU.
+You can write to them directly on GPU, as well as map and read them on CPU.
+
+\section usage_patterns_advanced Advanced patterns
+
+\subsection usage_patterns_integrated_graphics Detecting integrated graphics
+
+You can support integrated graphics (like Intel HD Graphics, AMD APU) better
+by detecting it in Vulkan.
+To do it, call `vkGetPhysicalDeviceProperties()`, inspect
+`VkPhysicalDeviceProperties::deviceType` and look for `VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU`.
+When you find it, you can assume that memory is unified and all memory types are comparably fast
+to access from GPU, regardless of `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`.
+
+You can then sum up sizes of all available memory heaps and treat them as useful for
+your GPU resources, instead of only `DEVICE_LOCAL` ones.
+You can also prefer to create your resources in memory types that are `HOST_VISIBLE` to map them
+directly instead of submitting explicit transfer (see below).
+
+\subsection usage_patterns_direct_vs_transfer Direct access versus transfer
+
+For resources that you frequently write on CPU and read on GPU, many solutions are possible:
+
+-# Create one copy in video memory using #VMA_MEMORY_USAGE_GPU_ONLY,
+   second copy in system memory using #VMA_MEMORY_USAGE_CPU_ONLY and submit explicit tranfer each time.
+-# Create just single copy using #VMA_MEMORY_USAGE_CPU_TO_GPU, map it and fill it on CPU,
+   read it directly on GPU.
+-# Create just single copy using #VMA_MEMORY_USAGE_CPU_ONLY, map it and fill it on CPU,
+   read it directly on GPU.
+
+Which solution is the most efficient depends on your resource and especially on the GPU.
+It is best to measure it and then make the decision.
+Some general recommendations:
+
+- On integrated graphics use (2) or (3) to avoid unnecesary time and memory overhead
+  related to using a second copy and making transfer.
+- For small resources (e.g. constant buffers) use (2).
+  Discrete AMD cards have special 256 MiB pool of video memory that is directly mappable.
+  Even if the resource ends up in system memory, its data may be cached on GPU after first
+  fetch over PCIe bus.
+- For larger resources (e.g. textures), decide between (1) and (2).
+  You may want to differentiate NVIDIA and AMD, e.g. by looking for memory type that is
+  both `DEVICE_LOCAL` and `HOST_VISIBLE`. When you find it, use (2), otherwise use (1).
+
+Similarly, for resources that you frequently write on GPU and read on CPU, multiple
+solutions are possible:
+
+-# Create one copy in video memory using #VMA_MEMORY_USAGE_GPU_ONLY,
+   second copy in system memory using #VMA_MEMORY_USAGE_GPU_TO_CPU and submit explicit tranfer each time.
+-# Create just single copy using #VMA_MEMORY_USAGE_GPU_TO_CPU, write to it directly on GPU,
+   map it and read it on CPU.
+
+You should take some measurements to decide which option is faster in case of your specific
+resource.
+
+If you don't want to specialize your code for specific types of GPUs, you can still make
+an simple optimization for cases when your resource ends up in mappable memory to use it
+directly in this case instead of creating CPU-side staging copy.
+For details see [Finding out if memory is mappable](@ref memory_mapping_finding_if_memory_mappable).
+
+
+\page configuration Configuration
+
+Please check "CONFIGURATION SECTION" in the code to find macros that you can define
+before each include of this file or change directly in this file to provide
+your own implementation of basic facilities like assert, `min()` and `max()` functions,
+mutex, atomic etc.
+The library uses its own implementation of containers by default, but you can switch to using
+STL containers instead.
+
+For example, define `VMA_ASSERT(expr)` before including the library to provide
+custom implementation of the assertion, compatible with your project.
+By default it is defined to standard C `assert(expr)` in `_DEBUG` configuration
+and empty otherwise.
+
+\section config_Vulkan_functions Pointers to Vulkan functions
+
+The library uses Vulkan functions straight from the `vulkan.h` header by default.
+If you want to provide your own pointers to these functions, e.g. fetched using
+`vkGetInstanceProcAddr()` and `vkGetDeviceProcAddr()`:
+
+-# Define `VMA_STATIC_VULKAN_FUNCTIONS 0`.
+-# Provide valid pointers through VmaAllocatorCreateInfo::pVulkanFunctions.
+
+\section custom_memory_allocator Custom host memory allocator
+
+If you use custom allocator for CPU memory rather than default operator `new`
+and `delete` from C++, you can make this library using your allocator as well
+by filling optional member VmaAllocatorCreateInfo::pAllocationCallbacks. These
+functions will be passed to Vulkan, as well as used by the library itself to
+make any CPU-side allocations.
+
+\section allocation_callbacks Device memory allocation callbacks
+
+The library makes calls to `vkAllocateMemory()` and `vkFreeMemory()` internally.
+You can setup callbacks to be informed about these calls, e.g. for the purpose
+of gathering some statistics. To do it, fill optional member
+VmaAllocatorCreateInfo::pDeviceMemoryCallbacks.
+
+\section heap_memory_limit Device heap memory limit
+
+When device memory of certain heap runs out of free space, new allocations may
+fail (returning error code) or they may succeed, silently pushing some existing
+memory blocks from GPU VRAM to system RAM (which degrades performance). This
+behavior is implementation-dependant - it depends on GPU vendor and graphics
+driver.
+
+On AMD cards it can be controlled while creating Vulkan device object by using
+VK_AMD_memory_overallocation_behavior extension, if available.
+
+Alternatively, if you want to test how your program behaves with limited amount of Vulkan device
+memory available without switching your graphics card to one that really has
+smaller VRAM, you can use a feature of this library intended for this purpose.
+To do it, fill optional member VmaAllocatorCreateInfo::pHeapSizeLimit.
+
+
+
+\page vk_khr_dedicated_allocation VK_KHR_dedicated_allocation
+
+VK_KHR_dedicated_allocation is a Vulkan extension which can be used to improve
+performance on some GPUs. It augments Vulkan API with possibility to query
+driver whether it prefers particular buffer or image to have its own, dedicated
+allocation (separate `VkDeviceMemory` block) for better efficiency - to be able
+to do some internal optimizations.
+
+The extension is supported by this library. It will be used automatically when
+enabled. To enable it:
+
+1 . When creating Vulkan device, check if following 2 device extensions are
+supported (call `vkEnumerateDeviceExtensionProperties()`).
+If yes, enable them (fill `VkDeviceCreateInfo::ppEnabledExtensionNames`).
+
+- VK_KHR_get_memory_requirements2
+- VK_KHR_dedicated_allocation
+
+If you enabled these extensions:
+
+2 . Use #VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT flag when creating
+your #VmaAllocator`to inform the library that you enabled required extensions
+and you want the library to use them.
+
+\code
+allocatorInfo.flags |= VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT;
+
+vmaCreateAllocator(&allocatorInfo, &allocator);
+\endcode
+
+That's all. The extension will be automatically used whenever you create a
+buffer using vmaCreateBuffer() or image using vmaCreateImage().
+
+When using the extension together with Vulkan Validation Layer, you will receive
+warnings like this:
+
+    vkBindBufferMemory(): Binding memory to buffer 0x33 but vkGetBufferMemoryRequirements() has not been called on that buffer.
+
+It is OK, you should just ignore it. It happens because you use function
+`vkGetBufferMemoryRequirements2KHR()` instead of standard
+`vkGetBufferMemoryRequirements()`, while the validation layer seems to be
+unaware of it.
+
+To learn more about this extension, see:
+
+- [VK_KHR_dedicated_allocation in Vulkan specification](https://www.khronos.org/registry/vulkan/specs/1.0-extensions/html/vkspec.html#VK_KHR_dedicated_allocation)
+- [VK_KHR_dedicated_allocation unofficial manual](http://asawicki.info/articles/VK_KHR_dedicated_allocation.php5)
+
+
+
+\page general_considerations General considerations
+
+\section general_considerations_thread_safety Thread safety
+
+- The library has no global state, so separate #VmaAllocator objects can be used
+  independently.
+  There should be no need to create multiple such objects though - one per `VkDevice` is enough.
+- By default, all calls to functions that take #VmaAllocator as first parameter
+  are safe to call from multiple threads simultaneously because they are
+  synchronized internally when needed.
+- When the allocator is created with #VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT
+  flag, calls to functions that take such #VmaAllocator object must be
+  synchronized externally.
+- Access to a #VmaAllocation object must be externally synchronized. For example,
+  you must not call vmaGetAllocationInfo() and vmaMapMemory() from different
+  threads at the same time if you pass the same #VmaAllocation object to these
+  functions.
+
+\section general_considerations_validation_layer_warnings Validation layer warnings
+
+When using this library, you can meet following types of warnings issued by
+Vulkan validation layer. They don't necessarily indicate a bug, so you may need
+to just ignore them.
+
+- *vkBindBufferMemory(): Binding memory to buffer 0xeb8e4 but vkGetBufferMemoryRequirements() has not been called on that buffer.*
+  - It happens when VK_KHR_dedicated_allocation extension is enabled.
+    `vkGetBufferMemoryRequirements2KHR` function is used instead, while validation layer seems to be unaware of it.
+- *Mapping an image with layout VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL can result in undefined behavior if this memory is used by the device. Only GENERAL or PREINITIALIZED should be used.*
+  - It happens when you map a buffer or image, because the library maps entire
+    `VkDeviceMemory` block, where different types of images and buffers may end
+    up together, especially on GPUs with unified memory like Intel.
+- *Non-linear image 0xebc91 is aliased with linear buffer 0xeb8e4 which may indicate a bug.*
+  - It happens when you use lost allocations, and a new image or buffer is
+    created in place of an existing object that bacame lost.
+  - It may happen also when you use [defragmentation](@ref defragmentation).
+
+\section general_considerations_allocation_algorithm Allocation algorithm
+
+The library uses following algorithm for allocation, in order:
+
+-# Try to find free range of memory in existing blocks.
+-# If failed, try to create a new block of `VkDeviceMemory`, with preferred block size.
+-# If failed, try to create such block with size/2, size/4, size/8.
+-# If failed and #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT flag was
+   specified, try to find space in existing blocks, possilby making some other
+   allocations lost.
+-# If failed, try to allocate separate `VkDeviceMemory` for this allocation,
+   just like when you use #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.
+-# If failed, choose other memory type that meets the requirements specified in
+   VmaAllocationCreateInfo and go to point 1.
+-# If failed, return `VK_ERROR_OUT_OF_DEVICE_MEMORY`.
+
+\section general_considerations_features_not_supported Features not supported
+
+Features deliberately excluded from the scope of this library:
+
+- Data transfer. Uploading (straming) and downloading data of buffers and images
+  between CPU and GPU memory and related synchronization is responsibility of the user.
+  Defining some "texture" object that would automatically stream its data from a
+  staging copy in CPU memory to GPU memory would rather be a feature of another,
+  higher-level library implemented on top of VMA.
+- Allocations for imported/exported external memory. They tend to require
+  explicit memory type index and dedicated allocation anyway, so they don't
+  interact with main features of this library. Such special purpose allocations
+  should be made manually, using `vkCreateBuffer()` and `vkAllocateMemory()`.
+- Recreation of buffers and images. Although the library has functions for
+  buffer and image creation (vmaCreateBuffer(), vmaCreateImage()), you need to
+  recreate these objects yourself after defragmentation. That's because the big
+  structures `VkBufferCreateInfo`, `VkImageCreateInfo` are not stored in
+  #VmaAllocation object.
+- Handling CPU memory allocation failures. When dynamically creating small C++
+  objects in CPU memory (not Vulkan memory), allocation failures are not checked
+  and handled gracefully, because that would complicate code significantly and
+  is usually not needed in desktop PC applications anyway.
+- Code free of any compiler warnings. Maintaining the library to compile and
+  work correctly on so many different platforms is hard enough. Being free of 
+  any warnings, on any version of any compiler, is simply not feasible.
+- This is a C++ library with C interface.
+  Bindings or ports to any other programming languages are welcomed as external projects and
+  are not going to be included into this repository.
+
+*/
+
+/*
+Define this macro to 0/1 to disable/enable support for recording functionality,
+available through VmaAllocatorCreateInfo::pRecordSettings.
+*/
+#ifndef VMA_RECORDING_ENABLED
+    #define VMA_RECORDING_ENABLED 0
+#endif
+
+#ifndef NOMINMAX
+    #define NOMINMAX // For windows.h
+#endif
+
+#ifndef VULKAN_H_
+    #include <vulkan/vulkan.h>
+#endif
+
+#if VMA_RECORDING_ENABLED
+    #include <windows.h>
+#endif
+
+// Define this macro to declare maximum supported Vulkan version in format AAABBBCCC,
+// where AAA = major, BBB = minor, CCC = patch.
+// If you want to use version > 1.0, it still needs to be enabled via VmaAllocatorCreateInfo::vulkanApiVersion.
+#if !defined(VMA_VULKAN_VERSION)
+    #if defined(VK_VERSION_1_1)
+        #define VMA_VULKAN_VERSION 1001000
+    #else
+        #define VMA_VULKAN_VERSION 1000000
+    #endif
+#endif
+
+#if !defined(VMA_DEDICATED_ALLOCATION)
+    #if VK_KHR_get_memory_requirements2 && VK_KHR_dedicated_allocation
+        #define VMA_DEDICATED_ALLOCATION 1
+    #else
+        #define VMA_DEDICATED_ALLOCATION 0
+    #endif
+#endif
+
+#if !defined(VMA_BIND_MEMORY2)
+    #if VK_KHR_bind_memory2
+        #define VMA_BIND_MEMORY2 1
+    #else
+        #define VMA_BIND_MEMORY2 0
+    #endif
+#endif
+
+#if !defined(VMA_MEMORY_BUDGET)
+    #if VK_EXT_memory_budget && (VK_KHR_get_physical_device_properties2 || VMA_VULKAN_VERSION >= 1001000)
+        #define VMA_MEMORY_BUDGET 1
+    #else
+        #define VMA_MEMORY_BUDGET 0
+    #endif
+#endif
+
+// Define these macros to decorate all public functions with additional code,
+// before and after returned type, appropriately. This may be useful for
+// exporing the functions when compiling VMA as a separate library. Example:
+// #define VMA_CALL_PRE  __declspec(dllexport)
+// #define VMA_CALL_POST __cdecl
+#ifndef VMA_CALL_PRE
+    #define VMA_CALL_PRE
+#endif
+#ifndef VMA_CALL_POST
+    #define VMA_CALL_POST
+#endif
+
+/** \struct VmaAllocator
+\brief Represents main object of this library initialized.
+
+Fill structure #VmaAllocatorCreateInfo and call function vmaCreateAllocator() to create it.
+Call function vmaDestroyAllocator() to destroy it.
+
+It is recommended to create just one object of this type per `VkDevice` object,
+right after Vulkan is initialized and keep it alive until before Vulkan device is destroyed.
+*/
+VK_DEFINE_HANDLE(VmaAllocator)
+
+/// Callback function called after successful vkAllocateMemory.
+typedef void (VKAPI_PTR *PFN_vmaAllocateDeviceMemoryFunction)(
+    VmaAllocator      allocator,
+    uint32_t          memoryType,
+    VkDeviceMemory    memory,
+    VkDeviceSize      size);
+/// Callback function called before vkFreeMemory.
+typedef void (VKAPI_PTR *PFN_vmaFreeDeviceMemoryFunction)(
+    VmaAllocator      allocator,
+    uint32_t          memoryType,
+    VkDeviceMemory    memory,
+    VkDeviceSize      size);
+
+/** \brief Set of callbacks that the library will call for `vkAllocateMemory` and `vkFreeMemory`.
+
+Provided for informative purpose, e.g. to gather statistics about number of
+allocations or total amount of memory allocated in Vulkan.
+
+Used in VmaAllocatorCreateInfo::pDeviceMemoryCallbacks.
+*/
+typedef struct VmaDeviceMemoryCallbacks {
+    /// Optional, can be null.
+    PFN_vmaAllocateDeviceMemoryFunction pfnAllocate;
+    /// Optional, can be null.
+    PFN_vmaFreeDeviceMemoryFunction pfnFree;
+} VmaDeviceMemoryCallbacks;
+
+/// Flags for created #VmaAllocator.
+typedef enum VmaAllocatorCreateFlagBits {
+    /** \brief Allocator and all objects created from it will not be synchronized internally, so you must guarantee they are used from only one thread at a time or synchronized externally by you.
+
+    Using this flag may increase performance because internal mutexes are not used.
+    */
+    VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT = 0x00000001,
+    /** \brief Enables usage of VK_KHR_dedicated_allocation extension.
+
+    The flag works only if VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_0`.
+    When it's `VK_API_VERSION_1_1`, the flag is ignored because the extension has been promoted to Vulkan 1.1.
+
+    Using this extenion will automatically allocate dedicated blocks of memory for
+    some buffers and images instead of suballocating place for them out of bigger
+    memory blocks (as if you explicitly used #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT
+    flag) when it is recommended by the driver. It may improve performance on some
+    GPUs.
+
+    You may set this flag only if you found out that following device extensions are
+    supported, you enabled them while creating Vulkan device passed as
+    VmaAllocatorCreateInfo::device, and you want them to be used internally by this
+    library:
+
+    - VK_KHR_get_memory_requirements2 (device extension)
+    - VK_KHR_dedicated_allocation (device extension)
+
+    When this flag is set, you can experience following warnings reported by Vulkan
+    validation layer. You can ignore them.
+
+    > vkBindBufferMemory(): Binding memory to buffer 0x2d but vkGetBufferMemoryRequirements() has not been called on that buffer.
+    */
+    VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT = 0x00000002,
+    /**
+    Enables usage of VK_KHR_bind_memory2 extension.
+
+    The flag works only if VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_0`.
+    When it's `VK_API_VERSION_1_1`, the flag is ignored because the extension has been promoted to Vulkan 1.1.
+
+    You may set this flag only if you found out that this device extension is supported,
+    you enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device,
+    and you want it to be used internally by this library.
+
+    The extension provides functions `vkBindBufferMemory2KHR` and `vkBindImageMemory2KHR`,
+    which allow to pass a chain of `pNext` structures while binding.
+    This flag is required if you use `pNext` parameter in vmaBindBufferMemory2() or vmaBindImageMemory2().
+    */
+    VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT = 0x00000004,
+    /**
+    Enables usage of VK_EXT_memory_budget extension.
+
+    You may set this flag only if you found out that this device extension is supported,
+    you enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device,
+    and you want it to be used internally by this library, along with another instance extension
+    VK_KHR_get_physical_device_properties2, which is required by it (or Vulkan 1.1, where this extension is promoted).
+
+    The extension provides query for current memory usage and budget, which will probably
+    be more accurate than an estimation used by the library otherwise.
+    */
+    VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT = 0x00000008,
+
+    VMA_ALLOCATOR_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VmaAllocatorCreateFlagBits;
+typedef VkFlags VmaAllocatorCreateFlags;
+
+/** \brief Pointers to some Vulkan functions - a subset used by the library.
+
+Used in VmaAllocatorCreateInfo::pVulkanFunctions.
+*/
+typedef struct VmaVulkanFunctions {
+    PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties;
+    PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties;
+    PFN_vkAllocateMemory vkAllocateMemory;
+    PFN_vkFreeMemory vkFreeMemory;
+    PFN_vkMapMemory vkMapMemory;
+    PFN_vkUnmapMemory vkUnmapMemory;
+    PFN_vkFlushMappedMemoryRanges vkFlushMappedMemoryRanges;
+    PFN_vkInvalidateMappedMemoryRanges vkInvalidateMappedMemoryRanges;
+    PFN_vkBindBufferMemory vkBindBufferMemory;
+    PFN_vkBindImageMemory vkBindImageMemory;
+    PFN_vkGetBufferMemoryRequirements vkGetBufferMemoryRequirements;
+    PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements;
+    PFN_vkCreateBuffer vkCreateBuffer;
+    PFN_vkDestroyBuffer vkDestroyBuffer;
+    PFN_vkCreateImage vkCreateImage;
+    PFN_vkDestroyImage vkDestroyImage;
+    PFN_vkCmdCopyBuffer vkCmdCopyBuffer;
+#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000
+    PFN_vkGetBufferMemoryRequirements2KHR vkGetBufferMemoryRequirements2KHR;
+    PFN_vkGetImageMemoryRequirements2KHR vkGetImageMemoryRequirements2KHR;
+#endif
+#if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000
+    PFN_vkBindBufferMemory2KHR vkBindBufferMemory2KHR;
+    PFN_vkBindImageMemory2KHR vkBindImageMemory2KHR;
+#endif
+#if VMA_MEMORY_BUDGET || VMA_VULKAN_VERSION >= 1001000
+    PFN_vkGetPhysicalDeviceMemoryProperties2KHR vkGetPhysicalDeviceMemoryProperties2KHR;
+#endif
+} VmaVulkanFunctions;
+
+/// Flags to be used in VmaRecordSettings::flags.
+typedef enum VmaRecordFlagBits {
+    /** \brief Enables flush after recording every function call.
+
+    Enable it if you expect your application to crash, which may leave recording file truncated.
+    It may degrade performance though.
+    */
+    VMA_RECORD_FLUSH_AFTER_CALL_BIT = 0x00000001,
+    
+    VMA_RECORD_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VmaRecordFlagBits;
+typedef VkFlags VmaRecordFlags;
+
+/// Parameters for recording calls to VMA functions. To be used in VmaAllocatorCreateInfo::pRecordSettings.
+typedef struct VmaRecordSettings
+{
+    /// Flags for recording. Use #VmaRecordFlagBits enum.
+    VmaRecordFlags flags;
+    /** \brief Path to the file that should be written by the recording.
+
+    Suggested extension: "csv".
+    If the file already exists, it will be overwritten.
+    It will be opened for the whole time #VmaAllocator object is alive.
+    If opening this file fails, creation of the whole allocator object fails.
+    */
+    const char* pFilePath;
+} VmaRecordSettings;
+
+/// Description of a Allocator to be created.
+typedef struct VmaAllocatorCreateInfo
+{
+    /// Flags for created allocator. Use #VmaAllocatorCreateFlagBits enum.
+    VmaAllocatorCreateFlags flags;
+    /// Vulkan physical device.
+    /** It must be valid throughout whole lifetime of created allocator. */
+    VkPhysicalDevice physicalDevice;
+    /// Vulkan device.
+    /** It must be valid throughout whole lifetime of created allocator. */
+    VkDevice device;
+    /// Preferred size of a single `VkDeviceMemory` block to be allocated from large heaps > 1 GiB. Optional.
+    /** Set to 0 to use default, which is currently 256 MiB. */
+    VkDeviceSize preferredLargeHeapBlockSize;
+    /// Custom CPU memory allocation callbacks. Optional.
+    /** Optional, can be null. When specified, will also be used for all CPU-side memory allocations. */
+    const VkAllocationCallbacks* pAllocationCallbacks;
+    /// Informative callbacks for `vkAllocateMemory`, `vkFreeMemory`. Optional.
+    /** Optional, can be null. */
+    const VmaDeviceMemoryCallbacks* pDeviceMemoryCallbacks;
+    /** \brief Maximum number of additional frames that are in use at the same time as current frame.
+
+    This value is used only when you make allocations with
+    VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag. Such allocation cannot become
+    lost if allocation.lastUseFrameIndex >= allocator.currentFrameIndex - frameInUseCount.
+
+    For example, if you double-buffer your command buffers, so resources used for
+    rendering in previous frame may still be in use by the GPU at the moment you
+    allocate resources needed for the current frame, set this value to 1.
+
+    If you want to allow any allocations other than used in the current frame to
+    become lost, set this value to 0.
+    */
+    uint32_t frameInUseCount;
+    /** \brief Either null or a pointer to an array of limits on maximum number of bytes that can be allocated out of particular Vulkan memory heap.
+
+    If not NULL, it must be a pointer to an array of
+    `VkPhysicalDeviceMemoryProperties::memoryHeapCount` elements, defining limit on
+    maximum number of bytes that can be allocated out of particular Vulkan memory
+    heap.
+
+    Any of the elements may be equal to `VK_WHOLE_SIZE`, which means no limit on that
+    heap. This is also the default in case of `pHeapSizeLimit` = NULL.
+
+    If there is a limit defined for a heap:
+
+    - If user tries to allocate more memory from that heap using this allocator,
+      the allocation fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.
+    - If the limit is smaller than heap size reported in `VkMemoryHeap::size`, the
+      value of this limit will be reported instead when using vmaGetMemoryProperties().
+
+    Warning! Using this feature may not be equivalent to installing a GPU with
+    smaller amount of memory, because graphics driver doesn't necessary fail new
+    allocations with `VK_ERROR_OUT_OF_DEVICE_MEMORY` result when memory capacity is
+    exceeded. It may return success and just silently migrate some device memory
+    blocks to system RAM. This driver behavior can also be controlled using
+    VK_AMD_memory_overallocation_behavior extension.
+    */
+    const VkDeviceSize* pHeapSizeLimit;
+    /** \brief Pointers to Vulkan functions. Can be null if you leave define `VMA_STATIC_VULKAN_FUNCTIONS 1`.
+
+    If you leave define `VMA_STATIC_VULKAN_FUNCTIONS 1` in configuration section,
+    you can pass null as this member, because the library will fetch pointers to
+    Vulkan functions internally in a static way, like:
+
+        vulkanFunctions.vkAllocateMemory = &vkAllocateMemory;
+
+    Fill this member if you want to provide your own pointers to Vulkan functions,
+    e.g. fetched using `vkGetInstanceProcAddr()` and `vkGetDeviceProcAddr()`.
+    */
+    const VmaVulkanFunctions* pVulkanFunctions;
+    /** \brief Parameters for recording of VMA calls. Can be null.
+
+    If not null, it enables recording of calls to VMA functions to a file.
+    If support for recording is not enabled using `VMA_RECORDING_ENABLED` macro,
+    creation of the allocator object fails with `VK_ERROR_FEATURE_NOT_PRESENT`.
+    */
+    const VmaRecordSettings* pRecordSettings;
+    /** \brief Optional handle to Vulkan instance object.
+
+    Optional, can be null. Must be set if #VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT flas is used
+    or if `vulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)`.
+    */
+    VkInstance instance;
+    /** \brief Optional. The highest version of Vulkan that the application is designed to use.
+    
+    It must be a value in the format as created by macro `VK_MAKE_VERSION` or a constant like: `VK_API_VERSION_1_1`, `VK_API_VERSION_1_0`.
+    The patch version number specified is ignored. Only the major and minor versions are considered.
+    It must be less or euqal (preferably equal) to value as passed to `vkCreateInstance` as `VkApplicationInfo::apiVersion`.
+    Only versions 1.0 and 1.1 are supported by the current implementation.
+    Leaving it initialized to zero is equivalent to `VK_API_VERSION_1_0`.
+    */
+    uint32_t vulkanApiVersion;
+} VmaAllocatorCreateInfo;
+
+/// Creates Allocator object.
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAllocator(
+    const VmaAllocatorCreateInfo* pCreateInfo,
+    VmaAllocator* pAllocator);
+
+/// Destroys allocator object.
+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyAllocator(
+    VmaAllocator allocator);
+
+/**
+PhysicalDeviceProperties are fetched from physicalDevice by the allocator.
+You can access it here, without fetching it again on your own.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaGetPhysicalDeviceProperties(
+    VmaAllocator allocator,
+    const VkPhysicalDeviceProperties** ppPhysicalDeviceProperties);
+
+/**
+PhysicalDeviceMemoryProperties are fetched from physicalDevice by the allocator.
+You can access it here, without fetching it again on your own.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryProperties(
+    VmaAllocator allocator,
+    const VkPhysicalDeviceMemoryProperties** ppPhysicalDeviceMemoryProperties);
+
+/**
+\brief Given Memory Type Index, returns Property Flags of this memory type.
+
+This is just a convenience function. Same information can be obtained using
+vmaGetMemoryProperties().
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryTypeProperties(
+    VmaAllocator allocator,
+    uint32_t memoryTypeIndex,
+    VkMemoryPropertyFlags* pFlags);
+
+/** \brief Sets index of the current frame.
+
+This function must be used if you make allocations with
+#VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT and
+#VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT flags to inform the allocator
+when a new frame begins. Allocations queried using vmaGetAllocationInfo() cannot
+become lost in the current frame.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaSetCurrentFrameIndex(
+    VmaAllocator allocator,
+    uint32_t frameIndex);
+
+/** \brief Calculated statistics of memory usage in entire allocator.
+*/
+typedef struct VmaStatInfo
+{
+    /// Number of `VkDeviceMemory` Vulkan memory blocks allocated.
+    uint32_t blockCount;
+    /// Number of #VmaAllocation allocation objects allocated.
+    uint32_t allocationCount;
+    /// Number of free ranges of memory between allocations.
+    uint32_t unusedRangeCount;
+    /// Total number of bytes occupied by all allocations.
+    VkDeviceSize usedBytes;
+    /// Total number of bytes occupied by unused ranges.
+    VkDeviceSize unusedBytes;
+    VkDeviceSize allocationSizeMin, allocationSizeAvg, allocationSizeMax;
+    VkDeviceSize unusedRangeSizeMin, unusedRangeSizeAvg, unusedRangeSizeMax;
+} VmaStatInfo;
+
+/// General statistics from current state of Allocator.
+typedef struct VmaStats
+{
+    VmaStatInfo memoryType[VK_MAX_MEMORY_TYPES];
+    VmaStatInfo memoryHeap[VK_MAX_MEMORY_HEAPS];
+    VmaStatInfo total;
+} VmaStats;
+
+/** \brief Retrieves statistics from current state of the Allocator.
+
+This function is called "calculate" not "get" because it has to traverse all
+internal data structures, so it may be quite slow. For faster but more brief statistics
+suitable to be called every frame or every allocation, use vmaGetBudget().
+
+Note that when using allocator from multiple threads, returned information may immediately
+become outdated.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStats(
+    VmaAllocator allocator,
+    VmaStats* pStats);
+
+/** \brief Statistics of current memory usage and available budget, in bytes, for specific memory heap.
+*/
+typedef struct VmaBudget
+{
+    /** \brief Sum size of all `VkDeviceMemory` blocks allocated from particular heap, in bytes.
+    */
+    VkDeviceSize blockBytes;
+    
+    /** \brief Sum size of all allocations created in particular heap, in bytes.
+    
+    Usually less or equal than `blockBytes`.
+    Difference `blockBytes - allocationBytes` is the amount of memory allocated but unused -
+    available for new allocations or wasted due to fragmentation.
+    
+    It might be greater than `blockBytes` if there are some allocations in lost state, as they account
+    to this value as well.
+    */
+    VkDeviceSize allocationBytes;
+    
+    /** \brief Estimated current memory usage of the program, in bytes.
+    
+    Fetched from system using `VK_EXT_memory_budget` extension if enabled.
+    
+    It might be different than `blockBytes` (usually higher) due to additional implicit objects
+    also occupying the memory, like swapchain, pipelines, descriptor heaps, command buffers, or
+    `VkDeviceMemory` blocks allocated outside of this library, if any.
+    */
+    VkDeviceSize usage;
+    
+    /** \brief Estimated amount of memory available to the program, in bytes.
+    
+    Fetched from system using `VK_EXT_memory_budget` extension if enabled.
+    
+    It might be different (most probably smaller) than `VkMemoryHeap::size[heapIndex]` due to factors
+    external to the program, like other programs also consuming system resources.
+    Difference `budget - usage` is the amount of additional memory that can probably
+    be allocated without problems. Exceeding the budget may result in various problems.
+    */
+    VkDeviceSize budget;
+} VmaBudget;
+
+/** \brief Retrieves information about current memory budget for all memory heaps.
+
+\param[out] pBudget Must point to array with number of elements at least equal to number of memory heaps in physical device used.
+
+This function is called "get" not "calculate" because it is very fast, suitable to be called
+every frame or every allocation. For more detailed statistics use vmaCalculateStats().
+
+Note that when using allocator from multiple threads, returned information may immediately
+become outdated.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaGetBudget(
+    VmaAllocator allocator,
+    VmaBudget* pBudget);
+
+#ifndef VMA_STATS_STRING_ENABLED
+#define VMA_STATS_STRING_ENABLED 1
+#endif
+
+#if VMA_STATS_STRING_ENABLED
+
+/// Builds and returns statistics as string in JSON format.
+/** @param[out] ppStatsString Must be freed using vmaFreeStatsString() function.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaBuildStatsString(
+    VmaAllocator allocator,
+    char** ppStatsString,
+    VkBool32 detailedMap);
+
+VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
+    VmaAllocator allocator,
+    char* pStatsString);
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+/** \struct VmaPool
+\brief Represents custom memory pool
+
+Fill structure VmaPoolCreateInfo and call function vmaCreatePool() to create it.
+Call function vmaDestroyPool() to destroy it.
+
+For more information see [Custom memory pools](@ref choosing_memory_type_custom_memory_pools).
+*/
+VK_DEFINE_HANDLE(VmaPool)
+
+typedef enum VmaMemoryUsage
+{
+    /** No intended memory usage specified.
+    Use other members of VmaAllocationCreateInfo to specify your requirements.
+    */
+    VMA_MEMORY_USAGE_UNKNOWN = 0,
+    /** Memory will be used on device only, so fast access from the device is preferred.
+    It usually means device-local GPU (video) memory.
+    No need to be mappable on host.
+    It is roughly equivalent of `D3D12_HEAP_TYPE_DEFAULT`.
+
+    Usage:
+    
+    - Resources written and read by device, e.g. images used as attachments.
+    - Resources transferred from host once (immutable) or infrequently and read by
+      device multiple times, e.g. textures to be sampled, vertex buffers, uniform
+      (constant) buffers, and majority of other types of resources used on GPU.
+
+    Allocation may still end up in `HOST_VISIBLE` memory on some implementations.
+    In such case, you are free to map it.
+    You can use #VMA_ALLOCATION_CREATE_MAPPED_BIT with this usage type.
+    */
+    VMA_MEMORY_USAGE_GPU_ONLY = 1,
+    /** Memory will be mappable on host.
+    It usually means CPU (system) memory.
+    Guarantees to be `HOST_VISIBLE` and `HOST_COHERENT`.
+    CPU access is typically uncached. Writes may be write-combined.
+    Resources created in this pool may still be accessible to the device, but access to them can be slow.
+    It is roughly equivalent of `D3D12_HEAP_TYPE_UPLOAD`.
+
+    Usage: Staging copy of resources used as transfer source.
+    */
+    VMA_MEMORY_USAGE_CPU_ONLY = 2,
+    /**
+    Memory that is both mappable on host (guarantees to be `HOST_VISIBLE`) and preferably fast to access by GPU.
+    CPU access is typically uncached. Writes may be write-combined.
+
+    Usage: Resources written frequently by host (dynamic), read by device. E.g. textures, vertex buffers, uniform buffers updated every frame or every draw call.
+    */
+    VMA_MEMORY_USAGE_CPU_TO_GPU = 3,
+    /** Memory mappable on host (guarantees to be `HOST_VISIBLE`) and cached.
+    It is roughly equivalent of `D3D12_HEAP_TYPE_READBACK`.
+
+    Usage:
+
+    - Resources written by device, read by host - results of some computations, e.g. screen capture, average scene luminance for HDR tone mapping.
+    - Any resources read or accessed randomly on host, e.g. CPU-side copy of vertex buffer used as source of transfer, but also used for collision detection.
+    */
+    VMA_MEMORY_USAGE_GPU_TO_CPU = 4,
+    /** CPU memory - memory that is preferably not `DEVICE_LOCAL`, but also not guaranteed to be `HOST_VISIBLE`.
+
+    Usage: Staging copy of resources moved from GPU memory to CPU memory as part
+    of custom paging/residency mechanism, to be moved back to GPU memory when needed.
+    */
+    VMA_MEMORY_USAGE_CPU_COPY = 5,
+    /** Lazily allocated GPU memory having `VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT`.
+    Exists mostly on mobile platforms. Using it on desktop PC or other GPUs with no such memory type present will fail the allocation.
+    
+    Usage: Memory for transient attachment images (color attachments, depth attachments etc.), created with `VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT`.
+
+    Allocations with this usage are always created as dedicated - it implies #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.
+    */
+    VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED = 6,
+
+    VMA_MEMORY_USAGE_MAX_ENUM = 0x7FFFFFFF
+} VmaMemoryUsage;
+
+/// Flags to be passed as VmaAllocationCreateInfo::flags.
+typedef enum VmaAllocationCreateFlagBits {
+    /** \brief Set this flag if the allocation should have its own memory block.
+    
+    Use it for special, big resources, like fullscreen images used as attachments.
+   
+    You should not use this flag if VmaAllocationCreateInfo::pool is not null.
+    */
+    VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT = 0x00000001,
+
+    /** \brief Set this flag to only try to allocate from existing `VkDeviceMemory` blocks and never create new such block.
+    
+    If new allocation cannot be placed in any of the existing blocks, allocation
+    fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY` error.
+    
+    You should not use #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT and
+    #VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT at the same time. It makes no sense.
+    
+    If VmaAllocationCreateInfo::pool is not null, this flag is implied and ignored. */
+    VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT = 0x00000002,
+    /** \brief Set this flag to use a memory that will be persistently mapped and retrieve pointer to it.
+    
+    Pointer to mapped memory will be returned through VmaAllocationInfo::pMappedData.
+
+    Is it valid to use this flag for allocation made from memory type that is not
+    `HOST_VISIBLE`. This flag is then ignored and memory is not mapped. This is
+    useful if you need an allocation that is efficient to use on GPU
+    (`DEVICE_LOCAL`) and still want to map it directly if possible on platforms that
+    support it (e.g. Intel GPU).
+
+    You should not use this flag together with #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT.
+    */
+    VMA_ALLOCATION_CREATE_MAPPED_BIT = 0x00000004,
+    /** Allocation created with this flag can become lost as a result of another
+    allocation with #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT flag, so you
+    must check it before use.
+
+    To check if allocation is not lost, call vmaGetAllocationInfo() and check if
+    VmaAllocationInfo::deviceMemory is not `VK_NULL_HANDLE`.
+
+    For details about supporting lost allocations, see Lost Allocations
+    chapter of User Guide on Main Page.
+
+    You should not use this flag together with #VMA_ALLOCATION_CREATE_MAPPED_BIT.
+    */
+    VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT = 0x00000008,
+    /** While creating allocation using this flag, other allocations that were
+    created with flag #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT can become lost.
+
+    For details about supporting lost allocations, see Lost Allocations
+    chapter of User Guide on Main Page.
+    */
+    VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT = 0x00000010,
+    /** Set this flag to treat VmaAllocationCreateInfo::pUserData as pointer to a
+    null-terminated string. Instead of copying pointer value, a local copy of the
+    string is made and stored in allocation's `pUserData`. The string is automatically
+    freed together with the allocation. It is also used in vmaBuildStatsString().
+    */
+    VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT = 0x00000020,
+    /** Allocation will be created from upper stack in a double stack pool.
+
+    This flag is only allowed for custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT flag.
+    */
+    VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT = 0x00000040,
+    /** Create both buffer/image and allocation, but don't bind them together.
+    It is useful when you want to bind yourself to do some more advanced binding, e.g. using some extensions.
+    The flag is meaningful only with functions that bind by default: vmaCreateBuffer(), vmaCreateImage().
+    Otherwise it is ignored.
+    */
+    VMA_ALLOCATION_CREATE_DONT_BIND_BIT = 0x00000080,
+    /** Create allocation only if additional device memory required for it, if any, won't exceed
+    memory budget. Otherwise return `VK_ERROR_OUT_OF_DEVICE_MEMORY`.
+    */
+    VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT = 0x00000100,
+
+    /** Allocation strategy that chooses smallest possible free range for the
+    allocation.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT  = 0x00010000,
+    /** Allocation strategy that chooses biggest possible free range for the
+    allocation.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT = 0x00020000,
+    /** Allocation strategy that chooses first suitable free range for the
+    allocation.
+
+    "First" doesn't necessarily means the one with smallest offset in memory,
+    but rather the one that is easiest and fastest to find.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT = 0x00040000,
+
+    /** Allocation strategy that tries to minimize memory usage.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT = VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT,
+    /** Allocation strategy that tries to minimize allocation time.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT = VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT,
+    /** Allocation strategy that tries to minimize memory fragmentation.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_MIN_FRAGMENTATION_BIT = VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT,
+
+    /** A bit mask to extract only `STRATEGY` bits from entire set of flags.
+    */
+    VMA_ALLOCATION_CREATE_STRATEGY_MASK =
+        VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT |
+        VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT |
+        VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT,
+
+    VMA_ALLOCATION_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VmaAllocationCreateFlagBits;
+typedef VkFlags VmaAllocationCreateFlags;
+
+typedef struct VmaAllocationCreateInfo
+{
+    /// Use #VmaAllocationCreateFlagBits enum.
+    VmaAllocationCreateFlags flags;
+    /** \brief Intended usage of memory.
+    
+    You can leave #VMA_MEMORY_USAGE_UNKNOWN if you specify memory requirements in other way. \n
+    If `pool` is not null, this member is ignored.
+    */
+    VmaMemoryUsage usage;
+    /** \brief Flags that must be set in a Memory Type chosen for an allocation.
+    
+    Leave 0 if you specify memory requirements in other way. \n
+    If `pool` is not null, this member is ignored.*/
+    VkMemoryPropertyFlags requiredFlags;
+    /** \brief Flags that preferably should be set in a memory type chosen for an allocation.
+    
+    Set to 0 if no additional flags are prefered. \n
+    If `pool` is not null, this member is ignored. */
+    VkMemoryPropertyFlags preferredFlags;
+    /** \brief Bitmask containing one bit set for every memory type acceptable for this allocation.
+
+    Value 0 is equivalent to `UINT32_MAX` - it means any memory type is accepted if
+    it meets other requirements specified by this structure, with no further
+    restrictions on memory type index. \n
+    If `pool` is not null, this member is ignored.
+    */
+    uint32_t memoryTypeBits;
+    /** \brief Pool that this allocation should be created in.
+
+    Leave `VK_NULL_HANDLE` to allocate from default pool. If not null, members:
+    `usage`, `requiredFlags`, `preferredFlags`, `memoryTypeBits` are ignored.
+    */
+    VmaPool pool;
+    /** \brief Custom general-purpose pointer that will be stored in #VmaAllocation, can be read as VmaAllocationInfo::pUserData and changed using vmaSetAllocationUserData().
+    
+    If #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT is used, it must be either
+    null or pointer to a null-terminated string. The string will be then copied to
+    internal buffer, so it doesn't need to be valid after allocation call.
+    */
+    void* pUserData;
+} VmaAllocationCreateInfo;
+
+/**
+\brief Helps to find memoryTypeIndex, given memoryTypeBits and VmaAllocationCreateInfo.
+
+This algorithm tries to find a memory type that:
+
+- Is allowed by memoryTypeBits.
+- Contains all the flags from pAllocationCreateInfo->requiredFlags.
+- Matches intended usage.
+- Has as many flags from pAllocationCreateInfo->preferredFlags as possible.
+
+\return Returns VK_ERROR_FEATURE_NOT_PRESENT if not found. Receiving such result
+from this function or any other allocating function probably means that your
+device doesn't support any memory type with requested features for the specific
+type of resource you want to use it for. Please check parameters of your
+resource, like image layout (OPTIMAL versus LINEAR) or mip level count.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndex(
+    VmaAllocator allocator,
+    uint32_t memoryTypeBits,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    uint32_t* pMemoryTypeIndex);
+
+/**
+\brief Helps to find memoryTypeIndex, given VkBufferCreateInfo and VmaAllocationCreateInfo.
+
+It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex.
+It internally creates a temporary, dummy buffer that never has memory bound.
+It is just a convenience function, equivalent to calling:
+
+- `vkCreateBuffer`
+- `vkGetBufferMemoryRequirements`
+- `vmaFindMemoryTypeIndex`
+- `vkDestroyBuffer`
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForBufferInfo(
+    VmaAllocator allocator,
+    const VkBufferCreateInfo* pBufferCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    uint32_t* pMemoryTypeIndex);
+
+/**
+\brief Helps to find memoryTypeIndex, given VkImageCreateInfo and VmaAllocationCreateInfo.
+
+It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex.
+It internally creates a temporary, dummy image that never has memory bound.
+It is just a convenience function, equivalent to calling:
+
+- `vkCreateImage`
+- `vkGetImageMemoryRequirements`
+- `vmaFindMemoryTypeIndex`
+- `vkDestroyImage`
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForImageInfo(
+    VmaAllocator allocator,
+    const VkImageCreateInfo* pImageCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    uint32_t* pMemoryTypeIndex);
+
+/// Flags to be passed as VmaPoolCreateInfo::flags.
+typedef enum VmaPoolCreateFlagBits {
+    /** \brief Use this flag if you always allocate only buffers and linear images or only optimal images out of this pool and so Buffer-Image Granularity can be ignored.
+
+    This is an optional optimization flag.
+
+    If you always allocate using vmaCreateBuffer(), vmaCreateImage(),
+    vmaAllocateMemoryForBuffer(), then you don't need to use it because allocator
+    knows exact type of your allocations so it can handle Buffer-Image Granularity
+    in the optimal way.
+
+    If you also allocate using vmaAllocateMemoryForImage() or vmaAllocateMemory(),
+    exact type of such allocations is not known, so allocator must be conservative
+    in handling Buffer-Image Granularity, which can lead to suboptimal allocation
+    (wasted memory). In that case, if you can make sure you always allocate only
+    buffers and linear images or only optimal images out of this pool, use this flag
+    to make allocator disregard Buffer-Image Granularity and so make allocations
+    faster and more optimal.
+    */
+    VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT = 0x00000002,
+
+    /** \brief Enables alternative, linear allocation algorithm in this pool.
+
+    Specify this flag to enable linear allocation algorithm, which always creates
+    new allocations after last one and doesn't reuse space from allocations freed in
+    between. It trades memory consumption for simplified algorithm and data
+    structure, which has better performance and uses less memory for metadata.
+
+    By using this flag, you can achieve behavior of free-at-once, stack,
+    ring buffer, and double stack. For details, see documentation chapter
+    \ref linear_algorithm.
+
+    When using this flag, you must specify VmaPoolCreateInfo::maxBlockCount == 1 (or 0 for default).
+
+    For more details, see [Linear allocation algorithm](@ref linear_algorithm).
+    */
+    VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT = 0x00000004,
+
+    /** \brief Enables alternative, buddy allocation algorithm in this pool.
+
+    It operates on a tree of blocks, each having size that is a power of two and
+    a half of its parent's size. Comparing to default algorithm, this one provides
+    faster allocation and deallocation and decreased external fragmentation,
+    at the expense of more memory wasted (internal fragmentation).
+
+    For more details, see [Buddy allocation algorithm](@ref buddy_algorithm).
+    */
+    VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT = 0x00000008,
+
+    /** Bit mask to extract only `ALGORITHM` bits from entire set of flags.
+    */
+    VMA_POOL_CREATE_ALGORITHM_MASK =
+        VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT |
+        VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT,
+
+    VMA_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VmaPoolCreateFlagBits;
+typedef VkFlags VmaPoolCreateFlags;
+
+/** \brief Describes parameter of created #VmaPool.
+*/
+typedef struct VmaPoolCreateInfo {
+    /** \brief Vulkan memory type index to allocate this pool from.
+    */
+    uint32_t memoryTypeIndex;
+    /** \brief Use combination of #VmaPoolCreateFlagBits.
+    */
+    VmaPoolCreateFlags flags;
+    /** \brief Size of a single `VkDeviceMemory` block to be allocated as part of this pool, in bytes. Optional.
+
+    Specify nonzero to set explicit, constant size of memory blocks used by this
+    pool.
+
+    Leave 0 to use default and let the library manage block sizes automatically.
+    Sizes of particular blocks may vary.
+    */
+    VkDeviceSize blockSize;
+    /** \brief Minimum number of blocks to be always allocated in this pool, even if they stay empty.
+
+    Set to 0 to have no preallocated blocks and allow the pool be completely empty.
+    */
+    size_t minBlockCount;
+    /** \brief Maximum number of blocks that can be allocated in this pool. Optional.
+
+    Set to 0 to use default, which is `SIZE_MAX`, which means no limit.
+    
+    Set to same value as VmaPoolCreateInfo::minBlockCount to have fixed amount of memory allocated
+    throughout whole lifetime of this pool.
+    */
+    size_t maxBlockCount;
+    /** \brief Maximum number of additional frames that are in use at the same time as current frame.
+
+    This value is used only when you make allocations with
+    #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag. Such allocation cannot become
+    lost if allocation.lastUseFrameIndex >= allocator.currentFrameIndex - frameInUseCount.
+
+    For example, if you double-buffer your command buffers, so resources used for
+    rendering in previous frame may still be in use by the GPU at the moment you
+    allocate resources needed for the current frame, set this value to 1.
+
+    If you want to allow any allocations other than used in the current frame to
+    become lost, set this value to 0.
+    */
+    uint32_t frameInUseCount;
+} VmaPoolCreateInfo;
+
+/** \brief Describes parameter of existing #VmaPool.
+*/
+typedef struct VmaPoolStats {
+    /** \brief Total amount of `VkDeviceMemory` allocated from Vulkan for this pool, in bytes.
+    */
+    VkDeviceSize size;
+    /** \brief Total number of bytes in the pool not used by any #VmaAllocation.
+    */
+    VkDeviceSize unusedSize;
+    /** \brief Number of #VmaAllocation objects created from this pool that were not destroyed or lost.
+    */
+    size_t allocationCount;
+    /** \brief Number of continuous memory ranges in the pool not used by any #VmaAllocation.
+    */
+    size_t unusedRangeCount;
+    /** \brief Size of the largest continuous free memory region available for new allocation.
+
+    Making a new allocation of that size is not guaranteed to succeed because of
+    possible additional margin required to respect alignment and buffer/image
+    granularity.
+    */
+    VkDeviceSize unusedRangeSizeMax;
+    /** \brief Number of `VkDeviceMemory` blocks allocated for this pool.
+    */
+    size_t blockCount;
+} VmaPoolStats;
+
+/** \brief Allocates Vulkan device memory and creates #VmaPool object.
+
+@param allocator Allocator object.
+@param pCreateInfo Parameters of pool to create.
+@param[out] pPool Handle to created pool.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreatePool(
+	VmaAllocator allocator,
+	const VmaPoolCreateInfo* pCreateInfo,
+	VmaPool* pPool);
+
+/** \brief Destroys #VmaPool object and frees Vulkan device memory.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyPool(
+    VmaAllocator allocator,
+    VmaPool pool);
+
+/** \brief Retrieves statistics of existing #VmaPool object.
+
+@param allocator Allocator object.
+@param pool Pool object.
+@param[out] pPoolStats Statistics of specified pool.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStats(
+    VmaAllocator allocator,
+    VmaPool pool,
+    VmaPoolStats* pPoolStats);
+
+/** \brief Marks all allocations in given pool as lost if they are not used in current frame or VmaPoolCreateInfo::frameInUseCount back from now.
+
+@param allocator Allocator object.
+@param pool Pool.
+@param[out] pLostAllocationCount Number of allocations marked as lost. Optional - pass null if you don't need this information.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaMakePoolAllocationsLost(
+    VmaAllocator allocator,
+    VmaPool pool,
+    size_t* pLostAllocationCount);
+
+/** \brief Checks magic number in margins around all allocations in given memory pool in search for corruptions.
+
+Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero,
+`VMA_DEBUG_MARGIN` is defined to nonzero and the pool is created in memory type that is
+`HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection).
+
+Possible return values:
+
+- `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for specified pool.
+- `VK_SUCCESS` - corruption detection has been performed and succeeded.
+- `VK_ERROR_VALIDATION_FAILED_EXT` - corruption detection has been performed and found memory corruptions around one of the allocations.
+  `VMA_ASSERT` is also fired in that case.
+- Other value: Error returned by Vulkan, e.g. memory mapping failure.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckPoolCorruption(VmaAllocator allocator, VmaPool pool);
+
+/** \brief Retrieves name of a custom pool.
+
+After the call `ppName` is either null or points to an internally-owned null-terminated string
+containing name of the pool that was previously set. The pointer becomes invalid when the pool is
+destroyed or its name is changed using vmaSetPoolName().
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolName(
+    VmaAllocator allocator,
+    VmaPool pool,
+    const char** ppName);
+
+/** \brief Sets name of a custom pool.
+
+`pName` can be either null or pointer to a null-terminated string with new name for the pool.
+Function makes internal copy of the string, so it can be changed or freed immediately after this call.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaSetPoolName(
+    VmaAllocator allocator,
+    VmaPool pool,
+    const char* pName);
+
+/** \struct VmaAllocation
+\brief Represents single memory allocation.
+
+It may be either dedicated block of `VkDeviceMemory` or a specific region of a bigger block of this type
+plus unique offset.
+
+There are multiple ways to create such object.
+You need to fill structure VmaAllocationCreateInfo.
+For more information see [Choosing memory type](@ref choosing_memory_type).
+
+Although the library provides convenience functions that create Vulkan buffer or image,
+allocate memory for it and bind them together,
+binding of the allocation to a buffer or an image is out of scope of the allocation itself.
+Allocation object can exist without buffer/image bound,
+binding can be done manually by the user, and destruction of it can be done
+independently of destruction of the allocation.
+
+The object also remembers its size and some other information.
+To retrieve this information, use function vmaGetAllocationInfo() and inspect
+returned structure VmaAllocationInfo.
+
+Some kinds allocations can be in lost state.
+For more information, see [Lost allocations](@ref lost_allocations).
+*/
+VK_DEFINE_HANDLE(VmaAllocation)
+
+/** \brief Parameters of #VmaAllocation objects, that can be retrieved using function vmaGetAllocationInfo().
+*/
+typedef struct VmaAllocationInfo {
+    /** \brief Memory type index that this allocation was allocated from.
+    
+    It never changes.
+    */
+    uint32_t memoryType;
+    /** \brief Handle to Vulkan memory object.
+
+    Same memory object can be shared by multiple allocations.
+    
+    It can change after call to vmaDefragment() if this allocation is passed to the function, or if allocation is lost.
+
+    If the allocation is lost, it is equal to `VK_NULL_HANDLE`.
+    */
+    VkDeviceMemory deviceMemory;
+    /** \brief Offset into deviceMemory object to the beginning of this allocation, in bytes. (deviceMemory, offset) pair is unique to this allocation.
+
+    It can change after call to vmaDefragment() if this allocation is passed to the function, or if allocation is lost.
+    */
+    VkDeviceSize offset;
+    /** \brief Size of this allocation, in bytes.
+
+    It never changes, unless allocation is lost.
+    */
+    VkDeviceSize size;
+    /** \brief Pointer to the beginning of this allocation as mapped data.
+
+    If the allocation hasn't been mapped using vmaMapMemory() and hasn't been
+    created with #VMA_ALLOCATION_CREATE_MAPPED_BIT flag, this value null.
+
+    It can change after call to vmaMapMemory(), vmaUnmapMemory().
+    It can also change after call to vmaDefragment() if this allocation is passed to the function.
+    */
+    void* pMappedData;
+    /** \brief Custom general-purpose pointer that was passed as VmaAllocationCreateInfo::pUserData or set using vmaSetAllocationUserData().
+
+    It can change after call to vmaSetAllocationUserData() for this allocation.
+    */
+    void* pUserData;
+} VmaAllocationInfo;
+
+/** \brief General purpose memory allocation.
+
+@param[out] pAllocation Handle to allocated memory.
+@param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().
+
+You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages().
+
+It is recommended to use vmaAllocateMemoryForBuffer(), vmaAllocateMemoryForImage(),
+vmaCreateBuffer(), vmaCreateImage() instead whenever possible.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemory(
+    VmaAllocator allocator,
+    const VkMemoryRequirements* pVkMemoryRequirements,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo);
+
+/** \brief General purpose memory allocation for multiple allocation objects at once.
+
+@param allocator Allocator object.
+@param pVkMemoryRequirements Memory requirements for each allocation.
+@param pCreateInfo Creation parameters for each alloction.
+@param allocationCount Number of allocations to make.
+@param[out] pAllocations Pointer to array that will be filled with handles to created allocations.
+@param[out] pAllocationInfo Optional. Pointer to array that will be filled with parameters of created allocations.
+
+You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages().
+
+Word "pages" is just a suggestion to use this function to allocate pieces of memory needed for sparse binding.
+It is just a general purpose allocation function able to make multiple allocations at once.
+It may be internally optimized to be more efficient than calling vmaAllocateMemory() `allocationCount` times.
+
+All allocations are made using same parameters. All of them are created out of the same memory pool and type.
+If any allocation fails, all allocations already made within this function call are also freed, so that when
+returned result is not `VK_SUCCESS`, `pAllocation` array is always entirely filled with `VK_NULL_HANDLE`.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryPages(
+    VmaAllocator allocator,
+    const VkMemoryRequirements* pVkMemoryRequirements,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    size_t allocationCount,
+    VmaAllocation* pAllocations,
+    VmaAllocationInfo* pAllocationInfo);
+
+/**
+@param[out] pAllocation Handle to allocated memory.
+@param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().
+
+You should free the memory using vmaFreeMemory().
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForBuffer(
+    VmaAllocator allocator,
+    VkBuffer buffer,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo);
+
+/// Function similar to vmaAllocateMemoryForBuffer().
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForImage(
+    VmaAllocator allocator,
+    VkImage image,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo);
+
+/** \brief Frees memory previously allocated using vmaAllocateMemory(), vmaAllocateMemoryForBuffer(), or vmaAllocateMemoryForImage().
+
+Passing `VK_NULL_HANDLE` as `allocation` is valid. Such function call is just skipped.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation);
+
+/** \brief Frees memory and destroys multiple allocations.
+
+Word "pages" is just a suggestion to use this function to free pieces of memory used for sparse binding.
+It is just a general purpose function to free memory and destroy allocations made using e.g. vmaAllocateMemory(),
+vmaAllocateMemoryPages() and other functions.
+It may be internally optimized to be more efficient than calling vmaFreeMemory() `allocationCount` times.
+
+Allocations in `pAllocations` array can come from any memory pools and types.
+Passing `VK_NULL_HANDLE` as elements of `pAllocations` array is valid. Such entries are just skipped.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemoryPages(
+    VmaAllocator allocator,
+    size_t allocationCount,
+    VmaAllocation* pAllocations);
+
+/** \brief Deprecated.
+
+In version 2.2.0 it used to try to change allocation's size without moving or reallocating it.
+In current version it returns `VK_SUCCESS` only if `newSize` equals current allocation's size.
+Otherwise returns `VK_ERROR_OUT_OF_POOL_MEMORY`, indicating that allocation's size could not be changed.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaResizeAllocation(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkDeviceSize newSize);
+
+/** \brief Returns current information about specified allocation and atomically marks it as used in current frame.
+
+Current paramters of given allocation are returned in `pAllocationInfo`.
+
+This function also atomically "touches" allocation - marks it as used in current frame,
+just like vmaTouchAllocation().
+If the allocation is in lost state, `pAllocationInfo->deviceMemory == VK_NULL_HANDLE`.
+
+Although this function uses atomics and doesn't lock any mutex, so it should be quite efficient,
+you can avoid calling it too often.
+
+- You can retrieve same VmaAllocationInfo structure while creating your resource, from function
+  vmaCreateBuffer(), vmaCreateImage(). You can remember it if you are sure parameters don't change
+  (e.g. due to defragmentation or allocation becoming lost).
+- If you just want to check if allocation is not lost, vmaTouchAllocation() will work faster.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationInfo(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VmaAllocationInfo* pAllocationInfo);
+
+/** \brief Returns `VK_TRUE` if allocation is not lost and atomically marks it as used in current frame.
+
+If the allocation has been created with #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag,
+this function returns `VK_TRUE` if it's not in lost state, so it can still be used.
+It then also atomically "touches" the allocation - marks it as used in current frame,
+so that you can be sure it won't become lost in current frame or next `frameInUseCount` frames.
+
+If the allocation is in lost state, the function returns `VK_FALSE`.
+Memory of such allocation, as well as buffer or image bound to it, should not be used.
+Lost allocation and the buffer/image still need to be destroyed.
+
+If the allocation has been created without #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag,
+this function always returns `VK_TRUE`.
+*/
+VMA_CALL_PRE VkBool32 VMA_CALL_POST vmaTouchAllocation(
+    VmaAllocator allocator,
+    VmaAllocation allocation);
+
+/** \brief Sets pUserData in given allocation to new value.
+
+If the allocation was created with VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT,
+pUserData must be either null, or pointer to a null-terminated string. The function
+makes local copy of the string and sets it as allocation's `pUserData`. String
+passed as pUserData doesn't need to be valid for whole lifetime of the allocation -
+you can free it after this call. String previously pointed by allocation's
+pUserData is freed from memory.
+
+If the flag was not used, the value of pointer `pUserData` is just copied to
+allocation's `pUserData`. It is opaque, so you can use it however you want - e.g.
+as a pointer, ordinal number or some handle to you own data.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationUserData(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    void* pUserData);
+
+/** \brief Creates new allocation that is in lost state from the beginning.
+
+It can be useful if you need a dummy, non-null allocation.
+
+You still need to destroy created object using vmaFreeMemory().
+
+Returned allocation is not tied to any specific memory pool or memory type and
+not bound to any image or buffer. It has size = 0. It cannot be turned into
+a real, non-empty allocation.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaCreateLostAllocation(
+    VmaAllocator allocator,
+    VmaAllocation* pAllocation);
+
+/** \brief Maps memory represented by given allocation and returns pointer to it.
+
+Maps memory represented by given allocation to make it accessible to CPU code.
+When succeeded, `*ppData` contains pointer to first byte of this memory.
+If the allocation is part of bigger `VkDeviceMemory` block, the pointer is
+correctly offseted to the beginning of region assigned to this particular
+allocation.
+
+Mapping is internally reference-counted and synchronized, so despite raw Vulkan
+function `vkMapMemory()` cannot be used to map same block of `VkDeviceMemory`
+multiple times simultaneously, it is safe to call this function on allocations
+assigned to the same memory block. Actual Vulkan memory will be mapped on first
+mapping and unmapped on last unmapping.
+
+If the function succeeded, you must call vmaUnmapMemory() to unmap the
+allocation when mapping is no longer needed or before freeing the allocation, at
+the latest.
+
+It also safe to call this function multiple times on the same allocation. You
+must call vmaUnmapMemory() same number of times as you called vmaMapMemory().
+
+It is also safe to call this function on allocation created with
+#VMA_ALLOCATION_CREATE_MAPPED_BIT flag. Its memory stays mapped all the time.
+You must still call vmaUnmapMemory() same number of times as you called
+vmaMapMemory(). You must not call vmaUnmapMemory() additional time to free the
+"0-th" mapping made automatically due to #VMA_ALLOCATION_CREATE_MAPPED_BIT flag.
+
+This function fails when used on allocation made in memory type that is not
+`HOST_VISIBLE`.
+
+This function always fails when called for allocation that was created with
+#VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag. Such allocations cannot be
+mapped.
+
+This function doesn't automatically flush or invalidate caches.
+If the allocation is made from a memory types that is not `HOST_COHERENT`,
+you also need to use vmaInvalidateAllocation() / vmaFlushAllocation(), as required by Vulkan specification.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaMapMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    void** ppData);
+
+/** \brief Unmaps memory represented by given allocation, mapped previously using vmaMapMemory().
+
+For details, see description of vmaMapMemory().
+
+This function doesn't automatically flush or invalidate caches.
+If the allocation is made from a memory types that is not `HOST_COHERENT`,
+you also need to use vmaInvalidateAllocation() / vmaFlushAllocation(), as required by Vulkan specification.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaUnmapMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation);
+
+/** \brief Flushes memory of given allocation.
+
+Calls `vkFlushMappedMemoryRanges()` for memory associated with given range of given allocation.
+It needs to be called after writing to a mapped memory for memory types that are not `HOST_COHERENT`.
+Unmap operation doesn't do that automatically.
+
+- `offset` must be relative to the beginning of allocation.
+- `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation.
+- `offset` and `size` don't have to be aligned.
+  They are internally rounded down/up to multiply of `nonCoherentAtomSize`.
+- If `size` is 0, this call is ignored.
+- If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`,
+  this call is ignored.
+
+Warning! `offset` and `size` are relative to the contents of given `allocation`.
+If you mean whole allocation, you can pass 0 and `VK_WHOLE_SIZE`, respectively.
+Do not pass allocation's offset as `offset`!!!
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaFlushAllocation(VmaAllocator allocator, VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size);
+
+/** \brief Invalidates memory of given allocation.
+
+Calls `vkInvalidateMappedMemoryRanges()` for memory associated with given range of given allocation.
+It needs to be called before reading from a mapped memory for memory types that are not `HOST_COHERENT`.
+Map operation doesn't do that automatically.
+
+- `offset` must be relative to the beginning of allocation.
+- `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation.
+- `offset` and `size` don't have to be aligned.
+  They are internally rounded down/up to multiply of `nonCoherentAtomSize`.
+- If `size` is 0, this call is ignored.
+- If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`,
+  this call is ignored.
+
+Warning! `offset` and `size` are relative to the contents of given `allocation`.
+If you mean whole allocation, you can pass 0 and `VK_WHOLE_SIZE`, respectively.
+Do not pass allocation's offset as `offset`!!!
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaInvalidateAllocation(VmaAllocator allocator, VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size);
+
+/** \brief Checks magic number in margins around all allocations in given memory types (in both default and custom pools) in search for corruptions.
+
+@param memoryTypeBits Bit mask, where each bit set means that a memory type with that index should be checked.
+
+Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero,
+`VMA_DEBUG_MARGIN` is defined to nonzero and only for memory types that are
+`HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection).
+
+Possible return values:
+
+- `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for any of specified memory types.
+- `VK_SUCCESS` - corruption detection has been performed and succeeded.
+- `VK_ERROR_VALIDATION_FAILED_EXT` - corruption detection has been performed and found memory corruptions around one of the allocations.
+  `VMA_ASSERT` is also fired in that case.
+- Other value: Error returned by Vulkan, e.g. memory mapping failure.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckCorruption(VmaAllocator allocator, uint32_t memoryTypeBits);
+
+/** \struct VmaDefragmentationContext
+\brief Represents Opaque object that represents started defragmentation process.
+
+Fill structure #VmaDefragmentationInfo2 and call function vmaDefragmentationBegin() to create it.
+Call function vmaDefragmentationEnd() to destroy it.
+*/
+VK_DEFINE_HANDLE(VmaDefragmentationContext)
+
+/// Flags to be used in vmaDefragmentationBegin(). None at the moment. Reserved for future use.
+typedef enum VmaDefragmentationFlagBits {
+    VMA_DEFRAGMENTATION_FLAG_INCREMENTAL = 0x1,
+    VMA_DEFRAGMENTATION_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
+} VmaDefragmentationFlagBits;
+typedef VkFlags VmaDefragmentationFlags;
+
+/** \brief Parameters for defragmentation.
+
+To be used with function vmaDefragmentationBegin().
+*/
+typedef struct VmaDefragmentationInfo2 {
+    /** \brief Reserved for future use. Should be 0.
+    */
+    VmaDefragmentationFlags flags;
+    /** \brief Number of allocations in `pAllocations` array.
+    */
+    uint32_t allocationCount;
+    /** \brief Pointer to array of allocations that can be defragmented.
+
+    The array should have `allocationCount` elements.
+    The array should not contain nulls.
+    Elements in the array should be unique - same allocation cannot occur twice.
+    It is safe to pass allocations that are in the lost state - they are ignored.
+    All allocations not present in this array are considered non-moveable during this defragmentation.
+    */
+    VmaAllocation* pAllocations;
+    /** \brief Optional, output. Pointer to array that will be filled with information whether the allocation at certain index has been changed during defragmentation.
+
+    The array should have `allocationCount` elements.
+    You can pass null if you are not interested in this information.
+    */
+    VkBool32* pAllocationsChanged;
+    /** \brief Numer of pools in `pPools` array.
+    */
+    uint32_t poolCount;
+    /** \brief Either null or pointer to array of pools to be defragmented.
+
+    All the allocations in the specified pools can be moved during defragmentation
+    and there is no way to check if they were really moved as in `pAllocationsChanged`,
+    so you must query all the allocations in all these pools for new `VkDeviceMemory`
+    and offset using vmaGetAllocationInfo() if you might need to recreate buffers
+    and images bound to them.
+
+    The array should have `poolCount` elements.
+    The array should not contain nulls.
+    Elements in the array should be unique - same pool cannot occur twice.
+
+    Using this array is equivalent to specifying all allocations from the pools in `pAllocations`.
+    It might be more efficient.
+    */
+    VmaPool* pPools;
+    /** \brief Maximum total numbers of bytes that can be copied while moving allocations to different places using transfers on CPU side, like `memcpy()`, `memmove()`.
+    
+    `VK_WHOLE_SIZE` means no limit.
+    */
+    VkDeviceSize maxCpuBytesToMove;
+    /** \brief Maximum number of allocations that can be moved to a different place using transfers on CPU side, like `memcpy()`, `memmove()`.
+
+    `UINT32_MAX` means no limit.
+    */
+    uint32_t maxCpuAllocationsToMove;
+    /** \brief Maximum total numbers of bytes that can be copied while moving allocations to different places using transfers on GPU side, posted to `commandBuffer`.
+    
+    `VK_WHOLE_SIZE` means no limit.
+    */
+    VkDeviceSize maxGpuBytesToMove;
+    /** \brief Maximum number of allocations that can be moved to a different place using transfers on GPU side, posted to `commandBuffer`.
+
+    `UINT32_MAX` means no limit.
+    */
+    uint32_t maxGpuAllocationsToMove;
+    /** \brief Optional. Command buffer where GPU copy commands will be posted.
+
+    If not null, it must be a valid command buffer handle that supports Transfer queue type.
+    It must be in the recording state and outside of a render pass instance.
+    You need to submit it and make sure it finished execution before calling vmaDefragmentationEnd().
+
+    Passing null means that only CPU defragmentation will be performed.
+    */
+    VkCommandBuffer commandBuffer;
+} VmaDefragmentationInfo2;
+
+typedef struct VmaDefragmentationPassMoveInfo {
+    VmaAllocation allocation;
+    VkDeviceMemory memory;
+    VkDeviceSize offset;
+} VmaDefragmentationPassMoveInfo;
+
+/** \brief Parameters for incremental defragmentation steps.
+
+To be used with function vmaBeginDefragmentationPass().
+*/
+typedef struct VmaDefragmentationPassInfo {
+    uint32_t moveCount;
+    VmaDefragmentationPassMoveInfo* pMoves;
+} VmaDefragmentationPassInfo;
+
+/** \brief Deprecated. Optional configuration parameters to be passed to function vmaDefragment().
+
+\deprecated This is a part of the old interface. It is recommended to use structure #VmaDefragmentationInfo2 and function vmaDefragmentationBegin() instead.
+*/
+typedef struct VmaDefragmentationInfo {
+    /** \brief Maximum total numbers of bytes that can be copied while moving allocations to different places.
+    
+    Default is `VK_WHOLE_SIZE`, which means no limit.
+    */
+    VkDeviceSize maxBytesToMove;
+    /** \brief Maximum number of allocations that can be moved to different place.
+
+    Default is `UINT32_MAX`, which means no limit.
+    */
+    uint32_t maxAllocationsToMove;
+} VmaDefragmentationInfo;
+
+/** \brief Statistics returned by function vmaDefragment(). */
+typedef struct VmaDefragmentationStats {
+    /// Total number of bytes that have been copied while moving allocations to different places.
+    VkDeviceSize bytesMoved;
+    /// Total number of bytes that have been released to the system by freeing empty `VkDeviceMemory` objects.
+    VkDeviceSize bytesFreed;
+    /// Number of allocations that have been moved to different places.
+    uint32_t allocationsMoved;
+    /// Number of empty `VkDeviceMemory` objects that have been released to the system.
+    uint32_t deviceMemoryBlocksFreed;
+} VmaDefragmentationStats;
+
+/** \brief Begins defragmentation process.
+
+@param allocator Allocator object.
+@param pInfo Structure filled with parameters of defragmentation.
+@param[out] pStats Optional. Statistics of defragmentation. You can pass null if you are not interested in this information.
+@param[out] pContext Context object that must be passed to vmaDefragmentationEnd() to finish defragmentation.
+@return `VK_SUCCESS` and `*pContext == null` if defragmentation finished within this function call. `VK_NOT_READY` and `*pContext != null` if defragmentation has been started and you need to call vmaDefragmentationEnd() to finish it. Negative value in case of error.
+
+Use this function instead of old, deprecated vmaDefragment().
+
+Warning! Between the call to vmaDefragmentationBegin() and vmaDefragmentationEnd():
+
+- You should not use any of allocations passed as `pInfo->pAllocations` or
+  any allocations that belong to pools passed as `pInfo->pPools`,
+  including calling vmaGetAllocationInfo(), vmaTouchAllocation(), or access
+  their data.
+- Some mutexes protecting internal data structures may be locked, so trying to
+  make or free any allocations, bind buffers or images, map memory, or launch
+  another simultaneous defragmentation in between may cause stall (when done on
+  another thread) or deadlock (when done on the same thread), unless you are
+  100% sure that defragmented allocations are in different pools.
+- Information returned via `pStats` and `pInfo->pAllocationsChanged` are undefined.
+  They become valid after call to vmaDefragmentationEnd().
+- If `pInfo->commandBuffer` is not null, you must submit that command buffer
+  and make sure it finished execution before calling vmaDefragmentationEnd().
+
+For more information and important limitations regarding defragmentation, see documentation chapter:
+[Defragmentation](@ref defragmentation).
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaDefragmentationBegin(
+    VmaAllocator allocator,
+    const VmaDefragmentationInfo2* pInfo,
+    VmaDefragmentationStats* pStats,
+    VmaDefragmentationContext *pContext);
+
+/** \brief Ends defragmentation process.
+
+Use this function to finish defragmentation started by vmaDefragmentationBegin().
+It is safe to pass `context == null`. The function then does nothing.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaDefragmentationEnd(
+    VmaAllocator allocator,
+    VmaDefragmentationContext context);
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentationPass(
+    VmaAllocator allocator,
+    VmaDefragmentationContext context,
+    VmaDefragmentationPassInfo* pInfo
+);
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaEndDefragmentationPass(
+    VmaAllocator allocator,
+    VmaDefragmentationContext context
+);
+
+/** \brief Deprecated. Compacts memory by moving allocations.
+
+@param pAllocations Array of allocations that can be moved during this compation.
+@param allocationCount Number of elements in pAllocations and pAllocationsChanged arrays.
+@param[out] pAllocationsChanged Array of boolean values that will indicate whether matching allocation in pAllocations array has been moved. This parameter is optional. Pass null if you don't need this information.
+@param pDefragmentationInfo Configuration parameters. Optional - pass null to use default values.
+@param[out] pDefragmentationStats Statistics returned by the function. Optional - pass null if you don't need this information.
+@return `VK_SUCCESS` if completed, negative error code in case of error.
+
+\deprecated This is a part of the old interface. It is recommended to use structure #VmaDefragmentationInfo2 and function vmaDefragmentationBegin() instead.
+
+This function works by moving allocations to different places (different
+`VkDeviceMemory` objects and/or different offsets) in order to optimize memory
+usage. Only allocations that are in `pAllocations` array can be moved. All other
+allocations are considered nonmovable in this call. Basic rules:
+
+- Only allocations made in memory types that have
+  `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` and `VK_MEMORY_PROPERTY_HOST_COHERENT_BIT`
+  flags can be compacted. You may pass other allocations but it makes no sense -
+  these will never be moved.
+- Custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT or
+  #VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT flag are not defragmented. Allocations
+  passed to this function that come from such pools are ignored.
+- Allocations created with #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT or
+  created as dedicated allocations for any other reason are also ignored.
+- Both allocations made with or without #VMA_ALLOCATION_CREATE_MAPPED_BIT
+  flag can be compacted. If not persistently mapped, memory will be mapped
+  temporarily inside this function if needed.
+- You must not pass same #VmaAllocation object multiple times in `pAllocations` array.
+
+The function also frees empty `VkDeviceMemory` blocks.
+
+Warning: This function may be time-consuming, so you shouldn't call it too often
+(like after every resource creation/destruction).
+You can call it on special occasions (like when reloading a game level or
+when you just destroyed a lot of objects). Calling it every frame may be OK, but
+you should measure that on your platform.
+
+For more information, see [Defragmentation](@ref defragmentation) chapter.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaDefragment(
+    VmaAllocator allocator,
+    VmaAllocation* pAllocations,
+    size_t allocationCount,
+    VkBool32* pAllocationsChanged,
+    const VmaDefragmentationInfo *pDefragmentationInfo,
+    VmaDefragmentationStats* pDefragmentationStats);
+
+/** \brief Binds buffer to allocation.
+
+Binds specified buffer to region of memory represented by specified allocation.
+Gets `VkDeviceMemory` handle and offset from the allocation.
+If you want to create a buffer, allocate memory for it and bind them together separately,
+you should use this function for binding instead of standard `vkBindBufferMemory()`,
+because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple
+allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously
+(which is illegal in Vulkan).
+
+It is recommended to use function vmaCreateBuffer() instead of this one.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkBuffer buffer);
+
+/** \brief Binds buffer to allocation with additional parameters.
+
+@param allocationLocalOffset Additional offset to be added while binding, relative to the beginnig of the `allocation`. Normally it should be 0.
+@param pNext A chain of structures to be attached to `VkBindBufferMemoryInfoKHR` structure used internally. Normally it should be null.
+
+This function is similar to vmaBindBufferMemory(), but it provides additional parameters.
+
+If `pNext` is not null, #VmaAllocator object must have been created with #VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT flag
+or with VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_1`. Otherwise the call fails.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory2(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkDeviceSize allocationLocalOffset,
+    VkBuffer buffer,
+    const void* pNext);
+
+/** \brief Binds image to allocation.
+
+Binds specified image to region of memory represented by specified allocation.
+Gets `VkDeviceMemory` handle and offset from the allocation.
+If you want to create an image, allocate memory for it and bind them together separately,
+you should use this function for binding instead of standard `vkBindImageMemory()`,
+because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple
+allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously
+(which is illegal in Vulkan).
+
+It is recommended to use function vmaCreateImage() instead of this one.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkImage image);
+
+/** \brief Binds image to allocation with additional parameters.
+
+@param allocationLocalOffset Additional offset to be added while binding, relative to the beginnig of the `allocation`. Normally it should be 0.
+@param pNext A chain of structures to be attached to `VkBindImageMemoryInfoKHR` structure used internally. Normally it should be null.
+
+This function is similar to vmaBindImageMemory(), but it provides additional parameters.
+
+If `pNext` is not null, #VmaAllocator object must have been created with #VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT flag
+or with VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_1`. Otherwise the call fails.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory2(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkDeviceSize allocationLocalOffset,
+    VkImage image,
+    const void* pNext);
+
+/**
+@param[out] pBuffer Buffer that was created.
+@param[out] pAllocation Allocation that was created.
+@param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().
+
+This function automatically:
+
+-# Creates buffer.
+-# Allocates appropriate memory for it.
+-# Binds the buffer with the memory.
+
+If any of these operations fail, buffer and allocation are not created,
+returned value is negative error code, *pBuffer and *pAllocation are null.
+
+If the function succeeded, you must destroy both buffer and allocation when you
+no longer need them using either convenience function vmaDestroyBuffer() or
+separately, using `vkDestroyBuffer()` and vmaFreeMemory().
+
+If VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT flag was used,
+VK_KHR_dedicated_allocation extension is used internally to query driver whether
+it requires or prefers the new buffer to have dedicated allocation. If yes,
+and if dedicated allocation is possible (VmaAllocationCreateInfo::pool is null
+and VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT is not used), it creates dedicated
+allocation for this buffer, just like when using
+VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBuffer(
+    VmaAllocator allocator,
+    const VkBufferCreateInfo* pBufferCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    VkBuffer* pBuffer,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo);
+
+/** \brief Destroys Vulkan buffer and frees allocated memory.
+
+This is just a convenience function equivalent to:
+
+\code
+vkDestroyBuffer(device, buffer, allocationCallbacks);
+vmaFreeMemory(allocator, allocation);
+\endcode
+
+It it safe to pass null as buffer and/or allocation.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyBuffer(
+    VmaAllocator allocator,
+    VkBuffer buffer,
+    VmaAllocation allocation);
+
+/// Function similar to vmaCreateBuffer().
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage(
+    VmaAllocator allocator,
+    const VkImageCreateInfo* pImageCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    VkImage* pImage,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo);
+
+/** \brief Destroys Vulkan image and frees allocated memory.
+
+This is just a convenience function equivalent to:
+
+\code
+vkDestroyImage(device, image, allocationCallbacks);
+vmaFreeMemory(allocator, allocation);
+\endcode
+
+It it safe to pass null as image and/or allocation.
+*/
+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage(
+    VmaAllocator allocator,
+    VkImage image,
+    VmaAllocation allocation);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // AMD_VULKAN_MEMORY_ALLOCATOR_H
+
+// For Visual Studio IntelliSense.
+#if defined(__cplusplus) && defined(__INTELLISENSE__)
+#define VMA_IMPLEMENTATION
+#endif
+
+#ifdef VMA_IMPLEMENTATION
+#undef VMA_IMPLEMENTATION
+
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+
+/*******************************************************************************
+CONFIGURATION SECTION
+
+Define some of these macros before each #include of this header or change them
+here if you need other then default behavior depending on your environment.
+*/
+
+/*
+Define this macro to 1 to make the library fetch pointers to Vulkan functions
+internally, like:
+
+    vulkanFunctions.vkAllocateMemory = &vkAllocateMemory;
+
+Define to 0 if you are going to provide you own pointers to Vulkan functions via
+VmaAllocatorCreateInfo::pVulkanFunctions.
+*/
+#if !defined(VMA_STATIC_VULKAN_FUNCTIONS) && !defined(VK_NO_PROTOTYPES)
+#define VMA_STATIC_VULKAN_FUNCTIONS 1
+#endif
+
+// Define this macro to 1 to make the library use STL containers instead of its own implementation.
+//#define VMA_USE_STL_CONTAINERS 1
+
+/* Set this macro to 1 to make the library including and using STL containers:
+std::pair, std::vector, std::list, std::unordered_map.
+
+Set it to 0 or undefined to make the library using its own implementation of
+the containers.
+*/
+#if VMA_USE_STL_CONTAINERS
+   #define VMA_USE_STL_VECTOR 1
+   #define VMA_USE_STL_UNORDERED_MAP 1
+   #define VMA_USE_STL_LIST 1
+#endif
+
+#ifndef VMA_USE_STL_SHARED_MUTEX
+    // Compiler conforms to C++17.
+    #if __cplusplus >= 201703L
+        #define VMA_USE_STL_SHARED_MUTEX 1
+    // Visual studio defines __cplusplus properly only when passed additional parameter: /Zc:__cplusplus
+    // Otherwise it's always 199711L, despite shared_mutex works since Visual Studio 2015 Update 2.
+    // See: https://blogs.msdn.microsoft.com/vcblog/2018/04/09/msvc-now-correctly-reports-__cplusplus/
+    #elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918 && __cplusplus == 199711L && _MSVC_LANG >= 201703L
+        #define VMA_USE_STL_SHARED_MUTEX 1
+    #else
+        #define VMA_USE_STL_SHARED_MUTEX 0
+    #endif
+#endif
+
+/*
+THESE INCLUDES ARE NOT ENABLED BY DEFAULT.
+Library has its own container implementation.
+*/
+#if VMA_USE_STL_VECTOR
+   #include <vector>
+#endif
+
+#if VMA_USE_STL_UNORDERED_MAP
+   #include <unordered_map>
+#endif
+
+#if VMA_USE_STL_LIST
+   #include <list>
+#endif
+
+/*
+Following headers are used in this CONFIGURATION section only, so feel free to
+remove them if not needed.
+*/
+#include <cassert> // for assert
+#include <algorithm> // for min, max
+#include <mutex>
+
+#ifndef VMA_NULL
+   // Value used as null pointer. Define it to e.g.: nullptr, NULL, 0, (void*)0.
+   #define VMA_NULL   nullptr
+#endif
+
+#if defined(__ANDROID_API__) && (__ANDROID_API__ < 16)
+#include <cstdlib>
+void *aligned_alloc(size_t alignment, size_t size)
+{
+    // alignment must be >= sizeof(void*)
+    if(alignment < sizeof(void*))
+    {
+        alignment = sizeof(void*);
+    }
+
+    return memalign(alignment, size);
+}
+#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC))
+#include <cstdlib>
+void *aligned_alloc(size_t alignment, size_t size)
+{
+    // alignment must be >= sizeof(void*)
+    if(alignment < sizeof(void*))
+    {
+        alignment = sizeof(void*);
+    }
+
+    void *pointer;
+    if(posix_memalign(&pointer, alignment, size) == 0)
+        return pointer;
+    return VMA_NULL;
+}
+#endif
+
+// If your compiler is not compatible with C++11 and definition of
+// aligned_alloc() function is missing, uncommeting following line may help:
+
+//#include <malloc.h>
+
+// Normal assert to check for programmer's errors, especially in Debug configuration.
+#ifndef VMA_ASSERT
+   #ifdef NDEBUG
+       #define VMA_ASSERT(expr)
+   #else
+       #define VMA_ASSERT(expr)         assert(expr)
+   #endif
+#endif
+
+// Assert that will be called very often, like inside data structures e.g. operator[].
+// Making it non-empty can make program slow.
+#ifndef VMA_HEAVY_ASSERT
+   #ifdef NDEBUG
+       #define VMA_HEAVY_ASSERT(expr)
+   #else
+       #define VMA_HEAVY_ASSERT(expr)   //VMA_ASSERT(expr)
+   #endif
+#endif
+
+#ifndef VMA_ALIGN_OF
+   #define VMA_ALIGN_OF(type)       (__alignof(type))
+#endif
+
+#ifndef VMA_SYSTEM_ALIGNED_MALLOC
+   #if defined(_WIN32)
+       #define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment)   (_aligned_malloc((size), (alignment)))
+   #else
+       #define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment)   (aligned_alloc((alignment), (size) ))
+   #endif
+#endif
+
+#ifndef VMA_SYSTEM_FREE
+   #if defined(_WIN32)
+       #define VMA_SYSTEM_FREE(ptr)   _aligned_free(ptr)
+   #else
+       #define VMA_SYSTEM_FREE(ptr)   free(ptr)
+   #endif
+#endif
+
+#ifndef VMA_MIN
+   #define VMA_MIN(v1, v2)    (std::min((v1), (v2)))
+#endif
+
+#ifndef VMA_MAX
+   #define VMA_MAX(v1, v2)    (std::max((v1), (v2)))
+#endif
+
+#ifndef VMA_SWAP
+   #define VMA_SWAP(v1, v2)   std::swap((v1), (v2))
+#endif
+
+#ifndef VMA_SORT
+   #define VMA_SORT(beg, end, cmp)  std::sort(beg, end, cmp)
+#endif
+
+#ifndef VMA_DEBUG_LOG
+   #define VMA_DEBUG_LOG(format, ...)
+   /*
+   #define VMA_DEBUG_LOG(format, ...) do { \
+       printf(format, __VA_ARGS__); \
+       printf("\n"); \
+   } while(false)
+   */
+#endif
+
+// Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString.
+#if VMA_STATS_STRING_ENABLED
+    static inline void VmaUint32ToStr(char* outStr, size_t strLen, uint32_t num)
+    {
+        snprintf(outStr, strLen, "%u", static_cast<unsigned int>(num));
+    }
+    static inline void VmaUint64ToStr(char* outStr, size_t strLen, uint64_t num)
+    {
+        snprintf(outStr, strLen, "%llu", static_cast<unsigned long long>(num));
+    }
+    static inline void VmaPtrToStr(char* outStr, size_t strLen, const void* ptr)
+    {
+        snprintf(outStr, strLen, "%p", ptr);
+    }
+#endif
+
+#ifndef VMA_MUTEX
+    class VmaMutex
+    {
+    public:
+        void Lock() { m_Mutex.lock(); }
+        void Unlock() { m_Mutex.unlock(); }
+        bool TryLock() { return m_Mutex.try_lock(); }
+    private:
+        std::mutex m_Mutex;
+    };
+    #define VMA_MUTEX VmaMutex
+#endif
+
+// Read-write mutex, where "read" is shared access, "write" is exclusive access.
+#ifndef VMA_RW_MUTEX
+    #if VMA_USE_STL_SHARED_MUTEX
+        // Use std::shared_mutex from C++17.
+        #include <shared_mutex>
+        class VmaRWMutex
+        {
+        public:
+            void LockRead() { m_Mutex.lock_shared(); }
+            void UnlockRead() { m_Mutex.unlock_shared(); }
+            bool TryLockRead() { return m_Mutex.try_lock_shared(); }
+            void LockWrite() { m_Mutex.lock(); }
+            void UnlockWrite() { m_Mutex.unlock(); }
+            bool TryLockWrite() { return m_Mutex.try_lock(); }
+        private:
+            std::shared_mutex m_Mutex;
+        };
+        #define VMA_RW_MUTEX VmaRWMutex
+    #elif defined(_WIN32) && defined(WINVER) && WINVER >= 0x0600
+        // Use SRWLOCK from WinAPI.
+        // Minimum supported client = Windows Vista, server = Windows Server 2008.
+        class VmaRWMutex
+        {
+        public:
+            VmaRWMutex() { InitializeSRWLock(&m_Lock); }
+            void LockRead() { AcquireSRWLockShared(&m_Lock); }
+            void UnlockRead() { ReleaseSRWLockShared(&m_Lock); }
+            bool TryLockRead() { return TryAcquireSRWLockShared(&m_Lock) != FALSE; }
+            void LockWrite() { AcquireSRWLockExclusive(&m_Lock); }
+            void UnlockWrite() { ReleaseSRWLockExclusive(&m_Lock); }
+            bool TryLockWrite() { return TryAcquireSRWLockExclusive(&m_Lock) != FALSE; }
+        private:
+            SRWLOCK m_Lock;
+        };
+        #define VMA_RW_MUTEX VmaRWMutex
+    #else
+        // Less efficient fallback: Use normal mutex.
+        class VmaRWMutex
+        {
+        public:
+            void LockRead() { m_Mutex.Lock(); }
+            void UnlockRead() { m_Mutex.Unlock(); }
+            bool TryLockRead() { return m_Mutex.TryLock(); }
+            void LockWrite() { m_Mutex.Lock(); }
+            void UnlockWrite() { m_Mutex.Unlock(); }
+            bool TryLockWrite() { return m_Mutex.TryLock(); }
+        private:
+            VMA_MUTEX m_Mutex;
+        };
+        #define VMA_RW_MUTEX VmaRWMutex
+    #endif // #if VMA_USE_STL_SHARED_MUTEX
+#endif // #ifndef VMA_RW_MUTEX
+
+/*
+If providing your own implementation, you need to implement a subset of std::atomic.
+*/
+#ifndef VMA_ATOMIC_UINT32
+    #include <atomic>
+    #define VMA_ATOMIC_UINT32 std::atomic<uint32_t>
+#endif
+
+#ifndef VMA_ATOMIC_UINT64
+    #include <atomic>
+    #define VMA_ATOMIC_UINT64 std::atomic<uint64_t>
+#endif
+
+#ifndef VMA_DEBUG_ALWAYS_DEDICATED_MEMORY
+    /**
+    Every allocation will have its own memory block.
+    Define to 1 for debugging purposes only.
+    */
+    #define VMA_DEBUG_ALWAYS_DEDICATED_MEMORY (0)
+#endif
+
+#ifndef VMA_DEBUG_ALIGNMENT
+    /**
+    Minimum alignment of all allocations, in bytes.
+    Set to more than 1 for debugging purposes only. Must be power of two.
+    */
+    #define VMA_DEBUG_ALIGNMENT (1)
+#endif
+
+#ifndef VMA_DEBUG_MARGIN
+    /**
+    Minimum margin before and after every allocation, in bytes.
+    Set nonzero for debugging purposes only.
+    */
+    #define VMA_DEBUG_MARGIN (0)
+#endif
+
+#ifndef VMA_DEBUG_INITIALIZE_ALLOCATIONS
+    /**
+    Define this macro to 1 to automatically fill new allocations and destroyed
+    allocations with some bit pattern.
+    */
+    #define VMA_DEBUG_INITIALIZE_ALLOCATIONS (0)
+#endif
+
+#ifndef VMA_DEBUG_DETECT_CORRUPTION
+    /**
+    Define this macro to 1 together with non-zero value of VMA_DEBUG_MARGIN to
+    enable writing magic value to the margin before and after every allocation and
+    validating it, so that memory corruptions (out-of-bounds writes) are detected.
+    */
+    #define VMA_DEBUG_DETECT_CORRUPTION (0)
+#endif
+
+#ifndef VMA_DEBUG_GLOBAL_MUTEX
+    /**
+    Set this to 1 for debugging purposes only, to enable single mutex protecting all
+    entry calls to the library. Can be useful for debugging multithreading issues.
+    */
+    #define VMA_DEBUG_GLOBAL_MUTEX (0)
+#endif
+
+#ifndef VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY
+    /**
+    Minimum value for VkPhysicalDeviceLimits::bufferImageGranularity.
+    Set to more than 1 for debugging purposes only. Must be power of two.
+    */
+    #define VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY (1)
+#endif
+
+#ifndef VMA_SMALL_HEAP_MAX_SIZE
+   /// Maximum size of a memory heap in Vulkan to consider it "small".
+   #define VMA_SMALL_HEAP_MAX_SIZE (1024ull * 1024 * 1024)
+#endif
+
+#ifndef VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE
+   /// Default size of a block allocated as single VkDeviceMemory from a "large" heap.
+   #define VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE (256ull * 1024 * 1024)
+#endif
+
+#ifndef VMA_CLASS_NO_COPY
+    #define VMA_CLASS_NO_COPY(className) \
+        private: \
+            className(const className&) = delete; \
+            className& operator=(const className&) = delete;
+#endif
+
+static const uint32_t VMA_FRAME_INDEX_LOST = UINT32_MAX;
+
+// Decimal 2139416166, float NaN, little-endian binary 66 E6 84 7F.
+static const uint32_t VMA_CORRUPTION_DETECTION_MAGIC_VALUE = 0x7F84E666;
+
+static const uint8_t VMA_ALLOCATION_FILL_PATTERN_CREATED   = 0xDC;
+static const uint8_t VMA_ALLOCATION_FILL_PATTERN_DESTROYED = 0xEF;
+
+/*******************************************************************************
+END OF CONFIGURATION
+*/
+
+static const uint32_t VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET = 0x10000000u;
+
+static VkAllocationCallbacks VmaEmptyAllocationCallbacks = {
+    VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL };
+
+// Returns number of bits set to 1 in (v).
+static inline uint32_t VmaCountBitsSet(uint32_t v)
+{
+	uint32_t c = v - ((v >> 1) & 0x55555555);
+	c = ((c >>  2) & 0x33333333) + (c & 0x33333333);
+	c = ((c >>  4) + c) & 0x0F0F0F0F;
+	c = ((c >>  8) + c) & 0x00FF00FF;
+	c = ((c >> 16) + c) & 0x0000FFFF;
+	return c;
+}
+
+// Aligns given value up to nearest multiply of align value. For example: VmaAlignUp(11, 8) = 16.
+// Use types like uint32_t, uint64_t as T.
+template <typename T>
+static inline T VmaAlignUp(T val, T align)
+{
+	return (val + align - 1) / align * align;
+}
+// Aligns given value down to nearest multiply of align value. For example: VmaAlignUp(11, 8) = 8.
+// Use types like uint32_t, uint64_t as T.
+template <typename T>
+static inline T VmaAlignDown(T val, T align)
+{
+    return val / align * align;
+}
+
+// Division with mathematical rounding to nearest number.
+template <typename T>
+static inline T VmaRoundDiv(T x, T y)
+{
+	return (x + (y / (T)2)) / y;
+}
+
+/*
+Returns true if given number is a power of two.
+T must be unsigned integer number or signed integer but always nonnegative.
+For 0 returns true.
+*/
+template <typename T>
+inline bool VmaIsPow2(T x)
+{
+    return (x & (x-1)) == 0;
+}
+
+// Returns smallest power of 2 greater or equal to v.
+static inline uint32_t VmaNextPow2(uint32_t v)
+{
+	v--;
+    v |= v >> 1;
+    v |= v >> 2;
+    v |= v >> 4;
+    v |= v >> 8;
+    v |= v >> 16;
+    v++;
+    return v;
+}
+static inline uint64_t VmaNextPow2(uint64_t v)
+{
+	v--;
+    v |= v >> 1;
+    v |= v >> 2;
+    v |= v >> 4;
+    v |= v >> 8;
+    v |= v >> 16;
+    v |= v >> 32;
+    v++;
+    return v;
+}
+
+// Returns largest power of 2 less or equal to v.
+static inline uint32_t VmaPrevPow2(uint32_t v)
+{
+    v |= v >> 1;
+    v |= v >> 2;
+    v |= v >> 4;
+    v |= v >> 8;
+    v |= v >> 16;
+    v = v ^ (v >> 1);
+    return v;
+}
+static inline uint64_t VmaPrevPow2(uint64_t v)
+{
+    v |= v >> 1;
+    v |= v >> 2;
+    v |= v >> 4;
+    v |= v >> 8;
+    v |= v >> 16;
+    v |= v >> 32;
+    v = v ^ (v >> 1);
+    return v;
+}
+
+static inline bool VmaStrIsEmpty(const char* pStr)
+{
+    return pStr == VMA_NULL || *pStr == '\0';
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+static const char* VmaAlgorithmToStr(uint32_t algorithm)
+{
+    switch(algorithm)
+    {
+    case VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT:
+        return "Linear";
+    case VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT:
+        return "Buddy";
+    case 0:
+        return "Default";
+    default:
+        VMA_ASSERT(0);
+        return "";
+    }
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+#ifndef VMA_SORT
+
+template<typename Iterator, typename Compare>
+Iterator VmaQuickSortPartition(Iterator beg, Iterator end, Compare cmp)
+{
+    Iterator centerValue = end; --centerValue;
+    Iterator insertIndex = beg;
+    for(Iterator memTypeIndex = beg; memTypeIndex < centerValue; ++memTypeIndex)
+    {
+        if(cmp(*memTypeIndex, *centerValue))
+        {
+            if(insertIndex != memTypeIndex)
+            {
+                VMA_SWAP(*memTypeIndex, *insertIndex);
+            }
+            ++insertIndex;
+        }
+    }
+    if(insertIndex != centerValue)
+    {
+        VMA_SWAP(*insertIndex, *centerValue);
+    }
+    return insertIndex;
+}
+
+template<typename Iterator, typename Compare>
+void VmaQuickSort(Iterator beg, Iterator end, Compare cmp)
+{
+    if(beg < end)
+    {
+        Iterator it = VmaQuickSortPartition<Iterator, Compare>(beg, end, cmp);
+        VmaQuickSort<Iterator, Compare>(beg, it, cmp);
+        VmaQuickSort<Iterator, Compare>(it + 1, end, cmp);
+    }
+}
+
+#define VMA_SORT(beg, end, cmp) VmaQuickSort(beg, end, cmp)
+
+#endif // #ifndef VMA_SORT
+
+/*
+Returns true if two memory blocks occupy overlapping pages.
+ResourceA must be in less memory offset than ResourceB.
+
+Algorithm is based on "Vulkan 1.0.39 - A Specification (with all registered Vulkan extensions)"
+chapter 11.6 "Resource Memory Association", paragraph "Buffer-Image Granularity".
+*/
+static inline bool VmaBlocksOnSamePage(
+    VkDeviceSize resourceAOffset,
+    VkDeviceSize resourceASize,
+    VkDeviceSize resourceBOffset,
+    VkDeviceSize pageSize)
+{
+    VMA_ASSERT(resourceAOffset + resourceASize <= resourceBOffset && resourceASize > 0 && pageSize > 0);
+    VkDeviceSize resourceAEnd = resourceAOffset + resourceASize - 1;
+    VkDeviceSize resourceAEndPage = resourceAEnd & ~(pageSize - 1);
+    VkDeviceSize resourceBStart = resourceBOffset;
+    VkDeviceSize resourceBStartPage = resourceBStart & ~(pageSize - 1);
+    return resourceAEndPage == resourceBStartPage;
+}
+
+enum VmaSuballocationType
+{
+    VMA_SUBALLOCATION_TYPE_FREE = 0,
+    VMA_SUBALLOCATION_TYPE_UNKNOWN = 1,
+    VMA_SUBALLOCATION_TYPE_BUFFER = 2,
+    VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN = 3,
+    VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR = 4,
+    VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL = 5,
+    VMA_SUBALLOCATION_TYPE_MAX_ENUM = 0x7FFFFFFF
+};
+
+/*
+Returns true if given suballocation types could conflict and must respect
+VkPhysicalDeviceLimits::bufferImageGranularity. They conflict if one is buffer
+or linear image and another one is optimal image. If type is unknown, behave
+conservatively.
+*/
+static inline bool VmaIsBufferImageGranularityConflict(
+    VmaSuballocationType suballocType1,
+    VmaSuballocationType suballocType2)
+{
+    if(suballocType1 > suballocType2)
+    {
+        VMA_SWAP(suballocType1, suballocType2);
+    }
+    
+    switch(suballocType1)
+    {
+    case VMA_SUBALLOCATION_TYPE_FREE:
+        return false;
+    case VMA_SUBALLOCATION_TYPE_UNKNOWN:
+        return true;
+    case VMA_SUBALLOCATION_TYPE_BUFFER:
+        return
+            suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||
+            suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL;
+    case VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN:
+        return
+            suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||
+            suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR ||
+            suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL;
+    case VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR:
+        return
+            suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL;
+    case VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL:
+        return false;
+    default:
+        VMA_ASSERT(0);
+        return true;
+    }
+}
+
+static void VmaWriteMagicValue(void* pData, VkDeviceSize offset)
+{
+#if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION
+    uint32_t* pDst = (uint32_t*)((char*)pData + offset);
+    const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t);
+    for(size_t i = 0; i < numberCount; ++i, ++pDst)
+    {
+        *pDst = VMA_CORRUPTION_DETECTION_MAGIC_VALUE;
+    }
+#else
+    // no-op
+#endif
+}
+
+static bool VmaValidateMagicValue(const void* pData, VkDeviceSize offset)
+{
+#if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION
+    const uint32_t* pSrc = (const uint32_t*)((const char*)pData + offset);
+    const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t);
+    for(size_t i = 0; i < numberCount; ++i, ++pSrc)
+    {
+        if(*pSrc != VMA_CORRUPTION_DETECTION_MAGIC_VALUE)
+        {
+            return false;
+        }
+    }
+#endif
+    return true;
+}
+
+/*
+Fills structure with parameters of an example buffer to be used for transfers
+during GPU memory defragmentation.
+*/
+static void VmaFillGpuDefragmentationBufferCreateInfo(VkBufferCreateInfo& outBufCreateInfo)
+{
+    memset(&outBufCreateInfo, 0, sizeof(outBufCreateInfo));
+    outBufCreateInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
+    outBufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+    outBufCreateInfo.size = (VkDeviceSize)VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE; // Example size.
+}
+
+// Helper RAII class to lock a mutex in constructor and unlock it in destructor (at the end of scope).
+struct VmaMutexLock
+{
+    VMA_CLASS_NO_COPY(VmaMutexLock)
+public:
+    VmaMutexLock(VMA_MUTEX& mutex, bool useMutex = true) :
+        m_pMutex(useMutex ? &mutex : VMA_NULL)
+    { if(m_pMutex) { m_pMutex->Lock(); } }
+    ~VmaMutexLock()
+    { if(m_pMutex) { m_pMutex->Unlock(); } }
+private:
+    VMA_MUTEX* m_pMutex;
+};
+
+// Helper RAII class to lock a RW mutex in constructor and unlock it in destructor (at the end of scope), for reading.
+struct VmaMutexLockRead
+{
+    VMA_CLASS_NO_COPY(VmaMutexLockRead)
+public:
+    VmaMutexLockRead(VMA_RW_MUTEX& mutex, bool useMutex) :
+        m_pMutex(useMutex ? &mutex : VMA_NULL)
+    { if(m_pMutex) { m_pMutex->LockRead(); } }
+    ~VmaMutexLockRead() { if(m_pMutex) { m_pMutex->UnlockRead(); } }
+private:
+    VMA_RW_MUTEX* m_pMutex;
+};
+
+// Helper RAII class to lock a RW mutex in constructor and unlock it in destructor (at the end of scope), for writing.
+struct VmaMutexLockWrite
+{
+    VMA_CLASS_NO_COPY(VmaMutexLockWrite)
+public:
+    VmaMutexLockWrite(VMA_RW_MUTEX& mutex, bool useMutex) :
+        m_pMutex(useMutex ? &mutex : VMA_NULL)
+    { if(m_pMutex) { m_pMutex->LockWrite(); } }
+    ~VmaMutexLockWrite() { if(m_pMutex) { m_pMutex->UnlockWrite(); } }
+private:
+    VMA_RW_MUTEX* m_pMutex;
+};
+
+#if VMA_DEBUG_GLOBAL_MUTEX
+    static VMA_MUTEX gDebugGlobalMutex;
+    #define VMA_DEBUG_GLOBAL_MUTEX_LOCK VmaMutexLock debugGlobalMutexLock(gDebugGlobalMutex, true);
+#else
+    #define VMA_DEBUG_GLOBAL_MUTEX_LOCK
+#endif
+
+// Minimum size of a free suballocation to register it in the free suballocation collection.
+static const VkDeviceSize VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER = 16;
+
+/*
+Performs binary search and returns iterator to first element that is greater or
+equal to (key), according to comparison (cmp).
+
+Cmp should return true if first argument is less than second argument.
+
+Returned value is the found element, if present in the collection or place where
+new element with value (key) should be inserted.
+*/
+template <typename CmpLess, typename IterT, typename KeyT>
+static IterT VmaBinaryFindFirstNotLess(IterT beg, IterT end, const KeyT &key, const CmpLess& cmp)
+{
+    size_t down = 0, up = (end - beg);
+    while(down < up)
+    {
+        const size_t mid = (down + up) / 2;
+        if(cmp(*(beg+mid), key))
+        {
+            down = mid + 1;
+        }
+        else
+        {
+            up = mid;
+        }
+    }
+    return beg + down;
+}
+
+template<typename CmpLess, typename IterT, typename KeyT>
+IterT VmaBinaryFindSorted(const IterT& beg, const IterT& end, const KeyT& value, const CmpLess& cmp)
+{
+    IterT it = VmaBinaryFindFirstNotLess<CmpLess, IterT, KeyT>(
+        beg, end, value, cmp);
+    if(it == end ||
+        (!cmp(*it, value) && !cmp(value, *it)))
+    {
+        return it;
+    }
+    return end;
+}
+
+/*
+Returns true if all pointers in the array are not-null and unique.
+Warning! O(n^2) complexity. Use only inside VMA_HEAVY_ASSERT.
+T must be pointer type, e.g. VmaAllocation, VmaPool.
+*/
+template<typename T>
+static bool VmaValidatePointerArray(uint32_t count, const T* arr)
+{
+    for(uint32_t i = 0; i < count; ++i)
+    {
+        const T iPtr = arr[i];
+        if(iPtr == VMA_NULL)
+        {
+            return false;
+        }
+        for(uint32_t j = i + 1; j < count; ++j)
+        {
+            if(iPtr == arr[j])
+            {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Memory allocation
+
+static void* VmaMalloc(const VkAllocationCallbacks* pAllocationCallbacks, size_t size, size_t alignment)
+{
+    if((pAllocationCallbacks != VMA_NULL) &&
+        (pAllocationCallbacks->pfnAllocation != VMA_NULL))
+    {
+        return (*pAllocationCallbacks->pfnAllocation)(
+            pAllocationCallbacks->pUserData,
+            size,
+            alignment,
+            VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
+    }
+    else
+    {
+        return VMA_SYSTEM_ALIGNED_MALLOC(size, alignment);
+    }
+}
+
+static void VmaFree(const VkAllocationCallbacks* pAllocationCallbacks, void* ptr)
+{
+    if((pAllocationCallbacks != VMA_NULL) &&
+        (pAllocationCallbacks->pfnFree != VMA_NULL))
+    {
+        (*pAllocationCallbacks->pfnFree)(pAllocationCallbacks->pUserData, ptr);
+    }
+    else
+    {
+        VMA_SYSTEM_FREE(ptr);
+    }
+}
+
+template<typename T>
+static T* VmaAllocate(const VkAllocationCallbacks* pAllocationCallbacks)
+{
+    return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T), VMA_ALIGN_OF(T));
+}
+
+template<typename T>
+static T* VmaAllocateArray(const VkAllocationCallbacks* pAllocationCallbacks, size_t count)
+{
+    return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T) * count, VMA_ALIGN_OF(T));
+}
+
+#define vma_new(allocator, type)   new(VmaAllocate<type>(allocator))(type)
+
+#define vma_new_array(allocator, type, count)   new(VmaAllocateArray<type>((allocator), (count)))(type)
+
+template<typename T>
+static void vma_delete(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr)
+{
+    ptr->~T();
+    VmaFree(pAllocationCallbacks, ptr);
+}
+
+template<typename T>
+static void vma_delete_array(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr, size_t count)
+{
+    if(ptr != VMA_NULL)
+    {
+        for(size_t i = count; i--; )
+        {
+            ptr[i].~T();
+        }
+        VmaFree(pAllocationCallbacks, ptr);
+    }
+}
+
+static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char* srcStr)
+{
+    if(srcStr != VMA_NULL)
+    {
+        const size_t len = strlen(srcStr);
+        char* const result = vma_new_array(allocs, char, len + 1);
+        memcpy(result, srcStr, len + 1);
+        return result;
+    }
+    else
+    {
+        return VMA_NULL;
+    }
+}
+
+static void VmaFreeString(const VkAllocationCallbacks* allocs, char* str)
+{
+    if(str != VMA_NULL)
+    {
+        const size_t len = strlen(str);
+        vma_delete_array(allocs, str, len + 1);
+    }
+}
+
+// STL-compatible allocator.
+template<typename T>
+class VmaStlAllocator
+{
+public:
+    const VkAllocationCallbacks* const m_pCallbacks;
+    typedef T value_type;
+    
+    VmaStlAllocator(const VkAllocationCallbacks* pCallbacks) : m_pCallbacks(pCallbacks) { }
+    template<typename U> VmaStlAllocator(const VmaStlAllocator<U>& src) : m_pCallbacks(src.m_pCallbacks) { }
+
+    T* allocate(size_t n) { return VmaAllocateArray<T>(m_pCallbacks, n); }
+    void deallocate(T* p, size_t n) { VmaFree(m_pCallbacks, p); }
+
+    template<typename U>
+    bool operator==(const VmaStlAllocator<U>& rhs) const
+    {
+        return m_pCallbacks == rhs.m_pCallbacks;
+    }
+    template<typename U>
+    bool operator!=(const VmaStlAllocator<U>& rhs) const
+    {
+        return m_pCallbacks != rhs.m_pCallbacks;
+    }
+
+    VmaStlAllocator& operator=(const VmaStlAllocator& x) = delete;
+};
+
+#if VMA_USE_STL_VECTOR
+
+#define VmaVector std::vector
+
+template<typename T, typename allocatorT>
+static void VmaVectorInsert(std::vector<T, allocatorT>& vec, size_t index, const T& item)
+{
+    vec.insert(vec.begin() + index, item);
+}
+
+template<typename T, typename allocatorT>
+static void VmaVectorRemove(std::vector<T, allocatorT>& vec, size_t index)
+{
+    vec.erase(vec.begin() + index);
+}
+
+#else // #if VMA_USE_STL_VECTOR
+
+/* Class with interface compatible with subset of std::vector.
+T must be POD because constructors and destructors are not called and memcpy is
+used for these objects. */
+template<typename T, typename AllocatorT>
+class VmaVector
+{
+public:
+    typedef T value_type;
+
+    VmaVector(const AllocatorT& allocator) :
+        m_Allocator(allocator),
+        m_pArray(VMA_NULL),
+        m_Count(0),
+        m_Capacity(0)
+    {
+    }
+
+    VmaVector(size_t count, const AllocatorT& allocator) :
+        m_Allocator(allocator),
+        m_pArray(count ? (T*)VmaAllocateArray<T>(allocator.m_pCallbacks, count) : VMA_NULL),
+        m_Count(count),
+        m_Capacity(count)
+    {
+    }
+    
+    // This version of the constructor is here for compatibility with pre-C++14 std::vector.
+    // value is unused.
+    VmaVector(size_t count, const T& value, const AllocatorT& allocator)
+        : VmaVector(count, allocator) {}
+    
+    VmaVector(const VmaVector<T, AllocatorT>& src) :
+        m_Allocator(src.m_Allocator),
+        m_pArray(src.m_Count ? (T*)VmaAllocateArray<T>(src.m_Allocator.m_pCallbacks, src.m_Count) : VMA_NULL),
+        m_Count(src.m_Count),
+        m_Capacity(src.m_Count)
+    {
+        if(m_Count != 0)
+        {
+            memcpy(m_pArray, src.m_pArray, m_Count * sizeof(T));
+        }
+    }
+    
+    ~VmaVector()
+    {
+        VmaFree(m_Allocator.m_pCallbacks, m_pArray);
+    }
+
+    VmaVector& operator=(const VmaVector<T, AllocatorT>& rhs)
+    {
+        if(&rhs != this)
+        {
+            resize(rhs.m_Count);
+            if(m_Count != 0)
+            {
+                memcpy(m_pArray, rhs.m_pArray, m_Count * sizeof(T));
+            }
+        }
+        return *this;
+    }
+    
+    bool empty() const { return m_Count == 0; }
+    size_t size() const { return m_Count; }
+    T* data() { return m_pArray; }
+    const T* data() const { return m_pArray; }
+    
+    T& operator[](size_t index)
+    {
+        VMA_HEAVY_ASSERT(index < m_Count);
+        return m_pArray[index];
+    }
+    const T& operator[](size_t index) const
+    {
+        VMA_HEAVY_ASSERT(index < m_Count);
+        return m_pArray[index];
+    }
+
+    T& front()
+    {
+        VMA_HEAVY_ASSERT(m_Count > 0);
+        return m_pArray[0];
+    }
+    const T& front() const
+    {
+        VMA_HEAVY_ASSERT(m_Count > 0);
+        return m_pArray[0];
+    }
+    T& back()
+    {
+        VMA_HEAVY_ASSERT(m_Count > 0);
+        return m_pArray[m_Count - 1];
+    }
+    const T& back() const
+    {
+        VMA_HEAVY_ASSERT(m_Count > 0);
+        return m_pArray[m_Count - 1];
+    }
+
+    void reserve(size_t newCapacity, bool freeMemory = false)
+    {
+        newCapacity = VMA_MAX(newCapacity, m_Count);
+        
+        if((newCapacity < m_Capacity) && !freeMemory)
+        {
+            newCapacity = m_Capacity;
+        }
+        
+        if(newCapacity != m_Capacity)
+        {
+            T* const newArray = newCapacity ? VmaAllocateArray<T>(m_Allocator, newCapacity) : VMA_NULL;
+            if(m_Count != 0)
+            {
+                memcpy(newArray, m_pArray, m_Count * sizeof(T));
+            }
+            VmaFree(m_Allocator.m_pCallbacks, m_pArray);
+            m_Capacity = newCapacity;
+            m_pArray = newArray;
+        }
+    }
+
+    void resize(size_t newCount, bool freeMemory = false)
+    {
+        size_t newCapacity = m_Capacity;
+        if(newCount > m_Capacity)
+        {
+            newCapacity = VMA_MAX(newCount, VMA_MAX(m_Capacity * 3 / 2, (size_t)8));
+        }
+        else if(freeMemory)
+        {
+            newCapacity = newCount;
+        }
+
+        if(newCapacity != m_Capacity)
+        {
+            T* const newArray = newCapacity ? VmaAllocateArray<T>(m_Allocator.m_pCallbacks, newCapacity) : VMA_NULL;
+            const size_t elementsToCopy = VMA_MIN(m_Count, newCount);
+            if(elementsToCopy != 0)
+            {
+                memcpy(newArray, m_pArray, elementsToCopy * sizeof(T));
+            }
+            VmaFree(m_Allocator.m_pCallbacks, m_pArray);
+            m_Capacity = newCapacity;
+            m_pArray = newArray;
+        }
+
+        m_Count = newCount;
+    }
+
+    void clear(bool freeMemory = false)
+    {
+        resize(0, freeMemory);
+    }
+
+    void insert(size_t index, const T& src)
+    {
+        VMA_HEAVY_ASSERT(index <= m_Count);
+        const size_t oldCount = size();
+        resize(oldCount + 1);
+        if(index < oldCount)
+        {
+            memmove(m_pArray + (index + 1), m_pArray + index, (oldCount - index) * sizeof(T));
+        }
+        m_pArray[index] = src;
+    }
+
+    void remove(size_t index)
+    {
+        VMA_HEAVY_ASSERT(index < m_Count);
+        const size_t oldCount = size();
+        if(index < oldCount - 1)
+        {
+            memmove(m_pArray + index, m_pArray + (index + 1), (oldCount - index - 1) * sizeof(T));
+        }
+        resize(oldCount - 1);
+    }
+
+    void push_back(const T& src)
+    {
+        const size_t newIndex = size();
+        resize(newIndex + 1);
+        m_pArray[newIndex] = src;
+    }
+
+    void pop_back()
+    {
+        VMA_HEAVY_ASSERT(m_Count > 0);
+        resize(size() - 1);
+    }
+
+    void push_front(const T& src)
+    {
+        insert(0, src);
+    }
+
+    void pop_front()
+    {
+        VMA_HEAVY_ASSERT(m_Count > 0);
+        remove(0);
+    }
+
+    typedef T* iterator;
+
+    iterator begin() { return m_pArray; }
+    iterator end() { return m_pArray + m_Count; }
+
+private:
+    AllocatorT m_Allocator;
+    T* m_pArray;
+    size_t m_Count;
+    size_t m_Capacity;
+};
+
+template<typename T, typename allocatorT>
+static void VmaVectorInsert(VmaVector<T, allocatorT>& vec, size_t index, const T& item)
+{
+    vec.insert(index, item);
+}
+
+template<typename T, typename allocatorT>
+static void VmaVectorRemove(VmaVector<T, allocatorT>& vec, size_t index)
+{
+    vec.remove(index);
+}
+
+#endif // #if VMA_USE_STL_VECTOR
+
+template<typename CmpLess, typename VectorT>
+size_t VmaVectorInsertSorted(VectorT& vector, const typename VectorT::value_type& value)
+{
+    const size_t indexToInsert = VmaBinaryFindFirstNotLess(
+        vector.data(),
+        vector.data() + vector.size(),
+        value,
+        CmpLess()) - vector.data();
+    VmaVectorInsert(vector, indexToInsert, value);
+    return indexToInsert;
+}
+
+template<typename CmpLess, typename VectorT>
+bool VmaVectorRemoveSorted(VectorT& vector, const typename VectorT::value_type& value)
+{
+    CmpLess comparator;
+    typename VectorT::iterator it = VmaBinaryFindFirstNotLess(
+        vector.begin(),
+        vector.end(),
+        value,
+        comparator);
+    if((it != vector.end()) && !comparator(*it, value) && !comparator(value, *it))
+    {
+        size_t indexToRemove = it - vector.begin();
+        VmaVectorRemove(vector, indexToRemove);
+        return true;
+    }
+    return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaPoolAllocator
+
+/*
+Allocator for objects of type T using a list of arrays (pools) to speed up
+allocation. Number of elements that can be allocated is not bounded because
+allocator can create multiple blocks.
+*/
+template<typename T>
+class VmaPoolAllocator
+{
+    VMA_CLASS_NO_COPY(VmaPoolAllocator)
+public:
+    VmaPoolAllocator(const VkAllocationCallbacks* pAllocationCallbacks, uint32_t firstBlockCapacity);
+    ~VmaPoolAllocator();
+    T* Alloc();
+    void Free(T* ptr);
+
+private:
+    union Item
+    {
+        uint32_t NextFreeIndex;
+        alignas(T) char Value[sizeof(T)];
+    };
+
+    struct ItemBlock
+    {
+        Item* pItems;
+        uint32_t Capacity;
+        uint32_t FirstFreeIndex;
+    };
+    
+    const VkAllocationCallbacks* m_pAllocationCallbacks;
+    const uint32_t m_FirstBlockCapacity;
+    VmaVector< ItemBlock, VmaStlAllocator<ItemBlock> > m_ItemBlocks;
+
+    ItemBlock& CreateNewBlock();
+};
+
+template<typename T>
+VmaPoolAllocator<T>::VmaPoolAllocator(const VkAllocationCallbacks* pAllocationCallbacks, uint32_t firstBlockCapacity) :
+    m_pAllocationCallbacks(pAllocationCallbacks),
+    m_FirstBlockCapacity(firstBlockCapacity),
+    m_ItemBlocks(VmaStlAllocator<ItemBlock>(pAllocationCallbacks))
+{
+    VMA_ASSERT(m_FirstBlockCapacity > 1);
+}
+
+template<typename T>
+VmaPoolAllocator<T>::~VmaPoolAllocator()
+{
+    for(size_t i = m_ItemBlocks.size(); i--; )
+        vma_delete_array(m_pAllocationCallbacks, m_ItemBlocks[i].pItems, m_ItemBlocks[i].Capacity);
+    m_ItemBlocks.clear();
+}
+
+template<typename T>
+T* VmaPoolAllocator<T>::Alloc()
+{
+    for(size_t i = m_ItemBlocks.size(); i--; )
+    {
+        ItemBlock& block = m_ItemBlocks[i];
+        // This block has some free items: Use first one.
+        if(block.FirstFreeIndex != UINT32_MAX)
+        {
+            Item* const pItem = &block.pItems[block.FirstFreeIndex];
+            block.FirstFreeIndex = pItem->NextFreeIndex;
+            T* result = (T*)&pItem->Value;
+            new(result)T(); // Explicit constructor call.
+            return result;
+        }
+    }
+
+    // No block has free item: Create new one and use it.
+    ItemBlock& newBlock = CreateNewBlock();
+    Item* const pItem = &newBlock.pItems[0];
+    newBlock.FirstFreeIndex = pItem->NextFreeIndex;
+    T* result = (T*)&pItem->Value;
+    new(result)T(); // Explicit constructor call.
+    return result;
+}
+
+template<typename T>
+void VmaPoolAllocator<T>::Free(T* ptr)
+{
+    // Search all memory blocks to find ptr.
+    for(size_t i = m_ItemBlocks.size(); i--; )
+    {
+        ItemBlock& block = m_ItemBlocks[i];
+        
+        // Casting to union.
+        Item* pItemPtr;
+        memcpy(&pItemPtr, &ptr, sizeof(pItemPtr));
+        
+        // Check if pItemPtr is in address range of this block.
+        if((pItemPtr >= block.pItems) && (pItemPtr < block.pItems + block.Capacity))
+        {
+            ptr->~T(); // Explicit destructor call.
+            const uint32_t index = static_cast<uint32_t>(pItemPtr - block.pItems);
+            pItemPtr->NextFreeIndex = block.FirstFreeIndex;
+            block.FirstFreeIndex = index;
+            return;
+        }
+    }
+    VMA_ASSERT(0 && "Pointer doesn't belong to this memory pool.");
+}
+
+template<typename T>
+typename VmaPoolAllocator<T>::ItemBlock& VmaPoolAllocator<T>::CreateNewBlock()
+{
+    const uint32_t newBlockCapacity = m_ItemBlocks.empty() ?
+        m_FirstBlockCapacity : m_ItemBlocks.back().Capacity * 3 / 2;
+
+    const ItemBlock newBlock = {
+        vma_new_array(m_pAllocationCallbacks, Item, newBlockCapacity),
+        newBlockCapacity,
+        0 };
+
+    m_ItemBlocks.push_back(newBlock);
+
+    // Setup singly-linked list of all free items in this block.
+    for(uint32_t i = 0; i < newBlockCapacity - 1; ++i)
+        newBlock.pItems[i].NextFreeIndex = i + 1;
+    newBlock.pItems[newBlockCapacity - 1].NextFreeIndex = UINT32_MAX;
+    return m_ItemBlocks.back();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaRawList, VmaList
+
+#if VMA_USE_STL_LIST
+
+#define VmaList std::list
+
+#else // #if VMA_USE_STL_LIST
+
+template<typename T>
+struct VmaListItem
+{
+    VmaListItem* pPrev;
+    VmaListItem* pNext;
+    T Value;
+};
+
+// Doubly linked list.
+template<typename T>
+class VmaRawList
+{
+    VMA_CLASS_NO_COPY(VmaRawList)
+public:
+    typedef VmaListItem<T> ItemType;
+
+    VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks);
+    ~VmaRawList();
+    void Clear();
+
+    size_t GetCount() const { return m_Count; }
+    bool IsEmpty() const { return m_Count == 0; }
+
+    ItemType* Front() { return m_pFront; }
+    const ItemType* Front() const { return m_pFront; }
+    ItemType* Back() { return m_pBack; }
+    const ItemType* Back() const { return m_pBack; }
+
+    ItemType* PushBack();
+    ItemType* PushFront();
+    ItemType* PushBack(const T& value);
+    ItemType* PushFront(const T& value);
+    void PopBack();
+    void PopFront();
+    
+    // Item can be null - it means PushBack.
+    ItemType* InsertBefore(ItemType* pItem);
+    // Item can be null - it means PushFront.
+    ItemType* InsertAfter(ItemType* pItem);
+
+    ItemType* InsertBefore(ItemType* pItem, const T& value);
+    ItemType* InsertAfter(ItemType* pItem, const T& value);
+
+    void Remove(ItemType* pItem);
+
+private:
+    const VkAllocationCallbacks* const m_pAllocationCallbacks;
+    VmaPoolAllocator<ItemType> m_ItemAllocator;
+    ItemType* m_pFront;
+    ItemType* m_pBack;
+    size_t m_Count;
+};
+
+template<typename T>
+VmaRawList<T>::VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks) :
+    m_pAllocationCallbacks(pAllocationCallbacks),
+    m_ItemAllocator(pAllocationCallbacks, 128),
+    m_pFront(VMA_NULL),
+    m_pBack(VMA_NULL),
+    m_Count(0)
+{
+}
+
+template<typename T>
+VmaRawList<T>::~VmaRawList()
+{
+    // Intentionally not calling Clear, because that would be unnecessary
+    // computations to return all items to m_ItemAllocator as free.
+}
+
+template<typename T>
+void VmaRawList<T>::Clear()
+{
+    if(IsEmpty() == false)
+    {
+        ItemType* pItem = m_pBack;
+        while(pItem != VMA_NULL)
+        {
+            ItemType* const pPrevItem = pItem->pPrev;
+            m_ItemAllocator.Free(pItem);
+            pItem = pPrevItem;
+        }
+        m_pFront = VMA_NULL;
+        m_pBack = VMA_NULL;
+        m_Count = 0;
+    }
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::PushBack()
+{
+    ItemType* const pNewItem = m_ItemAllocator.Alloc();
+    pNewItem->pNext = VMA_NULL;
+    if(IsEmpty())
+    {
+        pNewItem->pPrev = VMA_NULL;
+        m_pFront = pNewItem;
+        m_pBack = pNewItem;
+        m_Count = 1;
+    }
+    else
+    {
+        pNewItem->pPrev = m_pBack;
+        m_pBack->pNext = pNewItem;
+        m_pBack = pNewItem;
+        ++m_Count;
+    }
+    return pNewItem;
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::PushFront()
+{
+    ItemType* const pNewItem = m_ItemAllocator.Alloc();
+    pNewItem->pPrev = VMA_NULL;
+    if(IsEmpty())
+    {
+        pNewItem->pNext = VMA_NULL;
+        m_pFront = pNewItem;
+        m_pBack = pNewItem;
+        m_Count = 1;
+    }
+    else
+    {
+        pNewItem->pNext = m_pFront;
+        m_pFront->pPrev = pNewItem;
+        m_pFront = pNewItem;
+        ++m_Count;
+    }
+    return pNewItem;
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::PushBack(const T& value)
+{
+    ItemType* const pNewItem = PushBack();
+    pNewItem->Value = value;
+    return pNewItem;
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::PushFront(const T& value)
+{
+    ItemType* const pNewItem = PushFront();
+    pNewItem->Value = value;
+    return pNewItem;
+}
+
+template<typename T>
+void VmaRawList<T>::PopBack()
+{
+    VMA_HEAVY_ASSERT(m_Count > 0);
+    ItemType* const pBackItem = m_pBack;
+    ItemType* const pPrevItem = pBackItem->pPrev;
+    if(pPrevItem != VMA_NULL)
+    {
+        pPrevItem->pNext = VMA_NULL;
+    }
+    m_pBack = pPrevItem;
+    m_ItemAllocator.Free(pBackItem);
+    --m_Count;
+}
+
+template<typename T>
+void VmaRawList<T>::PopFront()
+{
+    VMA_HEAVY_ASSERT(m_Count > 0);
+    ItemType* const pFrontItem = m_pFront;
+    ItemType* const pNextItem = pFrontItem->pNext;
+    if(pNextItem != VMA_NULL)
+    {
+        pNextItem->pPrev = VMA_NULL;
+    }
+    m_pFront = pNextItem;
+    m_ItemAllocator.Free(pFrontItem);
+    --m_Count;
+}
+
+template<typename T>
+void VmaRawList<T>::Remove(ItemType* pItem)
+{
+    VMA_HEAVY_ASSERT(pItem != VMA_NULL);
+    VMA_HEAVY_ASSERT(m_Count > 0);
+
+    if(pItem->pPrev != VMA_NULL)
+    {
+        pItem->pPrev->pNext = pItem->pNext;
+    }
+    else
+    {
+        VMA_HEAVY_ASSERT(m_pFront == pItem);
+        m_pFront = pItem->pNext;
+    }
+
+    if(pItem->pNext != VMA_NULL)
+    {
+        pItem->pNext->pPrev = pItem->pPrev;
+    }
+    else
+    {
+        VMA_HEAVY_ASSERT(m_pBack == pItem);
+        m_pBack = pItem->pPrev;
+    }
+
+    m_ItemAllocator.Free(pItem);
+    --m_Count;
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::InsertBefore(ItemType* pItem)
+{
+    if(pItem != VMA_NULL)
+    {
+        ItemType* const prevItem = pItem->pPrev;
+        ItemType* const newItem = m_ItemAllocator.Alloc();
+        newItem->pPrev = prevItem;
+        newItem->pNext = pItem;
+        pItem->pPrev = newItem;
+        if(prevItem != VMA_NULL)
+        {
+            prevItem->pNext = newItem;
+        }
+        else
+        {
+            VMA_HEAVY_ASSERT(m_pFront == pItem);
+            m_pFront = newItem;
+        }
+        ++m_Count;
+        return newItem;
+    }
+    else
+        return PushBack();
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::InsertAfter(ItemType* pItem)
+{
+    if(pItem != VMA_NULL)
+    {
+        ItemType* const nextItem = pItem->pNext;
+        ItemType* const newItem = m_ItemAllocator.Alloc();
+        newItem->pNext = nextItem;
+        newItem->pPrev = pItem;
+        pItem->pNext = newItem;
+        if(nextItem != VMA_NULL)
+        {
+            nextItem->pPrev = newItem;
+        }
+        else
+        {
+            VMA_HEAVY_ASSERT(m_pBack == pItem);
+            m_pBack = newItem;
+        }
+        ++m_Count;
+        return newItem;
+    }
+    else
+        return PushFront();
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::InsertBefore(ItemType* pItem, const T& value)
+{
+    ItemType* const newItem = InsertBefore(pItem);
+    newItem->Value = value;
+    return newItem;
+}
+
+template<typename T>
+VmaListItem<T>* VmaRawList<T>::InsertAfter(ItemType* pItem, const T& value)
+{
+    ItemType* const newItem = InsertAfter(pItem);
+    newItem->Value = value;
+    return newItem;
+}
+
+template<typename T, typename AllocatorT>
+class VmaList
+{
+    VMA_CLASS_NO_COPY(VmaList)
+public:
+    class iterator
+    {
+    public:
+        iterator() :
+            m_pList(VMA_NULL),
+            m_pItem(VMA_NULL)
+        {
+        }
+
+        T& operator*() const
+        {
+            VMA_HEAVY_ASSERT(m_pItem != VMA_NULL);
+            return m_pItem->Value;
+        }
+        T* operator->() const
+        {
+            VMA_HEAVY_ASSERT(m_pItem != VMA_NULL);
+            return &m_pItem->Value;
+        }
+
+        iterator& operator++()
+        {
+            VMA_HEAVY_ASSERT(m_pItem != VMA_NULL);
+            m_pItem = m_pItem->pNext;
+            return *this;
+        }
+        iterator& operator--()
+        {
+            if(m_pItem != VMA_NULL)
+            {
+                m_pItem = m_pItem->pPrev;
+            }
+            else
+            {
+                VMA_HEAVY_ASSERT(!m_pList->IsEmpty());
+                m_pItem = m_pList->Back();
+            }
+            return *this;
+        }
+
+        iterator operator++(int)
+        {
+            iterator result = *this;
+            ++*this;
+            return result;
+        }
+        iterator operator--(int)
+        {
+            iterator result = *this;
+            --*this;
+            return result;
+        }
+
+        bool operator==(const iterator& rhs) const
+        {
+            VMA_HEAVY_ASSERT(m_pList == rhs.m_pList);
+            return m_pItem == rhs.m_pItem;
+        }
+        bool operator!=(const iterator& rhs) const
+        {
+            VMA_HEAVY_ASSERT(m_pList == rhs.m_pList);
+            return m_pItem != rhs.m_pItem;
+        }
+        
+    private:
+        VmaRawList<T>* m_pList;
+        VmaListItem<T>* m_pItem;
+
+        iterator(VmaRawList<T>* pList, VmaListItem<T>* pItem) :
+            m_pList(pList),
+            m_pItem(pItem)
+        {
+        }
+
+        friend class VmaList<T, AllocatorT>;
+    };
+
+    class const_iterator
+    {
+    public:
+        const_iterator() :
+            m_pList(VMA_NULL),
+            m_pItem(VMA_NULL)
+        {
+        }
+
+        const_iterator(const iterator& src) :
+            m_pList(src.m_pList),
+            m_pItem(src.m_pItem)
+        {
+        }
+        
+        const T& operator*() const
+        {
+            VMA_HEAVY_ASSERT(m_pItem != VMA_NULL);
+            return m_pItem->Value;
+        }
+        const T* operator->() const
+        {
+            VMA_HEAVY_ASSERT(m_pItem != VMA_NULL);
+            return &m_pItem->Value;
+        }
+
+        const_iterator& operator++()
+        {
+            VMA_HEAVY_ASSERT(m_pItem != VMA_NULL);
+            m_pItem = m_pItem->pNext;
+            return *this;
+        }
+        const_iterator& operator--()
+        {
+            if(m_pItem != VMA_NULL)
+            {
+                m_pItem = m_pItem->pPrev;
+            }
+            else
+            {
+                VMA_HEAVY_ASSERT(!m_pList->IsEmpty());
+                m_pItem = m_pList->Back();
+            }
+            return *this;
+        }
+
+        const_iterator operator++(int)
+        {
+            const_iterator result = *this;
+            ++*this;
+            return result;
+        }
+        const_iterator operator--(int)
+        {
+            const_iterator result = *this;
+            --*this;
+            return result;
+        }
+
+        bool operator==(const const_iterator& rhs) const
+        {
+            VMA_HEAVY_ASSERT(m_pList == rhs.m_pList);
+            return m_pItem == rhs.m_pItem;
+        }
+        bool operator!=(const const_iterator& rhs) const
+        {
+            VMA_HEAVY_ASSERT(m_pList == rhs.m_pList);
+            return m_pItem != rhs.m_pItem;
+        }
+        
+    private:
+        const_iterator(const VmaRawList<T>* pList, const VmaListItem<T>* pItem) :
+            m_pList(pList),
+            m_pItem(pItem)
+        {
+        }
+
+        const VmaRawList<T>* m_pList;
+        const VmaListItem<T>* m_pItem;
+
+        friend class VmaList<T, AllocatorT>;
+    };
+
+    VmaList(const AllocatorT& allocator) : m_RawList(allocator.m_pCallbacks) { }
+
+    bool empty() const { return m_RawList.IsEmpty(); }
+    size_t size() const { return m_RawList.GetCount(); }
+
+    iterator begin() { return iterator(&m_RawList, m_RawList.Front()); }
+    iterator end() { return iterator(&m_RawList, VMA_NULL); }
+
+    const_iterator cbegin() const { return const_iterator(&m_RawList, m_RawList.Front()); }
+    const_iterator cend() const { return const_iterator(&m_RawList, VMA_NULL); }
+
+    void clear() { m_RawList.Clear(); }
+    void push_back(const T& value) { m_RawList.PushBack(value); }
+    void erase(iterator it) { m_RawList.Remove(it.m_pItem); }
+    iterator insert(iterator it, const T& value) { return iterator(&m_RawList, m_RawList.InsertBefore(it.m_pItem, value)); }
+
+private:
+    VmaRawList<T> m_RawList;
+};
+
+#endif // #if VMA_USE_STL_LIST
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaMap
+
+// Unused in this version.
+#if 0
+
+#if VMA_USE_STL_UNORDERED_MAP
+
+#define VmaPair std::pair
+
+#define VMA_MAP_TYPE(KeyT, ValueT) \
+    std::unordered_map< KeyT, ValueT, std::hash<KeyT>, std::equal_to<KeyT>, VmaStlAllocator< std::pair<KeyT, ValueT> > >
+
+#else // #if VMA_USE_STL_UNORDERED_MAP
+
+template<typename T1, typename T2>
+struct VmaPair
+{
+    T1 first;
+    T2 second;
+
+    VmaPair() : first(), second() { }
+    VmaPair(const T1& firstSrc, const T2& secondSrc) : first(firstSrc), second(secondSrc) { }
+};
+
+/* Class compatible with subset of interface of std::unordered_map.
+KeyT, ValueT must be POD because they will be stored in VmaVector.
+*/
+template<typename KeyT, typename ValueT>
+class VmaMap
+{
+public:
+    typedef VmaPair<KeyT, ValueT> PairType;
+    typedef PairType* iterator;
+
+    VmaMap(const VmaStlAllocator<PairType>& allocator) : m_Vector(allocator) { }
+
+    iterator begin() { return m_Vector.begin(); }
+    iterator end() { return m_Vector.end(); }
+
+    void insert(const PairType& pair);
+    iterator find(const KeyT& key);
+    void erase(iterator it);
+    
+private:
+    VmaVector< PairType, VmaStlAllocator<PairType> > m_Vector;
+};
+
+#define VMA_MAP_TYPE(KeyT, ValueT) VmaMap<KeyT, ValueT>
+
+template<typename FirstT, typename SecondT>
+struct VmaPairFirstLess
+{
+    bool operator()(const VmaPair<FirstT, SecondT>& lhs, const VmaPair<FirstT, SecondT>& rhs) const
+    {
+        return lhs.first < rhs.first;
+    }
+    bool operator()(const VmaPair<FirstT, SecondT>& lhs, const FirstT& rhsFirst) const
+    {
+        return lhs.first < rhsFirst;
+    }
+};
+
+template<typename KeyT, typename ValueT>
+void VmaMap<KeyT, ValueT>::insert(const PairType& pair)
+{
+    const size_t indexToInsert = VmaBinaryFindFirstNotLess(
+        m_Vector.data(),
+        m_Vector.data() + m_Vector.size(),
+        pair,
+        VmaPairFirstLess<KeyT, ValueT>()) - m_Vector.data();
+    VmaVectorInsert(m_Vector, indexToInsert, pair);
+}
+
+template<typename KeyT, typename ValueT>
+VmaPair<KeyT, ValueT>* VmaMap<KeyT, ValueT>::find(const KeyT& key)
+{
+    PairType* it = VmaBinaryFindFirstNotLess(
+        m_Vector.data(),
+        m_Vector.data() + m_Vector.size(),
+        key,
+        VmaPairFirstLess<KeyT, ValueT>());
+    if((it != m_Vector.end()) && (it->first == key))
+    {
+        return it;
+    }
+    else
+    {
+        return m_Vector.end();
+    }
+}
+
+template<typename KeyT, typename ValueT>
+void VmaMap<KeyT, ValueT>::erase(iterator it)
+{
+    VmaVectorRemove(m_Vector, it - m_Vector.begin());
+}
+
+#endif // #if VMA_USE_STL_UNORDERED_MAP
+
+#endif // #if 0
+
+////////////////////////////////////////////////////////////////////////////////
+
+class VmaDeviceMemoryBlock;
+
+enum VMA_CACHE_OPERATION { VMA_CACHE_FLUSH, VMA_CACHE_INVALIDATE };
+
+struct VmaAllocation_T
+{
+private:
+    static const uint8_t MAP_COUNT_FLAG_PERSISTENT_MAP = 0x80;
+
+    enum FLAGS
+    {
+        FLAG_USER_DATA_STRING = 0x01,
+    };
+
+public:
+    enum ALLOCATION_TYPE
+    {
+        ALLOCATION_TYPE_NONE,
+        ALLOCATION_TYPE_BLOCK,
+        ALLOCATION_TYPE_DEDICATED,
+    };
+
+    /*
+    This struct is allocated using VmaPoolAllocator.
+    */
+
+    void Ctor(uint32_t currentFrameIndex, bool userDataString)
+    {
+        m_Alignment = 1;
+        m_Size = 0;
+        m_MemoryTypeIndex = 0;
+        m_pUserData = VMA_NULL;
+        m_LastUseFrameIndex = currentFrameIndex;
+        m_Type = (uint8_t)ALLOCATION_TYPE_NONE;
+        m_SuballocationType = (uint8_t)VMA_SUBALLOCATION_TYPE_UNKNOWN;
+        m_MapCount = 0;
+        m_Flags = userDataString ? (uint8_t)FLAG_USER_DATA_STRING : 0;
+
+#if VMA_STATS_STRING_ENABLED
+        m_CreationFrameIndex = currentFrameIndex;
+        m_BufferImageUsage = 0;
+#endif
+    }
+
+    void Dtor()
+    {
+        VMA_ASSERT((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) == 0 && "Allocation was not unmapped before destruction.");
+
+        // Check if owned string was freed.
+        VMA_ASSERT(m_pUserData == VMA_NULL);
+    }
+
+    void InitBlockAllocation(
+        VmaDeviceMemoryBlock* block,
+        VkDeviceSize offset,
+        VkDeviceSize alignment,
+        VkDeviceSize size,
+        uint32_t memoryTypeIndex,
+        VmaSuballocationType suballocationType,
+        bool mapped,
+        bool canBecomeLost)
+    {
+        VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE);
+        VMA_ASSERT(block != VMA_NULL);
+        m_Type = (uint8_t)ALLOCATION_TYPE_BLOCK;
+        m_Alignment = alignment;
+        m_Size = size;
+        m_MemoryTypeIndex = memoryTypeIndex;
+        m_MapCount = mapped ? MAP_COUNT_FLAG_PERSISTENT_MAP : 0;
+        m_SuballocationType = (uint8_t)suballocationType;
+        m_BlockAllocation.m_Block = block;
+        m_BlockAllocation.m_Offset = offset;
+        m_BlockAllocation.m_CanBecomeLost = canBecomeLost;
+    }
+
+    void InitLost()
+    {
+        VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE);
+        VMA_ASSERT(m_LastUseFrameIndex.load() == VMA_FRAME_INDEX_LOST);
+        m_Type = (uint8_t)ALLOCATION_TYPE_BLOCK;
+        m_MemoryTypeIndex = 0;
+        m_BlockAllocation.m_Block = VMA_NULL;
+        m_BlockAllocation.m_Offset = 0;
+        m_BlockAllocation.m_CanBecomeLost = true;
+    }
+
+    void ChangeBlockAllocation(
+        VmaAllocator hAllocator,
+        VmaDeviceMemoryBlock* block,
+        VkDeviceSize offset); 
+
+    void ChangeOffset(VkDeviceSize newOffset);
+
+    // pMappedData not null means allocation is created with MAPPED flag.
+    void InitDedicatedAllocation(
+        uint32_t memoryTypeIndex,
+        VkDeviceMemory hMemory,
+        VmaSuballocationType suballocationType,
+        void* pMappedData,
+        VkDeviceSize size)
+    {
+        VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE);
+        VMA_ASSERT(hMemory != VK_NULL_HANDLE);
+        m_Type = (uint8_t)ALLOCATION_TYPE_DEDICATED;
+        m_Alignment = 0;
+        m_Size = size;
+        m_MemoryTypeIndex = memoryTypeIndex;
+        m_SuballocationType = (uint8_t)suballocationType;
+        m_MapCount = (pMappedData != VMA_NULL) ? MAP_COUNT_FLAG_PERSISTENT_MAP : 0;
+        m_DedicatedAllocation.m_hMemory = hMemory;
+        m_DedicatedAllocation.m_pMappedData = pMappedData;
+    }
+
+    ALLOCATION_TYPE GetType() const { return (ALLOCATION_TYPE)m_Type; }
+    VkDeviceSize GetAlignment() const { return m_Alignment; }
+    VkDeviceSize GetSize() const { return m_Size; }
+    bool IsUserDataString() const { return (m_Flags & FLAG_USER_DATA_STRING) != 0; }
+    void* GetUserData() const { return m_pUserData; }
+    void SetUserData(VmaAllocator hAllocator, void* pUserData);
+    VmaSuballocationType GetSuballocationType() const { return (VmaSuballocationType)m_SuballocationType; }
+
+    VmaDeviceMemoryBlock* GetBlock() const
+    {
+        VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK);
+        return m_BlockAllocation.m_Block;
+    }
+    VkDeviceSize GetOffset() const;
+    VkDeviceMemory GetMemory() const;
+    uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; }
+    bool IsPersistentMap() const { return (m_MapCount & MAP_COUNT_FLAG_PERSISTENT_MAP) != 0; }
+    void* GetMappedData() const;
+    bool CanBecomeLost() const;
+    
+    uint32_t GetLastUseFrameIndex() const
+    {
+        return m_LastUseFrameIndex.load();
+    }
+    bool CompareExchangeLastUseFrameIndex(uint32_t& expected, uint32_t desired)
+    {
+        return m_LastUseFrameIndex.compare_exchange_weak(expected, desired);
+    }
+    /*
+    - If hAllocation.LastUseFrameIndex + frameInUseCount < allocator.CurrentFrameIndex,
+      makes it lost by setting LastUseFrameIndex = VMA_FRAME_INDEX_LOST and returns true.
+    - Else, returns false.
+    
+    If hAllocation is already lost, assert - you should not call it then.
+    If hAllocation was not created with CAN_BECOME_LOST_BIT, assert.
+    */
+    bool MakeLost(uint32_t currentFrameIndex, uint32_t frameInUseCount);
+
+    void DedicatedAllocCalcStatsInfo(VmaStatInfo& outInfo)
+    {
+        VMA_ASSERT(m_Type == ALLOCATION_TYPE_DEDICATED);
+        outInfo.blockCount = 1;
+        outInfo.allocationCount = 1;
+        outInfo.unusedRangeCount = 0;
+        outInfo.usedBytes = m_Size;
+        outInfo.unusedBytes = 0;
+        outInfo.allocationSizeMin = outInfo.allocationSizeMax = m_Size;
+        outInfo.unusedRangeSizeMin = UINT64_MAX;
+        outInfo.unusedRangeSizeMax = 0;
+    }
+
+    void BlockAllocMap();
+    void BlockAllocUnmap();
+    VkResult DedicatedAllocMap(VmaAllocator hAllocator, void** ppData);
+    void DedicatedAllocUnmap(VmaAllocator hAllocator);
+
+#if VMA_STATS_STRING_ENABLED
+    uint32_t GetCreationFrameIndex() const { return m_CreationFrameIndex; }
+    uint32_t GetBufferImageUsage() const { return m_BufferImageUsage; }
+
+    void InitBufferImageUsage(uint32_t bufferImageUsage)
+    {
+        VMA_ASSERT(m_BufferImageUsage == 0);
+        m_BufferImageUsage = bufferImageUsage;
+    }
+
+    void PrintParameters(class VmaJsonWriter& json) const;
+#endif
+
+private:
+    VkDeviceSize m_Alignment;
+    VkDeviceSize m_Size;
+    void* m_pUserData;
+    VMA_ATOMIC_UINT32 m_LastUseFrameIndex;
+    uint32_t m_MemoryTypeIndex;
+    uint8_t m_Type; // ALLOCATION_TYPE
+    uint8_t m_SuballocationType; // VmaSuballocationType
+    // Bit 0x80 is set when allocation was created with VMA_ALLOCATION_CREATE_MAPPED_BIT.
+    // Bits with mask 0x7F are reference counter for vmaMapMemory()/vmaUnmapMemory().
+    uint8_t m_MapCount;
+    uint8_t m_Flags; // enum FLAGS
+
+    // Allocation out of VmaDeviceMemoryBlock.
+    struct BlockAllocation
+    {
+        VmaDeviceMemoryBlock* m_Block;
+        VkDeviceSize m_Offset;
+        bool m_CanBecomeLost;
+    };
+
+    // Allocation for an object that has its own private VkDeviceMemory.
+    struct DedicatedAllocation
+    {
+        VkDeviceMemory m_hMemory;
+        void* m_pMappedData; // Not null means memory is mapped.
+    };
+
+    union
+    {
+        // Allocation out of VmaDeviceMemoryBlock.
+        BlockAllocation m_BlockAllocation;
+        // Allocation for an object that has its own private VkDeviceMemory.
+        DedicatedAllocation m_DedicatedAllocation;
+    };
+
+#if VMA_STATS_STRING_ENABLED
+    uint32_t m_CreationFrameIndex;
+    uint32_t m_BufferImageUsage; // 0 if unknown.
+#endif
+
+    void FreeUserDataString(VmaAllocator hAllocator);
+};
+
+/*
+Represents a region of VmaDeviceMemoryBlock that is either assigned and returned as
+allocated memory block or free.
+*/
+struct VmaSuballocation
+{
+    VkDeviceSize offset;
+    VkDeviceSize size;
+    VmaAllocation hAllocation;
+    VmaSuballocationType type;
+};
+
+// Comparator for offsets.
+struct VmaSuballocationOffsetLess
+{
+    bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const
+    {
+        return lhs.offset < rhs.offset;
+    }
+};
+struct VmaSuballocationOffsetGreater
+{
+    bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const
+    {
+        return lhs.offset > rhs.offset;
+    }
+};
+
+typedef VmaList< VmaSuballocation, VmaStlAllocator<VmaSuballocation> > VmaSuballocationList;
+
+// Cost of one additional allocation lost, as equivalent in bytes.
+static const VkDeviceSize VMA_LOST_ALLOCATION_COST = 1048576;
+
+enum class VmaAllocationRequestType
+{
+    Normal,
+    // Used by "Linear" algorithm.
+    UpperAddress,
+    EndOf1st,
+    EndOf2nd,
+};
+
+/*
+Parameters of planned allocation inside a VmaDeviceMemoryBlock.
+
+If canMakeOtherLost was false:
+- item points to a FREE suballocation.
+- itemsToMakeLostCount is 0.
+
+If canMakeOtherLost was true:
+- item points to first of sequence of suballocations, which are either FREE,
+  or point to VmaAllocations that can become lost.
+- itemsToMakeLostCount is the number of VmaAllocations that need to be made lost for
+  the requested allocation to succeed.
+*/
+struct VmaAllocationRequest
+{
+    VkDeviceSize offset;
+    VkDeviceSize sumFreeSize; // Sum size of free items that overlap with proposed allocation.
+    VkDeviceSize sumItemSize; // Sum size of items to make lost that overlap with proposed allocation.
+    VmaSuballocationList::iterator item;
+    size_t itemsToMakeLostCount;
+    void* customData;
+    VmaAllocationRequestType type;
+
+    VkDeviceSize CalcCost() const
+    {
+        return sumItemSize + itemsToMakeLostCount * VMA_LOST_ALLOCATION_COST;
+    }
+};
+
+/*
+Data structure used for bookkeeping of allocations and unused ranges of memory
+in a single VkDeviceMemory block.
+*/
+class VmaBlockMetadata
+{
+public:
+    VmaBlockMetadata(VmaAllocator hAllocator);
+    virtual ~VmaBlockMetadata() { }
+    virtual void Init(VkDeviceSize size) { m_Size = size; }
+
+    // Validates all data structures inside this object. If not valid, returns false.
+    virtual bool Validate() const = 0;
+    VkDeviceSize GetSize() const { return m_Size; }
+    virtual size_t GetAllocationCount() const = 0;
+    virtual VkDeviceSize GetSumFreeSize() const = 0;
+    virtual VkDeviceSize GetUnusedRangeSizeMax() const = 0;
+    // Returns true if this block is empty - contains only single free suballocation.
+    virtual bool IsEmpty() const = 0;
+
+    virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const = 0;
+    // Shouldn't modify blockCount.
+    virtual void AddPoolStats(VmaPoolStats& inoutStats) const = 0;
+
+#if VMA_STATS_STRING_ENABLED
+    virtual void PrintDetailedMap(class VmaJsonWriter& json) const = 0;
+#endif
+
+    // Tries to find a place for suballocation with given parameters inside this block.
+    // If succeeded, fills pAllocationRequest and returns true.
+    // If failed, returns false.
+    virtual bool CreateAllocationRequest(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VkDeviceSize bufferImageGranularity,
+        VkDeviceSize allocSize,
+        VkDeviceSize allocAlignment,
+        bool upperAddress,
+        VmaSuballocationType allocType,
+        bool canMakeOtherLost,
+        // Always one of VMA_ALLOCATION_CREATE_STRATEGY_* or VMA_ALLOCATION_INTERNAL_STRATEGY_* flags.
+        uint32_t strategy,
+        VmaAllocationRequest* pAllocationRequest) = 0;
+
+    virtual bool MakeRequestedAllocationsLost(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VmaAllocationRequest* pAllocationRequest) = 0;
+
+    virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount) = 0;
+
+    virtual VkResult CheckCorruption(const void* pBlockData) = 0;
+
+    // Makes actual allocation based on request. Request must already be checked and valid.
+    virtual void Alloc(
+        const VmaAllocationRequest& request,
+        VmaSuballocationType type,
+        VkDeviceSize allocSize,
+        VmaAllocation hAllocation) = 0;
+
+    // Frees suballocation assigned to given memory region.
+    virtual void Free(const VmaAllocation allocation) = 0;
+    virtual void FreeAtOffset(VkDeviceSize offset) = 0;
+
+protected:
+    const VkAllocationCallbacks* GetAllocationCallbacks() const { return m_pAllocationCallbacks; }
+
+#if VMA_STATS_STRING_ENABLED
+    void PrintDetailedMap_Begin(class VmaJsonWriter& json,
+        VkDeviceSize unusedBytes,
+        size_t allocationCount,
+        size_t unusedRangeCount) const;
+    void PrintDetailedMap_Allocation(class VmaJsonWriter& json,
+        VkDeviceSize offset,
+        VmaAllocation hAllocation) const;
+    void PrintDetailedMap_UnusedRange(class VmaJsonWriter& json,
+        VkDeviceSize offset,
+        VkDeviceSize size) const;
+    void PrintDetailedMap_End(class VmaJsonWriter& json) const;
+#endif
+
+private:
+    VkDeviceSize m_Size;
+    const VkAllocationCallbacks* m_pAllocationCallbacks;
+};
+
+#define VMA_VALIDATE(cond) do { if(!(cond)) { \
+        VMA_ASSERT(0 && "Validation failed: " #cond); \
+        return false; \
+    } } while(false)
+
+class VmaBlockMetadata_Generic : public VmaBlockMetadata
+{
+    VMA_CLASS_NO_COPY(VmaBlockMetadata_Generic)
+public:
+    VmaBlockMetadata_Generic(VmaAllocator hAllocator);
+    virtual ~VmaBlockMetadata_Generic();
+    virtual void Init(VkDeviceSize size);
+
+    virtual bool Validate() const;
+    virtual size_t GetAllocationCount() const { return m_Suballocations.size() - m_FreeCount; }
+    virtual VkDeviceSize GetSumFreeSize() const { return m_SumFreeSize; }
+    virtual VkDeviceSize GetUnusedRangeSizeMax() const;
+    virtual bool IsEmpty() const;
+
+    virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const;
+    virtual void AddPoolStats(VmaPoolStats& inoutStats) const;
+
+#if VMA_STATS_STRING_ENABLED
+    virtual void PrintDetailedMap(class VmaJsonWriter& json) const;
+#endif
+
+    virtual bool CreateAllocationRequest(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VkDeviceSize bufferImageGranularity,
+        VkDeviceSize allocSize,
+        VkDeviceSize allocAlignment,
+        bool upperAddress,
+        VmaSuballocationType allocType,
+        bool canMakeOtherLost,
+        uint32_t strategy,
+        VmaAllocationRequest* pAllocationRequest);
+
+    virtual bool MakeRequestedAllocationsLost(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VmaAllocationRequest* pAllocationRequest);
+
+    virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount);
+
+    virtual VkResult CheckCorruption(const void* pBlockData);
+
+    virtual void Alloc(
+        const VmaAllocationRequest& request,
+        VmaSuballocationType type,
+        VkDeviceSize allocSize,
+        VmaAllocation hAllocation);
+
+    virtual void Free(const VmaAllocation allocation);
+    virtual void FreeAtOffset(VkDeviceSize offset);
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // For defragmentation
+    
+    bool IsBufferImageGranularityConflictPossible(
+        VkDeviceSize bufferImageGranularity,
+        VmaSuballocationType& inOutPrevSuballocType) const;
+
+private:
+    friend class VmaDefragmentationAlgorithm_Generic;
+    friend class VmaDefragmentationAlgorithm_Fast;
+
+    uint32_t m_FreeCount;
+    VkDeviceSize m_SumFreeSize;
+    VmaSuballocationList m_Suballocations;
+    // Suballocations that are free and have size greater than certain threshold.
+    // Sorted by size, ascending.
+    VmaVector< VmaSuballocationList::iterator, VmaStlAllocator< VmaSuballocationList::iterator > > m_FreeSuballocationsBySize;
+
+    bool ValidateFreeSuballocationList() const;
+
+    // Checks if requested suballocation with given parameters can be placed in given pFreeSuballocItem.
+    // If yes, fills pOffset and returns true. If no, returns false.
+    bool CheckAllocation(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VkDeviceSize bufferImageGranularity,
+        VkDeviceSize allocSize,
+        VkDeviceSize allocAlignment,
+        VmaSuballocationType allocType,
+        VmaSuballocationList::const_iterator suballocItem,
+        bool canMakeOtherLost,
+        VkDeviceSize* pOffset,
+        size_t* itemsToMakeLostCount,
+        VkDeviceSize* pSumFreeSize,
+        VkDeviceSize* pSumItemSize) const;
+    // Given free suballocation, it merges it with following one, which must also be free.
+    void MergeFreeWithNext(VmaSuballocationList::iterator item);
+    // Releases given suballocation, making it free.
+    // Merges it with adjacent free suballocations if applicable.
+    // Returns iterator to new free suballocation at this place.
+    VmaSuballocationList::iterator FreeSuballocation(VmaSuballocationList::iterator suballocItem);
+    // Given free suballocation, it inserts it into sorted list of
+    // m_FreeSuballocationsBySize if it's suitable.
+    void RegisterFreeSuballocation(VmaSuballocationList::iterator item);
+    // Given free suballocation, it removes it from sorted list of
+    // m_FreeSuballocationsBySize if it's suitable.
+    void UnregisterFreeSuballocation(VmaSuballocationList::iterator item);
+};
+
+/*
+Allocations and their references in internal data structure look like this:
+
+if(m_2ndVectorMode == SECOND_VECTOR_EMPTY):
+
+        0 +-------+
+          |       |
+          |       |
+          |       |
+          +-------+
+          | Alloc |  1st[m_1stNullItemsBeginCount]
+          +-------+
+          | Alloc |  1st[m_1stNullItemsBeginCount + 1]
+          +-------+
+          |  ...  |
+          +-------+
+          | Alloc |  1st[1st.size() - 1]
+          +-------+
+          |       |
+          |       |
+          |       |
+GetSize() +-------+
+
+if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER):
+
+        0 +-------+
+          | Alloc |  2nd[0]
+          +-------+
+          | Alloc |  2nd[1]
+          +-------+
+          |  ...  |
+          +-------+
+          | Alloc |  2nd[2nd.size() - 1]
+          +-------+
+          |       |
+          |       |
+          |       |
+          +-------+
+          | Alloc |  1st[m_1stNullItemsBeginCount]
+          +-------+
+          | Alloc |  1st[m_1stNullItemsBeginCount + 1]
+          +-------+
+          |  ...  |
+          +-------+
+          | Alloc |  1st[1st.size() - 1]
+          +-------+
+          |       |
+GetSize() +-------+
+
+if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK):
+
+        0 +-------+
+          |       |
+          |       |
+          |       |
+          +-------+
+          | Alloc |  1st[m_1stNullItemsBeginCount]
+          +-------+
+          | Alloc |  1st[m_1stNullItemsBeginCount + 1]
+          +-------+
+          |  ...  |
+          +-------+
+          | Alloc |  1st[1st.size() - 1]
+          +-------+
+          |       |
+          |       |
+          |       |
+          +-------+
+          | Alloc |  2nd[2nd.size() - 1]
+          +-------+
+          |  ...  |
+          +-------+
+          | Alloc |  2nd[1]
+          +-------+
+          | Alloc |  2nd[0]
+GetSize() +-------+
+
+*/
+class VmaBlockMetadata_Linear : public VmaBlockMetadata
+{
+    VMA_CLASS_NO_COPY(VmaBlockMetadata_Linear)
+public:
+    VmaBlockMetadata_Linear(VmaAllocator hAllocator);
+    virtual ~VmaBlockMetadata_Linear();
+    virtual void Init(VkDeviceSize size);
+
+    virtual bool Validate() const;
+    virtual size_t GetAllocationCount() const;
+    virtual VkDeviceSize GetSumFreeSize() const { return m_SumFreeSize; }
+    virtual VkDeviceSize GetUnusedRangeSizeMax() const;
+    virtual bool IsEmpty() const { return GetAllocationCount() == 0; }
+
+    virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const;
+    virtual void AddPoolStats(VmaPoolStats& inoutStats) const;
+
+#if VMA_STATS_STRING_ENABLED
+    virtual void PrintDetailedMap(class VmaJsonWriter& json) const;
+#endif
+
+    virtual bool CreateAllocationRequest(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VkDeviceSize bufferImageGranularity,
+        VkDeviceSize allocSize,
+        VkDeviceSize allocAlignment,
+        bool upperAddress,
+        VmaSuballocationType allocType,
+        bool canMakeOtherLost,
+        uint32_t strategy,
+        VmaAllocationRequest* pAllocationRequest);
+
+    virtual bool MakeRequestedAllocationsLost(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VmaAllocationRequest* pAllocationRequest);
+
+    virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount);
+
+    virtual VkResult CheckCorruption(const void* pBlockData);
+
+    virtual void Alloc(
+        const VmaAllocationRequest& request,
+        VmaSuballocationType type,
+        VkDeviceSize allocSize,
+        VmaAllocation hAllocation);
+
+    virtual void Free(const VmaAllocation allocation);
+    virtual void FreeAtOffset(VkDeviceSize offset);
+
+private:
+    /*
+    There are two suballocation vectors, used in ping-pong way.
+    The one with index m_1stVectorIndex is called 1st.
+    The one with index (m_1stVectorIndex ^ 1) is called 2nd.
+    2nd can be non-empty only when 1st is not empty.
+    When 2nd is not empty, m_2ndVectorMode indicates its mode of operation.
+    */
+    typedef VmaVector< VmaSuballocation, VmaStlAllocator<VmaSuballocation> > SuballocationVectorType;
+
+    enum SECOND_VECTOR_MODE
+    {
+        SECOND_VECTOR_EMPTY,
+        /*
+        Suballocations in 2nd vector are created later than the ones in 1st, but they
+        all have smaller offset.
+        */
+        SECOND_VECTOR_RING_BUFFER,
+        /*
+        Suballocations in 2nd vector are upper side of double stack.
+        They all have offsets higher than those in 1st vector.
+        Top of this stack means smaller offsets, but higher indices in this vector.
+        */
+        SECOND_VECTOR_DOUBLE_STACK,
+    };
+
+    VkDeviceSize m_SumFreeSize;
+    SuballocationVectorType m_Suballocations0, m_Suballocations1;
+    uint32_t m_1stVectorIndex;
+    SECOND_VECTOR_MODE m_2ndVectorMode;
+
+    SuballocationVectorType& AccessSuballocations1st() { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; }
+    SuballocationVectorType& AccessSuballocations2nd() { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; }
+    const SuballocationVectorType& AccessSuballocations1st() const { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; }
+    const SuballocationVectorType& AccessSuballocations2nd() const { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; }
+    
+    // Number of items in 1st vector with hAllocation = null at the beginning.
+    size_t m_1stNullItemsBeginCount;
+    // Number of other items in 1st vector with hAllocation = null somewhere in the middle.
+    size_t m_1stNullItemsMiddleCount;
+    // Number of items in 2nd vector with hAllocation = null.
+    size_t m_2ndNullItemsCount;
+
+    bool ShouldCompact1st() const;
+    void CleanupAfterFree();
+
+    bool CreateAllocationRequest_LowerAddress(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VkDeviceSize bufferImageGranularity,
+        VkDeviceSize allocSize,
+        VkDeviceSize allocAlignment,
+        VmaSuballocationType allocType,
+        bool canMakeOtherLost,
+        uint32_t strategy,
+        VmaAllocationRequest* pAllocationRequest);
+    bool CreateAllocationRequest_UpperAddress(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VkDeviceSize bufferImageGranularity,
+        VkDeviceSize allocSize,
+        VkDeviceSize allocAlignment,
+        VmaSuballocationType allocType,
+        bool canMakeOtherLost,
+        uint32_t strategy,
+        VmaAllocationRequest* pAllocationRequest);
+};
+
+/*
+- GetSize() is the original size of allocated memory block.
+- m_UsableSize is this size aligned down to a power of two.
+  All allocations and calculations happen relative to m_UsableSize.
+- GetUnusableSize() is the difference between them.
+  It is repoted as separate, unused range, not available for allocations.
+
+Node at level 0 has size = m_UsableSize.
+Each next level contains nodes with size 2 times smaller than current level.
+m_LevelCount is the maximum number of levels to use in the current object.
+*/
+class VmaBlockMetadata_Buddy : public VmaBlockMetadata
+{
+    VMA_CLASS_NO_COPY(VmaBlockMetadata_Buddy)
+public:
+    VmaBlockMetadata_Buddy(VmaAllocator hAllocator);
+    virtual ~VmaBlockMetadata_Buddy();
+    virtual void Init(VkDeviceSize size);
+
+    virtual bool Validate() const;
+    virtual size_t GetAllocationCount() const { return m_AllocationCount; }
+    virtual VkDeviceSize GetSumFreeSize() const { return m_SumFreeSize + GetUnusableSize(); }
+    virtual VkDeviceSize GetUnusedRangeSizeMax() const;
+    virtual bool IsEmpty() const { return m_Root->type == Node::TYPE_FREE; }
+
+    virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const;
+    virtual void AddPoolStats(VmaPoolStats& inoutStats) const;
+
+#if VMA_STATS_STRING_ENABLED
+    virtual void PrintDetailedMap(class VmaJsonWriter& json) const;
+#endif
+
+    virtual bool CreateAllocationRequest(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VkDeviceSize bufferImageGranularity,
+        VkDeviceSize allocSize,
+        VkDeviceSize allocAlignment,
+        bool upperAddress,
+        VmaSuballocationType allocType,
+        bool canMakeOtherLost,
+        uint32_t strategy,
+        VmaAllocationRequest* pAllocationRequest);
+
+    virtual bool MakeRequestedAllocationsLost(
+        uint32_t currentFrameIndex,
+        uint32_t frameInUseCount,
+        VmaAllocationRequest* pAllocationRequest);
+
+    virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount);
+
+    virtual VkResult CheckCorruption(const void* pBlockData) { return VK_ERROR_FEATURE_NOT_PRESENT; }
+
+    virtual void Alloc(
+        const VmaAllocationRequest& request,
+        VmaSuballocationType type,
+        VkDeviceSize allocSize,
+        VmaAllocation hAllocation);
+
+    virtual void Free(const VmaAllocation allocation) { FreeAtOffset(allocation, allocation->GetOffset()); }
+    virtual void FreeAtOffset(VkDeviceSize offset) { FreeAtOffset(VMA_NULL, offset); }
+
+private:
+    static const VkDeviceSize MIN_NODE_SIZE = 32;
+    static const size_t MAX_LEVELS = 30;
+
+    struct ValidationContext
+    {
+        size_t calculatedAllocationCount;
+        size_t calculatedFreeCount;
+        VkDeviceSize calculatedSumFreeSize;
+
+        ValidationContext() :
+            calculatedAllocationCount(0),
+            calculatedFreeCount(0),
+            calculatedSumFreeSize(0) { }
+    };
+
+    struct Node
+    {
+        VkDeviceSize offset;
+        enum TYPE
+        {
+            TYPE_FREE,
+            TYPE_ALLOCATION,
+            TYPE_SPLIT,
+            TYPE_COUNT
+        } type;
+        Node* parent;
+        Node* buddy;
+
+        union
+        {
+            struct
+            {
+                Node* prev;
+                Node* next;
+            } free;
+            struct
+            {
+                VmaAllocation alloc;
+            } allocation;
+            struct
+            {
+                Node* leftChild;
+            } split;
+        };
+    };
+
+    // Size of the memory block aligned down to a power of two.
+    VkDeviceSize m_UsableSize;
+    uint32_t m_LevelCount;
+
+    Node* m_Root;
+    struct {
+        Node* front;
+        Node* back;
+    } m_FreeList[MAX_LEVELS];
+    // Number of nodes in the tree with type == TYPE_ALLOCATION.
+    size_t m_AllocationCount;
+    // Number of nodes in the tree with type == TYPE_FREE.
+    size_t m_FreeCount;
+    // This includes space wasted due to internal fragmentation. Doesn't include unusable size.
+    VkDeviceSize m_SumFreeSize;
+
+    VkDeviceSize GetUnusableSize() const { return GetSize() - m_UsableSize; }
+    void DeleteNode(Node* node);
+    bool ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const;
+    uint32_t AllocSizeToLevel(VkDeviceSize allocSize) const;
+    inline VkDeviceSize LevelToNodeSize(uint32_t level) const { return m_UsableSize >> level; }
+    // Alloc passed just for validation. Can be null.
+    void FreeAtOffset(VmaAllocation alloc, VkDeviceSize offset);
+    void CalcAllocationStatInfoNode(VmaStatInfo& outInfo, const Node* node, VkDeviceSize levelNodeSize) const;
+    // Adds node to the front of FreeList at given level.
+    // node->type must be FREE.
+    // node->free.prev, next can be undefined.
+    void AddToFreeListFront(uint32_t level, Node* node);
+    // Removes node from FreeList at given level.
+    // node->type must be FREE.
+    // node->free.prev, next stay untouched.
+    void RemoveFromFreeList(uint32_t level, Node* node);
+
+#if VMA_STATS_STRING_ENABLED
+    void PrintDetailedMapNode(class VmaJsonWriter& json, const Node* node, VkDeviceSize levelNodeSize) const;
+#endif
+};
+
+/*
+Represents a single block of device memory (`VkDeviceMemory`) with all the
+data about its regions (aka suballocations, #VmaAllocation), assigned and free.
+
+Thread-safety: This class must be externally synchronized.
+*/
+class VmaDeviceMemoryBlock
+{
+    VMA_CLASS_NO_COPY(VmaDeviceMemoryBlock)
+public:
+    VmaBlockMetadata* m_pMetadata;
+
+    VmaDeviceMemoryBlock(VmaAllocator hAllocator);
+
+    ~VmaDeviceMemoryBlock()
+    {
+        VMA_ASSERT(m_MapCount == 0 && "VkDeviceMemory block is being destroyed while it is still mapped.");
+        VMA_ASSERT(m_hMemory == VK_NULL_HANDLE);
+    }
+
+    // Always call after construction.
+    void Init(
+        VmaAllocator hAllocator,
+        VmaPool hParentPool,
+        uint32_t newMemoryTypeIndex,
+        VkDeviceMemory newMemory,
+        VkDeviceSize newSize,
+        uint32_t id,
+        uint32_t algorithm);
+    // Always call before destruction.
+    void Destroy(VmaAllocator allocator);
+    
+    VmaPool GetParentPool() const { return m_hParentPool; }
+    VkDeviceMemory GetDeviceMemory() const { return m_hMemory; }
+    uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; }
+    uint32_t GetId() const { return m_Id; }
+    void* GetMappedData() const { return m_pMappedData; }
+
+    // Validates all data structures inside this object. If not valid, returns false.
+    bool Validate() const;
+
+    VkResult CheckCorruption(VmaAllocator hAllocator);
+
+    // ppData can be null.
+    VkResult Map(VmaAllocator hAllocator, uint32_t count, void** ppData);
+    void Unmap(VmaAllocator hAllocator, uint32_t count);
+
+    VkResult WriteMagicValueAroundAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize);
+    VkResult ValidateMagicValueAroundAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize);
+
+    VkResult BindBufferMemory(
+        const VmaAllocator hAllocator,
+        const VmaAllocation hAllocation,
+        VkDeviceSize allocationLocalOffset,
+        VkBuffer hBuffer,
+        const void* pNext);
+    VkResult BindImageMemory(
+        const VmaAllocator hAllocator,
+        const VmaAllocation hAllocation,
+        VkDeviceSize allocationLocalOffset,
+        VkImage hImage,
+        const void* pNext);
+
+private:
+    VmaPool m_hParentPool; // VK_NULL_HANDLE if not belongs to custom pool.
+    uint32_t m_MemoryTypeIndex;
+    uint32_t m_Id;
+    VkDeviceMemory m_hMemory;
+
+    /*
+    Protects access to m_hMemory so it's not used by multiple threads simultaneously, e.g. vkMapMemory, vkBindBufferMemory.
+    Also protects m_MapCount, m_pMappedData.
+    Allocations, deallocations, any change in m_pMetadata is protected by parent's VmaBlockVector::m_Mutex.
+    */
+    VMA_MUTEX m_Mutex;
+    uint32_t m_MapCount;
+    void* m_pMappedData;
+};
+
+struct VmaPointerLess
+{
+    bool operator()(const void* lhs, const void* rhs) const
+    {
+        return lhs < rhs;
+    }
+};
+
+struct VmaDefragmentationMove
+{
+    size_t srcBlockIndex;
+    size_t dstBlockIndex;
+    VkDeviceSize srcOffset;
+    VkDeviceSize dstOffset;
+    VkDeviceSize size;
+    VmaAllocation hAllocation;
+    VmaDeviceMemoryBlock* pSrcBlock;
+    VmaDeviceMemoryBlock* pDstBlock;
+};
+
+class VmaDefragmentationAlgorithm;
+
+/*
+Sequence of VmaDeviceMemoryBlock. Represents memory blocks allocated for a specific
+Vulkan memory type.
+
+Synchronized internally with a mutex.
+*/
+struct VmaBlockVector
+{
+    VMA_CLASS_NO_COPY(VmaBlockVector)
+public:
+    VmaBlockVector(
+        VmaAllocator hAllocator,
+        VmaPool hParentPool,
+        uint32_t memoryTypeIndex,
+        VkDeviceSize preferredBlockSize,
+        size_t minBlockCount,
+        size_t maxBlockCount,
+        VkDeviceSize bufferImageGranularity,
+        uint32_t frameInUseCount,
+        bool explicitBlockSize,
+        uint32_t algorithm);
+    ~VmaBlockVector();
+
+    VkResult CreateMinBlocks();
+
+    VmaAllocator GetAllocator() const { return m_hAllocator; }
+    VmaPool GetParentPool() const { return m_hParentPool; }
+    bool IsCustomPool() const { return m_hParentPool != VMA_NULL; }
+    uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; }
+    VkDeviceSize GetPreferredBlockSize() const { return m_PreferredBlockSize; }
+    VkDeviceSize GetBufferImageGranularity() const { return m_BufferImageGranularity; }
+    uint32_t GetFrameInUseCount() const { return m_FrameInUseCount; }
+    uint32_t GetAlgorithm() const { return m_Algorithm; }
+
+    void GetPoolStats(VmaPoolStats* pStats);
+
+    bool IsEmpty();
+    bool IsCorruptionDetectionEnabled() const;
+
+    VkResult Allocate(
+        uint32_t currentFrameIndex,
+        VkDeviceSize size,
+        VkDeviceSize alignment,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaSuballocationType suballocType,
+        size_t allocationCount,
+        VmaAllocation* pAllocations);
+
+    void Free(const VmaAllocation hAllocation);
+
+    // Adds statistics of this BlockVector to pStats.
+    void AddStats(VmaStats* pStats);
+
+#if VMA_STATS_STRING_ENABLED
+    void PrintDetailedMap(class VmaJsonWriter& json);
+#endif
+
+    void MakePoolAllocationsLost(
+        uint32_t currentFrameIndex,
+        size_t* pLostAllocationCount);
+    VkResult CheckCorruption();
+
+    // Saves results in pCtx->res.
+    void Defragment(
+        class VmaBlockVectorDefragmentationContext* pCtx,
+        VmaDefragmentationStats* pStats, VmaDefragmentationFlags flags,
+        VkDeviceSize& maxCpuBytesToMove, uint32_t& maxCpuAllocationsToMove,
+        VkDeviceSize& maxGpuBytesToMove, uint32_t& maxGpuAllocationsToMove,
+        VkCommandBuffer commandBuffer);
+    void DefragmentationEnd(
+        class VmaBlockVectorDefragmentationContext* pCtx,
+        VmaDefragmentationStats* pStats);
+
+    uint32_t ProcessDefragmentations(
+        class VmaBlockVectorDefragmentationContext *pCtx,
+        VmaDefragmentationPassMoveInfo* pMove, uint32_t maxMoves);
+
+    void CommitDefragmentations(
+        class VmaBlockVectorDefragmentationContext *pCtx,
+        VmaDefragmentationStats* pStats);
+
+    ////////////////////////////////////////////////////////////////////////////////
+    // To be used only while the m_Mutex is locked. Used during defragmentation.
+
+    size_t GetBlockCount() const { return m_Blocks.size(); }
+    VmaDeviceMemoryBlock* GetBlock(size_t index) const { return m_Blocks[index]; }
+    size_t CalcAllocationCount() const;
+    bool IsBufferImageGranularityConflictPossible() const;
+
+private:
+    friend class VmaDefragmentationAlgorithm_Generic;
+
+    const VmaAllocator m_hAllocator;
+    const VmaPool m_hParentPool;
+    const uint32_t m_MemoryTypeIndex;
+    const VkDeviceSize m_PreferredBlockSize;
+    const size_t m_MinBlockCount;
+    const size_t m_MaxBlockCount;
+    const VkDeviceSize m_BufferImageGranularity;
+    const uint32_t m_FrameInUseCount;
+    const bool m_ExplicitBlockSize;
+    const uint32_t m_Algorithm;
+    VMA_RW_MUTEX m_Mutex;
+
+    /* There can be at most one allocation that is completely empty (except when minBlockCount > 0) -
+    a hysteresis to avoid pessimistic case of alternating creation and destruction of a VkDeviceMemory. */
+    bool m_HasEmptyBlock;
+    // Incrementally sorted by sumFreeSize, ascending.
+    VmaVector< VmaDeviceMemoryBlock*, VmaStlAllocator<VmaDeviceMemoryBlock*> > m_Blocks;
+    uint32_t m_NextBlockId;
+
+    VkDeviceSize CalcMaxBlockSize() const;
+
+    // Finds and removes given block from vector.
+    void Remove(VmaDeviceMemoryBlock* pBlock);
+
+    // Performs single step in sorting m_Blocks. They may not be fully sorted
+    // after this call.
+    void IncrementallySortBlocks();
+
+    VkResult AllocatePage(
+        uint32_t currentFrameIndex,
+        VkDeviceSize size,
+        VkDeviceSize alignment,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaSuballocationType suballocType,
+        VmaAllocation* pAllocation);
+
+    // To be used only without CAN_MAKE_OTHER_LOST flag.
+    VkResult AllocateFromBlock(
+        VmaDeviceMemoryBlock* pBlock,
+        uint32_t currentFrameIndex,
+        VkDeviceSize size,
+        VkDeviceSize alignment,
+        VmaAllocationCreateFlags allocFlags,
+        void* pUserData,
+        VmaSuballocationType suballocType,
+        uint32_t strategy,
+        VmaAllocation* pAllocation);
+
+    VkResult CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex);
+
+    // Saves result to pCtx->res.
+    void ApplyDefragmentationMovesCpu(
+        class VmaBlockVectorDefragmentationContext* pDefragCtx,
+        const VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves);
+    // Saves result to pCtx->res.
+    void ApplyDefragmentationMovesGpu(
+        class VmaBlockVectorDefragmentationContext* pDefragCtx,
+        VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+        VkCommandBuffer commandBuffer);
+
+    /*
+    Used during defragmentation. pDefragmentationStats is optional. It's in/out
+    - updated with new data.
+    */
+    void FreeEmptyBlocks(VmaDefragmentationStats* pDefragmentationStats);
+
+    void UpdateHasEmptyBlock();
+};
+
+struct VmaPool_T
+{
+    VMA_CLASS_NO_COPY(VmaPool_T)
+public:
+    VmaBlockVector m_BlockVector;
+
+    VmaPool_T(
+        VmaAllocator hAllocator,
+        const VmaPoolCreateInfo& createInfo,
+        VkDeviceSize preferredBlockSize);
+    ~VmaPool_T();
+
+    uint32_t GetId() const { return m_Id; }
+    void SetId(uint32_t id) { VMA_ASSERT(m_Id == 0); m_Id = id; }
+
+    const char* GetName() const { return m_Name; }
+    void SetName(const char* pName);
+
+#if VMA_STATS_STRING_ENABLED
+    //void PrintDetailedMap(class VmaStringBuilder& sb);
+#endif
+
+private:
+    uint32_t m_Id;
+    char* m_Name;
+};
+
+/*
+Performs defragmentation:
+
+- Updates `pBlockVector->m_pMetadata`.
+- Updates allocations by calling ChangeBlockAllocation() or ChangeOffset().
+- Does not move actual data, only returns requested moves as `moves`.
+*/
+class VmaDefragmentationAlgorithm
+{
+    VMA_CLASS_NO_COPY(VmaDefragmentationAlgorithm)
+public:
+    VmaDefragmentationAlgorithm(
+        VmaAllocator hAllocator,
+        VmaBlockVector* pBlockVector,
+        uint32_t currentFrameIndex) :
+        m_hAllocator(hAllocator),
+        m_pBlockVector(pBlockVector),
+        m_CurrentFrameIndex(currentFrameIndex)
+    {
+    }
+    virtual ~VmaDefragmentationAlgorithm()
+    {
+    }
+
+    virtual void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged) = 0;
+    virtual void AddAll() = 0;
+
+    virtual VkResult Defragment(
+        VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+        VkDeviceSize maxBytesToMove,
+        uint32_t maxAllocationsToMove,
+        VmaDefragmentationFlags flags) = 0;
+
+    virtual VkDeviceSize GetBytesMoved() const = 0;
+    virtual uint32_t GetAllocationsMoved() const = 0;
+
+protected:
+    VmaAllocator const m_hAllocator;
+    VmaBlockVector* const m_pBlockVector;
+    const uint32_t m_CurrentFrameIndex;
+
+    struct AllocationInfo
+    {
+        VmaAllocation m_hAllocation;
+        VkBool32* m_pChanged;
+
+        AllocationInfo() :
+            m_hAllocation(VK_NULL_HANDLE),
+            m_pChanged(VMA_NULL)
+        {
+        }
+        AllocationInfo(VmaAllocation hAlloc, VkBool32* pChanged) :
+            m_hAllocation(hAlloc),
+            m_pChanged(pChanged)
+        {
+        }
+    };
+};
+
+class VmaDefragmentationAlgorithm_Generic : public VmaDefragmentationAlgorithm
+{
+    VMA_CLASS_NO_COPY(VmaDefragmentationAlgorithm_Generic)
+public:
+    VmaDefragmentationAlgorithm_Generic(
+        VmaAllocator hAllocator,
+        VmaBlockVector* pBlockVector,
+        uint32_t currentFrameIndex,
+        bool overlappingMoveSupported);
+    virtual ~VmaDefragmentationAlgorithm_Generic();
+
+    virtual void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged);
+    virtual void AddAll() { m_AllAllocations = true; }
+
+    virtual VkResult Defragment(
+        VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+        VkDeviceSize maxBytesToMove,
+        uint32_t maxAllocationsToMove,
+        VmaDefragmentationFlags flags);
+
+    virtual VkDeviceSize GetBytesMoved() const { return m_BytesMoved; }
+    virtual uint32_t GetAllocationsMoved() const { return m_AllocationsMoved; }
+
+private:
+    uint32_t m_AllocationCount;
+    bool m_AllAllocations;
+
+    VkDeviceSize m_BytesMoved;
+    uint32_t m_AllocationsMoved;
+
+    struct AllocationInfoSizeGreater
+    {
+        bool operator()(const AllocationInfo& lhs, const AllocationInfo& rhs) const
+        {
+            return lhs.m_hAllocation->GetSize() > rhs.m_hAllocation->GetSize();
+        }
+    };
+
+    struct AllocationInfoOffsetGreater
+    {
+        bool operator()(const AllocationInfo& lhs, const AllocationInfo& rhs) const
+        {
+            return lhs.m_hAllocation->GetOffset() > rhs.m_hAllocation->GetOffset();
+        }
+    };
+
+    struct BlockInfo
+    {
+        size_t m_OriginalBlockIndex;
+        VmaDeviceMemoryBlock* m_pBlock;
+        bool m_HasNonMovableAllocations;
+        VmaVector< AllocationInfo, VmaStlAllocator<AllocationInfo> > m_Allocations;
+
+        BlockInfo(const VkAllocationCallbacks* pAllocationCallbacks) :
+            m_OriginalBlockIndex(SIZE_MAX),
+            m_pBlock(VMA_NULL),
+            m_HasNonMovableAllocations(true),
+            m_Allocations(pAllocationCallbacks)
+        {
+        }
+
+        void CalcHasNonMovableAllocations()
+        {
+            const size_t blockAllocCount = m_pBlock->m_pMetadata->GetAllocationCount();
+            const size_t defragmentAllocCount = m_Allocations.size();
+            m_HasNonMovableAllocations = blockAllocCount != defragmentAllocCount;
+        }
+
+        void SortAllocationsBySizeDescending()
+        {
+            VMA_SORT(m_Allocations.begin(), m_Allocations.end(), AllocationInfoSizeGreater());
+        }
+
+        void SortAllocationsByOffsetDescending()
+        {
+            VMA_SORT(m_Allocations.begin(), m_Allocations.end(), AllocationInfoOffsetGreater());
+        }
+    };
+
+    struct BlockPointerLess
+    {
+        bool operator()(const BlockInfo* pLhsBlockInfo, const VmaDeviceMemoryBlock* pRhsBlock) const
+        {
+            return pLhsBlockInfo->m_pBlock < pRhsBlock;
+        }
+        bool operator()(const BlockInfo* pLhsBlockInfo, const BlockInfo* pRhsBlockInfo) const
+        {
+            return pLhsBlockInfo->m_pBlock < pRhsBlockInfo->m_pBlock;
+        }
+    };
+
+    // 1. Blocks with some non-movable allocations go first.
+    // 2. Blocks with smaller sumFreeSize go first.
+    struct BlockInfoCompareMoveDestination
+    {
+        bool operator()(const BlockInfo* pLhsBlockInfo, const BlockInfo* pRhsBlockInfo) const
+        {
+            if(pLhsBlockInfo->m_HasNonMovableAllocations && !pRhsBlockInfo->m_HasNonMovableAllocations)
+            {
+                return true;
+            }
+            if(!pLhsBlockInfo->m_HasNonMovableAllocations && pRhsBlockInfo->m_HasNonMovableAllocations)
+            {
+                return false;
+            }
+            if(pLhsBlockInfo->m_pBlock->m_pMetadata->GetSumFreeSize() < pRhsBlockInfo->m_pBlock->m_pMetadata->GetSumFreeSize())
+            {
+                return true;
+            }
+            return false;
+        }
+    };
+
+    typedef VmaVector< BlockInfo*, VmaStlAllocator<BlockInfo*> > BlockInfoVector;
+    BlockInfoVector m_Blocks;
+
+    VkResult DefragmentRound(
+        VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+        VkDeviceSize maxBytesToMove,
+        uint32_t maxAllocationsToMove,
+        bool freeOldAllocations);
+
+    size_t CalcBlocksWithNonMovableCount() const;
+
+    static bool MoveMakesSense(
+        size_t dstBlockIndex, VkDeviceSize dstOffset,
+        size_t srcBlockIndex, VkDeviceSize srcOffset);
+};
+
+class VmaDefragmentationAlgorithm_Fast : public VmaDefragmentationAlgorithm
+{
+    VMA_CLASS_NO_COPY(VmaDefragmentationAlgorithm_Fast)
+public:
+    VmaDefragmentationAlgorithm_Fast(
+        VmaAllocator hAllocator,
+        VmaBlockVector* pBlockVector,
+        uint32_t currentFrameIndex,
+        bool overlappingMoveSupported);
+    virtual ~VmaDefragmentationAlgorithm_Fast();
+
+    virtual void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged) { ++m_AllocationCount; }
+    virtual void AddAll() { m_AllAllocations = true; }
+
+    virtual VkResult Defragment(
+        VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+        VkDeviceSize maxBytesToMove,
+        uint32_t maxAllocationsToMove,
+        VmaDefragmentationFlags flags);
+
+    virtual VkDeviceSize GetBytesMoved() const { return m_BytesMoved; }
+    virtual uint32_t GetAllocationsMoved() const { return m_AllocationsMoved; }
+
+private:
+    struct BlockInfo
+    {
+        size_t origBlockIndex;
+    };
+
+    class FreeSpaceDatabase
+    {
+    public:
+        FreeSpaceDatabase()
+        {
+            FreeSpace s = {};
+            s.blockInfoIndex = SIZE_MAX;
+            for(size_t i = 0; i < MAX_COUNT; ++i)
+            {
+                m_FreeSpaces[i] = s;
+            }
+        }
+
+        void Register(size_t blockInfoIndex, VkDeviceSize offset, VkDeviceSize size)
+        {
+            if(size < VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+            {
+                return;
+            }
+
+            // Find first invalid or the smallest structure.
+            size_t bestIndex = SIZE_MAX;
+            for(size_t i = 0; i < MAX_COUNT; ++i)
+            {
+                // Empty structure.
+                if(m_FreeSpaces[i].blockInfoIndex == SIZE_MAX)
+                {
+                    bestIndex = i;
+                    break;
+                }
+                if(m_FreeSpaces[i].size < size &&
+                    (bestIndex == SIZE_MAX || m_FreeSpaces[bestIndex].size > m_FreeSpaces[i].size))
+                {
+                    bestIndex = i;
+                }
+            }
+
+            if(bestIndex != SIZE_MAX)
+            {
+                m_FreeSpaces[bestIndex].blockInfoIndex = blockInfoIndex;
+                m_FreeSpaces[bestIndex].offset = offset;
+                m_FreeSpaces[bestIndex].size = size;
+            }
+        }
+
+        bool Fetch(VkDeviceSize alignment, VkDeviceSize size,
+            size_t& outBlockInfoIndex, VkDeviceSize& outDstOffset)
+        {
+            size_t bestIndex = SIZE_MAX;
+            VkDeviceSize bestFreeSpaceAfter = 0;
+            for(size_t i = 0; i < MAX_COUNT; ++i)
+            {
+                // Structure is valid.
+                if(m_FreeSpaces[i].blockInfoIndex != SIZE_MAX)
+                {
+                    const VkDeviceSize dstOffset = VmaAlignUp(m_FreeSpaces[i].offset, alignment);
+                    // Allocation fits into this structure.
+                    if(dstOffset + size <= m_FreeSpaces[i].offset + m_FreeSpaces[i].size)
+                    {
+                        const VkDeviceSize freeSpaceAfter = (m_FreeSpaces[i].offset + m_FreeSpaces[i].size) -
+                            (dstOffset + size);
+                        if(bestIndex == SIZE_MAX || freeSpaceAfter > bestFreeSpaceAfter)
+                        {
+                            bestIndex = i;
+                            bestFreeSpaceAfter = freeSpaceAfter;
+                        }
+                    }
+                }
+            }
+            
+            if(bestIndex != SIZE_MAX)
+            {
+                outBlockInfoIndex = m_FreeSpaces[bestIndex].blockInfoIndex;
+                outDstOffset = VmaAlignUp(m_FreeSpaces[bestIndex].offset, alignment);
+
+                if(bestFreeSpaceAfter >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+                {
+                    // Leave this structure for remaining empty space.
+                    const VkDeviceSize alignmentPlusSize = (outDstOffset - m_FreeSpaces[bestIndex].offset) + size;
+                    m_FreeSpaces[bestIndex].offset += alignmentPlusSize;
+                    m_FreeSpaces[bestIndex].size -= alignmentPlusSize;
+                }
+                else
+                {
+                    // This structure becomes invalid.
+                    m_FreeSpaces[bestIndex].blockInfoIndex = SIZE_MAX;
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+    private:
+        static const size_t MAX_COUNT = 4;
+
+        struct FreeSpace
+        {
+            size_t blockInfoIndex; // SIZE_MAX means this structure is invalid.
+            VkDeviceSize offset;
+            VkDeviceSize size;
+        } m_FreeSpaces[MAX_COUNT];
+    };
+
+    const bool m_OverlappingMoveSupported;
+
+    uint32_t m_AllocationCount;
+    bool m_AllAllocations;
+
+    VkDeviceSize m_BytesMoved;
+    uint32_t m_AllocationsMoved;
+
+    VmaVector< BlockInfo, VmaStlAllocator<BlockInfo> > m_BlockInfos;
+
+    void PreprocessMetadata();
+    void PostprocessMetadata();
+    void InsertSuballoc(VmaBlockMetadata_Generic* pMetadata, const VmaSuballocation& suballoc);
+};
+
+struct VmaBlockDefragmentationContext
+{
+    enum BLOCK_FLAG
+    {
+        BLOCK_FLAG_USED = 0x00000001,
+    };
+    uint32_t flags;
+    VkBuffer hBuffer;
+};
+
+class VmaBlockVectorDefragmentationContext
+{
+    VMA_CLASS_NO_COPY(VmaBlockVectorDefragmentationContext)
+public:
+    VkResult res;
+    bool mutexLocked;
+    VmaVector< VmaBlockDefragmentationContext, VmaStlAllocator<VmaBlockDefragmentationContext> > blockContexts;
+    VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> > defragmentationMoves;
+    uint32_t defragmentationMovesProcessed;
+    uint32_t defragmentationMovesCommitted;
+    bool hasDefragmentationPlan;
+
+    VmaBlockVectorDefragmentationContext(
+        VmaAllocator hAllocator,
+        VmaPool hCustomPool, // Optional.
+        VmaBlockVector* pBlockVector,
+        uint32_t currFrameIndex);
+    ~VmaBlockVectorDefragmentationContext();
+
+    VmaPool GetCustomPool() const { return m_hCustomPool; }
+    VmaBlockVector* GetBlockVector() const { return m_pBlockVector; }
+    VmaDefragmentationAlgorithm* GetAlgorithm() const { return m_pAlgorithm; }
+
+    void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged);
+    void AddAll() { m_AllAllocations = true; }
+
+    void Begin(bool overlappingMoveSupported, VmaDefragmentationFlags flags);
+
+private:
+    const VmaAllocator m_hAllocator;
+    // Null if not from custom pool.
+    const VmaPool m_hCustomPool;
+    // Redundant, for convenience not to fetch from m_hCustomPool->m_BlockVector or m_hAllocator->m_pBlockVectors.
+    VmaBlockVector* const m_pBlockVector;
+    const uint32_t m_CurrFrameIndex;
+    // Owner of this object.
+    VmaDefragmentationAlgorithm* m_pAlgorithm;
+
+    struct AllocInfo
+    {
+        VmaAllocation hAlloc;
+        VkBool32* pChanged;
+    };
+    // Used between constructor and Begin.
+    VmaVector< AllocInfo, VmaStlAllocator<AllocInfo> > m_Allocations;
+    bool m_AllAllocations;
+};
+
+struct VmaDefragmentationContext_T
+{
+private:
+    VMA_CLASS_NO_COPY(VmaDefragmentationContext_T)
+public:
+    VmaDefragmentationContext_T(
+        VmaAllocator hAllocator,
+        uint32_t currFrameIndex,
+        uint32_t flags,
+        VmaDefragmentationStats* pStats);
+    ~VmaDefragmentationContext_T();
+
+    void AddPools(uint32_t poolCount, VmaPool* pPools);
+    void AddAllocations(
+        uint32_t allocationCount,
+        VmaAllocation* pAllocations,
+        VkBool32* pAllocationsChanged);
+
+    /*
+    Returns:
+    - `VK_SUCCESS` if succeeded and object can be destroyed immediately.
+    - `VK_NOT_READY` if succeeded but the object must remain alive until vmaDefragmentationEnd().
+    - Negative value if error occured and object can be destroyed immediately.
+    */
+    VkResult Defragment(
+        VkDeviceSize maxCpuBytesToMove, uint32_t maxCpuAllocationsToMove,
+        VkDeviceSize maxGpuBytesToMove, uint32_t maxGpuAllocationsToMove,
+        VkCommandBuffer commandBuffer, VmaDefragmentationStats* pStats, VmaDefragmentationFlags flags);
+
+    VkResult DefragmentPassBegin(VmaDefragmentationPassInfo* pInfo);
+    VkResult DefragmentPassEnd();
+
+private:
+    const VmaAllocator m_hAllocator;
+    const uint32_t m_CurrFrameIndex;
+    const uint32_t m_Flags;
+    VmaDefragmentationStats* const m_pStats;
+
+    VkDeviceSize m_MaxCpuBytesToMove;
+    uint32_t m_MaxCpuAllocationsToMove;
+    VkDeviceSize m_MaxGpuBytesToMove;
+    uint32_t m_MaxGpuAllocationsToMove;
+
+    // Owner of these objects.
+    VmaBlockVectorDefragmentationContext* m_DefaultPoolContexts[VK_MAX_MEMORY_TYPES];
+    // Owner of these objects.
+    VmaVector< VmaBlockVectorDefragmentationContext*, VmaStlAllocator<VmaBlockVectorDefragmentationContext*> > m_CustomPoolContexts;
+};
+
+#if VMA_RECORDING_ENABLED
+
+class VmaRecorder
+{
+public:
+    VmaRecorder();
+    VkResult Init(const VmaRecordSettings& settings, bool useMutex);
+    void WriteConfiguration(
+        const VkPhysicalDeviceProperties& devProps,
+        const VkPhysicalDeviceMemoryProperties& memProps,
+        uint32_t vulkanApiVersion,
+        bool dedicatedAllocationExtensionEnabled,
+        bool bindMemory2ExtensionEnabled,
+        bool memoryBudgetExtensionEnabled);
+    ~VmaRecorder();
+
+    void RecordCreateAllocator(uint32_t frameIndex);
+    void RecordDestroyAllocator(uint32_t frameIndex);
+    void RecordCreatePool(uint32_t frameIndex,
+        const VmaPoolCreateInfo& createInfo,
+        VmaPool pool);
+    void RecordDestroyPool(uint32_t frameIndex, VmaPool pool);
+    void RecordAllocateMemory(uint32_t frameIndex,
+        const VkMemoryRequirements& vkMemReq,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaAllocation allocation);
+    void RecordAllocateMemoryPages(uint32_t frameIndex,
+        const VkMemoryRequirements& vkMemReq,
+        const VmaAllocationCreateInfo& createInfo,
+        uint64_t allocationCount,
+        const VmaAllocation* pAllocations);
+    void RecordAllocateMemoryForBuffer(uint32_t frameIndex,
+        const VkMemoryRequirements& vkMemReq,
+        bool requiresDedicatedAllocation,
+        bool prefersDedicatedAllocation,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaAllocation allocation);
+    void RecordAllocateMemoryForImage(uint32_t frameIndex,
+        const VkMemoryRequirements& vkMemReq,
+        bool requiresDedicatedAllocation,
+        bool prefersDedicatedAllocation,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaAllocation allocation);
+    void RecordFreeMemory(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordFreeMemoryPages(uint32_t frameIndex,
+        uint64_t allocationCount,
+        const VmaAllocation* pAllocations);
+    void RecordSetAllocationUserData(uint32_t frameIndex,
+        VmaAllocation allocation,
+        const void* pUserData);
+    void RecordCreateLostAllocation(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordMapMemory(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordUnmapMemory(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordFlushAllocation(uint32_t frameIndex,
+        VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size);
+    void RecordInvalidateAllocation(uint32_t frameIndex,
+        VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size);
+    void RecordCreateBuffer(uint32_t frameIndex,
+        const VkBufferCreateInfo& bufCreateInfo,
+        const VmaAllocationCreateInfo& allocCreateInfo,
+        VmaAllocation allocation);
+    void RecordCreateImage(uint32_t frameIndex,
+        const VkImageCreateInfo& imageCreateInfo,
+        const VmaAllocationCreateInfo& allocCreateInfo,
+        VmaAllocation allocation);
+    void RecordDestroyBuffer(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordDestroyImage(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordTouchAllocation(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordGetAllocationInfo(uint32_t frameIndex,
+        VmaAllocation allocation);
+    void RecordMakePoolAllocationsLost(uint32_t frameIndex,
+        VmaPool pool);
+    void RecordDefragmentationBegin(uint32_t frameIndex,
+        const VmaDefragmentationInfo2& info,
+        VmaDefragmentationContext ctx);
+    void RecordDefragmentationEnd(uint32_t frameIndex,
+        VmaDefragmentationContext ctx);
+    void RecordSetPoolName(uint32_t frameIndex,
+        VmaPool pool,
+        const char* name);
+
+private:
+    struct CallParams
+    {
+        uint32_t threadId;
+        double time;
+    };
+
+    class UserDataString
+    {
+    public:
+        UserDataString(VmaAllocationCreateFlags allocFlags, const void* pUserData);
+        const char* GetString() const { return m_Str; }
+
+    private:
+        char m_PtrStr[17];
+        const char* m_Str;
+    };
+
+    bool m_UseMutex;
+    VmaRecordFlags m_Flags;
+    FILE* m_File;
+    VMA_MUTEX m_FileMutex;
+    int64_t m_Freq;
+    int64_t m_StartCounter;
+
+    void GetBasicParams(CallParams& outParams);
+
+    // T must be a pointer type, e.g. VmaAllocation, VmaPool.
+    template<typename T>
+    void PrintPointerList(uint64_t count, const T* pItems)
+    {
+        if(count)
+        {
+            fprintf(m_File, "%p", pItems[0]);
+            for(uint64_t i = 1; i < count; ++i)
+            {
+                fprintf(m_File, " %p", pItems[i]);
+            }
+        }
+    }
+
+    void PrintPointerList(uint64_t count, const VmaAllocation* pItems);
+    void Flush();
+};
+
+#endif // #if VMA_RECORDING_ENABLED
+
+/*
+Thread-safe wrapper over VmaPoolAllocator free list, for allocation of VmaAllocation_T objects.
+*/
+class VmaAllocationObjectAllocator
+{
+    VMA_CLASS_NO_COPY(VmaAllocationObjectAllocator)
+public:
+    VmaAllocationObjectAllocator(const VkAllocationCallbacks* pAllocationCallbacks);
+
+    VmaAllocation Allocate();
+    void Free(VmaAllocation hAlloc);
+
+private:
+    VMA_MUTEX m_Mutex;
+    VmaPoolAllocator<VmaAllocation_T> m_Allocator;
+};
+
+struct VmaCurrentBudgetData
+{
+    VMA_ATOMIC_UINT64 m_BlockBytes[VK_MAX_MEMORY_HEAPS];
+    VMA_ATOMIC_UINT64 m_AllocationBytes[VK_MAX_MEMORY_HEAPS];
+
+#if VMA_MEMORY_BUDGET
+    VMA_ATOMIC_UINT32 m_OperationsSinceBudgetFetch;
+    VMA_RW_MUTEX m_BudgetMutex;
+    uint64_t m_VulkanUsage[VK_MAX_MEMORY_HEAPS];
+    uint64_t m_VulkanBudget[VK_MAX_MEMORY_HEAPS];
+    uint64_t m_BlockBytesAtBudgetFetch[VK_MAX_MEMORY_HEAPS];
+#endif // #if VMA_MEMORY_BUDGET
+
+    VmaCurrentBudgetData()
+    {
+        for(uint32_t heapIndex = 0; heapIndex < VK_MAX_MEMORY_HEAPS; ++heapIndex)
+        {
+            m_BlockBytes[heapIndex] = 0;
+            m_AllocationBytes[heapIndex] = 0;
+#if VMA_MEMORY_BUDGET
+            m_VulkanUsage[heapIndex] = 0;
+            m_VulkanBudget[heapIndex] = 0;
+            m_BlockBytesAtBudgetFetch[heapIndex] = 0;
+#endif
+        }
+
+#if VMA_MEMORY_BUDGET
+        m_OperationsSinceBudgetFetch = 0;
+#endif
+    }
+
+    void AddAllocation(uint32_t heapIndex, VkDeviceSize allocationSize)
+    {
+        m_AllocationBytes[heapIndex] += allocationSize;
+#if VMA_MEMORY_BUDGET
+        ++m_OperationsSinceBudgetFetch;
+#endif
+    }
+
+    void RemoveAllocation(uint32_t heapIndex, VkDeviceSize allocationSize)
+    {
+        VMA_ASSERT(m_AllocationBytes[heapIndex] >= allocationSize); // DELME
+        m_AllocationBytes[heapIndex] -= allocationSize;
+#if VMA_MEMORY_BUDGET
+        ++m_OperationsSinceBudgetFetch;
+#endif
+    }
+};
+
+// Main allocator object.
+struct VmaAllocator_T
+{
+    VMA_CLASS_NO_COPY(VmaAllocator_T)
+public:
+    bool m_UseMutex;
+    uint32_t m_VulkanApiVersion;
+    bool m_UseKhrDedicatedAllocation; // Can be set only if m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0).
+    bool m_UseKhrBindMemory2; // Can be set only if m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0).
+    bool m_UseExtMemoryBudget;
+    VkDevice m_hDevice;
+    VkInstance m_hInstance;
+    bool m_AllocationCallbacksSpecified;
+    VkAllocationCallbacks m_AllocationCallbacks;
+    VmaDeviceMemoryCallbacks m_DeviceMemoryCallbacks;
+    VmaAllocationObjectAllocator m_AllocationObjectAllocator;
+    
+    // Each bit (1 << i) is set if HeapSizeLimit is enabled for that heap, so cannot allocate more than the heap size.
+    uint32_t m_HeapSizeLimitMask;
+
+    VkPhysicalDeviceProperties m_PhysicalDeviceProperties;
+    VkPhysicalDeviceMemoryProperties m_MemProps;
+
+    // Default pools.
+    VmaBlockVector* m_pBlockVectors[VK_MAX_MEMORY_TYPES];
+
+    // Each vector is sorted by memory (handle value).
+    typedef VmaVector< VmaAllocation, VmaStlAllocator<VmaAllocation> > AllocationVectorType;
+    AllocationVectorType* m_pDedicatedAllocations[VK_MAX_MEMORY_TYPES];
+    VMA_RW_MUTEX m_DedicatedAllocationsMutex[VK_MAX_MEMORY_TYPES];
+
+    VmaCurrentBudgetData m_Budget;
+
+    VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo);
+    VkResult Init(const VmaAllocatorCreateInfo* pCreateInfo);
+    ~VmaAllocator_T();
+
+    const VkAllocationCallbacks* GetAllocationCallbacks() const
+    {
+        return m_AllocationCallbacksSpecified ? &m_AllocationCallbacks : 0;
+    }
+    const VmaVulkanFunctions& GetVulkanFunctions() const
+    {
+        return m_VulkanFunctions;
+    }
+
+    VkDeviceSize GetBufferImageGranularity() const
+    {
+        return VMA_MAX(
+            static_cast<VkDeviceSize>(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY),
+            m_PhysicalDeviceProperties.limits.bufferImageGranularity);
+    }
+
+    uint32_t GetMemoryHeapCount() const { return m_MemProps.memoryHeapCount; }
+    uint32_t GetMemoryTypeCount() const { return m_MemProps.memoryTypeCount; }
+
+    uint32_t MemoryTypeIndexToHeapIndex(uint32_t memTypeIndex) const
+    {
+        VMA_ASSERT(memTypeIndex < m_MemProps.memoryTypeCount);
+        return m_MemProps.memoryTypes[memTypeIndex].heapIndex;
+    }
+    // True when specific memory type is HOST_VISIBLE but not HOST_COHERENT.
+    bool IsMemoryTypeNonCoherent(uint32_t memTypeIndex) const
+    {
+        return (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) ==
+            VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+    }
+    // Minimum alignment for all allocations in specific memory type.
+    VkDeviceSize GetMemoryTypeMinAlignment(uint32_t memTypeIndex) const
+    {
+        return IsMemoryTypeNonCoherent(memTypeIndex) ?
+            VMA_MAX((VkDeviceSize)VMA_DEBUG_ALIGNMENT, m_PhysicalDeviceProperties.limits.nonCoherentAtomSize) :
+            (VkDeviceSize)VMA_DEBUG_ALIGNMENT;
+    }
+
+    bool IsIntegratedGpu() const
+    {
+        return m_PhysicalDeviceProperties.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU;
+    }
+
+#if VMA_RECORDING_ENABLED
+    VmaRecorder* GetRecorder() const { return m_pRecorder; }
+#endif
+
+    void GetBufferMemoryRequirements(
+        VkBuffer hBuffer,
+        VkMemoryRequirements& memReq,
+        bool& requiresDedicatedAllocation,
+        bool& prefersDedicatedAllocation) const;
+    void GetImageMemoryRequirements(
+        VkImage hImage,
+        VkMemoryRequirements& memReq,
+        bool& requiresDedicatedAllocation,
+        bool& prefersDedicatedAllocation) const;
+
+    // Main allocation function.
+    VkResult AllocateMemory(
+        const VkMemoryRequirements& vkMemReq,
+        bool requiresDedicatedAllocation,
+        bool prefersDedicatedAllocation,
+        VkBuffer dedicatedBuffer,
+        VkImage dedicatedImage,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaSuballocationType suballocType,
+        size_t allocationCount,
+        VmaAllocation* pAllocations);
+
+    // Main deallocation function.
+    void FreeMemory(
+        size_t allocationCount,
+        const VmaAllocation* pAllocations);
+
+    VkResult ResizeAllocation(
+        const VmaAllocation alloc,
+        VkDeviceSize newSize);
+
+    void CalculateStats(VmaStats* pStats);
+
+    void GetBudget(
+        VmaBudget* outBudget, uint32_t firstHeap, uint32_t heapCount);
+
+#if VMA_STATS_STRING_ENABLED
+    void PrintDetailedMap(class VmaJsonWriter& json);
+#endif
+
+    VkResult DefragmentationBegin(
+        const VmaDefragmentationInfo2& info,
+        VmaDefragmentationStats* pStats,
+        VmaDefragmentationContext* pContext);
+    VkResult DefragmentationEnd(
+        VmaDefragmentationContext context);
+
+    VkResult DefragmentationPassBegin(
+        VmaDefragmentationPassInfo* pInfo,
+        VmaDefragmentationContext context);
+    VkResult DefragmentationPassEnd(
+        VmaDefragmentationContext context);
+
+    void GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo);
+    bool TouchAllocation(VmaAllocation hAllocation);
+
+    VkResult CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool);
+    void DestroyPool(VmaPool pool);
+    void GetPoolStats(VmaPool pool, VmaPoolStats* pPoolStats);
+
+    void SetCurrentFrameIndex(uint32_t frameIndex);
+    uint32_t GetCurrentFrameIndex() const { return m_CurrentFrameIndex.load(); }
+
+    void MakePoolAllocationsLost(
+        VmaPool hPool,
+        size_t* pLostAllocationCount);
+    VkResult CheckPoolCorruption(VmaPool hPool);
+    VkResult CheckCorruption(uint32_t memoryTypeBits);
+
+    void CreateLostAllocation(VmaAllocation* pAllocation);
+
+    // Call to Vulkan function vkAllocateMemory with accompanying bookkeeping.
+    VkResult AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory);
+    // Call to Vulkan function vkFreeMemory with accompanying bookkeeping.
+    void FreeVulkanMemory(uint32_t memoryType, VkDeviceSize size, VkDeviceMemory hMemory);
+    // Call to Vulkan function vkBindBufferMemory or vkBindBufferMemory2KHR.
+    VkResult BindVulkanBuffer(
+        VkDeviceMemory memory,
+        VkDeviceSize memoryOffset,
+        VkBuffer buffer,
+        const void* pNext);
+    // Call to Vulkan function vkBindImageMemory or vkBindImageMemory2KHR.
+    VkResult BindVulkanImage(
+        VkDeviceMemory memory,
+        VkDeviceSize memoryOffset,
+        VkImage image,
+        const void* pNext);
+
+    VkResult Map(VmaAllocation hAllocation, void** ppData);
+    void Unmap(VmaAllocation hAllocation);
+
+    VkResult BindBufferMemory(
+        VmaAllocation hAllocation,
+        VkDeviceSize allocationLocalOffset,
+        VkBuffer hBuffer,
+        const void* pNext);
+    VkResult BindImageMemory(
+        VmaAllocation hAllocation,
+        VkDeviceSize allocationLocalOffset,
+        VkImage hImage,
+        const void* pNext);
+
+    void FlushOrInvalidateAllocation(
+        VmaAllocation hAllocation,
+        VkDeviceSize offset, VkDeviceSize size,
+        VMA_CACHE_OPERATION op);
+
+    void FillAllocation(const VmaAllocation hAllocation, uint8_t pattern);
+
+    /*
+    Returns bit mask of memory types that can support defragmentation on GPU as
+    they support creation of required buffer for copy operations.
+    */
+    uint32_t GetGpuDefragmentationMemoryTypeBits();
+
+private:
+    VkDeviceSize m_PreferredLargeHeapBlockSize;
+
+    VkPhysicalDevice m_PhysicalDevice;
+    VMA_ATOMIC_UINT32 m_CurrentFrameIndex;
+    VMA_ATOMIC_UINT32 m_GpuDefragmentationMemoryTypeBits; // UINT32_MAX means uninitialized.
+    
+    VMA_RW_MUTEX m_PoolsMutex;
+    // Protected by m_PoolsMutex. Sorted by pointer value.
+    VmaVector<VmaPool, VmaStlAllocator<VmaPool> > m_Pools;
+    uint32_t m_NextPoolId;
+
+    VmaVulkanFunctions m_VulkanFunctions;
+
+#if VMA_RECORDING_ENABLED
+    VmaRecorder* m_pRecorder;
+#endif
+
+    void ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions);
+
+    VkDeviceSize CalcPreferredBlockSize(uint32_t memTypeIndex);
+
+    VkResult AllocateMemoryOfType(
+        VkDeviceSize size,
+        VkDeviceSize alignment,
+        bool dedicatedAllocation,
+        VkBuffer dedicatedBuffer,
+        VkImage dedicatedImage,
+        const VmaAllocationCreateInfo& createInfo,
+        uint32_t memTypeIndex,
+        VmaSuballocationType suballocType,
+        size_t allocationCount,
+        VmaAllocation* pAllocations);
+
+    // Helper function only to be used inside AllocateDedicatedMemory.
+    VkResult AllocateDedicatedMemoryPage(
+        VkDeviceSize size,
+        VmaSuballocationType suballocType,
+        uint32_t memTypeIndex,
+        const VkMemoryAllocateInfo& allocInfo,
+        bool map,
+        bool isUserDataString,
+        void* pUserData,
+        VmaAllocation* pAllocation);
+
+    // Allocates and registers new VkDeviceMemory specifically for dedicated allocations.
+    VkResult AllocateDedicatedMemory(
+        VkDeviceSize size,
+        VmaSuballocationType suballocType,
+        uint32_t memTypeIndex,
+        bool withinBudget,
+        bool map,
+        bool isUserDataString,
+        void* pUserData,
+        VkBuffer dedicatedBuffer,
+        VkImage dedicatedImage,
+        size_t allocationCount,
+        VmaAllocation* pAllocations);
+
+    void FreeDedicatedMemory(const VmaAllocation allocation);
+
+    /*
+    Calculates and returns bit mask of memory types that can support defragmentation
+    on GPU as they support creation of required buffer for copy operations.
+    */
+    uint32_t CalculateGpuDefragmentationMemoryTypeBits() const;
+
+#if VMA_MEMORY_BUDGET
+    void UpdateVulkanBudget();
+#endif // #if VMA_MEMORY_BUDGET
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Memory allocation #2 after VmaAllocator_T definition
+
+static void* VmaMalloc(VmaAllocator hAllocator, size_t size, size_t alignment)
+{
+    return VmaMalloc(&hAllocator->m_AllocationCallbacks, size, alignment);
+}
+
+static void VmaFree(VmaAllocator hAllocator, void* ptr)
+{
+    VmaFree(&hAllocator->m_AllocationCallbacks, ptr);
+}
+
+template<typename T>
+static T* VmaAllocate(VmaAllocator hAllocator)
+{
+    return (T*)VmaMalloc(hAllocator, sizeof(T), VMA_ALIGN_OF(T));
+}
+
+template<typename T>
+static T* VmaAllocateArray(VmaAllocator hAllocator, size_t count)
+{
+    return (T*)VmaMalloc(hAllocator, sizeof(T) * count, VMA_ALIGN_OF(T));
+}
+
+template<typename T>
+static void vma_delete(VmaAllocator hAllocator, T* ptr)
+{
+    if(ptr != VMA_NULL)
+    {
+        ptr->~T();
+        VmaFree(hAllocator, ptr);
+    }
+}
+
+template<typename T>
+static void vma_delete_array(VmaAllocator hAllocator, T* ptr, size_t count)
+{
+    if(ptr != VMA_NULL)
+    {
+        for(size_t i = count; i--; )
+            ptr[i].~T();
+        VmaFree(hAllocator, ptr);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaStringBuilder
+
+#if VMA_STATS_STRING_ENABLED
+
+class VmaStringBuilder
+{
+public:
+    VmaStringBuilder(VmaAllocator alloc) : m_Data(VmaStlAllocator<char>(alloc->GetAllocationCallbacks())) { }
+    size_t GetLength() const { return m_Data.size(); }
+    const char* GetData() const { return m_Data.data(); }
+
+    void Add(char ch) { m_Data.push_back(ch); }
+    void Add(const char* pStr);
+    void AddNewLine() { Add('\n'); }
+    void AddNumber(uint32_t num);
+    void AddNumber(uint64_t num);
+    void AddPointer(const void* ptr);
+
+private:
+    VmaVector< char, VmaStlAllocator<char> > m_Data;
+};
+
+void VmaStringBuilder::Add(const char* pStr)
+{
+    const size_t strLen = strlen(pStr);
+    if(strLen > 0)
+    {
+        const size_t oldCount = m_Data.size();
+        m_Data.resize(oldCount + strLen);
+        memcpy(m_Data.data() + oldCount, pStr, strLen);
+    }
+}
+
+void VmaStringBuilder::AddNumber(uint32_t num)
+{
+    char buf[11];
+    buf[10] = '\0';
+    char *p = &buf[10];
+    do
+    {
+        *--p = '0' + (num % 10);
+        num /= 10;
+    }
+    while(num);
+    Add(p);
+}
+
+void VmaStringBuilder::AddNumber(uint64_t num)
+{
+    char buf[21];
+    buf[20] = '\0';
+    char *p = &buf[20];
+    do
+    {
+        *--p = '0' + (num % 10);
+        num /= 10;
+    }
+    while(num);
+    Add(p);
+}
+
+void VmaStringBuilder::AddPointer(const void* ptr)
+{
+    char buf[21];
+    VmaPtrToStr(buf, sizeof(buf), ptr);
+    Add(buf);
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaJsonWriter
+
+#if VMA_STATS_STRING_ENABLED
+
+class VmaJsonWriter
+{
+    VMA_CLASS_NO_COPY(VmaJsonWriter)
+public:
+    VmaJsonWriter(const VkAllocationCallbacks* pAllocationCallbacks, VmaStringBuilder& sb);
+    ~VmaJsonWriter();
+
+    void BeginObject(bool singleLine = false);
+    void EndObject();
+    
+    void BeginArray(bool singleLine = false);
+    void EndArray();
+    
+    void WriteString(const char* pStr);
+    void BeginString(const char* pStr = VMA_NULL);
+    void ContinueString(const char* pStr);
+    void ContinueString(uint32_t n);
+    void ContinueString(uint64_t n);
+    void ContinueString_Pointer(const void* ptr);
+    void EndString(const char* pStr = VMA_NULL);
+    
+    void WriteNumber(uint32_t n);
+    void WriteNumber(uint64_t n);
+    void WriteBool(bool b);
+    void WriteNull();
+
+private:
+    static const char* const INDENT;
+
+    enum COLLECTION_TYPE
+    {
+        COLLECTION_TYPE_OBJECT,
+        COLLECTION_TYPE_ARRAY,
+    };
+    struct StackItem
+    {
+        COLLECTION_TYPE type;
+        uint32_t valueCount;
+        bool singleLineMode;
+    };
+
+    VmaStringBuilder& m_SB;
+    VmaVector< StackItem, VmaStlAllocator<StackItem> > m_Stack;
+    bool m_InsideString;
+
+    void BeginValue(bool isString);
+    void WriteIndent(bool oneLess = false);
+};
+
+const char* const VmaJsonWriter::INDENT = "  ";
+
+VmaJsonWriter::VmaJsonWriter(const VkAllocationCallbacks* pAllocationCallbacks, VmaStringBuilder& sb) :
+    m_SB(sb),
+    m_Stack(VmaStlAllocator<StackItem>(pAllocationCallbacks)),
+    m_InsideString(false)
+{
+}
+
+VmaJsonWriter::~VmaJsonWriter()
+{
+    VMA_ASSERT(!m_InsideString);
+    VMA_ASSERT(m_Stack.empty());
+}
+
+void VmaJsonWriter::BeginObject(bool singleLine)
+{
+    VMA_ASSERT(!m_InsideString);
+
+    BeginValue(false);
+    m_SB.Add('{');
+
+    StackItem item;
+    item.type = COLLECTION_TYPE_OBJECT;
+    item.valueCount = 0;
+    item.singleLineMode = singleLine;
+    m_Stack.push_back(item);
+}
+
+void VmaJsonWriter::EndObject()
+{
+    VMA_ASSERT(!m_InsideString);
+
+    WriteIndent(true);
+    m_SB.Add('}');
+
+    VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_OBJECT);
+    m_Stack.pop_back();
+}
+
+void VmaJsonWriter::BeginArray(bool singleLine)
+{
+    VMA_ASSERT(!m_InsideString);
+
+    BeginValue(false);
+    m_SB.Add('[');
+
+    StackItem item;
+    item.type = COLLECTION_TYPE_ARRAY;
+    item.valueCount = 0;
+    item.singleLineMode = singleLine;
+    m_Stack.push_back(item);
+}
+
+void VmaJsonWriter::EndArray()
+{
+    VMA_ASSERT(!m_InsideString);
+
+    WriteIndent(true);
+    m_SB.Add(']');
+
+    VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_ARRAY);
+    m_Stack.pop_back();
+}
+
+void VmaJsonWriter::WriteString(const char* pStr)
+{
+    BeginString(pStr);
+    EndString();
+}
+
+void VmaJsonWriter::BeginString(const char* pStr)
+{
+    VMA_ASSERT(!m_InsideString);
+
+    BeginValue(true);
+    m_SB.Add('"');
+    m_InsideString = true;
+    if(pStr != VMA_NULL && pStr[0] != '\0')
+    {
+        ContinueString(pStr);
+    }
+}
+
+void VmaJsonWriter::ContinueString(const char* pStr)
+{
+    VMA_ASSERT(m_InsideString);
+
+    const size_t strLen = strlen(pStr);
+    for(size_t i = 0; i < strLen; ++i)
+    {
+        char ch = pStr[i];
+        if(ch == '\\')
+        {
+            m_SB.Add("\\\\");
+        }
+        else if(ch == '"')
+        {
+            m_SB.Add("\\\"");
+        }
+        else if(ch >= 32)
+        {
+            m_SB.Add(ch);
+        }
+        else switch(ch)
+        {
+        case '\b':
+            m_SB.Add("\\b");
+            break;
+        case '\f':
+            m_SB.Add("\\f");
+            break;
+        case '\n':
+            m_SB.Add("\\n");
+            break;
+        case '\r':
+            m_SB.Add("\\r");
+            break;
+        case '\t':
+            m_SB.Add("\\t");
+            break;
+        default:
+            VMA_ASSERT(0 && "Character not currently supported.");
+            break;
+        }
+    }
+}
+
+void VmaJsonWriter::ContinueString(uint32_t n)
+{
+    VMA_ASSERT(m_InsideString);
+    m_SB.AddNumber(n);
+}
+
+void VmaJsonWriter::ContinueString(uint64_t n)
+{
+    VMA_ASSERT(m_InsideString);
+    m_SB.AddNumber(n);
+}
+
+void VmaJsonWriter::ContinueString_Pointer(const void* ptr)
+{
+    VMA_ASSERT(m_InsideString);
+    m_SB.AddPointer(ptr);
+}
+
+void VmaJsonWriter::EndString(const char* pStr)
+{
+    VMA_ASSERT(m_InsideString);
+    if(pStr != VMA_NULL && pStr[0] != '\0')
+    {
+        ContinueString(pStr);
+    }
+    m_SB.Add('"');
+    m_InsideString = false;
+}
+
+void VmaJsonWriter::WriteNumber(uint32_t n)
+{
+    VMA_ASSERT(!m_InsideString);
+    BeginValue(false);
+    m_SB.AddNumber(n);
+}
+
+void VmaJsonWriter::WriteNumber(uint64_t n)
+{
+    VMA_ASSERT(!m_InsideString);
+    BeginValue(false);
+    m_SB.AddNumber(n);
+}
+
+void VmaJsonWriter::WriteBool(bool b)
+{
+    VMA_ASSERT(!m_InsideString);
+    BeginValue(false);
+    m_SB.Add(b ? "true" : "false");
+}
+
+void VmaJsonWriter::WriteNull()
+{
+    VMA_ASSERT(!m_InsideString);
+    BeginValue(false);
+    m_SB.Add("null");
+}
+
+void VmaJsonWriter::BeginValue(bool isString)
+{
+    if(!m_Stack.empty())
+    {
+        StackItem& currItem = m_Stack.back();
+        if(currItem.type == COLLECTION_TYPE_OBJECT &&
+            currItem.valueCount % 2 == 0)
+        {
+            VMA_ASSERT(isString);
+        }
+
+        if(currItem.type == COLLECTION_TYPE_OBJECT &&
+            currItem.valueCount % 2 != 0)
+        {
+            m_SB.Add(": ");
+        }
+        else if(currItem.valueCount > 0)
+        {
+            m_SB.Add(", ");
+            WriteIndent();
+        }
+        else
+        {
+            WriteIndent();
+        }
+        ++currItem.valueCount;
+    }
+}
+
+void VmaJsonWriter::WriteIndent(bool oneLess)
+{
+    if(!m_Stack.empty() && !m_Stack.back().singleLineMode)
+    {
+        m_SB.AddNewLine();
+        
+        size_t count = m_Stack.size();
+        if(count > 0 && oneLess)
+        {
+            --count;
+        }
+        for(size_t i = 0; i < count; ++i)
+        {
+            m_SB.Add(INDENT);
+        }
+    }
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+////////////////////////////////////////////////////////////////////////////////
+
+void VmaAllocation_T::SetUserData(VmaAllocator hAllocator, void* pUserData)
+{
+    if(IsUserDataString())
+    {
+        VMA_ASSERT(pUserData == VMA_NULL || pUserData != m_pUserData);
+
+        FreeUserDataString(hAllocator);
+
+        if(pUserData != VMA_NULL)
+        {
+            m_pUserData = VmaCreateStringCopy(hAllocator->GetAllocationCallbacks(), (const char*)pUserData);
+        }
+    }
+    else
+    {
+        m_pUserData = pUserData;
+    }
+}
+
+void VmaAllocation_T::ChangeBlockAllocation(
+    VmaAllocator hAllocator,
+    VmaDeviceMemoryBlock* block,
+    VkDeviceSize offset)
+{
+    VMA_ASSERT(block != VMA_NULL);
+    VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK);
+
+    // Move mapping reference counter from old block to new block.
+    if(block != m_BlockAllocation.m_Block)
+    {
+        uint32_t mapRefCount = m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP;
+        if(IsPersistentMap())
+            ++mapRefCount;
+        m_BlockAllocation.m_Block->Unmap(hAllocator, mapRefCount);
+        block->Map(hAllocator, mapRefCount, VMA_NULL);
+    }
+
+    m_BlockAllocation.m_Block = block;
+    m_BlockAllocation.m_Offset = offset;
+}
+
+void VmaAllocation_T::ChangeOffset(VkDeviceSize newOffset)
+{
+    VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK);
+    m_BlockAllocation.m_Offset = newOffset;
+}
+
+VkDeviceSize VmaAllocation_T::GetOffset() const
+{
+    switch(m_Type)
+    {
+    case ALLOCATION_TYPE_BLOCK:
+        return m_BlockAllocation.m_Offset;
+    case ALLOCATION_TYPE_DEDICATED:
+        return 0;
+    default:
+        VMA_ASSERT(0);
+        return 0;
+    }
+}
+
+VkDeviceMemory VmaAllocation_T::GetMemory() const
+{
+    switch(m_Type)
+    {
+    case ALLOCATION_TYPE_BLOCK:
+        return m_BlockAllocation.m_Block->GetDeviceMemory();
+    case ALLOCATION_TYPE_DEDICATED:
+        return m_DedicatedAllocation.m_hMemory;
+    default:
+        VMA_ASSERT(0);
+        return VK_NULL_HANDLE;
+    }
+}
+
+void* VmaAllocation_T::GetMappedData() const
+{
+    switch(m_Type)
+    {
+    case ALLOCATION_TYPE_BLOCK:
+        if(m_MapCount != 0)
+        {
+            void* pBlockData = m_BlockAllocation.m_Block->GetMappedData();
+            VMA_ASSERT(pBlockData != VMA_NULL);
+            return (char*)pBlockData + m_BlockAllocation.m_Offset;
+        }
+        else
+        {
+            return VMA_NULL;
+        }
+        break;
+    case ALLOCATION_TYPE_DEDICATED:
+        VMA_ASSERT((m_DedicatedAllocation.m_pMappedData != VMA_NULL) == (m_MapCount != 0));
+        return m_DedicatedAllocation.m_pMappedData;
+    default:
+        VMA_ASSERT(0);
+        return VMA_NULL;
+    }
+}
+
+bool VmaAllocation_T::CanBecomeLost() const
+{
+    switch(m_Type)
+    {
+    case ALLOCATION_TYPE_BLOCK:
+        return m_BlockAllocation.m_CanBecomeLost;
+    case ALLOCATION_TYPE_DEDICATED:
+        return false;
+    default:
+        VMA_ASSERT(0);
+        return false;
+    }
+}
+
+bool VmaAllocation_T::MakeLost(uint32_t currentFrameIndex, uint32_t frameInUseCount)
+{
+    VMA_ASSERT(CanBecomeLost());
+
+    /*
+    Warning: This is a carefully designed algorithm.
+    Do not modify unless you really know what you're doing :)
+    */
+    uint32_t localLastUseFrameIndex = GetLastUseFrameIndex();
+    for(;;)
+    {
+        if(localLastUseFrameIndex == VMA_FRAME_INDEX_LOST)
+        {
+            VMA_ASSERT(0);
+            return false;
+        }
+        else if(localLastUseFrameIndex + frameInUseCount >= currentFrameIndex)
+        {
+            return false;
+        }
+        else // Last use time earlier than current time.
+        {
+            if(CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, VMA_FRAME_INDEX_LOST))
+            {
+                // Setting hAllocation.LastUseFrameIndex atomic to VMA_FRAME_INDEX_LOST is enough to mark it as LOST.
+                // Calling code just needs to unregister this allocation in owning VmaDeviceMemoryBlock.
+                return true;
+            }
+        }
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+// Correspond to values of enum VmaSuballocationType.
+static const char* VMA_SUBALLOCATION_TYPE_NAMES[] = {
+    "FREE",
+    "UNKNOWN",
+    "BUFFER",
+    "IMAGE_UNKNOWN",
+    "IMAGE_LINEAR",
+    "IMAGE_OPTIMAL",
+};
+
+void VmaAllocation_T::PrintParameters(class VmaJsonWriter& json) const
+{
+    json.WriteString("Type");
+    json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[m_SuballocationType]);
+
+    json.WriteString("Size");
+    json.WriteNumber(m_Size);
+
+    if(m_pUserData != VMA_NULL)
+    {
+        json.WriteString("UserData");
+        if(IsUserDataString())
+        {
+            json.WriteString((const char*)m_pUserData);
+        }
+        else
+        {
+            json.BeginString();
+            json.ContinueString_Pointer(m_pUserData);
+            json.EndString();
+        }
+    }
+
+    json.WriteString("CreationFrameIndex");
+    json.WriteNumber(m_CreationFrameIndex);
+
+    json.WriteString("LastUseFrameIndex");
+    json.WriteNumber(GetLastUseFrameIndex());
+
+    if(m_BufferImageUsage != 0)
+    {
+        json.WriteString("Usage");
+        json.WriteNumber(m_BufferImageUsage);
+    }
+}
+
+#endif
+
+void VmaAllocation_T::FreeUserDataString(VmaAllocator hAllocator)
+{
+    VMA_ASSERT(IsUserDataString());
+    VmaFreeString(hAllocator->GetAllocationCallbacks(), (char*)m_pUserData);
+    m_pUserData = VMA_NULL;
+}
+
+void VmaAllocation_T::BlockAllocMap()
+{
+    VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK);
+
+    if((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) < 0x7F)
+    {
+        ++m_MapCount;
+    }
+    else
+    {
+        VMA_ASSERT(0 && "Allocation mapped too many times simultaneously.");
+    }
+}
+
+void VmaAllocation_T::BlockAllocUnmap()
+{
+    VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK);
+
+    if((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) != 0)
+    {
+        --m_MapCount;
+    }
+    else
+    {
+        VMA_ASSERT(0 && "Unmapping allocation not previously mapped.");
+    }
+}
+
+VkResult VmaAllocation_T::DedicatedAllocMap(VmaAllocator hAllocator, void** ppData)
+{
+    VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED);
+
+    if(m_MapCount != 0)
+    {
+        if((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) < 0x7F)
+        {
+            VMA_ASSERT(m_DedicatedAllocation.m_pMappedData != VMA_NULL);
+            *ppData = m_DedicatedAllocation.m_pMappedData;
+            ++m_MapCount;
+            return VK_SUCCESS;
+        }
+        else
+        {
+            VMA_ASSERT(0 && "Dedicated allocation mapped too many times simultaneously.");
+            return VK_ERROR_MEMORY_MAP_FAILED;
+        }
+    }
+    else
+    {
+        VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)(
+            hAllocator->m_hDevice,
+            m_DedicatedAllocation.m_hMemory,
+            0, // offset
+            VK_WHOLE_SIZE,
+            0, // flags
+            ppData);
+        if(result == VK_SUCCESS)
+        {
+            m_DedicatedAllocation.m_pMappedData = *ppData;
+            m_MapCount = 1;
+        }
+        return result;
+    }
+}
+
+void VmaAllocation_T::DedicatedAllocUnmap(VmaAllocator hAllocator)
+{
+    VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED);
+
+    if((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) != 0)
+    {
+        --m_MapCount;
+        if(m_MapCount == 0)
+        {
+            m_DedicatedAllocation.m_pMappedData = VMA_NULL;
+            (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(
+                hAllocator->m_hDevice,
+                m_DedicatedAllocation.m_hMemory);
+        }
+    }
+    else
+    {
+        VMA_ASSERT(0 && "Unmapping dedicated allocation not previously mapped.");
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+static void VmaPrintStatInfo(VmaJsonWriter& json, const VmaStatInfo& stat)
+{
+    json.BeginObject();
+
+    json.WriteString("Blocks");
+    json.WriteNumber(stat.blockCount);
+
+    json.WriteString("Allocations");
+    json.WriteNumber(stat.allocationCount);
+
+    json.WriteString("UnusedRanges");
+    json.WriteNumber(stat.unusedRangeCount);
+
+    json.WriteString("UsedBytes");
+    json.WriteNumber(stat.usedBytes);
+
+    json.WriteString("UnusedBytes");
+    json.WriteNumber(stat.unusedBytes);
+
+    if(stat.allocationCount > 1)
+    {
+        json.WriteString("AllocationSize");
+        json.BeginObject(true);
+        json.WriteString("Min");
+        json.WriteNumber(stat.allocationSizeMin);
+        json.WriteString("Avg");
+        json.WriteNumber(stat.allocationSizeAvg);
+        json.WriteString("Max");
+        json.WriteNumber(stat.allocationSizeMax);
+        json.EndObject();
+    }
+
+    if(stat.unusedRangeCount > 1)
+    {
+        json.WriteString("UnusedRangeSize");
+        json.BeginObject(true);
+        json.WriteString("Min");
+        json.WriteNumber(stat.unusedRangeSizeMin);
+        json.WriteString("Avg");
+        json.WriteNumber(stat.unusedRangeSizeAvg);
+        json.WriteString("Max");
+        json.WriteNumber(stat.unusedRangeSizeMax);
+        json.EndObject();
+    }
+
+    json.EndObject();
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+struct VmaSuballocationItemSizeLess
+{
+    bool operator()(
+        const VmaSuballocationList::iterator lhs,
+        const VmaSuballocationList::iterator rhs) const
+    {
+        return lhs->size < rhs->size;
+    }
+    bool operator()(
+        const VmaSuballocationList::iterator lhs,
+        VkDeviceSize rhsSize) const
+    {
+        return lhs->size < rhsSize;
+    }
+};
+
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaBlockMetadata
+
+VmaBlockMetadata::VmaBlockMetadata(VmaAllocator hAllocator) :
+    m_Size(0),
+    m_pAllocationCallbacks(hAllocator->GetAllocationCallbacks())
+{
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+void VmaBlockMetadata::PrintDetailedMap_Begin(class VmaJsonWriter& json,
+    VkDeviceSize unusedBytes,
+    size_t allocationCount,
+    size_t unusedRangeCount) const
+{
+    json.BeginObject();
+
+    json.WriteString("TotalBytes");
+    json.WriteNumber(GetSize());
+
+    json.WriteString("UnusedBytes");
+    json.WriteNumber(unusedBytes);
+
+    json.WriteString("Allocations");
+    json.WriteNumber((uint64_t)allocationCount);
+
+    json.WriteString("UnusedRanges");
+    json.WriteNumber((uint64_t)unusedRangeCount);
+
+    json.WriteString("Suballocations");
+    json.BeginArray();
+}
+
+void VmaBlockMetadata::PrintDetailedMap_Allocation(class VmaJsonWriter& json,
+    VkDeviceSize offset,
+    VmaAllocation hAllocation) const
+{
+    json.BeginObject(true);
+        
+    json.WriteString("Offset");
+    json.WriteNumber(offset);
+
+    hAllocation->PrintParameters(json);
+
+    json.EndObject();
+}
+
+void VmaBlockMetadata::PrintDetailedMap_UnusedRange(class VmaJsonWriter& json,
+    VkDeviceSize offset,
+    VkDeviceSize size) const
+{
+    json.BeginObject(true);
+        
+    json.WriteString("Offset");
+    json.WriteNumber(offset);
+
+    json.WriteString("Type");
+    json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[VMA_SUBALLOCATION_TYPE_FREE]);
+
+    json.WriteString("Size");
+    json.WriteNumber(size);
+
+    json.EndObject();
+}
+
+void VmaBlockMetadata::PrintDetailedMap_End(class VmaJsonWriter& json) const
+{
+    json.EndArray();
+    json.EndObject();
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaBlockMetadata_Generic
+
+VmaBlockMetadata_Generic::VmaBlockMetadata_Generic(VmaAllocator hAllocator) :
+    VmaBlockMetadata(hAllocator),
+    m_FreeCount(0),
+    m_SumFreeSize(0),
+    m_Suballocations(VmaStlAllocator<VmaSuballocation>(hAllocator->GetAllocationCallbacks())),
+    m_FreeSuballocationsBySize(VmaStlAllocator<VmaSuballocationList::iterator>(hAllocator->GetAllocationCallbacks()))
+{
+}
+
+VmaBlockMetadata_Generic::~VmaBlockMetadata_Generic()
+{
+}
+
+void VmaBlockMetadata_Generic::Init(VkDeviceSize size)
+{
+    VmaBlockMetadata::Init(size);
+
+    m_FreeCount = 1;
+    m_SumFreeSize = size;
+
+    VmaSuballocation suballoc = {};
+    suballoc.offset = 0;
+    suballoc.size = size;
+    suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+    suballoc.hAllocation = VK_NULL_HANDLE;
+
+    VMA_ASSERT(size > VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER);
+    m_Suballocations.push_back(suballoc);
+    VmaSuballocationList::iterator suballocItem = m_Suballocations.end();
+    --suballocItem;
+    m_FreeSuballocationsBySize.push_back(suballocItem);
+}
+
+bool VmaBlockMetadata_Generic::Validate() const
+{
+    VMA_VALIDATE(!m_Suballocations.empty());
+    
+    // Expected offset of new suballocation as calculated from previous ones.
+    VkDeviceSize calculatedOffset = 0;
+    // Expected number of free suballocations as calculated from traversing their list.
+    uint32_t calculatedFreeCount = 0;
+    // Expected sum size of free suballocations as calculated from traversing their list.
+    VkDeviceSize calculatedSumFreeSize = 0;
+    // Expected number of free suballocations that should be registered in
+    // m_FreeSuballocationsBySize calculated from traversing their list.
+    size_t freeSuballocationsToRegister = 0;
+    // True if previous visited suballocation was free.
+    bool prevFree = false;
+
+    for(VmaSuballocationList::const_iterator suballocItem = m_Suballocations.cbegin();
+        suballocItem != m_Suballocations.cend();
+        ++suballocItem)
+    {
+        const VmaSuballocation& subAlloc = *suballocItem;
+        
+        // Actual offset of this suballocation doesn't match expected one.
+        VMA_VALIDATE(subAlloc.offset == calculatedOffset);
+
+        const bool currFree = (subAlloc.type == VMA_SUBALLOCATION_TYPE_FREE);
+        // Two adjacent free suballocations are invalid. They should be merged.
+        VMA_VALIDATE(!prevFree || !currFree);
+
+        VMA_VALIDATE(currFree == (subAlloc.hAllocation == VK_NULL_HANDLE));
+
+        if(currFree)
+        {
+            calculatedSumFreeSize += subAlloc.size;
+            ++calculatedFreeCount;
+            if(subAlloc.size >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+            {
+                ++freeSuballocationsToRegister;
+            }
+
+            // Margin required between allocations - every free space must be at least that large.
+            VMA_VALIDATE(subAlloc.size >= VMA_DEBUG_MARGIN);
+        }
+        else
+        {
+            VMA_VALIDATE(subAlloc.hAllocation->GetOffset() == subAlloc.offset);
+            VMA_VALIDATE(subAlloc.hAllocation->GetSize() == subAlloc.size);
+
+            // Margin required between allocations - previous allocation must be free.
+            VMA_VALIDATE(VMA_DEBUG_MARGIN == 0 || prevFree);
+        }
+
+        calculatedOffset += subAlloc.size;
+        prevFree = currFree;
+    }
+
+    // Number of free suballocations registered in m_FreeSuballocationsBySize doesn't
+    // match expected one.
+    VMA_VALIDATE(m_FreeSuballocationsBySize.size() == freeSuballocationsToRegister);
+
+    VkDeviceSize lastSize = 0;
+    for(size_t i = 0; i < m_FreeSuballocationsBySize.size(); ++i)
+    {
+        VmaSuballocationList::iterator suballocItem = m_FreeSuballocationsBySize[i];
+        
+        // Only free suballocations can be registered in m_FreeSuballocationsBySize.
+        VMA_VALIDATE(suballocItem->type == VMA_SUBALLOCATION_TYPE_FREE);
+        // They must be sorted by size ascending.
+        VMA_VALIDATE(suballocItem->size >= lastSize);
+
+        lastSize = suballocItem->size;
+    }
+
+    // Check if totals match calculacted values.
+    VMA_VALIDATE(ValidateFreeSuballocationList());
+    VMA_VALIDATE(calculatedOffset == GetSize());
+    VMA_VALIDATE(calculatedSumFreeSize == m_SumFreeSize);
+    VMA_VALIDATE(calculatedFreeCount == m_FreeCount);
+
+    return true;
+}
+
+VkDeviceSize VmaBlockMetadata_Generic::GetUnusedRangeSizeMax() const
+{
+    if(!m_FreeSuballocationsBySize.empty())
+    {
+        return m_FreeSuballocationsBySize.back()->size;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+bool VmaBlockMetadata_Generic::IsEmpty() const
+{
+    return (m_Suballocations.size() == 1) && (m_FreeCount == 1);
+}
+
+void VmaBlockMetadata_Generic::CalcAllocationStatInfo(VmaStatInfo& outInfo) const
+{
+    outInfo.blockCount = 1;
+
+    const uint32_t rangeCount = (uint32_t)m_Suballocations.size();
+    outInfo.allocationCount = rangeCount - m_FreeCount;
+    outInfo.unusedRangeCount = m_FreeCount;
+    
+    outInfo.unusedBytes = m_SumFreeSize;
+    outInfo.usedBytes = GetSize() - outInfo.unusedBytes;
+
+    outInfo.allocationSizeMin = UINT64_MAX;
+    outInfo.allocationSizeMax = 0;
+    outInfo.unusedRangeSizeMin = UINT64_MAX;
+    outInfo.unusedRangeSizeMax = 0;
+
+    for(VmaSuballocationList::const_iterator suballocItem = m_Suballocations.cbegin();
+        suballocItem != m_Suballocations.cend();
+        ++suballocItem)
+    {
+        const VmaSuballocation& suballoc = *suballocItem;
+        if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            outInfo.allocationSizeMin = VMA_MIN(outInfo.allocationSizeMin, suballoc.size);
+            outInfo.allocationSizeMax = VMA_MAX(outInfo.allocationSizeMax, suballoc.size);
+        }
+        else
+        {
+            outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, suballoc.size);
+            outInfo.unusedRangeSizeMax = VMA_MAX(outInfo.unusedRangeSizeMax, suballoc.size);
+        }
+    }
+}
+
+void VmaBlockMetadata_Generic::AddPoolStats(VmaPoolStats& inoutStats) const
+{
+    const uint32_t rangeCount = (uint32_t)m_Suballocations.size();
+
+    inoutStats.size += GetSize();
+    inoutStats.unusedSize += m_SumFreeSize;
+    inoutStats.allocationCount += rangeCount - m_FreeCount;
+    inoutStats.unusedRangeCount += m_FreeCount;
+    inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, GetUnusedRangeSizeMax());
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+void VmaBlockMetadata_Generic::PrintDetailedMap(class VmaJsonWriter& json) const
+{
+    PrintDetailedMap_Begin(json,
+        m_SumFreeSize, // unusedBytes
+        m_Suballocations.size() - (size_t)m_FreeCount, // allocationCount
+        m_FreeCount); // unusedRangeCount
+
+    size_t i = 0;
+    for(VmaSuballocationList::const_iterator suballocItem = m_Suballocations.cbegin();
+        suballocItem != m_Suballocations.cend();
+        ++suballocItem, ++i)
+    {
+        if(suballocItem->type == VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            PrintDetailedMap_UnusedRange(json, suballocItem->offset, suballocItem->size);
+        }
+        else
+        {
+            PrintDetailedMap_Allocation(json, suballocItem->offset, suballocItem->hAllocation);
+        }
+    }
+
+    PrintDetailedMap_End(json);
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+bool VmaBlockMetadata_Generic::CreateAllocationRequest(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VkDeviceSize bufferImageGranularity,
+    VkDeviceSize allocSize,
+    VkDeviceSize allocAlignment,
+    bool upperAddress,
+    VmaSuballocationType allocType,
+    bool canMakeOtherLost,
+    uint32_t strategy,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    VMA_ASSERT(allocSize > 0);
+    VMA_ASSERT(!upperAddress);
+    VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);
+    VMA_ASSERT(pAllocationRequest != VMA_NULL);
+    VMA_HEAVY_ASSERT(Validate());
+
+    pAllocationRequest->type = VmaAllocationRequestType::Normal;
+
+    // There is not enough total free space in this block to fullfill the request: Early return.
+    if(canMakeOtherLost == false &&
+        m_SumFreeSize < allocSize + 2 * VMA_DEBUG_MARGIN)
+    {
+        return false;
+    }
+
+    // New algorithm, efficiently searching freeSuballocationsBySize.
+    const size_t freeSuballocCount = m_FreeSuballocationsBySize.size();
+    if(freeSuballocCount > 0)
+    {
+        if(strategy == VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT)
+        {
+            // Find first free suballocation with size not less than allocSize + 2 * VMA_DEBUG_MARGIN.
+            VmaSuballocationList::iterator* const it = VmaBinaryFindFirstNotLess(
+                m_FreeSuballocationsBySize.data(),
+                m_FreeSuballocationsBySize.data() + freeSuballocCount,
+                allocSize + 2 * VMA_DEBUG_MARGIN,
+                VmaSuballocationItemSizeLess());
+            size_t index = it - m_FreeSuballocationsBySize.data();
+            for(; index < freeSuballocCount; ++index)
+            {
+                if(CheckAllocation(
+                    currentFrameIndex,
+                    frameInUseCount,
+                    bufferImageGranularity,
+                    allocSize,
+                    allocAlignment,
+                    allocType,
+                    m_FreeSuballocationsBySize[index],
+                    false, // canMakeOtherLost
+                    &pAllocationRequest->offset,
+                    &pAllocationRequest->itemsToMakeLostCount,
+                    &pAllocationRequest->sumFreeSize,
+                    &pAllocationRequest->sumItemSize))
+                {
+                    pAllocationRequest->item = m_FreeSuballocationsBySize[index];
+                    return true;
+                }
+            }
+        }
+        else if(strategy == VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET)
+        {
+            for(VmaSuballocationList::iterator it = m_Suballocations.begin();
+                it != m_Suballocations.end();
+                ++it)
+            {
+                if(it->type == VMA_SUBALLOCATION_TYPE_FREE && CheckAllocation(
+                    currentFrameIndex,
+                    frameInUseCount,
+                    bufferImageGranularity,
+                    allocSize,
+                    allocAlignment,
+                    allocType,
+                    it,
+                    false, // canMakeOtherLost
+                    &pAllocationRequest->offset,
+                    &pAllocationRequest->itemsToMakeLostCount,
+                    &pAllocationRequest->sumFreeSize,
+                    &pAllocationRequest->sumItemSize))
+                {
+                    pAllocationRequest->item = it;
+                    return true;
+                }
+            }
+        }
+        else // WORST_FIT, FIRST_FIT
+        {
+            // Search staring from biggest suballocations.
+            for(size_t index = freeSuballocCount; index--; )
+            {
+                if(CheckAllocation(
+                    currentFrameIndex,
+                    frameInUseCount,
+                    bufferImageGranularity,
+                    allocSize,
+                    allocAlignment,
+                    allocType,
+                    m_FreeSuballocationsBySize[index],
+                    false, // canMakeOtherLost
+                    &pAllocationRequest->offset,
+                    &pAllocationRequest->itemsToMakeLostCount,
+                    &pAllocationRequest->sumFreeSize,
+                    &pAllocationRequest->sumItemSize))
+                {
+                    pAllocationRequest->item = m_FreeSuballocationsBySize[index];
+                    return true;
+                }
+            }
+        }
+    }
+
+    if(canMakeOtherLost)
+    {
+        // Brute-force algorithm. TODO: Come up with something better.
+
+        bool found = false;
+        VmaAllocationRequest tmpAllocRequest = {};
+        tmpAllocRequest.type = VmaAllocationRequestType::Normal;
+        for(VmaSuballocationList::iterator suballocIt = m_Suballocations.begin();
+            suballocIt != m_Suballocations.end();
+            ++suballocIt)
+        {
+            if(suballocIt->type == VMA_SUBALLOCATION_TYPE_FREE ||
+                suballocIt->hAllocation->CanBecomeLost())
+            {
+                if(CheckAllocation(
+                    currentFrameIndex,
+                    frameInUseCount,
+                    bufferImageGranularity,
+                    allocSize,
+                    allocAlignment,
+                    allocType,
+                    suballocIt,
+                    canMakeOtherLost,
+                    &tmpAllocRequest.offset,
+                    &tmpAllocRequest.itemsToMakeLostCount,
+                    &tmpAllocRequest.sumFreeSize,
+                    &tmpAllocRequest.sumItemSize))
+                {
+                    if(strategy == VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT)
+                    {
+                        *pAllocationRequest = tmpAllocRequest;
+                        pAllocationRequest->item = suballocIt;
+                        break;
+                    }
+                    if(!found || tmpAllocRequest.CalcCost() < pAllocationRequest->CalcCost())
+                    {
+                        *pAllocationRequest = tmpAllocRequest;
+                        pAllocationRequest->item = suballocIt;
+                        found = true;
+                    }
+                }
+            }
+        }
+
+        return found;
+    }
+
+    return false;
+}
+
+bool VmaBlockMetadata_Generic::MakeRequestedAllocationsLost(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    VMA_ASSERT(pAllocationRequest && pAllocationRequest->type == VmaAllocationRequestType::Normal);
+
+    while(pAllocationRequest->itemsToMakeLostCount > 0)
+    {
+        if(pAllocationRequest->item->type == VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            ++pAllocationRequest->item;
+        }
+        VMA_ASSERT(pAllocationRequest->item != m_Suballocations.end());
+        VMA_ASSERT(pAllocationRequest->item->hAllocation != VK_NULL_HANDLE);
+        VMA_ASSERT(pAllocationRequest->item->hAllocation->CanBecomeLost());
+        if(pAllocationRequest->item->hAllocation->MakeLost(currentFrameIndex, frameInUseCount))
+        {
+            pAllocationRequest->item = FreeSuballocation(pAllocationRequest->item);
+            --pAllocationRequest->itemsToMakeLostCount;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    VMA_HEAVY_ASSERT(Validate());
+    VMA_ASSERT(pAllocationRequest->item != m_Suballocations.end());
+    VMA_ASSERT(pAllocationRequest->item->type == VMA_SUBALLOCATION_TYPE_FREE);
+    
+    return true;
+}
+
+uint32_t VmaBlockMetadata_Generic::MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount)
+{
+    uint32_t lostAllocationCount = 0;
+    for(VmaSuballocationList::iterator it = m_Suballocations.begin();
+        it != m_Suballocations.end();
+        ++it)
+    {
+        if(it->type != VMA_SUBALLOCATION_TYPE_FREE &&
+            it->hAllocation->CanBecomeLost() &&
+            it->hAllocation->MakeLost(currentFrameIndex, frameInUseCount))
+        {
+            it = FreeSuballocation(it);
+            ++lostAllocationCount;
+        }
+    }
+    return lostAllocationCount;
+}
+
+VkResult VmaBlockMetadata_Generic::CheckCorruption(const void* pBlockData)
+{
+    for(VmaSuballocationList::iterator it = m_Suballocations.begin();
+        it != m_Suballocations.end();
+        ++it)
+    {
+        if(it->type != VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            if(!VmaValidateMagicValue(pBlockData, it->offset - VMA_DEBUG_MARGIN))
+            {
+                VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED BEFORE VALIDATED ALLOCATION!");
+                return VK_ERROR_VALIDATION_FAILED_EXT;
+            }
+            if(!VmaValidateMagicValue(pBlockData, it->offset + it->size))
+            {
+                VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!");
+                return VK_ERROR_VALIDATION_FAILED_EXT;
+            }
+        }
+    }
+
+    return VK_SUCCESS;
+}
+
+void VmaBlockMetadata_Generic::Alloc(
+    const VmaAllocationRequest& request,
+    VmaSuballocationType type,
+    VkDeviceSize allocSize,
+    VmaAllocation hAllocation)
+{
+    VMA_ASSERT(request.type == VmaAllocationRequestType::Normal);
+    VMA_ASSERT(request.item != m_Suballocations.end());
+    VmaSuballocation& suballoc = *request.item;
+    // Given suballocation is a free block.
+    VMA_ASSERT(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);
+    // Given offset is inside this suballocation.
+    VMA_ASSERT(request.offset >= suballoc.offset);
+    const VkDeviceSize paddingBegin = request.offset - suballoc.offset;
+    VMA_ASSERT(suballoc.size >= paddingBegin + allocSize);
+    const VkDeviceSize paddingEnd = suballoc.size - paddingBegin - allocSize;
+
+    // Unregister this free suballocation from m_FreeSuballocationsBySize and update
+    // it to become used.
+    UnregisterFreeSuballocation(request.item);
+
+    suballoc.offset = request.offset;
+    suballoc.size = allocSize;
+    suballoc.type = type;
+    suballoc.hAllocation = hAllocation;
+
+    // If there are any free bytes remaining at the end, insert new free suballocation after current one.
+    if(paddingEnd)
+    {
+        VmaSuballocation paddingSuballoc = {};
+        paddingSuballoc.offset = request.offset + allocSize;
+        paddingSuballoc.size = paddingEnd;
+        paddingSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+        VmaSuballocationList::iterator next = request.item;
+        ++next;
+        const VmaSuballocationList::iterator paddingEndItem =
+            m_Suballocations.insert(next, paddingSuballoc);
+        RegisterFreeSuballocation(paddingEndItem);
+    }
+
+    // If there are any free bytes remaining at the beginning, insert new free suballocation before current one.
+    if(paddingBegin)
+    {
+        VmaSuballocation paddingSuballoc = {};
+        paddingSuballoc.offset = request.offset - paddingBegin;
+        paddingSuballoc.size = paddingBegin;
+        paddingSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+        const VmaSuballocationList::iterator paddingBeginItem =
+            m_Suballocations.insert(request.item, paddingSuballoc);
+        RegisterFreeSuballocation(paddingBeginItem);
+    }
+
+    // Update totals.
+    m_FreeCount = m_FreeCount - 1;
+    if(paddingBegin > 0)
+    {
+        ++m_FreeCount;
+    }
+    if(paddingEnd > 0)
+    {
+        ++m_FreeCount;
+    }
+    m_SumFreeSize -= allocSize;
+}
+
+void VmaBlockMetadata_Generic::Free(const VmaAllocation allocation)
+{
+    for(VmaSuballocationList::iterator suballocItem = m_Suballocations.begin();
+        suballocItem != m_Suballocations.end();
+        ++suballocItem)
+    {
+        VmaSuballocation& suballoc = *suballocItem;
+        if(suballoc.hAllocation == allocation)
+        {
+            FreeSuballocation(suballocItem);
+            VMA_HEAVY_ASSERT(Validate());
+            return;
+        }
+    }
+    VMA_ASSERT(0 && "Not found!");
+}
+
+void VmaBlockMetadata_Generic::FreeAtOffset(VkDeviceSize offset)
+{
+    for(VmaSuballocationList::iterator suballocItem = m_Suballocations.begin();
+        suballocItem != m_Suballocations.end();
+        ++suballocItem)
+    {
+        VmaSuballocation& suballoc = *suballocItem;
+        if(suballoc.offset == offset)
+        {
+            FreeSuballocation(suballocItem);
+            return;
+        }
+    }
+    VMA_ASSERT(0 && "Not found!");
+}
+
+bool VmaBlockMetadata_Generic::ValidateFreeSuballocationList() const
+{
+    VkDeviceSize lastSize = 0;
+    for(size_t i = 0, count = m_FreeSuballocationsBySize.size(); i < count; ++i)
+    {
+        const VmaSuballocationList::iterator it = m_FreeSuballocationsBySize[i];
+
+        VMA_VALIDATE(it->type == VMA_SUBALLOCATION_TYPE_FREE);
+        VMA_VALIDATE(it->size >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER);
+        VMA_VALIDATE(it->size >= lastSize);
+        lastSize = it->size;
+    }
+    return true;
+}
+
+bool VmaBlockMetadata_Generic::CheckAllocation(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VkDeviceSize bufferImageGranularity,
+    VkDeviceSize allocSize,
+    VkDeviceSize allocAlignment,
+    VmaSuballocationType allocType,
+    VmaSuballocationList::const_iterator suballocItem,
+    bool canMakeOtherLost,
+    VkDeviceSize* pOffset,
+    size_t* itemsToMakeLostCount,
+    VkDeviceSize* pSumFreeSize,
+    VkDeviceSize* pSumItemSize) const
+{
+    VMA_ASSERT(allocSize > 0);
+    VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);
+    VMA_ASSERT(suballocItem != m_Suballocations.cend());
+    VMA_ASSERT(pOffset != VMA_NULL);
+    
+    *itemsToMakeLostCount = 0;
+    *pSumFreeSize = 0;
+    *pSumItemSize = 0;
+
+    if(canMakeOtherLost)
+    {
+        if(suballocItem->type == VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            *pSumFreeSize = suballocItem->size;
+        }
+        else
+        {
+            if(suballocItem->hAllocation->CanBecomeLost() &&
+                suballocItem->hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex)
+            {
+                ++*itemsToMakeLostCount;
+                *pSumItemSize = suballocItem->size;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        // Remaining size is too small for this request: Early return.
+        if(GetSize() - suballocItem->offset < allocSize)
+        {
+            return false;
+        }
+
+        // Start from offset equal to beginning of this suballocation.
+        *pOffset = suballocItem->offset;
+    
+        // Apply VMA_DEBUG_MARGIN at the beginning.
+        if(VMA_DEBUG_MARGIN > 0)
+        {
+            *pOffset += VMA_DEBUG_MARGIN;
+        }
+    
+        // Apply alignment.
+        *pOffset = VmaAlignUp(*pOffset, allocAlignment);
+
+        // Check previous suballocations for BufferImageGranularity conflicts.
+        // Make bigger alignment if necessary.
+        if(bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment)
+        {
+            bool bufferImageGranularityConflict = false;
+            VmaSuballocationList::const_iterator prevSuballocItem = suballocItem;
+            while(prevSuballocItem != m_Suballocations.cbegin())
+            {
+                --prevSuballocItem;
+                const VmaSuballocation& prevSuballoc = *prevSuballocItem;
+                if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, *pOffset, bufferImageGranularity))
+                {
+                    if(VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))
+                    {
+                        bufferImageGranularityConflict = true;
+                        break;
+                    }
+                }
+                else
+                    // Already on previous page.
+                    break;
+            }
+            if(bufferImageGranularityConflict)
+            {
+                *pOffset = VmaAlignUp(*pOffset, bufferImageGranularity);
+            }
+        }
+    
+        // Now that we have final *pOffset, check if we are past suballocItem.
+        // If yes, return false - this function should be called for another suballocItem as starting point.
+        if(*pOffset >= suballocItem->offset + suballocItem->size)
+        {
+            return false;
+        }
+    
+        // Calculate padding at the beginning based on current offset.
+        const VkDeviceSize paddingBegin = *pOffset - suballocItem->offset;
+
+        // Calculate required margin at the end.
+        const VkDeviceSize requiredEndMargin = VMA_DEBUG_MARGIN;
+
+        const VkDeviceSize totalSize = paddingBegin + allocSize + requiredEndMargin;
+        // Another early return check.
+        if(suballocItem->offset + totalSize > GetSize())
+        {
+            return false;
+        }
+
+        // Advance lastSuballocItem until desired size is reached.
+        // Update itemsToMakeLostCount.
+        VmaSuballocationList::const_iterator lastSuballocItem = suballocItem;
+        if(totalSize > suballocItem->size)
+        {
+            VkDeviceSize remainingSize = totalSize - suballocItem->size;
+            while(remainingSize > 0)
+            {
+                ++lastSuballocItem;
+                if(lastSuballocItem == m_Suballocations.cend())
+                {
+                    return false;
+                }
+                if(lastSuballocItem->type == VMA_SUBALLOCATION_TYPE_FREE)
+                {
+                    *pSumFreeSize += lastSuballocItem->size;
+                }
+                else
+                {
+                    VMA_ASSERT(lastSuballocItem->hAllocation != VK_NULL_HANDLE);
+                    if(lastSuballocItem->hAllocation->CanBecomeLost() &&
+                        lastSuballocItem->hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex)
+                    {
+                        ++*itemsToMakeLostCount;
+                        *pSumItemSize += lastSuballocItem->size;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+                remainingSize = (lastSuballocItem->size < remainingSize) ?
+                    remainingSize - lastSuballocItem->size : 0;
+            }
+        }
+
+        // Check next suballocations for BufferImageGranularity conflicts.
+        // If conflict exists, we must mark more allocations lost or fail.
+        if(bufferImageGranularity > 1 && (allocSize % bufferImageGranularity || *pOffset % bufferImageGranularity))
+        {
+            VmaSuballocationList::const_iterator nextSuballocItem = lastSuballocItem;
+            ++nextSuballocItem;
+            while(nextSuballocItem != m_Suballocations.cend())
+            {
+                const VmaSuballocation& nextSuballoc = *nextSuballocItem;
+                if(VmaBlocksOnSamePage(*pOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))
+                {
+                    if(VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))
+                    {
+                        VMA_ASSERT(nextSuballoc.hAllocation != VK_NULL_HANDLE);
+                        if(nextSuballoc.hAllocation->CanBecomeLost() &&
+                            nextSuballoc.hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex)
+                        {
+                            ++*itemsToMakeLostCount;
+                        }
+                        else
+                        {
+                            return false;
+                        }
+                    }
+                }
+                else
+                {
+                    // Already on next page.
+                    break;
+                }
+                ++nextSuballocItem;
+            }
+        }
+    }
+    else
+    {
+        const VmaSuballocation& suballoc = *suballocItem;
+        VMA_ASSERT(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);
+
+        *pSumFreeSize = suballoc.size;
+
+        // Size of this suballocation is too small for this request: Early return.
+        if(suballoc.size < allocSize)
+        {
+            return false;
+        }
+
+        // Start from offset equal to beginning of this suballocation.
+        *pOffset = suballoc.offset;
+    
+        // Apply VMA_DEBUG_MARGIN at the beginning.
+        if(VMA_DEBUG_MARGIN > 0)
+        {
+            *pOffset += VMA_DEBUG_MARGIN;
+        }
+    
+        // Apply alignment.
+        *pOffset = VmaAlignUp(*pOffset, allocAlignment);
+    
+        // Check previous suballocations for BufferImageGranularity conflicts.
+        // Make bigger alignment if necessary.
+        if(bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment)
+        {
+            bool bufferImageGranularityConflict = false;
+            VmaSuballocationList::const_iterator prevSuballocItem = suballocItem;
+            while(prevSuballocItem != m_Suballocations.cbegin())
+            {
+                --prevSuballocItem;
+                const VmaSuballocation& prevSuballoc = *prevSuballocItem;
+                if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, *pOffset, bufferImageGranularity))
+                {
+                    if(VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))
+                    {
+                        bufferImageGranularityConflict = true;
+                        break;
+                    }
+                }
+                else
+                    // Already on previous page.
+                    break;
+            }
+            if(bufferImageGranularityConflict)
+            {
+                *pOffset = VmaAlignUp(*pOffset, bufferImageGranularity);
+            }
+        }
+    
+        // Calculate padding at the beginning based on current offset.
+        const VkDeviceSize paddingBegin = *pOffset - suballoc.offset;
+
+        // Calculate required margin at the end.
+        const VkDeviceSize requiredEndMargin = VMA_DEBUG_MARGIN;
+
+        // Fail if requested size plus margin before and after is bigger than size of this suballocation.
+        if(paddingBegin + allocSize + requiredEndMargin > suballoc.size)
+        {
+            return false;
+        }
+
+        // Check next suballocations for BufferImageGranularity conflicts.
+        // If conflict exists, allocation cannot be made here.
+        if(bufferImageGranularity > 1 && (allocSize % bufferImageGranularity || *pOffset % bufferImageGranularity))
+        {
+            VmaSuballocationList::const_iterator nextSuballocItem = suballocItem;
+            ++nextSuballocItem;
+            while(nextSuballocItem != m_Suballocations.cend())
+            {
+                const VmaSuballocation& nextSuballoc = *nextSuballocItem;
+                if(VmaBlocksOnSamePage(*pOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))
+                {
+                    if(VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))
+                    {
+                        return false;
+                    }
+                }
+                else
+                {
+                    // Already on next page.
+                    break;
+                }
+                ++nextSuballocItem;
+            }
+        }
+    }
+
+    // All tests passed: Success. pOffset is already filled.
+    return true;
+}
+
+void VmaBlockMetadata_Generic::MergeFreeWithNext(VmaSuballocationList::iterator item)
+{
+    VMA_ASSERT(item != m_Suballocations.end());
+    VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE);
+    
+    VmaSuballocationList::iterator nextItem = item;
+    ++nextItem;
+    VMA_ASSERT(nextItem != m_Suballocations.end());
+    VMA_ASSERT(nextItem->type == VMA_SUBALLOCATION_TYPE_FREE);
+
+    item->size += nextItem->size;
+    --m_FreeCount;
+    m_Suballocations.erase(nextItem);
+}
+
+VmaSuballocationList::iterator VmaBlockMetadata_Generic::FreeSuballocation(VmaSuballocationList::iterator suballocItem)
+{
+    // Change this suballocation to be marked as free.
+    VmaSuballocation& suballoc = *suballocItem;
+    suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+    suballoc.hAllocation = VK_NULL_HANDLE;
+    
+    // Update totals.
+    ++m_FreeCount;
+    m_SumFreeSize += suballoc.size;
+
+    // Merge with previous and/or next suballocation if it's also free.
+    bool mergeWithNext = false;
+    bool mergeWithPrev = false;
+    
+    VmaSuballocationList::iterator nextItem = suballocItem;
+    ++nextItem;
+    if((nextItem != m_Suballocations.end()) && (nextItem->type == VMA_SUBALLOCATION_TYPE_FREE))
+    {
+        mergeWithNext = true;
+    }
+
+    VmaSuballocationList::iterator prevItem = suballocItem;
+    if(suballocItem != m_Suballocations.begin())
+    {
+        --prevItem;
+        if(prevItem->type == VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            mergeWithPrev = true;
+        }
+    }
+
+    if(mergeWithNext)
+    {
+        UnregisterFreeSuballocation(nextItem);
+        MergeFreeWithNext(suballocItem);
+    }
+
+    if(mergeWithPrev)
+    {
+        UnregisterFreeSuballocation(prevItem);
+        MergeFreeWithNext(prevItem);
+        RegisterFreeSuballocation(prevItem);
+        return prevItem;
+    }
+    else
+    {
+        RegisterFreeSuballocation(suballocItem);
+        return suballocItem;
+    }
+}
+
+void VmaBlockMetadata_Generic::RegisterFreeSuballocation(VmaSuballocationList::iterator item)
+{
+    VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE);
+    VMA_ASSERT(item->size > 0);
+
+    // You may want to enable this validation at the beginning or at the end of
+    // this function, depending on what do you want to check.
+    VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());
+
+    if(item->size >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+    {
+        if(m_FreeSuballocationsBySize.empty())
+        {
+            m_FreeSuballocationsBySize.push_back(item);
+        }
+        else
+        {
+            VmaVectorInsertSorted<VmaSuballocationItemSizeLess>(m_FreeSuballocationsBySize, item);
+        }
+    }
+
+    //VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());
+}
+
+
+void VmaBlockMetadata_Generic::UnregisterFreeSuballocation(VmaSuballocationList::iterator item)
+{
+    VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE);
+    VMA_ASSERT(item->size > 0);
+
+    // You may want to enable this validation at the beginning or at the end of
+    // this function, depending on what do you want to check.
+    VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());
+
+    if(item->size >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+    {
+        VmaSuballocationList::iterator* const it = VmaBinaryFindFirstNotLess(
+            m_FreeSuballocationsBySize.data(),
+            m_FreeSuballocationsBySize.data() + m_FreeSuballocationsBySize.size(),
+            item,
+            VmaSuballocationItemSizeLess());
+        for(size_t index = it - m_FreeSuballocationsBySize.data();
+            index < m_FreeSuballocationsBySize.size();
+            ++index)
+        {
+            if(m_FreeSuballocationsBySize[index] == item)
+            {
+                VmaVectorRemove(m_FreeSuballocationsBySize, index);
+                return;
+            }
+            VMA_ASSERT((m_FreeSuballocationsBySize[index]->size == item->size) && "Not found.");
+        }
+        VMA_ASSERT(0 && "Not found.");
+    }
+
+    //VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());
+}
+
+bool VmaBlockMetadata_Generic::IsBufferImageGranularityConflictPossible(
+    VkDeviceSize bufferImageGranularity,
+    VmaSuballocationType& inOutPrevSuballocType) const
+{
+    if(bufferImageGranularity == 1 || IsEmpty())
+    {
+        return false;
+    }
+
+    VkDeviceSize minAlignment = VK_WHOLE_SIZE;
+    bool typeConflictFound = false;
+    for(VmaSuballocationList::const_iterator it = m_Suballocations.cbegin();
+        it != m_Suballocations.cend();
+        ++it)
+    {
+        const VmaSuballocationType suballocType = it->type;
+        if(suballocType != VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            minAlignment = VMA_MIN(minAlignment, it->hAllocation->GetAlignment());
+            if(VmaIsBufferImageGranularityConflict(inOutPrevSuballocType, suballocType))
+            {
+                typeConflictFound = true;
+            }
+            inOutPrevSuballocType = suballocType;
+        }
+    }
+
+    return typeConflictFound || minAlignment >= bufferImageGranularity;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaBlockMetadata_Linear
+
+VmaBlockMetadata_Linear::VmaBlockMetadata_Linear(VmaAllocator hAllocator) :
+    VmaBlockMetadata(hAllocator),
+    m_SumFreeSize(0),
+    m_Suballocations0(VmaStlAllocator<VmaSuballocation>(hAllocator->GetAllocationCallbacks())),
+    m_Suballocations1(VmaStlAllocator<VmaSuballocation>(hAllocator->GetAllocationCallbacks())),
+    m_1stVectorIndex(0),
+    m_2ndVectorMode(SECOND_VECTOR_EMPTY),
+    m_1stNullItemsBeginCount(0),
+    m_1stNullItemsMiddleCount(0),
+    m_2ndNullItemsCount(0)
+{
+}
+
+VmaBlockMetadata_Linear::~VmaBlockMetadata_Linear()
+{
+}
+
+void VmaBlockMetadata_Linear::Init(VkDeviceSize size)
+{
+    VmaBlockMetadata::Init(size);
+    m_SumFreeSize = size;
+}
+
+bool VmaBlockMetadata_Linear::Validate() const
+{
+    const SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+
+    VMA_VALIDATE(suballocations2nd.empty() == (m_2ndVectorMode == SECOND_VECTOR_EMPTY));
+    VMA_VALIDATE(!suballocations1st.empty() ||
+        suballocations2nd.empty() ||
+        m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER);
+
+    if(!suballocations1st.empty())
+    {
+        // Null item at the beginning should be accounted into m_1stNullItemsBeginCount.
+        VMA_VALIDATE(suballocations1st[m_1stNullItemsBeginCount].hAllocation != VK_NULL_HANDLE);
+        // Null item at the end should be just pop_back().
+        VMA_VALIDATE(suballocations1st.back().hAllocation != VK_NULL_HANDLE);
+    }
+    if(!suballocations2nd.empty())
+    {
+        // Null item at the end should be just pop_back().
+        VMA_VALIDATE(suballocations2nd.back().hAllocation != VK_NULL_HANDLE);
+    }
+
+    VMA_VALIDATE(m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount <= suballocations1st.size());
+    VMA_VALIDATE(m_2ndNullItemsCount <= suballocations2nd.size());
+
+    VkDeviceSize sumUsedSize = 0;
+    const size_t suballoc1stCount = suballocations1st.size();
+    VkDeviceSize offset = VMA_DEBUG_MARGIN;
+
+    if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+    {
+        const size_t suballoc2ndCount = suballocations2nd.size();
+        size_t nullItem2ndCount = 0;
+        for(size_t i = 0; i < suballoc2ndCount; ++i)
+        {
+            const VmaSuballocation& suballoc = suballocations2nd[i];
+            const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);
+
+            VMA_VALIDATE(currFree == (suballoc.hAllocation == VK_NULL_HANDLE));
+            VMA_VALIDATE(suballoc.offset >= offset);
+
+            if(!currFree)
+            {
+                VMA_VALIDATE(suballoc.hAllocation->GetOffset() == suballoc.offset);
+                VMA_VALIDATE(suballoc.hAllocation->GetSize() == suballoc.size);
+                sumUsedSize += suballoc.size;
+            }
+            else
+            {
+                ++nullItem2ndCount;
+            }
+
+            offset = suballoc.offset + suballoc.size + VMA_DEBUG_MARGIN;
+        }
+
+        VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount);
+    }
+
+    for(size_t i = 0; i < m_1stNullItemsBeginCount; ++i)
+    {
+        const VmaSuballocation& suballoc = suballocations1st[i];
+        VMA_VALIDATE(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE &&
+            suballoc.hAllocation == VK_NULL_HANDLE);
+    }
+
+    size_t nullItem1stCount = m_1stNullItemsBeginCount;
+
+    for(size_t i = m_1stNullItemsBeginCount; i < suballoc1stCount; ++i)
+    {
+        const VmaSuballocation& suballoc = suballocations1st[i];
+        const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);
+
+        VMA_VALIDATE(currFree == (suballoc.hAllocation == VK_NULL_HANDLE));
+        VMA_VALIDATE(suballoc.offset >= offset);
+        VMA_VALIDATE(i >= m_1stNullItemsBeginCount || currFree);
+
+        if(!currFree)
+        {
+            VMA_VALIDATE(suballoc.hAllocation->GetOffset() == suballoc.offset);
+            VMA_VALIDATE(suballoc.hAllocation->GetSize() == suballoc.size);
+            sumUsedSize += suballoc.size;
+        }
+        else
+        {
+            ++nullItem1stCount;
+        }
+
+        offset = suballoc.offset + suballoc.size + VMA_DEBUG_MARGIN;
+    }
+    VMA_VALIDATE(nullItem1stCount == m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount);
+
+    if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+    {
+        const size_t suballoc2ndCount = suballocations2nd.size();
+        size_t nullItem2ndCount = 0;
+        for(size_t i = suballoc2ndCount; i--; )
+        {
+            const VmaSuballocation& suballoc = suballocations2nd[i];
+            const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);
+
+            VMA_VALIDATE(currFree == (suballoc.hAllocation == VK_NULL_HANDLE));
+            VMA_VALIDATE(suballoc.offset >= offset);
+
+            if(!currFree)
+            {
+                VMA_VALIDATE(suballoc.hAllocation->GetOffset() == suballoc.offset);
+                VMA_VALIDATE(suballoc.hAllocation->GetSize() == suballoc.size);
+                sumUsedSize += suballoc.size;
+            }
+            else
+            {
+                ++nullItem2ndCount;
+            }
+
+            offset = suballoc.offset + suballoc.size + VMA_DEBUG_MARGIN;
+        }
+
+        VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount);
+    }
+
+    VMA_VALIDATE(offset <= GetSize());
+    VMA_VALIDATE(m_SumFreeSize == GetSize() - sumUsedSize);
+
+    return true;
+}
+
+size_t VmaBlockMetadata_Linear::GetAllocationCount() const
+{
+    return AccessSuballocations1st().size() - (m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount) +
+        AccessSuballocations2nd().size() - m_2ndNullItemsCount;
+}
+
+VkDeviceSize VmaBlockMetadata_Linear::GetUnusedRangeSizeMax() const
+{
+    const VkDeviceSize size = GetSize();
+
+    /*
+    We don't consider gaps inside allocation vectors with freed allocations because
+    they are not suitable for reuse in linear allocator. We consider only space that
+    is available for new allocations.
+    */
+    if(IsEmpty())
+    {
+        return size;
+    }
+    
+    const SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+
+    switch(m_2ndVectorMode)
+    {
+    case SECOND_VECTOR_EMPTY:
+        /*
+        Available space is after end of 1st, as well as before beginning of 1st (which
+        whould make it a ring buffer).
+        */
+        {
+            const size_t suballocations1stCount = suballocations1st.size();
+            VMA_ASSERT(suballocations1stCount > m_1stNullItemsBeginCount);
+            const VmaSuballocation& firstSuballoc = suballocations1st[m_1stNullItemsBeginCount];
+            const VmaSuballocation& lastSuballoc  = suballocations1st[suballocations1stCount - 1];
+            return VMA_MAX(
+                firstSuballoc.offset,
+                size - (lastSuballoc.offset + lastSuballoc.size));
+        }
+        break;
+
+    case SECOND_VECTOR_RING_BUFFER:
+        /*
+        Available space is only between end of 2nd and beginning of 1st.
+        */
+        {
+            const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+            const VmaSuballocation& lastSuballoc2nd = suballocations2nd.back();
+            const VmaSuballocation& firstSuballoc1st = suballocations1st[m_1stNullItemsBeginCount];
+            return firstSuballoc1st.offset - (lastSuballoc2nd.offset + lastSuballoc2nd.size);
+        }
+        break;
+
+    case SECOND_VECTOR_DOUBLE_STACK:
+        /*
+        Available space is only between end of 1st and top of 2nd.
+        */
+        {
+            const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+            const VmaSuballocation& topSuballoc2nd = suballocations2nd.back();
+            const VmaSuballocation& lastSuballoc1st = suballocations1st.back();
+            return topSuballoc2nd.offset - (lastSuballoc1st.offset + lastSuballoc1st.size);
+        }
+        break;
+
+    default:
+        VMA_ASSERT(0);
+        return 0;
+    }
+}
+
+void VmaBlockMetadata_Linear::CalcAllocationStatInfo(VmaStatInfo& outInfo) const
+{
+    const VkDeviceSize size = GetSize();
+    const SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+    const size_t suballoc1stCount = suballocations1st.size();
+    const size_t suballoc2ndCount = suballocations2nd.size();
+
+    outInfo.blockCount = 1;
+    outInfo.allocationCount = (uint32_t)GetAllocationCount();
+    outInfo.unusedRangeCount = 0;
+    outInfo.usedBytes = 0;
+    outInfo.allocationSizeMin = UINT64_MAX;
+    outInfo.allocationSizeMax = 0;
+    outInfo.unusedRangeSizeMin = UINT64_MAX;
+    outInfo.unusedRangeSizeMax = 0;
+
+    VkDeviceSize lastOffset = 0;
+
+    if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+    {
+        const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;
+        size_t nextAlloc2ndIndex = 0;
+        while(lastOffset < freeSpace2ndTo1stEnd)
+        {
+            // Find next non-null allocation or move nextAllocIndex to the end.
+            while(nextAlloc2ndIndex < suballoc2ndCount &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                ++nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex < suballoc2ndCount)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                    ++outInfo.unusedRangeCount;
+                    outInfo.unusedBytes += unusedRangeSize;
+                    outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize);
+                    outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize);
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                outInfo.usedBytes += suballoc.size;
+                outInfo.allocationSizeMin = VMA_MIN(outInfo.allocationSizeMin, suballoc.size);
+                outInfo.allocationSizeMax = VMA_MIN(outInfo.allocationSizeMax, suballoc.size);
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                ++nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                // There is free space from lastOffset to freeSpace2ndTo1stEnd.
+                if(lastOffset < freeSpace2ndTo1stEnd)
+                {
+                    const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset;
+                    ++outInfo.unusedRangeCount;
+                    outInfo.unusedBytes += unusedRangeSize;
+                    outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize);
+                    outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize);
+               }
+
+                // End of loop.
+                lastOffset = freeSpace2ndTo1stEnd;
+            }
+        }
+    }
+
+    size_t nextAlloc1stIndex = m_1stNullItemsBeginCount;
+    const VkDeviceSize freeSpace1stTo2ndEnd =
+        m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size;
+    while(lastOffset < freeSpace1stTo2ndEnd)
+    {
+        // Find next non-null allocation or move nextAllocIndex to the end.
+        while(nextAlloc1stIndex < suballoc1stCount &&
+            suballocations1st[nextAlloc1stIndex].hAllocation == VK_NULL_HANDLE)
+        {
+            ++nextAlloc1stIndex;
+        }
+
+        // Found non-null allocation.
+        if(nextAlloc1stIndex < suballoc1stCount)
+        {
+            const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];
+            
+            // 1. Process free space before this allocation.
+            if(lastOffset < suballoc.offset)
+            {
+                // There is free space from lastOffset to suballoc.offset.
+                const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                ++outInfo.unusedRangeCount;
+                outInfo.unusedBytes += unusedRangeSize;
+                outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize);
+                outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize);
+            }
+            
+            // 2. Process this allocation.
+            // There is allocation with suballoc.offset, suballoc.size.
+            outInfo.usedBytes += suballoc.size;
+            outInfo.allocationSizeMin = VMA_MIN(outInfo.allocationSizeMin, suballoc.size);
+            outInfo.allocationSizeMax = VMA_MIN(outInfo.allocationSizeMax, suballoc.size);
+            
+            // 3. Prepare for next iteration.
+            lastOffset = suballoc.offset + suballoc.size;
+            ++nextAlloc1stIndex;
+        }
+        // We are at the end.
+        else
+        {
+            // There is free space from lastOffset to freeSpace1stTo2ndEnd.
+            if(lastOffset < freeSpace1stTo2ndEnd)
+            {
+                const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset;
+                ++outInfo.unusedRangeCount;
+                outInfo.unusedBytes += unusedRangeSize;
+                outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize);
+                outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize);
+           }
+
+            // End of loop.
+            lastOffset = freeSpace1stTo2ndEnd;
+        }
+    }
+
+    if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+    {
+        size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;
+        while(lastOffset < size)
+        {
+            // Find next non-null allocation or move nextAllocIndex to the end.
+            while(nextAlloc2ndIndex != SIZE_MAX &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                --nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex != SIZE_MAX)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                    ++outInfo.unusedRangeCount;
+                    outInfo.unusedBytes += unusedRangeSize;
+                    outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize);
+                    outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize);
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                outInfo.usedBytes += suballoc.size;
+                outInfo.allocationSizeMin = VMA_MIN(outInfo.allocationSizeMin, suballoc.size);
+                outInfo.allocationSizeMax = VMA_MIN(outInfo.allocationSizeMax, suballoc.size);
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                --nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                // There is free space from lastOffset to size.
+                if(lastOffset < size)
+                {
+                    const VkDeviceSize unusedRangeSize = size - lastOffset;
+                    ++outInfo.unusedRangeCount;
+                    outInfo.unusedBytes += unusedRangeSize;
+                    outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize);
+                    outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize);
+               }
+
+                // End of loop.
+                lastOffset = size;
+            }
+        }
+    }
+
+    outInfo.unusedBytes = size - outInfo.usedBytes;
+}
+
+void VmaBlockMetadata_Linear::AddPoolStats(VmaPoolStats& inoutStats) const
+{
+    const SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+    const VkDeviceSize size = GetSize();
+    const size_t suballoc1stCount = suballocations1st.size();
+    const size_t suballoc2ndCount = suballocations2nd.size();
+
+    inoutStats.size += size;
+
+    VkDeviceSize lastOffset = 0;
+
+    if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+    {
+        const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;
+        size_t nextAlloc2ndIndex = m_1stNullItemsBeginCount;
+        while(lastOffset < freeSpace2ndTo1stEnd)
+        {
+            // Find next non-null allocation or move nextAlloc2ndIndex to the end.
+            while(nextAlloc2ndIndex < suballoc2ndCount &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                ++nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex < suballoc2ndCount)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                    inoutStats.unusedSize += unusedRangeSize;
+                    ++inoutStats.unusedRangeCount;
+                    inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize);
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                ++inoutStats.allocationCount;
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                ++nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                if(lastOffset < freeSpace2ndTo1stEnd)
+                {
+                    // There is free space from lastOffset to freeSpace2ndTo1stEnd.
+                    const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset;
+                    inoutStats.unusedSize += unusedRangeSize;
+                    ++inoutStats.unusedRangeCount;
+                    inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize);
+                }
+
+                // End of loop.
+                lastOffset = freeSpace2ndTo1stEnd;
+            }
+        }
+    }
+
+    size_t nextAlloc1stIndex = m_1stNullItemsBeginCount;
+    const VkDeviceSize freeSpace1stTo2ndEnd =
+        m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size;
+    while(lastOffset < freeSpace1stTo2ndEnd)
+    {
+        // Find next non-null allocation or move nextAllocIndex to the end.
+        while(nextAlloc1stIndex < suballoc1stCount &&
+            suballocations1st[nextAlloc1stIndex].hAllocation == VK_NULL_HANDLE)
+        {
+            ++nextAlloc1stIndex;
+        }
+
+        // Found non-null allocation.
+        if(nextAlloc1stIndex < suballoc1stCount)
+        {
+            const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];
+            
+            // 1. Process free space before this allocation.
+            if(lastOffset < suballoc.offset)
+            {
+                // There is free space from lastOffset to suballoc.offset.
+                const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                inoutStats.unusedSize += unusedRangeSize;
+                ++inoutStats.unusedRangeCount;
+                inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize);
+            }
+            
+            // 2. Process this allocation.
+            // There is allocation with suballoc.offset, suballoc.size.
+            ++inoutStats.allocationCount;
+            
+            // 3. Prepare for next iteration.
+            lastOffset = suballoc.offset + suballoc.size;
+            ++nextAlloc1stIndex;
+        }
+        // We are at the end.
+        else
+        {
+            if(lastOffset < freeSpace1stTo2ndEnd)
+            {
+                // There is free space from lastOffset to freeSpace1stTo2ndEnd.
+                const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset;
+                inoutStats.unusedSize += unusedRangeSize;
+                ++inoutStats.unusedRangeCount;
+                inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize);
+            }
+
+            // End of loop.
+            lastOffset = freeSpace1stTo2ndEnd;
+        }
+    }
+
+    if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+    {
+        size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;
+        while(lastOffset < size)
+        {
+            // Find next non-null allocation or move nextAlloc2ndIndex to the end.
+            while(nextAlloc2ndIndex != SIZE_MAX &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                --nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex != SIZE_MAX)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                    inoutStats.unusedSize += unusedRangeSize;
+                    ++inoutStats.unusedRangeCount;
+                    inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize);
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                ++inoutStats.allocationCount;
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                --nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                if(lastOffset < size)
+                {
+                    // There is free space from lastOffset to size.
+                    const VkDeviceSize unusedRangeSize = size - lastOffset;
+                    inoutStats.unusedSize += unusedRangeSize;
+                    ++inoutStats.unusedRangeCount;
+                    inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize);
+                }
+
+                // End of loop.
+                lastOffset = size;
+            }
+        }
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+void VmaBlockMetadata_Linear::PrintDetailedMap(class VmaJsonWriter& json) const
+{
+    const VkDeviceSize size = GetSize();
+    const SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+    const size_t suballoc1stCount = suballocations1st.size();
+    const size_t suballoc2ndCount = suballocations2nd.size();
+
+    // FIRST PASS
+
+    size_t unusedRangeCount = 0;
+    VkDeviceSize usedBytes = 0;
+
+    VkDeviceSize lastOffset = 0;
+
+    size_t alloc2ndCount = 0;
+    if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+    {
+        const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;
+        size_t nextAlloc2ndIndex = 0;
+        while(lastOffset < freeSpace2ndTo1stEnd)
+        {
+            // Find next non-null allocation or move nextAlloc2ndIndex to the end.
+            while(nextAlloc2ndIndex < suballoc2ndCount &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                ++nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex < suballoc2ndCount)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    ++unusedRangeCount;
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                ++alloc2ndCount;
+                usedBytes += suballoc.size;
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                ++nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                if(lastOffset < freeSpace2ndTo1stEnd)
+                {
+                    // There is free space from lastOffset to freeSpace2ndTo1stEnd.
+                    ++unusedRangeCount;
+                }
+
+                // End of loop.
+                lastOffset = freeSpace2ndTo1stEnd;
+            }
+        }
+    }
+
+    size_t nextAlloc1stIndex = m_1stNullItemsBeginCount;
+    size_t alloc1stCount = 0;
+    const VkDeviceSize freeSpace1stTo2ndEnd =
+        m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size;
+    while(lastOffset < freeSpace1stTo2ndEnd)
+    {
+        // Find next non-null allocation or move nextAllocIndex to the end.
+        while(nextAlloc1stIndex < suballoc1stCount &&
+            suballocations1st[nextAlloc1stIndex].hAllocation == VK_NULL_HANDLE)
+        {
+            ++nextAlloc1stIndex;
+        }
+
+        // Found non-null allocation.
+        if(nextAlloc1stIndex < suballoc1stCount)
+        {
+            const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];
+            
+            // 1. Process free space before this allocation.
+            if(lastOffset < suballoc.offset)
+            {
+                // There is free space from lastOffset to suballoc.offset.
+                ++unusedRangeCount;
+            }
+            
+            // 2. Process this allocation.
+            // There is allocation with suballoc.offset, suballoc.size.
+            ++alloc1stCount;
+            usedBytes += suballoc.size;
+            
+            // 3. Prepare for next iteration.
+            lastOffset = suballoc.offset + suballoc.size;
+            ++nextAlloc1stIndex;
+        }
+        // We are at the end.
+        else
+        {
+            if(lastOffset < size)
+            {
+                // There is free space from lastOffset to freeSpace1stTo2ndEnd.
+                ++unusedRangeCount;
+            }
+
+            // End of loop.
+            lastOffset = freeSpace1stTo2ndEnd;
+        }
+    }
+
+    if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+    {
+        size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;
+        while(lastOffset < size)
+        {
+            // Find next non-null allocation or move nextAlloc2ndIndex to the end.
+            while(nextAlloc2ndIndex != SIZE_MAX &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                --nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex != SIZE_MAX)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    ++unusedRangeCount;
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                ++alloc2ndCount;
+                usedBytes += suballoc.size;
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                --nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                if(lastOffset < size)
+                {
+                    // There is free space from lastOffset to size.
+                    ++unusedRangeCount;
+                }
+
+                // End of loop.
+                lastOffset = size;
+            }
+        }
+    }
+
+    const VkDeviceSize unusedBytes = size - usedBytes;
+    PrintDetailedMap_Begin(json, unusedBytes, alloc1stCount + alloc2ndCount, unusedRangeCount);
+
+    // SECOND PASS
+    lastOffset = 0;
+
+    if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+    {
+        const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;
+        size_t nextAlloc2ndIndex = 0;
+        while(lastOffset < freeSpace2ndTo1stEnd)
+        {
+            // Find next non-null allocation or move nextAlloc2ndIndex to the end.
+            while(nextAlloc2ndIndex < suballoc2ndCount &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                ++nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex < suballoc2ndCount)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                    PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.hAllocation);
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                ++nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                if(lastOffset < freeSpace2ndTo1stEnd)
+                {
+                    // There is free space from lastOffset to freeSpace2ndTo1stEnd.
+                    const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset;
+                    PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);
+                }
+
+                // End of loop.
+                lastOffset = freeSpace2ndTo1stEnd;
+            }
+        }
+    }
+
+    nextAlloc1stIndex = m_1stNullItemsBeginCount;
+    while(lastOffset < freeSpace1stTo2ndEnd)
+    {
+        // Find next non-null allocation or move nextAllocIndex to the end.
+        while(nextAlloc1stIndex < suballoc1stCount &&
+            suballocations1st[nextAlloc1stIndex].hAllocation == VK_NULL_HANDLE)
+        {
+            ++nextAlloc1stIndex;
+        }
+
+        // Found non-null allocation.
+        if(nextAlloc1stIndex < suballoc1stCount)
+        {
+            const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];
+            
+            // 1. Process free space before this allocation.
+            if(lastOffset < suballoc.offset)
+            {
+                // There is free space from lastOffset to suballoc.offset.
+                const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);
+            }
+            
+            // 2. Process this allocation.
+            // There is allocation with suballoc.offset, suballoc.size.
+            PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.hAllocation);
+            
+            // 3. Prepare for next iteration.
+            lastOffset = suballoc.offset + suballoc.size;
+            ++nextAlloc1stIndex;
+        }
+        // We are at the end.
+        else
+        {
+            if(lastOffset < freeSpace1stTo2ndEnd)
+            {
+                // There is free space from lastOffset to freeSpace1stTo2ndEnd.
+                const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset;
+                PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);
+            }
+
+            // End of loop.
+            lastOffset = freeSpace1stTo2ndEnd;
+        }
+    }
+
+    if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+    {
+        size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;
+        while(lastOffset < size)
+        {
+            // Find next non-null allocation or move nextAlloc2ndIndex to the end.
+            while(nextAlloc2ndIndex != SIZE_MAX &&
+                suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE)
+            {
+                --nextAlloc2ndIndex;
+            }
+
+            // Found non-null allocation.
+            if(nextAlloc2ndIndex != SIZE_MAX)
+            {
+                const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];
+            
+                // 1. Process free space before this allocation.
+                if(lastOffset < suballoc.offset)
+                {
+                    // There is free space from lastOffset to suballoc.offset.
+                    const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;
+                    PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);
+                }
+            
+                // 2. Process this allocation.
+                // There is allocation with suballoc.offset, suballoc.size.
+                PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.hAllocation);
+            
+                // 3. Prepare for next iteration.
+                lastOffset = suballoc.offset + suballoc.size;
+                --nextAlloc2ndIndex;
+            }
+            // We are at the end.
+            else
+            {
+                if(lastOffset < size)
+                {
+                    // There is free space from lastOffset to size.
+                    const VkDeviceSize unusedRangeSize = size - lastOffset;
+                    PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);
+                }
+
+                // End of loop.
+                lastOffset = size;
+            }
+        }
+    }
+
+    PrintDetailedMap_End(json);
+}
+#endif // #if VMA_STATS_STRING_ENABLED
+
+bool VmaBlockMetadata_Linear::CreateAllocationRequest(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VkDeviceSize bufferImageGranularity,
+    VkDeviceSize allocSize,
+    VkDeviceSize allocAlignment,
+    bool upperAddress,
+    VmaSuballocationType allocType,
+    bool canMakeOtherLost,
+    uint32_t strategy,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    VMA_ASSERT(allocSize > 0);
+    VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);
+    VMA_ASSERT(pAllocationRequest != VMA_NULL);
+    VMA_HEAVY_ASSERT(Validate());
+    return upperAddress ?
+        CreateAllocationRequest_UpperAddress(
+            currentFrameIndex, frameInUseCount, bufferImageGranularity,
+            allocSize, allocAlignment, allocType, canMakeOtherLost, strategy, pAllocationRequest) :
+        CreateAllocationRequest_LowerAddress(
+            currentFrameIndex, frameInUseCount, bufferImageGranularity,
+            allocSize, allocAlignment, allocType, canMakeOtherLost, strategy, pAllocationRequest);
+}
+
+bool VmaBlockMetadata_Linear::CreateAllocationRequest_UpperAddress(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VkDeviceSize bufferImageGranularity,
+    VkDeviceSize allocSize,
+    VkDeviceSize allocAlignment,
+    VmaSuballocationType allocType,
+    bool canMakeOtherLost,
+    uint32_t strategy,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    const VkDeviceSize size = GetSize();
+    SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+
+    if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+    {
+        VMA_ASSERT(0 && "Trying to use pool with linear algorithm as double stack, while it is already being used as ring buffer.");
+        return false;
+    }
+
+    // Try to allocate before 2nd.back(), or end of block if 2nd.empty().
+    if(allocSize > size)
+    {
+        return false;
+    }
+    VkDeviceSize resultBaseOffset = size - allocSize;
+    if(!suballocations2nd.empty())
+    {
+        const VmaSuballocation& lastSuballoc = suballocations2nd.back();
+        resultBaseOffset = lastSuballoc.offset - allocSize;
+        if(allocSize > lastSuballoc.offset)
+        {
+            return false;
+        }
+    }
+
+    // Start from offset equal to end of free space.
+    VkDeviceSize resultOffset = resultBaseOffset;
+
+    // Apply VMA_DEBUG_MARGIN at the end.
+    if(VMA_DEBUG_MARGIN > 0)
+    {
+        if(resultOffset < VMA_DEBUG_MARGIN)
+        {
+            return false;
+        }
+        resultOffset -= VMA_DEBUG_MARGIN;
+    }
+
+    // Apply alignment.
+    resultOffset = VmaAlignDown(resultOffset, allocAlignment);
+
+    // Check next suballocations from 2nd for BufferImageGranularity conflicts.
+    // Make bigger alignment if necessary.
+    if(bufferImageGranularity > 1 && !suballocations2nd.empty())
+    {
+        bool bufferImageGranularityConflict = false;
+        for(size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; )
+        {
+            const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex];
+            if(VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))
+            {
+                if(VmaIsBufferImageGranularityConflict(nextSuballoc.type, allocType))
+                {
+                    bufferImageGranularityConflict = true;
+                    break;
+                }
+            }
+            else
+                // Already on previous page.
+                break;
+        }
+        if(bufferImageGranularityConflict)
+        {
+            resultOffset = VmaAlignDown(resultOffset, bufferImageGranularity);
+        }
+    }
+
+    // There is enough free space.
+    const VkDeviceSize endOf1st = !suballocations1st.empty() ?
+        suballocations1st.back().offset + suballocations1st.back().size :
+        0;
+    if(endOf1st + VMA_DEBUG_MARGIN <= resultOffset)
+    {
+        // Check previous suballocations for BufferImageGranularity conflicts.
+        // If conflict exists, allocation cannot be made here.
+        if(bufferImageGranularity > 1)
+        {
+            for(size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; )
+            {
+                const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex];
+                if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity))
+                {
+                    if(VmaIsBufferImageGranularityConflict(allocType, prevSuballoc.type))
+                    {
+                        return false;
+                    }
+                }
+                else
+                {
+                    // Already on next page.
+                    break;
+                }
+            }
+        }
+
+        // All tests passed: Success.
+        pAllocationRequest->offset = resultOffset;
+        pAllocationRequest->sumFreeSize = resultBaseOffset + allocSize - endOf1st;
+        pAllocationRequest->sumItemSize = 0;
+        // pAllocationRequest->item unused.
+        pAllocationRequest->itemsToMakeLostCount = 0;
+        pAllocationRequest->type = VmaAllocationRequestType::UpperAddress;
+        return true;
+    }
+
+    return false;
+}
+
+bool VmaBlockMetadata_Linear::CreateAllocationRequest_LowerAddress(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VkDeviceSize bufferImageGranularity,
+    VkDeviceSize allocSize,
+    VkDeviceSize allocAlignment,
+    VmaSuballocationType allocType,
+    bool canMakeOtherLost,
+    uint32_t strategy,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    const VkDeviceSize size = GetSize();
+    SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+
+    if(m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+    {
+        // Try to allocate at the end of 1st vector.
+
+        VkDeviceSize resultBaseOffset = 0;
+        if(!suballocations1st.empty())
+        {
+            const VmaSuballocation& lastSuballoc = suballocations1st.back();
+            resultBaseOffset = lastSuballoc.offset + lastSuballoc.size;
+        }
+
+        // Start from offset equal to beginning of free space.
+        VkDeviceSize resultOffset = resultBaseOffset;
+
+        // Apply VMA_DEBUG_MARGIN at the beginning.
+        if(VMA_DEBUG_MARGIN > 0)
+        {
+            resultOffset += VMA_DEBUG_MARGIN;
+        }
+
+        // Apply alignment.
+        resultOffset = VmaAlignUp(resultOffset, allocAlignment);
+
+        // Check previous suballocations for BufferImageGranularity conflicts.
+        // Make bigger alignment if necessary.
+        if(bufferImageGranularity > 1 && !suballocations1st.empty())
+        {
+            bool bufferImageGranularityConflict = false;
+            for(size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; )
+            {
+                const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex];
+                if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity))
+                {
+                    if(VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))
+                    {
+                        bufferImageGranularityConflict = true;
+                        break;
+                    }
+                }
+                else
+                    // Already on previous page.
+                    break;
+            }
+            if(bufferImageGranularityConflict)
+            {
+                resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity);
+            }
+        }
+
+        const VkDeviceSize freeSpaceEnd = m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ?
+            suballocations2nd.back().offset : size;
+
+        // There is enough free space at the end after alignment.
+        if(resultOffset + allocSize + VMA_DEBUG_MARGIN <= freeSpaceEnd)
+        {
+            // Check next suballocations for BufferImageGranularity conflicts.
+            // If conflict exists, allocation cannot be made here.
+            if(bufferImageGranularity > 1 && m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+            {
+                for(size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; )
+                {
+                    const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex];
+                    if(VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))
+                    {
+                        if(VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))
+                        {
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        // Already on previous page.
+                        break;
+                    }
+                }
+            }
+
+            // All tests passed: Success.
+            pAllocationRequest->offset = resultOffset;
+            pAllocationRequest->sumFreeSize = freeSpaceEnd - resultBaseOffset;
+            pAllocationRequest->sumItemSize = 0;
+            // pAllocationRequest->item, customData unused.
+            pAllocationRequest->type = VmaAllocationRequestType::EndOf1st;
+            pAllocationRequest->itemsToMakeLostCount = 0;
+            return true;
+        }
+    }
+
+    // Wrap-around to end of 2nd vector. Try to allocate there, watching for the
+    // beginning of 1st vector as the end of free space.
+    if(m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+    {
+        VMA_ASSERT(!suballocations1st.empty());
+
+        VkDeviceSize resultBaseOffset = 0;
+        if(!suballocations2nd.empty())
+        {
+            const VmaSuballocation& lastSuballoc = suballocations2nd.back();
+            resultBaseOffset = lastSuballoc.offset + lastSuballoc.size;
+        }
+
+        // Start from offset equal to beginning of free space.
+        VkDeviceSize resultOffset = resultBaseOffset;
+
+        // Apply VMA_DEBUG_MARGIN at the beginning.
+        if(VMA_DEBUG_MARGIN > 0)
+        {
+            resultOffset += VMA_DEBUG_MARGIN;
+        }
+
+        // Apply alignment.
+        resultOffset = VmaAlignUp(resultOffset, allocAlignment);
+
+        // Check previous suballocations for BufferImageGranularity conflicts.
+        // Make bigger alignment if necessary.
+        if(bufferImageGranularity > 1 && !suballocations2nd.empty())
+        {
+            bool bufferImageGranularityConflict = false;
+            for(size_t prevSuballocIndex = suballocations2nd.size(); prevSuballocIndex--; )
+            {
+                const VmaSuballocation& prevSuballoc = suballocations2nd[prevSuballocIndex];
+                if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity))
+                {
+                    if(VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))
+                    {
+                        bufferImageGranularityConflict = true;
+                        break;
+                    }
+                }
+                else
+                    // Already on previous page.
+                    break;
+            }
+            if(bufferImageGranularityConflict)
+            {
+                resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity);
+            }
+        }
+
+        pAllocationRequest->itemsToMakeLostCount = 0;
+        pAllocationRequest->sumItemSize = 0;
+        size_t index1st = m_1stNullItemsBeginCount;
+
+        if(canMakeOtherLost)
+        {
+            while(index1st < suballocations1st.size() &&
+                resultOffset + allocSize + VMA_DEBUG_MARGIN > suballocations1st[index1st].offset)
+            {
+                // Next colliding allocation at the beginning of 1st vector found. Try to make it lost.
+                const VmaSuballocation& suballoc = suballocations1st[index1st];
+                if(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE)
+                {
+                    // No problem.
+                }
+                else
+                {
+                    VMA_ASSERT(suballoc.hAllocation != VK_NULL_HANDLE);
+                    if(suballoc.hAllocation->CanBecomeLost() &&
+                        suballoc.hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex)
+                    {
+                        ++pAllocationRequest->itemsToMakeLostCount;
+                        pAllocationRequest->sumItemSize += suballoc.size;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+                ++index1st;
+            }
+
+            // Check next suballocations for BufferImageGranularity conflicts.
+            // If conflict exists, we must mark more allocations lost or fail.
+            if(bufferImageGranularity > 1)
+            {
+                while(index1st < suballocations1st.size())
+                {
+                    const VmaSuballocation& suballoc = suballocations1st[index1st];
+                    if(VmaBlocksOnSamePage(resultOffset, allocSize, suballoc.offset, bufferImageGranularity))
+                    {
+                        if(suballoc.hAllocation != VK_NULL_HANDLE)
+                        {
+                            // Not checking actual VmaIsBufferImageGranularityConflict(allocType, suballoc.type).
+                            if(suballoc.hAllocation->CanBecomeLost() &&
+                                suballoc.hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex)
+                            {
+                                ++pAllocationRequest->itemsToMakeLostCount;
+                                pAllocationRequest->sumItemSize += suballoc.size;
+                            }
+                            else
+                            {
+                                return false;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // Already on next page.
+                        break;
+                    }
+                    ++index1st;
+                }
+            }
+
+            // Special case: There is not enough room at the end for this allocation, even after making all from the 1st lost.
+            if(index1st == suballocations1st.size() &&
+                resultOffset + allocSize + VMA_DEBUG_MARGIN > size)
+            {
+                // TODO: This is a known bug that it's not yet implemented and the allocation is failing.
+                VMA_DEBUG_LOG("Unsupported special case in custom pool with linear allocation algorithm used as ring buffer with allocations that can be lost.");
+            }
+        }
+
+        // There is enough free space at the end after alignment.
+        if((index1st == suballocations1st.size() && resultOffset + allocSize + VMA_DEBUG_MARGIN <= size) ||
+            (index1st < suballocations1st.size() && resultOffset + allocSize + VMA_DEBUG_MARGIN <= suballocations1st[index1st].offset))
+        {
+            // Check next suballocations for BufferImageGranularity conflicts.
+            // If conflict exists, allocation cannot be made here.
+            if(bufferImageGranularity > 1)
+            {
+                for(size_t nextSuballocIndex = index1st;
+                    nextSuballocIndex < suballocations1st.size();
+                    nextSuballocIndex++)
+                {
+                    const VmaSuballocation& nextSuballoc = suballocations1st[nextSuballocIndex];
+                    if(VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))
+                    {
+                        if(VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))
+                        {
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        // Already on next page.
+                        break;
+                    }
+                }
+            }
+
+            // All tests passed: Success.
+            pAllocationRequest->offset = resultOffset;
+            pAllocationRequest->sumFreeSize =
+                (index1st < suballocations1st.size() ? suballocations1st[index1st].offset : size)
+                - resultBaseOffset
+                - pAllocationRequest->sumItemSize;
+            pAllocationRequest->type = VmaAllocationRequestType::EndOf2nd;
+            // pAllocationRequest->item, customData unused.
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool VmaBlockMetadata_Linear::MakeRequestedAllocationsLost(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    if(pAllocationRequest->itemsToMakeLostCount == 0)
+    {
+        return true;
+    }
+
+    VMA_ASSERT(m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER);
+    
+    // We always start from 1st.
+    SuballocationVectorType* suballocations = &AccessSuballocations1st();
+    size_t index = m_1stNullItemsBeginCount;
+    size_t madeLostCount = 0;
+    while(madeLostCount < pAllocationRequest->itemsToMakeLostCount)
+    {
+        if(index == suballocations->size())
+        {
+            index = 0;
+            // If we get to the end of 1st, we wrap around to beginning of 2nd of 1st.
+            if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+            {
+                suballocations = &AccessSuballocations2nd();
+            }
+            // else: m_2ndVectorMode == SECOND_VECTOR_EMPTY:
+            // suballocations continues pointing at AccessSuballocations1st().
+            VMA_ASSERT(!suballocations->empty());
+        }
+        VmaSuballocation& suballoc = (*suballocations)[index];
+        if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            VMA_ASSERT(suballoc.hAllocation != VK_NULL_HANDLE);
+            VMA_ASSERT(suballoc.hAllocation->CanBecomeLost());
+            if(suballoc.hAllocation->MakeLost(currentFrameIndex, frameInUseCount))
+            {
+                suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+                suballoc.hAllocation = VK_NULL_HANDLE;
+                m_SumFreeSize += suballoc.size;
+                if(suballocations == &AccessSuballocations1st())
+                {
+                    ++m_1stNullItemsMiddleCount;
+                }
+                else
+                {
+                    ++m_2ndNullItemsCount;
+                }
+                ++madeLostCount;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        ++index;
+    }
+
+    CleanupAfterFree();
+    //VMA_HEAVY_ASSERT(Validate()); // Already called by ClanupAfterFree().
+    
+    return true;
+}
+
+uint32_t VmaBlockMetadata_Linear::MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount)
+{
+    uint32_t lostAllocationCount = 0;
+    
+    SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    for(size_t i = m_1stNullItemsBeginCount, count = suballocations1st.size(); i < count; ++i)
+    {
+        VmaSuballocation& suballoc = suballocations1st[i];
+        if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE &&
+            suballoc.hAllocation->CanBecomeLost() &&
+            suballoc.hAllocation->MakeLost(currentFrameIndex, frameInUseCount))
+        {
+            suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+            suballoc.hAllocation = VK_NULL_HANDLE;
+            ++m_1stNullItemsMiddleCount;
+            m_SumFreeSize += suballoc.size;
+            ++lostAllocationCount;
+        }
+    }
+
+    SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+    for(size_t i = 0, count = suballocations2nd.size(); i < count; ++i)
+    {
+        VmaSuballocation& suballoc = suballocations2nd[i];
+        if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE &&
+            suballoc.hAllocation->CanBecomeLost() &&
+            suballoc.hAllocation->MakeLost(currentFrameIndex, frameInUseCount))
+        {
+            suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+            suballoc.hAllocation = VK_NULL_HANDLE;
+            ++m_2ndNullItemsCount;
+            m_SumFreeSize += suballoc.size;
+            ++lostAllocationCount;
+        }
+    }
+
+    if(lostAllocationCount)
+    {
+        CleanupAfterFree();
+    }
+
+    return lostAllocationCount;
+}
+
+VkResult VmaBlockMetadata_Linear::CheckCorruption(const void* pBlockData)
+{
+    SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    for(size_t i = m_1stNullItemsBeginCount, count = suballocations1st.size(); i < count; ++i)
+    {
+        const VmaSuballocation& suballoc = suballocations1st[i];
+        if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            if(!VmaValidateMagicValue(pBlockData, suballoc.offset - VMA_DEBUG_MARGIN))
+            {
+                VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED BEFORE VALIDATED ALLOCATION!");
+                return VK_ERROR_VALIDATION_FAILED_EXT;
+            }
+            if(!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size))
+            {
+                VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!");
+                return VK_ERROR_VALIDATION_FAILED_EXT;
+            }
+        }
+    }
+
+    SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+    for(size_t i = 0, count = suballocations2nd.size(); i < count; ++i)
+    {
+        const VmaSuballocation& suballoc = suballocations2nd[i];
+        if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)
+        {
+            if(!VmaValidateMagicValue(pBlockData, suballoc.offset - VMA_DEBUG_MARGIN))
+            {
+                VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED BEFORE VALIDATED ALLOCATION!");
+                return VK_ERROR_VALIDATION_FAILED_EXT;
+            }
+            if(!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size))
+            {
+                VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!");
+                return VK_ERROR_VALIDATION_FAILED_EXT;
+            }
+        }
+    }
+
+    return VK_SUCCESS;
+}
+
+void VmaBlockMetadata_Linear::Alloc(
+    const VmaAllocationRequest& request,
+    VmaSuballocationType type,
+    VkDeviceSize allocSize,
+    VmaAllocation hAllocation)
+{
+    const VmaSuballocation newSuballoc = { request.offset, allocSize, hAllocation, type };
+
+    switch(request.type)
+    {
+    case VmaAllocationRequestType::UpperAddress:
+        {
+            VMA_ASSERT(m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER &&
+                "CRITICAL ERROR: Trying to use linear allocator as double stack while it was already used as ring buffer.");
+            SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+            suballocations2nd.push_back(newSuballoc);
+            m_2ndVectorMode = SECOND_VECTOR_DOUBLE_STACK;
+        }
+        break;
+    case VmaAllocationRequestType::EndOf1st:
+        {
+            SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+
+            VMA_ASSERT(suballocations1st.empty() ||
+                request.offset >= suballocations1st.back().offset + suballocations1st.back().size);
+            // Check if it fits before the end of the block.
+            VMA_ASSERT(request.offset + allocSize <= GetSize());
+
+            suballocations1st.push_back(newSuballoc);
+        }
+        break;
+    case VmaAllocationRequestType::EndOf2nd:
+        {
+            SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+            // New allocation at the end of 2-part ring buffer, so before first allocation from 1st vector.
+            VMA_ASSERT(!suballocations1st.empty() &&
+                request.offset + allocSize <= suballocations1st[m_1stNullItemsBeginCount].offset);
+            SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+
+            switch(m_2ndVectorMode)
+            {
+            case SECOND_VECTOR_EMPTY:
+                // First allocation from second part ring buffer.
+                VMA_ASSERT(suballocations2nd.empty());
+                m_2ndVectorMode = SECOND_VECTOR_RING_BUFFER;
+                break;
+            case SECOND_VECTOR_RING_BUFFER:
+                // 2-part ring buffer is already started.
+                VMA_ASSERT(!suballocations2nd.empty());
+                break;
+            case SECOND_VECTOR_DOUBLE_STACK:
+                VMA_ASSERT(0 && "CRITICAL ERROR: Trying to use linear allocator as ring buffer while it was already used as double stack.");
+                break;
+            default:
+                VMA_ASSERT(0);
+            }
+
+            suballocations2nd.push_back(newSuballoc);
+        }
+        break;
+    default:
+        VMA_ASSERT(0 && "CRITICAL INTERNAL ERROR.");
+    }
+
+    m_SumFreeSize -= newSuballoc.size;
+}
+
+void VmaBlockMetadata_Linear::Free(const VmaAllocation allocation)
+{
+    FreeAtOffset(allocation->GetOffset());
+}
+
+void VmaBlockMetadata_Linear::FreeAtOffset(VkDeviceSize offset)
+{
+    SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+
+    if(!suballocations1st.empty())
+    {
+        // First allocation: Mark it as next empty at the beginning.
+        VmaSuballocation& firstSuballoc = suballocations1st[m_1stNullItemsBeginCount];
+        if(firstSuballoc.offset == offset)
+        {
+            firstSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;
+            firstSuballoc.hAllocation = VK_NULL_HANDLE;
+            m_SumFreeSize += firstSuballoc.size;
+            ++m_1stNullItemsBeginCount;
+            CleanupAfterFree();
+            return;
+        }
+    }
+
+    // Last allocation in 2-part ring buffer or top of upper stack (same logic).
+    if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ||
+        m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+    {
+        VmaSuballocation& lastSuballoc = suballocations2nd.back();
+        if(lastSuballoc.offset == offset)
+        {
+            m_SumFreeSize += lastSuballoc.size;
+            suballocations2nd.pop_back();
+            CleanupAfterFree();
+            return;
+        }
+    }
+    // Last allocation in 1st vector.
+    else if(m_2ndVectorMode == SECOND_VECTOR_EMPTY)
+    {
+        VmaSuballocation& lastSuballoc = suballocations1st.back();
+        if(lastSuballoc.offset == offset)
+        {
+            m_SumFreeSize += lastSuballoc.size;
+            suballocations1st.pop_back();
+            CleanupAfterFree();
+            return;
+        }
+    }
+
+    // Item from the middle of 1st vector.
+    {
+        VmaSuballocation refSuballoc;
+        refSuballoc.offset = offset;
+        // Rest of members stays uninitialized intentionally for better performance.
+        SuballocationVectorType::iterator it = VmaBinaryFindSorted(
+            suballocations1st.begin() + m_1stNullItemsBeginCount,
+            suballocations1st.end(),
+            refSuballoc,
+            VmaSuballocationOffsetLess());
+        if(it != suballocations1st.end())
+        {
+            it->type = VMA_SUBALLOCATION_TYPE_FREE;
+            it->hAllocation = VK_NULL_HANDLE;
+            ++m_1stNullItemsMiddleCount;
+            m_SumFreeSize += it->size;
+            CleanupAfterFree();
+            return;
+        }
+    }
+
+    if(m_2ndVectorMode != SECOND_VECTOR_EMPTY)
+    {
+        // Item from the middle of 2nd vector.
+        VmaSuballocation refSuballoc;
+        refSuballoc.offset = offset;
+        // Rest of members stays uninitialized intentionally for better performance.
+        SuballocationVectorType::iterator it = m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ?
+            VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetLess()) :
+            VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetGreater());
+        if(it != suballocations2nd.end())
+        {
+            it->type = VMA_SUBALLOCATION_TYPE_FREE;
+            it->hAllocation = VK_NULL_HANDLE;
+            ++m_2ndNullItemsCount;
+            m_SumFreeSize += it->size;
+            CleanupAfterFree();
+            return;
+        }
+    }
+
+    VMA_ASSERT(0 && "Allocation to free not found in linear allocator!");
+}
+
+bool VmaBlockMetadata_Linear::ShouldCompact1st() const
+{
+    const size_t nullItemCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount;
+    const size_t suballocCount = AccessSuballocations1st().size();
+    return suballocCount > 32 && nullItemCount * 2 >= (suballocCount - nullItemCount) * 3;
+}
+
+void VmaBlockMetadata_Linear::CleanupAfterFree()
+{
+    SuballocationVectorType& suballocations1st = AccessSuballocations1st();
+    SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();
+
+    if(IsEmpty())
+    {
+        suballocations1st.clear();
+        suballocations2nd.clear();
+        m_1stNullItemsBeginCount = 0;
+        m_1stNullItemsMiddleCount = 0;
+        m_2ndNullItemsCount = 0;
+        m_2ndVectorMode = SECOND_VECTOR_EMPTY;
+    }
+    else
+    {
+        const size_t suballoc1stCount = suballocations1st.size();
+        const size_t nullItem1stCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount;
+        VMA_ASSERT(nullItem1stCount <= suballoc1stCount);
+
+        // Find more null items at the beginning of 1st vector.
+        while(m_1stNullItemsBeginCount < suballoc1stCount &&
+            suballocations1st[m_1stNullItemsBeginCount].hAllocation == VK_NULL_HANDLE)
+        {
+            ++m_1stNullItemsBeginCount;
+            --m_1stNullItemsMiddleCount;
+        }
+
+        // Find more null items at the end of 1st vector.
+        while(m_1stNullItemsMiddleCount > 0 &&
+            suballocations1st.back().hAllocation == VK_NULL_HANDLE)
+        {
+            --m_1stNullItemsMiddleCount;
+            suballocations1st.pop_back();
+        }
+
+        // Find more null items at the end of 2nd vector.
+        while(m_2ndNullItemsCount > 0 &&
+            suballocations2nd.back().hAllocation == VK_NULL_HANDLE)
+        {
+            --m_2ndNullItemsCount;
+            suballocations2nd.pop_back();
+        }
+
+        // Find more null items at the beginning of 2nd vector.
+        while(m_2ndNullItemsCount > 0 &&
+            suballocations2nd[0].hAllocation == VK_NULL_HANDLE)
+        {
+            --m_2ndNullItemsCount;
+            VmaVectorRemove(suballocations2nd, 0);
+        }
+
+        if(ShouldCompact1st())
+        {
+            const size_t nonNullItemCount = suballoc1stCount - nullItem1stCount;
+            size_t srcIndex = m_1stNullItemsBeginCount;
+            for(size_t dstIndex = 0; dstIndex < nonNullItemCount; ++dstIndex)
+            {
+                while(suballocations1st[srcIndex].hAllocation == VK_NULL_HANDLE)
+                {
+                    ++srcIndex;
+                }
+                if(dstIndex != srcIndex)
+                {
+                    suballocations1st[dstIndex] = suballocations1st[srcIndex];
+                }
+                ++srcIndex;
+            }
+            suballocations1st.resize(nonNullItemCount);
+            m_1stNullItemsBeginCount = 0;
+            m_1stNullItemsMiddleCount = 0;
+        }
+
+        // 2nd vector became empty.
+        if(suballocations2nd.empty())
+        {
+            m_2ndVectorMode = SECOND_VECTOR_EMPTY;
+        }
+
+        // 1st vector became empty.
+        if(suballocations1st.size() - m_1stNullItemsBeginCount == 0)
+        {
+            suballocations1st.clear();
+            m_1stNullItemsBeginCount = 0;
+
+            if(!suballocations2nd.empty() && m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)
+            {
+                // Swap 1st with 2nd. Now 2nd is empty.
+                m_2ndVectorMode = SECOND_VECTOR_EMPTY;
+                m_1stNullItemsMiddleCount = m_2ndNullItemsCount;
+                while(m_1stNullItemsBeginCount < suballocations2nd.size() &&
+                    suballocations2nd[m_1stNullItemsBeginCount].hAllocation == VK_NULL_HANDLE)
+                {
+                    ++m_1stNullItemsBeginCount;
+                    --m_1stNullItemsMiddleCount;
+                }
+                m_2ndNullItemsCount = 0;
+                m_1stVectorIndex ^= 1;
+            }
+        }
+    }
+
+    VMA_HEAVY_ASSERT(Validate());
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaBlockMetadata_Buddy
+
+VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy(VmaAllocator hAllocator) :
+    VmaBlockMetadata(hAllocator),
+    m_Root(VMA_NULL),
+    m_AllocationCount(0),
+    m_FreeCount(1),
+    m_SumFreeSize(0)
+{
+    memset(m_FreeList, 0, sizeof(m_FreeList));
+}
+
+VmaBlockMetadata_Buddy::~VmaBlockMetadata_Buddy()
+{
+    DeleteNode(m_Root);
+}
+
+void VmaBlockMetadata_Buddy::Init(VkDeviceSize size)
+{
+    VmaBlockMetadata::Init(size);
+
+    m_UsableSize = VmaPrevPow2(size);
+    m_SumFreeSize = m_UsableSize;
+
+    // Calculate m_LevelCount.
+    m_LevelCount = 1;
+    while(m_LevelCount < MAX_LEVELS &&
+        LevelToNodeSize(m_LevelCount) >= MIN_NODE_SIZE)
+    {
+        ++m_LevelCount;
+    }
+
+    Node* rootNode = vma_new(GetAllocationCallbacks(), Node)();
+    rootNode->offset = 0;
+    rootNode->type = Node::TYPE_FREE;
+    rootNode->parent = VMA_NULL;
+    rootNode->buddy = VMA_NULL;
+
+    m_Root = rootNode;
+    AddToFreeListFront(0, rootNode);
+}
+
+bool VmaBlockMetadata_Buddy::Validate() const
+{
+    // Validate tree.
+    ValidationContext ctx;
+    if(!ValidateNode(ctx, VMA_NULL, m_Root, 0, LevelToNodeSize(0)))
+    {
+        VMA_VALIDATE(false && "ValidateNode failed.");
+    }
+    VMA_VALIDATE(m_AllocationCount == ctx.calculatedAllocationCount);
+    VMA_VALIDATE(m_SumFreeSize == ctx.calculatedSumFreeSize);
+
+    // Validate free node lists.
+    for(uint32_t level = 0; level < m_LevelCount; ++level)
+    {
+        VMA_VALIDATE(m_FreeList[level].front == VMA_NULL ||
+            m_FreeList[level].front->free.prev == VMA_NULL);
+
+        for(Node* node = m_FreeList[level].front;
+            node != VMA_NULL;
+            node = node->free.next)
+        {
+            VMA_VALIDATE(node->type == Node::TYPE_FREE);
+            
+            if(node->free.next == VMA_NULL)
+            {
+                VMA_VALIDATE(m_FreeList[level].back == node);
+            }
+            else
+            {
+                VMA_VALIDATE(node->free.next->free.prev == node);
+            }
+        }
+    }
+
+    // Validate that free lists ar higher levels are empty.
+    for(uint32_t level = m_LevelCount; level < MAX_LEVELS; ++level)
+    {
+        VMA_VALIDATE(m_FreeList[level].front == VMA_NULL && m_FreeList[level].back == VMA_NULL);
+    }
+
+    return true;
+}
+
+VkDeviceSize VmaBlockMetadata_Buddy::GetUnusedRangeSizeMax() const
+{
+    for(uint32_t level = 0; level < m_LevelCount; ++level)
+    {
+        if(m_FreeList[level].front != VMA_NULL)
+        {
+            return LevelToNodeSize(level);
+        }
+    }
+    return 0;
+}
+
+void VmaBlockMetadata_Buddy::CalcAllocationStatInfo(VmaStatInfo& outInfo) const
+{
+    const VkDeviceSize unusableSize = GetUnusableSize();
+
+    outInfo.blockCount = 1;
+
+    outInfo.allocationCount = outInfo.unusedRangeCount = 0;
+    outInfo.usedBytes = outInfo.unusedBytes = 0;
+
+    outInfo.allocationSizeMax = outInfo.unusedRangeSizeMax = 0;
+    outInfo.allocationSizeMin = outInfo.unusedRangeSizeMin = UINT64_MAX;
+    outInfo.allocationSizeAvg = outInfo.unusedRangeSizeAvg = 0; // Unused.
+
+    CalcAllocationStatInfoNode(outInfo, m_Root, LevelToNodeSize(0));
+
+    if(unusableSize > 0)
+    {
+        ++outInfo.unusedRangeCount;
+        outInfo.unusedBytes += unusableSize;
+        outInfo.unusedRangeSizeMax = VMA_MAX(outInfo.unusedRangeSizeMax, unusableSize);
+        outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusableSize);
+    }
+}
+
+void VmaBlockMetadata_Buddy::AddPoolStats(VmaPoolStats& inoutStats) const
+{
+    const VkDeviceSize unusableSize = GetUnusableSize();
+
+    inoutStats.size += GetSize();
+    inoutStats.unusedSize += m_SumFreeSize + unusableSize;
+    inoutStats.allocationCount += m_AllocationCount;
+    inoutStats.unusedRangeCount += m_FreeCount;
+    inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, GetUnusedRangeSizeMax());
+
+    if(unusableSize > 0)
+    {
+        ++inoutStats.unusedRangeCount;
+        // Not updating inoutStats.unusedRangeSizeMax with unusableSize because this space is not available for allocations.
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+void VmaBlockMetadata_Buddy::PrintDetailedMap(class VmaJsonWriter& json) const
+{
+    // TODO optimize
+    VmaStatInfo stat;
+    CalcAllocationStatInfo(stat);
+
+    PrintDetailedMap_Begin(
+        json,
+        stat.unusedBytes,
+        stat.allocationCount,
+        stat.unusedRangeCount);
+
+    PrintDetailedMapNode(json, m_Root, LevelToNodeSize(0));
+
+    const VkDeviceSize unusableSize = GetUnusableSize();
+    if(unusableSize > 0)
+    {
+        PrintDetailedMap_UnusedRange(json,
+            m_UsableSize, // offset
+            unusableSize); // size
+    }
+
+    PrintDetailedMap_End(json);
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+bool VmaBlockMetadata_Buddy::CreateAllocationRequest(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VkDeviceSize bufferImageGranularity,
+    VkDeviceSize allocSize,
+    VkDeviceSize allocAlignment,
+    bool upperAddress,
+    VmaSuballocationType allocType,
+    bool canMakeOtherLost,
+    uint32_t strategy,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    VMA_ASSERT(!upperAddress && "VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT can be used only with linear algorithm.");
+
+    // Simple way to respect bufferImageGranularity. May be optimized some day.
+    // Whenever it might be an OPTIMAL image...
+    if(allocType == VMA_SUBALLOCATION_TYPE_UNKNOWN ||
+        allocType == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||
+        allocType == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL)
+    {
+        allocAlignment = VMA_MAX(allocAlignment, bufferImageGranularity);
+        allocSize = VMA_MAX(allocSize, bufferImageGranularity);
+    }
+
+    if(allocSize > m_UsableSize)
+    {
+        return false;
+    }
+
+    const uint32_t targetLevel = AllocSizeToLevel(allocSize);
+    for(uint32_t level = targetLevel + 1; level--; )
+    {
+        for(Node* freeNode = m_FreeList[level].front;
+            freeNode != VMA_NULL;
+            freeNode = freeNode->free.next)
+        {
+            if(freeNode->offset % allocAlignment == 0)
+            {
+                pAllocationRequest->type = VmaAllocationRequestType::Normal;
+                pAllocationRequest->offset = freeNode->offset;
+                pAllocationRequest->sumFreeSize = LevelToNodeSize(level);
+                pAllocationRequest->sumItemSize = 0;
+                pAllocationRequest->itemsToMakeLostCount = 0;
+                pAllocationRequest->customData = (void*)(uintptr_t)level;
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+bool VmaBlockMetadata_Buddy::MakeRequestedAllocationsLost(
+    uint32_t currentFrameIndex,
+    uint32_t frameInUseCount,
+    VmaAllocationRequest* pAllocationRequest)
+{
+    /*
+    Lost allocations are not supported in buddy allocator at the moment.
+    Support might be added in the future.
+    */
+    return pAllocationRequest->itemsToMakeLostCount == 0;
+}
+
+uint32_t VmaBlockMetadata_Buddy::MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount)
+{
+    /*
+    Lost allocations are not supported in buddy allocator at the moment.
+    Support might be added in the future.
+    */
+    return 0;
+}
+
+void VmaBlockMetadata_Buddy::Alloc(
+    const VmaAllocationRequest& request,
+    VmaSuballocationType type,
+    VkDeviceSize allocSize,
+    VmaAllocation hAllocation)
+{
+    VMA_ASSERT(request.type == VmaAllocationRequestType::Normal);
+
+    const uint32_t targetLevel = AllocSizeToLevel(allocSize);
+    uint32_t currLevel = (uint32_t)(uintptr_t)request.customData;
+    
+    Node* currNode = m_FreeList[currLevel].front;
+    VMA_ASSERT(currNode != VMA_NULL && currNode->type == Node::TYPE_FREE);
+    while(currNode->offset != request.offset)
+    {
+        currNode = currNode->free.next;
+        VMA_ASSERT(currNode != VMA_NULL && currNode->type == Node::TYPE_FREE);
+    }
+    
+    // Go down, splitting free nodes.
+    while(currLevel < targetLevel)
+    {
+        // currNode is already first free node at currLevel.
+        // Remove it from list of free nodes at this currLevel.
+        RemoveFromFreeList(currLevel, currNode);
+         
+        const uint32_t childrenLevel = currLevel + 1;
+
+        // Create two free sub-nodes.
+        Node* leftChild = vma_new(GetAllocationCallbacks(), Node)();
+        Node* rightChild = vma_new(GetAllocationCallbacks(), Node)();
+
+        leftChild->offset = currNode->offset;
+        leftChild->type = Node::TYPE_FREE;
+        leftChild->parent = currNode;
+        leftChild->buddy = rightChild;
+
+        rightChild->offset = currNode->offset + LevelToNodeSize(childrenLevel);
+        rightChild->type = Node::TYPE_FREE;
+        rightChild->parent = currNode;
+        rightChild->buddy = leftChild;
+
+        // Convert current currNode to split type.
+        currNode->type = Node::TYPE_SPLIT;
+        currNode->split.leftChild = leftChild;
+
+        // Add child nodes to free list. Order is important!
+        AddToFreeListFront(childrenLevel, rightChild);
+        AddToFreeListFront(childrenLevel, leftChild);
+
+        ++m_FreeCount;
+        //m_SumFreeSize -= LevelToNodeSize(currLevel) % 2; // Useful only when level node sizes can be non power of 2.
+        ++currLevel;
+        currNode = m_FreeList[currLevel].front;
+
+        /*
+        We can be sure that currNode, as left child of node previously split,
+        also fullfills the alignment requirement.
+        */
+    }
+
+    // Remove from free list.
+    VMA_ASSERT(currLevel == targetLevel &&
+        currNode != VMA_NULL &&
+        currNode->type == Node::TYPE_FREE);
+    RemoveFromFreeList(currLevel, currNode);
+
+    // Convert to allocation node.
+    currNode->type = Node::TYPE_ALLOCATION;
+    currNode->allocation.alloc = hAllocation;
+
+    ++m_AllocationCount;
+    --m_FreeCount;
+    m_SumFreeSize -= allocSize;
+}
+
+void VmaBlockMetadata_Buddy::DeleteNode(Node* node)
+{
+    if(node->type == Node::TYPE_SPLIT)
+    {
+        DeleteNode(node->split.leftChild->buddy);
+        DeleteNode(node->split.leftChild);
+    }
+
+    vma_delete(GetAllocationCallbacks(), node);
+}
+
+bool VmaBlockMetadata_Buddy::ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const
+{
+    VMA_VALIDATE(level < m_LevelCount);
+    VMA_VALIDATE(curr->parent == parent);
+    VMA_VALIDATE((curr->buddy == VMA_NULL) == (parent == VMA_NULL));
+    VMA_VALIDATE(curr->buddy == VMA_NULL || curr->buddy->buddy == curr);
+    switch(curr->type)
+    {
+    case Node::TYPE_FREE:
+        // curr->free.prev, next are validated separately.
+        ctx.calculatedSumFreeSize += levelNodeSize;
+        ++ctx.calculatedFreeCount;
+        break;
+    case Node::TYPE_ALLOCATION:
+        ++ctx.calculatedAllocationCount;
+        ctx.calculatedSumFreeSize += levelNodeSize - curr->allocation.alloc->GetSize();
+        VMA_VALIDATE(curr->allocation.alloc != VK_NULL_HANDLE);
+        break;
+    case Node::TYPE_SPLIT:
+        {
+            const uint32_t childrenLevel = level + 1;
+            const VkDeviceSize childrenLevelNodeSize = levelNodeSize / 2;
+            const Node* const leftChild = curr->split.leftChild;
+            VMA_VALIDATE(leftChild != VMA_NULL);
+            VMA_VALIDATE(leftChild->offset == curr->offset);
+            if(!ValidateNode(ctx, curr, leftChild, childrenLevel, childrenLevelNodeSize))
+            {
+                VMA_VALIDATE(false && "ValidateNode for left child failed.");
+            }
+            const Node* const rightChild = leftChild->buddy;
+            VMA_VALIDATE(rightChild->offset == curr->offset + childrenLevelNodeSize);
+            if(!ValidateNode(ctx, curr, rightChild, childrenLevel, childrenLevelNodeSize))
+            {
+                VMA_VALIDATE(false && "ValidateNode for right child failed.");
+            }
+        }
+        break;
+    default:
+        return false;
+    }
+
+    return true;
+}
+
+uint32_t VmaBlockMetadata_Buddy::AllocSizeToLevel(VkDeviceSize allocSize) const
+{
+    // I know this could be optimized somehow e.g. by using std::log2p1 from C++20.
+    uint32_t level = 0;
+    VkDeviceSize currLevelNodeSize = m_UsableSize;
+    VkDeviceSize nextLevelNodeSize = currLevelNodeSize >> 1;
+    while(allocSize <= nextLevelNodeSize && level + 1 < m_LevelCount)
+    {
+        ++level;
+        currLevelNodeSize = nextLevelNodeSize;
+        nextLevelNodeSize = currLevelNodeSize >> 1;
+    }
+    return level;
+}
+
+void VmaBlockMetadata_Buddy::FreeAtOffset(VmaAllocation alloc, VkDeviceSize offset)
+{
+    // Find node and level.
+    Node* node = m_Root;
+    VkDeviceSize nodeOffset = 0;
+    uint32_t level = 0;
+    VkDeviceSize levelNodeSize = LevelToNodeSize(0);
+    while(node->type == Node::TYPE_SPLIT)
+    {
+        const VkDeviceSize nextLevelSize = levelNodeSize >> 1;
+        if(offset < nodeOffset + nextLevelSize)
+        {
+            node = node->split.leftChild;
+        }
+        else
+        {
+            node = node->split.leftChild->buddy;
+            nodeOffset += nextLevelSize;
+        }
+        ++level;
+        levelNodeSize = nextLevelSize;
+    }
+
+    VMA_ASSERT(node != VMA_NULL && node->type == Node::TYPE_ALLOCATION);
+    VMA_ASSERT(alloc == VK_NULL_HANDLE || node->allocation.alloc == alloc);
+
+    ++m_FreeCount;
+    --m_AllocationCount;
+    m_SumFreeSize += alloc->GetSize();
+
+    node->type = Node::TYPE_FREE;
+
+    // Join free nodes if possible.
+    while(level > 0 && node->buddy->type == Node::TYPE_FREE)
+    {
+        RemoveFromFreeList(level, node->buddy);
+        Node* const parent = node->parent;
+
+        vma_delete(GetAllocationCallbacks(), node->buddy);
+        vma_delete(GetAllocationCallbacks(), node);
+        parent->type = Node::TYPE_FREE;
+        
+        node = parent;
+        --level;
+        //m_SumFreeSize += LevelToNodeSize(level) % 2; // Useful only when level node sizes can be non power of 2.
+        --m_FreeCount;
+    }
+
+    AddToFreeListFront(level, node);
+}
+
+void VmaBlockMetadata_Buddy::CalcAllocationStatInfoNode(VmaStatInfo& outInfo, const Node* node, VkDeviceSize levelNodeSize) const
+{
+    switch(node->type)
+    {
+    case Node::TYPE_FREE:
+        ++outInfo.unusedRangeCount;
+        outInfo.unusedBytes += levelNodeSize;
+        outInfo.unusedRangeSizeMax = VMA_MAX(outInfo.unusedRangeSizeMax, levelNodeSize);
+        outInfo.unusedRangeSizeMin = VMA_MAX(outInfo.unusedRangeSizeMin, levelNodeSize);
+        break;
+    case Node::TYPE_ALLOCATION:
+        {
+            const VkDeviceSize allocSize = node->allocation.alloc->GetSize();
+            ++outInfo.allocationCount;
+            outInfo.usedBytes += allocSize;
+            outInfo.allocationSizeMax = VMA_MAX(outInfo.allocationSizeMax, allocSize);
+            outInfo.allocationSizeMin = VMA_MAX(outInfo.allocationSizeMin, allocSize);
+
+            const VkDeviceSize unusedRangeSize = levelNodeSize - allocSize;
+            if(unusedRangeSize > 0)
+            {
+                ++outInfo.unusedRangeCount;
+                outInfo.unusedBytes += unusedRangeSize;
+                outInfo.unusedRangeSizeMax = VMA_MAX(outInfo.unusedRangeSizeMax, unusedRangeSize);
+                outInfo.unusedRangeSizeMin = VMA_MAX(outInfo.unusedRangeSizeMin, unusedRangeSize);
+            }
+        }
+        break;
+    case Node::TYPE_SPLIT:
+        {
+            const VkDeviceSize childrenNodeSize = levelNodeSize / 2;
+            const Node* const leftChild = node->split.leftChild;
+            CalcAllocationStatInfoNode(outInfo, leftChild, childrenNodeSize);
+            const Node* const rightChild = leftChild->buddy;
+            CalcAllocationStatInfoNode(outInfo, rightChild, childrenNodeSize);
+        }
+        break;
+    default:
+        VMA_ASSERT(0);
+    }
+}
+
+void VmaBlockMetadata_Buddy::AddToFreeListFront(uint32_t level, Node* node)
+{
+    VMA_ASSERT(node->type == Node::TYPE_FREE);
+
+    // List is empty.
+    Node* const frontNode = m_FreeList[level].front;
+    if(frontNode == VMA_NULL)
+    {
+        VMA_ASSERT(m_FreeList[level].back == VMA_NULL);
+        node->free.prev = node->free.next = VMA_NULL;
+        m_FreeList[level].front = m_FreeList[level].back = node;
+    }
+    else
+    {
+        VMA_ASSERT(frontNode->free.prev == VMA_NULL);
+        node->free.prev = VMA_NULL;
+        node->free.next = frontNode;
+        frontNode->free.prev = node;
+        m_FreeList[level].front = node;
+    }
+}
+
+void VmaBlockMetadata_Buddy::RemoveFromFreeList(uint32_t level, Node* node)
+{
+    VMA_ASSERT(m_FreeList[level].front != VMA_NULL);
+
+    // It is at the front.
+    if(node->free.prev == VMA_NULL)
+    {
+        VMA_ASSERT(m_FreeList[level].front == node);
+        m_FreeList[level].front = node->free.next;
+    }
+    else
+    {
+        Node* const prevFreeNode = node->free.prev;
+        VMA_ASSERT(prevFreeNode->free.next == node);
+        prevFreeNode->free.next = node->free.next;
+    }
+
+    // It is at the back.
+    if(node->free.next == VMA_NULL)
+    {
+        VMA_ASSERT(m_FreeList[level].back == node);
+        m_FreeList[level].back = node->free.prev;
+    }
+    else
+    {
+        Node* const nextFreeNode = node->free.next;
+        VMA_ASSERT(nextFreeNode->free.prev == node);
+        nextFreeNode->free.prev = node->free.prev;
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+void VmaBlockMetadata_Buddy::PrintDetailedMapNode(class VmaJsonWriter& json, const Node* node, VkDeviceSize levelNodeSize) const
+{
+    switch(node->type)
+    {
+    case Node::TYPE_FREE:
+        PrintDetailedMap_UnusedRange(json, node->offset, levelNodeSize);
+        break;
+    case Node::TYPE_ALLOCATION:
+        {   
+            PrintDetailedMap_Allocation(json, node->offset, node->allocation.alloc);
+            const VkDeviceSize allocSize = node->allocation.alloc->GetSize();
+            if(allocSize < levelNodeSize)
+            {
+                PrintDetailedMap_UnusedRange(json, node->offset + allocSize, levelNodeSize - allocSize);
+            }
+        }
+        break;
+    case Node::TYPE_SPLIT:
+        {
+            const VkDeviceSize childrenNodeSize = levelNodeSize / 2;
+            const Node* const leftChild = node->split.leftChild;
+            PrintDetailedMapNode(json, leftChild, childrenNodeSize);
+            const Node* const rightChild = leftChild->buddy;
+            PrintDetailedMapNode(json, rightChild, childrenNodeSize);
+        }
+        break;
+    default:
+        VMA_ASSERT(0);
+    }
+}
+#endif // #if VMA_STATS_STRING_ENABLED
+
+
+////////////////////////////////////////////////////////////////////////////////
+// class VmaDeviceMemoryBlock
+
+VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator hAllocator) :
+    m_pMetadata(VMA_NULL),
+    m_MemoryTypeIndex(UINT32_MAX),
+    m_Id(0),
+    m_hMemory(VK_NULL_HANDLE),
+    m_MapCount(0),
+    m_pMappedData(VMA_NULL)
+{
+}
+
+void VmaDeviceMemoryBlock::Init(
+    VmaAllocator hAllocator,
+    VmaPool hParentPool,
+    uint32_t newMemoryTypeIndex,
+    VkDeviceMemory newMemory,
+    VkDeviceSize newSize,
+    uint32_t id,
+    uint32_t algorithm)
+{
+    VMA_ASSERT(m_hMemory == VK_NULL_HANDLE);
+
+    m_hParentPool = hParentPool;
+    m_MemoryTypeIndex = newMemoryTypeIndex;
+    m_Id = id;
+    m_hMemory = newMemory;
+
+    switch(algorithm)
+    {
+    case VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT:
+        m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Linear)(hAllocator);
+        break;
+    case VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT:
+        m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Buddy)(hAllocator);
+        break;
+    default:
+        VMA_ASSERT(0);
+        // Fall-through.
+    case 0:
+        m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Generic)(hAllocator);
+    }
+    m_pMetadata->Init(newSize);
+}
+
+void VmaDeviceMemoryBlock::Destroy(VmaAllocator allocator)
+{
+    // This is the most important assert in the entire library.
+    // Hitting it means you have some memory leak - unreleased VmaAllocation objects.
+    VMA_ASSERT(m_pMetadata->IsEmpty() && "Some allocations were not freed before destruction of this memory block!");
+
+    VMA_ASSERT(m_hMemory != VK_NULL_HANDLE);
+    allocator->FreeVulkanMemory(m_MemoryTypeIndex, m_pMetadata->GetSize(), m_hMemory);
+    m_hMemory = VK_NULL_HANDLE;
+
+    vma_delete(allocator, m_pMetadata);
+    m_pMetadata = VMA_NULL;
+}
+
+bool VmaDeviceMemoryBlock::Validate() const
+{
+    VMA_VALIDATE((m_hMemory != VK_NULL_HANDLE) &&
+        (m_pMetadata->GetSize() != 0));
+    
+    return m_pMetadata->Validate();
+}
+
+VkResult VmaDeviceMemoryBlock::CheckCorruption(VmaAllocator hAllocator)
+{
+    void* pData = nullptr;
+    VkResult res = Map(hAllocator, 1, &pData);
+    if(res != VK_SUCCESS)
+    {
+        return res;
+    }
+
+    res = m_pMetadata->CheckCorruption(pData);
+
+    Unmap(hAllocator, 1);
+
+    return res;
+}
+
+VkResult VmaDeviceMemoryBlock::Map(VmaAllocator hAllocator, uint32_t count, void** ppData)
+{
+    if(count == 0)
+    {
+        return VK_SUCCESS;
+    }
+
+    VmaMutexLock lock(m_Mutex, hAllocator->m_UseMutex);
+    if(m_MapCount != 0)
+    {
+        m_MapCount += count;
+        VMA_ASSERT(m_pMappedData != VMA_NULL);
+        if(ppData != VMA_NULL)
+        {
+            *ppData = m_pMappedData;
+        }
+        return VK_SUCCESS;
+    }
+    else
+    {
+        VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)(
+            hAllocator->m_hDevice,
+            m_hMemory,
+            0, // offset
+            VK_WHOLE_SIZE,
+            0, // flags
+            &m_pMappedData);
+        if(result == VK_SUCCESS)
+        {
+            if(ppData != VMA_NULL)
+            {
+                *ppData = m_pMappedData;
+            }
+            m_MapCount = count;
+        }
+        return result;
+    }
+}
+
+void VmaDeviceMemoryBlock::Unmap(VmaAllocator hAllocator, uint32_t count)
+{
+    if(count == 0)
+    {
+        return;
+    }
+
+    VmaMutexLock lock(m_Mutex, hAllocator->m_UseMutex);
+    if(m_MapCount >= count)
+    {
+        m_MapCount -= count;
+        if(m_MapCount == 0)
+        {
+            m_pMappedData = VMA_NULL;
+            (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(hAllocator->m_hDevice, m_hMemory);
+        }
+    }
+    else
+    {
+        VMA_ASSERT(0 && "VkDeviceMemory block is being unmapped while it was not previously mapped.");
+    }
+}
+
+VkResult VmaDeviceMemoryBlock::WriteMagicValueAroundAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize)
+{
+    VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION);
+    VMA_ASSERT(allocOffset >= VMA_DEBUG_MARGIN);
+
+    void* pData;
+    VkResult res = Map(hAllocator, 1, &pData);
+    if(res != VK_SUCCESS)
+    {
+        return res;
+    }
+
+    VmaWriteMagicValue(pData, allocOffset - VMA_DEBUG_MARGIN);
+    VmaWriteMagicValue(pData, allocOffset + allocSize);
+
+    Unmap(hAllocator, 1);
+
+    return VK_SUCCESS;
+}
+
+VkResult VmaDeviceMemoryBlock::ValidateMagicValueAroundAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize)
+{
+    VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION);
+    VMA_ASSERT(allocOffset >= VMA_DEBUG_MARGIN);
+
+    void* pData;
+    VkResult res = Map(hAllocator, 1, &pData);
+    if(res != VK_SUCCESS)
+    {
+        return res;
+    }
+
+    if(!VmaValidateMagicValue(pData, allocOffset - VMA_DEBUG_MARGIN))
+    {
+        VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED BEFORE FREED ALLOCATION!");
+    }
+    else if(!VmaValidateMagicValue(pData, allocOffset + allocSize))
+    {
+        VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER FREED ALLOCATION!");
+    }
+
+    Unmap(hAllocator, 1);
+
+    return VK_SUCCESS;
+}
+
+VkResult VmaDeviceMemoryBlock::BindBufferMemory(
+    const VmaAllocator hAllocator,
+    const VmaAllocation hAllocation,
+    VkDeviceSize allocationLocalOffset,
+    VkBuffer hBuffer,
+    const void* pNext)
+{
+    VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK &&
+        hAllocation->GetBlock() == this);
+    VMA_ASSERT(allocationLocalOffset < hAllocation->GetSize() &&
+        "Invalid allocationLocalOffset. Did you forget that this offset is relative to the beginning of the allocation, not the whole memory block?");
+    const VkDeviceSize memoryOffset = hAllocation->GetOffset() + allocationLocalOffset;
+    // This lock is important so that we don't call vkBind... and/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads.
+    VmaMutexLock lock(m_Mutex, hAllocator->m_UseMutex);
+    return hAllocator->BindVulkanBuffer(m_hMemory, memoryOffset, hBuffer, pNext);
+}
+
+VkResult VmaDeviceMemoryBlock::BindImageMemory(
+    const VmaAllocator hAllocator,
+    const VmaAllocation hAllocation,
+    VkDeviceSize allocationLocalOffset,
+    VkImage hImage,
+    const void* pNext)
+{
+    VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK &&
+        hAllocation->GetBlock() == this);
+    VMA_ASSERT(allocationLocalOffset < hAllocation->GetSize() &&
+        "Invalid allocationLocalOffset. Did you forget that this offset is relative to the beginning of the allocation, not the whole memory block?");
+    const VkDeviceSize memoryOffset = hAllocation->GetOffset() + allocationLocalOffset;
+    // This lock is important so that we don't call vkBind... and/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads.
+    VmaMutexLock lock(m_Mutex, hAllocator->m_UseMutex);
+    return hAllocator->BindVulkanImage(m_hMemory, memoryOffset, hImage, pNext);
+}
+
+static void InitStatInfo(VmaStatInfo& outInfo)
+{
+    memset(&outInfo, 0, sizeof(outInfo));
+    outInfo.allocationSizeMin = UINT64_MAX;
+    outInfo.unusedRangeSizeMin = UINT64_MAX;
+}
+
+// Adds statistics srcInfo into inoutInfo, like: inoutInfo += srcInfo.
+static void VmaAddStatInfo(VmaStatInfo& inoutInfo, const VmaStatInfo& srcInfo)
+{
+    inoutInfo.blockCount += srcInfo.blockCount;
+    inoutInfo.allocationCount += srcInfo.allocationCount;
+    inoutInfo.unusedRangeCount += srcInfo.unusedRangeCount;
+    inoutInfo.usedBytes += srcInfo.usedBytes;
+    inoutInfo.unusedBytes += srcInfo.unusedBytes;
+    inoutInfo.allocationSizeMin = VMA_MIN(inoutInfo.allocationSizeMin, srcInfo.allocationSizeMin);
+    inoutInfo.allocationSizeMax = VMA_MAX(inoutInfo.allocationSizeMax, srcInfo.allocationSizeMax);
+    inoutInfo.unusedRangeSizeMin = VMA_MIN(inoutInfo.unusedRangeSizeMin, srcInfo.unusedRangeSizeMin);
+    inoutInfo.unusedRangeSizeMax = VMA_MAX(inoutInfo.unusedRangeSizeMax, srcInfo.unusedRangeSizeMax);
+}
+
+static void VmaPostprocessCalcStatInfo(VmaStatInfo& inoutInfo)
+{
+    inoutInfo.allocationSizeAvg = (inoutInfo.allocationCount > 0) ?
+        VmaRoundDiv<VkDeviceSize>(inoutInfo.usedBytes, inoutInfo.allocationCount) : 0;
+    inoutInfo.unusedRangeSizeAvg = (inoutInfo.unusedRangeCount > 0) ?
+        VmaRoundDiv<VkDeviceSize>(inoutInfo.unusedBytes, inoutInfo.unusedRangeCount) : 0;
+}
+
+VmaPool_T::VmaPool_T(
+    VmaAllocator hAllocator,
+    const VmaPoolCreateInfo& createInfo,
+    VkDeviceSize preferredBlockSize) :
+    m_BlockVector(
+        hAllocator,
+        this, // hParentPool
+        createInfo.memoryTypeIndex,
+        createInfo.blockSize != 0 ? createInfo.blockSize : preferredBlockSize,
+        createInfo.minBlockCount,
+        createInfo.maxBlockCount,
+        (createInfo.flags & VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT) != 0 ? 1 : hAllocator->GetBufferImageGranularity(),
+        createInfo.frameInUseCount,
+        createInfo.blockSize != 0, // explicitBlockSize
+        createInfo.flags & VMA_POOL_CREATE_ALGORITHM_MASK), // algorithm
+    m_Id(0),
+    m_Name(VMA_NULL)
+{
+}
+
+VmaPool_T::~VmaPool_T()
+{
+}
+
+void VmaPool_T::SetName(const char* pName)
+{
+    const VkAllocationCallbacks* allocs = m_BlockVector.GetAllocator()->GetAllocationCallbacks();
+    VmaFreeString(allocs, m_Name);
+    
+    if(pName != VMA_NULL)
+    {
+        m_Name = VmaCreateStringCopy(allocs, pName);
+    }
+    else
+    {
+        m_Name = VMA_NULL;
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+VmaBlockVector::VmaBlockVector(
+    VmaAllocator hAllocator,
+    VmaPool hParentPool,
+    uint32_t memoryTypeIndex,
+    VkDeviceSize preferredBlockSize,
+    size_t minBlockCount,
+    size_t maxBlockCount,
+    VkDeviceSize bufferImageGranularity,
+    uint32_t frameInUseCount,
+    bool explicitBlockSize,
+    uint32_t algorithm) :
+    m_hAllocator(hAllocator),
+    m_hParentPool(hParentPool),
+    m_MemoryTypeIndex(memoryTypeIndex),
+    m_PreferredBlockSize(preferredBlockSize),
+    m_MinBlockCount(minBlockCount),
+    m_MaxBlockCount(maxBlockCount),
+    m_BufferImageGranularity(bufferImageGranularity),
+    m_FrameInUseCount(frameInUseCount),
+    m_ExplicitBlockSize(explicitBlockSize),
+    m_Algorithm(algorithm),
+    m_HasEmptyBlock(false),
+    m_Blocks(VmaStlAllocator<VmaDeviceMemoryBlock*>(hAllocator->GetAllocationCallbacks())),
+    m_NextBlockId(0)
+{
+}
+
+VmaBlockVector::~VmaBlockVector()
+{
+    for(size_t i = m_Blocks.size(); i--; )
+    {
+        m_Blocks[i]->Destroy(m_hAllocator);
+        vma_delete(m_hAllocator, m_Blocks[i]);
+    }
+}
+
+VkResult VmaBlockVector::CreateMinBlocks()
+{
+    for(size_t i = 0; i < m_MinBlockCount; ++i)
+    {
+        VkResult res = CreateBlock(m_PreferredBlockSize, VMA_NULL);
+        if(res != VK_SUCCESS)
+        {
+            return res;
+        }
+    }
+    return VK_SUCCESS;
+}
+
+void VmaBlockVector::GetPoolStats(VmaPoolStats* pStats)
+{
+    VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);
+
+    const size_t blockCount = m_Blocks.size();
+
+    pStats->size = 0;
+    pStats->unusedSize = 0;
+    pStats->allocationCount = 0;
+    pStats->unusedRangeCount = 0;
+    pStats->unusedRangeSizeMax = 0;
+    pStats->blockCount = blockCount;
+
+    for(uint32_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)
+    {
+        const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];
+        VMA_ASSERT(pBlock);
+        VMA_HEAVY_ASSERT(pBlock->Validate());
+        pBlock->m_pMetadata->AddPoolStats(*pStats);
+    }
+}
+
+bool VmaBlockVector::IsEmpty()
+{
+    VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);
+    return m_Blocks.empty();
+}
+
+bool VmaBlockVector::IsCorruptionDetectionEnabled() const
+{
+    const uint32_t requiredMemFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+    return (VMA_DEBUG_DETECT_CORRUPTION != 0) &&
+        (VMA_DEBUG_MARGIN > 0) &&
+        (m_Algorithm == 0 || m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) &&
+        (m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags & requiredMemFlags) == requiredMemFlags;
+}
+
+static const uint32_t VMA_ALLOCATION_TRY_COUNT = 32;
+
+VkResult VmaBlockVector::Allocate(
+    uint32_t currentFrameIndex,
+    VkDeviceSize size,
+    VkDeviceSize alignment,
+    const VmaAllocationCreateInfo& createInfo,
+    VmaSuballocationType suballocType,
+    size_t allocationCount,
+    VmaAllocation* pAllocations)
+{
+    size_t allocIndex;
+    VkResult res = VK_SUCCESS;
+
+    if(IsCorruptionDetectionEnabled())
+    {
+        size = VmaAlignUp<VkDeviceSize>(size, sizeof(VMA_CORRUPTION_DETECTION_MAGIC_VALUE));
+        alignment = VmaAlignUp<VkDeviceSize>(alignment, sizeof(VMA_CORRUPTION_DETECTION_MAGIC_VALUE));
+    }
+
+    {
+        VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex);
+        for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex)
+        {
+            res = AllocatePage(
+                currentFrameIndex,
+                size,
+                alignment,
+                createInfo,
+                suballocType,
+                pAllocations + allocIndex);
+            if(res != VK_SUCCESS)
+            {
+                break;
+            }
+        }
+    }
+
+    if(res != VK_SUCCESS)
+    {
+        // Free all already created allocations.
+        while(allocIndex--)
+        {
+            Free(pAllocations[allocIndex]);
+        }
+        memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount);
+    }
+
+    return res;
+}
+
+VkResult VmaBlockVector::AllocatePage(
+    uint32_t currentFrameIndex,
+    VkDeviceSize size,
+    VkDeviceSize alignment,
+    const VmaAllocationCreateInfo& createInfo,
+    VmaSuballocationType suballocType,
+    VmaAllocation* pAllocation)
+{
+    const bool isUpperAddress = (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0;
+    bool canMakeOtherLost = (createInfo.flags & VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT) != 0;
+    const bool mapped = (createInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0;
+    const bool isUserDataString = (createInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0;
+    
+    const bool withinBudget = (createInfo.flags & VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT) != 0;
+    VkDeviceSize freeMemory;
+    {
+        const uint32_t heapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex);
+        VmaBudget heapBudget = {};
+        m_hAllocator->GetBudget(&heapBudget, heapIndex, 1);
+        freeMemory = (heapBudget.usage < heapBudget.budget) ? (heapBudget.budget - heapBudget.usage) : 0;
+    }
+    
+    const bool canFallbackToDedicated = !IsCustomPool();
+    const bool canCreateNewBlock =
+        ((createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0) &&
+        (m_Blocks.size() < m_MaxBlockCount) &&
+        (freeMemory >= size || !canFallbackToDedicated);
+    uint32_t strategy = createInfo.flags & VMA_ALLOCATION_CREATE_STRATEGY_MASK;
+
+    // If linearAlgorithm is used, canMakeOtherLost is available only when used as ring buffer.
+    // Which in turn is available only when maxBlockCount = 1.
+    if(m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT && m_MaxBlockCount > 1)
+    {
+        canMakeOtherLost = false;
+    }
+
+    // Upper address can only be used with linear allocator and within single memory block.
+    if(isUpperAddress &&
+        (m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT || m_MaxBlockCount > 1))
+    {
+        return VK_ERROR_FEATURE_NOT_PRESENT;
+    }
+
+    // Validate strategy.
+    switch(strategy)
+    {
+    case 0:
+        strategy = VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT;
+        break;
+    case VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT:
+    case VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT:
+    case VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT:
+        break;
+    default:
+        return VK_ERROR_FEATURE_NOT_PRESENT;
+    }
+
+    // Early reject: requested allocation size is larger that maximum block size for this block vector.
+    if(size + 2 * VMA_DEBUG_MARGIN > m_PreferredBlockSize)
+    {
+        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+    }
+
+    /*
+    Under certain condition, this whole section can be skipped for optimization, so
+    we move on directly to trying to allocate with canMakeOtherLost. That's the case
+    e.g. for custom pools with linear algorithm.
+    */
+    if(!canMakeOtherLost || canCreateNewBlock)
+    {
+        // 1. Search existing allocations. Try to allocate without making other allocations lost.
+        VmaAllocationCreateFlags allocFlagsCopy = createInfo.flags;
+        allocFlagsCopy &= ~VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT;
+
+        if(m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT)
+        {
+            // Use only last block.
+            if(!m_Blocks.empty())
+            {
+                VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks.back();
+                VMA_ASSERT(pCurrBlock);
+                VkResult res = AllocateFromBlock(
+                    pCurrBlock,
+                    currentFrameIndex,
+                    size,
+                    alignment,
+                    allocFlagsCopy,
+                    createInfo.pUserData,
+                    suballocType,
+                    strategy,
+                    pAllocation);
+                if(res == VK_SUCCESS)
+                {
+                    VMA_DEBUG_LOG("    Returned from last block #%u", pCurrBlock->GetId());
+                    return VK_SUCCESS;
+                }
+            }
+        }
+        else
+        {
+            if(strategy == VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT)
+            {
+                // Forward order in m_Blocks - prefer blocks with smallest amount of free space.
+                for(size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex )
+                {
+                    VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];
+                    VMA_ASSERT(pCurrBlock);
+                    VkResult res = AllocateFromBlock(
+                        pCurrBlock,
+                        currentFrameIndex,
+                        size,
+                        alignment,
+                        allocFlagsCopy,
+                        createInfo.pUserData,
+                        suballocType,
+                        strategy,
+                        pAllocation);
+                    if(res == VK_SUCCESS)
+                    {
+                        VMA_DEBUG_LOG("    Returned from existing block #%u", pCurrBlock->GetId());
+                        return VK_SUCCESS;
+                    }
+                }
+            }
+            else // WORST_FIT, FIRST_FIT
+            {
+                // Backward order in m_Blocks - prefer blocks with largest amount of free space.
+                for(size_t blockIndex = m_Blocks.size(); blockIndex--; )
+                {
+                    VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];
+                    VMA_ASSERT(pCurrBlock);
+                    VkResult res = AllocateFromBlock(
+                        pCurrBlock,
+                        currentFrameIndex,
+                        size,
+                        alignment,
+                        allocFlagsCopy,
+                        createInfo.pUserData,
+                        suballocType,
+                        strategy,
+                        pAllocation);
+                    if(res == VK_SUCCESS)
+                    {
+                        VMA_DEBUG_LOG("    Returned from existing block #%u", pCurrBlock->GetId());
+                        return VK_SUCCESS;
+                    }
+                }
+            }
+        }
+
+        // 2. Try to create new block.
+        if(canCreateNewBlock)
+        {
+            // Calculate optimal size for new block.
+            VkDeviceSize newBlockSize = m_PreferredBlockSize;
+            uint32_t newBlockSizeShift = 0;
+            const uint32_t NEW_BLOCK_SIZE_SHIFT_MAX = 3;
+
+            if(!m_ExplicitBlockSize)
+            {
+                // Allocate 1/8, 1/4, 1/2 as first blocks.
+                const VkDeviceSize maxExistingBlockSize = CalcMaxBlockSize();
+                for(uint32_t i = 0; i < NEW_BLOCK_SIZE_SHIFT_MAX; ++i)
+                {
+                    const VkDeviceSize smallerNewBlockSize = newBlockSize / 2;
+                    if(smallerNewBlockSize > maxExistingBlockSize && smallerNewBlockSize >= size * 2)
+                    {
+                        newBlockSize = smallerNewBlockSize;
+                        ++newBlockSizeShift;
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+            }
+
+            size_t newBlockIndex = 0;
+            VkResult res = (newBlockSize <= freeMemory || !canFallbackToDedicated) ?
+                CreateBlock(newBlockSize, &newBlockIndex) : VK_ERROR_OUT_OF_DEVICE_MEMORY;
+            // Allocation of this size failed? Try 1/2, 1/4, 1/8 of m_PreferredBlockSize.
+            if(!m_ExplicitBlockSize)
+            {
+                while(res < 0 && newBlockSizeShift < NEW_BLOCK_SIZE_SHIFT_MAX)
+                {
+                    const VkDeviceSize smallerNewBlockSize = newBlockSize / 2;
+                    if(smallerNewBlockSize >= size)
+                    {
+                        newBlockSize = smallerNewBlockSize;
+                        ++newBlockSizeShift;
+                        res = (newBlockSize <= freeMemory || !canFallbackToDedicated) ?
+                            CreateBlock(newBlockSize, &newBlockIndex) : VK_ERROR_OUT_OF_DEVICE_MEMORY;
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+            }
+
+            if(res == VK_SUCCESS)
+            {
+                VmaDeviceMemoryBlock* const pBlock = m_Blocks[newBlockIndex];
+                VMA_ASSERT(pBlock->m_pMetadata->GetSize() >= size);
+
+                res = AllocateFromBlock(
+                    pBlock,
+                    currentFrameIndex,
+                    size,
+                    alignment,
+                    allocFlagsCopy,
+                    createInfo.pUserData,
+                    suballocType,
+                    strategy,
+                    pAllocation);
+                if(res == VK_SUCCESS)
+                {
+                    VMA_DEBUG_LOG("    Created new block #%u Size=%llu", pBlock->GetId(), newBlockSize);
+                    return VK_SUCCESS;
+                }
+                else
+                {
+                    // Allocation from new block failed, possibly due to VMA_DEBUG_MARGIN or alignment.
+                    return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+                }
+            }
+        }
+    }
+
+    // 3. Try to allocate from existing blocks with making other allocations lost.
+    if(canMakeOtherLost)
+    {
+        uint32_t tryIndex = 0;
+        for(; tryIndex < VMA_ALLOCATION_TRY_COUNT; ++tryIndex)
+        {
+            VmaDeviceMemoryBlock* pBestRequestBlock = VMA_NULL;
+            VmaAllocationRequest bestRequest = {};
+            VkDeviceSize bestRequestCost = VK_WHOLE_SIZE;
+
+            // 1. Search existing allocations.
+            if(strategy == VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT)
+            {
+                // Forward order in m_Blocks - prefer blocks with smallest amount of free space.
+                for(size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex )
+                {
+                    VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];
+                    VMA_ASSERT(pCurrBlock);
+                    VmaAllocationRequest currRequest = {};
+                    if(pCurrBlock->m_pMetadata->CreateAllocationRequest(
+                        currentFrameIndex,
+                        m_FrameInUseCount,
+                        m_BufferImageGranularity,
+                        size,
+                        alignment,
+                        (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0,
+                        suballocType,
+                        canMakeOtherLost,
+                        strategy,
+                        &currRequest))
+                    {
+                        const VkDeviceSize currRequestCost = currRequest.CalcCost();
+                        if(pBestRequestBlock == VMA_NULL ||
+                            currRequestCost < bestRequestCost)
+                        {
+                            pBestRequestBlock = pCurrBlock;
+                            bestRequest = currRequest;
+                            bestRequestCost = currRequestCost;
+
+                            if(bestRequestCost == 0)
+                            {
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            else // WORST_FIT, FIRST_FIT
+            {
+                // Backward order in m_Blocks - prefer blocks with largest amount of free space.
+                for(size_t blockIndex = m_Blocks.size(); blockIndex--; )
+                {
+                    VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];
+                    VMA_ASSERT(pCurrBlock);
+                    VmaAllocationRequest currRequest = {};
+                    if(pCurrBlock->m_pMetadata->CreateAllocationRequest(
+                        currentFrameIndex,
+                        m_FrameInUseCount,
+                        m_BufferImageGranularity,
+                        size,
+                        alignment,
+                        (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0,
+                        suballocType,
+                        canMakeOtherLost,
+                        strategy,
+                        &currRequest))
+                    {
+                        const VkDeviceSize currRequestCost = currRequest.CalcCost();
+                        if(pBestRequestBlock == VMA_NULL ||
+                            currRequestCost < bestRequestCost ||
+                            strategy == VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT)
+                        {
+                            pBestRequestBlock = pCurrBlock;
+                            bestRequest = currRequest;
+                            bestRequestCost = currRequestCost;
+
+                            if(bestRequestCost == 0 ||
+                                strategy == VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT)
+                            {
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+
+            if(pBestRequestBlock != VMA_NULL)
+            {
+                if(mapped)
+                {
+                    VkResult res = pBestRequestBlock->Map(m_hAllocator, 1, VMA_NULL);
+                    if(res != VK_SUCCESS)
+                    {
+                        return res;
+                    }
+                }
+
+                if(pBestRequestBlock->m_pMetadata->MakeRequestedAllocationsLost(
+                    currentFrameIndex,
+                    m_FrameInUseCount,
+                    &bestRequest))
+                {
+                    // Allocate from this pBlock.
+                    *pAllocation = m_hAllocator->m_AllocationObjectAllocator.Allocate();
+                    (*pAllocation)->Ctor(currentFrameIndex, isUserDataString);
+                    pBestRequestBlock->m_pMetadata->Alloc(bestRequest, suballocType, size, *pAllocation);
+                    UpdateHasEmptyBlock();
+                    (*pAllocation)->InitBlockAllocation(
+                        pBestRequestBlock,
+                        bestRequest.offset,
+                        alignment,
+                        size,
+                        m_MemoryTypeIndex,
+                        suballocType,
+                        mapped,
+                        (createInfo.flags & VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT) != 0);
+                    VMA_HEAVY_ASSERT(pBestRequestBlock->Validate());
+                    VMA_DEBUG_LOG("    Returned from existing block");
+                    (*pAllocation)->SetUserData(m_hAllocator, createInfo.pUserData);
+                    m_hAllocator->m_Budget.AddAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), size);
+                    if(VMA_DEBUG_INITIALIZE_ALLOCATIONS)
+                    {
+                        m_hAllocator->FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED);
+                    }
+                    if(IsCorruptionDetectionEnabled())
+                    {
+                        VkResult res = pBestRequestBlock->WriteMagicValueAroundAllocation(m_hAllocator, bestRequest.offset, size);
+                        VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to write magic value.");
+                    }
+                    return VK_SUCCESS;
+                }
+                // else: Some allocations must have been touched while we are here. Next try.
+            }
+            else
+            {
+                // Could not find place in any of the blocks - break outer loop.
+                break;
+            }
+        }
+        /* Maximum number of tries exceeded - a very unlike event when many other
+        threads are simultaneously touching allocations making it impossible to make
+        lost at the same time as we try to allocate. */
+        if(tryIndex == VMA_ALLOCATION_TRY_COUNT)
+        {
+            return VK_ERROR_TOO_MANY_OBJECTS;
+        }
+    }
+
+    return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+}
+
+void VmaBlockVector::Free(
+    const VmaAllocation hAllocation)
+{
+    VmaDeviceMemoryBlock* pBlockToDelete = VMA_NULL;
+
+    bool budgetExceeded = false;
+    {
+        const uint32_t heapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex);
+        VmaBudget heapBudget = {};
+        m_hAllocator->GetBudget(&heapBudget, heapIndex, 1);
+        budgetExceeded = heapBudget.usage >= heapBudget.budget;
+    }
+
+    // Scope for lock.
+    {
+        VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex);
+
+        VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock();
+
+        if(IsCorruptionDetectionEnabled())
+        {
+            VkResult res = pBlock->ValidateMagicValueAroundAllocation(m_hAllocator, hAllocation->GetOffset(), hAllocation->GetSize());
+            VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to validate magic value.");
+        }
+
+        if(hAllocation->IsPersistentMap())
+        {
+            pBlock->Unmap(m_hAllocator, 1);
+        }
+
+        pBlock->m_pMetadata->Free(hAllocation);
+        VMA_HEAVY_ASSERT(pBlock->Validate());
+
+        VMA_DEBUG_LOG("  Freed from MemoryTypeIndex=%u", m_MemoryTypeIndex);
+
+        const bool canDeleteBlock = m_Blocks.size() > m_MinBlockCount;
+        // pBlock became empty after this deallocation.
+        if(pBlock->m_pMetadata->IsEmpty())
+        {
+            // Already has empty block. We don't want to have two, so delete this one.
+            if((m_HasEmptyBlock || budgetExceeded) && canDeleteBlock)
+            {
+                pBlockToDelete = pBlock;
+                Remove(pBlock);
+            }
+            // else: We now have an empty block - leave it.
+        }
+        // pBlock didn't become empty, but we have another empty block - find and free that one.
+        // (This is optional, heuristics.)
+        else if(m_HasEmptyBlock && canDeleteBlock)
+        {
+            VmaDeviceMemoryBlock* pLastBlock = m_Blocks.back();
+            if(pLastBlock->m_pMetadata->IsEmpty())
+            {
+                pBlockToDelete = pLastBlock;
+                m_Blocks.pop_back();
+            }
+        }
+
+        UpdateHasEmptyBlock();
+        IncrementallySortBlocks();
+    }
+
+    // Destruction of a free block. Deferred until this point, outside of mutex
+    // lock, for performance reason.
+    if(pBlockToDelete != VMA_NULL)
+    {
+        VMA_DEBUG_LOG("    Deleted empty block");
+        pBlockToDelete->Destroy(m_hAllocator);
+        vma_delete(m_hAllocator, pBlockToDelete);
+    }
+}
+
+VkDeviceSize VmaBlockVector::CalcMaxBlockSize() const
+{
+    VkDeviceSize result = 0;
+    for(size_t i = m_Blocks.size(); i--; )
+    {
+        result = VMA_MAX(result, m_Blocks[i]->m_pMetadata->GetSize());
+        if(result >= m_PreferredBlockSize)
+        {
+            break;
+        }
+    }
+    return result;
+}
+
+void VmaBlockVector::Remove(VmaDeviceMemoryBlock* pBlock)
+{
+    for(uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)
+    {
+        if(m_Blocks[blockIndex] == pBlock)
+        {
+            VmaVectorRemove(m_Blocks, blockIndex);
+            return;
+        }
+    }
+    VMA_ASSERT(0);
+}
+
+void VmaBlockVector::IncrementallySortBlocks()
+{
+    if(m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT)
+    {
+        // Bubble sort only until first swap.
+        for(size_t i = 1; i < m_Blocks.size(); ++i)
+        {
+            if(m_Blocks[i - 1]->m_pMetadata->GetSumFreeSize() > m_Blocks[i]->m_pMetadata->GetSumFreeSize())
+            {
+                VMA_SWAP(m_Blocks[i - 1], m_Blocks[i]);
+                return;
+            }
+        }
+    }
+}
+
+VkResult VmaBlockVector::AllocateFromBlock(
+    VmaDeviceMemoryBlock* pBlock,
+    uint32_t currentFrameIndex,
+    VkDeviceSize size,
+    VkDeviceSize alignment,
+    VmaAllocationCreateFlags allocFlags,
+    void* pUserData,
+    VmaSuballocationType suballocType,
+    uint32_t strategy,
+    VmaAllocation* pAllocation)
+{
+    VMA_ASSERT((allocFlags & VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT) == 0);
+    const bool isUpperAddress = (allocFlags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0;
+    const bool mapped = (allocFlags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0;
+    const bool isUserDataString = (allocFlags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0;
+
+    VmaAllocationRequest currRequest = {};
+    if(pBlock->m_pMetadata->CreateAllocationRequest(
+        currentFrameIndex,
+        m_FrameInUseCount,
+        m_BufferImageGranularity,
+        size,
+        alignment,
+        isUpperAddress,
+        suballocType,
+        false, // canMakeOtherLost
+        strategy,
+        &currRequest))
+    {
+        // Allocate from pCurrBlock.
+        VMA_ASSERT(currRequest.itemsToMakeLostCount == 0);
+
+        if(mapped)
+        {
+            VkResult res = pBlock->Map(m_hAllocator, 1, VMA_NULL);
+            if(res != VK_SUCCESS)
+            {
+                return res;
+            }
+        }
+            
+        *pAllocation = m_hAllocator->m_AllocationObjectAllocator.Allocate();
+        (*pAllocation)->Ctor(currentFrameIndex, isUserDataString);
+        pBlock->m_pMetadata->Alloc(currRequest, suballocType, size, *pAllocation);
+        UpdateHasEmptyBlock();
+        (*pAllocation)->InitBlockAllocation(
+            pBlock,
+            currRequest.offset,
+            alignment,
+            size,
+            m_MemoryTypeIndex,
+            suballocType,
+            mapped,
+            (allocFlags & VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT) != 0);
+        VMA_HEAVY_ASSERT(pBlock->Validate());
+        (*pAllocation)->SetUserData(m_hAllocator, pUserData);
+        m_hAllocator->m_Budget.AddAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), size);
+        if(VMA_DEBUG_INITIALIZE_ALLOCATIONS)
+        {
+            m_hAllocator->FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED);
+        }
+        if(IsCorruptionDetectionEnabled())
+        {
+            VkResult res = pBlock->WriteMagicValueAroundAllocation(m_hAllocator, currRequest.offset, size);
+            VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to write magic value.");
+        }
+        return VK_SUCCESS;
+    }
+    return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+}
+
+VkResult VmaBlockVector::CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex)
+{
+    VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO };
+    allocInfo.memoryTypeIndex = m_MemoryTypeIndex;
+    allocInfo.allocationSize = blockSize;
+    VkDeviceMemory mem = VK_NULL_HANDLE;
+    VkResult res = m_hAllocator->AllocateVulkanMemory(&allocInfo, &mem);
+    if(res < 0)
+    {
+        return res;
+    }
+
+    // New VkDeviceMemory successfully created.
+
+    // Create new Allocation for it.
+    VmaDeviceMemoryBlock* const pBlock = vma_new(m_hAllocator, VmaDeviceMemoryBlock)(m_hAllocator);
+    pBlock->Init(
+        m_hAllocator,
+        m_hParentPool,
+        m_MemoryTypeIndex,
+        mem,
+        allocInfo.allocationSize,
+        m_NextBlockId++,
+        m_Algorithm);
+
+    m_Blocks.push_back(pBlock);
+    if(pNewBlockIndex != VMA_NULL)
+    {
+        *pNewBlockIndex = m_Blocks.size() - 1;
+    }
+
+    return VK_SUCCESS;
+}
+
+void VmaBlockVector::ApplyDefragmentationMovesCpu(
+    class VmaBlockVectorDefragmentationContext* pDefragCtx,
+    const VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves)
+{
+    const size_t blockCount = m_Blocks.size();
+    const bool isNonCoherent = m_hAllocator->IsMemoryTypeNonCoherent(m_MemoryTypeIndex);
+
+    enum BLOCK_FLAG
+    {
+        BLOCK_FLAG_USED = 0x00000001,
+        BLOCK_FLAG_MAPPED_FOR_DEFRAGMENTATION = 0x00000002,
+    };
+
+    struct BlockInfo
+    {
+        uint32_t flags;
+        void* pMappedData;
+    };
+    VmaVector< BlockInfo, VmaStlAllocator<BlockInfo> >
+        blockInfo(blockCount, BlockInfo(), VmaStlAllocator<BlockInfo>(m_hAllocator->GetAllocationCallbacks()));
+    memset(blockInfo.data(), 0, blockCount * sizeof(BlockInfo));
+
+    // Go over all moves. Mark blocks that are used with BLOCK_FLAG_USED.
+    const size_t moveCount = moves.size();
+    for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex)
+    {
+        const VmaDefragmentationMove& move = moves[moveIndex];
+        blockInfo[move.srcBlockIndex].flags |= BLOCK_FLAG_USED;
+        blockInfo[move.dstBlockIndex].flags |= BLOCK_FLAG_USED;
+    }
+
+    VMA_ASSERT(pDefragCtx->res == VK_SUCCESS);
+
+    // Go over all blocks. Get mapped pointer or map if necessary.
+    for(size_t blockIndex = 0; pDefragCtx->res == VK_SUCCESS && blockIndex < blockCount; ++blockIndex)
+    {
+        BlockInfo& currBlockInfo = blockInfo[blockIndex];
+        VmaDeviceMemoryBlock* pBlock = m_Blocks[blockIndex];
+        if((currBlockInfo.flags & BLOCK_FLAG_USED) != 0)
+        {
+            currBlockInfo.pMappedData = pBlock->GetMappedData();
+            // It is not originally mapped - map it.
+            if(currBlockInfo.pMappedData == VMA_NULL)
+            {
+                pDefragCtx->res = pBlock->Map(m_hAllocator, 1, &currBlockInfo.pMappedData);
+                if(pDefragCtx->res == VK_SUCCESS)
+                {
+                    currBlockInfo.flags |= BLOCK_FLAG_MAPPED_FOR_DEFRAGMENTATION;
+                }
+            }
+        }
+    }
+
+    // Go over all moves. Do actual data transfer.
+    if(pDefragCtx->res == VK_SUCCESS)
+    {
+        const VkDeviceSize nonCoherentAtomSize = m_hAllocator->m_PhysicalDeviceProperties.limits.nonCoherentAtomSize;
+        VkMappedMemoryRange memRange = { VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE };
+
+        for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex)
+        {
+            const VmaDefragmentationMove& move = moves[moveIndex];
+
+            const BlockInfo& srcBlockInfo = blockInfo[move.srcBlockIndex];
+            const BlockInfo& dstBlockInfo = blockInfo[move.dstBlockIndex];
+
+            VMA_ASSERT(srcBlockInfo.pMappedData && dstBlockInfo.pMappedData);
+
+            // Invalidate source.
+            if(isNonCoherent)
+            {
+                VmaDeviceMemoryBlock* const pSrcBlock = m_Blocks[move.srcBlockIndex];
+                memRange.memory = pSrcBlock->GetDeviceMemory();
+                memRange.offset = VmaAlignDown(move.srcOffset, nonCoherentAtomSize);
+                memRange.size = VMA_MIN(
+                    VmaAlignUp(move.size + (move.srcOffset - memRange.offset), nonCoherentAtomSize),
+                    pSrcBlock->m_pMetadata->GetSize() - memRange.offset);
+                (*m_hAllocator->GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hAllocator->m_hDevice, 1, &memRange);
+            }
+
+            // THE PLACE WHERE ACTUAL DATA COPY HAPPENS.
+            memmove(
+                reinterpret_cast<char*>(dstBlockInfo.pMappedData) + move.dstOffset,
+                reinterpret_cast<char*>(srcBlockInfo.pMappedData) + move.srcOffset,
+                static_cast<size_t>(move.size));
+
+            if(IsCorruptionDetectionEnabled())
+            {
+                VmaWriteMagicValue(dstBlockInfo.pMappedData, move.dstOffset - VMA_DEBUG_MARGIN);
+                VmaWriteMagicValue(dstBlockInfo.pMappedData, move.dstOffset + move.size);
+            }
+
+            // Flush destination.
+            if(isNonCoherent)
+            {
+                VmaDeviceMemoryBlock* const pDstBlock = m_Blocks[move.dstBlockIndex];
+                memRange.memory = pDstBlock->GetDeviceMemory();
+                memRange.offset = VmaAlignDown(move.dstOffset, nonCoherentAtomSize);
+                memRange.size = VMA_MIN(
+                    VmaAlignUp(move.size + (move.dstOffset - memRange.offset), nonCoherentAtomSize),
+                    pDstBlock->m_pMetadata->GetSize() - memRange.offset);
+                (*m_hAllocator->GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hAllocator->m_hDevice, 1, &memRange);
+            }
+        }
+    }
+
+    // Go over all blocks in reverse order. Unmap those that were mapped just for defragmentation.
+    // Regardless of pCtx->res == VK_SUCCESS.
+    for(size_t blockIndex = blockCount; blockIndex--; )
+    {
+        const BlockInfo& currBlockInfo = blockInfo[blockIndex];
+        if((currBlockInfo.flags & BLOCK_FLAG_MAPPED_FOR_DEFRAGMENTATION) != 0)
+        {
+            VmaDeviceMemoryBlock* pBlock = m_Blocks[blockIndex];
+            pBlock->Unmap(m_hAllocator, 1);
+        }
+    }
+}
+
+void VmaBlockVector::ApplyDefragmentationMovesGpu(
+    class VmaBlockVectorDefragmentationContext* pDefragCtx,
+    VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+    VkCommandBuffer commandBuffer)
+{
+    const size_t blockCount = m_Blocks.size();
+
+    pDefragCtx->blockContexts.resize(blockCount);
+    memset(pDefragCtx->blockContexts.data(), 0, blockCount * sizeof(VmaBlockDefragmentationContext));
+
+    // Go over all moves. Mark blocks that are used with BLOCK_FLAG_USED.
+    const size_t moveCount = moves.size();
+    for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex)
+    {
+        const VmaDefragmentationMove& move = moves[moveIndex];
+
+        //if(move.type == VMA_ALLOCATION_TYPE_UNKNOWN)
+        {
+            // Old school move still require us to map the whole block
+            pDefragCtx->blockContexts[move.srcBlockIndex].flags |= VmaBlockDefragmentationContext::BLOCK_FLAG_USED;
+            pDefragCtx->blockContexts[move.dstBlockIndex].flags |= VmaBlockDefragmentationContext::BLOCK_FLAG_USED;
+        }
+    }
+
+    VMA_ASSERT(pDefragCtx->res == VK_SUCCESS);
+
+    // Go over all blocks. Create and bind buffer for whole block if necessary.
+    {
+        VkBufferCreateInfo bufCreateInfo;
+        VmaFillGpuDefragmentationBufferCreateInfo(bufCreateInfo);
+
+        for(size_t blockIndex = 0; pDefragCtx->res == VK_SUCCESS && blockIndex < blockCount; ++blockIndex)
+        {
+            VmaBlockDefragmentationContext& currBlockCtx = pDefragCtx->blockContexts[blockIndex];
+            VmaDeviceMemoryBlock* pBlock = m_Blocks[blockIndex];
+            if((currBlockCtx.flags & VmaBlockDefragmentationContext::BLOCK_FLAG_USED) != 0)
+            {
+                bufCreateInfo.size = pBlock->m_pMetadata->GetSize();
+                pDefragCtx->res = (*m_hAllocator->GetVulkanFunctions().vkCreateBuffer)(
+                    m_hAllocator->m_hDevice, &bufCreateInfo, m_hAllocator->GetAllocationCallbacks(), &currBlockCtx.hBuffer);
+                if(pDefragCtx->res == VK_SUCCESS)
+                {
+                    pDefragCtx->res = (*m_hAllocator->GetVulkanFunctions().vkBindBufferMemory)(
+                        m_hAllocator->m_hDevice, currBlockCtx.hBuffer, pBlock->GetDeviceMemory(), 0);
+                }
+            }
+        }
+    }
+
+    // Go over all moves. Post data transfer commands to command buffer.
+    if(pDefragCtx->res == VK_SUCCESS)
+    {
+        for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex)
+        {
+            const VmaDefragmentationMove& move = moves[moveIndex];
+
+            const VmaBlockDefragmentationContext& srcBlockCtx = pDefragCtx->blockContexts[move.srcBlockIndex];
+            const VmaBlockDefragmentationContext& dstBlockCtx = pDefragCtx->blockContexts[move.dstBlockIndex];
+
+            VMA_ASSERT(srcBlockCtx.hBuffer && dstBlockCtx.hBuffer);
+
+            VkBufferCopy region = {
+                move.srcOffset,
+                move.dstOffset,
+                move.size };
+            (*m_hAllocator->GetVulkanFunctions().vkCmdCopyBuffer)(
+                commandBuffer, srcBlockCtx.hBuffer, dstBlockCtx.hBuffer, 1, &region);
+        }
+    }
+
+    // Save buffers to defrag context for later destruction.
+    if(pDefragCtx->res == VK_SUCCESS && moveCount > 0)
+    {
+        pDefragCtx->res = VK_NOT_READY;
+    }
+}
+
+void VmaBlockVector::FreeEmptyBlocks(VmaDefragmentationStats* pDefragmentationStats)
+{
+    for(size_t blockIndex = m_Blocks.size(); blockIndex--; )
+    {
+        VmaDeviceMemoryBlock* pBlock = m_Blocks[blockIndex];
+        if(pBlock->m_pMetadata->IsEmpty())
+        {
+            if(m_Blocks.size() > m_MinBlockCount)
+            {
+                if(pDefragmentationStats != VMA_NULL)
+                {
+                    ++pDefragmentationStats->deviceMemoryBlocksFreed;
+                    pDefragmentationStats->bytesFreed += pBlock->m_pMetadata->GetSize();
+                }
+
+                VmaVectorRemove(m_Blocks, blockIndex);
+                pBlock->Destroy(m_hAllocator);
+                vma_delete(m_hAllocator, pBlock);
+            }
+            else
+            {
+                break;
+            }
+        }
+    }
+    UpdateHasEmptyBlock();
+}
+
+void VmaBlockVector::UpdateHasEmptyBlock()
+{
+    m_HasEmptyBlock = false;
+    for(size_t index = 0, count = m_Blocks.size(); index < count; ++index)
+    {
+        VmaDeviceMemoryBlock* const pBlock = m_Blocks[index];
+        if(pBlock->m_pMetadata->IsEmpty())
+        {
+            m_HasEmptyBlock = true;
+            break;
+        }
+    }
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+void VmaBlockVector::PrintDetailedMap(class VmaJsonWriter& json)
+{
+    VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);
+
+    json.BeginObject();
+
+    if(IsCustomPool())
+    {
+        const char* poolName = m_hParentPool->GetName();
+        if(poolName != VMA_NULL && poolName[0] != '\0')
+        {
+            json.WriteString("Name");
+            json.WriteString(poolName);
+        }
+
+        json.WriteString("MemoryTypeIndex");
+        json.WriteNumber(m_MemoryTypeIndex);
+
+        json.WriteString("BlockSize");
+        json.WriteNumber(m_PreferredBlockSize);
+
+        json.WriteString("BlockCount");
+        json.BeginObject(true);
+        if(m_MinBlockCount > 0)
+        {
+            json.WriteString("Min");
+            json.WriteNumber((uint64_t)m_MinBlockCount);
+        }
+        if(m_MaxBlockCount < SIZE_MAX)
+        {
+            json.WriteString("Max");
+            json.WriteNumber((uint64_t)m_MaxBlockCount);
+        }
+        json.WriteString("Cur");
+        json.WriteNumber((uint64_t)m_Blocks.size());
+        json.EndObject();
+
+        if(m_FrameInUseCount > 0)
+        {
+            json.WriteString("FrameInUseCount");
+            json.WriteNumber(m_FrameInUseCount);
+        }
+
+        if(m_Algorithm != 0)
+        {
+            json.WriteString("Algorithm");
+            json.WriteString(VmaAlgorithmToStr(m_Algorithm));
+        }
+    }
+    else
+    {
+        json.WriteString("PreferredBlockSize");
+        json.WriteNumber(m_PreferredBlockSize);
+    }
+
+    json.WriteString("Blocks");
+    json.BeginObject();
+    for(size_t i = 0; i < m_Blocks.size(); ++i)
+    {
+        json.BeginString();
+        json.ContinueString(m_Blocks[i]->GetId());
+        json.EndString();
+
+        m_Blocks[i]->m_pMetadata->PrintDetailedMap(json);
+    }
+    json.EndObject();
+
+    json.EndObject();
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+void VmaBlockVector::Defragment(
+    class VmaBlockVectorDefragmentationContext* pCtx,
+    VmaDefragmentationStats* pStats, VmaDefragmentationFlags flags,
+    VkDeviceSize& maxCpuBytesToMove, uint32_t& maxCpuAllocationsToMove,
+    VkDeviceSize& maxGpuBytesToMove, uint32_t& maxGpuAllocationsToMove,
+    VkCommandBuffer commandBuffer)
+{
+    pCtx->res = VK_SUCCESS;
+    
+    const VkMemoryPropertyFlags memPropFlags =
+        m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags;
+    const bool isHostVisible = (memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0;
+
+    const bool canDefragmentOnCpu = maxCpuBytesToMove > 0 && maxCpuAllocationsToMove > 0 &&
+        isHostVisible;
+    const bool canDefragmentOnGpu = maxGpuBytesToMove > 0 && maxGpuAllocationsToMove > 0 &&
+        !IsCorruptionDetectionEnabled() &&
+        ((1u << m_MemoryTypeIndex) & m_hAllocator->GetGpuDefragmentationMemoryTypeBits()) != 0;
+
+    // There are options to defragment this memory type.
+    if(canDefragmentOnCpu || canDefragmentOnGpu)
+    {
+        bool defragmentOnGpu;
+        // There is only one option to defragment this memory type.
+        if(canDefragmentOnGpu != canDefragmentOnCpu)
+        {
+            defragmentOnGpu = canDefragmentOnGpu;
+        }
+        // Both options are available: Heuristics to choose the best one.
+        else
+        {
+            defragmentOnGpu = (memPropFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) != 0 ||
+                m_hAllocator->IsIntegratedGpu();
+        }
+
+        bool overlappingMoveSupported = !defragmentOnGpu;
+
+        if(m_hAllocator->m_UseMutex)
+        {
+            if(flags & VMA_DEFRAGMENTATION_FLAG_INCREMENTAL)
+            {
+                if(!m_Mutex.TryLockWrite())
+                {
+                    pCtx->res = VK_ERROR_INITIALIZATION_FAILED;
+                    return;
+                }
+            }
+            else
+            {
+                m_Mutex.LockWrite();
+                pCtx->mutexLocked = true;
+            }
+        }
+
+        pCtx->Begin(overlappingMoveSupported, flags);
+
+        // Defragment.
+
+        const VkDeviceSize maxBytesToMove = defragmentOnGpu ? maxGpuBytesToMove : maxCpuBytesToMove;
+        const uint32_t maxAllocationsToMove = defragmentOnGpu ? maxGpuAllocationsToMove : maxCpuAllocationsToMove;
+        pCtx->res = pCtx->GetAlgorithm()->Defragment(pCtx->defragmentationMoves, maxBytesToMove, maxAllocationsToMove, flags);
+
+        // Accumulate statistics.
+        if(pStats != VMA_NULL)
+        {
+            const VkDeviceSize bytesMoved = pCtx->GetAlgorithm()->GetBytesMoved();
+            const uint32_t allocationsMoved = pCtx->GetAlgorithm()->GetAllocationsMoved();
+            pStats->bytesMoved += bytesMoved;
+            pStats->allocationsMoved += allocationsMoved;
+            VMA_ASSERT(bytesMoved <= maxBytesToMove);
+            VMA_ASSERT(allocationsMoved <= maxAllocationsToMove);
+            if(defragmentOnGpu)
+            {
+                maxGpuBytesToMove -= bytesMoved;
+                maxGpuAllocationsToMove -= allocationsMoved;
+            }
+            else
+            {
+                maxCpuBytesToMove -= bytesMoved;
+                maxCpuAllocationsToMove -= allocationsMoved;
+            }
+        }
+
+        if(flags & VMA_DEFRAGMENTATION_FLAG_INCREMENTAL)
+        {
+            if(m_hAllocator->m_UseMutex)
+                m_Mutex.UnlockWrite();
+            
+            if(pCtx->res >= VK_SUCCESS && !pCtx->defragmentationMoves.empty())
+                pCtx->res = VK_NOT_READY;
+
+            return;
+        }
+    
+        if(pCtx->res >= VK_SUCCESS)
+        {
+            if(defragmentOnGpu)
+            {
+                ApplyDefragmentationMovesGpu(pCtx, pCtx->defragmentationMoves, commandBuffer);
+            }
+            else
+            {
+                ApplyDefragmentationMovesCpu(pCtx, pCtx->defragmentationMoves);
+            }
+        }
+    }
+}
+
+void VmaBlockVector::DefragmentationEnd(
+    class VmaBlockVectorDefragmentationContext* pCtx,
+    VmaDefragmentationStats* pStats)
+{
+    // Destroy buffers.
+    for(size_t blockIndex = pCtx->blockContexts.size(); blockIndex--; )
+    {
+        VmaBlockDefragmentationContext& blockCtx = pCtx->blockContexts[blockIndex];
+        if(blockCtx.hBuffer)
+        {
+            (*m_hAllocator->GetVulkanFunctions().vkDestroyBuffer)(
+                m_hAllocator->m_hDevice, blockCtx.hBuffer, m_hAllocator->GetAllocationCallbacks());
+        }
+    }
+
+    if(pCtx->res >= VK_SUCCESS)
+    {
+        FreeEmptyBlocks(pStats);
+    }
+
+    if(pCtx->mutexLocked)
+    {
+        VMA_ASSERT(m_hAllocator->m_UseMutex);
+        m_Mutex.UnlockWrite();
+    }
+}
+
+uint32_t VmaBlockVector::ProcessDefragmentations(
+    class VmaBlockVectorDefragmentationContext *pCtx,
+    VmaDefragmentationPassMoveInfo* pMove, uint32_t maxMoves)
+{
+    VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex);
+    
+    const uint32_t moveCount = std::min(uint32_t(pCtx->defragmentationMoves.size()) - pCtx->defragmentationMovesProcessed, maxMoves);
+
+    for(uint32_t i = pCtx->defragmentationMovesProcessed; i < moveCount; ++ i)
+    {
+        VmaDefragmentationMove& move = pCtx->defragmentationMoves[i];
+
+        pMove->allocation = move.hAllocation;
+        pMove->memory = move.pDstBlock->GetDeviceMemory();
+        pMove->offset = move.dstOffset;
+
+        ++ pMove;
+    }
+
+    pCtx->defragmentationMovesProcessed += moveCount;
+
+    return moveCount;
+}
+
+void VmaBlockVector::CommitDefragmentations(
+    class VmaBlockVectorDefragmentationContext *pCtx,
+    VmaDefragmentationStats* pStats)
+{
+    VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex);
+    
+    for(uint32_t i = pCtx->defragmentationMovesCommitted; i < pCtx->defragmentationMovesProcessed; ++ i)
+    {
+        const VmaDefragmentationMove &move = pCtx->defragmentationMoves[i];
+
+        move.pSrcBlock->m_pMetadata->FreeAtOffset(move.srcOffset);
+        move.hAllocation->ChangeBlockAllocation(m_hAllocator, move.pDstBlock, move.dstOffset);
+    }
+
+    pCtx->defragmentationMovesCommitted = pCtx->defragmentationMovesProcessed;
+    FreeEmptyBlocks(pStats);
+}
+
+size_t VmaBlockVector::CalcAllocationCount() const
+{
+    size_t result = 0;
+    for(size_t i = 0; i < m_Blocks.size(); ++i)
+    {
+        result += m_Blocks[i]->m_pMetadata->GetAllocationCount();
+    }
+    return result;
+}
+
+bool VmaBlockVector::IsBufferImageGranularityConflictPossible() const
+{
+    if(m_BufferImageGranularity == 1)
+    {
+        return false;
+    }
+    VmaSuballocationType lastSuballocType = VMA_SUBALLOCATION_TYPE_FREE;
+    for(size_t i = 0, count = m_Blocks.size(); i < count; ++i)
+    {
+        VmaDeviceMemoryBlock* const pBlock = m_Blocks[i];
+        VMA_ASSERT(m_Algorithm == 0);
+        VmaBlockMetadata_Generic* const pMetadata = (VmaBlockMetadata_Generic*)pBlock->m_pMetadata;
+        if(pMetadata->IsBufferImageGranularityConflictPossible(m_BufferImageGranularity, lastSuballocType))
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+void VmaBlockVector::MakePoolAllocationsLost(
+    uint32_t currentFrameIndex,
+    size_t* pLostAllocationCount)
+{
+    VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex);
+    size_t lostAllocationCount = 0;
+    for(uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)
+    {
+        VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];
+        VMA_ASSERT(pBlock);
+        lostAllocationCount += pBlock->m_pMetadata->MakeAllocationsLost(currentFrameIndex, m_FrameInUseCount);
+    }
+    if(pLostAllocationCount != VMA_NULL)
+    {
+        *pLostAllocationCount = lostAllocationCount;
+    }
+}
+
+VkResult VmaBlockVector::CheckCorruption()
+{
+    if(!IsCorruptionDetectionEnabled())
+    {
+        return VK_ERROR_FEATURE_NOT_PRESENT;
+    }
+
+    VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);
+    for(uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)
+    {
+        VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];
+        VMA_ASSERT(pBlock);
+        VkResult res = pBlock->CheckCorruption(m_hAllocator);
+        if(res != VK_SUCCESS)
+        {
+            return res;
+        }
+    }
+    return VK_SUCCESS;
+}
+
+void VmaBlockVector::AddStats(VmaStats* pStats)
+{
+    const uint32_t memTypeIndex = m_MemoryTypeIndex;
+    const uint32_t memHeapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(memTypeIndex);
+
+    VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);
+
+    for(uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)
+    {
+        const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];
+        VMA_ASSERT(pBlock);
+        VMA_HEAVY_ASSERT(pBlock->Validate());
+        VmaStatInfo allocationStatInfo;
+        pBlock->m_pMetadata->CalcAllocationStatInfo(allocationStatInfo);
+        VmaAddStatInfo(pStats->total, allocationStatInfo);
+        VmaAddStatInfo(pStats->memoryType[memTypeIndex], allocationStatInfo);
+        VmaAddStatInfo(pStats->memoryHeap[memHeapIndex], allocationStatInfo);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaDefragmentationAlgorithm_Generic members definition
+
+VmaDefragmentationAlgorithm_Generic::VmaDefragmentationAlgorithm_Generic(
+    VmaAllocator hAllocator,
+    VmaBlockVector* pBlockVector,
+    uint32_t currentFrameIndex,
+    bool overlappingMoveSupported) :
+    VmaDefragmentationAlgorithm(hAllocator, pBlockVector, currentFrameIndex),
+    m_AllocationCount(0),
+    m_AllAllocations(false),
+    m_BytesMoved(0),
+    m_AllocationsMoved(0),
+    m_Blocks(VmaStlAllocator<BlockInfo*>(hAllocator->GetAllocationCallbacks()))
+{
+    // Create block info for each block.
+    const size_t blockCount = m_pBlockVector->m_Blocks.size();
+    for(size_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)
+    {
+        BlockInfo* pBlockInfo = vma_new(m_hAllocator, BlockInfo)(m_hAllocator->GetAllocationCallbacks());
+        pBlockInfo->m_OriginalBlockIndex = blockIndex;
+        pBlockInfo->m_pBlock = m_pBlockVector->m_Blocks[blockIndex];
+        m_Blocks.push_back(pBlockInfo);
+    }
+
+    // Sort them by m_pBlock pointer value.
+    VMA_SORT(m_Blocks.begin(), m_Blocks.end(), BlockPointerLess());
+}
+
+VmaDefragmentationAlgorithm_Generic::~VmaDefragmentationAlgorithm_Generic()
+{
+    for(size_t i = m_Blocks.size(); i--; )
+    {
+        vma_delete(m_hAllocator, m_Blocks[i]);
+    }
+}
+
+void VmaDefragmentationAlgorithm_Generic::AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged)
+{
+    // Now as we are inside VmaBlockVector::m_Mutex, we can make final check if this allocation was not lost.
+    if(hAlloc->GetLastUseFrameIndex() != VMA_FRAME_INDEX_LOST)
+    {
+        VmaDeviceMemoryBlock* pBlock = hAlloc->GetBlock();
+        BlockInfoVector::iterator it = VmaBinaryFindFirstNotLess(m_Blocks.begin(), m_Blocks.end(), pBlock, BlockPointerLess());
+        if(it != m_Blocks.end() && (*it)->m_pBlock == pBlock)
+        {
+            AllocationInfo allocInfo = AllocationInfo(hAlloc, pChanged);
+            (*it)->m_Allocations.push_back(allocInfo);
+        }
+        else
+        {
+            VMA_ASSERT(0);
+        }
+
+        ++m_AllocationCount;
+    }
+}
+
+VkResult VmaDefragmentationAlgorithm_Generic::DefragmentRound(
+    VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+    VkDeviceSize maxBytesToMove,
+    uint32_t maxAllocationsToMove,
+    bool freeOldAllocations)
+{
+    if(m_Blocks.empty())
+    {
+        return VK_SUCCESS;
+    }
+
+    // This is a choice based on research.
+    // Option 1:
+    uint32_t strategy = VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT;
+    // Option 2:
+    //uint32_t strategy = VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT;
+    // Option 3:
+    //uint32_t strategy = VMA_ALLOCATION_CREATE_STRATEGY_MIN_FRAGMENTATION_BIT;
+
+    size_t srcBlockMinIndex = 0;
+    // When FAST_ALGORITHM, move allocations from only last out of blocks that contain non-movable allocations.
+    /*
+    if(m_AlgorithmFlags & VMA_DEFRAGMENTATION_FAST_ALGORITHM_BIT)
+    {
+        const size_t blocksWithNonMovableCount = CalcBlocksWithNonMovableCount();
+        if(blocksWithNonMovableCount > 0)
+        {
+            srcBlockMinIndex = blocksWithNonMovableCount - 1;
+        }
+    }
+    */
+
+    size_t srcBlockIndex = m_Blocks.size() - 1;
+    size_t srcAllocIndex = SIZE_MAX;
+    for(;;)
+    {
+        // 1. Find next allocation to move.
+        // 1.1. Start from last to first m_Blocks - they are sorted from most "destination" to most "source".
+        // 1.2. Then start from last to first m_Allocations.
+        while(srcAllocIndex >= m_Blocks[srcBlockIndex]->m_Allocations.size())
+        {
+            if(m_Blocks[srcBlockIndex]->m_Allocations.empty())
+            {
+                // Finished: no more allocations to process.
+                if(srcBlockIndex == srcBlockMinIndex)
+                {
+                    return VK_SUCCESS;
+                }
+                else
+                {
+                    --srcBlockIndex;
+                    srcAllocIndex = SIZE_MAX;
+                }
+            }
+            else
+            {
+                srcAllocIndex = m_Blocks[srcBlockIndex]->m_Allocations.size() - 1;
+            }
+        }
+        
+        BlockInfo* pSrcBlockInfo = m_Blocks[srcBlockIndex];
+        AllocationInfo& allocInfo = pSrcBlockInfo->m_Allocations[srcAllocIndex];
+
+        const VkDeviceSize size = allocInfo.m_hAllocation->GetSize();
+        const VkDeviceSize srcOffset = allocInfo.m_hAllocation->GetOffset();
+        const VkDeviceSize alignment = allocInfo.m_hAllocation->GetAlignment();
+        const VmaSuballocationType suballocType = allocInfo.m_hAllocation->GetSuballocationType();
+
+        // 2. Try to find new place for this allocation in preceding or current block.
+        for(size_t dstBlockIndex = 0; dstBlockIndex <= srcBlockIndex; ++dstBlockIndex)
+        {
+            BlockInfo* pDstBlockInfo = m_Blocks[dstBlockIndex];
+            VmaAllocationRequest dstAllocRequest;
+            if(pDstBlockInfo->m_pBlock->m_pMetadata->CreateAllocationRequest(
+                m_CurrentFrameIndex,
+                m_pBlockVector->GetFrameInUseCount(),
+                m_pBlockVector->GetBufferImageGranularity(),
+                size,
+                alignment,
+                false, // upperAddress
+                suballocType,
+                false, // canMakeOtherLost
+                strategy,
+                &dstAllocRequest) &&
+            MoveMakesSense(
+                dstBlockIndex, dstAllocRequest.offset, srcBlockIndex, srcOffset))
+            {
+                VMA_ASSERT(dstAllocRequest.itemsToMakeLostCount == 0);
+
+                // Reached limit on number of allocations or bytes to move.
+                if((m_AllocationsMoved + 1 > maxAllocationsToMove) ||
+                    (m_BytesMoved + size > maxBytesToMove))
+                {
+                    return VK_SUCCESS;
+                }
+
+                VmaDefragmentationMove move = {};
+                move.srcBlockIndex = pSrcBlockInfo->m_OriginalBlockIndex;
+                move.dstBlockIndex = pDstBlockInfo->m_OriginalBlockIndex;
+                move.srcOffset = srcOffset;
+                move.dstOffset = dstAllocRequest.offset;
+                move.size = size;
+                move.hAllocation = allocInfo.m_hAllocation;
+                move.pSrcBlock = pSrcBlockInfo->m_pBlock;
+                move.pDstBlock = pDstBlockInfo->m_pBlock;
+
+                moves.push_back(move);
+
+                pDstBlockInfo->m_pBlock->m_pMetadata->Alloc(
+                    dstAllocRequest,
+                    suballocType,
+                    size,
+                    allocInfo.m_hAllocation);
+
+                if(freeOldAllocations)
+                {
+                    pSrcBlockInfo->m_pBlock->m_pMetadata->FreeAtOffset(srcOffset);
+                    allocInfo.m_hAllocation->ChangeBlockAllocation(m_hAllocator, pDstBlockInfo->m_pBlock, dstAllocRequest.offset);
+                }
+                
+                if(allocInfo.m_pChanged != VMA_NULL)
+                {
+                    *allocInfo.m_pChanged = VK_TRUE;
+                }
+
+                ++m_AllocationsMoved;
+                m_BytesMoved += size;
+
+                VmaVectorRemove(pSrcBlockInfo->m_Allocations, srcAllocIndex);
+
+                break;
+            }
+        }
+
+        // If not processed, this allocInfo remains in pBlockInfo->m_Allocations for next round.
+
+        if(srcAllocIndex > 0)
+        {
+            --srcAllocIndex;
+        }
+        else
+        {
+            if(srcBlockIndex > 0)
+            {
+                --srcBlockIndex;
+                srcAllocIndex = SIZE_MAX;
+            }
+            else
+            {
+                return VK_SUCCESS;
+            }
+        }
+    }
+}
+
+size_t VmaDefragmentationAlgorithm_Generic::CalcBlocksWithNonMovableCount() const
+{
+    size_t result = 0;
+    for(size_t i = 0; i < m_Blocks.size(); ++i)
+    {
+        if(m_Blocks[i]->m_HasNonMovableAllocations)
+        {
+            ++result;
+        }
+    }
+    return result;
+}
+
+VkResult VmaDefragmentationAlgorithm_Generic::Defragment(
+    VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+    VkDeviceSize maxBytesToMove,
+    uint32_t maxAllocationsToMove,
+    VmaDefragmentationFlags flags)
+{
+    if(!m_AllAllocations && m_AllocationCount == 0)
+    {
+        return VK_SUCCESS;
+    }
+
+    const size_t blockCount = m_Blocks.size();
+    for(size_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)
+    {
+        BlockInfo* pBlockInfo = m_Blocks[blockIndex];
+
+        if(m_AllAllocations)
+        {
+            VmaBlockMetadata_Generic* pMetadata = (VmaBlockMetadata_Generic*)pBlockInfo->m_pBlock->m_pMetadata;
+            for(VmaSuballocationList::const_iterator it = pMetadata->m_Suballocations.begin();
+                it != pMetadata->m_Suballocations.end();
+                ++it)
+            {
+                if(it->type != VMA_SUBALLOCATION_TYPE_FREE)
+                {
+                    AllocationInfo allocInfo = AllocationInfo(it->hAllocation, VMA_NULL);
+                    pBlockInfo->m_Allocations.push_back(allocInfo);
+                }
+            }
+        }
+
+        pBlockInfo->CalcHasNonMovableAllocations();
+        
+        // This is a choice based on research.
+        // Option 1:
+        pBlockInfo->SortAllocationsByOffsetDescending();
+        // Option 2:
+        //pBlockInfo->SortAllocationsBySizeDescending();
+    }
+
+    // Sort m_Blocks this time by the main criterium, from most "destination" to most "source" blocks.
+    VMA_SORT(m_Blocks.begin(), m_Blocks.end(), BlockInfoCompareMoveDestination());
+
+    // This is a choice based on research.
+    const uint32_t roundCount = 2;
+
+    // Execute defragmentation rounds (the main part).
+    VkResult result = VK_SUCCESS;
+    for(uint32_t round = 0; (round < roundCount) && (result == VK_SUCCESS); ++round)
+    {
+        result = DefragmentRound(moves, maxBytesToMove, maxAllocationsToMove, !(flags & VMA_DEFRAGMENTATION_FLAG_INCREMENTAL));
+    }
+
+    return result;
+}
+
+bool VmaDefragmentationAlgorithm_Generic::MoveMakesSense(
+        size_t dstBlockIndex, VkDeviceSize dstOffset,
+        size_t srcBlockIndex, VkDeviceSize srcOffset)
+{
+    if(dstBlockIndex < srcBlockIndex)
+    {
+        return true;
+    }
+    if(dstBlockIndex > srcBlockIndex)
+    {
+        return false;
+    }
+    if(dstOffset < srcOffset)
+    {
+        return true;
+    }
+    return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaDefragmentationAlgorithm_Fast
+
+VmaDefragmentationAlgorithm_Fast::VmaDefragmentationAlgorithm_Fast(
+    VmaAllocator hAllocator,
+    VmaBlockVector* pBlockVector,
+    uint32_t currentFrameIndex,
+    bool overlappingMoveSupported) :
+    VmaDefragmentationAlgorithm(hAllocator, pBlockVector, currentFrameIndex),
+    m_OverlappingMoveSupported(overlappingMoveSupported),
+    m_AllocationCount(0),
+    m_AllAllocations(false),
+    m_BytesMoved(0),
+    m_AllocationsMoved(0),
+    m_BlockInfos(VmaStlAllocator<BlockInfo>(hAllocator->GetAllocationCallbacks()))
+{
+    VMA_ASSERT(VMA_DEBUG_MARGIN == 0);
+
+}
+
+VmaDefragmentationAlgorithm_Fast::~VmaDefragmentationAlgorithm_Fast()
+{
+}
+
+VkResult VmaDefragmentationAlgorithm_Fast::Defragment(
+    VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
+    VkDeviceSize maxBytesToMove,
+    uint32_t maxAllocationsToMove,
+    VmaDefragmentationFlags flags)
+{
+    VMA_ASSERT(m_AllAllocations || m_pBlockVector->CalcAllocationCount() == m_AllocationCount);
+
+    const size_t blockCount = m_pBlockVector->GetBlockCount();
+    if(blockCount == 0 || maxBytesToMove == 0 || maxAllocationsToMove == 0)
+    {
+        return VK_SUCCESS;
+    }
+
+    PreprocessMetadata();
+
+    // Sort blocks in order from most destination.
+
+    m_BlockInfos.resize(blockCount);
+    for(size_t i = 0; i < blockCount; ++i)
+    {
+        m_BlockInfos[i].origBlockIndex = i;
+    }
+
+    VMA_SORT(m_BlockInfos.begin(), m_BlockInfos.end(), [this](const BlockInfo& lhs, const BlockInfo& rhs) -> bool {
+        return m_pBlockVector->GetBlock(lhs.origBlockIndex)->m_pMetadata->GetSumFreeSize() <
+            m_pBlockVector->GetBlock(rhs.origBlockIndex)->m_pMetadata->GetSumFreeSize();
+    });
+
+    // THE MAIN ALGORITHM
+
+    FreeSpaceDatabase freeSpaceDb;
+
+    size_t dstBlockInfoIndex = 0;
+    size_t dstOrigBlockIndex = m_BlockInfos[dstBlockInfoIndex].origBlockIndex;
+    VmaDeviceMemoryBlock* pDstBlock = m_pBlockVector->GetBlock(dstOrigBlockIndex);
+    VmaBlockMetadata_Generic* pDstMetadata = (VmaBlockMetadata_Generic*)pDstBlock->m_pMetadata;
+    VkDeviceSize dstBlockSize = pDstMetadata->GetSize();
+    VkDeviceSize dstOffset = 0;
+
+    bool end = false;
+    for(size_t srcBlockInfoIndex = 0; !end && srcBlockInfoIndex < blockCount; ++srcBlockInfoIndex)
+    {
+        const size_t srcOrigBlockIndex = m_BlockInfos[srcBlockInfoIndex].origBlockIndex;
+        VmaDeviceMemoryBlock* const pSrcBlock = m_pBlockVector->GetBlock(srcOrigBlockIndex);
+        VmaBlockMetadata_Generic* const pSrcMetadata = (VmaBlockMetadata_Generic*)pSrcBlock->m_pMetadata;
+        for(VmaSuballocationList::iterator srcSuballocIt = pSrcMetadata->m_Suballocations.begin();
+            !end && srcSuballocIt != pSrcMetadata->m_Suballocations.end(); )
+        {
+            VmaAllocation_T* const pAlloc = srcSuballocIt->hAllocation;
+            const VkDeviceSize srcAllocAlignment = pAlloc->GetAlignment();
+            const VkDeviceSize srcAllocSize = srcSuballocIt->size;
+            if(m_AllocationsMoved == maxAllocationsToMove ||
+                m_BytesMoved + srcAllocSize > maxBytesToMove)
+            {
+                end = true;
+                break;
+            }
+            const VkDeviceSize srcAllocOffset = srcSuballocIt->offset;
+
+            VmaDefragmentationMove move = {};
+            // Try to place it in one of free spaces from the database.
+            size_t freeSpaceInfoIndex;
+            VkDeviceSize dstAllocOffset;
+            if(freeSpaceDb.Fetch(srcAllocAlignment, srcAllocSize,
+                freeSpaceInfoIndex, dstAllocOffset))
+            {
+                size_t freeSpaceOrigBlockIndex = m_BlockInfos[freeSpaceInfoIndex].origBlockIndex;
+                VmaDeviceMemoryBlock* pFreeSpaceBlock = m_pBlockVector->GetBlock(freeSpaceOrigBlockIndex);
+                VmaBlockMetadata_Generic* pFreeSpaceMetadata = (VmaBlockMetadata_Generic*)pFreeSpaceBlock->m_pMetadata;
+
+                // Same block
+                if(freeSpaceInfoIndex == srcBlockInfoIndex)
+                {
+                    VMA_ASSERT(dstAllocOffset <= srcAllocOffset);
+
+                    // MOVE OPTION 1: Move the allocation inside the same block by decreasing offset.
+
+                    VmaSuballocation suballoc = *srcSuballocIt;
+                    suballoc.offset = dstAllocOffset;
+                    suballoc.hAllocation->ChangeOffset(dstAllocOffset);
+                    m_BytesMoved += srcAllocSize;
+                    ++m_AllocationsMoved;
+                    
+                    VmaSuballocationList::iterator nextSuballocIt = srcSuballocIt;
+                    ++nextSuballocIt;
+                    pSrcMetadata->m_Suballocations.erase(srcSuballocIt);
+                    srcSuballocIt = nextSuballocIt;
+
+                    InsertSuballoc(pFreeSpaceMetadata, suballoc);
+
+                    move.srcBlockIndex = srcOrigBlockIndex;
+                    move.dstBlockIndex = freeSpaceOrigBlockIndex;
+                    move.srcOffset = srcAllocOffset;
+                    move.dstOffset = dstAllocOffset;
+                    move.size = srcAllocSize;
+                    
+                    moves.push_back(move);
+                }
+                // Different block
+                else
+                {
+                    // MOVE OPTION 2: Move the allocation to a different block.
+
+                    VMA_ASSERT(freeSpaceInfoIndex < srcBlockInfoIndex);
+
+                    VmaSuballocation suballoc = *srcSuballocIt;
+                    suballoc.offset = dstAllocOffset;
+                    suballoc.hAllocation->ChangeBlockAllocation(m_hAllocator, pFreeSpaceBlock, dstAllocOffset);
+                    m_BytesMoved += srcAllocSize;
+                    ++m_AllocationsMoved;
+
+                    VmaSuballocationList::iterator nextSuballocIt = srcSuballocIt;
+                    ++nextSuballocIt;
+                    pSrcMetadata->m_Suballocations.erase(srcSuballocIt);
+                    srcSuballocIt = nextSuballocIt;
+
+                    InsertSuballoc(pFreeSpaceMetadata, suballoc);
+
+                    move.srcBlockIndex = srcOrigBlockIndex;
+                    move.dstBlockIndex = freeSpaceOrigBlockIndex;
+                    move.srcOffset = srcAllocOffset;
+                    move.dstOffset = dstAllocOffset;
+                    move.size = srcAllocSize;
+                    
+                    moves.push_back(move);
+                }
+            }
+            else
+            {
+                dstAllocOffset = VmaAlignUp(dstOffset, srcAllocAlignment);
+
+                // If the allocation doesn't fit before the end of dstBlock, forward to next block.
+                while(dstBlockInfoIndex < srcBlockInfoIndex &&
+                    dstAllocOffset + srcAllocSize > dstBlockSize)
+                {
+                    // But before that, register remaining free space at the end of dst block.
+                    freeSpaceDb.Register(dstBlockInfoIndex, dstOffset, dstBlockSize - dstOffset);
+
+                    ++dstBlockInfoIndex;
+                    dstOrigBlockIndex = m_BlockInfos[dstBlockInfoIndex].origBlockIndex;
+                    pDstBlock = m_pBlockVector->GetBlock(dstOrigBlockIndex);
+                    pDstMetadata = (VmaBlockMetadata_Generic*)pDstBlock->m_pMetadata;
+                    dstBlockSize = pDstMetadata->GetSize();
+                    dstOffset = 0;
+                    dstAllocOffset = 0;
+                }
+
+                // Same block
+                if(dstBlockInfoIndex == srcBlockInfoIndex)
+                {
+                    VMA_ASSERT(dstAllocOffset <= srcAllocOffset);
+
+                    const bool overlap = dstAllocOffset + srcAllocSize > srcAllocOffset;
+
+                    bool skipOver = overlap;
+                    if(overlap && m_OverlappingMoveSupported && dstAllocOffset < srcAllocOffset)
+                    {
+                        // If destination and source place overlap, skip if it would move it
+                        // by only < 1/64 of its size.
+                        skipOver = (srcAllocOffset - dstAllocOffset) * 64 < srcAllocSize;
+                    }
+
+                    if(skipOver)
+                    {
+                        freeSpaceDb.Register(dstBlockInfoIndex, dstOffset, srcAllocOffset - dstOffset);
+
+                        dstOffset = srcAllocOffset + srcAllocSize;
+                        ++srcSuballocIt;
+                    }
+                    // MOVE OPTION 1: Move the allocation inside the same block by decreasing offset.
+                    else
+                    {
+                        srcSuballocIt->offset = dstAllocOffset;
+                        srcSuballocIt->hAllocation->ChangeOffset(dstAllocOffset);
+                        dstOffset = dstAllocOffset + srcAllocSize;
+                        m_BytesMoved += srcAllocSize;
+                        ++m_AllocationsMoved;
+                        ++srcSuballocIt;
+                        
+                        move.srcBlockIndex = srcOrigBlockIndex;
+                        move.dstBlockIndex = dstOrigBlockIndex;
+                        move.srcOffset = srcAllocOffset;
+                        move.dstOffset = dstAllocOffset;
+                        move.size = srcAllocSize;
+                        
+                        moves.push_back(move);
+                    }
+                }
+                // Different block
+                else
+                {
+                    // MOVE OPTION 2: Move the allocation to a different block.
+
+                    VMA_ASSERT(dstBlockInfoIndex < srcBlockInfoIndex);
+                    VMA_ASSERT(dstAllocOffset + srcAllocSize <= dstBlockSize);
+
+                    VmaSuballocation suballoc = *srcSuballocIt;
+                    suballoc.offset = dstAllocOffset;
+                    suballoc.hAllocation->ChangeBlockAllocation(m_hAllocator, pDstBlock, dstAllocOffset);
+                    dstOffset = dstAllocOffset + srcAllocSize;
+                    m_BytesMoved += srcAllocSize;
+                    ++m_AllocationsMoved;
+
+                    VmaSuballocationList::iterator nextSuballocIt = srcSuballocIt;
+                    ++nextSuballocIt;
+                    pSrcMetadata->m_Suballocations.erase(srcSuballocIt);
+                    srcSuballocIt = nextSuballocIt;
+
+                    pDstMetadata->m_Suballocations.push_back(suballoc);
+
+                    move.srcBlockIndex = srcOrigBlockIndex;
+                    move.dstBlockIndex = dstOrigBlockIndex;
+                    move.srcOffset = srcAllocOffset;
+                    move.dstOffset = dstAllocOffset;
+                    move.size = srcAllocSize;
+                    
+                    moves.push_back(move);
+                }
+            }
+        }
+    }
+
+    m_BlockInfos.clear();
+    
+    PostprocessMetadata();
+
+    return VK_SUCCESS;
+}
+
+void VmaDefragmentationAlgorithm_Fast::PreprocessMetadata()
+{
+    const size_t blockCount = m_pBlockVector->GetBlockCount();
+    for(size_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)
+    {
+        VmaBlockMetadata_Generic* const pMetadata =
+            (VmaBlockMetadata_Generic*)m_pBlockVector->GetBlock(blockIndex)->m_pMetadata;
+        pMetadata->m_FreeCount = 0;
+        pMetadata->m_SumFreeSize = pMetadata->GetSize();
+        pMetadata->m_FreeSuballocationsBySize.clear();
+        for(VmaSuballocationList::iterator it = pMetadata->m_Suballocations.begin();
+            it != pMetadata->m_Suballocations.end(); )
+        {
+            if(it->type == VMA_SUBALLOCATION_TYPE_FREE)
+            {
+                VmaSuballocationList::iterator nextIt = it;
+                ++nextIt;
+                pMetadata->m_Suballocations.erase(it);
+                it = nextIt;
+            }
+            else
+            {
+                ++it;
+            }
+        }
+    }
+}
+
+void VmaDefragmentationAlgorithm_Fast::PostprocessMetadata()
+{
+    const size_t blockCount = m_pBlockVector->GetBlockCount();
+    for(size_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)
+    {
+        VmaBlockMetadata_Generic* const pMetadata =
+            (VmaBlockMetadata_Generic*)m_pBlockVector->GetBlock(blockIndex)->m_pMetadata;
+        const VkDeviceSize blockSize = pMetadata->GetSize();
+        
+        // No allocations in this block - entire area is free.
+        if(pMetadata->m_Suballocations.empty())
+        {
+            pMetadata->m_FreeCount = 1;
+            //pMetadata->m_SumFreeSize is already set to blockSize.
+            VmaSuballocation suballoc = {
+                0, // offset
+                blockSize, // size
+                VMA_NULL, // hAllocation
+                VMA_SUBALLOCATION_TYPE_FREE };
+            pMetadata->m_Suballocations.push_back(suballoc);
+            pMetadata->RegisterFreeSuballocation(pMetadata->m_Suballocations.begin());
+        }
+        // There are some allocations in this block.
+        else
+        {
+            VkDeviceSize offset = 0;
+            VmaSuballocationList::iterator it;
+            for(it = pMetadata->m_Suballocations.begin();
+                it != pMetadata->m_Suballocations.end();
+                ++it)
+            {
+                VMA_ASSERT(it->type != VMA_SUBALLOCATION_TYPE_FREE);
+                VMA_ASSERT(it->offset >= offset);
+
+                // Need to insert preceding free space.
+                if(it->offset > offset)
+                {
+                    ++pMetadata->m_FreeCount;
+                    const VkDeviceSize freeSize = it->offset - offset;
+                    VmaSuballocation suballoc = {
+                        offset, // offset
+                        freeSize, // size
+                        VMA_NULL, // hAllocation
+                        VMA_SUBALLOCATION_TYPE_FREE };
+                    VmaSuballocationList::iterator precedingFreeIt = pMetadata->m_Suballocations.insert(it, suballoc);
+                    if(freeSize >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+                    {
+                        pMetadata->m_FreeSuballocationsBySize.push_back(precedingFreeIt);
+                    }
+                }
+
+                pMetadata->m_SumFreeSize -= it->size;
+                offset = it->offset + it->size;
+            }
+
+            // Need to insert trailing free space.
+            if(offset < blockSize)
+            {
+                ++pMetadata->m_FreeCount;
+                const VkDeviceSize freeSize = blockSize - offset;
+                VmaSuballocation suballoc = {
+                    offset, // offset
+                    freeSize, // size
+                    VMA_NULL, // hAllocation
+                    VMA_SUBALLOCATION_TYPE_FREE };
+                VMA_ASSERT(it == pMetadata->m_Suballocations.end());
+                VmaSuballocationList::iterator trailingFreeIt = pMetadata->m_Suballocations.insert(it, suballoc);
+                if(freeSize > VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER)
+                {
+                    pMetadata->m_FreeSuballocationsBySize.push_back(trailingFreeIt);
+                }
+            }
+
+            VMA_SORT(
+                pMetadata->m_FreeSuballocationsBySize.begin(),
+                pMetadata->m_FreeSuballocationsBySize.end(),
+                VmaSuballocationItemSizeLess());
+        }
+
+        VMA_HEAVY_ASSERT(pMetadata->Validate());
+    }
+}
+
+void VmaDefragmentationAlgorithm_Fast::InsertSuballoc(VmaBlockMetadata_Generic* pMetadata, const VmaSuballocation& suballoc)
+{
+    // TODO: Optimize somehow. Remember iterator instead of searching for it linearly.
+    VmaSuballocationList::iterator it = pMetadata->m_Suballocations.begin();
+    while(it != pMetadata->m_Suballocations.end())
+    {
+        if(it->offset < suballoc.offset)
+        {
+            ++it;
+        }
+    }
+    pMetadata->m_Suballocations.insert(it, suballoc);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaBlockVectorDefragmentationContext
+
+VmaBlockVectorDefragmentationContext::VmaBlockVectorDefragmentationContext(
+    VmaAllocator hAllocator,
+    VmaPool hCustomPool,
+    VmaBlockVector* pBlockVector,
+    uint32_t currFrameIndex) :
+    res(VK_SUCCESS),
+    mutexLocked(false),
+    blockContexts(VmaStlAllocator<VmaBlockDefragmentationContext>(hAllocator->GetAllocationCallbacks())),
+    defragmentationMoves(VmaStlAllocator<VmaDefragmentationMove>(hAllocator->GetAllocationCallbacks())),
+    defragmentationMovesProcessed(0),
+    defragmentationMovesCommitted(0),
+    hasDefragmentationPlan(0),
+    m_hAllocator(hAllocator),
+    m_hCustomPool(hCustomPool),
+    m_pBlockVector(pBlockVector),
+    m_CurrFrameIndex(currFrameIndex),
+    m_pAlgorithm(VMA_NULL),
+    m_Allocations(VmaStlAllocator<AllocInfo>(hAllocator->GetAllocationCallbacks())),
+    m_AllAllocations(false)
+{
+}
+
+VmaBlockVectorDefragmentationContext::~VmaBlockVectorDefragmentationContext()
+{
+    vma_delete(m_hAllocator, m_pAlgorithm);
+}
+
+void VmaBlockVectorDefragmentationContext::AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged)
+{
+    AllocInfo info = { hAlloc, pChanged };
+    m_Allocations.push_back(info);
+}
+
+void VmaBlockVectorDefragmentationContext::Begin(bool overlappingMoveSupported, VmaDefragmentationFlags flags)
+{
+    const bool allAllocations = m_AllAllocations ||
+        m_Allocations.size() == m_pBlockVector->CalcAllocationCount();
+
+    /********************************
+    HERE IS THE CHOICE OF DEFRAGMENTATION ALGORITHM.
+    ********************************/
+
+    /*
+    Fast algorithm is supported only when certain criteria are met:
+    - VMA_DEBUG_MARGIN is 0.
+    - All allocations in this block vector are moveable.
+    - There is no possibility of image/buffer granularity conflict.
+    - The defragmentation is not incremental
+    */
+    if(VMA_DEBUG_MARGIN == 0 &&
+        allAllocations &&
+        !m_pBlockVector->IsBufferImageGranularityConflictPossible() &&
+        !(flags & VMA_DEFRAGMENTATION_FLAG_INCREMENTAL))
+    {
+        m_pAlgorithm = vma_new(m_hAllocator, VmaDefragmentationAlgorithm_Fast)(
+            m_hAllocator, m_pBlockVector, m_CurrFrameIndex, overlappingMoveSupported);
+    }
+    else
+    {
+        m_pAlgorithm = vma_new(m_hAllocator, VmaDefragmentationAlgorithm_Generic)(
+            m_hAllocator, m_pBlockVector, m_CurrFrameIndex, overlappingMoveSupported);
+    }
+
+    if(allAllocations)
+    {
+        m_pAlgorithm->AddAll();
+    }
+    else
+    {
+        for(size_t i = 0, count = m_Allocations.size(); i < count; ++i)
+        {
+            m_pAlgorithm->AddAllocation(m_Allocations[i].hAlloc, m_Allocations[i].pChanged);
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaDefragmentationContext
+
+VmaDefragmentationContext_T::VmaDefragmentationContext_T(
+    VmaAllocator hAllocator,
+    uint32_t currFrameIndex,
+    uint32_t flags,
+    VmaDefragmentationStats* pStats) :
+    m_hAllocator(hAllocator),
+    m_CurrFrameIndex(currFrameIndex),
+    m_Flags(flags),
+    m_pStats(pStats),
+    m_CustomPoolContexts(VmaStlAllocator<VmaBlockVectorDefragmentationContext*>(hAllocator->GetAllocationCallbacks()))
+{
+    memset(m_DefaultPoolContexts, 0, sizeof(m_DefaultPoolContexts));
+}
+
+VmaDefragmentationContext_T::~VmaDefragmentationContext_T()
+{
+    for(size_t i = m_CustomPoolContexts.size(); i--; )
+    {
+        VmaBlockVectorDefragmentationContext* pBlockVectorCtx = m_CustomPoolContexts[i];
+        pBlockVectorCtx->GetBlockVector()->DefragmentationEnd(pBlockVectorCtx, m_pStats);
+        vma_delete(m_hAllocator, pBlockVectorCtx);
+    }
+    for(size_t i = m_hAllocator->m_MemProps.memoryTypeCount; i--; )
+    {
+        VmaBlockVectorDefragmentationContext* pBlockVectorCtx = m_DefaultPoolContexts[i];
+        if(pBlockVectorCtx)
+        {
+            pBlockVectorCtx->GetBlockVector()->DefragmentationEnd(pBlockVectorCtx, m_pStats);
+            vma_delete(m_hAllocator, pBlockVectorCtx);
+        }
+    }
+}
+
+void VmaDefragmentationContext_T::AddPools(uint32_t poolCount, VmaPool* pPools)
+{
+    for(uint32_t poolIndex = 0; poolIndex < poolCount; ++poolIndex)
+    {
+        VmaPool pool = pPools[poolIndex];
+        VMA_ASSERT(pool);
+        // Pools with algorithm other than default are not defragmented.
+        if(pool->m_BlockVector.GetAlgorithm() == 0)
+        {
+            VmaBlockVectorDefragmentationContext* pBlockVectorDefragCtx = VMA_NULL;
+            
+            for(size_t i = m_CustomPoolContexts.size(); i--; )
+            {
+                if(m_CustomPoolContexts[i]->GetCustomPool() == pool)
+                {
+                    pBlockVectorDefragCtx = m_CustomPoolContexts[i];
+                    break;
+                }
+            }
+            
+            if(!pBlockVectorDefragCtx)
+            {
+                pBlockVectorDefragCtx = vma_new(m_hAllocator, VmaBlockVectorDefragmentationContext)(
+                    m_hAllocator,
+                    pool,
+                    &pool->m_BlockVector,
+                    m_CurrFrameIndex);
+                m_CustomPoolContexts.push_back(pBlockVectorDefragCtx);
+            }
+
+            pBlockVectorDefragCtx->AddAll();
+        }
+    }
+}
+
+void VmaDefragmentationContext_T::AddAllocations(
+    uint32_t allocationCount,
+    VmaAllocation* pAllocations,
+    VkBool32* pAllocationsChanged)
+{
+    // Dispatch pAllocations among defragmentators. Create them when necessary.
+    for(uint32_t allocIndex = 0; allocIndex < allocationCount; ++allocIndex)
+    {
+        const VmaAllocation hAlloc = pAllocations[allocIndex];
+        VMA_ASSERT(hAlloc);
+        // DedicatedAlloc cannot be defragmented.
+        if((hAlloc->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK) &&
+            // Lost allocation cannot be defragmented.
+            (hAlloc->GetLastUseFrameIndex() != VMA_FRAME_INDEX_LOST))
+        {
+            VmaBlockVectorDefragmentationContext* pBlockVectorDefragCtx = VMA_NULL;
+
+            const VmaPool hAllocPool = hAlloc->GetBlock()->GetParentPool();
+            // This allocation belongs to custom pool.
+            if(hAllocPool != VK_NULL_HANDLE)
+            {
+                // Pools with algorithm other than default are not defragmented.
+                if(hAllocPool->m_BlockVector.GetAlgorithm() == 0)
+                {
+                    for(size_t i = m_CustomPoolContexts.size(); i--; )
+                    {
+                        if(m_CustomPoolContexts[i]->GetCustomPool() == hAllocPool)
+                        {
+                            pBlockVectorDefragCtx = m_CustomPoolContexts[i];
+                            break;
+                        }
+                    }
+                    if(!pBlockVectorDefragCtx)
+                    {
+                        pBlockVectorDefragCtx = vma_new(m_hAllocator, VmaBlockVectorDefragmentationContext)(
+                            m_hAllocator,
+                            hAllocPool,
+                            &hAllocPool->m_BlockVector,
+                            m_CurrFrameIndex);
+                        m_CustomPoolContexts.push_back(pBlockVectorDefragCtx);
+                    }
+                }
+            }
+            // This allocation belongs to default pool.
+            else
+            {
+                const uint32_t memTypeIndex = hAlloc->GetMemoryTypeIndex();
+                pBlockVectorDefragCtx = m_DefaultPoolContexts[memTypeIndex];
+                if(!pBlockVectorDefragCtx)
+                {
+                    pBlockVectorDefragCtx = vma_new(m_hAllocator, VmaBlockVectorDefragmentationContext)(
+                        m_hAllocator,
+                        VMA_NULL, // hCustomPool
+                        m_hAllocator->m_pBlockVectors[memTypeIndex],
+                        m_CurrFrameIndex);
+                    m_DefaultPoolContexts[memTypeIndex] = pBlockVectorDefragCtx;
+                }
+            }
+
+            if(pBlockVectorDefragCtx)
+            {
+                VkBool32* const pChanged = (pAllocationsChanged != VMA_NULL) ?
+                    &pAllocationsChanged[allocIndex] : VMA_NULL;
+                pBlockVectorDefragCtx->AddAllocation(hAlloc, pChanged);
+            }
+        }
+    }
+}
+
+VkResult VmaDefragmentationContext_T::Defragment(
+    VkDeviceSize maxCpuBytesToMove, uint32_t maxCpuAllocationsToMove,
+    VkDeviceSize maxGpuBytesToMove, uint32_t maxGpuAllocationsToMove,
+    VkCommandBuffer commandBuffer, VmaDefragmentationStats* pStats, VmaDefragmentationFlags flags)
+{
+    if(pStats)
+    {
+        memset(pStats, 0, sizeof(VmaDefragmentationStats));
+    }
+
+    if(flags & VMA_DEFRAGMENTATION_FLAG_INCREMENTAL)
+    {
+        // For incremental defragmetnations, we just earmark how much we can move
+        // The real meat is in the defragmentation steps
+        m_MaxCpuBytesToMove = maxCpuBytesToMove;
+        m_MaxCpuAllocationsToMove = maxCpuAllocationsToMove;
+
+        m_MaxGpuBytesToMove = maxGpuBytesToMove;
+        m_MaxGpuAllocationsToMove = maxGpuAllocationsToMove;
+
+        if(m_MaxCpuBytesToMove == 0 && m_MaxCpuAllocationsToMove == 0 &&
+            m_MaxGpuBytesToMove == 0 && m_MaxGpuAllocationsToMove == 0)
+            return VK_SUCCESS;
+
+        return VK_NOT_READY;
+    }
+
+    if(commandBuffer == VK_NULL_HANDLE)
+    {
+        maxGpuBytesToMove = 0;
+        maxGpuAllocationsToMove = 0;
+    }
+
+    VkResult res = VK_SUCCESS;
+
+    // Process default pools.
+    for(uint32_t memTypeIndex = 0;
+        memTypeIndex < m_hAllocator->GetMemoryTypeCount() && res >= VK_SUCCESS;
+        ++memTypeIndex)
+    {
+        VmaBlockVectorDefragmentationContext* pBlockVectorCtx = m_DefaultPoolContexts[memTypeIndex];
+        if(pBlockVectorCtx)
+        {
+            VMA_ASSERT(pBlockVectorCtx->GetBlockVector());
+            pBlockVectorCtx->GetBlockVector()->Defragment(
+                pBlockVectorCtx,
+                pStats, flags,
+                maxCpuBytesToMove, maxCpuAllocationsToMove,
+                maxGpuBytesToMove, maxGpuAllocationsToMove,
+                commandBuffer);
+            if(pBlockVectorCtx->res != VK_SUCCESS)
+            {
+                res = pBlockVectorCtx->res;
+            }
+        }
+    }
+
+    // Process custom pools.
+    for(size_t customCtxIndex = 0, customCtxCount = m_CustomPoolContexts.size();
+        customCtxIndex < customCtxCount && res >= VK_SUCCESS;
+        ++customCtxIndex)
+    {
+        VmaBlockVectorDefragmentationContext* pBlockVectorCtx = m_CustomPoolContexts[customCtxIndex];
+        VMA_ASSERT(pBlockVectorCtx && pBlockVectorCtx->GetBlockVector());
+        pBlockVectorCtx->GetBlockVector()->Defragment(
+            pBlockVectorCtx,
+            pStats, flags,
+            maxCpuBytesToMove, maxCpuAllocationsToMove,
+            maxGpuBytesToMove, maxGpuAllocationsToMove,
+            commandBuffer);
+        if(pBlockVectorCtx->res != VK_SUCCESS)
+        {
+            res = pBlockVectorCtx->res;
+        }
+    }
+
+    return res;
+}
+
+VkResult VmaDefragmentationContext_T::DefragmentPassBegin(VmaDefragmentationPassInfo* pInfo)
+{
+    VmaDefragmentationPassMoveInfo* pCurrentMove = pInfo->pMoves;
+    uint32_t movesLeft = pInfo->moveCount;
+
+    // Process default pools.
+    for(uint32_t memTypeIndex = 0;
+        memTypeIndex < m_hAllocator->GetMemoryTypeCount();
+        ++memTypeIndex)
+    {
+        VmaBlockVectorDefragmentationContext *pBlockVectorCtx = m_DefaultPoolContexts[memTypeIndex];
+        if(pBlockVectorCtx)
+        {
+            VMA_ASSERT(pBlockVectorCtx->GetBlockVector());
+
+            if(!pBlockVectorCtx->hasDefragmentationPlan)
+            {
+                pBlockVectorCtx->GetBlockVector()->Defragment(
+                    pBlockVectorCtx,
+                    m_pStats, m_Flags,
+                    m_MaxCpuBytesToMove, m_MaxCpuAllocationsToMove,
+                    m_MaxGpuBytesToMove, m_MaxGpuAllocationsToMove,
+                    VK_NULL_HANDLE);
+
+                if(pBlockVectorCtx->res < VK_SUCCESS)
+                    continue;
+
+                pBlockVectorCtx->hasDefragmentationPlan = true;
+            }
+
+            const uint32_t processed = pBlockVectorCtx->GetBlockVector()->ProcessDefragmentations(
+                pBlockVectorCtx,
+                pCurrentMove, movesLeft);
+
+            movesLeft -= processed;
+            pCurrentMove += processed;
+        }
+    }
+
+    // Process custom pools.
+    for(size_t customCtxIndex = 0, customCtxCount = m_CustomPoolContexts.size();
+        customCtxIndex < customCtxCount;
+        ++customCtxIndex)
+    {
+        VmaBlockVectorDefragmentationContext *pBlockVectorCtx = m_CustomPoolContexts[customCtxIndex];
+        VMA_ASSERT(pBlockVectorCtx && pBlockVectorCtx->GetBlockVector());
+
+        if(!pBlockVectorCtx->hasDefragmentationPlan)
+        {
+            pBlockVectorCtx->GetBlockVector()->Defragment(
+                pBlockVectorCtx,
+                m_pStats, m_Flags,
+                m_MaxCpuBytesToMove, m_MaxCpuAllocationsToMove,
+                m_MaxGpuBytesToMove, m_MaxGpuAllocationsToMove,
+                VK_NULL_HANDLE);
+
+            if(pBlockVectorCtx->res < VK_SUCCESS)
+                continue;
+
+            pBlockVectorCtx->hasDefragmentationPlan = true;
+        }
+
+        const uint32_t processed = pBlockVectorCtx->GetBlockVector()->ProcessDefragmentations(
+            pBlockVectorCtx,
+            pCurrentMove, movesLeft);
+
+        movesLeft -= processed;
+        pCurrentMove += processed;
+    }
+
+    pInfo->moveCount = pInfo->moveCount - movesLeft;
+
+    return VK_SUCCESS;
+}
+VkResult VmaDefragmentationContext_T::DefragmentPassEnd()
+{
+    VkResult res = VK_SUCCESS;
+
+    // Process default pools.
+    for(uint32_t memTypeIndex = 0;
+        memTypeIndex < m_hAllocator->GetMemoryTypeCount();
+        ++memTypeIndex)
+    {
+        VmaBlockVectorDefragmentationContext *pBlockVectorCtx = m_DefaultPoolContexts[memTypeIndex];
+        if(pBlockVectorCtx)
+        {
+            VMA_ASSERT(pBlockVectorCtx->GetBlockVector());
+
+            if(!pBlockVectorCtx->hasDefragmentationPlan)
+            {
+                res = VK_NOT_READY;
+                continue;
+            }
+
+            pBlockVectorCtx->GetBlockVector()->CommitDefragmentations(
+                pBlockVectorCtx, m_pStats);
+
+            if(pBlockVectorCtx->defragmentationMoves.size() != pBlockVectorCtx->defragmentationMovesCommitted)
+                res = VK_NOT_READY;
+        }
+    }
+
+    // Process custom pools.
+    for(size_t customCtxIndex = 0, customCtxCount = m_CustomPoolContexts.size();
+        customCtxIndex < customCtxCount;
+        ++customCtxIndex)
+    {
+        VmaBlockVectorDefragmentationContext *pBlockVectorCtx = m_CustomPoolContexts[customCtxIndex];
+        VMA_ASSERT(pBlockVectorCtx && pBlockVectorCtx->GetBlockVector());
+
+        if(!pBlockVectorCtx->hasDefragmentationPlan)
+        {
+            res = VK_NOT_READY;
+            continue;
+        }
+
+        pBlockVectorCtx->GetBlockVector()->CommitDefragmentations(
+            pBlockVectorCtx, m_pStats);
+
+        if(pBlockVectorCtx->defragmentationMoves.size() != pBlockVectorCtx->defragmentationMovesCommitted)
+            res = VK_NOT_READY;
+    }
+
+    return res;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaRecorder
+
+#if VMA_RECORDING_ENABLED
+
+VmaRecorder::VmaRecorder() :
+    m_UseMutex(true),
+    m_Flags(0),
+    m_File(VMA_NULL),
+    m_Freq(INT64_MAX),
+    m_StartCounter(INT64_MAX)
+{
+}
+
+VkResult VmaRecorder::Init(const VmaRecordSettings& settings, bool useMutex)
+{
+    m_UseMutex = useMutex;
+    m_Flags = settings.flags;
+
+    QueryPerformanceFrequency((LARGE_INTEGER*)&m_Freq);
+    QueryPerformanceCounter((LARGE_INTEGER*)&m_StartCounter);
+
+    // Open file for writing.
+    errno_t err = fopen_s(&m_File, settings.pFilePath, "wb");
+    if(err != 0)
+    {
+        return VK_ERROR_INITIALIZATION_FAILED;
+    }
+
+    // Write header.
+    fprintf(m_File, "%s\n", "Vulkan Memory Allocator,Calls recording");
+    fprintf(m_File, "%s\n", "1,8");
+
+    return VK_SUCCESS;
+}
+
+VmaRecorder::~VmaRecorder()
+{
+    if(m_File != VMA_NULL)
+    {
+        fclose(m_File);
+    }
+}
+
+void VmaRecorder::RecordCreateAllocator(uint32_t frameIndex)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaCreateAllocator\n", callParams.threadId, callParams.time, frameIndex);
+    Flush();
+}
+
+void VmaRecorder::RecordDestroyAllocator(uint32_t frameIndex)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaDestroyAllocator\n", callParams.threadId, callParams.time, frameIndex);
+    Flush();
+}
+
+void VmaRecorder::RecordCreatePool(uint32_t frameIndex, const VmaPoolCreateInfo& createInfo, VmaPool pool)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaCreatePool,%u,%u,%llu,%llu,%llu,%u,%p\n", callParams.threadId, callParams.time, frameIndex,
+        createInfo.memoryTypeIndex,
+        createInfo.flags,
+        createInfo.blockSize,
+        (uint64_t)createInfo.minBlockCount,
+        (uint64_t)createInfo.maxBlockCount,
+        createInfo.frameInUseCount,
+        pool);
+    Flush();
+}
+
+void VmaRecorder::RecordDestroyPool(uint32_t frameIndex, VmaPool pool)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaDestroyPool,%p\n", callParams.threadId, callParams.time, frameIndex,
+        pool);
+    Flush();
+}
+
+void VmaRecorder::RecordAllocateMemory(uint32_t frameIndex,
+        const VkMemoryRequirements& vkMemReq,
+        const VmaAllocationCreateInfo& createInfo,
+        VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(createInfo.flags, createInfo.pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaAllocateMemory,%llu,%llu,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex,
+        vkMemReq.size,
+        vkMemReq.alignment,
+        vkMemReq.memoryTypeBits,
+        createInfo.flags,
+        createInfo.usage,
+        createInfo.requiredFlags,
+        createInfo.preferredFlags,
+        createInfo.memoryTypeBits,
+        createInfo.pool,
+        allocation,
+        userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordAllocateMemoryPages(uint32_t frameIndex,
+    const VkMemoryRequirements& vkMemReq,
+    const VmaAllocationCreateInfo& createInfo,
+    uint64_t allocationCount,
+    const VmaAllocation* pAllocations)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(createInfo.flags, createInfo.pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaAllocateMemoryPages,%llu,%llu,%u,%u,%u,%u,%u,%u,%p,", callParams.threadId, callParams.time, frameIndex,
+        vkMemReq.size,
+        vkMemReq.alignment,
+        vkMemReq.memoryTypeBits,
+        createInfo.flags,
+        createInfo.usage,
+        createInfo.requiredFlags,
+        createInfo.preferredFlags,
+        createInfo.memoryTypeBits,
+        createInfo.pool);
+    PrintPointerList(allocationCount, pAllocations);
+    fprintf(m_File, ",%s\n", userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordAllocateMemoryForBuffer(uint32_t frameIndex,
+    const VkMemoryRequirements& vkMemReq,
+    bool requiresDedicatedAllocation,
+    bool prefersDedicatedAllocation,
+    const VmaAllocationCreateInfo& createInfo,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(createInfo.flags, createInfo.pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaAllocateMemoryForBuffer,%llu,%llu,%u,%u,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex,
+        vkMemReq.size,
+        vkMemReq.alignment,
+        vkMemReq.memoryTypeBits,
+        requiresDedicatedAllocation ? 1 : 0,
+        prefersDedicatedAllocation ? 1 : 0,
+        createInfo.flags,
+        createInfo.usage,
+        createInfo.requiredFlags,
+        createInfo.preferredFlags,
+        createInfo.memoryTypeBits,
+        createInfo.pool,
+        allocation,
+        userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordAllocateMemoryForImage(uint32_t frameIndex,
+    const VkMemoryRequirements& vkMemReq,
+    bool requiresDedicatedAllocation,
+    bool prefersDedicatedAllocation,
+    const VmaAllocationCreateInfo& createInfo,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(createInfo.flags, createInfo.pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaAllocateMemoryForImage,%llu,%llu,%u,%u,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex,
+        vkMemReq.size,
+        vkMemReq.alignment,
+        vkMemReq.memoryTypeBits,
+        requiresDedicatedAllocation ? 1 : 0,
+        prefersDedicatedAllocation ? 1 : 0,
+        createInfo.flags,
+        createInfo.usage,
+        createInfo.requiredFlags,
+        createInfo.preferredFlags,
+        createInfo.memoryTypeBits,
+        createInfo.pool,
+        allocation,
+        userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordFreeMemory(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaFreeMemory,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordFreeMemoryPages(uint32_t frameIndex,
+    uint64_t allocationCount,
+    const VmaAllocation* pAllocations)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaFreeMemoryPages,", callParams.threadId, callParams.time, frameIndex);
+    PrintPointerList(allocationCount, pAllocations);
+    fprintf(m_File, "\n");
+    Flush();
+}
+
+void VmaRecorder::RecordSetAllocationUserData(uint32_t frameIndex,
+    VmaAllocation allocation,
+    const void* pUserData)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(
+        allocation->IsUserDataString() ? VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT : 0,
+        pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaSetAllocationUserData,%p,%s\n", callParams.threadId, callParams.time, frameIndex,
+        allocation,
+        userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordCreateLostAllocation(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaCreateLostAllocation,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordMapMemory(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaMapMemory,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordUnmapMemory(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaUnmapMemory,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordFlushAllocation(uint32_t frameIndex,
+    VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaFlushAllocation,%p,%llu,%llu\n", callParams.threadId, callParams.time, frameIndex,
+        allocation,
+        offset,
+        size);
+    Flush();
+}
+
+void VmaRecorder::RecordInvalidateAllocation(uint32_t frameIndex,
+    VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaInvalidateAllocation,%p,%llu,%llu\n", callParams.threadId, callParams.time, frameIndex,
+        allocation,
+        offset,
+        size);
+    Flush();
+}
+
+void VmaRecorder::RecordCreateBuffer(uint32_t frameIndex,
+    const VkBufferCreateInfo& bufCreateInfo,
+    const VmaAllocationCreateInfo& allocCreateInfo,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(allocCreateInfo.flags, allocCreateInfo.pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaCreateBuffer,%u,%llu,%u,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex,
+        bufCreateInfo.flags,
+        bufCreateInfo.size,
+        bufCreateInfo.usage,
+        bufCreateInfo.sharingMode,
+        allocCreateInfo.flags,
+        allocCreateInfo.usage,
+        allocCreateInfo.requiredFlags,
+        allocCreateInfo.preferredFlags,
+        allocCreateInfo.memoryTypeBits,
+        allocCreateInfo.pool,
+        allocation,
+        userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordCreateImage(uint32_t frameIndex,
+    const VkImageCreateInfo& imageCreateInfo,
+    const VmaAllocationCreateInfo& allocCreateInfo,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    UserDataString userDataStr(allocCreateInfo.flags, allocCreateInfo.pUserData);
+    fprintf(m_File, "%u,%.3f,%u,vmaCreateImage,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex,
+        imageCreateInfo.flags,
+        imageCreateInfo.imageType,
+        imageCreateInfo.format,
+        imageCreateInfo.extent.width,
+        imageCreateInfo.extent.height,
+        imageCreateInfo.extent.depth,
+        imageCreateInfo.mipLevels,
+        imageCreateInfo.arrayLayers,
+        imageCreateInfo.samples,
+        imageCreateInfo.tiling,
+        imageCreateInfo.usage,
+        imageCreateInfo.sharingMode,
+        imageCreateInfo.initialLayout,
+        allocCreateInfo.flags,
+        allocCreateInfo.usage,
+        allocCreateInfo.requiredFlags,
+        allocCreateInfo.preferredFlags,
+        allocCreateInfo.memoryTypeBits,
+        allocCreateInfo.pool,
+        allocation,
+        userDataStr.GetString());
+    Flush();
+}
+
+void VmaRecorder::RecordDestroyBuffer(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaDestroyBuffer,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordDestroyImage(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaDestroyImage,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordTouchAllocation(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaTouchAllocation,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordGetAllocationInfo(uint32_t frameIndex,
+    VmaAllocation allocation)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaGetAllocationInfo,%p\n", callParams.threadId, callParams.time, frameIndex,
+        allocation);
+    Flush();
+}
+
+void VmaRecorder::RecordMakePoolAllocationsLost(uint32_t frameIndex,
+    VmaPool pool)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaMakePoolAllocationsLost,%p\n", callParams.threadId, callParams.time, frameIndex,
+        pool);
+    Flush();
+}
+
+void VmaRecorder::RecordDefragmentationBegin(uint32_t frameIndex,
+    const VmaDefragmentationInfo2& info,
+    VmaDefragmentationContext ctx)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaDefragmentationBegin,%u,", callParams.threadId, callParams.time, frameIndex,
+        info.flags);
+    PrintPointerList(info.allocationCount, info.pAllocations);
+    fprintf(m_File, ",");
+    PrintPointerList(info.poolCount, info.pPools);
+    fprintf(m_File, ",%llu,%u,%llu,%u,%p,%p\n",
+        info.maxCpuBytesToMove,
+        info.maxCpuAllocationsToMove,
+        info.maxGpuBytesToMove,
+        info.maxGpuAllocationsToMove,
+        info.commandBuffer,
+        ctx);
+    Flush();
+}
+
+void VmaRecorder::RecordDefragmentationEnd(uint32_t frameIndex,
+    VmaDefragmentationContext ctx)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaDefragmentationEnd,%p\n", callParams.threadId, callParams.time, frameIndex,
+        ctx);
+    Flush();
+}
+
+void VmaRecorder::RecordSetPoolName(uint32_t frameIndex,
+    VmaPool pool,
+    const char* name)
+{
+    CallParams callParams;
+    GetBasicParams(callParams);
+
+    VmaMutexLock lock(m_FileMutex, m_UseMutex);
+    fprintf(m_File, "%u,%.3f,%u,vmaSetPoolName,%p,%s\n", callParams.threadId, callParams.time, frameIndex,
+        pool, name != VMA_NULL ? name : "");
+    Flush();
+}
+
+VmaRecorder::UserDataString::UserDataString(VmaAllocationCreateFlags allocFlags, const void* pUserData)
+{
+    if(pUserData != VMA_NULL)
+    {
+        if((allocFlags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0)
+        {
+            m_Str = (const char*)pUserData;
+        }
+        else
+        {
+            sprintf_s(m_PtrStr, "%p", pUserData);
+            m_Str = m_PtrStr;
+        }
+    }
+    else
+    {
+        m_Str = "";
+    }
+}
+
+void VmaRecorder::WriteConfiguration(
+    const VkPhysicalDeviceProperties& devProps,
+    const VkPhysicalDeviceMemoryProperties& memProps,
+    uint32_t vulkanApiVersion,
+    bool dedicatedAllocationExtensionEnabled,
+    bool bindMemory2ExtensionEnabled,
+    bool memoryBudgetExtensionEnabled)
+{
+    fprintf(m_File, "Config,Begin\n");
+
+    fprintf(m_File, "VulkanApiVersion,%u,%u\n", VK_VERSION_MAJOR(vulkanApiVersion), VK_VERSION_MINOR(vulkanApiVersion));
+
+    fprintf(m_File, "PhysicalDevice,apiVersion,%u\n", devProps.apiVersion);
+    fprintf(m_File, "PhysicalDevice,driverVersion,%u\n", devProps.driverVersion);
+    fprintf(m_File, "PhysicalDevice,vendorID,%u\n", devProps.vendorID);
+    fprintf(m_File, "PhysicalDevice,deviceID,%u\n", devProps.deviceID);
+    fprintf(m_File, "PhysicalDevice,deviceType,%u\n", devProps.deviceType);
+    fprintf(m_File, "PhysicalDevice,deviceName,%s\n", devProps.deviceName);
+
+    fprintf(m_File, "PhysicalDeviceLimits,maxMemoryAllocationCount,%u\n", devProps.limits.maxMemoryAllocationCount);
+    fprintf(m_File, "PhysicalDeviceLimits,bufferImageGranularity,%llu\n", devProps.limits.bufferImageGranularity);
+    fprintf(m_File, "PhysicalDeviceLimits,nonCoherentAtomSize,%llu\n", devProps.limits.nonCoherentAtomSize);
+
+    fprintf(m_File, "PhysicalDeviceMemory,HeapCount,%u\n", memProps.memoryHeapCount);
+    for(uint32_t i = 0; i < memProps.memoryHeapCount; ++i)
+    {
+        fprintf(m_File, "PhysicalDeviceMemory,Heap,%u,size,%llu\n", i, memProps.memoryHeaps[i].size);
+        fprintf(m_File, "PhysicalDeviceMemory,Heap,%u,flags,%u\n", i, memProps.memoryHeaps[i].flags);
+    }
+    fprintf(m_File, "PhysicalDeviceMemory,TypeCount,%u\n", memProps.memoryTypeCount);
+    for(uint32_t i = 0; i < memProps.memoryTypeCount; ++i)
+    {
+        fprintf(m_File, "PhysicalDeviceMemory,Type,%u,heapIndex,%u\n", i, memProps.memoryTypes[i].heapIndex);
+        fprintf(m_File, "PhysicalDeviceMemory,Type,%u,propertyFlags,%u\n", i, memProps.memoryTypes[i].propertyFlags);
+    }
+
+    fprintf(m_File, "Extension,VK_KHR_dedicated_allocation,%u\n", dedicatedAllocationExtensionEnabled ? 1 : 0);
+    fprintf(m_File, "Extension,VK_KHR_bind_memory2,%u\n", bindMemory2ExtensionEnabled ? 1 : 0);
+    fprintf(m_File, "Extension,VK_EXT_memory_budget,%u\n", memoryBudgetExtensionEnabled ? 1 : 0);
+
+    fprintf(m_File, "Macro,VMA_DEBUG_ALWAYS_DEDICATED_MEMORY,%u\n", VMA_DEBUG_ALWAYS_DEDICATED_MEMORY ? 1 : 0);
+    fprintf(m_File, "Macro,VMA_DEBUG_ALIGNMENT,%llu\n", (VkDeviceSize)VMA_DEBUG_ALIGNMENT);
+    fprintf(m_File, "Macro,VMA_DEBUG_MARGIN,%llu\n", (VkDeviceSize)VMA_DEBUG_MARGIN);
+    fprintf(m_File, "Macro,VMA_DEBUG_INITIALIZE_ALLOCATIONS,%u\n", VMA_DEBUG_INITIALIZE_ALLOCATIONS ? 1 : 0);
+    fprintf(m_File, "Macro,VMA_DEBUG_DETECT_CORRUPTION,%u\n", VMA_DEBUG_DETECT_CORRUPTION ? 1 : 0);
+    fprintf(m_File, "Macro,VMA_DEBUG_GLOBAL_MUTEX,%u\n", VMA_DEBUG_GLOBAL_MUTEX ? 1 : 0);
+    fprintf(m_File, "Macro,VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY,%llu\n", (VkDeviceSize)VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY);
+    fprintf(m_File, "Macro,VMA_SMALL_HEAP_MAX_SIZE,%llu\n", (VkDeviceSize)VMA_SMALL_HEAP_MAX_SIZE);
+    fprintf(m_File, "Macro,VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE,%llu\n", (VkDeviceSize)VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE);
+
+    fprintf(m_File, "Config,End\n");
+}
+
+void VmaRecorder::GetBasicParams(CallParams& outParams)
+{
+    outParams.threadId = GetCurrentThreadId();
+
+    LARGE_INTEGER counter;
+    QueryPerformanceCounter(&counter);
+    outParams.time = (double)(counter.QuadPart - m_StartCounter) / (double)m_Freq;
+}
+
+void VmaRecorder::PrintPointerList(uint64_t count, const VmaAllocation* pItems)
+{
+    if(count)
+    {
+        fprintf(m_File, "%p", pItems[0]);
+        for(uint64_t i = 1; i < count; ++i)
+        {
+            fprintf(m_File, " %p", pItems[i]);
+        }
+    }
+}
+
+void VmaRecorder::Flush()
+{
+    if((m_Flags & VMA_RECORD_FLUSH_AFTER_CALL_BIT) != 0)
+    {
+        fflush(m_File);
+    }
+}
+
+#endif // #if VMA_RECORDING_ENABLED
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaAllocationObjectAllocator
+
+VmaAllocationObjectAllocator::VmaAllocationObjectAllocator(const VkAllocationCallbacks* pAllocationCallbacks) :
+    m_Allocator(pAllocationCallbacks, 1024)
+{
+}
+
+VmaAllocation VmaAllocationObjectAllocator::Allocate()
+{
+    VmaMutexLock mutexLock(m_Mutex);
+    return m_Allocator.Alloc();
+}
+
+void VmaAllocationObjectAllocator::Free(VmaAllocation hAlloc)
+{
+    VmaMutexLock mutexLock(m_Mutex);
+    m_Allocator.Free(hAlloc);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// VmaAllocator_T
+
+VmaAllocator_T::VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo) :
+    m_UseMutex((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT) == 0),
+    m_VulkanApiVersion(pCreateInfo->vulkanApiVersion != 0 ? pCreateInfo->vulkanApiVersion : VK_API_VERSION_1_0),
+    m_UseKhrDedicatedAllocation((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0),
+    m_UseKhrBindMemory2((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT) != 0),
+    m_UseExtMemoryBudget((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0),
+    m_hDevice(pCreateInfo->device),
+    m_hInstance(pCreateInfo->instance),
+    m_AllocationCallbacksSpecified(pCreateInfo->pAllocationCallbacks != VMA_NULL),
+    m_AllocationCallbacks(pCreateInfo->pAllocationCallbacks ?
+        *pCreateInfo->pAllocationCallbacks : VmaEmptyAllocationCallbacks),
+    m_AllocationObjectAllocator(&m_AllocationCallbacks),
+    m_HeapSizeLimitMask(0),
+    m_PreferredLargeHeapBlockSize(0),
+    m_PhysicalDevice(pCreateInfo->physicalDevice),
+    m_CurrentFrameIndex(0),
+    m_GpuDefragmentationMemoryTypeBits(UINT32_MAX),
+    m_Pools(VmaStlAllocator<VmaPool>(GetAllocationCallbacks())),
+    m_NextPoolId(0)
+#if VMA_RECORDING_ENABLED
+    ,m_pRecorder(VMA_NULL)
+#endif
+{
+    if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))
+    {
+        m_UseKhrDedicatedAllocation = false;
+        m_UseKhrBindMemory2 = false;
+    }
+
+    if(VMA_DEBUG_DETECT_CORRUPTION)
+    {
+        // Needs to be multiply of uint32_t size because we are going to write VMA_CORRUPTION_DETECTION_MAGIC_VALUE to it.
+        VMA_ASSERT(VMA_DEBUG_MARGIN % sizeof(uint32_t) == 0);
+    }
+
+    VMA_ASSERT(pCreateInfo->physicalDevice && pCreateInfo->device);
+
+    if(m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0))
+    {
+#if !(VMA_DEDICATED_ALLOCATION)
+        if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0)
+        {
+            VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT set but required extensions are disabled by preprocessor macros.");
+        }
+#endif
+#if !(VMA_BIND_MEMORY2)
+        if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT) != 0)
+        {
+            VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT set but required extension is disabled by preprocessor macros.");
+        }
+#endif
+    }
+#if !(VMA_MEMORY_BUDGET)
+    if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0)
+    {
+        VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT set but required extension is disabled by preprocessor macros.");
+    }
+#endif
+#if VMA_VULKAN_VERSION < 1001000
+    if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))
+    {
+        VMA_ASSERT(0 && "vulkanApiVersion >= VK_API_VERSION_1_1 but required Vulkan version is disabled by preprocessor macros.");
+    }
+#endif
+
+    memset(&m_DeviceMemoryCallbacks, 0 ,sizeof(m_DeviceMemoryCallbacks));
+    memset(&m_PhysicalDeviceProperties, 0, sizeof(m_PhysicalDeviceProperties));
+    memset(&m_MemProps, 0, sizeof(m_MemProps));
+        
+    memset(&m_pBlockVectors, 0, sizeof(m_pBlockVectors));
+    memset(&m_pDedicatedAllocations, 0, sizeof(m_pDedicatedAllocations));
+    memset(&m_VulkanFunctions, 0, sizeof(m_VulkanFunctions));
+
+    if(pCreateInfo->pDeviceMemoryCallbacks != VMA_NULL)
+    {
+        m_DeviceMemoryCallbacks.pfnAllocate = pCreateInfo->pDeviceMemoryCallbacks->pfnAllocate;
+        m_DeviceMemoryCallbacks.pfnFree = pCreateInfo->pDeviceMemoryCallbacks->pfnFree;
+    }
+
+    ImportVulkanFunctions(pCreateInfo->pVulkanFunctions);
+
+    (*m_VulkanFunctions.vkGetPhysicalDeviceProperties)(m_PhysicalDevice, &m_PhysicalDeviceProperties);
+    (*m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties)(m_PhysicalDevice, &m_MemProps);
+
+    VMA_ASSERT(VmaIsPow2(VMA_DEBUG_ALIGNMENT));
+    VMA_ASSERT(VmaIsPow2(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY));
+    VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.bufferImageGranularity));
+    VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.nonCoherentAtomSize));
+
+    m_PreferredLargeHeapBlockSize = (pCreateInfo->preferredLargeHeapBlockSize != 0) ?
+        pCreateInfo->preferredLargeHeapBlockSize : static_cast<VkDeviceSize>(VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE);
+
+    if(pCreateInfo->pHeapSizeLimit != VMA_NULL)
+    {
+        for(uint32_t heapIndex = 0; heapIndex < GetMemoryHeapCount(); ++heapIndex)
+        {
+            const VkDeviceSize limit = pCreateInfo->pHeapSizeLimit[heapIndex];
+            if(limit != VK_WHOLE_SIZE)
+            {
+                m_HeapSizeLimitMask |= 1u << heapIndex;
+                if(limit < m_MemProps.memoryHeaps[heapIndex].size)
+                {
+                    m_MemProps.memoryHeaps[heapIndex].size = limit;
+                }
+            }
+        }
+    }
+
+    for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)
+    {
+        const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(memTypeIndex);
+
+        m_pBlockVectors[memTypeIndex] = vma_new(this, VmaBlockVector)(
+            this,
+            VK_NULL_HANDLE, // hParentPool
+            memTypeIndex,
+            preferredBlockSize,
+            0,
+            SIZE_MAX,
+            GetBufferImageGranularity(),
+            pCreateInfo->frameInUseCount,
+            false, // explicitBlockSize
+            false); // linearAlgorithm
+        // No need to call m_pBlockVectors[memTypeIndex][blockVectorTypeIndex]->CreateMinBlocks here,
+        // becase minBlockCount is 0.
+        m_pDedicatedAllocations[memTypeIndex] = vma_new(this, AllocationVectorType)(VmaStlAllocator<VmaAllocation>(GetAllocationCallbacks()));
+
+    }
+}
+
+VkResult VmaAllocator_T::Init(const VmaAllocatorCreateInfo* pCreateInfo)
+{
+    VkResult res = VK_SUCCESS;
+
+    if(pCreateInfo->pRecordSettings != VMA_NULL &&
+        !VmaStrIsEmpty(pCreateInfo->pRecordSettings->pFilePath))
+    {
+#if VMA_RECORDING_ENABLED
+        m_pRecorder = vma_new(this, VmaRecorder)();
+        res = m_pRecorder->Init(*pCreateInfo->pRecordSettings, m_UseMutex);
+        if(res != VK_SUCCESS)
+        {
+            return res;
+        }
+        m_pRecorder->WriteConfiguration(
+            m_PhysicalDeviceProperties,
+            m_MemProps,
+            m_VulkanApiVersion,
+            m_UseKhrDedicatedAllocation,
+            m_UseKhrBindMemory2,
+            m_UseExtMemoryBudget);
+        m_pRecorder->RecordCreateAllocator(GetCurrentFrameIndex());
+#else
+        VMA_ASSERT(0 && "VmaAllocatorCreateInfo::pRecordSettings used, but not supported due to VMA_RECORDING_ENABLED not defined to 1.");
+        return VK_ERROR_FEATURE_NOT_PRESENT;
+#endif
+    }
+
+#if VMA_MEMORY_BUDGET
+    if(m_UseExtMemoryBudget)
+    {
+        UpdateVulkanBudget();
+    }
+#endif // #if VMA_MEMORY_BUDGET
+
+    return res;
+}
+
+VmaAllocator_T::~VmaAllocator_T()
+{
+#if VMA_RECORDING_ENABLED
+    if(m_pRecorder != VMA_NULL)
+    {
+        m_pRecorder->RecordDestroyAllocator(GetCurrentFrameIndex());
+        vma_delete(this, m_pRecorder);
+    }
+#endif
+    
+    VMA_ASSERT(m_Pools.empty());
+
+    for(size_t i = GetMemoryTypeCount(); i--; )
+    {
+        if(m_pDedicatedAllocations[i] != VMA_NULL && !m_pDedicatedAllocations[i]->empty())
+        {
+            VMA_ASSERT(0 && "Unfreed dedicated allocations found.");
+        }
+
+        vma_delete(this, m_pDedicatedAllocations[i]);
+        vma_delete(this, m_pBlockVectors[i]);
+    }
+}
+
+void VmaAllocator_T::ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions)
+{
+#if VMA_STATIC_VULKAN_FUNCTIONS == 1
+    m_VulkanFunctions.vkGetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties)vkGetPhysicalDeviceProperties;
+    m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties = (PFN_vkGetPhysicalDeviceMemoryProperties)vkGetPhysicalDeviceMemoryProperties;
+    m_VulkanFunctions.vkAllocateMemory = (PFN_vkAllocateMemory)vkAllocateMemory;
+    m_VulkanFunctions.vkFreeMemory = (PFN_vkFreeMemory)vkFreeMemory;
+    m_VulkanFunctions.vkMapMemory = (PFN_vkMapMemory)vkMapMemory;
+    m_VulkanFunctions.vkUnmapMemory = (PFN_vkUnmapMemory)vkUnmapMemory;
+    m_VulkanFunctions.vkFlushMappedMemoryRanges = (PFN_vkFlushMappedMemoryRanges)vkFlushMappedMemoryRanges;
+    m_VulkanFunctions.vkInvalidateMappedMemoryRanges = (PFN_vkInvalidateMappedMemoryRanges)vkInvalidateMappedMemoryRanges;
+    m_VulkanFunctions.vkBindBufferMemory = (PFN_vkBindBufferMemory)vkBindBufferMemory;
+    m_VulkanFunctions.vkBindImageMemory = (PFN_vkBindImageMemory)vkBindImageMemory;
+    m_VulkanFunctions.vkGetBufferMemoryRequirements = (PFN_vkGetBufferMemoryRequirements)vkGetBufferMemoryRequirements;
+    m_VulkanFunctions.vkGetImageMemoryRequirements = (PFN_vkGetImageMemoryRequirements)vkGetImageMemoryRequirements;
+    m_VulkanFunctions.vkCreateBuffer = (PFN_vkCreateBuffer)vkCreateBuffer;
+    m_VulkanFunctions.vkDestroyBuffer = (PFN_vkDestroyBuffer)vkDestroyBuffer;
+    m_VulkanFunctions.vkCreateImage = (PFN_vkCreateImage)vkCreateImage;
+    m_VulkanFunctions.vkDestroyImage = (PFN_vkDestroyImage)vkDestroyImage;
+    m_VulkanFunctions.vkCmdCopyBuffer = (PFN_vkCmdCopyBuffer)vkCmdCopyBuffer;
+#if VMA_VULKAN_VERSION >= 1001000
+    if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))
+    {
+        VMA_ASSERT(m_hInstance != VK_NULL_HANDLE);
+        m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR =
+            (PFN_vkGetBufferMemoryRequirements2KHR)vkGetDeviceProcAddr(m_hDevice, "vkGetBufferMemoryRequirements2");
+        m_VulkanFunctions.vkGetImageMemoryRequirements2KHR =
+            (PFN_vkGetImageMemoryRequirements2KHR)vkGetDeviceProcAddr(m_hDevice, "vkGetImageMemoryRequirements2");
+        m_VulkanFunctions.vkBindBufferMemory2KHR =
+            (PFN_vkBindBufferMemory2KHR)vkGetDeviceProcAddr(m_hDevice, "vkBindBufferMemory2");
+        m_VulkanFunctions.vkBindImageMemory2KHR =
+            (PFN_vkBindImageMemory2KHR)vkGetDeviceProcAddr(m_hDevice, "vkBindImageMemory2");
+        m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR =
+            (PFN_vkGetPhysicalDeviceMemoryProperties2KHR)vkGetInstanceProcAddr(m_hInstance, "vkGetPhysicalDeviceMemoryProperties2");
+    }
+#endif
+#if VMA_DEDICATED_ALLOCATION
+    if(m_UseKhrDedicatedAllocation)
+    {
+        m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR =
+            (PFN_vkGetBufferMemoryRequirements2KHR)vkGetDeviceProcAddr(m_hDevice, "vkGetBufferMemoryRequirements2KHR");
+        m_VulkanFunctions.vkGetImageMemoryRequirements2KHR =
+            (PFN_vkGetImageMemoryRequirements2KHR)vkGetDeviceProcAddr(m_hDevice, "vkGetImageMemoryRequirements2KHR");
+    }
+#endif
+#if VMA_BIND_MEMORY2
+    if(m_UseKhrBindMemory2)
+    {
+        m_VulkanFunctions.vkBindBufferMemory2KHR =
+            (PFN_vkBindBufferMemory2KHR)vkGetDeviceProcAddr(m_hDevice, "vkBindBufferMemory2KHR");
+        m_VulkanFunctions.vkBindImageMemory2KHR =
+            (PFN_vkBindImageMemory2KHR)vkGetDeviceProcAddr(m_hDevice, "vkBindImageMemory2KHR");
+    }
+#endif // #if VMA_BIND_MEMORY2
+#if VMA_MEMORY_BUDGET
+    if(m_UseExtMemoryBudget && m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0))
+    {
+        VMA_ASSERT(m_hInstance != VK_NULL_HANDLE);
+        m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR =
+            (PFN_vkGetPhysicalDeviceMemoryProperties2KHR)vkGetInstanceProcAddr(m_hInstance, "vkGetPhysicalDeviceMemoryProperties2KHR");
+    }
+#endif // #if VMA_MEMORY_BUDGET
+#endif // #if VMA_STATIC_VULKAN_FUNCTIONS == 1
+
+#define VMA_COPY_IF_NOT_NULL(funcName) \
+    if(pVulkanFunctions->funcName != VMA_NULL) m_VulkanFunctions.funcName = pVulkanFunctions->funcName;
+
+    if(pVulkanFunctions != VMA_NULL)
+    {
+        VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceProperties);
+        VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceMemoryProperties);
+        VMA_COPY_IF_NOT_NULL(vkAllocateMemory);
+        VMA_COPY_IF_NOT_NULL(vkFreeMemory);
+        VMA_COPY_IF_NOT_NULL(vkMapMemory);
+        VMA_COPY_IF_NOT_NULL(vkUnmapMemory);
+        VMA_COPY_IF_NOT_NULL(vkFlushMappedMemoryRanges);
+        VMA_COPY_IF_NOT_NULL(vkInvalidateMappedMemoryRanges);
+        VMA_COPY_IF_NOT_NULL(vkBindBufferMemory);
+        VMA_COPY_IF_NOT_NULL(vkBindImageMemory);
+        VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements);
+        VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements);
+        VMA_COPY_IF_NOT_NULL(vkCreateBuffer);
+        VMA_COPY_IF_NOT_NULL(vkDestroyBuffer);
+        VMA_COPY_IF_NOT_NULL(vkCreateImage);
+        VMA_COPY_IF_NOT_NULL(vkDestroyImage);
+        VMA_COPY_IF_NOT_NULL(vkCmdCopyBuffer);
+#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000
+        VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements2KHR);
+        VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements2KHR);
+#endif
+#if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000
+        VMA_COPY_IF_NOT_NULL(vkBindBufferMemory2KHR);
+        VMA_COPY_IF_NOT_NULL(vkBindImageMemory2KHR);
+#endif
+#if VMA_MEMORY_BUDGET
+        VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceMemoryProperties2KHR);
+#endif
+    }
+
+#undef VMA_COPY_IF_NOT_NULL
+
+    // If these asserts are hit, you must either #define VMA_STATIC_VULKAN_FUNCTIONS 1
+    // or pass valid pointers as VmaAllocatorCreateInfo::pVulkanFunctions.
+    VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceProperties != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkAllocateMemory != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkFreeMemory != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkMapMemory != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkUnmapMemory != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkFlushMappedMemoryRanges != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkInvalidateMappedMemoryRanges != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkBindBufferMemory != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkBindImageMemory != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkCreateBuffer != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkDestroyBuffer != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkCreateImage != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkDestroyImage != VMA_NULL);
+    VMA_ASSERT(m_VulkanFunctions.vkCmdCopyBuffer != VMA_NULL);
+#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000
+    if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0) || m_UseKhrDedicatedAllocation)
+    {
+        VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR != VMA_NULL);
+        VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements2KHR != VMA_NULL);
+    }
+#endif
+#if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000
+    if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0) || m_UseKhrBindMemory2)
+    {
+        VMA_ASSERT(m_VulkanFunctions.vkBindBufferMemory2KHR != VMA_NULL);
+        VMA_ASSERT(m_VulkanFunctions.vkBindImageMemory2KHR != VMA_NULL);
+    }
+#endif
+#if VMA_MEMORY_BUDGET || VMA_VULKAN_VERSION >= 1001000
+    if(m_UseExtMemoryBudget || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))
+    {
+        VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR != VMA_NULL);
+    }
+#endif
+}
+
+VkDeviceSize VmaAllocator_T::CalcPreferredBlockSize(uint32_t memTypeIndex)
+{
+    const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex);
+    const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size;
+    const bool isSmallHeap = heapSize <= VMA_SMALL_HEAP_MAX_SIZE;
+    return VmaAlignUp(isSmallHeap ? (heapSize / 8) : m_PreferredLargeHeapBlockSize, (VkDeviceSize)32);
+}
+
+VkResult VmaAllocator_T::AllocateMemoryOfType(
+    VkDeviceSize size,
+    VkDeviceSize alignment,
+    bool dedicatedAllocation,
+    VkBuffer dedicatedBuffer,
+    VkImage dedicatedImage,
+    const VmaAllocationCreateInfo& createInfo,
+    uint32_t memTypeIndex,
+    VmaSuballocationType suballocType,
+    size_t allocationCount,
+    VmaAllocation* pAllocations)
+{
+    VMA_ASSERT(pAllocations != VMA_NULL);
+    VMA_DEBUG_LOG("  AllocateMemory: MemoryTypeIndex=%u, AllocationCount=%zu, Size=%llu", memTypeIndex, allocationCount, size);
+
+    VmaAllocationCreateInfo finalCreateInfo = createInfo;
+
+    // If memory type is not HOST_VISIBLE, disable MAPPED.
+    if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0 &&
+        (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)
+    {
+        finalCreateInfo.flags &= ~VMA_ALLOCATION_CREATE_MAPPED_BIT;
+    }
+    // If memory is lazily allocated, it should be always dedicated.
+    if(finalCreateInfo.usage == VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED)
+    {
+        finalCreateInfo.flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT;
+    }
+
+    VmaBlockVector* const blockVector = m_pBlockVectors[memTypeIndex];
+    VMA_ASSERT(blockVector);
+
+    const VkDeviceSize preferredBlockSize = blockVector->GetPreferredBlockSize();
+    bool preferDedicatedMemory =
+        VMA_DEBUG_ALWAYS_DEDICATED_MEMORY ||
+        dedicatedAllocation ||
+        // Heuristics: Allocate dedicated memory if requested size if greater than half of preferred block size.
+        size > preferredBlockSize / 2;
+
+    if(preferDedicatedMemory &&
+        (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0 &&
+        finalCreateInfo.pool == VK_NULL_HANDLE)
+    {
+        finalCreateInfo.flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT;
+    }
+
+    if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0)
+    {
+        if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0)
+        {
+            return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+        }
+        else
+        {
+            return AllocateDedicatedMemory(
+                size,
+                suballocType,
+                memTypeIndex,
+                (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT) != 0,
+                (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,
+                (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,
+                finalCreateInfo.pUserData,
+                dedicatedBuffer,
+                dedicatedImage,
+                allocationCount,
+                pAllocations);
+        }
+    }
+    else
+    {
+        VkResult res = blockVector->Allocate(
+            m_CurrentFrameIndex.load(),
+            size,
+            alignment,
+            finalCreateInfo,
+            suballocType,
+            allocationCount,
+            pAllocations);
+        if(res == VK_SUCCESS)
+        {
+            return res;
+        }
+
+        // 5. Try dedicated memory.
+        if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0)
+        {
+            return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+        }
+        else
+        {
+            res = AllocateDedicatedMemory(
+                size,
+                suballocType,
+                memTypeIndex,
+                (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT) != 0,
+                (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,
+                (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,
+                finalCreateInfo.pUserData,
+                dedicatedBuffer,
+                dedicatedImage,
+                allocationCount,
+                pAllocations);
+            if(res == VK_SUCCESS)
+            {
+                // Succeeded: AllocateDedicatedMemory function already filld pMemory, nothing more to do here.
+                VMA_DEBUG_LOG("    Allocated as DedicatedMemory");
+                return VK_SUCCESS;
+            }
+            else
+            {
+                // Everything failed: Return error code.
+                VMA_DEBUG_LOG("    vkAllocateMemory FAILED");
+                return res;
+            }
+        }
+    }
+}
+
+VkResult VmaAllocator_T::AllocateDedicatedMemory(
+    VkDeviceSize size,
+    VmaSuballocationType suballocType,
+    uint32_t memTypeIndex,
+    bool withinBudget,
+    bool map,
+    bool isUserDataString,
+    void* pUserData,
+    VkBuffer dedicatedBuffer,
+    VkImage dedicatedImage,
+    size_t allocationCount,
+    VmaAllocation* pAllocations)
+{
+    VMA_ASSERT(allocationCount > 0 && pAllocations);
+
+    if(withinBudget)
+    {
+        const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex);
+        VmaBudget heapBudget = {};
+        GetBudget(&heapBudget, heapIndex, 1);
+        if(heapBudget.usage + size * allocationCount > heapBudget.budget)
+        {
+            return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+        }
+    }
+
+    VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO };
+    allocInfo.memoryTypeIndex = memTypeIndex;
+    allocInfo.allocationSize = size;
+
+#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000
+    VkMemoryDedicatedAllocateInfoKHR dedicatedAllocInfo = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR };
+    if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))
+    {
+        if(dedicatedBuffer != VK_NULL_HANDLE)
+        {
+            VMA_ASSERT(dedicatedImage == VK_NULL_HANDLE);
+            dedicatedAllocInfo.buffer = dedicatedBuffer;
+            allocInfo.pNext = &dedicatedAllocInfo;
+        }
+        else if(dedicatedImage != VK_NULL_HANDLE)
+        {
+            dedicatedAllocInfo.image = dedicatedImage;
+            allocInfo.pNext = &dedicatedAllocInfo;
+        }
+    }
+#endif // #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000
+
+    size_t allocIndex;
+    VkResult res = VK_SUCCESS;
+    for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex)
+    {
+        res = AllocateDedicatedMemoryPage(
+            size,
+            suballocType,
+            memTypeIndex,
+            allocInfo,
+            map,
+            isUserDataString,
+            pUserData,
+            pAllocations + allocIndex);
+        if(res != VK_SUCCESS)
+        {
+            break;
+        }
+    }
+
+    if(res == VK_SUCCESS)
+    {
+        // Register them in m_pDedicatedAllocations.
+        {
+            VmaMutexLockWrite lock(m_DedicatedAllocationsMutex[memTypeIndex], m_UseMutex);
+            AllocationVectorType* pDedicatedAllocations = m_pDedicatedAllocations[memTypeIndex];
+            VMA_ASSERT(pDedicatedAllocations);
+            for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex)
+            {
+                VmaVectorInsertSorted<VmaPointerLess>(*pDedicatedAllocations, pAllocations[allocIndex]);
+            }
+        }
+
+        VMA_DEBUG_LOG("    Allocated DedicatedMemory Count=%zu, MemoryTypeIndex=#%u", allocationCount, memTypeIndex);
+    }
+    else
+    {
+        // Free all already created allocations.
+        while(allocIndex--)
+        {
+            VmaAllocation currAlloc = pAllocations[allocIndex];
+            VkDeviceMemory hMemory = currAlloc->GetMemory();
+    
+            /*
+            There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory
+            before vkFreeMemory.
+
+            if(currAlloc->GetMappedData() != VMA_NULL)
+            {
+                (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory);
+            }
+            */
+    
+            FreeVulkanMemory(memTypeIndex, currAlloc->GetSize(), hMemory);
+            m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(memTypeIndex), currAlloc->GetSize());
+            currAlloc->SetUserData(this, VMA_NULL);
+            currAlloc->Dtor();
+            m_AllocationObjectAllocator.Free(currAlloc);
+        }
+
+        memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount);
+    }
+
+    return res;
+}
+
+VkResult VmaAllocator_T::AllocateDedicatedMemoryPage(
+    VkDeviceSize size,
+    VmaSuballocationType suballocType,
+    uint32_t memTypeIndex,
+    const VkMemoryAllocateInfo& allocInfo,
+    bool map,
+    bool isUserDataString,
+    void* pUserData,
+    VmaAllocation* pAllocation)
+{
+    VkDeviceMemory hMemory = VK_NULL_HANDLE;
+    VkResult res = AllocateVulkanMemory(&allocInfo, &hMemory);
+    if(res < 0)
+    {
+        VMA_DEBUG_LOG("    vkAllocateMemory FAILED");
+        return res;
+    }
+
+    void* pMappedData = VMA_NULL;
+    if(map)
+    {
+        res = (*m_VulkanFunctions.vkMapMemory)(
+            m_hDevice,
+            hMemory,
+            0,
+            VK_WHOLE_SIZE,
+            0,
+            &pMappedData);
+        if(res < 0)
+        {
+            VMA_DEBUG_LOG("    vkMapMemory FAILED");
+            FreeVulkanMemory(memTypeIndex, size, hMemory);
+            return res;
+        }
+    }
+
+    *pAllocation = m_AllocationObjectAllocator.Allocate();
+    (*pAllocation)->Ctor(m_CurrentFrameIndex.load(), isUserDataString);
+    (*pAllocation)->InitDedicatedAllocation(memTypeIndex, hMemory, suballocType, pMappedData, size);
+    (*pAllocation)->SetUserData(this, pUserData);
+    m_Budget.AddAllocation(MemoryTypeIndexToHeapIndex(memTypeIndex), size);
+    if(VMA_DEBUG_INITIALIZE_ALLOCATIONS)
+    {
+        FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED);
+    }
+
+    return VK_SUCCESS;
+}
+
+void VmaAllocator_T::GetBufferMemoryRequirements(
+    VkBuffer hBuffer,
+    VkMemoryRequirements& memReq,
+    bool& requiresDedicatedAllocation,
+    bool& prefersDedicatedAllocation) const
+{
+#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000
+    if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))
+    {
+        VkBufferMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR };
+        memReqInfo.buffer = hBuffer;
+
+        VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR };
+
+        VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR };
+        memReq2.pNext = &memDedicatedReq;
+
+        (*m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2);
+
+        memReq = memReq2.memoryRequirements;
+        requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE);
+        prefersDedicatedAllocation  = (memDedicatedReq.prefersDedicatedAllocation  != VK_FALSE);
+    }
+    else
+#endif // #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000
+    {
+        (*m_VulkanFunctions.vkGetBufferMemoryRequirements)(m_hDevice, hBuffer, &memReq);
+        requiresDedicatedAllocation = false;
+        prefersDedicatedAllocation  = false;
+    }
+}
+
+void VmaAllocator_T::GetImageMemoryRequirements(
+    VkImage hImage,
+    VkMemoryRequirements& memReq,
+    bool& requiresDedicatedAllocation,
+    bool& prefersDedicatedAllocation) const
+{
+#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000
+    if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))
+    {
+        VkImageMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR };
+        memReqInfo.image = hImage;
+
+        VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR };
+
+        VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR };
+        memReq2.pNext = &memDedicatedReq;
+
+        (*m_VulkanFunctions.vkGetImageMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2);
+
+        memReq = memReq2.memoryRequirements;
+        requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE);
+        prefersDedicatedAllocation  = (memDedicatedReq.prefersDedicatedAllocation  != VK_FALSE);
+    }
+    else
+#endif // #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000
+    {
+        (*m_VulkanFunctions.vkGetImageMemoryRequirements)(m_hDevice, hImage, &memReq);
+        requiresDedicatedAllocation = false;
+        prefersDedicatedAllocation  = false;
+    }
+}
+
+VkResult VmaAllocator_T::AllocateMemory(
+    const VkMemoryRequirements& vkMemReq,
+    bool requiresDedicatedAllocation,
+    bool prefersDedicatedAllocation,
+    VkBuffer dedicatedBuffer,
+    VkImage dedicatedImage,
+    const VmaAllocationCreateInfo& createInfo,
+    VmaSuballocationType suballocType,
+    size_t allocationCount,
+    VmaAllocation* pAllocations)
+{
+    memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount);
+
+    VMA_ASSERT(VmaIsPow2(vkMemReq.alignment));
+
+    if(vkMemReq.size == 0)
+    {
+        return VK_ERROR_VALIDATION_FAILED_EXT;
+    }
+    if((createInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0 &&
+        (createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0)
+    {
+        VMA_ASSERT(0 && "Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT together with VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT makes no sense.");
+        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+    }
+    if((createInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0 &&
+        (createInfo.flags & VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT) != 0)
+    {
+        VMA_ASSERT(0 && "Specifying VMA_ALLOCATION_CREATE_MAPPED_BIT together with VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT is invalid.");
+        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+    }
+    if(requiresDedicatedAllocation)
+    {
+        if((createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0)
+        {
+            VMA_ASSERT(0 && "VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT specified while dedicated allocation is required.");
+            return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+        }
+        if(createInfo.pool != VK_NULL_HANDLE)
+        {
+            VMA_ASSERT(0 && "Pool specified while dedicated allocation is required.");
+            return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+        }
+    }
+    if((createInfo.pool != VK_NULL_HANDLE) &&
+        ((createInfo.flags & (VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT)) != 0))
+    {
+        VMA_ASSERT(0 && "Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT when pool != null is invalid.");
+        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+    }
+
+    if(createInfo.pool != VK_NULL_HANDLE)
+    {
+        const VkDeviceSize alignmentForPool = VMA_MAX(
+            vkMemReq.alignment,
+            GetMemoryTypeMinAlignment(createInfo.pool->m_BlockVector.GetMemoryTypeIndex()));
+
+        VmaAllocationCreateInfo createInfoForPool = createInfo;
+        // If memory type is not HOST_VISIBLE, disable MAPPED.
+        if((createInfoForPool.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0 &&
+            (m_MemProps.memoryTypes[createInfo.pool->m_BlockVector.GetMemoryTypeIndex()].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)
+        {
+            createInfoForPool.flags &= ~VMA_ALLOCATION_CREATE_MAPPED_BIT;
+        }
+
+        return createInfo.pool->m_BlockVector.Allocate(
+            m_CurrentFrameIndex.load(),
+            vkMemReq.size,
+            alignmentForPool,
+            createInfoForPool,
+            suballocType,
+            allocationCount,
+            pAllocations);
+    }
+    else
+    {
+        // Bit mask of memory Vulkan types acceptable for this allocation.
+        uint32_t memoryTypeBits = vkMemReq.memoryTypeBits;
+        uint32_t memTypeIndex = UINT32_MAX;
+        VkResult res = vmaFindMemoryTypeIndex(this, memoryTypeBits, &createInfo, &memTypeIndex);
+        if(res == VK_SUCCESS)
+        {
+            VkDeviceSize alignmentForMemType = VMA_MAX(
+                vkMemReq.alignment,
+                GetMemoryTypeMinAlignment(memTypeIndex));
+
+            res = AllocateMemoryOfType(
+                vkMemReq.size,
+                alignmentForMemType,
+                requiresDedicatedAllocation || prefersDedicatedAllocation,
+                dedicatedBuffer,
+                dedicatedImage,
+                createInfo,
+                memTypeIndex,
+                suballocType,
+                allocationCount,
+                pAllocations);
+            // Succeeded on first try.
+            if(res == VK_SUCCESS)
+            {
+                return res;
+            }
+            // Allocation from this memory type failed. Try other compatible memory types.
+            else
+            {
+                for(;;)
+                {
+                    // Remove old memTypeIndex from list of possibilities.
+                    memoryTypeBits &= ~(1u << memTypeIndex);
+                    // Find alternative memTypeIndex.
+                    res = vmaFindMemoryTypeIndex(this, memoryTypeBits, &createInfo, &memTypeIndex);
+                    if(res == VK_SUCCESS)
+                    {
+                        alignmentForMemType = VMA_MAX(
+                            vkMemReq.alignment,
+                            GetMemoryTypeMinAlignment(memTypeIndex));
+                        
+                        res = AllocateMemoryOfType(
+                            vkMemReq.size,
+                            alignmentForMemType,
+                            requiresDedicatedAllocation || prefersDedicatedAllocation,
+                            dedicatedBuffer,
+                            dedicatedImage,
+                            createInfo,
+                            memTypeIndex,
+                            suballocType,
+                            allocationCount,
+                            pAllocations);
+                        // Allocation from this alternative memory type succeeded.
+                        if(res == VK_SUCCESS)
+                        {
+                            return res;
+                        }
+                        // else: Allocation from this memory type failed. Try next one - next loop iteration.
+                    }
+                    // No other matching memory type index could be found.
+                    else
+                    {
+                        // Not returning res, which is VK_ERROR_FEATURE_NOT_PRESENT, because we already failed to allocate once.
+                        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+                    }
+                }
+            }
+        }
+        // Can't find any single memory type maching requirements. res is VK_ERROR_FEATURE_NOT_PRESENT.
+        else
+            return res;
+    }
+}
+
+void VmaAllocator_T::FreeMemory(
+    size_t allocationCount,
+    const VmaAllocation* pAllocations)
+{
+    VMA_ASSERT(pAllocations);
+
+    for(size_t allocIndex = allocationCount; allocIndex--; )
+    {
+        VmaAllocation allocation = pAllocations[allocIndex];
+
+        if(allocation != VK_NULL_HANDLE)
+        {
+            if(TouchAllocation(allocation))
+            {
+                if(VMA_DEBUG_INITIALIZE_ALLOCATIONS)
+                {
+                    FillAllocation(allocation, VMA_ALLOCATION_FILL_PATTERN_DESTROYED);
+                }
+
+                switch(allocation->GetType())
+                {
+                case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
+                    {
+                        VmaBlockVector* pBlockVector = VMA_NULL;
+                        VmaPool hPool = allocation->GetBlock()->GetParentPool();
+                        if(hPool != VK_NULL_HANDLE)
+                        {
+                            pBlockVector = &hPool->m_BlockVector;
+                        }
+                        else
+                        {
+                            const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex();
+                            pBlockVector = m_pBlockVectors[memTypeIndex];
+                        }
+                        pBlockVector->Free(allocation);
+                    }
+                    break;
+                case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
+                    FreeDedicatedMemory(allocation);
+                    break;
+                default:
+                    VMA_ASSERT(0);
+                }
+            }
+
+            // Do this regardless of whether the allocation is lost. Lost allocations still account to Budget.AllocationBytes.
+            m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(allocation->GetMemoryTypeIndex()), allocation->GetSize());
+            allocation->SetUserData(this, VMA_NULL);
+            allocation->Dtor();
+            m_AllocationObjectAllocator.Free(allocation);
+        }
+    }
+}
+
+VkResult VmaAllocator_T::ResizeAllocation(
+    const VmaAllocation alloc,
+    VkDeviceSize newSize)
+{
+    // This function is deprecated and so it does nothing. It's left for backward compatibility.
+    if(newSize == 0 || alloc->GetLastUseFrameIndex() == VMA_FRAME_INDEX_LOST)
+    {
+        return VK_ERROR_VALIDATION_FAILED_EXT;
+    }
+    if(newSize == alloc->GetSize())
+    {
+        return VK_SUCCESS;
+    }
+    return VK_ERROR_OUT_OF_POOL_MEMORY;
+}
+
+void VmaAllocator_T::CalculateStats(VmaStats* pStats)
+{
+    // Initialize.
+    InitStatInfo(pStats->total);
+    for(size_t i = 0; i < VK_MAX_MEMORY_TYPES; ++i)
+        InitStatInfo(pStats->memoryType[i]);
+    for(size_t i = 0; i < VK_MAX_MEMORY_HEAPS; ++i)
+        InitStatInfo(pStats->memoryHeap[i]);
+    
+    // Process default pools.
+    for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)
+    {
+        VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex];
+        VMA_ASSERT(pBlockVector);
+        pBlockVector->AddStats(pStats);
+    }
+
+    // Process custom pools.
+    {
+        VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex);
+        for(size_t poolIndex = 0, poolCount = m_Pools.size(); poolIndex < poolCount; ++poolIndex)
+        {
+            m_Pools[poolIndex]->m_BlockVector.AddStats(pStats);
+        }
+    }
+
+    // Process dedicated allocations.
+    for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)
+    {
+        const uint32_t memHeapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex);
+        VmaMutexLockRead dedicatedAllocationsLock(m_DedicatedAllocationsMutex[memTypeIndex], m_UseMutex);
+        AllocationVectorType* const pDedicatedAllocVector = m_pDedicatedAllocations[memTypeIndex];
+        VMA_ASSERT(pDedicatedAllocVector);
+        for(size_t allocIndex = 0, allocCount = pDedicatedAllocVector->size(); allocIndex < allocCount; ++allocIndex)
+        {
+            VmaStatInfo allocationStatInfo;
+            (*pDedicatedAllocVector)[allocIndex]->DedicatedAllocCalcStatsInfo(allocationStatInfo);
+            VmaAddStatInfo(pStats->total, allocationStatInfo);
+            VmaAddStatInfo(pStats->memoryType[memTypeIndex], allocationStatInfo);
+            VmaAddStatInfo(pStats->memoryHeap[memHeapIndex], allocationStatInfo);
+        }
+    }
+
+    // Postprocess.
+    VmaPostprocessCalcStatInfo(pStats->total);
+    for(size_t i = 0; i < GetMemoryTypeCount(); ++i)
+        VmaPostprocessCalcStatInfo(pStats->memoryType[i]);
+    for(size_t i = 0; i < GetMemoryHeapCount(); ++i)
+        VmaPostprocessCalcStatInfo(pStats->memoryHeap[i]);
+}
+
+void VmaAllocator_T::GetBudget(VmaBudget* outBudget, uint32_t firstHeap, uint32_t heapCount)
+{
+#if VMA_MEMORY_BUDGET
+    if(m_UseExtMemoryBudget)
+    {
+        if(m_Budget.m_OperationsSinceBudgetFetch < 30)
+        {
+            VmaMutexLockRead lockRead(m_Budget.m_BudgetMutex, m_UseMutex);
+            for(uint32_t i = 0; i < heapCount; ++i, ++outBudget)
+            {
+                const uint32_t heapIndex = firstHeap + i;
+
+                outBudget->blockBytes = m_Budget.m_BlockBytes[heapIndex];
+                outBudget->allocationBytes = m_Budget.m_AllocationBytes[heapIndex];
+
+                if(m_Budget.m_VulkanUsage[heapIndex] + outBudget->blockBytes > m_Budget.m_BlockBytesAtBudgetFetch[heapIndex])
+                {
+                    outBudget->usage = m_Budget.m_VulkanUsage[heapIndex] +
+                        outBudget->blockBytes - m_Budget.m_BlockBytesAtBudgetFetch[heapIndex];
+                }
+                else
+                {
+                    outBudget->usage = 0;
+                }
+
+                // Have to take MIN with heap size because explicit HeapSizeLimit is included in it.
+                outBudget->budget = VMA_MIN(
+                    m_Budget.m_VulkanBudget[heapIndex], m_MemProps.memoryHeaps[heapIndex].size);
+            }
+        }
+        else
+        {
+            UpdateVulkanBudget(); // Outside of mutex lock
+            GetBudget(outBudget, firstHeap, heapCount); // Recursion
+        }
+    }
+    else
+#endif
+    {
+        for(uint32_t i = 0; i < heapCount; ++i, ++outBudget)
+        {
+            const uint32_t heapIndex = firstHeap + i;
+
+            outBudget->blockBytes = m_Budget.m_BlockBytes[heapIndex];
+            outBudget->allocationBytes = m_Budget.m_AllocationBytes[heapIndex];
+
+            outBudget->usage = outBudget->blockBytes;
+            outBudget->budget = m_MemProps.memoryHeaps[heapIndex].size * 8 / 10; // 80% heuristics.
+        }
+    }
+}
+
+static const uint32_t VMA_VENDOR_ID_AMD = 4098;
+
+VkResult VmaAllocator_T::DefragmentationBegin(
+    const VmaDefragmentationInfo2& info,
+    VmaDefragmentationStats* pStats,
+    VmaDefragmentationContext* pContext)
+{
+    if(info.pAllocationsChanged != VMA_NULL)
+    {
+        memset(info.pAllocationsChanged, 0, info.allocationCount * sizeof(VkBool32));
+    }
+
+    *pContext = vma_new(this, VmaDefragmentationContext_T)(
+        this, m_CurrentFrameIndex.load(), info.flags, pStats);
+
+    (*pContext)->AddPools(info.poolCount, info.pPools);
+    (*pContext)->AddAllocations(
+        info.allocationCount, info.pAllocations, info.pAllocationsChanged);
+
+    VkResult res = (*pContext)->Defragment(
+        info.maxCpuBytesToMove, info.maxCpuAllocationsToMove,
+        info.maxGpuBytesToMove, info.maxGpuAllocationsToMove,
+        info.commandBuffer, pStats, info.flags);
+
+    if(res != VK_NOT_READY)
+    {
+        vma_delete(this, *pContext);
+        *pContext = VMA_NULL;
+    }
+
+    return res;
+}
+
+VkResult VmaAllocator_T::DefragmentationEnd(
+    VmaDefragmentationContext context)
+{
+    vma_delete(this, context);
+    return VK_SUCCESS;
+}
+
+VkResult VmaAllocator_T::DefragmentationPassBegin(
+    VmaDefragmentationPassInfo* pInfo,
+    VmaDefragmentationContext context)
+{
+    return context->DefragmentPassBegin(pInfo);
+}
+VkResult VmaAllocator_T::DefragmentationPassEnd(
+    VmaDefragmentationContext context)
+{
+    return context->DefragmentPassEnd();
+    
+}
+
+void VmaAllocator_T::GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo)
+{
+    if(hAllocation->CanBecomeLost())
+    {
+        /*
+        Warning: This is a carefully designed algorithm.
+        Do not modify unless you really know what you're doing :)
+        */
+        const uint32_t localCurrFrameIndex = m_CurrentFrameIndex.load();
+        uint32_t localLastUseFrameIndex = hAllocation->GetLastUseFrameIndex();
+        for(;;)
+        {
+            if(localLastUseFrameIndex == VMA_FRAME_INDEX_LOST)
+            {
+                pAllocationInfo->memoryType = UINT32_MAX;
+                pAllocationInfo->deviceMemory = VK_NULL_HANDLE;
+                pAllocationInfo->offset = 0;
+                pAllocationInfo->size = hAllocation->GetSize();
+                pAllocationInfo->pMappedData = VMA_NULL;
+                pAllocationInfo->pUserData = hAllocation->GetUserData();
+                return;
+            }
+            else if(localLastUseFrameIndex == localCurrFrameIndex)
+            {
+                pAllocationInfo->memoryType = hAllocation->GetMemoryTypeIndex();
+                pAllocationInfo->deviceMemory = hAllocation->GetMemory();
+                pAllocationInfo->offset = hAllocation->GetOffset();
+                pAllocationInfo->size = hAllocation->GetSize();
+                pAllocationInfo->pMappedData = VMA_NULL;
+                pAllocationInfo->pUserData = hAllocation->GetUserData();
+                return;
+            }
+            else // Last use time earlier than current time.
+            {
+                if(hAllocation->CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, localCurrFrameIndex))
+                {
+                    localLastUseFrameIndex = localCurrFrameIndex;
+                }
+            }
+        }
+    }
+    else
+    {
+#if VMA_STATS_STRING_ENABLED
+        uint32_t localCurrFrameIndex = m_CurrentFrameIndex.load();
+        uint32_t localLastUseFrameIndex = hAllocation->GetLastUseFrameIndex();
+        for(;;)
+        {
+            VMA_ASSERT(localLastUseFrameIndex != VMA_FRAME_INDEX_LOST);
+            if(localLastUseFrameIndex == localCurrFrameIndex)
+            {
+                break;
+            }
+            else // Last use time earlier than current time.
+            {
+                if(hAllocation->CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, localCurrFrameIndex))
+                {
+                    localLastUseFrameIndex = localCurrFrameIndex;
+                }
+            }
+        }
+#endif
+
+        pAllocationInfo->memoryType = hAllocation->GetMemoryTypeIndex();
+        pAllocationInfo->deviceMemory = hAllocation->GetMemory();
+        pAllocationInfo->offset = hAllocation->GetOffset();
+        pAllocationInfo->size = hAllocation->GetSize();
+        pAllocationInfo->pMappedData = hAllocation->GetMappedData();
+        pAllocationInfo->pUserData = hAllocation->GetUserData();
+    }
+}
+
+bool VmaAllocator_T::TouchAllocation(VmaAllocation hAllocation)
+{
+    // This is a stripped-down version of VmaAllocator_T::GetAllocationInfo.
+    if(hAllocation->CanBecomeLost())
+    {
+        uint32_t localCurrFrameIndex = m_CurrentFrameIndex.load();
+        uint32_t localLastUseFrameIndex = hAllocation->GetLastUseFrameIndex();
+        for(;;)
+        {
+            if(localLastUseFrameIndex == VMA_FRAME_INDEX_LOST)
+            {
+                return false;
+            }
+            else if(localLastUseFrameIndex == localCurrFrameIndex)
+            {
+                return true;
+            }
+            else // Last use time earlier than current time.
+            {
+                if(hAllocation->CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, localCurrFrameIndex))
+                {
+                    localLastUseFrameIndex = localCurrFrameIndex;
+                }
+            }
+        }
+    }
+    else
+    {
+#if VMA_STATS_STRING_ENABLED
+        uint32_t localCurrFrameIndex = m_CurrentFrameIndex.load();
+        uint32_t localLastUseFrameIndex = hAllocation->GetLastUseFrameIndex();
+        for(;;)
+        {
+            VMA_ASSERT(localLastUseFrameIndex != VMA_FRAME_INDEX_LOST);
+            if(localLastUseFrameIndex == localCurrFrameIndex)
+            {
+                break;
+            }
+            else // Last use time earlier than current time.
+            {
+                if(hAllocation->CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, localCurrFrameIndex))
+                {
+                    localLastUseFrameIndex = localCurrFrameIndex;
+                }
+            }
+        }
+#endif
+
+        return true;
+    }
+}
+
+VkResult VmaAllocator_T::CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool)
+{
+    VMA_DEBUG_LOG("  CreatePool: MemoryTypeIndex=%u, flags=%u", pCreateInfo->memoryTypeIndex, pCreateInfo->flags);
+
+    VmaPoolCreateInfo newCreateInfo = *pCreateInfo;
+
+    if(newCreateInfo.maxBlockCount == 0)
+    {
+        newCreateInfo.maxBlockCount = SIZE_MAX;
+    }
+    if(newCreateInfo.minBlockCount > newCreateInfo.maxBlockCount)
+    {
+        return VK_ERROR_INITIALIZATION_FAILED;
+    }
+
+    const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(newCreateInfo.memoryTypeIndex);
+
+    *pPool = vma_new(this, VmaPool_T)(this, newCreateInfo, preferredBlockSize);
+
+    VkResult res = (*pPool)->m_BlockVector.CreateMinBlocks();
+    if(res != VK_SUCCESS)
+    {
+        vma_delete(this, *pPool);
+        *pPool = VMA_NULL;
+        return res;
+    }
+
+    // Add to m_Pools.
+    {
+        VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex);
+        (*pPool)->SetId(m_NextPoolId++);
+        VmaVectorInsertSorted<VmaPointerLess>(m_Pools, *pPool);
+    }
+
+    return VK_SUCCESS;
+}
+
+void VmaAllocator_T::DestroyPool(VmaPool pool)
+{
+    // Remove from m_Pools.
+    {
+        VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex);
+        bool success = VmaVectorRemoveSorted<VmaPointerLess>(m_Pools, pool);
+        VMA_ASSERT(success && "Pool not found in Allocator.");
+    }
+
+    vma_delete(this, pool);
+}
+
+void VmaAllocator_T::GetPoolStats(VmaPool pool, VmaPoolStats* pPoolStats)
+{
+    pool->m_BlockVector.GetPoolStats(pPoolStats);
+}
+
+void VmaAllocator_T::SetCurrentFrameIndex(uint32_t frameIndex)
+{
+    m_CurrentFrameIndex.store(frameIndex);
+
+#if VMA_MEMORY_BUDGET
+    if(m_UseExtMemoryBudget)
+    {
+        UpdateVulkanBudget();
+    }
+#endif // #if VMA_MEMORY_BUDGET
+}
+
+void VmaAllocator_T::MakePoolAllocationsLost(
+    VmaPool hPool,
+    size_t* pLostAllocationCount)
+{
+    hPool->m_BlockVector.MakePoolAllocationsLost(
+        m_CurrentFrameIndex.load(),
+        pLostAllocationCount);
+}
+
+VkResult VmaAllocator_T::CheckPoolCorruption(VmaPool hPool)
+{
+    return hPool->m_BlockVector.CheckCorruption();
+}
+
+VkResult VmaAllocator_T::CheckCorruption(uint32_t memoryTypeBits)
+{
+    VkResult finalRes = VK_ERROR_FEATURE_NOT_PRESENT;
+
+    // Process default pools.
+    for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)
+    {
+        if(((1u << memTypeIndex) & memoryTypeBits) != 0)
+        {
+            VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex];
+            VMA_ASSERT(pBlockVector);
+            VkResult localRes = pBlockVector->CheckCorruption();
+            switch(localRes)
+            {
+            case VK_ERROR_FEATURE_NOT_PRESENT:
+                break;
+            case VK_SUCCESS:
+                finalRes = VK_SUCCESS;
+                break;
+            default:
+                return localRes;
+            }
+        }
+    }
+
+    // Process custom pools.
+    {
+        VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex);
+        for(size_t poolIndex = 0, poolCount = m_Pools.size(); poolIndex < poolCount; ++poolIndex)
+        {
+            if(((1u << m_Pools[poolIndex]->m_BlockVector.GetMemoryTypeIndex()) & memoryTypeBits) != 0)
+            {
+                VkResult localRes = m_Pools[poolIndex]->m_BlockVector.CheckCorruption();
+                switch(localRes)
+                {
+                case VK_ERROR_FEATURE_NOT_PRESENT:
+                    break;
+                case VK_SUCCESS:
+                    finalRes = VK_SUCCESS;
+                    break;
+                default:
+                    return localRes;
+                }
+            }
+        }
+    }
+
+    return finalRes;
+}
+
+void VmaAllocator_T::CreateLostAllocation(VmaAllocation* pAllocation)
+{
+    *pAllocation = m_AllocationObjectAllocator.Allocate();
+    (*pAllocation)->Ctor(VMA_FRAME_INDEX_LOST, false);
+    (*pAllocation)->InitLost();
+}
+
+VkResult VmaAllocator_T::AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory)
+{
+    const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(pAllocateInfo->memoryTypeIndex);
+
+    // HeapSizeLimit is in effect for this heap.
+    if((m_HeapSizeLimitMask & (1u << heapIndex)) != 0)
+    {
+        const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size;
+        VkDeviceSize blockBytes = m_Budget.m_BlockBytes[heapIndex];
+        for(;;)
+        {
+            const VkDeviceSize blockBytesAfterAllocation = blockBytes + pAllocateInfo->allocationSize;
+            if(blockBytesAfterAllocation > heapSize)
+            {
+                return VK_ERROR_OUT_OF_DEVICE_MEMORY;
+            }
+            if(m_Budget.m_BlockBytes[heapIndex].compare_exchange_strong(blockBytes, blockBytesAfterAllocation))
+            {
+                break;
+            }
+        }
+    }
+    else
+    {
+        m_Budget.m_BlockBytes[heapIndex] += pAllocateInfo->allocationSize;
+    }
+
+    // VULKAN CALL vkAllocateMemory.
+    VkResult res = (*m_VulkanFunctions.vkAllocateMemory)(m_hDevice, pAllocateInfo, GetAllocationCallbacks(), pMemory);
+
+    if(res == VK_SUCCESS)
+    {
+#if VMA_MEMORY_BUDGET
+        ++m_Budget.m_OperationsSinceBudgetFetch;
+#endif
+
+        // Informative callback.
+        if(m_DeviceMemoryCallbacks.pfnAllocate != VMA_NULL)
+        {
+            (*m_DeviceMemoryCallbacks.pfnAllocate)(this, pAllocateInfo->memoryTypeIndex, *pMemory, pAllocateInfo->allocationSize);
+        }
+    }
+    else
+    {
+        m_Budget.m_BlockBytes[heapIndex] -= pAllocateInfo->allocationSize;
+    }
+
+    return res;
+}
+
+void VmaAllocator_T::FreeVulkanMemory(uint32_t memoryType, VkDeviceSize size, VkDeviceMemory hMemory)
+{
+    // Informative callback.
+    if(m_DeviceMemoryCallbacks.pfnFree != VMA_NULL)
+    {
+        (*m_DeviceMemoryCallbacks.pfnFree)(this, memoryType, hMemory, size);
+    }
+
+    // VULKAN CALL vkFreeMemory.
+    (*m_VulkanFunctions.vkFreeMemory)(m_hDevice, hMemory, GetAllocationCallbacks());
+
+    m_Budget.m_BlockBytes[MemoryTypeIndexToHeapIndex(memoryType)] -= size;
+}
+
+VkResult VmaAllocator_T::BindVulkanBuffer(
+    VkDeviceMemory memory,
+    VkDeviceSize memoryOffset,
+    VkBuffer buffer,
+    const void* pNext)
+{
+    if(pNext != VMA_NULL)
+    {
+#if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2
+        if((m_UseKhrBindMemory2 || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) &&
+            m_VulkanFunctions.vkBindBufferMemory2KHR != VMA_NULL)
+        {
+            VkBindBufferMemoryInfoKHR bindBufferMemoryInfo = { VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR };
+            bindBufferMemoryInfo.pNext = pNext;
+            bindBufferMemoryInfo.buffer = buffer;
+            bindBufferMemoryInfo.memory = memory;
+            bindBufferMemoryInfo.memoryOffset = memoryOffset;
+            return (*m_VulkanFunctions.vkBindBufferMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo);
+        }
+        else
+#endif // #if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2
+        {
+            return VK_ERROR_EXTENSION_NOT_PRESENT;
+        }
+    }
+    else
+    {
+        return (*m_VulkanFunctions.vkBindBufferMemory)(m_hDevice, buffer, memory, memoryOffset);
+    }
+}
+
+VkResult VmaAllocator_T::BindVulkanImage(
+    VkDeviceMemory memory,
+    VkDeviceSize memoryOffset,
+    VkImage image,
+    const void* pNext)
+{
+    if(pNext != VMA_NULL)
+    {
+#if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2
+        if((m_UseKhrBindMemory2 || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) &&
+            m_VulkanFunctions.vkBindImageMemory2KHR != VMA_NULL)
+        {
+            VkBindImageMemoryInfoKHR bindBufferMemoryInfo = { VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHR };
+            bindBufferMemoryInfo.pNext = pNext;
+            bindBufferMemoryInfo.image = image;
+            bindBufferMemoryInfo.memory = memory;
+            bindBufferMemoryInfo.memoryOffset = memoryOffset;
+            return (*m_VulkanFunctions.vkBindImageMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo);
+        }
+        else
+#endif // #if VMA_BIND_MEMORY2
+        {
+            return VK_ERROR_EXTENSION_NOT_PRESENT;
+        }
+    }
+    else
+    {
+        return (*m_VulkanFunctions.vkBindImageMemory)(m_hDevice, image, memory, memoryOffset);
+    }
+}
+
+VkResult VmaAllocator_T::Map(VmaAllocation hAllocation, void** ppData)
+{
+    if(hAllocation->CanBecomeLost())
+    {
+        return VK_ERROR_MEMORY_MAP_FAILED;
+    }
+
+    switch(hAllocation->GetType())
+    {
+    case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
+        {
+            VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock();
+            char *pBytes = VMA_NULL;
+            VkResult res = pBlock->Map(this, 1, (void**)&pBytes);
+            if(res == VK_SUCCESS)
+            {
+                *ppData = pBytes + (ptrdiff_t)hAllocation->GetOffset();
+                hAllocation->BlockAllocMap();
+            }
+            return res;
+        }
+    case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
+        return hAllocation->DedicatedAllocMap(this, ppData);
+    default:
+        VMA_ASSERT(0);
+        return VK_ERROR_MEMORY_MAP_FAILED;
+    }
+}
+
+void VmaAllocator_T::Unmap(VmaAllocation hAllocation)
+{
+    switch(hAllocation->GetType())
+    {
+    case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
+        {
+            VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock();
+            hAllocation->BlockAllocUnmap();
+            pBlock->Unmap(this, 1);
+        }
+        break;
+    case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
+        hAllocation->DedicatedAllocUnmap(this);
+        break;
+    default:
+        VMA_ASSERT(0);
+    }
+}
+
+VkResult VmaAllocator_T::BindBufferMemory(
+    VmaAllocation hAllocation,
+    VkDeviceSize allocationLocalOffset,
+    VkBuffer hBuffer,
+    const void* pNext)
+{
+    VkResult res = VK_SUCCESS;
+    switch(hAllocation->GetType())
+    {
+    case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
+        res = BindVulkanBuffer(hAllocation->GetMemory(), allocationLocalOffset, hBuffer, pNext);
+        break;
+    case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
+    {
+        VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock();
+        VMA_ASSERT(pBlock && "Binding buffer to allocation that doesn't belong to any block. Is the allocation lost?");
+        res = pBlock->BindBufferMemory(this, hAllocation, allocationLocalOffset, hBuffer, pNext);
+        break;
+    }
+    default:
+        VMA_ASSERT(0);
+    }
+    return res;
+}
+
+VkResult VmaAllocator_T::BindImageMemory(
+    VmaAllocation hAllocation,
+    VkDeviceSize allocationLocalOffset,
+    VkImage hImage,
+    const void* pNext)
+{
+    VkResult res = VK_SUCCESS;
+    switch(hAllocation->GetType())
+    {
+    case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
+        res = BindVulkanImage(hAllocation->GetMemory(), allocationLocalOffset, hImage, pNext);
+        break;
+    case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
+    {
+        VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock();
+        VMA_ASSERT(pBlock && "Binding image to allocation that doesn't belong to any block. Is the allocation lost?");
+        res = pBlock->BindImageMemory(this, hAllocation, allocationLocalOffset, hImage, pNext);
+        break;
+    }
+    default:
+        VMA_ASSERT(0);
+    }
+    return res;
+}
+
+void VmaAllocator_T::FlushOrInvalidateAllocation(
+    VmaAllocation hAllocation,
+    VkDeviceSize offset, VkDeviceSize size,
+    VMA_CACHE_OPERATION op)
+{
+    const uint32_t memTypeIndex = hAllocation->GetMemoryTypeIndex();
+    if(size > 0 && IsMemoryTypeNonCoherent(memTypeIndex))
+    {
+        const VkDeviceSize allocationSize = hAllocation->GetSize();
+        VMA_ASSERT(offset <= allocationSize);
+
+        const VkDeviceSize nonCoherentAtomSize = m_PhysicalDeviceProperties.limits.nonCoherentAtomSize;
+
+        VkMappedMemoryRange memRange = { VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE };
+        memRange.memory = hAllocation->GetMemory();
+        
+        switch(hAllocation->GetType())
+        {
+        case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:
+            memRange.offset = VmaAlignDown(offset, nonCoherentAtomSize);
+            if(size == VK_WHOLE_SIZE)
+            {
+                memRange.size = allocationSize - memRange.offset;
+            }
+            else
+            {
+                VMA_ASSERT(offset + size <= allocationSize);
+                memRange.size = VMA_MIN(
+                    VmaAlignUp(size + (offset - memRange.offset), nonCoherentAtomSize),
+                    allocationSize - memRange.offset);
+            }
+            break;
+
+        case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:
+        {
+            // 1. Still within this allocation.
+            memRange.offset = VmaAlignDown(offset, nonCoherentAtomSize);
+            if(size == VK_WHOLE_SIZE)
+            {
+                size = allocationSize - offset;
+            }
+            else
+            {
+                VMA_ASSERT(offset + size <= allocationSize);
+            }
+            memRange.size = VmaAlignUp(size + (offset - memRange.offset), nonCoherentAtomSize);
+
+            // 2. Adjust to whole block.
+            const VkDeviceSize allocationOffset = hAllocation->GetOffset();
+            VMA_ASSERT(allocationOffset % nonCoherentAtomSize == 0);
+            const VkDeviceSize blockSize = hAllocation->GetBlock()->m_pMetadata->GetSize();
+            memRange.offset += allocationOffset;
+            memRange.size = VMA_MIN(memRange.size, blockSize - memRange.offset);
+            
+            break;
+        }
+        
+        default:
+            VMA_ASSERT(0);
+        }
+
+        switch(op)
+        {
+        case VMA_CACHE_FLUSH:
+            (*GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hDevice, 1, &memRange);
+            break;
+        case VMA_CACHE_INVALIDATE:
+            (*GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hDevice, 1, &memRange);
+            break;
+        default:
+            VMA_ASSERT(0);
+        }
+    }
+    // else: Just ignore this call.
+}
+
+void VmaAllocator_T::FreeDedicatedMemory(const VmaAllocation allocation)
+{
+    VMA_ASSERT(allocation && allocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED);
+
+    const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex();
+    {
+        VmaMutexLockWrite lock(m_DedicatedAllocationsMutex[memTypeIndex], m_UseMutex);
+        AllocationVectorType* const pDedicatedAllocations = m_pDedicatedAllocations[memTypeIndex];
+        VMA_ASSERT(pDedicatedAllocations);
+        bool success = VmaVectorRemoveSorted<VmaPointerLess>(*pDedicatedAllocations, allocation);
+        VMA_ASSERT(success);
+    }
+
+    VkDeviceMemory hMemory = allocation->GetMemory();
+    
+    /*
+    There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory
+    before vkFreeMemory.
+
+    if(allocation->GetMappedData() != VMA_NULL)
+    {
+        (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory);
+    }
+    */
+    
+    FreeVulkanMemory(memTypeIndex, allocation->GetSize(), hMemory);
+
+    VMA_DEBUG_LOG("    Freed DedicatedMemory MemoryTypeIndex=%u", memTypeIndex);
+}
+
+uint32_t VmaAllocator_T::CalculateGpuDefragmentationMemoryTypeBits() const
+{
+    VkBufferCreateInfo dummyBufCreateInfo;
+    VmaFillGpuDefragmentationBufferCreateInfo(dummyBufCreateInfo);
+
+    uint32_t memoryTypeBits = 0;
+
+    // Create buffer.
+    VkBuffer buf = VK_NULL_HANDLE;
+    VkResult res = (*GetVulkanFunctions().vkCreateBuffer)(
+        m_hDevice, &dummyBufCreateInfo, GetAllocationCallbacks(), &buf);
+    if(res == VK_SUCCESS)
+    {
+        // Query for supported memory types.
+        VkMemoryRequirements memReq;
+        (*GetVulkanFunctions().vkGetBufferMemoryRequirements)(m_hDevice, buf, &memReq);
+        memoryTypeBits = memReq.memoryTypeBits;
+
+        // Destroy buffer.
+        (*GetVulkanFunctions().vkDestroyBuffer)(m_hDevice, buf, GetAllocationCallbacks());
+    }
+
+    return memoryTypeBits;
+}
+
+#if VMA_MEMORY_BUDGET
+
+void VmaAllocator_T::UpdateVulkanBudget()
+{
+    VMA_ASSERT(m_UseExtMemoryBudget);
+
+    VkPhysicalDeviceMemoryProperties2KHR memProps = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR };
+
+    VkPhysicalDeviceMemoryBudgetPropertiesEXT budgetProps = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT };
+    memProps.pNext = &budgetProps;
+
+    GetVulkanFunctions().vkGetPhysicalDeviceMemoryProperties2KHR(m_PhysicalDevice, &memProps);
+
+    {
+        VmaMutexLockWrite lockWrite(m_Budget.m_BudgetMutex, m_UseMutex);
+
+        for(uint32_t heapIndex = 0; heapIndex < GetMemoryHeapCount(); ++heapIndex)
+        {
+            m_Budget.m_VulkanUsage[heapIndex] = budgetProps.heapUsage[heapIndex];
+            m_Budget.m_VulkanBudget[heapIndex] = budgetProps.heapBudget[heapIndex];
+            m_Budget.m_BlockBytesAtBudgetFetch[heapIndex] = m_Budget.m_BlockBytes[heapIndex].load();
+        }
+        m_Budget.m_OperationsSinceBudgetFetch = 0;
+    }
+}
+
+#endif // #if VMA_MEMORY_BUDGET
+
+void VmaAllocator_T::FillAllocation(const VmaAllocation hAllocation, uint8_t pattern)
+{
+    if(VMA_DEBUG_INITIALIZE_ALLOCATIONS &&
+        !hAllocation->CanBecomeLost() &&
+        (m_MemProps.memoryTypes[hAllocation->GetMemoryTypeIndex()].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0)
+    {
+        void* pData = VMA_NULL;
+        VkResult res = Map(hAllocation, &pData);
+        if(res == VK_SUCCESS)
+        {
+            memset(pData, (int)pattern, (size_t)hAllocation->GetSize());
+            FlushOrInvalidateAllocation(hAllocation, 0, VK_WHOLE_SIZE, VMA_CACHE_FLUSH);
+            Unmap(hAllocation);
+        }
+        else
+        {
+            VMA_ASSERT(0 && "VMA_DEBUG_INITIALIZE_ALLOCATIONS is enabled, but couldn't map memory to fill allocation.");
+        }
+    }
+}
+
+uint32_t VmaAllocator_T::GetGpuDefragmentationMemoryTypeBits()
+{
+    uint32_t memoryTypeBits = m_GpuDefragmentationMemoryTypeBits.load();
+    if(memoryTypeBits == UINT32_MAX)
+    {
+        memoryTypeBits = CalculateGpuDefragmentationMemoryTypeBits();
+        m_GpuDefragmentationMemoryTypeBits.store(memoryTypeBits);
+    }
+    return memoryTypeBits;
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+void VmaAllocator_T::PrintDetailedMap(VmaJsonWriter& json)
+{
+    bool dedicatedAllocationsStarted = false;
+    for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)
+    {
+        VmaMutexLockRead dedicatedAllocationsLock(m_DedicatedAllocationsMutex[memTypeIndex], m_UseMutex);
+        AllocationVectorType* const pDedicatedAllocVector = m_pDedicatedAllocations[memTypeIndex];
+        VMA_ASSERT(pDedicatedAllocVector);
+        if(pDedicatedAllocVector->empty() == false)
+        {
+            if(dedicatedAllocationsStarted == false)
+            {
+                dedicatedAllocationsStarted = true;
+                json.WriteString("DedicatedAllocations");
+                json.BeginObject();
+            }
+
+            json.BeginString("Type ");
+            json.ContinueString(memTypeIndex);
+            json.EndString();
+                
+            json.BeginArray();
+
+            for(size_t i = 0; i < pDedicatedAllocVector->size(); ++i)
+            {
+                json.BeginObject(true);
+                const VmaAllocation hAlloc = (*pDedicatedAllocVector)[i];
+                hAlloc->PrintParameters(json);
+                json.EndObject();
+            }
+
+            json.EndArray();
+        }
+    }
+    if(dedicatedAllocationsStarted)
+    {
+        json.EndObject();
+    }
+
+    {
+        bool allocationsStarted = false;
+        for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)
+        {
+            if(m_pBlockVectors[memTypeIndex]->IsEmpty() == false)
+            {
+                if(allocationsStarted == false)
+                {
+                    allocationsStarted = true;
+                    json.WriteString("DefaultPools");
+                    json.BeginObject();
+                }
+
+                json.BeginString("Type ");
+                json.ContinueString(memTypeIndex);
+                json.EndString();
+
+                m_pBlockVectors[memTypeIndex]->PrintDetailedMap(json);
+            }
+        }
+        if(allocationsStarted)
+        {
+            json.EndObject();
+        }
+    }
+
+    // Custom pools
+    {
+        VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex);
+        const size_t poolCount = m_Pools.size();
+        if(poolCount > 0)
+        {
+            json.WriteString("Pools");
+            json.BeginObject();
+            for(size_t poolIndex = 0; poolIndex < poolCount; ++poolIndex)
+            {
+                json.BeginString();
+                json.ContinueString(m_Pools[poolIndex]->GetId());
+                json.EndString();
+
+                m_Pools[poolIndex]->m_BlockVector.PrintDetailedMap(json);
+            }
+            json.EndObject();
+        }
+    }
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+////////////////////////////////////////////////////////////////////////////////
+// Public interface
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAllocator(
+    const VmaAllocatorCreateInfo* pCreateInfo,
+    VmaAllocator* pAllocator)
+{
+    VMA_ASSERT(pCreateInfo && pAllocator);
+    VMA_ASSERT(pCreateInfo->vulkanApiVersion == 0 ||
+        (VK_VERSION_MAJOR(pCreateInfo->vulkanApiVersion) == 1 && VK_VERSION_MINOR(pCreateInfo->vulkanApiVersion) <= 1));
+    VMA_DEBUG_LOG("vmaCreateAllocator");
+    *pAllocator = vma_new(pCreateInfo->pAllocationCallbacks, VmaAllocator_T)(pCreateInfo);
+    return (*pAllocator)->Init(pCreateInfo);
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyAllocator(
+    VmaAllocator allocator)
+{
+    if(allocator != VK_NULL_HANDLE)
+    {
+        VMA_DEBUG_LOG("vmaDestroyAllocator");
+        VkAllocationCallbacks allocationCallbacks = allocator->m_AllocationCallbacks;
+        vma_delete(&allocationCallbacks, allocator);
+    }
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaGetPhysicalDeviceProperties(
+    VmaAllocator allocator,
+    const VkPhysicalDeviceProperties **ppPhysicalDeviceProperties)
+{
+    VMA_ASSERT(allocator && ppPhysicalDeviceProperties);
+    *ppPhysicalDeviceProperties = &allocator->m_PhysicalDeviceProperties;
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryProperties(
+    VmaAllocator allocator,
+    const VkPhysicalDeviceMemoryProperties** ppPhysicalDeviceMemoryProperties)
+{
+    VMA_ASSERT(allocator && ppPhysicalDeviceMemoryProperties);
+    *ppPhysicalDeviceMemoryProperties = &allocator->m_MemProps;
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryTypeProperties(
+    VmaAllocator allocator,
+    uint32_t memoryTypeIndex,
+    VkMemoryPropertyFlags* pFlags)
+{
+    VMA_ASSERT(allocator && pFlags);
+    VMA_ASSERT(memoryTypeIndex < allocator->GetMemoryTypeCount());
+    *pFlags = allocator->m_MemProps.memoryTypes[memoryTypeIndex].propertyFlags;
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaSetCurrentFrameIndex(
+    VmaAllocator allocator,
+    uint32_t frameIndex)
+{
+    VMA_ASSERT(allocator);
+    VMA_ASSERT(frameIndex != VMA_FRAME_INDEX_LOST);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    allocator->SetCurrentFrameIndex(frameIndex);
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStats(
+    VmaAllocator allocator,
+    VmaStats* pStats)
+{
+    VMA_ASSERT(allocator && pStats);
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+    allocator->CalculateStats(pStats);
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaGetBudget(
+    VmaAllocator allocator,
+    VmaBudget* pBudget)
+{
+    VMA_ASSERT(allocator && pBudget);
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+    allocator->GetBudget(pBudget, 0, allocator->GetMemoryHeapCount());
+}
+
+#if VMA_STATS_STRING_ENABLED
+
+VMA_CALL_PRE void VMA_CALL_POST vmaBuildStatsString(
+    VmaAllocator allocator,
+    char** ppStatsString,
+    VkBool32 detailedMap)
+{
+    VMA_ASSERT(allocator && ppStatsString);
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    VmaStringBuilder sb(allocator);
+    {
+        VmaJsonWriter json(allocator->GetAllocationCallbacks(), sb);
+        json.BeginObject();
+
+        VmaBudget budget[VK_MAX_MEMORY_HEAPS];
+        allocator->GetBudget(budget, 0, allocator->GetMemoryHeapCount());
+
+        VmaStats stats;
+        allocator->CalculateStats(&stats);
+
+        json.WriteString("Total");
+        VmaPrintStatInfo(json, stats.total);
+    
+        for(uint32_t heapIndex = 0; heapIndex < allocator->GetMemoryHeapCount(); ++heapIndex)
+        {
+            json.BeginString("Heap ");
+            json.ContinueString(heapIndex);
+            json.EndString();
+            json.BeginObject();
+
+            json.WriteString("Size");
+            json.WriteNumber(allocator->m_MemProps.memoryHeaps[heapIndex].size);
+
+            json.WriteString("Flags");
+            json.BeginArray(true);
+            if((allocator->m_MemProps.memoryHeaps[heapIndex].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) != 0)
+            {
+                json.WriteString("DEVICE_LOCAL");
+            }
+            json.EndArray();
+
+            json.WriteString("Budget");
+            json.BeginObject();
+            {
+                json.WriteString("BlockBytes");
+                json.WriteNumber(budget[heapIndex].blockBytes);
+                json.WriteString("AllocationBytes");
+                json.WriteNumber(budget[heapIndex].allocationBytes);
+                json.WriteString("Usage");
+                json.WriteNumber(budget[heapIndex].usage);
+                json.WriteString("Budget");
+                json.WriteNumber(budget[heapIndex].budget);
+            }
+            json.EndObject();
+
+            if(stats.memoryHeap[heapIndex].blockCount > 0)
+            {
+                json.WriteString("Stats");
+                VmaPrintStatInfo(json, stats.memoryHeap[heapIndex]);
+            }
+
+            for(uint32_t typeIndex = 0; typeIndex < allocator->GetMemoryTypeCount(); ++typeIndex)
+            {
+                if(allocator->MemoryTypeIndexToHeapIndex(typeIndex) == heapIndex)
+                {
+                    json.BeginString("Type ");
+                    json.ContinueString(typeIndex);
+                    json.EndString();
+
+                    json.BeginObject();
+
+                    json.WriteString("Flags");
+                    json.BeginArray(true);
+                    VkMemoryPropertyFlags flags = allocator->m_MemProps.memoryTypes[typeIndex].propertyFlags;
+                    if((flags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) != 0)
+                    {
+                        json.WriteString("DEVICE_LOCAL");
+                    }
+                    if((flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0)
+                    {
+                        json.WriteString("HOST_VISIBLE");
+                    }
+                    if((flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0)
+                    {
+                        json.WriteString("HOST_COHERENT");
+                    }
+                    if((flags & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) != 0)
+                    {
+                        json.WriteString("HOST_CACHED");
+                    }
+                    if((flags & VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT) != 0)
+                    {
+                        json.WriteString("LAZILY_ALLOCATED");
+                    }
+                    json.EndArray();
+
+                    if(stats.memoryType[typeIndex].blockCount > 0)
+                    {
+                        json.WriteString("Stats");
+                        VmaPrintStatInfo(json, stats.memoryType[typeIndex]);
+                    }
+
+                    json.EndObject();
+                }
+            }
+
+            json.EndObject();
+        }
+        if(detailedMap == VK_TRUE)
+        {
+            allocator->PrintDetailedMap(json);
+        }
+
+        json.EndObject();
+    }
+
+    const size_t len = sb.GetLength();
+    char* const pChars = vma_new_array(allocator, char, len + 1);
+    if(len > 0)
+    {
+        memcpy(pChars, sb.GetData(), len);
+    }
+    pChars[len] = '\0';
+    *ppStatsString = pChars;
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
+    VmaAllocator allocator,
+    char* pStatsString)
+{
+    if(pStatsString != VMA_NULL)
+    {
+        VMA_ASSERT(allocator);
+        size_t len = strlen(pStatsString);
+        vma_delete_array(allocator, pStatsString, len + 1);
+    }
+}
+
+#endif // #if VMA_STATS_STRING_ENABLED
+
+/*
+This function is not protected by any mutex because it just reads immutable data.
+*/
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndex(
+    VmaAllocator allocator,
+    uint32_t memoryTypeBits,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    uint32_t* pMemoryTypeIndex)
+{
+    VMA_ASSERT(allocator != VK_NULL_HANDLE);
+    VMA_ASSERT(pAllocationCreateInfo != VMA_NULL);
+    VMA_ASSERT(pMemoryTypeIndex != VMA_NULL);
+
+    if(pAllocationCreateInfo->memoryTypeBits != 0)
+    {
+        memoryTypeBits &= pAllocationCreateInfo->memoryTypeBits;
+    }
+    
+    uint32_t requiredFlags = pAllocationCreateInfo->requiredFlags;
+    uint32_t preferredFlags = pAllocationCreateInfo->preferredFlags;
+    uint32_t notPreferredFlags = 0;
+
+    // Convert usage to requiredFlags and preferredFlags.
+    switch(pAllocationCreateInfo->usage)
+    {
+    case VMA_MEMORY_USAGE_UNKNOWN:
+        break;
+    case VMA_MEMORY_USAGE_GPU_ONLY:
+        if(!allocator->IsIntegratedGpu() || (preferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)
+        {
+            preferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+        }
+        break;
+    case VMA_MEMORY_USAGE_CPU_ONLY:
+        requiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+        break;
+    case VMA_MEMORY_USAGE_CPU_TO_GPU:
+        requiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+        if(!allocator->IsIntegratedGpu() || (preferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)
+        {
+            preferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+        }
+        break;
+    case VMA_MEMORY_USAGE_GPU_TO_CPU:
+        requiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+        preferredFlags |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
+        break;
+    case VMA_MEMORY_USAGE_CPU_COPY:
+        notPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+        break;
+    case VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED:
+        requiredFlags |= VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT;
+        break;
+    default:
+        VMA_ASSERT(0);
+        break;
+    }
+
+    *pMemoryTypeIndex = UINT32_MAX;
+    uint32_t minCost = UINT32_MAX;
+    for(uint32_t memTypeIndex = 0, memTypeBit = 1;
+        memTypeIndex < allocator->GetMemoryTypeCount();
+        ++memTypeIndex, memTypeBit <<= 1)
+    {
+        // This memory type is acceptable according to memoryTypeBits bitmask.
+        if((memTypeBit & memoryTypeBits) != 0)
+        {
+            const VkMemoryPropertyFlags currFlags =
+                allocator->m_MemProps.memoryTypes[memTypeIndex].propertyFlags;
+            // This memory type contains requiredFlags.
+            if((requiredFlags & ~currFlags) == 0)
+            {
+                // Calculate cost as number of bits from preferredFlags not present in this memory type.
+                uint32_t currCost = VmaCountBitsSet(preferredFlags & ~currFlags) +
+                    VmaCountBitsSet(currFlags & notPreferredFlags);
+                // Remember memory type with lowest cost.
+                if(currCost < minCost)
+                {
+                    *pMemoryTypeIndex = memTypeIndex;
+                    if(currCost == 0)
+                    {
+                        return VK_SUCCESS;
+                    }
+                    minCost = currCost;
+                }
+            }
+        }
+    }
+    return (*pMemoryTypeIndex != UINT32_MAX) ? VK_SUCCESS : VK_ERROR_FEATURE_NOT_PRESENT;
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForBufferInfo(
+    VmaAllocator allocator,
+    const VkBufferCreateInfo* pBufferCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    uint32_t* pMemoryTypeIndex)
+{
+    VMA_ASSERT(allocator != VK_NULL_HANDLE);
+    VMA_ASSERT(pBufferCreateInfo != VMA_NULL);
+    VMA_ASSERT(pAllocationCreateInfo != VMA_NULL);
+    VMA_ASSERT(pMemoryTypeIndex != VMA_NULL);
+
+    const VkDevice hDev = allocator->m_hDevice;
+    VkBuffer hBuffer = VK_NULL_HANDLE;
+    VkResult res = allocator->GetVulkanFunctions().vkCreateBuffer(
+        hDev, pBufferCreateInfo, allocator->GetAllocationCallbacks(), &hBuffer);
+    if(res == VK_SUCCESS)
+    {
+        VkMemoryRequirements memReq = {};
+        allocator->GetVulkanFunctions().vkGetBufferMemoryRequirements(
+            hDev, hBuffer, &memReq);
+
+        res = vmaFindMemoryTypeIndex(
+            allocator,
+            memReq.memoryTypeBits,
+            pAllocationCreateInfo,
+            pMemoryTypeIndex);
+
+        allocator->GetVulkanFunctions().vkDestroyBuffer(
+            hDev, hBuffer, allocator->GetAllocationCallbacks());
+    }
+    return res;
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForImageInfo(
+    VmaAllocator allocator,
+    const VkImageCreateInfo* pImageCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    uint32_t* pMemoryTypeIndex)
+{
+    VMA_ASSERT(allocator != VK_NULL_HANDLE);
+    VMA_ASSERT(pImageCreateInfo != VMA_NULL);
+    VMA_ASSERT(pAllocationCreateInfo != VMA_NULL);
+    VMA_ASSERT(pMemoryTypeIndex != VMA_NULL);
+
+    const VkDevice hDev = allocator->m_hDevice;
+    VkImage hImage = VK_NULL_HANDLE;
+    VkResult res = allocator->GetVulkanFunctions().vkCreateImage(
+        hDev, pImageCreateInfo, allocator->GetAllocationCallbacks(), &hImage);
+    if(res == VK_SUCCESS)
+    {
+        VkMemoryRequirements memReq = {};
+        allocator->GetVulkanFunctions().vkGetImageMemoryRequirements(
+            hDev, hImage, &memReq);
+
+        res = vmaFindMemoryTypeIndex(
+            allocator,
+            memReq.memoryTypeBits,
+            pAllocationCreateInfo,
+            pMemoryTypeIndex);
+
+        allocator->GetVulkanFunctions().vkDestroyImage(
+            hDev, hImage, allocator->GetAllocationCallbacks());
+    }
+    return res;
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreatePool(
+	VmaAllocator allocator,
+	const VmaPoolCreateInfo* pCreateInfo,
+	VmaPool* pPool)
+{
+    VMA_ASSERT(allocator && pCreateInfo && pPool);
+    
+    VMA_DEBUG_LOG("vmaCreatePool");
+    
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+    
+    VkResult res = allocator->CreatePool(pCreateInfo, pPool);
+    
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordCreatePool(allocator->GetCurrentFrameIndex(), *pCreateInfo, *pPool);
+    }
+#endif
+    
+    return res;
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyPool(
+    VmaAllocator allocator,
+    VmaPool pool)
+{
+    VMA_ASSERT(allocator);
+    
+    if(pool == VK_NULL_HANDLE)
+    {
+        return;
+    }
+    
+    VMA_DEBUG_LOG("vmaDestroyPool");
+    
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+    
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordDestroyPool(allocator->GetCurrentFrameIndex(), pool);
+    }
+#endif
+
+    allocator->DestroyPool(pool);
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStats(
+    VmaAllocator allocator,
+    VmaPool pool,
+    VmaPoolStats* pPoolStats)
+{
+    VMA_ASSERT(allocator && pool && pPoolStats);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    allocator->GetPoolStats(pool, pPoolStats);
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaMakePoolAllocationsLost(
+    VmaAllocator allocator,
+    VmaPool pool,
+    size_t* pLostAllocationCount)
+{
+    VMA_ASSERT(allocator && pool);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordMakePoolAllocationsLost(allocator->GetCurrentFrameIndex(), pool);
+    }
+#endif
+
+    allocator->MakePoolAllocationsLost(pool, pLostAllocationCount);
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckPoolCorruption(VmaAllocator allocator, VmaPool pool)
+{
+    VMA_ASSERT(allocator && pool);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    VMA_DEBUG_LOG("vmaCheckPoolCorruption");
+
+    return allocator->CheckPoolCorruption(pool);
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolName(
+    VmaAllocator allocator,
+    VmaPool pool,
+    const char** ppName)
+{
+    VMA_ASSERT(allocator && pool);
+    
+    VMA_DEBUG_LOG("vmaGetPoolName");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    *ppName = pool->GetName();
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaSetPoolName(
+    VmaAllocator allocator,
+    VmaPool pool,
+    const char* pName)
+{
+    VMA_ASSERT(allocator && pool);
+
+    VMA_DEBUG_LOG("vmaSetPoolName");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    pool->SetName(pName);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordSetPoolName(allocator->GetCurrentFrameIndex(), pool, pName);
+    }
+#endif
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemory(
+    VmaAllocator allocator,
+    const VkMemoryRequirements* pVkMemoryRequirements,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocation);
+
+    VMA_DEBUG_LOG("vmaAllocateMemory");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+	VkResult result = allocator->AllocateMemory(
+        *pVkMemoryRequirements,
+        false, // requiresDedicatedAllocation
+        false, // prefersDedicatedAllocation
+        VK_NULL_HANDLE, // dedicatedBuffer
+        VK_NULL_HANDLE, // dedicatedImage
+        *pCreateInfo,
+        VMA_SUBALLOCATION_TYPE_UNKNOWN,
+        1, // allocationCount
+        pAllocation);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordAllocateMemory(
+            allocator->GetCurrentFrameIndex(),
+            *pVkMemoryRequirements,
+            *pCreateInfo,
+            *pAllocation);
+    }
+#endif
+        
+    if(pAllocationInfo != VMA_NULL && result == VK_SUCCESS)
+    {
+        allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);
+    }
+
+	return result;
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryPages(
+    VmaAllocator allocator,
+    const VkMemoryRequirements* pVkMemoryRequirements,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    size_t allocationCount,
+    VmaAllocation* pAllocations,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    if(allocationCount == 0)
+    {
+        return VK_SUCCESS;
+    }
+
+    VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocations);
+
+    VMA_DEBUG_LOG("vmaAllocateMemoryPages");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+	VkResult result = allocator->AllocateMemory(
+        *pVkMemoryRequirements,
+        false, // requiresDedicatedAllocation
+        false, // prefersDedicatedAllocation
+        VK_NULL_HANDLE, // dedicatedBuffer
+        VK_NULL_HANDLE, // dedicatedImage
+        *pCreateInfo,
+        VMA_SUBALLOCATION_TYPE_UNKNOWN,
+        allocationCount,
+        pAllocations);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordAllocateMemoryPages(
+            allocator->GetCurrentFrameIndex(),
+            *pVkMemoryRequirements,
+            *pCreateInfo,
+            (uint64_t)allocationCount,
+            pAllocations);
+    }
+#endif
+        
+    if(pAllocationInfo != VMA_NULL && result == VK_SUCCESS)
+    {
+        for(size_t i = 0; i < allocationCount; ++i)
+        {
+            allocator->GetAllocationInfo(pAllocations[i], pAllocationInfo + i);
+        }
+    }
+
+	return result;
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForBuffer(
+    VmaAllocator allocator,
+    VkBuffer buffer,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    VMA_ASSERT(allocator && buffer != VK_NULL_HANDLE && pCreateInfo && pAllocation);
+
+    VMA_DEBUG_LOG("vmaAllocateMemoryForBuffer");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    VkMemoryRequirements vkMemReq = {};
+    bool requiresDedicatedAllocation = false;
+    bool prefersDedicatedAllocation = false;
+    allocator->GetBufferMemoryRequirements(buffer, vkMemReq,
+        requiresDedicatedAllocation,
+        prefersDedicatedAllocation);
+
+    VkResult result = allocator->AllocateMemory(
+        vkMemReq,
+        requiresDedicatedAllocation,
+        prefersDedicatedAllocation,
+        buffer, // dedicatedBuffer
+        VK_NULL_HANDLE, // dedicatedImage
+        *pCreateInfo,
+        VMA_SUBALLOCATION_TYPE_BUFFER,
+        1, // allocationCount
+        pAllocation);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordAllocateMemoryForBuffer(
+            allocator->GetCurrentFrameIndex(),
+            vkMemReq,
+            requiresDedicatedAllocation,
+            prefersDedicatedAllocation,
+            *pCreateInfo,
+            *pAllocation);
+    }
+#endif
+
+    if(pAllocationInfo && result == VK_SUCCESS)
+    {
+        allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);
+    }
+
+	return result;
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForImage(
+    VmaAllocator allocator,
+    VkImage image,
+    const VmaAllocationCreateInfo* pCreateInfo,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    VMA_ASSERT(allocator && image != VK_NULL_HANDLE && pCreateInfo && pAllocation);
+
+    VMA_DEBUG_LOG("vmaAllocateMemoryForImage");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    VkMemoryRequirements vkMemReq = {};
+    bool requiresDedicatedAllocation = false;
+    bool prefersDedicatedAllocation  = false;
+    allocator->GetImageMemoryRequirements(image, vkMemReq,
+        requiresDedicatedAllocation, prefersDedicatedAllocation);
+
+    VkResult result = allocator->AllocateMemory(
+        vkMemReq,
+        requiresDedicatedAllocation,
+        prefersDedicatedAllocation,
+        VK_NULL_HANDLE, // dedicatedBuffer
+        image, // dedicatedImage
+        *pCreateInfo,
+        VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN,
+        1, // allocationCount
+        pAllocation);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordAllocateMemoryForImage(
+            allocator->GetCurrentFrameIndex(),
+            vkMemReq,
+            requiresDedicatedAllocation,
+            prefersDedicatedAllocation,
+            *pCreateInfo,
+            *pAllocation);
+    }
+#endif
+
+    if(pAllocationInfo && result == VK_SUCCESS)
+    {
+        allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);
+    }
+
+	return result;
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation)
+{
+    VMA_ASSERT(allocator);
+    
+    if(allocation == VK_NULL_HANDLE)
+    {
+        return;
+    }
+    
+    VMA_DEBUG_LOG("vmaFreeMemory");
+    
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordFreeMemory(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+    
+    allocator->FreeMemory(
+        1, // allocationCount
+        &allocation);
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemoryPages(
+    VmaAllocator allocator,
+    size_t allocationCount,
+    VmaAllocation* pAllocations)
+{
+    if(allocationCount == 0)
+    {
+        return;
+    }
+
+    VMA_ASSERT(allocator);
+    
+    VMA_DEBUG_LOG("vmaFreeMemoryPages");
+    
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordFreeMemoryPages(
+            allocator->GetCurrentFrameIndex(),
+            (uint64_t)allocationCount,
+            pAllocations);
+    }
+#endif
+    
+    allocator->FreeMemory(allocationCount, pAllocations);
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaResizeAllocation(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkDeviceSize newSize)
+{
+    VMA_ASSERT(allocator && allocation);
+    
+    VMA_DEBUG_LOG("vmaResizeAllocation");
+    
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    return allocator->ResizeAllocation(allocation, newSize);
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationInfo(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    VMA_ASSERT(allocator && allocation && pAllocationInfo);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordGetAllocationInfo(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+
+    allocator->GetAllocationInfo(allocation, pAllocationInfo);
+}
+
+VMA_CALL_PRE VkBool32 VMA_CALL_POST vmaTouchAllocation(
+    VmaAllocator allocator,
+    VmaAllocation allocation)
+{
+    VMA_ASSERT(allocator && allocation);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordTouchAllocation(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+
+    return allocator->TouchAllocation(allocation);
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationUserData(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    void* pUserData)
+{
+    VMA_ASSERT(allocator && allocation);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    allocation->SetUserData(allocator, pUserData);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordSetAllocationUserData(
+            allocator->GetCurrentFrameIndex(),
+            allocation,
+            pUserData);
+    }
+#endif
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaCreateLostAllocation(
+    VmaAllocator allocator,
+    VmaAllocation* pAllocation)
+{
+    VMA_ASSERT(allocator && pAllocation);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK;
+
+    allocator->CreateLostAllocation(pAllocation);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordCreateLostAllocation(
+            allocator->GetCurrentFrameIndex(),
+            *pAllocation);
+    }
+#endif
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaMapMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    void** ppData)
+{
+    VMA_ASSERT(allocator && allocation && ppData);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    VkResult res = allocator->Map(allocation, ppData);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordMapMemory(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+
+    return res;
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaUnmapMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation)
+{
+    VMA_ASSERT(allocator && allocation);
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordUnmapMemory(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+
+    allocator->Unmap(allocation);
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaFlushAllocation(VmaAllocator allocator, VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size)
+{
+    VMA_ASSERT(allocator && allocation);
+
+    VMA_DEBUG_LOG("vmaFlushAllocation");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_FLUSH);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordFlushAllocation(
+            allocator->GetCurrentFrameIndex(),
+            allocation, offset, size);
+    }
+#endif
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaInvalidateAllocation(VmaAllocator allocator, VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size)
+{
+    VMA_ASSERT(allocator && allocation);
+
+    VMA_DEBUG_LOG("vmaInvalidateAllocation");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_INVALIDATE);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordInvalidateAllocation(
+            allocator->GetCurrentFrameIndex(),
+            allocation, offset, size);
+    }
+#endif
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckCorruption(VmaAllocator allocator, uint32_t memoryTypeBits)
+{
+    VMA_ASSERT(allocator);
+
+    VMA_DEBUG_LOG("vmaCheckCorruption");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    return allocator->CheckCorruption(memoryTypeBits);
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaDefragment(
+    VmaAllocator allocator,
+    VmaAllocation* pAllocations,
+    size_t allocationCount,
+    VkBool32* pAllocationsChanged,
+    const VmaDefragmentationInfo *pDefragmentationInfo,
+    VmaDefragmentationStats* pDefragmentationStats)
+{
+    // Deprecated interface, reimplemented using new one.
+
+    VmaDefragmentationInfo2 info2 = {};
+    info2.allocationCount = (uint32_t)allocationCount;
+    info2.pAllocations = pAllocations;
+    info2.pAllocationsChanged = pAllocationsChanged;
+    if(pDefragmentationInfo != VMA_NULL)
+    {
+        info2.maxCpuAllocationsToMove = pDefragmentationInfo->maxAllocationsToMove;
+        info2.maxCpuBytesToMove = pDefragmentationInfo->maxBytesToMove;
+    }
+    else
+    {
+        info2.maxCpuAllocationsToMove = UINT32_MAX;
+        info2.maxCpuBytesToMove = VK_WHOLE_SIZE;
+    }
+    // info2.flags, maxGpuAllocationsToMove, maxGpuBytesToMove, commandBuffer deliberately left zero.
+
+    VmaDefragmentationContext ctx;
+    VkResult res = vmaDefragmentationBegin(allocator, &info2, pDefragmentationStats, &ctx);
+    if(res == VK_NOT_READY)
+    {
+        res = vmaDefragmentationEnd( allocator, ctx);
+    }
+    return res;
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaDefragmentationBegin(
+    VmaAllocator allocator,
+    const VmaDefragmentationInfo2* pInfo,
+    VmaDefragmentationStats* pStats,
+    VmaDefragmentationContext *pContext)
+{
+    VMA_ASSERT(allocator && pInfo && pContext);
+
+    // Degenerate case: Nothing to defragment.
+    if(pInfo->allocationCount == 0 && pInfo->poolCount == 0)
+    {
+        return VK_SUCCESS;
+    }
+
+    VMA_ASSERT(pInfo->allocationCount == 0 || pInfo->pAllocations != VMA_NULL);
+    VMA_ASSERT(pInfo->poolCount == 0 || pInfo->pPools != VMA_NULL);
+    VMA_HEAVY_ASSERT(VmaValidatePointerArray(pInfo->allocationCount, pInfo->pAllocations));
+    VMA_HEAVY_ASSERT(VmaValidatePointerArray(pInfo->poolCount, pInfo->pPools));
+
+    VMA_DEBUG_LOG("vmaDefragmentationBegin");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    VkResult res = allocator->DefragmentationBegin(*pInfo, pStats, pContext);
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordDefragmentationBegin(
+            allocator->GetCurrentFrameIndex(), *pInfo, *pContext);
+    }
+#endif
+
+    return res;
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaDefragmentationEnd(
+    VmaAllocator allocator,
+    VmaDefragmentationContext context)
+{
+    VMA_ASSERT(allocator);
+
+    VMA_DEBUG_LOG("vmaDefragmentationEnd");
+
+    if(context != VK_NULL_HANDLE)
+    {
+        VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+        if(allocator->GetRecorder() != VMA_NULL)
+        {
+            allocator->GetRecorder()->RecordDefragmentationEnd(
+                allocator->GetCurrentFrameIndex(), context);
+        }
+#endif
+
+        return allocator->DefragmentationEnd(context);
+    }
+    else
+    {
+        return VK_SUCCESS;
+    }
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentationPass(
+    VmaAllocator allocator,
+    VmaDefragmentationContext context,
+    VmaDefragmentationPassInfo* pInfo
+    )
+{
+    VMA_ASSERT(allocator);
+    VMA_ASSERT(pInfo);
+    VMA_HEAVY_ASSERT(VmaValidatePointerArray(pInfo->moveCount, pInfo->pMoves));
+
+    VMA_DEBUG_LOG("vmaBeginDefragmentationPass");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    if(context == VK_NULL_HANDLE)
+    {
+        pInfo->moveCount = 0;
+        return VK_SUCCESS;
+    }
+
+    return allocator->DefragmentationPassBegin(pInfo, context);
+}
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaEndDefragmentationPass(
+    VmaAllocator allocator,
+    VmaDefragmentationContext context)
+{
+    VMA_ASSERT(allocator);
+
+    VMA_DEBUG_LOG("vmaEndDefragmentationPass");
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    if(context == VK_NULL_HANDLE)
+        return VK_SUCCESS;
+
+    return allocator->DefragmentationPassEnd(context);
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkBuffer buffer)
+{
+    VMA_ASSERT(allocator && allocation && buffer);
+
+    VMA_DEBUG_LOG("vmaBindBufferMemory");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    return allocator->BindBufferMemory(allocation, 0, buffer, VMA_NULL);
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory2(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkDeviceSize allocationLocalOffset,
+    VkBuffer buffer,
+    const void* pNext)
+{
+    VMA_ASSERT(allocator && allocation && buffer);
+
+    VMA_DEBUG_LOG("vmaBindBufferMemory2");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    return allocator->BindBufferMemory(allocation, allocationLocalOffset, buffer, pNext);
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkImage image)
+{
+    VMA_ASSERT(allocator && allocation && image);
+
+    VMA_DEBUG_LOG("vmaBindImageMemory");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    return allocator->BindImageMemory(allocation, 0, image, VMA_NULL);
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory2(
+    VmaAllocator allocator,
+    VmaAllocation allocation,
+    VkDeviceSize allocationLocalOffset,
+    VkImage image,
+    const void* pNext)
+{
+    VMA_ASSERT(allocator && allocation && image);
+
+    VMA_DEBUG_LOG("vmaBindImageMemory2");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+        return allocator->BindImageMemory(allocation, allocationLocalOffset, image, pNext);
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBuffer(
+    VmaAllocator allocator,
+    const VkBufferCreateInfo* pBufferCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    VkBuffer* pBuffer,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    VMA_ASSERT(allocator && pBufferCreateInfo && pAllocationCreateInfo && pBuffer && pAllocation);
+
+    if(pBufferCreateInfo->size == 0)
+    {
+        return VK_ERROR_VALIDATION_FAILED_EXT;
+    }
+    
+    VMA_DEBUG_LOG("vmaCreateBuffer");
+    
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    *pBuffer = VK_NULL_HANDLE;
+    *pAllocation = VK_NULL_HANDLE;
+
+    // 1. Create VkBuffer.
+    VkResult res = (*allocator->GetVulkanFunctions().vkCreateBuffer)(
+        allocator->m_hDevice,
+        pBufferCreateInfo,
+        allocator->GetAllocationCallbacks(),
+        pBuffer);
+    if(res >= 0)
+    {
+        // 2. vkGetBufferMemoryRequirements.
+        VkMemoryRequirements vkMemReq = {};
+        bool requiresDedicatedAllocation = false;
+        bool prefersDedicatedAllocation  = false;
+        allocator->GetBufferMemoryRequirements(*pBuffer, vkMemReq,
+            requiresDedicatedAllocation, prefersDedicatedAllocation);
+
+        // Make sure alignment requirements for specific buffer usages reported
+        // in Physical Device Properties are included in alignment reported by memory requirements.
+        if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT) != 0)
+        {
+           VMA_ASSERT(vkMemReq.alignment %
+              allocator->m_PhysicalDeviceProperties.limits.minTexelBufferOffsetAlignment == 0);
+        }
+        if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT) != 0)
+        {
+           VMA_ASSERT(vkMemReq.alignment %
+              allocator->m_PhysicalDeviceProperties.limits.minUniformBufferOffsetAlignment == 0);
+        }
+        if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_STORAGE_BUFFER_BIT) != 0)
+        {
+           VMA_ASSERT(vkMemReq.alignment %
+              allocator->m_PhysicalDeviceProperties.limits.minStorageBufferOffsetAlignment == 0);
+        }
+
+        // 3. Allocate memory using allocator.
+        res = allocator->AllocateMemory(
+            vkMemReq,
+            requiresDedicatedAllocation,
+            prefersDedicatedAllocation,
+            *pBuffer, // dedicatedBuffer
+            VK_NULL_HANDLE, // dedicatedImage
+            *pAllocationCreateInfo,
+            VMA_SUBALLOCATION_TYPE_BUFFER,
+            1, // allocationCount
+            pAllocation);
+
+#if VMA_RECORDING_ENABLED
+        if(allocator->GetRecorder() != VMA_NULL)
+        {
+            allocator->GetRecorder()->RecordCreateBuffer(
+                allocator->GetCurrentFrameIndex(),
+                *pBufferCreateInfo,
+                *pAllocationCreateInfo,
+                *pAllocation);
+        }
+#endif
+
+        if(res >= 0)
+        {
+            // 3. Bind buffer with memory.
+            if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0)
+            {
+                res = allocator->BindBufferMemory(*pAllocation, 0, *pBuffer, VMA_NULL);
+            }
+            if(res >= 0)
+            {
+                // All steps succeeded.
+                #if VMA_STATS_STRING_ENABLED
+                    (*pAllocation)->InitBufferImageUsage(pBufferCreateInfo->usage);
+                #endif
+                if(pAllocationInfo != VMA_NULL)
+                {
+                    allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);
+                }
+
+                return VK_SUCCESS;
+            }
+            allocator->FreeMemory(
+                1, // allocationCount
+                pAllocation);
+            *pAllocation = VK_NULL_HANDLE;
+            (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks());
+            *pBuffer = VK_NULL_HANDLE;
+            return res;
+        }
+        (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks());
+        *pBuffer = VK_NULL_HANDLE;
+        return res;
+    }
+    return res;
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyBuffer(
+    VmaAllocator allocator,
+    VkBuffer buffer,
+    VmaAllocation allocation)
+{
+    VMA_ASSERT(allocator);
+
+    if(buffer == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE)
+    {
+        return;
+    }
+
+    VMA_DEBUG_LOG("vmaDestroyBuffer");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordDestroyBuffer(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+
+    if(buffer != VK_NULL_HANDLE)
+    {
+        (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, buffer, allocator->GetAllocationCallbacks());
+    }
+
+    if(allocation != VK_NULL_HANDLE)
+    {
+        allocator->FreeMemory(
+            1, // allocationCount
+            &allocation);
+    }
+}
+
+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage(
+    VmaAllocator allocator,
+    const VkImageCreateInfo* pImageCreateInfo,
+    const VmaAllocationCreateInfo* pAllocationCreateInfo,
+    VkImage* pImage,
+    VmaAllocation* pAllocation,
+    VmaAllocationInfo* pAllocationInfo)
+{
+    VMA_ASSERT(allocator && pImageCreateInfo && pAllocationCreateInfo && pImage && pAllocation);
+
+    if(pImageCreateInfo->extent.width == 0 ||
+        pImageCreateInfo->extent.height == 0 ||
+        pImageCreateInfo->extent.depth == 0 ||
+        pImageCreateInfo->mipLevels == 0 ||
+        pImageCreateInfo->arrayLayers == 0)
+    {
+        return VK_ERROR_VALIDATION_FAILED_EXT;
+    }
+
+    VMA_DEBUG_LOG("vmaCreateImage");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+    *pImage = VK_NULL_HANDLE;
+    *pAllocation = VK_NULL_HANDLE;
+
+    // 1. Create VkImage.
+    VkResult res = (*allocator->GetVulkanFunctions().vkCreateImage)(
+        allocator->m_hDevice,
+        pImageCreateInfo,
+        allocator->GetAllocationCallbacks(),
+        pImage);
+    if(res >= 0)
+    {
+        VmaSuballocationType suballocType = pImageCreateInfo->tiling == VK_IMAGE_TILING_OPTIMAL ?
+            VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL :
+            VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR;
+        
+        // 2. Allocate memory using allocator.
+        VkMemoryRequirements vkMemReq = {};
+        bool requiresDedicatedAllocation = false;
+        bool prefersDedicatedAllocation  = false;
+        allocator->GetImageMemoryRequirements(*pImage, vkMemReq,
+            requiresDedicatedAllocation, prefersDedicatedAllocation);
+
+        res = allocator->AllocateMemory(
+            vkMemReq,
+            requiresDedicatedAllocation,
+            prefersDedicatedAllocation,
+            VK_NULL_HANDLE, // dedicatedBuffer
+            *pImage, // dedicatedImage
+            *pAllocationCreateInfo,
+            suballocType,
+            1, // allocationCount
+            pAllocation);
+
+#if VMA_RECORDING_ENABLED
+        if(allocator->GetRecorder() != VMA_NULL)
+        {
+            allocator->GetRecorder()->RecordCreateImage(
+                allocator->GetCurrentFrameIndex(),
+                *pImageCreateInfo,
+                *pAllocationCreateInfo,
+                *pAllocation);
+        }
+#endif
+
+        if(res >= 0)
+        {
+            // 3. Bind image with memory.
+            if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0)
+            {
+                res = allocator->BindImageMemory(*pAllocation, 0, *pImage, VMA_NULL);
+            }
+            if(res >= 0)
+            {
+                // All steps succeeded.
+                #if VMA_STATS_STRING_ENABLED
+                    (*pAllocation)->InitBufferImageUsage(pImageCreateInfo->usage);
+                #endif
+                if(pAllocationInfo != VMA_NULL)
+                {
+                    allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);
+                }
+
+                return VK_SUCCESS;
+            }
+            allocator->FreeMemory(
+                1, // allocationCount
+                pAllocation);
+            *pAllocation = VK_NULL_HANDLE;
+            (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks());
+            *pImage = VK_NULL_HANDLE;
+            return res;
+        }
+        (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks());
+        *pImage = VK_NULL_HANDLE;
+        return res;
+    }
+    return res;
+}
+
+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage(
+    VmaAllocator allocator,
+    VkImage image,
+    VmaAllocation allocation)
+{
+    VMA_ASSERT(allocator);
+
+    if(image == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE)
+    {
+        return;
+    }
+
+    VMA_DEBUG_LOG("vmaDestroyImage");
+
+    VMA_DEBUG_GLOBAL_MUTEX_LOCK
+
+#if VMA_RECORDING_ENABLED
+    if(allocator->GetRecorder() != VMA_NULL)
+    {
+        allocator->GetRecorder()->RecordDestroyImage(
+            allocator->GetCurrentFrameIndex(),
+            allocation);
+    }
+#endif
+
+    if(image != VK_NULL_HANDLE)
+    {
+        (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, image, allocator->GetAllocationCallbacks());
+    }
+    if(allocation != VK_NULL_HANDLE)
+    {
+        allocator->FreeMemory(
+            1, // allocationCount
+            &allocation);
+    }
+}
+
+#endif // #ifdef VMA_IMPLEMENTATION
diff --git a/3rdparty/MoltenVK/.gitignore b/3rdparty/MoltenVK/.gitignore
deleted file mode 100644
index b67fced9fd..0000000000
--- a/3rdparty/MoltenVK/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.ninja_log
-build.ninja
-cmake_install.cmake
-CMakeCache.txt
-CMakeFiles
-MoltenVK
-moltenvk-prefix
diff --git a/3rdparty/MoltenVK/CMakeLists.txt b/3rdparty/MoltenVK/CMakeLists.txt
deleted file mode 100644
index ec9c2b802b..0000000000
--- a/3rdparty/MoltenVK/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-project(moltenvk NONE)
-include(ExternalProject)
-
-ExternalProject_Add(moltenvk
-	GIT_REPOSITORY https://github.com/KhronosGroup/MoltenVK.git
-	GIT_TAG 49b97f2
-	BUILD_IN_SOURCE 1
-	SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK
-	CONFIGURE_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/fetchDependencies" --macos
-	BUILD_COMMAND xcodebuild build -quiet -project "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/MoltenVKPackaging.xcodeproj" -scheme "MoltenVK Package \(macOS only\)" -configuration "Release" -arch "${CMAKE_HOST_SYSTEM_PROCESSOR}"
-	COMMAND ln -f "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/MoltenVK/dylib/macOS/libMoltenVK.dylib" "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/Build/Products/Release/dynamic/libMoltenVK.dylib"
-	INSTALL_COMMAND ""
-	BUILD_BYPRODUCTS "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/Build/Products/Release/dynamic/libMoltenVK.dylib"
-)
diff --git a/3rdparty/OpenAL/CMakeLists.txt b/3rdparty/OpenAL/CMakeLists.txt
index b9fee23ce5..715534e5bf 100644
--- a/3rdparty/OpenAL/CMakeLists.txt
+++ b/3rdparty/OpenAL/CMakeLists.txt
@@ -1,18 +1,11 @@
 # OpenAL
-if(USE_SYSTEM_OPENAL)
-    if(WIN32)
-      find_package(OpenAL CONFIG REQUIRED)
-    else()
-      find_package(OpenAL REQUIRED)
-    endif()
-    add_library(3rdparty_openal INTERFACE)
-    target_link_libraries(3rdparty_openal INTERFACE OpenAL::OpenAL)
-    set_target_properties(OpenAL::OpenAL PROPERTIES IMPORTED_GLOBAL ON)
+if (MSVC)
+	find_path(OPENAL_INCLUDE_DIR al.h PATHS OpenAL/include)
+	find_library(OPENAL_LIBRARY OpenAL32 PATHS OpenAL/libs/Win64/)
 else()
-    option(ALSOFT_UTILS "Build utility programs" OFF)
-    option(ALSOFT_EXAMPLES "Build example programs" OFF)
-    set(LIBTYPE "STATIC")
-    add_subdirectory(openal-soft EXCLUDE_FROM_ALL)
-    add_library(3rdparty_openal INTERFACE)
-    target_link_libraries(3rdparty_openal INTERFACE OpenAL::OpenAL)
+	find_package(OpenAL REQUIRED)
 endif()
+
+add_library(3rdparty_openal INTERFACE)
+target_include_directories(3rdparty_openal INTERFACE ${OPENAL_INCLUDE_DIR})
+target_link_libraries(3rdparty_openal INTERFACE ${OPENAL_LIBRARY})
diff --git a/3rdparty/OpenAL/include/al.h b/3rdparty/OpenAL/include/al.h
new file mode 100644
index 0000000000..8749e1b77e
--- /dev/null
+++ b/3rdparty/OpenAL/include/al.h
@@ -0,0 +1,655 @@
+#ifndef AL_AL_H
+#define AL_AL_H
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#ifndef AL_API
+ #if defined(AL_LIBTYPE_STATIC)
+  #define AL_API
+ #elif defined(_WIN32)
+  #define AL_API __declspec(dllimport)
+ #else
+  #define AL_API extern
+ #endif
+#endif
+
+#if defined(_WIN32)
+ #define AL_APIENTRY __cdecl
+#else
+ #define AL_APIENTRY
+#endif
+
+
+/* Deprecated macros. */
+#define OPENAL
+#define ALAPI                                    AL_API
+#define ALAPIENTRY                               AL_APIENTRY
+#define AL_INVALID                               (-1)
+#define AL_ILLEGAL_ENUM                          AL_INVALID_ENUM
+#define AL_ILLEGAL_COMMAND                       AL_INVALID_OPERATION
+
+/* Supported AL versions. */
+#define AL_VERSION_1_0
+#define AL_VERSION_1_1
+
+/** 8-bit boolean */
+typedef char ALboolean;
+
+/** character */
+typedef char ALchar;
+
+/** signed 8-bit 2's complement integer */
+typedef signed char ALbyte;
+
+/** unsigned 8-bit integer */
+typedef unsigned char ALubyte;
+
+/** signed 16-bit 2's complement integer */
+typedef short ALshort;
+
+/** unsigned 16-bit integer */
+typedef unsigned short ALushort;
+
+/** signed 32-bit 2's complement integer */
+typedef int ALint;
+
+/** unsigned 32-bit integer */
+typedef unsigned int ALuint;
+
+/** non-negative 32-bit binary integer size */
+typedef int ALsizei;
+
+/** enumerated 32-bit value */
+typedef int ALenum;
+
+/** 32-bit IEEE754 floating-point */
+typedef float ALfloat;
+
+/** 64-bit IEEE754 floating-point */
+typedef double ALdouble;
+
+/** void type (for opaque pointers only) */
+typedef void ALvoid;
+
+
+/* Enumerant values begin at column 50. No tabs. */
+
+/** "no distance model" or "no buffer" */
+#define AL_NONE                                  0
+
+/** Boolean False. */
+#define AL_FALSE                                 0
+
+/** Boolean True. */
+#define AL_TRUE                                  1
+
+
+/**
+ * Relative source.
+ * Type:    ALboolean
+ * Range:   [AL_TRUE, AL_FALSE]
+ * Default: AL_FALSE
+ *
+ * Specifies if the Source has relative coordinates.
+ */
+#define AL_SOURCE_RELATIVE                       0x202
+
+
+/**
+ * Inner cone angle, in degrees.
+ * Type:    ALint, ALfloat
+ * Range:   [0 - 360]
+ * Default: 360
+ *
+ * The angle covered by the inner cone, where the source will not attenuate.
+ */
+#define AL_CONE_INNER_ANGLE                      0x1001
+
+/**
+ * Outer cone angle, in degrees.
+ * Range:   [0 - 360]
+ * Default: 360
+ *
+ * The angle covered by the outer cone, where the source will be fully
+ * attenuated.
+ */
+#define AL_CONE_OUTER_ANGLE                      0x1002
+
+/**
+ * Source pitch.
+ * Type:    ALfloat
+ * Range:   [0.5 - 2.0]
+ * Default: 1.0
+ *
+ * A multiplier for the frequency (sample rate) of the source's buffer.
+ */
+#define AL_PITCH                                 0x1003
+
+/**
+ * Source or listener position.
+ * Type:    ALfloat[3], ALint[3]
+ * Default: {0, 0, 0}
+ *
+ * The source or listener location in three dimensional space.
+ *
+ * OpenAL, like OpenGL, uses a right handed coordinate system, where in a
+ * frontal default view X (thumb) points right, Y points up (index finger), and
+ * Z points towards the viewer/camera (middle finger).
+ *
+ * To switch from a left handed coordinate system, flip the sign on the Z
+ * coordinate.
+ */
+#define AL_POSITION                              0x1004
+
+/**
+ * Source direction.
+ * Type:    ALfloat[3], ALint[3]
+ * Default: {0, 0, 0}
+ *
+ * Specifies the current direction in local space.
+ * A zero-length vector specifies an omni-directional source (cone is ignored).
+ */
+#define AL_DIRECTION                             0x1005
+
+/**
+ * Source or listener velocity.
+ * Type:    ALfloat[3], ALint[3]
+ * Default: {0, 0, 0}
+ *
+ * Specifies the current velocity in local space.
+ */
+#define AL_VELOCITY                              0x1006
+
+/**
+ * Source looping.
+ * Type:    ALboolean
+ * Range:   [AL_TRUE, AL_FALSE]
+ * Default: AL_FALSE
+ *
+ * Specifies whether source is looping.
+ */
+#define AL_LOOPING                               0x1007
+
+/**
+ * Source buffer.
+ * Type:  ALuint
+ * Range: any valid Buffer.
+ *
+ * Specifies the buffer to provide sound samples.
+ */
+#define AL_BUFFER                                0x1009
+
+/**
+ * Source or listener gain.
+ * Type:  ALfloat
+ * Range: [0.0 - ]
+ *
+ * A value of 1.0 means unattenuated. Each division by 2 equals an attenuation
+ * of about -6dB. Each multiplicaton by 2 equals an amplification of about
+ * +6dB.
+ *
+ * A value of 0.0 is meaningless with respect to a logarithmic scale; it is
+ * silent.
+ */
+#define AL_GAIN                                  0x100A
+
+/**
+ * Minimum source gain.
+ * Type:  ALfloat
+ * Range: [0.0 - 1.0]
+ *
+ * The minimum gain allowed for a source, after distance and cone attenation is
+ * applied (if applicable).
+ */
+#define AL_MIN_GAIN                              0x100D
+
+/**
+ * Maximum source gain.
+ * Type:  ALfloat
+ * Range: [0.0 - 1.0]
+ *
+ * The maximum gain allowed for a source, after distance and cone attenation is
+ * applied (if applicable).
+ */
+#define AL_MAX_GAIN                              0x100E
+
+/**
+ * Listener orientation.
+ * Type: ALfloat[6]
+ * Default: {0.0, 0.0, -1.0, 0.0, 1.0, 0.0}
+ *
+ * Effectively two three dimensional vectors. The first vector is the front (or
+ * "at") and the second is the top (or "up").
+ *
+ * Both vectors are in local space.
+ */
+#define AL_ORIENTATION                           0x100F
+
+/**
+ * Source state (query only).
+ * Type:  ALint
+ * Range: [AL_INITIAL, AL_PLAYING, AL_PAUSED, AL_STOPPED]
+ */
+#define AL_SOURCE_STATE                          0x1010
+
+/* Source state values. */
+#define AL_INITIAL                               0x1011
+#define AL_PLAYING                               0x1012
+#define AL_PAUSED                                0x1013
+#define AL_STOPPED                               0x1014
+
+/**
+ * Source Buffer Queue size (query only).
+ * Type: ALint
+ *
+ * The number of buffers queued using alSourceQueueBuffers, minus the buffers
+ * removed with alSourceUnqueueBuffers.
+ */
+#define AL_BUFFERS_QUEUED                        0x1015
+
+/**
+ * Source Buffer Queue processed count (query only).
+ * Type: ALint
+ *
+ * The number of queued buffers that have been fully processed, and can be
+ * removed with alSourceUnqueueBuffers.
+ *
+ * Looping sources will never fully process buffers because they will be set to
+ * play again for when the source loops.
+ */
+#define AL_BUFFERS_PROCESSED                     0x1016
+
+/**
+ * Source reference distance.
+ * Type:    ALfloat
+ * Range:   [0.0 - ]
+ * Default: 1.0
+ *
+ * The distance in units that no attenuation occurs.
+ *
+ * At 0.0, no distance attenuation ever occurs on non-linear attenuation models.
+ */
+#define AL_REFERENCE_DISTANCE                    0x1020
+
+/**
+ * Source rolloff factor.
+ * Type:    ALfloat
+ * Range:   [0.0 - ]
+ * Default: 1.0
+ *
+ * Multiplier to exaggerate or diminish distance attenuation.
+ *
+ * At 0.0, no distance attenuation ever occurs.
+ */
+#define AL_ROLLOFF_FACTOR                        0x1021
+
+/**
+ * Outer cone gain.
+ * Type:    ALfloat
+ * Range:   [0.0 - 1.0]
+ * Default: 0.0
+ *
+ * The gain attenuation applied when the listener is outside of the source's
+ * outer cone.
+ */
+#define AL_CONE_OUTER_GAIN                       0x1022
+
+/**
+ * Source maximum distance.
+ * Type:    ALfloat
+ * Range:   [0.0 - ]
+ * Default: FLT_MAX
+ *
+ * The distance above which the source is not attenuated any further with a
+ * clamped distance model, or where attenuation reaches 0.0 gain for linear
+ * distance models with a default rolloff factor.
+ */
+#define AL_MAX_DISTANCE                          0x1023
+
+/** Source buffer position, in seconds */
+#define AL_SEC_OFFSET                            0x1024
+/** Source buffer position, in sample frames */
+#define AL_SAMPLE_OFFSET                         0x1025
+/** Source buffer position, in bytes */
+#define AL_BYTE_OFFSET                           0x1026
+
+/**
+ * Source type (query only).
+ * Type:  ALint
+ * Range: [AL_STATIC, AL_STREAMING, AL_UNDETERMINED]
+ *
+ * A Source is Static if a Buffer has been attached using AL_BUFFER.
+ *
+ * A Source is Streaming if one or more Buffers have been attached using
+ * alSourceQueueBuffers.
+ *
+ * A Source is Undetermined when it has the NULL buffer attached using
+ * AL_BUFFER.
+ */
+#define AL_SOURCE_TYPE                           0x1027
+
+/* Source type values. */
+#define AL_STATIC                                0x1028
+#define AL_STREAMING                             0x1029
+#define AL_UNDETERMINED                          0x1030
+
+/** Unsigned 8-bit mono buffer format. */
+#define AL_FORMAT_MONO8                          0x1100
+/** Signed 16-bit mono buffer format. */
+#define AL_FORMAT_MONO16                         0x1101
+/** Unsigned 8-bit stereo buffer format. */
+#define AL_FORMAT_STEREO8                        0x1102
+/** Signed 16-bit stereo buffer format. */
+#define AL_FORMAT_STEREO16                       0x1103
+
+/** Buffer frequency (query only). */
+#define AL_FREQUENCY                             0x2001
+/** Buffer bits per sample (query only). */
+#define AL_BITS                                  0x2002
+/** Buffer channel count (query only). */
+#define AL_CHANNELS                              0x2003
+/** Buffer data size (query only). */
+#define AL_SIZE                                  0x2004
+
+/* Buffer state. Not for public use. */
+#define AL_UNUSED                                0x2010
+#define AL_PENDING                               0x2011
+#define AL_PROCESSED                             0x2012
+
+
+/** No error. */
+#define AL_NO_ERROR                              0
+
+/** Invalid name paramater passed to AL call. */
+#define AL_INVALID_NAME                          0xA001
+
+/** Invalid enum parameter passed to AL call. */
+#define AL_INVALID_ENUM                          0xA002
+
+/** Invalid value parameter passed to AL call. */
+#define AL_INVALID_VALUE                         0xA003
+
+/** Illegal AL call. */
+#define AL_INVALID_OPERATION                     0xA004
+
+/** Not enough memory. */
+#define AL_OUT_OF_MEMORY                         0xA005
+
+
+/** Context string: Vendor ID. */
+#define AL_VENDOR                                0xB001
+/** Context string: Version. */
+#define AL_VERSION                               0xB002
+/** Context string: Renderer ID. */
+#define AL_RENDERER                              0xB003
+/** Context string: Space-separated extension list. */
+#define AL_EXTENSIONS                            0xB004
+
+
+/**
+ * Doppler scale.
+ * Type:    ALfloat
+ * Range:   [0.0 - ]
+ * Default: 1.0
+ *
+ * Scale for source and listener velocities.
+ */
+#define AL_DOPPLER_FACTOR                        0xC000
+AL_API void AL_APIENTRY alDopplerFactor(ALfloat value);
+
+/**
+ * Doppler velocity (deprecated).
+ *
+ * A multiplier applied to the Speed of Sound.
+ */
+#define AL_DOPPLER_VELOCITY                      0xC001
+AL_API void AL_APIENTRY alDopplerVelocity(ALfloat value);
+
+/**
+ * Speed of Sound, in units per second.
+ * Type:    ALfloat
+ * Range:   [0.0001 - ]
+ * Default: 343.3
+ *
+ * The speed at which sound waves are assumed to travel, when calculating the
+ * doppler effect.
+ */
+#define AL_SPEED_OF_SOUND                        0xC003
+AL_API void AL_APIENTRY alSpeedOfSound(ALfloat value);
+
+/**
+ * Distance attenuation model.
+ * Type:    ALint
+ * Range:   [AL_NONE, AL_INVERSE_DISTANCE, AL_INVERSE_DISTANCE_CLAMPED,
+ *           AL_LINEAR_DISTANCE, AL_LINEAR_DISTANCE_CLAMPED,
+ *           AL_EXPONENT_DISTANCE, AL_EXPONENT_DISTANCE_CLAMPED]
+ * Default: AL_INVERSE_DISTANCE_CLAMPED
+ *
+ * The model by which sources attenuate with distance.
+ *
+ * None     - No distance attenuation.
+ * Inverse  - Doubling the distance halves the source gain.
+ * Linear   - Linear gain scaling between the reference and max distances.
+ * Exponent - Exponential gain dropoff.
+ *
+ * Clamped variations work like the non-clamped counterparts, except the
+ * distance calculated is clamped between the reference and max distances.
+ */
+#define AL_DISTANCE_MODEL                        0xD000
+AL_API void AL_APIENTRY alDistanceModel(ALenum distanceModel);
+
+/* Distance model values. */
+#define AL_INVERSE_DISTANCE                      0xD001
+#define AL_INVERSE_DISTANCE_CLAMPED              0xD002
+#define AL_LINEAR_DISTANCE                       0xD003
+#define AL_LINEAR_DISTANCE_CLAMPED               0xD004
+#define AL_EXPONENT_DISTANCE                     0xD005
+#define AL_EXPONENT_DISTANCE_CLAMPED             0xD006
+
+/* Renderer State management. */
+AL_API void AL_APIENTRY alEnable(ALenum capability);
+AL_API void AL_APIENTRY alDisable(ALenum capability);
+AL_API ALboolean AL_APIENTRY alIsEnabled(ALenum capability);
+
+/* State retrieval. */
+AL_API const ALchar* AL_APIENTRY alGetString(ALenum param);
+AL_API void AL_APIENTRY alGetBooleanv(ALenum param, ALboolean *values);
+AL_API void AL_APIENTRY alGetIntegerv(ALenum param, ALint *values);
+AL_API void AL_APIENTRY alGetFloatv(ALenum param, ALfloat *values);
+AL_API void AL_APIENTRY alGetDoublev(ALenum param, ALdouble *values);
+AL_API ALboolean AL_APIENTRY alGetBoolean(ALenum param);
+AL_API ALint AL_APIENTRY alGetInteger(ALenum param);
+AL_API ALfloat AL_APIENTRY alGetFloat(ALenum param);
+AL_API ALdouble AL_APIENTRY alGetDouble(ALenum param);
+
+/* Error retrieval. */
+
+/** Obtain the first error generated in the AL context since the last check. */
+AL_API ALenum AL_APIENTRY alGetError(void);
+
+/** Query for the presence of an extension on the AL context. */
+AL_API ALboolean AL_APIENTRY alIsExtensionPresent(const ALchar *extname);
+/**
+ * Retrieve the address of a function. The returned function may be context-
+ * specific.
+ */
+AL_API void* AL_APIENTRY alGetProcAddress(const ALchar *fname);
+/**
+ * Retrieve the value of an enum. The returned value may be context-specific.
+ */
+AL_API ALenum AL_APIENTRY alGetEnumValue(const ALchar *ename);
+
+
+/* Set Listener parameters */
+AL_API void AL_APIENTRY alListenerf(ALenum param, ALfloat value);
+AL_API void AL_APIENTRY alListener3f(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
+AL_API void AL_APIENTRY alListenerfv(ALenum param, const ALfloat *values);
+AL_API void AL_APIENTRY alListeneri(ALenum param, ALint value);
+AL_API void AL_APIENTRY alListener3i(ALenum param, ALint value1, ALint value2, ALint value3);
+AL_API void AL_APIENTRY alListeneriv(ALenum param, const ALint *values);
+
+/* Get Listener parameters */
+AL_API void AL_APIENTRY alGetListenerf(ALenum param, ALfloat *value);
+AL_API void AL_APIENTRY alGetListener3f(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
+AL_API void AL_APIENTRY alGetListenerfv(ALenum param, ALfloat *values);
+AL_API void AL_APIENTRY alGetListeneri(ALenum param, ALint *value);
+AL_API void AL_APIENTRY alGetListener3i(ALenum param, ALint *value1, ALint *value2, ALint *value3);
+AL_API void AL_APIENTRY alGetListeneriv(ALenum param, ALint *values);
+
+
+/** Create Source objects. */
+AL_API void AL_APIENTRY alGenSources(ALsizei n, ALuint *sources);
+/** Delete Source objects. */
+AL_API void AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources);
+/** Verify a handle is a valid Source. */
+AL_API ALboolean AL_APIENTRY alIsSource(ALuint source);
+
+/* Set Source parameters. */
+AL_API void AL_APIENTRY alSourcef(ALuint source, ALenum param, ALfloat value);
+AL_API void AL_APIENTRY alSource3f(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
+AL_API void AL_APIENTRY alSourcefv(ALuint source, ALenum param, const ALfloat *values);
+AL_API void AL_APIENTRY alSourcei(ALuint source, ALenum param, ALint value);
+AL_API void AL_APIENTRY alSource3i(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3);
+AL_API void AL_APIENTRY alSourceiv(ALuint source, ALenum param, const ALint *values);
+
+/* Get Source parameters. */
+AL_API void AL_APIENTRY alGetSourcef(ALuint source, ALenum param, ALfloat *value);
+AL_API void AL_APIENTRY alGetSource3f(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
+AL_API void AL_APIENTRY alGetSourcefv(ALuint source, ALenum param, ALfloat *values);
+AL_API void AL_APIENTRY alGetSourcei(ALuint source,  ALenum param, ALint *value);
+AL_API void AL_APIENTRY alGetSource3i(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3);
+AL_API void AL_APIENTRY alGetSourceiv(ALuint source,  ALenum param, ALint *values);
+
+
+/** Play, replay, or resume (if paused) a list of Sources */
+AL_API void AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources);
+/** Stop a list of Sources */
+AL_API void AL_APIENTRY alSourceStopv(ALsizei n, const ALuint *sources);
+/** Rewind a list of Sources */
+AL_API void AL_APIENTRY alSourceRewindv(ALsizei n, const ALuint *sources);
+/** Pause a list of Sources */
+AL_API void AL_APIENTRY alSourcePausev(ALsizei n, const ALuint *sources);
+
+/** Play, replay, or resume a Source */
+AL_API void AL_APIENTRY alSourcePlay(ALuint source);
+/** Stop a Source */
+AL_API void AL_APIENTRY alSourceStop(ALuint source);
+/** Rewind a Source (set playback postiton to beginning) */
+AL_API void AL_APIENTRY alSourceRewind(ALuint source);
+/** Pause a Source */
+AL_API void AL_APIENTRY alSourcePause(ALuint source);
+
+/** Queue buffers onto a source */
+AL_API void AL_APIENTRY alSourceQueueBuffers(ALuint source, ALsizei nb, const ALuint *buffers);
+/** Unqueue processed buffers from a source */
+AL_API void AL_APIENTRY alSourceUnqueueBuffers(ALuint source, ALsizei nb, ALuint *buffers);
+
+
+/** Create Buffer objects */
+AL_API void AL_APIENTRY alGenBuffers(ALsizei n, ALuint *buffers);
+/** Delete Buffer objects */
+AL_API void AL_APIENTRY alDeleteBuffers(ALsizei n, const ALuint *buffers);
+/** Verify a handle is a valid Buffer */
+AL_API ALboolean AL_APIENTRY alIsBuffer(ALuint buffer);
+
+/** Specifies the data to be copied into a buffer */
+AL_API void AL_APIENTRY alBufferData(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq);
+
+/* Set Buffer parameters, */
+AL_API void AL_APIENTRY alBufferf(ALuint buffer, ALenum param, ALfloat value);
+AL_API void AL_APIENTRY alBuffer3f(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
+AL_API void AL_APIENTRY alBufferfv(ALuint buffer, ALenum param, const ALfloat *values);
+AL_API void AL_APIENTRY alBufferi(ALuint buffer, ALenum param, ALint value);
+AL_API void AL_APIENTRY alBuffer3i(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3);
+AL_API void AL_APIENTRY alBufferiv(ALuint buffer, ALenum param, const ALint *values);
+
+/* Get Buffer parameters. */
+AL_API void AL_APIENTRY alGetBufferf(ALuint buffer, ALenum param, ALfloat *value);
+AL_API void AL_APIENTRY alGetBuffer3f(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
+AL_API void AL_APIENTRY alGetBufferfv(ALuint buffer, ALenum param, ALfloat *values);
+AL_API void AL_APIENTRY alGetBufferi(ALuint buffer, ALenum param, ALint *value);
+AL_API void AL_APIENTRY alGetBuffer3i(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3);
+AL_API void AL_APIENTRY alGetBufferiv(ALuint buffer, ALenum param, ALint *values);
+
+/* Pointer-to-function type, useful for dynamically getting AL entry points. */
+typedef void          (AL_APIENTRY *LPALENABLE)(ALenum capability);
+typedef void          (AL_APIENTRY *LPALDISABLE)(ALenum capability);
+typedef ALboolean     (AL_APIENTRY *LPALISENABLED)(ALenum capability);
+typedef const ALchar* (AL_APIENTRY *LPALGETSTRING)(ALenum param);
+typedef void          (AL_APIENTRY *LPALGETBOOLEANV)(ALenum param, ALboolean *values);
+typedef void          (AL_APIENTRY *LPALGETINTEGERV)(ALenum param, ALint *values);
+typedef void          (AL_APIENTRY *LPALGETFLOATV)(ALenum param, ALfloat *values);
+typedef void          (AL_APIENTRY *LPALGETDOUBLEV)(ALenum param, ALdouble *values);
+typedef ALboolean     (AL_APIENTRY *LPALGETBOOLEAN)(ALenum param);
+typedef ALint         (AL_APIENTRY *LPALGETINTEGER)(ALenum param);
+typedef ALfloat       (AL_APIENTRY *LPALGETFLOAT)(ALenum param);
+typedef ALdouble      (AL_APIENTRY *LPALGETDOUBLE)(ALenum param);
+typedef ALenum        (AL_APIENTRY *LPALGETERROR)(void);
+typedef ALboolean     (AL_APIENTRY *LPALISEXTENSIONPRESENT)(const ALchar *extname);
+typedef void*         (AL_APIENTRY *LPALGETPROCADDRESS)(const ALchar *fname);
+typedef ALenum        (AL_APIENTRY *LPALGETENUMVALUE)(const ALchar *ename);
+typedef void          (AL_APIENTRY *LPALLISTENERF)(ALenum param, ALfloat value);
+typedef void          (AL_APIENTRY *LPALLISTENER3F)(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
+typedef void          (AL_APIENTRY *LPALLISTENERFV)(ALenum param, const ALfloat *values);
+typedef void          (AL_APIENTRY *LPALLISTENERI)(ALenum param, ALint value);
+typedef void          (AL_APIENTRY *LPALLISTENER3I)(ALenum param, ALint value1, ALint value2, ALint value3);
+typedef void          (AL_APIENTRY *LPALLISTENERIV)(ALenum param, const ALint *values);
+typedef void          (AL_APIENTRY *LPALGETLISTENERF)(ALenum param, ALfloat *value);
+typedef void          (AL_APIENTRY *LPALGETLISTENER3F)(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
+typedef void          (AL_APIENTRY *LPALGETLISTENERFV)(ALenum param, ALfloat *values);
+typedef void          (AL_APIENTRY *LPALGETLISTENERI)(ALenum param, ALint *value);
+typedef void          (AL_APIENTRY *LPALGETLISTENER3I)(ALenum param, ALint *value1, ALint *value2, ALint *value3);
+typedef void          (AL_APIENTRY *LPALGETLISTENERIV)(ALenum param, ALint *values);
+typedef void          (AL_APIENTRY *LPALGENSOURCES)(ALsizei n, ALuint *sources);
+typedef void          (AL_APIENTRY *LPALDELETESOURCES)(ALsizei n, const ALuint *sources);
+typedef ALboolean     (AL_APIENTRY *LPALISSOURCE)(ALuint source);
+typedef void          (AL_APIENTRY *LPALSOURCEF)(ALuint source, ALenum param, ALfloat value);
+typedef void          (AL_APIENTRY *LPALSOURCE3F)(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
+typedef void          (AL_APIENTRY *LPALSOURCEFV)(ALuint source, ALenum param, const ALfloat *values);
+typedef void          (AL_APIENTRY *LPALSOURCEI)(ALuint source, ALenum param, ALint value);
+typedef void          (AL_APIENTRY *LPALSOURCE3I)(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3);
+typedef void          (AL_APIENTRY *LPALSOURCEIV)(ALuint source, ALenum param, const ALint *values);
+typedef void          (AL_APIENTRY *LPALGETSOURCEF)(ALuint source, ALenum param, ALfloat *value);
+typedef void          (AL_APIENTRY *LPALGETSOURCE3F)(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
+typedef void          (AL_APIENTRY *LPALGETSOURCEFV)(ALuint source, ALenum param, ALfloat *values);
+typedef void          (AL_APIENTRY *LPALGETSOURCEI)(ALuint source, ALenum param, ALint *value);
+typedef void          (AL_APIENTRY *LPALGETSOURCE3I)(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3);
+typedef void          (AL_APIENTRY *LPALGETSOURCEIV)(ALuint source, ALenum param, ALint *values);
+typedef void          (AL_APIENTRY *LPALSOURCEPLAYV)(ALsizei n, const ALuint *sources);
+typedef void          (AL_APIENTRY *LPALSOURCESTOPV)(ALsizei n, const ALuint *sources);
+typedef void          (AL_APIENTRY *LPALSOURCEREWINDV)(ALsizei n, const ALuint *sources);
+typedef void          (AL_APIENTRY *LPALSOURCEPAUSEV)(ALsizei n, const ALuint *sources);
+typedef void          (AL_APIENTRY *LPALSOURCEPLAY)(ALuint source);
+typedef void          (AL_APIENTRY *LPALSOURCESTOP)(ALuint source);
+typedef void          (AL_APIENTRY *LPALSOURCEREWIND)(ALuint source);
+typedef void          (AL_APIENTRY *LPALSOURCEPAUSE)(ALuint source);
+typedef void          (AL_APIENTRY *LPALSOURCEQUEUEBUFFERS)(ALuint source, ALsizei nb, const ALuint *buffers);
+typedef void          (AL_APIENTRY *LPALSOURCEUNQUEUEBUFFERS)(ALuint source, ALsizei nb, ALuint *buffers);
+typedef void          (AL_APIENTRY *LPALGENBUFFERS)(ALsizei n, ALuint *buffers);
+typedef void          (AL_APIENTRY *LPALDELETEBUFFERS)(ALsizei n, const ALuint *buffers);
+typedef ALboolean     (AL_APIENTRY *LPALISBUFFER)(ALuint buffer);
+typedef void          (AL_APIENTRY *LPALBUFFERDATA)(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq);
+typedef void          (AL_APIENTRY *LPALBUFFERF)(ALuint buffer, ALenum param, ALfloat value);
+typedef void          (AL_APIENTRY *LPALBUFFER3F)(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
+typedef void          (AL_APIENTRY *LPALBUFFERFV)(ALuint buffer, ALenum param, const ALfloat *values);
+typedef void          (AL_APIENTRY *LPALBUFFERI)(ALuint buffer, ALenum param, ALint value);
+typedef void          (AL_APIENTRY *LPALBUFFER3I)(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3);
+typedef void          (AL_APIENTRY *LPALBUFFERIV)(ALuint buffer, ALenum param, const ALint *values);
+typedef void          (AL_APIENTRY *LPALGETBUFFERF)(ALuint buffer, ALenum param, ALfloat *value);
+typedef void          (AL_APIENTRY *LPALGETBUFFER3F)(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
+typedef void          (AL_APIENTRY *LPALGETBUFFERFV)(ALuint buffer, ALenum param, ALfloat *values);
+typedef void          (AL_APIENTRY *LPALGETBUFFERI)(ALuint buffer, ALenum param, ALint *value);
+typedef void          (AL_APIENTRY *LPALGETBUFFER3I)(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3);
+typedef void          (AL_APIENTRY *LPALGETBUFFERIV)(ALuint buffer, ALenum param, ALint *values);
+typedef void          (AL_APIENTRY *LPALDOPPLERFACTOR)(ALfloat value);
+typedef void          (AL_APIENTRY *LPALDOPPLERVELOCITY)(ALfloat value);
+typedef void          (AL_APIENTRY *LPALSPEEDOFSOUND)(ALfloat value);
+typedef void          (AL_APIENTRY *LPALDISTANCEMODEL)(ALenum distanceModel);
+
+#if defined(__cplusplus)
+}  /* extern "C" */
+#endif
+
+#endif /* AL_AL_H */
diff --git a/3rdparty/OpenAL/include/alc.h b/3rdparty/OpenAL/include/alc.h
new file mode 100644
index 0000000000..c73b6e9179
--- /dev/null
+++ b/3rdparty/OpenAL/include/alc.h
@@ -0,0 +1,270 @@
+#ifndef AL_ALC_H
+#define AL_ALC_H
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#ifndef ALC_API
+ #if defined(AL_LIBTYPE_STATIC)
+  #define ALC_API
+ #elif defined(_WIN32)
+  #define ALC_API __declspec(dllimport)
+ #else
+  #define ALC_API extern
+ #endif
+#endif
+
+#if defined(_WIN32)
+ #define ALC_APIENTRY __cdecl
+#else
+ #define ALC_APIENTRY
+#endif
+
+
+/* Deprecated macros. */
+#define ALCAPI                                   ALC_API
+#define ALCAPIENTRY                              ALC_APIENTRY
+#define ALC_INVALID                              0
+
+/** Supported ALC version? */
+#define ALC_VERSION_0_1                          1
+
+/** Opaque device handle */
+typedef struct ALCdevice ALCdevice;
+/** Opaque context handle */
+typedef struct ALCcontext ALCcontext;
+
+/** 8-bit boolean */
+typedef char ALCboolean;
+
+/** character */
+typedef char ALCchar;
+
+/** signed 8-bit 2's complement integer */
+typedef signed char ALCbyte;
+
+/** unsigned 8-bit integer */
+typedef unsigned char ALCubyte;
+
+/** signed 16-bit 2's complement integer */
+typedef short ALCshort;
+
+/** unsigned 16-bit integer */
+typedef unsigned short ALCushort;
+
+/** signed 32-bit 2's complement integer */
+typedef int ALCint;
+
+/** unsigned 32-bit integer */
+typedef unsigned int ALCuint;
+
+/** non-negative 32-bit binary integer size */
+typedef int ALCsizei;
+
+/** enumerated 32-bit value */
+typedef int ALCenum;
+
+/** 32-bit IEEE754 floating-point */
+typedef float ALCfloat;
+
+/** 64-bit IEEE754 floating-point */
+typedef double ALCdouble;
+
+/** void type (for opaque pointers only) */
+typedef void ALCvoid;
+
+
+/* Enumerant values begin at column 50. No tabs. */
+
+/** Boolean False. */
+#define ALC_FALSE                                0
+
+/** Boolean True. */
+#define ALC_TRUE                                 1
+
+/** Context attribute: <int> Hz. */
+#define ALC_FREQUENCY                            0x1007
+
+/** Context attribute: <int> Hz. */
+#define ALC_REFRESH                              0x1008
+
+/** Context attribute: AL_TRUE or AL_FALSE synchronous context? */
+#define ALC_SYNC                                 0x1009
+
+/** Context attribute: <int> requested Mono (3D) Sources. */
+#define ALC_MONO_SOURCES                         0x1010
+
+/** Context attribute: <int> requested Stereo Sources. */
+#define ALC_STEREO_SOURCES                       0x1011
+
+/** No error. */
+#define ALC_NO_ERROR                             0
+
+/** Invalid device handle. */
+#define ALC_INVALID_DEVICE                       0xA001
+
+/** Invalid context handle. */
+#define ALC_INVALID_CONTEXT                      0xA002
+
+/** Invalid enum parameter passed to an ALC call. */
+#define ALC_INVALID_ENUM                         0xA003
+
+/** Invalid value parameter passed to an ALC call. */
+#define ALC_INVALID_VALUE                        0xA004
+
+/** Out of memory. */
+#define ALC_OUT_OF_MEMORY                        0xA005
+
+
+/** Runtime ALC major version. */
+#define ALC_MAJOR_VERSION                        0x1000
+/** Runtime ALC minor version. */
+#define ALC_MINOR_VERSION                        0x1001
+
+/** Context attribute list size. */
+#define ALC_ATTRIBUTES_SIZE                      0x1002
+/** Context attribute list properties. */
+#define ALC_ALL_ATTRIBUTES                       0x1003
+
+/** String for the default device specifier. */
+#define ALC_DEFAULT_DEVICE_SPECIFIER             0x1004
+/**
+ * String for the given device's specifier.
+ *
+ * If device handle is NULL, it is instead a null-char separated list of
+ * strings of known device specifiers (list ends with an empty string).
+ */
+#define ALC_DEVICE_SPECIFIER                     0x1005
+/** String for space-separated list of ALC extensions. */
+#define ALC_EXTENSIONS                           0x1006
+
+
+/** Capture extension */
+#define ALC_EXT_CAPTURE 1
+/**
+ * String for the given capture device's specifier.
+ *
+ * If device handle is NULL, it is instead a null-char separated list of
+ * strings of known capture device specifiers (list ends with an empty string).
+ */
+#define ALC_CAPTURE_DEVICE_SPECIFIER             0x310
+/** String for the default capture device specifier. */
+#define ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER     0x311
+/** Number of sample frames available for capture. */
+#define ALC_CAPTURE_SAMPLES                      0x312
+
+
+/** Enumerate All extension */
+#define ALC_ENUMERATE_ALL_EXT 1
+/** String for the default extended device specifier. */
+#define ALC_DEFAULT_ALL_DEVICES_SPECIFIER        0x1012
+/**
+ * String for the given extended device's specifier.
+ *
+ * If device handle is NULL, it is instead a null-char separated list of
+ * strings of known extended device specifiers (list ends with an empty string).
+ */
+#define ALC_ALL_DEVICES_SPECIFIER                0x1013
+
+
+/* Context management. */
+
+/** Create and attach a context to the given device. */
+ALC_API ALCcontext* ALC_APIENTRY alcCreateContext(ALCdevice *device, const ALCint *attrlist);
+/**
+ * Makes the given context the active process-wide context. Passing NULL clears
+ * the active context.
+ */
+ALC_API ALCboolean  ALC_APIENTRY alcMakeContextCurrent(ALCcontext *context);
+/** Resumes processing updates for the given context. */
+ALC_API void        ALC_APIENTRY alcProcessContext(ALCcontext *context);
+/** Suspends updates for the given context. */
+ALC_API void        ALC_APIENTRY alcSuspendContext(ALCcontext *context);
+/** Remove a context from its device and destroys it. */
+ALC_API void        ALC_APIENTRY alcDestroyContext(ALCcontext *context);
+/** Returns the currently active context. */
+ALC_API ALCcontext* ALC_APIENTRY alcGetCurrentContext(void);
+/** Returns the device that a particular context is attached to. */
+ALC_API ALCdevice*  ALC_APIENTRY alcGetContextsDevice(ALCcontext *context);
+
+/* Device management. */
+
+/** Opens the named playback device. */
+ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *devicename);
+/** Closes the given playback device. */
+ALC_API ALCboolean ALC_APIENTRY alcCloseDevice(ALCdevice *device);
+
+/* Error support. */
+
+/** Obtain the most recent Device error. */
+ALC_API ALCenum ALC_APIENTRY alcGetError(ALCdevice *device);
+
+/* Extension support. */
+
+/**
+ * Query for the presence of an extension on the device. Pass a NULL device to
+ * query a device-inspecific extension.
+ */
+ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const ALCchar *extname);
+/**
+ * Retrieve the address of a function. Given a non-NULL device, the returned
+ * function may be device-specific.
+ */
+ALC_API ALCvoid*   ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcname);
+/**
+ * Retrieve the value of an enum. Given a non-NULL device, the returned value
+ * may be device-specific.
+ */
+ALC_API ALCenum    ALC_APIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *enumname);
+
+/* Query functions. */
+
+/** Returns information about the device, and error strings. */
+ALC_API const ALCchar* ALC_APIENTRY alcGetString(ALCdevice *device, ALCenum param);
+/** Returns information about the device and the version of OpenAL. */
+ALC_API void           ALC_APIENTRY alcGetIntegerv(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values);
+
+/* Capture functions. */
+
+/**
+ * Opens the named capture device with the given frequency, format, and buffer
+ * size.
+ */
+ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize);
+/** Closes the given capture device. */
+ALC_API ALCboolean ALC_APIENTRY alcCaptureCloseDevice(ALCdevice *device);
+/** Starts capturing samples into the device buffer.  */
+ALC_API void       ALC_APIENTRY alcCaptureStart(ALCdevice *device);
+/** Stops capturing samples. Samples in the device buffer remain available. */
+ALC_API void       ALC_APIENTRY alcCaptureStop(ALCdevice *device);
+/** Reads samples from the device buffer. */
+ALC_API void       ALC_APIENTRY alcCaptureSamples(ALCdevice *device, ALCvoid *buffer, ALCsizei samples);
+
+/* Pointer-to-function type, useful for dynamically getting ALC entry points. */
+typedef ALCcontext*    (ALC_APIENTRY *LPALCCREATECONTEXT)(ALCdevice *device, const ALCint *attrlist);
+typedef ALCboolean     (ALC_APIENTRY *LPALCMAKECONTEXTCURRENT)(ALCcontext *context);
+typedef void           (ALC_APIENTRY *LPALCPROCESSCONTEXT)(ALCcontext *context);
+typedef void           (ALC_APIENTRY *LPALCSUSPENDCONTEXT)(ALCcontext *context);
+typedef void           (ALC_APIENTRY *LPALCDESTROYCONTEXT)(ALCcontext *context);
+typedef ALCcontext*    (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)(void);
+typedef ALCdevice*     (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)(ALCcontext *context);
+typedef ALCdevice*     (ALC_APIENTRY *LPALCOPENDEVICE)(const ALCchar *devicename);
+typedef ALCboolean     (ALC_APIENTRY *LPALCCLOSEDEVICE)(ALCdevice *device);
+typedef ALCenum        (ALC_APIENTRY *LPALCGETERROR)(ALCdevice *device);
+typedef ALCboolean     (ALC_APIENTRY *LPALCISEXTENSIONPRESENT)(ALCdevice *device, const ALCchar *extname);
+typedef ALCvoid*       (ALC_APIENTRY *LPALCGETPROCADDRESS)(ALCdevice *device, const ALCchar *funcname);
+typedef ALCenum        (ALC_APIENTRY *LPALCGETENUMVALUE)(ALCdevice *device, const ALCchar *enumname);
+typedef const ALCchar* (ALC_APIENTRY *LPALCGETSTRING)(ALCdevice *device, ALCenum param);
+typedef void           (ALC_APIENTRY *LPALCGETINTEGERV)(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values);
+typedef ALCdevice*     (ALC_APIENTRY *LPALCCAPTUREOPENDEVICE)(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize);
+typedef ALCboolean     (ALC_APIENTRY *LPALCCAPTURECLOSEDEVICE)(ALCdevice *device);
+typedef void           (ALC_APIENTRY *LPALCCAPTURESTART)(ALCdevice *device);
+typedef void           (ALC_APIENTRY *LPALCCAPTURESTOP)(ALCdevice *device);
+typedef void           (ALC_APIENTRY *LPALCCAPTURESAMPLES)(ALCdevice *device, ALCvoid *buffer, ALCsizei samples);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* AL_ALC_H */
diff --git a/3rdparty/OpenAL/include/alext.h b/3rdparty/OpenAL/include/alext.h
new file mode 100644
index 0000000000..f80b0708ab
--- /dev/null
+++ b/3rdparty/OpenAL/include/alext.h
@@ -0,0 +1,586 @@
+/**
+ * OpenAL cross platform audio library
+ * Copyright (C) 2008 by authors.
+ * This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ *  License along with this library; if not, write to the
+ *  Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Or go to http://www.gnu.org/copyleft/lgpl.html
+ */
+
+#ifndef AL_ALEXT_H
+#define AL_ALEXT_H
+
+#include <stddef.h>
+/* Define int64 and uint64 types */
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) ||             \
+    (defined(__cplusplus) && __cplusplus >= 201103L)
+#include <stdint.h>
+typedef int64_t _alsoft_int64_t;
+typedef uint64_t _alsoft_uint64_t;
+#elif defined(_WIN32)
+typedef __int64 _alsoft_int64_t;
+typedef unsigned __int64 _alsoft_uint64_t;
+#else
+/* Fallback if nothing above works */
+#include <stdint.h>
+typedef int64_t _alsoft_int64_t;
+typedef uint64_t _alsoft_uint64_t;
+#endif
+
+#include "alc.h"
+#include "al.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef AL_LOKI_IMA_ADPCM_format
+#define AL_LOKI_IMA_ADPCM_format 1
+#define AL_FORMAT_IMA_ADPCM_MONO16_EXT           0x10000
+#define AL_FORMAT_IMA_ADPCM_STEREO16_EXT         0x10001
+#endif
+
+#ifndef AL_LOKI_WAVE_format
+#define AL_LOKI_WAVE_format 1
+#define AL_FORMAT_WAVE_EXT                       0x10002
+#endif
+
+#ifndef AL_EXT_vorbis
+#define AL_EXT_vorbis 1
+#define AL_FORMAT_VORBIS_EXT                     0x10003
+#endif
+
+#ifndef AL_LOKI_quadriphonic
+#define AL_LOKI_quadriphonic 1
+#define AL_FORMAT_QUAD8_LOKI                     0x10004
+#define AL_FORMAT_QUAD16_LOKI                    0x10005
+#endif
+
+#ifndef AL_EXT_float32
+#define AL_EXT_float32 1
+#define AL_FORMAT_MONO_FLOAT32                   0x10010
+#define AL_FORMAT_STEREO_FLOAT32                 0x10011
+#endif
+
+#ifndef AL_EXT_double
+#define AL_EXT_double 1
+#define AL_FORMAT_MONO_DOUBLE_EXT                0x10012
+#define AL_FORMAT_STEREO_DOUBLE_EXT              0x10013
+#endif
+
+#ifndef AL_EXT_MULAW
+#define AL_EXT_MULAW 1
+#define AL_FORMAT_MONO_MULAW_EXT                 0x10014
+#define AL_FORMAT_STEREO_MULAW_EXT               0x10015
+#endif
+
+#ifndef AL_EXT_ALAW
+#define AL_EXT_ALAW 1
+#define AL_FORMAT_MONO_ALAW_EXT                  0x10016
+#define AL_FORMAT_STEREO_ALAW_EXT                0x10017
+#endif
+
+#ifndef ALC_LOKI_audio_channel
+#define ALC_LOKI_audio_channel 1
+#define ALC_CHAN_MAIN_LOKI                       0x500001
+#define ALC_CHAN_PCM_LOKI                        0x500002
+#define ALC_CHAN_CD_LOKI                         0x500003
+#endif
+
+#ifndef AL_EXT_MCFORMATS
+#define AL_EXT_MCFORMATS 1
+/* Provides support for surround sound buffer formats with 8, 16, and 32-bit
+ * samples.
+ *
+ * QUAD8: Unsigned 8-bit, Quadraphonic (Front Left, Front Right, Rear Left,
+ *        Rear Right).
+ * QUAD16: Signed 16-bit, Quadraphonic.
+ * QUAD32: 32-bit float, Quadraphonic.
+ * REAR8: Unsigned 8-bit, Rear Stereo (Rear Left, Rear Right).
+ * REAR16: Signed 16-bit, Rear Stereo.
+ * REAR32: 32-bit float, Rear Stereo.
+ * 51CHN8: Unsigned 8-bit, 5.1 Surround (Front Left, Front Right, Front Center,
+ *         LFE, Side Left, Side Right). Note that some audio systems may label
+ *         5.1's Side channels as Rear or Surround; they are equivalent for the
+ *         purposes of this extension.
+ * 51CHN16: Signed 16-bit, 5.1 Surround.
+ * 51CHN32: 32-bit float, 5.1 Surround.
+ * 61CHN8: Unsigned 8-bit, 6.1 Surround (Front Left, Front Right, Front Center,
+ *         LFE, Rear Center, Side Left, Side Right).
+ * 61CHN16: Signed 16-bit, 6.1 Surround.
+ * 61CHN32: 32-bit float, 6.1 Surround.
+ * 71CHN8: Unsigned 8-bit, 7.1 Surround (Front Left, Front Right, Front Center,
+ *         LFE, Rear Left, Rear Right, Side Left, Side Right).
+ * 71CHN16: Signed 16-bit, 7.1 Surround.
+ * 71CHN32: 32-bit float, 7.1 Surround.
+ */
+#define AL_FORMAT_QUAD8                          0x1204
+#define AL_FORMAT_QUAD16                         0x1205
+#define AL_FORMAT_QUAD32                         0x1206
+#define AL_FORMAT_REAR8                          0x1207
+#define AL_FORMAT_REAR16                         0x1208
+#define AL_FORMAT_REAR32                         0x1209
+#define AL_FORMAT_51CHN8                         0x120A
+#define AL_FORMAT_51CHN16                        0x120B
+#define AL_FORMAT_51CHN32                        0x120C
+#define AL_FORMAT_61CHN8                         0x120D
+#define AL_FORMAT_61CHN16                        0x120E
+#define AL_FORMAT_61CHN32                        0x120F
+#define AL_FORMAT_71CHN8                         0x1210
+#define AL_FORMAT_71CHN16                        0x1211
+#define AL_FORMAT_71CHN32                        0x1212
+#endif
+
+#ifndef AL_EXT_MULAW_MCFORMATS
+#define AL_EXT_MULAW_MCFORMATS 1
+#define AL_FORMAT_MONO_MULAW                     0x10014
+#define AL_FORMAT_STEREO_MULAW                   0x10015
+#define AL_FORMAT_QUAD_MULAW                     0x10021
+#define AL_FORMAT_REAR_MULAW                     0x10022
+#define AL_FORMAT_51CHN_MULAW                    0x10023
+#define AL_FORMAT_61CHN_MULAW                    0x10024
+#define AL_FORMAT_71CHN_MULAW                    0x10025
+#endif
+
+#ifndef AL_EXT_IMA4
+#define AL_EXT_IMA4 1
+#define AL_FORMAT_MONO_IMA4                      0x1300
+#define AL_FORMAT_STEREO_IMA4                    0x1301
+#endif
+
+#ifndef AL_EXT_STATIC_BUFFER
+#define AL_EXT_STATIC_BUFFER 1
+typedef void (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALint,ALenum,ALvoid*,ALsizei,ALsizei);
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alBufferDataStatic(const ALint buffer, ALenum format, ALvoid *data, ALsizei len, ALsizei freq);
+#endif
+#endif
+
+#ifndef ALC_EXT_EFX
+#define ALC_EXT_EFX 1
+#include "efx.h"
+#endif
+
+#ifndef ALC_EXT_disconnect
+#define ALC_EXT_disconnect 1
+#define ALC_CONNECTED                            0x313
+#endif
+
+#ifndef ALC_EXT_thread_local_context
+#define ALC_EXT_thread_local_context 1
+typedef ALCboolean  (ALC_APIENTRY*PFNALCSETTHREADCONTEXTPROC)(ALCcontext *context);
+typedef ALCcontext* (ALC_APIENTRY*PFNALCGETTHREADCONTEXTPROC)(void);
+#ifdef AL_ALEXT_PROTOTYPES
+ALC_API ALCboolean  ALC_APIENTRY alcSetThreadContext(ALCcontext *context);
+ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void);
+#endif
+#endif
+
+#ifndef AL_EXT_source_distance_model
+#define AL_EXT_source_distance_model 1
+#define AL_SOURCE_DISTANCE_MODEL                 0x200
+#endif
+
+#ifndef AL_SOFT_buffer_sub_data
+#define AL_SOFT_buffer_sub_data 1
+#define AL_BYTE_RW_OFFSETS_SOFT                  0x1031
+#define AL_SAMPLE_RW_OFFSETS_SOFT                0x1032
+typedef void (AL_APIENTRY*PFNALBUFFERSUBDATASOFTPROC)(ALuint,ALenum,const ALvoid*,ALsizei,ALsizei);
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length);
+#endif
+#endif
+
+#ifndef AL_SOFT_loop_points
+#define AL_SOFT_loop_points 1
+#define AL_LOOP_POINTS_SOFT                      0x2015
+#endif
+
+#ifndef AL_EXT_FOLDBACK
+#define AL_EXT_FOLDBACK 1
+#define AL_EXT_FOLDBACK_NAME                     "AL_EXT_FOLDBACK"
+#define AL_FOLDBACK_EVENT_BLOCK                  0x4112
+#define AL_FOLDBACK_EVENT_START                  0x4111
+#define AL_FOLDBACK_EVENT_STOP                   0x4113
+#define AL_FOLDBACK_MODE_MONO                    0x4101
+#define AL_FOLDBACK_MODE_STEREO                  0x4102
+typedef void (AL_APIENTRY*LPALFOLDBACKCALLBACK)(ALenum,ALsizei);
+typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTART)(ALenum,ALsizei,ALsizei,ALfloat*,LPALFOLDBACKCALLBACK);
+typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTOP)(void);
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alRequestFoldbackStart(ALenum mode,ALsizei count,ALsizei length,ALfloat *mem,LPALFOLDBACKCALLBACK callback);
+AL_API void AL_APIENTRY alRequestFoldbackStop(void);
+#endif
+#endif
+
+#ifndef ALC_EXT_DEDICATED
+#define ALC_EXT_DEDICATED 1
+#define AL_DEDICATED_GAIN                        0x0001
+#define AL_EFFECT_DEDICATED_DIALOGUE             0x9001
+#define AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT 0x9000
+#endif
+
+#ifndef AL_SOFT_buffer_samples
+#define AL_SOFT_buffer_samples 1
+/* Channel configurations */
+#define AL_MONO_SOFT                             0x1500
+#define AL_STEREO_SOFT                           0x1501
+#define AL_REAR_SOFT                             0x1502
+#define AL_QUAD_SOFT                             0x1503
+#define AL_5POINT1_SOFT                          0x1504
+#define AL_6POINT1_SOFT                          0x1505
+#define AL_7POINT1_SOFT                          0x1506
+
+/* Sample types */
+#define AL_BYTE_SOFT                             0x1400
+#define AL_UNSIGNED_BYTE_SOFT                    0x1401
+#define AL_SHORT_SOFT                            0x1402
+#define AL_UNSIGNED_SHORT_SOFT                   0x1403
+#define AL_INT_SOFT                              0x1404
+#define AL_UNSIGNED_INT_SOFT                     0x1405
+#define AL_FLOAT_SOFT                            0x1406
+#define AL_DOUBLE_SOFT                           0x1407
+#define AL_BYTE3_SOFT                            0x1408
+#define AL_UNSIGNED_BYTE3_SOFT                   0x1409
+
+/* Storage formats */
+#define AL_MONO8_SOFT                            0x1100
+#define AL_MONO16_SOFT                           0x1101
+#define AL_MONO32F_SOFT                          0x10010
+#define AL_STEREO8_SOFT                          0x1102
+#define AL_STEREO16_SOFT                         0x1103
+#define AL_STEREO32F_SOFT                        0x10011
+#define AL_QUAD8_SOFT                            0x1204
+#define AL_QUAD16_SOFT                           0x1205
+#define AL_QUAD32F_SOFT                          0x1206
+#define AL_REAR8_SOFT                            0x1207
+#define AL_REAR16_SOFT                           0x1208
+#define AL_REAR32F_SOFT                          0x1209
+#define AL_5POINT1_8_SOFT                        0x120A
+#define AL_5POINT1_16_SOFT                       0x120B
+#define AL_5POINT1_32F_SOFT                      0x120C
+#define AL_6POINT1_8_SOFT                        0x120D
+#define AL_6POINT1_16_SOFT                       0x120E
+#define AL_6POINT1_32F_SOFT                      0x120F
+#define AL_7POINT1_8_SOFT                        0x1210
+#define AL_7POINT1_16_SOFT                       0x1211
+#define AL_7POINT1_32F_SOFT                      0x1212
+
+/* Buffer attributes */
+#define AL_INTERNAL_FORMAT_SOFT                  0x2008
+#define AL_BYTE_LENGTH_SOFT                      0x2009
+#define AL_SAMPLE_LENGTH_SOFT                    0x200A
+#define AL_SEC_LENGTH_SOFT                       0x200B
+
+typedef void (AL_APIENTRY*LPALBUFFERSAMPLESSOFT)(ALuint,ALuint,ALenum,ALsizei,ALenum,ALenum,const ALvoid*);
+typedef void (AL_APIENTRY*LPALBUFFERSUBSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,const ALvoid*);
+typedef void (AL_APIENTRY*LPALGETBUFFERSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,ALvoid*);
+typedef ALboolean (AL_APIENTRY*LPALISBUFFERFORMATSUPPORTEDSOFT)(ALenum);
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alBufferSamplesSOFT(ALuint buffer, ALuint samplerate, ALenum internalformat, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data);
+AL_API void AL_APIENTRY alBufferSubSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data);
+AL_API void AL_APIENTRY alGetBufferSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, ALvoid *data);
+AL_API ALboolean AL_APIENTRY alIsBufferFormatSupportedSOFT(ALenum format);
+#endif
+#endif
+
+#ifndef AL_SOFT_direct_channels
+#define AL_SOFT_direct_channels 1
+#define AL_DIRECT_CHANNELS_SOFT                  0x1033
+#endif
+
+#ifndef ALC_SOFT_loopback
+#define ALC_SOFT_loopback 1
+#define ALC_FORMAT_CHANNELS_SOFT                 0x1990
+#define ALC_FORMAT_TYPE_SOFT                     0x1991
+
+/* Sample types */
+#define ALC_BYTE_SOFT                            0x1400
+#define ALC_UNSIGNED_BYTE_SOFT                   0x1401
+#define ALC_SHORT_SOFT                           0x1402
+#define ALC_UNSIGNED_SHORT_SOFT                  0x1403
+#define ALC_INT_SOFT                             0x1404
+#define ALC_UNSIGNED_INT_SOFT                    0x1405
+#define ALC_FLOAT_SOFT                           0x1406
+
+/* Channel configurations */
+#define ALC_MONO_SOFT                            0x1500
+#define ALC_STEREO_SOFT                          0x1501
+#define ALC_QUAD_SOFT                            0x1503
+#define ALC_5POINT1_SOFT                         0x1504
+#define ALC_6POINT1_SOFT                         0x1505
+#define ALC_7POINT1_SOFT                         0x1506
+
+typedef ALCdevice* (ALC_APIENTRY*LPALCLOOPBACKOPENDEVICESOFT)(const ALCchar*);
+typedef ALCboolean (ALC_APIENTRY*LPALCISRENDERFORMATSUPPORTEDSOFT)(ALCdevice*,ALCsizei,ALCenum,ALCenum);
+typedef void (ALC_APIENTRY*LPALCRENDERSAMPLESSOFT)(ALCdevice*,ALCvoid*,ALCsizei);
+#ifdef AL_ALEXT_PROTOTYPES
+ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(const ALCchar *deviceName);
+ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupportedSOFT(ALCdevice *device, ALCsizei freq, ALCenum channels, ALCenum type);
+ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffer, ALCsizei samples);
+#endif
+#endif
+
+#ifndef AL_EXT_STEREO_ANGLES
+#define AL_EXT_STEREO_ANGLES 1
+#define AL_STEREO_ANGLES                         0x1030
+#endif
+
+#ifndef AL_EXT_SOURCE_RADIUS
+#define AL_EXT_SOURCE_RADIUS 1
+#define AL_SOURCE_RADIUS                         0x1031
+#endif
+
+#ifndef AL_SOFT_source_latency
+#define AL_SOFT_source_latency 1
+#define AL_SAMPLE_OFFSET_LATENCY_SOFT            0x1200
+#define AL_SEC_OFFSET_LATENCY_SOFT               0x1201
+typedef _alsoft_int64_t ALint64SOFT;
+typedef _alsoft_uint64_t ALuint64SOFT;
+typedef void (AL_APIENTRY*LPALSOURCEDSOFT)(ALuint,ALenum,ALdouble);
+typedef void (AL_APIENTRY*LPALSOURCE3DSOFT)(ALuint,ALenum,ALdouble,ALdouble,ALdouble);
+typedef void (AL_APIENTRY*LPALSOURCEDVSOFT)(ALuint,ALenum,const ALdouble*);
+typedef void (AL_APIENTRY*LPALGETSOURCEDSOFT)(ALuint,ALenum,ALdouble*);
+typedef void (AL_APIENTRY*LPALGETSOURCE3DSOFT)(ALuint,ALenum,ALdouble*,ALdouble*,ALdouble*);
+typedef void (AL_APIENTRY*LPALGETSOURCEDVSOFT)(ALuint,ALenum,ALdouble*);
+typedef void (AL_APIENTRY*LPALSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT);
+typedef void (AL_APIENTRY*LPALSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT,ALint64SOFT,ALint64SOFT);
+typedef void (AL_APIENTRY*LPALSOURCEI64VSOFT)(ALuint,ALenum,const ALint64SOFT*);
+typedef void (AL_APIENTRY*LPALGETSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT*);
+typedef void (AL_APIENTRY*LPALGETSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT*,ALint64SOFT*,ALint64SOFT*);
+typedef void (AL_APIENTRY*LPALGETSOURCEI64VSOFT)(ALuint,ALenum,ALint64SOFT*);
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alSourcedSOFT(ALuint source, ALenum param, ALdouble value);
+AL_API void AL_APIENTRY alSource3dSOFT(ALuint source, ALenum param, ALdouble value1, ALdouble value2, ALdouble value3);
+AL_API void AL_APIENTRY alSourcedvSOFT(ALuint source, ALenum param, const ALdouble *values);
+AL_API void AL_APIENTRY alGetSourcedSOFT(ALuint source, ALenum param, ALdouble *value);
+AL_API void AL_APIENTRY alGetSource3dSOFT(ALuint source, ALenum param, ALdouble *value1, ALdouble *value2, ALdouble *value3);
+AL_API void AL_APIENTRY alGetSourcedvSOFT(ALuint source, ALenum param, ALdouble *values);
+AL_API void AL_APIENTRY alSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT value);
+AL_API void AL_APIENTRY alSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT value1, ALint64SOFT value2, ALint64SOFT value3);
+AL_API void AL_APIENTRY alSourcei64vSOFT(ALuint source, ALenum param, const ALint64SOFT *values);
+AL_API void AL_APIENTRY alGetSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT *value);
+AL_API void AL_APIENTRY alGetSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT *value1, ALint64SOFT *value2, ALint64SOFT *value3);
+AL_API void AL_APIENTRY alGetSourcei64vSOFT(ALuint source, ALenum param, ALint64SOFT *values);
+#endif
+#endif
+
+#ifndef ALC_EXT_DEFAULT_FILTER_ORDER
+#define ALC_EXT_DEFAULT_FILTER_ORDER 1
+#define ALC_DEFAULT_FILTER_ORDER                 0x1100
+#endif
+
+#ifndef AL_SOFT_deferred_updates
+#define AL_SOFT_deferred_updates 1
+#define AL_DEFERRED_UPDATES_SOFT                 0xC002
+typedef void (AL_APIENTRY*LPALDEFERUPDATESSOFT)(void);
+typedef void (AL_APIENTRY*LPALPROCESSUPDATESSOFT)(void);
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alDeferUpdatesSOFT(void);
+AL_API void AL_APIENTRY alProcessUpdatesSOFT(void);
+#endif
+#endif
+
+#ifndef AL_SOFT_block_alignment
+#define AL_SOFT_block_alignment 1
+#define AL_UNPACK_BLOCK_ALIGNMENT_SOFT           0x200C
+#define AL_PACK_BLOCK_ALIGNMENT_SOFT             0x200D
+#endif
+
+#ifndef AL_SOFT_MSADPCM
+#define AL_SOFT_MSADPCM 1
+#define AL_FORMAT_MONO_MSADPCM_SOFT              0x1302
+#define AL_FORMAT_STEREO_MSADPCM_SOFT            0x1303
+#endif
+
+#ifndef AL_SOFT_source_length
+#define AL_SOFT_source_length 1
+/*#define AL_BYTE_LENGTH_SOFT                      0x2009*/
+/*#define AL_SAMPLE_LENGTH_SOFT                    0x200A*/
+/*#define AL_SEC_LENGTH_SOFT                       0x200B*/
+#endif
+
+#ifndef ALC_SOFT_pause_device
+#define ALC_SOFT_pause_device 1
+typedef void (ALC_APIENTRY*LPALCDEVICEPAUSESOFT)(ALCdevice *device);
+typedef void (ALC_APIENTRY*LPALCDEVICERESUMESOFT)(ALCdevice *device);
+#ifdef AL_ALEXT_PROTOTYPES
+ALC_API void ALC_APIENTRY alcDevicePauseSOFT(ALCdevice *device);
+ALC_API void ALC_APIENTRY alcDeviceResumeSOFT(ALCdevice *device);
+#endif
+#endif
+
+#ifndef AL_EXT_BFORMAT
+#define AL_EXT_BFORMAT 1
+/* Provides support for B-Format ambisonic buffers (first-order, FuMa scaling
+ * and layout).
+ *
+ * BFORMAT2D_8: Unsigned 8-bit, 3-channel non-periphonic (WXY).
+ * BFORMAT2D_16: Signed 16-bit, 3-channel non-periphonic (WXY).
+ * BFORMAT2D_FLOAT32: 32-bit float, 3-channel non-periphonic (WXY).
+ * BFORMAT3D_8: Unsigned 8-bit, 4-channel periphonic (WXYZ).
+ * BFORMAT3D_16: Signed 16-bit, 4-channel periphonic (WXYZ).
+ * BFORMAT3D_FLOAT32: 32-bit float, 4-channel periphonic (WXYZ).
+ */
+#define AL_FORMAT_BFORMAT2D_8                    0x20021
+#define AL_FORMAT_BFORMAT2D_16                   0x20022
+#define AL_FORMAT_BFORMAT2D_FLOAT32              0x20023
+#define AL_FORMAT_BFORMAT3D_8                    0x20031
+#define AL_FORMAT_BFORMAT3D_16                   0x20032
+#define AL_FORMAT_BFORMAT3D_FLOAT32              0x20033
+#endif
+
+#ifndef AL_EXT_MULAW_BFORMAT
+#define AL_EXT_MULAW_BFORMAT 1
+#define AL_FORMAT_BFORMAT2D_MULAW                0x10031
+#define AL_FORMAT_BFORMAT3D_MULAW                0x10032
+#endif
+
+#ifndef ALC_SOFT_HRTF
+#define ALC_SOFT_HRTF 1
+#define ALC_HRTF_SOFT                            0x1992
+#define ALC_DONT_CARE_SOFT                       0x0002
+#define ALC_HRTF_STATUS_SOFT                     0x1993
+#define ALC_HRTF_DISABLED_SOFT                   0x0000
+#define ALC_HRTF_ENABLED_SOFT                    0x0001
+#define ALC_HRTF_DENIED_SOFT                     0x0002
+#define ALC_HRTF_REQUIRED_SOFT                   0x0003
+#define ALC_HRTF_HEADPHONES_DETECTED_SOFT        0x0004
+#define ALC_HRTF_UNSUPPORTED_FORMAT_SOFT         0x0005
+#define ALC_NUM_HRTF_SPECIFIERS_SOFT             0x1994
+#define ALC_HRTF_SPECIFIER_SOFT                  0x1995
+#define ALC_HRTF_ID_SOFT                         0x1996
+typedef const ALCchar* (ALC_APIENTRY*LPALCGETSTRINGISOFT)(ALCdevice *device, ALCenum paramName, ALCsizei index);
+typedef ALCboolean (ALC_APIENTRY*LPALCRESETDEVICESOFT)(ALCdevice *device, const ALCint *attribs);
+#ifdef AL_ALEXT_PROTOTYPES
+ALC_API const ALCchar* ALC_APIENTRY alcGetStringiSOFT(ALCdevice *device, ALCenum paramName, ALCsizei index);
+ALC_API ALCboolean ALC_APIENTRY alcResetDeviceSOFT(ALCdevice *device, const ALCint *attribs);
+#endif
+#endif
+
+#ifndef AL_SOFT_gain_clamp_ex
+#define AL_SOFT_gain_clamp_ex 1
+#define AL_GAIN_LIMIT_SOFT                       0x200E
+#endif
+
+#ifndef AL_SOFT_source_resampler
+#define AL_SOFT_source_resampler
+#define AL_NUM_RESAMPLERS_SOFT                   0x1210
+#define AL_DEFAULT_RESAMPLER_SOFT                0x1211
+#define AL_SOURCE_RESAMPLER_SOFT                 0x1212
+#define AL_RESAMPLER_NAME_SOFT                   0x1213
+typedef const ALchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALenum pname, ALsizei index);
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index);
+#endif
+#endif
+
+#ifndef AL_SOFT_source_spatialize
+#define AL_SOFT_source_spatialize
+#define AL_SOURCE_SPATIALIZE_SOFT                0x1214
+#define AL_AUTO_SOFT                             0x0002
+#endif
+
+#ifndef ALC_SOFT_output_limiter
+#define ALC_SOFT_output_limiter
+#define ALC_OUTPUT_LIMITER_SOFT                  0x199A
+#endif
+
+#ifndef ALC_SOFT_device_clock
+#define ALC_SOFT_device_clock 1
+typedef _alsoft_int64_t ALCint64SOFT;
+typedef _alsoft_uint64_t ALCuint64SOFT;
+#define ALC_DEVICE_CLOCK_SOFT                    0x1600
+#define ALC_DEVICE_LATENCY_SOFT                  0x1601
+#define ALC_DEVICE_CLOCK_LATENCY_SOFT            0x1602
+#define AL_SAMPLE_OFFSET_CLOCK_SOFT              0x1202
+#define AL_SEC_OFFSET_CLOCK_SOFT                 0x1203
+typedef void (ALC_APIENTRY*LPALCGETINTEGER64VSOFT)(ALCdevice *device, ALCenum pname, ALsizei size, ALCint64SOFT *values);
+#ifdef AL_ALEXT_PROTOTYPES
+ALC_API void ALC_APIENTRY alcGetInteger64vSOFT(ALCdevice *device, ALCenum pname, ALsizei size, ALCint64SOFT *values);
+#endif
+#endif
+
+#ifndef AL_SOFT_direct_channels_remix
+#define AL_SOFT_direct_channels_remix 1
+#define AL_DROP_UNMATCHED_SOFT                   0x0001
+#define AL_REMIX_UNMATCHED_SOFT                  0x0002
+#endif
+
+#ifndef AL_SOFT_bformat_ex
+#define AL_SOFT_bformat_ex 1
+#define AL_AMBISONIC_LAYOUT_SOFT                 0x1997
+#define AL_AMBISONIC_SCALING_SOFT                0x1998
+
+/* Ambisonic layouts */
+#define AL_FUMA_SOFT                             0x0000
+#define AL_ACN_SOFT                              0x0001
+
+/* Ambisonic scalings (normalization) */
+/*#define AL_FUMA_SOFT*/
+#define AL_SN3D_SOFT                             0x0001
+#define AL_N3D_SOFT                              0x0002
+#endif
+
+#ifndef ALC_SOFT_loopback_bformat
+#define ALC_SOFT_loopback_bformat 1
+#define ALC_AMBISONIC_LAYOUT_SOFT                0x1997
+#define ALC_AMBISONIC_SCALING_SOFT               0x1998
+#define ALC_AMBISONIC_ORDER_SOFT                 0x1999
+#define ALC_MAX_AMBISONIC_ORDER_SOFT             0x199B
+
+#define ALC_BFORMAT3D_SOFT                       0x1507
+
+/* Ambisonic layouts */
+#define ALC_FUMA_SOFT                            0x0000
+#define ALC_ACN_SOFT                             0x0001
+
+/* Ambisonic scalings (normalization) */
+/*#define ALC_FUMA_SOFT*/
+#define ALC_SN3D_SOFT                            0x0001
+#define ALC_N3D_SOFT                             0x0002
+#endif
+
+#ifndef AL_SOFT_effect_target
+#define AL_SOFT_effect_target
+#define AL_EFFECTSLOT_TARGET_SOFT                0x199C
+#endif
+
+#ifndef AL_SOFT_events
+#define AL_SOFT_events 1
+#define AL_EVENT_CALLBACK_FUNCTION_SOFT          0x19A2
+#define AL_EVENT_CALLBACK_USER_PARAM_SOFT        0x19A3
+#define AL_EVENT_TYPE_BUFFER_COMPLETED_SOFT      0x19A4
+#define AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT  0x19A5
+#define AL_EVENT_TYPE_DISCONNECTED_SOFT          0x19A6
+typedef void (AL_APIENTRY*ALEVENTPROCSOFT)(ALenum eventType, ALuint object, ALuint param,
+                                           ALsizei length, const ALchar *message,
+                                           void *userParam);
+typedef void (AL_APIENTRY*LPALEVENTCONTROLSOFT)(ALsizei count, const ALenum *types, ALboolean enable);
+typedef void (AL_APIENTRY*LPALEVENTCALLBACKSOFT)(ALEVENTPROCSOFT callback, void *userParam);
+typedef void* (AL_APIENTRY*LPALGETPOINTERSOFT)(ALenum pname);
+typedef void (AL_APIENTRY*LPALGETPOINTERVSOFT)(ALenum pname, void **values);
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alEventControlSOFT(ALsizei count, const ALenum *types, ALboolean enable);
+AL_API void AL_APIENTRY alEventCallbackSOFT(ALEVENTPROCSOFT callback, void *userParam);
+AL_API void* AL_APIENTRY alGetPointerSOFT(ALenum pname);
+AL_API void AL_APIENTRY alGetPointervSOFT(ALenum pname, void **values);
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/3rdparty/OpenAL/include/efx-creative.h b/3rdparty/OpenAL/include/efx-creative.h
new file mode 100644
index 0000000000..0a04c982e1
--- /dev/null
+++ b/3rdparty/OpenAL/include/efx-creative.h
@@ -0,0 +1,3 @@
+/* The tokens that would be defined here are already defined in efx.h. This
+ * empty file is here to provide compatibility with Windows-based projects
+ * that would include it. */
diff --git a/3rdparty/OpenAL/include/efx-presets.h b/3rdparty/OpenAL/include/efx-presets.h
new file mode 100644
index 0000000000..8539fd5178
--- /dev/null
+++ b/3rdparty/OpenAL/include/efx-presets.h
@@ -0,0 +1,402 @@
+/* Reverb presets for EFX */
+
+#ifndef EFX_PRESETS_H
+#define EFX_PRESETS_H
+
+#ifndef EFXEAXREVERBPROPERTIES_DEFINED
+#define EFXEAXREVERBPROPERTIES_DEFINED
+typedef struct {
+    float flDensity;
+    float flDiffusion;
+    float flGain;
+    float flGainHF;
+    float flGainLF;
+    float flDecayTime;
+    float flDecayHFRatio;
+    float flDecayLFRatio;
+    float flReflectionsGain;
+    float flReflectionsDelay;
+    float flReflectionsPan[3];
+    float flLateReverbGain;
+    float flLateReverbDelay;
+    float flLateReverbPan[3];
+    float flEchoTime;
+    float flEchoDepth;
+    float flModulationTime;
+    float flModulationDepth;
+    float flAirAbsorptionGainHF;
+    float flHFReference;
+    float flLFReference;
+    float flRoomRolloffFactor;
+    int   iDecayHFLimit;
+} EFXEAXREVERBPROPERTIES, *LPEFXEAXREVERBPROPERTIES;
+#endif
+
+/* Default Presets */
+
+#define EFX_REVERB_PRESET_GENERIC \
+    { 1.0000f, 1.0000f, 0.3162f, 0.8913f, 1.0000f, 1.4900f, 0.8300f, 1.0000f, 0.0500f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_PADDEDCELL \
+    { 0.1715f, 1.0000f, 0.3162f, 0.0010f, 1.0000f, 0.1700f, 0.1000f, 1.0000f, 0.2500f, 0.0010f, { 0.0000f, 0.0000f, 0.0000f }, 1.2691f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_ROOM \
+    { 0.4287f, 1.0000f, 0.3162f, 0.5929f, 1.0000f, 0.4000f, 0.8300f, 1.0000f, 0.1503f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 1.0629f, 0.0030f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_BATHROOM \
+    { 0.1715f, 1.0000f, 0.3162f, 0.2512f, 1.0000f, 1.4900f, 0.5400f, 1.0000f, 0.6531f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 3.2734f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_LIVINGROOM \
+    { 0.9766f, 1.0000f, 0.3162f, 0.0010f, 1.0000f, 0.5000f, 0.1000f, 1.0000f, 0.2051f, 0.0030f, { 0.0000f, 0.0000f, 0.0000f }, 0.2805f, 0.0040f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_STONEROOM \
+    { 1.0000f, 1.0000f, 0.3162f, 0.7079f, 1.0000f, 2.3100f, 0.6400f, 1.0000f, 0.4411f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1003f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_AUDITORIUM \
+    { 1.0000f, 1.0000f, 0.3162f, 0.5781f, 1.0000f, 4.3200f, 0.5900f, 1.0000f, 0.4032f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.7170f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CONCERTHALL \
+    { 1.0000f, 1.0000f, 0.3162f, 0.5623f, 1.0000f, 3.9200f, 0.7000f, 1.0000f, 0.2427f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.9977f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CAVE \
+    { 1.0000f, 1.0000f, 0.3162f, 1.0000f, 1.0000f, 2.9100f, 1.3000f, 1.0000f, 0.5000f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.7063f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_ARENA \
+    { 1.0000f, 1.0000f, 0.3162f, 0.4477f, 1.0000f, 7.2400f, 0.3300f, 1.0000f, 0.2612f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.0186f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_HANGAR \
+    { 1.0000f, 1.0000f, 0.3162f, 0.3162f, 1.0000f, 10.0500f, 0.2300f, 1.0000f, 0.5000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.2560f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CARPETEDHALLWAY \
+    { 0.4287f, 1.0000f, 0.3162f, 0.0100f, 1.0000f, 0.3000f, 0.1000f, 1.0000f, 0.1215f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 0.1531f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_HALLWAY \
+    { 0.3645f, 1.0000f, 0.3162f, 0.7079f, 1.0000f, 1.4900f, 0.5900f, 1.0000f, 0.2458f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.6615f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_STONECORRIDOR \
+    { 1.0000f, 1.0000f, 0.3162f, 0.7612f, 1.0000f, 2.7000f, 0.7900f, 1.0000f, 0.2472f, 0.0130f, { 0.0000f, 0.0000f, 0.0000f }, 1.5758f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_ALLEY \
+    { 1.0000f, 0.3000f, 0.3162f, 0.7328f, 1.0000f, 1.4900f, 0.8600f, 1.0000f, 0.2500f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.9954f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.9500f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_FOREST \
+    { 1.0000f, 0.3000f, 0.3162f, 0.0224f, 1.0000f, 1.4900f, 0.5400f, 1.0000f, 0.0525f, 0.1620f, { 0.0000f, 0.0000f, 0.0000f }, 0.7682f, 0.0880f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CITY \
+    { 1.0000f, 0.5000f, 0.3162f, 0.3981f, 1.0000f, 1.4900f, 0.6700f, 1.0000f, 0.0730f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.1427f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_MOUNTAINS \
+    { 1.0000f, 0.2700f, 0.3162f, 0.0562f, 1.0000f, 1.4900f, 0.2100f, 1.0000f, 0.0407f, 0.3000f, { 0.0000f, 0.0000f, 0.0000f }, 0.1919f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_QUARRY \
+    { 1.0000f, 1.0000f, 0.3162f, 0.3162f, 1.0000f, 1.4900f, 0.8300f, 1.0000f, 0.0000f, 0.0610f, { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0250f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.7000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_PLAIN \
+    { 1.0000f, 0.2100f, 0.3162f, 0.1000f, 1.0000f, 1.4900f, 0.5000f, 1.0000f, 0.0585f, 0.1790f, { 0.0000f, 0.0000f, 0.0000f }, 0.1089f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_PARKINGLOT \
+    { 1.0000f, 1.0000f, 0.3162f, 1.0000f, 1.0000f, 1.6500f, 1.5000f, 1.0000f, 0.2082f, 0.0080f, { 0.0000f, 0.0000f, 0.0000f }, 0.2652f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_SEWERPIPE \
+    { 0.3071f, 0.8000f, 0.3162f, 0.3162f, 1.0000f, 2.8100f, 0.1400f, 1.0000f, 1.6387f, 0.0140f, { 0.0000f, 0.0000f, 0.0000f }, 3.2471f, 0.0210f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_UNDERWATER \
+    { 0.3645f, 1.0000f, 0.3162f, 0.0100f, 1.0000f, 1.4900f, 0.1000f, 1.0000f, 0.5963f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 7.0795f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 1.1800f, 0.3480f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_DRUGGED \
+    { 0.4287f, 0.5000f, 0.3162f, 1.0000f, 1.0000f, 8.3900f, 1.3900f, 1.0000f, 0.8760f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 3.1081f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 1.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_DIZZY \
+    { 0.3645f, 0.6000f, 0.3162f, 0.6310f, 1.0000f, 17.2300f, 0.5600f, 1.0000f, 0.1392f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.4937f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.8100f, 0.3100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_PSYCHOTIC \
+    { 0.0625f, 0.5000f, 0.3162f, 0.8404f, 1.0000f, 7.5600f, 0.9100f, 1.0000f, 0.4864f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 2.4378f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 4.0000f, 1.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+/* Castle Presets */
+
+#define EFX_REVERB_PRESET_CASTLE_SMALLROOM \
+    { 1.0000f, 0.8900f, 0.3162f, 0.3981f, 0.1000f, 1.2200f, 0.8300f, 0.3100f, 0.8913f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CASTLE_SHORTPASSAGE \
+    { 1.0000f, 0.8900f, 0.3162f, 0.3162f, 0.1000f, 2.3200f, 0.8300f, 0.3100f, 0.8913f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CASTLE_MEDIUMROOM \
+    { 1.0000f, 0.9300f, 0.3162f, 0.2818f, 0.1000f, 2.0400f, 0.8300f, 0.4600f, 0.6310f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1550f, 0.0300f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CASTLE_LARGEROOM \
+    { 1.0000f, 0.8200f, 0.3162f, 0.2818f, 0.1259f, 2.5300f, 0.8300f, 0.5000f, 0.4467f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1850f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CASTLE_LONGPASSAGE \
+    { 1.0000f, 0.8900f, 0.3162f, 0.3981f, 0.1000f, 3.4200f, 0.8300f, 0.3100f, 0.8913f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CASTLE_HALL \
+    { 1.0000f, 0.8100f, 0.3162f, 0.2818f, 0.1778f, 3.1400f, 0.7900f, 0.6200f, 0.1778f, 0.0560f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CASTLE_CUPBOARD \
+    { 1.0000f, 0.8900f, 0.3162f, 0.2818f, 0.1000f, 0.6700f, 0.8700f, 0.3100f, 1.4125f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 3.5481f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CASTLE_COURTYARD \
+    { 1.0000f, 0.4200f, 0.3162f, 0.4467f, 0.1995f, 2.1300f, 0.6100f, 0.2300f, 0.2239f, 0.1600f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0360f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.3700f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_CASTLE_ALCOVE \
+    { 1.0000f, 0.8900f, 0.3162f, 0.5012f, 0.1000f, 1.6400f, 0.8700f, 0.3100f, 1.0000f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 }
+
+/* Factory Presets */
+
+#define EFX_REVERB_PRESET_FACTORY_SMALLROOM \
+    { 0.3645f, 0.8200f, 0.3162f, 0.7943f, 0.5012f, 1.7200f, 0.6500f, 1.3100f, 0.7079f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.1190f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_FACTORY_SHORTPASSAGE \
+    { 0.3645f, 0.6400f, 0.2512f, 0.7943f, 0.5012f, 2.5300f, 0.6500f, 1.3100f, 1.0000f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.1350f, 0.2300f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_FACTORY_MEDIUMROOM \
+    { 0.4287f, 0.8200f, 0.2512f, 0.7943f, 0.5012f, 2.7600f, 0.6500f, 1.3100f, 0.2818f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1740f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_FACTORY_LARGEROOM \
+    { 0.4287f, 0.7500f, 0.2512f, 0.7079f, 0.6310f, 4.2400f, 0.5100f, 1.3100f, 0.1778f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.2310f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_FACTORY_LONGPASSAGE \
+    { 0.3645f, 0.6400f, 0.2512f, 0.7943f, 0.5012f, 4.0600f, 0.6500f, 1.3100f, 1.0000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0370f, { 0.0000f, 0.0000f, 0.0000f }, 0.1350f, 0.2300f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_FACTORY_HALL \
+    { 0.4287f, 0.7500f, 0.3162f, 0.7079f, 0.6310f, 7.4300f, 0.5100f, 1.3100f, 0.0631f, 0.0730f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_FACTORY_CUPBOARD \
+    { 0.3071f, 0.6300f, 0.2512f, 0.7943f, 0.5012f, 0.4900f, 0.6500f, 1.3100f, 1.2589f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.1070f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_FACTORY_COURTYARD \
+    { 0.3071f, 0.5700f, 0.3162f, 0.3162f, 0.6310f, 2.3200f, 0.2900f, 0.5600f, 0.2239f, 0.1400f, { 0.0000f, 0.0000f, 0.0000f }, 0.3981f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2900f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_FACTORY_ALCOVE \
+    { 0.3645f, 0.5900f, 0.2512f, 0.7943f, 0.5012f, 3.1400f, 0.6500f, 1.3100f, 1.4125f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.1140f, 0.1000f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 }
+
+/* Ice Palace Presets */
+
+#define EFX_REVERB_PRESET_ICEPALACE_SMALLROOM \
+    { 1.0000f, 0.8400f, 0.3162f, 0.5623f, 0.2818f, 1.5100f, 1.5300f, 0.2700f, 0.8913f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1640f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_ICEPALACE_SHORTPASSAGE \
+    { 1.0000f, 0.7500f, 0.3162f, 0.5623f, 0.2818f, 1.7900f, 1.4600f, 0.2800f, 0.5012f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.1770f, 0.0900f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_ICEPALACE_MEDIUMROOM \
+    { 1.0000f, 0.8700f, 0.3162f, 0.5623f, 0.4467f, 2.2200f, 1.5300f, 0.3200f, 0.3981f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.1860f, 0.1200f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_ICEPALACE_LARGEROOM \
+    { 1.0000f, 0.8100f, 0.3162f, 0.5623f, 0.4467f, 3.1400f, 1.5300f, 0.3200f, 0.2512f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.2140f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_ICEPALACE_LONGPASSAGE \
+    { 1.0000f, 0.7700f, 0.3162f, 0.5623f, 0.3981f, 3.0100f, 1.4600f, 0.2800f, 0.7943f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0250f, { 0.0000f, 0.0000f, 0.0000f }, 0.1860f, 0.0400f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_ICEPALACE_HALL \
+    { 1.0000f, 0.7600f, 0.3162f, 0.4467f, 0.5623f, 5.4900f, 1.5300f, 0.3800f, 0.1122f, 0.0540f, { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0520f, { 0.0000f, 0.0000f, 0.0000f }, 0.2260f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_ICEPALACE_CUPBOARD \
+    { 1.0000f, 0.8300f, 0.3162f, 0.5012f, 0.2239f, 0.7600f, 1.5300f, 0.2600f, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1430f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_ICEPALACE_COURTYARD \
+    { 1.0000f, 0.5900f, 0.3162f, 0.2818f, 0.3162f, 2.0400f, 1.2000f, 0.3800f, 0.3162f, 0.1730f, { 0.0000f, 0.0000f, 0.0000f }, 0.3162f, 0.0430f, { 0.0000f, 0.0000f, 0.0000f }, 0.2350f, 0.4800f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_ICEPALACE_ALCOVE \
+    { 1.0000f, 0.8400f, 0.3162f, 0.5623f, 0.2818f, 2.7600f, 1.4600f, 0.2800f, 1.1220f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1610f, 0.0900f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 }
+
+/* Space Station Presets */
+
+#define EFX_REVERB_PRESET_SPACESTATION_SMALLROOM \
+    { 0.2109f, 0.7000f, 0.3162f, 0.7079f, 0.8913f, 1.7200f, 0.8200f, 0.5500f, 0.7943f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0130f, { 0.0000f, 0.0000f, 0.0000f }, 0.1880f, 0.2600f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_SPACESTATION_SHORTPASSAGE \
+    { 0.2109f, 0.8700f, 0.3162f, 0.6310f, 0.8913f, 3.5700f, 0.5000f, 0.5500f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1720f, 0.2000f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_SPACESTATION_MEDIUMROOM \
+    { 0.2109f, 0.7500f, 0.3162f, 0.6310f, 0.8913f, 3.0100f, 0.5000f, 0.5500f, 0.3981f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0350f, { 0.0000f, 0.0000f, 0.0000f }, 0.2090f, 0.3100f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_SPACESTATION_LARGEROOM \
+    { 0.3645f, 0.8100f, 0.3162f, 0.6310f, 0.8913f, 3.8900f, 0.3800f, 0.6100f, 0.3162f, 0.0560f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0350f, { 0.0000f, 0.0000f, 0.0000f }, 0.2330f, 0.2800f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_SPACESTATION_LONGPASSAGE \
+    { 0.4287f, 0.8200f, 0.3162f, 0.6310f, 0.8913f, 4.6200f, 0.6200f, 0.5500f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0310f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2300f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_SPACESTATION_HALL \
+    { 0.4287f, 0.8700f, 0.3162f, 0.6310f, 0.8913f, 7.1100f, 0.3800f, 0.6100f, 0.1778f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0470f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2500f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_SPACESTATION_CUPBOARD \
+    { 0.1715f, 0.5600f, 0.3162f, 0.7079f, 0.8913f, 0.7900f, 0.8100f, 0.5500f, 1.4125f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0180f, { 0.0000f, 0.0000f, 0.0000f }, 0.1810f, 0.3100f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_SPACESTATION_ALCOVE \
+    { 0.2109f, 0.7800f, 0.3162f, 0.7079f, 0.8913f, 1.1600f, 0.8100f, 0.5500f, 1.4125f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0180f, { 0.0000f, 0.0000f, 0.0000f }, 0.1920f, 0.2100f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 }
+
+/* Wooden Galleon Presets */
+
+#define EFX_REVERB_PRESET_WOODEN_SMALLROOM \
+    { 1.0000f, 1.0000f, 0.3162f, 0.1122f, 0.3162f, 0.7900f, 0.3200f, 0.8700f, 1.0000f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_WOODEN_SHORTPASSAGE \
+    { 1.0000f, 1.0000f, 0.3162f, 0.1259f, 0.3162f, 1.7500f, 0.5000f, 0.8700f, 0.8913f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_WOODEN_MEDIUMROOM \
+    { 1.0000f, 1.0000f, 0.3162f, 0.1000f, 0.2818f, 1.4700f, 0.4200f, 0.8200f, 0.8913f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_WOODEN_LARGEROOM \
+    { 1.0000f, 1.0000f, 0.3162f, 0.0891f, 0.2818f, 2.6500f, 0.3300f, 0.8200f, 0.8913f, 0.0660f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_WOODEN_LONGPASSAGE \
+    { 1.0000f, 1.0000f, 0.3162f, 0.1000f, 0.3162f, 1.9900f, 0.4000f, 0.7900f, 1.0000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.4467f, 0.0360f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_WOODEN_HALL \
+    { 1.0000f, 1.0000f, 0.3162f, 0.0794f, 0.2818f, 3.4500f, 0.3000f, 0.8200f, 0.8913f, 0.0880f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0630f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_WOODEN_CUPBOARD \
+    { 1.0000f, 1.0000f, 0.3162f, 0.1413f, 0.3162f, 0.5600f, 0.4600f, 0.9100f, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_WOODEN_COURTYARD \
+    { 1.0000f, 0.6500f, 0.3162f, 0.0794f, 0.3162f, 1.7900f, 0.3500f, 0.7900f, 0.5623f, 0.1230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1000f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_WOODEN_ALCOVE \
+    { 1.0000f, 1.0000f, 0.3162f, 0.1259f, 0.3162f, 1.2200f, 0.6200f, 0.9100f, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 }
+
+/* Sports Presets */
+
+#define EFX_REVERB_PRESET_SPORT_EMPTYSTADIUM \
+    { 1.0000f, 1.0000f, 0.3162f, 0.4467f, 0.7943f, 6.2600f, 0.5100f, 1.1000f, 0.0631f, 0.1830f, { 0.0000f, 0.0000f, 0.0000f }, 0.3981f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_SPORT_SQUASHCOURT \
+    { 1.0000f, 0.7500f, 0.3162f, 0.3162f, 0.7943f, 2.2200f, 0.9100f, 1.1600f, 0.4467f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1260f, 0.1900f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_SPORT_SMALLSWIMMINGPOOL \
+    { 1.0000f, 0.7000f, 0.3162f, 0.7943f, 0.8913f, 2.7600f, 1.2500f, 1.1400f, 0.6310f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1790f, 0.1500f, 0.8950f, 0.1900f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_SPORT_LARGESWIMMINGPOOL \
+    { 1.0000f, 0.8200f, 0.3162f, 0.7943f, 1.0000f, 5.4900f, 1.3100f, 1.1400f, 0.4467f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 0.5012f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2220f, 0.5500f, 1.1590f, 0.2100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_SPORT_GYMNASIUM \
+    { 1.0000f, 0.8100f, 0.3162f, 0.4467f, 0.8913f, 3.1400f, 1.0600f, 1.3500f, 0.3981f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.5623f, 0.0450f, { 0.0000f, 0.0000f, 0.0000f }, 0.1460f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_SPORT_FULLSTADIUM \
+    { 1.0000f, 1.0000f, 0.3162f, 0.0708f, 0.7943f, 5.2500f, 0.1700f, 0.8000f, 0.1000f, 0.1880f, { 0.0000f, 0.0000f, 0.0000f }, 0.2818f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_SPORT_STADIUMTANNOY \
+    { 1.0000f, 0.7800f, 0.3162f, 0.5623f, 0.5012f, 2.5300f, 0.8800f, 0.6800f, 0.2818f, 0.2300f, { 0.0000f, 0.0000f, 0.0000f }, 0.5012f, 0.0630f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+/* Prefab Presets */
+
+#define EFX_REVERB_PRESET_PREFAB_WORKSHOP \
+    { 0.4287f, 1.0000f, 0.3162f, 0.1413f, 0.3981f, 0.7600f, 1.0000f, 1.0000f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_PREFAB_SCHOOLROOM \
+    { 0.4022f, 0.6900f, 0.3162f, 0.6310f, 0.5012f, 0.9800f, 0.4500f, 0.1800f, 1.4125f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.0950f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_PREFAB_PRACTISEROOM \
+    { 0.4022f, 0.8700f, 0.3162f, 0.3981f, 0.5012f, 1.1200f, 0.5600f, 0.1800f, 1.2589f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.0950f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_PREFAB_OUTHOUSE \
+    { 1.0000f, 0.8200f, 0.3162f, 0.1122f, 0.1585f, 1.3800f, 0.3800f, 0.3500f, 0.8913f, 0.0240f, { 0.0000f, 0.0000f, -0.0000f }, 0.6310f, 0.0440f, { 0.0000f, 0.0000f, 0.0000f }, 0.1210f, 0.1700f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_PREFAB_CARAVAN \
+    { 1.0000f, 1.0000f, 0.3162f, 0.0891f, 0.1259f, 0.4300f, 1.5000f, 1.0000f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+/* Dome and Pipe Presets */
+
+#define EFX_REVERB_PRESET_DOME_TOMB \
+    { 1.0000f, 0.7900f, 0.3162f, 0.3548f, 0.2239f, 4.1800f, 0.2100f, 0.1000f, 0.3868f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 1.6788f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.1770f, 0.1900f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_PIPE_SMALL \
+    { 1.0000f, 1.0000f, 0.3162f, 0.3548f, 0.2239f, 5.0400f, 0.1000f, 0.1000f, 0.5012f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 2.5119f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_DOME_SAINTPAULS \
+    { 1.0000f, 0.8700f, 0.3162f, 0.3548f, 0.2239f, 10.4800f, 0.1900f, 0.1000f, 0.1778f, 0.0900f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0420f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1200f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_PIPE_LONGTHIN \
+    { 0.2560f, 0.9100f, 0.3162f, 0.4467f, 0.2818f, 9.2100f, 0.1800f, 0.1000f, 0.7079f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_PIPE_LARGE \
+    { 1.0000f, 1.0000f, 0.3162f, 0.3548f, 0.2239f, 8.4500f, 0.1000f, 0.1000f, 0.3981f, 0.0460f, { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_PIPE_RESONANT \
+    { 0.1373f, 0.9100f, 0.3162f, 0.4467f, 0.2818f, 6.8100f, 0.1800f, 0.1000f, 0.7079f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0 }
+
+/* Outdoors Presets */
+
+#define EFX_REVERB_PRESET_OUTDOORS_BACKYARD \
+    { 1.0000f, 0.4500f, 0.3162f, 0.2512f, 0.5012f, 1.1200f, 0.3400f, 0.4600f, 0.4467f, 0.0690f, { 0.0000f, 0.0000f, -0.0000f }, 0.7079f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.2180f, 0.3400f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_OUTDOORS_ROLLINGPLAINS \
+    { 1.0000f, 0.0000f, 0.3162f, 0.0112f, 0.6310f, 2.1300f, 0.2100f, 0.4600f, 0.1778f, 0.3000f, { 0.0000f, 0.0000f, -0.0000f }, 0.4467f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_OUTDOORS_DEEPCANYON \
+    { 1.0000f, 0.7400f, 0.3162f, 0.1778f, 0.6310f, 3.8900f, 0.2100f, 0.4600f, 0.3162f, 0.2230f, { 0.0000f, 0.0000f, -0.0000f }, 0.3548f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_OUTDOORS_CREEK \
+    { 1.0000f, 0.3500f, 0.3162f, 0.1778f, 0.5012f, 2.1300f, 0.2100f, 0.4600f, 0.3981f, 0.1150f, { 0.0000f, 0.0000f, -0.0000f }, 0.1995f, 0.0310f, { 0.0000f, 0.0000f, 0.0000f }, 0.2180f, 0.3400f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_OUTDOORS_VALLEY \
+    { 1.0000f, 0.2800f, 0.3162f, 0.0282f, 0.1585f, 2.8800f, 0.2600f, 0.3500f, 0.1413f, 0.2630f, { 0.0000f, 0.0000f, -0.0000f }, 0.3981f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.3400f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 }
+
+/* Mood Presets */
+
+#define EFX_REVERB_PRESET_MOOD_HEAVEN \
+    { 1.0000f, 0.9400f, 0.3162f, 0.7943f, 0.4467f, 5.0400f, 1.1200f, 0.5600f, 0.2427f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0800f, 2.7420f, 0.0500f, 0.9977f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_MOOD_HELL \
+    { 1.0000f, 0.5700f, 0.3162f, 0.3548f, 0.4467f, 3.5700f, 0.4900f, 2.0000f, 0.0000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1100f, 0.0400f, 2.1090f, 0.5200f, 0.9943f, 5000.0000f, 139.5000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_MOOD_MEMORY \
+    { 1.0000f, 0.8500f, 0.3162f, 0.6310f, 0.3548f, 4.0600f, 0.8200f, 0.5600f, 0.0398f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.4740f, 0.4500f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+/* Driving Presets */
+
+#define EFX_REVERB_PRESET_DRIVING_COMMENTATOR \
+    { 1.0000f, 0.0000f, 0.3162f, 0.5623f, 0.5012f, 2.4200f, 0.8800f, 0.6800f, 0.1995f, 0.0930f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_DRIVING_PITGARAGE \
+    { 0.4287f, 0.5900f, 0.3162f, 0.7079f, 0.5623f, 1.7200f, 0.9300f, 0.8700f, 0.5623f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_DRIVING_INCAR_RACER \
+    { 0.0832f, 0.8000f, 0.3162f, 1.0000f, 0.7943f, 0.1700f, 2.0000f, 0.4100f, 1.7783f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_DRIVING_INCAR_SPORTS \
+    { 0.0832f, 0.8000f, 0.3162f, 0.6310f, 1.0000f, 0.1700f, 0.7500f, 0.4100f, 1.0000f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.5623f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_DRIVING_INCAR_LUXURY \
+    { 0.2560f, 1.0000f, 0.3162f, 0.1000f, 0.5012f, 0.1300f, 0.4100f, 0.4600f, 0.7943f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_DRIVING_FULLGRANDSTAND \
+    { 1.0000f, 1.0000f, 0.3162f, 0.2818f, 0.6310f, 3.0100f, 1.3700f, 1.2800f, 0.3548f, 0.0900f, { 0.0000f, 0.0000f, 0.0000f }, 0.1778f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10420.2002f, 250.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_DRIVING_EMPTYGRANDSTAND \
+    { 1.0000f, 1.0000f, 0.3162f, 1.0000f, 0.7943f, 4.6200f, 1.7500f, 1.4000f, 0.2082f, 0.0900f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10420.2002f, 250.0000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_DRIVING_TUNNEL \
+    { 1.0000f, 0.8100f, 0.3162f, 0.3981f, 0.8913f, 3.4200f, 0.9400f, 1.3100f, 0.7079f, 0.0510f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0470f, { 0.0000f, 0.0000f, 0.0000f }, 0.2140f, 0.0500f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 155.3000f, 0.0000f, 0x1 }
+
+/* City Presets */
+
+#define EFX_REVERB_PRESET_CITY_STREETS \
+    { 1.0000f, 0.7800f, 0.3162f, 0.7079f, 0.8913f, 1.7900f, 1.1200f, 0.9100f, 0.2818f, 0.0460f, { 0.0000f, 0.0000f, 0.0000f }, 0.1995f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CITY_SUBWAY \
+    { 1.0000f, 0.7400f, 0.3162f, 0.7079f, 0.8913f, 3.0100f, 1.2300f, 0.9100f, 0.7079f, 0.0460f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.2100f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CITY_MUSEUM \
+    { 1.0000f, 0.8200f, 0.3162f, 0.1778f, 0.1778f, 3.2800f, 1.4000f, 0.5700f, 0.2512f, 0.0390f, { 0.0000f, 0.0000f, -0.0000f }, 0.8913f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 0.1300f, 0.1700f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_CITY_LIBRARY \
+    { 1.0000f, 0.8200f, 0.3162f, 0.2818f, 0.0891f, 2.7600f, 0.8900f, 0.4100f, 0.3548f, 0.0290f, { 0.0000f, 0.0000f, -0.0000f }, 0.8913f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.1300f, 0.1700f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 }
+
+#define EFX_REVERB_PRESET_CITY_UNDERPASS \
+    { 1.0000f, 0.8200f, 0.3162f, 0.4467f, 0.8913f, 3.5700f, 1.1200f, 0.9100f, 0.3981f, 0.0590f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0370f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1400f, 0.2500f, 0.0000f, 0.9920f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CITY_ABANDONED \
+    { 1.0000f, 0.6900f, 0.3162f, 0.7943f, 0.8913f, 3.2800f, 1.1700f, 0.9100f, 0.4467f, 0.0440f, { 0.0000f, 0.0000f, 0.0000f }, 0.2818f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, 0.0000f, 0.9966f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+/* Misc. Presets */
+
+#define EFX_REVERB_PRESET_DUSTYROOM \
+    { 0.3645f, 0.5600f, 0.3162f, 0.7943f, 0.7079f, 1.7900f, 0.3800f, 0.2100f, 0.5012f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0060f, { 0.0000f, 0.0000f, 0.0000f }, 0.2020f, 0.0500f, 0.2500f, 0.0000f, 0.9886f, 13046.0000f, 163.3000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_CHAPEL \
+    { 1.0000f, 0.8400f, 0.3162f, 0.5623f, 1.0000f, 4.6200f, 0.6400f, 1.2300f, 0.4467f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.1100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+
+#define EFX_REVERB_PRESET_SMALLWATERROOM \
+    { 1.0000f, 0.7000f, 0.3162f, 0.4477f, 1.0000f, 1.5100f, 1.2500f, 1.1400f, 0.8913f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1790f, 0.1500f, 0.8950f, 0.1900f, 0.9920f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
+
+#endif /* EFX_PRESETS_H */
diff --git a/3rdparty/OpenAL/include/efx.h b/3rdparty/OpenAL/include/efx.h
new file mode 100644
index 0000000000..5ab64a64d7
--- /dev/null
+++ b/3rdparty/OpenAL/include/efx.h
@@ -0,0 +1,762 @@
+#ifndef AL_EFX_H
+#define AL_EFX_H
+
+#include <float.h>
+
+#include "alc.h"
+#include "al.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ALC_EXT_EFX_NAME                         "ALC_EXT_EFX"
+
+#define ALC_EFX_MAJOR_VERSION                    0x20001
+#define ALC_EFX_MINOR_VERSION                    0x20002
+#define ALC_MAX_AUXILIARY_SENDS                  0x20003
+
+
+/* Listener properties. */
+#define AL_METERS_PER_UNIT                       0x20004
+
+/* Source properties. */
+#define AL_DIRECT_FILTER                         0x20005
+#define AL_AUXILIARY_SEND_FILTER                 0x20006
+#define AL_AIR_ABSORPTION_FACTOR                 0x20007
+#define AL_ROOM_ROLLOFF_FACTOR                   0x20008
+#define AL_CONE_OUTER_GAINHF                     0x20009
+#define AL_DIRECT_FILTER_GAINHF_AUTO             0x2000A
+#define AL_AUXILIARY_SEND_FILTER_GAIN_AUTO       0x2000B
+#define AL_AUXILIARY_SEND_FILTER_GAINHF_AUTO     0x2000C
+
+
+/* Effect properties. */
+
+/* Reverb effect parameters */
+#define AL_REVERB_DENSITY                        0x0001
+#define AL_REVERB_DIFFUSION                      0x0002
+#define AL_REVERB_GAIN                           0x0003
+#define AL_REVERB_GAINHF                         0x0004
+#define AL_REVERB_DECAY_TIME                     0x0005
+#define AL_REVERB_DECAY_HFRATIO                  0x0006
+#define AL_REVERB_REFLECTIONS_GAIN               0x0007
+#define AL_REVERB_REFLECTIONS_DELAY              0x0008
+#define AL_REVERB_LATE_REVERB_GAIN               0x0009
+#define AL_REVERB_LATE_REVERB_DELAY              0x000A
+#define AL_REVERB_AIR_ABSORPTION_GAINHF          0x000B
+#define AL_REVERB_ROOM_ROLLOFF_FACTOR            0x000C
+#define AL_REVERB_DECAY_HFLIMIT                  0x000D
+
+/* EAX Reverb effect parameters */
+#define AL_EAXREVERB_DENSITY                     0x0001
+#define AL_EAXREVERB_DIFFUSION                   0x0002
+#define AL_EAXREVERB_GAIN                        0x0003
+#define AL_EAXREVERB_GAINHF                      0x0004
+#define AL_EAXREVERB_GAINLF                      0x0005
+#define AL_EAXREVERB_DECAY_TIME                  0x0006
+#define AL_EAXREVERB_DECAY_HFRATIO               0x0007
+#define AL_EAXREVERB_DECAY_LFRATIO               0x0008
+#define AL_EAXREVERB_REFLECTIONS_GAIN            0x0009
+#define AL_EAXREVERB_REFLECTIONS_DELAY           0x000A
+#define AL_EAXREVERB_REFLECTIONS_PAN             0x000B
+#define AL_EAXREVERB_LATE_REVERB_GAIN            0x000C
+#define AL_EAXREVERB_LATE_REVERB_DELAY           0x000D
+#define AL_EAXREVERB_LATE_REVERB_PAN             0x000E
+#define AL_EAXREVERB_ECHO_TIME                   0x000F
+#define AL_EAXREVERB_ECHO_DEPTH                  0x0010
+#define AL_EAXREVERB_MODULATION_TIME             0x0011
+#define AL_EAXREVERB_MODULATION_DEPTH            0x0012
+#define AL_EAXREVERB_AIR_ABSORPTION_GAINHF       0x0013
+#define AL_EAXREVERB_HFREFERENCE                 0x0014
+#define AL_EAXREVERB_LFREFERENCE                 0x0015
+#define AL_EAXREVERB_ROOM_ROLLOFF_FACTOR         0x0016
+#define AL_EAXREVERB_DECAY_HFLIMIT               0x0017
+
+/* Chorus effect parameters */
+#define AL_CHORUS_WAVEFORM                       0x0001
+#define AL_CHORUS_PHASE                          0x0002
+#define AL_CHORUS_RATE                           0x0003
+#define AL_CHORUS_DEPTH                          0x0004
+#define AL_CHORUS_FEEDBACK                       0x0005
+#define AL_CHORUS_DELAY                          0x0006
+
+/* Distortion effect parameters */
+#define AL_DISTORTION_EDGE                       0x0001
+#define AL_DISTORTION_GAIN                       0x0002
+#define AL_DISTORTION_LOWPASS_CUTOFF             0x0003
+#define AL_DISTORTION_EQCENTER                   0x0004
+#define AL_DISTORTION_EQBANDWIDTH                0x0005
+
+/* Echo effect parameters */
+#define AL_ECHO_DELAY                            0x0001
+#define AL_ECHO_LRDELAY                          0x0002
+#define AL_ECHO_DAMPING                          0x0003
+#define AL_ECHO_FEEDBACK                         0x0004
+#define AL_ECHO_SPREAD                           0x0005
+
+/* Flanger effect parameters */
+#define AL_FLANGER_WAVEFORM                      0x0001
+#define AL_FLANGER_PHASE                         0x0002
+#define AL_FLANGER_RATE                          0x0003
+#define AL_FLANGER_DEPTH                         0x0004
+#define AL_FLANGER_FEEDBACK                      0x0005
+#define AL_FLANGER_DELAY                         0x0006
+
+/* Frequency shifter effect parameters */
+#define AL_FREQUENCY_SHIFTER_FREQUENCY           0x0001
+#define AL_FREQUENCY_SHIFTER_LEFT_DIRECTION      0x0002
+#define AL_FREQUENCY_SHIFTER_RIGHT_DIRECTION     0x0003
+
+/* Vocal morpher effect parameters */
+#define AL_VOCAL_MORPHER_PHONEMEA                0x0001
+#define AL_VOCAL_MORPHER_PHONEMEA_COARSE_TUNING  0x0002
+#define AL_VOCAL_MORPHER_PHONEMEB                0x0003
+#define AL_VOCAL_MORPHER_PHONEMEB_COARSE_TUNING  0x0004
+#define AL_VOCAL_MORPHER_WAVEFORM                0x0005
+#define AL_VOCAL_MORPHER_RATE                    0x0006
+
+/* Pitchshifter effect parameters */
+#define AL_PITCH_SHIFTER_COARSE_TUNE             0x0001
+#define AL_PITCH_SHIFTER_FINE_TUNE               0x0002
+
+/* Ringmodulator effect parameters */
+#define AL_RING_MODULATOR_FREQUENCY              0x0001
+#define AL_RING_MODULATOR_HIGHPASS_CUTOFF        0x0002
+#define AL_RING_MODULATOR_WAVEFORM               0x0003
+
+/* Autowah effect parameters */
+#define AL_AUTOWAH_ATTACK_TIME                   0x0001
+#define AL_AUTOWAH_RELEASE_TIME                  0x0002
+#define AL_AUTOWAH_RESONANCE                     0x0003
+#define AL_AUTOWAH_PEAK_GAIN                     0x0004
+
+/* Compressor effect parameters */
+#define AL_COMPRESSOR_ONOFF                      0x0001
+
+/* Equalizer effect parameters */
+#define AL_EQUALIZER_LOW_GAIN                    0x0001
+#define AL_EQUALIZER_LOW_CUTOFF                  0x0002
+#define AL_EQUALIZER_MID1_GAIN                   0x0003
+#define AL_EQUALIZER_MID1_CENTER                 0x0004
+#define AL_EQUALIZER_MID1_WIDTH                  0x0005
+#define AL_EQUALIZER_MID2_GAIN                   0x0006
+#define AL_EQUALIZER_MID2_CENTER                 0x0007
+#define AL_EQUALIZER_MID2_WIDTH                  0x0008
+#define AL_EQUALIZER_HIGH_GAIN                   0x0009
+#define AL_EQUALIZER_HIGH_CUTOFF                 0x000A
+
+/* Effect type */
+#define AL_EFFECT_FIRST_PARAMETER                0x0000
+#define AL_EFFECT_LAST_PARAMETER                 0x8000
+#define AL_EFFECT_TYPE                           0x8001
+
+/* Effect types, used with the AL_EFFECT_TYPE property */
+#define AL_EFFECT_NULL                           0x0000
+#define AL_EFFECT_REVERB                         0x0001
+#define AL_EFFECT_CHORUS                         0x0002
+#define AL_EFFECT_DISTORTION                     0x0003
+#define AL_EFFECT_ECHO                           0x0004
+#define AL_EFFECT_FLANGER                        0x0005
+#define AL_EFFECT_FREQUENCY_SHIFTER              0x0006
+#define AL_EFFECT_VOCAL_MORPHER                  0x0007
+#define AL_EFFECT_PITCH_SHIFTER                  0x0008
+#define AL_EFFECT_RING_MODULATOR                 0x0009
+#define AL_EFFECT_AUTOWAH                        0x000A
+#define AL_EFFECT_COMPRESSOR                     0x000B
+#define AL_EFFECT_EQUALIZER                      0x000C
+#define AL_EFFECT_EAXREVERB                      0x8000
+
+/* Auxiliary Effect Slot properties. */
+#define AL_EFFECTSLOT_EFFECT                     0x0001
+#define AL_EFFECTSLOT_GAIN                       0x0002
+#define AL_EFFECTSLOT_AUXILIARY_SEND_AUTO        0x0003
+
+/* NULL Auxiliary Slot ID to disable a source send. */
+#define AL_EFFECTSLOT_NULL                       0x0000
+
+
+/* Filter properties. */
+
+/* Lowpass filter parameters */
+#define AL_LOWPASS_GAIN                          0x0001
+#define AL_LOWPASS_GAINHF                        0x0002
+
+/* Highpass filter parameters */
+#define AL_HIGHPASS_GAIN                         0x0001
+#define AL_HIGHPASS_GAINLF                       0x0002
+
+/* Bandpass filter parameters */
+#define AL_BANDPASS_GAIN                         0x0001
+#define AL_BANDPASS_GAINLF                       0x0002
+#define AL_BANDPASS_GAINHF                       0x0003
+
+/* Filter type */
+#define AL_FILTER_FIRST_PARAMETER                0x0000
+#define AL_FILTER_LAST_PARAMETER                 0x8000
+#define AL_FILTER_TYPE                           0x8001
+
+/* Filter types, used with the AL_FILTER_TYPE property */
+#define AL_FILTER_NULL                           0x0000
+#define AL_FILTER_LOWPASS                        0x0001
+#define AL_FILTER_HIGHPASS                       0x0002
+#define AL_FILTER_BANDPASS                       0x0003
+
+
+/* Effect object function types. */
+typedef void (AL_APIENTRY *LPALGENEFFECTS)(ALsizei, ALuint*);
+typedef void (AL_APIENTRY *LPALDELETEEFFECTS)(ALsizei, const ALuint*);
+typedef ALboolean (AL_APIENTRY *LPALISEFFECT)(ALuint);
+typedef void (AL_APIENTRY *LPALEFFECTI)(ALuint, ALenum, ALint);
+typedef void (AL_APIENTRY *LPALEFFECTIV)(ALuint, ALenum, const ALint*);
+typedef void (AL_APIENTRY *LPALEFFECTF)(ALuint, ALenum, ALfloat);
+typedef void (AL_APIENTRY *LPALEFFECTFV)(ALuint, ALenum, const ALfloat*);
+typedef void (AL_APIENTRY *LPALGETEFFECTI)(ALuint, ALenum, ALint*);
+typedef void (AL_APIENTRY *LPALGETEFFECTIV)(ALuint, ALenum, ALint*);
+typedef void (AL_APIENTRY *LPALGETEFFECTF)(ALuint, ALenum, ALfloat*);
+typedef void (AL_APIENTRY *LPALGETEFFECTFV)(ALuint, ALenum, ALfloat*);
+
+/* Filter object function types. */
+typedef void (AL_APIENTRY *LPALGENFILTERS)(ALsizei, ALuint*);
+typedef void (AL_APIENTRY *LPALDELETEFILTERS)(ALsizei, const ALuint*);
+typedef ALboolean (AL_APIENTRY *LPALISFILTER)(ALuint);
+typedef void (AL_APIENTRY *LPALFILTERI)(ALuint, ALenum, ALint);
+typedef void (AL_APIENTRY *LPALFILTERIV)(ALuint, ALenum, const ALint*);
+typedef void (AL_APIENTRY *LPALFILTERF)(ALuint, ALenum, ALfloat);
+typedef void (AL_APIENTRY *LPALFILTERFV)(ALuint, ALenum, const ALfloat*);
+typedef void (AL_APIENTRY *LPALGETFILTERI)(ALuint, ALenum, ALint*);
+typedef void (AL_APIENTRY *LPALGETFILTERIV)(ALuint, ALenum, ALint*);
+typedef void (AL_APIENTRY *LPALGETFILTERF)(ALuint, ALenum, ALfloat*);
+typedef void (AL_APIENTRY *LPALGETFILTERFV)(ALuint, ALenum, ALfloat*);
+
+/* Auxiliary Effect Slot object function types. */
+typedef void (AL_APIENTRY *LPALGENAUXILIARYEFFECTSLOTS)(ALsizei, ALuint*);
+typedef void (AL_APIENTRY *LPALDELETEAUXILIARYEFFECTSLOTS)(ALsizei, const ALuint*);
+typedef ALboolean (AL_APIENTRY *LPALISAUXILIARYEFFECTSLOT)(ALuint);
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint);
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, const ALint*);
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat);
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, const ALfloat*);
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint*);
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, ALint*);
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat*);
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, ALfloat*);
+
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects);
+AL_API void AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint *effects);
+AL_API ALboolean AL_APIENTRY alIsEffect(ALuint effect);
+AL_API void AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue);
+AL_API void AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *piValues);
+AL_API void AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue);
+AL_API void AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *pflValues);
+AL_API void AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *piValue);
+AL_API void AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *piValues);
+AL_API void AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *pflValue);
+AL_API void AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *pflValues);
+
+AL_API void AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters);
+AL_API void AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint *filters);
+AL_API ALboolean AL_APIENTRY alIsFilter(ALuint filter);
+AL_API void AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue);
+AL_API void AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *piValues);
+AL_API void AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue);
+AL_API void AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *pflValues);
+AL_API void AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *piValue);
+AL_API void AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piValues);
+AL_API void AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *pflValue);
+AL_API void AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *pflValues);
+
+AL_API void AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots);
+AL_API void AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint *effectslots);
+AL_API ALboolean AL_APIENTRY alIsAuxiliaryEffectSlot(ALuint effectslot);
+AL_API void AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint iValue);
+AL_API void AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *piValues);
+AL_API void AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat flValue);
+AL_API void AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *pflValues);
+AL_API void AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *piValue);
+AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *piValues);
+AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *pflValue);
+AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *pflValues);
+#endif
+
+/* Filter ranges and defaults. */
+
+/* Lowpass filter */
+#define AL_LOWPASS_MIN_GAIN                      (0.0f)
+#define AL_LOWPASS_MAX_GAIN                      (1.0f)
+#define AL_LOWPASS_DEFAULT_GAIN                  (1.0f)
+
+#define AL_LOWPASS_MIN_GAINHF                    (0.0f)
+#define AL_LOWPASS_MAX_GAINHF                    (1.0f)
+#define AL_LOWPASS_DEFAULT_GAINHF                (1.0f)
+
+/* Highpass filter */
+#define AL_HIGHPASS_MIN_GAIN                     (0.0f)
+#define AL_HIGHPASS_MAX_GAIN                     (1.0f)
+#define AL_HIGHPASS_DEFAULT_GAIN                 (1.0f)
+
+#define AL_HIGHPASS_MIN_GAINLF                   (0.0f)
+#define AL_HIGHPASS_MAX_GAINLF                   (1.0f)
+#define AL_HIGHPASS_DEFAULT_GAINLF               (1.0f)
+
+/* Bandpass filter */
+#define AL_BANDPASS_MIN_GAIN                     (0.0f)
+#define AL_BANDPASS_MAX_GAIN                     (1.0f)
+#define AL_BANDPASS_DEFAULT_GAIN                 (1.0f)
+
+#define AL_BANDPASS_MIN_GAINHF                   (0.0f)
+#define AL_BANDPASS_MAX_GAINHF                   (1.0f)
+#define AL_BANDPASS_DEFAULT_GAINHF               (1.0f)
+
+#define AL_BANDPASS_MIN_GAINLF                   (0.0f)
+#define AL_BANDPASS_MAX_GAINLF                   (1.0f)
+#define AL_BANDPASS_DEFAULT_GAINLF               (1.0f)
+
+
+/* Effect parameter ranges and defaults. */
+
+/* Standard reverb effect */
+#define AL_REVERB_MIN_DENSITY                    (0.0f)
+#define AL_REVERB_MAX_DENSITY                    (1.0f)
+#define AL_REVERB_DEFAULT_DENSITY                (1.0f)
+
+#define AL_REVERB_MIN_DIFFUSION                  (0.0f)
+#define AL_REVERB_MAX_DIFFUSION                  (1.0f)
+#define AL_REVERB_DEFAULT_DIFFUSION              (1.0f)
+
+#define AL_REVERB_MIN_GAIN                       (0.0f)
+#define AL_REVERB_MAX_GAIN                       (1.0f)
+#define AL_REVERB_DEFAULT_GAIN                   (0.32f)
+
+#define AL_REVERB_MIN_GAINHF                     (0.0f)
+#define AL_REVERB_MAX_GAINHF                     (1.0f)
+#define AL_REVERB_DEFAULT_GAINHF                 (0.89f)
+
+#define AL_REVERB_MIN_DECAY_TIME                 (0.1f)
+#define AL_REVERB_MAX_DECAY_TIME                 (20.0f)
+#define AL_REVERB_DEFAULT_DECAY_TIME             (1.49f)
+
+#define AL_REVERB_MIN_DECAY_HFRATIO              (0.1f)
+#define AL_REVERB_MAX_DECAY_HFRATIO              (2.0f)
+#define AL_REVERB_DEFAULT_DECAY_HFRATIO          (0.83f)
+
+#define AL_REVERB_MIN_REFLECTIONS_GAIN           (0.0f)
+#define AL_REVERB_MAX_REFLECTIONS_GAIN           (3.16f)
+#define AL_REVERB_DEFAULT_REFLECTIONS_GAIN       (0.05f)
+
+#define AL_REVERB_MIN_REFLECTIONS_DELAY          (0.0f)
+#define AL_REVERB_MAX_REFLECTIONS_DELAY          (0.3f)
+#define AL_REVERB_DEFAULT_REFLECTIONS_DELAY      (0.007f)
+
+#define AL_REVERB_MIN_LATE_REVERB_GAIN           (0.0f)
+#define AL_REVERB_MAX_LATE_REVERB_GAIN           (10.0f)
+#define AL_REVERB_DEFAULT_LATE_REVERB_GAIN       (1.26f)
+
+#define AL_REVERB_MIN_LATE_REVERB_DELAY          (0.0f)
+#define AL_REVERB_MAX_LATE_REVERB_DELAY          (0.1f)
+#define AL_REVERB_DEFAULT_LATE_REVERB_DELAY      (0.011f)
+
+#define AL_REVERB_MIN_AIR_ABSORPTION_GAINHF      (0.892f)
+#define AL_REVERB_MAX_AIR_ABSORPTION_GAINHF      (1.0f)
+#define AL_REVERB_DEFAULT_AIR_ABSORPTION_GAINHF  (0.994f)
+
+#define AL_REVERB_MIN_ROOM_ROLLOFF_FACTOR        (0.0f)
+#define AL_REVERB_MAX_ROOM_ROLLOFF_FACTOR        (10.0f)
+#define AL_REVERB_DEFAULT_ROOM_ROLLOFF_FACTOR    (0.0f)
+
+#define AL_REVERB_MIN_DECAY_HFLIMIT              AL_FALSE
+#define AL_REVERB_MAX_DECAY_HFLIMIT              AL_TRUE
+#define AL_REVERB_DEFAULT_DECAY_HFLIMIT          AL_TRUE
+
+/* EAX reverb effect */
+#define AL_EAXREVERB_MIN_DENSITY                 (0.0f)
+#define AL_EAXREVERB_MAX_DENSITY                 (1.0f)
+#define AL_EAXREVERB_DEFAULT_DENSITY             (1.0f)
+
+#define AL_EAXREVERB_MIN_DIFFUSION               (0.0f)
+#define AL_EAXREVERB_MAX_DIFFUSION               (1.0f)
+#define AL_EAXREVERB_DEFAULT_DIFFUSION           (1.0f)
+
+#define AL_EAXREVERB_MIN_GAIN                    (0.0f)
+#define AL_EAXREVERB_MAX_GAIN                    (1.0f)
+#define AL_EAXREVERB_DEFAULT_GAIN                (0.32f)
+
+#define AL_EAXREVERB_MIN_GAINHF                  (0.0f)
+#define AL_EAXREVERB_MAX_GAINHF                  (1.0f)
+#define AL_EAXREVERB_DEFAULT_GAINHF              (0.89f)
+
+#define AL_EAXREVERB_MIN_GAINLF                  (0.0f)
+#define AL_EAXREVERB_MAX_GAINLF                  (1.0f)
+#define AL_EAXREVERB_DEFAULT_GAINLF              (1.0f)
+
+#define AL_EAXREVERB_MIN_DECAY_TIME              (0.1f)
+#define AL_EAXREVERB_MAX_DECAY_TIME              (20.0f)
+#define AL_EAXREVERB_DEFAULT_DECAY_TIME          (1.49f)
+
+#define AL_EAXREVERB_MIN_DECAY_HFRATIO           (0.1f)
+#define AL_EAXREVERB_MAX_DECAY_HFRATIO           (2.0f)
+#define AL_EAXREVERB_DEFAULT_DECAY_HFRATIO       (0.83f)
+
+#define AL_EAXREVERB_MIN_DECAY_LFRATIO           (0.1f)
+#define AL_EAXREVERB_MAX_DECAY_LFRATIO           (2.0f)
+#define AL_EAXREVERB_DEFAULT_DECAY_LFRATIO       (1.0f)
+
+#define AL_EAXREVERB_MIN_REFLECTIONS_GAIN        (0.0f)
+#define AL_EAXREVERB_MAX_REFLECTIONS_GAIN        (3.16f)
+#define AL_EAXREVERB_DEFAULT_REFLECTIONS_GAIN    (0.05f)
+
+#define AL_EAXREVERB_MIN_REFLECTIONS_DELAY       (0.0f)
+#define AL_EAXREVERB_MAX_REFLECTIONS_DELAY       (0.3f)
+#define AL_EAXREVERB_DEFAULT_REFLECTIONS_DELAY   (0.007f)
+
+#define AL_EAXREVERB_DEFAULT_REFLECTIONS_PAN_XYZ (0.0f)
+
+#define AL_EAXREVERB_MIN_LATE_REVERB_GAIN        (0.0f)
+#define AL_EAXREVERB_MAX_LATE_REVERB_GAIN        (10.0f)
+#define AL_EAXREVERB_DEFAULT_LATE_REVERB_GAIN    (1.26f)
+
+#define AL_EAXREVERB_MIN_LATE_REVERB_DELAY       (0.0f)
+#define AL_EAXREVERB_MAX_LATE_REVERB_DELAY       (0.1f)
+#define AL_EAXREVERB_DEFAULT_LATE_REVERB_DELAY   (0.011f)
+
+#define AL_EAXREVERB_DEFAULT_LATE_REVERB_PAN_XYZ (0.0f)
+
+#define AL_EAXREVERB_MIN_ECHO_TIME               (0.075f)
+#define AL_EAXREVERB_MAX_ECHO_TIME               (0.25f)
+#define AL_EAXREVERB_DEFAULT_ECHO_TIME           (0.25f)
+
+#define AL_EAXREVERB_MIN_ECHO_DEPTH              (0.0f)
+#define AL_EAXREVERB_MAX_ECHO_DEPTH              (1.0f)
+#define AL_EAXREVERB_DEFAULT_ECHO_DEPTH          (0.0f)
+
+#define AL_EAXREVERB_MIN_MODULATION_TIME         (0.04f)
+#define AL_EAXREVERB_MAX_MODULATION_TIME         (4.0f)
+#define AL_EAXREVERB_DEFAULT_MODULATION_TIME     (0.25f)
+
+#define AL_EAXREVERB_MIN_MODULATION_DEPTH        (0.0f)
+#define AL_EAXREVERB_MAX_MODULATION_DEPTH        (1.0f)
+#define AL_EAXREVERB_DEFAULT_MODULATION_DEPTH    (0.0f)
+
+#define AL_EAXREVERB_MIN_AIR_ABSORPTION_GAINHF   (0.892f)
+#define AL_EAXREVERB_MAX_AIR_ABSORPTION_GAINHF   (1.0f)
+#define AL_EAXREVERB_DEFAULT_AIR_ABSORPTION_GAINHF (0.994f)
+
+#define AL_EAXREVERB_MIN_HFREFERENCE             (1000.0f)
+#define AL_EAXREVERB_MAX_HFREFERENCE             (20000.0f)
+#define AL_EAXREVERB_DEFAULT_HFREFERENCE         (5000.0f)
+
+#define AL_EAXREVERB_MIN_LFREFERENCE             (20.0f)
+#define AL_EAXREVERB_MAX_LFREFERENCE             (1000.0f)
+#define AL_EAXREVERB_DEFAULT_LFREFERENCE         (250.0f)
+
+#define AL_EAXREVERB_MIN_ROOM_ROLLOFF_FACTOR     (0.0f)
+#define AL_EAXREVERB_MAX_ROOM_ROLLOFF_FACTOR     (10.0f)
+#define AL_EAXREVERB_DEFAULT_ROOM_ROLLOFF_FACTOR (0.0f)
+
+#define AL_EAXREVERB_MIN_DECAY_HFLIMIT           AL_FALSE
+#define AL_EAXREVERB_MAX_DECAY_HFLIMIT           AL_TRUE
+#define AL_EAXREVERB_DEFAULT_DECAY_HFLIMIT       AL_TRUE
+
+/* Chorus effect */
+#define AL_CHORUS_WAVEFORM_SINUSOID              (0)
+#define AL_CHORUS_WAVEFORM_TRIANGLE              (1)
+
+#define AL_CHORUS_MIN_WAVEFORM                   (0)
+#define AL_CHORUS_MAX_WAVEFORM                   (1)
+#define AL_CHORUS_DEFAULT_WAVEFORM               (1)
+
+#define AL_CHORUS_MIN_PHASE                      (-180)
+#define AL_CHORUS_MAX_PHASE                      (180)
+#define AL_CHORUS_DEFAULT_PHASE                  (90)
+
+#define AL_CHORUS_MIN_RATE                       (0.0f)
+#define AL_CHORUS_MAX_RATE                       (10.0f)
+#define AL_CHORUS_DEFAULT_RATE                   (1.1f)
+
+#define AL_CHORUS_MIN_DEPTH                      (0.0f)
+#define AL_CHORUS_MAX_DEPTH                      (1.0f)
+#define AL_CHORUS_DEFAULT_DEPTH                  (0.1f)
+
+#define AL_CHORUS_MIN_FEEDBACK                   (-1.0f)
+#define AL_CHORUS_MAX_FEEDBACK                   (1.0f)
+#define AL_CHORUS_DEFAULT_FEEDBACK               (0.25f)
+
+#define AL_CHORUS_MIN_DELAY                      (0.0f)
+#define AL_CHORUS_MAX_DELAY                      (0.016f)
+#define AL_CHORUS_DEFAULT_DELAY                  (0.016f)
+
+/* Distortion effect */
+#define AL_DISTORTION_MIN_EDGE                   (0.0f)
+#define AL_DISTORTION_MAX_EDGE                   (1.0f)
+#define AL_DISTORTION_DEFAULT_EDGE               (0.2f)
+
+#define AL_DISTORTION_MIN_GAIN                   (0.01f)
+#define AL_DISTORTION_MAX_GAIN                   (1.0f)
+#define AL_DISTORTION_DEFAULT_GAIN               (0.05f)
+
+#define AL_DISTORTION_MIN_LOWPASS_CUTOFF         (80.0f)
+#define AL_DISTORTION_MAX_LOWPASS_CUTOFF         (24000.0f)
+#define AL_DISTORTION_DEFAULT_LOWPASS_CUTOFF     (8000.0f)
+
+#define AL_DISTORTION_MIN_EQCENTER               (80.0f)
+#define AL_DISTORTION_MAX_EQCENTER               (24000.0f)
+#define AL_DISTORTION_DEFAULT_EQCENTER           (3600.0f)
+
+#define AL_DISTORTION_MIN_EQBANDWIDTH            (80.0f)
+#define AL_DISTORTION_MAX_EQBANDWIDTH            (24000.0f)
+#define AL_DISTORTION_DEFAULT_EQBANDWIDTH        (3600.0f)
+
+/* Echo effect */
+#define AL_ECHO_MIN_DELAY                        (0.0f)
+#define AL_ECHO_MAX_DELAY                        (0.207f)
+#define AL_ECHO_DEFAULT_DELAY                    (0.1f)
+
+#define AL_ECHO_MIN_LRDELAY                      (0.0f)
+#define AL_ECHO_MAX_LRDELAY                      (0.404f)
+#define AL_ECHO_DEFAULT_LRDELAY                  (0.1f)
+
+#define AL_ECHO_MIN_DAMPING                      (0.0f)
+#define AL_ECHO_MAX_DAMPING                      (0.99f)
+#define AL_ECHO_DEFAULT_DAMPING                  (0.5f)
+
+#define AL_ECHO_MIN_FEEDBACK                     (0.0f)
+#define AL_ECHO_MAX_FEEDBACK                     (1.0f)
+#define AL_ECHO_DEFAULT_FEEDBACK                 (0.5f)
+
+#define AL_ECHO_MIN_SPREAD                       (-1.0f)
+#define AL_ECHO_MAX_SPREAD                       (1.0f)
+#define AL_ECHO_DEFAULT_SPREAD                   (-1.0f)
+
+/* Flanger effect */
+#define AL_FLANGER_WAVEFORM_SINUSOID             (0)
+#define AL_FLANGER_WAVEFORM_TRIANGLE             (1)
+
+#define AL_FLANGER_MIN_WAVEFORM                  (0)
+#define AL_FLANGER_MAX_WAVEFORM                  (1)
+#define AL_FLANGER_DEFAULT_WAVEFORM              (1)
+
+#define AL_FLANGER_MIN_PHASE                     (-180)
+#define AL_FLANGER_MAX_PHASE                     (180)
+#define AL_FLANGER_DEFAULT_PHASE                 (0)
+
+#define AL_FLANGER_MIN_RATE                      (0.0f)
+#define AL_FLANGER_MAX_RATE                      (10.0f)
+#define AL_FLANGER_DEFAULT_RATE                  (0.27f)
+
+#define AL_FLANGER_MIN_DEPTH                     (0.0f)
+#define AL_FLANGER_MAX_DEPTH                     (1.0f)
+#define AL_FLANGER_DEFAULT_DEPTH                 (1.0f)
+
+#define AL_FLANGER_MIN_FEEDBACK                  (-1.0f)
+#define AL_FLANGER_MAX_FEEDBACK                  (1.0f)
+#define AL_FLANGER_DEFAULT_FEEDBACK              (-0.5f)
+
+#define AL_FLANGER_MIN_DELAY                     (0.0f)
+#define AL_FLANGER_MAX_DELAY                     (0.004f)
+#define AL_FLANGER_DEFAULT_DELAY                 (0.002f)
+
+/* Frequency shifter effect */
+#define AL_FREQUENCY_SHIFTER_MIN_FREQUENCY       (0.0f)
+#define AL_FREQUENCY_SHIFTER_MAX_FREQUENCY       (24000.0f)
+#define AL_FREQUENCY_SHIFTER_DEFAULT_FREQUENCY   (0.0f)
+
+#define AL_FREQUENCY_SHIFTER_MIN_LEFT_DIRECTION  (0)
+#define AL_FREQUENCY_SHIFTER_MAX_LEFT_DIRECTION  (2)
+#define AL_FREQUENCY_SHIFTER_DEFAULT_LEFT_DIRECTION (0)
+
+#define AL_FREQUENCY_SHIFTER_DIRECTION_DOWN      (0)
+#define AL_FREQUENCY_SHIFTER_DIRECTION_UP        (1)
+#define AL_FREQUENCY_SHIFTER_DIRECTION_OFF       (2)
+
+#define AL_FREQUENCY_SHIFTER_MIN_RIGHT_DIRECTION (0)
+#define AL_FREQUENCY_SHIFTER_MAX_RIGHT_DIRECTION (2)
+#define AL_FREQUENCY_SHIFTER_DEFAULT_RIGHT_DIRECTION (0)
+
+/* Vocal morpher effect */
+#define AL_VOCAL_MORPHER_MIN_PHONEMEA            (0)
+#define AL_VOCAL_MORPHER_MAX_PHONEMEA            (29)
+#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA        (0)
+
+#define AL_VOCAL_MORPHER_MIN_PHONEMEA_COARSE_TUNING (-24)
+#define AL_VOCAL_MORPHER_MAX_PHONEMEA_COARSE_TUNING (24)
+#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA_COARSE_TUNING (0)
+
+#define AL_VOCAL_MORPHER_MIN_PHONEMEB            (0)
+#define AL_VOCAL_MORPHER_MAX_PHONEMEB            (29)
+#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEB        (10)
+
+#define AL_VOCAL_MORPHER_MIN_PHONEMEB_COARSE_TUNING (-24)
+#define AL_VOCAL_MORPHER_MAX_PHONEMEB_COARSE_TUNING (24)
+#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEB_COARSE_TUNING (0)
+
+#define AL_VOCAL_MORPHER_PHONEME_A               (0)
+#define AL_VOCAL_MORPHER_PHONEME_E               (1)
+#define AL_VOCAL_MORPHER_PHONEME_I               (2)
+#define AL_VOCAL_MORPHER_PHONEME_O               (3)
+#define AL_VOCAL_MORPHER_PHONEME_U               (4)
+#define AL_VOCAL_MORPHER_PHONEME_AA              (5)
+#define AL_VOCAL_MORPHER_PHONEME_AE              (6)
+#define AL_VOCAL_MORPHER_PHONEME_AH              (7)
+#define AL_VOCAL_MORPHER_PHONEME_AO              (8)
+#define AL_VOCAL_MORPHER_PHONEME_EH              (9)
+#define AL_VOCAL_MORPHER_PHONEME_ER              (10)
+#define AL_VOCAL_MORPHER_PHONEME_IH              (11)
+#define AL_VOCAL_MORPHER_PHONEME_IY              (12)
+#define AL_VOCAL_MORPHER_PHONEME_UH              (13)
+#define AL_VOCAL_MORPHER_PHONEME_UW              (14)
+#define AL_VOCAL_MORPHER_PHONEME_B               (15)
+#define AL_VOCAL_MORPHER_PHONEME_D               (16)
+#define AL_VOCAL_MORPHER_PHONEME_F               (17)
+#define AL_VOCAL_MORPHER_PHONEME_G               (18)
+#define AL_VOCAL_MORPHER_PHONEME_J               (19)
+#define AL_VOCAL_MORPHER_PHONEME_K               (20)
+#define AL_VOCAL_MORPHER_PHONEME_L               (21)
+#define AL_VOCAL_MORPHER_PHONEME_M               (22)
+#define AL_VOCAL_MORPHER_PHONEME_N               (23)
+#define AL_VOCAL_MORPHER_PHONEME_P               (24)
+#define AL_VOCAL_MORPHER_PHONEME_R               (25)
+#define AL_VOCAL_MORPHER_PHONEME_S               (26)
+#define AL_VOCAL_MORPHER_PHONEME_T               (27)
+#define AL_VOCAL_MORPHER_PHONEME_V               (28)
+#define AL_VOCAL_MORPHER_PHONEME_Z               (29)
+
+#define AL_VOCAL_MORPHER_WAVEFORM_SINUSOID       (0)
+#define AL_VOCAL_MORPHER_WAVEFORM_TRIANGLE       (1)
+#define AL_VOCAL_MORPHER_WAVEFORM_SAWTOOTH       (2)
+
+#define AL_VOCAL_MORPHER_MIN_WAVEFORM            (0)
+#define AL_VOCAL_MORPHER_MAX_WAVEFORM            (2)
+#define AL_VOCAL_MORPHER_DEFAULT_WAVEFORM        (0)
+
+#define AL_VOCAL_MORPHER_MIN_RATE                (0.0f)
+#define AL_VOCAL_MORPHER_MAX_RATE                (10.0f)
+#define AL_VOCAL_MORPHER_DEFAULT_RATE            (1.41f)
+
+/* Pitch shifter effect */
+#define AL_PITCH_SHIFTER_MIN_COARSE_TUNE         (-12)
+#define AL_PITCH_SHIFTER_MAX_COARSE_TUNE         (12)
+#define AL_PITCH_SHIFTER_DEFAULT_COARSE_TUNE     (12)
+
+#define AL_PITCH_SHIFTER_MIN_FINE_TUNE           (-50)
+#define AL_PITCH_SHIFTER_MAX_FINE_TUNE           (50)
+#define AL_PITCH_SHIFTER_DEFAULT_FINE_TUNE       (0)
+
+/* Ring modulator effect */
+#define AL_RING_MODULATOR_MIN_FREQUENCY          (0.0f)
+#define AL_RING_MODULATOR_MAX_FREQUENCY          (8000.0f)
+#define AL_RING_MODULATOR_DEFAULT_FREQUENCY      (440.0f)
+
+#define AL_RING_MODULATOR_MIN_HIGHPASS_CUTOFF    (0.0f)
+#define AL_RING_MODULATOR_MAX_HIGHPASS_CUTOFF    (24000.0f)
+#define AL_RING_MODULATOR_DEFAULT_HIGHPASS_CUTOFF (800.0f)
+
+#define AL_RING_MODULATOR_SINUSOID               (0)
+#define AL_RING_MODULATOR_SAWTOOTH               (1)
+#define AL_RING_MODULATOR_SQUARE                 (2)
+
+#define AL_RING_MODULATOR_MIN_WAVEFORM           (0)
+#define AL_RING_MODULATOR_MAX_WAVEFORM           (2)
+#define AL_RING_MODULATOR_DEFAULT_WAVEFORM       (0)
+
+/* Autowah effect */
+#define AL_AUTOWAH_MIN_ATTACK_TIME               (0.0001f)
+#define AL_AUTOWAH_MAX_ATTACK_TIME               (1.0f)
+#define AL_AUTOWAH_DEFAULT_ATTACK_TIME           (0.06f)
+
+#define AL_AUTOWAH_MIN_RELEASE_TIME              (0.0001f)
+#define AL_AUTOWAH_MAX_RELEASE_TIME              (1.0f)
+#define AL_AUTOWAH_DEFAULT_RELEASE_TIME          (0.06f)
+
+#define AL_AUTOWAH_MIN_RESONANCE                 (2.0f)
+#define AL_AUTOWAH_MAX_RESONANCE                 (1000.0f)
+#define AL_AUTOWAH_DEFAULT_RESONANCE             (1000.0f)
+
+#define AL_AUTOWAH_MIN_PEAK_GAIN                 (0.00003f)
+#define AL_AUTOWAH_MAX_PEAK_GAIN                 (31621.0f)
+#define AL_AUTOWAH_DEFAULT_PEAK_GAIN             (11.22f)
+
+/* Compressor effect */
+#define AL_COMPRESSOR_MIN_ONOFF                  (0)
+#define AL_COMPRESSOR_MAX_ONOFF                  (1)
+#define AL_COMPRESSOR_DEFAULT_ONOFF              (1)
+
+/* Equalizer effect */
+#define AL_EQUALIZER_MIN_LOW_GAIN                (0.126f)
+#define AL_EQUALIZER_MAX_LOW_GAIN                (7.943f)
+#define AL_EQUALIZER_DEFAULT_LOW_GAIN            (1.0f)
+
+#define AL_EQUALIZER_MIN_LOW_CUTOFF              (50.0f)
+#define AL_EQUALIZER_MAX_LOW_CUTOFF              (800.0f)
+#define AL_EQUALIZER_DEFAULT_LOW_CUTOFF          (200.0f)
+
+#define AL_EQUALIZER_MIN_MID1_GAIN               (0.126f)
+#define AL_EQUALIZER_MAX_MID1_GAIN               (7.943f)
+#define AL_EQUALIZER_DEFAULT_MID1_GAIN           (1.0f)
+
+#define AL_EQUALIZER_MIN_MID1_CENTER             (200.0f)
+#define AL_EQUALIZER_MAX_MID1_CENTER             (3000.0f)
+#define AL_EQUALIZER_DEFAULT_MID1_CENTER         (500.0f)
+
+#define AL_EQUALIZER_MIN_MID1_WIDTH              (0.01f)
+#define AL_EQUALIZER_MAX_MID1_WIDTH              (1.0f)
+#define AL_EQUALIZER_DEFAULT_MID1_WIDTH          (1.0f)
+
+#define AL_EQUALIZER_MIN_MID2_GAIN               (0.126f)
+#define AL_EQUALIZER_MAX_MID2_GAIN               (7.943f)
+#define AL_EQUALIZER_DEFAULT_MID2_GAIN           (1.0f)
+
+#define AL_EQUALIZER_MIN_MID2_CENTER             (1000.0f)
+#define AL_EQUALIZER_MAX_MID2_CENTER             (8000.0f)
+#define AL_EQUALIZER_DEFAULT_MID2_CENTER         (3000.0f)
+
+#define AL_EQUALIZER_MIN_MID2_WIDTH              (0.01f)
+#define AL_EQUALIZER_MAX_MID2_WIDTH              (1.0f)
+#define AL_EQUALIZER_DEFAULT_MID2_WIDTH          (1.0f)
+
+#define AL_EQUALIZER_MIN_HIGH_GAIN               (0.126f)
+#define AL_EQUALIZER_MAX_HIGH_GAIN               (7.943f)
+#define AL_EQUALIZER_DEFAULT_HIGH_GAIN           (1.0f)
+
+#define AL_EQUALIZER_MIN_HIGH_CUTOFF             (4000.0f)
+#define AL_EQUALIZER_MAX_HIGH_CUTOFF             (16000.0f)
+#define AL_EQUALIZER_DEFAULT_HIGH_CUTOFF         (6000.0f)
+
+
+/* Source parameter value ranges and defaults. */
+#define AL_MIN_AIR_ABSORPTION_FACTOR             (0.0f)
+#define AL_MAX_AIR_ABSORPTION_FACTOR             (10.0f)
+#define AL_DEFAULT_AIR_ABSORPTION_FACTOR         (0.0f)
+
+#define AL_MIN_ROOM_ROLLOFF_FACTOR               (0.0f)
+#define AL_MAX_ROOM_ROLLOFF_FACTOR               (10.0f)
+#define AL_DEFAULT_ROOM_ROLLOFF_FACTOR           (0.0f)
+
+#define AL_MIN_CONE_OUTER_GAINHF                 (0.0f)
+#define AL_MAX_CONE_OUTER_GAINHF                 (1.0f)
+#define AL_DEFAULT_CONE_OUTER_GAINHF             (1.0f)
+
+#define AL_MIN_DIRECT_FILTER_GAINHF_AUTO         AL_FALSE
+#define AL_MAX_DIRECT_FILTER_GAINHF_AUTO         AL_TRUE
+#define AL_DEFAULT_DIRECT_FILTER_GAINHF_AUTO     AL_TRUE
+
+#define AL_MIN_AUXILIARY_SEND_FILTER_GAIN_AUTO   AL_FALSE
+#define AL_MAX_AUXILIARY_SEND_FILTER_GAIN_AUTO   AL_TRUE
+#define AL_DEFAULT_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_TRUE
+
+#define AL_MIN_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_FALSE
+#define AL_MAX_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_TRUE
+#define AL_DEFAULT_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_TRUE
+
+
+/* Listener parameter value ranges and defaults. */
+#define AL_MIN_METERS_PER_UNIT                   FLT_MIN
+#define AL_MAX_METERS_PER_UNIT                   FLT_MAX
+#define AL_DEFAULT_METERS_PER_UNIT               (1.0f)
+
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#endif /* AL_EFX_H */
diff --git a/3rdparty/OpenAL/libs/Win64/OpenAL32.def b/3rdparty/OpenAL/libs/Win64/OpenAL32.def
new file mode 100644
index 0000000000..a5c4c00097
--- /dev/null
+++ b/3rdparty/OpenAL/libs/Win64/OpenAL32.def
@@ -0,0 +1,176 @@
+EXPORTS
+    alAuxiliaryEffectSlotPlaySOFT
+    alAuxiliaryEffectSlotPlayvSOFT
+    alAuxiliaryEffectSlotStopSOFT
+    alAuxiliaryEffectSlotStopvSOFT
+    alAuxiliaryEffectSlotf
+    alAuxiliaryEffectSlotfv
+    alAuxiliaryEffectSloti
+    alAuxiliaryEffectSlotiv
+    alBuffer3f
+    alBuffer3i
+    alBufferCallbackSOFT
+    alBufferData
+    alBufferSamplesSOFT
+    alBufferStorageSOFT
+    alBufferSubDataSOFT
+    alBufferSubSamplesSOFT
+    alBufferf
+    alBufferfv
+    alBufferi
+    alBufferiv
+    alDeferUpdatesSOFT
+    alDeleteAuxiliaryEffectSlots
+    alDeleteBuffers
+    alDeleteEffects
+    alDeleteFilters
+    alDeleteSources
+    alDisable
+    alDistanceModel
+    alDopplerFactor
+    alDopplerVelocity
+    alEffectf
+    alEffectfv
+    alEffecti
+    alEffectiv
+    alEnable
+    alEventCallbackSOFT
+    alEventControlSOFT
+    alFilterf
+    alFilterfv
+    alFilteri
+    alFilteriv
+    alFlushMappedBufferSOFT
+    alGenAuxiliaryEffectSlots
+    alGenBuffers
+    alGenEffects
+    alGenFilters
+    alGenSources
+    alGetAuxiliaryEffectSlotf
+    alGetAuxiliaryEffectSlotfv
+    alGetAuxiliaryEffectSloti
+    alGetAuxiliaryEffectSlotiv
+    alGetBoolean
+    alGetBooleanv
+    alGetBuffer3PtrSOFT
+    alGetBuffer3f
+    alGetBuffer3i
+    alGetBufferPtrSOFT
+    alGetBufferPtrvSOFT
+    alGetBufferSamplesSOFT
+    alGetBufferf
+    alGetBufferfv
+    alGetBufferi
+    alGetBufferiv
+    alGetDouble
+    alGetDoublev
+    alGetEffectf
+    alGetEffectfv
+    alGetEffecti
+    alGetEffectiv
+    alGetEnumValue
+    alGetError
+    alGetFilterf
+    alGetFilterfv
+    alGetFilteri
+    alGetFilteriv
+    alGetFloat
+    alGetFloatv
+    alGetInteger
+    alGetInteger64SOFT
+    alGetInteger64vSOFT
+    alGetIntegerv
+    alGetListener3f
+    alGetListener3i
+    alGetListenerf
+    alGetListenerfv
+    alGetListeneri
+    alGetListeneriv
+    alGetPointerSOFT
+    alGetPointervSOFT
+    alGetProcAddress
+    alGetSource3dSOFT
+    alGetSource3f
+    alGetSource3i
+    alGetSource3i64SOFT
+    alGetSourcedSOFT
+    alGetSourcedvSOFT
+    alGetSourcef
+    alGetSourcefv
+    alGetSourcei
+    alGetSourcei64SOFT
+    alGetSourcei64vSOFT
+    alGetSourceiv
+    alGetString
+    alGetStringiSOFT
+    alIsAuxiliaryEffectSlot
+    alIsBuffer
+    alIsBufferFormatSupportedSOFT
+    alIsEffect
+    alIsEnabled
+    alIsExtensionPresent
+    alIsFilter
+    alIsSource
+    alListener3f
+    alListener3i
+    alListenerf
+    alListenerfv
+    alListeneri
+    alListeneriv
+    alMapBufferSOFT
+    alProcessUpdatesSOFT
+    alSource3dSOFT
+    alSource3f
+    alSource3i
+    alSource3i64SOFT
+    alSourcePause
+    alSourcePausev
+    alSourcePlay
+    alSourcePlayv
+    alSourceQueueBuffers
+    alSourceRewind
+    alSourceRewindv
+    alSourceStop
+    alSourceStopv
+    alSourceUnqueueBuffers
+    alSourcedSOFT
+    alSourcedvSOFT
+    alSourcef
+    alSourcefv
+    alSourcei
+    alSourcei64SOFT
+    alSourcei64vSOFT
+    alSourceiv
+    alSpeedOfSound
+    alUnmapBufferSOFT
+    alcCaptureCloseDevice
+    alcCaptureOpenDevice
+    alcCaptureSamples
+    alcCaptureStart
+    alcCaptureStop
+    alcCloseDevice
+    alcCreateContext
+    alcDestroyContext
+    alcDevicePauseSOFT
+    alcDeviceResumeSOFT
+    alcGetContextsDevice
+    alcGetCurrentContext
+    alcGetEnumValue
+    alcGetError
+    alcGetInteger64vSOFT
+    alcGetIntegerv
+    alcGetProcAddress
+    alcGetString
+    alcGetStringiSOFT
+    alcGetThreadContext
+    alcIsExtensionPresent
+    alcIsRenderFormatSupportedSOFT
+    alcLoopbackOpenDeviceSOFT
+    alcMakeContextCurrent
+    alcOpenDevice
+    alcProcessContext
+    alcRenderSamplesSOFT
+    alcResetDeviceSOFT
+    alcSetThreadContext
+    alcSuspendContext
+    alsoft_get_version
diff --git a/3rdparty/OpenAL/libs/Win64/OpenAL32.lib b/3rdparty/OpenAL/libs/Win64/OpenAL32.lib
new file mode 100644
index 0000000000..9c6ec3e4fc
Binary files /dev/null and b/3rdparty/OpenAL/libs/Win64/OpenAL32.lib differ
diff --git a/3rdparty/OpenAL/openal-soft b/3rdparty/OpenAL/openal-soft
deleted file mode 160000
index dc7d7054a5..0000000000
--- a/3rdparty/OpenAL/openal-soft
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit dc7d7054a5b4f3bec1dc23a42fd616a0847af948
diff --git a/3rdparty/OpenAL/openal-soft.vcxproj b/3rdparty/OpenAL/openal-soft.vcxproj
deleted file mode 100644
index d309093527..0000000000
--- a/3rdparty/OpenAL/openal-soft.vcxproj
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="openal-soft\include\AL\al.h" />
-    <ClInclude Include="openal-soft\include\AL\alc.h" />
-    <ClInclude Include="openal-soft\include\AL\alext.h" />
-    <ClInclude Include="openal-soft\include\AL\efx-creative.h" />
-    <ClInclude Include="openal-soft\include\AL\efx-presets.h" />
-    <ClInclude Include="openal-soft\include\AL\efx.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <Keyword>MakeFileProj</Keyword>
-    <ProjectName>openal-soft</ProjectName>
-    <ProjectGuid>{8846A9AA-5539-4C91-8301-F54260E1A07A}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-  </PropertyGroup>
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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">
-    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
-      cd "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -DCMAKE_SYSTEM_VERSION=10.0 -DLIBTYPE=STATIC -DFORCE_STATIC_VCRT=true -DALSOFT_UTILS=false -DALSOFT_EXAMPLES=false -DALSOFT_INSTALL=false -DALSOFT_INSTALL_CONFIG=false -DALSOFT_INSTALL_HRTF_DATA=false -DALSOFT_INSTALL_AMBDEC_PRESETS=false -DALSOFT_INSTALL_EXAMPLES=false -DALSOFT_INSTALL_UTILS=false "$(SolutionDir)3rdparty\OpenAL\openal-soft"
-    </CmakeReleaseCLI>
-    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
-      cd "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="./Debug" -DCMAKE_SYSTEM_VERSION=10.0 -DLIBTYPE=STATIC -DALSOFT_UTILS=false -DALSOFT_EXAMPLES=false -DALSOFT_INSTALL=false -DALSOFT_INSTALL_CONFIG=false -DALSOFT_INSTALL_HRTF_DATA=false -DALSOFT_INSTALL_AMBDEC_PRESETS=false -DALSOFT_INSTALL_EXAMPLES=false -DALSOFT_INSTALL_UTILS=false "$(SolutionDir)3rdparty\OpenAL\openal-soft"
-    </CmakeDebugCLI>
-    <CmakeCopyCLI>
-      echo Copying..
-      copy "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\OpenAL32.lib" "$(SolutionDir)build\lib\$(Configuration)-$(Platform)"
-    </CmakeCopyCLI>
-    <CmakeCleanCLI>
-      echo Cleaning..
-      del "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\OpenAL32.lib"
-      rmdir /s /q "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
-    </CmakeCleanCLI>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-    <NMakeBuildCommandLine>
-      $(CmakeDebugCLI)
-      ninja
-      $(CmakeCopyCLI)
-    </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>
-      $(CmakeCleanCLI)
-      $(CmakeDebugCLI)
-      ninja
-      $(CmakeCopyCLI)
-    </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>
-      $(CmakeCleanCLI)
-    </NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-    <NMakeBuildCommandLine>
-      $(CmakeReleaseCLI)
-      ninja
-      $(CmakeCopyCLI)
-    </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>
-      $(CmakeCleanCLI)
-      $(CmakeReleaseCLI)
-      ninja
-      $(CmakeCopyCLI)
-    </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>
-      $(CmakeCleanCLI)
-    </NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/3rdparty/SPIRV/.gitignore b/3rdparty/SPIRV/.gitignore
new file mode 100644
index 0000000000..f3b5fb62e4
--- /dev/null
+++ b/3rdparty/SPIRV/.gitignore
@@ -0,0 +1,2 @@
+/build
+/x64
diff --git a/3rdparty/SPIRV/CMakeLists.txt b/3rdparty/SPIRV/CMakeLists.txt
new file mode 100644
index 0000000000..9202f34769
--- /dev/null
+++ b/3rdparty/SPIRV/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(SKIP_SPIRV_TOOLS_INSTALL ON CACHE BOOL "Skip spirv-tools install" FORCE)
+set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers" CACHE STRING "SPIRV-Headers path" FORCE)
+add_subdirectory(SPIRV-Tools)
diff --git a/3rdparty/SPIRV/SPIRV-Headers b/3rdparty/SPIRV/SPIRV-Headers
new file mode 160000
index 0000000000..3fdabd0da2
--- /dev/null
+++ b/3rdparty/SPIRV/SPIRV-Headers
@@ -0,0 +1 @@
+Subproject commit 3fdabd0da2932c276b25b9b4a988ba134eba1aa6
diff --git a/3rdparty/SPIRV/SPIRV-Tools b/3rdparty/SPIRV/SPIRV-Tools
new file mode 160000
index 0000000000..895927bd3f
--- /dev/null
+++ b/3rdparty/SPIRV/SPIRV-Tools
@@ -0,0 +1 @@
+Subproject commit 895927bd3f2d653f40cebab55aa6c7eabde30a86
diff --git a/3rdparty/SPIRV/spirv.vcxproj b/3rdparty/SPIRV/spirv.vcxproj
new file mode 100644
index 0000000000..1ce9784ee1
--- /dev/null
+++ b/3rdparty/SPIRV/spirv.vcxproj
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1}</ProjectGuid>
+    <Keyword>MakeFileProj</Keyword>
+  </PropertyGroup>
+  <Import Project="..\..\buildfiles\msvc\common_default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\..\buildfiles\msvc\common_default_macros.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <CmakeGenerator>"Visual Studio $(VisualStudioVersion.Substring(0,2))"</CmakeGenerator>
+    <CmakeReleaseCLI>cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Release" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR=$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/SPIRV-Headers')) SPIRV-Tools -B build</CmakeReleaseCLI>
+    <CmakeDebugCLI>cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Debug" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR=$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/SPIRV-Headers')) -S SPIRV-Tools -B build</CmakeDebugCLI>
+    <PropsAbsPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\buildfiles\msvc\common_default.props'))</PropsAbsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <NMakeBuildCommandLine>$(CmakeReleaseCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>$(CmakeReleaseCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>$(CmakeReleaseCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeCleanCommandLine>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <NMakeBuildCommandLine>$(CmakeDebugCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
+    </NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>$(CmakeDebugCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
+    </NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>$(CmakeDebugCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
+    </NMakeCleanCommandLine>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/3rdparty/SPIRV/spirv.vcxproj.filters b/3rdparty/SPIRV/spirv.vcxproj.filters
new file mode 100644
index 0000000000..9cd8510566
--- /dev/null
+++ b/3rdparty/SPIRV/spirv.vcxproj.filters
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file
diff --git a/3rdparty/SoundTouch/CMakeLists.txt b/3rdparty/SoundTouch/CMakeLists.txt
deleted file mode 100644
index acc7d02714..0000000000
--- a/3rdparty/SoundTouch/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-add_library(soundtouch STATIC EXCLUDE_FROM_ALL
-	soundtouch/source/SoundTouch/AAFilter.cpp
-	soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp
-	soundtouch/source/SoundTouch/FIRFilter.cpp
-	soundtouch/source/SoundTouch/InterpolateCubic.cpp
-	soundtouch/source/SoundTouch/InterpolateLinear.cpp
-	soundtouch/source/SoundTouch/InterpolateShannon.cpp
-	soundtouch/source/SoundTouch/RateTransposer.cpp
-	soundtouch/source/SoundTouch/SoundTouch.cpp
-	soundtouch/source/SoundTouch/sse_optimized.cpp
-	soundtouch/source/SoundTouch/TDStretch.cpp
-)
-
-target_include_directories(soundtouch PRIVATE
-	soundtouch/source/SoundTouch
-	soundtouch/include)
-
-target_include_directories(soundtouch INTERFACE
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/soundtouch/include>
-	$<INSTALL_INTERFACE:/soundtouch/include>)
-
-set_property(TARGET soundtouch PROPERTY FOLDER "3rdparty/")
-
-target_compile_definitions(soundtouch PUBLIC
-	ST_NO_EXCEPTION_HANDLING
-	USE_MULTICH_ALWAYS
-	SOUNDTOUCH_FLOAT_SAMPLES;
-)
-
-target_compile_options(soundtouch PRIVATE "-w")
-
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86|X86|amd64|AMD64|em64t|EM64T)")
-	target_compile_definitions(soundtouch PUBLIC
-		SOUNDTOUCH_ALLOW_SSE
-	)
-endif ()
diff --git a/3rdparty/SoundTouch/soundtouch b/3rdparty/SoundTouch/soundtouch
deleted file mode 160000
index 3982730833..0000000000
--- a/3rdparty/SoundTouch/soundtouch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3982730833b6daefe77dcfb32b5c282851640c17
diff --git a/3rdparty/SoundTouch/soundtouch.vcxproj b/3rdparty/SoundTouch/soundtouch.vcxproj
deleted file mode 100644
index 760e58abb3..0000000000
--- a/3rdparty/SoundTouch/soundtouch.vcxproj
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="soundtouch\include\FIFOSampleBuffer.h" />
-    <ClInclude Include="soundtouch\include\FIFOSamplePipe.h" />
-    <ClInclude Include="soundtouch\include\SoundTouch.h" />
-    <ClInclude Include="soundtouch\include\STTypes.h" />
-    <ClInclude Include="soundtouch\source\SoundTouch\AAFilter.h" />
-    <ClInclude Include="soundtouch\source\SoundTouch\FIRFilter.h" />
-    <ClInclude Include="soundtouch\source\SoundTouch\InterpolateCubic.h" />
-    <ClInclude Include="soundtouch\source\SoundTouch\InterpolateLinear.h" />
-    <ClInclude Include="soundtouch\source\SoundTouch\InterpolateShannon.h" />
-    <ClInclude Include="soundtouch\source\SoundTouch\RateTransposer.h" />
-    <ClInclude Include="soundtouch\source\SoundTouch\TDStretch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="soundtouch\source\SoundTouch\AAFilter.cpp" />
-    <ClCompile Include="soundtouch\source\SoundTouch\FIFOSampleBuffer.cpp" />
-    <ClCompile Include="soundtouch\source\SoundTouch\FIRFilter.cpp" />
-    <ClCompile Include="soundtouch\source\SoundTouch\InterpolateCubic.cpp" />
-    <ClCompile Include="soundtouch\source\SoundTouch\InterpolateLinear.cpp" />
-    <ClCompile Include="soundtouch\source\SoundTouch\InterpolateShannon.cpp" />
-    <ClCompile Include="soundtouch\source\SoundTouch\RateTransposer.cpp" />
-    <ClCompile Include="soundtouch\source\SoundTouch\SoundTouch.cpp" />
-    <ClCompile Include="soundtouch\source\SoundTouch\sse_optimized.cpp" />
-    <ClCompile Include="soundtouch\source\SoundTouch\TDStretch.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{508c291a-3d18-49f5-b25d-f7c8db92cb21}</ProjectGuid>
-    <RootNamespace>soundtouch</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>SOUNDTOUCH_ALLOW_SSE;ST_NO_EXCEPTION_HANDLING;USE_MULTICH_ALWAYS;SOUNDTOUCH_FLOAT_SAMPLES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./soundtouch/source/SoundTouch;./soundtouch/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ProgramDatabase</DebugInformationFormat>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/3rdparty/SoundTouch/soundtouch.vcxproj.filters b/3rdparty/SoundTouch/soundtouch.vcxproj.filters
deleted file mode 100644
index dac3e1803b..0000000000
--- a/3rdparty/SoundTouch/soundtouch.vcxproj.filters
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="soundtouch\include\FIFOSampleBuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="soundtouch\include\FIFOSamplePipe.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="soundtouch\include\SoundTouch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="soundtouch\include\STTypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="soundtouch\source\SoundTouch\FIRFilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="soundtouch\source\SoundTouch\InterpolateCubic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="soundtouch\source\SoundTouch\InterpolateLinear.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="soundtouch\source\SoundTouch\InterpolateShannon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="soundtouch\source\SoundTouch\RateTransposer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="soundtouch\source\SoundTouch\TDStretch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="soundtouch\source\SoundTouch\AAFilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="soundtouch\source\SoundTouch\InterpolateLinear.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="soundtouch\source\SoundTouch\InterpolateShannon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="soundtouch\source\SoundTouch\RateTransposer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="soundtouch\source\SoundTouch\SoundTouch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="soundtouch\source\SoundTouch\sse_optimized.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="soundtouch\source\SoundTouch\TDStretch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="soundtouch\source\SoundTouch\AAFilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="soundtouch\source\SoundTouch\FIFOSampleBuffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="soundtouch\source\SoundTouch\FIRFilter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="soundtouch\source\SoundTouch\InterpolateCubic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/3rdparty/XAudio2Redist/include/xaudio2redist.h b/3rdparty/XAudio2Redist/include/xaudio2redist.h
new file mode 100644
index 0000000000..c27a9218a6
--- /dev/null
+++ b/3rdparty/XAudio2Redist/include/xaudio2redist.h
@@ -0,0 +1,1275 @@
+/**************************************************************************
+ *
+ * Copyright (c) Microsoft Corporation.  All rights reserved.
+ *
+ * File:    xaudio2.h
+ * Content: Declarations for the XAudio2 game audio API.
+ *
+ **************************************************************************/
+
+#ifdef _MSC_VER
+#pragma once
+#endif
+
+#ifndef __XAUDIO2_INCLUDED__
+#define __XAUDIO2_INCLUDED__
+
+#include <sdkddkver.h>
+
+// Current name of the DLL shipped in the same SDK as this header.
+// The name reflects the current version
+#define XAUDIO2_DLL_A  "xaudio2_9redist.dll"
+#define XAUDIO2_DLL_W L"xaudio2_9redist.dll"
+#define XAUDIO2D_DLL_A  "xaudio2_9redist.dll"
+#define XAUDIO2D_DLL_W L"xaudio2_9redist.dll"
+
+#ifdef UNICODE
+    #define XAUDIO2_DLL XAUDIO2_DLL_W
+    #define XAUDIO2D_DLL XAUDIO2D_DLL_W
+#else
+    #define XAUDIO2_DLL XAUDIO2_DLL_A
+    #define XAUDIO2D_DLL XAUDIO2D_DLL_A
+#endif
+
+
+/**************************************************************************
+ *
+ * XAudio2 COM object class and interface IDs.
+ *
+ **************************************************************************/
+
+#include <basetyps.h>
+
+#ifdef __cplusplus
+    // XAudio 2.9
+    interface __declspec(uuid("2B02E3CF-2E0B-4ec3-BE45-1B2A3FE7210D")) IXAudio2;
+    interface __declspec(uuid("84ac29bb-d619-44d2-b197-e4acf7df3ed6")) IXAudio2Extension;
+    EXTERN_C const GUID DECLSPEC_SELECTANY IID_IXAudio2Extension = __uuidof(IXAudio2Extension);
+    EXTERN_C const GUID DECLSPEC_SELECTANY IID_IXAudio2 = __uuidof(IXAudio2);
+
+#else // #ifdef __cplusplus
+    // Compiling with C for Windows 10 and later
+    DEFINE_GUID(IID_IXAudio2,           0x2B02E3CF, 0x2E0B, 0x4ec3, 0xBE, 0x45, 0x1B, 0x2A, 0x3F, 0xE7, 0x21, 0x0D);
+    DEFINE_GUID(IID_IXAudio2Extension,  0x84ac29bb, 0xd619, 0x44d2, 0xb1, 0x97, 0xe4, 0xac, 0xf7, 0xdf, 0x3e, 0xd6);
+#endif // #ifdef __cplusplus
+
+
+// Ignore the rest of this header if only the GUID definitions were requested
+#ifndef GUID_DEFS_ONLY
+
+#include <objbase.h>           // Windows COM declarations
+#include <sal.h>               // Markers for documenting API semantics
+#include <mmreg.h>             // Basic data types and constants for audio work
+#include <audiosessiontypes.h> // For AUDIO_STREAM_CATEGORY
+
+// The Windows 7 version of audiosessiontypes.h does not define AUDIO_STREAM_CATEGORY, so if we are targeting
+// Windows 7 we might have to define it here, depending on which SDK is used.
+#if _WIN32_WINNT < _WIN32_WINNT_WIN8
+
+// If we are compiling for Windows 7, we might be using the Windows 7 Platform SDK, which does not have AUDIO_STREAM_CATEGORY.
+// But we might be using a newer SDK (such as the Win8 Platform SDK), which has AUDIO_STREAM_CATEGORY.
+// Determine if we are using the Windows 7 Platform SDK by checking if WAVE_FORMAT_WM9_SPECTRUM_ANALYZER is defined.
+#ifndef WAVE_FORMAT_WM9_SPECTRUM_ANALYZER
+typedef enum _AUDIO_STREAM_CATEGORY
+{
+    AudioCategory_Other = 0,
+    AudioCategory_ForegroundOnlyMedia = 1,
+    AudioCategory_Communications = 3,
+    AudioCategory_Alerts = 4,
+    AudioCategory_SoundEffects = 5,
+    AudioCategory_GameEffects = 6,
+    AudioCategory_GameMedia = 7,
+    AudioCategory_GameChat = 8,
+    AudioCategory_Speech = 9,
+    AudioCategory_Movie = 10,
+    AudioCategory_Media = 11,
+} AUDIO_STREAM_CATEGORY;
+#endif /* WAVE_FORMAT_WM9_SPECTRUM_ANALYZER */
+#endif /* NTDDI_VERSION < NTDDI_WIN8 */
+
+// All structures defined in this file use tight field packing
+#pragma pack(push, 1)
+
+
+/**************************************************************************
+ *
+ * XAudio2 constants, flags and error codes.
+ *
+ **************************************************************************/
+
+// Numeric boundary values
+#define XAUDIO2_MAX_BUFFER_BYTES        0x80000000    // Maximum bytes allowed in a source buffer
+#define XAUDIO2_MAX_QUEUED_BUFFERS      64            // Maximum buffers allowed in a voice queue
+#define XAUDIO2_MAX_BUFFERS_SYSTEM      2             // Maximum buffers allowed for system threads (Xbox 360 only)
+#define XAUDIO2_MAX_AUDIO_CHANNELS      64            // Maximum channels in an audio stream
+#define XAUDIO2_MIN_SAMPLE_RATE         1000          // Minimum audio sample rate supported
+#define XAUDIO2_MAX_SAMPLE_RATE         200000        // Maximum audio sample rate supported
+#define XAUDIO2_MAX_VOLUME_LEVEL        16777216.0f   // Maximum acceptable volume level (2^24)
+#define XAUDIO2_MIN_FREQ_RATIO          (1/1024.0f)   // Minimum SetFrequencyRatio argument
+#define XAUDIO2_MAX_FREQ_RATIO          1024.0f       // Maximum MaxFrequencyRatio argument
+#define XAUDIO2_DEFAULT_FREQ_RATIO      2.0f          // Default MaxFrequencyRatio argument
+#define XAUDIO2_MAX_FILTER_ONEOVERQ     1.5f          // Maximum XAUDIO2_FILTER_PARAMETERS.OneOverQ
+#define XAUDIO2_MAX_FILTER_FREQUENCY    1.0f          // Maximum XAUDIO2_FILTER_PARAMETERS.Frequency
+#define XAUDIO2_MAX_LOOP_COUNT          254           // Maximum non-infinite XAUDIO2_BUFFER.LoopCount
+#define XAUDIO2_MAX_INSTANCES           8             // Maximum simultaneous XAudio2 objects on Xbox 360
+
+// For XMA voices on Xbox 360 there is an additional restriction on the MaxFrequencyRatio
+// argument and the voice's sample rate: the product of these numbers cannot exceed 600000
+// for one-channel voices or 300000 for voices with more than one channel.
+#define XAUDIO2_MAX_RATIO_TIMES_RATE_XMA_MONO         600000
+#define XAUDIO2_MAX_RATIO_TIMES_RATE_XMA_MULTICHANNEL 300000
+
+// Numeric values with special meanings
+#define XAUDIO2_COMMIT_NOW              0             // Used as an OperationSet argument
+#define XAUDIO2_COMMIT_ALL              0             // Used in IXAudio2::CommitChanges
+#define XAUDIO2_INVALID_OPSET           (UINT32)(-1)  // Not allowed for OperationSet arguments
+#define XAUDIO2_NO_LOOP_REGION          0             // Used in XAUDIO2_BUFFER.LoopCount
+#define XAUDIO2_LOOP_INFINITE           255           // Used in XAUDIO2_BUFFER.LoopCount
+#define XAUDIO2_DEFAULT_CHANNELS        0             // Used in CreateMasteringVoice
+#define XAUDIO2_DEFAULT_SAMPLERATE      0             // Used in CreateMasteringVoice
+
+// Flags
+#define XAUDIO2_DEBUG_ENGINE                  0x0001    // Used in XAudio2Create
+#define XAUDIO2_VOICE_NOPITCH                 0x0002    // Used in IXAudio2::CreateSourceVoice
+#define XAUDIO2_VOICE_NOSRC                   0x0004    // Used in IXAudio2::CreateSourceVoice
+#define XAUDIO2_VOICE_USEFILTER               0x0008    // Used in IXAudio2::CreateSource/SubmixVoice
+#define XAUDIO2_PLAY_TAILS                    0x0020    // Used in IXAudio2SourceVoice::Stop
+#define XAUDIO2_END_OF_STREAM                 0x0040    // Used in XAUDIO2_BUFFER.Flags
+#define XAUDIO2_SEND_USEFILTER                0x0080    // Used in XAUDIO2_SEND_DESCRIPTOR.Flags
+#define XAUDIO2_VOICE_NOSAMPLESPLAYED         0x0100    // Used in IXAudio2SourceVoice::GetState
+#define XAUDIO2_STOP_ENGINE_WHEN_IDLE         0x2000    // Used in XAudio2Create to force the engine to Stop when no source voices are Started, and Start when a voice is Started
+#define XAUDIO2_1024_QUANTUM                  0x8000    // Used in XAudio2Create to specify nondefault processing quantum of 21.33 ms (1024 samples at 48KHz)
+#define XAUDIO2_NO_VIRTUAL_AUDIO_CLIENT       0x10000   // Used in CreateMasteringVoice to create a virtual audio client
+
+// Default parameters for the built-in filter
+#define XAUDIO2_DEFAULT_FILTER_TYPE     LowPassFilter
+#define XAUDIO2_DEFAULT_FILTER_FREQUENCY XAUDIO2_MAX_FILTER_FREQUENCY
+#define XAUDIO2_DEFAULT_FILTER_ONEOVERQ 1.0f
+
+// Internal XAudio2 constants
+// The audio frame quantum can be calculated by reducing the fraction:
+//     SamplesPerAudioFrame / SamplesPerSecond
+#define XAUDIO2_QUANTUM_NUMERATOR   1                 // On Windows, XAudio2 processes audio
+#define XAUDIO2_QUANTUM_DENOMINATOR 100               //  in 10ms chunks (= 1/100 seconds)
+#define XAUDIO2_QUANTUM_MS (1000.0f * XAUDIO2_QUANTUM_NUMERATOR / XAUDIO2_QUANTUM_DENOMINATOR)
+
+// XAudio2 error codes
+#define FACILITY_XAUDIO2 0x896
+#define XAUDIO2_E_INVALID_CALL                       ((HRESULT)0x88960001)    // An API call or one of its arguments was illegal
+#define XAUDIO2_E_XMA_DECODER_ERROR                  ((HRESULT)0x88960002)    // The XMA hardware suffered an unrecoverable error
+#define XAUDIO2_E_XAPO_CREATION_FAILED               ((HRESULT)0x88960003)    // XAudio2 failed to initialize an XAPO effect
+#define XAUDIO2_E_DEVICE_INVALIDATED                 ((HRESULT)0x88960004)    // An audio device became unusable (unplugged, etc)
+
+/**************************************************************************
+ *
+ * Forward declarations for the XAudio2 interfaces.
+ *
+ **************************************************************************/
+
+#ifdef __cplusplus
+    #define FWD_DECLARE(x) interface x
+#else
+    #define FWD_DECLARE(x) typedef interface x x
+#endif
+
+FWD_DECLARE(IXAudio2);
+FWD_DECLARE(IXAudio2Voice);
+FWD_DECLARE(IXAudio2SourceVoice);
+FWD_DECLARE(IXAudio2SubmixVoice);
+FWD_DECLARE(IXAudio2MasteringVoice);
+FWD_DECLARE(IXAudio2EngineCallback);
+FWD_DECLARE(IXAudio2VoiceCallback);
+
+
+/**************************************************************************
+ *
+ * XAudio2 structures and enumerations.
+ *
+ **************************************************************************/
+
+// Used in XAudio2Create, specifies which CPU(s) to use.
+typedef UINT32 XAUDIO2_PROCESSOR;
+#define Processor1  0x00000001
+#define Processor2  0x00000002
+#define Processor3  0x00000004
+#define Processor4  0x00000008
+#define Processor5  0x00000010
+#define Processor6  0x00000020
+#define Processor7  0x00000040
+#define Processor8  0x00000080
+#define Processor9  0x00000100
+#define Processor10 0x00000200
+#define Processor11 0x00000400
+#define Processor12 0x00000800
+#define Processor13 0x00001000
+#define Processor14 0x00002000
+#define Processor15 0x00004000
+#define Processor16 0x00008000
+#define Processor17 0x00010000
+#define Processor18 0x00020000
+#define Processor19 0x00040000
+#define Processor20 0x00080000
+#define Processor21 0x00100000
+#define Processor22 0x00200000
+#define Processor23 0x00400000
+#define Processor24 0x00800000
+#define Processor25 0x01000000
+#define Processor26 0x02000000
+#define Processor27 0x04000000
+#define Processor28 0x08000000
+#define Processor29 0x10000000
+#define Processor30 0x20000000
+#define Processor31 0x40000000
+#define Processor32 0x80000000
+#define XAUDIO2_ANY_PROCESSOR 0xffffffff
+
+// This value indicates that XAudio2 will choose the default processor by itself. The actual value chosen
+// may vary depending on the hardware platform.
+#define XAUDIO2_USE_DEFAULT_PROCESSOR 0x00000000
+
+// This definition is included for backwards compatibilty. New implementations should use
+// XAUDIO2_USE_DEFAULT_PROCESSOR instead to let XAudio2 select the appropriate default processor for the hardware platform.
+#define XAUDIO2_DEFAULT_PROCESSOR Processor1
+
+// Returned by IXAudio2Voice::GetVoiceDetails
+typedef struct XAUDIO2_VOICE_DETAILS
+{
+    UINT32 CreationFlags;               // Flags the voice was created with.
+    UINT32 ActiveFlags;                 // Flags currently active.
+    UINT32 InputChannels;               // Channels in the voice's input audio.
+    UINT32 InputSampleRate;             // Sample rate of the voice's input audio.
+} XAUDIO2_VOICE_DETAILS;
+
+// Used in XAUDIO2_VOICE_SENDS below
+typedef struct XAUDIO2_SEND_DESCRIPTOR
+{
+    UINT32 Flags;                       // Either 0 or XAUDIO2_SEND_USEFILTER.
+    IXAudio2Voice* pOutputVoice;        // This send's destination voice.
+} XAUDIO2_SEND_DESCRIPTOR;
+
+// Used in the voice creation functions and in IXAudio2Voice::SetOutputVoices
+typedef struct XAUDIO2_VOICE_SENDS
+{
+    UINT32 SendCount;                   // Number of sends from this voice.
+    XAUDIO2_SEND_DESCRIPTOR* pSends;    // Array of SendCount send descriptors.
+} XAUDIO2_VOICE_SENDS;
+
+// Used in XAUDIO2_EFFECT_CHAIN below
+typedef struct XAUDIO2_EFFECT_DESCRIPTOR
+{
+    IUnknown* pEffect;                  // Pointer to the effect object's IUnknown interface.
+    BOOL InitialState;                  // TRUE if the effect should begin in the enabled state.
+    UINT32 OutputChannels;              // How many output channels the effect should produce.
+} XAUDIO2_EFFECT_DESCRIPTOR;
+
+// Used in the voice creation functions and in IXAudio2Voice::SetEffectChain
+typedef struct XAUDIO2_EFFECT_CHAIN
+{
+    UINT32 EffectCount;                 // Number of effects in this voice's effect chain.
+    XAUDIO2_EFFECT_DESCRIPTOR* pEffectDescriptors; // Array of effect descriptors.
+} XAUDIO2_EFFECT_CHAIN;
+
+// Used in XAUDIO2_FILTER_PARAMETERS below
+typedef enum XAUDIO2_FILTER_TYPE
+{
+    LowPassFilter,                      // Attenuates frequencies above the cutoff frequency (state-variable filter).
+    BandPassFilter,                     // Attenuates frequencies outside a given range      (state-variable filter).
+    HighPassFilter,                     // Attenuates frequencies below the cutoff frequency (state-variable filter).
+    NotchFilter,                        // Attenuates frequencies inside a given range       (state-variable filter).
+    LowPassOnePoleFilter,               // Attenuates frequencies above the cutoff frequency (one-pole filter, XAUDIO2_FILTER_PARAMETERS.OneOverQ has no effect)
+    HighPassOnePoleFilter               // Attenuates frequencies below the cutoff frequency (one-pole filter, XAUDIO2_FILTER_PARAMETERS.OneOverQ has no effect)
+} XAUDIO2_FILTER_TYPE;
+
+// Used in IXAudio2Voice::Set/GetFilterParameters and Set/GetOutputFilterParameters
+typedef struct XAUDIO2_FILTER_PARAMETERS
+{
+    XAUDIO2_FILTER_TYPE Type;           // Filter type.
+    float Frequency;                    // Filter coefficient.
+                                        //  must be >= 0 and <= XAUDIO2_MAX_FILTER_FREQUENCY
+                                        //  See XAudio2CutoffFrequencyToRadians() for state-variable filter types and
+                                        //  XAudio2CutoffFrequencyToOnePoleCoefficient() for one-pole filter types.
+    float OneOverQ;                     // Reciprocal of the filter's quality factor Q;
+                                        //  must be > 0 and <= XAUDIO2_MAX_FILTER_ONEOVERQ.
+                                        //  Has no effect for one-pole filters.
+} XAUDIO2_FILTER_PARAMETERS;
+
+// Used in IXAudio2SourceVoice::SubmitSourceBuffer
+typedef struct XAUDIO2_BUFFER
+{
+    UINT32 Flags;                       // Either 0 or XAUDIO2_END_OF_STREAM.
+    UINT32 AudioBytes;                  // Size of the audio data buffer in bytes.
+    const BYTE* pAudioData;             // Pointer to the audio data buffer.
+    UINT32 PlayBegin;                   // First sample in this buffer to be played.
+    UINT32 PlayLength;                  // Length of the region to be played in samples,
+                                        //  or 0 to play the whole buffer.
+    UINT32 LoopBegin;                   // First sample of the region to be looped.
+    UINT32 LoopLength;                  // Length of the desired loop region in samples,
+                                        //  or 0 to loop the entire buffer.
+    UINT32 LoopCount;                   // Number of times to repeat the loop region,
+                                        //  or XAUDIO2_LOOP_INFINITE to loop forever.
+    void* pContext;                     // Context value to be passed back in callbacks.
+} XAUDIO2_BUFFER;
+
+// Used in IXAudio2SourceVoice::SubmitSourceBuffer when submitting XWMA data.
+// NOTE: If an XWMA sound is submitted in more than one buffer, each buffer's
+// pDecodedPacketCumulativeBytes[PacketCount-1] value must be subtracted from
+// all the entries in the next buffer's pDecodedPacketCumulativeBytes array.
+// And whether a sound is submitted in more than one buffer or not, the final
+// buffer of the sound should use the XAUDIO2_END_OF_STREAM flag, or else the
+// client must call IXAudio2SourceVoice::Discontinuity after submitting it.
+typedef struct XAUDIO2_BUFFER_WMA
+{
+    const UINT32* pDecodedPacketCumulativeBytes; // Decoded packet's cumulative size array.
+                                                 //  Each element is the number of bytes accumulated
+                                                 //  when the corresponding XWMA packet is decoded in
+                                                 //  order.  The array must have PacketCount elements.
+    UINT32 PacketCount;                          // Number of XWMA packets submitted. Must be >= 1 and
+                                                 //  divide evenly into XAUDIO2_BUFFER.AudioBytes.
+} XAUDIO2_BUFFER_WMA;
+
+// Returned by IXAudio2SourceVoice::GetState
+typedef struct XAUDIO2_VOICE_STATE
+{
+    void* pCurrentBufferContext;        // The pContext value provided in the XAUDIO2_BUFFER
+                                        //  that is currently being processed, or NULL if
+                                        //  there are no buffers in the queue.
+    UINT32 BuffersQueued;               // Number of buffers currently queued on the voice
+                                        //  (including the one that is being processed).
+    UINT64 SamplesPlayed;               // Total number of samples produced by the voice since
+                                        //  it began processing the current audio stream.
+                                        //  If XAUDIO2_VOICE_NOSAMPLESPLAYED is specified
+                                        //  in the call to IXAudio2SourceVoice::GetState,
+                                        //  this member will not be calculated, saving CPU.
+} XAUDIO2_VOICE_STATE;
+
+// Returned by IXAudio2::GetPerformanceData
+typedef struct XAUDIO2_PERFORMANCE_DATA
+{
+    // CPU usage information
+    UINT64 AudioCyclesSinceLastQuery;   // CPU cycles spent on audio processing since the
+                                        //  last call to StartEngine or GetPerformanceData.
+    UINT64 TotalCyclesSinceLastQuery;   // Total CPU cycles elapsed since the last call
+                                        //  (only counts the CPU XAudio2 is running on).
+    UINT32 MinimumCyclesPerQuantum;     // Fewest CPU cycles spent processing any one
+                                        //  audio quantum since the last call.
+    UINT32 MaximumCyclesPerQuantum;     // Most CPU cycles spent processing any one
+                                        //  audio quantum since the last call.
+
+    // Memory usage information
+    UINT32 MemoryUsageInBytes;          // Total heap space currently in use.
+
+    // Audio latency and glitching information
+    UINT32 CurrentLatencyInSamples;     // Minimum delay from when a sample is read from a
+                                        //  source buffer to when it reaches the speakers.
+    UINT32 GlitchesSinceEngineStarted;  // Audio dropouts since the engine was started.
+
+    // Data about XAudio2's current workload
+    UINT32 ActiveSourceVoiceCount;      // Source voices currently playing.
+    UINT32 TotalSourceVoiceCount;       // Source voices currently existing.
+    UINT32 ActiveSubmixVoiceCount;      // Submix voices currently playing/existing.
+
+    UINT32 ActiveResamplerCount;        // Resample xAPOs currently active.
+    UINT32 ActiveMatrixMixCount;        // MatrixMix xAPOs currently active.
+
+    // Usage of the hardware XMA decoder (Xbox 360 only)
+    UINT32 ActiveXmaSourceVoices;       // Number of source voices decoding XMA data.
+    UINT32 ActiveXmaStreams;            // A voice can use more than one XMA stream.
+} XAUDIO2_PERFORMANCE_DATA;
+
+// Used in IXAudio2::SetDebugConfiguration
+typedef struct XAUDIO2_DEBUG_CONFIGURATION
+{
+    UINT32 TraceMask;                   // Bitmap of enabled debug message types.
+    UINT32 BreakMask;                   // Message types that will break into the debugger.
+    BOOL LogThreadID;                   // Whether to log the thread ID with each message.
+    BOOL LogFileline;                   // Whether to log the source file and line number.
+    BOOL LogFunctionName;               // Whether to log the function name.
+    BOOL LogTiming;                     // Whether to log message timestamps.
+} XAUDIO2_DEBUG_CONFIGURATION;
+
+// Values for the TraceMask and BreakMask bitmaps.  Only ERRORS and WARNINGS
+// are valid in BreakMask.  WARNINGS implies ERRORS, DETAIL implies INFO, and
+// FUNC_CALLS implies API_CALLS.  By default, TraceMask is ERRORS and WARNINGS
+// and all the other settings are zero.
+#define XAUDIO2_LOG_ERRORS     0x0001   // For handled errors with serious effects.
+#define XAUDIO2_LOG_WARNINGS   0x0002   // For handled errors that may be recoverable.
+#define XAUDIO2_LOG_INFO       0x0004   // Informational chit-chat (e.g. state changes).
+#define XAUDIO2_LOG_DETAIL     0x0008   // More detailed chit-chat.
+#define XAUDIO2_LOG_API_CALLS  0x0010   // Public API function entries and exits.
+#define XAUDIO2_LOG_FUNC_CALLS 0x0020   // Internal function entries and exits.
+#define XAUDIO2_LOG_TIMING     0x0040   // Delays detected and other timing data.
+#define XAUDIO2_LOG_LOCKS      0x0080   // Usage of critical sections and mutexes.
+#define XAUDIO2_LOG_MEMORY     0x0100   // Memory heap usage information.
+#define XAUDIO2_LOG_STREAMING  0x1000   // Audio streaming information.
+
+
+/**************************************************************************
+ *
+ * IXAudio2: Top-level XAudio2 COM interface.
+ *
+ **************************************************************************/
+
+// Use default arguments if compiling as C++
+#ifdef __cplusplus
+    #define X2DEFAULT(x) =x
+#else
+    #define X2DEFAULT(x)
+#endif
+
+#undef INTERFACE
+#define INTERFACE IXAudio2
+DECLARE_INTERFACE_(IXAudio2, IUnknown)
+{
+    // NAME: IXAudio2::QueryInterface
+    // DESCRIPTION: Queries for a given COM interface on the XAudio2 object.
+    //              Only IID_IUnknown, IID_IXAudio2 and IID_IXaudio2Extension are supported.
+    //
+    // ARGUMENTS:
+    //  riid - IID of the interface to be obtained.
+    //  ppvInterface - Returns a pointer to the requested interface.
+    //
+    STDMETHOD(QueryInterface) (THIS_ REFIID riid, _COM_Outptr_ void** ppvInterface) PURE;
+
+    // NAME: IXAudio2::AddRef
+    // DESCRIPTION: Adds a reference to the XAudio2 object.
+    //
+    STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+
+    // NAME: IXAudio2::Release
+    // DESCRIPTION: Releases a reference to the XAudio2 object.
+    //
+    STDMETHOD_(ULONG, Release) (THIS) PURE;
+
+    // NAME: IXAudio2::RegisterForCallbacks
+    // DESCRIPTION: Adds a new client to receive XAudio2's engine callbacks.
+    //
+    // ARGUMENTS:
+    //  pCallback - Callback interface to be called during each processing pass.
+    //
+    STDMETHOD(RegisterForCallbacks) (THIS_ _In_ IXAudio2EngineCallback* pCallback) PURE;
+
+    // NAME: IXAudio2::UnregisterForCallbacks
+    // DESCRIPTION: Removes an existing receiver of XAudio2 engine callbacks.
+    //
+    // ARGUMENTS:
+    //  pCallback - Previously registered callback interface to be removed.
+    //
+    STDMETHOD_(void, UnregisterForCallbacks) (THIS_ _In_ IXAudio2EngineCallback* pCallback) PURE;
+
+    // NAME: IXAudio2::CreateSourceVoice
+    // DESCRIPTION: Creates and configures a source voice.
+    //
+    // ARGUMENTS:
+    //  ppSourceVoice - Returns the new object's IXAudio2SourceVoice interface.
+    //  pSourceFormat - Format of the audio that will be fed to the voice.
+    //  Flags - XAUDIO2_VOICE flags specifying the source voice's behavior.
+    //  MaxFrequencyRatio - Maximum SetFrequencyRatio argument to be allowed.
+    //  pCallback - Optional pointer to a client-provided callback interface.
+    //  pSendList - Optional list of voices this voice should send audio to.
+    //  pEffectChain - Optional list of effects to apply to the audio data.
+    //
+    STDMETHOD(CreateSourceVoice) (THIS_ _Outptr_ IXAudio2SourceVoice** ppSourceVoice,
+                                  _In_ const WAVEFORMATEX* pSourceFormat,
+                                  UINT32 Flags X2DEFAULT(0),
+                                  float MaxFrequencyRatio X2DEFAULT(XAUDIO2_DEFAULT_FREQ_RATIO),
+                                  _In_opt_ IXAudio2VoiceCallback* pCallback X2DEFAULT(NULL),
+                                  _In_opt_ const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL),
+                                  _In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
+
+    // NAME: IXAudio2::CreateSubmixVoice
+    // DESCRIPTION: Creates and configures a submix voice.
+    //
+    // ARGUMENTS:
+    //  ppSubmixVoice - Returns the new object's IXAudio2SubmixVoice interface.
+    //  InputChannels - Number of channels in this voice's input audio data.
+    //  InputSampleRate - Sample rate of this voice's input audio data.
+    //  Flags - XAUDIO2_VOICE flags specifying the submix voice's behavior.
+    //  ProcessingStage - Arbitrary number that determines the processing order.
+    //  pSendList - Optional list of voices this voice should send audio to.
+    //  pEffectChain - Optional list of effects to apply to the audio data.
+    //
+    STDMETHOD(CreateSubmixVoice) (THIS_ _Outptr_ IXAudio2SubmixVoice** ppSubmixVoice,
+                                  UINT32 InputChannels, UINT32 InputSampleRate,
+                                  UINT32 Flags X2DEFAULT(0), UINT32 ProcessingStage X2DEFAULT(0),
+                                  _In_opt_ const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL),
+                                  _In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
+
+
+    // NAME: IXAudio2::CreateMasteringVoice
+    // DESCRIPTION: Creates and configures a mastering voice.
+    //
+    // ARGUMENTS:
+    //  ppMasteringVoice - Returns the new object's IXAudio2MasteringVoice interface.
+    //  InputChannels - Number of channels in this voice's input audio data.
+    //  InputSampleRate - Sample rate of this voice's input audio data.
+    //  Flags - XAUDIO2_VOICE flags specifying the mastering voice's behavior.
+    //  szDeviceId - Identifier of the device to receive the output audio.
+    //  pEffectChain - Optional list of effects to apply to the audio data.
+    //  StreamCategory - The audio stream category to use for this mastering voice
+    //
+    STDMETHOD(CreateMasteringVoice) (THIS_ _Outptr_ IXAudio2MasteringVoice** ppMasteringVoice,
+                                     UINT32 InputChannels X2DEFAULT(XAUDIO2_DEFAULT_CHANNELS),
+                                     UINT32 InputSampleRate X2DEFAULT(XAUDIO2_DEFAULT_SAMPLERATE),
+                                     UINT32 Flags X2DEFAULT(0), _In_opt_z_ LPCWSTR szDeviceId X2DEFAULT(NULL),
+                                     _In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL),
+                                    _In_ AUDIO_STREAM_CATEGORY StreamCategory X2DEFAULT(AudioCategory_GameEffects)) PURE;
+
+    // NAME: IXAudio2::StartEngine
+    // DESCRIPTION: Creates and starts the audio processing thread.
+    //
+    STDMETHOD(StartEngine) (THIS) PURE;
+
+    // NAME: IXAudio2::StopEngine
+    // DESCRIPTION: Stops and destroys the audio processing thread.
+    //
+    STDMETHOD_(void, StopEngine) (THIS) PURE;
+
+    // NAME: IXAudio2::CommitChanges
+    // DESCRIPTION: Atomically applies a set of operations previously tagged
+    //              with a given identifier.
+    //
+    // ARGUMENTS:
+    //  OperationSet - Identifier of the set of operations to be applied.
+    //
+    STDMETHOD(CommitChanges) (THIS_ UINT32 OperationSet) PURE;
+
+    // NAME: IXAudio2::GetPerformanceData
+    // DESCRIPTION: Returns current resource usage details: memory, CPU, etc.
+    //
+    // ARGUMENTS:
+    //  pPerfData - Returns the performance data structure.
+    //
+    STDMETHOD_(void, GetPerformanceData) (THIS_ _Out_ XAUDIO2_PERFORMANCE_DATA* pPerfData) PURE;
+
+    // NAME: IXAudio2::SetDebugConfiguration
+    // DESCRIPTION: Configures XAudio2's debug output (in debug builds only).
+    //
+    // ARGUMENTS:
+    //  pDebugConfiguration - Structure describing the debug output behavior.
+    //  pReserved - Optional parameter; must be NULL.
+    //
+    STDMETHOD_(void, SetDebugConfiguration) (THIS_ _In_opt_ const XAUDIO2_DEBUG_CONFIGURATION* pDebugConfiguration,
+                                             _Reserved_ void* pReserved X2DEFAULT(NULL)) PURE;
+};
+
+// This interface extends IXAudio2 with additional functionality.
+// Use IXAudio2::QueryInterface to obtain a pointer to this interface.
+#undef INTERFACE
+#define INTERFACE IXAudio2Extension
+DECLARE_INTERFACE_(IXAudio2Extension, IUnknown)
+{
+    // NAME: IXAudio2Extension::QueryInterface
+    // DESCRIPTION: Queries for a given COM interface on the XAudio2 object.
+    //              Only IID_IUnknown, IID_IXAudio2 and IID_IXaudio2Extension are supported.
+    //
+    // ARGUMENTS:
+    //  riid - IID of the interface to be obtained.
+    //  ppvInterface - Returns a pointer to the requested interface.
+    //
+    STDMETHOD(QueryInterface) (THIS_ REFIID riid, _COM_Outptr_ void** ppvInterface) PURE;
+
+    // NAME: IXAudio2Extension::AddRef
+    // DESCRIPTION: Adds a reference to the XAudio2 object.
+    //
+    STDMETHOD_(ULONG, AddRef) (THIS) PURE;
+
+    // NAME: IXAudio2Extension::Release
+    // DESCRIPTION: Releases a reference to the XAudio2 object.
+    //
+    STDMETHOD_(ULONG, Release) (THIS) PURE;
+
+    // NAME: IXAudio2Extension::GetProcessingQuantum
+    // DESCRIPTION: Returns the processing quantum
+    //              quantumMilliseconds = (1000.0f * quantumNumerator / quantumDenominator)
+    //
+    // ARGUMENTS:
+    //  quantumNumerator - Quantum numerator
+    //  quantumDenominator - Quantum denominator
+    //
+    STDMETHOD_(void, GetProcessingQuantum)(THIS_ _Out_ UINT32* quantumNumerator, _Out_range_(!= , 0) UINT32* quantumDenominator);
+
+    // NAME: IXAudio2Extension::GetProcessor
+    // DESCRIPTION: Returns the number of the processor used by XAudio2
+    //
+    // ARGUMENTS:
+    //  processor - Non-zero Processor number
+    //
+    STDMETHOD_(void, GetProcessor)(THIS_ _Out_range_(!= , 0) XAUDIO2_PROCESSOR* processor);
+};
+
+/**************************************************************************
+ *
+ * IXAudio2Voice: Base voice management interface.
+ *
+ **************************************************************************/
+
+#undef INTERFACE
+#define INTERFACE IXAudio2Voice
+DECLARE_INTERFACE(IXAudio2Voice)
+{
+    // These methods are declared in a macro so that the same declarations
+    // can be used in the derived voice types (IXAudio2SourceVoice, etc).
+
+    #define Declare_IXAudio2Voice_Methods() \
+    \
+    /* NAME: IXAudio2Voice::GetVoiceDetails
+    // DESCRIPTION: Returns the basic characteristics of this voice.
+    //
+    // ARGUMENTS:
+    //  pVoiceDetails - Returns the voice's details.
+    */\
+    STDMETHOD_(void, GetVoiceDetails) (THIS_ _Out_ XAUDIO2_VOICE_DETAILS* pVoiceDetails) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetOutputVoices
+    // DESCRIPTION: Replaces the set of submix/mastering voices that receive
+    //              this voice's output.
+    //
+    // ARGUMENTS:
+    //  pSendList - Optional list of voices this voice should send audio to.
+    */\
+    STDMETHOD(SetOutputVoices) (THIS_ _In_opt_ const XAUDIO2_VOICE_SENDS* pSendList) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetEffectChain
+    // DESCRIPTION: Replaces this voice's current effect chain with a new one.
+    //
+    // ARGUMENTS:
+    //  pEffectChain - Structure describing the new effect chain to be used.
+    */\
+    STDMETHOD(SetEffectChain) (THIS_ _In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain) PURE; \
+    \
+    /* NAME: IXAudio2Voice::EnableEffect
+    // DESCRIPTION: Enables an effect in this voice's effect chain.
+    //
+    // ARGUMENTS:
+    //  EffectIndex - Index of an effect within this voice's effect chain.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(EnableEffect) (THIS_ UINT32 EffectIndex, \
+                             UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::DisableEffect
+    // DESCRIPTION: Disables an effect in this voice's effect chain.
+    //
+    // ARGUMENTS:
+    //  EffectIndex - Index of an effect within this voice's effect chain.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(DisableEffect) (THIS_ UINT32 EffectIndex, \
+                              UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetEffectState
+    // DESCRIPTION: Returns the running state of an effect.
+    //
+    // ARGUMENTS:
+    //  EffectIndex - Index of an effect within this voice's effect chain.
+    //  pEnabled - Returns the enabled/disabled state of the given effect.
+    */\
+    STDMETHOD_(void, GetEffectState) (THIS_ UINT32 EffectIndex, _Out_ BOOL* pEnabled) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetEffectParameters
+    // DESCRIPTION: Sets effect-specific parameters.
+    //
+    // REMARKS: Unlike IXAPOParameters::SetParameters, this method may
+    //          be called from any thread.  XAudio2 implements
+    //          appropriate synchronization to copy the parameters to the
+    //          realtime audio processing thread.
+    //
+    // ARGUMENTS:
+    //  EffectIndex - Index of an effect within this voice's effect chain.
+    //  pParameters - Pointer to an effect-specific parameters block.
+    //  ParametersByteSize - Size of the pParameters array  in bytes.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(SetEffectParameters) (THIS_ UINT32 EffectIndex, \
+                                    _In_reads_bytes_(ParametersByteSize) const void* pParameters, \
+                                    UINT32 ParametersByteSize, \
+                                    UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetEffectParameters
+    // DESCRIPTION: Obtains the current effect-specific parameters.
+    //
+    // ARGUMENTS:
+    //  EffectIndex - Index of an effect within this voice's effect chain.
+    //  pParameters - Returns the current values of the effect-specific parameters.
+    //  ParametersByteSize - Size of the pParameters array in bytes.
+    */\
+    STDMETHOD(GetEffectParameters) (THIS_ UINT32 EffectIndex, \
+                                    _Out_writes_bytes_(ParametersByteSize) void* pParameters, \
+                                    UINT32 ParametersByteSize) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetFilterParameters
+    // DESCRIPTION: Sets this voice's filter parameters.
+    //
+    // ARGUMENTS:
+    //  pParameters - Pointer to the filter's parameter structure.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(SetFilterParameters) (THIS_ _In_ const XAUDIO2_FILTER_PARAMETERS* pParameters, \
+                                    UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetFilterParameters
+    // DESCRIPTION: Returns this voice's current filter parameters.
+    //
+    // ARGUMENTS:
+    //  pParameters - Returns the filter parameters.
+    */\
+    STDMETHOD_(void, GetFilterParameters) (THIS_ _Out_ XAUDIO2_FILTER_PARAMETERS* pParameters) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetOutputFilterParameters
+    // DESCRIPTION: Sets the filter parameters on one of this voice's sends.
+    //
+    // ARGUMENTS:
+    //  pDestinationVoice - Destination voice of the send whose filter parameters will be set.
+    //  pParameters - Pointer to the filter's parameter structure.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(SetOutputFilterParameters) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice, \
+                                          _In_ const XAUDIO2_FILTER_PARAMETERS* pParameters, \
+                                          UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetOutputFilterParameters
+    // DESCRIPTION: Returns the filter parameters from one of this voice's sends.
+    //
+    // ARGUMENTS:
+    //  pDestinationVoice - Destination voice of the send whose filter parameters will be read.
+    //  pParameters - Returns the filter parameters.
+    */\
+    STDMETHOD_(void, GetOutputFilterParameters) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice, \
+                                                 _Out_ XAUDIO2_FILTER_PARAMETERS* pParameters) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetVolume
+    // DESCRIPTION: Sets this voice's overall volume level.
+    //
+    // ARGUMENTS:
+    //  Volume - New overall volume level to be used, as an amplitude factor.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(SetVolume) (THIS_ float Volume, \
+                          UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetVolume
+    // DESCRIPTION: Obtains this voice's current overall volume level.
+    //
+    // ARGUMENTS:
+    //  pVolume: Returns the voice's current overall volume level.
+    */\
+    STDMETHOD_(void, GetVolume) (THIS_ _Out_ float* pVolume) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetChannelVolumes
+    // DESCRIPTION: Sets this voice's per-channel volume levels.
+    //
+    // ARGUMENTS:
+    //  Channels - Used to confirm the voice's channel count.
+    //  pVolumes - Array of per-channel volume levels to be used.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(SetChannelVolumes) (THIS_ UINT32 Channels, _In_reads_(Channels) const float* pVolumes, \
+                                  UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetChannelVolumes
+    // DESCRIPTION: Returns this voice's current per-channel volume levels.
+    //
+    // ARGUMENTS:
+    //  Channels - Used to confirm the voice's channel count.
+    //  pVolumes - Returns an array of the current per-channel volume levels.
+    */\
+    STDMETHOD_(void, GetChannelVolumes) (THIS_ UINT32 Channels, _Out_writes_(Channels) float* pVolumes) PURE; \
+    \
+    /* NAME: IXAudio2Voice::SetOutputMatrix
+    // DESCRIPTION: Sets the volume levels used to mix from each channel of this
+    //              voice's output audio to each channel of a given destination
+    //              voice's input audio.
+    //
+    // ARGUMENTS:
+    //  pDestinationVoice - The destination voice whose mix matrix to change.
+    //  SourceChannels - Used to confirm this voice's output channel count
+    //   (the number of channels produced by the last effect in the chain).
+    //  DestinationChannels - Confirms the destination voice's input channels.
+    //  pLevelMatrix - Array of [SourceChannels * DestinationChannels] send
+    //   levels.  The level used to send from source channel S to destination
+    //   channel D should be in pLevelMatrix[S + SourceChannels * D].
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    */\
+    STDMETHOD(SetOutputMatrix) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice, \
+                                UINT32 SourceChannels, UINT32 DestinationChannels, \
+                                _In_reads_(SourceChannels * DestinationChannels) const float* pLevelMatrix, \
+                                UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
+    \
+    /* NAME: IXAudio2Voice::GetOutputMatrix
+    // DESCRIPTION: Obtains the volume levels used to send each channel of this
+    //              voice's output audio to each channel of a given destination
+    //              voice's input audio.
+    //
+    // ARGUMENTS:
+    //  pDestinationVoice - The destination voice whose mix matrix to obtain.
+    //  SourceChannels - Used to confirm this voice's output channel count
+    //   (the number of channels produced by the last effect in the chain).
+    //  DestinationChannels - Confirms the destination voice's input channels.
+    //  pLevelMatrix - Array of send levels, as above.
+    */\
+    STDMETHOD_(void, GetOutputMatrix) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice, \
+                                       UINT32 SourceChannels, UINT32 DestinationChannels, \
+                                       _Out_writes_(SourceChannels * DestinationChannels) float* pLevelMatrix) PURE; \
+    \
+    /* NAME: IXAudio2Voice::DestroyVoice
+    // DESCRIPTION: Destroys this voice, stopping it if necessary and removing
+    //              it from the XAudio2 graph.
+    */\
+    STDMETHOD_(void, DestroyVoice) (THIS) PURE
+
+    Declare_IXAudio2Voice_Methods();
+};
+
+
+/**************************************************************************
+ *
+ * IXAudio2SourceVoice: Source voice management interface.
+ *
+ **************************************************************************/
+
+#undef INTERFACE
+#define INTERFACE IXAudio2SourceVoice
+DECLARE_INTERFACE_(IXAudio2SourceVoice, IXAudio2Voice)
+{
+    // Methods from IXAudio2Voice base interface
+    Declare_IXAudio2Voice_Methods();
+
+    // NAME: IXAudio2SourceVoice::Start
+    // DESCRIPTION: Makes this voice start consuming and processing audio.
+    //
+    // ARGUMENTS:
+    //  Flags - Flags controlling how the voice should be started.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    //
+    STDMETHOD(Start) (THIS_ UINT32 Flags X2DEFAULT(0), UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
+
+    // NAME: IXAudio2SourceVoice::Stop
+    // DESCRIPTION: Makes this voice stop consuming audio.
+    //
+    // ARGUMENTS:
+    //  Flags - Flags controlling how the voice should be stopped.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    //
+    STDMETHOD(Stop) (THIS_ UINT32 Flags X2DEFAULT(0), UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
+
+    // NAME: IXAudio2SourceVoice::SubmitSourceBuffer
+    // DESCRIPTION: Adds a new audio buffer to this voice's input queue.
+    //
+    // ARGUMENTS:
+    //  pBuffer - Pointer to the buffer structure to be queued.
+    //  pBufferWMA - Additional structure used only when submitting XWMA data.
+    //
+    STDMETHOD(SubmitSourceBuffer) (THIS_ _In_ const XAUDIO2_BUFFER* pBuffer, _In_opt_ const XAUDIO2_BUFFER_WMA* pBufferWMA X2DEFAULT(NULL)) PURE;
+
+    // NAME: IXAudio2SourceVoice::FlushSourceBuffers
+    // DESCRIPTION: Removes all pending audio buffers from this voice's queue.
+    //
+    STDMETHOD(FlushSourceBuffers) (THIS) PURE;
+
+    // NAME: IXAudio2SourceVoice::Discontinuity
+    // DESCRIPTION: Notifies the voice of an intentional break in the stream of
+    //              audio buffers (e.g. the end of a sound), to prevent XAudio2
+    //              from interpreting an empty buffer queue as a glitch.
+    //
+    STDMETHOD(Discontinuity) (THIS) PURE;
+
+    // NAME: IXAudio2SourceVoice::ExitLoop
+    // DESCRIPTION: Breaks out of the current loop when its end is reached.
+    //
+    // ARGUMENTS:
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    //
+    STDMETHOD(ExitLoop) (THIS_ UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
+
+    // NAME: IXAudio2SourceVoice::GetState
+    // DESCRIPTION: Returns the number of buffers currently queued on this voice,
+    //              the pContext value associated with the currently processing
+    //              buffer (if any), and other voice state information.
+    //
+    // ARGUMENTS:
+    //  pVoiceState - Returns the state information.
+    //  Flags - Flags controlling what voice state is returned.
+    //
+    STDMETHOD_(void, GetState) (THIS_ _Out_ XAUDIO2_VOICE_STATE* pVoiceState, UINT32 Flags X2DEFAULT(0)) PURE;
+
+    // NAME: IXAudio2SourceVoice::SetFrequencyRatio
+    // DESCRIPTION: Sets this voice's frequency adjustment, i.e. its pitch.
+    //
+    // ARGUMENTS:
+    //  Ratio - Frequency change, expressed as source frequency / target frequency.
+    //  OperationSet - Used to identify this call as part of a deferred batch.
+    //
+    STDMETHOD(SetFrequencyRatio) (THIS_ float Ratio,
+                                  UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
+
+    // NAME: IXAudio2SourceVoice::GetFrequencyRatio
+    // DESCRIPTION: Returns this voice's current frequency adjustment ratio.
+    //
+    // ARGUMENTS:
+    //  pRatio - Returns the frequency adjustment.
+    //
+    STDMETHOD_(void, GetFrequencyRatio) (THIS_ _Out_ float* pRatio) PURE;
+
+    // NAME: IXAudio2SourceVoice::SetSourceSampleRate
+    // DESCRIPTION: Reconfigures this voice to treat its source data as being
+    //              at a different sample rate than the original one specified
+    //              in CreateSourceVoice's pSourceFormat argument.
+    //
+    // ARGUMENTS:
+    //  UINT32 - The intended sample rate of further submitted source data.
+    //
+    STDMETHOD(SetSourceSampleRate) (THIS_ UINT32 NewSourceSampleRate) PURE;
+};
+
+
+/**************************************************************************
+ *
+ * IXAudio2SubmixVoice: Submixing voice management interface.
+ *
+ **************************************************************************/
+
+#undef INTERFACE
+#define INTERFACE IXAudio2SubmixVoice
+DECLARE_INTERFACE_(IXAudio2SubmixVoice, IXAudio2Voice)
+{
+    // Methods from IXAudio2Voice base interface
+    Declare_IXAudio2Voice_Methods();
+
+    // There are currently no methods specific to submix voices.
+};
+
+
+/**************************************************************************
+ *
+ * IXAudio2MasteringVoice: Mastering voice management interface.
+ *
+ **************************************************************************/
+
+#undef INTERFACE
+#define INTERFACE IXAudio2MasteringVoice
+DECLARE_INTERFACE_(IXAudio2MasteringVoice, IXAudio2Voice)
+{
+    // Methods from IXAudio2Voice base interface
+    Declare_IXAudio2Voice_Methods();
+
+    // NAME: IXAudio2MasteringVoice::GetChannelMask
+    // DESCRIPTION: Returns the channel mask for this voice
+    //
+    // ARGUMENTS:
+    //  pChannelMask - returns the channel mask for this voice.  This corresponds
+    //                 to the dwChannelMask member of WAVEFORMATEXTENSIBLE.
+    //
+    STDMETHOD(GetChannelMask) (THIS_ _Out_ DWORD* pChannelmask) PURE;
+};
+
+
+/**************************************************************************
+ *
+ * IXAudio2EngineCallback: Client notification interface for engine events.
+ *
+ * REMARKS: Contains methods to notify the client when certain events happen
+ *          in the XAudio2 engine.  This interface should be implemented by
+ *          the client.  XAudio2 will call these methods via the interface
+ *          pointer provided by the client when it calls
+ *          IXAudio2::RegisterForCallbacks.
+ *
+ **************************************************************************/
+
+#undef INTERFACE
+#define INTERFACE IXAudio2EngineCallback
+DECLARE_INTERFACE(IXAudio2EngineCallback)
+{
+    // Called by XAudio2 just before an audio processing pass begins.
+    STDMETHOD_(void, OnProcessingPassStart) (THIS) PURE;
+
+    // Called just after an audio processing pass ends.
+    STDMETHOD_(void, OnProcessingPassEnd) (THIS) PURE;
+
+    // Called in the event of a critical system error which requires XAudio2
+    // to be closed down and restarted.  The error code is given in Error.
+    STDMETHOD_(void, OnCriticalError) (THIS_ HRESULT Error) PURE;
+};
+
+
+/**************************************************************************
+ *
+ * IXAudio2VoiceCallback: Client notification interface for voice events.
+ *
+ * REMARKS: Contains methods to notify the client when certain events happen
+ *          in an XAudio2 voice.  This interface should be implemented by the
+ *          client.  XAudio2 will call these methods via an interface pointer
+ *          provided by the client in the IXAudio2::CreateSourceVoice call.
+ *
+ **************************************************************************/
+
+#undef INTERFACE
+#define INTERFACE IXAudio2VoiceCallback
+DECLARE_INTERFACE(IXAudio2VoiceCallback)
+{
+    // Called just before this voice's processing pass begins.
+    STDMETHOD_(void, OnVoiceProcessingPassStart) (THIS_ UINT32 BytesRequired) PURE;
+
+    // Called just after this voice's processing pass ends.
+    STDMETHOD_(void, OnVoiceProcessingPassEnd) (THIS) PURE;
+
+    // Called when this voice has just finished playing a buffer stream
+    // (as marked with the XAUDIO2_END_OF_STREAM flag on the last buffer).
+    STDMETHOD_(void, OnStreamEnd) (THIS) PURE;
+
+    // Called when this voice is about to start processing a new buffer.
+    STDMETHOD_(void, OnBufferStart) (THIS_ void* pBufferContext) PURE;
+
+    // Called when this voice has just finished processing a buffer.
+    // The buffer can now be reused or destroyed.
+    STDMETHOD_(void, OnBufferEnd) (THIS_ void* pBufferContext) PURE;
+
+    // Called when this voice has just reached the end position of a loop.
+    STDMETHOD_(void, OnLoopEnd) (THIS_ void* pBufferContext) PURE;
+
+    // Called in the event of a critical error during voice processing,
+    // such as a failing xAPO or an error from the hardware XMA decoder.
+    // The voice may have to be destroyed and re-created to recover from
+    // the error.  The callback arguments report which buffer was being
+    // processed when the error occurred, and its HRESULT code.
+    STDMETHOD_(void, OnVoiceError) (THIS_ void* pBufferContext, HRESULT Error) PURE;
+};
+
+
+/**************************************************************************
+ *
+ * Macros to make it easier to use the XAudio2 COM interfaces in C code.
+ *
+ **************************************************************************/
+
+#ifndef __cplusplus
+
+// IXAudio2
+#define IXAudio2_QueryInterface(This,riid,ppvInterface) ((This)->lpVtbl->QueryInterface(This,riid,ppvInterface))
+#define IXAudio2_AddRef(This) ((This)->lpVtbl->AddRef(This))
+#define IXAudio2_Release(This) ((This)->lpVtbl->Release(This))
+#define IXAudio2_RegisterForCallbacks(This,pCallback) ((This)->lpVtbl->RegisterForCallbacks(This,pCallback))
+#define IXAudio2_UnregisterForCallbacks(This,pCallback) ((This)->lpVtbl->UnregisterForCallbacks(This,pCallback))
+#define IXAudio2_CreateSourceVoice(This,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain) ((This)->lpVtbl->CreateSourceVoice(This,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain))
+#define IXAudio2_CreateSubmixVoice(This,ppSubmixVoice,InputChannels,InputSampleRate,Flags,ProcessingStage,pSendList,pEffectChain) ((This)->lpVtbl->CreateSubmixVoice(This,ppSubmixVoice,InputChannels,InputSampleRate,Flags,ProcessingStage,pSendList,pEffectChain))
+#define IXAudio2_CreateMasteringVoice(This,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceId,pEffectChain,StreamCategory) ((This)->lpVtbl->CreateMasteringVoice(This,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceId,pEffectChain,StreamCategory))
+#define IXAudio2_StartEngine(This) ((This)->lpVtbl->StartEngine(This))
+#define IXAudio2_StopEngine(This) ((This)->lpVtbl->StopEngine(This))
+#define IXAudio2_CommitChanges(This,OperationSet) ((This)->lpVtbl->CommitChanges(This,OperationSet))
+#define IXAudio2_GetPerformanceData(This,pPerfData) ((This)->lpVtbl->GetPerformanceData(This,pPerfData))
+#define IXAudio2_SetDebugConfiguration(This,pDebugConfiguration,pReserved) ((This)->lpVtbl->SetDebugConfiguration(This,pDebugConfiguration,pReserved))
+
+// IXAudio2Extension
+#define IXAudio2Extension_GetProcessingQuantum(This,quantumNumerator,quantumDenominator) ((This)->lpVtbl->GetProcessingQuantum(This,quantumNumerator,quantumDenominator))
+#define IXAudio2Extension_GetProcessor(This,processor) ((This)->lpVtbl->GetProcessor(This,processor))
+
+// IXAudio2Voice
+#define IXAudio2Voice_GetVoiceDetails(This,pVoiceDetails) ((This)->lpVtbl->GetVoiceDetails(This,pVoiceDetails))
+#define IXAudio2Voice_SetOutputVoices(This,pSendList) ((This)->lpVtbl->SetOutputVoices(This,pSendList))
+#define IXAudio2Voice_SetEffectChain(This,pEffectChain) ((This)->lpVtbl->SetEffectChain(This,pEffectChain))
+#define IXAudio2Voice_EnableEffect(This,EffectIndex,OperationSet) ((This)->lpVtbl->EnableEffect(This,EffectIndex,OperationSet))
+#define IXAudio2Voice_DisableEffect(This,EffectIndex,OperationSet) ((This)->lpVtbl->DisableEffect(This,EffectIndex,OperationSet))
+#define IXAudio2Voice_GetEffectState(This,EffectIndex,pEnabled) ((This)->lpVtbl->GetEffectState(This,EffectIndex,pEnabled))
+#define IXAudio2Voice_SetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize, OperationSet) ((This)->lpVtbl->SetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize,OperationSet))
+#define IXAudio2Voice_GetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize) ((This)->lpVtbl->GetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize))
+#define IXAudio2Voice_SetFilterParameters(This,pParameters,OperationSet) ((This)->lpVtbl->SetFilterParameters(This,pParameters,OperationSet))
+#define IXAudio2Voice_GetFilterParameters(This,pParameters) ((This)->lpVtbl->GetFilterParameters(This,pParameters))
+#define IXAudio2Voice_SetOutputFilterParameters(This,pDestinationVoice,pParameters,OperationSet) ((This)->lpVtbl->SetOutputFilterParameters(This,pDestinationVoice,pParameters,OperationSet))
+#define IXAudio2Voice_GetOutputFilterParameters(This,pDestinationVoice,pParameters) ((This)->lpVtbl->GetOutputFilterParameters(This,pDestinationVoice,pParameters))
+#define IXAudio2Voice_SetVolume(This,Volume,OperationSet) ((This)->lpVtbl->SetVolume(This,Volume,OperationSet))
+#define IXAudio2Voice_GetVolume(This,pVolume) ((This)->lpVtbl->GetVolume(This,pVolume))
+#define IXAudio2Voice_SetChannelVolumes(This,Channels,pVolumes,OperationSet) ((This)->lpVtbl->SetChannelVolumes(This,Channels,pVolumes,OperationSet))
+#define IXAudio2Voice_GetChannelVolumes(This,Channels,pVolumes) ((This)->lpVtbl->GetChannelVolumes(This,Channels,pVolumes))
+#define IXAudio2Voice_SetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix,OperationSet) ((This)->lpVtbl->SetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix,OperationSet))
+#define IXAudio2Voice_GetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix) ((This)->lpVtbl->GetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix))
+#define IXAudio2Voice_DestroyVoice(This) ((This)->lpVtbl->DestroyVoice(This))
+
+// IXAudio2SourceVoice
+#define IXAudio2SourceVoice_GetVoiceDetails IXAudio2Voice_GetVoiceDetails
+#define IXAudio2SourceVoice_SetOutputVoices IXAudio2Voice_SetOutputVoices
+#define IXAudio2SourceVoice_SetEffectChain IXAudio2Voice_SetEffectChain
+#define IXAudio2SourceVoice_EnableEffect IXAudio2Voice_EnableEffect
+#define IXAudio2SourceVoice_DisableEffect IXAudio2Voice_DisableEffect
+#define IXAudio2SourceVoice_GetEffectState IXAudio2Voice_GetEffectState
+#define IXAudio2SourceVoice_SetEffectParameters IXAudio2Voice_SetEffectParameters
+#define IXAudio2SourceVoice_GetEffectParameters IXAudio2Voice_GetEffectParameters
+#define IXAudio2SourceVoice_SetFilterParameters IXAudio2Voice_SetFilterParameters
+#define IXAudio2SourceVoice_GetFilterParameters IXAudio2Voice_GetFilterParameters
+#define IXAudio2SourceVoice_SetOutputFilterParameters IXAudio2Voice_SetOutputFilterParameters
+#define IXAudio2SourceVoice_GetOutputFilterParameters IXAudio2Voice_GetOutputFilterParameters
+#define IXAudio2SourceVoice_SetVolume IXAudio2Voice_SetVolume
+#define IXAudio2SourceVoice_GetVolume IXAudio2Voice_GetVolume
+#define IXAudio2SourceVoice_SetChannelVolumes IXAudio2Voice_SetChannelVolumes
+#define IXAudio2SourceVoice_GetChannelVolumes IXAudio2Voice_GetChannelVolumes
+#define IXAudio2SourceVoice_SetOutputMatrix IXAudio2Voice_SetOutputMatrix
+#define IXAudio2SourceVoice_GetOutputMatrix IXAudio2Voice_GetOutputMatrix
+#define IXAudio2SourceVoice_DestroyVoice IXAudio2Voice_DestroyVoice
+#define IXAudio2SourceVoice_Start(This,Flags,OperationSet) ((This)->lpVtbl->Start(This,Flags,OperationSet))
+#define IXAudio2SourceVoice_Stop(This,Flags,OperationSet) ((This)->lpVtbl->Stop(This,Flags,OperationSet))
+#define IXAudio2SourceVoice_SubmitSourceBuffer(This,pBuffer,pBufferWMA) ((This)->lpVtbl->SubmitSourceBuffer(This,pBuffer,pBufferWMA))
+#define IXAudio2SourceVoice_FlushSourceBuffers(This) ((This)->lpVtbl->FlushSourceBuffers(This))
+#define IXAudio2SourceVoice_Discontinuity(This) ((This)->lpVtbl->Discontinuity(This))
+#define IXAudio2SourceVoice_ExitLoop(This,OperationSet) ((This)->lpVtbl->ExitLoop(This,OperationSet))
+#define IXAudio2SourceVoice_GetState(This,pVoiceState,Flags) ((This)->lpVtbl->GetState(This,pVoiceState,Flags))
+#define IXAudio2SourceVoice_SetFrequencyRatio(This,Ratio,OperationSet) ((This)->lpVtbl->SetFrequencyRatio(This,Ratio,OperationSet))
+#define IXAudio2SourceVoice_GetFrequencyRatio(This,pRatio) ((This)->lpVtbl->GetFrequencyRatio(This,pRatio))
+#define IXAudio2SourceVoice_SetSourceSampleRate(This,NewSourceSampleRate) ((This)->lpVtbl->SetSourceSampleRate(This,NewSourceSampleRate))
+
+// IXAudio2SubmixVoice
+#define IXAudio2SubmixVoice_GetVoiceDetails IXAudio2Voice_GetVoiceDetails
+#define IXAudio2SubmixVoice_SetOutputVoices IXAudio2Voice_SetOutputVoices
+#define IXAudio2SubmixVoice_SetEffectChain IXAudio2Voice_SetEffectChain
+#define IXAudio2SubmixVoice_EnableEffect IXAudio2Voice_EnableEffect
+#define IXAudio2SubmixVoice_DisableEffect IXAudio2Voice_DisableEffect
+#define IXAudio2SubmixVoice_GetEffectState IXAudio2Voice_GetEffectState
+#define IXAudio2SubmixVoice_SetEffectParameters IXAudio2Voice_SetEffectParameters
+#define IXAudio2SubmixVoice_GetEffectParameters IXAudio2Voice_GetEffectParameters
+#define IXAudio2SubmixVoice_SetFilterParameters IXAudio2Voice_SetFilterParameters
+#define IXAudio2SubmixVoice_GetFilterParameters IXAudio2Voice_GetFilterParameters
+#define IXAudio2SubmixVoice_SetOutputFilterParameters IXAudio2Voice_SetOutputFilterParameters
+#define IXAudio2SubmixVoice_GetOutputFilterParameters IXAudio2Voice_GetOutputFilterParameters
+#define IXAudio2SubmixVoice_SetVolume IXAudio2Voice_SetVolume
+#define IXAudio2SubmixVoice_GetVolume IXAudio2Voice_GetVolume
+#define IXAudio2SubmixVoice_SetChannelVolumes IXAudio2Voice_SetChannelVolumes
+#define IXAudio2SubmixVoice_GetChannelVolumes IXAudio2Voice_GetChannelVolumes
+#define IXAudio2SubmixVoice_SetOutputMatrix IXAudio2Voice_SetOutputMatrix
+#define IXAudio2SubmixVoice_GetOutputMatrix IXAudio2Voice_GetOutputMatrix
+#define IXAudio2SubmixVoice_DestroyVoice IXAudio2Voice_DestroyVoice
+
+// IXAudio2MasteringVoice
+#define IXAudio2MasteringVoice_GetVoiceDetails IXAudio2Voice_GetVoiceDetails
+#define IXAudio2MasteringVoice_SetOutputVoices IXAudio2Voice_SetOutputVoices
+#define IXAudio2MasteringVoice_SetEffectChain IXAudio2Voice_SetEffectChain
+#define IXAudio2MasteringVoice_EnableEffect IXAudio2Voice_EnableEffect
+#define IXAudio2MasteringVoice_DisableEffect IXAudio2Voice_DisableEffect
+#define IXAudio2MasteringVoice_GetEffectState IXAudio2Voice_GetEffectState
+#define IXAudio2MasteringVoice_SetEffectParameters IXAudio2Voice_SetEffectParameters
+#define IXAudio2MasteringVoice_GetEffectParameters IXAudio2Voice_GetEffectParameters
+#define IXAudio2MasteringVoice_SetFilterParameters IXAudio2Voice_SetFilterParameters
+#define IXAudio2MasteringVoice_GetFilterParameters IXAudio2Voice_GetFilterParameters
+#define IXAudio2MasteringVoice_SetOutputFilterParameters IXAudio2Voice_SetOutputFilterParameters
+#define IXAudio2MasteringVoice_GetOutputFilterParameters IXAudio2Voice_GetOutputFilterParameters
+#define IXAudio2MasteringVoice_SetVolume IXAudio2Voice_SetVolume
+#define IXAudio2MasteringVoice_GetVolume IXAudio2Voice_GetVolume
+#define IXAudio2MasteringVoice_SetChannelVolumes IXAudio2Voice_SetChannelVolumes
+#define IXAudio2MasteringVoice_GetChannelVolumes IXAudio2Voice_GetChannelVolumes
+#define IXAudio2MasteringVoice_SetOutputMatrix IXAudio2Voice_SetOutputMatrix
+#define IXAudio2MasteringVoice_GetOutputMatrix IXAudio2Voice_GetOutputMatrix
+#define IXAudio2MasteringVoice_DestroyVoice IXAudio2Voice_DestroyVoice
+#define IXAudio2MasteringVoice_GetChannelMask(This,pChannelMask) ((This)->lpVtbl->GetChannelMask(This,pChannelMask))
+
+#endif // #ifndef __cplusplus
+
+
+/**************************************************************************
+ *
+ * Utility functions used to convert from pitch in semitones and volume
+ * in decibels to the frequency and amplitude ratio units used by XAudio2.
+ * These are only defined if the client #defines XAUDIO2_HELPER_FUNCTIONS
+ * prior to #including xaudio2.h.
+ *
+ **************************************************************************/
+
+#ifdef XAUDIO2_HELPER_FUNCTIONS
+
+#define _USE_MATH_DEFINES   // Make math.h define M_PI
+#include <math.h>           // For powf, log10f, sinf and asinf
+
+// Calculate the argument to SetVolume from a decibel value
+__inline float XAudio2DecibelsToAmplitudeRatio(float Decibels)
+{
+    return powf(10.0f, Decibels / 20.0f);
+}
+
+// Recover a volume in decibels from an amplitude factor
+__inline float XAudio2AmplitudeRatioToDecibels(float Volume)
+{
+    if (Volume == 0)
+    {
+        return -3.402823466e+38f; // Smallest float value (-FLT_MAX)
+    }
+    return 20.0f * log10f(Volume);
+}
+
+// Calculate the argument to SetFrequencyRatio from a semitone value
+__inline float XAudio2SemitonesToFrequencyRatio(float Semitones)
+{
+    // FrequencyRatio = 2 ^ Octaves
+    //                = 2 ^ (Semitones / 12)
+    return powf(2.0f, Semitones / 12.0f);
+}
+
+// Recover a pitch in semitones from a frequency ratio
+__inline float XAudio2FrequencyRatioToSemitones(float FrequencyRatio)
+{
+    // Semitones = 12 * log2(FrequencyRatio)
+    //           = 12 * log2(10) * log10(FrequencyRatio)
+    return 39.86313713864835f * log10f(FrequencyRatio);
+}
+
+// Convert from filter cutoff frequencies expressed in Hertz to the radian
+// frequency values used in XAUDIO2_FILTER_PARAMETERS.Frequency, state-variable
+// filter types only.  Use XAudio2CutoffFrequencyToOnePoleCoefficient() for one-pole filter types.
+// Note that the highest CutoffFrequency supported is SampleRate/6.
+// Higher values of CutoffFrequency will return XAUDIO2_MAX_FILTER_FREQUENCY.
+__inline float XAudio2CutoffFrequencyToRadians(float CutoffFrequency, UINT32 SampleRate)
+{
+    if ((UINT32)(CutoffFrequency * 6.0f) >= SampleRate)
+    {
+        return XAUDIO2_MAX_FILTER_FREQUENCY;
+    }
+    return 2.0f * sinf((float)M_PI * CutoffFrequency / (float)SampleRate);
+}
+
+// Convert from radian frequencies back to absolute frequencies in Hertz
+__inline float XAudio2RadiansToCutoffFrequency(float Radians, float SampleRate)
+{
+    return SampleRate * asinf(Radians / 2.0f) / (float)M_PI;
+}
+
+// Convert from filter cutoff frequencies expressed in Hertz to the filter
+// coefficients used with XAUDIO2_FILTER_PARAMETERS.Frequency,
+// LowPassOnePoleFilter and HighPassOnePoleFilter filter types only.
+// Use XAudio2CutoffFrequencyToRadians() for state-variable filter types.
+__inline float XAudio2CutoffFrequencyToOnePoleCoefficient(float CutoffFrequency, UINT32 SampleRate)
+{
+    if ((UINT32)CutoffFrequency >= SampleRate)
+    {
+        return XAUDIO2_MAX_FILTER_FREQUENCY;
+    }
+    return ( 1.0f - powf(1.0f - 2.0f * CutoffFrequency / (float)SampleRate, 2.0f) );
+}
+
+
+#endif // #ifdef XAUDIO2_HELPER_FUNCTIONS
+
+
+/**************************************************************************
+ *
+ * XAudio2Create: Top-level function that creates an XAudio2 instance.
+ *
+ * ARGUMENTS:
+ *
+ *  Flags - Flags specifying the XAudio2 object's behavior.
+ *
+ *  XAudio2Processor - An XAUDIO2_PROCESSOR value that specifies the
+ *          hardware threads (Xbox) or processors (Windows) that XAudio2
+ *          will use.  Note that XAudio2 supports concurrent processing on
+ *          multiple threads, using any combination of XAUDIO2_PROCESSOR
+ *          flags.  The values are platform-specific; platform-independent
+ *          code can use XAUDIO2_USE_DEFAULT_PROCESSOR to use the default on
+ *          each platform.
+ *
+ **************************************************************************/
+
+// We're an xaudio2 client
+#define XAUDIO2_STDAPI EXTERN_C DECLSPEC_IMPORT HRESULT STDAPICALLTYPE
+
+XAUDIO2_STDAPI XAudio2Create(_Outptr_ IXAudio2** ppXAudio2, UINT32 Flags X2DEFAULT(0),
+    XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_USE_DEFAULT_PROCESSOR));
+
+// Undo the #pragma pack(push, 1) directive at the top of this file
+#pragma pack(pop)
+
+#endif // #ifndef GUID_DEFS_ONLY
+
+#endif // #ifndef __XAUDIO2_INCLUDED__
diff --git a/3rdparty/XAudio2Redist/libs/xaudio2_9redist.lib b/3rdparty/XAudio2Redist/libs/xaudio2_9redist.lib
new file mode 100644
index 0000000000..96eb038304
Binary files /dev/null and b/3rdparty/XAudio2Redist/libs/xaudio2_9redist.lib differ
diff --git a/3rdparty/asmjit/CMakeLists.txt b/3rdparty/asmjit/CMakeLists.txt
index ae88ce2fe8..2032592584 100644
--- a/3rdparty/asmjit/CMakeLists.txt
+++ b/3rdparty/asmjit/CMakeLists.txt
@@ -3,7 +3,6 @@ set(ASMJIT_STATIC TRUE)
 set(ASMJIT_BUILD_X86 TRUE)
 set(ASMJIT_BUILD_ARM FALSE)
 set(ASMJIT_BUILD_TEST FALSE)
-set(ASMJIT_NO_DEPRECATED TRUE)
 set(ASMJIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/asmjit" CACHE PATH "Location of 'asmjit'")
 
 include("${ASMJIT_DIR}/CMakeLists.txt")
@@ -15,5 +14,4 @@ target_link_libraries(asmjit PRIVATE ${ASMJIT_DEPS})
 # ASMJIT should have a option for disabling installing and this wouldnt
 # be required to avoid installing ASMJIT...
 
-set_property(TARGET asmjit PROPERTY FOLDER "3rdparty/")
 add_library(3rdparty::asmjit ALIAS asmjit)
diff --git a/3rdparty/asmjit/asmjit b/3rdparty/asmjit/asmjit
index 416f735696..723f58581a 160000
--- a/3rdparty/asmjit/asmjit
+++ b/3rdparty/asmjit/asmjit
@@ -1 +1 @@
-Subproject commit 416f7356967c1f66784dc1580fe157f9406d8bff
+Subproject commit 723f58581afc0f4cb16ba13396ff77e425896847
diff --git a/3rdparty/asmjit/asmjit.vcxproj b/3rdparty/asmjit/asmjit.vcxproj
index b53b790f1c..a786d83b84 100644
--- a/3rdparty/asmjit/asmjit.vcxproj
+++ b/3rdparty/asmjit/asmjit.vcxproj
@@ -11,158 +11,66 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="asmjit\src\asmjit\core\archtraits.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\assembler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\builder.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\codeholder.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\codewriter.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\compiler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\constpool.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\cpuinfo.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\emithelper.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\emitter.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\emitterutils.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\environment.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\errorhandler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\formatter.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\funcargscontext.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\func.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\globals.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\inst.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\jitallocator.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\jitruntime.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\logger.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\operand.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\osutils.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\ralocal.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\rapass.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\rastack.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\string.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\support.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\target.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\type.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\virtmem.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\zone.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\zonehash.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\zonelist.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\zonestack.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\zonetree.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\zonevector.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\arch.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\assembler.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codebuilder.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codecompiler.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codeemitter.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codeholder.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\constpool.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\cpuinfo.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\func.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\globals.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\inst.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\logging.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\osutils.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\operand.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\regalloc.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\runtime.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\string.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\vmem.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\zone.cpp" />
     <ClCompile Include="asmjit\src\asmjit\x86\x86assembler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86builder.cpp" />
     <ClCompile Include="asmjit\src\asmjit\x86\x86compiler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86emithelper.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86formatter.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86func.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86instapi.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86instdb.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86inst.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86instimpl.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86internal.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86logging.cpp" />
     <ClCompile Include="asmjit\src\asmjit\x86\x86operand.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86rapass.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64assembler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64builder.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64compiler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64emithelper.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64formatter.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64func.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64instapi.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64instdb.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64operand.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64rapass.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\armformatter.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86operand_regs.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86regalloc.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="asmjit\src\asmjit\a64.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\armutils.h" />
-    <ClInclude Include="asmjit\src\asmjit\asmjit-scope-begin.h" />
-    <ClInclude Include="asmjit\src\asmjit\asmjit-scope-end.h" />
-    <ClInclude Include="asmjit\src\asmjit\asmjit.h" />
-    <ClInclude Include="asmjit\src\asmjit\core.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\api-build_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\api-config.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\archcommons.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\archtraits.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\assembler.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\builder.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\builder_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\codebuffer.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\codeholder.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\codewriter_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\compilerdefs.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\compiler.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\constpool.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\cpuinfo.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\emithelper_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\emitter.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\emitterutils_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\environment.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\errorhandler.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\formatter.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\formatter_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\funcargscontext_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\func.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\globals.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\inst.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\jitallocator.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\jitruntime.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\logger.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\misc_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\operand.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\osutils.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\osutils_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\raassignment_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\rabuilders_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\radefs_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\ralocal_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\rapass_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\rastack_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\string.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\support.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\support_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\target.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\type.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\virtmem.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zone.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zonehash.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zonelist.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zonestack.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zonestring.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zonetree.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zonevector.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86archtraits_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\arch.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\assembler.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codebuilder.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codecompiler.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codeemitter.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codeholder.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\constpool.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\context_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\cpuinfo.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\func.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\logging.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\globals.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\inst.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\lock.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\operand.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\osutils.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\regalloc_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\runtime.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\string.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\vectypes.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\vmem.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\zone.h" />
     <ClInclude Include="asmjit\src\asmjit\x86\x86assembler.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86builder.h" />
     <ClInclude Include="asmjit\src\asmjit\x86\x86compiler.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86emithelper_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86emitter.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86formatter_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86func_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86globals.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86instapi_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86instdb.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86instdb_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86opcode_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86inst.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86instimpl_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86internal_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86logging_p.h" />
     <ClInclude Include="asmjit\src\asmjit\x86\x86operand.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86rapass_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64archtraits_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64assembler.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64builder.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64compiler.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64emithelper_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64emitter.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64formatter_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64func_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64globals.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64instapi_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64instdb.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64instdb_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64operand.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64rapass_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64utils.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\armformatter_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\armglobals.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\armoperand.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86regalloc_p.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{AC40FF01-426E-4838-A317-66354CEFAE88}</ProjectGuid>
@@ -179,14 +87,6 @@
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-  </PropertyGroup>
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
@@ -203,10 +103,8 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>ASMJIT_STATIC;ASMJIT_NO_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ASMJIT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release'">MaxSpeed</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/3rdparty/asmjit/asmjit.vcxproj.filters b/3rdparty/asmjit/asmjit.vcxproj.filters
index 2b73120e3a..0505172685 100644
--- a/3rdparty/asmjit/asmjit.vcxproj.filters
+++ b/3rdparty/asmjit/asmjit.vcxproj.filters
@@ -1,157 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="asmjit\src\asmjit\core\archtraits.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\assembler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\builder.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\codeholder.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\codewriter.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\compiler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\constpool.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\cpuinfo.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\emithelper.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\emitter.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\emitterutils.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\environment.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\errorhandler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\formatter.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\funcargscontext.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\func.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\globals.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\inst.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\jitallocator.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\jitruntime.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\logger.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\operand.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\osutils.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\ralocal.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\rapass.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\rastack.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\string.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\support.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\target.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\type.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\virtmem.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\zone.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\zonehash.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\zonelist.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\zonestack.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\zonetree.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\core\zonevector.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\arch.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\assembler.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codebuilder.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codecompiler.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codeemitter.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\codeholder.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\constpool.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\cpuinfo.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\func.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\globals.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\inst.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\logging.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\osutils.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\operand.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\regalloc.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\runtime.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\string.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\vmem.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\base\zone.cpp" />
     <ClCompile Include="asmjit\src\asmjit\x86\x86assembler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86builder.cpp" />
     <ClCompile Include="asmjit\src\asmjit\x86\x86compiler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86emithelper.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86formatter.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86func.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86instapi.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86instdb.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86inst.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86instimpl.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86internal.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86logging.cpp" />
     <ClCompile Include="asmjit\src\asmjit\x86\x86operand.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\x86\x86rapass.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64assembler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64builder.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64compiler.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64emithelper.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64formatter.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64func.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64instapi.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64instdb.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64operand.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\a64rapass.cpp" />
-    <ClCompile Include="asmjit\src\asmjit\arm\armformatter.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86operand_regs.cpp" />
+    <ClCompile Include="asmjit\src\asmjit\x86\x86regalloc.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="asmjit\src\asmjit\core\api-build_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\api-config.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\archcommons.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\archtraits.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\assembler.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\builder.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\codebuffer.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\codeholder.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\codewriter_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\compilerdefs.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\compiler.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\constpool.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\cpuinfo.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\emithelper_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\emitter.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\emitterutils_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\environment.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\errorhandler.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\formatter.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\formatter_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\funcargscontext_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\func.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\globals.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\inst.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\jitallocator.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\jitruntime.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\logger.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\misc_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\operand.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\osutils.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\osutils_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\raassignment_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\rabuilders_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\radefs_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\ralocal_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\rapass_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\rastack_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\string.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\support.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\target.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\type.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\virtmem.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zone.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zonehash.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zonelist.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zonestack.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zonestring.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zonetree.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\zonevector.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86archtraits_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\arch.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\assembler.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codebuilder.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codecompiler.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codeemitter.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\codeholder.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\constpool.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\context_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\cpuinfo.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\func.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\logging.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\globals.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\inst.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\lock.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\operand.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\osutils.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\regalloc_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\runtime.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\string.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\vectypes.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\vmem.h" />
+    <ClInclude Include="asmjit\src\asmjit\base\zone.h" />
     <ClInclude Include="asmjit\src\asmjit\x86\x86assembler.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86builder.h" />
     <ClInclude Include="asmjit\src\asmjit\x86\x86compiler.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86emithelper_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86emitter.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86formatter_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86func_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86globals.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86instapi_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86instdb.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86instdb_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86opcode_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86inst.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86instimpl_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86internal_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86logging_p.h" />
     <ClInclude Include="asmjit\src\asmjit\x86\x86operand.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86\x86rapass_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64archtraits_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64assembler.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64builder.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64compiler.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64emithelper_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64emitter.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64formatter_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64func_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64globals.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64instapi_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64instdb.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64instdb_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64operand.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64rapass_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\a64utils.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\armformatter_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\armglobals.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\armoperand.h" />
-    <ClInclude Include="asmjit\src\asmjit\a64.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm.h" />
-    <ClInclude Include="asmjit\src\asmjit\asmjit.h" />
-    <ClInclude Include="asmjit\src\asmjit\asmjit-scope-begin.h" />
-    <ClInclude Include="asmjit\src\asmjit\asmjit-scope-end.h" />
-    <ClInclude Include="asmjit\src\asmjit\core.h" />
-    <ClInclude Include="asmjit\src\asmjit\x86.h" />
-    <ClInclude Include="asmjit\src\asmjit\arm\armutils.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\builder_p.h" />
-    <ClInclude Include="asmjit\src\asmjit\core\support_p.h" />
+    <ClInclude Include="asmjit\src\asmjit\x86\x86regalloc_p.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/3rdparty/bcdec/bcdec.hpp b/3rdparty/bcdec/bcdec.hpp
deleted file mode 100644
index 9fac43d0fb..0000000000
--- a/3rdparty/bcdec/bcdec.hpp
+++ /dev/null
@@ -1,170 +0,0 @@
-// Based on https://github.com/iOrange/bcdec/blob/963c5e56b7a335e066cff7d16a3de75f4e8ad366/bcdec.h
-// provides functions to decompress blocks of BC compressed images
-//
-// ------------------------------------------------------------------------------
-//
-// MIT LICENSE
-// ===========
-// Copyright (c) 2022 Sergii Kudlai
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal in
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// ------------------------------------------------------------------------------
-
-#pragma once
-
-#include <util/types.hpp>
-
-static void bcdec__color_block(const u8* compressedBlock, u8* dstColors, int destinationPitch, bool onlyOpaqueMode) {
-	u16 c0, c1;
-	u32 refColors[4]; /* 0xAABBGGRR */
-	u32 colorIndices;
-	u32 r0, g0, b0, r1, g1, b1, r, g, b;
-
-	c0 = *reinterpret_cast<const u16*>(compressedBlock);
-	c1 = *(reinterpret_cast<const u16*>(compressedBlock) + 1);
-
-	/* Unpack 565 ref colors */
-	r0 = (c0 >> 11) & 0x1F;
-	g0 = (c0 >> 5)  & 0x3F;
-	b0 =  c0        & 0x1F;
-
-	r1 = (c1 >> 11) & 0x1F;
-	g1 = (c1 >> 5)  & 0x3F;
-	b1 =  c1        & 0x1F;
-
-	/* Expand 565 ref colors to 888 */
-	r = (r0 * 527 + 23) >> 6;
-	g = (g0 * 259 + 33) >> 6;
-	b = (b0 * 527 + 23) >> 6;
-	refColors[0] = 0xFF000000 | (r << 16) | (g << 8) | b;
-
-	r = (r1 * 527 + 23) >> 6;
-	g = (g1 * 259 + 33) >> 6;
-	b = (b1 * 527 + 23) >> 6;
-	refColors[1] = 0xFF000000 | (r << 16) | (g << 8) | b;
-
-	if (c0 > c1 || onlyOpaqueMode)
-	{   /* Standard BC1 mode (also BC3 color block uses ONLY this mode) */
-		/* color_2 = 2/3*color_0 + 1/3*color_1
-		color_3 = 1/3*color_0 + 2/3*color_1 */
-		r = ((2 * r0 + r1) *  351 +   61) >>  7;
-		g = ((2 * g0 + g1) * 2763 + 1039) >> 11;
-		b = ((2 * b0 + b1) *  351 +   61) >>  7;
-		refColors[2] = 0xFF000000 | (r << 16) | (g << 8) | b;
-
-		r = ((r0 + r1 * 2) *  351 +   61) >>  7;
-		g = ((g0 + g1 * 2) * 2763 + 1039) >> 11;
-		b = ((b0 + b1 * 2) *  351 +   61) >>  7;
-		refColors[3] = 0xFF000000 | (r << 16) | (g << 8) | b;
-	}
-	else
-	{   /* Quite rare BC1A mode */
-		/* color_2 = 1/2*color_0 + 1/2*color_1;
-		color_3 = 0;                         */
-		r = ((r0 + r1) * 1053 +  125) >>  8;
-		g = ((g0 + g1) * 4145 + 1019) >> 11;
-		b = ((b0 + b1) * 1053 +  125) >>  8;
-		refColors[2] = 0xFF000000 | (r << 16) | (g << 8) | b;
-
-		refColors[3] = 0x00000000;
-	}
-
-	colorIndices = *reinterpret_cast<const u32*>(compressedBlock + 4);
-
-	/* Fill out the decompressed color block */
-	for (int i = 0; i < 4; ++i)
-	{
-		for (int j = 0; j < 4; ++j)
-		{
-			int idx = colorIndices & 0x03;
-			*reinterpret_cast<u32*>(dstColors + j * 4) = refColors[idx];
-			colorIndices >>= 2;
-		}
-
-		dstColors += destinationPitch;
-	}
-}
-
-static void bcdec__sharp_alpha_block(const u16* alpha, u8* decompressed, int destinationPitch) {
-	for (int i = 0; i < 4; ++i)
-	{
-		for (int j = 0; j < 4; ++j)
-		{
-			decompressed[j * 4] = ((alpha[i] >> (4 * j)) & 0x0F) * 17;
-		}
-		decompressed += destinationPitch;
-	}
-}
-
-static void bcdec__smooth_alpha_block(const u8* compressedBlock, u8* decompressed, int destinationPitch) {
-	u8 alpha[8];
-	u64 block = *reinterpret_cast<const u64*>(compressedBlock);
-	u64 indices;
-
-	alpha[0] = block & 0xFF;
-	alpha[1] = (block >> 8) & 0xFF;
-
-	if (alpha[0] > alpha[1])
-	{
-		/* 6 interpolated alpha values. */
-		alpha[2] = (6 * alpha[0] +     alpha[1]) / 7;   /* 6/7*alpha_0 + 1/7*alpha_1 */
-		alpha[3] = (5 * alpha[0] + 2 * alpha[1]) / 7;   /* 5/7*alpha_0 + 2/7*alpha_1 */
-		alpha[4] = (4 * alpha[0] + 3 * alpha[1]) / 7;   /* 4/7*alpha_0 + 3/7*alpha_1 */
-		alpha[5] = (3 * alpha[0] + 4 * alpha[1]) / 7;   /* 3/7*alpha_0 + 4/7*alpha_1 */
-		alpha[6] = (2 * alpha[0] + 5 * alpha[1]) / 7;   /* 2/7*alpha_0 + 5/7*alpha_1 */
-		alpha[7] = (    alpha[0] + 6 * alpha[1]) / 7;   /* 1/7*alpha_0 + 6/7*alpha_1 */
-	}
-	else
-	{
-		/* 4 interpolated alpha values. */
-		alpha[2] = (4 * alpha[0] +     alpha[1]) / 5;   /* 4/5*alpha_0 + 1/5*alpha_1 */
-		alpha[3] = (3 * alpha[0] + 2 * alpha[1]) / 5;   /* 3/5*alpha_0 + 2/5*alpha_1 */
-		alpha[4] = (2 * alpha[0] + 3 * alpha[1]) / 5;   /* 2/5*alpha_0 + 3/5*alpha_1 */
-		alpha[5] = (    alpha[0] + 4 * alpha[1]) / 5;   /* 1/5*alpha_0 + 4/5*alpha_1 */
-		alpha[6] = 0x00;
-		alpha[7] = 0xFF;
-	}
-
-	indices = block >> 16;
-	for (int i = 0; i < 4; ++i)
-	{
-		for (int j = 0; j < 4; ++j)
-		{
-			decompressed[j * 4] = alpha[indices & 0x07];
-			indices >>= 3;
-		}
-		decompressed += destinationPitch;
-	}
-}
-
-static inline void bcdec_bc1(const u8* compressedBlock, u8* decompressedBlock, int destinationPitch) {
-	bcdec__color_block(compressedBlock, decompressedBlock, destinationPitch, false);
-}
-
-static inline void bcdec_bc2(const u8* compressedBlock, u8* decompressedBlock, int destinationPitch) {
-	bcdec__color_block(compressedBlock + 8, decompressedBlock, destinationPitch, true);
-	bcdec__sharp_alpha_block(reinterpret_cast<const u16*>(compressedBlock), decompressedBlock + 3, destinationPitch);
-}
-
-static inline void bcdec_bc3(const u8* compressedBlock, u8* decompressedBlock, int destinationPitch) {
-	bcdec__color_block(compressedBlock + 8, decompressedBlock, destinationPitch, true);
-	bcdec__smooth_alpha_block(compressedBlock, decompressedBlock + 3, destinationPitch);
-}
-
diff --git a/3rdparty/cubeb/CMakeLists.txt b/3rdparty/cubeb/CMakeLists.txt
deleted file mode 100644
index 6d1f231f0b..0000000000
--- a/3rdparty/cubeb/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Cubeb
-
-set(BUILD_SHARED_LIBS FALSE CACHE BOOL "Don't build shared libs")
-set(BUILD_TESTS FALSE CACHE BOOL "Don't build tests")
-set(BUILD_RUST_LIBS FALSE CACHE BOOL "Don't build rust libs")
-set(BUILD_TOOLS FALSE CACHE BOOL "Don't build tools")
-set(BUNDLE_SPEEX TRUE CACHE BOOL "Bundle the speex library")
-set(LAZY_LOAD_LIBS TRUE CACHE BOOL "Lazily load shared libraries")
-set(USE_SANITIZERS FALSE CACHE BOOL "Dont't use sanitizers")
-
-add_subdirectory(cubeb EXCLUDE_FROM_ALL)
-add_library(3rdparty::cubeb ALIAS cubeb)
-
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|ARM|aarch64|AArch64|Aarch64)")
-	target_compile_definitions(speex PUBLIC
-		#_USE_NEON
-	)
-elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86|X86|amd64|AMD64|em64t|EM64T)")
-	target_compile_definitions(speex PUBLIC
-		_USE_SSE
-		_USE_SSE2
-	)
-endif ()
diff --git a/3rdparty/cubeb/cubeb b/3rdparty/cubeb/cubeb
deleted file mode 160000
index 70b4e3db78..0000000000
--- a/3rdparty/cubeb/cubeb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 70b4e3db7822de4d534959885cda109d6edbee36
diff --git a/3rdparty/cubeb/extra/cubeb_export.h b/3rdparty/cubeb/extra/cubeb_export.h
deleted file mode 100644
index 0a831f4ac4..0000000000
--- a/3rdparty/cubeb/extra/cubeb_export.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define CUBEB_EXPORT
diff --git a/3rdparty/cubeb/libcubeb.vcxproj b/3rdparty/cubeb/libcubeb.vcxproj
deleted file mode 100644
index 36229297fe..0000000000
--- a/3rdparty/cubeb/libcubeb.vcxproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="cubeb\src\cubeb.c" />
-    <ClCompile Include="cubeb\src\cubeb_log.cpp" />
-    <ClCompile Include="cubeb\src\cubeb_mixer.cpp" />
-    <ClCompile Include="cubeb\src\cubeb_resampler.cpp" />
-    <ClCompile Include="cubeb\src\cubeb_strings.c" />
-    <ClCompile Include="cubeb\src\cubeb_utils.cpp" />
-    <ClCompile Include="cubeb\src\cubeb_wasapi.cpp" />
-    <ClCompile Include="cubeb\src\cubeb_winmm.c" />
-    <ClCompile Include="cubeb\subprojects\speex\resample.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="cubeb\include\cubeb\cubeb.h" />
-    <ClInclude Include="cubeb\src\cubeb-internal.h" />
-    <ClInclude Include="cubeb\src\cubeb-speex-resampler.h" />
-    <ClInclude Include="cubeb\src\cubeb_array_queue.h" />
-    <ClInclude Include="cubeb\src\cubeb_assert.h" />
-    <ClInclude Include="cubeb\src\cubeb_log.h" />
-    <ClInclude Include="cubeb\src\cubeb_mixer.h" />
-    <ClInclude Include="cubeb\src\cubeb_resampler.h" />
-    <ClInclude Include="cubeb\src\cubeb_resampler_internal.h" />
-    <ClInclude Include="cubeb\src\cubeb_ringbuffer.h" />
-    <ClInclude Include="cubeb\src\cubeb_ring_array.h" />
-    <ClInclude Include="cubeb\src\cubeb_strings.h" />
-    <ClInclude Include="cubeb\src\cubeb_utils.h" />
-    <ClInclude Include="cubeb\src\cubeb_utils_win.h" />
-    <ClInclude Include="cubeb\subprojects\speex\arch.h" />
-    <ClInclude Include="cubeb\subprojects\speex\fixed_generic.h" />
-    <ClInclude Include="cubeb\subprojects\speex\resample_neon.h" />
-    <ClInclude Include="cubeb\subprojects\speex\resample_sse.h" />
-    <ClInclude Include="cubeb\subprojects\speex\speex_config_types.h" />
-    <ClInclude Include="cubeb\subprojects\speex\speex_resampler.h" />
-    <ClInclude Include="cubeb\subprojects\speex\stack_alloc.h" />
-    <ClInclude Include="extra\cubeb_export.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{fda7b080-03b0-48c8-b24f-88118981422a}</ProjectGuid>
-    <RootNamespace>libcubeb</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>OUTSIDE_SPEEX;RANDOM_PREFIX=speex;FLOATING_POINT;_USE_SSE;_USE_SSE2;EXPORT=;USE_WASAPI;USE_WINMM;CUBEB_WASAPI_USE_IAUDIOSTREAMVOLUME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./cubeb/subprojects/;./extra/;./cubeb/src/;./cubeb/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/3rdparty/cubeb/libcubeb.vcxproj.filters b/3rdparty/cubeb/libcubeb.vcxproj.filters
deleted file mode 100644
index 980dd3338d..0000000000
--- a/3rdparty/cubeb/libcubeb.vcxproj.filters
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="cubeb\src\cubeb_winmm.c">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="cubeb\src\cubeb_utils.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="cubeb\src\cubeb_wasapi.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="cubeb\src\cubeb_strings.c">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="cubeb\src\cubeb_resampler.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="cubeb\src\cubeb_mixer.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="cubeb\src\cubeb_log.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="cubeb\src\cubeb.c">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="cubeb\subprojects\speex\resample.c">
-      <Filter>Source files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Source files">
-      <UniqueIdentifier>{cd86de6d-e811-4c48-9653-af00c7098a45}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files">
-      <UniqueIdentifier>{566bbf3e-ca28-4390-b054-58c92a66f24e}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="cubeb\subprojects\speex\speex_config_types.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\subprojects\speex\speex_resampler.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\subprojects\speex\stack_alloc.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\subprojects\speex\arch.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\subprojects\speex\fixed_generic.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\subprojects\speex\resample_neon.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\subprojects\speex\resample_sse.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\include\cubeb\cubeb.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\src\cubeb_array_queue.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\src\cubeb_assert.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\src\cubeb_log.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\src\cubeb_mixer.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\src\cubeb_resampler.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\src\cubeb_resampler_internal.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\src\cubeb_ring_array.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\src\cubeb_ringbuffer.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\src\cubeb_strings.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\src\cubeb_utils.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\src\cubeb_utils_win.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\src\cubeb-internal.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="cubeb\src\cubeb-speex-resampler.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="extra\cubeb_export.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/3rdparty/curl/CMakeLists.txt b/3rdparty/curl/CMakeLists.txt
index b20763af65..f0cc526167 100644
--- a/3rdparty/curl/CMakeLists.txt
+++ b/3rdparty/curl/CMakeLists.txt
@@ -1,37 +1,16 @@
 # CURL
 
 if(USE_SYSTEM_CURL)
-	message(STATUS "RPCS3: using shared libcurl")
+	message("-- RPCS3: using shared libcurl")
 	find_package(CURL REQUIRED)
-	add_library(3rdparty_libcurl INTERFACE)
-	target_link_libraries(3rdparty_libcurl INTERFACE CURL::libcurl)
+	add_library(libcurl INTERFACE)
+	target_link_libraries(libcurl INTERFACE CURL::libcurl)
 else()
-	message(STATUS "RPCS3: building libcurl + wolfssl submodules")
-	set(BUILD_CURL_EXE OFF CACHE BOOL "Set to ON to build curl executable.")
-	set(BUILD_STATIC_CURL OFF CACHE BOOL "Set to ON to build curl executable with static libcurl.")
-	set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libcurl.")
-	set(BUILD_SHARED_LIBS OFF CACHE BOOL "Set to ON to build shared libcurl.")
-	find_package(WolfSSL REQUIRED)
-	set(CURL_USE_WOLFSSL ON CACHE BOOL "enable wolfSSL for SSL/TLS")
-	set(CURL_USE_OPENSSL OFF CACHE BOOL "Use OpenSSL code. Experimental")
-	set(HTTP_ONLY ON CACHE BOOL "disables all protocols except HTTP (This overrides all CURL_DISABLE_* options)")
-	set(USE_LIBIDN2 OFF CACHE BOOL "Use libidn2 for IDN support") # Disabled because MacOS CI doesn't work otherwise
+	message("-- RPCS3: building libcurl + wolfssl submodules")
+	option(BUILD_CURL_EXE "Set to ON to build curl executable." OFF)
+	option(CMAKE_USE_WOLFSSL "enable wolfSSL for SSL/TLS" ON)
+	option(HTTP_ONLY "disables all protocols except HTTP (This overrides all CURL_DISABLE_* options)" ON)
+	option(CURL_ZLIB "Set to ON to enable building curl with zlib support." OFF)
 	set(CURL_CA_PATH "none" CACHE STRING "Location of default CA path. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.")
-	option(CURL_DISABLE_INSTALL "Disable installation targets" ON)
-	if(USE_MSVC_STATIC_CRT)
-		set(CURL_STATIC_CRT ON CACHE BOOL "Use static crt to build curl")
-	endif()
-	if(WIN32)
-		set(ENABLE_UNICODE ON CACHE BOOL "enable Unicode")
-	endif()
-	set(CURL_USE_LIBSSH2 OFF CACHE BOOL "Use libSSH2")
-	set(CURL_USE_LIBPSL OFF CACHE BOOL "Use libPSL")
-	option(BUILD_TESTING "Build tests" OFF)
-	option(BUILD_EXAMPLES "Build libcurl examples" OFF)
-
 	add_subdirectory(curl EXCLUDE_FROM_ALL)
-
-	add_library(3rdparty_libcurl INTERFACE)
-	target_link_libraries(3rdparty_libcurl INTERFACE libcurl_static)
-
 endif()
diff --git a/3rdparty/curl/curl b/3rdparty/curl/curl
index fdb8a789d2..6b951a6928 160000
--- a/3rdparty/curl/curl
+++ b/3rdparty/curl/curl
@@ -1 +1 @@
-Subproject commit fdb8a789d2b446b77bd7cdd2eff95f6cbc814cf4
+Subproject commit 6b951a6928811507d493303b2878e848c077b471
diff --git a/3rdparty/curl/libcurl.vcxproj b/3rdparty/curl/libcurl.vcxproj
index c4a96abdc4..71f8e0554d 100644
--- a/3rdparty/curl/libcurl.vcxproj
+++ b/3rdparty/curl/libcurl.vcxproj
@@ -33,8 +33,8 @@
   </ImportGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Midl>
@@ -43,11 +43,11 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>curl\include;curl\lib;extra;$(SolutionDir)3rdparty\wolfssl\wolfssl\wolfssl;$(SolutionDir)3rdparty\wolfssl\wolfssl;$(SolutionDir)3rdparty\wolfssl\extra\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WOLFSSL_ALT_CERT_CHAINS;HAVE_SNI;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WOLFSSL;NO_MD4;WOLFSSL_USER_SETTINGS;USE_IPV6;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>curl\include;curl\lib;extra;$(SolutionDir)3rdparty\wolfssl;$(SolutionDir)3rdparty\wolfssl\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>HAVE_SNI;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WOLFSSL;USE_IPV6;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -62,33 +62,16 @@
     <ClCompile Include="curl\lib\altsvc.c" />
     <ClCompile Include="curl\lib\amigaos.c" />
     <ClCompile Include="curl\lib\asyn-ares.c" />
-    <ClCompile Include="curl\lib\asyn-base.c" />
-    <ClCompile Include="curl\lib\asyn-thrdd.c" />
-    <ClCompile Include="curl\lib\bufq.c" />
+    <ClCompile Include="curl\lib\asyn-thread.c" />
+    <ClCompile Include="curl\lib\base64.c" />
     <ClCompile Include="curl\lib\bufref.c" />
-    <ClCompile Include="curl\lib\cf-h1-proxy.c" />
-    <ClCompile Include="curl\lib\cf-h2-proxy.c" />
-    <ClCompile Include="curl\lib\cf-haproxy.c" />
-    <ClCompile Include="curl\lib\cf-https-connect.c" />
-    <ClCompile Include="curl\lib\cf-socket.c" />
-    <ClCompile Include="curl\lib\cfilters.c" />
+    <ClCompile Include="curl\lib\c-hyper.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\cshutdn.c" />
-    <ClCompile Include="curl\lib\curlx\base64.c" />
-    <ClCompile Include="curl\lib\curlx\dynbuf.c" />
-    <ClCompile Include="curl\lib\curlx\inet_pton.c" />
-    <ClCompile Include="curl\lib\curlx\multibyte.c" />
-    <ClCompile Include="curl\lib\curlx\nonblock.c" />
-    <ClCompile Include="curl\lib\curlx\strparse.c" />
-    <ClCompile Include="curl\lib\curlx\timediff.c" />
-    <ClCompile Include="curl\lib\curlx\timeval.c" />
-    <ClCompile Include="curl\lib\curlx\version_win32.c" />
-    <ClCompile Include="curl\lib\curlx\warnless.c" />
-    <ClCompile Include="curl\lib\curlx\winapi.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" />
@@ -96,28 +79,25 @@
     <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_sha512_256.c" />
     <ClCompile Include="curl\lib\curl_sspi.c" />
     <ClCompile Include="curl\lib\curl_threads.c" />
-    <ClCompile Include="curl\lib\curl_trc.c" />
-    <ClCompile Include="curl\lib\cw-out.c" />
-    <ClCompile Include="curl\lib\cw-pause.c" />
     <ClCompile Include="curl\lib\dict.c" />
-    <ClCompile Include="curl\lib\dllmain.c" />
     <ClCompile Include="curl\lib\doh.c" />
-    <ClCompile Include="curl\lib\dynhds.c" />
+    <ClCompile Include="curl\lib\dotdot.c" />
+    <ClCompile Include="curl\lib\dynbuf.c" />
     <ClCompile Include="curl\lib\easy.c" />
     <ClCompile Include="curl\lib\easygetopt.c" />
     <ClCompile Include="curl\lib\easyoptions.c" />
     <ClCompile Include="curl\lib\escape.c" />
-    <ClCompile Include="curl\lib\fake_addrinfo.c" />
     <ClCompile Include="curl\lib\file.c" />
     <ClCompile Include="curl\lib\fileinfo.c" />
-    <ClCompile Include="curl\lib\fopen.c" />
     <ClCompile Include="curl\lib\formdata.c" />
     <ClCompile Include="curl\lib\ftp.c" />
     <ClCompile Include="curl\lib\ftplistparser.c" />
@@ -125,30 +105,30 @@
     <ClCompile Include="curl\lib\getinfo.c" />
     <ClCompile Include="curl\lib\gopher.c" />
     <ClCompile Include="curl\lib\hash.c" />
-    <ClCompile Include="curl\lib\headers.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\hsts.c" />
     <ClCompile Include="curl\lib\http.c" />
-    <ClCompile Include="curl\lib\http1.c" />
     <ClCompile Include="curl\lib\http2.c" />
-    <ClCompile Include="curl\lib\httpsrr.c" />
     <ClCompile Include="curl\lib\http_aws_sigv4.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.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\macos.c" />
     <ClCompile Include="curl\lib\md4.c" />
     <ClCompile Include="curl\lib\md5.c" />
     <ClCompile Include="curl\lib\memdebug.c" />
@@ -156,9 +136,11 @@
     <ClCompile Include="curl\lib\mprintf.c" />
     <ClCompile Include="curl\lib\mqtt.c" />
     <ClCompile Include="curl\lib\multi.c" />
-    <ClCompile Include="curl\lib\multi_ev.c" />
     <ClCompile Include="curl\lib\netrc.c" />
-    <ClCompile Include="curl\lib\noproxy.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" />
@@ -167,7 +149,6 @@
     <ClCompile Include="curl\lib\psl.c" />
     <ClCompile Include="curl\lib\rand.c" />
     <ClCompile Include="curl\lib\rename.c" />
-    <ClCompile Include="curl\lib\request.c" />
     <ClCompile Include="curl\lib\rtsp.c" />
     <ClCompile Include="curl\lib\select.c" />
     <ClCompile Include="curl\lib\sendf.c" />
@@ -185,29 +166,23 @@
     <ClCompile Include="curl\lib\splay.c" />
     <ClCompile Include="curl\lib\strcase.c" />
     <ClCompile Include="curl\lib\strdup.c" />
-    <ClCompile Include="curl\lib\strequal.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\uint-bset.c" />
-    <ClCompile Include="curl\lib\uint-hash.c" />
-    <ClCompile Include="curl\lib\uint-spbset.c" />
-    <ClCompile Include="curl\lib\uint-table.c" />
     <ClCompile Include="curl\lib\url.c" />
     <ClCompile Include="curl\lib\urlapi.c" />
     <ClCompile Include="curl\lib\vauth\gsasl.c" />
     <ClCompile Include="curl\lib\version.c" />
-    <ClCompile Include="curl\lib\vquic\curl_msh3.c" />
-    <ClCompile Include="curl\lib\vquic\curl_ngtcp2.c" />
-    <ClCompile Include="curl\lib\vquic\curl_quiche.c" />
-    <ClCompile Include="curl\lib\vtls\cipher_suite.c" />
-    <ClCompile Include="curl\lib\vtls\hostcheck.c" />
+    <ClCompile Include="curl\lib\version_win32.c" />
     <ClCompile Include="curl\lib\vtls\rustls.c" />
-    <ClCompile Include="curl\lib\vtls\vtls_scache.c" />
-    <ClCompile Include="curl\lib\vtls\vtls_spack.c" />
-    <ClCompile Include="curl\lib\vtls\x509asn1.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" />
@@ -220,23 +195,26 @@
     <ClCompile Include="curl\lib\vauth\spnego_gssapi.c" />
     <ClCompile Include="curl\lib\vauth\spnego_sspi.c" />
     <ClCompile Include="curl\lib\vauth\vauth.c" />
+    <ClCompile Include="curl\lib\vquic\ngtcp2.c" />
+    <ClCompile Include="curl\lib\vquic\quiche.c" />
     <ClCompile Include="curl\lib\vquic\vquic.c" />
-    <ClCompile Include="curl\lib\vssh\curl_path.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\keylog.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" />
-    <ClCompile Include="curl\lib\ws.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="curl\include\curl\curl.h" />
@@ -252,37 +230,26 @@
     <ClInclude Include="curl\lib\amigaos.h" />
     <ClInclude Include="curl\lib\arpa_telnet.h" />
     <ClInclude Include="curl\lib\asyn.h" />
-    <ClInclude Include="curl\lib\bufq.h" />
     <ClInclude Include="curl\lib\bufref.h" />
-    <ClInclude Include="curl\lib\cf-h1-proxy.h" />
-    <ClInclude Include="curl\lib\cf-h2-proxy.h" />
-    <ClInclude Include="curl\lib\cf-haproxy.h" />
-    <ClInclude Include="curl\lib\cf-https-connect.h" />
-    <ClInclude Include="curl\lib\cf-socket.h" />
-    <ClInclude Include="curl\lib\cfilters.h" />
+    <ClInclude Include="curl\lib\c-hyper.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\cshutdn.h" />
-    <ClInclude Include="curl\lib\curlx\base64.h" />
-    <ClInclude Include="curl\lib\curlx\curlx.h" />
-    <ClInclude Include="curl\lib\curlx\dynbuf.h" />
-    <ClInclude Include="curl\lib\curlx\inet_pton.h" />
-    <ClInclude Include="curl\lib\curlx\multibyte.h" />
-    <ClInclude Include="curl\lib\curlx\nonblock.h" />
-    <ClInclude Include="curl\lib\curlx\strparse.h" />
-    <ClInclude Include="curl\lib\curlx\timediff.h" />
-    <ClInclude Include="curl\lib\curlx\timeval.h" />
-    <ClInclude Include="curl\lib\curlx\version_win32.h" />
-    <ClInclude Include="curl\lib\curlx\warnless.h" />
-    <ClInclude Include="curl\lib\curlx\winapi.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" />
@@ -297,73 +264,67 @@
     <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_sha512_256.h" />
     <ClInclude Include="curl\lib\curl_sspi.h" />
     <ClInclude Include="curl\lib\curl_threads.h" />
-    <ClInclude Include="curl\lib\curl_trc.h" />
-    <ClInclude Include="curl\lib\cw-out.h" />
-    <ClInclude Include="curl\lib\cw-pause.h" />
     <ClInclude Include="curl\lib\dict.h" />
     <ClInclude Include="curl\lib\doh.h" />
-    <ClInclude Include="curl\lib\dynhds.h" />
+    <ClInclude Include="curl\lib\dotdot.h" />
+    <ClInclude Include="curl\lib\dynbuf.h" />
     <ClInclude Include="curl\lib\easyif.h" />
     <ClInclude Include="curl\lib\easyoptions.h" />
-    <ClInclude Include="curl\lib\easy_lock.h" />
     <ClInclude Include="curl\lib\escape.h" />
-    <ClInclude Include="curl\lib\fake_addrinfo.h" />
     <ClInclude Include="curl\lib\file.h" />
     <ClInclude Include="curl\lib\fileinfo.h" />
-    <ClInclude Include="curl\lib\fopen.h" />
     <ClInclude Include="curl\lib\formdata.h" />
     <ClInclude Include="curl\lib\ftp.h" />
     <ClInclude Include="curl\lib\ftplistparser.h" />
-    <ClInclude Include="curl\lib\functypes.h" />
     <ClInclude Include="curl\lib\getinfo.h" />
     <ClInclude Include="curl\lib\gopher.h" />
     <ClInclude Include="curl\lib\hash.h" />
-    <ClInclude Include="curl\lib\headers.h" />
+    <ClInclude Include="curl\lib\hostcheck.h" />
     <ClInclude Include="curl\lib\hostip.h" />
     <ClInclude Include="curl\lib\hsts.h" />
     <ClInclude Include="curl\lib\http.h" />
-    <ClInclude Include="curl\lib\http1.h" />
     <ClInclude Include="curl\lib\http2.h" />
-    <ClInclude Include="curl\lib\httpsrr.h" />
     <ClInclude Include="curl\lib\http_aws_sigv4.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\idn.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\macos.h" />
     <ClInclude Include="curl\lib\memdebug.h" />
     <ClInclude Include="curl\lib\mime.h" />
     <ClInclude Include="curl\lib\mqtt.h" />
     <ClInclude Include="curl\lib\multihandle.h" />
     <ClInclude Include="curl\lib\multiif.h" />
-    <ClInclude Include="curl\lib\multi_ev.h" />
     <ClInclude Include="curl\lib\netrc.h" />
-    <ClInclude Include="curl\lib\noproxy.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\request.h" />
     <ClInclude Include="curl\lib\rtsp.h" />
     <ClInclude Include="curl\lib\select.h" />
     <ClInclude Include="curl\lib\sendf.h" />
@@ -389,43 +350,37 @@
     <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\uint-bset.h" />
-    <ClInclude Include="curl\lib\uint-hash.h" />
-    <ClInclude Include="curl\lib\uint-spbset.h" />
-    <ClInclude Include="curl\lib\uint-table.h" />
     <ClInclude Include="curl\lib\url.h" />
     <ClInclude Include="curl\lib\urlapi-int.h" />
     <ClInclude Include="curl\lib\urldata.h" />
-    <ClInclude Include="curl\lib\vquic\curl_msh3.h" />
-    <ClInclude Include="curl\lib\vquic\curl_ngtcp2.h" />
-    <ClInclude Include="curl\lib\vquic\curl_quiche.h" />
-    <ClInclude Include="curl\lib\vquic\vquic_int.h" />
-    <ClInclude Include="curl\lib\vtls\cipher_suite.h" />
-    <ClInclude Include="curl\lib\vtls\hostcheck.h" />
+    <ClInclude Include="curl\lib\version_win32.h" />
     <ClInclude Include="curl\lib\vtls\rustls.h" />
-    <ClInclude Include="curl\lib\vtls\schannel_int.h" />
-    <ClInclude Include="curl\lib\vtls\vtls_int.h" />
-    <ClInclude Include="curl\lib\vtls\vtls_scache.h" />
-    <ClInclude Include="curl\lib\vtls\vtls_spack.h" />
-    <ClInclude Include="curl\lib\vtls\x509asn1.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\vquic\vquic.h" />
-    <ClInclude Include="curl\lib\vssh\curl_path.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\keylog.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" />
-    <ClInclude Include="curl\lib\ws.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="curl\lib\libcurl.rc" />
diff --git a/3rdparty/curl/libcurl.vcxproj.filters b/3rdparty/curl/libcurl.vcxproj.filters
index 32eb05f40e..33417807a1 100644
--- a/3rdparty/curl/libcurl.vcxproj.filters
+++ b/3rdparty/curl/libcurl.vcxproj.filters
@@ -24,6 +24,12 @@
     <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\bufref.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -42,6 +48,9 @@
     <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>
@@ -63,9 +72,18 @@
     <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>
@@ -87,6 +105,9 @@
     <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>
@@ -123,6 +144,12 @@
     <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>
@@ -132,6 +159,9 @@
     <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>
@@ -153,6 +183,9 @@
     <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>
@@ -162,6 +195,9 @@
     <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>
@@ -192,6 +228,18 @@
     <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>
@@ -270,6 +318,12 @@
     <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>
@@ -279,6 +333,9 @@
     <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>
@@ -291,6 +348,15 @@
     <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>
@@ -327,7 +393,10 @@
     <ClCompile Include="curl\lib\vauth\vauth.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\vssh\curl_path.c">
+    <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">
@@ -342,6 +411,9 @@
     <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>
@@ -351,6 +423,12 @@
     <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>
@@ -369,15 +447,24 @@
     <ClCompile Include="curl\lib\vtls\wolfssl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="curl\lib\dynbuf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="curl\lib\mqtt.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="curl\lib\version_win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="curl\lib\vquic\vquic.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="curl\lib\vtls\keylog.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="curl\lib\c-hyper.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="curl\lib\easygetopt.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -396,159 +483,6 @@
     <ClCompile Include="curl\lib\vauth\gsasl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\vtls\hostcheck.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\vtls\x509asn1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\headers.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\fopen.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\noproxy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\ws.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\cfilters.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\idn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\cf-https-connect.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\cf-socket.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\vquic\curl_msh3.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\vquic\curl_ngtcp2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\vquic\curl_quiche.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\http1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\dynhds.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\bufq.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\cf-h1-proxy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\cf-h2-proxy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\cf-haproxy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curl_trc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\request.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\cw-out.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curl_sha512_256.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\httpsrr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\vtls\cipher_suite.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\vtls\vtls_scache.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\vtls\vtls_spack.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\cshutdn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\cw-pause.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\dllmain.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\macos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\multi_ev.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\strequal.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\asyn-base.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\asyn-thrdd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\fake_addrinfo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\uint-bset.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\uint-hash.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\uint-spbset.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\uint-table.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\base64.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\dynbuf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\inet_pton.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\multibyte.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\nonblock.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\strparse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\timediff.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\timeval.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\version_win32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\warnless.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\winapi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="curl\include\curl\curl.h">
@@ -593,6 +527,12 @@
     <ClInclude Include="curl\lib\bufref.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>
@@ -605,9 +545,21 @@
     <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>
@@ -620,9 +572,15 @@
     <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>
@@ -662,9 +620,18 @@
     <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>
@@ -677,6 +644,9 @@
     <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>
@@ -698,6 +668,9 @@
     <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>
@@ -728,6 +701,9 @@
     <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>
@@ -761,6 +737,9 @@
     <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>
@@ -779,6 +758,12 @@
     <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>
@@ -794,6 +779,9 @@
     <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>
@@ -872,6 +860,9 @@
     <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>
@@ -884,6 +875,15 @@
     <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>
@@ -893,15 +893,24 @@
     <ClInclude Include="curl\lib\vauth\vauth.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\vssh\curl_path.h">
+    <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>
@@ -911,6 +920,12 @@
     <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>
@@ -926,18 +941,27 @@
     <ClInclude Include="curl\lib\vtls\wolfssl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="curl\lib\dynbuf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="curl\lib\mqtt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="curl\lib\setup-win32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="curl\lib\version_win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="curl\lib\vquic\vquic.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="curl\lib\vtls\keylog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="curl\lib\c-hyper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="curl\lib\curl_krb5.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -953,165 +977,6 @@
     <ClInclude Include="curl\lib\vtls\rustls.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\vtls\hostcheck.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\vtls\x509asn1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\headers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\easy_lock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\fopen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\functypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\noproxy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\ws.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\cfilters.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\idn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\cf-https-connect.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\cf-socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\vquic\curl_msh3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\vquic\curl_ngtcp2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\vquic\curl_quiche.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\vquic\vquic_int.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\http1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\dynhds.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\bufq.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\cf-h1-proxy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\cf-h2-proxy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\cf-haproxy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curl_trc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\request.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\cw-out.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curl_sha512_256.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\httpsrr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\vtls\cipher_suite.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\vtls\schannel_int.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\vtls\vtls_int.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\vtls\vtls_scache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\vtls\vtls_spack.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\cshutdn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\cw-pause.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\macos.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\multi_ev.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\fake_addrinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\uint-bset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\uint-hash.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\uint-spbset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\uint-table.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\base64.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\curlx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\dynbuf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\inet_pton.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\multibyte.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\nonblock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\strparse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\timediff.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\timeval.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\version_win32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\warnless.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\winapi.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="curl\lib\libcurl.rc">
diff --git a/3rdparty/discord-rpc/CMakeLists.txt b/3rdparty/discord-rpc/CMakeLists.txt
index 2ad705d52c..34c7c4fdb9 100644
--- a/3rdparty/discord-rpc/CMakeLists.txt
+++ b/3rdparty/discord-rpc/CMakeLists.txt
@@ -1,15 +1,34 @@
 # DiscordRPC
-
 add_library(3rdparty_discordRPC INTERFACE)
 
+# We don't want Discord Rich Presence on the BSDs and other OSes
 if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE))
-	set(BUILD_EXAMPLES FALSE CACHE BOOL "Build example apps")
-	set(ENABLE_IO_THREAD TRUE CACHE BOOL "Start up a separate I/O thread, otherwise I'd need to call an update function")
-	set(USE_STATIC_CRT FALSE CACHE BOOL "Use /MT[d] for dynamic library")
-	set(WARNINGS_AS_ERRORS FALSE CACHE BOOL "When enabled, compiles with `-Werror` (on *nix platforms).")
+	if (WIN32 AND NOT MSVC)
+		ExternalProject_Add(discordRPC
+				GIT_REPOSITORY https://github.com/discordapp/discord-rpc
+				BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
+				INSTALL_COMMAND ""
+			)
 
-	add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
-	target_include_directories(3rdparty_discordRPC INTERFACE discord-rpc/include)
+	endif()
+
+	target_include_directories(3rdparty_discordRPC INTERFACE include)
 	target_compile_definitions(3rdparty_discordRPC INTERFACE -DWITH_DISCORD_RPC)
-	target_link_libraries(3rdparty_discordRPC INTERFACE discord-rpc)
+
+	set(DISCORD_RPC_LIB NOTFOUND)
+	if (WIN32)
+		if (NOT MSVC)
+			set(DISCORD_RPC_LIB ${CMAKE_CURRENT_BINARY_DIR}/src/libdiscord-rpc.a)
+		else()
+			find_library(DISCORD_RPC_LIB discord-rpc PATHS lib/ NO_DEFAULT_PATH)
+		endif()
+	elseif(CMAKE_SYSTEM MATCHES "Linux")
+		find_library(DISCORD_RPC_LIB discord-rpc-linux PATHS lib/ NO_DEFAULT_PATH)
+	elseif(APPLE)
+		find_library(DISCORD_RPC_LIB discord-rpc-mac PATHS lib/ NO_DEFAULT_PATH)
+	endif()
+	target_link_libraries(3rdparty_discordRPC INTERFACE ${DISCORD_RPC_LIB})
+	if(APPLE)
+		target_link_libraries(3rdparty_discordRPC INTERFACE "objc" "-framework Foundation" "-framework CoreServices")
+	endif()
 endif()
diff --git a/3rdparty/discord-rpc/discord-rpc b/3rdparty/discord-rpc/discord-rpc
deleted file mode 160000
index 3dc2c326cb..0000000000
--- a/3rdparty/discord-rpc/discord-rpc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3dc2c326cb4dc5815c6069970c13154898f58d48
diff --git a/3rdparty/discord-rpc/discord-rpc.vcxproj b/3rdparty/discord-rpc/discord-rpc.vcxproj
deleted file mode 100644
index 2777c4e9df..0000000000
--- a/3rdparty/discord-rpc/discord-rpc.vcxproj
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="discord-rpc\include\discord_register.h" />
-    <ClInclude Include="discord-rpc\include\discord_rpc.h" />
-    <ClInclude Include="discord-rpc\src\backoff.h" />
-    <ClInclude Include="discord-rpc\src\connection.h" />
-    <ClInclude Include="discord-rpc\src\msg_queue.h" />
-    <ClInclude Include="discord-rpc\src\rpc_connection.h" />
-    <ClInclude Include="discord-rpc\src\serialization.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="discord-rpc\src\connection_win.cpp" />
-    <ClCompile Include="discord-rpc\src\discord_register_win.cpp" />
-    <ClCompile Include="discord-rpc\src\discord_rpc.cpp" />
-    <ClCompile Include="discord-rpc\src\dllmain.cpp" />
-    <ClCompile Include="discord-rpc\src\rpc_connection.cpp" />
-    <ClCompile Include="discord-rpc\src\serialization.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{81b0d6d6-84e6-40c1-8dbd-47cbcb3051ad}</ProjectGuid>
-    <RootNamespace>discord-rpc</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./discord-rpc/include;./discord-rpc/thirdparty/rapidjson-1.1.0/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/3rdparty/discord-rpc/discord-rpc.vcxproj.filters b/3rdparty/discord-rpc/discord-rpc.vcxproj.filters
deleted file mode 100644
index 9bac920a6d..0000000000
--- a/3rdparty/discord-rpc/discord-rpc.vcxproj.filters
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header files">
-      <UniqueIdentifier>{719448a4-8eab-4e75-b6b7-687e2b217490}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files">
-      <UniqueIdentifier>{7c0d57b3-e2ef-45c2-aa2d-2765e5c73279}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="discord-rpc\src\backoff.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="discord-rpc\src\connection.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="discord-rpc\src\msg_queue.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="discord-rpc\src\rpc_connection.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="discord-rpc\src\serialization.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="discord-rpc\include\discord_register.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="discord-rpc\include\discord_rpc.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="discord-rpc\src\connection_win.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="discord-rpc\src\discord_register_win.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="discord-rpc\src\discord_rpc.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="discord-rpc\src\dllmain.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="discord-rpc\src\rpc_connection.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="discord-rpc\src\serialization.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/3rdparty/discord-rpc/include/discord_register.h b/3rdparty/discord-rpc/include/discord_register.h
new file mode 100644
index 0000000000..16fb42f328
--- /dev/null
+++ b/3rdparty/discord-rpc/include/discord_register.h
@@ -0,0 +1,26 @@
+#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
+#else
+#define DISCORD_EXPORT
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+DISCORD_EXPORT void Discord_Register(const char* applicationId, const char* command);
+DISCORD_EXPORT void Discord_RegisterSteamGame(const char* applicationId, const char* steamId);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/3rdparty/discord-rpc/include/discord_rpc.h b/3rdparty/discord-rpc/include/discord_rpc.h
new file mode 100644
index 0000000000..3e1441e058
--- /dev/null
+++ b/3rdparty/discord-rpc/include/discord_rpc.h
@@ -0,0 +1,87 @@
+#pragma once
+#include <stdint.h>
+
+// clang-format off
+
+#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
+#else
+#  define DISCORD_EXPORT
+#endif
+
+// clang-format on
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct DiscordRichPresence {
+    const char* state;   /* max 128 bytes */
+    const char* details; /* max 128 bytes */
+    int64_t startTimestamp;
+    int64_t endTimestamp;
+    const char* largeImageKey;  /* max 32 bytes */
+    const char* largeImageText; /* max 128 bytes */
+    const char* smallImageKey;  /* max 32 bytes */
+    const char* smallImageText; /* max 128 bytes */
+    const char* partyId;        /* max 128 bytes */
+    int partySize;
+    int partyMax;
+    const char* matchSecret;    /* max 128 bytes */
+    const char* joinSecret;     /* max 128 bytes */
+    const char* spectateSecret; /* max 128 bytes */
+    int8_t instance;
+} DiscordRichPresence;
+
+typedef struct DiscordUser {
+    const char* userId;
+    const char* username;
+    const char* discriminator;
+    const char* avatar;
+} DiscordUser;
+
+typedef struct DiscordEventHandlers {
+    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 DiscordUser* request);
+} DiscordEventHandlers;
+
+#define DISCORD_REPLY_NO 0
+#define DISCORD_REPLY_YES 1
+#define DISCORD_REPLY_IGNORE 2
+
+DISCORD_EXPORT void Discord_Initialize(const char* applicationId,
+                                       DiscordEventHandlers* handlers,
+                                       int autoRegister,
+                                       const char* optionalSteamId);
+DISCORD_EXPORT void Discord_Shutdown(void);
+
+/* checks for incoming messages, dispatches callbacks */
+DISCORD_EXPORT void Discord_RunCallbacks(void);
+
+/* If you disable the lib starting its own io thread, you'll need to call this from your own */
+#ifdef DISCORD_DISABLE_IO_THREAD
+DISCORD_EXPORT void Discord_UpdateConnection(void);
+#endif
+
+DISCORD_EXPORT void Discord_UpdatePresence(const DiscordRichPresence* presence);
+DISCORD_EXPORT void Discord_ClearPresence(void);
+
+DISCORD_EXPORT void Discord_Respond(const char* userid, /* DISCORD_REPLY_ */ int reply);
+
+DISCORD_EXPORT void Discord_UpdateHandlers(DiscordEventHandlers* handlers);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
diff --git a/3rdparty/discord-rpc/lib/discord-rpc.lib b/3rdparty/discord-rpc/lib/discord-rpc.lib
new file mode 100644
index 0000000000..2f75226ca6
Binary files /dev/null and b/3rdparty/discord-rpc/lib/discord-rpc.lib differ
diff --git a/3rdparty/discord-rpc/lib/libdiscord-rpc-linux.a b/3rdparty/discord-rpc/lib/libdiscord-rpc-linux.a
new file mode 100644
index 0000000000..7297c5637b
Binary files /dev/null and b/3rdparty/discord-rpc/lib/libdiscord-rpc-linux.a differ
diff --git a/3rdparty/discord-rpc/lib/libdiscord-rpc-mac.a b/3rdparty/discord-rpc/lib/libdiscord-rpc-mac.a
new file mode 100644
index 0000000000..4da36ac6ab
Binary files /dev/null and b/3rdparty/discord-rpc/lib/libdiscord-rpc-mac.a differ
diff --git a/3rdparty/ffmpeg b/3rdparty/ffmpeg
index ec6367d3ba..e5fb13bbb0 160000
--- a/3rdparty/ffmpeg
+++ b/3rdparty/ffmpeg
@@ -1 +1 @@
-Subproject commit ec6367d3ba9d0d57b9d22d4b87da8144acaf428f
+Subproject commit e5fb13bbb07ac3ba2e1998e2f5688f3714870d93
diff --git a/3rdparty/flatbuffers b/3rdparty/flatbuffers
index 595bf0007a..9e7e8cbe9f 160000
--- a/3rdparty/flatbuffers
+++ b/3rdparty/flatbuffers
@@ -1 +1 @@
-Subproject commit 595bf0007ab1929570c7671f091313c8fc20644e
+Subproject commit 9e7e8cbe9f675123dd41b7c62868acad39188cae
diff --git a/3rdparty/fusion/CMakeLists.txt b/3rdparty/fusion/CMakeLists.txt
deleted file mode 100644
index c58b2dfe9f..0000000000
--- a/3rdparty/fusion/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# To avoid python numpy dependency in debug build, force release build of this library
-set(ORIG_BUILD_TYPE ${CMAKE_BUILD_TYPE})
-set(CMAKE_BUILD_TYPE Release)
-add_subdirectory(fusion EXCLUDE_FROM_ALL)
-set(CMAKE_BUILD_TYPE ${ORIG_BUILD_TYPE})
diff --git a/3rdparty/fusion/fusion b/3rdparty/fusion/fusion
deleted file mode 160000
index 066d4a63b2..0000000000
--- a/3rdparty/fusion/fusion
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 066d4a63b2c714b20b0a8073a01fda7c5c6763f6
diff --git a/3rdparty/fusion/fusion.vcxproj b/3rdparty/fusion/fusion.vcxproj
deleted file mode 100644
index 71e669be00..0000000000
--- a/3rdparty/fusion/fusion.vcxproj
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="fusion\Fusion\Fusion.h" />
-    <ClInclude Include="fusion\Fusion\FusionAhrs.h" />
-    <ClInclude Include="fusion\Fusion\FusionAxes.h" />
-    <ClInclude Include="fusion\Fusion\FusionCalibration.h" />
-    <ClInclude Include="fusion\Fusion\FusionCompass.h" />
-    <ClInclude Include="fusion\Fusion\FusionConvention.h" />
-    <ClInclude Include="fusion\Fusion\FusionMath.h" />
-    <ClInclude Include="fusion\Fusion\FusionOffset.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="fusion\Fusion\FusionAhrs.c" />
-    <ClCompile Include="fusion\Fusion\FusionCompass.c" />
-    <ClCompile Include="fusion\Fusion\FusionOffset.c" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <RootNamespace>Fusion</RootNamespace>
-    <ProjectGuid>{3C67A2FF-4710-402A-BE3E-31B0CB0576DF}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-  </PropertyGroup>
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/3rdparty/fusion/fusion.vcxproj.filters b/3rdparty/fusion/fusion.vcxproj.filters
deleted file mode 100644
index 85764a4f97..0000000000
--- a/3rdparty/fusion/fusion.vcxproj.filters
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="fusion\Fusion\Fusion.h" />
-    <ClInclude Include="fusion\Fusion\FusionAhrs.h" />
-    <ClInclude Include="fusion\Fusion\FusionAxes.h" />
-    <ClInclude Include="fusion\Fusion\FusionCalibration.h" />
-    <ClInclude Include="fusion\Fusion\FusionCompass.h" />
-    <ClInclude Include="fusion\Fusion\FusionConvention.h" />
-    <ClInclude Include="fusion\Fusion\FusionMath.h" />
-    <ClInclude Include="fusion\Fusion\FusionOffset.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="fusion\Fusion\FusionAhrs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="fusion\Fusion\FusionCompass.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="fusion\Fusion\FusionOffset.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/3rdparty/glslang/glslang b/3rdparty/glslang/glslang
index fc9889c889..ae2a562936 160000
--- a/3rdparty/glslang/glslang
+++ b/3rdparty/glslang/glslang
@@ -1 +1 @@
-Subproject commit fc9889c889561c5882e83819dcaffef5ed45529b
+Subproject commit ae2a562936cc8504c9ef2757cceaff163147834f
diff --git a/3rdparty/glslang/glslang.vcxproj b/3rdparty/glslang/glslang.vcxproj
index 298fd149c6..a305e3ec01 100644
--- a/3rdparty/glslang/glslang.vcxproj
+++ b/3rdparty/glslang/glslang.vcxproj
@@ -38,62 +38,27 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <CmakeGenerator>"Visual Studio $(VisualStudioVersion.Substring(0,2))"</CmakeGenerator>
-    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Release" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DGLSLANG_TESTS=OFF -DENABLE_GLSLANG_BINARIES=OFF -DBUILD_EXTERNAL=OFF -DENABLE_SPVREMAPPER=OFF -DENABLE_HLSL=OFF -DENABLE_OPT=OFF -S glslang -B "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
-    </CmakeReleaseCLI>
-    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug -DGLSLANG_TESTS=OFF -DENABLE_GLSLANG_BINARIES=OFF -DBUILD_EXTERNAL=OFF -DENABLE_SPVREMAPPER=OFF -DENABLE_HLSL=OFF -DENABLE_OPT=OFF -S glslang -B "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
-    </CmakeDebugCLI>
-    <CmakeCopyCLI>
-      echo Copying..
-      mkdir "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\$(ProjectName)"
-      copy "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\SPIRV\$(CONFIGURATION)\*.lib" "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\$(ProjectName)"
-      copy "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\glslang\OSDependent\Windows\$(CONFIGURATION)\*.lib" "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\$(ProjectName)"
-      copy "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\glslang\$(CONFIGURATION)\*.lib" "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\$(ProjectName)"
-    </CmakeCopyCLI>
-    <CmakeCleanCLI>
-      echo Cleaning..
-      rmdir /s /q "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\$(ProjectName)"
-      rmdir /s /q "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
-    </CmakeCleanCLI>
+    <CmakeReleaseCLI>cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Release" -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -S glslang -B build</CmakeReleaseCLI>
+    <CmakeDebugCLI>cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Debug" -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -S glslang -B build</CmakeDebugCLI>
     <PropsAbsPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\buildfiles\msvc\common_default.props'))</PropsAbsPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-    <NMakeBuildCommandLine>
-      $(CmakeReleaseCLI)
-      msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
-      $(CmakeCopyCLI)
-    </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>
-      $(CmakeReleaseCLI)
-      msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
-      $(CmakeCopyCLI)
-    </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>
-      $(CmakeReleaseCLI)
-      msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
-      $(CmakeCleanCLI)
-    </NMakeCleanCommandLine>
+    <NMakeBuildCommandLine>$(CmakeReleaseCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>$(CmakeReleaseCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>$(CmakeReleaseCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeCleanCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-    <NMakeBuildCommandLine>
-      $(CmakeDebugCLI)
-      msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
-      $(CmakeCopyCLI)
+    <NMakeBuildCommandLine>$(CmakeDebugCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
     </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>
-      $(CmakeDebugCLI)
-      msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
-      $(CmakeCopyCLI)
+    <NMakeReBuildCommandLine>$(CmakeDebugCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
     </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>
-      $(CmakeDebugCLI)
-      msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
-      $(CmakeCleanCLI)
+    <NMakeCleanCommandLine>$(CmakeDebugCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
     </NMakeCleanCommandLine>
   </PropertyGroup>
   <ItemDefinitionGroup>
diff --git a/3rdparty/hidapi/CMakeLists.txt b/3rdparty/hidapi/CMakeLists.txt
index e1e36ac13e..da0a8e1907 100644
--- a/3rdparty/hidapi/CMakeLists.txt
+++ b/3rdparty/hidapi/CMakeLists.txt
@@ -1,22 +1,25 @@
 # hidapi
-set(BUILD_SHARED_LIBS FALSE CACHE BOOL "Don't build shared libs")
-set(HIDAPI_INSTALL_TARGETS FALSE CACHE BOOL "Don't install anything")
-
-if(CMAKE_SYSTEM MATCHES "Linux")
-	set(HIDAPI_WITH_LIBUSB FALSE CACHE BOOL "Don't build with libusb for linux")
-endif()
-
 add_library(3rdparty_hidapi INTERFACE)
-add_subdirectory(hidapi EXCLUDE_FROM_ALL)
+target_include_directories(3rdparty_hidapi INTERFACE hidapi/hidapi)
 
 if(APPLE)
-	target_link_libraries(3rdparty_hidapi INTERFACE hidapi_darwin "-framework CoreFoundation" "-framework IOKit")
+	add_subdirectory(hidapi/mac EXCLUDE_FROM_ALL)
+	target_include_directories(hidapi-mac PUBLIC hidapi/hidapi)
+
+	target_link_libraries(3rdparty_hidapi INTERFACE hidapi-mac "-framework CoreFoundation" "-framework IOKit")
 elseif(CMAKE_SYSTEM MATCHES "Linux")
+	add_subdirectory(hidapi/linux EXCLUDE_FROM_ALL)
+	target_include_directories(hidapi-hidraw PUBLIC hidapi/hidapi)
+
 	target_link_libraries(3rdparty_hidapi INTERFACE hidapi-hidraw udev)
 elseif(WIN32)
-	target_link_libraries(3rdparty_hidapi INTERFACE hidapi::hidapi hidapi::include Shlwapi.lib)
-elseif(ANDROID)
-	target_link_libraries(3rdparty_hidapi INTERFACE hidapi::libusb)
+	add_subdirectory(hidapi/windows EXCLUDE_FROM_ALL)
+	target_include_directories(hidapi-hid PUBLIC hidapi/hidapi)
+
+	target_link_libraries(3rdparty_hidapi INTERFACE hidapi-hid Shlwapi.lib)
 else()
+	add_subdirectory(hidapi/libusb EXCLUDE_FROM_ALL)
+	target_include_directories(hidapi-libusb PUBLIC hidapi/hidapi)
+
 	target_link_libraries(3rdparty_hidapi INTERFACE hidapi-libusb usb)
 endif()
diff --git a/3rdparty/hidapi/hidapi b/3rdparty/hidapi/hidapi
index f42423643e..01f601a150 160000
--- a/3rdparty/hidapi/hidapi
+++ b/3rdparty/hidapi/hidapi
@@ -1 +1 @@
-Subproject commit f42423643ec9011c98cccc0bb790722bbbd3f30b
+Subproject commit 01f601a1509bf9c67819fbf521df39644bab52d5
diff --git a/3rdparty/hidapi/hidapi.vcxproj b/3rdparty/hidapi/hidapi.vcxproj
index 6f6dc198e2..89dd74c0a8 100644
--- a/3rdparty/hidapi/hidapi.vcxproj
+++ b/3rdparty/hidapi/hidapi.vcxproj
@@ -44,13 +44,13 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)lib/</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)lib/</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -101,17 +101,6 @@
   <ItemGroup>
     <ClInclude Include="hidapi\hidapi\hidapi.h" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="hidapi\linux\hid.c" />
-    <None Include="hidapi\mac\hid.c" />
-    <None Include="hidapi\windows\hidapi_descriptor_reconstruct.c" />
-    <None Include="hidapi\mac\hidapi_darwin.h" />
-    <None Include="hidapi\windows\hidapi_descriptor_reconstruct.h" />
-    <None Include="hidapi\windows\hidapi_hidclass.h" />
-    <None Include="hidapi\windows\hidapi_hidpi.h" />
-    <None Include="hidapi\windows\hidapi_hidsdi.h" />
-    <None Include="hidapi\windows\hidapi_winapi.h" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/3rdparty/hidapi/hidapi.vcxproj.filters b/3rdparty/hidapi/hidapi.vcxproj.filters
index 91646f10b4..74f1b00db0 100644
--- a/3rdparty/hidapi/hidapi.vcxproj.filters
+++ b/3rdparty/hidapi/hidapi.vcxproj.filters
@@ -24,33 +24,4 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="hidapi\windows\hidapi_descriptor_reconstruct.c">
-      <Filter>Source Files</Filter>
-    </None>
-    <None Include="hidapi\linux\hid.c">
-      <Filter>Source Files</Filter>
-    </None>
-    <None Include="hidapi\mac\hid.c">
-      <Filter>Source Files</Filter>
-    </None>
-    <None Include="hidapi\windows\hidapi_descriptor_reconstruct.h">
-      <Filter>Header Files</Filter>
-    </None>
-    <None Include="hidapi\windows\hidapi_hidclass.h">
-      <Filter>Header Files</Filter>
-    </None>
-    <None Include="hidapi\windows\hidapi_hidpi.h">
-      <Filter>Header Files</Filter>
-    </None>
-    <None Include="hidapi\windows\hidapi_hidsdi.h">
-      <Filter>Header Files</Filter>
-    </None>
-    <None Include="hidapi\windows\hidapi_winapi.h">
-      <Filter>Header Files</Filter>
-    </None>
-    <None Include="hidapi\mac\hidapi_darwin.h">
-      <Filter>Header Files</Filter>
-    </None>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/3rdparty/libpng/CMakeLists.txt b/3rdparty/libpng/CMakeLists.txt
index f24c2c9709..d1c3b58bcd 100644
--- a/3rdparty/libpng/CMakeLists.txt
+++ b/3rdparty/libpng/CMakeLists.txt
@@ -2,13 +2,14 @@
 # Select the version of libpng to use, default is builtin
 if (NOT USE_SYSTEM_LIBPNG)
 	# We use libpng's static library and don't need to build the shared library and run the tests
-	set(PNG_SHARED OFF CACHE BOOL "Build shared lib")
-	set(PNG_TESTS OFF CACHE BOOL "Build libpng tests")
+	set(PNG_SHARED OFF CACHE BOOL "Build shared lib" FORCE)
+	set(PNG_TESTS OFF CACHE BOOL "Build libpng tests" FORCE)
+	set(PNG_BUILD_ZLIB ON CACHE BOOL "ZLIB is already build or package is found" FORCE)
 	set(SKIP_INSTALL_ALL ON)
 	add_subdirectory(libpng EXCLUDE_FROM_ALL)
 	target_include_directories(png_static INTERFACE "${libpng_BINARY_DIR}" "${libpng_SOURCE_DIR}")
 
-	set(LIBPNG_TARGET png_static PARENT_SCOPE)
+	set(LIBPNG_TARGET png_static PARENT_SCOPE)	
 else()
 	find_package(PNG REQUIRED)
 
diff --git a/3rdparty/libpng/libpng b/3rdparty/libpng/libpng
index 2b978915d8..a40189cf88 160000
--- a/3rdparty/libpng/libpng
+++ b/3rdparty/libpng/libpng
@@ -1 +1 @@
-Subproject commit 2b978915d82377df13fcbb1fb56660195ded868a
+Subproject commit a40189cf881e9f0db80511c382292a5604c3c3d1
diff --git a/3rdparty/libpng/libpng.vcxproj b/3rdparty/libpng/libpng.vcxproj
index 7e781065a6..658a9acf5f 100644
--- a/3rdparty/libpng/libpng.vcxproj
+++ b/3rdparty/libpng/libpng.vcxproj
@@ -1,12 +1,12 @@
 <?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|x64">
-      <Configuration>Debug</Configuration>
+    <ProjectConfiguration Include="Debug Library|x64">
+      <Configuration>Debug Library</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
+    <ProjectConfiguration Include="Release Library|x64">
+      <Configuration>Release Library</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -19,11 +19,11 @@
   <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -33,28 +33,28 @@
   </PropertyGroup>
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|x64'">
     <LinkIncremental>false</LinkIncremental>
     <CustomBuildBeforeTargets />
     <TargetName>$(ProjectName)16</TargetName>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)lib/</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|x64'">
     <LinkIncremental>false</LinkIncremental>
     <CustomBuildBeforeTargets />
     <TargetName>$(ProjectName)16</TargetName>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)lib/</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|x64'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>$(WarningLevel)</WarningLevel>
@@ -68,28 +68,32 @@
       <FloatingPointExceptions>false</FloatingPointExceptions>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
       <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
+      <BrowseInformation>true</BrowseInformation>
       <CompileAs>CompileAsC</CompileAs>
       <StringPooling>true</StringPooling>
       <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
       <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|x64'">
     <ClCompile>
       <WarningLevel>$(WarningLevel)</WarningLevel>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FloatingPointExceptions>false</FloatingPointExceptions>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
       <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
+      <BrowseInformation>true</BrowseInformation>
       <CompileAs>CompileAsC</CompileAs>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
@@ -111,8 +115,8 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="libpng\png.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Library|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="libpng\pngerror.c" />
     <ClCompile Include="libpng\pngget.c" />
@@ -131,8 +135,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="libpng\scripts\pngwin.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Library|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Library|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/3rdparty/libpng/pnglibconf.vcxproj b/3rdparty/libpng/pnglibconf.vcxproj
index 6c43778af8..e4a22c8af6 100644
--- a/3rdparty/libpng/pnglibconf.vcxproj
+++ b/3rdparty/libpng/pnglibconf.vcxproj
@@ -32,8 +32,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <CustomBuildBeforeTargets>Build</CustomBuildBeforeTargets>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
diff --git a/3rdparty/libsdl-org/CMakeLists.txt b/3rdparty/libsdl-org/CMakeLists.txt
deleted file mode 100644
index ba59cec8f7..0000000000
--- a/3rdparty/libsdl-org/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-option(SDL_SHARED "Build a shared version of the library" OFF)
-option(SDL_STATIC "Build a static version of the library" ON)
-option(SDL_TEST_LIBRARY "Build the SDL3_test library" OFF)
-add_subdirectory(SDL EXCLUDE_FROM_ALL)
diff --git a/3rdparty/libsdl-org/SDL b/3rdparty/libsdl-org/SDL
deleted file mode 160000
index c9a6709bd2..0000000000
--- a/3rdparty/libsdl-org/SDL
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c9a6709bd21750f1ad9597be21abace78c6378c9
diff --git a/3rdparty/libsdl-org/SDL.vcxproj b/3rdparty/libsdl-org/SDL.vcxproj
deleted file mode 100644
index 81b7d853a5..0000000000
--- a/3rdparty/libsdl-org/SDL.vcxproj
+++ /dev/null
@@ -1,540 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="SDL\include\SDL3\SDL_begin_code.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_camera.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_close_code.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_assert.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_atomic.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_audio.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_bits.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_blendmode.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_clipboard.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_copying.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_cpuinfo.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_egl.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_endian.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_error.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_events.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_filesystem.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_gamepad.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_gpu.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_guid.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_haptic.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_hints.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_hidapi.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_asyncio.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_joystick.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_keyboard.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_keycode.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_loadso.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_locale.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_log.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_main.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_messagebox.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_metal.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_misc.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_mouse.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_mutex.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_opengl.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_opengl_glext.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_opengles.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_opengles2.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_gl2.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_gl2ext.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_gl2platform.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_khrplatform.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_pen.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_pixels.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_platform.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_platform_defines.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_power.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_process.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_properties.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_rect.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_render.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_revision.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_iostream.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_scancode.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_sensor.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_stdinc.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_storage.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_surface.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_system.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_test.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_test_assert.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_test_common.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_test_compare.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_test_crc32.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_test_font.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_test_fuzzer.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_test_harness.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_test_log.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_test_md5.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_test_memory.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_thread.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_time.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_timer.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_touch.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_version.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_video.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_vulkan.h" />
-    <ClInclude Include="SDL\src\audio\directsound\SDL_directsound.h" />
-    <ClInclude Include="SDL\src\audio\disk\SDL_diskaudio.h" />
-    <ClInclude Include="SDL\src\audio\dummy\SDL_dummyaudio.h" />
-    <ClInclude Include="SDL\src\audio\SDL_audio_c.h" />
-    <ClInclude Include="SDL\src\audio\SDL_audiodev_c.h" />
-    <ClInclude Include="SDL\src\audio\SDL_sysaudio.h" />
-    <ClInclude Include="SDL\src\audio\SDL_audioqueue.h" />
-    <ClInclude Include="SDL\src\audio\SDL_audioresample.h" />
-    <ClInclude Include="SDL\src\audio\SDL_wave.h" />
-    <ClInclude Include="SDL\src\audio\wasapi\SDL_wasapi.h" />
-    <ClInclude Include="SDL\src\camera\SDL_camera_c.h" />
-    <ClInclude Include="SDL\src\camera\SDL_syscamera.h" />
-    <ClInclude Include="SDL\src\core\windows\SDL_directx.h" />
-    <ClInclude Include="SDL\src\core\windows\SDL_gameinput.h" />
-    <ClInclude Include="SDL\src\core\windows\SDL_hid.h" />
-    <ClInclude Include="SDL\src\core\windows\SDL_immdevice.h" />
-    <ClInclude Include="SDL\src\core\windows\SDL_windows.h" />
-    <ClInclude Include="SDL\src\core\windows\SDL_xinput.h" />
-    <ClInclude Include="SDL\src\cpuinfo\SDL_cpuinfo_c.h" />
-    <ClInclude Include="SDL\src\dynapi\SDL_dynapi.h" />
-    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_overrides.h" />
-    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_procs.h" />
-    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_unsupported.h" />
-    <ClInclude Include="SDL\src\events\blank_cursor.h" />
-    <ClInclude Include="SDL\src\events\default_cursor.h" />
-    <ClInclude Include="SDL\src\events\scancodes_windows.h" />
-    <ClInclude Include="SDL\src\events\SDL_categories_c.h" />
-    <ClInclude Include="SDL\src\events\SDL_clipboardevents_c.h" />
-    <ClInclude Include="SDL\src\events\SDL_displayevents_c.h" />
-    <ClInclude Include="SDL\src\events\SDL_dropevents_c.h" />
-    <ClInclude Include="SDL\src\events\SDL_events_c.h" />
-    <ClInclude Include="SDL\src\events\SDL_eventwatch_c.h" />
-    <ClInclude Include="SDL\src\events\SDL_keyboard_c.h" />
-    <ClInclude Include="SDL\src\events\SDL_keymap_c.h" />
-    <ClInclude Include="SDL\src\events\SDL_mouse_c.h" />
-    <ClInclude Include="SDL\src\events\SDL_touch_c.h" />
-    <ClInclude Include="SDL\src\events\SDL_windowevents_c.h" />
-    <ClInclude Include="SDL\src\filesystem\SDL_sysfilesystem.h" />
-    <ClInclude Include="SDL\src\gpu\SDL_sysgpu.h" />
-    <ClInclude Include="SDL\src\gpu\vulkan\SDL_gpu_vulkan_vkfuncs.h" />
-    <ClInclude Include="SDL\src\io\SDL_asyncio_c.h" />
-    <ClInclude Include="SDL\src\io\SDL_sysasyncio.h" />
-    <ClInclude Include="SDL\src\haptic\SDL_haptic_c.h" />
-    <ClInclude Include="SDL\src\haptic\SDL_syshaptic.h" />
-    <ClInclude Include="SDL\src\haptic\windows\SDL_dinputhaptic_c.h" />
-    <ClInclude Include="SDL\src\haptic\windows\SDL_windowshaptic_c.h" />
-    <ClInclude Include="SDL\src\hidapi\hidapi\hidapi.h" />
-    <ClInclude Include="SDL\src\hidapi\SDL_hidapi_c.h" />
-    <ClInclude Include="SDL\src\joystick\controller_type.h" />
-    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapijoystick_c.h" />
-    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.h" />
-    <ClInclude Include="SDL\src\joystick\SDL_gamepad_c.h" />
-    <ClInclude Include="SDL\src\joystick\SDL_gamepad_db.h" />
-    <ClInclude Include="SDL\src\joystick\SDL_joystick_c.h" />
-    <ClInclude Include="SDL\src\joystick\SDL_steam_virtual_gamepad.h" />
-    <ClInclude Include="SDL\src\joystick\SDL_sysjoystick.h" />
-    <ClInclude Include="SDL\src\joystick\usb_ids.h" />
-    <ClInclude Include="SDL\src\joystick\virtual\SDL_virtualjoystick_c.h" />
-    <ClInclude Include="SDL\src\joystick\windows\SDL_dinputjoystick_c.h" />
-    <ClInclude Include="SDL\src\joystick\windows\SDL_rawinputjoystick_c.h" />
-    <ClInclude Include="SDL\src\joystick\windows\SDL_windowsjoystick_c.h" />
-    <ClInclude Include="SDL\src\joystick\windows\SDL_xinputjoystick_c.h" />
-    <ClInclude Include="SDL\src\libm\math_libm.h" />
-    <ClInclude Include="SDL\src\libm\math_private.h" />
-    <ClInclude Include="SDL\src\locale\SDL_syslocale.h" />
-    <ClInclude Include="SDL\src\main\SDL_main_callbacks.h" />
-    <ClInclude Include="SDL\src\misc\SDL_sysurl.h" />
-    <ClInclude Include="SDL\src\power\SDL_syspower.h" />
-    <ClInclude Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.h" />
-    <ClInclude Include="SDL\src\render\direct3d12\SDL_shaders_d3d12.h" />
-    <ClInclude Include="SDL\src\render\direct3d\SDL_shaders_d3d.h" />
-    <ClInclude Include="SDL\src\render\opengles2\SDL_gles2funcs.h" />
-    <ClInclude Include="SDL\src\render\opengles2\SDL_shaders_gles2.h" />
-    <ClInclude Include="SDL\src\render\opengl\SDL_glfuncs.h" />
-    <ClInclude Include="SDL\src\render\opengl\SDL_shaders_gl.h" />
-    <ClInclude Include="SDL\src\render\SDL_d3dmath.h" />
-    <ClInclude Include="SDL\src\render\SDL_sysrender.h" />
-    <ClInclude Include="SDL\src\render\SDL_yuv_sw_c.h" />
-    <ClInclude Include="SDL\src\render\software\SDL_blendfillrect.h" />
-    <ClInclude Include="SDL\src\render\software\SDL_blendline.h" />
-    <ClInclude Include="SDL\src\render\software\SDL_blendpoint.h" />
-    <ClInclude Include="SDL\src\render\software\SDL_draw.h" />
-    <ClInclude Include="SDL\src\render\software\SDL_drawline.h" />
-    <ClInclude Include="SDL\src\render\software\SDL_drawpoint.h" />
-    <ClInclude Include="SDL\src\render\software\SDL_render_sw_c.h" />
-    <ClInclude Include="SDL\src\render\software\SDL_rotate.h" />
-    <ClInclude Include="SDL\src\render\software\SDL_triangle.h" />
-    <ClInclude Include="SDL\src\render\vulkan\SDL_shaders_vulkan.h" />
-    <ClInclude Include="SDL\src\SDL_assert_c.h" />
-    <ClInclude Include="SDL\src\SDL_error_c.h" />
-    <ClCompile Include="SDL\src\core\windows\pch.c" />
-    <ClCompile Include="SDL\src\camera\dummy\SDL_camera_dummy.c" />
-    <ClCompile Include="SDL\src\camera\mediafoundation\SDL_camera_mediafoundation.c" />
-    <ClCompile Include="SDL\src\camera\SDL_camera.c" />
-    <ClCompile Include="SDL\src\dialog\SDL_dialog.c" />
-    <ClCompile Include="SDL\src\dialog\SDL_dialog_utils.c" />
-    <ClCompile Include="SDL\src\filesystem\SDL_filesystem.c" />
-    <ClCompile Include="SDL\src\filesystem\windows\SDL_sysfsops.c" />
-    <ClCompile Include="SDL\src\io\windows\SDL_asyncio_windows_ioring.c" />
-    <ClCompile Include="SDL\src\gpu\SDL_gpu.c" />
-    <ClCompile Include="SDL\src\gpu\d3d12\SDL_gpu_d3d12.c" />
-    <ClCompile Include="SDL\src\gpu\vulkan\SDL_gpu_vulkan.c" />
-    <ClCompile Include="SDL\src\io\generic\SDL_asyncio_generic.c" />
-    <ClCompile Include="SDL\src\io\SDL_asyncio.c" />
-    <ClCompile Include="SDL\src\main\generic\SDL_sysmain_callbacks.c" />
-    <ClCompile Include="SDL\src\main\SDL_main_callbacks.c" />
-    <ClCompile Include="SDL\src\main\SDL_runapp.c" />
-    <ClCompile Include="SDL\src\main\windows\SDL_sysmain_runapp.c" />
-    <ClCompile Include="SDL\src\render\vulkan\SDL_render_vulkan.c" />
-    <ClCompile Include="SDL\src\render\vulkan\SDL_shaders_vulkan.c" />
-    <ClCompile Include="SDL\src\SDL_guid.c" />
-    <ClInclude Include="SDL\src\SDL_hashtable.h" />
-    <ClInclude Include="SDL\src\SDL_hints_c.h" />
-    <ClInclude Include="SDL\src\SDL_internal.h" />
-    <ClInclude Include="SDL\src\SDL_list.h" />
-    <ClInclude Include="SDL\src\SDL_log_c.h" />
-    <ClInclude Include="SDL\src\SDL_properties_c.h" />
-    <ClInclude Include="SDL\src\sensor\dummy\SDL_dummysensor.h" />
-    <ClInclude Include="SDL\src\sensor\SDL_sensor_c.h" />
-    <ClInclude Include="SDL\src\sensor\SDL_syssensor.h" />
-    <ClInclude Include="SDL\src\sensor\windows\SDL_windowssensor.h" />
-    <ClInclude Include="SDL\src\thread\SDL_systhread.h" />
-    <ClInclude Include="SDL\src\thread\SDL_thread_c.h" />
-    <ClInclude Include="SDL\src\thread\generic\SDL_syscond_c.h" />
-    <ClInclude Include="SDL\src\thread\windows\SDL_sysmutex_c.h" />
-    <ClInclude Include="SDL\src\thread\generic\SDL_sysrwlock_c.h" />
-    <ClInclude Include="SDL\src\thread\windows\SDL_systhread_c.h" />
-    <ClInclude Include="SDL\src\timer\SDL_timer_c.h" />
-    <ClInclude Include="SDL\src\video\dummy\SDL_nullevents_c.h" />
-    <ClInclude Include="SDL\src\video\dummy\SDL_nullframebuffer_c.h" />
-    <ClInclude Include="SDL\src\video\dummy\SDL_nullvideo.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_icd.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_layer.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_platform.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_sdk_platform.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_android.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_beta.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_core.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_directfb.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_fuchsia.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_ggp.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_ios.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_macos.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_metal.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_vi.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_wayland.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_win32.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xcb.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xlib.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xlib_xrandr.h" />
-    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenevents_c.h" />
-    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenframebuffer_c.h" />
-    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenopengles.h" />
-    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenvideo.h" />
-    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenvulkan.h" />
-    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenwindow.h" />
-    <ClInclude Include="SDL\src\video\SDL_blit.h" />
-    <ClInclude Include="SDL\src\video\SDL_blit_auto.h" />
-    <ClInclude Include="SDL\src\video\SDL_blit_copy.h" />
-    <ClInclude Include="SDL\src\video\SDL_blit_slow.h" />
-    <ClInclude Include="SDL\src\video\SDL_clipboard_c.h" />
-    <ClInclude Include="SDL\src\video\SDL_egl_c.h" />
-    <ClInclude Include="SDL\src\video\SDL_pixels_c.h" />
-    <ClInclude Include="SDL\src\video\SDL_rect_c.h" />
-    <ClInclude Include="SDL\src\video\SDL_RLEaccel_c.h" />
-    <ClInclude Include="SDL\src\video\SDL_stb_c.h" />
-    <ClInclude Include="SDL\src\video\SDL_surface_c.h" />
-    <ClInclude Include="SDL\src\video\SDL_sysvideo.h" />
-    <ClInclude Include="SDL\src\video\SDL_vulkan_internal.h" />
-    <ClInclude Include="SDL\src\video\SDL_yuv_c.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_msctf.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_surface_utils.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsclipboard.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsevents.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsframebuffer.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowskeyboard.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsgameinput.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsmessagebox.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsmodes.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsmouse.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsopengl.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsopengles.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsrawinput.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsshape.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsvideo.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsvulkan.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_windowswindow.h" />
-    <ClInclude Include="SDL\src\video\windows\wmmsg.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_common.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_internal.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx_func.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_sse.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_sse_func.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std_func.h" />
-    <ClCompile Include="SDL\src\atomic\SDL_atomic.c" />
-    <ClCompile Include="SDL\src\atomic\SDL_spinlock.c" />
-    <ClCompile Include="SDL\src\audio\directsound\SDL_directsound.c" />
-    <ClCompile Include="SDL\src\audio\disk\SDL_diskaudio.c" />
-    <ClCompile Include="SDL\src\audio\dummy\SDL_dummyaudio.c" />
-    <ClCompile Include="SDL\src\audio\SDL_audio.c" />
-    <ClCompile Include="SDL\src\audio\SDL_audiocvt.c" />
-    <ClCompile Include="SDL\src\audio\SDL_audiodev.c" />
-    <ClCompile Include="SDL\src\audio\SDL_audiotypecvt.c" />
-    <ClCompile Include="SDL\src\audio\SDL_audioqueue.c" />
-    <ClCompile Include="SDL\src\audio\SDL_audioresample.c" />
-    <ClCompile Include="SDL\src\audio\SDL_mixer.c" />
-    <ClCompile Include="SDL\src\audio\SDL_wave.c" />
-    <ClCompile Include="SDL\src\audio\wasapi\SDL_wasapi.c" />
-    <ClCompile Include="SDL\src\core\SDL_core_unsupported.c" />
-    <ClCompile Include="SDL\src\core\windows\SDL_gameinput.c" />
-    <ClCompile Include="SDL\src\core\windows\SDL_hid.c" />
-    <ClCompile Include="SDL\src\core\windows\SDL_immdevice.c" />
-    <ClCompile Include="SDL\src\core\windows\SDL_windows.c" />
-    <ClCompile Include="SDL\src\core\windows\SDL_xinput.c" />
-    <ClCompile Include="SDL\src\cpuinfo\SDL_cpuinfo.c" />
-    <ClCompile Include="SDL\src\dialog\windows\SDL_windowsdialog.c" />
-    <ClCompile Include="SDL\src\dynapi\SDL_dynapi.c" />
-    <ClCompile Include="SDL\src\events\SDL_categories.c" />
-    <ClCompile Include="SDL\src\events\SDL_clipboardevents.c" />
-    <ClCompile Include="SDL\src\events\SDL_displayevents.c" />
-    <ClCompile Include="SDL\src\events\SDL_dropevents.c" />
-    <ClCompile Include="SDL\src\events\SDL_events.c" />
-    <ClCompile Include="SDL\src\events\SDL_eventwatch.c" />
-    <ClCompile Include="SDL\src\events\SDL_keyboard.c" />
-    <ClCompile Include="SDL\src\events\SDL_keymap.c" />
-    <ClCompile Include="SDL\src\events\SDL_mouse.c" />
-    <ClCompile Include="SDL\src\events\SDL_pen.c" />
-    <ClCompile Include="SDL\src\events\SDL_quit.c" />
-    <ClCompile Include="SDL\src\events\SDL_touch.c" />
-    <ClCompile Include="SDL\src\events\SDL_windowevents.c" />
-    <ClCompile Include="SDL\src\io\SDL_iostream.c" />
-    <ClCompile Include="SDL\src\filesystem\windows\SDL_sysfilesystem.c" />
-    <ClCompile Include="SDL\src\haptic\dummy\SDL_syshaptic.c" />
-    <ClCompile Include="SDL\src\haptic\SDL_haptic.c" />
-    <ClCompile Include="SDL\src\haptic\windows\SDL_dinputhaptic.c" />
-    <ClCompile Include="SDL\src\haptic\windows\SDL_windowshaptic.c" />
-    <ClCompile Include="SDL\src\hidapi\SDL_hidapi.c" />
-    <ClCompile Include="SDL\src\joystick\controller_type.c" />
-    <ClCompile Include="SDL\src\joystick\dummy\SDL_sysjoystick.c" />
-    <ClCompile Include="SDL\src\joystick\gdk\SDL_gameinputjoystick.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapijoystick.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_combined.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_gamecube.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_luna.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps3.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps4.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps5.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_shield.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_stadia.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam_hori.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steamdeck.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_switch.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_wii.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
-    <ClCompile Include="SDL\src\joystick\SDL_gamepad.c" />
-    <ClCompile Include="SDL\src\joystick\SDL_joystick.c" />
-    <ClCompile Include="SDL\src\joystick\SDL_steam_virtual_gamepad.c" />
-    <ClCompile Include="SDL\src\joystick\virtual\SDL_virtualjoystick.c" />
-    <ClCompile Include="SDL\src\joystick\windows\SDL_dinputjoystick.c" />
-    <ClCompile Include="SDL\src\joystick\windows\SDL_rawinputjoystick.c" />
-    <ClCompile Include="SDL\src\joystick\windows\SDL_windowsjoystick.c" />
-    <ClCompile Include="SDL\src\joystick\windows\SDL_windows_gaming_input.c" />
-    <ClCompile Include="SDL\src\joystick\windows\SDL_xinputjoystick.c" />
-    <ClCompile Include="SDL\src\libm\s_modf.c" />
-    <ClCompile Include="SDL\src\loadso\windows\SDL_sysloadso.c" />
-    <ClCompile Include="SDL\src\locale\SDL_locale.c" />
-    <ClCompile Include="SDL\src\locale\windows\SDL_syslocale.c" />
-    <ClCompile Include="SDL\src\misc\SDL_url.c" />
-    <ClCompile Include="SDL\src\misc\windows\SDL_sysurl.c" />
-    <ClCompile Include="SDL\src\power\SDL_power.c" />
-    <ClCompile Include="SDL\src\power\windows\SDL_syspower.c" />
-    <ClCompile Include="SDL\src\process\SDL_process.c" />
-    <ClCompile Include="SDL\src\process\windows\SDL_windowsprocess.c" />
-    <ClCompile Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.c" />
-    <ClCompile Include="SDL\src\render\direct3d12\SDL_render_d3d12.c" />
-    <ClCompile Include="SDL\src\render\direct3d12\SDL_shaders_d3d12.c" />
-    <ClCompile Include="SDL\src\render\direct3d\SDL_render_d3d.c" />
-    <ClCompile Include="SDL\src\render\direct3d11\SDL_render_d3d11.c" />
-    <ClCompile Include="SDL\src\render\direct3d\SDL_shaders_d3d.c" />
-    <ClCompile Include="SDL\src\render\gpu\SDL_pipeline_gpu.c" />
-    <ClCompile Include="SDL\src\render\gpu\SDL_render_gpu.c" />
-    <ClCompile Include="SDL\src\render\gpu\SDL_shaders_gpu.c" />
-    <ClCompile Include="SDL\src\render\opengl\SDL_render_gl.c" />
-    <ClCompile Include="SDL\src\render\opengl\SDL_shaders_gl.c" />
-    <ClCompile Include="SDL\src\render\opengles2\SDL_render_gles2.c" />
-    <ClCompile Include="SDL\src\render\opengles2\SDL_shaders_gles2.c" />
-    <ClCompile Include="SDL\src\render\SDL_d3dmath.c" />
-    <ClCompile Include="SDL\src\render\SDL_render.c" />
-    <ClCompile Include="SDL\src\render\SDL_render_unsupported.c" />
-    <ClCompile Include="SDL\src\render\SDL_yuv_sw.c" />
-    <ClCompile Include="SDL\src\render\software\SDL_blendfillrect.c" />
-    <ClCompile Include="SDL\src\render\software\SDL_blendline.c" />
-    <ClCompile Include="SDL\src\render\software\SDL_blendpoint.c" />
-    <ClCompile Include="SDL\src\render\software\SDL_drawline.c" />
-    <ClCompile Include="SDL\src\render\software\SDL_drawpoint.c" />
-    <ClCompile Include="SDL\src\render\software\SDL_render_sw.c" />
-    <ClCompile Include="SDL\src\render\software\SDL_rotate.c" />
-    <ClCompile Include="SDL\src\render\software\SDL_triangle.c" />
-    <ClCompile Include="SDL\src\SDL.c" />
-    <ClCompile Include="SDL\src\SDL_assert.c" />
-    <ClCompile Include="SDL\src\SDL_error.c" />
-    <ClCompile Include="SDL\src\SDL_hashtable.c" />
-    <ClCompile Include="SDL\src\SDL_hints.c" />
-    <ClCompile Include="SDL\src\SDL_list.c" />
-    <ClCompile Include="SDL\src\SDL_log.c" />
-    <ClCompile Include="SDL\src\SDL_properties.c" />
-    <ClCompile Include="SDL\src\SDL_utils.c" />
-    <ClCompile Include="SDL\src\sensor\dummy\SDL_dummysensor.c" />
-    <ClCompile Include="SDL\src\sensor\SDL_sensor.c" />
-    <ClCompile Include="SDL\src\sensor\windows\SDL_windowssensor.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_crc16.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_crc32.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_getenv.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_iconv.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_malloc.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_memcpy.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_memmove.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_memset.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_mslibc.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_murmur3.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_qsort.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_random.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_stdlib.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_string.c" />
-    <ClCompile Include="SDL\src\stdlib\SDL_strtokr.c" />
-    <ClCompile Include="SDL\src\storage\generic\SDL_genericstorage.c" />
-    <ClCompile Include="SDL\src\storage\steam\SDL_steamstorage.c" />
-    <ClCompile Include="SDL\src\storage\SDL_storage.c" />
-    <ClCompile Include="SDL\src\thread\generic\SDL_syscond.c" />
-    <ClCompile Include="SDL\src\thread\generic\SDL_sysrwlock.c" />
-    <ClCompile Include="SDL\src\thread\SDL_thread.c" />
-    <ClCompile Include="SDL\src\thread\windows\SDL_syscond_cv.c" />
-    <ClCompile Include="SDL\src\thread\windows\SDL_sysmutex.c" />
-    <ClCompile Include="SDL\src\thread\windows\SDL_sysrwlock_srw.c" />
-    <ClCompile Include="SDL\src\thread\windows\SDL_syssem.c" />
-    <ClCompile Include="SDL\src\thread\windows\SDL_systhread.c" />
-    <ClCompile Include="SDL\src\thread\windows\SDL_systls.c" />
-    <ClCompile Include="SDL\src\timer\SDL_timer.c" />
-    <ClCompile Include="SDL\src\timer\windows\SDL_systimer.c" />
-    <ClCompile Include="SDL\src\time\SDL_time.c" />
-    <ClCompile Include="SDL\src\time\windows\SDL_systime.c" />
-    <ClCompile Include="SDL\src\tray\windows\SDL_tray.c" />
-    <ClCompile Include="SDL\src\tray\SDL_tray_utils.c" />
-    <ClCompile Include="SDL\src\video\dummy\SDL_nullevents.c" />
-    <ClCompile Include="SDL\src\video\dummy\SDL_nullframebuffer.c" />
-    <ClCompile Include="SDL\src\video\dummy\SDL_nullvideo.c" />
-    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenevents.c" />
-    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenframebuffer.c" />
-    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenopengles.c" />
-    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenvideo.c" />
-    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenvulkan.c" />
-    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenwindow.c" />
-    <ClCompile Include="SDL\src\video\SDL_blit.c" />
-    <ClCompile Include="SDL\src\video\SDL_blit_0.c" />
-    <ClCompile Include="SDL\src\video\SDL_blit_1.c" />
-    <ClCompile Include="SDL\src\video\SDL_blit_A.c" />
-    <ClCompile Include="SDL\src\video\SDL_blit_auto.c" />
-    <ClCompile Include="SDL\src\video\SDL_blit_copy.c" />
-    <ClCompile Include="SDL\src\video\SDL_blit_N.c" />
-    <ClCompile Include="SDL\src\video\SDL_blit_slow.c" />
-    <ClCompile Include="SDL\src\video\SDL_bmp.c" />
-    <ClCompile Include="SDL\src\video\SDL_clipboard.c" />
-    <ClCompile Include="SDL\src\video\SDL_egl.c" />
-    <ClCompile Include="SDL\src\video\SDL_fillrect.c" />
-    <ClCompile Include="SDL\src\video\SDL_pixels.c" />
-    <ClCompile Include="SDL\src\video\SDL_rect.c" />
-    <ClCompile Include="SDL\src\video\SDL_RLEaccel.c" />
-    <ClCompile Include="SDL\src\video\SDL_stb.c" />
-    <ClCompile Include="SDL\src\video\SDL_stretch.c" />
-    <ClCompile Include="SDL\src\video\SDL_surface.c" />
-    <ClCompile Include="SDL\src\video\SDL_video.c" />
-    <ClCompile Include="SDL\src\video\SDL_video_unsupported.c" />
-    <ClCompile Include="SDL\src\video\SDL_vulkan_utils.c" />
-    <ClCompile Include="SDL\src\video\SDL_yuv.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_surface_utils.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsclipboard.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsevents.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsframebuffer.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowskeyboard.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsgameinput.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsmessagebox.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsmodes.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsmouse.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsopengl.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsopengles.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsrawinput.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsshape.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsvideo.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsvulkan.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowswindow.c" />
-    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx.c" />
-    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_sse.c" />
-    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_std.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="SDL\src\core\windows\version.rc" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <IncludePath>SDL\src;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>SDL\include;SDL\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ProgramDatabase</DebugInformationFormat>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/3rdparty/libsdl-org/SDL.vcxproj.filters b/3rdparty/libsdl-org/SDL.vcxproj.filters
deleted file mode 100644
index 44d4e4ec9f..0000000000
--- a/3rdparty/libsdl-org/SDL.vcxproj.filters
+++ /dev/null
@@ -1,1592 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="API Headers">
-      <UniqueIdentifier>{395b3af0-33d0-411b-b153-de1676bf1ef8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="audio">
-      <UniqueIdentifier>{5a3e3167-75be-414f-8947-a5306df372b2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="atomic">
-      <UniqueIdentifier>{546d9ed1-988e-49d3-b1a5-e5b3d19de6c1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="core">
-      <UniqueIdentifier>{a56247ff-5108-4960-ba6a-6814fd1554ec}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="core\windows">
-      <UniqueIdentifier>{8880dfad-2a06-4e84-ab6e-6583641ad2d1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="cpuinfo">
-      <UniqueIdentifier>{2b996a7f-f3e9-4300-a97f-2c907bcd89a9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="dynapi">
-      <UniqueIdentifier>{5713d682-2bc7-4da4-bcf0-262a98f142eb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="events">
-      <UniqueIdentifier>{5e27e19f-b3f8-4e2d-b323-b00b2040ec86}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="io">
-      <UniqueIdentifier>{a3ab9cff-8495-4a5c-8af6-27e43199a712}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="filesystem">
-      <UniqueIdentifier>{377061e4-3856-4f05-b916-0d3b360df0f6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="filesystem\windows">
-      <UniqueIdentifier>{226a6643-1c65-4c7f-92aa-861313d974bb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="haptic">
-      <UniqueIdentifier>{ef859522-a7fe-4a00-a511-d6a9896adf5b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hidapi">
-      <UniqueIdentifier>{01fd2642-4493-4316-b548-fb829f4c9125}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="joystick">
-      <UniqueIdentifier>{cce7558f-590a-4f0a-ac0d-e579f76e588e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="libm">
-      <UniqueIdentifier>{7a53c9e4-d4bd-40ed-9265-1625df685121}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hidapi\hidapi">
-      <UniqueIdentifier>{4c7a051c-ce7c-426c-bf8c-9187827f9052}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="loadso">
-      <UniqueIdentifier>{97e2f79f-311b-42ea-81b2-e801649fdd93}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="loadso\windows">
-      <UniqueIdentifier>{baf97c8c-7e90-41e5-bff8-14051b8d3956}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="locale">
-      <UniqueIdentifier>{45e50d3a-56c9-4352-b811-0c60c49a2431}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="misc">
-      <UniqueIdentifier>{9d86e0ef-d6f6-4db2-bfc5-b3529406fa8d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="misc\windows">
-      <UniqueIdentifier>{b35fa13c-6ed2-4680-8c56-c7d71b76ceab}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="locale\windows">
-      <UniqueIdentifier>{61b61b31-9e26-4171-a3bb-b969f1889726}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="audio\directsound">
-      <UniqueIdentifier>{f63aa216-6ee7-4143-90d3-32be3787f276}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="audio\disk">
-      <UniqueIdentifier>{90bee923-89df-417f-a6c3-3e260a7dd54d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="audio\dummy">
-      <UniqueIdentifier>{4c8ad943-c2fb-4014-9ca3-041e0ad08426}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="audio\wasapi">
-      <UniqueIdentifier>{3d68ae70-a9ff-46cf-be69-069f0b02aca0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="haptic\windows">
-      <UniqueIdentifier>{ebc2fca3-3c26-45e3-815e-3e0581d5e226}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="haptic\dummy">
-      <UniqueIdentifier>{47c445a2-7014-4e15-9660-7c89a27dddcf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="joystick\dummy">
-      <UniqueIdentifier>{d008487d-6ed0-4251-848b-79a68e3c1459}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="joystick\gdk">
-      <UniqueIdentifier>{c9e8273e-13ae-47dc-bef8-8ad8e64c9a3e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="joystick\hidapi">
-      <UniqueIdentifier>{c9e8273e-13ae-47dc-bef8-8ad8e64c9a3d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="joystick\windows">
-      <UniqueIdentifier>{0b8e136d-56ae-47e7-9981-e863a57ac616}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="joystick\virtual">
-      <UniqueIdentifier>{bf3febd3-9328-43e8-b196-0fd3be8177dd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="video">
-      <UniqueIdentifier>{1a62dc68-52d2-4c07-9d81-d94dfe1d0d12}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="video\dummy">
-      <UniqueIdentifier>{e9f01b22-34b3-4380-ade6-0e96c74e9c90}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="video\yuv2rgb">
-      <UniqueIdentifier>{f674f22f-7841-4f3a-974e-c36b2d4823fc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="video\windows">
-      <UniqueIdentifier>{d7ad92de-4e55-4202-9b2b-1bd9a35fe4dc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="timer">
-      <UniqueIdentifier>{8311d79d-9ad5-4369-99fe-b2fb2659d402}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="timer\windows">
-      <UniqueIdentifier>{6c4dfb80-fdf9-497c-a6ff-3cd8f22efde9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="thread">
-      <UniqueIdentifier>{4810e35c-33cb-4da2-bfaf-452da20d3c9a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="thread\windows">
-      <UniqueIdentifier>{2cf93f1d-81fd-4bdc-998c-5e2fa43988bc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="thread\generic">
-      <UniqueIdentifier>{5752b7ab-2344-4f38-95ab-b5d3bc150315}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="stdlib">
-      <UniqueIdentifier>{7a0eae3d-f113-4914-b926-6816d1929250}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="sensor">
-      <UniqueIdentifier>{ee602cbf-96a2-4b0b-92a9-51d38a727411}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="sensor\dummy">
-      <UniqueIdentifier>{a812185b-9060-4a1c-8431-be4f66894626}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="sensor\windows">
-      <UniqueIdentifier>{31c16cdf-adc4-4950-8293-28ba530f3882}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="render">
-      <UniqueIdentifier>{add61b53-8144-47d6-bd67-3420a87c4905}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="render\direct3d">
-      <UniqueIdentifier>{e7cdcf36-b462-49c7-98b7-07ea7b3687f4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="render\direct3d11">
-      <UniqueIdentifier>{82588eef-dcaa-4f69-b2a9-e675940ce54c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="render\opengl">
-      <UniqueIdentifier>{560239c3-8fa1-4d23-a81a-b8408b2f7d3f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="render\opengles2">
-      <UniqueIdentifier>{81711059-7575-4ece-9e68-333b63e992c4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="render\software">
-      <UniqueIdentifier>{1e44970f-7535-4bfb-b8a5-ea0cea0349e0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="power">
-      <UniqueIdentifier>{1dd91224-1176-492b-a2cb-e26153394db0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="power\windows">
-      <UniqueIdentifier>{e3ecfe50-cf22-41d3-8983-2fead5164b47}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="video\khronos">
-      <UniqueIdentifier>{5521d22f-1e52-47a6-8c52-06a3b6bdefd7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="video\khronos\vulkan">
-      <UniqueIdentifier>{4755f3a6-49ac-46d6-86be-21f5c21f2197}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="render\direct3d12">
-      <UniqueIdentifier>{f48c2b17-1bee-4fec-a7c8-24cf619abe08}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="video\intrin">
-      <UniqueIdentifier>{653672cc-90ae-4eba-a256-6479f2c31804}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="main">
-      <UniqueIdentifier>{00001967ea2801028a046a722a070000}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="main\generic">
-      <UniqueIdentifier>{0000ddc7911820dbe64274d3654f0000}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="camera">
-      <UniqueIdentifier>{0000de1b75e1a954834693f1c81e0000}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="camera\dummy">
-      <UniqueIdentifier>{0000fc2700d453b3c8d79fe81e1c0000}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="camera\mediafoundation">
-      <UniqueIdentifier>{0000fbfe2d21e4f451142e7d0e870000}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="render\vulkan">
-      <UniqueIdentifier>{5115ba31-20f8-4eab-a8c5-6a572ab78ff7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="time">
-      <UniqueIdentifier>{00003288226ff86b99eee5b443e90000}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="time\windows">
-      <UniqueIdentifier>{0000d7fda065b13b0ca4ab262c380000}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="gpu">
-      <UniqueIdentifier>{098fbef9-d8a0-4b3b-b57b-d157d395335d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="dialog">
-      <UniqueIdentifier>{00008dfdfa0190856fbf3c7db52d0000}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="video\offscreen">
-      <UniqueIdentifier>{748cf015-00b8-4e71-ac48-02e947e4d93d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="main\windows">
-      <UniqueIdentifier>{00009d5ded166cc6c6680ec771a30000}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="io\generic">
-      <UniqueIdentifier>{00004d6806b6238cae0ed62db5440000}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="io\windows">
-      <UniqueIdentifier>{000028b2ea36d7190d13777a4dc70000}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="SDL\include\SDL3\SDL_begin_code.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_camera.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_close_code.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_assert.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_atomic.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_audio.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_bits.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_blendmode.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_clipboard.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_copying.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_cpuinfo.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_egl.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_endian.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_error.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_events.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_filesystem.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_gamepad.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_guid.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_haptic.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_hints.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_hidapi.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_asyncio.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_joystick.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_keyboard.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_keycode.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_loadso.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_locale.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_log.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_main.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_messagebox.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_mouse.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_mutex.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_opengl.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_opengl_glext.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_opengles.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_opengles2.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_gl2.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_gl2ext.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_gl2platform.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_khrplatform.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_pen.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_pixels.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_platform.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_platform_defines.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_power.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_process.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_properties.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_rect.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_render.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_revision.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_iostream.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_scancode.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_sensor.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_stdinc.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_surface.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_system.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_test.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_test_assert.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_test_common.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_test_compare.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_test_crc32.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_test_font.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_test_fuzzer.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_test_harness.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_test_log.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_test_md5.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_thread.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_timer.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_touch.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_version.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_video.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_vulkan.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\camera\SDL_camera_c.h">
-      <Filter>camera</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\camera\SDL_syscamera.h">
-      <Filter>camera</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\filesystem\SDL_sysfilesystem.h">
-      <Filter>filesystem</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\io\SDL_asyncio_c.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\io\SDL_sysasyncio.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\main\SDL_main_callbacks.h">
-      <Filter>main</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\SDL_error_c.h" />
-    <ClInclude Include="SDL\src\SDL_hashtable.h" />
-    <ClInclude Include="SDL\src\SDL_list.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_metal.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_misc.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_test_memory.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\audio\SDL_audio_c.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\audio\SDL_audiodev_c.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\audio\SDL_wave.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\audio\SDL_sysaudio.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\audio\SDL_audioqueue.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\audio\SDL_audioresample.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\core\windows\SDL_directx.h">
-      <Filter>core\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\core\windows\SDL_gameinput.h">
-      <Filter>core\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\core\windows\SDL_hid.h">
-      <Filter>core\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\core\windows\SDL_immdevice.h">
-      <Filter>core\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\core\windows\SDL_windows.h">
-      <Filter>core\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\core\windows\SDL_xinput.h">
-      <Filter>core\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\core\windows\SDL_directx.h">
-      <Filter>core\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\cpuinfo\SDL_cpuinfo_c.h">
-      <Filter>cpuinfo</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\dynapi\SDL_dynapi.h">
-      <Filter>dynapi</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_overrides.h">
-      <Filter>dynapi</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_procs.h">
-      <Filter>dynapi</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_unsupported.h">
-      <Filter>dynapi</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\events\SDL_clipboardevents_c.h">
-      <Filter>events</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\events\SDL_displayevents_c.h">
-      <Filter>events</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\events\SDL_dropevents_c.h">
-      <Filter>events</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\events\SDL_events_c.h">
-      <Filter>events</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\events\SDL_eventWatch_c.h">
-      <Filter>events</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\events\SDL_keyboard_c.h">
-      <Filter>events</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\events\SDL_keymap_c.h">
-      <Filter>events</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\events\SDL_mouse_c.h">
-      <Filter>events</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\events\SDL_touch_c.h">
-      <Filter>events</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\events\SDL_windowevents_c.h">
-      <Filter>events</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\events\blank_cursor.h">
-      <Filter>events</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\events\default_cursor.h">
-      <Filter>events</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\events\scancodes_windows.h">
-      <Filter>events</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\haptic\SDL_syshaptic.h">
-      <Filter>haptic</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\haptic\SDL_haptic_c.h">
-      <Filter>haptic</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\SDL_gamepad_c.h">
-      <Filter>joystick</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\SDL_gamepad_db.h">
-      <Filter>joystick</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\SDL_joystick_c.h">
-      <Filter>joystick</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\SDL_steam_virtual_gamepad.h">
-      <Filter>joystick</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\SDL_sysjoystick.h">
-      <Filter>joystick</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\controller_type.h">
-      <Filter>joystick</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\usb_ids.h">
-      <Filter>joystick</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\libm\math_libm.h">
-      <Filter>libm</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\libm\math_private.h">
-      <Filter>libm</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\hidapi\hidapi\hidapi.h">
-      <Filter>hidapi\hidapi</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\locale\SDL_syslocale.h">
-      <Filter>locale</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\misc\SDL_sysurl.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\audio\directsound\SDL_directsound.h">
-      <Filter>audio\directsound</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\audio\disk\SDL_diskaudio.h">
-      <Filter>audio\disk</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\audio\dummy\SDL_dummyaudio.h">
-      <Filter>audio\dummy</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\audio\wasapi\SDL_wasapi.h">
-      <Filter>audio\wasapi</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\haptic\windows\SDL_dinputhaptic_c.h">
-      <Filter>haptic\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\haptic\windows\SDL_windowshaptic_c.h">
-      <Filter>haptic\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapijoystick_c.h">
-      <Filter>joystick\hidapi</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.h">
-      <Filter>joystick\hidapi</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\windows\SDL_dinputjoystick_c.h">
-      <Filter>joystick\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\windows\SDL_rawinputjoystick_c.h">
-      <Filter>joystick\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\windows\SDL_windowsjoystick_c.h">
-      <Filter>joystick\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\windows\SDL_xinputjoystick_c.h">
-      <Filter>joystick\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\joystick\virtual\SDL_virtualjoystick_c.h">
-      <Filter>joystick\virtual</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_RLEaccel_c.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_surface_c.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_blit.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_blit_auto.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_blit_copy.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_blit_slow.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_clipboard_c.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_pixels_c.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_rect_c.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_sysvideo.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_egl_c.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_stb_c.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_yuv_c.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\SDL_vulkan_internal.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\dummy\SDL_nullevents_c.h">
-      <Filter>video\dummy</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\dummy\SDL_nullframebuffer_c.h">
-      <Filter>video\dummy</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\dummy\SDL_nullvideo.h">
-      <Filter>video\dummy</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb.h">
-      <Filter>video\yuv2rgb</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_sse_func.h">
-      <Filter>video\yuv2rgb</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std_func.h">
-      <Filter>video\yuv2rgb</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_surface_utils.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsclipboard.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsevents.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsframebuffer.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowskeyboard.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsgameinput.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsmessagebox.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsmodes.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsmouse.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsopengl.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsrawinput.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsshape.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsvideo.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsvulkan.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowswindow.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\wmmsg.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_msctf.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\windows\SDL_windowsopengles.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\timer\SDL_timer_c.h">
-      <Filter>timer</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\thread\SDL_thread_c.h">
-      <Filter>thread</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\thread\SDL_systhread.h">
-      <Filter>thread</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\thread\windows\SDL_sysmutex_c.h">
-      <Filter>thread\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\thread\windows\SDL_systhread_c.h">
-      <Filter>thread\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\thread\generic\SDL_syscond_c.h">
-      <Filter>thread\generic</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\sensor\SDL_sensor_c.h">
-      <Filter>sensor</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\sensor\SDL_syssensor.h">
-      <Filter>sensor</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\sensor\dummy\SDL_dummysensor.h">
-      <Filter>sensor\dummy</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\sensor\windows\SDL_windowssensor.h">
-      <Filter>sensor\windows</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\SDL_d3dmath.h">
-      <Filter>render</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\SDL_sysrender.h">
-      <Filter>render</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\SDL_yuv_sw_c.h">
-      <Filter>render</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\direct3d\SDL_shaders_d3d.h">
-      <Filter>render\direct3d</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.h">
-      <Filter>render\direct3d11</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\opengl\SDL_glfuncs.h">
-      <Filter>render\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\opengl\SDL_shaders_gl.h">
-      <Filter>render\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\opengles2\SDL_shaders_gles2.h">
-      <Filter>render\opengles2</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\opengles2\SDL_gles2funcs.h">
-      <Filter>render\opengles2</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\software\SDL_blendfillrect.h">
-      <Filter>render\software</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\software\SDL_blendline.h">
-      <Filter>render\software</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\software\SDL_blendpoint.h">
-      <Filter>render\software</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\software\SDL_draw.h">
-      <Filter>render\software</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\software\SDL_drawline.h">
-      <Filter>render\software</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\software\SDL_drawpoint.h">
-      <Filter>render\software</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\software\SDL_render_sw_c.h">
-      <Filter>render\software</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\software\SDL_rotate.h">
-      <Filter>render\software</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\render\software\SDL_triangle.h">
-      <Filter>render\software</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\power\SDL_syspower.h">
-      <Filter>power</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xlib_xrandr.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_icd.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_layer.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_platform.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_sdk_platform.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_android.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_beta.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_core.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_directfb.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_fuchsia.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_ggp.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_ios.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_macos.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_metal.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_vi.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_wayland.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_win32.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xcb.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xlib.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\SDL_assert_c.h" />
-    <ClInclude Include="SDL\src\SDL_hints_c.h" />
-    <ClInclude Include="SDL\src\SDL_internal.h" />
-    <ClInclude Include="SDL\src\SDL_log_c.h" />
-    <ClInclude Include="SDL\src\SDL_properties_c.h" />
-    <ClInclude Include="SDL\src\render\direct3d12\SDL_shaders_d3d12.h">
-      <Filter>render\direct3d12</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\hidapi\SDL_hidapi_c.h" />
-    <ClInclude Include="SDL\src\thread\generic\SDL_sysrwlock_c.h" />
-    <ClInclude Include="SDL\src\thread\generic\SDL_sysrwlock_c.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_common.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_internal.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx_func.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_sse.h" />
-    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std.h" />
-    <ClInclude Include="SDL\src\render\vulkan\SDL_shaders_vulkan.h">
-      <Filter>render\vulkan</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenevents_c.h">
-      <Filter>video\offscreen</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenframebuffer_c.h">
-      <Filter>video\offscreen</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenopengles.h">
-      <Filter>video\offscreen</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenvideo.h">
-      <Filter>video\offscreen</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenvulkan.h">
-      <Filter>video\offscreen</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenwindow.h">
-      <Filter>video\offscreen</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_gpu.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\gpu\SDL_sysgpu.h">
-      <Filter>gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\src\gpu\vulkan\SDL_gpu_vulkan_vkfuncs.h">
-      <Filter>gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="SDL\include\SDL3\SDL_storage.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_time.h" />
-    <ClInclude Include="SDL\src\events\SDL_categories_c.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="SDL\src\audio\wasapi\SDL_wasapi.c" />
-    <ClCompile Include="SDL\src\camera\dummy\SDL_camera_dummy.c">
-      <Filter>camera\dummy</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\camera\mediafoundation\SDL_camera_mediafoundation.c">
-      <Filter>camera\mediafoundation</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\camera\SDL_camera.c">
-      <Filter>camera</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\dialog\SDL_dialog.c">
-      <Filter>dialog</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\dialog\SDL_dialog_utils.c">
-      <Filter>dialog</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\filesystem\SDL_filesystem.c">
-      <Filter>filesystem</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\filesystem\windows\SDL_sysfsops.c">
-      <Filter>filesystem\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\io\generic\SDL_asyncio_generic.c">
-      <Filter>io\generic</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\io\SDL_asyncio.c">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\io\windows\SDL_asyncio_windows_ioring.c">
-      <Filter>io\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\main\generic\SDL_sysmain_callbacks.c">
-      <Filter>main\generic</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\main\SDL_main_callbacks.c">
-      <Filter>main</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\main\SDL_runapp.c">
-      <Filter>main</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\main\windows\SDL_sysmain_runapp.c">
-      <Filter>main\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\SDL.c" />
-    <ClCompile Include="SDL\src\SDL_assert.c" />
-    <ClCompile Include="SDL\src\SDL_error.c" />
-    <ClCompile Include="SDL\src\SDL_guid.c" />
-    <ClCompile Include="SDL\src\SDL_hashtable.c" />
-    <ClCompile Include="SDL\src\SDL_hints.c" />
-    <ClCompile Include="SDL\src\SDL_list.c" />
-    <ClCompile Include="SDL\src\SDL_properties.c" />
-    <ClCompile Include="SDL\src\SDL_utils.c" />
-    <ClCompile Include="SDL\src\audio\SDL_audio.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\audio\SDL_audiocvt.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\audio\SDL_audiodev.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\audio\SDL_audiotypecvt.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\audio\SDL_audioqueue.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\audio\SDL_audioresample.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\audio\SDL_wave.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\audio\SDL_mixer.c">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\atomic\SDL_atomic.c">
-      <Filter>atomic</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\atomic\SDL_spinlock.c">
-      <Filter>atomic</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\core\SDL_core_unsupported.c">
-      <Filter>core</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\core\windows\SDL_gameinput.c">
-      <Filter>core\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\core\windows\SDL_hid.c">
-      <Filter>core\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\core\windows\SDL_immdevice.c">
-      <Filter>core\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\core\windows\SDL_windows.c">
-      <Filter>core\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\core\windows\SDL_xinput.c">
-      <Filter>core\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\cpuinfo\SDL_cpuinfo.c">
-      <Filter>cpuinfo</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\dialog\windows\SDL_windowsdialog.c">
-      <Filter>dialog</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\dynapi\SDL_dynapi.c">
-      <Filter>dynapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\events\SDL_categories.c">
-      <Filter>events</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\events\SDL_clipboardevents.c">
-      <Filter>events</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\events\SDL_displayevents.c">
-      <Filter>events</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\events\SDL_dropevents.c">
-      <Filter>events</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\events\SDL_events.c">
-      <Filter>events</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\events\SDL_eventWatch.c">
-      <Filter>events</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\events\SDL_keyboard.c">
-      <Filter>events</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\events\SDL_keymap.c">
-      <Filter>events</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\events\SDL_mouse.c">
-      <Filter>events</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\events\SDL_pen.c">
-      <Filter>events</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\events\SDL_quit.c">
-      <Filter>events</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\events\SDL_touch.c">
-      <Filter>events</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\events\SDL_windowevents.c">
-      <Filter>events</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\io\SDL_iostream.c">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\filesystem\windows\SDL_sysfilesystem.c">
-      <Filter>filesystem\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\haptic\SDL_haptic.c">
-      <Filter>haptic</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\hidapi\SDL_hidapi.c">
-      <Filter>hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\controller_type.c">
-      <Filter>joystick</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\SDL_gamepad.c">
-      <Filter>joystick</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\SDL_joystick.c">
-      <Filter>joystick</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\SDL_steam_virtual_gamepad.c">
-      <Filter>joystick</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\libm\s_modf.c">
-      <Filter>libm</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\loadso\windows\SDL_sysloadso.c">
-      <Filter>loadso\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\misc\SDL_url.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\misc\windows\SDL_sysurl.c">
-      <Filter>misc\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\locale\windows\SDL_syslocale.c">
-      <Filter>locale\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\locale\SDL_locale.c">
-      <Filter>locale</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\audio\directsound\SDL_directsound.c">
-      <Filter>audio\directsound</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\audio\disk\SDL_diskaudio.c">
-      <Filter>audio\disk</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\audio\dummy\SDL_dummyaudio.c">
-      <Filter>audio\dummy</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\audio\wasapi\SDL_wasapi.c">
-      <Filter>audio\wasapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\haptic\windows\SDL_dinputhaptic.c">
-      <Filter>haptic\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\haptic\windows\SDL_windowshaptic.c">
-      <Filter>haptic\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\haptic\dummy\SDL_syshaptic.c">
-      <Filter>haptic\dummy</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\dummy\SDL_sysjoystick.c">
-      <Filter>joystick\dummy</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\gdk\SDL_gameinputjoystick.c">
-      <Filter>joystick\gdk</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_combined.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_gamecube.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_luna.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps3.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps4.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps5.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_shield.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_stadia.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam_hori.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steamdeck.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_switch.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_wii.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360w.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xboxone.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapijoystick.c">
-      <Filter>joystick\hidapi</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\windows\SDL_dinputjoystick.c">
-      <Filter>joystick\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\windows\SDL_rawinputjoystick.c">
-      <Filter>joystick\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\windows\SDL_windows_gaming_input.c">
-      <Filter>joystick\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\windows\SDL_windowsjoystick.c">
-      <Filter>joystick\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\windows\SDL_xinputjoystick.c">
-      <Filter>joystick\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\joystick\virtual\SDL_virtualjoystick.c">
-      <Filter>joystick\virtual</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\time\SDL_time.c">
-      <Filter>time</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\time\windows\SDL_systime.c">
-      <Filter>time\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\tray\windows\SDL_tray.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\tray\SDL_tray_utils.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_RLEaccel.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_blit.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_blit_0.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_blit_1.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_blit_A.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_blit_N.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_blit_auto.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_blit_copy.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_blit_slow.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_bmp.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_clipboard.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_egl.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_fillrect.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_pixels.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_rect.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_stb.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_stretch.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_surface.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_video.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_video_unsupported.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_yuv.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\SDL_vulkan_utils.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\dummy\SDL_nullevents.c">
-      <Filter>video\dummy</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\dummy\SDL_nullframebuffer.c">
-      <Filter>video\dummy</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\dummy\SDL_nullvideo.c">
-      <Filter>video\dummy</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_surface_utils.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsclipboard.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsevents.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsframebuffer.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowskeyboard.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsgameinput.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsmessagebox.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsmodes.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsmouse.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsopengl.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsopengles.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsrawinput.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsshape.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsvideo.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsvulkan.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\windows\SDL_windowswindow.c">
-      <Filter>video\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\timer\SDL_timer.c">
-      <Filter>timer</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\timer\windows\SDL_systimer.c">
-      <Filter>timer\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\thread\SDL_thread.c">
-      <Filter>thread</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\thread\windows\SDL_syscond_cv.c">
-      <Filter>thread\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\thread\windows\SDL_sysmutex.c">
-      <Filter>thread\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\thread\windows\SDL_sysrwlock_srw.c">
-      <Filter>thread\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\thread\windows\SDL_syssem.c">
-      <Filter>thread\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\thread\windows\SDL_systhread.c">
-      <Filter>thread\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\thread\windows\SDL_systls.c">
-      <Filter>thread\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\thread\generic\SDL_syscond.c">
-      <Filter>thread\generic</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_crc16.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_crc32.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_getenv.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_iconv.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_malloc.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_memcpy.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_memmove.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_memset.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_murmur3.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_qsort.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_random.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_stdlib.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_string.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_strtokr.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\sensor\SDL_sensor.c">
-      <Filter>sensor</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\sensor\dummy\SDL_dummysensor.c">
-      <Filter>sensor\dummy</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\sensor\windows\SDL_windowssensor.c">
-      <Filter>sensor\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\SDL_d3dmath.c">
-      <Filter>render</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\SDL_render.c">
-      <Filter>render</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\SDL_render_unsupported.c">
-      <Filter>render</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\SDL_yuv_sw.c">
-      <Filter>render</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\direct3d\SDL_render_d3d.c">
-      <Filter>render\direct3d</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\direct3d\SDL_shaders_d3d.c">
-      <Filter>render\direct3d</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\direct3d11\SDL_render_d3d11.c">
-      <Filter>render\direct3d11</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.c">
-      <Filter>render\direct3d11</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\opengl\SDL_render_gl.c">
-      <Filter>render\opengl</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\opengl\SDL_shaders_gl.c">
-      <Filter>render\opengl</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\opengles2\SDL_render_gles2.c">
-      <Filter>render\opengles2</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\opengles2\SDL_shaders_gles2.c">
-      <Filter>render\opengles2</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\software\SDL_blendfillrect.c">
-      <Filter>render\software</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\software\SDL_blendline.c">
-      <Filter>render\software</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\software\SDL_blendpoint.c">
-      <Filter>render\software</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\software\SDL_drawline.c">
-      <Filter>render\software</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\software\SDL_drawpoint.c">
-      <Filter>render\software</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\software\SDL_render_sw.c">
-      <Filter>render\software</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\software\SDL_rotate.c">
-      <Filter>render\software</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\software\SDL_triangle.c">
-      <Filter>render\software</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\power\SDL_power.c">
-      <Filter>power</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\power\windows\SDL_syspower.c">
-      <Filter>power\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\SDL_log.c" />
-    <ClCompile Include="SDL\src\render\direct3d12\SDL_render_d3d12.c">
-      <Filter>render\direct3d12</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\direct3d12\SDL_shaders_d3d12.c">
-      <Filter>render\direct3d12</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\core\windows\pch.c">
-      <Filter>core\windows</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\stdlib\SDL_mslibc.c">
-      <Filter>stdlib</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\thread\generic\SDL_sysrwlock.c" />
-    <ClCompile Include="SDL\src\thread\generic\SDL_sysrwlock.c" />
-    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx.c" />
-    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_sse.c" />
-    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_std.c" />
-    <ClCompile Include="SDL\src\render\vulkan\SDL_render_vulkan.c">
-      <Filter>render\vulkan</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\render\vulkan\SDL_shaders_vulkan.c">
-      <Filter>render\vulkan</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenevents.c">
-      <Filter>video\offscreen</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenframebuffer.c">
-      <Filter>video\offscreen</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenopengles.c">
-      <Filter>video\offscreen</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenvideo.c">
-      <Filter>video\offscreen</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenvulkan.c">
-      <Filter>video\offscreen</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenwindow.c">
-      <Filter>video\offscreen</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\gpu\SDL_gpu.c">
-      <Filter>gpu</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\gpu\d3d12\SDL_gpu_d3d12.c">
-      <Filter>gpu</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\gpu\vulkan\SDL_gpu_vulkan.c">
-      <Filter>gpu</Filter>
-    </ClCompile>
-    <ClCompile Include="SDL\src\process\SDL_process.c" />
-    <ClCompile Include="SDL\src\process\windows\SDL_windowsprocess.c" />
-    <ClCompile Include="SDL\src\render\gpu\SDL_pipeline_gpu.c" />
-    <ClCompile Include="SDL\src\render\gpu\SDL_render_gpu.c" />
-    <ClCompile Include="SDL\src\render\gpu\SDL_shaders_gpu.c" />
-    <ClCompile Include="SDL\src\storage\generic\SDL_genericstorage.c" />
-    <ClCompile Include="SDL\src\storage\steam\SDL_steamstorage.c" />
-    <ClCompile Include="SDL\src\storage\SDL_storage.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="SDL\src\core\windows\version.rc" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/3rdparty/libusb/CMakeLists.txt b/3rdparty/libusb/CMakeLists.txt
index 0fc66f2429..21f3e019ef 100644
--- a/3rdparty/libusb/CMakeLists.txt
+++ b/3rdparty/libusb/CMakeLists.txt
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 2.8.4)
+
 project(libusb)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
@@ -11,7 +13,7 @@ option(WITHOUT_PTHREADS "force pthreads to not be used.  if on, then they are us
 
 set(LIBUSB_MAJOR 1)
 set(LIBUSB_MINOR 0)
-set(LIBUSB_MICRO 26)
+set(LIBUSB_MICRO 23)
 
 macro(append_compiler_flags)
 	foreach(FLAG IN ITEMS ${ARGN})
diff --git a/3rdparty/libusb/config.cmake b/3rdparty/libusb/config.cmake
index 1a9833eb9b..57f19f07a6 100644
--- a/3rdparty/libusb/config.cmake
+++ b/3rdparty/libusb/config.cmake
@@ -89,11 +89,7 @@ set(PACKAGE_URL "http://www.libusb.org" CACHE INTERNAL "package url" FORCE)
 set(PACKAGE_TARNAME "libusb" CACHE INTERNAL "tarball name" FORCE)
 set(VERSION "${PACKAGE_VERSION}" CACHE INTERNAL "version" FORCE)
 
-if(MSVC)
-	file(COPY libusb/msvc/config.h DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-else()
-	configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
-endif()
+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
 message(STATUS "Generated configuration file in ${CMAKE_CURRENT_BINARY_DIR}/config.h")
 
 # for generated config.h
diff --git a/3rdparty/libusb/config.h.cmake b/3rdparty/libusb/config.h.cmake
index 60db929d54..dbf72bfa39 100644
--- a/3rdparty/libusb/config.h.cmake
+++ b/3rdparty/libusb/config.h.cmake
@@ -1,8 +1,6 @@
 #ifndef LIBUSB_CONFIG_H
 #define LIBUSB_CONFIG_H
 
-#define PRINTF_FORMAT(a, b) __attribute__ ((__format__ (__printf__, a, b)))
-
 #define DEFAULT_VISIBILITY @DEFAULT_VISIBILITY@
 
 #cmakedefine ENABLE_DEBUG_LOGGING
diff --git a/3rdparty/libusb/libusb b/3rdparty/libusb/libusb
index 15a7ebb4d4..c33990a300 160000
--- a/3rdparty/libusb/libusb
+++ b/3rdparty/libusb/libusb
@@ -1 +1 @@
-Subproject commit 15a7ebb4d426c5ce196684347d2b7cafad862626
+Subproject commit c33990a300674e24f47ff0f172f7efb10b63b88a
diff --git a/3rdparty/libusb/libusb.cmake b/3rdparty/libusb/libusb.cmake
index 6de23c3528..7df04c32e0 100644
--- a/3rdparty/libusb/libusb.cmake
+++ b/3rdparty/libusb/libusb.cmake
@@ -3,6 +3,22 @@ include(os.cmake)
 include(config.cmake)
 include(FindThreads)
 
+set (LIBUSB_COMMON
+	core.c
+	descriptor.c
+	io.c
+	sync.c
+	hotplug.c
+	strerror.c
+	libusb-1.0.rc
+	libusb-1.0.def
+)
+
+foreach(SRC IN LISTS LIBUSB_COMMON)
+	list(APPEND LIBUSB_COMMON_FINAL ${LIBUSB_SOURCE_DIR}/libusb/${SRC})
+endforeach()
+
+
 include_directories(${LIBUSB_SOURCE_DIR}/libusb)
 include_directories(${LIBUSB_SOURCE_DIR}/libusb/os)
 
@@ -12,14 +28,7 @@ endif()
 
 add_library(usb-1.0-static
 	STATIC
-	libusb/libusb/core.c
-	libusb/libusb/descriptor.c
-	libusb/libusb/io.c
-	libusb/libusb/sync.c
-	libusb/libusb/hotplug.c
-	libusb/libusb/strerror.c
-	libusb/libusb/libusb-1.0.rc
-	libusb/libusb/libusb-1.0.def
+	${LIBUSB_COMMON_FINAL}
 	${LIBUSB_PLATFORM}
 )
 
diff --git a/3rdparty/libusb/libusb_static.vcxproj b/3rdparty/libusb/libusb_static.vcxproj
index 66dfc2ac29..703b5bdb25 100644
--- a/3rdparty/libusb/libusb_static.vcxproj
+++ b/3rdparty/libusb/libusb_static.vcxproj
@@ -35,8 +35,8 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)lib/</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
     <TargetName>libusb-1.0</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
@@ -50,9 +50,11 @@
     <ClCompile Condition="'$(Configuration)'=='Debug'">
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <ClCompile Condition="'$(Configuration)'=='Release'">
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Lib>
       <OutputFile>$(OutDir)libusb-1.0.lib</OutputFile>
diff --git a/3rdparty/libusb/os.cmake b/3rdparty/libusb/os.cmake
index dc87180272..cde292bc0a 100644
--- a/3rdparty/libusb/os.cmake
+++ b/3rdparty/libusb/os.cmake
@@ -5,43 +5,42 @@ if (CMAKE_USE_PTHREADS_INIT)
 	set(PTHREADS_ENABLED TRUE)
 endif()
 
-if (CYGWIN)
+if (WIN32 OR "${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
 	add_compile_definitions(PLATFORM_WINDOWS=1)
-	set(OS_WINDOWS 1)
+	set(OS_WINDOWS 1 CACHE INTERNAL "controls config.h macro definition" FORCE)
 
-	message(STATUS "Detected Cygwin")
-	set(PTHREADS_ENABLED TRUE)
-	set(WITHOUT_POLL_H TRUE)
+	# Enable MingW support for RC language (for CMake pre-2.8)
+	if (MINGW)
+		set(CMAKE_RC_COMPILER_INIT windres)
+		set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
+	endif()
+	enable_language(RC)
+
+	if ("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
+		message(STATUS "Detected cygwin")
+		set(PTHREADS_ENABLED TRUE)
+		set(WITHOUT_POLL_H TRUE CACHE INTERNAL "Disable using poll.h even if it's available - use windows poll instead fo cygwin's" FORCE)
+	endif()
 
 	list(APPEND PLATFORM_SRC
 		events_windows.c
 		windows_usbdk.c
 		windows_common.c
 		windows_winusb.c
+		threads_windows.c
 	)
 
 	if (PTHREADS_ENABLED AND NOT WITHOUT_PTHREADS)
 		list(APPEND PLATFORM_SRC threads_posix)
+	else()
+		list(APPEND PLATFORM_SRC threads_windows.c)
 	endif()
-elseif(WIN32)
-	add_compile_definitions(PLATFORM_WINDOWS=1)
-	set(OS_WINDOWS 1)
-	set(PTHREADS_ENABLED FALSE)
-
-	list(APPEND PLATFORM_SRC
-		events_windows.c
-		windows_usbdk.c
-		windows_common.c
-		windows_winusb.c
-	)
-
-	list(APPEND PLATFORM_SRC threads_windows.c)
 elseif (APPLE)
 	# Apple != OSX alone
 	add_compile_definitions(PLATFORM_POSIX=1 HAVE_CLOCK_GETTIME)
-	set(OS_DARWIN 1)
+	set(OS_DARWIN 1 CACHE INTERNAL "controls config.h macro definition" FORCE)
 
-	if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+	if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
 		set(PLATFORM_SRC
 			darwin_usb.c
 			threads_posix.c
@@ -50,7 +49,6 @@ elseif (APPLE)
 
 		find_package(IOKit REQUIRED)
 		list(APPEND LIBUSB_LIBRARIES ${IOKit_LIBRARIES})
-		list(APPEND LIBUSB_LIBRARIES "-framework Security")
 
 		# Currently only objc_registerThreadWithCollector requires linking against it
 		# which is only for MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
@@ -77,8 +75,8 @@ int main()
 elseif (UNIX)
 	# Unix is for all *NIX systems including OSX
 	add_compile_definitions(PLATFORM_POSIX=1 HAVE_CLOCK_GETTIME)
-	if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR ANDROID)
-		set(OS_LINUX 1)
+	if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+		set(OS_LINUX 1 CACHE INTERNAL "controls config.h macro definition" FORCE)
 
 		set(PLATFORM_SRC
 			linux_usbfs.c
@@ -87,9 +85,7 @@ elseif (UNIX)
 			events_posix.c
 		)
 
-		if(NOT ANDROID)
-			list(APPEND LIBUSB_LIBRARIES rt)
-		endif()
+		list(APPEND LIBUSB_LIBRARIES rt)
 	endif()
 endif()
 
@@ -111,4 +107,4 @@ set(LIBUSB_LIBRARIES ${LIBUSB_LIBRARIES} PARENT_SCOPE)
 if (WITHOUT_PTHREADS)
 	set(PTHREADS_ENABLED FALSE)
 endif()
-set(THREADS_POSIX ${PTHREADS_ENABLED})
+set(THREADS_POSIX ${PTHREADS_ENABLED} CACHE INTERNAL "use pthreads" FORCE)
diff --git a/3rdparty/llvm.cmake b/3rdparty/llvm.cmake
new file mode 100644
index 0000000000..2f695f26f5
--- /dev/null
+++ b/3rdparty/llvm.cmake
@@ -0,0 +1,65 @@
+if(WITH_LLVM)
+	if(BUILD_LLVM_SUBMODULE)
+		message(STATUS "LLVM will be built from the submodule.")
+
+		set(LLVM_TARGETS_TO_BUILD "X86" CACHE INTERNAL "")
+		option(LLVM_BUILD_RUNTIME OFF)
+		option(LLVM_BUILD_TOOLS OFF)
+		option(LLVM_INCLUDE_BENCHMARKS OFF)
+		option(LLVM_INCLUDE_DOCS OFF)
+		option(LLVM_INCLUDE_EXAMPLES OFF)
+		option(LLVM_INCLUDE_TESTS OFF)
+		option(LLVM_INCLUDE_TOOLS OFF)
+		option(LLVM_INCLUDE_UTILS OFF)
+		option(LLVM_CCACHE_BUILD ON)
+
+		set(CXX_FLAGS_OLD ${CMAKE_CXX_FLAGS})
+
+		if (MSVC)
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS")
+		endif()
+
+		# LLVM needs to be built out-of-tree
+		add_subdirectory(${CMAKE_SOURCE_DIR}/llvm ${CMAKE_CURRENT_BINARY_DIR}/llvm_build EXCLUDE_FROM_ALL)
+		set(LLVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/llvm_build/lib/cmake/llvm/")
+
+		set(CMAKE_CXX_FLAGS ${CXX_FLAGS_OLD})
+
+		# now tries to find LLVM again
+		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()
+
+	else()
+		message(STATUS "Using prebuilt LLVM")
+
+		if (LLVM_DIR AND NOT IS_ABSOLUTE "${LLVM_DIR}")
+			# change relative LLVM_DIR to be relative to the source dir
+			set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR})
+		endif()
+
+		find_package(LLVM 11.0 CONFIG)
+
+		if (NOT LLVM_FOUND)
+			if (LLVM_VERSION AND LLVM_VERSION_MAJOR LESS 11)
+				message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 11.0. \
+														 Enable BUILD_LLVM_SUBMODULE option to build LLVM from included as a git submodule.")
+			endif()
+
+			message(FATAL_ERROR "Can't find LLVM libraries from the CMAKE_PREFIX_PATH path or LLVM_DIR. \
+													 Enable BUILD_LLVM_SUBMODULE option to build LLVM from included as a git submodule.")
+		endif()
+	endif()
+
+	set(LLVM_LIBS LLVMMCJIT LLVMX86CodeGen LLVMX86AsmParser)
+
+	add_library(3rdparty_llvm INTERFACE)
+	target_link_libraries(3rdparty_llvm INTERFACE ${LLVM_LIBS})
+	target_include_directories(3rdparty_llvm INTERFACE ${LLVM_INCLUDE_DIRS})
+	target_compile_definitions(3rdparty_llvm INTERFACE ${LLVM_DEFINITIONS} -DLLVM_AVAILABLE)
+
+	add_library(3rdparty::llvm ALIAS 3rdparty_llvm)
+else()
+	add_library(3rdparty::llvm ALIAS 3rdparty_dummy_lib)
+endif()
diff --git a/3rdparty/llvm/CMakeLists.txt b/3rdparty/llvm/CMakeLists.txt
deleted file mode 100644
index d1295886d8..0000000000
--- a/3rdparty/llvm/CMakeLists.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-if(WITH_LLVM)
-	check_cxx_compiler_flag("-msse -msse2 -mcx16" COMPILER_X86)
-	check_cxx_compiler_flag("-march=armv8-a+lse" COMPILER_ARM)
-
-	if(BUILD_LLVM)
-		message(STATUS "LLVM will be built from the submodule.")
-
-		if (ANDROID)
-			if (COMPILER_ARM)
-				set(LLVM_TARGETS_TO_BUILD "AArch64" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
-				set(LLVM_TARGET_ARCH "${CMAKE_SYSTEM_PROCESSOR}-none-linux-android${ANDROID_NATIVE_API_LEVEL}" CACHE STRING "")
-			else()
-				set(LLVM_TARGETS_TO_BUILD "X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
-			endif()
-		else()
-			set(LLVM_TARGETS_TO_BUILD "AArch64;X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
-		endif()
-
-		option(LLVM_BUILD_RUNTIME "Build the LLVM runtime libraries." OFF)
-		option(LLVM_BUILD_TOOLS "Build the LLVM tools. If OFF, just generate build targets." OFF)
-		option(LLVM_INCLUDE_BENCHMARKS "Generate benchmark targets. If OFF, benchmarks can't be built." OFF)
-		option(LLVM_INCLUDE_DOCS "Generate build targets for llvm documentation." OFF)
-		option(LLVM_INCLUDE_EXAMPLES "Generate build targets for the LLVM examples" OFF)
-		option(LLVM_INCLUDE_TESTS "Generate build targets for the LLVM unit tests." OFF)
-		option(LLVM_INCLUDE_TOOLS "Generate build targets for the LLVM tools." OFF)
-		option(LLVM_INCLUDE_UTILS "Generate build targets for the LLVM utils." OFF)
-		option(LLVM_CCACHE_BUILD "Set to ON for a ccache enabled build" OFF)
-		set(LLVM_ENABLE_WARNINGS OFF CACHE BOOL "Enable compiler warnings.")
-
-		# For Windows x86 (not Windows AArch64).
-		# Check on MSVC is needed due to COMPILER_X86, COMPILER_ARM etc. are not set/supported by the MSVC compiler, if used.
-		# Furthermore, the MSVC compiler is not available/supported on Windows AArch64
-		if(WIN32 AND (COMPILER_X86 OR MSVC))
-			set(LLVM_USE_INTEL_JITEVENTS ON)
-		endif()
-
-		if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-			if(COMPILER_X86)
-				set(LLVM_USE_INTEL_JITEVENTS ON)
-			endif()
-			set(LLVM_USE_PERF ON)
-		endif()
-
-		if (MSVC)
-			add_compile_definitions("$<$<COMPILE_LANGUAGE:CXX>:_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS>")
-		endif()
-
-		# LLVM needs to be built out-of-tree
-		add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/llvm/llvm ${CMAKE_CURRENT_BINARY_DIR}/llvm_build EXCLUDE_FROM_ALL)
-		set(LLVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/llvm_build/lib/cmake/llvm/")
-
-		set(STATIC_LINK_LLVM ON CACHE BOOL "Link against LLVM statically. This will get set to ON if you build LLVM from the submodule." FORCE)
-
-		find_package(LLVM 19.1 CONFIG)
-		if(NOT LLVM_FOUND)
-			message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
-		endif()
-	else()
-		message(STATUS "Using prebuilt or system LLVM")
-
-		if (LLVM_DIR AND NOT IS_ABSOLUTE "${LLVM_DIR}")
-			# change relative LLVM_DIR to be relative to the source dir
-			set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR})
-		endif()
-
-		find_package(LLVM CONFIG)
-
-		if (NOT LLVM_FOUND)
-			message(FATAL_ERROR "Can't find LLVM libraries from the CMAKE_PREFIX_PATH path or LLVM_DIR. Enable BUILD_LLVM option to build LLVM from included as a git submodule.")
-		endif()
-		if (LLVM_VERSION VERSION_LESS 18)
-			message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 18 or above. Enable BUILD_LLVM option to build LLVM from included as a git submodule.")
-		endif()
-	endif()
-
-	if (STATIC_LINK_LLVM)
-		if (NOT DEFINED LLVM_TARGETS_TO_BUILD)
-			if(COMPILER_ARM)
-				set(LLVM_TARGETS_TO_BUILD "AArch64" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
-			else()
-				set(LLVM_TARGETS_TO_BUILD "X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
-			endif()
-		endif()
-
-		# For Windows x86 (not Windows AArch64) only when BUILD_LLVM is enabled and
-		# for Linux x86 (not Linux AArch64) even if BUILD_LLVM is disabled (precompiled llvm used)
-		if(LLVM_USE_INTEL_JITEVENTS OR (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND COMPILER_X86))
-			list (APPEND LLVM_ADDITIONAL_LIBS IntelJITEvents)
-		endif()
-
-		# For Linux even if BUILD_LLVM is disabled (precompiled llvm used)
-		if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-			list (APPEND LLVM_ADDITIONAL_LIBS PerfJITEvents)
-		endif()
-
-		llvm_map_components_to_libnames(LLVM_LIBS
-			${LLVM_TARGETS_TO_BUILD}
-			${LLVM_ADDITIONAL_LIBS}
-			Core
-			ExecutionEngine
-			MCJIT
-			Passes
-		)
-	else()
-		set(LLVM_LIBS LLVM)
-	endif()
-
-	add_library(3rdparty_llvm INTERFACE)
-	target_link_libraries(3rdparty_llvm INTERFACE ${LLVM_LIBS})
-	target_include_directories(3rdparty_llvm INTERFACE ${LLVM_INCLUDE_DIRS})
-	separate_arguments(LLVM_DEFINITIONS_LIST NATIVE_COMMAND ${LLVM_DEFINITIONS})
-	target_compile_definitions(3rdparty_llvm INTERFACE ${LLVM_DEFINITIONS_LIST} LLVM_AVAILABLE)
-
-	add_library(3rdparty::llvm ALIAS 3rdparty_llvm)
-else()
-	add_library(3rdparty::llvm ALIAS 3rdparty_dummy_lib)
-endif()
diff --git a/3rdparty/llvm/llvm b/3rdparty/llvm/llvm
deleted file mode 160000
index cd708029e0..0000000000
--- a/3rdparty/llvm/llvm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cd708029e0b2869e80abe31ddb175f7c35361f90
diff --git a/3rdparty/miniupnp/CMakeLists.txt b/3rdparty/miniupnp/CMakeLists.txt
deleted file mode 100644
index 93c3dc55cd..0000000000
--- a/3rdparty/miniupnp/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-option (UPNPC_BUILD_STATIC "Build static library" TRUE)
-option (UPNPC_BUILD_SHARED "Build shared library" FALSE)
-option (UPNPC_BUILD_TESTS "Build test executables" FALSE)
-option (UPNPC_BUILD_SAMPLE "Build sample executables" FALSE)
-option (NO_GETADDRINFO "Define NO_GETADDRINFO" FALSE)
-option (UPNPC_NO_INSTALL "Disable installation" TRUE)
-
-add_subdirectory(miniupnp/miniupnpc EXCLUDE_FROM_ALL)
diff --git a/3rdparty/miniupnp/miniupnp b/3rdparty/miniupnp/miniupnp
deleted file mode 160000
index d66872e34d..0000000000
--- a/3rdparty/miniupnp/miniupnp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d66872e34d9ff83a07f8b71371b13419b2089953
diff --git a/3rdparty/miniupnp/miniupnpc_static.vcxproj b/3rdparty/miniupnp/miniupnpc_static.vcxproj
deleted file mode 100644
index e331c013d4..0000000000
--- a/3rdparty/miniupnp/miniupnpc_static.vcxproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{5228f863-e0dd-4de7-aa7b-5c52b14cd4d0}</ProjectGuid>
-    <RootNamespace>miniupnpcstatic</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINSOCK_DEPRECATED_NO_WARNINGS; _CRT_SECURE_NO_WARNINGS;MINIUPNP_STATICLIB;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>generated;miniupnp\miniupnpc;miniupnp\miniupnpc\include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd $(ProjectDir)miniupnp\miniupnpc\msvc
-cscript genminiupnpcstrings.vbs</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINSOCK_DEPRECATED_NO_WARNINGS; _CRT_SECURE_NO_WARNINGS;MINIUPNP_STATICLIB;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>generated;miniupnp\miniupnpc;miniupnp\miniupnpc\include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>
-      </SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd $(ProjectDir)miniupnp\miniupnpc\msvc
-cscript genminiupnpcstrings.vbs</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="miniupnp\miniupnpc\src\addr_is_reserved.c" />
-    <ClCompile Include="miniupnp\miniupnpc\src\connecthostport.c" />
-    <ClCompile Include="miniupnp\miniupnpc\src\igd_desc_parse.c" />
-    <ClCompile Include="miniupnp\miniupnpc\src\minisoap.c" />
-    <ClCompile Include="miniupnp\miniupnpc\src\minissdpc.c" />
-    <ClCompile Include="miniupnp\miniupnpc\src\miniupnpc.c" />
-    <ClCompile Include="miniupnp\miniupnpc\src\miniwget.c" />
-    <ClCompile Include="miniupnp\miniupnpc\src\minixml.c" />
-    <ClCompile Include="miniupnp\miniupnpc\src\portlistingparse.c" />
-    <ClCompile Include="miniupnp\miniupnpc\src\receivedata.c" />
-    <ClCompile Include="miniupnp\miniupnpc\src\upnpcommands.c" />
-    <ClCompile Include="miniupnp\miniupnpc\src\upnpdev.c" />
-    <ClCompile Include="miniupnp\miniupnpc\src\upnperrors.c" />
-    <ClCompile Include="miniupnp\miniupnpc\src\upnpreplyparse.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="miniupnp\miniupnpc\src\addr_is_reserved.h" />
-    <ClInclude Include="miniupnp\miniupnpc\src\connecthostport.h" />
-    <ClInclude Include="miniupnp\miniupnpc\include\igd_desc_parse.h" />
-    <ClInclude Include="miniupnp\miniupnpc\src\minisoap.h" />
-    <ClInclude Include="miniupnp\miniupnpc\src\minissdpc.h" />
-    <ClInclude Include="miniupnp\miniupnpc\include\miniupnpc.h" />
-    <ClInclude Include="miniupnp\miniupnpc\miniupnpcstrings.h" />
-    <ClInclude Include="miniupnp\miniupnpc\include\miniupnpctypes.h" />
-    <ClInclude Include="miniupnp\miniupnpc\include\miniupnpc_declspec.h" />
-    <ClInclude Include="miniupnp\miniupnpc\include\miniwget.h" />
-    <ClInclude Include="miniupnp\miniupnpc\src\miniwget_private.h" />
-    <ClInclude Include="miniupnp\miniupnpc\src\minixml.h" />
-    <ClInclude Include="miniupnp\miniupnpc\include\portlistingparse.h" />
-    <ClInclude Include="miniupnp\miniupnpc\src\receivedata.h" />
-    <ClInclude Include="miniupnp\miniupnpc\include\upnpcommands.h" />
-    <ClInclude Include="miniupnp\miniupnpc\include\upnpdev.h" />
-    <ClInclude Include="miniupnp\miniupnpc\include\upnperrors.h" />
-    <ClInclude Include="miniupnp\miniupnpc\include\upnpreplyparse.h" />
-    <ClInclude Include="miniupnp\miniupnpc\src\win32_snprintf.h" />
-    <ClInclude Include="miniupnp\miniupnpc\rc_version.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/3rdparty/opencv/CMakeLists.txt b/3rdparty/opencv/CMakeLists.txt
deleted file mode 100644
index 1103f3be94..0000000000
--- a/3rdparty/opencv/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# OpenCV
-
-set(OPENCV_TARGET 3rdparty_dummy_lib PARENT_SCOPE)
-
-if (USE_SYSTEM_OPENCV)
-	message(STATUS "RPCS3: using system OpenCV")
-	find_package(OpenCV COMPONENTS core photo)
-	
-	if(OPENCV_FOUND)
-		message(STATUS "RPCS3: found system OpenCV")
-		include_directories(${OpenCV_INCLUDE_DIRS})
-		add_library(3rdparty_opencv INTERFACE)
-		target_link_libraries(3rdparty_opencv INTERFACE ${OpenCV_LIBS})
-		target_compile_definitions(3rdparty_opencv INTERFACE -DHAVE_OPENCV)
-		set(OPENCV_TARGET 3rdparty_opencv PARENT_SCOPE)
-	else()
-		message(WARNING "RPCS3: OpenCV not found. Building without OpenCV support")
-	endif()
-else()
-	message(WARNING "RPCS3: Building without OpenCV support")
-endif()
diff --git a/3rdparty/opencv/opencv b/3rdparty/opencv/opencv
deleted file mode 160000
index 50fb5e701d..0000000000
--- a/3rdparty/opencv/opencv
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 50fb5e701d8b0d3fe8262ed84668a94cc8cbf0b1
diff --git a/3rdparty/pine/pine_server.h b/3rdparty/pine/pine_server.h
deleted file mode 100644
index fe88ddb474..0000000000
--- a/3rdparty/pine/pine_server.h
+++ /dev/null
@@ -1,629 +0,0 @@
-// Based on https://github.com/PCSX2/pcsx2/blob/edeb0d7bd7258c58273cc4a88a9f9a823d71e48c/pcsx2/IPC.h
-// and https://github.com/PCSX2/pcsx2/blob/edeb0d7bd7258c58273cc4a88a9f9a823d71e48c/pcsx2/IPC.cpp
-// Relicensed as GPLv2 for use in RPCS3 with permission from copyright owner (Govanify).
-
-#pragma once
-
-// IPC uses a concept of "slot" to be able to communicate with multiple
-// emulators at the same time, each slot should be unique to each emulator to
-// allow PnP and configurable by the end user so that several runs don't
-// conflict with each others
-#define IPC_DEFAULT_SLOT 28012
-
-#include <string>
-#include "stdafx.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <thread>
-#include <sys/types.h>
-#if _WIN32
-#define read_portable(a, b, c) (recv(a, b, ::narrow<int>(c), 0))
-#define write_portable(a, b, c) (send(a, b, ::narrow<int>(c), 0))
-#define close_portable(a) (closesocket(a))
-#define bzero(b, len) (memset((b), '\0', (len)), (void)0)
-#include <WinSock2.h>
-#include <windows.h>
-#include <ws2tcpip.h>
-#else
-#define read_portable(a, b, c) (read(a, b, c))
-#define write_portable(a, b, c) (write(a, b, c))
-#define close_portable(a) (close(a))
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <arpa/inet.h>
-#include <poll.h>
-#include <unistd.h>
-#endif
-
-#ifdef _WIN32
-constexpr SOCKET invalid_socket = INVALID_SOCKET;
-#else
-constexpr int invalid_socket = -1;
-#endif
-
-namespace pine
-{
-	/**
-	 * Emulator status enum. @n
-	 * A list of possible emulator statuses. @n
-	 */
-	enum EmuStatus : uint32_t
-	{
-		Running = 0,            /**< Game is running */
-		Paused = 1,             /**< Game is paused */
-		Shutdown = 2,           /**< Game is shutdown */
-	};
-
-	typedef unsigned long long SOCKET;
-
-	template<typename Impl>
-	class pine_server : public Impl
-	{
-	public:
-#ifdef _WIN32
-		// windows claim to have support for AF_UNIX sockets but that is a blatant lie,
-		// their SDK won't even run their own examples, so we go on TCP sockets.
-		SOCKET m_sock;
-		// the message socket used in thread's accept().
-		SOCKET m_msgsock;
-#else
-		// absolute path of the socket. Stored in XDG_RUNTIME_DIR, if unset /tmp
-		std::string m_socket_name;
-		int m_sock = 0;
-		// the message socket used in thread's accept().
-		int m_msgsock = 0;
-#endif
-
-		/**
-		 * Maximum memory used by an IPC message request.
-		 * Equivalent to 50,000 Write64 requests.
-		 */
-		#define MAX_IPC_SIZE 650000
-
-		/**
-		 * Maximum memory used by an IPC message reply.
-		 * Equivalent to 50,000 Read64 replies.
-		 */
-		#define MAX_IPC_RETURN_SIZE 450000
-
-		/**
-		 * IPC return buffer.
-		 * A preallocated buffer used to store all IPC replies.
-		 * to the size of 50.000 MsgWrite64 IPC calls.
-		 */
-		std::vector<char> m_ret_buffer;
-
-		/**
-		 * IPC messages buffer.
-		 * A preallocated buffer used to store all IPC messages.
-		 */
-		std::vector<char> m_ipc_buffer;
-
-		/**
-		 * IPC Command messages opcodes.
-		 * A list of possible operations possible by the IPC.
-		 * Each one of them is what we call an "opcode" and is the first
-		 * byte sent by the IPC to differentiate between commands.
-		 */
-		enum IPCCommand : unsigned char
-		{
-			MsgRead8 = 0,           /**< Read 8 bit value to memory. */
-			MsgRead16 = 1,          /**< Read 16 bit value to memory. */
-			MsgRead32 = 2,          /**< Read 32 bit value to memory. */
-			MsgRead64 = 3,          /**< Read 64 bit value to memory. */
-			MsgWrite8 = 4,          /**< Write 8 bit value to memory. */
-			MsgWrite16 = 5,         /**< Write 16 bit value to memory. */
-			MsgWrite32 = 6,         /**< Write 32 bit value to memory. */
-			MsgWrite64 = 7,         /**< Write 64 bit value to memory. */
-			MsgVersion = 8,         /**< Returns RPCS3 version. */
-			MsgTitle = 0xB,         /**< Returns the game title. */
-			MsgID = 0xC,            /**< Returns the game ID. */
-			MsgUUID = 0xD,          /**< Returns the game UUID. */
-			MsgGameVersion = 0xE,   /**< Returns the game verion. */
-			MsgStatus = 0xF,        /**< Returns the emulator status. */
-			MsgUnimplemented = 0xFF /**< Unimplemented IPC message. */
-		};
-
-		/**
-		 * IPC message buffer.
-		 * A list of all needed fields to store an IPC message.
-		 */
-		struct IPCBuffer
-		{
-			usz size{};     /**< Size of the buffer. */
-			char* buffer{}; /**< Buffer. */
-		};
-
-		/**
-		 * IPC result codes.
-		 * A list of possible result codes the IPC can send back.
-		 * Each one of them is what we call an "opcode" or "tag" and is the
-		 * first byte sent by the IPC to differentiate between results.
-		 */
-		enum IPCResult : unsigned char
-		{
-			IPC_OK = 0,     /**< IPC command successfully completed. */
-			IPC_FAIL = 0xFF /**< IPC command failed to complete. */
-		};
-
-		/**
-		 * Internal function, Parses an IPC command.
-		 * buf: buffer containing the IPC command.
-		 * buf_size: size of the buffer announced.
-		 * ret_buffer: buffer that will be used to send the reply.
-		 * return value: IPCBuffer containing a buffer with the result
-		 *               of the command and its size.
-		 */
-		IPCBuffer ParseCommand(char* buf, char* ret_buffer, u32 buf_size)
-		{
-			usz ret_cnt = 5;
-			usz buf_cnt = 0;
-
-			const auto error = [&]()
-			{
-				return IPCBuffer{ 5, MakeFailIPC(ret_buffer) };
-			};
-
-			const auto write_string = [&](const std::string& str)
-			{
-				if (!SafetyChecks(buf_cnt, 0, ret_cnt, str.size() + 1 + sizeof(u32), buf_size))
-					return false;
-				ToArray(ret_buffer, ::narrow<u32>(str.size() + 1), ret_cnt);
-				ret_cnt += sizeof(u32);
-				memcpy(&ret_buffer[ret_cnt], str.data(), str.size());
-				ret_cnt += str.size();
-				ret_buffer[ret_cnt++] = '\0';
-				return true;
-			};
-
-			while (buf_cnt < buf_size)
-			{
-				if (!SafetyChecks(buf_cnt, 1, ret_cnt, 0, buf_size))
-					return error();
-				buf_cnt++;
-				// example IPC messages: MsgRead/Write
-				// refer to the client doc for more info on the format
-				//         IPC Message event (1 byte)
-				//         |  Memory address (4 byte)
-				//         |  |           argument (VLE)
-				//         |  |           |
-				// format: XX YY YY YY YY ZZ ZZ ZZ ZZ
-				//        reply code: 00 = OK, FF = NOT OK
-				//        |  return value (VLE)
-				//        |  |
-				// reply: XX ZZ ZZ ZZ ZZ
-				IPCCommand command = std::bit_cast<IPCCommand>(buf[buf_cnt - 1]);
-				switch (command)
-				{
-				case MsgRead8:
-				{
-					if (!SafetyChecks(buf_cnt, 4, ret_cnt, 1, buf_size))
-						return error();
-					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
-					if (!Impl::template check_addr<1>(a))
-						return error();
-					const u8 res = Impl::read8(a);
-					ToArray(ret_buffer, res, ret_cnt);
-					ret_cnt += 1;
-					buf_cnt += 4;
-					break;
-				}
-				case MsgRead16:
-				{
-					if (!SafetyChecks(buf_cnt, 4, ret_cnt, 2, buf_size))
-						return error();
-					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
-					if (!Impl::template check_addr<2>(a))
-						return error();
-					const u16 res = Impl::read16(a);
-					ToArray(ret_buffer, res, ret_cnt);
-					ret_cnt += 2;
-					buf_cnt += 4;
-					break;
-				}
-				case MsgRead32:
-				{
-					if (!SafetyChecks(buf_cnt, 4, ret_cnt, 4, buf_size))
-						return error();
-					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
-					if (!Impl::template check_addr<4>(a))
-						return error();
-					const u32 res = Impl::read32(a);
-					ToArray(ret_buffer, res, ret_cnt);
-					ret_cnt += 4;
-					buf_cnt += 4;
-					break;
-				}
-				case MsgRead64:
-				{
-					if (!SafetyChecks(buf_cnt, 4, ret_cnt, 8, buf_size))
-						return error();
-					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
-					if (!Impl::template check_addr<8>(a))
-						return error();
-					u64 res = Impl::read64(a);
-					ToArray(ret_buffer, res, ret_cnt);
-					ret_cnt += 8;
-					buf_cnt += 4;
-					break;
-				}
-				case MsgWrite8:
-				{
-					if (!SafetyChecks(buf_cnt, 1 + 4, ret_cnt, 0, buf_size))
-						return error();
-					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
-					if (!Impl::template check_addr<1>(a, vm::page_writable))
-						return error();
-					Impl::write8(a, FromArray<u8>(&buf[buf_cnt], 4));
-					buf_cnt += 5;
-					break;
-				}
-				case MsgWrite16:
-				{
-					if (!SafetyChecks(buf_cnt, 2 + 4, ret_cnt, 0, buf_size))
-						return error();
-					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
-					if (!Impl::template check_addr<2>(a, vm::page_writable))
-						return error();
-					Impl::write16(a, FromArray<u16>(&buf[buf_cnt], 4));
-					buf_cnt += 6;
-					break;
-				}
-				case MsgWrite32:
-				{
-					if (!SafetyChecks(buf_cnt, 4 + 4, ret_cnt, 0, buf_size))
-						return error();
-					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
-					if (!Impl::template check_addr<4>(a, vm::page_writable))
-						return error();
-					Impl::write32(a, FromArray<u32>(&buf[buf_cnt], 4));
-					buf_cnt += 8;
-					break;
-				}
-				case MsgWrite64:
-				{
-					if (!SafetyChecks(buf_cnt, 8 + 4, ret_cnt, 0, buf_size))
-						return error();
-					const u32 a = FromArray<u32>(&buf[buf_cnt], 0);
-					if (!Impl::template check_addr<8>(a, vm::page_writable))
-						return error();
-					Impl::write64(a, FromArray<u64>(&buf[buf_cnt], 4));
-					buf_cnt += 12;
-					break;
-				}
-				case MsgVersion:
-				{
-					if (!write_string("RPCS3 " + Impl::get_version_and_branch()))
-						return error();
-					break;
-				}
-				case MsgStatus:
-				{
-					if (!SafetyChecks(buf_cnt, 0, ret_cnt, 4, buf_size))
-						return error();
-					EmuStatus status = Impl::get_status();
-					ToArray(ret_buffer, status, ret_cnt);
-					ret_cnt += 4;
-					buf_cnt += 4;
-					break;
-				}
-				case MsgTitle:
-				{
-					if (!write_string(Impl::get_title()))
-						return error();
-					break;
-				}
-				case MsgID:
-				{
-					if (!write_string(Impl::get_title_ID()))
-						return error();
-					break;
-				}
-				case MsgUUID:
-				{
-					if (!write_string(Impl::get_executable_hash()))
-						return error();
-					break;
-				}
-				case MsgGameVersion:
-				{
-					if (!write_string(Impl::get_app_version()))
-						return error();
-					break;
-				}
-				default:
-				{
-					return error();
-				}
-				}
-			}
-			return IPCBuffer{ ret_cnt, MakeOkIPC(ret_buffer, ret_cnt) };
-		}
-
-		/**
-		 * Formats an IPC buffer
-		 * ret_buffer: return buffer to use.
-		 * size: size of the IPC buffer.
-		 * return value: buffer containing the status code allocated of size
-		 */
-		static inline char* MakeOkIPC(char* ret_buffer, usz size = 5)
-		{
-			ToArray(ret_buffer, ::narrow<u32>(size), 0);
-			ret_buffer[4] = IPC_OK;
-			return ret_buffer;
-		}
-
-		static inline char* MakeFailIPC(char* ret_buffer, usz size = 5)
-		{
-			ToArray(ret_buffer, ::narrow<u32>(size), 0);
-			ret_buffer[4] = IPC_FAIL;
-			return ret_buffer;
-		}
-
-		/**
-		 * Initializes an open socket for IPC communication.
-		 * return value: false if a fatal failure happened, true otherwise.
-		 */
-		bool StartSocket()
-		{
-			::pollfd poll_fd{};
-
-			for (int pending_connection = 0; pending_connection != 1;)
-			{
-				if (thread_ctrl::state() == thread_state::aborting)
-				{
-					return false;
-				}
-
-				std::memset(&poll_fd, 0, sizeof(poll_fd));
-				poll_fd.events  = POLLIN;
-				poll_fd.revents = 0;
-				poll_fd.fd      = m_sock;
-
-#ifdef _WIN32
-				// Try to wait for an incoming connection
-				pending_connection = ::WSAPoll(&poll_fd, 1, 10);
-#else
-				pending_connection = ::poll(&poll_fd, 1, 10);
-#endif
-			}
-
-			m_msgsock = accept(m_sock, 0, 0);
-
-			if (m_msgsock == invalid_socket)
-			{
-				// everything else is non recoverable in our scope
-				// we also mark as recoverable socket errors where it would block a
-				// non blocking socket, even though our socket is blocking, in case
-				// we ever have to implement a non blocking socket.
-#ifdef _WIN32
-				int errno_w = WSAGetLastError();
-				if (!(errno_w == WSAECONNRESET || errno_w == WSAEINTR || errno_w == WSAEINPROGRESS || errno_w == WSAEMFILE || errno_w == WSAEWOULDBLOCK))
-				{
-#else
-				if (!(errno == ECONNABORTED || errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))
-				{
-#endif
-					Impl::error("IPC: An unrecoverable error happened! Shutting down...");
-					return false;
-				}
-			}
-			return true;
-		}
-
-		// Thread used to relay IPC commands.
-		void operator()()
-		{
-			// we allocate once buffers to not have to do mallocs for each IPC
-			// request, as malloc is expansive when we optimize for µs.
-			m_ret_buffer.resize(MAX_IPC_RETURN_SIZE);
-			m_ipc_buffer.resize(MAX_IPC_SIZE);
-
-			if (!StartSocket())
-				return;
-
-			while (thread_ctrl::state() != thread_state::aborting)
-			{
-				// either int or ssize_t depending on the platform, so we have to
-				// use a bunch of auto
-				auto receive_length = 0;
-				auto end_length = 4;
-
-				// while we haven't received the entire packet, maybe due to
-				// socket datagram splittage, we continue to read
-				while (receive_length < end_length)
-				{
-					auto tmp_length = read_portable(m_msgsock, &m_ipc_buffer[receive_length], MAX_IPC_SIZE - receive_length);
-
-					// we recreate the socket if an error happens
-					if (tmp_length <= 0)
-					{
-						receive_length = 0;
-						if (!StartSocket())
-							return;
-						break;
-					}
-
-					receive_length += tmp_length;
-
-					// if we got at least the final size then update
-					if (end_length == 4 && receive_length >= 4)
-					{
-						end_length = FromArray<u32>(m_ipc_buffer.data(), 0);
-						// we'd like to avoid a client trying to do OOB
-						if (end_length > MAX_IPC_SIZE || end_length < 4)
-						{
-							receive_length = 0;
-							break;
-						}
-					}
-				}
-
-				// we remove 4 bytes to get the message size out of the IPC command
-				// size in ParseCommand.
-				// also, if we got a failed command, let's reset the state so we don't
-				// end up deadlocking by getting out of sync, eg when a client
-				// disconnects
-				if (receive_length != 0)
-				{
-					pine_server::IPCBuffer res = ParseCommand(&m_ipc_buffer[4], m_ret_buffer.data(), static_cast<u32>(end_length) - 4);
-
-					// if we cannot send back our answer restart the socket
-					if (write_portable(m_msgsock, res.buffer, res.size) < 0)
-					{
-						if (!StartSocket())
-							return;
-					}
-				}
-			}
-		}
-
-		/**
-		 * Converts an uint to an char* in little endian
-		 * res_array: the array to modify
-		 * res: the value to convert
-		 * i: when to insert it into the array
-		 * return value: res_array
-		 * NB: implicitely inlined
-		 */
-		template <typename T>
-		static char* ToArray(char* res_array, T res, usz i)
-		{
-			memcpy(res_array + i, reinterpret_cast<char*>(&res), sizeof(T));
-			return res_array;
-		}
-
-		/**
-		 * Converts a char* to an uint in little endian
-		 * arr: the array to convert
-		 * i: when to load it from the array
-		 * return value: the converted value
-		 * NB: implicitely inlined
-		 */
-		template <typename T>
-		static T FromArray(char* arr, int i)
-		{
-			return *reinterpret_cast<T*>(arr + i);
-		}
-
-		/**
-		 * Ensures an IPC message isn't too big.
-		 * return value: false if checks failed, true otherwise.
-		 */
-		static inline bool SafetyChecks(usz command_len, usz command_size, usz reply_len, usz reply_size = 0, usz buf_size = MAX_IPC_SIZE - 1)
-		{
-			bool res = ((command_len + command_size) > buf_size ||
-				(reply_len + reply_size) >= MAX_IPC_RETURN_SIZE);
-			if (res) [[unlikely]]
-				return false;
-			return true;
-		}
-
-	public:
-		/* Initializers */
-		pine_server() noexcept
-		{
-#ifdef _WIN32
-			WSADATA wsa;
-			struct sockaddr_in server;
-			m_sock = INVALID_SOCKET;
-			m_msgsock = INVALID_SOCKET;
-
-			if (WSAStartup(MAKEWORD(2, 2), &wsa) != 0)
-			{
-				Impl::error("IPC: Cannot initialize winsock! Shutting down...");
-				return;
-			}
-
-			if ((m_sock = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
-			{
-				Impl::error("IPC: Cannot open socket! Shutting down...");
-				return;
-			}
-
-			// yes very good windows s/sun/sin/g sure is fine
-			server.sin_family = AF_INET;
-			// localhost only
-			if (!inet_pton(server.sin_family, "127.0.0.1", &server.sin_addr.s_addr))
-			{
-				fmt::throw_exception("IPC: Failed to convert localhost");
-			}
-			server.sin_port = htons(Impl::get_port());
-
-			if (bind(m_sock, reinterpret_cast<struct sockaddr*>(&server), sizeof(server)) == SOCKET_ERROR)
-			{
-				Impl::error("IPC: Error while binding to socket! Shutting down...");
-				return;
-			}
-
-#else
-			char* runtime_dir = nullptr;
-#ifdef __APPLE__
-			runtime_dir = std::getenv("TMPDIR");
-#else
-			runtime_dir = std::getenv("XDG_RUNTIME_DIR");
-#endif
-			// fallback in case macOS or other OSes don't implement the XDG base
-			// spec
-			if (runtime_dir == nullptr)
-				m_socket_name = "/tmp/rpcs3.sock";
-			else
-			{
-				m_socket_name = runtime_dir;
-				m_socket_name += "/rpcs3.sock";
-			}
-
-			const int slot = Impl::get_port();
-			if (slot != IPC_DEFAULT_SLOT)
-			{
-				fmt::append(m_socket_name, ".%d", slot);
-			}
-
-			struct sockaddr_un server;
-
-			m_sock = socket(AF_UNIX, SOCK_STREAM, 0);
-			if (m_sock < 0)
-			{
-				Impl::error("IPC: Cannot open socket! Shutting down...");
-				return;
-			}
-			server.sun_family = AF_UNIX;
-			strcpy(server.sun_path, m_socket_name.c_str());
-
-			// we unlink the socket so that when releasing this thread the socket gets
-			// freed even if we didn't close correctly the loop
-			unlink(m_socket_name.c_str());
-			if (bind(m_sock, std::bit_cast<struct sockaddr*>(&server), sizeof(struct sockaddr_un)))
-			{
-				Impl::error("IPC: Error while binding to socket! Shutting down...");
-				return;
-			}
-#endif
-
-			// maximum queue of 4096 commands before refusing, approximated to the
-			// nearest legal value. We do not use SOMAXCONN as windows have this idea
-			// that a "reasonable" value is 5, which is not.
-			listen(m_sock, 4096);
-		}
-
-		pine_server(const pine_server&) = delete;
-		pine_server& operator=(const pine_server&) = delete;
-
-		void Cleanup()
-		{
-#ifdef _WIN32
-			WSACleanup();
-#else
-			unlink(m_socket_name.c_str());
-#endif
-			close_portable(m_sock);
-			close_portable(m_msgsock);
-		}
-
-		~pine_server()
-		{
-			Cleanup();
-		}
-
-	}; // class pine_server
-}
diff --git a/3rdparty/pugixml b/3rdparty/pugixml
index ee86beb30e..08b3433180 160000
--- a/3rdparty/pugixml
+++ b/3rdparty/pugixml
@@ -1 +1 @@
-Subproject commit ee86beb30e4973f5feffe3ce63bfa4fbadf72f38
+Subproject commit 08b3433180727ea2f78fe02e860a08471db1e03c
diff --git a/3rdparty/qt5.cmake b/3rdparty/qt5.cmake
new file mode 100644
index 0000000000..914ba435e1
--- /dev/null
+++ b/3rdparty/qt5.cmake
@@ -0,0 +1,45 @@
+add_library(3rdparty_qt5 INTERFACE)
+
+set(QT_MIN_VER 5.15.2)
+
+find_package(Qt5 ${QT_MIN_VER} CONFIG COMPONENTS Widgets Concurrent)
+if(WIN32)
+	find_package(Qt5 ${QT_MIN_VER} COMPONENTS WinExtras REQUIRED)
+	target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::WinExtras Qt5::Concurrent)
+else()
+	find_package(Qt5 ${QT_MIN_VER} COMPONENTS DBus Gui)
+	if(Qt5DBus_FOUND)
+		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::Concurrent)
+	endif()
+	target_include_directories(3rdparty_qt5 INTERFACE ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
+endif()
+
+if(NOT Qt5Widgets_FOUND)
+	if(Qt5Widgets_VERSION VERSION_LESS ${QT_MIN_VER})
+		message("Minimum supported Qt5 version is ${QT_MIN_VER}! You have version ${Qt5Widgets_VERSION} installed, please upgrade!")
+		if(CMAKE_SYSTEM MATCHES "Linux")
+			message(FATAL_ERROR "Most distros do not provide an up-to-date version of Qt.
+If you're on Ubuntu or Linux Mint, there are PPAs you can use to install one of the latest qt5 versions.
+Find the correct ppa at https://launchpad.net/~beineri and follow the instructions.")
+		elseif(WIN32)
+			message(FATAL_ERROR "You can download the latest version of Qt5 here: https://www.qt.io/download-open-source/")
+		else()
+			message(FATAL_ERROR "Look online for instructions on installing an up-to-date Qt5 on ${CMAKE_SYSTEM}.")
+		endif()
+	endif()
+
+	message("CMake was unable to find Qt5!")
+	if(WIN32)
+		message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\${QT_MIN_VER}\\msvc2019_64\\)
+You can also try setting the Qt5_DIR preprocessor definiton.")
+	elseif(CMAKE_SYSTEM MATCHES "Linux")
+		message(FATAL_ERROR "Make sure to install your distro's qt5 package!")
+	else()
+		message(FATAL_ERROR "You need to have Qt5 installed, look online for instructions on installing Qt5 on ${CMAKE_SYSTEM}.")
+	endif()
+endif()
+
+add_library(3rdparty::qt5 ALIAS 3rdparty_qt5)
diff --git a/3rdparty/qt6.cmake b/3rdparty/qt6.cmake
deleted file mode 100644
index ef89bdab05..0000000000
--- a/3rdparty/qt6.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-add_library(3rdparty_qt6 INTERFACE)
-
-set(QT_MIN_VER 6.7.0)
-
-find_package(Qt6 ${QT_MIN_VER} CONFIG COMPONENTS Widgets Concurrent Multimedia MultimediaWidgets Svg SvgWidgets)
-if(WIN32)
-	target_link_libraries(3rdparty_qt6 INTERFACE Qt6::Widgets Qt6::Concurrent Qt6::Multimedia Qt6::MultimediaWidgets Qt6::Svg Qt6::SvgWidgets)
-else()
-	find_package(Qt6 ${QT_MIN_VER} COMPONENTS DBus Gui)
-	if(Qt6DBus_FOUND)
-		target_link_libraries(3rdparty_qt6 INTERFACE Qt6::Widgets Qt6::DBus Qt6::Concurrent Qt6::Multimedia Qt6::MultimediaWidgets Qt6::Svg Qt6::SvgWidgets)
-		target_compile_definitions(3rdparty_qt6 INTERFACE -DHAVE_QTDBUS)
-	else()
-		target_link_libraries(3rdparty_qt6 INTERFACE Qt6::Widgets Qt6::Concurrent Qt6::Multimedia Qt6::MultimediaWidgets Qt6::Svg Qt6::SvgWidgets)
-	endif()
-	target_include_directories(3rdparty_qt6 INTERFACE ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
-endif()
-
-if(Qt6Widgets_FOUND)
-	if(Qt6Widgets_VERSION VERSION_LESS ${QT_MIN_VER})
-		message("Minimum supported Qt version is ${QT_MIN_VER}! You have version ${Qt6Widgets_VERSION} installed, please upgrade!")
-		if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-			message(FATAL_ERROR "Most distros do not provide an up-to-date version of Qt.
-If you're on Ubuntu or Linux Mint, there are PPAs you can use to install one of the latest qt6 versions.
-Find the correct ppa at https://launchpad.net/~beineri and follow the instructions.")
-		elseif(WIN32)
-			message(FATAL_ERROR "You can download the latest version of Qt6 here: https://www.qt.io/download-open-source/")
-		else()
-			message(FATAL_ERROR "Look online for instructions on installing an up-to-date Qt6 on ${CMAKE_SYSTEM}.")
-		endif()
-	endif()
-else()
-	message("CMake was unable to find Qt6!")
-	if(WIN32)
-		message(FATAL_ERROR "Make sure the Qt6_ROOT environment variable has been set properly. (for example C:\\Qt\\${QT_MIN_VER}\\msvc2022_64\\)")
-	elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-		message(FATAL_ERROR "Make sure to install your distro's qt6 package!")
-	else()
-		message(FATAL_ERROR "You need to have Qt6 installed, look online for instructions on installing Qt6 on ${CMAKE_SYSTEM}.")
-	endif()
-endif()
-
-add_library(3rdparty::qt6 ALIAS 3rdparty_qt6)
diff --git a/3rdparty/rtmidi/CMakeLists.txt b/3rdparty/rtmidi/CMakeLists.txt
deleted file mode 100644
index 610f858c6d..0000000000
--- a/3rdparty/rtmidi/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-option(RTMIDI_API_JACK "Compile with JACK support." OFF)
-option(RTMIDI_BUILD_TESTING "Build test programs" OFF)
-set(RTMIDI_TARGETNAME_UNINSTALL "uninstall-rpcs3-rtmidi")
-add_subdirectory(rtmidi EXCLUDE_FROM_ALL)
diff --git a/3rdparty/rtmidi/rtmidi b/3rdparty/rtmidi/rtmidi
deleted file mode 160000
index 1e5b49925a..0000000000
--- a/3rdparty/rtmidi/rtmidi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1e5b49925aa60065db52de44c366d446a902547b
diff --git a/3rdparty/stblib/CMakeLists.txt b/3rdparty/stblib/CMakeLists.txt
deleted file mode 100644
index 3426459edb..0000000000
--- a/3rdparty/stblib/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_library(3rdparty_stblib INTERFACE)
-target_include_directories(3rdparty_stblib INTERFACE stb)
diff --git a/3rdparty/stblib/LICENSE b/3rdparty/stblib/LICENSE
new file mode 100644
index 0000000000..8681adb3af
--- /dev/null
+++ b/3rdparty/stblib/LICENSE
@@ -0,0 +1,16 @@
+Copyright (c) 2017 Sean Barrett
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/3rdparty/stblib/include/stb_image.h b/3rdparty/stblib/include/stb_image.h
new file mode 100644
index 0000000000..0f8459a799
--- /dev/null
+++ b/3rdparty/stblib/include/stb_image.h
@@ -0,0 +1,7890 @@
+/* stb_image - v2.27 - public domain image loader - http://nothings.org/stb
+                                  no warranty implied; use at your own risk
+
+   Do this:
+      #define STB_IMAGE_IMPLEMENTATION
+   before you include this file in *one* C or C++ file to create the implementation.
+
+   // i.e. it should look like this:
+   #include ...
+   #include ...
+   #include ...
+   #define STB_IMAGE_IMPLEMENTATION
+   #include "stb_image.h"
+
+   You can #define STBI_ASSERT(x) before the #include to avoid using assert.h.
+   And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free
+
+
+   QUICK NOTES:
+      Primarily of interest to game developers and other people who can
+          avoid problematic images and only need the trivial interface
+
+      JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib)
+      PNG 1/2/4/8/16-bit-per-channel
+
+      TGA (not sure what subset, if a subset)
+      BMP non-1bpp, non-RLE
+      PSD (composited view only, no extra channels, 8/16 bit-per-channel)
+
+      GIF (*comp always reports as 4-channel)
+      HDR (radiance rgbE format)
+      PIC (Softimage PIC)
+      PNM (PPM and PGM binary only)
+
+      Animated GIF still needs a proper API, but here's one way to do it:
+          http://gist.github.com/urraka/685d9a6340b26b830d49
+
+      - decode from memory or through FILE (define STBI_NO_STDIO to remove code)
+      - decode from arbitrary I/O callbacks
+      - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON)
+
+   Full documentation under "DOCUMENTATION" below.
+
+
+LICENSE
+
+  See end of file for license information.
+
+RECENT REVISION HISTORY:
+
+      2.27  (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes
+      2.26  (2020-07-13) many minor fixes
+      2.25  (2020-02-02) fix warnings
+      2.24  (2020-02-02) fix warnings; thread-local failure_reason and flip_vertically
+      2.23  (2019-08-11) fix clang static analysis warning
+      2.22  (2019-03-04) gif fixes, fix warnings
+      2.21  (2019-02-25) fix typo in comment
+      2.20  (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs
+      2.19  (2018-02-11) fix warning
+      2.18  (2018-01-30) fix warnings
+      2.17  (2018-01-29) bugfix, 1-bit BMP, 16-bitness query, fix warnings
+      2.16  (2017-07-23) all functions have 16-bit variants; optimizations; bugfixes
+      2.15  (2017-03-18) fix png-1,2,4; all Imagenet JPGs; no runtime SSE detection on GCC
+      2.14  (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs
+      2.13  (2016-12-04) experimental 16-bit API, only for PNG so far; fixes
+      2.12  (2016-04-02) fix typo in 2.11 PSD fix that caused crashes
+      2.11  (2016-04-02) 16-bit PNGS; enable SSE2 in non-gcc x64
+                         RGB-format JPEG; remove white matting in PSD;
+                         allocate large structures on the stack;
+                         correct channel count for PNG & BMP
+      2.10  (2016-01-22) avoid warning introduced in 2.09
+      2.09  (2016-01-16) 16-bit TGA; comments in PNM files; STBI_REALLOC_SIZED
+
+   See end of file for full revision history.
+
+
+ ============================    Contributors    =========================
+
+ Image formats                          Extensions, features
+    Sean Barrett (jpeg, png, bmp)          Jetro Lauha (stbi_info)
+    Nicolas Schulz (hdr, psd)              Martin "SpartanJ" Golini (stbi_info)
+    Jonathan Dummer (tga)                  James "moose2000" Brown (iPhone PNG)
+    Jean-Marc Lienher (gif)                Ben "Disch" Wenger (io callbacks)
+    Tom Seddon (pic)                       Omar Cornut (1/2/4-bit PNG)
+    Thatcher Ulrich (psd)                  Nicolas Guillemot (vertical flip)
+    Ken Miller (pgm, ppm)                  Richard Mitton (16-bit PSD)
+    github:urraka (animated gif)           Junggon Kim (PNM comments)
+    Christopher Forseth (animated gif)     Daniel Gibson (16-bit TGA)
+                                           socks-the-fox (16-bit PNG)
+                                           Jeremy Sawicki (handle all ImageNet JPGs)
+ Optimizations & bugfixes                  Mikhail Morozov (1-bit BMP)
+    Fabian "ryg" Giesen                    Anael Seghezzi (is-16-bit query)
+    Arseny Kapoulkine                      Simon Breuss (16-bit PNM)
+    John-Mark Allen
+    Carmelo J Fdez-Aguera
+
+ Bug & warning fixes
+    Marc LeBlanc            David Woo          Guillaume George     Martins Mozeiko
+    Christpher Lloyd        Jerry Jansson      Joseph Thomson       Blazej Dariusz Roszkowski
+    Phil Jordan                                Dave Moore           Roy Eltham
+    Hayaki Saito            Nathan Reed        Won Chun
+    Luke Graham             Johan Duparc       Nick Verigakis       the Horde3D community
+    Thomas Ruf              Ronny Chevalier                         github:rlyeh
+    Janez Zemva             John Bartholomew   Michal Cichon        github:romigrou
+    Jonathan Blow           Ken Hamada         Tero Hanninen        github:svdijk
+    Eugene Golushkov        Laurent Gomila     Cort Stratton        github:snagar
+    Aruelien Pocheville     Sergio Gonzalez    Thibault Reuille     github:Zelex
+    Cass Everitt            Ryamond Barbiero                        github:grim210
+    Paul Du Bois            Engin Manap        Aldo Culquicondor    github:sammyhw
+    Philipp Wiesemann       Dale Weiler        Oriol Ferrer Mesia   github:phprus
+    Josh Tobin                                 Matthew Gregan       github:poppolopoppo
+    Julian Raschke          Gregory Mullen     Christian Floisand   github:darealshinji
+    Baldur Karlsson         Kevin Schmidt      JR Smith             github:Michaelangel007
+                            Brad Weinberger    Matvey Cherevko      github:mosra
+    Luca Sas                Alexander Veselov  Zack Middleton       [reserved]
+    Ryan C. Gordon          [reserved]                              [reserved]
+                     DO NOT ADD YOUR NAME HERE
+
+                     Jacko Dirks
+
+  To add your name to the credits, pick a random blank space in the middle and fill it.
+  80% of merge conflicts on stb PRs are due to people adding their name at the end
+  of the credits.
+*/
+
+#ifndef STBI_INCLUDE_STB_IMAGE_H
+#define STBI_INCLUDE_STB_IMAGE_H
+
+// DOCUMENTATION
+//
+// Limitations:
+//    - no 12-bit-per-channel JPEG
+//    - no JPEGs with arithmetic coding
+//    - GIF always returns *comp=4
+//
+// Basic usage (see HDR discussion below for HDR usage):
+//    int x,y,n;
+//    unsigned char *data = stbi_load(filename, &x, &y, &n, 0);
+//    // ... process data if not NULL ...
+//    // ... x = width, y = height, n = # 8-bit components per pixel ...
+//    // ... replace '0' with '1'..'4' to force that many components per pixel
+//    // ... but 'n' will always be the number that it would have been if you said 0
+//    stbi_image_free(data)
+//
+// Standard parameters:
+//    int *x                 -- outputs image width in pixels
+//    int *y                 -- outputs image height in pixels
+//    int *channels_in_file  -- outputs # of image components in image file
+//    int desired_channels   -- if non-zero, # of image components requested in result
+//
+// The return value from an image loader is an 'unsigned char *' which points
+// to the pixel data, or NULL on an allocation failure or if the image is
+// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels,
+// with each pixel consisting of N interleaved 8-bit components; the first
+// pixel pointed to is top-left-most in the image. There is no padding between
+// image scanlines or between pixels, regardless of format. The number of
+// components N is 'desired_channels' if desired_channels is non-zero, or
+// *channels_in_file otherwise. If desired_channels is non-zero,
+// *channels_in_file has the number of components that _would_ have been
+// output otherwise. E.g. if you set desired_channels to 4, you will always
+// get RGBA output, but you can check *channels_in_file to see if it's trivially
+// opaque because e.g. there were only 3 channels in the source image.
+//
+// An output image with N components has the following components interleaved
+// in this order in each pixel:
+//
+//     N=#comp     components
+//       1           grey
+//       2           grey, alpha
+//       3           red, green, blue
+//       4           red, green, blue, alpha
+//
+// If image loading fails for any reason, the return value will be NULL,
+// and *x, *y, *channels_in_file will be unchanged. The function
+// stbi_failure_reason() can be queried for an extremely brief, end-user
+// unfriendly explanation of why the load failed. Define STBI_NO_FAILURE_STRINGS
+// to avoid compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly
+// more user-friendly ones.
+//
+// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized.
+//
+// To query the width, height and component count of an image without having to
+// decode the full file, you can use the stbi_info family of functions:
+//
+//   int x,y,n,ok;
+//   ok = stbi_info(filename, &x, &y, &n);
+//   // returns ok=1 and sets x, y, n if image is a supported format,
+//   // 0 otherwise.
+//
+// Note that stb_image pervasively uses ints in its public API for sizes,
+// including sizes of memory buffers. This is now part of the API and thus
+// hard to change without causing breakage. As a result, the various image
+// loaders all have certain limits on image size; these differ somewhat
+// by format but generally boil down to either just under 2GB or just under
+// 1GB. When the decoded image would be larger than this, stb_image decoding
+// will fail.
+//
+// Additionally, stb_image will reject image files that have any of their
+// dimensions set to a larger value than the configurable STBI_MAX_DIMENSIONS,
+// which defaults to 2**24 = 16777216 pixels. Due to the above memory limit,
+// the only way to have an image with such dimensions load correctly
+// is for it to have a rather extreme aspect ratio. Either way, the
+// assumption here is that such larger images are likely to be malformed
+// or malicious. If you do need to load an image with individual dimensions
+// larger than that, and it still fits in the overall size limit, you can
+// #define STBI_MAX_DIMENSIONS on your own to be something larger.
+//
+// ===========================================================================
+//
+// UNICODE:
+//
+//   If compiling for Windows and you wish to use Unicode filenames, compile
+//   with
+//       #define STBI_WINDOWS_UTF8
+//   and pass utf8-encoded filenames. Call stbi_convert_wchar_to_utf8 to convert
+//   Windows wchar_t filenames to utf8.
+//
+// ===========================================================================
+//
+// Philosophy
+//
+// stb libraries are designed with the following priorities:
+//
+//    1. easy to use
+//    2. easy to maintain
+//    3. good performance
+//
+// Sometimes I let "good performance" creep up in priority over "easy to maintain",
+// and for best performance I may provide less-easy-to-use APIs that give higher
+// performance, in addition to the easy-to-use ones. Nevertheless, it's important
+// to keep in mind that from the standpoint of you, a client of this library,
+// all you care about is #1 and #3, and stb libraries DO NOT emphasize #3 above all.
+//
+// Some secondary priorities arise directly from the first two, some of which
+// provide more explicit reasons why performance can't be emphasized.
+//
+//    - Portable ("ease of use")
+//    - Small source code footprint ("easy to maintain")
+//    - No dependencies ("ease of use")
+//
+// ===========================================================================
+//
+// I/O callbacks
+//
+// I/O callbacks allow you to read from arbitrary sources, like packaged
+// files or some other source. Data read from callbacks are processed
+// through a small internal buffer (currently 128 bytes) to try to reduce
+// overhead.
+//
+// The three functions you must define are "read" (reads some bytes of data),
+// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end).
+//
+// ===========================================================================
+//
+// SIMD support
+//
+// The JPEG decoder will try to automatically use SIMD kernels on x86 when
+// supported by the compiler. For ARM Neon support, you must explicitly
+// request it.
+//
+// (The old do-it-yourself SIMD API is no longer supported in the current
+// code.)
+//
+// On x86, SSE2 will automatically be used when available based on a run-time
+// test; if not, the generic C versions are used as a fall-back. On ARM targets,
+// the typical path is to have separate builds for NEON and non-NEON devices
+// (at least this is true for iOS and Android). Therefore, the NEON support is
+// toggled by a build flag: define STBI_NEON to get NEON loops.
+//
+// If for some reason you do not want to use any of SIMD code, or if
+// you have issues compiling it, you can disable it entirely by
+// defining STBI_NO_SIMD.
+//
+// ===========================================================================
+//
+// HDR image support   (disable by defining STBI_NO_HDR)
+//
+// stb_image supports loading HDR images in general, and currently the Radiance
+// .HDR file format specifically. You can still load any file through the existing
+// interface; if you attempt to load an HDR file, it will be automatically remapped
+// to LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1;
+// both of these constants can be reconfigured through this interface:
+//
+//     stbi_hdr_to_ldr_gamma(2.2f);
+//     stbi_hdr_to_ldr_scale(1.0f);
+//
+// (note, do not use _inverse_ constants; stbi_image will invert them
+// appropriately).
+//
+// Additionally, there is a new, parallel interface for loading files as
+// (linear) floats to preserve the full dynamic range:
+//
+//    float *data = stbi_loadf(filename, &x, &y, &n, 0);
+//
+// If you load LDR images through this interface, those images will
+// be promoted to floating point values, run through the inverse of
+// constants corresponding to the above:
+//
+//     stbi_ldr_to_hdr_scale(1.0f);
+//     stbi_ldr_to_hdr_gamma(2.2f);
+//
+// Finally, given a filename (or an open file or memory block--see header
+// file for details) containing image data, you can query for the "most
+// appropriate" interface to use (that is, whether the image is HDR or
+// not), using:
+//
+//     stbi_is_hdr(char *filename);
+//
+// ===========================================================================
+//
+// iPhone PNG support:
+//
+// We optionally support converting iPhone-formatted PNGs (which store
+// premultiplied BGRA) back to RGB, even though they're internally encoded
+// differently. To enable this conversion, call
+// stbi_convert_iphone_png_to_rgb(1).
+//
+// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per
+// pixel to remove any premultiplied alpha *only* if the image file explicitly
+// says there's premultiplied data (currently only happens in iPhone images,
+// and only if iPhone convert-to-rgb processing is on).
+//
+// ===========================================================================
+//
+// ADDITIONAL CONFIGURATION
+//
+//  - You can suppress implementation of any of the decoders to reduce
+//    your code footprint by #defining one or more of the following
+//    symbols before creating the implementation.
+//
+//        STBI_NO_JPEG
+//        STBI_NO_PNG
+//        STBI_NO_BMP
+//        STBI_NO_PSD
+//        STBI_NO_TGA
+//        STBI_NO_GIF
+//        STBI_NO_HDR
+//        STBI_NO_PIC
+//        STBI_NO_PNM   (.ppm and .pgm)
+//
+//  - You can request *only* certain decoders and suppress all other ones
+//    (this will be more forward-compatible, as addition of new decoders
+//    doesn't require you to disable them explicitly):
+//
+//        STBI_ONLY_JPEG
+//        STBI_ONLY_PNG
+//        STBI_ONLY_BMP
+//        STBI_ONLY_PSD
+//        STBI_ONLY_TGA
+//        STBI_ONLY_GIF
+//        STBI_ONLY_HDR
+//        STBI_ONLY_PIC
+//        STBI_ONLY_PNM   (.ppm and .pgm)
+//
+//   - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still
+//     want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB
+//
+//  - If you define STBI_MAX_DIMENSIONS, stb_image will reject images greater
+//    than that size (in either width or height) without further processing.
+//    This is to let programs in the wild set an upper bound to prevent
+//    denial-of-service attacks on untrusted data, as one could generate a
+//    valid image of gigantic dimensions and force stb_image to allocate a
+//    huge block of memory and spend disproportionate time decoding it. By
+//    default this is set to (1 << 24), which is 16777216, but that's still
+//    very big.
+
+#ifndef STBI_NO_STDIO
+#include <stdio.h>
+#endif // STBI_NO_STDIO
+
+#define STBI_VERSION 1
+
+enum
+{
+   STBI_default = 0, // only used for desired_channels
+
+   STBI_grey       = 1,
+   STBI_grey_alpha = 2,
+   STBI_rgb        = 3,
+   STBI_rgb_alpha  = 4
+};
+
+#include <stdlib.h>
+typedef unsigned char stbi_uc;
+typedef unsigned short stbi_us;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef STBIDEF
+#ifdef STB_IMAGE_STATIC
+#define STBIDEF static
+#else
+#define STBIDEF extern
+#endif
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// PRIMARY API - works on images of any type
+//
+
+//
+// load image by filename, open file, or memory buffer
+//
+
+typedef struct
+{
+   int      (*read)  (void *user,char *data,int size);   // fill 'data' with 'size' bytes.  return number of bytes actually read
+   void     (*skip)  (void *user,int n);                 // skip the next 'n' bytes, or 'unget' the last -n bytes if negative
+   int      (*eof)   (void *user);                       // returns nonzero if we are at end of file/data
+} stbi_io_callbacks;
+
+////////////////////////////////////
+//
+// 8-bits-per-channel interface
+//
+
+STBIDEF stbi_uc *stbi_load_from_memory   (stbi_uc           const *buffer, int len   , int *x, int *y, int *channels_in_file, int desired_channels);
+STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk  , void *user, int *x, int *y, int *channels_in_file, int desired_channels);
+
+#ifndef STBI_NO_STDIO
+STBIDEF stbi_uc *stbi_load            (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
+STBIDEF stbi_uc *stbi_load_from_file  (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
+// for stbi_load_from_file, file pointer is left pointing immediately after image
+#endif
+
+#ifndef STBI_NO_GIF
+STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp);
+#endif
+
+#ifdef STBI_WINDOWS_UTF8
+STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input);
+#endif
+
+////////////////////////////////////
+//
+// 16-bits-per-channel interface
+//
+
+STBIDEF stbi_us *stbi_load_16_from_memory   (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels);
+STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels);
+
+#ifndef STBI_NO_STDIO
+STBIDEF stbi_us *stbi_load_16          (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
+STBIDEF stbi_us *stbi_load_from_file_16(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
+#endif
+
+////////////////////////////////////
+//
+// float-per-channel interface
+//
+#ifndef STBI_NO_LINEAR
+   STBIDEF float *stbi_loadf_from_memory     (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels);
+   STBIDEF float *stbi_loadf_from_callbacks  (stbi_io_callbacks const *clbk, void *user, int *x, int *y,  int *channels_in_file, int desired_channels);
+
+   #ifndef STBI_NO_STDIO
+   STBIDEF float *stbi_loadf            (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
+   STBIDEF float *stbi_loadf_from_file  (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
+   #endif
+#endif
+
+#ifndef STBI_NO_HDR
+   STBIDEF void   stbi_hdr_to_ldr_gamma(float gamma);
+   STBIDEF void   stbi_hdr_to_ldr_scale(float scale);
+#endif // STBI_NO_HDR
+
+#ifndef STBI_NO_LINEAR
+   STBIDEF void   stbi_ldr_to_hdr_gamma(float gamma);
+   STBIDEF void   stbi_ldr_to_hdr_scale(float scale);
+#endif // STBI_NO_LINEAR
+
+// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR
+STBIDEF int    stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user);
+STBIDEF int    stbi_is_hdr_from_memory(stbi_uc const *buffer, int len);
+#ifndef STBI_NO_STDIO
+STBIDEF int      stbi_is_hdr          (char const *filename);
+STBIDEF int      stbi_is_hdr_from_file(FILE *f);
+#endif // STBI_NO_STDIO
+
+
+// get a VERY brief reason for failure
+// on most compilers (and ALL modern mainstream compilers) this is threadsafe
+STBIDEF const char *stbi_failure_reason  (void);
+
+// free the loaded image -- this is just free()
+STBIDEF void     stbi_image_free      (void *retval_from_stbi_load);
+
+// get image dimensions & components without fully decoding
+STBIDEF int      stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp);
+STBIDEF int      stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp);
+STBIDEF int      stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len);
+STBIDEF int      stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *clbk, void *user);
+
+#ifndef STBI_NO_STDIO
+STBIDEF int      stbi_info               (char const *filename,     int *x, int *y, int *comp);
+STBIDEF int      stbi_info_from_file     (FILE *f,                  int *x, int *y, int *comp);
+STBIDEF int      stbi_is_16_bit          (char const *filename);
+STBIDEF int      stbi_is_16_bit_from_file(FILE *f);
+#endif
+
+
+
+// for image formats that explicitly notate that they have premultiplied alpha,
+// we just return the colors as stored in the file. set this flag to force
+// unpremultiplication. results are undefined if the unpremultiply overflow.
+STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply);
+
+// indicate whether we should process iphone images back to canonical format,
+// or just pass them through "as-is"
+STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert);
+
+// flip the image vertically, so the first pixel in the output array is the bottom left
+STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip);
+
+// as above, but only applies to images loaded on the thread that calls the function
+// this function is only available if your compiler supports thread-local variables;
+// calling it will fail to link if your compiler doesn't
+STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply);
+STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert);
+STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip);
+
+// ZLIB client - used by PNG, available for other purposes
+
+STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen);
+STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header);
+STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen);
+STBIDEF int   stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
+
+STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen);
+STBIDEF int   stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+//
+//
+////   end header file   /////////////////////////////////////////////////////
+#endif // STBI_INCLUDE_STB_IMAGE_H
+
+#ifdef STB_IMAGE_IMPLEMENTATION
+
+#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \
+  || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \
+  || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \
+  || defined(STBI_ONLY_ZLIB)
+   #ifndef STBI_ONLY_JPEG
+   #define STBI_NO_JPEG
+   #endif
+   #ifndef STBI_ONLY_PNG
+   #define STBI_NO_PNG
+   #endif
+   #ifndef STBI_ONLY_BMP
+   #define STBI_NO_BMP
+   #endif
+   #ifndef STBI_ONLY_PSD
+   #define STBI_NO_PSD
+   #endif
+   #ifndef STBI_ONLY_TGA
+   #define STBI_NO_TGA
+   #endif
+   #ifndef STBI_ONLY_GIF
+   #define STBI_NO_GIF
+   #endif
+   #ifndef STBI_ONLY_HDR
+   #define STBI_NO_HDR
+   #endif
+   #ifndef STBI_ONLY_PIC
+   #define STBI_NO_PIC
+   #endif
+   #ifndef STBI_ONLY_PNM
+   #define STBI_NO_PNM
+   #endif
+#endif
+
+#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB)
+#define STBI_NO_ZLIB
+#endif
+
+
+#include <stdarg.h>
+#include <stddef.h> // ptrdiff_t on osx
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
+#include <math.h>  // ldexp, pow
+#endif
+
+#ifndef STBI_NO_STDIO
+#include <stdio.h>
+#endif
+
+#ifndef STBI_ASSERT
+#include <assert.h>
+#define STBI_ASSERT(x) assert(x)
+#endif
+
+#ifdef __cplusplus
+#define STBI_EXTERN extern "C"
+#else
+#define STBI_EXTERN extern
+#endif
+
+
+#ifndef _MSC_VER
+   #ifdef __cplusplus
+   #define stbi_inline inline
+   #else
+   #define stbi_inline
+   #endif
+#else
+   #define stbi_inline __forceinline
+#endif
+
+#ifndef STBI_NO_THREAD_LOCALS
+   #if defined(__cplusplus) &&  __cplusplus >= 201103L
+      #define STBI_THREAD_LOCAL       thread_local
+   #elif defined(__GNUC__) && __GNUC__ < 5
+      #define STBI_THREAD_LOCAL       __thread
+   #elif defined(_MSC_VER)
+      #define STBI_THREAD_LOCAL       __declspec(thread)
+   #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_THREADS__)
+      #define STBI_THREAD_LOCAL       _Thread_local
+   #endif
+
+   #ifndef STBI_THREAD_LOCAL
+      #if defined(__GNUC__)
+        #define STBI_THREAD_LOCAL       __thread
+      #endif
+   #endif
+#endif
+
+#ifdef _MSC_VER
+typedef unsigned short stbi__uint16;
+typedef   signed short stbi__int16;
+typedef unsigned int   stbi__uint32;
+typedef   signed int   stbi__int32;
+#else
+#include <stdint.h>
+typedef uint16_t stbi__uint16;
+typedef int16_t  stbi__int16;
+typedef uint32_t stbi__uint32;
+typedef int32_t  stbi__int32;
+#endif
+
+// should produce compiler error if size is wrong
+typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1];
+
+#ifdef _MSC_VER
+#define STBI_NOTUSED(v)  (void)(v)
+#else
+#define STBI_NOTUSED(v)  (void)sizeof(v)
+#endif
+
+#ifdef _MSC_VER
+#define STBI_HAS_LROTL
+#endif
+
+#ifdef STBI_HAS_LROTL
+   #define stbi_lrot(x,y)  _lrotl(x,y)
+#else
+   #define stbi_lrot(x,y)  (((x) << (y)) | ((x) >> (-(y) & 31)))
+#endif
+
+#if defined(STBI_MALLOC) && defined(STBI_FREE) && (defined(STBI_REALLOC) || defined(STBI_REALLOC_SIZED))
+// ok
+#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) && !defined(STBI_REALLOC_SIZED)
+// ok
+#else
+#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC (or STBI_REALLOC_SIZED)."
+#endif
+
+#ifndef STBI_MALLOC
+#define STBI_MALLOC(sz)           malloc(sz)
+#define STBI_REALLOC(p,newsz)     realloc(p,newsz)
+#define STBI_FREE(p)              free(p)
+#endif
+
+#ifndef STBI_REALLOC_SIZED
+#define STBI_REALLOC_SIZED(p,oldsz,newsz) STBI_REALLOC(p,newsz)
+#endif
+
+// x86/x64 detection
+#if defined(__x86_64__) || defined(_M_X64)
+#define STBI__X64_TARGET
+#elif defined(__i386) || defined(_M_IX86)
+#define STBI__X86_TARGET
+#endif
+
+#if defined(__GNUC__) && defined(STBI__X86_TARGET) && !defined(__SSE2__) && !defined(STBI_NO_SIMD)
+// gcc doesn't support sse2 intrinsics unless you compile with -msse2,
+// which in turn means it gets to use SSE2 everywhere. This is unfortunate,
+// but previous attempts to provide the SSE2 functions with runtime
+// detection caused numerous issues. The way architecture extensions are
+// exposed in GCC/Clang is, sadly, not really suited for one-file libs.
+// New behavior: if compiled with -msse2, we use SSE2 without any
+// detection; if not, we don't use it at all.
+#define STBI_NO_SIMD
+#endif
+
+#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD)
+// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET
+//
+// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the
+// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant.
+// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not
+// simultaneously enabling "-mstackrealign".
+//
+// See https://github.com/nothings/stb/issues/81 for more information.
+//
+// So default to no SSE2 on 32-bit MinGW. If you've read this far and added
+// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2.
+#define STBI_NO_SIMD
+#endif
+
+#if !defined(STBI_NO_SIMD) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET))
+#define STBI_SSE2
+#include <emmintrin.h>
+
+#ifdef _MSC_VER
+
+#if _MSC_VER >= 1400  // not VC6
+#include <intrin.h> // __cpuid
+static int stbi__cpuid3(void)
+{
+   int info[4];
+   __cpuid(info,1);
+   return info[3];
+}
+#else
+static int stbi__cpuid3(void)
+{
+   int res;
+   __asm {
+      mov  eax,1
+      cpuid
+      mov  res,edx
+   }
+   return res;
+}
+#endif
+
+#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name
+
+#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2)
+static int stbi__sse2_available(void)
+{
+   int info3 = stbi__cpuid3();
+   return ((info3 >> 26) & 1) != 0;
+}
+#endif
+
+#else // assume GCC-style if not VC++
+#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
+
+#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2)
+static int stbi__sse2_available(void)
+{
+   // If we're even attempting to compile this on GCC/Clang, that means
+   // -msse2 is on, which means the compiler is allowed to use SSE2
+   // instructions at will, and so are we.
+   return 1;
+}
+#endif
+
+#endif
+#endif
+
+// ARM NEON
+#if defined(STBI_NO_SIMD) && defined(STBI_NEON)
+#undef STBI_NEON
+#endif
+
+#ifdef STBI_NEON
+#include <arm_neon.h>
+#ifdef _MSC_VER
+#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name
+#else
+#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
+#endif
+#endif
+
+#ifndef STBI_SIMD_ALIGN
+#define STBI_SIMD_ALIGN(type, name) type name
+#endif
+
+#ifndef STBI_MAX_DIMENSIONS
+#define STBI_MAX_DIMENSIONS (1 << 24)
+#endif
+
+///////////////////////////////////////////////
+//
+//  stbi__context struct and start_xxx functions
+
+// stbi__context structure is our basic context used by all images, so it
+// contains all the IO context, plus some basic image information
+typedef struct
+{
+   stbi__uint32 img_x, img_y;
+   int img_n, img_out_n;
+
+   stbi_io_callbacks io;
+   void *io_user_data;
+
+   int read_from_callbacks;
+   int buflen;
+   stbi_uc buffer_start[128];
+   int callback_already_read;
+
+   stbi_uc *img_buffer, *img_buffer_end;
+   stbi_uc *img_buffer_original, *img_buffer_original_end;
+} stbi__context;
+
+
+static void stbi__refill_buffer(stbi__context *s);
+
+// initialize a memory-decode context
+static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len)
+{
+   s->io.read = NULL;
+   s->read_from_callbacks = 0;
+   s->callback_already_read = 0;
+   s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer;
+   s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len;
+}
+
+// initialize a callback-based context
+static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user)
+{
+   s->io = *c;
+   s->io_user_data = user;
+   s->buflen = sizeof(s->buffer_start);
+   s->read_from_callbacks = 1;
+   s->callback_already_read = 0;
+   s->img_buffer = s->img_buffer_original = s->buffer_start;
+   stbi__refill_buffer(s);
+   s->img_buffer_original_end = s->img_buffer_end;
+}
+
+#ifndef STBI_NO_STDIO
+
+static int stbi__stdio_read(void *user, char *data, int size)
+{
+   return (int) fread(data,1,size,(FILE*) user);
+}
+
+static void stbi__stdio_skip(void *user, int n)
+{
+   int ch;
+   fseek((FILE*) user, n, SEEK_CUR);
+   ch = fgetc((FILE*) user);  /* have to read a byte to reset feof()'s flag */
+   if (ch != EOF) {
+      ungetc(ch, (FILE *) user);  /* push byte back onto stream if valid. */
+   }
+}
+
+static int stbi__stdio_eof(void *user)
+{
+   return feof((FILE*) user) || ferror((FILE *) user);
+}
+
+static stbi_io_callbacks stbi__stdio_callbacks =
+{
+   stbi__stdio_read,
+   stbi__stdio_skip,
+   stbi__stdio_eof,
+};
+
+static void stbi__start_file(stbi__context *s, FILE *f)
+{
+   stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f);
+}
+
+//static void stop_file(stbi__context *s) { }
+
+#endif // !STBI_NO_STDIO
+
+static void stbi__rewind(stbi__context *s)
+{
+   // conceptually rewind SHOULD rewind to the beginning of the stream,
+   // but we just rewind to the beginning of the initial buffer, because
+   // we only use it after doing 'test', which only ever looks at at most 92 bytes
+   s->img_buffer = s->img_buffer_original;
+   s->img_buffer_end = s->img_buffer_original_end;
+}
+
+enum
+{
+   STBI_ORDER_RGB,
+   STBI_ORDER_BGR
+};
+
+typedef struct
+{
+   int bits_per_channel;
+   int num_channels;
+   int channel_order;
+} stbi__result_info;
+
+#ifndef STBI_NO_JPEG
+static int      stbi__jpeg_test(stbi__context *s);
+static void    *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_PNG
+static int      stbi__png_test(stbi__context *s);
+static void    *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__png_info(stbi__context *s, int *x, int *y, int *comp);
+static int      stbi__png_is16(stbi__context *s);
+#endif
+
+#ifndef STBI_NO_BMP
+static int      stbi__bmp_test(stbi__context *s);
+static void    *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_TGA
+static int      stbi__tga_test(stbi__context *s);
+static void    *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__tga_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_PSD
+static int      stbi__psd_test(stbi__context *s);
+static void    *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc);
+static int      stbi__psd_info(stbi__context *s, int *x, int *y, int *comp);
+static int      stbi__psd_is16(stbi__context *s);
+#endif
+
+#ifndef STBI_NO_HDR
+static int      stbi__hdr_test(stbi__context *s);
+static float   *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_PIC
+static int      stbi__pic_test(stbi__context *s);
+static void    *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__pic_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_GIF
+static int      stbi__gif_test(stbi__context *s);
+static void    *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static void    *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp);
+static int      stbi__gif_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_PNM
+static int      stbi__pnm_test(stbi__context *s);
+static void    *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp);
+static int      stbi__pnm_is16(stbi__context *s);
+#endif
+
+static
+#ifdef STBI_THREAD_LOCAL
+STBI_THREAD_LOCAL
+#endif
+const char *stbi__g_failure_reason;
+
+STBIDEF const char *stbi_failure_reason(void)
+{
+   return stbi__g_failure_reason;
+}
+
+#ifndef STBI_NO_FAILURE_STRINGS
+static int stbi__err(const char *str)
+{
+   stbi__g_failure_reason = str;
+   return 0;
+}
+#endif
+
+static void *stbi__malloc(size_t size)
+{
+    return STBI_MALLOC(size);
+}
+
+// stb_image uses ints pervasively, including for offset calculations.
+// therefore the largest decoded image size we can support with the
+// current code, even on 64-bit targets, is INT_MAX. this is not a
+// significant limitation for the intended use case.
+//
+// we do, however, need to make sure our size calculations don't
+// overflow. hence a few helper functions for size calculations that
+// multiply integers together, making sure that they're non-negative
+// and no overflow occurs.
+
+// return 1 if the sum is valid, 0 on overflow.
+// negative terms are considered invalid.
+static int stbi__addsizes_valid(int a, int b)
+{
+   if (b < 0) return 0;
+   // now 0 <= b <= INT_MAX, hence also
+   // 0 <= INT_MAX - b <= INTMAX.
+   // And "a + b <= INT_MAX" (which might overflow) is the
+   // same as a <= INT_MAX - b (no overflow)
+   return a <= INT_MAX - b;
+}
+
+// returns 1 if the product is valid, 0 on overflow.
+// negative factors are considered invalid.
+static int stbi__mul2sizes_valid(int a, int b)
+{
+   if (a < 0 || b < 0) return 0;
+   if (b == 0) return 1; // mul-by-0 is always safe
+   // portable way to check for no overflows in a*b
+   return a <= INT_MAX/b;
+}
+
+#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR)
+// returns 1 if "a*b + add" has no negative terms/factors and doesn't overflow
+static int stbi__mad2sizes_valid(int a, int b, int add)
+{
+   return stbi__mul2sizes_valid(a, b) && stbi__addsizes_valid(a*b, add);
+}
+#endif
+
+// returns 1 if "a*b*c + add" has no negative terms/factors and doesn't overflow
+static int stbi__mad3sizes_valid(int a, int b, int c, int add)
+{
+   return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) &&
+      stbi__addsizes_valid(a*b*c, add);
+}
+
+// returns 1 if "a*b*c*d + add" has no negative terms/factors and doesn't overflow
+#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
+static int stbi__mad4sizes_valid(int a, int b, int c, int d, int add)
+{
+   return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) &&
+      stbi__mul2sizes_valid(a*b*c, d) && stbi__addsizes_valid(a*b*c*d, add);
+}
+#endif
+
+#if !defined(STBI_NO_JPEG) || !defined(STBI_NO_PNG) || !defined(STBI_NO_TGA) || !defined(STBI_NO_HDR)
+// mallocs with size overflow checking
+static void *stbi__malloc_mad2(int a, int b, int add)
+{
+   if (!stbi__mad2sizes_valid(a, b, add)) return NULL;
+   return stbi__malloc(a*b + add);
+}
+#endif
+
+static void *stbi__malloc_mad3(int a, int b, int c, int add)
+{
+   if (!stbi__mad3sizes_valid(a, b, c, add)) return NULL;
+   return stbi__malloc(a*b*c + add);
+}
+
+#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
+static void *stbi__malloc_mad4(int a, int b, int c, int d, int add)
+{
+   if (!stbi__mad4sizes_valid(a, b, c, d, add)) return NULL;
+   return stbi__malloc(a*b*c*d + add);
+}
+#endif
+
+// stbi__err - error
+// stbi__errpf - error returning pointer to float
+// stbi__errpuc - error returning pointer to unsigned char
+
+#ifdef STBI_NO_FAILURE_STRINGS
+   #define stbi__err(x,y)  0
+#elif defined(STBI_FAILURE_USERMSG)
+   #define stbi__err(x,y)  stbi__err(y)
+#else
+   #define stbi__err(x,y)  stbi__err(x)
+#endif
+
+#define stbi__errpf(x,y)   ((float *)(size_t) (stbi__err(x,y)?NULL:NULL))
+#define stbi__errpuc(x,y)  ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL))
+
+STBIDEF void stbi_image_free(void *retval_from_stbi_load)
+{
+   STBI_FREE(retval_from_stbi_load);
+}
+
+#ifndef STBI_NO_LINEAR
+static float   *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp);
+#endif
+
+#ifndef STBI_NO_HDR
+static stbi_uc *stbi__hdr_to_ldr(float   *data, int x, int y, int comp);
+#endif
+
+static int stbi__vertically_flip_on_load_global = 0;
+
+STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip)
+{
+   stbi__vertically_flip_on_load_global = flag_true_if_should_flip;
+}
+
+#ifndef STBI_THREAD_LOCAL
+#define stbi__vertically_flip_on_load  stbi__vertically_flip_on_load_global
+#else
+static STBI_THREAD_LOCAL int stbi__vertically_flip_on_load_local, stbi__vertically_flip_on_load_set;
+
+STBIDEF void stbi_set_flip_vertically_on_load_thread(int flag_true_if_should_flip)
+{
+   stbi__vertically_flip_on_load_local = flag_true_if_should_flip;
+   stbi__vertically_flip_on_load_set = 1;
+}
+
+#define stbi__vertically_flip_on_load  (stbi__vertically_flip_on_load_set       \
+                                         ? stbi__vertically_flip_on_load_local  \
+                                         : stbi__vertically_flip_on_load_global)
+#endif // STBI_THREAD_LOCAL
+
+static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc)
+{
+   memset(ri, 0, sizeof(*ri)); // make sure it's initialized if we add new fields
+   ri->bits_per_channel = 8; // default is 8 so most paths don't have to be changed
+   ri->channel_order = STBI_ORDER_RGB; // all current input & output are this, but this is here so we can add BGR order
+   ri->num_channels = 0;
+
+   // test the formats with a very explicit header first (at least a FOURCC
+   // or distinctive magic number first)
+   #ifndef STBI_NO_PNG
+   if (stbi__png_test(s))  return stbi__png_load(s,x,y,comp,req_comp, ri);
+   #endif
+   #ifndef STBI_NO_BMP
+   if (stbi__bmp_test(s))  return stbi__bmp_load(s,x,y,comp,req_comp, ri);
+   #endif
+   #ifndef STBI_NO_GIF
+   if (stbi__gif_test(s))  return stbi__gif_load(s,x,y,comp,req_comp, ri);
+   #endif
+   #ifndef STBI_NO_PSD
+   if (stbi__psd_test(s))  return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc);
+   #else
+   STBI_NOTUSED(bpc);
+   #endif
+   #ifndef STBI_NO_PIC
+   if (stbi__pic_test(s))  return stbi__pic_load(s,x,y,comp,req_comp, ri);
+   #endif
+
+   // then the formats that can end up attempting to load with just 1 or 2
+   // bytes matching expectations; these are prone to false positives, so
+   // try them later
+   #ifndef STBI_NO_JPEG
+   if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp, ri);
+   #endif
+   #ifndef STBI_NO_PNM
+   if (stbi__pnm_test(s))  return stbi__pnm_load(s,x,y,comp,req_comp, ri);
+   #endif
+
+   #ifndef STBI_NO_HDR
+   if (stbi__hdr_test(s)) {
+      float *hdr = stbi__hdr_load(s, x,y,comp,req_comp, ri);
+      return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp);
+   }
+   #endif
+
+   #ifndef STBI_NO_TGA
+   // test tga last because it's a crappy test!
+   if (stbi__tga_test(s))
+      return stbi__tga_load(s,x,y,comp,req_comp, ri);
+   #endif
+
+   return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt");
+}
+
+static stbi_uc *stbi__convert_16_to_8(stbi__uint16 *orig, int w, int h, int channels)
+{
+   int i;
+   int img_len = w * h * channels;
+   stbi_uc *reduced;
+
+   reduced = (stbi_uc *) stbi__malloc(img_len);
+   if (reduced == NULL) return stbi__errpuc("outofmem", "Out of memory");
+
+   for (i = 0; i < img_len; ++i)
+      reduced[i] = (stbi_uc)((orig[i] >> 8) & 0xFF); // top half of each byte is sufficient approx of 16->8 bit scaling
+
+   STBI_FREE(orig);
+   return reduced;
+}
+
+static stbi__uint16 *stbi__convert_8_to_16(stbi_uc *orig, int w, int h, int channels)
+{
+   int i;
+   int img_len = w * h * channels;
+   stbi__uint16 *enlarged;
+
+   enlarged = (stbi__uint16 *) stbi__malloc(img_len*2);
+   if (enlarged == NULL) return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory");
+
+   for (i = 0; i < img_len; ++i)
+      enlarged[i] = (stbi__uint16)((orig[i] << 8) + orig[i]); // replicate to high and low byte, maps 0->0, 255->0xffff
+
+   STBI_FREE(orig);
+   return enlarged;
+}
+
+static void stbi__vertical_flip(void *image, int w, int h, int bytes_per_pixel)
+{
+   int row;
+   size_t bytes_per_row = (size_t)w * bytes_per_pixel;
+   stbi_uc temp[2048];
+   stbi_uc *bytes = (stbi_uc *)image;
+
+   for (row = 0; row < (h>>1); row++) {
+      stbi_uc *row0 = bytes + row*bytes_per_row;
+      stbi_uc *row1 = bytes + (h - row - 1)*bytes_per_row;
+      // swap row0 with row1
+      size_t bytes_left = bytes_per_row;
+      while (bytes_left) {
+         size_t bytes_copy = (bytes_left < sizeof(temp)) ? bytes_left : sizeof(temp);
+         memcpy(temp, row0, bytes_copy);
+         memcpy(row0, row1, bytes_copy);
+         memcpy(row1, temp, bytes_copy);
+         row0 += bytes_copy;
+         row1 += bytes_copy;
+         bytes_left -= bytes_copy;
+      }
+   }
+}
+
+#ifndef STBI_NO_GIF
+static void stbi__vertical_flip_slices(void *image, int w, int h, int z, int bytes_per_pixel)
+{
+   int slice;
+   int slice_size = w * h * bytes_per_pixel;
+
+   stbi_uc *bytes = (stbi_uc *)image;
+   for (slice = 0; slice < z; ++slice) {
+      stbi__vertical_flip(bytes, w, h, bytes_per_pixel);
+      bytes += slice_size;
+   }
+}
+#endif
+
+static unsigned char *stbi__load_and_postprocess_8bit(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__result_info ri;
+   void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 8);
+
+   if (result == NULL)
+      return NULL;
+
+   // it is the responsibility of the loaders to make sure we get either 8 or 16 bit.
+   STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16);
+
+   if (ri.bits_per_channel != 8) {
+      result = stbi__convert_16_to_8((stbi__uint16 *) result, *x, *y, req_comp == 0 ? *comp : req_comp);
+      ri.bits_per_channel = 8;
+   }
+
+   // @TODO: move stbi__convert_format to here
+
+   if (stbi__vertically_flip_on_load) {
+      int channels = req_comp ? req_comp : *comp;
+      stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi_uc));
+   }
+
+   return (unsigned char *) result;
+}
+
+static stbi__uint16 *stbi__load_and_postprocess_16bit(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__result_info ri;
+   void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 16);
+
+   if (result == NULL)
+      return NULL;
+
+   // it is the responsibility of the loaders to make sure we get either 8 or 16 bit.
+   STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16);
+
+   if (ri.bits_per_channel != 16) {
+      result = stbi__convert_8_to_16((stbi_uc *) result, *x, *y, req_comp == 0 ? *comp : req_comp);
+      ri.bits_per_channel = 16;
+   }
+
+   // @TODO: move stbi__convert_format16 to here
+   // @TODO: special case RGB-to-Y (and RGBA-to-YA) for 8-bit-to-16-bit case to keep more precision
+
+   if (stbi__vertically_flip_on_load) {
+      int channels = req_comp ? req_comp : *comp;
+      stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi__uint16));
+   }
+
+   return (stbi__uint16 *) result;
+}
+
+#if !defined(STBI_NO_HDR) && !defined(STBI_NO_LINEAR)
+static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp)
+{
+   if (stbi__vertically_flip_on_load && result != NULL) {
+      int channels = req_comp ? req_comp : *comp;
+      stbi__vertical_flip(result, *x, *y, channels * sizeof(float));
+   }
+}
+#endif
+
+#ifndef STBI_NO_STDIO
+
+#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8)
+STBI_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide);
+STBI_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default);
+#endif
+
+#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8)
+STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input)
+{
+	return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL);
+}
+#endif
+
+static FILE *stbi__fopen(char const *filename, char const *mode)
+{
+   FILE *f;
+#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8)
+   wchar_t wMode[64];
+   wchar_t wFilename[1024];
+	if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename)/sizeof(*wFilename)))
+      return 0;
+
+	if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode)/sizeof(*wMode)))
+      return 0;
+
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+	if (0 != _wfopen_s(&f, wFilename, wMode))
+		f = 0;
+#else
+   f = _wfopen(wFilename, wMode);
+#endif
+
+#elif defined(_MSC_VER) && _MSC_VER >= 1400
+   if (0 != fopen_s(&f, filename, mode))
+      f=0;
+#else
+   f = fopen(filename, mode);
+#endif
+   return f;
+}
+
+
+STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp)
+{
+   FILE *f = stbi__fopen(filename, "rb");
+   unsigned char *result;
+   if (!f) return stbi__errpuc("can't fopen", "Unable to open file");
+   result = stbi_load_from_file(f,x,y,comp,req_comp);
+   fclose(f);
+   return result;
+}
+
+STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
+{
+   unsigned char *result;
+   stbi__context s;
+   stbi__start_file(&s,f);
+   result = stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
+   if (result) {
+      // need to 'unget' all the characters in the IO buffer
+      fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR);
+   }
+   return result;
+}
+
+STBIDEF stbi__uint16 *stbi_load_from_file_16(FILE *f, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__uint16 *result;
+   stbi__context s;
+   stbi__start_file(&s,f);
+   result = stbi__load_and_postprocess_16bit(&s,x,y,comp,req_comp);
+   if (result) {
+      // need to 'unget' all the characters in the IO buffer
+      fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR);
+   }
+   return result;
+}
+
+STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *comp, int req_comp)
+{
+   FILE *f = stbi__fopen(filename, "rb");
+   stbi__uint16 *result;
+   if (!f) return (stbi_us *) stbi__errpuc("can't fopen", "Unable to open file");
+   result = stbi_load_from_file_16(f,x,y,comp,req_comp);
+   fclose(f);
+   return result;
+}
+
+
+#endif //!STBI_NO_STDIO
+
+STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels)
+{
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels);
+}
+
+STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels)
+{
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user);
+   return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels);
+}
+
+STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
+}
+
+STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
+   return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
+}
+
+#ifndef STBI_NO_GIF
+STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp)
+{
+   unsigned char *result;
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+
+   result = (unsigned char*) stbi__load_gif_main(&s, delays, x, y, z, comp, req_comp);
+   if (stbi__vertically_flip_on_load) {
+      stbi__vertical_flip_slices( result, *x, *y, *z, *comp );
+   }
+
+   return result;
+}
+#endif
+
+#ifndef STBI_NO_LINEAR
+static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   unsigned char *data;
+   #ifndef STBI_NO_HDR
+   if (stbi__hdr_test(s)) {
+      stbi__result_info ri;
+      float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp, &ri);
+      if (hdr_data)
+         stbi__float_postprocess(hdr_data,x,y,comp,req_comp);
+      return hdr_data;
+   }
+   #endif
+   data = stbi__load_and_postprocess_8bit(s, x, y, comp, req_comp);
+   if (data)
+      return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp);
+   return stbi__errpf("unknown image type", "Image not of any known type, or corrupt");
+}
+
+STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__loadf_main(&s,x,y,comp,req_comp);
+}
+
+STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
+   return stbi__loadf_main(&s,x,y,comp,req_comp);
+}
+
+#ifndef STBI_NO_STDIO
+STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp)
+{
+   float *result;
+   FILE *f = stbi__fopen(filename, "rb");
+   if (!f) return stbi__errpf("can't fopen", "Unable to open file");
+   result = stbi_loadf_from_file(f,x,y,comp,req_comp);
+   fclose(f);
+   return result;
+}
+
+STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_file(&s,f);
+   return stbi__loadf_main(&s,x,y,comp,req_comp);
+}
+#endif // !STBI_NO_STDIO
+
+#endif // !STBI_NO_LINEAR
+
+// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is
+// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always
+// reports false!
+
+STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len)
+{
+   #ifndef STBI_NO_HDR
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__hdr_test(&s);
+   #else
+   STBI_NOTUSED(buffer);
+   STBI_NOTUSED(len);
+   return 0;
+   #endif
+}
+
+#ifndef STBI_NO_STDIO
+STBIDEF int      stbi_is_hdr          (char const *filename)
+{
+   FILE *f = stbi__fopen(filename, "rb");
+   int result=0;
+   if (f) {
+      result = stbi_is_hdr_from_file(f);
+      fclose(f);
+   }
+   return result;
+}
+
+STBIDEF int stbi_is_hdr_from_file(FILE *f)
+{
+   #ifndef STBI_NO_HDR
+   long pos = ftell(f);
+   int res;
+   stbi__context s;
+   stbi__start_file(&s,f);
+   res = stbi__hdr_test(&s);
+   fseek(f, pos, SEEK_SET);
+   return res;
+   #else
+   STBI_NOTUSED(f);
+   return 0;
+   #endif
+}
+#endif // !STBI_NO_STDIO
+
+STBIDEF int      stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user)
+{
+   #ifndef STBI_NO_HDR
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
+   return stbi__hdr_test(&s);
+   #else
+   STBI_NOTUSED(clbk);
+   STBI_NOTUSED(user);
+   return 0;
+   #endif
+}
+
+#ifndef STBI_NO_LINEAR
+static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f;
+
+STBIDEF void   stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; }
+STBIDEF void   stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; }
+#endif
+
+static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f;
+
+STBIDEF void   stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; }
+STBIDEF void   stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; }
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Common code used by all image loaders
+//
+
+enum
+{
+   STBI__SCAN_load=0,
+   STBI__SCAN_type,
+   STBI__SCAN_header
+};
+
+static void stbi__refill_buffer(stbi__context *s)
+{
+   int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen);
+   s->callback_already_read += (int) (s->img_buffer - s->img_buffer_original);
+   if (n == 0) {
+      // at end of file, treat same as if from memory, but need to handle case
+      // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file
+      s->read_from_callbacks = 0;
+      s->img_buffer = s->buffer_start;
+      s->img_buffer_end = s->buffer_start+1;
+      *s->img_buffer = 0;
+   } else {
+      s->img_buffer = s->buffer_start;
+      s->img_buffer_end = s->buffer_start + n;
+   }
+}
+
+stbi_inline static stbi_uc stbi__get8(stbi__context *s)
+{
+   if (s->img_buffer < s->img_buffer_end)
+      return *s->img_buffer++;
+   if (s->read_from_callbacks) {
+      stbi__refill_buffer(s);
+      return *s->img_buffer++;
+   }
+   return 0;
+}
+
+#if defined(STBI_NO_JPEG) && defined(STBI_NO_HDR) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM)
+// nothing
+#else
+stbi_inline static int stbi__at_eof(stbi__context *s)
+{
+   if (s->io.read) {
+      if (!(s->io.eof)(s->io_user_data)) return 0;
+      // if feof() is true, check if buffer = end
+      // special case: we've only got the special 0 character at the end
+      if (s->read_from_callbacks == 0) return 1;
+   }
+
+   return s->img_buffer >= s->img_buffer_end;
+}
+#endif
+
+#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC)
+// nothing
+#else
+static void stbi__skip(stbi__context *s, int n)
+{
+   if (n == 0) return;  // already there!
+   if (n < 0) {
+      s->img_buffer = s->img_buffer_end;
+      return;
+   }
+   if (s->io.read) {
+      int blen = (int) (s->img_buffer_end - s->img_buffer);
+      if (blen < n) {
+         s->img_buffer = s->img_buffer_end;
+         (s->io.skip)(s->io_user_data, n - blen);
+         return;
+      }
+   }
+   s->img_buffer += n;
+}
+#endif
+
+#if defined(STBI_NO_PNG) && defined(STBI_NO_TGA) && defined(STBI_NO_HDR) && defined(STBI_NO_PNM)
+// nothing
+#else
+static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n)
+{
+   if (s->io.read) {
+      int blen = (int) (s->img_buffer_end - s->img_buffer);
+      if (blen < n) {
+         int res, count;
+
+         memcpy(buffer, s->img_buffer, blen);
+
+         count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen);
+         res = (count == (n-blen));
+         s->img_buffer = s->img_buffer_end;
+         return res;
+      }
+   }
+
+   if (s->img_buffer+n <= s->img_buffer_end) {
+      memcpy(buffer, s->img_buffer, n);
+      s->img_buffer += n;
+      return 1;
+   } else
+      return 0;
+}
+#endif
+
+#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC)
+// nothing
+#else
+static int stbi__get16be(stbi__context *s)
+{
+   int z = stbi__get8(s);
+   return (z << 8) + stbi__get8(s);
+}
+#endif
+
+#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD) && defined(STBI_NO_PIC)
+// nothing
+#else
+static stbi__uint32 stbi__get32be(stbi__context *s)
+{
+   stbi__uint32 z = stbi__get16be(s);
+   return (z << 16) + stbi__get16be(s);
+}
+#endif
+
+#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF)
+// nothing
+#else
+static int stbi__get16le(stbi__context *s)
+{
+   int z = stbi__get8(s);
+   return z + (stbi__get8(s) << 8);
+}
+#endif
+
+#ifndef STBI_NO_BMP
+static stbi__uint32 stbi__get32le(stbi__context *s)
+{
+   stbi__uint32 z = stbi__get16le(s);
+   z += (stbi__uint32)stbi__get16le(s) << 16;
+   return z;
+}
+#endif
+
+#define STBI__BYTECAST(x)  ((stbi_uc) ((x) & 255))  // truncate int to byte without warnings
+
+#if defined(STBI_NO_JPEG) && defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM)
+// nothing
+#else
+//////////////////////////////////////////////////////////////////////////////
+//
+//  generic converter from built-in img_n to req_comp
+//    individual types do this automatically as much as possible (e.g. jpeg
+//    does all cases internally since it needs to colorspace convert anyway,
+//    and it never has alpha, so very few cases ). png can automatically
+//    interleave an alpha=255 channel, but falls back to this for other cases
+//
+//  assume data buffer is malloced, so malloc a new one and free that one
+//  only failure mode is malloc failing
+
+static stbi_uc stbi__compute_y(int r, int g, int b)
+{
+   return (stbi_uc) (((r*77) + (g*150) +  (29*b)) >> 8);
+}
+#endif
+
+#if defined(STBI_NO_PNG) && defined(STBI_NO_BMP) && defined(STBI_NO_PSD) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) && defined(STBI_NO_PIC) && defined(STBI_NO_PNM)
+// nothing
+#else
+static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y)
+{
+   int i,j;
+   unsigned char *good;
+
+   if (req_comp == img_n) return data;
+   STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
+
+   good = (unsigned char *) stbi__malloc_mad3(req_comp, x, y, 0);
+   if (good == NULL) {
+      STBI_FREE(data);
+      return stbi__errpuc("outofmem", "Out of memory");
+   }
+
+   for (j=0; j < (int) y; ++j) {
+      unsigned char *src  = data + j * x * img_n   ;
+      unsigned char *dest = good + j * x * req_comp;
+
+      #define STBI__COMBO(a,b)  ((a)*8+(b))
+      #define STBI__CASE(a,b)   case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b)
+      // convert source image with img_n components to one with req_comp components;
+      // avoid switch per pixel, so use switch per scanline and massive macros
+      switch (STBI__COMBO(img_n, req_comp)) {
+         STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=255;                                     } break;
+         STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0];                                  } break;
+         STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=255;                     } break;
+         STBI__CASE(2,1) { dest[0]=src[0];                                                  } break;
+         STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0];                                  } break;
+         STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1];                  } break;
+         STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=255;        } break;
+         STBI__CASE(3,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]);                   } break;
+         STBI__CASE(3,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = 255;    } break;
+         STBI__CASE(4,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]);                   } break;
+         STBI__CASE(4,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = src[3]; } break;
+         STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];                    } break;
+         default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return stbi__errpuc("unsupported", "Unsupported format conversion");
+      }
+      #undef STBI__CASE
+   }
+
+   STBI_FREE(data);
+   return good;
+}
+#endif
+
+#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD)
+// nothing
+#else
+static stbi__uint16 stbi__compute_y_16(int r, int g, int b)
+{
+   return (stbi__uint16) (((r*77) + (g*150) +  (29*b)) >> 8);
+}
+#endif
+
+#if defined(STBI_NO_PNG) && defined(STBI_NO_PSD)
+// nothing
+#else
+static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int req_comp, unsigned int x, unsigned int y)
+{
+   int i,j;
+   stbi__uint16 *good;
+
+   if (req_comp == img_n) return data;
+   STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
+
+   good = (stbi__uint16 *) stbi__malloc(req_comp * x * y * 2);
+   if (good == NULL) {
+      STBI_FREE(data);
+      return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory");
+   }
+
+   for (j=0; j < (int) y; ++j) {
+      stbi__uint16 *src  = data + j * x * img_n   ;
+      stbi__uint16 *dest = good + j * x * req_comp;
+
+      #define STBI__COMBO(a,b)  ((a)*8+(b))
+      #define STBI__CASE(a,b)   case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b)
+      // convert source image with img_n components to one with req_comp components;
+      // avoid switch per pixel, so use switch per scanline and massive macros
+      switch (STBI__COMBO(img_n, req_comp)) {
+         STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=0xffff;                                     } break;
+         STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0];                                     } break;
+         STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=0xffff;                     } break;
+         STBI__CASE(2,1) { dest[0]=src[0];                                                     } break;
+         STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0];                                     } break;
+         STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1];                     } break;
+         STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=0xffff;        } break;
+         STBI__CASE(3,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]);                   } break;
+         STBI__CASE(3,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = 0xffff; } break;
+         STBI__CASE(4,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]);                   } break;
+         STBI__CASE(4,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = src[3]; } break;
+         STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];                       } break;
+         default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return (stbi__uint16*) stbi__errpuc("unsupported", "Unsupported format conversion");
+      }
+      #undef STBI__CASE
+   }
+
+   STBI_FREE(data);
+   return good;
+}
+#endif
+
+#ifndef STBI_NO_LINEAR
+static float   *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp)
+{
+   int i,k,n;
+   float *output;
+   if (!data) return NULL;
+   output = (float *) stbi__malloc_mad4(x, y, comp, sizeof(float), 0);
+   if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); }
+   // compute number of non-alpha components
+   if (comp & 1) n = comp; else n = comp-1;
+   for (i=0; i < x*y; ++i) {
+      for (k=0; k < n; ++k) {
+         output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale);
+      }
+   }
+   if (n < comp) {
+      for (i=0; i < x*y; ++i) {
+         output[i*comp + n] = data[i*comp + n]/255.0f;
+      }
+   }
+   STBI_FREE(data);
+   return output;
+}
+#endif
+
+#ifndef STBI_NO_HDR
+#define stbi__float2int(x)   ((int) (x))
+static stbi_uc *stbi__hdr_to_ldr(float   *data, int x, int y, int comp)
+{
+   int i,k,n;
+   stbi_uc *output;
+   if (!data) return NULL;
+   output = (stbi_uc *) stbi__malloc_mad3(x, y, comp, 0);
+   if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); }
+   // compute number of non-alpha components
+   if (comp & 1) n = comp; else n = comp-1;
+   for (i=0; i < x*y; ++i) {
+      for (k=0; k < n; ++k) {
+         float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f;
+         if (z < 0) z = 0;
+         if (z > 255) z = 255;
+         output[i*comp + k] = (stbi_uc) stbi__float2int(z);
+      }
+      if (k < comp) {
+         float z = data[i*comp+k] * 255 + 0.5f;
+         if (z < 0) z = 0;
+         if (z > 255) z = 255;
+         output[i*comp + k] = (stbi_uc) stbi__float2int(z);
+      }
+   }
+   STBI_FREE(data);
+   return output;
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  "baseline" JPEG/JFIF decoder
+//
+//    simple implementation
+//      - doesn't support delayed output of y-dimension
+//      - simple interface (only one output format: 8-bit interleaved RGB)
+//      - doesn't try to recover corrupt jpegs
+//      - doesn't allow partial loading, loading multiple at once
+//      - still fast on x86 (copying globals into locals doesn't help x86)
+//      - allocates lots of intermediate memory (full size of all components)
+//        - non-interleaved case requires this anyway
+//        - allows good upsampling (see next)
+//    high-quality
+//      - upsampled channels are bilinearly interpolated, even across blocks
+//      - quality integer IDCT derived from IJG's 'slow'
+//    performance
+//      - fast huffman; reasonable integer IDCT
+//      - some SIMD kernels for common paths on targets with SSE2/NEON
+//      - uses a lot of intermediate memory, could cache poorly
+
+#ifndef STBI_NO_JPEG
+
+// huffman decoding acceleration
+#define FAST_BITS   9  // larger handles more cases; smaller stomps less cache
+
+typedef struct
+{
+   stbi_uc  fast[1 << FAST_BITS];
+   // weirdly, repacking this into AoS is a 10% speed loss, instead of a win
+   stbi__uint16 code[256];
+   stbi_uc  values[256];
+   stbi_uc  size[257];
+   unsigned int maxcode[18];
+   int    delta[17];   // old 'firstsymbol' - old 'firstcode'
+} stbi__huffman;
+
+typedef struct
+{
+   stbi__context *s;
+   stbi__huffman huff_dc[4];
+   stbi__huffman huff_ac[4];
+   stbi__uint16 dequant[4][64];
+   stbi__int16 fast_ac[4][1 << FAST_BITS];
+
+// sizes for components, interleaved MCUs
+   int img_h_max, img_v_max;
+   int img_mcu_x, img_mcu_y;
+   int img_mcu_w, img_mcu_h;
+
+// definition of jpeg image component
+   struct
+   {
+      int id;
+      int h,v;
+      int tq;
+      int hd,ha;
+      int dc_pred;
+
+      int x,y,w2,h2;
+      stbi_uc *data;
+      void *raw_data, *raw_coeff;
+      stbi_uc *linebuf;
+      short   *coeff;   // progressive only
+      int      coeff_w, coeff_h; // number of 8x8 coefficient blocks
+   } img_comp[4];
+
+   stbi__uint32   code_buffer; // jpeg entropy-coded buffer
+   int            code_bits;   // number of valid bits
+   unsigned char  marker;      // marker seen while filling entropy buffer
+   int            nomore;      // flag if we saw a marker so must stop
+
+   int            progressive;
+   int            spec_start;
+   int            spec_end;
+   int            succ_high;
+   int            succ_low;
+   int            eob_run;
+   int            jfif;
+   int            app14_color_transform; // Adobe APP14 tag
+   int            rgb;
+
+   int scan_n, order[4];
+   int restart_interval, todo;
+
+// kernels
+   void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]);
+   void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step);
+   stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs);
+} stbi__jpeg;
+
+static int stbi__build_huffman(stbi__huffman *h, int *count)
+{
+   int i,j,k=0;
+   unsigned int code;
+   // build size list for each symbol (from JPEG spec)
+   for (i=0; i < 16; ++i)
+      for (j=0; j < count[i]; ++j)
+         h->size[k++] = (stbi_uc) (i+1);
+   h->size[k] = 0;
+
+   // compute actual symbols (from jpeg spec)
+   code = 0;
+   k = 0;
+   for(j=1; j <= 16; ++j) {
+      // compute delta to add to code to compute symbol id
+      h->delta[j] = k - code;
+      if (h->size[k] == j) {
+         while (h->size[k] == j)
+            h->code[k++] = (stbi__uint16) (code++);
+         if (code-1 >= (1u << j)) return stbi__err("bad code lengths","Corrupt JPEG");
+      }
+      // compute largest code + 1 for this size, preshifted as needed later
+      h->maxcode[j] = code << (16-j);
+      code <<= 1;
+   }
+   h->maxcode[j] = 0xffffffff;
+
+   // build non-spec acceleration table; 255 is flag for not-accelerated
+   memset(h->fast, 255, 1 << FAST_BITS);
+   for (i=0; i < k; ++i) {
+      int s = h->size[i];
+      if (s <= FAST_BITS) {
+         int c = h->code[i] << (FAST_BITS-s);
+         int m = 1 << (FAST_BITS-s);
+         for (j=0; j < m; ++j) {
+            h->fast[c+j] = (stbi_uc) i;
+         }
+      }
+   }
+   return 1;
+}
+
+// build a table that decodes both magnitude and value of small ACs in
+// one go.
+static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h)
+{
+   int i;
+   for (i=0; i < (1 << FAST_BITS); ++i) {
+      stbi_uc fast = h->fast[i];
+      fast_ac[i] = 0;
+      if (fast < 255) {
+         int rs = h->values[fast];
+         int run = (rs >> 4) & 15;
+         int magbits = rs & 15;
+         int len = h->size[fast];
+
+         if (magbits && len + magbits <= FAST_BITS) {
+            // magnitude code followed by receive_extend code
+            int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits);
+            int m = 1 << (magbits - 1);
+            if (k < m) k += (~0U << magbits) + 1;
+            // if the result is small enough, we can fit it in fast_ac table
+            if (k >= -128 && k <= 127)
+               fast_ac[i] = (stbi__int16) ((k * 256) + (run * 16) + (len + magbits));
+         }
+      }
+   }
+}
+
+static void stbi__grow_buffer_unsafe(stbi__jpeg *j)
+{
+   do {
+      unsigned int b = j->nomore ? 0 : stbi__get8(j->s);
+      if (b == 0xff) {
+         int c = stbi__get8(j->s);
+         while (c == 0xff) c = stbi__get8(j->s); // consume fill bytes
+         if (c != 0) {
+            j->marker = (unsigned char) c;
+            j->nomore = 1;
+            return;
+         }
+      }
+      j->code_buffer |= b << (24 - j->code_bits);
+      j->code_bits += 8;
+   } while (j->code_bits <= 24);
+}
+
+// (1 << n) - 1
+static const stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535};
+
+// decode a jpeg huffman value from the bitstream
+stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h)
+{
+   unsigned int temp;
+   int c,k;
+
+   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+
+   // look at the top FAST_BITS and determine what symbol ID it is,
+   // if the code is <= FAST_BITS
+   c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
+   k = h->fast[c];
+   if (k < 255) {
+      int s = h->size[k];
+      if (s > j->code_bits)
+         return -1;
+      j->code_buffer <<= s;
+      j->code_bits -= s;
+      return h->values[k];
+   }
+
+   // naive test is to shift the code_buffer down so k bits are
+   // valid, then test against maxcode. To speed this up, we've
+   // preshifted maxcode left so that it has (16-k) 0s at the
+   // end; in other words, regardless of the number of bits, it
+   // wants to be compared against something shifted to have 16;
+   // that way we don't need to shift inside the loop.
+   temp = j->code_buffer >> 16;
+   for (k=FAST_BITS+1 ; ; ++k)
+      if (temp < h->maxcode[k])
+         break;
+   if (k == 17) {
+      // error! code not found
+      j->code_bits -= 16;
+      return -1;
+   }
+
+   if (k > j->code_bits)
+      return -1;
+
+   // convert the huffman code to the symbol id
+   c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k];
+   STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]);
+
+   // convert the id to a symbol
+   j->code_bits -= k;
+   j->code_buffer <<= k;
+   return h->values[c];
+}
+
+// bias[n] = (-1<<n) + 1
+static const int stbi__jbias[16] = {0,-1,-3,-7,-15,-31,-63,-127,-255,-511,-1023,-2047,-4095,-8191,-16383,-32767};
+
+// combined JPEG 'receive' and JPEG 'extend', since baseline
+// always extends everything it receives.
+stbi_inline static int stbi__extend_receive(stbi__jpeg *j, int n)
+{
+   unsigned int k;
+   int sgn;
+   if (j->code_bits < n) stbi__grow_buffer_unsafe(j);
+
+   sgn = j->code_buffer >> 31; // sign bit always in MSB; 0 if MSB clear (positive), 1 if MSB set (negative)
+   k = stbi_lrot(j->code_buffer, n);
+   j->code_buffer = k & ~stbi__bmask[n];
+   k &= stbi__bmask[n];
+   j->code_bits -= n;
+   return k + (stbi__jbias[n] & (sgn - 1));
+}
+
+// get some unsigned bits
+stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n)
+{
+   unsigned int k;
+   if (j->code_bits < n) stbi__grow_buffer_unsafe(j);
+   k = stbi_lrot(j->code_buffer, n);
+   j->code_buffer = k & ~stbi__bmask[n];
+   k &= stbi__bmask[n];
+   j->code_bits -= n;
+   return k;
+}
+
+stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j)
+{
+   unsigned int k;
+   if (j->code_bits < 1) stbi__grow_buffer_unsafe(j);
+   k = j->code_buffer;
+   j->code_buffer <<= 1;
+   --j->code_bits;
+   return k & 0x80000000;
+}
+
+// given a value that's at position X in the zigzag stream,
+// where does it appear in the 8x8 matrix coded as row-major?
+static const stbi_uc stbi__jpeg_dezigzag[64+15] =
+{
+    0,  1,  8, 16,  9,  2,  3, 10,
+   17, 24, 32, 25, 18, 11,  4,  5,
+   12, 19, 26, 33, 40, 48, 41, 34,
+   27, 20, 13,  6,  7, 14, 21, 28,
+   35, 42, 49, 56, 57, 50, 43, 36,
+   29, 22, 15, 23, 30, 37, 44, 51,
+   58, 59, 52, 45, 38, 31, 39, 46,
+   53, 60, 61, 54, 47, 55, 62, 63,
+   // let corrupt input sample past end
+   63, 63, 63, 63, 63, 63, 63, 63,
+   63, 63, 63, 63, 63, 63, 63
+};
+
+// decode one 64-entry block--
+static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi__uint16 *dequant)
+{
+   int diff,dc,k;
+   int t;
+
+   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+   t = stbi__jpeg_huff_decode(j, hdc);
+   if (t < 0 || t > 15) return stbi__err("bad huffman code","Corrupt JPEG");
+
+   // 0 all the ac values now so we can do it 32-bits at a time
+   memset(data,0,64*sizeof(data[0]));
+
+   diff = t ? stbi__extend_receive(j, t) : 0;
+   dc = j->img_comp[b].dc_pred + diff;
+   j->img_comp[b].dc_pred = dc;
+   data[0] = (short) (dc * dequant[0]);
+
+   // decode AC components, see JPEG spec
+   k = 1;
+   do {
+      unsigned int zig;
+      int c,r,s;
+      if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+      c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
+      r = fac[c];
+      if (r) { // fast-AC path
+         k += (r >> 4) & 15; // run
+         s = r & 15; // combined length
+         j->code_buffer <<= s;
+         j->code_bits -= s;
+         // decode into unzigzag'd location
+         zig = stbi__jpeg_dezigzag[k++];
+         data[zig] = (short) ((r >> 8) * dequant[zig]);
+      } else {
+         int rs = stbi__jpeg_huff_decode(j, hac);
+         if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
+         s = rs & 15;
+         r = rs >> 4;
+         if (s == 0) {
+            if (rs != 0xf0) break; // end block
+            k += 16;
+         } else {
+            k += r;
+            // decode into unzigzag'd location
+            zig = stbi__jpeg_dezigzag[k++];
+            data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]);
+         }
+      }
+   } while (k < 64);
+   return 1;
+}
+
+static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b)
+{
+   int diff,dc;
+   int t;
+   if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
+
+   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+
+   if (j->succ_high == 0) {
+      // first scan for DC coefficient, must be first
+      memset(data,0,64*sizeof(data[0])); // 0 all the ac values now
+      t = stbi__jpeg_huff_decode(j, hdc);
+      if (t < 0 || t > 15) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
+      diff = t ? stbi__extend_receive(j, t) : 0;
+
+      dc = j->img_comp[b].dc_pred + diff;
+      j->img_comp[b].dc_pred = dc;
+      data[0] = (short) (dc * (1 << j->succ_low));
+   } else {
+      // refinement scan for DC coefficient
+      if (stbi__jpeg_get_bit(j))
+         data[0] += (short) (1 << j->succ_low);
+   }
+   return 1;
+}
+
+// @OPTIMIZE: store non-zigzagged during the decode passes,
+// and only de-zigzag when dequantizing
+static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac)
+{
+   int k;
+   if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
+
+   if (j->succ_high == 0) {
+      int shift = j->succ_low;
+
+      if (j->eob_run) {
+         --j->eob_run;
+         return 1;
+      }
+
+      k = j->spec_start;
+      do {
+         unsigned int zig;
+         int c,r,s;
+         if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+         c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
+         r = fac[c];
+         if (r) { // fast-AC path
+            k += (r >> 4) & 15; // run
+            s = r & 15; // combined length
+            j->code_buffer <<= s;
+            j->code_bits -= s;
+            zig = stbi__jpeg_dezigzag[k++];
+            data[zig] = (short) ((r >> 8) * (1 << shift));
+         } else {
+            int rs = stbi__jpeg_huff_decode(j, hac);
+            if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
+            s = rs & 15;
+            r = rs >> 4;
+            if (s == 0) {
+               if (r < 15) {
+                  j->eob_run = (1 << r);
+                  if (r)
+                     j->eob_run += stbi__jpeg_get_bits(j, r);
+                  --j->eob_run;
+                  break;
+               }
+               k += 16;
+            } else {
+               k += r;
+               zig = stbi__jpeg_dezigzag[k++];
+               data[zig] = (short) (stbi__extend_receive(j,s) * (1 << shift));
+            }
+         }
+      } while (k <= j->spec_end);
+   } else {
+      // refinement scan for these AC coefficients
+
+      short bit = (short) (1 << j->succ_low);
+
+      if (j->eob_run) {
+         --j->eob_run;
+         for (k = j->spec_start; k <= j->spec_end; ++k) {
+            short *p = &data[stbi__jpeg_dezigzag[k]];
+            if (*p != 0)
+               if (stbi__jpeg_get_bit(j))
+                  if ((*p & bit)==0) {
+                     if (*p > 0)
+                        *p += bit;
+                     else
+                        *p -= bit;
+                  }
+         }
+      } else {
+         k = j->spec_start;
+         do {
+            int r,s;
+            int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh
+            if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
+            s = rs & 15;
+            r = rs >> 4;
+            if (s == 0) {
+               if (r < 15) {
+                  j->eob_run = (1 << r) - 1;
+                  if (r)
+                     j->eob_run += stbi__jpeg_get_bits(j, r);
+                  r = 64; // force end of block
+               } else {
+                  // r=15 s=0 should write 16 0s, so we just do
+                  // a run of 15 0s and then write s (which is 0),
+                  // so we don't have to do anything special here
+               }
+            } else {
+               if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG");
+               // sign bit
+               if (stbi__jpeg_get_bit(j))
+                  s = bit;
+               else
+                  s = -bit;
+            }
+
+            // advance by r
+            while (k <= j->spec_end) {
+               short *p = &data[stbi__jpeg_dezigzag[k++]];
+               if (*p != 0) {
+                  if (stbi__jpeg_get_bit(j))
+                     if ((*p & bit)==0) {
+                        if (*p > 0)
+                           *p += bit;
+                        else
+                           *p -= bit;
+                     }
+               } else {
+                  if (r == 0) {
+                     *p = (short) s;
+                     break;
+                  }
+                  --r;
+               }
+            }
+         } while (k <= j->spec_end);
+      }
+   }
+   return 1;
+}
+
+// take a -128..127 value and stbi__clamp it and convert to 0..255
+stbi_inline static stbi_uc stbi__clamp(int x)
+{
+   // trick to use a single test to catch both cases
+   if ((unsigned int) x > 255) {
+      if (x < 0) return 0;
+      if (x > 255) return 255;
+   }
+   return (stbi_uc) x;
+}
+
+#define stbi__f2f(x)  ((int) (((x) * 4096 + 0.5)))
+#define stbi__fsh(x)  ((x) * 4096)
+
+// derived from jidctint -- DCT_ISLOW
+#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \
+   int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \
+   p2 = s2;                                    \
+   p3 = s6;                                    \
+   p1 = (p2+p3) * stbi__f2f(0.5411961f);       \
+   t2 = p1 + p3*stbi__f2f(-1.847759065f);      \
+   t3 = p1 + p2*stbi__f2f( 0.765366865f);      \
+   p2 = s0;                                    \
+   p3 = s4;                                    \
+   t0 = stbi__fsh(p2+p3);                      \
+   t1 = stbi__fsh(p2-p3);                      \
+   x0 = t0+t3;                                 \
+   x3 = t0-t3;                                 \
+   x1 = t1+t2;                                 \
+   x2 = t1-t2;                                 \
+   t0 = s7;                                    \
+   t1 = s5;                                    \
+   t2 = s3;                                    \
+   t3 = s1;                                    \
+   p3 = t0+t2;                                 \
+   p4 = t1+t3;                                 \
+   p1 = t0+t3;                                 \
+   p2 = t1+t2;                                 \
+   p5 = (p3+p4)*stbi__f2f( 1.175875602f);      \
+   t0 = t0*stbi__f2f( 0.298631336f);           \
+   t1 = t1*stbi__f2f( 2.053119869f);           \
+   t2 = t2*stbi__f2f( 3.072711026f);           \
+   t3 = t3*stbi__f2f( 1.501321110f);           \
+   p1 = p5 + p1*stbi__f2f(-0.899976223f);      \
+   p2 = p5 + p2*stbi__f2f(-2.562915447f);      \
+   p3 = p3*stbi__f2f(-1.961570560f);           \
+   p4 = p4*stbi__f2f(-0.390180644f);           \
+   t3 += p1+p4;                                \
+   t2 += p2+p3;                                \
+   t1 += p2+p4;                                \
+   t0 += p1+p3;
+
+static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64])
+{
+   int i,val[64],*v=val;
+   stbi_uc *o;
+   short *d = data;
+
+   // columns
+   for (i=0; i < 8; ++i,++d, ++v) {
+      // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing
+      if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0
+           && d[40]==0 && d[48]==0 && d[56]==0) {
+         //    no shortcut                 0     seconds
+         //    (1|2|3|4|5|6|7)==0          0     seconds
+         //    all separate               -0.047 seconds
+         //    1 && 2|3 && 4|5 && 6|7:    -0.047 seconds
+         int dcterm = d[0]*4;
+         v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm;
+      } else {
+         STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56])
+         // constants scaled things up by 1<<12; let's bring them back
+         // down, but keep 2 extra bits of precision
+         x0 += 512; x1 += 512; x2 += 512; x3 += 512;
+         v[ 0] = (x0+t3) >> 10;
+         v[56] = (x0-t3) >> 10;
+         v[ 8] = (x1+t2) >> 10;
+         v[48] = (x1-t2) >> 10;
+         v[16] = (x2+t1) >> 10;
+         v[40] = (x2-t1) >> 10;
+         v[24] = (x3+t0) >> 10;
+         v[32] = (x3-t0) >> 10;
+      }
+   }
+
+   for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) {
+      // no fast case since the first 1D IDCT spread components out
+      STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7])
+      // constants scaled things up by 1<<12, plus we had 1<<2 from first
+      // loop, plus horizontal and vertical each scale by sqrt(8) so together
+      // we've got an extra 1<<3, so 1<<17 total we need to remove.
+      // so we want to round that, which means adding 0.5 * 1<<17,
+      // aka 65536. Also, we'll end up with -128 to 127 that we want
+      // to encode as 0..255 by adding 128, so we'll add that before the shift
+      x0 += 65536 + (128<<17);
+      x1 += 65536 + (128<<17);
+      x2 += 65536 + (128<<17);
+      x3 += 65536 + (128<<17);
+      // tried computing the shifts into temps, or'ing the temps to see
+      // if any were out of range, but that was slower
+      o[0] = stbi__clamp((x0+t3) >> 17);
+      o[7] = stbi__clamp((x0-t3) >> 17);
+      o[1] = stbi__clamp((x1+t2) >> 17);
+      o[6] = stbi__clamp((x1-t2) >> 17);
+      o[2] = stbi__clamp((x2+t1) >> 17);
+      o[5] = stbi__clamp((x2-t1) >> 17);
+      o[3] = stbi__clamp((x3+t0) >> 17);
+      o[4] = stbi__clamp((x3-t0) >> 17);
+   }
+}
+
+#ifdef STBI_SSE2
+// sse2 integer IDCT. not the fastest possible implementation but it
+// produces bit-identical results to the generic C version so it's
+// fully "transparent".
+static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64])
+{
+   // This is constructed to match our regular (generic) integer IDCT exactly.
+   __m128i row0, row1, row2, row3, row4, row5, row6, row7;
+   __m128i tmp;
+
+   // dot product constant: even elems=x, odd elems=y
+   #define dct_const(x,y)  _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y))
+
+   // out(0) = c0[even]*x + c0[odd]*y   (c0, x, y 16-bit, out 32-bit)
+   // out(1) = c1[even]*x + c1[odd]*y
+   #define dct_rot(out0,out1, x,y,c0,c1) \
+      __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \
+      __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \
+      __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \
+      __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \
+      __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \
+      __m128i out1##_h = _mm_madd_epi16(c0##hi, c1)
+
+   // out = in << 12  (in 16-bit, out 32-bit)
+   #define dct_widen(out, in) \
+      __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \
+      __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4)
+
+   // wide add
+   #define dct_wadd(out, a, b) \
+      __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \
+      __m128i out##_h = _mm_add_epi32(a##_h, b##_h)
+
+   // wide sub
+   #define dct_wsub(out, a, b) \
+      __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \
+      __m128i out##_h = _mm_sub_epi32(a##_h, b##_h)
+
+   // butterfly a/b, add bias, then shift by "s" and pack
+   #define dct_bfly32o(out0, out1, a,b,bias,s) \
+      { \
+         __m128i abiased_l = _mm_add_epi32(a##_l, bias); \
+         __m128i abiased_h = _mm_add_epi32(a##_h, bias); \
+         dct_wadd(sum, abiased, b); \
+         dct_wsub(dif, abiased, b); \
+         out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \
+         out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \
+      }
+
+   // 8-bit interleave step (for transposes)
+   #define dct_interleave8(a, b) \
+      tmp = a; \
+      a = _mm_unpacklo_epi8(a, b); \
+      b = _mm_unpackhi_epi8(tmp, b)
+
+   // 16-bit interleave step (for transposes)
+   #define dct_interleave16(a, b) \
+      tmp = a; \
+      a = _mm_unpacklo_epi16(a, b); \
+      b = _mm_unpackhi_epi16(tmp, b)
+
+   #define dct_pass(bias,shift) \
+      { \
+         /* even part */ \
+         dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \
+         __m128i sum04 = _mm_add_epi16(row0, row4); \
+         __m128i dif04 = _mm_sub_epi16(row0, row4); \
+         dct_widen(t0e, sum04); \
+         dct_widen(t1e, dif04); \
+         dct_wadd(x0, t0e, t3e); \
+         dct_wsub(x3, t0e, t3e); \
+         dct_wadd(x1, t1e, t2e); \
+         dct_wsub(x2, t1e, t2e); \
+         /* odd part */ \
+         dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \
+         dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \
+         __m128i sum17 = _mm_add_epi16(row1, row7); \
+         __m128i sum35 = _mm_add_epi16(row3, row5); \
+         dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \
+         dct_wadd(x4, y0o, y4o); \
+         dct_wadd(x5, y1o, y5o); \
+         dct_wadd(x6, y2o, y5o); \
+         dct_wadd(x7, y3o, y4o); \
+         dct_bfly32o(row0,row7, x0,x7,bias,shift); \
+         dct_bfly32o(row1,row6, x1,x6,bias,shift); \
+         dct_bfly32o(row2,row5, x2,x5,bias,shift); \
+         dct_bfly32o(row3,row4, x3,x4,bias,shift); \
+      }
+
+   __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f));
+   __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f));
+   __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f));
+   __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f));
+   __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f));
+   __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f));
+   __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f));
+   __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f));
+
+   // rounding biases in column/row passes, see stbi__idct_block for explanation.
+   __m128i bias_0 = _mm_set1_epi32(512);
+   __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17));
+
+   // load
+   row0 = _mm_load_si128((const __m128i *) (data + 0*8));
+   row1 = _mm_load_si128((const __m128i *) (data + 1*8));
+   row2 = _mm_load_si128((const __m128i *) (data + 2*8));
+   row3 = _mm_load_si128((const __m128i *) (data + 3*8));
+   row4 = _mm_load_si128((const __m128i *) (data + 4*8));
+   row5 = _mm_load_si128((const __m128i *) (data + 5*8));
+   row6 = _mm_load_si128((const __m128i *) (data + 6*8));
+   row7 = _mm_load_si128((const __m128i *) (data + 7*8));
+
+   // column pass
+   dct_pass(bias_0, 10);
+
+   {
+      // 16bit 8x8 transpose pass 1
+      dct_interleave16(row0, row4);
+      dct_interleave16(row1, row5);
+      dct_interleave16(row2, row6);
+      dct_interleave16(row3, row7);
+
+      // transpose pass 2
+      dct_interleave16(row0, row2);
+      dct_interleave16(row1, row3);
+      dct_interleave16(row4, row6);
+      dct_interleave16(row5, row7);
+
+      // transpose pass 3
+      dct_interleave16(row0, row1);
+      dct_interleave16(row2, row3);
+      dct_interleave16(row4, row5);
+      dct_interleave16(row6, row7);
+   }
+
+   // row pass
+   dct_pass(bias_1, 17);
+
+   {
+      // pack
+      __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7
+      __m128i p1 = _mm_packus_epi16(row2, row3);
+      __m128i p2 = _mm_packus_epi16(row4, row5);
+      __m128i p3 = _mm_packus_epi16(row6, row7);
+
+      // 8bit 8x8 transpose pass 1
+      dct_interleave8(p0, p2); // a0e0a1e1...
+      dct_interleave8(p1, p3); // c0g0c1g1...
+
+      // transpose pass 2
+      dct_interleave8(p0, p1); // a0c0e0g0...
+      dct_interleave8(p2, p3); // b0d0f0h0...
+
+      // transpose pass 3
+      dct_interleave8(p0, p2); // a0b0c0d0...
+      dct_interleave8(p1, p3); // a4b4c4d4...
+
+      // store
+      _mm_storel_epi64((__m128i *) out, p0); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, p2); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, p1); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, p3); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e));
+   }
+
+#undef dct_const
+#undef dct_rot
+#undef dct_widen
+#undef dct_wadd
+#undef dct_wsub
+#undef dct_bfly32o
+#undef dct_interleave8
+#undef dct_interleave16
+#undef dct_pass
+}
+
+#endif // STBI_SSE2
+
+#ifdef STBI_NEON
+
+// NEON integer IDCT. should produce bit-identical
+// results to the generic C version.
+static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64])
+{
+   int16x8_t row0, row1, row2, row3, row4, row5, row6, row7;
+
+   int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f));
+   int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f));
+   int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f));
+   int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f));
+   int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f));
+   int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f));
+   int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f));
+   int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f));
+   int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f));
+   int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f));
+   int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f));
+   int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f));
+
+#define dct_long_mul(out, inq, coeff) \
+   int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \
+   int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff)
+
+#define dct_long_mac(out, acc, inq, coeff) \
+   int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \
+   int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff)
+
+#define dct_widen(out, inq) \
+   int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \
+   int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12)
+
+// wide add
+#define dct_wadd(out, a, b) \
+   int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \
+   int32x4_t out##_h = vaddq_s32(a##_h, b##_h)
+
+// wide sub
+#define dct_wsub(out, a, b) \
+   int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \
+   int32x4_t out##_h = vsubq_s32(a##_h, b##_h)
+
+// butterfly a/b, then shift using "shiftop" by "s" and pack
+#define dct_bfly32o(out0,out1, a,b,shiftop,s) \
+   { \
+      dct_wadd(sum, a, b); \
+      dct_wsub(dif, a, b); \
+      out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \
+      out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \
+   }
+
+#define dct_pass(shiftop, shift) \
+   { \
+      /* even part */ \
+      int16x8_t sum26 = vaddq_s16(row2, row6); \
+      dct_long_mul(p1e, sum26, rot0_0); \
+      dct_long_mac(t2e, p1e, row6, rot0_1); \
+      dct_long_mac(t3e, p1e, row2, rot0_2); \
+      int16x8_t sum04 = vaddq_s16(row0, row4); \
+      int16x8_t dif04 = vsubq_s16(row0, row4); \
+      dct_widen(t0e, sum04); \
+      dct_widen(t1e, dif04); \
+      dct_wadd(x0, t0e, t3e); \
+      dct_wsub(x3, t0e, t3e); \
+      dct_wadd(x1, t1e, t2e); \
+      dct_wsub(x2, t1e, t2e); \
+      /* odd part */ \
+      int16x8_t sum15 = vaddq_s16(row1, row5); \
+      int16x8_t sum17 = vaddq_s16(row1, row7); \
+      int16x8_t sum35 = vaddq_s16(row3, row5); \
+      int16x8_t sum37 = vaddq_s16(row3, row7); \
+      int16x8_t sumodd = vaddq_s16(sum17, sum35); \
+      dct_long_mul(p5o, sumodd, rot1_0); \
+      dct_long_mac(p1o, p5o, sum17, rot1_1); \
+      dct_long_mac(p2o, p5o, sum35, rot1_2); \
+      dct_long_mul(p3o, sum37, rot2_0); \
+      dct_long_mul(p4o, sum15, rot2_1); \
+      dct_wadd(sump13o, p1o, p3o); \
+      dct_wadd(sump24o, p2o, p4o); \
+      dct_wadd(sump23o, p2o, p3o); \
+      dct_wadd(sump14o, p1o, p4o); \
+      dct_long_mac(x4, sump13o, row7, rot3_0); \
+      dct_long_mac(x5, sump24o, row5, rot3_1); \
+      dct_long_mac(x6, sump23o, row3, rot3_2); \
+      dct_long_mac(x7, sump14o, row1, rot3_3); \
+      dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \
+      dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \
+      dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \
+      dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \
+   }
+
+   // load
+   row0 = vld1q_s16(data + 0*8);
+   row1 = vld1q_s16(data + 1*8);
+   row2 = vld1q_s16(data + 2*8);
+   row3 = vld1q_s16(data + 3*8);
+   row4 = vld1q_s16(data + 4*8);
+   row5 = vld1q_s16(data + 5*8);
+   row6 = vld1q_s16(data + 6*8);
+   row7 = vld1q_s16(data + 7*8);
+
+   // add DC bias
+   row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0));
+
+   // column pass
+   dct_pass(vrshrn_n_s32, 10);
+
+   // 16bit 8x8 transpose
+   {
+// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively.
+// whether compilers actually get this is another story, sadly.
+#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; }
+#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); }
+#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); }
+
+      // pass 1
+      dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6
+      dct_trn16(row2, row3);
+      dct_trn16(row4, row5);
+      dct_trn16(row6, row7);
+
+      // pass 2
+      dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4
+      dct_trn32(row1, row3);
+      dct_trn32(row4, row6);
+      dct_trn32(row5, row7);
+
+      // pass 3
+      dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0
+      dct_trn64(row1, row5);
+      dct_trn64(row2, row6);
+      dct_trn64(row3, row7);
+
+#undef dct_trn16
+#undef dct_trn32
+#undef dct_trn64
+   }
+
+   // row pass
+   // vrshrn_n_s32 only supports shifts up to 16, we need
+   // 17. so do a non-rounding shift of 16 first then follow
+   // up with a rounding shift by 1.
+   dct_pass(vshrn_n_s32, 16);
+
+   {
+      // pack and round
+      uint8x8_t p0 = vqrshrun_n_s16(row0, 1);
+      uint8x8_t p1 = vqrshrun_n_s16(row1, 1);
+      uint8x8_t p2 = vqrshrun_n_s16(row2, 1);
+      uint8x8_t p3 = vqrshrun_n_s16(row3, 1);
+      uint8x8_t p4 = vqrshrun_n_s16(row4, 1);
+      uint8x8_t p5 = vqrshrun_n_s16(row5, 1);
+      uint8x8_t p6 = vqrshrun_n_s16(row6, 1);
+      uint8x8_t p7 = vqrshrun_n_s16(row7, 1);
+
+      // again, these can translate into one instruction, but often don't.
+#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; }
+#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); }
+#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); }
+
+      // sadly can't use interleaved stores here since we only write
+      // 8 bytes to each scan line!
+
+      // 8x8 8-bit transpose pass 1
+      dct_trn8_8(p0, p1);
+      dct_trn8_8(p2, p3);
+      dct_trn8_8(p4, p5);
+      dct_trn8_8(p6, p7);
+
+      // pass 2
+      dct_trn8_16(p0, p2);
+      dct_trn8_16(p1, p3);
+      dct_trn8_16(p4, p6);
+      dct_trn8_16(p5, p7);
+
+      // pass 3
+      dct_trn8_32(p0, p4);
+      dct_trn8_32(p1, p5);
+      dct_trn8_32(p2, p6);
+      dct_trn8_32(p3, p7);
+
+      // store
+      vst1_u8(out, p0); out += out_stride;
+      vst1_u8(out, p1); out += out_stride;
+      vst1_u8(out, p2); out += out_stride;
+      vst1_u8(out, p3); out += out_stride;
+      vst1_u8(out, p4); out += out_stride;
+      vst1_u8(out, p5); out += out_stride;
+      vst1_u8(out, p6); out += out_stride;
+      vst1_u8(out, p7);
+
+#undef dct_trn8_8
+#undef dct_trn8_16
+#undef dct_trn8_32
+   }
+
+#undef dct_long_mul
+#undef dct_long_mac
+#undef dct_widen
+#undef dct_wadd
+#undef dct_wsub
+#undef dct_bfly32o
+#undef dct_pass
+}
+
+#endif // STBI_NEON
+
+#define STBI__MARKER_none  0xff
+// if there's a pending marker from the entropy stream, return that
+// otherwise, fetch from the stream and get a marker. if there's no
+// marker, return 0xff, which is never a valid marker value
+static stbi_uc stbi__get_marker(stbi__jpeg *j)
+{
+   stbi_uc x;
+   if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; }
+   x = stbi__get8(j->s);
+   if (x != 0xff) return STBI__MARKER_none;
+   while (x == 0xff)
+      x = stbi__get8(j->s); // consume repeated 0xff fill bytes
+   return x;
+}
+
+// in each scan, we'll have scan_n components, and the order
+// of the components is specified by order[]
+#define STBI__RESTART(x)     ((x) >= 0xd0 && (x) <= 0xd7)
+
+// after a restart interval, stbi__jpeg_reset the entropy decoder and
+// the dc prediction
+static void stbi__jpeg_reset(stbi__jpeg *j)
+{
+   j->code_bits = 0;
+   j->code_buffer = 0;
+   j->nomore = 0;
+   j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = j->img_comp[3].dc_pred = 0;
+   j->marker = STBI__MARKER_none;
+   j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff;
+   j->eob_run = 0;
+   // no more than 1<<31 MCUs if no restart_interal? that's plenty safe,
+   // since we don't even allow 1<<30 pixels
+}
+
+static int stbi__parse_entropy_coded_data(stbi__jpeg *z)
+{
+   stbi__jpeg_reset(z);
+   if (!z->progressive) {
+      if (z->scan_n == 1) {
+         int i,j;
+         STBI_SIMD_ALIGN(short, data[64]);
+         int n = z->order[0];
+         // non-interleaved data, we just need to process one block at a time,
+         // in trivial scanline order
+         // number of blocks to do just depends on how many actual "pixels" this
+         // component has, independent of interleaved MCU blocking and such
+         int w = (z->img_comp[n].x+7) >> 3;
+         int h = (z->img_comp[n].y+7) >> 3;
+         for (j=0; j < h; ++j) {
+            for (i=0; i < w; ++i) {
+               int ha = z->img_comp[n].ha;
+               if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0;
+               z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data);
+               // every data block is an MCU, so countdown the restart interval
+               if (--z->todo <= 0) {
+                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
+                  // if it's NOT a restart, then just bail, so we get corrupt data
+                  // rather than no data
+                  if (!STBI__RESTART(z->marker)) return 1;
+                  stbi__jpeg_reset(z);
+               }
+            }
+         }
+         return 1;
+      } else { // interleaved
+         int i,j,k,x,y;
+         STBI_SIMD_ALIGN(short, data[64]);
+         for (j=0; j < z->img_mcu_y; ++j) {
+            for (i=0; i < z->img_mcu_x; ++i) {
+               // scan an interleaved mcu... process scan_n components in order
+               for (k=0; k < z->scan_n; ++k) {
+                  int n = z->order[k];
+                  // scan out an mcu's worth of this component; that's just determined
+                  // by the basic H and V specified for the component
+                  for (y=0; y < z->img_comp[n].v; ++y) {
+                     for (x=0; x < z->img_comp[n].h; ++x) {
+                        int x2 = (i*z->img_comp[n].h + x)*8;
+                        int y2 = (j*z->img_comp[n].v + y)*8;
+                        int ha = z->img_comp[n].ha;
+                        if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0;
+                        z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data);
+                     }
+                  }
+               }
+               // after all interleaved components, that's an interleaved MCU,
+               // so now count down the restart interval
+               if (--z->todo <= 0) {
+                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
+                  if (!STBI__RESTART(z->marker)) return 1;
+                  stbi__jpeg_reset(z);
+               }
+            }
+         }
+         return 1;
+      }
+   } else {
+      if (z->scan_n == 1) {
+         int i,j;
+         int n = z->order[0];
+         // non-interleaved data, we just need to process one block at a time,
+         // in trivial scanline order
+         // number of blocks to do just depends on how many actual "pixels" this
+         // component has, independent of interleaved MCU blocking and such
+         int w = (z->img_comp[n].x+7) >> 3;
+         int h = (z->img_comp[n].y+7) >> 3;
+         for (j=0; j < h; ++j) {
+            for (i=0; i < w; ++i) {
+               short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w);
+               if (z->spec_start == 0) {
+                  if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n))
+                     return 0;
+               } else {
+                  int ha = z->img_comp[n].ha;
+                  if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha]))
+                     return 0;
+               }
+               // every data block is an MCU, so countdown the restart interval
+               if (--z->todo <= 0) {
+                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
+                  if (!STBI__RESTART(z->marker)) return 1;
+                  stbi__jpeg_reset(z);
+               }
+            }
+         }
+         return 1;
+      } else { // interleaved
+         int i,j,k,x,y;
+         for (j=0; j < z->img_mcu_y; ++j) {
+            for (i=0; i < z->img_mcu_x; ++i) {
+               // scan an interleaved mcu... process scan_n components in order
+               for (k=0; k < z->scan_n; ++k) {
+                  int n = z->order[k];
+                  // scan out an mcu's worth of this component; that's just determined
+                  // by the basic H and V specified for the component
+                  for (y=0; y < z->img_comp[n].v; ++y) {
+                     for (x=0; x < z->img_comp[n].h; ++x) {
+                        int x2 = (i*z->img_comp[n].h + x);
+                        int y2 = (j*z->img_comp[n].v + y);
+                        short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w);
+                        if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n))
+                           return 0;
+                     }
+                  }
+               }
+               // after all interleaved components, that's an interleaved MCU,
+               // so now count down the restart interval
+               if (--z->todo <= 0) {
+                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
+                  if (!STBI__RESTART(z->marker)) return 1;
+                  stbi__jpeg_reset(z);
+               }
+            }
+         }
+         return 1;
+      }
+   }
+}
+
+static void stbi__jpeg_dequantize(short *data, stbi__uint16 *dequant)
+{
+   int i;
+   for (i=0; i < 64; ++i)
+      data[i] *= dequant[i];
+}
+
+static void stbi__jpeg_finish(stbi__jpeg *z)
+{
+   if (z->progressive) {
+      // dequantize and idct the data
+      int i,j,n;
+      for (n=0; n < z->s->img_n; ++n) {
+         int w = (z->img_comp[n].x+7) >> 3;
+         int h = (z->img_comp[n].y+7) >> 3;
+         for (j=0; j < h; ++j) {
+            for (i=0; i < w; ++i) {
+               short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w);
+               stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]);
+               z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data);
+            }
+         }
+      }
+   }
+}
+
+static int stbi__process_marker(stbi__jpeg *z, int m)
+{
+   int L;
+   switch (m) {
+      case STBI__MARKER_none: // no marker found
+         return stbi__err("expected marker","Corrupt JPEG");
+
+      case 0xDD: // DRI - specify restart interval
+         if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG");
+         z->restart_interval = stbi__get16be(z->s);
+         return 1;
+
+      case 0xDB: // DQT - define quantization table
+         L = stbi__get16be(z->s)-2;
+         while (L > 0) {
+            int q = stbi__get8(z->s);
+            int p = q >> 4, sixteen = (p != 0);
+            int t = q & 15,i;
+            if (p != 0 && p != 1) return stbi__err("bad DQT type","Corrupt JPEG");
+            if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG");
+
+            for (i=0; i < 64; ++i)
+               z->dequant[t][stbi__jpeg_dezigzag[i]] = (stbi__uint16)(sixteen ? stbi__get16be(z->s) : stbi__get8(z->s));
+            L -= (sixteen ? 129 : 65);
+         }
+         return L==0;
+
+      case 0xC4: // DHT - define huffman table
+         L = stbi__get16be(z->s)-2;
+         while (L > 0) {
+            stbi_uc *v;
+            int sizes[16],i,n=0;
+            int q = stbi__get8(z->s);
+            int tc = q >> 4;
+            int th = q & 15;
+            if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG");
+            for (i=0; i < 16; ++i) {
+               sizes[i] = stbi__get8(z->s);
+               n += sizes[i];
+            }
+            L -= 17;
+            if (tc == 0) {
+               if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0;
+               v = z->huff_dc[th].values;
+            } else {
+               if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0;
+               v = z->huff_ac[th].values;
+            }
+            for (i=0; i < n; ++i)
+               v[i] = stbi__get8(z->s);
+            if (tc != 0)
+               stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th);
+            L -= n;
+         }
+         return L==0;
+   }
+
+   // check for comment block or APP blocks
+   if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) {
+      L = stbi__get16be(z->s);
+      if (L < 2) {
+         if (m == 0xFE)
+            return stbi__err("bad COM len","Corrupt JPEG");
+         else
+            return stbi__err("bad APP len","Corrupt JPEG");
+      }
+      L -= 2;
+
+      if (m == 0xE0 && L >= 5) { // JFIF APP0 segment
+         static const unsigned char tag[5] = {'J','F','I','F','\0'};
+         int ok = 1;
+         int i;
+         for (i=0; i < 5; ++i)
+            if (stbi__get8(z->s) != tag[i])
+               ok = 0;
+         L -= 5;
+         if (ok)
+            z->jfif = 1;
+      } else if (m == 0xEE && L >= 12) { // Adobe APP14 segment
+         static const unsigned char tag[6] = {'A','d','o','b','e','\0'};
+         int ok = 1;
+         int i;
+         for (i=0; i < 6; ++i)
+            if (stbi__get8(z->s) != tag[i])
+               ok = 0;
+         L -= 6;
+         if (ok) {
+            stbi__get8(z->s); // version
+            stbi__get16be(z->s); // flags0
+            stbi__get16be(z->s); // flags1
+            z->app14_color_transform = stbi__get8(z->s); // color transform
+            L -= 6;
+         }
+      }
+
+      stbi__skip(z->s, L);
+      return 1;
+   }
+
+   return stbi__err("unknown marker","Corrupt JPEG");
+}
+
+// after we see SOS
+static int stbi__process_scan_header(stbi__jpeg *z)
+{
+   int i;
+   int Ls = stbi__get16be(z->s);
+   z->scan_n = stbi__get8(z->s);
+   if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG");
+   if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG");
+   for (i=0; i < z->scan_n; ++i) {
+      int id = stbi__get8(z->s), which;
+      int q = stbi__get8(z->s);
+      for (which = 0; which < z->s->img_n; ++which)
+         if (z->img_comp[which].id == id)
+            break;
+      if (which == z->s->img_n) return 0; // no match
+      z->img_comp[which].hd = q >> 4;   if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG");
+      z->img_comp[which].ha = q & 15;   if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG");
+      z->order[i] = which;
+   }
+
+   {
+      int aa;
+      z->spec_start = stbi__get8(z->s);
+      z->spec_end   = stbi__get8(z->s); // should be 63, but might be 0
+      aa = stbi__get8(z->s);
+      z->succ_high = (aa >> 4);
+      z->succ_low  = (aa & 15);
+      if (z->progressive) {
+         if (z->spec_start > 63 || z->spec_end > 63  || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13)
+            return stbi__err("bad SOS", "Corrupt JPEG");
+      } else {
+         if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG");
+         if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG");
+         z->spec_end = 63;
+      }
+   }
+
+   return 1;
+}
+
+static int stbi__free_jpeg_components(stbi__jpeg *z, int ncomp, int why)
+{
+   int i;
+   for (i=0; i < ncomp; ++i) {
+      if (z->img_comp[i].raw_data) {
+         STBI_FREE(z->img_comp[i].raw_data);
+         z->img_comp[i].raw_data = NULL;
+         z->img_comp[i].data = NULL;
+      }
+      if (z->img_comp[i].raw_coeff) {
+         STBI_FREE(z->img_comp[i].raw_coeff);
+         z->img_comp[i].raw_coeff = 0;
+         z->img_comp[i].coeff = 0;
+      }
+      if (z->img_comp[i].linebuf) {
+         STBI_FREE(z->img_comp[i].linebuf);
+         z->img_comp[i].linebuf = NULL;
+      }
+   }
+   return why;
+}
+
+static int stbi__process_frame_header(stbi__jpeg *z, int scan)
+{
+   stbi__context *s = z->s;
+   int Lf,p,i,q, h_max=1,v_max=1,c;
+   Lf = stbi__get16be(s);         if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG
+   p  = stbi__get8(s);            if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline
+   s->img_y = stbi__get16be(s);   if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG
+   s->img_x = stbi__get16be(s);   if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires
+   if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+   if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+   c = stbi__get8(s);
+   if (c != 3 && c != 1 && c != 4) return stbi__err("bad component count","Corrupt JPEG");
+   s->img_n = c;
+   for (i=0; i < c; ++i) {
+      z->img_comp[i].data = NULL;
+      z->img_comp[i].linebuf = NULL;
+   }
+
+   if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG");
+
+   z->rgb = 0;
+   for (i=0; i < s->img_n; ++i) {
+      static const unsigned char rgb[3] = { 'R', 'G', 'B' };
+      z->img_comp[i].id = stbi__get8(s);
+      if (s->img_n == 3 && z->img_comp[i].id == rgb[i])
+         ++z->rgb;
+      q = stbi__get8(s);
+      z->img_comp[i].h = (q >> 4);  if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG");
+      z->img_comp[i].v = q & 15;    if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG");
+      z->img_comp[i].tq = stbi__get8(s);  if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG");
+   }
+
+   if (scan != STBI__SCAN_load) return 1;
+
+   if (!stbi__mad3sizes_valid(s->img_x, s->img_y, s->img_n, 0)) return stbi__err("too large", "Image too large to decode");
+
+   for (i=0; i < s->img_n; ++i) {
+      if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h;
+      if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v;
+   }
+
+   // compute interleaved mcu info
+   z->img_h_max = h_max;
+   z->img_v_max = v_max;
+   z->img_mcu_w = h_max * 8;
+   z->img_mcu_h = v_max * 8;
+   // these sizes can't be more than 17 bits
+   z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w;
+   z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h;
+
+   for (i=0; i < s->img_n; ++i) {
+      // number of effective pixels (e.g. for non-interleaved MCU)
+      z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max;
+      z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max;
+      // to simplify generation, we'll allocate enough memory to decode
+      // the bogus oversized data from using interleaved MCUs and their
+      // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't
+      // discard the extra data until colorspace conversion
+      //
+      // img_mcu_x, img_mcu_y: <=17 bits; comp[i].h and .v are <=4 (checked earlier)
+      // so these muls can't overflow with 32-bit ints (which we require)
+      z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8;
+      z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8;
+      z->img_comp[i].coeff = 0;
+      z->img_comp[i].raw_coeff = 0;
+      z->img_comp[i].linebuf = NULL;
+      z->img_comp[i].raw_data = stbi__malloc_mad2(z->img_comp[i].w2, z->img_comp[i].h2, 15);
+      if (z->img_comp[i].raw_data == NULL)
+         return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory"));
+      // align blocks for idct using mmx/sse
+      z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15);
+      if (z->progressive) {
+         // w2, h2 are multiples of 8 (see above)
+         z->img_comp[i].coeff_w = z->img_comp[i].w2 / 8;
+         z->img_comp[i].coeff_h = z->img_comp[i].h2 / 8;
+         z->img_comp[i].raw_coeff = stbi__malloc_mad3(z->img_comp[i].w2, z->img_comp[i].h2, sizeof(short), 15);
+         if (z->img_comp[i].raw_coeff == NULL)
+            return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory"));
+         z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15);
+      }
+   }
+
+   return 1;
+}
+
+// use comparisons since in some cases we handle more than one case (e.g. SOF)
+#define stbi__DNL(x)         ((x) == 0xdc)
+#define stbi__SOI(x)         ((x) == 0xd8)
+#define stbi__EOI(x)         ((x) == 0xd9)
+#define stbi__SOF(x)         ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2)
+#define stbi__SOS(x)         ((x) == 0xda)
+
+#define stbi__SOF_progressive(x)   ((x) == 0xc2)
+
+static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan)
+{
+   int m;
+   z->jfif = 0;
+   z->app14_color_transform = -1; // valid values are 0,1,2
+   z->marker = STBI__MARKER_none; // initialize cached marker to empty
+   m = stbi__get_marker(z);
+   if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG");
+   if (scan == STBI__SCAN_type) return 1;
+   m = stbi__get_marker(z);
+   while (!stbi__SOF(m)) {
+      if (!stbi__process_marker(z,m)) return 0;
+      m = stbi__get_marker(z);
+      while (m == STBI__MARKER_none) {
+         // some files have extra padding after their blocks, so ok, we'll scan
+         if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG");
+         m = stbi__get_marker(z);
+      }
+   }
+   z->progressive = stbi__SOF_progressive(m);
+   if (!stbi__process_frame_header(z, scan)) return 0;
+   return 1;
+}
+
+// decode image to YCbCr format
+static int stbi__decode_jpeg_image(stbi__jpeg *j)
+{
+   int m;
+   for (m = 0; m < 4; m++) {
+      j->img_comp[m].raw_data = NULL;
+      j->img_comp[m].raw_coeff = NULL;
+   }
+   j->restart_interval = 0;
+   if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0;
+   m = stbi__get_marker(j);
+   while (!stbi__EOI(m)) {
+      if (stbi__SOS(m)) {
+         if (!stbi__process_scan_header(j)) return 0;
+         if (!stbi__parse_entropy_coded_data(j)) return 0;
+         if (j->marker == STBI__MARKER_none ) {
+            // handle 0s at the end of image data from IP Kamera 9060
+            while (!stbi__at_eof(j->s)) {
+               int x = stbi__get8(j->s);
+               if (x == 255) {
+                  j->marker = stbi__get8(j->s);
+                  break;
+               }
+            }
+            // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0
+         }
+      } else if (stbi__DNL(m)) {
+         int Ld = stbi__get16be(j->s);
+         stbi__uint32 NL = stbi__get16be(j->s);
+         if (Ld != 4) return stbi__err("bad DNL len", "Corrupt JPEG");
+         if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG");
+      } else {
+         if (!stbi__process_marker(j, m)) return 0;
+      }
+      m = stbi__get_marker(j);
+   }
+   if (j->progressive)
+      stbi__jpeg_finish(j);
+   return 1;
+}
+
+// static jfif-centered resampling (across block boundaries)
+
+typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1,
+                                    int w, int hs);
+
+#define stbi__div4(x) ((stbi_uc) ((x) >> 2))
+
+static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   STBI_NOTUSED(out);
+   STBI_NOTUSED(in_far);
+   STBI_NOTUSED(w);
+   STBI_NOTUSED(hs);
+   return in_near;
+}
+
+static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // need to generate two samples vertically for every one in input
+   int i;
+   STBI_NOTUSED(hs);
+   for (i=0; i < w; ++i)
+      out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2);
+   return out;
+}
+
+static stbi_uc*  stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // need to generate two samples horizontally for every one in input
+   int i;
+   stbi_uc *input = in_near;
+
+   if (w == 1) {
+      // if only one sample, can't do any interpolation
+      out[0] = out[1] = input[0];
+      return out;
+   }
+
+   out[0] = input[0];
+   out[1] = stbi__div4(input[0]*3 + input[1] + 2);
+   for (i=1; i < w-1; ++i) {
+      int n = 3*input[i]+2;
+      out[i*2+0] = stbi__div4(n+input[i-1]);
+      out[i*2+1] = stbi__div4(n+input[i+1]);
+   }
+   out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2);
+   out[i*2+1] = input[w-1];
+
+   STBI_NOTUSED(in_far);
+   STBI_NOTUSED(hs);
+
+   return out;
+}
+
+#define stbi__div16(x) ((stbi_uc) ((x) >> 4))
+
+static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // need to generate 2x2 samples for every one in input
+   int i,t0,t1;
+   if (w == 1) {
+      out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2);
+      return out;
+   }
+
+   t1 = 3*in_near[0] + in_far[0];
+   out[0] = stbi__div4(t1+2);
+   for (i=1; i < w; ++i) {
+      t0 = t1;
+      t1 = 3*in_near[i]+in_far[i];
+      out[i*2-1] = stbi__div16(3*t0 + t1 + 8);
+      out[i*2  ] = stbi__div16(3*t1 + t0 + 8);
+   }
+   out[w*2-1] = stbi__div4(t1+2);
+
+   STBI_NOTUSED(hs);
+
+   return out;
+}
+
+#if defined(STBI_SSE2) || defined(STBI_NEON)
+static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // need to generate 2x2 samples for every one in input
+   int i=0,t0,t1;
+
+   if (w == 1) {
+      out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2);
+      return out;
+   }
+
+   t1 = 3*in_near[0] + in_far[0];
+   // process groups of 8 pixels for as long as we can.
+   // note we can't handle the last pixel in a row in this loop
+   // because we need to handle the filter boundary conditions.
+   for (; i < ((w-1) & ~7); i += 8) {
+#if defined(STBI_SSE2)
+      // load and perform the vertical filtering pass
+      // this uses 3*x + y = 4*x + (y - x)
+      __m128i zero  = _mm_setzero_si128();
+      __m128i farb  = _mm_loadl_epi64((__m128i *) (in_far + i));
+      __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i));
+      __m128i farw  = _mm_unpacklo_epi8(farb, zero);
+      __m128i nearw = _mm_unpacklo_epi8(nearb, zero);
+      __m128i diff  = _mm_sub_epi16(farw, nearw);
+      __m128i nears = _mm_slli_epi16(nearw, 2);
+      __m128i curr  = _mm_add_epi16(nears, diff); // current row
+
+      // horizontal filter works the same based on shifted vers of current
+      // row. "prev" is current row shifted right by 1 pixel; we need to
+      // insert the previous pixel value (from t1).
+      // "next" is current row shifted left by 1 pixel, with first pixel
+      // of next block of 8 pixels added in.
+      __m128i prv0 = _mm_slli_si128(curr, 2);
+      __m128i nxt0 = _mm_srli_si128(curr, 2);
+      __m128i prev = _mm_insert_epi16(prv0, t1, 0);
+      __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7);
+
+      // horizontal filter, polyphase implementation since it's convenient:
+      // even pixels = 3*cur + prev = cur*4 + (prev - cur)
+      // odd  pixels = 3*cur + next = cur*4 + (next - cur)
+      // note the shared term.
+      __m128i bias  = _mm_set1_epi16(8);
+      __m128i curs = _mm_slli_epi16(curr, 2);
+      __m128i prvd = _mm_sub_epi16(prev, curr);
+      __m128i nxtd = _mm_sub_epi16(next, curr);
+      __m128i curb = _mm_add_epi16(curs, bias);
+      __m128i even = _mm_add_epi16(prvd, curb);
+      __m128i odd  = _mm_add_epi16(nxtd, curb);
+
+      // interleave even and odd pixels, then undo scaling.
+      __m128i int0 = _mm_unpacklo_epi16(even, odd);
+      __m128i int1 = _mm_unpackhi_epi16(even, odd);
+      __m128i de0  = _mm_srli_epi16(int0, 4);
+      __m128i de1  = _mm_srli_epi16(int1, 4);
+
+      // pack and write output
+      __m128i outv = _mm_packus_epi16(de0, de1);
+      _mm_storeu_si128((__m128i *) (out + i*2), outv);
+#elif defined(STBI_NEON)
+      // load and perform the vertical filtering pass
+      // this uses 3*x + y = 4*x + (y - x)
+      uint8x8_t farb  = vld1_u8(in_far + i);
+      uint8x8_t nearb = vld1_u8(in_near + i);
+      int16x8_t diff  = vreinterpretq_s16_u16(vsubl_u8(farb, nearb));
+      int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2));
+      int16x8_t curr  = vaddq_s16(nears, diff); // current row
+
+      // horizontal filter works the same based on shifted vers of current
+      // row. "prev" is current row shifted right by 1 pixel; we need to
+      // insert the previous pixel value (from t1).
+      // "next" is current row shifted left by 1 pixel, with first pixel
+      // of next block of 8 pixels added in.
+      int16x8_t prv0 = vextq_s16(curr, curr, 7);
+      int16x8_t nxt0 = vextq_s16(curr, curr, 1);
+      int16x8_t prev = vsetq_lane_s16(t1, prv0, 0);
+      int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7);
+
+      // horizontal filter, polyphase implementation since it's convenient:
+      // even pixels = 3*cur + prev = cur*4 + (prev - cur)
+      // odd  pixels = 3*cur + next = cur*4 + (next - cur)
+      // note the shared term.
+      int16x8_t curs = vshlq_n_s16(curr, 2);
+      int16x8_t prvd = vsubq_s16(prev, curr);
+      int16x8_t nxtd = vsubq_s16(next, curr);
+      int16x8_t even = vaddq_s16(curs, prvd);
+      int16x8_t odd  = vaddq_s16(curs, nxtd);
+
+      // undo scaling and round, then store with even/odd phases interleaved
+      uint8x8x2_t o;
+      o.val[0] = vqrshrun_n_s16(even, 4);
+      o.val[1] = vqrshrun_n_s16(odd,  4);
+      vst2_u8(out + i*2, o);
+#endif
+
+      // "previous" value for next iter
+      t1 = 3*in_near[i+7] + in_far[i+7];
+   }
+
+   t0 = t1;
+   t1 = 3*in_near[i] + in_far[i];
+   out[i*2] = stbi__div16(3*t1 + t0 + 8);
+
+   for (++i; i < w; ++i) {
+      t0 = t1;
+      t1 = 3*in_near[i]+in_far[i];
+      out[i*2-1] = stbi__div16(3*t0 + t1 + 8);
+      out[i*2  ] = stbi__div16(3*t1 + t0 + 8);
+   }
+   out[w*2-1] = stbi__div4(t1+2);
+
+   STBI_NOTUSED(hs);
+
+   return out;
+}
+#endif
+
+static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // resample with nearest-neighbor
+   int i,j;
+   STBI_NOTUSED(in_far);
+   for (i=0; i < w; ++i)
+      for (j=0; j < hs; ++j)
+         out[i*hs+j] = in_near[i];
+   return out;
+}
+
+// this is a reduced-precision calculation of YCbCr-to-RGB introduced
+// to make sure the code produces the same results in both SIMD and scalar
+#define stbi__float2fixed(x)  (((int) ((x) * 4096.0f + 0.5f)) << 8)
+static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step)
+{
+   int i;
+   for (i=0; i < count; ++i) {
+      int y_fixed = (y[i] << 20) + (1<<19); // rounding
+      int r,g,b;
+      int cr = pcr[i] - 128;
+      int cb = pcb[i] - 128;
+      r = y_fixed +  cr* stbi__float2fixed(1.40200f);
+      g = y_fixed + (cr*-stbi__float2fixed(0.71414f)) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000);
+      b = y_fixed                                     +   cb* stbi__float2fixed(1.77200f);
+      r >>= 20;
+      g >>= 20;
+      b >>= 20;
+      if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; }
+      if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; }
+      if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; }
+      out[0] = (stbi_uc)r;
+      out[1] = (stbi_uc)g;
+      out[2] = (stbi_uc)b;
+      out[3] = 255;
+      out += step;
+   }
+}
+
+#if defined(STBI_SSE2) || defined(STBI_NEON)
+static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step)
+{
+   int i = 0;
+
+#ifdef STBI_SSE2
+   // step == 3 is pretty ugly on the final interleave, and i'm not convinced
+   // it's useful in practice (you wouldn't use it for textures, for example).
+   // so just accelerate step == 4 case.
+   if (step == 4) {
+      // this is a fairly straightforward implementation and not super-optimized.
+      __m128i signflip  = _mm_set1_epi8(-0x80);
+      __m128i cr_const0 = _mm_set1_epi16(   (short) ( 1.40200f*4096.0f+0.5f));
+      __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f));
+      __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f));
+      __m128i cb_const1 = _mm_set1_epi16(   (short) ( 1.77200f*4096.0f+0.5f));
+      __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128);
+      __m128i xw = _mm_set1_epi16(255); // alpha channel
+
+      for (; i+7 < count; i += 8) {
+         // load
+         __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i));
+         __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i));
+         __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i));
+         __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128
+         __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128
+
+         // unpack to short (and left-shift cr, cb by 8)
+         __m128i yw  = _mm_unpacklo_epi8(y_bias, y_bytes);
+         __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased);
+         __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased);
+
+         // color transform
+         __m128i yws = _mm_srli_epi16(yw, 4);
+         __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw);
+         __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw);
+         __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1);
+         __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1);
+         __m128i rws = _mm_add_epi16(cr0, yws);
+         __m128i gwt = _mm_add_epi16(cb0, yws);
+         __m128i bws = _mm_add_epi16(yws, cb1);
+         __m128i gws = _mm_add_epi16(gwt, cr1);
+
+         // descale
+         __m128i rw = _mm_srai_epi16(rws, 4);
+         __m128i bw = _mm_srai_epi16(bws, 4);
+         __m128i gw = _mm_srai_epi16(gws, 4);
+
+         // back to byte, set up for transpose
+         __m128i brb = _mm_packus_epi16(rw, bw);
+         __m128i gxb = _mm_packus_epi16(gw, xw);
+
+         // transpose to interleave channels
+         __m128i t0 = _mm_unpacklo_epi8(brb, gxb);
+         __m128i t1 = _mm_unpackhi_epi8(brb, gxb);
+         __m128i o0 = _mm_unpacklo_epi16(t0, t1);
+         __m128i o1 = _mm_unpackhi_epi16(t0, t1);
+
+         // store
+         _mm_storeu_si128((__m128i *) (out + 0), o0);
+         _mm_storeu_si128((__m128i *) (out + 16), o1);
+         out += 32;
+      }
+   }
+#endif
+
+#ifdef STBI_NEON
+   // in this version, step=3 support would be easy to add. but is there demand?
+   if (step == 4) {
+      // this is a fairly straightforward implementation and not super-optimized.
+      uint8x8_t signflip = vdup_n_u8(0x80);
+      int16x8_t cr_const0 = vdupq_n_s16(   (short) ( 1.40200f*4096.0f+0.5f));
+      int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f));
+      int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f));
+      int16x8_t cb_const1 = vdupq_n_s16(   (short) ( 1.77200f*4096.0f+0.5f));
+
+      for (; i+7 < count; i += 8) {
+         // load
+         uint8x8_t y_bytes  = vld1_u8(y + i);
+         uint8x8_t cr_bytes = vld1_u8(pcr + i);
+         uint8x8_t cb_bytes = vld1_u8(pcb + i);
+         int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip));
+         int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip));
+
+         // expand to s16
+         int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4));
+         int16x8_t crw = vshll_n_s8(cr_biased, 7);
+         int16x8_t cbw = vshll_n_s8(cb_biased, 7);
+
+         // color transform
+         int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0);
+         int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0);
+         int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1);
+         int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1);
+         int16x8_t rws = vaddq_s16(yws, cr0);
+         int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1);
+         int16x8_t bws = vaddq_s16(yws, cb1);
+
+         // undo scaling, round, convert to byte
+         uint8x8x4_t o;
+         o.val[0] = vqrshrun_n_s16(rws, 4);
+         o.val[1] = vqrshrun_n_s16(gws, 4);
+         o.val[2] = vqrshrun_n_s16(bws, 4);
+         o.val[3] = vdup_n_u8(255);
+
+         // store, interleaving r/g/b/a
+         vst4_u8(out, o);
+         out += 8*4;
+      }
+   }
+#endif
+
+   for (; i < count; ++i) {
+      int y_fixed = (y[i] << 20) + (1<<19); // rounding
+      int r,g,b;
+      int cr = pcr[i] - 128;
+      int cb = pcb[i] - 128;
+      r = y_fixed + cr* stbi__float2fixed(1.40200f);
+      g = y_fixed + cr*-stbi__float2fixed(0.71414f) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000);
+      b = y_fixed                                   +   cb* stbi__float2fixed(1.77200f);
+      r >>= 20;
+      g >>= 20;
+      b >>= 20;
+      if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; }
+      if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; }
+      if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; }
+      out[0] = (stbi_uc)r;
+      out[1] = (stbi_uc)g;
+      out[2] = (stbi_uc)b;
+      out[3] = 255;
+      out += step;
+   }
+}
+#endif
+
+// set up the kernels
+static void stbi__setup_jpeg(stbi__jpeg *j)
+{
+   j->idct_block_kernel = stbi__idct_block;
+   j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row;
+   j->resample_row_hv_2_kernel = stbi__resample_row_hv_2;
+
+#ifdef STBI_SSE2
+   if (stbi__sse2_available()) {
+      j->idct_block_kernel = stbi__idct_simd;
+      j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd;
+      j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd;
+   }
+#endif
+
+#ifdef STBI_NEON
+   j->idct_block_kernel = stbi__idct_simd;
+   j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd;
+   j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd;
+#endif
+}
+
+// clean up the temporary component buffers
+static void stbi__cleanup_jpeg(stbi__jpeg *j)
+{
+   stbi__free_jpeg_components(j, j->s->img_n, 0);
+}
+
+typedef struct
+{
+   resample_row_func resample;
+   stbi_uc *line0,*line1;
+   int hs,vs;   // expansion factor in each axis
+   int w_lores; // horizontal pixels pre-expansion
+   int ystep;   // how far through vertical expansion we are
+   int ypos;    // which pre-expansion row we're on
+} stbi__resample;
+
+// fast 0..255 * 0..255 => 0..255 rounded multiplication
+static stbi_uc stbi__blinn_8x8(stbi_uc x, stbi_uc y)
+{
+   unsigned int t = x*y + 128;
+   return (stbi_uc) ((t + (t >>8)) >> 8);
+}
+
+static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp)
+{
+   int n, decode_n, is_rgb;
+   z->s->img_n = 0; // make stbi__cleanup_jpeg safe
+
+   // validate req_comp
+   if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");
+
+   // load a jpeg image from whichever source, but leave in YCbCr format
+   if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; }
+
+   // determine actual number of components to generate
+   n = req_comp ? req_comp : z->s->img_n >= 3 ? 3 : 1;
+
+   is_rgb = z->s->img_n == 3 && (z->rgb == 3 || (z->app14_color_transform == 0 && !z->jfif));
+
+   if (z->s->img_n == 3 && n < 3 && !is_rgb)
+      decode_n = 1;
+   else
+      decode_n = z->s->img_n;
+
+   // nothing to do if no components requested; check this now to avoid
+   // accessing uninitialized coutput[0] later
+   if (decode_n <= 0) { stbi__cleanup_jpeg(z); return NULL; }
+
+   // resample and color-convert
+   {
+      int k;
+      unsigned int i,j;
+      stbi_uc *output;
+      stbi_uc *coutput[4] = { NULL, NULL, NULL, NULL };
+
+      stbi__resample res_comp[4];
+
+      for (k=0; k < decode_n; ++k) {
+         stbi__resample *r = &res_comp[k];
+
+         // allocate line buffer big enough for upsampling off the edges
+         // with upsample factor of 4
+         z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3);
+         if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); }
+
+         r->hs      = z->img_h_max / z->img_comp[k].h;
+         r->vs      = z->img_v_max / z->img_comp[k].v;
+         r->ystep   = r->vs >> 1;
+         r->w_lores = (z->s->img_x + r->hs-1) / r->hs;
+         r->ypos    = 0;
+         r->line0   = r->line1 = z->img_comp[k].data;
+
+         if      (r->hs == 1 && r->vs == 1) r->resample = resample_row_1;
+         else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2;
+         else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2;
+         else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel;
+         else                               r->resample = stbi__resample_row_generic;
+      }
+
+      // can't error after this so, this is safe
+      output = (stbi_uc *) stbi__malloc_mad3(n, z->s->img_x, z->s->img_y, 1);
+      if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); }
+
+      // now go ahead and resample
+      for (j=0; j < z->s->img_y; ++j) {
+         stbi_uc *out = output + n * z->s->img_x * j;
+         for (k=0; k < decode_n; ++k) {
+            stbi__resample *r = &res_comp[k];
+            int y_bot = r->ystep >= (r->vs >> 1);
+            coutput[k] = r->resample(z->img_comp[k].linebuf,
+                                     y_bot ? r->line1 : r->line0,
+                                     y_bot ? r->line0 : r->line1,
+                                     r->w_lores, r->hs);
+            if (++r->ystep >= r->vs) {
+               r->ystep = 0;
+               r->line0 = r->line1;
+               if (++r->ypos < z->img_comp[k].y)
+                  r->line1 += z->img_comp[k].w2;
+            }
+         }
+         if (n >= 3) {
+            stbi_uc *y = coutput[0];
+            if (z->s->img_n == 3) {
+               if (is_rgb) {
+                  for (i=0; i < z->s->img_x; ++i) {
+                     out[0] = y[i];
+                     out[1] = coutput[1][i];
+                     out[2] = coutput[2][i];
+                     out[3] = 255;
+                     out += n;
+                  }
+               } else {
+                  z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
+               }
+            } else if (z->s->img_n == 4) {
+               if (z->app14_color_transform == 0) { // CMYK
+                  for (i=0; i < z->s->img_x; ++i) {
+                     stbi_uc m = coutput[3][i];
+                     out[0] = stbi__blinn_8x8(coutput[0][i], m);
+                     out[1] = stbi__blinn_8x8(coutput[1][i], m);
+                     out[2] = stbi__blinn_8x8(coutput[2][i], m);
+                     out[3] = 255;
+                     out += n;
+                  }
+               } else if (z->app14_color_transform == 2) { // YCCK
+                  z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
+                  for (i=0; i < z->s->img_x; ++i) {
+                     stbi_uc m = coutput[3][i];
+                     out[0] = stbi__blinn_8x8(255 - out[0], m);
+                     out[1] = stbi__blinn_8x8(255 - out[1], m);
+                     out[2] = stbi__blinn_8x8(255 - out[2], m);
+                     out += n;
+                  }
+               } else { // YCbCr + alpha?  Ignore the fourth channel for now
+                  z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
+               }
+            } else
+               for (i=0; i < z->s->img_x; ++i) {
+                  out[0] = out[1] = out[2] = y[i];
+                  out[3] = 255; // not used if n==3
+                  out += n;
+               }
+         } else {
+            if (is_rgb) {
+               if (n == 1)
+                  for (i=0; i < z->s->img_x; ++i)
+                     *out++ = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]);
+               else {
+                  for (i=0; i < z->s->img_x; ++i, out += 2) {
+                     out[0] = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]);
+                     out[1] = 255;
+                  }
+               }
+            } else if (z->s->img_n == 4 && z->app14_color_transform == 0) {
+               for (i=0; i < z->s->img_x; ++i) {
+                  stbi_uc m = coutput[3][i];
+                  stbi_uc r = stbi__blinn_8x8(coutput[0][i], m);
+                  stbi_uc g = stbi__blinn_8x8(coutput[1][i], m);
+                  stbi_uc b = stbi__blinn_8x8(coutput[2][i], m);
+                  out[0] = stbi__compute_y(r, g, b);
+                  out[1] = 255;
+                  out += n;
+               }
+            } else if (z->s->img_n == 4 && z->app14_color_transform == 2) {
+               for (i=0; i < z->s->img_x; ++i) {
+                  out[0] = stbi__blinn_8x8(255 - coutput[0][i], coutput[3][i]);
+                  out[1] = 255;
+                  out += n;
+               }
+            } else {
+               stbi_uc *y = coutput[0];
+               if (n == 1)
+                  for (i=0; i < z->s->img_x; ++i) out[i] = y[i];
+               else
+                  for (i=0; i < z->s->img_x; ++i) { *out++ = y[i]; *out++ = 255; }
+            }
+         }
+      }
+      stbi__cleanup_jpeg(z);
+      *out_x = z->s->img_x;
+      *out_y = z->s->img_y;
+      if (comp) *comp = z->s->img_n >= 3 ? 3 : 1; // report original components, not output
+      return output;
+   }
+}
+
+static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   unsigned char* result;
+   stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg));
+   if (!j) return stbi__errpuc("outofmem", "Out of memory");
+   STBI_NOTUSED(ri);
+   j->s = s;
+   stbi__setup_jpeg(j);
+   result = load_jpeg_image(j, x,y,comp,req_comp);
+   STBI_FREE(j);
+   return result;
+}
+
+static int stbi__jpeg_test(stbi__context *s)
+{
+   int r;
+   stbi__jpeg* j = (stbi__jpeg*)stbi__malloc(sizeof(stbi__jpeg));
+   if (!j) return stbi__err("outofmem", "Out of memory");
+   j->s = s;
+   stbi__setup_jpeg(j);
+   r = stbi__decode_jpeg_header(j, STBI__SCAN_type);
+   stbi__rewind(s);
+   STBI_FREE(j);
+   return r;
+}
+
+static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp)
+{
+   if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) {
+      stbi__rewind( j->s );
+      return 0;
+   }
+   if (x) *x = j->s->img_x;
+   if (y) *y = j->s->img_y;
+   if (comp) *comp = j->s->img_n >= 3 ? 3 : 1;
+   return 1;
+}
+
+static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   int result;
+   stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg)));
+   if (!j) return stbi__err("outofmem", "Out of memory");
+   j->s = s;
+   result = stbi__jpeg_info_raw(j, x, y, comp);
+   STBI_FREE(j);
+   return result;
+}
+#endif
+
+// public domain zlib decode    v0.2  Sean Barrett 2006-11-18
+//    simple implementation
+//      - all input must be provided in an upfront buffer
+//      - all output is written to a single output buffer (can malloc/realloc)
+//    performance
+//      - fast huffman
+
+#ifndef STBI_NO_ZLIB
+
+// fast-way is faster to check than jpeg huffman, but slow way is slower
+#define STBI__ZFAST_BITS  9 // accelerate all cases in default tables
+#define STBI__ZFAST_MASK  ((1 << STBI__ZFAST_BITS) - 1)
+#define STBI__ZNSYMS 288 // number of symbols in literal/length alphabet
+
+// zlib-style huffman encoding
+// (jpegs packs from left, zlib from right, so can't share code)
+typedef struct
+{
+   stbi__uint16 fast[1 << STBI__ZFAST_BITS];
+   stbi__uint16 firstcode[16];
+   int maxcode[17];
+   stbi__uint16 firstsymbol[16];
+   stbi_uc  size[STBI__ZNSYMS];
+   stbi__uint16 value[STBI__ZNSYMS];
+} stbi__zhuffman;
+
+stbi_inline static int stbi__bitreverse16(int n)
+{
+  n = ((n & 0xAAAA) >>  1) | ((n & 0x5555) << 1);
+  n = ((n & 0xCCCC) >>  2) | ((n & 0x3333) << 2);
+  n = ((n & 0xF0F0) >>  4) | ((n & 0x0F0F) << 4);
+  n = ((n & 0xFF00) >>  8) | ((n & 0x00FF) << 8);
+  return n;
+}
+
+stbi_inline static int stbi__bit_reverse(int v, int bits)
+{
+   STBI_ASSERT(bits <= 16);
+   // to bit reverse n bits, reverse 16 and shift
+   // e.g. 11 bits, bit reverse and shift away 5
+   return stbi__bitreverse16(v) >> (16-bits);
+}
+
+static int stbi__zbuild_huffman(stbi__zhuffman *z, const stbi_uc *sizelist, int num)
+{
+   int i,k=0;
+   int code, next_code[16], sizes[17];
+
+   // DEFLATE spec for generating codes
+   memset(sizes, 0, sizeof(sizes));
+   memset(z->fast, 0, sizeof(z->fast));
+   for (i=0; i < num; ++i)
+      ++sizes[sizelist[i]];
+   sizes[0] = 0;
+   for (i=1; i < 16; ++i)
+      if (sizes[i] > (1 << i))
+         return stbi__err("bad sizes", "Corrupt PNG");
+   code = 0;
+   for (i=1; i < 16; ++i) {
+      next_code[i] = code;
+      z->firstcode[i] = (stbi__uint16) code;
+      z->firstsymbol[i] = (stbi__uint16) k;
+      code = (code + sizes[i]);
+      if (sizes[i])
+         if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG");
+      z->maxcode[i] = code << (16-i); // preshift for inner loop
+      code <<= 1;
+      k += sizes[i];
+   }
+   z->maxcode[16] = 0x10000; // sentinel
+   for (i=0; i < num; ++i) {
+      int s = sizelist[i];
+      if (s) {
+         int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s];
+         stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i);
+         z->size [c] = (stbi_uc     ) s;
+         z->value[c] = (stbi__uint16) i;
+         if (s <= STBI__ZFAST_BITS) {
+            int j = stbi__bit_reverse(next_code[s],s);
+            while (j < (1 << STBI__ZFAST_BITS)) {
+               z->fast[j] = fastv;
+               j += (1 << s);
+            }
+         }
+         ++next_code[s];
+      }
+   }
+   return 1;
+}
+
+// zlib-from-memory implementation for PNG reading
+//    because PNG allows splitting the zlib stream arbitrarily,
+//    and it's annoying structurally to have PNG call ZLIB call PNG,
+//    we require PNG read all the IDATs and combine them into a single
+//    memory buffer
+
+typedef struct
+{
+   stbi_uc *zbuffer, *zbuffer_end;
+   int num_bits;
+   stbi__uint32 code_buffer;
+
+   char *zout;
+   char *zout_start;
+   char *zout_end;
+   int   z_expandable;
+
+   stbi__zhuffman z_length, z_distance;
+} stbi__zbuf;
+
+stbi_inline static int stbi__zeof(stbi__zbuf *z)
+{
+   return (z->zbuffer >= z->zbuffer_end);
+}
+
+stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z)
+{
+   return stbi__zeof(z) ? 0 : *z->zbuffer++;
+}
+
+static void stbi__fill_bits(stbi__zbuf *z)
+{
+   do {
+      if (z->code_buffer >= (1U << z->num_bits)) {
+        z->zbuffer = z->zbuffer_end;  /* treat this as EOF so we fail. */
+        return;
+      }
+      z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits;
+      z->num_bits += 8;
+   } while (z->num_bits <= 24);
+}
+
+stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n)
+{
+   unsigned int k;
+   if (z->num_bits < n) stbi__fill_bits(z);
+   k = z->code_buffer & ((1 << n) - 1);
+   z->code_buffer >>= n;
+   z->num_bits -= n;
+   return k;
+}
+
+static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z)
+{
+   int b,s,k;
+   // not resolved by fast table, so compute it the slow way
+   // use jpeg approach, which requires MSbits at top
+   k = stbi__bit_reverse(a->code_buffer, 16);
+   for (s=STBI__ZFAST_BITS+1; ; ++s)
+      if (k < z->maxcode[s])
+         break;
+   if (s >= 16) return -1; // invalid code!
+   // code size is s, so:
+   b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s];
+   if (b >= STBI__ZNSYMS) return -1; // some data was corrupt somewhere!
+   if (z->size[b] != s) return -1;  // was originally an assert, but report failure instead.
+   a->code_buffer >>= s;
+   a->num_bits -= s;
+   return z->value[b];
+}
+
+stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z)
+{
+   int b,s;
+   if (a->num_bits < 16) {
+      if (stbi__zeof(a)) {
+         return -1;   /* report error for unexpected end of data. */
+      }
+      stbi__fill_bits(a);
+   }
+   b = z->fast[a->code_buffer & STBI__ZFAST_MASK];
+   if (b) {
+      s = b >> 9;
+      a->code_buffer >>= s;
+      a->num_bits -= s;
+      return b & 511;
+   }
+   return stbi__zhuffman_decode_slowpath(a, z);
+}
+
+static int stbi__zexpand(stbi__zbuf *z, char *zout, int n)  // need to make room for n bytes
+{
+   char *q;
+   unsigned int cur, limit, old_limit;
+   z->zout = zout;
+   if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG");
+   cur   = (unsigned int) (z->zout - z->zout_start);
+   limit = old_limit = (unsigned) (z->zout_end - z->zout_start);
+   if (UINT_MAX - cur < (unsigned) n) return stbi__err("outofmem", "Out of memory");
+   while (cur + n > limit) {
+      if(limit > UINT_MAX / 2) return stbi__err("outofmem", "Out of memory");
+      limit *= 2;
+   }
+   q = (char *) STBI_REALLOC_SIZED(z->zout_start, old_limit, limit);
+   STBI_NOTUSED(old_limit);
+   if (q == NULL) return stbi__err("outofmem", "Out of memory");
+   z->zout_start = q;
+   z->zout       = q + cur;
+   z->zout_end   = q + limit;
+   return 1;
+}
+
+static const int stbi__zlength_base[31] = {
+   3,4,5,6,7,8,9,10,11,13,
+   15,17,19,23,27,31,35,43,51,59,
+   67,83,99,115,131,163,195,227,258,0,0 };
+
+static const int stbi__zlength_extra[31]=
+{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 };
+
+static const int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,
+257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0};
+
+static const int stbi__zdist_extra[32] =
+{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+
+static int stbi__parse_huffman_block(stbi__zbuf *a)
+{
+   char *zout = a->zout;
+   for(;;) {
+      int z = stbi__zhuffman_decode(a, &a->z_length);
+      if (z < 256) {
+         if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes
+         if (zout >= a->zout_end) {
+            if (!stbi__zexpand(a, zout, 1)) return 0;
+            zout = a->zout;
+         }
+         *zout++ = (char) z;
+      } else {
+         stbi_uc *p;
+         int len,dist;
+         if (z == 256) {
+            a->zout = zout;
+            return 1;
+         }
+         z -= 257;
+         len = stbi__zlength_base[z];
+         if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]);
+         z = stbi__zhuffman_decode(a, &a->z_distance);
+         if (z < 0) return stbi__err("bad huffman code","Corrupt PNG");
+         dist = stbi__zdist_base[z];
+         if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]);
+         if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG");
+         if (zout + len > a->zout_end) {
+            if (!stbi__zexpand(a, zout, len)) return 0;
+            zout = a->zout;
+         }
+         p = (stbi_uc *) (zout - dist);
+         if (dist == 1) { // run of one byte; common in images.
+            stbi_uc v = *p;
+            if (len) { do *zout++ = v; while (--len); }
+         } else {
+            if (len) { do *zout++ = *p++; while (--len); }
+         }
+      }
+   }
+}
+
+static int stbi__compute_huffman_codes(stbi__zbuf *a)
+{
+   static const stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 };
+   stbi__zhuffman z_codelength;
+   stbi_uc lencodes[286+32+137];//padding for maximum single op
+   stbi_uc codelength_sizes[19];
+   int i,n;
+
+   int hlit  = stbi__zreceive(a,5) + 257;
+   int hdist = stbi__zreceive(a,5) + 1;
+   int hclen = stbi__zreceive(a,4) + 4;
+   int ntot  = hlit + hdist;
+
+   memset(codelength_sizes, 0, sizeof(codelength_sizes));
+   for (i=0; i < hclen; ++i) {
+      int s = stbi__zreceive(a,3);
+      codelength_sizes[length_dezigzag[i]] = (stbi_uc) s;
+   }
+   if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0;
+
+   n = 0;
+   while (n < ntot) {
+      int c = stbi__zhuffman_decode(a, &z_codelength);
+      if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG");
+      if (c < 16)
+         lencodes[n++] = (stbi_uc) c;
+      else {
+         stbi_uc fill = 0;
+         if (c == 16) {
+            c = stbi__zreceive(a,2)+3;
+            if (n == 0) return stbi__err("bad codelengths", "Corrupt PNG");
+            fill = lencodes[n-1];
+         } else if (c == 17) {
+            c = stbi__zreceive(a,3)+3;
+         } else if (c == 18) {
+            c = stbi__zreceive(a,7)+11;
+         } else {
+            return stbi__err("bad codelengths", "Corrupt PNG");
+         }
+         if (ntot - n < c) return stbi__err("bad codelengths", "Corrupt PNG");
+         memset(lencodes+n, fill, c);
+         n += c;
+      }
+   }
+   if (n != ntot) return stbi__err("bad codelengths","Corrupt PNG");
+   if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0;
+   if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0;
+   return 1;
+}
+
+static int stbi__parse_uncompressed_block(stbi__zbuf *a)
+{
+   stbi_uc header[4];
+   int len,nlen,k;
+   if (a->num_bits & 7)
+      stbi__zreceive(a, a->num_bits & 7); // discard
+   // drain the bit-packed data into header
+   k = 0;
+   while (a->num_bits > 0) {
+      header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check
+      a->code_buffer >>= 8;
+      a->num_bits -= 8;
+   }
+   if (a->num_bits < 0) return stbi__err("zlib corrupt","Corrupt PNG");
+   // now fill header the normal way
+   while (k < 4)
+      header[k++] = stbi__zget8(a);
+   len  = header[1] * 256 + header[0];
+   nlen = header[3] * 256 + header[2];
+   if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG");
+   if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG");
+   if (a->zout + len > a->zout_end)
+      if (!stbi__zexpand(a, a->zout, len)) return 0;
+   memcpy(a->zout, a->zbuffer, len);
+   a->zbuffer += len;
+   a->zout += len;
+   return 1;
+}
+
+static int stbi__parse_zlib_header(stbi__zbuf *a)
+{
+   int cmf   = stbi__zget8(a);
+   int cm    = cmf & 15;
+   /* int cinfo = cmf >> 4; */
+   int flg   = stbi__zget8(a);
+   if (stbi__zeof(a)) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec
+   if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec
+   if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png
+   if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png
+   // window = 1 << (8 + cinfo)... but who cares, we fully buffer output
+   return 1;
+}
+
+static const stbi_uc stbi__zdefault_length[STBI__ZNSYMS] =
+{
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8
+};
+static const stbi_uc stbi__zdefault_distance[32] =
+{
+   5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+};
+/*
+Init algorithm:
+{
+   int i;   // use <= to match clearly with spec
+   for (i=0; i <= 143; ++i)     stbi__zdefault_length[i]   = 8;
+   for (   ; i <= 255; ++i)     stbi__zdefault_length[i]   = 9;
+   for (   ; i <= 279; ++i)     stbi__zdefault_length[i]   = 7;
+   for (   ; i <= 287; ++i)     stbi__zdefault_length[i]   = 8;
+
+   for (i=0; i <=  31; ++i)     stbi__zdefault_distance[i] = 5;
+}
+*/
+
+static int stbi__parse_zlib(stbi__zbuf *a, int parse_header)
+{
+   int final, type;
+   if (parse_header)
+      if (!stbi__parse_zlib_header(a)) return 0;
+   a->num_bits = 0;
+   a->code_buffer = 0;
+   do {
+      final = stbi__zreceive(a,1);
+      type = stbi__zreceive(a,2);
+      if (type == 0) {
+         if (!stbi__parse_uncompressed_block(a)) return 0;
+      } else if (type == 3) {
+         return 0;
+      } else {
+         if (type == 1) {
+            // use fixed code lengths
+            if (!stbi__zbuild_huffman(&a->z_length  , stbi__zdefault_length  , STBI__ZNSYMS)) return 0;
+            if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance,  32)) return 0;
+         } else {
+            if (!stbi__compute_huffman_codes(a)) return 0;
+         }
+         if (!stbi__parse_huffman_block(a)) return 0;
+      }
+   } while (!final);
+   return 1;
+}
+
+static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header)
+{
+   a->zout_start = obuf;
+   a->zout       = obuf;
+   a->zout_end   = obuf + olen;
+   a->z_expandable = exp;
+
+   return stbi__parse_zlib(a, parse_header);
+}
+
+STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen)
+{
+   stbi__zbuf a;
+   char *p = (char *) stbi__malloc(initial_size);
+   if (p == NULL) return NULL;
+   a.zbuffer = (stbi_uc *) buffer;
+   a.zbuffer_end = (stbi_uc *) buffer + len;
+   if (stbi__do_zlib(&a, p, initial_size, 1, 1)) {
+      if (outlen) *outlen = (int) (a.zout - a.zout_start);
+      return a.zout_start;
+   } else {
+      STBI_FREE(a.zout_start);
+      return NULL;
+   }
+}
+
+STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen)
+{
+   return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen);
+}
+
+STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header)
+{
+   stbi__zbuf a;
+   char *p = (char *) stbi__malloc(initial_size);
+   if (p == NULL) return NULL;
+   a.zbuffer = (stbi_uc *) buffer;
+   a.zbuffer_end = (stbi_uc *) buffer + len;
+   if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) {
+      if (outlen) *outlen = (int) (a.zout - a.zout_start);
+      return a.zout_start;
+   } else {
+      STBI_FREE(a.zout_start);
+      return NULL;
+   }
+}
+
+STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen)
+{
+   stbi__zbuf a;
+   a.zbuffer = (stbi_uc *) ibuffer;
+   a.zbuffer_end = (stbi_uc *) ibuffer + ilen;
+   if (stbi__do_zlib(&a, obuffer, olen, 0, 1))
+      return (int) (a.zout - a.zout_start);
+   else
+      return -1;
+}
+
+STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen)
+{
+   stbi__zbuf a;
+   char *p = (char *) stbi__malloc(16384);
+   if (p == NULL) return NULL;
+   a.zbuffer = (stbi_uc *) buffer;
+   a.zbuffer_end = (stbi_uc *) buffer+len;
+   if (stbi__do_zlib(&a, p, 16384, 1, 0)) {
+      if (outlen) *outlen = (int) (a.zout - a.zout_start);
+      return a.zout_start;
+   } else {
+      STBI_FREE(a.zout_start);
+      return NULL;
+   }
+}
+
+STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen)
+{
+   stbi__zbuf a;
+   a.zbuffer = (stbi_uc *) ibuffer;
+   a.zbuffer_end = (stbi_uc *) ibuffer + ilen;
+   if (stbi__do_zlib(&a, obuffer, olen, 0, 0))
+      return (int) (a.zout - a.zout_start);
+   else
+      return -1;
+}
+#endif
+
+// public domain "baseline" PNG decoder   v0.10  Sean Barrett 2006-11-18
+//    simple implementation
+//      - only 8-bit samples
+//      - no CRC checking
+//      - allocates lots of intermediate memory
+//        - avoids problem of streaming data between subsystems
+//        - avoids explicit window management
+//    performance
+//      - uses stb_zlib, a PD zlib implementation with fast huffman decoding
+
+#ifndef STBI_NO_PNG
+typedef struct
+{
+   stbi__uint32 length;
+   stbi__uint32 type;
+} stbi__pngchunk;
+
+static stbi__pngchunk stbi__get_chunk_header(stbi__context *s)
+{
+   stbi__pngchunk c;
+   c.length = stbi__get32be(s);
+   c.type   = stbi__get32be(s);
+   return c;
+}
+
+static int stbi__check_png_header(stbi__context *s)
+{
+   static const stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 };
+   int i;
+   for (i=0; i < 8; ++i)
+      if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG");
+   return 1;
+}
+
+typedef struct
+{
+   stbi__context *s;
+   stbi_uc *idata, *expanded, *out;
+   int depth;
+} stbi__png;
+
+
+enum {
+   STBI__F_none=0,
+   STBI__F_sub=1,
+   STBI__F_up=2,
+   STBI__F_avg=3,
+   STBI__F_paeth=4,
+   // synthetic filters used for first scanline to avoid needing a dummy row of 0s
+   STBI__F_avg_first,
+   STBI__F_paeth_first
+};
+
+static stbi_uc first_row_filter[5] =
+{
+   STBI__F_none,
+   STBI__F_sub,
+   STBI__F_none,
+   STBI__F_avg_first,
+   STBI__F_paeth_first
+};
+
+static int stbi__paeth(int a, int b, int c)
+{
+   int p = a + b - c;
+   int pa = abs(p-a);
+   int pb = abs(p-b);
+   int pc = abs(p-c);
+   if (pa <= pb && pa <= pc) return a;
+   if (pb <= pc) return b;
+   return c;
+}
+
+static const stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 };
+
+// create the png data from post-deflated data
+static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color)
+{
+   int bytes = (depth == 16? 2 : 1);
+   stbi__context *s = a->s;
+   stbi__uint32 i,j,stride = x*out_n*bytes;
+   stbi__uint32 img_len, img_width_bytes;
+   int k;
+   int img_n = s->img_n; // copy it into a local for later
+
+   int output_bytes = out_n*bytes;
+   int filter_bytes = img_n*bytes;
+   int width = x;
+
+   STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1);
+   a->out = (stbi_uc *) stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into
+   if (!a->out) return stbi__err("outofmem", "Out of memory");
+
+   if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) return stbi__err("too large", "Corrupt PNG");
+   img_width_bytes = (((img_n * x * depth) + 7) >> 3);
+   img_len = (img_width_bytes + 1) * y;
+
+   // we used to check for exact match between raw_len and img_len on non-interlaced PNGs,
+   // but issue #276 reported a PNG in the wild that had extra data at the end (all zeros),
+   // so just check for raw_len < img_len always.
+   if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG");
+
+   for (j=0; j < y; ++j) {
+      stbi_uc *cur = a->out + stride*j;
+      stbi_uc *prior;
+      int filter = *raw++;
+
+      if (filter > 4)
+         return stbi__err("invalid filter","Corrupt PNG");
+
+      if (depth < 8) {
+         if (img_width_bytes > x) return stbi__err("invalid width","Corrupt PNG");
+         cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place
+         filter_bytes = 1;
+         width = img_width_bytes;
+      }
+      prior = cur - stride; // bugfix: need to compute this after 'cur +=' computation above
+
+      // if first row, use special filter that doesn't sample previous row
+      if (j == 0) filter = first_row_filter[filter];
+
+      // handle first byte explicitly
+      for (k=0; k < filter_bytes; ++k) {
+         switch (filter) {
+            case STBI__F_none       : cur[k] = raw[k]; break;
+            case STBI__F_sub        : cur[k] = raw[k]; break;
+            case STBI__F_up         : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break;
+            case STBI__F_avg        : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break;
+            case STBI__F_paeth      : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break;
+            case STBI__F_avg_first  : cur[k] = raw[k]; break;
+            case STBI__F_paeth_first: cur[k] = raw[k]; break;
+         }
+      }
+
+      if (depth == 8) {
+         if (img_n != out_n)
+            cur[img_n] = 255; // first pixel
+         raw += img_n;
+         cur += out_n;
+         prior += out_n;
+      } else if (depth == 16) {
+         if (img_n != out_n) {
+            cur[filter_bytes]   = 255; // first pixel top byte
+            cur[filter_bytes+1] = 255; // first pixel bottom byte
+         }
+         raw += filter_bytes;
+         cur += output_bytes;
+         prior += output_bytes;
+      } else {
+         raw += 1;
+         cur += 1;
+         prior += 1;
+      }
+
+      // this is a little gross, so that we don't switch per-pixel or per-component
+      if (depth < 8 || img_n == out_n) {
+         int nk = (width - 1)*filter_bytes;
+         #define STBI__CASE(f) \
+             case f:     \
+                for (k=0; k < nk; ++k)
+         switch (filter) {
+            // "none" filter turns into a memcpy here; make that explicit.
+            case STBI__F_none:         memcpy(cur, raw, nk); break;
+            STBI__CASE(STBI__F_sub)          { cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); } break;
+            STBI__CASE(STBI__F_up)           { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
+            STBI__CASE(STBI__F_avg)          { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); } break;
+            STBI__CASE(STBI__F_paeth)        { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); } break;
+            STBI__CASE(STBI__F_avg_first)    { cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); } break;
+            STBI__CASE(STBI__F_paeth_first)  { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); } break;
+         }
+         #undef STBI__CASE
+         raw += nk;
+      } else {
+         STBI_ASSERT(img_n+1 == out_n);
+         #define STBI__CASE(f) \
+             case f:     \
+                for (i=x-1; i >= 1; --i, cur[filter_bytes]=255,raw+=filter_bytes,cur+=output_bytes,prior+=output_bytes) \
+                   for (k=0; k < filter_bytes; ++k)
+         switch (filter) {
+            STBI__CASE(STBI__F_none)         { cur[k] = raw[k]; } break;
+            STBI__CASE(STBI__F_sub)          { cur[k] = STBI__BYTECAST(raw[k] + cur[k- output_bytes]); } break;
+            STBI__CASE(STBI__F_up)           { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
+            STBI__CASE(STBI__F_avg)          { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k- output_bytes])>>1)); } break;
+            STBI__CASE(STBI__F_paeth)        { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],prior[k],prior[k- output_bytes])); } break;
+            STBI__CASE(STBI__F_avg_first)    { cur[k] = STBI__BYTECAST(raw[k] + (cur[k- output_bytes] >> 1)); } break;
+            STBI__CASE(STBI__F_paeth_first)  { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],0,0)); } break;
+         }
+         #undef STBI__CASE
+
+         // the loop above sets the high byte of the pixels' alpha, but for
+         // 16 bit png files we also need the low byte set. we'll do that here.
+         if (depth == 16) {
+            cur = a->out + stride*j; // start at the beginning of the row again
+            for (i=0; i < x; ++i,cur+=output_bytes) {
+               cur[filter_bytes+1] = 255;
+            }
+         }
+      }
+   }
+
+   // we make a separate pass to expand bits to pixels; for performance,
+   // this could run two scanlines behind the above code, so it won't
+   // intefere with filtering but will still be in the cache.
+   if (depth < 8) {
+      for (j=0; j < y; ++j) {
+         stbi_uc *cur = a->out + stride*j;
+         stbi_uc *in  = a->out + stride*j + x*out_n - img_width_bytes;
+         // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit
+         // png guarante byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop
+         stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range
+
+         // note that the final byte might overshoot and write more data than desired.
+         // we can allocate enough data that this never writes out of memory, but it
+         // could also overwrite the next scanline. can it overwrite non-empty data
+         // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel.
+         // so we need to explicitly clamp the final ones
+
+         if (depth == 4) {
+            for (k=x*img_n; k >= 2; k-=2, ++in) {
+               *cur++ = scale * ((*in >> 4)       );
+               *cur++ = scale * ((*in     ) & 0x0f);
+            }
+            if (k > 0) *cur++ = scale * ((*in >> 4)       );
+         } else if (depth == 2) {
+            for (k=x*img_n; k >= 4; k-=4, ++in) {
+               *cur++ = scale * ((*in >> 6)       );
+               *cur++ = scale * ((*in >> 4) & 0x03);
+               *cur++ = scale * ((*in >> 2) & 0x03);
+               *cur++ = scale * ((*in     ) & 0x03);
+            }
+            if (k > 0) *cur++ = scale * ((*in >> 6)       );
+            if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03);
+            if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03);
+         } else if (depth == 1) {
+            for (k=x*img_n; k >= 8; k-=8, ++in) {
+               *cur++ = scale * ((*in >> 7)       );
+               *cur++ = scale * ((*in >> 6) & 0x01);
+               *cur++ = scale * ((*in >> 5) & 0x01);
+               *cur++ = scale * ((*in >> 4) & 0x01);
+               *cur++ = scale * ((*in >> 3) & 0x01);
+               *cur++ = scale * ((*in >> 2) & 0x01);
+               *cur++ = scale * ((*in >> 1) & 0x01);
+               *cur++ = scale * ((*in     ) & 0x01);
+            }
+            if (k > 0) *cur++ = scale * ((*in >> 7)       );
+            if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01);
+            if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01);
+            if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01);
+            if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01);
+            if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01);
+            if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01);
+         }
+         if (img_n != out_n) {
+            int q;
+            // insert alpha = 255
+            cur = a->out + stride*j;
+            if (img_n == 1) {
+               for (q=x-1; q >= 0; --q) {
+                  cur[q*2+1] = 255;
+                  cur[q*2+0] = cur[q];
+               }
+            } else {
+               STBI_ASSERT(img_n == 3);
+               for (q=x-1; q >= 0; --q) {
+                  cur[q*4+3] = 255;
+                  cur[q*4+2] = cur[q*3+2];
+                  cur[q*4+1] = cur[q*3+1];
+                  cur[q*4+0] = cur[q*3+0];
+               }
+            }
+         }
+      }
+   } else if (depth == 16) {
+      // force the image data from big-endian to platform-native.
+      // this is done in a separate pass due to the decoding relying
+      // on the data being untouched, but could probably be done
+      // per-line during decode if care is taken.
+      stbi_uc *cur = a->out;
+      stbi__uint16 *cur16 = (stbi__uint16*)cur;
+
+      for(i=0; i < x*y*out_n; ++i,cur16++,cur+=2) {
+         *cur16 = (cur[0] << 8) | cur[1];
+      }
+   }
+
+   return 1;
+}
+
+static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced)
+{
+   int bytes = (depth == 16 ? 2 : 1);
+   int out_bytes = out_n * bytes;
+   stbi_uc *final;
+   int p;
+   if (!interlaced)
+      return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color);
+
+   // de-interlacing
+   final = (stbi_uc *) stbi__malloc_mad3(a->s->img_x, a->s->img_y, out_bytes, 0);
+   if (!final) return stbi__err("outofmem", "Out of memory");
+   for (p=0; p < 7; ++p) {
+      int xorig[] = { 0,4,0,2,0,1,0 };
+      int yorig[] = { 0,0,4,0,2,0,1 };
+      int xspc[]  = { 8,8,4,4,2,2,1 };
+      int yspc[]  = { 8,8,8,4,4,2,2 };
+      int i,j,x,y;
+      // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1
+      x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p];
+      y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p];
+      if (x && y) {
+         stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y;
+         if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) {
+            STBI_FREE(final);
+            return 0;
+         }
+         for (j=0; j < y; ++j) {
+            for (i=0; i < x; ++i) {
+               int out_y = j*yspc[p]+yorig[p];
+               int out_x = i*xspc[p]+xorig[p];
+               memcpy(final + out_y*a->s->img_x*out_bytes + out_x*out_bytes,
+                      a->out + (j*x+i)*out_bytes, out_bytes);
+            }
+         }
+         STBI_FREE(a->out);
+         image_data += img_len;
+         image_data_len -= img_len;
+      }
+   }
+   a->out = final;
+
+   return 1;
+}
+
+static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n)
+{
+   stbi__context *s = z->s;
+   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
+   stbi_uc *p = z->out;
+
+   // compute color-based transparency, assuming we've
+   // already got 255 as the alpha value in the output
+   STBI_ASSERT(out_n == 2 || out_n == 4);
+
+   if (out_n == 2) {
+      for (i=0; i < pixel_count; ++i) {
+         p[1] = (p[0] == tc[0] ? 0 : 255);
+         p += 2;
+      }
+   } else {
+      for (i=0; i < pixel_count; ++i) {
+         if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2])
+            p[3] = 0;
+         p += 4;
+      }
+   }
+   return 1;
+}
+
+static int stbi__compute_transparency16(stbi__png *z, stbi__uint16 tc[3], int out_n)
+{
+   stbi__context *s = z->s;
+   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
+   stbi__uint16 *p = (stbi__uint16*) z->out;
+
+   // compute color-based transparency, assuming we've
+   // already got 65535 as the alpha value in the output
+   STBI_ASSERT(out_n == 2 || out_n == 4);
+
+   if (out_n == 2) {
+      for (i = 0; i < pixel_count; ++i) {
+         p[1] = (p[0] == tc[0] ? 0 : 65535);
+         p += 2;
+      }
+   } else {
+      for (i = 0; i < pixel_count; ++i) {
+         if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2])
+            p[3] = 0;
+         p += 4;
+      }
+   }
+   return 1;
+}
+
+static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n)
+{
+   stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y;
+   stbi_uc *p, *temp_out, *orig = a->out;
+
+   p = (stbi_uc *) stbi__malloc_mad2(pixel_count, pal_img_n, 0);
+   if (p == NULL) return stbi__err("outofmem", "Out of memory");
+
+   // between here and free(out) below, exitting would leak
+   temp_out = p;
+
+   if (pal_img_n == 3) {
+      for (i=0; i < pixel_count; ++i) {
+         int n = orig[i]*4;
+         p[0] = palette[n  ];
+         p[1] = palette[n+1];
+         p[2] = palette[n+2];
+         p += 3;
+      }
+   } else {
+      for (i=0; i < pixel_count; ++i) {
+         int n = orig[i]*4;
+         p[0] = palette[n  ];
+         p[1] = palette[n+1];
+         p[2] = palette[n+2];
+         p[3] = palette[n+3];
+         p += 4;
+      }
+   }
+   STBI_FREE(a->out);
+   a->out = temp_out;
+
+   STBI_NOTUSED(len);
+
+   return 1;
+}
+
+static int stbi__unpremultiply_on_load_global = 0;
+static int stbi__de_iphone_flag_global = 0;
+
+STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply)
+{
+   stbi__unpremultiply_on_load_global = flag_true_if_should_unpremultiply;
+}
+
+STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert)
+{
+   stbi__de_iphone_flag_global = flag_true_if_should_convert;
+}
+
+#ifndef STBI_THREAD_LOCAL
+#define stbi__unpremultiply_on_load  stbi__unpremultiply_on_load_global
+#define stbi__de_iphone_flag  stbi__de_iphone_flag_global
+#else
+static STBI_THREAD_LOCAL int stbi__unpremultiply_on_load_local, stbi__unpremultiply_on_load_set;
+static STBI_THREAD_LOCAL int stbi__de_iphone_flag_local, stbi__de_iphone_flag_set;
+
+STBIDEF void stbi__unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply)
+{
+   stbi__unpremultiply_on_load_local = flag_true_if_should_unpremultiply;
+   stbi__unpremultiply_on_load_set = 1;
+}
+
+STBIDEF void stbi_convert_iphone_png_to_rgb_thread(int flag_true_if_should_convert)
+{
+   stbi__de_iphone_flag_local = flag_true_if_should_convert;
+   stbi__de_iphone_flag_set = 1;
+}
+
+#define stbi__unpremultiply_on_load  (stbi__unpremultiply_on_load_set           \
+                                       ? stbi__unpremultiply_on_load_local      \
+                                       : stbi__unpremultiply_on_load_global)
+#define stbi__de_iphone_flag  (stbi__de_iphone_flag_set                         \
+                                ? stbi__de_iphone_flag_local                    \
+                                : stbi__de_iphone_flag_global)
+#endif // STBI_THREAD_LOCAL
+
+static void stbi__de_iphone(stbi__png *z)
+{
+   stbi__context *s = z->s;
+   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
+   stbi_uc *p = z->out;
+
+   if (s->img_out_n == 3) {  // convert bgr to rgb
+      for (i=0; i < pixel_count; ++i) {
+         stbi_uc t = p[0];
+         p[0] = p[2];
+         p[2] = t;
+         p += 3;
+      }
+   } else {
+      STBI_ASSERT(s->img_out_n == 4);
+      if (stbi__unpremultiply_on_load) {
+         // convert bgr to rgb and unpremultiply
+         for (i=0; i < pixel_count; ++i) {
+            stbi_uc a = p[3];
+            stbi_uc t = p[0];
+            if (a) {
+               stbi_uc half = a / 2;
+               p[0] = (p[2] * 255 + half) / a;
+               p[1] = (p[1] * 255 + half) / a;
+               p[2] = ( t   * 255 + half) / a;
+            } else {
+               p[0] = p[2];
+               p[2] = t;
+            }
+            p += 4;
+         }
+      } else {
+         // convert bgr to rgb
+         for (i=0; i < pixel_count; ++i) {
+            stbi_uc t = p[0];
+            p[0] = p[2];
+            p[2] = t;
+            p += 4;
+         }
+      }
+   }
+}
+
+#define STBI__PNG_TYPE(a,b,c,d)  (((unsigned) (a) << 24) + ((unsigned) (b) << 16) + ((unsigned) (c) << 8) + (unsigned) (d))
+
+static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
+{
+   stbi_uc palette[1024], pal_img_n=0;
+   stbi_uc has_trans=0, tc[3]={0};
+   stbi__uint16 tc16[3];
+   stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0;
+   int first=1,k,interlace=0, color=0, is_iphone=0;
+   stbi__context *s = z->s;
+
+   z->expanded = NULL;
+   z->idata = NULL;
+   z->out = NULL;
+
+   if (!stbi__check_png_header(s)) return 0;
+
+   if (scan == STBI__SCAN_type) return 1;
+
+   for (;;) {
+      stbi__pngchunk c = stbi__get_chunk_header(s);
+      switch (c.type) {
+         case STBI__PNG_TYPE('C','g','B','I'):
+            is_iphone = 1;
+            stbi__skip(s, c.length);
+            break;
+         case STBI__PNG_TYPE('I','H','D','R'): {
+            int comp,filter;
+            if (!first) return stbi__err("multiple IHDR","Corrupt PNG");
+            first = 0;
+            if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG");
+            s->img_x = stbi__get32be(s);
+            s->img_y = stbi__get32be(s);
+            if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+            if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+            z->depth = stbi__get8(s);  if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16)  return stbi__err("1/2/4/8/16-bit only","PNG not supported: 1/2/4/8/16-bit only");
+            color = stbi__get8(s);  if (color > 6)         return stbi__err("bad ctype","Corrupt PNG");
+            if (color == 3 && z->depth == 16)                  return stbi__err("bad ctype","Corrupt PNG");
+            if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG");
+            comp  = stbi__get8(s);  if (comp) return stbi__err("bad comp method","Corrupt PNG");
+            filter= stbi__get8(s);  if (filter) return stbi__err("bad filter method","Corrupt PNG");
+            interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG");
+            if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG");
+            if (!pal_img_n) {
+               s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0);
+               if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode");
+               if (scan == STBI__SCAN_header) return 1;
+            } else {
+               // if paletted, then pal_n is our final components, and
+               // img_n is # components to decompress/filter.
+               s->img_n = 1;
+               if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG");
+               // if SCAN_header, have to scan to see if we have a tRNS
+            }
+            break;
+         }
+
+         case STBI__PNG_TYPE('P','L','T','E'):  {
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG");
+            pal_len = c.length / 3;
+            if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG");
+            for (i=0; i < pal_len; ++i) {
+               palette[i*4+0] = stbi__get8(s);
+               palette[i*4+1] = stbi__get8(s);
+               palette[i*4+2] = stbi__get8(s);
+               palette[i*4+3] = 255;
+            }
+            break;
+         }
+
+         case STBI__PNG_TYPE('t','R','N','S'): {
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG");
+            if (pal_img_n) {
+               if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; }
+               if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG");
+               if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG");
+               pal_img_n = 4;
+               for (i=0; i < c.length; ++i)
+                  palette[i*4+3] = stbi__get8(s);
+            } else {
+               if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG");
+               if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG");
+               has_trans = 1;
+               if (z->depth == 16) {
+                  for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is
+               } else {
+                  for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger
+               }
+            }
+            break;
+         }
+
+         case STBI__PNG_TYPE('I','D','A','T'): {
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG");
+            if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; }
+            if ((int)(ioff + c.length) < (int)ioff) return 0;
+            if (ioff + c.length > idata_limit) {
+               stbi__uint32 idata_limit_old = idata_limit;
+               stbi_uc *p;
+               if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096;
+               while (ioff + c.length > idata_limit)
+                  idata_limit *= 2;
+               STBI_NOTUSED(idata_limit_old);
+               p = (stbi_uc *) STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory");
+               z->idata = p;
+            }
+            if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG");
+            ioff += c.length;
+            break;
+         }
+
+         case STBI__PNG_TYPE('I','E','N','D'): {
+            stbi__uint32 raw_len, bpl;
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if (scan != STBI__SCAN_load) return 1;
+            if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG");
+            // initial guess for decoded data size to avoid unnecessary reallocs
+            bpl = (s->img_x * z->depth + 7) / 8; // bytes per line, per component
+            raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */;
+            z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone);
+            if (z->expanded == NULL) return 0; // zlib should set error
+            STBI_FREE(z->idata); z->idata = NULL;
+            if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans)
+               s->img_out_n = s->img_n+1;
+            else
+               s->img_out_n = s->img_n;
+            if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) return 0;
+            if (has_trans) {
+               if (z->depth == 16) {
+                  if (!stbi__compute_transparency16(z, tc16, s->img_out_n)) return 0;
+               } else {
+                  if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0;
+               }
+            }
+            if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2)
+               stbi__de_iphone(z);
+            if (pal_img_n) {
+               // pal_img_n == 3 or 4
+               s->img_n = pal_img_n; // record the actual colors we had
+               s->img_out_n = pal_img_n;
+               if (req_comp >= 3) s->img_out_n = req_comp;
+               if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n))
+                  return 0;
+            } else if (has_trans) {
+               // non-paletted image with tRNS -> source image has (constant) alpha
+               ++s->img_n;
+            }
+            STBI_FREE(z->expanded); z->expanded = NULL;
+            // end of PNG chunk, read and skip CRC
+            stbi__get32be(s);
+            return 1;
+         }
+
+         default:
+            // if critical, fail
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if ((c.type & (1 << 29)) == 0) {
+               #ifndef STBI_NO_FAILURE_STRINGS
+               // not threadsafe
+               static char invalid_chunk[] = "XXXX PNG chunk not known";
+               invalid_chunk[0] = STBI__BYTECAST(c.type >> 24);
+               invalid_chunk[1] = STBI__BYTECAST(c.type >> 16);
+               invalid_chunk[2] = STBI__BYTECAST(c.type >>  8);
+               invalid_chunk[3] = STBI__BYTECAST(c.type >>  0);
+               #endif
+               return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type");
+            }
+            stbi__skip(s, c.length);
+            break;
+      }
+      // end of PNG chunk, read and skip CRC
+      stbi__get32be(s);
+   }
+}
+
+static void *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp, stbi__result_info *ri)
+{
+   void *result=NULL;
+   if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");
+   if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) {
+      if (p->depth <= 8)
+         ri->bits_per_channel = 8;
+      else if (p->depth == 16)
+         ri->bits_per_channel = 16;
+      else
+         return stbi__errpuc("bad bits_per_channel", "PNG not supported: unsupported color depth");
+      result = p->out;
+      p->out = NULL;
+      if (req_comp && req_comp != p->s->img_out_n) {
+         if (ri->bits_per_channel == 8)
+            result = stbi__convert_format((unsigned char *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y);
+         else
+            result = stbi__convert_format16((stbi__uint16 *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y);
+         p->s->img_out_n = req_comp;
+         if (result == NULL) return result;
+      }
+      *x = p->s->img_x;
+      *y = p->s->img_y;
+      if (n) *n = p->s->img_n;
+   }
+   STBI_FREE(p->out);      p->out      = NULL;
+   STBI_FREE(p->expanded); p->expanded = NULL;
+   STBI_FREE(p->idata);    p->idata    = NULL;
+
+   return result;
+}
+
+static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   stbi__png p;
+   p.s = s;
+   return stbi__do_png(&p, x,y,comp,req_comp, ri);
+}
+
+static int stbi__png_test(stbi__context *s)
+{
+   int r;
+   r = stbi__check_png_header(s);
+   stbi__rewind(s);
+   return r;
+}
+
+static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp)
+{
+   if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) {
+      stbi__rewind( p->s );
+      return 0;
+   }
+   if (x) *x = p->s->img_x;
+   if (y) *y = p->s->img_y;
+   if (comp) *comp = p->s->img_n;
+   return 1;
+}
+
+static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   stbi__png p;
+   p.s = s;
+   return stbi__png_info_raw(&p, x, y, comp);
+}
+
+static int stbi__png_is16(stbi__context *s)
+{
+   stbi__png p;
+   p.s = s;
+   if (!stbi__png_info_raw(&p, NULL, NULL, NULL))
+	   return 0;
+   if (p.depth != 16) {
+      stbi__rewind(p.s);
+      return 0;
+   }
+   return 1;
+}
+#endif
+
+// Microsoft/Windows BMP image
+
+#ifndef STBI_NO_BMP
+static int stbi__bmp_test_raw(stbi__context *s)
+{
+   int r;
+   int sz;
+   if (stbi__get8(s) != 'B') return 0;
+   if (stbi__get8(s) != 'M') return 0;
+   stbi__get32le(s); // discard filesize
+   stbi__get16le(s); // discard reserved
+   stbi__get16le(s); // discard reserved
+   stbi__get32le(s); // discard data offset
+   sz = stbi__get32le(s);
+   r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124);
+   return r;
+}
+
+static int stbi__bmp_test(stbi__context *s)
+{
+   int r = stbi__bmp_test_raw(s);
+   stbi__rewind(s);
+   return r;
+}
+
+
+// returns 0..31 for the highest set bit
+static int stbi__high_bit(unsigned int z)
+{
+   int n=0;
+   if (z == 0) return -1;
+   if (z >= 0x10000) { n += 16; z >>= 16; }
+   if (z >= 0x00100) { n +=  8; z >>=  8; }
+   if (z >= 0x00010) { n +=  4; z >>=  4; }
+   if (z >= 0x00004) { n +=  2; z >>=  2; }
+   if (z >= 0x00002) { n +=  1;/* >>=  1;*/ }
+   return n;
+}
+
+static int stbi__bitcount(unsigned int a)
+{
+   a = (a & 0x55555555) + ((a >>  1) & 0x55555555); // max 2
+   a = (a & 0x33333333) + ((a >>  2) & 0x33333333); // max 4
+   a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits
+   a = (a + (a >> 8)); // max 16 per 8 bits
+   a = (a + (a >> 16)); // max 32 per 8 bits
+   return a & 0xff;
+}
+
+// extract an arbitrarily-aligned N-bit value (N=bits)
+// from v, and then make it 8-bits long and fractionally
+// extend it to full full range.
+static int stbi__shiftsigned(unsigned int v, int shift, int bits)
+{
+   static unsigned int mul_table[9] = {
+      0,
+      0xff/*0b11111111*/, 0x55/*0b01010101*/, 0x49/*0b01001001*/, 0x11/*0b00010001*/,
+      0x21/*0b00100001*/, 0x41/*0b01000001*/, 0x81/*0b10000001*/, 0x01/*0b00000001*/,
+   };
+   static unsigned int shift_table[9] = {
+      0, 0,0,1,0,2,4,6,0,
+   };
+   if (shift < 0)
+      v <<= -shift;
+   else
+      v >>= shift;
+   STBI_ASSERT(v < 256);
+   v >>= (8-bits);
+   STBI_ASSERT(bits >= 0 && bits <= 8);
+   return (int) ((unsigned) v * mul_table[bits]) >> shift_table[bits];
+}
+
+typedef struct
+{
+   int bpp, offset, hsz;
+   unsigned int mr,mg,mb,ma, all_a;
+   int extra_read;
+} stbi__bmp_data;
+
+static int stbi__bmp_set_mask_defaults(stbi__bmp_data *info, int compress)
+{
+   // BI_BITFIELDS specifies masks explicitly, don't override
+   if (compress == 3)
+      return 1;
+
+   if (compress == 0) {
+      if (info->bpp == 16) {
+         info->mr = 31u << 10;
+         info->mg = 31u <<  5;
+         info->mb = 31u <<  0;
+      } else if (info->bpp == 32) {
+         info->mr = 0xffu << 16;
+         info->mg = 0xffu <<  8;
+         info->mb = 0xffu <<  0;
+         info->ma = 0xffu << 24;
+         info->all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0
+      } else {
+         // otherwise, use defaults, which is all-0
+         info->mr = info->mg = info->mb = info->ma = 0;
+      }
+      return 1;
+   }
+   return 0; // error
+}
+
+static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info)
+{
+   int hsz;
+   if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP");
+   stbi__get32le(s); // discard filesize
+   stbi__get16le(s); // discard reserved
+   stbi__get16le(s); // discard reserved
+   info->offset = stbi__get32le(s);
+   info->hsz = hsz = stbi__get32le(s);
+   info->mr = info->mg = info->mb = info->ma = 0;
+   info->extra_read = 14;
+
+   if (info->offset < 0) return stbi__errpuc("bad BMP", "bad BMP");
+
+   if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown");
+   if (hsz == 12) {
+      s->img_x = stbi__get16le(s);
+      s->img_y = stbi__get16le(s);
+   } else {
+      s->img_x = stbi__get32le(s);
+      s->img_y = stbi__get32le(s);
+   }
+   if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP");
+   info->bpp = stbi__get16le(s);
+   if (hsz != 12) {
+      int compress = stbi__get32le(s);
+      if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE");
+      if (compress >= 4) return stbi__errpuc("BMP JPEG/PNG", "BMP type not supported: unsupported compression"); // this includes PNG/JPEG modes
+      if (compress == 3 && info->bpp != 16 && info->bpp != 32) return stbi__errpuc("bad BMP", "bad BMP"); // bitfields requires 16 or 32 bits/pixel
+      stbi__get32le(s); // discard sizeof
+      stbi__get32le(s); // discard hres
+      stbi__get32le(s); // discard vres
+      stbi__get32le(s); // discard colorsused
+      stbi__get32le(s); // discard max important
+      if (hsz == 40 || hsz == 56) {
+         if (hsz == 56) {
+            stbi__get32le(s);
+            stbi__get32le(s);
+            stbi__get32le(s);
+            stbi__get32le(s);
+         }
+         if (info->bpp == 16 || info->bpp == 32) {
+            if (compress == 0) {
+               stbi__bmp_set_mask_defaults(info, compress);
+            } else if (compress == 3) {
+               info->mr = stbi__get32le(s);
+               info->mg = stbi__get32le(s);
+               info->mb = stbi__get32le(s);
+               info->extra_read += 12;
+               // not documented, but generated by photoshop and handled by mspaint
+               if (info->mr == info->mg && info->mg == info->mb) {
+                  // ?!?!?
+                  return stbi__errpuc("bad BMP", "bad BMP");
+               }
+            } else
+               return stbi__errpuc("bad BMP", "bad BMP");
+         }
+      } else {
+         // V4/V5 header
+         int i;
+         if (hsz != 108 && hsz != 124)
+            return stbi__errpuc("bad BMP", "bad BMP");
+         info->mr = stbi__get32le(s);
+         info->mg = stbi__get32le(s);
+         info->mb = stbi__get32le(s);
+         info->ma = stbi__get32le(s);
+         if (compress != 3) // override mr/mg/mb unless in BI_BITFIELDS mode, as per docs
+            stbi__bmp_set_mask_defaults(info, compress);
+         stbi__get32le(s); // discard color space
+         for (i=0; i < 12; ++i)
+            stbi__get32le(s); // discard color space parameters
+         if (hsz == 124) {
+            stbi__get32le(s); // discard rendering intent
+            stbi__get32le(s); // discard offset of profile data
+            stbi__get32le(s); // discard size of profile data
+            stbi__get32le(s); // discard reserved
+         }
+      }
+   }
+   return (void *) 1;
+}
+
+
+static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   stbi_uc *out;
+   unsigned int mr=0,mg=0,mb=0,ma=0, all_a;
+   stbi_uc pal[256][4];
+   int psize=0,i,j,width;
+   int flip_vertically, pad, target;
+   stbi__bmp_data info;
+   STBI_NOTUSED(ri);
+
+   info.all_a = 255;
+   if (stbi__bmp_parse_header(s, &info) == NULL)
+      return NULL; // error code already set
+
+   flip_vertically = ((int) s->img_y) > 0;
+   s->img_y = abs((int) s->img_y);
+
+   if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+   if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+
+   mr = info.mr;
+   mg = info.mg;
+   mb = info.mb;
+   ma = info.ma;
+   all_a = info.all_a;
+
+   if (info.hsz == 12) {
+      if (info.bpp < 24)
+         psize = (info.offset - info.extra_read - 24) / 3;
+   } else {
+      if (info.bpp < 16)
+         psize = (info.offset - info.extra_read - info.hsz) >> 2;
+   }
+   if (psize == 0) {
+      if (info.offset != s->callback_already_read + (s->img_buffer - s->img_buffer_original)) {
+        return stbi__errpuc("bad offset", "Corrupt BMP");
+      }
+   }
+
+   if (info.bpp == 24 && ma == 0xff000000)
+      s->img_n = 3;
+   else
+      s->img_n = ma ? 4 : 3;
+   if (req_comp && req_comp >= 3) // we can directly decode 3 or 4
+      target = req_comp;
+   else
+      target = s->img_n; // if they want monochrome, we'll post-convert
+
+   // sanity-check size
+   if (!stbi__mad3sizes_valid(target, s->img_x, s->img_y, 0))
+      return stbi__errpuc("too large", "Corrupt BMP");
+
+   out = (stbi_uc *) stbi__malloc_mad3(target, s->img_x, s->img_y, 0);
+   if (!out) return stbi__errpuc("outofmem", "Out of memory");
+   if (info.bpp < 16) {
+      int z=0;
+      if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); }
+      for (i=0; i < psize; ++i) {
+         pal[i][2] = stbi__get8(s);
+         pal[i][1] = stbi__get8(s);
+         pal[i][0] = stbi__get8(s);
+         if (info.hsz != 12) stbi__get8(s);
+         pal[i][3] = 255;
+      }
+      stbi__skip(s, info.offset - info.extra_read - info.hsz - psize * (info.hsz == 12 ? 3 : 4));
+      if (info.bpp == 1) width = (s->img_x + 7) >> 3;
+      else if (info.bpp == 4) width = (s->img_x + 1) >> 1;
+      else if (info.bpp == 8) width = s->img_x;
+      else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); }
+      pad = (-width)&3;
+      if (info.bpp == 1) {
+         for (j=0; j < (int) s->img_y; ++j) {
+            int bit_offset = 7, v = stbi__get8(s);
+            for (i=0; i < (int) s->img_x; ++i) {
+               int color = (v>>bit_offset)&0x1;
+               out[z++] = pal[color][0];
+               out[z++] = pal[color][1];
+               out[z++] = pal[color][2];
+               if (target == 4) out[z++] = 255;
+               if (i+1 == (int) s->img_x) break;
+               if((--bit_offset) < 0) {
+                  bit_offset = 7;
+                  v = stbi__get8(s);
+               }
+            }
+            stbi__skip(s, pad);
+         }
+      } else {
+         for (j=0; j < (int) s->img_y; ++j) {
+            for (i=0; i < (int) s->img_x; i += 2) {
+               int v=stbi__get8(s),v2=0;
+               if (info.bpp == 4) {
+                  v2 = v & 15;
+                  v >>= 4;
+               }
+               out[z++] = pal[v][0];
+               out[z++] = pal[v][1];
+               out[z++] = pal[v][2];
+               if (target == 4) out[z++] = 255;
+               if (i+1 == (int) s->img_x) break;
+               v = (info.bpp == 8) ? stbi__get8(s) : v2;
+               out[z++] = pal[v][0];
+               out[z++] = pal[v][1];
+               out[z++] = pal[v][2];
+               if (target == 4) out[z++] = 255;
+            }
+            stbi__skip(s, pad);
+         }
+      }
+   } else {
+      int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0;
+      int z = 0;
+      int easy=0;
+      stbi__skip(s, info.offset - info.extra_read - info.hsz);
+      if (info.bpp == 24) width = 3 * s->img_x;
+      else if (info.bpp == 16) width = 2*s->img_x;
+      else /* bpp = 32 and pad = 0 */ width=0;
+      pad = (-width) & 3;
+      if (info.bpp == 24) {
+         easy = 1;
+      } else if (info.bpp == 32) {
+         if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000)
+            easy = 2;
+      }
+      if (!easy) {
+         if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); }
+         // right shift amt to put high bit in position #7
+         rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr);
+         gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg);
+         bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb);
+         ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma);
+         if (rcount > 8 || gcount > 8 || bcount > 8 || acount > 8) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); }
+      }
+      for (j=0; j < (int) s->img_y; ++j) {
+         if (easy) {
+            for (i=0; i < (int) s->img_x; ++i) {
+               unsigned char a;
+               out[z+2] = stbi__get8(s);
+               out[z+1] = stbi__get8(s);
+               out[z+0] = stbi__get8(s);
+               z += 3;
+               a = (easy == 2 ? stbi__get8(s) : 255);
+               all_a |= a;
+               if (target == 4) out[z++] = a;
+            }
+         } else {
+            int bpp = info.bpp;
+            for (i=0; i < (int) s->img_x; ++i) {
+               stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s));
+               unsigned int a;
+               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount));
+               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount));
+               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount));
+               a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255);
+               all_a |= a;
+               if (target == 4) out[z++] = STBI__BYTECAST(a);
+            }
+         }
+         stbi__skip(s, pad);
+      }
+   }
+
+   // if alpha channel is all 0s, replace with all 255s
+   if (target == 4 && all_a == 0)
+      for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4)
+         out[i] = 255;
+
+   if (flip_vertically) {
+      stbi_uc t;
+      for (j=0; j < (int) s->img_y>>1; ++j) {
+         stbi_uc *p1 = out +      j     *s->img_x*target;
+         stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target;
+         for (i=0; i < (int) s->img_x*target; ++i) {
+            t = p1[i]; p1[i] = p2[i]; p2[i] = t;
+         }
+      }
+   }
+
+   if (req_comp && req_comp != target) {
+      out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y);
+      if (out == NULL) return out; // stbi__convert_format frees input on failure
+   }
+
+   *x = s->img_x;
+   *y = s->img_y;
+   if (comp) *comp = s->img_n;
+   return out;
+}
+#endif
+
+// Targa Truevision - TGA
+// by Jonathan Dummer
+#ifndef STBI_NO_TGA
+// returns STBI_rgb or whatever, 0 on error
+static int stbi__tga_get_comp(int bits_per_pixel, int is_grey, int* is_rgb16)
+{
+   // only RGB or RGBA (incl. 16bit) or grey allowed
+   if (is_rgb16) *is_rgb16 = 0;
+   switch(bits_per_pixel) {
+      case 8:  return STBI_grey;
+      case 16: if(is_grey) return STBI_grey_alpha;
+               // fallthrough
+      case 15: if(is_rgb16) *is_rgb16 = 1;
+               return STBI_rgb;
+      case 24: // fallthrough
+      case 32: return bits_per_pixel/8;
+      default: return 0;
+   }
+}
+
+static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp)
+{
+    int tga_w, tga_h, tga_comp, tga_image_type, tga_bits_per_pixel, tga_colormap_bpp;
+    int sz, tga_colormap_type;
+    stbi__get8(s);                   // discard Offset
+    tga_colormap_type = stbi__get8(s); // colormap type
+    if( tga_colormap_type > 1 ) {
+        stbi__rewind(s);
+        return 0;      // only RGB or indexed allowed
+    }
+    tga_image_type = stbi__get8(s); // image type
+    if ( tga_colormap_type == 1 ) { // colormapped (paletted) image
+        if (tga_image_type != 1 && tga_image_type != 9) {
+            stbi__rewind(s);
+            return 0;
+        }
+        stbi__skip(s,4);       // skip index of first colormap entry and number of entries
+        sz = stbi__get8(s);    //   check bits per palette color entry
+        if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) {
+            stbi__rewind(s);
+            return 0;
+        }
+        stbi__skip(s,4);       // skip image x and y origin
+        tga_colormap_bpp = sz;
+    } else { // "normal" image w/o colormap - only RGB or grey allowed, +/- RLE
+        if ( (tga_image_type != 2) && (tga_image_type != 3) && (tga_image_type != 10) && (tga_image_type != 11) ) {
+            stbi__rewind(s);
+            return 0; // only RGB or grey allowed, +/- RLE
+        }
+        stbi__skip(s,9); // skip colormap specification and image x/y origin
+        tga_colormap_bpp = 0;
+    }
+    tga_w = stbi__get16le(s);
+    if( tga_w < 1 ) {
+        stbi__rewind(s);
+        return 0;   // test width
+    }
+    tga_h = stbi__get16le(s);
+    if( tga_h < 1 ) {
+        stbi__rewind(s);
+        return 0;   // test height
+    }
+    tga_bits_per_pixel = stbi__get8(s); // bits per pixel
+    stbi__get8(s); // ignore alpha bits
+    if (tga_colormap_bpp != 0) {
+        if((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16)) {
+            // when using a colormap, tga_bits_per_pixel is the size of the indexes
+            // I don't think anything but 8 or 16bit indexes makes sense
+            stbi__rewind(s);
+            return 0;
+        }
+        tga_comp = stbi__tga_get_comp(tga_colormap_bpp, 0, NULL);
+    } else {
+        tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3) || (tga_image_type == 11), NULL);
+    }
+    if(!tga_comp) {
+      stbi__rewind(s);
+      return 0;
+    }
+    if (x) *x = tga_w;
+    if (y) *y = tga_h;
+    if (comp) *comp = tga_comp;
+    return 1;                   // seems to have passed everything
+}
+
+static int stbi__tga_test(stbi__context *s)
+{
+   int res = 0;
+   int sz, tga_color_type;
+   stbi__get8(s);      //   discard Offset
+   tga_color_type = stbi__get8(s);   //   color type
+   if ( tga_color_type > 1 ) goto errorEnd;   //   only RGB or indexed allowed
+   sz = stbi__get8(s);   //   image type
+   if ( tga_color_type == 1 ) { // colormapped (paletted) image
+      if (sz != 1 && sz != 9) goto errorEnd; // colortype 1 demands image type 1 or 9
+      stbi__skip(s,4);       // skip index of first colormap entry and number of entries
+      sz = stbi__get8(s);    //   check bits per palette color entry
+      if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd;
+      stbi__skip(s,4);       // skip image x and y origin
+   } else { // "normal" image w/o colormap
+      if ( (sz != 2) && (sz != 3) && (sz != 10) && (sz != 11) ) goto errorEnd; // only RGB or grey allowed, +/- RLE
+      stbi__skip(s,9); // skip colormap specification and image x/y origin
+   }
+   if ( stbi__get16le(s) < 1 ) goto errorEnd;      //   test width
+   if ( stbi__get16le(s) < 1 ) goto errorEnd;      //   test height
+   sz = stbi__get8(s);   //   bits per pixel
+   if ( (tga_color_type == 1) && (sz != 8) && (sz != 16) ) goto errorEnd; // for colormapped images, bpp is size of an index
+   if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd;
+
+   res = 1; // if we got this far, everything's good and we can return 1 instead of 0
+
+errorEnd:
+   stbi__rewind(s);
+   return res;
+}
+
+// read 16bit value and convert to 24bit RGB
+static void stbi__tga_read_rgb16(stbi__context *s, stbi_uc* out)
+{
+   stbi__uint16 px = (stbi__uint16)stbi__get16le(s);
+   stbi__uint16 fiveBitMask = 31;
+   // we have 3 channels with 5bits each
+   int r = (px >> 10) & fiveBitMask;
+   int g = (px >> 5) & fiveBitMask;
+   int b = px & fiveBitMask;
+   // Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later
+   out[0] = (stbi_uc)((r * 255)/31);
+   out[1] = (stbi_uc)((g * 255)/31);
+   out[2] = (stbi_uc)((b * 255)/31);
+
+   // some people claim that the most significant bit might be used for alpha
+   // (possibly if an alpha-bit is set in the "image descriptor byte")
+   // but that only made 16bit test images completely translucent..
+   // so let's treat all 15 and 16bit TGAs as RGB with no alpha.
+}
+
+static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   //   read in the TGA header stuff
+   int tga_offset = stbi__get8(s);
+   int tga_indexed = stbi__get8(s);
+   int tga_image_type = stbi__get8(s);
+   int tga_is_RLE = 0;
+   int tga_palette_start = stbi__get16le(s);
+   int tga_palette_len = stbi__get16le(s);
+   int tga_palette_bits = stbi__get8(s);
+   int tga_x_origin = stbi__get16le(s);
+   int tga_y_origin = stbi__get16le(s);
+   int tga_width = stbi__get16le(s);
+   int tga_height = stbi__get16le(s);
+   int tga_bits_per_pixel = stbi__get8(s);
+   int tga_comp, tga_rgb16=0;
+   int tga_inverted = stbi__get8(s);
+   // int tga_alpha_bits = tga_inverted & 15; // the 4 lowest bits - unused (useless?)
+   //   image data
+   unsigned char *tga_data;
+   unsigned char *tga_palette = NULL;
+   int i, j;
+   unsigned char raw_data[4] = {0};
+   int RLE_count = 0;
+   int RLE_repeating = 0;
+   int read_next_pixel = 1;
+   STBI_NOTUSED(ri);
+   STBI_NOTUSED(tga_x_origin); // @TODO
+   STBI_NOTUSED(tga_y_origin); // @TODO
+
+   if (tga_height > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+   if (tga_width > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+
+   //   do a tiny bit of precessing
+   if ( tga_image_type >= 8 )
+   {
+      tga_image_type -= 8;
+      tga_is_RLE = 1;
+   }
+   tga_inverted = 1 - ((tga_inverted >> 5) & 1);
+
+   //   If I'm paletted, then I'll use the number of bits from the palette
+   if ( tga_indexed ) tga_comp = stbi__tga_get_comp(tga_palette_bits, 0, &tga_rgb16);
+   else tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3), &tga_rgb16);
+
+   if(!tga_comp) // shouldn't really happen, stbi__tga_test() should have ensured basic consistency
+      return stbi__errpuc("bad format", "Can't find out TGA pixelformat");
+
+   //   tga info
+   *x = tga_width;
+   *y = tga_height;
+   if (comp) *comp = tga_comp;
+
+   if (!stbi__mad3sizes_valid(tga_width, tga_height, tga_comp, 0))
+      return stbi__errpuc("too large", "Corrupt TGA");
+
+   tga_data = (unsigned char*)stbi__malloc_mad3(tga_width, tga_height, tga_comp, 0);
+   if (!tga_data) return stbi__errpuc("outofmem", "Out of memory");
+
+   // skip to the data's starting position (offset usually = 0)
+   stbi__skip(s, tga_offset );
+
+   if ( !tga_indexed && !tga_is_RLE && !tga_rgb16 ) {
+      for (i=0; i < tga_height; ++i) {
+         int row = tga_inverted ? tga_height -i - 1 : i;
+         stbi_uc *tga_row = tga_data + row*tga_width*tga_comp;
+         stbi__getn(s, tga_row, tga_width * tga_comp);
+      }
+   } else  {
+      //   do I need to load a palette?
+      if ( tga_indexed)
+      {
+         if (tga_palette_len == 0) {  /* you have to have at least one entry! */
+            STBI_FREE(tga_data);
+            return stbi__errpuc("bad palette", "Corrupt TGA");
+         }
+
+         //   any data to skip? (offset usually = 0)
+         stbi__skip(s, tga_palette_start );
+         //   load the palette
+         tga_palette = (unsigned char*)stbi__malloc_mad2(tga_palette_len, tga_comp, 0);
+         if (!tga_palette) {
+            STBI_FREE(tga_data);
+            return stbi__errpuc("outofmem", "Out of memory");
+         }
+         if (tga_rgb16) {
+            stbi_uc *pal_entry = tga_palette;
+            STBI_ASSERT(tga_comp == STBI_rgb);
+            for (i=0; i < tga_palette_len; ++i) {
+               stbi__tga_read_rgb16(s, pal_entry);
+               pal_entry += tga_comp;
+            }
+         } else if (!stbi__getn(s, tga_palette, tga_palette_len * tga_comp)) {
+               STBI_FREE(tga_data);
+               STBI_FREE(tga_palette);
+               return stbi__errpuc("bad palette", "Corrupt TGA");
+         }
+      }
+      //   load the data
+      for (i=0; i < tga_width * tga_height; ++i)
+      {
+         //   if I'm in RLE mode, do I need to get a RLE stbi__pngchunk?
+         if ( tga_is_RLE )
+         {
+            if ( RLE_count == 0 )
+            {
+               //   yep, get the next byte as a RLE command
+               int RLE_cmd = stbi__get8(s);
+               RLE_count = 1 + (RLE_cmd & 127);
+               RLE_repeating = RLE_cmd >> 7;
+               read_next_pixel = 1;
+            } else if ( !RLE_repeating )
+            {
+               read_next_pixel = 1;
+            }
+         } else
+         {
+            read_next_pixel = 1;
+         }
+         //   OK, if I need to read a pixel, do it now
+         if ( read_next_pixel )
+         {
+            //   load however much data we did have
+            if ( tga_indexed )
+            {
+               // read in index, then perform the lookup
+               int pal_idx = (tga_bits_per_pixel == 8) ? stbi__get8(s) : stbi__get16le(s);
+               if ( pal_idx >= tga_palette_len ) {
+                  // invalid index
+                  pal_idx = 0;
+               }
+               pal_idx *= tga_comp;
+               for (j = 0; j < tga_comp; ++j) {
+                  raw_data[j] = tga_palette[pal_idx+j];
+               }
+            } else if(tga_rgb16) {
+               STBI_ASSERT(tga_comp == STBI_rgb);
+               stbi__tga_read_rgb16(s, raw_data);
+            } else {
+               //   read in the data raw
+               for (j = 0; j < tga_comp; ++j) {
+                  raw_data[j] = stbi__get8(s);
+               }
+            }
+            //   clear the reading flag for the next pixel
+            read_next_pixel = 0;
+         } // end of reading a pixel
+
+         // copy data
+         for (j = 0; j < tga_comp; ++j)
+           tga_data[i*tga_comp+j] = raw_data[j];
+
+         //   in case we're in RLE mode, keep counting down
+         --RLE_count;
+      }
+      //   do I need to invert the image?
+      if ( tga_inverted )
+      {
+         for (j = 0; j*2 < tga_height; ++j)
+         {
+            int index1 = j * tga_width * tga_comp;
+            int index2 = (tga_height - 1 - j) * tga_width * tga_comp;
+            for (i = tga_width * tga_comp; i > 0; --i)
+            {
+               unsigned char temp = tga_data[index1];
+               tga_data[index1] = tga_data[index2];
+               tga_data[index2] = temp;
+               ++index1;
+               ++index2;
+            }
+         }
+      }
+      //   clear my palette, if I had one
+      if ( tga_palette != NULL )
+      {
+         STBI_FREE( tga_palette );
+      }
+   }
+
+   // swap RGB - if the source data was RGB16, it already is in the right order
+   if (tga_comp >= 3 && !tga_rgb16)
+   {
+      unsigned char* tga_pixel = tga_data;
+      for (i=0; i < tga_width * tga_height; ++i)
+      {
+         unsigned char temp = tga_pixel[0];
+         tga_pixel[0] = tga_pixel[2];
+         tga_pixel[2] = temp;
+         tga_pixel += tga_comp;
+      }
+   }
+
+   // convert to target component count
+   if (req_comp && req_comp != tga_comp)
+      tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height);
+
+   //   the things I do to get rid of an error message, and yet keep
+   //   Microsoft's C compilers happy... [8^(
+   tga_palette_start = tga_palette_len = tga_palette_bits =
+         tga_x_origin = tga_y_origin = 0;
+   STBI_NOTUSED(tga_palette_start);
+   //   OK, done
+   return tga_data;
+}
+#endif
+
+// *************************************************************************************************
+// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB
+
+#ifndef STBI_NO_PSD
+static int stbi__psd_test(stbi__context *s)
+{
+   int r = (stbi__get32be(s) == 0x38425053);
+   stbi__rewind(s);
+   return r;
+}
+
+static int stbi__psd_decode_rle(stbi__context *s, stbi_uc *p, int pixelCount)
+{
+   int count, nleft, len;
+
+   count = 0;
+   while ((nleft = pixelCount - count) > 0) {
+      len = stbi__get8(s);
+      if (len == 128) {
+         // No-op.
+      } else if (len < 128) {
+         // Copy next len+1 bytes literally.
+         len++;
+         if (len > nleft) return 0; // corrupt data
+         count += len;
+         while (len) {
+            *p = stbi__get8(s);
+            p += 4;
+            len--;
+         }
+      } else if (len > 128) {
+         stbi_uc   val;
+         // Next -len+1 bytes in the dest are replicated from next source byte.
+         // (Interpret len as a negative 8-bit int.)
+         len = 257 - len;
+         if (len > nleft) return 0; // corrupt data
+         val = stbi__get8(s);
+         count += len;
+         while (len) {
+            *p = val;
+            p += 4;
+            len--;
+         }
+      }
+   }
+
+   return 1;
+}
+
+static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc)
+{
+   int pixelCount;
+   int channelCount, compression;
+   int channel, i;
+   int bitdepth;
+   int w,h;
+   stbi_uc *out;
+   STBI_NOTUSED(ri);
+
+   // Check identifier
+   if (stbi__get32be(s) != 0x38425053)   // "8BPS"
+      return stbi__errpuc("not PSD", "Corrupt PSD image");
+
+   // Check file type version.
+   if (stbi__get16be(s) != 1)
+      return stbi__errpuc("wrong version", "Unsupported version of PSD image");
+
+   // Skip 6 reserved bytes.
+   stbi__skip(s, 6 );
+
+   // Read the number of channels (R, G, B, A, etc).
+   channelCount = stbi__get16be(s);
+   if (channelCount < 0 || channelCount > 16)
+      return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image");
+
+   // Read the rows and columns of the image.
+   h = stbi__get32be(s);
+   w = stbi__get32be(s);
+
+   if (h > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+   if (w > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+
+   // Make sure the depth is 8 bits.
+   bitdepth = stbi__get16be(s);
+   if (bitdepth != 8 && bitdepth != 16)
+      return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit");
+
+   // Make sure the color mode is RGB.
+   // Valid options are:
+   //   0: Bitmap
+   //   1: Grayscale
+   //   2: Indexed color
+   //   3: RGB color
+   //   4: CMYK color
+   //   7: Multichannel
+   //   8: Duotone
+   //   9: Lab color
+   if (stbi__get16be(s) != 3)
+      return stbi__errpuc("wrong color format", "PSD is not in RGB color format");
+
+   // Skip the Mode Data.  (It's the palette for indexed color; other info for other modes.)
+   stbi__skip(s,stbi__get32be(s) );
+
+   // Skip the image resources.  (resolution, pen tool paths, etc)
+   stbi__skip(s, stbi__get32be(s) );
+
+   // Skip the reserved data.
+   stbi__skip(s, stbi__get32be(s) );
+
+   // Find out if the data is compressed.
+   // Known values:
+   //   0: no compression
+   //   1: RLE compressed
+   compression = stbi__get16be(s);
+   if (compression > 1)
+      return stbi__errpuc("bad compression", "PSD has an unknown compression format");
+
+   // Check size
+   if (!stbi__mad3sizes_valid(4, w, h, 0))
+      return stbi__errpuc("too large", "Corrupt PSD");
+
+   // Create the destination image.
+
+   if (!compression && bitdepth == 16 && bpc == 16) {
+      out = (stbi_uc *) stbi__malloc_mad3(8, w, h, 0);
+      ri->bits_per_channel = 16;
+   } else
+      out = (stbi_uc *) stbi__malloc(4 * w*h);
+
+   if (!out) return stbi__errpuc("outofmem", "Out of memory");
+   pixelCount = w*h;
+
+   // Initialize the data to zero.
+   //memset( out, 0, pixelCount * 4 );
+
+   // Finally, the image data.
+   if (compression) {
+      // RLE as used by .PSD and .TIFF
+      // Loop until you get the number of unpacked bytes you are expecting:
+      //     Read the next source byte into n.
+      //     If n is between 0 and 127 inclusive, copy the next n+1 bytes literally.
+      //     Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times.
+      //     Else if n is 128, noop.
+      // Endloop
+
+      // The RLE-compressed data is preceded by a 2-byte data count for each row in the data,
+      // which we're going to just skip.
+      stbi__skip(s, h * channelCount * 2 );
+
+      // Read the RLE data by channel.
+      for (channel = 0; channel < 4; channel++) {
+         stbi_uc *p;
+
+         p = out+channel;
+         if (channel >= channelCount) {
+            // Fill this channel with default data.
+            for (i = 0; i < pixelCount; i++, p += 4)
+               *p = (channel == 3 ? 255 : 0);
+         } else {
+            // Read the RLE data.
+            if (!stbi__psd_decode_rle(s, p, pixelCount)) {
+               STBI_FREE(out);
+               return stbi__errpuc("corrupt", "bad RLE data");
+            }
+         }
+      }
+
+   } else {
+      // We're at the raw image data.  It's each channel in order (Red, Green, Blue, Alpha, ...)
+      // where each channel consists of an 8-bit (or 16-bit) value for each pixel in the image.
+
+      // Read the data by channel.
+      for (channel = 0; channel < 4; channel++) {
+         if (channel >= channelCount) {
+            // Fill this channel with default data.
+            if (bitdepth == 16 && bpc == 16) {
+               stbi__uint16 *q = ((stbi__uint16 *) out) + channel;
+               stbi__uint16 val = channel == 3 ? 65535 : 0;
+               for (i = 0; i < pixelCount; i++, q += 4)
+                  *q = val;
+            } else {
+               stbi_uc *p = out+channel;
+               stbi_uc val = channel == 3 ? 255 : 0;
+               for (i = 0; i < pixelCount; i++, p += 4)
+                  *p = val;
+            }
+         } else {
+            if (ri->bits_per_channel == 16) {    // output bpc
+               stbi__uint16 *q = ((stbi__uint16 *) out) + channel;
+               for (i = 0; i < pixelCount; i++, q += 4)
+                  *q = (stbi__uint16) stbi__get16be(s);
+            } else {
+               stbi_uc *p = out+channel;
+               if (bitdepth == 16) {  // input bpc
+                  for (i = 0; i < pixelCount; i++, p += 4)
+                     *p = (stbi_uc) (stbi__get16be(s) >> 8);
+               } else {
+                  for (i = 0; i < pixelCount; i++, p += 4)
+                     *p = stbi__get8(s);
+               }
+            }
+         }
+      }
+   }
+
+   // remove weird white matte from PSD
+   if (channelCount >= 4) {
+      if (ri->bits_per_channel == 16) {
+         for (i=0; i < w*h; ++i) {
+            stbi__uint16 *pixel = (stbi__uint16 *) out + 4*i;
+            if (pixel[3] != 0 && pixel[3] != 65535) {
+               float a = pixel[3] / 65535.0f;
+               float ra = 1.0f / a;
+               float inv_a = 65535.0f * (1 - ra);
+               pixel[0] = (stbi__uint16) (pixel[0]*ra + inv_a);
+               pixel[1] = (stbi__uint16) (pixel[1]*ra + inv_a);
+               pixel[2] = (stbi__uint16) (pixel[2]*ra + inv_a);
+            }
+         }
+      } else {
+         for (i=0; i < w*h; ++i) {
+            unsigned char *pixel = out + 4*i;
+            if (pixel[3] != 0 && pixel[3] != 255) {
+               float a = pixel[3] / 255.0f;
+               float ra = 1.0f / a;
+               float inv_a = 255.0f * (1 - ra);
+               pixel[0] = (unsigned char) (pixel[0]*ra + inv_a);
+               pixel[1] = (unsigned char) (pixel[1]*ra + inv_a);
+               pixel[2] = (unsigned char) (pixel[2]*ra + inv_a);
+            }
+         }
+      }
+   }
+
+   // convert to desired output format
+   if (req_comp && req_comp != 4) {
+      if (ri->bits_per_channel == 16)
+         out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, 4, req_comp, w, h);
+      else
+         out = stbi__convert_format(out, 4, req_comp, w, h);
+      if (out == NULL) return out; // stbi__convert_format frees input on failure
+   }
+
+   if (comp) *comp = 4;
+   *y = h;
+   *x = w;
+
+   return out;
+}
+#endif
+
+// *************************************************************************************************
+// Softimage PIC loader
+// by Tom Seddon
+//
+// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format
+// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/
+
+#ifndef STBI_NO_PIC
+static int stbi__pic_is4(stbi__context *s,const char *str)
+{
+   int i;
+   for (i=0; i<4; ++i)
+      if (stbi__get8(s) != (stbi_uc)str[i])
+         return 0;
+
+   return 1;
+}
+
+static int stbi__pic_test_core(stbi__context *s)
+{
+   int i;
+
+   if (!stbi__pic_is4(s,"\x53\x80\xF6\x34"))
+      return 0;
+
+   for(i=0;i<84;++i)
+      stbi__get8(s);
+
+   if (!stbi__pic_is4(s,"PICT"))
+      return 0;
+
+   return 1;
+}
+
+typedef struct
+{
+   stbi_uc size,type,channel;
+} stbi__pic_packet;
+
+static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest)
+{
+   int mask=0x80, i;
+
+   for (i=0; i<4; ++i, mask>>=1) {
+      if (channel & mask) {
+         if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short");
+         dest[i]=stbi__get8(s);
+      }
+   }
+
+   return dest;
+}
+
+static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src)
+{
+   int mask=0x80,i;
+
+   for (i=0;i<4; ++i, mask>>=1)
+      if (channel&mask)
+         dest[i]=src[i];
+}
+
+static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result)
+{
+   int act_comp=0,num_packets=0,y,chained;
+   stbi__pic_packet packets[10];
+
+   // this will (should...) cater for even some bizarre stuff like having data
+    // for the same channel in multiple packets.
+   do {
+      stbi__pic_packet *packet;
+
+      if (num_packets==sizeof(packets)/sizeof(packets[0]))
+         return stbi__errpuc("bad format","too many packets");
+
+      packet = &packets[num_packets++];
+
+      chained = stbi__get8(s);
+      packet->size    = stbi__get8(s);
+      packet->type    = stbi__get8(s);
+      packet->channel = stbi__get8(s);
+
+      act_comp |= packet->channel;
+
+      if (stbi__at_eof(s))          return stbi__errpuc("bad file","file too short (reading packets)");
+      if (packet->size != 8)  return stbi__errpuc("bad format","packet isn't 8bpp");
+   } while (chained);
+
+   *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel?
+
+   for(y=0; y<height; ++y) {
+      int packet_idx;
+
+      for(packet_idx=0; packet_idx < num_packets; ++packet_idx) {
+         stbi__pic_packet *packet = &packets[packet_idx];
+         stbi_uc *dest = result+y*width*4;
+
+         switch (packet->type) {
+            default:
+               return stbi__errpuc("bad format","packet has bad compression type");
+
+            case 0: {//uncompressed
+               int x;
+
+               for(x=0;x<width;++x, dest+=4)
+                  if (!stbi__readval(s,packet->channel,dest))
+                     return 0;
+               break;
+            }
+
+            case 1://Pure RLE
+               {
+                  int left=width, i;
+
+                  while (left>0) {
+                     stbi_uc count,value[4];
+
+                     count=stbi__get8(s);
+                     if (stbi__at_eof(s))   return stbi__errpuc("bad file","file too short (pure read count)");
+
+                     if (count > left)
+                        count = (stbi_uc) left;
+
+                     if (!stbi__readval(s,packet->channel,value))  return 0;
+
+                     for(i=0; i<count; ++i,dest+=4)
+                        stbi__copyval(packet->channel,dest,value);
+                     left -= count;
+                  }
+               }
+               break;
+
+            case 2: {//Mixed RLE
+               int left=width;
+               while (left>0) {
+                  int count = stbi__get8(s), i;
+                  if (stbi__at_eof(s))  return stbi__errpuc("bad file","file too short (mixed read count)");
+
+                  if (count >= 128) { // Repeated
+                     stbi_uc value[4];
+
+                     if (count==128)
+                        count = stbi__get16be(s);
+                     else
+                        count -= 127;
+                     if (count > left)
+                        return stbi__errpuc("bad file","scanline overrun");
+
+                     if (!stbi__readval(s,packet->channel,value))
+                        return 0;
+
+                     for(i=0;i<count;++i, dest += 4)
+                        stbi__copyval(packet->channel,dest,value);
+                  } else { // Raw
+                     ++count;
+                     if (count>left) return stbi__errpuc("bad file","scanline overrun");
+
+                     for(i=0;i<count;++i, dest+=4)
+                        if (!stbi__readval(s,packet->channel,dest))
+                           return 0;
+                  }
+                  left-=count;
+               }
+               break;
+            }
+         }
+      }
+   }
+
+   return result;
+}
+
+static void *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp, stbi__result_info *ri)
+{
+   stbi_uc *result;
+   int i, x,y, internal_comp;
+   STBI_NOTUSED(ri);
+
+   if (!comp) comp = &internal_comp;
+
+   for (i=0; i<92; ++i)
+      stbi__get8(s);
+
+   x = stbi__get16be(s);
+   y = stbi__get16be(s);
+
+   if (y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+   if (x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+
+   if (stbi__at_eof(s))  return stbi__errpuc("bad file","file too short (pic header)");
+   if (!stbi__mad3sizes_valid(x, y, 4, 0)) return stbi__errpuc("too large", "PIC image too large to decode");
+
+   stbi__get32be(s); //skip `ratio'
+   stbi__get16be(s); //skip `fields'
+   stbi__get16be(s); //skip `pad'
+
+   // intermediate buffer is RGBA
+   result = (stbi_uc *) stbi__malloc_mad3(x, y, 4, 0);
+   if (!result) return stbi__errpuc("outofmem", "Out of memory");
+   memset(result, 0xff, x*y*4);
+
+   if (!stbi__pic_load_core(s,x,y,comp, result)) {
+      STBI_FREE(result);
+      result=0;
+   }
+   *px = x;
+   *py = y;
+   if (req_comp == 0) req_comp = *comp;
+   result=stbi__convert_format(result,4,req_comp,x,y);
+
+   return result;
+}
+
+static int stbi__pic_test(stbi__context *s)
+{
+   int r = stbi__pic_test_core(s);
+   stbi__rewind(s);
+   return r;
+}
+#endif
+
+// *************************************************************************************************
+// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb
+
+#ifndef STBI_NO_GIF
+typedef struct
+{
+   stbi__int16 prefix;
+   stbi_uc first;
+   stbi_uc suffix;
+} stbi__gif_lzw;
+
+typedef struct
+{
+   int w,h;
+   stbi_uc *out;                 // output buffer (always 4 components)
+   stbi_uc *background;          // The current "background" as far as a gif is concerned
+   stbi_uc *history;
+   int flags, bgindex, ratio, transparent, eflags;
+   stbi_uc  pal[256][4];
+   stbi_uc lpal[256][4];
+   stbi__gif_lzw codes[8192];
+   stbi_uc *color_table;
+   int parse, step;
+   int lflags;
+   int start_x, start_y;
+   int max_x, max_y;
+   int cur_x, cur_y;
+   int line_size;
+   int delay;
+} stbi__gif;
+
+static int stbi__gif_test_raw(stbi__context *s)
+{
+   int sz;
+   if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0;
+   sz = stbi__get8(s);
+   if (sz != '9' && sz != '7') return 0;
+   if (stbi__get8(s) != 'a') return 0;
+   return 1;
+}
+
+static int stbi__gif_test(stbi__context *s)
+{
+   int r = stbi__gif_test_raw(s);
+   stbi__rewind(s);
+   return r;
+}
+
+static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp)
+{
+   int i;
+   for (i=0; i < num_entries; ++i) {
+      pal[i][2] = stbi__get8(s);
+      pal[i][1] = stbi__get8(s);
+      pal[i][0] = stbi__get8(s);
+      pal[i][3] = transp == i ? 0 : 255;
+   }
+}
+
+static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info)
+{
+   stbi_uc version;
+   if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8')
+      return stbi__err("not GIF", "Corrupt GIF");
+
+   version = stbi__get8(s);
+   if (version != '7' && version != '9')    return stbi__err("not GIF", "Corrupt GIF");
+   if (stbi__get8(s) != 'a')                return stbi__err("not GIF", "Corrupt GIF");
+
+   stbi__g_failure_reason = "";
+   g->w = stbi__get16le(s);
+   g->h = stbi__get16le(s);
+   g->flags = stbi__get8(s);
+   g->bgindex = stbi__get8(s);
+   g->ratio = stbi__get8(s);
+   g->transparent = -1;
+
+   if (g->w > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+   if (g->h > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+
+   if (comp != 0) *comp = 4;  // can't actually tell whether it's 3 or 4 until we parse the comments
+
+   if (is_info) return 1;
+
+   if (g->flags & 0x80)
+      stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1);
+
+   return 1;
+}
+
+static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp)
+{
+   stbi__gif* g = (stbi__gif*) stbi__malloc(sizeof(stbi__gif));
+   if (!g) return stbi__err("outofmem", "Out of memory");
+   if (!stbi__gif_header(s, g, comp, 1)) {
+      STBI_FREE(g);
+      stbi__rewind( s );
+      return 0;
+   }
+   if (x) *x = g->w;
+   if (y) *y = g->h;
+   STBI_FREE(g);
+   return 1;
+}
+
+static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code)
+{
+   stbi_uc *p, *c;
+   int idx;
+
+   // recurse to decode the prefixes, since the linked-list is backwards,
+   // and working backwards through an interleaved image would be nasty
+   if (g->codes[code].prefix >= 0)
+      stbi__out_gif_code(g, g->codes[code].prefix);
+
+   if (g->cur_y >= g->max_y) return;
+
+   idx = g->cur_x + g->cur_y;
+   p = &g->out[idx];
+   g->history[idx / 4] = 1;
+
+   c = &g->color_table[g->codes[code].suffix * 4];
+   if (c[3] > 128) { // don't render transparent pixels;
+      p[0] = c[2];
+      p[1] = c[1];
+      p[2] = c[0];
+      p[3] = c[3];
+   }
+   g->cur_x += 4;
+
+   if (g->cur_x >= g->max_x) {
+      g->cur_x = g->start_x;
+      g->cur_y += g->step;
+
+      while (g->cur_y >= g->max_y && g->parse > 0) {
+         g->step = (1 << g->parse) * g->line_size;
+         g->cur_y = g->start_y + (g->step >> 1);
+         --g->parse;
+      }
+   }
+}
+
+static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g)
+{
+   stbi_uc lzw_cs;
+   stbi__int32 len, init_code;
+   stbi__uint32 first;
+   stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear;
+   stbi__gif_lzw *p;
+
+   lzw_cs = stbi__get8(s);
+   if (lzw_cs > 12) return NULL;
+   clear = 1 << lzw_cs;
+   first = 1;
+   codesize = lzw_cs + 1;
+   codemask = (1 << codesize) - 1;
+   bits = 0;
+   valid_bits = 0;
+   for (init_code = 0; init_code < clear; init_code++) {
+      g->codes[init_code].prefix = -1;
+      g->codes[init_code].first = (stbi_uc) init_code;
+      g->codes[init_code].suffix = (stbi_uc) init_code;
+   }
+
+   // support no starting clear code
+   avail = clear+2;
+   oldcode = -1;
+
+   len = 0;
+   for(;;) {
+      if (valid_bits < codesize) {
+         if (len == 0) {
+            len = stbi__get8(s); // start new block
+            if (len == 0)
+               return g->out;
+         }
+         --len;
+         bits |= (stbi__int32) stbi__get8(s) << valid_bits;
+         valid_bits += 8;
+      } else {
+         stbi__int32 code = bits & codemask;
+         bits >>= codesize;
+         valid_bits -= codesize;
+         // @OPTIMIZE: is there some way we can accelerate the non-clear path?
+         if (code == clear) {  // clear code
+            codesize = lzw_cs + 1;
+            codemask = (1 << codesize) - 1;
+            avail = clear + 2;
+            oldcode = -1;
+            first = 0;
+         } else if (code == clear + 1) { // end of stream code
+            stbi__skip(s, len);
+            while ((len = stbi__get8(s)) > 0)
+               stbi__skip(s,len);
+            return g->out;
+         } else if (code <= avail) {
+            if (first) {
+               return stbi__errpuc("no clear code", "Corrupt GIF");
+            }
+
+            if (oldcode >= 0) {
+               p = &g->codes[avail++];
+               if (avail > 8192) {
+                  return stbi__errpuc("too many codes", "Corrupt GIF");
+               }
+
+               p->prefix = (stbi__int16) oldcode;
+               p->first = g->codes[oldcode].first;
+               p->suffix = (code == avail) ? p->first : g->codes[code].first;
+            } else if (code == avail)
+               return stbi__errpuc("illegal code in raster", "Corrupt GIF");
+
+            stbi__out_gif_code(g, (stbi__uint16) code);
+
+            if ((avail & codemask) == 0 && avail <= 0x0FFF) {
+               codesize++;
+               codemask = (1 << codesize) - 1;
+            }
+
+            oldcode = code;
+         } else {
+            return stbi__errpuc("illegal code in raster", "Corrupt GIF");
+         }
+      }
+   }
+}
+
+// this function is designed to support animated gifs, although stb_image doesn't support it
+// two back is the image from two frames ago, used for a very specific disposal format
+static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp, stbi_uc *two_back)
+{
+   int dispose;
+   int first_frame;
+   int pi;
+   int pcount;
+   STBI_NOTUSED(req_comp);
+
+   // on first frame, any non-written pixels get the background colour (non-transparent)
+   first_frame = 0;
+   if (g->out == 0) {
+      if (!stbi__gif_header(s, g, comp,0)) return 0; // stbi__g_failure_reason set by stbi__gif_header
+      if (!stbi__mad3sizes_valid(4, g->w, g->h, 0))
+         return stbi__errpuc("too large", "GIF image is too large");
+      pcount = g->w * g->h;
+      g->out = (stbi_uc *) stbi__malloc(4 * pcount);
+      g->background = (stbi_uc *) stbi__malloc(4 * pcount);
+      g->history = (stbi_uc *) stbi__malloc(pcount);
+      if (!g->out || !g->background || !g->history)
+         return stbi__errpuc("outofmem", "Out of memory");
+
+      // image is treated as "transparent" at the start - ie, nothing overwrites the current background;
+      // background colour is only used for pixels that are not rendered first frame, after that "background"
+      // color refers to the color that was there the previous frame.
+      memset(g->out, 0x00, 4 * pcount);
+      memset(g->background, 0x00, 4 * pcount); // state of the background (starts transparent)
+      memset(g->history, 0x00, pcount);        // pixels that were affected previous frame
+      first_frame = 1;
+   } else {
+      // second frame - how do we dispose of the previous one?
+      dispose = (g->eflags & 0x1C) >> 2;
+      pcount = g->w * g->h;
+
+      if ((dispose == 3) && (two_back == 0)) {
+         dispose = 2; // if I don't have an image to revert back to, default to the old background
+      }
+
+      if (dispose == 3) { // use previous graphic
+         for (pi = 0; pi < pcount; ++pi) {
+            if (g->history[pi]) {
+               memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 );
+            }
+         }
+      } else if (dispose == 2) {
+         // restore what was changed last frame to background before that frame;
+         for (pi = 0; pi < pcount; ++pi) {
+            if (g->history[pi]) {
+               memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 );
+            }
+         }
+      } else {
+         // This is a non-disposal case eithe way, so just
+         // leave the pixels as is, and they will become the new background
+         // 1: do not dispose
+         // 0:  not specified.
+      }
+
+      // background is what out is after the undoing of the previou frame;
+      memcpy( g->background, g->out, 4 * g->w * g->h );
+   }
+
+   // clear my history;
+   memset( g->history, 0x00, g->w * g->h );        // pixels that were affected previous frame
+
+   for (;;) {
+      int tag = stbi__get8(s);
+      switch (tag) {
+         case 0x2C: /* Image Descriptor */
+         {
+            stbi__int32 x, y, w, h;
+            stbi_uc *o;
+
+            x = stbi__get16le(s);
+            y = stbi__get16le(s);
+            w = stbi__get16le(s);
+            h = stbi__get16le(s);
+            if (((x + w) > (g->w)) || ((y + h) > (g->h)))
+               return stbi__errpuc("bad Image Descriptor", "Corrupt GIF");
+
+            g->line_size = g->w * 4;
+            g->start_x = x * 4;
+            g->start_y = y * g->line_size;
+            g->max_x   = g->start_x + w * 4;
+            g->max_y   = g->start_y + h * g->line_size;
+            g->cur_x   = g->start_x;
+            g->cur_y   = g->start_y;
+
+            // if the width of the specified rectangle is 0, that means
+            // we may not see *any* pixels or the image is malformed;
+            // to make sure this is caught, move the current y down to
+            // max_y (which is what out_gif_code checks).
+            if (w == 0)
+               g->cur_y = g->max_y;
+
+            g->lflags = stbi__get8(s);
+
+            if (g->lflags & 0x40) {
+               g->step = 8 * g->line_size; // first interlaced spacing
+               g->parse = 3;
+            } else {
+               g->step = g->line_size;
+               g->parse = 0;
+            }
+
+            if (g->lflags & 0x80) {
+               stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1);
+               g->color_table = (stbi_uc *) g->lpal;
+            } else if (g->flags & 0x80) {
+               g->color_table = (stbi_uc *) g->pal;
+            } else
+               return stbi__errpuc("missing color table", "Corrupt GIF");
+
+            o = stbi__process_gif_raster(s, g);
+            if (!o) return NULL;
+
+            // if this was the first frame,
+            pcount = g->w * g->h;
+            if (first_frame && (g->bgindex > 0)) {
+               // if first frame, any pixel not drawn to gets the background color
+               for (pi = 0; pi < pcount; ++pi) {
+                  if (g->history[pi] == 0) {
+                     g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be;
+                     memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 );
+                  }
+               }
+            }
+
+            return o;
+         }
+
+         case 0x21: // Comment Extension.
+         {
+            int len;
+            int ext = stbi__get8(s);
+            if (ext == 0xF9) { // Graphic Control Extension.
+               len = stbi__get8(s);
+               if (len == 4) {
+                  g->eflags = stbi__get8(s);
+                  g->delay = 10 * stbi__get16le(s); // delay - 1/100th of a second, saving as 1/1000ths.
+
+                  // unset old transparent
+                  if (g->transparent >= 0) {
+                     g->pal[g->transparent][3] = 255;
+                  }
+                  if (g->eflags & 0x01) {
+                     g->transparent = stbi__get8(s);
+                     if (g->transparent >= 0) {
+                        g->pal[g->transparent][3] = 0;
+                     }
+                  } else {
+                     // don't need transparent
+                     stbi__skip(s, 1);
+                     g->transparent = -1;
+                  }
+               } else {
+                  stbi__skip(s, len);
+                  break;
+               }
+            }
+            while ((len = stbi__get8(s)) != 0) {
+               stbi__skip(s, len);
+            }
+            break;
+         }
+
+         case 0x3B: // gif stream termination code
+            return (stbi_uc *) s; // using '1' causes warning on some compilers
+
+         default:
+            return stbi__errpuc("unknown code", "Corrupt GIF");
+      }
+   }
+}
+
+static void *stbi__load_gif_main_outofmem(stbi__gif *g, stbi_uc *out, int **delays)
+{
+   STBI_FREE(g->out);
+   STBI_FREE(g->history);
+   STBI_FREE(g->background);
+
+   if (out) STBI_FREE(out);
+   if (delays && *delays) STBI_FREE(*delays);
+   return stbi__errpuc("outofmem", "Out of memory");
+}
+
+static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp)
+{
+   if (stbi__gif_test(s)) {
+      int layers = 0;
+      stbi_uc *u = 0;
+      stbi_uc *out = 0;
+      stbi_uc *two_back = 0;
+      stbi__gif g;
+      int stride;
+      int out_size = 0;
+      int delays_size = 0;
+
+      STBI_NOTUSED(out_size);
+      STBI_NOTUSED(delays_size);
+
+      memset(&g, 0, sizeof(g));
+      if (delays) {
+         *delays = 0;
+      }
+
+      do {
+         u = stbi__gif_load_next(s, &g, comp, req_comp, two_back);
+         if (u == (stbi_uc *) s) u = 0;  // end of animated gif marker
+
+         if (u) {
+            *x = g.w;
+            *y = g.h;
+            ++layers;
+            stride = g.w * g.h * 4;
+
+            if (out) {
+               void *tmp = (stbi_uc*) STBI_REALLOC_SIZED( out, out_size, layers * stride );
+               if (!tmp)
+                  return stbi__load_gif_main_outofmem(&g, out, delays);
+               else {
+                   out = (stbi_uc*) tmp;
+                   out_size = layers * stride;
+               }
+
+               if (delays) {
+                  int *new_delays = (int*) STBI_REALLOC_SIZED( *delays, delays_size, sizeof(int) * layers );
+                  if (!new_delays)
+                     return stbi__load_gif_main_outofmem(&g, out, delays);
+                  *delays = new_delays;
+                  delays_size = layers * sizeof(int);
+               }
+            } else {
+               out = (stbi_uc*)stbi__malloc( layers * stride );
+               if (!out)
+                  return stbi__load_gif_main_outofmem(&g, out, delays);
+               out_size = layers * stride;
+               if (delays) {
+                  *delays = (int*) stbi__malloc( layers * sizeof(int) );
+                  if (!*delays)
+                     return stbi__load_gif_main_outofmem(&g, out, delays);
+                  delays_size = layers * sizeof(int);
+               }
+            }
+            memcpy( out + ((layers - 1) * stride), u, stride );
+            if (layers >= 2) {
+               two_back = out - 2 * stride;
+            }
+
+            if (delays) {
+               (*delays)[layers - 1U] = g.delay;
+            }
+         }
+      } while (u != 0);
+
+      // free temp buffer;
+      STBI_FREE(g.out);
+      STBI_FREE(g.history);
+      STBI_FREE(g.background);
+
+      // do the final conversion after loading everything;
+      if (req_comp && req_comp != 4)
+         out = stbi__convert_format(out, 4, req_comp, layers * g.w, g.h);
+
+      *z = layers;
+      return out;
+   } else {
+      return stbi__errpuc("not GIF", "Image was not as a gif type.");
+   }
+}
+
+static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   stbi_uc *u = 0;
+   stbi__gif g;
+   memset(&g, 0, sizeof(g));
+   STBI_NOTUSED(ri);
+
+   u = stbi__gif_load_next(s, &g, comp, req_comp, 0);
+   if (u == (stbi_uc *) s) u = 0;  // end of animated gif marker
+   if (u) {
+      *x = g.w;
+      *y = g.h;
+
+      // moved conversion to after successful load so that the same
+      // can be done for multiple frames.
+      if (req_comp && req_comp != 4)
+         u = stbi__convert_format(u, 4, req_comp, g.w, g.h);
+   } else if (g.out) {
+      // if there was an error and we allocated an image buffer, free it!
+      STBI_FREE(g.out);
+   }
+
+   // free buffers needed for multiple frame loading;
+   STBI_FREE(g.history);
+   STBI_FREE(g.background);
+
+   return u;
+}
+
+static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   return stbi__gif_info_raw(s,x,y,comp);
+}
+#endif
+
+// *************************************************************************************************
+// Radiance RGBE HDR loader
+// originally by Nicolas Schulz
+#ifndef STBI_NO_HDR
+static int stbi__hdr_test_core(stbi__context *s, const char *signature)
+{
+   int i;
+   for (i=0; signature[i]; ++i)
+      if (stbi__get8(s) != signature[i])
+          return 0;
+   stbi__rewind(s);
+   return 1;
+}
+
+static int stbi__hdr_test(stbi__context* s)
+{
+   int r = stbi__hdr_test_core(s, "#?RADIANCE\n");
+   stbi__rewind(s);
+   if(!r) {
+       r = stbi__hdr_test_core(s, "#?RGBE\n");
+       stbi__rewind(s);
+   }
+   return r;
+}
+
+#define STBI__HDR_BUFLEN  1024
+static char *stbi__hdr_gettoken(stbi__context *z, char *buffer)
+{
+   int len=0;
+   char c = '\0';
+
+   c = (char) stbi__get8(z);
+
+   while (!stbi__at_eof(z) && c != '\n') {
+      buffer[len++] = c;
+      if (len == STBI__HDR_BUFLEN-1) {
+         // flush to end of line
+         while (!stbi__at_eof(z) && stbi__get8(z) != '\n')
+            ;
+         break;
+      }
+      c = (char) stbi__get8(z);
+   }
+
+   buffer[len] = 0;
+   return buffer;
+}
+
+static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp)
+{
+   if ( input[3] != 0 ) {
+      float f1;
+      // Exponent
+      f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8));
+      if (req_comp <= 2)
+         output[0] = (input[0] + input[1] + input[2]) * f1 / 3;
+      else {
+         output[0] = input[0] * f1;
+         output[1] = input[1] * f1;
+         output[2] = input[2] * f1;
+      }
+      if (req_comp == 2) output[1] = 1;
+      if (req_comp == 4) output[3] = 1;
+   } else {
+      switch (req_comp) {
+         case 4: output[3] = 1; /* fallthrough */
+         case 3: output[0] = output[1] = output[2] = 0;
+                 break;
+         case 2: output[1] = 1; /* fallthrough */
+         case 1: output[0] = 0;
+                 break;
+      }
+   }
+}
+
+static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   char buffer[STBI__HDR_BUFLEN];
+   char *token;
+   int valid = 0;
+   int width, height;
+   stbi_uc *scanline;
+   float *hdr_data;
+   int len;
+   unsigned char count, value;
+   int i, j, k, c1,c2, z;
+   const char *headerToken;
+   STBI_NOTUSED(ri);
+
+   // Check identifier
+   headerToken = stbi__hdr_gettoken(s,buffer);
+   if (strcmp(headerToken, "#?RADIANCE") != 0 && strcmp(headerToken, "#?RGBE") != 0)
+      return stbi__errpf("not HDR", "Corrupt HDR image");
+
+   // Parse header
+   for(;;) {
+      token = stbi__hdr_gettoken(s,buffer);
+      if (token[0] == 0) break;
+      if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1;
+   }
+
+   if (!valid)    return stbi__errpf("unsupported format", "Unsupported HDR format");
+
+   // Parse width and height
+   // can't use sscanf() if we're not using stdio!
+   token = stbi__hdr_gettoken(s,buffer);
+   if (strncmp(token, "-Y ", 3))  return stbi__errpf("unsupported data layout", "Unsupported HDR format");
+   token += 3;
+   height = (int) strtol(token, &token, 10);
+   while (*token == ' ') ++token;
+   if (strncmp(token, "+X ", 3))  return stbi__errpf("unsupported data layout", "Unsupported HDR format");
+   token += 3;
+   width = (int) strtol(token, NULL, 10);
+
+   if (height > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)");
+   if (width > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)");
+
+   *x = width;
+   *y = height;
+
+   if (comp) *comp = 3;
+   if (req_comp == 0) req_comp = 3;
+
+   if (!stbi__mad4sizes_valid(width, height, req_comp, sizeof(float), 0))
+      return stbi__errpf("too large", "HDR image is too large");
+
+   // Read data
+   hdr_data = (float *) stbi__malloc_mad4(width, height, req_comp, sizeof(float), 0);
+   if (!hdr_data)
+      return stbi__errpf("outofmem", "Out of memory");
+
+   // Load image data
+   // image data is stored as some number of sca
+   if ( width < 8 || width >= 32768) {
+      // Read flat data
+      for (j=0; j < height; ++j) {
+         for (i=0; i < width; ++i) {
+            stbi_uc rgbe[4];
+           main_decode_loop:
+            stbi__getn(s, rgbe, 4);
+            stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp);
+         }
+      }
+   } else {
+      // Read RLE-encoded data
+      scanline = NULL;
+
+      for (j = 0; j < height; ++j) {
+         c1 = stbi__get8(s);
+         c2 = stbi__get8(s);
+         len = stbi__get8(s);
+         if (c1 != 2 || c2 != 2 || (len & 0x80)) {
+            // not run-length encoded, so we have to actually use THIS data as a decoded
+            // pixel (note this can't be a valid pixel--one of RGB must be >= 128)
+            stbi_uc rgbe[4];
+            rgbe[0] = (stbi_uc) c1;
+            rgbe[1] = (stbi_uc) c2;
+            rgbe[2] = (stbi_uc) len;
+            rgbe[3] = (stbi_uc) stbi__get8(s);
+            stbi__hdr_convert(hdr_data, rgbe, req_comp);
+            i = 1;
+            j = 0;
+            STBI_FREE(scanline);
+            goto main_decode_loop; // yes, this makes no sense
+         }
+         len <<= 8;
+         len |= stbi__get8(s);
+         if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); }
+         if (scanline == NULL) {
+            scanline = (stbi_uc *) stbi__malloc_mad2(width, 4, 0);
+            if (!scanline) {
+               STBI_FREE(hdr_data);
+               return stbi__errpf("outofmem", "Out of memory");
+            }
+         }
+
+         for (k = 0; k < 4; ++k) {
+            int nleft;
+            i = 0;
+            while ((nleft = width - i) > 0) {
+               count = stbi__get8(s);
+               if (count > 128) {
+                  // Run
+                  value = stbi__get8(s);
+                  count -= 128;
+                  if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
+                  for (z = 0; z < count; ++z)
+                     scanline[i++ * 4 + k] = value;
+               } else {
+                  // Dump
+                  if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
+                  for (z = 0; z < count; ++z)
+                     scanline[i++ * 4 + k] = stbi__get8(s);
+               }
+            }
+         }
+         for (i=0; i < width; ++i)
+            stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp);
+      }
+      if (scanline)
+         STBI_FREE(scanline);
+   }
+
+   return hdr_data;
+}
+
+static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   char buffer[STBI__HDR_BUFLEN];
+   char *token;
+   int valid = 0;
+   int dummy;
+
+   if (!x) x = &dummy;
+   if (!y) y = &dummy;
+   if (!comp) comp = &dummy;
+
+   if (stbi__hdr_test(s) == 0) {
+       stbi__rewind( s );
+       return 0;
+   }
+
+   for(;;) {
+      token = stbi__hdr_gettoken(s,buffer);
+      if (token[0] == 0) break;
+      if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1;
+   }
+
+   if (!valid) {
+       stbi__rewind( s );
+       return 0;
+   }
+   token = stbi__hdr_gettoken(s,buffer);
+   if (strncmp(token, "-Y ", 3)) {
+       stbi__rewind( s );
+       return 0;
+   }
+   token += 3;
+   *y = (int) strtol(token, &token, 10);
+   while (*token == ' ') ++token;
+   if (strncmp(token, "+X ", 3)) {
+       stbi__rewind( s );
+       return 0;
+   }
+   token += 3;
+   *x = (int) strtol(token, NULL, 10);
+   *comp = 3;
+   return 1;
+}
+#endif // STBI_NO_HDR
+
+#ifndef STBI_NO_BMP
+static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   void *p;
+   stbi__bmp_data info;
+
+   info.all_a = 255;
+   p = stbi__bmp_parse_header(s, &info);
+   if (p == NULL) {
+      stbi__rewind( s );
+      return 0;
+   }
+   if (x) *x = s->img_x;
+   if (y) *y = s->img_y;
+   if (comp) {
+      if (info.bpp == 24 && info.ma == 0xff000000)
+         *comp = 3;
+      else
+         *comp = info.ma ? 4 : 3;
+   }
+   return 1;
+}
+#endif
+
+#ifndef STBI_NO_PSD
+static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   int channelCount, dummy, depth;
+   if (!x) x = &dummy;
+   if (!y) y = &dummy;
+   if (!comp) comp = &dummy;
+   if (stbi__get32be(s) != 0x38425053) {
+       stbi__rewind( s );
+       return 0;
+   }
+   if (stbi__get16be(s) != 1) {
+       stbi__rewind( s );
+       return 0;
+   }
+   stbi__skip(s, 6);
+   channelCount = stbi__get16be(s);
+   if (channelCount < 0 || channelCount > 16) {
+       stbi__rewind( s );
+       return 0;
+   }
+   *y = stbi__get32be(s);
+   *x = stbi__get32be(s);
+   depth = stbi__get16be(s);
+   if (depth != 8 && depth != 16) {
+       stbi__rewind( s );
+       return 0;
+   }
+   if (stbi__get16be(s) != 3) {
+       stbi__rewind( s );
+       return 0;
+   }
+   *comp = 4;
+   return 1;
+}
+
+static int stbi__psd_is16(stbi__context *s)
+{
+   int channelCount, depth;
+   if (stbi__get32be(s) != 0x38425053) {
+       stbi__rewind( s );
+       return 0;
+   }
+   if (stbi__get16be(s) != 1) {
+       stbi__rewind( s );
+       return 0;
+   }
+   stbi__skip(s, 6);
+   channelCount = stbi__get16be(s);
+   if (channelCount < 0 || channelCount > 16) {
+       stbi__rewind( s );
+       return 0;
+   }
+   STBI_NOTUSED(stbi__get32be(s));
+   STBI_NOTUSED(stbi__get32be(s));
+   depth = stbi__get16be(s);
+   if (depth != 16) {
+       stbi__rewind( s );
+       return 0;
+   }
+   return 1;
+}
+#endif
+
+#ifndef STBI_NO_PIC
+static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   int act_comp=0,num_packets=0,chained,dummy;
+   stbi__pic_packet packets[10];
+
+   if (!x) x = &dummy;
+   if (!y) y = &dummy;
+   if (!comp) comp = &dummy;
+
+   if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) {
+      stbi__rewind(s);
+      return 0;
+   }
+
+   stbi__skip(s, 88);
+
+   *x = stbi__get16be(s);
+   *y = stbi__get16be(s);
+   if (stbi__at_eof(s)) {
+      stbi__rewind( s);
+      return 0;
+   }
+   if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) {
+      stbi__rewind( s );
+      return 0;
+   }
+
+   stbi__skip(s, 8);
+
+   do {
+      stbi__pic_packet *packet;
+
+      if (num_packets==sizeof(packets)/sizeof(packets[0]))
+         return 0;
+
+      packet = &packets[num_packets++];
+      chained = stbi__get8(s);
+      packet->size    = stbi__get8(s);
+      packet->type    = stbi__get8(s);
+      packet->channel = stbi__get8(s);
+      act_comp |= packet->channel;
+
+      if (stbi__at_eof(s)) {
+          stbi__rewind( s );
+          return 0;
+      }
+      if (packet->size != 8) {
+          stbi__rewind( s );
+          return 0;
+      }
+   } while (chained);
+
+   *comp = (act_comp & 0x10 ? 4 : 3);
+
+   return 1;
+}
+#endif
+
+// *************************************************************************************************
+// Portable Gray Map and Portable Pixel Map loader
+// by Ken Miller
+//
+// PGM: http://netpbm.sourceforge.net/doc/pgm.html
+// PPM: http://netpbm.sourceforge.net/doc/ppm.html
+//
+// Known limitations:
+//    Does not support comments in the header section
+//    Does not support ASCII image data (formats P2 and P3)
+
+#ifndef STBI_NO_PNM
+
+static int      stbi__pnm_test(stbi__context *s)
+{
+   char p, t;
+   p = (char) stbi__get8(s);
+   t = (char) stbi__get8(s);
+   if (p != 'P' || (t != '5' && t != '6')) {
+       stbi__rewind( s );
+       return 0;
+   }
+   return 1;
+}
+
+static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   stbi_uc *out;
+   STBI_NOTUSED(ri);
+
+   ri->bits_per_channel = stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n);
+   if (ri->bits_per_channel == 0)
+      return 0;
+
+   if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+   if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+
+   *x = s->img_x;
+   *y = s->img_y;
+   if (comp) *comp = s->img_n;
+
+   if (!stbi__mad4sizes_valid(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0))
+      return stbi__errpuc("too large", "PNM too large");
+
+   out = (stbi_uc *) stbi__malloc_mad4(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0);
+   if (!out) return stbi__errpuc("outofmem", "Out of memory");
+   stbi__getn(s, out, s->img_n * s->img_x * s->img_y * (ri->bits_per_channel / 8));
+
+   if (req_comp && req_comp != s->img_n) {
+      out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y);
+      if (out == NULL) return out; // stbi__convert_format frees input on failure
+   }
+   return out;
+}
+
+static int      stbi__pnm_isspace(char c)
+{
+   return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r';
+}
+
+static void     stbi__pnm_skip_whitespace(stbi__context *s, char *c)
+{
+   for (;;) {
+      while (!stbi__at_eof(s) && stbi__pnm_isspace(*c))
+         *c = (char) stbi__get8(s);
+
+      if (stbi__at_eof(s) || *c != '#')
+         break;
+
+      while (!stbi__at_eof(s) && *c != '\n' && *c != '\r' )
+         *c = (char) stbi__get8(s);
+   }
+}
+
+static int      stbi__pnm_isdigit(char c)
+{
+   return c >= '0' && c <= '9';
+}
+
+static int      stbi__pnm_getinteger(stbi__context *s, char *c)
+{
+   int value = 0;
+
+   while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) {
+      value = value*10 + (*c - '0');
+      *c = (char) stbi__get8(s);
+   }
+
+   return value;
+}
+
+static int      stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   int maxv, dummy;
+   char c, p, t;
+
+   if (!x) x = &dummy;
+   if (!y) y = &dummy;
+   if (!comp) comp = &dummy;
+
+   stbi__rewind(s);
+
+   // Get identifier
+   p = (char) stbi__get8(s);
+   t = (char) stbi__get8(s);
+   if (p != 'P' || (t != '5' && t != '6')) {
+       stbi__rewind(s);
+       return 0;
+   }
+
+   *comp = (t == '6') ? 3 : 1;  // '5' is 1-component .pgm; '6' is 3-component .ppm
+
+   c = (char) stbi__get8(s);
+   stbi__pnm_skip_whitespace(s, &c);
+
+   *x = stbi__pnm_getinteger(s, &c); // read width
+   stbi__pnm_skip_whitespace(s, &c);
+
+   *y = stbi__pnm_getinteger(s, &c); // read height
+   stbi__pnm_skip_whitespace(s, &c);
+
+   maxv = stbi__pnm_getinteger(s, &c);  // read max value
+   if (maxv > 65535)
+      return stbi__err("max value > 65535", "PPM image supports only 8-bit and 16-bit images");
+   else if (maxv > 255)
+      return 16;
+   else
+      return 8;
+}
+
+static int stbi__pnm_is16(stbi__context *s)
+{
+   if (stbi__pnm_info(s, NULL, NULL, NULL) == 16)
+	   return 1;
+   return 0;
+}
+#endif
+
+static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp)
+{
+   #ifndef STBI_NO_JPEG
+   if (stbi__jpeg_info(s, x, y, comp)) return 1;
+   #endif
+
+   #ifndef STBI_NO_PNG
+   if (stbi__png_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_GIF
+   if (stbi__gif_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_BMP
+   if (stbi__bmp_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_PSD
+   if (stbi__psd_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_PIC
+   if (stbi__pic_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_PNM
+   if (stbi__pnm_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_HDR
+   if (stbi__hdr_info(s, x, y, comp))  return 1;
+   #endif
+
+   // test tga last because it's a crappy test!
+   #ifndef STBI_NO_TGA
+   if (stbi__tga_info(s, x, y, comp))
+       return 1;
+   #endif
+   return stbi__err("unknown image type", "Image not of any known type, or corrupt");
+}
+
+static int stbi__is_16_main(stbi__context *s)
+{
+   #ifndef STBI_NO_PNG
+   if (stbi__png_is16(s))  return 1;
+   #endif
+
+   #ifndef STBI_NO_PSD
+   if (stbi__psd_is16(s))  return 1;
+   #endif
+
+   #ifndef STBI_NO_PNM
+   if (stbi__pnm_is16(s))  return 1;
+   #endif
+   return 0;
+}
+
+#ifndef STBI_NO_STDIO
+STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp)
+{
+    FILE *f = stbi__fopen(filename, "rb");
+    int result;
+    if (!f) return stbi__err("can't fopen", "Unable to open file");
+    result = stbi_info_from_file(f, x, y, comp);
+    fclose(f);
+    return result;
+}
+
+STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp)
+{
+   int r;
+   stbi__context s;
+   long pos = ftell(f);
+   stbi__start_file(&s, f);
+   r = stbi__info_main(&s,x,y,comp);
+   fseek(f,pos,SEEK_SET);
+   return r;
+}
+
+STBIDEF int stbi_is_16_bit(char const *filename)
+{
+    FILE *f = stbi__fopen(filename, "rb");
+    int result;
+    if (!f) return stbi__err("can't fopen", "Unable to open file");
+    result = stbi_is_16_bit_from_file(f);
+    fclose(f);
+    return result;
+}
+
+STBIDEF int stbi_is_16_bit_from_file(FILE *f)
+{
+   int r;
+   stbi__context s;
+   long pos = ftell(f);
+   stbi__start_file(&s, f);
+   r = stbi__is_16_main(&s);
+   fseek(f,pos,SEEK_SET);
+   return r;
+}
+#endif // !STBI_NO_STDIO
+
+STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp)
+{
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__info_main(&s,x,y,comp);
+}
+
+STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp)
+{
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user);
+   return stbi__info_main(&s,x,y,comp);
+}
+
+STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len)
+{
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__is_16_main(&s);
+}
+
+STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user)
+{
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user);
+   return stbi__is_16_main(&s);
+}
+
+#endif // STB_IMAGE_IMPLEMENTATION
+
+/*
+   revision history:
+      2.20  (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs
+      2.19  (2018-02-11) fix warning
+      2.18  (2018-01-30) fix warnings
+      2.17  (2018-01-29) change sbti__shiftsigned to avoid clang -O2 bug
+                         1-bit BMP
+                         *_is_16_bit api
+                         avoid warnings
+      2.16  (2017-07-23) all functions have 16-bit variants;
+                         STBI_NO_STDIO works again;
+                         compilation fixes;
+                         fix rounding in unpremultiply;
+                         optimize vertical flip;
+                         disable raw_len validation;
+                         documentation fixes
+      2.15  (2017-03-18) fix png-1,2,4 bug; now all Imagenet JPGs decode;
+                         warning fixes; disable run-time SSE detection on gcc;
+                         uniform handling of optional "return" values;
+                         thread-safe initialization of zlib tables
+      2.14  (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs
+      2.13  (2016-11-29) add 16-bit API, only supported for PNG right now
+      2.12  (2016-04-02) fix typo in 2.11 PSD fix that caused crashes
+      2.11  (2016-04-02) allocate large structures on the stack
+                         remove white matting for transparent PSD
+                         fix reported channel count for PNG & BMP
+                         re-enable SSE2 in non-gcc 64-bit
+                         support RGB-formatted JPEG
+                         read 16-bit PNGs (only as 8-bit)
+      2.10  (2016-01-22) avoid warning introduced in 2.09 by STBI_REALLOC_SIZED
+      2.09  (2016-01-16) allow comments in PNM files
+                         16-bit-per-pixel TGA (not bit-per-component)
+                         info() for TGA could break due to .hdr handling
+                         info() for BMP to shares code instead of sloppy parse
+                         can use STBI_REALLOC_SIZED if allocator doesn't support realloc
+                         code cleanup
+      2.08  (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA
+      2.07  (2015-09-13) fix compiler warnings
+                         partial animated GIF support
+                         limited 16-bpc PSD support
+                         #ifdef unused functions
+                         bug with < 92 byte PIC,PNM,HDR,TGA
+      2.06  (2015-04-19) fix bug where PSD returns wrong '*comp' value
+      2.05  (2015-04-19) fix bug in progressive JPEG handling, fix warning
+      2.04  (2015-04-15) try to re-enable SIMD on MinGW 64-bit
+      2.03  (2015-04-12) extra corruption checking (mmozeiko)
+                         stbi_set_flip_vertically_on_load (nguillemot)
+                         fix NEON support; fix mingw support
+      2.02  (2015-01-19) fix incorrect assert, fix warning
+      2.01  (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2
+      2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG
+      2.00  (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg)
+                         progressive JPEG (stb)
+                         PGM/PPM support (Ken Miller)
+                         STBI_MALLOC,STBI_REALLOC,STBI_FREE
+                         GIF bugfix -- seemingly never worked
+                         STBI_NO_*, STBI_ONLY_*
+      1.48  (2014-12-14) fix incorrectly-named assert()
+      1.47  (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb)
+                         optimize PNG (ryg)
+                         fix bug in interlaced PNG with user-specified channel count (stb)
+      1.46  (2014-08-26)
+              fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG
+      1.45  (2014-08-16)
+              fix MSVC-ARM internal compiler error by wrapping malloc
+      1.44  (2014-08-07)
+              various warning fixes from Ronny Chevalier
+      1.43  (2014-07-15)
+              fix MSVC-only compiler problem in code changed in 1.42
+      1.42  (2014-07-09)
+              don't define _CRT_SECURE_NO_WARNINGS (affects user code)
+              fixes to stbi__cleanup_jpeg path
+              added STBI_ASSERT to avoid requiring assert.h
+      1.41  (2014-06-25)
+              fix search&replace from 1.36 that messed up comments/error messages
+      1.40  (2014-06-22)
+              fix gcc struct-initialization warning
+      1.39  (2014-06-15)
+              fix to TGA optimization when req_comp != number of components in TGA;
+              fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite)
+              add support for BMP version 5 (more ignored fields)
+      1.38  (2014-06-06)
+              suppress MSVC warnings on integer casts truncating values
+              fix accidental rename of 'skip' field of I/O
+      1.37  (2014-06-04)
+              remove duplicate typedef
+      1.36  (2014-06-03)
+              convert to header file single-file library
+              if de-iphone isn't set, load iphone images color-swapped instead of returning NULL
+      1.35  (2014-05-27)
+              various warnings
+              fix broken STBI_SIMD path
+              fix bug where stbi_load_from_file no longer left file pointer in correct place
+              fix broken non-easy path for 32-bit BMP (possibly never used)
+              TGA optimization by Arseny Kapoulkine
+      1.34  (unknown)
+              use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case
+      1.33  (2011-07-14)
+              make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements
+      1.32  (2011-07-13)
+              support for "info" function for all supported filetypes (SpartanJ)
+      1.31  (2011-06-20)
+              a few more leak fixes, bug in PNG handling (SpartanJ)
+      1.30  (2011-06-11)
+              added ability to load files via callbacks to accomidate custom input streams (Ben Wenger)
+              removed deprecated format-specific test/load functions
+              removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway
+              error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha)
+              fix inefficiency in decoding 32-bit BMP (David Woo)
+      1.29  (2010-08-16)
+              various warning fixes from Aurelien Pocheville
+      1.28  (2010-08-01)
+              fix bug in GIF palette transparency (SpartanJ)
+      1.27  (2010-08-01)
+              cast-to-stbi_uc to fix warnings
+      1.26  (2010-07-24)
+              fix bug in file buffering for PNG reported by SpartanJ
+      1.25  (2010-07-17)
+              refix trans_data warning (Won Chun)
+      1.24  (2010-07-12)
+              perf improvements reading from files on platforms with lock-heavy fgetc()
+              minor perf improvements for jpeg
+              deprecated type-specific functions so we'll get feedback if they're needed
+              attempt to fix trans_data warning (Won Chun)
+      1.23    fixed bug in iPhone support
+      1.22  (2010-07-10)
+              removed image *writing* support
+              stbi_info support from Jetro Lauha
+              GIF support from Jean-Marc Lienher
+              iPhone PNG-extensions from James Brown
+              warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva)
+      1.21    fix use of 'stbi_uc' in header (reported by jon blow)
+      1.20    added support for Softimage PIC, by Tom Seddon
+      1.19    bug in interlaced PNG corruption check (found by ryg)
+      1.18  (2008-08-02)
+              fix a threading bug (local mutable static)
+      1.17    support interlaced PNG
+      1.16    major bugfix - stbi__convert_format converted one too many pixels
+      1.15    initialize some fields for thread safety
+      1.14    fix threadsafe conversion bug
+              header-file-only version (#define STBI_HEADER_FILE_ONLY before including)
+      1.13    threadsafe
+      1.12    const qualifiers in the API
+      1.11    Support installable IDCT, colorspace conversion routines
+      1.10    Fixes for 64-bit (don't use "unsigned long")
+              optimized upsampling by Fabian "ryg" Giesen
+      1.09    Fix format-conversion for PSD code (bad global variables!)
+      1.08    Thatcher Ulrich's PSD code integrated by Nicolas Schulz
+      1.07    attempt to fix C++ warning/errors again
+      1.06    attempt to fix C++ warning/errors again
+      1.05    fix TGA loading to return correct *comp and use good luminance calc
+      1.04    default float alpha is 1, not 255; use 'void *' for stbi_image_free
+      1.03    bugfixes to STBI_NO_STDIO, STBI_NO_HDR
+      1.02    support for (subset of) HDR files, float interface for preferred access to them
+      1.01    fix bug: possible bug in handling right-side up bmps... not sure
+              fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all
+      1.00    interface to zlib that skips zlib header
+      0.99    correct handling of alpha in palette
+      0.98    TGA loader by lonesock; dynamically add loaders (untested)
+      0.97    jpeg errors on too large a file; also catch another malloc failure
+      0.96    fix detection of invalid v value - particleman@mollyrocket forum
+      0.95    during header scan, seek to markers in case of padding
+      0.94    STBI_NO_STDIO to disable stdio usage; rename all #defines the same
+      0.93    handle jpegtran output; verbose errors
+      0.92    read 4,8,16,24,32-bit BMP files of several formats
+      0.91    output 24-bit Windows 3.0 BMP files
+      0.90    fix a few more warnings; bump version number to approach 1.0
+      0.61    bugfixes due to Marc LeBlanc, Christopher Lloyd
+      0.60    fix compiling as c++
+      0.59    fix warnings: merge Dave Moore's -Wall fixes
+      0.58    fix bug: zlib uncompressed mode len/nlen was wrong endian
+      0.57    fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available
+      0.56    fix bug: zlib uncompressed mode len vs. nlen
+      0.55    fix bug: restart_interval not initialized to 0
+      0.54    allow NULL for 'int *comp'
+      0.53    fix bug in png 3->4; speedup png decoding
+      0.52    png handles req_comp=3,4 directly; minor cleanup; jpeg comments
+      0.51    obey req_comp requests, 1-component jpegs return as 1-component,
+              on 'test' only check type, not whether we support this variant
+      0.50  (2006-11-19)
+              first released version
+*/
+
+
+/*
+------------------------------------------------------------------------------
+This software is available under 2 licenses -- choose whichever you prefer.
+------------------------------------------------------------------------------
+ALTERNATIVE A - MIT License
+Copyright (c) 2017 Sean Barrett
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+------------------------------------------------------------------------------
+ALTERNATIVE B - Public Domain (www.unlicense.org)
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+------------------------------------------------------------------------------
+*/
diff --git a/3rdparty/stblib/include/stb_truetype.h b/3rdparty/stblib/include/stb_truetype.h
new file mode 100644
index 0000000000..9414a63412
--- /dev/null
+++ b/3rdparty/stblib/include/stb_truetype.h
@@ -0,0 +1,5017 @@
+// stb_truetype.h - v1.25 - public domain
+// authored from 2009-2021 by Sean Barrett / RAD Game Tools
+//
+// =======================================================================
+//
+//    NO SECURITY GUARANTEE -- DO NOT USE THIS ON UNTRUSTED FONT FILES
+//
+// This library does no range checking of the offsets found in the file,
+// meaning an attacker can use it to read arbitrary memory.
+//
+// =======================================================================
+//
+//   This library processes TrueType files:
+//        parse files
+//        extract glyph metrics
+//        extract glyph shapes
+//        render glyphs to one-channel bitmaps with antialiasing (box filter)
+//        render glyphs to one-channel SDF bitmaps (signed-distance field/function)
+//
+//   Todo:
+//        non-MS cmaps
+//        crashproof on bad data
+//        hinting? (no longer patented)
+//        cleartype-style AA?
+//        optimize: use simple memory allocator for intermediates
+//        optimize: build edge-list directly from curves
+//        optimize: rasterize directly from curves?
+//
+// ADDITIONAL CONTRIBUTORS
+//
+//   Mikko Mononen: compound shape support, more cmap formats
+//   Tor Andersson: kerning, subpixel rendering
+//   Dougall Johnson: OpenType / Type 2 font handling
+//   Daniel Ribeiro Maciel: basic GPOS-based kerning
+//
+//   Misc other:
+//       Ryan Gordon
+//       Simon Glass
+//       github:IntellectualKitty
+//       Imanol Celaya
+//       Daniel Ribeiro Maciel
+//
+//   Bug/warning reports/fixes:
+//       "Zer" on mollyrocket       Fabian "ryg" Giesen   github:NiLuJe
+//       Cass Everitt               Martins Mozeiko       github:aloucks
+//       stoiko (Haemimont Games)   Cap Petschulat        github:oyvindjam
+//       Brian Hook                 Omar Cornut           github:vassvik
+//       Walter van Niftrik         Ryan Griege
+//       David Gow                  Peter LaValle
+//       David Given                Sergey Popov
+//       Ivan-Assen Ivanov          Giumo X. Clanjor
+//       Anthony Pesch              Higor Euripedes
+//       Johan Duparc               Thomas Fields
+//       Hou Qiming                 Derek Vinyard
+//       Rob Loach                  Cort Stratton
+//       Kenney Phillis Jr.         Brian Costabile
+//       Ken Voskuil (kaesve)
+//
+// VERSION HISTORY
+//
+//   1.25 (2021-07-11) many fixes
+//   1.24 (2020-02-05) fix warning
+//   1.23 (2020-02-02) query SVG data for glyphs; query whole kerning table (but only kern not GPOS)
+//   1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined
+//   1.21 (2019-02-25) fix warning
+//   1.20 (2019-02-07) PackFontRange skips missing codepoints; GetScaleFontVMetrics()
+//   1.19 (2018-02-11) GPOS kerning, STBTT_fmod
+//   1.18 (2018-01-29) add missing function
+//   1.17 (2017-07-23) make more arguments const; doc fix
+//   1.16 (2017-07-12) SDF support
+//   1.15 (2017-03-03) make more arguments const
+//   1.14 (2017-01-16) num-fonts-in-TTC function
+//   1.13 (2017-01-02) support OpenType fonts, certain Apple fonts
+//   1.12 (2016-10-25) suppress warnings about casting away const with -Wcast-qual
+//   1.11 (2016-04-02) fix unused-variable warning
+//   1.10 (2016-04-02) user-defined fabs(); rare memory leak; remove duplicate typedef
+//   1.09 (2016-01-16) warning fix; avoid crash on outofmem; use allocation userdata properly
+//   1.08 (2015-09-13) document stbtt_Rasterize(); fixes for vertical & horizontal edges
+//   1.07 (2015-08-01) allow PackFontRanges to accept arrays of sparse codepoints;
+//                     variant PackFontRanges to pack and render in separate phases;
+//                     fix stbtt_GetFontOFfsetForIndex (never worked for non-0 input?);
+//                     fixed an assert() bug in the new rasterizer
+//                     replace assert() with STBTT_assert() in new rasterizer
+//
+//   Full history can be found at the end of this file.
+//
+// LICENSE
+//
+//   See end of file for license information.
+//
+// USAGE
+//
+//   Include this file in whatever places need to refer to it. In ONE C/C++
+//   file, write:
+//      #define STB_TRUETYPE_IMPLEMENTATION
+//   before the #include of this file. This expands out the actual
+//   implementation into that C/C++ file.
+//
+//   To make the implementation private to the file that generates the implementation,
+//      #define STBTT_STATIC
+//
+//   Simple 3D API (don't ship this, but it's fine for tools and quick start)
+//           stbtt_BakeFontBitmap()               -- bake a font to a bitmap for use as texture
+//           stbtt_GetBakedQuad()                 -- compute quad to draw for a given char
+//
+//   Improved 3D API (more shippable):
+//           #include "stb_rect_pack.h"           -- optional, but you really want it
+//           stbtt_PackBegin()
+//           stbtt_PackSetOversampling()          -- for improved quality on small fonts
+//           stbtt_PackFontRanges()               -- pack and renders
+//           stbtt_PackEnd()
+//           stbtt_GetPackedQuad()
+//
+//   "Load" a font file from a memory buffer (you have to keep the buffer loaded)
+//           stbtt_InitFont()
+//           stbtt_GetFontOffsetForIndex()        -- indexing for TTC font collections
+//           stbtt_GetNumberOfFonts()             -- number of fonts for TTC font collections
+//
+//   Render a unicode codepoint to a bitmap
+//           stbtt_GetCodepointBitmap()           -- allocates and returns a bitmap
+//           stbtt_MakeCodepointBitmap()          -- renders into bitmap you provide
+//           stbtt_GetCodepointBitmapBox()        -- how big the bitmap must be
+//
+//   Character advance/positioning
+//           stbtt_GetCodepointHMetrics()
+//           stbtt_GetFontVMetrics()
+//           stbtt_GetFontVMetricsOS2()
+//           stbtt_GetCodepointKernAdvance()
+//
+//   Starting with version 1.06, the rasterizer was replaced with a new,
+//   faster and generally-more-precise rasterizer. The new rasterizer more
+//   accurately measures pixel coverage for anti-aliasing, except in the case
+//   where multiple shapes overlap, in which case it overestimates the AA pixel
+//   coverage. Thus, anti-aliasing of intersecting shapes may look wrong. If
+//   this turns out to be a problem, you can re-enable the old rasterizer with
+//        #define STBTT_RASTERIZER_VERSION 1
+//   which will incur about a 15% speed hit.
+//
+// ADDITIONAL DOCUMENTATION
+//
+//   Immediately after this block comment are a series of sample programs.
+//
+//   After the sample programs is the "header file" section. This section
+//   includes documentation for each API function.
+//
+//   Some important concepts to understand to use this library:
+//
+//      Codepoint
+//         Characters are defined by unicode codepoints, e.g. 65 is
+//         uppercase A, 231 is lowercase c with a cedilla, 0x7e30 is
+//         the hiragana for "ma".
+//
+//      Glyph
+//         A visual character shape (every codepoint is rendered as
+//         some glyph)
+//
+//      Glyph index
+//         A font-specific integer ID representing a glyph
+//
+//      Baseline
+//         Glyph shapes are defined relative to a baseline, which is the
+//         bottom of uppercase characters. Characters extend both above
+//         and below the baseline.
+//
+//      Current Point
+//         As you draw text to the screen, you keep track of a "current point"
+//         which is the origin of each character. The current point's vertical
+//         position is the baseline. Even "baked fonts" use this model.
+//
+//      Vertical Font Metrics
+//         The vertical qualities of the font, used to vertically position
+//         and space the characters. See docs for stbtt_GetFontVMetrics.
+//
+//      Font Size in Pixels or Points
+//         The preferred interface for specifying font sizes in stb_truetype
+//         is to specify how tall the font's vertical extent should be in pixels.
+//         If that sounds good enough, skip the next paragraph.
+//
+//         Most font APIs instead use "points", which are a common typographic
+//         measurement for describing font size, defined as 72 points per inch.
+//         stb_truetype provides a point API for compatibility. However, true
+//         "per inch" conventions don't make much sense on computer displays
+//         since different monitors have different number of pixels per
+//         inch. For example, Windows traditionally uses a convention that
+//         there are 96 pixels per inch, thus making 'inch' measurements have
+//         nothing to do with inches, and thus effectively defining a point to
+//         be 1.333 pixels. Additionally, the TrueType font data provides
+//         an explicit scale factor to scale a given font's glyphs to points,
+//         but the author has observed that this scale factor is often wrong
+//         for non-commercial fonts, thus making fonts scaled in points
+//         according to the TrueType spec incoherently sized in practice.
+//
+// DETAILED USAGE:
+//
+//  Scale:
+//    Select how high you want the font to be, in points or pixels.
+//    Call ScaleForPixelHeight or ScaleForMappingEmToPixels to compute
+//    a scale factor SF that will be used by all other functions.
+//
+//  Baseline:
+//    You need to select a y-coordinate that is the baseline of where
+//    your text will appear. Call GetFontBoundingBox to get the baseline-relative
+//    bounding box for all characters. SF*-y0 will be the distance in pixels
+//    that the worst-case character could extend above the baseline, so if
+//    you want the top edge of characters to appear at the top of the
+//    screen where y=0, then you would set the baseline to SF*-y0.
+//
+//  Current point:
+//    Set the current point where the first character will appear. The
+//    first character could extend left of the current point; this is font
+//    dependent. You can either choose a current point that is the leftmost
+//    point and hope, or add some padding, or check the bounding box or
+//    left-side-bearing of the first character to be displayed and set
+//    the current point based on that.
+//
+//  Displaying a character:
+//    Compute the bounding box of the character. It will contain signed values
+//    relative to <current_point, baseline>. I.e. if it returns x0,y0,x1,y1,
+//    then the character should be displayed in the rectangle from
+//    <current_point+SF*x0, baseline+SF*y0> to <current_point+SF*x1,baseline+SF*y1).
+//
+//  Advancing for the next character:
+//    Call GlyphHMetrics, and compute 'current_point += SF * advance'.
+//
+//
+// ADVANCED USAGE
+//
+//   Quality:
+//
+//    - Use the functions with Subpixel at the end to allow your characters
+//      to have subpixel positioning. Since the font is anti-aliased, not
+//      hinted, this is very import for quality. (This is not possible with
+//      baked fonts.)
+//
+//    - Kerning is now supported, and if you're supporting subpixel rendering
+//      then kerning is worth using to give your text a polished look.
+//
+//   Performance:
+//
+//    - Convert Unicode codepoints to glyph indexes and operate on the glyphs;
+//      if you don't do this, stb_truetype is forced to do the conversion on
+//      every call.
+//
+//    - There are a lot of memory allocations. We should modify it to take
+//      a temp buffer and allocate from the temp buffer (without freeing),
+//      should help performance a lot.
+//
+// NOTES
+//
+//   The system uses the raw data found in the .ttf file without changing it
+//   and without building auxiliary data structures. This is a bit inefficient
+//   on little-endian systems (the data is big-endian), but assuming you're
+//   caching the bitmaps or glyph shapes this shouldn't be a big deal.
+//
+//   It appears to be very hard to programmatically determine what font a
+//   given file is in a general way. I provide an API for this, but I don't
+//   recommend it.
+//
+//
+// PERFORMANCE MEASUREMENTS FOR 1.06:
+//
+//                      32-bit     64-bit
+//   Previous release:  8.83 s     7.68 s
+//   Pool allocations:  7.72 s     6.34 s
+//   Inline sort     :  6.54 s     5.65 s
+//   New rasterizer  :  5.63 s     5.00 s
+
+//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
+////
+////  SAMPLE PROGRAMS
+////
+//
+//  Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless
+//
+#if 0
+#define STB_TRUETYPE_IMPLEMENTATION  // force following include to generate implementation
+#include "stb_truetype.h"
+
+unsigned char ttf_buffer[1<<20];
+unsigned char temp_bitmap[512*512];
+
+stbtt_bakedchar cdata[96]; // ASCII 32..126 is 95 glyphs
+GLuint ftex;
+
+void my_stbtt_initfont(void)
+{
+   fread(ttf_buffer, 1, 1<<20, fopen("c:/windows/fonts/times.ttf", "rb"));
+   stbtt_BakeFontBitmap(ttf_buffer,0, 32.0, temp_bitmap,512,512, 32,96, cdata); // no guarantee this fits!
+   // can free ttf_buffer at this point
+   glGenTextures(1, &ftex);
+   glBindTexture(GL_TEXTURE_2D, ftex);
+   glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, 512,512, 0, GL_ALPHA, GL_UNSIGNED_BYTE, temp_bitmap);
+   // can free temp_bitmap at this point
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+}
+
+void my_stbtt_print(float x, float y, char *text)
+{
+   // assume orthographic projection with units = screen pixels, origin at top left
+   glEnable(GL_BLEND);
+   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+   glEnable(GL_TEXTURE_2D);
+   glBindTexture(GL_TEXTURE_2D, ftex);
+   glBegin(GL_QUADS);
+   while (*text) {
+      if (*text >= 32 && *text < 128) {
+         stbtt_aligned_quad q;
+         stbtt_GetBakedQuad(cdata, 512,512, *text-32, &x,&y,&q,1);//1=opengl & d3d10+,0=d3d9
+         glTexCoord2f(q.s0,q.t1); glVertex2f(q.x0,q.y0);
+         glTexCoord2f(q.s1,q.t1); glVertex2f(q.x1,q.y0);
+         glTexCoord2f(q.s1,q.t0); glVertex2f(q.x1,q.y1);
+         glTexCoord2f(q.s0,q.t0); glVertex2f(q.x0,q.y1);
+      }
+      ++text;
+   }
+   glEnd();
+}
+#endif
+//
+//
+//////////////////////////////////////////////////////////////////////////////
+//
+// Complete program (this compiles): get a single bitmap, print as ASCII art
+//
+#if 0
+#include <stdio.h>
+#define STB_TRUETYPE_IMPLEMENTATION  // force following include to generate implementation
+#include "stb_truetype.h"
+
+char ttf_buffer[1<<25];
+
+int main(int argc, char **argv)
+{
+   stbtt_fontinfo font;
+   unsigned char *bitmap;
+   int w,h,i,j,c = (argc > 1 ? atoi(argv[1]) : 'a'), s = (argc > 2 ? atoi(argv[2]) : 20);
+
+   fread(ttf_buffer, 1, 1<<25, fopen(argc > 3 ? argv[3] : "c:/windows/fonts/arialbd.ttf", "rb"));
+
+   stbtt_InitFont(&font, ttf_buffer, stbtt_GetFontOffsetForIndex(ttf_buffer,0));
+   bitmap = stbtt_GetCodepointBitmap(&font, 0,stbtt_ScaleForPixelHeight(&font, s), c, &w, &h, 0,0);
+
+   for (j=0; j < h; ++j) {
+      for (i=0; i < w; ++i)
+         putchar(" .:ioVM@"[bitmap[j*w+i]>>5]);
+      putchar('\n');
+   }
+   return 0;
+}
+#endif
+//
+// Output:
+//
+//     .ii.
+//    @@@@@@.
+//   V@Mio@@o
+//   :i.  V@V
+//     :oM@@M
+//   :@@@MM@M
+//   @@o  o@M
+//  :@@.  M@M
+//   @@@o@@@@
+//   :M@@V:@@.
+//
+//////////////////////////////////////////////////////////////////////////////
+//
+// Complete program: print "Hello World!" banner, with bugs
+//
+#if 0
+char buffer[24<<20];
+unsigned char screen[20][79];
+
+int main(int arg, char **argv)
+{
+   stbtt_fontinfo font;
+   int i,j,ascent,baseline,ch=0;
+   float scale, xpos=2; // leave a little padding in case the character extends left
+   char *text = "Heljo World!"; // intentionally misspelled to show 'lj' brokenness
+
+   fread(buffer, 1, 1000000, fopen("c:/windows/fonts/arialbd.ttf", "rb"));
+   stbtt_InitFont(&font, buffer, 0);
+
+   scale = stbtt_ScaleForPixelHeight(&font, 15);
+   stbtt_GetFontVMetrics(&font, &ascent,0,0);
+   baseline = (int) (ascent*scale);
+
+   while (text[ch]) {
+      int advance,lsb,x0,y0,x1,y1;
+      float x_shift = xpos - (float) floor(xpos);
+      stbtt_GetCodepointHMetrics(&font, text[ch], &advance, &lsb);
+      stbtt_GetCodepointBitmapBoxSubpixel(&font, text[ch], scale,scale,x_shift,0, &x0,&y0,&x1,&y1);
+      stbtt_MakeCodepointBitmapSubpixel(&font, &screen[baseline + y0][(int) xpos + x0], x1-x0,y1-y0, 79, scale,scale,x_shift,0, text[ch]);
+      // note that this stomps the old data, so where character boxes overlap (e.g. 'lj') it's wrong
+      // because this API is really for baking character bitmaps into textures. if you want to render
+      // a sequence of characters, you really need to render each bitmap to a temp buffer, then
+      // "alpha blend" that into the working buffer
+      xpos += (advance * scale);
+      if (text[ch+1])
+         xpos += scale*stbtt_GetCodepointKernAdvance(&font, text[ch],text[ch+1]);
+      ++ch;
+   }
+
+   for (j=0; j < 20; ++j) {
+      for (i=0; i < 78; ++i)
+         putchar(" .:ioVM@"[screen[j][i]>>5]);
+      putchar('\n');
+   }
+
+   return 0;
+}
+#endif
+
+
+//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
+////
+////   INTEGRATION WITH YOUR CODEBASE
+////
+////   The following sections allow you to supply alternate definitions
+////   of C library functions used by stb_truetype, e.g. if you don't
+////   link with the C runtime library.
+
+#ifdef STB_TRUETYPE_IMPLEMENTATION
+   // #define your own (u)stbtt_int8/16/32 before including to override this
+   #ifndef stbtt_uint8
+   typedef unsigned char   stbtt_uint8;
+   typedef signed   char   stbtt_int8;
+   typedef unsigned short  stbtt_uint16;
+   typedef signed   short  stbtt_int16;
+   typedef unsigned int    stbtt_uint32;
+   typedef signed   int    stbtt_int32;
+   #endif
+
+   typedef char stbtt__check_size32[sizeof(stbtt_int32)==4 ? 1 : -1];
+   typedef char stbtt__check_size16[sizeof(stbtt_int16)==2 ? 1 : -1];
+
+   // e.g. #define your own STBTT_ifloor/STBTT_iceil() to avoid math.h
+   #ifndef STBTT_ifloor
+   #include <math.h>
+   #define STBTT_ifloor(x)   ((int) floor(x))
+   #define STBTT_iceil(x)    ((int) ceil(x))
+   #endif
+
+   #ifndef STBTT_sqrt
+   #include <math.h>
+   #define STBTT_sqrt(x)      sqrt(x)
+   #define STBTT_pow(x,y)     pow(x,y)
+   #endif
+
+   #ifndef STBTT_fmod
+   #include <math.h>
+   #define STBTT_fmod(x,y)    fmod(x,y)
+   #endif
+
+   #ifndef STBTT_cos
+   #include <math.h>
+   #define STBTT_cos(x)       cos(x)
+   #define STBTT_acos(x)      acos(x)
+   #endif
+
+   #ifndef STBTT_fabs
+   #include <math.h>
+   #define STBTT_fabs(x)      fabs(x)
+   #endif
+
+   // #define your own functions "STBTT_malloc" / "STBTT_free" to avoid malloc.h
+   #ifndef STBTT_malloc
+   #include <stdlib.h>
+   #define STBTT_malloc(x,u)  ((void)(u),malloc(x))
+   #define STBTT_free(x,u)    ((void)(u),free(x))
+   #endif
+
+   #ifndef STBTT_assert
+   #include <assert.h>
+   #define STBTT_assert(x)    assert(x)
+   #endif
+
+   #ifndef STBTT_strlen
+   #include <string.h>
+   #define STBTT_strlen(x)    strlen(x)
+   #endif
+
+   #ifndef STBTT_memcpy
+   #include <string.h>
+   #define STBTT_memcpy       memcpy
+   #define STBTT_memset       memset
+   #endif
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+////
+////   INTERFACE
+////
+////
+
+#ifndef __STB_INCLUDE_STB_TRUETYPE_H__
+#define __STB_INCLUDE_STB_TRUETYPE_H__
+
+#ifdef STBTT_STATIC
+#define STBTT_DEF static
+#else
+#define STBTT_DEF extern
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// private structure
+typedef struct
+{
+   unsigned char *data;
+   int cursor;
+   int size;
+} stbtt__buf;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// TEXTURE BAKING API
+//
+// If you use this API, you only have to call two functions ever.
+//
+
+typedef struct
+{
+   unsigned short x0,y0,x1,y1; // coordinates of bbox in bitmap
+   float xoff,yoff,xadvance;
+} stbtt_bakedchar;
+
+STBTT_DEF int stbtt_BakeFontBitmap(const unsigned char *data, int offset,  // font location (use offset=0 for plain .ttf)
+                                float pixel_height,                     // height of font in pixels
+                                unsigned char *pixels, int pw, int ph,  // bitmap to be filled in
+                                int first_char, int num_chars,          // characters to bake
+                                stbtt_bakedchar *chardata);             // you allocate this, it's num_chars long
+// if return is positive, the first unused row of the bitmap
+// if return is negative, returns the negative of the number of characters that fit
+// if return is 0, no characters fit and no rows were used
+// This uses a very crappy packing.
+
+typedef struct
+{
+   float x0,y0,s0,t0; // top-left
+   float x1,y1,s1,t1; // bottom-right
+} stbtt_aligned_quad;
+
+STBTT_DEF void stbtt_GetBakedQuad(const stbtt_bakedchar *chardata, int pw, int ph,  // same data as above
+                               int char_index,             // character to display
+                               float *xpos, float *ypos,   // pointers to current position in screen pixel space
+                               stbtt_aligned_quad *q,      // output: quad to draw
+                               int opengl_fillrule);       // true if opengl fill rule; false if DX9 or earlier
+// Call GetBakedQuad with char_index = 'character - first_char', and it
+// creates the quad you need to draw and advances the current position.
+//
+// The coordinate system used assumes y increases downwards.
+//
+// Characters will extend both above and below the current position;
+// see discussion of "BASELINE" above.
+//
+// It's inefficient; you might want to c&p it and optimize it.
+
+STBTT_DEF void stbtt_GetScaledFontVMetrics(const unsigned char *fontdata, int index, float size, float *ascent, float *descent, float *lineGap);
+// Query the font vertical metrics without having to create a font first.
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// NEW TEXTURE BAKING API
+//
+// This provides options for packing multiple fonts into one atlas, not
+// perfectly but better than nothing.
+
+typedef struct
+{
+   unsigned short x0,y0,x1,y1; // coordinates of bbox in bitmap
+   float xoff,yoff,xadvance;
+   float xoff2,yoff2;
+} stbtt_packedchar;
+
+typedef struct stbtt_pack_context stbtt_pack_context;
+typedef struct stbtt_fontinfo stbtt_fontinfo;
+#ifndef STB_RECT_PACK_VERSION
+typedef struct stbrp_rect stbrp_rect;
+#endif
+
+STBTT_DEF int  stbtt_PackBegin(stbtt_pack_context *spc, unsigned char *pixels, int width, int height, int stride_in_bytes, int padding, void *alloc_context);
+// Initializes a packing context stored in the passed-in stbtt_pack_context.
+// Future calls using this context will pack characters into the bitmap passed
+// in here: a 1-channel bitmap that is width * height. stride_in_bytes is
+// the distance from one row to the next (or 0 to mean they are packed tightly
+// together). "padding" is the amount of padding to leave between each
+// character (normally you want '1' for bitmaps you'll use as textures with
+// bilinear filtering).
+//
+// Returns 0 on failure, 1 on success.
+
+STBTT_DEF void stbtt_PackEnd  (stbtt_pack_context *spc);
+// Cleans up the packing context and frees all memory.
+
+#define STBTT_POINT_SIZE(x)   (-(x))
+
+STBTT_DEF int  stbtt_PackFontRange(stbtt_pack_context *spc, const unsigned char *fontdata, int font_index, float font_size,
+                                int first_unicode_char_in_range, int num_chars_in_range, stbtt_packedchar *chardata_for_range);
+// Creates character bitmaps from the font_index'th font found in fontdata (use
+// font_index=0 if you don't know what that is). It creates num_chars_in_range
+// bitmaps for characters with unicode values starting at first_unicode_char_in_range
+// and increasing. Data for how to render them is stored in chardata_for_range;
+// pass these to stbtt_GetPackedQuad to get back renderable quads.
+//
+// font_size is the full height of the character from ascender to descender,
+// as computed by stbtt_ScaleForPixelHeight. To use a point size as computed
+// by stbtt_ScaleForMappingEmToPixels, wrap the point size in STBTT_POINT_SIZE()
+// and pass that result as 'font_size':
+//       ...,                  20 , ... // font max minus min y is 20 pixels tall
+//       ..., STBTT_POINT_SIZE(20), ... // 'M' is 20 pixels tall
+
+typedef struct
+{
+   float font_size;
+   int first_unicode_codepoint_in_range;  // if non-zero, then the chars are continuous, and this is the first codepoint
+   int *array_of_unicode_codepoints;       // if non-zero, then this is an array of unicode codepoints
+   int num_chars;
+   stbtt_packedchar *chardata_for_range; // output
+   unsigned char h_oversample, v_oversample; // don't set these, they're used internally
+} stbtt_pack_range;
+
+STBTT_DEF int  stbtt_PackFontRanges(stbtt_pack_context *spc, const unsigned char *fontdata, int font_index, stbtt_pack_range *ranges, int num_ranges);
+// Creates character bitmaps from multiple ranges of characters stored in
+// ranges. This will usually create a better-packed bitmap than multiple
+// calls to stbtt_PackFontRange. Note that you can call this multiple
+// times within a single PackBegin/PackEnd.
+
+STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h_oversample, unsigned int v_oversample);
+// Oversampling a font increases the quality by allowing higher-quality subpixel
+// positioning, and is especially valuable at smaller text sizes.
+//
+// This function sets the amount of oversampling for all following calls to
+// stbtt_PackFontRange(s) or stbtt_PackFontRangesGatherRects for a given
+// pack context. The default (no oversampling) is achieved by h_oversample=1
+// and v_oversample=1. The total number of pixels required is
+// h_oversample*v_oversample larger than the default; for example, 2x2
+// oversampling requires 4x the storage of 1x1. For best results, render
+// oversampled textures with bilinear filtering. Look at the readme in
+// stb/tests/oversample for information about oversampled fonts
+//
+// To use with PackFontRangesGather etc., you must set it before calls
+// call to PackFontRangesGatherRects.
+
+STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip);
+// If skip != 0, this tells stb_truetype to skip any codepoints for which
+// there is no corresponding glyph. If skip=0, which is the default, then
+// codepoints without a glyph recived the font's "missing character" glyph,
+// typically an empty box by convention.
+
+STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph,  // same data as above
+                               int char_index,             // character to display
+                               float *xpos, float *ypos,   // pointers to current position in screen pixel space
+                               stbtt_aligned_quad *q,      // output: quad to draw
+                               int align_to_integer);
+
+STBTT_DEF int  stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects);
+STBTT_DEF void stbtt_PackFontRangesPackRects(stbtt_pack_context *spc, stbrp_rect *rects, int num_rects);
+STBTT_DEF int  stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects);
+// Calling these functions in sequence is roughly equivalent to calling
+// stbtt_PackFontRanges(). If you more control over the packing of multiple
+// fonts, or if you want to pack custom data into a font texture, take a look
+// at the source to of stbtt_PackFontRanges() and create a custom version
+// using these functions, e.g. call GatherRects multiple times,
+// building up a single array of rects, then call PackRects once,
+// then call RenderIntoRects repeatedly. This may result in a
+// better packing than calling PackFontRanges multiple times
+// (or it may not).
+
+// this is an opaque structure that you shouldn't mess with which holds
+// all the context needed from PackBegin to PackEnd.
+struct stbtt_pack_context {
+   void *user_allocator_context;
+   void *pack_info;
+   int   width;
+   int   height;
+   int   stride_in_bytes;
+   int   padding;
+   int   skip_missing;
+   unsigned int   h_oversample, v_oversample;
+   unsigned char *pixels;
+   void  *nodes;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// FONT LOADING
+//
+//
+
+STBTT_DEF int stbtt_GetNumberOfFonts(const unsigned char *data);
+// This function will determine the number of fonts in a font file.  TrueType
+// collection (.ttc) files may contain multiple fonts, while TrueType font
+// (.ttf) files only contain one font. The number of fonts can be used for
+// indexing with the previous function where the index is between zero and one
+// less than the total fonts. If an error occurs, -1 is returned.
+
+STBTT_DEF int stbtt_GetFontOffsetForIndex(const unsigned char *data, int index);
+// Each .ttf/.ttc file may have more than one font. Each font has a sequential
+// index number starting from 0. Call this function to get the font offset for
+// a given index; it returns -1 if the index is out of range. A regular .ttf
+// file will only define one font and it always be at offset 0, so it will
+// return '0' for index 0, and -1 for all other indices.
+
+// The following structure is defined publicly so you can declare one on
+// the stack or as a global or etc, but you should treat it as opaque.
+struct stbtt_fontinfo
+{
+   void           * userdata;
+   unsigned char  * data;              // pointer to .ttf file
+   int              fontstart;         // offset of start of font
+
+   int numGlyphs;                     // number of glyphs, needed for range checking
+
+   int loca,head,glyf,hhea,hmtx,kern,gpos,svg; // table locations as offset from start of .ttf
+   int index_map;                     // a cmap mapping for our chosen character encoding
+   int indexToLocFormat;              // format needed to map from glyph index to glyph
+
+   stbtt__buf cff;                    // cff font data
+   stbtt__buf charstrings;            // the charstring index
+   stbtt__buf gsubrs;                 // global charstring subroutines index
+   stbtt__buf subrs;                  // private charstring subroutines index
+   stbtt__buf fontdicts;              // array of font dicts
+   stbtt__buf fdselect;               // map from glyph to fontdict
+};
+
+STBTT_DEF int stbtt_InitFont(stbtt_fontinfo *info, const unsigned char *data, int offset);
+// Given an offset into the file that defines a font, this function builds
+// the necessary cached info for the rest of the system. You must allocate
+// the stbtt_fontinfo yourself, and stbtt_InitFont will fill it out. You don't
+// need to do anything special to free it, because the contents are pure
+// value data with no additional data structures. Returns 0 on failure.
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// CHARACTER TO GLYPH-INDEX CONVERSIOn
+
+STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codepoint);
+// If you're going to perform multiple operations on the same character
+// and you want a speed-up, call this function with the character you're
+// going to process, then use glyph-based functions instead of the
+// codepoint-based functions.
+// Returns 0 if the character codepoint is not defined in the font.
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// CHARACTER PROPERTIES
+//
+
+STBTT_DEF float stbtt_ScaleForPixelHeight(const stbtt_fontinfo *info, float pixels);
+// computes a scale factor to produce a font whose "height" is 'pixels' tall.
+// Height is measured as the distance from the highest ascender to the lowest
+// descender; in other words, it's equivalent to calling stbtt_GetFontVMetrics
+// and computing:
+//       scale = pixels / (ascent - descent)
+// so if you prefer to measure height by the ascent only, use a similar calculation.
+
+STBTT_DEF float stbtt_ScaleForMappingEmToPixels(const stbtt_fontinfo *info, float pixels);
+// computes a scale factor to produce a font whose EM size is mapped to
+// 'pixels' tall. This is probably what traditional APIs compute, but
+// I'm not positive.
+
+STBTT_DEF void stbtt_GetFontVMetrics(const stbtt_fontinfo *info, int *ascent, int *descent, int *lineGap);
+// ascent is the coordinate above the baseline the font extends; descent
+// is the coordinate below the baseline the font extends (i.e. it is typically negative)
+// lineGap is the spacing between one row's descent and the next row's ascent...
+// so you should advance the vertical position by "*ascent - *descent + *lineGap"
+//   these are expressed in unscaled coordinates, so you must multiply by
+//   the scale factor for a given size
+
+STBTT_DEF int  stbtt_GetFontVMetricsOS2(const stbtt_fontinfo *info, int *typoAscent, int *typoDescent, int *typoLineGap);
+// analogous to GetFontVMetrics, but returns the "typographic" values from the OS/2
+// table (specific to MS/Windows TTF files).
+//
+// Returns 1 on success (table present), 0 on failure.
+
+STBTT_DEF void stbtt_GetFontBoundingBox(const stbtt_fontinfo *info, int *x0, int *y0, int *x1, int *y1);
+// the bounding box around all possible characters
+
+STBTT_DEF void stbtt_GetCodepointHMetrics(const stbtt_fontinfo *info, int codepoint, int *advanceWidth, int *leftSideBearing);
+// leftSideBearing is the offset from the current horizontal position to the left edge of the character
+// advanceWidth is the offset from the current horizontal position to the next horizontal position
+//   these are expressed in unscaled coordinates
+
+STBTT_DEF int  stbtt_GetCodepointKernAdvance(const stbtt_fontinfo *info, int ch1, int ch2);
+// an additional amount to add to the 'advance' value between ch1 and ch2
+
+STBTT_DEF int stbtt_GetCodepointBox(const stbtt_fontinfo *info, int codepoint, int *x0, int *y0, int *x1, int *y1);
+// Gets the bounding box of the visible part of the glyph, in unscaled coordinates
+
+STBTT_DEF void stbtt_GetGlyphHMetrics(const stbtt_fontinfo *info, int glyph_index, int *advanceWidth, int *leftSideBearing);
+STBTT_DEF int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2);
+STBTT_DEF int  stbtt_GetGlyphBox(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1);
+// as above, but takes one or more glyph indices for greater efficiency
+
+typedef struct stbtt_kerningentry
+{
+   int glyph1; // use stbtt_FindGlyphIndex
+   int glyph2;
+   int advance;
+} stbtt_kerningentry;
+
+STBTT_DEF int  stbtt_GetKerningTableLength(const stbtt_fontinfo *info);
+STBTT_DEF int  stbtt_GetKerningTable(const stbtt_fontinfo *info, stbtt_kerningentry* table, int table_length);
+// Retrieves a complete list of all of the kerning pairs provided by the font
+// stbtt_GetKerningTable never writes more than table_length entries and returns how many entries it did write.
+// The table will be sorted by (a.glyph1 == b.glyph1)?(a.glyph2 < b.glyph2):(a.glyph1 < b.glyph1)
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// GLYPH SHAPES (you probably don't need these, but they have to go before
+// the bitmaps for C declaration-order reasons)
+//
+
+#ifndef STBTT_vmove // you can predefine these to use different values (but why?)
+   enum {
+      STBTT_vmove=1,
+      STBTT_vline,
+      STBTT_vcurve,
+      STBTT_vcubic
+   };
+#endif
+
+#ifndef stbtt_vertex // you can predefine this to use different values
+                   // (we share this with other code at RAD)
+   #define stbtt_vertex_type short // can't use stbtt_int16 because that's not visible in the header file
+   typedef struct
+   {
+      stbtt_vertex_type x,y,cx,cy,cx1,cy1;
+      unsigned char type,padding;
+   } stbtt_vertex;
+#endif
+
+STBTT_DEF int stbtt_IsGlyphEmpty(const stbtt_fontinfo *info, int glyph_index);
+// returns non-zero if nothing is drawn for this glyph
+
+STBTT_DEF int stbtt_GetCodepointShape(const stbtt_fontinfo *info, int unicode_codepoint, stbtt_vertex **vertices);
+STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **vertices);
+// returns # of vertices and fills *vertices with the pointer to them
+//   these are expressed in "unscaled" coordinates
+//
+// The shape is a series of contours. Each one starts with
+// a STBTT_moveto, then consists of a series of mixed
+// STBTT_lineto and STBTT_curveto segments. A lineto
+// draws a line from previous endpoint to its x,y; a curveto
+// draws a quadratic bezier from previous endpoint to
+// its x,y, using cx,cy as the bezier control point.
+
+STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *vertices);
+// frees the data allocated above
+
+STBTT_DEF unsigned char *stbtt_FindSVGDoc(const stbtt_fontinfo *info, int gl);
+STBTT_DEF int stbtt_GetCodepointSVG(const stbtt_fontinfo *info, int unicode_codepoint, const char **svg);
+STBTT_DEF int stbtt_GetGlyphSVG(const stbtt_fontinfo *info, int gl, const char **svg);
+// fills svg with the character's SVG data.
+// returns data size or 0 if SVG not found.
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// BITMAP RENDERING
+//
+
+STBTT_DEF void stbtt_FreeBitmap(unsigned char *bitmap, void *userdata);
+// frees the bitmap allocated below
+
+STBTT_DEF unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int codepoint, int *width, int *height, int *xoff, int *yoff);
+// allocates a large-enough single-channel 8bpp bitmap and renders the
+// specified character/glyph at the specified scale into it, with
+// antialiasing. 0 is no coverage (transparent), 255 is fully covered (opaque).
+// *width & *height are filled out with the width & height of the bitmap,
+// which is stored left-to-right, top-to-bottom.
+//
+// xoff/yoff are the offset it pixel space from the glyph origin to the top-left of the bitmap
+
+STBTT_DEF unsigned char *stbtt_GetCodepointBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint, int *width, int *height, int *xoff, int *yoff);
+// the same as stbtt_GetCodepoitnBitmap, but you can specify a subpixel
+// shift for the character
+
+STBTT_DEF void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint);
+// the same as stbtt_GetCodepointBitmap, but you pass in storage for the bitmap
+// in the form of 'output', with row spacing of 'out_stride' bytes. the bitmap
+// is clipped to out_w/out_h bytes. Call stbtt_GetCodepointBitmapBox to get the
+// width and height and positioning info for it first.
+
+STBTT_DEF void stbtt_MakeCodepointBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint);
+// same as stbtt_MakeCodepointBitmap, but you can specify a subpixel
+// shift for the character
+
+STBTT_DEF void stbtt_MakeCodepointBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int oversample_x, int oversample_y, float *sub_x, float *sub_y, int codepoint);
+// same as stbtt_MakeCodepointBitmapSubpixel, but prefiltering
+// is performed (see stbtt_PackSetOversampling)
+
+STBTT_DEF void stbtt_GetCodepointBitmapBox(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1);
+// get the bbox of the bitmap centered around the glyph origin; so the
+// bitmap width is ix1-ix0, height is iy1-iy0, and location to place
+// the bitmap top left is (leftSideBearing*scale,iy0).
+// (Note that the bitmap uses y-increases-down, but the shape uses
+// y-increases-up, so CodepointBitmapBox and CodepointBox are inverted.)
+
+STBTT_DEF void stbtt_GetCodepointBitmapBoxSubpixel(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1);
+// same as stbtt_GetCodepointBitmapBox, but you can specify a subpixel
+// shift for the character
+
+// the following functions are equivalent to the above functions, but operate
+// on glyph indices instead of Unicode codepoints (for efficiency)
+STBTT_DEF unsigned char *stbtt_GetGlyphBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int glyph, int *width, int *height, int *xoff, int *yoff);
+STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int glyph, int *width, int *height, int *xoff, int *yoff);
+STBTT_DEF void stbtt_MakeGlyphBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int glyph);
+STBTT_DEF void stbtt_MakeGlyphBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int glyph);
+STBTT_DEF void stbtt_MakeGlyphBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int oversample_x, int oversample_y, float *sub_x, float *sub_y, int glyph);
+STBTT_DEF void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1);
+STBTT_DEF void stbtt_GetGlyphBitmapBoxSubpixel(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y,float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1);
+
+
+// @TODO: don't expose this structure
+typedef struct
+{
+   int w,h,stride;
+   unsigned char *pixels;
+} stbtt__bitmap;
+
+// rasterize a shape with quadratic beziers into a bitmap
+STBTT_DEF void stbtt_Rasterize(stbtt__bitmap *result,        // 1-channel bitmap to draw into
+                               float flatness_in_pixels,     // allowable error of curve in pixels
+                               stbtt_vertex *vertices,       // array of vertices defining shape
+                               int num_verts,                // number of vertices in above array
+                               float scale_x, float scale_y, // scale applied to input vertices
+                               float shift_x, float shift_y, // translation applied to input vertices
+                               int x_off, int y_off,         // another translation applied to input
+                               int invert,                   // if non-zero, vertically flip shape
+                               void *userdata);              // context for to STBTT_MALLOC
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Signed Distance Function (or Field) rendering
+
+STBTT_DEF void stbtt_FreeSDF(unsigned char *bitmap, void *userdata);
+// frees the SDF bitmap allocated below
+
+STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float scale, int glyph, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff);
+STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, float scale, int codepoint, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff);
+// These functions compute a discretized SDF field for a single character, suitable for storing
+// in a single-channel texture, sampling with bilinear filtering, and testing against
+// larger than some threshold to produce scalable fonts.
+//        info              --  the font
+//        scale             --  controls the size of the resulting SDF bitmap, same as it would be creating a regular bitmap
+//        glyph/codepoint   --  the character to generate the SDF for
+//        padding           --  extra "pixels" around the character which are filled with the distance to the character (not 0),
+//                                 which allows effects like bit outlines
+//        onedge_value      --  value 0-255 to test the SDF against to reconstruct the character (i.e. the isocontour of the character)
+//        pixel_dist_scale  --  what value the SDF should increase by when moving one SDF "pixel" away from the edge (on the 0..255 scale)
+//                                 if positive, > onedge_value is inside; if negative, < onedge_value is inside
+//        width,height      --  output height & width of the SDF bitmap (including padding)
+//        xoff,yoff         --  output origin of the character
+//        return value      --  a 2D array of bytes 0..255, width*height in size
+//
+// pixel_dist_scale & onedge_value are a scale & bias that allows you to make
+// optimal use of the limited 0..255 for your application, trading off precision
+// and special effects. SDF values outside the range 0..255 are clamped to 0..255.
+//
+// Example:
+//      scale = stbtt_ScaleForPixelHeight(22)
+//      padding = 5
+//      onedge_value = 180
+//      pixel_dist_scale = 180/5.0 = 36.0
+//
+//      This will create an SDF bitmap in which the character is about 22 pixels
+//      high but the whole bitmap is about 22+5+5=32 pixels high. To produce a filled
+//      shape, sample the SDF at each pixel and fill the pixel if the SDF value
+//      is greater than or equal to 180/255. (You'll actually want to antialias,
+//      which is beyond the scope of this example.) Additionally, you can compute
+//      offset outlines (e.g. to stroke the character border inside & outside,
+//      or only outside). For example, to fill outside the character up to 3 SDF
+//      pixels, you would compare against (180-36.0*3)/255 = 72/255. The above
+//      choice of variables maps a range from 5 pixels outside the shape to
+//      2 pixels inside the shape to 0..255; this is intended primarily for apply
+//      outside effects only (the interior range is needed to allow proper
+//      antialiasing of the font at *smaller* sizes)
+//
+// The function computes the SDF analytically at each SDF pixel, not by e.g.
+// building a higher-res bitmap and approximating it. In theory the quality
+// should be as high as possible for an SDF of this size & representation, but
+// unclear if this is true in practice (perhaps building a higher-res bitmap
+// and computing from that can allow drop-out prevention).
+//
+// The algorithm has not been optimized at all, so expect it to be slow
+// if computing lots of characters or very large sizes.
+
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Finding the right font...
+//
+// You should really just solve this offline, keep your own tables
+// of what font is what, and don't try to get it out of the .ttf file.
+// That's because getting it out of the .ttf file is really hard, because
+// the names in the file can appear in many possible encodings, in many
+// possible languages, and e.g. if you need a case-insensitive comparison,
+// the details of that depend on the encoding & language in a complex way
+// (actually underspecified in truetype, but also gigantic).
+//
+// But you can use the provided functions in two possible ways:
+//     stbtt_FindMatchingFont() will use *case-sensitive* comparisons on
+//             unicode-encoded names to try to find the font you want;
+//             you can run this before calling stbtt_InitFont()
+//
+//     stbtt_GetFontNameString() lets you get any of the various strings
+//             from the file yourself and do your own comparisons on them.
+//             You have to have called stbtt_InitFont() first.
+
+
+STBTT_DEF int stbtt_FindMatchingFont(const unsigned char *fontdata, const char *name, int flags);
+// returns the offset (not index) of the font that matches, or -1 if none
+//   if you use STBTT_MACSTYLE_DONTCARE, use a font name like "Arial Bold".
+//   if you use any other flag, use a font name like "Arial"; this checks
+//     the 'macStyle' header field; i don't know if fonts set this consistently
+#define STBTT_MACSTYLE_DONTCARE     0
+#define STBTT_MACSTYLE_BOLD         1
+#define STBTT_MACSTYLE_ITALIC       2
+#define STBTT_MACSTYLE_UNDERSCORE   4
+#define STBTT_MACSTYLE_NONE         8   // <= not same as 0, this makes us check the bitfield is 0
+
+STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const char *s2, int len2);
+// returns 1/0 whether the first string interpreted as utf8 is identical to
+// the second string interpreted as big-endian utf16... useful for strings from next func
+
+STBTT_DEF const char *stbtt_GetFontNameString(const stbtt_fontinfo *font, int *length, int platformID, int encodingID, int languageID, int nameID);
+// returns the string (which may be big-endian double byte, e.g. for unicode)
+// and puts the length in bytes in *length.
+//
+// some of the values for the IDs are below; for more see the truetype spec:
+//     http://developer.apple.com/textfonts/TTRefMan/RM06/Chap6name.html
+//     http://www.microsoft.com/typography/otspec/name.htm
+
+enum { // platformID
+   STBTT_PLATFORM_ID_UNICODE   =0,
+   STBTT_PLATFORM_ID_MAC       =1,
+   STBTT_PLATFORM_ID_ISO       =2,
+   STBTT_PLATFORM_ID_MICROSOFT =3
+};
+
+enum { // encodingID for STBTT_PLATFORM_ID_UNICODE
+   STBTT_UNICODE_EID_UNICODE_1_0    =0,
+   STBTT_UNICODE_EID_UNICODE_1_1    =1,
+   STBTT_UNICODE_EID_ISO_10646      =2,
+   STBTT_UNICODE_EID_UNICODE_2_0_BMP=3,
+   STBTT_UNICODE_EID_UNICODE_2_0_FULL=4
+};
+
+enum { // encodingID for STBTT_PLATFORM_ID_MICROSOFT
+   STBTT_MS_EID_SYMBOL        =0,
+   STBTT_MS_EID_UNICODE_BMP   =1,
+   STBTT_MS_EID_SHIFTJIS      =2,
+   STBTT_MS_EID_UNICODE_FULL  =10
+};
+
+enum { // encodingID for STBTT_PLATFORM_ID_MAC; same as Script Manager codes
+   STBTT_MAC_EID_ROMAN        =0,   STBTT_MAC_EID_ARABIC       =4,
+   STBTT_MAC_EID_JAPANESE     =1,   STBTT_MAC_EID_HEBREW       =5,
+   STBTT_MAC_EID_CHINESE_TRAD =2,   STBTT_MAC_EID_GREEK        =6,
+   STBTT_MAC_EID_KOREAN       =3,   STBTT_MAC_EID_RUSSIAN      =7
+};
+
+enum { // languageID for STBTT_PLATFORM_ID_MICROSOFT; same as LCID...
+       // problematic because there are e.g. 16 english LCIDs and 16 arabic LCIDs
+   STBTT_MS_LANG_ENGLISH     =0x0409,   STBTT_MS_LANG_ITALIAN     =0x0410,
+   STBTT_MS_LANG_CHINESE     =0x0804,   STBTT_MS_LANG_JAPANESE    =0x0411,
+   STBTT_MS_LANG_DUTCH       =0x0413,   STBTT_MS_LANG_KOREAN      =0x0412,
+   STBTT_MS_LANG_FRENCH      =0x040c,   STBTT_MS_LANG_RUSSIAN     =0x0419,
+   STBTT_MS_LANG_GERMAN      =0x0407,   STBTT_MS_LANG_SPANISH     =0x0409,
+   STBTT_MS_LANG_HEBREW      =0x040d,   STBTT_MS_LANG_SWEDISH     =0x041D
+};
+
+enum { // languageID for STBTT_PLATFORM_ID_MAC
+   STBTT_MAC_LANG_ENGLISH      =0 ,   STBTT_MAC_LANG_JAPANESE     =11,
+   STBTT_MAC_LANG_ARABIC       =12,   STBTT_MAC_LANG_KOREAN       =23,
+   STBTT_MAC_LANG_DUTCH        =4 ,   STBTT_MAC_LANG_RUSSIAN      =32,
+   STBTT_MAC_LANG_FRENCH       =1 ,   STBTT_MAC_LANG_SPANISH      =6 ,
+   STBTT_MAC_LANG_GERMAN       =2 ,   STBTT_MAC_LANG_SWEDISH      =5 ,
+   STBTT_MAC_LANG_HEBREW       =10,   STBTT_MAC_LANG_CHINESE_SIMPLIFIED =33,
+   STBTT_MAC_LANG_ITALIAN      =3 ,   STBTT_MAC_LANG_CHINESE_TRAD =19
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __STB_INCLUDE_STB_TRUETYPE_H__
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+////
+////   IMPLEMENTATION
+////
+////
+
+#ifdef STB_TRUETYPE_IMPLEMENTATION
+
+#ifndef STBTT_MAX_OVERSAMPLE
+#define STBTT_MAX_OVERSAMPLE   8
+#endif
+
+#if STBTT_MAX_OVERSAMPLE > 255
+#error "STBTT_MAX_OVERSAMPLE cannot be > 255"
+#endif
+
+typedef int stbtt__test_oversample_pow2[(STBTT_MAX_OVERSAMPLE & (STBTT_MAX_OVERSAMPLE-1)) == 0 ? 1 : -1];
+
+#ifndef STBTT_RASTERIZER_VERSION
+#define STBTT_RASTERIZER_VERSION 2
+#endif
+
+#ifdef _MSC_VER
+#define STBTT__NOTUSED(v)  (void)(v)
+#else
+#define STBTT__NOTUSED(v)  (void)sizeof(v)
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+//
+// stbtt__buf helpers to parse data from file
+//
+
+static stbtt_uint8 stbtt__buf_get8(stbtt__buf *b)
+{
+   if (b->cursor >= b->size)
+      return 0;
+   return b->data[b->cursor++];
+}
+
+static stbtt_uint8 stbtt__buf_peek8(stbtt__buf *b)
+{
+   if (b->cursor >= b->size)
+      return 0;
+   return b->data[b->cursor];
+}
+
+static void stbtt__buf_seek(stbtt__buf *b, int o)
+{
+   STBTT_assert(!(o > b->size || o < 0));
+   b->cursor = (o > b->size || o < 0) ? b->size : o;
+}
+
+static void stbtt__buf_skip(stbtt__buf *b, int o)
+{
+   stbtt__buf_seek(b, b->cursor + o);
+}
+
+static stbtt_uint32 stbtt__buf_get(stbtt__buf *b, int n)
+{
+   stbtt_uint32 v = 0;
+   int i;
+   STBTT_assert(n >= 1 && n <= 4);
+   for (i = 0; i < n; i++)
+      v = (v << 8) | stbtt__buf_get8(b);
+   return v;
+}
+
+static stbtt__buf stbtt__new_buf(const void *p, size_t size)
+{
+   stbtt__buf r;
+   STBTT_assert(size < 0x40000000);
+   r.data = (stbtt_uint8*) p;
+   r.size = (int) size;
+   r.cursor = 0;
+   return r;
+}
+
+#define stbtt__buf_get16(b)  stbtt__buf_get((b), 2)
+#define stbtt__buf_get32(b)  stbtt__buf_get((b), 4)
+
+static stbtt__buf stbtt__buf_range(const stbtt__buf *b, int o, int s)
+{
+   stbtt__buf r = stbtt__new_buf(NULL, 0);
+   if (o < 0 || s < 0 || o > b->size || s > b->size - o) return r;
+   r.data = b->data + o;
+   r.size = s;
+   return r;
+}
+
+static stbtt__buf stbtt__cff_get_index(stbtt__buf *b)
+{
+   int count, start, offsize;
+   start = b->cursor;
+   count = stbtt__buf_get16(b);
+   if (count) {
+      offsize = stbtt__buf_get8(b);
+      STBTT_assert(offsize >= 1 && offsize <= 4);
+      stbtt__buf_skip(b, offsize * count);
+      stbtt__buf_skip(b, stbtt__buf_get(b, offsize) - 1);
+   }
+   return stbtt__buf_range(b, start, b->cursor - start);
+}
+
+static stbtt_uint32 stbtt__cff_int(stbtt__buf *b)
+{
+   int b0 = stbtt__buf_get8(b);
+   if (b0 >= 32 && b0 <= 246)       return b0 - 139;
+   else if (b0 >= 247 && b0 <= 250) return (b0 - 247)*256 + stbtt__buf_get8(b) + 108;
+   else if (b0 >= 251 && b0 <= 254) return -(b0 - 251)*256 - stbtt__buf_get8(b) - 108;
+   else if (b0 == 28)               return stbtt__buf_get16(b);
+   else if (b0 == 29)               return stbtt__buf_get32(b);
+   STBTT_assert(0);
+   return 0;
+}
+
+static void stbtt__cff_skip_operand(stbtt__buf *b) {
+   int v, b0 = stbtt__buf_peek8(b);
+   STBTT_assert(b0 >= 28);
+   if (b0 == 30) {
+      stbtt__buf_skip(b, 1);
+      while (b->cursor < b->size) {
+         v = stbtt__buf_get8(b);
+         if ((v & 0xF) == 0xF || (v >> 4) == 0xF)
+            break;
+      }
+   } else {
+      stbtt__cff_int(b);
+   }
+}
+
+static stbtt__buf stbtt__dict_get(stbtt__buf *b, int key)
+{
+   stbtt__buf_seek(b, 0);
+   while (b->cursor < b->size) {
+      int start = b->cursor, end, op;
+      while (stbtt__buf_peek8(b) >= 28)
+         stbtt__cff_skip_operand(b);
+      end = b->cursor;
+      op = stbtt__buf_get8(b);
+      if (op == 12)  op = stbtt__buf_get8(b) | 0x100;
+      if (op == key) return stbtt__buf_range(b, start, end-start);
+   }
+   return stbtt__buf_range(b, 0, 0);
+}
+
+static void stbtt__dict_get_ints(stbtt__buf *b, int key, int outcount, stbtt_uint32 *out)
+{
+   int i;
+   stbtt__buf operands = stbtt__dict_get(b, key);
+   for (i = 0; i < outcount && operands.cursor < operands.size; i++)
+      out[i] = stbtt__cff_int(&operands);
+}
+
+static int stbtt__cff_index_count(stbtt__buf *b)
+{
+   stbtt__buf_seek(b, 0);
+   return stbtt__buf_get16(b);
+}
+
+static stbtt__buf stbtt__cff_index_get(stbtt__buf b, int i)
+{
+   int count, offsize, start, end;
+   stbtt__buf_seek(&b, 0);
+   count = stbtt__buf_get16(&b);
+   offsize = stbtt__buf_get8(&b);
+   STBTT_assert(i >= 0 && i < count);
+   STBTT_assert(offsize >= 1 && offsize <= 4);
+   stbtt__buf_skip(&b, i*offsize);
+   start = stbtt__buf_get(&b, offsize);
+   end = stbtt__buf_get(&b, offsize);
+   return stbtt__buf_range(&b, 2+(count+1)*offsize+start, end - start);
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+// accessors to parse data from file
+//
+
+// on platforms that don't allow misaligned reads, if we want to allow
+// truetype fonts that aren't padded to alignment, define ALLOW_UNALIGNED_TRUETYPE
+
+#define ttBYTE(p)     (* (stbtt_uint8 *) (p))
+#define ttCHAR(p)     (* (stbtt_int8 *) (p))
+#define ttFixed(p)    ttLONG(p)
+
+static stbtt_uint16 ttUSHORT(stbtt_uint8 *p) { return p[0]*256 + p[1]; }
+static stbtt_int16 ttSHORT(stbtt_uint8 *p)   { return p[0]*256 + p[1]; }
+static stbtt_uint32 ttULONG(stbtt_uint8 *p)  { return (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; }
+static stbtt_int32 ttLONG(stbtt_uint8 *p)    { return (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; }
+
+#define stbtt_tag4(p,c0,c1,c2,c3) ((p)[0] == (c0) && (p)[1] == (c1) && (p)[2] == (c2) && (p)[3] == (c3))
+#define stbtt_tag(p,str)           stbtt_tag4(p,str[0],str[1],str[2],str[3])
+
+static int stbtt__isfont(stbtt_uint8 *font)
+{
+   // check the version number
+   if (stbtt_tag4(font, '1',0,0,0))  return 1; // TrueType 1
+   if (stbtt_tag(font, "typ1"))   return 1; // TrueType with type 1 font -- we don't support this!
+   if (stbtt_tag(font, "OTTO"))   return 1; // OpenType with CFF
+   if (stbtt_tag4(font, 0,1,0,0)) return 1; // OpenType 1.0
+   if (stbtt_tag(font, "true"))   return 1; // Apple specification for TrueType fonts
+   return 0;
+}
+
+// @OPTIMIZE: binary search
+static stbtt_uint32 stbtt__find_table(stbtt_uint8 *data, stbtt_uint32 fontstart, const char *tag)
+{
+   stbtt_int32 num_tables = ttUSHORT(data+fontstart+4);
+   stbtt_uint32 tabledir = fontstart + 12;
+   stbtt_int32 i;
+   for (i=0; i < num_tables; ++i) {
+      stbtt_uint32 loc = tabledir + 16*i;
+      if (stbtt_tag(data+loc+0, tag))
+         return ttULONG(data+loc+8);
+   }
+   return 0;
+}
+
+static int stbtt_GetFontOffsetForIndex_internal(unsigned char *font_collection, int index)
+{
+   // if it's just a font, there's only one valid index
+   if (stbtt__isfont(font_collection))
+      return index == 0 ? 0 : -1;
+
+   // check if it's a TTC
+   if (stbtt_tag(font_collection, "ttcf")) {
+      // version 1?
+      if (ttULONG(font_collection+4) == 0x00010000 || ttULONG(font_collection+4) == 0x00020000) {
+         stbtt_int32 n = ttLONG(font_collection+8);
+         if (index >= n)
+            return -1;
+         return ttULONG(font_collection+12+index*4);
+      }
+   }
+   return -1;
+}
+
+static int stbtt_GetNumberOfFonts_internal(unsigned char *font_collection)
+{
+   // if it's just a font, there's only one valid font
+   if (stbtt__isfont(font_collection))
+      return 1;
+
+   // check if it's a TTC
+   if (stbtt_tag(font_collection, "ttcf")) {
+      // version 1?
+      if (ttULONG(font_collection+4) == 0x00010000 || ttULONG(font_collection+4) == 0x00020000) {
+         return ttLONG(font_collection+8);
+      }
+   }
+   return 0;
+}
+
+static stbtt__buf stbtt__get_subrs(stbtt__buf cff, stbtt__buf fontdict)
+{
+   stbtt_uint32 subrsoff = 0, private_loc[2] = { 0, 0 };
+   stbtt__buf pdict;
+   stbtt__dict_get_ints(&fontdict, 18, 2, private_loc);
+   if (!private_loc[1] || !private_loc[0]) return stbtt__new_buf(NULL, 0);
+   pdict = stbtt__buf_range(&cff, private_loc[1], private_loc[0]);
+   stbtt__dict_get_ints(&pdict, 19, 1, &subrsoff);
+   if (!subrsoff) return stbtt__new_buf(NULL, 0);
+   stbtt__buf_seek(&cff, private_loc[1]+subrsoff);
+   return stbtt__cff_get_index(&cff);
+}
+
+// since most people won't use this, find this table the first time it's needed
+static int stbtt__get_svg(stbtt_fontinfo *info)
+{
+   stbtt_uint32 t;
+   if (info->svg < 0) {
+      t = stbtt__find_table(info->data, info->fontstart, "SVG ");
+      if (t) {
+         stbtt_uint32 offset = ttULONG(info->data + t + 2);
+         info->svg = t + offset;
+      } else {
+         info->svg = 0;
+      }
+   }
+   return info->svg;
+}
+
+static int stbtt_InitFont_internal(stbtt_fontinfo *info, unsigned char *data, int fontstart)
+{
+   stbtt_uint32 cmap, t;
+   stbtt_int32 i,numTables;
+
+   info->data = data;
+   info->fontstart = fontstart;
+   info->cff = stbtt__new_buf(NULL, 0);
+
+   cmap = stbtt__find_table(data, fontstart, "cmap");       // required
+   info->loca = stbtt__find_table(data, fontstart, "loca"); // required
+   info->head = stbtt__find_table(data, fontstart, "head"); // required
+   info->glyf = stbtt__find_table(data, fontstart, "glyf"); // required
+   info->hhea = stbtt__find_table(data, fontstart, "hhea"); // required
+   info->hmtx = stbtt__find_table(data, fontstart, "hmtx"); // required
+   info->kern = stbtt__find_table(data, fontstart, "kern"); // not required
+   info->gpos = stbtt__find_table(data, fontstart, "GPOS"); // not required
+
+   if (!cmap || !info->head || !info->hhea || !info->hmtx)
+      return 0;
+   if (info->glyf) {
+      // required for truetype
+      if (!info->loca) return 0;
+   } else {
+      // initialization for CFF / Type2 fonts (OTF)
+      stbtt__buf b, topdict, topdictidx;
+      stbtt_uint32 cstype = 2, charstrings = 0, fdarrayoff = 0, fdselectoff = 0;
+      stbtt_uint32 cff;
+
+      cff = stbtt__find_table(data, fontstart, "CFF ");
+      if (!cff) return 0;
+
+      info->fontdicts = stbtt__new_buf(NULL, 0);
+      info->fdselect = stbtt__new_buf(NULL, 0);
+
+      // @TODO this should use size from table (not 512MB)
+      info->cff = stbtt__new_buf(data+cff, 512*1024*1024);
+      b = info->cff;
+
+      // read the header
+      stbtt__buf_skip(&b, 2);
+      stbtt__buf_seek(&b, stbtt__buf_get8(&b)); // hdrsize
+
+      // @TODO the name INDEX could list multiple fonts,
+      // but we just use the first one.
+      stbtt__cff_get_index(&b);  // name INDEX
+      topdictidx = stbtt__cff_get_index(&b);
+      topdict = stbtt__cff_index_get(topdictidx, 0);
+      stbtt__cff_get_index(&b);  // string INDEX
+      info->gsubrs = stbtt__cff_get_index(&b);
+
+      stbtt__dict_get_ints(&topdict, 17, 1, &charstrings);
+      stbtt__dict_get_ints(&topdict, 0x100 | 6, 1, &cstype);
+      stbtt__dict_get_ints(&topdict, 0x100 | 36, 1, &fdarrayoff);
+      stbtt__dict_get_ints(&topdict, 0x100 | 37, 1, &fdselectoff);
+      info->subrs = stbtt__get_subrs(b, topdict);
+
+      // we only support Type 2 charstrings
+      if (cstype != 2) return 0;
+      if (charstrings == 0) return 0;
+
+      if (fdarrayoff) {
+         // looks like a CID font
+         if (!fdselectoff) return 0;
+         stbtt__buf_seek(&b, fdarrayoff);
+         info->fontdicts = stbtt__cff_get_index(&b);
+         info->fdselect = stbtt__buf_range(&b, fdselectoff, b.size-fdselectoff);
+      }
+
+      stbtt__buf_seek(&b, charstrings);
+      info->charstrings = stbtt__cff_get_index(&b);
+   }
+
+   t = stbtt__find_table(data, fontstart, "maxp");
+   if (t)
+      info->numGlyphs = ttUSHORT(data+t+4);
+   else
+      info->numGlyphs = 0xffff;
+
+   info->svg = -1;
+
+   // find a cmap encoding table we understand *now* to avoid searching
+   // later. (todo: could make this installable)
+   // the same regardless of glyph.
+   numTables = ttUSHORT(data + cmap + 2);
+   info->index_map = 0;
+   for (i=0; i < numTables; ++i) {
+      stbtt_uint32 encoding_record = cmap + 4 + 8 * i;
+      // find an encoding we understand:
+      switch(ttUSHORT(data+encoding_record)) {
+         case STBTT_PLATFORM_ID_MICROSOFT:
+            switch (ttUSHORT(data+encoding_record+2)) {
+               case STBTT_MS_EID_UNICODE_BMP:
+               case STBTT_MS_EID_UNICODE_FULL:
+                  // MS/Unicode
+                  info->index_map = cmap + ttULONG(data+encoding_record+4);
+                  break;
+            }
+            break;
+        case STBTT_PLATFORM_ID_UNICODE:
+            // Mac/iOS has these
+            // all the encodingIDs are unicode, so we don't bother to check it
+            info->index_map = cmap + ttULONG(data+encoding_record+4);
+            break;
+      }
+   }
+   if (info->index_map == 0)
+      return 0;
+
+   info->indexToLocFormat = ttUSHORT(data+info->head + 50);
+   return 1;
+}
+
+STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codepoint)
+{
+   stbtt_uint8 *data = info->data;
+   stbtt_uint32 index_map = info->index_map;
+
+   stbtt_uint16 format = ttUSHORT(data + index_map + 0);
+   if (format == 0) { // apple byte encoding
+      stbtt_int32 bytes = ttUSHORT(data + index_map + 2);
+      if (unicode_codepoint < bytes-6)
+         return ttBYTE(data + index_map + 6 + unicode_codepoint);
+      return 0;
+   } else if (format == 6) {
+      stbtt_uint32 first = ttUSHORT(data + index_map + 6);
+      stbtt_uint32 count = ttUSHORT(data + index_map + 8);
+      if ((stbtt_uint32) unicode_codepoint >= first && (stbtt_uint32) unicode_codepoint < first+count)
+         return ttUSHORT(data + index_map + 10 + (unicode_codepoint - first)*2);
+      return 0;
+   } else if (format == 2) {
+      STBTT_assert(0); // @TODO: high-byte mapping for japanese/chinese/korean
+      return 0;
+   } else if (format == 4) { // standard mapping for windows fonts: binary search collection of ranges
+      stbtt_uint16 segcount = ttUSHORT(data+index_map+6) >> 1;
+      stbtt_uint16 searchRange = ttUSHORT(data+index_map+8) >> 1;
+      stbtt_uint16 entrySelector = ttUSHORT(data+index_map+10);
+      stbtt_uint16 rangeShift = ttUSHORT(data+index_map+12) >> 1;
+
+      // do a binary search of the segments
+      stbtt_uint32 endCount = index_map + 14;
+      stbtt_uint32 search = endCount;
+
+      if (unicode_codepoint > 0xffff)
+         return 0;
+
+      // they lie from endCount .. endCount + segCount
+      // but searchRange is the nearest power of two, so...
+      if (unicode_codepoint >= ttUSHORT(data + search + rangeShift*2))
+         search += rangeShift*2;
+
+      // now decrement to bias correctly to find smallest
+      search -= 2;
+      while (entrySelector) {
+         stbtt_uint16 end;
+         searchRange >>= 1;
+         end = ttUSHORT(data + search + searchRange*2);
+         if (unicode_codepoint > end)
+            search += searchRange*2;
+         --entrySelector;
+      }
+      search += 2;
+
+      {
+         stbtt_uint16 offset, start, last;
+         stbtt_uint16 item = (stbtt_uint16) ((search - endCount) >> 1);
+
+         start = ttUSHORT(data + index_map + 14 + segcount*2 + 2 + 2*item);
+         last = ttUSHORT(data + endCount + 2*item);
+         if (unicode_codepoint < start || unicode_codepoint > last)
+            return 0;
+
+         offset = ttUSHORT(data + index_map + 14 + segcount*6 + 2 + 2*item);
+         if (offset == 0)
+            return (stbtt_uint16) (unicode_codepoint + ttSHORT(data + index_map + 14 + segcount*4 + 2 + 2*item));
+
+         return ttUSHORT(data + offset + (unicode_codepoint-start)*2 + index_map + 14 + segcount*6 + 2 + 2*item);
+      }
+   } else if (format == 12 || format == 13) {
+      stbtt_uint32 ngroups = ttULONG(data+index_map+12);
+      stbtt_int32 low,high;
+      low = 0; high = (stbtt_int32)ngroups;
+      // Binary search the right group.
+      while (low < high) {
+         stbtt_int32 mid = low + ((high-low) >> 1); // rounds down, so low <= mid < high
+         stbtt_uint32 start_char = ttULONG(data+index_map+16+mid*12);
+         stbtt_uint32 end_char = ttULONG(data+index_map+16+mid*12+4);
+         if ((stbtt_uint32) unicode_codepoint < start_char)
+            high = mid;
+         else if ((stbtt_uint32) unicode_codepoint > end_char)
+            low = mid+1;
+         else {
+            stbtt_uint32 start_glyph = ttULONG(data+index_map+16+mid*12+8);
+            if (format == 12)
+               return start_glyph + unicode_codepoint-start_char;
+            else // format == 13
+               return start_glyph;
+         }
+      }
+      return 0; // not found
+   }
+   // @TODO
+   STBTT_assert(0);
+   return 0;
+}
+
+STBTT_DEF int stbtt_GetCodepointShape(const stbtt_fontinfo *info, int unicode_codepoint, stbtt_vertex **vertices)
+{
+   return stbtt_GetGlyphShape(info, stbtt_FindGlyphIndex(info, unicode_codepoint), vertices);
+}
+
+static void stbtt_setvertex(stbtt_vertex *v, stbtt_uint8 type, stbtt_int32 x, stbtt_int32 y, stbtt_int32 cx, stbtt_int32 cy)
+{
+   v->type = type;
+   v->x = (stbtt_int16) x;
+   v->y = (stbtt_int16) y;
+   v->cx = (stbtt_int16) cx;
+   v->cy = (stbtt_int16) cy;
+}
+
+static int stbtt__GetGlyfOffset(const stbtt_fontinfo *info, int glyph_index)
+{
+   int g1,g2;
+
+   STBTT_assert(!info->cff.size);
+
+   if (glyph_index >= info->numGlyphs) return -1; // glyph index out of range
+   if (info->indexToLocFormat >= 2)    return -1; // unknown index->glyph map format
+
+   if (info->indexToLocFormat == 0) {
+      g1 = info->glyf + ttUSHORT(info->data + info->loca + glyph_index * 2) * 2;
+      g2 = info->glyf + ttUSHORT(info->data + info->loca + glyph_index * 2 + 2) * 2;
+   } else {
+      g1 = info->glyf + ttULONG (info->data + info->loca + glyph_index * 4);
+      g2 = info->glyf + ttULONG (info->data + info->loca + glyph_index * 4 + 4);
+   }
+
+   return g1==g2 ? -1 : g1; // if length is 0, return -1
+}
+
+static int stbtt__GetGlyphInfoT2(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1);
+
+STBTT_DEF int stbtt_GetGlyphBox(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1)
+{
+   if (info->cff.size) {
+      stbtt__GetGlyphInfoT2(info, glyph_index, x0, y0, x1, y1);
+   } else {
+      int g = stbtt__GetGlyfOffset(info, glyph_index);
+      if (g < 0) return 0;
+
+      if (x0) *x0 = ttSHORT(info->data + g + 2);
+      if (y0) *y0 = ttSHORT(info->data + g + 4);
+      if (x1) *x1 = ttSHORT(info->data + g + 6);
+      if (y1) *y1 = ttSHORT(info->data + g + 8);
+   }
+   return 1;
+}
+
+STBTT_DEF int stbtt_GetCodepointBox(const stbtt_fontinfo *info, int codepoint, int *x0, int *y0, int *x1, int *y1)
+{
+   return stbtt_GetGlyphBox(info, stbtt_FindGlyphIndex(info,codepoint), x0,y0,x1,y1);
+}
+
+STBTT_DEF int stbtt_IsGlyphEmpty(const stbtt_fontinfo *info, int glyph_index)
+{
+   stbtt_int16 numberOfContours;
+   int g;
+   if (info->cff.size)
+      return stbtt__GetGlyphInfoT2(info, glyph_index, NULL, NULL, NULL, NULL) == 0;
+   g = stbtt__GetGlyfOffset(info, glyph_index);
+   if (g < 0) return 1;
+   numberOfContours = ttSHORT(info->data + g);
+   return numberOfContours == 0;
+}
+
+static int stbtt__close_shape(stbtt_vertex *vertices, int num_vertices, int was_off, int start_off,
+    stbtt_int32 sx, stbtt_int32 sy, stbtt_int32 scx, stbtt_int32 scy, stbtt_int32 cx, stbtt_int32 cy)
+{
+   if (start_off) {
+      if (was_off)
+         stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, (cx+scx)>>1, (cy+scy)>>1, cx,cy);
+      stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, sx,sy,scx,scy);
+   } else {
+      if (was_off)
+         stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve,sx,sy,cx,cy);
+      else
+         stbtt_setvertex(&vertices[num_vertices++], STBTT_vline,sx,sy,0,0);
+   }
+   return num_vertices;
+}
+
+static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **pvertices)
+{
+   stbtt_int16 numberOfContours;
+   stbtt_uint8 *endPtsOfContours;
+   stbtt_uint8 *data = info->data;
+   stbtt_vertex *vertices=0;
+   int num_vertices=0;
+   int g = stbtt__GetGlyfOffset(info, glyph_index);
+
+   *pvertices = NULL;
+
+   if (g < 0) return 0;
+
+   numberOfContours = ttSHORT(data + g);
+
+   if (numberOfContours > 0) {
+      stbtt_uint8 flags=0,flagcount;
+      stbtt_int32 ins, i,j=0,m,n, next_move, was_off=0, off, start_off=0;
+      stbtt_int32 x,y,cx,cy,sx,sy, scx,scy;
+      stbtt_uint8 *points;
+      endPtsOfContours = (data + g + 10);
+      ins = ttUSHORT(data + g + 10 + numberOfContours * 2);
+      points = data + g + 10 + numberOfContours * 2 + 2 + ins;
+
+      n = 1+ttUSHORT(endPtsOfContours + numberOfContours*2-2);
+
+      m = n + 2*numberOfContours;  // a loose bound on how many vertices we might need
+      vertices = (stbtt_vertex *) STBTT_malloc(m * sizeof(vertices[0]), info->userdata);
+      if (vertices == 0)
+         return 0;
+
+      next_move = 0;
+      flagcount=0;
+
+      // in first pass, we load uninterpreted data into the allocated array
+      // above, shifted to the end of the array so we won't overwrite it when
+      // we create our final data starting from the front
+
+      off = m - n; // starting offset for uninterpreted data, regardless of how m ends up being calculated
+
+      // first load flags
+
+      for (i=0; i < n; ++i) {
+         if (flagcount == 0) {
+            flags = *points++;
+            if (flags & 8)
+               flagcount = *points++;
+         } else
+            --flagcount;
+         vertices[off+i].type = flags;
+      }
+
+      // now load x coordinates
+      x=0;
+      for (i=0; i < n; ++i) {
+         flags = vertices[off+i].type;
+         if (flags & 2) {
+            stbtt_int16 dx = *points++;
+            x += (flags & 16) ? dx : -dx; // ???
+         } else {
+            if (!(flags & 16)) {
+               x = x + (stbtt_int16) (points[0]*256 + points[1]);
+               points += 2;
+            }
+         }
+         vertices[off+i].x = (stbtt_int16) x;
+      }
+
+      // now load y coordinates
+      y=0;
+      for (i=0; i < n; ++i) {
+         flags = vertices[off+i].type;
+         if (flags & 4) {
+            stbtt_int16 dy = *points++;
+            y += (flags & 32) ? dy : -dy; // ???
+         } else {
+            if (!(flags & 32)) {
+               y = y + (stbtt_int16) (points[0]*256 + points[1]);
+               points += 2;
+            }
+         }
+         vertices[off+i].y = (stbtt_int16) y;
+      }
+
+      // now convert them to our format
+      num_vertices=0;
+      sx = sy = cx = cy = scx = scy = 0;
+      for (i=0; i < n; ++i) {
+         flags = vertices[off+i].type;
+         x     = (stbtt_int16) vertices[off+i].x;
+         y     = (stbtt_int16) vertices[off+i].y;
+
+         if (next_move == i) {
+            if (i != 0)
+               num_vertices = stbtt__close_shape(vertices, num_vertices, was_off, start_off, sx,sy,scx,scy,cx,cy);
+
+            // now start the new one
+            start_off = !(flags & 1);
+            if (start_off) {
+               // if we start off with an off-curve point, then when we need to find a point on the curve
+               // where we can start, and we need to save some state for when we wraparound.
+               scx = x;
+               scy = y;
+               if (!(vertices[off+i+1].type & 1)) {
+                  // next point is also a curve point, so interpolate an on-point curve
+                  sx = (x + (stbtt_int32) vertices[off+i+1].x) >> 1;
+                  sy = (y + (stbtt_int32) vertices[off+i+1].y) >> 1;
+               } else {
+                  // otherwise just use the next point as our start point
+                  sx = (stbtt_int32) vertices[off+i+1].x;
+                  sy = (stbtt_int32) vertices[off+i+1].y;
+                  ++i; // we're using point i+1 as the starting point, so skip it
+               }
+            } else {
+               sx = x;
+               sy = y;
+            }
+            stbtt_setvertex(&vertices[num_vertices++], STBTT_vmove,sx,sy,0,0);
+            was_off = 0;
+            next_move = 1 + ttUSHORT(endPtsOfContours+j*2);
+            ++j;
+         } else {
+            if (!(flags & 1)) { // if it's a curve
+               if (was_off) // two off-curve control points in a row means interpolate an on-curve midpoint
+                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, (cx+x)>>1, (cy+y)>>1, cx, cy);
+               cx = x;
+               cy = y;
+               was_off = 1;
+            } else {
+               if (was_off)
+                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, x,y, cx, cy);
+               else
+                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vline, x,y,0,0);
+               was_off = 0;
+            }
+         }
+      }
+      num_vertices = stbtt__close_shape(vertices, num_vertices, was_off, start_off, sx,sy,scx,scy,cx,cy);
+   } else if (numberOfContours < 0) {
+      // Compound shapes.
+      int more = 1;
+      stbtt_uint8 *comp = data + g + 10;
+      num_vertices = 0;
+      vertices = 0;
+      while (more) {
+         stbtt_uint16 flags, gidx;
+         int comp_num_verts = 0, i;
+         stbtt_vertex *comp_verts = 0, *tmp = 0;
+         float mtx[6] = {1,0,0,1,0,0}, m, n;
+
+         flags = ttSHORT(comp); comp+=2;
+         gidx = ttSHORT(comp); comp+=2;
+
+         if (flags & 2) { // XY values
+            if (flags & 1) { // shorts
+               mtx[4] = ttSHORT(comp); comp+=2;
+               mtx[5] = ttSHORT(comp); comp+=2;
+            } else {
+               mtx[4] = ttCHAR(comp); comp+=1;
+               mtx[5] = ttCHAR(comp); comp+=1;
+            }
+         }
+         else {
+            // @TODO handle matching point
+            STBTT_assert(0);
+         }
+         if (flags & (1<<3)) { // WE_HAVE_A_SCALE
+            mtx[0] = mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
+            mtx[1] = mtx[2] = 0;
+         } else if (flags & (1<<6)) { // WE_HAVE_AN_X_AND_YSCALE
+            mtx[0] = ttSHORT(comp)/16384.0f; comp+=2;
+            mtx[1] = mtx[2] = 0;
+            mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
+         } else if (flags & (1<<7)) { // WE_HAVE_A_TWO_BY_TWO
+            mtx[0] = ttSHORT(comp)/16384.0f; comp+=2;
+            mtx[1] = ttSHORT(comp)/16384.0f; comp+=2;
+            mtx[2] = ttSHORT(comp)/16384.0f; comp+=2;
+            mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
+         }
+
+         // Find transformation scales.
+         m = (float) STBTT_sqrt(mtx[0]*mtx[0] + mtx[1]*mtx[1]);
+         n = (float) STBTT_sqrt(mtx[2]*mtx[2] + mtx[3]*mtx[3]);
+
+         // Get indexed glyph.
+         comp_num_verts = stbtt_GetGlyphShape(info, gidx, &comp_verts);
+         if (comp_num_verts > 0) {
+            // Transform vertices.
+            for (i = 0; i < comp_num_verts; ++i) {
+               stbtt_vertex* v = &comp_verts[i];
+               stbtt_vertex_type x,y;
+               x=v->x; y=v->y;
+               v->x = (stbtt_vertex_type)(m * (mtx[0]*x + mtx[2]*y + mtx[4]));
+               v->y = (stbtt_vertex_type)(n * (mtx[1]*x + mtx[3]*y + mtx[5]));
+               x=v->cx; y=v->cy;
+               v->cx = (stbtt_vertex_type)(m * (mtx[0]*x + mtx[2]*y + mtx[4]));
+               v->cy = (stbtt_vertex_type)(n * (mtx[1]*x + mtx[3]*y + mtx[5]));
+            }
+            // Append vertices.
+            tmp = (stbtt_vertex*)STBTT_malloc((num_vertices+comp_num_verts)*sizeof(stbtt_vertex), info->userdata);
+            if (!tmp) {
+               if (vertices) STBTT_free(vertices, info->userdata);
+               if (comp_verts) STBTT_free(comp_verts, info->userdata);
+               return 0;
+            }
+            if (num_vertices > 0 && vertices) STBTT_memcpy(tmp, vertices, num_vertices*sizeof(stbtt_vertex));
+            STBTT_memcpy(tmp+num_vertices, comp_verts, comp_num_verts*sizeof(stbtt_vertex));
+            if (vertices) STBTT_free(vertices, info->userdata);
+            vertices = tmp;
+            STBTT_free(comp_verts, info->userdata);
+            num_vertices += comp_num_verts;
+         }
+         // More components ?
+         more = flags & (1<<5);
+      }
+   } else {
+      // numberOfCounters == 0, do nothing
+   }
+
+   *pvertices = vertices;
+   return num_vertices;
+}
+
+typedef struct
+{
+   int bounds;
+   int started;
+   float first_x, first_y;
+   float x, y;
+   stbtt_int32 min_x, max_x, min_y, max_y;
+
+   stbtt_vertex *pvertices;
+   int num_vertices;
+} stbtt__csctx;
+
+#define STBTT__CSCTX_INIT(bounds) {bounds,0, 0,0, 0,0, 0,0,0,0, NULL, 0}
+
+static void stbtt__track_vertex(stbtt__csctx *c, stbtt_int32 x, stbtt_int32 y)
+{
+   if (x > c->max_x || !c->started) c->max_x = x;
+   if (y > c->max_y || !c->started) c->max_y = y;
+   if (x < c->min_x || !c->started) c->min_x = x;
+   if (y < c->min_y || !c->started) c->min_y = y;
+   c->started = 1;
+}
+
+static void stbtt__csctx_v(stbtt__csctx *c, stbtt_uint8 type, stbtt_int32 x, stbtt_int32 y, stbtt_int32 cx, stbtt_int32 cy, stbtt_int32 cx1, stbtt_int32 cy1)
+{
+   if (c->bounds) {
+      stbtt__track_vertex(c, x, y);
+      if (type == STBTT_vcubic) {
+         stbtt__track_vertex(c, cx, cy);
+         stbtt__track_vertex(c, cx1, cy1);
+      }
+   } else {
+      stbtt_setvertex(&c->pvertices[c->num_vertices], type, x, y, cx, cy);
+      c->pvertices[c->num_vertices].cx1 = (stbtt_int16) cx1;
+      c->pvertices[c->num_vertices].cy1 = (stbtt_int16) cy1;
+   }
+   c->num_vertices++;
+}
+
+static void stbtt__csctx_close_shape(stbtt__csctx *ctx)
+{
+   if (ctx->first_x != ctx->x || ctx->first_y != ctx->y)
+      stbtt__csctx_v(ctx, STBTT_vline, (int)ctx->first_x, (int)ctx->first_y, 0, 0, 0, 0);
+}
+
+static void stbtt__csctx_rmove_to(stbtt__csctx *ctx, float dx, float dy)
+{
+   stbtt__csctx_close_shape(ctx);
+   ctx->first_x = ctx->x = ctx->x + dx;
+   ctx->first_y = ctx->y = ctx->y + dy;
+   stbtt__csctx_v(ctx, STBTT_vmove, (int)ctx->x, (int)ctx->y, 0, 0, 0, 0);
+}
+
+static void stbtt__csctx_rline_to(stbtt__csctx *ctx, float dx, float dy)
+{
+   ctx->x += dx;
+   ctx->y += dy;
+   stbtt__csctx_v(ctx, STBTT_vline, (int)ctx->x, (int)ctx->y, 0, 0, 0, 0);
+}
+
+static void stbtt__csctx_rccurve_to(stbtt__csctx *ctx, float dx1, float dy1, float dx2, float dy2, float dx3, float dy3)
+{
+   float cx1 = ctx->x + dx1;
+   float cy1 = ctx->y + dy1;
+   float cx2 = cx1 + dx2;
+   float cy2 = cy1 + dy2;
+   ctx->x = cx2 + dx3;
+   ctx->y = cy2 + dy3;
+   stbtt__csctx_v(ctx, STBTT_vcubic, (int)ctx->x, (int)ctx->y, (int)cx1, (int)cy1, (int)cx2, (int)cy2);
+}
+
+static stbtt__buf stbtt__get_subr(stbtt__buf idx, int n)
+{
+   int count = stbtt__cff_index_count(&idx);
+   int bias = 107;
+   if (count >= 33900)
+      bias = 32768;
+   else if (count >= 1240)
+      bias = 1131;
+   n += bias;
+   if (n < 0 || n >= count)
+      return stbtt__new_buf(NULL, 0);
+   return stbtt__cff_index_get(idx, n);
+}
+
+static stbtt__buf stbtt__cid_get_glyph_subrs(const stbtt_fontinfo *info, int glyph_index)
+{
+   stbtt__buf fdselect = info->fdselect;
+   int nranges, start, end, v, fmt, fdselector = -1, i;
+
+   stbtt__buf_seek(&fdselect, 0);
+   fmt = stbtt__buf_get8(&fdselect);
+   if (fmt == 0) {
+      // untested
+      stbtt__buf_skip(&fdselect, glyph_index);
+      fdselector = stbtt__buf_get8(&fdselect);
+   } else if (fmt == 3) {
+      nranges = stbtt__buf_get16(&fdselect);
+      start = stbtt__buf_get16(&fdselect);
+      for (i = 0; i < nranges; i++) {
+         v = stbtt__buf_get8(&fdselect);
+         end = stbtt__buf_get16(&fdselect);
+         if (glyph_index >= start && glyph_index < end) {
+            fdselector = v;
+            break;
+         }
+         start = end;
+      }
+   }
+   if (fdselector == -1) stbtt__new_buf(NULL, 0);
+   return stbtt__get_subrs(info->cff, stbtt__cff_index_get(info->fontdicts, fdselector));
+}
+
+static int stbtt__run_charstring(const stbtt_fontinfo *info, int glyph_index, stbtt__csctx *c)
+{
+   int in_header = 1, maskbits = 0, subr_stack_height = 0, sp = 0, v, i, b0;
+   int has_subrs = 0, clear_stack;
+   float s[48];
+   stbtt__buf subr_stack[10], subrs = info->subrs, b;
+   float f;
+
+#define STBTT__CSERR(s) (0)
+
+   // this currently ignores the initial width value, which isn't needed if we have hmtx
+   b = stbtt__cff_index_get(info->charstrings, glyph_index);
+   while (b.cursor < b.size) {
+      i = 0;
+      clear_stack = 1;
+      b0 = stbtt__buf_get8(&b);
+      switch (b0) {
+      // @TODO implement hinting
+      case 0x13: // hintmask
+      case 0x14: // cntrmask
+         if (in_header)
+            maskbits += (sp / 2); // implicit "vstem"
+         in_header = 0;
+         stbtt__buf_skip(&b, (maskbits + 7) / 8);
+         break;
+
+      case 0x01: // hstem
+      case 0x03: // vstem
+      case 0x12: // hstemhm
+      case 0x17: // vstemhm
+         maskbits += (sp / 2);
+         break;
+
+      case 0x15: // rmoveto
+         in_header = 0;
+         if (sp < 2) return STBTT__CSERR("rmoveto stack");
+         stbtt__csctx_rmove_to(c, s[sp-2], s[sp-1]);
+         break;
+      case 0x04: // vmoveto
+         in_header = 0;
+         if (sp < 1) return STBTT__CSERR("vmoveto stack");
+         stbtt__csctx_rmove_to(c, 0, s[sp-1]);
+         break;
+      case 0x16: // hmoveto
+         in_header = 0;
+         if (sp < 1) return STBTT__CSERR("hmoveto stack");
+         stbtt__csctx_rmove_to(c, s[sp-1], 0);
+         break;
+
+      case 0x05: // rlineto
+         if (sp < 2) return STBTT__CSERR("rlineto stack");
+         for (; i + 1 < sp; i += 2)
+            stbtt__csctx_rline_to(c, s[i], s[i+1]);
+         break;
+
+      // hlineto/vlineto and vhcurveto/hvcurveto alternate horizontal and vertical
+      // starting from a different place.
+
+      case 0x07: // vlineto
+         if (sp < 1) return STBTT__CSERR("vlineto stack");
+         goto vlineto;
+      case 0x06: // hlineto
+         if (sp < 1) return STBTT__CSERR("hlineto stack");
+         for (;;) {
+            if (i >= sp) break;
+            stbtt__csctx_rline_to(c, s[i], 0);
+            i++;
+      vlineto:
+            if (i >= sp) break;
+            stbtt__csctx_rline_to(c, 0, s[i]);
+            i++;
+         }
+         break;
+
+      case 0x1F: // hvcurveto
+         if (sp < 4) return STBTT__CSERR("hvcurveto stack");
+         goto hvcurveto;
+      case 0x1E: // vhcurveto
+         if (sp < 4) return STBTT__CSERR("vhcurveto stack");
+         for (;;) {
+            if (i + 3 >= sp) break;
+            stbtt__csctx_rccurve_to(c, 0, s[i], s[i+1], s[i+2], s[i+3], (sp - i == 5) ? s[i + 4] : 0.0f);
+            i += 4;
+      hvcurveto:
+            if (i + 3 >= sp) break;
+            stbtt__csctx_rccurve_to(c, s[i], 0, s[i+1], s[i+2], (sp - i == 5) ? s[i+4] : 0.0f, s[i+3]);
+            i += 4;
+         }
+         break;
+
+      case 0x08: // rrcurveto
+         if (sp < 6) return STBTT__CSERR("rcurveline stack");
+         for (; i + 5 < sp; i += 6)
+            stbtt__csctx_rccurve_to(c, s[i], s[i+1], s[i+2], s[i+3], s[i+4], s[i+5]);
+         break;
+
+      case 0x18: // rcurveline
+         if (sp < 8) return STBTT__CSERR("rcurveline stack");
+         for (; i + 5 < sp - 2; i += 6)
+            stbtt__csctx_rccurve_to(c, s[i], s[i+1], s[i+2], s[i+3], s[i+4], s[i+5]);
+         if (i + 1 >= sp) return STBTT__CSERR("rcurveline stack");
+         stbtt__csctx_rline_to(c, s[i], s[i+1]);
+         break;
+
+      case 0x19: // rlinecurve
+         if (sp < 8) return STBTT__CSERR("rlinecurve stack");
+         for (; i + 1 < sp - 6; i += 2)
+            stbtt__csctx_rline_to(c, s[i], s[i+1]);
+         if (i + 5 >= sp) return STBTT__CSERR("rlinecurve stack");
+         stbtt__csctx_rccurve_to(c, s[i], s[i+1], s[i+2], s[i+3], s[i+4], s[i+5]);
+         break;
+
+      case 0x1A: // vvcurveto
+      case 0x1B: // hhcurveto
+         if (sp < 4) return STBTT__CSERR("(vv|hh)curveto stack");
+         f = 0.0;
+         if (sp & 1) { f = s[i]; i++; }
+         for (; i + 3 < sp; i += 4) {
+            if (b0 == 0x1B)
+               stbtt__csctx_rccurve_to(c, s[i], f, s[i+1], s[i+2], s[i+3], 0.0);
+            else
+               stbtt__csctx_rccurve_to(c, f, s[i], s[i+1], s[i+2], 0.0, s[i+3]);
+            f = 0.0;
+         }
+         break;
+
+      case 0x0A: // callsubr
+         if (!has_subrs) {
+            if (info->fdselect.size)
+               subrs = stbtt__cid_get_glyph_subrs(info, glyph_index);
+            has_subrs = 1;
+         }
+         // FALLTHROUGH
+      case 0x1D: // callgsubr
+         if (sp < 1) return STBTT__CSERR("call(g|)subr stack");
+         v = (int) s[--sp];
+         if (subr_stack_height >= 10) return STBTT__CSERR("recursion limit");
+         subr_stack[subr_stack_height++] = b;
+         b = stbtt__get_subr(b0 == 0x0A ? subrs : info->gsubrs, v);
+         if (b.size == 0) return STBTT__CSERR("subr not found");
+         b.cursor = 0;
+         clear_stack = 0;
+         break;
+
+      case 0x0B: // return
+         if (subr_stack_height <= 0) return STBTT__CSERR("return outside subr");
+         b = subr_stack[--subr_stack_height];
+         clear_stack = 0;
+         break;
+
+      case 0x0E: // endchar
+         stbtt__csctx_close_shape(c);
+         return 1;
+
+      case 0x0C: { // two-byte escape
+         float dx1, dx2, dx3, dx4, dx5, dx6, dy1, dy2, dy3, dy4, dy5, dy6;
+         float dx, dy;
+         int b1 = stbtt__buf_get8(&b);
+         switch (b1) {
+         // @TODO These "flex" implementations ignore the flex-depth and resolution,
+         // and always draw beziers.
+         case 0x22: // hflex
+            if (sp < 7) return STBTT__CSERR("hflex stack");
+            dx1 = s[0];
+            dx2 = s[1];
+            dy2 = s[2];
+            dx3 = s[3];
+            dx4 = s[4];
+            dx5 = s[5];
+            dx6 = s[6];
+            stbtt__csctx_rccurve_to(c, dx1, 0, dx2, dy2, dx3, 0);
+            stbtt__csctx_rccurve_to(c, dx4, 0, dx5, -dy2, dx6, 0);
+            break;
+
+         case 0x23: // flex
+            if (sp < 13) return STBTT__CSERR("flex stack");
+            dx1 = s[0];
+            dy1 = s[1];
+            dx2 = s[2];
+            dy2 = s[3];
+            dx3 = s[4];
+            dy3 = s[5];
+            dx4 = s[6];
+            dy4 = s[7];
+            dx5 = s[8];
+            dy5 = s[9];
+            dx6 = s[10];
+            dy6 = s[11];
+            //fd is s[12]
+            stbtt__csctx_rccurve_to(c, dx1, dy1, dx2, dy2, dx3, dy3);
+            stbtt__csctx_rccurve_to(c, dx4, dy4, dx5, dy5, dx6, dy6);
+            break;
+
+         case 0x24: // hflex1
+            if (sp < 9) return STBTT__CSERR("hflex1 stack");
+            dx1 = s[0];
+            dy1 = s[1];
+            dx2 = s[2];
+            dy2 = s[3];
+            dx3 = s[4];
+            dx4 = s[5];
+            dx5 = s[6];
+            dy5 = s[7];
+            dx6 = s[8];
+            stbtt__csctx_rccurve_to(c, dx1, dy1, dx2, dy2, dx3, 0);
+            stbtt__csctx_rccurve_to(c, dx4, 0, dx5, dy5, dx6, -(dy1+dy2+dy5));
+            break;
+
+         case 0x25: // flex1
+            if (sp < 11) return STBTT__CSERR("flex1 stack");
+            dx1 = s[0];
+            dy1 = s[1];
+            dx2 = s[2];
+            dy2 = s[3];
+            dx3 = s[4];
+            dy3 = s[5];
+            dx4 = s[6];
+            dy4 = s[7];
+            dx5 = s[8];
+            dy5 = s[9];
+            dx6 = dy6 = s[10];
+            dx = dx1+dx2+dx3+dx4+dx5;
+            dy = dy1+dy2+dy3+dy4+dy5;
+            if (STBTT_fabs(dx) > STBTT_fabs(dy))
+               dy6 = -dy;
+            else
+               dx6 = -dx;
+            stbtt__csctx_rccurve_to(c, dx1, dy1, dx2, dy2, dx3, dy3);
+            stbtt__csctx_rccurve_to(c, dx4, dy4, dx5, dy5, dx6, dy6);
+            break;
+
+         default:
+            return STBTT__CSERR("unimplemented");
+         }
+      } break;
+
+      default:
+         if (b0 != 255 && b0 != 28 && b0 < 32)
+            return STBTT__CSERR("reserved operator");
+
+         // push immediate
+         if (b0 == 255) {
+            f = (float)(stbtt_int32)stbtt__buf_get32(&b) / 0x10000;
+         } else {
+            stbtt__buf_skip(&b, -1);
+            f = (float)(stbtt_int16)stbtt__cff_int(&b);
+         }
+         if (sp >= 48) return STBTT__CSERR("push stack overflow");
+         s[sp++] = f;
+         clear_stack = 0;
+         break;
+      }
+      if (clear_stack) sp = 0;
+   }
+   return STBTT__CSERR("no endchar");
+
+#undef STBTT__CSERR
+}
+
+static int stbtt__GetGlyphShapeT2(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **pvertices)
+{
+   // runs the charstring twice, once to count and once to output (to avoid realloc)
+   stbtt__csctx count_ctx = STBTT__CSCTX_INIT(1);
+   stbtt__csctx output_ctx = STBTT__CSCTX_INIT(0);
+   if (stbtt__run_charstring(info, glyph_index, &count_ctx)) {
+      *pvertices = (stbtt_vertex*)STBTT_malloc(count_ctx.num_vertices*sizeof(stbtt_vertex), info->userdata);
+      output_ctx.pvertices = *pvertices;
+      if (stbtt__run_charstring(info, glyph_index, &output_ctx)) {
+         STBTT_assert(output_ctx.num_vertices == count_ctx.num_vertices);
+         return output_ctx.num_vertices;
+      }
+   }
+   *pvertices = NULL;
+   return 0;
+}
+
+static int stbtt__GetGlyphInfoT2(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1)
+{
+   stbtt__csctx c = STBTT__CSCTX_INIT(1);
+   int r = stbtt__run_charstring(info, glyph_index, &c);
+   if (x0)  *x0 = r ? c.min_x : 0;
+   if (y0)  *y0 = r ? c.min_y : 0;
+   if (x1)  *x1 = r ? c.max_x : 0;
+   if (y1)  *y1 = r ? c.max_y : 0;
+   return r ? c.num_vertices : 0;
+}
+
+STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **pvertices)
+{
+   if (!info->cff.size)
+      return stbtt__GetGlyphShapeTT(info, glyph_index, pvertices);
+   else
+      return stbtt__GetGlyphShapeT2(info, glyph_index, pvertices);
+}
+
+STBTT_DEF void stbtt_GetGlyphHMetrics(const stbtt_fontinfo *info, int glyph_index, int *advanceWidth, int *leftSideBearing)
+{
+   stbtt_uint16 numOfLongHorMetrics = ttUSHORT(info->data+info->hhea + 34);
+   if (glyph_index < numOfLongHorMetrics) {
+      if (advanceWidth)     *advanceWidth    = ttSHORT(info->data + info->hmtx + 4*glyph_index);
+      if (leftSideBearing)  *leftSideBearing = ttSHORT(info->data + info->hmtx + 4*glyph_index + 2);
+   } else {
+      if (advanceWidth)     *advanceWidth    = ttSHORT(info->data + info->hmtx + 4*(numOfLongHorMetrics-1));
+      if (leftSideBearing)  *leftSideBearing = ttSHORT(info->data + info->hmtx + 4*numOfLongHorMetrics + 2*(glyph_index - numOfLongHorMetrics));
+   }
+}
+
+STBTT_DEF int  stbtt_GetKerningTableLength(const stbtt_fontinfo *info)
+{
+   stbtt_uint8 *data = info->data + info->kern;
+
+   // we only look at the first table. it must be 'horizontal' and format 0.
+   if (!info->kern)
+      return 0;
+   if (ttUSHORT(data+2) < 1) // number of tables, need at least 1
+      return 0;
+   if (ttUSHORT(data+8) != 1) // horizontal flag must be set in format
+      return 0;
+
+   return ttUSHORT(data+10);
+}
+
+STBTT_DEF int stbtt_GetKerningTable(const stbtt_fontinfo *info, stbtt_kerningentry* table, int table_length)
+{
+   stbtt_uint8 *data = info->data + info->kern;
+   int k, length;
+
+   // we only look at the first table. it must be 'horizontal' and format 0.
+   if (!info->kern)
+      return 0;
+   if (ttUSHORT(data+2) < 1) // number of tables, need at least 1
+      return 0;
+   if (ttUSHORT(data+8) != 1) // horizontal flag must be set in format
+      return 0;
+
+   length = ttUSHORT(data+10);
+   if (table_length < length)
+      length = table_length;
+
+   for (k = 0; k < length; k++)
+   {
+      table[k].glyph1 = ttUSHORT(data+18+(k*6));
+      table[k].glyph2 = ttUSHORT(data+20+(k*6));
+      table[k].advance = ttSHORT(data+22+(k*6));
+   }
+
+   return length;
+}
+
+static int stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2)
+{
+   stbtt_uint8 *data = info->data + info->kern;
+   stbtt_uint32 needle, straw;
+   int l, r, m;
+
+   // we only look at the first table. it must be 'horizontal' and format 0.
+   if (!info->kern)
+      return 0;
+   if (ttUSHORT(data+2) < 1) // number of tables, need at least 1
+      return 0;
+   if (ttUSHORT(data+8) != 1) // horizontal flag must be set in format
+      return 0;
+
+   l = 0;
+   r = ttUSHORT(data+10) - 1;
+   needle = glyph1 << 16 | glyph2;
+   while (l <= r) {
+      m = (l + r) >> 1;
+      straw = ttULONG(data+18+(m*6)); // note: unaligned read
+      if (needle < straw)
+         r = m - 1;
+      else if (needle > straw)
+         l = m + 1;
+      else
+         return ttSHORT(data+22+(m*6));
+   }
+   return 0;
+}
+
+static stbtt_int32 stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyph)
+{
+   stbtt_uint16 coverageFormat = ttUSHORT(coverageTable);
+   switch (coverageFormat) {
+      case 1: {
+         stbtt_uint16 glyphCount = ttUSHORT(coverageTable + 2);
+
+         // Binary search.
+         stbtt_int32 l=0, r=glyphCount-1, m;
+         int straw, needle=glyph;
+         while (l <= r) {
+            stbtt_uint8 *glyphArray = coverageTable + 4;
+            stbtt_uint16 glyphID;
+            m = (l + r) >> 1;
+            glyphID = ttUSHORT(glyphArray + 2 * m);
+            straw = glyphID;
+            if (needle < straw)
+               r = m - 1;
+            else if (needle > straw)
+               l = m + 1;
+            else {
+               return m;
+            }
+         }
+         break;
+      }
+
+      case 2: {
+         stbtt_uint16 rangeCount = ttUSHORT(coverageTable + 2);
+         stbtt_uint8 *rangeArray = coverageTable + 4;
+
+         // Binary search.
+         stbtt_int32 l=0, r=rangeCount-1, m;
+         int strawStart, strawEnd, needle=glyph;
+         while (l <= r) {
+            stbtt_uint8 *rangeRecord;
+            m = (l + r) >> 1;
+            rangeRecord = rangeArray + 6 * m;
+            strawStart = ttUSHORT(rangeRecord);
+            strawEnd = ttUSHORT(rangeRecord + 2);
+            if (needle < strawStart)
+               r = m - 1;
+            else if (needle > strawEnd)
+               l = m + 1;
+            else {
+               stbtt_uint16 startCoverageIndex = ttUSHORT(rangeRecord + 4);
+               return startCoverageIndex + glyph - strawStart;
+            }
+         }
+         break;
+      }
+
+      default: return -1; // unsupported
+   }
+
+   return -1;
+}
+
+static stbtt_int32  stbtt__GetGlyphClass(stbtt_uint8 *classDefTable, int glyph)
+{
+   stbtt_uint16 classDefFormat = ttUSHORT(classDefTable);
+   switch (classDefFormat)
+   {
+      case 1: {
+         stbtt_uint16 startGlyphID = ttUSHORT(classDefTable + 2);
+         stbtt_uint16 glyphCount = ttUSHORT(classDefTable + 4);
+         stbtt_uint8 *classDef1ValueArray = classDefTable + 6;
+
+         if (glyph >= startGlyphID && glyph < startGlyphID + glyphCount)
+            return (stbtt_int32)ttUSHORT(classDef1ValueArray + 2 * (glyph - startGlyphID));
+         break;
+      }
+
+      case 2: {
+         stbtt_uint16 classRangeCount = ttUSHORT(classDefTable + 2);
+         stbtt_uint8 *classRangeRecords = classDefTable + 4;
+
+         // Binary search.
+         stbtt_int32 l=0, r=classRangeCount-1, m;
+         int strawStart, strawEnd, needle=glyph;
+         while (l <= r) {
+            stbtt_uint8 *classRangeRecord;
+            m = (l + r) >> 1;
+            classRangeRecord = classRangeRecords + 6 * m;
+            strawStart = ttUSHORT(classRangeRecord);
+            strawEnd = ttUSHORT(classRangeRecord + 2);
+            if (needle < strawStart)
+               r = m - 1;
+            else if (needle > strawEnd)
+               l = m + 1;
+            else
+               return (stbtt_int32)ttUSHORT(classRangeRecord + 4);
+         }
+         break;
+      }
+
+      default:
+         return -1; // Unsupported definition type, return an error.
+   }
+
+   // "All glyphs not assigned to a class fall into class 0". (OpenType spec)
+   return 0;
+}
+
+// Define to STBTT_assert(x) if you want to break on unimplemented formats.
+#define STBTT_GPOS_TODO_assert(x)
+
+static stbtt_int32 stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2)
+{
+   stbtt_uint16 lookupListOffset;
+   stbtt_uint8 *lookupList;
+   stbtt_uint16 lookupCount;
+   stbtt_uint8 *data;
+   stbtt_int32 i, sti;
+
+   if (!info->gpos) return 0;
+
+   data = info->data + info->gpos;
+
+   if (ttUSHORT(data+0) != 1) return 0; // Major version 1
+   if (ttUSHORT(data+2) != 0) return 0; // Minor version 0
+
+   lookupListOffset = ttUSHORT(data+8);
+   lookupList = data + lookupListOffset;
+   lookupCount = ttUSHORT(lookupList);
+
+   for (i=0; i<lookupCount; ++i) {
+      stbtt_uint16 lookupOffset = ttUSHORT(lookupList + 2 + 2 * i);
+      stbtt_uint8 *lookupTable = lookupList + lookupOffset;
+
+      stbtt_uint16 lookupType = ttUSHORT(lookupTable);
+      stbtt_uint16 subTableCount = ttUSHORT(lookupTable + 4);
+      stbtt_uint8 *subTableOffsets = lookupTable + 6;
+      if (lookupType != 2) // Pair Adjustment Positioning Subtable
+         continue;
+
+      for (sti=0; sti<subTableCount; sti++) {
+         stbtt_uint16 subtableOffset = ttUSHORT(subTableOffsets + 2 * sti);
+         stbtt_uint8 *table = lookupTable + subtableOffset;
+         stbtt_uint16 posFormat = ttUSHORT(table);
+         stbtt_uint16 coverageOffset = ttUSHORT(table + 2);
+         stbtt_int32 coverageIndex = stbtt__GetCoverageIndex(table + coverageOffset, glyph1);
+         if (coverageIndex == -1) continue;
+
+         switch (posFormat) {
+            case 1: {
+               stbtt_int32 l, r, m;
+               int straw, needle;
+               stbtt_uint16 valueFormat1 = ttUSHORT(table + 4);
+               stbtt_uint16 valueFormat2 = ttUSHORT(table + 6);
+               if (valueFormat1 == 4 && valueFormat2 == 0) { // Support more formats?
+                  stbtt_int32 valueRecordPairSizeInBytes = 2;
+                  stbtt_uint16 pairSetCount = ttUSHORT(table + 8);
+                  stbtt_uint16 pairPosOffset = ttUSHORT(table + 10 + 2 * coverageIndex);
+                  stbtt_uint8 *pairValueTable = table + pairPosOffset;
+                  stbtt_uint16 pairValueCount = ttUSHORT(pairValueTable);
+                  stbtt_uint8 *pairValueArray = pairValueTable + 2;
+
+                  if (coverageIndex >= pairSetCount) return 0;
+
+                  needle=glyph2;
+                  r=pairValueCount-1;
+                  l=0;
+
+                  // Binary search.
+                  while (l <= r) {
+                     stbtt_uint16 secondGlyph;
+                     stbtt_uint8 *pairValue;
+                     m = (l + r) >> 1;
+                     pairValue = pairValueArray + (2 + valueRecordPairSizeInBytes) * m;
+                     secondGlyph = ttUSHORT(pairValue);
+                     straw = secondGlyph;
+                     if (needle < straw)
+                        r = m - 1;
+                     else if (needle > straw)
+                        l = m + 1;
+                     else {
+                        stbtt_int16 xAdvance = ttSHORT(pairValue + 2);
+                        return xAdvance;
+                     }
+                  }
+               } else
+                  return 0;
+               break;
+            }
+
+            case 2: {
+               stbtt_uint16 valueFormat1 = ttUSHORT(table + 4);
+               stbtt_uint16 valueFormat2 = ttUSHORT(table + 6);
+               if (valueFormat1 == 4 && valueFormat2 == 0) { // Support more formats?
+                  stbtt_uint16 classDef1Offset = ttUSHORT(table + 8);
+                  stbtt_uint16 classDef2Offset = ttUSHORT(table + 10);
+                  int glyph1class = stbtt__GetGlyphClass(table + classDef1Offset, glyph1);
+                  int glyph2class = stbtt__GetGlyphClass(table + classDef2Offset, glyph2);
+
+                  stbtt_uint16 class1Count = ttUSHORT(table + 12);
+                  stbtt_uint16 class2Count = ttUSHORT(table + 14);
+                  stbtt_uint8 *class1Records, *class2Records;
+                  stbtt_int16 xAdvance;
+
+                  if (glyph1class < 0 || glyph1class >= class1Count) return 0; // malformed
+                  if (glyph2class < 0 || glyph2class >= class2Count) return 0; // malformed
+
+                  class1Records = table + 16;
+                  class2Records = class1Records + 2 * (glyph1class * class2Count);
+                  xAdvance = ttSHORT(class2Records + 2 * glyph2class);
+                  return xAdvance;
+               } else
+                  return 0;
+               break;
+            }
+
+            default:
+               return 0; // Unsupported position format
+         }
+      }
+   }
+
+   return 0;
+}
+
+STBTT_DEF int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int g1, int g2)
+{
+   int xAdvance = 0;
+
+   if (info->gpos)
+      xAdvance += stbtt__GetGlyphGPOSInfoAdvance(info, g1, g2);
+   else if (info->kern)
+      xAdvance += stbtt__GetGlyphKernInfoAdvance(info, g1, g2);
+
+   return xAdvance;
+}
+
+STBTT_DEF int  stbtt_GetCodepointKernAdvance(const stbtt_fontinfo *info, int ch1, int ch2)
+{
+   if (!info->kern && !info->gpos) // if no kerning table, don't waste time looking up both codepoint->glyphs
+      return 0;
+   return stbtt_GetGlyphKernAdvance(info, stbtt_FindGlyphIndex(info,ch1), stbtt_FindGlyphIndex(info,ch2));
+}
+
+STBTT_DEF void stbtt_GetCodepointHMetrics(const stbtt_fontinfo *info, int codepoint, int *advanceWidth, int *leftSideBearing)
+{
+   stbtt_GetGlyphHMetrics(info, stbtt_FindGlyphIndex(info,codepoint), advanceWidth, leftSideBearing);
+}
+
+STBTT_DEF void stbtt_GetFontVMetrics(const stbtt_fontinfo *info, int *ascent, int *descent, int *lineGap)
+{
+   if (ascent ) *ascent  = ttSHORT(info->data+info->hhea + 4);
+   if (descent) *descent = ttSHORT(info->data+info->hhea + 6);
+   if (lineGap) *lineGap = ttSHORT(info->data+info->hhea + 8);
+}
+
+STBTT_DEF int  stbtt_GetFontVMetricsOS2(const stbtt_fontinfo *info, int *typoAscent, int *typoDescent, int *typoLineGap)
+{
+   int tab = stbtt__find_table(info->data, info->fontstart, "OS/2");
+   if (!tab)
+      return 0;
+   if (typoAscent ) *typoAscent  = ttSHORT(info->data+tab + 68);
+   if (typoDescent) *typoDescent = ttSHORT(info->data+tab + 70);
+   if (typoLineGap) *typoLineGap = ttSHORT(info->data+tab + 72);
+   return 1;
+}
+
+STBTT_DEF void stbtt_GetFontBoundingBox(const stbtt_fontinfo *info, int *x0, int *y0, int *x1, int *y1)
+{
+   *x0 = ttSHORT(info->data + info->head + 36);
+   *y0 = ttSHORT(info->data + info->head + 38);
+   *x1 = ttSHORT(info->data + info->head + 40);
+   *y1 = ttSHORT(info->data + info->head + 42);
+}
+
+STBTT_DEF float stbtt_ScaleForPixelHeight(const stbtt_fontinfo *info, float height)
+{
+   int fheight = ttSHORT(info->data + info->hhea + 4) - ttSHORT(info->data + info->hhea + 6);
+   return (float) height / fheight;
+}
+
+STBTT_DEF float stbtt_ScaleForMappingEmToPixels(const stbtt_fontinfo *info, float pixels)
+{
+   int unitsPerEm = ttUSHORT(info->data + info->head + 18);
+   return pixels / unitsPerEm;
+}
+
+STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *v)
+{
+   STBTT_free(v, info->userdata);
+}
+
+STBTT_DEF stbtt_uint8 *stbtt_FindSVGDoc(const stbtt_fontinfo *info, int gl)
+{
+   int i;
+   stbtt_uint8 *data = info->data;
+   stbtt_uint8 *svg_doc_list = data + stbtt__get_svg((stbtt_fontinfo *) info);
+
+   int numEntries = ttUSHORT(svg_doc_list);
+   stbtt_uint8 *svg_docs = svg_doc_list + 2;
+
+   for(i=0; i<numEntries; i++) {
+      stbtt_uint8 *svg_doc = svg_docs + (12 * i);
+      if ((gl >= ttUSHORT(svg_doc)) && (gl <= ttUSHORT(svg_doc + 2)))
+         return svg_doc;
+   }
+   return 0;
+}
+
+STBTT_DEF int stbtt_GetGlyphSVG(const stbtt_fontinfo *info, int gl, const char **svg)
+{
+   stbtt_uint8 *data = info->data;
+   stbtt_uint8 *svg_doc;
+
+   if (info->svg == 0)
+      return 0;
+
+   svg_doc = stbtt_FindSVGDoc(info, gl);
+   if (svg_doc != NULL) {
+      *svg = (char *) data + info->svg + ttULONG(svg_doc + 4);
+      return ttULONG(svg_doc + 8);
+   } else {
+      return 0;
+   }
+}
+
+STBTT_DEF int stbtt_GetCodepointSVG(const stbtt_fontinfo *info, int unicode_codepoint, const char **svg)
+{
+   return stbtt_GetGlyphSVG(info, stbtt_FindGlyphIndex(info, unicode_codepoint), svg);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// antialiasing software rasterizer
+//
+
+STBTT_DEF void stbtt_GetGlyphBitmapBoxSubpixel(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y,float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1)
+{
+   int x0=0,y0=0,x1,y1; // =0 suppresses compiler warning
+   if (!stbtt_GetGlyphBox(font, glyph, &x0,&y0,&x1,&y1)) {
+      // e.g. space character
+      if (ix0) *ix0 = 0;
+      if (iy0) *iy0 = 0;
+      if (ix1) *ix1 = 0;
+      if (iy1) *iy1 = 0;
+   } else {
+      // move to integral bboxes (treating pixels as little squares, what pixels get touched)?
+      if (ix0) *ix0 = STBTT_ifloor( x0 * scale_x + shift_x);
+      if (iy0) *iy0 = STBTT_ifloor(-y1 * scale_y + shift_y);
+      if (ix1) *ix1 = STBTT_iceil ( x1 * scale_x + shift_x);
+      if (iy1) *iy1 = STBTT_iceil (-y0 * scale_y + shift_y);
+   }
+}
+
+STBTT_DEF void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1)
+{
+   stbtt_GetGlyphBitmapBoxSubpixel(font, glyph, scale_x, scale_y,0.0f,0.0f, ix0, iy0, ix1, iy1);
+}
+
+STBTT_DEF void stbtt_GetCodepointBitmapBoxSubpixel(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1)
+{
+   stbtt_GetGlyphBitmapBoxSubpixel(font, stbtt_FindGlyphIndex(font,codepoint), scale_x, scale_y,shift_x,shift_y, ix0,iy0,ix1,iy1);
+}
+
+STBTT_DEF void stbtt_GetCodepointBitmapBox(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1)
+{
+   stbtt_GetCodepointBitmapBoxSubpixel(font, codepoint, scale_x, scale_y,0.0f,0.0f, ix0,iy0,ix1,iy1);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Rasterizer
+
+typedef struct stbtt__hheap_chunk
+{
+   struct stbtt__hheap_chunk *next;
+} stbtt__hheap_chunk;
+
+typedef struct stbtt__hheap
+{
+   struct stbtt__hheap_chunk *head;
+   void   *first_free;
+   int    num_remaining_in_head_chunk;
+} stbtt__hheap;
+
+static void *stbtt__hheap_alloc(stbtt__hheap *hh, size_t size, void *userdata)
+{
+   if (hh->first_free) {
+      void *p = hh->first_free;
+      hh->first_free = * (void **) p;
+      return p;
+   } else {
+      if (hh->num_remaining_in_head_chunk == 0) {
+         int count = (size < 32 ? 2000 : size < 128 ? 800 : 100);
+         stbtt__hheap_chunk *c = (stbtt__hheap_chunk *) STBTT_malloc(sizeof(stbtt__hheap_chunk) + size * count, userdata);
+         if (c == NULL)
+            return NULL;
+         c->next = hh->head;
+         hh->head = c;
+         hh->num_remaining_in_head_chunk = count;
+      }
+      --hh->num_remaining_in_head_chunk;
+      return (char *) (hh->head) + sizeof(stbtt__hheap_chunk) + size * hh->num_remaining_in_head_chunk;
+   }
+}
+
+static void stbtt__hheap_free(stbtt__hheap *hh, void *p)
+{
+   *(void **) p = hh->first_free;
+   hh->first_free = p;
+}
+
+static void stbtt__hheap_cleanup(stbtt__hheap *hh, void *userdata)
+{
+   stbtt__hheap_chunk *c = hh->head;
+   while (c) {
+      stbtt__hheap_chunk *n = c->next;
+      STBTT_free(c, userdata);
+      c = n;
+   }
+}
+
+typedef struct stbtt__edge {
+   float x0,y0, x1,y1;
+   int invert;
+} stbtt__edge;
+
+
+typedef struct stbtt__active_edge
+{
+   struct stbtt__active_edge *next;
+   #if STBTT_RASTERIZER_VERSION==1
+   int x,dx;
+   float ey;
+   int direction;
+   #elif STBTT_RASTERIZER_VERSION==2
+   float fx,fdx,fdy;
+   float direction;
+   float sy;
+   float ey;
+   #else
+   #error "Unrecognized value of STBTT_RASTERIZER_VERSION"
+   #endif
+} stbtt__active_edge;
+
+#if STBTT_RASTERIZER_VERSION == 1
+#define STBTT_FIXSHIFT   10
+#define STBTT_FIX        (1 << STBTT_FIXSHIFT)
+#define STBTT_FIXMASK    (STBTT_FIX-1)
+
+static stbtt__active_edge *stbtt__new_active(stbtt__hheap *hh, stbtt__edge *e, int off_x, float start_point, void *userdata)
+{
+   stbtt__active_edge *z = (stbtt__active_edge *) stbtt__hheap_alloc(hh, sizeof(*z), userdata);
+   float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0);
+   STBTT_assert(z != NULL);
+   if (!z) return z;
+
+   // round dx down to avoid overshooting
+   if (dxdy < 0)
+      z->dx = -STBTT_ifloor(STBTT_FIX * -dxdy);
+   else
+      z->dx = STBTT_ifloor(STBTT_FIX * dxdy);
+
+   z->x = STBTT_ifloor(STBTT_FIX * e->x0 + z->dx * (start_point - e->y0)); // use z->dx so when we offset later it's by the same amount
+   z->x -= off_x * STBTT_FIX;
+
+   z->ey = e->y1;
+   z->next = 0;
+   z->direction = e->invert ? 1 : -1;
+   return z;
+}
+#elif STBTT_RASTERIZER_VERSION == 2
+static stbtt__active_edge *stbtt__new_active(stbtt__hheap *hh, stbtt__edge *e, int off_x, float start_point, void *userdata)
+{
+   stbtt__active_edge *z = (stbtt__active_edge *) stbtt__hheap_alloc(hh, sizeof(*z), userdata);
+   float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0);
+   STBTT_assert(z != NULL);
+   //STBTT_assert(e->y0 <= start_point);
+   if (!z) return z;
+   z->fdx = dxdy;
+   z->fdy = dxdy != 0.0f ? (1.0f/dxdy) : 0.0f;
+   z->fx = e->x0 + dxdy * (start_point - e->y0);
+   z->fx -= off_x;
+   z->direction = e->invert ? 1.0f : -1.0f;
+   z->sy = e->y0;
+   z->ey = e->y1;
+   z->next = 0;
+   return z;
+}
+#else
+#error "Unrecognized value of STBTT_RASTERIZER_VERSION"
+#endif
+
+#if STBTT_RASTERIZER_VERSION == 1
+// note: this routine clips fills that extend off the edges... ideally this
+// wouldn't happen, but it could happen if the truetype glyph bounding boxes
+// are wrong, or if the user supplies a too-small bitmap
+static void stbtt__fill_active_edges(unsigned char *scanline, int len, stbtt__active_edge *e, int max_weight)
+{
+   // non-zero winding fill
+   int x0=0, w=0;
+
+   while (e) {
+      if (w == 0) {
+         // if we're currently at zero, we need to record the edge start point
+         x0 = e->x; w += e->direction;
+      } else {
+         int x1 = e->x; w += e->direction;
+         // if we went to zero, we need to draw
+         if (w == 0) {
+            int i = x0 >> STBTT_FIXSHIFT;
+            int j = x1 >> STBTT_FIXSHIFT;
+
+            if (i < len && j >= 0) {
+               if (i == j) {
+                  // x0,x1 are the same pixel, so compute combined coverage
+                  scanline[i] = scanline[i] + (stbtt_uint8) ((x1 - x0) * max_weight >> STBTT_FIXSHIFT);
+               } else {
+                  if (i >= 0) // add antialiasing for x0
+                     scanline[i] = scanline[i] + (stbtt_uint8) (((STBTT_FIX - (x0 & STBTT_FIXMASK)) * max_weight) >> STBTT_FIXSHIFT);
+                  else
+                     i = -1; // clip
+
+                  if (j < len) // add antialiasing for x1
+                     scanline[j] = scanline[j] + (stbtt_uint8) (((x1 & STBTT_FIXMASK) * max_weight) >> STBTT_FIXSHIFT);
+                  else
+                     j = len; // clip
+
+                  for (++i; i < j; ++i) // fill pixels between x0 and x1
+                     scanline[i] = scanline[i] + (stbtt_uint8) max_weight;
+               }
+            }
+         }
+      }
+
+      e = e->next;
+   }
+}
+
+static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, int n, int vsubsample, int off_x, int off_y, void *userdata)
+{
+   stbtt__hheap hh = { 0, 0, 0 };
+   stbtt__active_edge *active = NULL;
+   int y,j=0;
+   int max_weight = (255 / vsubsample);  // weight per vertical scanline
+   int s; // vertical subsample index
+   unsigned char scanline_data[512], *scanline;
+
+   if (result->w > 512)
+      scanline = (unsigned char *) STBTT_malloc(result->w, userdata);
+   else
+      scanline = scanline_data;
+
+   y = off_y * vsubsample;
+   e[n].y0 = (off_y + result->h) * (float) vsubsample + 1;
+
+   while (j < result->h) {
+      STBTT_memset(scanline, 0, result->w);
+      for (s=0; s < vsubsample; ++s) {
+         // find center of pixel for this scanline
+         float scan_y = y + 0.5f;
+         stbtt__active_edge **step = &active;
+
+         // update all active edges;
+         // remove all active edges that terminate before the center of this scanline
+         while (*step) {
+            stbtt__active_edge * z = *step;
+            if (z->ey <= scan_y) {
+               *step = z->next; // delete from list
+               STBTT_assert(z->direction);
+               z->direction = 0;
+               stbtt__hheap_free(&hh, z);
+            } else {
+               z->x += z->dx; // advance to position for current scanline
+               step = &((*step)->next); // advance through list
+            }
+         }
+
+         // resort the list if needed
+         for(;;) {
+            int changed=0;
+            step = &active;
+            while (*step && (*step)->next) {
+               if ((*step)->x > (*step)->next->x) {
+                  stbtt__active_edge *t = *step;
+                  stbtt__active_edge *q = t->next;
+
+                  t->next = q->next;
+                  q->next = t;
+                  *step = q;
+                  changed = 1;
+               }
+               step = &(*step)->next;
+            }
+            if (!changed) break;
+         }
+
+         // insert all edges that start before the center of this scanline -- omit ones that also end on this scanline
+         while (e->y0 <= scan_y) {
+            if (e->y1 > scan_y) {
+               stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y, userdata);
+               if (z != NULL) {
+                  // find insertion point
+                  if (active == NULL)
+                     active = z;
+                  else if (z->x < active->x) {
+                     // insert at front
+                     z->next = active;
+                     active = z;
+                  } else {
+                     // find thing to insert AFTER
+                     stbtt__active_edge *p = active;
+                     while (p->next && p->next->x < z->x)
+                        p = p->next;
+                     // at this point, p->next->x is NOT < z->x
+                     z->next = p->next;
+                     p->next = z;
+                  }
+               }
+            }
+            ++e;
+         }
+
+         // now process all active edges in XOR fashion
+         if (active)
+            stbtt__fill_active_edges(scanline, result->w, active, max_weight);
+
+         ++y;
+      }
+      STBTT_memcpy(result->pixels + j * result->stride, scanline, result->w);
+      ++j;
+   }
+
+   stbtt__hheap_cleanup(&hh, userdata);
+
+   if (scanline != scanline_data)
+      STBTT_free(scanline, userdata);
+}
+
+#elif STBTT_RASTERIZER_VERSION == 2
+
+// the edge passed in here does not cross the vertical line at x or the vertical line at x+1
+// (i.e. it has already been clipped to those)
+static void stbtt__handle_clipped_edge(float *scanline, int x, stbtt__active_edge *e, float x0, float y0, float x1, float y1)
+{
+   if (y0 == y1) return;
+   STBTT_assert(y0 < y1);
+   STBTT_assert(e->sy <= e->ey);
+   if (y0 > e->ey) return;
+   if (y1 < e->sy) return;
+   if (y0 < e->sy) {
+      x0 += (x1-x0) * (e->sy - y0) / (y1-y0);
+      y0 = e->sy;
+   }
+   if (y1 > e->ey) {
+      x1 += (x1-x0) * (e->ey - y1) / (y1-y0);
+      y1 = e->ey;
+   }
+
+   if (x0 == x)
+      STBTT_assert(x1 <= x+1);
+   else if (x0 == x+1)
+      STBTT_assert(x1 >= x);
+   else if (x0 <= x)
+      STBTT_assert(x1 <= x);
+   else if (x0 >= x+1)
+      STBTT_assert(x1 >= x+1);
+   else
+      STBTT_assert(x1 >= x && x1 <= x+1);
+
+   if (x0 <= x && x1 <= x)
+      scanline[x] += e->direction * (y1-y0);
+   else if (x0 >= x+1 && x1 >= x+1)
+      ;
+   else {
+      STBTT_assert(x0 >= x && x0 <= x+1 && x1 >= x && x1 <= x+1);
+      scanline[x] += e->direction * (y1-y0) * (1-((x0-x)+(x1-x))/2); // coverage = 1 - average x position
+   }
+}
+
+static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, int len, stbtt__active_edge *e, float y_top)
+{
+   float y_bottom = y_top+1;
+
+   while (e) {
+      // brute force every pixel
+
+      // compute intersection points with top & bottom
+      STBTT_assert(e->ey >= y_top);
+
+      if (e->fdx == 0) {
+         float x0 = e->fx;
+         if (x0 < len) {
+            if (x0 >= 0) {
+               stbtt__handle_clipped_edge(scanline,(int) x0,e, x0,y_top, x0,y_bottom);
+               stbtt__handle_clipped_edge(scanline_fill-1,(int) x0+1,e, x0,y_top, x0,y_bottom);
+            } else {
+               stbtt__handle_clipped_edge(scanline_fill-1,0,e, x0,y_top, x0,y_bottom);
+            }
+         }
+      } else {
+         float x0 = e->fx;
+         float dx = e->fdx;
+         float xb = x0 + dx;
+         float x_top, x_bottom;
+         float sy0,sy1;
+         float dy = e->fdy;
+         STBTT_assert(e->sy <= y_bottom && e->ey >= y_top);
+
+         // compute endpoints of line segment clipped to this scanline (if the
+         // line segment starts on this scanline. x0 is the intersection of the
+         // line with y_top, but that may be off the line segment.
+         if (e->sy > y_top) {
+            x_top = x0 + dx * (e->sy - y_top);
+            sy0 = e->sy;
+         } else {
+            x_top = x0;
+            sy0 = y_top;
+         }
+         if (e->ey < y_bottom) {
+            x_bottom = x0 + dx * (e->ey - y_top);
+            sy1 = e->ey;
+         } else {
+            x_bottom = xb;
+            sy1 = y_bottom;
+         }
+
+         if (x_top >= 0 && x_bottom >= 0 && x_top < len && x_bottom < len) {
+            // from here on, we don't have to range check x values
+
+            if ((int) x_top == (int) x_bottom) {
+               float height;
+               // simple case, only spans one pixel
+               int x = (int) x_top;
+               height = sy1 - sy0;
+               STBTT_assert(x >= 0 && x < len);
+               scanline[x] += e->direction * (1-((x_top - x) + (x_bottom-x))/2)  * height;
+               scanline_fill[x] += e->direction * height; // everything right of this pixel is filled
+            } else {
+               int x,x1,x2;
+               float y_crossing, y_final, step, sign, area;
+               // covers 2+ pixels
+               if (x_top > x_bottom) {
+                  // flip scanline vertically; signed area is the same
+                  float t;
+                  sy0 = y_bottom - (sy0 - y_top);
+                  sy1 = y_bottom - (sy1 - y_top);
+                  t = sy0, sy0 = sy1, sy1 = t;
+                  t = x_bottom, x_bottom = x_top, x_top = t;
+                  dx = -dx;
+                  dy = -dy;
+                  t = x0, x0 = xb, xb = t;
+               }
+               assert(dy >= 0);
+               assert(dx >= 0);
+
+               x1 = (int) x_top;
+               x2 = (int) x_bottom;
+               // compute intersection with y axis at x1+1
+               y_crossing = (x1+1 - x0) * dy + y_top;
+               // if x2 is right at the right edge of x1, y_crossing can blow up, github #1057
+               if (y_crossing > y_bottom)
+                  y_crossing = y_bottom;
+
+               sign = e->direction;
+               // area of the rectangle covered from y0..y_crossing
+               area = sign * (y_crossing-sy0);
+               // area of the triangle (x_top,y0), (x+1,y0), (x+1,y_crossing)
+               scanline[x1] += area * (x1+1 - x_top)/2;
+
+               // check if final y_crossing is blown up; no test case for this
+               y_final = y_crossing + dy * (x2 - (x1+1)); // advance y by number of steps taken below
+               if (y_final > y_bottom) {
+                  y_final = y_bottom;
+                  dy = (y_final - y_crossing ) / (x2 - (x1+1)); // if denom=0, y_final = y_crossing, so y_final <= y_bottom
+               }
+
+               step = sign * dy * 1; // dy is dy/dx, change in y for every 1 change in x, which is also how much pixel area changes for each step in x
+               for (x = x1+1; x < x2; ++x) {
+                  scanline[x] += area + step/2; // area of parallelogram is step/2
+                  area += step;
+               }
+               STBTT_assert(STBTT_fabs(area) <= 1.01f); // accumulated error from area += step unless we round step down
+
+               // area of the triangle (x2,y_crossing), (x_bottom,y1), (x2,y1)
+               scanline[x2] += area + sign * (x_bottom - x2)/2 * (sy1-y_crossing);
+
+               scanline_fill[x2] += sign * (sy1-sy0);
+            }
+         } else {
+            // if edge goes outside of box we're drawing, we require
+            // clipping logic. since this does not match the intended use
+            // of this library, we use a different, very slow brute
+            // force implementation
+            int x;
+            for (x=0; x < len; ++x) {
+               // cases:
+               //
+               // there can be up to two intersections with the pixel. any intersection
+               // with left or right edges can be handled by splitting into two (or three)
+               // regions. intersections with top & bottom do not necessitate case-wise logic.
+               //
+               // the old way of doing this found the intersections with the left & right edges,
+               // then used some simple logic to produce up to three segments in sorted order
+               // from top-to-bottom. however, this had a problem: if an x edge was epsilon
+               // across the x border, then the corresponding y position might not be distinct
+               // from the other y segment, and it might ignored as an empty segment. to avoid
+               // that, we need to explicitly produce segments based on x positions.
+
+               // rename variables to clearly-defined pairs
+               float y0 = y_top;
+               float x1 = (float) (x);
+               float x2 = (float) (x+1);
+               float x3 = xb;
+               float y3 = y_bottom;
+
+               // x = e->x + e->dx * (y-y_top)
+               // (y-y_top) = (x - e->x) / e->dx
+               // y = (x - e->x) / e->dx + y_top
+               float y1 = (x - x0) / dx + y_top;
+               float y2 = (x+1 - x0) / dx + y_top;
+
+               if (x0 < x1 && x3 > x2) {         // three segments descending down-right
+                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1);
+                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x2,y2);
+                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3);
+               } else if (x3 < x1 && x0 > x2) {  // three segments descending down-left
+                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2);
+                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x1,y1);
+                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3);
+               } else if (x0 < x1 && x3 > x1) {  // two segments across x, down-right
+                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1);
+                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3);
+               } else if (x3 < x1 && x0 > x1) {  // two segments across x, down-left
+                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1);
+                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3);
+               } else if (x0 < x2 && x3 > x2) {  // two segments across x+1, down-right
+                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2);
+                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3);
+               } else if (x3 < x2 && x0 > x2) {  // two segments across x+1, down-left
+                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2);
+                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3);
+               } else {  // one segment
+                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x3,y3);
+               }
+            }
+         }
+      }
+      e = e->next;
+   }
+}
+
+// directly AA rasterize edges w/o supersampling
+static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, int n, int vsubsample, int off_x, int off_y, void *userdata)
+{
+   stbtt__hheap hh = { 0, 0, 0 };
+   stbtt__active_edge *active = NULL;
+   int y,j=0, i;
+   float scanline_data[129], *scanline, *scanline2;
+
+   STBTT__NOTUSED(vsubsample);
+
+   if (result->w > 64)
+      scanline = (float *) STBTT_malloc((result->w*2+1) * sizeof(float), userdata);
+   else
+      scanline = scanline_data;
+
+   scanline2 = scanline + result->w;
+
+   y = off_y;
+   e[n].y0 = (float) (off_y + result->h) + 1;
+
+   while (j < result->h) {
+      // find center of pixel for this scanline
+      float scan_y_top    = y + 0.0f;
+      float scan_y_bottom = y + 1.0f;
+      stbtt__active_edge **step = &active;
+
+      STBTT_memset(scanline , 0, result->w*sizeof(scanline[0]));
+      STBTT_memset(scanline2, 0, (result->w+1)*sizeof(scanline[0]));
+
+      // update all active edges;
+      // remove all active edges that terminate before the top of this scanline
+      while (*step) {
+         stbtt__active_edge * z = *step;
+         if (z->ey <= scan_y_top) {
+            *step = z->next; // delete from list
+            STBTT_assert(z->direction);
+            z->direction = 0;
+            stbtt__hheap_free(&hh, z);
+         } else {
+            step = &((*step)->next); // advance through list
+         }
+      }
+
+      // insert all edges that start before the bottom of this scanline
+      while (e->y0 <= scan_y_bottom) {
+         if (e->y0 != e->y1) {
+            stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y_top, userdata);
+            if (z != NULL) {
+               if (j == 0 && off_y != 0) {
+                  if (z->ey < scan_y_top) {
+                     // this can happen due to subpixel positioning and some kind of fp rounding error i think
+                     z->ey = scan_y_top;
+                  }
+               }
+               STBTT_assert(z->ey >= scan_y_top); // if we get really unlucky a tiny bit of an edge can be out of bounds
+               // insert at front
+               z->next = active;
+               active = z;
+            }
+         }
+         ++e;
+      }
+
+      // now process all active edges
+      if (active)
+         stbtt__fill_active_edges_new(scanline, scanline2+1, result->w, active, scan_y_top);
+
+      {
+         float sum = 0;
+         for (i=0; i < result->w; ++i) {
+            float k;
+            int m;
+            sum += scanline2[i];
+            k = scanline[i] + sum;
+            k = (float) STBTT_fabs(k)*255 + 0.5f;
+            m = (int) k;
+            if (m > 255) m = 255;
+            result->pixels[j*result->stride + i] = (unsigned char) m;
+         }
+      }
+      // advance all the edges
+      step = &active;
+      while (*step) {
+         stbtt__active_edge *z = *step;
+         z->fx += z->fdx; // advance to position for current scanline
+         step = &((*step)->next); // advance through list
+      }
+
+      ++y;
+      ++j;
+   }
+
+   stbtt__hheap_cleanup(&hh, userdata);
+
+   if (scanline != scanline_data)
+      STBTT_free(scanline, userdata);
+}
+#else
+#error "Unrecognized value of STBTT_RASTERIZER_VERSION"
+#endif
+
+#define STBTT__COMPARE(a,b)  ((a)->y0 < (b)->y0)
+
+static void stbtt__sort_edges_ins_sort(stbtt__edge *p, int n)
+{
+   int i,j;
+   for (i=1; i < n; ++i) {
+      stbtt__edge t = p[i], *a = &t;
+      j = i;
+      while (j > 0) {
+         stbtt__edge *b = &p[j-1];
+         int c = STBTT__COMPARE(a,b);
+         if (!c) break;
+         p[j] = p[j-1];
+         --j;
+      }
+      if (i != j)
+         p[j] = t;
+   }
+}
+
+static void stbtt__sort_edges_quicksort(stbtt__edge *p, int n)
+{
+   /* threshold for transitioning to insertion sort */
+   while (n > 12) {
+      stbtt__edge t;
+      int c01,c12,c,m,i,j;
+
+      /* compute median of three */
+      m = n >> 1;
+      c01 = STBTT__COMPARE(&p[0],&p[m]);
+      c12 = STBTT__COMPARE(&p[m],&p[n-1]);
+      /* if 0 >= mid >= end, or 0 < mid < end, then use mid */
+      if (c01 != c12) {
+         /* otherwise, we'll need to swap something else to middle */
+         int z;
+         c = STBTT__COMPARE(&p[0],&p[n-1]);
+         /* 0>mid && mid<n:  0>n => n; 0<n => 0 */
+         /* 0<mid && mid>n:  0>n => 0; 0<n => n */
+         z = (c == c12) ? 0 : n-1;
+         t = p[z];
+         p[z] = p[m];
+         p[m] = t;
+      }
+      /* now p[m] is the median-of-three */
+      /* swap it to the beginning so it won't move around */
+      t = p[0];
+      p[0] = p[m];
+      p[m] = t;
+
+      /* partition loop */
+      i=1;
+      j=n-1;
+      for(;;) {
+         /* handling of equality is crucial here */
+         /* for sentinels & efficiency with duplicates */
+         for (;;++i) {
+            if (!STBTT__COMPARE(&p[i], &p[0])) break;
+         }
+         for (;;--j) {
+            if (!STBTT__COMPARE(&p[0], &p[j])) break;
+         }
+         /* make sure we haven't crossed */
+         if (i >= j) break;
+         t = p[i];
+         p[i] = p[j];
+         p[j] = t;
+
+         ++i;
+         --j;
+      }
+      /* recurse on smaller side, iterate on larger */
+      if (j < (n-i)) {
+         stbtt__sort_edges_quicksort(p,j);
+         p = p+i;
+         n = n-i;
+      } else {
+         stbtt__sort_edges_quicksort(p+i, n-i);
+         n = j;
+      }
+   }
+}
+
+static void stbtt__sort_edges(stbtt__edge *p, int n)
+{
+   stbtt__sort_edges_quicksort(p, n);
+   stbtt__sort_edges_ins_sort(p, n);
+}
+
+typedef struct
+{
+   float x,y;
+} stbtt__point;
+
+static void stbtt__rasterize(stbtt__bitmap *result, stbtt__point *pts, int *wcount, int windings, float scale_x, float scale_y, float shift_x, float shift_y, int off_x, int off_y, int invert, void *userdata)
+{
+   float y_scale_inv = invert ? -scale_y : scale_y;
+   stbtt__edge *e;
+   int n,i,j,k,m;
+#if STBTT_RASTERIZER_VERSION == 1
+   int vsubsample = result->h < 8 ? 15 : 5;
+#elif STBTT_RASTERIZER_VERSION == 2
+   int vsubsample = 1;
+#else
+   #error "Unrecognized value of STBTT_RASTERIZER_VERSION"
+#endif
+   // vsubsample should divide 255 evenly; otherwise we won't reach full opacity
+
+   // now we have to blow out the windings into explicit edge lists
+   n = 0;
+   for (i=0; i < windings; ++i)
+      n += wcount[i];
+
+   e = (stbtt__edge *) STBTT_malloc(sizeof(*e) * (n+1), userdata); // add an extra one as a sentinel
+   if (e == 0) return;
+   n = 0;
+
+   m=0;
+   for (i=0; i < windings; ++i) {
+      stbtt__point *p = pts + m;
+      m += wcount[i];
+      j = wcount[i]-1;
+      for (k=0; k < wcount[i]; j=k++) {
+         int a=k,b=j;
+         // skip the edge if horizontal
+         if (p[j].y == p[k].y)
+            continue;
+         // add edge from j to k to the list
+         e[n].invert = 0;
+         if (invert ? p[j].y > p[k].y : p[j].y < p[k].y) {
+            e[n].invert = 1;
+            a=j,b=k;
+         }
+         e[n].x0 = p[a].x * scale_x + shift_x;
+         e[n].y0 = (p[a].y * y_scale_inv + shift_y) * vsubsample;
+         e[n].x1 = p[b].x * scale_x + shift_x;
+         e[n].y1 = (p[b].y * y_scale_inv + shift_y) * vsubsample;
+         ++n;
+      }
+   }
+
+   // now sort the edges by their highest point (should snap to integer, and then by x)
+   //STBTT_sort(e, n, sizeof(e[0]), stbtt__edge_compare);
+   stbtt__sort_edges(e, n);
+
+   // now, traverse the scanlines and find the intersections on each scanline, use xor winding rule
+   stbtt__rasterize_sorted_edges(result, e, n, vsubsample, off_x, off_y, userdata);
+
+   STBTT_free(e, userdata);
+}
+
+static void stbtt__add_point(stbtt__point *points, int n, float x, float y)
+{
+   if (!points) return; // during first pass, it's unallocated
+   points[n].x = x;
+   points[n].y = y;
+}
+
+// tessellate until threshold p is happy... @TODO warped to compensate for non-linear stretching
+static int stbtt__tesselate_curve(stbtt__point *points, int *num_points, float x0, float y0, float x1, float y1, float x2, float y2, float objspace_flatness_squared, int n)
+{
+   // midpoint
+   float mx = (x0 + 2*x1 + x2)/4;
+   float my = (y0 + 2*y1 + y2)/4;
+   // versus directly drawn line
+   float dx = (x0+x2)/2 - mx;
+   float dy = (y0+y2)/2 - my;
+   if (n > 16) // 65536 segments on one curve better be enough!
+      return 1;
+   if (dx*dx+dy*dy > objspace_flatness_squared) { // half-pixel error allowed... need to be smaller if AA
+      stbtt__tesselate_curve(points, num_points, x0,y0, (x0+x1)/2.0f,(y0+y1)/2.0f, mx,my, objspace_flatness_squared,n+1);
+      stbtt__tesselate_curve(points, num_points, mx,my, (x1+x2)/2.0f,(y1+y2)/2.0f, x2,y2, objspace_flatness_squared,n+1);
+   } else {
+      stbtt__add_point(points, *num_points,x2,y2);
+      *num_points = *num_points+1;
+   }
+   return 1;
+}
+
+static void stbtt__tesselate_cubic(stbtt__point *points, int *num_points, float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3, float objspace_flatness_squared, int n)
+{
+   // @TODO this "flatness" calculation is just made-up nonsense that seems to work well enough
+   float dx0 = x1-x0;
+   float dy0 = y1-y0;
+   float dx1 = x2-x1;
+   float dy1 = y2-y1;
+   float dx2 = x3-x2;
+   float dy2 = y3-y2;
+   float dx = x3-x0;
+   float dy = y3-y0;
+   float longlen = (float) (STBTT_sqrt(dx0*dx0+dy0*dy0)+STBTT_sqrt(dx1*dx1+dy1*dy1)+STBTT_sqrt(dx2*dx2+dy2*dy2));
+   float shortlen = (float) STBTT_sqrt(dx*dx+dy*dy);
+   float flatness_squared = longlen*longlen-shortlen*shortlen;
+
+   if (n > 16) // 65536 segments on one curve better be enough!
+      return;
+
+   if (flatness_squared > objspace_flatness_squared) {
+      float x01 = (x0+x1)/2;
+      float y01 = (y0+y1)/2;
+      float x12 = (x1+x2)/2;
+      float y12 = (y1+y2)/2;
+      float x23 = (x2+x3)/2;
+      float y23 = (y2+y3)/2;
+
+      float xa = (x01+x12)/2;
+      float ya = (y01+y12)/2;
+      float xb = (x12+x23)/2;
+      float yb = (y12+y23)/2;
+
+      float mx = (xa+xb)/2;
+      float my = (ya+yb)/2;
+
+      stbtt__tesselate_cubic(points, num_points, x0,y0, x01,y01, xa,ya, mx,my, objspace_flatness_squared,n+1);
+      stbtt__tesselate_cubic(points, num_points, mx,my, xb,yb, x23,y23, x3,y3, objspace_flatness_squared,n+1);
+   } else {
+      stbtt__add_point(points, *num_points,x3,y3);
+      *num_points = *num_points+1;
+   }
+}
+
+// returns number of contours
+static stbtt__point *stbtt_FlattenCurves(stbtt_vertex *vertices, int num_verts, float objspace_flatness, int **contour_lengths, int *num_contours, void *userdata)
+{
+   stbtt__point *points=0;
+   int num_points=0;
+
+   float objspace_flatness_squared = objspace_flatness * objspace_flatness;
+   int i,n=0,start=0, pass;
+
+   // count how many "moves" there are to get the contour count
+   for (i=0; i < num_verts; ++i)
+      if (vertices[i].type == STBTT_vmove)
+         ++n;
+
+   *num_contours = n;
+   if (n == 0) return 0;
+
+   *contour_lengths = (int *) STBTT_malloc(sizeof(**contour_lengths) * n, userdata);
+
+   if (*contour_lengths == 0) {
+      *num_contours = 0;
+      return 0;
+   }
+
+   // make two passes through the points so we don't need to realloc
+   for (pass=0; pass < 2; ++pass) {
+      float x=0,y=0;
+      if (pass == 1) {
+         points = (stbtt__point *) STBTT_malloc(num_points * sizeof(points[0]), userdata);
+         if (points == NULL) goto error;
+      }
+      num_points = 0;
+      n= -1;
+      for (i=0; i < num_verts; ++i) {
+         switch (vertices[i].type) {
+            case STBTT_vmove:
+               // start the next contour
+               if (n >= 0)
+                  (*contour_lengths)[n] = num_points - start;
+               ++n;
+               start = num_points;
+
+               x = vertices[i].x, y = vertices[i].y;
+               stbtt__add_point(points, num_points++, x,y);
+               break;
+            case STBTT_vline:
+               x = vertices[i].x, y = vertices[i].y;
+               stbtt__add_point(points, num_points++, x, y);
+               break;
+            case STBTT_vcurve:
+               stbtt__tesselate_curve(points, &num_points, x,y,
+                                        vertices[i].cx, vertices[i].cy,
+                                        vertices[i].x,  vertices[i].y,
+                                        objspace_flatness_squared, 0);
+               x = vertices[i].x, y = vertices[i].y;
+               break;
+            case STBTT_vcubic:
+               stbtt__tesselate_cubic(points, &num_points, x,y,
+                                        vertices[i].cx, vertices[i].cy,
+                                        vertices[i].cx1, vertices[i].cy1,
+                                        vertices[i].x,  vertices[i].y,
+                                        objspace_flatness_squared, 0);
+               x = vertices[i].x, y = vertices[i].y;
+               break;
+         }
+      }
+      (*contour_lengths)[n] = num_points - start;
+   }
+
+   return points;
+error:
+   STBTT_free(points, userdata);
+   STBTT_free(*contour_lengths, userdata);
+   *contour_lengths = 0;
+   *num_contours = 0;
+   return NULL;
+}
+
+STBTT_DEF void stbtt_Rasterize(stbtt__bitmap *result, float flatness_in_pixels, stbtt_vertex *vertices, int num_verts, float scale_x, float scale_y, float shift_x, float shift_y, int x_off, int y_off, int invert, void *userdata)
+{
+   float scale            = scale_x > scale_y ? scale_y : scale_x;
+   int winding_count      = 0;
+   int *winding_lengths   = NULL;
+   stbtt__point *windings = stbtt_FlattenCurves(vertices, num_verts, flatness_in_pixels / scale, &winding_lengths, &winding_count, userdata);
+   if (windings) {
+      stbtt__rasterize(result, windings, winding_lengths, winding_count, scale_x, scale_y, shift_x, shift_y, x_off, y_off, invert, userdata);
+      STBTT_free(winding_lengths, userdata);
+      STBTT_free(windings, userdata);
+   }
+}
+
+STBTT_DEF void stbtt_FreeBitmap(unsigned char *bitmap, void *userdata)
+{
+   STBTT_free(bitmap, userdata);
+}
+
+STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int glyph, int *width, int *height, int *xoff, int *yoff)
+{
+   int ix0,iy0,ix1,iy1;
+   stbtt__bitmap gbm;
+   stbtt_vertex *vertices;
+   int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices);
+
+   if (scale_x == 0) scale_x = scale_y;
+   if (scale_y == 0) {
+      if (scale_x == 0) {
+         STBTT_free(vertices, info->userdata);
+         return NULL;
+      }
+      scale_y = scale_x;
+   }
+
+   stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale_x, scale_y, shift_x, shift_y, &ix0,&iy0,&ix1,&iy1);
+
+   // now we get the size
+   gbm.w = (ix1 - ix0);
+   gbm.h = (iy1 - iy0);
+   gbm.pixels = NULL; // in case we error
+
+   if (width ) *width  = gbm.w;
+   if (height) *height = gbm.h;
+   if (xoff  ) *xoff   = ix0;
+   if (yoff  ) *yoff   = iy0;
+
+   if (gbm.w && gbm.h) {
+      gbm.pixels = (unsigned char *) STBTT_malloc(gbm.w * gbm.h, info->userdata);
+      if (gbm.pixels) {
+         gbm.stride = gbm.w;
+
+         stbtt_Rasterize(&gbm, 0.35f, vertices, num_verts, scale_x, scale_y, shift_x, shift_y, ix0, iy0, 1, info->userdata);
+      }
+   }
+   STBTT_free(vertices, info->userdata);
+   return gbm.pixels;
+}
+
+STBTT_DEF unsigned char *stbtt_GetGlyphBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int glyph, int *width, int *height, int *xoff, int *yoff)
+{
+   return stbtt_GetGlyphBitmapSubpixel(info, scale_x, scale_y, 0.0f, 0.0f, glyph, width, height, xoff, yoff);
+}
+
+STBTT_DEF void stbtt_MakeGlyphBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int glyph)
+{
+   int ix0,iy0;
+   stbtt_vertex *vertices;
+   int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices);
+   stbtt__bitmap gbm;
+
+   stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale_x, scale_y, shift_x, shift_y, &ix0,&iy0,0,0);
+   gbm.pixels = output;
+   gbm.w = out_w;
+   gbm.h = out_h;
+   gbm.stride = out_stride;
+
+   if (gbm.w && gbm.h)
+      stbtt_Rasterize(&gbm, 0.35f, vertices, num_verts, scale_x, scale_y, shift_x, shift_y, ix0,iy0, 1, info->userdata);
+
+   STBTT_free(vertices, info->userdata);
+}
+
+STBTT_DEF void stbtt_MakeGlyphBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int glyph)
+{
+   stbtt_MakeGlyphBitmapSubpixel(info, output, out_w, out_h, out_stride, scale_x, scale_y, 0.0f,0.0f, glyph);
+}
+
+STBTT_DEF unsigned char *stbtt_GetCodepointBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint, int *width, int *height, int *xoff, int *yoff)
+{
+   return stbtt_GetGlyphBitmapSubpixel(info, scale_x, scale_y,shift_x,shift_y, stbtt_FindGlyphIndex(info,codepoint), width,height,xoff,yoff);
+}
+
+STBTT_DEF void stbtt_MakeCodepointBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int oversample_x, int oversample_y, float *sub_x, float *sub_y, int codepoint)
+{
+   stbtt_MakeGlyphBitmapSubpixelPrefilter(info, output, out_w, out_h, out_stride, scale_x, scale_y, shift_x, shift_y, oversample_x, oversample_y, sub_x, sub_y, stbtt_FindGlyphIndex(info,codepoint));
+}
+
+STBTT_DEF void stbtt_MakeCodepointBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint)
+{
+   stbtt_MakeGlyphBitmapSubpixel(info, output, out_w, out_h, out_stride, scale_x, scale_y, shift_x, shift_y, stbtt_FindGlyphIndex(info,codepoint));
+}
+
+STBTT_DEF unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int codepoint, int *width, int *height, int *xoff, int *yoff)
+{
+   return stbtt_GetCodepointBitmapSubpixel(info, scale_x, scale_y, 0.0f,0.0f, codepoint, width,height,xoff,yoff);
+}
+
+STBTT_DEF void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint)
+{
+   stbtt_MakeCodepointBitmapSubpixel(info, output, out_w, out_h, out_stride, scale_x, scale_y, 0.0f,0.0f, codepoint);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// bitmap baking
+//
+// This is SUPER-CRAPPY packing to keep source code small
+
+static int stbtt_BakeFontBitmap_internal(unsigned char *data, int offset,  // font location (use offset=0 for plain .ttf)
+                                float pixel_height,                     // height of font in pixels
+                                unsigned char *pixels, int pw, int ph,  // bitmap to be filled in
+                                int first_char, int num_chars,          // characters to bake
+                                stbtt_bakedchar *chardata)
+{
+   float scale;
+   int x,y,bottom_y, i;
+   stbtt_fontinfo f;
+   f.userdata = NULL;
+   if (!stbtt_InitFont(&f, data, offset))
+      return -1;
+   STBTT_memset(pixels, 0, pw*ph); // background of 0 around pixels
+   x=y=1;
+   bottom_y = 1;
+
+   scale = stbtt_ScaleForPixelHeight(&f, pixel_height);
+
+   for (i=0; i < num_chars; ++i) {
+      int advance, lsb, x0,y0,x1,y1,gw,gh;
+      int g = stbtt_FindGlyphIndex(&f, first_char + i);
+      stbtt_GetGlyphHMetrics(&f, g, &advance, &lsb);
+      stbtt_GetGlyphBitmapBox(&f, g, scale,scale, &x0,&y0,&x1,&y1);
+      gw = x1-x0;
+      gh = y1-y0;
+      if (x + gw + 1 >= pw)
+         y = bottom_y, x = 1; // advance to next row
+      if (y + gh + 1 >= ph) // check if it fits vertically AFTER potentially moving to next row
+         return -i;
+      STBTT_assert(x+gw < pw);
+      STBTT_assert(y+gh < ph);
+      stbtt_MakeGlyphBitmap(&f, pixels+x+y*pw, gw,gh,pw, scale,scale, g);
+      chardata[i].x0 = (stbtt_int16) x;
+      chardata[i].y0 = (stbtt_int16) y;
+      chardata[i].x1 = (stbtt_int16) (x + gw);
+      chardata[i].y1 = (stbtt_int16) (y + gh);
+      chardata[i].xadvance = scale * advance;
+      chardata[i].xoff     = (float) x0;
+      chardata[i].yoff     = (float) y0;
+      x = x + gw + 1;
+      if (y+gh+1 > bottom_y)
+         bottom_y = y+gh+1;
+   }
+   return bottom_y;
+}
+
+STBTT_DEF void stbtt_GetBakedQuad(const stbtt_bakedchar *chardata, int pw, int ph, int char_index, float *xpos, float *ypos, stbtt_aligned_quad *q, int opengl_fillrule)
+{
+   float d3d_bias = opengl_fillrule ? 0 : -0.5f;
+   float ipw = 1.0f / pw, iph = 1.0f / ph;
+   const stbtt_bakedchar *b = chardata + char_index;
+   int round_x = STBTT_ifloor((*xpos + b->xoff) + 0.5f);
+   int round_y = STBTT_ifloor((*ypos + b->yoff) + 0.5f);
+
+   q->x0 = round_x + d3d_bias;
+   q->y0 = round_y + d3d_bias;
+   q->x1 = round_x + b->x1 - b->x0 + d3d_bias;
+   q->y1 = round_y + b->y1 - b->y0 + d3d_bias;
+
+   q->s0 = b->x0 * ipw;
+   q->t0 = b->y0 * iph;
+   q->s1 = b->x1 * ipw;
+   q->t1 = b->y1 * iph;
+
+   *xpos += b->xadvance;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// rectangle packing replacement routines if you don't have stb_rect_pack.h
+//
+
+#ifndef STB_RECT_PACK_VERSION
+
+typedef int stbrp_coord;
+
+////////////////////////////////////////////////////////////////////////////////////
+//                                                                                //
+//                                                                                //
+// COMPILER WARNING ?!?!?                                                         //
+//                                                                                //
+//                                                                                //
+// if you get a compile warning due to these symbols being defined more than      //
+// once, move #include "stb_rect_pack.h" before #include "stb_truetype.h"         //
+//                                                                                //
+////////////////////////////////////////////////////////////////////////////////////
+
+typedef struct
+{
+   int width,height;
+   int x,y,bottom_y;
+} stbrp_context;
+
+typedef struct
+{
+   unsigned char x;
+} stbrp_node;
+
+struct stbrp_rect
+{
+   stbrp_coord x,y;
+   int id,w,h,was_packed;
+};
+
+static void stbrp_init_target(stbrp_context *con, int pw, int ph, stbrp_node *nodes, int num_nodes)
+{
+   con->width  = pw;
+   con->height = ph;
+   con->x = 0;
+   con->y = 0;
+   con->bottom_y = 0;
+   STBTT__NOTUSED(nodes);
+   STBTT__NOTUSED(num_nodes);
+}
+
+static void stbrp_pack_rects(stbrp_context *con, stbrp_rect *rects, int num_rects)
+{
+   int i;
+   for (i=0; i < num_rects; ++i) {
+      if (con->x + rects[i].w > con->width) {
+         con->x = 0;
+         con->y = con->bottom_y;
+      }
+      if (con->y + rects[i].h > con->height)
+         break;
+      rects[i].x = con->x;
+      rects[i].y = con->y;
+      rects[i].was_packed = 1;
+      con->x += rects[i].w;
+      if (con->y + rects[i].h > con->bottom_y)
+         con->bottom_y = con->y + rects[i].h;
+   }
+   for (   ; i < num_rects; ++i)
+      rects[i].was_packed = 0;
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// bitmap baking
+//
+// This is SUPER-AWESOME (tm Ryan Gordon) packing using stb_rect_pack.h. If
+// stb_rect_pack.h isn't available, it uses the BakeFontBitmap strategy.
+
+STBTT_DEF int stbtt_PackBegin(stbtt_pack_context *spc, unsigned char *pixels, int pw, int ph, int stride_in_bytes, int padding, void *alloc_context)
+{
+   stbrp_context *context = (stbrp_context *) STBTT_malloc(sizeof(*context)            ,alloc_context);
+   int            num_nodes = pw - padding;
+   stbrp_node    *nodes   = (stbrp_node    *) STBTT_malloc(sizeof(*nodes  ) * num_nodes,alloc_context);
+
+   if (context == NULL || nodes == NULL) {
+      if (context != NULL) STBTT_free(context, alloc_context);
+      if (nodes   != NULL) STBTT_free(nodes  , alloc_context);
+      return 0;
+   }
+
+   spc->user_allocator_context = alloc_context;
+   spc->width = pw;
+   spc->height = ph;
+   spc->pixels = pixels;
+   spc->pack_info = context;
+   spc->nodes = nodes;
+   spc->padding = padding;
+   spc->stride_in_bytes = stride_in_bytes != 0 ? stride_in_bytes : pw;
+   spc->h_oversample = 1;
+   spc->v_oversample = 1;
+   spc->skip_missing = 0;
+
+   stbrp_init_target(context, pw-padding, ph-padding, nodes, num_nodes);
+
+   if (pixels)
+      STBTT_memset(pixels, 0, pw*ph); // background of 0 around pixels
+
+   return 1;
+}
+
+STBTT_DEF void stbtt_PackEnd  (stbtt_pack_context *spc)
+{
+   STBTT_free(spc->nodes    , spc->user_allocator_context);
+   STBTT_free(spc->pack_info, spc->user_allocator_context);
+}
+
+STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h_oversample, unsigned int v_oversample)
+{
+   STBTT_assert(h_oversample <= STBTT_MAX_OVERSAMPLE);
+   STBTT_assert(v_oversample <= STBTT_MAX_OVERSAMPLE);
+   if (h_oversample <= STBTT_MAX_OVERSAMPLE)
+      spc->h_oversample = h_oversample;
+   if (v_oversample <= STBTT_MAX_OVERSAMPLE)
+      spc->v_oversample = v_oversample;
+}
+
+STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip)
+{
+   spc->skip_missing = skip;
+}
+
+#define STBTT__OVER_MASK  (STBTT_MAX_OVERSAMPLE-1)
+
+static void stbtt__h_prefilter(unsigned char *pixels, int w, int h, int stride_in_bytes, unsigned int kernel_width)
+{
+   unsigned char buffer[STBTT_MAX_OVERSAMPLE];
+   int safe_w = w - kernel_width;
+   int j;
+   STBTT_memset(buffer, 0, STBTT_MAX_OVERSAMPLE); // suppress bogus warning from VS2013 -analyze
+   for (j=0; j < h; ++j) {
+      int i;
+      unsigned int total;
+      STBTT_memset(buffer, 0, kernel_width);
+
+      total = 0;
+
+      // make kernel_width a constant in common cases so compiler can optimize out the divide
+      switch (kernel_width) {
+         case 2:
+            for (i=0; i <= safe_w; ++i) {
+               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
+               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
+               pixels[i] = (unsigned char) (total / 2);
+            }
+            break;
+         case 3:
+            for (i=0; i <= safe_w; ++i) {
+               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
+               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
+               pixels[i] = (unsigned char) (total / 3);
+            }
+            break;
+         case 4:
+            for (i=0; i <= safe_w; ++i) {
+               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
+               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
+               pixels[i] = (unsigned char) (total / 4);
+            }
+            break;
+         case 5:
+            for (i=0; i <= safe_w; ++i) {
+               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
+               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
+               pixels[i] = (unsigned char) (total / 5);
+            }
+            break;
+         default:
+            for (i=0; i <= safe_w; ++i) {
+               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
+               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
+               pixels[i] = (unsigned char) (total / kernel_width);
+            }
+            break;
+      }
+
+      for (; i < w; ++i) {
+         STBTT_assert(pixels[i] == 0);
+         total -= buffer[i & STBTT__OVER_MASK];
+         pixels[i] = (unsigned char) (total / kernel_width);
+      }
+
+      pixels += stride_in_bytes;
+   }
+}
+
+static void stbtt__v_prefilter(unsigned char *pixels, int w, int h, int stride_in_bytes, unsigned int kernel_width)
+{
+   unsigned char buffer[STBTT_MAX_OVERSAMPLE];
+   int safe_h = h - kernel_width;
+   int j;
+   STBTT_memset(buffer, 0, STBTT_MAX_OVERSAMPLE); // suppress bogus warning from VS2013 -analyze
+   for (j=0; j < w; ++j) {
+      int i;
+      unsigned int total;
+      STBTT_memset(buffer, 0, kernel_width);
+
+      total = 0;
+
+      // make kernel_width a constant in common cases so compiler can optimize out the divide
+      switch (kernel_width) {
+         case 2:
+            for (i=0; i <= safe_h; ++i) {
+               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
+               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
+               pixels[i*stride_in_bytes] = (unsigned char) (total / 2);
+            }
+            break;
+         case 3:
+            for (i=0; i <= safe_h; ++i) {
+               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
+               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
+               pixels[i*stride_in_bytes] = (unsigned char) (total / 3);
+            }
+            break;
+         case 4:
+            for (i=0; i <= safe_h; ++i) {
+               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
+               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
+               pixels[i*stride_in_bytes] = (unsigned char) (total / 4);
+            }
+            break;
+         case 5:
+            for (i=0; i <= safe_h; ++i) {
+               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
+               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
+               pixels[i*stride_in_bytes] = (unsigned char) (total / 5);
+            }
+            break;
+         default:
+            for (i=0; i <= safe_h; ++i) {
+               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
+               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
+               pixels[i*stride_in_bytes] = (unsigned char) (total / kernel_width);
+            }
+            break;
+      }
+
+      for (; i < h; ++i) {
+         STBTT_assert(pixels[i*stride_in_bytes] == 0);
+         total -= buffer[i & STBTT__OVER_MASK];
+         pixels[i*stride_in_bytes] = (unsigned char) (total / kernel_width);
+      }
+
+      pixels += 1;
+   }
+}
+
+static float stbtt__oversample_shift(int oversample)
+{
+   if (!oversample)
+      return 0.0f;
+
+   // The prefilter is a box filter of width "oversample",
+   // which shifts phase by (oversample - 1)/2 pixels in
+   // oversampled space. We want to shift in the opposite
+   // direction to counter this.
+   return (float)-(oversample - 1) / (2.0f * (float)oversample);
+}
+
+// rects array must be big enough to accommodate all characters in the given ranges
+STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects)
+{
+   int i,j,k;
+   int missing_glyph_added = 0;
+
+   k=0;
+   for (i=0; i < num_ranges; ++i) {
+      float fh = ranges[i].font_size;
+      float scale = fh > 0 ? stbtt_ScaleForPixelHeight(info, fh) : stbtt_ScaleForMappingEmToPixels(info, -fh);
+      ranges[i].h_oversample = (unsigned char) spc->h_oversample;
+      ranges[i].v_oversample = (unsigned char) spc->v_oversample;
+      for (j=0; j < ranges[i].num_chars; ++j) {
+         int x0,y0,x1,y1;
+         int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j];
+         int glyph = stbtt_FindGlyphIndex(info, codepoint);
+         if (glyph == 0 && (spc->skip_missing || missing_glyph_added)) {
+            rects[k].w = rects[k].h = 0;
+         } else {
+            stbtt_GetGlyphBitmapBoxSubpixel(info,glyph,
+                                            scale * spc->h_oversample,
+                                            scale * spc->v_oversample,
+                                            0,0,
+                                            &x0,&y0,&x1,&y1);
+            rects[k].w = (stbrp_coord) (x1-x0 + spc->padding + spc->h_oversample-1);
+            rects[k].h = (stbrp_coord) (y1-y0 + spc->padding + spc->v_oversample-1);
+            if (glyph == 0)
+               missing_glyph_added = 1;
+         }
+         ++k;
+      }
+   }
+
+   return k;
+}
+
+STBTT_DEF void stbtt_MakeGlyphBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int prefilter_x, int prefilter_y, float *sub_x, float *sub_y, int glyph)
+{
+   stbtt_MakeGlyphBitmapSubpixel(info,
+                                 output,
+                                 out_w - (prefilter_x - 1),
+                                 out_h - (prefilter_y - 1),
+                                 out_stride,
+                                 scale_x,
+                                 scale_y,
+                                 shift_x,
+                                 shift_y,
+                                 glyph);
+
+   if (prefilter_x > 1)
+      stbtt__h_prefilter(output, out_w, out_h, out_stride, prefilter_x);
+
+   if (prefilter_y > 1)
+      stbtt__v_prefilter(output, out_w, out_h, out_stride, prefilter_y);
+
+   *sub_x = stbtt__oversample_shift(prefilter_x);
+   *sub_y = stbtt__oversample_shift(prefilter_y);
+}
+
+// rects array must be big enough to accommodate all characters in the given ranges
+STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects)
+{
+   int i,j,k, missing_glyph = -1, return_value = 1;
+
+   // save current values
+   int old_h_over = spc->h_oversample;
+   int old_v_over = spc->v_oversample;
+
+   k = 0;
+   for (i=0; i < num_ranges; ++i) {
+      float fh = ranges[i].font_size;
+      float scale = fh > 0 ? stbtt_ScaleForPixelHeight(info, fh) : stbtt_ScaleForMappingEmToPixels(info, -fh);
+      float recip_h,recip_v,sub_x,sub_y;
+      spc->h_oversample = ranges[i].h_oversample;
+      spc->v_oversample = ranges[i].v_oversample;
+      recip_h = 1.0f / spc->h_oversample;
+      recip_v = 1.0f / spc->v_oversample;
+      sub_x = stbtt__oversample_shift(spc->h_oversample);
+      sub_y = stbtt__oversample_shift(spc->v_oversample);
+      for (j=0; j < ranges[i].num_chars; ++j) {
+         stbrp_rect *r = &rects[k];
+         if (r->was_packed && r->w != 0 && r->h != 0) {
+            stbtt_packedchar *bc = &ranges[i].chardata_for_range[j];
+            int advance, lsb, x0,y0,x1,y1;
+            int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j];
+            int glyph = stbtt_FindGlyphIndex(info, codepoint);
+            stbrp_coord pad = (stbrp_coord) spc->padding;
+
+            // pad on left and top
+            r->x += pad;
+            r->y += pad;
+            r->w -= pad;
+            r->h -= pad;
+            stbtt_GetGlyphHMetrics(info, glyph, &advance, &lsb);
+            stbtt_GetGlyphBitmapBox(info, glyph,
+                                    scale * spc->h_oversample,
+                                    scale * spc->v_oversample,
+                                    &x0,&y0,&x1,&y1);
+            stbtt_MakeGlyphBitmapSubpixel(info,
+                                          spc->pixels + r->x + r->y*spc->stride_in_bytes,
+                                          r->w - spc->h_oversample+1,
+                                          r->h - spc->v_oversample+1,
+                                          spc->stride_in_bytes,
+                                          scale * spc->h_oversample,
+                                          scale * spc->v_oversample,
+                                          0,0,
+                                          glyph);
+
+            if (spc->h_oversample > 1)
+               stbtt__h_prefilter(spc->pixels + r->x + r->y*spc->stride_in_bytes,
+                                  r->w, r->h, spc->stride_in_bytes,
+                                  spc->h_oversample);
+
+            if (spc->v_oversample > 1)
+               stbtt__v_prefilter(spc->pixels + r->x + r->y*spc->stride_in_bytes,
+                                  r->w, r->h, spc->stride_in_bytes,
+                                  spc->v_oversample);
+
+            bc->x0       = (stbtt_int16)  r->x;
+            bc->y0       = (stbtt_int16)  r->y;
+            bc->x1       = (stbtt_int16) (r->x + r->w);
+            bc->y1       = (stbtt_int16) (r->y + r->h);
+            bc->xadvance =                scale * advance;
+            bc->xoff     =       (float)  x0 * recip_h + sub_x;
+            bc->yoff     =       (float)  y0 * recip_v + sub_y;
+            bc->xoff2    =                (x0 + r->w) * recip_h + sub_x;
+            bc->yoff2    =                (y0 + r->h) * recip_v + sub_y;
+
+            if (glyph == 0)
+               missing_glyph = j;
+         } else if (spc->skip_missing) {
+            return_value = 0;
+         } else if (r->was_packed && r->w == 0 && r->h == 0 && missing_glyph >= 0) {
+            ranges[i].chardata_for_range[j] = ranges[i].chardata_for_range[missing_glyph];
+         } else {
+            return_value = 0; // if any fail, report failure
+         }
+
+         ++k;
+      }
+   }
+
+   // restore original values
+   spc->h_oversample = old_h_over;
+   spc->v_oversample = old_v_over;
+
+   return return_value;
+}
+
+STBTT_DEF void stbtt_PackFontRangesPackRects(stbtt_pack_context *spc, stbrp_rect *rects, int num_rects)
+{
+   stbrp_pack_rects((stbrp_context *) spc->pack_info, rects, num_rects);
+}
+
+STBTT_DEF int stbtt_PackFontRanges(stbtt_pack_context *spc, const unsigned char *fontdata, int font_index, stbtt_pack_range *ranges, int num_ranges)
+{
+   stbtt_fontinfo info;
+   int i,j,n, return_value = 1;
+   //stbrp_context *context = (stbrp_context *) spc->pack_info;
+   stbrp_rect    *rects;
+
+   // flag all characters as NOT packed
+   for (i=0; i < num_ranges; ++i)
+      for (j=0; j < ranges[i].num_chars; ++j)
+         ranges[i].chardata_for_range[j].x0 =
+         ranges[i].chardata_for_range[j].y0 =
+         ranges[i].chardata_for_range[j].x1 =
+         ranges[i].chardata_for_range[j].y1 = 0;
+
+   n = 0;
+   for (i=0; i < num_ranges; ++i)
+      n += ranges[i].num_chars;
+
+   rects = (stbrp_rect *) STBTT_malloc(sizeof(*rects) * n, spc->user_allocator_context);
+   if (rects == NULL)
+      return 0;
+
+   info.userdata = spc->user_allocator_context;
+   stbtt_InitFont(&info, fontdata, stbtt_GetFontOffsetForIndex(fontdata,font_index));
+
+   n = stbtt_PackFontRangesGatherRects(spc, &info, ranges, num_ranges, rects);
+
+   stbtt_PackFontRangesPackRects(spc, rects, n);
+
+   return_value = stbtt_PackFontRangesRenderIntoRects(spc, &info, ranges, num_ranges, rects);
+
+   STBTT_free(rects, spc->user_allocator_context);
+   return return_value;
+}
+
+STBTT_DEF int stbtt_PackFontRange(stbtt_pack_context *spc, const unsigned char *fontdata, int font_index, float font_size,
+            int first_unicode_codepoint_in_range, int num_chars_in_range, stbtt_packedchar *chardata_for_range)
+{
+   stbtt_pack_range range;
+   range.first_unicode_codepoint_in_range = first_unicode_codepoint_in_range;
+   range.array_of_unicode_codepoints = NULL;
+   range.num_chars                   = num_chars_in_range;
+   range.chardata_for_range          = chardata_for_range;
+   range.font_size                   = font_size;
+   return stbtt_PackFontRanges(spc, fontdata, font_index, &range, 1);
+}
+
+STBTT_DEF void stbtt_GetScaledFontVMetrics(const unsigned char *fontdata, int index, float size, float *ascent, float *descent, float *lineGap)
+{
+   int i_ascent, i_descent, i_lineGap;
+   float scale;
+   stbtt_fontinfo info;
+   stbtt_InitFont(&info, fontdata, stbtt_GetFontOffsetForIndex(fontdata, index));
+   scale = size > 0 ? stbtt_ScaleForPixelHeight(&info, size) : stbtt_ScaleForMappingEmToPixels(&info, -size);
+   stbtt_GetFontVMetrics(&info, &i_ascent, &i_descent, &i_lineGap);
+   *ascent  = (float) i_ascent  * scale;
+   *descent = (float) i_descent * scale;
+   *lineGap = (float) i_lineGap * scale;
+}
+
+STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph, int char_index, float *xpos, float *ypos, stbtt_aligned_quad *q, int align_to_integer)
+{
+   float ipw = 1.0f / pw, iph = 1.0f / ph;
+   const stbtt_packedchar *b = chardata + char_index;
+
+   if (align_to_integer) {
+      float x = (float) STBTT_ifloor((*xpos + b->xoff) + 0.5f);
+      float y = (float) STBTT_ifloor((*ypos + b->yoff) + 0.5f);
+      q->x0 = x;
+      q->y0 = y;
+      q->x1 = x + b->xoff2 - b->xoff;
+      q->y1 = y + b->yoff2 - b->yoff;
+   } else {
+      q->x0 = *xpos + b->xoff;
+      q->y0 = *ypos + b->yoff;
+      q->x1 = *xpos + b->xoff2;
+      q->y1 = *ypos + b->yoff2;
+   }
+
+   q->s0 = b->x0 * ipw;
+   q->t0 = b->y0 * iph;
+   q->s1 = b->x1 * ipw;
+   q->t1 = b->y1 * iph;
+
+   *xpos += b->xadvance;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// sdf computation
+//
+
+#define STBTT_min(a,b)  ((a) < (b) ? (a) : (b))
+#define STBTT_max(a,b)  ((a) < (b) ? (b) : (a))
+
+static int stbtt__ray_intersect_bezier(float orig[2], float ray[2], float q0[2], float q1[2], float q2[2], float hits[2][2])
+{
+   float q0perp = q0[1]*ray[0] - q0[0]*ray[1];
+   float q1perp = q1[1]*ray[0] - q1[0]*ray[1];
+   float q2perp = q2[1]*ray[0] - q2[0]*ray[1];
+   float roperp = orig[1]*ray[0] - orig[0]*ray[1];
+
+   float a = q0perp - 2*q1perp + q2perp;
+   float b = q1perp - q0perp;
+   float c = q0perp - roperp;
+
+   float s0 = 0., s1 = 0.;
+   int num_s = 0;
+
+   if (a != 0.0) {
+      float discr = b*b - a*c;
+      if (discr > 0.0) {
+         float rcpna = -1 / a;
+         float d = (float) STBTT_sqrt(discr);
+         s0 = (b+d) * rcpna;
+         s1 = (b-d) * rcpna;
+         if (s0 >= 0.0 && s0 <= 1.0)
+            num_s = 1;
+         if (d > 0.0 && s1 >= 0.0 && s1 <= 1.0) {
+            if (num_s == 0) s0 = s1;
+            ++num_s;
+         }
+      }
+   } else {
+      // 2*b*s + c = 0
+      // s = -c / (2*b)
+      s0 = c / (-2 * b);
+      if (s0 >= 0.0 && s0 <= 1.0)
+         num_s = 1;
+   }
+
+   if (num_s == 0)
+      return 0;
+   else {
+      float rcp_len2 = 1 / (ray[0]*ray[0] + ray[1]*ray[1]);
+      float rayn_x = ray[0] * rcp_len2, rayn_y = ray[1] * rcp_len2;
+
+      float q0d =   q0[0]*rayn_x +   q0[1]*rayn_y;
+      float q1d =   q1[0]*rayn_x +   q1[1]*rayn_y;
+      float q2d =   q2[0]*rayn_x +   q2[1]*rayn_y;
+      float rod = orig[0]*rayn_x + orig[1]*rayn_y;
+
+      float q10d = q1d - q0d;
+      float q20d = q2d - q0d;
+      float q0rd = q0d - rod;
+
+      hits[0][0] = q0rd + s0*(2.0f - 2.0f*s0)*q10d + s0*s0*q20d;
+      hits[0][1] = a*s0+b;
+
+      if (num_s > 1) {
+         hits[1][0] = q0rd + s1*(2.0f - 2.0f*s1)*q10d + s1*s1*q20d;
+         hits[1][1] = a*s1+b;
+         return 2;
+      } else {
+         return 1;
+      }
+   }
+}
+
+static int equal(float *a, float *b)
+{
+   return (a[0] == b[0] && a[1] == b[1]);
+}
+
+static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex *verts)
+{
+   int i;
+   float orig[2], ray[2] = { 1, 0 };
+   float y_frac;
+   int winding = 0;
+
+   // make sure y never passes through a vertex of the shape
+   y_frac = (float) STBTT_fmod(y, 1.0f);
+   if (y_frac < 0.01f)
+      y += 0.01f;
+   else if (y_frac > 0.99f)
+      y -= 0.01f;
+
+   orig[0] = x;
+   orig[1] = y;
+
+   // test a ray from (-infinity,y) to (x,y)
+   for (i=0; i < nverts; ++i) {
+      if (verts[i].type == STBTT_vline) {
+         int x0 = (int) verts[i-1].x, y0 = (int) verts[i-1].y;
+         int x1 = (int) verts[i  ].x, y1 = (int) verts[i  ].y;
+         if (y > STBTT_min(y0,y1) && y < STBTT_max(y0,y1) && x > STBTT_min(x0,x1)) {
+            float x_inter = (y - y0) / (y1 - y0) * (x1-x0) + x0;
+            if (x_inter < x)
+               winding += (y0 < y1) ? 1 : -1;
+         }
+      }
+      if (verts[i].type == STBTT_vcurve) {
+         int x0 = (int) verts[i-1].x , y0 = (int) verts[i-1].y ;
+         int x1 = (int) verts[i  ].cx, y1 = (int) verts[i  ].cy;
+         int x2 = (int) verts[i  ].x , y2 = (int) verts[i  ].y ;
+         int ax = STBTT_min(x0,STBTT_min(x1,x2)), ay = STBTT_min(y0,STBTT_min(y1,y2));
+         int by = STBTT_max(y0,STBTT_max(y1,y2));
+         if (y > ay && y < by && x > ax) {
+            float q0[2],q1[2],q2[2];
+            float hits[2][2];
+            q0[0] = (float)x0;
+            q0[1] = (float)y0;
+            q1[0] = (float)x1;
+            q1[1] = (float)y1;
+            q2[0] = (float)x2;
+            q2[1] = (float)y2;
+            if (equal(q0,q1) || equal(q1,q2)) {
+               x0 = (int)verts[i-1].x;
+               y0 = (int)verts[i-1].y;
+               x1 = (int)verts[i  ].x;
+               y1 = (int)verts[i  ].y;
+               if (y > STBTT_min(y0,y1) && y < STBTT_max(y0,y1) && x > STBTT_min(x0,x1)) {
+                  float x_inter = (y - y0) / (y1 - y0) * (x1-x0) + x0;
+                  if (x_inter < x)
+                     winding += (y0 < y1) ? 1 : -1;
+               }
+            } else {
+               int num_hits = stbtt__ray_intersect_bezier(orig, ray, q0, q1, q2, hits);
+               if (num_hits >= 1)
+                  if (hits[0][0] < 0)
+                     winding += (hits[0][1] < 0 ? -1 : 1);
+               if (num_hits >= 2)
+                  if (hits[1][0] < 0)
+                     winding += (hits[1][1] < 0 ? -1 : 1);
+            }
+         }
+      }
+   }
+   return winding;
+}
+
+static float stbtt__cuberoot( float x )
+{
+   if (x<0)
+      return -(float) STBTT_pow(-x,1.0f/3.0f);
+   else
+      return  (float) STBTT_pow( x,1.0f/3.0f);
+}
+
+// x^3 + a*x^2 + b*x + c = 0
+static int stbtt__solve_cubic(float a, float b, float c, float* r)
+{
+   float s = -a / 3;
+   float p = b - a*a / 3;
+   float q = a * (2*a*a - 9*b) / 27 + c;
+   float p3 = p*p*p;
+   float d = q*q + 4*p3 / 27;
+   if (d >= 0) {
+      float z = (float) STBTT_sqrt(d);
+      float u = (-q + z) / 2;
+      float v = (-q - z) / 2;
+      u = stbtt__cuberoot(u);
+      v = stbtt__cuberoot(v);
+      r[0] = s + u + v;
+      return 1;
+   } else {
+      float u = (float) STBTT_sqrt(-p/3);
+      float v = (float) STBTT_acos(-STBTT_sqrt(-27/p3) * q / 2) / 3; // p3 must be negative, since d is negative
+      float m = (float) STBTT_cos(v);
+      float n = (float) STBTT_cos(v-3.141592/2)*1.732050808f;
+      r[0] = s + u * 2 * m;
+      r[1] = s - u * (m + n);
+      r[2] = s - u * (m - n);
+
+      //STBTT_assert( STBTT_fabs(((r[0]+a)*r[0]+b)*r[0]+c) < 0.05f);  // these asserts may not be safe at all scales, though they're in bezier t parameter units so maybe?
+      //STBTT_assert( STBTT_fabs(((r[1]+a)*r[1]+b)*r[1]+c) < 0.05f);
+      //STBTT_assert( STBTT_fabs(((r[2]+a)*r[2]+b)*r[2]+c) < 0.05f);
+      return 3;
+   }
+}
+
+STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float scale, int glyph, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff)
+{
+   float scale_x = scale, scale_y = scale;
+   int ix0,iy0,ix1,iy1;
+   int w,h;
+   unsigned char *data;
+
+   if (scale == 0) return NULL;
+
+   stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale, scale, 0.0f,0.0f, &ix0,&iy0,&ix1,&iy1);
+
+   // if empty, return NULL
+   if (ix0 == ix1 || iy0 == iy1)
+      return NULL;
+
+   ix0 -= padding;
+   iy0 -= padding;
+   ix1 += padding;
+   iy1 += padding;
+
+   w = (ix1 - ix0);
+   h = (iy1 - iy0);
+
+   if (width ) *width  = w;
+   if (height) *height = h;
+   if (xoff  ) *xoff   = ix0;
+   if (yoff  ) *yoff   = iy0;
+
+   // invert for y-downwards bitmaps
+   scale_y = -scale_y;
+
+   {
+      int x,y,i,j;
+      float *precompute;
+      stbtt_vertex *verts;
+      int num_verts = stbtt_GetGlyphShape(info, glyph, &verts);
+      data = (unsigned char *) STBTT_malloc(w * h, info->userdata);
+      precompute = (float *) STBTT_malloc(num_verts * sizeof(float), info->userdata);
+
+      for (i=0,j=num_verts-1; i < num_verts; j=i++) {
+         if (verts[i].type == STBTT_vline) {
+            float x0 = verts[i].x*scale_x, y0 = verts[i].y*scale_y;
+            float x1 = verts[j].x*scale_x, y1 = verts[j].y*scale_y;
+            float dist = (float) STBTT_sqrt((x1-x0)*(x1-x0) + (y1-y0)*(y1-y0));
+            precompute[i] = (dist == 0) ? 0.0f : 1.0f / dist;
+         } else if (verts[i].type == STBTT_vcurve) {
+            float x2 = verts[j].x *scale_x, y2 = verts[j].y *scale_y;
+            float x1 = verts[i].cx*scale_x, y1 = verts[i].cy*scale_y;
+            float x0 = verts[i].x *scale_x, y0 = verts[i].y *scale_y;
+            float bx = x0 - 2*x1 + x2, by = y0 - 2*y1 + y2;
+            float len2 = bx*bx + by*by;
+            if (len2 != 0.0f)
+               precompute[i] = 1.0f / (bx*bx + by*by);
+            else
+               precompute[i] = 0.0f;
+         } else
+            precompute[i] = 0.0f;
+      }
+
+      for (y=iy0; y < iy1; ++y) {
+         for (x=ix0; x < ix1; ++x) {
+            float val;
+            float min_dist = 999999.0f;
+            float sx = (float) x + 0.5f;
+            float sy = (float) y + 0.5f;
+            float x_gspace = (sx / scale_x);
+            float y_gspace = (sy / scale_y);
+
+            int winding = stbtt__compute_crossings_x(x_gspace, y_gspace, num_verts, verts); // @OPTIMIZE: this could just be a rasterization, but needs to be line vs. non-tesselated curves so a new path
+
+            for (i=0; i < num_verts; ++i) {
+               float x0 = verts[i].x*scale_x, y0 = verts[i].y*scale_y;
+
+               if (verts[i].type == STBTT_vline && precompute[i] != 0.0f) {
+                  float x1 = verts[i-1].x*scale_x, y1 = verts[i-1].y*scale_y;
+
+                  float dist,dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy);
+                  if (dist2 < min_dist*min_dist)
+                     min_dist = (float) STBTT_sqrt(dist2);
+
+                  // coarse culling against bbox
+                  //if (sx > STBTT_min(x0,x1)-min_dist && sx < STBTT_max(x0,x1)+min_dist &&
+                  //    sy > STBTT_min(y0,y1)-min_dist && sy < STBTT_max(y0,y1)+min_dist)
+                  dist = (float) STBTT_fabs((x1-x0)*(y0-sy) - (y1-y0)*(x0-sx)) * precompute[i];
+                  STBTT_assert(i != 0);
+                  if (dist < min_dist) {
+                     // check position along line
+                     // x' = x0 + t*(x1-x0), y' = y0 + t*(y1-y0)
+                     // minimize (x'-sx)*(x'-sx)+(y'-sy)*(y'-sy)
+                     float dx = x1-x0, dy = y1-y0;
+                     float px = x0-sx, py = y0-sy;
+                     // minimize (px+t*dx)^2 + (py+t*dy)^2 = px*px + 2*px*dx*t + t^2*dx*dx + py*py + 2*py*dy*t + t^2*dy*dy
+                     // derivative: 2*px*dx + 2*py*dy + (2*dx*dx+2*dy*dy)*t, set to 0 and solve
+                     float t = -(px*dx + py*dy) / (dx*dx + dy*dy);
+                     if (t >= 0.0f && t <= 1.0f)
+                        min_dist = dist;
+                  }
+               } else if (verts[i].type == STBTT_vcurve) {
+                  float x2 = verts[i-1].x *scale_x, y2 = verts[i-1].y *scale_y;
+                  float x1 = verts[i  ].cx*scale_x, y1 = verts[i  ].cy*scale_y;
+                  float box_x0 = STBTT_min(STBTT_min(x0,x1),x2);
+                  float box_y0 = STBTT_min(STBTT_min(y0,y1),y2);
+                  float box_x1 = STBTT_max(STBTT_max(x0,x1),x2);
+                  float box_y1 = STBTT_max(STBTT_max(y0,y1),y2);
+                  // coarse culling against bbox to avoid computing cubic unnecessarily
+                  if (sx > box_x0-min_dist && sx < box_x1+min_dist && sy > box_y0-min_dist && sy < box_y1+min_dist) {
+                     int num=0;
+                     float ax = x1-x0, ay = y1-y0;
+                     float bx = x0 - 2*x1 + x2, by = y0 - 2*y1 + y2;
+                     float mx = x0 - sx, my = y0 - sy;
+                     float res[3] = {0.f,0.f,0.f};
+                     float px,py,t,it,dist2;
+                     float a_inv = precompute[i];
+                     if (a_inv == 0.0) { // if a_inv is 0, it's 2nd degree so use quadratic formula
+                        float a = 3*(ax*bx + ay*by);
+                        float b = 2*(ax*ax + ay*ay) + (mx*bx+my*by);
+                        float c = mx*ax+my*ay;
+                        if (a == 0.0) { // if a is 0, it's linear
+                           if (b != 0.0) {
+                              res[num++] = -c/b;
+                           }
+                        } else {
+                           float discriminant = b*b - 4*a*c;
+                           if (discriminant < 0)
+                              num = 0;
+                           else {
+                              float root = (float) STBTT_sqrt(discriminant);
+                              res[0] = (-b - root)/(2*a);
+                              res[1] = (-b + root)/(2*a);
+                              num = 2; // don't bother distinguishing 1-solution case, as code below will still work
+                           }
+                        }
+                     } else {
+                        float b = 3*(ax*bx + ay*by) * a_inv; // could precompute this as it doesn't depend on sample point
+                        float c = (2*(ax*ax + ay*ay) + (mx*bx+my*by)) * a_inv;
+                        float d = (mx*ax+my*ay) * a_inv;
+                        num = stbtt__solve_cubic(b, c, d, res);
+                     }
+                     dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy);
+                     if (dist2 < min_dist*min_dist)
+                        min_dist = (float) STBTT_sqrt(dist2);
+
+                     if (num >= 1 && res[0] >= 0.0f && res[0] <= 1.0f) {
+                        t = res[0], it = 1.0f - t;
+                        px = it*it*x0 + 2*t*it*x1 + t*t*x2;
+                        py = it*it*y0 + 2*t*it*y1 + t*t*y2;
+                        dist2 = (px-sx)*(px-sx) + (py-sy)*(py-sy);
+                        if (dist2 < min_dist * min_dist)
+                           min_dist = (float) STBTT_sqrt(dist2);
+                     }
+                     if (num >= 2 && res[1] >= 0.0f && res[1] <= 1.0f) {
+                        t = res[1], it = 1.0f - t;
+                        px = it*it*x0 + 2*t*it*x1 + t*t*x2;
+                        py = it*it*y0 + 2*t*it*y1 + t*t*y2;
+                        dist2 = (px-sx)*(px-sx) + (py-sy)*(py-sy);
+                        if (dist2 < min_dist * min_dist)
+                           min_dist = (float) STBTT_sqrt(dist2);
+                     }
+                     if (num >= 3 && res[2] >= 0.0f && res[2] <= 1.0f) {
+                        t = res[2], it = 1.0f - t;
+                        px = it*it*x0 + 2*t*it*x1 + t*t*x2;
+                        py = it*it*y0 + 2*t*it*y1 + t*t*y2;
+                        dist2 = (px-sx)*(px-sx) + (py-sy)*(py-sy);
+                        if (dist2 < min_dist * min_dist)
+                           min_dist = (float) STBTT_sqrt(dist2);
+                     }
+                  }
+               }
+            }
+            if (winding == 0)
+               min_dist = -min_dist;  // if outside the shape, value is negative
+            val = onedge_value + pixel_dist_scale * min_dist;
+            if (val < 0)
+               val = 0;
+            else if (val > 255)
+               val = 255;
+            data[(y-iy0)*w+(x-ix0)] = (unsigned char) val;
+         }
+      }
+      STBTT_free(precompute, info->userdata);
+      STBTT_free(verts, info->userdata);
+   }
+   return data;
+}
+
+STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, float scale, int codepoint, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff)
+{
+   return stbtt_GetGlyphSDF(info, scale, stbtt_FindGlyphIndex(info, codepoint), padding, onedge_value, pixel_dist_scale, width, height, xoff, yoff);
+}
+
+STBTT_DEF void stbtt_FreeSDF(unsigned char *bitmap, void *userdata)
+{
+   STBTT_free(bitmap, userdata);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// font name matching -- recommended not to use this
+//
+
+// check if a utf8 string contains a prefix which is the utf16 string; if so return length of matching utf8 string
+static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(stbtt_uint8 *s1, stbtt_int32 len1, stbtt_uint8 *s2, stbtt_int32 len2)
+{
+   stbtt_int32 i=0;
+
+   // convert utf16 to utf8 and compare the results while converting
+   while (len2) {
+      stbtt_uint16 ch = s2[0]*256 + s2[1];
+      if (ch < 0x80) {
+         if (i >= len1) return -1;
+         if (s1[i++] != ch) return -1;
+      } else if (ch < 0x800) {
+         if (i+1 >= len1) return -1;
+         if (s1[i++] != 0xc0 + (ch >> 6)) return -1;
+         if (s1[i++] != 0x80 + (ch & 0x3f)) return -1;
+      } else if (ch >= 0xd800 && ch < 0xdc00) {
+         stbtt_uint32 c;
+         stbtt_uint16 ch2 = s2[2]*256 + s2[3];
+         if (i+3 >= len1) return -1;
+         c = ((ch - 0xd800) << 10) + (ch2 - 0xdc00) + 0x10000;
+         if (s1[i++] != 0xf0 + (c >> 18)) return -1;
+         if (s1[i++] != 0x80 + ((c >> 12) & 0x3f)) return -1;
+         if (s1[i++] != 0x80 + ((c >>  6) & 0x3f)) return -1;
+         if (s1[i++] != 0x80 + ((c      ) & 0x3f)) return -1;
+         s2 += 2; // plus another 2 below
+         len2 -= 2;
+      } else if (ch >= 0xdc00 && ch < 0xe000) {
+         return -1;
+      } else {
+         if (i+2 >= len1) return -1;
+         if (s1[i++] != 0xe0 + (ch >> 12)) return -1;
+         if (s1[i++] != 0x80 + ((ch >> 6) & 0x3f)) return -1;
+         if (s1[i++] != 0x80 + ((ch     ) & 0x3f)) return -1;
+      }
+      s2 += 2;
+      len2 -= 2;
+   }
+   return i;
+}
+
+static int stbtt_CompareUTF8toUTF16_bigendian_internal(char *s1, int len1, char *s2, int len2)
+{
+   return len1 == stbtt__CompareUTF8toUTF16_bigendian_prefix((stbtt_uint8*) s1, len1, (stbtt_uint8*) s2, len2);
+}
+
+// returns results in whatever encoding you request... but note that 2-byte encodings
+// will be BIG-ENDIAN... use stbtt_CompareUTF8toUTF16_bigendian() to compare
+STBTT_DEF const char *stbtt_GetFontNameString(const stbtt_fontinfo *font, int *length, int platformID, int encodingID, int languageID, int nameID)
+{
+   stbtt_int32 i,count,stringOffset;
+   stbtt_uint8 *fc = font->data;
+   stbtt_uint32 offset = font->fontstart;
+   stbtt_uint32 nm = stbtt__find_table(fc, offset, "name");
+   if (!nm) return NULL;
+
+   count = ttUSHORT(fc+nm+2);
+   stringOffset = nm + ttUSHORT(fc+nm+4);
+   for (i=0; i < count; ++i) {
+      stbtt_uint32 loc = nm + 6 + 12 * i;
+      if (platformID == ttUSHORT(fc+loc+0) && encodingID == ttUSHORT(fc+loc+2)
+          && languageID == ttUSHORT(fc+loc+4) && nameID == ttUSHORT(fc+loc+6)) {
+         *length = ttUSHORT(fc+loc+8);
+         return (const char *) (fc+stringOffset+ttUSHORT(fc+loc+10));
+      }
+   }
+   return NULL;
+}
+
+static int stbtt__matchpair(stbtt_uint8 *fc, stbtt_uint32 nm, stbtt_uint8 *name, stbtt_int32 nlen, stbtt_int32 target_id, stbtt_int32 next_id)
+{
+   stbtt_int32 i;
+   stbtt_int32 count = ttUSHORT(fc+nm+2);
+   stbtt_int32 stringOffset = nm + ttUSHORT(fc+nm+4);
+
+   for (i=0; i < count; ++i) {
+      stbtt_uint32 loc = nm + 6 + 12 * i;
+      stbtt_int32 id = ttUSHORT(fc+loc+6);
+      if (id == target_id) {
+         // find the encoding
+         stbtt_int32 platform = ttUSHORT(fc+loc+0), encoding = ttUSHORT(fc+loc+2), language = ttUSHORT(fc+loc+4);
+
+         // is this a Unicode encoding?
+         if (platform == 0 || (platform == 3 && encoding == 1) || (platform == 3 && encoding == 10)) {
+            stbtt_int32 slen = ttUSHORT(fc+loc+8);
+            stbtt_int32 off = ttUSHORT(fc+loc+10);
+
+            // check if there's a prefix match
+            stbtt_int32 matchlen = stbtt__CompareUTF8toUTF16_bigendian_prefix(name, nlen, fc+stringOffset+off,slen);
+            if (matchlen >= 0) {
+               // check for target_id+1 immediately following, with same encoding & language
+               if (i+1 < count && ttUSHORT(fc+loc+12+6) == next_id && ttUSHORT(fc+loc+12) == platform && ttUSHORT(fc+loc+12+2) == encoding && ttUSHORT(fc+loc+12+4) == language) {
+                  slen = ttUSHORT(fc+loc+12+8);
+                  off = ttUSHORT(fc+loc+12+10);
+                  if (slen == 0) {
+                     if (matchlen == nlen)
+                        return 1;
+                  } else if (matchlen < nlen && name[matchlen] == ' ') {
+                     ++matchlen;
+                     if (stbtt_CompareUTF8toUTF16_bigendian_internal((char*) (name+matchlen), nlen-matchlen, (char*)(fc+stringOffset+off),slen))
+                        return 1;
+                  }
+               } else {
+                  // if nothing immediately following
+                  if (matchlen == nlen)
+                     return 1;
+               }
+            }
+         }
+
+         // @TODO handle other encodings
+      }
+   }
+   return 0;
+}
+
+static int stbtt__matches(stbtt_uint8 *fc, stbtt_uint32 offset, stbtt_uint8 *name, stbtt_int32 flags)
+{
+   stbtt_int32 nlen = (stbtt_int32) STBTT_strlen((char *) name);
+   stbtt_uint32 nm,hd;
+   if (!stbtt__isfont(fc+offset)) return 0;
+
+   // check italics/bold/underline flags in macStyle...
+   if (flags) {
+      hd = stbtt__find_table(fc, offset, "head");
+      if ((ttUSHORT(fc+hd+44) & 7) != (flags & 7)) return 0;
+   }
+
+   nm = stbtt__find_table(fc, offset, "name");
+   if (!nm) return 0;
+
+   if (flags) {
+      // if we checked the macStyle flags, then just check the family and ignore the subfamily
+      if (stbtt__matchpair(fc, nm, name, nlen, 16, -1))  return 1;
+      if (stbtt__matchpair(fc, nm, name, nlen,  1, -1))  return 1;
+      if (stbtt__matchpair(fc, nm, name, nlen,  3, -1))  return 1;
+   } else {
+      if (stbtt__matchpair(fc, nm, name, nlen, 16, 17))  return 1;
+      if (stbtt__matchpair(fc, nm, name, nlen,  1,  2))  return 1;
+      if (stbtt__matchpair(fc, nm, name, nlen,  3, -1))  return 1;
+   }
+
+   return 0;
+}
+
+static int stbtt_FindMatchingFont_internal(unsigned char *font_collection, char *name_utf8, stbtt_int32 flags)
+{
+   stbtt_int32 i;
+   for (i=0;;++i) {
+      stbtt_int32 off = stbtt_GetFontOffsetForIndex(font_collection, i);
+      if (off < 0) return off;
+      if (stbtt__matches((stbtt_uint8 *) font_collection, off, (stbtt_uint8*) name_utf8, flags))
+         return off;
+   }
+}
+
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-qual"
+#endif
+
+STBTT_DEF int stbtt_BakeFontBitmap(const unsigned char *data, int offset,
+                                float pixel_height, unsigned char *pixels, int pw, int ph,
+                                int first_char, int num_chars, stbtt_bakedchar *chardata)
+{
+   return stbtt_BakeFontBitmap_internal((unsigned char *) data, offset, pixel_height, pixels, pw, ph, first_char, num_chars, chardata);
+}
+
+STBTT_DEF int stbtt_GetFontOffsetForIndex(const unsigned char *data, int index)
+{
+   return stbtt_GetFontOffsetForIndex_internal((unsigned char *) data, index);
+}
+
+STBTT_DEF int stbtt_GetNumberOfFonts(const unsigned char *data)
+{
+   return stbtt_GetNumberOfFonts_internal((unsigned char *) data);
+}
+
+STBTT_DEF int stbtt_InitFont(stbtt_fontinfo *info, const unsigned char *data, int offset)
+{
+   return stbtt_InitFont_internal(info, (unsigned char *) data, offset);
+}
+
+STBTT_DEF int stbtt_FindMatchingFont(const unsigned char *fontdata, const char *name, int flags)
+{
+   return stbtt_FindMatchingFont_internal((unsigned char *) fontdata, (char *) name, flags);
+}
+
+STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const char *s2, int len2)
+{
+   return stbtt_CompareUTF8toUTF16_bigendian_internal((char *) s1, len1, (char *) s2, len2);
+}
+
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
+#endif // STB_TRUETYPE_IMPLEMENTATION
+
+
+// FULL VERSION HISTORY
+//
+//   1.25 (2021-07-11) many fixes
+//   1.24 (2020-02-05) fix warning
+//   1.23 (2020-02-02) query SVG data for glyphs; query whole kerning table (but only kern not GPOS)
+//   1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined
+//   1.21 (2019-02-25) fix warning
+//   1.20 (2019-02-07) PackFontRange skips missing codepoints; GetScaleFontVMetrics()
+//   1.19 (2018-02-11) OpenType GPOS kerning (horizontal only), STBTT_fmod
+//   1.18 (2018-01-29) add missing function
+//   1.17 (2017-07-23) make more arguments const; doc fix
+//   1.16 (2017-07-12) SDF support
+//   1.15 (2017-03-03) make more arguments const
+//   1.14 (2017-01-16) num-fonts-in-TTC function
+//   1.13 (2017-01-02) support OpenType fonts, certain Apple fonts
+//   1.12 (2016-10-25) suppress warnings about casting away const with -Wcast-qual
+//   1.11 (2016-04-02) fix unused-variable warning
+//   1.10 (2016-04-02) allow user-defined fabs() replacement
+//                     fix memory leak if fontsize=0.0
+//                     fix warning from duplicate typedef
+//   1.09 (2016-01-16) warning fix; avoid crash on outofmem; use alloc userdata for PackFontRanges
+//   1.08 (2015-09-13) document stbtt_Rasterize(); fixes for vertical & horizontal edges
+//   1.07 (2015-08-01) allow PackFontRanges to accept arrays of sparse codepoints;
+//                     allow PackFontRanges to pack and render in separate phases;
+//                     fix stbtt_GetFontOFfsetForIndex (never worked for non-0 input?);
+//                     fixed an assert() bug in the new rasterizer
+//                     replace assert() with STBTT_assert() in new rasterizer
+//   1.06 (2015-07-14) performance improvements (~35% faster on x86 and x64 on test machine)
+//                     also more precise AA rasterizer, except if shapes overlap
+//                     remove need for STBTT_sort
+//   1.05 (2015-04-15) fix misplaced definitions for STBTT_STATIC
+//   1.04 (2015-04-15) typo in example
+//   1.03 (2015-04-12) STBTT_STATIC, fix memory leak in new packing, various fixes
+//   1.02 (2014-12-10) fix various warnings & compile issues w/ stb_rect_pack, C++
+//   1.01 (2014-12-08) fix subpixel position when oversampling to exactly match
+//                        non-oversampled; STBTT_POINT_SIZE for packed case only
+//   1.00 (2014-12-06) add new PackBegin etc. API, w/ support for oversampling
+//   0.99 (2014-09-18) fix multiple bugs with subpixel rendering (ryg)
+//   0.9  (2014-08-07) support certain mac/iOS fonts without an MS platformID
+//   0.8b (2014-07-07) fix a warning
+//   0.8  (2014-05-25) fix a few more warnings
+//   0.7  (2013-09-25) bugfix: subpixel glyph bug fixed in 0.5 had come back
+//   0.6c (2012-07-24) improve documentation
+//   0.6b (2012-07-20) fix a few more warnings
+//   0.6  (2012-07-17) fix warnings; added stbtt_ScaleForMappingEmToPixels,
+//                        stbtt_GetFontBoundingBox, stbtt_IsGlyphEmpty
+//   0.5  (2011-12-09) bugfixes:
+//                        subpixel glyph renderer computed wrong bounding box
+//                        first vertex of shape can be off-curve (FreeSans)
+//   0.4b (2011-12-03) fixed an error in the font baking example
+//   0.4  (2011-12-01) kerning, subpixel rendering (tor)
+//                    bugfixes for:
+//                        codepoint-to-glyph conversion using table fmt=12
+//                        codepoint-to-glyph conversion using table fmt=4
+//                        stbtt_GetBakedQuad with non-square texture (Zer)
+//                    updated Hello World! sample to use kerning and subpixel
+//                    fixed some warnings
+//   0.3  (2009-06-24) cmap fmt=12, compound shapes (MM)
+//                    userdata, malloc-from-userdata, non-zero fill (stb)
+//   0.2  (2009-03-11) Fix unsigned/signed char warnings
+//   0.1  (2009-03-09) First public release
+//
+
+/*
+------------------------------------------------------------------------------
+This software is available under 2 licenses -- choose whichever you prefer.
+------------------------------------------------------------------------------
+ALTERNATIVE A - MIT License
+Copyright (c) 2017 Sean Barrett
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+------------------------------------------------------------------------------
+ALTERNATIVE B - Public Domain (www.unlicense.org)
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+------------------------------------------------------------------------------
+*/
diff --git a/3rdparty/stblib/stb b/3rdparty/stblib/stb
deleted file mode 160000
index 013ac3bedd..0000000000
--- a/3rdparty/stblib/stb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 013ac3beddff3dbffafd5177e7972067cd2b5083
diff --git a/3rdparty/unordered_dense/include/unordered_dense.h b/3rdparty/unordered_dense/include/unordered_dense.h
deleted file mode 100644
index 13484a9817..0000000000
--- a/3rdparty/unordered_dense/include/unordered_dense.h
+++ /dev/null
@@ -1,2101 +0,0 @@
-///////////////////////// ankerl::unordered_dense::{map, set} /////////////////////////
-
-// A fast & densely stored hashmap and hashset based on robin-hood backward shift deletion.
-// Version 4.5.0
-// https://github.com/martinus/unordered_dense
-//
-// Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-// SPDX-License-Identifier: MIT
-// Copyright (c) 2022-2024 Martin Leitner-Ankerl <martin.ankerl@gmail.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#ifndef ANKERL_UNORDERED_DENSE_H
-#define ANKERL_UNORDERED_DENSE_H
-
-// see https://semver.org/spec/v2.0.0.html
-#define ANKERL_UNORDERED_DENSE_VERSION_MAJOR 4 // NOLINT(cppcoreguidelines-macro-usage) incompatible API changes
-#define ANKERL_UNORDERED_DENSE_VERSION_MINOR 5 // NOLINT(cppcoreguidelines-macro-usage) backwards compatible functionality
-#define ANKERL_UNORDERED_DENSE_VERSION_PATCH 0 // NOLINT(cppcoreguidelines-macro-usage) backwards compatible bug fixes
-
-// API versioning with inline namespace, see https://www.foonathan.net/2018/11/inline-namespaces/
-
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define ANKERL_UNORDERED_DENSE_VERSION_CONCAT1(major, minor, patch) v##major##_##minor##_##patch
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define ANKERL_UNORDERED_DENSE_VERSION_CONCAT(major, minor, patch) ANKERL_UNORDERED_DENSE_VERSION_CONCAT1(major, minor, patch)
-#define ANKERL_UNORDERED_DENSE_NAMESPACE   \
-    ANKERL_UNORDERED_DENSE_VERSION_CONCAT( \
-        ANKERL_UNORDERED_DENSE_VERSION_MAJOR, ANKERL_UNORDERED_DENSE_VERSION_MINOR, ANKERL_UNORDERED_DENSE_VERSION_PATCH)
-
-#if defined(_MSVC_LANG)
-#    define ANKERL_UNORDERED_DENSE_CPP_VERSION _MSVC_LANG
-#else
-#    define ANKERL_UNORDERED_DENSE_CPP_VERSION __cplusplus
-#endif
-
-#if defined(__GNUC__)
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#    define ANKERL_UNORDERED_DENSE_PACK(decl) decl __attribute__((__packed__))
-#elif defined(_MSC_VER)
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#    define ANKERL_UNORDERED_DENSE_PACK(decl) __pragma(pack(push, 1)) decl __pragma(pack(pop))
-#endif
-
-// exceptions
-#if defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)
-#    define ANKERL_UNORDERED_DENSE_HAS_EXCEPTIONS() 1 // NOLINT(cppcoreguidelines-macro-usage)
-#else
-#    define ANKERL_UNORDERED_DENSE_HAS_EXCEPTIONS() 0 // NOLINT(cppcoreguidelines-macro-usage)
-#endif
-#ifdef _MSC_VER
-#    define ANKERL_UNORDERED_DENSE_NOINLINE __declspec(noinline)
-#else
-#    define ANKERL_UNORDERED_DENSE_NOINLINE __attribute__((noinline))
-#endif
-
-// defined in unordered_dense.cpp
-#if !defined(ANKERL_UNORDERED_DENSE_EXPORT)
-#    define ANKERL_UNORDERED_DENSE_EXPORT
-#endif
-
-#if ANKERL_UNORDERED_DENSE_CPP_VERSION < 201703L
-#    error ankerl::unordered_dense requires C++17 or higher
-#else
-#    include <array>            // for array
-#    include <cstdint>          // for uint64_t, uint32_t, uint8_t, UINT64_C
-#    include <cstring>          // for size_t, memcpy, memset
-#    include <functional>       // for equal_to, hash
-#    include <initializer_list> // for initializer_list
-#    include <iterator>         // for pair, distance
-#    include <limits>           // for numeric_limits
-#    include <memory>           // for allocator, allocator_traits, shared_ptr
-#    include <optional>         // for optional
-#    include <stdexcept>        // for out_of_range
-#    include <string>           // for basic_string
-#    include <string_view>      // for basic_string_view, hash
-#    include <tuple>            // for forward_as_tuple
-#    include <type_traits>      // for enable_if_t, declval, conditional_t, ena...
-#    include <utility>          // for forward, exchange, pair, as_const, piece...
-#    include <vector>           // for vector
-#    if ANKERL_UNORDERED_DENSE_HAS_EXCEPTIONS() == 0
-#        include <cstdlib> // for abort
-#    endif
-
-#    if defined(__has_include) && !defined(ANKERL_UNORDERED_DENSE_DISABLE_PMR)
-#        if __has_include(<memory_resource>)
-#            define ANKERL_UNORDERED_DENSE_PMR std::pmr // NOLINT(cppcoreguidelines-macro-usage)
-#            include <memory_resource>                  // for polymorphic_allocator
-#        elif __has_include(<experimental/memory_resource>)
-#            define ANKERL_UNORDERED_DENSE_PMR std::experimental::pmr // NOLINT(cppcoreguidelines-macro-usage)
-#            include <experimental/memory_resource>                   // for polymorphic_allocator
-#        endif
-#    endif
-
-#    if defined(_MSC_VER) && defined(_M_X64)
-#        include <intrin.h>
-#        pragma intrinsic(_umul128)
-#    endif
-
-#    if defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__clang__)
-#        define ANKERL_UNORDERED_DENSE_LIKELY(x) __builtin_expect(x, 1)   // NOLINT(cppcoreguidelines-macro-usage)
-#        define ANKERL_UNORDERED_DENSE_UNLIKELY(x) __builtin_expect(x, 0) // NOLINT(cppcoreguidelines-macro-usage)
-#    else
-#        define ANKERL_UNORDERED_DENSE_LIKELY(x) (x)   // NOLINT(cppcoreguidelines-macro-usage)
-#        define ANKERL_UNORDERED_DENSE_UNLIKELY(x) (x) // NOLINT(cppcoreguidelines-macro-usage)
-#    endif
-
-namespace ankerl::unordered_dense {
-inline namespace ANKERL_UNORDERED_DENSE_NAMESPACE {
-
-namespace detail {
-
-#    if ANKERL_UNORDERED_DENSE_HAS_EXCEPTIONS()
-
-// make sure this is not inlined as it is slow and dramatically enlarges code, thus making other
-// inlinings more difficult. Throws are also generally the slow path.
-[[noreturn]] inline ANKERL_UNORDERED_DENSE_NOINLINE void on_error_key_not_found() {
-    throw std::out_of_range("ankerl::unordered_dense::map::at(): key not found");
-}
-[[noreturn]] inline ANKERL_UNORDERED_DENSE_NOINLINE void on_error_bucket_overflow() {
-    throw std::overflow_error("ankerl::unordered_dense: reached max bucket size, cannot increase size");
-}
-[[noreturn]] inline ANKERL_UNORDERED_DENSE_NOINLINE void on_error_too_many_elements() {
-    throw std::out_of_range("ankerl::unordered_dense::map::replace(): too many elements");
-}
-
-#    else
-
-[[noreturn]] inline void on_error_key_not_found() {
-    abort();
-}
-[[noreturn]] inline void on_error_bucket_overflow() {
-    abort();
-}
-[[noreturn]] inline void on_error_too_many_elements() {
-    abort();
-}
-
-#    endif
-
-} // namespace detail
-
-// hash ///////////////////////////////////////////////////////////////////////
-
-// This is a stripped-down implementation of wyhash: https://github.com/wangyi-fudan/wyhash
-// No big-endian support (because different values on different machines don't matter),
-// hardcodes seed and the secret, reformats the code, and clang-tidy fixes.
-namespace detail::wyhash {
-
-inline void mum(uint64_t* a, uint64_t* b) {
-#    if defined(__SIZEOF_INT128__)
-    __uint128_t r = *a;
-    r *= *b;
-    *a = static_cast<uint64_t>(r);
-    *b = static_cast<uint64_t>(r >> 64U);
-#    elif defined(_MSC_VER) && defined(_M_X64)
-    *a = _umul128(*a, *b, b);
-#    else
-    uint64_t ha = *a >> 32U;
-    uint64_t hb = *b >> 32U;
-    uint64_t la = static_cast<uint32_t>(*a);
-    uint64_t lb = static_cast<uint32_t>(*b);
-    uint64_t hi{};
-    uint64_t lo{};
-    uint64_t rh = ha * hb;
-    uint64_t rm0 = ha * lb;
-    uint64_t rm1 = hb * la;
-    uint64_t rl = la * lb;
-    uint64_t t = rl + (rm0 << 32U);
-    auto c = static_cast<uint64_t>(t < rl);
-    lo = t + (rm1 << 32U);
-    c += static_cast<uint64_t>(lo < t);
-    hi = rh + (rm0 >> 32U) + (rm1 >> 32U) + c;
-    *a = lo;
-    *b = hi;
-#    endif
-}
-
-// multiply and xor mix function, aka MUM
-[[nodiscard]] inline auto mix(uint64_t a, uint64_t b) -> uint64_t {
-    mum(&a, &b);
-    return a ^ b;
-}
-
-// read functions. WARNING: we don't care about endianness, so results are different on big endian!
-[[nodiscard]] inline auto r8(const uint8_t* p) -> uint64_t {
-    uint64_t v{};
-    std::memcpy(&v, p, 8U);
-    return v;
-}
-
-[[nodiscard]] inline auto r4(const uint8_t* p) -> uint64_t {
-    uint32_t v{};
-    std::memcpy(&v, p, 4);
-    return v;
-}
-
-// reads 1, 2, or 3 bytes
-[[nodiscard]] inline auto r3(const uint8_t* p, size_t k) -> uint64_t {
-    return (static_cast<uint64_t>(p[0]) << 16U) | (static_cast<uint64_t>(p[k >> 1U]) << 8U) | p[k - 1];
-}
-
-[[maybe_unused]] [[nodiscard]] inline auto hash(void const* key, size_t len) -> uint64_t {
-    static constexpr auto secret = std::array{UINT64_C(0xa0761d6478bd642f),
-                                              UINT64_C(0xe7037ed1a0b428db),
-                                              UINT64_C(0x8ebc6af09c88c6e3),
-                                              UINT64_C(0x589965cc75374cc3)};
-
-    auto const* p = static_cast<uint8_t const*>(key);
-    uint64_t seed = secret[0];
-    uint64_t a{};
-    uint64_t b{};
-    if (ANKERL_UNORDERED_DENSE_LIKELY(len <= 16)) {
-        if (ANKERL_UNORDERED_DENSE_LIKELY(len >= 4)) {
-            a = (r4(p) << 32U) | r4(p + ((len >> 3U) << 2U));
-            b = (r4(p + len - 4) << 32U) | r4(p + len - 4 - ((len >> 3U) << 2U));
-        } else if (ANKERL_UNORDERED_DENSE_LIKELY(len > 0)) {
-            a = r3(p, len);
-            b = 0;
-        } else {
-            a = 0;
-            b = 0;
-        }
-    } else {
-        size_t i = len;
-        if (ANKERL_UNORDERED_DENSE_UNLIKELY(i > 48)) {
-            uint64_t see1 = seed;
-            uint64_t see2 = seed;
-            do {
-                seed = mix(r8(p) ^ secret[1], r8(p + 8) ^ seed);
-                see1 = mix(r8(p + 16) ^ secret[2], r8(p + 24) ^ see1);
-                see2 = mix(r8(p + 32) ^ secret[3], r8(p + 40) ^ see2);
-                p += 48;
-                i -= 48;
-            } while (ANKERL_UNORDERED_DENSE_LIKELY(i > 48));
-            seed ^= see1 ^ see2;
-        }
-        while (ANKERL_UNORDERED_DENSE_UNLIKELY(i > 16)) {
-            seed = mix(r8(p) ^ secret[1], r8(p + 8) ^ seed);
-            i -= 16;
-            p += 16;
-        }
-        a = r8(p + i - 16);
-        b = r8(p + i - 8);
-    }
-
-    return mix(secret[1] ^ len, mix(a ^ secret[1], b ^ seed));
-}
-
-[[nodiscard]] inline auto hash(uint64_t x) -> uint64_t {
-    return detail::wyhash::mix(x, UINT64_C(0x9E3779B97F4A7C15));
-}
-
-} // namespace detail::wyhash
-
-ANKERL_UNORDERED_DENSE_EXPORT template <typename T, typename Enable = void>
-struct hash {
-    auto operator()(T const& obj) const noexcept(noexcept(std::declval<std::hash<T>>().operator()(std::declval<T const&>())))
-        -> uint64_t {
-        return std::hash<T>{}(obj);
-    }
-};
-
-template <typename T>
-struct hash<T, typename std::hash<T>::is_avalanching> {
-    using is_avalanching = void;
-    auto operator()(T const& obj) const noexcept(noexcept(std::declval<std::hash<T>>().operator()(std::declval<T const&>())))
-        -> uint64_t {
-        return std::hash<T>{}(obj);
-    }
-};
-
-template <typename CharT>
-struct hash<std::basic_string<CharT>> {
-    using is_avalanching = void;
-    auto operator()(std::basic_string<CharT> const& str) const noexcept -> uint64_t {
-        return detail::wyhash::hash(str.data(), sizeof(CharT) * str.size());
-    }
-};
-
-template <typename CharT>
-struct hash<std::basic_string_view<CharT>> {
-    using is_avalanching = void;
-    auto operator()(std::basic_string_view<CharT> const& sv) const noexcept -> uint64_t {
-        return detail::wyhash::hash(sv.data(), sizeof(CharT) * sv.size());
-    }
-};
-
-template <class T>
-struct hash<T*> {
-    using is_avalanching = void;
-    auto operator()(T* ptr) const noexcept -> uint64_t {
-        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-        return detail::wyhash::hash(reinterpret_cast<uintptr_t>(ptr));
-    }
-};
-
-template <class T>
-struct hash<std::unique_ptr<T>> {
-    using is_avalanching = void;
-    auto operator()(std::unique_ptr<T> const& ptr) const noexcept -> uint64_t {
-        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-        return detail::wyhash::hash(reinterpret_cast<uintptr_t>(ptr.get()));
-    }
-};
-
-template <class T>
-struct hash<std::shared_ptr<T>> {
-    using is_avalanching = void;
-    auto operator()(std::shared_ptr<T> const& ptr) const noexcept -> uint64_t {
-        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-        return detail::wyhash::hash(reinterpret_cast<uintptr_t>(ptr.get()));
-    }
-};
-
-template <typename Enum>
-struct hash<Enum, typename std::enable_if<std::is_enum<Enum>::value>::type> {
-    using is_avalanching = void;
-    auto operator()(Enum e) const noexcept -> uint64_t {
-        using underlying = typename std::underlying_type_t<Enum>;
-        return detail::wyhash::hash(static_cast<underlying>(e));
-    }
-};
-
-template <typename... Args>
-struct tuple_hash_helper {
-    // Converts the value into 64bit. If it is an integral type, just cast it. Mixing is doing the rest.
-    // If it isn't an integral we need to hash it.
-    template <typename Arg>
-    [[nodiscard]] constexpr static auto to64(Arg const& arg) -> uint64_t {
-        if constexpr (std::is_integral_v<Arg> || std::is_enum_v<Arg>) {
-            return static_cast<uint64_t>(arg);
-        } else {
-            return hash<Arg>{}(arg);
-        }
-    }
-
-    [[nodiscard]] static auto mix64(uint64_t state, uint64_t v) -> uint64_t {
-        return detail::wyhash::mix(state + v, uint64_t{0x9ddfea08eb382d69});
-    }
-
-    // Creates a buffer that holds all the data from each element of the tuple. If possible we memcpy the data directly. If
-    // not, we hash the object and use this for the array. Size of the array is known at compile time, and memcpy is optimized
-    // away, so filling the buffer is highly efficient. Finally, call wyhash with this buffer.
-    template <typename T, std::size_t... Idx>
-    [[nodiscard]] static auto calc_hash(T const& t, std::index_sequence<Idx...>) noexcept -> uint64_t {
-        auto h = uint64_t{};
-        ((h = mix64(h, to64(std::get<Idx>(t)))), ...);
-        return h;
-    }
-};
-
-template <typename... Args>
-struct hash<std::tuple<Args...>> : tuple_hash_helper<Args...> {
-    using is_avalanching = void;
-    auto operator()(std::tuple<Args...> const& t) const noexcept -> uint64_t {
-        return tuple_hash_helper<Args...>::calc_hash(t, std::index_sequence_for<Args...>{});
-    }
-};
-
-template <typename A, typename B>
-struct hash<std::pair<A, B>> : tuple_hash_helper<A, B> {
-    using is_avalanching = void;
-    auto operator()(std::pair<A, B> const& t) const noexcept -> uint64_t {
-        return tuple_hash_helper<A, B>::calc_hash(t, std::index_sequence_for<A, B>{});
-    }
-};
-
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#    define ANKERL_UNORDERED_DENSE_HASH_STATICCAST(T)                    \
-        template <>                                                      \
-        struct hash<T> {                                                 \
-            using is_avalanching = void;                                 \
-            auto operator()(T const& obj) const noexcept -> uint64_t {   \
-                return detail::wyhash::hash(static_cast<uint64_t>(obj)); \
-            }                                                            \
-        }
-
-#    if defined(__GNUC__) && !defined(__clang__)
-#        pragma GCC diagnostic push
-#        pragma GCC diagnostic ignored "-Wuseless-cast"
-#    endif
-// see https://en.cppreference.com/w/cpp/utility/hash
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(bool);
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(char);
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(signed char);
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(unsigned char);
-#    if ANKERL_UNORDERED_DENSE_CPP_VERSION >= 202002L && defined(__cpp_char8_t)
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(char8_t);
-#    endif
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(char16_t);
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(char32_t);
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(wchar_t);
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(short);
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(unsigned short);
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(int);
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(unsigned int);
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(long);
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(long long);
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(unsigned long);
-ANKERL_UNORDERED_DENSE_HASH_STATICCAST(unsigned long long);
-
-#    if defined(__GNUC__) && !defined(__clang__)
-#        pragma GCC diagnostic pop
-#    endif
-
-// bucket_type //////////////////////////////////////////////////////////
-
-namespace bucket_type {
-
-struct standard {
-    static constexpr uint32_t dist_inc = 1U << 8U;             // skip 1 byte fingerprint
-    static constexpr uint32_t fingerprint_mask = dist_inc - 1; // mask for 1 byte of fingerprint
-
-    uint32_t m_dist_and_fingerprint; // upper 3 byte: distance to original bucket. lower byte: fingerprint from hash
-    uint32_t m_value_idx;            // index into the m_values vector.
-};
-
-ANKERL_UNORDERED_DENSE_PACK(struct big {
-    static constexpr uint32_t dist_inc = 1U << 8U;             // skip 1 byte fingerprint
-    static constexpr uint32_t fingerprint_mask = dist_inc - 1; // mask for 1 byte of fingerprint
-
-    uint32_t m_dist_and_fingerprint; // upper 3 byte: distance to original bucket. lower byte: fingerprint from hash
-    size_t m_value_idx;              // index into the m_values vector.
-});
-
-} // namespace bucket_type
-
-namespace detail {
-
-struct nonesuch {};
-struct default_container_t {};
-
-template <class Default, class AlwaysVoid, template <class...> class Op, class... Args>
-struct detector {
-    using value_t = std::false_type;
-    using type = Default;
-};
-
-template <class Default, template <class...> class Op, class... Args>
-struct detector<Default, std::void_t<Op<Args...>>, Op, Args...> {
-    using value_t = std::true_type;
-    using type = Op<Args...>;
-};
-
-template <template <class...> class Op, class... Args>
-using is_detected = typename detail::detector<detail::nonesuch, void, Op, Args...>::value_t;
-
-template <template <class...> class Op, class... Args>
-constexpr bool is_detected_v = is_detected<Op, Args...>::value;
-
-template <typename T>
-using detect_avalanching = typename T::is_avalanching;
-
-template <typename T>
-using detect_is_transparent = typename T::is_transparent;
-
-template <typename T>
-using detect_iterator = typename T::iterator;
-
-template <typename T>
-using detect_reserve = decltype(std::declval<T&>().reserve(size_t{}));
-
-// enable_if helpers
-
-template <typename Mapped>
-constexpr bool is_map_v = !std::is_void_v<Mapped>;
-
-// clang-format off
-template <typename Hash, typename KeyEqual>
-constexpr bool is_transparent_v = is_detected_v<detect_is_transparent, Hash> && is_detected_v<detect_is_transparent, KeyEqual>;
-// clang-format on
-
-template <typename From, typename To1, typename To2>
-constexpr bool is_neither_convertible_v = !std::is_convertible_v<From, To1> && !std::is_convertible_v<From, To2>;
-
-template <typename T>
-constexpr bool has_reserve = is_detected_v<detect_reserve, T>;
-
-// base type for map has mapped_type
-template <class T>
-struct base_table_type_map {
-    using mapped_type = T;
-};
-
-// base type for set doesn't have mapped_type
-struct base_table_type_set {};
-
-} // namespace detail
-
-// Very much like std::deque, but faster for indexing (in most cases). As of now this doesn't implement the full std::vector
-// API, but merely what's necessary to work as an underlying container for ankerl::unordered_dense::{map, set}.
-// It allocates blocks of equal size and puts them into the m_blocks vector. That means it can grow simply by adding a new
-// block to the back of m_blocks, and doesn't double its size like an std::vector. The disadvantage is that memory is not
-// linear and thus there is one more indirection necessary for indexing.
-template <typename T, typename Allocator = std::allocator<T>, size_t MaxSegmentSizeBytes = 4096>
-class segmented_vector {
-    template <bool IsConst>
-    class iter_t;
-
-public:
-    using allocator_type = Allocator;
-    using pointer = typename std::allocator_traits<allocator_type>::pointer;
-    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
-    using difference_type = typename std::allocator_traits<allocator_type>::difference_type;
-    using value_type = T;
-    using size_type = std::size_t;
-    using reference = T&;
-    using const_reference = T const&;
-    using iterator = iter_t<false>;
-    using const_iterator = iter_t<true>;
-
-private:
-    using vec_alloc = typename std::allocator_traits<Allocator>::template rebind_alloc<pointer>;
-    std::vector<pointer, vec_alloc> m_blocks{};
-    size_t m_size{};
-
-    // Calculates the maximum number for x in  (s << x) <= max_val
-    static constexpr auto num_bits_closest(size_t max_val, size_t s) -> size_t {
-        auto f = size_t{0};
-        while (s << (f + 1) <= max_val) {
-            ++f;
-        }
-        return f;
-    }
-
-    using self_t = segmented_vector<T, Allocator, MaxSegmentSizeBytes>;
-    static constexpr auto num_bits = num_bits_closest(MaxSegmentSizeBytes, sizeof(T));
-    static constexpr auto num_elements_in_block = 1U << num_bits;
-    static constexpr auto mask = num_elements_in_block - 1U;
-
-    /**
-     * Iterator class doubles as const_iterator and iterator
-     */
-    template <bool IsConst>
-    class iter_t {
-        using ptr_t = typename std::conditional_t<IsConst, segmented_vector::const_pointer const*, segmented_vector::pointer*>;
-        ptr_t m_data{};
-        size_t m_idx{};
-
-        template <bool B>
-        friend class iter_t;
-
-    public:
-        using difference_type = segmented_vector::difference_type;
-        using value_type = T;
-        using reference = typename std::conditional_t<IsConst, value_type const&, value_type&>;
-        using pointer = typename std::conditional_t<IsConst, segmented_vector::const_pointer, segmented_vector::pointer>;
-        using iterator_category = std::forward_iterator_tag;
-
-        iter_t() noexcept = default;
-
-        template <bool OtherIsConst, typename = typename std::enable_if<IsConst && !OtherIsConst>::type>
-        // NOLINTNEXTLINE(google-explicit-constructor,hicpp-explicit-conversions)
-        constexpr iter_t(iter_t<OtherIsConst> const& other) noexcept
-            : m_data(other.m_data)
-            , m_idx(other.m_idx) {}
-
-        constexpr iter_t(ptr_t data, size_t idx) noexcept
-            : m_data(data)
-            , m_idx(idx) {}
-
-        template <bool OtherIsConst, typename = typename std::enable_if<IsConst && !OtherIsConst>::type>
-        constexpr auto operator=(iter_t<OtherIsConst> const& other) noexcept -> iter_t& {
-            m_data = other.m_data;
-            m_idx = other.m_idx;
-            return *this;
-        }
-
-        constexpr auto operator++() noexcept -> iter_t& {
-            ++m_idx;
-            return *this;
-        }
-
-        constexpr auto operator++(int) noexcept -> iter_t {
-            iter_t prev(*this);
-            this->operator++();
-            return prev;
-        }
-
-        constexpr auto operator+(difference_type diff) noexcept -> iter_t {
-            return {m_data, static_cast<size_t>(static_cast<difference_type>(m_idx) + diff)};
-        }
-
-        template <bool OtherIsConst>
-        constexpr auto operator-(iter_t<OtherIsConst> const& other) noexcept -> difference_type {
-            return static_cast<difference_type>(m_idx) - static_cast<difference_type>(other.m_idx);
-        }
-
-        constexpr auto operator*() const noexcept -> reference {
-            return m_data[m_idx >> num_bits][m_idx & mask];
-        }
-
-        constexpr auto operator->() const noexcept -> pointer {
-            return &m_data[m_idx >> num_bits][m_idx & mask];
-        }
-
-        template <bool O>
-        constexpr auto operator==(iter_t<O> const& o) const noexcept -> bool {
-            return m_idx == o.m_idx;
-        }
-
-        template <bool O>
-        constexpr auto operator!=(iter_t<O> const& o) const noexcept -> bool {
-            return !(*this == o);
-        }
-    };
-
-    // slow path: need to allocate a new segment every once in a while
-    void increase_capacity() {
-        auto ba = Allocator(m_blocks.get_allocator());
-        pointer block = std::allocator_traits<Allocator>::allocate(ba, num_elements_in_block);
-        m_blocks.push_back(block);
-    }
-
-    // Moves everything from other
-    void append_everything_from(segmented_vector&& other) {
-        reserve(size() + other.size());
-        for (auto&& o : other) {
-            emplace_back(std::move(o));
-        }
-    }
-
-    // Copies everything from other
-    void append_everything_from(segmented_vector const& other) {
-        reserve(size() + other.size());
-        for (auto const& o : other) {
-            emplace_back(o);
-        }
-    }
-
-    void dealloc() {
-        auto ba = Allocator(m_blocks.get_allocator());
-        for (auto ptr : m_blocks) {
-            std::allocator_traits<Allocator>::deallocate(ba, ptr, num_elements_in_block);
-        }
-    }
-
-    [[nodiscard]] static constexpr auto calc_num_blocks_for_capacity(size_t capacity) {
-        return (capacity + num_elements_in_block - 1U) / num_elements_in_block;
-    }
-
-public:
-    segmented_vector() = default;
-
-    // NOLINTNEXTLINE(google-explicit-constructor,hicpp-explicit-conversions)
-    segmented_vector(Allocator alloc)
-        : m_blocks(vec_alloc(alloc)) {}
-
-    segmented_vector(segmented_vector&& other, Allocator alloc)
-        : segmented_vector(alloc) {
-        *this = std::move(other);
-    }
-
-    segmented_vector(segmented_vector const& other, Allocator alloc)
-        : m_blocks(vec_alloc(alloc)) {
-        append_everything_from(other);
-    }
-
-    segmented_vector(segmented_vector&& other) noexcept
-        : segmented_vector(std::move(other), get_allocator()) {}
-
-    segmented_vector(segmented_vector const& other) {
-        append_everything_from(other);
-    }
-
-    auto operator=(segmented_vector const& other) -> segmented_vector& {
-        if (this == &other) {
-            return *this;
-        }
-        clear();
-        append_everything_from(other);
-        return *this;
-    }
-
-    auto operator=(segmented_vector&& other) noexcept -> segmented_vector& {
-        clear();
-        dealloc();
-        if (other.get_allocator() == get_allocator()) {
-            m_blocks = std::move(other.m_blocks);
-            m_size = std::exchange(other.m_size, {});
-        } else {
-            // make sure to construct with other's allocator!
-            m_blocks = std::vector<pointer, vec_alloc>(vec_alloc(other.get_allocator()));
-            append_everything_from(std::move(other));
-        }
-        return *this;
-    }
-
-    ~segmented_vector() {
-        clear();
-        dealloc();
-    }
-
-    [[nodiscard]] constexpr auto size() const -> size_t {
-        return m_size;
-    }
-
-    [[nodiscard]] constexpr auto capacity() const -> size_t {
-        return m_blocks.size() * num_elements_in_block;
-    }
-
-    // Indexing is highly performance critical
-    [[nodiscard]] constexpr auto operator[](size_t i) const noexcept -> T const& {
-        return m_blocks[i >> num_bits][i & mask];
-    }
-
-    [[nodiscard]] constexpr auto operator[](size_t i) noexcept -> T& {
-        return m_blocks[i >> num_bits][i & mask];
-    }
-
-    [[nodiscard]] constexpr auto begin() -> iterator {
-        return {m_blocks.data(), 0U};
-    }
-    [[nodiscard]] constexpr auto begin() const -> const_iterator {
-        return {m_blocks.data(), 0U};
-    }
-    [[nodiscard]] constexpr auto cbegin() const -> const_iterator {
-        return {m_blocks.data(), 0U};
-    }
-
-    [[nodiscard]] constexpr auto end() -> iterator {
-        return {m_blocks.data(), m_size};
-    }
-    [[nodiscard]] constexpr auto end() const -> const_iterator {
-        return {m_blocks.data(), m_size};
-    }
-    [[nodiscard]] constexpr auto cend() const -> const_iterator {
-        return {m_blocks.data(), m_size};
-    }
-
-    [[nodiscard]] constexpr auto back() -> reference {
-        return operator[](m_size - 1);
-    }
-    [[nodiscard]] constexpr auto back() const -> const_reference {
-        return operator[](m_size - 1);
-    }
-
-    void pop_back() {
-        back().~T();
-        --m_size;
-    }
-
-    [[nodiscard]] auto empty() const {
-        return 0 == m_size;
-    }
-
-    void reserve(size_t new_capacity) {
-        m_blocks.reserve(calc_num_blocks_for_capacity(new_capacity));
-        while (new_capacity > capacity()) {
-            increase_capacity();
-        }
-    }
-
-    [[nodiscard]] auto get_allocator() const -> allocator_type {
-        return allocator_type{m_blocks.get_allocator()};
-    }
-
-    template <class... Args>
-    auto emplace_back(Args&&... args) -> reference {
-        if (m_size == capacity()) {
-            increase_capacity();
-        }
-        auto* ptr = static_cast<void*>(&operator[](m_size));
-        auto& ref = *new (ptr) T(std::forward<Args>(args)...);
-        ++m_size;
-        return ref;
-    }
-
-    void clear() {
-        if constexpr (!std::is_trivially_destructible_v<T>) {
-            for (size_t i = 0, s = size(); i < s; ++i) {
-                operator[](i).~T();
-            }
-        }
-        m_size = 0;
-    }
-
-    void shrink_to_fit() {
-        auto ba = Allocator(m_blocks.get_allocator());
-        auto num_blocks_required = calc_num_blocks_for_capacity(m_size);
-        while (m_blocks.size() > num_blocks_required) {
-            std::allocator_traits<Allocator>::deallocate(ba, m_blocks.back(), num_elements_in_block);
-            m_blocks.pop_back();
-        }
-        m_blocks.shrink_to_fit();
-    }
-};
-
-namespace detail {
-
-// This is it, the table. Doubles as map and set, and uses `void` for T when its used as a set.
-template <class Key,
-          class T, // when void, treat it as a set.
-          class Hash,
-          class KeyEqual,
-          class AllocatorOrContainer,
-          class Bucket,
-          class BucketContainer,
-          bool IsSegmented>
-class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, base_table_type_set> {
-    using underlying_value_type = typename std::conditional_t<is_map_v<T>, std::pair<Key, T>, Key>;
-    using underlying_container_type = std::conditional_t<IsSegmented,
-                                                         segmented_vector<underlying_value_type, AllocatorOrContainer>,
-                                                         std::vector<underlying_value_type, AllocatorOrContainer>>;
-
-public:
-    using value_container_type = std::
-        conditional_t<is_detected_v<detect_iterator, AllocatorOrContainer>, AllocatorOrContainer, underlying_container_type>;
-
-private:
-    using bucket_alloc =
-        typename std::allocator_traits<typename value_container_type::allocator_type>::template rebind_alloc<Bucket>;
-    using default_bucket_container_type =
-        std::conditional_t<IsSegmented, segmented_vector<Bucket, bucket_alloc>, std::vector<Bucket, bucket_alloc>>;
-
-    using bucket_container_type = std::conditional_t<std::is_same_v<BucketContainer, detail::default_container_t>,
-                                                     default_bucket_container_type,
-                                                     BucketContainer>;
-
-    static constexpr uint8_t initial_shifts = 64 - 2; // 2^(64-m_shift) number of buckets
-    static constexpr float default_max_load_factor = 0.8F;
-
-public:
-    using key_type = Key;
-    using value_type = typename value_container_type::value_type;
-    using size_type = typename value_container_type::size_type;
-    using difference_type = typename value_container_type::difference_type;
-    using hasher = Hash;
-    using key_equal = KeyEqual;
-    using allocator_type = typename value_container_type::allocator_type;
-    using reference = typename value_container_type::reference;
-    using const_reference = typename value_container_type::const_reference;
-    using pointer = typename value_container_type::pointer;
-    using const_pointer = typename value_container_type::const_pointer;
-    using const_iterator = typename value_container_type::const_iterator;
-    using iterator = std::conditional_t<is_map_v<T>, typename value_container_type::iterator, const_iterator>;
-    using bucket_type = Bucket;
-
-private:
-    using value_idx_type = decltype(Bucket::m_value_idx);
-    using dist_and_fingerprint_type = decltype(Bucket::m_dist_and_fingerprint);
-
-    static_assert(std::is_trivially_destructible_v<Bucket>, "assert there's no need to call destructor / std::destroy");
-    static_assert(std::is_trivially_copyable_v<Bucket>, "assert we can just memset / memcpy");
-
-    value_container_type m_values{}; // Contains all the key-value pairs in one densely stored container. No holes.
-    bucket_container_type m_buckets{};
-    size_t m_max_bucket_capacity = 0;
-    float m_max_load_factor = default_max_load_factor;
-    Hash m_hash{};
-    KeyEqual m_equal{};
-    uint8_t m_shifts = initial_shifts;
-
-    [[nodiscard]] auto next(value_idx_type bucket_idx) const -> value_idx_type {
-        return ANKERL_UNORDERED_DENSE_UNLIKELY(bucket_idx + 1U == bucket_count())
-                   ? 0
-                   : static_cast<value_idx_type>(bucket_idx + 1U);
-    }
-
-    // Helper to access bucket through pointer types
-    [[nodiscard]] static constexpr auto at(bucket_container_type& bucket, size_t offset) -> Bucket& {
-        return bucket[offset];
-    }
-
-    [[nodiscard]] static constexpr auto at(const bucket_container_type& bucket, size_t offset) -> const Bucket& {
-        return bucket[offset];
-    }
-
-    // use the dist_inc and dist_dec functions so that uint16_t types work without warning
-    [[nodiscard]] static constexpr auto dist_inc(dist_and_fingerprint_type x) -> dist_and_fingerprint_type {
-        return static_cast<dist_and_fingerprint_type>(x + Bucket::dist_inc);
-    }
-
-    [[nodiscard]] static constexpr auto dist_dec(dist_and_fingerprint_type x) -> dist_and_fingerprint_type {
-        return static_cast<dist_and_fingerprint_type>(x - Bucket::dist_inc);
-    }
-
-    // The goal of mixed_hash is to always produce a high quality 64bit hash.
-    template <typename K>
-    [[nodiscard]] constexpr auto mixed_hash(K const& key) const -> uint64_t {
-        if constexpr (is_detected_v<detect_avalanching, Hash>) {
-            // we know that the hash is good because is_avalanching.
-            if constexpr (sizeof(decltype(m_hash(key))) < sizeof(uint64_t)) {
-                // 32bit hash and is_avalanching => multiply with a constant to avalanche bits upwards
-                return m_hash(key) * UINT64_C(0x9ddfea08eb382d69);
-            } else {
-                // 64bit and is_avalanching => only use the hash itself.
-                return m_hash(key);
-            }
-        } else {
-            // not is_avalanching => apply wyhash
-            return wyhash::hash(m_hash(key));
-        }
-    }
-
-    [[nodiscard]] constexpr auto dist_and_fingerprint_from_hash(uint64_t hash) const -> dist_and_fingerprint_type {
-        return Bucket::dist_inc | (static_cast<dist_and_fingerprint_type>(hash) & Bucket::fingerprint_mask);
-    }
-
-    [[nodiscard]] constexpr auto bucket_idx_from_hash(uint64_t hash) const -> value_idx_type {
-        return static_cast<value_idx_type>(hash >> m_shifts);
-    }
-
-    [[nodiscard]] static constexpr auto get_key(value_type const& vt) -> key_type const& {
-        if constexpr (is_map_v<T>) {
-            return vt.first;
-        } else {
-            return vt;
-        }
-    }
-
-    template <typename K>
-    [[nodiscard]] auto next_while_less(K const& key) const -> Bucket {
-        auto hash = mixed_hash(key);
-        auto dist_and_fingerprint = dist_and_fingerprint_from_hash(hash);
-        auto bucket_idx = bucket_idx_from_hash(hash);
-
-        while (dist_and_fingerprint < at(m_buckets, bucket_idx).m_dist_and_fingerprint) {
-            dist_and_fingerprint = dist_inc(dist_and_fingerprint);
-            bucket_idx = next(bucket_idx);
-        }
-        return {dist_and_fingerprint, bucket_idx};
-    }
-
-    void place_and_shift_up(Bucket bucket, value_idx_type place) {
-        while (0 != at(m_buckets, place).m_dist_and_fingerprint) {
-            bucket = std::exchange(at(m_buckets, place), bucket);
-            bucket.m_dist_and_fingerprint = dist_inc(bucket.m_dist_and_fingerprint);
-            place = next(place);
-        }
-        at(m_buckets, place) = bucket;
-    }
-
-    [[nodiscard]] static constexpr auto calc_num_buckets(uint8_t shifts) -> size_t {
-        return (std::min)(max_bucket_count(), size_t{1} << (64U - shifts));
-    }
-
-    [[nodiscard]] constexpr auto calc_shifts_for_size(size_t s) const -> uint8_t {
-        auto shifts = initial_shifts;
-        while (shifts > 0 && static_cast<size_t>(static_cast<float>(calc_num_buckets(shifts)) * max_load_factor()) < s) {
-            --shifts;
-        }
-        return shifts;
-    }
-
-    // assumes m_values has data, m_buckets=m_buckets_end=nullptr, m_shifts is INITIAL_SHIFTS
-    void copy_buckets(table const& other) {
-        // assumes m_values has already the correct data copied over.
-        if (empty()) {
-            // when empty, at least allocate an initial buckets and clear them.
-            allocate_buckets_from_shift();
-            clear_buckets();
-        } else {
-            m_shifts = other.m_shifts;
-            allocate_buckets_from_shift();
-            if constexpr (IsSegmented || !std::is_same_v<BucketContainer, default_container_t>) {
-                for (auto i = 0UL; i < bucket_count(); ++i) {
-                    at(m_buckets, i) = at(other.m_buckets, i);
-                }
-            } else {
-                std::memcpy(m_buckets.data(), other.m_buckets.data(), sizeof(Bucket) * bucket_count());
-            }
-        }
-    }
-
-    /**
-     * True when no element can be added any more without increasing the size
-     */
-    [[nodiscard]] auto is_full() const -> bool {
-        return size() > m_max_bucket_capacity;
-    }
-
-    void deallocate_buckets() {
-        m_buckets.clear();
-        m_buckets.shrink_to_fit();
-        m_max_bucket_capacity = 0;
-    }
-
-    void allocate_buckets_from_shift() {
-        auto num_buckets = calc_num_buckets(m_shifts);
-        if constexpr (IsSegmented || !std::is_same_v<BucketContainer, default_container_t>) {
-            if constexpr (has_reserve<bucket_container_type>) {
-                m_buckets.reserve(num_buckets);
-            }
-            for (size_t i = m_buckets.size(); i < num_buckets; ++i) {
-                m_buckets.emplace_back();
-            }
-        } else {
-            m_buckets.resize(num_buckets);
-        }
-        if (num_buckets == max_bucket_count()) {
-            // reached the maximum, make sure we can use each bucket
-            m_max_bucket_capacity = max_bucket_count();
-        } else {
-            m_max_bucket_capacity = static_cast<value_idx_type>(static_cast<float>(num_buckets) * max_load_factor());
-        }
-    }
-
-    void clear_buckets() {
-        if constexpr (IsSegmented || !std::is_same_v<BucketContainer, default_container_t>) {
-            for (auto&& e : m_buckets) {
-                std::memset(&e, 0, sizeof(e));
-            }
-        } else {
-            std::memset(m_buckets.data(), 0, sizeof(Bucket) * bucket_count());
-        }
-    }
-
-    void clear_and_fill_buckets_from_values() {
-        clear_buckets();
-        for (value_idx_type value_idx = 0, end_idx = static_cast<value_idx_type>(m_values.size()); value_idx < end_idx;
-             ++value_idx) {
-            auto const& key = get_key(m_values[value_idx]);
-            auto [dist_and_fingerprint, bucket] = next_while_less(key);
-
-            // we know for certain that key has not yet been inserted, so no need to check it.
-            place_and_shift_up({dist_and_fingerprint, value_idx}, bucket);
-        }
-    }
-
-    void increase_size() {
-        if (m_max_bucket_capacity == max_bucket_count()) {
-            // remove the value again, we can't add it!
-            m_values.pop_back();
-            on_error_bucket_overflow();
-        }
-        --m_shifts;
-        if constexpr (!IsSegmented || std::is_same_v<BucketContainer, default_container_t>) {
-            deallocate_buckets();
-        }
-        allocate_buckets_from_shift();
-        clear_and_fill_buckets_from_values();
-    }
-
-    template <typename Op>
-    void do_erase(value_idx_type bucket_idx, Op handle_erased_value) {
-        auto const value_idx_to_remove = at(m_buckets, bucket_idx).m_value_idx;
-
-        // shift down until either empty or an element with correct spot is found
-        auto next_bucket_idx = next(bucket_idx);
-        while (at(m_buckets, next_bucket_idx).m_dist_and_fingerprint >= Bucket::dist_inc * 2) {
-            at(m_buckets, bucket_idx) = {dist_dec(at(m_buckets, next_bucket_idx).m_dist_and_fingerprint),
-                                         at(m_buckets, next_bucket_idx).m_value_idx};
-            bucket_idx = std::exchange(next_bucket_idx, next(next_bucket_idx));
-        }
-        at(m_buckets, bucket_idx) = {};
-        handle_erased_value(std::move(m_values[value_idx_to_remove]));
-
-        // update m_values
-        if (value_idx_to_remove != m_values.size() - 1) {
-            // no luck, we'll have to replace the value with the last one and update the index accordingly
-            auto& val = m_values[value_idx_to_remove];
-            val = std::move(m_values.back());
-
-            // update the values_idx of the moved entry. No need to play the info game, just look until we find the values_idx
-            auto mh = mixed_hash(get_key(val));
-            bucket_idx = bucket_idx_from_hash(mh);
-
-            auto const values_idx_back = static_cast<value_idx_type>(m_values.size() - 1);
-            while (values_idx_back != at(m_buckets, bucket_idx).m_value_idx) {
-                bucket_idx = next(bucket_idx);
-            }
-            at(m_buckets, bucket_idx).m_value_idx = value_idx_to_remove;
-        }
-        m_values.pop_back();
-    }
-
-    template <typename K, typename Op>
-    auto do_erase_key(K&& key, Op handle_erased_value) -> size_t {
-        if (empty()) {
-            return 0;
-        }
-
-        auto [dist_and_fingerprint, bucket_idx] = next_while_less(key);
-
-        while (dist_and_fingerprint == at(m_buckets, bucket_idx).m_dist_and_fingerprint &&
-               !m_equal(key, get_key(m_values[at(m_buckets, bucket_idx).m_value_idx]))) {
-            dist_and_fingerprint = dist_inc(dist_and_fingerprint);
-            bucket_idx = next(bucket_idx);
-        }
-
-        if (dist_and_fingerprint != at(m_buckets, bucket_idx).m_dist_and_fingerprint) {
-            return 0;
-        }
-        do_erase(bucket_idx, handle_erased_value);
-        return 1;
-    }
-
-    template <class K, class M>
-    auto do_insert_or_assign(K&& key, M&& mapped) -> std::pair<iterator, bool> {
-        auto it_isinserted = try_emplace(std::forward<K>(key), std::forward<M>(mapped));
-        if (!it_isinserted.second) {
-            it_isinserted.first->second = std::forward<M>(mapped);
-        }
-        return it_isinserted;
-    }
-
-    template <typename... Args>
-    auto do_place_element(dist_and_fingerprint_type dist_and_fingerprint, value_idx_type bucket_idx, Args&&... args)
-        -> std::pair<iterator, bool> {
-
-        // emplace the new value. If that throws an exception, no harm done; index is still in a valid state
-        m_values.emplace_back(std::forward<Args>(args)...);
-
-        auto value_idx = static_cast<value_idx_type>(m_values.size() - 1);
-        if (ANKERL_UNORDERED_DENSE_UNLIKELY(is_full())) {
-            increase_size();
-        } else {
-            place_and_shift_up({dist_and_fingerprint, value_idx}, bucket_idx);
-        }
-
-        // place element and shift up until we find an empty spot
-        return {begin() + static_cast<difference_type>(value_idx), true};
-    }
-
-    template <typename K, typename... Args>
-    auto do_try_emplace(K&& key, Args&&... args) -> std::pair<iterator, bool> {
-        auto hash = mixed_hash(key);
-        auto dist_and_fingerprint = dist_and_fingerprint_from_hash(hash);
-        auto bucket_idx = bucket_idx_from_hash(hash);
-
-        while (true) {
-            auto* bucket = &at(m_buckets, bucket_idx);
-            if (dist_and_fingerprint == bucket->m_dist_and_fingerprint) {
-                if (m_equal(key, get_key(m_values[bucket->m_value_idx]))) {
-                    return {begin() + static_cast<difference_type>(bucket->m_value_idx), false};
-                }
-            } else if (dist_and_fingerprint > bucket->m_dist_and_fingerprint) {
-                return do_place_element(dist_and_fingerprint,
-                                        bucket_idx,
-                                        std::piecewise_construct,
-                                        std::forward_as_tuple(std::forward<K>(key)),
-                                        std::forward_as_tuple(std::forward<Args>(args)...));
-            }
-            dist_and_fingerprint = dist_inc(dist_and_fingerprint);
-            bucket_idx = next(bucket_idx);
-        }
-    }
-
-    template <typename K>
-    auto do_find(K const& key) -> iterator {
-        if (ANKERL_UNORDERED_DENSE_UNLIKELY(empty())) {
-            return end();
-        }
-
-        auto mh = mixed_hash(key);
-        auto dist_and_fingerprint = dist_and_fingerprint_from_hash(mh);
-        auto bucket_idx = bucket_idx_from_hash(mh);
-        auto* bucket = &at(m_buckets, bucket_idx);
-
-        // unrolled loop. *Always* check a few directly, then enter the loop. This is faster.
-        if (dist_and_fingerprint == bucket->m_dist_and_fingerprint && m_equal(key, get_key(m_values[bucket->m_value_idx]))) {
-            return begin() + static_cast<difference_type>(bucket->m_value_idx);
-        }
-        dist_and_fingerprint = dist_inc(dist_and_fingerprint);
-        bucket_idx = next(bucket_idx);
-        bucket = &at(m_buckets, bucket_idx);
-
-        if (dist_and_fingerprint == bucket->m_dist_and_fingerprint && m_equal(key, get_key(m_values[bucket->m_value_idx]))) {
-            return begin() + static_cast<difference_type>(bucket->m_value_idx);
-        }
-        dist_and_fingerprint = dist_inc(dist_and_fingerprint);
-        bucket_idx = next(bucket_idx);
-        bucket = &at(m_buckets, bucket_idx);
-
-        while (true) {
-            if (dist_and_fingerprint == bucket->m_dist_and_fingerprint) {
-                if (m_equal(key, get_key(m_values[bucket->m_value_idx]))) {
-                    return begin() + static_cast<difference_type>(bucket->m_value_idx);
-                }
-            } else if (dist_and_fingerprint > bucket->m_dist_and_fingerprint) {
-                return end();
-            }
-            dist_and_fingerprint = dist_inc(dist_and_fingerprint);
-            bucket_idx = next(bucket_idx);
-            bucket = &at(m_buckets, bucket_idx);
-        }
-    }
-
-    template <typename K>
-    auto do_find(K const& key) const -> const_iterator {
-        return const_cast<table*>(this)->do_find(key); // NOLINT(cppcoreguidelines-pro-type-const-cast)
-    }
-
-    template <typename K, typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto do_at(K const& key) -> Q& {
-        if (auto it = find(key); ANKERL_UNORDERED_DENSE_LIKELY(end() != it)) {
-            return it->second;
-        }
-        on_error_key_not_found();
-    }
-
-    template <typename K, typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto do_at(K const& key) const -> Q const& {
-        return const_cast<table*>(this)->at(key); // NOLINT(cppcoreguidelines-pro-type-const-cast)
-    }
-
-public:
-    explicit table(size_t bucket_count,
-                   Hash const& hash = Hash(),
-                   KeyEqual const& equal = KeyEqual(),
-                   allocator_type const& alloc_or_container = allocator_type())
-        : m_values(alloc_or_container)
-        , m_buckets(alloc_or_container)
-        , m_hash(hash)
-        , m_equal(equal) {
-        if (0 != bucket_count) {
-            reserve(bucket_count);
-        } else {
-            allocate_buckets_from_shift();
-            clear_buckets();
-        }
-    }
-
-    table()
-        : table(0) {}
-
-    table(size_t bucket_count, allocator_type const& alloc)
-        : table(bucket_count, Hash(), KeyEqual(), alloc) {}
-
-    table(size_t bucket_count, Hash const& hash, allocator_type const& alloc)
-        : table(bucket_count, hash, KeyEqual(), alloc) {}
-
-    explicit table(allocator_type const& alloc)
-        : table(0, Hash(), KeyEqual(), alloc) {}
-
-    template <class InputIt>
-    table(InputIt first,
-          InputIt last,
-          size_type bucket_count = 0,
-          Hash const& hash = Hash(),
-          KeyEqual const& equal = KeyEqual(),
-          allocator_type const& alloc = allocator_type())
-        : table(bucket_count, hash, equal, alloc) {
-        insert(first, last);
-    }
-
-    template <class InputIt>
-    table(InputIt first, InputIt last, size_type bucket_count, allocator_type const& alloc)
-        : table(first, last, bucket_count, Hash(), KeyEqual(), alloc) {}
-
-    template <class InputIt>
-    table(InputIt first, InputIt last, size_type bucket_count, Hash const& hash, allocator_type const& alloc)
-        : table(first, last, bucket_count, hash, KeyEqual(), alloc) {}
-
-    table(table const& other)
-        : table(other, other.m_values.get_allocator()) {}
-
-    table(table const& other, allocator_type const& alloc)
-        : m_values(other.m_values, alloc)
-        , m_max_load_factor(other.m_max_load_factor)
-        , m_hash(other.m_hash)
-        , m_equal(other.m_equal) {
-        copy_buckets(other);
-    }
-
-    table(table&& other) noexcept
-        : table(std::move(other), other.m_values.get_allocator()) {}
-
-    table(table&& other, allocator_type const& alloc) noexcept
-        : m_values(alloc) {
-        *this = std::move(other);
-    }
-
-    table(std::initializer_list<value_type> ilist,
-          size_t bucket_count = 0,
-          Hash const& hash = Hash(),
-          KeyEqual const& equal = KeyEqual(),
-          allocator_type const& alloc = allocator_type())
-        : table(bucket_count, hash, equal, alloc) {
-        insert(ilist);
-    }
-
-    table(std::initializer_list<value_type> ilist, size_type bucket_count, allocator_type const& alloc)
-        : table(ilist, bucket_count, Hash(), KeyEqual(), alloc) {}
-
-    table(std::initializer_list<value_type> init, size_type bucket_count, Hash const& hash, allocator_type const& alloc)
-        : table(init, bucket_count, hash, KeyEqual(), alloc) {}
-
-    ~table() {}
-
-    auto operator=(table const& other) -> table& {
-        if (&other != this) {
-            deallocate_buckets(); // deallocate before m_values is set (might have another allocator)
-            m_values = other.m_values;
-            m_max_load_factor = other.m_max_load_factor;
-            m_hash = other.m_hash;
-            m_equal = other.m_equal;
-            m_shifts = initial_shifts;
-            copy_buckets(other);
-        }
-        return *this;
-    }
-
-    auto operator=(table&& other) noexcept(noexcept(std::is_nothrow_move_assignable_v<value_container_type> &&
-                                                    std::is_nothrow_move_assignable_v<Hash> &&
-                                                    std::is_nothrow_move_assignable_v<KeyEqual>)) -> table& {
-        if (&other != this) {
-            deallocate_buckets(); // deallocate before m_values is set (might have another allocator)
-            m_values = std::move(other.m_values);
-            other.m_values.clear();
-
-            // we can only reuse m_buckets when both maps have the same allocator!
-            if (get_allocator() == other.get_allocator()) {
-                m_buckets = std::move(other.m_buckets);
-                other.m_buckets.clear();
-                m_max_bucket_capacity = std::exchange(other.m_max_bucket_capacity, 0);
-                m_shifts = std::exchange(other.m_shifts, initial_shifts);
-                m_max_load_factor = std::exchange(other.m_max_load_factor, default_max_load_factor);
-                m_hash = std::exchange(other.m_hash, {});
-                m_equal = std::exchange(other.m_equal, {});
-                other.allocate_buckets_from_shift();
-                other.clear_buckets();
-            } else {
-                // set max_load_factor *before* copying the other's buckets, so we have the same
-                // behavior
-                m_max_load_factor = other.m_max_load_factor;
-
-                // copy_buckets sets m_buckets, m_num_buckets, m_max_bucket_capacity, m_shifts
-                copy_buckets(other);
-                // clear's the other's buckets so other is now already usable.
-                other.clear_buckets();
-                m_hash = other.m_hash;
-                m_equal = other.m_equal;
-            }
-            // map "other" is now already usable, it's empty.
-        }
-        return *this;
-    }
-
-    auto operator=(std::initializer_list<value_type> ilist) -> table& {
-        clear();
-        insert(ilist);
-        return *this;
-    }
-
-    auto get_allocator() const noexcept -> allocator_type {
-        return m_values.get_allocator();
-    }
-
-    // iterators //////////////////////////////////////////////////////////////
-
-    auto begin() noexcept -> iterator {
-        return m_values.begin();
-    }
-
-    auto begin() const noexcept -> const_iterator {
-        return m_values.begin();
-    }
-
-    auto cbegin() const noexcept -> const_iterator {
-        return m_values.cbegin();
-    }
-
-    auto end() noexcept -> iterator {
-        return m_values.end();
-    }
-
-    auto cend() const noexcept -> const_iterator {
-        return m_values.cend();
-    }
-
-    auto end() const noexcept -> const_iterator {
-        return m_values.end();
-    }
-
-    // capacity ///////////////////////////////////////////////////////////////
-
-    [[nodiscard]] auto empty() const noexcept -> bool {
-        return m_values.empty();
-    }
-
-    [[nodiscard]] auto size() const noexcept -> size_t {
-        return m_values.size();
-    }
-
-    [[nodiscard]] static constexpr auto max_size() noexcept -> size_t {
-        if constexpr ((std::numeric_limits<value_idx_type>::max)() == (std::numeric_limits<size_t>::max)()) {
-            return size_t{1} << (sizeof(value_idx_type) * 8 - 1);
-        } else {
-            return size_t{1} << (sizeof(value_idx_type) * 8);
-        }
-    }
-
-    // modifiers //////////////////////////////////////////////////////////////
-
-    void clear() {
-        m_values.clear();
-        clear_buckets();
-    }
-
-    auto insert(value_type const& value) -> std::pair<iterator, bool> {
-        return emplace(value);
-    }
-
-    auto insert(value_type&& value) -> std::pair<iterator, bool> {
-        return emplace(std::move(value));
-    }
-
-    template <class P, std::enable_if_t<std::is_constructible_v<value_type, P&&>, bool> = true>
-    auto insert(P&& value) -> std::pair<iterator, bool> {
-        return emplace(std::forward<P>(value));
-    }
-
-    auto insert(const_iterator /*hint*/, value_type const& value) -> iterator {
-        return insert(value).first;
-    }
-
-    auto insert(const_iterator /*hint*/, value_type&& value) -> iterator {
-        return insert(std::move(value)).first;
-    }
-
-    template <class P, std::enable_if_t<std::is_constructible_v<value_type, P&&>, bool> = true>
-    auto insert(const_iterator /*hint*/, P&& value) -> iterator {
-        return insert(std::forward<P>(value)).first;
-    }
-
-    template <class InputIt>
-    void insert(InputIt first, InputIt last) {
-        while (first != last) {
-            insert(*first);
-            ++first;
-        }
-    }
-
-    void insert(std::initializer_list<value_type> ilist) {
-        insert(ilist.begin(), ilist.end());
-    }
-
-    // nonstandard API: *this is emptied.
-    // Also see "A Standard flat_map" https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2022/p0429r9.pdf
-    auto extract() && -> value_container_type {
-        return std::move(m_values);
-    }
-
-    // nonstandard API:
-    // Discards the internally held container and replaces it with the one passed. Erases non-unique elements.
-    auto replace(value_container_type&& container) {
-        if (ANKERL_UNORDERED_DENSE_UNLIKELY(container.size() > max_size())) {
-            on_error_too_many_elements();
-        }
-        auto shifts = calc_shifts_for_size(container.size());
-        if (0 == bucket_count() || shifts < m_shifts || container.get_allocator() != m_values.get_allocator()) {
-            m_shifts = shifts;
-            deallocate_buckets();
-            allocate_buckets_from_shift();
-        }
-        clear_buckets();
-
-        m_values = std::move(container);
-
-        // can't use clear_and_fill_buckets_from_values() because container elements might not be unique
-        auto value_idx = value_idx_type{};
-
-        // loop until we reach the end of the container. duplicated entries will be replaced with back().
-        while (value_idx != static_cast<value_idx_type>(m_values.size())) {
-            auto const& key = get_key(m_values[value_idx]);
-
-            auto hash = mixed_hash(key);
-            auto dist_and_fingerprint = dist_and_fingerprint_from_hash(hash);
-            auto bucket_idx = bucket_idx_from_hash(hash);
-
-            bool key_found = false;
-            while (true) {
-                auto const& bucket = at(m_buckets, bucket_idx);
-                if (dist_and_fingerprint > bucket.m_dist_and_fingerprint) {
-                    break;
-                }
-                if (dist_and_fingerprint == bucket.m_dist_and_fingerprint &&
-                    m_equal(key, get_key(m_values[bucket.m_value_idx]))) {
-                    key_found = true;
-                    break;
-                }
-                dist_and_fingerprint = dist_inc(dist_and_fingerprint);
-                bucket_idx = next(bucket_idx);
-            }
-
-            if (key_found) {
-                if (value_idx != static_cast<value_idx_type>(m_values.size() - 1)) {
-                    m_values[value_idx] = std::move(m_values.back());
-                }
-                m_values.pop_back();
-            } else {
-                place_and_shift_up({dist_and_fingerprint, value_idx}, bucket_idx);
-                ++value_idx;
-            }
-        }
-    }
-
-    template <class M, typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto insert_or_assign(Key const& key, M&& mapped) -> std::pair<iterator, bool> {
-        return do_insert_or_assign(key, std::forward<M>(mapped));
-    }
-
-    template <class M, typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto insert_or_assign(Key&& key, M&& mapped) -> std::pair<iterator, bool> {
-        return do_insert_or_assign(std::move(key), std::forward<M>(mapped));
-    }
-
-    template <typename K,
-              typename M,
-              typename Q = T,
-              typename H = Hash,
-              typename KE = KeyEqual,
-              std::enable_if_t<is_map_v<Q> && is_transparent_v<H, KE>, bool> = true>
-    auto insert_or_assign(K&& key, M&& mapped) -> std::pair<iterator, bool> {
-        return do_insert_or_assign(std::forward<K>(key), std::forward<M>(mapped));
-    }
-
-    template <class M, typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto insert_or_assign(const_iterator /*hint*/, Key const& key, M&& mapped) -> iterator {
-        return do_insert_or_assign(key, std::forward<M>(mapped)).first;
-    }
-
-    template <class M, typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto insert_or_assign(const_iterator /*hint*/, Key&& key, M&& mapped) -> iterator {
-        return do_insert_or_assign(std::move(key), std::forward<M>(mapped)).first;
-    }
-
-    template <typename K,
-              typename M,
-              typename Q = T,
-              typename H = Hash,
-              typename KE = KeyEqual,
-              std::enable_if_t<is_map_v<Q> && is_transparent_v<H, KE>, bool> = true>
-    auto insert_or_assign(const_iterator /*hint*/, K&& key, M&& mapped) -> iterator {
-        return do_insert_or_assign(std::forward<K>(key), std::forward<M>(mapped)).first;
-    }
-
-    // Single arguments for unordered_set can be used without having to construct the value_type
-    template <class K,
-              typename Q = T,
-              typename H = Hash,
-              typename KE = KeyEqual,
-              std::enable_if_t<!is_map_v<Q> && is_transparent_v<H, KE>, bool> = true>
-    auto emplace(K&& key) -> std::pair<iterator, bool> {
-        auto hash = mixed_hash(key);
-        auto dist_and_fingerprint = dist_and_fingerprint_from_hash(hash);
-        auto bucket_idx = bucket_idx_from_hash(hash);
-
-        while (dist_and_fingerprint <= at(m_buckets, bucket_idx).m_dist_and_fingerprint) {
-            if (dist_and_fingerprint == at(m_buckets, bucket_idx).m_dist_and_fingerprint &&
-                m_equal(key, m_values[at(m_buckets, bucket_idx).m_value_idx])) {
-                // found it, return without ever actually creating anything
-                return {begin() + static_cast<difference_type>(at(m_buckets, bucket_idx).m_value_idx), false};
-            }
-            dist_and_fingerprint = dist_inc(dist_and_fingerprint);
-            bucket_idx = next(bucket_idx);
-        }
-
-        // value is new, insert element first, so when exception happens we are in a valid state
-        return do_place_element(dist_and_fingerprint, bucket_idx, std::forward<K>(key));
-    }
-
-    template <class... Args>
-    auto emplace(Args&&... args) -> std::pair<iterator, bool> {
-        // we have to instantiate the value_type to be able to access the key.
-        // 1. emplace_back the object so it is constructed. 2. If the key is already there, pop it later in the loop.
-        auto& key = get_key(m_values.emplace_back(std::forward<Args>(args)...));
-        auto hash = mixed_hash(key);
-        auto dist_and_fingerprint = dist_and_fingerprint_from_hash(hash);
-        auto bucket_idx = bucket_idx_from_hash(hash);
-
-        while (dist_and_fingerprint <= at(m_buckets, bucket_idx).m_dist_and_fingerprint) {
-            if (dist_and_fingerprint == at(m_buckets, bucket_idx).m_dist_and_fingerprint &&
-                m_equal(key, get_key(m_values[at(m_buckets, bucket_idx).m_value_idx]))) {
-                m_values.pop_back(); // value was already there, so get rid of it
-                return {begin() + static_cast<difference_type>(at(m_buckets, bucket_idx).m_value_idx), false};
-            }
-            dist_and_fingerprint = dist_inc(dist_and_fingerprint);
-            bucket_idx = next(bucket_idx);
-        }
-
-        // value is new, place the bucket and shift up until we find an empty spot
-        auto value_idx = static_cast<value_idx_type>(m_values.size() - 1);
-        if (ANKERL_UNORDERED_DENSE_UNLIKELY(is_full())) {
-            // increase_size just rehashes all the data we have in m_values
-            increase_size();
-        } else {
-            // place element and shift up until we find an empty spot
-            place_and_shift_up({dist_and_fingerprint, value_idx}, bucket_idx);
-        }
-        return {begin() + static_cast<difference_type>(value_idx), true};
-    }
-
-    template <class... Args>
-    auto emplace_hint(const_iterator /*hint*/, Args&&... args) -> iterator {
-        return emplace(std::forward<Args>(args)...).first;
-    }
-
-    template <class... Args, typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto try_emplace(Key const& key, Args&&... args) -> std::pair<iterator, bool> {
-        return do_try_emplace(key, std::forward<Args>(args)...);
-    }
-
-    template <class... Args, typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto try_emplace(Key&& key, Args&&... args) -> std::pair<iterator, bool> {
-        return do_try_emplace(std::move(key), std::forward<Args>(args)...);
-    }
-
-    template <class... Args, typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto try_emplace(const_iterator /*hint*/, Key const& key, Args&&... args) -> iterator {
-        return do_try_emplace(key, std::forward<Args>(args)...).first;
-    }
-
-    template <class... Args, typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto try_emplace(const_iterator /*hint*/, Key&& key, Args&&... args) -> iterator {
-        return do_try_emplace(std::move(key), std::forward<Args>(args)...).first;
-    }
-
-    template <
-        typename K,
-        typename... Args,
-        typename Q = T,
-        typename H = Hash,
-        typename KE = KeyEqual,
-        std::enable_if_t<is_map_v<Q> && is_transparent_v<H, KE> && is_neither_convertible_v<K&&, iterator, const_iterator>,
-                         bool> = true>
-    auto try_emplace(K&& key, Args&&... args) -> std::pair<iterator, bool> {
-        return do_try_emplace(std::forward<K>(key), std::forward<Args>(args)...);
-    }
-
-    template <
-        typename K,
-        typename... Args,
-        typename Q = T,
-        typename H = Hash,
-        typename KE = KeyEqual,
-        std::enable_if_t<is_map_v<Q> && is_transparent_v<H, KE> && is_neither_convertible_v<K&&, iterator, const_iterator>,
-                         bool> = true>
-    auto try_emplace(const_iterator /*hint*/, K&& key, Args&&... args) -> iterator {
-        return do_try_emplace(std::forward<K>(key), std::forward<Args>(args)...).first;
-    }
-
-    auto erase(iterator it) -> iterator {
-        auto hash = mixed_hash(get_key(*it));
-        auto bucket_idx = bucket_idx_from_hash(hash);
-
-        auto const value_idx_to_remove = static_cast<value_idx_type>(it - cbegin());
-        while (at(m_buckets, bucket_idx).m_value_idx != value_idx_to_remove) {
-            bucket_idx = next(bucket_idx);
-        }
-
-        do_erase(bucket_idx, [](value_type&& /*unused*/) {
-        });
-        return begin() + static_cast<difference_type>(value_idx_to_remove);
-    }
-
-    auto extract(iterator it) -> value_type {
-        auto hash = mixed_hash(get_key(*it));
-        auto bucket_idx = bucket_idx_from_hash(hash);
-
-        auto const value_idx_to_remove = static_cast<value_idx_type>(it - cbegin());
-        while (at(m_buckets, bucket_idx).m_value_idx != value_idx_to_remove) {
-            bucket_idx = next(bucket_idx);
-        }
-
-        auto tmp = std::optional<value_type>{};
-        do_erase(bucket_idx, [&tmp](value_type&& val) {
-            tmp = std::move(val);
-        });
-        return std::move(tmp).value();
-    }
-
-    template <typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto erase(const_iterator it) -> iterator {
-        return erase(begin() + (it - cbegin()));
-    }
-
-    template <typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto extract(const_iterator it) -> value_type {
-        return extract(begin() + (it - cbegin()));
-    }
-
-    auto erase(const_iterator first, const_iterator last) -> iterator {
-        auto const idx_first = first - cbegin();
-        auto const idx_last = last - cbegin();
-        auto const first_to_last = std::distance(first, last);
-        auto const last_to_end = std::distance(last, cend());
-
-        // remove elements from left to right which moves elements from the end back
-        auto const mid = idx_first + (std::min)(first_to_last, last_to_end);
-        auto idx = idx_first;
-        while (idx != mid) {
-            erase(begin() + idx);
-            ++idx;
-        }
-
-        // all elements from the right are moved, now remove the last element until all done
-        idx = idx_last;
-        while (idx != mid) {
-            --idx;
-            erase(begin() + idx);
-        }
-
-        return begin() + idx_first;
-    }
-
-    auto erase(Key const& key) -> size_t {
-        return do_erase_key(key, [](value_type&& /*unused*/) {
-        });
-    }
-
-    auto extract(Key const& key) -> std::optional<value_type> {
-        auto tmp = std::optional<value_type>{};
-        do_erase_key(key, [&tmp](value_type&& val) {
-            tmp = std::move(val);
-        });
-        return tmp;
-    }
-
-    template <class K, class H = Hash, class KE = KeyEqual, std::enable_if_t<is_transparent_v<H, KE>, bool> = true>
-    auto erase(K&& key) -> size_t {
-        return do_erase_key(std::forward<K>(key), [](value_type&& /*unused*/) {
-        });
-    }
-
-    template <class K, class H = Hash, class KE = KeyEqual, std::enable_if_t<is_transparent_v<H, KE>, bool> = true>
-    auto extract(K&& key) -> std::optional<value_type> {
-        auto tmp = std::optional<value_type>{};
-        do_erase_key(std::forward<K>(key), [&tmp](value_type&& val) {
-            tmp = std::move(val);
-        });
-        return tmp;
-    }
-
-    void swap(table& other) noexcept(noexcept(std::is_nothrow_swappable_v<value_container_type> &&
-                                              std::is_nothrow_swappable_v<Hash> && std::is_nothrow_swappable_v<KeyEqual>)) {
-        using std::swap;
-        swap(other, *this);
-    }
-
-    // lookup /////////////////////////////////////////////////////////////////
-
-    template <typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto at(key_type const& key) -> Q& {
-        return do_at(key);
-    }
-
-    template <typename K,
-              typename Q = T,
-              typename H = Hash,
-              typename KE = KeyEqual,
-              std::enable_if_t<is_map_v<Q> && is_transparent_v<H, KE>, bool> = true>
-    auto at(K const& key) -> Q& {
-        return do_at(key);
-    }
-
-    template <typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto at(key_type const& key) const -> Q const& {
-        return do_at(key);
-    }
-
-    template <typename K,
-              typename Q = T,
-              typename H = Hash,
-              typename KE = KeyEqual,
-              std::enable_if_t<is_map_v<Q> && is_transparent_v<H, KE>, bool> = true>
-    auto at(K const& key) const -> Q const& {
-        return do_at(key);
-    }
-
-    template <typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto operator[](Key const& key) -> Q& {
-        return try_emplace(key).first->second;
-    }
-
-    template <typename Q = T, std::enable_if_t<is_map_v<Q>, bool> = true>
-    auto operator[](Key&& key) -> Q& {
-        return try_emplace(std::move(key)).first->second;
-    }
-
-    template <typename K,
-              typename Q = T,
-              typename H = Hash,
-              typename KE = KeyEqual,
-              std::enable_if_t<is_map_v<Q> && is_transparent_v<H, KE>, bool> = true>
-    auto operator[](K&& key) -> Q& {
-        return try_emplace(std::forward<K>(key)).first->second;
-    }
-
-    auto count(Key const& key) const -> size_t {
-        return find(key) == end() ? 0 : 1;
-    }
-
-    template <class K, class H = Hash, class KE = KeyEqual, std::enable_if_t<is_transparent_v<H, KE>, bool> = true>
-    auto count(K const& key) const -> size_t {
-        return find(key) == end() ? 0 : 1;
-    }
-
-    auto find(Key const& key) -> iterator {
-        return do_find(key);
-    }
-
-    auto find(Key const& key) const -> const_iterator {
-        return do_find(key);
-    }
-
-    template <class K, class H = Hash, class KE = KeyEqual, std::enable_if_t<is_transparent_v<H, KE>, bool> = true>
-    auto find(K const& key) -> iterator {
-        return do_find(key);
-    }
-
-    template <class K, class H = Hash, class KE = KeyEqual, std::enable_if_t<is_transparent_v<H, KE>, bool> = true>
-    auto find(K const& key) const -> const_iterator {
-        return do_find(key);
-    }
-
-    auto contains(Key const& key) const -> bool {
-        return find(key) != end();
-    }
-
-    template <class K, class H = Hash, class KE = KeyEqual, std::enable_if_t<is_transparent_v<H, KE>, bool> = true>
-    auto contains(K const& key) const -> bool {
-        return find(key) != end();
-    }
-
-    auto equal_range(Key const& key) -> std::pair<iterator, iterator> {
-        auto it = do_find(key);
-        return {it, it == end() ? end() : it + 1};
-    }
-
-    auto equal_range(const Key& key) const -> std::pair<const_iterator, const_iterator> {
-        auto it = do_find(key);
-        return {it, it == end() ? end() : it + 1};
-    }
-
-    template <class K, class H = Hash, class KE = KeyEqual, std::enable_if_t<is_transparent_v<H, KE>, bool> = true>
-    auto equal_range(K const& key) -> std::pair<iterator, iterator> {
-        auto it = do_find(key);
-        return {it, it == end() ? end() : it + 1};
-    }
-
-    template <class K, class H = Hash, class KE = KeyEqual, std::enable_if_t<is_transparent_v<H, KE>, bool> = true>
-    auto equal_range(K const& key) const -> std::pair<const_iterator, const_iterator> {
-        auto it = do_find(key);
-        return {it, it == end() ? end() : it + 1};
-    }
-
-    // bucket interface ///////////////////////////////////////////////////////
-
-    auto bucket_count() const noexcept -> size_t { // NOLINT(modernize-use-nodiscard)
-        return m_buckets.size();
-    }
-
-    static constexpr auto max_bucket_count() noexcept -> size_t { // NOLINT(modernize-use-nodiscard)
-        return max_size();
-    }
-
-    // hash policy ////////////////////////////////////////////////////////////
-
-    [[nodiscard]] auto load_factor() const -> float {
-        return bucket_count() ? static_cast<float>(size()) / static_cast<float>(bucket_count()) : 0.0F;
-    }
-
-    [[nodiscard]] auto max_load_factor() const -> float {
-        return m_max_load_factor;
-    }
-
-    void max_load_factor(float ml) {
-        m_max_load_factor = ml;
-        if (bucket_count() != max_bucket_count()) {
-            m_max_bucket_capacity = static_cast<value_idx_type>(static_cast<float>(bucket_count()) * max_load_factor());
-        }
-    }
-
-    void rehash(size_t count) {
-        count = (std::min)(count, max_size());
-        auto shifts = calc_shifts_for_size((std::max)(count, size()));
-        if (shifts != m_shifts) {
-            m_shifts = shifts;
-            deallocate_buckets();
-            m_values.shrink_to_fit();
-            allocate_buckets_from_shift();
-            clear_and_fill_buckets_from_values();
-        }
-    }
-
-    void reserve(size_t capa) {
-        capa = (std::min)(capa, max_size());
-        if constexpr (has_reserve<value_container_type>) {
-            // std::deque doesn't have reserve(). Make sure we only call when available
-            m_values.reserve(capa);
-        }
-        auto shifts = calc_shifts_for_size((std::max)(capa, size()));
-        if (0 == bucket_count() || shifts < m_shifts) {
-            m_shifts = shifts;
-            deallocate_buckets();
-            allocate_buckets_from_shift();
-            clear_and_fill_buckets_from_values();
-        }
-    }
-
-    // observers //////////////////////////////////////////////////////////////
-
-    auto hash_function() const -> hasher {
-        return m_hash;
-    }
-
-    auto key_eq() const -> key_equal {
-        return m_equal;
-    }
-
-    // nonstandard API: expose the underlying values container
-    [[nodiscard]] auto values() const noexcept -> value_container_type const& {
-        return m_values;
-    }
-
-    // non-member functions ///////////////////////////////////////////////////
-
-    friend auto operator==(table const& a, table const& b) -> bool {
-        if (&a == &b) {
-            return true;
-        }
-        if (a.size() != b.size()) {
-            return false;
-        }
-        for (auto const& b_entry : b) {
-            auto it = a.find(get_key(b_entry));
-            if constexpr (is_map_v<T>) {
-                // map: check that key is here, then also check that value is the same
-                if (a.end() == it || !(b_entry.second == it->second)) {
-                    return false;
-                }
-            } else {
-                // set: only check that the key is here
-                if (a.end() == it) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    friend auto operator!=(table const& a, table const& b) -> bool {
-        return !(a == b);
-    }
-};
-
-} // namespace detail
-
-ANKERL_UNORDERED_DENSE_EXPORT template <class Key,
-                                        class T,
-                                        class Hash = hash<Key>,
-                                        class KeyEqual = std::equal_to<Key>,
-                                        class AllocatorOrContainer = std::allocator<std::pair<Key, T>>,
-                                        class Bucket = bucket_type::standard,
-                                        class BucketContainer = detail::default_container_t>
-using map = detail::table<Key, T, Hash, KeyEqual, AllocatorOrContainer, Bucket, BucketContainer, false>;
-
-ANKERL_UNORDERED_DENSE_EXPORT template <class Key,
-                                        class T,
-                                        class Hash = hash<Key>,
-                                        class KeyEqual = std::equal_to<Key>,
-                                        class AllocatorOrContainer = std::allocator<std::pair<Key, T>>,
-                                        class Bucket = bucket_type::standard,
-                                        class BucketContainer = detail::default_container_t>
-using segmented_map = detail::table<Key, T, Hash, KeyEqual, AllocatorOrContainer, Bucket, BucketContainer, true>;
-
-ANKERL_UNORDERED_DENSE_EXPORT template <class Key,
-                                        class Hash = hash<Key>,
-                                        class KeyEqual = std::equal_to<Key>,
-                                        class AllocatorOrContainer = std::allocator<Key>,
-                                        class Bucket = bucket_type::standard,
-                                        class BucketContainer = detail::default_container_t>
-using set = detail::table<Key, void, Hash, KeyEqual, AllocatorOrContainer, Bucket, BucketContainer, false>;
-
-ANKERL_UNORDERED_DENSE_EXPORT template <class Key,
-                                        class Hash = hash<Key>,
-                                        class KeyEqual = std::equal_to<Key>,
-                                        class AllocatorOrContainer = std::allocator<Key>,
-                                        class Bucket = bucket_type::standard,
-                                        class BucketContainer = detail::default_container_t>
-using segmented_set = detail::table<Key, void, Hash, KeyEqual, AllocatorOrContainer, Bucket, BucketContainer, true>;
-
-#    if defined(ANKERL_UNORDERED_DENSE_PMR)
-
-namespace pmr {
-
-ANKERL_UNORDERED_DENSE_EXPORT template <class Key,
-                                        class T,
-                                        class Hash = hash<Key>,
-                                        class KeyEqual = std::equal_to<Key>,
-                                        class Bucket = bucket_type::standard>
-using map = detail::table<Key,
-                          T,
-                          Hash,
-                          KeyEqual,
-                          ANKERL_UNORDERED_DENSE_PMR::polymorphic_allocator<std::pair<Key, T>>,
-                          Bucket,
-                          detail::default_container_t,
-                          false>;
-
-ANKERL_UNORDERED_DENSE_EXPORT template <class Key,
-                                        class T,
-                                        class Hash = hash<Key>,
-                                        class KeyEqual = std::equal_to<Key>,
-                                        class Bucket = bucket_type::standard>
-using segmented_map = detail::table<Key,
-                                    T,
-                                    Hash,
-                                    KeyEqual,
-                                    ANKERL_UNORDERED_DENSE_PMR::polymorphic_allocator<std::pair<Key, T>>,
-                                    Bucket,
-                                    detail::default_container_t,
-                                    true>;
-
-ANKERL_UNORDERED_DENSE_EXPORT template <class Key,
-                                        class Hash = hash<Key>,
-                                        class KeyEqual = std::equal_to<Key>,
-                                        class Bucket = bucket_type::standard>
-using set = detail::table<Key,
-                          void,
-                          Hash,
-                          KeyEqual,
-                          ANKERL_UNORDERED_DENSE_PMR::polymorphic_allocator<Key>,
-                          Bucket,
-                          detail::default_container_t,
-                          false>;
-
-ANKERL_UNORDERED_DENSE_EXPORT template <class Key,
-                                        class Hash = hash<Key>,
-                                        class KeyEqual = std::equal_to<Key>,
-                                        class Bucket = bucket_type::standard>
-using segmented_set = detail::table<Key,
-                                    void,
-                                    Hash,
-                                    KeyEqual,
-                                    ANKERL_UNORDERED_DENSE_PMR::polymorphic_allocator<Key>,
-                                    Bucket,
-                                    detail::default_container_t,
-                                    true>;
-
-} // namespace pmr
-
-#    endif
-
-// deduction guides ///////////////////////////////////////////////////////////
-
-// deduction guides for alias templates are only possible since C++20
-// see https://en.cppreference.com/w/cpp/language/class_template_argument_deduction
-
-} // namespace ANKERL_UNORDERED_DENSE_NAMESPACE
-} // namespace ankerl::unordered_dense
-
-// std extensions /////////////////////////////////////////////////////////////
-
-namespace std { // NOLINT(cert-dcl58-cpp)
-
-ANKERL_UNORDERED_DENSE_EXPORT template <class Key,
-                                        class T,
-                                        class Hash,
-                                        class KeyEqual,
-                                        class AllocatorOrContainer,
-                                        class Bucket,
-                                        class Pred,
-                                        class BucketContainer,
-                                        bool IsSegmented>
-// NOLINTNEXTLINE(cert-dcl58-cpp)
-auto erase_if(
-    ankerl::unordered_dense::detail::table<Key, T, Hash, KeyEqual, AllocatorOrContainer, Bucket, BucketContainer, IsSegmented>&
-        map,
-    Pred pred) -> size_t {
-    using map_t = ankerl::unordered_dense::detail::
-        table<Key, T, Hash, KeyEqual, AllocatorOrContainer, Bucket, BucketContainer, IsSegmented>;
-
-    // going back to front because erase() invalidates the end iterator
-    auto const old_size = map.size();
-    auto idx = old_size;
-    while (idx) {
-        --idx;
-        auto it = map.begin() + static_cast<typename map_t::difference_type>(idx);
-        if (pred(*it)) {
-            map.erase(it);
-        }
-    }
-
-    return old_size - map.size();
-}
-
-} // namespace std
-
-#endif
-#endif
diff --git a/3rdparty/version_check.sh b/3rdparty/version_check.sh
deleted file mode 100644
index e0632da3e7..0000000000
--- a/3rdparty/version_check.sh
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/bash -ex
-
-verbose=0
-git_verbose=0
-max_jobs=16
-
-lockfile="$(pwd)/version_check.lock"
-resultfile="$(pwd)/version_check_results.txt"
-
-if [ "$1" = "-v" ]; then
-    verbose=1
-elif [ "$1" = "-vv" ]; then
-    verbose=1
-    git_verbose=1
-fi
-
-# Limit concurrent jobs
-job_control()
-{
-    while [ "$(jobs | wc -l)" -ge "$max_jobs" ]; do
-        sleep 0.1
-    done
-}
-
-git_call()
-{
-    if [ "$git_verbose" -eq 1 ]; then
-        eval "git $@"
-    elif [[ "$1" == "fetch" ]]; then
-        eval "git $@ >/dev/null 2>&1"
-    else
-        eval "git $@ 2>/dev/null"
-    fi
-}
-
-check_tags()
-{
-    local path=$(echo "$1" | sed 's:/*$::')
-
-    echo "Checking $path"
-
-    git_call fetch --prune --all
-
-    # Get the latest tag (by commit date, not tag name)
-    local tag_list=$(git_call rev-list --tags --max-count=1)
-    local latest_tag=$(git_call describe --tags "$tag_list")
-    local highest_tag=$(git_call tag -l | sort -V | tail -n1)
-
-    if [ -n "$latest_tag" ] || [ -n "$highest_tag" ]; then
-
-        # Get the current tag
-        local current_tag=$(git_call describe --tags --abbrev=0)
-
-        if [ -n "$current_tag" ]; then
-
-            if [ "$verbose" -eq 1 ]; then
-                echo "$path -> latest: $latest_tag, highest: $highest_tag, current: $current_tag"
-            fi
-
-            local ts0=$(git_call log -1 --format=%ct $highest_tag)
-            local ts1=$(git_call log -1 --format=%ct $latest_tag)
-            local ts2=$(git_call log -1 --format=%ct $current_tag)
-
-            if (( ts0 > ts2 )) || (( ts1 > ts2 )); then
-                if [ "$verbose" -eq 1 ]; then
-                    echo -e "\t $path: latest is newer"
-                elif [ "$verbose" -eq 0 ]; then
-                    echo "$path -> latest: $latest_tag, highest: $highest_tag, current: $current_tag"
-                fi
-
-                # Critical section guarded by flock
-                (
-                    flock 200
-                    echo "$path -> latest: $latest_tag, highest: $highest_tag, current: $current_tag" >> "$resultfile"
-                ) 200>"$lockfile"
-            fi
-
-        elif [ "$verbose" -eq 1 ]; then
-            echo "$path -> latest: $latest_tag, highest: $highest_tag"
-        fi
-    elif [ "$verbose" -eq 1 ]; then
-
-        if [ -n "$current_tag" ]; then
-            echo "$path -> current: $current_tag"
-        else
-            echo "$path -> no tags found"
-        fi
-    fi
-}
-
-# Fetch and check repositories multi threaded
-for submoduledir in */ ;
-do
-    cd "$submoduledir" || continue
-
-    if [ -e ".git" ]; then
-        job_control
-        check_tags "$submoduledir" &
-    else
-        for sub in */ ;
-        do
-            if [ -e "$sub/.git" ]; then
-                cd "$sub" || continue
-                job_control
-                check_tags "$submoduledir$sub" &
-                cd .. || exit
-            fi
-        done
-    fi
-
-    cd .. || exit
-done
-
-# Wait for all background jobs to finish
-wait
-
-# Print results
-echo -e "\n\nResult:\n"
-
-# Find the max length of the paths (before '->')
-max_len=0
-while IFS='->' read -r left _; do
-    len=$(echo -n "$left" | wc -c)
-    if (( len > max_len )); then
-        max_len=$len
-    fi
-done < "$resultfile"
-
-# Print with padding so '->' lines up
-while IFS='->' read -r left right; do
-    right=$(echo "$right" | sed 's/^[[:space:]]*>*[[:space:]]*//')
-    printf "%-${max_len}s -> %s\n" "$left" "$right"
-done < "$resultfile"
-
-# Remove tmp files
-rm -f "$resultfile"
-rm -f "$lockfile"
diff --git a/3rdparty/wolfssl b/3rdparty/wolfssl
new file mode 160000
index 0000000000..723ed009ae
--- /dev/null
+++ b/3rdparty/wolfssl
@@ -0,0 +1 @@
+Subproject commit 723ed009ae5dc68acc14cd7664f93503d64cd51d
diff --git a/3rdparty/wolfssl/wolfssl.vcxproj b/3rdparty/wolfssl.vcxproj
similarity index 56%
rename from 3rdparty/wolfssl/wolfssl.vcxproj
rename to 3rdparty/wolfssl.vcxproj
index 90da8b7f38..f9cbcdcafa 100644
--- a/3rdparty/wolfssl/wolfssl.vcxproj
+++ b/3rdparty/wolfssl.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -41,14 +41,14 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <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;./extra/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WOLFSSL_LIB;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>./wolfssl;./wolfssl/IDE/WIN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WOLFSSL_LIB;WOLFSSL_DES_ECB;HAVE_FFDHE_2048;TFM_TIMING_RESISTANT;ECC_TIMING_RESISTANT;WC_RSA_BLINDING;HAVE_AESGCM;WOLFSSL_SHA512;WOLFSSL_SHA384;NO_DSA;HAVE_ECC;TFM_ECC256;ECC_SHAMIR;NO_RC4;NO_HC128;NO_RABBIT;WOLFSSL_SHA224;WOLFSSL_SHA3;WOLFSSL_SHAKE256;HAVE_POLY1305;HAVE_ONE_TIME_AUTH;HAVE_CHACHA;HAVE_HASHDRBG;HAVE_TLS_EXTENSIONS;HAVE_SNI;HAVE_SUPPORTED_CURVES;HAVE_EXTENDED_MASTER;NO_RC4;HAVE_ENCRYPT_THEN_MAC;NO_PSK;NO_MD4;WC_NO_ASYNC_THREADING;OPENSSL_EXTRA;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -61,19 +61,18 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>./wolfssl;./extra/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WOLFSSL_LIB;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>./wolfssl;./wolfssl/IDE/WIN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WOLFSSL_LIB;WOLFSSL_DES_ECB;HAVE_FFDHE_2048;TFM_TIMING_RESISTANT;NO_DSA;TFM_ECC256;NO_RC4;NO_HC128;NO_RABBIT;WOLFSSL_SHA224;WOLFSSL_SHA3;WOLFSSL_SHAKE256;HAVE_POLY1305;HAVE_ONE_TIME_AUTH;HAVE_CHACHA;HAVE_HASHDRBG;HAVE_SNI;HAVE_ENCRYPT_THEN_MAC;NO_MD4;WC_NO_ASYNC_THREADING;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;WC_NO_HARDEN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <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\ssl_asn1.c" />
     <ClCompile Include="wolfssl\src\wolfio.c" />
     <ClCompile Include="wolfssl\src\keys.c" />
     <ClCompile Include="wolfssl\src\ocsp.c" />
@@ -102,9 +101,10 @@
     <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\kdf.c" />
     <ClCompile Include="wolfssl\wolfcrypt\src\logging.c" />
     <ClCompile Include="wolfssl\wolfcrypt\src\md2.c" />
     <ClCompile Include="wolfssl\wolfcrypt\src\md4.c" />
@@ -114,11 +114,10 @@
     <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\rc2.c" />
     <ClCompile Include="wolfssl\wolfcrypt\src\ripemd.c" />
     <ClCompile Include="wolfssl\wolfcrypt\src\rsa.c" />
-    <ClCompile Include="wolfssl\wolfcrypt\src\sakke.c" />
     <ClCompile Include="wolfssl\wolfcrypt\src\sha.c" />
     <ClCompile Include="wolfssl\wolfcrypt\src\sha256.c" />
     <ClCompile Include="wolfssl\wolfcrypt\src\sha3.c" />
@@ -137,96 +136,7 @@
     <ClCompile Include="wolfssl\wolfcrypt\src\wolfevent.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="extra\win32\user_settings.h" />
     <ClInclude Include="wolfssl\resource.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\aes.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\arc4.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\asn.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\asn_public.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\blake2-impl.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\blake2-int.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\blake2.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\camellia.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\chacha.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\chacha20_poly1305.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\cmac.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\coding.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\compress.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\cpuid.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\cryptocb.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\curve25519.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\curve448.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\des3.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\dh.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\dilithium.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\dsa.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ecc.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\eccsi.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ed25519.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ed448.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\error-crypt.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ext_kyber.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ext_lms.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ext_xmss.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\falcon.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\fe_448.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\fe_operations.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\fips_test.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ge_448.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ge_operations.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\hash.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\hmac.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\hpke.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\integer.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\kdf.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\kyber.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\lms.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\logging.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\md2.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\md4.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\md5.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\memory.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\mem_track.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\misc.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\mpi_class.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\mpi_superclass.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\pkcs11.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\pkcs12.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\pkcs7.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\poly1305.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\pwdbased.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\random.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\rc2.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ripemd.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\rsa.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sakke.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\selftest.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\settings.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sha.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sha256.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sha3.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sha512.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\signature.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\siphash.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sm2.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sm3.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sm4.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sp.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sphincs.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sp_int.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\srp.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\tfm.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\types.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\visibility.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_encrypt.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_kyber.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_lms.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_pkcs11.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_port.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_xmss.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wolfevent.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wolfmath.h" />
-    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\xmss.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>
@@ -241,6 +151,7 @@
       <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">
@@ -248,9 +159,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="wolfssl\wolfssl\wolfcrypt\include.am" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/3rdparty/wolfssl/CMakeLists.txt b/3rdparty/wolfssl/CMakeLists.txt
deleted file mode 100644
index cf1a66a1f5..0000000000
--- a/3rdparty/wolfssl/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-if(USE_SYSTEM_WOLFSSL)
-	message(STATUS "RPCS3: using shared wolfssl")
-	pkg_check_modules(WolfSSL REQUIRED IMPORTED_TARGET wolfssl>=4.7.0)
-	add_library(wolfssl INTERFACE)
-	target_link_libraries(wolfssl INTERFACE PkgConfig::WolfSSL)
-else()
-	option(WOLFSSL_TLS13 "Enable wolfSSL TLS v1.3 (default: enabled)" OFF)
-	set(WOLFSSL_SHA3 ON CACHE STRING "Enable wolfSSL SHA-3 support (default: enabled on x86_64/aarch64)")
-	set(WOLFSSL_SHAKE256 ON CACHE STRING "Enable wolfSSL SHAKE256 support (default: enabled on x86_64/aarch64)")
-	option(WOLFSSL_BASE64_ENCODE "Enable Base64 encoding (default: enabled on x86_64)" OFF)
-	option(WOLFSSL_DES3 "Enable DES3 (default: disabled)" ON)
-	option(WOLFSSL_PWDBASED "Enable PWDBASED (default: disabled)" ON)
-	option(WOLFSSL_FAST_MATH "Enable fast math ops (default: disabled)" ON)
-	option(WOLFSSL_EXAMPLES "Enable examples (default: enabled)" OFF)
-	option(WOLFSSL_CRYPT_TESTS "Enable Crypt Bench/Test (default: enabled)" OFF)
-	option(WOLFSSL_ASYNC_THREADS "Enable Asynchronous Threading (default: enabled)" OFF)
-	option(WOLFSSL_BUILD_OUT_OF_TREE "Don't generate files in the source tree (default: yes)" ON)
-	option(WOLFSSL_SNI "Enable SNI (default: disabled)" ON)
-	option(WOLFSSL_OPENSSLEXTRA "Enable extra OpenSSL API, size+ (default: disabled)" ON)
-	option(WOLFSSL_HARDEN "Enable Hardened build, Enables Timing Resistance and Blinding (default: enabled)" OFF)
-	option(WOLFSSL_ALT_CERT_CHAINS "Enable support for Alternate certification chains (default: disabled)" ON)
-
-	add_subdirectory(wolfssl EXCLUDE_FROM_ALL)
-
-	target_compile_definitions(wolfssl PUBLIC WOLFSSL_DES_ECB HAVE_WRITE_DUP FP_MAX_BITS=8192 WOLFSSL_NO_OPTIONS_H)
-endif()
diff --git a/3rdparty/wolfssl/extra/win32/user_settings.h b/3rdparty/wolfssl/extra/win32/user_settings.h
deleted file mode 100644
index 09cff64fc0..0000000000
--- a/3rdparty/wolfssl/extra/win32/user_settings.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef _WIN_USER_SETTINGS_H_
-#define _WIN_USER_SETTINGS_H_
-
-/* Verify this is Windows */
-#ifndef _WIN32
-#error This user_settings.h header is only designed for Windows
-#endif
-
-/* Configurations */
-#define WOLFSSL_SYS_CA_CERTS
-#define WOLFSSL_DES_ECB
-#define HAVE_FFDHE_2048
-#define TFM_TIMING_RESISTANT
-#define NO_DSA
-#define TFM_ECC256
-#define NO_RC4
-#define NO_HC128
-#define NO_RABBIT
-#define WOLFSSL_SHA224
-#define WOLFSSL_SHA384
-#define WOLFSSL_SHA3
-#define WOLFSSL_SHA512
-#define WOLFSSL_SHAKE256
-#define HAVE_POLY1305
-#define HAVE_ONE_TIME_AUTH
-#define HAVE_CHACHA
-#define HAVE_HASHDRBG
-#ifndef HAVE_SNI
-#define HAVE_SNI
-#endif
-#define HAVE_ENCRYPT_THEN_MAC
-#ifndef NO_MD4
-#define NO_MD4
-#endif
-#define WC_NO_ASYNC_THREADING
-#define WC_NO_HARDEN
-#define HAVE_WRITE_DUP
-#define WC_RSA_BLINDING
-#define NO_MULTIBYTE_PRINT
-#define OPENSSL_EXTRA
-#define WOLFSSL_RIPEMD
-#define NO_PSK
-#define HAVE_EXTENDED_MASTER
-#define WOLFSSL_SNIFFER
-#define WOLFSSL_IGNORE_FILE_WARN
-#define HAVE_AESGCM
-#define HAVE_SUPPORTED_CURVES
-#define HAVE_TLS_EXTENSIONS
-#define HAVE_ECC
-#define ECC_SHAMIR
-#define ECC_TIMING_RESISTANT
-#define USE_FAST_MATH
-#define FP_MAX_BITS 8192
-#ifndef WOLFSSL_ALT_CERT_CHAINS
-#define WOLFSSL_ALT_CERT_CHAINS
-#endif
-
-/* UTF-8 aware filesystem functions for Windows */
-#define WOLFSSL_USER_FILESYSTEM
-
-#include <stdio.h>
-#define XFILE      FILE*
-
-extern FILE* wolfSSL_fopen_utf8(const char* name, const char* mode);
-#define XFOPEN     wolfSSL_fopen_utf8
-
-#define XFDOPEN    fdopen
-#define XFSEEK     fseek
-#define XFTELL     ftell
-#define XREWIND    rewind
-#define XFREAD     fread
-#define XFWRITE    fwrite
-#define XFCLOSE    fclose
-#define XSEEK_END  SEEK_END
-#define XSEEK_SET  SEEK_SET
-#define XBADFILE   NULL
-#define XFGETS     fgets
-#define XFPRINTF   fprintf
-#define XFFLUSH    fflush
-
-/* For some reason we need to define ssize_t */
-#define HAVE_SSIZE_T
-#define ssize_t __int64
-
-#include <sys/stat.h>
-extern int wolfSSL_stat_utf8(const char* path, struct _stat* buffer);
-#define XSTAT       wolfSSL_stat_utf8
-#define XSTAT_TYPE struct _stat
-#define XS_ISREG(s) (s & _S_IFREG)
-#define SEPARATOR_CHAR ';'
-
-#endif /* _WIN_USER_SETTINGS_H_ */
diff --git a/3rdparty/wolfssl/wolfssl b/3rdparty/wolfssl/wolfssl
deleted file mode 160000
index b077c81eb6..0000000000
--- a/3rdparty/wolfssl/wolfssl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b077c81eb635392e694ccedbab8b644297ec0285
diff --git a/3rdparty/xxHash b/3rdparty/xxHash
new file mode 160000
index 0000000000..94e5f23e73
--- /dev/null
+++ b/3rdparty/xxHash
@@ -0,0 +1 @@
+Subproject commit 94e5f23e736f2bb67ebdf90727353e65344f9fc0
diff --git a/3rdparty/rtmidi/rtmidi.vcxproj b/3rdparty/xxhash.vcxproj
similarity index 69%
rename from 3rdparty/rtmidi/rtmidi.vcxproj
rename to 3rdparty/xxhash.vcxproj
index 0792f594e8..6985e3205a 100644
--- a/3rdparty/rtmidi/rtmidi.vcxproj
+++ b/3rdparty/xxhash.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -10,29 +10,26 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="rtmidi\RtMidi.h" />
-    <ClInclude Include="rtmidi\rtmidi_c.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="rtmidi\RtMidi.cpp" />
-    <ClCompile Include="rtmidi\rtmidi_c.cpp" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2C902C67-985C-4BE0-94A3-E0FE2EB929A3}</ProjectGuid>
-    <RootNamespace>rtmidi</RootNamespace>
+    <ProjectGuid>{939FE206-1182-ABC3-1234-FEAB88E98404}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
@@ -46,15 +43,22 @@
     <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>__WINDOWS_MM__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./rtmidi/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ProgramDatabase</DebugInformationFormat>
+      <Optimization>MaxSpeed</Optimization>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="xxHash/xxhash.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="LICENSE" />
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="xxHash/xxhash.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/3rdparty/yaml-cpp/CMakeLists.txt b/3rdparty/yaml-cpp/CMakeLists.txt
index 0c123a37b8..78792066b6 100644
--- a/3rdparty/yaml-cpp/CMakeLists.txt
+++ b/3rdparty/yaml-cpp/CMakeLists.txt
@@ -3,8 +3,6 @@
 # to disable it...
 # So we just install it to a different directory
 set(YAML_CPP_INSTALL OFF CACHE BOOL "Don't install YAML")
-set(YAML_CPP_DISABLE_UNINSTALL ON CACHE BOOL "Disable yaml-cpp uninstall")
-
 set(CMAKE_INSTALL_PREFIX_OLD ${CMAKE_INSTALL_PREFIX})
 set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/yaml-cpp_install)
 
diff --git a/3rdparty/yaml-cpp/yaml-cpp b/3rdparty/yaml-cpp/yaml-cpp
index 456c68f452..6a211f0bc7 160000
--- a/3rdparty/yaml-cpp/yaml-cpp
+++ b/3rdparty/yaml-cpp/yaml-cpp
@@ -1 +1 @@
-Subproject commit 456c68f452da09d8ca84b375faa2b1397713eaba
+Subproject commit 6a211f0bc71920beef749e6c35d7d1bcc2447715
diff --git a/3rdparty/yaml-cpp/yaml-cpp.vcxproj b/3rdparty/yaml-cpp/yaml-cpp.vcxproj
index b1b732727c..847a3d1854 100644
--- a/3rdparty/yaml-cpp/yaml-cpp.vcxproj
+++ b/3rdparty/yaml-cpp/yaml-cpp.vcxproj
@@ -25,14 +25,6 @@
   <PropertyGroup>
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-  </PropertyGroup>
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
@@ -60,7 +52,6 @@
     </ClCompile>
     <ClCompile Include="yaml-cpp\src\convert.cpp">
     </ClCompile>
-    <ClCompile Include="yaml-cpp\src\depthguard.cpp" />
     <ClCompile Include="yaml-cpp\src\directives.cpp">
     </ClCompile>
     <ClCompile Include="yaml-cpp\src\emit.cpp">
diff --git a/3rdparty/yaml-cpp/yaml-cpp.vcxproj.filters b/3rdparty/yaml-cpp/yaml-cpp.vcxproj.filters
index 60c75fa23e..fc71f8981f 100644
--- a/3rdparty/yaml-cpp/yaml-cpp.vcxproj.filters
+++ b/3rdparty/yaml-cpp/yaml-cpp.vcxproj.filters
@@ -91,8 +91,5 @@
     <ClCompile Include="yaml-cpp\src\exceptions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="yaml-cpp\src\depthguard.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/3rdparty/zlib/CMakeLists.txt b/3rdparty/zlib/CMakeLists.txt
index d9dffb07be..048ae1dcf5 100644
--- a/3rdparty/zlib/CMakeLists.txt
+++ b/3rdparty/zlib/CMakeLists.txt
@@ -1,18 +1,14 @@
 if (USE_SYSTEM_ZLIB)
-	message(STATUS "RPCS3: Using system ZLIB")
-	find_package(ZLIB QUIET REQUIRED)
-
-	add_library(3rdparty_zlib INTERFACE)
-	target_link_libraries(3rdparty_zlib INTERFACE ZLIB::ZLIB)
-	target_compile_definitions(3rdparty_zlib INTERFACE -DZLIB_CONST=1)
+    message(STATUS "-- RPCS3: Using syztem ZLIB")
+    find_package(ZLIB QUIET)
 else()
-	option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" OFF)
-	message(STATUS "RPCS3: Using builtin ZLIB")
+	message(STATUS "-- RPCS3: Using builtin ZLIB")
 	set(SKIP_INSTALL_ALL ON)
 	add_subdirectory(zlib EXCLUDE_FROM_ALL)
-
-	add_library(3rdparty_zlib INTERFACE)
-	target_link_libraries(3rdparty_zlib INTERFACE zlibstatic)
-	target_include_directories(3rdparty_zlib INTERFACE zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib)
-	target_compile_definitions(3rdparty_zlib INTERFACE -DZLIB_CONST=1)
+	set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zlib" "${CMAKE_CURRENT_BINARY_DIR}/zlib")
+	set(ZLIB_LIBRARY zlibstatic)
 endif()
+
+add_library(3rdparty_zlib INTERFACE)
+target_link_libraries(3rdparty_zlib INTERFACE ${ZLIB_LIBRARY})
+target_include_directories(3rdparty_zlib INTERFACE ${ZLIB_INCLUDE_DIR})
diff --git a/3rdparty/zlib/zlib b/3rdparty/zlib/zlib
index 51b7f2abda..cacf7f1d4e 160000
--- a/3rdparty/zlib/zlib
+++ b/3rdparty/zlib/zlib
@@ -1 +1 @@
-Subproject commit 51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf
+Subproject commit cacf7f1d4e3d44d871b605da3b647f07d718623f
diff --git a/3rdparty/zlib/zlib.vcxproj b/3rdparty/zlib/zlib.vcxproj
index dbc63d51a2..2f39f358f2 100644
--- a/3rdparty/zlib/zlib.vcxproj
+++ b/3rdparty/zlib/zlib.vcxproj
@@ -22,23 +22,6 @@
     <ClCompile Include="$(ZLibSrcDir)\trees.c" />
     <ClCompile Include="$(ZLibSrcDir)\uncompr.c" />
     <ClCompile Include="$(ZLibSrcDir)\zutil.c" />
-    <ClCompile Include="zlib\gzclose.c" />
-    <ClCompile Include="zlib\gzlib.c" />
-    <ClCompile Include="zlib\gzread.c" />
-    <ClCompile Include="zlib\gzwrite.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="zlib\crc32.h" />
-    <ClInclude Include="zlib\deflate.h" />
-    <ClInclude Include="zlib\gzguts.h" />
-    <ClInclude Include="zlib\inffast.h" />
-    <ClInclude Include="zlib\inffixed.h" />
-    <ClInclude Include="zlib\inflate.h" />
-    <ClInclude Include="zlib\inftrees.h" />
-    <ClInclude Include="zlib\trees.h" />
-    <ClInclude Include="zlib\zconf.h" />
-    <ClInclude Include="zlib\zlib.h" />
-    <ClInclude Include="zlib\zutil.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{60F89955-91C6-3A36-8000-13C592FEC2DF}</ProjectGuid>
@@ -70,23 +53,25 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;ZLIB_CONST;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>$(WarningLevel)</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
+      <BrowseInformation>true</BrowseInformation>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -101,10 +86,11 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <BufferSecurityCheck>false</BufferSecurityCheck>
+      <BrowseInformation>true</BrowseInformation>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
-      <PreprocessorDefinitions>WIN32;ZLIB_CONST;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/3rdparty/zstd/CMakeLists.txt b/3rdparty/zstd/CMakeLists.txt
deleted file mode 100644
index 5a8b6f3d90..0000000000
--- a/3rdparty/zstd/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
-option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
-option(ZSTD_BUILD_STATIC "BUILD STATIC LIBRARIES" ON)
-option(ZSTD_BUILD_TESTS "BUILD TESTS" OFF)
-
-add_subdirectory(zstd/build/cmake EXLUDE_FROM_ALL)
-add_library(3rdparty_zstd INTERFACE)
-target_link_libraries(3rdparty_zstd INTERFACE libzstd_static)
diff --git a/3rdparty/zstd/zstd b/3rdparty/zstd/zstd
deleted file mode 160000
index f8745da6ff..0000000000
--- a/3rdparty/zstd/zstd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f8745da6ff1ad1e7bab384bd1f9d742439278e99
diff --git a/3rdparty/zstd/zstd.rc b/3rdparty/zstd/zstd.rc
deleted file mode 100644
index 5851ae8f33..0000000000
--- a/3rdparty/zstd/zstd.rc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-
-#include "zstd\lib\zstd.h" /* ZSTD_VERSION_STRING */
-#define APSTUDIO_READONLY_SYMBOLS
-#include "verrsrc.h"
-#undef APSTUDIO_READONLY_SYMBOLS
-
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE 9, 1
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO     VERSIONINFO
-  FILEVERSION       ZSTD_VERSION_MAJOR,ZSTD_VERSION_MINOR,ZSTD_VERSION_RELEASE,0
-  PRODUCTVERSION    ZSTD_VERSION_MAJOR,ZSTD_VERSION_MINOR,ZSTD_VERSION_RELEASE,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_DLL
- FILESUBTYPE VFT2_UNKNOWN
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "CompanyName", "Meta Platforms, Inc."
-            VALUE "FileDescription", "Zstandard - Fast and efficient compression algorithm"
-            VALUE "FileVersion", ZSTD_VERSION_STRING
-            VALUE "InternalName", "zstd.exe"
-            VALUE "LegalCopyright", "Copyright (c) Meta Platforms, Inc. and affiliates."
-            VALUE "OriginalFilename", "zstd.exe"
-            VALUE "ProductName", "Zstandard"
-            VALUE "ProductVersion", ZSTD_VERSION_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0409, 1200
-    END
-END
-
-#endif
diff --git a/3rdparty/zstd/zstd.vcxproj b/3rdparty/zstd/zstd.vcxproj
deleted file mode 100644
index 720fabe962..0000000000
--- a/3rdparty/zstd/zstd.vcxproj
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include=".\zstd\lib\common\debug.c" />
-    <ClCompile Include=".\zstd\lib\common\entropy_common.c" />
-    <ClCompile Include=".\zstd\lib\common\error_private.c" />
-    <ClCompile Include=".\zstd\lib\common\pool.c" />
-    <ClCompile Include=".\zstd\lib\common\threading.c" />
-    <ClCompile Include=".\zstd\lib\common\xxhash.c" />
-    <ClCompile Include=".\zstd\lib\common\zstd_common.c" />
-    <ClCompile Include=".\zstd\lib\common\fse_decompress.c" />
-    <ClCompile Include=".\zstd\lib\compress\hist.c" />
-    <ClCompile Include=".\zstd\lib\compress\fse_compress.c" />
-    <ClCompile Include=".\zstd\lib\compress\huf_compress.c" />
-    <ClCompile Include=".\zstd\lib\compress\zstdmt_compress.c" />
-    <ClCompile Include=".\zstd\lib\compress\zstd_compress.c" />
-    <ClCompile Include=".\zstd\lib\compress\zstd_compress_literals.c" />
-    <ClCompile Include=".\zstd\lib\compress\zstd_compress_sequences.c" />
-    <ClCompile Include=".\zstd\lib\compress\zstd_compress_superblock.c" />
-    <ClCompile Include=".\zstd\lib\compress\zstd_fast.c" />
-    <ClCompile Include=".\zstd\lib\compress\zstd_double_fast.c" />
-    <ClCompile Include=".\zstd\lib\compress\zstd_lazy.c" />
-    <ClCompile Include=".\zstd\lib\compress\zstd_opt.c" />
-    <ClCompile Include=".\zstd\lib\compress\zstd_ldm.c" />
-    <ClCompile Include=".\zstd\lib\decompress\huf_decompress.c" />
-    <ClCompile Include=".\zstd\lib\decompress\zstd_decompress.c" />
-    <ClCompile Include=".\zstd\lib\decompress\zstd_decompress_block.c" />
-    <ClCompile Include=".\zstd\lib\decompress\zstd_ddict.c" />
-    <ClCompile Include=".\zstd\lib\dictBuilder\cover.c" />
-    <ClCompile Include=".\zstd\lib\dictBuilder\fastcover.c" />
-    <ClCompile Include=".\zstd\lib\dictBuilder\divsufsort.c" />
-    <ClCompile Include=".\zstd\lib\dictBuilder\zdict.c" />
-    <ClCompile Include=".\zstd\lib\legacy\zstd_v01.c" />
-    <ClCompile Include=".\zstd\lib\legacy\zstd_v02.c" />
-    <ClCompile Include=".\zstd\lib\legacy\zstd_v03.c" />
-    <ClCompile Include=".\zstd\lib\legacy\zstd_v04.c" />
-    <ClCompile Include=".\zstd\lib\legacy\zstd_v05.c" />
-    <ClCompile Include=".\zstd\lib\legacy\zstd_v06.c" />
-    <ClCompile Include=".\zstd\lib\legacy\zstd_v07.c" />
-    <ClCompile Include=".\zstd\programs\util.c" />
-    <ClCompile Include=".\zstd\programs\timefn.c" />
-    <ClCompile Include=".\zstd\programs\benchfn.c" />
-    <ClCompile Include=".\zstd\programs\benchzstd.c" />
-    <ClCompile Include=".\zstd\programs\datagen.c" />
-    <ClCompile Include=".\zstd\programs\dibio.c" />
-    <ClCompile Include=".\zstd\programs\fileio.c" />
-    <ClCompile Include=".\zstd\programs\fileio_asyncio.c" />
-    <ClCompile Include=".\zstd\programs\lorem.c" />
-    <ClCompile Include=".\zstd\programs\zstdcli.c" />
-    <ClCompile Include=".\zstd\programs\zstdcli_trace.c" />
-    <ClCompile Include="zstd\lib\compress\zstd_preSplit.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include=".\zstd\lib\common\pool.h" />
-    <ClInclude Include=".\zstd\lib\common\threading.h" />
-    <ClInclude Include=".\zstd\lib\common\xxhash.h" />
-    <ClInclude Include=".\zstd\lib\compress\zstdmt_compress.h" />
-    <ClInclude Include=".\zstd\lib\zdict.h" />
-    <ClInclude Include=".\zstd\lib\dictBuilder\cover.h" />
-    <ClInclude Include=".\zstd\lib\dictBuilder\divsufsort.h" />
-    <ClInclude Include=".\zstd\lib\common\fse.h" />
-    <ClInclude Include=".\zstd\lib\common\huf.h" />
-    <ClInclude Include=".\zstd\lib\zstd.h" />
-    <ClInclude Include=".\zstd\lib\common\zstd_internal.h" />
-    <ClInclude Include=".\zstd\lib\zstd_errors.h" />
-    <ClInclude Include=".\zstd\lib\compress\zstd_compress.h" />
-    <ClInclude Include=".\zstd\lib\compress\zstd_compress_literals.h" />
-    <ClInclude Include=".\zstd\lib\compress\zstd_compress_sequences.h" />
-    <ClInclude Include=".\zstd\lib\compress\zstd_cwksp.h" />
-    <ClInclude Include=".\zstd\lib\compress\zstd_compress_superblock.h" />
-    <ClInclude Include=".\zstd\lib\compress\zstd_fast.h" />
-    <ClInclude Include=".\zstd\lib\compress\zstd_double_fast.h" />
-    <ClInclude Include=".\zstd\lib\compress\zstd_lazy.h" />
-    <ClInclude Include=".\zstd\lib\compress\zstd_opt.h" />
-    <ClInclude Include=".\zstd\lib\compress\zstd_ldm.h" />
-    <ClInclude Include=".\zstd\lib\decompress\zstd_ddict.h" />
-    <ClInclude Include=".\zstd\lib\legacy\zstd_legacy.h" />
-    <ClInclude Include=".\zstd\lib\legacy\zstd_v01.h" />
-    <ClInclude Include=".\zstd\lib\legacy\zstd_v02.h" />
-    <ClInclude Include=".\zstd\lib\legacy\zstd_v03.h" />
-    <ClInclude Include=".\zstd\lib\legacy\zstd_v04.h" />
-    <ClInclude Include=".\zstd\lib\legacy\zstd_v05.h" />
-    <ClInclude Include=".\zstd\lib\legacy\zstd_v06.h" />
-    <ClInclude Include=".\zstd\lib\legacy\zstd_v07.h" />
-    <ClInclude Include=".\zstd\programs\benchzstd.h" />
-    <ClInclude Include=".\zstd\programs\datagen.h" />
-    <ClInclude Include=".\zstd\programs\dibio.h" />
-    <ClInclude Include=".\zstd\programs\fileio.h" />
-    <ClInclude Include=".\zstd\programs\platform.h" />
-    <ClInclude Include=".\zstd\programs\util.h" />
-    <ClInclude Include="zstd\lib\common\allocations.h" />
-    <ClInclude Include="zstd\lib\common\bits.h" />
-    <ClInclude Include="zstd\lib\common\bitstream.h" />
-    <ClInclude Include="zstd\lib\common\compiler.h" />
-    <ClInclude Include="zstd\lib\common\cpu.h" />
-    <ClInclude Include="zstd\lib\common\debug.h" />
-    <ClInclude Include="zstd\lib\common\error_private.h" />
-    <ClInclude Include="zstd\lib\common\mem.h" />
-    <ClInclude Include="zstd\lib\common\portability_macros.h" />
-    <ClInclude Include="zstd\lib\common\zstd_deps.h" />
-    <ClInclude Include="zstd\lib\common\zstd_trace.h" />
-    <ClInclude Include="zstd\lib\compress\clevels.h" />
-    <ClInclude Include="zstd\lib\compress\hist.h" />
-    <ClInclude Include="zstd\lib\compress\zstd_compress_internal.h" />
-    <ClInclude Include="zstd\lib\compress\zstd_ldm_geartab.h" />
-    <ClInclude Include="zstd\lib\compress\zstd_preSplit.h" />
-    <ClInclude Include="zstd\lib\decompress\zstd_decompress_block.h" />
-    <ClInclude Include="zstd\lib\decompress\zstd_decompress_internal.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zstd.rc" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectName>zstd</ProjectName>
-    <RootNamespace>zstd</RootNamespace>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-    <InstructionSet>NotSet</InstructionSet>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\compress;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath);</IncludePath>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-    <LibraryPath>$(LibraryPath);</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\compress;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath);</IncludePath>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-    <LibraryPath>$(LibraryPath);</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalOptions>/DZSTD_MULTITHREAD %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>ZSTD_MULTITHREAD=1;ZSTD_LEGACY_SUPPORT=5;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <EnablePREfast>false</EnablePREfast>
-      <EnableEnhancedInstructionSet>$(InstructionSet)</EnableEnhancedInstructionSet>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>ZSTD_MULTITHREAD=1;ZSTD_LEGACY_SUPPORT=5;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TreatWarningAsError>false</TreatWarningAsError>
-      <EnablePREfast>false</EnablePREfast>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalOptions>/DZSTD_MULTITHREAD %(AdditionalOptions)</AdditionalOptions>
-      <EnableEnhancedInstructionSet>$(InstructionSet)</EnableEnhancedInstructionSet>
-      <LanguageStandard_C>Default</LanguageStandard_C>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/BUILDING.md b/BUILDING.md
index 311bbddeee..e72c433ef8 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -5,69 +5,58 @@ Other instructions may be found [here](https://wiki.rpcs3.net/index.php?title=Bu
 
 ## Setup your environment
 
-### Windows 10 or later
+### Windows 7 or later
 
-The following tools are required to build RPCS3 on Windows 10 or later:
-- [Visual Studio 2022](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community)
-- **Optional** - [CMake 3.28.0+](https://www.cmake.org/download/) (add to PATH)
+* [CMake 3.16.9+](https://www.cmake.org/download/) (add to PATH)
+* [Python 3.6+](https://www.python.org/downloads/) (add to PATH)
+* [Qt 5.15.2](https://www.qt.io/download-qt-installer)
+* [Visual Studio 2019](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community)
+* [Vulkan SDK 1.2.154+](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html))
 
-  **NOTES:**
-  - **Visual Studio 2022** integrates **CMake 3.29+** and it also supports both the `sln` solution (`.sln`, `.vcxproj`) and `CMake` solution (`CMakeLists.txt`, `CMakePresets.json`).
-    See sections [Building with Visual Studio sln solution](#building-with-visual-studio-sln-solution) and [Building with Visual Studio CMake solution](#building-with-visual-studio-cmake-solution)
-    on how to build the project with **Visual Studio**.
-  - Install and use this standalone **CMake** tool just in case of your preference. See section [Building with standalone CMake tool](#building-with-standalone-cmake-tool) on how to build the project
-    with standalone **CMake** tool.
-
-- [Python 3.6+](https://www.python.org/downloads/) (add to PATH)
-- [Qt 6.9.1](https://www.qt.io/download-qt-installer) In case you can't download from the official installer, you can use [Another Qt installer](https://github.com/miurahr/aqtinstall) (In that case you will need to manually add the "qtmultimedia" module when installing Qt)
-- [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (see "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0.
-
-The `sln` solution available only on **Visual Studio** is the preferred building solution. It easily allows to build the **RPCS3** application in `Release` and `Debug` mode.
-
-In order to build **RPCS3** with the `sln` solution (with **Visual Studio**), **Qt** libs need to be detected. To detect the libs:
-- add and set the `QTDIR` environment variable, e.g. `<QtInstallFolder>\6.9.1\msvc2022_64\`
-- or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2022)
-
-  **NOTE:** If you have issues with the **Visual Studio Qt Plugin**, you may want to uninstall it and install the [Legacy Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.LEGACYQtVisualStudioTools2022) instead.
-
-In order to build **RPCS3** with the `CMake` solution (with both **Visual Studio** and standalone **CMake** tool):
-- add and set the `Qt6_ROOT` environment variable to the **Qt** libs path, e.g. `<QtInstallFolder>\6.9.1\msvc2022_64\`
+**Either add the** `QTDIR` **environment variable, e.g.** `<QtInstallFolder>\5.15.2\msvc2019_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)**
 
 ### Linux
 
-These are the essentials tools to build RPCS3 on Linux. Some of them can be installed through your favorite package manager:
-- Clang 17+ or GCC 13+
-- [CMake 3.28.0+](https://www.cmake.org/download/)
-- [Qt 6.9.1](https://www.qt.io/download-qt-installer)
-- [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0.
-- [SDL3](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend)
+These are the essentials tools to build RPCS3 on Linux. Some of them can be installed through your favorite package manager.
+
+* Clang 12+ or GCC 11+
+* [CMake 3.16.9+](https://www.cmake.org/download/)
+* [Qt 5.15.2](https://www.qt.io/download-qt-installer)
+* [Vulkan SDK 1.2.154+](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html))
+* [SDL2](https://www.libsdl.org/download-2.0.php) (for the FAudio backend)
 
 **If you have an NVIDIA GPU, you may need to install the libglvnd package.**
 
 #### Arch Linux
 
-    sudo pacman -S glew openal cmake ninja vulkan-validation-layers qt6-base qt6-declarative qt6-multimedia qt6-svg sdl3 sndio jack2 base-devel
+    sudo pacman -S glew openal cmake vulkan-validation-layers qt5-base qt5-declarative sdl2
 
 #### Debian & Ubuntu
 
-    sudo apt-get install build-essential ninja-build libasound2-dev libpulse-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git libevdev-dev libsdl3-3.2 libsdl3-dev libjack-dev libsndio-dev
+    sudo apt-get install build-essential libasound2-dev libpulse-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git libevdev-dev libsdl2-2.0 libsdl2-dev
 
 Ubuntu is usually horrendously out of date, and some packages need to be downloaded by hand. This part is for Qt, GCC, Vulkan, and CMake
-
 ##### Qt PPA
 
-Ubuntu usually does not have a new enough Qt package to suit rpcs3's needs. There is currently no PPA available to work around this.
+Ubuntu usually does not have a new enough Qt package to suit rpcs3's needs. There is a PPA available to work around this. Run the following:
+```
+. /etc/os-release
+sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-$UBUNTU_CODENAME
+sudo apt-get update
+sudo apt-get install qt515base qt515svg
+. /opt/qt515/bin/qt515-env.sh >/dev/null 2>&1
+```
 
-##### GCC 13.x installation
+##### GCC 11.x installation
 
-If the `gcc-13` package is not available on your system, use the following commands
+If the `gcc-11` package is not available on your system, use the following commands
 ```
 sudo add-apt-repository ppa:ubuntu-toolchain-r/test
 sudo apt-get update
-sudo apt-get install gcc-13 g++-13
+sudo apt-get install gcc-11 g++-11
 ```
 
-You can either use `update-alternatives` to setup `gcc-13`/`g++-13` as your default compilers or prefix the `cmake` build file generation command by `CXX=g++-13 CC=gcc-13` to use it.
+You can either use `update-alternatives` to setup `gcc-11`/`g++-11` as your default compilers or prefix any `cmake` command by `CXX=g++-11 CC=gcc-11 ` to use it.
 
 ##### Vulkan SDK
 
@@ -75,13 +64,12 @@ For Ubuntu systems, it is strongly recommended to use the PPA from [LunarG](http
 ```
 . /etc/os-release
 wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
-sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.268-$UBUNTU_CODENAME.list https://packages.lunarg.com/vulkan/1.3.268/lunarg-vulkan-1.3.268-$UBUNTU_CODENAME.list
+sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.2.154-$UBUNTU_CODENAME.list https://packages.lunarg.com/vulkan/1.2.154/lunarg-vulkan-1.2.154-$UBUNTU_CODENAME.list
 sudo apt update
 sudo apt install vulkan-sdk
 ```
 
 ##### CMake
-
 ```
 . /etc/os-release
 wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add -
@@ -94,98 +82,52 @@ sudo apt-get install cmake
 
 #### Fedora
 
-    sudo dnf install alsa-lib-devel cmake ninja-build glew glew-devel libatomic libevdev-devel libudev-devel openal-devel qt6-qtbase-devel qt6-qtbase-private-devel vulkan-devel pipewire-jack-audio-connection-kit-devel qt6-qtmultimedia-devel qt6-qtsvg-devel llvm-devel
+    sudo dnf install alsa-lib-devel cmake glew glew-devel libatomic libevdev-devel libudev-devel openal-devel qt5-qtbase-devel qt5-qtbase-private-devel vulkan-devel
 
 #### OpenSUSE
 
-    sudo zypper install git cmake ninja libasound2 libpulse-devel openal-soft-devel glew-devel zlib-devel libedit-devel vulkan-devel libudev-devel libqt6-qtbase-devel libqt6-qtmultimedia-devel libqt6-qtsvg-devel libQt6Gui-private-headers-devel libevdev-devel libsndio7_1 libjack-devel
+    sudo zypper install git cmake libasound2 libpulse-devel openal-soft-devel glew-devel zlib-devel libedit-devel vulkan-devel libudev-devel libqt5-qtbase-devel libqt5gui-private-headers-devel libevdev-devel
 
 ## Setup the project
 
 Clone and initialize the repository
 
-```bash
-git clone --recurse-submodules https://github.com/RPCS3/rpcs3.git
+```
+git clone https://github.com/RPCS3/rpcs3.git
 cd rpcs3
-# This is automatically done by `git clone --recurse-submodules`,
-# but in case you forgot it, you can manually fetch submodules this way:
 git submodule update --init
 ```
 
 ### Windows
 
-#### Building with Visual Studio sln solution
+#### Configuring the Qt plugin (if used)
 
-Start **Visual Studio**, click on `Open a project or solution` and select the `rpcs3.sln` file inside the RPCS3's root folder
+1) Go to the Qt5 menu and edit Qt5 options.
+2) Add the path to your Qt installation with compiler e.g. `<QtInstallFolder>\5.15.2\msvc2019_64`.
+3) While selecting the rpcs3qt project, go to Qt5->Project Setting and select the version you added.
 
-##### Configuring the Qt Plugin (if used)
+#### Building the projects
 
-1) go to `Extensions->Qt VS Tools->Qt Versions`
-2) add the path to your Qt installation with compiler e.g. `<QtInstallFolder>\6.9.1\msvc2022_64`, version will fill in automatically
-3) go to `Extensions->Qt VS Tools->Options->Legacy Project Format`. (Only available in the **Legacy Qt Plugin**)
-4) set `Build: Run pre-build setup` to `true`. (Only available in the **Legacy Qt Plugin**)
+Open `rpcs3.sln`. The recommended build configuration is `Release`. (On older revisions: `Release - LLVM`)
 
-##### Building the projects
+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).
 
-**NOTE:** The recommended build configuration is `Release`. (On older revisions: `Release - LLVM`)
+If you're not using the precompiled libs, build the following projects in *__BUILD_BEFORE* folder by right-clicking on a project > *Build*.:
+* glslang
+* **Either** llvm_build **or** llvm_build_clang_cl
+* spirv
 
-To speed up the compilation time, you may want to download and extract to `<rpcs3_root>\build\lib_ext\<$(Configuration)>-x64` (e.g. `c:\rpcs3\build\lib_ext\Release-x64`; the path needs to be created) the following precompiled lib:
-- [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-19.1.7/llvmlibs_mt.7z)
+Afterwards:
 
-**NOTES:**
-- `<$(Configuration)>` can assume values `Release` or `Debug`.
-- Unoptimised/debug libs are currently not available precompiled for **LLVM**. Trying to use it when building the **RPCS3** application in `Debug` mode will provide a `cannot open file` error.
-
-If you're not using the precompiled libs, those dependency libs need to be compiled first. From the `Solution Explorer` panel:
-1) expand `__BUILD_BEFORE`
-2) from the `Solution Configurations` drop-down menu, select `Release` (select `Debug` if you want to build in `Debug` mode)
-3) right-click one of the following projects and then click on `Build` to build the selected lib:
-   - `llvm_build`
-   - or `llvm_build_clang_cl` (if you have also the **clang** compiler installed on VS)
-
-**NOTE:** Compiled dependency libs have priority over precompiled libs, if installed. It means that they will always be referenced and linked in case the precompiled libs are also available.
-
-In order to build the **RPCS3** application:
-1) from the `Solution Configurations` drop-down menu, select `Release` (select `Debug` if you want to build in `Debug` mode)
-
-   **NOTE:** In case you previously compiled the dependency libs under `__BUILD_BEFORE`, you have also to select the same build configuration (e.g. `Release`, if you compiled the dependency libs in `Release` mode)
-
-2) click on `Build` menu and then on `Build Solution`
-3) once the build is completed, the **RPCS3** application will be available under the `<rpcs3_root>\bin` folder
-
-#### Building with Visual Studio CMake solution
-
-Start **Visual Studio**, click on `Open a local folder` and select the RPCS3's root folder
-
-Once the project is open on VS, from the `Solution Explorer` panel:
-1) right-click on `rpcs3` and then click on `Switch to CMake Targets View`
-2) from the `Configuration` drop-down menu, select `msvc-release` (select `msvc-debug` if you want to build in `Debug` mode)
-3) right-click on `CMakeLists.txt Project` and then click on `Configure Cache`
-4) once the cache is created, the `rpcs3 project` will be available
-5) right-click on `rpcs3 Project` and then click on `Build All`, or click on `Build` menu and then on `Build All`
-6) once the build is completed, the **RPCS3** application will be available under the `<rpcs3_root>\build-msvc\bin` folder
-
-#### Building with standalone CMake tool
-
-In case you preferred to install and use the standalone **CMake** tool:
-1) move on the RPCS3's root folder
-2) execute the following commands to create the cache and to build the application (for the build, use `--preset msvc-debug` if you want to build in `Debug` mode), respectively:
-
-   ```
-   cmake --preset msvc
-   cmake --build --preset msvc-release
-   ```
-3) once the build is completed, the **RPCS3** application will be available under the `<rpcs3_root>\build-msvc\bin` folder
+`Build > Build Solution`
 
 ### Linux
 
 While still in the project root:
 
-1) `cmake -B build -G Ninja` to generate build files with the default compiler (override the compiler by prepending e.g. `CC=clang CXX=clang++`)
-2) `cmake --build build` to compile
-3) run RPCS3 with `build/bin/rpcs3`
-
-If compiling for ARM, pass the flag `-DUSE_NATIVE_INSTRUCTIONS=OFF` to the first `cmake` command. This resolves some NEON errors when compiling our SIMD headers.
+1) `cd .. && mkdir rpcs3_build && cd rpcs3_build`
+2) `cmake ../rpcs3/ && make` or `CXX=g++-11 CC=gcc-11 cmake ../rpcs3/ && make` to force these compilers
+3) Run RPCS3 with `./bin/rpcs3`
 
 When using GDB, configure it to ignore SIGSEGV signal (`handle SIGSEGV nostop noprint`).
 If desired, use the various build options in [CMakeLists](https://github.com/RPCS3/rpcs3/blob/master/CMakeLists.txt).
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f633730fc..f9b18ef691 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,22 +1,12 @@
-cmake_minimum_required(VERSION 3.28)
+cmake_minimum_required(VERSION 3.16.9)
 
-find_program(CCACHE_PATH ccache HINTS ENV PATH)
-if(CCACHE_PATH)
-  message(STATUS "Using ccache: ${CCACHE_PATH}")
-  set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PATH}")
-  set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PATH}")
-endif()
+project(rpcs3)
 
-project(rpcs3 LANGUAGES C CXX)
-
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
         message(FATAL_ERROR "RPCS3 requires at least gcc-11.")
     endif()
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0)
         message(FATAL_ERROR "RPCS3 requires at least clang-12.0.")
     endif()
@@ -24,129 +14,64 @@ endif()
 
 option(USE_NATIVE_INSTRUCTIONS "USE_NATIVE_INSTRUCTIONS makes rpcs3 compile with -march=native, which is useful for local builds, but not good for packages." ON)
 option(WITH_LLVM "Enable usage of LLVM library" ON)
-option(BUILD_LLVM "Build LLVM from git submodule" OFF)
-option(STATIC_LINK_LLVM "Link against LLVM statically. This will get set to ON if you build LLVM from the submodule." OFF)
+option(BUILD_LLVM_SUBMODULE "Build LLVM from git submodule" ON)
+option(USE_ALSA "ALSA audio backend" ON)
+option(USE_PULSE "PulseAudio audio backend" ON)
 option(USE_FAUDIO "FAudio audio backend" ON)
 option(USE_LIBEVDEV "libevdev-based joystick support" ON)
-option(USE_DISCORD_RPC "Discord rich presence integration" OFF)
+option(USE_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_PRECOMPILED_HEADERS "Use precompiled headers" OFF)
-option(USE_SDL "Enables SDL input handler" OFF)
-option(USE_SYSTEM_CUBEB "Prefer system cubeb instead of the builtin one" OFF)
-option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON)
-option(USE_SYSTEM_FAUDIO "Prefer system FAudio instead of the builtin one" OFF)
-option(USE_SYSTEM_FFMPEG "Prefer system ffmpeg instead of the prebuild one" OFF)
-option(USE_SYSTEM_FLATBUFFERS "Prefer system flatbuffers instead of the builtin one" OFF)
-option(USE_SYSTEM_LIBPNG "Prefer system libpng instead of the builtin one" OFF)
-option(USE_SYSTEM_LIBUSB "Prefer system libusb instead of the builtin one" OFF)
-option(USE_SYSTEM_MVK "Prefer system MoltenVK instead of the builtin one" OFF)
-option(USE_SYSTEM_OPENAL "Prefer system OpenAL instead of the prebuild one" ON)
-option(USE_SYSTEM_OPENCV "Prefer system OpenCV instead of the builtin one" ON)
-option(USE_SYSTEM_PUGIXML "Prefer system pugixml instead of the builtin one" OFF)
-option(USE_SYSTEM_SDL "Prefer system SDL instead of the builtin one" ON)
-option(USE_SYSTEM_WOLFSSL "Prefer system MoltenVK instead of the builtin one" OFF)
-option(USE_SYSTEM_ZLIB "Prefer system ZLIB instead of the builtin one" ON)
-option(HAS_MEMORY_BREAKPOINTS "Add support for memory breakpoints to the interpreter" OFF)
-option(USE_LTO "Use LTO for building" ON)
-option(BUILD_RPCS3_TESTS "Build RPCS3 unit tests." OFF)
-option(RUN_RPCS3_TESTS "Run RPCS3 unit tests. Requires BUILD_RPCS3_TESTS" OFF)
 
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/buildfiles/cmake")
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/buildfiles/cmake")
 
 include(CheckCXXCompilerFlag)
 
-get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-if(IS_MULTI_CONFIG)
-    # TODO(cjj19970505@live.cn)
-    # Currently DicordRPC is included as a binary compiled with /MT flag.
-    # We need all 4 binaries(/MT /MTd /MD /MDd) or including the source instead of binary.
-    set(USE_DISCORD_RPC OFF CACHE BOOL "Discord RPC is only avaliable with single-config generator" FORCE)
-else()
-    if(NOT CMAKE_BUILD_TYPE)
-        message(STATUS "No build type selected, default to Release")
-        set(CMAKE_BUILD_TYPE "Release")
-    endif()
+if(NOT CMAKE_BUILD_TYPE)
+    message(STATUS "No build type selected, default to Release")
+    set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-if(CMAKE_BUILD_TYPE MATCHES "Debug" AND NOT MSVC)
-    add_compile_definitions(_DEBUG)
-endif()
-
-if(MSVC)
-    option(USE_MSVC_STATIC_CRT "Use static MSVC C runtime" OFF)
-
-    # TODO(cjj19970505@live.cn)
-    # DiscordRPC binary in 3rdparty is compiled /MT
-    # So theoretically we should enable DiscordRPC in Release and static CRT build
-    # since we might encounter some rumtime issues when more than one CRT version are presented.
-    # https://docs.microsoft.com/en-us/cpp/c-runtime-library/crt-library-features?view=msvc-160#what-problems-exist-if-an-application-uses-more-than-one-crt-version
-    # Add other DiscordRPC binaries(compiled with /MTd, /MD, /MDd) or compile it from source may address this issue.
-    if(NOT IS_MULTI_CONFIG)
-        if(NOT(CMAKE_BUILD_TYPE MATCHES "Release" AND USE_MSVC_STATIC_CRT))
-            set(USE_DISCORD_RPC OFF CACHE BOOL "Discord RPC is only available in Release and static CRT build." FORCE)
-        endif()
-    endif()
-
-    if(USE_MSVC_STATIC_CRT)
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-    else()
-        # though doc ( https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html )
-        # says if that property is not set then CMake uses the default value MultiThreaded$<$<CONFIG:Debug>:Debug>DLL
-        # to select a MSVC runtime library.
-        # But yaml-cpp set /MT(d) if CMAKE_MSVC_RUNTIME_LIBRARY is undefined
-        # So we have to define it explicitly
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
-    endif()
-
-    # TODO(cjj19970505@live.cn)
-    # offical QT uses dynamic CRT.
-    # When building our lib with static CRT and debug build type
-    # and linking with Qt with dynamic CRT and debug build,
-    # error is encountered in runtime (which is expected).
-    # But building our lib with static CRT and release build type,
-    # and linking with Qt with dynamic CRT and release build seems to be working,
-    # which is the same config with VS solution.
-    # (though technically it might still have some hidden errors).
-    # So we allow static CRT in both relase and debug build, but prompt warning in debug build.
-    # For more info:
-    # https://docs.microsoft.com/en-us/cpp/c-runtime-library/crt-library-features?view=msvc-160#what-problems-exist-if-an-application-uses-more-than-one-crt-version
-    # https://wiki.qt.io/Technical_FAQ#Why_does_a_statically_built_Qt_use_the_dynamic_Visual_Studio_runtime_libraries_.3F_Do_I_need_to_deploy_those_with_my_application_.3F
-    if(USE_MSVC_STATIC_CRT)
-        if(IS_MULTI_CONFIG OR CMAKE_BUILD_TYPE MATCHES "Debug")
-            message(AUTHOR_WARNING "Debug build currently can not work with static CRT.")
-        endif()
-    endif()
-    add_compile_options(/MP)
+if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+    add_definitions(-DNDEBUG)
+elseif(NOT MSVC)
+    add_definitions(-D_DEBUG)
 endif()
 
 if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
     message( FATAL_ERROR "RPCS3 can only be compiled on 64-bit platforms." )
 endif()
 
-if(APPLE AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
-    include_directories(/opt/homebrew/include)
-    link_directories(/opt/homebrew/lib)
+find_program(CCACHE_FOUND ccache)
+if(CCACHE_FOUND)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
 endif()
 
+if(WIN32)
+    add_definitions(-DUNICODE)
+    add_definitions(-D_WIN32_WINNT=0x0602)
+endif()
+
+if(APPLE)
+    include_directories(/opt/local/include)
+    link_directories(/opt/local/lib)
+endif()
+
+# Warnings are silenced for 3rdparty code
+set(CMAKE_CXX_FLAGS -w)
+set(CMAKE_C_FLAGS -w)
+set(LLVM_ENABLE_WARNINGS OFF CACHE BOOL "")
+
 if(MSVC)
     add_compile_options(/wd4530 /utf-8) # C++ exception handler used, but unwind semantics are not enabled
 endif()
 
 add_subdirectory(3rdparty)
 
-if (DISABLE_LTO)
-    if (CMAKE_C_FLAGS)
-        string(REGEX REPLACE "-flto[^ ]*" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
-    endif()
-    if (CMAKE_CXX_FLAGS)
-        string(REGEX REPLACE "-flto[^ ]*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-    endif()
-endif()
-
-string(FIND "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}" "-flto" FOUND_LTO)
-if (NOT FOUND_LTO EQUAL -1)
-    message(FATAL_ERROR "RPCS3 doesn't support building with LTO, use -DDISABLE_LTO=TRUE to force-disable it")
-endif()
+unset(CMAKE_CXX_FLAGS)
+unset(CMAKE_C_FLAGS)
 
 if(NOT WIN32)
     add_compile_options(-pthread)
@@ -157,9 +82,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${PROJECT_BINARY_DIR}/bin")
 
-if(BUILD_RPCS3_TESTS)
-    enable_testing()
-endif()
-add_subdirectory(rpcs3)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-set_directory_properties(PROPERTIES VS_STARTUP_PROJECT rpcs3)
+add_subdirectory(rpcs3)
diff --git a/CMakePresets.json b/CMakePresets.json
deleted file mode 100644
index a81db6227d..0000000000
--- a/CMakePresets.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  "version": 3,
-  "configurePresets": [
-    {
-      "name": "gcc",
-      "generator": "Ninja",
-      "binaryDir": "build-gcc",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "USE_NATIVE_INSTRUCTIONS": "ON",
-        "USE_PRECOMPILED_HEADERS": "ON",
-        "USE_FAUDIO": "OFF",
-        "USE_SYSTEM_CURL": "OFF",
-        "USE_SYSTEM_ZLIB": "OFF",
-        "USE_SYSTEM_LIBPNG": "OFF",
-        "USE_SYSTEM_OPENCV": "ON",
-        "BUILD_LLVM": "OFF",
-        "STATIC_LINK_LLVM": "ON"
-      }
-    },
-    {
-      "name": "clang",
-      "generator": "Ninja",
-      "binaryDir": "build-clang64",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "USE_NATIVE_INSTRUCTIONS": "ON",
-        "USE_PRECOMPILED_HEADERS": "ON",
-        "USE_FAUDIO": "OFF",
-        "USE_SYSTEM_CURL": "OFF",
-        "USE_SYSTEM_ZLIB": "OFF",
-        "USE_SYSTEM_LIBPNG": "OFF",
-        "USE_SYSTEM_OPENCV": "ON",
-        "LLVM_ENABLE_LIBCXX": "ON",
-        "BUILD_LLVM": "OFF",
-        "STATIC_LINK_LLVM": "ON"
-      },
-      "environment": {
-        "CXX": "clang++",
-        "CC": "clang"
-      }
-    },
-    {
-      "name": "msvc",
-      "displayName": "Windows x64",
-      "generator": "Visual Studio 17 2022",
-      "binaryDir": "build-msvc",
-      "architecture": {
-        "value": "x64",
-        "strategy": "external"
-      },
-      "cacheVariables": {
-        "CMAKE_CONFIGURATION_TYPES": "Debug;Release",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
-        "USE_NATIVE_INSTRUCTIONS": "ON",
-        "USE_PRECOMPILED_HEADERS": "ON",
-        "USE_FAUDIO": "OFF",
-        "USE_SYSTEM_CURL": "OFF",
-        "USE_SYSTEM_ZLIB": "OFF",
-        "USE_SYSTEM_OPENAL": "OFF",
-        "USE_SYSTEM_OPENCV": "OFF",
-        "BUILD_LLVM": "ON",
-        "STATIC_LINK_LLVM": "ON"
-      },
-      "vendor": {
-        "microsoft.com/VisualStudioSettings/CMake/1.0": {
-          "hostOS": [
-            "Windows"
-          ]
-        }
-      }
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "msvc-debug",
-      "configurePreset": "msvc",
-      "configuration": "Debug"
-    },
-    {
-      "name": "msvc-release",
-      "configurePreset": "msvc",
-      "configuration": "Release"
-    }
-  ]
-}
diff --git a/README.md b/README.md
index ac6e3cd594..58afa27362 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,14 @@
 RPCS3
 =====
 
-[![GitHub Actions](https://img.shields.io/github/actions/workflow/status/RPCS3/rpcs3/rpcs3.yml?branch=master&logo=github&label=Actions)](https://github.com/RPCS3/rpcs3/actions/workflows/rpcs3.yml)
-[![RPCS3 Discord Server](https://img.shields.io/discord/272035812277878785?color=5865F2&label=RPCS3%20Discord&logo=discord&logoColor=white)](https://discord.gg/rpcs3)
+[![Azure Build Status](https://dev.azure.com/nekotekina/nekotekina/_apis/build/status/RPCS3.rpcs3?branchName=master)](https://dev.azure.com/nekotekina/nekotekina/_build?definitionId=4&branchName=master)
+[![Cirrus CI - Base Branch Build Status](https://img.shields.io/cirrus/github/RPCS3/rpcs3?label=Cirrus%20CI%20(FreeBSD)&logo=cirrus-ci)](https://cirrus-ci.com/github/RPCS3/rpcs3)
+[![RPCS3 discord server](https://img.shields.io/discord/272035812277878785?color=%237289DA&label=RPCS3%20Discord&logo=discord&logoColor=white)](https://discord.me/rpcs3)
 
-The world's first free and open-source PlayStation 3 emulator/debugger, written in C++ for Windows, Linux, macOS and FreeBSD.
+The world's first free and open-source PlayStation 3 emulator/debugger, written in C++ for Windows and Linux.
 
 You can find some basic information on our [**website**](https://rpcs3.net/). Game info is being populated on the [**Wiki**](https://wiki.rpcs3.net/).
-For discussion about this emulator, PS3 emulation, and game compatibility reports, please visit our [**forums**](https://forums.rpcs3.net) and our [**Discord server**](https://discord.gg/RPCS3).
+For discussion about this emulator, PS3 emulation, and game compatibility reports, please visit our [**forums**](https://forums.rpcs3.net) and our [**Discord server**](https://discord.me/RPCS3).
 
 [**Support Lead Developers Nekotekina and kd-11 on Patreon**](https://www.patreon.com/Nekotekina)
 
@@ -20,6 +21,7 @@ If you want to contribute as a developer, please take a look at the following pa
 
 * [Coding Style](https://github.com/RPCS3/rpcs3/wiki/Coding-Style)
 * [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information)
+* [Roadmap](https://rpcs3.net/roadmap)
 
 You should also contact any of the developers in the forums or in the Discord server to learn more about the current state of the emulator.
 
@@ -31,7 +33,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 2022](https://aka.ms/vs/17/release/VC_redist.x64.exe) 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
 
diff --git a/Utilities/BitField.h b/Utilities/BitField.h
index b2243dbe1e..da41049193 100644
--- a/Utilities/BitField.h
+++ b/Utilities/BitField.h
@@ -8,15 +8,12 @@
 #pragma GCC diagnostic ignored "-Weffc++"
 #endif
 
-template <typename T, uint N>
+template<typename T, uint N>
 struct bf_base
 {
 	using type = T;
 	using vtype = std::common_type_t<type>;
-	using utype = std::make_unsigned_t<vtype>;
-
-	static constexpr bool can_be_packed = N < (sizeof(int) * 8 + (std::is_unsigned_v<vtype> ? 1 : 0)) && sizeof(vtype) > sizeof(int);
-	using compact_type = std::conditional_t<can_be_packed, std::conditional_t<std::is_unsigned_v<vtype>, uint, int>, vtype>;
+	using utype = typename std::make_unsigned<vtype>::type;
 
 	// Datatype bitsize
 	static constexpr uint bitmax = sizeof(T) * 8; static_assert(N - 1 < bitmax, "bf_base<> error: N out of bounds");
@@ -35,13 +32,12 @@ protected:
 };
 
 // Bitfield accessor (N bits from I position, 0 is LSB)
-template <typename T, uint I, uint N>
+template<typename T, uint I, uint N>
 struct bf_t : bf_base<T, N>
 {
 	using type = typename bf_t::type;
 	using vtype = typename bf_t::vtype;
 	using utype = typename bf_t::utype;
-	using compact_type = typename bf_t::compact_type;
 
 	// Field offset
 	static constexpr uint bitpos = I; static_assert(bitpos + N <= bf_t::bitmax, "bf_t<> error: I out of bounds");
@@ -52,29 +48,47 @@ struct bf_t : bf_base<T, N>
 		return static_cast<utype>(static_cast<utype>(bf_t::mask1 >> (bf_t::bitmax - bf_t::bitsize)) << bitpos);
 	}
 
-	// Bitfield extraction
-	static constexpr compact_type extract(const T& data) noexcept
+	// Bitfield extraction helper
+	template<typename T2, typename = void>
+	struct extract_impl
 	{
-		if constexpr (std::is_signed_v<T>)
+		static_assert(!sizeof(T2), "bf_t<> error: Invalid type");
+	};
+
+	template<typename T2>
+	struct extract_impl<T2, std::enable_if_t<std::is_unsigned<T2>::value>>
+	{
+		// Load unsigned value
+		static constexpr T2 extract(const T& data)
 		{
-			// Load signed value (sign-extended)
-			return static_cast<compact_type>(static_cast<vtype>(static_cast<utype>(data) << (bf_t::bitmax - bitpos - N)) >> (bf_t::bitmax - N));
+			return static_cast<T2>((static_cast<utype>(data) >> bitpos) & bf_t::vmask);
 		}
-		else
+	};
+
+	template<typename T2>
+	struct extract_impl<T2, std::enable_if_t<std::is_signed<T2>::value>>
+	{
+		// Load signed value (sign-extended)
+		static constexpr T2 extract(const T& data)
 		{
-			// Load unsigned value
-			return static_cast<compact_type>((static_cast<utype>(data) >> bitpos) & bf_t::vmask);
+			return static_cast<T2>(static_cast<vtype>(static_cast<utype>(data) << (bf_t::bitmax - bitpos - N)) >> (bf_t::bitmax - N));
 		}
+	};
+
+	// Bitfield extraction
+	static constexpr vtype extract(const T& data)
+	{
+		return extract_impl<vtype>::extract(data);
 	}
 
 	// Bitfield insertion
-	static constexpr vtype insert(compact_type value)
+	static constexpr vtype insert(vtype value)
 	{
 		return static_cast<vtype>((value & bf_t::vmask) << bitpos);
 	}
 
 	// Load bitfield value
-	constexpr operator compact_type() const noexcept
+	constexpr operator vtype() const
 	{
 		return extract(this->m_data);
 	}
@@ -86,93 +100,83 @@ struct bf_t : bf_base<T, N>
 	}
 
 	// Optimized bool conversion (must be removed if inappropriate)
-	explicit constexpr operator bool() const noexcept
+	explicit constexpr operator bool() const
 	{
 		return unshifted() != 0u;
 	}
 
 	// Store bitfield value
-	bf_t& operator =(compact_type value) noexcept
+	bf_t& operator =(vtype value)
 	{
 		this->m_data = static_cast<vtype>((this->m_data & ~data_mask()) | insert(value));
 		return *this;
 	}
 
-	compact_type operator ++(int)
+	vtype operator ++(int)
 	{
-		compact_type result = *this;
-		*this = static_cast<compact_type>(result + 1u);
+		utype result = *this;
+		*this = static_cast<vtype>(result + 1);
 		return result;
 	}
 
 	bf_t& operator ++()
 	{
-		return *this = static_cast<compact_type>(*this + 1u);
+		return *this = *this + 1;
 	}
 
-	compact_type operator --(int)
+	vtype operator --(int)
 	{
-		compact_type result = *this;
-		*this = static_cast<compact_type>(result - 1u);
+		utype result = *this;
+		*this = static_cast<vtype>(result - 1);
 		return result;
 	}
 
 	bf_t& operator --()
 	{
-		return *this = static_cast<compact_type>(*this - 1u);
+		return *this = *this - 1;
 	}
 
-	bf_t& operator +=(compact_type right)
+	bf_t& operator +=(vtype right)
 	{
-		return *this = static_cast<compact_type>(*this + right);
+		return *this = *this + right;
 	}
 
-	bf_t& operator -=(compact_type right)
+	bf_t& operator -=(vtype right)
 	{
-		return *this = static_cast<compact_type>(*this - right);
+		return *this = *this - right;
 	}
 
-	bf_t& operator *=(compact_type right)
+	bf_t& operator *=(vtype right)
 	{
-		return *this = static_cast<compact_type>(*this * right);
+		return *this = *this * right;
 	}
 
-	bf_t& operator &=(compact_type right)
+	bf_t& operator &=(vtype right)
 	{
-		this->m_data &= static_cast<vtype>(((static_cast<utype>(right + 0u) & bf_t::vmask) << bitpos) | ~(bf_t::vmask << bitpos));
+		this->m_data &= static_cast<vtype>(((static_cast<utype>(right) & bf_t::vmask) << bitpos) | ~(bf_t::vmask << bitpos));
 		return *this;
 	}
 
-	bf_t& operator |=(compact_type right)
+	bf_t& operator |=(vtype right)
 	{
-		this->m_data |= static_cast<vtype>((static_cast<utype>(right + 0u) & bf_t::vmask) << bitpos);
+		this->m_data |= static_cast<vtype>((static_cast<utype>(right) & bf_t::vmask) << bitpos);
 		return *this;
 	}
 
-	bf_t& operator ^=(compact_type right)
+	bf_t& operator ^=(vtype right)
 	{
-		this->m_data ^= static_cast<vtype>((static_cast<utype>(right + 0u) & bf_t::vmask) << bitpos);
+		this->m_data ^= static_cast<vtype>((static_cast<utype>(right) & bf_t::vmask) << bitpos);
 		return *this;
 	}
 };
 
-template <typename T, uint I, uint N>
-struct std::common_type<bf_t<T, I, N>, bf_t<T, I, N>> : std::common_type<T> {};
-
-template <typename T, uint I, uint N, typename T2>
-struct std::common_type<bf_t<T, I, N>, T2> : std::common_type<T2, std::common_type_t<T>> {};
-
-template <typename T, uint I, uint N, typename T2>
-struct std::common_type<T2, bf_t<T, I, N>> : std::common_type<std::common_type_t<T>, T2> {};
-
 // Field pack (concatenated from left to right)
-template <typename F = void, typename... Fields>
+template<typename F = void, typename... Fields>
 struct cf_t : bf_base<typename F::type, F::bitsize + cf_t<Fields...>::bitsize>
 {
 	using type = typename cf_t::type;
 	using vtype = typename cf_t::vtype;
 	using utype = typename cf_t::utype;
-	using compact_type = typename cf_t::compact_type;
 
 	// Get disjunction of all "data" masks of concatenated values
 	static constexpr vtype data_mask()
@@ -181,25 +185,25 @@ struct cf_t : bf_base<typename F::type, F::bitsize + cf_t<Fields...>::bitsize>
 	}
 
 	// Extract all bitfields and concatenate
-	static constexpr compact_type extract(const type& data)
+	static constexpr vtype extract(const type& data)
 	{
-		return static_cast<compact_type>(static_cast<utype>(F::extract(data)) << cf_t<Fields...>::bitsize | cf_t<Fields...>::extract(data));
+		return static_cast<vtype>(static_cast<utype>(F::extract(data)) << cf_t<Fields...>::bitsize | cf_t<Fields...>::extract(data));
 	}
 
 	// Split bitfields and insert them
-	static constexpr vtype insert(compact_type value)
+	static constexpr vtype insert(vtype value)
 	{
 		return static_cast<vtype>(F::insert(value >> cf_t<Fields...>::bitsize) | cf_t<Fields...>::insert(value));
 	}
 
 	// Load value
-	constexpr operator compact_type() const noexcept
+	constexpr operator vtype() const
 	{
 		return extract(this->m_data);
 	}
 
 	// Store value
-	cf_t& operator =(compact_type value) noexcept
+	cf_t& operator =(vtype value)
 	{
 		this->m_data = (this->m_data & ~data_mask()) | insert(value);
 		return *this;
@@ -207,7 +211,7 @@ struct cf_t : bf_base<typename F::type, F::bitsize + cf_t<Fields...>::bitsize>
 };
 
 // Empty field pack (recursion terminator)
-template <>
+template<>
 struct cf_t<void>
 {
 	static constexpr uint bitsize = 0;
@@ -217,13 +221,13 @@ struct cf_t<void>
 		return 0;
 	}
 
-	template <typename T>
+	template<typename T>
 	static constexpr auto extract(const T&) -> decltype(+T())
 	{
 		return 0;
 	}
 
-	template <typename T>
+	template<typename T>
 	static constexpr T insert(T /*value*/)
 	{
 		return 0;
@@ -231,7 +235,7 @@ struct cf_t<void>
 };
 
 // Fixed field (provides constant values in field pack)
-template <typename T, T V, uint N>
+template<typename T, T V, uint N>
 struct ff_t : bf_base<T, N>
 {
 	using type = typename ff_t::type;
@@ -245,7 +249,7 @@ struct ff_t : bf_base<T, N>
 	}
 
 	// Get value
-	constexpr operator vtype() const noexcept
+	operator vtype() const
 	{
 		return V;
 	}
@@ -255,8 +259,8 @@ struct ff_t : bf_base<T, N>
 #pragma GCC diagnostic pop
 #endif
 
-template <typename T, uint I, uint N>
-struct fmt_unveil<bf_t<T, I, N>>
+template<typename T, uint I, uint N>
+struct fmt_unveil<bf_t<T, I, N>, void>
 {
 	using type = typename fmt_unveil<std::common_type_t<T>>::type;
 
@@ -266,8 +270,8 @@ struct fmt_unveil<bf_t<T, I, N>>
 	}
 };
 
-template <typename F, typename... Fields>
-struct fmt_unveil<cf_t<F, Fields...>>
+template<typename F, typename... Fields>
+struct fmt_unveil<cf_t<F, Fields...>, void>
 {
 	using type = typename fmt_unveil<std::common_type_t<typename F::type>>::type;
 
@@ -277,8 +281,8 @@ struct fmt_unveil<cf_t<F, Fields...>>
 	}
 };
 
-template <typename T, T V, uint N>
-struct fmt_unveil<ff_t<T, V, N>>
+template<typename T, T V, uint N>
+struct fmt_unveil<ff_t<T, V, N>, void>
 {
 	using type = typename fmt_unveil<std::common_type_t<T>>::type;
 
diff --git a/Utilities/CRC.h b/Utilities/CRC.h
index df2cbb2022..36333879f7 100644
--- a/Utilities/CRC.h
+++ b/Utilities/CRC.h
@@ -725,7 +725,7 @@ namespace CRCPP
 		{
 			while (size--)
 			{
-#ifdef _MSC_VER
+#if defined(WIN32) || defined(_WIN32) || defined(WINCE)
 				// Disable warning about data loss when doing (remainder >> CHAR_BIT) when
 				// remainder is one byte long. The algorithm is still correct in this case,
 				// though it's possible that one additional machine instruction will be executed.
@@ -733,7 +733,7 @@ namespace CRCPP
 #   pragma warning (disable : 4333)
 #endif
 				remainder = (remainder >> CHAR_BIT) ^ lookupTable[static_cast<unsigned char>(remainder ^ *current++)];
-#ifdef _MSC_VER
+#if defined(WIN32) || defined(_WIN32) || defined(WINCE)
 #   pragma warning (pop)
 #endif
 			}
diff --git a/Utilities/Config.cpp b/Utilities/Config.cpp
index 0c2a1fa2aa..b500a251f5 100644
--- a/Utilities/Config.cpp
+++ b/Utilities/Config.cpp
@@ -1,24 +1,17 @@
 #include "stdafx.h"
 #include "Config.h"
 #include "util/types.hpp"
+
 #include "util/yaml.hpp"
 
 #include <charconv>
 
 LOG_CHANNEL(cfg_log, "CFG");
 
-template <>
-void fmt_class_string<cfg::node>::format(std::string& out, u64 arg)
-{
- 	out += get_object(arg).to_string();
-}
-
 namespace cfg
 {
-	u32 _base::id_counter = 0;
-
 	_base::_base(type _type)
-		: m_type(_type), m_id(id_counter++)
+		: m_type(_type)
 	{
 		if (_type != type::node)
 		{
@@ -26,21 +19,21 @@ namespace cfg
 		}
 	}
 
-	_base::_base(type _type, node* owner, std::string name, bool dynamic)
-		: m_type(_type), m_parent(owner), m_dynamic(dynamic), m_name(std::move(name)), m_id(id_counter++)
+	_base::_base(type _type, node* owner, const std::string& name, bool dynamic)
+		: m_type(_type), m_dynamic(dynamic), m_name(name)
 	{
 		for (const auto& node : owner->m_nodes)
 		{
-			if (node->get_name() == m_name)
+			if (node->get_name() == name)
 			{
-				cfg_log.fatal("Node already exists: %s", m_name);
+				cfg_log.fatal("Node already exists: %s", name);
 			}
 		}
 
 		owner->m_nodes.emplace_back(this);
 	}
 
-	bool _base::from_string(std::string_view, bool)
+	bool _base::from_string(const std::string&, bool)
 	{
 		cfg_log.fatal("cfg::_base::from_string() purecall");
 		return false;
@@ -52,17 +45,6 @@ namespace cfg
 		return false;
 	}
 
-	bool _base::save(std::string_view cfg_name) const
-	{
-		if (fs::pending_file cfg_file(cfg_name); !!cfg_file.file)
-		{
-			cfg_file.file.write(to_string());
-			return cfg_file.commit();
-		}
-
-		return false;
-	}
-
 	// Emit YAML
 	static void encode(YAML::Emitter& out, const class _base& rhs);
 
@@ -76,17 +58,11 @@ std::vector<std::string> cfg::make_int_range(s64 min, s64 max)
 	return {std::to_string(min), std::to_string(max)};
 }
 
-bool try_to_int64(s64* out, std::string_view value, s64 min, s64 max)
+bool try_to_int64(s64* out, const std::string& value, s64 min, s64 max)
 {
-	if (value.empty())
-	{
-		if (out) cfg_log.error("cfg::try_to_int64(): called with an empty string");
-		return false;
-	}
-
 	s64 result;
-	const char* start = value.data();
-	const char* end = start + value.size();
+	const char* start = &value.front();
+	const char* end = &value.back() + 1;
 	int base = 10;
 	int sign = +1;
 
@@ -96,7 +72,7 @@ bool try_to_int64(s64* out, std::string_view value, s64 min, s64 max)
 		start += 1;
 	}
 
-	if (start[0] == '0' && value.size() >= 2 && (start[1] == 'x' || start[1] == 'X'))
+	if (start[0] == '0' && (start[1] == 'x' || start[1] == 'X'))
 	{
 		// Limited hex support
 		base = 16;
@@ -115,7 +91,7 @@ bool try_to_int64(s64* out, std::string_view value, s64 min, s64 max)
 
 	if (result < min || result > max)
 	{
-		if (out) cfg_log.error("cfg::try_to_int64('%s'): out of bounds (val=%d, min=%d, max=%d)", value, result, min, max);
+		if (out) cfg_log.error("cfg::try_to_int64('%s'): out of bounds (%d..%d)", value, min, max);
 		return false;
 	}
 
@@ -128,20 +104,14 @@ std::vector<std::string> cfg::make_uint_range(u64 min, u64 max)
 	return {std::to_string(min), std::to_string(max)};
 }
 
-bool try_to_uint64(u64* out, std::string_view value, u64 min, u64 max)
+bool try_to_uint64(u64* out, const std::string& value, u64 min, u64 max)
 {
-	if (value.empty())
-	{
-		if (out) cfg_log.error("cfg::try_to_uint64(): called with an empty string");
-		return false;
-	}
-
 	u64 result;
-	const char* start = value.data();
-	const char* end = start + value.size();
+	const char* start = &value.front();
+	const char* end = &value.back() + 1;
 	int base = 10;
 
-	if (start[0] == '0' && value.size() >= 2 && (start[1] == 'x' || start[1] == 'X'))
+	if (start[0] == '0' && (start[1] == 'x' || start[1] == 'X'))
 	{
 		// Limited hex support
 		base = 16;
@@ -158,7 +128,7 @@ bool try_to_uint64(u64* out, std::string_view value, u64 min, u64 max)
 
 	if (result < min || result > max)
 	{
-		if (out) cfg_log.error("cfg::try_to_uint64('%s'): out of bounds (val=%u, min=%u, max=%u)", value, result, min, max);
+		if (out) cfg_log.error("cfg::try_to_uint64('%s'): out of bounds (%u..%u)", value, min, max);
 		return false;
 	}
 
@@ -166,64 +136,7 @@ bool try_to_uint64(u64* out, std::string_view value, u64 min, u64 max)
 	return true;
 }
 
-std::vector<std::string> cfg::make_float_range(f64 min, f64 max)
-{
-	return {std::to_string(min), std::to_string(max)};
-}
-
-bool try_to_float(f64* out, std::string_view value, f64 min, f64 max)
-{
-	if (value.empty())
-	{
-		if (out) cfg_log.error("cfg::try_to_float(): called with an empty string");
-		return false;
-	}
-
-	// std::from_chars float is yet to be implemented on Xcode it seems
-	// And strtod doesn't support ranged view so we need to ensure it meets a null terminator
-	const std::string str = std::string{value};
-
-	char* end_check{};
-	const double result = std::strtod(str.data(), &end_check);
-
-	if (end_check != str.data() + str.size())
-	{
-		if (out) cfg_log.error("cfg::try_to_float('%s'): invalid float", value);
-		return false;
-	}
-
-	if (result < min || result > max)
-	{
-		if (out) cfg_log.error("cfg::try_to_float('%s'): out of bounds (val=%f, min=%f, max=%f)", value, result, min, max);
-		return false;
-	}
-
-	if (out) *out = result;
-	return true;
-}
-
-bool try_to_string(std::string* out, const f64& value)
-{
-#ifdef __APPLE__
-	if (out) *out = std::to_string(value);
-	return true;
-#else
-	std::array<char, 32> str{};
-
-	if (auto [ptr, ec] = std::to_chars(str.data(), str.data() + str.size(), value, std::chars_format::fixed); ec == std::errc())
-	{
-		if (out) *out = std::string(str.data(), ptr);
-		return true;
-	}
-	else
-	{
-		if (out) cfg_log.error("cfg::try_to_string(): could not convert value '%f' to string. error='%s'", value, std::make_error_code(ec).message());
-		return false;
-	}
-#endif
-}
-
-bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) func, std::string_view value)
+bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) func, const std::string& value)
 {
 	u64 max = umax;
 
@@ -249,8 +162,8 @@ bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) f
 	}
 
 	u64 result;
-	const char* start = value.data();
-	const char* end = start + value.size();
+	const char* start = &value.front();
+	const char* end = &value.back() + 1;
 	int base = 10;
 
 	if (start[0] == '0' && (start[1] == 'x' || start[1] == 'X'))
@@ -270,7 +183,7 @@ bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) f
 
 	if (result > max)
 	{
-		if (out) cfg_log.error("cfg::try_to_enum_value('%s'): out of bounds(val=%u, min=0, max=%u)", value, result, max);
+		if (out) cfg_log.error("cfg::try_to_enum_value('%s'): out of bounds(0..%u)", value, max);
 		return false;
 	}
 
@@ -337,18 +250,6 @@ void cfg::encode(YAML::Emitter& out, const cfg::_base& rhs)
 		out << YAML::EndMap;
 		return;
 	}
-	case type::node_map:
-	{
-		//out << YAML::Block; // Does nothing, output is in Flow mode still (TODO)
-		out << YAML::BeginMap;
-		for (const auto& np : static_cast<const node_map_entry&>(rhs).get_map())
-		{
-			out << YAML::Key << np.first;
-			out << YAML::Value << fmt::format("%s", np.second);
-		}
-		out << YAML::EndMap;
-		return;
-	}
 	case type::log:
 	{
 		out << YAML::BeginMap;
@@ -361,22 +262,6 @@ void cfg::encode(YAML::Emitter& out, const cfg::_base& rhs)
 		out << YAML::EndMap;
 		return;
 	}
-	case type::device:
-	{
-		out << YAML::BeginMap;
-		for (const auto& [key, info] : static_cast<const device_entry&>(rhs).get_map())
-		{
-			out << YAML::Key << key;
-			out << YAML::BeginMap;
-			out << YAML::Key << "Path" << YAML::Value << info.path;
-			out << YAML::Key << "Serial" << YAML::Value << info.serial;
-			out << YAML::Key << "VID" << YAML::Value << info.vid;
-			out << YAML::Key << "PID" << YAML::Value << info.pid;
-			out << YAML::EndMap;
-		}
-		out << YAML::EndMap;
-		return;
-	}
 	default:
 	{
 		out << rhs.to_string();
@@ -429,14 +314,13 @@ void cfg::decode(const YAML::Node& data, cfg::_base& rhs, bool dynamic)
 		break;
 	}
 	case type::map:
-	case type::node_map:
 	{
 		if (!data.IsMap())
 		{
 			return;
 		}
 
-		map_of_type<std::string> values;
+		std::map<std::string, std::string> values;
 
 		for (const auto& pair : data)
 		{
@@ -455,7 +339,7 @@ void cfg::decode(const YAML::Node& data, cfg::_base& rhs, bool dynamic)
 			return; // ???
 		}
 
-		map_of_type<logs::level> values;
+		std::map<std::string, logs::level> values;
 
 		for (const auto& pair : data)
 		{
@@ -471,44 +355,6 @@ void cfg::decode(const YAML::Node& data, cfg::_base& rhs, bool dynamic)
 		static_cast<log_entry&>(rhs).set_map(std::move(values));
 		break;
 	}
-	case type::device:
-	{
-		if (!data.IsMap())
-		{
-			return; // ???
-		}
-
-		map_of_type<device_info> values;
-
-		for (const auto& pair : data)
-		{
-			if (!pair.first.IsScalar() || !pair.second.IsMap()) continue;
-
-			device_info info{};
-
-			for (const auto& key_value : pair.second)
-			{
-				if (!key_value.first.IsScalar() || !key_value.second.IsScalar()) continue;
-
-				if (key_value.first.Scalar() == "Path")
-					info.path = key_value.second.Scalar();
-
-				if (key_value.first.Scalar() == "Serial")
-					info.serial = key_value.second.Scalar();
-
-				if (key_value.first.Scalar() == "VID")
-					info.vid = key_value.second.Scalar();
-
-				if (key_value.first.Scalar() == "PID")
-					info.pid = key_value.second.Scalar();
-			}
-
-			values.emplace(pair.first.Scalar(), std::move(info));
-		}
-
-		static_cast<device_entry&>(rhs).set_map(std::move(values));
-		break;
-	}
 	default:
 	{
 		std::string value;
@@ -531,9 +377,9 @@ std::string cfg::node::to_string() const
 	return {out.c_str(), out.size()};
 }
 
-bool cfg::node::from_string(std::string_view value, bool dynamic)
+bool cfg::node::from_string(const std::string& value, bool dynamic)
 {
-	auto [result, error] = yaml_load(std::string(value));
+	auto [result, error] = yaml_load(value);
 
 	if (error.empty())
 	{
@@ -541,7 +387,7 @@ bool cfg::node::from_string(std::string_view value, bool dynamic)
 		return true;
 	}
 
-	cfg_log.error("Failed to load node: %s", error);
+	cfg_log.fatal("Failed to load node: %s", error);
 	return false;
 }
 
@@ -568,40 +414,27 @@ void cfg::set_entry::from_default()
 	m_set = {};
 }
 
-std::string cfg::map_entry::get_value(std::string_view key)
+std::string cfg::map_entry::get_value(const std::string& key)
 {
-	if (auto it = m_map.find(key); it != m_map.end())
-	{
-		return it->second;
-	}
-
-	return {};
+	return m_map.contains(key) ? m_map.at(key) : "";
 }
 
-void cfg::map_entry::set_value(std::string key, std::string value)
+void cfg::map_entry::set_value(const std::string& key, const std::string& value)
 {
-	m_map[std::move(key)] = std::move(value);
+	m_map[key] = value;
 }
 
-void cfg::map_entry::set_map(map_of_type<std::string>&& map)
+void cfg::map_entry::set_map(std::map<std::string, std::string>&& map)
 {
 	m_map = std::move(map);
 }
 
-void cfg::map_entry::erase(std::string_view key)
-{
-	if (auto it = m_map.find(key); it != m_map.end())
-	{
-		m_map.erase(it);
-	}
-}
-
 void cfg::map_entry::from_default()
 {
 	set_map({});
 }
 
-void cfg::log_entry::set_map(map_of_type<logs::level>&& map)
+void cfg::log_entry::set_map(std::map<std::string, logs::level>&& map)
 {
 	m_map = std::move(map);
 }
@@ -610,25 +443,3 @@ void cfg::log_entry::from_default()
 {
 	set_map({});
 }
-
-std::pair<u16, u16> cfg::device_info::get_usb_ids() const
-{
-	auto string_to_hex = [](const std::string& str) -> u16
-	{
-		u16 value = 0x0000;
-		if (!str.empty() && std::from_chars(str.data(), str.data() + str.size(), value, 16).ec != std::errc{})
-			cfg_log.error("Failed to parse hex from string \"%s\"", str);
-		return value;
-	};
-	return {string_to_hex(vid), string_to_hex(pid)};
-}
-
-void cfg::device_entry::set_map(map_of_type<device_info>&& map)
-{
-	m_map = std::move(map);
-}
-
-void cfg::device_entry::from_default()
-{
-	m_map = m_default;
-}
diff --git a/Utilities/Config.h b/Utilities/Config.h
index bd05c25220..51fd0c2d43 100644
--- a/Utilities/Config.h
+++ b/Utilities/Config.h
@@ -6,7 +6,6 @@
 #include "util/atomic.hpp"
 #include "util/shared_ptr.hpp"
 
-#include <algorithm>
 #include <utility>
 #include <string>
 #include <vector>
@@ -21,11 +20,8 @@ namespace cfg
 	// Format min and max unsigned values
 	std::vector<std::string> make_uint_range(u64 min, u64 max);
 
-	// Format min and max float values
-	std::vector<std::string> make_float_range(f64 min, f64 max);
-
 	// Internal hack
-	bool try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) func, std::string_view);
+	bool try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) func, const std::string&);
 
 	// Internal hack
 	std::vector<std::string> try_to_enum_list(decltype(&fmt_class_string<int>::format) func);
@@ -41,9 +37,7 @@ namespace cfg
 		string, // cfg::string type
 		set, // cfg::set_entry type
 		map, // cfg::map_entry type
-		node_map, // cfg::node_map_entry type
-		log, // cfg::log_entry type
-		device, // cfg::device_entry type
+		log,
 	};
 
 	// Config tree entry abstract base class
@@ -52,18 +46,14 @@ namespace cfg
 		const type m_type{};
 
 	protected:
-		_base* m_parent = nullptr;
 		bool m_dynamic = true;
 		const std::string m_name{};
 
-		static u32 id_counter;
-		u32 m_id = 0;
-
 		// Ownerless entry constructor
 		_base(type _type);
 
 		// Owned entry constructor
-		_base(type _type, class node* owner, std::string name, bool dynamic);
+		_base(type _type, class node* owner, const std::string& name, bool dynamic);
 
 	public:
 		_base(const _base&) = delete;
@@ -72,16 +62,9 @@ namespace cfg
 
 		virtual ~_base() = default;
 
-		// Get unique ID
-		u32 get_id() const { return m_id; }
-
-		// Get parent
-		_base* get_parent() const { return m_parent; }
-
 		// Get type
 		type get_type() const { return m_type; }
 
-		// Get name
 		const std::string& get_name() const { return m_name; }
 
 		// Get dynamic property for reloading configs during games
@@ -93,28 +76,20 @@ namespace cfg
 		// Convert to string (optional)
 		virtual std::string to_string() const
 		{
-			return {};
-		}
-
-		// Convert default to string (optional)
-		virtual std::string def_to_string() const
-		{
-			return {};
+			return{};
 		}
 
 		// Try to convert from string (optional)
-		virtual bool from_string(std::string_view, bool /*dynamic*/ = false);
+		virtual bool from_string(const std::string&, bool /*dynamic*/ = false);
 
 		// Get string list (optional)
 		virtual std::vector<std::string> to_list() const
 		{
-			return {};
+			return{};
 		}
 
 		// Set multiple values. Implementation-specific, optional.
 		virtual bool from_list(std::vector<std::string>&&);
-
-		bool save(std::string_view cfg_name) const;
 	};
 
 	// Config tree node which contains another nodes
@@ -132,8 +107,8 @@ namespace cfg
 		}
 
 		// Registered node constructor
-		node(node* owner, std::string name, bool dynamic = true)
-			: _base(type::node, owner, std::move(name), dynamic)
+		node(node* owner, const std::string& name, bool dynamic = true)
+			: _base(type::node, owner, name, dynamic)
 		{
 		}
 
@@ -147,7 +122,7 @@ namespace cfg
 		std::string to_string() const override;
 
 		// Deserialize node
-		bool from_string(std::string_view value, bool dynamic = false) override;
+		bool from_string(const std::string& value, bool dynamic = false) override;
 
 		// Set default values
 		void from_default() override;
@@ -160,8 +135,8 @@ namespace cfg
 	public:
 		bool def;
 
-		_bool(node* owner, std::string name, bool def = false, bool dynamic = false)
-			: _base(type::_bool, owner, std::move(name), dynamic)
+		_bool(node* owner, const std::string& name, bool def = false, bool dynamic = false)
+			: _base(type::_bool, owner, name, dynamic)
 			, m_value(def)
 			, def(def)
 		{
@@ -184,24 +159,11 @@ namespace cfg
 			return m_value ? "true" : "false";
 		}
 
-		std::string def_to_string() const override
+		bool from_string(const std::string& value, bool /*dynamic*/ = false) override
 		{
-			return def ? "true" : "false";
-		}
-
-		bool from_string(std::string_view value, bool /*dynamic*/ = false) override
-		{
-			if (value.size() != 4 && value.size() != 5)
-			{
-				return false;
-			}
-
-			char copy[5];
-			std::transform(value.begin(), value.end(), std::begin(copy), ::tolower);
-
-			if (value.size() == 5 && std::string_view{copy, 5} == "false")
+			if (value == "false")
 				m_value = false;
-			else if (value.size() == 4 && std::string_view{copy, 4} == "true")
+			else if (value == "true")
 				m_value = true;
 			else
 				return false;
@@ -217,7 +179,7 @@ namespace cfg
 
 	// Value node with fixed set of possible values, each maps to an enum value of type T.
 	template <typename T>
-	class _enum : public _base
+	class _enum final : public _base
 	{
 		atomic_t<T> m_value;
 
@@ -241,11 +203,6 @@ namespace cfg
 			return m_value;
 		}
 
-		T get_default() const
-		{
-			return def;
-		}
-
 		void set(T value)
 		{
 			m_value = value;
@@ -263,14 +220,7 @@ namespace cfg
 			return result; // TODO: ???
 		}
 
-		std::string def_to_string() const override
-		{
-			std::string result;
-			fmt_class_string<T>::format(result, fmt_unveil<T>::get(def));
-			return result; // TODO: ???
-		}
-
-		bool from_string(std::string_view value, bool /*dynamic*/ = false) override
+		bool from_string(const std::string& value, bool /*dynamic*/ = false) override
 		{
 			u64 result;
 
@@ -305,8 +255,8 @@ namespace cfg
 		int_type def;
 
 		// Expose range
-		static constexpr s64 max = Max;
-		static constexpr s64 min = Min;
+		static const s64 max = Max;
+		static const s64 min = Min;
 
 		_int(node* owner, const std::string& name, int_type def = std::min<int_type>(Max, std::max<int_type>(Min, 0)), bool dynamic = false)
 			: _base(type::_int, owner, name, dynamic)
@@ -335,12 +285,7 @@ namespace cfg
 			return std::to_string(m_value);
 		}
 
-		std::string def_to_string() const override
-		{
-			return std::to_string(def);
-		}
-
-		bool from_string(std::string_view value, bool /*dynamic*/ = false) override
+		bool from_string(const std::string& value, bool /*dynamic*/ = false) override
 		{
 			s64 result;
 			if (try_to_int64(&result, value, Min, Max))
@@ -354,7 +299,6 @@ namespace cfg
 
 		void set(const s64& value)
 		{
-			ensure(value >= Min && value <= Max);
 			m_value = static_cast<int_type>(value);
 		}
 
@@ -364,90 +308,6 @@ namespace cfg
 		}
 	};
 
-	// Float entry with custom Min/Max range.
-	template <s32 Min, s32 Max>
-	class _float final : public _base
-	{
-		static_assert(Min < Max, "Invalid cfg::_float range");
-
-		using float_type = f64;
-		atomic_t<float_type> m_value;
-
-	public:
-		float_type def;
-
-		// Expose range
-		static constexpr float_type max = Max;
-		static constexpr float_type min = Min;
-
-		_float(node* owner, const std::string& name, float_type def = std::min<float_type>(Max, std::max<float_type>(Min, 0)), bool dynamic = false)
-			: _base(type::_int, owner, name, dynamic)
-			, m_value(def)
-			, def(def)
-		{
-		}
-
-		operator float_type() const
-		{
-			return m_value;
-		}
-
-		float_type get() const
-		{
-			return m_value;
-		}
-
-		void from_default() override
-		{
-			m_value = def;
-		}
-
-		std::string to_string() const override
-		{
-			std::string result;
-			if (try_to_string(&result, m_value))
-			{
-				return result;
-			}
-
-			return "0.0";
-		}
-
-		std::string def_to_string() const override
-		{
-			std::string result;
-			if (try_to_string(&result, def))
-			{
-				return result;
-			}
-
-			return "0.0";
-		}
-
-		bool from_string(std::string_view value, bool /*dynamic*/ = false) override
-		{
-			f64 result;
-			if (try_to_float(&result, value, Min, Max))
-			{
-				m_value = static_cast<float_type>(result);
-				return true;
-			}
-
-			return false;
-		}
-
-		void set(const f64& value)
-		{
-			ensure(value >= Min && value <= Max);
-			m_value = static_cast<float_type>(value);
-		}
-
-		std::vector<std::string> to_list() const override
-		{
-			return make_float_range(Min, Max);
-		}
-	};
-
 	// Alias for 32 bit int
 	using int32 = _int<s32{smin}, s32{smax}>;
 
@@ -469,8 +329,8 @@ namespace cfg
 		int_type def;
 
 		// Expose range
-		static constexpr u64 max = Max;
-		static constexpr u64 min = Min;
+		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)
@@ -499,12 +359,7 @@ namespace cfg
 			return std::to_string(m_value);
 		}
 
-		std::string def_to_string() const override
-		{
-			return std::to_string(def);
-		}
-
-		bool from_string(std::string_view value, bool /*dynamic*/ = false) override
+		bool from_string(const std::string& value, bool /*dynamic*/ = false) override
 		{
 			u64 result;
 			if (try_to_uint64(&result, value, Min, Max))
@@ -518,7 +373,6 @@ namespace cfg
 
 		void set(const u64& value)
 		{
-			ensure(value >= Min && value <= Max);
 			m_value = static_cast<int_type>(value);
 		}
 
@@ -543,7 +397,7 @@ namespace cfg
 		std::string def;
 
 		string(node* owner, std::string name, std::string def = {}, bool dynamic = false)
-			: _base(type::string, owner, std::move(name), dynamic)
+			: _base(type::string, owner, name, dynamic)
 			, m_value(def)
 			, def(std::move(def))
 		{
@@ -554,6 +408,21 @@ namespace cfg
 			return *m_value.load().get();
 		}
 
+		std::pair<const std::string&, shared_ptr<std::string>> get() const
+		{
+			auto v = m_value.load();
+
+			if (auto s = v.get())
+			{
+				return {*s, std::move(v)};
+			}
+			else
+			{
+				static const std::string _empty;
+				return {_empty, {}};
+			}
+		}
+
 		void from_default() override;
 
 		std::string to_string() const override
@@ -561,14 +430,9 @@ namespace cfg
 			return *m_value.load().get();
 		}
 
-		std::string def_to_string() const override
+		bool from_string(const std::string& value, bool /*dynamic*/ = false) override
 		{
-			return def;
-		}
-
-		bool from_string(std::string_view value, bool /*dynamic*/ = false) override
-		{
-			m_value = std::string(value);
+			m_value = value;
 			return true;
 		}
 	};
@@ -599,7 +463,7 @@ namespace cfg
 
 		std::vector<std::string> to_list() const override
 		{
-			return { m_set.begin(), m_set.end() };
+			return{ m_set.begin(), m_set.end() };
 		}
 
 		bool from_list(std::vector<std::string>&& list) override
@@ -610,46 +474,32 @@ namespace cfg
 		}
 	};
 
-	template<typename T>
-	using map_of_type = std::map<std::string, T, std::less<>>;
-
-	class map_entry : public _base
+	class map_entry final : public _base
 	{
-		map_of_type<std::string> m_map{};
+		std::map<std::string, std::string> m_map{};
 
 	public:
-		map_entry(node* owner, const std::string& name, type _type = type::map)
-			: _base(_type, owner, name, true)
+		map_entry(node* owner, const std::string& name)
+			: _base(type::map, owner, name, true)
 		{
 		}
 
-		const map_of_type<std::string>& get_map() const
+		const std::map<std::string, std::string>& get_map() const
 		{
 			return m_map;
 		}
 
-		std::string get_value(std::string_view key);
+		std::string get_value(const std::string& key);
 
-		void set_value(std::string key, std::string value);
-		void set_map(map_of_type<std::string>&& map);
-
-		void erase(std::string_view key);
+		void set_value(const std::string& key, const std::string& value);
+		void set_map(std::map<std::string, std::string>&& map);
 
 		void from_default() override;
 	};
 
-	class node_map_entry final : public map_entry
-	{
-	public:
-		node_map_entry(node* owner, const std::string& name)
-			: map_entry(owner, name, type::node_map)
-		{
-		}
-	};
-
 	class log_entry final : public _base
 	{
-		map_of_type<logs::level> m_map{};
+		std::map<std::string, logs::level> m_map{};
 
 	public:
 		log_entry(node* owner, const std::string& name)
@@ -657,49 +507,12 @@ namespace cfg
 		{
 		}
 
-		const map_of_type<logs::level>& get_map() const
+		const std::map<std::string, logs::level>& get_map() const
 		{
 			return m_map;
 		}
 
-		void set_map(map_of_type<logs::level>&& map);
-
-		void from_default() override;
-	};
-
-	struct device_info
-	{
-		std::string path;
-		std::string serial;
-		std::string vid;
-		std::string pid;
-		std::pair<u16, u16> get_usb_ids() const;
-	};
-
-	class device_entry final : public _base
-	{
-		map_of_type<device_info> m_map{};
-		map_of_type<device_info> m_default{};
-
-	public:
-		device_entry(node* owner, const std::string& name, map_of_type<device_info> def = {})
-			: _base(type::device, owner, name, true)
-			, m_map(std::move(def))
-		{
-			m_default = m_map;
-		}
-
-		const map_of_type<device_info>& get_map() const
-		{
-			return m_map;
-		}
-
-		const map_of_type<device_info>& get_default() const
-		{
-			return m_default;
-		}
-
-		void set_map(map_of_type<device_info>&& map);
+		void set_map(std::map<std::string, logs::level>&& map);
 
 		void from_default() override;
 	};
diff --git a/Utilities/File.cpp b/Utilities/File.cpp
index aafcfe3c30..5dd2357f57 100644
--- a/Utilities/File.cpp
+++ b/Utilities/File.cpp
@@ -1,33 +1,23 @@
 #include "File.h"
 #include "mutex.h"
 #include "StrFmt.h"
+#include "Crypto/sha1.h"
 
-#include <span>
 #include <unordered_map>
 #include <algorithm>
 #include <cstring>
 #include <map>
-#include <iostream>
 
 #include "util/asm.hpp"
-#include "util/coro.hpp"
 
 using namespace std::literals::string_literals;
 
-#ifdef ANDROID
-std::string g_android_executable_dir;
-std::string g_android_config_dir;
-std::string g_android_cache_dir;
-#endif
-
 #ifdef _WIN32
 
-#include "Utilities/StrUtil.h"
-
 #include <cwchar>
 #include <Windows.h>
 
-static std::unique_ptr<wchar_t[]> to_wchar(std::string_view source)
+static std::unique_ptr<wchar_t[]> to_wchar(const std::string& source)
 {
 	// String size + null terminator
 	const usz buf_size = source.size() + 1;
@@ -50,7 +40,7 @@ static std::unique_ptr<wchar_t[]> to_wchar(std::string_view source)
 		std::memcpy(buffer.get() + 32768 + 4, L"UNC\\", 4 * sizeof(wchar_t));
 	}
 
-	ensure(MultiByteToWideChar(CP_UTF8, 0, source.data(), size, buffer.get() + 32768 + (unc ? 8 : 4), size)); // "to_wchar"
+	ensure(MultiByteToWideChar(CP_UTF8, 0, source.c_str(), size, buffer.get() + 32768 + (unc ? 8 : 4), size)); // "to_wchar"
 
 	// Canonicalize wide path (replace '/', ".", "..", \\ repetitions, etc)
 	ensure(GetFullPathNameW(buffer.get() + 32768, 32768, buffer.get(), nullptr) - 1 < 32768 - 1); // "to_wchar"
@@ -58,6 +48,23 @@ static std::unique_ptr<wchar_t[]> to_wchar(std::string_view source)
 	return buffer;
 }
 
+static void to_utf8(std::string& out, const wchar_t* source)
+{
+	// String size
+	const usz length = std::wcslen(source);
+
+	// Safe buffer size for max possible output length (including null terminator)
+	const int buf_size = narrow<int>(length * 3 + 1);
+
+	// Resize buffer
+	out.resize(buf_size - 1);
+
+	const int result = WideCharToMultiByte(CP_UTF8, 0, source, static_cast<int>(length) + 1, &out.front(), buf_size, nullptr, nullptr);
+
+	// Fix the size
+	out.resize(ensure(result) - 1);
+}
+
 static time_t to_time(const ULARGE_INTEGER& ft)
 {
 	return ft.QuadPart / 10000000ULL - 11644473600ULL;
@@ -122,7 +129,6 @@ static fs::error to_error(DWORD e)
 	case ERROR_NOT_READY: return fs::error::noent;
 	case ERROR_FILENAME_EXCED_RANGE: return fs::error::toolong;
 	case ERROR_DISK_FULL: return fs::error::nospace;
-	case ERROR_NOT_SAME_DEVICE: return fs::error::xdev;
 	default: return fs::error::unknown;
 	}
 }
@@ -145,7 +151,6 @@ static fs::error to_error(DWORD e)
 #if defined(__APPLE__)
 #include <copyfile.h>
 #include <mach-o/dyld.h>
-#include <limits.h>
 #elif defined(__linux__) || defined(__sun)
 #include <sys/sendfile.h>
 #include <sys/syscall.h>
@@ -166,7 +171,6 @@ static fs::error to_error(int e)
 	case EROFS: return fs::error::readonly;
 	case EISDIR: return fs::error::isdir;
 	case ENOSPC: return fs::error::nospace;
-	case EXDEV: return fs::error::xdev;
 	default: return fs::error::unknown;
 	}
 }
@@ -220,17 +224,10 @@ namespace fs
 	{
 	}
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4646)
-#endif
-	[[noreturn]] stat_t file_base::get_stat()
+	[[noreturn]] stat_t file_base::stat()
 	{
-		fmt::throw_exception("fs::file::get_stat() not supported.");
+		fmt::throw_exception("fs::file::stat() not supported.");
 	}
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 	void file_base::sync()
 	{
@@ -246,11 +243,6 @@ namespace fs
 #endif
 	}
 
-	file_id file_base::get_id()
-	{
-		return {};
-	}
-
 	u64 file_base::write_gather(const iovec_clone* buffers, u64 buf_count)
 	{
 		u64 total = 0;
@@ -279,66 +271,6 @@ namespace fs
 		return this->write(buf.get(), total);
 	}
 
-	file_id::operator bool() const
-	{
-		return !type.empty() && !data.empty();
-	}
-
-	// Test if identical
-	// For example: when LHS writes one byte to a file at X offset, RHS file be able to read that exact byte at X offset)
-	bool file_id::is_mirror_of(const file_id& rhs) const
-	{
-		// If either is an invalid ID we cannot compare safely, return false
-		return rhs && type == rhs.type && data == rhs.data;
-	}
-
-	// Test if both files point to the same file
-	// For example: if a file descriptor pointing to the complete file exists and is being truncated to 0 bytes from non-
-	// -zero size state: this has to affect both RHS and LHS files.
-	bool file_id::is_coherent_with(const file_id& rhs) const
-	{
-		struct id_view
-		{
-			std::string_view type_view;
-			std::span<const u8> data_view;
-		};
-
-		id_view _rhs{rhs.type, {rhs.data.data(), rhs.data.size()}};
-		id_view _lhs{type, {data.data(), data.size()}};
-
-		// Peek through fs::file wrappers
-		auto peek_wrapppers = [](id_view& id)
-		{
-			u64 offset_count = 0;
-			constexpr auto lv2_view = "lv2_file::file_view: "sv;
-
-			for (usz pos = 0; (pos = id.type_view.find(lv2_view, pos)) != umax; pos += lv2_view.size())
-			{
-				offset_count++;
-			}
-
-			// Remove offsets data
-			id.data_view = id.data_view.subspan(sizeof(u64) * offset_count);
-
-			// Get last category identifier
-			if (usz sep = id.type_view.rfind(": "); sep != umax)
-			{
-				id.type_view.remove_prefix(sep + 2);
-			}
-		};
-
-		peek_wrapppers(_rhs);
-		peek_wrapppers(_lhs);
-
-		// If either is an invalid ID we cannot compare safely, return false
-		if (_rhs.type_view.empty() || _rhs.data_view.empty())
-		{
-			return false;
-		}
-
-		return _rhs.type_view == _lhs.type_view && std::equal(_rhs.data_view.begin(), _rhs.data_view.end(), _lhs.data_view.begin(), _lhs.data_view.end());
-	}
-
 	dir_base::~dir_base()
 	{
 	}
@@ -364,12 +296,6 @@ namespace fs
 		return false;
 	}
 
-	bool device_base::create_symlink(const std::string&)
-	{
-		g_tls_error = error::readonly;
-		return false;
-	}
-
 	bool device_base::rename(const std::string&, const std::string&)
 	{
 		g_tls_error = error::readonly;
@@ -393,399 +319,6 @@ namespace fs
 		g_tls_error = error::readonly;
 		return false;
 	}
-
-#ifdef _WIN32
-	class windows_file final : public file_base
-	{
-		HANDLE m_handle;
-		atomic_t<u64> m_pos;
-
-	public:
-		windows_file(HANDLE handle)
-			: m_handle(handle)
-			, m_pos(0)
-		{
-		}
-
-		~windows_file() override
-		{
-			if (m_handle != nullptr)
-			{
-				CloseHandle(m_handle);
-			}
-		}
-
-		stat_t get_stat() override
-		{
-			FILE_BASIC_INFO basic_info;
-			ensure(GetFileInformationByHandleEx(m_handle, FileBasicInfo, &basic_info, sizeof(FILE_BASIC_INFO))); // "file::stat"
-
-			stat_t info;
-			info.is_directory = (basic_info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
-			info.is_writable = (basic_info.FileAttributes & FILE_ATTRIBUTE_READONLY) == 0;
-			info.size = this->size();
-			info.atime = to_time(basic_info.LastAccessTime);
-			info.mtime = to_time(basic_info.LastWriteTime);
-			info.ctime = info.mtime;
-
-			if (info.atime < info.mtime)
-				info.atime = info.mtime;
-
-			return info;
-		}
-
-		void sync() override
-		{
-			ensure(FlushFileBuffers(m_handle)); // "file::sync"
-		}
-
-		bool trunc(u64 length) override
-		{
-			FILE_END_OF_FILE_INFO _eof;
-			_eof.EndOfFile.QuadPart = length;
-
-			if (!SetFileInformationByHandle(m_handle, FileEndOfFileInfo, &_eof, sizeof(_eof)))
-			{
-				g_tls_error = to_error(GetLastError());
-				return false;
-			}
-
-			return true;
-		}
-
-		u64 read(void* buffer, u64 count) override
-		{
-			u64 nread_sum = 0;
-
-			for (char* data = static_cast<char*>(buffer); count;)
-			{
-				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
-
-				DWORD nread = 0;
-				OVERLAPPED ovl{};
-				const u64 pos = m_pos;
-				ovl.Offset = DWORD(pos);
-				ovl.OffsetHigh = DWORD(pos >> 32);
-				ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read"
-				nread_sum += nread;
-				m_pos += nread;
-
-				if (nread < size)
-				{
-					break;
-				}
-
-				count -= size;
-				data += size;
-			}
-
-			return nread_sum;
-		}
-
-		u64 read_at(u64 offset, void* buffer, u64 count) override
-		{
-			u64 nread_sum = 0;
-
-			for (char* data = static_cast<char*>(buffer); count;)
-			{
-				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
-
-				DWORD nread = 0;
-				OVERLAPPED ovl{};
-				ovl.Offset = DWORD(offset);
-				ovl.OffsetHigh = DWORD(offset >> 32);
-				ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read"
-				nread_sum += nread;
-
-				if (nread < size)
-				{
-					break;
-				}
-
-				count -= size;
-				data += size;
-				offset += size;
-			}
-
-			return nread_sum;
-		}
-
-		u64 write(const void* buffer, u64 count) override
-		{
-			u64 nwritten_sum = 0;
-
-			for (const char* data = static_cast<const char*>(buffer); count;)
-			{
-				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
-
-				DWORD nwritten = 0;
-				OVERLAPPED ovl{};
-				const u64 pos = m_pos.fetch_add(size);
-				ovl.Offset = DWORD(pos);
-				ovl.OffsetHigh = DWORD(pos >> 32);
-				ensure(WriteFile(m_handle, data, size, &nwritten, &ovl)); // "file::write"
-				ensure(nwritten == size);
-				nwritten_sum += nwritten;
-
-				if (nwritten < size)
-				{
-					break;
-				}
-
-				count -= size;
-				data += size;
-			}
-
-			return nwritten_sum;
-		}
-
-		u64 seek(s64 offset, seek_mode whence) override
-		{
-			if (whence > seek_end)
-			{
-				fmt::throw_exception("Invalid whence (0x%x)", whence);
-			}
-
-			const s64 new_pos =
-				whence == fs::seek_set ? offset :
-				whence == fs::seek_cur ? offset + m_pos :
-				whence == fs::seek_end ? offset + size() : -1;
-
-			if (new_pos < 0)
-			{
-				fs::g_tls_error = fs::error::inval;
-				return -1;
-			}
-
-			m_pos = new_pos;
-			return m_pos;
-		}
-
-		u64 size() override
-		{
-			LARGE_INTEGER size;
-			ensure(GetFileSizeEx(m_handle, &size)); // "file::size"
-
-			return size.QuadPart;
-		}
-
-		native_handle get_handle() override
-		{
-			return m_handle;
-		}
-
-		file_id get_id() override
-		{
-			file_id id{"windows_file"};
-			id.data.resize(sizeof(FILE_ID_INFO));
-
-			FILE_ID_INFO info;
-
-			if (!GetFileInformationByHandleEx(m_handle, FileIdInfo, &info, sizeof(info)))
-			{
-				// Try GetFileInformationByHandle as a fallback
-				BY_HANDLE_FILE_INFORMATION info2;
-				ensure(GetFileInformationByHandle(m_handle, &info2));
-
-				info = {};
-				info.VolumeSerialNumber = info2.dwVolumeSerialNumber;
-				std::memcpy(&info.FileId, &info2.nFileIndexHigh, 8);
-			}
-
-			std::memcpy(id.data.data(), &info, sizeof(info));
-			return id;
-		}
-
-		void release() override
-		{
-			m_handle = nullptr;
-		}
-	};
-#else
-	class unix_file final : public file_base
-	{
-		int m_fd;
-
-	public:
-		unix_file(int fd)
-			: m_fd(fd)
-		{
-		}
-
-		~unix_file() override
-		{
-			if (m_fd >= 0)
-			{
-				::close(m_fd);
-			}
-		}
-
-		stat_t get_stat() override
-		{
-			struct ::stat file_info;
-			ensure(::fstat(m_fd, &file_info) == 0); // "file::stat"
-
-			stat_t info;
-			info.is_directory = S_ISDIR(file_info.st_mode);
-			info.is_writable = file_info.st_mode & 0200; // HACK: approximation
-			info.size = file_info.st_size;
-			info.atime = file_info.st_atime;
-			info.mtime = file_info.st_mtime;
-			info.ctime = info.mtime;
-
-			if (info.atime < info.mtime)
-				info.atime = info.mtime;
-
-			return info;
-		}
-
-		void sync() override
-		{
-			ensure(::fsync(m_fd) == 0); // "file::sync"
-		}
-
-		bool trunc(u64 length) override
-		{
-			if (::ftruncate(m_fd, length) != 0)
-			{
-				g_tls_error = to_error(errno);
-				return false;
-			}
-
-			return true;
-		}
-
-		u64 read(void* buffer, u64 count) override
-		{
-			u64 result = 0;
-
-			// Loop because (huge?) read can be processed partially
-			while (auto r = ::read(m_fd, buffer, count))
-			{
-				ensure(r > 0); // "file::read"
-				count -= r;
-				result += r;
-				buffer = static_cast<u8*>(buffer) + r;
-				if (!count)
-					break;
-			}
-
-			return result;
-		}
-
-		u64 read_at(u64 offset, void* buffer, u64 count) override
-		{
-			u64 result = 0;
-
-			// For safety; see read()
-			while (auto r = ::pread(m_fd, buffer, count, offset))
-			{
-				ensure(r > 0); // "file::read_at"
-				count -= r;
-				offset += r;
-				result += r;
-				buffer = static_cast<u8*>(buffer) + r;
-				if (!count)
-					break;
-			}
-
-			return result;
-		}
-
-		u64 write(const void* buffer, u64 count) override
-		{
-			u64 result = 0;
-
-			// For safety; see read()
-			while (auto r = ::write(m_fd, buffer, count))
-			{
-				ensure(r > 0); // "file::write"
-				count -= r;
-				result += r;
-				buffer = static_cast<const u8*>(buffer) + r;
-				if (!count)
-					break;
-			}
-
-			return result;
-		}
-
-		u64 seek(s64 offset, seek_mode whence) override
-		{
-			if (whence > seek_end)
-			{
-				fmt::throw_exception("Invalid whence (0x%x)", whence);
-			}
-
-			const int mode =
-				whence == seek_set ? SEEK_SET :
-				whence == seek_cur ? SEEK_CUR : SEEK_END;
-
-			const auto result = ::lseek(m_fd, offset, mode);
-
-			if (result == -1)
-			{
-				g_tls_error = to_error(errno);
-				return -1;
-			}
-
-			return result;
-		}
-
-		u64 size() override
-		{
-			struct ::stat file_info;
-			ensure(::fstat(m_fd, &file_info) == 0); // "file::size"
-
-			return file_info.st_size;
-		}
-
-		native_handle get_handle() override
-		{
-			return m_fd;
-		}
-
-		file_id get_id() override
-		{
-			struct ::stat file_info;
-			ensure(::fstat(m_fd, &file_info) == 0); // "file::get_id"
-
-			file_id id{"unix_file"};
-			id.data.resize(sizeof(file_info.st_dev) + sizeof(file_info.st_ino));
-
-			std::memcpy(id.data.data(), &file_info.st_dev, sizeof(file_info.st_dev));
-			std::memcpy(id.data.data() + sizeof(file_info.st_dev), &file_info.st_ino, sizeof(file_info.st_ino));
-			return id;
-		}
-
-		u64 write_gather(const iovec_clone* buffers, u64 buf_count) override
-		{
-			static_assert(sizeof(iovec) == sizeof(iovec_clone), "Weird iovec size");
-			static_assert(offsetof(iovec, iov_len) == offsetof(iovec_clone, iov_len), "Weird iovec::iov_len offset");
-
-			u64 result = 0;
-
-			while (buf_count)
-			{
-				iovec arg[256];
-				const auto count = std::min<u64>(buf_count, 256);
-				std::memcpy(&arg, buffers, sizeof(iovec) * count);
-				const auto added = ::writev(m_fd, arg, count);
-				ensure(added != -1); // "file::write_gather"
-				result += added;
-				buf_count -= count;
-				buffers += count;
-			}
-
-			return result;
-		}
-
-		void release() override
-		{
-			m_fd = -1;
-		}
-	};
-#endif
 }
 
 shared_ptr<fs::device_base> fs::device_manager::get_device(const std::string& path)
@@ -850,12 +383,12 @@ shared_ptr<fs::device_base> fs::set_virtual_device(const std::string& name, shar
 	return get_device_manager().set_device(name, std::move(device));
 }
 
-std::string_view fs::get_parent_dir_view(std::string_view path, u32 parent_level)
+std::string fs::get_parent_dir(const std::string& path)
 {
 	std::string_view result = path;
 
 	// Number of path components to remove
-	usz to_remove = parent_level;
+	usz to_remove = 1;
 
 	while (to_remove--)
 	{
@@ -898,14 +431,11 @@ std::string_view fs::get_parent_dir_view(std::string_view path, u32 parent_level
 		return "/";
 	}
 
-	return result;
+	return std::string{result};
 }
 
-bool fs::get_stat(const std::string& path, stat_t& info)
+bool fs::stat(const std::string& path, stat_t& info)
 {
-	// Ensure consistent information on failure
-	info = {};
-
 	if (auto device = get_virtual_device(path))
 	{
 		return device->stat(path, info);
@@ -923,7 +453,7 @@ bool fs::get_stat(const std::string& path, stat_t& info)
 	// Handle drives specially
 	if (epath.find_first_of(delim) == umax && epath.ends_with(':'))
 	{
-		WIN32_FILE_ATTRIBUTE_DATA attrs{};
+		WIN32_FILE_ATTRIBUTE_DATA attrs;
 
 		// Must end with a delimiter
 		if (!GetFileAttributesExW(to_wchar(std::string(epath) + '/').get(), GetFileExInfoStandard, &attrs))
@@ -945,6 +475,8 @@ bool fs::get_stat(const std::string& path, stat_t& info)
 		return true;
 	}
 
+	WIN32_FIND_DATA attrs;
+
 	// Allowed by FindFirstFileExW but we should not allow it
 	if (epath.ends_with("*"))
 	{
@@ -952,8 +484,6 @@ bool fs::get_stat(const std::string& path, stat_t& info)
 		return false;
 	}
 
-	WIN32_FIND_DATA attrs{};
-
 	const auto wchar_ptr = to_wchar(std::string(epath));
 	const std::wstring_view wpath_view = wchar_ptr.get();
 
@@ -987,7 +517,6 @@ bool fs::get_stat(const std::string& path, stat_t& info)
 	}
 
 	info.is_directory = (attrs.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
-	info.is_symlink = (attrs.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) != 0;
 	info.is_writable = (attrs.dwFileAttributes & FILE_ATTRIBUTE_READONLY) == 0;
 	info.size = attrs.nFileSizeLow | (u64{attrs.nFileSizeHigh} << 32);
 	info.atime = to_time(attrs.ftLastAccessTime);
@@ -1002,7 +531,6 @@ bool fs::get_stat(const std::string& path, stat_t& info)
 	}
 
 	info.is_directory = S_ISDIR(file_info.st_mode);
-	info.is_symlink = S_ISLNK(file_info.st_mode);
 	info.is_writable = file_info.st_mode & 0200; // HACK: approximation
 	info.size = file_info.st_size;
 	info.atime = file_info.st_atime;
@@ -1019,13 +547,13 @@ bool fs::get_stat(const std::string& path, stat_t& info)
 bool fs::exists(const std::string& path)
 {
 	fs::stat_t info{};
-	return fs::get_stat(path, info);
+	return fs::stat(path, info);
 }
 
 bool fs::is_file(const std::string& path)
 {
 	fs::stat_t info{};
-	if (!fs::get_stat(path, info))
+	if (!fs::stat(path, info))
 	{
 		return false;
 	}
@@ -1042,7 +570,7 @@ bool fs::is_file(const std::string& path)
 bool fs::is_dir(const std::string& path)
 {
 	fs::stat_t info{};
-	if (!fs::get_stat(path, info))
+	if (!fs::stat(path, info))
 	{
 		return false;
 	}
@@ -1056,23 +584,6 @@ bool fs::is_dir(const std::string& path)
 	return true;
 }
 
-bool fs::is_symlink(const std::string& path)
-{
-	fs::stat_t info{};
-	if (!fs::get_stat(path, info))
-	{
-		return false;
-	}
-
-	if (!info.is_symlink)
-	{
-		g_tls_error = error::exist;
-		return false;
-	}
-
-	return true;
-}
-
 bool fs::statfs(const std::string& path, fs::device_stat& info)
 {
 	if (auto device = get_virtual_device(path))
@@ -1172,9 +683,9 @@ bool fs::create_path(const std::string& path)
 
 #ifdef _WIN32
 	// Workaround: don't call is_dir with naked drive letter
-	if (parent.size() < path.size() && (parent.empty() || (parent.back() != ':' && !is_dir(parent) && !create_path(parent))))
+	if (!parent.empty() && parent.back() != ':' && !is_dir(parent) && !create_path(parent))
 #else
-	if (parent.size() < path.size() && !is_dir(parent) && !create_path(parent))
+	if (!parent.empty() && !is_dir(parent) && !create_path(parent))
 #endif
 	{
 		return false;
@@ -1208,39 +719,14 @@ bool fs::remove_dir(const std::string& path)
 		g_tls_error = to_error(GetLastError());
 		return false;
 	}
+
+	return true;
 #else
 	if (::rmdir(path.c_str()) != 0)
 	{
 		g_tls_error = to_error(errno);
 		return false;
 	}
-#endif
-
-	return true;
-}
-
-bool fs::create_symlink(const std::string& path, const std::string& target)
-{
-	if (auto device = get_virtual_device(path))
-	{
-		return device->create_symlink(path);
-	}
-
-#ifdef _WIN32
-	const DWORD flags = is_dir(target) ? SYMBOLIC_LINK_FLAG_DIRECTORY : 0;
-	if (!CreateSymbolicLinkW(to_wchar(path).get(), to_wchar(target).get(), flags))
-	{
-		g_tls_error = to_error(GetLastError());
-		return false;
-	}
-
-	return true;
-#else
-	if (::symlink(target.c_str(), path.c_str()) != 0)
-	{
-		g_tls_error = to_error(errno);
-		return false;
-	}
 
 	return true;
 #endif
@@ -1373,20 +859,9 @@ bool fs::copy_file(const std::string& from, const std::string& to, bool overwrit
 	if (::fcopyfile(input, output, 0, COPYFILE_ALL))
 #elif defined(__linux__) || defined(__sun)
 	// sendfile will work with non-socket output (i.e. regular file) on Linux 2.6.33+
+	off_t bytes_copied = 0;
 	struct ::stat fileinfo = { 0 };
-	bool result = ::fstat(input, &fileinfo) != -1;
-	if (result)
-	{
-		for (off_t bytes_copied = 0; bytes_copied < fileinfo.st_size; /* Do nothing, bytes_copied is increased by sendfile. */)
-		{
-			if (::sendfile(output, input, &bytes_copied, fileinfo.st_size - bytes_copied) == -1)
-			{
-				result = false;
-				break;
-			}
-		}
-	}
-	if (!result)
+	if (::fstat(input, &fileinfo) == -1 || ::sendfile(output, input, &bytes_copied, fileinfo.st_size) == -1)
 #else
 #error "Native file copy implementation is missing"
 #endif
@@ -1515,23 +990,7 @@ bool fs::utime(const std::string& path, s64 atime, s64 mtime)
 	FILETIME _mtime = from_time(mtime);
 	if (!SetFileTime(handle, nullptr, &_atime, &_mtime))
 	{
-		const DWORD last_error = GetLastError();
-		g_tls_error = to_error(last_error);
-
-		// Some filesystems fail to set a date lower than 01/01/1980 00:00:00
-		if (last_error == ERROR_INVALID_PARAMETER && (atime < 315532800 || mtime < 315532800))
-		{
-			// Try again with 01/01/1980 00:00:00
-			_atime = from_time(std::max<s64>(atime, 315532800));
-			_mtime = from_time(std::max<s64>(mtime, 315532800));
-
-			if (SetFileTime(handle, nullptr, &_atime, &_mtime))
-			{
-				CloseHandle(handle);
-				return true;
-			}
-		}
-
+		g_tls_error = to_error(GetLastError());
 		CloseHandle(handle);
 		return false;
 	}
@@ -1563,12 +1022,12 @@ void fs::sync()
 #endif
 }
 
-[[noreturn]] void fs::xnull(std::source_location loc)
+[[noreturn]] void fs::xnull(const src_loc& loc)
 {
 	fmt::throw_exception("Null object.%s", loc);
 }
 
-[[noreturn]] void fs::xfail(std::source_location loc)
+[[noreturn]] void fs::xfail(const src_loc& loc)
 {
 	fmt::throw_exception("Unexpected fs::error %s%s", g_tls_error, loc);
 }
@@ -1640,6 +1099,144 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 		return;
 	}
 
+	class windows_file final : public file_base
+	{
+		const HANDLE m_handle;
+
+	public:
+		windows_file(HANDLE handle)
+			: m_handle(handle)
+		{
+		}
+
+		~windows_file() override
+		{
+			CloseHandle(m_handle);
+		}
+
+		stat_t stat() override
+		{
+			FILE_BASIC_INFO basic_info;
+			ensure(GetFileInformationByHandleEx(m_handle, FileBasicInfo, &basic_info, sizeof(FILE_BASIC_INFO))); // "file::stat"
+
+			stat_t info;
+			info.is_directory = (basic_info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
+			info.is_writable = (basic_info.FileAttributes & FILE_ATTRIBUTE_READONLY) == 0;
+			info.size = this->size();
+			info.atime = to_time(basic_info.LastAccessTime);
+			info.mtime = to_time(basic_info.LastWriteTime);
+			info.ctime = info.mtime;
+
+			if (info.atime < info.mtime)
+				info.atime = info.mtime;
+
+			return info;
+		}
+
+		void sync() override
+		{
+			ensure(FlushFileBuffers(m_handle)); // "file::sync"
+		}
+
+		bool trunc(u64 length) override
+		{
+			FILE_END_OF_FILE_INFO _eof;
+			_eof.EndOfFile.QuadPart = length;
+
+			if (!SetFileInformationByHandle(m_handle, FileEndOfFileInfo, &_eof, sizeof(_eof)))
+			{
+				g_tls_error = to_error(GetLastError());
+				return false;
+			}
+
+			return true;
+		}
+
+		u64 read(void* buffer, u64 count) override
+		{
+			u64 nread_sum = 0;
+
+			for (char* data = static_cast<char*>(buffer); count;)
+			{
+				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
+
+				DWORD nread = 0;
+				ensure(ReadFile(m_handle, data, size, &nread, nullptr)); // "file::read"
+				nread_sum += nread;
+
+				if (nread < size)
+				{
+					break;
+				}
+
+				count -= size;
+				data += size;
+			}
+
+			return nread_sum;
+		}
+
+		u64 write(const void* buffer, u64 count) override
+		{
+			u64 nwritten_sum = 0;
+
+			for (const char* data = static_cast<const char*>(buffer); count;)
+			{
+				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096)); 
+
+				DWORD nwritten = 0;
+				ensure(WriteFile(m_handle, data, size, &nwritten, nullptr)); // "file::write"
+				nwritten_sum += nwritten;
+
+				if (nwritten < size)
+				{
+					break;
+				}
+
+				count -= size;
+				data += size;
+			}
+
+			return nwritten_sum;
+		}
+
+		u64 seek(s64 offset, seek_mode whence) override
+		{
+			if (whence > seek_end)
+			{
+				fmt::throw_exception("Invalid whence (0x%x)", whence);
+			}
+
+			LARGE_INTEGER pos;
+			pos.QuadPart = offset;
+
+			const DWORD mode =
+				whence == seek_set ? FILE_BEGIN :
+				whence == seek_cur ? FILE_CURRENT : FILE_END;
+
+			if (!SetFilePointerEx(m_handle, pos, &pos, mode))
+			{
+				g_tls_error = to_error(GetLastError());
+				return -1;
+			}
+
+			return pos.QuadPart;
+		}
+
+		u64 size() override
+		{
+			LARGE_INTEGER size;
+			ensure(GetFileSizeEx(m_handle, &size)); // "file::size"
+
+			return size.QuadPart;
+		}
+
+		native_handle get_handle() override
+		{
+			return m_handle;
+		}
+	};
+
 	m_file = std::make_unique<windows_file>(handle);
 #else
 	int flags = O_CLOEXEC; // Ensures all files are closed on execl for auto updater
@@ -1690,31 +1287,134 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 		ensure(::ftruncate(fd, 0) == 0);
 	}
 
-	m_file = std::make_unique<unix_file>(fd);
-
-	if (mode & fs::isfile && !(mode & fs::write) && get_stat().is_directory)
+	class unix_file final : public file_base
 	{
-		m_file.reset();
-		g_tls_error = error::isdir;
-	}
+		const int m_fd;
+
+	public:
+		unix_file(int fd)
+			: m_fd(fd)
+		{
+		}
+
+		~unix_file() override
+		{
+			::close(m_fd);
+		}
+
+		stat_t stat() override
+		{
+			struct ::stat file_info;
+			ensure(::fstat(m_fd, &file_info) == 0); // "file::stat"
+
+			stat_t info;
+			info.is_directory = S_ISDIR(file_info.st_mode);
+			info.is_writable = file_info.st_mode & 0200; // HACK: approximation
+			info.size = file_info.st_size;
+			info.atime = file_info.st_atime;
+			info.mtime = file_info.st_mtime;
+			info.ctime = info.mtime;
+
+			if (info.atime < info.mtime)
+				info.atime = info.mtime;
+
+			return info;
+		}
+
+		void sync() override
+		{
+			ensure(::fsync(m_fd) == 0); // "file::sync"
+		}
+
+		bool trunc(u64 length) override
+		{
+			if (::ftruncate(m_fd, length) != 0)
+			{
+				g_tls_error = to_error(errno);
+				return false;
+			}
+
+			return true;
+		}
+
+		u64 read(void* buffer, u64 count) override
+		{
+			const auto result = ::read(m_fd, buffer, count);
+			ensure(result != -1); // "file::read"
+
+			return result;
+		}
+
+		u64 write(const void* buffer, u64 count) override
+		{
+			const auto result = ::write(m_fd, buffer, count);
+			ensure(result != -1); // "file::write"
+
+			return result;
+		}
+
+		u64 seek(s64 offset, seek_mode whence) override
+		{
+			if (whence > seek_end)
+			{
+				fmt::throw_exception("Invalid whence (0x%x)", whence);
+			}
+
+			const int mode =
+				whence == seek_set ? SEEK_SET :
+				whence == seek_cur ? SEEK_CUR : SEEK_END;
+
+			const auto result = ::lseek(m_fd, offset, mode);
+
+			if (result == -1)
+			{
+				g_tls_error = to_error(errno);
+				return -1;
+			}
+
+			return result;
+		}
+
+		u64 size() override
+		{
+			struct ::stat file_info;
+			ensure(::fstat(m_fd, &file_info) == 0); // "file::size"
+
+			return file_info.st_size;
+		}
+
+		native_handle get_handle() override
+		{
+			return m_fd;
+		}
+
+		u64 write_gather(const iovec_clone* buffers, u64 buf_count) override
+		{
+			static_assert(sizeof(iovec) == sizeof(iovec_clone), "Weird iovec size");
+			static_assert(offsetof(iovec, iov_len) == offsetof(iovec_clone, iov_len), "Weird iovec::iov_len offset");
+
+			u64 result = 0;
+
+			while (buf_count)
+			{
+				iovec arg[256];
+				const auto count = std::min<u64>(buf_count, 256);
+				std::memcpy(&arg, buffers, sizeof(iovec) * count);
+				const auto added = ::writev(m_fd, arg, count);
+				ensure(added != -1); // "file::write_gather"
+				result += added;
+				buf_count -= count;
+				buffers += count;
+			}
+
+			return result;
+		}
+	};
+
+	m_file = std::make_unique<unix_file>(fd);
 #endif
 }
 
-
-
-fs::file fs::file::from_native_handle(native_handle handle)
-{
-	fs::file result;
-
-#ifdef _WIN32
-	result.m_file = std::make_unique<windows_file>(static_cast<HANDLE>(handle));
-#else
-	result.m_file = std::make_unique<unix_file>(handle);
-#endif
-
-	return result;
-}
-
 fs::file::file(const void* ptr, usz size)
 {
 	class memory_stream : public file_base
@@ -1756,21 +1456,6 @@ fs::file::file(const void* ptr, usz size)
 			return 0;
 		}
 
-		u64 read_at(u64 offset, void* buffer, u64 count) override
-		{
-			if (offset < m_size)
-			{
-				// Get readable size
-				if (const u64 result = std::min<u64>(count, m_size - offset))
-				{
-					std::memcpy(buffer, m_ptr + offset, result);
-					return result;
-				}
-			}
-
-			return 0;
-		}
-
 		u64 write(const void*, u64) override
 		{
 			return 0;
@@ -1816,20 +1501,8 @@ fs::native_handle fs::file::get_handle() const
 #endif
 }
 
-fs::file_id fs::file::get_id() const
-{
-	if (m_file)
-	{
-		return m_file->get_id();
-	}
-
-	return {};
-}
-
 bool fs::dir::open(const std::string& path)
 {
-	m_dir.reset();
-
 	if (path.empty())
 	{
 		// Don't allow opening empty path (TODO)
@@ -1867,10 +1540,10 @@ bool fs::dir::open(const std::string& path)
 		{
 			dir_entry info;
 
-			info.name = wchar_to_utf8(found.cFileName);
+			to_utf8(info.name, found.cFileName);
 			info.is_directory = (found.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
 			info.is_writable = (found.dwFileAttributes & FILE_ATTRIBUTE_READONLY) == 0;
-			info.size = (static_cast<u64>(found.nFileSizeHigh) << 32) | static_cast<u64>(found.nFileSizeLow);
+			info.size = ((u64)found.nFileSizeHigh << 32) | (u64)found.nFileSizeLow;
 			info.atime = to_time(found.ftLastAccessTime);
 			info.mtime = to_time(found.ftLastWriteTime);
 			info.ctime = info.mtime;
@@ -1983,9 +1656,9 @@ bool fs::dir::open(const std::string& path)
 	return true;
 }
 
-bool fs::file::strict_read_check(u64 offset, u64 _size, u64 type_size) const
+bool fs::file::strict_read_check(u64 _size, u64 type_size) const
 {
-	if (usz pos0 = offset, size0 = size(); (pos0 >= size0 ? 0 : (size0 - pos0)) / type_size < _size)
+	if (usz pos0 = pos(), size0 = size(); pos0 >= size0 || (size0 - pos0) / type_size < _size)
 	{
 		fs::g_tls_error = fs::error::inval;
 		return false;
@@ -1994,136 +1667,24 @@ bool fs::file::strict_read_check(u64 offset, u64 _size, u64 type_size) const
 	return true;
 }
 
-std::string fs::get_executable_path()
+const std::string& fs::get_config_dir()
 {
-#ifdef ANDROID
-	return g_android_executable_dir + "/dummy-rpcs3.apk";
-#else
-	// Use magic static
-	static const std::string s_exe_path = []
-	{
-#if defined(_WIN32)
-		constexpr DWORD size = 32767;
-		std::vector<wchar_t> buffer(size);
-		GetModuleFileNameW(nullptr, buffer.data(), size);
-		return wchar_to_utf8(buffer.data());
-#elif defined(__APPLE__)
-		char bin_path[PATH_MAX];
-		uint32_t bin_path_size = sizeof(bin_path);
-		if (_NSGetExecutablePath(bin_path, &bin_path_size) != 0)
-		{
-			std::cerr << "Failed to find app binary path" << std::endl;
-			return std::string{};
-		}
-
-		// App bundle directory is three levels up from the binary.
-		return get_parent_dir(bin_path, 3);
-#else
-		if (const char* appimage_path = ::getenv("APPIMAGE"))
-		{
-			std::cout << "Found AppImage path: " << appimage_path << std::endl;
-			return std::string(appimage_path);
-		}
-
-		std::cout << "No AppImage path found, checking for executable" << std::endl;
-
-		char exe_path[PATH_MAX];
-		const ssize_t len = ::readlink("/proc/self/exe", exe_path, sizeof(exe_path) - 1);
-
-		if (len == -1)
-		{
-			std::cerr << "Failed to find executable path" << std::endl;
-			return std::string{};
-		}
-
-		exe_path[len] = '\0';
-		std::cout << "Found exec path: " << exe_path << std::endl;
-
-		return std::string(exe_path);
-#endif
-	}();
-
-	return s_exe_path;
-#endif
-}
-
-std::string fs::get_executable_dir()
-{
-#ifdef ANDROID
-	return g_android_executable_dir;
-#else
-	// Use magic static
-	static const std::string s_exe_dir = []
-	{
-		std::string exe_path = get_executable_path();
-		if (exe_path.empty())
-		{
-			return exe_path;
-		}
-
-		return get_parent_dir(exe_path) + "/";
-	}();
-
-	return s_exe_dir;
-#endif
-}
-
-const std::string& fs::get_config_dir([[maybe_unused]] bool get_config_subdirectory)
-{
-#ifdef ANDROID
-	return g_android_config_dir;
-#else
 	// Use magic static
 	static const std::string s_dir = []
 	{
 		std::string dir;
 
-		// Check if a portable directory exists.
-		std::string portable_dir = get_executable_dir() + "/portable/";
-		if (is_dir(portable_dir))
-		{
-			return portable_dir;
-		}
-
 #ifdef _WIN32
-		std::vector<wchar_t> buf;
-
-		// Check if RPCS3_CONFIG_DIR is set and get the required buffer size
-		DWORD size = GetEnvironmentVariable(L"RPCS3_CONFIG_DIR", nullptr, 0);
-		if (size > 0)
+		wchar_t buf[32768];
+		constexpr DWORD size = static_cast<DWORD>(std::size(buf));
+		if (GetEnvironmentVariable(L"RPCS3_CONFIG_DIR", buf, size) - 1 >= size - 1 &&
+			GetModuleFileName(nullptr, buf, size) - 1 >= size - 1)
 		{
-			// Resize buffer and fetch RPCS3_CONFIG_DIR
-			buf.resize(size);
-
-			if (GetEnvironmentVariable(L"RPCS3_CONFIG_DIR", buf.data(), size) != (size - 1))
-			{
-				// Clear buffer on failure and notify user
-				MessageBoxA(nullptr, fmt::format("GetEnvironmentVariable(RPCS3_CONFIG_DIR) failed: error: %s", fmt::win_error{GetLastError(), nullptr}).c_str(), "fs::get_config_dir()", MB_ICONERROR);
-				buf.clear();
-			}
+			MessageBoxA(nullptr, fmt::format("GetModuleFileName() failed: error %u.", GetLastError()).c_str(), "fs::get_config_dir()", MB_ICONERROR);
+			return dir; // empty
 		}
 
-		// Fallback to executable path if needed
-		for (DWORD buf_size = MAX_PATH; size == 0; buf_size += MAX_PATH)
-		{
-			buf.resize(buf_size);
-			size = GetModuleFileName(nullptr, buf.data(), buf_size);
-
-			if (size == 0)
-			{
-				MessageBoxA(nullptr, fmt::format("GetModuleFileName() failed: error: %s", fmt::win_error{GetLastError(), nullptr}).c_str(), "fs::get_config_dir()", MB_ICONERROR);
-				return dir; // empty
-			}
-
-			if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-			{
-				// Try again with increased buffer size
-				size = 0;
-				continue;
-			}
-		}
-
-		dir = wchar_to_utf8(buf.data());
+		to_utf8(dir, buf); // Convert to UTF-8
 
 		std::replace(dir.begin(), dir.end(), '\\', '/');
 
@@ -2153,23 +1714,11 @@ const std::string& fs::get_config_dir([[maybe_unused]] bool get_config_subdirect
 		return dir;
 	}();
 
-#ifdef _WIN32
-	if (get_config_subdirectory)
-	{
-		static const std::string subdir = s_dir + "config/";
-		return subdir;
-	}
-#endif
-
 	return s_dir;
-#endif
 }
 
 const std::string& fs::get_cache_dir()
 {
-#ifdef ANDROID
-	return g_android_cache_dir;
-#else
 	static const std::string s_dir = []
 	{
 		std::string dir;
@@ -2204,17 +1753,6 @@ const std::string& fs::get_cache_dir()
 	}();
 
 	return s_dir;
-#endif
-}
-
-const std::string& fs::get_log_dir()
-{
-#ifdef _WIN32
-	static const std::string s_dir = fs::get_config_dir() + "log/";
-	return s_dir;
-#else
-	return fs::get_cache_dir();
-#endif
 }
 
 const std::string& fs::get_temp_dir()
@@ -2227,27 +1765,14 @@ const std::string& fs::get_temp_dir()
 		wchar_t buf[MAX_PATH + 2]{};
 		if (GetTempPathW(MAX_PATH + 1, buf) - 1 > MAX_PATH)
 		{
-			MessageBoxA(nullptr, fmt::format("GetTempPath() failed: error: %s", fmt::win_error{GetLastError(), nullptr}).c_str(), "fs::get_temp_dir()", MB_ICONERROR);
+			MessageBoxA(nullptr, fmt::format("GetTempPath() failed: error %u.", GetLastError()).c_str(), "fs::get_temp_dir()", MB_ICONERROR);
 			return dir; // empty
 		}
 
-		dir = wchar_to_utf8(buf);
+		to_utf8(dir, buf);
 #else
-		const char* tmp_dir = getenv("TMPDIR");
-		if (tmp_dir == nullptr || tmp_dir[0] == '\0')
-		{
-			// Fall back to cache directory
-			dir = get_cache_dir();
-		}
-		else
-		{
-			dir = tmp_dir;
-			if (!dir.ends_with("/"))
-			{
-				// Ensure path ends with a separator
-				dir += "/";
-			}
-		}
+		// TODO
+		dir = get_cache_dir();
 #endif
 
 		return dir;
@@ -2256,7 +1781,7 @@ const std::string& fs::get_temp_dir()
 	return s_dir;
 }
 
-bool fs::remove_all(const std::string& path, bool remove_root, bool is_no_dir_ok)
+bool fs::remove_all(const std::string& path, bool remove_root)
 {
 	if (const auto root_dir = dir(path))
 	{
@@ -2285,7 +1810,7 @@ bool fs::remove_all(const std::string& path, bool remove_root, bool is_no_dir_ok
 	}
 	else
 	{
-		return is_no_dir_ok;
+		return false;
 	}
 
 	if (remove_root)
@@ -2296,7 +1821,7 @@ bool fs::remove_all(const std::string& path, bool remove_root, bool is_no_dir_ok
 	return true;
 }
 
-u64 fs::get_dir_size(const std::string& path, u64 rounding_alignment, atomic_t<bool>* cancel_flag)
+u64 fs::get_dir_size(const std::string& path, u64 rounding_alignment)
 {
 	u64 result = 0;
 
@@ -2309,11 +1834,6 @@ u64 fs::get_dir_size(const std::string& path, u64 rounding_alignment, atomic_t<b
 
 	for (const auto& entry : root_dir)
 	{
-		if (cancel_flag && *cancel_flag)
-		{
-			return umax;
-		}
-
 		if (entry.name == "." || entry.name == "..")
 		{
 			continue;
@@ -2363,13 +1883,13 @@ fs::file fs::make_gather(std::vector<fs::file> files)
 		{
 		}
 
-		fs::stat_t get_stat() override
+		fs::stat_t stat() override
 		{
 			fs::stat_t result{};
 
 			if (!files.empty())
 			{
-				result = files[0].get_stat();
+				result = files[0].stat();
 			}
 
 			result.is_directory = false;
@@ -2421,40 +1941,6 @@ fs::file fs::make_gather(std::vector<fs::file> files)
 			return 0;
 		}
 
-		u64 read_at(u64 start, void* buffer, u64 size) override
-		{
-			if (start < end)
-			{
-				u64 pos = start;
-
-				// Get readable size
-				if (const u64 max = std::min<u64>(size, end - pos))
-				{
-					u8* buf_out = static_cast<u8*>(buffer);
-					u64 buf_max = max;
-
-					for (auto it = ends.upper_bound(pos); it != ends.end(); ++it)
-					{
-						const u64 count = std::min<u64>(it->first - pos, buf_max);
-						const u64 read  = files[it->second].read_at(files[it->second].size() + pos - it->first, buf_out, count);
-
-						buf_out += count;
-						buf_max -= count;
-						pos     += read;
-
-						if (read < count || buf_max == 0)
-						{
-							break;
-						}
-					}
-
-					return pos - start;
-				}
-			}
-
-			return 0;
-		}
-
 		u64 write(const void*, u64) override
 		{
 			return 0;
@@ -2488,41 +1974,14 @@ fs::file fs::make_gather(std::vector<fs::file> files)
 	return result;
 }
 
-std::string fs::generate_neighboring_path(std::string_view source, [[maybe_unused]] u64 seed)
+fs::pending_file::pending_file(const std::string& path)
 {
-	// Seed is currently not used
-
-	return fmt::format(u8"%s/＄%s.%s.tmp", get_parent_dir(source), source.substr(source.find_last_of(fs::delim) + 1), fmt::base57(utils::get_unique_tsc()));
-}
-
-bool fs::pending_file::open(std::string_view path)
-{
-	file.close();
-
-	if (!m_path.empty())
-	{
-		fs::remove_file(m_path);
-	}
-
-	if (path.empty())
-	{
-		fs::g_tls_error = fs::error::noent;
-		m_dest.clear();
-		return false;
-	}
-
 	do
 	{
-		m_path = fs::generate_neighboring_path(path, 0);
+		m_path = fmt::format(u8"%s/＄%s.%s.tmp", get_parent_dir(path), std::string_view(path).substr(path.find_last_of(fs::delim) + 1), fmt::base57(utils::get_unique_tsc()));
 
 		if (file.open(m_path, fs::create + fs::write + fs::read + fs::excl))
 		{
-#ifdef _WIN32
-			// Auto-delete pending log file
-			FILE_DISPOSITION_INFO disp;
-			disp.DeleteFileW = true;
-			SetFileInformationByHandle(file.get_handle(), FileDispositionInfo, &disp, sizeof(disp));
-#endif
 			m_dest = path;
 			break;
 		}
@@ -2530,8 +1989,6 @@ bool fs::pending_file::open(std::string_view path)
 		m_path.clear();
 	}
 	while (fs::g_tls_error == fs::error::exist); // Only retry if failed due to existing file
-
-	return file.operator bool();
 }
 
 fs::pending_file::~pending_file()
@@ -2546,7 +2003,7 @@ fs::pending_file::~pending_file()
 
 bool fs::pending_file::commit(bool overwrite)
 {
-	if (m_path.empty())
+	if (!file || m_path.empty())
 	{
 		fs::g_tls_error = fs::error::noent;
 		return false;
@@ -2554,144 +2011,16 @@ bool fs::pending_file::commit(bool overwrite)
 
 	// The temporary file's contents must be on disk before rename
 #ifndef _WIN32
-	if (file)
-	{
-		file.sync();
-	}
+	file.sync();
 #endif
-
-#ifdef _WIN32
-	if (file)
-	{
-		// Disable auto-delete
-		FILE_DISPOSITION_INFO disp;
-		disp.DeleteFileW = false;
-		ensure(SetFileInformationByHandle(file.get_handle(), FileDispositionInfo, &disp, sizeof(disp)));
-	}
-
-	std::vector<std::wstring> hardlink_paths;
-
-	const auto ws1 = to_wchar(m_path);
-
-	const HANDLE file_handle = !overwrite ? INVALID_HANDLE_VALUE
-		: CreateFileW(ws1.get(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, nullptr);
-
-	while (file_handle != INVALID_HANDLE_VALUE)
-	{
-		// Get file ID (used to check for hardlinks)
-		BY_HANDLE_FILE_INFORMATION file_info;
-
-		if (!GetFileInformationByHandle(file_handle, &file_info) || file_info.nNumberOfLinks == 1)
-		{
-			CloseHandle(file_handle);
-			break;
-		}
-
-		// Buffer for holding link name
-		std::wstring link_name_buffer(MAX_PATH, wchar_t{});
-		DWORD buffer_size{};
-		HANDLE find_handle = INVALID_HANDLE_VALUE;
-
-		while (true)
-		{
-			buffer_size = static_cast<DWORD>(link_name_buffer.size() - 1);
-			find_handle = FindFirstFileNameW(ws1.get(), 0, &buffer_size, link_name_buffer.data());
-
-			if (find_handle != INVALID_HANDLE_VALUE || GetLastError() != ERROR_MORE_DATA)
-			{
-				break;
-			}
-
-			link_name_buffer.resize(buffer_size + 1);
-		}
-
-		if (find_handle != INVALID_HANDLE_VALUE)
-		{
-			const std::wstring_view ws1_sv = ws1.get();
-
-			while (true)
-			{
-				if (link_name_buffer.c_str() != ws1_sv)
-				{
-					// Note: link_name_buffer is a buffer which may contain zeroes so truncate it
-					hardlink_paths.push_back(link_name_buffer.c_str());
-				}
-
-				buffer_size = static_cast<DWORD>(link_name_buffer.size() - 1);
-				if (!FindNextFileNameW(find_handle, &buffer_size, link_name_buffer.data()))
-				{
-					if (GetLastError() != ERROR_MORE_DATA)
-					{
-						break;
-					}
-
-					link_name_buffer.resize(buffer_size + 1);
-				}
-			}
-		}
-
-		// Clean up
-		FindClose(find_handle);
-		CloseHandle(file_handle);
-		break;
-	}
-
-	if (!hardlink_paths.empty())
-	{
-		// REPLACEFILE_WRITE_THROUGH is not supported
-		file.sync();
-	}
-#endif
-
 	file.close();
 
 #ifdef _WIN32
-	const auto wdest = to_wchar(m_dest);
+	const auto ws1 = to_wchar(m_path);
+	const auto ws2 = to_wchar(m_dest);
 
-	bool ok = false;
-
-	if (hardlink_paths.empty())
+	if (MoveFileExW(ws1.get(), ws2.get(), overwrite ? MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH : MOVEFILE_WRITE_THROUGH))
 	{
-		ok = MoveFileExW(ws1.get(), wdest.get(), overwrite ? MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH : MOVEFILE_WRITE_THROUGH);
-	}
-	else
-	{
-		ok = ReplaceFileW(ws1.get(), wdest.get(), nullptr, 0, nullptr, nullptr);
-	}
-
-	if (ok)
-	{
-		for (const std::wstring& link_name : hardlink_paths)
-		{
-			std::unique_ptr<wchar_t[]> write_temp_path;
-
-			do
-			{
-				write_temp_path = to_wchar(fs::generate_neighboring_path(m_dest, 0));
-
-				// Generate a temporary hard linke
-				if (CreateHardLinkW(wdest.get(), write_temp_path.get(), nullptr))
-				{
-					if (MoveFileExW(write_temp_path.get(), link_name.data(), MOVEFILE_REPLACE_EXISTING))
-					{
-						// Success
-						write_temp_path.reset();
-						break;
-					}
-
-					break;
-				}
-			}
-			while (fs::g_tls_error == fs::error::exist); // Only retry if failed due to existing file
-
-			if (write_temp_path)
-			{
-				// Failure
-				g_tls_error = to_error(GetLastError());
-				return false;
-			}
-		}
-
 		// Disable the destructor
 		m_path.clear();
 		return true;
@@ -2710,30 +2039,6 @@ bool fs::pending_file::commit(bool overwrite)
 	return false;
 }
 
-stx::generator<fs::dir_entry&> fs::list_dir_recursively(const std::string& path)
-{
-	for (auto& entry : fs::dir(path))
-	{
-		if (entry.name == "." || entry.name == "..")
-		{
-			continue;
-		}
-
-		std::string new_path = path_append(path, entry.name);
-
-		if (entry.is_directory)
-		{
-			for (auto& nested : fs::list_dir_recursively(new_path))
-			{
-				co_yield nested;
-			}
-		}
-
-		entry.name = std::move(new_path);
-		co_yield entry;
-	}
-}
-
 template<>
 void fmt_class_string<fs::seek_mode>::format(std::string& out, u64 arg)
 {
@@ -2753,17 +2058,6 @@ void fmt_class_string<fs::seek_mode>::format(std::string& out, u64 arg)
 template<>
 void fmt_class_string<fs::error>::format(std::string& out, u64 arg)
 {
-	if (arg == static_cast<u64>(fs::error::unknown))
-	{
-		// Note: may not be the correct error code because it only prints the last
-#ifdef _WIN32
-		fmt::append(out, "Unknown error [errno=%d]", GetLastError());
-#else
-		fmt::append(out, "Unknown error [errno=%d]", errno);
-#endif
-		return;
-	}
-
 	format_enum(out, arg, [](auto arg)
 	{
 		switch (arg)
@@ -2779,19 +2073,9 @@ void fmt_class_string<fs::error>::format(std::string& out, u64 arg)
 		case fs::error::isdir: return "Is a directory";
 		case fs::error::toolong: return "Path too long";
 		case fs::error::nospace: return "Not enough space on the device";
-		case fs::error::xdev: return "Device mismatch";
 		case fs::error::unknown: return "Unknown system error";
 		}
 
 		return unknown;
 	});
 }
-
-template<>
-void fmt_class_string<fs::file_id>::format(std::string& out, u64 arg)
-{
-	const fs::file_id& id = get_object(arg);
-
-	// TODO: Format data
-	fmt::append(out, "{type='%s'}", id.type);
-}
diff --git a/Utilities/File.h b/Utilities/File.h
index a5a4c53d75..20ed7760a2 100644
--- a/Utilities/File.h
+++ b/Utilities/File.h
@@ -1,6 +1,5 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
-#include "util/serialization.hpp"
 #include "util/types.hpp"
 #include "util/shared_ptr.hpp"
 #include "bit_set.h"
@@ -33,7 +32,6 @@ namespace fs
 		excl,
 		lock,
 		unread,
-		isfile,
 
 		__bitset_enum_max
 	};
@@ -46,10 +44,8 @@ namespace fs
 	constexpr auto excl    = +open_mode::excl; // Failure if the file already exists (used with `create`)
 	constexpr auto lock    = +open_mode::lock; // Prevent opening the file more than once
 	constexpr auto unread  = +open_mode::unread; // Aggressively prevent reading the opened file (do not use)
-	constexpr auto isfile  = +open_mode::isfile; // Ensure valid fs::file handle is not of directory
 
-	constexpr auto write_new = write + create + excl;
-	constexpr auto rewrite = write + create + trunc;
+	constexpr auto rewrite = open_mode::write + open_mode::create + open_mode::trunc;
 
 	// File seek mode
 	enum class seek_mode : u32
@@ -67,20 +63,13 @@ namespace fs
 	struct stat_t
 	{
 		bool is_directory;
-		bool is_symlink;
 		bool is_writable;
 		u64 size;
 		s64 atime;
 		s64 mtime;
 		s64 ctime;
-
-		using enable_bitcopy = std::true_type;
-
-		constexpr bool operator==(const stat_t&) const = default;
 	};
 
-	static_assert(utils::Bitcopy<stat_t>);
-
 	// Helper, layout is equal to iovec struct
 	struct iovec_clone
 	{
@@ -88,35 +77,20 @@ namespace fs
 		usz iov_len;
 	};
 
-	struct file_id
-	{
-		std::string type;
-		std::vector<u8> data;
-
-		explicit operator bool() const;
-		bool is_mirror_of(const file_id&) const;
-		bool is_coherent_with(const file_id&) const;
-	};
-
 	// File handle base
 	struct file_base
 	{
 		virtual ~file_base();
 
-		[[noreturn]] virtual stat_t get_stat();
+		[[noreturn]] virtual stat_t stat();
 		virtual void sync();
 		virtual bool trunc(u64 length) = 0;
 		virtual u64 read(void* buffer, u64 size) = 0;
-		virtual u64 read_at(u64 offset, void* buffer, u64 size) = 0;
 		virtual u64 write(const void* buffer, u64 size) = 0;
 		virtual u64 seek(s64 offset, seek_mode whence) = 0;
 		virtual u64 size() = 0;
 		virtual native_handle get_handle();
-		virtual file_id get_id();
 		virtual u64 write_gather(const iovec_clone* buffers, u64 buf_count);
-		virtual void release()
-		{
-		}
 	};
 
 	// Directory entry (TODO)
@@ -128,12 +102,8 @@ namespace fs
 			: stat_t{}
 		{
 		}
-
-		using enable_bitcopy = std::false_type;
 	};
 
-	static_assert(!utils::Bitcopy<dir_entry>);
-
 	// Directory handle base
 	struct dir_base
 	{
@@ -164,7 +134,6 @@ namespace fs
 		virtual bool statfs(const std::string& path, device_stat& info) = 0;
 		virtual bool remove_dir(const std::string& path);
 		virtual bool create_dir(const std::string& path);
-		virtual bool create_symlink(const std::string& path);
 		virtual bool rename(const std::string& from, const std::string& to);
 		virtual bool remove(const std::string& path);
 		virtual bool trunc(const std::string& path, u64 length);
@@ -174,8 +143,8 @@ namespace fs
 		virtual std::unique_ptr<dir_base> open_dir(const std::string& path) = 0;
 	};
 
-	[[noreturn]] void xnull(std::source_location);
-	[[noreturn]] void xfail(std::source_location);
+	[[noreturn]] void xnull(const src_loc&);
+	[[noreturn]] void xfail(const src_loc&);
 	[[noreturn]] void xovfl();
 
 	constexpr struct pod_tag_t{} pod_tag;
@@ -186,17 +155,11 @@ namespace fs
 	// Set virtual device with specified name (nullptr for deletion)
 	shared_ptr<device_base> set_virtual_device(const std::string& name, shared_ptr<device_base> device);
 
-	// Try to get parent directory
-	std::string_view get_parent_dir_view(std::string_view path, u32 parent_level = 1);
-
-	// String (typical use) version
-	inline std::string get_parent_dir(std::string_view path, u32 parent_level = 1)
-	{
-		return std::string{get_parent_dir_view(path, parent_level)};
-	}
+	// Try to get parent directory (returns empty string on failure)
+	std::string get_parent_dir(const std::string& path);
 
 	// Get file information
-	bool get_stat(const std::string& path, stat_t& info);
+	bool stat(const std::string& path, stat_t& info);
 
 	// Check whether a file or a directory exists (not recommended, use is_file() or is_dir() instead)
 	bool exists(const std::string& path);
@@ -207,9 +170,6 @@ namespace fs
 	// Check whether the directory exists and is NOT a file
 	bool is_dir(const std::string& path);
 
-	// Check whether the path points to an existing symlink
-	bool is_symlink(const std::string& path);
-
 	// Get filesystem information
 	bool statfs(const std::string& path, device_stat& info);
 
@@ -222,9 +182,6 @@ namespace fs
 	// Create directories
 	bool create_path(const std::string& path);
 
-	// Create symbolic link
-	bool create_symlink(const std::string& path, const std::string& target);
-
 	// Rename (move) file or directory
 	bool rename(const std::string& from, const std::string& to, bool overwrite);
 
@@ -247,6 +204,8 @@ namespace fs
 	{
 		std::unique_ptr<file_base> m_file{};
 
+		bool strict_read_check(u64 size, u64 type_size) const;
+
 	public:
 		// Default constructor
 		file() = default;
@@ -254,8 +213,6 @@ namespace fs
 		// Open file with specified mode
 		explicit file(const std::string& path, bs_t<open_mode> mode = ::fs::read);
 
-		static file from_native_handle(native_handle handle);
-
 		// Open memory for read
 		explicit file(const void* ptr, usz size);
 
@@ -285,202 +242,264 @@ namespace fs
 			m_file = std::move(ptr);
 		}
 
-		void release_handle()
-		{
-			if (m_file)
-			{
-				release()->release();
-			}
-		}
-
 		std::unique_ptr<file_base> release()
 		{
-			return std::exchange(m_file, nullptr);
+			return std::move(m_file);
 		}
 
 		// Change file size (possibly appending zero bytes)
-		bool trunc(u64 length, std::source_location src_loc = std::source_location::current()) const
+		bool trunc(u64 length,
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (!m_file) xnull(src_loc);
+			if (!m_file) xnull({line, col, file, func});
 			return m_file->trunc(length);
 		}
 
 		// Get file information
-		stat_t get_stat(std::source_location src_loc = std::source_location::current()) const
+		stat_t stat(
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (!m_file) xnull(src_loc);
-			return m_file->get_stat();
+			if (!m_file) xnull({line, col, file, func});
+			return m_file->stat();
 		}
 
 		// Sync file buffers
-		void sync(std::source_location src_loc = std::source_location::current()) const
+		void sync(
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (!m_file) xnull(src_loc);
+			if (!m_file) xnull({line, col, file, func});
 			return m_file->sync();
 		}
 
-		// Check if the handle is capable of reading (size * type_size) of bytes at the time of calling
-		bool strict_read_check(u64 offset, u64 size, u64 type_size) const;
-
 		// Read the data from the file and return the amount of data written in buffer
-		u64 read(void* buffer, u64 count, std::source_location src_loc = std::source_location::current()) const
+		u64 read(void* buffer, u64 count,
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (!m_file) xnull(src_loc);
+			if (!m_file) xnull({line, col, file, func});
 			return m_file->read(buffer, count);
 		}
 
-		// Read the data from the file at specified offset in thread-safe manner
-		u64 read_at(u64 offset, void* buffer, u64 count, std::source_location src_loc = std::source_location::current()) const
-		{
-			if (!m_file) xnull(src_loc);
-			return m_file->read_at(offset, buffer, count);
-		}
-
 		// Write the data to the file and return the amount of data actually written
-		u64 write(const void* buffer, u64 count, std::source_location src_loc = std::source_location::current()) const
+		u64 write(const void* buffer, u64 count,
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (!m_file) xnull(src_loc);
+			if (!m_file) xnull({line, col, file, func});
 			return m_file->write(buffer, count);
 		}
 
 		// Change current position, returns resulting position
-		u64 seek(s64 offset, seek_mode whence = seek_set, std::source_location src_loc = std::source_location::current()) const
+		u64 seek(s64 offset, seek_mode whence = seek_set,
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (!m_file) xnull(src_loc);
+			if (!m_file) xnull({line, col, file, func});
 			return m_file->seek(offset, whence);
 		}
 
 		// Get file size
-		u64 size(std::source_location src_loc = std::source_location::current()) const
+		u64 size(
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (!m_file) xnull(src_loc);
+			if (!m_file) xnull({line, col, file, func});
 			return m_file->size();
 		}
 
 		// Get current position
-		u64 pos(std::source_location src_loc = std::source_location::current()) const
+		u64 pos(
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (!m_file) xnull(src_loc);
+			if (!m_file) xnull({line, col, file, func});
 			return m_file->seek(0, seek_cur);
 		}
 
 		// Write std::basic_string unconditionally
-		template <typename T> requires (std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>)
-		const file& write(const std::basic_string<T>& str, std::source_location src_loc = std::source_location::current()) const
+		template <typename T>
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, const file&> write(const std::basic_string<T>& str,
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (write(str.data(), str.size() * sizeof(T), src_loc) != str.size() * sizeof(T)) xfail(src_loc);
+			if (write(str.data(), str.size() * sizeof(T), line, col, file, func) != str.size() * sizeof(T)) xfail({line, col, file, func});
 			return *this;
 		}
 
 		// Write POD unconditionally
-		template <typename T> requires (std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>)
-		const file& write(const T& data, std::source_location src_loc = std::source_location::current()) 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,
+			pod_tag_t = pod_tag,
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (write(std::addressof(data), sizeof(T), src_loc) != sizeof(T)) xfail(src_loc);
+			if (write(std::addressof(data), sizeof(T), line, col, file, func) != sizeof(T)) xfail({line, col, file, func});
 			return *this;
 		}
 
 		// Write POD std::vector unconditionally
-		template <typename T> requires (std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>)
-		const file& write(const std::vector<T>& vec, std::source_location src_loc = std::source_location::current()) 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,
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (write(vec.data(), vec.size() * sizeof(T), src_loc) != vec.size() * sizeof(T)) xfail(src_loc);
+			if (write(vec.data(), vec.size() * sizeof(T), line, col, file, func) != vec.size() * sizeof(T)) xfail({line, col, file, func});
 			return *this;
 		}
 
-		// Read std::basic_string
-		template <typename T> requires (std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>)
-		bool read(std::basic_string<T>& str, usz _size = umax, std::source_location src_loc = std::source_location::current()) const
+		// Read std::basic_string, size must be set by resize() method
+		template <typename T>
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, bool> read(std::basic_string<T>& str,
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION(),
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN()) const
 		{
-			if (!m_file) xnull(src_loc);
+			return read(&str[0], str.size() * sizeof(T), line, col, file, func) == str.size() * sizeof(T);
+		}
 
-			if (_size != umax)
+		// Read std::basic_string
+		template <bool IsStrict = false, typename T>
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, bool> read(std::basic_string<T>& str, usz _size,
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION(),
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN()) const
+		{
+			if (!m_file) xnull({line, col, file, func});
+			if (!_size) return true;
+
+			if constexpr (IsStrict)
 			{
-				// If _size arg is too high std::bad_alloc may happen during resize and then we cannot error check
-				if ((_size >= 0x10'0000 / sizeof(T)) && !strict_read_check(pos(), _size, sizeof(T)))
-				{
-					return false;
-				}
-
-				str.resize(_size);
+				// If _size arg is too high std::bad_alloc may happen in resize and then we cannot error check
+				if (!strict_read_check(_size, sizeof(T))) return false;
 			}
 
-			return read(str.data(), sizeof(T) * str.size(), src_loc) == sizeof(T) * str.size();
+			str.resize(_size);
+			return read(str.data(), sizeof(T) * _size, line, col, file, func) == sizeof(T) * _size;
 		}
 
 		// Read POD, sizeof(T) is used
-		template <typename T> requires (std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>)
-		bool read(T& data,
-			pod_tag_t = pod_tag, std::source_location src_loc = std::source_location::current()) const
+		template <typename T>
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, bool> read(T& data,
+			pod_tag_t = pod_tag,
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			return read(std::addressof(data), sizeof(T), src_loc) == sizeof(T);
+			return read(&data, sizeof(T), line, col, file, func) == sizeof(T);
+		}
+
+		// Read POD std::vector, size must be set by resize() method
+		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 char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION(),
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN()) const
+		{
+			return read(vec.data(), sizeof(T) * vec.size(), line, col, file, func) == sizeof(T) * vec.size();
 		}
 
 		// Read POD std::vector
-		template <typename T> requires (std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>)
-		bool read(std::vector<T>& vec, usz _size = umax, bool use_offs = false, usz offset = umax, std::source_location src_loc = std::source_location::current()) const
+		template <bool IsStrict = false, typename T>
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, bool> read(std::vector<T>& vec, usz _size,
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION(),
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN()) const
 		{
-			if (!m_file) xnull(src_loc);
+			if (!m_file) xnull({line, col, file, func});
+			if (!_size) return true;
 
-			if (_size != umax)
+			if constexpr (IsStrict)
 			{
-				// If _size arg is too high std::bad_alloc may happen during resize and then we cannot error check
-				if ((_size >= 0x10'0000 / sizeof(T)) && !strict_read_check(use_offs ? offset : pos(), _size, sizeof(T)))
-				{
-					return false;
-				}
-
-				vec.resize(_size);
+				if (!strict_read_check(_size, sizeof(T))) return false;
 			}
 
-			if (use_offs)
-			{
-				return read_at(offset, vec.data(), sizeof(T) * vec.size(), src_loc) == sizeof(T) * vec.size();
-			}
-
-			return read(vec.data(), sizeof(T) * vec.size(), src_loc) == sizeof(T) * vec.size();
+			vec.resize(_size);
+			return read(vec.data(), sizeof(T) * _size, line, col, file, func) == sizeof(T) * _size;
 		}
 
 		// Read POD (experimental)
-		template <typename T> requires (std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>)
-		T read(pod_tag_t = pod_tag, std::source_location src_loc = std::source_location::current()) const
+		template <typename T>
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, T> read(
+			pod_tag_t = pod_tag,
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
 			T result;
-			if (!read(result, pod_tag, src_loc)) xfail(src_loc);
+			if (!read(result, pod_tag, line, col, file, func)) xfail({line, col, file, func});
 			return result;
 		}
 
 		// Read full file to std::basic_string
 		template <typename T = char>
-		std::basic_string<T> to_string(std::source_location src_loc = std::source_location::current()) const
+		std::basic_string<T> to_string(
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
 			std::basic_string<T> result;
 			result.resize(size() / sizeof(T));
-			seek(0);
-			if (!read(result, result.size(), src_loc)) xfail(src_loc);
+			if (seek(0), !read(result, file, func, line, col)) xfail({line, col, file, func});
 			return result;
 		}
 
 		// Read full file to std::vector
-		template<typename T> requires (std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>)
-		std::vector<T> to_vector(std::source_location src_loc = std::source_location::current()) const
+		template<typename T>
+		std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, std::vector<T>> to_vector(
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
 			std::vector<T> result;
 			result.resize(size() / sizeof(T));
-			if (!read(result, result.size(), true, 0, src_loc)) xfail(src_loc);
+			if (seek(0), !read(result, file, func, line, col)) xfail({line, col, file, func});
 			return result;
 		}
 
 		// Get native handle if available
 		native_handle get_handle() const;
 
-		// Get file ID information (custom ID)
-		file_id get_id() const;
-
 		// Gathered write
-		u64 write_gather(const iovec_clone* buffers, u64 buf_count, std::source_location src_loc = std::source_location::current()) const
+		u64 write_gather(const iovec_clone* buffers, u64 buf_count,
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (!m_file) xnull(src_loc);
+			if (!m_file) xnull({line, col, file, func});
 			return m_file->write_gather(buffers, buf_count);
 		}
 	};
@@ -493,7 +512,7 @@ namespace fs
 		dir() = default;
 
 		// Open dir handle
-		explicit dir(const std::string& path) noexcept
+		explicit dir(const std::string& path)
 		{
 			open(path);
 		}
@@ -502,7 +521,7 @@ namespace fs
 		bool open(const std::string& path);
 
 		// Check whether the handle is valid (opened directory)
-		explicit operator bool() const noexcept
+		explicit operator bool() const
 		{
 			return m_dir.operator bool();
 		}
@@ -524,16 +543,24 @@ namespace fs
 		}
 
 		// Get next directory entry
-		bool read(dir_entry& out, std::source_location src_loc = std::source_location::current()) const
+		bool read(dir_entry& out,
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (!m_dir) xnull(src_loc);
+			if (!m_dir) xnull({line, col, file, func});
 			return m_dir->read(out);
 		}
 
 		// Reset to the beginning
-		void rewind(std::source_location src_loc = std::source_location::current()) const
+		void rewind(
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION()) const
 		{
-			if (!m_dir) xnull(src_loc);
+			if (!m_dir) xnull({line, col, file, func});
 			return m_dir->rewind();
 		}
 
@@ -549,7 +576,7 @@ namespace fs
 				from_current
 			};
 
-			iterator(const dir* parent, mode mode_ = mode::from_first) noexcept
+			iterator(const dir* parent, mode mode_ = mode::from_first)
 				: m_parent(parent)
 			{
 				if (!m_parent)
@@ -587,13 +614,6 @@ namespace fs
 				return *this;
 			}
 
-			iterator operator++(int)
-			{
-				iterator old = *this;
-				*this = {m_parent, mode::from_current};
-				return old;
-			}
-
 			bool operator !=(const iterator& rhs) const
 			{
 				return m_parent != rhs.m_parent;
@@ -611,26 +631,15 @@ namespace fs
 		}
 	};
 
-	// Get executable path
-	std::string get_executable_path();
-
-	// Get executable containing directory
-	std::string get_executable_dir();
-
-	// Get configuration directory. Set get_config_subdirectory to true to get the nested config dir on windows.
-	const std::string& get_config_dir(bool get_config_subdirectory = false);
+	// Get configuration directory
+	const std::string& get_config_dir();
 
 	// Get common cache directory
 	const std::string& get_cache_dir();
 
-	// Get common log directory
-	const std::string& get_log_dir();
-
 	// Temporary directory
 	const std::string& get_temp_dir();
 
-	std::string generate_neighboring_path(std::string_view source, u64 seed);
-
 	// Unique pending file creation destined to be renamed to the destination file
 	struct pending_file
 	{
@@ -638,34 +647,22 @@ namespace fs
 
 		// This is meant to modify files atomically, overwriting is likely
 		bool commit(bool overwrite = true);
-		bool open(std::string_view path);
-
-		pending_file() noexcept = default;
-
-		pending_file(std::string_view path) noexcept
-		{
-			open(path);
-		}
 
+		pending_file(const std::string& path);
 		pending_file(const pending_file&) = delete;
 		pending_file& operator=(const pending_file&) = delete;
 		~pending_file();
 
-		const std::string& get_temp_path() const
-		{
-			return m_path;
-		}
-
 	private:
 		std::string m_path{}; // Pending file path
 		std::string m_dest{}; // Destination file path
 	};
 
 	// Delete directory and all its contents recursively
-	bool remove_all(const std::string& path, bool remove_root = true, bool is_no_dir_ok = false);
+	bool remove_all(const std::string& path, bool remove_root = true);
 
 	// Get size of all files recursively
-	u64 get_dir_size(const std::string& path, u64 rounding_alignment = 1, atomic_t<bool>* cancel_flag = nullptr);
+	u64 get_dir_size(const std::string& path, u64 rounding_alignment = 1);
 
 	enum class error : uint
 	{
@@ -680,7 +677,6 @@ namespace fs
 		isdir,
 		toolong,
 		nospace,
-		xdev,
 		unknown
 	};
 
@@ -696,10 +692,9 @@ namespace fs
 		T obj;
 		u64 pos;
 
-		container_stream(T&& obj, const stat_t& init_stat = {})
+		container_stream(T&& obj)
 			: obj(std::forward<T>(obj))
 			, pos(0)
-			, m_stat(init_stat)
 		{
 		}
 
@@ -710,7 +705,6 @@ namespace fs
 		bool trunc(u64 length) override
 		{
 			obj.resize(length);
-			update_time(true);
 			return true;
 		}
 
@@ -725,25 +719,6 @@ namespace fs
 				{
 					std::copy(obj.cbegin() + pos, obj.cbegin() + pos + max, static_cast<value_type*>(buffer));
 					pos = pos + max;
-					update_time();
-					return max;
-				}
-			}
-
-			return 0;
-		}
-
-		u64 read_at(u64 offset, void* buffer, u64 size) override
-		{
-			const u64 end = obj.size();
-
-			if (offset < end)
-			{
-				// Get readable size
-				if (const u64 max = std::min<u64>(size, end - offset))
-				{
-					std::copy(obj.cbegin() + offset, obj.cbegin() + offset + max, static_cast<value_type*>(buffer));
-					update_time();
 					return max;
 				}
 			}
@@ -779,7 +754,6 @@ namespace fs
 			obj.insert(obj.end(), src + overlap, src + size);
 			pos += size;
 
-			if (size) update_time(true);
 			return size;
 		}
 
@@ -804,34 +778,13 @@ namespace fs
 		{
 			return obj.size();
 		}
-
-		stat_t get_stat() override
-		{
-			return m_stat;
-		}
-
-	private:
-		stat_t m_stat{};
-
-		void update_time(bool write = false)
-		{
-			// TODO: Accurate timestamps
-			m_stat.atime++;
-
-			if (write)
-			{
-				m_stat.mtime++;
-				m_stat.mtime = std::max(m_stat.atime, m_stat.mtime);
-				m_stat.ctime = m_stat.mtime;
-			}
-		}
 	};
 
 	template <typename T>
-	file make_stream(T&& container = T{}, const stat_t& stat = stat_t{})
+	file make_stream(T&& container = T{})
 	{
 		file result;
-		result.reset(std::make_unique<container_stream<T>>(std::forward<T>(container), stat));
+		result.reset(std::make_unique<container_stream<T>>(std::forward<T>(container)));
 		return result;
 	}
 
@@ -864,6 +817,4 @@ namespace fs
 	}
 
 	file make_gather(std::vector<file>);
-
-	stx::generator<dir_entry&> list_dir_recursively(const std::string& path);
 }
diff --git a/Utilities/JIT.cpp b/Utilities/JIT.cpp
new file mode 100644
index 0000000000..079b4dc0c4
--- /dev/null
+++ b/Utilities/JIT.cpp
@@ -0,0 +1,858 @@
+#include "util/types.hpp"
+#include "util/sysinfo.hpp"
+#include "JIT.h"
+#include "StrFmt.h"
+#include "File.h"
+#include "util/logs.hpp"
+#include "mutex.h"
+#include "util/vm.hpp"
+#include "util/asm.hpp"
+#include <charconv>
+#include <zlib.h>
+
+#ifdef __linux__
+#define CAN_OVERCOMMIT
+#endif
+
+LOG_CHANNEL(jit_log, "JIT");
+
+static u8* get_jit_memory()
+{
+	// Reserve 2G memory (magic static)
+	static void* const s_memory2 = []() -> void*
+	{
+		void* ptr = utils::memory_reserve(0x80000000);
+#ifdef CAN_OVERCOMMIT
+		utils::memory_commit(ptr, 0x80000000);
+		utils::memory_protect(ptr, 0x40000000, utils::protection::wx);
+#endif
+		return ptr;
+	}();
+
+	return static_cast<u8*>(s_memory2);
+}
+
+// Allocation counters (1G code, 1G data subranges)
+static atomic_t<u64> s_code_pos{0}, s_data_pos{0};
+
+// Snapshot of code generated before main()
+static std::vector<u8> s_code_init, s_data_init;
+
+template <atomic_t<u64>& Ctr, uint Off, utils::protection Prot>
+static u8* add_jit_memory(usz size, uint align)
+{
+	// Select subrange
+	u8* pointer = get_jit_memory() + Off;
+
+	if (!size && !align) [[unlikely]]
+	{
+		// Return subrange info
+		return pointer;
+	}
+
+	u64 olda, newa;
+
+	// Simple allocation by incrementing pointer to the next free data
+	const u64 pos = Ctr.atomic_op([&](u64& ctr) -> u64
+	{
+		const u64 _pos = utils::align(ctr & 0xffff'ffff, align);
+		const u64 _new = utils::align(_pos + size, align);
+
+		if (_new > 0x40000000) [[unlikely]]
+		{
+			// Sorry, we failed, and further attempts should fail too.
+			ctr |= 0x40000000;
+			return -1;
+		}
+
+		// Last allocation is stored in highest bits
+		olda = ctr >> 32;
+		newa = olda;
+
+		// Check the necessity to commit more memory
+		if (_new > olda) [[unlikely]]
+		{
+			newa = utils::align(_new, 0x200000);
+		}
+
+		ctr += _new - (ctr & 0xffff'ffff);
+		return _pos;
+	});
+
+	if (pos == umax) [[unlikely]]
+	{
+		jit_log.error("Out of memory (size=0x%x, align=0x%x, off=0x%x)", size, align, Off);
+		return nullptr;
+	}
+
+	if (olda != newa) [[unlikely]]
+	{
+#ifndef CAN_OVERCOMMIT
+		// Commit more memory
+		utils::memory_commit(pointer + olda, newa - olda, Prot);
+#endif
+		// Acknowledge committed memory
+		Ctr.atomic_op([&](u64& ctr)
+		{
+			if ((ctr >> 32) < newa)
+			{
+				ctr += (newa - (ctr >> 32)) << 32;
+			}
+		});
+	}
+
+	return pointer + pos;
+}
+
+jit_runtime::jit_runtime()
+	: HostRuntime()
+{
+}
+
+jit_runtime::~jit_runtime()
+{
+}
+
+asmjit::Error jit_runtime::_add(void** dst, asmjit::CodeHolder* code) noexcept
+{
+	usz codeSize = code->getCodeSize();
+	if (!codeSize) [[unlikely]]
+	{
+		*dst = nullptr;
+		return asmjit::kErrorNoCodeGenerated;
+	}
+
+	void* p = jit_runtime::alloc(codeSize, 16);
+	if (!p) [[unlikely]]
+	{
+		*dst = nullptr;
+		return asmjit::kErrorNoVirtualMemory;
+	}
+
+	usz relocSize = code->relocate(p);
+	if (!relocSize) [[unlikely]]
+	{
+		*dst = nullptr;
+		return asmjit::kErrorInvalidState;
+	}
+
+	flush(p, relocSize);
+	*dst = p;
+
+	return asmjit::kErrorOk;
+}
+
+asmjit::Error jit_runtime::_release(void*) noexcept
+{
+	return asmjit::kErrorOk;
+}
+
+u8* jit_runtime::alloc(usz size, uint align, bool exec) noexcept
+{
+	if (exec)
+	{
+		return add_jit_memory<s_code_pos, 0x0, utils::protection::wx>(size, align);
+	}
+	else
+	{
+		return add_jit_memory<s_data_pos, 0x40000000, utils::protection::rw>(size, align);
+	}
+}
+
+void jit_runtime::initialize()
+{
+	if (!s_code_init.empty() || !s_data_init.empty())
+	{
+		return;
+	}
+
+	// Create code/data snapshot
+	s_code_init.resize(s_code_pos & 0xffff'ffff);
+	std::memcpy(s_code_init.data(), alloc(0, 0, true), s_code_init.size());
+	s_data_init.resize(s_data_pos & 0xffff'ffff);
+	std::memcpy(s_data_init.data(), alloc(0, 0, false), s_data_init.size());
+}
+
+void jit_runtime::finalize() noexcept
+{
+	// Reset JIT memory
+#ifdef CAN_OVERCOMMIT
+	utils::memory_reset(get_jit_memory(), 0x80000000);
+	utils::memory_protect(get_jit_memory(), 0x40000000, utils::protection::wx);
+#else
+	utils::memory_decommit(get_jit_memory(), 0x80000000);
+#endif
+
+	s_code_pos = 0;
+	s_data_pos = 0;
+
+	// Restore code/data snapshot
+	std::memcpy(alloc(s_code_init.size(), 1, true), s_code_init.data(), s_code_init.size());
+	std::memcpy(alloc(s_data_init.size(), 1, false), s_data_init.data(), s_data_init.size());
+}
+
+asmjit::Runtime& asmjit::get_global_runtime()
+{
+	// 16 MiB for internal needs
+	static constexpr u64 size = 1024 * 1024 * 16;
+
+	struct custom_runtime final : asmjit::HostRuntime
+	{
+		custom_runtime() noexcept
+		{
+			// Search starting in first 2 GiB of memory
+			for (u64 addr = size;; addr += size)
+			{
+				if (auto ptr = utils::memory_reserve(size, reinterpret_cast<void*>(addr)))
+				{
+					m_pos.raw() = static_cast<std::byte*>(ptr);
+					break;
+				}
+			}
+
+			// Initialize "end" pointer
+			m_max = m_pos + size;
+
+			// Make memory writable + executable
+			utils::memory_commit(m_pos, size, utils::protection::wx);
+		}
+
+		custom_runtime(const custom_runtime&) = delete;
+
+		custom_runtime& operator=(const custom_runtime&) = delete;
+
+		asmjit::Error _add(void** dst, asmjit::CodeHolder* code) noexcept override
+		{
+			usz codeSize = code->getCodeSize();
+			if (!codeSize) [[unlikely]]
+			{
+				*dst = nullptr;
+				return asmjit::kErrorNoCodeGenerated;
+			}
+
+			void* p = m_pos.fetch_add(utils::align(codeSize, 4096));
+			if (!p || m_pos > m_max) [[unlikely]]
+			{
+				*dst = nullptr;
+				jit_log.fatal("Out of memory (static asmjit)");
+				return asmjit::kErrorNoVirtualMemory;
+			}
+
+			usz relocSize = code->relocate(p);
+			if (!relocSize) [[unlikely]]
+			{
+				*dst = nullptr;
+				return asmjit::kErrorInvalidState;
+			}
+
+			utils::memory_protect(p, utils::align(codeSize, 4096), utils::protection::rx);
+			flush(p, relocSize);
+			*dst = p;
+
+			return asmjit::kErrorOk;
+		}
+
+		asmjit::Error _release(void*) noexcept override
+		{
+			return asmjit::kErrorOk;
+		}
+
+	private:
+		atomic_t<std::byte*> m_pos{};
+
+		std::byte* m_max{};
+	};
+
+	// Magic static
+	static custom_runtime g_rt;
+	return g_rt;
+}
+
+#ifdef LLVM_AVAILABLE
+
+#include <unordered_map>
+#include <unordered_set>
+#include <deque>
+
+#ifdef _MSC_VER
+#pragma warning(push, 0)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#pragma GCC diagnostic ignored "-Weffc++"
+#pragma GCC diagnostic ignored "-Wmissing-noreturn"
+#endif
+#include "llvm/Support/TargetSelect.h"
+#include "llvm/Support/FormattedStream.h"
+#include "llvm/Support/Host.h"
+#include "llvm/ExecutionEngine/ExecutionEngine.h"
+#include "llvm/ExecutionEngine/RTDyldMemoryManager.h"
+#include "llvm/ExecutionEngine/ObjectCache.h"
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
+
+const bool jit_initialize = []() -> bool
+{
+	llvm::InitializeNativeTarget();
+	llvm::InitializeNativeTargetAsmPrinter();
+	llvm::InitializeNativeTargetAsmParser();
+	LLVMLinkInMCJIT();
+	return true;
+}();
+
+[[noreturn]] static void null(const char* name)
+{
+	fmt::throw_exception("Null function: %s", name);
+}
+
+namespace vm
+{
+	extern u8* const g_sudo_addr;
+}
+
+static shared_mutex null_mtx;
+
+static std::unordered_map<std::string, u64> null_funcs;
+
+static u64 make_null_function(const std::string& name)
+{
+	if (name.starts_with("__0x"))
+	{
+		u32 addr = -1;
+		auto res = std::from_chars(name.c_str() + 4, name.c_str() + name.size(), addr, 16);
+
+		if (res.ec == std::errc() && res.ptr == name.c_str() + name.size() && addr < 0x8000'0000)
+		{
+			// Point the garbage to reserved, non-executable memory
+			return reinterpret_cast<u64>(vm::g_sudo_addr + addr);
+		}
+	}
+
+	std::lock_guard lock(null_mtx);
+
+	if (u64& func_ptr = null_funcs[name]) [[likely]]
+	{
+		// Already exists
+		return func_ptr;
+	}
+	else
+	{
+		using namespace asmjit;
+
+		// Build a "null" function that contains its name
+		const auto func = build_function_asm<void (*)()>([&](X86Assembler& c, auto& args)
+		{
+			Label data = c.newLabel();
+			c.lea(args[0], x86::qword_ptr(data, 0));
+			c.jmp(imm_ptr(&null));
+			c.align(kAlignCode, 16);
+			c.bind(data);
+
+			// Copy function name bytes
+			for (char ch : name)
+				c.db(ch);
+			c.db(0);
+			c.align(kAlignData, 16);
+		});
+
+		func_ptr = reinterpret_cast<u64>(func);
+		return func_ptr;
+	}
+}
+
+// Simple memory manager
+struct MemoryManager1 : llvm::RTDyldMemoryManager
+{
+	// 256 MiB for code or data
+	static constexpr u64 c_max_size = 0x20000000 / 2;
+
+	// Allocation unit (2M)
+	static constexpr u64 c_page_size = 2 * 1024 * 1024;
+
+	// Reserve 512 MiB
+	u8* const ptr = static_cast<u8*>(utils::memory_reserve(c_max_size * 2));
+
+	u64 code_ptr = 0;
+	u64 data_ptr = c_max_size;
+
+	MemoryManager1() = default;
+
+	MemoryManager1(const MemoryManager1&) = delete;
+
+	MemoryManager1& operator=(const MemoryManager1&) = delete;
+
+	~MemoryManager1() override
+	{
+		utils::memory_release(ptr, c_max_size * 2);
+	}
+
+	llvm::JITSymbol findSymbol(const std::string& name) override
+	{
+		u64 addr = RTDyldMemoryManager::getSymbolAddress(name);
+
+		if (!addr)
+		{
+			addr = make_null_function(name);
+
+			if (!addr)
+			{
+				fmt::throw_exception("Failed to link '%s'", name);
+			}
+		}
+
+		return {addr, llvm::JITSymbolFlags::Exported};
+	}
+
+	u8* allocate(u64& oldp, uptr size, uint align, utils::protection prot)
+	{
+		if (align > c_page_size)
+		{
+			jit_log.fatal("Unsupported alignment (size=0x%x, align=0x%x)", size, align);
+			return nullptr;
+		}
+
+		const u64 olda = utils::align(oldp, align);
+		const u64 newp = utils::align(olda + size, align);
+
+		if ((newp - 1) / c_max_size != oldp / c_max_size)
+		{
+			jit_log.fatal("Out of memory (size=0x%x, align=0x%x)", size, align);
+			return nullptr;
+		}
+
+		if ((oldp - 1) / c_page_size != (newp - 1) / c_page_size)
+		{
+			// Allocate pages on demand
+			const u64 pagea = utils::align(oldp, c_page_size);
+			const u64 psize = utils::align(newp - pagea, c_page_size);
+			utils::memory_commit(this->ptr + pagea, psize, prot);
+		}
+
+		// Update allocation counter
+		oldp = newp;
+
+		return this->ptr + olda;
+	}
+
+	u8* allocateCodeSection(uptr size, uint align, uint /*sec_id*/, llvm::StringRef /*sec_name*/) override
+	{
+		return allocate(code_ptr, size, align, utils::protection::wx);
+	}
+
+	u8* allocateDataSection(uptr size, uint align, uint /*sec_id*/, llvm::StringRef /*sec_name*/, bool /*is_ro*/) override
+	{
+		return allocate(data_ptr, size, align, utils::protection::rw);
+	}
+
+	bool finalizeMemory(std::string* = nullptr) override
+	{
+		return false;
+	}
+
+	void registerEHFrames(u8*, u64, usz) override
+	{
+	}
+
+	void deregisterEHFrames() override
+	{
+	}
+};
+
+// Simple memory manager
+struct MemoryManager2 : llvm::RTDyldMemoryManager
+{
+	MemoryManager2() = default;
+
+	~MemoryManager2() override
+	{
+	}
+
+	llvm::JITSymbol findSymbol(const std::string& name) override
+	{
+		u64 addr = RTDyldMemoryManager::getSymbolAddress(name);
+
+		if (!addr)
+		{
+			addr = make_null_function(name);
+
+			if (!addr)
+			{
+				fmt::throw_exception("Failed to link '%s' (MM2)", name);
+			}
+		}
+
+		return {addr, llvm::JITSymbolFlags::Exported};
+	}
+
+	u8* allocateCodeSection(uptr size, uint align, uint /*sec_id*/, llvm::StringRef /*sec_name*/) override
+	{
+		return jit_runtime::alloc(size, align, true);
+	}
+
+	u8* allocateDataSection(uptr size, uint align, uint /*sec_id*/, llvm::StringRef /*sec_name*/, bool /*is_ro*/) override
+	{
+		return jit_runtime::alloc(size, align, false);
+	}
+
+	bool finalizeMemory(std::string* = nullptr) override
+	{
+		return false;
+	}
+
+	void registerEHFrames(u8*, u64, usz) override
+	{
+	}
+
+	void deregisterEHFrames() override
+	{
+	}
+};
+
+// Helper class
+class ObjectCache final : public llvm::ObjectCache
+{
+	const std::string& m_path;
+
+public:
+	ObjectCache(const std::string& path)
+		: m_path(path)
+	{
+	}
+
+	~ObjectCache() override = default;
+
+	void notifyObjectCompiled(const llvm::Module* _module, llvm::MemoryBufferRef obj) override
+	{
+		std::string name = m_path;
+		name.append(_module->getName().data());
+		//fs::file(name, fs::rewrite).write(obj.getBufferStart(), obj.getBufferSize());
+		name.append(".gz");
+
+		z_stream zs{};
+		uLong zsz = compressBound(::narrow<u32>(obj.getBufferSize())) + 256;
+		auto zbuf = std::make_unique<uchar[]>(zsz);
+#ifndef _MSC_VER
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+		deflateInit2(&zs, 9, Z_DEFLATED, 16 + 15, 9, Z_DEFAULT_STRATEGY);
+#ifndef _MSC_VER
+#pragma GCC diagnostic pop
+#endif
+		zs.avail_in  = static_cast<uInt>(obj.getBufferSize());
+		zs.next_in   = reinterpret_cast<uchar*>(const_cast<char*>(obj.getBufferStart()));
+		zs.avail_out = static_cast<uInt>(zsz);
+		zs.next_out  = zbuf.get();
+
+		switch (deflate(&zs, Z_FINISH))
+		{
+		case Z_OK:
+		case Z_STREAM_END:
+		{
+			deflateEnd(&zs);
+			break;
+		}
+		default:
+		{
+			jit_log.error("LLVM: Failed to compress module: %s", _module->getName().data());
+			deflateEnd(&zs);
+			return;
+		}
+		}
+
+		if (!fs::write_file(name, fs::rewrite, zbuf.get(), zsz - zs.avail_out))
+		{
+				jit_log.error("LLVM: Failed to create module file: %s (%s)", name, fs::g_tls_error);
+				return;
+		}
+
+		jit_log.notice("LLVM: Created module: %s", _module->getName().data());
+	}
+
+	static std::unique_ptr<llvm::MemoryBuffer> load(const std::string& path)
+	{
+		if (fs::file cached{path + ".gz", fs::read})
+		{
+			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"
+#endif
+			inflateInit2(&zs, 16 + 15);
+#ifndef _MSC_VER
+#pragma GCC diagnostic pop
+#endif
+			zs.avail_in = static_cast<uInt>(gz.size());
+			zs.next_in  = gz.data();
+			out.resize(gz.size() * 6);
+			zs.avail_out = static_cast<uInt>(out.size());
+			zs.next_out  = out.data();
+
+			while (zs.avail_in)
+			{
+				switch (inflate(&zs, Z_FINISH))
+				{
+				case Z_OK: break;
+				case Z_STREAM_END: break;
+				case Z_BUF_ERROR:
+				{
+					if (zs.avail_in)
+						break;
+					[[fallthrough]];
+				}
+				default:
+					inflateEnd(&zs);
+					return nullptr;
+				}
+
+				if (zs.avail_in)
+				{
+					auto cur_size = zs.next_out - out.data();
+					out.resize(out.size() + 65536);
+					zs.avail_out = static_cast<uInt>(out.size() - cur_size);
+					zs.next_out = out.data() + cur_size;
+				}
+			}
+
+			out.resize(zs.next_out - out.data());
+			inflateEnd(&zs);
+
+			auto buf = llvm::WritableMemoryBuffer::getNewUninitMemBuffer(out.size());
+			std::memcpy(buf->getBufferStart(), out.data(), out.size());
+			return buf;
+		}
+
+		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;
+		}
+
+		return nullptr;
+	}
+
+	std::unique_ptr<llvm::MemoryBuffer> getObject(const llvm::Module* _module) override
+	{
+		std::string path = m_path;
+		path.append(_module->getName().data());
+
+		if (auto buf = load(path))
+		{
+			jit_log.notice("LLVM: Loaded module: %s", _module->getName().data());
+			return buf;
+		}
+
+		return nullptr;
+	}
+};
+
+std::string jit_compiler::cpu(const std::string& _cpu)
+{
+	std::string m_cpu = _cpu;
+
+	if (m_cpu.empty())
+	{
+		m_cpu = llvm::sys::getHostCPUName().operator std::string();
+
+		if (m_cpu == "sandybridge" ||
+			m_cpu == "ivybridge" ||
+			m_cpu == "haswell" ||
+			m_cpu == "broadwell" ||
+			m_cpu == "skylake" ||
+			m_cpu == "skylake-avx512" ||
+			m_cpu == "cascadelake" ||
+			m_cpu == "cooperlake" ||
+			m_cpu == "cannonlake" ||
+			m_cpu == "icelake" ||
+			m_cpu == "icelake-client" ||
+			m_cpu == "icelake-server" ||
+			m_cpu == "tigerlake" ||
+			m_cpu == "rocketlake")
+		{
+			// Downgrade if AVX is not supported by some chips
+			if (!utils::has_avx())
+			{
+				m_cpu = "nehalem";
+			}
+		}
+
+		if (m_cpu == "skylake-avx512" ||
+			m_cpu == "cascadelake" ||
+			m_cpu == "cooperlake" ||
+			m_cpu == "cannonlake" ||
+			m_cpu == "icelake" ||
+			m_cpu == "icelake-client" ||
+			m_cpu == "icelake-server" ||
+			m_cpu == "tigerlake" ||
+			m_cpu == "rocketlake")
+		{
+			// Downgrade if AVX-512 is disabled or not supported
+			if (!utils::has_avx512())
+			{
+				m_cpu = "skylake";
+			}
+		}
+
+		if (m_cpu == "znver1" && utils::has_clwb())
+		{
+			// Upgrade
+			m_cpu = "znver2";
+		}
+	}
+
+	return m_cpu;
+}
+
+jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, const std::string& _cpu, u32 flags)
+	: m_cpu(cpu(_cpu))
+{
+	std::string result;
+
+	auto null_mod = std::make_unique<llvm::Module> ("null_", m_context);
+
+	if (_link.empty())
+	{
+		std::unique_ptr<llvm::RTDyldMemoryManager> mem;
+
+		if (flags & 0x1)
+		{
+			mem = std::make_unique<MemoryManager1>();
+		}
+		else
+		{
+			mem = std::make_unique<MemoryManager2>();
+			null_mod->setTargetTriple(llvm::Triple::normalize("x86_64-unknown-linux-gnu"));
+		}
+
+		// Auxiliary JIT (does not use custom memory manager, only writes the objects)
+		m_engine.reset(llvm::EngineBuilder(std::move(null_mod))
+			.setErrorStr(&result)
+			.setEngineKind(llvm::EngineKind::JIT)
+			.setMCJITMemoryManager(std::move(mem))
+			.setOptLevel(llvm::CodeGenOpt::Aggressive)
+			.setCodeModel(flags & 0x2 ? llvm::CodeModel::Large : llvm::CodeModel::Small)
+			.setMCPU(m_cpu)
+			.create());
+	}
+	else
+	{
+		// Primary JIT
+		m_engine.reset(llvm::EngineBuilder(std::move(null_mod))
+			.setErrorStr(&result)
+			.setEngineKind(llvm::EngineKind::JIT)
+			.setMCJITMemoryManager(std::make_unique<MemoryManager1>())
+			.setOptLevel(llvm::CodeGenOpt::Aggressive)
+			.setCodeModel(flags & 0x2 ? llvm::CodeModel::Large : llvm::CodeModel::Small)
+			.setMCPU(m_cpu)
+			.create());
+
+		for (auto&& [name, addr] : _link)
+		{
+			m_engine->updateGlobalMapping(name, addr);
+		}
+	}
+
+	if (!m_engine)
+	{
+		fmt::throw_exception("LLVM: Failed to create ExecutionEngine: %s", result);
+	}
+}
+
+jit_compiler::~jit_compiler()
+{
+}
+
+void jit_compiler::add(std::unique_ptr<llvm::Module> _module, const std::string& path)
+{
+	ObjectCache cache{path};
+	m_engine->setObjectCache(&cache);
+
+	const auto ptr = _module.get();
+	m_engine->addModule(std::move(_module));
+	m_engine->generateCodeForModule(ptr);
+	m_engine->setObjectCache(nullptr);
+
+	for (auto& func : ptr->functions())
+	{
+		// Delete IR to lower memory consumption
+		func.deleteBody();
+	}
+}
+
+void jit_compiler::add(std::unique_ptr<llvm::Module> _module)
+{
+	const auto ptr = _module.get();
+	m_engine->addModule(std::move(_module));
+	m_engine->generateCodeForModule(ptr);
+
+	for (auto& func : ptr->functions())
+	{
+		// Delete IR to lower memory consumption
+		func.deleteBody();
+	}
+}
+
+void jit_compiler::add(const std::string& path)
+{
+	auto cache = ObjectCache::load(path);
+
+	if (auto object_file = llvm::object::ObjectFile::createObjectFile(*cache))
+	{
+		m_engine->addObjectFile( std::move(*object_file) );
+	}
+	else
+	{
+		jit_log.error("ObjectCache: Adding failed: %s", 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();
+}
+
+u64 jit_compiler::get(const std::string& name)
+{
+	return m_engine->getGlobalValueAddress(name);
+}
+
+#endif
diff --git a/Utilities/JIT.h b/Utilities/JIT.h
index 6dfa9e7cd0..53e9c08edd 100644
--- a/Utilities/JIT.h
+++ b/Utilities/JIT.h
@@ -1,13 +1,8 @@
 #pragma once
 
-#include "util/types.hpp"
-#include "util/atomic.hpp"
-
 // Include asmjit with warnings ignored
 #define ASMJIT_EMBED
-#define ASMJIT_STATIC
-#define ASMJIT_BUILD_DEBUG
-#undef Bool
+#define ASMJIT_DEBUG
 
 #ifdef _MSC_VER
 #pragma warning(push, 0)
@@ -23,42 +18,15 @@
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
 #pragma GCC diagnostic ignored "-Weffc++"
-#ifdef __clang__
-#pragma GCC diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion"
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#else
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wduplicated-branches"
-#pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion"
 #endif
 #include <asmjit/asmjit.h>
-#if defined(ARCH_ARM64)
-#include <asmjit/a64.h>
-#endif
 #pragma GCC diagnostic pop
 #endif
 
 #include <array>
 #include <functional>
-#include <memory>
-#include <string>
-#include <string_view>
-#include <unordered_map>
-#include <util/v128.hpp>
-
-#if defined(ARCH_X64)
-using native_asm = asmjit::x86::Assembler;
-using native_args = std::array<asmjit::x86::Gp, 4>;
-#elif defined(ARCH_ARM64)
-using native_asm = asmjit::a64::Assembler;
-using native_args = std::array<asmjit::a64::Gp, 4>;
-#endif
-
-void jit_announce(uptr func, usz size, std::string_view name);
-
-void jit_announce(auto* func, usz size, std::string_view name)
-{
-	jit_announce(uptr(func), size, name);
-}
 
 enum class jit_class
 {
@@ -68,34 +36,20 @@ enum class jit_class
 	spu_data,
 };
 
-struct jit_runtime_base
-{
-	jit_runtime_base() noexcept = default;
-	virtual ~jit_runtime_base() = default;
-
-	jit_runtime_base(const jit_runtime_base&) = delete;
-	jit_runtime_base& operator=(const jit_runtime_base&) = delete;
-
-	const asmjit::Environment& environment() const noexcept;
-	void* _add(asmjit::CodeHolder* code, usz align = 64) noexcept;
-	virtual uchar* _alloc(usz size, usz align) noexcept = 0;
-};
-
 // ASMJIT runtime for emitting code in a single 2G region
-struct jit_runtime final : jit_runtime_base
+struct jit_runtime final : asmjit::HostRuntime
 {
 	jit_runtime();
 	~jit_runtime() override;
 
 	// Allocate executable memory
-	uchar* _alloc(usz size, usz align) noexcept override;
+	asmjit::Error _add(void** dst, asmjit::CodeHolder* code) noexcept override;
+
+	// Do nothing (deallocation is delayed)
+	asmjit::Error _release(void* p) noexcept override;
 
 	// Allocate memory
-	static u8* alloc(usz size, usz align, bool exec = true) noexcept;
-
-	// Allocate 0 bytes, observe memory location
-	// Same as alloc(0, 1, exec)
-	static u8* peek(bool exec = true) noexcept;
+	static u8* alloc(usz size, uint align, bool exec = true) noexcept;
 
 	// Should be called at least once after global initialization
 	static void initialize();
@@ -107,25 +61,11 @@ struct jit_runtime final : jit_runtime_base
 namespace asmjit
 {
 	// Should only be used to build global functions
-	jit_runtime_base& get_global_runtime();
-
-	// Don't use directly
-	class inline_runtime : public jit_runtime_base
-	{
-		uchar* m_data;
-		usz m_size;
-
-	public:
-		inline_runtime(uchar* data, usz size);
-
-		~inline_runtime();
-
-		uchar* _alloc(usz size, usz align) noexcept override;
-	};
+	asmjit::Runtime& get_global_runtime();
 
 	// Emit xbegin and adjacent loop, return label at xbegin (don't use xabort please)
 	template <typename F>
-	[[nodiscard]] inline asmjit::Label build_transaction_enter(asmjit::x86::Assembler& c, asmjit::Label fallback, F func)
+	[[nodiscard]] inline asmjit::Label build_transaction_enter(asmjit::X86Assembler& c, asmjit::Label fallback, F func)
 	{
 		Label fall = c.newLabel();
 		Label begin = c.newLabel();
@@ -140,7 +80,7 @@ namespace asmjit
 		func();
 
 		// Other bad statuses are ignored regardless of repeat flag (TODO)
-		c.align(AlignMode::kCode, 16);
+		c.align(kAlignCode, 16);
 		c.bind(begin);
 		return fall;
 
@@ -148,7 +88,7 @@ namespace asmjit
 	}
 
 	// Helper to spill RDX (EDX) register for RDTSC
-	inline void build_swap_rdx_with(asmjit::x86::Assembler& c, std::array<x86::Gp, 4>& args, const asmjit::x86::Gp& with)
+	inline void build_swap_rdx_with(asmjit::X86Assembler& c, std::array<X86Gp, 4>& args, const asmjit::X86Gp& with)
 	{
 #ifdef _WIN32
 		c.xchg(args[1], with);
@@ -160,7 +100,7 @@ namespace asmjit
 	}
 
 	// Get full RDTSC value into chosen register (clobbers rax/rdx or saves only rax with other target)
-	inline void build_get_tsc(asmjit::x86::Assembler& c, const asmjit::x86::Gp& to = asmjit::x86::rax)
+	inline void build_get_tsc(asmjit::X86Assembler& c, const asmjit::X86Gp& to = asmjit::x86::rax)
 	{
 		if (&to != &x86::rax && &to != &x86::rdx)
 		{
@@ -187,269 +127,21 @@ namespace asmjit
 			c.or_(to.r64(), x86::rdx);
 		}
 	}
-
-	inline void build_init_args_from_ghc(native_asm& c, native_args& args)
-	{
-#if defined(ARCH_X64)
-		// TODO: handle case when args don't overlap with r13/rbp/r12/rbx
-		c.mov(args[0], x86::r13);
-		c.mov(args[1], x86::rbp);
-		c.mov(args[2], x86::r12);
-		c.mov(args[3], x86::rbx);
-#else
-		static_cast<void>(c);
-		static_cast<void>(args);
-#endif
-	}
-
-	inline void build_init_ghc_args(native_asm& c, native_args& args)
-	{
-#if defined(ARCH_X64)
-		// TODO: handle case when args don't overlap with r13/rbp/r12/rbx
-		c.mov(x86::r13, args[0]);
-		c.mov(x86::rbp, args[1]);
-		c.mov(x86::r12, args[2]);
-		c.mov(x86::rbx, args[3]);
-#else
-		static_cast<void>(c);
-		static_cast<void>(args);
-#endif
-	}
-
-#if defined(ARCH_X64)
-	struct simd_builder : native_asm
-	{
-		std::unordered_map<v128, Label> consts;
-
-		Operand v0, v1, v2, v3, v4, v5;
-
-		uint vsize = 16;
-		uint vmask = 0;
-
-		simd_builder(CodeHolder* ch) noexcept;
-		~simd_builder();
-
-		void operator()() noexcept;
-
-		void _init(uint new_vsize = 0);
-		void vec_cleanup_ret();
-		void vec_set_all_zeros(const Operand& v);
-		void vec_set_all_ones(const Operand& v);
-		void vec_set_const(const Operand& v, const v128& value);
-		void vec_clobbering_test(u32 esize, const Operand& v, const Operand& rhs);
-		void vec_broadcast_gpr(u32 esize, const Operand& v, const x86::Gp& r);
-
-		// return x86::ptr(base, ctr, X, 0) where X is set for esize accordingly
-		x86::Mem ptr_scale_for_vec(u32 esize, const x86::Gp& base, const x86::Gp& index);
-
-		void vec_load_unaligned(u32 esize, const Operand& v, const x86::Mem& src);
-		void vec_store_unaligned(u32 esize, const Operand& v, const x86::Mem& dst);
-		void vec_partial_move(u32 esize, const Operand& dst, const Operand& src);
-
-		void _vec_binary_op(x86::Inst::Id sse_op, x86::Inst::Id vex_op, x86::Inst::Id evex_op, const Operand& dst, const Operand& lhs, const Operand& rhs);
-
-		void vec_shuffle_xi8(const Operand& dst, const Operand& lhs, const Operand& rhs)
-		{
-			using enum x86::Inst::Id;
-			_vec_binary_op(kIdPshufb, kIdVpshufb, kIdVpshufb, dst, lhs, rhs);
-		}
-
-		void vec_xor(u32, const Operand& dst, const Operand& lhs, const Operand& rhs)
-		{
-			using enum x86::Inst::Id;
-			_vec_binary_op(kIdPxor, kIdVpxor, kIdVpxord, dst, lhs, rhs);
-		}
-
-		void vec_or(u32, const Operand& dst, const Operand& lhs, const Operand& rhs)
-		{
-			using enum x86::Inst::Id;
-			_vec_binary_op(kIdPor, kIdVpor, kIdVpord, dst, lhs, rhs);
-		}
-
-		void vec_andn(u32, const Operand& dst, const Operand& lhs, const Operand& rhs)
-		{
-			using enum x86::Inst::Id;
-			_vec_binary_op(kIdPandn, kIdVpandn, kIdVpandnd, dst, lhs, rhs);
-		}
-
-		void vec_umin(u32 esize, const Operand& dst, const Operand& lhs, const Operand& rhs);
-		void vec_umax(u32 esize, const Operand& dst, const Operand& lhs, const Operand& rhs);
-		void vec_cmp_eq(u32 esize, const Operand& dst, const Operand& lhs, const Operand& rhs);
-
-		void vec_extract_high(u32 esize, const Operand& dst, const Operand& src);
-		void vec_extract_gpr(u32 esize, const x86::Gp& dst, const Operand& src);
-
-		simd_builder& keep_if_not_masked()
-		{
-			if (vmask && vmask < 8)
-			{
-				this->k(x86::KReg(vmask));
-			}
-
-			return *this;
-		}
-
-		simd_builder& zero_if_not_masked()
-		{
-			if (vmask && vmask < 8)
-			{
-				this->k(x86::KReg(vmask));
-				this->z();
-			}
-
-			return *this;
-		}
-
-		void build_loop(u32 esize, const x86::Gp& reg_ctr, const x86::Gp& reg_cnt, auto&& build, auto&& reduce)
-		{
-			ensure((esize & (esize - 1)) == 0);
-			ensure(esize <= vsize);
-
-			Label body = this->newLabel();
-			Label next = this->newLabel();
-			Label exit = this->newLabel();
-
-			const u32 step = vsize / esize;
-
-			this->xor_(reg_ctr.r32(), reg_ctr.r32()); // Reset counter reg
-			this->cmp(reg_cnt, step);
-			this->jb(next); // If count < step, skip main loop body
-			this->align(AlignMode::kCode, 16);
-			this->bind(body);
-			this->sub(reg_cnt, step);
-			build();
-			this->add(reg_ctr, step);
-			this->cmp(reg_cnt, step);
-			this->jae(body);
-			this->bind(next);
-
-			if (vmask)
-			{
-				// Build single last iteration (masked)
-				this->test(reg_cnt, reg_cnt);
-				this->jz(exit);
-
-				if (esize == 1 && vsize == 64)
-				{
-					this->bzhi(reg_cnt.r64(), x86::Mem(consts[~u128()], 0), reg_cnt.r64());
-					this->kmovq(x86::k7, reg_cnt.r64());
-				}
-				else
-				{
-					this->bzhi(reg_cnt.r32(), x86::Mem(consts[~u128()], 0), reg_cnt.r32());
-					this->kmovd(x86::k7, reg_cnt.r32());
-				}
-
-				vmask = 7;
-				build();
-
-				// Rollout reduction step
-				this->bind(exit);
-				while (true)
-				{
-					vsize /= 2;
-					if (vsize < esize)
-						break;
-					this->_init(vsize);
-					reduce();
-				}
-			}
-			else
-			{
-				// Build unrolled loop tail (reduced vector width)
-				while (true)
-				{
-					vsize /= 2;
-					if (vsize < esize)
-						break;
-
-					// Shall not clobber flags
-					this->_init(vsize);
-					reduce();
-
-					if (vsize == esize)
-					{
-						// Last "iteration"
-						this->test(reg_cnt, reg_cnt);
-						this->jz(exit);
-						build();
-					}
-					else
-					{
-						const u32 step = vsize / esize;
-						Label next = this->newLabel();
-						this->cmp(reg_cnt, step);
-						this->jb(next);
-						build();
-						this->add(reg_ctr, step);
-						this->sub(reg_cnt, step);
-						this->bind(next);
-					}
-				}
-
-				this->bind(exit);
-			}
-
-			this->_init(0);
-		}
-	};
-
-	// for (; count > 0; ctr++, count--)
-	inline void build_loop(native_asm& c, auto ctr, auto count, auto&& build)
-	{
-		asmjit::Label body = c.newLabel();
-		asmjit::Label exit = c.newLabel();
-
-		c.test(count, count);
-		c.jz(exit);
-		c.align(asmjit::AlignMode::kCode, 16);
-		c.bind(body);
-		build();
-		c.inc(ctr);
-		c.sub(count, 1);
-		c.ja(body);
-		c.bind(exit);
-	}
-
-	inline void maybe_flush_lbr(native_asm& c, uint count = 2)
-	{
-		// Workaround for bad LBR callstacks which happen in some situations (mainly TSX) - execute additional RETs
-		Label next = c.newLabel();
-		c.lea(x86::rcx, x86::qword_ptr(next));
-
-		for (u32 i = 0; i < count; i++)
-		{
-			c.push(x86::rcx);
-			c.sub(x86::rcx, 16);
-		}
-
-		for (u32 i = 0; i < count; i++)
-		{
-			c.ret();
-			c.align(asmjit::AlignMode::kCode, 16);
-		}
-
-		c.bind(next);
-	}
-#endif
 }
 
 // Build runtime function with asmjit::X86Assembler
-template <typename FT, typename Asm = native_asm, typename F>
-inline FT build_function_asm(std::string_view name, F&& builder, ::jit_runtime* custom_runtime = nullptr, bool reduced_size = false)
+template <typename FT, typename F>
+inline FT build_function_asm(F&& builder)
 {
-#ifdef __APPLE__
-	pthread_jit_write_protect_np(false);
-#endif
 	using namespace asmjit;
 
-	auto& rt = custom_runtime ? *custom_runtime : get_global_runtime();
+	auto& rt = get_global_runtime();
 
 	CodeHolder code;
-	code.init(rt.environment());
+	code.init(rt.getCodeInfo());
+	code._globalHints = asmjit::CodeEmitter::kHintOptimizedAlign;
 
-#if defined(ARCH_X64)
-	native_args args;
+	std::array<X86Gp, 4> args;
 #ifdef _WIN32
 	args[0] = x86::rcx;
 	args[1] = x86::rdx;
@@ -461,55 +153,60 @@ inline FT build_function_asm(std::string_view name, F&& builder, ::jit_runtime*
 	args[2] = x86::rdx;
 	args[3] = x86::rcx;
 #endif
-#elif defined(ARCH_ARM64)
-	native_args args;
-	args[0] = a64::x0;
-	args[1] = a64::x1;
-	args[2] = a64::x2;
-	args[3] = a64::x3;
-#endif
 
-	Asm compiler(&code);
-	compiler.addEncodingOptions(EncodingOptions::kOptimizedAlign);
-	compiler.addEncodingOptions(EncodingOptions::kOptimizeForSize);
-	if constexpr (std::is_invocable_r_v<bool, F, Asm&, native_args&>)
+	X86Assembler compiler(&code);
+	builder(std::ref(compiler), args);
+	ensure(compiler.getLastError() == 0);
+
+	FT result;
+
+	if (rt.add(&result, &code))
 	{
-		if (!builder(compiler, args))
-			return nullptr;
-	}
-	else
-	{
-		builder(compiler, args);
+		return nullptr;
 	}
 
-	if constexpr (std::is_invocable_r_v<void, Asm>)
-	{
-		// Finalization
-		compiler();
-	}
-
-	const auto result = rt._add(&code, reduced_size ? 16 : 64);
-	jit_announce(result, code.codeSize(), name);
-	return reinterpret_cast<FT>(uptr(result));
+	return result;
 }
 
 #ifdef LLVM_AVAILABLE
 
-namespace llvm
-{
-	class LLVMContext;
-	class ExecutionEngine;
-	class Module;
-	class StringRef;
-}
+#include <memory>
+#include <string>
+#include <string_view>
+#include <unordered_map>
 
-enum class thread_state : u32;
+#include "util/types.hpp"
+
+#ifdef _MSC_VER
+#pragma warning(push, 0)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wsuggest-override"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#pragma GCC diagnostic ignored "-Weffc++"
+#pragma GCC diagnostic ignored "-Wmissing-noreturn"
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Winconsistent-missing-override"
+#endif
+#endif
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/Module.h"
+#include "llvm/ExecutionEngine/ExecutionEngine.h"
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 
 // Temporary compiler interface
 class jit_compiler final
 {
 	// Local LLVM context
-	std::unique_ptr<llvm::LLVMContext> m_context{};
+	llvm::LLVMContext m_context{};
 
 	// Execution instance
 	std::unique_ptr<llvm::ExecutionEngine> m_engine{};
@@ -517,18 +214,14 @@ class jit_compiler final
 	// Arch
 	std::string m_cpu{};
 
-	// Disk Space left
-	atomic_t<usz> m_disk_space = umax;
-
 public:
-	jit_compiler(const std::unordered_map<std::string, u64>& _link, const std::string& _cpu, u32 flags = 0, std::function<u64(const std::string&)> symbols_cement = {}) noexcept;
-	jit_compiler& operator=(thread_state) noexcept;
-	~jit_compiler() noexcept;
+	jit_compiler(const std::unordered_map<std::string, u64>& _link, const std::string& _cpu, u32 flags = 0);
+	~jit_compiler();
 
 	// Get LLVM context
 	auto& get_context()
 	{
-		return *m_context;
+		return m_context;
 	}
 
 	auto& get_engine() const
@@ -543,10 +236,7 @@ public:
 	void add(std::unique_ptr<llvm::Module> _module);
 
 	// Add object (path to obj file)
-	bool add(const std::string& path);
-
-	// Update global mapping for a single value
-	void update_global_mapping(const std::string& name, u64 addr);
+	void add(const std::string& path);
 
 	// Check object file
 	static bool check(const std::string& path);
@@ -559,16 +249,6 @@ public:
 
 	// Get CPU info
 	static std::string cpu(const std::string& _cpu);
-
-	// Get system triple (PPU)
-	static std::string triple1();
-
-	// Get system triple (SPU)
-	static std::string triple2();
-
-	bool add_sub_disk_space(ssz space);
 };
 
-const char *fallback_cpu_detection();
-
-#endif // LLVM_AVAILABLE
+#endif
diff --git a/Utilities/JITASM.cpp b/Utilities/JITASM.cpp
deleted file mode 100644
index acb5f40b04..0000000000
--- a/Utilities/JITASM.cpp
+++ /dev/null
@@ -1,866 +0,0 @@
-#include "util/types.hpp"
-#include "util/sysinfo.hpp"
-#include "JIT.h"
-#include "StrFmt.h"
-#include "File.h"
-#include "util/logs.hpp"
-#include "util/vm.hpp"
-#include "util/asm.hpp"
-#include "util/v128.hpp"
-#include "util/simd.hpp"
-
-#ifdef __linux__
-#include <unistd.h>
-#define CAN_OVERCOMMIT
-#endif
-
-LOG_CHANNEL(jit_log, "JIT");
-
-void jit_announce(uptr func, usz size, std::string_view name)
-{
-#ifdef __linux__
-#if 0
-	static const struct tmp_perf_map
-	{
-		std::string name{fmt::format("/tmp/perf-%d.map", getpid())};
-		fs::file data{name, fs::rewrite + fs::append};
-
-		tmp_perf_map() = default;
-		tmp_perf_map(const tmp_perf_map&) = delete;
-		tmp_perf_map& operator=(const tmp_perf_map&) = delete;
-
-		~tmp_perf_map()
-		{
-			fs::remove_file(name);
-		}
-	} s_map;
-
-	if (size && name.size())
-	{
-		s_map.data.write(fmt::format("%x %x %s\n", func, size, name));
-	}
-
-	if (!func && !size && !name.size())
-	{
-		fs::remove_file(s_map.name);
-		return;
-	}
-#endif
-#endif
-
-	if (!size)
-	{
-		jit_log.error("Empty function announced: %s (%p)", name, func);
-		return;
-	}
-
-	// If directory ASMJIT doesn't exist, nothing will be written
-	static constexpr u64 c_dump_size = 0x1'0000'0000;
-	static constexpr u64 c_index_size = c_dump_size / 16;
-	static atomic_t<u64> g_index_off = 0;
-	static atomic_t<u64> g_data_off = c_index_size;
-
-	static void* g_asm = []() -> void*
-	{
-		fs::remove_all(fs::get_cache_dir() + "/ASMJIT/", false);
-
-		fs::file objs(fmt::format("%s/ASMJIT/.objects", fs::get_cache_dir()), fs::read + fs::rewrite);
-
-		if (!objs || !objs.trunc(c_dump_size))
-		{
-			return nullptr;
-		}
-
-		return utils::memory_map_fd(objs.get_handle(), c_dump_size, utils::protection::rw);
-	}();
-
-	if (g_asm && size < c_index_size)
-	{
-		struct entry
-		{
-			u64 addr; // RPCS3 process address
-			u32 size; // Function size
-			u32 off; // Function offset
-		};
-
-		// Write index entry at the beginning of file, and data + NTS name at fixed offset
-		const u64 index_off = g_index_off.fetch_add(1);
-		const u64 size_all = size + name.size() + 1;
-		const u64 data_off = g_data_off.fetch_add(size_all);
-
-		// If either index or data area is exhausted, nothing will be written
-		if (index_off < c_index_size / sizeof(entry) && data_off + size_all < c_dump_size)
-		{
-			entry& index = static_cast<entry*>(g_asm)[index_off];
-
-			std::memcpy(static_cast<char*>(g_asm) + data_off, reinterpret_cast<char*>(func), size);
-			std::memcpy(static_cast<char*>(g_asm) + data_off + size, name.data(), name.size());
-			index.size = static_cast<u32>(size);
-			index.off = static_cast<u32>(data_off);
-			atomic_storage<u64>::store(index.addr, func);
-		}
-	}
-
-	if (g_asm && !name.empty() && name[0] != '_')
-	{
-		// Save some objects separately
-		fs::file dump(fmt::format("%s/ASMJIT/%s", fs::get_cache_dir(), name), fs::rewrite);
-
-		if (dump)
-		{
-			dump.write(reinterpret_cast<uchar*>(func), size);
-		}
-	}
-}
-
-static u8* get_jit_memory()
-{
-	// Reserve 2G memory (magic static)
-	static void* const s_memory2 = []() -> void*
-	{
-		void* ptr = utils::memory_reserve(0x80000000);
-#ifdef CAN_OVERCOMMIT
-		utils::memory_commit(ptr, 0x80000000);
-		utils::memory_protect(ptr, 0x40000000, utils::protection::wx);
-#endif
-		return ptr;
-	}();
-
-	return static_cast<u8*>(s_memory2);
-}
-
-// Allocation counters (1G code, 1G data subranges)
-static atomic_t<u64> s_code_pos{0}, s_data_pos{0};
-
-// Snapshot of code generated before main()
-static std::vector<u8> s_code_init, s_data_init;
-
-template <atomic_t<u64>& Ctr, uint Off, utils::protection Prot>
-static u8* add_jit_memory(usz size, usz align)
-{
-	// Select subrange
-	u8* pointer = get_jit_memory() + Off;
-
-	if (!size && !align) [[unlikely]]
-	{
-		// Return subrange info
-		return pointer;
-	}
-
-	if (!size && align == 1)
-	{
-		// Return memory top address
-		return pointer + (Ctr.load() & 0xffff'ffff);
-	}
-
-	u64 olda, newa;
-
-	// Simple allocation by incrementing pointer to the next free data
-	const u64 pos = Ctr.atomic_op([&](u64& ctr) -> u64
-	{
-		const u64 _pos = utils::align(ctr & 0xffff'ffff, align);
-		const u64 _new = utils::align(_pos + size, align);
-
-		if (_new > 0x40000000) [[unlikely]]
-		{
-			// Sorry, we failed, and further attempts should fail too.
-			ctr |= 0x40000000;
-			return -1;
-		}
-
-		// Last allocation is stored in highest bits
-		olda = ctr >> 32;
-		newa = olda;
-
-		// Check the necessity to commit more memory
-		if (_new > olda) [[unlikely]]
-		{
-			newa = utils::align(_new, 0x200000);
-		}
-
-		ctr += _new - (ctr & 0xffff'ffff);
-		return _pos;
-	});
-
-	if (pos == umax) [[unlikely]]
-	{
-		jit_log.error("Out of memory (size=0x%x, align=0x%x, off=0x%x)", size, align, Off);
-		return nullptr;
-	}
-
-	if (olda != newa) [[unlikely]]
-	{
-#ifndef CAN_OVERCOMMIT
-		// Commit more memory.
-		utils::memory_commit(pointer + olda, newa - olda, Prot);
-#endif
-		// Acknowledge committed memory
-		Ctr.atomic_op([&](u64& ctr)
-		{
-			if ((ctr >> 32) < newa)
-			{
-				ctr += (newa - (ctr >> 32)) << 32;
-			}
-		});
-	}
-
-	ensure(pointer + pos >= get_jit_memory() + Off);
-	ensure(pointer + pos < get_jit_memory() + Off + 0x40000000);
-
-	return pointer + pos;
-}
-
-const asmjit::Environment& jit_runtime_base::environment() const noexcept
-{
-	static const asmjit::Environment g_env = asmjit::Environment::host();
-
-	return g_env;
-}
-
-void* jit_runtime_base::_add(asmjit::CodeHolder* code, usz align) noexcept
-{
-	ensure(!code->flatten());
-	ensure(!code->resolveUnresolvedLinks());
-	usz codeSize = code->codeSize();
-	if (!codeSize)
-		return nullptr;
-
-	auto p = ensure(this->_alloc(codeSize, align));
-	ensure(!code->relocateToBase(uptr(p)));
-
-	{
-		// We manage rw <-> rx transitions manually on Apple
-		// because it's easier to keep track of when and where we need to toggle W^X
-#if !(defined(ARCH_ARM64) && defined(__APPLE__))
-		asmjit::VirtMem::ProtectJitReadWriteScope rwScope(p, codeSize);
-#endif
-
-		for (asmjit::Section* section : code->_sections)
-		{
-			if (section->offset() + section->bufferSize() > utils::align<usz>(codeSize, align))
-			{
-				fmt::throw_exception("CodeHolder section exceeds range: Section->offset: 0x%x, Section->bufferSize: 0x%x, alloted-memory=0x%x", section->offset(), section->bufferSize(), utils::align<usz>(codeSize, align));
-			}
-
-			std::memcpy(p + section->offset(), section->data(), section->bufferSize());
-		}
-	}
-
-	return p;
-}
-
-jit_runtime::jit_runtime()
-{
-}
-
-jit_runtime::~jit_runtime()
-{
-}
-
-uchar* jit_runtime::_alloc(usz size, usz align) noexcept
-{
-	return jit_runtime::alloc(size, align, true);
-}
-
-u8* jit_runtime::alloc(usz size, usz align, bool exec) noexcept
-{
-#if defined(__APPLE__)
-	static std::mutex s_alloc_lock;
-	std::lock_guard lock(s_alloc_lock);
-#endif
-
-	if (exec)
-	{
-		return add_jit_memory<s_code_pos, 0x0, utils::protection::wx>(size, align);
-	}
-	else
-	{
-		return add_jit_memory<s_data_pos, 0x40000000, utils::protection::rw>(size, align);
-	}
-}
-
-u8* jit_runtime::peek(bool exec) noexcept
-{
-	if (exec)
-	{
-		return add_jit_memory<s_code_pos, 0x0, utils::protection::wx>(0, 1);
-	}
-	else
-	{
-		return add_jit_memory<s_data_pos, 0x40000000, utils::protection::rw>(0, 1);
-	}
-}
-
-void jit_runtime::initialize()
-{
-	if (!s_code_init.empty() || !s_data_init.empty())
-	{
-		return;
-	}
-
-	// Create code/data snapshot
-	s_code_init.resize(s_code_pos & 0xffff'ffff);
-	std::memcpy(s_code_init.data(), alloc(0, 0, true), s_code_init.size());
-	s_data_init.resize(s_data_pos & 0xffff'ffff);
-	std::memcpy(s_data_init.data(), alloc(0, 0, false), s_data_init.size());
-}
-
-void jit_runtime::finalize() noexcept
-{
-#ifdef __APPLE__
-	pthread_jit_write_protect_np(false);
-#endif
-	// Reset JIT memory
-#ifdef CAN_OVERCOMMIT
-	utils::memory_reset(get_jit_memory(), 0x80000000);
-	utils::memory_protect(get_jit_memory(), 0x40000000, utils::protection::wx);
-#else
-	utils::memory_decommit(get_jit_memory(), 0x80000000);
-#endif
-
-	s_code_pos = 0;
-	s_data_pos = 0;
-
-	// Restore code/data snapshot
-	std::memcpy(alloc(s_code_init.size(), 1, true), s_code_init.data(), s_code_init.size());
-	std::memcpy(alloc(s_data_init.size(), 1, false), s_data_init.data(), s_data_init.size());
-
-#ifdef __APPLE__
-	pthread_jit_write_protect_np(true);
-#endif
-#ifdef ARCH_ARM64
-	// Flush all cache lines after potentially writing executable code
-	asm("ISB");
-	asm("DSB ISH");
-#endif
-}
-
-jit_runtime_base& asmjit::get_global_runtime()
-{
-	// 16 MiB for internal needs
-	static constexpr u64 size = 1024 * 1024 * 16;
-
-	struct custom_runtime final : jit_runtime_base
-	{
-		custom_runtime() noexcept
-		{
-			ensure(m_pos.raw() = static_cast<uchar*>(utils::memory_reserve(size)));
-
-			// Initialize "end" pointer
-			m_max = m_pos + size;
-
-			// Make memory writable + executable
-			utils::memory_commit(m_pos, size, utils::protection::wx);
-		}
-
-		uchar* _alloc(usz size, usz align) noexcept override
-		{
-			return m_pos.atomic_op([&](uchar*& pos) -> uchar*
-			{
-				const auto r = reinterpret_cast<uchar*>(utils::align(uptr(pos), align));
-
-				if (r >= pos && r + size > pos && r + size <= m_max)
-				{
-					pos = r + size;
-					return r;
-				}
-
-				return nullptr;
-			});
-		}
-
-	private:
-		atomic_t<uchar*> m_pos{};
-
-		uchar* m_max{};
-	};
-
-	// Magic static
-	static custom_runtime g_rt;
-	return g_rt;
-}
-
-asmjit::inline_runtime::inline_runtime(uchar* data, usz size)
-	: m_data(data)
-	, m_size(size)
-{
-}
-
-uchar* asmjit::inline_runtime::_alloc(usz size, usz align) noexcept
-{
-	ensure(align <= 4096);
-
-	return size <= m_size ? m_data : nullptr;
-}
-
-asmjit::inline_runtime::~inline_runtime()
-{
-	utils::memory_protect(m_data, m_size, utils::protection::rx);
-}
-
-#if defined(ARCH_X64)
-asmjit::simd_builder::simd_builder(CodeHolder* ch) noexcept
-	: native_asm(ch)
-{
-	_init(0);
-	consts[~v128()] = this->newLabel();
-}
-
-asmjit::simd_builder::~simd_builder()
-{
-}
-
-void asmjit::simd_builder::_init(uint new_vsize)
-{
-	if ((!new_vsize && utils::has_avx512_icl()) || new_vsize == 64)
-	{
-		v0 = x86::zmm0;
-		v1 = x86::zmm1;
-		v2 = x86::zmm2;
-		v3 = x86::zmm3;
-		v4 = x86::zmm4;
-		v5 = x86::zmm5;
-		vsize = 64;
-	}
-	else if ((!new_vsize && utils::has_avx2()) || new_vsize == 32)
-	{
-		v0 = x86::ymm0;
-		v1 = x86::ymm1;
-		v2 = x86::ymm2;
-		v3 = x86::ymm3;
-		v4 = x86::ymm4;
-		v5 = x86::ymm5;
-		vsize = 32;
-	}
-	else
-	{
-		v0 = x86::xmm0;
-		v1 = x86::xmm1;
-		v2 = x86::xmm2;
-		v3 = x86::xmm3;
-		v4 = x86::xmm4;
-		v5 = x86::xmm5;
-		vsize = new_vsize ? new_vsize : 16;
-	}
-
-	if (utils::has_avx512())
-	{
-		if (!new_vsize)
-			vmask = -1;
-	}
-	else
-	{
-		vmask = 0;
-	}
-}
-
-void asmjit::simd_builder::operator()() noexcept
-{
-	for (auto&& [x, y] : consts)
-	{
-		this->align(AlignMode::kData, 16);
-		this->bind(y);
-		this->embed(&x, 16);
-	}
-}
-
-void asmjit::simd_builder::vec_cleanup_ret()
-{
-	if (utils::has_avx() && vsize > 16)
-		this->vzeroupper();
-	this->ret();
-}
-
-void asmjit::simd_builder::vec_set_all_zeros(const Operand& v)
-{
-	x86::Xmm reg(v.id());
-	if (utils::has_avx())
-		this->vpxor(reg, reg, reg);
-	else
-		this->xorps(reg, reg);
-}
-
-void asmjit::simd_builder::vec_set_all_ones(const Operand& v)
-{
-	x86::Xmm reg(v.id());
-	if (x86::Zmm zr(v.id()); zr == v)
-		this->vpternlogd(zr, zr, zr, 0xff);
-	else if (x86::Ymm yr(v.id()); yr == v)
-		this->vpcmpeqd(yr, yr, yr);
-	else if (utils::has_avx())
-		this->vpcmpeqd(reg, reg, reg);
-	else
-		this->pcmpeqd(reg, reg);
-}
-
-void asmjit::simd_builder::vec_set_const(const Operand& v, const v128& val)
-{
-	if (!val._u)
-		return vec_set_all_zeros(v);
-	if (!~val._u)
-		return vec_set_all_ones(v);
-	else
-	{
-		Label co = consts[val];
-		if (!co.isValid())
-			co = consts[val] = this->newLabel();
-		if (x86::Zmm zr(v.id()); zr == v)
-			this->vbroadcasti32x4(zr, x86::oword_ptr(co));
-		else if (x86::Ymm yr(v.id()); yr == v)
-			this->vbroadcasti128(yr, x86::oword_ptr(co));
-		else if (utils::has_avx())
-			this->vmovaps(x86::Xmm(v.id()), x86::oword_ptr(co));
-		else
-			this->movaps(x86::Xmm(v.id()), x86::oword_ptr(co));
-	}
-}
-
-void asmjit::simd_builder::vec_clobbering_test(u32 esize, const Operand& v, const Operand& rhs)
-{
-	if (esize == 64)
-	{
-		this->emit(x86::Inst::kIdVptestmd, x86::k0, v, rhs);
-		this->ktestw(x86::k0, x86::k0);
-	}
-	else if (esize == 32)
-	{
-		this->emit(x86::Inst::kIdVptest, v, rhs);
-	}
-	else if (esize == 16 && utils::has_avx())
-	{
-		this->emit(x86::Inst::kIdVptest, v, rhs);
-	}
-	else if (esize == 16 && utils::has_sse41())
-	{
-		this->emit(x86::Inst::kIdPtest, v, rhs);
-	}
-	else
-	{
-		if (v != rhs)
-			this->emit(x86::Inst::kIdPand, v, rhs);
-		if (esize == 16)
-			this->emit(x86::Inst::kIdPacksswb, v, v);
-		this->emit(x86::Inst::kIdMovq, x86::rax, v);
-		if (esize == 16 || esize == 8)
-			this->test(x86::rax, x86::rax);
-		else if (esize == 4)
-			this->test(x86::eax, x86::eax);
-		else if (esize == 2)
-			this->test(x86::ax, x86::ax);
-		else if (esize == 1)
-			this->test(x86::al, x86::al);
-		else
-			fmt::throw_exception("Unimplemented");
-	}
-}
-
-void asmjit::simd_builder::vec_broadcast_gpr(u32 esize, const Operand& v, const x86::Gp& r)
-{
-	if (esize == 2)
-	{
-		if (utils::has_avx512())
-			this->emit(x86::Inst::kIdVpbroadcastw, v, r.r32());
-		else if (utils::has_avx())
-		{
-			this->emit(x86::Inst::kIdVmovd, v, r.r32());
-			if (utils::has_avx2())
-				this->emit(x86::Inst::kIdVpbroadcastw, v, v);
-			else
-			{
-				this->emit(x86::Inst::kIdVpunpcklwd, v, v, v);
-				this->emit(x86::Inst::kIdVpshufd, v, v, Imm(0));
-			}
-		}
-		else
-		{
-			this->emit(x86::Inst::kIdMovd, v, r.r32());
-			this->emit(x86::Inst::kIdPunpcklwd, v, v);
-			this->emit(x86::Inst::kIdPshufd, v, v, Imm(0));
-		}
-	}
-	else if (esize == 4)
-	{
-		if (utils::has_avx512())
-			this->emit(x86::Inst::kIdVpbroadcastd, v, r.r32());
-		else if (utils::has_avx())
-		{
-			this->emit(x86::Inst::kIdVmovd, v, r.r32());
-			if (utils::has_avx2())
-				this->emit(x86::Inst::kIdVpbroadcastd, v, v);
-			else
-				this->emit(x86::Inst::kIdVpshufd, v, v, Imm(0));
-		}
-		else
-		{
-			this->emit(x86::Inst::kIdMovd, v, r.r32());
-			this->emit(x86::Inst::kIdPshufd, v, v, Imm(0));
-		}
-	}
-	else
-	{
-		fmt::throw_exception("Unimplemented");
-	}
-}
-
-asmjit::x86::Mem asmjit::simd_builder::ptr_scale_for_vec(u32 esize, const x86::Gp& base, const x86::Gp& index)
-{
-	switch (ensure(esize))
-	{
-	case 1: return x86::ptr(base, index, 0, 0);
-	case 2: return x86::ptr(base, index, 1, 0);
-	case 4: return x86::ptr(base, index, 2, 0);
-	case 8: return x86::ptr(base, index, 3, 0);
-	default: fmt::throw_exception("Bad esize");
-	}
-}
-
-void asmjit::simd_builder::vec_load_unaligned(u32 esize, const Operand& v, const x86::Mem& src)
-{
-	ensure(std::has_single_bit(esize));
-	ensure(std::has_single_bit(vsize));
-
-	if (esize == 2)
-	{
-		ensure(vsize >= 2);
-		if (vsize == 2)
-			vec_set_all_zeros(v);
-		if (vsize == 2 && utils::has_avx())
-			this->emit(x86::Inst::kIdVpinsrw, x86::Xmm(v.id()), x86::Xmm(v.id()), src, Imm(0));
-		else if (vsize == 2)
-			this->emit(x86::Inst::kIdPinsrw, v, src, Imm(0));
-		else if ((vmask && vmask < 8) || vsize >= 64)
-			this->emit(x86::Inst::kIdVmovdqu16, v, src);
-		else
-			return vec_load_unaligned(vsize, v, src);
-	}
-	else if (esize == 4)
-	{
-		ensure(vsize >= 4);
-		if (vsize == 4 && utils::has_avx())
-			this->emit(x86::Inst::kIdVmovd, x86::Xmm(v.id()), src);
-		else if (vsize == 4)
-			this->emit(x86::Inst::kIdMovd, v, src);
-		else if ((vmask && vmask < 8) || vsize >= 64)
-			this->emit(x86::Inst::kIdVmovdqu32, v, src);
-		else
-			return vec_load_unaligned(vsize, v, src);
-	}
-	else if (esize == 8)
-	{
-		ensure(vsize >= 8);
-		if (vsize == 8 && utils::has_avx())
-			this->emit(x86::Inst::kIdVmovq, x86::Xmm(v.id()), src);
-		else if (vsize == 8)
-			this->emit(x86::Inst::kIdMovq, v, src);
-		else if ((vmask && vmask < 8) || vsize >= 64)
-			this->emit(x86::Inst::kIdVmovdqu64, v, src);
-		else
-			return vec_load_unaligned(vsize, v, src);
-	}
-	else if (esize >= 16)
-	{
-		ensure(vsize >= 16);
-		if ((vmask && vmask < 8) || vsize >= 64)
-			this->emit(x86::Inst::kIdVmovdqu64, v, src); // Not really needed
-		else if (utils::has_avx())
-			this->emit(x86::Inst::kIdVmovdqu, v, src);
-		else
-			this->emit(x86::Inst::kIdMovups, v, src);
-	}
-	else
-	{
-		fmt::throw_exception("Unimplemented");
-	}
-}
-
-void asmjit::simd_builder::vec_store_unaligned(u32 esize, const Operand& v, const x86::Mem& dst)
-{
-	ensure(std::has_single_bit(esize));
-	ensure(std::has_single_bit(vsize));
-
-	if (esize == 2)
-	{
-		ensure(vsize >= 2);
-		if (vsize == 2 && utils::has_avx())
-			this->emit(x86::Inst::kIdVpextrw, dst, x86::Xmm(v.id()), Imm(0));
-		else if (vsize == 2 && utils::has_sse41())
-			this->emit(x86::Inst::kIdPextrw, dst, v, Imm(0));
-		else if (vsize == 2)
-			this->push(x86::rax), this->pextrw(x86::eax, x86::Xmm(v.id()), 0), this->mov(dst, x86::ax), this->pop(x86::rax);
-		else if ((vmask && vmask < 8) || vsize >= 64)
-			this->emit(x86::Inst::kIdVmovdqu16, dst, v);
-		else
-			return vec_store_unaligned(vsize, v, dst);
-	}
-	else if (esize == 4)
-	{
-		ensure(vsize >= 4);
-		if (vsize == 4 && utils::has_avx())
-			this->emit(x86::Inst::kIdVmovd, dst, x86::Xmm(v.id()));
-		else if (vsize == 4)
-			this->emit(x86::Inst::kIdMovd, dst, v);
-		else if ((vmask && vmask < 8) || vsize >= 64)
-			this->emit(x86::Inst::kIdVmovdqu32, dst, v);
-		else
-			return vec_store_unaligned(vsize, v, dst);
-	}
-	else if (esize == 8)
-	{
-		ensure(vsize >= 8);
-		if (vsize == 8 && utils::has_avx())
-			this->emit(x86::Inst::kIdVmovq, dst, x86::Xmm(v.id()));
-		else if (vsize == 8)
-			this->emit(x86::Inst::kIdMovq, dst, v);
-		else if ((vmask && vmask < 8) || vsize >= 64)
-			this->emit(x86::Inst::kIdVmovdqu64, dst, v);
-		else
-			return vec_store_unaligned(vsize, v, dst);
-	}
-	else if (esize >= 16)
-	{
-		ensure(vsize >= 16);
-		if ((vmask && vmask < 8) || vsize >= 64)
-			this->emit(x86::Inst::kIdVmovdqu64, dst, v); // Not really needed
-		else if (utils::has_avx())
-			this->emit(x86::Inst::kIdVmovdqu, dst, v);
-		else
-			this->emit(x86::Inst::kIdMovups, dst, v);
-	}
-	else
-	{
-		fmt::throw_exception("Unimplemented");
-	}
-}
-
-void asmjit::simd_builder::_vec_binary_op(x86::Inst::Id sse_op, x86::Inst::Id vex_op, x86::Inst::Id evex_op, const Operand& dst, const Operand& lhs, const Operand& rhs)
-{
-	if (utils::has_avx())
-	{
-		if (evex_op != x86::Inst::kIdNone && (vex_op == x86::Inst::kIdNone || this->_extraReg.isReg() || vsize >= 64))
-		{
-			this->evex().emit(evex_op, dst, lhs, rhs);
-		}
-		else
-		{
-			this->emit(vex_op, dst, lhs, rhs);
-		}
-	}
-	else if (dst == lhs)
-	{
-		this->emit(sse_op, dst, rhs);
-	}
-	else if (dst == rhs)
-	{
-		fmt::throw_exception("Unimplemented");
-	}
-	else
-	{
-		this->emit(x86::Inst::kIdMovaps, dst, lhs);
-		this->emit(sse_op, dst, rhs);
-	}
-}
-
-void asmjit::simd_builder::vec_umin(u32 esize, const Operand& dst, const Operand& lhs, const Operand& rhs)
-{
-	using enum x86::Inst::Id;
-	if (esize == 2)
-	{
-		if (utils::has_sse41())
-			return _vec_binary_op(kIdPminuw, kIdVpminuw, kIdVpminuw, dst, lhs, rhs);
-	}
-	else if (esize == 4)
-	{
-		if (utils::has_sse41())
-			return _vec_binary_op(kIdPminud, kIdVpminud, kIdVpminud, dst, lhs, rhs);
-	}
-
-	fmt::throw_exception("Unimplemented");
-}
-
-void asmjit::simd_builder::vec_umax(u32 esize, const Operand& dst, const Operand& lhs, const Operand& rhs)
-{
-	using enum x86::Inst::Id;
-	if (esize == 2)
-	{
-		if (utils::has_sse41())
-			return _vec_binary_op(kIdPmaxuw, kIdVpmaxuw, kIdVpmaxuw, dst, lhs, rhs);
-	}
-	else if (esize == 4)
-	{
-		if (utils::has_sse41())
-			return _vec_binary_op(kIdPmaxud, kIdVpmaxud, kIdVpmaxud, dst, lhs, rhs);
-	}
-
-	fmt::throw_exception("Unimplemented");
-}
-
-void asmjit::simd_builder::vec_cmp_eq(u32 esize, const Operand& dst, const Operand& lhs, const Operand& rhs)
-{
-	using enum x86::Inst::Id;
-	if (esize == 2)
-	{
-		if (vsize == 64)
-		{
-			this->evex().emit(kIdVpcmpeqw, x86::k0, lhs, rhs);
-			this->evex().emit(kIdVpmovm2w, dst, x86::k0);
-		}
-		else
-		{
-			_vec_binary_op(kIdPcmpeqw, kIdVpcmpeqw, kIdNone, dst, lhs, rhs);
-		}
-	}
-	else if (esize == 4)
-	{
-		if (vsize == 64)
-		{
-			this->evex().emit(kIdVpcmpeqd, x86::k0, lhs, rhs);
-			this->evex().emit(kIdVpmovm2d, dst, x86::k0);
-		}
-		else
-		{
-			_vec_binary_op(kIdPcmpeqd, kIdVpcmpeqd, kIdNone, dst, lhs, rhs);
-		}
-	}
-	else
-	{
-		fmt::throw_exception("Unimplemented");
-	}
-}
-
-void asmjit::simd_builder::vec_extract_high(u32, const Operand& dst, const Operand& src)
-{
-	if (vsize == 32)
-		this->vextracti32x8(x86::Ymm(dst.id()), x86::Zmm(src.id()), 1);
-	else if (vsize == 16)
-		this->vextracti128(x86::Xmm(dst.id()), x86::Ymm(src.id()), 1);
-	else
-	{
-		if (utils::has_avx())
-			this->vpsrldq(x86::Xmm(dst.id()), x86::Xmm(src.id()), vsize);
-		else
-		{
-			this->movdqa(x86::Xmm(dst.id()), x86::Xmm(src.id()));
-			this->psrldq(x86::Xmm(dst.id()), vsize);
-		}
-	}
-}
-
-void asmjit::simd_builder::vec_extract_gpr(u32 esize, const x86::Gp& dst, const Operand& src)
-{
-	if (esize == 8 && utils::has_avx())
-		this->vmovq(dst.r64(), x86::Xmm(src.id()));
-	else if (esize == 8)
-		this->movq(dst.r64(), x86::Xmm(src.id()));
-	else if (esize == 4 && utils::has_avx())
-		this->vmovd(dst.r32(), x86::Xmm(src.id()));
-	else if (esize == 4)
-		this->movd(dst.r32(), x86::Xmm(src.id()));
-	else if (esize == 2 && utils::has_avx())
-		this->vpextrw(dst.r32(), x86::Xmm(src.id()), 0);
-	else if (esize == 2)
-		this->pextrw(dst.r32(), x86::Xmm(src.id()), 0);
-	else
-		fmt::throw_exception("Unimplemented");
-}
-
-#endif /* X86 */
diff --git a/Utilities/JITLLVM.cpp b/Utilities/JITLLVM.cpp
deleted file mode 100644
index 2b82d57d54..0000000000
--- a/Utilities/JITLLVM.cpp
+++ /dev/null
@@ -1,919 +0,0 @@
-#include "util/types.hpp"
-#include "util/sysinfo.hpp"
-#include "Utilities/Thread.h"
-#include "JIT.h"
-#include "StrFmt.h"
-#include "File.h"
-#include "util/logs.hpp"
-#include "mutex.h"
-#include "util/vm.hpp"
-#include "util/asm.hpp"
-#include "Crypto/unzip.h"
-
-#include <charconv>
-
-LOG_CHANNEL(jit_log, "JIT");
-
-#ifdef LLVM_AVAILABLE
-
-#include <unordered_map>
-
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#pragma GCC diagnostic ignored "-Wredundant-decls"
-#pragma GCC diagnostic ignored "-Weffc++"
-#pragma GCC diagnostic ignored "-Wmissing-noreturn"
-#endif
-#include <llvm/Support/CodeGen.h>
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/TargetParser/Host.h"
-#include "llvm/ExecutionEngine/ExecutionEngine.h"
-#include "llvm/ExecutionEngine/RTDyldMemoryManager.h"
-#include "llvm/ExecutionEngine/ObjectCache.h"
-#include "llvm/ExecutionEngine/JITEventListener.h"
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/Object/SymbolSize.h"
-#ifdef _MSC_VER
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
-
-#ifdef ARCH_ARM64
-#include "Emu/CPU/Backends/AArch64/AArch64Common.h"
-#endif
-
-const bool jit_initialize = []() -> bool
-{
-	llvm::InitializeNativeTarget();
-	llvm::InitializeNativeTargetAsmPrinter();
-	llvm::InitializeNativeTargetAsmParser();
-	LLVMLinkInMCJIT();
-	return true;
-}();
-
-[[noreturn]] static void null(const char* name)
-{
-	fmt::throw_exception("Null function: %s", name);
-}
-
-namespace vm
-{
-	extern u8* const g_sudo_addr;
-}
-
-static shared_mutex null_mtx;
-
-static std::unordered_map<std::string, u64> null_funcs;
-
-static u64 make_null_function(const std::string& name)
-{
-	if (name.starts_with("__0x"))
-	{
-		u32 addr = -1;
-		auto res = std::from_chars(name.c_str() + 4, name.c_str() + name.size(), addr, 16);
-
-		if (res.ec == std::errc() && res.ptr == name.c_str() + name.size() && addr < 0x8000'0000)
-		{
-			fmt::throw_exception("Unhandled symbols cementing! (name='%s'", name);
-		}
-	}
-
-	std::lock_guard lock(null_mtx);
-
-	if (u64& func_ptr = null_funcs[name]) [[likely]]
-	{
-		// Already exists
-		return func_ptr;
-	}
-	else
-	{
-		using namespace asmjit;
-
-		// Build a "null" function that contains its name
-		const auto func = build_function_asm<void (*)()>("NULL", [&](native_asm& c, auto& args)
-		{
-#if defined(ARCH_X64)
-			Label data = c.newLabel();
-			c.lea(args[0], x86::qword_ptr(data, 0));
-			c.jmp(Imm(&null));
-			c.align(AlignMode::kCode, 16);
-			c.bind(data);
-
-			// Copy function name bytes
-			for (char ch : name)
-				c.db(ch);
-			c.db(0);
-			c.align(AlignMode::kData, 16);
-#else
-			// AArch64 implementation
-			Label data = c.newLabel();
-			Label jump_address = c.newLabel();
-			c.ldr(args[0], arm::ptr(data, 0));
-			c.ldr(a64::x14, arm::ptr(jump_address, 0));
-			c.br(a64::x14);
-
-			// Data frame
-			c.align(AlignMode::kCode, 16);
-			c.bind(jump_address);
-			c.embedUInt64(reinterpret_cast<u64>(&null));
-
-			c.align(AlignMode::kData, 16);
-			c.bind(data);
-			c.embed(name.c_str(), name.size());
-			c.embedUInt8(0U);
-			c.align(AlignMode::kData, 16);
-#endif
-		});
-
-		func_ptr = reinterpret_cast<u64>(func);
-		return func_ptr;
-	}
-}
-
-struct JITAnnouncer : llvm::JITEventListener
-{
-	void notifyObjectLoaded(u64, const llvm::object::ObjectFile& obj, const llvm::RuntimeDyld::LoadedObjectInfo& info) override
-	{
-		using namespace llvm;
-
-		object::OwningBinary<object::ObjectFile> debug_obj_ = info.getObjectForDebug(obj);
-		if (!debug_obj_.getBinary())
-		{
-#ifdef __linux__
-			jit_log.error("LLVM: Failed to announce JIT events (no debug object)");
-#endif
-			return;
-		}
-
-		const object::ObjectFile& debug_obj = *debug_obj_.getBinary();
-
-		for (const auto& [sym, size] : computeSymbolSizes(debug_obj))
-		{
-			Expected<object::SymbolRef::Type> type_ = sym.getType();
-			if (!type_ || *type_ != object::SymbolRef::ST_Function)
-				continue;
-
-			Expected<StringRef> name = sym.getName();
-			if (!name)
-				continue;
-
-			Expected<u64> addr = sym.getAddress();
-			if (!addr)
-				continue;
-
-			jit_announce(*addr, size, {name->data(), name->size()});
-		}
-	}
-};
-
-// Simple memory manager
-struct MemoryManager1 : llvm::RTDyldMemoryManager
-{
-	// 256 MiB for code or data
-	static constexpr u64 c_max_size = 0x1000'0000;
-
-	// Allocation unit (2M)
-	static constexpr u64 c_page_size = 2 * 1024 * 1024;
-
-	// Reserve 256 MiB blocks
-	void* m_code_mems = nullptr;
-	void* m_data_ro_mems = nullptr;
-	void* m_data_rw_mems = nullptr;
-
-	u64 code_ptr = 0;
-	u64 data_ro_ptr = 0;
-	u64 data_rw_ptr = 0;
-
-	// First fallback for non-existing symbols
-	// May be a memory container internally
-	std::function<u64(const std::string&)> m_symbols_cement;
-
-	MemoryManager1(std::function<u64(const std::string&)> symbols_cement = {}) noexcept
-		: m_symbols_cement(std::move(symbols_cement))
-	{
-		auto ptr = reinterpret_cast<u8*>(utils::memory_reserve(c_max_size * 3));
-		m_code_mems = ptr;
-		// ptr += c_max_size;
-		// m_data_ro_mems = ptr;
-		 ptr += c_max_size;
-		m_data_rw_mems = ptr;
-	}
-
-	MemoryManager1(const MemoryManager1&) = delete;
-
-	MemoryManager1& operator=(const MemoryManager1&) = delete;
-
-	~MemoryManager1() override
-	{
-		// Hack: don't release to prevent reuse of address space, see jit_announce
-		// constexpr auto how_much = [](u64 pos) { return utils::align(pos, pos < c_page_size ? c_page_size / 4 : c_page_size); };
-		// utils::memory_decommit(m_code_mems, how_much(code_ptr));
-		// utils::memory_decommit(m_data_ro_mems, how_much(data_ro_ptr));
-		// utils::memory_decommit(m_data_rw_mems, how_much(data_rw_ptr));
-		utils::memory_decommit(m_code_mems, c_max_size * 3);
-	}
-
-	llvm::JITSymbol findSymbol(const std::string& name) override
-	{
-		u64 addr = RTDyldMemoryManager::getSymbolAddress(name);
-
-		if (!addr && m_symbols_cement)
-		{
-			addr = m_symbols_cement(name);
-		}
-
-		if (!addr)
-		{
-			addr = make_null_function(name);
-
-			if (!addr)
-			{
-				fmt::throw_exception("Failed to link '%s'", name);
-			}
-		}
-
-		return {addr, llvm::JITSymbolFlags::Exported};
-	}
-
-	u8* allocate(u64& alloc_pos, void* block, uptr size, u64 align, utils::protection prot)
-	{
-		align = align ? align : 16;
- 
-		const u64 sizea = utils::align(size, align);
-
-		if (!size || align > c_page_size || sizea > c_max_size || sizea < size)
-		{
-			jit_log.fatal("Unsupported size/alignment (size=0x%x, align=0x%x)", size, align);
-			return nullptr;
-		}
-
-		u64 oldp = alloc_pos;
-
-		u64 olda = utils::align(oldp, align);
-
-		ensure(olda >= oldp);
-		ensure(olda < ~sizea);
-
-		u64 newp = olda + sizea;
-
-		if ((newp - 1) / c_max_size != (oldp - 1) / c_max_size)
-		{
-			constexpr usz num_of_allocations = 1;
-
-			if ((newp - 1) / c_max_size > num_of_allocations)
-			{
-				// Allocating more than one region does not work for relocations, needs more robust solution
-				fmt::throw_exception("Out of memory (size=0x%x, align=0x%x)", size, align);
-			}
-		}
-
-		// Update allocation counter
-		alloc_pos = newp;
-
-		constexpr usz page_quarter = c_page_size / 4;
-
-		// Optimization: split the first allocation to 512 KiB for single-module compilers
-		if (oldp < c_page_size && align < page_quarter && (std::min(newp, c_page_size) - 1) / page_quarter != (oldp - 1) / page_quarter)
-		{
-			const u64 pagea = utils::align(oldp, page_quarter);
-			const u64 psize = utils::align(std::min(newp, c_page_size) - pagea, page_quarter);
-			utils::memory_commit(reinterpret_cast<u8*>(block) + (pagea % c_max_size), psize, prot);
-
-			// Advance
-			oldp = pagea + psize;
-		}
-
-		if ((newp - 1) / c_page_size != (oldp - 1) / c_page_size)
-		{
-			// Allocate pages on demand
-			const u64 pagea = utils::align(oldp, c_page_size);
-			const u64 psize = utils::align(newp - pagea, c_page_size);
-			utils::memory_commit(reinterpret_cast<u8*>(block) + (pagea % c_max_size), psize, prot);
-		}
-
-		return reinterpret_cast<u8*>(block) + (olda % c_max_size);
-	}
-
-	u8* allocateCodeSection(uptr size, uint align, uint /*sec_id*/, llvm::StringRef /*sec_name*/) override
-	{
-		return allocate(code_ptr, m_code_mems, size, align, utils::protection::wx);
-	}
-
-	u8* allocateDataSection(uptr size, uint align, uint /*sec_id*/, llvm::StringRef /*sec_name*/, bool is_ro) override
-	{
-		if (is_ro)
-		{
-			// Disabled
-			//return allocate(data_ro_ptr, m_data_ro_mems, size, align, utils::protection::rw);
-		}
-
-		return allocate(data_rw_ptr, m_data_rw_mems, size, align, utils::protection::rw);
-	}
-
-	bool finalizeMemory(std::string* = nullptr) override
-	{
-		return false;
-	}
-
-	void registerEHFrames(u8*, u64, usz) override
-	{
-	}
-
-	void deregisterEHFrames() override
-	{
-	}
-};
-
-// Simple memory manager
-struct MemoryManager2 : llvm::RTDyldMemoryManager
-{
-	// First fallback for non-existing symbols
-	// May be a memory container internally
-	std::function<u64(const std::string&)> m_symbols_cement;
-
-	MemoryManager2(std::function<u64(const std::string&)> symbols_cement = {}) noexcept
-		: m_symbols_cement(std::move(symbols_cement))
-	{
-	}
-
-	~MemoryManager2() override
-	{
-	}
-
-	llvm::JITSymbol findSymbol(const std::string& name) override
-	{
-		u64 addr = RTDyldMemoryManager::getSymbolAddress(name);
-
-		if (!addr && m_symbols_cement)
-		{
-			addr = m_symbols_cement(name);
-		}
-
-		if (!addr)
-		{
-			addr = make_null_function(name);
-
-			if (!addr)
-			{
-				fmt::throw_exception("Failed to link '%s' (MM2)", name);
-			}
-		}
-
-		return {addr, llvm::JITSymbolFlags::Exported};
-	}
-
-	u8* allocateCodeSection(uptr size, uint align, uint /*sec_id*/, llvm::StringRef /*sec_name*/) override
-	{
-		return jit_runtime::alloc(size, align, true);
-	}
-
-	u8* allocateDataSection(uptr size, uint align, uint /*sec_id*/, llvm::StringRef /*sec_name*/, bool /*is_ro*/) override
-	{
-		return jit_runtime::alloc(size, align, false);
-	}
-
-	bool finalizeMemory(std::string* = nullptr) override
-	{
-		return false;
-	}
-
-	void registerEHFrames(u8*, u64, usz) override
-	{
-	}
-
-	void deregisterEHFrames() override
-	{
-	}
-};
-
-// Helper class
-class ObjectCache final : public llvm::ObjectCache
-{
-	const std::string& m_path;
-	const std::add_pointer_t<jit_compiler> m_compiler = nullptr;
-
-public:
-	ObjectCache(const std::string& path, jit_compiler* compiler = nullptr)
-		: m_path(path)
-		, m_compiler(compiler)
-	{
-	}
-
-	~ObjectCache() override = default;
-
-	void notifyObjectCompiled(const llvm::Module* _module, llvm::MemoryBufferRef obj) override
-	{
-		std::string name = m_path;
-
-		name.append(_module->getName());
-		//fs::file(name, fs::rewrite).write(obj.getBufferStart(), obj.getBufferSize());
-		name.append(".gz");
-
-		if (!obj.getBufferSize())
-		{
-			jit_log.error("LLVM: Nothing to write: %s", name);
-			return;
-		}
-
-		ensure(m_compiler);
-
-		fs::pending_file module_file;
-
-		if (!module_file.open((name)))
-		{
-			jit_log.error("LLVM: Failed to create module file: %s (%s)", name, fs::g_tls_error);
-			return;
-		}
-
-		// Bold assumption about upper limit of space consumption
-		const usz max_size = obj.getBufferSize() * 4;
-
-		if (!m_compiler->add_sub_disk_space(0 - max_size))
-		{
-			jit_log.error("LLVM: Failed to create module file: %s (not enough disk space left)", name);
-			return;
-		}
-
-		if (!zip(obj.getBufferStart(), obj.getBufferSize(), module_file.file))
-		{
-			jit_log.error("LLVM: Failed to compress module: %s", std::string(_module->getName()));
-			return;
-		}
-
-		jit_log.trace("LLVM: Created module: %s", std::string(_module->getName()));
-
-		// Restore space that was overestimated
-		ensure(m_compiler->add_sub_disk_space(max_size - module_file.file.size()));
-		module_file.commit();
-	}
-
-	static std::unique_ptr<llvm::MemoryBuffer> load(const std::string& path)
-	{
-		if (fs::file cached{path + ".gz", fs::read})
-		{
-			const std::vector<u8> cached_data = cached.to_vector<u8>();
-
-			if (cached_data.empty()) [[unlikely]]
-			{
-				return nullptr;
-			}
-
-			const std::vector<u8> out = unzip(cached_data);
-
-			if (out.empty())
-			{
-				jit_log.error("LLVM: Failed to unzip module: '%s'", path);
-				return nullptr;
-			}
-
-			auto buf = llvm::WritableMemoryBuffer::getNewUninitMemBuffer(out.size());
-			std::memcpy(buf->getBufferStart(), out.data(), out.size());
-			return buf;
-		}
-
-		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;
-		}
-
-		return nullptr;
-	}
-
-	std::unique_ptr<llvm::MemoryBuffer> getObject(const llvm::Module* _module) override
-	{
-		std::string path = m_path;
-		path.append(_module->getName().data());
-
-		if (auto buf = load(path))
-		{
-			jit_log.notice("LLVM: Loaded module: %s", _module->getName().data());
-			return buf;
-		}
-
-		return nullptr;
-	}
-};
-
-std::string jit_compiler::cpu(const std::string& _cpu)
-{
-	std::string m_cpu = _cpu;
-
-	if (m_cpu.empty())
-	{
-		m_cpu = llvm::sys::getHostCPUName().str();
-
-		if (m_cpu == "generic")
-		{
-			// Try to detect a best match based on other criteria
-			m_cpu = fallback_cpu_detection();
-		}
-
-		if (m_cpu == "sandybridge" ||
-			m_cpu == "ivybridge" ||
-			m_cpu == "haswell" ||
-			m_cpu == "broadwell" ||
-			m_cpu == "skylake" ||
-			m_cpu == "skylake-avx512" ||
-			m_cpu == "cascadelake" ||
-			m_cpu == "cooperlake" ||
-			m_cpu == "cannonlake" ||
-			m_cpu == "icelake" ||
-			m_cpu == "icelake-client" ||
-			m_cpu == "icelake-server" ||
-			m_cpu == "tigerlake" ||
-			m_cpu == "rocketlake" ||
-			m_cpu == "alderlake" ||
-			m_cpu == "raptorlake" ||
-			m_cpu == "meteorlake")
-		{
-			// Downgrade if AVX is not supported by some chips
-			if (!utils::has_avx())
-			{
-				m_cpu = "nehalem";
-			}
-		}
-
-		if (m_cpu == "skylake-avx512" ||
-			m_cpu == "cascadelake" ||
-			m_cpu == "cooperlake" ||
-			m_cpu == "cannonlake" ||
-			m_cpu == "icelake" ||
-			m_cpu == "icelake-client" ||
-			m_cpu == "icelake-server" ||
-			m_cpu == "tigerlake" ||
-			m_cpu == "rocketlake")
-		{
-			// Downgrade if AVX-512 is disabled or not supported
-			if (!utils::has_avx512())
-			{
-				m_cpu = "skylake";
-			}
-		}
-
-		if (m_cpu == "znver1" && utils::has_clwb())
-		{
-			// Upgrade
-			m_cpu = "znver2";
-		}
-
-		if ((m_cpu == "znver3" || m_cpu == "goldmont" || m_cpu == "alderlake" || m_cpu == "raptorlake" || m_cpu == "meteorlake") && utils::has_avx512_icl())
-		{
-			// Upgrade
-			m_cpu = "icelake-client";
-		}
-
-		if (m_cpu == "goldmont" && utils::has_avx2())
-		{
-			// Upgrade
-			m_cpu = "alderlake";
-		}
-	}
-
-	return m_cpu;
-}
-
-std::string jit_compiler::triple1()
-{
-#if defined(_WIN32)
-	return llvm::Triple::normalize(llvm::sys::getProcessTriple());
-#elif defined(__APPLE__) && defined(ARCH_X64)
-	return llvm::Triple::normalize("x86_64-unknown-linux-gnu");
-#elif (defined(__ANDROID__) || defined(__APPLE__)) && defined(ARCH_ARM64)
-	return llvm::Triple::normalize("aarch64-unknown-linux-android"); // Set environment to android to reserve x18
-#elif defined(__ANDROID__) && defined(ARCH_X64)
-	return llvm::Triple::normalize("x86_64-unknown-linux-android");
-#else
-	return llvm::Triple::normalize(llvm::sys::getProcessTriple());
-#endif
-}
-
-std::string jit_compiler::triple2()
-{
-#if defined(_WIN32) && defined(ARCH_X64)
-	return llvm::Triple::normalize("x86_64-unknown-linux-gnu");
-#elif defined(_WIN32) && defined(ARCH_ARM64)
-	return llvm::Triple::normalize("aarch64-unknown-linux-gnu");
-#elif defined(__APPLE__) && defined(ARCH_X64)
-	return llvm::Triple::normalize("x86_64-unknown-linux-gnu");
-#elif (defined(__ANDROID__) || defined(__APPLE__)) && defined(ARCH_ARM64)
-	return llvm::Triple::normalize("aarch64-unknown-linux-android"); // Set environment to android to reserve x18
-#elif defined(__ANDROID__) && defined(ARCH_X64)
-	return llvm::Triple::normalize("x86_64-unknown-linux-android"); // Set environment to android to reserve x18
-#else
-	return llvm::Triple::normalize(llvm::sys::getProcessTriple());
-#endif
-}
-
-bool jit_compiler::add_sub_disk_space(ssz space)
-{
-	if (space >= 0)
-	{
-		ensure(m_disk_space.fetch_add(space) < ~static_cast<usz>(space));
-		return true;
-	}
-
-	return m_disk_space.fetch_op([sub_size = static_cast<usz>(0 - space)](usz& val)
-	{
-		if (val >= sub_size)
-		{
-			val -= sub_size;
-			return true;
-		}
-
-		return false;
-	}).second;
-}
-
-jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, const std::string& _cpu, u32 flags, std::function<u64(const std::string&)> symbols_cement) noexcept
-	: m_context(new llvm::LLVMContext)
-	, m_cpu(cpu(_cpu))
-{
-	[[maybe_unused]] static const bool s_install_llvm_error_handler = []()
-	{
-		llvm::remove_fatal_error_handler();
-		llvm::install_fatal_error_handler([](void*, const char* msg, bool)
-		{
-			const std::string_view out = msg ? msg : "";
-			fmt::throw_exception("LLVM Emergency Exit Invoked: '%s'", out);
-		}, nullptr);
-
-		return true;
-	}();
-
-	std::string result;
-
-	auto null_mod = std::make_unique<llvm::Module> ("null_", *m_context);
-	null_mod->setTargetTriple(jit_compiler::triple1());
-
-	std::unique_ptr<llvm::RTDyldMemoryManager> mem;
-
-	if (_link.empty())
-	{
-		// Auxiliary JIT (does not use custom memory manager, only writes the objects)
-		if (flags & 0x1)
-		{
-			mem = std::make_unique<MemoryManager1>(std::move(symbols_cement));
-		}
-		else
-		{
-			mem = std::make_unique<MemoryManager2>(std::move(symbols_cement));
-			null_mod->setTargetTriple(jit_compiler::triple2());
-		}
-	}
-	else
-	{
-		mem = std::make_unique<MemoryManager1>(std::move(symbols_cement));
-	}
-
-	{
-		m_engine.reset(llvm::EngineBuilder(std::move(null_mod))
-			.setErrorStr(&result)
-			.setEngineKind(llvm::EngineKind::JIT)
-			.setMCJITMemoryManager(std::move(mem))
-			.setOptLevel(llvm::CodeGenOptLevel::Aggressive)
-			.setCodeModel(flags & 0x2 ? llvm::CodeModel::Large : llvm::CodeModel::Small)
-#ifdef __APPLE__
-			//.setCodeModel(llvm::CodeModel::Large)
-#endif
-			.setRelocationModel(llvm::Reloc::Model::PIC_)
-			.setMCPU(m_cpu)
-			.create());
-	}
-
-	if (!_link.empty())
-	{
-		for (auto&& [name, addr] : _link)
-		{
-			m_engine->updateGlobalMapping(name, addr);
-		}
-	}
-
-	if (!_link.empty() || !(flags & 0x1))
-	{
-		m_engine->RegisterJITEventListener(llvm::JITEventListener::createIntelJITEventListener());
-		m_engine->RegisterJITEventListener(new JITAnnouncer);
-	}
-
-	if (!m_engine)
-	{
-		fmt::throw_exception("LLVM: Failed to create ExecutionEngine: %s", result);
-	}
-
-	fs::device_stat stats{};
-
-	if (fs::statfs(fs::get_cache_dir(), stats))
-	{
-		m_disk_space = stats.avail_free / 4;
-	}
-}
-
-jit_compiler& jit_compiler::operator=(thread_state s) noexcept
-{
-	if (s == thread_state::destroying_context)
-	{
-		// Release resources explicitly
-		m_engine.reset();
-		m_context.reset();
-	}
-
-	return *this;
-}
-
-jit_compiler::~jit_compiler() noexcept
-{
-}
-
-void jit_compiler::add(std::unique_ptr<llvm::Module> _module, const std::string& path)
-{
-	ObjectCache cache{path, this};
-	m_engine->setObjectCache(&cache);
-
-	const auto ptr = _module.get();
-	m_engine->addModule(std::move(_module));
-	m_engine->generateCodeForModule(ptr);
-	m_engine->setObjectCache(nullptr);
-
-	for (auto& func : ptr->functions())
-	{
-		// Delete IR to lower memory consumption
-		func.deleteBody();
-	}
-}
-
-void jit_compiler::add(std::unique_ptr<llvm::Module> _module)
-{
-	const auto ptr = _module.get();
-	m_engine->addModule(std::move(_module));
-	m_engine->generateCodeForModule(ptr);
-
-	for (auto& func : ptr->functions())
-	{
-		// Delete IR to lower memory consumption
-		func.deleteBody();
-	}
-}
-
-bool jit_compiler::add(const std::string& path)
-{
-	auto cache = ObjectCache::load(path);
-
-	if (!cache)
-	{
-		jit_log.error("ObjectCache: Failed to read file. (path='%s', error=%s)", path, fs::g_tls_error);
-		return false;
-	}
-
-	if (auto object_file = llvm::object::ObjectFile::createObjectFile(*cache))
-	{
-		m_engine->addObjectFile(llvm::object::OwningBinary<llvm::object::ObjectFile>(std::move(*object_file), std::move(cache)));
-		jit_log.trace("ObjectCache: Successfully added %s", path);
-		return true;
-	}
-	else
-	{
-		jit_log.error("ObjectCache: Adding failed: %s", path);
-		return false;
-	}
-}
-
-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::update_global_mapping(const std::string& name, u64 addr)
-{
-	m_engine->updateGlobalMapping(name, addr);
-}
-
-void jit_compiler::fin()
-{
-	m_engine->finalizeObject();
-}
-
-u64 jit_compiler::get(const std::string& name)
-{
-	return m_engine->getGlobalValueAddress(name);
-}
-
-const char * fallback_cpu_detection()
-{
-#if defined(ARCH_X64)
-	// If we got here we either have a very old and outdated CPU or a new CPU that has not been seen by LLVM yet.
-	const std::string brand = utils::get_cpu_brand();
-	const auto family = utils::get_cpu_family();
-	const auto model = utils::get_cpu_model();
-
-	jit_log.error("CPU wasn't identified by LLVM, brand = %s, family = 0x%x, model = 0x%x", brand, family, model);
-
-	if (brand.starts_with("AMD"))
-	{
-		switch (family)
-		{
-		case 0x10:
-		case 0x12: // Unimplemented in LLVM
-			return "amdfam10";
-		case 0x15:
-			// Bulldozer class, includes piledriver, excavator, steamroller, etc
-			return utils::has_avx2() ? "bdver4" : "bdver1";
-		case 0x17:
-		case 0x18:
-			// No major differences between znver1 and znver2, return the lesser
-			return "znver1";
-		case 0x19:
-			// Models 0-Fh are zen3 as are 20h-60h. The rest we can assume are zen4
-			return ((model >= 0x20 && model <= 0x60) || model < 0x10) ? "znver3" : "znver4";
-		case 0x1a:
-			// Only one generation in family 1a so far, zen5, which we do not support yet.
-			// Return zen4 as a workaround until the next LLVM upgrade.
-			return "znver4";
-		default:
-			// Safest guesses
-			return utils::has_avx512() ? "znver4" :
-			       utils::has_avx2()   ? "znver1" :
-			       utils::has_avx()    ? "bdver1" :
-			                             "nehalem";
-		}
-	}
-	else if (brand.find("Intel") != std::string::npos)
-	{
-		if (!utils::has_avx())
-		{
-			return "nehalem";
-		}
-		if (!utils::has_avx2())
-		{
-			return "ivybridge";
-		}
-		if (!utils::has_avx512())
-		{
-			return "skylake";
-		}
-		if (utils::has_avx512_icl())
-		{
-			return "cannonlake";
-		}
-		return "icelake-client";
-	}
-	else if (brand.starts_with("VirtualApple"))
-	{
-		// No AVX. This will change in MacOS 15+, at which point we may revise this.
-		return utils::has_avx() ? "haswell" : "nehalem";
-	}
-
-#elif defined(ARCH_ARM64)
-#ifdef ANDROID
-	static std::string s_result = []() -> std::string
-	{
-		std::string result = aarch64::get_cpu_name();
-		if (result.empty())
-		{
-			return "cortex-a78";
-		}
-
-		std::transform(result.begin(), result.end(), result.begin(), ::tolower);
-		return result;
-	}();
-
-	return s_result.c_str();
-#else
-	// TODO: Read the data from /proc/cpuinfo. ARM CPU registers are not accessible from usermode.
-	// This will be a pain when supporting snapdragon on windows but we'll cross that bridge when we get there.
-	// Require at least armv8-2a. Older chips are going to be useless anyway.
-	return "cortex-a78";
-#endif
-#endif
-
-	// Failed to guess, use generic fallback
-	return "generic";
-}
-
-#endif // LLVM_AVAILABLE
diff --git a/Utilities/StrFmt.cpp b/Utilities/StrFmt.cpp
index c628a90a8a..63eccf8883 100644
--- a/Utilities/StrFmt.cpp
+++ b/Utilities/StrFmt.cpp
@@ -2,10 +2,9 @@
 #include "StrUtil.h"
 #include "cfmt.h"
 #include "util/endian.hpp"
+#include "util/logs.hpp"
 #include "util/v128.hpp"
 
-#include <locale>
-#include <codecvt>
 #include <algorithm>
 #include <string_view>
 #include "Thread.h"
@@ -16,97 +15,44 @@
 #include <errno.h>
 #endif
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-std::string wchar_to_utf8(std::wstring_view src)
-{
 #ifdef _WIN32
+std::string wchar_to_utf8(const wchar_t *src)
+{
 	std::string utf8_string;
-	const int size = ::narrow<int>(src.size());
-	const auto tmp_size = WideCharToMultiByte(CP_UTF8, 0, src.data(), size, nullptr, 0, nullptr, nullptr);
+	const auto tmp_size = WideCharToMultiByte(CP_UTF8, 0, src, -1, nullptr, 0, nullptr, nullptr);
 	utf8_string.resize(tmp_size);
-	WideCharToMultiByte(CP_UTF8, 0, src.data(), size, utf8_string.data(), tmp_size, nullptr, nullptr);
+	WideCharToMultiByte(CP_UTF8, 0, src, -1, utf8_string.data(), tmp_size, nullptr, nullptr);
 	return utf8_string;
-#else
-	std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converter{};
-	return converter.to_bytes(src.data());
-#endif
 }
 
-std::string utf16_to_utf8(std::u16string_view src)
+std::string wchar_path_to_ansi_path(const std::wstring& src)
 {
-	std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter{};
-	return converter.to_bytes(src.data());
+	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::u16string utf8_to_utf16(std::string_view src)
+std::string utf8_path_to_ansi_path(const std::string& src)
 {
-	std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter{};
-	return converter.from_bytes(src.data());
-}
+	std::wstring buf_wide;
 
-std::wstring utf8_to_wchar(std::string_view src)
-{
-#ifdef _WIN32
-	std::wstring wchar_string;
-	const int size = ::narrow<int>(src.size());
-	const auto tmp_size = MultiByteToWideChar(CP_UTF8, 0, src.data(), size, nullptr, 0);
-	wchar_string.resize(tmp_size);
-	MultiByteToWideChar(CP_UTF8, 0, src.data(), size, wchar_string.data(), tmp_size);
-	return wchar_string;
-#else
-	std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter{};
-	return converter.from_bytes(src.data());
-#endif
-}
-#ifdef _MSC_VER
-#pragma warning(pop)
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#else
-#pragma GCC diagnostic pop
-#endif
+	// 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);
 
-#ifdef _WIN32
-std::string fmt::win_error_to_string(unsigned long error, void* module_handle)
-{
-	std::string message;
-	LPWSTR message_buffer = nullptr;
-	if (FormatMessageW((module_handle ? FORMAT_MESSAGE_FROM_HMODULE : FORMAT_MESSAGE_FROM_SYSTEM) | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS,
-			module_handle, error, 0, reinterpret_cast<LPWSTR>(&message_buffer), 0, nullptr))
-	{
-		message = fmt::format("%s (0x%x)", fmt::trim(wchar_to_utf8(message_buffer), " \t\n\r\f\v"), error);
-	}
-	else
-	{
-		message = fmt::format("0x%x", error);
-	}
-
-	if (message_buffer)
-	{
-		LocalFree(message_buffer);
-	}
-
-	return message;
-}
-
-std::string fmt::win_error_to_string(const fmt::win_error& error)
-{
-	return fmt::win_error_to_string(error.error, error.module_handle);
-}
-
-template <>
-void fmt_class_string<fmt::win_error>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%s", fmt::win_error_to_string(get_object(arg)));
+	return wchar_path_to_ansi_path(buf_wide);
 }
 #endif
 
@@ -170,132 +116,6 @@ void fmt_class_string<fmt::base57>::format(std::string& out, u64 arg)
 	}
 }
 
-fmt::base57_result fmt::base57_result::from_string(std::string_view str)
-{
-	fmt::base57_result result(str.size() / 11 * 8 + (str.size() % 11 ? 8 : 0));
-
-	// Each 11 chars of input produces 8 bytes of byte output
-	for (usz i = 0, p = 0; i < result.size; i += 8, p += 11)
-	{
-		// Load up to 8 bytes
-		const std::string_view be_value = str.substr(p);
-		be_t<u64> value = 0;
-
-		for (u64 j = 10, multiplier = 0; j != umax; j--)
-		{
-			if (multiplier == 0)
-			{
-				multiplier = 1;
-			}
-			else
-			{
-				// Do it first to avoid overflow
-				multiplier *= 57;
-			}
-
-			if (j < be_value.size())
-			{
-				auto to_val = [](u8 c) -> u64
-				{
-					if (std::isdigit(c))
-					{
-						return c - '0';
-					}
-
-					if (std::isupper(c))
-					{
-						// Omitted characters
-						if (c == 'B' || c == 'D' || c == 'I' || c == 'O')
-						{
-							return umax;
-						}
-
-						if (c > 'O')
-						{
-							c -= 4;
-						}
-						else if (c > 'I')
-						{
-							c -= 3;
-						}
-						else if (c > 'D')
-						{
-							c -= 2;
-						}
-						else if (c > 'B')
-						{
-							c--;
-						}
-
-						return c - 'A' + 10;
-					}
-
-					if (std::islower(c))
-					{
-						// Omitted characters
-						if (c == 'l')
-						{
-							return umax;
-						}
-
-						if (c > 'l')
-						{
-							c--;
-						}
-
-						return c - 'a' + 10 + 22;
-					}
-
-					return umax;
-				};
-
-				const u64 res = to_val(be_value[j]);
-
-				if (res == umax)
-				{
-					// Invalid input character
-					result = {};
-					break;
-				}
-
-				if (u64{umax} / multiplier < res)
-				{
-					// Overflow
-					result = {};
-					break;
-				}
-
-				const u64 addend = res * multiplier;
-
-				if (~value < addend)
-				{
-					// Overflow
-					result = {};
-					break;
-				}
-
-				value += addend;
-			}
-		}
-
-		if (!result.size)
-		{
-			break;
-		}
-
-		if (result.size - i < sizeof(value))
-		{
-			std::memcpy(result.memory.get() + i, &value, result.size - i);
-		}
-		else
-		{
-			std::memcpy(result.memory.get() + i, &value, sizeof(value));
-		}
-	}
-
-	return result;
-}
-
 void fmt_class_string<const void*>::format(std::string& out, u64 arg)
 {
 	fmt::append(out, "%p", arg);
@@ -313,11 +133,6 @@ void fmt_class_string<const char*>::format(std::string& out, u64 arg)
 	}
 }
 
-void fmt_class_string<const wchar_t*>::format(std::string& out, u64 arg)
-{
-	out += wchar_to_utf8(reinterpret_cast<const wchar_t*>(arg));
-}
-
 template <>
 void fmt_class_string<std::string>::format(std::string& out, u64 arg)
 {
@@ -358,33 +173,6 @@ void fmt_class_string<std::vector<char8_t>>::format(std::string& out, u64 arg)
 	out.append(obj.cbegin(), obj.cend());
 }
 
-template <>
-void fmt_class_string<fmt::buf_to_hexstring>::format(std::string& out, u64 arg)
-{
-	const auto& _arg = get_object(arg);
-	const std::vector<u8> buf(_arg.buf, _arg.buf + _arg.len);
-	out.reserve(out.size() + (buf.size() * 3));
-	static constexpr char hex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-	const bool use_linebreak = _arg.line_length > 0;
-
-	for (usz index = 0; index < buf.size(); index++)
-	{
-		if (index > 0)
-		{
-			if (use_linebreak && (index % _arg.line_length) == 0)
-				out += '\n';
-			else
-				out += ' ';
-		}
-
-		if (_arg.with_prefix)
-			out += "0x";
-
-		out += hex[buf[index] >> 4];
-		out += hex[buf[index] & 15];
-	}
-}
-
 void format_byte_array(std::string& out, const uchar* data, usz size)
 {
 	if (!size)
@@ -539,67 +327,22 @@ void fmt_class_string<s128>::format(std::string& out, u64 arg)
 }
 
 template <>
-void fmt_class_string<std::source_location>::format(std::string& out, u64 arg)
+void fmt_class_string<src_loc>::format(std::string& out, u64 arg)
 {
-	const std::source_location& loc = get_object(arg);
+	const src_loc& loc = get_object(arg);
 
-	auto is_valid = [](auto num)
+	if (loc.col != umax)
 	{
-		return num && num != umax;
-	};
-
-	const bool has_line = is_valid(loc.line());
-
-	if (has_line && is_valid(loc.column()))
-	{
-		fmt::append(out, "\n(in file %s:%u[:%u]", loc.file_name(), loc.line(), loc.column());
+		fmt::append(out, "\n(in file %s:%u[:%u]", loc.file, loc.line, loc.col);
 	}
-	else if (has_line)
-	{
-		fmt::append(out, "\n(in file %s:%u", loc.file_name(), loc.line());
-	}
-	// Let's not care about such useless corner cases
-	// else if (is_valid(loc.column())
 	else
 	{
-		fmt::append(out, "\n(in file %s", loc.file_name());
+		fmt::append(out, "\n(in file %s:%u", loc.file, loc.line);
 	}
 
-	if (std::string_view full_func{loc.function_name() ? loc.function_name() : ""}; !full_func.empty())
+	if (loc.func && *loc.func)
 	{
-		// Remove useless disambiguators
-		std::string func = fmt::replace_all(std::string(full_func), {
-			{"struct ", ""},
-			{"class ", ""},
-			{"enum ", ""},
-			{"typename ", ""},
-#ifdef _MSC_VER
-			{"__cdecl ", ""},
-#endif
-			{"unsigned long long", "ullong"},
-			//{"unsigned long", "ulong"}, // ullong
-			{"unsigned int", "uint"},
-			{"unsigned short", "ushort"},
-			{"unsigned char", "uchar"}});
-
-		// Remove function argument signature for long names
-		for (usz index = func.find_first_of('('); index != umax && func.size() >= 100u; index = func.find_first_of('(', index))
-		{
-			// Operator() function
-			if (func.compare(0, 3, "()("sv) == 0 || func.compare(0, 3, "() "sv))
-			{
-				if (usz not_space = func.find_first_not_of(' ', index + 2); not_space != umax && func[not_space] == '(')
-				{
-					index += 2;
-					continue;
-				}
-			}
-
-			func = func.substr(0, index) + "()";
-			break;
-		}
-
-		fmt::append(out, ", in function '%s')", func);
+		fmt::append(out, ", in function %s)", loc.func);
 	}
 	else
 	{
@@ -610,58 +353,26 @@ void fmt_class_string<std::source_location>::format(std::string& out, u64 arg)
 #ifdef _WIN32
 	if (DWORD error = GetLastError())
 	{
-		fmt::append(out, " (error=%s)", error, fmt::win_error_to_string(error));
+		fmt::append(out, " (e=0x%08x[%u])", error, error);
 	}
 #else
 	if (int error = errno)
 	{
-		fmt::append(out, " (errno=%d=%s)", error, strerror(errno));
+		fmt::append(out, " (errno=%d)", error);
 	}
 #endif
 }
 
 namespace fmt
 {
-	[[noreturn]] void raw_verify_error(std::source_location loc, const char8_t* msg, usz object)
+	[[noreturn]] void raw_verify_error(const src_loc& loc, const char8_t* msg)
 	{
 		std::string out;
-		fmt::append(out, "%s (object: 0x%x)%s", msg ? msg : u8"Verification failed", object, loc);
+		fmt::append(out, "%s%s", msg ? msg : u8"Verification failed", loc);
 		thread_ctrl::emergency_exit(out);
 	}
 
-	[[noreturn]] void raw_range_error(std::source_location loc, std::string_view index, usz container_size)
-	{
-		std::string out;
-
-		if (container_size != umax)
-		{
-			fmt::append(out, "Range check failed (index: %s, container_size: %u)%s", index, container_size, loc);
-		}
-		else
-		{
-			fmt::append(out, "Range check failed (index: %s)%s", index, loc);
-		}
-
-		thread_ctrl::emergency_exit(out);
-	}
-
-	[[noreturn]] void raw_range_error(std::source_location loc, usz index, usz container_size)
-	{
-		std::string out;
-
-		if (container_size != umax)
-		{
-			fmt::append(out, "Range check failed (index: %u, container_size: %u)%s", index, container_size, loc);
-		}
-		else
-		{
-			fmt::append(out, "Range check failed (index: %u)%s", index, loc);
-		}
-
-		thread_ctrl::emergency_exit(out);
-	}
-
-	[[noreturn]] void raw_throw_exception(std::source_location loc, const char* fmt, const fmt_type_info* sup, const u64* args)
+	[[noreturn]] void raw_throw_exception(const src_loc& loc, const char* fmt, const fmt_type_info* sup, const u64* args)
 	{
 		std::string out;
 		raw_append(out, fmt, sup, args);
@@ -714,19 +425,18 @@ struct fmt::cfmt_src
 	{
 // Hack: use known function pointers to determine type
 #define TYPE(type) \
-		if (sup[extra].fmt_string == &fmt_class_string<type>::format) return sizeof(type);
+	if (sup[extra].fmt_string == &fmt_class_string<type>::format) return sizeof(type);
 
 		TYPE(int);
 		TYPE(llong);
 		TYPE(schar);
 		TYPE(short);
-		if constexpr (std::is_signed_v<char>) TYPE(char);
+		if (std::is_signed<char>::value) TYPE(char);
 		TYPE(long);
+		TYPE(u128);
 		TYPE(s128);
 
 #undef TYPE
-		if (sup[extra].fmt_string == &fmt_class_string<u128>::format)
-			return -1;
 
 		return 0;
 	}
@@ -748,12 +458,6 @@ void fmt::raw_append(std::string& out, const char* fmt, const fmt_type_info* sup
 
 std::string fmt::replace_all(std::string_view src, std::string_view from, std::string_view to, usz count)
 {
-	if (src.empty())
-		return {};
-
-	if (from.empty() || count == 0)
-		return std::string(src);
-
 	std::string target;
 	target.reserve(src.size() + to.size());
 
@@ -823,38 +527,17 @@ std::vector<std::string> fmt::split(std::string_view source, std::initializer_li
 	return result;
 }
 
-std::string fmt::trim(const std::string& source, std::string_view values)
+std::string fmt::trim(const std::string& source, const std::string& values)
 {
-	const usz begin = source.find_first_not_of(values);
+	usz begin = source.find_first_not_of(values);
 
 	if (begin == source.npos)
 		return {};
 
-	const usz end = source.find_last_not_of(values);
-
-	if (end == source.npos)
-		return source.substr(begin);
-
-	return source.substr(begin, end + 1 - begin);
+	return source.substr(begin, source.find_last_not_of(values) + 1);
 }
 
-std::string fmt::trim_front(const std::string& source, std::string_view values)
-{
-	const usz begin = source.find_first_not_of(values);
-
-	if (begin == source.npos)
-		return {};
-
-	return source.substr(begin);
-}
-
-void fmt::trim_back(std::string& source, std::string_view values)
-{
-	const usz index = source.find_last_not_of(values);
-	source.resize(index + 1);
-}
-
-std::string fmt::to_upper(std::string_view string)
+std::string fmt::to_upper(const std::string& string)
 {
 	std::string result;
 	result.resize(string.size());
@@ -862,7 +545,7 @@ std::string fmt::to_upper(std::string_view string)
 	return result;
 }
 
-std::string fmt::to_lower(std::string_view string)
+std::string fmt::to_lower(const std::string& string)
 {
 	std::string result;
 	result.resize(string.size());
@@ -870,17 +553,41 @@ std::string fmt::to_lower(std::string_view string)
 	return result;
 }
 
-std::string fmt::truncate(std::string_view src, usz length)
+bool fmt::match(const std::string& source, const std::string& mask)
 {
-	return std::string(src.begin(), src.begin() + std::min(src.size(), length));
-}
+	usz source_position = 0, mask_position = 0;
 
-std::string get_file_extension(const std::string& file_path)
-{
-	if (usz dotpos = file_path.find_last_of('.'); dotpos != std::string::npos && dotpos + 1 < file_path.size())
+	for (; source_position < source.size() && mask_position < mask.size(); ++mask_position, ++source_position)
 	{
-		return file_path.substr(dotpos + 1);
+		switch (mask[mask_position])
+		{
+		case '?': break;
+
+		case '*':
+			for (usz test_source_position = source_position; test_source_position < source.size(); ++test_source_position)
+			{
+				if (match(source.substr(test_source_position), mask.substr(mask_position + 1)))
+				{
+					return true;
+				}
+			}
+			return false;
+
+		default:
+			if (source[source_position] != mask[mask_position])
+			{
+				return false;
+			}
+
+			break;
+		}
 	}
 
-	return {};
+	if (source_position != source.size())
+		return false;
+
+	if (mask_position != mask.size())
+		return false;
+
+	return true;
 }
diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h
index 5eba199e26..747d01918d 100644
--- a/Utilities/StrFmt.h
+++ b/Utilities/StrFmt.h
@@ -8,21 +8,9 @@ namespace fmt
 {
 	template <typename CharT, usz N, typename... Args>
 	static std::string format(const CharT(&)[N], const Args&...);
-
-#ifdef _WIN32
-	struct win_error
-	{
-		unsigned long error{};
-		void* module_handle{};
-	};
-
-	// Get a string for a windows error (DWORD). Optionally a module HANDLE can be passed.
-	std::string win_error_to_string(unsigned long error, void* module_handle = nullptr);
-	std::string win_error_to_string(const win_error& error);
-#endif
 }
 
-template <typename T>
+template <typename T, typename = void>
 struct fmt_unveil
 {
 	static_assert(sizeof(T) > 0, "fmt_unveil<> error: incomplete type");
@@ -54,8 +42,7 @@ struct fmt_unveil
 };
 
 template <typename T>
-	requires(std::is_integral_v<T> && sizeof(T) <= 8 && alignof(T) <= 8)
-struct fmt_unveil<T>
+struct fmt_unveil<T, std::enable_if_t<std::is_integral<T>::value && sizeof(T) <= 8 && alignof(T) <= 8>>
 {
 	using type = T;
 
@@ -66,8 +53,7 @@ struct fmt_unveil<T>
 };
 
 template <typename T>
-	requires(std::is_floating_point_v<T> && sizeof(T) <= 8 && alignof(T) <= 8)
-struct fmt_unveil<T>
+struct fmt_unveil<T, std::enable_if_t<std::is_floating_point<T>::value && sizeof(T) <= 8 && alignof(T) <= 8>>
 {
 	using type = T;
 
@@ -79,8 +65,7 @@ struct fmt_unveil<T>
 };
 
 template <typename T>
-	requires std::is_enum_v<T>
-struct fmt_unveil<T>
+struct fmt_unveil<T, std::enable_if_t<std::is_enum<T>::value>>
 {
 	using type = T;
 
@@ -91,7 +76,7 @@ struct fmt_unveil<T>
 };
 
 template <typename T>
-struct fmt_unveil<T*>
+struct fmt_unveil<T*, void>
 {
 	using type = std::add_const_t<T>*;
 
@@ -108,7 +93,7 @@ namespace fmt
 }
 
 template <fmt::CharT T, usz N>
-struct fmt_unveil<T[N]>
+struct fmt_unveil<T[N], void>
 {
 	using type = std::add_const_t<T>*;
 
@@ -119,7 +104,7 @@ struct fmt_unveil<T[N]>
 };
 
 template <typename T, bool Se, usz Align>
-struct fmt_unveil<se_t<T, Se, Align>>
+struct fmt_unveil<se_t<T, Se, Align>, void>
 {
 	using type = typename fmt_unveil<T>::type;
 
@@ -130,7 +115,7 @@ struct fmt_unveil<se_t<T, Se, Align>>
 };
 
 // String type format provider, also type classifier (format() called if an argument is formatted as "%s")
-template <typename T>
+template <typename T, typename = void>
 struct fmt_class_string
 {
 	// Formatting function (must be explicitly specialized)
@@ -203,73 +188,39 @@ struct fmt_class_string
 };
 
 template <>
-struct fmt_class_string<const void*>
+struct fmt_class_string<const void*, void>
 {
 	static void format(std::string& out, u64 arg);
 };
 
 template <typename T>
-struct fmt_class_string<T*> : fmt_class_string<const void*>
+struct fmt_class_string<T*, void> : fmt_class_string<const void*, void>
 {
 	// Classify all pointers as const void*
 };
 
 template <>
-struct fmt_class_string<const char*>
+struct fmt_class_string<const char*, void>
 {
 	static void format(std::string& out, u64 arg);
 };
 
 template <>
-struct fmt_class_string<char*> : fmt_class_string<const char*>
+struct fmt_class_string<char*, void> : fmt_class_string<const char*>
 {
 	// Classify char* as const char*
 };
 
 template <>
-struct fmt_class_string<const char8_t*> : fmt_class_string<const char*>
+struct fmt_class_string<const char8_t*, void> : fmt_class_string<const char*>
 {
 };
 
 template <>
-struct fmt_class_string<char8_t*> : fmt_class_string<const char8_t*>
+struct fmt_class_string<char8_t*, void> : fmt_class_string<const char8_t*>
 {
 };
 
-template <>
-struct fmt_class_string<const wchar_t*>
-{
-	static void format(std::string& out, u64 arg);
-};
-
-template <>
-struct fmt_class_string<wchar_t*> : fmt_class_string<const wchar_t*>
-{
-};
-
-namespace fmt
-{
-	template <typename T>
-	concept StringConvertible = requires (T & t)
-	{
-		{ t.to_string() } -> std::convertible_to<std::string>;
-	};
-}
-
-template <fmt::StringConvertible T>
-struct fmt_class_string<T>
-{
-	static FORCE_INLINE SAFE_BUFFERS(const T&) get_object(u64 arg)
-	{
-		return *reinterpret_cast<const T*>(static_cast<uptr>(arg));
-	}
-
-	static void format(std::string& out, u64 arg)
-	{
-		out += get_object(arg).to_string();
-	}
-};
-
 namespace fmt
 {
 	// Both uchar and std::byte are allowed
@@ -278,7 +229,7 @@ namespace fmt
 }
 
 template <fmt::ByteArray T>
-struct fmt_class_string<T>
+struct fmt_class_string<T, void>
 {
 	static FORCE_INLINE SAFE_BUFFERS(const T&) get_object(u64 arg)
 	{
@@ -288,7 +239,7 @@ struct fmt_class_string<T>
 	static void format(std::string& out, u64 arg)
 	{
 		const auto& obj = get_object(arg);
-
+	
 		void format_byte_array(std::string&, const uchar*, usz);
 		format_byte_array(out, reinterpret_cast<const uchar*>(std::data(obj)), std::size(obj));
 	}
@@ -323,39 +274,20 @@ namespace fmt
 		const uchar* data;
 		usz size;
 
-		base57() = default;
-
 		template <typename T>
-		base57(const T& arg) noexcept
-			: data(reinterpret_cast<const uchar*>(std::addressof(arg)))
+		base57(const T& arg)
+			: data(reinterpret_cast<const uchar*>(&arg))
 			, size(sizeof(T))
 		{
 		}
 
-		base57(const uchar* data, usz size) noexcept
+		base57(const uchar* data, usz size)
 			: data(data)
 			, size(size)
 		{
 		}
 	};
 
-	struct base57_result : public base57
-	{
-		std::unique_ptr<uchar[]> memory;
-
-		base57_result() noexcept = default;
-		base57_result(base57_result&&) = default;
-		base57_result& operator=(base57_result&&) = default;
-
-		explicit base57_result(usz size) noexcept
-			: base57(size ? new uchar[size] : nullptr, size)
-			, memory(const_cast<uchar*>(this->data))
-		{
-		}
-
-		static base57_result from_string(std::string_view str);
-	};
-
 	template <typename... Args>
 	constexpr const fmt_type_info type_info_v[sizeof...(Args) + 1]{fmt_type_info::make<fmt_unveil_t<Args>>()...};
 
@@ -379,21 +311,22 @@ namespace fmt
 	}
 
 	// Internal exception message formatting template, must be explicitly specialized or instantiated in cpp to minimize code bloat
-	[[noreturn]] void raw_throw_exception(std::source_location, const char*, const fmt_type_info*, const u64*);
+	[[noreturn]] void raw_throw_exception(const src_loc&, const char*, const fmt_type_info*, const u64*);
 
 	// Throw exception with formatting
 	template <typename CharT, usz N, typename... Args>
 	struct throw_exception
 	{
-		struct args_break_t {};
-
 		[[noreturn]] FORCE_INLINE SAFE_BUFFERS() throw_exception(const CharT(&fmt)[N], const Args&... args,
-			args_break_t = args_break_t{}, std::source_location src_loc = std::source_location::current())
+			u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION())
 		{
-			raw_throw_exception(src_loc, reinterpret_cast<const char*>(fmt), type_info_v<Args...>, fmt_args_t<Args...>{fmt_unveil<Args>::get(args)...});
+			raw_throw_exception({line, col, file, func}, reinterpret_cast<const char*>(fmt), type_info_v<Args...>, fmt_args_t<Args...>{fmt_unveil<Args>::get(args)...});
 		}
 
-#if !defined(_MSC_VER) || defined(__clang__)
+#ifndef _MSC_VER
 		[[noreturn]] ~throw_exception();
 #endif
 	};
@@ -445,7 +378,11 @@ namespace fmt
 
 	// Ensure with formatting
 	template <typename T, typename CharT, usz N, typename... Args>
-	decltype(auto) ensure(T&& arg, const CharT(&fmt)[N], tie<Args...> args, std::source_location src_loc = std::source_location::current()) noexcept
+	decltype(auto) ensure(T&& arg, const CharT(&fmt)[N], tie<Args...> args,
+		u32 line = __builtin_LINE(),
+		u32 col = __builtin_COLUMN(),
+		const char* file = __builtin_FILE(),
+		const char* func = __builtin_FUNCTION()) noexcept
 	{
 		if (std::forward<T>(arg)) [[likely]]
 		{
@@ -456,6 +393,6 @@ namespace fmt
 		u64 data[sizeof...(Args) + 1];
 		args.init(data);
 
-		raw_throw_exception(src_loc, reinterpret_cast<const char*>(fmt), type_info_v<std::remove_cvref_t<Args>...>, +data);
+		raw_throw_exception({line, col, file, func}, reinterpret_cast<const char*>(fmt), type_info_v<std::remove_cvref_t<Args>...>, +data);
 	}
 }
diff --git a/Utilities/StrUtil.h b/Utilities/StrUtil.h
index c28efda863..f305fecf1d 100644
--- a/Utilities/StrUtil.h
+++ b/Utilities/StrUtil.h
@@ -6,48 +6,34 @@
 #include <functional>
 #include <string_view>
 
-#include "util/types.hpp"
-
-std::wstring utf8_to_wchar(std::string_view src);
-std::string wchar_to_utf8(std::wstring_view src);
-std::string utf16_to_utf8(std::u16string_view src);
-std::u16string utf8_to_utf16(std::string_view src);
+#ifdef _WIN32
+std::string wchar_to_utf8(const 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 a std::string or a char array to a char array with truncation
 template <typename D, typename T>
-inline void strcpy_trunc(D&& dst, const T& src)
+inline void strcpy_trunc(D& dst, const T& src)
 {
-	const usz count = std::size(src) >= std::size(dst) ? std::max<usz>(std::size(dst), 1) - 1 : std::size(src);
+	const usz 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);
 }
 
 // Convert string to signed integer
-bool try_to_int64(s64* out, std::string_view value, s64 min, s64 max);
+bool try_to_int64(s64* out, const std::string& value, s64 min, s64 max);
 
 // Convert string to unsigned integer
-bool try_to_uint64(u64* out, std::string_view value, u64 min, u64 max);
-
-// Convert string to float
-bool try_to_float(f64* out, std::string_view value, f64 min, f64 max);
-
-// Convert float to string locale independent
-bool try_to_string(std::string* out, const f64& value);
-
-// Get the file extension of a file path ("png", "jpg", etc.)
-std::string get_file_extension(const std::string& file_path);
+bool try_to_uint64(u64* out, const std::string& value, u64 min, u64 max);
 
 namespace fmt
 {
-	// Replaces all occurrences of 'from' with 'to' until 'count' substrings were replaced.
-	std::string replace_all(std::string_view src, std::string_view from, std::string_view to, usz count = umax);
+	std::string replace_all(std::string_view src, std::string_view from, std::string_view to, usz count = -1);
 
 	template <usz list_size>
-	std::string replace_all(std::string src, const std::pair<std::string_view, std::string> (&list)[list_size])
+	std::string replace_all(std::string src, const std::pair<std::string, std::string> (&list)[list_size])
 	{
-		if constexpr (list_size == 0)
-			return src;
-
 		for (usz pos = 0; pos < src.length(); ++pos)
 		{
 			for (usz i = 0; i < list_size; ++i)
@@ -55,14 +41,11 @@ namespace fmt
 				const usz comp_length = list[i].first.length();
 
 				if (src.length() - pos < comp_length)
-				{
 					continue;
-				}
 
 				if (src.substr(pos, comp_length) == list[i].first)
 				{
-					src.erase(pos, comp_length);
-					src.insert(pos, list[i].second.data(), list[i].second.length());
+					src = (pos ? src.substr(0, pos) + list[i].second : list[i].second) + src.substr(pos + comp_length);
 					pos += list[i].second.length() - 1;
 					break;
 				}
@@ -73,11 +56,8 @@ namespace fmt
 	}
 
 	template <usz list_size>
-	std::string replace_all(std::string src, const std::pair<std::string_view, std::function<std::string()>> (&list)[list_size])
+	std::string replace_all(std::string src, const std::pair<std::string, std::function<std::string()>> (&list)[list_size])
 	{
-		if constexpr (list_size == 0)
-			return src;
-
 		for (usz pos = 0; pos < src.length(); ++pos)
 		{
 			for (usz i = 0; i < list_size; ++i)
@@ -85,16 +65,12 @@ namespace fmt
 				const usz comp_length = list[i].first.length();
 
 				if (src.length() - pos < comp_length)
-				{
 					continue;
-				}
 
 				if (src.substr(pos, comp_length) == list[i].first)
 				{
-					src.erase(pos, comp_length);
-					auto replacement = list[i].second();
-					src.insert(pos, replacement);
-					pos += replacement.length() - 1;
+					src = (pos ? src.substr(0, pos) + list[i].second() : list[i].second()) + src.substr(pos + comp_length);
+					pos += list[i].second().length() - 1;
 					break;
 				}
 			}
@@ -103,47 +79,8 @@ namespace fmt
 		return src;
 	}
 
-	static inline
-	std::string replace_all(std::string src, const std::vector<std::pair<std::string, std::string>>& list)
-	{
-		if (list.empty())
-			return src;
-
-		for (usz pos = 0; pos < src.length(); ++pos)
-		{
-			for (usz i = 0; i < list.size(); ++i)
-			{
-				const usz comp_length = list[i].first.length();
-
-				if (src.length() - pos < comp_length)
-				{
-					continue;
-				}
-
-				if (src.substr(pos, comp_length) == list[i].first)
-				{
-					src.erase(pos, comp_length);
-					src.insert(pos, list[i].second);
-					pos += list[i].second.length() - 1;
-					break;
-				}
-			}
-		}
-
-		return src;
-	}
-
-	// Splits the string into a vector of strings using the separators. The vector may contain empty strings unless is_skip_empty is true.
 	std::vector<std::string> split(std::string_view source, std::initializer_list<std::string_view> separators, bool is_skip_empty = true);
-
-	// Removes all preceding and trailing characters specified by 'values' from 'source'.
-	std::string trim(const std::string& source, std::string_view values = " \t");
-
-	// Removes all preceding characters specified by 'values' from 'source'.
-	std::string trim_front(const std::string& source, std::string_view values = " \t");
-
-	// Removes all trailing characters specified by 'values' from 'source'.
-	void trim_back(std::string& source, std::string_view values = " \t");
+	std::string trim(const std::string& source, const std::string& values = " \t");
 
 	template <typename T>
 	std::string merge(const T& source, const std::string& separator)
@@ -176,7 +113,7 @@ namespace fmt
 		std::string result;
 		bool first = true;
 
-		for (const auto& v : sources)
+		for (auto& v : sources)
 		{
 			if (first)
 			{
@@ -192,42 +129,8 @@ namespace fmt
 		return result;
 	}
 
-	// Returns the string transformed to uppercase
-	std::string to_upper(std::string_view string);
+	std::string to_upper(const std::string& string);
+	std::string to_lower(const std::string& string);
 
-	// Returns the string transformed to lowercase
-	std::string to_lower(std::string_view string);
-
-	// Returns the string shortened to length
-	std::string truncate(std::string_view src, usz length);
-
-	struct buf_to_hexstring
-	{
-		buf_to_hexstring(const u8* buf, usz len, usz line_length = 16, bool with_prefix = false)
-			: buf(buf), len(len), line_length(line_length), with_prefix(with_prefix) {}
-
-		const u8* buf;
-		usz len;
-		usz line_length;
-		bool with_prefix;
-	};
-
-	struct string_hash
-	{
-		using hash_type = std::hash<std::string_view>;
-		using is_transparent = void;
-
-		std::size_t operator()(const char* str) const
-		{
-			return hash_type{}(str);
-		}
-		std::size_t operator()(std::string_view str) const
-		{
-			return hash_type{}(str);
-		}
-		std::size_t operator()(std::string const& str) const
-		{
-			return hash_type{}(str);
-		}
-	};
+	bool match(const std::string& source, const std::string& mask);
 }
diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp
index c67e720b6f..4a85d12fb4 100644
--- a/Utilities/Thread.cpp
+++ b/Utilities/Thread.cpp
@@ -4,31 +4,19 @@
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/lv2/sys_mmapper.h"
 #include "Emu/Cell/lv2/sys_event.h"
-#include "Emu/Cell/lv2/sys_process.h"
 #include "Emu/RSX/RSXThread.h"
 #include "Thread.h"
 #include "Utilities/JIT.h"
 #include <thread>
+#include <sstream>
 #include <cfenv>
 
-#ifdef ARCH_ARM64
-#include "Emu/CPU/Backends/AArch64/AArch64Signal.h"
-#endif
-
 #ifdef _WIN32
 #include <Windows.h>
 #include <Psapi.h>
 #include <process.h>
 #include <sysinfoapi.h>
-
-#include "util/dyn_lib.hpp"
-
-DYNAMIC_IMPORT_RENAME("Kernel32.dll", SetThreadDescriptionImport, "SetThreadDescription", HRESULT(HANDLE hThread, PCWSTR lpThreadDescription));
-
 #else
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #ifdef __APPLE__
 #define _XOPEN_SOURCE
 #define __USE_GNU
@@ -50,7 +38,6 @@ DYNAMIC_IMPORT_RENAME("Kernel32.dll", SetThreadDescriptionImport, "SetThreadDesc
 #include <time.h>
 #endif
 #ifdef __linux__
-#include <sys/syscall.h>
 #include <sys/timerfd.h>
 #include <unistd.h>
 #endif
@@ -90,7 +77,7 @@ DYNAMIC_IMPORT_RENAME("Kernel32.dll", SetThreadDescriptionImport, "SetThreadDesc
 #include "util/logs.hpp"
 #include "util/asm.hpp"
 #include "util/v128.hpp"
-#include "util/simd.hpp"
+#include "util/v128sse.hpp"
 #include "util/sysinfo.hpp"
 #include "Emu/Memory/vm_locking.h"
 
@@ -107,19 +94,35 @@ thread_local bool g_tls_access_violation_recovered = false;
 extern thread_local std::string(*g_tls_log_prefix)();
 
 // Report error and call std::abort(), defined in main.cpp
-[[noreturn]] void report_fatal_error(std::string_view text, bool is_html = false, bool include_help_text = true);
+[[noreturn]] void report_fatal_error(std::string_view);
 
-enum cpu_threads_emulation_info_dump_t : u32 {};
+template <>
+void fmt_class_string<std::thread::id>::format(std::string& out, u64 arg)
+{
+	std::ostringstream ss;
+	ss << get_object(arg);
+	out += ss.str();
+}
 
 std::string dump_useful_thread_info()
 {
+	thread_local volatile bool guard = false;
+
 	std::string result;
 
+	// In case the dumping function was the cause for the exception/access violation
+	// Avoid recursion
+	if (std::exchange(guard, true))
+	{
+		return result;
+	}
+
 	if (auto cpu = get_current_cpu_thread())
 	{
-		fmt::append(result, "%s", cpu_threads_emulation_info_dump_t{cpu->id});
+		result = cpu->dump_all();
 	}
 
+	guard = false;
 	return result;
 }
 
@@ -186,14 +189,6 @@ bool IsDebuggerPresent()
 }
 #endif
 
-bool is_debugger_present()
-{
-	if (g_cfg.core.external_debugger)
-		return true;
-	return IsDebuggerPresent();
-}
-
-#if defined(ARCH_X64)
 enum x64_reg_t : u32
 {
 	X64R_RAX = 0,
@@ -286,11 +281,8 @@ enum x64_op_t : u32
 	X64OP_ADC, // lock adc [mem], ...
 	X64OP_SUB, // lock sub [mem], ...
 	X64OP_SBB, // lock sbb [mem], ...
-	X64OP_BEXTR,
 };
 
-static thread_local x64_reg_t s_tls_reg3{};
-
 void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, usz& out_size, usz& out_length)
 {
 	// simple analysis of x64 code allows to reinterpret MOV or other instructions in any desired way
@@ -751,12 +743,10 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, usz
 		const u8 vopm = op1 == 0xc5 ? 1 : op2 & 0x1f;
 		const u8 vop1 = op1 == 0xc5 ? op3 : code[2];
 		const u8 vlen = (opx & 0x4) ? 32 : 16;
-		const u8 vreg = (~opx >> 3) & 0xf;
+		//const u8 vreg = (~opx >> 3) & 0xf;
 		out_length += op1 == 0xc5 ? 2 : 3;
 		code += op1 == 0xc5 ? 2 : 3;
 
-		s_tls_reg3 = x64_reg_t{vreg};
-
 		if (vopm == 0x1) switch (vop1) // Implied leading byte 0x0F
 		{
 		case 0x11:
@@ -786,22 +776,6 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, usz
 		}
 		}
 
-		if (vopm == 0x2) switch (vop1) // Implied leading bytes 0x0F 0x38
-		{
-		case 0xf7:
-		{
-			if (!repe && !repne && vlen == 16) // BEXTR r32,mem,r32
-			{
-				out_op = X64OP_BEXTR;
-				out_reg = get_modRM_reg_xmm(code, rex);
-				out_size = opx & 0x80 ? 8 : 4;
-				out_length += get_modRM_size(code);
-				return;
-			}
-			break;
-		}
-		}
-
 		break;
 	}
 	case 0xc6:
@@ -865,7 +839,6 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, usz
 #ifdef _WIN32
 
 typedef CONTEXT x64_context;
-typedef CONTEXT ucontext_t;
 
 #define X64REG(context, reg) (&(&(context)->Rax)[reg])
 #define XMMREG(context, reg) (reinterpret_cast<v128*>(&(&(context)->Xmm0)[reg]))
@@ -1238,88 +1211,42 @@ usz get_x64_access_size(x64_context* context, x64_op_t op, x64_reg_t reg, usz d_
 	return d_size;
 }
 
-#elif defined(ARCH_ARM64)
-
-#if defined(__APPLE__)
-// https://github.com/bombela/backward-cpp/issues/200
-#define RIP(context) ((context)->uc_mcontext->__ss.__pc)
-#elif defined(__FreeBSD__)
-#define RIP(context) ((context)->uc_mcontext.mc_gpregs.gp_elr)
-#elif defined(__NetBSD__)
-#define RIP(context) ((context)->uc_mcontext.__gregs[_REG_PC])
-#elif defined(__OpenBSD__)
-#define RIP(context) ((context)->sc_elr)
-#else
-#define RIP(context) ((context)->uc_mcontext.pc)
-#endif
-
-#endif /* ARCH_ */
-
 namespace rsx
 {
 	extern std::function<bool(u32 addr, bool is_writing)> g_access_violation_handler;
 }
 
-bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noexcept
+bool handle_access_violation(u32 addr, bool is_writing, x64_context* context) noexcept
 {
 	g_tls_fault_all++;
 
 	const auto cpu = get_current_cpu_thread();
 
-	struct spu_unsavable
+	if (rsx::g_access_violation_handler)
 	{
-		spu_thread* _spu;
-
-		spu_unsavable(cpu_thread* cpu) noexcept
-			: _spu(cpu ? cpu->try_get<spu_thread>() : nullptr)
-		{
-			if (_spu)
-			{
-				if (_spu->unsavable)
-				{
-					_spu = nullptr;
-				}
-				else
-				{
-					// Must not be saved inside access violation handler because it is unpredictable
-					_spu->unsavable = true;
-				}
-			}
-		}
-
-		~spu_unsavable() noexcept
-		{
-			if (_spu)
-			{
-				_spu->unsavable = false;
-			}
-		}
-	} spu_protection{cpu};
-
-	if (addr < RAW_SPU_BASE_ADDR && vm::check_addr(addr) && rsx::g_access_violation_handler)
-	{
-		bool state_changed = false;
-
 		if (cpu)
 		{
-			state_changed = vm::temporary_unlock(*cpu);
+			vm::temporary_unlock(*cpu);
 		}
 
 		bool handled = rsx::g_access_violation_handler(addr, is_writing);
 
-		if (state_changed && (cpu->state += cpu_flag::temp, cpu->test_stopped()))
-		{
-			//
-		}
-
 		if (handled)
 		{
 			g_tls_fault_rsx++;
+			if (cpu && cpu->test_stopped())
+			{
+				//
+			}
+
 			return true;
 		}
+
+		if (cpu && cpu->test_stopped())
+		{
+		}
 	}
 
-#if defined(ARCH_X64)
 	const u8* const code = reinterpret_cast<u8*>(RIP(context));
 
 	x64_op_t op;
@@ -1360,7 +1287,7 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 	// check if address is RawSPU MMIO register
 	do if (addr - RAW_SPU_BASE_ADDR < (6 * RAW_SPU_OFFSET) && (addr % RAW_SPU_OFFSET) >= RAW_SPU_PROB_OFFSET)
 	{
-		auto thread = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu((addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET));
+		auto thread = idm::get<named_thread<spu_thread>>(spu_thread::find_raw_spu((addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET));
 
 		if (!thread)
 		{
@@ -1427,37 +1354,6 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 
 			break;
 		}
-		case X64OP_BEXTR:
-		{
-			u32 value;
-			if (is_writing || !thread->read_reg(addr, value))
-			{
-				return false;
-			}
-
-			value = stx::se_storage<u32>::swap(value);
-
-			u64 ctrl;
-			if (!get_x64_reg_value(context, s_tls_reg3, d_size, i_size, ctrl))
-			{
-				return false;
-			}
-
-			u8 start = ctrl & 0xff;
-			u8 _len = (ctrl & 0xff00) >> 8;
-			if (_len > 32)
-				_len = 32;
-			if (start > 32)
-				start = 32;
-			value = (u64{value} >> start) & ~(u64{umax} << _len);
-
-			if (!put_x64_reg_value(context, reg, d_size, value) || !set_x64_cmp_flags(context, d_size, value, 0))
-			{
-				return false;
-			}
-
-			break;
-		}
 		case X64OP_STORE:
 		case X64OP_STORE_BE:
 		{
@@ -1490,12 +1386,14 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 		g_tls_fault_spu++;
 		return true;
 	} while (0);
-#else
-	static_cast<void>(context);
-#endif /* ARCH_ */
 
 	if (vm::check_addr(addr, is_writing ? vm::page_writable : vm::page_readable))
 	{
+		if (cpu && cpu->test_stopped())
+		{
+			//
+		}
+
 		return true;
 	}
 
@@ -1504,11 +1402,6 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 	{
 		g_tls_access_violation_recovered = true;
 
-		if (vm::check_addr(addr, is_writing ? vm::page_writable : vm::page_readable))
-		{
-			return true;
-		}
-
 		const auto area = vm::reserve_map(vm::any, addr & -0x10000, 0x10000);
 
 		if (!area)
@@ -1516,17 +1409,18 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 			return false;
 		}
 
-		if (vm::writer_lock mlock; area->flags & vm::preallocated || vm::check_addr(addr, 0))
+		if (vm::reader_lock rlock; vm::check_addr(addr, 0))
 		{
 			// For allocated memory with protection lower than required (such as protection::no or read-only while writing to it)
 			utils::memory_protect(vm::base(addr & -0x1000), 0x1000, utils::protection::rw);
 			return true;
 		}
 
-		return area->falloc(addr & -0x10000, 0x10000) || vm::check_addr(addr, is_writing ? vm::page_writable : vm::page_readable);
+		area->falloc(addr & -0x10000, 0x10000);
+		return vm::check_addr(addr, is_writing ? vm::page_writable : vm::page_readable);
 	};
 
-	if (cpu && (cpu->get_class() == thread_class::ppu || cpu->get_class() == thread_class::spu))
+	if (cpu && (cpu->id_type() == 1 || cpu->id_type() == 2))
 	{
 		vm::temporary_unlock(*cpu);
 		u32 pf_port_id = 0;
@@ -1548,7 +1442,7 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 			}
 		}
 
-		if (auto pf_port = idm::get_unlocked<lv2_obj, lv2_event_port>(pf_port_id); pf_port && pf_port->queue)
+		if (pf_port_id)
 		{
 			// We notify the game that a page fault occurred so it can rectify it.
 			// Note, for data3, were the memory readable AND we got a page fault, it must be due to a write violation since reads are allowed.
@@ -1570,7 +1464,7 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 
 			u64 data3;
 			{
-				vm::writer_lock rlock;
+				vm::reader_lock rlock;
 				if (vm::check_addr(addr, is_writing ? vm::page_writable : vm::page_readable))
 				{
 					// Memory was allocated inbetween, retry
@@ -1586,38 +1480,25 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 				}
 			}
 
+			// Deschedule
+			if (cpu->id_type() == 1)
+			{
+				lv2_obj::sleep(*cpu);
+			}
 
 			// Now, place the page fault event onto table so that other functions [sys_mmapper_free_address and pagefault recovery funcs etc]
 			// know that this thread is page faulted and where.
 
 			auto& pf_events = g_fxo->get<page_fault_event_entries>();
-
-			// De-schedule
-			if (cpu->get_class() == thread_class::ppu)
 			{
-				cpu->state -= cpu_flag::signal; // Cannot use check_state here and signal must be removed if exists
-				lv2_obj::sleep(*cpu);
-			}
-
-			auto send_event = [&]() -> error_code
-			{
-				lv2_obj::notify_all_t notify_later{};
-
 				std::lock_guard pf_lock(pf_events.pf_mutex);
-
-				if (auto error = pf_port->queue->send(pf_port->name ? pf_port->name : ((u64{process_getpid() + 0u} << 32) | u64{pf_port_id}), data1, data2, data3))
-				{
-					return error;
-				}
-
 				pf_events.events.emplace(cpu, addr);
-				return {};
-			};
+			}
 
 			sig_log.warning("Page_fault %s location 0x%x because of %s memory", is_writing ? "writing" : "reading",
 				addr, data3 == SYS_MEMORY_PAGE_FAULT_CAUSE_READ_ONLY ? "writing read-only" : "using unmapped");
 
-			if (cpu->get_class() == thread_class::ppu)
+			if (cpu->id_type() == 1)
 			{
 				if (const auto func = static_cast<ppu_thread*>(cpu)->current_function)
 				{
@@ -1625,18 +1506,19 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 				}
 			}
 
-			error_code sending_error = not_an_error(CELL_EBUSY);
+			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.
-			for (u64 sleep_until = get_system_time(); static_cast<u32>(sending_error) == CELL_EBUSY; thread_ctrl::wait_until(&sleep_until, 1000))
+			while (static_cast<u32>(sending_error) == CELL_EBUSY)
 			{
-				sending_error = send_event();
-
 				if (cpu->is_stopped())
 				{
 					sending_error = {};
 					break;
 				}
+
+				thread_ctrl::wait_for(1000);
+				sending_error = sys_event_port_send(pf_port_id, data1, data2, data3);
 			}
 
 			if (sending_error)
@@ -1667,12 +1549,12 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 			return true;
 		}
 
-		if (cpu->get_class() == thread_class::spu)
+		if (cpu->id_type() == 2)
 		{
 			if (!g_tls_access_violation_recovered)
 			{
 				vm_log.notice("\n%s", dump_useful_thread_info());
-				vm_log.always()("[%s] Access violation %s location 0x%x (%s)", cpu->get_name(), is_writing ? "writing" : "reading", addr, (is_writing && vm::check_addr(addr)) ? "read-only memory" : "unmapped memory");
+				vm_log.error("Access violation %s location 0x%x (%s) [type=u%u]", is_writing ? "writing" : "reading", addr, (is_writing && vm::check_addr(addr)) ? "read-only memory" : "unmapped memory", d_size * 8);
 			}
 
 			// TODO:
@@ -1698,63 +1580,23 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 		}
 	}
 
-	if (cpu)
+	Emu.Pause();
+
+	if (!g_tls_access_violation_recovered)
 	{
-		cpu->state += cpu_flag::wait;
+		vm_log.notice("\n%s", dump_useful_thread_info());
 	}
 
 	// Note: a thread may access violate more than once after hack_alloc recovery
 	// Do not log any further access violations in this case.
 	if (!g_tls_access_violation_recovered)
 	{
-		vm_log.notice("\n%s", dump_useful_thread_info());
-		vm_log.fatal("Access violation %s location 0x%x (%s)", is_writing ? "writing" : (cpu && cpu->get_class() == thread_class::ppu && cpu->get_pc() == addr ? "executing" : "reading"), addr, (is_writing && vm::check_addr(addr)) ? "read-only memory" : "unmapped memory");
+		vm_log.fatal("Access violation %s location 0x%x (%s) [type=u%u]", is_writing ? "writing" : "reading", addr, (is_writing && vm::check_addr(addr)) ? "read-only memory" : "unmapped memory", d_size * 8);
 	}
 
-	while (Emu.IsPausedOrReady())
-	{
-		if (cpu)
-		{
-			auto state = +cpu->state;
-
-			if (::is_paused(state) && !::is_stopped(state))
-			{
-				thread_ctrl::wait_on(cpu->state, state);
-			}
-			else
-			{
-				// Temporary until Emulator updates state
-				std::this_thread::yield();
-			}
-		}
-		else
-		{
-			thread_ctrl::wait_for(1000);
-		}
-	}
-
-	Emu.Pause(true);
-
 	while (Emu.IsPaused())
 	{
-		if (cpu)
-		{
-			auto state = +cpu->state;
-
-			if (::is_paused(state) && !::is_stopped(state))
-			{
-				thread_ctrl::wait_on(cpu->state, state);
-			}
-			else
-			{
-				// Temporary until Emulator updates state
-				std::this_thread::yield();
-			}
-		}
-		else
-		{
-			thread_ctrl::wait_for(1000);
-		}
+		thread_ctrl::wait();
 	}
 
 	if (Emu.IsStopped() && !hack_alloc())
@@ -1777,7 +1619,7 @@ static void append_thread_name(std::string& msg)
 	}
 	else
 	{
-		fmt::append(msg, "Thread id = %u.\n", thread_ctrl::get_tid());
+		fmt::append(msg, "Thread id = %s.\n", std::this_thread::get_id());
 	}
 }
 
@@ -1785,7 +1627,7 @@ static void append_thread_name(std::string& msg)
 
 static LONG exception_handler(PEXCEPTION_POINTERS pExp) noexcept
 {
-	if (pExp->ExceptionRecord->ExceptionCode == EXCEPTION_BREAKPOINT)
+	if (pExp->ExceptionRecord->ExceptionCode == EXCEPTION_BREAKPOINT && IsDebuggerPresent())
 	{
 		return EXCEPTION_CONTINUE_SEARCH;
 	}
@@ -1817,28 +1659,6 @@ static LONG exception_handler(PEXCEPTION_POINTERS pExp) noexcept
 		}
 	}
 
-	switch (pExp->ExceptionRecord->ExceptionCode)
-	{
-	case EXCEPTION_ACCESS_VIOLATION:
-	case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
-	case EXCEPTION_DATATYPE_MISALIGNMENT:
-	case EXCEPTION_ILLEGAL_INSTRUCTION:
-	case EXCEPTION_IN_PAGE_ERROR:
-	case EXCEPTION_INT_DIVIDE_BY_ZERO:
-	case EXCEPTION_NONCONTINUABLE_EXCEPTION:
-	case EXCEPTION_PRIV_INSTRUCTION:
-	//case EXCEPTION_STACK_OVERFLOW:
-	{
-		sys_log.notice("\n%s", dump_useful_thread_info());
-		logs::listener::sync_all();
-		break;
-	}
-	default:
-	{
-		break;
-	}
-	}
-
 	return EXCEPTION_CONTINUE_SEARCH;
 }
 
@@ -1853,11 +1673,6 @@ static LONG exception_filter(PEXCEPTION_POINTERS pExp) noexcept
 			pExp->ExceptionRecord->ExceptionInformation[0] == 1 ? "writing" : "reading";
 
 		fmt::append(msg, "Segfault %s location %p at %p.\n", cause, pExp->ExceptionRecord->ExceptionInformation[1], pExp->ExceptionRecord->ExceptionAddress);
-
-		if (vm::try_get_addr(reinterpret_cast<u8*>(pExp->ExceptionRecord->ExceptionInformation[1])).second)
-		{
-			fmt::append(msg, "Sudo Addr: %p, VM Addr: %p\n", vm::g_sudo_addr, vm::g_base_addr);
-		}
 	}
 	else
 	{
@@ -1882,18 +1697,10 @@ static LONG exception_filter(PEXCEPTION_POINTERS pExp) noexcept
 		}
 	}
 
-#if defined(ARCH_X64)
-	const auto exec_addr = pExp->ContextRecord->Rip;
-#elif defined(ARCH_ARM64)
-	const auto exec_addr = pExp->ContextRecord->Pc;
-#else
-#error "Unimplemented exception handling for this architecture"
-#endif
-
-	fmt::append(msg, "Instruction address: %p.\n", exec_addr);
+	fmt::append(msg, "Instruction address: %p.\n", pExp->ContextRecord->Rip);
 
 	DWORD64 unwind_base;
-	if (const auto rtf = RtlLookupFunctionEntry(exec_addr, &unwind_base, nullptr))
+	if (const auto rtf = RtlLookupFunctionEntry(pExp->ContextRecord->Rip, &unwind_base, nullptr))
 	{
 		// Get function address
 		const DWORD64 func_addr = rtf->BeginAddress + unwind_base;
@@ -1910,7 +1717,7 @@ static LONG exception_filter(PEXCEPTION_POINTERS pExp) noexcept
 		{
 			const DWORD64 base = reinterpret_cast<DWORD64>(info.lpBaseOfDll);
 
-			if (exec_addr >= base && exec_addr < base + info.SizeOfImage)
+			if (pExp->ContextRecord->Rip >= base && pExp->ContextRecord->Rip < base + info.SizeOfImage)
 			{
 				std::string module_name;
 				for (DWORD size = 15; module_name.size() != size;)
@@ -1934,24 +1741,17 @@ static LONG exception_filter(PEXCEPTION_POINTERS pExp) noexcept
 
 	// TODO: print registers and the callstack
 
-	sys_log.fatal("\n%s", msg);
-	logs::listener::sync_all();
-
 	thread_ctrl::emergency_exit(msg);
 }
 
 const bool s_exception_handler_set = []() -> bool
 {
-#ifdef USE_ASAN
-	if (!AddVectoredExceptionHandler(FALSE, static_cast<PVECTORED_EXCEPTION_HANDLER>(exception_handler)))
-#else
-	if (!AddVectoredExceptionHandler(1, static_cast<PVECTORED_EXCEPTION_HANDLER>(exception_handler)))
-#endif
+	if (!AddVectoredExceptionHandler(1, (PVECTORED_EXCEPTION_HANDLER)exception_handler))
 	{
 		report_fatal_error("AddVectoredExceptionHandler() failed.");
 	}
 
-	if (!SetUnhandledExceptionFilter(static_cast<LPTOP_LEVEL_EXCEPTION_FILTER>(exception_filter)))
+	if (!SetUnhandledExceptionFilter((LPTOP_LEVEL_EXCEPTION_FILTER)exception_filter))
 	{
 		report_fatal_error("SetUnhandledExceptionFilter() failed.");
 	}
@@ -1963,9 +1763,8 @@ const bool s_exception_handler_set = []() -> bool
 
 static void signal_handler(int /*sig*/, siginfo_t* info, void* uct) noexcept
 {
-	ucontext_t* context = static_cast<ucontext_t*>(uct);
+	x64_context* context = static_cast<ucontext_t*>(uct);
 
-#if defined(ARCH_X64)
 #ifdef __APPLE__
 	const u64 err = context->uc_mcontext->__es.__err;
 #elif defined(__DragonFly__) || defined(__FreeBSD__)
@@ -1980,42 +1779,6 @@ static void signal_handler(int /*sig*/, siginfo_t* info, void* uct) noexcept
 
 	const bool is_executing = err & 0x10;
 	const bool is_writing = err & 0x2;
-#elif defined(ARCH_ARM64)
-	const bool is_executing = uptr(info->si_addr) == uptr(RIP(context));
-
-#if defined(__linux__) || defined(__APPLE__)
-	// Current CPU state decoder is reverse-engineered from the linux kernel and may not work on other platforms.
-	const auto decoded_reason = aarch64::decode_fault_reason(context);
-	const bool is_writing = (decoded_reason == aarch64::fault_reason::data_write);
-
-	if (decoded_reason != aarch64::fault_reason::data_write &&
-		decoded_reason != aarch64::fault_reason::data_read)
-	{
-		// We don't expect other classes of exceptions during normal executions
-		sig_log.warning("Unexpected fault. Reason: %d", static_cast<int>(decoded_reason));
-	}
-
-#else
-	const u32 insn = is_executing ? 0 : *reinterpret_cast<u32*>(RIP(context));
-	const bool is_writing =
-		(insn & 0xbfff0000) == 0x0c000000 ||  // STR <Wt>, [<Xn>, #<imm>] (store word with immediate offset)
-		(insn & 0xbfe00000) == 0x0c800000 ||  // STP <Wt1>, <Wt2>, [<Xn>, #<imm>] (store pair of registers with immediate offset)
-		(insn & 0xbfdf0000) == 0x0d000000 ||  // STR <Wt>, [<Xn>, <Xm>] (store word with register offset)
-		(insn & 0xbfc00000) == 0x0d800000 ||  // STP <Wt1>, <Wt2>, [<Xn>, <Xm>] (store pair of registers with register offset)
-		(insn & 0x3f400000) == 0x08000000 ||  // STR <Vd>, [<Xn>, #<imm>] (store SIMD/FP register with immediate offset)
-		(insn & 0x3bc00000) == 0x39000000 ||  // STR <Wt>, [<Xn>, #<imm>] (store word with immediate offset)
-		(insn & 0x3fc00000) == 0x3d800000 ||  // STR <Vd>, [<Xn>, <Xm>] (store SIMD/FP register with register offset)
-		(insn & 0x3bc00000) == 0x38000000 ||  // STR <Wt>, [<Xn>, <Xm>] (store word with register offset)
-		(insn & 0x3fe00000) == 0x3c800000 ||  // STUR <Vd>, [<Xn>, #<imm>] (store unprivileged register with immediate offset)
-		(insn & 0x3fe00000) == 0x3ca00000 ||  // STR <Vd>, [<Xn>, #<imm>] (store SIMD/FP register with immediate offset)
-		(insn & 0x3a400000) == 0x28000000 ||  // STP <Wt1>, <Wt2>, [<Xn>, #<imm>] (store pair of registers with immediate offset)
-		(insn & 0xbf000000) == 0xad000000 ||  // STP <Vd1>, <Vd2>, [<Xn>, #<imm>] (store SIMD/FP 128-bit register pair with immediate offset)
-		(insn & 0xbf000000) == 0x6d000000;    // STP <Dd1>, <Dd2>, [<Xn>, #<imm>] (store SIMD/FP 64-bit register pair with immediate offset)
-#endif
-
-#else
-#error "signal_handler not implemented"
-#endif
 
 	const u64 exec64 = (reinterpret_cast<u64>(info->si_addr) - reinterpret_cast<u64>(vm::g_exec_addr)) / 2;
 	const auto cause = is_executing ? "executing" : is_writing ? "writing" : "reading";
@@ -2039,39 +1802,14 @@ static void signal_handler(int /*sig*/, siginfo_t* info, void* uct) noexcept
 
 	std::string msg = fmt::format("Segfault %s location %p at %p.\n", cause, info->si_addr, RIP(context));
 
-	if (vm::try_get_addr(info->si_addr).second)
-	{
-		fmt::append(msg, "Sudo Addr: %p, VM Addr: %p\n", vm::g_sudo_addr, vm::g_base_addr);
-	}
-
 	append_thread_name(msg);
 
-	sys_log.fatal("\n%s", msg);
-	sys_log.notice("\n%s", dump_useful_thread_info());
-	logs::listener::sync_all();
-
 	if (IsDebuggerPresent())
 	{
-		// Convert to SIGTRAP
-		raise(SIGTRAP);
-		return;
-	}
+		sys_log.fatal("\n%s", msg);
 
-	thread_ctrl::emergency_exit(msg);
-}
+		sys_log.notice("\n%s", dump_useful_thread_info());
 
-static void sigill_handler(int /*sig*/, siginfo_t* info, void* /*uct*/) noexcept
-{
-	std::string msg = fmt::format("Illegal instruction at %p (%s).\n", info->si_addr, *reinterpret_cast<be_t<u128>*>(info->si_addr));
-
-	append_thread_name(msg);
-
-	sys_log.fatal("\n%s", msg);
-	sys_log.notice("\n%s", dump_useful_thread_info());
-	logs::listener::sync_all();
-
-	if (IsDebuggerPresent())
-	{
 		// Convert to SIGTRAP
 		raise(SIGTRAP);
 		return;
@@ -2097,21 +1835,6 @@ const bool s_exception_handler_set = []() -> bool
 		std::abort();
 	}
 
-#ifdef __APPLE__
-	if (::sigaction(SIGBUS, &sa, NULL) == -1)
-	{
-		std::fprintf(stderr, "sigaction(SIGBUS) failed (%d).\n", errno);
-		std::abort();
-	}
-#endif
-
-	sa.sa_sigaction = sigill_handler;
-	if (::sigaction(SIGILL, &sa, NULL) == -1)
-	{
-		std::fprintf(stderr, "sigaction(SIGILL) failed (%d).\n", errno);
-		std::abort();
-	}
-
 	sa.sa_handler = sigpipe_signaling_handler;
 	if (::sigaction(SIGPIPE, &sa, NULL) == -1)
 	{
@@ -2130,10 +1853,11 @@ const bool s_terminate_handler_set = []() -> bool
 	std::set_terminate([]()
 	{
 		if (IsDebuggerPresent())
-		{
-			logs::listener::sync_all();
-			utils::trap();
-		}
+#ifdef _MSC_VER
+			__debugbreak();
+#else
+			__asm("int3;");
+#endif
 
 		report_fatal_error("RPCS3 has abnormally terminated.");
 	});
@@ -2147,23 +1871,41 @@ thread_local DECLARE(thread_ctrl::g_tls_error_callback) = nullptr;
 
 DECLARE(thread_ctrl::g_native_core_layout) { native_core_arrangement::undefined };
 
+static atomic_t<u128, 64> s_thread_bits{0};
+
+static atomic_t<thread_base**> s_thread_pool[128]{};
+
 void thread_base::start()
 {
-	m_sync.atomic_op([&](u32& v)
+	for (u128 bits = s_thread_bits.load(); bits; bits &= bits - 1)
 	{
-		v &= ~static_cast<u32>(thread_state::mask);
-		v |= static_cast<u32>(thread_state::created);
-	});
+		const u32 pos = utils::ctz128(bits);
+
+		if (!s_thread_pool[pos])
+		{
+			continue;
+		}
+
+		thread_base** tls = s_thread_pool[pos].exchange(nullptr);
+
+		if (!tls)
+		{
+			continue;
+		}
+
+		// Receive "that" native thread handle, sent "this" thread_base
+		const u64 _self = reinterpret_cast<u64>(atomic_storage<thread_base*>::load(*tls));
+		m_thread.release(_self);
+		ensure(_self != reinterpret_cast<u64>(this));
+		atomic_storage<thread_base*>::store(*tls, this);
+		s_thread_pool[pos].notify_one();
+		return;
+	}
 
 #ifdef _WIN32
 	m_thread = ::_beginthreadex(nullptr, 0, entry_point, this, CREATE_SUSPENDED, nullptr);
 	ensure(m_thread);
-	ensure(::ResumeThread(reinterpret_cast<HANDLE>(+m_thread)) != static_cast<DWORD>(-1));
-#elif defined(__APPLE__)
-	pthread_attr_t stack_size_attr;
-	pthread_attr_init(&stack_size_attr);
-	pthread_attr_setstacksize(&stack_size_attr, 0x800000);
-	ensure(pthread_create(reinterpret_cast<pthread_t*>(&m_thread.raw()), &stack_size_attr, entry_point, this) == 0);
+	ensure(::ResumeThread(reinterpret_cast<HANDLE>(+m_thread)) != -1);
 #else
 	ensure(pthread_create(reinterpret_cast<pthread_t*>(&m_thread.raw()), nullptr, entry_point, this) == 0);
 #endif
@@ -2172,11 +1914,7 @@ void thread_base::start()
 void thread_base::initialize(void (*error_cb)())
 {
 #ifndef _WIN32
-#ifdef ANDROID
-	m_thread.release(pthread_self());
-#else
 	m_thread.release(reinterpret_cast<u64>(pthread_self()));
-#endif
 #endif
 
 	// Initialize TLS variables
@@ -2193,7 +1931,7 @@ void thread_base::initialize(void (*error_cb)())
 	{
 		if (attempts == umax)
 		{
-			g_tls_wait_time += utils::get_tsc() - stamp0;
+			g_tls_wait_time += __rdtsc() - stamp0;
 		}
 		else if (attempts > 1)
 		{
@@ -2208,13 +1946,6 @@ void thread_base::initialize(void (*error_cb)())
 
 void thread_base::set_name(std::string name)
 {
-#ifdef _WIN32
-	if (SetThreadDescriptionImport)
-	{
-		SetThreadDescriptionImport(GetCurrentThread(), utf8_to_wchar(name).c_str());
-	}
-#endif
-
 #ifdef _MSC_VER
 	struct THREADNAME_INFO
 	{
@@ -2259,7 +1990,7 @@ void thread_base::set_name(std::string name)
 u64 thread_base::finalize(thread_state result_state) noexcept
 {
 	// Report pending errors
-	error_code::error_report(0, nullptr, nullptr, nullptr, nullptr);
+	error_code::error_report(0, 0, 0, 0);
 
 #ifdef _WIN32
 	static thread_local ULONG64 tls_cycles{};
@@ -2270,7 +2001,7 @@ u64 thread_base::finalize(thread_state result_state) noexcept
 	tls_cycles += cycles;
 	FILETIME ctime, etime, ktime, utime;
 	GetThreadTimes(GetCurrentThread(), &ctime, &etime, &ktime, &utime);
-	const u64 time = ((ktime.dwLowDateTime | static_cast<u64>(ktime.dwHighDateTime) << 32) + (utime.dwLowDateTime | static_cast<u64>(utime.dwHighDateTime) << 32)) * 100ull - tls_time;
+	const u64 time = ((ktime.dwLowDateTime | (u64)ktime.dwHighDateTime << 32) + (utime.dwLowDateTime | (u64)utime.dwHighDateTime << 32)) * 100ull - tls_time;
 	tls_time += time;
 	const u64 fsoft = 0;
 	const u64 fhard = 0;
@@ -2305,10 +2036,7 @@ u64 thread_base::finalize(thread_state result_state) noexcept
 		return thread_ctrl::get_name_cached();
 	};
 
-	const bool is_cpu_thread = !!cpu_thread::get_current();
-	auto& thread_log = (is_cpu_thread || g_tls_fault_all ? sig_log.notice : sig_log.trace);
-
-	thread_log("Thread time: %fs (%fGc); Faults: %u [rsx:%u, spu:%u]; [soft:%u hard:%u]; Switches:[vol:%u unvol:%u]; Wait:[%.3fs, spur:%u]",
+	sig_log.notice("Thread time: %fs (%fGc); Faults: %u [rsx:%u, spu:%u]; [soft:%u hard:%u]; Switches:[vol:%u unvol:%u]; Wait:[%.3fs, spur:%u]",
 		time / 1000000000.,
 		cycles / 1000000000.,
 		g_tls_fault_all,
@@ -2324,14 +2052,14 @@ u64 thread_base::finalize(thread_state result_state) noexcept
 	const u64 _self = m_thread;
 
 	// Set result state (errored or finalized)
-	m_sync.fetch_op([&](u32& v)
+	m_sync.fetch_op([&](u64& v)
 	{
 		v &= -4;
 		v |= static_cast<u32>(result_state);
 	});
 
 	// Signal waiting threads
-	m_sync.notify_all();
+	m_sync.notify_all(2);
 
 	return _self;
 }
@@ -2345,46 +2073,144 @@ thread_base::native_entry thread_base::finalize(u64 _self) noexcept
 	g_tls_wait_fail = 0;
 	g_tls_access_violation_recovered = false;
 
-	g_tls_log_prefix = []() -> std::string { return {}; };
+	const auto fake_self = reinterpret_cast<thread_base*>(_self);
 
-	if (_self == umax)
+	g_tls_log_prefix = []() -> std::string { return {}; };
+	thread_ctrl::g_tls_this_thread = fake_self;
+
+	if (!_self)
 	{
-		thread_ctrl::g_tls_this_thread = nullptr;
 		return nullptr;
 	}
 
-#ifdef _WIN32
-	_endthreadex(0);
-#else
-	pthread_exit(nullptr);
-#endif
+	// Try to add self to thread pool
+	set_name("..pool");
 
-	return nullptr;
+	thread_ctrl::set_native_priority(0);
+
+	thread_ctrl::set_thread_affinity_mask(0);
+
+	std::fesetround(FE_TONEAREST);
+
+	static constexpr u64 s_stop_bit = 0x8000'0000'0000'0000ull;
+
+	static atomic_t<u64> s_pool_ctr = []
+	{
+		std::atexit([]
+		{
+			s_pool_ctr |= s_stop_bit;
+
+			while (/*u64 remains = */s_pool_ctr & ~s_stop_bit)
+			{
+				for (u32 i = 0; i < std::size(s_thread_pool); i++)
+				{
+					if (thread_base** ptls = s_thread_pool[i].exchange(nullptr))
+					{
+						// Extract thread handle
+						const u64 _self = reinterpret_cast<u64>(*ptls);
+
+						// Wake up a thread and make sure it's joined
+						s_thread_pool[i].notify_one();
+
+#ifdef _WIN32
+						const HANDLE handle = reinterpret_cast<HANDLE>(_self);
+						WaitForSingleObject(handle, INFINITE);
+						CloseHandle(handle);
+#else
+						pthread_join(reinterpret_cast<pthread_t>(_self), nullptr);
+#endif
+					}
+				}
+			}
+		});
+
+		return 0;
+	}();
+
+	s_pool_ctr++;
+
+	u32 pos = -1;
+
+	while (true)
+	{
+		const auto [bits, ok] = s_thread_bits.fetch_op([](u128& bits)
+		{
+			if (~bits) [[likely]]
+			{
+				// Set lowest clear bit
+				bits |= bits + 1;
+				return true;
+			}
+
+			return false;
+		});
+
+		if (ok) [[likely]]
+		{
+			pos = utils::ctz128(~bits);
+			break;
+		}
+
+		s_thread_bits.wait(bits);
+	}
+
+	const auto tls = &thread_ctrl::g_tls_this_thread;
+	s_thread_pool[pos] = tls;
+
+	atomic_wait::list<2> list{};
+	list.set<0>(s_pool_ctr, 0, s_stop_bit);
+	list.set<1>(s_thread_pool[pos], tls);
+
+	while (s_thread_pool[pos] == tls || atomic_storage<thread_base*>::load(*tls) == fake_self)
+	{
+		list.wait();
+
+		if (s_pool_ctr & s_stop_bit)
+		{
+			break;
+		}
+	}
+
+	// Free thread pool slot
+	s_thread_bits.atomic_op([pos](u128& val)
+	{
+		val &= ~(u128(1) << pos);
+	});
+
+	s_thread_bits.notify_one();
+
+	if (--s_pool_ctr & s_stop_bit)
+	{
+		return nullptr;
+	}
+
+	// Return new entry point
+	utils::prefetch_exec((*tls)->entry_point);
+	return (*tls)->entry_point;
 }
 
 thread_base::native_entry thread_base::make_trampoline(u64(*entry)(thread_base* _base))
 {
-	return build_function_asm<native_entry>("", [&](native_asm& c, auto& args)
+	return build_function_asm<native_entry>([&](asmjit::X86Assembler& c, auto& args)
 	{
 		using namespace asmjit;
 
-#if defined(ARCH_X64)
 		Label _ret = c.newLabel();
 		c.push(x86::rbp);
 		c.sub(x86::rsp, 0x20);
 
 		// Call entry point (TODO: support for detached threads missing?)
-		c.call(entry);
+		c.call(imm_ptr(entry));
 
 		// Call finalize, return if zero
 		c.mov(args[0], x86::rax);
-		c.call(static_cast<native_entry(*)(u64)>(&finalize));
+		c.call(imm_ptr<native_entry(*)(u64)>(finalize));
 		c.test(x86::rax, x86::rax);
 		c.jz(_ret);
 
 		// Otherwise, call it as an entry point with first arg = new current thread
 		c.mov(x86::rbp, x86::rax);
-		c.call(thread_ctrl::get_current);
+		c.call(imm_ptr(thread_ctrl::get_current));
 		c.mov(args[0], x86::rax);
 		c.add(x86::rsp, 0x28);
 		c.jmp(x86::rbp);
@@ -2392,11 +2218,6 @@ thread_base::native_entry thread_base::make_trampoline(u64(*entry)(thread_base*
 		c.bind(_ret);
 		c.add(x86::rsp, 0x28);
 		c.ret();
-#else
-	UNUSED(c);
-	UNUSED(args);
-	UNUSED(entry);
-#endif
 	});
 }
 
@@ -2418,24 +2239,14 @@ thread_state thread_ctrl::state()
 	return static_cast<thread_state>(_this->m_sync & 3);
 }
 
-void thread_ctrl::wait_for(u64 usec, [[maybe_unused]] bool alert /* true */)
+void thread_ctrl::_wait_for(u64 usec, [[maybe_unused]] bool alert /* true */)
 {
-	if (!usec)
-	{
-		return;
-	}
-
 	auto _this = g_tls_this_thread;
 
-	if (!alert && usec > 50000)
-	{
-		usec = 50000;
-	}
-
 #ifdef __linux__
 	static thread_local struct linux_timer_handle_t
 	{
-		// Allocate timer only if needed (i.e. someone calls wait_for with alert and short period)
+		// 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
@@ -2460,13 +2271,14 @@ void thread_ctrl::wait_for(u64 usec, [[maybe_unused]] bool alert /* true */)
 		}
 	} fd_timer;
 
-	if (!alert && fd_timer != -1)
+	if (!alert && usec > 0 && usec <= 1000 && fd_timer != -1)
 	{
 		struct itimerspec timeout;
 		u64 missed;
+		u64 nsec = usec * 1000ull;
 
-		timeout.it_value.tv_nsec = usec % 1'000'000 * 1'000ull;
-		timeout.it_value.tv_sec = usec / 1'000'000;
+		timeout.it_value.tv_nsec = (nsec % 1000000000ull);
+		timeout.it_value.tv_sec = nsec / 1000000000ull;
 		timeout.it_interval.tv_sec = 0;
 		timeout.it_interval.tv_nsec = 0;
 		timerfd_settime(fd_timer, 0, &timeout, NULL);
@@ -2476,107 +2288,16 @@ void thread_ctrl::wait_for(u64 usec, [[maybe_unused]] bool alert /* true */)
 	}
 #endif
 
-	if (alert)
-	{
-		if (_this->m_sync.bit_test_reset(2) || _this->m_taskq)
-		{
-			return;
-		}
-	}
-
-	// Wait for signal and thread state abort
-	atomic_wait::list<2> list{};
-
-	if (alert)
-	{
-		list.set<0>(_this->m_sync, 0);
-		list.template set<1>(_this->m_taskq);
-	}
-	else
-	{
-		list.set<0>(_this->m_dummy, 0);
-	}
-
-	list.wait(atomic_wait_timeout{usec <= 0xffff'ffff'ffff'ffff / 1000 ? usec * 1000 : 0xffff'ffff'ffff'ffff});
-}
-
-
-void thread_ctrl::wait_until(u64* wait_time, u64 add_time, u64 min_wait, bool update_to_current_time)
-{
-	*wait_time = utils::add_saturate<u64>(*wait_time, add_time);
-
-	// TODO: Implement proper support for "waiting until" inside atomic wait engine
-	const u64 current_time = get_system_time();
-
-	if (current_time > *wait_time)
-	{
-		if (update_to_current_time)
-		{
-			*wait_time = current_time + (add_time - (current_time - *wait_time) % add_time);
-		}
-		else if (!min_wait)
-		{
-			return;
-		}
-	}
-
-	if (min_wait)
-	{
-		*wait_time = std::max<u64>(*wait_time, utils::add_saturate<u64>(current_time, min_wait));
-	}
-
-	wait_for(*wait_time - current_time);
-}
-
-void thread_ctrl::wait_for_accurate(u64 usec)
-{
-	if (!usec)
+	if (_this->m_sync.bit_test_reset(2) || _this->m_taskq)
 	{
 		return;
 	}
 
-	if (usec > 50000)
-	{
-		fmt::throw_exception("thread_ctrl::wait_for_accurate: unsupported amount");
-	}
-
-#ifdef __linux__
-	return wait_for(usec, false);
-#else
-	using namespace std::chrono_literals;
-
-	const auto until = std::chrono::steady_clock::now() + 1us * usec;
-
-	while (true)
-	{
-		// Host scheduler quantum for windows (worst case)
-		constexpr u64 host_min_quantum = 500;
-
-		if (usec >= host_min_quantum)
-		{
-			// Wait on multiple of min quantum for large durations to avoid overloading low thread cpus
-			wait_for(usec - (usec % host_min_quantum), false);
-		}
-		// TODO: Determine best value for yield delay
-		else if (usec >= host_min_quantum / 2)
-		{
-			std::this_thread::yield();
-		}
-		else
-		{
-			busy_wait(100);
-		}
-
-		const auto current = std::chrono::steady_clock::now();
-
-		if (current >= until)
-		{
-			break;
-		}
-
-		usec = std::chrono::duration_cast<std::chrono::microseconds>(until - current).count();
-	}
-#endif
+	// Wait for signal and thread state abort
+	atomic_wait::list<2> list{};
+	list.set<0>(_this->m_sync, 0, 4 + 1);
+	list.set<1>(_this->m_taskq, nullptr);
+	list.wait(atomic_wait_timeout{usec <= 0xffff'ffff'ffff'ffff / 1000 ? usec * 1000 : 0xffff'ffff'ffff'ffff});
 }
 
 std::string thread_ctrl::get_name_cached()
@@ -2604,25 +2325,24 @@ std::string thread_ctrl::get_name_cached()
 	return *name_cache;
 }
 
-thread_base::thread_base(native_entry entry, std::string name) noexcept
+thread_base::thread_base(native_entry entry, std::string name)
 	: entry_point(entry)
 	, m_tname(make_single_value(std::move(name)))
 {
 }
 
-thread_base::~thread_base() noexcept
+thread_base::~thread_base()
 {
 	// Cleanup abandoned tasks: initialize default results and signal
 	this->exec();
 
-	// Cleanup
+	// Only cleanup on errored status
+	if ((m_sync & 3) == 2)
 	{
 #ifdef _WIN32
 		const HANDLE handle0 = reinterpret_cast<HANDLE>(m_thread.load());
 		WaitForSingleObject(handle0, INFINITE);
 		CloseHandle(handle0);
-#elif defined(ANDROID)
-		pthread_join(m_thread.load(), nullptr);
 #else
 		pthread_join(reinterpret_cast<pthread_t>(m_thread.load()), nullptr);
 #endif
@@ -2640,11 +2360,11 @@ bool thread_base::join(bool dtor) const
 	// Hacked for too sleepy threads (1ms) TODO: make sure it's unneeded and remove
 	const auto timeout = dtor && Emu.IsStopped() ? atomic_wait_timeout{1'000'000} : atomic_wait_timeout::inf;
 
-	auto stamp0 = utils::get_tsc();
+	auto stamp0 = __rdtsc();
 
 	for (u64 i = 0; (m_sync & 3) <= 1; i++)
 	{
-		m_sync.wait(m_sync & ~2, timeout);
+		m_sync.wait(0, 2, timeout);
 
 		if (m_sync & 2)
 		{
@@ -2653,7 +2373,7 @@ bool thread_base::join(bool dtor) const
 
 		if (i >= 16 && !(i & (i - 1)) && timeout != atomic_wait_timeout::inf)
 		{
-			sig_log.error("Thread [%s] is too sleepy. Waiting for it %.3fus already!", *m_tname.load(), (utils::get_tsc() - stamp0) / (utils::get_tsc_freq() / 1000000.));
+			sig_log.error(u8"Thread [%s] is too sleepy. Waiting for it %.3fµs already!", *m_tname.load(), (__rdtsc() - stamp0) / (utils::get_tsc_freq() / 1000000.));
 		}
 	}
 
@@ -2664,7 +2384,7 @@ void thread_base::notify()
 {
 	// Set notification
 	m_sync |= 4;
-	m_sync.notify_all();
+	m_sync.notify_one(4);
 }
 
 u64 thread_base::get_native_id() const
@@ -2697,16 +2417,11 @@ u64 thread_base::get_cycles()
 #else
 	clockid_t _clock;
 	struct timespec thread_time;
-#ifdef ANDROID
-	pthread_t thread_id = handle;
-#else
-	pthread_t thread_id = reinterpret_cast<pthread_t>(handle);
-#endif
-	if (!pthread_getcpuclockid(thread_id, &_clock) && !clock_gettime(_clock, &thread_time))
+	if (!pthread_getcpuclockid(reinterpret_cast<pthread_t>(handle), &_clock) && !clock_gettime(_clock, &thread_time))
 	{
 		cycles = static_cast<u64>(thread_time.tv_sec) * 1'000'000'000 + thread_time.tv_nsec;
 #endif
-		if (const u64 old_cycles = m_cycles.exchange(cycles))
+		if (const u64 old_cycles = m_sync.fetch_op([&](u64& v){ v &= 7; v |= (cycles << 3); }) >> 3)
 		{
 			return cycles - old_cycles;
 		}
@@ -2716,7 +2431,7 @@ u64 thread_base::get_cycles()
 	}
 	else
 	{
-		return m_cycles;
+		return m_sync >> 3;
 	}
 }
 
@@ -2737,24 +2452,26 @@ void thread_base::exec()
 	while (shared_ptr<thread_future> head = m_taskq.exchange(null_ptr))
 	{
 		// TODO: check if adapting reverse algorithm is feasible here
-		thread_future* prev_head{head.get()};
+		shared_ptr<thread_future>* prev{};
 
-		for (thread_future* prev{};;)
+		for (auto ptr = head.get(); ptr; ptr = ptr->next.get())
 		{
-			utils::prefetch_exec(prev_head->exec.load());
+			utils::prefetch_exec(ptr->exec.load());
 
-			if (auto next = prev_head->next.get())
+			ptr->prev = prev;
+
+			if (ptr->next)
 			{
-				prev = std::exchange(prev_head, next);
-				prev_head->prev = prev;
-			}
-			else
-			{
-				break;
+				prev = &ptr->next;
 			}
 		}
 
-		for (auto ptr = prev_head; ptr; ptr = ptr->prev)
+		if (!prev)
+		{
+			prev = &head;
+		}
+
+		for (auto ptr = prev->get(); ptr; ptr = ptr->prev->get())
 		{
 			if (auto task = ptr->exec.load()) [[likely]]
 			{
@@ -2769,8 +2486,8 @@ void thread_base::exec()
 				}
 
 				// Notify waiters
-				ptr->done.release(1);
-				ptr->done.notify_all();
+				ptr->exec.release(nullptr);
+				ptr->exec.notify_all();
 			}
 
 			if (ptr->next)
@@ -2778,6 +2495,11 @@ void thread_base::exec()
 				// Partial cleanup
 				ptr->next.reset();
 			}
+
+			if (!ptr->prev)
+			{
+				break;
+			}
 		}
 
 		if (!m_taskq) [[likely]]
@@ -2789,57 +2511,24 @@ void thread_base::exec()
 
 [[noreturn]] void thread_ctrl::emergency_exit(std::string_view reason)
 {
-	if (const std::string info = dump_useful_thread_info(); !info.empty())
+	if (std::string info = dump_useful_thread_info(); !info.empty())
 	{
 		sys_log.notice("\n%s", info);
 	}
 
-	std::string reason_buf;
-
-	if (auto ppu = cpu_thread::get_current<ppu_thread>())
-	{
-		if (auto func = ppu->current_function)
-		{
-			fmt::append(reason_buf, "%s (PPU: %s)", reason, func);
-		}
-	}
-
-	if (!reason_buf.empty())
-	{
-		reason = reason_buf;
-	}
-
 	sig_log.fatal("Thread terminated due to fatal error: %s", reason);
 
-	logs::listener::sync_all();
-
+#ifdef _WIN32
 	if (IsDebuggerPresent())
 	{
-		// Prevent repeatedly halting the debugger in case multiple threads crashed at once
-		static atomic_t<u64> s_last_break = 0;
-		const u64 current_break = get_system_time() & -2;
-
-		if (s_last_break.fetch_op([current_break](u64& v)
-		{
-			if (current_break >= (v & -2) && current_break - (v & -2) >= 20'000'000)
-			{
-				v = current_break;
-				return true;
-			}
-
-			// Let's allow a single more thread to halt the debugger so the programmer sees the pattern
-			if (!(v & 1))
-			{
-				v |= 1;
-				return true;
-			}
-
-			return false;
-		}).second)
-		{
-			utils::trap();
-		}
+		__debugbreak();
 	}
+#else
+	if (IsDebuggerPresent())
+	{
+		__asm("int3;");
+	}
+#endif
 
 	if (const auto _this = g_tls_this_thread)
 	{
@@ -2847,13 +2536,13 @@ void thread_base::exec()
 
 		u64 _self = _this->finalize(thread_state::errored);
 
-		if (_self == umax)
+		if (!_self)
 		{
 			// Unused, detached thread support remnant
 			delete _this;
 		}
 
-		thread_base::finalize(umax);
+		thread_base::finalize(0);
 
 #ifdef _WIN32
 		_endthreadex(0);
@@ -2899,7 +2588,7 @@ void thread_ctrl::detect_cpu_layout()
 		if (!GetLogicalProcessorInformationEx(relationship,
 			reinterpret_cast<SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *>(buffer.data()), &buffer_size))
 		{
-			sig_log.error("GetLogicalProcessorInformationEx failed (size=%u, error=%s)", buffer_size, fmt::win_error{GetLastError(), nullptr});
+			sig_log.error("GetLogicalProcessorInformationEx failed (size=%u, error=%u)", buffer_size, GetLastError());
 		}
 		else
 		{
@@ -3033,7 +2722,7 @@ u64 thread_ctrl::get_affinity_mask(thread_class group)
 							spu_mask = 0b0000101010101010;
 							rsx_mask = 0b1000000000000000;
 						}
-						else // if (g_cfg.core.thread_scheduler == thread_scheduler_mode::old)
+						else
 						{
 							ppu_mask = 0b1111111100000000;
 							spu_mask = ppu_mask;
@@ -3074,7 +2763,7 @@ u64 thread_ctrl::get_affinity_mask(thread_class group)
 						spu_mask = 0b1111111100000000;
 						rsx_mask = 0b0000000000001111;
 					}
-					else // if (g_cfg.core.thread_scheduler == thread_scheduler_mode::old)
+					else
 					{
 						// Verified by more than one windows user on 16-thread CPU
 						ppu_mask = spu_mask = rsx_mask = (0b10101010101010101010101010101010 & all_cores_mask);
@@ -3088,7 +2777,7 @@ u64 thread_ctrl::get_affinity_mask(thread_class group)
 						spu_mask = 0b111111110000;
 						rsx_mask = 0b000000000011;
 					}
-					else // if (g_cfg.core.thread_scheduler == thread_scheduler_mode::old)
+					else
 					{
 						ppu_mask = spu_mask = rsx_mask = all_cores_mask;
 					}
@@ -3146,7 +2835,7 @@ void thread_ctrl::set_native_priority(int priority)
 
 	if (!SetThreadPriority(_this_thread, native_priority))
 	{
-		sig_log.error("SetThreadPriority() failed: %s", fmt::win_error{GetLastError(), nullptr});
+		sig_log.error("SetThreadPriority() failed: 0x%x", GetLastError());
 	}
 #else
 	int policy;
@@ -3161,7 +2850,7 @@ void thread_ctrl::set_native_priority(int priority)
 
 	if (int err = pthread_setschedparam(pthread_self(), policy, &param))
 	{
-		sig_log.error("pthread_setschedparam() failed: %d", err);
+		sig_log.error("pthraed_setschedparam() failed: %d", err);
 	}
 #endif
 }
@@ -3198,14 +2887,14 @@ void thread_ctrl::set_thread_affinity_mask(u64 mask)
 	HANDLE _this_thread = GetCurrentThread();
 	if (!SetThreadAffinityMask(_this_thread, !mask ? process_affinity_mask : mask))
 	{
-		sig_log.error("Failed to set thread affinity 0x%x: error: %s", mask, fmt::win_error{GetLastError(), nullptr});
+		sig_log.error("Failed to set thread affinity 0x%x: error 0x%x.", mask, GetLastError());
 	}
 #elif __APPLE__
 	// Supports only one core
 	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), !mask ? 0 : 1);
-#elif !defined(ANDROID) && (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__))
+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)
 	if (!mask)
 	{
 		// Reset affinity mask
@@ -3257,7 +2946,7 @@ u64 thread_ctrl::get_thread_affinity_mask()
 
 	sig_log.error("Failed to get thread affinity mask.");
 	return 0;
-#elif !defined(ANDROID) && (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__))
+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)
 	cpu_set_t cs;
 	CPU_ZERO(&cs);
 
@@ -3324,10 +3013,6 @@ u64 thread_ctrl::get_tid()
 {
 #ifdef _WIN32
 	return GetCurrentThreadId();
-#elif defined(ANDROID)
-	return static_cast<u64>(pthread_self());
-#elif defined(__linux__)
-	return syscall(SYS_gettid);
 #else
 	return reinterpret_cast<u64>(pthread_self());
 #endif
diff --git a/Utilities/Thread.h b/Utilities/Thread.h
index da5b25ce96..bd6cbf548e 100644
--- a/Utilities/Thread.h
+++ b/Utilities/Thread.h
@@ -6,6 +6,9 @@
 
 #include <string>
 
+#include "mutex.h"
+#include "lockless.h"
+
 // Hardware core layout
 enum class native_core_arrangement : u32
 {
@@ -17,10 +20,10 @@ enum class native_core_arrangement : u32
 
 enum class thread_class : u32
 {
-	general = 0,
-	ppu = 1,
-	spu = 2,
-	rsx = 0x55,
+	general,
+	rsx,
+	spu,
+	ppu
 };
 
 enum class thread_state : u32
@@ -29,8 +32,7 @@ enum class thread_state : u32
 	aborting = 1, // The thread has been joined in the destructor or explicitly aborted
 	errored = 2, // Set after the emergency_exit call
 	finished = 3,  // Final state, always set at the end of thread execution
-	mask = 3,
-	destroying_context = 7, // Special value assigned to destroy data explicitly before the destructor
+	mask = 3
 };
 
 template <class Context>
@@ -81,9 +83,9 @@ struct result_storage<Ctx, Args...>
 };
 
 template <typename T>
-concept NamedThreadName = requires (const T&)
+concept NamedThreadName = requires (const T& t)
 {
-	std::string(T::thread_name);
+	std::string(t.thread_name);
 };
 
 // Base class for task queue (linked list)
@@ -93,24 +95,22 @@ class thread_future
 
 	shared_ptr<thread_future> next{};
 
-	thread_future* prev{};
+	shared_ptr<thread_future>* prev{};
 
 protected:
-	atomic_t<void(*)(const thread_base*, thread_future*)> exec{};
-
-	atomic_t<u32> done{0};
+	atomic_t<void(*)(thread_base*, thread_future*)> exec{};
 
 public:
 	// Get reference to the atomic variable for inspection and waiting for
 	const auto& get_wait() const
 	{
-		return done;
+		return exec;
 	}
 
 	// Wait (preset)
 	void wait() const
 	{
-		done.wait(0);
+		exec.wait<atomic_wait::op_ne>(nullptr);
 	}
 };
 
@@ -127,20 +127,12 @@ public:
 
 	const native_entry entry_point;
 
-	// Set name for debugger
-	static void set_name(std::string);
-
 private:
 	// Thread handle (platform-specific)
 	atomic_t<u64> m_thread{0};
 
-	// Thread cycles
-	atomic_t<u64> m_cycles{0};
-
-	atomic_t<u32> m_dummy{0};
-
-	// Thread state
-	atomic_t<u32> m_sync{0};
+	// Thread state and cycles
+	atomic_t<u64> m_sync{0};
 
 	// Thread name
 	atomic_ptr<std::string> m_tname;
@@ -160,8 +152,11 @@ private:
 	// Cleanup after possibly deleting the thread instance
 	static native_entry finalize(u64 _self) noexcept;
 
+	// Set name for debugger
+	static void set_name(std::string);
+
 	// Make entry point
-	static native_entry make_trampoline(u64(*entry)(thread_base* _base));
+	static native_entry make_trampoline(u64(*)(thread_base*));
 
 	friend class thread_ctrl;
 
@@ -169,9 +164,9 @@ private:
 	friend class named_thread;
 
 protected:
-	thread_base(native_entry, std::string name) noexcept;
+	thread_base(native_entry, std::string name);
 
-	~thread_base() noexcept;
+	~thread_base();
 
 public:
 	// Get CPU cycles since last time this function was called. First call returns 0.
@@ -206,6 +201,9 @@ class thread_ctrl final
 	// Target cpu core layout
 	static atomic_t<native_core_arrangement> g_native_core_layout;
 
+	// Internal waiting function, may throw. Infinite value is -1.
+	static void _wait_for(u64 usec, bool alert);
+
 	friend class thread_base;
 
 	// Optimized get_name() for logging
@@ -215,11 +213,6 @@ public:
 	// Get current thread name
 	static std::string get_name()
 	{
-		if (!g_tls_this_thread)
-		{
-			return "not named_thread";
-		}
-
 		return *g_tls_this_thread->m_tname.load();
 	}
 
@@ -270,24 +263,21 @@ public:
 	// Read current state, possibly executing some tasks
 	static thread_state state();
 
-	// Wait once with timeout. Infinite value is -1.
-	static void wait_for(u64 usec, bool alert = true);
-
-	// Wait once with time point, add_time is added to the time point.
-	static void wait_until(u64* wait_time, u64 add_time = 0, u64 min_wait = 0, bool update_to_current_time = true);
-
-	// Waiting with accurate timeout
-	static void wait_for_accurate(u64 usec);
+	// Wait once with timeout. May spuriously return false.
+	static inline void wait_for(u64 usec, bool alert = true)
+	{
+		_wait_for(usec, alert);
+	}
 
 	// Wait.
 	static inline void wait()
 	{
-		wait_for(-1, true);
+		_wait_for(-1, true);
 	}
 
 	// Wait for both thread sync var and provided atomic var
-	template <uint Max, typename Func>
-	static inline void wait_on_custom(Func&& setter, u64 usec = -1)
+	template <atomic_wait::op Op = atomic_wait::op::eq, typename T, typename U>
+	static inline void wait_on(T& wait, U old, u64 usec = -1)
 	{
 		auto _this = g_tls_this_thread;
 
@@ -296,25 +286,13 @@ public:
 			return;
 		}
 
-		atomic_wait::list<Max + 2> list{};
-		list.template set<Max>(_this->m_sync, 0);
-		list.template set<Max + 1>(_this->m_taskq);
-		setter(list);
+		atomic_wait::list<3> list{};
+		list.set<0, Op>(wait, old);
+		list.set<1>(_this->m_sync, 0, 4 + 1);
+		list.set<2>(_this->m_taskq, nullptr);
 		list.wait(atomic_wait_timeout{usec <= 0xffff'ffff'ffff'ffff / 1000 ? usec * 1000 : 0xffff'ffff'ffff'ffff});
 	}
 
-	template <typename T, typename U>
-	static inline void wait_on(T& wait, U old, u64 usec = -1)
-	{
-		wait_on_custom<1>([&](atomic_wait::list<3>& list) { list.template set<0>(wait, old); }, usec);
-	}
-
-	template <typename T>
-	static inline void wait_on(T& wait)
-	{
-		wait_on_custom<1>([&](atomic_wait::list<3>& list) { list.template set<0>(wait); });
-	}
-
 	// Exit.
 	[[noreturn]] static void emergency_exit(std::string_view reason);
 
@@ -348,7 +326,7 @@ public:
 	// Sets the native thread priority and returns it to zero at destructor
 	struct scoped_priority
 	{
-		explicit scoped_priority(int prio) noexcept
+		explicit scoped_priority(int prio)
 		{
 			set_native_priority(prio);
 		}
@@ -357,7 +335,7 @@ public:
 
 		scoped_priority& operator=(const scoped_priority&) = delete;
 
-		~scoped_priority() noexcept
+		~scoped_priority()
 		{
 			set_native_priority(0);
 		}
@@ -374,32 +352,22 @@ private:
 	static const u64 process_affinity_mask;
 };
 
-#if defined(__has_cpp_attribute)
-#if __has_cpp_attribute(no_unique_address)
-#define NO_UNIQUE_ADDRESS [[no_unique_address]]
-#else
-#define NO_UNIQUE_ADDRESS
-#endif
-#else
-#define NO_UNIQUE_ADDRESS
-#endif
-
 // Used internally
 template <bool Discard, typename Ctx, typename... Args>
 class thread_future_t : public thread_future, result_storage<Ctx, std::conditional_t<Discard, int, void>, Args...>
 {
-	NO_UNIQUE_ADDRESS decltype(std::make_tuple(std::forward<Args>(std::declval<Args>())...)) m_args;
+	[[no_unique_address]] decltype(std::make_tuple(std::forward<Args>(std::declval<Args>())...)) m_args;
 
-	NO_UNIQUE_ADDRESS Ctx m_func;
+	[[no_unique_address]] Ctx m_func;
 
 	using future = thread_future_t;
 
 public:
-	thread_future_t(Ctx&& func, Args&&... args) noexcept
+	thread_future_t(Ctx&& func, Args&&... args)
 		: m_args(std::forward<Args>(args)...)
 		, m_func(std::forward<Ctx>(func))
 	{
-		thread_future::exec.raw() = +[](const thread_base* tb, thread_future* tf)
+		thread_future::exec.raw() = +[](thread_base* tb, thread_future* tf)
 		{
 			const auto _this = static_cast<future*>(tf);
 
@@ -424,7 +392,7 @@ public:
 		};
 	}
 
-	~thread_future_t() noexcept
+	~thread_future_t()
 	{
 		if constexpr (!future::empty && !Discard)
 		{
@@ -462,11 +430,6 @@ public:
 	}
 };
 
-namespace stx
-{
-	struct launch_retainer;
-}
-
 // Derived from the callable object Context, possibly a lambda
 template <class Context>
 class named_thread final : public Context, result_storage<Context>, thread_base
@@ -515,49 +478,23 @@ class named_thread final : public Context, result_storage<Context>, thread_base
 		return thread::finalize(thread_state::finished);
 	}
 
-#if defined(ARCH_X64)
 	static inline thread::native_entry trampoline = thread::make_trampoline(entry_point);
-#else
-#ifdef _WIN32
-	static uint trampoline(void* arg)
-#else
-	static void* trampoline(void* arg)
-#endif
-	{
-		if (const auto next = thread_base::finalize(entry_point(static_cast<thread_base*>(arg))))
-		{
-			return next(thread_ctrl::get_current());
-		}
-
-		return {};
-	}
-#endif
 
 	friend class thread_ctrl;
 
 public:
 	// Forwarding constructor with default name (also potentially the default constructor)
-	template <typename... Args> requires (std::is_constructible_v<Context, Args&&...>) && (!(std::is_same_v<std::remove_cvref_t<Args>, stx::launch_retainer> || ...)) && (NamedThreadName<Context>)
-	named_thread(Args&&... args) noexcept
+	template <typename... Args> requires (std::is_constructible_v<Context, Args&&...>) && (NamedThreadName<Context>)
+	named_thread(Args&&... args)
 		: Context(std::forward<Args>(args)...)
 		, thread(trampoline, std::string(Context::thread_name))
 	{
 		thread::start();
 	}
 
-	// Forwarding constructor with default name, does not automatically run the thread
-	template <typename... Args> requires (std::is_constructible_v<Context, Args&&...>) && (NamedThreadName<Context>)
-	named_thread(const stx::launch_retainer&, Args&&... args) noexcept
-		: Context(std::forward<Args>(args)...)
-		, thread(trampoline, std::string(Context::thread_name))
-	{
-		// Create a stand-by thread context
-		m_sync |= static_cast<u32>(thread_state::finished);
-	}
-
 	// Normal forwarding constructor
-	template <typename... Args> requires (std::is_constructible_v<Context, Args&&...>) && (!NamedThreadName<Context>)
-	named_thread(std::string name, Args&&... args) noexcept
+	template <typename... Args> requires (std::is_constructible_v<Context, Args&&...>)
+	named_thread(std::string name, Args&&... args)
 		: Context(std::forward<Args>(args)...)
 		, thread(trampoline, std::move(name))
 	{
@@ -565,7 +502,7 @@ public:
 	}
 
 	// Lambda constructor, also the implicit deduction guide candidate
-	named_thread(std::string_view name, Context&& f) noexcept requires (!NamedThreadName<Context>)
+	named_thread(std::string_view name, Context&& f)
 		: Context(std::forward<Context>(f))
 		, thread(trampoline, std::string(name))
 	{
@@ -577,7 +514,7 @@ public:
 	named_thread& operator=(const named_thread&) = delete;
 
 	// Wait for the completion and access result (if not void)
-	[[nodiscard]] decltype(auto) operator()() noexcept
+	[[nodiscard]] decltype(auto) operator()()
 	{
 		thread::join();
 
@@ -588,7 +525,7 @@ public:
 	}
 
 	// Wait for the completion and access result (if not void)
-	[[nodiscard]] decltype(auto) operator()() const noexcept
+	[[nodiscard]] decltype(auto) operator()() const
 	{
 		thread::join();
 
@@ -600,7 +537,7 @@ public:
 
 	// Send command to the thread to invoke directly (references should be passed via std::ref())
 	template <bool Discard = true, typename Arg, typename... Args>
-	auto operator()(Arg&& arg, Args&&... args) noexcept
+	auto operator()(Arg&& arg, Args&&... args)
 	{
 		// Overloaded operator() of the Context.
 		constexpr bool v1 = std::is_invocable_v<Context, Arg&&, Args&&...>;
@@ -674,60 +611,36 @@ public:
 	}
 
 	// Access thread state
-	operator thread_state() const noexcept
+	operator thread_state() const
 	{
 		return static_cast<thread_state>(thread::m_sync.load() & 3);
 	}
 
-	named_thread& operator=(thread_state s) noexcept
+	// Try to abort by assigning thread_state::aborting/finished
+	// Join thread by thread_state::finished
+	named_thread& operator=(thread_state s)
 	{
-		if (s == thread_state::created)
-		{
-			// Run thread
-			ensure(operator thread_state() == thread_state::finished);
-			thread::start();
-			return *this;
-		}
-
-		bool notify_sync = false;
-
-		// Try to abort by assigning thread_state::aborting/finished
-		// Join thread by thread_state::finished
-		if (s >= thread_state::aborting && thread::m_sync.fetch_op([](u32& v) { return !(v & 3) && (v |= 1); }).second)
-		{
-			notify_sync = true;
-		}
-
 		if constexpr (std::is_assignable_v<Context&, thread_state>)
 		{
-			static_cast<Context&>(*this) = thread_state::aborting;
+			static_cast<Context&>(*this) = s;
 		}
 
-		if (notify_sync)
+		if (s >= thread_state::aborting && thread::m_sync.fetch_op([](u64& v){ return !(v & 3) && (v |= 1); }).second)
 		{
-			// Notify after context abortion has been made so all conditions for wake-up be satisfied by the time of notification
-			thread::m_sync.notify_all();
+			thread::m_sync.notify_one(1);
 		}
 
-		if (s == thread_state::finished || s == thread_state::destroying_context)
+		if (s == thread_state::finished)
 		{
 			// This participates in emulation stopping, use destruction-alike semantics
 			thread::join(true);
 		}
 
-		if (s == thread_state::destroying_context)
-		{
-			if constexpr (std::is_assignable_v<Context&, thread_state>)
-			{
-				static_cast<Context&>(*this) = thread_state::destroying_context;
-			}
-		}
-
 		return *this;
 	}
 
 	// Context type doesn't need virtual destructor
-	~named_thread() noexcept
+	~named_thread()
 	{
 		// Assign aborting state forcefully and join thread
 		operator=(thread_state::finished);
@@ -745,7 +658,7 @@ class named_thread_group final
 {
 	using Thread = named_thread<Context>;
 
-	u32 m_count = 0;
+	const u32 m_count;
 
 	Thread* m_threads;
 
@@ -756,7 +669,7 @@ class named_thread_group final
 
 public:
 	// Lambda constructor, also the implicit deduction guide candidate
-	named_thread_group(std::string_view name, u32 count, Context&& f) noexcept
+	named_thread_group(std::string_view name, u32 count, const Context& f)
 		: m_count(count)
 		, m_threads(nullptr)
 	{
@@ -768,60 +681,14 @@ public:
 		init_threads();
 
 		// Create all threads
-		for (u32 i = 0; i < m_count - 1; i++)
+		for (u32 i = 0; i < m_count; i++)
 		{
-			// Copy the context
-			new (static_cast<void*>(m_threads + i)) Thread(std::string(name) + std::to_string(i + 1), static_cast<const Context&>(f));
+			new (static_cast<void*>(m_threads + i)) Thread(std::string(name) + std::to_string(i + 1), f);
 		}
-
-		// Move the context (if movable)
-		new (static_cast<void*>(m_threads + m_count - 1)) Thread(std::string(name) + std::to_string(m_count), std::forward<Context>(f));
-	}
-
-	// Constructor with a function performed before adding more threads
-	template <typename CheckAndPrepare>
-	named_thread_group(std::string_view name, u32 count, Context&& f, CheckAndPrepare&& check) noexcept
-		: m_count(count)
-		, m_threads(nullptr)
-	{
-		if (count == 0)
-		{
-			return;
-		}
-
-		init_threads();
-		m_count = 0;
-
-		// Create all threads
-		for (u32 i = 0; i < count - 1; i++)
-		{
-			// Copy the context
-			std::remove_cvref_t<Context> context(static_cast<const Context&>(f));
-
-			// Perform the check and additional preparations for each context
-			if (!std::invoke(std::forward<CheckAndPrepare>(check), i, context))
-			{
-				return;
-			}
-
-			m_count++;
-			new (static_cast<void*>(m_threads + i)) Thread(std::string(name) + std::to_string(i + 1), std::move(context));
-		}
-
-		// Move the context (if movable)
-		std::remove_cvref_t<Context> context(std::forward<Context>(f));
-
-		if (!std::invoke(std::forward<CheckAndPrepare>(check), m_count - 1, context))
-		{
-			return;
-		}
-
-		m_count++;
-		new (static_cast<void*>(m_threads + m_count - 1)) Thread(std::string(name) + std::to_string(m_count - 1), std::move(context));
 	}
 
 	// Default constructor
-	named_thread_group(std::string_view name, u32 count) noexcept
+	named_thread_group(std::string_view name, u32 count)
 		: m_count(count)
 		, m_threads(nullptr)
 	{
@@ -888,12 +755,12 @@ public:
 		return m_count;
 	}
 
-	~named_thread_group() noexcept
+	~named_thread_group()
 	{
-		// Destroy all threads in reverse order (it should join them)
+		// Destroy all threads (it should join them)
 		for (u32 i = 0; i < m_count; i++)
 		{
-			std::launder(m_threads + (m_count - i - 1))->~Thread();
+			std::launder(m_threads + i)->~Thread();
 		}
 
 		::operator delete(static_cast<void*>(m_threads), std::align_val_t{alignof(Thread)});
diff --git a/Utilities/Timer.h b/Utilities/Timer.h
index 50f6ab7462..7d084b2f91 100644
--- a/Utilities/Timer.h
+++ b/Utilities/Timer.h
@@ -12,7 +12,7 @@ private:
 	steady_clock::time_point m_end;
 
 public:
-	Timer() : m_stopped(false), m_start(steady_clock::now())
+	Timer() : m_stopped(false)
 	{
 	}
 
diff --git a/Utilities/address_range.h b/Utilities/address_range.h
index 8da0279ef1..7e556d69e3 100644
--- a/Utilities/address_range.h
+++ b/Utilities/address_range.h
@@ -1,141 +1,133 @@
 #pragma once
 
 #include "util/types.hpp"
-#include "util/vm.hpp"
 #include "StrFmt.h"
 #include <vector>
 #include <algorithm>
 
+
 namespace utils
 {
-	template <typename T>
 	class address_range_vector;
 
+
 	/**
-	 * Helpers
+	 * Constexprs
 	 */
-	template <typename T>
-	T page_start(T addr)
+	constexpr inline u32 page_start(u32 addr)
 	{
-		return addr & ~static_cast<T>(get_page_size() - 1);
+		return addr & ~4095u;
 	}
 
-	template <typename T>
-	static inline T next_page(T addr)
+	constexpr inline u32 next_page(u32 addr)
 	{
-		return page_start(addr) + static_cast<T>(get_page_size());
+		return page_start(addr + 4096u);
 	}
 
-	template <typename T>
-	static inline T page_end(T addr)
+	constexpr inline u32 page_end(u32 addr)
 	{
 		return next_page(addr) - 1;
 	}
 
-	template <typename T>
-	static inline T is_page_aligned(T val)
+	constexpr inline u32 is_page_aligned(u32 addr)
 	{
-		return (val & static_cast<T>(get_page_size() - 1)) == 0;
+		return page_start(addr) == addr;
 	}
 
 
 	/**
 	 * Address Range utility class
 	 */
-	template <typename T>
 	class address_range
 	{
 	public:
-		T start = umax; // First address in range
-		T end = 0; // Last address
-
-		using signed_type_t = std::make_signed<T>::type;
+		u32 start = umax; // First address in range
+		u32 end = 0; // Last address
 
 	private:
 		// Helper constexprs
-		static constexpr inline bool range_overlaps(T start1, T end1, T start2, T end2)
+		static constexpr inline bool range_overlaps(u32 start1, u32 end1, u32 start2, u32 end2)
 		{
 			return (start1 <= end2 && start2 <= end1);
 		}
 
-		static constexpr inline bool address_overlaps(T address, T start, T end)
+		static constexpr inline bool address_overlaps(u32 address, u32 start, u32 end)
 		{
 			return (start <= address && address <= end);
 		}
 
-		static constexpr inline bool range_inside_range(T start1, T end1, T start2, T end2)
+		static constexpr inline bool range_inside_range(u32 start1, u32 end1, u32 start2, u32 end2)
 		{
 			return (start1 >= start2 && end1 <= end2);
 		}
 
-		constexpr address_range(T _start, T _end) : start(_start), end(_end) {}
+		constexpr address_range(u32 _start, u32 _end) : start(_start), end(_end) {}
 
 	public:
 		// Constructors
 		constexpr address_range() = default;
 
-		static constexpr address_range start_length(T _start, T _length)
+		static constexpr address_range start_length(u32 _start, u32 _length)
 		{
 			if (!_length)
 			{
 				return {};
 			}
 
-			const T _end = static_cast<T>(_start + _length - 1);
-			return {_start, _end};
+			return {_start, _start + (_length - 1)};
 		}
 
-		static constexpr address_range start_end(T _start, T _end)
+		static constexpr address_range start_end(u32 _start, u32 _end)
 		{
 			return {_start, _end};
 		}
 
 		// Length
-		T length() const
+		u32 length() const
 		{
 			AUDIT(valid());
 			return end - start + 1;
 		}
 
-		void set_length(const T new_length)
+		void set_length(const u32 new_length)
 		{
 			end = start + new_length - 1;
 			ensure(valid());
 		}
 
-		T next_address() const
+		u32 next_address() const
 		{
 			return end + 1;
 		}
 
-		T prev_address() const
+		u32 prev_address() const
 		{
 			return start - 1;
 		}
 
 		// Overlapping checks
-		bool overlaps(const address_range<T>& other) const
+		bool overlaps(const address_range &other) const
 		{
 			AUDIT(valid() && other.valid());
 			return range_overlaps(start, end, other.start, other.end);
 		}
 
-		bool overlaps(const T addr) const
+		bool overlaps(const u32 addr) const
 		{
 			AUDIT(valid());
 			return address_overlaps(addr, start, end);
 		}
 
-		bool inside(const address_range<T>& other) const
+		bool inside(const address_range &other) const
 		{
 			AUDIT(valid() && other.valid());
 			return range_inside_range(start, end, other.start, other.end);
 		}
 
-		inline bool inside(const address_range_vector<T>& vec) const;
-		inline bool overlaps(const address_range_vector<T>& vec) const;
+		inline bool inside(const address_range_vector &vec) const;
+		inline bool overlaps(const address_range_vector &vec) const;
 
-		bool touches(const address_range<T>& other) const
+		bool touches(const address_range &other) const
 		{
 			AUDIT(valid() && other.valid());
 			// returns true if there is overlap, or if sections are side-by-side
@@ -143,7 +135,7 @@ namespace utils
 		}
 
 		// Utilities
-		signed_type_t signed_distance(const address_range<T>& other) const
+		s32 signed_distance(const address_range &other) const
 		{
 			if (touches(other))
 			{
@@ -153,15 +145,15 @@ namespace utils
 			// other after this
 			if (other.start > end)
 			{
-				return static_cast<signed_type_t>(other.start - end - 1);
+				return static_cast<s32>(other.start - end - 1);
 			}
 
 			// this after other
 			AUDIT(start > other.end);
-			return -static_cast<signed_type_t>(start - other.end - 1);
+			return -static_cast<s32>(start - other.end - 1);
 		}
 
-		T distance(const address_range<T>& other) const
+		u32 distance(const address_range &other) const
 		{
 			if (touches(other))
 			{
@@ -179,7 +171,7 @@ namespace utils
 			return (start - other.end - 1);
 		}
 
-		address_range<T> get_min_max(const address_range<T>& other) const
+		address_range get_min_max(const address_range &other) const
 		{
 			return {
 				std::min(valid() ? start : umax, other.valid() ? other.start : umax),
@@ -187,17 +179,17 @@ namespace utils
 			};
 		}
 
-		void set_min_max(const address_range<T>& other)
+		void set_min_max(const address_range &other)
 		{
 			*this = get_min_max(other);
 		}
 
 		bool is_page_range() const
 		{
-			return (valid() && is_page_aligned(start) && is_page_aligned(length()));
+			return (valid() && start % 4096u == 0 && length() % 4096u == 0);
 		}
 
-		address_range<T> to_page_range() const
+		address_range to_page_range() const
 		{
 			AUDIT(valid());
 			return { page_start(start), page_end(end) };
@@ -211,7 +203,7 @@ namespace utils
 			AUDIT(is_page_range());
 		}
 
-		address_range<T> get_intersect(const address_range<T>& clamp) const
+		address_range get_intersect(const address_range &clamp) const
 		{
 			if (!valid() || !clamp.valid())
 			{
@@ -221,7 +213,7 @@ namespace utils
 			return { std::max(start, clamp.start), std::min(end, clamp.end) };
 		}
 
-		void intersect(const address_range<T>& clamp)
+		void intersect(const address_range &clamp)
 		{
 			if (!clamp.valid())
 			{
@@ -247,7 +239,7 @@ namespace utils
 		}
 
 		// Comparison Operators
-		bool operator ==(const address_range<T>& other) const
+		bool operator ==(const address_range& other) const
 		{
 			return (start == other.start && end == other.end);
 		}
@@ -261,27 +253,21 @@ namespace utils
 		}
 	};
 
-	using address_range16 = address_range<u16>;
-	using address_range32 = address_range<u32>;
-	using address_range64 = address_range<u64>;
-
-	template <typename T>
-	static inline address_range<T> page_for(T addr)
+	static inline address_range page_for(u32 addr)
 	{
-		return address_range<T>::start_end(page_start(addr), page_end(addr));
+		return address_range::start_end(page_start(addr), page_end(addr));
 	}
 
 
 	/**
 	 * Address Range Vector utility class
 	 *
-	 * Collection of address_range<T> objects. Allows for merging and removing ranges from the set.
+	 * Collection of address_range objects. Allows for merging and removing ranges from the set.
 	 */
-	template <typename T>
 	class address_range_vector
 	{
 	public:
-		using vector_type = std::vector<address_range<T>>;
+		using vector_type = std::vector<address_range>;
 		using iterator = vector_type::iterator;
 		using const_iterator = vector_type::const_iterator;
 		using size_type = vector_type::size_type;
@@ -295,8 +281,8 @@ namespace utils
 		inline void clear() { data.clear(); }
 		inline size_type size() const { return data.size(); }
 		inline bool empty() const { return data.empty(); }
-		inline address_range<T>& operator[](size_type n) { return data[n]; }
-		inline const address_range<T>& operator[](size_type n) const { return data[n]; }
+		inline address_range& operator[](size_type n) { return data[n]; }
+		inline const address_range& operator[](size_type n) const { return data[n]; }
 		inline iterator begin() { return data.begin(); }
 		inline const_iterator begin() const { return data.begin(); }
 		inline iterator end() { return data.end(); }
@@ -304,7 +290,7 @@ namespace utils
 
 		// Search for ranges that touch new_range. If found, merge instead of adding new_range.
 		// When adding a new range, re-use invalid ranges whenever possible
-		void merge(const address_range<T>& new_range)
+		void merge(const address_range &new_range)
 		{
 			// Note the case where we have
 			//   AAAA  BBBB
@@ -316,8 +302,8 @@ namespace utils
 				return;
 			}
 
-			address_range<T> *found = nullptr;
-			address_range<T> *invalid = nullptr;
+			address_range *found = nullptr;
+			address_range *invalid = nullptr;
 
 			for (auto &existing : data)
 			{
@@ -362,22 +348,22 @@ namespace utils
 			AUDIT(check_consistency());
 		}
 
-		void merge(const address_range_vector<T>& other)
+		void merge(const address_range_vector &other)
 		{
-			for (const address_range<T>& new_range : other)
+			for (const address_range &new_range : other)
 			{
 				merge(new_range);
 			}
 		}
 
 		// Exclude a given range from data
-		void exclude(const address_range<T>& exclusion)
+		void exclude(const address_range &exclusion)
 		{
 			// Note the case where we have
 			//    AAAAAAA
 			//      EEE
 			// where data={A} and exclusion=E.
-			// In this case, we need to reduce A to the head (before E starts), and then create a new address_range<T> B for the tail (after E ends), i.e.
+			// In this case, we need to reduce A to the head (before E starts), and then create a new address_range B for the tail (after E ends), i.e.
 			//    AA   BB
 			//      EEE
 
@@ -386,13 +372,13 @@ namespace utils
 				return;
 			}
 
-			address_range<T> *invalid = nullptr; // try to re-use an invalid range instead of calling push_back
+			address_range *invalid = nullptr; // try to re-use an invalid range instead of calling push_back
 
 			// We use index access because we might have to push_back within the loop, which could invalidate the iterators
 			size_type _size = data.size();
 			for (size_type n = 0; n < _size; ++n)
 			{
-				address_range<T>& existing = data[n];
+				address_range &existing = data[n];
 
 				if (!existing.valid())
 				{
@@ -445,7 +431,7 @@ namespace utils
 					else
 					{
 						// IMPORTANT: adding to data invalidates "existing". This must be done last!
-						data.push_back(address_range<T>::start_end(exclusion.next_address(), tail_end));
+						data.push_back(address_range::start_end(exclusion.next_address(), tail_end));
 					}
 				}
 			}
@@ -453,9 +439,9 @@ namespace utils
 			AUDIT(!overlaps(exclusion));
 		}
 
-		void exclude(const address_range_vector<T>& other)
+		void exclude(const address_range_vector &other)
 		{
-			for (const address_range<T>& exclusion : other)
+			for (const address_range &exclusion : other)
 			{
 				exclude(exclusion);
 			}
@@ -493,25 +479,25 @@ namespace utils
 		}
 
 		// Test for overlap with a given range
-		bool overlaps(const address_range<T>& range) const
+		bool overlaps(const address_range &range) const
 		{
-			return std::any_of(data.cbegin(), data.cend(), [&range](const address_range<T>& cur)
+			return std::any_of(data.cbegin(), data.cend(), [&range](const address_range& cur)
 			{
 				return cur.valid() && cur.overlaps(range);
 			});
 		}
 
-		// Test for overlap with a given address_range<T> vector
-		bool overlaps(const address_range_vector<T>& other) const
+		// Test for overlap with a given address_range vector
+		bool overlaps(const address_range_vector &other) const
 		{
-			for (const address_range<T>& rng1 : data)
+			for (const address_range &rng1 : data)
 			{
 				if (!rng1.valid())
 				{
 					continue;
 				}
 
-				for (const address_range<T>& rng2 : other.data)
+				for (const address_range &rng2 : other.data)
 				{
 					if (!rng2.valid())
 					{
@@ -528,56 +514,36 @@ namespace utils
 		}
 
 		// Test if a given range is fully contained inside this vector
-		bool contains(const address_range<T>& range) const
+		bool contains(const address_range &range) const
 		{
-			return std::any_of(this->begin(), this->end(), [&range](const address_range<T>& cur)
+			return std::any_of(this->begin(), this->end(), [&range](const address_range& cur)
 			{
 				return cur.valid() && cur.inside(range);
 			});
 		}
 
 		// Test if all ranges in this vector are full contained inside a specific range
-		bool inside(const address_range<T>& range) const
+		bool inside(const address_range &range) const
 		{
-			return std::all_of(this->begin(), this->end(), [&range](const address_range<T>& cur)
+			return std::all_of(this->begin(), this->end(), [&range](const address_range& cur)
 			{
 				return !cur.valid() || cur.inside(range);
 			});
 		}
-
-		// Count valid entries
-		usz valid_count() const
-		{
-			usz count = 0;
-			for (const auto& e : data)
-			{
-				if (e.valid())
-				{
-					count++;
-				}
-			}
-			return count;
-		}
 	};
 
 
 	// These declarations must be done after address_range_vector has been defined
-	template <typename T>
-	bool address_range<T>::inside(const address_range_vector<T>& vec) const
+	bool address_range::inside(const address_range_vector &vec) const
 	{
 		return vec.contains(*this);
 	}
 
-	template <typename T>
-	bool address_range<T>::overlaps(const address_range_vector<T>& vec) const
+	bool address_range::overlaps(const address_range_vector &vec) const
 	{
 		return vec.overlaps(*this);
 	}
 
-	using address_range_vector16 = address_range_vector<u16>;
-	using address_range_vector32 = address_range_vector<u32>;
-	using address_range_vector64 = address_range_vector<u64>;
-
 } // namespace utils
 
 
@@ -586,9 +552,9 @@ namespace std
 	static_assert(sizeof(usz) >= 2 * sizeof(u32), "usz must be at least twice the size of u32");
 
 	template <>
-	struct hash<utils::address_range32>
+	struct hash<utils::address_range>
 	{
-		usz operator()(const utils::address_range32& k) const
+		usz operator()(const utils::address_range& k) const
 		{
 			// we can guarantee a unique hash since our type is 64 bits and usz as well
 			return (usz{ k.start } << 32) | usz{ k.end };
diff --git a/Utilities/bin_patch.cpp b/Utilities/bin_patch.cpp
index 9449d808c0..7a3e79e875 100644
--- a/Utilities/bin_patch.cpp
+++ b/Utilities/bin_patch.cpp
@@ -1,20 +1,14 @@
 #include "bin_patch.h"
-#include "ppu_patch.h"
 #include "File.h"
 #include "Config.h"
 #include "version.h"
-#include "Emu/IdManager.h"
 #include "Emu/Memory/vm.h"
 #include "Emu/System.h"
-#include "Emu/VFS.h"
 
 #include "util/types.hpp"
+#include "util/endian.hpp"
 #include "util/asm.hpp"
 
-#include <charconv>
-#include <regex>
-#include <vector>
-
 LOG_CHANNEL(patch_log, "PAT");
 
 template <>
@@ -35,23 +29,6 @@ void fmt_class_string<YAML::NodeType::value>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
-void fmt_class_string<patch_configurable_type>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](patch_configurable_type value)
-	{
-		switch (value)
-		{
-		case patch_configurable_type::double_range: return "double_range";
-		case patch_configurable_type::double_enum: return "double_enum";
-		case patch_configurable_type::long_range: return "long_range";
-		case patch_configurable_type::long_enum: return "long_enum";
-		}
-
-		return unknown;
-	});
-}
-
 template <>
 void fmt_class_string<patch_type>::format(std::string& out, u64 arg)
 {
@@ -61,10 +38,6 @@ void fmt_class_string<patch_type>::format(std::string& out, u64 arg)
 		{
 		case patch_type::invalid: return "invalid";
 		case patch_type::alloc: return "alloc";
-		case patch_type::code_alloc: return "calloc";
-		case patch_type::jump: return "jump";
-		case patch_type::jump_link: return "jumpl";
-		case patch_type::jump_func: return "jumpf";
 		case patch_type::load: return "load";
 		case patch_type::byte: return "byte";
 		case patch_type::le16: return "le16";
@@ -79,61 +52,38 @@ void fmt_class_string<patch_type>::format(std::string& out, u64 arg)
 		case patch_type::bd64: return "bd64";
 		case patch_type::lef32: return "lef32";
 		case patch_type::lef64: return "lef64";
-		case patch_type::bp_exec: return "bpex";
 		case patch_type::utf8: return "utf8";
-		case patch_type::c_utf8: return "cutf8";
-		case patch_type::move_file: return "move_file";
-		case patch_type::hide_file: return "hide_file";
 		}
 
 		return unknown;
 	});
 }
 
-void patch_engine::patch_config_value::set_and_check_value(f64 new_value, std::string_view name)
-{
-	switch (type)
-	{
-	case patch_configurable_type::double_enum:
-	case patch_configurable_type::long_enum:
-	{
-		if (std::none_of(allowed_values.begin(), allowed_values.end(), [&new_value](const patch_allowed_value& allowed_value){ return allowed_value.value == new_value; }))
-		{
-			patch_log.error("Can't set configurable enumerated value '%s' to %f. Using default value %f", name, new_value, value);
-			return;
-		}
-		break;
-	}
-	case patch_configurable_type::double_range:
-	case patch_configurable_type::long_range:
-	{
-		if (new_value < min || new_value > max)
-		{
-			patch_log.error("Can't set configurable range value '%s' to %f. Using default value %f", name, new_value, value);
-			return;
-		}
-		break;
-	}
-	}
-
-	value = new_value;
-}
-
 patch_engine::patch_engine()
 {
+	const std::string patches_path = get_patches_path();
+
+	if (!fs::create_path(patches_path))
+	{
+		patch_log.fatal("Failed to create path: %s (%s)", patches_path, fs::g_tls_error);
+	}
 }
 
 std::string patch_engine::get_patch_config_path()
 {
-	const std::string config_dir = fs::get_config_dir(true);
-	const std::string patch_path = config_dir + "patch_config.yml";
 #ifdef _WIN32
+	const std::string config_dir = fs::get_config_dir() + "config/";
+	const std::string patch_path = config_dir + "patch_config.yml";
+
 	if (!fs::create_path(config_dir))
 	{
 		patch_log.error("Could not create path: %s (%s)", patch_path, fs::g_tls_error);
 	}
-#endif
+
 	return patch_path;
+#else
+	return fs::get_config_dir() + "patch_config.yml";
+#endif
 }
 
 std::string patch_engine::get_patches_path()
@@ -146,17 +96,10 @@ std::string patch_engine::get_imported_patch_path()
 	return get_patches_path() + "imported_patch.yml";
 }
 
-static void append_log_message(std::stringstream* log_messages, std::string_view message, const logs::message* channel = nullptr)
+static void append_log_message(std::stringstream* log_messages, const std::string& message)
 {
-	if (channel)
-	{
-		channel->operator()("%s", message);
-	}
-
-	if (log_messages && !message.empty())
-	{
+	if (log_messages)
 		*log_messages << message << std::endl;
-	}
 };
 
 bool patch_engine::load(patch_map& patches_map, const std::string& path, std::string content, bool importing, std::stringstream* log_messages)
@@ -201,7 +144,8 @@ bool patch_engine::load(patch_map& patches_map, const std::string& path, std::st
 
 		if (version != patch_engine_version)
 		{
-			append_log_message(log_messages, fmt::format("Error: File version %s does not match patch engine target version %s (location: %s, file: %s)", version, patch_engine_version, get_yaml_node_location(version_node), path), &patch_log.error);
+			append_log_message(log_messages, fmt::format("Error: File version %s does not match patch engine target version %s (file: %s)", version, patch_engine_version, path));
+			patch_log.error("File version %s does not match patch engine target version %s (file: %s)", version, patch_engine_version, path);
 			return false;
 		}
 
@@ -210,7 +154,8 @@ bool patch_engine::load(patch_map& patches_map, const std::string& path, std::st
 	}
 	else
 	{
-		append_log_message(log_messages, fmt::format("Error: No '%s' entry found. Patch engine version = %s (file: %s)", patch_key::version, patch_engine_version, path), &patch_log.error);
+		append_log_message(log_messages, fmt::format("Error: No '%s' entry found. Patch engine version = %s (file: %s)", patch_key::version, patch_engine_version, path));
+		patch_log.error("No '%s' entry found. Patch engine version = %s (file: %s)", patch_key::version, patch_engine_version, path);
 		return false;
 	}
 
@@ -219,18 +164,12 @@ bool patch_engine::load(patch_map& patches_map, const std::string& path, std::st
 	// Go through each main key in the file
 	for (auto pair : root)
 	{
-		const std::string& main_key = pair.first.Scalar();
-
-		if (main_key.empty())
-		{
-			append_log_message(log_messages, fmt::format("Error: Skipping empty key (location: %s, file: %s)", get_yaml_node_location(pair.first), path), &patch_log.error);
-			is_valid = false;
-			continue;
-		}
+		const auto& main_key = pair.first.Scalar();
 
 		if (const auto yml_type = pair.second.Type(); yml_type != YAML::NodeType::Map)
 		{
-			append_log_message(log_messages, fmt::format("Error: Skipping key %s: expected Map, found %s (location: %s, file: %s)", main_key, yml_type, get_yaml_node_location(pair.second), path), &patch_log.error);
+			append_log_message(log_messages, fmt::format("Error: Skipping key %s: expected Map, found %s", main_key, yml_type));
+			patch_log.error("Skipping key %s: expected Map, found %s (file: %s)", main_key, yml_type, path);
 			is_valid = false;
 			continue;
 		}
@@ -242,9 +181,9 @@ bool patch_engine::load(patch_map& patches_map, const std::string& path, std::st
 		}
 
 		// Find or create an entry matching the key/hash in our map
-		patch_container& container = patches_map[main_key];
-		container.hash    = main_key;
-		container.version = version;
+		auto& container = patches_map[main_key];
+		container.hash      = main_key;
+		container.version   = version;
 
 		// Go through each patch
 		for (auto patches_entry : pair.second)
@@ -252,18 +191,12 @@ bool patch_engine::load(patch_map& patches_map, const std::string& path, std::st
 			// Each key in "Patches" is also the patch description
 			const std::string& description = patches_entry.first.Scalar();
 
-			if (description.empty())
-			{
-				append_log_message(log_messages, fmt::format("Error: Empty patch name (key: %s, location: %s, file: %s)", main_key, get_yaml_node_location(patches_entry.first), path), &patch_log.error);
-				is_valid = false;
-				continue;
-			}
-
 			// Compile patch information
 
 			if (const auto yml_type = patches_entry.second.Type(); yml_type != YAML::NodeType::Map)
 			{
-				append_log_message(log_messages, fmt::format("Error: Skipping Patch key %s: expected Map, found %s (key: %s, location: %s, file: %s)", description, yml_type, main_key, get_yaml_node_location(patches_entry.second), path), &patch_log.error);
+				append_log_message(log_messages, fmt::format("Error: Skipping Patch key %s: expected Map, found %s (key: %s)", description, yml_type, main_key));
+				patch_log.error("Skipping Patch key %s: expected Map, found %s (key: %s, file: %s)", description, yml_type, main_key, path);
 				is_valid = false;
 				continue;
 			}
@@ -278,7 +211,8 @@ bool patch_engine::load(patch_map& patches_map, const std::string& path, std::st
 			{
 				if (const auto yml_type = games_node.Type(); yml_type != YAML::NodeType::Map)
 				{
-					append_log_message(log_messages, fmt::format("Error: Skipping Games key: expected Map, found %s (patch: %s, key: %s, location: %s, file: %s)", yml_type, description, main_key, get_yaml_node_location(games_node), path), &patch_log.error);
+					append_log_message(log_messages, fmt::format("Error: Skipping Games key: expected Map, found %s (patch: %s, key: %s)", yml_type, description, main_key));
+					patch_log.error("Skipping Games key: expected Map, found %s (patch: %s, key: %s, file: %s)", yml_type, description, main_key, path);
 					is_valid = false;
 					continue;
 				}
@@ -287,16 +221,10 @@ bool patch_engine::load(patch_map& patches_map, const std::string& path, std::st
 				{
 					const std::string& title = game_node.first.Scalar();
 
-					if (title.empty())
-					{
-						append_log_message(log_messages, fmt::format("Error: Empty game title (key: %s, location: %s, file: %s)", main_key, get_yaml_node_location(game_node), path), &patch_log.error);
-						is_valid = false;
-						continue;
-					}
-
 					if (const auto yml_type = game_node.second.Type(); yml_type != YAML::NodeType::Map)
 					{
-						append_log_message(log_messages, fmt::format("Error: Skipping game %s: expected Map, found %s (patch: %s, key: %s, location: %s, file: %s)", title, yml_type, description, main_key, get_yaml_node_location(game_node), path), &patch_log.error);
+						append_log_message(log_messages, fmt::format("Error: Skipping %s: expected Map, found %s (patch: %s, key: %s)", title, yml_type, description, main_key));
+						patch_log.error("Skipping %s: expected Map, found %s (patch: %s, key: %s, file: %s)", title, yml_type, description, main_key, path);
 						is_valid = false;
 						continue;
 					}
@@ -307,78 +235,53 @@ bool patch_engine::load(patch_map& patches_map, const std::string& path, std::st
 					{
 						const std::string& serial = serial_node.first.Scalar();
 
-						if (serial.empty())
-						{
-							append_log_message(log_messages, fmt::format("Error: Using empty serial (title: %s, patch: %s, key: %s, location: %s, file: %s)", title, description, main_key, get_yaml_node_location(serial_node), path), &patch_log.error);
-							is_valid = false;
-							continue;
-						}
-
 						if (serial == patch_key::all)
 						{
 							if (!title_is_all_key)
 							{
-								append_log_message(log_messages, fmt::format("Error: Using '%s' as serial is not allowed for titles other than '%s' (title: %s, patch: %s, key: %s, location: %s, file: %s)", patch_key::all, patch_key::all, title, description, main_key, get_yaml_node_location(serial_node), path), &patch_log.error);
+								append_log_message(log_messages, fmt::format("Error: Using '%s' as serial is not allowed for titles other than '%s' (title: %s, patch: %s, key: %s)", patch_key::all, patch_key::all, title, description, main_key));
+								patch_log.error("Error: Using '%s' as serial is not allowed for titles other than '%s' (title: %s, patch: %s, key: %s, file: %s)", patch_key::all, patch_key::all, title, description, main_key, path);
 								is_valid = false;
 								continue;
 							}
 						}
 						else if (title_is_all_key)
 						{
-							append_log_message(log_messages, fmt::format("Error: Only '%s' is allowed as serial if the title is '%s' (serial: %s, patch: %s, key: %s, location: %s, file: %s)", patch_key::all, patch_key::all, serial, description, main_key, get_yaml_node_location(serial_node), path), &patch_log.error);
-							is_valid = false;
-							continue;
-						}
-						else if (serial.size() != 9 || !std::all_of(serial.begin(), serial.end(), [](char c) { return std::isalnum(c); }))
-						{
-							append_log_message(log_messages, fmt::format("Error: Serial '%s' invalid (patch: %s, key: %s, location: %s, file: %s)", serial, description, main_key, get_yaml_node_location(serial_node), path), &patch_log.error);
+							append_log_message(log_messages, fmt::format("Error: Only '%s' is allowed as serial if the title is '%s' (serial: %s, patch: %s, key: %s)", patch_key::all, patch_key::all, serial, description, main_key));
+							patch_log.error("Error: Only '%s' is allowed as serial if the title is '%s' (serial: %s, patch: %s, key: %s, file: %s)", patch_key::all, patch_key::all, serial, description, main_key, path);
 							is_valid = false;
 							continue;
 						}
 
 						if (const auto yml_type = serial_node.second.Type(); yml_type != YAML::NodeType::Sequence)
 						{
-							append_log_message(log_messages, fmt::format("Error: Skipping %s: expected Sequence, found %s (title: %s, patch: %s, key: %s, location: %s, file: %s)", serial, title, yml_type, description, main_key, get_yaml_node_location(serial_node), path), &patch_log.error);
+							append_log_message(log_messages, fmt::format("Error: Skipping %s: expected Sequence, found %s (title: %s, patch: %s, key: %s)", serial, title, yml_type, description, main_key));
+							patch_log.error("Skipping %s: expected Sequence, found %s (title: %s, patch: %s, key: %s, file: %s)", serial, title, yml_type, description, main_key, path);
 							is_valid = false;
 							continue;
 						}
 
-						patch_app_versions app_versions;
+						patch_engine::patch_app_versions app_versions;
 
 						for (const auto version : serial_node.second)
 						{
-							const std::string& app_version = version.Scalar();
+							const auto& app_version = version.Scalar();
 
-							static const std::regex app_ver_regexp("^([0-9]{2}\\.[0-9]{2})$");
+							// Find out if this patch was enabled in the patch config
+							const bool enabled = patch_config[main_key].patch_info_map[description].titles[title][serial][app_version];
 
-							if (app_version != patch_key::all && (app_version.size() != 5 || !std::regex_match(app_version, app_ver_regexp)))
-							{
-								append_log_message(log_messages, fmt::format("Error: Skipping invalid app version '%s' (title: %s, serial: %s, patch: %s, key: %s, location: %s, file: %s)", app_version, title, serial, description, main_key, get_yaml_node_location(serial_node), path), &patch_log.error);
-								is_valid = false;
-								continue;
-							}
-
-							if (app_versions.contains(app_version))
-							{
-								append_log_message(log_messages, fmt::format("Error: Skipping duplicate app version '%s' (title: %s, serial: %s, patch: %s, key: %s, location: %s, file: %s)", app_version, title, serial, description, main_key, get_yaml_node_location(serial_node), path), &patch_log.error);
-								is_valid = false;
-								continue;
-							}
-
-							// Get this patch's config values
-							const patch_config_values& config_values = patch_config[main_key].patch_info_map[description].titles[title][serial][app_version];
-
-							app_versions[app_version] = config_values;
+							app_versions.emplace(version.Scalar(), enabled);
 						}
 
 						if (app_versions.empty())
 						{
-							append_log_message(log_messages, fmt::format("Error: Skipping %s: empty Sequence (title: %s, patch: %s, key: %s, location: %s, file: %s)", serial, title, description, main_key, get_yaml_node_location(serial_node), path), &patch_log.error);
+							append_log_message(log_messages, fmt::format("Error: Skipping %s: empty Sequence (title: %s, patch: %s, key: %s)", serial, title, description, main_key));
+							patch_log.error("Skipping %s: empty Sequence (title: %s, patch: %s, key: %s, file: %s)", serial, title, description, main_key, path);
 							is_valid = false;
 						}
 						else
 						{
-							info.titles[title][serial] = std::move(app_versions);
+							info.titles[title][serial] = app_versions;
 						}
 					}
 				}
@@ -400,21 +303,14 @@ bool patch_engine::load(patch_map& patches_map, const std::string& path, std::st
 				{
 					for (const auto note : notes_node)
 					{
-						if (note)
+						if (note && note.IsScalar())
 						{
-							if (note.IsScalar())
-							{
-								info.notes += note.Scalar();
-							}
-							else
-							{
-								append_log_message(log_messages, fmt::format("Error: Skipping sequenced Note (patch: %s, key: %s, location: %s, file: %s)", description, main_key, get_yaml_node_location(note), path), &patch_log.error);
-								is_valid = false;
-							}
+							info.notes += note.Scalar();
 						}
 						else
 						{
-							append_log_message(log_messages, fmt::format("Error: Skipping sequenced Note (patch: %s, key: %s, location: %s, file: %s)", description, main_key, get_yaml_node_location(notes_node), path), &patch_log.error);
+							append_log_message(log_messages, fmt::format("Error: Skipping sequenced Note (patch: %s, key: %s)", description, main_key));
+							patch_log.error("Skipping sequenced Note (patch: %s, key: %s, file: %s)", description, main_key, path);
 							is_valid = false;
 						}
 					}
@@ -430,236 +326,46 @@ bool patch_engine::load(patch_map& patches_map, const std::string& path, std::st
 				info.patch_group = patch_group_node.Scalar();
 			}
 
-			if (const auto config_values_node = patches_entry.second[patch_key::config_values])
-			{
-				if (const auto yml_type = config_values_node.Type(); yml_type != YAML::NodeType::Map || config_values_node.size() == 0)
-				{
-					append_log_message(log_messages, fmt::format("Error: Skipping configurable values: expected Map, found %s (patch: %s, key: %s, location: %s, file: %s)", yml_type, description, main_key, get_yaml_node_location(config_values_node), path), &patch_log.error);
-					is_valid = false;
-				}
-				else
-				{
-					for (const auto config_value_node : config_values_node)
-					{
-						const std::string& value_key = config_value_node.first.Scalar();
-
-						if (const auto yml_type = config_value_node.second.Type(); yml_type != YAML::NodeType::Map)
-						{
-							append_log_message(log_messages, fmt::format("Error: Skipping configurable value %s: expected Map, found %s (patch: %s, key: %s, location: %s, file: %s)", value_key, yml_type, description, main_key, get_yaml_node_location(config_value_node), path), &patch_log.error);
-							is_valid = false;
-						}
-						else
-						{
-							patch_config_value& config_value = info.default_config_values[value_key];
-
-							if (const auto config_value_type_node = config_value_node.second[patch_key::type]; config_value_type_node && config_value_type_node.IsScalar())
-							{
-								const std::string& str_type = config_value_type_node.Scalar();
-								bool is_valid_type = false;
-
-								for (patch_configurable_type type : { patch_configurable_type::double_range, patch_configurable_type::double_enum, patch_configurable_type::long_range, patch_configurable_type::long_enum })
-								{
-									if (str_type == fmt::format("%s", type))
-									{
-										config_value.type = type;
-										is_valid_type = true;
-										break;
-									}
-								}
-
-								if (is_valid_type)
-								{
-									const auto get_and_check_config_value = [&](const YAML::Node& node)
-									{
-										std::string err;
-										f64 val{};
-
-										switch (config_value.type)
-										{
-										case patch_configurable_type::double_range:
-										case patch_configurable_type::double_enum:
-											val = get_yaml_node_value<f64>(node, err);
-											break;
-										case patch_configurable_type::long_range:
-										case patch_configurable_type::long_enum:
-											val = static_cast<f64>(get_yaml_node_value<s64>(node, err));
-											break;
-										}
-
-										if (!err.empty())
-										{
-											append_log_message(log_messages, fmt::format("Error: Invalid data type found in configurable value: %s (key: %s, location: %s, file: %s)", err, main_key, get_yaml_node_location(config_value_node), path), &patch_log.error);
-											is_valid = false;
-										}
-
-										return val;
-									};
-
-									if (const auto config_value_value_node = config_value_node.second[patch_key::value]; config_value_value_node && config_value_value_node.IsScalar())
-									{
-										config_value.value = get_and_check_config_value(config_value_value_node);
-									}
-									else
-									{
-										append_log_message(log_messages, fmt::format("Error: Invalid or missing configurable value (key: %s, location: %s, file: %s)", main_key, get_yaml_node_location(config_value_node), path), &patch_log.error);
-										is_valid = false;
-									}
-
-									switch (config_value.type)
-									{
-									case patch_configurable_type::double_range:
-									case patch_configurable_type::long_range:
-									{
-										if (const auto config_value_min_node = config_value_node.second[patch_key::min]; config_value_min_node && config_value_min_node.IsScalar())
-										{
-											config_value.min = get_and_check_config_value(config_value_min_node);
-										}
-										else
-										{
-											append_log_message(log_messages, fmt::format("Error: Invalid or missing configurable min (key: %s, location: %s, file: %s)", main_key, get_yaml_node_location(config_value_node), path), &patch_log.error);
-											is_valid = false;
-										}
-
-										if (const auto config_value_max_node = config_value_node.second[patch_key::max]; config_value_max_node && config_value_max_node.IsScalar())
-										{
-											config_value.max = get_and_check_config_value(config_value_max_node);
-										}
-										else
-										{
-											append_log_message(log_messages, fmt::format("Error: Invalid or missing configurable max (key: %s, location: %s, file: %s)", main_key, get_yaml_node_location(config_value_node), path), &patch_log.error);
-											is_valid = false;
-										}
-
-										if (config_value.min >= config_value.max)
-										{
-											append_log_message(log_messages, fmt::format("Error: Configurable max has to be larger than configurable min (key: %s, location: %s, file: %s)", main_key, get_yaml_node_location(config_value_node), path), &patch_log.error);
-											is_valid = false;
-										}
-
-										if (config_value.value < config_value.min || config_value.value > config_value.max)
-										{
-											append_log_message(log_messages, fmt::format("Error: Configurable value out of range (key: %s, location: %s, file: %s)", main_key, get_yaml_node_location(config_value_node), path), &patch_log.error);
-											is_valid = false;
-										}
-										break;
-									}
-									case patch_configurable_type::double_enum:
-									case patch_configurable_type::long_enum:
-									{
-										if (const auto config_value_allowed_values_node = config_value_node.second[patch_key::allowed_values]; config_value_allowed_values_node && config_value_allowed_values_node.IsMap())
-										{
-											config_value.allowed_values.clear();
-
-											for (const auto allowed_value : config_value_allowed_values_node)
-											{
-												if (allowed_value.second && allowed_value.second.IsScalar())
-												{
-													patch_allowed_value new_allowed_value{};
-													new_allowed_value.label = allowed_value.first.Scalar();
-													new_allowed_value.value = get_and_check_config_value(allowed_value.second);
-
-													if (std::any_of(config_value.allowed_values.begin(), config_value.allowed_values.end(), [&new_allowed_value](const patch_allowed_value& other){ return new_allowed_value.value == other.value || new_allowed_value.label == other.label; }))
-													{
-														append_log_message(log_messages, fmt::format("Error: Skipping configurable allowed value. Another entry with the same label or value already exists. (patch: %s, key: %s, location: %s, file: %s)", description, main_key, get_yaml_node_location(allowed_value), path), &patch_log.error);
-														is_valid = false;
-													}
-													else
-													{
-														config_value.allowed_values.push_back(std::move(new_allowed_value));
-													}
-												}
-												else
-												{
-													append_log_message(log_messages, fmt::format("Error: Skipping configurable allowed value (patch: %s, key: %s, location: %s, file: %s)", description, main_key, get_yaml_node_location(allowed_value), path), &patch_log.error);
-													is_valid = false;
-												}
-											}
-
-											if (config_value.allowed_values.size() < 2)
-											{
-												append_log_message(log_messages, fmt::format("Error: Configurable allowed values need at least 2 entries (key: %s, location: %s, file: %s)", main_key, get_yaml_node_location(config_value_allowed_values_node), path), &patch_log.error);
-												is_valid = false;
-											}
-
-											if (std::none_of(config_value.allowed_values.begin(), config_value.allowed_values.end(), [&config_value](const patch_allowed_value& other){ return other.value == config_value.value; }))
-											{
-												append_log_message(log_messages, fmt::format("Error: Configurable value was not found in allowed values (key: %s, location: %s, file: %s)", main_key, get_yaml_node_location(config_value_allowed_values_node), path), &patch_log.error);
-												is_valid = false;
-											}
-										}
-										else
-										{
-											append_log_message(log_messages, fmt::format("Error: Invalid or missing configurable allowed values (key: %s, location: %s, file: %s)", main_key, get_yaml_node_location(config_value_node), path), &patch_log.error);
-											is_valid = false;
-										}
-										break;
-									}
-									}
-								}
-								else
-								{
-									append_log_message(log_messages, fmt::format("Error: Invalid configurable type (key: %s, location: %s, file: %s)", main_key, get_yaml_node_location(config_value_type_node), path), &patch_log.error);
-									is_valid = false;
-								}
-							}
-							else
-							{
-								append_log_message(log_messages, fmt::format("Error: Invalid or missing configurable type (key: %s, location: %s, file: %s)", main_key, get_yaml_node_location(config_value_node), path), &patch_log.error);
-								is_valid = false;
-							}
-						}
-					}
-				}
-			}
-
 			if (const auto patch_node = patches_entry.second[patch_key::patch])
 			{
-				if (!read_patch_node(info, patch_node, root, path, log_messages))
+				if (!read_patch_node(info, patch_node, root, log_messages))
 				{
-					for (const auto& it : patches_entry.second)
-					{
-						if (it.first.Scalar() == patch_key::patch)
-						{
-							append_log_message(log_messages, fmt::format("Skipping invalid patch node %s: (key: %s, location: %s, file: %s)", info.description, main_key, get_yaml_node_location(it.first), path), &patch_log.error);
-							break;
-						}
-					}
 					is_valid = false;
 				}
 			}
 
 			// Skip this patch if a higher patch version already exists
-			if (container.patch_info_map.contains(description))
+			if (container.patch_info_map.find(description) != container.patch_info_map.end())
 			{
 				bool ok;
-				const std::string& existing_version = container.patch_info_map[description].patch_version;
+				const auto existing_version  = container.patch_info_map[description].patch_version;
 				const bool version_is_bigger = utils::compare_versions(info.patch_version, existing_version, ok) > 0;
 
 				if (!ok || !version_is_bigger)
 				{
-					append_log_message(log_messages, fmt::format("A higher or equal patch version already exists ('%s' vs '%s') for %s: %s (in file %s)", info.patch_version, existing_version, main_key, description, path), &patch_log.warning);
+					patch_log.warning("A higher or equal patch version already exists ('%s' vs '%s') for %s: %s (in file %s)", info.patch_version, existing_version, main_key, description, path);
+					append_log_message(log_messages, fmt::format("A higher or equal patch version already exists ('%s' vs '%s') for %s: %s (in file %s)", info.patch_version, existing_version, main_key, description, path));
 					continue;
 				}
-
-				if (!importing)
+				else if (!importing)
 				{
 					patch_log.warning("A lower patch version was found ('%s' vs '%s') for %s: %s (in file %s)", existing_version, info.patch_version, main_key, description,  container.patch_info_map[description].source_path);
 				}
 			}
 
 			// Insert patch information
-			container.patch_info_map[description] = std::move(info);
+			container.patch_info_map[description] = info;
 		}
 	}
 
 	return is_valid;
 }
 
-patch_type patch_engine::get_patch_type(std::string_view text)
+patch_type patch_engine::get_patch_type(YAML::Node node)
 {
 	u64 type_val = 0;
 
-	if (!cfg::try_to_enum_value(&type_val, &fmt_class_string<patch_type>::format, text))
+	if (!node || !node.IsScalar() || !cfg::try_to_enum_value(&type_val, &fmt_class_string<patch_type>::format, node.Scalar()))
 	{
 		return patch_type::invalid;
 	}
@@ -667,26 +373,17 @@ patch_type patch_engine::get_patch_type(std::string_view text)
 	return static_cast<patch_type>(type_val);
 }
 
-patch_type patch_engine::get_patch_type(YAML::Node node)
-{
-	if (!node || !node.IsScalar())
-	{
-		return patch_type::invalid;
-	}
-
-	return get_patch_type(node.Scalar());
-}
-
-bool patch_engine::add_patch_data(YAML::Node node, patch_info& info, u32 modifier, const YAML::Node& root, std::string_view path, std::stringstream* log_messages)
+bool patch_engine::add_patch_data(YAML::Node node, patch_info& info, u32 modifier, const YAML::Node& root, std::stringstream* log_messages)
 {
 	if (!node || !node.IsSequence())
 	{
-		append_log_message(log_messages, fmt::format("Skipping invalid patch node %s. (key: %s, location: %s, file: %s)", info.description, info.hash, get_yaml_node_location(node), path), &patch_log.error);
+		append_log_message(log_messages, fmt::format("Skipping invalid patch node %s. (key: %s)", info.description, info.hash));
+		patch_log.error("Skipping invalid patch node %s. (key: %s)", info.description, info.hash);
 		return false;
 	}
 
 	const auto type_node  = node[0];
-	const auto addr_node  = node[1];
+	auto addr_node        = node[1];
 	const auto value_node = node[2];
 
 	const auto type = get_patch_type(type_node);
@@ -694,7 +391,8 @@ bool patch_engine::add_patch_data(YAML::Node node, patch_info& info, u32 modifie
 	if (type == patch_type::invalid)
 	{
 		const auto type_str = type_node && type_node.IsScalar() ? type_node.Scalar() : "";
-		append_log_message(log_messages, fmt::format("Skipping patch node %s: type '%s' is invalid. (key: %s, location: %s, file: %s)", info.description, type_str, info.hash, get_yaml_node_location(node), path), &patch_log.error);
+		append_log_message(log_messages, fmt::format("Skipping patch node %s: type '%s' is invalid. (key: %s)", info.description, type_str, info.hash));
+		patch_log.error("Skipping patch node %s: type '%s' is invalid. (key: %s)", info.description, type_str, info.hash);
 		return false;
 	}
 
@@ -705,7 +403,8 @@ bool patch_engine::add_patch_data(YAML::Node node, patch_info& info, u32 modifie
 		// Check if the anchor was resolved.
 		if (const auto yml_type = addr_node.Type(); yml_type != YAML::NodeType::Sequence)
 		{
-			append_log_message(log_messages, fmt::format("Skipping patch node %s: expected Sequence, found %s (key: %s, location: %s, file: %s)", info.description, yml_type, info.hash, get_yaml_node_location(node), path), &patch_log.error);
+			append_log_message(log_messages, fmt::format("Skipping sequence: expected Sequence, found %s (key: %s)", yml_type, info.hash));
+			patch_log.error("Skipping sequence: expected Sequence, found %s (key: %s)", yml_type, info.hash);
 			return false;
 		}
 
@@ -716,7 +415,7 @@ bool patch_engine::add_patch_data(YAML::Node node, patch_info& info, u32 modifie
 
 		for (const auto& item : addr_node)
 		{
-			if (!add_patch_data(item, info, mod, root, path, log_messages))
+			if (!add_patch_data(item, info, mod, root, log_messages))
 			{
 				is_valid = false;
 			}
@@ -725,151 +424,61 @@ bool patch_engine::add_patch_data(YAML::Node node, patch_info& info, u32 modifie
 		return is_valid;
 	}
 
-	if (const auto yml_type = value_node.Type(); yml_type != YAML::NodeType::Scalar)
-	{
-		append_log_message(log_messages, fmt::format("Skipping patch node %s. Value element has wrong type %s. (key: %s, location: %s, file: %s)", info.description, yml_type, info.hash, get_yaml_node_location(node), path), &patch_log.error);
-		return false;
-	}
-
-	if (patch_type_uses_hex_offset(type) && !addr_node.Scalar().starts_with("0x"))
-	{
-		append_log_message(log_messages, fmt::format("Skipping patch node %s. Address element has wrong format %s. (key: %s, location: %s, file: %s)", info.description, addr_node.Scalar(), info.hash, get_yaml_node_location(node), path), &patch_log.error);
-		return false;
-	}
-
-	patch_data p_data{};
-	p_data.type            = type;
-	p_data.offset          = addr_node.as<u32>(0) + modifier;
-	p_data.original_offset = addr_node.Scalar();
-	p_data.original_value  = value_node.Scalar();
-
-	const bool is_config_value = info.default_config_values.contains(p_data.original_value);
-	const patch_config_value config_value = is_config_value ? ::at32(info.default_config_values, p_data.original_value) : patch_config_value{};
+	struct patch_data p_data{};
+	p_data.type           = type;
+	p_data.offset         = addr_node.as<u32>(0) + modifier;
+	p_data.original_value = value_node.IsScalar() ? value_node.Scalar() : "";
 
 	std::string error_message;
 
-	// Validate offset
 	switch (p_data.type)
 	{
-	case patch_type::move_file:
-	case patch_type::hide_file:
-		break;
-	default:
-	{
-		[[maybe_unused]] const u32 offset = get_yaml_node_value<u32>(addr_node, error_message);
-		if (!error_message.empty())
-		{
-			error_message = fmt::format("Skipping patch data entry: [ %s, 0x%.8x, %s ] (key: %s, location: %s, file: %s) Invalid patch offset '%s' (not a valid u32 or overflow)",
-				p_data.type, p_data.offset, p_data.original_value.empty() ? "?" : p_data.original_value, info.hash, get_yaml_node_location(node), path, p_data.original_offset);
-			append_log_message(log_messages, error_message, &patch_log.error);
-			return false;
-		}
-		if ((0xFFFFFFFF - modifier) < p_data.offset)
-		{
-			error_message = fmt::format("Skipping patch data entry: [ %s, 0x%.8x, %s ] (key: %s, location: %s, file: %s) Invalid combination of patch offset 0x%.8x and modifier 0x%.8x (overflow)",
-				p_data.type, p_data.offset, p_data.original_value.empty() ? "?" : p_data.original_value, info.hash, get_yaml_node_location(node), path, p_data.offset, modifier);
-			append_log_message(log_messages, error_message, &patch_log.error);
-			return false;
-		}
-		break;
-	}
-	}
-
-	// Validate value
-	const auto get_node_value = [&]<typename U, typename S>(U, S) // Add unused params. The lambda doesn't compile otherwise.
-	{
-		p_data.value.long_value = is_config_value ? static_cast<U>(config_value.value) : get_yaml_node_value<U>(value_node, error_message);
-
-		if (error_message.find("bad conversion") != std::string::npos)
-		{
-			error_message.clear();
-			p_data.value.long_value = get_yaml_node_value<S>(value_node, error_message);
-		}
-	};
-
-	switch (p_data.type)
-	{
-	case patch_type::invalid:
-	case patch_type::load:
-	{
-		fmt::throw_exception("Unreachable patch type: %s", p_data.type);
-	}
-	case patch_type::bp_exec:
 	case patch_type::utf8:
-	case patch_type::c_utf8:
-	case patch_type::jump_func:
-	case patch_type::move_file:
-	case patch_type::hide_file:
 	{
 		break;
 	}
 	case patch_type::bef32:
 	case patch_type::lef32:
-	{
-		p_data.value.double_value = is_config_value ? config_value.value : get_yaml_node_value<f32>(value_node, error_message);
-		break;
-	}
 	case patch_type::bef64:
 	case patch_type::lef64:
 	{
-		p_data.value.double_value = is_config_value ? config_value.value : get_yaml_node_value<f64>(value_node, error_message);
+		p_data.value.double_value = get_yaml_node_value<f64>(value_node, error_message);
 		break;
 	}
-	case patch_type::byte:
+	default:
 	{
-		get_node_value(u8{}, s8{});
-		break;
-	}
-	case patch_type::le16:
-	case patch_type::be16:
-	{
-		get_node_value(u16{}, s16{});
-		break;
-	}
-	case patch_type::le32:
-	case patch_type::be32:
-	case patch_type::bd32:
-	{
-		get_node_value(u32{}, s32{});
-		break;
-	}
-	case patch_type::alloc:
-	case patch_type::code_alloc:
-	case patch_type::jump:
-	case patch_type::jump_link:
-	case patch_type::le64:
-	case patch_type::be64:
-	case patch_type::bd64:
-	{
-		get_node_value(u64{}, s64{});
+		p_data.value.long_value = get_yaml_node_value<u64>(value_node, error_message);
 		break;
 	}
 	}
 
 	if (!error_message.empty())
 	{
-		error_message = fmt::format("Skipping patch data entry: [ %s, 0x%.8x, %s ] (key: %s, location: %s, file: %s) %s",
-			p_data.type, p_data.offset, p_data.original_value.empty() ? "?" : p_data.original_value, info.hash, get_yaml_node_location(node), path, error_message);
-		append_log_message(log_messages, error_message, &patch_log.error);
+		error_message = fmt::format("Skipping patch data entry: [ %s, 0x%.8x, %s ] (key: %s) %s",
+			p_data.type, p_data.offset, p_data.original_value.empty() ? "?" : p_data.original_value, info.hash, error_message);
+		append_log_message(log_messages, error_message);
+		patch_log.error("%s", error_message);
 		return false;
 	}
 
-	info.data_list.emplace_back(std::move(p_data));
+	info.data_list.emplace_back(p_data);
 
 	return true;
 }
 
-bool patch_engine::read_patch_node(patch_info& info, YAML::Node node, const YAML::Node& root, std::string_view path, std::stringstream* log_messages)
+bool patch_engine::read_patch_node(patch_info& info, YAML::Node node, const YAML::Node& root, std::stringstream* log_messages)
 {
 	if (!node)
 	{
-		append_log_message(log_messages, fmt::format("Skipping invalid patch node %s. (key: %s, location: %s)", info.description, info.hash, get_yaml_node_location(node)), &patch_log.error);
+		append_log_message(log_messages, fmt::format("Skipping invalid patch node %s. (key: %s)", info.description, info.hash));
+		patch_log.error("Skipping invalid patch node %s. (key: %s)", info.description, info.hash);
 		return false;
 	}
 
 	if (const auto yml_type = node.Type(); yml_type != YAML::NodeType::Sequence)
 	{
-		append_log_message(log_messages, fmt::format("Skipping patch node %s: expected Sequence, found %s (key: %s, location: %s)", info.description, yml_type, info.hash, get_yaml_node_location(node)), &patch_log.error);
+		append_log_message(log_messages, fmt::format("Skipping patch node %s: expected Sequence, found %s (key: %s)", info.description, yml_type, info.hash));
+		patch_log.error("Skipping patch node %s: expected Sequence, found %s (key: %s)", info.description, yml_type, info.hash);
 		return false;
 	}
 
@@ -877,7 +486,7 @@ bool patch_engine::read_patch_node(patch_info& info, YAML::Node node, const YAML
 
 	for (auto patch : node)
 	{
-		if (!add_patch_data(patch, info, 0, root, path, log_messages))
+		if (!add_patch_data(patch, info, 0, root, log_messages))
 		{
 			is_valid = false;
 		}
@@ -895,7 +504,7 @@ void patch_engine::append_global_patches()
 	load(m_map, get_imported_patch_path());
 }
 
-void patch_engine::append_title_patches(std::string_view title_id)
+void patch_engine::append_title_patches(const std::string& title_id)
 {
 	if (title_id.empty())
 	{
@@ -903,96 +512,45 @@ void patch_engine::append_title_patches(std::string_view title_id)
 	}
 
 	// Regular patch.yml
-	load(m_map, fmt::format("%s%s_patch.yml", get_patches_path(), title_id));
+	load(m_map, get_patches_path() + title_id + "_patch.yml");
 }
 
-void unmap_vm_area(std::shared_ptr<vm::block_t>& ptr)
+void ppu_register_range(u32 addr, u32 size);
+
+static std::basic_string<u32> apply_modification(const patch_engine::patch_info& patch, u8* dst, u32 filesz, u32 min_addr)
 {
-	if (ptr && ptr->flags & (1ull << 62))
-	{
-		vm::unmap(0, true, &ptr);
-	}
-}
+	std::basic_string<u32> applied;
 
-// Returns old 'applied' size
-static usz apply_modification(std::vector<u32>& applied, patch_engine::patch_info& patch, std::function<u8*(u32, u32)> mem_translate, u32 filesz, u32 min_addr)
-{
-	const usz old_applied_size = applied.size();
-
-	// Update configurable values
-	for (const auto& [key, config_value] : patch.actual_config_values)
-	{
-		for (usz i = 0; i < patch.data_list.size(); i++)
-		{
-			patch_engine::patch_data& p = ::at32(patch.data_list, i);
-
-			if (p.original_value == key)
-			{
-				switch (p.type)
-				{
-				case patch_type::bef32:
-				case patch_type::lef32:
-				case patch_type::bef64:
-				case patch_type::lef64:
-				{
-					p.value.double_value = config_value.value;
-					patch_log.notice("Using configurable value (key='%s', value=%f, index=%d, hash='%s', description='%s', author='%s', patch_version='%s', file_version='%s')",
-						key, p.value.double_value, i, patch.hash, patch.description, patch.author, patch.patch_version, patch.version);
-					break;
-				}
-				default:
-				{
-					p.value.long_value = static_cast<u64>(config_value.value);
-					patch_log.notice("Using configurable value (key='%s', value=0x%x=%d, index=%d, hash='%s', description='%s', author='%s', patch_version='%s', file_version='%s')",
-						key, p.value.long_value, p.value.long_value, i, patch.hash, patch.description, patch.author, patch.patch_version, patch.version);
-					break;
-				}
-				}
-			}
-		}
-	}
-
-	for (const patch_engine::patch_data& p : patch.data_list)
+	for (const auto& p : patch.data_list)
 	{
 		if (p.type != patch_type::alloc) continue;
 
-		// Do not allow null address or if resultant ptr is not a VM ptr
-		if (const u32 alloc_at = (p.offset & -4096); alloc_at >> 16)
+		// Do not allow null address or if dst is not a VM ptr
+		if (const u32 alloc_at = vm::try_get_addr(dst + (p.offset & -4096)).first; alloc_at >> 16)
 		{
 			const u32 alloc_size = utils::align(static_cast<u32>(p.value.long_value) + alloc_at % 4096, 4096);
 
 			// Allocate map if needed, if allocated flags will indicate that bit 62 is set (unique identifier)
-			auto alloc_map = vm::reserve_map(vm::any, alloc_at & -0x10000, utils::align(alloc_size, 0x10000), vm::page_size_64k | (1ull << 62));
+			auto alloc_map = vm::reserve_map(vm::any, alloc_at & -0x10000, utils::align(alloc_size, 0x10000), vm::page_size_64k | vm::preallocated | vm::bf0_0x2 | (1ull << 62));
 
-			u64 flags = vm::alloc_unwritable;
+			u64 flags = 0;
 
 			switch (p.offset % patch_engine::mem_protection::mask)
 			{
-			case patch_engine::mem_protection::wx: flags = vm::alloc_executable; break;
-			case patch_engine::mem_protection::ro: break;
-			case patch_engine::mem_protection::rx: flags |= vm::alloc_executable; break;
-			case patch_engine::mem_protection::rw: flags &= ~vm::alloc_unwritable; break;
+			case patch_engine::mem_protection::wx: flags |= vm::page_writable + vm::page_readable + vm::page_executable; break;
+			case patch_engine::mem_protection::ro: flags |= vm::page_readable; break;
+			case patch_engine::mem_protection::rx: flags |= vm::page_writable + vm::page_executable; break;
+			case patch_engine::mem_protection::rw: flags |= vm::page_writable + vm::page_readable; break;
 			default: ensure(false);
 			}
 
 			if (alloc_map)
 			{
-				if (alloc_map->falloc(alloc_at, alloc_size, nullptr, flags))
+				if (alloc_map->falloc(alloc_at, alloc_size))
 				{
-					if (vm::check_addr(alloc_at, vm::page_1m_size))
-					{
-						p.alloc_addr = alloc_at & -0x100000;
-					}
-					else if (vm::check_addr(alloc_at, vm::page_64k_size))
-					{
-						p.alloc_addr = alloc_at & -0x10000;
-					}
-					else
-					{
-						p.alloc_addr = alloc_at & -0x1000;
-					}
+					vm::page_protect(alloc_at, alloc_size, 0, flags, flags ^ (vm::page_writable + vm::page_readable + vm::page_executable));
 
-					if (flags & vm::alloc_executable)
+					if (flags & vm::page_executable)
 					{
 						ppu_register_range(alloc_at, alloc_size);
 					}
@@ -1002,109 +560,45 @@ static usz apply_modification(std::vector<u32>& applied, patch_engine::patch_inf
 				}
 
 				// Revert if allocated map before failure
-				unmap_vm_area(alloc_map);
+				if (alloc_map->flags & (1ull << 62))
+				{
+					vm::unmap(vm::any, alloc_map->addr);
+				}
 			}
 		}
 
 		// Revert in case of failure
-		std::for_each(applied.begin() + old_applied_size, applied.end(), [&](u32 index)
+		for (u32 index : applied)
 		{
-			const u32 addr = std::exchange(patch.data_list[index].alloc_addr, 0);
+			const u32 addr = patch.data_list[index].offset & -4096;
 
-			vm::dealloc(addr);
+			// Try different alignments until works
+			if (!vm::dealloc(addr))
+			{
+				if (!vm::dealloc(addr & -0x10000))
+				{
+					vm::dealloc(addr & -0x100000);
+				}
+			}
 
-			auto alloc_map = vm::get(vm::any, addr);
-			unmap_vm_area(alloc_map);
-		});
+			if (auto alloc_map = vm::get(vm::any, addr); alloc_map->flags & (1ull << 62))
+			{
+				vm::unmap(vm::any, alloc_map->addr);
+			}
+		}
 
-		applied.resize(old_applied_size);
-		return old_applied_size;
+		applied.clear();
+		return applied;
 	}
 
 	// Fixup values from before
-	std::fill(applied.begin() + old_applied_size, applied.end(), u32{umax});
+	std::fill(applied.begin(), applied.end(), u32{umax});
 
-	u32 relocate_instructions_at = 0;
-
-	for (const patch_engine::patch_data& p : patch.data_list)
+	for (const auto& p : patch.data_list)
 	{
 		u32 offset = p.offset;
 
-		if (relocate_instructions_at && vm::read32(relocate_instructions_at) != 0x6000'0000u)
-		{
-			// No longer points a NOP to be filled, meaning we ran out of instructions
-			relocate_instructions_at = 0;
-		}
-
-		u32 memory_size = 0;
-
-		switch (p.type)
-		{
-		case patch_type::invalid:
-		case patch_type::load:
-		{
-			// Invalid in this context
-			break;
-		}
-		case patch_type::alloc:
-		{
-			// Applied before
-			memory_size = 0;
-			continue;
-		}
-		case patch_type::byte:
-		{
-			memory_size = sizeof(u8);
-			break;
-		}
-		case patch_type::le16:
-		case patch_type::be16:
-		{
-			memory_size = sizeof(u16);
-			break;
-		}
-		case patch_type::code_alloc:
-		case patch_type::jump:
-		case patch_type::jump_link:
-		case patch_type::jump_func:
-		case patch_type::bp_exec:
-		case patch_type::le32:
-		case patch_type::lef32:
-		case patch_type::bd32:
-		case patch_type::be32:
-		case patch_type::bef32:
-		{
-			memory_size = sizeof(u32);
-			break;
-		}
-		case patch_type::lef64:
-		case patch_type::le64:
-		case patch_type::bd64:
-		case patch_type::be64:
-		case patch_type::bef64:
-		{
-			memory_size = sizeof(u64);
-			break;
-		}
-		case patch_type::utf8:
-		{
-			memory_size = ::size32(p.original_value);
-			break;
-		}
-		case patch_type::c_utf8:
-		{
-			memory_size = utils::add_saturate<u32>(::size32(p.original_value), 1);
-			break;
-		}
-		case patch_type::move_file:
-		case patch_type::hide_file:
-		{
-			memory_size = 0;
-			break;
-		}
-		}
-
-		if (memory_size != 0 && !relocate_instructions_at && (filesz < memory_size || offset < min_addr || offset - min_addr > filesz - memory_size))
+		if (offset < min_addr || offset - min_addr >= filesz)
 		{
 			// This patch is out of range for this segment
 			continue;
@@ -1112,20 +606,7 @@ static usz apply_modification(std::vector<u32>& applied, patch_engine::patch_inf
 
 		offset -= min_addr;
 
-		auto ptr = mem_translate(offset, memory_size);
-
-		if (!ptr && memory_size != 0 && !relocate_instructions_at)
-		{
-			// Memory translation failed
-			continue;
-		}
-
-		if (relocate_instructions_at)
-		{
-			offset = relocate_instructions_at;
-			ptr = vm::get_super_ptr<u8>(relocate_instructions_at);
-			relocate_instructions_at += 4; // Advance to the next instruction on dynamic memory
-		}
+		auto ptr = dst + offset;
 
 		u32 resval = umax;
 
@@ -1142,157 +623,6 @@ static usz apply_modification(std::vector<u32>& applied, patch_engine::patch_inf
 			// Applied before
 			continue;
 		}
-		case patch_type::code_alloc:
-		{
-			const u32 out_branch = vm::try_get_addr(relocate_instructions_at ? vm::get_super_ptr<u8>(offset & -4) : mem_translate(offset & -4, 4)).first;
-
-			// Allow only if points to a PPU executable instruction
-			if (out_branch < 0x10000 || out_branch >= 0x4000'0000 || !vm::check_addr<4>(out_branch, vm::page_executable))
-			{
-				continue;
-			}
-
-			const u32 alloc_size = utils::align(static_cast<u32>(p.value.long_value + 1) * 4, 0x10000);
-
-			// Check if should maybe reuse previous code cave allocation (0 size)
-			if (alloc_size - 4 != 0)
-			{
-				// Nope
-				relocate_instructions_at = 0;
-			}
-
-			// Always executable
-			u64 flags = vm::alloc_executable | vm::alloc_unwritable;
-
-			switch (p.offset & patch_engine::mem_protection::mask)
-			{
-			case patch_engine::mem_protection::rw:
-			case patch_engine::mem_protection::wx:
-			{
-				flags &= ~vm::alloc_unwritable;
-				break;
-			}
-			case patch_engine::mem_protection::ro:
-			case patch_engine::mem_protection::rx:
-			{
-				break;
-			}
-			default: ensure(false);
-			}
-
-			const auto alloc_map = ensure(vm::get(vm::any, out_branch));
-
-			// Range allowed for absolute branches to operate at
-			// It takes into account that we need to put a branch for return at the end of memory space
-			const u32 addr = p.alloc_addr = (relocate_instructions_at ? relocate_instructions_at : alloc_map->alloc(alloc_size, nullptr, 0x10000, flags));
-
-			if (!addr)
-			{
-				patch_log.error("Failed to allocate 0x%x bytes for code (entry=0x%x)", alloc_size, addr, out_branch);
-				continue;
-			}
-
-			patch_log.success("Allocated 0x%x for code at 0x%x (entry=0x%x)", alloc_size, addr, out_branch);
-
-			// NOP filled
-			std::fill_n(vm::get_super_ptr<u32>(addr), p.value.long_value, 0x60000000);
-
-			// Check if already registered by previous code allocation
-			if (relocate_instructions_at != addr)
-			{
-				// Register code
-				ppu_register_range(addr, alloc_size);
-			}
-
-			resval = out_branch & -4;
-
-			// Write branch to return to code
-			if (!ppu_form_branch_to_code(addr + static_cast<u32>(p.value.long_value) * 4, resval + 4))
-			{
-				patch_log.error("Failed to write return jump at 0x%x", addr + static_cast<u32>(p.value.long_value) * 4);
-				ensure(alloc_map->dealloc(addr));
-				continue;
-			}
-
-			// Write branch to code
-			if (!ppu_form_branch_to_code(out_branch, addr))
-			{
-				patch_log.error("Failed to jump to code cave at 0x%x", out_branch);
-				ensure(alloc_map->dealloc(addr));
-				continue;
-			}
-
-			// Record the insertion point as a faux block.
-			g_fxo->need<ppu_patch_block_registry_t>();
-			g_fxo->get<ppu_patch_block_registry_t>().block_addresses.insert(resval);
-
-			relocate_instructions_at = addr;
-			break;
-		}
-		case patch_type::jump:
-		case patch_type::jump_link:
-		{
-			const u32 out_branch = vm::try_get_addr(relocate_instructions_at ? vm::get_super_ptr<u8>(offset & -4) : mem_translate(offset & -4, 4)).first;
-			const u32 dest = static_cast<u32>(p.value.long_value);
-
-			// Allow only if points to a PPU executable instruction
-			if (!ppu_form_branch_to_code(out_branch, dest, p.type == patch_type::jump_link))
-			{
-				continue;
-			}
-
-			resval = out_branch & -4;
-			break;
-		}
-		case patch_type::jump_func:
-		{
-			const std::string& str = p.original_value;
-
-			const u32 out_branch = vm::try_get_addr(relocate_instructions_at ? vm::get_super_ptr<u8>(offset & -4) : mem_translate(offset & -4, 4)).first;
-			const usz sep_pos = str.find_first_of(':');
-
-			// Must contain only a single ':' or none
-			// If ':' is found: Left string is the module name, right string is the function name
-			// If ':' is not found: The entire string is a direct address of the function's descriptor in hexadecimal
-			if (str.size() <= 2 || !sep_pos || sep_pos == str.size() - 1 || sep_pos != str.find_last_of(":"))
-			{
-				continue;
-			}
-
-			const std::string_view func_name{std::string_view(str).substr(sep_pos + 1)};
-			u32 id = 0;
-
-			if (func_name.starts_with("0x"sv))
-			{
-				// Raw hexadecimal-formatted FNID (real function name cannot contain a digit at the start, derived from C/CPP which were used in PS3 development)
-				const auto result = std::from_chars(func_name.data() + 2, func_name.data() + func_name.size() - 2, id, 16);
-
-				if (result.ec != std::errc() || str.data() + sep_pos != result.ptr)
-				{
-					continue;
-				}
-			}
-			else
-			{
-				if (sep_pos == umax)
-				{
-					continue;
-				}
-
-				// Generate FNID using function name
-				id = ppu_generate_id(func_name);
-			}
-
-			// Allow only if points to a PPU executable instruction
-			// FNID/OPD-address is placed at target
-			if (!ppu_form_branch_to_code(out_branch, id, true, true, std::string{str.data(), sep_pos != umax ? sep_pos : 0}))
-			{
-				continue;
-			}
-
-			resval = out_branch & -4;
-			break;
-		}
 		case patch_type::byte:
 		{
 			*ptr = static_cast<u8>(p.value.long_value);
@@ -1380,99 +710,37 @@ static usz apply_modification(std::vector<u32>& applied, patch_engine::patch_inf
 			std::memcpy(ptr, &val, sizeof(val));
 			break;
 		}
-		case patch_type::bp_exec:
-		{
-			const u32 exec_addr = vm::try_get_addr(relocate_instructions_at ? vm::get_super_ptr<u8>(offset & -4) : mem_translate(offset & -4, 4)).first;
-
-			if (exec_addr)
-			{
-				Emu.GetCallbacks().add_breakpoint(exec_addr);
-			}
-
-			break;
-		}
 		case patch_type::utf8:
 		{
 			std::memcpy(ptr, p.original_value.data(), p.original_value.size());
 			break;
 		}
-		case patch_type::c_utf8:
-		{
-			std::memcpy(ptr, p.original_value.data(), p.original_value.size() + 1);
-			break;
-		}
-		case patch_type::move_file:
-		case patch_type::hide_file:
-		{
-			const bool is_hide = p.type == patch_type::hide_file;
-			std::string original_vfs_path = p.original_offset;
-			std::string dest_vfs_path = p.original_value;
-
-			if (original_vfs_path.empty())
-			{
-				patch_log.error("Failed to patch file: original path is empty", original_vfs_path);
-				continue;
-			}
-
-			if (!is_hide && dest_vfs_path.empty())
-			{
-				patch_log.error("Failed to patch file: destination path is empty", dest_vfs_path);
-				continue;
-			}
-
-			if (!original_vfs_path.starts_with("/dev_"))
-			{
-				original_vfs_path.insert(0, "/dev_");
-			}
-
-			if (!is_hide && !dest_vfs_path.starts_with("/dev_"))
-			{
-				dest_vfs_path.insert(0, "/dev_");
-			}
-
-			const std::string dest_path = is_hide ? fs::get_config_dir() + "delete_this_dir.../delete_this..." : vfs::get(dest_vfs_path);
-
-			if (dest_path.empty())
-			{
-				patch_log.error("Failed to patch file path at '%s': destination is not mounted", original_vfs_path, dest_vfs_path);
-				continue;
-			}
-
-			if (!vfs::mount(original_vfs_path, dest_path))
-			{
-				patch_log.error("Failed to patch file path at '%s': vfs::mount(dest='%s') failed", original_vfs_path, dest_vfs_path);
-				continue;
-			}
-
-			break;
-		}
 		}
 
 		// Possibly an executable instruction
 		applied.push_back(resval);
 	}
 
-	return old_applied_size;
+	return applied;
 }
 
-void patch_engine::apply(std::vector<u32>& applied_total, const std::string& name, std::function<u8*(u32, u32)> mem_translate, u32 filesz, u32 min_addr)
+std::basic_string<u32> patch_engine::apply(const std::string& name, u8* dst, u32 filesz, u32 min_addr)
 {
-	// applied_total may be non-empty, do not clear it
-
-	if (!m_map.contains(name))
+	if (m_map.find(name) == m_map.cend())
 	{
-		return;
+		return {};
 	}
 
-	const patch_container& container = ::at32(m_map, name);
-	const std::string& serial = Emu.GetTitleID();
-	const std::string& app_version = Emu.GetAppVersion();
+	std::basic_string<u32> applied_total;
+	const auto& container = m_map.at(name);
+	const auto& serial = Emu.GetTitleID();
+	const auto& app_version = Emu.GetAppVersion();
 
-	// Different containers in order to separate the patches
-	std::vector<std::shared_ptr<patch_info>> patches_for_this_serial_and_this_version;
-	std::vector<std::shared_ptr<patch_info>> patches_for_this_serial_and_all_versions;
-	std::vector<std::shared_ptr<patch_info>> patches_for_all_serials_and_this_version;
-	std::vector<std::shared_ptr<patch_info>> patches_for_all_serials_and_all_versions;
+	// Different containers in order to seperate the patches
+	std::vector<const patch_info*> patches_for_this_serial_and_this_version;
+	std::vector<const patch_info*> patches_for_this_serial_and_all_versions;
+	std::vector<const patch_info*> patches_for_all_serials_and_this_version;
+	std::vector<const patch_info*> patches_for_all_serials_and_all_versions;
 
 	// Sort patches into different vectors based on their serial and version
 	for (const auto& [description, patch] : container.patch_info_map)
@@ -1485,11 +753,11 @@ void patch_engine::apply(std::vector<u32>& applied_total, const std::string& nam
 
 			std::string found_serial;
 
-			if (serials.contains(serial))
+			if (serials.find(serial) != serials.end())
 			{
 				found_serial = serial;
 			}
-			else if (serials.contains(patch_key::all))
+			else if (serials.find(patch_key::all) != serials.end())
 			{
 				found_serial = patch_key::all;
 				is_all_serials = true;
@@ -1500,64 +768,40 @@ void patch_engine::apply(std::vector<u32>& applied_total, const std::string& nam
 				continue;
 			}
 
-			const patch_app_versions& app_versions = ::at32(serials, found_serial);
+			const auto& app_versions = serials.at(found_serial);
 			std::string found_app_version;
 
-			if (app_versions.contains(app_version))
+			if (app_versions.find(app_version) != app_versions.end())
 			{
 				found_app_version = app_version;
 			}
-			else if (app_versions.contains(patch_key::all))
+			else if (app_versions.find(patch_key::all) != app_versions.end())
 			{
 				found_app_version = patch_key::all;
 				is_all_versions = true;
 			}
 
-			if (found_app_version.empty())
+			if (!found_app_version.empty() && app_versions.at(found_app_version))
 			{
-				continue;
-			}
-
-			const patch_config_values& config_values = ::at32(app_versions, found_app_version);
-
-			// Check if this patch is enabled
-			if (config_values.enabled)
-			{
-				// Make copy of this patch
-				std::shared_ptr<patch_info> p_ptr = std::make_shared<patch_info>(patch);
-
-				// Move configurable values to special container for readability
-				p_ptr->actual_config_values = p_ptr->default_config_values;
-
-				// Update configurable values
-				for (auto& [key, config_value] : config_values.config_values)
-				{
-					if (p_ptr->actual_config_values.contains(key))
-					{
-						patch_config_value& actual_config_value = ::at32(p_ptr->actual_config_values, key);
-						actual_config_value.set_and_check_value(config_value.value, key);
-					}
-				}
-
-				// Sort the patch by priority
+				// This patch is enabled
 				if (is_all_serials)
 				{
 					if (is_all_versions)
 					{
-						patches_for_all_serials_and_all_versions.emplace_back(p_ptr);
+						patches_for_all_serials_and_all_versions.emplace_back(&patch);
 					}
 					else
 					{
-						patches_for_all_serials_and_this_version.emplace_back(p_ptr);
+						patches_for_all_serials_and_this_version.emplace_back(&patch);
 					}
 				}
 				else if (is_all_versions)
 				{
-					patches_for_this_serial_and_all_versions.emplace_back(p_ptr);
+					patches_for_this_serial_and_all_versions.emplace_back(&patch);
 				}
 				else
 				{
-					patches_for_this_serial_and_this_version.emplace_back(p_ptr);
+					patches_for_this_serial_and_this_version.emplace_back(&patch);
 				}
 
 				break;
@@ -1565,6 +809,16 @@ void patch_engine::apply(std::vector<u32>& applied_total, const std::string& nam
 		}
 	}
 
+	// Apply modifications sequentially
+	auto apply_func = [&](const patch_info& patch)
+	{
+		auto applied = apply_modification(patch, dst, filesz, min_addr);
+
+		applied_total += applied;
+
+		patch_log.success("Applied patch (hash='%s', description='%s', author='%s', patch_version='%s', file_version='%s') (<- %u)", patch.hash, patch.description, patch.author, patch.patch_version, patch.version, applied.size());
+	};
+
 	// Sort specific patches after global patches
 	// So they will determine the end results
 	const auto patch_super_list =
@@ -1584,57 +838,24 @@ void patch_engine::apply(std::vector<u32>& applied_total, const std::string& nam
 			{
 				if (!m_applied_groups.insert(patch->patch_group).second)
 				{
-					patch.reset();
+					patch = nullptr;
 				}
 			}
 		}
 	}
 
-	// Apply modifications sequentially
 	for (auto patch_list : patch_super_list)
 	{
-		for (const std::shared_ptr<patch_info>& patch : *patch_list)
+		for (const patch_info* patch : *patch_list)
 		{
 			if (patch)
 			{
-				const usz old_size = apply_modification(applied_total, *patch, mem_translate, filesz, min_addr);
-
-				if (applied_total.size() != old_size)
-				{
-					patch_log.success("Applied patch (hash='%s', description='%s', author='%s', patch_version='%s', file_version='%s') (<- %u)",
-						patch->hash, patch->description, patch->author, patch->patch_version, patch->version, applied_total.size() - old_size);
-				}
+				apply_func(*patch);
 			}
 		}
 	}
 
-	// Ensure consistent order
-	std::sort(applied_total.begin(), applied_total.end());
-}
-
-void patch_engine::unload(const std::string& name)
-{
-	if (!m_map.contains(name))
-	{
-		return;
-	}
-
-	const patch_container& container = ::at32(m_map, name);
-
-	for (const auto& [description, patch] : container.patch_info_map)
-	{
-		for (const patch_data& entry : patch.data_list)
-		{
-			// Deallocate used memory
-			if (u32 addr = std::exchange(entry.alloc_addr, 0))
-			{
-				vm::dealloc(addr);
-
-				auto alloc_map = vm::get(vm::any, addr);
-				unmap_vm_area(alloc_map);
-			}
-		}
-	}
+	return applied_total;
 }
 
 void patch_engine::save_config(const patch_map& patches_map)
@@ -1642,10 +863,17 @@ void patch_engine::save_config(const patch_map& patches_map)
 	const std::string path = get_patch_config_path();
 	patch_log.notice("Saving patch config file %s", path);
 
+	fs::file file(path, fs::rewrite);
+	if (!file)
+	{
+		patch_log.fatal("Failed to open patch config file %s (%s)", path, fs::g_tls_error);
+		return;
+	}
+
 	YAML::Emitter out;
 	out << YAML::BeginMap;
 
-	// Save values per hash, description, serial and app_version
+	// Save 'enabled' state per hash, description, serial and app_version
 	patch_map config_map;
 
 	for (const auto& [hash, container] : patches_map)
@@ -1656,28 +884,28 @@ void patch_engine::save_config(const patch_map& patches_map)
 			{
 				for (const auto& [serial, app_versions] : serials)
 				{
-					for (const auto& [app_version, config_values] : app_versions)
+					for (const auto& [app_version, enabled] : app_versions)
 					{
-						const bool config_values_dirty = !patch.default_config_values.empty() && !config_values.config_values.empty() && patch.default_config_values != config_values.config_values;
-
-						if (config_values.enabled || config_values_dirty)
+						if (enabled)
 						{
-							config_map[hash].patch_info_map[description].titles[title][serial][app_version] = config_values;
+							config_map[hash].patch_info_map[description].titles[title][serial][app_version] = true;
 						}
 					}
 				}
 			}
 		}
 
-		if (const auto& patches_to_save = config_map[hash].patch_info_map; !patches_to_save.empty())
+		if (const auto& enabled_patches = config_map[hash].patch_info_map; !enabled_patches.empty())
 		{
 			out << hash << YAML::BeginMap;
 
-			for (const auto& [description, patch] : patches_to_save)
+			for (const auto& [description, patch] : enabled_patches)
 			{
+				const auto& titles = patch.titles;
+
 				out << description << YAML::BeginMap;
 
-				for (const auto& [title, serials] : patch.titles)
+				for (const auto& [title, serials] : titles)
 				{
 					out << title << YAML::BeginMap;
 
@@ -1685,34 +913,9 @@ void patch_engine::save_config(const patch_map& patches_map)
 					{
 						out << serial << YAML::BeginMap;
 
-						for (const auto& [app_version, config_values] : app_versions)
+						for (const auto& [app_version, enabled] : app_versions)
 						{
-							const auto& default_config_values = ::at32(container.patch_info_map, description).default_config_values;
-							const bool config_values_dirty = !default_config_values.empty() && !config_values.config_values.empty() && default_config_values != config_values.config_values;
-
-							if (config_values.enabled || config_values_dirty)
-							{
-								out << app_version << YAML::BeginMap;
-
-								if (config_values.enabled)
-								{
-									out << patch_key::enabled << config_values.enabled;
-								}
-
-								if (config_values_dirty)
-								{
-									out << patch_key::config_values << YAML::BeginMap;
-
-									for (const auto& [name, config_value] : config_values.config_values)
-									{
-										out << name << config_value.value;
-									}
-
-									out << YAML::EndMap;
-								}
-
-								out << YAML::EndMap;
-							}
+							out << app_version << enabled;
 						}
 
 						out << YAML::EndMap;
@@ -1730,52 +933,49 @@ void patch_engine::save_config(const patch_map& patches_map)
 
 	out << YAML::EndMap;
 
-	fs::pending_file file(path);
-
-	if (!file.file || file.file.write(out.c_str(), out.size()) < out.size() || !file.commit())
-	{
-		patch_log.error("Failed to create patch config file %s (error=%s)", path, fs::g_tls_error);
-	}
+	file.write(out.c_str(), out.size());
 }
 
-static void append_patches(patch_engine::patch_map& existing_patches, const patch_engine::patch_map& new_patches, usz& count, usz& total, std::stringstream* log_messages, std::string_view path)
+static void append_patches(patch_engine::patch_map& existing_patches, const patch_engine::patch_map& new_patches, usz& count, usz& total, std::stringstream* log_messages)
 {
 	for (const auto& [hash, new_container] : new_patches)
 	{
 		total += new_container.patch_info_map.size();
 
-		if (!existing_patches.contains(hash))
+		if (existing_patches.find(hash) == existing_patches.end())
 		{
 			existing_patches[hash] = new_container;
 			count += new_container.patch_info_map.size();
 			continue;
 		}
 
-		patch_engine::patch_container& container = existing_patches[hash];
+		auto& container = existing_patches[hash];
 
 		for (const auto& [description, new_info] : new_container.patch_info_map)
 		{
-			if (!container.patch_info_map.contains(description))
+			if (container.patch_info_map.find(description) == container.patch_info_map.end())
 			{
 				container.patch_info_map[description] = new_info;
 				count++;
 				continue;
 			}
 
-			patch_engine::patch_info& info = container.patch_info_map[description];
+			auto& info = container.patch_info_map[description];
 
 			bool ok;
 			const bool version_is_bigger = utils::compare_versions(new_info.patch_version, info.patch_version, ok) > 0;
 
 			if (!ok)
 			{
-				append_log_message(log_messages, fmt::format("Failed to compare patch versions ('%s' vs '%s') for %s: %s (file: %s)", new_info.patch_version, info.patch_version, hash, description, path), &patch_log.error);
+				patch_log.error("Failed to compare patch versions ('%s' vs '%s') for %s: %s", new_info.patch_version, info.patch_version, hash, description);
+				append_log_message(log_messages, fmt::format("Failed to compare patch versions ('%s' vs '%s') for %s: %s", new_info.patch_version, info.patch_version, hash, description));
 				continue;
 			}
 
 			if (!version_is_bigger)
 			{
-				append_log_message(log_messages, fmt::format("A higher or equal patch version already exists ('%s' vs '%s') for %s: %s (file: %s)", new_info.patch_version, info.patch_version, hash, description, path), &patch_log.error);
+				patch_log.error("A higher or equal patch version already exists ('%s' vs '%s') for %s: %s", new_info.patch_version, info.patch_version, hash, description);
+				append_log_message(log_messages, fmt::format("A higher or equal patch version already exists ('%s' vs '%s') for %s: %s", new_info.patch_version, info.patch_version, hash, description));
 				continue;
 			}
 
@@ -1806,7 +1006,8 @@ bool patch_engine::save_patches(const patch_map& patches, const std::string& pat
 	fs::file file(path, fs::rewrite);
 	if (!file)
 	{
-		append_log_message(log_messages, fmt::format("Failed to open patch file %s (%s)", path, fs::g_tls_error), &patch_log.fatal);
+		patch_log.fatal("save_patches: Failed to open patch file %s (%s)", path, fs::g_tls_error);
+		append_log_message(log_messages, fmt::format("Failed to open patch file %s (%s)", path, fs::g_tls_error));
 		return false;
 	}
 
@@ -1837,9 +1038,9 @@ bool patch_engine::save_patches(const patch_map& patches, const std::string& pat
 				{
 					out << serial << YAML::BeginSeq;
 
-					for (const auto& [app_version, patch_config] : app_versions)
+					for (const auto& app_version : app_versions)
 					{
-						out << app_version;
+						out << app_version.first;
 					}
 
 					out << YAML::EndSeq;
@@ -1855,42 +1056,6 @@ bool patch_engine::save_patches(const patch_map& patches, const std::string& pat
 			if (!info.patch_group.empty())   out << patch_key::group         << info.patch_group;
 			if (!info.notes.empty())         out << patch_key::notes         << info.notes;
 
-			if (!info.default_config_values.empty())
-			{
-				out << patch_key::config_values << YAML::BeginMap;
-
-				for (const auto& [key, config_value] : info.default_config_values)
-				{
-					out << key << YAML::BeginMap;
-					out << patch_key::type << fmt::format("%s", config_value.type);
-					out << patch_key::value << config_value.value;
-
-					switch (config_value.type)
-					{
-					case patch_configurable_type::double_range:
-					case patch_configurable_type::long_range:
-						out << patch_key::min << config_value.min;
-						out << patch_key::max << config_value.max;
-						break;
-					case patch_configurable_type::double_enum:
-					case patch_configurable_type::long_enum:
-						out << patch_key::allowed_values << YAML::BeginMap;
-
-						for (const auto& allowed_value : config_value.allowed_values)
-						{
-							out << allowed_value.label << allowed_value.value;
-						}
-
-						out << YAML::EndMap;
-						break;
-					}
-
-					out << YAML::EndMap;
-				}
-
-				out << YAML::EndMap;
-			}
-
 			out << patch_key::patch << YAML::BeginSeq;
 
 			for (const auto& data : info.data_list)
@@ -1925,11 +1090,11 @@ bool patch_engine::save_patches(const patch_map& patches, const std::string& pat
 
 bool patch_engine::import_patches(const patch_engine::patch_map& patches, const std::string& path, usz& count, usz& total, std::stringstream* log_messages)
 {
-	patch_map existing_patches;
+	patch_engine::patch_map existing_patches;
 
 	if (load(existing_patches, path, "", true, log_messages))
 	{
-		append_patches(existing_patches, patches, count, total, log_messages, path);
+		append_patches(existing_patches, patches, count, total, log_messages);
 		return count == 0 || save_patches(existing_patches, path, log_messages);
 	}
 
@@ -1938,15 +1103,15 @@ bool patch_engine::import_patches(const patch_engine::patch_map& patches, const
 
 bool patch_engine::remove_patch(const patch_info& info)
 {
-	patch_map patches;
+	patch_engine::patch_map patches;
 
 	if (load(patches, info.source_path))
 	{
-		if (patches.contains(info.hash))
+		if (patches.find(info.hash) != patches.end())
 		{
-			patch_container& container = patches[info.hash];
+			auto& container = patches[info.hash];
 
-			if (container.patch_info_map.contains(info.description))
+			if (container.patch_info_map.find(info.description) != container.patch_info_map.end())
 			{
 				container.patch_info_map.erase(info.description);
 				return save_patches(patches, info.source_path);
@@ -1959,7 +1124,7 @@ bool patch_engine::remove_patch(const patch_info& info)
 
 patch_engine::patch_map patch_engine::load_config()
 {
-	patch_map config_map{};
+	patch_map config_map;
 
 	const std::string path = get_patch_config_path();
 	patch_log.notice("Loading patch config file %s", path);
@@ -1976,7 +1141,7 @@ patch_engine::patch_map patch_engine::load_config()
 
 		for (const auto pair : root)
 		{
-			const std::string& hash = pair.first.Scalar();
+			const auto& hash = pair.first.Scalar();
 
 			if (const auto yml_type = pair.second.Type(); yml_type != YAML::NodeType::Map)
 			{
@@ -1986,7 +1151,7 @@ patch_engine::patch_map patch_engine::load_config()
 
 			for (const auto patch : pair.second)
 			{
-				const std::string& description = patch.first.Scalar();
+				const auto& description = patch.first.Scalar();
 
 				if (const auto yml_type = patch.second.Type(); yml_type != YAML::NodeType::Map)
 				{
@@ -1996,7 +1161,7 @@ patch_engine::patch_map patch_engine::load_config()
 
 				for (const auto title_node : patch.second)
 				{
-					const std::string& title = title_node.first.Scalar();
+					const auto& title = title_node.first.Scalar();
 
 					if (const auto yml_type = title_node.second.Type(); yml_type != YAML::NodeType::Map)
 					{
@@ -2006,7 +1171,7 @@ patch_engine::patch_map patch_engine::load_config()
 
 					for (const auto serial_node : title_node.second)
 					{
-						const std::string& serial = serial_node.first.Scalar();
+						const auto& serial = serial_node.first.Scalar();
 
 						if (const auto yml_type = serial_node.second.Type(); yml_type != YAML::NodeType::Map)
 						{
@@ -2017,29 +1182,8 @@ patch_engine::patch_map patch_engine::load_config()
 						for (const auto app_version_node : serial_node.second)
 						{
 							const auto& app_version = app_version_node.first.Scalar();
-							auto& config_values = config_map[hash].patch_info_map[description].titles[title][serial][app_version];
-
-							if (app_version_node.second.IsMap())
-							{
-								if (const auto enable_node = app_version_node.second[patch_key::enabled])
-								{
-									config_values.enabled = enable_node.as<bool>(false);
-								}
-
-								if (const auto config_values_node = app_version_node.second[patch_key::config_values])
-								{
-									for (const auto config_value_node : config_values_node)
-									{
-										patch_config_value& config_value = config_values.config_values[config_value_node.first.Scalar()];
-										config_value.value = config_value_node.second.as<f64>(0.0);
-									}
-								}
-							}
-							else
-							{
-								// Legacy
-								config_values.enabled = app_version_node.second.as<bool>(false);
-							}
+							const bool enabled = app_version_node.second.as<bool>(false);
+							config_map[hash].patch_info_map[description].titles[title][serial][app_version] = enabled;
 						}
 					}
 				}
diff --git a/Utilities/bin_patch.h b/Utilities/bin_patch.h
index 1e06c54570..d37652f9eb 100644
--- a/Utilities/bin_patch.h
+++ b/Utilities/bin_patch.h
@@ -3,7 +3,6 @@
 #include <vector>
 #include <string>
 #include <unordered_map>
-#include <functional>
 
 #include "util/types.hpp"
 #include "util/yaml.hpp"
@@ -19,13 +18,6 @@ namespace patch_key
 	static const std::string patch = "Patch";
 	static const std::string patch_version = "Patch Version";
 	static const std::string version = "Version";
-	static const std::string enabled = "Enabled";
-	static const std::string config_values = "Configurable Values";
-	static const std::string value = "Value";
-	static const std::string type = "Type";
-	static const std::string min = "Min";
-	static const std::string max = "Max";
-	static const std::string allowed_values = "Allowed Values";
 }
 
 inline static const std::string patch_engine_version = "1.2";
@@ -35,10 +27,6 @@ enum class patch_type
 	invalid,
 	load,
 	alloc, // Allocate memory at address (zeroized executable memory)
-	code_alloc,// Allocate memory somewhere, saves branch to memory at specfied address (filled with PPU NOP and branch for returning)
-	jump, // Install special 32-bit jump instruction (PPU only atm)
-	jump_link, // jump + set link (PPU only atm)
-	jump_func, // jump to exported function (PPU only, forever)
 	byte,
 	le16,
 	le32,
@@ -52,24 +40,7 @@ enum class patch_type
 	bd64, // be64 with data hint (non-code)
 	bef32,
 	bef64,
-	bp_exec, // Execution Breakpoint 
 	utf8, // Text of string (not null-terminated automatically)
-	c_utf8, // Text of string (null-terminated automatically)
-	move_file, // Move file
-	hide_file, // Hide file
-};
-
-static constexpr bool patch_type_uses_hex_offset(patch_type type)
-{
-	return type >= patch_type::alloc && type <= patch_type::c_utf8;
-}
-
-enum class patch_configurable_type
-{
-	double_range,
-	double_enum,
-	long_range,
-	long_enum
 };
 
 class patch_engine
@@ -79,50 +50,15 @@ public:
 	{
 		patch_type type = patch_type::load;
 		u32 offset = 0;
-		std::string original_offset{}; // Used for specifying paths
 		std::string original_value{}; // Used for import consistency (avoid rounding etc.)
 		union
 		{
 			u64 long_value;
 			f64 double_value;
 		} value{0};
-		mutable u32 alloc_addr = 0; // Used to save optional allocation address (if occured)
 	};
 
-	struct patch_allowed_value
-	{
-		std::string label;
-		f64 value{};
-
-		bool operator==(const patch_allowed_value& other) const
-		{
-			return value == other.value && label == other.label;
-		}
-	};
-
-	struct patch_config_value
-	{
-		f64 value{};
-		f64 min{};
-		f64 max{};
-		patch_configurable_type type{};
-		std::vector<patch_allowed_value> allowed_values;
-
-		bool operator==(const patch_config_value& other) const
-		{
-			return value == other.value && min == other.min && max == other.max && type == other.type && allowed_values == other.allowed_values;
-		}
-
-		void set_and_check_value(f64 new_value, std::string_view name);
-	};
-
-	struct patch_config_values
-	{
-		bool enabled{};
-		std::map<std::string, patch_config_value> config_values;
-	};
-
-	using patch_app_versions = std::unordered_map<std::string /*app_version*/, patch_config_values>;
+	using patch_app_versions = std::unordered_map<std::string /*app_version*/, bool /*enabled*/>;
 	using patch_serials = std::unordered_map<std::string /*serial*/, patch_app_versions>;
 	using patch_titles = std::unordered_map<std::string /*serial*/, patch_serials>;
 
@@ -137,12 +73,10 @@ public:
 		std::string author{};
 		std::string notes{};
 		std::string source_path{};
-		std::map<std::string, patch_config_value> default_config_values;
 
 		// Redundant information for accessibility (see patch_container)
 		std::string hash{};
 		std::string version{};
-		std::map<std::string, patch_config_value> actual_config_values;
 	};
 
 	struct patch_container
@@ -182,16 +116,13 @@ public:
 	static bool load(patch_map& patches, const std::string& path, std::string content = "", bool importing = false, std::stringstream* log_messages = nullptr);
 
 	// Read and add a patch node to the patch info
-	static bool read_patch_node(patch_info& info, YAML::Node node, const YAML::Node& root, std::string_view path, std::stringstream* log_messages = nullptr);
-
-	// Get the patch type from a string
-	static patch_type get_patch_type(std::string_view text);
+	static bool read_patch_node(patch_info& info, YAML::Node node, const YAML::Node& root, std::stringstream* log_messages = nullptr);
 
 	// Get the patch type of a patch node
 	static patch_type get_patch_type(YAML::Node node);
 
 	// Add the data of a patch node
-	static bool add_patch_data(YAML::Node node, patch_info& info, u32 modifier, const YAML::Node& root, std::string_view path, std::stringstream* log_messages = nullptr);
+	static bool add_patch_data(YAML::Node node, patch_info& info, u32 modifier, const YAML::Node& root, std::stringstream* log_messages = nullptr);
 
 	// Save to patch_config.yml
 	static void save_config(const patch_map& patches_map);
@@ -212,13 +143,10 @@ public:
 	void append_global_patches();
 
 	// Load from title relevant files and append to member patches map
-	void append_title_patches(std::string_view title_id);
+	void append_title_patches(const std::string& title_id);
 
 	// Apply patch (returns the number of entries applied)
-	void apply(std::vector<u32>& applied_total, const std::string& name, std::function<u8*(u32, u32)> mem_translate, u32 filesz = -1, u32 min_addr = 0);
-
-	// Deallocate memory used by patches
-	void unload(const std::string& name);
+	std::basic_string<u32> apply(const std::string& name, u8* dst, u32 filesz = -1, u32 min_addr = 0);
 
 private:
 	// Database
diff --git a/Utilities/bit_set.h b/Utilities/bit_set.h
index 8b98ae0fd4..494700d0b3 100644
--- a/Utilities/bit_set.h
+++ b/Utilities/bit_set.h
@@ -42,8 +42,6 @@ public:
 	// Underlying type
 	using under = std::underlying_type_t<T>;
 
-	ENABLE_BITWISE_SERIALIZATION;
-
 private:
 	// Underlying value
 	under m_data;
@@ -51,7 +49,7 @@ private:
 	friend class atomic_bs_t<T>;
 
 	// Value constructor
-	constexpr explicit bs_t(int, under data) noexcept
+	constexpr explicit bs_t(int, under data)
 		: m_data(data)
 	{
 	}
@@ -60,9 +58,9 @@ public:
 	static constexpr usz bitmax = sizeof(T) * 8;
 	static constexpr usz bitsize = static_cast<under>(T::__bitset_enum_max);
 
-	static_assert(std::is_enum_v<T>, "bs_t<> error: invalid type (must be enum)");
+	static_assert(std::is_enum<T>::value, "bs_t<> error: invalid type (must be enum)");
 	static_assert(bitsize <= bitmax, "bs_t<> error: invalid __bitset_enum_max");
-	static_assert(bitsize != bitmax || std::is_unsigned_v<under>, "bs_t<> error: invalid __bitset_enum_max (sign bit)");
+	static_assert(bitsize != bitmax || std::is_unsigned<under>::value, "bs_t<> error: invalid __bitset_enum_max (sign bit)");
 
 	// Helper function
 	static constexpr under shift(T value)
@@ -73,19 +71,19 @@ public:
 	bs_t() = default;
 
 	// Construct from a single bit
-	constexpr bs_t(T bit) noexcept
+	constexpr bs_t(T bit)
 		: m_data(shift(bit))
 	{
 	}
 
 	// Test for empty bitset
-	constexpr explicit operator bool() const noexcept
+	constexpr explicit operator bool() const
 	{
 		return m_data != 0;
 	}
 
 	// Extract underlying data
-	constexpr explicit operator under() const noexcept
+	constexpr explicit operator under() const
 	{
 		return m_data;
 	}
@@ -140,7 +138,7 @@ public:
 		return bs_t(0, lhs.m_data ^ rhs.m_data);
 	}
 
-	constexpr bool operator ==(bs_t rhs) const noexcept
+	constexpr bool operator ==(bs_t rhs) const
 	{
 		return m_data == rhs.m_data;
 	}
@@ -166,12 +164,12 @@ public:
 		return r;
 	}
 
-	constexpr bool all_of(bs_t arg) const
+	constexpr bool all_of(bs_t arg)
 	{
 		return (m_data & arg.m_data) == arg.m_data;
 	}
 
-	constexpr bool none_of(bs_t arg) const
+	constexpr bool none_of(bs_t arg)
 	{
 		return (m_data & arg.m_data) == 0;
 	}
@@ -373,19 +371,19 @@ public:
 	bool bit_test_reset(uint bit) = delete;
 	bool bit_test_invert(uint bit) = delete;
 
-	bool all_of(bs_t arg) const
+	bool all_of(bs_t arg)
 	{
 		return base::load().all_of(arg);
 	}
 
-	bool none_of(bs_t arg) const
+	bool none_of(bs_t arg)
 	{
 		return base::load().none_of(arg);
 	}
 };
 
 template <typename T>
-struct fmt_unveil<bs_t<T>>
+struct fmt_unveil<bs_t<T>, void>
 {
 	// Format as is
 	using type = bs_t<T>;
diff --git a/Utilities/cfmt.h b/Utilities/cfmt.h
index 9d23c6f759..fe04a36d7e 100644
--- a/Utilities/cfmt.h
+++ b/Utilities/cfmt.h
@@ -2,6 +2,7 @@
 
 #include "util/types.hpp"
 #include <string>
+#include <vector>
 #include <algorithm>
 #include "util/asm.hpp"
 
@@ -14,8 +15,6 @@ C-style format parser. Appends formatted string to `out`, returns number of char
 template<typename Dst, typename Char, typename Src>
 usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 {
-	ensure(fmt);
-
 	const usz start_pos = out.size();
 
 	struct cfmt_context
@@ -366,11 +365,9 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 			break;
 		}
 
-		const usz src_type = src.type(ctx.args);
-
-		if (!ctx.type || src_type > 8)
+		if (!ctx.type)
 		{
-			ctx.type = static_cast<u8>(src_type);
+			ctx.type = static_cast<u8>(src.type(ctx.args));
 
 			if (!ctx.type)
 			{
@@ -380,13 +377,7 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 
 		// Sign-extended argument expected
 		const u64 val = src.template get<u64>(ctx.args);
-		bool negative = ctx.type && ctx.type <= 8 && static_cast<s64>(val) < 0;
-
-		if (ctx.type == 16)
-		{
-			u128 val2 = *reinterpret_cast<const u128*>(val);
-			negative = !!(val2 & (u128{1} << 127));
-		}
+		const bool negative = ctx.type && static_cast<s64>(val) < 0;
 
 		const usz start = out.size();
 
@@ -405,14 +396,15 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 				out.push_back(' ');
 			}
 
-			if (ctx.type >= 16)
+			if (ctx.type == 16)
 			{
-				u128 val2 = *reinterpret_cast<const u128*>(val);
-				write_decimal(negative ? u128{} - val2 : val2, ctx.prec);
+				// TODO: support negative values (s128)
+				u128 val2 = *reinterpret_cast<u128*>(val);
+				write_decimal(val2, ctx.prec);
 			}
 			else
 			{
-				write_decimal(negative ? u64{} - val : val, ctx.prec);
+				write_decimal(negative ? 0 - val : val, ctx.prec);
 			}
 		}
 
@@ -444,11 +436,9 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 			break;
 		}
 
-		const usz src_type = src.type(ctx.args);
-
-		if (!ctx.type || src_type > 8)
+		if (!ctx.type)
 		{
-			ctx.type = static_cast<u8>(src_type);
+			ctx.type = static_cast<u8>(src.type(ctx.args));
 
 			if (!ctx.type)
 			{
@@ -479,9 +469,9 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 
 		if ((ctx.alter && val) || !ctx.dot || ctx.prec)
 		{
-			if (ctx.type >= 16)
+			if (ctx.type == 16)
 			{
-				u128 val2 = *reinterpret_cast<const u128*>(val);
+				u128 val2 = *reinterpret_cast<u128*>(val);
 				write_octal(val2, ctx.prec);
 			}
 			else
@@ -512,11 +502,9 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 			break;
 		}
 
-		const usz src_type = src.type(ctx.args);
-
-		if (!ctx.type || src_type > 8)
+		if (!ctx.type)
 		{
-			ctx.type = static_cast<u8>(src_type);
+			ctx.type = static_cast<u8>(src.type(ctx.args));
 
 			if (!ctx.type)
 			{
@@ -547,9 +535,9 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 
 		if ((ctx.alter && val) || !ctx.dot || ctx.prec)
 		{
-			if (ctx.type >= 16)
+			if (ctx.type == 16)
 			{
-				u128 val2 = *reinterpret_cast<const u128*>(val);
+				u128 val2 = *reinterpret_cast<u128*>(val);
 				write_hex(val2, ch == 'X', ctx.prec);
 			}
 			else
@@ -586,11 +574,9 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 			break;
 		}
 
-		const usz src_type = src.type(ctx.args);
-
-		if (!ctx.type || src_type > 8)
+		if (!ctx.type)
 		{
-			ctx.type = static_cast<u8>(src_type);
+			ctx.type = static_cast<u8>(src.type(ctx.args));
 
 			if (!ctx.type)
 			{
@@ -611,9 +597,9 @@ usz cfmt_append(Dst& out, const Char* fmt, Src&& src)
 
 		if (!ctx.dot || ctx.prec)
 		{
-			if (ctx.type >= 16)
+			if (ctx.type == 16)
 			{
-				u128 val2 = *reinterpret_cast<const u128*>(val);
+				u128 val2 = *reinterpret_cast<u128*>(val);
 				write_decimal(val2, ctx.prec);
 			}
 			else
diff --git a/Utilities/cheat_info.cpp b/Utilities/cheat_info.cpp
index a16be2767f..42ffb89e52 100644
--- a/Utilities/cheat_info.cpp
+++ b/Utilities/cheat_info.cpp
@@ -1,32 +1,10 @@
 #include "stdafx.h"
 #include "cheat_info.h"
+#include "Config.h"
 #include "StrUtil.h"
 
 LOG_CHANNEL(log_cheat, "Cheat");
 
-template <>
-void fmt_class_string<cheat_type>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](cheat_type value)
-	{
-		switch (value)
-		{
-		case cheat_type::unsigned_8_cheat: return "Unsigned 8 bits";
-		case cheat_type::unsigned_16_cheat: return "Unsigned 16 bits";
-		case cheat_type::unsigned_32_cheat: return "Unsigned 32 bits";
-		case cheat_type::unsigned_64_cheat: return "Unsigned 64 bits";
-		case cheat_type::signed_8_cheat: return "Signed 8 bits";
-		case cheat_type::signed_16_cheat: return "Signed 16 bits";
-		case cheat_type::signed_32_cheat: return "Signed 32 bits";
-		case cheat_type::signed_64_cheat: return "Signed 64 bits";
-		case cheat_type::float_32_cheat: return "Float 32 bits";
-		case cheat_type::max: break;
-		}
-
-		return unknown;
-	});
-}
-
 bool cheat_info::from_str(const std::string& cheat_line)
 {
 	auto cheat_vec = fmt::split(cheat_line, {"@@@"}, false);
diff --git a/Utilities/cheat_info.h b/Utilities/cheat_info.h
index 3ceb32716b..9c77d8dd7f 100644
--- a/Utilities/cheat_info.h
+++ b/Utilities/cheat_info.h
@@ -14,7 +14,6 @@ enum class cheat_type : u8
 	signed_16_cheat,
 	signed_32_cheat,
 	signed_64_cheat,
-	float_32_cheat,
 	max
 };
 
diff --git a/Utilities/cond.cpp b/Utilities/cond.cpp
index 425f74d806..69eb2d47c6 100644
--- a/Utilities/cond.cpp
+++ b/Utilities/cond.cpp
@@ -1,4 +1,5 @@
 #include "cond.h"
+#include "sync.h"
 
 // use constants, increase signal space
 
@@ -8,7 +9,7 @@ void cond_variable::imp_wait(u32 _old, u64 _timeout) noexcept
 	ensure(_old);
 
 	// Wait with timeout
-	m_value.wait(_old, atomic_wait_timeout{_timeout > max_timeout ? umax : _timeout * 1000});
+	m_value.wait(_old, c_signal_mask, atomic_wait_timeout{_timeout > max_timeout ? umax : _timeout * 1000});
 
 	// Cleanup
 	m_value.atomic_op([](u32& value)
@@ -46,10 +47,10 @@ void cond_variable::imp_wake(u32 _count) noexcept
 	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();
+		m_value.notify_all(c_signal_mask);
 	}
 	else
 	{
-		m_value.notify_one();
+		m_value.notify_one(c_signal_mask);
 	}
 }
diff --git a/Utilities/date_time.cpp b/Utilities/date_time.cpp
deleted file mode 100644
index 6aef060318..0000000000
--- a/Utilities/date_time.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "stdafx.h"
-#include "date_time.h"
-
-#include <chrono>
-
-template <>
-void fmt_class_string<std::chrono::sys_time<typename std::chrono::system_clock::duration>>::format(std::string& out, u64 arg)
-{
-	const std::time_t dateTime = std::chrono::system_clock::to_time_t(get_object(arg));
-	out += date_time::fmt_time("%Y-%m-%dT%H:%M:%S", dateTime);
-}
diff --git a/Utilities/geometry.h b/Utilities/geometry.h
index faace6c77e..e37ab7ed16 100644
--- a/Utilities/geometry.h
+++ b/Utilities/geometry.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <cmath>
-#include <type_traits>
 
 template<typename T>
 struct size2_base
@@ -671,22 +670,17 @@ struct area_base
 	{
 		return{ x1 / size.width, y1 / size.height, x2 / size.width, y2 / size.height };
 	}
-
-	template <typename U> requires (std::is_arithmetic_v<U>)
-	constexpr area_base operator / (const U& value) const
+	constexpr area_base operator / (const T& value) const
 	{
-		return area_base{static_cast<T>(x1 / value), static_cast<T>(y1 / value), static_cast<T>(x2 / value), static_cast<T>(y2 / value)};
+		return{ x1 / value, y1 / value, x2 / value, y2 / value };
 	}
-
 	constexpr area_base operator * (const size2_base<T>& size) const
 	{
 		return{ x1 * size.width, y1 * size.height, x2 * size.width, y2 * size.height };
 	}
-
-	template <typename U> requires (std::is_arithmetic_v<U>)
-	constexpr area_base operator * (const U& value) const
+	constexpr area_base operator * (const f32& value) const
 	{
-		return area_base{static_cast<T>(x1 * value), static_cast<T>(y1 * value), static_cast<T>(x2 * value), static_cast<T>(y2 * value)};
+		return{ static_cast<T>(x1 * value), static_cast<T>(y1 * value), static_cast<T>(x2 * value), static_cast<T>(y2 * value) };
 	}
 
 	template<typename NT>
@@ -700,12 +694,6 @@ template<typename T>
 struct size3_base
 {
 	T width, height, depth;
-
-	template<typename NT>
-	explicit constexpr operator size3_base<NT>() const
-	{
-		return{ static_cast<NT>(width), static_cast<NT>(height), static_cast<NT>(depth) };
-	}
 };
 
 template<typename T>
@@ -777,9 +765,9 @@ struct color4_base
 	};
 
 	constexpr color4_base()
-		: x{ T{0} }
-		, y{ T{0} }
-		, z{ T{0} }
+		: x{}
+		, y{}
+		, z{}
 		, w{ T(1) }
 	{
 	}
diff --git a/Utilities/git-version-gen.cmd b/Utilities/git-version-gen.cmd
index 5d9254171d..84b4a37840 100644
--- a/Utilities/git-version-gen.cmd
+++ b/Utilities/git-version-gen.cmd
@@ -18,58 +18,28 @@ rem // https://github.com/RPCS3/rpcs3 and https://rpcs3.net/.
 setlocal ENABLEDELAYEDEXPANSION
 setlocal ENABLEEXTENSIONS
 
-rem // Try to get git path from environment variable
 set GIT_VERSION_FILE=%~p0..\rpcs3\git-version.h
 if not defined GIT (
-	echo GIT not defined, using git as command.
-	set GIT='git'
-	echo PATH is:
-	echo "%PATH%"
-) else (
-	echo GIT defined as %GIT%
+	set GIT="git"
 )
-
-rem // Check if git works. Try to find it manually otherwise.
-call %GIT% describe --always > NUL 2> NUL
+call %GIT% describe > NUL 2> NUL
 if errorlevel 1 (
-	echo Git not on PATH, trying fallback paths
-
-	set git_array[0]="%ProgramFiles%\Git\bin\git.exe"
-	set git_array[1]="%ProgramFiles(x86)%\Git\bin\git.exe"
-	set git_array[2]="%ProgramW6432%\Git\bin\git.exe"
-	set git_array[3]="C:\Program Files (x86)\Git\bin\git.exe"
-	set git_array[4]="C:\Program Files\Git\bin\git.exe"
-	set git_array[5]="%ProgramFiles%\Git\cmd\git.exe"
-	set git_array[6]="%ProgramFiles(x86)%\Git\cmd\git.exe"
-	set git_array[7]="%ProgramW6432%\Git\cmd\git.exe"
-	set git_array[8]="C:\Program Files (x86)\Git\cmd\git.exe"
-	set git_array[9]="C:\Program Files\Git\cmd\git.exe"
-
-	for /l %%n in (0,1,9) do (
-		set GIT=!git_array[%%n]!
-		call !GIT! describe --always > NUL 2> NUL
-		if errorlevel 1 (
-			echo git not found on path !GIT!
-		) else (
-			echo git found on path !GIT!
-			goto end_of_git_loop
-		)
+	echo Git not on path, trying default Msysgit paths
+	set GIT="%ProgramFiles(x86)%\Git\bin\git.exe"
+	call !GIT! describe > NUL 2> NUL
+	if errorlevel 1 (
+		set GIT="%ProgramFiles%\Git\bin\git.exe"
 	)
-	echo git not found
 )
-:end_of_git_loop
 
-rem // Check if the generated file exists and if we should skip the rest of the script.
 if exist "%GIT_VERSION_FILE%" (
 	rem // Skip updating the file if RPCS3_GIT_VERSION_NO_UPDATE is 1.
 	findstr /B /C:"#define RPCS3_GIT_VERSION_NO_UPDATE 1" "%GIT_VERSION_FILE%" > NUL
 	if not errorlevel 1 (
-		echo Skip updating the file: RPCS3_GIT_VERSION_NO_UPDATE is 1.
 		goto done
 	)
 )
 
-rem // Check if git works. Early out with dummy data if it doesn't.
 call %GIT% describe --always > NUL 2> NUL
 if errorlevel 1 (
 	echo Unable to update git-version.h, git not found.
@@ -89,101 +59,53 @@ 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 // Check if the current build system sets the git branch and version.
-if defined BUILD_SOURCEBRANCHNAME (
-
-	rem // This must be a CI build
-
-	if defined BUILD_REPOSITORY_NAME (
-		echo BUILD_REPOSITORY_NAME: %BUILD_REPOSITORY_NAME%
-	) else (
-		echo BUILD_REPOSITORY_NAME undefined
-	)
-
-	if defined BUILD_SOURCEBRANCHNAME (
-		echo BUILD_SOURCEBRANCHNAME: %BUILD_SOURCEBRANCHNAME%
-	) else (
-		echo BUILD_SOURCEBRANCHNAME undefined
-	)
-
-	rem // These environment variables are defined by CI
+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%
-	echo GIT_FULL_BRANCH: !GIT_FULL_BRANCH!
 
-	if "!GIT_FULL_BRANCH!"=="RPCS3/rpcs3/master" (
-		rem // Let's assume this is a master release build for now
-		echo Assuming master release build
-
-		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_BRANCH=%BUILD_SOURCEBRANCHNAME%
+	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 ("%BUILD_REPOSITORY_NAME%") do set user=%%a
+		set "GIT_BRANCH=!user!/%SYSTEM_PULLREQUEST_SOURCEBRANCH%"
 	) else (
-		rem // This must be a pull request or a build from a fork.
-		echo Assuming pull request build
-
-		if "%BUILD_SOURCEBRANCHNAME%"=="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 ("%BUILD_REPOSITORY_NAME%") do set user=%%a
-			set "GIT_BRANCH=!user!/%BUILD_SOURCEBRANCHNAME%"
-		) else (
-			set GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%
-		)
-
-		rem // Make GIT_VERSION the last commit (shortened); Don't include commit count on non-release builds
-		for /F %%I IN ('call %GIT% rev-parse --short^=8 HEAD') do set GIT_VERSION=%%I
+		rem // Otherwise, GIT_BRANCH=branch
+		set GIT_BRANCH=%SYSTEM_PULLREQUEST_SOURCEBRANCH%
 	)
 
-) else (
-	echo BUILD_SOURCEBRANCHNAME undefined
-	echo Assuming local build
-
-	rem // Make GIT_VERSION the last commit (shortened); Don't include commit count on non-release builds
+	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 final variables:
-if defined GIT_VERSION (
-	echo GIT_VERSION: %GIT_VERSION%
-) else (
-	echo GIT_VERSION undefined
-)
-if defined GIT_BRANCH (
-	echo GIT_BRANCH: %GIT_BRANCH%
-) else (
-	echo GIT_BRANCH undefined
-)
-if defined GIT_FULL_BRANCH (
-	echo GIT_FULL_BRANCH: %GIT_FULL_BRANCH%
-) else (
-	echo GIT_FULL_BRANCH undefined
-)
+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%" (
 	findstr /C:"%GIT_VERSION%" "%GIT_VERSION_FILE%" > NUL
 	if not errorlevel 1 (
-		echo done, already has the current version...
 		goto done
 	)
 )
 
 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%"
 
 :done
-
-echo File is:
-more %GIT_VERSION_FILE%
-echo File end
diff --git a/Utilities/lockless.h b/Utilities/lockless.h
index 5028b398c3..b86377ee98 100644
--- a/Utilities/lockless.h
+++ b/Utilities/lockless.h
@@ -2,15 +2,13 @@
 
 #include "util/types.hpp"
 #include "util/atomic.hpp"
-#include "util/bless.hpp"
 
-// Simple unshrinkable array base for concurrent access. Only growths automatically.
-// There is no way to know the current size. The smaller index is, the faster it's accessed.
-//
-// T is the type of elements. Currently, default constructor of T shall be constexpr.
-// N is initial element count, available without any memory allocation and only stored contiguously.
-// Let's have around 256 bytes or less worth of preallocated elements
-template <typename T, usz N = std::max<usz>(256 / sizeof(T), 1)>
+//! Simple sizeless array base for concurrent access. Cannot shrink, only growths automatically.
+//! There is no way to know the current size. The smaller index is, the faster it's accessed.
+//!
+//! T is the type of elements. Currently, default constructor of T shall be constexpr.
+//! N is initial element count, available without any memory allocation and only stored contiguously.
+template <typename T, usz N>
 class lf_array
 {
 	// Data (default-initialized)
@@ -32,118 +30,28 @@ public:
 
 	T& operator [](usz index)
 	{
-		lf_array* _this = this;
-
-		T* result{};
-		bool installed = false;
-
-		for (usz i = 0;; i += N)
+		if (index < N) [[likely]]
 		{
-			if (index - i < N)
+			return m_data[index];
+		}
+		else if (!m_next) [[unlikely]]
+		{
+			// Create new array block. It's not a full-fledged once-synchronization, unlikely needed.
+			for (auto _new = new lf_array, ptr = this; ptr;)
 			{
-				result = std::addressof(_this->m_data[index - i]);
-				break;
+				// Install the pointer. If failed, go deeper.
+				ptr = ptr->m_next.compare_and_swap(nullptr, _new);
 			}
-
-			lf_array* next = _this->m_next;
-
-			if (!next)
-			{
-				// Do not allow access beyond many element more at a time
-				ensure(!installed && index - i < N * 2);
-
-				installed = true;
-
-				for (auto _new = new lf_array, ptr = _this; ptr;)
-				{
-					// Install the pointer. If failed, go deeper.
-					ptr = ptr->m_next.compare_and_swap(nullptr, _new);
-
-					if (!next)
-					{
-						// Determine the next pointer (if null then the new memory has been installed)
-						next = ptr ? ptr : _new;
-					}
-				}
-			}
-
-			_this = next;
 		}
 
-		return *result;
-	}
-
-	template <typename F> requires (std::is_invocable_v<F, T&>)
-	auto for_each(F&& func, bool is_finite = true)
-	{
-		lf_array* _this = this;
-
-		using return_t = std::invoke_result_t<F, T&>;
-
-		while (_this)
-		{
-			for (usz j = 0; j < N; j++)
-			{
-				if constexpr (std::is_void_v<return_t>)
-				{
-					std::invoke(func, _this->m_data[j]);
-				}
-				else
-				{
-					auto ret = std::invoke(func, _this->m_data[j]);
-
-					if (ret)
-					{
-						return std::make_pair(std::addressof(_this->m_data[j]), std::move(ret));
-					}
-				}
-			}
-
-			lf_array* next = _this->m_next;
-
-			if constexpr (!std::is_void_v<return_t>)
-			{
-				if (!next && !is_finite)
-				{
-					for (auto _new = new lf_array, ptr = _this; ptr;)
-					{
-						// Install the pointer. If failed, go deeper.
-						ptr = ptr->m_next.compare_and_swap(nullptr, _new);
-
-						if (!next)
-						{
-							// Determine the next pointer (if null then the new memory has been installed)
-							next = ptr ? ptr : _new;
-						}
-					}
-				}
-			}
-
-			_this = next;
-		}
-
-		if constexpr (!std::is_void_v<return_t>)
-		{
-			return std::make_pair(std::add_pointer_t<T>{}, return_t());
-		}
-	}
-
-	u64 size() const
-	{
-		u64 size_n = 0;
-
-		for (auto ptr = this; ptr; ptr = ptr->m_next)
-		{
-			size_n += N;
-		}
-
-		return size_n;
+		// Access recursively
+		return (*m_next)[index - N];
 	}
 };
 
-// Simple lock-free FIFO queue base. Based on lf_array<T, N> itself. Currently uses 32-bit counters.
-// There is no "push_end" or "pop_begin" provided, the queue element must signal its state on its own.
-template<typename T, usz N = std::max<usz>(256 / sizeof(T), 1)>
+//! Simple lock-free FIFO queue base. Based on lf_array<T, N> itself. Currently uses 32-bit counters.
+//! There is no "push_end" or "pop_begin" provided, the queue element must signal its state on its own.
+template<typename T, usz N>
 class lf_fifo : public lf_array<T, N>
 {
 	// LSB 32-bit: push, MSB 32-bit: pop
@@ -349,30 +257,6 @@ public:
 		return {};
 	}
 
-	const T& operator[](usz index) const noexcept
-	{
-		lf_queue_iterator<T> result = begin();
-
-		while (--index != umax)
-		{
-			result++;
-		}
-
-		return *result;
-	}
-
-	T& operator[](usz index) noexcept
-	{
-		lf_queue_iterator<T> result = begin();
-
-		while (--index != umax)
-		{
-			result++;
-		}
-
-		return *result;
-	}
-
 	lf_queue_slice& pop_front()
 	{
 		delete std::exchange(m_head, std::exchange(m_head->m_link, nullptr));
@@ -384,25 +268,12 @@ public:
 template <typename T>
 class lf_queue final
 {
-private:
-	struct fat_ptr
-	{
-		u64 ptr{};
-		u32 is_non_null{};
-		u32 reserved{};
-	};
-
-	atomic_t<fat_ptr> m_head{fat_ptr{}};
-
-	lf_queue_item<T>* load(fat_ptr value) const noexcept
-	{
-		return reinterpret_cast<lf_queue_item<T>*>(value.ptr);
-	}
+	atomic_t<lf_queue_item<T>*> m_head{nullptr};
 
 	// Extract all elements and reverse element order (FILO to FIFO)
 	lf_queue_item<T>* reverse() noexcept
 	{
-		if (auto* head = load(m_head) ? load(m_head.exchange(fat_ptr{})) : nullptr)
+		if (auto* head = m_head.load() ? m_head.exchange(nullptr) : nullptr)
 		{
 			if (auto* prev = head->m_link)
 			{
@@ -426,75 +297,45 @@ private:
 public:
 	constexpr lf_queue() = default;
 
-	lf_queue(lf_queue&& other) noexcept
-	{
-		m_head.release(other.m_head.exchange(fat_ptr{}));
-	}
-
-	lf_queue& operator=(lf_queue&& other) noexcept
-	{
-		if (this == std::addressof(other))
-		{
-			return *this;
-		}
-
-		delete load(m_head.exchange(other.m_head.exchange(fat_ptr{})));
-		return *this;
-	}
-
 	~lf_queue()
 	{
-		delete load(m_head);
+		delete m_head.load();
 	}
 
+	template <atomic_wait::op Flags = atomic_wait::op::eq>
 	void wait(std::nullptr_t /*null*/ = nullptr) noexcept
 	{
-		if (!operator bool())
+		if (m_head == nullptr)
 		{
-			get_wait_atomic().wait(0);
+			m_head.template wait<Flags>(nullptr);
 		}
 	}
 
-	atomic_t<u32> &get_wait_atomic()
-	{
-		return *utils::bless<atomic_t<u32>>(&m_head.raw().is_non_null);
-	}
-
 	const volatile void* observe() const noexcept
 	{
-		return load(m_head);
+		return m_head.load();
 	}
 
 	explicit operator bool() const noexcept
 	{
-		return observe() != nullptr;
+		return m_head != nullptr;
 	}
 
-	template <bool Notify = true, typename... Args>
-	bool push(Args&&... args)
+	template <typename... Args>
+	void push(Args&&... args)
 	{
-		auto oldv = m_head.load();
-		auto item = new lf_queue_item<T>(load(oldv), std::forward<Args>(args)...);
+		auto _old = m_head.load();
+		auto item = new lf_queue_item<T>(_old, std::forward<Args>(args)...);
 
-		while (!m_head.compare_exchange(oldv, fat_ptr{reinterpret_cast<u64>(item), item != nullptr, 0}))
+		while (!m_head.compare_exchange(_old, item))
 		{
-			item->m_link = load(oldv);
+			item->m_link = _old;
 		}
 
-		if (!oldv.ptr && Notify)
+		if (!_old)
 		{
 			// Notify only if queue was empty
-			notify(true);
-		}
-
-		return !oldv.ptr;
-	}
-
-	void notify(bool force = false)
-	{
-		if (force || operator bool())
-		{
-			get_wait_atomic().notify_one();
+			m_head.notify_one();
 		}
 	}
 
@@ -506,14 +347,6 @@ public:
 		return result;
 	}
 
-	// Withdraw the list in reverse order (LIFO/FILO)
-	lf_queue_slice<T> pop_all_reversed()
-	{
-		lf_queue_slice<T> result;
-		result.m_head = load(m_head.exchange(fat_ptr{}));
-		return result;
-	}
-
 	// Apply func(data) to each element, return the total length
 	template <typename F>
 	usz apply(F func)
diff --git a/Utilities/mutex.cpp b/Utilities/mutex.cpp
index 0cbd0df30e..f7e32eaf3a 100644
--- a/Utilities/mutex.cpp
+++ b/Utilities/mutex.cpp
@@ -6,27 +6,14 @@ void shared_mutex::imp_lock_shared(u32 val)
 {
 	ensure(val < c_err); // "shared_mutex underflow"
 
-	// Try to steal the notification bit
-	if (val & c_sig && m_value.compare_exchange(val, val - c_sig + 1))
-	{
-		return;
-	}
-
 	for (int i = 0; i < 10; i++)
 	{
+		busy_wait();
+
 		if (try_lock_shared())
 		{
 			return;
 		}
-
-		const u32 old = m_value;
-
-		if (old & c_sig && m_value.compare_and_swap_test(old, old - c_sig + 1))
-		{
-			return;
-		}
-
-		busy_wait();
 	}
 
 	// Acquire writer lock and downgrade
@@ -74,38 +61,25 @@ void shared_mutex::imp_wait()
 			break;
 		}
 
-		m_value.wait(old);
+		m_value.wait(old, c_sig);
 	}
 }
 
 void shared_mutex::imp_signal()
 {
 	m_value += c_sig;
-	m_value.notify_one();
+	m_value.notify_one(c_sig);
 }
 
 void shared_mutex::imp_lock(u32 val)
 {
 	ensure(val < c_err); // "shared_mutex underflow"
 
-	// Try to steal the notification bit
-	if (val & c_sig && m_value.compare_exchange(val, val - c_sig + c_one))
-	{
-		return;
-	}
-
 	for (int i = 0; i < 10; i++)
 	{
 		busy_wait();
 
-		const u32 old = m_value;
-
-		if (!old && try_lock())
-		{
-			return;
-		}
-
-		if (old & c_sig && m_value.compare_and_swap_test(old, old - c_sig + c_one))
+		if (!m_value && try_lock())
 		{
 			return;
 		}
diff --git a/Utilities/mutex.h b/Utilities/mutex.h
index 4c09431096..a02d9945da 100644
--- a/Utilities/mutex.h
+++ b/Utilities/mutex.h
@@ -121,7 +121,7 @@ public:
 
 	void unlock_hle()
 	{
-		const u32 value = atomic_storage<u32>::fetch_add_hle_rel(m_value.raw(), ~c_one + 1);
+		const u32 value = atomic_storage<u32>::fetch_add_hle_rel(m_value.raw(), 0u - c_one);
 
 		if (value != c_one) [[unlikely]]
 		{
@@ -171,11 +171,6 @@ public:
 	{
 		return m_value.load() < c_one - 1;
 	}
-
-	bool has_waiters() const
-	{
-		return m_value.load() > c_one;
-	}
 };
 
 // Simplified shared (reader) lock implementation.
diff --git a/Utilities/ppu_patch.h b/Utilities/ppu_patch.h
deleted file mode 100644
index f88786cf24..0000000000
--- a/Utilities/ppu_patch.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include <unordered_set>
-#include <string>
-
-// Patch utilities specific to PPU code
-struct ppu_patch_block_registry_t
-{
-    ppu_patch_block_registry_t() = default;
-    ppu_patch_block_registry_t(const ppu_patch_block_registry_t&) = delete;
-    ppu_patch_block_registry_t& operator=(const ppu_patch_block_registry_t&) = delete;
-
-    std::unordered_set<u32> block_addresses{};
-};
-
-void ppu_register_range(u32 addr, u32 size);
-bool ppu_form_branch_to_code(u32 entry, u32 target, bool link = false, bool with_toc = false, std::string module_name = {});
-u32 ppu_generate_id(std::string_view name);
diff --git a/Utilities/rXml.cpp b/Utilities/rXml.cpp
index 14ac0659f6..6901945b68 100644
--- a/Utilities/rXml.cpp
+++ b/Utilities/rXml.cpp
@@ -5,102 +5,66 @@ rXmlNode::rXmlNode()
 {
 }
 
-rXmlNode::rXmlNode(const pugi::xml_node& node)
+rXmlNode::rXmlNode(const pugi::xml_node &node)
 {
 	handle = node;
 }
 
 std::shared_ptr<rXmlNode> rXmlNode::GetChildren()
 {
-	if (handle)
-	{
-		if (const pugi::xml_node child = handle.first_child())
-		{
-			return std::make_shared<rXmlNode>(child);
-		}
-	}
+	// it.begin() returns node_iterator*, *it.begin() return node*.
+	pugi::xml_object_range<pugi::xml_node_iterator> it = handle.children();
+	pugi::xml_node begin = *it.begin();
 
-	return nullptr;
+	if (begin)
+	{
+		return std::make_shared<rXmlNode>(begin);
+	}
+	else
+	{
+		return nullptr;
+	}
 }
 
 std::shared_ptr<rXmlNode> rXmlNode::GetNext()
 {
-	if (handle)
+	pugi::xml_node result = handle.next_sibling();
+	if (result)
 	{
-		if (const pugi::xml_node result = handle.next_sibling())
-		{
-			return std::make_shared<rXmlNode>(result);
-		}
+		return std::make_shared<rXmlNode>(result);
+	}
+	else
+	{
+		return nullptr;
 	}
-
-	return nullptr;
 }
 
 std::string rXmlNode::GetName()
 {
-	if (handle)
-	{
-		if (const pugi::char_t* name = handle.name())
-		{
-			return name;
-		}
-	}
-
-	return {};
+	return handle.name();
 }
 
-std::string rXmlNode::GetAttribute(std::string_view name)
+std::string rXmlNode::GetAttribute(const std::string &name)
 {
-	if (handle)
-	{
-		if (const pugi::xml_attribute attr = handle.attribute(name))
-		{
-			if (const pugi::char_t* value = attr.value())
-			{
-				return value;
-			}
-		}
-	}
-
-	return {};
+	auto pred = [&name](pugi::xml_attribute attr) { return (name == attr.name()); };
+	return handle.find_attribute(pred).value();
 }
 
 std::string rXmlNode::GetNodeContent()
 {
-	if (handle)
-	{
-		if (const pugi::xml_text text = handle.text())
-		{
-			if (const pugi::char_t* value = text.get())
-			{
-				return value;
-			}
-		}
-	}
-
-	return {};
+	return handle.text().get();
 }
 
 rXmlDocument::rXmlDocument()
 {
 }
 
-pugi::xml_parse_result rXmlDocument::Read(std::string_view data)
+void rXmlDocument::Read(const std::string& data)
 {
-	if (handle)
-	{
-		return handle.load_buffer(data.data(), data.size());
-	}
-
-	return {};
+	handle.load_buffer(data.data(), data.size());
 }
 
 std::shared_ptr<rXmlNode> rXmlDocument::GetRoot()
 {
-	if (const pugi::xml_node root = handle.root())
-	{
-		return std::make_shared<rXmlNode>(root);
-	}
-
-	return nullptr;
+	return std::make_shared<rXmlNode>(handle.root());
 }
diff --git a/Utilities/rXml.h b/Utilities/rXml.h
index 8b70d06ee4..c5292470d8 100644
--- a/Utilities/rXml.h
+++ b/Utilities/rXml.h
@@ -19,11 +19,11 @@
 struct rXmlNode
 {
 	rXmlNode();
-	rXmlNode(const pugi::xml_node& node);
+	rXmlNode(const pugi::xml_node &);
 	std::shared_ptr<rXmlNode> GetChildren();
 	std::shared_ptr<rXmlNode> GetNext();
 	std::string GetName();
-	std::string GetAttribute(std::string_view name);
+	std::string GetAttribute( const std::string &name);
 	std::string GetNodeContent();
 
 	pugi::xml_node handle{};
@@ -34,8 +34,8 @@ struct rXmlDocument
 	rXmlDocument();
 	rXmlDocument(const rXmlDocument& other) = delete;
 	rXmlDocument &operator=(const rXmlDocument& other) = delete;
-	pugi::xml_parse_result Read(std::string_view data);
-	virtual std::shared_ptr<rXmlNode> GetRoot();
+	void Read(const std::string& data);
+	std::shared_ptr<rXmlNode> GetRoot();
 
 	pugi::xml_document handle{};
 };
diff --git a/Utilities/sema.cpp b/Utilities/sema.cpp
index ee3dd98ffa..faf082b761 100644
--- a/Utilities/sema.cpp
+++ b/Utilities/sema.cpp
@@ -8,84 +8,72 @@ void semaphore_base::imp_wait()
 	{
 		busy_wait();
 
-		const u32 value = m_value.load();
+		const s32 value = m_value.load();
 
-		if (value & c_value_mask && m_value.compare_and_swap_test(value, value - c_value))
+		if (value > 0 && m_value.compare_and_swap_test(value, value - 1))
 		{
 			return;
 		}
 	}
 
-	bool waits = false;
-
 	while (true)
 	{
 		// Try hard way
-		const u32 value = m_value.fetch_op([&](u32& value)
+		const s32 value = m_value.atomic_op([](s32& value)
 		{
-			ensure(value != c_waiter_mask); // "semaphore_base: overflow"
-
-			if (value & c_value_mask)
+			// Use sign bit to acknowledge waiter presence
+			if (value && value > smin)
 			{
-				// Obtain signal
-				value -= c_value;
+				value--;
 
-				if (waits)
+				if (value < 0)
 				{
-					// Remove waiter
-					value -= c_waiter;
+					// Remove sign bit
+					value -= s32{smin};
 				}
 			}
-			else if (!waits)
+			else
 			{
-				// Add waiter
-				value += c_waiter;
+				// Set sign bit
+				value = smin;
 			}
+
+			return value;
 		});
 
-		if (value & c_value_mask)
+		if (value >= 0)
 		{
-			break;
+			// Signal other waiter to wake up or to restore sign bit
+			m_value.notify_one();
+			return;
 		}
 
-		m_value.wait(value + (waits ? 0 : c_waiter));
-		waits = true;
+		m_value.wait(value);
 	}
 }
 
-void semaphore_base::imp_post(u32 _old)
+void semaphore_base::imp_post(s32 _old)
 {
-	ensure(~_old & c_value_mask); // "semaphore_base: overflow"
+	ensure(_old < 0); // "semaphore_base: overflow"
 
-	if ((_old & c_waiter_mask) / c_waiter > (_old & c_value_mask) / c_value)
-	{
-		m_value.notify_one();
-	}
+	m_value.notify_one();
 }
 
-bool semaphore_base::try_post(u32 _max)
+bool semaphore_base::try_post(s32 _max)
 {
 	// Conditional increment
-	const auto [value, ok] = m_value.fetch_op([&](u32& value)
+	const s32 value = m_value.fetch_op([&](s32& value)
 	{
-		if ((value & c_value_mask) <= _max)
+		if (value < _max)
 		{
-			value += c_value;
-			return true;
+			value += 1;
 		}
-
-		return false;
 	});
 
-	if (!ok)
-	{
-		return false;
-	}
-
-	if (value & c_waiter_mask)
+	if (value < 0)
 	{
 		imp_post(value);
 	}
 
-	return true;
+	return value < _max;
 }
diff --git a/Utilities/sema.h b/Utilities/sema.h
index 45080ebed2..6e067e419f 100644
--- a/Utilities/sema.h
+++ b/Utilities/sema.h
@@ -7,22 +7,14 @@
 class semaphore_base
 {
 	// Semaphore value
-	atomic_t<u32> m_value;
-
-	enum : u32
-	{
-		c_value = 1u << 0,
-		c_value_mask = +c_value * 0xffff,
-		c_waiter = 1u << 16,
-		c_waiter_mask = +c_waiter * 0xffff,
-	};
+	atomic_t<s32> m_value;
 
 	void imp_wait();
 
-	void imp_post(u32 _old);
+	void imp_post(s32 _old);
 
 protected:
-	explicit constexpr semaphore_base(u32 value) noexcept
+	explicit constexpr semaphore_base(s32 value)
 		: m_value{value}
 	{
 	}
@@ -30,10 +22,10 @@ protected:
 	void wait()
 	{
 		// Load value
-		const u32 value = m_value.load();
+		const s32 value = m_value.load();
 
 		// Conditional decrement
-		if ((value & c_value_mask) == 0 || !m_value.compare_and_swap_test(value, value - c_value)) [[unlikely]]
+		if (value <= 0 || !m_value.compare_and_swap_test(value, value - 1)) [[unlikely]]
 		{
 			imp_wait();
 		}
@@ -41,47 +33,36 @@ protected:
 
 	bool try_wait()
 	{
-		return m_value.fetch_op([](u32& value)
-		{
-			if (value & c_value_mask)
-			{
-				value -= c_value;
-				return true;
-			}
-
-			return false;
-		}).second;
+		return m_value.try_dec(0);
 	}
 
-	void post(u32 _max)
+	void post(s32 _max)
 	{
 		// Unconditional increment
-		const u32 value = m_value.fetch_add(c_value);
+		const s32 value = m_value.fetch_add(1);
 
-		if (value & c_waiter_mask || (value & c_value_mask) >= std::min<u32>(c_value_mask, _max)) [[unlikely]]
+		if (value < 0 || value >= _max) [[unlikely]]
 		{
 			imp_post(value);
 		}
 	}
 
-	bool try_post(u32 _max);
+	bool try_post(s32 _max);
 
 public:
 	// Get current semaphore value
 	s32 get() const
 	{
 		// Load value
-		const u32 raw_value = m_value;
-		const u32 waiters = (raw_value & c_waiter_mask) / c_waiter;
-		const u32 value = (raw_value & c_value_mask) / c_value;
+		const s32 value = m_value;
 
 		// Return only positive value
-		return static_cast<s32>(waiters >= value ? 0 : value - waiters);
+		return value < 0 ? 0 : value;
 	}
 };
 
 // Lightweight semaphore template (default arguments define binary semaphore and Def == Max)
-template <s16 Max = 1, s16 Def = Max>
+template <s32 Max = 1, s32 Def = Max>
 class semaphore final : public semaphore_base
 {
 	static_assert(Max >= 0, "semaphore<>: Max is out of bounds");
@@ -92,13 +73,13 @@ class semaphore final : public semaphore_base
 
 public:
 	// Default constructor (recommended)
-	constexpr semaphore() noexcept
+	constexpr semaphore()
 		: base(Def)
 	{
 	}
 
 	// Explicit value constructor (not recommended)
-	explicit constexpr semaphore(s16 value) noexcept
+	explicit constexpr semaphore(s32 value)
 		: base(value)
 	{
 	}
diff --git a/Utilities/simple_ringbuf.cpp b/Utilities/simple_ringbuf.cpp
deleted file mode 100644
index c31b7af6fa..0000000000
--- a/Utilities/simple_ringbuf.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-#include "Utilities/simple_ringbuf.h"
-
-simple_ringbuf::simple_ringbuf(u64 size)
-{
-	set_buf_size(size);
-}
-
-simple_ringbuf::~simple_ringbuf()
-{
-	rw_ptr.load(); // Sync
-}
-
-simple_ringbuf::simple_ringbuf(const simple_ringbuf& other)
-{
-	ctr_state old = other.rw_ptr.load();
-
-	for (;;)
-	{
-		buf = other.buf;
-		rw_ptr = old;
-
-		const ctr_state current = other.rw_ptr.load();
-		if (old == current)
-		{
-			break;
-		}
-		old = current;
-	}
-}
-
-simple_ringbuf& simple_ringbuf::operator=(const simple_ringbuf& other)
-{
-	if (this == &other) return *this;
-
-	ctr_state old = other.rw_ptr.load();
-
-	for (;;)
-	{
-		buf = other.buf;
-		rw_ptr = old;
-
-		const ctr_state current = other.rw_ptr.load();
-		if (old == current)
-		{
-			break;
-		}
-		old = current;
-	}
-
-	return *this;
-}
-
-simple_ringbuf::simple_ringbuf(simple_ringbuf&& other)
-{
-	const ctr_state other_rw_ptr = other.rw_ptr.load();
-	buf = std::move(other.buf);
-	rw_ptr = other_rw_ptr;
-
-	other.rw_ptr.store({});
-}
-
-simple_ringbuf& simple_ringbuf::operator=(simple_ringbuf&& other)
-{
-	if (this == &other) return *this;
-
-	const ctr_state other_rw_ptr = other.rw_ptr.load();
-	buf = std::move(other.buf);
-	rw_ptr = other_rw_ptr;
-
-	other.rw_ptr.store({});
-
-	return *this;
-}
-
-u64 simple_ringbuf::get_free_size() const
-{
-	return get_free_size(rw_ptr);
-}
-
-u64 simple_ringbuf::get_used_size() const
-{
-	return get_used_size(rw_ptr);
-}
-
-u64 simple_ringbuf::get_total_size() const
-{
-	rw_ptr.load(); // Sync
-	return buf.size() - 1;
-}
-
-u64 simple_ringbuf::get_free_size(ctr_state val) const
-{
-	const u64 buf_size = buf.size();
-	const u64 rd = val.read_ptr % buf_size;
-	const u64 wr = val.write_ptr % buf_size;
-
-	return (wr >= rd ? buf_size + rd - wr : rd - wr) - 1;
-}
-
-u64 simple_ringbuf::get_used_size(ctr_state val) const
-{
-	const u64 buf_size = buf.size();
-	const u64 rd = val.read_ptr % buf_size;
-	const u64 wr = val.write_ptr % buf_size;
-
-	return wr >= rd ? wr - rd : buf_size + wr - rd;
-}
-
-void simple_ringbuf::set_buf_size(u64 size)
-{
-	ensure(size != umax);
-
-	buf.resize(size + 1);
-	rw_ptr.store({});
-}
-
-void simple_ringbuf::writer_flush(u64 cnt)
-{
-	rw_ptr.atomic_op([&](ctr_state& val)
-	{
-		const u64 used = get_used_size(val);
-		if (used == 0) return;
-
-		val.write_ptr += buf.size() - std::min<u64>(used, cnt);
-	});
-}
-
-void simple_ringbuf::reader_flush(u64 cnt)
-{
-	rw_ptr.atomic_op([&](ctr_state& val)
-	{
-		val.read_ptr += std::min(get_used_size(val), cnt);
-	});
-}
-
-u64 simple_ringbuf::push(const void* data, u64 size, bool force)
-{
-	ensure(data != nullptr);
-
-	return rw_ptr.atomic_op([&](ctr_state& val) -> u64
-	{
-		const u64 buf_size  = buf.size();
-		const u64 old       = val.write_ptr % buf_size;
-		const u64 free_size = get_free_size(val);
-		const u64 to_push   = std::min(size, free_size);
-		const auto b_data   = static_cast<const u8*>(data);
-
-		if (!to_push || (!force && free_size < size))
-		{
-			return 0;
-		}
-
-		if (old + to_push > buf_size)
-		{
-			const auto first_write_sz = buf_size - old;
-			memcpy(&buf[old], b_data, first_write_sz);
-			memcpy(&buf[0], b_data + first_write_sz, to_push - first_write_sz);
-		}
-		else
-		{
-			memcpy(&buf[old], b_data, to_push);
-		}
-
-		val.write_ptr += to_push;
-
-		return to_push;
-	});
-}
-
-u64 simple_ringbuf::pop(void* data, u64 size, bool force)
-{
-	ensure(data != nullptr);
-
-	return rw_ptr.atomic_op([&](ctr_state& val) -> u64
-	{
-		const u64 buf_size  = buf.size();
-		const u64 old       = val.read_ptr % buf_size;
-		const u64 used_size = get_used_size(val);
-		const u64 to_pop    = std::min(size, used_size);
-		const auto b_data   = static_cast<u8*>(data);
-
-		if (!to_pop || (!force && used_size < size))
-		{
-			return 0;
-		}
-
-		if (old + to_pop > buf_size)
-		{
-			const auto first_read_sz = buf_size - old;
-			memcpy(b_data, &buf[old], first_read_sz);
-			memcpy(b_data + first_read_sz, &buf[0], to_pop - first_read_sz);
-		}
-		else
-		{
-			memcpy(b_data, &buf[old], to_pop);
-		}
-
-		val.read_ptr += to_pop;
-
-		return to_pop;
-	});
-}
diff --git a/Utilities/simple_ringbuf.h b/Utilities/simple_ringbuf.h
deleted file mode 100644
index 92151f7a97..0000000000
--- a/Utilities/simple_ringbuf.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-#include "util/atomic.hpp"
-#include <vector>
-
-// Single reader/writer simple ringbuffer.
-class simple_ringbuf
-{
-public:
-
-	simple_ringbuf(u64 size = 0);
-	virtual ~simple_ringbuf();
-
-	simple_ringbuf(const simple_ringbuf& other);
-	simple_ringbuf& operator=(const simple_ringbuf& other);
-
-	// Thread unsafe functions.
-	simple_ringbuf(simple_ringbuf&& other);
-	simple_ringbuf& operator=(simple_ringbuf&& other);
-	void set_buf_size(u64 size);
-
-	// Helper functions
-	u64 get_free_size() const;
-	u64 get_used_size() const;
-	u64 get_total_size() const;
-
-	// Writer functions
-	u64 push(const void* data, u64 size, bool force = false);
-	void writer_flush(u64 cnt = umax);
-
-	// Reader functions
-	u64 pop(void* data, u64 size, bool force = false);
-	void reader_flush(u64 cnt = umax);
-
-private:
-
-	struct ctr_state
-	{
-		alignas(sizeof(u64) * 2)
-		u64 read_ptr = 0;
-		u64 write_ptr = 0;
-
-		auto operator<=>(const ctr_state& other) const = default;
-	};
-
-	static_assert(sizeof(ctr_state) == sizeof(u64) * 2);
-
-	atomic_t<ctr_state> rw_ptr{};
-	std::vector<u8> buf{};
-
-	u64 get_free_size(ctr_state val) const;
-	u64 get_used_size(ctr_state val) const;
-};
diff --git a/Utilities/stack_trace.cpp b/Utilities/stack_trace.cpp
deleted file mode 100644
index f44751fcda..0000000000
--- a/Utilities/stack_trace.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-#include "stdafx.h"
-#include "stack_trace.h"
-
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#define DBGHELP_TRANSLATE_TCHAR
-#include <DbgHelp.h>
-#include <codecvt>
-#else
-#include <execinfo.h>
-#endif
-
-namespace utils
-{
-#ifdef _WIN32
-	std::string wstr_to_utf8(LPWSTR data, int str_len)
-	{
-		if (!str_len)
-		{
-			return {};
-		}
-
-		// Calculate size
-		const auto length = WideCharToMultiByte(CP_UTF8, 0, data, str_len, NULL, 0, NULL, NULL);
-
-		// Convert
-		std::vector<char> out(length + 1, 0);
-		WideCharToMultiByte(CP_UTF8, 0, data, str_len, out.data(), length, NULL, NULL);
-		return out.data();
-	}
-
-	std::vector<void*> get_backtrace(int max_depth)
-	{
-		std::vector<void*> result = {};
-
-		const auto hProcess = ::GetCurrentProcess();
-		const auto hThread = ::GetCurrentThread();
-
-		CONTEXT context{};
-		RtlCaptureContext(&context);
-
-		STACKFRAME64 stack = {};
-		stack.AddrPC.Mode = AddrModeFlat;
-		stack.AddrStack.Mode = AddrModeFlat;
-		stack.AddrFrame.Mode = AddrModeFlat;
-#if defined(ARCH_X64)
-		stack.AddrPC.Offset = context.Rip;
-		stack.AddrStack.Offset = context.Rsp;
-		stack.AddrFrame.Offset = context.Rbp;
-#elif defined(ARCH_ARM64)
-		stack.AddrPC.Offset = context.Pc;
-		stack.AddrStack.Offset = context.Sp;
-		stack.AddrFrame.Offset = context.Fp;
-#endif
-
-		while (max_depth--)
-		{
-			if (!StackWalk64(
-				IMAGE_FILE_MACHINE_AMD64,
-				hProcess,
-				hThread,
-				&stack,
-				&context,
-				NULL,
-				SymFunctionTableAccess64,
-				SymGetModuleBase64,
-				NULL))
-			{
-				break;
-			}
-
-			result.push_back(reinterpret_cast<void*>(stack.AddrPC.Offset));
-		}
-
-		return result;
-	}
-
-	std::vector<std::string> get_backtrace_symbols(const std::vector<void*>& stack)
-	{
-		std::vector<std::string> result = {};
-		std::vector<u8> symbol_buf(sizeof(SYMBOL_INFOW) + sizeof(TCHAR) * 256);
-
-		const auto hProcess = ::GetCurrentProcess();
-
-		auto sym = reinterpret_cast<SYMBOL_INFOW*>(symbol_buf.data());
-		sym->SizeOfStruct = sizeof(SYMBOL_INFOW);
-		sym->MaxNameLen = 256;
-
-		IMAGEHLP_LINEW64 line_info{};
-		line_info.SizeOfStruct = sizeof(IMAGEHLP_LINEW64);
-
-		SymInitialize(hProcess, NULL, TRUE);
-		SymSetOptions(SYMOPT_LOAD_LINES);
-
-		for (const auto& pointer : stack)
-		{
-			DWORD64 unused;
-			SymFromAddrW(hProcess, reinterpret_cast<DWORD64>(pointer), &unused, sym);
-
-			if (sym->NameLen)
-			{
-				const auto function_name = wstr_to_utf8(sym->Name, static_cast<int>(sym->NameLen));
-
-				// Attempt to get file and line information if available
-				DWORD unused2;
-				if (SymGetLineFromAddrW64(hProcess, reinterpret_cast<DWORD64>(pointer), &unused2, &line_info))
-				{
-					const auto full_path = fmt::format("%s:%u %s", wstr_to_utf8(line_info.FileName, -1), line_info.LineNumber, function_name);
-					result.push_back(full_path);
-				}
-				else
-				{
-					result.push_back(function_name);
-				}
-			}
-			else
-			{
-				result.push_back(fmt::format("rpcs3@0xp", pointer));
-			}
-		}
-
-		return result;
-	}
-#else
-	std::vector<void*> get_backtrace(int max_depth)
-	{
-		std::vector<void*> result(max_depth);
-#ifndef ANDROID
-		int depth = backtrace(result.data(), max_depth);
-		result.resize(depth);
-#endif
-		return result;
-	}
-
-	std::vector<std::string> get_backtrace_symbols(const std::vector<void*>& stack)
-	{
-		std::vector<std::string> result;
-#ifndef ANDROID
-		result.reserve(stack.size());
-
-		const auto symbols = backtrace_symbols(stack.data(), static_cast<int>(stack.size()));
-		for (usz i = 0; i < stack.size(); ++i)
-		{
-			result.push_back(symbols[i]);
-		}
-
-		free(symbols);
-#endif
-		return result;
-	}
-#endif
-}
diff --git a/Utilities/stack_trace.h b/Utilities/stack_trace.h
deleted file mode 100644
index f57175611f..0000000000
--- a/Utilities/stack_trace.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-#include <util/types.hpp>
-#include <util/logs.hpp>
-
-namespace utils
-{
-	namespace stack_trace
-	{
-		// Printing utilities
-
-		template <typename T>
-		concept Logger = requires (T& t, const std::string& msg)
-		{
-			{ t.print(msg) };
-		};
-
-		struct print_to_log
-		{
-			logs::channel& log;
-
-		public:
-			print_to_log(logs::channel& chan)
-				: log(chan)
-			{}
-
-			void print(const std::string& s)
-			{
-				log.error("%s", s);
-			}
-		};
-	}
-
-	std::vector<void*> get_backtrace(int max_depth = 255);
-	std::vector<std::string> get_backtrace_symbols(const std::vector<void*>& stack);
-
-	FORCE_INLINE void print_trace(stack_trace::Logger auto& logger, int max_depth = 255)
-	{
-		const auto trace = get_backtrace(max_depth);
-		const auto lines = get_backtrace_symbols(trace);
-
-		for (const auto& line : lines)
-		{
-			logger.print(line);
-		}
-	}
-}
diff --git a/Utilities/sync.h b/Utilities/sync.h
index db46d6104f..6e4d87ea38 100644
--- a/Utilities/sync.h
+++ b/Utilities/sync.h
@@ -12,12 +12,18 @@
 #include <Windows.h>
 #include <ctime>
 #elif __linux__
+#include <errno.h>
 #include <sys/syscall.h>
 #include <linux/futex.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <fcntl.h>
 #endif
+#include <algorithm>
+#include <chrono>
+#include <mutex>
+#include <condition_variable>
+#include <unordered_map>
 
 #ifdef _WIN32
 DYNAMIC_IMPORT("ntdll.dll", NtWaitForKeyedEvent, NTSTATUS(HANDLE, PVOID Key, BOOLEAN Alertable, PLARGE_INTEGER Timeout));
@@ -32,31 +38,7 @@ constexpr NTSTATUS NTSTATUS_ALERTED = 0x101;
 constexpr NTSTATUS NTSTATUS_TIMEOUT = 0x102;
 #endif
 
-#ifdef __linux__
-#ifndef SYS_futex_waitv
-#if defined(ARCH_X64) || defined(ARCH_ARM64)
-#define SYS_futex_waitv 449
-#endif
-#endif
-
-#ifndef FUTEX_32
-#define FUTEX_32 2
-#endif
-
-#ifndef FUTEX_WAITV_MAX
-#define FUTEX_WAITV_MAX 128
-struct futex_waitv
-{
-	__u64 val;
-	__u64 uaddr;
-	__u32 flags;
-	__u32 __reserved;
-};
-#endif
-#else
-
-#include <condition_variable>
-
+#ifndef __linux__
 enum
 {
 	FUTEX_PRIVATE_FLAG = 0,
@@ -117,13 +99,13 @@ inline int futex(volatile void* uaddr, int futex_op, uint val, const timespec* t
 
 				if (!timeout)
 				{
-					rec.cv.wait(lock, FN(!rec.mask));
+					rec.cv.wait(lock, [&] { return !rec.mask; });
 				}
 				else if (futex_op == FUTEX_WAIT)
 				{
 					const auto nsec = std::chrono::nanoseconds(timeout->tv_nsec + timeout->tv_sec * 1000000000ull);
 
-					if (!rec.cv.wait_for(lock, nsec, FN(!rec.mask)))
+					if (!rec.cv.wait_for(lock, nsec, [&] { return !rec.mask; }))
 					{
 						res = -1;
 						errno = ETIMEDOUT;
@@ -131,7 +113,7 @@ inline int futex(volatile void* uaddr, int futex_op, uint val, const timespec* t
 				}
 				else
 				{
-					// TODO: absolute timeout
+					// TODO
 				}
 
 				map.erase(std::find(map.find(uaddr), map.end(), ref));
diff --git a/Utilities/transactional_storage.h b/Utilities/transactional_storage.h
deleted file mode 100644
index 1be923233e..0000000000
--- a/Utilities/transactional_storage.h
+++ /dev/null
@@ -1,159 +0,0 @@
-#include "util/types.hpp"
-#include <vector>
-#include <mutex>
-#include "Emu/Cell/timers.hpp"
-
-// Thread-safe object pool with garbage collection
-class universal_pool
-{
-public:
-
-	universal_pool(u32 gc_interval = 10000) : gc_interval(gc_interval)
-	{
-	}
-
-	~universal_pool()
-	{
-		std::lock_guard lock(mutex);
-		storage.clear();
-	}
-
-	universal_pool(const universal_pool&) = delete;
-	universal_pool& operator=(const universal_pool&) = delete;
-
-	void set_gc_interval(u32 new_val)
-	{
-		gc_interval = new_val;
-	}
-
-	template <typename F>
-	requires (std::invocable<F&> && std::is_same_v<std::invoke_result_t<F&>, std::shared_ptr<void>>)
-	void add_op(F func)
-	{
-		std::lock_guard lock(mutex);
-		if (std::shared_ptr<void> new_val = std::invoke(func); new_val)
-		{
-			storage.push_back(new_val);
-		}
-		delete_unused();
-	}
-
-	void force_gc()
-	{
-		std::lock_guard lock(mutex);
-		delete_unused();
-	}
-
-private:
-
-	void delete_unused()
-	{
-		const u32 gc_int = gc_interval.observe();
-
-		if (u64 crnt_time = get_system_time(); gc_int == 0 || crnt_time > gc_last_time + gc_int)
-		{
-			gc_last_time = crnt_time;
-			storage.erase
-			(
-				std::remove_if(storage.begin(), storage.end(), [](auto& obj) { return obj.use_count() <= 1; }),
-				storage.end()
-			);
-		}
-	}
-
-	shared_mutex mutex{};
-	std::vector<std::shared_ptr<void>> storage{};
-	u64 gc_last_time = get_system_time();
-	atomic_t<u32> gc_interval = 0;
-};
-
-template<typename T>
-class transactional_storage
-{
-public:
-
-	transactional_storage(std::shared_ptr<universal_pool> pool, std::shared_ptr<T> obj = std::make_shared<T>())
-	{
-		ensure(pool && obj);
-
-		this->pool = pool;
-		add(obj);
-	}
-
-	transactional_storage(const transactional_storage&) = delete;
-	transactional_storage& operator=(const transactional_storage&) = delete;
-
-	transactional_storage(transactional_storage&& other)
-		: pool(std::move(other.pool))
-	{
-		std::unique_lock lock_other{other.current_mutex};
-		const std::shared_ptr<T> other_current = other.current;
-		other.current = nullptr;
-		lock_other.unlock();
-
-		std::lock_guard lock{current_mutex};
-		current = other_current;
-	}
-
-	transactional_storage& operator=(transactional_storage&& other)
-	{
-		if (this == &other) return *this;
-
-		pool = std::move(other.pool);
-
-		std::unique_lock lock_other{other.current_mutex};
-		const std::shared_ptr<T> other_current = other.current;
-		other.current = nullptr;
-		lock_other.unlock();
-
-		std::lock_guard lock{current_mutex};
-		current = other_current;
-
-		return *this;
-	}
-
-	std::shared_ptr<const T> get_current()
-	{
-		reader_lock lock(current_mutex);
-		return current;
-	}
-
-	void add(std::shared_ptr<T> obj)
-	{
-		if (!obj)
-		{
-			return;
-		}
-
-		pool->add_op([&]() -> std::shared_ptr<void>
-		{
-			{
-				std::lock_guard lock{current_mutex};
-				current = obj;
-			}
-			return std::move(obj);
-		});
-	}
-
-	template <typename F>
-	requires (std::invocable<F&> && std::is_same_v<std::invoke_result_t<F&>, std::shared_ptr<T>>)
-	void add_op(F func)
-	{
-		pool->add_op([&]() -> std::shared_ptr<void>
-		{
-			std::shared_ptr<T> obj = std::invoke(func);
-			if (obj)
-			{
-				std::lock_guard lock{current_mutex};
-				current = obj;
-			}
-			return obj;
-		});
-	}
-
-private:
-
-	shared_mutex current_mutex{};
-	std::shared_ptr<T> current{};
-	std::shared_ptr<universal_pool> pool{};
-};
diff --git a/Utilities/version.cpp b/Utilities/version.cpp
index 0c3cbb6da1..f31722c391 100644
--- a/Utilities/version.cpp
+++ b/Utilities/version.cpp
@@ -30,8 +30,7 @@ namespace utils
 
 		if (lo())
 		{
-			version += '.';
-			version += std::to_string(lo());
+			version += "." + std::to_string(lo());
 		}
 
 		if (type() != version_type::release)
@@ -41,8 +40,7 @@ namespace utils
 				version += "-" + postfix();
 			}
 
-			version += ' ';
-			version += utils::to_string(type());
+			version += " " + utils::to_string(type());
 
 			if (type_index() > 1)
 			{
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 0000000000..604e8bec8e
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,121 @@
+trigger:
+  branches:
+    include:
+      - master
+  tags:
+    exclude:
+      - '*'
+pr: none
+jobs:
+- job: Linux_Build
+  strategy:
+    matrix:
+      Clang:
+        COMPILER: clang
+      GCC:
+        COMPILER: gcc
+  variables:
+    CCACHE_DIR: $(Pipeline.Workspace)/ccache
+    CI_HAS_ARTIFACTS: true
+    UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f
+    UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-linux"
+    DEPLOY_APPIMAGE: true
+    APPDIR: "/rpcs3/build/appdir"
+    ARTDIR: "/root/artifacts"
+    RELEASE_MESSAGE: "/rpcs3/GitHubReleaseMessage.txt"
+
+  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-ci-bionic:1.1
+      docker run                      \
+        -v $(pwd):/rpcs3              \
+        --env-file .ci/docker.env \
+        -v $CCACHE_DIR:/root/.ccache  \
+        -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
+        rpcs3/rpcs3-ci-bionic:1.1 \
+        /rpcs3/.ci/build-linux.sh
+    displayName: Docker setup and build
+
+  - publish: $(Build.ArtifactStagingDirectory)
+    condition: succeeded()
+    artifact: RPCS3 for Linux ($(COMPILER))
+
+  - bash: .ci/github-upload.sh
+    condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['COMPILER'], 'gcc'))
+    displayName: Push build to GitHub
+    env:
+      RPCS3_TOKEN: $(RPCS3-Token)
+
+- job: Windows_Build
+  variables:
+    COMPILER: msvc
+    QT_VER_MAIN: '5'
+    QT_VER: '5.15.2'
+    QT_VER_MSVC: 'msvc2019'
+    QT_DATE: '202011130602'
+    QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64
+    VULKAN_VER: '1.2.182.0'
+    VULKAN_SDK_SHA: '7089d48011f06c4a02a593913c6a9385d1652ab7765c25d2666d5d6ef4e24af8'
+    VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER)
+    CACHE_DIR: ./cache
+    UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
+    UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-win"
+
+  pool:
+    vmImage: "windows-latest"
+
+  steps:
+    - bash: .ci/get_keys-windows.sh
+      displayName: Get Cache Keys
+
+    - task: Cache@2
+      inputs:
+        key: $(Agent.OS) | $(COMPILER) | "$(QT_VER)" | $(VULKAN_SDK_SHA) | llvm.lock | glslang.lock
+        path: $(CACHE_DIR)
+        restoreKeys: |
+          $(Agent.OS) | $(COMPILER)
+      displayName: Cache
+
+    - bash: .ci/setup-windows.sh
+      displayName: Download and unpack dependencies
+
+    - bash: .ci/export-azure-vars.sh
+      displayName: Export Variables
+
+    - task: MSBuild@1
+      inputs:
+        solution: './3rdparty/SPIRV/spirv.vcxproj'
+        maximumCpuCount: true
+        platform: x64
+        configuration: 'Release'
+      displayName: Compile SPIRV-Tools
+
+    - task: VSBuild@1
+      inputs:
+        solution: 'rpcs3.sln'
+        maximumCpuCount: true
+        platform: x64
+        configuration: 'Release'
+      displayName: Compile RPCS3
+
+    - bash: .ci/deploy-windows.sh
+      displayName: Pack up build artifacts
+
+    - publish: $(Build.ArtifactStagingDirectory)
+      condition: succeeded()
+      artifact: RPCS3 for Windows
+
+    - bash: .ci/github-upload.sh
+      condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+      displayName: Push build to GitHub
+      env:
+        RPCS3_TOKEN: $(RPCS3-Token)
diff --git a/bin/GuiConfigs/Classic (Bright).qss b/bin/GuiConfigs/Classic (Bright).qss
index 143e42df94..130a8ab4f6 100644
--- a/bin/GuiConfigs/Classic (Bright).qss	
+++ b/bin/GuiConfigs/Classic (Bright).qss	
@@ -20,9 +20,6 @@ QToolBar#mw_toolbar::separator {
 	margin-top:2px;
 	margin-bottom: 2px;
 }
-QToolButton:disabled {
-	color: #787878;
-}
 QSlider#sizeSlider::groove:horizontal {
 	border: 0em solid transparent;
 	height: .3em;
@@ -46,14 +43,28 @@ QLabel#gamelist_icon_background_color {
 	color: rgba(209,209,209,255);
 }
 
+/* game grid stylesheet */
+QTableWidget#game_grid {
+	font-weight:600;
+	font-size:8pt;
+	font-family:Lucida Grande;
+	color: rgba(51,51,51,255);
+}
+QTableWidget#game_grid::item:selected:active {
+	selection-background-color: #0078D7;
+}
+QTableWidget#game_grid::item:selected:!active {
+	selection-background-color: #008cff;
+}
+
 /* log stylesheet */
-QPlainTextEdit#tty_frame {
+QTextEdit#tty_frame {
 	background-color:#ffffff;
 }
 QLabel#tty_text {
 	color:#000000;
 }
-QPlainTextEdit#log_frame {
+QTextEdit#log_frame {
 	background-color:#ffffff;
 }
 QLabel#log_level_always {
@@ -120,46 +131,3 @@ QLabel#rsx_debugger_display_buffer {
 QLabel#l_controller {
 	color:#434343;
 }
-
-/* Game Grid */
-#game_list_grid_item[selected="true"] {
-	background: #0078D7;
-}
-#game_list_grid_item:hover {
-	background: #008cff;
-}
-#game_list_grid_item:focus {
-	background: #0078D7;
-}
-
-/* Game Grid Font */
-#game_list_grid_item #game_list_grid_item_title_label {
-	font-weight: 600;
-	font-size: 8pt;
-	font-family: Lucida Grande;
-	color: rgba(51,51,51,255);
-}
-
-/* Game Grid hover and focus: we need to handle properties differently when using descendants */
-#game_list_grid_item[selected="true"] #game_list_grid_item_title_label {
-	color: #fff;
-}
-#game_list_grid_item[hover="true"] #game_list_grid_item_title_label {
-	color: #fff;
-}
-#game_list_grid_item[focus="true"] #game_list_grid_item_title_label {
-	color: #fff;
-}
-
-/* Top menu bar (Workaround for transparent menus in Qt 6.7.3) */
-QMenu {
-	color: #000;
-	background-color: #F0F0F0;
-	alternate-background-color: #f2f2f2;
-}
-QMenu::item:selected {
-	background: #90C8F6;
-}
-QMenu::item:disabled {
-	color: #787878;
-}
diff --git a/bin/GuiConfigs/Darker Style by TheMitoSan.qss b/bin/GuiConfigs/Darker Style by TheMitoSan.qss
index 47270a211e..08465d05f9 100644
--- a/bin/GuiConfigs/Darker Style by TheMitoSan.qss	
+++ b/bin/GuiConfigs/Darker Style by TheMitoSan.qss	
@@ -1,5 +1,5 @@
-/*
-TheMitoSan Dark-Theme for RPCS3
+/* 
+TheMitoSan Dark-Theme for RPCS3 
 Based on Kuroi (Dark) by Ani
 by themitosan @ twitter.com/themitosan
 Ani @ https://github.com/AniLeo
@@ -58,7 +58,7 @@ QTabBar::tab:hover {
 }
 
 /* Checkboxes */
-QCheckBox::indicator, QListWidget::indicator, QTreeWidget::indicator {
+QCheckBox::indicator {
 	border-radius: 0.125em;
 	border-top-right-radius: 0em;
 	border-bottom-left-radius: 0em;
@@ -67,14 +67,13 @@ QCheckBox::indicator, QListWidget::indicator, QTreeWidget::indicator {
 	height: 0.8em;
 	margin-top: 0.0625em;
 }
-QCheckBox::indicator:checked, QListWidget::indicator::checked, QTreeWidget::indicator::checked {
-	background-color: #000; /* Black */
-	image: url("GuiConfigs/check_mark_white.png");
+QCheckBox::indicator:checked {
+	background-color: #FFF; /* White */
 }
-QCheckBox::indicator:unchecked, QListWidget::indicator::unchecked, QTreeWidget::indicator::unchecked {
+QCheckBox::indicator:unchecked {
 	background-color: #000; /* Black */
 }
-QCheckBox::indicator::disabled, QListWidget::indicator::disabled, QTreeWidget::indicator::disabled {
+QCheckBox::indicator::disabled {
 	background-color: #af4949; /* Red */
 }
 
@@ -87,14 +86,13 @@ QRadioButton::indicator {
 	border-radius: 0.270em;
 }
 QRadioButton::indicator:checked {
-	background-color: #000; /* Black */
-	image: url("GuiConfigs/check_mark_white.png");
+	background-color: #FFF; /* Green */
 }
 QRadioButton::indicator:unchecked {
-	background-color: #000; /* Black */
+	background-color: #000; /* Red */
 }
 QRadioButton::indicator::disabled {
-	background-color: #af4949; /* Red */
+	background-color: #af4949; /* Gray */
 }
 
 /* Combo Boxes */
@@ -137,7 +135,7 @@ QPushButton::disabled {
 }
 
 QPushButton::pressed {
-	background-color: #333;
+	background-color: #333; 
 }
 
 /* Log and Debugger borders */
@@ -182,11 +180,34 @@ QMenu::item:disabled {
 	border-radius: 0.25em;
 }
 
+/* Libraries list */
+QListWidget::item:selected {
+	background-color: #3d3d3d;
+	color: #ecf0f1;
+	border-radius: 0.125em;
+}
+QListWidget::item:hover {
+	background-color: #4c4b4b;
+	color: #ecf0f1;
+	border-radius: 0.25em;
+}
+
 /* Pad Settings: Controller Image */
-QLabel#l_controller {
+QLabel#l_controller { 
 	color: #FFF;
 }
 
+/* Game Grid Font */
+QTableWidget#game_grid {
+	font-weight: 600;
+	font-size: 8pt;
+	font-family: Lucida Grande;
+	color: #FFF;
+}
+QTableWidget#game_grid::item:selected:!active {
+	selection-background-color: #313f4e;
+}
+
 /* Slider on toolbar */
 QWidget#sizeSliderContainer {
 	background: transparent;
@@ -209,8 +230,8 @@ QLabel#color_button {
 }
 
 /* Search bar on main toolbar */
-QLineEdit#mw_searchbar {
-	margin-left: 0.7em;
+QLineEdit#mw_searchbar { 
+	margin-left: 0.7em; 
 	color: #ecf0f1;
 }
 
@@ -243,7 +264,7 @@ QLabel#thumbnail_icon_color {
 }
 
 /* Set Log colors */
-QPlainTextEdit#log_frame {
+QTextEdit#log_frame {
 	background-color: #000; /* Black */
 }
 QLabel#log_level_always {
@@ -275,7 +296,7 @@ QLabel#log_stack {
 }
 
 /* Set TTY colors */
-QPlainTextEdit#tty_frame {
+QTextEdit#tty_frame {
 	background-color: #000; /* Black */
 }
 QLabel#tty_text {
@@ -323,57 +344,24 @@ QLabel#debugger_frame_pc {
 /* Tree view changes*/
 QTreeView::branch:has-children:!has-siblings:closed,
 QTreeView::branch:closed:has-children:has-siblings {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_white.png");
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_white.png");
 }
 
 QTreeView::branch:open:has-children:!has-siblings,
-QTreeView::branch:open:has-children:has-siblings {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_down_white.png");
+QTreeView::branch:open:has-children:has-siblings  {
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_down_white.png");
 }
 
 QTreeView::branch:has-children:!has-siblings:closed:hover,
 QTreeView::branch:closed:has-children:has-siblings:hover {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_blue.png");
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_blue.png");
 }
 
 QTreeView::branch:open:has-children:!has-siblings:hover,
-QTreeView::branch:open:has-children:has-siblings:hover {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_down_blue.png");
+QTreeView::branch:open:has-children:has-siblings:hover  {
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_down_blue.png");
 }
-
-/* Game Grid */
-#game_list_grid_item[selected="true"] {
-	background: #313f4e;
-}
-#game_list_grid_item:hover {
-	background: #313f4e;
-}
-#game_list_grid_item:focus {
-	background: #0078D7;
-}
-
-/* Game Grid Font */
-#game_list_grid_item #game_list_grid_item_title_label {
-	font-weight: 600;
-	font-size: 8pt;
-	font-family: Lucida Grande;
-	color: #FFF;
-}
-
-/* Game Grid hover and focus: we need to handle properties differently when using descendants */
-#game_list_grid_item[selected="true"] #game_list_grid_item_title_label {
-	background-color: #313f4e;
-}
-#game_list_grid_item[hover="true"] #game_list_grid_item_title_label {
-	background-color: #313f4e;
-}
-#game_list_grid_item[focus="true"] #game_list_grid_item_title_label {
-	background-color: #0078D7;
-}
-
-/* Richtext link color */
-QLabel#richtext_link_color { color: #87cefa; }
diff --git a/bin/GuiConfigs/Envy.qss b/bin/GuiConfigs/Envy.qss
index a78ba04f58..320949a33b 100644
--- a/bin/GuiConfigs/Envy.qss
+++ b/bin/GuiConfigs/Envy.qss
@@ -1,4 +1,4 @@
-/*
+/* 
 Envy theme for RPCS3 by drysalter (https://github.com/drysalter)
 03/04/2019
 */
@@ -19,7 +19,7 @@ Candy Red: #ff007a
 Yellow: #f2d571
 Fuchsia: #ff00ff
 Orange: #ff6000
-Cyan: #3498d8
+Cyan: #3498d8 
 
 */
 
@@ -209,7 +209,7 @@ QRadioButton::indicator:unchecked {
 }
 
 QRadioButton::indicator:disabled {
-	background-color: #4d5058;
+	background-color: #4d5058; 
 }
 
 /* Combo Boxes */
@@ -272,7 +272,7 @@ QSlider::handle:horizontal {
 	border: 1px solid #5c5c5c;
 	border-radius: 0.1em;
 	width: 18px;
-	margin: -2px 2;
+	margin: -2px 2; 
 }
 
 QSlider::handle:horizontal:hover {
@@ -335,7 +335,7 @@ QPushButton:disabled {
 }
 
 QPushButton::pressed {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d3038, stop: 1 #2d3038);
+	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d3038, stop: 1 #2d3038); 
 }
 
 /* Spinboxes */
@@ -454,7 +454,7 @@ QListWidget::item:selected {
 }
 
 QListWidget::item:hover {
-	background-color: #30333a;
+	background-color:  #30333a;
 	color: #8cf944;
 	border-radius: 0.25em;
 }
@@ -479,7 +479,7 @@ QListWidget::indicator:disabled {
 }
 
 /* Pad Settings: Controller Image */
-QLabel#l_controller {
+QLabel#l_controller { 
 	color: #8cf944;
 }
 
@@ -505,7 +505,7 @@ QLabel#color_button {
 }
 
 /* Search bar on main toolbar */
-QLineEdit#mw_searchbar {
+QLineEdit#mw_searchbar { 
 	color: #ecf0f1;
 	background-color: #2d3038;
 	border: 1px solid #f8f8f8;
@@ -513,14 +513,14 @@ QLineEdit#mw_searchbar {
 	padding-left: 5px;
 }
 
-QLineEdit#mw_searchbar:hover {
+QLineEdit#mw_searchbar:hover { 
 	color: #ecf0f1;
 	background-color: #2d3038;
 	border: 1px solid #8cf944;
 	margin: 15px;
 }
 
-QLineEdit#mw_searchbar:focus {
+QLineEdit#mw_searchbar:focus { 
 	border: 1px solid #8cf944;
 }
 
@@ -565,8 +565,8 @@ QTableView {
 }
 
 QTableView::item:hover {
-	color: #8cf944;
-}
+    color: #8cf944;
+}      
 
 /* Game Icon Background */
 QLabel#gamelist_icon_background_color {
@@ -579,7 +579,7 @@ QLabel#thumbnail_icon_color {
 }
 
 /* Log colors */
-QPlainTextEdit#log_frame {
+QTextEdit#log_frame {
 	background-color: #23262d;
 }
 
@@ -620,7 +620,7 @@ QLabel#log_stack {
 }
 
 /* TTY colors */
-QPlainTextEdit#tty_frame {
+QTextEdit#tty_frame {
 	background-color: #23262d;
 }
 
@@ -641,45 +641,24 @@ QLabel#debugger_frame_pc {
 /* Tree view changes*/
 QTreeView::branch:has-children:!has-siblings:closed,
 QTreeView::branch:closed:has-children:has-siblings {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_white.png");
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_white.png");
 }
 
 QTreeView::branch:open:has-children:!has-siblings,
-QTreeView::branch:open:has-children:has-siblings {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_down_white.png");
+QTreeView::branch:open:has-children:has-siblings  {
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_down_white.png");
 }
 
 QTreeView::branch:has-children:!has-siblings:closed:hover,
 QTreeView::branch:closed:has-children:has-siblings:hover {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_green.png");
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_green.png");
 }
 
 QTreeView::branch:open:has-children:!has-siblings:hover,
-QTreeView::branch:open:has-children:has-siblings:hover {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_down_green.png");
+QTreeView::branch:open:has-children:has-siblings:hover  {
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_down_green.png");
 }
-
-/* Game Grid */
-#game_list_grid_item[selected="true"] {
-	background: #2d3038;
-}
-#game_list_grid_item:focus {
-	background: #2d3038;
-}
-
-/* Game Grid hover and focus: we need to handle properties differently when using descendants */
-#game_list_grid_item[selected="true"] #game_list_grid_item_title_label {
-	background-color: #2d3038;
-	color: #8cf944;
-}
-#game_list_grid_item[focus="true"] #game_list_grid_item_title_label {
-	background-color: #2d3038;
-	color: #8cf944;
-}
-
-/* Richtext link color */
-QLabel#richtext_link_color { color: #8cf944; }
diff --git a/bin/GuiConfigs/Kuroi (Dark) by Ani.qss b/bin/GuiConfigs/Kuroi (Dark) by Ani.qss
index 54c667213b..0f63d148ed 100644
--- a/bin/GuiConfigs/Kuroi (Dark) by Ani.qss	
+++ b/bin/GuiConfigs/Kuroi (Dark) by Ani.qss	
@@ -249,6 +249,20 @@ QWidget#trophy_notification_frame {
 	color: #e6e6e6;
 }
 
+/* Game Grid Font */
+QTableWidget#game_grid {
+	font-weight: 600;
+	font-size: 8pt;
+	font-family: Lucida Grande;
+	selection-color: #e6e6e6;
+}
+QTableWidget#game_grid::item:selected:active {
+	selection-background-color: #4c4b4b;
+}
+QTableWidget#game_grid::item:selected:!active {
+	selection-background-color: #3d3d3d;
+}
+
 /* Set Toolbar Slider Size */
 QSlider#sizeSlider::groove:horizontal {
 	border: 0em solid transparent;
@@ -292,7 +306,7 @@ QLabel#debugger_frame_pc {
 }
 
 /* Set Log colors */
-QPlainTextEdit#log_frame {
+QTextEdit#log_frame {
 	background-color: #000000; /* Black */
 }
 QLabel#log_level_always {
@@ -323,7 +337,7 @@ QLabel#log_stack {
 	color: #ffffff; /* White */
 }
 /* Set TTY colors */
-QPlainTextEdit#tty_frame {
+QTextEdit#tty_frame {
 	background-color: #000000; /* Black */
 }
 QLabel#tty_text {
@@ -333,57 +347,24 @@ QLabel#tty_text {
 /* Tree view changes*/
 QTreeView::branch:has-children:!has-siblings:closed,
 QTreeView::branch:closed:has-children:has-siblings {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_white.png");
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_white.png");
 }
 
 QTreeView::branch:open:has-children:!has-siblings,
-QTreeView::branch:open:has-children:has-siblings {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_down_white.png");
+QTreeView::branch:open:has-children:has-siblings  {
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_down_white.png");
 }
 
 QTreeView::branch:has-children:!has-siblings:closed:hover,
 QTreeView::branch:closed:has-children:has-siblings:hover {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_blue.png");
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_blue.png");
 }
 
 QTreeView::branch:open:has-children:!has-siblings:hover,
-QTreeView::branch:open:has-children:has-siblings:hover {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_down_blue.png");
+QTreeView::branch:open:has-children:has-siblings:hover  {
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_down_blue.png");
 }
-
-/* Game Grid */
-#game_list_grid_item[selected="true"] {
-	background: #3d3d3d;
-}
-#game_list_grid_item:hover {
-	background: #3d3d3d;
-}
-#game_list_grid_item:focus {
-	background: #4c4b4b;
-}
-
-/* Game Grid Font */
-#game_list_grid_item #game_list_grid_item_title_label {
-	font-weight: 600;
-	font-size: 8pt;
-	font-family: Lucida Grande;
-}
-
-/* Game Grid hover and focus: we need to handle properties differently when using descendants */
-#game_list_grid_item[selected="true"] #game_list_grid_item_title_label {
-	background-color: #3d3d3d;
-}
-#game_list_grid_item[hover="true"] #game_list_grid_item_title_label {
-	background-color: #3d3d3d;
-}
-#game_list_grid_item[focus="true"] #game_list_grid_item_title_label {
-	color: #e6e6e6;
-	background-color: #4c4b4b;
-}
-
-/* Richtext link color */
-QLabel#richtext_link_color { color: #87cefa; }
diff --git a/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss b/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss
index 410db682f7..efc1fc40f0 100644
--- a/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss	
+++ b/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss	
@@ -1,5 +1,5 @@
-/*
-ModernBlue Theme for RPCS3
+/* 
+ModernBlue Theme for RPCS3 
 by themitosan @ twitter.com/themitosan
 (2017.12.12)
 */
@@ -124,7 +124,7 @@ QGroupBox::title {
 /* Buttons */
 QPushButton {
 	background-color: #46598b;
-	color: #fff;
+	color: #fff; 
 }
 
 QPushButton::disabled {
@@ -133,7 +133,7 @@ QPushButton::disabled {
 }
 
 QPushButton::pressed {
-	background-color: #172038;
+	background-color: #172038; 
 }
 
 /* Log and Debugger borders */
@@ -190,10 +190,21 @@ QListWidget::item:hover {
 }
 
 /* Pad Settings: Controller Image */
-QLabel#l_controller {
+QLabel#l_controller { 
 	color: #fff;
 }
 
+/* Game Grid Font */
+QTableWidget#game_grid {
+	font-weight: 600;
+	font-size: 8pt;
+	font-family: Lucida Grande;
+	color: #fff;
+}
+QTableWidget#game_grid::item:selected:!active {
+	selection-background-color: #354454;
+}
+
 /* Slider on toolbar */
 QWidget#sizeSliderContainer {
 	background: transparent;
@@ -216,8 +227,8 @@ QLabel#color_button {
 }
 
 /* Search bar on main toolbar */
-QLineEdit#mw_searchbar {
-	margin-left: 0.7em;
+QLineEdit#mw_searchbar { 
+	margin-left: 0.7em; 
 	color: #ecf0f1;
 }
 
@@ -250,7 +261,7 @@ QLabel#thumbnail_icon_color {
 }
 
 /* Set Log colors */
-QPlainTextEdit#log_frame {
+QTextEdit#log_frame {
 	background-color: #181d24; /* Black */
 }
 QLabel#log_level_always {
@@ -282,7 +293,7 @@ QLabel#log_stack {
 }
 
 /* Set TTY colors */
-QPlainTextEdit#tty_frame {
+QTextEdit#tty_frame {
 	background-color: #181d24; /* Black */
 }
 QLabel#tty_text {
@@ -330,57 +341,24 @@ QLabel#debugger_frame_pc {
 /* Tree view changes*/
 QTreeView::branch:has-children:!has-siblings:closed,
 QTreeView::branch:closed:has-children:has-siblings {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_white.png");
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_white.png");
 }
 
 QTreeView::branch:open:has-children:!has-siblings,
-QTreeView::branch:open:has-children:has-siblings {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_down_white.png");
+QTreeView::branch:open:has-children:has-siblings  {
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_down_white.png");
 }
 
 QTreeView::branch:has-children:!has-siblings:closed:hover,
 QTreeView::branch:closed:has-children:has-siblings:hover {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_blue.png");
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_blue.png");
 }
 
 QTreeView::branch:open:has-children:!has-siblings:hover,
-QTreeView::branch:open:has-children:has-siblings:hover {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_down_blue.png");
+QTreeView::branch:open:has-children:has-siblings:hover  {
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_down_blue.png");
 }
-
-/* Game Grid */
-#game_list_grid_item[selected="true"] {
-	background: #354454;
-}
-#game_list_grid_item:hover {
-	background: #354454;
-}
-#game_list_grid_item:focus {
-	background: #0078D7;
-}
-
-/* Game Grid Font */
-#game_list_grid_item #game_list_grid_item_title_label {
-	font-weight: 600;
-	font-size: 8pt;
-	font-family: Lucida Grande;
-	color: #FFF;
-}
-
-/* Game Grid hover and focus: we need to handle properties differently when using descendants */
-#game_list_grid_item[selected="true"] #game_list_grid_item_title_label {
-	background-color: #354454;
-}
-#game_list_grid_item[hover="true"] #game_list_grid_item_title_label {
-	background-color: #354454;
-}
-#game_list_grid_item[focus="true"] #game_list_grid_item_title_label {
-	background-color: #0078D7;
-}
-
-/* Richtext link color */
-QLabel#richtext_link_color { color: #87cefa; }
diff --git a/bin/GuiConfigs/Nekotekina by GooseWing.qss b/bin/GuiConfigs/Nekotekina by GooseWing.qss
index 435d550755..152106bb34 100755
--- a/bin/GuiConfigs/Nekotekina by GooseWing.qss	
+++ b/bin/GuiConfigs/Nekotekina by GooseWing.qss	
@@ -1,6 +1,6 @@
 /*
 Nekotekina Theme for RPCS3 by GooseWing
-v1.1
+v1.0
 
 Based on YoRHa Theme for RPCS3
 by Ani @ https://github.com/AniLeo
@@ -60,21 +60,21 @@ QWidget {
 }
 
 
-/* HLE/LLE: Style QListWidget checkboxes (QListWidget) */
-QListWidget::indicator, QTreeWidget::indicator {
+/* LLE: Style QListWidget checkboxes (QListWidget) */
+#lleList::indicator {
 	border: 0.05em solid #4d4940;
 }
-QListWidget::indicator::unchecked, QTreeWidget::indicator::unchecked {
-	background-color: #705722; /* Dark */
+#lleList::indicator::unchecked {
+	background-color: #b3ac98;
 }
-QListWidget::indicator::checked, QTreeWidget::indicator::checked {
-	background-color: #ffd785; /* Light */
+#lleList::indicator::checked {
+	background-color: #4d4940;
 }
-QListWidget::indicator::disabled, QTreeWidget::indicator::disabled {
-	background-color: #828790; /* Gray */
+#lleList::indicator::disabled {
+	background-color: #828790;
 }
-QListWidget::item::selected, QTreeWidget::item::selected {
-	background-color: #5c471c;
+#lleList::item::selected {
+	color: #4d4940;
 }
 
 
@@ -85,9 +85,10 @@ QToolTip {
 	border: 0.10em solid #705722;
 }
 
-/* CG Disasm and Trophy Manager */
-QWidget#trophy_manager, QWidget#cg_disasm, QWidget#log_viewer {
-	border-image: url("GuiConfigs/kot-bg.jpg");
+
+/* CG Disasm and Trophy Manager: background-image doesn't work, use static color */
+QWidget#cg_disasm, QWidget#trophy_manager {
+	background: #6e695c;
 }
 
 
@@ -110,20 +111,32 @@ QHeaderView::section {
 }
 
 
-
-/* All Tabs */
-QTabWidget::tab-bar {
-	alignment: center; /* Centel all tabs */
-}
-/* Move tabs on log viewer back to the left side */
-QTabWidget#tab_widget_log::tab-bar {
-	alignment: left;
-}
+/* All other Tabs */
 QTabBar {
-	border-bottom: 0.05em solid #ffd785;
 	text-transform: uppercase;
 }
+
 QTabBar::tab {
+	background: transparent;
+	padding-left: 0.50em;
+	padding-right: 0.50em;
+	padding-top: 0.25em;
+	padding-bottom: 0.25em;
+	margin-right: 0.25em;
+}
+QTabBar::tab::selected {
+	background: #705722;
+	color: #ffd785;
+	border-bottom-style: solid;
+}
+
+
+/* Settings Dialog: Tabs */
+QTabBar#tab_bar_settings {
+	border-bottom: 0.05em solid #705722;
+	text-transform: uppercase;
+}
+QTabBar::tab#tab_bar_settings {
 	background: transparent;
 	width: 5.20em;
 	padding-left: 0.50em;
@@ -134,25 +147,19 @@ QTabBar::tab {
 	font-size: 10.5pt;
 	font-weight: 550;
 }
-QTabBar::tab:last {
+QTabBar::tab:last#tab_bar_settings {
 	margin-right: 0em;
 }
-QTabBar::tab::selected {
+QTabBar::tab:!selected:hover#tab_bar_settings {
+	background: transparent;
+	color: #705722;
+}
+QTabBar::tab::selected#tab_bar_settings {
 	background: #bfa163;
 	color: #705722;
+	border-bottom-style: solid;
 	margin-top: 0.15em;
-	border-top-left-radius: 0.3em;
-	border-top-right-radius: 0.3em;
 }
-/* Fix the tabs in VFS being cropped */
-#vfs_dialog QTabBar::tab {
-	width: 5.50em;
-}
-/* The first tab is wider than others */
-#vfs_dialog QTabBar::tab:first {
-	width: 7.45em;
-}
-
 
 
 /* Checkboxes */
@@ -247,9 +254,6 @@ QSpinBox, QDoubleSpinBox {
 	border-radius: 0.10em;
 	color: #ffd785;
 }
-QSpinBox::disabled, QDoubleSpinBox::disabled {
-	background-color: #828790;
-}
 
 
 /* Styles Sliders */
@@ -270,16 +274,8 @@ QSlider#sizeSlider::groove:horizontal {
 }
 
 /* Log and Debugger borders */
-QTextEdit, QPlainTextEdit {
-	background: rgba(52, 49, 40, 0.9);
-	color: #ffd785;
-	font-family: none;
-	font-size: 8.50pt;
-}
-
-#debugger QListWidget, #debugger QTextEdit {
-	border: 0.05em solid #ffd785;
-	background: rgba(52, 49, 40, 0.9);
+QTextEdit {
+	border: 0.05em solid #4d4940;
 }
 
 
@@ -302,19 +298,6 @@ QDockWidget::close-button, QDockWidget::float-button {
 }
 
 
-/* Calendar fixes */
-QDateTimeEdit, QDateTimeEdit::drop-down {
-	background: transparent;
-	border: 0.05em solid #ffd785;
-	border-radius: 0.10em;
-	color: #ffd785;
-}
-QCalendarWidget QWidget{
-	background-color: #bfa163;
-	color: #4d4940;
-}
-
-
 /* Disable ugly borders */
 QTabWidget::pane {
 	border: 0em solid #4d4940;
@@ -367,6 +350,21 @@ QLabel#l_controller {
 }
 
 
+/* Game Grid Font */
+QTableWidget#game_grid {
+	font-weight: 600;
+	color: #4d4940;
+	text-transform: uppercase;
+	selection-color: #aea993;
+}
+QTableWidget#game_grid::item:selected:active {
+	selection-background-color: #4d4940;
+}
+QTableWidget#game_grid::item:selected:!active {
+	selection-background-color: #615c51;
+}
+
+
 /* Debug UI Settings buttons */
 QLabel#color_button {
 	background: transparent;
@@ -376,7 +374,7 @@ QLabel#color_button {
 /* Search bar on main Toolbar */
 QLineEdit#mw_searchbar {
 	margin-left: 0.7em;
-	color: #ffd785;
+	color: #4d4940;
 	font-size: 10.25pt;
 }
 
@@ -399,7 +397,7 @@ QLabel#gamelist_icon_background_color {
 
 /* Set Windows Taskbar Thumbnail colors */
 QLabel#thumbnail_icon_color {
-	color: #ffd785;
+	color: #4d4940;
 }
 
 
@@ -439,22 +437,13 @@ QLabel#log_stack {
 
 /* Memory Viewer */
 QLabel#memory_viewer_address_panel {
-	color: #ffd785; /* Font Color: Light */
-	border: 0.05em solid #ffd785;
-	background: rgba(52, 49, 40, 0.9);
-	font-family: none;
+	color: #0000ff; /* Font Color: Blue */
 }
 QLabel#memory_viewer_hex_panel {
-	color: #bfa163; /* Font Color: Grey */
-	border: 0.05em solid #ffd785;
-	background: rgba(52, 49, 40, 0.9);
-	font-family: none;
+	color: #4d4940; /* Font Color: Grey */
 }
 QLabel#memory_viewer_ascii_panel {
-	color: #bfa163; /* Font Color: Grey */
-	border: 0.05em solid #ffd785;
-	background: rgba(52, 49, 40, 0.9);
-	font-family: none;
+	color: #4d4940; /* Font Color: Grey */
 }
 
 
@@ -474,36 +463,3 @@ QWidget#trophy_notification_frame {
 	background-color: #b3ac98;
 	color: #4d4940;
 }
-
-/* Game Grid */
-#game_list_grid_item[selected="true"] {
-	background: #615c51;
-}
-#game_list_grid_item:hover {
-	background: #615c51;
-}
-#game_list_grid_item:focus {
-	background: #4d4940;
-}
-
-/* Game Grid Font */
-#game_list_grid_item #game_list_grid_item_title_label {
-	font-weight: 600;
-	text-transform: uppercase;
-	color: #ffd785;
-}
-
-/* Game Grid hover and focus: we need to handle properties differently when using descendants */
-#game_list_grid_item[selected="true"] #game_list_grid_item_title_label {
-	background-color: #615c51;
-}
-#game_list_grid_item[hover="true"] #game_list_grid_item_title_label {
-	background-color: #615c51;
-}
-#game_list_grid_item[focus="true"] #game_list_grid_item_title_label {
-	background-color: #4d4940;
-	color: #ffd785;
-}
-
-/* Richtext link color */
-QLabel#richtext_link_color { color: #87cefa; }
diff --git a/bin/GuiConfigs/Skyline (Nightfall).qss b/bin/GuiConfigs/Skyline (Nightfall).qss
index 625a6a28b6..442596c8c4 100644
--- a/bin/GuiConfigs/Skyline (Nightfall).qss	
+++ b/bin/GuiConfigs/Skyline (Nightfall).qss	
@@ -105,7 +105,7 @@ QToolButton:hover {
 }
 
 /* Search bar in Main Toolbar */
-QLineEdit#mw_searchbar {
+QLineEdit#mw_searchbar { 
 	color: #455971;
 	background-color: #FFFFFF;
 	border: 1px solid #999999;
@@ -113,15 +113,15 @@ QLineEdit#mw_searchbar {
 	padding-left: 5px;
 }
 
-QLineEdit#mw_searchbar:hover {
-	margin-left: 0.7em;
+QLineEdit#mw_searchbar:hover { 
+	margin-left: 0.7em; 
 	color: #0074e7;
 	background-color: #FFFFFF;
 	border: 1px solid #0071ec;
 	margin: 15px;
 }
 
-QLineEdit#mw_searchbar:focus {
+QLineEdit#mw_searchbar:focus { 
 	border: 1px solid #0074e7;
 }
 
@@ -148,7 +148,7 @@ QSlider::handle:horizontal {
 	border: 1px solid #5c5c5c;
 	border-radius: 0.1em;
 	width: 18px;
-	margin: -2px 2;
+	margin: -2px 2; 
 }
 
 QSlider::handle:horizontal:hover {
@@ -220,17 +220,6 @@ QScrollBar::up-arrow, QScrollBar::down-arrow, QScrollBar::up-button:vertical, QS
 	border: none;
 }
 
-#game_list_grid QScrollBar {
-	width: 10px;
-	height: 3px;
-}
-#game_list_grid QScrollBar::handle {
-	background: #1c273d;
-}
-#game_list_grid QScrollBar::handle:hover, QScrollBar::handle:pressed {
-	background: #0074e7;
-}
-
 /* Radio Buttons */
 QRadioButton::indicator {
 	border: 0.0625em solid #455971;
@@ -253,7 +242,7 @@ QRadioButton::indicator:unchecked {
 }
 
 QRadioButton::indicator:disabled {
-	background-color: #455971;
+	background-color: #455971; 
 }
 
 /* Checkboxes */
@@ -544,7 +533,7 @@ QProgressBar::chunk {
 }
 
 /* Pad Settings: Controller Image */
-QLabel#l_controller {
+QLabel#l_controller { 
 	color: #0074e7;
 }
 
@@ -565,7 +554,7 @@ QHeaderView::section {
 	background-color: #111525;
 	color: #FFFFFF;
 	padding-top: 3px;
-	padding-left: 3px;
+	padding-left: 3px;	
 	height: 20px;
 	border: none;
 }
@@ -611,7 +600,7 @@ QLineEdit:focus {
 }
 
 /* Log colors */
-QPlainTextEdit#log_frame {
+QTextEdit#log_frame {
 	background-color: #111525;
 }
 
@@ -674,52 +663,24 @@ QLabel#debugger_frame_pc {
 /* Tree view changes*/
 QTreeView::branch:has-children:!has-siblings:closed,
 QTreeView::branch:closed:has-children:has-siblings {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_white.png");
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_white.png");
 }
 
 QTreeView::branch:open:has-children:!has-siblings,
-QTreeView::branch:open:has-children:has-siblings {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_down_white.png");
+QTreeView::branch:open:has-children:has-siblings  {
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_down_white.png");
 }
 
 QTreeView::branch:has-children:!has-siblings:closed:hover,
 QTreeView::branch:closed:has-children:has-siblings:hover {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_blue.png");
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_blue.png");
 }
 
 QTreeView::branch:open:has-children:!has-siblings:hover,
-QTreeView::branch:open:has-children:has-siblings:hover {
-	border-image: none;
-	image: url("GuiConfigs/list_arrow_down_blue.png");
+QTreeView::branch:open:has-children:has-siblings:hover  {
+    border-image: none;
+    image: url("GuiConfigs/list_arrow_down_blue.png");
 }
-
-/* Game Grid */
-#game_list_grid_item[selected="true"] {
-	background: #0f1d36;
-}
-#game_list_grid_item:focus {
-	background: #0f1d36;
-}
-
-#game_list_grid_item #game_list_grid_item_title_label {
-	color: #FFFFFF;
-}
-
-/* Game Grid hover and focus: we need to handle properties differently when using descendants */
-#game_list_grid_item[selected="true"] #game_list_grid_item_title_label {
-	background-color: #0f1d36;
-	color: #2397ff;
-}
-#game_list_grid_item[hover="true"] #game_list_grid_item_title_label {
-	color: #2397ff;
-}
-#game_list_grid_item[focus="true"] #game_list_grid_item_title_label {
-	background-color: #0f1d36;
-	color: #2397ff;
-}
-
-/* Richtext link color */
-QLabel#richtext_link_color { color: #0074e7; }
diff --git a/bin/GuiConfigs/Skyline.qss b/bin/GuiConfigs/Skyline.qss
index ef3c7c6857..c41bfcf801 100644
--- a/bin/GuiConfigs/Skyline.qss
+++ b/bin/GuiConfigs/Skyline.qss
@@ -105,7 +105,7 @@ QToolButton:hover {
 }
 
 /* Search bar in Main Toolbar */
-QLineEdit#mw_searchbar {
+QLineEdit#mw_searchbar {  
 	color: #455971;
 	background-color: #FFFFFF;
 	border: 1px solid #999999;
@@ -113,15 +113,15 @@ QLineEdit#mw_searchbar {
 	padding-left: 5px;
 }
 
-QLineEdit#mw_searchbar:hover {
-	margin-left: 0.7em;
+QLineEdit#mw_searchbar:hover { 
+	margin-left: 0.7em; 
 	color: #455971;
 	background-color: #FFFFFF;
 	border: 1px solid #0071ec;
 	margin: 15px;
 }
 
-QLineEdit#mw_searchbar:focus {
+QLineEdit#mw_searchbar:focus { 
 	border: 1px solid #0071ec;
 }
 
@@ -148,7 +148,7 @@ QSlider::handle:horizontal {
 	border: 1px solid #5c5c5c;
 	border-radius: 0.1em;
 	width: 18px;
-	margin: -2px 2;
+	margin: -2px 2; 
 }
 
 QSlider::handle:horizontal:disabled {
@@ -254,7 +254,7 @@ QRadioButton::indicator:unchecked {
 }
 
 QRadioButton::indicator:disabled {
-	background-color: #455971;
+	background-color: #455971; 
 }
 
 /* Checkboxes */
@@ -552,7 +552,7 @@ QProgressBar::chunk {
 }
 
 /* Pad Settings: Controller Image */
-QLabel#l_controller {
+QLabel#l_controller { 
 	color: #4343c1;
 }
 
@@ -573,7 +573,7 @@ QHeaderView::section {
 	background-color: #FFFFFF;
 	color: #455971;
 	padding-top: 3px;
-	padding-left: 3px;
+	padding-left: 3px;	
 	height: 20px;
 	border: none;
 }
@@ -619,7 +619,7 @@ QLineEdit:focus {
 }
 
 /* Log colors */
-QPlainTextEdit#log_frame {
+QTextEdit#log_frame {
 	background-color: #FFFFFF;
 }
 
@@ -678,24 +678,3 @@ QLabel#debugger_frame_pc {
 	color: #000; /* Font Color: Black */
 	background-color: #00ff00; /* Green */
 }
-
-/* Game Grid */
-#game_list_grid_item[selected="true"] {
-	background: #4343c1;
-}
-#game_list_grid_item:focus {
-	background: #4343c1;
-}
-
-/* Game Grid hover and focus: we need to handle properties differently when using descendants */
-#game_list_grid_item[selected="true"] #game_list_grid_item_title_label {
-	background-color: #4343c1;
-	color: #FFF;
-}
-#game_list_grid_item[hover="true"] #game_list_grid_item_title_label {
-	color: #4343c1;
-}
-#game_list_grid_item[focus="true"] #game_list_grid_item_title_label {
-	background-color: #4343c1;
-	color: #FFF;
-}
diff --git a/bin/GuiConfigs/YoRHa by Ani.qss b/bin/GuiConfigs/YoRHa by Ani.qss
index c3345d4cd9..a0dcb56f04 100644
--- a/bin/GuiConfigs/YoRHa by Ani.qss	
+++ b/bin/GuiConfigs/YoRHa by Ani.qss	
@@ -2,8 +2,6 @@
 YoRHa Theme for RPCS3
 by Ani @ https://github.com/AniLeo
 r1 (2018.02.27)
-r2 (2021.08.28)
-r3 (2022.08.20)
 */
 
 /*
@@ -27,7 +25,7 @@ aea993
 
 /* Every widget */
 QWidget {
-	font-family: "SCE-PS3 Rodin LATIN";
+	font-family: SCE-PS3 Rodin LATIN;
 	font-size: 9.00pt;
 
 	color: #292929;
@@ -35,92 +33,116 @@ QWidget {
 	alternate-background-color: transparent;
 }
 
-/* Every dialog */
-QDialog {
-	border-image: url("GuiConfigs/YoRHa-background.jpg");
-}
 
-/*
-	QTextEdit, QPlainTextEdit: Use flat dark color background with
-	                           a solid border, smaller font size and
-	                           default font family for better readability
-
-	RPCS3: Log, TTY, Log Viewer, CG Disasm
-*/
-QTextEdit, QPlainTextEdit {
-	background: rgba(52, 49, 40, 0.9);
-	border: 0.05em solid #4d4940;
-	color: #b3ac98;
+/* Debugger: Sets font-family to default (any invalid value could be provided) */
+#debugger QListWidget, #debugger QTextEdit {
 	font-family: none;
+}
+
+
+/* Log+TTY: Use flat dark color background with default font for better readability */
+#log_frame, #tty_frame {
+	background: rgba(52, 49, 40, 0.9);
 	font-size: 8.50pt;
+	font-family: none;
 }
 
-/*
-	QListWidget, QTreeWidget: Style checkboxes and rows
 
-	RPCS3: LLE/HLE Selector, Debugger
-*/
-QListWidget::item {
-	margin-top: 0.05em;
-	margin-bottom: 0.05em;
+/* Debugger: Restore original font size */
+#debugger QListWidget, #debugger QTextEdit {
+	font-size: 9.50pt;
 }
-QListWidget::indicator, QTreeWidget::indicator {
+
+
+/* LLE: Style QListWidget checkboxes (QListWidget) */
+#lleList::indicator {
 	border: 0.05em solid #4d4940;
 }
-QListWidget::indicator::unchecked, QTreeWidget::indicator::unchecked {
+#lleList::indicator::unchecked {
 	background-color: #b3ac98;
 }
-QListWidget::indicator::checked, QTreeWidget::indicator::checked {
+#lleList::indicator::checked {
 	background-color: #4d4940;
 }
-QListWidget::indicator::disabled, QTreeWidget::indicator::disabled {
+#lleList::indicator::disabled {
 	background-color: #828790;
 }
-QListWidget::item::selected, QTreeWidget::item::selected {
-	background-color: #4d4940;
-}
-
-/*
-	QTableView: Style selected row
-
-	RPCS3: Game List
-*/
-QTableView {
-	selection-background-color: #4d4940;
-}
-
-/*
-	QToolTip: Mouse Tooltips
-*/
-QToolTip {
-	background-color: #b3ac98;
-	border: 0.10em solid #4d4940;
+#lleList::item::selected {
 	color: #4d4940;
 }
 
-/* Table headers */
-QHeaderView {
-	color: #b3ac98;
+/* Style QTreeWidget checkboxes */
+QTreeWidget::indicator {
+	border: 0.05em solid #4d4940;
 }
+QTreeWidget::indicator::unchecked {
+	background-color: #b3ac98;
+}
+QTreeWidget::indicator::checked {
+	background-color: #4d4940;
+}
+QTreeWidget::indicator::disabled {
+	background-color: #828790;
+}
+QTreeWidget::item::selected {
+	color: #4d4940;
+}
+
+/* Mouse Tooltips */
+QToolTip {
+	background-color: #b3ac98;
+	color: #4d4940;
+	border: 0.10em solid #4d4940;
+}
+
+
+/* Main Window, Dialogs and some Dialogs that are actually widgets */
+QDialog, QWidget#trophy_manager, QWidget#cg_disasm, QMainWindow#main_window {
+	border-image: url("GuiConfigs/YoRHa-background.jpg");
+}
+
+
+/* Table headers */
 QHeaderView::section {
 	text-transform: uppercase;
 	background: #4d4940;
 	color: #b3ac98;
-	padding-left: 0.20em;
-	padding-top: 0.25em;
-	margin-bottom: 0.05em;
+	padding-left: 0.15em;
+	padding-top: 0.15em;
+	padding-bottom: 0.10em;
 	text-transform: uppercase;
 	border: none;
 }
 
-/* All Tabs */
+
+/* All other Tabs */
 QTabBar {
+	text-transform: uppercase;
+}
+
+QTabBar::tab {
+	background: transparent;
+	padding-left: 0.50em;
+	padding-right: 0.50em;
+	padding-top: 0.25em;
+	padding-bottom: 0.25em;
+	margin-right: 0.25em;
+}
+QTabBar::tab::selected {
+	background: #4d4940;
+	color: #aea993;
+	border-bottom-style: solid;
+}
+
+
+/* Settings Dialog: Tabs */
+QTabBar#tab_bar_settings {
 	border-bottom: 0.05em solid #4d4940;
 	text-transform: uppercase;
 }
-QTabBar::tab {
+QTabBar::tab#tab_bar_settings {
 	background: transparent;
-	width: 4.80em;
+	width: 5.20em;
 	padding-left: 0.50em;
 	padding-right: 0.50em;
 	padding-top: 0.65em;
@@ -129,73 +151,82 @@ QTabBar::tab {
 	font-size: 10.5pt;
 	font-weight: 550;
 }
-QTabBar::tab:last {
+QTabBar::tab:last#tab_bar_settings {
 	margin-right: 0em;
 }
-QTabBar::tab:!selected:hover {
+QTabBar::tab:!selected:hover#tab_bar_settings {
 	background: transparent;
 	color: #4d4940;
 }
-QTabBar::tab::selected {
+QTabBar::tab::selected#tab_bar_settings {
 	background: #4d4940;
 	color: #aea993;
+	border-bottom-style: solid;
+	margin-top: 0.15em;
 }
 
+
 /* Checkboxes */
 QCheckBox::indicator {
 	border-radius: 0.1em;
-}
-/* Radio Buttons */
-QRadioButton::indicator {
-	border-radius: 0.4em;
-}
-/* Checkboxes and Radio Buttons */
-QCheckBox::indicator, QRadioButton::indicator {
 	border: 0.05em solid #4d4940;
 	margin-top: 0.05em;
-	margin-bottom: 0.05em;
 	width: 0.8em;
 	height: 0.8em;
 }
-QCheckBox::indicator:checked, QRadioButton::indicator:checked {
+QCheckBox::indicator:checked {
 	background-color: #4d4940; /* Dark */
 }
-QCheckBox::indicator:unchecked, QRadioButton::indicator:unchecked {
+QCheckBox::indicator:unchecked {
 	background-color: #b3ac98; /* Light */
 }
-QCheckBox::indicator::disabled, QRadioButton::indicator::disabled {
+QCheckBox::indicator::disabled {
 	background-color: #828790; /* Gray */
 }
 
-/* Combo Boxes, Datetime dropdown */
-QComboBox, QDateTimeEdit, QLineEdit {
+
+/* Radio Buttons */
+QRadioButton::indicator {
+	border-radius: 0.4em;
+	border: 0.05em solid #4d4940;
+	width: 0.8em;
+	height: 0.8em;
+}
+QRadioButton::indicator:checked {
+	background-color: #4d4940; /* Dark */
+}
+QRadioButton::indicator:unchecked {
+	background-color: #b3ac98; /* Light */
+}
+QRadioButton::indicator::disabled {
+	background-color: #828790; /* Gray */
+}
+
+
+/* Combo Boxes */
+QComboBox {
 	background: transparent;
 	color: #4d4940;
 	border: 0.05em solid #1e1e1e;
 	border-radius: 0.15em;
-	padding-top: 0.1em;
-	padding-bottom: 0.1em;
+	padding-bottom: 0.2em;
+	padding-left: 0.4em;
 }
 QComboBox QAbstractItemView {
 	background: #b3ac98;
 }
-QComboBox::disabled, QDateTimeEdit::disabled, QLineEdit::disabled {
+QComboBox::disabled {
 	background: #828790;
 	color: #4d4940;
 }
-/* Text boxes need less left padding than combo boxes */
-QComboBox {
-	padding-left: 0.4em;
-}
-QLineEdit {
-	padding-left: 0.2em;
-}
+
 
 /* Group Boxes (Settings Dialog) */
 QGroupBox {
 	margin-top: 1em;
 	border: 0.05em solid #4d4940;
 	text-transform: uppercase;
+	font-size: 9.25pt;
 }
 QGroupBox::title {
 	subcontrol-origin: margin;
@@ -204,6 +235,7 @@ QGroupBox::title {
 	color: #4d4940;
 }
 
+
 /* Buttons */
 QPushButton {
 	background: #b3ac98;
@@ -212,28 +244,40 @@ QPushButton::disabled {
 	background: #828790;
 }
 
+
 /* QSpinBox (Settings -> Emulator -> width/height) */
-/* QDoubleSpinBox (Pads -> Mouse Acceleration -> x/y) */
+/* QDoubleSpinBox (Pads -> Mouse Acceleration -> x/y) */ 
 QSpinBox, QDoubleSpinBox {
+	/* background: transparent; - This hits a weird bug in Qt where background flickers */
 	background-color: #b3ac98;
+	border: 0.05em solid #4d4940;
+	border-radius: 0.10em;
 }
-QSpinBox::disabled, QDoubleSpinBox::disabled {
-	background-color: #828790;
-}
+
 
 /* Styles Sliders */
 QSlider::groove:horizontal {
 	border: 0.10em solid #4d4940;
 	border-radius: 0.10em;
 }
+
 QSlider::handle:horizontal {
 	background: #4d4940;
 	width: 0.50em;
 }
-QSlider::disabled {
-	background: #828790;
+
+QSlider#sizeSlider::groove:horizontal {
+	border: 0.10em solid #4d4940;
+	border-radius: 0.10em;
+	height: 1.5em;
 }
 
+/* Log and Debugger borders */
+QTextEdit {
+	border: 0.05em solid #4d4940;
+}
+
+
 /* For dock buttons to be visible */
 QDockWidget {
 	background: transparent;
@@ -252,14 +296,12 @@ QDockWidget::close-button, QDockWidget::float-button {
 	background-color: #b3ac98;
 }
 
+
 /* Disable ugly borders */
 QTabWidget::pane {
 	border: 0em solid #4d4940;
 }
-/* Center tabs */
-QTabWidget::tab-bar {
-	alignment: center;
-}
+
 
 /* Top menu bar */
 QMenuBar {
@@ -277,6 +319,7 @@ QMenuBar::item:selected {
 	color: #aea993
 }
 
+
 QMenu {
 	background: #b3ac98;
 	color: #4d4940;
@@ -299,6 +342,42 @@ QMenu::item:disabled {
 	color: #4d4940;
 }
 
+
+/* Pad Settings: Controller Image */
+QLabel#l_controller {
+	color: #4d4940;
+}
+
+
+/* Game Grid Font */
+QTableWidget#game_grid {
+	font-weight: 600;
+	color: #4d4940;
+	text-transform: uppercase;
+	selection-color: #aea993;
+}
+QTableWidget#game_grid::item:selected:active {
+	selection-background-color: #4d4940;
+}
+QTableWidget#game_grid::item:selected:!active {
+	selection-background-color: #615c51;
+}
+
+
+/* Debug UI Settings buttons */
+QLabel#color_button {
+	background: transparent;
+}
+
+
+/* Search bar on main Toolbar */
+QLineEdit#mw_searchbar {
+	margin-left: 0.7em;
+	color: #4d4940;
+	font-size: 10.25pt;
+}
+
+
 /* Uniform colors in Toolbar */
 QToolButton {
 	background: transparent;
@@ -308,79 +387,19 @@ QToolButton::hover {
 	background-color: #b3ac98;
 }
 
-/* Calendar widget */
-QCalendarWidget QWidget{
-	background: #b3ac98;
-	color: #4d4940;
-}
-
-
-/*** RPCS3 Specifics ***/
-
-
-/* Main Window, Dialogs and some Dialogs that are actually widgets */
-QWidget#trophy_manager, QWidget#cg_disasm, QWidget#log_viewer, QMainWindow#main_window {
-	border-image: url("GuiConfigs/YoRHa-background.jpg");
-}
-
-/*
-	#debugger: Set font-family to default (any invalid value could be provided)
-	           Reset background, color and font size to the global values
-	           Add solid border
-*/
-#debugger QListWidget, #debugger QTextEdit {
-	background: transparent;
-	border: 0.05em solid #4d4940;
-	color: #292929;
-	font-family: none;
-	font-size: 9.5pt;
-}
-
-/* Align the log widget tabs to the left */
-QTabWidget#tab_widget_log::tab-bar {
-	alignment: left;
-}
-
-/* Restore log section QTabBar to small sizes */
-QTabBar#tab_bar_log {
-	border-bottom: 0;
-}
-QTabBar#tab_bar_log::tab {
-	width: 2.00em;
-	padding: 0.25em;
-	font-size: 9.0pt;
-	font-weight: 400;
-	margin-right: 0;
-}
-
-/* Pad Settings: Controller Image */
-QLabel#l_controller {
-	color: #4d4940;
-}
-
-/* Debug UI Settings buttons */
-QLabel#color_button {
-	background: transparent;
-}
-
-/* Search bar on main Toolbar */
-QLineEdit#mw_searchbar {
-	margin-left: 0.7em;
-	color: #4d4940;
-	font-size: 10.25pt;
-	border: 0em;
-}
 
 /* Set Theme UI colors */
 QLabel#gamelist_icon_background_color {
 	color: transparent;
 }
 
+
 /* Set Windows Taskbar Thumbnail colors */
 QLabel#thumbnail_icon_color {
 	color: #4d4940;
 }
 
+
 QLabel#log_level_always {
 	color: #00ffff; /* Cyan */
 }
@@ -414,6 +433,7 @@ QLabel#log_stack {
 	color: #b3ac98; /* Light */
 }
 
+
 /* Memory Viewer */
 QLabel#memory_viewer_address_panel {
 	color: #0000ff; /* Font Color: Blue */
@@ -425,6 +445,7 @@ QLabel#memory_viewer_ascii_panel {
 	color: #4d4940; /* Font Color: Grey */
 }
 
+
 /* Debugger colors */
 QLabel#debugger_frame_breakpoint {
 	color: #000000; /* Font Color: Black */
@@ -435,46 +456,9 @@ QLabel#debugger_frame_pc {
 	background-color: #00ff00; /* Green */
 }
 
+
 /* Trophy Notification Popup */
 QWidget#trophy_notification_frame {
 	background-color: #b3ac98;
 	color: #4d4940;
 }
-
-/*
-	#sizeSlider: Style the main window's icon size slider so it's not stretched
-*/
-QSlider#sizeSlider::groove:horizontal {
-	height: 1.5em;
-}
-
-/*
-	On Patch Creator, it's the patch validation label
-	since we can't avoid repainting color, let's bold it instead
-*/
-QLabel#validLabel {
-	font-weight: 600;
-}
-
-/* Game Grid */
-#game_list_grid_item[selected="true"] {
-	background: #4d4940;
-}
-#game_list_grid_item:focus {
-	background: #4d4940;
-}
-
-/* Game Grid Font */
-#game_list_grid_item #game_list_grid_item_title_label {
-	font-weight: 600;
-	color: #4d4940;
-	text-transform: uppercase;
-}
-
-/* Game Grid hover and focus: we need to handle properties differently when using descendants */
-#game_list_grid_item[selected="true"] #game_list_grid_item_title_label {
-	color: #aea993;
-}
-#game_list_grid_item[focus="true"] #game_list_grid_item_title_label {
-	color: #aea993;
-}
diff --git a/bin/GuiConfigs/check_mark_white.png b/bin/GuiConfigs/check_mark_white.png
deleted file mode 100644
index f9b94ccb87..0000000000
Binary files a/bin/GuiConfigs/check_mark_white.png and /dev/null differ
diff --git a/bin/Icons/ui/spinner-24.png b/bin/Icons/ui/spinner-24.png
deleted file mode 100644
index 088b5d180a..0000000000
Binary files a/bin/Icons/ui/spinner-24.png and /dev/null differ
diff --git a/bin/OpenAL32.dll b/bin/OpenAL32.dll
new file mode 100755
index 0000000000..f903a0c635
Binary files /dev/null and b/bin/OpenAL32.dll differ
diff --git a/bin/test/dump_stack.elf b/bin/dev_hdd0/game/TEST12345/USRDIR/dump_stack.elf
similarity index 100%
rename from bin/test/dump_stack.elf
rename to bin/dev_hdd0/game/TEST12345/USRDIR/dump_stack.elf
diff --git a/bin/test/gs_gcm_basic_triangle.elf b/bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_basic_triangle.elf
similarity index 100%
rename from bin/test/gs_gcm_basic_triangle.elf
rename to bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_basic_triangle.elf
diff --git a/bin/test/gs_gcm_cube.elf b/bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_cube.elf
similarity index 100%
rename from bin/test/gs_gcm_cube.elf
rename to bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_cube.elf
diff --git a/bin/test/gs_gcm_handle_system_cmd.elf b/bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_handle_system_cmd.elf
similarity index 100%
rename from bin/test/gs_gcm_handle_system_cmd.elf
rename to bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_handle_system_cmd.elf
diff --git a/bin/test/gs_gcm_hello_world.elf b/bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_hello_world.elf
similarity index 100%
rename from bin/test/gs_gcm_hello_world.elf
rename to bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_hello_world.elf
diff --git a/bin/test/gs_gcm_tetris.elf b/bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_tetris.elf
similarity index 100%
rename from bin/test/gs_gcm_tetris.elf
rename to bin/dev_hdd0/game/TEST12345/USRDIR/gs_gcm_tetris.elf
diff --git a/bin/test/pad_test.elf b/bin/dev_hdd0/game/TEST12345/USRDIR/pad_test.elf
similarity index 100%
rename from bin/test/pad_test.elf
rename to bin/dev_hdd0/game/TEST12345/USRDIR/pad_test.elf
diff --git a/bin/test/ppu_thread.elf b/bin/dev_hdd0/game/TEST12345/USRDIR/ppu_thread.elf
similarity index 100%
rename from bin/test/ppu_thread.elf
rename to bin/dev_hdd0/game/TEST12345/USRDIR/ppu_thread.elf
diff --git a/bin/test/pspgame.elf b/bin/dev_hdd0/game/TEST12345/USRDIR/pspgame.elf
similarity index 100%
rename from bin/test/pspgame.elf
rename to bin/dev_hdd0/game/TEST12345/USRDIR/pspgame.elf
diff --git a/bin/test/rpcsp.elf b/bin/dev_hdd0/game/TEST12345/USRDIR/rpcsp.elf
similarity index 100%
rename from bin/test/rpcsp.elf
rename to bin/dev_hdd0/game/TEST12345/USRDIR/rpcsp.elf
diff --git a/bin/test/spurs_test.self b/bin/dev_hdd0/game/TEST12345/USRDIR/spurs_test.self
similarity index 54%
rename from bin/test/spurs_test.self
rename to bin/dev_hdd0/game/TEST12345/USRDIR/spurs_test.self
index 4f9838ce8b..17cd1be8fc 100644
Binary files a/bin/test/spurs_test.self and b/bin/dev_hdd0/game/TEST12345/USRDIR/spurs_test.self differ
diff --git a/bin/git/README.md b/bin/git/README.md
new file mode 100644
index 0000000000..2a7096e8fd
--- /dev/null
+++ b/bin/git/README.md
@@ -0,0 +1 @@
+Cached data from GitHub API.
diff --git a/bin/git/commits.lst b/bin/git/commits.lst
new file mode 100644
index 0000000000..ec1bc52e39
--- /dev/null
+++ b/bin/git/commits.lst
@@ -0,0 +1,12678 @@
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2012-11-03T15:16:18Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2012-11-03T15:16:18Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Initial commit","sha":"de070bf485943666ef9c6c235076a3b40eee6e00"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2012-11-14T23:39:56Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2012-11-14T23:39:56Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"http://code.google.com/p/rpcs3/source/detail?r=44","sha":"a90b5cf37abc882e32d0dd43f6bb6a84cd8c0769"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2012-11-15T15:45:11Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2012-11-15T15:45:11Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"http://code.google.com/p/rpcs3/source/detail?r=45","sha":"3bb7a299ca4f05599d8e46324a3b8990e7a1cecd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-06-30T08:46:29Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-06-30T08:46:29Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Improved sc function binder.\n- Improved GLGSRender.","sha":"5753edf6efd139e8a8edcfe68a1c1c56cbca72a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-06-30T10:59:21Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-06-30T10:59:21Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Added GIT ignore list.","sha":"1f6a7560e4a870686855f9e81262455a0324b79b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-01T12:08:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-01T12:08:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Improved PPU decoder","sha":"4486cbb855910c0e9c0895b4f5d328477d6b0e62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-03T13:02:46Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-03T13:02:46Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"PPU Interpreter: Fixed all VPR instructions.","sha":"8ba26db020ff3b3d43ca357a6577fc78309002d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-03T16:17:16Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-03T16:17:16Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Improved PPCDecoder.\n- Improved PPUDecoder.\n- Improved Debugger GUI.\n\nCompilerELF:\n - Added all PPU instructions.\n - Fixed analyzer crash.","sha":"b35dfdf29bf03382b310f77472c3c9e262317c1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-03T20:25:54Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-03T20:25:54Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"PPUDecoder:\n - Fixed BI field.\n\nProject updated to VS12.","sha":"7e07cd95959f096e1747fc20b21673471bf115b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-04T14:20:36Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-04T14:20:36Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Improved SPU Decoder.","sha":"991f281bbdfe21976f1a384413597ba8369ccb77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-05T23:49:38Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-05T23:49:38Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Fixed loading modules in debug mode.\n- Improved Lwmutex.\n- Implemented events syscalls.\n- Fixed SPU local storage.","sha":"6d7d3acb43d4808575e359ff86a04fe647814daa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-08T13:24:46Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-08T13:24:46Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Implemented MTCRF instruction.\n- Implemented sys_spu_thread_set_argument syscall.\n- Improved Debugger.","sha":"fb57bb9c4e1cca401c093cb53c379ad892883f7b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-11T14:28:10Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-11T14:28:10Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Fixed PPU G_3f_0 Decoder.","sha":"027a31bd844a2d417488f4552ba9cb0ca3c2c9a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-12T12:42:17Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-07-12T12:42:17Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Implemented RAW SPU.\n- Implemented memory mapping.","sha":"559852a8fc2da59e91025f4709590df030282236"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-03T09:40:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-03T09:40:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Implemented HDD manager.\n- Implemented VFS manager.\n- Implemented MFC.\n- Fixed ELF Compiler.\n- Improved HLE Func binder.","sha":"81e874c9e28af6d458d1db85b7ad825aca79ef13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-08-10T21:48:32Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-08-10T21:48:32Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"msg":"Update .gitignore","sha":"6fd824fccab9b2ba97a002a7cb9836973338ec64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-08-10T21:48:54Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-08-10T21:48:54Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"msg":"Fix debugger working directory","sha":"fafb88672ae75d703448ec1f192cb6fc008a2645"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-08-10T21:51:24Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-08-10T21:51:24Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"msg":"(indirectly) Fix ini boolean parsing error","sha":"cd3ad0b1497afe6e8e0733d975da2f01102a5cae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-10T21:56:24Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-10T21:56:24Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"OpenGL Renderer fixes:\n  - Fixed Vertex & Fragment Shader Decompilers.\n  - Fixed Transform Constants loading.","sha":"f42d4b65723a47c3466b9fa6766228f8f521dd9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-08-10T22:09:27Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-08-10T22:09:27Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"msg":"When debugging, put the git revision in the title\n\nUseful for bug reports, user-friendly version still used when building\nin release mode. A unix script for generating the git version is still\nneeded.","sha":"d249bfef4d5daf1fd95520ffdebe96651dd74a9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-08-12T09:56:56Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-08-12T09:56:56Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"msg":"Fix spelling of IsRunned to IsRunning","sha":"96c692aefc381ff396a729148698a6b11b5bf703"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-08-12T09:57:25Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-08-12T09:57:25Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"msg":"Update .gitignore to include git-version.h","sha":"f42e6d7374ae96e1052b100082576c6705ab7fed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-16T22:22:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-16T22:22:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Improved Vertex & Fragment Shader Decompilers.\n- Fixed some FPR instructions.\n- Implemented more GCM syscalls.\n- Fixed callbacks alert.","sha":"0aff0499608f4cca6746e832d20d3b679449c39c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-17T16:23:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-17T16:23:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Fixed sys_ppu_thread_exit.\n- Disabled some dbg tools.","sha":"2f5fa75bb4f5e0805fa1896739bedaebaac19735"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-18T23:06:11Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-18T23:06:11Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Implemented send open system menu cmd.\n- Added cellSysutil module.\n- Improved OpenGL renderer.\n- Added cube & hello world homebrews.\n- Implemented more GCM syscalls.","sha":"234e174b7d28c133fc089fe2d73d255a2ec4fec6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-26T14:18:59Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-26T14:18:59Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"OpenGL renderer:\n- Improved Vertex & Fragment Shader Decompilers.\n- Implemented fp uniform loader.\n- Implemented DXT1 & DXT2 textures decompression.\n- Implemented draft cellResc module.\n- Updated glext.\n\nPPU Interpreter:\n- Fixed VSPLTW, VNMSUBFP, VMRGLW, VMRGLH, VMRGLB, VMRGHW, VMRGHH, VMRGHB instructions.\n\ncellFs:\n- Fixed cellFsStat syscall.","sha":"f83aa9d5aeb192c1983ba1b34d4284db0f522f4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-26T14:27:35Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-26T14:27:35Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1 from DHrpcs3/wip\n\nWip","sha":"555ad9472afe34d705db868c23ab12b995eb8142"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-26T14:53:12Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-26T14:53:12Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Version bump.","sha":"05687829d674b1af3242c0592d8208444c74c811"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-27T15:18:01Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-27T15:18:01Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"OpenGL renderer:\n- Disabled dump vertex data.\n- Fixed fragment constants loader.\n- Fixed fbo creation.\n- Implemented texture filtering.","sha":"a9fdcd959bb81044308761ceea398bf9ab67573a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-27T15:22:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-08-27T15:22:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Version bump.","sha":"5cc488011f00dc635ecac9acfdf0aa323e6fa3b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-09-03T17:26:31Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-09-03T17:26:31Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"msg":"Merge remote-tracking branch 'upstream/master'\n\nConflicts:\n\trpcs3/Emu/GS/GL/GLGSRender.cpp\n\trpcs3/Gui/InterpreterDisAsm.cpp\n\trpcs3/Gui/MainFrame.cpp","sha":"f4b98074b0d18a26e2d8775bca3e02c990260b89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-09-05T07:45:33Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-09-05T07:45:33Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"msg":"Refactor of game loading","sha":"f25fa26b4245f3f0814144620ae20c61a7c69a81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-09-05T07:45:46Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-09-05T07:45:46Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"msg":"Update .gitignore","sha":"9b921f3c2db28fac8e54cecf2a2d2d58a1ff6243"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-09-05T08:06:59Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2013-09-05T08:06:59Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"msg":"Fix more spelling mistakes","sha":"eefd175900ccda4a9c8043610c340e1447c3c8eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-09-05T10:44:45Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-09-05T10:44:45Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #2 from cornytrace/master\n\nSeveral small improvements","sha":"43e0c84f6438818b9093cac6284cc1221d6adb91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-08T08:45:10Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-08T08:45:10Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellPngDec Module Added\n\nImplemented 'cellPngDec', using 'sys_fs' to access the files and the\n'lodepng' library to decode PNG buffers to Raw-pixel buffers that can be\nused as textures.","sha":"3123432dcc2313899aff488e1fb5abcda6583c3a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-09T16:27:31Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-09T16:27:31Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellJpgDec Module Added\n\n*Replaced \"sys_jpgdec\" with \"cellJpgDec\" in\n\"rpcs3\\Emu\\SysCalls\\Modules.cpp\".\n*Implemented 'cellJpgDec', using 'sys_fs' to access the files and the\n'jpg-compressor' (jpgd) library to decode JPG buffers to Raw-pixel\nbuffers that can be\nused as textures.\n*Fixed memory leak issue in cellPngDec and minor changes.","sha":"0275b430cf46b0f2ed9aaf23650fd9d016659a66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-10T13:17:02Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-10T13:17:02Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellGifDec Module Added\n\n*Implemented 'cellGifDec', using 'sys_fs' to access the files and the\n'stb_image' (stblib) library to decode GIF buffers to Raw-pixel buffers\nthat can be used as textures.\n\n*Replace 'lodepng' and 'jpeg-compressor' libraries with 'stb_image' in\ncellPngDec and cellJpgDec, respectively.\n\n*Fixed minor issues in cellPngDec and cellJpgDec.","sha":"aea7f4aa771f2592f7ed0c007e50ecee1b3cb2c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-11T20:49:49Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-11T20:49:49Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Keybord support Added\n\n* Implemented 'cellKb*' functions from 'sys_io' module, which are part\nof the libkb library.\n\n* Added corresponding entries in the 'Config > Settings' menu to change\nthe handler of the keyboard. Supported handlers: Windows, Null.\n\nINFO: This keyboard library is *very* experimental and I am aware of\nsome bugs. There will be improvements soon.","sha":"4835ae35afafa88aac69b8db70743defc4c4ac4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-13T17:29:54Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-13T17:29:54Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Keybord support improved\n\n*Improved Keyboard:\n- Fixed crash when using Null keyboard handler\n- Added support for meta keys\n- Added support for {caps, num, scroll} lock.\n\n*Small issues fixed in previous module:\n- cellGifDec: Fixed wrong information of packet field in\ncellGifDecReadHeader.\n- cellGifDec: Set DataOutInfo.recordType as 1 since the output is always\nan image.\n- cellJpgDec: Set colorSpace as 3, until a better function is\nimplemented.\n- cellJpgDec, cellPngDec: Added RGBA support.\n\n*Changed layout of \"Config > Settings\" menu.","sha":"1b7302c0bafc1b6bd87fb602edb93374efe77b53"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-14T18:20:57Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-14T18:20:57Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Mouse support added\n\n*Implemented 'cellMouse*' functions from 'sys_io' module, which are part\nof the libmouse library.\n\n* Added corresponding entries in the 'Config > Settings' menu to change\nthe handler of the mouse. Supported handlers: Windows, Null.\n\n* cellGifDec: Fixed some errors and added support for RGBA color.\n\n(Remember: The mouse support is very experimental)","sha":"1024a7c7c41f2c747a875e891ad7bed79730b6a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-14T20:47:59Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-14T20:47:59Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Minor issues fixed\n\n*Memory leak in image decodification modules.\n\n*Changed mouse wheel delta value.","sha":"b85d39bfc34d4522f4877839ad63ef4405c02faa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-09-15T15:13:23Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-09-15T15:13:23Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #4 from AlexAltea/master\n\nNew image decodification modules & IO devices","sha":"d7e4f7ec3bdeaa7d07bb8daea5fdfb6c72039289"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-18T21:50:00Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-18T21:50:00Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Improved sys_fs module\n\n- cellFsStat now accepts mounting points in the path argument.\n\n- cellFsMkdir, cellFsRmdir, cellFsUnlink and cellFsRename are now using\nthe real path provided by the VFS.\n\n- cellFsFtruncate, cellFsTruncate and cellFsFGetBlockSize are partially\nimplemented.\n\nNote: I have spotted a bug in cellFsRename and cellFsRmdir (this has\nnothing to do with the changes I made), but I don't dare to fix it since\nI am not sure if I will break other functions with my solution.","sha":"20665b9f891182ab9ded2a851d8234b838f6b7c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-19T21:40:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-19T21:40:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Improved image decoding modules\n\n* Huge improvement in the speed of cell{Png|Gif|Jpg}DecDecodeData when\nreading input files.\n\nNote: Sorry if this commit is too \"small\", but I need to sync every\nchange since I use two PCs.","sha":"a11de0f607b3bb81a16c0e48ea2456ce57b0824f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-21T00:40:36Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-21T00:40:36Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Debugger improved: Instruction editor added\n\nHow to use the instruction editor:\n1. Load an .ELF file\n2. Select an instruction from any valid memory address inside any\nthread.\n3. Press 'E' key and have fun. :P\n\nNote1: I suggest to remove the function InterpreterDisAsmFrame::DClick\nand use InterpreterDisAsmFrame::InstrKey to do all debugging-related\nactions (Add breakpoint, Edit, Step, Run, etc.) using the same keyboard\nlayout as debuggers like OllyDbg.\n\nNote2: The final binary is 200 KB larger due to this feature. This issue\nshould be fixed in the future. This has probably something to do with\nthe #include's.","sha":"bf293ebbfc59b2f0a652d4d5e42628b76bbf8e98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-22T11:34:54Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-22T11:34:54Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Debugger improved: Register editor added\n\nHow to use the register editor:\n1. Load an .ELF file\n2. Select any instruction from a thread. (This is a workaround to\nactivate the appropriate event listener. This will be changed in the\nfuture).\n3. Press 'R' key and modify any register you want.\n\nNote:\nThe register editor only works with PPU and SPU threads.\n\nAdditional changes:\n* Fixed the filesize problem caused by the instruction editor dialog.\n* Instruction Editor: Fixed small issue in SPU threads","sha":"9c6ae554faa76b9e21e75609fc43af9669994e04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-22T23:50:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-22T23:50:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"More SPU Instructions: Floating point arithmetic\n\nImplemented Floating/Double-floating arithmetic operations: Add,\nSubstract and Multiply: FA, FS, FM, DFA, DFS, DFM respectively.\n\n* Fixed issue in the register editor: Wrong value displayed when reading\n64 bit or 128 bit registers.\n\n* Fixed issue in the register editor: Error when writing to 128 bit\nregisters.","sha":"db7e68d30861824f1062f1e94bf20fe6c166702b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-23T10:48:27Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-23T10:48:27Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"More SPU Instructions: Floating point comparison\n\n* Implemented Floating/Double-floating comparison instructions:\nFCGT, FCMGT, FCEQ, FCMEQ, DFCGT, DFCMGT, DFCEQ, DFCMEQ\n\n* Implemented more Floating/Double-floating operations:\nFMA, FMS, FNMS, DFMA, DFMS, DFNMS, DFNMA\n\n* Implemented Double / Single floating-point conversion:\nFESD, FRSD","sha":"03dcfeabc3047e6a2cb4af88932828d8d5622282"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-23T12:20:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-23T12:20:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Changed syntax of last SPU instructions","sha":"7d97bbfbbf073927744f9999533b211297ab13c9"}
+{"author":{"avatar":null,"date":"2013-09-23T13:55:37Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2013-09-23T13:55:37Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #5 from AlexAltea/master\n\nImproved debugger, modules and the SPU interpreter","sha":"e655999a23f7a98576fc33276671bfe4fc3b1555"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-09-24T21:11:29Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-09-24T21:11:29Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved mem_t.\n- Implemented mem_ptr_t.\n- Fixed issue 3.","sha":"eebe859f83f789801f5f974755967c9679cb56b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-25T13:43:55Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-25T13:43:55Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Improved image dec. modules & New dummy modules\n\n* Improved image decoding modules:\n- Fixed error that appeared after last commit (eebe859f83).\n- Changed some functions to use the mem*_t classes.\n- Implemented cell*DecSetParameter.\n\n* Created new dummy modules for sys_net (0x0000), sys_http (0x0001),\ncellHttpUtil (0x0002) and cellSsl (0x0003).","sha":"1a85ccbbf423ea062ae7fc41c7444bb65b945d91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-09-27T10:05:29Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-09-27T10:05:29Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Created new dummy module for cellAudio.","sha":"784fc571b3d5d7b4a59e52b27c2abba866e6f225"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-28T02:36:57Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-28T02:36:57Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"More dummy modules\n\n* 41 new dummy modules created.\n\nNOTE: I have detached the previous 4 dummy modules of my last commit\n(1a85ccbbf4) from the project since they will consume space of the\nexecutable, and compilation time and don't provide anything useful yet,\nthe same applies to this commit. The only reason to provide this dummy\nmodules is to avoid that developers have to spend too much time on\ncreating the template of the module before implementing functions. If\nyou want to implement a function of any of these modules, add the\ncorresponding file to the project first.","sha":"afb9273823d7ef3c70219d44a9bd766983151683"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-28T14:30:04Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-28T14:30:04Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Some Modules updated to use mem*_t class\n\ncellKb, cellMouse and cellSysutil now use the mem*_t instances instead\nof using \"u32 *_addr\" variables.","sha":"9bb2d082e6ecf8a350d7e7b2ee6697eaf27a9766"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-28T21:05:56Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-09-28T21:05:56Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Small issue fixed","sha":"2eb2a2a197f2978b3f5cc6cafbcc3bc14ac12e41"}
+{"author":{"avatar":null,"date":"2013-09-28T22:07:31Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2013-09-28T22:07:31Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #7 from AlexAltea/master\n\nSome modules updated / improved & New dummy modules","sha":"efd336b74372abaee3fbf058598b6ed5f7743e7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-09-30T16:35:28Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-09-30T16:35:28Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Minor improved cellAudio module. More dummy modules created. Some modules are not included to the project.  If you want to implement a function of any of these modules, add the corresponding file to the project first.","sha":"23ece01a0b6381cbbf70f87d6fa5d8d38094a1d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-10-01T11:05:44Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-10-01T11:05:44Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"f8193fd784da9ca57eec37100f30977b6966d846"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-10-06T12:07:42Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-10-06T12:07:42Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Implemented be_t, mem_struct_ptr_t, vfsFile.\n- Improved sys_fs, cellPngDec, cellJpgDec, cellGifDec modules.","sha":"dd48f827c3a54ea319a5a9610d01918ef8b07ae9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-10-06T14:15:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-10-06T14:15:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved OpenGL renderer.\n- Improved Vertex Shader Decompiler.\n- Fixed CMD analyzer.\n\n- Improved sys_fs module.\n- Minor fixes.","sha":"8259006bc3a4a771f82c72ecdefb00a7b581845b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-10-06T15:05:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-10-06T15:05:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed minor Debugger errors.","sha":"64cd9746b825c757be87b2613ac9853d5710b2ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-10-06T15:41:19Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-10-06T15:41:19Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed small error.","sha":"5874a5683e5f186fd66f370bec5bea3af98dabd7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-10-14T19:40:44Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-10-14T19:40:44Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Experimental SELF decryption support\n\nThis SELF decryption feature is not portable and its code looks really\nugly. It is experimental and is meant to save time to developers when\ndoing tests with SELF files. Besides that, it works (under Windows). :-)\n\nHow to use it:\n1. Place \"scetool.exe\" (and \"zlib1.dll\") into the main rpcs3 folder.\n\n2. Obtain a LEGAL copy of the SELF decryption keys and place them in a\nfolder named \"data\" next to the main executable in a format that is\nreadable for \"scetool.exe\". That is, following files should be present:\ndata/keys\ndata/ldr_curves\ndata/vsh_curves\n\n(See screenshot in the comments)\n\nNOTE: These are the steps to enable SELF decryption and it applies to\nfuture commits regarding this matter. We do NOT take any responsibility\nabout the way you obtain the keys or (until we include SELF decryption\ninto our code) the actions \"scetool.exe\" (or \"zlib1.dll\") perform.","sha":"c1565e55e5b1b18f74d69737fd63ac434ad1e658"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-10-21T21:02:43Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-10-21T21:02:43Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"SELF decrypter improves & About... dialog added\n\nSELF decrypter improved:\nThe files 'scetool.exe' and 'zlib1.dll' are no longer needed. Everything\nneeded is now included in the rpsc3 project. So the only thing you need\nin order to load SELF files are the keys. More information about this\nmatter in my last commit: c1565e55\n\nWarning for devs! There is a lot of spaghetti code in /scetool/. I\nfucked up things a bit while trying to include scetool in rpcs3. There\nis a lot of unused code there and I need to make sure that everything is\nworking properly. In any case, the code seems to work stable so\nend-users shouldn't be worried about this warning. ;-)\n\n'About...' dialog added:\nWell, I have nothing more to say here. I wish you all a nice day!","sha":"f1b420eb3b9a875de69e5cf87936b49d7bb0e8dd"}
+{"author":{"avatar":null,"date":"2013-10-28T21:58:03Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2013-10-28T21:58:03Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Added ELF32 little endian support for PSP ELF files.","sha":"198d0a2fc07eef51a761e7d8a7e2d1f5dd3871a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-10-28T22:50:36Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-10-28T22:50:36Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #9 from Hykem/master\n\nAdd SELF decryption and ELF32 little endian support","sha":"6622dc42b53067282fd5badca02a64a1be482026"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-03T19:23:16Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-03T19:23:16Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Implemented ARM9Thread.\n- Improved OpenGL Renderer.\n- Improved RAW SPU mfc.","sha":"0b35be32a43b575e16a43e50a385841dc0a58e1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-05T18:12:18Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-05T18:12:18Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Implemented ARM9Interpreter & ARM9DisAsm.\n- Implemented MemoryBlockLE & DynamicMemoryBlockLE.\n- Implemented CPUDecoder.","sha":"6b22e7d90aeb96ccdedb10337101a10f6e5e97f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-05T19:22:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-05T19:22:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Renamed ARM9 to ARMv7.\n- Improved ELF32 loader.","sha":"b263c3ebaf84275a0acb86cd67114aa91375636f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-05T20:04:55Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-05T20:04:55Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Fixed compilation errors.","sha":"f18fff08c75258e92808cd506c8eab47ef3b2bb9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-06T01:01:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-06T01:01:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Implemented some ARMv7 instructions.","sha":"099333c9921fefa4807f65223d31e97ecb0536c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-09T01:05:58Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-09T01:05:58Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge branch 'master' of https://github.com/AlexAltea/rpcs3\n\nNOTE: I included some changes of the forks of O1L and Dante38490 to my\nfork. However, a conflict appeared while merging their sources with the\nones of DH. I had to resolve this conflict manually and push all the\nchanges like a new commit, that's why there changes weren't recorded\nindividually and (probably) won't appear at in the commits list. I am\nvery sorry for this, I'll try to avoid this in the future.\n\nIn order to preserve the authors of those commits, I write this list\nhere:\nO1L: Dummy Modules (cellAudio, cellSaveData, and more)\n\nhttps://github.com/O1L/rpcs3/commit/23ece01a0b6381cbbf70f87d6fa5d8d38094a1d3\n\nhttps://github.com/O1L/rpcs3/commit/784fc571b3d5d7b4a59e52b27c2abba866e6f225\n\nDante38490: Spotted and fixed an issue in git-version-gen.cmd\n\nhttps://github.com/Dante38490/rpcs3/commit/44e8867125deff3cecc29c6ed42f3a6fda998e5a\n\nRegarding my changes:\n* New lv2 SysCalls implemented (and others improved)\n* SDATA unpacker implemented\n* Changed layout of sc_table","sha":"60261408c2413176ac5dfaa00eee0605711914cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2190419?v=4","date":"2013-11-09T01:17:44Z","email":"sodroski@bu.edu","login":"Magn3s1um","name":"Magn3s1um"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2190419?v=4","date":"2013-11-09T01:17:44Z","email":"sodroski@bu.edu","login":"Magn3s1um","name":"Magn3s1um"},"msg":"-Added SPR registers \n-Implemented MTSPR","sha":"3c762750a0def0c2591d0deb0ac7ba033aa2d7d3"}
+{"author":{"avatar":null,"date":"2013-11-09T01:27:37Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2013-11-09T01:27:37Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Fixed OpenGL error 0x0502.\n\nImplemented cellRtc module.\n\nAdded module name list in cellSysmodule to aid debugging.","sha":"3076571b6fd6a33ba6b50c0696587da8d70da008"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-09T02:48:43Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-09T02:48:43Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed errors of last commit\n\nI forgot to modify one line of code that broke the entire solution. Now\nthis is fixed. I also disabled the logging of sys_timer_usleep calls.","sha":"620b8d036980aefc01790f8ecf4d1abeb7ca1cc8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-09T02:55:34Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-09T02:55:34Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #15 from Hykem/master\n\nFix for OpenGL error and implementation of cellRtc","sha":"3b15f35432800792f93d79e4e16470647e68f9ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-09T12:25:12Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-09T12:25:12Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Fixed memory leaks in cellRtc module.\n- Fixed CPUThread crash.\n- Improved ARMv7 Interpreter.","sha":"6ea2c7d6a853bd6a803773c6d4507f5abd93b903"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2190419?v=4","date":"2013-11-09T15:41:56Z","email":"sodroski@bu.edu","login":"Magn3s1um","name":"Magn3s1um"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2190419?v=4","date":"2013-11-09T15:41:56Z","email":"sodroski@bu.edu","login":"Magn3s1um","name":"Magn3s1um"},"msg":"-Partial Implementation of Floating-Point Status and Control Register (FPSCR)","sha":"1192d20295aa3171252bc99a0516bde90c4b5b1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2190419?v=4","date":"2013-11-09T15:51:26Z","email":"sodroski@bu.edu","login":"Magn3s1um","name":"Magn3s1um"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2190419?v=4","date":"2013-11-09T15:51:26Z","email":"sodroski@bu.edu","login":"Magn3s1um","name":"Magn3s1um"},"msg":"-Fixed MPYU and special registers based on comments","sha":"63482dcfdcbd54fdcafe41ce1dd183ad3aeef0d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-09T16:07:17Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-09T16:07:17Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #16 from Magn3s1um/master\n\nFloating-Point Status and Control Register (FPSCR) and code fixes","sha":"a55f76879e8c62a5da3a92a09cbfbbbce8cc4ca7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-09T21:29:49Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-09T21:29:49Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved GS Renderer.","sha":"521244b0e0c1ff87659e166d96ba5b93c0cfa88d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-09T21:30:41Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-09T21:30:41Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"842559804f35e921cedd807ad237942fcdcbf0af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-09T21:49:01Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-09T21:49:01Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed clear mask.","sha":"3dd9683b472b89358a697210798c89df5b0e5baa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-11-13T18:24:24Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-11-13T18:24:24Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Updated","sha":"584d4eb9d49d5fbed74b1636e03a9510d3821bd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-11-13T18:35:25Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-11-13T18:35:25Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Implemented PKG Installer, improved Boot game.","sha":"6d56f1ae86451e75cbbe0dfcc76122c0f24846e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-11-13T19:43:44Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-11-13T19:43:44Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Fixed errors from previous commit. Sorry.","sha":"b1caa5f9c403af4f59243c15177bf5586dc0f8a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-14T11:34:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-14T11:34:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #17 from O1L/master\n\nPKG Installer","sha":"45e58d882e303bc230ff17b3ae7315c24dc21a18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-14T11:54:37Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-14T11:54:37Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed remaining conflicts\n\nFixed remaining conflicts from O1L/rpcs3 (master):\n* Removed cellPhotoDecodeUtil.cpp, cellPhotoImportUtil.cpp and\ncellScreenShotUtility.cpp which are already present.\n* Updated cellSaveData.cpp to fix the conflicts.","sha":"2a5f353e1e69d01eb9e1a82a51cd61390cf593b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-16T00:38:22Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-16T00:38:22Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Improved cellResc module\n\n* cellResc module improved\n\n* Many changes in this commit are from [DH]: The implementation of\ncellRescSetConvertAndFlip, cellRescSetWaitFlip and cellRescSetSrc as\nwell as all the other changes that are not in cellResc module.\n\n* Fixed another conflict from O1L/rpcs3 (master): Deleted\n\"cellPhotoUtility\" (which already exists in cellPhotoExport)\nNow all the conflicts are solved. :-)\n\nNOTE: We should search for a better name for 's_rescInternalInstance'.\nThis one is just too long and some lines don't even fit in my screen\nbecause of this.","sha":"382ae8a78f343e7d40c422196efe1b99adc83045"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-16T01:44:08Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-16T01:44:08Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Implemented cellRescResetFlipStatus & cellRescGetFlipStatus.\n- Renamed gs homebrews.\n- Updated AboutDialog.","sha":"baea02901bb8bc2ffc9fc5259666879b857d320d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-16T21:12:30Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-16T21:12:30Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Improved sc function binder.\n- Improved Module binder.\n- Added Dump Depth Buffer & Dump Color Buffers options (values can be changed on the fly).","sha":"53737472101610358ee9d4f2d4b5b97061b4c4e1"}
+{"author":{"avatar":null,"date":"2013-11-18T02:10:59Z","email":"osdito@gmail.com","login":null,"name":"Osvaldo Costa"},"committer":{"avatar":null,"date":"2013-11-18T02:10:59Z","email":"osdito@gmail.com","login":null,"name":"Osvaldo Costa"},"msg":"Change the GUI a little bit\n\nRemoved the launch of the ELF Compiler window at startup. Instead of it,\nI added a menubar item called \"Compiler\", and within it a menu item\ncalled \"ELF Compiler\", wich will launch the window.","sha":"19fea0043249e3f7cfdf3f0174590fd7c78f1b86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-19T21:10:23Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-19T21:10:23Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Fixed OpenGL renderer LoadVertexArray & DrawArray.\n- Improved SPU SCs.\n- Renamed mem_ptr_t -> mem_list_ptr_t, mem_struct_ptr_t -> mem_ptr_t.","sha":"9d5b13839be78b77be4b14c9f6e0434b8cda4305"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-19T21:20:29Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-19T21:20:29Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #19 from osvcos/master\n\nChange the GUI a little bit","sha":"ead70f5c0060e981410ef069e785de009844dbc5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-22T15:15:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-22T15:15:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed SLD.\nThanks to elisha464.","sha":"aab69513aab65804717fae2853245fe164fb24c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-23T02:55:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-23T02:55:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved PPU Interpreter\n- Fixed MULHW & MULHWU.\n- Improved MULHD & MULHDU.","sha":"62c1980cac4be2266eaae4367cde0af033008d44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-23T04:47:19Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-23T04:47:19Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"New debugging features, cellGame & minor changes\n\nTwo cellGame functions partially implemented:\n- cellGameGetParamInt\n- cellGameGetParamString\n\nNew debugging features:\n- Call Stack viewer added\n- Memory Viewer rewritten (Not finished yet)\n\nModified definition of UNIMPLEMENTED_FUNC to improve compatibility with\nother compilers: Thanks @krofna\n\nReplaced the \"Compiler\" menu entry with \"Tools\" and \"Memory Viewer\"\nentry added.\n\nNOTE: To \"quickly\" browse the memory using the Memory Viewer you can use\nthe scrollbar. Notice the irony of the word 'quickly' since the memory\nviewer is actually slow as fuck. I will fix that soon. As you can see,\nI'd like to add a Raw image viewer in the future in order to \"see\"\ntextures directly from memory.","sha":"5e1a958ee660b6ba2be6bd803cc3f457d462560d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-23T05:38:19Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-23T05:38:19Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved Memory Viewer","sha":"cbe4ab253c5f7c81b464a6a7bc83f384d3c27b4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-23T15:20:31Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-23T15:20:31Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"- Improved call stack.","sha":"8463694d4f1cb6917663aa4cfb712b1cacaf95e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-23T17:56:03Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-23T17:56:03Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Implemented Raw Image Preview tool","sha":"268a654fecf70a704e0d03baadc8410cecac890c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-23T18:50:54Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-23T18:50:54Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved RAW SPU\nFixed sc binder_func_10","sha":"da9c778a4c691b7d1a004fc2a1fb877095b077d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-23T18:51:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-23T18:51:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"f91bd80bc2e0d4d04bab4e9f40c974c1a15d44b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1102695?v=4","date":"2013-11-19T10:30:58Z","email":"krofnica996@gmail.com","login":"krofna","name":"Mislav Blažević"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1102695?v=4","date":"2013-11-23T22:27:58Z","email":"krofnica996@gmail.com","login":"krofna","name":"Mislav Blažević"},"msg":"Start porting to GNU compiler","sha":"d8bd34b57ede9d47565be25704e4b1985a543452"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1102695?v=4","date":"2013-11-23T22:31:05Z","email":"krofnica996@gmail.com","login":"krofna","name":"Mislav Blažević"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1102695?v=4","date":"2013-11-23T22:31:05Z","email":"krofnica996@gmail.com","login":"krofna","name":"Mislav Blažević"},"msg":"Cleanup OpenGL hacks","sha":"2926d3805c99dbdc9a254c1c0fa3d84e6dd92913"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-23T22:50:13Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-23T22:50:13Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #24 from FGRE/master\n\nFix compilation with GNU compiler","sha":"0ff38bc8ce18dbf6b7a2cf47b0f6b5cb10c3d7ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-24T00:01:57Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-24T00:01:57Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed compilation errors\nMinor improvements","sha":"c7ca4b996a01ab3bfa016a553ddcf0c8427c9369"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-24T00:47:17Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-24T00:47:17Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"New GCM commands implemented\n\n- NV4097_SET_DEPTH_BOUNDS_MIN\n- NV4097_SET_POLY_OFFSET_FILL_ENABLE\n- NV4097_SET_POLY_OFFSET_LINE_ENABLE\n- NV4097_SET_POLY_OFFSET_POINT_ENABLE\n- NV4097_SET_RESTART_INDEX_ENABLE\n- NV4097_SET_RESTART_INDEX","sha":"f43a3249379519db96df542935662c97dfbd0598"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1102695?v=4","date":"2013-11-24T09:17:18Z","email":"krofnica996@gmail.com","login":"krofna","name":"Mislav Blažević"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1102695?v=4","date":"2013-11-24T09:23:04Z","email":"krofnica996@gmail.com","login":"krofna","name":"Mislav Blažević"},"msg":"Fix linking","sha":"9a8cf34f44f4ba08692a6d603f565b15278d1823"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-11-25T11:49:55Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-11-25T11:49:55Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Added libfont module. Set Renderer to OpenGL, Aspect Ratio to 16:9 and Pad Handler to Windows by default. Partially implemented cellGcmSetDebugOutputLevel and cellGcmSetSecondVFrequency functions. Added 'host_root' path to VFS Manager.","sha":"206cc6ac91267d09dd273fcc548970ddd4471500"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-25T17:56:33Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-25T17:56:33Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #26 from O1L/master\n\nAdded cellFont module (dummy in this moment) & minor changes in default settings","sha":"12c2e13dfa672fc351a639cbd4cf9e0901146313"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-25T17:57:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-25T17:57:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #25 from FGRE/master\n\nFix linking","sha":"a852baee5bbd7b0720c8806f09df9a10bd110118"}
+{"author":{"avatar":null,"date":"2013-11-26T00:23:25Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2013-11-26T00:23:25Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Implemented syscall 114.\n\nImplemented manual unfself routine for debug (homebrew) packages.","sha":"03d2525ccca3b833a6021c8be1d3cbfc810e6084"}
+{"author":{"avatar":null,"date":"2013-11-26T00:28:08Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2013-11-26T00:28:08Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Missing changes from last commit.","sha":"97d65e5563c8de2fd03477a168c59093f0cdd395"}
+{"author":{"avatar":null,"date":"2013-11-26T01:22:26Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2013-11-26T01:22:26Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #27 from Hykem/master\n\nSyscall 114 and UNFSELF","sha":"dae31c44e0bc205b747f003593d536ea7f3f92bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-26T04:34:19Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-26T04:34:19Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved OpenGL renderer & RAW SPU\n- Improved Fragment Shader Decompiler.\n- Fixed NV308A_COLOR cmd.\n- Fixed break points for RAW SPU Thread.\n- Added cellMsgDialogOpen2 to cellSysutil module.","sha":"9ce30fdd741202169e9876e9689b72083729af5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-26T05:04:39Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-26T05:04:39Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved Debug SELF loader","sha":"4fbfc1476392140972f9c24c6a75aa0b3c66b226"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2013-11-27T06:37:46Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2013-11-27T06:37:46Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Introduce a Qt UI for RPCS3","sha":"d83a9b12d600182ec27fe88f8500e0db7ab038cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2013-11-27T19:16:19Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2013-11-27T19:16:19Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"First stage of WX dependency removal.","sha":"6bcaf469e8fe5b3d0a9e99c85ef3c9901520b165"}
+{"author":{"avatar":null,"date":"2013-11-27T22:15:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-11-27T22:15:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellGcmSetUserHandler (empty), SPU.SF syntax\n\nTest commit","sha":"794cd4cf89be0e360b0b369b84a3bb13974a3723"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-28T12:09:49Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-28T12:09:49Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #30 from xsacha/master\n\nRemoval of WX dependency and introduction of Qt UI alternative","sha":"1bc99a3762f1710b315fb24b8701f1701e816314"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-28T12:27:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-11-28T12:27:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed conflicts.","sha":"28a5d1bcab57d20e977f21b3b2f744c762b533bc"}
+{"author":{"avatar":null,"date":"2013-11-28T14:37:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-11-28T14:37:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"a32fe40275324cba6ef867b474747a43d52dc37a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-29T04:56:26Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-11-29T04:56:26Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"New functions & Minor changes\n\n* cellGameBootCheck, cellSysutilGetSystemParamString partially\nimplemented.\n* Improved debug SELF loader (I applied DH's changes over another part\nof code that Hykem wrote).\n* Added checkbox in the Config>Settings menu to ignore Read/Write errors\n(disabled by default).\n* Minor issues.","sha":"5ce57e963f6a0f89d01434b0319c5a17f3cc3069"}
+{"author":{"avatar":null,"date":"2013-11-29T14:46:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-11-29T14:46:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"65c920bc8d44aada78b1c96f6702a2adb3ae662f"}
+{"author":{"avatar":null,"date":"2013-11-29T15:27:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-11-29T15:27:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU ELF loading\n\nI'm not sure that it's correct way to get entry point","sha":"c48168ffc7c4653b7d681df28a6e6b775684026e"}
+{"author":{"avatar":null,"date":"2013-11-29T23:40:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-11-29T23:40:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU fixes\n\nPartially tested and fixed","sha":"384e20acf023b5d8ca26efd89e4d2e4c89ca3167"}
+{"author":{"avatar":null,"date":"2013-11-29T23:40:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-11-29T23:40:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/Nekotekina/rpcs3","sha":"f0946c4bc87854d18cd641af6ca1856bfd50d620"}
+{"author":{"avatar":null,"date":"2013-11-29T23:50:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-11-29T23:50:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge fix","sha":"b217742c7b177a01926d755742adabbb9a200a6f"}
+{"author":{"avatar":null,"date":"2013-12-01T00:36:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-01T00:36:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Fixes 2\n\nIt's almost finished","sha":"ae39d3802f2193479c6878a471a6c0c74097d9db"}
+{"author":{"avatar":null,"date":"2013-12-01T17:30:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-01T17:30:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Fixes 3\n\nAlmost all implemented instructions are fixed. Partialy tested. Some\ninstructions are still unimplemented.","sha":"1cfcc742d8937d1533c9ce26a3b092640079edd9"}
+{"author":{"avatar":null,"date":"2013-12-02T10:40:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-02T10:40:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Fixes 3.1\n\nSmall fixes","sha":"38fabf7cd2328bda4ecdec86bbe92d4e794de2d8"}
+{"author":{"avatar":null,"date":"2013-12-02T18:49:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-02T18:49:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Fixes 3.2","sha":"73c2628ef40d52845081fdb0c2ea20b6db474cbf"}
+{"author":{"avatar":null,"date":"2013-12-03T20:35:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-03T20:35:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Improvement\n\nImplemented CFLTS, CFLTU, CSFLT and CUFLT. Finally fixed FREST.","sha":"241ae8364519090d830f3924ff519264b07bac8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-04T13:52:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-04T13:52:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #33 from Nekotekina/master\n\nSPU Changes Request","sha":"ff4fcdd5fdc9bc23ec7bd5a200bb219f7621056e"}
+{"author":{"avatar":null,"date":"2013-12-07T20:56:42Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2013-12-07T20:56:42Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"General improvements:\n\n- Added drafts for event flag emulation;\n- Implemented memory locking/unlocking;\n- Refactored common SC_Memory objects;\n- Implemented VM (virtual memory) syscalls;\n- Improved cellGameBootCheck;\n- Added more dummy values to cellVideoOutGetDeviceInfo;\n- Mapped functions sys_mmapper_allocate_memory and sys_mmapper_map_memory to sysPrxForUser;\n- Mapped syscalls 341 and 342 (duplicates of 324 and 325) to sys_memory_container_create and sys_memory_container_destroy;\n\nImproved PKG installation routine:\n- Allow immediate game booting;\n- Fixed and improved game folder path handling.","sha":"a9a246a8661d28000b84cd33fa7ac7ee3cf21ee2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-07T22:52:41Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-07T22:52:41Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"SPU improvements\n- Implemented more SPU Channels.\n- Improved interpreter.\nMinor improvements.","sha":"bba1b6a6e0d72d73e03a4b8f202cc430c61bb3a2"}
+{"author":{"avatar":null,"date":"2013-12-07T23:12:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-07T23:12:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Improvement\n\nSome instructions implemented with SSE intrinsics","sha":"9bf8f2eec551b43ce5b433c7da70ae57d2305c4f"}
+{"author":{"avatar":null,"date":"2013-12-07T23:13:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-07T23:13:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"430ded8259101687dfb33a4b7196473281e40eab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-08T00:09:16Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-08T00:09:16Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved OpenGL renderer\n- Implemented color buffer reading.","sha":"76a93443c37beda725e4c0d359f9ca4b4b497ca6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-08T00:42:59Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-08T00:42:59Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved OpenGL renderer.\n- Rotate color buffer.","sha":"34f5997f821896d6242abe68b1c76c4172473b9f"}
+{"author":{"avatar":null,"date":"2013-12-08T01:00:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-08T01:00:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"2135fb9685d0b0f37718aeb7488ca8e7937ff776"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-08T13:47:54Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-08T13:47:54Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved PSF loader.\nImproved Game Viewer.\nImplemented cellPadGetInfo.\nMinor improvements.","sha":"eaef09df9134d5955f733318a5a3ab7bb0fd4273"}
+{"author":{"avatar":null,"date":"2013-12-08T14:03:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-08T14:03:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"MFC\n\nMinor changes","sha":"34ac4688e6bac6235ac0026a9aae655e042ab632"}
+{"author":{"avatar":null,"date":"2013-12-08T14:04:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-08T14:04:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"78ca7e1d44791f19cdb5e7a6dd5cd9f43edf1bfb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-08T16:54:45Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-08T16:54:45Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved Boot UI.\nAdded dev_usb000.\nFixed Game Viewer.\nMinor fixes.","sha":"23539f13b5d761054acf708a1a03e167afd5787b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-08T17:06:20Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-08T17:06:20Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Refresh Game Viewer after Install PKG","sha":"bf03874be2b13cf53c5aa43e808797f5d71944fe"}
+{"author":{"avatar":null,"date":"2013-12-08T17:44:52Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-08T17:44:52Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Revert \"SPU Improvement\"\n\nThis reverts commit 9bf8f2eec551b43ce5b433c7da70ae57d2305c4f.","sha":"e8d2245a0b1b4dd645070052b7f36ddf68a8001e"}
+{"author":{"avatar":null,"date":"2013-12-08T17:46:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-08T17:46:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"bba9ea830f4f86628474855e3544bf2a053c1b83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-12-09T16:56:04Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-12-09T16:56:04Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"First cellFont functions & minor changes\n\n* Edited .gitignore\n* Moved some functions to cellFontFT.\n* Now cellFont initializes correctly, but it doesn't render anything\nyet. There are still several things to change and functions to\nimplement. I will take care of it.","sha":"849af30bfd0b321aad260daa9f4b9af3ad1593f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-12-09T17:07:13Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-12-09T17:07:13Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed conflicts","sha":"e2de06da6365e0bd454033e072d14b65c547fd05"}
+{"author":{"avatar":null,"date":"2013-12-10T22:58:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-10T22:58:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Basic DMA, MFC, channel changes\n\nAdded new consts, thread-safe locks for critical resources, removed some\nwarnings. Modified git-version.h","sha":"c9fc99c388c9361600ef8dc8c4e024b61add94e0"}
+{"author":{"avatar":null,"date":"2013-12-11T22:13:28Z","email":"osdito@gmail.com","login":null,"name":"Osvaldo Costa"},"committer":{"avatar":null,"date":"2013-12-11T22:13:28Z","email":"osdito@gmail.com","login":null,"name":"Osvaldo Costa"},"msg":"Relocate sys_process_is_stack to sysPrxForUser.cpp","sha":"bc3772614bffcb982b41c2abb2e8b99bd13c5c65"}
+{"author":{"avatar":null,"date":"2013-12-11T22:26:20Z","email":"osdito@gmail.com","login":null,"name":"Osvaldo Costa"},"committer":{"avatar":null,"date":"2013-12-11T22:26:36Z","email":"osdito@gmail.com","login":null,"name":"Osvaldo Costa"},"msg":"Relocate sys_process_is_stack to sysPrxForUser.cpp","sha":"2c1cb5184397956770b430f7359fc66f8a2371b0"}
+{"author":{"avatar":null,"date":"2013-12-13T01:35:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-13T01:35:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"MBox, some improvements\n\nSome changes reverted (warnings), multi-thread safety fixed, MBox MMIO\nmodified","sha":"ee137323aa4f635e93318860768451bae3486aab"}
+{"author":{"avatar":null,"date":"2013-12-14T00:15:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-14T00:15:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"STBUX implemented\n\nMissed PPU opcode + replaced some non-unicode non-ASCII characters in\nPPPInstrTable.h","sha":"eed6a7ffe3356f1770a9e33aa1f156da4e125992"}
+{"author":{"avatar":null,"date":"2013-12-14T00:17:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-14T00:17:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"01a274a1db126aa6c0dc28ed2a2f0fd782efec3c"}
+{"author":{"avatar":null,"date":"2013-12-14T21:59:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-14T21:59:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Win32 fix & elf loading fix\n\nFixed compilation error for x86 version. Fixed issue with ELF loading.","sha":"c3d2cd344f8042d2cb9b9dc0966748752e5e4d19"}
+{"author":{"avatar":null,"date":"2013-12-18T22:30:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-18T22:30:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Notification of NI flag change\n\nProbably useless.","sha":"e28ba3056126e929f5128cccd0e207d57e8f64fb"}
+{"author":{"avatar":null,"date":"2013-12-22T17:40:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-22T17:40:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Improvements\n\nImplemented SNR channels and syscalls, fixed sys_spu_thread_initialize\n(args' passing, SPU image copying for each thread)","sha":"c9abf559be4fecf68a07bc3c29f5d45e8325bd16"}
+{"author":{"avatar":null,"date":"2013-12-22T18:16:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-22T18:16:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fast fix\n\nPrevious commit was wrong","sha":"37b5b49f58809e092b76e4b4a8dea04657f7c78f"}
+{"author":{"avatar":null,"date":"2013-12-23T11:57:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-23T11:57:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Fixes\n\nMandelbrot set does work now and its modified version included in\nTEST12345 folder.","sha":"ba8108d59500907b7a4a704c86bb9c2e69ba6ecb"}
+{"author":{"avatar":null,"date":"2013-12-23T13:20:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-23T13:20:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Files removed\n\nThey don't work from this folder","sha":"fdb3fdb9277205b6b1e7a56830232233165d67be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-24T03:58:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-24T03:58:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed ELF64 loader.\nFixed cellPadGetInfo.\nFixed cellFsOpen path encoding.\nDraft implementation of cellAudioGetPortConfig.\nImplemented STBUX, STHUX, STWUX.\nImproved Boot (S)ELF / Install PKG UI.","sha":"b500fcbaedc5a1c2b386eda66ce2014a5eccda73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-24T04:02:21Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-24T04:02:21Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Added missed files.","sha":"456374d487020933eae69fbeb063aece803de53e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-24T05:25:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2013-12-24T05:25:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Implemented LWZUX, LWAX, LWAUX, LHA, LHAU, LWA, STWBRX, STHBRX.","sha":"eb2ab73e1667b341604988d974c6c1f9f12fd8a2"}
+{"author":{"avatar":null,"date":"2013-12-24T08:42:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-24T08:42:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed conflicts\n\n(merge branch)","sha":"ab2bc35b182ca0aacbfdaa0cc62945ce796437c6"}
+{"author":{"avatar":null,"date":"2013-12-24T11:10:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-24T11:10:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed x86 build\n\nFixed crashes","sha":"3a82ed5dc9b08fc0307f4bdb126fa7eec98a8bda"}
+{"author":{"avatar":null,"date":"2013-12-24T17:34:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-24T17:34:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Improvements\n\nImplemented sys_spu_image_import, original Mandelbrot PKG should work\nnow.","sha":"35257f5e94cd861c766a409e8460e3cd7865fb9c"}
+{"author":{"avatar":null,"date":"2013-12-25T17:28:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-25T17:28:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU\n\nImplemented sys_raw_spu_load, sys_raw_spu_image_load. Minor review of\nMFC, channels.","sha":"1ab5ef9dd7f5606a6933c8e36db68b92758ca598"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-12-27T10:55:11Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-12-27T10:55:11Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Implemented some cellSysutil audio functions, added configurable controls (draft/ugly implementation), and minor changes in cellAudio and ConLog","sha":"286254a10a01f605259219e7d8341f37c31eecbc"}
+{"author":{"avatar":null,"date":"2013-12-27T11:35:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-27T11:35:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU\n\nLQX Hack removed, Critical Section for m_status removed.","sha":"ca13d4f2ef2cef1c1f19bae7fd892e62c5156ea2"}
+{"author":{"avatar":null,"date":"2013-12-27T21:50:25Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2013-12-27T21:50:25Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #34 from osvcos/master\n\nRelocate sys_process_is_stack to sysPrxForUser.cpp","sha":"69be408b32a09cf6cabe92c7187e14150550586e"}
+{"author":{"avatar":null,"date":"2013-12-27T21:50:55Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2013-12-27T21:50:55Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #36 from Nekotekina/master\n\nSPU Improvements","sha":"f477b62813baf323c295f1eff5b61ace3e43b2f8"}
+{"author":{"avatar":null,"date":"2013-12-27T21:51:14Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2013-12-27T21:51:14Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #37 from O1L/master\n\ncellSysutil audio functions, configurable controls and other minor changes","sha":"e807ae1a588da29a6dd2cdd717ad518bc44c43a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-12-28T10:05:44Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2013-12-28T10:05:44Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Update missed file","sha":"429041097b8a1b1d2efaae769182b29d9214d20c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-12-28T22:03:32Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-12-28T22:03:32Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #38 from O1L/master\n\nUpdate missed WindowsPadHandler.h\r\n\r\n_Note:_ O1L explained that there was some issues when trying to fix what I mentioned in my last comment caused by wxWidgets 2.8.12. Therefore I will merge this commit as we can try different approaches to fix this in the future.","sha":"24d01a28c825c1e2042e3fc944f48a4a5944064e"}
+{"author":{"avatar":null,"date":"2013-12-29T21:18:51Z","email":"osdito@gmail.com","login":null,"name":"Osvaldo Costa"},"committer":{"avatar":null,"date":"2013-12-29T21:18:51Z","email":"osdito@gmail.com","login":null,"name":"Osvaldo Costa"},"msg":"Halfplement syscall 351 (sys_memory_get_page_attribute)","sha":"9a1e22fb85b5d31bd1a48e43df4582f7866ee1c3"}
+{"author":{"avatar":null,"date":"2013-12-30T19:34:39Z","email":"osdito@gmail.com","login":null,"name":"Osvaldo Costa"},"committer":{"avatar":null,"date":"2013-12-30T19:34:39Z","email":"osdito@gmail.com","login":null,"name":"Osvaldo Costa"},"msg":"Halfplement syscall 351 (sys_memory_get_page_attribute)","sha":"7277940b8473c6a2c533dfa88ffeddb325439258"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-12-30T21:32:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-12-30T21:32:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #40 from osvcos/master\n\nHalfplement syscall 351 (sys_memory_get_page_attribute)","sha":"3858f5097ed38b895a25448329c944caf78ca054"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-12-30T22:59:39Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2013-12-30T22:59:39Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Experimental RSX Debugger & minor changes\n\nRSX Debugger:\nCurrently, it can preview the color buffers while the RSX Thread is\nrunning, view and modify the render flags, and act as a memory viewer in\nthe RSX command buffers (no disasm yet). You can press F5, to update the\ninformation (buffers, memory, flags, etc.) of the frame. There are *a\nlot* of TODO's here that will be done in the future.\n\nMinor changes:\n*Added /dev_flash/ to VFS (required for cellFont in the future).\n*cellMsgDialogOpenErrorCode implemented using wxMessageBox. The\ninformation for each error code comes from PSDevWiki. There are lots\nerror codes missing.\n*Updated sys_memory_get_page_attribute\n\nHappy new year to everyone! :-)","sha":"d1a27748a357e782ffe5d2555ac6f9a5bccdc088"}
+{"author":{"avatar":null,"date":"2013-12-31T11:10:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-31T11:10:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"New functions\n\nAdded cellSync module, implemented sys_spu_thread_group_join,\nsys_spu_thread_group_suspend, added /dev_bdvd/ device, fixed default\nvalues of analog sticks.","sha":"552fd355bc1925e095051a767b798a703ef6a7e2"}
+{"author":{"avatar":null,"date":"2013-12-31T11:16:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2013-12-31T11:16:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed conflicts","sha":"906f4482217944a7539bb243bf7c68ad22d7263a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-02T01:13:08Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-02T01:13:08Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"RSX Debugger & cellFont improved\n\nRSX Debugger:\n*Better way to add name:value pairs to the tabs.\n*Added some entries in the Settings/Texture/Lightning tabs.\n*Experimental DisAsm.\n*Support for previewing RGB textures (buggy!).\n*Minor cleanups and improvements\n\ncellFont:\n*Added cellFontOpenFontMemory, cellFontOpenFontFile,\ncellFontOpenFontset. They still need some modifications (e.g. bind these\nfunctions to stblib/stb_truetype.h).","sha":"1a43fe5ceb213cacb5198ff42826056c60f41760"}
+{"author":{"avatar":null,"date":"2014-01-02T14:56:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-02T14:56:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"64b18b4dc23a6d86196719a2f4b3399c4eae4d07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-04T23:45:44Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-04T23:45:44Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"RSX Debugger, Mem. Viewer and module improvements\n\n* Small cleanup in cellJpgDec and cellPngDec.\n* cellPamf added to the project and a few test lines added to\ncellPamfGetHeaderSize(2).\n* Improved speed of the Raw Image Preview on the the Memory Viewer.\n* Now you can click on the shown buffers / textures in the RSX Debugger\nin order to see them in full size. More settings added to the tabs.\n* Fixed cellFsStat in order to fix the crash aused by opening\ndirectiories. The solution is really *really* ugly. Once vfsDir is\nready, I will replace it with something better.","sha":"aa9b0d0a3123996d4dcc8a9e133121097cfc5c6f"}
+{"author":{"avatar":null,"date":"2014-01-04T23:58:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-04T23:58:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Minor improvements\n\ncellFsAioRead partially implemented, cellPadInfoPressMode &\ncellPadInfoSensorMode stubs","sha":"5f06f46f3284e58f8d59e28afa31ae4d33bd9e87"}
+{"author":{"avatar":null,"date":"2014-01-04T23:58:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-04T23:58:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"2d011e94cd06ada2f0b0fec1913add5ae9757f53"}
+{"author":{"avatar":null,"date":"2014-01-06T01:50:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-06T01:50:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellPamf partial research and implementation","sha":"5f8d36600c141f0c1796699ae86712b4e14a33f6"}
+{"author":{"avatar":null,"date":"2014-01-06T16:16:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-06T16:16:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellPamf improvements","sha":"db8f01717c14f513850116abe638de4cc369873d"}
+{"author":{"avatar":null,"date":"2014-01-06T16:53:30Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-01-06T16:53:30Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #47 from Nekotekina/master\n\ncellSync, cellPamf and other","sha":"40f2e679ec6f2d799a30aa3dd29d297a586fae15"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-07T07:30:41Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-07T07:30:41Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved RSX Debugger\n - Fixed crash in debug build.\n - Implemented texture selection.","sha":"cbeadcf872f2560941eb49656f600ca2e762bfff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-07T20:11:02Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-07T20:11:02Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved Vertex Shader Decompiler.\nFixed VFS Manager crash.\nFixed SPU image loader.\nDraft implementation of cellFsAioRead.\nImproved Callbacks.","sha":"7971db665e74c2b455ba7bc5e99c0a8d147af90f"}
+{"author":{"avatar":null,"date":"2014-01-07T20:27:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-07T20:27:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fixes","sha":"f4952bee1881456905ce84ca4cf525f2d71fa8ff"}
+{"author":{"avatar":null,"date":"2014-01-07T20:49:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-07T20:49:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed conflicts","sha":"775bf8b340f549d2589cf4a81dda8a2b620c32cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-07T21:36:51Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-07T21:36:51Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #48 from Nekotekina/master\n\nCompilation fix + other fixes","sha":"1d61e7b4a4bfd81b3d632aa6565b43d7e240056d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-08T21:16:13Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-08T21:16:13Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Implemented mem_func_ptr_t.\nImproved cellFsAioRead.\nFixed cellAudioOut* return error codes.","sha":"76695a97b92e16afc30799e7568895962e5ba0bd"}
+{"author":{"avatar":null,"date":"2014-01-10T01:30:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-10T01:30:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed errors, improvements\n\ncellSync review, MFC channel AtomicStat added, draft implementation of\nMFC_GETLLAR_CMD, MFC_PUTLLC_CMD etc, memory allocating hacks for\nalignment.","sha":"1be7454bc47ec815c04942613f653805d64aa2dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-10T21:06:22Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-10T21:06:22Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellAudio updated\n\ncellAudio:\n* Change endianness of datatypes.\n* Fixed port handling.\n* Uninitialize module when restarting.\n* Minor syntax fixes.","sha":"2506810a2ea9427c3d47216cee1d7f637e0968ea"}
+{"author":{"avatar":null,"date":"2014-01-12T09:35:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-12T09:35:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"4e8cd72e59f72113c2ba428ea72c3eee68415af4"}
+{"author":{"avatar":null,"date":"2014-01-12T10:27:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-12T10:27:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"CellSync review (mutexes, SPU).\n\nFile descriptors temporarily detached from ID manager.\nSome logs disabled.","sha":"970b834f2e82ef7d379a25fe74063b3d5b6d7165"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2014-01-12T10:40:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2014-01-12T10:40:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #49 from Nekotekina/master\n\ncellSyncMutex+SPU","sha":"e0a70bb0fa3a080e4159df0593ce492ca3f6b45a"}
+{"author":{"avatar":null,"date":"2014-01-14T19:03:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-14T19:03:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Simple analog stick support (from KB)\n\nLeft stick: arrows; right stick: PgDn/PgUp (vertical) and Home/End\n(horizontal)\nAdded L10n functions' list (copied from old distr)\nFixed \"LoadShdr64 error: shstrndx too big\" in ELF64 loader\nOther minor changes","sha":"e41f21abc758c03da2c92228a8de053578d2fbcb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-17T16:56:03Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-17T16:56:03Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Added Virtual Memory Block for the IO Address Space\nStarted implementing some the memory mapping functions of libgcm","sha":"509d46a5442058a4c41a5d1a0bd5a84862de1b38"}
+{"author":{"avatar":null,"date":"2014-01-17T23:45:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-17T23:45:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellPamf update","sha":"9e06aeff331b3d64084386412f605a62fa2b64af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-18T21:36:22Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-18T21:36:22Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"More memory mapping functions for libgcm","sha":"48726e8fed12f299b4af1dd5cf1e4a365cdd1437"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-18T21:36:42Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-18T21:36:42Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"4e4dd4364606f257890d7741b7f35f10e5df3459"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-18T22:21:52Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-18T22:21:52Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #51 from elisha464/master\n\nMemory Mapping functions for libgcm and virtual memory block","sha":"159b6ecea3974ec379065c19024a0eef8082088b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-19T03:14:11Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-19T03:14:11Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved ID manager.\nImproved MemoryBlock.","sha":"ab41540064bf8a3a0e8fd6f96ad841d2a61a7e81"}
+{"author":{"avatar":null,"date":"2014-01-19T10:52:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-19T10:52:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellPamf update, cellDmux draft","sha":"d65647acf373c05e663b511b1ce74bc7cfd23960"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-19T16:05:27Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-19T16:05:27Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved vfsDevice.\nMinor fixes.","sha":"dc2fd8c39e6ac94385691c6f38507c8327431ebd"}
+{"author":{"avatar":null,"date":"2014-01-19T21:19:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-19T21:19:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SC_Lwmutex","sha":"6fb1a67a833062af5d16a109a033d1c00d9bad9d"}
+{"author":{"avatar":null,"date":"2014-01-20T23:34:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-20T23:34:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some bugs fixed","sha":"5f9bc138980668c5f5583f6898bb362ef67c9375"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-21T17:55:48Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-21T17:55:48Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Implement reserved memory in virtual memory block","sha":"66a481d4bc1f82ade37a3100a74ccddf968774d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-21T18:08:33Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-21T18:08:33Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fixed some memory mapping functions","sha":"6504ddede45a6f4420c49a5993236000e0c7ec90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-21T18:29:16Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-21T18:29:16Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"small change to unmapping functions","sha":"8514a14cf4704feeed62955170ef5a6c29aa9805"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-21T19:10:44Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-21T19:10:44Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"finished all memory mapping functions of libgcm","sha":"9b9e621593032ef5b6288c01292e68af061a7347"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-21T19:19:07Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-21T19:19:07Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3\n\nConflicts:\n\trpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp","sha":"7920f6d4730518cb81c14f868daf7ea3cdb43feb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-21T20:23:28Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-21T20:23:28Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"small fix","sha":"14c7c63e3463dc75e2431d03bd84da19524555f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-21T21:28:55Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-21T21:28:55Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #52 from elisha464/master\n\nMore memory mapping functions","sha":"cf740f512969617086d2d8813b4c0e5f0583279f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-22T18:04:11Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-22T18:04:11Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fix cellGcmMapMainMemory","sha":"f260d1c60236a60a8042de4ecd65128ce6dae370"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-22T19:53:11Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-22T19:53:11Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fixed getId and create thread (the id was written using write32 instead of write64)","sha":"ec942f26572800949a7456e8b2c0a2db1ff00a46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-22T20:49:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-22T20:49:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #53 from elisha464/master\n\nminor fixes","sha":"4b356998f25ed2f2871bbf291dfc07585856729e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-23T17:03:43Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-23T17:03:43Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fix stop when trying to run two games in a row","sha":"64bfae6648a3113388c48eeabb59bc7e62b4c49e"}
+{"author":{"avatar":null,"date":"2014-01-23T18:40:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-23T18:40:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small changes","sha":"93faac57804412273f3bcd623494d2dd4d0bb89f"}
+{"author":{"avatar":null,"date":"2014-01-23T18:45:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-23T18:45:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed conflicts","sha":"d16dbedaa1b0435cdd994c8e6219138aea1ab635"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-23T19:37:59Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-23T19:37:59Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fix thread exit crash","sha":"8a3835bcef4d717955cb68518217c8c907ac6e18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-23T19:38:26Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-23T19:38:26Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"changed warning of cellGcmAddressToOffset to Log","sha":"4ee90e1f90a0a5af76ac6c4e19da3a1ef884ca5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-23T20:11:28Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-23T20:11:28Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"eac95265493f47b483afaf8496bca5fc14893994"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-23T20:11:54Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-23T20:11:54Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #55 from elisha464/master\n\nMore fixes","sha":"51512f25c5c6d0e628199181f2934c2a9039aa6d"}
+{"author":{"avatar":null,"date":"2014-01-23T20:38:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-23T20:38:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"fc3f5348b824ccda050300b41d34fc363cea455f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-23T23:22:56Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-23T23:22:56Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"changed everything to use the new IO address space","sha":"8e9dcd279a459201ac8d676b4bf6cb767caad30b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-24T00:26:08Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-24T00:26:08Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"forgot some stuff :P","sha":"824fd46062118f8452d0223cd92b9392cc567026"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-24T00:28:04Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-24T00:28:04Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"e8d00e6bbd6d1465386b1e504fcaf7b92a317c54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-24T00:35:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-24T00:35:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #56 from elisha464/master\n\nchanged RSXThread to use the IO Memory\r\n\r\nThe datatype args didn't work for a certain part of RSXThread, because it tried to read from memory directly, but I needed it to you se read32 of the memorybase so it can reach the virtual memory block and in the end the real address.","sha":"09387879a0c06f428813748f930d65f36ef03980"}
+{"author":{"avatar":null,"date":"2014-01-25T20:42:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-25T20:42:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"88208f5e01269468a5ee5b31a5823f5432ea561c"}
+{"author":{"avatar":null,"date":"2014-01-25T22:53:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-25T22:53:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"FDs fix","sha":"4de64e5afe958adc36c227568f99abd55fb6afea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-25T23:17:15Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-25T23:17:15Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #57 from Nekotekina/master\n\nUpdate: lwmutex reimplementation, cellPamf update, cellDmux draft, small changes in PPU interpreter","sha":"211a477864e8c27c3b1478542222fb343a0a9981"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-26T21:07:14Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-26T21:07:14Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"delete m_main_mem_addr","sha":"543ed016426d4ae30a19c1d39dcbdf5f6daf4996"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-26T21:08:09Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-26T21:08:09Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fix problem where there was black quads instead of text in fw samples","sha":"057efb48fa01f780149566a6ed76b9e6bc6fa7af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-28T18:01:44Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-28T18:01:44Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fixed VPREM and VSLDOI","sha":"3209b2f5f34a4c8f187c578ebe07af8d9f0c3240"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-28T18:02:20Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-28T18:02:20Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"7e591deaf35ec7ec6e610537cae33cfc0b430432"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-28T19:41:27Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-01-28T19:41:27Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #58 from elisha464/master\n\nFixed some vector instructions and a small fix in the fragment shader decompiler","sha":"d07b5f0dc8bf7cf6c0f5dfdd1b912aef858b151b"}
+{"author":{"avatar":null,"date":"2014-01-29T20:31:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-29T20:31:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SC_Rwlock implementation, SC_Lwcond draft\n\nOther small changes","sha":"67a144df2a7b7f3018aefd49c123b1f8601e763a"}
+{"author":{"avatar":null,"date":"2014-01-30T23:40:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-30T23:40:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugs fixed, lwcond implementation\n\nModules: mutex added","sha":"6efe751d4c186675cca019794d256de56a17e835"}
+{"author":{"avatar":null,"date":"2014-01-31T12:46:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-31T12:46:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small changes\n\nSC_FUNC changes (done by DH)\nPPUInterpreter changes (copied from main, done by elisha464)\nLog() using fixed","sha":"432c6cf206f9acfda01fd0660dad480e4a526876"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-31T18:40:18Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-31T18:40:18Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved ThreadBase.\nImproved Vertex Shader Decompiler.","sha":"4b8d6b69194bc770725de6c1b8fb93fce11838d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-31T20:44:35Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-31T20:44:35Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fixed fragment decompiler\nwhen adding a const, I added a check to see if it already exists","sha":"678e455b4f62343a32bd3d44ebec63ff8ffbdd43"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-31T20:54:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-01-31T20:54:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Small fixes","sha":"d93ce95a36d623d57fac822828c383936c879403"}
+{"author":{"avatar":null,"date":"2014-01-31T21:35:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-31T21:35:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small changes","sha":"67601bd639eba8e75db9b85da31fd357008dacdd"}
+{"author":{"avatar":null,"date":"2014-01-31T21:56:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-31T21:56:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed conflicts","sha":"6553909dc52bae5a8210b02318b7fd97a04f74dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-31T22:02:10Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-31T22:02:10Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"985b27daabf3295fe736cdd75358ce8fbc553ec3"}
+{"author":{"avatar":null,"date":"2014-01-31T22:07:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-01-31T22:07:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Afterfix","sha":"9919154d666952688846e9d5ea73d2e9c0f89cf2"}
+{"author":{"avatar":null,"date":"2014-01-31T22:09:32Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-01-31T22:09:32Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #59 from Nekotekina/master\n\nNew sync primitives","sha":"31c0687fc0ad7bd2d9a7e5ca6d3c0a72c29be1c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-31T22:16:43Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-01-31T22:16:43Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"9526ff37b9624fd9ca7b6e15674ce6c40c601f60"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-01T07:30:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-01T07:30:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #60 from elisha464/master\n\nfragmentDecompiler fix","sha":"16c284214fb1abd91057ab5bca9c0f209067efb8"}
+{"author":{"avatar":null,"date":"2014-02-01T10:17:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-01T10:17:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some typos fixed (thanks to Nukem9)\n\ncellSysutilCheckCallback() modified, some warnings converted","sha":"b6022603144d6e0f787376c8990e9cdd75bf45cf"}
+{"author":{"avatar":null,"date":"2014-02-01T10:19:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-01T10:19:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Oops","sha":"15dd0bb0f24a183a440d9d1c63680abc944eeb05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-01T11:10:57Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-01T11:10:57Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fix WriteDepthBuffer and scissoring","sha":"bff084c233f8aa836ae7e680307eeebb9f956eb6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-01T12:54:55Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-01T12:54:55Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fixed problem of textures being disabled after every end command","sha":"79c2654a8cad1f7c1dfc240f6d16dcf75274a82e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-01T14:15:24Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-01T14:15:24Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"change warning to log in lwmutex","sha":"da8cd146ebc7edc2642451f5e205a4b4212de562"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-01T14:15:42Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-01T14:15:42Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"39bb6d3b2b26479fb1a26235c6476938910ff357"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-01T16:44:19Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-01T16:44:19Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fixed clamping of texture_border","sha":"8467d8c8c7495f04e2c77aef41e9df404d940e16"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-02T19:42:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-02T19:42:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Implemented vfsLocalDir & vfsDirBase.\nImproved ThreadBase.\nMinor fixes.","sha":"beb19633e91ba04a61211c12d51efcfa5a66acce"}
+{"author":{"avatar":null,"date":"2014-02-02T19:49:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-02T19:49:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Memory alignment fix\n\nSome mutexes added, _sys_heap_memalign implemented","sha":"7fce5589f8ecbdf6d9c963ced3adef568303e091"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-02T20:47:17Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-02T20:47:17Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed compilation errors.","sha":"8ba8d355415e39429e2f5615e0af6d7f75f91fe9"}
+{"author":{"avatar":null,"date":"2014-02-02T21:20:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-02T21:20:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"a0c8e116df83c3e4cbc35a79dc76a9a91bcad4cf"}
+{"author":{"avatar":null,"date":"2014-02-03T13:12:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-03T13:12:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed thread issues\n\nFixed args passing\nFixed thread stopping/pausing (temporarily)\nFixed problems with SC_Condition and SC_Mutex (partially)","sha":"311486ed79fc7c3e5895815e2d2facbed8652d76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-03T16:11:47Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-03T16:11:47Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"started fixing the rsx textures\noffset and format are done","sha":"ad4ad4e55d805282d216452c87bbdf0349b13734"}
+{"author":{"avatar":null,"date":"2014-02-03T20:23:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-03T20:23:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small changes","sha":"aeca523a3489ec7dd79186bd24bfc6ca9227be10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-04T16:47:31Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-04T16:47:31Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Copy Paste :P (thnx AlexAletra)","sha":"d2bd0b0ccfc4a9a7beae3de4ca4fa2fe80ed5682"}
+{"author":{"avatar":null,"date":"2014-02-05T11:55:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-05T11:55:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small changes, some bugs fixed","sha":"cfe154d9160efa41896aae1477baf1f89ea2cc4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-05T20:48:30Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-05T20:48:30Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"more rsx texture (address, control0,  image rect)","sha":"c515cb8fb6d8722faad980a82dfe278da6471687"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-02-06T16:58:42Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-02-06T16:58:42Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Use _ftelli64 and _fseeki64 instead ftell and fseek in unpkg, required to unpacking big files (> 4 Gb). Deleted wxMoveDir() (not needed now :P ) and added simple progress bars in unpkg.","sha":"e0737204fd65685123941a4104f4c6fbfdf84fc4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-02-06T18:34:05Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-02-06T18:34:05Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Minor changes","sha":"74426fd4e99802feca2f506e614a80c0e8867da5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-06T22:40:45Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-06T22:40:45Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #63 from O1L/master\n\nImproved UnPkg.","sha":"ce88a4fc9a6960d073248264feabf6253b8ccafa"}
+{"author":{"avatar":null,"date":"2014-02-06T22:55:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-06T22:55:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Reservation implemented\n\nSome SPU bugs fixed;\nsys_spu_thread_get_exit_status\nsys_spu_thread_group_destroy","sha":"6c606be09f7377ace2ae067dda40a2c7078a57ea"}
+{"author":{"avatar":null,"date":"2014-02-07T21:55:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-07T21:55:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Reservation review\n\nMinor changes\nSC_Event_flag.cpp module detached","sha":"ed40732e7b92649270067f57e0b59e7503dae1bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-09T11:07:50Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-09T11:07:50Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellFont rendering functions\n\n-Now, all the games using rendering text using\ncellFontRenderCharGlyphImage and all the related functions should work,\nor at least don't crash.\n\n-There are still issues with the character position on surface, and in\nsome cases, it renders the text with a different font than the one the\ngame specified. A lot of cellFont stuff is still missing or may be not\nproperly implemented.\n\n-For games using system-embedded fontsets you have to find a *legal* way\nto copy the .TTF files from your PS3 into dev_flash/data/font.","sha":"66a9acfb04112f17ee5f017125d64460a5bd86bb"}
+{"author":{"avatar":null,"date":"2014-02-09T11:11:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-09T11:11:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small changes\n\nlwmutex completely implemented","sha":"3308fefa7f8fd9e44ab0a2b7ea2bf8374fe04bf1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-09T13:50:35Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-09T13:50:35Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #64 from Nekotekina/master\n\nLast changes","sha":"4ebd974f5e4ed51311ded11a22b0ccb5b3ca7294"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-09T17:41:20Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-09T17:44:04Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Update Readme with some links to the wiki and forums","sha":"d85c26aa8bfd31e94fefdcddd6f1ee13bf9c4961"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-09T17:55:15Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-09T17:55:15Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #65 from Bigpet/master\n\nUpdate Readme with some links to the wiki and forums","sha":"27a4e6a2b6b5b6c7a3f836dc8a70f190482baa09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-09T20:45:53Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-09T20:45:53Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"remove local copy of wxWidgets","sha":"8f7ceee36af93cda9c1653cb14ee282d7285800a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-09T20:48:23Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-09T20:48:23Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add wxWidgets submodule","sha":"145450964a9bde63c2bf0806f45d35319192ea2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-09T20:51:01Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-09T20:51:01Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"delete submodules again","sha":"30df3727c2cfa757138b5abbff784336ed0cbe62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-09T21:03:38Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-09T21:03:38Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add wxWidgets repository as a submodule","sha":"6dcfaf8617c7b2dad50e193fe93257d7c1213eb2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-09T21:53:48Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-09T21:53:48Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Directory-related functions implemented\n\n* cellFsOpendir, cellFsReaddir, cellFsClosedir functions implemented.\n* vfsDirBase: m_entryes, GetEntryes renamed to m_entries, GetEntries\nrespectively.\n* vfsLocalDir: Read() function added to get the entries one by one.\n* Moved IsExists() from vfsLocalDir to vfsDirBase to avoid \"R6025 pure\nvirtual function call\" error.\n* Other minor changes in some functions of sys_fs","sha":"4d988262593f315d758a613af8ac7c40cdd5ec8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T01:13:13Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T01:13:13Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"make it compilable, don't merge this, string logs are broken and paths absolute to my machine","sha":"59dcbd3ba35f4db9b7eccc497111fac73b789d66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T01:23:40Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T01:23:40Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"merging vfs changes because I need to fix wxstring reads","sha":"b9abb1e0750663a792816a561bea44e4d0d0b378"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T01:43:24Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T01:43:24Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"prevent overflow becaus wxStrings aren't \\0 terminated anymore","sha":"3f52a6aa50b98adb46bcb4129638145eed022b31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T02:00:02Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T02:00:02Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"use relative paths again to include the wxWidgets stuff","sha":"bf26e069b88fdb55afcf04cd4592c9fcd9db8888"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T10:19:48Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T10:19:48Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"use the unicode version of the regex lib, don't know why the releas config links against it while debug doesn't","sha":"fdcdd7769fa8284c33fa59af1cd06f97bf07a212"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-10T12:47:15Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-10T12:47:15Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3\n\nConflicts:\n\trpcs3/rpcs3.vcxproj.filters","sha":"c2ec1cb7095345301e6b4b493fee740bb5d0e701"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T12:53:09Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T12:53:09Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"use .wx_str() instead of .mb_str(), Dbg console is still broken","sha":"b9c3dc352d22a3b095993e5078fb7fea7a175717"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-10T15:57:32Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-10T15:57:32Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"implemented viewport scale and offset (but everything seems to flip now :( )","sha":"bc38af04a53db7e73727b0115fa788a75c910d59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T16:13:38Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T16:13:38Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"convert Dbg console packets uniformly to char*","sha":"7423997b4221026d3cb2d850c698bde7fe0e935e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T16:16:35Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T16:16:35Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"remove commented out code","sha":"427a63f3248736dc1ca1de440434de05663f09da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-10T16:34:30Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-10T16:34:30Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"more rsx texture (control1)\nand fixed crash of rsx debugger","sha":"48115b153e14d363d8b5af7125a65e0bd43c61a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T18:51:03Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-10T18:51:03Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"clean up more output conversions, everything that wants to get printed needs to be explicitly convertex to the wxCharType otherwise the VFormat prints nothing","sha":"b05e466e8f1d6e4ee9c5a0a79bd268ff4f1a48fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-11T02:47:25Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-11T02:47:25Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Few module functions added\n\nImplemented:\n* cellSysutilApGetRequiredMemSize\n* cellGameContentErrorDialog\n\nBinded lv2 SysCall 814 to cellFsUnlink","sha":"8adf19c904752395ea681c53ab957ba5a15c9e2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-12T18:23:33Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-12T18:23:33Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add submodule instructions and bump submodule version","sha":"14006256481ea4c3659ceb0c33cc99c51049e3f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-12T18:54:41Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-12T18:54:41Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #66 from Bigpet/wxWidget3Port\n\nwxWidgets3 port","sha":"e9b3c4b5f67eb65945940aacf1334b823773913f"}
+{"author":{"avatar":null,"date":"2014-02-12T19:03:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-12T19:03:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Event system rewriting, EventManager partially implemented\n\ncellAudio partially rewritten, some bugs fixed","sha":"460d948e87cb34c6424d733c4941fdf33aa07c68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-12T20:07:44Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-12T20:07:44Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"change submodule to DHrpcs3","sha":"b8400cbe63f1d449dd771da8e95ba79e7d9131c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-12T20:09:12Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-12T20:09:12Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #67 from Bigpet/master\n\nchange submodule to DHrpcs3","sha":"3a9b5afe30617955d2b27478abb435ea4394f82e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-12T20:46:23Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-12T20:46:23Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"remove the outdated gl.lib reference, if this causes new linker issues we need to add the right name to the vcxproj instead","sha":"de95ac3adbab69e66495c6833a8d9adcfde1edfc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-12T20:57:37Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-12T20:57:37Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add the x64 library directory correctly","sha":"d3f4b086c67a2fdcb96f4b3d12f2acb0e1b9b26b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-12T21:08:03Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-12T21:08:03Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add the dependencies config for rpcs3, so that wxwidgets gets automatically build to build rpcs3","sha":"39e72fc3ccc33c6dc90dd9e4dc5b6003486a3b52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-12T21:18:12Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-12T21:18:12Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #68 from Bigpet/master\n\nRemove the outdated gl.lib reference","sha":"256ee2ff8a1bc4db834ddc22bd9341fe5c8d29a2"}
+{"author":{"avatar":null,"date":"2014-02-13T08:39:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-13T08:39:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Trying to fix merge conflicts...","sha":"77ec2c954f8cecda71032703306fbcf4a3bee675"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-13T10:33:07Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-13T10:33:07Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Few bugs fixed and license file added\n\n* Fixed GUI issues caused by the update to wxWidgets 3.\n* Fixed small bug in SC_TTY (thanks Nukem9!)\n* Added GPL v2 license file.","sha":"5953781c13f13ea43fc071b8062ff034060543fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-13T11:13:05Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-13T11:13:05Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #70 from Nekotekina/rpcs3\n\nand conflicts fixed.","sha":"373d189edbde68735ac20a66e597dcbca2758bee"}
+{"author":{"avatar":null,"date":"2014-02-13T11:57:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-13T11:57:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"a6faf04db490ba386bf755341613c528af7b8426"}
+{"author":{"avatar":null,"date":"2014-02-13T16:59:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-13T16:59:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"log fixes (to wx_str())","sha":"5a240c32a93d32f412b1ac35c9de34c840b89bf2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-13T17:02:46Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-13T17:02:46Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"more rsx texture (filters)\nimplemented deswizzling of textures (only one format for now, a fix for multiple context sample)","sha":"6846d15dc840f000df6d820030aeb31750cf9e80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-13T17:10:36Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-13T17:10:36Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #71 from Nekotekina/master\n\nLog fixes","sha":"2b63888782a89f809a0e224dd12fb2d6035a290a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-13T19:05:23Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-13T19:05:23Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Logging CheckBox, cellGame stuff and other fixes\n\n* cellGameContentPermit and cellGameBootCheck updated.\n* Checkbox in the Settings dialog, for enabling logging.\n* Fixed GUI issue in the InterpreterDisAsmFrame.\n* Fixed -dirty flag in wxWidgets submodule.","sha":"eb93e87b7f27eddc457e2ef57e7b2c32f97ab5db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-13T23:08:32Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-13T23:08:32Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"make stepping work again, it's impossible to use it without these changes","sha":"11ba83738fd34d3b51de0867ee86fb5888a73a93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-13T23:10:58Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-13T23:10:58Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"6fbd4d3dafe040e8b1cf963c01047c70fbf0b743"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-13T23:17:25Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-13T23:17:25Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #72 from Bigpet/master\n\nFix \"Go to Adress\" and Stepping","sha":"209155d71dbcd840c61101afcc1cefbf7ecfa46e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-14T00:30:15Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-14T00:30:15Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed few warnings and typos","sha":"82e0bbebdb6c7a8d96111544f62068acad797f76"}
+{"author":{"avatar":null,"date":"2014-02-14T11:40:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-14T11:40:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_lwcond, sys_mutex, sys_cond rewritten\n\nSome bugs fixed","sha":"e94ea409feb74a91041b7d52724174cd82d4be66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-14T12:50:41Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-14T12:50:41Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"flipped frame buffer","sha":"f7967f97ecb120ef79d0d1e57b36bcbfa0351c96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-14T17:14:14Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-14T17:14:14Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"undo thread behavior changes and add html subproject to dependencies.","sha":"8bf8c7e6e912648c7e0accf891758af362be9984"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-14T17:17:04Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-14T17:17:04Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #75 from Bigpet/master\n\nUndo thread behavior changes and add html subproject to dependencies.","sha":"e03d274071ba07423d5fff6c258aa5168c87d5f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-14T19:50:02Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-14T19:50:02Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix stepping a little better than last time","sha":"f179bd4cd7de5a4f2149c29e759658adc4fb2c35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-14T19:50:25Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-14T19:50:25Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"b5d588a40b1572220673299b2647a51e316a1a7a"}
+{"author":{"avatar":null,"date":"2014-02-14T20:08:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-14T20:08:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small cellAudio update","sha":"e066bcf2616a2566b1b59f4a80230e307a754c85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-14T20:09:24Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-14T20:09:24Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #76 from Bigpet/master\n\nFix stepping a little better than last time","sha":"f2a3db0bd84cc618e9856f2784963888f02a9ee9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-15T00:06:12Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-15T00:06:12Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"TRP Loader and undo few cellGame changes","sha":"deaedcb6fa0c13807d025949344eab739cc6997d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-15T00:44:18Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-15T00:44:18Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"f3ad989e34eed6b2c87c717cb711f66c3cab7265"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-12T18:33:25Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-15T00:51:59Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Add cache support\n\nalso added tentative blocksize and sys_game_procexit support\n\nadded final cache support and improved the process chainloading error messages\n\ndon't ignore cache directory in the .gitignore\n\nadd warning for clearing cache","sha":"bdc8eba3bbcdfe23c80a3ac9f05d2737fbacbfdf"}
+{"author":{"avatar":null,"date":"2014-02-15T06:13:31Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-02-15T06:13:31Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #77 from Bigpet/SysCacheImpl\n\nBasic sys cache implementation","sha":"700698247a743d645cc938c0f2e3ef934a715c04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-15T11:05:16Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-15T11:05:16Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3\n\nConflicts:\n\trpcs3/Emu/GS/GL/GLVertexProgram.cpp\n\trpcs3/rpcs3.vcxproj.filters","sha":"5590efe054a8f3156fe831a18020e25af4611450"}
+{"author":{"avatar":null,"date":"2014-02-15T21:16:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-15T21:16:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed some problems","sha":"848c5dadf0eecccf1ce86b22e525316c7121e67c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-16T01:51:04Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-16T01:51:04Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Some sceNpTrophy syscalls and few fixes\n\n* Restored deleted functions in FuncList.cpp\n* Fixed bugs in TRPLoader.\n* Implemented some sceNpTrophy syscalls.\n* Added sceNp headers (required for sceNpTrophy).\n* Updated .gitignore to ignore trophies.\n\nNOTE: Thanks to the new sceNpTrophy syscalls, RPCS3 can install the\ntrophy contents in dev_hdd0/home/00000001/trophy/. Remember this is\nstill on an experimental stage.","sha":"3fdb50b0ea9fb84ae9206bb98816251e8c5e962f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-16T08:28:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-16T08:28:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Small fixes","sha":"01f3763eb4e61ab5eb26b443733dcd8935d9bebf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-16T08:56:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-16T08:56:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Merged elisha464 branch","sha":"a7368cc893748d096dccfee3da4d8e21767632c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-16T09:39:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-16T09:39:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed RSXDebugger","sha":"5d59dae73045cf70cf70ba95eda3f42e028cd6eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-16T15:19:06Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-16T15:19:06Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved VFS\n- Implemended vfsDir.\n- Improved vfsDevice.\n- Improved vfsFile.","sha":"321d323beb944fc1b2d060774b5809e07424c2c9"}
+{"author":{"avatar":null,"date":"2014-02-16T15:23:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-16T15:23:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Audio port output in .wav file","sha":"4375b9dd2a4d947d325e832a3e83dbb110987cb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-16T15:37:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-16T15:37:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed cellFsOpen & cellFsOpendir","sha":"bd8ff4ca116ed32c6c3fd26388489a629e1d8b00"}
+{"author":{"avatar":null,"date":"2014-02-16T17:57:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-16T17:57:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed conflicts","sha":"931929a82c7c3f83287bd0ae96461518ea627a9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-16T21:17:56Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-16T21:17:56Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Few source-code improvements\n\n* Fixed identation inconsistency after last merge.\n* Replaced uint32_t with u32 in LinearToSwizzleAddress.\n* Replaced hardcoded values with defined GCM constants (in Emu/GS/GCM.h)\nin some switch statements.\n\nThis commit won't produce any changes in the RPCS3 executable. It's just\nto make the code easier to read.","sha":"ab25edfaccb5574f0c9b87870a723d7e3e22ecdf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-17T17:27:17Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-17T17:27:17Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3\n\nConflicts:\n\trpcs3/Emu/GS/GL/GLGSRender.cpp\n\trpcs3/Emu/GS/GL/GLGSRender.h\n\trpcs3/Emu/GS/RSXTexture.cpp\n\trpcs3/Emu/GS/RSXThread.cpp\n\trpcs3/Emu/GS/RSXThread.h\n\trpcs3/Gui/RSXDebugger.cpp\n\trpcs3/rpcs3.vcxproj.filters","sha":"07c9fbee7f408fa6d65b89f66a840962229aa3e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-17T21:05:59Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-17T21:05:59Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"a small fix in vertexShaderDecompiler (fixes scogger loading screen)","sha":"7f7b12a6dd1c0fab915bfa93cfdc6cb208808d35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-17T21:10:08Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-17T21:10:08Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #79 from elisha464/master\n\nvertexShaderDecompiler fix","sha":"22558df68e0fc2648c53c60ffde8858ed086922e"}
+{"author":{"avatar":null,"date":"2014-02-18T18:45:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-18T18:45:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small changes","sha":"d849e083b65688ca009c813fd7a54ab7bd94045d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-18T19:57:32Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-18T19:57:32Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #80 from Nekotekina/master\n\nSync changes, simple file output for sound","sha":"51613df4555093fdc152fff26ac43bc7405a9968"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-19T00:41:57Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-19T00:41:57Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"RSX Debugger: Shader program editor\n\n* Added checkbox in the Settings dialog for logging/editing shader\nprograms.\n* Added \"Programs\" tab to the RSX Debugger. Double-click on the entries\nto view/edit the shaders. Click on \"Yes\" after closing the editor will\nrecompile your program even if no changes were done.\n* Replaced \"Ctrl+C\" shortcut for running the emulator with \"Ctrl+E\" to\navoid accidentally unpausing the emulator when copying text.\n* Added glDetachShader to GLProcTable.tbl\n\nNOTE: There is a known bug: For some reason, certain shaders refuse to\ncompile again, even if you save the original shader as the \"new\" one.","sha":"b85a86b225d192b36161101ec69d34111d9b2567"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-19T04:33:31Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-19T04:33:31Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Moved some lines and deleted old code\n\n* Removed Compiler ELF references from rpcs3.cpp\n* Reordered the menu bar lines.\n* Moved the construction of some panels of MainFrame from rpcs3.cpp to\nMainFrame.cpp","sha":"83a7c837617d0a8c067f19b096e4aef0d66faea3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-19T17:27:52Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-19T17:27:52Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Minor fixes","sha":"b1df7444a4351342ce13721f78dc83a18dac929e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-19T22:38:47Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-19T22:38:47Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fixed MFOCRF","sha":"45452c57c4efff6b951e3b0e7798adb8b8b69094"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-19T22:41:32Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-19T22:41:32Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"ab4c4c2fd21dd922f8a6c5ff129323e1cd1817cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-19T22:50:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-19T22:50:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #81 from elisha464/master\n\nsmall fix, makes scogger run","sha":"8fedbd204e0076f128c43ca18849866be52ada5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-19T23:39:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-19T23:39:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Implemented RSXThread OutOfArgsCount notification.","sha":"d6fe398f79cc6e4097cd2f316abe6a04d92869bd"}
+{"author":{"avatar":null,"date":"2014-02-20T02:16:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-20T02:16:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Minor changes, some bugs fixed\n\ncellVdec headers, cellFsAioRead review, sync stuff review, cellAdec and\ncellVpost","sha":"9351e50f63d1f48685d4d3022875ea080530acf2"}
+{"author":{"avatar":null,"date":"2014-02-20T12:13:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-20T12:13:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellAdec, cellVpost headers","sha":"08b4748aae046655ab4b3268e8b2dc668d83cdfc"}
+{"author":{"avatar":null,"date":"2014-02-20T20:47:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-20T20:47:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Event fix, cellAudio fix","sha":"81147506f03b9b82728ad3dc749198717a4a94b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-21T01:35:33Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-21T01:35:33Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"PKG Loader rewritten\n\n* Rewritten unpkg.c -> Loader/PKG.cpp\n* MainFrame::InstallPkg now *only* installs the PKG.\n* Fixed crash when unpacking big debug PKG files.\n* Debug PKGs are no longer recrypted.\n* 'About...' dialog updated to remove PKG-related notice.\n* Unpkg removed.\n\nNOTE: The class PKGLoader is using wxWidgets functions to access the\nfiles. I think VFS would be better, but the Emulator isn't necessarily\nrunning when installing the PKG. In the other hand, initializing VFS\nwith RPCS3 may be somewhat risky... Any alternatives?\n\nTODO: Get rid of the decrypted \"*.dec\" files, and try to decrypt and\nread contents of the PKG on the fly using the information stored in\nm_entries.","sha":"5f9e60c45ff1f4ddcad166ce6aadea264a4f35bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-21T13:21:08Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-21T13:21:08Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Minor changes in RSXTexture.h and PKG Loader\n\n* Moved RSXTexture from RSXThread.h to RSXTexture.h\n* Renamed RSXTexture::Getmipmap to RSXTexture::GetMipmap\n* Used more GCM texture format constants in GLGSRender.h\n* PKG Loader: Added an \"Overwrite?\" dialog in case the folder\ndest+titleID (i.e. \"/dev_hdd0/game/\"+titleID) already exists. Note that\nin that case, the game won't be installed regardless of the option you\nchoose on the dialog.","sha":"17b877e448b204c44f65291fc0e9e4bd5f1b1147"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-21T16:13:57Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-21T16:13:57Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #46 from krofna","sha":"e7a721a1fbd47452ce289de405ae4a697f0912fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-21T19:36:22Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-21T19:36:22Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"msg":"merge branch","sha":"07135570f4ff9e304de7bfebce165c2462c0eacc"}
+{"author":{"avatar":null,"date":"2014-02-22T00:26:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-22T00:26:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"New functions\n\nsys_spu_thread_bind_queue, sys_spu_thread_connect_event and SPU-side\nsys_spu_thread_receive_event, sys_spu_thread_send_event\nFixed event system\nFixed SleepQueue priority alg\nAudio: cellAudioGetPortTimestamp and cellAudioGetPortBlockTag","sha":"b56df0c7f6efcfffb8bc04ca3cc2852f8e98a55f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-22T02:53:06Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-22T02:53:06Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved GameViewer\nGameViewer use VFS.\nImplemented be_t increment / decrement\nImplemented se\nImproved sys_fs syscalls.","sha":"05184d2e716f8036779f88dd33bca5ea5423e720"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-22T08:54:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-22T08:54:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #82 from Nekotekina/master\n\nEvent, audio, SPU fixes","sha":"7c6c20ef18dcf810adc96fff2f440a1ff0f10edd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-22T12:06:23Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-22T12:06:23Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Implemented audio Dump To File\nFixed MFOCRF, MTOCRF, MTCRF\nMinor fixes","sha":"81b19057bb1a6ef752672b2eaa9df2c9a7a2d76b"}
+{"author":{"avatar":null,"date":"2014-02-22T17:42:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-22T17:42:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ffmpeg submodule added","sha":"8df7f49b55fe31070899eabd692063302f362067"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-23T01:39:46Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-23T01:39:46Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge refactoring branch & Krofna's pull req. #46","sha":"696e00a570ea1fae575e171ad8c61eeab674c524"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-23T16:52:52Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-23T16:52:52Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"msg":"Make buildable with GCC in Linux\n\n* replace GetThreadID with std::this_thread.getId()\n* name all anonymous structs and unions that contain non-trivially constructable objects\n* made default constructor for big endian type noexcept to make it work with std::atomic\n* move instantiated specialized template function members ouside of the class definition to comply with the standard\n* added default instantiation for template parameter \"=nullptr\"\n* used the C++11 standardized thread_local instead of the __declspec(thread)\n* added transitional definitions to bridge the microsoft specific calls (compare and exchange and aligned alloc)\n* removed cyclic dependency between Emulator->CPUThreadManager->CPUThread->SMutex->Emulator->...\n* fixed some instances of indentation by space instead of tabs\n* surrounded some unused code with an #if 0 block to make sure it doesn't compile","sha":"9a30ce5f18a26886d272059a2f2cb0a02365ef70"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-23T17:13:08Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-23T17:13:08Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"msg":"merge newer changes","sha":"bebf027e0b50cdef9325acf5b6e8786637dda243"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-23T17:13:08Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-23T17:21:10Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"msg":"fix small merge mistake","sha":"1be8563fdbbfb32a52e3346dd2341b7b756e2bab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-23T17:23:14Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-23T17:23:14Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"msg":"fix small type mismatch","sha":"aef3b24c8d6aed8673cfb52cba3b0c3998d22bc6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-23T19:05:49Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-23T19:40:12Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"msg":"more merge fixes, I should really compile it before submitting a pull request","sha":"92fb77d50ed725155718d5076fa82312d801fa54"}
+{"author":{"avatar":null,"date":"2014-02-24T00:00:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-24T00:00:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Work on demuxer, ffmpeg libs linked","sha":"a14276abf16a3eb27a5106b61b3d0cc618ef8a8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-23T23:40:03Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-24T00:51:55Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"make things compile under windows again, there's still some ugly ifdefs\nI'd like to get rid of","sha":"1908286e7c0545532eb9a094d08027f161c63155"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-24T06:54:42Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-24T06:54:42Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Minor changes: GCM command, PKG loader & SysCalls\n\n* Fixed incorrect time displayed on NV4097_GET_REPORT.\n* Fixed small bug in PKGLoader::UnpackEntry\n* Moved some code in SC_Time.cpp\n* Auxiliary function declarations of SC_Time.cpp in SC_Time.h\n* Updated cellFsUnlink. *This won't work until ExistsFile is fully\nimplemented*.","sha":"7379b0e2ed1d770898dcd661092b2aeafcb3b523"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-24T07:14:21Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-02-24T07:14:21Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #83 from Bigpet/master\n\nMake buildable with GCC in Linux","sha":"d9d80d8fb49b878c7dd83e094a45024dadd51d2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-24T16:03:47Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-24T16:03:47Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Using be_t in some cellGcm structs & minor fixes\n\n* Using be_t in CellGcmControl, CellGcmConfig, CellGcmContextData and\nCellGcmTileInfo.\n* Fixed wrong names in Emu/SysCalls/Modules/sceNp.cpp\n* Fixed ConLog's mount info strings in System.cpp","sha":"2827db0e2a43b329c21fa4f8364feb302cd2fc87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-25T13:09:44Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-25T13:09:44Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellPad modifications\n\n* Using be_t on cellPad structs.\n* Swapped Square and Circle default keys (they were inverted).","sha":"681c3c53f00efe477288e09b998430de733f91c9"}
+{"author":{"avatar":null,"date":"2014-02-26T07:51:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-26T07:51:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Demuxer improved, cellPamf improved\n\nFile reading improved","sha":"0bd5dc53635ba461386ff5212c5cbbf1f6b0ede2"}
+{"author":{"avatar":null,"date":"2014-02-26T10:35:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-26T10:35:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cond/lwcond fixed","sha":"8048c70bc8af4008b9d9b449844c66d44bc906a8"}
+{"author":{"avatar":null,"date":"2014-02-26T11:27:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-26T11:27:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed conflicts","sha":"8bd0ee875cb39f28316a2b4f3dd4ed3feaf5e3ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-02-24T07:51:57Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-02-26T13:24:41Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"small compile fixes","sha":"f85420b343e22beb6b14f2ca249264b9e77b9f9f"}
+{"author":{"avatar":null,"date":"2014-02-26T14:06:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-26T14:06:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"memcpy partially replaced\n\nFixed one of exit issues","sha":"8b952bf98c195f3b5103e3b5e1e04cede9af66d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-26T21:24:57Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-26T21:24:57Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fixed flipped colors on some homebrews","sha":"5fbc190c80103537fb6b433f0fa719f9c0fbc89d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-27T17:47:08Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-27T17:47:08Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fix alpha test","sha":"d0300e5f43c183bbdb446ed893581fbb850b306c"}
+{"author":{"avatar":null,"date":"2014-02-27T18:25:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-27T18:25:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some errors fixed","sha":"dbdae777800e1a8f9c0b7d015589837c933d2895"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-28T09:19:56Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-02-28T09:19:56Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fixed colors on scogger","sha":"1ab5bc40a0989720c6c045d525e064c85ea4d887"}
+{"author":{"avatar":null,"date":"2014-02-28T09:53:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-02-28T09:53:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/elisha464/rpcs3","sha":"f3a3a630c35f1e7f35a73382e4476de071713ae3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-28T13:23:14Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-28T13:23:14Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #87 from elisha464/master\n\nminor rsx fixes","sha":"38fbd190b0bcaac478b7638efaa8840f160cd8c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-28T18:34:50Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-02-28T18:36:19Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix small mistakes\n\nfix endian mistakes, mistaken word length and preprocessor mistake","sha":"dbc39bce4075e0e1e75d5dff38e58aefed1b7701"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-28T18:39:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-28T18:39:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #88 from Bigpet/master\n\nfix small mistakes","sha":"6a15351363e93acdfba1eb26072baae1ae0ed896"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-02-28T18:55:48Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-02-28T18:55:48Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3\n\nConflicts:\n\tUtilities/BEType.h","sha":"377db4515ae5ed29439a375802bda309bcf48058"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-02-28T19:21:52Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-02-28T19:21:52Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"gcc..","sha":"fd564159b58cbd5d850ad55472eb3f3e9056f99d"}
+{"author":{"avatar":null,"date":"2014-03-01T08:38:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-01T08:38:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Vpost draft","sha":"17fa60c31c05bd3931565359d90624b5cef05d4d"}
+{"author":{"avatar":null,"date":"2014-03-01T08:39:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-01T08:39:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"4828723d5cb800c7c9886b36efb602577f3cd2c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-01T14:32:15Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-01T14:32:15Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"fix the typo.","sha":"d418cceae46ad97fe3bab604868ca339a802ea47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-27T03:21:08Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-01T18:33:38Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"RPCS3 arguments, TTY to file & sceNpTrophy stuff","sha":"cd10dca71fd4df4594fb141f2d3b95693b5d0e24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-02-28T03:48:20Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-01T18:33:39Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Few functions added\n\n* sceNpManagerGetStatus\n* sys_mmapper_free_memory\n* Minor changes in sys_mmapper_allocate_memory\n* Changed the layout of the sys_vm functions in SysCalls.cpp","sha":"7f7ad1b66126a4e057324b6c360a4591d9f30c34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-01T18:11:58Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-01T18:33:40Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Minor fixes: SPU, sys_mmapper, and cmd-line args.\n\n* Some SPU instructions updated:\n- Updated wrong instructions: SHLH, FRDS\n- Added UNIMPLEMENTED warning to: HBR, HBRA, HBRR\n* Updated sys_mmapper_allocate_memory declaration in SysCalls.h\n* Added sceNp.cpp to project\n* Added checkbox in the Settings menu for exiting RPCS3 when\nsys_process_exit (SC_Process.cpp) is called. Unfortunately, due to some\nproblems, this checkbox doesn't have a real effect yet.","sha":"6c28753dae993b4cb5d0d7767297489205c24a6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-01T18:59:36Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-01T18:59:36Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"Merge remote-tracking branch 'upstream/master'","sha":"e0d3f1cae6e07d4931d0776c907e2fb4e51766d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-01T19:29:26Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-01T19:29:26Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Reverted 'Unimpl.' warning on some SPU instr.\n\nI'm sorry. I deserve punishment and torture for this.","sha":"1e53c7f244cb65e74565b0fe954ab45003691196"}
+{"author":{"avatar":null,"date":"2014-03-01T23:50:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-01T23:50:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"I cannot do anything","sha":"9e62b330b1d2c9e27904fdaf1d3b88fc27eea957"}
+{"author":{"avatar":null,"date":"2014-03-02T06:24:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-02T06:24:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"c978fe377d2d47c2135c8b208cc741a409035d37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-02T10:50:07Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-02T10:50:07Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"Merge remote-tracking branch 'upstream/master'","sha":"b4712c0dca1c08ce5de16e910aeb1ef56b6b4784"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-02T10:57:17Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-02T10:57:17Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"Merge https://github.com/Nekotekina/rpcs3","sha":"7a1d44b55232bc0bf1c32467b0e0710139f3c0f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-02T11:55:20Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-02T11:55:20Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"get ffmpeg working with cmake..","sha":"bea8be29d5fcf2fa55166a90ae2ad7b48914be6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-02T12:00:57Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-02T12:00:57Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"add ffmpeg to link..","sha":"851acfdbf35604651dc1c6825d843f98ed59d3da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-02T13:37:06Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-02T13:37:06Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #89 from Nekotekina/master\n\n...","sha":"6fcead2a0e51abf98266aad93982a4342be0f0ab"}
+{"author":{"avatar":null,"date":"2014-03-02T23:02:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-02T23:02:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellAdec draft","sha":"c064c701e2d35b10629de79311e69671ef6a9bcc"}
+{"author":{"avatar":null,"date":"2014-03-03T04:48:07Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-03-03T04:48:07Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"First installment of RPCS3's custom crypto engine:\n\n- Removed all scetool dependencies;\n- Implemented a key vault to manage PS3 keys internally;\n- Implemented SELF decryption;\n- Improved PKG handling.\n\nNotes:\n- NPDRM SELF files (EBOOT.BIN) can also be decrypted. A valid matching RAP file must be placed under the dev_usb000 folder.\n- The source code is considerably commented and several debugging functions were also added in order to aid anyone who wishes to contribute to the engine.","sha":"a1adc6cdaad8a25a303f6e80c635b05b20f1517b"}
+{"author":{"avatar":null,"date":"2014-03-03T04:59:22Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-03-03T04:59:22Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Fixed AboutDialog (changed in last commit).","sha":"4770e5af084b8e9d3d2a0b8bdc99984e8beac8e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-03T10:44:00Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-03T10:44:00Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"fix gcc complain about non-const reference...","sha":"85626024a0e98469d458ab1c74e05abbb07aaf2d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-03T11:05:15Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-03T11:05:15Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"not sure about it.. but compiles..","sha":"caa797cee34d4c8c1b87e6b25cab4e0e7b9fc009"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-03T13:16:42Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-03T13:16:42Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed x64 compilation errors & cellFsGetFreeSize","sha":"05db17b2b05c77abc228eaa36835df06f803152b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-03T13:42:21Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-03T13:42:21Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"merge branch 'master' of https://github.com/DHrpcs3/rpcs3 into crypto","sha":"bd45704c8361bea37b8e131aa778c55d9b7a0b78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-03T13:51:54Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-03T13:51:54Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"fix gcc compile...","sha":"354cf24302bd868835e3bc87ca55b20ef3346598"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-03-03T20:45:27Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-03-03T20:45:27Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"fix memory alignment\nadded eaIOMap with flags (draft)\nchanged gcmInit to throw an error when not being able to map to io address","sha":"11571cf2a40bfbbd479368aef683b977cd68c7fe"}
+{"author":{"avatar":null,"date":"2014-03-03T23:21:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-03T23:21:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"It can play video, but it can't\n\nI don't know how to disable aggressive data caching that occures in\nvdecRead(). Also ReleaseAu function is disabled because it breaks\neverything.","sha":"8a4c67deab3e3887fd2c33cdc3e4d6eefbf1db0c"}
+{"author":{"avatar":null,"date":"2014-03-03T23:36:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-03T23:36:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"b32a8e2e289d7cf5f032e1aa5ab0aa1833eefb6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-04T08:37:28Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3497381?v=4","date":"2014-03-04T08:37:28Z","email":"kaito.linux@gmail.com","login":"Aishou","name":"Aishou"},"msg":"more fixes...","sha":"d32025ae3cdb921ab359f7fc27bc28d03b165b1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-04T14:18:12Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-04T14:18:12Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #90 from Aishou/master\n\nLinux compilation fixes","sha":"bc77f27bb2d0edb7f0b8f1b105842fef811e12b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-04T14:40:15Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-04T14:40:15Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Minor changes\n\n* Fixed some forgotten `!` in cellFsGetFreeSize.\n* Fixed VSUM2SWS opcode.\n* Added cellNetCtl to the project.\n* Implemented cellNetCtlGetState.","sha":"8204deaae6fad61c01714b6d558addb2bf60ca87"}
+{"author":{"avatar":null,"date":"2014-03-04T19:18:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-04T19:18:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"prx_mem memory leak fixed\n\nCPUThread::ExecAsCallback (experimental)","sha":"384536ba4f122d96873e95c970b6474f25b284bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-06T00:52:23Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-06T00:52:23Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Changes in cellRtc & sceNpTrophy\n\n* Two header files added: cellRtc.h and sceNpTrophy.h\n* Changes in sceNpTrophyCreateContext.\n* Implemented sceNpTrophyGetTrophyInfo.","sha":"39d3814be73d06d55f3207f73fedabe04f7e9f0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-06T08:48:35Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-06T08:48:35Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Progress in cellL10n\n\n* cellL10n added to the project.\n* Function addresses added to cellL10n_init.\n* UTF16stoUTF8s implemented (WARNING: I haven't tested it).","sha":"d6596ca45321a74568342b9567e4b32d1b098d55"}
+{"author":{"avatar":null,"date":"2014-03-06T11:40:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-06T11:40:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"libmixer draft\n\nand some hacks","sha":"e86a8496003c622df84b00b4f87488ae2048166c"}
+{"author":{"avatar":null,"date":"2014-03-06T11:50:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-06T11:50:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"05c6a96d27800c9e826b8ea38ab967d535b794dc"}
+{"author":{"avatar":null,"date":"2014-03-06T11:55:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-06T11:55:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed (again)","sha":"fac86aae58b3676cf25c1537a9975be3b17deba2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-06T12:27:58Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-06T12:27:58Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixes in sceNpTrophy and FSEL (PPU instr.)","sha":"898fbf02b802a980075b8b94ba8a683f3964e3ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-03-06T17:46:23Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-03-06T17:46:23Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"e32a6a2eea49c9d2b03e363438a0baf1e2f3f5fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-07T03:15:56Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-07T03:15:56Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"respect the outputBytesPerLine parameter if it's longer than the natural length of the PNG file","sha":"3871134a49346d81c2a15fbe340845afcb444e0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-07T03:23:08Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-07T03:23:08Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #91 from Bigpet/master\n\nrespect the outputBytesPerLine parameter","sha":"4af648905cc7273274253e4795297b9af986f4f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-03-07T07:10:29Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-03-07T07:10:29Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"0edd70d3d881e8e0180fbc5f1ff4a4c1419b3da4"}
+{"author":{"avatar":null,"date":"2014-03-07T12:03:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-07T12:03:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_ppu_thread_join, sys_ppu_thread_exit fixed\n\nSome diagnostic messages in mutexes","sha":"3127543b6e0f1763e5336611c036c07b3a457aad"}
+{"author":{"avatar":null,"date":"2014-03-07T12:04:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-07T12:04:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"3a00ec7682d9f21a4a8a5cd6afd858fa64628244"}
+{"author":{"avatar":null,"date":"2014-03-07T21:31:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-07T21:31:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSpurs draft added","sha":"1c302433af31ab4b57271f3fd620318b6fb32c93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-03-07T23:15:39Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-03-07T23:15:39Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Implemented simple OpenAL audio output. Structures and enum's from cellAudio.cpp moved to cellAudio.h . Audio dump functions moved in AudioDumper class.","sha":"df894c05b2778e41c7784ddc54d2fe91c2f29ba9"}
+{"author":{"avatar":null,"date":"2014-03-07T22:46:55Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-03-07T22:46:55Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #93 from O1L/master\n\nImplemented OpenAL audio output.","sha":"fdf935afe96b17aabccadb690901a84791bba53a"}
+{"author":{"avatar":null,"date":"2014-03-07T23:02:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-07T23:02:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"75f535c947138e81d688021f8be59108842bf715"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-07T23:20:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-07T23:20:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #94 from Nekotekina/master\n\nDifferent changes","sha":"2f65e84562dc1159b8eee7f7d0b3502fa2effb0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-09T03:57:19Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-09T03:57:19Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Updates in cellL10n and sceNpTrophy\n\n* UTF16stoUTF8s updated.\n* Added missing return in sceNpTrophyRegisterContext.\n* Added sceNpTrophyGetGameInfo.","sha":"8461bee32e3ce60f1f9386a2c3c4c7c50ddf5de3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-09T14:44:12Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-09T14:44:12Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Fix slashes in OpenAL includes","sha":"bde5c9cfed2b7149cc8074d75811a06cdb67b8a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-09T16:37:41Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-09T16:37:41Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #97 from xsacha/master\n\nFix slashes in OpenAL includes","sha":"b46cb713248f071711779db2e56d731e2d8545e4"}
+{"author":{"avatar":null,"date":"2014-03-09T23:07:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-09T23:07:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"a33575b1152b77b0ce9d31acc411812ea436d311"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-10T07:28:17Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-10T07:28:17Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Fix a case where an array is read out of bounds in cellSpurs.cpp","sha":"1aa6e5df958bd54811b284865d7b1a4b22877440"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-03-10T14:11:46Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-03-10T14:11:46Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #98 from lioncash/out-of-bounds-fix\n\nFix a case where an array is read out of bounds in cellSpurs.cpp","sha":"d90d2f2df7282e89e64b2ffaf1e3dd8721a410ed"}
+{"author":{"avatar":null,"date":"2014-03-10T16:24:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-10T16:24:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"7984df37c35b18ed3812a9237663ea20e14c2406"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-11T14:42:28Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-11T14:42:28Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Some sys_net functions\n\n* sys_net; Added some functions using winsock.h | sys/socket.h\n* sys_net: Renamed overloaded function/structs \"*\" to \"sys_net_*\"\n* Added SetAddr function to mem_base_t","sha":"d5e94d4cd938cfd3e4d246ce35ec64c5100e8305"}
+{"author":{"avatar":null,"date":"2014-03-11T16:20:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-11T16:20:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"rldcr, rldcl instructions\n\nSome intructions fixed","sha":"7f7d5a57c80a1308ae206890267359c9a7d2242f"}
+{"author":{"avatar":null,"date":"2014-03-09T23:07:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-11T16:36:58Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Compilation fix","sha":"b7b33145f6870fff3be00321a7d83dc9a11bcb01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-11T16:36:17Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-11T16:36:58Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Linux build fix.","sha":"5f3f7e197a7c692ecb379c2a37c1d132489659fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-11T17:40:37Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-11T17:40:37Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellUserInfo module added & cellFsReadWithOffset","sha":"b31a990cf135599e1bbcf5f0b3068d81f3cdf0b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-03-11T17:45:15Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-03-11T17:45:15Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Fix converting audio data. Implemented some cellFsStRead functions.","sha":"a31160fe9933ccfbfb827d3231cb0d0c2a8d978d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-03-11T17:57:31Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-03-11T17:57:31Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"9194b73a81c70ce96efca54bc300adf3e915cf34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-11T18:29:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-11T18:29:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #99 from xsacha/master\n\nLinux build fix","sha":"5c563d04c7073d97edb8d31a201f9a4447379003"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-03-11T18:52:14Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-03-11T18:52:14Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"disabled a few stuff and changed color to white before rendering to main window (fix fw_stencil_reflect)","sha":"c08c5eef10b87a9b256ba065f21d007aece0b04f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-03-11T19:00:21Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1371635?v=4","date":"2014-03-11T19:00:21Z","email":"elisha464@gmail.com","login":"elisha464","name":"elisha464"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"62f9d454ebeef02fa45bd4d687c3ac66e8b52dbf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-11T19:14:39Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-11T19:14:39Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #100 from O1L/master","sha":"fb1b57720c124f22d3d8148df61e6df5a64aba04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-12T22:34:35Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-12T22:34:35Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellGame functions & MULHD(U) warn. disabled","sha":"80cfb2eb580256184e875bfae08a76ff9d116fd0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-03-13T00:26:53Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-03-13T00:26:53Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved OpenAL audio output\nImplemented LDBRX PPU instruction\nEnabled FRSQRTE PPU instruction\nImproved Fragment Program Decompiler\nImplemented Log lvl selection","sha":"0e437312adb1b02c9e04292c1ba51f5d58acceed"}
+{"author":{"avatar":null,"date":"2014-03-13T09:17:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-13T09:17:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Update","sha":"8cc6a287a7a599df34581fbd937e45ef2ccc8685"}
+{"author":{"avatar":null,"date":"2014-03-13T09:18:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-13T09:18:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed conflicts","sha":"2de22f032117306d106f0feb88740f1f9c35483c"}
+{"author":{"avatar":null,"date":"2014-03-13T16:11:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-13T16:11:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_spinlock implemented","sha":"2c447f686dc575d3264b8b7a26eb2e829a9fc2bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-03-14T13:50:50Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-03-14T13:50:50Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Conflicts fixed.","sha":"50d49141b000f49e31801788cc307f2ab589a0bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-03-14T14:53:37Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-03-14T14:53:37Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Fixed crash on using NUll Audio Output, fixed possible crash in OpenAL exit and minor changes in cellAudioEventQueue functions.","sha":"b0f6b03c38016a5534235f17a2d2c0d1456f5f11"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-14T14:05:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-14T14:05:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #101 from O1L/master\n\nMinor changes.","sha":"48abfdfbb1db851a2af79459e0be6b303be970ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-14T17:12:12Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-14T17:12:12Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Minor changes\n\n* Fixed identation\n* Make some parts of the code more readable.","sha":"6c4a980d36f727340ca599b662178da250476173"}
+{"author":{"avatar":null,"date":"2014-03-14T23:15:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-14T23:15:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"024aa0660cf473cbde36ebca0326b84c7faec72d"}
+{"author":{"avatar":null,"date":"2014-03-15T15:43:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-15T15:43:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"DMA List commands\n\ncellAudio: multiple queue support\nsys_cond simplified\ncellFsMkdir (?)","sha":"60d922da110d71d3ab701fb8f4312687583670d2"}
+{"author":{"avatar":null,"date":"2014-03-15T16:03:55Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-03-15T16:03:55Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #102 from Nekotekina/master\n\nDifferent changes","sha":"65eb8735971ee1d9ba5978e052324f7b13d19b97"}
+{"author":{"avatar":null,"date":"2014-03-15T19:45:43Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-03-15T19:45:43Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Improved FRES and FRSQRTE results (tested with ppu_fpu).\n\nImplemented and improved several SC_Memory syscalls.\n\nStarted working in sceNp module.","sha":"c4a9c874d197a42ed99a520c6b0a3834fec7c282"}
+{"author":{"avatar":null,"date":"2014-03-15T20:37:29Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-03-15T20:37:29Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Added missing change.","sha":"0a35c4f2c4d01eab7036ee41f5bcb0d0d19b0611"}
+{"author":{"avatar":null,"date":"2014-03-15T20:46:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-15T20:46:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Thread Group-specific MMIO\n\nLS access, SNR writing","sha":"c9a421f12fc1d3fba39b73f15933297a8e0eec00"}
+{"author":{"avatar":null,"date":"2014-03-15T21:33:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-15T21:33:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Weird MFC_PUTR_CMD handling","sha":"4aa6ddf3dd62d8e83d74f49c4e99511ee106a8aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-16T12:49:05Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-16T12:49:05Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Linux build fix","sha":"a00f47b5e4e62b696e2ad2a86dde624760087521"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-16T15:15:41Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-16T15:15:41Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #103 from xsacha/master\n\nLinux build fix","sha":"39a717b23945e9a5ec763637650d5fe2a58d41fe"}
+{"author":{"avatar":null,"date":"2014-03-16T20:14:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-16T20:14:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Event flag partial implementation","sha":"1a1bed2258fdbd8552abc4718d9a92c2435c3c16"}
+{"author":{"avatar":null,"date":"2014-03-17T09:16:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-17T09:16:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"4cbe3a2a46b8335806cb5e6980784d5ecf11e50a"}
+{"author":{"avatar":null,"date":"2014-03-17T09:17:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-17T09:17:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge https://github.com/elisha464/rpcs3","sha":"475c3ff96794bb17bb17e98e77260d5a4aa06c20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-17T13:41:15Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-17T13:41:15Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Fix slashes for Linux","sha":"6968137bbcf58789a8ce2354fe47c57fa2bdc2db"}
+{"author":{"avatar":null,"date":"2014-03-17T15:07:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-17T15:07:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"event flag improvement (not finished)\n\nFixed empty SPU thread name issue","sha":"c4d9223034ff2be401d49794e603b2599ea02afd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-17T17:13:10Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-17T17:13:10Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #104 from xsacha/master\n\nFix some strings for Linux","sha":"9786c036d51798736fbc002854882d7480aab909"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-17T19:34:19Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-17T19:34:19Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellGame, cellSysutil and TRP installer improved\n\n* TRP Loader and sceNpTrophyRegisterContext improved.\n* cellSysutil constants moved to cellSysutil.h\n* cellGameBootCheck bug fixed that makes size->hddFreeSizeKB be 0.\n* Added system language selector (this is *not* RPCS3's language).\ncellSysutilGetSystemParamInt(0x111) will return the selected language.\n\nNOTE: The problems caused by the last commit (pull request #104 merged)\nare not yet fixed.","sha":"cf4501fe41685a14d29eca99c6e9c10b3262c640"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6977591?v=4","date":"2014-03-18T00:03:26Z","email":"kasper.augustyn@gmail.com","login":"kacek","name":"kacek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6977591?v=4","date":"2014-03-18T00:03:26Z","email":"kasper.augustyn@gmail.com","login":"kacek","name":"kacek"},"msg":"implemented  cellGcmsetTexture_BorderColor function","sha":"4b14c72ed850f60118f8cf5b3347861dc1490802"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6977591?v=4","date":"2014-03-18T06:20:59Z","email":"kasper.augustyn@gmail.com","login":"kacek","name":"kacek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6977591?v=4","date":"2014-03-18T06:20:59Z","email":"kasper.augustyn@gmail.com","login":"kacek","name":"kacek"},"msg":"cellGcmSetTexture_BorderColor fix","sha":"39dc6f0838a548135d371c85636e983b712c85ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-18T12:00:35Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-18T12:00:35Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #105 from kacek/master\n\nimplemented  cellGcmsetTexture_BorderColor function","sha":"fb38897b8f96144093dc523c695bfe59810320eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-18T16:45:26Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-18T16:45:26Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"TextureBorderColor & cellFont problems fixed\n\n* Fixed tabs/spaces problem in cellSysutil.h too.\n\nNOTE: The problem with cellFont (crash on line 604) has been fixed, but\nfor a high price: There is now a huge memory leak when a NULL pointer is\npassed to cellFontRenderSurfaceInit.","sha":"2601933bdc23f65bcbbebdb0f8426071941607de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-18T17:27:11Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-18T17:27:11Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Another small fix related with TextureBorderColor\n\nTODO: Find an appropriate place for setting the GL_TEXTURE_BORDER_COLOR\nparameter.","sha":"37f7a31a2274a0ddb1be152b7b0a5bf8570000c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-18T22:58:42Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-18T22:58:42Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add experimental subfme and subfze support and fix cache folder creation","sha":"2ddee26d834347441e9d5405ac045d392eec525d"}
+{"author":{"avatar":null,"date":"2014-03-19T00:32:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-19T00:32:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Audio decoding","sha":"38bfbe2c40ffa4359fcaad7a5b3386d4bfce2307"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-19T13:38:42Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-19T13:38:42Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"27bb41d6528f390a2ceb57b67c73ca3fbe7af63d"}
+{"author":{"avatar":null,"date":"2014-03-19T14:47:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-19T14:47:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"RLWIMI, RLWINM and RLWNM fixed","sha":"a520934abd716a264864812f82a394ed1030f9fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-19T15:19:35Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-19T15:19:35Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellHddGameCheck and some fixes\n\n* Fixed wrong endianness in several structs.\n* Fixed CreateFile-related bug in TRP Loader.\n* Added cellHddGame (cellSysutil) structs and cellHddGameCheck.","sha":"8c2aee5e643281cd09c6d84cfbb2573f9b5583d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-19T17:13:52Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-19T17:13:52Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"correct the subtraction instructions and try something more sensible for overflow detection","sha":"acf955635f168f2c8d7a32cbead545edbe227296"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-19T22:40:49Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-19T22:40:49Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix carry errors","sha":"5a1ce28105cd3154db2687b53e0f01d2b6b255c2"}
+{"author":{"avatar":null,"date":"2014-03-19T14:47:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-19T22:40:52Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"RLWIMI, RLWINM and RLWNM fixed","sha":"87e016bdf039fb222c82c118f340d010983e9534"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-19T23:10:12Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-19T23:10:12Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #108 from Bigpet/master\n\nadded SUBFME, SUBFZE and fix cache folder creation","sha":"cd4f0b2c686ee38364f76b52743664553d65bf9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-19T23:51:58Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-19T23:51:58Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"6e4203998a4837706cbdfe777b9e47036939b85b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-20T00:03:59Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-20T00:03:59Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #109 from Bigpet/master\n\nMissed carry flag corrections and the rotate fixes","sha":"f0129382b9160b5b4e98b1da87dac7f95ad1da35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-20T01:48:02Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-20T01:48:02Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"stswi and lswi instructions","sha":"f0e73a652fb6259ce9ac4e458543ed199c57a9df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-20T01:56:56Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-20T01:56:56Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #110 from Bigpet/master\n\nstswi and lswi instructions","sha":"834700eb24a0644d76d4eea8b2ede1982406d049"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-20T18:23:14Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-20T18:23:14Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"TROPUSR Loader & sceNpTrophy stuff\n\n* Added a loader for the TROPUSR.DAT files.\n* Added a few structs/enums to sceNpTrophy.h\n* Added more sceNpTrophy functions and updated other ones.\n* Updated cellHddGame error codes in cellSysutil.h\n* Added addresses of cellHddGame to cellSysutil_init.\n\nNOTE:  There is a known problem in the `if\n(!Emu.GetVFS().ExistsFile(filepath))` in `TROPUSRLoader::Load` which\ncauses the games to overwrite their TROPUSR.DAT file every time they\nboot and they \"forget\" the unlocked trophies. However, as long as the\ngame is running the unlocked trophies should be still there.","sha":"f86ac251a89e38eb73a15870eed3398fcf74ab56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-20T23:46:27Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-20T23:46:27Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Small fixes in sceNpTrophy and cellSaveData\n\n* Added cellSaveData.cpp to the project.\n* Fixed wrong cellSaveData structs.\n* Fixed compilation problem caused by the switch/case statements\nintroduced in sceNpTrophy and TROPUSR.cpp in the last commit","sha":"ad7ac17647018c3c06e8a166798d75f28bcda61c"}
+{"author":{"avatar":null,"date":"2014-03-21T09:02:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-21T09:02:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"cad7a0584808755b666b0912153c1e49867e42fc"}
+{"author":{"avatar":null,"date":"2014-03-21T09:45:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-21T09:45:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fix slashes for Windows :p","sha":"39d1e21802e6f13cf98a02c692bac3fed31fadeb"}
+{"author":{"avatar":null,"date":"2014-03-21T15:06:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-21T15:06:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ConLog unicode support improved","sha":"5ea58d9451c2af7884bb5d1fd74e47d0bcc5770a"}
+{"author":{"avatar":null,"date":"2014-03-22T01:08:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-22T01:08:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Demuxer improvement","sha":"169fcd098b02b44dd991bb76e8a5c499c084f71a"}
+{"author":{"avatar":null,"date":"2014-03-22T10:45:59Z","email":"dante38490@free.fr","login":null,"name":"Dante38490"},"committer":{"avatar":null,"date":"2014-03-22T10:45:59Z","email":"dante38490@free.fr","login":null,"name":"Dante38490"},"msg":"Update git-version-gen.cmd\n\nlittle change add adress website officiel","sha":"3701b2b551504b39d5a06be952125d221d3bb62f"}
+{"author":{"avatar":null,"date":"2014-03-22T11:08:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-22T11:08:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellAtrac draft\n\nsys_spu_thread_group_resume\nSome bugs fixed","sha":"d0ea397492e5efd4541137777a0580ef093dc23e"}
+{"author":{"avatar":null,"date":"2014-03-22T21:04:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-22T21:04:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SC_Lwcond fixed","sha":"be80a7c39ce888a7e2c76d460400a3c1bf81f1db"}
+{"author":{"avatar":null,"date":"2014-03-22T21:09:00Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-03-22T21:09:00Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #113 from Nekotekina/master\n\nPlayable video","sha":"d1ffea084720564e78c7d5a9d284a5f241c62211"}
+{"author":{"avatar":null,"date":"2014-03-23T19:43:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-23T19:43:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Minor fixes\n\ncellAtrac faked","sha":"7bab42455b1c857a7a150be6e9a4e54199619796"}
+{"author":{"avatar":null,"date":"2014-03-23T20:49:05Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-03-23T20:49:05Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #112 from Dante38490/patch-1\n\nUpdate git-version-gen.cmd","sha":"ea34cb52c1ffb73173643b05d1ba5abe2ede8018"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T12:40:35Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T12:40:35Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"msg":"Initialize strings through the initializer list in PPUProgramCompiler.h","sha":"874da27599cac2d29ea6f0be4b0f56a88c5caf91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T12:47:30Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T12:47:30Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"msg":"Minor const correctness","sha":"c00850c4c520c35ed7d28271f0cf8acb4ca5d7d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T12:53:34Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T12:53:34Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"msg":"Remove redundant assignment in RSXThread.\nThis is assigned the same value further down the function.","sha":"4db1f49aafbada07f46b65d9cec0a692be310599"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T13:03:37Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T13:21:17Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"msg":"Fix case where UTF16stoUTF8s in cellL10n.cpp would always fail out if compiled with Visual Studio.","sha":"8302e6c001afc2036bb25cc948be02d32a7a995a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T13:05:22Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T13:40:02Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"msg":"Fix erroneous duplicate condition check in cellSpursGetTasksetId.","sha":"68412301412ba60e292ca9b70ccdc1ef7bbe0d8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T13:08:32Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T13:40:25Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"msg":"Fix a missing return in an if statement in sceNpTrophyCreateContext.","sha":"90b83f6b3e89f863b424fd7c7f684f86315f03a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-24T14:32:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-24T14:32:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #114 from lioncash/misc-things\n\nMisc things","sha":"0ef0cfb38afba2af33777ac32d15eb55f1fb525d"}
+{"author":{"avatar":null,"date":"2014-03-24T15:28:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-24T15:28:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"9b1c0c97d3972d5ddda5ac4331431e651c0b7430"}
+{"author":{"avatar":null,"date":"2014-03-24T17:51:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-24T17:51:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small RSX fix","sha":"21d19ccd5935e90a049d9bc142f2ca4dd3f5e817"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T23:53:14Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-24T23:53:14Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Use const references for the string keys in Ini.cpp/.h","sha":"b8d3ce7ae8b91bf60f14593d059bea4f931efea5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-25T00:08:33Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-25T00:08:33Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Fix erroneous assignment in an if statement.\n\nShould have been a comparison.","sha":"a5d9c9033fcd1f348b8ef2dfc954db26e7ffa6af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-25T01:09:11Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-25T01:09:11Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #118 from lioncash/misc-things\n\nFix erroneous assignment in an if statement.","sha":"621edfb926a95640fc1c714e7836905fe731ec79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-25T01:11:56Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-25T01:11:56Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #117 from lioncash/const-references\n\nUse const references for the string keys in Ini.cpp/.h","sha":"31e1464e1ac0852781495972ad7b16f4aa2877ba"}
+{"author":{"avatar":null,"date":"2014-03-25T13:05:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-25T13:05:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Reservation improved","sha":"8a54f542d0e8f006dc3c49c8da3f237eb2f45e44"}
+{"author":{"avatar":null,"date":"2014-03-25T22:26:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-25T22:26:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"7f7a23027b3c7c6cc91659e5e6032cbe2a74770e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-21T14:07:05Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-26T00:23:06Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Linux build fix.","sha":"3e9cbb4a247ec49b230e710076a93ca981e0ac4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-26T00:29:17Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-26T00:29:17Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Fix an assign. Some other misc changes.","sha":"ebc6b9e66ef5d71c48f816db6413a4b1af7a427a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-26T09:02:03Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-26T09:02:03Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #120 from xsacha/master\n\nLinux build fix","sha":"c57d3af8dd8e90c5e55cb103c7731d2441556fbe"}
+{"author":{"avatar":null,"date":"2014-03-26T12:00:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-26T12:00:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"79c01316d68a1b5d9b9b0c838b3532d8e4c31d15"}
+{"author":{"avatar":null,"date":"2014-03-26T22:45:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-26T22:45:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Experimental libmixer\n\nadec, vdec improved\nfixed sound","sha":"994ce50392831426af55f5542b6897d186a7ab62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-26T23:25:12Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-26T23:25:12Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Use Push instead of AddCpy in CallStackBranch.","sha":"a7bc2034d023f8010500eecd36a65472a07db983"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-26T23:54:09Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-26T23:54:09Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Remove an unnecessary c_str call.","sha":"2185465d346ddbbc9e94ade7628038f93ff665cd"}
+{"author":{"avatar":null,"date":"2014-03-27T00:11:47Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-03-27T00:11:47Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #122 from lioncash/misc-things\n\nRemove an unnecessary c_str call.","sha":"f399ce68a22c691c1364d740a4581abea2853f18"}
+{"author":{"avatar":null,"date":"2014-03-27T00:12:04Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-03-27T00:12:04Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #121 from lioncash/stack\n\nUse Push instead of AddCpy in CallStackBranch.","sha":"457455b71ddbbb073b51cb7f5f9f2aea6823eeca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-27T01:12:45Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-03-27T01:12:45Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Linux build fix","sha":"9b0bcf0b54e27e28c647b16b8b20487d4a3de9a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-27T04:34:55Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-27T06:49:02Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Simplify some VFS-related code.","sha":"8e44bcdbda84dd33133ad02fcdf966ce98f3848d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-27T11:36:24Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-27T11:36:24Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"msg":"More specific log message for adecRawRead.\nWas previously logging as adecRead.","sha":"007f0f243755a0d5dbb023021d07deac45ce8b2b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-27T12:26:20Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-27T13:22:56Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"msg":"Make a some printfs into error log calls.","sha":"7f5412f4270ec75278722ca3478936177a6bcf6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-27T13:04:44Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-27T13:23:32Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"msg":"Fix a typo in a log message\nAlso moved a logging statement after an if statement check. We don't want to signify creation of something before checking its validity.","sha":"a5f35cc43780b3203842e7968c66aa8c3ad87ddd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-27T15:03:38Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-27T15:03:38Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #127 from lioncash/misc-things\n\nMinor logging changes.","sha":"7d3414c44c9bdc9c991b87607838580495201d80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-27T15:08:04Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-27T15:08:04Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #125 from lioncash/ui\n\nSimplify some VFS-related code.","sha":"c541176a3206bfbef62a15eba3023ccbfd23f234"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-27T15:40:58Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-27T15:40:58Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Minor fixes\n\n* Modified some .gitignore's\n* Removed some #include <vector>'s\nand other stuff...","sha":"1fd42c34c25b343c70adc5b776a2af01c4e67dde"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-27T22:17:59Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-27T22:17:59Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #124 from xsacha/master\n\nLinux build fix","sha":"64145d7d628abfa114b1c93463e027253850095b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3304040?v=4","date":"2014-03-28T01:57:28Z","email":"acmiyaguchi@gmail.com","login":"acmiyaguchi","name":"Anthony Miyaguchi"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3304040?v=4","date":"2014-03-28T01:57:28Z","email":"acmiyaguchi@gmail.com","login":"acmiyaguchi","name":"Anthony Miyaguchi"},"msg":"Quick one line change fixes a hang after failing to run an *.elf file and stopping the emulator via the Stop button.","sha":"544bacf54e1456ecd51571fe6045323598967264"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/181182?v=4","date":"2014-03-28T02:50:30Z","email":"mrnohbdy@gmail.com","login":"nohbdy","name":"nohbdy"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/181182?v=4","date":"2014-03-28T03:16:14Z","email":"mrnohbdy@gmail.com","login":"nohbdy","name":"nohbdy"},"msg":"Minor code and memory initialization fixes\n\n* Explicitly initialize member variables in SELFDecrypter, MemInfo, and\nVirtualMemoryBlock\n* Zero out memory used for counter/nonce in aes-ctr\n* Fix use of a ControlInfo pointer after it is added to an Array via\nArray::Move (which makes it an invalid pointer) in\nSELFDecrypter::LoadHeaders","sha":"d533572ee92ac60cf04942102c3eed0071f5897a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-28T04:20:13Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-28T04:20:13Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"PSF Loader improved & issue #126 fixed\n\n* Improved PSF Loader: Now you can get the value of the PARAM.SFO\nentries directly with the GetString(key), GetInteger(key) methods.\nGameInfo related lines were removed since they have nothing to do with\nPSF files.\n* cellGame, cellSysutil, and GameViewer are modified because of the PSF\nLoader changes.\n* Removed unnecessary null pointer checks:\nhttps://github.com/DHrpcs3/rpcs3/issues/126","sha":"2c7269e3de196388d67cb44c4f302a71fc54972e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-28T04:32:24Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-28T04:32:24Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Reverted ConLog changes of commit 5ea58d94\n\nThis was causing a \"Bad flip!\" error on Arkedo Series 02 Swap!. I guess\nwe will have to search for a better solution. I just reverted the\nConLog.cpp / ConLog.h files.\n\nRelated commit:\nhttps://github.com/DHrpcs3/rpcs3/commit/5ea58d9451c2af7884bb5d1fd74e47d0bcc5770a","sha":"950fcfe4ef6da8aad5198fc12b029862545cfc4e"}
+{"author":{"avatar":null,"date":"2014-03-28T04:52:51Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-03-28T04:52:51Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #129 from acmiyaguchi/master\n\nFix a hang after failing to run an *.elf file and stopping emulator","sha":"e03b68f12f155feeb6d8627e4fb312cdd57a4eca"}
+{"author":{"avatar":null,"date":"2014-03-28T04:53:28Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-03-28T04:53:28Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #130 from nohbdy/bugfix\n\nMinor code and memory initialization fixes","sha":"98b4a35fb5950c26abca386a427d0261708a8263"}
+{"author":{"avatar":null,"date":"2014-03-28T08:47:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-28T08:47:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"bad_flip issue fix","sha":"70cc2494aa16d6cc170bb7a5ba486a594e480713"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1319813?v=4","date":"2014-03-28T11:33:51Z","email":"benanderson@acidic.co.nz","login":"bagedevimo","name":"Ben Anderson"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1319813?v=4","date":"2014-03-28T11:33:51Z","email":"benanderson@acidic.co.nz","login":"bagedevimo","name":"Ben Anderson"},"msg":"x11 fix","sha":"b36a5a95f087d7212e376c9c4c28a43b6fef5376"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-28T12:03:54Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-28T12:03:54Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #131 from bagedevimo/x11\n\nFixes X11 threading issue, under Linux","sha":"5bf70afb217e74373884a7e0173ef83ee74417a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-03-28T17:17:44Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-03-28T17:17:44Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"GUI: some changes in Config -> Settings","sha":"1be14f818a3f973e68e67bbbea82781316899b9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-28T18:37:32Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-28T18:37:32Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #132 from O1L/master\n\nGUI: Config -> Settings menu reworked.","sha":"64b80f5a2e2e147838dc27613bde2732267bbb42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-28T19:06:15Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-28T19:06:15Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellSaveData* progress & reverted commit 950fcfe\n\n* Reverted commit\nhttps://github.com/DHrpcs3/rpcs3/commit/950fcfe4ef6da8aad5198fc12b029862545cfc4e\n(Reverted ConLog changes) that fixed the \"Bad flip!\" error since there\nis a better way of solving it. It will be fixed soon.\n* Moved cellSaveData to cellSysutil (but preserving the functions in a\nseparated file named: cellSysutil_SaveData.cpp).\n* Progress on cellSaveDataList* functions.\n* Added a small margin to the new Settings dialog. :-)","sha":"503c24453a988d08646d66ce1d88ca92c41c0fb7"}
+{"author":{"avatar":null,"date":"2014-03-28T22:50:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-28T22:50:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Minor fixes\n\nLibmixer: additional patterns","sha":"689c41ccb32b3772488c6abe9fa9d588a8eeaf16"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1319813?v=4","date":"2014-03-29T00:52:27Z","email":"benanderson@acidic.co.nz","login":"bagedevimo","name":"Ben Anderson"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1319813?v=4","date":"2014-03-29T00:52:27Z","email":"benanderson@acidic.co.nz","login":"bagedevimo","name":"Ben Anderson"},"msg":"Fixes invalid conversion from wxStringConst, to std::string under gcc-4.8","sha":"6141c33630079684316039d77078ccd32f9ec3ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-29T06:05:57Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-29T06:05:57Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #133 from bagedevimo/fix\n\nFixes invalid conversion from wxStringConst, to std::string under gcc-4-8","sha":"a7fbd5c9b6c840564fd800c45bdbb5b31076bf74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1319813?v=4","date":"2014-03-29T07:52:39Z","email":"benanderson@acidic.co.nz","login":"bagedevimo","name":"Ben Anderson"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1319813?v=4","date":"2014-03-29T07:52:39Z","email":"benanderson@acidic.co.nz","login":"bagedevimo","name":"Ben Anderson"},"msg":"Commenting out all of this, should fix the pathing glitches on *nix, without breaking windows functionality.","sha":"b317b2fedaced7ba2556886ff2ae51c63643f7d5"}
+{"author":{"avatar":null,"date":"2014-03-29T08:04:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-29T08:04:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"98024cbb01b340280fbeac2ca03667010d73280c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1319813?v=4","date":"2014-03-29T08:11:43Z","email":"benanderson@acidic.co.nz","login":"bagedevimo","name":"Ben Anderson"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1319813?v=4","date":"2014-03-29T08:11:43Z","email":"benanderson@acidic.co.nz","login":"bagedevimo","name":"Ben Anderson"},"msg":"Added call to GlewInit() under *nix, should fix cairo display crashes.","sha":"e24027eccb3525aede831396bf6abbbc519ee0b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-29T08:50:26Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-29T08:50:26Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #135 from bagedevimo/path-fix\n\nNix Path fix.","sha":"4c6aa348101e0884e46baff7c192ca060e4877b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1319813?v=4","date":"2014-03-29T14:15:46Z","email":"benanderson@acidic.co.nz","login":"bagedevimo","name":"Ben Anderson"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1319813?v=4","date":"2014-03-29T14:15:46Z","email":"benanderson@acidic.co.nz","login":"bagedevimo","name":"Ben Anderson"},"msg":"Fixes GL fix, which was broken. Added -g flag to cmake, so we can have debug builds.","sha":"84c93237509dde98abd8c4ad14d701bf2c88957a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1319813?v=4","date":"2014-03-29T14:21:41Z","email":"benanderson@acidic.co.nz","login":"bagedevimo","name":"Ben Anderson"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1319813?v=4","date":"2014-03-29T14:21:41Z","email":"benanderson@acidic.co.nz","login":"bagedevimo","name":"Ben Anderson"},"msg":"Fixes null ptr in gcc, probably to do with operator precedence. @Bigpet was all over this one.","sha":"33f7f37ca7b737f8de2bd4e04da28aebfcf91de1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-29T15:26:08Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-29T15:26:08Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #138 from bagedevimo/nix-fix\n\nMore *nix fixes.","sha":"7804c565845466416a879da87082092f98550e1a"}
+{"author":{"avatar":null,"date":"2014-03-29T16:49:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-29T16:49:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"72bb0c842f360797f0a6167eb53f24aca7977da3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-29T20:13:05Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-29T20:13:05Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Fix missing unary increment operator in DisAsmFrame","sha":"d6bcf14cc0f518460fbf88473d026b7a7124aca7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-29T20:28:39Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-29T20:28:39Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Memset the ringbuffer in m_fs_config by the size of the actual ringbuffer struct, not FsRingBufferConfig.","sha":"12b627fa9cf0d7737edf733a40c4d71469a84049"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-29T23:15:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-29T23:15:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #140 from lioncash/misc-things\n\nFix missing unary increment operator in DisAsmFrame","sha":"3e328cdea51c0290cc6e20cce6ebfbbcaf457868"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-29T23:18:02Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-29T23:18:02Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #141 from lioncash/bounds\n\nMemset the ringbuffer in m_fs_config by the size of the actual ringbuffer struct, not FsRingBufferConfig's size..","sha":"ae5d06d4be9e42721ee41dc08959019995a03775"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-30T04:08:16Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-30T04:08:16Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Fix a case where m_hdd_file is passed to m_file uninitialized.\n\nDue to the way initializations work in C++, despite the order of the initializations in the initialization list, it will actually do the initializing in the order the class variables are defined.","sha":"479ef45aec6ef6a485a1292ac744ca5b6229c2e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-30T04:13:00Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-30T04:13:00Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Move VHDDManager over to using vector. Also fix some variable and function name typos.","sha":"b9de74f5c674df05324618d7728b74ed31fd9a4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-30T10:23:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-30T10:23:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #142 from lioncash/hdd\n\nMisc HDD stuff","sha":"e6aa1a9553bdcb0fc42a866487351132349ce8a5"}
+{"author":{"avatar":null,"date":"2014-03-30T11:59:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-30T11:59:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Audio mixing fixed\n\nLibmixer reseen\nSome bugs fixed","sha":"fce074d812b87836dea43861619ab78ea541e8de"}
+{"author":{"avatar":null,"date":"2014-03-30T18:53:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-30T18:53:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Downmixing/upmixing","sha":"9e2561d12175c8297cca7e3bf74d32c1d1a1514a"}
+{"author":{"avatar":null,"date":"2014-03-30T20:09:49Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-03-30T20:09:49Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Updated the crypto engine:\n\n- Updated AES and SHA-1 source code;\n- Fixed a few code warnings;\n- Implemented EDAT/SDAT decryption.\n\nStarted SPURS implementation:\n- Added an internal SPURSManager class draft;\n- Added several drafts for cellSpurs functions.\n\nImplemented key.edat decryption in sceNpDrmIsAvailable:\n- NOTE: Currently, the decrypted key.edat is stored under dev_hdd1/titleID and the user must replace this file in dev_hdd0. This behavior will change in the future as it's currently intended for controlled testing only.","sha":"196c2ffe5bc628e236d0e18f4b77a12d948b4d42"}
+{"author":{"avatar":null,"date":"2014-03-30T20:43:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-30T20:43:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"2d955dc2975b4de2ef4e2b0d6099e60064bca069"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3304040?v=4","date":"2014-03-30T22:58:51Z","email":"acmiyaguchi@gmail.com","login":"acmiyaguchi","name":"Anthony Miyaguchi"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3304040?v=4","date":"2014-03-31T00:54:34Z","email":"acmiyaguchi@gmail.com","login":"acmiyaguchi","name":"Anthony Miyaguchi"},"msg":"Organized the cellGcmSys_init() functions in a more sane manner.","sha":"a62552b0861771a49b2bd99f4d3a8af8ba95797d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3304040?v=4","date":"2014-03-31T00:02:27Z","email":"acmiyaguchi@gmail.com","login":"acmiyaguchi","name":"Anthony Miyaguchi"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3304040?v=4","date":"2014-03-31T00:54:57Z","email":"acmiyaguchi@gmail.com","login":"acmiyaguchi","name":"Anthony Miyaguchi"},"msg":"Reordered functions for organization.","sha":"eab81deb2791837e04d4a002198e818bdea9783b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3304040?v=4","date":"2014-03-31T00:25:55Z","email":"acmiyaguchi@gmail.com","login":"acmiyaguchi","name":"Anthony Miyaguchi"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3304040?v=4","date":"2014-03-31T00:56:03Z","email":"acmiyaguchi@gmail.com","login":"acmiyaguchi","name":"Anthony Miyaguchi"},"msg":"Function declaration at top needed for another function.","sha":"b571f14fe467451013b189bfdf3aadcec997bd71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3304040?v=4","date":"2014-03-31T01:01:51Z","email":"acmiyaguchi@gmail.com","login":"acmiyaguchi","name":"Anthony Miyaguchi"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3304040?v=4","date":"2014-03-31T01:01:51Z","email":"acmiyaguchi@gmail.com","login":"acmiyaguchi","name":"Anthony Miyaguchi"},"msg":"Added cellGcmSetUserHandler that already existed but was never added.","sha":"2106fb83b26f1d9cfb1d9cf64c936dd1ea68c684"}
+{"author":{"avatar":null,"date":"2014-03-31T06:19:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-31T06:19:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Little fix","sha":"9afbbfad0a04f89eb85bff623f6c60f3bf338460"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-03-31T06:59:16Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-03-31T07:00:30Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"Add FindGLEW to CMake modules along with some compiler flags","sha":"800769308430afb19f42bb642820c918e66bdea3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-03-31T07:55:27Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-03-31T07:55:27Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"Rename xor to xor_ to allow build to continue in compliant compilers","sha":"61d0e4ee54de3fb9c122eb8dad6dcefed092e504"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-31T09:18:40Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-31T09:18:40Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #144 from acmiyaguchi/gcm\n\nReorganize cellGcmSys module","sha":"66ec7c0d632c4ce5c02804faceaee08ea4bf6578"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-31T09:23:17Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-31T09:23:17Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #146 from darkf/stuff\n\nAdd FindGLEW to CMake build and fix naming error","sha":"8011cc8ec4e426b4634a7cec039ac298adbd8a05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-31T10:04:34Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-31T10:04:34Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #145 from Nekotekina/master\n\nFixed conflicts.","sha":"01dbb8eb9af3aa924274c985abf2e3b2920810d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-31T12:56:24Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-31T12:56:24Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"msg":"Fix some memory leaks in unedat.cpp.","sha":"e47e37a8d285776a804116b45cfb4fd51a74ae25"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-31T12:59:52Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-31T12:59:52Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"msg":"Fix variable typos in unedat.cpp\nAlso fixed possible uninitialized variable usage. Initializes length to zero.","sha":"c4b64c8d9f93c76844c4cd0f652406245e353f79"}
+{"author":{"avatar":null,"date":"2014-03-31T14:38:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-03-31T14:38:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"24becb93250c75aaae94c22101c3ea1c13213e06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-30T07:40:52Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-31T15:35:04Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"upgrade to VS2013       to use variadic templates for type safe printing","sha":"8a000940daafe9823367b37d3635171c9ce901b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-30T11:26:01Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-03-31T15:35:05Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix implicit conversion error","sha":"b1894ac6cbaf2fcd834a12fbfbcadad519f3b302"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-31T18:30:07Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-31T18:30:07Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellSaveData* (cellSysutil) improvements\n\n* cellSaveData improvements: cellSaveDataListLoad2 should work perfectly\n(ignoring the fact that there is no dialog, and the first entry is\nchosen automatically). cellSaveDataListSave2 has improved too. Some code\nrefactoring is required though.\n* Reverted (deleted) Emu/SysCalls/Dialogs/ folder which I accidentally\nincluded while merging Nekotekina's branch (including minor SaveData\nchanges).\n* Modified some small things in cellGcmSys.","sha":"a09ad031ec9210156cab5dc74826d4cbd4c1db4e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-31T19:41:24Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-03-31T19:41:24Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #147 from lioncash/mem-leaks\n\nFix some memleaks in unedat.cpp","sha":"fa4473de497d87c696ad0b6038ebf3f55ebee718"}
+{"author":{"avatar":null,"date":"2014-04-01T08:19:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-01T08:19:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"7c79631609a34ea3bc99fb6a62183e591fe15252"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T00:33:55Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T14:23:03Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"replace all instances of wxString with std::string in all cases not\ndirectly involved in either the GUI or other wxWidget classes like wxFile","sha":"8ac226ae6913153479d7f69bc90f3e2cfe6acf5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T15:22:57Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T15:22:57Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"remove redundant c_str -> string -> c_str conversions","sha":"febe8624bfe0a0585600bfb17fd35767a7667c9b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-01T16:25:33Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-01T16:25:33Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #153 from Bigpet/wxString_exorcism\n\nwxString exorcism","sha":"bc095322c31aa3019d76349237f2c6cf804a44bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T17:19:51Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T17:19:51Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"correct some merge error that happened from automatic git merging","sha":"bcb9ad94c1bf73770957bd6977df7ab7de8bcbd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T17:01:42Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T17:25:22Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"remove some wxString references I missed","sha":"02729695ffd203f62683e2ae07424468a8702cb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-01T17:40:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-01T17:40:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #155 from Bigpet/wxString_exorcism\n\nWx string exorcism fixups","sha":"2ab8aa173d400c1d0891a7bd88e63777737263df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T17:44:38Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T17:44:38Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"blantant test code removal  well this is embarassing, VS didn't recompile it, so I didn't notice the mistake","sha":"69352206b6557282d16927415a87500f152e4ff6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T18:13:22Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T18:13:22Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"remove dummy alias in strfmt. Fix some wxString remnants, that only make problems in Linux","sha":"373ae6b1072dd9dbb8ea133f1ccb022a06fa647a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T18:27:58Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-01T18:27:58Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix indentation","sha":"748aa6fce88e226ab2586d49b449219d5b0ddd9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-01T18:30:44Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-01T18:30:44Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #156 from Bigpet/wxString_exorcism\n\nFix static placeholder test.","sha":"4857e86cdc4558cc1ec407505260f46147a968ec"}
+{"author":{"avatar":null,"date":"2014-04-01T20:04:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-01T20:04:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Audio sync fix\n\nLibmixer: SSPlayer draft\nDetection fixed\nMacros for function substitute registration","sha":"d2ca1cc25a2593f05a072e7cf816bb28457f45dc"}
+{"author":{"avatar":null,"date":"2014-04-01T20:05:54Z","email":"dante38490@free.fr","login":null,"name":"Dante38490"},"committer":{"avatar":null,"date":"2014-04-01T20:05:54Z","email":"dante38490@free.fr","login":null,"name":"Dante38490"},"msg":"Update rpcs3.sln","sha":"d1219b0dc8fb67ca0a994e1fc0d1365ca8652bc1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-01T21:31:10Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-01T21:31:10Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #157 from Dante38490/patch-4\n\nUpdate rpcs3.sln on VS 2013","sha":"c294f5318fa4b380826e9d19f0844ed56cb2ef7e"}
+{"author":{"avatar":null,"date":"2014-04-02T08:37:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-02T08:37:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"e2e8980194ab3b85793a02b5dec19cf269e126c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-02T11:59:20Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-02T13:58:47Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Move PPUProgramCompiler to vector","sha":"b3e0441940b063a4ba1ffebdf7211cd3282ed912"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-02T12:31:32Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-02T14:21:16Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Minor simplifications to PPUProgramCompiler","sha":"990fca3e7baaffe0de19e2350a48a9761c52b938"}
+{"author":{"avatar":null,"date":"2014-04-02T15:17:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-02T15:17:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix (cellAudio, fsAioRead)\n\nlibsynth2 draft","sha":"b6d8f1e0280b8592e8c0cbc56c09be3e53d044a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-02T15:57:50Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-02T15:57:50Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Gui logging in main thread\n\nDo the logging to the GUI log element in the main thread. Not doing this\ncauses issues with the GTK backend of wxWidgets. Plus it's just common\nsense to try to limit gui calls to one thread.","sha":"dad82aa1eb0914ee7dcafcb7a4f7d572693dd33a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-02T17:53:44Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-02T17:53:44Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellPngDec fixes and some rewritings\n\n* This commit solves the cellPngDec GetMemFromAddr(0x0) error when\nloading PNGs from files.\n* cellVideoOutGetResolution, cellRtc* syscalls rewritten to use the use\nthe mem*_t data types.\n* Replaced int/uint with s32/u32 in some syscall arguments and structs.","sha":"81cdaa883a72190ee892fb35c32456de9ee6320d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-02T17:57:02Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-02T17:57:02Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #159 from lioncash/vector\n\nMove most of PPUProgramCompiler over to vector","sha":"2c2ee023b509d29524d8c1aea1f25bbad619c3df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-02T17:58:34Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-02T17:58:34Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #160 from Bigpet/master\n\nGui logging in main thread","sha":"fc9a90e2209cdcc465992bb13739e21bfb0e073f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-02T18:23:37Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-02T18:30:30Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Reorganize the VS project.\n\nPuts all the headers with the corresponding cpp file instead of having every include in a single folder.\n\nAlso added headers that weren't included previously.","sha":"bb40c0a71aadd371533ddde0d6dc13f57f855f36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-02T18:39:39Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-02T18:42:25Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Fix the build.","sha":"1aff35f6691bec1bb6581ec1cd0e90d3cb2b1f0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-02T19:02:41Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-02T19:02:41Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #162 from lioncash/build-fix\n\nFix the build.","sha":"91958ce1cbb4413083c705463e4c814a35249c19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-02T23:24:39Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-02T23:32:07Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Stub some sceNp funcs","sha":"2a83af6dbf86ffba6f21250062e0555c6d354954"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-03T00:55:44Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-03T00:55:44Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #164 from lioncash/stubs\n\nStub some sceNp funcs","sha":"262607c83d37e19b7c24d826a6293e3b847f1e41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-03T01:37:45Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-03T02:02:43Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Add a parameter check to some Gif/Jpg/Png decoding syscalls","sha":"9d0dd4c7cfc0ea791bed98e90b2341f0c77da50a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-03T02:06:51Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-03T02:06:51Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #165 from lioncash/misc\n\nAdd a parameter check to some Gif/Jpg/Png decoding syscalls","sha":"01b5681dc85b488b9b3cb9934a7f3bc75160e3e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-03T02:20:12Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-03T02:20:12Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"lv2 sc_table edited & FP recompiler ddx/ddy fix\n\n* Replaced ddx/ddy with dFdx/dFdy in FP recompiler.\n* SysCalls table edited. It should now be easier to read / edit. Tell me\nif you disagree with this.","sha":"7093852fa02c69a038fb01fe8fc6e5c55c9950c9"}
+{"author":{"avatar":null,"date":"2014-04-03T11:01:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-03T11:01:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSync: global mutex avoided\n\ncellAudio: level bug fixed","sha":"1e0259890316ffe7ebbc78e4db6c7528d7fc73fa"}
+{"author":{"avatar":null,"date":"2014-04-03T12:11:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-03T12:11:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"fb9dbfab3a328e1f5a08b9152a34004b847b2808"}
+{"author":{"avatar":null,"date":"2014-04-03T20:46:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-03T20:46:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"AudioDumper: 8ch output","sha":"24eb97f28712b9bed50f5227e6f1a78f1856cd35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-04T07:24:28Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-04T07:28:00Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"Implement/stub cellSysutilGetBgmPlaybackStatus","sha":"4d4b6c0895f0ec3ffb027ba9754626f943b61a10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-04T09:32:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-04T09:32:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #168 from darkf/sysutil\n\nImplement/stub cellSysutilGetBgmPlaybackStatus","sha":"e25796f0d012fea1d8d354e84684b54ed1ac3480"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-04T13:25:38Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-04T13:25:38Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"msg":"Use spaces for vertical alignment","sha":"d0c9d7c0ae04d55647a395e1555314ca7cdcbce1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-04T14:01:57Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-04T14:01:57Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #169 from lioncash/tab-fixes\n\nUse spaces for vertical alignment","sha":"dcb9d53e6ddbfd8a7d8b1d059f3a728b11fd38ba"}
+{"author":{"avatar":null,"date":"2014-04-04T14:43:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-04T14:43:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"c6c6dbe546cf44d96c2ee8407bbf29a505a6b9c6"}
+{"author":{"avatar":null,"date":"2014-04-04T15:36:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-04T15:36:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"asmjit submodule added","sha":"82edd111e93e7d2db7f7f8b658715e60ee5c4089"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-04T15:55:09Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-04T15:55:09Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #170 from Nekotekina/master\n\nAudio fixes","sha":"3bcf5d155742dd0ae5d5f48ee283350305ec0a8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/691945?v=4","date":"2014-04-05T10:17:32Z","email":"nmzik@mail.ru","login":"Nmzik","name":"Nmzik"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/691945?v=4","date":"2014-04-05T10:17:32Z","email":"nmzik@mail.ru","login":"Nmzik","name":"Nmzik"},"msg":"Test","sha":"3243c4c0c846b7b481f12d080bb7099116942d9b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-04-05T14:26:45Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-04-05T14:26:45Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"GUI: Pad Settings dialog reworked.","sha":"bbbe2f8916dcb9263a0050d86d012e1e9d649d32"}
+{"author":{"avatar":null,"date":"2014-04-05T16:30:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-05T16:30:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Working on simple SPU JIT\n\nNo, it doesn't work.","sha":"4a9310755f55648bffdf84df9f6d38661b06c968"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-05T19:46:56Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-05T19:46:56Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Fix two parameter sanity checks in sceRtc.","sha":"842a6fe1d4eed3e171ffef0521c2775fbedd6076"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-06T13:00:26Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-06T13:00:26Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #173 from lioncash/misc\n\nFix two parameter sanity checks in sceRtc.","sha":"039dd480da00ffb1204f0d47d160292ad8b20a14"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/905208?v=4","date":"2014-04-05T00:36:22Z","email":"eriksson.monteiro@ua.pt","login":"eriksson","name":"Eriksson Monteiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/905208?v=4","date":"2014-04-06T13:25:53Z","email":"eriksson.monteiro@ua.pt","login":"eriksson","name":"Eriksson Monteiro"},"msg":"remove trailing commas in arrays","sha":"d7dc9386537a1dafb9d456e2c9300481bbda69b4"}
+{"author":{"avatar":null,"date":"2014-04-06T15:08:07Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-04-06T15:08:07Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #171 from Nmzik/master\n\nMinor improvement","sha":"f76e1630b40de65be56a94f560615c7a92234e0f"}
+{"author":{"avatar":null,"date":"2014-04-06T15:17:07Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-04-06T15:17:07Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #172 from O1L/master\n\nGUI: Pad Settings dialog reworked.","sha":"d0b249fbca989fe11913ed990cabff6f472fcd3c"}
+{"author":{"avatar":null,"date":"2014-04-06T19:23:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-06T19:23:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU JIT WIP","sha":"e614a7313c7ad4b1fbefb48431835d5f3baf29ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/691945?v=4","date":"2014-04-06T19:47:21Z","email":"nmzik@mail.ru","login":"Nmzik","name":"Nmzik"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/691945?v=4","date":"2014-04-06T19:47:21Z","email":"nmzik@mail.ru","login":"Nmzik","name":"Nmzik"},"msg":"added 2 functions","sha":"f9e6230ead20e07b77d2d32dd032e0315624ada8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-06T19:58:58Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-06T19:58:58Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #174 from Nmzik/master\n\nAdded 2 new functions","sha":"b6cda331c0af24ac5c7b63239408b59b3d329684"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-06T20:59:05Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-06T20:59:05Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #161 from lioncash/vs\n\nReorganize the VS project.","sha":"8798b05e1f6af4f9132b77d11a7e78a59235fc42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/905208?v=4","date":"2014-04-06T21:35:36Z","email":"eriksson.monteiro@ua.pt","login":"eriksson","name":"Eriksson Monteiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/905208?v=4","date":"2014-04-06T21:35:36Z","email":"eriksson.monteiro@ua.pt","login":"eriksson","name":"Eriksson Monteiro"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 into nx-dbgoutput","sha":"5a5edf17fd4547b5736d0e0abc6adabb59b662be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/905208?v=4","date":"2014-04-06T21:51:36Z","email":"eriksson.monteiro@ua.pt","login":"eriksson","name":"Eriksson Monteiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/905208?v=4","date":"2014-04-06T21:51:36Z","email":"eriksson.monteiro@ua.pt","login":"eriksson","name":"Eriksson Monteiro"},"msg":"replace CLK_TCK for CLOCKS_PER_SEC","sha":"e65d1a3dd91c9cc6acbb28c593cae2b149e77f54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-31T13:32:42Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-07T03:46:58Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Disallow inheriting of the null and windows mouse/keyboard/pad handlers. These aren't intended to be further extended.","sha":"26e80a18b4aa2cb7d35e997763999ec03d12d233"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-03-31T14:18:44Z","email":"mathew1800@gmail.com","login":"lioncash","name":"lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-07T03:46:59Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Move Keyboard/Mouse/Pad handlers over to using vector.","sha":"c5a7946a24b9b6fae73d7a141d57c2afb1f52f25"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-01T00:02:27Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-07T03:46:59Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Move the mouse/keyboard/pad handlers over to using unique_ptr as the underlying base.","sha":"3c5e3fa85385974a4a5a0d0740a2ee7c358b5144"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-07T03:45:11Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-07T03:47:00Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Fix stupid mistake I made with rebasing.\n\nAccidentally overwrote the Pad handler stuff for windows. Should be fixed now.","sha":"d36da21d6f5da9a717d0a19468b94b11b2e1e0c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-07T07:49:09Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-07T07:49:09Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #150 from lioncash/unique-ptr\n\nMisc cleanup of the Io stuff.","sha":"f45223563cc1317fa12f24fa8eede0faeca1c273"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-07T12:40:50Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-07T12:40:50Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed error in SC_Pad.cpp and Readme.md updated","sha":"9e40247af0bc94123f80a753c8f1bffc69784113"}
+{"author":{"avatar":null,"date":"2014-04-07T13:06:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-07T13:06:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU JIT fix\n\nNothing changed in interpreter.","sha":"f9b68bc01266847201d9f255f785b4af3c09b843"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-07T15:41:58Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-07T15:48:30Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Fix typo in SUBFZE for the PPUInterpreter.","sha":"f019bd995a5df67bd2879e96597b38d0f5ad649c"}
+{"author":{"avatar":null,"date":"2014-04-07T18:27:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-07T18:27:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU JIT: more asm","sha":"4e9dc8ab9c34813c270031979235c5ae1f3e98d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-07T19:21:38Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-07T19:21:38Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #176 from lioncash/ppu-typo\n\nFix a typo in SUBFZE for the PPUInterpreter.","sha":"1975b7e139b183bd4a58069523469110598e6918"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/905208?v=4","date":"2014-04-07T23:41:09Z","email":"eriksson.monteiro@ua.pt","login":"eriksson","name":"Eriksson Monteiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/905208?v=4","date":"2014-04-07T23:41:09Z","email":"eriksson.monteiro@ua.pt","login":"eriksson","name":"Eriksson Monteiro"},"msg":"fix trailing comma in array","sha":"3cb18ac5a92c64882915b7b754df8b1b31ebfd0f"}
+{"author":{"avatar":null,"date":"2014-04-08T15:10:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-08T15:10:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some bugs fixed","sha":"33f7afd6e606ba8005c4e042bcba8ef277a9b29a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-08T17:29:17Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-08T17:41:47Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Various warning fixes and devirtualization\n\n* Remove ArrayString\n* devirtualize GetCount and SetCount, they're no longer needed\n* set storage duration of fmt::placeholder to extern to be consistent\n* make length unsigned and the return value of sprintf signed\n* remove dead code \"s.Close()\" is never reached\n* devirtualize WrteToLog()\n* devirtualize Ini functions","sha":"406695097563592e66b4fca95bcab4f0b37c4ebf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-08T18:05:55Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-08T18:05:55Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #175 from eriksson/nx-fixes\n\n*nix fixes","sha":"ce1b6039acdca4de5252be6bc9a515741a8beed5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-08T18:06:20Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-08T18:06:20Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #177 from Bigpet/minifix\n\nVarious warning fixes and devirtualization","sha":"e89ecd192bbc7a64890d42969b090dbf31728569"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-08T19:44:11Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-08T19:47:02Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Remove GCC specific variadic macro syntax","sha":"10ca726752543b1a149a675dcb91abf8d4796fa9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-08T19:59:25Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-08T19:59:25Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #178 from Bigpet/master\n\nRemove GCC specific variadic macro syntax","sha":"930d507d43239144358e070cbb18e1283901fd29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-09T16:23:14Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-09T16:23:14Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellSaveData* improvements\n\n* cellSaveDataFixedSave2 and cellSaveDataFixedLoad2 implemented. Still a\nlittle buggy.\n* Small fix the cellSaveDataList(Save|Load)2 problem in Disgaea D2 and\nother games.\n\nNOTE: cellSysutil_SaveData.cpp is a total mess: some blocks of code\nappear in all the syscalls. I just want to wait until most of the\nSaveData functions are implemented and working to do some serious\nrefactoring.","sha":"8183ee4d563f1aebd0a227a6e331201ce63c3459"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-04-09T19:57:26Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-04-09T19:57:26Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Implemented small tool for generating id of HLE-Function. Fixed small issue in PADManager dialog.","sha":"770ebaf271d363b2f00ce044338e459f53a74220"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-04-09T20:42:50Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-04-09T20:42:50Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"I just forgot to do it...","sha":"0763e429b8d2668c9d6008640c06cbf62d00911f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-09T21:59:29Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-09T21:59:29Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #179 from O1L/master\n\nMinor fix in GUI an other changes.","sha":"c8d842827549c44cfd153f92c1236fc87e9bcb46"}
+{"author":{"avatar":null,"date":"2014-04-09T22:00:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-09T22:00:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"a7057f5205d88e3e577f6a0615f97810202b051e"}
+{"author":{"avatar":null,"date":"2014-04-11T08:33:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-11T08:33:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"e56bb1b6757d34abf46531cc7ac74726010466c0"}
+{"author":{"avatar":null,"date":"2014-04-12T10:27:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-12T10:27:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Interpreter fix","sha":"180f8aac5d2d64c79703503fb7c3e504640d9f9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-12T19:33:53Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-12T19:36:34Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"msg":"quote guard CMake variables","sha":"a14c61802ec8436ed6d92ac6ce9485060f01bc5f"}
+{"author":{"avatar":null,"date":"2014-04-12T19:54:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-04-12T19:54:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #182 from Bigpet/array_remove\n\nReplace Array with std::vector","sha":"a059297bf4b32b38e6b8ff64acbcf576a4c4431d"}
+{"author":{"avatar":null,"date":"2014-04-12T19:54:43Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-04-12T19:54:43Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #183 from Bigpet/cmakefix\n\nquote guard CMake variables","sha":"0d7397a636fd2b30f20f70852f881641e69a32cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/365198?v=4","date":"2014-04-13T01:19:48Z","email":"danieru.dressler@gmail.com","login":"daniel-dressler","name":"danieru"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/365198?v=4","date":"2014-04-13T01:19:48Z","email":"danieru.dressler@gmail.com","login":"daniel-dressler","name":"danieru"},"msg":"Add Linux build instructions for Debian & Ubuntu","sha":"57a9b557e9af1b2099665b91c430759a5ca67613"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/365198?v=4","date":"2014-04-13T03:15:09Z","email":"danieru.dressler@gmail.com","login":"daniel-dressler","name":"danieru"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/365198?v=4","date":"2014-04-13T03:15:09Z","email":"danieru.dressler@gmail.com","login":"daniel-dressler","name":"danieru"},"msg":"Fix run instruction hitting CWD bug\n\nPCS3 assumes current working directory is bin folder.\nSo running it like ./bin/pcs3 stops it from finding\ndev_hdd0 and related.","sha":"b87aa55351bc89d55ff3ddf4d2f70ccc3bb6669c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-13T05:38:55Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-13T05:38:55Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #184 from daniel-dressler/master\n\nAdd Linux build instructions for Debian & Ubuntu","sha":"5dc9be649d71f70ca015e993ebd9a40d77164a77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-14T07:01:31Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-14T07:01:31Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix not range-checked vector access","sha":"552b71a3785ec3809ed2265099387aaa839b9ef8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-14T08:55:43Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-14T08:55:43Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"try to reign in the vector<ptr> madness","sha":"8ef94144064b84c8c297e0ce54ac982b91b095cc"}
+{"author":{"avatar":null,"date":"2014-04-14T09:42:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-14T09:42:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"New bugs added","sha":"c41317dd82b68b7cf35b07186c4337b29a691a20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-14T22:55:07Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-14T22:55:07Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #187 from Bigpet/master\n\nrange-check and more explicit ownership with vector<ptr>","sha":"aa8e854be27dad863ad7622c305c8a0b6f4dcc11"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-15T12:48:21Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-15T12:48:21Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"yeah, that happened","sha":"f073f1ca4b0d3c460bbba3ef7645d85ad1fe15e8"}
+{"author":{"avatar":null,"date":"2014-04-15T14:12:15Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-04-15T14:12:15Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #191 from Bigpet/master\n\nFix for video playback","sha":"34729e2687260fc5c67395dd1193cb889fea6c7f"}
+{"author":{"avatar":null,"date":"2014-04-16T11:09:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-16T11:09:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"...","sha":"dab07513009f539508009fc3b53516d3488bead4"}
+{"author":{"avatar":null,"date":"2014-04-16T11:36:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-16T11:36:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some comments cleared","sha":"a57841d00605fe8475004bd22851d9f7570d2774"}
+{"author":{"avatar":null,"date":"2014-04-16T23:28:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-16T23:28:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some bugs fixed","sha":"29d2ea7513fc18ddc700446114520a79af9fa05f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/181182?v=4","date":"2014-04-15T14:12:15Z","email":"mrnohbdy@gmail.com","login":"nohbdy","name":"nohbdy"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/181182?v=4","date":"2014-04-17T20:15:43Z","email":"mrnohbdy@gmail.com","login":"nohbdy","name":"nohbdy"},"msg":"RSX Bugfixes and plugging memory leaks\nBUGFIX: Add break after NV4097_SET_TEXTURE_BORDER_COLOR in RSXThread.cpp\nBUGFIX: Fix parameters passed to RSXTexture::SetControl3 (they were being\npassed in reverse order)\nBUGFIX: Remove invalid, non-sensical call to glPixelStorei in GLGSRender.h\nBUGFIX: Fix signed/unsigned comparison compiler warnings in GLGSRender.h\nCHANGE: Make GLFragmentProgram::Decompiler synchronous by default\nCHANGE: Update wxWidgets submodule to latest commit\nBUGFIX: Fix several memory leaks\nADDED: Created a new MSVC debug configuration to output locations\n  of allocations that end up leaking after the program\n  is closed.\nBUGFIX: Fix the stupid PadHandler crash due to the lack of a virtual d'tor","sha":"d136adc73fd206cedab4ab9a3f50f5cbbf054e11"}
+{"author":{"avatar":null,"date":"2014-04-17T20:25:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-17T20:25:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"More opcodes","sha":"5d091411a30ac56648c9e13b50898584d85b5b36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-17T21:18:20Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-17T21:18:20Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #193 from nohbdy/pull_apr172014\n\nRSX Bugfixes and plugging memory leaks","sha":"bad20ab9df46bc5dcdb84510d7bf6ba0c359ef41"}
+{"author":{"avatar":null,"date":"2014-04-17T21:38:07Z","email":"dante38490@free.fr","login":null,"name":"Dante38490"},"committer":{"avatar":null,"date":"2014-04-17T21:38:07Z","email":"dante38490@free.fr","login":null,"name":"Dante38490"},"msg":"return back\n\nrestore correct version","sha":"9900b36f07a67f4356f05f743fd746f290be972f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-17T22:17:25Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-17T22:17:25Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #194 from Dante38490/patch-1\n\nRestore the \"# Visual Studio 2013\" comment in rpcs3.sln","sha":"ef108ae4d6ac0b30a52d5b18f35f6d44255e5f3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-18T11:28:27Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-18T11:28:27Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"copying class with pointers as member when deleting them in the desctructor is danger zone.","sha":"79eaffaaa7350af9022aec95014ade7819b841e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-18T11:31:37Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-18T11:31:37Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"forgot the right check","sha":"ee9d25c675f831d571149b330cf7d8d0d642eec9"}
+{"author":{"avatar":null,"date":"2014-04-18T12:59:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-18T12:59:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3\n\nConflicts:\n\trpcs3/rpcs3.vcxproj.filters\n\nConflicts fixed","sha":"62df7eb4991fb1600ff7c532230895471c1daa61"}
+{"author":{"avatar":null,"date":"2014-04-18T22:11:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-18T22:11:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"More opcodes","sha":"78757383911f7e0f8b7b40b98df6f1ea3f6d97ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-19T09:33:27Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-19T09:33:27Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #196 from Bigpet/deleteErr\n\nfix copying class with pointers as member","sha":"225c58c17bfcfa469cef3ac37ccfdfbb9c047812"}
+{"author":{"avatar":null,"date":"2014-04-19T14:45:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-19T14:45:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"678a964ff464a506e9a69e1643fa829f3dcc3b2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-19T16:50:06Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-19T16:50:06Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellSaveData* (cellSysutil) refactoring","sha":"9e793c21222f811b3fac4239155737d8706a8170"}
+{"author":{"avatar":null,"date":"2014-04-19T22:53:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-19T22:53:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Accuracy improved","sha":"e1bbedd4bfbc7773538e51c9d46afcfad10f73be"}
+{"author":{"avatar":null,"date":"2014-04-20T19:36:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-20T19:36:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some stuff","sha":"525084e7ccb12b8441cad75b5c3e6f2e7231249f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-23T11:19:18Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-23T11:19:18Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #197 from Nekotekina/master\n\nSimple SPU JIT","sha":"0d7e45639a52418cb8270165c769ece3a768db0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-23T11:59:14Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-23T12:06:19Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"Add SPU decoder mode selection to GUI/Config","sha":"090f7f8cfbd2569c2f9e291b8f986beee8235f09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-23T18:38:34Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-23T18:38:34Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #198 from darkf/spugui\n\nAdd SPU decoder mode selection to GUI/Config","sha":"8c4fd75c82ee4c726135cd61daaccdef69ae77bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-24T12:10:43Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-24T12:10:43Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"accept accepts NULL address","sha":"b0b6034e634917c7f44e2b563a0c32086084cd89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-25T05:02:33Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-25T05:02:33Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"sys_net: Implement sockaddr_in, inet_addr, listen","sha":"ee2e0b3bbfb5cab8f0060f7253ef2111386dc676"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-25T05:14:40Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-25T05:14:40Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"Stub cellWebBrowserEstimate2 so some apps proceed","sha":"2b7c12a3f0f27b777ecbc414a54f1686e28263af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-25T08:00:18Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-25T08:00:18Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #199 from darkf/net-work\n\nImprove networking","sha":"15b0b6830e47f10b458468200b7b011ff5907d5e"}
+{"author":{"avatar":null,"date":"2014-04-25T12:48:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-25T12:48:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fixes","sha":"555d053e325827e86d41c4af79bf1d781e4b5ec0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-25T13:53:35Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-25T13:53:35Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #200 from Nekotekina/master\n\nCompilation fixes","sha":"6facd8d9c6407c59ba74d28218fa213c3a9e77de"}
+{"author":{"avatar":null,"date":"2014-04-25T20:09:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-25T20:09:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix again","sha":"a24cb250d8bc3a193f78f84d03bad9c40541a5fe"}
+{"author":{"avatar":null,"date":"2014-04-25T20:28:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-04-25T20:28:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Useless code removed","sha":"0d375809b15fa1888ecd39bdf78f5caa5a9bd339"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-26T10:55:29Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-26T10:55:29Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #201 from Nekotekina/master\n\nCompilation fix again","sha":"a2157a5365db4c6b72b2973a4697c82ac67b54af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-25T16:57:00Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-26T22:41:46Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"This is squashed commit from the follwing commits:\n\n* various changes to make it compile with clang\n\n* don't compile recompiler on linux yet but make the CMake build include asmjit already\n\n* add experimental travis bot\n\n* modify yml to match\n\n* try to build and install wxWidgets, since it's not in the travis repo\n\n* use newer cmake version for travis\n\n* add keys with sudo\n\n* use sudo for all apt- commands\n\n* Add additional dependencies\n\n* use version approriate gcc flags for c++11\n\n* try clang, gcc too old\n\n* set c++0x flag for clang\n\n* use gcc 4.8\n\n* use gcc 4.8 and add the repo for it\n\n* use gcc 4.8 even for clang to get newer headers\n\n* fix ambiguous conversions\n\n* add lz from hykem and more explicit conversions from be for x86\n\n* more switch disambiguation\n\n* more switch disambiguation\n\n* add additional unigned int casts to deal with be_t conversion ambiguity\n\n* remove unnecessary clang flag\n\n* add lz.cpp to vcxproj and cast to u32 instead of unsigned int\n\n* correct temporaray #ifdefs","sha":"eea3aa9729234da9ff28317eb5393e9b00642db6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-26T23:13:54Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-26T23:13:54Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #202 from Bigpet/linub\n\nAdd travis CI config file and all the changes to make it compile there under both gcc and llvm clang","sha":"b0699f38e780c8c4e89484b303587a99e31c907d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-27T12:33:31Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-27T12:33:31Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"pad: Send all button states so release events fire","sha":"d47dbf4f327f025e60194eeb30b394c59a71fd26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-27T14:06:03Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-27T14:06:03Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #204 from darkf/padfix\n\npad: Send all button states so release events fire","sha":"d085301af30eca29f213e4a448a221b0c831d554"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T16:18:04Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T16:18:04Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"enable SPU recompiler on linux","sha":"1ba5cafc5f3ee03ad5948961f82fb5a383bee544"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T16:37:21Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T16:37:21Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"remove more offsetof calls on linux and add asmjit linkage","sha":"f906d031fa5c0f2192ee946d5dc3ead689e8e58c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T16:51:24Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T16:51:24Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"remove .m128i_uxx subscripts because they're non standard","sha":"60a7fe17b5ba51b2049c1f1a2f22a4c5c49cac37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:07:20Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:07:20Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add precompiled header build to cmake to speed up building","sha":"a766f5951d16515396b5e9c0cf001f5e27ff051c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:15:35Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:15:35Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add explicit casts for the ptrdiffs","sha":"85be97e6a244e34546d874e7c804af906b4aa6c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:17:41Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:17:41Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix typo in cmakelists.txt","sha":"07841fc9e3a983d80f23ec9006c1137f182d14f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:23:11Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:23:11Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix typo in cmakelists.txt, again","sha":"6a24d2bbac3209b4e18ed321470c8d3614c85045"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:28:03Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:28:03Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"rename all the non-standard include file extensions to *.h","sha":"4981c576d2ed04d9c6102eaa86980c4b2f4608ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:34:09Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:34:09Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"disable cotire for now","sha":"71699724341256c9c75598bcc76fb063d974e1f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:55:31Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:55:31Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"explicit casting","sha":"9d3d7b09b3dd39790085573a9943440231a0db7d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:59:12Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T17:59:12Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix path to the asmjit lib","sha":"95ca5315e7291e1c23c9cb7c5bc8bf838c911368"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T18:13:47Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T18:13:47Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"explicitER casting, why you heff to be mad Clang","sha":"0bcadaf15519a4002c73ce543b0da3a8ade84486"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T18:23:32Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T18:23:32Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"explicit cast from void(*)() to void *","sha":"870fa5a15362d977e143b45c8c579cae6ab289ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T19:32:12Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-27T19:32:12Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add asmjit path hack, we'll get rid of it sooner or later","sha":"fad6c7cecbd1abd0ea335b62f44d551bf84ac024"}
+{"author":{"avatar":null,"date":"2014-04-27T21:12:35Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-04-27T21:12:35Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #206 from Bigpet/linspurec\n\nenable SPU recompiler on linux","sha":"db1ca2f89f725bb29cc16bb439a0a1bb4f795a5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/889237?v=4","date":"2014-04-27T23:11:03Z","email":"clayton.m.walker@gmail.com","login":"Sineaggi","name":"Clayton Walker"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/889237?v=4","date":"2014-04-27T23:11:03Z","email":"clayton.m.walker@gmail.com","login":"Sineaggi","name":"Clayton Walker"},"msg":"Gui: Replace sscanf with ToULong","sha":"0c5526f2fd6efc91f50b0d53a3d165f0baa4d432"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-13T01:31:59Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-27T23:53:13Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Clean up UI code.\n\n- Use Bind instead of connect. It's recommended for anyone using wx 2.9+\n- Remove AppConnector. All this did was destroy objects used in the UI. However, wxWidgets handles this. So it's redundant.\n- Misc other unimportant changes.","sha":"b877879db67a44abba3e6c3c75a56d9fb1509344"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-27T23:55:18Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-04-27T23:55:18Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"README: Use OpenAL Soft and add a Travis CI badge","sha":"708662da39f31738675365bac7e710c1198589cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-13T01:31:59Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-04-28T00:05:01Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Correct event handlers to trigger in all instnces\n\nSome events don't propagate correctly to the right sub-window\nand some things like the pad handler don't even necessarily have\nwindows. So, just register some events with the top-level app.\n\nAlso add a virtual destructor to the PadHandlerBase to be able to\ndeal with multiple inheritance in the derived classes.","sha":"8feabb00d6e5db792f9ae5ac469f16baf815ef88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T03:17:22Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T04:31:41Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Fix some type comparion warnings.","sha":"5f6a2e498a01b173111e72d77215a9fde12721cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T03:17:36Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T04:31:42Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Fix an unused variable warning.","sha":"42d5da633a78276875fdaee04e16e203be5343b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T03:19:31Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T04:31:42Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Avoid pointless strdup().","sha":"2f7fbf01cf1671f2c801bd7a644d1874109f0ef2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T07:15:37Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T07:15:37Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Don't ask twice if MemoryBlocks can read mem.\n\nThey already check on Read32(), so just use that to iterate.","sha":"e4c0b0310cee6c7ab8c91d82c365a0fdc795dddb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-28T07:36:20Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-28T07:36:20Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #208 from darkf/patch-1\n\nREADME: Use OpenAL Soft and add a Travis CI badge","sha":"c8d93d0da43bc55f3f52ddba26f67ab3e593e5ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T07:42:02Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T07:42:02Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Use templates in FastRead/FastWrite to simplify.\n\nDRY.","sha":"32554b7023e2464b506515d02c8e2bf3509f5efb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-28T08:12:10Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-28T08:12:10Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #207 from UnconventionalT/master\n\nGui: Replace sscanf with ToULong","sha":"dea8bed140d4149713bc5e6feeafd7844cdf80d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T03:27:36Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:43:06Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Make MemoryBase::Unmap() return a value.","sha":"b550ccfc73799af436e3cc9969122b7dfb41f888"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T03:34:33Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:43:06Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Fix some int/ptr comparisons.","sha":"2fdefc4fb54c76db5c3c6873dc404f5eab8e0e37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T03:34:47Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:43:07Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Log unhandled case in FPSCR::checkSliceRounding().","sha":"563aa2d2ca15c5bd0017bdf3fac05cc85e03895e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T03:37:25Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:43:07Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Clarify an assignment is not a comparison.","sha":"f2d6bf73caad21cb69138b7c8d9375ebf422e792"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T03:38:43Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:43:08Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Always return a value in get_time().\n\nAlthough, clock_gettime() should never fail here.","sha":"80eb12a9d69ba6b9358acf4a81fdd1a242e28297"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T03:41:51Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:43:09Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Correct some non-const string literals.\n\nShould not be treated as non-const char *.","sha":"bcf63a0faea288753e9345ce9d83c87cfa085987"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T03:48:59Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:43:09Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Don't try to delete [] things that weren't new'd.","sha":"763fb2719f8c23907b9dc306f05b43dcb288d146"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T03:57:47Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:43:10Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Avoid a trigraph.","sha":"75fe77115d156ed538dbfe50dfd670043f0e310f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T04:07:12Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:43:10Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Clarify precedence in macro.","sha":"1fb8060263d4841b61ef3c4a8739a260256d4059"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T04:08:21Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:43:11Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Clarify a no-content loop.","sha":"bdb08c58d38814665af1d42b33ab42966c53cba7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T04:10:41Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:43:11Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Clarify if/else precedence in a macro.","sha":"fb03214f0aecca50f7a90e4206c59c3488894dd6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T06:22:27Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:43:12Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Add AboutDialog.h header to msvc.","sha":"fce0a1efa1b44b97f8ea04080a89675f8ccb0e54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T06:23:29Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:43:12Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Fix reseved -> reserved typo.","sha":"d6baac6fbe8e02c97d211351813d079f7e2ccfbd"}
+{"author":{"avatar":null,"date":"2014-04-28T14:54:54Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-04-28T14:54:54Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #185 from lioncash/gui-cleanup\n\nClean up UI code.","sha":"7b28d9d7ba261d596a387ffe281faa21b5a36345"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:57:49Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-04-28T14:57:49Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Switch a bunch of loops to range fors.","sha":"8ff354a4ea70333f111721d4b7c93fc73e0bc99d"}
+{"author":{"avatar":null,"date":"2014-04-28T15:31:11Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-04-28T15:31:11Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #212 from unknownbrackets/perf\n\nImprove memory access performance a little","sha":"82e47a5c53859a752114dc686ed48f0793466cc6"}
+{"author":{"avatar":null,"date":"2014-04-28T16:15:12Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-04-28T16:15:12Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #209 from unknownbrackets/warnings\n\nFix a bunch of warnings","sha":"90896560bbad2d1f34cc31b384aa964b6ac0d215"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-28T19:18:11Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-28T19:18:11Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"well let's hope Clang doesn't mind implicit unsigned int to u64","sha":"92d556524bfacfad84fc3e5c7247d1d25506493c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-28T19:36:31Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-28T19:36:31Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"format warning disable for clang, it clutters up the build messages too much","sha":"baaa2ae45a8adea199cba9bd8f20ecf4e3aec64c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-28T19:50:07Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-04-28T19:50:07Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"format warning disable for clang, typo correction","sha":"3220e9bbc4643a104e275470369b13608baa4aa6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-28T21:15:52Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-04-28T21:15:52Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #213 from Bigpet/master\n\nCompile fix for VS (doesn't like implicit `u64 *` to `unsigned long*`)","sha":"f908a3ca78384f8e72e02e18cf61af64bf729167"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/889237?v=4","date":"2014-04-29T07:15:25Z","email":"clayton.m.walker@gmail.com","login":"Sineaggi","name":"Clayton Walker"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/889237?v=4","date":"2014-04-29T07:17:41Z","email":"clayton.m.walker@gmail.com","login":"Sineaggi","name":"Clayton Walker"},"msg":"Set build independent binary output dir\nUseful for using multimple compilers (gcc/clang) with different compile-time (debug/release)","sha":"4db97eae7c8e60215d73f3e5e47f05fd006df8f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/357935?v=4","date":"2014-04-28T22:51:49Z","email":"andreas@drqueue.org","login":"kaazoo","name":"Andreas Schroeder"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/357935?v=4","date":"2014-04-29T20:46:42Z","email":"andreas@drqueue.org","login":"kaazoo","name":"Andreas Schroeder"},"msg":"Mac OSX: fix includes & add missing functionality","sha":"64cfab5b46de082984c2568d8ef834e003ef9275"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/357935?v=4","date":"2014-04-28T22:54:33Z","email":"andreas@drqueue.org","login":"kaazoo","name":"Andreas Schroeder"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/357935?v=4","date":"2014-04-29T20:46:42Z","email":"andreas@drqueue.org","login":"kaazoo","name":"Andreas Schroeder"},"msg":"Mac OSX: use __thread for thread-local storage","sha":"e7f0efa56d358acdc3d7eb865a6774e61fa827a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/357935?v=4","date":"2014-04-29T17:55:03Z","email":"andreas@drqueue.org","login":"kaazoo","name":"Andreas Schroeder"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/357935?v=4","date":"2014-04-29T20:46:43Z","email":"andreas@drqueue.org","login":"kaazoo","name":"Andreas Schroeder"},"msg":"add info for Mac OSX","sha":"22a90a0907b98d8cab49675d8a2425d81fd390f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/357935?v=4","date":"2014-04-29T20:10:42Z","email":"andreas@drqueue.org","login":"kaazoo","name":"Andreas Schroeder"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/357935?v=4","date":"2014-04-29T20:46:43Z","email":"andreas@drqueue.org","login":"kaazoo","name":"Andreas Schroeder"},"msg":"move clock_gettime() into GNU.cpp","sha":"ebe20a08251aa4dc48b0f9ef2c144681679f4dd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/357935?v=4","date":"2014-04-29T22:58:57Z","email":"andreas@drqueue.org","login":"kaazoo","name":"Andreas Schroeder"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/357935?v=4","date":"2014-04-29T22:58:57Z","email":"andreas@drqueue.org","login":"kaazoo","name":"Andreas Schroeder"},"msg":"detect Mac OSX and Windows, fall back to Linux","sha":"11ca1316077f8520508b39897a9e70b15214d2ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-01T14:50:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-01T14:50:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #214 from kaazoo/master\n\nAdd compilation support for Mac OSX","sha":"4c9444b9580ce6e103f6c332601c19a3cc33aaeb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-05-01T17:29:28Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-05-01T17:29:28Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix OpenGL includes for Win32","sha":"0aa8a9f37266c8bdc66c49adafb249a624c212b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-05-01T17:32:16Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-05-01T17:32:16Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"more compact precompiler checking","sha":"4de24cb436450eb36dd4fc8d1a95e67e340a2fe0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-01T19:07:40Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-01T19:07:40Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #217 from Bigpet/master\n\nfix msvc opengl includes","sha":"5b0ebacc4034871c4e4abe64a0c7d797331ea70d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-06T01:49:20Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-06T01:49:20Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"Added in some more error codes to Cellpad functions","sha":"29cd11ad06188eecd31c4a26bb376416552499df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-06T02:58:49Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-06T02:58:49Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"Fixed 'Assign_changes' usage for cellpad / padhandler","sha":"199845a9d1d416e7103d4a4e19fc965b3680f85c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-07T03:46:18Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-07T03:48:55Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"Add in cellPadGetCapabilityInfo function","sha":"604eecf5d4e7983dfdec8946c3a73ff228b318d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-07T03:54:41Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-07T03:54:41Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"Implemented more cellPad functions, fixed some cellpad error returns","sha":"0d4e950769fe8dd4a0dfdbe1df082ce6778c0b62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-07T04:04:47Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-07T04:04:47Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"Added pressure support for keys, redid analog 'key' stick support","sha":"387eac4d08aee57cc54cf81d91748a2aa64fcb24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-07T04:09:10Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-07T04:09:10Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"Initial cellPadClearBuf functionality","sha":"0e933439dcba676575b0d44e7a3ad9de17efe6c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-07T06:45:18Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-07T06:45:18Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"Revert comment out of cellPadGetCapabilityInfo in funcList","sha":"4d28d2e75d66c07e07917cfc20361d280eb8c244"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-07T23:08:16Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-07T23:08:16Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"Fix pad handler for digital buttons","sha":"5deedb1524c6a676d411577ca3a49980e12672e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:21:45Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:21:45Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Update wxWidgets to fix recompile thing in MSVC.","sha":"cf86056ba97da1f2526f9d02f495af4995db50de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:22:03Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:22:03Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Fix operand order in DSTST instruction.\n\nNo functional change.  Also, switch SC to use a u32 for more typesafe\nopcode decoding - also no functional change.","sha":"134e891068ecd8c31509b77f4eee85f22aef4fee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:23:23Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:23:23Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Fix SRAWI instruction decoding.\n\nIt's SH, not sh.  Lowercase combines bits from two fields.","sha":"d54237b0a36656be4cce574b32ca95eb90909fe9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:28:34Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:36:13Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Add missing TD instruction.","sha":"a5c18b2a09861e279b75bf0204cd36ab58a7b82e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:37:30Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:39:45Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Add missing LSWX and STSWX instructions.","sha":"592e13b6a049265a981b90f2fc1e4b8b104ec9d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:48:27Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:48:27Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Add missing STFSUX/STFDUX instructions.","sha":"9290453d2e206ee5a198daba1138a94a611d89fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:53:19Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-08T06:53:19Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Add missing ICBI instruction.","sha":"ff89e06fd6afc9a18450e593e10db4c55bb34a7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-08T22:20:16Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-08T22:20:16Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"Removed unneccessary commented analog stick code","sha":"6045c9a89084d14d2c7e71c576c0ead91079728c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-09T04:20:36Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-09T04:20:36Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #219 from jarveson/cellPad_fixes\n\nCell pad fixes","sha":"93cb2a0af9e6c92b226e2f31f8949a33553cf8f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-09T04:23:20Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-09T04:23:20Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #220 from unknownbrackets/opcodes\n\nAdd a few missing opcodes, fix SRAWI","sha":"8d5599d3dc2f31da4914f270fad712b2565997b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-05-09T09:16:31Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-05-09T09:16:31Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"match project dependencies for wxStuff from their *.sln","sha":"4c5b5f709fee472cad80fd9e5789fec197da464d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-05-10T14:00:34Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-05-10T14:00:34Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"some light formatting and hotkeys for main frame restored","sha":"ca64054505011272bc31369de1c218c661559939"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-10T22:54:42Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-10T22:54:42Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #225 from Bigpet/master\n\nSome light formatting and hotkeys for main frame restored.","sha":"4aefd5cbc44673dc69c839db3931c67b706b3fc2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-12T19:31:01Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-12T19:31:01Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed issue with RSX Reports\n\nReports consist of 16 bytes (64-bit timestamp, 32-bit value and 32-bit\nzero padding). This was found by @nohbdy some time ago.","sha":"38bd40891d961eab09672cd14f7c621819c0e3ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-13T18:45:24Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-13T18:45:24Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Fixed issue #221, and other minor changes.","sha":"5833d22fe019d59fd0b6f609dacca87b46f2fa5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-14T12:49:49Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-14T12:49:49Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #226 from O1L/master\n\nFixed issue #221.","sha":"5b252a8bad1a36dbd83660b9c963ca0a7305082f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-15T08:11:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-15T08:11:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Implement CELL_GCM_TEXTURE_R5G5B5A1/R5G6B5","sha":"f3c3bebd6e0c63daee536db5941b74c66f136927"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-15T09:01:41Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-15T09:01:41Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #227 from raven02/master\n\nImplement CELL_GCM_TEXTURE_R5G5B5A1/R5G6B5","sha":"315f1e62ad3579471963a66cde6bff5d68cb614d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-15T14:29:55Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-15T14:29:55Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add few more texture formats and comments","sha":"42434adfaf53adf5cdd2823dc91eaaaac828c93d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-15T16:15:37Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-15T16:15:37Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #228 from raven02/patch-1\n\nAdd few more texture formats and comments","sha":"68b0f800ffa2c90f11facb84a5fff8f8fabfcc84"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-16T07:13:34Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-16T07:13:34Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Use GL_BGRA for glReadPixels()","sha":"f5e1d9eab19fab3db16a9dd13510a4d2a5e15408"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-16T13:27:14Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-16T13:27:14Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Log lvl -> Log Level","sha":"20af7c4981ab043dbcd80cdf02e1d3087b259ac8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-16T13:29:34Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-16T13:29:34Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Set default off for WriteColorBuffers / DepthBuffers","sha":"8278c8f5c4328abdc57b320c9217c0e2f7a7ef0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-16T14:43:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-16T14:43:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix ternary operator","sha":"86ca4819ee40eadbe7801e820f948df16d727597"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-16T17:27:55Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-16T17:27:55Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix CELL_GCM_TEXTURE_B8 opengl error 0x0500","sha":"ca7c4e119e43935f659569dc8e2fb2445702ae70"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-16T17:44:13Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-16T17:44:13Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Typo fix","sha":"e7a4eac6766b9790c7040776900b09c97198fc3a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-17T02:03:21Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-17T02:03:21Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Set default on for Ignore RW errors\n\nThis seems to be making couples of games at least not booting without the option ticking.","sha":"ddfdaa270eb1a3dbe2d0d7a3487fc9475ce96e62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-17T09:00:25Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-17T09:00:25Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Implement CELL_GCM_TEXTURE_A1R5G5B5 & CELL_GCM_TEXTURE_A4R4G4B4","sha":"0d9de89a26b32298ff92c3011eed65d8472bb577"}
+{"author":{"avatar":null,"date":"2014-05-17T09:22:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-17T09:22:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #230 from raven02/master\n\nUse GL_BGRA for glReadPixels()","sha":"a33e4c734678f174a933affce086e58aa74656fd"}
+{"author":{"avatar":null,"date":"2014-05-17T09:22:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-17T09:22:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #231 from raven02/patch-1\n\nSet default off for WriteColorBuffers / DepthBuffers","sha":"36d5cf1a7fe2e7b94be4df647424e388527211ec"}
+{"author":{"avatar":null,"date":"2014-05-17T09:22:35Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-17T09:22:35Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #232 from raven02/patch-2\n\nFix ternary operator","sha":"a3a6a8a9e0de1ea7465d8f755a5e54dfb039bc7c"}
+{"author":{"avatar":null,"date":"2014-05-17T09:22:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-17T09:22:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #233 from raven02/patch-3\n\nFix CELL_GCM_TEXTURE_B8 opengl error 0x0500","sha":"389e3bbd91be007d7dac82e22b59431f58efc3df"}
+{"author":{"avatar":null,"date":"2014-05-17T09:22:58Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-17T09:22:58Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #235 from raven02/patch-4\n\nImplement CELL_GCM_TEXTURE_A1R5G5B5 & CELL_GCM_TEXTURE_A4R4G4B4","sha":"1f465bc7d807dbff3cde914cee926bd7f6f2f544"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-17T15:17:41Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-17T15:17:41Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Implemented CELL_GCM_TEXTURE_D1R5G5B5\n\nSame color issue as A1R5G5B5 though.","sha":"d745a7bb4ebd974523506655de5b2071cbf47932"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T16:21:25Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T16:21:25Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"cellPngDec: fix outputMode, outputBytesPerLine.\n\nThis handles CELL_PNGDEC_BOTTOM_TO_TOP and also handles reduced\noutputBytesPerLine more correctly-looking.  Not actually tested against\nactual behavior.","sha":"f7114cc6204effbd4611d0e4eb039e96cedc0805"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-17T16:52:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-17T16:52:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix wrong type for DEPTH24_D8/DEPTH16","sha":"ccc35176f6e3488f7023e6e8da949ab3e6a59aef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-17T17:19:55Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-17T17:19:55Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #237 from raven02/patch-5\n\nFix wrong type for DEPTH24_D8/DEPTH16","sha":"ac65af7b62a68290f004c8671be5c27891d01259"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T17:22:27Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T18:15:25Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"GL: Correct texture reswizzling, fix A4R4G4B4.","sha":"68bc41b4362b156bc16686a422aa4db5ed970099"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T17:42:34Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T18:15:25Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"GL: support the G8B8 tex format.","sha":"2f8e31cddd063bc49d3bf4972de4f906e4a1614e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T18:03:48Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T18:15:26Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"GL: Add support for R6G5B5.","sha":"86d35d58df9bdf0306ff77517ea47427f1f820ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T18:14:59Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T18:15:26Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"GL: Correct byteswapping for 565 type textures.","sha":"0978a1348ec06cc6c26e42ed9bf847aa11707a01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T18:29:49Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T18:29:49Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"GL: Small simplification.","sha":"b58320d7dcfc09d000197f995dd59d8d672b5879"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T18:32:18Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T18:32:18Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Typo.","sha":"dbcee43567422a31c35521534f24f9430719782b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-17T18:56:29Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-17T18:56:29Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #238 from unknownbrackets/texformats\n\nCorrect various texture formats in OpenGL","sha":"921de12d93babf0e529df2bc21103f7a297b70cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-17T19:48:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-17T19:48:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #236 from unknownbrackets/pngdec\n\ncellPngDec: fix outputMode, outputBytesPerLine","sha":"0e3e4c75536659dd71a7abaeb07d6c305211f7ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T19:55:40Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T21:49:22Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"GL: Add R8B8_R8G8 / B8R8_G8R8 formats, tweak G8B8.\n\nBased on how the first two swizzle, most likely G8B8 works that way too.","sha":"cf0e116a56414884eae69db2d07d3c63c03c6432"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T20:11:32Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T21:49:22Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"GL: Add Y16_X16_FLOAT tex format (untested.)","sha":"439dd9d8a386af7ae1c3bbc3d0d3bb23c9231299"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T20:37:34Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T21:49:23Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"GL: Add Y16_X16 tex format (untested.)","sha":"28b10157add92f04f1ed0113d2a516caa266b26d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T21:55:23Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-17T22:38:13Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Typo.","sha":"c8dea6b9315fe90edc31e1d1171bd06feb15a57d"}
+{"author":{"avatar":null,"date":"2014-05-17T23:19:30Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-17T23:19:30Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #241 from unknownbrackets/texformats\n\nAdd a few more texformats, fix cellPngDec","sha":"c0f55ae1e7d10b1ee3fd38db5158fc1c873aada6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-18T05:32:11Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-18T05:32:11Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"cellPngDec: Ignore bytesPerLine < width * bpp.\n\nIt seems strange, but Sonic CD passes bytesPerLine = w * 3 for a 4 channel\nimage.  Either this is a bug elsewhere, or it ignores likely incorrect\nstrides.\n\nUntested except in Sonic CD.","sha":"fed2998d48792d7811fba34603fb5c7f5f313bf8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-18T06:06:26Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-18T06:06:26Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"GL: Swap R/B in A1R5G5B5 correctly.\n\nFixes Terraria, thanks @raven02.  How did I miss this, it was not passing\nthe test after all...","sha":"7992115f6cee23cd343bfaf8d347e4798d7b261f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-18T06:14:42Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-18T06:14:42Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"GL: Fix D1R5G5B5 texture R/B components as well.","sha":"07505aa9e20ccdd50008b7394135555aa44be6e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-18T06:57:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-18T06:57:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix wrong color effect in Disgaea 3","sha":"c8e52a78f903f209f7d684ba5557003d704f15c5"}
+{"author":{"avatar":null,"date":"2014-05-18T08:08:05Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-18T08:08:05Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #242 from unknownbrackets/pngdec\n\ncellPngDec: Ignore bytesPerLine < width * bpp","sha":"be11bd85f69213fdd8e0186f88f6e125ed250831"}
+{"author":{"avatar":null,"date":"2014-05-18T08:08:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-18T08:08:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #243 from unknownbrackets/texformats\n\nSwap R/B in a few other texture formats","sha":"1a6fa4aedca8b009c33a499cab1622e6e513bc33"}
+{"author":{"avatar":null,"date":"2014-05-18T08:08:17Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-18T08:08:17Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #244 from raven02/patch-6\n\nFix wrong color effect in Disgaea 3","sha":"9e7f8564b6c2407605257c8dc86f9b62ef81f1c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-18T10:46:01Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-18T10:46:01Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Check pointers in cellPamf","sha":"b4a76843444cbebc00cfe7d604609387ef4bc505"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-18T12:28:11Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-18T12:28:11Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"msg":"int ->size_t","sha":"5e36362a4c9376c5d32f3d07655d4d482edef3ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-18T13:05:06Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-18T13:05:06Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #246 from Blaypeg/master\n\nExplicit conversion to avoid compiler warning (2)","sha":"4f63f57d26c5ff4a651fd5242bcfb473158162d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-18T21:21:41Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-18T21:22:05Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"GL: Fix half-float texture formats.\n\nThis matches the ps3 output/channels for these textures per the\nrsx/texture_formats test.","sha":"06c4c4520096ea32a828f87252a2a6b10857c60c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-18T21:39:04Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-18T21:39:04Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"GL: Fix X16 / Y16_X16 texture formats.\n\nPer the rsx/texture_formats test.  Not sure about pitch, may need to deal\nwith UNPACK_ROW_LENGTH...","sha":"612e515317b3149bf4f46139dc791ea5768d8900"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-18T22:24:12Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-18T22:24:12Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"GL: Fix the compressed R8B8 / B8R8 type formats.\n\nThe not-swizzled bit is always set for them.","sha":"7948f376fb0bf2db5d845fdbcaf70082d01e4ffa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-18T22:52:20Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-18T22:52:20Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #247 from unknownbrackets/texformats\n\nImplement more texture formats per the test","sha":"0d0df4b4918628f251fb110f3223595e2216d39a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T06:12:28Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T06:12:28Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"msg":"virtual memory block reads/writes properly fail if address is out of bounds.\n\nFixes Solar v2.1 http://puu.sh/8ScXK.jpg","sha":"9e791da7bd3f900d9e11e670a67002c0fd66e19c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-19T07:43:41Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-19T07:43:41Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add support for m_surface_depth_format 0","sha":"c2f3f048083ac01c03c135142096e24978d410fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T09:07:45Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T09:23:22Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"msg":"gitignore now ignores files generated by visual studio profiler, solution configured for profiling.","sha":"346614b0da4dc74fe482624f2c0e903feda0bea1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T09:09:54Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T09:23:22Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"msg":"MEMORY: Copy from real's destination parameter should be immutable","sha":"2834697f1f8dbad36aa7a932a5a2b9e60ecd3470"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T09:10:33Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T09:23:23Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"msg":"MEMORY: Added AppendRawBytes, which also advances the memory pointer unlike Memory.CopyFromReal","sha":"9bdb12e3da1f7f3f0607c6ff2673a54f1ed5dc72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T09:14:07Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T09:23:23Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"msg":"cellPngDecDecodeData handles CELL_PNGDEC_ARGB case much faster.\n\nProfiling done with two samples on Solar v2.1 from rpcs3 init to first frame.\nBefore optimization, profiler found rpcs3 in cellPngDecDecodeData 15.3% of the time.\nPost-optimization, profiler finds rpcs3 in cellPngDecDecodeData 0.33% of the time for ~50x improvement.","sha":"3aeb0b0f9552cbae1856f396189f1dff7d5ca8c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-19T13:05:53Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-19T13:05:53Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fix pointers issue in cellUserInfoGetList\n\nSolves GetMemFromAddr(0x0) on NPEB01894.","sha":"e280d54f3f6abd4e1ce540bf08812f346f5a4f7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-19T13:14:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-19T13:14:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add comment for depth format 0","sha":"4f961c9e0b7d16363b7121003e3b8f1fdb19d56b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-19T13:16:17Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-19T13:16:17Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #249 from raven02/patch-9\n\nAdd support for m_surface_depth_format 0","sha":"c312bc1b7096ab89bce33967415e65adf5b7aaf4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-19T14:48:59Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-19T14:48:59Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Regress fix cellPamf","sha":"0ba5bb4e7a7631d08ffc106ac1f538096179abf5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-19T17:13:18Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-19T17:13:18Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #252 from raven02/patch-11\n\nRegression fix cellPamf","sha":"9ce9c3ce21b70243033a7200d957c38922a59de6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T21:56:58Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T21:56:58Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"msg":"Improve Memory Viewer: There are bugs in text representation.\n\nChar display now only displays printable ascii characters. Anything non-printable is printed as '.' as is standard.\nAdditionally, displayed lines are properly delineated with newlines so that we don't wrap on spaces.","sha":"4c02c20d841ca72e95473295898d93529b6f201f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T21:58:01Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1606755?v=4","date":"2014-05-19T21:58:01Z","email":"ItzWarty@gmail.com","login":"miyu","name":"Michael Yu"},"msg":"MEMORY: Fixed IsMyAddress bound error (GetEndAddr returns an inclusive value)","sha":"85785b471e28a79bec648fd78b94df11598180bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-19T22:29:03Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-19T22:29:03Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #253 from ItzWarty/memoryviewer_fixes\n\nImprove Memory Viewer: There are bugs in text representation.","sha":"9209edc15cc45c54f28f3fd8088d87b885509254"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-20T13:33:45Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-20T14:10:14Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add NV4097_SET_BACK_POLYGON_MODE","sha":"f67d30571b404b497afceb6a01b54153e2dcd593"}
+{"author":{"avatar":null,"date":"2014-05-20T14:12:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-20T14:12:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #254 from raven02/patch-12\n\nImplement NV4097_SET_BACK_POLYGON_MODE","sha":"6bb812f283a689d17120d30cc0c914785d143a97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-20T18:08:49Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-20T18:08:49Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Set default polygon_mode as GL_FILL","sha":"e0f89beb7dcbb420a29a713dd9472d8e5b3675c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-20T19:21:31Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-20T19:21:31Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #255 from raven02/patch-12\n\nSet default polygon_mode as GL_FILL","sha":"840e9d8ed8fd41ed8b6f2649c7bd6a336f5f81be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-21T00:54:08Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-21T00:54:08Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"cellPad: Fix logic error in setPressMode and setSensorMode","sha":"233b179f65d4fc55128db2d42d28b86e8e7f42dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-21T00:56:36Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2014-05-21T00:56:36Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"cellPad: Changes to report 0 length if theres no changes","sha":"afc5294016e78c1e1322337d4f99e3bb74f77513"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-21T01:38:27Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-21T01:38:27Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #257 from jarveson/cellpad_fixes2\n\nCellpad fixes","sha":"ec53f2557a86958f22ed48eafe10d7f1f7d9a145"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-21T09:55:44Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-21T10:14:51Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Enable GL_SCISSOR_TEST and add glLogicOp","sha":"967935d3893ce1c4ec58e8d11190da15c176ee68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-21T10:45:36Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-21T10:45:36Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"asmjit project moved in asmjitsrc directory.","sha":"570efab05f9b44bfb798a109c072129f307f0464"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-21T12:14:33Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-21T12:14:33Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Some changes from previous commit restored.","sha":"3475912233acff33c6e83b251416b16a04dd1485"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-21T12:57:57Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-21T12:57:57Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Restored.","sha":"e3a56e39d727045b66c3c10dc71d81496faa030f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-21T13:06:02Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-21T13:06:02Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Completed.","sha":"60514cc48d8824472565da99622ba26e6fc3fddf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-21T13:43:33Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-21T13:43:33Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #258 from raven02/patch-13\n\nEnable GL_SCISSOR_TEST and add glLogicOp","sha":"38e0c62e99cdedc057ccda6ae37709db1cf3b375"}
+{"author":{"avatar":null,"date":"2014-05-21T15:22:01Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-21T15:22:01Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #248 from ItzWarty/master\n\nvirtual memory block reads/writes properly fail if address is out of bounds","sha":"e569de73d68eba3cec65cf5eb7ce4cab5c295f59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-21T16:20:13Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-21T16:31:40Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Code cleanup and added glPolygonOffset","sha":"b95667563faa2d29f8dfaeecf08aaa97ccc72ffb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-21T16:48:25Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-21T16:48:49Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"There is no glEnable(GL_FRONT_FACE)","sha":"3445f8a49f0a4f3ca33fec15123b8504ed879a3f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-21T17:08:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-21T17:08:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Re-enable glFrontFace with sanity check","sha":"94393ff4ea0b52f439ffa5857ddd2dd0a90187c3"}
+{"author":{"avatar":null,"date":"2014-05-21T17:42:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-21T17:42:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #259 from raven02/patch-14\n\nCode cleanup and added glPolygonOffset","sha":"e2ebb09d6cd5c0a8c3070599f8a4bfa23b9a106c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-22T17:39:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-23T14:22:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Replace slow glReadpixels routine with glBlitframebuffer for non-MRT","sha":"a2af749e717ed0596c96c53198acac2c2f350592"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-23T15:51:55Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-23T15:51:55Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add 960x540 natvie resolution support","sha":"6520b8f06d1022112ef314766dabd3521d169243"}
+{"author":{"avatar":null,"date":"2014-05-23T16:02:26Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-23T16:02:26Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #262 from raven02/patch-15\n\nReplace slow glReadpixels routine with glBlitframebuffer","sha":"9e4c2c10308f34c40c5b1c53a8acb8530e99b46c"}
+{"author":{"avatar":null,"date":"2014-05-23T16:02:40Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-23T16:02:40Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #263 from raven02/patch-16\n\nAdd 960x540 natvie resolution support","sha":"0ec78e0d5eee144f9e30f2728033d888cf57e061"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-23T16:18:29Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-23T16:20:57Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Update LR only when cond passes.\n\nIt should not be updated otherwise.  In most cases, won't matter.\n\nAlso, reorder slightly so SetBranch() can safely set PC directly.","sha":"493bf93a5ae587c1cf328f5352d5a9560f904279"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-23T16:19:18Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-23T16:20:58Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Do not set the CA bit in ADD().\n\nThanks Ashe`.","sha":"82d60ee48ddd2375bd0d9594877345c8a27fb39e"}
+{"author":{"avatar":null,"date":"2014-05-23T16:24:32Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-23T16:24:32Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #264 from unknownbrackets/ppu-minor\n\nClean up LR updates in branches, remove CA update in ADD","sha":"a186efded2191b9455fa47e672a27801c61e6946"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-23T16:31:59Z","email":"Blaypeg@users.noreply.github.com","login":"Blaypeg","name":"Blaypeg"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-23T16:31:59Z","email":"Blaypeg@users.noreply.github.com","login":"Blaypeg","name":"Blaypeg"},"msg":"Merge pull request #1 from DHrpcs3/master\n\ntest","sha":"360070bddb242c0a51b6b88fa8daafedcb7659b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-23T16:57:13Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/191233?v=4","date":"2014-05-23T16:57:13Z","email":"checkins@unknownbrackets.org","login":"unknownbrackets","name":"Unknown W. Brackets"},"msg":"Fix the DCBZ instruction.\n\nNeeds to zero memory.","sha":"f49d3d6a28f9deb4e50095f8968f863d1e70681a"}
+{"author":{"avatar":null,"date":"2014-05-23T17:32:15Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-23T17:32:15Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #265 from unknownbrackets/ppu-minor\n\nFix the DCBZ instruction","sha":"59f08f9bdd561f9b77b6b11077608e139e14e7bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-24T13:42:42Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-24T13:48:54Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add option to skip PAMF","sha":"8a068e7fca50f42de0041d98e362ff4ceb8c21ad"}
+{"author":{"avatar":null,"date":"2014-05-24T15:13:53Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-24T15:13:53Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #266 from raven02/patch-18\n\nAdd option to skip PAMF movie","sha":"b09560cc1c327a486dcc35d7861be918fd4cf666"}
+{"author":{"avatar":null,"date":"2014-05-24T16:23:17Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-05-24T16:23:17Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #250 from ItzWarty/cellPngDecDecodeData_optimizations\n\nOptimize cellPngDecDecodeData's CELL_PNGDEC_ARGB case","sha":"490d1059ac30aa1a2fb6a3deef9748d5e07ce4b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3615018?v=4","date":"2014-05-24T19:05:00Z","email":"michael.putters@binarygenetics.com","login":"rraziel","name":"Michael Putters"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3615018?v=4","date":"2014-05-24T19:05:00Z","email":"michael.putters@binarygenetics.com","login":"rraziel","name":"Michael Putters"},"msg":"Basic XInput support","sha":"03914d60d321df32d4eff072fe89d8f4cfa15ec6"}
+{"author":{"avatar":null,"date":"2014-05-24T19:14:41Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-24T19:14:41Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #267 from mputters/xinput\n\nBasic XInput support","sha":"33584b6668040279191716d709ebbf95c4797cf7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-24T21:38:29Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-24T21:38:29Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Switch to OpenAL Soft (see issue #166). Use native FLOAT32 data now. Add small check in OpenALThread.","sha":"6072fd2fbbb39c65f02da5ae84f868f6743a77ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-24T21:46:25Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-24T21:46:25Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"8a1227eaa2db89ac8ace11cb22374c21b7e73b05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3615018?v=4","date":"2014-05-25T07:34:06Z","email":"michael.putters@binarygenetics.com","login":"rraziel","name":"Michael Putters"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3615018?v=4","date":"2014-05-25T07:34:06Z","email":"michael.putters@binarygenetics.com","login":"rraziel","name":"Michael Putters"},"msg":"Inverted XInput Y-axis for sticks","sha":"6780a2f0bfa649799bf56161609b179ebb3adc7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-25T08:00:54Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-25T08:05:21Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Hide debug console option","sha":"2b8998af9126851b827ad305df7f3facc34aea54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-25T11:01:42Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-25T11:01:42Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #270 from mputters/xinput\n\nInverted XInput Y-axis for sticks","sha":"5d88ca2287a785a8b032345628124640813fcae9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-25T14:08:45Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-25T14:08:45Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSXThread: Add few more logging and comments","sha":"5109065425cbd7f9535bd82defd249f6cbae552f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-25T14:21:38Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-25T14:21:38Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add case_16(NV4097_SET_TEXTURE_FORMAT, 0x20)","sha":"c096bfce7a322b4ecfde7cabcafe92617a536320"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-25T16:38:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-25T16:50:43Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Re-enable glPrimitiveRestartIndex","sha":"fe31f1be6189b343d152ff9ff038b1d0d4ffca9f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-25T16:05:07Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-25T17:07:16Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add Primitve restart & scissor test","sha":"29d0b1443ec86798f8ff08e1facc03bf47c10ad0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-25T18:45:44Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-25T18:45:44Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"msg":"Attempt to make columns sortable for game list","sha":"95f67080f8535da366692a8cfa338ab7914346a6"}
+{"author":{"avatar":null,"date":"2014-05-25T19:39:09Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-25T19:39:09Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #268 from O1L/master\n\nSwitch to OpenAL Soft.","sha":"9c1ec3569f159b4ca425b1dd969a40ca17e13d87"}
+{"author":{"avatar":null,"date":"2014-05-25T19:39:17Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-25T19:39:17Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #271 from raven02/patch-19\n\nDbgConsole: hide debug console","sha":"ddd485fdadeabe26ddd76886e32adade5ce015e0"}
+{"author":{"avatar":null,"date":"2014-05-25T19:39:22Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-25T19:39:22Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #272 from raven02/patch-20\n\nRSXThread: add few more logging and comments","sha":"6b66f7759087a2b9edf3c7ace27889b785d1e552"}
+{"author":{"avatar":null,"date":"2014-05-25T19:39:28Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-25T19:39:28Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #273 from raven02/patch-21\n\nRSXDebugger : add scissor test & primitive restart","sha":"5fda90abc68fa4d7df2a97607833805ff612a1c8"}
+{"author":{"avatar":null,"date":"2014-05-25T19:39:33Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-25T19:39:33Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #274 from raven02/patch-22\n\nGLGSRender: re-enable glPrimitiveRestartIndex","sha":"948d4ef3a28f36ad8fa5cb8eff283b94d7a6d309"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-25T20:31:40Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-25T20:31:40Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Minor changes\n\nIrrelevant modifications. None of this affects RPCS3 directly.","sha":"40f0f80f5de2266fe6477c1b7ee09e1d55a55d63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-25T20:36:55Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-25T20:36:55Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"msg":"Change types to stop compiler warnings","sha":"f1257f9e3f04161b370f1825fe4d2d5379eab051"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-25T20:59:26Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-25T20:59:26Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"msg":"Set Game List columns as sortable","sha":"f060f9e047afcbfcfcf8552248532f324d1f3d13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-25T21:01:00Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-25T21:01:00Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"msg":"Remove Unused varible","sha":"42e5000c2da79875213613296fe9a51a151012b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-25T21:30:15Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-25T21:30:15Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #275 from Blaypeg/master\n\nGUI Update, Game panel column headings now sortable","sha":"b953e06622d5dc39afae958c19c04efcba5abd75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6180192?v=4","date":"2014-05-26T12:01:07Z","email":"aniruddh.sxn22@gmail.com","login":"aniruddh22","name":"aniruddh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6180192?v=4","date":"2014-05-26T12:01:07Z","email":"aniruddh.sxn22@gmail.com","login":"aniruddh22","name":"aniruddh"},"msg":"Update sysutil_video.h","sha":"da77ed1de39e89d6f51403d6873064c38a9cb05a"}
+{"author":{"avatar":null,"date":"2014-05-26T12:30:27Z","email":"Dante38490@free.fr","login":null,"name":"Zangetsu"},"committer":{"avatar":null,"date":"2014-05-26T12:30:27Z","email":"Dante38490@free.fr","login":null,"name":"Zangetsu"},"msg":"Correct name soft_oal.dll and fix sln","sha":"3de9202533f80b75818d8a6acb7b67309fe26a56"}
+{"author":{"avatar":null,"date":"2014-05-26T12:34:07Z","email":"dante38490@free.fr","login":null,"name":"Dante38490"},"committer":{"avatar":null,"date":"2014-05-26T12:34:07Z","email":"dante38490@free.fr","login":null,"name":"Dante38490"},"msg":"Update README.md","sha":"4f1b7bf69a3597e15631747c721e24b0526eaff9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-28T00:03:57Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-28T00:03:57Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Opcode : add KIL & LRP","sha":"872cbec8ba32cae6a8fc2032673f812eb8b28629"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-28T00:29:13Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-28T00:29:13Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #280 from raven02/patch-23\n\nOpcode: add KIL & LRP","sha":"c1594255a76ff0d17d8219ac67d6a821e7da94cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-28T03:32:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-28T03:32:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Opcode : add STR/SFL and fix KIL (discard)","sha":"13d68cbeeb4ec54098df9ceda01ef00e44dfd656"}
+{"author":{"avatar":null,"date":"2014-05-28T13:00:30Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-28T13:00:30Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #281 from raven02/patch-24\n\nAdd few more opcode(STR/SFL) and fix KIL (discard)","sha":"69ec7a041ee5ddca07a9d415d75545d28257cea3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-30T01:24:54Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-30T11:19:26Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Cleanup and add point size/point sprite/specular","sha":"323a48d14b31a07d640191b1188a8ad72e85ebd3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-30T11:25:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-30T11:25:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix spacing","sha":"bb64684be97abe14cdf1853a8d2930a7b5a90641"}
+{"author":{"avatar":null,"date":"2014-05-30T14:13:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-05-30T14:13:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Another cellPamf issue fixed\n\nevent_flag messages changed","sha":"940d71ecdb2ce51e5025ab02ef9175636b1aac76"}
+{"author":{"avatar":null,"date":"2014-05-30T14:36:39Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-30T14:36:39Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #282 from raven02/patch-25\n\nCleanup and add point size/specular/point sprite","sha":"f545ba08cb68b7a53d7b187c03536b7836b781c5"}
+{"author":{"avatar":null,"date":"2014-05-30T17:16:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-05-30T17:16:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small RSX fix","sha":"d5d4f88c17f1c5483902ec2dfaa99bd0e02c5571"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-30T17:44:38Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-30T17:44:38Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Implement cellPngDecCreate/Destroy()","sha":"141d8e20ec06ee4d5da6fb8b02d23c7c3600c7a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-30T17:45:45Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-30T17:45:45Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add struct CellPngDecMainHandle","sha":"eb61c2a960263c7809b1cc85f07a1d730ebb088f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-30T17:56:31Z","email":"Blaypeg@users.noreply.github.com","login":"Blaypeg","name":"Blaypeg"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-30T17:56:31Z","email":"Blaypeg@users.noreply.github.com","login":"Blaypeg","name":"Blaypeg"},"msg":"Merge pull request #2 from DHrpcs3/master\n\nupdate","sha":"d455c21db51ce8e81439e0387456ae128956bb25"}
+{"author":{"avatar":null,"date":"2014-05-30T18:17:33Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-30T18:17:33Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #283 from raven02/patch-26\n\nImplement cellPngDecCreate/Destroy()","sha":"f09a358ea5feb6ee86a60472c03c40000ceb067e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-30T19:28:16Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-30T19:28:16Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix typo for #283","sha":"57d4d72f60cc784bd0a8ea1444d88e5e602d9995"}
+{"author":{"avatar":null,"date":"2014-05-30T19:36:00Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-05-30T19:36:00Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #284 from raven02/patch-27\n\nFix typo for #283","sha":"46e61efefb73ab1ac24389d4b3c9f391a366d1e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-30T22:20:39Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-30T22:20:39Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #286 from Nekotekina/master\n\nSome bugs fixed","sha":"a0cc3a0fb081f982ec5b060ad31c849cf037a853"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-30T22:49:19Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-30T22:49:19Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Use be_t<u32>/<64>","sha":"97561ff52b3c55591d9977ecaeb04b5d3aab2a3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-30T23:40:51Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-30T23:40:51Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #287 from raven02/patch-28\n\nUse be_t<u32>/<64> in struct","sha":"d3cb97d4e99c9dffceb23e75bf5061d01f0ee18d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-31T02:16:11Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-31T02:31:43Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellSpursAttributeSetMemoryContainerForSpuThread()","sha":"41d0163781f2b1d191d2638c8d4757ee51622aed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-31T07:48:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-31T07:48:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Compact duplicate draw objects routine","sha":"08c7ae64e33cd34078fa6c0410d012aff3fc6e3b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-31T08:52:02Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-31T08:52:02Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #289 from raven02/patch-30\n\nCompact duplicate draw objects routine","sha":"802a1fee7c10be7f6ef18bf70262afd2250dcf04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-31T08:53:39Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-31T08:53:39Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #288 from raven02/patch-29\n\nImplement cellSpursAttributeSetMemoryContainerForSpuThread","sha":"834f5dc9a912ab68de9dd6ba35d0aa3e0f53685d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-31T10:40:37Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-05-31T10:40:37Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"msg":"Add Menu and INI option to autostart emulation","sha":"0d3b8c08086402f25f4982736967a161ddd43c16"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-31T14:21:47Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-31T14:21:47Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Add a option for converting audio to 16 bit. Issue #276 fixed with using this option?","sha":"14fae9a40151cbcd862c399a9126a05e1750d952"}
+{"author":{"avatar":null,"date":"2014-05-31T15:11:15Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-05-31T15:11:15Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #277 from aniruddh22/patch-1\n\nAdd 1024x768 native resolution support","sha":"1affafe5ead4adacbceb971596ab2d25c20c6785"}
+{"author":{"avatar":null,"date":"2014-05-31T15:12:29Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-05-31T15:12:29Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #279 from Dante38490/patch-1\n\nUpdate README.md","sha":"ecd87aa2b57e36cafc5e7e45f39416618a2bf4b2"}
+{"author":{"avatar":null,"date":"2014-05-31T15:12:56Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-05-31T15:12:56Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #278 from Dante38490/master\n\nCorrect name soft_oal.dll and fix sln","sha":"d300a506302bed653dc28dfcf2a87d1496f40b86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-31T15:19:54Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-05-31T15:19:54Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"1705c5afb6e26e54a9992069796e7f910094b968"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-31T16:03:11Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-31T16:03:11Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #291 from O1L/master\n\nFixed issue #276.","sha":"1efa137f8fb2d4de9d844c95b6890b1ed40161cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-31T21:37:48Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-05-31T21:41:12Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Added cellSaveDataAuto* functions\n\nImplemented:\n- cellSaveDataAutoSave2\n- cellSaveDataAutoLoad2","sha":"c01b5fb0db5a6d1babe5e409da84c6759705b036"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-31T23:12:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-05-31T23:12:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Opcodo : Add DP2A and temporarily disable KIL","sha":"1bff3ad6ff515cd960542bb2b96c3223b1ca0f94"}
+{"author":{"avatar":null,"date":"2014-06-01T01:52:57Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-01T01:52:57Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #294 from raven02/patch-31\n\nOpcode : Add DP2A and temporarily disable KIL instruction","sha":"da2c5bbda0d10856d6bd1c6025b926021b31372e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-01T06:41:57Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-01T06:54:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fragment decompiler change to async mode","sha":"ceeff8ae815dee82e75d4f02298df597cca10dd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-01T08:16:12Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-01T08:21:14Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add /dev_flash and sub-directories","sha":"d7d4cd4434f006822c573a60b8ab6519171fcc3a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-01T09:38:37Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-01T09:38:37Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved mem_ptr_t.\nImplemented mem_func_ptr_t.","sha":"c00f4b60224b18f3f91155ac2ca8ed941a0679a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-06-01T13:10:26Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-06-01T13:10:26Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"msg":"Moved autostart to HLE Section","sha":"934856c3501b33b13762ec46140fe08b6ea5244a"}
+{"author":{"avatar":null,"date":"2014-06-01T13:16:08Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-01T13:16:08Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #295 from raven02/patch-32\n\nFragment decompiler changes to async mode","sha":"fea95d264f8c281606f0712a87d7736f95cd7ef6"}
+{"author":{"avatar":null,"date":"2014-06-01T13:16:18Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-01T13:16:18Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #296 from raven02/master\n\nAdd /dev_flash and sub-directories","sha":"c231bec7367e25b90cc58e2f79d2fe9f26886424"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-01T18:32:00Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-01T18:32:00Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Change to Error logging for null cmd","sha":"16d909834fd6a4d8fe42733e72ba9c9c5584ef5b"}
+{"author":{"avatar":null,"date":"2014-06-01T18:34:50Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-01T18:34:50Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #297 from raven02/patch-1\n\nChange to Error logging for null cmd","sha":"c6c87b66f90afee31d877a1e75a5fe203ab4aeb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-06-01T18:36:08Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7057840?v=4","date":"2014-06-01T18:36:08Z","email":"neil.avent@gmail.com","login":"Blaypeg","name":"Blaypeg"},"msg":"Add Remove Game option to Gameviewer\n\nCan right click game to remove from list and installation","sha":"dab71d01c15b10f0576b0fcdf7740923ef8d84a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-01T19:03:01Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-01T19:03:01Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #290 from Blaypeg/master\n\nAdd options for autoboot","sha":"fe0e34cbe1af5401eb896bc5ab00a8b7947ba298"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-01T19:28:29Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-01T19:28:29Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"msg":"help out compilers that use two phase lookup as dictated by the standard","sha":"924f117ba0ed93529b1cac9f9e0525adaee76f0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-01T19:56:49Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-01T19:56:49Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #298 from Bigpet/twophasefix\n\nhelp out compilers that use two phase lookup as dictated by the standard","sha":"a9768739eb71a9d7061a48b44a9212a77d0fcffb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-01T20:57:50Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-01T20:57:50Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"use non-wx header only Ini library in preparation of the core/gui devide","sha":"2d77415cc33925de778c0e9d4bfc9d556e051c84"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-01T21:07:35Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-01T21:07:35Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"revert argument order again, doesn't really need to be reversed, will just cause confusion","sha":"c216c0f2e824f80a29b433fe9013d9638fef134b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-01T22:02:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-01T22:02:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #300 from Bigpet/iniReplace\n\nuse non wxIni implementation","sha":"cb3622176a7cf83cd85ec73babf6454b5887f515"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T03:09:42Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T04:14:00Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Stub cellSpurs functions","sha":"3662c4e9bfdaf037d0ed732259714a4daf1b0b60"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T05:42:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T05:42:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Log as error for null pointer","sha":"5597f95abac378900691a0daf535597e04fb7289"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T06:53:13Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T06:53:13Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"EventFlag_add should be always present and checked","sha":"05d80e49948ca412fa73dcd137a1999abfc800ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T07:18:01Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T07:18:01Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix 'always start after boot' not saving","sha":"96bcfdac7e2812539987bbc5f9eff0da47e7e990"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-02T07:50:42Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-02T07:50:42Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #302 from raven02/patch-3\n\nFix 'always start after boot' not saving","sha":"a09984d210134b090081adc86e71cfbd3621b7d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T07:57:34Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T07:57:34Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Silly typo fix","sha":"c4522922f206951e42368e89ff9a4fd456f21f03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T08:09:36Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T08:09:36Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix wrong identation","sha":"54ede6c4e33707c5badf2e5680cd44907651cc76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T08:34:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T08:34:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Set default log level to Error","sha":"f7d21596a55be0e0897b179dc9bcd06e6c88d713"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-02T08:36:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-02T08:36:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #301 from raven02/patch-2\n\nStub bunch of cellSpurs functions & error log null pointer","sha":"ab65b38d9accf23c7b41185137dcd4867adff53f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-02T11:59:45Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-02T11:59:45Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Removed 32-bit config. from .SLN and CMakeLists","sha":"111da4d0fdf6e722130d1e755522161a33e03f68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-02T12:08:32Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-02T12:08:32Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Removed 32-bit related #if(n)def's","sha":"82c6d8d68bfbd5159794a322001902ade6ef9a55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-02T14:59:50Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-02T14:59:50Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed GameViewer issue\n\nDouble-clicking an entry in the sorted list caused the corresponding\nelement of the unsorted list to be run. This is now fixed.","sha":"b05bd512161b4b236d8976944b17a50016739c08"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-02T15:49:30Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-02T17:29:22Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add primitive InterlockedOr64 implementation\n\nuse non msvc specific type for int64_t\n\nadd umul for gcc","sha":"96e229abfa8d6a6fb78e5d3eb16b06bf9cec7c90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-02T17:46:42Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-02T19:12:35Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"include cstdint type\n\nadd mulh like function for gcc\n\navoid multiple definitions of msvc intrinsic replacements","sha":"1bb140780bd4cb78830d4d5b1f4c4d2b0cdd1cee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-02T20:00:05Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-02T20:00:05Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"move inline definitions in header,          wtf am I doing, Travis pls.","sha":"e8efb8f9fbe476308761b1fa3df61f79396450f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T22:17:33Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T22:17:33Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: Reorganize and group revelant NV4097 functions","sha":"c4075f159214d1648a7229ef05df70aa66bd6f74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T22:18:33Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-02T22:18:33Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add NV4097_SET_FLIP\n\nIt is custom naming","sha":"aac846ff741e5b1f244388f41c583d3d0d17edfb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-02T22:24:33Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-02T22:24:33Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #305 from DHrpcs3/remove-32bit\n\nRemove 32-bit configuration from the project","sha":"a382b81d5643461380776c0c794dd9730a72c45a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-03T10:32:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-03T10:32:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Speedup write color buffers","sha":"8bb5da3b0626130fde53d4a1c65a7466d98f580a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-03T12:11:38Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-03T12:11:38Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #308 from raven02/patch-6\n\nSpeedup write color buffers","sha":"664d2502ca3ae9cd538db7d53120427efdc60f60"}
+{"author":{"avatar":null,"date":"2014-06-03T13:13:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-03T13:13:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #307 from raven02/patch-5\n\nRSX: Reorganize and group revelant NV4097 functions","sha":"4faa4d6ed9111ad7d3b1baa0c16f75adab358af0"}
+{"author":{"avatar":null,"date":"2014-06-03T13:13:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-03T13:13:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #303 from raven02/patch-4\n\nSet default log level to Error","sha":"650c5155df856664ecb9d3215f1b4a6847e277a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-03T18:46:42Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-03T18:53:06Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix opcodes STR/SFL for both VP and FP","sha":"59628960b6c92250f74b0e8290da345d99be6b52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-03T19:02:12Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-03T19:02:12Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add missing case 0x0d","sha":"1a37723a05d04d9617350efb882a8997ddd8d228"}
+{"author":{"avatar":null,"date":"2014-06-03T20:08:44Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-03T20:08:44Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #309 from raven02/patch-7\n\nFix opcodes STR/SFL for both VP and FP","sha":"77f818fa232913ac92eaabd30ffc30d2f51c1f0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-03T20:42:15Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-03T20:42:15Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed cellSaveDataAutoLoad2\n\nProbably that's closer to what a real PS3 does. Anyway, tests are\nrequired to be sure about that.\n\nIssue #304 fixed.","sha":"585ac5a748588204c5790ed8d1bb44b86b319308"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-04T09:12:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-04T15:59:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"enum for vertex data type","sha":"ba913459848e7c3708f4918c8a06b7e8a854f710"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-04T16:03:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-04T16:03:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellSpurs task error code fixes and plus bunch of new functions add","sha":"c7b26f1372540e3996fa04a5438a6bd4ad5e9843"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-04T16:53:37Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-04T16:53:37Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Build fix","sha":"7c137cc482e060481acb3542660ef2f1ef244e34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-04T18:52:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-04T18:52:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Check 8-byte and 128-byte alignment for spurs","sha":"1827b918826b3044bf10ed4095cb723028b7136d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-04T19:57:17Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-04T19:57:17Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #310 from raven02/patch-8\n\nenum for vertex data type/antialias & cellSpurs error code fixes","sha":"a61c4f6bb0ac6bd57f0d90791c18861818604b02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-04T20:05:04Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-04T20:51:17Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellGcmSys : add those unimplemented and error logging","sha":"44d762fc606d3b397b52b74f440f1e6b2d15649b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-04T21:01:30Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-04T21:01:30Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #311 from raven02/patch-9\n\ncellGcmSys : add those unimplemented and error logging","sha":"53b650e88f0a93bbfbd068b05d0101838ff4cb8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-04T22:04:11Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-04T22:04:11Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellGcmSys: Report retrieval functions","sha":"af219bb41549c61f84879828e6d6b4d6d45f82ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-05T06:48:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-05T16:19:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellResc : add those unimplemented and error logging","sha":"26fc29c1a937ab2fe32e4ca0e543dcf95fcbf537"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-05T16:47:01Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-05T17:50:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellGcmSys: fill out some stuffs for zCulling","sha":"b9a055f1c8c0a86ced0fa810edacf1ef858e4a94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-05T17:56:41Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-05T17:56:41Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #312 from raven02/patch-10\n\ncellResc : add those unimplemented and error logging","sha":"4f36ecc6813adfb59fe946ea7ba0fe9cf1b78b3a"}
+{"author":{"avatar":null,"date":"2014-06-05T20:19:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-05T20:19:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #314 from raven02/patch-11\n\ncellGcmSys: fill out some stuffs for zCulling","sha":"283f290f47da7f130058c6d1ee12bbec75d8dcd4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-02T17:27:24Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-06T00:50:22Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Seperate ConLog.h and ConLogFrame.h (for now only seperate headers)\n\nmake precompiled header slimmer under Linux to increase CI and dev-machine build-times\n\nmake sure unused modules don't compile\nadd unused modules to the VS project to easier keep track of them","sha":"40add8f9a26649afd17a1199e9c2185f7847abb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-06T01:33:24Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-06T01:33:24Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"enable cotire for better build-times","sha":"8da681eab26c08326423187ec3a225f9cbdaa474"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-06T02:17:15Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-06T02:17:15Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #315 from Bigpet/simplestdafx\n\nReduce stdafx.h under Linux for better build-times","sha":"4ac80612400379d277481c0c4e71abfce1cc2eb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-07T02:22:29Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-07T02:22:29Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"GcmZcullInfo::Pack and removed 32-bit OAL dll","sha":"5e00dfb5c32a0961071d45ccb9e7b0f6614f493c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-07T06:34:36Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-07T06:34:36Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Improvements in SC_Process and other lv2 syscalls\n\n* Splitted the file in SC_Process.h and SC_Process.cpp.\n* Some argument data types modified on sys_process_* functions.\n* Implemented sys_process_get_number_of_object and sys_process_get_id.\n* Added dummy versions of other sys_process_* functions based on the old\nSysCalls::lv2Process* code (which I deleted).\n* Improved BE <-> LE comparisons on SC_Mutex, SC_Lwmutex and SC_Lwcond.\n* Updated some SC_Memory functions to use mem_ptr_t<T>.\n\nNOTE: There are probably better ways to get the active objects that\ndon't imply creating a new data type filled with std::set<u32>'s.\n\nTODO: For some types, the corresponding std::set<u32> isn't being\nupdated when an object is created/destroyed. I'll take care of this\nsoon.","sha":"253421697196f7dc69232c0f7ac01e62948ab645"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-07T07:08:16Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-07T07:08:16Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Reverted BE <-> LE comp. changes in some lv2 SCs","sha":"5ed77a3ca9dbfe846b741eba57bc4865c8a91c80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-07T07:54:02Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-07T08:08:02Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Centre the game list panel","sha":"219e048922c29c83ed46cee0f98ffa93d0372eed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-07T09:32:15Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-07T12:31:07Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellSpurs : initialize eventFlag","sha":"7855ebcd9f990e460f2d010e106cfb5aa8011377"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-07T13:23:12Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-07T13:23:12Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #319 from raven02/patch-15\n\ncellSpurs : initialize eventFlag","sha":"4f5f600ef67d56059559db8689b950742607b01a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-07T13:40:34Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-07T13:40:34Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #318 from raven02/patch-14\n\nCentre the game list panel","sha":"30a1516d196da500e88d983c17315ae3e36ff0f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-07T14:15:49Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-07T14:15:49Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved Fragment Shader Decompiler\n- Implemented LIT, RFL, LIF, BRK, IF, LOOP, REP\n- Fixed KIL, RCP, RSQ, DP2A\n\nImplemented fmt::replace_first & fmt::replace_all","sha":"f8e8e2f624199adf5e994f1b20deab9b0ee05923"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-07T15:08:14Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-07T15:08:14Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved unknown HLE functions logging\nFixed Fragment Shader Decompiler","sha":"a4740d5f0989b411fc68e6375ff24fe322fee3f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-07T15:18:40Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-07T15:18:40Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Reverted remaining .ToBE() deletions & small fix\n\nAnd fixed wrong comparison on: `_cellSpursEventFlagInitialize`.","sha":"125b71d2c5f8d0b248a7b66024c3140cc255d817"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-07T15:32:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-07T15:32:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed small error in Fragment Shader Decompiler","sha":"1b1ce85b326d66af43e97e91845acf3ed79df0e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-07T15:32:42Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-07T15:32:42Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"afcbeb371318a7ea18d96e269ebf13abbcec0edc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-07T15:52:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-07T15:52:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved Fragment Shader Decompiler\n- Fixed KIL\n- Added all regs to reg_table","sha":"e0046671f1d5c1c1652b5e0baf3a75f23c5a036e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-07T16:20:39Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-07T16:20:39Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fragment Shader Decompiler: fixed condition registers.","sha":"03d2798dba63c47a3b06b82019c1297c2b04535a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-08T05:27:57Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-08T05:27:57Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved PPU Interpreter\n- Fixed UpdateCR0\n- Fixed XER.CA updating","sha":"7bb966ba822240ad6b14935f07326adbcbecaa8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-08T14:43:53Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-08T14:43:53Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"enable full precompiled headers for non-Windows Platforms for now to make people not guess all the time what to include","sha":"982ea35d44c55269fe40b648c260e9ee2610b892"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-08T14:52:35Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-06-08T14:52:35Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved Vertex Shader Decompiler\n- Fixed condition register selection\n- Implemented LIT\n- Fixed RCP","sha":"3c8815cc06fb446646f13de02a1b53cbfe369e28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-08T14:58:40Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-08T14:58:40Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"try include guards to circumvent a weird error with gcc and unity builds","sha":"4d84507c9616fb0f650d10e29052465780af9fca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-08T15:26:01Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-08T15:26:01Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #323 from Bigpet/master\n\nenable full precompiled headers for non-Windows Platforms","sha":"d6f71ee2b318c64e9b7bc39b1f25773fb5959eb6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-08T09:10:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-08T15:29:16Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellSpurs: create new taskset using attr","sha":"f051011fd165c2257578312343f37147f97900a4"}
+{"author":{"avatar":null,"date":"2014-06-08T16:36:58Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-08T16:36:58Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #322 from raven02/patch-16\n\ncellSpurs : create new taskset using attr","sha":"c4e3ec825e23133bc4f75f1f65b0315ac4861e82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-05-02T06:30:32Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-08T21:16:06Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"initial start to eliminate static func init, not compilable atm\n\nmove module initialization into a module manager, still has some issues like stopping not working and debug crashing\n\nadd #idef 0 to modules that aren't in the windows project\n\ndon't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors\n\nremove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable\n\nadd secondary project, no real use for it now\n\nadd some memleak config to the emucore and add asmjit path to rpcs3\n\nsmall rebase error fixed to get it to compile again\n\nadd filters for emucore\n\nre-add the module manager and static file\n\nWIP commit, linker errors abound\n\nsome more abstraction layer stuff\n\nfix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers\n\nrebasing\n\nfix memset undefined and re() usage of se_t before declaration\n\nAdd wxGUI define by default for cmake builds\n\nfix copy constructors of Datetime header\n\nfix copy constructors of other wx interface classes\n\nremove static declarations of global variables\n\nmake wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls\n\nremove duplicate definition for FromUTF8 and ToUTF8\n\ntemp changes","sha":"c37905e465b0d619b94daea21fb23bd48795d9e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-08T11:43:13Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-08T21:16:06Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Fix building with precompiled headers\n\nadd the unimplemented modules to the emucore project\n\nfix a bug in the rXml wrapper that didn't consider the possiblity of functions returning null pointers","sha":"314307b84068c04e1772c750cea0b2f501ec0451"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-08T13:57:37Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-08T21:16:07Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add xinput pad handler to the windows emucore","sha":"10e10de98d119052abded8190779013e0e5aad4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-08T21:02:20Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-08T21:16:08Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add back fused gui log classes, this needs to be redone another way\n\nalso, add back wx requirement for strfmt","sha":"ed10ea754438e4ef58ec51b095ba471ee44c5895"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-08T21:23:36Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-08T21:23:36Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"reset debug output directory","sha":"33d82e0d6e9525cb102ae688fa53521004205783"}
+{"author":{"avatar":null,"date":"2014-06-09T00:22:04Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-06-09T00:22:04Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #239 from Bigpet/splitproj\n\nSplit gui and emulation core into seperate projects","sha":"93481fe27d9a01137f0ee1afddfebc08d55daaeb"}
+{"author":{"avatar":null,"date":"2014-06-09T00:36:15Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-06-09T00:36:15Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #216 from UnconventionalT/binary-dir-fix\n\nSet build independent binary output dir","sha":"bd6837f2f9fa7a325a382e58680de76c8ec78c23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-09T00:51:55Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-09T00:55:16Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"remove unexplained commented out code that I added myself with the last PR\n\n* remove unexplained commented out code that I added myself\n* revert asmjit settings change that was meant to only be local for me","sha":"e85abdeb2c9d372beb73354f95f84200bba0a8fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-09T01:08:22Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-09T01:08:22Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #324 from Bigpet/splitfixups\n\nremove unexplained commented out code that I added myself with the last PR","sha":"e050b7fd1e022ea1cbd81dd78e56c2e00434ba10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-09T01:36:26Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-09T01:36:26Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add dependency on asmjit to rpcs3 project,            might fix the buildbot","sha":"2382f3b69eb290b21e984bc8f766a86849cfd6a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-09T03:37:12Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-09T03:37:12Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix machine specific path, sorry about that one","sha":"779117d129014946abdf299e16272821e6107456"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-09T03:39:12Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-09T03:39:12Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"msg":"Merge pull request #325 from Bigpet/master\n\nadd dependency on asmjit to rpcs3 project","sha":"0d42fcf5361e0daa395ae995d651baae0b58007f"}
+{"author":{"avatar":null,"date":"2014-06-09T13:35:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-09T13:35:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSysmoduleLoadModule modified\n\ncellSysutilEnableBgmPlayback draft\ncellSurMixerGetCurrentBlockTag\ncellSurMixerGetTimestamp\nInterval.h draft","sha":"4fedf5749e24f791ddda9f9abb7f3c3acdb72d47"}
+{"author":{"avatar":null,"date":"2014-06-09T14:42:58Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-09T14:42:58Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #326 from Nekotekina/master\n\ncellSysmoduleLoadModule modified","sha":"c9dec7b11820df926d04744e338f49018ce7ade4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-09T16:28:52Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-09T16:28:52Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellSysUtil : stub remaining BGM playback functions","sha":"a28ad25221908755734d0cb1a52b28468bf9b5f8"}
+{"author":{"avatar":null,"date":"2014-06-09T17:01:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-09T17:01:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #327 from raven02/patch-17\n\ncellSysUtil : stub remaining BGM playback functions","sha":"52a1860f0abb8f67f8b0ba66dd40c01b9168563d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-11T20:22:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-11T20:22:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix vertex program decompile function","sha":"70f687136333697d2bc614d06fed0b6a795305c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-11T21:24:37Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-12T01:27:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Gameviewer : read PARAM.SFO for blue-ray disc","sha":"9b951d5d3f57890956b3ebf8ba7219851fe6f00c"}
+{"author":{"avatar":null,"date":"2014-06-12T14:27:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-12T14:27:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #333 from raven02/patch-19\n\nGameviewer : read PARAM.SFO for blu-ray disc copy","sha":"49e2d0528c1b96e60bb8ff43b6ca0f9620b53c30"}
+{"author":{"avatar":null,"date":"2014-06-12T14:27:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-12T14:27:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #332 from raven02/patch-18\n\nFix vertex program decompile function","sha":"ada0b31295751b05bc90e00ad8429a86c61b07ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-12T17:37:33Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-12T18:18:12Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix point size/line_width/poly_offset_scale_factor/bias","sha":"8112440a27f26c027eb7d4693b4fe718f653a54b"}
+{"author":{"avatar":null,"date":"2014-06-12T18:35:55Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-12T18:35:55Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #334 from raven02/patch-20\n\nFix point size/line_width/poly_offset","sha":"c5a244c669939d5926c0aa61b4f69f12bbdff829"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-13T18:44:18Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-13T20:14:04Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix line width conversion and comment out point size which already done in vertex shader","sha":"469faf43aabc354fcd1289044a0a16db7dd664f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-13T20:44:53Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-13T20:44:53Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Build fix","sha":"bf456d5d168ea49a75a9a65e9dc81e405a3a637a"}
+{"author":{"avatar":null,"date":"2014-06-13T21:11:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-13T21:11:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #335 from raven02/patch-21\n\nFix line width conversion and comment out point size which already done ...","sha":"49c9e0f3e25032906ccc325f0fb2d5cc50561a52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-14T06:16:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-14T06:16:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Gameviewer : name category HG as HDD game and DG as Disc game","sha":"f471857a255fad42f275ae74a95da402551726a3"}
+{"author":{"avatar":null,"date":"2014-06-14T13:40:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-14T13:40:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #336 from raven02/patch-22\n\nGameviewer : name category HG as HDD game and DG as Disc game","sha":"f7c0c6fd34d2010533785249572180a5429fdae0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-14T16:54:09Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-14T16:59:16Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Regresion fix : restore point size functionality","sha":"5007d62e2714e8f7ea1418c5f344eb67febdc198"}
+{"author":{"avatar":null,"date":"2014-06-14T17:18:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-14T17:18:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #337 from raven02/patch-23\n\nRegression fix : restore point size functionality","sha":"aaf60a18691ea83bee1914c6dd171d7f8ef27034"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-14T18:20:11Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-14T18:29:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: fix line width","sha":"44dd770cecbced22da22ca6ca0702cd07878a193"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-14T18:31:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-14T18:31:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #338 from raven02/patch-24\n\nRSX: fix line width","sha":"a4c5c4d5f965e3afca55d9044c884c385ee74ce6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-14T21:41:11Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-14T21:53:26Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX : implement line stipple","sha":"76c8eedb250a043a7d3031631b2d1ea711f9fde0"}
+{"author":{"avatar":null,"date":"2014-06-14T22:06:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-14T22:06:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #339 from raven02/patch-25\n\nRSX : implement line stipple [NV4097_SET_LINE_STIPPLE/PATTERN]","sha":"aafa3351dacdd4e8cb99e01e1809e7a96f291d3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-15T04:25:09Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-15T04:25:09Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"set default m_line_stipple_pattern as 0xffff","sha":"64044173c65e5b9cc1353540c5834f07b5e375bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-15T10:27:37Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-15T10:27:37Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #340 from raven02/patch-26\n\nRSX: set default m_line_stipple_pattern as 0xffff","sha":"a6bca0ecc5f2ab8319cdb0e879aa81505c47b248"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-15T19:05:28Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-15T19:05:28Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Paritally fix depth read elf","sha":"ee58ba9fd9d607520987ccea8b6470c358a3bee8"}
+{"author":{"avatar":null,"date":"2014-06-15T19:22:20Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-15T19:22:20Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #342 from raven02/patch-28\n\nParitally fix depth read elf","sha":"95cc6fb3bc730f89acb7fab769f85162d7f7646e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-15T22:32:11Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-15T22:32:11Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Drop off glEnable(GL_SCISSOR_TEST)","sha":"0541482ee4b5b0c0aa3405edac5c686c1186e40a"}
+{"author":{"avatar":null,"date":"2014-06-16T04:35:56Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-16T04:35:56Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #345 from raven02/patch-28\n\nDrop off  scissor test enable on OnInitThread()","sha":"ba08d25517be513655ae203de189c9f35a67e93a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-17T16:21:40Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-17T16:21:40Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Remove glDetachShader for vp and fp","sha":"79d34afb96c9b3109df36319d61a3515a008d42b"}
+{"author":{"avatar":null,"date":"2014-06-17T16:52:41Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-17T16:52:41Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #346 from raven02/patch-29\n\nRemove glDetachShader for vp and fp","sha":"4930d8785b7a76c77753bf0007ca2ae825930ff4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-18T21:02:04Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-18T21:02:04Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix 1024x768 resolution not being saved","sha":"4f4ab4c81add1742e3076d3745e644ca0c06fcb6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-18T21:20:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-18T21:20:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add comment","sha":"07006fd093836ea42089e5f8a09b587c16347292"}
+{"author":{"avatar":null,"date":"2014-06-18T21:39:04Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-18T21:39:04Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #348 from raven02/patch-31\n\nFix 1024x768 resolution not being saved","sha":"bf6507e9be7028b1bf34a66b690cc813d080eb8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-19T18:15:53Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-19T18:15:53Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Minor changes\n\n* Removed old lv2Process* functions\n* Function name is displayed again in unimplemented syscalls\n* Minor changes that won't affect the emulator.","sha":"f131f134a52e4723677b8bc69e79f464542451b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-20T09:33:02Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-20T09:49:22Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Option allow downscaling 720p/1080p to 480p","sha":"efffc7e6bc2ebbc9d93756783ed25cf35caa7115"}
+{"author":{"avatar":null,"date":"2014-06-20T13:47:49Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-06-20T13:47:49Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #351 from raven02/patch-32\n\nOption allow downscaling 720p/1080p to 480p","sha":"6e3289f392bf702275e1ddaaa50583dc69c99532"}
+{"author":{"avatar":null,"date":"2014-06-20T13:47:59Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-06-20T13:47:59Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #350 from Nekotekina/master\n\nSome crash avoidance","sha":"9048bab3059ef097c5ea11d9048f821207014cdd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-20T18:25:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-20T18:25:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Downscale small bug fix","sha":"fda97f25a0228d2a449202d83fadba6c1610c8ab"}
+{"author":{"avatar":null,"date":"2014-06-20T19:04:09Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-20T19:04:09Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #352 from raven02/patch-33\n\nDownscale small bug fix","sha":"52eaf10d934dce63ade9a5514cc0d8b2b802c06f"}
+{"author":{"avatar":null,"date":"2014-06-20T19:54:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-20T19:54:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_ppu_thread_create threadname workaround","sha":"7fca980887644b3776f98a1b8d17ae13e6a1558a"}
+{"author":{"avatar":null,"date":"2014-06-20T19:56:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-20T19:56:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SSemaphore basic implementation\n\nSet for RSX","sha":"1c4ae999d63cac8cfbcf1a93fbc267d696b9f231"}
+{"author":{"avatar":null,"date":"2014-06-20T19:57:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-20T19:57:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SQueue little improvement","sha":"e79236a97f6964cfb40990ee3ccb372825ddf5a9"}
+{"author":{"avatar":null,"date":"2014-06-20T22:03:46Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-20T22:03:46Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #353 from Nekotekina/master\n\nTried to replace semaphore","sha":"dc8b0b09c614801399e0bc8f2ab08218f628d47d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-20T22:57:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-21T04:02:11Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: matrix offset fix and use original buffer width for writing color/depth","sha":"12f217aba997dab447c0247b1716d3197ee0eb41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-21T04:29:17Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-21T04:29:17Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Misc thread started/ended/aborted aligment","sha":"c3960b7f4392dc785c7ec8641b83cfa956f2fd80"}
+{"author":{"avatar":null,"date":"2014-06-21T04:58:11Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-21T04:58:11Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #354 from raven02/patch-34\n\nRSX: matrix offset fix and use original buffer width/height for writing color/depth","sha":"283c1f64e7b77cf597fad352a8fdf6b536f6b401"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-21T10:04:59Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-21T10:04:59Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Set rendering width/height to buffer width/height","sha":"4e55e6abbd331ad61d9cd24896fcf1ad2f031a1b"}
+{"author":{"avatar":null,"date":"2014-06-21T14:24:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-21T14:24:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SC_Semaphore rewritten","sha":"5da33c62430026e5d5885e957dbed111d13c41fa"}
+{"author":{"avatar":null,"date":"2014-06-21T14:26:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-21T14:26:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small workaround","sha":"54cdc41ac82573a5f0311d39aee4eb72edf0f9c3"}
+{"author":{"avatar":null,"date":"2014-06-21T14:27:54Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-21T14:27:54Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #356 from raven02/patch-1\n\nSet rendering width/height to buffer width/height","sha":"b9bfd7af80d9d30ebdc624f0698572c8512c588e"}
+{"author":{"avatar":null,"date":"2014-06-21T14:40:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-21T14:40:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"2fad8039f516cbebdd326fd8c35de3faf677264c"}
+{"author":{"avatar":null,"date":"2014-06-21T18:57:05Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-21T18:57:05Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #357 from Nekotekina/master\n\nSC_Semaphore improved and detached from (r)wxSemaphore","sha":"591295315233a4476f62efff4e3a16ace1e86f9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-21T21:23:24Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-21T21:23:24Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"FP: flush m_code_level & check emptyness of m_end_offsets","sha":"2f2a0c8fbc685141f4b4b77a544ae286d2ef8b64"}
+{"author":{"avatar":null,"date":"2014-06-21T21:41:51Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-21T21:41:51Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #359 from raven02/patch-2\n\nFP: flush m_code_level & check emptyness of m_end_offsets","sha":"6bf46957214f1c03f110a37cb7903fc9b251cf2b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-21T22:55:02Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-21T22:55:02Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Paritally revert #359","sha":"f5813bf2cd394228ff49611fa7e861308087b0ad"}
+{"author":{"avatar":null,"date":"2014-06-21T23:04:18Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-21T23:04:18Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #360 from raven02/patch-3\n\nParitally revert #359","sha":"69cb8349e60c500bf4b15592ab486d10c83d51a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-22T08:01:59Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-22T10:44:22Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: asynchronous glReadPixels with PBO for writing color/depth buffers","sha":"a99061127fd4eb906c3536bf7476f622872f1e71"}
+{"author":{"avatar":null,"date":"2014-06-22T10:59:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-22T10:59:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"rCriticalSection & rSemaphore removed\n\nSC_Semaphore errors fixed\nRoom for interrupt threads","sha":"30b8e512341b98989e4ba36297f0a64a51575608"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-22T11:23:37Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-22T11:23:37Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #362 from Nekotekina/master\n\nrCriticalSection & rSemaphore removed","sha":"5a1d702e3dd23598702a8c841a8a563be08ef9b8"}
+{"author":{"avatar":null,"date":"2014-06-22T16:27:59Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-22T16:27:59Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #361 from raven02/patch-4\n\n RSX: asynchronous glReadPixels with PBO for writing color/depth buffers","sha":"77e11d670a97ed9e98025f9a1ccd2e65b5f7d8f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-22T19:45:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-22T19:45:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX : delete PBO when exit thread","sha":"fe74f97d442a467e3e1589888928900f75e087a0"}
+{"author":{"avatar":null,"date":"2014-06-23T01:03:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-23T01:03:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Work on RawSPU: interrupt mailbox\n\nAchievement unlocked: run spu_test!","sha":"f9c592098f7d8c83e7340fc0fef651c5dc27a23e"}
+{"author":{"avatar":null,"date":"2014-06-23T02:41:11Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-06-23T02:41:11Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #365 from Nekotekina/master\n\nWork on RawSPU: interrupt mailbox","sha":"35b57fc78e6729d198bc2bcda6423393ab77b79e"}
+{"author":{"avatar":null,"date":"2014-06-23T02:41:26Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-06-23T02:41:26Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #364 from raven02/patch-5\n\nRSX : delete PBOs when exit thread","sha":"2e668cd2b610f0a200a9869c880e304400eef6d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-23T16:42:57Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-23T16:42:57Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: Use blit for MRT as well","sha":"677bc4c553c2d80ddb205a2936b87f9c888f18bd"}
+{"author":{"avatar":null,"date":"2014-06-23T17:05:40Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-23T17:05:40Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #366 from raven02/patch-6\n\nRSX: Use blit for MRT as well","sha":"d0fd6eedf61092534cc7c189de8bad76c7f1a523"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-23T17:40:40Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-23T17:41:22Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Added some lv2 syscalls for sys_prx","sha":"eb3e18ac7e31b6c042eb83fb5388f0a08d1d4efe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-24T15:03:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-24T15:03:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Gameviewer : fix wrong category","sha":"6f3b3f11c8870f6b63eaa12cbb576f9bb446eb4d"}
+{"author":{"avatar":null,"date":"2014-06-24T16:23:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-24T16:23:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #368 from raven02/patch-7\n\nGameviewer : fix wrong category","sha":"336442eeba9f1da1559574bb2554718344202d40"}
+{"author":{"avatar":null,"date":"2014-06-24T22:16:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-24T22:16:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fixes","sha":"2200e6f4d9eb79d96c89660ec1ace4aa464cd88b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-25T16:10:17Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-25T16:10:17Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Log error when flag 0x3c/0x3d EDAT files detected","sha":"eb7128bcc1d07dc2fb4e8a146f4bd4e29100adf9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-25T16:11:10Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-25T16:11:10Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add EDAT_FLAG_0x3C/0x3D","sha":"0ed518a85d08b83133d155912cdb3944989684e8"}
+{"author":{"avatar":null,"date":"2014-06-25T19:07:41Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-25T19:07:41Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #369 from raven02/patch-8\n\nLog error when flag 0x3c/0x3d EDAT files detected","sha":"4cbbbec8b38218e7743c8781aac49e7ac97f4353"}
+{"author":{"avatar":null,"date":"2014-06-25T21:59:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-25T21:59:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some freezing fixed","sha":"eca7339a67e38f70ee9992f061ff81bfee220832"}
+{"author":{"avatar":null,"date":"2014-06-25T22:37:21Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-25T22:37:21Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #370 from Nekotekina/master\n\nFixed some samples freeze","sha":"394b698e92156f9ccba1b31dfc304785cebdf19c"}
+{"author":{"avatar":null,"date":"2014-06-26T14:17:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-26T14:17:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SC_Event_flag: test passed","sha":"458322e548c09926b5ad5a8a3f1d3533df75be56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-17T15:44:03Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-26T15:34:28Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"msg":"Logging system rework\n\n* use one central unified log with channels/priorities ad-hoc listener registration and de-registration\n* disable buffering by default\n* add multi-threaded ringbuffer implementation\n* use buffered listener for the gui (using the ringbuffer)","sha":"21da317453b45c3aa4e765c3e980164fb8ac9b1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-27T04:01:40Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-27T04:01:40Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"rename conlog gui file and set the logbuffer-consumed flag sooner","sha":"1ad4380fab31d27f96ee34c9b111a3f91c123834"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-27T07:22:00Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-27T07:22:00Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"use a more compact method to add and remove listeners t o all channels","sha":"ae472e9e67a8c0b9e1e6383fe29af9d7c372500e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-27T10:09:44Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-27T10:09:44Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #371 from Bigpet/newlogtemp\n\nLogging system rework","sha":"afad6daa7df7de28756e621fc7bcbd16a2351b02"}
+{"author":{"avatar":null,"date":"2014-06-27T11:11:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-27T11:11:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSysutilBgmPlayback fix","sha":"5ef3b80596a2bbf225f30b300998cc4c2cb39a0e"}
+{"author":{"avatar":null,"date":"2014-06-27T13:03:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-27T13:03:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"e6a4ef9eb875f7ed5b52cc821df007b487e8d42e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-27T13:26:46Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-06-27T13:28:17Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"use only one set of logging macros instead of two and don't use free() as a function name","sha":"95f1a0e64531e70df05c26798d9be2aca9cc4f7b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-27T15:22:15Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-27T15:22:15Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #372 from Bigpet/logsimpler\n\nDon't use two sets of logging functions","sha":"f8a0225b33b070189d37e325223ec1197b4966c9"}
+{"author":{"avatar":null,"date":"2014-06-27T16:05:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-27T16:05:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"a4308b96f6eca0541a55a870e6f3ab369831d146"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-27T23:30:12Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-27T23:30:12Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix CELL_GCM_TEXTURE_DEPTH24_D8 and detail trace for GLTexture::Init()","sha":"a1db96d70de2343116957c45e0b8b8d2cd4e0586"}
+{"author":{"avatar":null,"date":"2014-06-28T00:03:51Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-28T00:03:51Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #375 from raven02/patch-2\n\nFix CELL_GCM_TEXTURE_DEPTH24_D8 and detail trace for GLTexture::Init()","sha":"2d862da5401ffde3308330da73926a6c08c379ad"}
+{"author":{"avatar":null,"date":"2014-06-28T01:19:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-28T01:19:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small changes","sha":"b11e08658919b55a403e2f155ed1672cf20c2abb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-28T09:19:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-28T13:12:14Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix texture MAG filter and add max anisotropy","sha":"382af8437c831f734260be34cd4ef5bb84ba5ed5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-28T14:51:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-28T14:51:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #376 from raven02/patch-3\n\nFix texture MAG filter and add max anisotropy","sha":"57a288a242a4a60dfda944d5e814d92833733fe7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-27T14:57:58Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-28T15:58:20Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Remove obsolete option \"Hide Debug Console\" and move skipPamf to HLE section","sha":"fb8ced95b01cbf2a74f2d31606134d115abc805d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-28T16:00:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-28T16:00:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #373 from raven02/remove\n\nRemove obsolete option \"Hide Debug Console\"","sha":"0c53c00325e251c26de59e320663fefc84e7a64b"}
+{"author":{"avatar":null,"date":"2014-06-29T03:21:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-29T03:21:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small changes 2","sha":"8987350b5b4f96b12856fe53f26f59bd5cf0cc1c"}
+{"author":{"avatar":null,"date":"2014-06-29T03:22:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-29T03:22:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"6f1efc851f93770644422152ce196740b8d8380d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-28T22:07:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-29T19:15:37Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellResc : InitMembers , InitSurfaces and few stuffs for InitRSXContext","sha":"26c77fbaa0cebc41bcbbc9d981aba4120982e52c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-29T19:32:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-29T19:32:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #377 from raven02/patch-4\n\ncellResc : InitMembers , InitSurfaces and few stuffs for InitRSXContext","sha":"42424618aff98d34114258d87164b1784a0cf89d"}
+{"author":{"avatar":null,"date":"2014-06-29T21:08:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-29T21:08:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fixes","sha":"cf98ddf979a810cf12f82ca2329b063fc45b9f66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-29T21:32:38Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-29T22:11:00Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Implement cellRescCreateInterlaceTable()","sha":"347f6f20b70e5880813c5d7e29b0f201c2198066"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-30T02:38:24Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-30T02:38:24Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Build fix","sha":"0f1606fbd399d0ef6ffbaca47e289393fdb62d89"}
+{"author":{"avatar":null,"date":"2014-06-30T03:45:58Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-06-30T03:45:58Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #378 from raven02/patch-5\n\nImplement cellRescCreateInterlaceTable()","sha":"0a4cffd7599e46f37bb765d7ef769108952d8b46"}
+{"author":{"avatar":null,"date":"2014-06-30T22:53:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-30T22:53:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellGameDataCheckCreate2 implemented","sha":"06868cb694f47dbfe00bff97f7b5ab85c0076a3e"}
+{"author":{"avatar":null,"date":"2014-06-30T22:54:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-06-30T22:54:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"017e44cf4d57b97887257197fdb8d6c04b6e3f1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-30T23:57:49Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-30T23:57:49Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Cross-check and validate all NV0406E/4097/3089/3062/308A functions with gcm_method.h","sha":"8d1d227dac1311c42e614574204a0ab1de815717"}
+{"author":{"avatar":null,"date":"2014-07-01T00:31:35Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-01T00:31:35Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #379 from raven02/patch-7\n\nCross-check and validate all NV0406E/4097/3089/3062/308A functions with ...","sha":"203706842801854c0ae5f626726aa4f68cec6e4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-06-30T18:27:45Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-01T02:20:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellResc : few more stuff init and cleanup","sha":"a7bac1f084e4336ed227849b4a863aad603cb62e"}
+{"author":{"avatar":null,"date":"2014-07-01T02:51:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-01T02:51:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #380 from raven02/patch-6\n\ncellResc : few more stuff init and cleanup","sha":"f0468a145f37b519d4cf470c9df68f9ada6a2b19"}
+{"author":{"avatar":null,"date":"2014-07-01T12:21:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-01T12:21:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"FileExists() fixed","sha":"2d1409c7063be5c5e7fad0564b04dbae71687b49"}
+{"author":{"avatar":null,"date":"2014-07-01T13:29:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-01T13:29:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed conflicts","sha":"f3b61f58eff439a519d644db186d71a14418a35c"}
+{"author":{"avatar":null,"date":"2014-07-01T15:34:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-01T15:34:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"2eeab1feb00defc95ff8152a3a35e0c3b88e587d"}
+{"author":{"avatar":null,"date":"2014-07-01T16:04:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-01T16:04:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2","sha":"5f6a2365503506269d15c7b777a97eec37b68339"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-01T16:01:26Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-01T16:09:24Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Implement Polygon Stipple","sha":"7aefdd3e1fe686a645690382b88740641fb7bbcc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-01T16:27:55Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-01T16:27:55Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #382 from raven02/patch-8\n\nImplement Polygon Stipple","sha":"97e31c8873740b3434b06ee37e7374ad911114db"}
+{"author":{"avatar":null,"date":"2014-07-01T17:39:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-01T17:39:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 3","sha":"8736a14599e6fc702141b42e4fdd837fc4afd866"}
+{"author":{"avatar":null,"date":"2014-07-01T17:50:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-01T17:50:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 4","sha":"7f5f67163b36c2b59c6d5f7d8dac25a8e4570f97"}
+{"author":{"avatar":null,"date":"2014-07-01T18:06:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-01T18:06:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 5","sha":"fdc84796357ddaab5030198a39828486e9f2f99c"}
+{"author":{"avatar":null,"date":"2014-07-01T18:42:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-01T18:42:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 6","sha":"77458e5795c6800fcb521e523c834dfd8b9d883a"}
+{"author":{"avatar":null,"date":"2014-07-01T19:06:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-01T19:06:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #381 from Nekotekina/master\n\nNekotekina's stuff","sha":"fd56797b77eeaec4a8fda3a31f4411a6687c0d4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-01T20:29:16Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-01T20:29:16Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Indentation fix","sha":"1eb66198c0b3a1d005ecf88dc7368708cd708b3a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-01T20:42:53Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-01T20:42:53Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Obsolete skipPamf option","sha":"3019122685848878fe91d3eafd7691a7b6ad82ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-01T21:19:13Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-01T21:19:13Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #384 from raven02/skippamf\n\nObsolete skipPamf option","sha":"3d4be9aee366fbd3c7c98a4430edbc097284f977"}
+{"author":{"avatar":null,"date":"2014-07-01T22:58:50Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-01T22:58:50Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #383 from raven02/patch-9\n\nIndentation fix","sha":"6d870cb5588c89a0da6ab8ff64cf246577252db4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-02T08:30:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-02T08:30:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX : check packed before memcpy when writing color/depth buffers","sha":"82a28d3365950549b3858c8d1b20aca5d9f4b93a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-02T08:42:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-02T08:42:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #385 from raven02/patch-10\n\nRSX : check packed before memcpy when writing color/depth buffers","sha":"cb61112490b3a1de5e80e88357d79cde019b9052"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-02T16:41:06Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-02T16:48:44Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Obsolete option \"480p downscale\" and make it auto rescale whenever approriate","sha":"b7be0dc6338fd4cc2d9785116d3838269c22e3f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-02T17:20:09Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-02T17:20:09Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #386 from raven02/patch-11\n\nObsolete option \"480p downscale\" and make it auto rescale whenever appro...","sha":"e29a1ddef7875337ac957bd0afba42bdf38d09fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-03T05:29:54Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-03T05:29:54Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Sanity check m_alpha_func","sha":"8b9a454e2f8095873f8a6b8289f04ce2846ecb54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-03T19:10:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-03T19:10:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellResc : SetVBlankHandler() & SetFlipHandler()","sha":"4d57af9ed2458032866544c0304ad62b9ac47583"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-03T22:19:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-03T22:19:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Few changes and comment","sha":"feb241439eb731211b7e196b4c555c57ed49e66f"}
+{"author":{"avatar":null,"date":"2014-07-03T22:52:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-03T22:52:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellMsgDialog functions improved\n\nCallback can return result now","sha":"abbbaa222bc4dd6447bfb9575a9f12e2a584d1ce"}
+{"author":{"avatar":null,"date":"2014-07-03T23:06:55Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-03T23:06:55Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #389 from raven02/patch-14\n\ncellResc : SetVBlankHandler() & SetFlipHandler()","sha":"e22e9993d74118e0f0aced7b3b07181e08ccef14"}
+{"author":{"avatar":null,"date":"2014-07-03T23:07:11Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-03T23:07:11Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #388 from raven02/patch-13\n\nRSX: sanity check m_alpha_func","sha":"f3cbdcd59da6552b4bd880ede69d8aecff6a8d92"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-03T23:24:14Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-03T23:24:14Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #390 from Nekotekina/master\n\ncellMsgDialog functions improved","sha":"072dfc600cc86ac03225905907dc32be59f2d6e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-04T08:29:31Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-04T08:29:31Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add files to allow for packaging  on teamcity","sha":"69c9d95f10952ccec7b707a029fd2dc930575104"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-04T08:32:02Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-04T08:32:02Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Merge pull request #391 from Bigpet/master\n\nadd files to allow for packaging  on teamcity","sha":"d84c619882d8a40a4fc5758a24c58a823dc57ddc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-04T10:15:43Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-04T10:15:43Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"make script runnable locally","sha":"ba29a19e8278f049ed9c9c7b7fa9d37af57a4733"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-04T10:19:01Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-04T10:19:01Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Merge pull request #392 from Bigpet/master\n\nmake package script runnable locally","sha":"c5e780ffb2ebe1f5cc480bc4bd662470e7d098a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-04T11:13:47Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-04T11:13:47Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"don't prompt for xcopy\n\ndon't ask whether to override files when copying them for packaging","sha":"061fe50835aea22acbf764a60b1cd160fc28171a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-04T20:01:49Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-04T20:01:49Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX : comment out code for NV4097_SET_SCULL_CONTROL and add LOG_WARNING","sha":"6a6fbea5ee16a2116b7b24f52da116ea424e3e56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-04T20:07:15Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-04T20:07:15Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Comment style change","sha":"1fc3654ca424e8eab9b345e07596f609be75e229"}
+{"author":{"avatar":null,"date":"2014-07-04T22:13:28Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-04T22:13:28Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #393 from raven02/patch-16\n\nRSX : comment out code for NV4097_SET_SCULL_CONTROL and add LOG_WARNING","sha":"c4360ee834fb057cc87328dba7fc223489caf01d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-05T16:02:59Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-05T17:33:04Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX blending MRT and cellResc 512MB io address space changes","sha":"9ede2d675384a66904edac00c0ce389c7da083b1"}
+{"author":{"avatar":null,"date":"2014-07-05T19:23:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-05T19:23:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Decrementer","sha":"d16953d3924de984e4aaf15878ef8d99a8ac9f86"}
+{"author":{"avatar":null,"date":"2014-07-05T19:24:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-05T19:24:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SSPlayer funcs in libmixer","sha":"60f3ed3543b5854b9a062c35140ea50a552fbb90"}
+{"author":{"avatar":null,"date":"2014-07-05T19:24:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-05T19:24:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"b0ce69f1e17ac99e6495f7cc77c6e25625731ccc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-05T20:29:56Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-05T20:29:56Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #395 from Nekotekina/master\n\nSPU Decrementer, cellSSPlayer functions","sha":"98787ddb3b28168efe833c3c3fdef3e6a7765063"}
+{"author":{"avatar":null,"date":"2014-07-06T00:15:39Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-06T00:15:39Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #394 from raven02/patch-17\n\nRSX blending MRT and cellResc 512MB io address space changes","sha":"7218ccfe669a66511d8eac62b964a631e87cc373"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-06-24T22:38:34Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-06T14:23:37Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Removed external functions from SysCalls.h\n\n* Replace `int` with `s32` as return type for syscalls.\n* Renamed `SC_Something.*` files with the proper lv2 name\n`sys_something.*`.\n* Moving away from the lv2, those functions and folders that doesn't\ncorrespond to lv2 functions. E.g. module functions from sys_io,\nsysPrxForUser, cellGcmSys.\n* Splitted some files (memory -> memory+mmapper) and merged other ones\n(event+event_flag ->event, spu+spu_thread -> spu), according to common\nsense, PSDevWiki docs, and checking firmware files.\n* Removed external functions from `SysCalls.h`.\n\nNOTE: What should we do about: cellGcmCallback? It's not a lv2 syscall\nbut it appears on the sc_table and it is actually called in games. Is\nthis some kind of hack?","sha":"08d61163eae615172ff89b077893daefb41d3d9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-05T23:30:28Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-06T14:44:56Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Removed old / unnecessary code\n\n* Removed Plugins.h file as I assume setting up a plugin hell is a bad\nidea (does anyone disagree?).\n* Removed FnIdGenerator, and moved FnIdGenerator::GenerateFnId to\ngetFunctionId in Modules.cpp\n* Disabled RSX Debugger and Memory Viewer when the emulator is stopped.\n* ELF64Loader::LoadPhdrData refactored.","sha":"0002cc0af3daaf36316dbaba1ea50cb730b5d4d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-06T16:05:52Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-06T16:05:52Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed conflicts and minor changes (2)","sha":"230ba0d360403929f89dec429ef640fe0b202cad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-06T17:02:50Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-06T17:02:50Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #396 from DHrpcs3/prx_loader\n\nChanges for modules and lv2 sycalls","sha":"d0b7c9a9afdd2bc8622112d9ffb400225fce4e77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-06T17:40:51Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-06T17:40:51Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix compile error on the Debug - Memleak config","sha":"ad83fb325cf56e996392094e085c4f446af42b88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-06T18:12:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-06T18:12:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #398 from Bigpet/slnfix\n\nfix compile error on the Debug - Memleak config","sha":"e55c8410b4062b1ec512df073df1f5b8304a182d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-06T18:26:05Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-06T18:26:05Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellPamf : add error log for CELL_PAMF_ERROR_INVALID_ARG","sha":"d751e350c686c8aaa78cfd89f4f128e54b09cfca"}
+{"author":{"avatar":null,"date":"2014-07-06T19:39:37Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-06T19:39:37Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #399 from raven02/patch-18\n\ncellPamf : add error log for CELL_PAMF_ERROR_INVALID_ARG","sha":"a26bc227d840b8239863463d66665f08053ce756"}
+{"author":{"avatar":null,"date":"2014-07-06T23:36:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-06T23:36:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Memory allocation changes","sha":"19db12e090021bc75d44a3453e399b3dba973c71"}
+{"author":{"avatar":null,"date":"2014-07-06T23:36:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-06T23:36:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"faab4ed6db9a56c6b1d7f3b9c5a906f142209449"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1764343?v=4","date":"2014-07-07T06:53:47Z","email":"hwguy.siplus@gmail.com","login":"Triang3l","name":"SiPlus"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1764343?v=4","date":"2014-07-07T06:53:47Z","email":"hwguy.siplus@gmail.com","login":"Triang3l","name":"SiPlus"},"msg":"Change vec2(float, 0.0).xxxx to vec4(float) in VS","sha":"8a305b19af40e7d4dceafa1976e341959a8044be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1764343?v=4","date":"2014-07-07T06:57:03Z","email":"hwguy.siplus@gmail.com","login":"Triang3l","name":"SiPlus"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1764343?v=4","date":"2014-07-07T06:57:03Z","email":"hwguy.siplus@gmail.com","login":"Triang3l","name":"SiPlus"},"msg":"Change vec2(float, 0.0).xxxx to vec4(float) in FS","sha":"bf8e6dbc8ea524a286d91fb0cccc81e7e49c90bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-07T08:25:31Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-07T08:25:31Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #400 from SiPlus/patch-1\n\nChange vec2(float, 0.0).xxxx to vec4(float)","sha":"bbf3c80d04af0b60d9a61dff89e50d11d7b4c52a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-07T10:59:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-07T14:16:59Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX : add rescale support for native 960x1080 & 1024x768","sha":"38e41e0ea81503acd82e33d6ebc86263f943e4f7"}
+{"author":{"avatar":null,"date":"2014-07-07T15:48:08Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-07T15:48:08Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #401 from raven02/patch-19\n\nRSX : add rescale support for native 960x1080 & 1024x768","sha":"cd8f2867914c83b318eac5df2a3cca609edb4afb"}
+{"author":{"avatar":null,"date":"2014-07-07T17:22:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-07T17:22:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some cleanup","sha":"d1fff053c265a328726fb866fce0218bc231eaaa"}
+{"author":{"avatar":null,"date":"2014-07-08T14:26:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-08T14:26:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ifdefs and linux (posix) version (not tested)","sha":"50b42f85932a454e8a0b0f2b5459472378a2df95"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-08T15:18:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-08T15:25:02Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: simplify recale native resolution","sha":"52112006d40dca7b82121b11175d04f7a581e268"}
+{"author":{"avatar":null,"date":"2014-07-08T16:18:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-08T16:18:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #403 from raven02/patch-20\n\nRSX: simplify recale native resolution code","sha":"3c7d48933f63477b7f1747f58ad2667d9c59bc44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-08T15:58:01Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-08T16:25:17Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Qt: Update to Qt 5.2 code base. Makes the code much simpler!","sha":"ba3838f54c834f3d7b79970d8a16afda2a6c5649"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-08T16:26:31Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-08T16:26:31Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Qt: Update to match rest of emu.","sha":"2ba5ada9f81203666297beedc1e85274daa98db3"}
+{"author":{"avatar":null,"date":"2014-07-08T17:08:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-08T17:08:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"34590bc88469f5dc040b8fef5609a2932436a8bd"}
+{"author":{"avatar":null,"date":"2014-07-08T17:18:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-08T17:18:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix 2","sha":"6e77f80d5f57511c110a433f24473e4d04b50d57"}
+{"author":{"avatar":null,"date":"2014-07-08T17:18:44Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-08T17:18:44Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #404 from xsacha/master\n\nQt update","sha":"f232351720f9292772a1f433b9c80c63389e70f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-08T20:33:57Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-08T20:34:10Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"wxRemoval: Ini.cpp","sha":"0299ab7660f8bc22d1019a3b3627b28c2d4f78fb"}
+{"author":{"avatar":null,"date":"2014-07-08T23:04:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-08T23:04:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some bugs fixed","sha":"123c4ba1a8bd83230a047eb8941ac78ab7276184"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-04T08:29:31Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-09T15:18:23Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add files to allow for packaging  on teamcity\n\nadd initial appveyor script\n\nadd submodule update before build\n\nadd msbuild cmd\n\nremove msbuild cmd\n\nmake script runnable locally\n\nadd solution without wxwdigets\n\nadd initial appveyor script\n\nadd submodule update before build\n\nadd msbuild cmd\n\nremove msbuild cmd\n\nadd packaging step to appveyor\n\nadd ftp upload test\n\nuse msbuild explicitly\n\ndoesn't seem to work otherwise\n\ntemporarily remove deploy script\n\ntemporarily remove build script\n\nremove non-essential stuff\n\nadd back some stuff\n\nset artifact path\n\nupdate artifact stuff\n\ntry to add back deploy\n\nadd build step again, *sigh*\n\nadd some more build settings\n\nadd build sript style build again\n\ndownload wxwidgets instead of building\n\nremove quite flag for debugging\n\nadd cert igonre to download\n\ndont redundantly add folder\n\nuse a seperate solution without wxwidgets dependencies\n\nonly use the rpcs3 7z as artifact\n\nto avoid re-packaging wxwidgets, also comment out deployment, since I don't have acccess to the main account to add secure strings\n\nConflicts:\n\tpackage.bat","sha":"dd382b2afc941f0bdc9f2c1239f19c52a7d4bdb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-09T15:27:20Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-09T15:27:20Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"add back /Y flag on xcopy\n\nto make sure no stdin input is requuired","sha":"10d9c3e4126fb270232845d9087abf601c133199"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-09T19:16:17Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-09T19:16:17Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Revert some changes until GCC 4.9 is available.","sha":"711f9eadc5c15d40243a8f83fc7aaf4ef5407f12"}
+{"author":{"avatar":null,"date":"2014-07-09T20:02:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-09T20:02:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Using recursive mutex","sha":"bb0695e76c388ed55d368a70e3d5b0389ff75552"}
+{"author":{"avatar":null,"date":"2014-07-09T20:02:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-09T20:02:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"3fdeb7299944bce9c1a66d6b561be5ab52a9fcb2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-09T20:49:24Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-09T20:49:24Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Use an alternative to sregex.","sha":"80dbe1a67f4c663b64475cdbe3fe0e57699aa4e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-09T20:57:40Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-09T20:57:40Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #405 from xsacha/master\n\nwxRemoval: Ini.cpp","sha":"2e06e8152ed3ca3e4b18e60ae5c89c38c209ac0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-09T21:05:11Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-09T21:05:11Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #407 from Bigpet/appveyorbuild3\n\nAppveyorbuild","sha":"470ffaf167465356db73c17ebc65feb613e8059f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-09T15:46:58Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-09T21:50:25Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix crash in Battle fantasia/Crystal defenders","sha":"96fb8b968fb8c065c4e9a96bfe7a439e009d1421"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-09T22:05:14Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-09T22:05:14Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #408 from raven02/patch-21\n\nFix crash in Battle fantasia/Crystal defenders","sha":"59d0b1da4e138658b361be665da0f0fa677e4145"}
+{"author":{"avatar":null,"date":"2014-07-09T22:07:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-09T22:07:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"b5f376f834616423c7d1f02ddea138ad4630aa00"}
+{"author":{"avatar":null,"date":"2014-07-10T00:13:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-10T00:13:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some cleanup 2","sha":"22b9afdb601422719d2021d7df85b7a606eaa625"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-10T14:16:19Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-10T14:16:26Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"stdafx: move out some uncommon includes","sha":"ab7a45aedea989ccebce69f2da4683aa47fd965a"}
+{"author":{"avatar":null,"date":"2014-07-10T14:29:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-10T14:29:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"0dfbb5de73bbe8c89d264619051997b526a65243"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-10T16:46:10Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-10T16:46:10Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"CMake: Improve to support build type. Default to release.","sha":"6b148d1d4c532374e4d7de8d5f1f53d4ff445241"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-10T16:49:25Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-10T17:23:36Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX : set bunch of default values using opengl one","sha":"a8480f66e00b2ea6db404fdf635d5ebe48b3a28e"}
+{"author":{"avatar":null,"date":"2014-07-10T17:28:20Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-10T17:28:20Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #410 from xsacha/master\n\nCMake and stdafx improvements","sha":"c03677bd96d4872cca54629294a8ef692c71894f"}
+{"author":{"avatar":null,"date":"2014-07-10T18:06:47Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-10T18:06:47Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #411 from raven02/patch-22\n\nRSX : set default values using opengl one.","sha":"d1533b606b6f911b25a45368fdc9583b956e2392"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-10T18:41:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-10T18:41:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Remove m_alpha_func sanity check","sha":"8cacbe3567eedd1b2c023d89f3c37ba67e9f957d"}
+{"author":{"avatar":null,"date":"2014-07-10T18:58:43Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-10T18:58:43Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #412 from raven02/patch-23\n\nRemove m_alpha_func sanity check","sha":"2bd8db5f7a28ce214d49e72f6185d70b9b409ae6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-10T19:07:46Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-10T19:08:05Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Warnings: Fix several warnings.","sha":"f256153a2b3e44b08fc83a5191e1383fd916462f"}
+{"author":{"avatar":null,"date":"2014-07-10T19:26:57Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-10T19:26:57Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #413 from xsacha/master\n\nWarnings: Fix several warnings.","sha":"313af89d36311303731262c371cf4843f12f346d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-10T19:45:07Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-10T19:45:07Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Use a standard config dir on non-Windows. Fixes #192\nAlso remove WindowInfo::GetDefault which was redundant.","sha":"3737993bb220cfe78eb2da94984cf63e110a3ddf"}
+{"author":{"avatar":null,"date":"2014-07-10T19:56:24Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-10T19:56:24Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #414 from xsacha/master\n\nUse a standard config dir on non-Windows. Fixes #192","sha":"1a1fb622fa75d204a44d96d85f2ca527f8efa1b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-10T20:54:12Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-10T20:54:12Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Stdafx: More cleanup","sha":"8793d7581100d4efe1d5aae66e7467a81652d5ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-10T21:13:45Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-10T21:13:45Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Optimise travis a bit more. Use Cmake 3.0. Also drop rPlatform from stdafx.","sha":"51bb9dced4198fee60b783598e90533fac9baeb2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-10T21:29:07Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-10T21:29:07Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #415 from xsacha/master\n\nStdafx: more cleanup","sha":"ca3f621b3b1d14a26fbc578ca6d331ee7bf61f42"}
+{"author":{"avatar":null,"date":"2014-07-11T06:01:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-11T06:01:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Warning fix","sha":"cb9c1030a9d3986f349bb84d12f2b4afdb0260ee"}
+{"author":{"avatar":null,"date":"2014-07-11T06:09:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-11T06:09:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed conflicts","sha":"259b57c64aa53eda3caf3196326111d6c47a4c94"}
+{"author":{"avatar":null,"date":"2014-07-11T09:18:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-11T09:18:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some fixes","sha":"125359e30e9c445e167075b99dfdf968c2cc4c4b"}
+{"author":{"avatar":null,"date":"2014-07-11T09:39:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-11T09:39:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"ad524798fa49017a55b7c65d623742c87db0a145"}
+{"author":{"avatar":null,"date":"2014-07-11T11:32:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-11T11:32:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Exceptions fixed","sha":"2fe52451e1deef66a56bbd05d55b9c329cf94c7a"}
+{"author":{"avatar":null,"date":"2014-07-11T12:22:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-11T12:22:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"F|_|C|< the speed, we need some checks","sha":"2203cb1dcf37ec6d692333195fa3d5247449b871"}
+{"author":{"avatar":null,"date":"2014-07-11T12:50:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-11T12:50:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"c16daed87da994ab056a0bbb022c9f9dbf32411e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-11T13:14:26Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-11T13:14:26Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #409 from Nekotekina/master\n\nMemory system improved","sha":"3642b267a07c84f2e4f8ccd2fd2c6b9be68f7f31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-11T16:18:12Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-11T16:18:12Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Removed: \"Ignore R/W memory errors\" option\n\nVery small commit to take care of one thing missing in #409.\n\nReasons for that change:\n<Nekoteki>\bAlexAltea: it's fatal error that shouldn't be ignored\n<Nekoteki>\bAlexAltea: the second reason, ps3 can handle page faults by\nitself","sha":"14050c7302faecf90bfcbd4d42b496313cce67ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-11T11:59:13Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-12T06:33:04Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Stdafx: Major header cleanup","sha":"6e06fdf638e5828ab0fd38082531839737d4a5fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-11T17:06:59Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-12T06:33:04Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"More header changes.","sha":"c09b0f511ea9dc4b075e76ccc28365b9c7c6deeb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-12T07:02:39Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-12T07:02:39Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Fix conflicts.","sha":"9816ec3aa0da7a98750ec0437f9e1bd9689b6fd7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-12T07:46:14Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-12T07:46:14Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Remove some indirect headers.","sha":"a1158c9515be69c8e8d3f9dbe6ba48ba82788e83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3204887?v=4","date":"2014-07-12T09:48:58Z","email":"davidkiarie4@gmail.com","login":"3dgie","name":"David Kiarie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3204887?v=4","date":"2014-07-12T09:48:58Z","email":"davidkiarie4@gmail.com","login":"3dgie","name":"David Kiarie"},"msg":"rpcs3/Gui:minor gui  fixes\n\nEnable uses to go back after using VHDDManager or\nVFSManager by providing Ok and Cancel buttons otherwise I\nhave to kill rpcs3\n\nsigned-off-by: asla<davidkiarie4@gmail.com>","sha":"2267c84d6a6ff071fea59bebd68135523d979e78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-12T11:52:37Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-12T11:52:37Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"unload modules upon stopping  I guess we won't find out what's wrong if we don't let it fail","sha":"f75a3c8f6084fab8a4dedeecf6a142357c1fe1cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-12T12:03:21Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-12T12:03:21Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #417 from xsacha/master\n\nStdafx: More header cleaning.","sha":"64754a08b4b091282c075dc2be5ad43eb6ad512d"}
+{"author":{"avatar":null,"date":"2014-07-12T14:53:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-12T14:53:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Build fix\n\nNon-ASCII characters replaced in PPUThread.h\nSome cleanup","sha":"19088422555e2580e49aac68e68b4e131c684a24"}
+{"author":{"avatar":null,"date":"2014-07-12T15:30:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-12T15:30:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"9b5a3fd2b61ad69f7dba924c3dc7b03011f4d34d"}
+{"author":{"avatar":null,"date":"2014-07-12T15:40:52Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-12T15:40:52Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2","sha":"a94d0771fec43db9b8e40a5dfa9fe52e483b8a76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-12T16:07:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-12T16:07:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #559 from Nekotekina/master\n\nBuild fix","sha":"5835669dd9818579f0a152fe950a5abb2375076c"}
+{"author":{"avatar":null,"date":"2014-07-12T16:38:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-12T16:38:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Little fix","sha":"2331c5991aeb9d3cdee9c413e400b8130fe5f110"}
+{"author":{"avatar":null,"date":"2014-07-12T16:53:32Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-12T16:53:32Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #560 from Nekotekina/master\n\nLittle fix","sha":"b523c2810e27e4f1892d16b5db048237c80ac05d"}
+{"author":{"avatar":null,"date":"2014-07-12T21:01:41Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"committer":{"avatar":null,"date":"2014-07-12T21:01:41Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"msg":"Add .DS_Store to .gitignore","sha":"634a1f3162f9b720f3d4ed348fcd52ba4fb050b0"}
+{"author":{"avatar":null,"date":"2014-07-12T21:06:43Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"committer":{"avatar":null,"date":"2014-07-12T21:06:43Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"msg":"Fix broken OS X build with isnan and MAP_ANONYMOUS","sha":"a4f73bc7054563527bee2ce891e3de2c24012c5a"}
+{"author":{"avatar":null,"date":"2014-07-12T21:10:49Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"committer":{"avatar":null,"date":"2014-07-12T21:10:49Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"msg":"Add include path for XQuartz on OS X","sha":"b7b3761c09cbcf2c82a5db9099f214090dd4b5ff"}
+{"author":{"avatar":null,"date":"2014-07-12T22:08:25Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-12T22:08:25Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #558 from Bigpet/modunload\n\nunload modules upon stopping","sha":"f240690ff5799469d281b02862f6ccce5d7ad917"}
+{"author":{"avatar":null,"date":"2014-07-12T22:08:31Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-12T22:08:31Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #562 from boxingcow/master\n\nFix OS X build","sha":"fc962de3dd7910cb31d195a84ae5c6a375695424"}
+{"author":{"avatar":null,"date":"2014-07-12T22:39:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-12T22:39:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"PKG Installing fixed","sha":"21aedb518c6b9d416358cd7749dacb0ac8e4d225"}
+{"author":{"avatar":null,"date":"2014-07-12T22:56:52Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-12T22:56:52Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"2c7de6102780d3ae05cdf76e5a03a15e3f360216"}
+{"author":{"avatar":null,"date":"2014-07-12T23:21:42Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-12T23:21:42Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #563 from Nekotekina/master\n\nFixed mkdir (PKG Install issue)","sha":"582825934cf0cda89ffe95f431c165f6dd7dd2bb"}
+{"author":{"avatar":null,"date":"2014-07-13T08:31:11Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"committer":{"avatar":null,"date":"2014-07-13T08:31:11Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"msg":"Stupid mistake.","sha":"3c8084b2c7ea5c50f5db3eabddb1c41102faeeb8"}
+{"author":{"avatar":null,"date":"2014-07-13T12:26:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-13T12:26:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Forgotten memory check + PSV stuff fixed","sha":"7370c49ff3e0f0582d021fbbd6a5fa31aa77cba9"}
+{"author":{"avatar":null,"date":"2014-07-13T17:51:19Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"committer":{"avatar":null,"date":"2014-07-13T17:51:19Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"msg":"There is a special place in hell for 'Smart Dashes'","sha":"10647890ef5784b57adb737b14a4532201c30783"}
+{"author":{"avatar":null,"date":"2014-07-13T18:55:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-13T18:55:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"spu_printf fixed","sha":"2eafb235ba547b9fddaf916ed45d0882d1201f4b"}
+{"author":{"avatar":null,"date":"2014-07-13T18:59:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-13T18:59:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Little fix","sha":"1dbbbc55f69eafff8783b324859afb6b1c84ff66"}
+{"author":{"avatar":null,"date":"2014-07-13T19:05:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-13T19:05:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Callbacks","sha":"dab3d6c6d6a8f5a54f1ae8452d934842e43863b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-07-14T04:06:15Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-07-14T04:06:15Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"RSXThread: Remove some redundant assignments","sha":"3c04f2fef95944143cf95edbe1279e2fede567f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-14T07:26:31Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-14T07:26:31Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"c++11 fixups. Initialise to zero where possible. note: cellAudio looks quite messed up.","sha":"6bd044f9be56d325c77f6279d269046a82c82b19"}
+{"author":{"avatar":null,"date":"2014-07-14T08:18:45Z","email":"finlaywilliamson@rocketmail.com","login":null,"name":"boxingcow"},"committer":{"avatar":null,"date":"2014-07-14T08:18:45Z","email":"finlaywilliamson@rocketmail.com","login":null,"name":"boxingcow"},"msg":"Update Memory.h\n\nTo remove extraneous code.","sha":"ebf713c5a69ed833f93beadf06b749a59b1e9776"}
+{"author":{"avatar":null,"date":"2014-07-14T09:24:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-14T09:24:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Asmjit updated","sha":"a71053ae15d0cd3eb8f363fb63cc3cd9cad590c1"}
+{"author":{"avatar":null,"date":"2014-07-14T11:03:19Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-07-14T11:03:19Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #557 from Aslaville/ui\n\nrpcs3/Gui:minor gui  fixes","sha":"b930b874fe3ebf4a4bf26f933968e7863ce1272e"}
+{"author":{"avatar":null,"date":"2014-07-14T11:03:57Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-07-14T11:03:57Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #565 from boxingcow/master\n\nFix the OS X build fixes...","sha":"17d400f72ab2aa2e672fc04d3c9f21913d5d94aa"}
+{"author":{"avatar":null,"date":"2014-07-14T11:04:22Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-07-14T11:04:22Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #566 from lioncash/assignments\n\nRSXThread: Remove some redundant assignments","sha":"09d0d81a43d20990bbf4612f13b1212344cfb551"}
+{"author":{"avatar":null,"date":"2014-07-14T11:04:57Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-07-14T11:04:57Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #567 from xsacha/master\n\nc++11 cleanup","sha":"62d3dcaf6431f7ae78fa097f844b3e0b76d296b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-14T17:21:24Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-14T17:21:24Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Fix issue from #567 that stopped videos from working. Clean up some code.","sha":"82536b298c0f53ef3af196b7d56738d43b37c063"}
+{"author":{"avatar":null,"date":"2014-07-14T18:02:01Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-14T18:02:01Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #570 from xsacha/video-fix\n\nFix issue from #567 that stopped videos from working. Clean up some code...","sha":"73491d4ffa23cfc373799cb0b3fa31e8f7ae5b00"}
+{"author":{"avatar":null,"date":"2014-07-14T19:15:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-14T19:15:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"IsGoodAddr() bug fixed","sha":"01aa74e4a86be3b999383ccec8d8a54738eaa1fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-14T19:42:41Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-14T19:42:41Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Fix rFile","sha":"26e14188976a7d0e6266b227ee57796f42f2d93f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-14T20:02:26Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-14T20:02:26Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Merge remote-tracking branch 'origin/pr/571'","sha":"38333f01e35c95537bb700b507cba89108ce493a"}
+{"author":{"avatar":null,"date":"2014-07-14T21:32:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-14T21:32:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SSE4.1 detection","sha":"51b54a4d6bf46b701983ea63fe988778469fb598"}
+{"author":{"avatar":null,"date":"2014-07-14T21:33:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-14T21:33:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Callback header fix","sha":"51f64049ab563545c502adc451b507d40ff2e1a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-14T23:06:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-14T23:06:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #572 from Nekotekina/master\n\nUpdate","sha":"75e81bc969e5e22e9058ba1b1ad83aff0111b67e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3204887?v=4","date":"2014-07-15T15:04:37Z","email":"davidkiarie4@gmail.com","login":"3dgie","name":"David Kiarie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3204887?v=4","date":"2014-07-15T15:04:37Z","email":"davidkiarie4@gmail.com","login":"3dgie","name":"David Kiarie"},"msg":"fix broken commit (2267c84d6a6ff071fea59bebd68135523d979e78)","sha":"dbfd07f11e87668963dd053369556ec2094edf7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3204887?v=4","date":"2014-07-15T15:29:48Z","email":"davidkiarie4@gmail.com","login":"3dgie","name":"David Kiarie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3204887?v=4","date":"2014-07-15T15:29:48Z","email":"davidkiarie4@gmail.com","login":"3dgie","name":"David Kiarie"},"msg":"rename some functions as per their function","sha":"78aef474a5a802b328ba82ba200cd234bab59b00"}
+{"author":{"avatar":null,"date":"2014-07-16T12:03:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-16T12:03:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":".gitignore fix","sha":"8e19af530b7424d073540aa40766e9117a15e01d"}
+{"author":{"avatar":null,"date":"2014-07-16T12:06:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-16T12:06:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"RawSPU initialization fix","sha":"b487dcee277681e0765f7bb48d5407e554373fc7"}
+{"author":{"avatar":null,"date":"2014-07-16T12:07:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-16T12:07:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_raw_spu_destroy implemented","sha":"e1a9f08a91f55aedf836ee6a6e0b6c6f08d91ee4"}
+{"author":{"avatar":null,"date":"2014-07-16T12:09:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-16T12:09:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Rounding mode set","sha":"d94ce7094e857f11baac31f70addb5f9041771ea"}
+{"author":{"avatar":null,"date":"2014-07-16T12:09:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-16T12:09:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"RawSPU initialization fix","sha":"3d9c76a80d7fe0d74932b3afb20452dccf380fc0"}
+{"author":{"avatar":null,"date":"2014-07-16T12:13:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-16T12:13:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Interpreter fix\n\n(these bugs weren't in SPURecompiler)","sha":"3d0983e7d021ccc24ea2f462c9f2cc1bfcecf225"}
+{"author":{"avatar":null,"date":"2014-07-16T12:15:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-16T12:15:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU Recompiler fix","sha":"694a2b774ed3eb415df26bf92d46b5affef84296"}
+{"author":{"avatar":null,"date":"2014-07-16T16:10:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-16T16:10:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"RawSPU cleanup","sha":"ecbc9d1b080494342f5682937e93881f1590b49e"}
+{"author":{"avatar":null,"date":"2014-07-16T16:21:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-16T16:21:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Time functions fixed","sha":"c3e06694351b6ee153b2253502818aa9cdf1fb24"}
+{"author":{"avatar":null,"date":"2014-07-16T16:45:54Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"committer":{"avatar":null,"date":"2014-07-16T16:45:54Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"msg":"Fix small clang warning","sha":"c37c90613f4b4b4fc7593657b14086dd6650e6a3"}
+{"author":{"avatar":null,"date":"2014-07-16T18:29:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-16T18:29:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Little fix","sha":"7816843dfbe9ca5767267ef359270e063acacde8"}
+{"author":{"avatar":null,"date":"2014-07-17T12:40:52Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-07-17T12:40:52Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #573 from Aslaville/UI\n\nfix broken commit (2267c84d6a6ff071fea59bebd68135523d979e78)","sha":"e6a660a200263d91216cef85307f55526d6b3ed4"}
+{"author":{"avatar":null,"date":"2014-07-17T12:41:15Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-07-17T12:41:15Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #574 from Nekotekina/SРU\n\nSPU Fixes","sha":"a7971b55ee9ddc423d52a10ac57c73d3fcf69c25"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-17T20:05:15Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-18T14:19:37Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix compiler warning","sha":"f729f21e6cf32f8f39c3e38c2d368c3291e79d7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-18T15:03:39Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-18T15:03:39Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Regression fix #1","sha":"4856066a81d4d363681e87b240b7bff1d6a49df0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-18T16:44:31Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-18T16:44:31Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #577 from raven02/patch-3\n\nRegression fix #1","sha":"1cfd2c44753526e21ee01083228e4be3d3fad5cb"}
+{"author":{"avatar":null,"date":"2014-07-18T16:55:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-18T16:55:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"be_t<> constructor elimination","sha":"74914c59165fef1127f543dfc5c692494e31559b"}
+{"author":{"avatar":null,"date":"2014-07-18T16:59:14Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-18T16:59:14Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #576 from raven02/patch-2\n\nFix compiler warning","sha":"2eb73e5b4b35baace1e7055be77dda8a432b65e5"}
+{"author":{"avatar":null,"date":"2014-07-18T17:04:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-18T17:04:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Little fix","sha":"f69337be6540fea6a7e9744b505352ac6332029b"}
+{"author":{"avatar":null,"date":"2014-07-18T17:30:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-18T17:30:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Little fix 2","sha":"5f55afda0f9cf444cf209d51340038a278a877c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-18T17:47:58Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-18T17:47:58Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix a dst_reg typo for tc9","sha":"d058ef769cbea6baefea11645d327a56a5c6e12b"}
+{"author":{"avatar":null,"date":"2014-07-18T17:51:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-18T17:51:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #578 from Nekotekina/master\n\nElimination of be_t<> constructors","sha":"b97ce7732b6a5b69b9416a3b94dfb3f076b2d8c3"}
+{"author":{"avatar":null,"date":"2014-07-18T17:56:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-18T17:56:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #579 from raven02/patch-4\n\nFix a dst_reg typo for tc9","sha":"e7ad52ee9f98b0fa967e61615eb461b4e80bd71a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-18T18:07:50Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-18T18:07:50Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"GUI : Boot elf and run at start","sha":"f151ba7c53a1718fc4102f638f375a9b5c8c5b27"}
+{"author":{"avatar":null,"date":"2014-07-18T18:13:27Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"committer":{"avatar":null,"date":"2014-07-18T18:13:27Z","email":"boxingcow@rocketmail.com","login":null,"name":"boxingcow"},"msg":"Merge git://github.com/DHrpcs3/rpcs3","sha":"c7e4c90cb5c0f17772bb28f8e8231856570b749c"}
+{"author":{"avatar":null,"date":"2014-07-18T18:31:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-18T18:31:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #580 from raven02/patch-6\n\nGUI : Boot elf and run at start","sha":"4e55be976240b85d42912f54b9a856c579453e42"}
+{"author":{"avatar":null,"date":"2014-07-18T18:40:39Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-18T18:40:39Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #581 from boxingcow/master\n\nFix small Clang warning about parenthesis","sha":"9989988cb794b9c5c870475a9c8b5a2a21ee6fa7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-18T20:33:08Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-18T20:33:08Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Regression fix #2","sha":"1a36a2d75942aa90f62a8e3b01dc29f822589442"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-18T21:15:06Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-18T21:15:06Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #582 from raven02/patch-7\n\nRegression fix #343","sha":"222750b846917f8fefd1202c6782652f9d9a98aa"}
+{"author":{"avatar":null,"date":"2014-07-19T07:04:33Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-19T07:04:33Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Revert \"Fix a dst_reg typo for tc9\"","sha":"a7f3b6fd570e76c721243e24407cd87124db29ea"}
+{"author":{"avatar":null,"date":"2014-07-19T07:06:17Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-19T07:06:17Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #583 from DHrpcs3/revert-579-patch-4\n\nRevert \"Fix a dst_reg typo for tc9\"","sha":"bd04990af30135b14c214c823e37a5cc33de05b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-19T09:24:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-19T09:24:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved RSX emulation\n- Fixed NV4097_SET_SHADER_CONTROL\n- Vertex Shader: SCA instructions don't override VEC result","sha":"7433a021dbfe135acd4f141e044afe325413fac8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-19T11:58:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-19T11:58:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed LOOP & REP instructions in FragmentShaderDecompiler","sha":"68078427aac9dc52dacb028480077debb0fa05ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-19T13:09:39Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-19T13:09:39Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix a typo in the packaging batch file\n\nthe soft_oal.dll was written with a dash which is clearly wrong","sha":"0fe32fa0d357e5e924c7c5873d3229de7bef6c37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-19T15:39:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-19T15:39:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"RSX: fixed scissor","sha":"8b9a46bb392c42b8a6f32f099fe070f99bba192b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-20T06:46:50Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-20T06:55:33Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Make a spelling difference consistent","sha":"5f3ea1005a7fce603969f1f81cb83b2971914536"}
+{"author":{"avatar":null,"date":"2014-07-20T17:03:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-20T17:03:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Name fix (SPU JIT)\n\nUnnecessary check removed","sha":"1f46098b23d9c2e5603548cf225a50a474b33687"}
+{"author":{"avatar":null,"date":"2014-07-20T17:05:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-20T17:05:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_ppu_thread_exit fix","sha":"41495e5d2aa8ea94029c1dc1479798ccfa889ac0"}
+{"author":{"avatar":null,"date":"2014-07-20T17:13:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-20T17:13:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SysCall table fixes","sha":"25aeb2e086d19afd8afd8065a349c4629b6b01c7"}
+{"author":{"avatar":null,"date":"2014-07-20T17:13:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-20T17:13:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_process_is_stack fixed","sha":"3d74112aa3ba03fd942a79b1036f0d254426a8eb"}
+{"author":{"avatar":null,"date":"2014-07-20T17:14:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-20T17:14:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncMutex fixed","sha":"883885dc0b47ec4e4382bcd6ffaf448d2db9d36b"}
+{"author":{"avatar":null,"date":"2014-07-20T17:23:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-20T17:23:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #585 from raven02/patch-8\n\nMake a spelling difference consistent","sha":"1a2da9d60855eac9dba72d4cd513f7471b1ed1bb"}
+{"author":{"avatar":null,"date":"2014-07-20T17:52:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-20T17:52:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"bba74b90568ef94f98b6a7c05eb0bddd4af85f46"}
+{"author":{"avatar":null,"date":"2014-07-20T17:59:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-20T17:59:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fix of fix (damned crutch)","sha":"1f64087a3be90b41247991979c6a54ac575566d6"}
+{"author":{"avatar":null,"date":"2014-07-20T22:30:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-20T22:30:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_spinlock fixed","sha":"fe49046a961fa2551739df588a3422d0980b7efb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-21T09:57:07Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-21T09:57:07Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Revert \"Regression fix #343\"","sha":"9c2fe3b25d4f2b5b52882537ff713ff6d1324dc3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-21T10:30:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-21T10:30:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #586 from DHrpcs3/revert-582-patch-7\n\nRevert \"Regression fix #343\"","sha":"6651795f6dafe383b8705b034642378ececb8991"}
+{"author":{"avatar":null,"date":"2014-07-21T10:37:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-21T10:37:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"da8194d6591529f2c46318c37f5a08d4d13323c6"}
+{"author":{"avatar":null,"date":"2014-07-21T14:42:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-21T14:42:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Variadic templates for module logs\n\nTwo new module log types: Todo() and Notice()","sha":"640de8157104ebbd66bd258e0dd4b712f83ab4a3"}
+{"author":{"avatar":null,"date":"2014-07-21T14:49:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-21T14:49:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fix for SysCallBase","sha":"0865fca90a7cc279cf8d98bdfdad2caa8cbb6ac0"}
+{"author":{"avatar":null,"date":"2014-07-21T15:58:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-21T15:58:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"LogBase class for both SysCallBase and Module","sha":"5c84ad30a199b59950bebf16c3985d169c932ac5"}
+{"author":{"avatar":null,"date":"2014-07-21T16:39:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-21T16:39:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Logging option restored","sha":"e3fbfc4bda38a5b341bdc5a28fe024933f747465"}
+{"author":{"avatar":null,"date":"2014-07-21T18:35:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-21T18:35:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small SPU cleanup","sha":"fa5311718eb700a641bfbdf896cbfd83e2c46c98"}
+{"author":{"avatar":null,"date":"2014-07-21T19:05:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-21T19:05:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncBarrierInitialize implemented\n\n(SPU sample works)","sha":"2a5506dae6d0c01ee3c2a9855831277309e325e7"}
+{"author":{"avatar":null,"date":"2014-07-21T21:55:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-21T21:55:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":".gitignore updated","sha":"356904d198200edd2615b3d839bfe56c46b6a976"}
+{"author":{"avatar":null,"date":"2014-07-22T14:46:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-22T14:46:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncRwmInitialize implemented\n\ncellSyncRwmRead implemented (SPU sample works)","sha":"1c32a284e1f4d5418f09e14856eef05cfae9a287"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-22T15:16:15Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-22T15:16:15Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed memory exception on cellJpgDec & cellGifDec\n\n* Added support for CELL_JPGDEC_BUFFER and CELL_GIFDEC_BUFFER.","sha":"fe46a4591564b2317a6f7b2f3b68ec28dccb6fce"}
+{"author":{"avatar":null,"date":"2014-07-22T19:02:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-22T19:02:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncQueue draft","sha":"f55afc27a9e2153abf88ad3344f84e98325e76cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-22T19:37:45Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-22T19:37:45Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Flipping / padding on .JPG and .GIF decoding\n\n* Changes in cellJpgDec and cellGifDec come from cellPngDec.","sha":"713bff01e129b0beea9c538a76c31fb47dde7524"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-22T22:50:45Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-22T22:50:45Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"RSX method naming modified\n\nGCM commands (e.g. cellGcmSet*) are not the same as RSX methods (e.g.\nNV4097_*). The name has to be changed.","sha":"abbd3ae2390699bd6ff558c8dbe1d30dca857089"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-23T10:38:08Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-23T10:38:08Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Removed \"Boot game and start\" entry\n\nThere is already a setting on the menu (Settings > HLE > Always start\nafter boot) to do that. Make it active by default since disabling it is\nonly useful for debugging purposes.","sha":"602c436e1c344448470c8012a59e643bee7c90e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-23T17:51:41Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-07-23T17:51:41Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"use a include directory relatie to the lists file","sha":"afe493f18716387974364355115df55c741e3cd4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-23T18:36:57Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-23T18:36:57Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Minor fixes and changes","sha":"36895606171a05e65d50167d78ac612a3f074e73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-23T18:40:38Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-23T18:40:38Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #591 from Bigpet/cmakefix\n\nuse a include directory relative to the lists file","sha":"58421029c41305045c862f5c097dd8aba50732a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-23T18:52:30Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-23T18:52:30Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #593 from DHrpcs3/wip\n\nGUI and RSX updates","sha":"65ecaab2c4876fa36f384818453dfc1b4bf2187b"}
+{"author":{"avatar":null,"date":"2014-07-23T21:51:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-23T21:51:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncQueuePush implemented","sha":"3d184b3a594df6dd11e02b61b3017b5f232e6797"}
+{"author":{"avatar":null,"date":"2014-07-24T00:54:08Z","email":"dante38490@free.fr","login":null,"name":"Dante38490"},"committer":{"avatar":null,"date":"2014-07-24T00:54:08Z","email":"dante38490@free.fr","login":null,"name":"Dante38490"},"msg":"Version change to 0.0.0.5 After create Tag 0.0.0.5","sha":"c28747aef66e8c92bac0482451940a601d3c6ac4"}
+{"author":{"avatar":null,"date":"2014-07-24T13:26:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-24T13:26:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"f8d9242743b02ae0e57697da9be048aa7c39871a"}
+{"author":{"avatar":null,"date":"2014-07-24T15:02:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-24T15:02:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncQueuePop...\n\ncellSyncQueueSize,\ncellSyncQueueClear implemented","sha":"74e18dc8c925c56f3fe8c269dc396a6504514cf3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-25T08:34:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-25T08:34:28Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #594 from Dante38490/patch-1\n\nVersion rpcs3 Update to 0.0.0.5 After create Tag 0.0.0.5","sha":"c497de196344feef43929df28878027c2edd09d1"}
+{"author":{"avatar":null,"date":"2014-07-25T08:35:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-25T08:35:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncQueueTryPush, cellSyncQueueTryPop","sha":"9d0bd55ec0edafd781c05dc1af90db8549055fc8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-25T05:27:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-25T08:41:59Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX : add missing NV4097 method names","sha":"1ac0ae817229690936a70b24d2e916ecacda2f08"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-25T08:43:38Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-25T08:43:38Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix flip control gcm sample","sha":"2a16f50f7f4df4dbe81513fa3df96ef29dd66034"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-25T09:10:44Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-25T09:10:44Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #695 from raven02/patch-10\n\nRSX : add missing NV4097 method names","sha":"665aaa0ef50fe864434092aee65ef8476d98354d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-25T09:11:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-25T09:11:43Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #696 from raven02/patch-11\n\nFix flip control gcm sample","sha":"1d0071302a86785f0fec3a54650de3b0a4d5e983"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-25T19:03:08Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-25T19:03:08Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Cleanup in RSXThread::DoCmd\n\nSome RSX commands added.\nMoved unused commands to the bottom of the big switch/case.","sha":"c6cac4b205c99ea13f914e1acdd63d1cc59958be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-25T12:57:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-26T04:58:33Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: checkForGlError for Stencil/Depth/Color misc","sha":"76fb1d9db00ffaa0cd5a523731e7159f55caf864"}
+{"author":{"avatar":null,"date":"2014-07-26T05:50:58Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-26T05:50:58Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #698 from raven02/patch-12\n\nRSX: checkForGlError for Stencil/Depth/Color","sha":"c41be3a964ef276ae6f944ed508c9128bebe20ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-27T01:24:06Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-27T01:24:06Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Regression fix https://github.com/DHrpcs3/rpcs3/issues/697","sha":"a7bc421137bc839378299c7928f86f7c5b303de2"}
+{"author":{"avatar":null,"date":"2014-07-27T04:38:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-27T04:38:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #700 from raven02/patch-13\n\nRegression fix #697","sha":"bacc193638ec11bb0afb8a2616aabbde76893cf0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-27T14:18:53Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-27T14:18:53Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: detach shader when clear program buffer","sha":"726760a38e70b5b50a82d21e39c0e62f3ff3d8db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-27T17:30:25Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-27T17:30:25Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Stub all remaining sceNP functions","sha":"caf5a578756726444bd5e8f5e891d9dd411d7650"}
+{"author":{"avatar":null,"date":"2014-07-27T17:52:57Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-27T17:52:57Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #703 from raven02/patch-15\n\nStub bunch of sceNP functions","sha":"0aae7a516807a91b8435fbe6842788d28eee5b71"}
+{"author":{"avatar":null,"date":"2014-07-27T19:06:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-27T19:06:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #702 from raven02/patch-14\n\nRSX: detach shader when clear program buffer","sha":"b2b8cb17cd1e03690d2c9dec072090d7676955c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-28T06:10:50Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-28T06:10:50Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix spacing","sha":"b22ba861833d1c9208c9b9abe39dbd16bb0b4ae3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-28T11:15:28Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-28T11:15:28Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add sceNpSignalingDestroyCtx()","sha":"dbc8f76b52e178191af276828aa08a36bdcf10c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-28T12:51:54Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-28T12:51:54Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #706 from raven02/patch-16\n\nFix spacing","sha":"d1343f54153bf039cfa4453540ae3d1d0c1270dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-07-28T15:40:06Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-07-28T15:40:06Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Prepared new SysCalls, made nicer","sha":"329520168b39bf94b503d1be5fdcf459833e0d90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-28T15:53:21Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-28T15:53:21Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #707 from tambry/newsyscalls\n\nPrepared new SysCalls, made nicer","sha":"9ccc36382b6172b12897655d7e85dda4bfcc36d9"}
+{"author":{"avatar":null,"date":"2014-07-28T20:29:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-28T20:29:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"143a75616ceb4adb644940e024fcd89a68febb0d"}
+{"author":{"avatar":null,"date":"2014-07-29T01:48:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-07-29T01:48:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflict fixed","sha":"9d2d5102f636b8dc8b4062ca4ff88924cbd6cd90"}
+{"author":{"avatar":null,"date":"2014-07-29T04:14:01Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-29T04:14:01Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #709 from Nekotekina/master\n\nVarious fixes, new functions","sha":"b98b3241e72e6acd7e72e665ffc72207ab80e9b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-07-29T08:28:15Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-07-29T08:28:15Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix debugger startup error","sha":"8c6622dd820d5bf9899d6c512684e621351d4f4e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-29T12:38:36Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-29T12:38:36Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #710 from tambry/debuggererrorfix\n\nFix debugger startup error","sha":"08d22a8033cbd1bd51254ddfc58eb2e1b12d9822"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-29T19:33:44Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-29T19:33:44Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: cleanup PBO","sha":"90dd215b8c601df96e426dd6ff087597a68edfe4"}
+{"author":{"avatar":null,"date":"2014-07-29T19:49:32Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-07-29T19:49:32Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #711 from raven02/patch-17\n\nRSX: cleanup PBO","sha":"03627a62eb247c82454d3fb44f536c7b97a71db9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-29T21:45:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-29T21:45:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"EDAT: list the edat files name","sha":"ebec856a3607e403fde4353b5755bc82af306b64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-29T21:48:58Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-29T21:48:58Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Minor change","sha":"33559ca0ea6e9d7cda1ae32e445adaffc00095c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-29T21:50:22Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-29T21:50:22Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #712 from raven02/patch-17\n\nEDAT: list the edat files name","sha":"e56c6914d2d35e8d4e00cc2d41a53efa7ace140b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-30T13:31:55Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-07-30T13:31:55Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Update GLGSRender.cpp","sha":"f52c644af73479a7a2fe687377a5ffaba6be41a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-30T13:53:58Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-30T13:53:58Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #713 from raven02/patch-2\n\nFix PBO no initialization","sha":"6cb083be1ad0af37593bc9393ebb1b0ebc22f944"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-31T16:08:02Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-07-31T16:08:02Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Implemented vm::var.\nMemoryAllocator replaced with vm::var","sha":"cd33be149133b48e7143c135113459ad05ae80c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-31T18:20:00Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-07-31T18:20:00Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"More rFile cleanups and fixes.\nWas using fileExists/dirExists before when really should have just been exists. File or Dir doesn't matter and would only create false negatives.\nCurrent working directory shouldn't really be used at all. This is just the folder the application is run from (not even where the .exe resides).\nSome of the infos required by vfsLocalDir such as executable may not be portable. Not sure of their intended function as they are never used.","sha":"e8525a6f1461e64deb2668dda3bfbd40cdfd7b33"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-08-01T16:27:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-08-01T16:27:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed compilation errors\nImplemented vm::ptr & vm::ref","sha":"7411012db9b6659eed131592d54a7de8bd976d01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-03T06:30:45Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-03T06:30:45Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Additions and improvements to cellNetCtl","sha":"f405395f972b6874d27efdb4fb4452c8f42713f4"}
+{"author":{"avatar":null,"date":"2014-08-03T01:41:06Z","email":"dante38490@free.fr","login":null,"name":"Dante38490"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T21:29:52Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Remove the Soft_OAL line\n\nBecause now that the file is integrated with git it so it became unnecessary.","sha":"18918db012230b237e094774a75a8d6a29bfb858"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T21:37:50Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T21:37:50Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #719 from tambry/cellnetctl\n\nAdditions and improvements to cellNetCtl","sha":"fc122630d4818bf209d0379260881b8506bf42b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T22:07:50Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T22:07:50Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed error of pull request #719","sha":"35b00bf8bcf56fd2d47a6a72e32c188033f56ad1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-02T08:20:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T22:09:37Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Init cellSail module","sha":"fa2fa5b4bffee14ccfbd7d2bcdec9f643b2d347d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-03T06:31:59Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T22:27:49Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"RSX : fix opengl error 0x505","sha":"7f5cc96842946d7e0733678f393e330cdff670ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T23:07:09Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T23:07:09Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #714 from xsacha/rFile\n\nMore rFile cleanups and fixes.","sha":"e3d38f704f3dd63f3de52ad9592c6be864de6b65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-31T23:52:43Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T23:37:21Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellGcmSys updated\n\n* cellGcmGetTiledPitchSize (thanks 3141card), cellGcmFunc15.\n* sysPrxForUser: _sys_memset\n* Created headers cellGcmSys.h and sysPrxForUser.h\n* int, int32_t -> s32 and uint32_t -> u32.","sha":"48a339fd17489f1658ae0faa2c51017f1ba6250d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T23:33:57Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T23:37:23Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Renamed Emu/GS -> Emu/RSX","sha":"f07c35d9aeb7dfd476c5e933aa3f0602e916c77d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T23:52:36Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T23:52:36Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed error of pull request #714","sha":"90d0e69a569e8a74fbada773c07fcce44b5ea587"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T23:54:44Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-03T23:54:44Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #722 from DHrpcs3/gcm-wip\n\nSome GCM-related changes","sha":"9223174c0c0ff7d2c605b7d8ae534019182210aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-04T10:36:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-04T10:36:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Remove duplicate","sha":"d48de0afb0478f8e1bbcdfbff3d186c7ddb706da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-04T11:57:32Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-04T11:57:32Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #723 from raven02/patch-3\n\nRemove duplicate","sha":"2fb95556a5b3b1c8180f71736977a26e72c6f6a5"}
+{"author":{"avatar":null,"date":"2014-08-04T18:33:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-04T18:33:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Arrgh, wrong checks!!!","sha":"f5b3c38c27816647897b6116674a961f6a84ad0d"}
+{"author":{"avatar":null,"date":"2014-08-04T18:43:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-04T18:43:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"GetCount for Out_IntrMBox","sha":"424d5e22d2ec0d6124f87b4a16c224fd24d3d048"}
+{"author":{"avatar":null,"date":"2014-08-04T20:25:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-04T20:25:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"It doesn't hurt if we list all the imports?","sha":"48514b0e93d0092c9916148673bfec0d4cdcffa2"}
+{"author":{"avatar":null,"date":"2014-08-05T10:18:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-05T10:18:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"IsGood() check elimination\n\nReasons: 1) It's unsafe - we cannot guarantee that address is still good\nwhile it is used. 2) It's wrong in many modules which are usually just\ncompare pointer with zero.","sha":"8f04ab07ed480dd4d898d2ded53ff294302a0332"}
+{"author":{"avatar":null,"date":"2014-08-05T10:29:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-05T10:29:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_time fix","sha":"bdc263bc34eddf36921fcc0303c8494a314b77b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-08-05T12:14:08Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-08-05T12:14:08Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"msg":"Fix infinite loop in rMkpath","sha":"e1b7380bc6e1f0af0cb4f689eae360d142f53a88"}
+{"author":{"avatar":null,"date":"2014-08-05T14:06:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-05T14:06:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some missing logs","sha":"021656d8216723c334c14e83311a52a372f9590e"}
+{"author":{"avatar":null,"date":"2014-08-05T14:36:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-05T14:36:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"edat patch","sha":"d2bb2c71b4f87ac37c21db3cd4dfbdac2a863b0b"}
+{"author":{"avatar":null,"date":"2014-08-05T14:41:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-05T14:41:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"...","sha":"83948a298c14a1acc018fa774eded28cc0601675"}
+{"author":{"avatar":null,"date":"2014-08-05T16:36:56Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-05T16:36:56Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #724 from xsacha/rFile\n\nFix infinite loop in rMkpath","sha":"6864a3ebcded37035a400222aea20ff97744a9bc"}
+{"author":{"avatar":null,"date":"2014-08-05T16:37:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-05T16:37:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #725 from Nekotekina/edat-fix\n\nedat patch from sent stuff (fixes shit)","sha":"cb22cbca6225a24b334fa29d374f417a39f6b859"}
+{"author":{"avatar":null,"date":"2014-08-05T17:33:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-05T17:33:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Copy(To)(From)(Real) elimination\n\nIt was nothing but a crutch","sha":"e7ae71bd73673164e9abcfa626d21c87a888100d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/61218?v=4","date":"2014-08-05T12:14:08Z","email":"xsacha@gmail.com","login":"xsacha","name":"Sacha"},"committer":{"avatar":null,"date":"2014-08-05T17:47:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fix infinite loop in rMkpath","sha":"9f268065def0ed73baeef77f1ca774a3ce46d485"}
+{"author":{"avatar":null,"date":"2014-08-05T14:36:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-05T17:47:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"edat patch","sha":"5621258b9d1a8020d57e691a92f5c877ee40b5fe"}
+{"author":{"avatar":null,"date":"2014-08-05T14:41:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-05T17:47:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"...","sha":"facb412e6280bcc114d13fbd26bee89ebc0fb97f"}
+{"author":{"avatar":null,"date":"2014-08-05T22:19:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-05T22:19:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some missing logs","sha":"36f76bf2883a6e740b7a8f2262a251b727903d3c"}
+{"author":{"avatar":null,"date":"2014-08-05T22:34:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-05T22:34:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"vfsLocalDir::IsOpened() implemented","sha":"270c8516453a338465a37217f9f6a82bf07e579c"}
+{"author":{"avatar":null,"date":"2014-08-07T07:59:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-07T07:59:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncBarrierNotify","sha":"fb448461df10ebbf09f35b3b0e299bcdf2ca858e"}
+{"author":{"avatar":null,"date":"2014-08-07T19:16:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-07T19:16:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncBarrierWait","sha":"6568a94b0e5a6a71525a80fb5f07f5538ea3b5d5"}
+{"author":{"avatar":null,"date":"2014-08-07T21:34:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-07T21:34:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncRwmWrite","sha":"8169a8e4bbdce54af93d71ff518c9579d9cda09e"}
+{"author":{"avatar":null,"date":"2014-08-08T12:55:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-08T12:55:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Broken comments","sha":"9b24ca7a28775e6815e6f8f5cb8215f449dc0d82"}
+{"author":{"avatar":null,"date":"2014-08-08T13:54:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-08T13:54:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncQueuePeek","sha":"9b24db3a76aff9e5098654786f15d8c1f3b16e53"}
+{"author":{"avatar":null,"date":"2014-08-08T14:50:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-08T14:50:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncLFQueue moved, cellSpursQueue cleared","sha":"b89c4fec3e49050fc5adbfa1638b43d8aa7ccb55"}
+{"author":{"avatar":null,"date":"2014-08-08T15:55:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-08T15:55:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_event_flag.cpp restored","sha":"b00e0fcf695ef491065a37b7ea92bc2bed8c1339"}
+{"author":{"avatar":null,"date":"2014-08-08T18:13:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-08T18:13:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Little cleanup","sha":"dfd5fd388e1d6cf1495a76da6f9916e7b3728440"}
+{"author":{"avatar":null,"date":"2014-08-08T18:23:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-08T18:23:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Renaming (1)","sha":"7f5ae1cdc2a7766926088fd54bd498b8b47dc4a4"}
+{"author":{"avatar":null,"date":"2014-08-08T18:25:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-08T18:25:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Renaming (2)","sha":"231de946a06a1d28496f16ddc6829d8c401ff3bf"}
+{"author":{"avatar":null,"date":"2014-08-08T18:52:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-08T18:52:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Oops.","sha":"f0eadc783dbae0584d0098ef4fb8809bf25ef010"}
+{"author":{"avatar":null,"date":"2014-08-08T20:39:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-08T20:39:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Log fix","sha":"c3d84c8f05812022e93411caedaf93fbbd997baf"}
+{"author":{"avatar":null,"date":"2014-08-08T21:27:44Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-08T21:27:44Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #730 from Nekotekina/master\n\nCommit collection","sha":"3d47c8ab9f79920bdfbe0d67726c3375c27a1d69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T06:52:50Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T07:11:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"FS: add cellFsChmod & cellFsAioWrite","sha":"ae96537b8d313fa4f1e716c676de98313c826352"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T08:27:59Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T08:27:59Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Misc cleanup","sha":"1521eea3240254fbdc5d29febe149257895bb018"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T08:44:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T08:44:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellFsFsync","sha":"6a0ad1b0014f981ba44932269628a6c5e07d9297"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T09:17:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T09:17:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"cellFsSdataOpenByFd","sha":"3f65b54a1ecfb7092552d199a3ea0a6e0a1b6eac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T12:36:24Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T12:36:24Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Return CELL_EFAULT if specified address is invalid","sha":"15fa50f24e0a5016563ea3a4bd1f58304e59dac2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T15:16:21Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T15:16:21Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Show game title and ID in log","sha":"b9ae34cc3b2b0e2badd99f58e08dab9b7fc65965"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T15:31:21Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T15:31:21Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix typo","sha":"e49fcd4b2109121349f339f4467b2d5e94a567a0"}
+{"author":{"avatar":null,"date":"2014-08-09T16:01:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-09T16:01:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Last syscall registering","sha":"6f8fb71d15473bb64c99c93baa38ecf3b6f9e7bd"}
+{"author":{"avatar":null,"date":"2014-08-09T16:04:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-09T16:04:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_process_get_sdk_version rough implementation","sha":"b7ea1f4d4460740b868b5c713274c73d3c8d7b38"}
+{"author":{"avatar":null,"date":"2014-08-09T16:10:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-09T16:10:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #731 from raven02/patch-1\n\nFS: add cellFsChmod/SdataOpenByFd/Fsync & cellFsAioWrite","sha":"228c33d44dfec432075baa68607788fad234c94e"}
+{"author":{"avatar":null,"date":"2014-08-09T16:10:37Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-09T16:10:37Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #732 from raven02/patch-2\n\nReturn CELL_EFAULT if specified address is invalid","sha":"e69744c7ca10988b10ef3104f679bb4f4499e15f"}
+{"author":{"avatar":null,"date":"2014-08-09T16:10:42Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-09T16:10:42Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #733 from raven02/patch-3\n\nShow game title and ID in log","sha":"e9835d4a2ce4e460f4d8ea2ebaf99fde0b760b3e"}
+{"author":{"avatar":null,"date":"2014-08-09T16:23:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-09T16:23:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncLFQueueInitialize preparations","sha":"b4615f24520f7c337b5854d112ed157e9ea480d0"}
+{"author":{"avatar":null,"date":"2014-08-09T16:01:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-09T16:25:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Last syscall registering","sha":"18e1799980177cae9293b432078d0747ae16edb8"}
+{"author":{"avatar":null,"date":"2014-08-09T16:04:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-09T16:27:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_process_get_sdk_version rough implementation","sha":"b09412a79ad4004e167d2578805cb4b46c720beb"}
+{"author":{"avatar":null,"date":"2014-08-09T16:23:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-09T16:27:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncLFQueueInitialize preparations","sha":"c3bba76d32196188de15af0b5c6eb1a03f939d3c"}
+{"author":{"avatar":null,"date":"2014-08-09T16:29:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-09T16:29:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge remote-tracking branch 'origin/master'","sha":"4c29c932837b80e454c49f29e78cd02caa673fec"}
+{"author":{"avatar":null,"date":"2014-08-09T16:39:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-09T16:39:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Revert \"Return CELL_EFAULT if specified address is invalid\"\n\nThis reverts commit 15fa50f24e0a5016563ea3a4bd1f58304e59dac2.","sha":"dadd93bb8415d7f877f810b4127c9cdc0b89c1d2"}
+{"author":{"avatar":null,"date":"2014-08-09T17:19:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-09T17:19:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #734 from Nekotekina/master\n\nLogging last syscall code for memory error","sha":"6bd45f96975b9fb0100b021bc331e2496b9db1d0"}
+{"author":{"avatar":null,"date":"2014-08-09T19:39:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-09T19:39:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"syncLFQueueInitialize","sha":"c7e77730fe30c2bb1a2d7ee6395189f64d03f2f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T23:10:44Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-08-09T23:10:44Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Damn typo","sha":"e948842faaf1aa3ce70c41c8768cc743abf515df"}
+{"author":{"avatar":null,"date":"2014-08-09T23:18:53Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-09T23:18:53Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #735 from raven02/patch-4\n\nDamn typo","sha":"b8c0b3af73e6c47ac4c8a55088871bd7f33d7a88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-10T16:05:41Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-10T16:05:41Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Add TasksetAttribute2 initilization, fix wrong TODO\n\nAlso fixed cellSpurs.h formatting","sha":"51dd8cb5c3347706053a162f64c6d2d73241b5c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-10T19:06:51Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-10T19:06:51Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Add TaskAttribute2 initilization","sha":"0aed6d8c198c49ad17af651e9ff4c5814decb366"}
+{"author":{"avatar":null,"date":"2014-08-10T19:16:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-10T19:16:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #736 from tambry/cellSpursTasksetAttribute2\n\nAdded TasksetAttribute2 initilization and fixed wrong TODO message","sha":"2fbd9453dd1cc76c1bd37d7f3e00ec692726c03d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-10T19:56:42Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-10T19:56:42Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Log name of syscall, when access violation occurs","sha":"54839b293bf374ab6fc7daeab8bbf314e1787d3a"}
+{"author":{"avatar":null,"date":"2014-08-10T20:18:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-10T20:18:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #737 from tambry/LastSyscallName\n\nLog name of syscall, when access violation occurs","sha":"bbb74350410491925d5225face8be0fa306a2c8d"}
+{"author":{"avatar":null,"date":"2014-08-11T09:48:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-11T09:48:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"aed250d3b0181420403b561d7fb76ed761fcc76b"}
+{"author":{"avatar":null,"date":"2014-08-11T18:35:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-11T18:35:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"CellSyncLFQueue draft","sha":"641efa9b341037561ab0d2b90f6080a1c789afa1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-11T20:15:20Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-11T20:15:20Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"msg":"Automatic-Pause at specified function calls, can be set up using \"pause.bin\" with rpcs3.\nYou would need to find the function ids you wanna play with and write them reversed with Hex Editor.\nThat's quite pity i have no knowledge about wxWidgets so there is no GUI to set up this.","sha":"e9ee084231a4e98e6f0011be5a9223cfc24700de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-11T20:24:12Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-11T20:24:12Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"msg":"typo fix.","sha":"fcab9b2f8e2e87ac7bfa3c6846b0404ab606f13e"}
+{"author":{"avatar":null,"date":"2014-08-11T21:10:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-11T21:10:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Endianness fix (I'm idiot)","sha":"99b4b369357f1cdf4951322a0bbf9724dc5a9ab3"}
+{"author":{"avatar":null,"date":"2014-08-11T22:18:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-11T22:18:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #738 from Syphurith/patch-1\n\nAuto-Pause at specified function call.","sha":"7645f9a3dd2d8b00eb2b8d8e3279a2a2a4dabcd8"}
+{"author":{"avatar":null,"date":"2014-08-09T19:39:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-12T09:05:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"syncLFQueueInitialize","sha":"6383288311f907a09014a32581cce87610e7b8c9"}
+{"author":{"avatar":null,"date":"2014-08-11T18:35:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-12T09:05:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"CellSyncLFQueue draft","sha":"24019fa7b278ddb6ff90d1ef8238bee885e495fb"}
+{"author":{"avatar":null,"date":"2014-08-11T21:10:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-12T09:05:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Endianness fix (I'm idiot)","sha":"fb80c1419c1435fdb1c286a08631df653023cb7c"}
+{"author":{"avatar":null,"date":"2014-08-12T09:05:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-12T09:05:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/Nekotekina/rpcs3","sha":"8002295397c481c1b75bd970727514406b1301e8"}
+{"author":{"avatar":null,"date":"2014-08-12T15:46:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-12T15:46:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"syncLFQueueGetPushPointer","sha":"ce0a7fda5cfebb17e2fd822528b5eb23be0c88e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-12T17:44:28Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-12T17:44:28Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Don't set game's size info when it's a null pointer","sha":"8095c34e4976a3b98371671d16764646a17210a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-12T20:27:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-12T20:27:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Improve content errors and fix access violation","sha":"7dc48425c10326383a7bd5ee39feb4203a827a27"}
+{"author":{"avatar":null,"date":"2014-08-12T21:23:42Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-12T21:23:42Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #739 from tambry/BootCheckFix\n\nDon't set game's size info when it's a null pointer","sha":"5b89d137fcd34648b7d1d18d03b82f7bd006be6c"}
+{"author":{"avatar":null,"date":"2014-08-12T21:23:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-12T21:23:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #740 from tambry/ErrorDialogFix\n\nImprove content errors and fix access violation","sha":"72f1206585e270d7f98fbb9d718b5ef26be7eaa8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T06:39:45Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T06:39:45Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Re-fixed content error dialogs","sha":"980dfc8f4be25d83c83c15552f990ae855ffe0eb"}
+{"author":{"avatar":null,"date":"2014-08-13T07:04:18Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-13T07:04:18Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #741 from tambry/RefixCellGame\n\nRe-fixed content error dialogs","sha":"22d018c4cdc3127aa7ea1ad45b0764978da70634"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5377832?v=4","date":"2014-08-13T07:43:11Z","email":"admin@archshift.com","login":"archshift","name":"archshift"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5377832?v=4","date":"2014-08-13T07:43:11Z","email":"admin@archshift.com","login":"archshift","name":"archshift"},"msg":"Add build directory to .gitignore\n\nMany people prefer to build out-of-source, especially in the ./build directory. This prevents it from being tracked by git.","sha":"1570bee4b81fc616e2a4e28b208463ecde1b7486"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T07:46:17Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T07:46:17Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Create RWLock with default attributes, when attributes is a null pointer","sha":"3095d01144c0cc092bec7ccaf7f13671dfe28010"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T07:57:55Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T07:57:55Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Don't set game's size info in Patch and Data check","sha":"1a92526ba006efcf319d05d4a3867dacf96a1dde"}
+{"author":{"avatar":null,"date":"2014-08-13T09:53:14Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-13T09:53:14Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #742 from archshift/gitignore\n\nAdd build directory to .gitignore","sha":"ae1fc37eebd368ae148a4c2b3bae2d0db69db8b6"}
+{"author":{"avatar":null,"date":"2014-08-13T09:53:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-13T09:53:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #744 from tambry/DataPatchCheckFix\n\nDon't set game's size info in Patch and Data check","sha":"36ab30d3e962d2f6a276dd5dd485c68771ac80ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T10:53:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T10:53:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix redeclaration","sha":"03747e3106699ddb323827cf138ac3cdd4334803"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T12:25:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T12:25:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"License isn't always needed, fixes access violation","sha":"8f4d8f82ed205d10aa14a90fa9518605f0e6177e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-13T12:54:27Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-13T12:54:27Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"msg":"Auto-Pause At Function Call and System Call.\nWould have a configuration window (with create the list, and enable/disable, being something similar to VFSManger and etc).\nMove the code to Debug::AutoPause in AutoPause.cpp and AutoPause.h\nIt triggers currently in GameViewer, and would finally change to somewhere else.\nWell and now it is all enabled (Function call + System call) by default.","sha":"ea00c3a07f0b66b19a56a49e970db168cdfa89d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T14:00:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T14:00:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Somewhat implemented cellGcmSetFlipImmediate\n\nAlso a small change (optimization?) in cellGcmSetPrepareFlip()","sha":"134ee1eff0039161a74bc7127ffea75c95939b78"}
+{"author":{"avatar":null,"date":"2014-08-13T15:47:28Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-08-13T15:47:28Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #743 from tambry/DefaultRWLock\n\nCreate RWLock with default attributes, when attributes is a null pointer","sha":"60cb52bd2302bc74e3b05225bd618c102c506b65"}
+{"author":{"avatar":null,"date":"2014-08-13T15:47:45Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-08-13T15:47:45Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #745 from tambry/DirNameFix\n\nFix redeclaration","sha":"1b41cb0e80dfc3a8a284fb01dfa5648309f4a498"}
+{"author":{"avatar":null,"date":"2014-08-13T15:48:02Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-08-13T15:48:02Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #746 from tambry/DrmAvailableViolationFix\n\nLicense isn't always needed, fixes access violation","sha":"b005d2fbd735f118ff8bf4fa09542be50ae1a4d3"}
+{"author":{"avatar":null,"date":"2014-08-13T15:48:30Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-08-13T15:48:30Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #747 from tambry/FlipImmediate\n\nSomewhat implemented cellGcmSetFlipImmediate","sha":"351d6eabb842b84ac788502a671e45fa31033bf7"}
+{"author":{"avatar":null,"date":"2014-08-13T17:22:44Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-13T17:22:44Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #750 from Syphurith/patch-AutoPause\n\nAuto-Pause At Function Call and System Call","sha":"618d2c85ab6a573ff345a87a0e13a40091a95c95"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-13T17:55:35Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-13T17:55:35Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"msg":"Implemented Syscalls 177. Not tested (having nothing to trigger it)\nAdded State changes for sys_spu_thread_group_* calls.\nDoes almost nothing for 176 and skips the EPERM check for 177.","sha":"2d29023931fa2d7874548508091d6d969d73327b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T18:01:09Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T18:01:09Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Actually fix sys_rwlock_create","sha":"63088515b49e118ffad192b73163ea1dbff27899"}
+{"author":{"avatar":null,"date":"2014-08-13T18:22:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-13T18:22:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"4b72ecda0de2fed1a3c03a0860fefeb4cefca43b"}
+{"author":{"avatar":null,"date":"2014-08-13T19:06:28Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-13T19:06:28Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #751 from tambry/RWLockFix\n\nActually fix sys_rwlock_create","sha":"d7a4f3ed209ce0e13ae3df380d9d7906c0736986"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T19:29:38Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-13T19:29:38Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement sceNpDrmIsAvailable2","sha":"91b4596c0bccefabdd9ad3d8f9317a05bfa1bdde"}
+{"author":{"avatar":null,"date":"2014-08-13T19:40:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-13T19:40:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #753 from tambry/NpDrmIsAvailable2\n\nImplement sceNpDrmIsAvailable2","sha":"27403162ad54d007635b1034f8ad8c2716f520bb"}
+{"author":{"avatar":null,"date":"2014-08-13T21:03:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-13T21:03:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"8ec47b7e27480cc0503bb6fafeab067b911568fd"}
+{"author":{"avatar":null,"date":"2014-08-13T21:39:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-13T21:39:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"syncLFQueueCompletePushPointer","sha":"369c667faafc9f27065d9990accaacc93d3d6b91"}
+{"author":{"avatar":null,"date":"2014-08-14T12:02:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-14T12:02:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Memory bugs fixed","sha":"c9cd80c0890e66475c74c87a34aab207c7e23aac"}
+{"author":{"avatar":null,"date":"2014-08-14T12:15:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-14T12:15:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Little fix (forbids pointer arithmetic in some places)","sha":"9f0c5899d6d3c28cebc3f73c170f5e9d8f56d125"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-14T15:22:13Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-14T15:22:13Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"msg":"Added GUI Configuration for Auto-Pause.\nYou can easily configure it as what you do for VHD/VFS.\nTo disable/enable Auto-Pause, find the configuration checkboxes from HLE/Misc panel in Config->Setting of rpcs3.","sha":"069aa9fb2a71622b0e518dec72d37c134e9d2d0c"}
+{"author":{"avatar":null,"date":"2014-08-14T15:36:53Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-08-14T15:36:53Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #752 from Syphurith/patch-syscall-177\n\nSysCalls 177 sys_spu_thread_group_terminate","sha":"004df937edeb72d464f4b43429b8d0efc6a33796"}
+{"author":{"avatar":null,"date":"2014-08-14T15:39:35Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-08-14T15:39:35Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #754 from Syphurith/patch-AutoPause\n\nAuto-Pause GUI Configuration","sha":"d1e74044f96eaf29f356f3d47ecca3a7be9b5235"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-14T16:04:32Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-14T16:04:32Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"msg":"Typo fix for checking input against what program get.","sha":"b9b9eb7fb236f4ea92262da65ff9d17f2c5e6eab"}
+{"author":{"avatar":null,"date":"2014-08-14T16:54:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-14T16:54:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #755 from Syphurith/patch-AutoPause\n\nTypo fix for Auto-Pause GUI.","sha":"4d88cfed955bc5c3c55ed43d1a8ed22faa254f9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-15T07:02:36Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-15T07:02:36Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"msg":"Make Auto-Pause UI better.","sha":"98cdbb759b58a3565e49551a98182445a65f5a70"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-15T11:44:16Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-15T11:44:16Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"msg":"Added Save Data Utility UI (stub).\nMay be connected to real data after those related save data list get implemented, with those data sent to UI decided.\nAlso removed some comments from Auto-Pause.","sha":"5531a615e68893aaf81cf15b6da85ac6641fe211"}
+{"author":{"avatar":null,"date":"2014-08-15T12:50:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-15T12:50:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some hack","sha":"cb58a773c9354d204c64107c9dbc4ebad257882a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-15T13:02:18Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-15T13:02:18Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"msg":"Typo Fix. Bind submenu items.","sha":"9e59ccd9affa0c6d088c666250a213143805d051"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-15T13:36:20Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-15T13:36:20Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"msg":"Removed checking <0 on unsigned int. (lol)","sha":"d949ef1b8a626afc1638df2d9f768a72cb9d70da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-15T14:57:55Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-15T14:57:55Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Huge SceNp header additions and splitting\n\nTUS, SNS, Commerce and Clans modules are now in seperate files.\nAdded a lot of headers and structures.","sha":"d36580f1dc5c75691f357e2f311c6e54f085d1ec"}
+{"author":{"avatar":null,"date":"2014-08-15T17:26:40Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-08-15T17:26:40Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #756 from Syphurith/patch-UI\n\nAdded Save Data Utility UI (stub)","sha":"b78d0a8e5b9c3e4a9b5858707cabaae3c97c671f"}
+{"author":{"avatar":null,"date":"2014-08-15T17:27:15Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-08-15T17:27:15Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #757 from tambry/SceNpImprovements\n\nHuge SceNp header additions and splitting","sha":"bf8b066d973b73f00d97737acac049320267d18d"}
+{"author":{"avatar":null,"date":"2014-08-16T15:01:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-16T15:01:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"152c2b87a4403b4fafa8c94e05d0addebfd70ef5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-16T16:03:31Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-16T16:03:31Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"msg":"Give Log Console (ConLogFrame) a Context Menu with Copy and Clear actions.","sha":"e360746265c05e215ce6f665962e8b176ee5d71c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-16T16:20:16Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-16T16:20:16Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Enabled cellGem and added cellGemGetMemorySize","sha":"1e4f95dee3a29e7a1dea02816caedad9e4fd0758"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-16T16:33:24Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-16T16:33:24Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"msg":"typo fix: added missing header. really sorry for that.","sha":"b82d2caa6bee14366be4806d9e31ee90315a990b"}
+{"author":{"avatar":null,"date":"2014-08-16T18:09:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-16T18:09:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #759 from tambry/cellGem\n\nEnabled cellGem and added cellGemGetMemorySize","sha":"95a66afbe64063fc6ac6185bb5387ebe0ff8c308"}
+{"author":{"avatar":null,"date":"2014-08-16T18:09:22Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-16T18:09:22Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #760 from Syphurith/patch-UI\n\nUI: Clear command for Log Console","sha":"2b4f44c0b2994a06d1c7a41d0d3e8fa6f9c08e1c"}
+{"author":{"avatar":null,"date":"2014-08-16T21:39:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-16T21:39:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"syncLFQueueGetPushPointer, syncLFQueueCompletePushPointer","sha":"50fb51dd0d112055444ae187ba34962a9ecff7b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-16T21:45:56Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-16T21:45:56Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Updates in sys_rsx and CellGcmDisplayInfo\n\nThanks a lot to @3141card for all the relevant information about RSX\nrelated lv2 syscalls.","sha":"b7be8b19efb325307dbbe0ddaf84625fcc997c25"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-17T06:18:53Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-17T06:18:53Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix sceNpClans, sceNpCommerce2, sceNpSns and sceNpTus functions not being registered","sha":"0489f9c342ba0b540021fd9725d3dd2ab4fabb07"}
+{"author":{"avatar":null,"date":"2014-08-17T06:29:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-17T06:29:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #761 from tambry/cellLoadingFixes\n\nFix sceNpClans, sceNpCommerce2, sceNpSns and sceNpTus functions not being registered","sha":"d9b5cafdeeed6336a3fdefbef95c101109319581"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-17T07:53:09Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-17T07:53:09Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fixed some grammatical mistakes","sha":"9b1a2e50f21e6fb8635599acab6753ffdd7c7ed6"}
+{"author":{"avatar":null,"date":"2014-08-17T08:00:49Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-17T08:00:49Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #762 from tambry/GrammaticalFixes\n\nFixed some grammatical mistakes","sha":"8236b3d034e37f18a80a7458cc441d2b90cfa04c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-17T09:22:36Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-17T09:22:36Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"cellGcmSys changes and minor fixes","sha":"bb1749d3dab8ce02aa6dd2cd649e1b05e3d853bc"}
+{"author":{"avatar":null,"date":"2014-08-17T14:46:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-17T14:46:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_spu_thread_group_join fix","sha":"e1ac43e1b8097beef01d54f05f989829b081429e"}
+{"author":{"avatar":null,"date":"2014-08-17T14:59:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-17T14:59:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellPadSetPortSetting fix","sha":"db676256d7e9e4a1d30d19fe72cfe80883046fb9"}
+{"author":{"avatar":null,"date":"2014-08-17T15:08:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-17T15:08:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"syncLFQueueGetPopPointer + bugfix","sha":"cf5dbdbdb51b27169462064673c851d39763f219"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-17T20:11:58Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-17T20:11:58Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #763 from DHrpcs3/gcm-wip\n\ncellGcmSys and sys_rsx changes","sha":"f69174677182950cd39ef18a834493f88e1f2dc9"}
+{"author":{"avatar":null,"date":"2014-08-17T21:35:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-17T21:35:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"syncLFQueueCompletePopPointer + bugfix","sha":"64935ccee65b164fdcc296dfd696565cfc562033"}
+{"author":{"avatar":null,"date":"2014-08-17T22:39:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-17T22:39:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPR removed from SPU","sha":"55ee7065beb3f1b45e641cf4b763dc480071de2b"}
+{"author":{"avatar":null,"date":"2014-08-17T22:46:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-17T22:46:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPR are not used","sha":"8a785fefc28e0173bb356a759dd90e5dd5c9f68d"}
+{"author":{"avatar":null,"date":"2014-08-18T00:23:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-18T00:23:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU: some instructions removed\n\nThey can't be used on PS3.\nBitfields for interrupt flags added.","sha":"07a5720c170d37c918407a4ed542e903320fa533"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-18T09:47:54Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2014-08-18T09:47:54Z","email":"877033040@qq.com","login":"Syphurith","name":"luxsie"},"msg":"Implemented L10nConvertStr as only char* -> char* (type).\nThis may be used in other l10n functions, since it was designed to receive void* pointer.\nFind sizeof(size_t) is 4 (uint32_t?) in Guided Fate Paradox. Thank @B1ackDaemon for testing.\nChanged log content for this function. Also fixed many typos..\nNeed windows sdk for code page transformation on windows. Need iconv to build on Linux/Mac.\nOriginal source for char to char codepage transformation is already tested using codeblocks and vs.\nNoticed l10n_conv_t is omitted in reference, which may be replaced by iconv_t or simply other function.\nModified .travis.yml to apt-get install libc6-dev and removed -liconv from CMakeFile.txt.","sha":"7bbf4bbaebe93d238f2617aee9b2f5a8ecbfe845"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-18T10:36:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-18T10:36:53Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #765 from Syphurith/patch-L10nConvertStr-rebuilt\n\nL10nConvertStr","sha":"f71780609d98da801e575596cc1d2547e8dd7320"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-18T14:37:23Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-18T14:37:23Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"RSXVertexData bugs fixed\n\n* Some extra info on sys_rsx syscalls\n* Code cleaned in GLGSRender.cpp","sha":"b23a5f231250eec31733a9552f804d91d976b83c"}
+{"author":{"avatar":null,"date":"2014-08-18T16:12:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-18T16:12:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSyncLFQueueClear\n\ncellSyncLFQueueSize\ncellSyncLFQueueDepth\n_cellSyncLFQueueGetSignalAddress\ncellSyncLFQueueGetDirection\ncellSyncLFQueueGetEntrySize","sha":"9ba553643c98d111d8caad6ce8f68fb41ff06786"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-18T20:07:52Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-18T20:07:52Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fragment Shader recompiler comments\n\nDon't expect changes due to this commit.","sha":"cf9769fe654bf5cffcb0110bc87b497308d8dfdb"}
+{"author":{"avatar":null,"date":"2014-08-18T21:16:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-18T21:16:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some headers defined","sha":"293f276f873e8f149a9692dd57f5615cbe631e34"}
+{"author":{"avatar":null,"date":"2014-08-18T22:33:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-18T22:33:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"afe984ca29d29bc36a42da0bc6135b1fe8a47022"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T00:10:29Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T00:10:29Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Vertex Data base offset/index\n\nFixed incorrect default value in RSXTexture.","sha":"529d0dbbbe24a2518def6842e564f67eb3e2f919"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-08-19T06:48:11Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-08-19T06:48:11Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"GLGSRender: Fix always false error condition","sha":"538498f21f95c9b6a1256a0db852ea2253e7d2f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-08-19T06:58:26Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-08-19T07:07:18Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"cellL10n: Fix mismatching delete call, should be delete[]","sha":"2e6ce1c94a9140c32b5f7577d8ea4b4eb42f9daf"}
+{"author":{"avatar":null,"date":"2014-08-19T08:32:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-19T08:32:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"4446aa5d1797e4ce757c24829073d391476a16fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T09:23:36Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T09:23:36Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #768 from lioncash/delete\n\ncellL10n: Fix mismatching delete call, should be delete[]","sha":"6cd67be087ac1e2666fc9b3c4a6d0f0e1203008e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T09:25:31Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T09:25:31Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #767 from lioncash/logical\n\nGLGSRender: Fix always false error condition","sha":"475fb0d8c8ca4b2f4122a6ae8170458a05fec527"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-26T03:31:46Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T11:10:41Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Updated IDManager\n\nID member m_flags has been replaced with m_type, which stores the type\nof the object referenced by the ID and added std::set<IDType> to the ID\nmanager to group relevant IDs in order to use them later in some\nlv2/sys_process functions and the Kernel Explorer.","sha":"d53327f8bb47524b27c1c998bf646d635a7c44cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-07-26T05:51:45Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T11:19:22Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Kernel Explorer implemented","sha":"d3e9e1296ca852abad04936a6eff33037b367cf8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T10:14:26Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T11:19:24Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Minor sys_prx update","sha":"c273c0e42b1511c1e7efd467fca2031055176b91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T11:57:05Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T11:57:05Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Linux compilation fixes","sha":"a010f802cacd0be89b1c36e8d934fd81959a5727"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T12:03:59Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-19T12:03:59Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #766 from DHrpcs3/prx_loader\n\nKernel Explorer implemented","sha":"29a7a619bc89c4097f492a41023c8d40091a5dc2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-08-19T14:25:13Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-08-19T14:25:13Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Ini: Remove dead code","sha":"46a472acf9a44862abbe01a958874d0cfc9d6751"}
+{"author":{"avatar":null,"date":"2014-08-19T14:44:47Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-08-19T14:44:47Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #769 from lioncash/ini\n\nIni: Remove dead code","sha":"0d43c822cd30117c09cb0f1d17d58e1c4b64a6f2"}
+{"author":{"avatar":null,"date":"2014-08-19T18:17:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-19T18:17:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"REG_FUNC macros\n\nAnd some auxiliary changes","sha":"89b944c397046745adc0e05b63ba1bbcead1f522"}
+{"author":{"avatar":null,"date":"2014-08-19T19:28:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-19T19:28:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"0a0ccb54bf96e43bc3f7dbd58ed39fa77ad19531"}
+{"author":{"avatar":null,"date":"2014-08-20T00:32:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-20T00:32:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some fixes","sha":"ffa258d334253fdb9668237f57c9b7129e569b3a"}
+{"author":{"avatar":null,"date":"2014-08-20T10:21:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-20T10:21:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"_sys_spu_printf_initialize\n\n_sys_spu_printf_finalize\n_sys_spu_printf_attach_group\n_sys_spu_printf_detach_group\n_sys_spu_printf_attach_thread\n_sys_spu_printf_detach_thread","sha":"dd9df4f36ff5362032afd99602fadb3528b74559"}
+{"author":{"avatar":null,"date":"2014-08-20T14:23:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-20T14:23:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SetCurrentNamedThread()","sha":"9eb280c3676154dd6a7b3b03af1ed442bb8466e4"}
+{"author":{"avatar":null,"date":"2014-08-20T22:12:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-20T22:12:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Light hack for FSCRRD and FSCRWR\n\nSPU_*Event* channels implemented for LR event\nMFC_RdTagMask implemented","sha":"126b636edf61a11c0994d5213528c519a0d21e14"}
+{"author":{"avatar":null,"date":"2014-08-21T01:02:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-21T01:02:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Interrupt handling changed","sha":"1941f3d916364d3d3aee660ade80538e4561aa36"}
+{"author":{"avatar":null,"date":"2014-08-21T01:31:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-21T01:31:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_event_flag_set_bit_impatient","sha":"1f3f6f46648cdecd86d3dcdf552922377e3a3a8f"}
+{"author":{"avatar":null,"date":"2014-08-21T02:20:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-21T02:20:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"still FSCRRD","sha":"f153143c9d928caf39c9c95e69908adfa20918f4"}
+{"author":{"avatar":null,"date":"2014-08-21T09:56:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-21T09:56:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSpurs: debug preparations\n\nAlmost all functions registered","sha":"4760ec63e2d300f25472f4955e5e97800ab7afff"}
+{"author":{"avatar":null,"date":"2014-08-21T12:55:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-21T12:55:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_spu_thread_throw_event","sha":"184007e1e00b3fd68f092760b2154704e9e40239"}
+{"author":{"avatar":null,"date":"2014-08-21T21:37:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-21T21:37:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Reservation global struct removed\n\nIt wasn't solving anything, unfortunately.","sha":"a169c5bcacb3b2b28cbd282f1bfc44793166cbec"}
+{"author":{"avatar":null,"date":"2014-08-22T14:21:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-22T14:21:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Attempt to remove some includes","sha":"5abd3fabfa78d8ed9da4f00f5f37334e6eee422e"}
+{"author":{"avatar":null,"date":"2014-08-22T14:30:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-22T14:30:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"7a466b7fb7ce143f428d234cabd807bf857d4300"}
+{"author":{"avatar":null,"date":"2014-08-22T14:58:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-22T14:58:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"52cf911c60468524e57cb0bfb48dda146a411c32"}
+{"author":{"avatar":null,"date":"2014-08-22T15:33:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-22T15:33:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2 (not sure)","sha":"a8b591234003e8becd43c78e8bb97164c08cbda5"}
+{"author":{"avatar":null,"date":"2014-08-22T16:36:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-22T16:36:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Another try","sha":"652c5901f84ff956a700fbe63ab927c58207f637"}
+{"author":{"avatar":null,"date":"2014-08-22T16:54:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-22T16:54:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"102f8cf9935eee090459cf82756eef39ac2c05c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-22T19:34:43Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-22T19:34:43Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Added Added cellSaveDataListAutoSave and AutoLoad\n\nAlso fixed logging of container argument for all other save data\nfunctions.","sha":"9c6b935770be1f0d5860851db2fe6f5a1f2112ea"}
+{"author":{"avatar":null,"date":"2014-08-22T21:15:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-22T21:15:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"include clearing","sha":"861ce9e7334596db72c3e071c2f5e7a7e1927e3c"}
+{"author":{"avatar":null,"date":"2014-08-22T21:31:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-22T21:31:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"0d15fc35d74941e5b2364af469c83da1b6973dea"}
+{"author":{"avatar":null,"date":"2014-08-23T00:16:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-23T00:16:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"include clearing","sha":"efa538f9d762babfe8d480ef544c97f3eb1de305"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-23T07:30:26Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-23T07:30:26Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix overwriting, when installing PKG files\n\nNow properly removes the directory and tries to continue installation.","sha":"ae47cdaad8a3e3269693514ee5515b75e32f474a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-23T07:50:34Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-23T07:50:34Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Use std::string for installing PKG files\n\nAlso now only refreshes, when it could open the PKG file.","sha":"7a7264db330c1b5097a1a23fd7554cc0b5586fc9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-23T12:57:21Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-23T12:57:21Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #773 from tambry/OverwriteFix\n\nFix overwriting, when installing PKG files","sha":"0d4c10b56c9219072135eb76c664ad78219cb0e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-23T13:11:39Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-23T13:11:39Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #771 from tambry/cellSaveDataListAuto\n\nAdded Added cellSaveDataListAutoSave and AutoLoad","sha":"889e7807cba8dc3de417c80e581de7b7d5dfc543"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-23T13:27:25Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-23T13:27:25Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"More improvements and small additions to cellNetCtl","sha":"9d2fd7a27f1ca55f9885d26be295e2b0dc027778"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-23T13:28:57Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-23T13:28:57Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #770 from tambry/cellNetCtlImprovements\n\nMore improvements and small additions to cellNetCtl","sha":"c71ed13f1adfe3533942297790742544b7f81308"}
+{"author":{"avatar":null,"date":"2014-08-23T14:51:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-23T14:51:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Log include fixes","sha":"b005ee3cdaa5e52cd8ab35fa94d6a5c56e6f4c59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-23T19:41:22Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-23T19:41:22Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Added cellSail structures and callbacks","sha":"31131c17efa29e6b42bbb4a797c6927faaf9e2c6"}
+{"author":{"avatar":null,"date":"2014-08-23T20:40:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-23T20:40:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Include clearing","sha":"4ffd03fe3e028814836b8b4a58f1bf72f2b580a4"}
+{"author":{"avatar":null,"date":"2014-08-23T20:42:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-23T20:42:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellGem bug fixed","sha":"e353c3952216b8f091c78cc32441ab9468b31860"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-23T22:04:22Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-23T22:04:22Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #774 from tambry/cellSailThings\n\nAdded cellSail structures and callbacks","sha":"23fb4734eaf7b6929b47b5a1405752fada582989"}
+{"author":{"avatar":null,"date":"2014-08-23T22:20:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-23T22:20:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"7c7782cd4c4c92f68ad5effc0f3561d6619b5299"}
+{"author":{"avatar":null,"date":"2014-08-23T22:34:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-23T22:34:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"11f618fdeff2ddf7fac543ea799a0dd8f77eef59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-23T23:00:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-23T23:00:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #775 from Nekotekina/master\n\nMany changez","sha":"6f0531b3f7645f8d399fa534a32a647e5dd55461"}
+{"author":{"avatar":null,"date":"2014-08-24T17:42:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-24T17:42:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Include cleaning","sha":"50b5d72bb2627bbf9eec09bb26c842cd5c0c5afd"}
+{"author":{"avatar":null,"date":"2014-08-24T22:23:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-24T22:23:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Abstract GSFrameBase class and callback","sha":"84c5899faf930af374ee5a2750d31ca70dabd859"}
+{"author":{"avatar":null,"date":"2014-08-24T23:08:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-24T23:08:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix (?)","sha":"a324b58145facc11bfb336321706d6e446eb54f9"}
+{"author":{"avatar":null,"date":"2014-08-24T23:38:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-24T23:38:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"bed3260e459a32f42c7e18c38c02cb3cc2d77a49"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-25T02:39:38Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-25T02:39:38Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #776 from Nekotekina/master\n\nGUI callbacks","sha":"3c562afd495b26e4633bdf5e34509903d77dce47"}
+{"author":{"avatar":null,"date":"2014-08-25T14:56:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-25T14:56:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"rFile.h, Thread.h, IdManager.h includes moved","sha":"61c4a88ab438d8584cd63f7c7b3e5f7ed7c5d978"}
+{"author":{"avatar":null,"date":"2014-08-25T17:01:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-25T17:01:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU spr name table","sha":"f6ba1eaebd2789ba0b4d7df00c93f297fdbc842d"}
+{"author":{"avatar":null,"date":"2014-08-25T18:09:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-25T18:09:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some cleanup","sha":"a74e07dc408f9d4b1accda3a55a437f4b310a941"}
+{"author":{"avatar":null,"date":"2014-08-25T18:50:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-25T18:50:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"04c67c3f4b34daa73e4f33b5f2b1a5d88a6e7394"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-25T18:59:15Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-25T18:59:15Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix access violation when directory name is not given\n\nInstead now displays it as \"Unknown\"","sha":"6397640df8d8a376dc9b88afbb95c7c2e5d3e776"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-25T19:15:51Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-25T19:15:51Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #777 from tambry/contentErrorDialogFix\n\nFix access violation when directory name is not given","sha":"472a71fb8f0b01abf435a9fa998cc1709d86032c"}
+{"author":{"avatar":null,"date":"2014-08-25T20:52:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-25T20:52:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"455bdc381989a780dc794770e93225596d991d23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-25T21:17:51Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-25T21:41:57Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"GCM Report/Notify and sys_rsx functions","sha":"13fec1cd9ad15993b1fc921baffdfce887df9b18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-25T23:45:15Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-25T23:45:15Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Minor lv2 / GCM updates and double-click loading","sha":"5bd85bd4eb4f07c5bdab45ea7eb30ac36d52327e"}
+{"author":{"avatar":null,"date":"2014-08-25T23:55:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-25T23:55:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some leaks fixed","sha":"78cbb90ef6efb11bca38c589d65bbe7be05ac15b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-25T23:58:10Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-25T23:58:10Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #778 from DHrpcs3/gcm-wip\n\ncellGcmSys and lv2 updates","sha":"08f192ee0ee921792739ca9243e4c988dac2f438"}
+{"author":{"avatar":null,"date":"2014-08-26T00:52:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-26T00:52:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"9eda0aa245683de58b79fb125958331157e46571"}
+{"author":{"avatar":null,"date":"2014-08-26T14:38:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-26T14:38:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SC_FUNC.h rewritten\n\nNow float arguments should work correctly","sha":"5d3a612003f0c10372028dba17767d5e86f89432"}
+{"author":{"avatar":null,"date":"2014-08-26T16:45:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-26T16:45:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"d7fd8e3ca69690941d948237a58402f6fb380377"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-26T17:54:17Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-26T17:54:17Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #779 from Nekotekina/master\n\nSC_FUNC fix","sha":"0b52abeaf80de310e5c2531df760742eab7caf61"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-26T18:07:05Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-08-26T18:07:05Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Minor shortening in Resc","sha":"0d6386f391db9ac15b82bf6974a3fe74be0d933f"}
+{"author":{"avatar":null,"date":"2014-08-26T21:09:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-26T21:09:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"36e691c2db0bb8a7010fcfc1c98f87f3c6ab1170"}
+{"author":{"avatar":null,"date":"2014-08-26T22:44:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-26T22:44:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSync2 stub activated","sha":"bbf7508d41587d54c10f9bcb57efc522fb649776"}
+{"author":{"avatar":null,"date":"2014-08-27T13:11:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-27T13:11:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSync2 stub","sha":"0fb45cccbc043c2f897178021ae024e947b41973"}
+{"author":{"avatar":null,"date":"2014-08-27T14:37:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-27T14:37:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSpursJq stub","sha":"6a996fcd0ad92ff1c71fba0e85a86c71eec67b8c"}
+{"author":{"avatar":null,"date":"2014-08-27T19:05:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-27T19:05:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_memory_get_page_attribute faked correctly","sha":"1065eb17dece5c2656ee172b8c483a20be5e23d6"}
+{"author":{"avatar":null,"date":"2014-08-27T21:04:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-27T21:04:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_spu_thread_group_exit","sha":"d5aa7aae432bcf3cf69d3bf54a3fbd59b4366ff0"}
+{"author":{"avatar":null,"date":"2014-08-27T22:14:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-27T22:14:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellFiber stub activated","sha":"f6bb62a76c9f170be35cb88fc9e0253391895108"}
+{"author":{"avatar":null,"date":"2014-08-28T01:18:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-28T01:18:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"mem_class_t eliminated\n\nIt didn't work for some reasons anyway,","sha":"b37f3e1b93acc2ebff85b1c7965dcb30b94a36c3"}
+{"author":{"avatar":null,"date":"2014-08-28T16:29:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-28T16:29:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some std include moved","sha":"693e7a38fa39bcd59ee6f1dbcfc6047e5da4309d"}
+{"author":{"avatar":null,"date":"2014-08-28T22:49:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-28T22:49:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"stdafx_gui.h created, wx removed from stdafx.h","sha":"028ce2dd9f86fb1077b2753f0747bea4653f475a"}
+{"author":{"avatar":null,"date":"2014-08-29T12:07:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-29T12:07:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"0be2728e1927231cf4983ab773d497f9115abe75"}
+{"author":{"avatar":null,"date":"2014-08-29T12:21:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-29T12:21:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2","sha":"12f4f35cfaa31a64a47ced419e6f7c264d91748a"}
+{"author":{"avatar":null,"date":"2014-08-29T12:27:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-29T12:27:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 3","sha":"851ae920b9346b6c67f06f224047f522a40df0d2"}
+{"author":{"avatar":null,"date":"2014-08-29T13:06:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-29T13:06:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 4","sha":"2c8b485ba0635990d7b95b82bf86da32db33e1ab"}
+{"author":{"avatar":null,"date":"2014-08-29T13:25:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-29T13:25:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 5","sha":"21e254d05fcd3821da633e27dce79f32fb84572c"}
+{"author":{"avatar":null,"date":"2014-08-29T18:30:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-29T18:30:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellMsgDialog code moved","sha":"56ba26ab24dd43a84c2c7e5ae7bea21126a620f2"}
+{"author":{"avatar":null,"date":"2014-08-29T19:51:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-29T19:51:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"<wx/math.h> excluded, wxString forwarded","sha":"120c3261b47cea3596912f3d9af861b1dec79741"}
+{"author":{"avatar":null,"date":"2014-08-29T19:59:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-29T19:59:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"6cb2518a8100dbb6e3fe1dddda0af12c5c458cb2"}
+{"author":{"avatar":null,"date":"2014-08-29T20:26:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-29T20:26:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2","sha":"d14f22d0592dad854b4ec266a5acce9ecb4d791b"}
+{"author":{"avatar":null,"date":"2014-08-30T10:19:00Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-30T10:19:00Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #781 from Nekotekina/master\n\nwxRemoval©","sha":"d99ae7b21cad2a83171cf88ecf4ff7d99456cafa"}
+{"author":{"avatar":null,"date":"2014-08-30T13:52:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-30T13:52:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"(nothing, really)","sha":"8dfe7138dfa12b7cca6f184b2da9635364b793de"}
+{"author":{"avatar":null,"date":"2014-08-30T17:51:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-30T17:51:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some warnings fixed, some code removed","sha":"3269c88d02a7e6fef584e4dfc326a2a49b12c6c5"}
+{"author":{"avatar":null,"date":"2014-08-30T18:35:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-30T18:35:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some warnings fixed","sha":"fb1d7d39827f6f94fb53b4ce1b93ffbb6136b476"}
+{"author":{"avatar":null,"date":"2014-08-30T19:11:42Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-08-30T19:11:42Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #780 from tambry/minorFixes\n\nMinor shortening in Resc","sha":"5a043ddacb95eb94666f9e0826ec989314814826"}
+{"author":{"avatar":null,"date":"2014-08-30T20:41:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-30T20:41:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some warnings fixed","sha":"9e2bb9e9d2734767606c0700b7e5f03679658193"}
+{"author":{"avatar":null,"date":"2014-08-30T22:15:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-30T22:15:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"memory-wip branch merged","sha":"367b8e7129ca79b29fa3c8f22b6acee9fbab26cc"}
+{"author":{"avatar":null,"date":"2014-08-30T23:06:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-30T23:06:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"ff3df64a26d203ae51a4ddf8db0f1ee6f6e6fb03"}
+{"author":{"avatar":null,"date":"2014-08-30T23:19:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-30T23:19:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2","sha":"140d40b5bc62b383cb5ee2caccbbd03f8316c354"}
+{"author":{"avatar":null,"date":"2014-08-30T23:38:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-30T23:38:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 3","sha":"26e03fa794f235367b68b19442eb5e180a2346cc"}
+{"author":{"avatar":null,"date":"2014-08-31T09:54:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-31T09:54:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Test","sha":"571bd63644383ff58476e353977bdacfab243b02"}
+{"author":{"avatar":null,"date":"2014-08-31T11:18:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-31T11:18:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"ebc4fa3e81b91d182ea8b6194e02bdfacc0c9eb7"}
+{"author":{"avatar":null,"date":"2014-08-31T15:01:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-31T15:01:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"vm::ptr for u8/char types, mem_list_ptr_t removed","sha":"a8cfefac07673d49a5653ef193988a8917ffc1fe"}
+{"author":{"avatar":null,"date":"2014-08-31T15:31:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-31T15:31:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"8e5980b307475b5db3cca79d16a3ea953a9fe08a"}
+{"author":{"avatar":null,"date":"2014-08-31T15:39:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-31T15:39:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2","sha":"f6f58b7615d0bc1b23158fab25a69f68e70c588c"}
+{"author":{"avatar":null,"date":"2014-08-31T15:48:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-31T15:48:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 3","sha":"96d7034c96b9aeae557a639b53ec3a16f56644a3"}
+{"author":{"avatar":null,"date":"2014-08-31T17:13:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-31T17:13:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bug fixed","sha":"06486b6537a72a3d11a6279c73777987cc177f19"}
+{"author":{"avatar":null,"date":"2014-08-31T19:38:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-31T19:38:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugs fixed","sha":"49b295e332022c806241fabfae5502037cfd0655"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-08-31T20:12:09Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/712067?v=4","date":"2014-08-31T20:12:09Z","email":"mathew1800@gmail.com","login":"lioncash","name":"Lioncash"},"msg":"Core: Apply const to some functions","sha":"82840282fb3ea68e2c4ecc7fb37bac444ea2b3f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-31T20:56:39Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-08-31T20:56:39Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #783 from lioncash/consts\n\nCore: Apply const to some functions","sha":"6fa75cf9932406fa92cd2374dbad5107e76550b1"}
+{"author":{"avatar":null,"date":"2014-08-31T21:55:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-31T21:55:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"mem16_t replaced\n\nI think it's not bad to use pointer type when possible, because it's\noften originally pointer, not reference.","sha":"0d94c78e630af11a3f2024b98568c5c3d8659667"}
+{"author":{"avatar":null,"date":"2014-08-31T22:58:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-08-31T22:58:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"mem64_t replaced\n\nAdded conversion from vm::var to vm::ptr of the same type.","sha":"0b5ef1d8f96f2ee626619a023c43d16ea74f05b8"}
+{"author":{"avatar":null,"date":"2014-09-01T00:51:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-01T00:51:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"mem32_t replaced","sha":"9501869aa140a6bda33e5a2e763e213de896cc79"}
+{"author":{"avatar":null,"date":"2014-09-01T12:47:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-01T12:47:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"mem_func_ptr_t replaced","sha":"f31ed4e9f25a6f146cb523d16471647fc5624a04"}
+{"author":{"avatar":null,"date":"2014-09-01T16:16:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-01T16:16:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Patch from DH applied","sha":"774b5be7d7df2288ae407ecbbff0206395a85c88"}
+{"author":{"avatar":null,"date":"2014-09-01T16:45:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-01T16:45:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"3b764d45f2e3cc3058ab65329f11b215174d4e05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-01T16:52:36Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-01T16:52:36Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Added cellNetCtlNetStartDialogLoadAsync and cellNetCtlNetStartDialogUnloadAsync","sha":"9ef074c7efc2c70cb35b20c56db6b8c3a87afa93"}
+{"author":{"avatar":null,"date":"2014-09-01T17:38:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-01T17:38:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2 + callback fix","sha":"09022b1000dd8b399cdd6d8de33417fd505ddd62"}
+{"author":{"avatar":null,"date":"2014-09-01T18:29:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-01T18:29:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 3","sha":"4f6a4073931992a4c8cf3b032fe86afce71f470a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-01T19:38:12Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-01T19:38:12Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #784 from tambry/cellNetCtlNetStart\n\nAdded cellNetCtlNetStartDialogLoadAsync and cellNetCtlNetStartDialogUnloadAsync","sha":"294d94a2d9acbff23f999b23fdba6b43ec778914"}
+{"author":{"avatar":null,"date":"2014-09-01T21:22:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-01T21:22:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 4","sha":"73555c1df178e2d4ec1e49e46e712e4528efd5ac"}
+{"author":{"avatar":null,"date":"2014-09-01T21:41:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-01T21:41:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 5","sha":"51ea1e3bed76eb6da47f99451e28b3ebff5fc221"}
+{"author":{"avatar":null,"date":"2014-09-01T21:46:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-01T21:46:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 6","sha":"37da5589e4275e0c04f91e8da573a707b1a0aa8d"}
+{"author":{"avatar":null,"date":"2014-09-01T22:22:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-01T22:22:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"mem_bptr_t replaced","sha":"9c94a6943d5948febbcff541e4360b6cc6c1849c"}
+{"author":{"avatar":null,"date":"2014-09-01T22:35:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-01T22:35:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some warnings fixed","sha":"6e02477fc623ffb9ea25a91106d3bceed674423b"}
+{"author":{"avatar":null,"date":"2014-09-01T22:59:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-01T22:59:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Callbacks fix + TODO","sha":"bd9775e0ebc5536261603999cf25a57d3e5acd22"}
+{"author":{"avatar":null,"date":"2014-09-02T01:05:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-02T01:05:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"mem_ptr_t replaced","sha":"b952017a3aa81b632035ff5380850f059441db00"}
+{"author":{"avatar":null,"date":"2014-09-02T01:14:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-02T01:14:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"1626df7e4602bb9388ac06cf478c66886b48273a"}
+{"author":{"avatar":null,"date":"2014-09-02T01:25:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-02T01:25:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"5a20d41fb236a9c4cab7a95139b92b20bec5d039"}
+{"author":{"avatar":null,"date":"2014-09-02T12:18:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-02T12:18:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small mistake","sha":"30d7fcd28872637030dbeae96eb99051c3e2bdb1"}
+{"author":{"avatar":null,"date":"2014-09-02T12:45:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-02T12:45:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Another little bug","sha":"47ee010b64861489ef08f0500fe05a5db41bdc49"}
+{"author":{"avatar":null,"date":"2014-09-02T12:50:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-02T12:50:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small mistake","sha":"fa43e80206ba44473f8f94a919388613c5c4fd89"}
+{"author":{"avatar":null,"date":"2014-09-02T13:03:07Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-02T13:03:07Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #785 from Nekotekina/master\n\nvm:: global replacement","sha":"505dacf1524283b36dc51295e613a77e25560b6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-02T16:58:42Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-02T16:58:42Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Removed cellSaveDataListAutoSave and cellSaveDataListAutoLoad until they can be fixed\n\nAlso added a lot of TODO printouts for other save data functions.","sha":"e6595f05bca7584c2f93abe39442792ca4e232f9"}
+{"author":{"avatar":null,"date":"2014-09-02T19:04:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-02T19:04:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #786 from tambry/cellSaveDataFixes\n\nRemoved cellSaveDataListAutoSave and cellSaveDataListAutoLoad until they can be fixed","sha":"82f31b6436e9a9eeeceb0f4aab1f1b69334c5cac"}
+{"author":{"avatar":null,"date":"2014-09-02T21:48:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-02T21:48:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"DynamicMemoryBlockBase.h removed\n\nMap() and Unmap(): roughly rewritten.\nI checked every memory-related syscall and I'm sure that they don't\nreally need any mirroring. Some unused code deleted.","sha":"d0e532e7ce21276e23e421c09046699cce56fb5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-09-03T10:06:11Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-09-03T10:12:50Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"unix preprocessor define typo fixed","sha":"383f6aff2bf22a47b9b20f483e9b60c991dde87c"}
+{"author":{"avatar":null,"date":"2014-09-03T10:20:22Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-03T10:20:22Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #787 from Bigpet/unixtypo\n\nunix preprocessor define typo fixed","sha":"c51e52614ebde923a9f22f36f11aacb1274196fa"}
+{"author":{"avatar":null,"date":"2014-09-03T16:33:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-03T16:33:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some memory functions removed","sha":"1337cf4f04941a1b5ebdbf7dd9ba6b76f800d9b2"}
+{"author":{"avatar":null,"date":"2014-09-03T17:09:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-03T17:09:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"4b49d57f976ae89e8a21b3d6ad68de32a4f44090"}
+{"author":{"avatar":null,"date":"2014-09-04T09:21:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-04T09:21:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"re() removed, added be_t<const T> specialization","sha":"05cebd1017194e6c2a65433c9d1319d370d85d03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-04T15:27:19Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-04T15:27:19Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Added cellSync2 attribute initilization\n\nAlso added checks for EstimateBufferSize functions","sha":"e6ab29346ec4ba01eb4458728ea5a0afb4a54b89"}
+{"author":{"avatar":null,"date":"2014-09-04T15:36:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-04T15:36:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #789 from tambry/cellSync2InitAndEstimate\n\nAdded cellSync2 attribute initilization","sha":"2084665cc13fa41e0c1f2496a79b1c60652bff29"}
+{"author":{"avatar":null,"date":"2014-09-04T17:32:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-04T17:32:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some functions removed","sha":"9f2afffca1eebcea5ba1ed33a933d845020be2f6"}
+{"author":{"avatar":null,"date":"2014-09-04T17:39:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-04T17:39:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"4346514b9d90302047cdcfe2c82276b3da7266e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-04T19:39:08Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-04T19:39:08Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix cellPamfReaderGetPresentationStartTime access violation\n\nShould also fix access violations for other cellPamf functions","sha":"cef2c59ae24869e4a7c1c68a881ce743b9bf7ac6"}
+{"author":{"avatar":null,"date":"2014-09-04T19:55:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-04T19:55:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_ppu_thread_create fix","sha":"27b24132a0048fee17e4db2bfbe654f778b81c08"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-04T20:03:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-04T20:03:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #790 from tambry/cellPamfAccessViolationFix\n\nFix cellPamfReaderGetPresentationStartTime access violation","sha":"3ffc0edac9d494283fed559382cbefc8df35502f"}
+{"author":{"avatar":null,"date":"2014-09-04T23:23:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-04T23:23:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"WriteString replaced\n\nstrcpy_trunc (defined in GNU.h) is better for fixed-length char arrays","sha":"964c1bfd6cb23340ed10eae94b5ee9d0964e5ade"}
+{"author":{"avatar":null,"date":"2014-09-05T11:24:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-05T11:24:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Attempt to fix some warnings","sha":"f298d0451eca42024e195b24f445b46aedf2c759"}
+{"author":{"avatar":null,"date":"2014-09-05T17:23:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-05T17:23:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"GetMemFromAddr, VirtualToRealAddr replaced\n\nSome arg types changed","sha":"225dba754dc92e5743b47d0ab02f2c8b39c9e521"}
+{"author":{"avatar":null,"date":"2014-09-05T17:54:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-05T17:54:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix, be_t fix\n\n+ CellWebBrowserConfig2 struct","sha":"feec20ac3e4a8914a2174fe83d8a7fd6dc7bdbec"}
+{"author":{"avatar":null,"date":"2014-09-05T20:26:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-05T20:26:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"MemoryBase::operator+ replaced","sha":"db9cbe6cdddc9e447a303d2d1a6d1eb1a0c3c99c"}
+{"author":{"avatar":null,"date":"2014-09-05T22:12:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-05T22:12:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"MemoryBase::operator[] replaced","sha":"12becc6120fd529633cbb73636ba1ea01da3d2aa"}
+{"author":{"avatar":null,"date":"2014-09-05T22:54:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-05T22:54:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"b0d9fba41835770a0996f8c49cb5f264295eba3f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-06T00:09:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-06T00:09:16Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #791 from Nekotekina/master\n\nvm:: replacement 2","sha":"7e758970cf9efbd63971be260c91e92c09465e33"}
+{"author":{"avatar":null,"date":"2014-09-06T10:52:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-06T10:52:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSync2 fixes","sha":"95734b8b9a32b538bd573ef1c5be3b778f8b7463"}
+{"author":{"avatar":null,"date":"2014-09-06T10:58:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-06T10:58:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"++","sha":"b5e7724e764ee4ee61e055918e6dd465dd0391c3"}
+{"author":{"avatar":null,"date":"2014-09-06T11:10:53Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-06T11:10:53Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #792 from Nekotekina/master\n\ncellSync2* fixes","sha":"1b499a6fd592c3d62220ec56f9901c8a78768a66"}
+{"author":{"avatar":null,"date":"2014-09-06T13:33:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-06T13:33:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Memory.Write*/Read* replaced","sha":"43a61d0ab9226b30e4a1e415b4a735911f02f0fd"}
+{"author":{"avatar":null,"date":"2014-09-06T16:30:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-06T16:30:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"u128\n\nOnly useful as vector type anyway.","sha":"82433d946e37711135fb41941e54ab443dcf6e9f"}
+{"author":{"avatar":null,"date":"2014-09-06T17:30:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-06T17:30:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Well, vector argument support in SC_FUNC","sha":"6c01854fec56002a9eaf03d537bcb1b4555c2975"}
+{"author":{"avatar":null,"date":"2014-09-06T23:35:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-06T23:35:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"58f436e749bda53494ea770a84653a93796d9700"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-07T00:11:13Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-07T00:11:13Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #793 from Nekotekina/master\n\nvm:: replacement 3","sha":"ec9740e747d9652426755e955b1de87d4e61ec21"}
+{"author":{"avatar":null,"date":"2014-09-07T07:49:25Z","email":"Arkaran99@github.com","login":null,"name":"Arkaran99"},"committer":{"avatar":null,"date":"2014-09-07T08:43:25Z","email":"Arkaran99@github.com","login":null,"name":"Arkaran99"},"msg":"Fix compile errors in Debug - MemLeak.\n\nAdd rpcs3/define_new_memleakdetect.h to save and replace new operator with Visual Studio Memory Leak Detection's operator.\nAdd rpcs3/restore_new.h to restore new operator to a previous saved state.","sha":"1e60319be2a2c8db4ff4316f8d1c223a919376cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-07T09:04:15Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-07T09:04:15Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #795 from Arkaran99/master\n\nFix compile errors in Debug - MemLeak.","sha":"e65676ffa97af21e6083b275858edfbb679845b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-09-07T11:13:29Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-09-07T11:13:29Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Fixed conflicts","sha":"339e40d42366bdb29678f429dc1fad86db5728f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-09-07T13:47:53Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-09-07T13:47:53Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Add PPU / SPU / RawSPU threads in KernelExplorer, and some coding style changes.","sha":"402199d70f13fbbb5fc76c619f6753bdfce1b261"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-09-07T14:05:29Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-09-07T14:05:29Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Removed unnecessary newlines.","sha":"54106f6f9ba30fa7185f28ec9d17491702c71c6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-07T15:53:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-07T15:53:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Re-enabled cellCamera and cellOvis, added cellCamera enums and structs\n\nAlso some fixes to ordering in emucore.vcxproj.filters","sha":"16727a9c5eb1cde0e0545169fecd3003ba40f2d5"}
+{"author":{"avatar":null,"date":"2014-09-08T00:54:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-08T00:54:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"WIP (cellPngDec refactoring)","sha":"470afd78d5e2ac52c87047456e95329e7279a6d4"}
+{"author":{"avatar":null,"date":"2014-09-08T10:20:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-08T10:20:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"311a3b3e4781440fcff3e8c75651937e9e1c627e"}
+{"author":{"avatar":null,"date":"2014-09-08T13:00:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-08T13:00:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #797 from tambry/cellCameraAndOvis\n\nRe-enabled cellCamera and cellOvis, added cellCamera enums and structs","sha":"c2563da820e4d8bbc6f5a4d7d1f16095e2ae3fcf"}
+{"author":{"avatar":null,"date":"2014-09-08T14:56:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-08T14:56:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellPngDec (nothing changed)","sha":"5d951451c5ae82f88a7a7703b235326b5d5dec8c"}
+{"author":{"avatar":null,"date":"2014-09-08T17:06:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-08T17:06:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"bugfix","sha":"c79b52b3348ec369319c8eb9d752cb11e19357f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-08T21:16:10Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-08T21:16:10Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #796 from O1L/master\n\nPPU / SPU / RawSPU threads in KernelExplorer.","sha":"a99c8e3c7cc24ca9ad98c32830a80f14d5e26e33"}
+{"author":{"avatar":null,"date":"2014-09-09T12:13:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-09T12:13:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"It was overcomplicated","sha":"3b71721a33827bb4040f9c0a96ed215eedba3775"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-09T15:44:02Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-09T15:44:02Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Added new things, updated others\n\n+ Tab in settings for cellCamera and cellGem related things, currently\nincludes setting camera type\n+ cellCamera and cellGem initilization\n+ Added cellCameraGetType\n* Updated asmjit and ffmpeg\n* Some minor optimizations","sha":"6029cc40f21b510897baf6787a44f25ffc236c07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-09T15:49:12Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-09T15:49:12Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Minor cellSysutil fix","sha":"089a6ee07d0694e6394c6831a07035b117ec05d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-09T16:08:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-09T16:08:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Comment fix","sha":"dc51630803858ac6386d6d269d417155ebc8263d"}
+{"author":{"avatar":null,"date":"2014-09-09T16:35:10Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-09T16:35:10Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #799 from tambry/cellCameraAndGemAndOtherUpdates\n\nCell camera and gem and other updates","sha":"218399afcbae1a9c521e66a7cdfd4140445c393d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-09T21:18:21Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-09T21:18:21Z","email":"alexaltea123@gmail.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Fixed cellFsStReadInit issue\n\n* Disabled automatic HLEExitOnStop option when the ELF file argument is\nprovided.\n* Reverted some changes of last pull.","sha":"b881e095e9c7ae4b9188592f89c5e211c7c75c6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-09-10T04:54:51Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-09-10T04:54:51Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"implement cellFsStRead (does *not* use ringbuffers)","sha":"145e0aa827a7790347efd73f24c2a016480bbc2a"}
+{"author":{"avatar":null,"date":"2014-09-10T05:02:25Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-10T05:02:25Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #800 from darkf/stread\n\nimplement cellFsStRead (does *not* use ringbuffers)","sha":"ff29320a34758cff7d95e25b06563c729106f0cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-11T15:59:42Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-11T15:59:42Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implemented NV4097_SET_TWO_SIDE_LIGHT_EN","sha":"88cc03b9e2dde3c4a93d7dfca11e0743393a3aa5"}
+{"author":{"avatar":null,"date":"2014-09-11T16:13:46Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-11T16:13:46Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #801 from tambry/TwoSidedLight\n\nImplemented NV4097_SET_TWO_SIDE_LIGHT_EN","sha":"98c67389b082e7ec0d6d06b5478d077b685b59cc"}
+{"author":{"avatar":null,"date":"2014-09-11T19:18:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-11T19:18:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"CallbackManager rewritten","sha":"cd392563616140859bc6374640644905d03c06b7"}
+{"author":{"avatar":null,"date":"2014-09-11T19:33:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-11T19:33:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"fe53f6f2d7844dfda27cafe9f14dd4c489987c99"}
+{"author":{"avatar":null,"date":"2014-09-11T19:40:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-11T19:40:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2","sha":"ed55011edeb19af616d7896d5a0c36da992284cd"}
+{"author":{"avatar":null,"date":"2014-09-11T20:46:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-11T20:46:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Cb fix","sha":"8cde1c18c484a35556264c09d129f151581f9f32"}
+{"author":{"avatar":null,"date":"2014-09-11T21:10:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-11T21:10:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"3e1c04b3560249d0f2efb955691c5ce38ba2abb9"}
+{"author":{"avatar":null,"date":"2014-09-11T21:16:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-11T21:16:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"85f2009175cd908f777161315e745873935212c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-12T12:18:27Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-12T12:18:27Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implemented sys_get_random_number","sha":"6d0fae09c5980d7bc7cd8ad02868398dfd6c454e"}
+{"author":{"avatar":null,"date":"2014-09-12T13:08:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-12T13:08:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Float/vector arg support for callbacks","sha":"5a4aa9096b7a1b44a2dc38994e18b95e385d2863"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-12T14:28:02Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-12T14:28:02Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Added more initializations and terminations","sha":"c74c592dd32bb996f9d3010235441e2469861515"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-12T14:43:33Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-12T14:43:33Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #803 from tambry/InitilizationsAndTerminations\n\nAdded more initializations and terminations","sha":"3d910a9a420baed67181ac192be82bc5918da744"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-12T15:11:04Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-12T15:11:04Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fixed assigning of the generated number","sha":"1098edea989d1aba8e47e9d0b341a007f2b535e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-12T15:25:09Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-12T15:25:09Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #802 from tambry/sys_get_random_number\n\nImplemented sys_get_random_number","sha":"20186b5049b03cf59cac2f9f32f8071bdfb882b2"}
+{"author":{"avatar":null,"date":"2014-09-12T19:27:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-12T19:27:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"FastCall() removed","sha":"c1da446653e417b80dc03e2623e5a61bbdfc3381"}
+{"author":{"avatar":null,"date":"2014-09-12T21:14:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-12T21:14:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ExecAsCallback() removed","sha":"10e9d383d4adb81d329ea6c665caff7fa911adc7"}
+{"author":{"avatar":null,"date":"2014-09-12T21:50:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-12T21:50:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"0df3e955c847898e6b62f0e12a9bcc2f60be290e"}
+{"author":{"avatar":null,"date":"2014-09-13T14:25:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-13T14:25:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix 2","sha":"860d7bd3f1e3f282a8959925d151840f97f2764e"}
+{"author":{"avatar":null,"date":"2014-09-13T16:45:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-13T16:45:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #805 from Nekotekina/master\n\nCallbackManager rewritten","sha":"3775d28d24cc0b1d0f558993cdfdcbae657953cb"}
+{"author":{"avatar":null,"date":"2014-09-07T13:13:38Z","email":"Arkaran99@github.com","login":null,"name":"Arkaran99"},"committer":{"avatar":null,"date":"2014-09-13T18:38:16Z","email":"Arkaran99@github.com","login":null,"name":"Arkaran99"},"msg":"Update gitignore to ignore x64 folders.","sha":"9834fc7f70a1019dde2f1721ceb42f5ac80a8cca"}
+{"author":{"avatar":null,"date":"2014-09-10T22:59:50Z","email":"Arkaran99@github.com","login":null,"name":"Arkaran99"},"committer":{"avatar":null,"date":"2014-09-13T18:38:18Z","email":"Arkaran99@github.com","login":null,"name":"Arkaran99"},"msg":"Remove unused include and very small refactoring.\n\nUnused include in unself.h, ELF.h.\nNew line after an if to enable debugging.\nRewrite strange boolean expression in ELF.cpp.","sha":"7dafb164e8829b060cbc5d7879ea6b7454aafa9b"}
+{"author":{"avatar":null,"date":"2014-09-13T20:00:17Z","email":"Arkaran99@github.com","login":null,"name":"Arkaran99"},"committer":{"avatar":null,"date":"2014-09-13T20:00:17Z","email":"Arkaran99@github.com","login":null,"name":"Arkaran99"},"msg":"Change ModuleManager::init function.\n\nFirst step to help refactor Module management.\nAdd every module in the static ModuleInfo list. Module without id are assigned\nto 0xffff.\nThe init function is called after constructor and take a pointer to Module\nas an input.\nThis pointer is used to set the Module's global pointer in its file.","sha":"3caff5a107a74bc023a6c1f50264ddc7aa350c9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-09-13T20:40:12Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-09-13T20:40:12Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"More information in KernelExplorer.","sha":"dc7e143de597d3a256a12e25553e2c37547ed368"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-09-13T20:50:38Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-09-13T20:50:38Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Fixed typo","sha":"2b7a00d42d5d6276c10053f537d06e3f72aa3757"}
+{"author":{"avatar":null,"date":"2014-09-14T17:31:08Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-14T17:31:08Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #806 from Arkaran99/master\n\nSmall refactor","sha":"bd1f4134812a30c966f54af79fa045279a4174ff"}
+{"author":{"avatar":null,"date":"2014-09-14T17:31:14Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-14T17:31:14Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #807 from O1L/master\n\nMore information in KernelExplorer.","sha":"8f1a8450be8361b752c10f7c5871b8402cd1eaa4"}
+{"author":{"avatar":null,"date":"2014-09-14T22:17:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-14T22:17:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small refactoring","sha":"597d07bf24ff585f847bdb752eff35dbab7f3cb9"}
+{"author":{"avatar":null,"date":"2014-09-14T22:27:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-14T22:27:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"dfaa668b314cbd9d06203edbc37142a973e30caa"}
+{"author":{"avatar":null,"date":"2014-09-14T22:34:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-14T22:34:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2","sha":"38746a5ef9a186da658f46d1c3139cd7d3998d7d"}
+{"author":{"avatar":null,"date":"2014-09-14T22:52:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-14T22:52:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 3","sha":"4243558319631c939e5b0e77b3e6cd282f402bfa"}
+{"author":{"avatar":null,"date":"2014-09-15T15:04:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-15T15:04:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Basic stack argument support for callbacks","sha":"201f0f3a9fce8510a73a575b2fa18d1e9ec53108"}
+{"author":{"avatar":null,"date":"2014-09-15T18:17:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-15T18:17:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix + CellSpursAttribute","sha":"c9132a4bdbcaf9c3662ce956eb57ea63f789301c"}
+{"author":{"avatar":null,"date":"2014-09-15T19:04:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-15T19:04:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fix formatting","sha":"5f1253598cefd54467a65dac44385576570e340c"}
+{"author":{"avatar":null,"date":"2014-09-15T19:13:54Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-15T19:13:54Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #810 from Nekotekina/master\n\nSome code removed, CellSpursAttribute implemented","sha":"29c2e84fa18db2e918bc0d17bf3261429c3799c9"}
+{"author":{"avatar":null,"date":"2014-09-15T22:58:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-15T22:58:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSpursAttributeEnableSystemWorkload","sha":"76418fe1b4f4fbcdd23f37b05270cef0e044c783"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-09-16T11:23:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-09-16T11:23:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Improved to_be_t\nFixed cellCameraGetType\nRemoved be_array_t\nImproved cb_caller","sha":"b0569639a93c93a1ea37da23a166b20458bcbf80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-09-16T12:52:04Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-09-16T13:03:57Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Bigpet"},"msg":"define templates outside of block scope","sha":"96c86580f0795a238309b733da9367d6005c2e7d"}
+{"author":{"avatar":null,"date":"2014-09-15T22:58:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-16T13:29:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSpursAttributeEnableSystemWorkload","sha":"3730c53c9ea994b36db8a2d6a60de9fad8e992ab"}
+{"author":{"avatar":null,"date":"2014-09-16T13:31:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-16T13:31:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/Nekotekina/rpcs3","sha":"667da92934b3c97942ac17b6c4cbd29a46d7bcc6"}
+{"author":{"avatar":null,"date":"2014-09-16T13:56:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-16T13:56:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"CB_FUNC / SC_FUNC small update","sha":"b600cba180b58c63483ed5929cee85413963cfa3"}
+{"author":{"avatar":null,"date":"2014-09-16T15:08:37Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-16T15:08:37Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #812 from Nekotekina/master\n\ncellSpursAttributeEnableSystemWorkload","sha":"ef1c5af6086575151a45939e06e6640f7945c0af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-16T16:28:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-16T16:28:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix crash in Arkedo games (that I created)","sha":"b7a6c93e96ebc9efa8f8437139ef92dd9d82c269"}
+{"author":{"avatar":null,"date":"2014-09-16T16:31:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-16T16:31:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #813 from tambry/ArkedoCrashFix\n\nFix crash in Arkedo games (that I created)","sha":"8cc09d1c91884f291b09ab01ec8386a8fc0788df"}
+{"author":{"avatar":null,"date":"2014-09-16T17:46:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-16T17:49:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"declCPU removed, PPUThread& is passed as argument\n\nAdded experimental feature: passing PPUThread& to syscall","sha":"626133c0ebc0fd651d36fce6cf351c1274dfc899"}
+{"author":{"avatar":null,"date":"2014-09-17T13:15:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-17T13:15:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_process_is_spu_lock_line_reservation_address\n\nFormatting changed a bit","sha":"0044141631eaabaf1538e332371e8e856f138cc5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-17T15:31:45Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-17T15:31:45Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #814 from Nekotekina/master\n\ndeclCPU removed, PPUThread& is passed as argument","sha":"279ec3d8a36d1ab99c0d7a69909a4f7b03b97dff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-09-17T19:51:02Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-09-17T19:51:02Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Minor changes","sha":"9d1a2dd3768c356cb1ca80fa866e6a06f327ddca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-18T18:19:10Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-18T18:19:10Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Added a camera option\n\nAlso a couple minor optimizations","sha":"fcfdd1551b7095fcc927c034f136de5229345ea9"}
+{"author":{"avatar":null,"date":"2014-09-18T18:33:14Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-18T18:33:14Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #816 from tambry/CameraAndOptimizations\n\nAdded a camera option","sha":"df84e89d461ee9158dd70bfbb834573e8a56b01a"}
+{"author":{"avatar":null,"date":"2014-09-19T00:19:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-19T00:19:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"CellSpurs initialization","sha":"bb77249ac889bcf108deac06ca28f51e9501b59e"}
+{"author":{"avatar":null,"date":"2014-09-19T00:24:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-19T00:24:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"5ad68cfe300414cb46d80d8a0dceba7572b99378"}
+{"author":{"avatar":null,"date":"2014-09-19T11:27:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-19T11:27:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"CellSpurs initialization","sha":"dbd49a55c6fbd28fc8286a85246ccb59dc6ddf91"}
+{"author":{"avatar":null,"date":"2014-09-19T19:11:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-19T19:11:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"vm::atomic initial structure","sha":"b6f8700b8b111808b8dcd1e1dbe5ed443752c253"}
+{"author":{"avatar":null,"date":"2014-09-19T19:12:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-19T19:12:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"to_be()","sha":"0baf295c1be88444fa2e1eb4d3771cd0640c4593"}
+{"author":{"avatar":null,"date":"2014-09-19T23:16:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-19T23:16:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"vm::atomic update, be_t update\n\n1) MakeFromLE replaced with make(), MakeFromBE removed. Compiler seems\nto be able to optimize it anyway.\n2) be_t<> conversion operator temporarily replaced with conversion\nthrough LE because it can't work with all possible numeric conversions\n(float<>int for example)","sha":"66000240ac5bf9aea8e6e4d58af448c7bdac960d"}
+{"author":{"avatar":null,"date":"2014-09-20T00:08:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-20T00:08:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Warning fix","sha":"89da242cd2cfd411010bb63e78ba9de21412b81f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-20T16:09:18Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-20T16:09:18Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Added sceNpBasicGetFriendListEntryCount and sceNpBasicGetMessageEntryCount\n\nFixed (?) sometimes functions being unloaded when they shouldn't.\nAlso reverted the SPUThread hack.","sha":"6360ef1790d5a335aadd45d82b3fd0e44f32014a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-20T16:47:24Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-20T16:47:24Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #817 from tambry/sceNpAdditionModuleFix\n\nAdded sceNpBasicGetFriendListEntryCount and sceNpBasicGetMessageEntryCount","sha":"2234d0fe0ae150bc49351f06fe42c21ee27ef57c"}
+{"author":{"avatar":null,"date":"2014-09-20T21:00:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-20T21:00:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"vm::atomic update","sha":"169c8c47c09812b3acd8b10914ab8ae0c35263a9"}
+{"author":{"avatar":null,"date":"2014-09-20T23:29:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-20T23:29:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"vm::atomic update (or, and, xor)\n\nCellSyncMutex, CellSyncBarrier, CellSyncRwm refactoring","sha":"3ab08e0d7aa745e31fa3dc07f0fc2c7698c31d19"}
+{"author":{"avatar":null,"date":"2014-09-21T13:02:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-21T13:02:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"...+CellSyncQueue","sha":"c9ad88b3ff23c6391decf366f447bf17cb5c2c0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-21T14:26:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-21T14:26:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Huge sceNp cleanup, added sceNpCommerce2Init and sceNpCommerce2Term","sha":"4a998e5374b0de5458e1d48d93404d6263b39ce6"}
+{"author":{"avatar":null,"date":"2014-09-21T14:44:56Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-21T14:44:56Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #818 from tambry/SceNpCleanupAndCommerce2Additions\n\nHuge sceNp cleanup and added sceNpCommerce2Init and sceNpCommerce2Term","sha":"f1e2446f17a433c7257396a3acfa623f526d59e4"}
+{"author":{"avatar":null,"date":"2014-09-21T15:14:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-21T15:14:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"449e7c1049ca72168baaeb4f6be7b9e9a010621d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-22T19:00:28Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-22T19:00:28Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Added sceNpTrophyTerm and proofed some unloadings\n\nMade cellNetCtl, cellGem, cellCamera, sceNp, sceNpCommerce2 and\nsceNpTrophy properly unload if termination function wasn't called.","sha":"790a8bf8141e0e830d6540f111ae985a6751881f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-22T22:12:23Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-22T22:12:23Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #819 from tambry/ProofedUnloadingOfSomeModules\n\nAdded sceNpTrophyTerm and proofed some unloadings","sha":"c3299424821fe306fe557b8320c6833620afc12d"}
+{"author":{"avatar":null,"date":"2014-09-22T23:07:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-22T23:07:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"More changes","sha":"e5a485e50b6555239d0cab1495405d6cc5a443d9"}
+{"author":{"avatar":null,"date":"2014-09-23T14:27:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-23T14:27:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"vm::atomic update, small fixes","sha":"a4a4e572a0b13c33c41fda40fa71a9a1d02bbaba"}
+{"author":{"avatar":null,"date":"2014-09-24T18:44:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-24T18:44:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"m_custom_task thread member","sha":"05a7466a5a9befa604af267cf497519dbee6a6c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-25T17:07:06Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-25T17:07:06Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implemented sceNpBasicGetEvent, sceNpLookupInit and sceNpLookupTerm\n\nUpdated writing to pointers for sys_get_random_number,\nsceNpBasicGetFriendListEntryCount and sceNpBasicGetMessageEntryCount.\nFixed some pointers and TODOs in cellNetCtl.","sha":"d17322948d0ca58da1769e6b7503c6d97f70e2f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-25T17:16:23Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-25T17:16:23Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Updated ASMJIT","sha":"b5fa247eb3b10030c9a5182e4bb9a96661104ad6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-25T18:51:52Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-25T18:51:52Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix some things","sha":"c87c75a45b1900a632fcbb8819856662578c59a9"}
+{"author":{"avatar":null,"date":"2014-09-25T19:08:21Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-09-25T19:08:21Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #820 from tambry/SceNpAdditionsAndOtherFixes\n\nImplemented sceNpBasicGetEvent, sceNpLookupInit and sceNpLookupTerm","sha":"9bef0a86833a1ba2f2f72b4c226942848afa143e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-25T19:27:40Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-25T19:27:40Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix sys_get_random_number\n\nThanks @Nekotekina","sha":"1f870af5cf67a770e8d8be46f356dfdcb0de3cab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-25T21:23:06Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-09-25T21:23:06Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #821 from tambry/sys_get_random_number-Fix\n\nFix sys_get_random_number","sha":"13b7df5d39a08814e9abea957617ae2c03ee53a9"}
+{"author":{"avatar":null,"date":"2014-09-25T21:41:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-25T21:41:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSpursWakeUp, CellSpursWorkloadAttribute\n\n+vm_atomic update (8bit type)","sha":"e40776ba79a465b8202cb09beb4bb41012823f7f"}
+{"author":{"avatar":null,"date":"2014-09-27T18:49:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-27T18:49:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"vm::atomic -> atomic_t","sha":"ae17ef4d68a2413aeb637006cd4553dbe655f63d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-28T15:21:45Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-28T15:21:45Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Add cellAvconfExt and cellVideoOutGetScreenSize\n\nAlso added a flag to RSX debugger showing if two sided lighting is\nenabled, a 3D Monitor option and fixed a \")\" missing in TODO printout\nfor sys_spu_elf_get_information.","sha":"879e2d920c9bf748ed5624bc5b349c9d79265ece"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-28T15:24:34Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-28T15:24:34Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Also remove couple unneeded be_t","sha":"b9e7e46198545c874ffada161b976b88c0b76d17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-28T16:42:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-09-28T16:42:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Removed wx implementation and added Windows only implementation","sha":"2e29348b9ce23bce3b06ab11628f3cef383891f2"}
+{"author":{"avatar":null,"date":"2014-09-28T16:54:47Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-09-28T16:54:47Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #822 from tambry/cellAvconfExtAndVideoOut\n\nAdd cellAvconfExt and cellVideoOutGetScreenSize","sha":"5b18e90cacdfa49b9d4b71db179248d784c687ee"}
+{"author":{"avatar":null,"date":"2014-09-28T19:10:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-28T19:10:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"spursAddWorkload","sha":"c53a822c4e0c04af6a01da3f6380c7aaf23a3e83"}
+{"author":{"avatar":null,"date":"2014-09-29T15:38:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-29T15:38:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some %x fixed","sha":"7d95311a0107d1c4a76006b5775137ec586bbee5"}
+{"author":{"avatar":null,"date":"2014-09-29T15:39:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-29T15:39:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"_cellSpursWorkloadFlagReceiver, cellSpursReadyCountStore","sha":"6b53479ac3cf63bf6775e854c5123e6dce049604"}
+{"author":{"avatar":null,"date":"2014-09-29T22:28:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-29T22:28:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some fixes","sha":"68cdc95da57b95255ee461e79133e903885cc129"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/691945?v=4","date":"2014-09-30T18:42:15Z","email":"nmzik@mail.ru","login":"Nmzik","name":"nmzik"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/691945?v=4","date":"2014-09-30T18:42:15Z","email":"nmzik@mail.ru","login":"Nmzik","name":"nmzik"},"msg":"Adjusted attributes, added better log messages and an initialization check in the sceNP module","sha":"c0b53d6b48775aece82fd0849b58794c893f9c38"}
+{"author":{"avatar":null,"date":"2014-09-30T19:06:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-09-30T19:06:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Channel<> rewritten","sha":"ce97a7e7a605f6eb8189e844826cb505dc6d1ae4"}
+{"author":{"avatar":null,"date":"2014-09-30T20:01:58Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-09-30T20:01:58Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #824 from Nmzik/master\n\nAdjusted attributes, added better log messages and an initialization check in the sceNP module","sha":"64158b1b10f7169e8646744bbd91880ffb3d0c7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-01T09:25:06Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-01T09:25:06Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"msg":"Added initialization for SceNpUtilBandwidthTestInitStart\n\nAlso added initialization checks","sha":"1ded37d2535127ec0669a7db7a8d0eb0bde8c2c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-10-01T09:45:43Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-10-01T09:45:43Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Improved be_t\nFixed NV4097_SET_TWO_SIDE_LIGHT_EN\nAdded LIS, ORI, NOP & BLR to PPU Jit","sha":"eada1fe12c73c9cd2ed0ffd1a985a76839de4b61"}
+{"author":{"avatar":null,"date":"2014-10-01T13:18:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-01T13:18:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Memory fixes","sha":"4a6779469c077f4dce16cb7166c410f9c38072a4"}
+{"author":{"avatar":null,"date":"2014-10-01T13:57:44Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-10-01T13:57:44Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Updated the Crypto Engine:\n\n- Fixed several bugs in unedat;\n- Improved EDAT/SDAT file decryption.","sha":"6d6c1a96722093579707421f8c7dce9100342a6d"}
+{"author":{"avatar":null,"date":"2014-10-01T13:58:10Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-10-01T13:58:10Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #825 from Survanium90/master\n\nAdded initialization for SceNpUtilBandwidthTestInitStart","sha":"4978af50e4417294feac11d5618df194b03ea37d"}
+{"author":{"avatar":null,"date":"2014-10-01T14:15:04Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-10-01T14:15:04Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Fixed compilation errors.","sha":"faeedf13550b4bb4f51c07f2f04fb322fb9b4edd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-10-02T05:13:35Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-10-02T05:13:35Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed fix_import function in Modules.cpp","sha":"77076191c704faefc5e939a8962af6de4e85b70b"}
+{"author":{"avatar":null,"date":"2014-10-02T10:29:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-02T10:29:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small update","sha":"752449bbc005a5ef38191986c7fb8a42f6bc57cb"}
+{"author":{"avatar":null,"date":"2014-10-02T12:19:52Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-02T12:19:52Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"6b0857dcff1d9abd1fb5a75ee0089b971ca59d2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-10-02T13:13:44Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-10-02T13:13:44Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"change initial value of sys_lwmutex_t::waiter","sha":"f11c6c3cf469c67e188b31f9ff68d3e096ed5f98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-02T17:19:21Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-02T17:19:21Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #827 from Bigpet/master\n\nchange initial value of sys_lwmutex_t::waiter","sha":"e4eecd247cf8f32b6d8edcf65aed970be242f24a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-03T13:39:34Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-03T13:39:34Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"msg":"Added initialization checks in SceNpClans module","sha":"5b467ff82a7f546b0750e10af02146640943eeac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-03T19:07:05Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-03T19:07:05Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"msg":"Fix for \"Added initialization checks in SceNpClans module\"","sha":"18d40102f736c61cb59b85442f75e8bbe4e13a1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-03T21:09:40Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-03T21:09:40Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"msg":"Fix 2 for \"Added initialization checks in SceNpClans module\"","sha":"aed76b2a0ac0f73e5e1bd7a2dbd71c1d03261310"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-04T07:31:27Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-04T07:31:27Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"msg":"Added more initializations in cellCamera","sha":"70e5068e37b1647806c4fb0b5c8195be36f0418b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-04T07:38:38Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-04T07:38:38Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"msg":"Added initialization and termination for SceNpTus Module\n\nAlso added initialization checks","sha":"b02225dd80ef36a7bbfa3532a10adc3c102eccc7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-04T13:51:34Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-04T13:51:34Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #828 from Survanium90/master\n\nAdded initialization checks in SceNpClans module","sha":"ad4b0f092b3b7122d0c278a6559c1d8a51edeeb9"}
+{"author":{"avatar":null,"date":"2014-10-04T14:43:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-04T14:43:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small changes in memory and RSXIOMem\n\nSome bugs fixed, some other changes.","sha":"74007d5e5d84f5fbc965949132c78c25807d7bde"}
+{"author":{"avatar":null,"date":"2014-10-04T14:57:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-04T14:57:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Damned conflicts fixed","sha":"6c8d6aaf7170fa727c97f39e4b517bb55160b008"}
+{"author":{"avatar":null,"date":"2014-10-04T15:15:16Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-10-04T15:15:16Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #830 from Nekotekina/master\n\nVarious changes","sha":"f38fb61c62e840790dad6623ee01ac2c0884ddb4"}
+{"author":{"avatar":null,"date":"2014-10-05T08:03:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-05T08:03:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"RSX fix\n\nForgot to rollback these lines.","sha":"5f46534b72974d59a81410ef2d0be1d90bec708d"}
+{"author":{"avatar":null,"date":"2014-10-05T08:07:14Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-10-05T08:07:14Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #833 from Nekotekina/master\n\nRSX fix","sha":"4a2d61bc84d2b79b7d06f8ce0fd6ee24cb815769"}
+{"author":{"avatar":null,"date":"2014-10-05T08:25:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-05T08:25:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"RSXDebugger fix","sha":"4273c52efc32f85f8adb79c625b4ae069eff6845"}
+{"author":{"avatar":null,"date":"2014-10-05T08:36:35Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-10-05T08:36:35Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #834 from Nekotekina/master\n\nRSXDebugger fix","sha":"5e954f4f76168f02545c40093eabce727761c2ad"}
+{"author":{"avatar":null,"date":"2014-10-05T21:21:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-05T21:21:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Notification for encrypted SPU modules","sha":"ed0918d097ccc47b99ed662a99a8538c580be2b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-05T22:17:38Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-05T22:17:38Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #835 from Nekotekina/master\n\nNotification for encrypted SPU modules","sha":"9c3981bc8e90b1df17d033b46ad2b85bc5c7aaa6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-10-06T13:39:25Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-10-06T13:39:25Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Small RSX fix","sha":"b13a8ab4e3cc561083bb66b29311aeaaff6258f5"}
+{"author":{"avatar":null,"date":"2014-10-06T15:08:50Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-10-06T15:08:50Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #836 from raven02/patch-1\n\nSmall RSX fix","sha":"67bc9acbe0634344875f05250f9d3b9a81031a1b"}
+{"author":{"avatar":null,"date":"2014-10-07T13:35:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-07T13:35:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPURS kernel v1","sha":"237ab974dd026638fe4ad886f87e5b4249dedacd"}
+{"author":{"avatar":null,"date":"2014-10-07T21:37:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-07T21:37:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some things for u128","sha":"94c30924dd3174a091f350d70ad92fc210f081de"}
+{"author":{"avatar":null,"date":"2014-10-07T21:53:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-07T21:53:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"fd7da9d61ad35905f5b7f6f52893bc38d76072b6"}
+{"author":{"avatar":null,"date":"2014-09-27T20:56:27Z","email":"Arkaran99@github.com","login":null,"name":"Arkaran99"},"committer":{"avatar":null,"date":"2014-10-07T23:35:19Z","email":"Arkaran99@github.com","login":null,"name":"Arkaran99"},"msg":"Avoid giving arguments by value for log.","sha":"d9a95aae096d02741ad72a868abb40ff76bc2089"}
+{"author":{"avatar":null,"date":"2014-10-08T12:29:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-08T12:29:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugfix","sha":"9a02add9304626a379d15a0e23d3d33519ee7036"}
+{"author":{"avatar":null,"date":"2014-10-08T14:26:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-08T14:26:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fixes","sha":"266c3d47538c971c99dcd501bff2cdeb673b6726"}
+{"author":{"avatar":null,"date":"2014-10-09T21:26:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-09T21:26:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"RSXIO memory mapping with strict ordering (draft)","sha":"1dac13be16c83f5762eba8d4b4080907d531f517"}
+{"author":{"avatar":null,"date":"2014-10-09T21:38:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-09T21:38:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU branch D/E flags workaround","sha":"b7d0bfa972bc27042f40c8fba536fd0ad5ca640a"}
+{"author":{"avatar":null,"date":"2014-10-09T21:39:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-09T21:39:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPURS kernel v2","sha":"b0da8319b76f422b0d6f31dc15de70792bfff18f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-10-10T14:24:28Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-10-10T14:24:28Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Disable pausing when a null command occurs","sha":"9bcaa1e498519795d87edaee9cb2bc2830bfb6bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-10-10T14:24:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-10-10T14:24:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Update ASMJIT","sha":"d92b44e93fc5d96ec3c3a65b81902b446883a8f5"}
+{"author":{"avatar":null,"date":"2014-10-10T18:19:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-10T18:19:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Atomic intrinsics refactoring","sha":"09fbda603c82a63d27f8c5ccdb428f278d9a3b23"}
+{"author":{"avatar":null,"date":"2014-10-10T18:41:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-10T18:41:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Atomic intrinsics for u128 type\n\ncellSpursGetSpuThreadGroupId\ncellSpursGetNumSpuThread\ncellSpursGetSpuThreadId","sha":"446993eaa6cc76422e81acd24550ae1278b8b151"}
+{"author":{"avatar":null,"date":"2014-10-10T21:33:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-10T21:33:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"waiter_op() and waiter_signal() basis\n\nSimplified signaling on condition variables without using them directly.","sha":"3c2e0fff07ec312d267753a56d398ec111456513"}
+{"author":{"avatar":null,"date":"2014-10-10T22:37:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-10T22:37:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"waiter_reg_t, cellSyncBarrier improved","sha":"48eb66383bb972329c67b8c57d6a30f8618f9204"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-10-11T17:20:01Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-10-11T17:20:01Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Remove unneeded be_t","sha":"9e5403aeb3b73df27983875cffd04c96a02a6bb6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-08-31T11:10:33Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:48:17Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"LLVM based PPU Recompiler. Intial commit","sha":"2bb63ad0518ad45bb10f666d759fbf8d40d63c3b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:16:53Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:48:53Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Implemented a basic UT framework for PPULLVMRecompiler","sha":"2ea881301a0a05a89d9b42dd08884c9741987ff0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:19:43Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:51:24Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Moved tests to a new file","sha":"66d0b25448dda5d11a72e2013b3817cd77de4834"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:20:07Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:51:24Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Added more tests","sha":"659a3d88c6025e049b0ed4602261b1a0ef6de1a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-02T09:41:32Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:51:25Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Added support for 3 more instructions","sha":"d8d0c0d2fef9e75370c54f8cdd0857ce75776f4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:26:15Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:52:37Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Added support for a few more vector instructions","sha":"eaa644dc207e6463a382ebca3862e5df5e20de7b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:26:36Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:52:38Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Added support for MULLI","sha":"ac86ee8fa9cf4b075b641ec39762b0bca25384a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:26:55Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:52:38Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Support few more instructions","sha":"878926f57c4895971b16c99c8705c5b30696d9ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:27:05Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:52:39Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Refactoring + new instructions","sha":"aa614e83f2136506a7b74ae2aa9b0957180bfd80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:28:38Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:52:39Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Implemented fallback to PPU Interpreter","sha":"6135b450c2505f8cdd58278ab39e08b199c4e210"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:30:34Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:54:24Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Added LLVM as a submodule","sha":"02d1c9f6d2020bdbee04f2ebaac879ed56a47cef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:30:50Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:55:02Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Compilation Fix","sha":"791f8e3b9a9a8e087493b9d5d4107cfb43386522"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:33:06Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:56:07Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Made changes so that the recompiler output may be verfied against that of the interpreter. This seems to be a better strategy for testing the recompiler. The best strategy would be to verify its output against a real PPU core but I dont have access to one.","sha":"a4bb9eaa55c28e0270c6b9d23abfe132d1f9c8b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-09T21:30:53Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:56:07Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Made changes so that there is a single LLVM context instead of one per PPU. If separate LLVM contexts are used per PPU and if different PPUs execute the same address then the address will have to compiled once per PPU.","sha":"1be5222e660fd4994040b79e3355e7d03949fb69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:34:09Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:56:08Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Some refactoring. Added support for some load/store instructions.","sha":"f5188cdb3233e2885c0774692f479df598372a74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-12T11:27:11Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:56:08Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Disabled tests","sha":"1f3a1177442d459209db809c53ee8660b8c8c1b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:35:18Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:56:09Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Run recompilation in the background","sha":"840ae2f86b3458123fa3fa1e285e9f55c13e122a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:35:51Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:56:09Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Fixed some bugs that prevented the recompiler from terminating properly","sha":"d69de9c3326e1046aac248305abd49d3c8871924"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:36:29Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T09:56:10Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Enabled some LLVM analysis/transform passes\nImplement mul, neg, nor, subf","sha":"e485047a10151006579a45483a80c28f4acb12f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T14:37:38Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:00:58Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Implemented LF*, STF*, RL* and a few more instructions","sha":"c72d97c64afad0bcd7fad32b85ac5766fe46f234"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-15T21:37:14Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:05:03Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"LLVM VS project files that were part of the reposiory have been removed. These files will now be auto-generated. It should now be possbile to build from any directory and not just D:\\Projects\\rpcs3.","sha":"170439f91c604b4fd3be756a904237d7bc3603fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-16T04:31:53Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:06:23Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Remove unneeded LLVM files","sha":"d35d00f301b56071543700b3634be3e8075759a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-16T04:40:27Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:06:24Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Remove unneeded files","sha":"2ff8b9fb20e909ad3de3960435114d40e869ac7a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-16T06:03:56Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:08:03Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"More changes to get the build to work properly","sha":"a029e708630e83cf0a0af2df1554268f43129306"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-17T09:57:45Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:10:38Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Print disassembly to log","sha":"ccc37b5dc52a34fa7293396f8c008aba72bc5ba7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-18T11:29:49Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:10:38Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Implemented some FP instructions but did not add support for updating the FPSCR. Many misc changes.","sha":"e687a9124368e494923659c6628f2996a09e0c2b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-18T12:04:49Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:10:39Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Disabled the use of BMI instructions since older processors do not support it","sha":"f210180aa66f3e78d81e1d32e48806a058ded434"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-21T21:28:48Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"gopalsr83"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:10:39Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Fixed compilation in Linux. Have not tested it though.","sha":"d5e86f7190d2ace751a54cb0879ed4c61d878025"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-22T20:22:20Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:10:40Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Implemented branch instructions and some basic block combining.","sha":"1bd235616f9567cc16a293161d8275357da47518"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-26T12:40:24Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:10:41Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Support some instructions","sha":"3e7d42b0236780326aeeed8a0dd26caf64500449"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-09-26T16:03:11Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:10:41Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Disabled unit tests","sha":"9c99fc7bb1feb97206fa533aca7b800a1513eaca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-08T20:04:17Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:10:42Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Fixed some bugs","sha":"143f542bd6349c4523ef07eaa638fd090d2fe34e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-12T18:24:43Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-13T10:10:42Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Support more instructions","sha":"cd154ad35721b742d718eaee32f37f0b16434381"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-14T08:53:50Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-14T08:53:50Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Fix compilation errors caused by rebase","sha":"b95cddb0c7c307beb950e62267416c201779ef68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-16T09:58:57Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-16T09:58:57Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Support more instructions","sha":"35a0e0c625c1c86cf39400e0d888a765423a637d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-16T11:33:46Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-16T11:33:46Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Made minor fixes to some instructions in the PPU interpreter. Also changed the implementation of MFTB so that it always increments at a constant rate.","sha":"817947e37399cc62f69405da9530ca6f3ddef889"}
+{"author":{"avatar":null,"date":"2014-10-16T16:29:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-16T16:29:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"waiter_map_t : concept changed\n\nPurpose-specific waiter_map_t objects instead of global one. SM_Sleep()\nremoved.","sha":"18b69cac99232b9205f4d1fc43adcf0165703a9e"}
+{"author":{"avatar":null,"date":"2014-10-16T17:07:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-16T17:07:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugfix","sha":"f839713a94c5e1bba0ba9acbdd6b8cf5d9ed7e2b"}
+{"author":{"avatar":null,"date":"2014-10-16T19:34:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-16T19:34:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"waiter_map_t for syncRwm and syncQueue","sha":"5de059789d4c66969abdad70963fd567bfa8900e"}
+{"author":{"avatar":null,"date":"2014-10-16T22:13:20Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-10-16T22:13:20Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #839 from gopalsr83/master\n\nMinor fixes to PPU interpreter.","sha":"d5a8675d1eae31000b7227886be03f6433e058c7"}
+{"author":{"avatar":null,"date":"2014-10-16T22:13:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-10-16T22:13:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #841 from Nekotekina/master\n\nSmall cellSpurs / cellSync update","sha":"3d415d653b6154fd4c21985690f8c5a20ed001e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-10-17T13:20:40Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-10-17T13:20:40Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Initial cellSail implementation\n\nAlso a TODOs for frequencies","sha":"d58beb8f4c721e99655df7e2cac7f461ff82ef08"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-10-17T15:14:58Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-10-17T15:14:58Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fixes\n\nFixed vm::vars missing be_t in a lot of cases and disabled a part of\ncellSailCreateDescriptor for now.","sha":"b96037f1607ae800b8ab2c9d9e2ab8d04dc8d990"}
+{"author":{"avatar":null,"date":"2014-10-17T15:43:46Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-10-17T15:43:46Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #842 from tambry/ChangesAndAdditions\n\nInitial cellSail implementation","sha":"9c8666573b8a324268d9caf81adb13636d70e808"}
+{"author":{"avatar":null,"date":"2014-10-17T20:13:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-17T20:13:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"waiter_map_t small fix","sha":"18930a43f2fb163ec977852f05b38045bea5d8bb"}
+{"author":{"avatar":null,"date":"2014-10-17T22:20:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-17T22:20:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellAdecClose, cellVdecClose fix","sha":"318d06efda28fded138995dd15f447757908d214"}
+{"author":{"avatar":null,"date":"2014-10-18T17:00:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-18T17:00:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"AV decoding minor cleanup","sha":"81474be1035465d98558844c57aa118f5e711753"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-18T18:14:16Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-18T18:14:16Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"msg":"Added initialization checks in CellGem","sha":"220e4ad8a6c9cab2c012d227341e1c5b9b68975c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-18T18:20:37Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-18T18:20:37Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"msg":"Implemented sceNpManagerGetContentRatingFlag","sha":"7fd3dd9ebfab8b06d28d487a21ad474bc631d962"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-18T18:22:52Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-10-18T18:22:52Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"msg":"Initial CellMic implementation","sha":"f1168f7c596ddd769d15fec35cfbe76e09f70ae0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-18T19:11:26Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-18T19:11:26Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #845 from Survanium90/master\n\nVarious changes in CellGem, SceNP and CellMic","sha":"59c8def5660f7afdd7d98f19ded1aa9e22562c85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-18T20:27:54Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-18T20:27:54Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Support more instructions","sha":"ce4d04290e4dbdf1b63bc8faa7f86d03d0b32987"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-18T21:06:26Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-18T21:06:26Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge remote-tracking branch 'upstream/master' into ppu_llvm_recompiler\n\nConflicts:\n\tUtilities/BEType.h\n\trpcs3/Emu/Cell/PPUInterpreter.h\n\trpcs3/emucore.vcxproj.filters","sha":"8a7ba5a7096c134fdb3d1ae712d275e91a69fff8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-18T22:45:31Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-18T22:45:31Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #844 from Nekotekina/master\n\nSome fixes in cellAdec, cellVdec, cellDmux","sha":"6a163b8cc54211be8c44dc6b8dd8902bc0dfb6c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-19T19:46:35Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-19T19:46:35Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Some cleanup","sha":"024c15d4d3ac8c94544e8e5779a0060d0bee3d83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-20T11:49:01Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-20T11:49:01Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Fixed the implementation of LSWI and STSWI. Simplified the implementation\nof VSL and VSR.","sha":"7e1413badf5c4cb55d2b83b51d56638f6527d46c"}
+{"author":{"avatar":null,"date":"2014-10-20T15:43:20Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-10-20T15:43:20Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #846 from gopalsr83/master\n\nFixed the implementation of LSWI and STSWI. Simplified the implementation of VSL and VSR.","sha":"ab0a907c7a4c263cf4ea5f35ea788d00517339c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-19T20:18:05Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":null,"date":"2014-10-20T20:47:00Z","email":"gopal@gopals-ubuntu-12-04-vm.(none)","login":null,"name":"S Gopal Rajagopal"},"msg":"Updated Travis CI configuration to compile LLVM","sha":"4514fc12bd2a3ca341f2b11d6dffeebd75722c70"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-21T10:36:10Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"gopalsr83"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-21T10:36:10Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"gopalsr83"},"msg":"Made changes for compiling in Linux","sha":"1446e5bb50fcfc46646f5cb420496fef9b2c2af1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-10-21T14:20:52Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-10-21T14:20:52Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Support FSQRT/FSQRTS instructions","sha":"20a5bf424fda91a8ed1c972ffd9e1646e9314c31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-10-21T14:43:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-10-21T14:43:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add test against interpreter","sha":"00486d39e24bd76c1f2f881169978c29db4a3ca2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-21T18:16:37Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-21T18:16:37Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge pull request #1 from raven02/patch-2\n\nSupport FSQRT/FSQRTS instructions","sha":"8cfc9c7493ef65a8887028292616080fa23e8b26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-21T18:31:16Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-21T18:31:16Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge remote-tracking branch 'upstream/master' into ppu_llvm_recompiler\n\nConflicts:\n\tUtilities/BEType.h\n\trpcs3/Emu/Cell/PPUInterpreter.h\n\trpcs3/emucore.vcxproj.filters","sha":"dfd3425e650c210e2b9fb353909d03570d0b82e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-21T18:52:27Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-21T19:42:15Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Cleanup some files","sha":"ce21a9d25088b28b704bc9277799991ed8c971e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-22T13:13:26Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-22T13:13:26Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #847 from gopalsr83/ppu_llvm_recompiler\n\nPPU Recompiler (LLVM)","sha":"5d1cafdebca3480423b3a85dcbbe5682074e9152"}
+{"author":{"avatar":null,"date":"2014-10-22T22:53:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-22T22:53:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some things simplified","sha":"7777be6fc10a44c2ea9884ed216174300b822d0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2014-10-23T04:09:31Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2014-10-23T04:09:31Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"msg":"Update README.md\n\nUpdate now Compile With PPU GIT (LLVM)","sha":"2c99aa4ea92f1dfde743d6322bbb54a14f377ca2"}
+{"author":{"avatar":null,"date":"2014-10-23T22:06:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-23T22:06:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Few instructions simplified","sha":"973e3f8f7e19090aefed9ca7535b3862a34ffe13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-10-23T16:46:04Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2836720?v=4","date":"2014-10-24T00:46:14Z","email":"jacky.kk.tsui@gmail.com","login":"jacky400","name":"raven02"},"msg":"Support FCTID/FCTIW instructions","sha":"4eb4186b5cc5da44fd522a97bd02809e4d7ba08d"}
+{"author":{"avatar":null,"date":"2014-10-24T13:24:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-24T13:24:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Few warnings fixed","sha":"6df5ddb973e151eedb29081f17e9ca98dbf8897f"}
+{"author":{"avatar":null,"date":"2014-10-24T19:13:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-24T19:13:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"ffda60996d09f40c56367611d5eb26d48b95fc36"}
+{"author":{"avatar":null,"date":"2014-10-24T23:30:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-10-24T23:30:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #849 from raven02/patch-3\n\nSupport FCTID/FCTIW instructions","sha":"a180e90a6d2d0244532fe6ba88f6ce2e61991091"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-25T01:08:47Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-25T01:08:47Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Intial commit for advanced tracer","sha":"6bc0ce8046a8a2fc3c8842f398118c417c513ad8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-25T01:26:57Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-25T01:26:57Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Fixed compilation issues","sha":"160b58cf617d6f98038875cf03904ee201bc31c1"}
+{"author":{"avatar":null,"date":"2014-10-25T17:59:33Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-10-25T17:59:33Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #848 from Dante38490/patch-1\n\nUpdate README.md","sha":"d26f7f696d548993d78fb9add321fccfed16b003"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-10-25T20:53:55Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2836720?v=4","date":"2014-10-25T22:30:43Z","email":"jacky.kk.tsui@gmail.com","login":"jacky400","name":"raven02"},"msg":"Stub DCBI instruction","sha":"f54a5c6591e6006ea5327e4f4bc49d231575163c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-26T10:59:39Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-10-26T10:59:39Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #850 from raven02/patch-4\n\nStub DCBI instruction","sha":"7258ddc3188fb9d4e8785ac6b1f0e864d91c2241"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-10-26T16:19:48Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2014-10-26T16:59:08Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"remove dependency on CMake and python","sha":"1af2f5b2141f12b3ef3d207cf1bca25ca5760ad2"}
+{"author":{"avatar":null,"date":"2014-10-27T21:24:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-27T21:24:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellAdec improved","sha":"09a4d14f8f34c5623c3e9bbb692fc9f872b99862"}
+{"author":{"avatar":null,"date":"2014-10-28T12:30:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-28T12:30:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"65ddf980e086d1e9487c2d3f2108de05d907d72f"}
+{"author":{"avatar":null,"date":"2014-10-28T16:46:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-28T16:46:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugfix","sha":"0f602e0e13d8fec6a604a1e254e168e70c764f7f"}
+{"author":{"avatar":null,"date":"2014-10-29T04:13:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-29T04:13:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Tiny ARMv7 interpreter update","sha":"bf6415accd26c6633c89281113079a96965204ba"}
+{"author":{"avatar":null,"date":"2014-10-29T15:30:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-29T15:30:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: more opcodes","sha":"94213bb398b6437ead77de4be3d98312fba5e203"}
+{"author":{"avatar":null,"date":"2014-10-30T15:17:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-30T15:17:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: more opcodes","sha":"7aeda3b0c72540095354661febb42903446f41d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-10-30T20:02:49Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-10-30T20:02:49Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Update OpenGL definitions to 4.5 specification","sha":"633078004a67471aadf43ec558b890bdeb671532"}
+{"author":{"avatar":null,"date":"2014-10-30T20:07:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-30T20:07:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: more opcodes","sha":"de156c59e4c2dddeeb62b713db3c48f8c20b7717"}
+{"author":{"avatar":null,"date":"2014-10-31T01:12:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-31T01:12:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: BX, MOV_IMM, IT (ITSTATE register)","sha":"3895c083cbd5af2f0155a05682ee106255ad08eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-31T19:52:39Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-10-31T19:52:39Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Made changes to tracer so that it understand compiled blocks","sha":"7846fa5829da514ba6bef6c042fdd39e2909e11f"}
+{"author":{"avatar":null,"date":"2014-10-31T22:00:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-10-31T22:00:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: more opcodes + STR","sha":"536c5a900a02a16ae24de68642ef72c7a7695cf6"}
+{"author":{"avatar":null,"date":"2014-11-01T13:12:10Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-11-01T13:12:10Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #853 from tambry/OpenGLUpdate\n\nUpdate OpenGL definitions to 4.5 specification","sha":"8ff9b44abb39073a6f56b7f83789d7a8ecbf2d6e"}
+{"author":{"avatar":null,"date":"2014-11-01T23:19:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-01T23:19:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: more opcodes, some changes in loader","sha":"3bdfc6b4999658e1ecd26a80c20413a1963a0ee1"}
+{"author":{"avatar":null,"date":"2014-11-01T23:45:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-01T23:45:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"61e6d8af96e6d1979b9f32b95fcc6b719d69bc50"}
+{"author":{"avatar":null,"date":"2014-11-02T00:28:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-02T00:28:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"ddbd590bef419fd0957c7ce48ddbdea05f0e0662"}
+{"author":{"avatar":null,"date":"2014-11-02T01:18:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-02T01:18:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"31c71b4a4863b4cbd27cc2b95b2a5e2db7ff8e95"}
+{"author":{"avatar":null,"date":"2014-11-02T15:50:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-02T15:50:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: CMP_REG, LDR_IMM, LDR_LIT, STR_REG, SUB_REG\n\nsceLibc: exit and printf drafts\nThis actually allows to display hello world.","sha":"df72f5e37cd199729343765ef0db5b54b52f6335"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-02T15:55:51Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-02T15:55:51Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Removed LLVM and PPU LLVM Recompiler from Debug, Release and 'Debug - MemLeak' build configurations. Added 'Release - LLVM' and 'Debug - LLVM' which include LLVM and PPU LLVM Recompiler.","sha":"c2743e6dad27e4a1e053e6a7e3f2d34b9e25953b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-03T06:28:50Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"gopalsr83"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-03T06:28:50Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"gopalsr83"},"msg":"Fixed linux compilation","sha":"af78355570710cecc9ed7a724abc191b0a0f653a"}
+{"author":{"avatar":null,"date":"2014-11-03T11:35:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-03T11:35:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Something is wrong with entry points...","sha":"43382a0ac649958dfec234363b1448299b7703bd"}
+{"author":{"avatar":null,"date":"2014-11-04T00:51:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-04T00:51:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sceLibstdcxx draft","sha":"c5858de567521a2f28d1090b726f264272bbe3bb"}
+{"author":{"avatar":null,"date":"2014-11-04T16:30:09Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-11-04T16:30:09Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #851 from Bigpet/cmakeless\n\nremove dependency on CMake and python under Windows","sha":"321c29fe1cbaa1fa09fd7ecd2db63f786aefecde"}
+{"author":{"avatar":null,"date":"2014-11-04T16:45:25Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-11-04T16:45:25Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge branch 'master' of https://github.com/gopalsr83/rpcs3 into gopalsr83-master","sha":"5a27a84f5af38f25ad4c90fcf5c2496f43816044"}
+{"author":{"avatar":null,"date":"2014-11-04T16:48:45Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-11-04T16:48:45Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge branch 'master' of https://github.com/gopalsr83/rpcs3 into gopalsr83-master","sha":"e14fbda50232acecec8190fd5959220a340990c5"}
+{"author":{"avatar":null,"date":"2014-11-04T16:49:02Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-11-04T16:49:02Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge branch 'gopalsr83-master'","sha":"a4e5751cff6b345e6539a0d3e9ecc13d85238fad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-04T19:31:20Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-04T19:31:20Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Construct CFG from execution traces","sha":"7c3c5ae08ed02f22f22c8ddf5b7ee93c6c53c78b"}
+{"author":{"avatar":null,"date":"2014-11-05T16:07:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-05T16:07:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sceLibm, sceLibKernel drafts","sha":"7a2cd15173a580df3e8061ae722e14c640db04c7"}
+{"author":{"avatar":null,"date":"2014-11-05T16:20:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-05T16:20:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"5d63c6b52669c1d82909367ea87e1f02cd139d2e"}
+{"author":{"avatar":null,"date":"2014-11-05T18:53:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-05T18:53:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sceRefs reading algorithm modified","sha":"1749b95b57e0749c8592870ac01eed870a34cbd1"}
+{"author":{"avatar":null,"date":"2014-11-06T00:22:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-06T00:22:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: CMP_IMM, SUB_IMM, null HLE function","sha":"7172154da7aa00c59db530d7f8d38bfed3f07f50"}
+{"author":{"avatar":null,"date":"2014-11-06T00:57:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-06T00:57:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugfix","sha":"af0ab4e8ad7266fa6123b3306a57d32f1fe92a48"}
+{"author":{"avatar":null,"date":"2014-11-06T15:29:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-06T15:29:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sceLibc: memcpy, stack arguments","sha":"8ad141de6fdaf1ee957af1579b123d67009e14ab"}
+{"author":{"avatar":null,"date":"2014-11-06T16:09:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-06T16:09:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some errors","sha":"5ba772df93b4425babfc35a7587668e6671cd048"}
+{"author":{"avatar":null,"date":"2014-11-06T16:20:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-06T16:20:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Hmm...","sha":"0503f08f6712e7810ac7f5cf657779c4977af656"}
+{"author":{"avatar":null,"date":"2014-11-06T18:39:31Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-11-06T18:39:31Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #855 from Nekotekina/master\n\nVarious progress","sha":"2fb0911e2aac6d1a7945d0c4db2e75b31e58172b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-07T10:54:59Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-07T10:54:59Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Generate code from a CFG","sha":"ee6a239679eade4c1f4211c5489d31c30e0fade7"}
+{"author":{"avatar":null,"date":"2014-11-07T19:30:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-07T19:30:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: ADD*, LSL*, shifts fixed","sha":"27c35174bced685d6c64b07fe8ddccd8a793a89d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-08T04:22:23Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-08T04:22:23Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Integrated execution engine, tracer, recompilation engine and compiler","sha":"34e34910fd4cac5340396c6d8d1ee3fe7fd11f3c"}
+{"author":{"avatar":null,"date":"2014-11-08T16:58:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-08T16:58:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellGcmCallback modified","sha":"ac20cf006060ef2fd2c1309ee75820e109240312"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-08T20:30:19Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-08T20:30:19Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Fixed some bugs","sha":"80294e1034195be8ce13894884690150e8793371"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-09T06:20:01Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-09T06:20:01Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Disabled call stack tracing when using the PPU LLVM recompiler","sha":"5c468d7591f60f719bcb60b8be4f23e7e16be103"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-09T08:33:36Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-09T08:33:36Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Always inline functions","sha":"71c12360c7ef8232cf157680cf08046077ef10a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-09T19:34:21Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-09T19:34:21Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Utilize idle time to combine blocks","sha":"c12a98510c8efb435ec17fce2b726a70f5c1ef5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-09T21:01:35Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-09T21:01:35Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge remote-tracking branch 'upstream/master' into ppu_llvm_recompiler\n\nConflicts:\n\trpcs3/Emu/Cell/PPUInterpreter.h\n\trpcs3/Emu/Cell/PPULLVMRecompiler.cpp\n\trpcs3/Emu/Cell/PPULLVMRecompiler.h\n\trpcs3/Emu/Cell/PPUThread.cpp\n\trpcs3/emucore.vcxproj.filters\n\trpcs3/rpcs3.vcxproj","sha":"06a4c301cd960d5ca457dbdd941d8ff2fc9d6c41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-11-09T23:34:28Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-11-09T23:34:28Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"WIN32: set timer resolution clock to 1 ms","sha":"ea7ec448dd0756d43664cc07a0afb5dcd6da117c"}
+{"author":{"avatar":null,"date":"2014-11-10T00:21:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-10T00:21:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"PSV: sceKernelCreateThread and sceKernelStartThread\n\nSome fixes in callback manager","sha":"c8d4193f08db20682310b74a2048c7421704f859"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-10T06:00:44Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-10T06:00:44Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge remote-tracking branch 'upstream/master' into ppu_llvm_recompiler","sha":"18251b784f2dbc4a09419c9b0b8c3ae27a6ae35c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-10T07:19:48Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-10T07:19:48Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Fixed some errors thrown by gcc/clang","sha":"87accc624ff6513f90f5bedc3aeb1f10fef1c9a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-10T09:02:41Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-10T09:02:41Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Fixed some more gcc/clang compilation errors","sha":"1568d2d602b8febb0b78740166eff3594e157018"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-10T20:18:46Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-10T20:18:46Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Added RSX logging option\n\nAlso some minor fixes to cellSail","sha":"9ee7471bd5f7ed4c89778159c5b06af1793651ae"}
+{"author":{"avatar":null,"date":"2014-11-10T20:47:43Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-11-10T20:47:43Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #859 from tambry/RSXLogging\n\nAdded RSX logging option","sha":"831ff350f2dc313db522223d0af8b13dddb05d8c"}
+{"author":{"avatar":null,"date":"2014-11-11T13:04:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-11T13:04:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"220384997fbe5246693dd3c9a4ba6ead3b50b6d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5060138?v=4","date":"2014-11-12T22:25:27Z","email":"devmapal@gmail.com","login":"devmapal","name":"Fabian Schaffert"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5060138?v=4","date":"2014-11-12T22:25:27Z","email":"devmapal@gmail.com","login":"devmapal","name":"Fabian Schaffert"},"msg":"Fixes segfault described in #794\n\nFixes bug in sys_semaphore_create() when a NULL pointer address is\npassed in sem or attr.\n\nFixes bug in sys_semaphore_get_value() when a NULL pointer address is\npassed in count.","sha":"4185c1e42298a8b88b2d7d1ab95af0404f05224c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-12T22:40:04Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-12T22:40:04Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #860 from devmapal/master\n\nFixes segfault described in #794","sha":"7904d87ddd7bb26d35b6795aa56e4c8a41e98bbf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5060138?v=4","date":"2014-11-14T23:16:17Z","email":"devmapal@gmail.com","login":"devmapal","name":"Fabian Schaffert"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5060138?v=4","date":"2014-11-14T23:16:17Z","email":"devmapal@gmail.com","login":"devmapal","name":"Fabian Schaffert"},"msg":"Adds copy constructor for class InstrBase\n\nA copy constructor is necessarry for `class InstrBase`, as the implicit\ncopy constructor simply copies the pointer `m_args`. This results in a\ndouble delete of the same memory region, causing a segmentation fault\nwhen rpcs3 exited.","sha":"6906d146bbcd0118aa0686a04eb34cd6f6a57f31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-15T00:41:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-15T00:41:47Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #861 from devmapal/master\n\nFixes segmentation fault on exiting rpcs3","sha":"4f30e014a4ff5f8c54d0ae635efd9dd9d10d6c66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-15T14:45:02Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-15T14:45:02Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"cellSail fixes and GetRegBySPR split up\n\n* Fixed cellSailPlayerAddDescriptor\n* Fixed cellSailDescriptorSetAutoSelection\n* Fixed cellSailDescriptorIsAutoSelection\n* Split GetRegBySPR into ReadSPR and WriteSPR\n* Added 0x10c for ReadSPR and WriteSPR (Time-based register)","sha":"3af57957d584a082642d7342aaad35eceec693b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-11-15T14:47:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-11-15T14:47:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Check pSelf->pAddr is not NULL before setup pAddr pointer","sha":"3b31a9233d290fb0e5c6fb63f5d6c59a79504b33"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-15T14:49:20Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-15T14:49:20Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #862 from tambry/Fixes\n\ncellSail fixes, split GetRegBySPR into ReadSPR and WriteSPR, added 0x10c case for them","sha":"2e4012355716841ce3dddb6dd04c0f74b06f6500"}
+{"author":{"avatar":null,"date":"2014-11-15T15:19:40Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-11-15T15:19:40Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #858 from gopalsr83/ppu_llvm_recompiler\n\nImproved tracer for the PPU recompiler","sha":"19d1a6babc860063b1f0e04e238e89a4d9de1e59"}
+{"author":{"avatar":null,"date":"2014-11-15T15:19:50Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-11-15T15:19:50Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #863 from raven02/patch-6\n\nCheck pSelf->pAddr is not NULL before setup pAddr pointer","sha":"4fe4e589fb62d5e5850564a1fc748bc2c3c94f9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5060138?v=4","date":"2014-11-15T20:30:01Z","email":"devmapal@gmail.com","login":"devmapal","name":"Fabian Schaffert"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5060138?v=4","date":"2014-11-15T20:30:01Z","email":"devmapal@gmail.com","login":"devmapal","name":"Fabian Schaffert"},"msg":"Fixes build in Debug mode on linux\n\nThe changes introduced in commit 80294e1 makes the mcdisassembler\ncomponent of LLVM necessary in debug mode to successfully link rpcs3.","sha":"f507724b5cc28cccd61ae25711e8b3e007cf525c"}
+{"author":{"avatar":null,"date":"2014-11-15T21:51:31Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-11-15T21:51:31Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #864 from devmapal/master\n\nFixes build in Debug mode on linux","sha":"0e094f66183fc7ab841ba347a55a52021e3118da"}
+{"author":{"avatar":null,"date":"2014-11-16T04:40:02Z","email":"dante38@freee.fr","login":null,"name":"Zangetsu"},"committer":{"avatar":null,"date":"2014-11-16T04:40:02Z","email":"dante38@freee.fr","login":null,"name":"Zangetsu"},"msg":"Update SLN Delete version express and Update Number for VS2013 Update 4","sha":"05f91dc293191ef3c18091ad94dc021d3313a38d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-11-16T11:05:41Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-11-16T11:05:41Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Check address is not null for cellGcmAddressToOffset","sha":"25ba18e8a76ba12472a9baba4758e783940c3202"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-16T11:46:36Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-16T11:46:36Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #867 from raven02/patch-7\n\nCheck address is not null for cellGcmAddressToOffset","sha":"1ef01be4b5585179b2c17ffc18543c4ecccf8962"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5060138?v=4","date":"2014-11-16T13:43:58Z","email":"devmapal@gmail.com","login":"devmapal","name":"Fabian Schaffert"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5060138?v=4","date":"2014-11-16T13:45:58Z","email":"devmapal@gmail.com","login":"devmapal","name":"Fabian Schaffert"},"msg":"Fixes return value of sys_semaphore_create()\n\nIn case of att.addr() being NULL, CELL_EFAULT must be returnd and not\nCELL_EINVAL, according to the corresponding ps3autotest.","sha":"00e0e857934b52d4078fb0d9851b1b861bee3f1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5060138?v=4","date":"2014-11-16T19:48:22Z","email":"devmapal@gmail.com","login":"devmapal","name":"Fabian Schaffert"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5060138?v=4","date":"2014-11-16T20:16:49Z","email":"devmapal@gmail.com","login":"devmapal","name":"Fabian Schaffert"},"msg":"Fixes segfaults for sys_event_flag_(create/get)\n\nNeither sys_event_flag_create() nor sys_event_flag_get() checked for\nNULL pointers in their arguments, which caused the corresponding test\nfrom ps3autotests to segfault.","sha":"e9ab9f51fc38596890df07411ebb357e209d174c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-17T03:29:39Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-17T03:29:39Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #868 from devmapal/master\n\nFixes issues in sys_semaphore_create() and sys_event_flag_(create/get)()","sha":"427fd58ef29a265ffc1c51e497c624e943bc631e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-11-18T06:44:37Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-11-18T06:44:37Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Minor fix","sha":"cd347fa1103f1cb6ae3886b60aafc0ca92a584c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-18T08:01:04Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-18T08:01:04Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #869 from raven02/patch-8\n\nMinor fix","sha":"11d96426398f5bf46de90a91804106df0211ed79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-18T16:03:49Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-18T16:03:49Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix for TB SPR and disable writing to TB SPR\n\nNow use get_time() like MFTB instead of reading for the time-based SPR.","sha":"f99353f649584c272c4cc5acf032b5fd9ef21915"}
+{"author":{"avatar":null,"date":"2014-11-18T17:29:40Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-11-18T17:29:40Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #866 from Dante38490/master\n\nUpdate rpcs3.sln","sha":"b019ee09c60a88d4a437c39091a262153766f133"}
+{"author":{"avatar":null,"date":"2014-11-18T17:29:50Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-11-18T17:29:50Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #870 from tambry/SPRFixes\n\nFix for TB SPR and disable writing to TB SPR","sha":"1d6148499236eb747f6057c6b47fe97bae0780c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-19T14:16:30Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-19T14:16:30Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Implemented LLE Modules Manager (draft)\nImproved loader core.\nImplemented *_thread wrappers.\nMinor fixes.\nTemporary disabled ELF Compiler & DisAsm frame.","sha":"598d929abaa47281322b14eb840cd11c959e9692"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-11-19T15:17:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-11-19T15:17:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Check contentInfoPath && usrdirPath is not null for cellGameContentPermit","sha":"06f3df0ff465d77b5f52a3a0563474a16d63ffac"}
+{"author":{"avatar":null,"date":"2014-11-19T16:13:38Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-11-19T16:13:38Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #871 from raven02/patch-9\n\nCheck contentInfoPath && usrdirPath is not null for cellGameContentPermi...","sha":"28aaa94022cd337238b7a81800672982b25f3aff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-19T19:12:07Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-19T19:12:07Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Improved the logic that detects which functions should be recompiled","sha":"e8582c86550ff6b6376afdc19d5498aa3291a05f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-19T19:33:51Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-19T19:33:51Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Implemented ANDC and also added support for TB and TBH in MFSPR","sha":"13acb06d1a9aad5b92bd77d6008dffbbddea30b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-20T18:08:10Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-20T18:08:10Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Fixed the unit test framework for the PPU LLVM recompiler. Added tests for ANDC. Fixed an issues that prevented LMW/STMW from being generated properly.","sha":"66610186915085c0b9874a76f8c5ee46c5a0620d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-20T18:34:59Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-20T18:34:59Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Direct UT output to PPULLVMRecompiler.log","sha":"5addbcbbb0079eb96ee6ffde4d2b5345cbb7c6e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-20T19:41:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-20T19:41:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed compilation errors\nImplemented converter_le_be","sha":"cdfef3bf9e27021dace0ff45c9104ed5e834188b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-21T13:52:01Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-21T13:52:01Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix Travis compiling","sha":"16b4b9bf40e0165bafc6f20196ffed857e3ba7ce"}
+{"author":{"avatar":null,"date":"2014-11-21T15:58:16Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-11-21T15:58:16Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #873 from tambry/TravisFix\n\nFix Travis compiling","sha":"c846e33a10f2e0c26b07dfc0be4b53a3bb16fc19"}
+{"author":{"avatar":null,"date":"2014-11-22T16:49:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-22T16:49:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"8df2c3d707d1b39f0bf13ddbbbe5416a452d603d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-23T13:36:20Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-23T13:36:20Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Implemented some vector instructions","sha":"921ee1464b7b4529bc37bb92bdc2c00062ee95a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-23T15:17:00Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-23T15:17:00Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Implemented VPK*","sha":"5934132b55ef5d676726760bb12eda015f4b78b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-23T20:11:25Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-23T20:11:25Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Implement more instructions in the PPU LLVM recompiler","sha":"d92344f3836fd9bc2aa0846f937d8b495b91577d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-24T18:12:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-24T18:12:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed vm_ptr\nImproved elf64 loader.\nMinor improvements to vm.\nAdded hotkeys to MainFrame.","sha":"795729a0b7e7781c2c0505d4dc92de93b5a6cbca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-24T18:19:06Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-24T18:19:06Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Remove code left in comments from the PPU LLVM recompiler. Also cause the emulator to pause if unsupported instructions are required to be compiled.","sha":"bb1e08a6bef303dcae77ce387c0dc7612e857cfb"}
+{"author":{"avatar":null,"date":"2014-11-24T19:51:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-24T19:51:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"ea1bad87246ad5c245cf63081509f5337166ef14"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-24T20:44:12Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-24T20:44:12Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Implement some more FP instructions in the PPU LLVM recompiler","sha":"a9645eda73006326fd271f04dba82becf7765191"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5060138?v=4","date":"2014-11-24T21:05:17Z","email":"devmapal@gmail.com","login":"devmapal","name":"Fabian Schaffert"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5060138?v=4","date":"2014-11-24T21:06:21Z","email":"devmapal@gmail.com","login":"devmapal","name":"Fabian Schaffert"},"msg":"Fixes compilation error","sha":"ad01829b2389216abac5ab8455819dd8f41418ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-24T21:15:08Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-11-24T21:15:08Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #874 from devmapal/master\n\nFixes compilation error","sha":"a8c98982535bd623ae8b7aca97c2bc85c635cf84"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-25T17:56:16Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-25T17:56:16Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge remote-tracking branch 'upstream/master'\n\nConflicts:\n\trpcs3/Emu/Cell/PPUInterpreter.h","sha":"631675fdd6fe83219d4e79e24e40266146e8c6f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-25T19:23:24Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-25T19:23:24Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"PPU LLVM recompiler: Implement more instructions","sha":"205e1d88b3a8b7ae1b941ef03d164bdbbaf0d0e6"}
+{"author":{"avatar":null,"date":"2014-11-28T18:56:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-28T18:56:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPU loader fix","sha":"936aeed0a5c8b8e205f74c0df72d2e9a2c853b21"}
+{"author":{"avatar":null,"date":"2014-11-28T19:06:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-28T19:06:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"a7e659abd10ed52465438bc6a20a4dc0651d4b8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-28T20:09:59Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-28T20:09:59Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"PPU: Implemented some instructions in the recompiler. Fixed some bugs in the interpreter.","sha":"6ea50567b67903a1e097ac2b68c112e1d28cea99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T13:16:53Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T13:16:53Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Improved LLE Manager\nImproved VFS","sha":"a59cf50f037e895fffbd854f7c759f2cd4891983"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T13:17:34Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T13:17:34Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"95ce623da4293dfac829024d7c63b8da7e359c63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T14:16:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T14:16:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed GameViewer\nDisabled pause on null rsx instruction","sha":"2b7f984de8706274f226b2fe818e8d44dd9cfc66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T14:50:59Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T14:50:59Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed loading unknown modules","sha":"47df9eb1567e86c3aa643e4a1c330869f8ff6e1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T14:54:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T14:54:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed compilation","sha":"6d3c4e6efcd2e574186a109f33d52abe5efe1b71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T15:15:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T15:15:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Using strcmp instead stricmp","sha":"d9b0b56e3e7f2eeb382884f189305a07f7b39753"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-29T17:01:04Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-29T17:01:04Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix CellVideoOut values, formatting fixes","sha":"bfff7ff5f9db8e064b9830b90405f223f9da06ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-29T17:05:49Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-29T17:05:49Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge remote-tracking branch 'upstream/master'\n\nConflicts:\n\trpcs3/Emu/SysCalls/lv2/lv2Fs.cpp\n\nUpdate from master","sha":"6aff1545c2d97a3f23442ff6b003d56c8a25ff6c"}
+{"author":{"avatar":null,"date":"2014-11-29T17:41:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-29T17:41:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellGameContentPermit: extremely DANGEROUS bug fixed\n\nAnd few tiny changes.","sha":"9fc7197c4fa51d01af0485dc4179c1e169882849"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-29T21:16:29Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-29T21:16:29Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"PPU: Implement more instructions in the recompiler. Fix some instructions in the interpreter.","sha":"ce0f713f03e748eda69bf64aad200a21e7b55d54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T21:59:16Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T21:59:16Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed path to param.sfo","sha":"12d8e0ef38c353786c01cadb6632c39e6d5f78b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T22:03:29Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-29T22:03:29Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Minor fixes","sha":"ebae8dad0a1b8d044a7804c075a9a0dfb1e5d175"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-30T07:09:38Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-11-30T07:09:38Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge remote-tracking branch 'upstream/master'","sha":"1eb9460f2b72c52bc0cece823c70c0454ff93a30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-11-30T08:35:03Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-11-30T08:35:03Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Conflicts fixed","sha":"58787f80a15101d84e5a134381211306cdb6b882"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-30T11:18:17Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-11-30T11:18:17Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"VFS fixes\n- using /app_home/ as local link\nImplemented fmt::merge & fmt::tolower","sha":"a58c5f5a4c9004046a7a51f1b9198a913cbcb178"}
+{"author":{"avatar":null,"date":"2014-11-30T12:08:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-30T12:08:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"fd7a0950a78beb9169d3a995e62bf030e6933b75"}
+{"author":{"avatar":null,"date":"2014-11-30T12:08:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-30T12:08:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"d6489578648544fb86953b4e17a26056527e4589"}
+{"author":{"avatar":null,"date":"2014-11-30T19:09:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-11-30T19:09:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #876 from tambry/master\n\nCellVideoOut fix, formatting fixes and Travis compiling fix","sha":"8f5d9b2c0ef99efd88b55502a167ba3396eda4c6"}
+{"author":{"avatar":null,"date":"2014-11-30T19:23:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-30T19:23:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"/dev_bdvd/ and /app_home/ fixed","sha":"1568930da6476354c4f5df24c4dacf29d623de8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-30T20:39:48Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-11-30T20:39:48Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"PPU: Implemented more instructions","sha":"6cc6ca9f3c9756e5a1db1b085826db4f798adbae"}
+{"author":{"avatar":null,"date":"2014-11-30T22:04:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-11-30T22:04:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some bugs fixed\n\nARMv7 partially restored","sha":"697b699873909ab89ba686215b2068261cc03826"}
+{"author":{"avatar":null,"date":"2014-12-01T00:41:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-01T00:41:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Memory leak fixed","sha":"c61fe621b02683035f8b85d32422b5f8a398fac9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-01T13:17:25Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-01T13:17:25Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge remote-tracking branch 'upstream/master'","sha":"54d6aee0282d8784fda5443ffbac2c9fdd051275"}
+{"author":{"avatar":null,"date":"2014-12-01T16:34:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-01T16:34:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some draft","sha":"e4d5e7c78b52e4b2ec6b401f627814f2c06a4a0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-01T16:47:48Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-01T16:47:48Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"b736b8616b893b7e6d793a235e2972cc73e176a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-12-01T17:17:57Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5306886?v=4","date":"2014-12-01T17:17:57Z","email":"AlexAltea@users.noreply.github.com","login":"AlexAltea","name":"Alexandro Sánchez Bach"},"msg":"Merge pull request #878 from Nekotekina/master\n\nPSV progression, loader fixes","sha":"7ba0bda244a01c670fe5c97ba283407c5b384faa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-01T19:19:18Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-01T19:19:18Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge remote-tracking branch 'upstream/master'","sha":"1f60d6374c855c6f6d0f77ca9e4a5851c57e7c1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-01T19:20:27Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-01T19:20:27Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"ARMv7 decoder reworked (needs more testing / fixes / optimisations). TODO: implement new ARMv7 disassembler (currently ARMv7DisAsm fully disabled), add 0x0 opcodes group.","sha":"c3696f7897e423efdb13bd01e6606e2c758488a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-01T19:27:22Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-01T19:27:22Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Oops, disable my debug logs.","sha":"b2c113e5b1fd7ab1f92fa1b3fb3e87863e2b8f98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-01T22:02:05Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-01T22:02:05Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"RSX: Fixed NV4097_SET_VERTEX_DATA4UB_M, NV4097_SET_VERTEX_DATA2F_M & NV4097_SET_VERTEX_DATA4F_M implementation","sha":"d593e475547949738afb361319d49efac11775fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-01T23:25:08Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-01T23:25:08Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed sys_mmapper_unmap_memory","sha":"a7256763468d59eaef4ccfd34a4fdce50e582b17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-02T00:51:42Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-02T00:51:42Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed RSXThread::ReadIO32 exception","sha":"d82f0b62a594ec4e98fbcc05aa06618de225af52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-02T01:04:01Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-02T01:04:01Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed last commit","sha":"ceee6049dc73d2c466968942f0495ef5fcbf7de9"}
+{"author":{"avatar":null,"date":"2014-12-02T01:19:35Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-02T01:19:35Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #879 from gopalsr83/master\n\nPPU: Implemented some instructions and fixed some bugs in the recompiler. Also fixed some issues in the interpreter.","sha":"b942da3f6856038582683d9689d08c061a69bede"}
+{"author":{"avatar":null,"date":"2014-12-03T13:21:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-03T13:21:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Going to fix demuxer","sha":"8cb8298c038b4b102a1f317cd577302d9d76a256"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-03T16:29:11Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-03T16:29:11Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"16d31bc5e600b890f546fb67bba30ef70ec3857d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-05T14:32:55Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-05T14:32:55Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Update README.md","sha":"473af155fc44e18f06098864067c0dbcf6602460"}
+{"author":{"avatar":null,"date":"2014-12-05T16:12:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-05T16:12:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Demuxer improved + MSVC thread name registrering","sha":"eb7cd7ccced5e3d5780f2d94e62e876ab8cd5b83"}
+{"author":{"avatar":null,"date":"2014-12-06T00:50:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-06T00:50:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"6e1e537b5feae397492655ddfc628e0e4153f9a8"}
+{"author":{"avatar":null,"date":"2014-12-06T09:28:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-06T09:28:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"asserts replaced","sha":"270bfad96f2fa9cab8613234746aa9ccd1be8100"}
+{"author":{"avatar":null,"date":"2014-12-06T12:48:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-06T12:48:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"asserts replaced (2)","sha":"796c1b46c27d3df3b6153ae79fc0aa2da8180929"}
+{"author":{"avatar":null,"date":"2014-12-06T14:02:18Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-12-06T14:02:18Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #882 from Nekotekina/master\n\nAV decoding fix","sha":"f241a63e860526a56341a25a31e2e2ef0cccb0af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3987560?v=4","date":"2014-12-07T07:30:15Z","email":"marco@rebhan-online.de","login":"2xsaiko","name":"MRebhan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3987560?v=4","date":"2014-12-07T07:30:15Z","email":"marco@rebhan-online.de","login":"2xsaiko","name":"MRebhan"},"msg":"Update README.md\n\nAdd dependency for Linux build: libglew-dev","sha":"1ad53bc889c17000ea501c4cfa906536b4a0f852"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-07T11:25:49Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-07T11:25:49Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"GCC build fix","sha":"5d37b42576cf2b8391bbfbdd2e2163f8998ef7c1"}
+{"author":{"avatar":null,"date":"2014-12-08T00:35:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-08T00:35:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"PSV loader fixed","sha":"f2d4453b045763abeb8ad64e61bfa067f0acaec1"}
+{"author":{"avatar":null,"date":"2014-12-08T08:24:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-08T08:24:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #884 from Nekotekina/master\n\nPSV loader fixed","sha":"1ba5b27f455c1051544d77d440086820c03d5fca"}
+{"author":{"avatar":null,"date":"2014-12-09T16:13:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-09T16:13:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Added DivX and MP3 support","sha":"cb694f944c7281258fdffc9535d9457133c06a6a"}
+{"author":{"avatar":null,"date":"2014-12-09T17:24:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-09T17:24:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixes","sha":"2b4f858caff84b493ea639661aca711a29066222"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-10T04:42:13Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-10T04:42:13Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Implement taskset attribute functions","sha":"a254507be1fe7fb3cf0f1274e35eeb545f65618f"}
+{"author":{"avatar":null,"date":"2014-12-10T11:47:26Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-10T11:47:26Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #881 from O1L/master\n\nARMv7 decoder reworked.","sha":"530c17f4f79133e925d639ecce38512f89b8b8cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-11T13:43:17Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-11T13:43:17Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"PPU: Corrected SC instruction format to comply with the PowerISA","sha":"5db254f3a56bb375eb37b279f1d2938d9db8541d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-11T14:54:02Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-11T14:54:02Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Minor fixes","sha":"418a12dd03dd200432b19a003c6afbff24b750d7"}
+{"author":{"avatar":null,"date":"2014-12-11T16:00:48Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-11T16:00:48Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #885 from tambry/Fixes\n\nMinor fixes","sha":"447580a6b7ef5edcd836179fac7256725578cf7a"}
+{"author":{"avatar":null,"date":"2014-12-11T18:43:33Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-11T18:43:33Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #887 from gopalsr83/master\n\nPPU: Corrected SC instruction format to comply with the PowerISA","sha":"937214bc598ff604765bdfea3bdf183c26f5eadc"}
+{"author":{"avatar":null,"date":"2014-12-11T19:25:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-11T19:25:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellPamf improved","sha":"855761432235369badffb320de03009496a5c9f7"}
+{"author":{"avatar":null,"date":"2014-12-12T00:21:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-12T00:21:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Demuxer improved","sha":"058eb9e709d1d5c77e1ff736cb70803c0809c730"}
+{"author":{"avatar":null,"date":"2014-12-12T01:27:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-12T01:27:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugfix","sha":"154433b2e92bae3821d05910c29b9008a59f133f"}
+{"author":{"avatar":null,"date":"2014-12-12T15:38:26Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-12-12T15:38:26Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #888 from Nekotekina/master\n\nDivX, MP3 codecs activated, cellPamf and cellDmux improvements","sha":"b48159b104f50d294c8afb662840ba59849acd53"}
+{"author":{"avatar":null,"date":"2014-12-12T15:38:55Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-12-12T15:38:55Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #883 from MRebhan/patch-1\n\nUpdate README.md","sha":"52eb61736dd03bd6e0f697ca3852568043355cae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2014-12-12T16:31:48Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2014-12-12T16:31:48Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"msg":"Fixed Path Rap file for decrypt .Edat","sha":"7a05ad7023547f11dff92fa850ff8eac5ac1fb37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-12T20:12:09Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-12T20:12:09Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Implement create taskset","sha":"5dd15b3c47bb9acc47e2e351fec0aaeeae78afb4"}
+{"author":{"avatar":null,"date":"2014-12-13T13:49:05Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-12-13T13:49:05Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #889 from Dante38490/patch-1\n\nFixed Path Rap file for decrypt .Edat","sha":"0e81313477e92a71aad4e91cad37dc4cdce74193"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-13T16:17:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-13T16:17:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"VP: Fixed BRI, Experimental BRA implementation","sha":"a5705d33084912366fead9e71c488e525497521a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-13T16:19:06Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-13T16:19:06Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add std::set<int> m_jump_lvls","sha":"4967771df5a351e5b63b3cdefa2462573961a01b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-13T16:39:28Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-13T16:39:28Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Minor fix","sha":"1b6bd42201273825c7f95d97d898130f07c19b2b"}
+{"author":{"avatar":null,"date":"2014-12-13T16:54:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-13T16:54:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellPamfReaderGetStreamInfo() improved","sha":"982f7cba5965b8fb2dc592d81ea2e43c27189402"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-13T17:27:34Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-13T17:27:34Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"GUI: show game icons in GameViewer","sha":"6bd041f8002bd06a73a1d5348579ac38e2c31ce8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-13T17:51:40Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-13T17:51:40Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Build fix","sha":"4ca8cb05fad8e2fa3ed5f8477a3da0e1a91c2f2c"}
+{"author":{"avatar":null,"date":"2014-12-13T18:51:28Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-13T18:51:28Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #891 from raven02/patch-11\n\nRSX: Fixed BRI, Experimental BRA implementation","sha":"68ec7ac095cbd8800979001894a2781cfdd61727"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-13T18:52:31Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-13T18:52:31Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Implement some taskset functions","sha":"40f5f73658a2e4ad388884feacfdf9f963aed359"}
+{"author":{"avatar":null,"date":"2014-12-13T19:08:40Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-13T19:08:40Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #892 from O1L/master\n\nGUI: show game icons in GameViewer","sha":"ff64f908be5ce2813f146d212e74ee32c7c72204"}
+{"author":{"avatar":null,"date":"2014-12-13T20:43:57Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-13T20:43:57Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #893 from Nekotekina/master\n\ncellPamfReaderGetStreamInfo() improved","sha":"5d745a60dc4d03c13af07deba61547fbdfb27701"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-13T21:49:06Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-13T21:49:06Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Implement cellSpursCreateTask","sha":"53e0979f2910879090dbae21345625bafea08b97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-14T06:37:46Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-14T06:37:46Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Enable logging of taskset calls","sha":"68cc9b205920c3579d5d89897caa022f506d44bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T06:47:06Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T06:47:06Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Better fit the gameviewer","sha":"012af7384495348c19bfaf143c431f1efad3a8c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T06:48:24Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T06:48:24Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"mainframe resize","sha":"47fc7f22b0a04b897669ba0a8ef7174544d61a5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T06:54:26Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T06:54:26Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"sort name column by default","sha":"7e2fa38519b0df4bef8fc9d132f1052f05e2772e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T07:04:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T07:04:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"fix icon loading for blu-ray disc","sha":"8b4de95919f867187c5d34698f25438beed1170e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-14T07:59:04Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-14T07:59:04Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"cellSail additions, updates and fixes","sha":"ebe2a5e2cc69849c64bcb9c9944d457b6195b2ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T08:21:38Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T08:21:38Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"icon sizing fix","sha":"6c571b30d20521f1af73adbcc8696e463bb7ac3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T09:36:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T09:36:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"vfs path fix","sha":"cb52ca220ea67f351bdf14cb63aa520a04777676"}
+{"author":{"avatar":null,"date":"2014-12-14T10:02:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-14T10:02:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #895 from raven02/patch-12\n\nBetter fit the gameviewer and icon path fix for blu-ray disc","sha":"7a4d851201d9d2a5cbe0aef5aedf7cc58d473519"}
+{"author":{"avatar":null,"date":"2014-12-14T10:02:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-14T10:02:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #896 from tambry/SailThings\n\ncellSail additions, updates and fixes","sha":"e5718ed2643798dff724c4093940560612274370"}
+{"author":{"avatar":null,"date":"2014-12-14T13:11:50Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-12-14T13:11:50Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #886 from Arkaran99/master\n\nAvoid giving arguments by value for log","sha":"24c5e7d6cd05a536a1a7284b0b85d285c449c311"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T15:09:44Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T15:09:44Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX : enum vec_opcode & sc_opcode","sha":"32aa5ad4151796b5a2900b32586999afafe0ecec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T15:10:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T15:10:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"enum sca_opcode and vec_opcode","sha":"96a992fadbda457e648de65fdc2b1fe3226f6746"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T15:21:41Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-14T15:21:41Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"log error for unimplmented fpcode","sha":"c0b4bf2f944f08d697d7091dceb994dc6085b355"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-14T17:14:26Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-14T17:14:26Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement sys_game_process_exitspawn and fixes","sha":"b8d2343765f026eb268dc4697dbeccd877eae38f"}
+{"author":{"avatar":null,"date":"2014-12-14T18:34:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-14T18:34:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #897 from raven02/patch-13\n\nRSX : enum vec_opcode & sca_opcode","sha":"89d8c34caebbb42af36ddb01e7ee5aaa1e09722b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-14T18:51:19Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-14T18:51:19Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix compiling","sha":"fc25abdbfd46f30f08fdb577e918f17b63999648"}
+{"author":{"avatar":null,"date":"2014-12-14T19:04:49Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-14T19:04:49Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #898 from tambry/DrmFunctions\n\nImplement sys_game_process_exitspawn and fixes","sha":"2b719b6dc00ac1f6bac9060b5441ca7d9666eb03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-12-15T16:09:27Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8973079?v=4","date":"2014-12-15T16:09:27Z","email":"yanamor70@mail.ru","login":"Survanium90","name":"Survanium90"},"msg":"Added function \"sys_process_is_stack\"","sha":"eb9e6434f17d2275a4d0bb17cd2859eed51e9752"}
+{"author":{"avatar":null,"date":"2014-12-15T16:47:11Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-15T16:47:11Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #899 from Survanium90/master\n\nAdded function \"sys_process_is_stack\"","sha":"181d593cee64c70110c076676290bf8aafdd129c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-15T17:38:12Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-15T17:38:12Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"High rescale quality for icons in GameViewer, fixed removing of games in GameViewer","sha":"8ec5b1cd8495645c09393174a8e152c285842eda"}
+{"author":{"avatar":null,"date":"2014-12-15T19:15:31Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-15T19:15:31Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #900 from O1L/master\n\nHigh rescale quality for icons, fixed removing of games in GameViewer","sha":"9ca6bb92962fc7be7b1b7dd3f7aff041118ac212"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-16T03:42:50Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-16T03:42:50Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Added comments on CellSpurs fields","sha":"5a6016003542d7064ac716f7f7f7c71d0d1b59e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-16T14:52:43Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-16T14:52:43Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix missing break","sha":"e27a1f98aa701888e1654118f7252ede4f27831a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-16T10:53:34Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-16T15:04:59Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"cellMsgDialog: Fix a few minor typos.","sha":"1dbc0b448aff72a1ad37dc36269cad6179ebce1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-16T10:20:54Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-16T15:07:33Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"cellMsgDialogOpen2: Don't segfault when given a null pointer","sha":"8fa301ec0533b0d7f98206b9b5c0b13e2b7b426f"}
+{"author":{"avatar":null,"date":"2014-12-16T15:28:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-16T15:28:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #901 from raven02/patch-1\n\nRSX: fix missing case break","sha":"369bef5e1ed7cc7411116d94a202ec0045f05410"}
+{"author":{"avatar":null,"date":"2014-12-16T15:37:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-16T15:37:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #902 from darkf/fix_fixed\n\nMinor fixes","sha":"d2964c1fa45bf9ec8d96629904aaf9bbbba620ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2836720?v=4","date":"2014-12-17T14:01:59Z","email":"jacky.kk.tsui@gmail.com","login":"jacky400","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2836720?v=4","date":"2014-12-17T14:01:59Z","email":"jacky.kk.tsui@gmail.com","login":"jacky400","name":"raven02"},"msg":"RSX: shaders fix and vertex texture implementation","sha":"3fc471eb322c0902f2559383e99f4c4753763437"}
+{"author":{"avatar":null,"date":"2014-12-17T14:35:59Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-17T14:35:59Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #903 from raven02/rsx\n\nRSX: shaders fix and vertex texture implementation","sha":"fb165839642ca2457657f400e54fd37482d05bbd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-17T14:59:28Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-17T14:59:28Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Temporary disable compile_shader()","sha":"114550b0f7abe854cae9767cb5580d0d21fcded4"}
+{"author":{"avatar":null,"date":"2014-12-17T15:21:19Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-17T15:21:19Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #904 from raven02/patch-1\n\nTemporary disable compile_shader()","sha":"621864be1856d9e23d2ff4bc05ae498ea7a7dba1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-17T16:05:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-17T16:05:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Revert VFS","sha":"52bf72787f5b7316af03a75fcc6a767150a8dec5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-17T16:10:20Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-17T16:10:20Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Revert fmt::merge","sha":"37838a49ec825318765e0a4e2300e83dc7be7a8a"}
+{"author":{"avatar":null,"date":"2014-12-17T19:52:26Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-17T19:52:26Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #905 from raven02/patch-2\n\nRevert VFS and fmt::merge","sha":"83208d8b89b51bf11523673d7692081265e8ce8a"}
+{"author":{"avatar":null,"date":"2014-12-18T23:18:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-18T23:18:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellMsgDialogOpen2(): argument checking improved","sha":"e9653f102906fc7788a0d272897d2d8964235fba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-19T11:31:52Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-19T11:31:52Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"cellSail updates and many various fixes","sha":"ce853bc2521f8d005e1076d9619ffc84e3c6b92f"}
+{"author":{"avatar":null,"date":"2014-12-19T11:46:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-19T11:46:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #907 from tambry/cellSailAndFixes\n\ncellSail updates and many various fixes","sha":"dd067847dd55a3d6c607d7a45e4ae047aa8d050c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-19T14:02:11Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-19T14:02:11Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement CELL_SAVEDATA_FILEOP_WRITE_NOTRUNC","sha":"c5ca1991636be922e64d65ec63d8207e33961c61"}
+{"author":{"avatar":null,"date":"2014-12-19T14:45:47Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-19T14:45:47Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #908 from tambry/FileOP\n\nImplement CELL_SAVEDATA_FILEOP_WRITE_NOTRUNC","sha":"c1a676718702cc9f16fb78a2ec6225f4528ad070"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-19T15:19:23Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-19T15:19:23Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Revert \"Implement CELL_SAVEDATA_FILEOP_WRITE_NOTRUNC\"\n\nThis reverts commit c5ca1991636be922e64d65ec63d8207e33961c61.","sha":"2545372a760c7ee5bc4fc84afb3f560af052961c"}
+{"author":{"avatar":null,"date":"2014-12-19T16:03:05Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2014-12-19T16:03:05Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #909 from tambry/master\n\nRevert \"Implement CELL_SAVEDATA_FILEOP_WRITE_NOTRUNC\"","sha":"d07328417f80165804aebb42fecded6ec109b654"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-20T07:05:42Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-20T07:05:42Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"cellSail: fix wrong argument type","sha":"29036504e6a0f6199ad9dba4f64c2f4e9ce730ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-20T11:45:27Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-20T11:45:27Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"cellSaveData: allocate file list properly","sha":"980b9aaab3b525f30815b6eebe9321b9d3d57596"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-20T11:46:09Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-20T11:46:09Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"vfsLocalFile: log when Create fails","sha":"e0ff129dd173b932833491856816ff4574312def"}
+{"author":{"avatar":null,"date":"2014-12-20T12:20:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-20T12:20:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #910 from darkf/cellsail_fix\n\ncellSail: fix wrong argument type","sha":"f231ebb0ad075b2679f9d952d3ab506a25f079ce"}
+{"author":{"avatar":null,"date":"2014-12-20T12:20:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-20T12:20:27Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #911 from darkf/savedata_fix\n\ncellSaveData fix","sha":"5d6fb5a56b6b4c308f2a715de80f51af2d8d45ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T17:13:10Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T17:13:10Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: vertex data regression fix","sha":"c76dd371f3d1c746e9e2c4eb0aba5f5782640549"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T17:14:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T17:14:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"regression fix #1","sha":"c63f370d8bed36331a9a7a790907ebccade4c039"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T17:42:15Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T17:42:15Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Minor fix","sha":"612d11bd0387863293c217e12479d92fce36c5a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T17:54:01Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T17:54:01Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"fix :)","sha":"7c9062fd3d6b7ff5c4edb0050f7d2b9c7fc59037"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-20T20:07:29Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-20T20:07:29Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Improve the readability of the SPURS2 kernel at the cost of some performance","sha":"698f4fd4506dd0c8429d82026c82b0761c7b1706"}
+{"author":{"avatar":null,"date":"2014-12-20T20:51:21Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-20T20:51:21Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #913 from raven02/patch-3\n\nRSX: vertex data regression fix","sha":"7a61fd305505023b6f17fc589dfb1f01047df326"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T23:30:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T23:30:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Reapply fmt::merge change","sha":"0506bf03525b84b0d8a7fa92e15ab8ad01523c3a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T23:32:19Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T23:32:19Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Reapply VFS change","sha":"c6a00e157d2cdec92ec7a60b2bd40b6a7b35a066"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T23:35:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T23:35:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"PARAM.SFO path change","sha":"1e6a533ac78ec7696bd25e653e83c0a701bf2cc5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T23:36:17Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-20T23:36:17Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Trophy.trp path change","sha":"e98d1c0cb7bb0ff7708367ea463acf4cf0f4af76"}
+{"author":{"avatar":null,"date":"2014-12-21T09:15:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-21T09:15:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #914 from raven02/patch-1\n\nRSX : Reapply fmt::merge change & VFS change","sha":"a9647152f7795773cc7c8347ea17dc686114f42b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-21T10:56:38Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-21T10:56:38Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Update ASMJIT","sha":"5f3b25b43a9ad62e3ba3a47942a0603b82961c2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-21T10:58:30Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-21T10:58:30Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Update FFMPEG","sha":"b2b31b04211216726d23c412c2a5ff5e6b450d71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-21T16:29:51Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-21T16:29:51Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Show more information in GSFrame, some changes in cellAudio","sha":"b3be4d11e3d2572c50ea168c47cf4d29dc3509e5"}
+{"author":{"avatar":null,"date":"2014-12-21T17:52:40Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-21T17:52:40Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #915 from O1L/master\n\nShow more information in GSFrame title, some changes in cellAudio","sha":"0011a50c0b8ae7762639a0a05b5936fb84cfe9dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-21T19:37:53Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-21T19:37:53Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Improve readability of SPURS1 kernel at the cost of some perormance","sha":"52b342464be7c067d62473730703345923f3148f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-21T19:44:07Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-21T19:44:07Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix compiling","sha":"688e5a3af61ca78fab59a45d6a8bd673e583bcb8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-21T20:42:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-21T20:42:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Implemented frame limiter\nSome errors in unpkg replaced with warnings","sha":"969cf67ba8b8b114b613f763a986e45b829f6733"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-21T21:37:43Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-21T21:37:43Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix callback hangup in Adreko game series","sha":"52467c54e33b07ba40578aaa28662a3da57aa57a"}
+{"author":{"avatar":null,"date":"2014-12-21T21:52:20Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-21T21:52:20Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #917 from raven02/patch-2\n\nFix callback hangup in Arkedo game series","sha":"5f40f732a95bc776a52bff9a0865b79ea7cb31a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2014-12-21T23:06:25Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2014-12-21T23:06:25Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"msg":"Update MainFrame.cpp\n\nFix Size Setting panel for Tab Graphic","sha":"7464843e53b00e24877212e45a7629d82559324a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-21T23:10:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2014-12-21T23:10:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed condition decompilation in vertex & fragment shaders\nAdded 30 & 60 modes to frame limiter","sha":"e1ea7a28c3718fb44ae3fa77a60a848d34c69158"}
+{"author":{"avatar":null,"date":"2014-12-22T00:56:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-22T00:56:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Syscalls: minor fixes","sha":"0fb092f2a5f8237d7d8da489cf2b8727605064f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-22T11:53:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-22T11:53:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #916 from tambry/master\n\nUpdate submodules","sha":"4f031c11c6232933c3e91879eaf01178cd12531a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-22T15:25:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-22T15:25:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #918 from Dante38490/patch-1\n\nFix Size Setting panel","sha":"27c76960b47b658d4a635ce0f028aa35c863ef26"}
+{"author":{"avatar":null,"date":"2014-12-22T23:31:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-22T23:31:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SMutex eliminated","sha":"b2de24db73e0158fdcbe789088df9c95e5ed5cf3"}
+{"author":{"avatar":null,"date":"2014-12-23T23:38:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-23T23:38:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"std::shared_ptr in IdManager","sha":"d8239a39c91a3f816ae1ff012cb55864fa4d4af5"}
+{"author":{"avatar":null,"date":"2014-12-24T16:09:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-24T16:09:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Kernel Explorer partially restored","sha":"cbdc32e95eeb4b334a493519874738b1bbb03263"}
+{"author":{"avatar":null,"date":"2014-12-24T18:19:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-24T18:19:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellFs functions merged","sha":"69388f032e44274831de8c72c0e3293868b3b334"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-24T18:47:56Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-24T18:47:56Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"cellSail PAMF creation and 3D availability fix","sha":"642e850dfe57f16c32a7af3c2115c3d29f6f4fd3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-24T19:03:52Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-24T19:03:52Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix compiling","sha":"cf1bd9b61b9dc46ae0da68cd7ca90351d8fd0230"}
+{"author":{"avatar":null,"date":"2014-12-24T19:27:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-24T19:27:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #920 from tambry/SailAndVideo\n\ncellSail PAMF creation and 3D availability fix","sha":"31aef6460d2074e92a7204f24b00256e8f3ccd30"}
+{"author":{"avatar":null,"date":"2014-12-24T22:24:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-24T22:24:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SQueue renamed and moved","sha":"7613d749ec333f7a2fccea8bc1b611c9f43df1c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-25T04:39:57Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-25T04:39:57Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"Add a memory ASCII string search","sha":"a94a7d4495e2bb9710f0c17a47f84ddb02d1609c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-25T08:32:18Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-25T08:32:18Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"cellSaveData: terminate callback loop when asked to","sha":"efde3219bd86e9c4882b1e02fe427b9c49e49045"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-25T08:44:10Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-25T08:44:10Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #921 from darkf/savedata-fix\n\ncellSaveData: Terminate callback loop when asked to","sha":"e38dc93a66d95da403c8a4b6dc2c3afe2a24a2d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-25T08:53:56Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2014-12-25T08:53:56Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"MemoryStringSearcher: drop superfluous qualifier","sha":"efd729d0b8e81c123f6c2e418b26c44649d901cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-25T09:07:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-25T09:07:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #922 from darkf/string-search\n\nAdd a memory ASCII string search","sha":"9a63754b43bd0f90b42b3303a4e1641257f468b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-25T16:46:33Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-25T16:46:33Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Revert \"Check address is not null for cellGcmAddressToOffset\"","sha":"bc8fba9cc48a26fc90a0e52973fa4354964acab6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-25T17:29:54Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-25T17:29:54Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #924 from raven02/revert-867-patch-7\n\nRevert \"Check address is not null for cellGcmAddressToOffset\"","sha":"00e87adcfd551a3ff8f35a2ab5ae3534cce060e7"}
+{"author":{"avatar":null,"date":"2014-12-25T20:30:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-25T20:30:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"c30594943547c553589ab8d2470311a8b3099953"}
+{"author":{"avatar":null,"date":"2014-12-25T22:49:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-25T22:49:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"squeue_t fixed","sha":"bdbbde4d367cfba45bc347e9955855562647f5b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-25T22:54:36Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-25T22:54:36Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Not always flush in callback","sha":"3f7e6c990f39bff1fb159b79e85a42a0978ab700"}
+{"author":{"avatar":null,"date":"2014-12-25T22:58:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-25T22:58:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"squeue_t fix 2","sha":"1491dcdc9256a4243699552de7658be6650a0c50"}
+{"author":{"avatar":null,"date":"2014-12-25T23:11:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-25T23:11:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #926 from raven02/patch-4\n\nNot always flush in callback","sha":"2c70cef453d88742fd3068c32ff0448d3f82699f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-26T05:59:47Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2836720?v=4","date":"2014-12-26T06:25:22Z","email":"jacky.kk.tsui@gmail.com","login":"jacky400","name":"raven02"},"msg":"Formatting RSX thread","sha":"97d50a0692c0b5f3c613d07218bd8169ce033ec3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-26T07:26:43Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-26T07:26:43Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"ELF loader : small bug fix","sha":"98404e12c5729b026537e208af5ca335181a68e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-26T07:46:49Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-26T07:46:49Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #928 from raven02/patch-6\n\nELF loader : small bug fix","sha":"2c3e3b583a50bb10b7907cafefcef0253851fe35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-26T08:06:12Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-26T08:06:12Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Improvements to saving and cellFsStat","sha":"052692ac8cb97804c01ad5ce4b02b132b75cce69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-26T08:20:07Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-26T08:20:07Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #925 from tambry/SaveDataTimes\n\nImprovements to saving and cellFsStat","sha":"cbffd14539332552d9739fa36056b504c5d893a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-26T08:20:18Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-26T08:20:18Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #927 from raven02/patch-5\n\nFormatting RSX thread","sha":"d6989c18470424923d75054bdd623de545031f0f"}
+{"author":{"avatar":null,"date":"2014-12-26T14:06:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-26T14:06:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"be2d6061932c9ee00f8bc2226ff664f45c5bac09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-26T15:56:55Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-26T15:56:55Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fragment Program improvements\n\n* Implement TXP (Needs testing)\n* Implement TXB\n* Implement TXL","sha":"1bde52623b01a6d870f694fcb2bba618843fb9a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-26T16:16:57Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-26T16:16:57Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"cellFsStat fix and other fixes","sha":"0cd3cd3e051588ef164bb4f91fb2e434b8841114"}
+{"author":{"avatar":null,"date":"2014-12-26T18:32:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-26T18:32:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Revert \"Formatting RSX thread\"\n\nThis reverts commit 97d50a0692c0b5f3c613d07218bd8169ce033ec3.","sha":"dabac038202847e0b5c20d31a7f1690d15a9a0d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-26T20:15:00Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-26T20:15:00Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: fall back the case switch","sha":"b9a8c6414dc6b904c50179af7721e7dc37e859ad"}
+{"author":{"avatar":null,"date":"2014-12-26T20:57:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-26T20:57:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #930 from tambry/StatFixesAndFragment\n\nFragment program improvements and stat fixes","sha":"c8ba041a3800b92539f046dddd2096aef7e94555"}
+{"author":{"avatar":null,"date":"2014-12-26T22:58:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-26T22:58:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #931 from raven02/patch-7\n\nRSX break fix: fall back the case switch","sha":"411e21210cdf7280a3a83c63b24e4433b657e410"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-27T09:00:44Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-27T09:00:44Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix TXB instruction","sha":"240c20936094f40974f4f17ede3007d48801aa1b"}
+{"author":{"avatar":null,"date":"2014-12-27T11:47:59Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-27T11:47:59Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #932 from tambry/FragmentProgramFix\n\nFix TXB instruction","sha":"e79a7c2261fdfeacb29727221526e16d0257ba68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-27T17:25:51Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2014-12-27T17:25:51Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Some changes in LLEModulesManager and cellAudio","sha":"2a6f4e19cca965e97af38998c7956606da894b00"}
+{"author":{"avatar":null,"date":"2014-12-27T20:20:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-27T20:20:36Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #933 from O1L/master\n\nSome changes in LLEModulesManager and cellAudio","sha":"0388ba5032545da5dc56fc5a4d887f61a9bd9367"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T00:35:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T00:35:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX : log NV4097_SET_CONTEXT_DMA_REPORT","sha":"8690c0297294d50fbd87a30d1e4d5b3f02fe5b19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T00:43:14Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T00:43:14Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"few more cmd","sha":"8e88e531de9ddefbe0daaef1fdf34f2b671d2257"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T00:46:50Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T00:46:50Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"one more cmd","sha":"b61015595692d4ce3c9820ac0a2287a7349a7703"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-28T07:53:01Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-28T07:53:01Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fragment Program improvements and additions\n\n+ Added TODOs for REFL, LIT, LRP, BEM, TEXBEM and TXPBEM\n- Removed the warning message about TEX_SRB texture projection being\nused\n* Implemented packSnorm2x16, unpackSnorm2x16, packSnorm4x8 and\nunpackSnorm4x8. All need more testing to be confirmed as working","sha":"108e87926650c9724212581bda4777441079ab38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T13:00:20Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T13:00:20Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"case range switch","sha":"63a559310cd408195ca171200fece40b4110bf42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T13:01:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T13:01:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"minor changes","sha":"4701affbf9b8fc41bcc371d721a0d080468954a5"}
+{"author":{"avatar":null,"date":"2014-12-28T13:15:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-28T13:15:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"removed excessive stuff","sha":"653db28675cbb25bf3782dcf0efe8927926a11c3"}
+{"author":{"avatar":null,"date":"2014-12-28T13:15:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-28T13:15:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"GSFrame caption fixed","sha":"d11bdfedb63b68e68f77753773b2246bb0aed16f"}
+{"author":{"avatar":null,"date":"2014-12-28T13:17:35Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-28T13:17:35Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #935 from raven02/patch-9\n\nRSX: add few nv4097 cmds and simplify case switch","sha":"31ca42bf1a6f4bbc7fe58e30363d8a4069bf206a"}
+{"author":{"avatar":null,"date":"2014-12-28T13:17:42Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-28T13:17:42Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #936 from tambry/FPImprovements\n\nFragment Program improvements and additions","sha":"4b8d61736460fe75f264c7180bd7d9d898b540f5"}
+{"author":{"avatar":null,"date":"2014-12-28T13:29:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-28T13:29:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"6cd2665e120bb8232881ed17742ef97c15b3c607"}
+{"author":{"avatar":null,"date":"2014-12-28T13:52:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-28T13:52:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Conflicts fixed","sha":"1636531d4a167211c5eb238efa794a44899d8015"}
+{"author":{"avatar":null,"date":"2014-12-28T15:53:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2014-12-28T15:53:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugfix","sha":"f16ec62b4aeb1256f7b3af9c13ae5f84fd3d0ab6"}
+{"author":{"avatar":null,"date":"2014-12-28T18:51:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-28T18:51:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #938 from Nekotekina/master\n\nVarious changes","sha":"af25d47dd9186eea4c3e732719897519af57cff5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:21:34Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:21:34Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: Implement LIT instruction","sha":"4907dedf69bc7089df7284efb914960e1d2db33e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:22:54Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:22:54Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Remove duplicate code","sha":"b81e0f9e4c838ded834ddbd733e0651820540d67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:37:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:37:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"format fix","sha":"06907cb9428e3acefd97b0417844a6401d268c93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:39:00Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:39:00Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Temporary disable BRI instruction","sha":"51c107656f27c184344d0b331140b53373e2c10b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:42:08Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:42:08Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"format fix","sha":"24a19a0dd9b3648327c96003d4c08432e381eb30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:43:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:43:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"change to log_warning","sha":"19e1631697b501d7093054a18f848b7b9c713709"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:53:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-28T22:53:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"format fix","sha":"85d23e2c3258acc4a5cc9154619031fe43276c00"}
+{"author":{"avatar":null,"date":"2014-12-29T00:55:22Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-29T00:55:22Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #939 from raven02/patch-10\n\nFP: Implement LIT instruction","sha":"325dd0308b094c22485e5226c7dc9d89de444ffb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-29T19:23:09Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2836720?v=4","date":"2014-12-29T19:37:58Z","email":"jacky.kk.tsui@gmail.com","login":"jacky400","name":"raven02"},"msg":"RSX : add ClearColor() / ClearStencil() / ClearDepth() / ClearSurface()","sha":"1b87f9312b3db51fe836e76d1c7c8aef14406ab1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-29T22:26:41Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-29T22:26:41Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix compiling","sha":"669ebc594cb78024b11ae3bdf4b5502a9c7513db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-30T02:57:12Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-30T02:57:12Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix compiling #1","sha":"d66825515dca9f0e1d1d1df51ee495d7beda10be"}
+{"author":{"avatar":null,"date":"2014-12-30T06:30:46Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-30T06:30:46Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #940 from raven02/patch-11\n\nRSX : add ClearColor() / ClearStencil() / ClearDepth() / ClearSurface()","sha":"99a9a1e38d1a9a3c4d1de714ce1b7342da632ea2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2014-12-30T15:33:43Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2836720?v=4","date":"2014-12-30T15:44:08Z","email":"jacky.kk.tsui@gmail.com","login":"jacky400","name":"raven02"},"msg":"RSX: refactor glEnable cmd","sha":"3e3665a13b179ae52a76491ffacaaca6653004d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-30T20:15:00Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-30T20:15:00Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement cellSubDisplayGetRequiredMemory","sha":"29c1dc2c074cf7a99a172d7c92267415407fe421"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-30T20:17:08Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2014-12-30T20:17:08Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #941 from raven02/patch-12\n\nRSX : refactor glEnable cmd","sha":"044dcb07901be2e823de818062133f05ee68bd40"}
+{"author":{"avatar":null,"date":"2014-12-31T10:23:31Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2014-12-31T10:23:31Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #942 from tambry/SubDisplay\n\nImplement cellSubDisplayGetRequiredMemory","sha":"944b9f3ae6abfc96c9ecb3642f6e1acd2737e8ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-31T20:21:22Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2014-12-31T20:21:22Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: System service workload - initial commit","sha":"66641160422e704616065c717f815c60cb647499"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-01-01T04:16:34Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2836720?v=4","date":"2015-01-01T04:31:40Z","email":"jacky.kk.tsui@gmail.com","login":"jacky400","name":"raven02"},"msg":"RSX: add alpha func/ref , depth func/mask and bug fix","sha":"a7ca7055520adcc5afba541d9692ebeb407bd913"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-01T09:17:18Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-01T09:17:18Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #943 from raven02/patch-12\n\nRSX: add alpha func/ref , depth func/mask and bug fix","sha":"2d46830ba8ca9d42ddd648d6be51d21320fb456c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-01T10:25:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-01T10:25:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement cellPadPeriphGetInfo\n\nAlso minor fixes","sha":"9873d909d0afa1d1e64c0dcea01c7d81db5230ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-01T13:32:15Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-01T13:32:15Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #944 from tambry/master\n\nImplement cellPadPeriphGetInfo","sha":"406eff5ef0fe1220b9516e98df90b1d752e64a55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-01-01T14:54:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-01-01T14:54:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: create depth buffer only when required","sha":"8616d340bb9ed41db8ba4da7c512e6eb376273bc"}
+{"author":{"avatar":null,"date":"2015-01-01T15:56:10Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-01T15:56:10Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #946 from raven02/patch-14\n\nRSX: create depth buffer only when required","sha":"ac75b62f4d204f6ba6652a3b4af06dd3248c4fc7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-01T20:03:36Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-01T20:03:36Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: System service workload","sha":"4a83d43a8f317c0a5f75ddced3b78f20db84d7e8"}
+{"author":{"avatar":null,"date":"2015-01-01T23:41:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-01T23:41:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Sync primitives reworked\n\n(rwlock rewritten)","sha":"f3cd908d5c1b5bae7a15e04cfc5facd6f8010594"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2836720?v=4","date":"2015-01-01T22:55:02Z","email":"jacky.kk.tsui@gmail.com","login":"jacky400","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2836720?v=4","date":"2015-01-02T00:06:42Z","email":"jacky.kk.tsui@gmail.com","login":"jacky400","name":"raven02"},"msg":"RSX : inline fragment naming as vertex shader","sha":"fffadb975b7bfdbf742fe336b6824425844ea7ea"}
+{"author":{"avatar":null,"date":"2015-01-02T11:53:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-02T11:53:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"b61bcb6ad657f974bdb3d8fc18b89744dd250a40"}
+{"author":{"avatar":null,"date":"2015-01-02T12:32:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-02T12:32:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2","sha":"658079af557b76b1d9379fd478b633a7d08c96ec"}
+{"author":{"avatar":null,"date":"2015-01-02T15:29:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-02T15:29:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Warning fix","sha":"318d7276c0d27700152d63c0534656479ee71a1b"}
+{"author":{"avatar":null,"date":"2015-01-02T16:02:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-02T16:02:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugfix","sha":"d8664c8da4d1a9dc91f4cfe0aaeb60784ea36567"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-03T08:28:55Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-03T08:28:55Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #947 from raven02/rsx\n\nRSX : inline fragment naming & structure as vertex shader one","sha":"3181c566c0fa09042d0ed8cc8a56ed2a64fab0fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-03T10:29:22Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-03T10:29:22Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Integrate SPURS kernel and system service workload. Also, fixed some bugs.","sha":"c1df79b7139f21faa0de83bceaa602f3fed46ed9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-01-03T16:34:05Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2836720?v=4","date":"2015-01-03T17:00:56Z","email":"jacky.kk.tsui@gmail.com","login":"jacky400","name":"raven02"},"msg":"RSX : few more cmd refactoring","sha":"d2e6f6fef0b59c1f97713d828f01b54d0a074b50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-03T19:14:56Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-03T19:14:56Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #950 from raven02/patch-1\n\nRSX : few more refactoring","sha":"1d914d820b440b07d748d17616d6b9e6f45639d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-03T19:17:42Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-03T19:17:42Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #949 from Nekotekina/master\n\nSync primitives fix","sha":"fc97e3d2b855eaca3888a4d2fc3a47721efe741e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-01-03T22:38:06Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-01-03T22:38:06Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX disable front face","sha":"ec7b351cf0690042b141e4ba9877dc4f023732ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-04T07:47:09Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-04T07:47:09Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #951 from raven02/patch-2\n\nRSX disable front face","sha":"3d2aa622f1a297be8e0dd3f62bbea6c8625a398c"}
+{"author":{"avatar":null,"date":"2015-01-04T12:35:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-04T12:35:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Experimental RawSPU MMIO implementation","sha":"896097da0ded3b87b47f5554879046e47197bdc3"}
+{"author":{"avatar":null,"date":"2015-01-04T15:33:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-04T15:33:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Prefix decoding improved","sha":"22497757e97495d63fe79dac8c21883411ecfc33"}
+{"author":{"avatar":null,"date":"2015-01-04T16:44:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-04T16:44:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"PKG installer improved\n\nNow it doesn't attempt to delete existing directory and overwrites only\nexisting files. It should fix installing updates.","sha":"27cfdc897b3df24dd89754f4163c30975203a5f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-01-04T19:48:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2836720?v=4","date":"2015-01-04T20:08:26Z","email":"jacky.kk.tsui@gmail.com","login":"jacky400","name":"raven02"},"msg":"RSX : last few cmd refactoring","sha":"12edfeb21685f549838f5f9d5ac29995f7101cea"}
+{"author":{"avatar":null,"date":"2015-01-04T21:46:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-04T21:46:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Code moved, attempt to make SIGSEGV handler","sha":"6069071e4d4a8fd7d1c9f39c7ca1d2e93e650ac6"}
+{"author":{"avatar":null,"date":"2015-01-04T21:59:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-04T21:59:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"63df801b033b03c59c02709a00af372e2e361e28"}
+{"author":{"avatar":null,"date":"2015-01-04T22:01:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-04T22:01:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fix 2","sha":"43ebd4450d7f7e425649d918cb0b4139b9428dda"}
+{"author":{"avatar":null,"date":"2015-01-04T22:29:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-04T22:29:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fix 3","sha":"ba5e2e3f0f6df534a3ff9b6eb35f391670ee8003"}
+{"author":{"avatar":null,"date":"2015-01-04T22:45:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-04T22:45:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Damned fix for damned terraria","sha":"92c9a0a9aacc99bf34957f0cfea465783f826831"}
+{"author":{"avatar":null,"date":"2015-01-04T23:07:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-04T23:07:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellSaveData reorganized a bit","sha":"181854fc356e9b1cfeed0d57480cbe61e4633840"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-05T11:14:26Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-05T11:14:26Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge upstream","sha":"2d94db4945a316b4c212229dce77fbb24117825d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-05T16:24:03Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-05T16:24:03Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Add locks in the system service workload","sha":"b01c17d1a0048e71fb232c462e0c20430255720f"}
+{"author":{"avatar":null,"date":"2015-01-05T16:41:38Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-01-05T16:41:38Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #953 from raven02/patch-4\n\nRSX : last few cmd refactoring","sha":"b756b807862723072c69a1d7b43d02fd1565d078"}
+{"author":{"avatar":null,"date":"2015-01-05T16:41:52Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-01-05T16:41:52Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #954 from Nekotekina/master\n\nPKG installer fix + experimental optimization","sha":"5ffc6ffca517be0549f9a685d9b619682c119a6b"}
+{"author":{"avatar":null,"date":"2015-01-07T02:14:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-07T02:14:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"vm::stackvar (experimental)\n\nShould be convenient for small allocations which would be done on stack\non real console","sha":"3f44e07b7ceabb9c8f2a6a5b7bbc75d6846fd432"}
+{"author":{"avatar":null,"date":"2015-01-07T02:27:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-07T02:27:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"5f27e9b6e71172500a6c75f2d17930b131ec2e4c"}
+{"author":{"avatar":null,"date":"2015-01-07T02:31:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-07T02:31:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2","sha":"a1b1f6be6391ac8461c691317bf6229bdb8ce83c"}
+{"author":{"avatar":null,"date":"2015-01-07T16:44:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-07T16:44:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"CB_FUNC/SC_FUNC fixed","sha":"bd71c1200e1e12b8177fbb64b997c9c398fdd29d"}
+{"author":{"avatar":null,"date":"2015-01-07T22:58:24Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-07T22:58:24Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #955 from Nekotekina/master\n\nvm::stackvar, callback args and syscall results fixed","sha":"1d0f2c16e0ba342b8322648cb18f3766695de65f"}
+{"author":{"avatar":null,"date":"2015-01-08T22:17:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-08T22:17:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Linux fixes","sha":"056f93f3e400d551c711701dbd97f0a27c46bd50"}
+{"author":{"avatar":null,"date":"2015-01-09T20:11:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-09T20:11:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellAudioAdd(2/6ch)Data fixed","sha":"70ee62f43fcad8e91582465810b65a8734dff9da"}
+{"author":{"avatar":null,"date":"2015-01-09T21:04:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-09T21:04:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellAudio fix (forgotten functions)","sha":"5928b85ec1f2bcb5edf924df696b97b900b2e437"}
+{"author":{"avatar":null,"date":"2015-01-10T19:32:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-10T19:32:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #956 from Nekotekina/master\n\ncellAudio fixes, Linux fixes","sha":"afe221c29d0b2adbf73996d6c4792b9b5eaa2ebf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-01-10T21:19:21Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-01-10T21:19:21Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Added minidx9 as a submodule","sha":"e6e60795b78e2f29c97f94e9557cd5f63f2ef9cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-01-10T23:46:10Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-01-10T23:46:10Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Improved AudioThread interface, added XAudio2 audio output","sha":"b5c33ec26b3e1bc47fb05d61d8ee413d1773b693"}
+{"author":{"avatar":null,"date":"2015-01-11T09:33:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-11T09:33:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"be_storage_t\n\nBE data is internally stored as u8, u16, u32, u64, u128 value (decreases\namount of reinterpret casts in be<>le conversions)","sha":"c36e6924119ed5eed85e72f481fcf704abb9b4b7"}
+{"author":{"avatar":null,"date":"2015-01-11T10:43:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-11T10:43:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Callback syntax changed\n\ncall() became overloaded () operator","sha":"da09477be85385b99104479dcf576a1f3b8a826c"}
+{"author":{"avatar":null,"date":"2015-01-11T12:13:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-11T12:13:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"a128() removed","sha":"c89d2cf13841e84b2e0a2ef180f9856e142389ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-01-11T12:21:53Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-01-11T12:21:53Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"msg":"Build fix","sha":"0648f1d0a2564bde5c83d6a5214e54ed17abb616"}
+{"author":{"avatar":null,"date":"2015-01-12T13:17:48Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-12T13:17:48Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #957 from O1L/master\n\nAudioThread improvements","sha":"11fd944f53f41d33c327da392bdfc3536ce84925"}
+{"author":{"avatar":null,"date":"2015-01-12T13:46:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-12T13:46:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"ad2b2c9c62128507a10c5256a46fbdfa11456165"}
+{"author":{"avatar":null,"date":"2015-01-12T18:12:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-12T18:12:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Experimental template formatting with be_t<> support","sha":"b6ec618f978532763dd03e4222556e0c3ea8977e"}
+{"author":{"avatar":null,"date":"2015-01-12T19:11:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-12T19:11:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"b90540c1eb7b41b2d9d041a5acdb6e720eac881e"}
+{"author":{"avatar":null,"date":"2015-01-12T19:31:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-12T19:31:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2","sha":"e40347dd53208018a361ac63365141b617cfd70a"}
+{"author":{"avatar":null,"date":"2015-01-12T20:37:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-12T20:37:29Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 3","sha":"7372583cab6df3bc38f21dfdf6b9b71f079593b1"}
+{"author":{"avatar":null,"date":"2015-01-12T21:32:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-12T21:32:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cntlz fix","sha":"25672cdc47ca003c4c43e67fa77378853703ddb3"}
+{"author":{"avatar":null,"date":"2015-01-13T00:10:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-13T00:10:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fix","sha":"fe86869f37897a62244585e334a98c624c22265d"}
+{"author":{"avatar":null,"date":"2015-01-13T01:02:16Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-13T01:02:16Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #959 from Nekotekina/master\n\nExperimental function fmt::format","sha":"f4c712dafc289c0b1476f16b695f2c853e8566cd"}
+{"author":{"avatar":null,"date":"2015-01-13T14:54:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-13T14:54:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Formatting fixes, ToBE() replaced with data()","sha":"1c4e89d2bfa5a5127db8644a0ebdd3c87e13a551"}
+{"author":{"avatar":null,"date":"2015-01-13T17:14:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-13T17:14:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Experimental vm::ptr support for fmt::format","sha":"88fd748dd5147a0637dd51745acdd22b5244a921"}
+{"author":{"avatar":null,"date":"2015-01-13T17:38:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-13T17:38:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"PKG installer fixed","sha":"f1f51521f4f4a183e1bdd9276766887a38eeea33"}
+{"author":{"avatar":null,"date":"2015-01-13T18:08:41Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-01-13T18:08:41Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #960 from Nekotekina/master\n\nPKG installer fixed","sha":"8df825abc545f47f11163389ffbc06dd673d4238"}
+{"author":{"avatar":null,"date":"2015-01-13T23:08:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-13T23:08:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":".ToLE() changed to .value() or removed","sha":"bf7cf0ee9d9924f5cbb0a9082ad97780093719e0"}
+{"author":{"avatar":null,"date":"2015-01-13T23:32:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-13T23:32:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"824b0f832a5633eb71112fce71c5907b2f9cdc33"}
+{"author":{"avatar":null,"date":"2015-01-14T13:57:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-14T13:57:19Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"vm::cast","sha":"cdeac05e88120067a88114bbda03bbf4a8ecfa13"}
+{"author":{"avatar":null,"date":"2015-01-14T14:31:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-14T14:31:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"4237043f3897cf78d24170a84f2a59b1575896ad"}
+{"author":{"avatar":null,"date":"2015-01-14T16:48:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-14T16:48:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"vm::cast in PPUInterpreter","sha":"809ba662900eb389853bb5e973593ba26508dfa2"}
+{"author":{"avatar":null,"date":"2015-01-14T18:00:21Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-14T18:00:21Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #961 from Nekotekina/master\n\nSome bugs fixed","sha":"a43e03b5491f3f1c885b1a1aba45c76d84107fdc"}
+{"author":{"avatar":null,"date":"2015-01-14T19:45:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-14T19:45:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Syscall name resolving improved","sha":"42b748a881630f2405570f56c9a6448ebadff0a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-14T21:33:27Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-14T21:46:02Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"msg":"Fix Git version and Remove old Platform on emucore.vcxproj","sha":"3da3eee15f3fb760fccd491192703ac2ff9a3495"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-14T22:48:55Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-14T22:48:55Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"msg":"Fix Compile Linux","sha":"e5b59a6bad392ccf78f87f8c376c6382661267c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-14T23:46:42Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-14T23:46:42Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"msg":"Fix Linux 2","sha":"79e8ed47d5bda24515314d95046248660cf28385"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T01:26:49Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T01:26:49Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"msg":"Fix Typho","sha":"d3c9aff2f49715ae18f852ddb275455a870e5ddd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-01-15T01:58:11Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-01-15T02:34:03Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"don't distinguish between windows and unix for no reason","sha":"71225da13537d7d7a6fe01ac5a680f3577a7b0b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T02:47:22Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T02:47:22Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Merge pull request #2 from Bigpet/master\n\ndon't distinguish between windows and unix for no reason","sha":"e69f76de87a1384dc7a9e63a53d1570a407303ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-01-15T03:00:43Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-01-15T03:00:43Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"forgot to remove somicolon","sha":"57361e2943811a4301c24a11d7492a72199fb6e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T03:03:25Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T03:03:25Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"msg":"Fix correct PATH","sha":"1cf4791f95d95f419a8be81cc1b478444ab0bd00"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T03:15:34Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T03:15:34Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Merge pull request #3 from Bigpet/master\n\nforgot to remove somicolon","sha":"6db1ee634dccfaf86762268616495bf1486b1b88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T03:03:25Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T03:16:14Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"msg":"Fix correct name file","sha":"e61849c3c415c66ca564f018f79b44f212093425"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T03:16:54Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T03:16:54Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Dante38490"},"msg":"Merge branch 'master' of https://github.com/Zangetsu38/rpcs3","sha":"edd4359554dbdde251071b2ed3526765ad09cfa5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T03:18:44Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-01-15T03:18:44Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Fix My error","sha":"0a7b9c03e4535e17dabf75d1b1659d31f3e729b7"}
+{"author":{"avatar":null,"date":"2015-01-15T16:10:48Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-01-15T16:10:48Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #962 from Zangetsu38/master\n\nFix Git version and Remove old Platform on emucore.vcxproj","sha":"692502b1775db5aa268619f8551a47e11328058f"}
+{"author":{"avatar":null,"date":"2015-01-16T14:36:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-16T14:36:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellAudio updated, thread_t updated","sha":"fd06f7038713434b472de6848ec8ff1de05a884f"}
+{"author":{"avatar":null,"date":"2015-01-16T17:09:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-16T17:09:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"squeue_t updated","sha":"4dae27c1d41d91d655d4c1de69ae87ad1fc2711d"}
+{"author":{"avatar":null,"date":"2015-01-17T16:14:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-17T16:14:58Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cellAudio, thread_t improvements, pause/resume callback","sha":"b897a5d20a1f4f924feb728cd951f02c94a726c2"}
+{"author":{"avatar":null,"date":"2015-01-17T16:36:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-17T16:36:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"a6754e29a69e25a76e99e0c7dafca0431da9d273"}
+{"author":{"avatar":null,"date":"2015-01-17T18:33:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-17T18:33:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Things updated","sha":"011362bf1ce75a2998a92450c02f14ba1defae19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:00:58Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:00:58Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Implement missing PPU instructions.","sha":"ae4420e6046d4ad3c5790f396c88ea4184b5ebd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:01:16Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:01:16Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix conditional bcctr.","sha":"54827f7267fa00aac7204541a75d346107b67683"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:01:25Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:01:25Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix mtcrf.","sha":"e47d21024c0c9c561fa0f3a21b3b492b110b1db5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:01:52Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:01:52Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix handling of VRSAVE, and remove references to nonexistent USPRG registers.","sha":"ee508f85b4a78e3b0c4b8f4175e8f49135c92864"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:02:11Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:02:11Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix FPSCR manipulation instructions.","sha":"6cd3310171734788013cec7956d11a00b11ad76c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:02:18Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:02:18Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix fcmp.","sha":"42b55c60e7766993e2e19fd958a65d4d0fc15247"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:02:50Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:02:50Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix lfs/stfs with SNaNs.","sha":"b7761beee9c8f5025b1835bdc8cf360fb7270d93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:03:02Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:03:02Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix detection of denormals in frsp.","sha":"d78fe3b4d4de35dc0dd34ac8911969f36f51ea6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:03:16Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:03:16Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix stwcx. and stdcx. not properly clearing the reservation address.","sha":"74cbf1877be0b3bc13a2172c8004c9a4553bd475"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:03:48Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:03:48Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix mftbu returning the wrong half of the timebase register.","sha":"bbe12bf4b1fde69baa2bbb794ad3ba02770594ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:04:01Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:04:01Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Reduce code duplication in FPU instruction implementations.","sha":"46fa6455551e03845b834c5368e61f70d954ab66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:04:13Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:04:13Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix invalid double constant.","sha":"5fd88bf801266131a32c0dbf8b53d774595b82dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:04:22Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:04:22Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix fcti rounding.","sha":"fee20573d2155f0a5b8f7b8d9d2cc88e8f6b9da4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:04:35Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:04:35Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix intermediate rounding of fused multiply-add instructions.","sha":"43e74a9c61f467d145fded785c9f9724e7d25ffc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:04:45Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:04:45Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Catch invalid and zero-division exceptions in FPU instructions.","sha":"14e0cbde9cf7a8dfcf44b9ede1f44b784bddb87d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:04:56Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:04:56Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix vsumsws clobbering input registers and reading from the wrong word.","sha":"0fa0946a461addb8f6900b9fe59fe8ce71bcd1b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:05:08Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:05:08Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Reduce code duplication for vcmp instructions.","sha":"2e2dbf6c3371454878c59a082bca7fc8c1a79931"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:05:18Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:05:18Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Handle NaNs correctly in vector FP instructions.","sha":"10c706d9a5fa84fa245daffe53e756c2017fb26a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:05:30Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:05:30Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix vmaxfp/vminfp with mixed signs of zero.","sha":"3eb3f66e96ce975e7a87a66ffcbdc85618464386"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:05:38Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:05:38Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Fix intermediate truncation in vector FP fused multiply-add.","sha":"9a310c312e63f227820611e87d841136d666a149"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:05:48Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-17T22:05:48Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Implement VSCR_NJ for all vector FP instructions.","sha":"c9df9c93ed3e1f7093f49eb64eddbf3d93879e3e"}
+{"author":{"avatar":null,"date":"2015-01-17T23:01:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-17T23:01:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Audio format changed to 8ch","sha":"d557ba2d970a830254eb2497a7353d37f0a71f66"}
+{"author":{"avatar":null,"date":"2015-01-17T23:11:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-17T23:11:06Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #964 from achurch/ppu-interpreter-fixes\n\nImplement missing and fix broken PPU instructions in the interpreter.","sha":"10150957ff2b4de361f9bbc58ef1f78ccb40a73c"}
+{"author":{"avatar":null,"date":"2015-01-18T00:40:03Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-18T00:40:03Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #965 from Nekotekina/master\n\ncellAudio update, thread_t","sha":"26f1e2c9e331e6a1772d21ef3d316ed01af381b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-18T09:18:53Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-18T09:18:53Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Add Coverity Scan badge","sha":"7c2b2620c189acfa91d51533e2574bb34a21693b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-18T09:28:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-18T09:28:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Add Coverity Scan build uploading through Travis\n\nHopefully I didn't break anything...","sha":"a792bae1211e299addb7294b56df683e8adba48e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-18T10:13:36Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-18T10:13:36Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Try to fix Coverity Scan","sha":"7da5714fd908164147e7ecc4b5a9d8347660aaed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-01-18T10:51:30Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-01-18T10:51:30Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Small RSX fixes\n- Fixed constants offset in FP decompiler.\n- Fixed vertex textures initialization.","sha":"482d470bf22f063bfb533410d5a4d2402ba58b91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-01-18T11:16:24Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-01-18T11:16:24Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Forgot this one","sha":"1bf9e41c26665d288ca1d20c86c4d20a125e686d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-18T11:51:40Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-18T11:51:40Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Let Coverity run itself only on coverity_scan branch","sha":"6627cc96669b5decfab0459f3c522851317b9554"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-18T12:14:19Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-18T12:14:19Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Set host FP rounding mode for PPU floating-point instructions.","sha":"04902965fe4750f9818179d1173ae5b8bfab1ccd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-18T12:14:31Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-18T12:14:31Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Implement host FP exception checking for PPU floating-point instructions.","sha":"3a87a405936b34fcd8bfd47419264c88f6e9b4d3"}
+{"author":{"avatar":null,"date":"2015-01-18T13:57:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-18T13:57:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Exception handling fix","sha":"6545df2b15f2db6b6785bd3630aa640096965348"}
+{"author":{"avatar":null,"date":"2015-01-18T14:30:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-18T14:30:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation  fix","sha":"561e7cd5a91839d5dfe56b937db1b9429a05d247"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-18T18:17:51Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-18T18:17:51Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Implement the FPSCR register.","sha":"a87de1b565f473638e5ea31d7918162a30b754ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-18T18:18:03Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-18T18:18:03Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Implement the SRR0 register.","sha":"03b059c1d501cf30c2144e99a24f74205892eac5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-18T18:18:36Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-18T18:18:36Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Implement the mfspr and mtspr instructions.","sha":"4375422c09c92dbdf0a6a627c1c20a15264974d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-18T18:19:10Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-01-18T18:19:10Z","email":"achurch+github@achurch.org","login":"achurch","name":"Andrew Church"},"msg":"Implement full floating-point support.","sha":"e64f6a1db3fd6f39fcffb7d86c9754a229d6a473"}
+{"author":{"avatar":null,"date":"2015-01-18T18:54:08Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-18T18:54:08Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #968 from achurch/ppu-interpreter-fixes\n\nImplement FPU rounding mode and exception checking in the PPU interpreter.","sha":"9709f7f82144cc9dfa4575813ae751ce35997dd3"}
+{"author":{"avatar":null,"date":"2015-01-18T18:54:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-18T18:54:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #969 from achurch/spu-interpreter-fixes\n\nFix SPU interpreter to match real hardware","sha":"d9dd3a7eda52b0b77d0a8e41888093e6417cb82c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-01-18T20:41:22Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-01-18T20:41:22Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"FP: switch to version 420","sha":"788075309957f2075907435a4e2775d33742d5fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-01-18T20:42:00Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-01-18T20:42:00Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"VP: switch to version 420","sha":"546619ee240e97c6145bc90af1d825e79634c826"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-01-18T20:42:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-01-18T20:42:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Init: switch to version 420 layout (binding = 0)","sha":"2c98a37512731f93a94b0700e4f1a9e6982b8e5b"}
+{"author":{"avatar":null,"date":"2015-01-18T21:04:44Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-18T21:04:44Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #970 from raven02/patch-5\n\nFP: switch to version 420","sha":"e8d9ea116aedb419adc288596310b6332035c2fe"}
+{"author":{"avatar":null,"date":"2015-01-18T21:29:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-18T21:29:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"87f1a9d9dc91cfdd27ab4280914a7e623584d54f"}
+{"author":{"avatar":null,"date":"2015-01-18T22:54:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-18T22:54:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"fmt::format() optimization (fmt::unveil template)","sha":"0d28f378a76fd78bfd3095c034818a168a46c066"}
+{"author":{"avatar":null,"date":"2015-01-19T13:31:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-19T13:31:02Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"fmt::to_udec(), fmt::to_sdec()","sha":"3428499492125d881409022b9b98c473328815a1"}
+{"author":{"avatar":null,"date":"2015-01-19T14:16:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-19T14:16:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cast_to_ppu_gpr(), cast_from_ppu_gpr() updated","sha":"f3c9143a8117249859de2b9cdb756d00a49e8a32"}
+{"author":{"avatar":null,"date":"2015-01-19T14:34:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-19T14:34:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"8ecf3dcc80da1eb4752d563b7915d943cb9ee9cf"}
+{"author":{"avatar":null,"date":"2015-01-19T16:30:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-19T16:30:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"vm::ptr::make() fixed, added to_le() method","sha":"1629feb15eba6845cc63a2b1338e5dfb50b5cc7f"}
+{"author":{"avatar":null,"date":"2015-01-19T16:59:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-19T16:59:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"6ec63039335e14e3ed699412d483403019aedceb"}
+{"author":{"avatar":null,"date":"2015-01-19T18:02:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-19T18:02:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"cast_armv7_gpr added","sha":"c4558d2ca7f5978455fc5beaf21550f631f3f2c1"}
+{"author":{"avatar":null,"date":"2015-01-19T19:41:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-19T19:41:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"RealToVirtualAddr became vm::get_addr()","sha":"5195b2b1b4fbbbd404a0a678457537a4c764efa1"}
+{"author":{"avatar":null,"date":"2015-01-19T21:30:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-19T21:30:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small vm fix","sha":"36a134798be67a09ba02cdb78f2a82be6d49f46a"}
+{"author":{"avatar":null,"date":"2015-01-19T23:15:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-19T23:15:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Formatting changes","sha":"ec2e53dc6b782adeadc5499f2a816d880a609249"}
+{"author":{"avatar":null,"date":"2015-01-19T23:58:07Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-19T23:58:07Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #971 from Nekotekina/master\n\nOptimization and some restrictions for ppu/armv7 function prototypes","sha":"6a2eefaf3f9a499e45a984b4acb339ca35361a6e"}
+{"author":{"avatar":null,"date":"2015-01-20T15:06:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-20T15:06:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7Context, some opcodes added","sha":"5dd3437da98898a06fb75feae51524e4464184e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-20T19:17:20Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-20T19:17:20Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Implement cellSpursSendSignal, cellSpursSendWorkloadSignal and some cellSpursEventFlag functions","sha":"17f34f512777cc56b923beb18316722d47227dea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-20T19:43:53Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-20T19:43:53Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge remote-tracking branch 'upstream/master' into spurs_taskset\n\nConflicts:\n\trpcs3/Emu/SysCalls/Modules/cellSpurs.cpp\n\trpcs3/Emu/SysCalls/Modules/cellSpurs.h\n\trpcs3/emucore.vcxproj.filters","sha":"411dfd9a3f074f93151d20f2244edb9743adbcbe"}
+{"author":{"avatar":null,"date":"2015-01-20T22:29:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-20T22:29:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: LDR_REG, LDRD_IMM, LDREX, STREX\n\nsceLibc: printf() improved\nsceLibKernel: sceKernelGetThreadId(), sceKernelWaitThreadEnd()","sha":"2d7bf06dea44077d6dacd4095a071a6dbe13d9ea"}
+{"author":{"avatar":null,"date":"2015-01-20T22:46:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-20T22:46:59Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"f3ee2ac9ef24b9d62a380a55c035a12e833046e5"}
+{"author":{"avatar":null,"date":"2015-01-20T23:29:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-20T23:29:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"psv_log_base initialization fixed","sha":"0cd03ca9e60cc87324f8694852998326b70c21dd"}
+{"author":{"avatar":null,"date":"2015-01-20T23:41:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-20T23:41:56Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Another attempt","sha":"ab5dd3ae6f1e39ad82ed67f8a9c8390a02ed7c86"}
+{"author":{"avatar":null,"date":"2015-01-21T11:38:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-21T11:38:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sceLibc: memset()","sha":"506951a5a40f9f23ddceec6c621b30daafb29ad3"}
+{"author":{"avatar":null,"date":"2015-01-21T14:34:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-21T14:34:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7Callback.h, psv modules initialization fixed\n\nsceLibc: __cxa_atexit, __aeabi_atexit","sha":"509e09c2c57b9c2c77331a690977e39464fdc725"}
+{"author":{"avatar":null,"date":"2015-01-21T14:43:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-21T14:43:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"8660b41833d6935934af75c99ee8a7aa48886c2a"}
+{"author":{"avatar":null,"date":"2015-01-21T15:18:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-21T15:18:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some refactoring","sha":"aead66ccbff6aea8b195308b0e0577c3891f2eb9"}
+{"author":{"avatar":null,"date":"2015-01-21T17:15:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-21T17:15:04Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: V* instructions draft","sha":"ab501842c87da87780f2c7efb4978e9b37360633"}
+{"author":{"avatar":null,"date":"2015-01-21T17:33:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-21T17:33:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some code moved to ARMv7Decoder.cpp","sha":"6069be7a93dbdce1fb40295620a040e0c603e669"}
+{"author":{"avatar":null,"date":"2015-01-21T21:09:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-21T21:09:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7 decoder improved","sha":"79d03ece667396adf68d83aeed202f2c1a464c78"}
+{"author":{"avatar":null,"date":"2015-01-21T21:39:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-21T21:39:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"1a5d5c96edc13b89d921bad766550ed4905f57a7"}
+{"author":{"avatar":null,"date":"2015-01-21T23:12:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-21T23:12:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some bug fixed","sha":"ec3c8999553e875400b361d908c6096a02ebbb2b"}
+{"author":{"avatar":null,"date":"2015-01-21T23:45:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-21T23:45:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"fmt::format fixed","sha":"07a2e0b55a86eca3c50d7492b38ca49152e68d33"}
+{"author":{"avatar":null,"date":"2015-01-22T01:58:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-22T01:58:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"More opcodes","sha":"4246d83f2a9486602db35596eb82b6f887563463"}
+{"author":{"avatar":null,"date":"2015-01-22T05:44:33Z","email":"214009270@qq.com","login":null,"name":"sb2130"},"committer":{"avatar":null,"date":"2015-01-22T05:44:33Z","email":"214009270@qq.com","login":null,"name":"sb2130"},"msg":"small fix on loader::load(vfsStream& stream)\n\ni->get_error_code() would have been changed in the if brace","sha":"3e40f22d15d42a82e3f14f293ca2b2a611cfc730"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-22T14:30:33Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-22T14:30:33Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #973 from sb2130/small-fix\n\nsmall fix on loader::load(vfsStream& stream)","sha":"a7e4e07a800f392e56c6f5cda36759a8fd219fb2"}
+{"author":{"avatar":null,"date":"2015-01-22T18:42:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-22T18:42:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"More opcodes","sha":"15e946053baad7fdf9bdcdd07f2925ff52ad1936"}
+{"author":{"avatar":null,"date":"2015-01-22T19:34:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-22T19:34:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"LDRH opcodes","sha":"e01528137e3c829d55a1137e3edb492789ec790c"}
+{"author":{"avatar":null,"date":"2015-01-22T20:35:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-22T20:35:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7 opcode table fixed","sha":"cbd56fc4f57d1188e5e5a5bd2e8629d573ac7150"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-22T21:31:46Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-22T21:31:46Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Implement cellSpursEventFlagWait and cellSpursEventFlagSet. Also modify implementation to make use of vm::var","sha":"8717bdffa9e58b56ae31476cb003aab9033e0f79"}
+{"author":{"avatar":null,"date":"2015-01-22T23:47:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-22T23:47:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small update","sha":"b4c4c4cc896dd0fbb9fcfeae2c029bf7a4428387"}
+{"author":{"avatar":null,"date":"2015-01-23T01:47:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-23T01:47:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sceLibc: sprintf()","sha":"ca3e82341d839e1f5257aa99b972f36d6c51b490"}
+{"author":{"avatar":null,"date":"2015-01-23T03:50:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-23T03:50:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: MUL implemented","sha":"bef2ee8f724359ecd3f67a3c7116330d2806f2f0"}
+{"author":{"avatar":null,"date":"2015-01-23T12:57:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-23T12:57:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"++","sha":"4f706ed69c712ac6c3efac250828295e3497b1e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-23T14:55:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-23T14:55:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #975 from Nekotekina/master\n\nARMv7 changes","sha":"f2e27869597e287f4dec63f3542bc0cea91965e8"}
+{"author":{"avatar":null,"date":"2015-01-23T17:25:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-23T17:25:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7 interpreter refactoring","sha":"47e2e0bd58d40928b00053254eb169f465ae4819"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-23T18:47:37Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-23T18:47:37Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Improve the readability of the event flag functions","sha":"173fb060cb5dea6c008aabf371e26566eb31a77d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-23T19:11:29Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-23T19:11:29Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Implement cellSpursGetWorkloadData and cellSpursLookUpTasksetAddress","sha":"430aa9af8912c0c00944e62a91f309153b15dd69"}
+{"author":{"avatar":null,"date":"2015-01-23T19:36:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-23T19:36:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: CLZ, MVN_IMM, UXTB implemented","sha":"55a2a5c8e55a9500541105358d777ce11b8dc05c"}
+{"author":{"avatar":null,"date":"2015-01-23T21:48:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-23T21:48:14Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sceLibKernel.h added","sha":"2647b77c011bfc65c10093bd72f2e8ad99af02a8"}
+{"author":{"avatar":null,"date":"2015-01-24T00:18:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-24T00:18:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some functions registered","sha":"08c0c90a05b99fe33272a7fa433c97d1f799162b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-24T19:21:19Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-24T19:21:19Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Small fix to cellMsgDialogOpen2","sha":"23a5cd5cff74df3d09237132f17c7ff00a10568f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-24T19:30:36Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-24T19:30:36Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement more FP instructions","sha":"94c81c73c57c96f1250e5477be3d6bc80597229c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-24T19:50:26Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-24T19:50:26Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Various fixes\n\nFixes to dead code and a couple self-assignings","sha":"be50130c3f6951176206ae20282339b1cd259b45"}
+{"author":{"avatar":null,"date":"2015-01-24T20:48:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-24T20:48:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: Some functions registered, u64/s64 arg/result support","sha":"23923af4871ffc00d2f17d51febb0f7ac3a4e2e7"}
+{"author":{"avatar":null,"date":"2015-01-24T23:34:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-24T23:34:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: IO funcs registered, u64/s64 stack arg support","sha":"94b0d9dfd57bd773ee95b794c480f6b43952becc"}
+{"author":{"avatar":null,"date":"2015-01-25T16:23:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-25T16:23:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some warnings fixed","sha":"6d1c9f2764aa732d923ee4c2faefdca724facac5"}
+{"author":{"avatar":null,"date":"2015-01-25T20:18:59Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-01-25T20:18:59Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #977 from Nekotekina/master\n\nARMv7 changes","sha":"9d6dc46812605d5ac7c59ab19b8537d7e1df510c"}
+{"author":{"avatar":null,"date":"2015-01-25T22:38:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-25T22:38:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"psv_object_list_t template concept","sha":"93504762632b7152029d44ba3a9d001b4b480f96"}
+{"author":{"avatar":null,"date":"2015-01-26T06:13:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-26T06:13:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fix","sha":"12c13e619321365c66067cf545dcc143704efd5b"}
+{"author":{"avatar":null,"date":"2015-01-26T12:55:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-26T12:55:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixes","sha":"a7d85480a85b3c632919f6ccee3b3bc4dcfc7dbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-26T14:45:58Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-26T14:45:58Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Implement some portions of taskset policy module","sha":"2e2f92f4f64a7ddea7a020a907cc1dcb9dfb7aba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-26T18:53:00Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-26T18:53:00Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Add Coveralls badge\n\nStart making unit tests now!","sha":"31dcdea27b38eb522987d7dbf2674ad0e46e4bc2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-26T19:01:47Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-26T19:01:47Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"More fixes and fixes to previous fixes","sha":"78a92c7d43158b47f1ab0bd9427330a5f8f9b022"}
+{"author":{"avatar":null,"date":"2015-01-27T00:19:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-27T00:19:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"scePerf stub, sceSysmodule, sema, ef","sha":"81340e9d5c3667b108579a71cfcf264158a641d3"}
+{"author":{"avatar":null,"date":"2015-01-27T01:26:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-27T01:26:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"NIDs fix","sha":"3141cc9bc717a6ca0598ac13b586e1f2d2d05e54"}
+{"author":{"avatar":null,"date":"2015-01-27T01:39:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-27T01:39:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sceCtrl stub","sha":"912e3fc2133ac2af5485b12a86543e2b4dfa3264"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T14:54:59Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T14:54:59Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #976 from tambry/Fixes\n\nVarious fixes and improvements","sha":"095608530fbd6054183057571cbc806f985809bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T15:14:15Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T15:14:15Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Add support for \"test mode\"\n\nSince @devmapal hasn't made a PR for this and this would be probably\nuseful for Coveralls and unit tests I'm making a PR for it myself.\n\nMore info:\n\nhttps://github.com/devmapal/rpcs3/commit/c72f5d40f521b955faec024e6b788aa1e027ccfc","sha":"f15c679fea693368422b2f35897c1b087579506b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T15:34:50Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T15:34:50Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix compiling","sha":"f81b00d4883c05d5f9dad9f1447b5b15a437b419"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T16:48:41Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T16:48:41Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #979 from tambry/CompileFix\n\nFix compiling","sha":"d48617a3e8ab3a9259a2f0dfd657cfcc6f2dbb4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T16:54:28Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T16:54:28Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge remote-tracking branch 'upstream/master' into Things","sha":"0e8ea4f27c13198c5416c64f04c3c2108db04e8c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T17:22:56Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T17:22:56Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Revert RSXIO changes\n\nThis revert fixes many games, while seeming to break none.","sha":"3a51a6ded7be80d0e24052161167218a52e78449"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T19:04:40Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-27T19:04:40Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Experimental DMA implementation, bug fixes\n\nThe experimental DMA implementation is ported from Nucleus.","sha":"e12cfc89deedc7046d3f5756f504a3ef920ab559"}
+{"author":{"avatar":null,"date":"2015-01-27T19:57:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-27T19:57:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: LDRB_IMM, STRB_IMM","sha":"14efde91900ceab0e02bafc44532eeabe0d5eb20"}
+{"author":{"avatar":null,"date":"2015-01-27T22:39:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-27T22:39:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sceDisplay, sceDeci4p stub","sha":"1c4db01e196af6ce0549e6f13b69d4553e7474b3"}
+{"author":{"avatar":null,"date":"2015-01-28T12:59:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-28T12:59:16Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"vm_ptr: function format changed","sha":"579a88b7c43dcc1b005a3eae22a7364125904762"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-28T13:17:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-28T13:17:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Disable DMA writes and add copyright notices","sha":"084106ced6808f3e5be4e7ef9280159152da5e80"}
+{"author":{"avatar":null,"date":"2015-01-28T14:17:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-28T14:17:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sceGxm stub","sha":"e508d6db5dc7b50013844bd8dc44851ee08a478d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-28T18:18:06Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-28T18:18:06Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Document some parts of taskset policy module","sha":"a7728c9067165c23d0e70000a72fefc11a84612a"}
+{"author":{"avatar":null,"date":"2015-01-28T23:57:42Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-28T23:57:42Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #981 from Nekotekina/master\n\nARMv7 progress, some changes in vm_ptr","sha":"1fa301b71964cd3ac2aa582861e3196ad1cf705c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-29T14:50:34Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-29T14:50:34Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Update kernel to use lock line reservations","sha":"62e2d8d9a7b8aaa110673862b80733b4e93b42c7"}
+{"author":{"avatar":null,"date":"2015-01-29T15:48:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-29T15:48:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: stubs for other modules, loader improved","sha":"62c8f2ac342527d75c64c123ead8186e2fafbe1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-29T16:28:39Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-01-29T16:28:39Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix conflicts","sha":"a671c43862cf39a4679ab9373c84af38383318ca"}
+{"author":{"avatar":null,"date":"2015-01-29T17:42:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-29T17:42:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some functions added","sha":"6c40dc0631e83ce819eef6c3305b9221fd8ffae6"}
+{"author":{"avatar":null,"date":"2015-01-29T21:42:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-29T21:42:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some functions added","sha":"74b6d5c2eda6255ce346debb3cdedd54aa65287b"}
+{"author":{"avatar":null,"date":"2015-01-29T23:58:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-29T23:58:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some functions added","sha":"35898a6cdf3d4afcff106342d31876eb305a3264"}
+{"author":{"avatar":null,"date":"2015-01-30T10:48:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-30T10:48:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some functions added","sha":"cd6f95c90d6e09d9ddbd7740f2234d5e3ce92a34"}
+{"author":{"avatar":null,"date":"2015-01-30T12:19:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-30T12:19:01Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some functions added","sha":"6cab4d7100abdd7c7bd41dcb18355cf2c8fb49d1"}
+{"author":{"avatar":null,"date":"2015-01-30T17:19:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-30T17:19:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some functions added","sha":"bdd458d2ae1bbd029eca9a116eb3de5618f2ad99"}
+{"author":{"avatar":null,"date":"2015-01-30T17:41:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-30T17:41:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"2be045593a62f99d029f400033d04f7e88c18c36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-30T19:06:58Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-30T19:06:58Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Update system service workload to use lock line reservations","sha":"507638e6d825baa187015d49fbbe98f1db2bedc8"}
+{"author":{"avatar":null,"date":"2015-01-30T20:01:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-30T20:01:13Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixed TLS for PPU threads","sha":"4ea1b8cffc8a0f9e4c54cb0dcb18f90986d461ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-30T20:02:07Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-30T20:02:07Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Implement some SPU thread functions used by the system service module","sha":"f7b7c234b7d745e41f35ff8cce2350b623875562"}
+{"author":{"avatar":null,"date":"2015-01-30T21:22:30Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-30T21:22:30Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #984 from Nekotekina/master\n\nFunction stubs for PSV","sha":"289ef4c6d4d513f9d0a615aeafd486bec4acebdc"}
+{"author":{"avatar":null,"date":"2015-01-30T21:30:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-30T21:30:46Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugfix","sha":"140a42fbcb16f13a3f27fd7ff1ba4ecb1edd5255"}
+{"author":{"avatar":null,"date":"2015-01-30T21:54:16Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-01-30T21:54:16Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #985 from Nekotekina/master\n\nBugfix for TLS","sha":"29165af76168cbda3f3c937e16de4bf090f3e3c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-30T22:05:03Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-30T22:05:03Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Implement some portions of the taskset PM","sha":"d8bed3b0ced0bc219658ad90148f68e1caa6a5bd"}
+{"author":{"avatar":null,"date":"2015-01-31T13:01:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-31T13:01:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"RSX \"refactoring\" reverted","sha":"384cb5e4153d79896fac17d1ec4a6082227c042e"}
+{"author":{"avatar":null,"date":"2015-01-31T13:44:37Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-01-31T13:44:37Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #986 from Nekotekina/master\n\nRSX \"refactoring\" reverted","sha":"12d1f8202d9ab4154d34d568c7760aac147f505b"}
+{"author":{"avatar":null,"date":"2015-01-31T16:44:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-01-31T16:44:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"TLS for ARMv7 threads","sha":"61a5459ccb48a25e499e1a6a82df64c3ac47e60e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-31T20:46:06Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-01-31T20:46:06Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Implement some portions of taskset pm","sha":"61342946a4a84271a398f3f48bfd1ed60e91f69d"}
+{"author":{"avatar":null,"date":"2015-02-01T07:09:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-01T07:09:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fixes","sha":"8a945a1a52b47b686871978de245b092d7d1a578"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-01T13:45:25Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-01T13:45:25Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix conflicts 2","sha":"899b06d6db7de880a5ac9d61d941507b45d67d01"}
+{"author":{"avatar":null,"date":"2015-02-01T13:52:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-01T13:52:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: argc, argv setting, LDRSB_IMM, bugfixes","sha":"e5dd03dbcb042c93f00a112f4b5e0f661245cd81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-01T20:02:40Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-01T20:02:40Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Implement some portions of taskset policy manager","sha":"ba6ac5019ea6e022d08060c730ae0cc9af1a0c6d"}
+{"author":{"avatar":null,"date":"2015-02-01T21:12:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-01T21:12:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: bugfix, loader improved, scePerf","sha":"dab80497bbbd39141914a4b918732129f52c7ae2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-02T03:32:38Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-02T03:32:38Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Reorder, rename and some cleanup","sha":"2c70f5168a89e081f2bfde4482df94eef2426c7c"}
+{"author":{"avatar":null,"date":"2015-02-02T07:07:07Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-02T07:07:07Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #980 from tambry/Things\n\nTest mode, RSXIO changes reverted and experimental DMA implementation","sha":"c153215d6d30c960ffda6b325b167c83d9b7a808"}
+{"author":{"avatar":null,"date":"2015-02-02T09:14:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-02T09:14:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: ARM encoding introduced; bugfixes","sha":"23c7028b2acf2bc18e657d6613e7ebfd42b6a6eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-02-02T10:21:35Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-02-02T10:27:18Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Fix some small mistakes\n\n* replace_first and replace_all were in the wrong namespace, so they could not be linked\n* replace_all did not work correctly (would loop indefinately)\n* cellGcmUnmapIoAddress did not shif the size, so it would run past the end of the mmap array\n* fsstat did use a 32-bit size on Windows, so files >4 gigs would return \"stat failed\"","sha":"bd65f8107495186d6f0f0a2b0ae585dda666c1c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-02-02T10:33:49Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-02-02T10:33:49Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"re-enable threadlist in GUI\n\nThis used to crash so it was removed. However I think this is a cruicial feature.\nThis is the only way to observe the stack-frames, registers and disasm around the PC\nin a user friendly way.\n\nThe reason this caused crashes was that we got a reference to a std::vector and iterated\nover it in one thread while another thread could modify it (and thereby invalidating the\niterators). The way I \"fixed\" it is to just copy the `std::vector<std::shared_ptr<...>>`\nand iterate over the copy. This obviously has some overhead (locking the shared_ptr\ncounters and incrementing them). It also allows entities other than the Thread manager\nto keep the Thread objects frome being deleted but that should not be a problem.","sha":"13d2f8fa59b477bcfe32dae1e4dba2b014d24ec3"}
+{"author":{"avatar":null,"date":"2015-02-02T11:10:53Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-02T11:10:53Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #987 from Bigpet/minifixes\n\nFix some small mistakes","sha":"4c52b65374f7aec21a3a463c18b48a914f99a69d"}
+{"author":{"avatar":null,"date":"2015-02-02T11:11:20Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-02T11:11:20Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #988 from Bigpet/restore_threadlist\n\nre-enable threadlist in GUI","sha":"fbee6d4017b4d2fcb7ab1c5e9267156cf8e8eb9d"}
+{"author":{"avatar":null,"date":"2015-02-02T11:39:51Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-02T11:39:51Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #989 from Nekotekina/master\n\nVarious improvements","sha":"c267ca2584ffa2b46b217e9f3ecee3ca00005399"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-02T20:43:32Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-02T20:43:32Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Fix some issues","sha":"67342781b7a91ac4d0737279c6e6d1ea565b3c7b"}
+{"author":{"avatar":null,"date":"2015-02-02T21:00:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-02T21:00:05Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: branch instrs fixed, new instructions\n\nBIC_IMM, BIC_REG, RSB_IMM, LDR_LIT, STRB_REG, STRH_REG\nFixed initial stack size","sha":"5225ca8fc2154c506cb91bdfdb56cf38087fdef2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-02-02T21:38:05Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-02-02T21:38:47Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"fix #elif with no condition","sha":"8ce1de036adeefe5874731be57b2a7ce48e74179"}
+{"author":{"avatar":null,"date":"2015-02-02T22:18:49Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-02T22:18:49Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #990 from Bigpet/minifixes\n\nfix #elif with no condition","sha":"32fd9223ff9bb842e7008ecb8ac351f86047ae3f"}
+{"author":{"avatar":null,"date":"2015-02-02T22:20:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-02T22:20:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"60f6566c784496878f457d1206e6549dc13e5da5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-03T05:33:49Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-03T05:33:49Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Fix more issues","sha":"0191955ab67d178f6b27526853a63ed800b049d9"}
+{"author":{"avatar":null,"date":"2015-02-03T14:48:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-03T14:48:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: new instructions, bugfix\n\nLDRD_LIT, LDRH_IMM, LDRH_LIT, LSR_IMM, ORR_IMM, STRD_IMM, STRD_REG,\nUMULL","sha":"2494fcf8d842d0e69d49361f859854f1ace641c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-03T17:42:26Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-03T17:42:26Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge remote-tracking branch 'upstream/master' into spurs_taskset\n\nConflicts:\n\trpcs3/emucore.vcxproj.filters","sha":"d1a7c85e95f928d7ef5d584a3d51e850ba51400e"}
+{"author":{"avatar":null,"date":"2015-02-03T21:34:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-03T21:34:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: new instructions, bugfix\n\nADC_IMM, ADR, AND_IMM, EOR_REG, LDRB_REG","sha":"d5bbea097badf32a2c3dcc002dd22b39f6055364"}
+{"author":{"avatar":null,"date":"2015-02-04T12:16:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-04T12:16:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"TTY output improved; ARMv7: new instructions\n\nADC_REG, MVN_REG, ORR_REG, ROR_IMM, ROR_REG, TST_IMM, armv7_fmt improved","sha":"e3f55a75a32cabfe7814fcc4c4cedc7be8cb15c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-04T15:29:34Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-04T15:29:34Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Fixed more issues","sha":"daaa5059e9da18efeabd2e94e71159786f735092"}
+{"author":{"avatar":null,"date":"2015-02-04T23:52:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-04T23:52:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: partial disasm functionality, bugfix","sha":"819c955cca888368546f195d11aff3d4c2c5d026"}
+{"author":{"avatar":null,"date":"2015-02-05T12:18:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-05T12:18:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: bugfix, some disasm subroutines","sha":"e93aaf395770eec4ecb09efb932f764dda1700f2"}
+{"author":{"avatar":null,"date":"2015-02-05T18:13:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-05T18:13:27Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: new instructions\n\nEOR_IMM, LDM, REV, STM","sha":"5983813d12d3630344ba24f9170989fcdf1fa051"}
+{"author":{"avatar":null,"date":"2015-02-06T00:23:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-06T00:23:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some drafts","sha":"c1c586a072a0180430949d6c16a052f80e8a53d5"}
+{"author":{"avatar":null,"date":"2015-02-06T23:39:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-06T23:39:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"New reservations (not finished)","sha":"1af4848324fa887ba4e58ea56cbaad3eddbfcb7c"}
+{"author":{"avatar":null,"date":"2015-02-07T13:46:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-07T13:46:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Reservations improved","sha":"39db6bb4615d03a704aa283c9077d69da0639a6d"}
+{"author":{"avatar":null,"date":"2015-02-07T13:59:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-07T13:59:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"c71c5eb422d3ae4ac24e49e39da6e080bc615086"}
+{"author":{"avatar":null,"date":"2015-02-07T14:12:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-07T14:12:39Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fix 1","sha":"c9f994d92d9ba4253231dbaed0f8411b6bde4884"}
+{"author":{"avatar":null,"date":"2015-02-07T14:13:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-07T14:13:32Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fix 2","sha":"6aef58318c18ce660ff6429584d04b2b0518f39f"}
+{"author":{"avatar":null,"date":"2015-02-07T15:35:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-07T15:35:54Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Linux fix","sha":"e70875ad5cc1b9ffa69a44ce23f562c981447284"}
+{"author":{"avatar":null,"date":"2015-02-07T20:06:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-07T20:06:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"90c021fc310ecd4d6290eaacd20e6ebc27cabcef"}
+{"author":{"avatar":null,"date":"2015-02-07T20:21:51Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-07T20:21:51Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #992 from Nekotekina/master\n\nReservations reimplemented","sha":"71292a7617bb51e84e2a5a68a919aa0308e0ec64"}
+{"author":{"avatar":null,"date":"2015-02-07T22:09:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-07T22:09:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugfix","sha":"fcbbdc87fc91aa4c471cf4ebfa813972f96059c6"}
+{"author":{"avatar":null,"date":"2015-02-07T22:20:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-07T22:20:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #993 from Nekotekina/master\n\nBugfix","sha":"9d9a7cf370ac77c1de100ed9f37ce8a695c7cbdc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2015-02-08T11:37:10Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2015-02-08T11:37:10Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"Improve sceNpTrophy","sha":"bddff3b70aebcbe0d18845be30da403464422a07"}
+{"author":{"avatar":null,"date":"2015-02-08T13:12:22Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-08T13:12:22Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #995 from darkf/trophy\n\nImprove sceNpTrophy","sha":"3080fb2806e80363a52c55e95de990a9cddabd1d"}
+{"author":{"avatar":null,"date":"2015-02-08T13:38:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-08T13:38:08Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugfix, ECIWX/ECOWX disabled","sha":"19acaf3f86fc875c2006878bd32ea27704974ebf"}
+{"author":{"avatar":null,"date":"2015-02-08T15:25:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-08T15:25:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Reservations improved","sha":"31bbf56ff1f33ab0e1fa8214cbea9e31ff2db703"}
+{"author":{"avatar":null,"date":"2015-02-08T20:08:09Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-08T20:08:09Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #996 from Nekotekina/master\n\nReservations improved","sha":"4ba915bbdd36b6d36efa0f310adf7694ec134d85"}
+{"author":{"avatar":null,"date":"2015-02-08T22:44:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-08T22:44:55Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"NV3089_IMAGE_IN_SIZE","sha":"4e28a007c8266a9858d01491c240dc255cc1a2bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-09T13:06:46Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-09T13:06:46Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Various improvements","sha":"cd8bcd4c02e17bba3d42e1e46d27f207260f0c76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-09T13:22:04Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-09T13:22:04Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fixed conflicts","sha":"dfb2598e417e741e8a96915aaa4c35ebd0a14753"}
+{"author":{"avatar":null,"date":"2015-02-10T12:51:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-10T12:51:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"NV3089_IMAGE_IN_SIZE","sha":"e642e393246c4202ab06ab9bd785cff8773fb951"}
+{"author":{"avatar":null,"date":"2015-02-10T13:20:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-10T13:20:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"c0a1dab09d3279f768fb4c217076f4cb3ac8e4ea"}
+{"author":{"avatar":null,"date":"2015-02-10T13:37:07Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-10T13:37:07Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #998 from Nekotekina/master\n\nNV3089_IMAGE_IN_SIZE rewritten","sha":"73d63c508aabd40b1f36e41e8378ae21f74279f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-10T15:43:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-10T15:43:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge remote-tracking branch 'upstream/master' into Improvements2","sha":"43a95d709d4e802bdf1633306d5b412e19dd783b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-02-10T23:44:22Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-02-10T23:44:22Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Add librt to the list of linked libraries\n\nThis is needed by `shm_unlink` and similar functions. Fixes #997","sha":"068883a441129e9465204798cb3459f138f076b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/34521?v=4","date":"2015-02-11T04:17:39Z","email":"robxu9@gmail.com","login":"robxu9","name":"Robert Xu"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/34521?v=4","date":"2015-02-11T04:17:39Z","email":"robxu9@gmail.com","login":"robxu9","name":"Robert Xu"},"msg":"Fix building on OS X 10.10","sha":"00e637645c629ee67f369d24243d7be245a72dfb"}
+{"author":{"avatar":null,"date":"2015-02-11T07:21:21Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-11T07:21:21Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #999 from Bigpet/master\n\nAdd librt to the list of linked libraries","sha":"47af5c1b5cbfab15724234c64237846b9b8758fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-11T09:30:46Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-11T09:30:46Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge remote-tracking branch 'upstream/master' into spurs_taskset","sha":"853234f7d716e10dfd727937fc3997f9ae89e138"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-11T10:15:43Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-11T10:15:43Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Disable the SPURS kernel","sha":"d675c67f798acf696818782aa181b2b8abb1ad20"}
+{"author":{"avatar":null,"date":"2015-02-11T11:06:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-11T11:06:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1001 from gopalsr83/spurs_taskset\n\nSPURS Taskset","sha":"2032b15acfb16f064bdd335ebd6918cfa4e288e1"}
+{"author":{"avatar":null,"date":"2015-02-11T11:39:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-11T11:39:51Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugfix","sha":"fdc5fa34beb6f13a2c8ffec413a4674842484c9f"}
+{"author":{"avatar":null,"date":"2015-02-11T12:03:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-11T12:03:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"43408998334899eb6a664223e39ca5d45c5a9c10"}
+{"author":{"avatar":null,"date":"2015-02-11T12:22:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-11T12:22:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 2","sha":"3e26971044a1920917e6d0bd98962ee8dc9fb1f3"}
+{"author":{"avatar":null,"date":"2015-02-11T12:25:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-11T12:25:20Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix 3","sha":"250fb15592fa3bd0e7559b98286c3426db015efe"}
+{"author":{"avatar":null,"date":"2015-02-11T12:58:26Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-11T12:58:26Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1002 from Nekotekina/master\n\nCompilation fix","sha":"7624c89d1265d9ae25e41b3d8eeeb584a63fee9c"}
+{"author":{"avatar":null,"date":"2015-02-11T13:05:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-11T13:05:50Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"5c08bd6a7359fca404f28ef5a09d7cc6759265e5"}
+{"author":{"avatar":null,"date":"2015-02-11T13:37:21Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-11T13:37:21Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1003 from Nekotekina/master\n\nCompilation fix","sha":"982e536ad2ce70fff20b6b421bb8763ce4687d7e"}
+{"author":{"avatar":null,"date":"2015-02-11T20:11:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-11T20:11:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"SPURS fix, PPU threads are deleted at exit/join","sha":"42f961816c3cbcae8ea9db34e90dfa639e4f877a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-11T21:09:48Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-11T21:09:48Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Big improvements to cellCamera and cellGem","sha":"cc6ba726eb69be8fc73aad7dbc539c8bd13e34fb"}
+{"author":{"avatar":null,"date":"2015-02-11T21:26:56Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-11T21:26:56Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1004 from Nekotekina/master\n\nSPURS fix, PPU threads are deleted at exit/join","sha":"5e73d68e4a09e0b322a7e71f31c73474f022a551"}
+{"author":{"avatar":null,"date":"2015-02-11T21:27:03Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-11T21:27:03Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1005 from tambry/Improvements2\n\nImprovements to cellCamera, cellGem and other minor things","sha":"35e04bdbe30966c7e7c04de3fdaa2b157c1c30cc"}
+{"author":{"avatar":null,"date":"2015-02-12T08:44:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-12T08:44:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"5986448d67cc0e7cc761ed35123bfeb761e7e1ce"}
+{"author":{"avatar":null,"date":"2015-02-12T08:56:43Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-12T08:56:43Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1006 from Nekotekina/master\n\nSmall fix","sha":"4d5bdf1419446bcf84c33afe828b93b8529b6102"}
+{"author":{"avatar":null,"date":"2015-02-12T20:10:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-12T20:10:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Memory cleanup: u64 -> u32, empty TLS fixed\n\ncellGameContentPermit fixed","sha":"0eebfb0aaaad4ae3fefe26f251b1975dc78ba21c"}
+{"author":{"avatar":null,"date":"2015-02-13T14:04:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-13T14:04:03Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Memory cleanup, page flags implemented\n\nRSXCMDMem, SPRXMem, MmaperMem removed\nMainMem range fixed","sha":"267de68441b4cbe355b77d4e2c30b3011efedd77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-13T14:44:26Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-13T14:44:26Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Small formatting changes","sha":"8ce3943e09c03fd0d823c61039d09f9164b09403"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-13T14:47:08Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-13T14:47:08Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge remote-tracking branch 'upstream/master' into Improvements","sha":"7b249790f51de5ca41ea921c36bac22b600afbf5"}
+{"author":{"avatar":null,"date":"2015-02-13T15:26:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-13T15:26:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"ba83767706c146dfdb5b0ff0e4dff6645eb09100"}
+{"author":{"avatar":null,"date":"2015-02-13T15:55:08Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-02-13T15:55:08Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1008 from robxu9/master\n\nFix building on OS X 10.10","sha":"fcd300ad4d552de0e4194971f8d1189c33b1f70e"}
+{"author":{"avatar":null,"date":"2015-02-13T20:15:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-13T20:15:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"5fc77fe89ea91f8f67eafc07cde16a16d487ec1a"}
+{"author":{"avatar":null,"date":"2015-02-13T20:24:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-13T20:24:18Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"0d489518abaf69254de268ec4e9a2e864da4c2b0"}
+{"author":{"avatar":null,"date":"2015-02-13T21:45:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-13T21:45:36Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some cleanup","sha":"f01059283a54c18b904251ad97ee368f1b90c0d1"}
+{"author":{"avatar":null,"date":"2015-02-13T22:48:28Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-13T22:48:28Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1009 from Nekotekina/master\n\nMemory cleanup","sha":"bf1e29e22706c55d8247b7a8afb2939ebde004d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-14T07:16:48Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-14T07:16:48Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"cellCamera ifs now switches","sha":"2df18c91e9940fd171564c989208652cdebaad02"}
+{"author":{"avatar":null,"date":"2015-02-15T12:31:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-15T12:31:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"decode_x64_reg_op improved","sha":"6909a1540028d1b594038db1f3e0cdf8dd81953b"}
+{"author":{"avatar":null,"date":"2015-02-15T17:13:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-15T17:13:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some cleanup","sha":"1189503b4d0f6240082c3892222aa44f13d5ffb4"}
+{"author":{"avatar":null,"date":"2015-02-16T01:53:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-16T01:53:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Memory (unfinished)","sha":"e6c628caba8e29b1b772c859fcad5182f2163524"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-16T17:19:17Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-16T17:19:17Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"PPUJIT: Support exception based MMIO and reservations","sha":"e7f278b5d2e479a164ed139e5671454160cdd9ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-16T17:30:41Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-16T17:30:41Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"PPUJIT: Fix unit tests","sha":"3a2b13c02b39d49439c21924a0299b9430c15992"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-16T17:37:22Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-16T17:37:22Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"PPUJIT: Fix EOL issues","sha":"1365c830b232f98fcc21db87291e7dcc2379725f"}
+{"author":{"avatar":null,"date":"2015-02-17T00:08:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-17T00:08:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Reservations improved","sha":"20dce26b1d91352b2154fadd1917179604b0a1c8"}
+{"author":{"avatar":null,"date":"2015-02-17T00:40:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-17T00:40:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"bddad4d76683270fde88e5f189776caef33f9ebc"}
+{"author":{"avatar":null,"date":"2015-02-17T02:01:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-17T02:01:47Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"STOS support (for memset)","sha":"3f3873ceb5bd7ab3e1af0d53b12b3398d5577173"}
+{"author":{"avatar":null,"date":"2015-02-17T15:27:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-17T15:27:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Loader fixed","sha":"1f2eafc4f255c3adb656f9e0dc7c4218e205c449"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-18T09:39:56Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-18T09:39:56Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Update GLEXT.h to revision 29735","sha":"714ff6c32ecc3620698906df0edd4ff59eaaca0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-02-18T14:59:26Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-02-18T14:59:26Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Only link to librt on Linux\n\nThe library is not needed on OSX and does not seem to exists there","sha":"518c028a3db3794006adceec9415aca6d3c358ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-02-18T15:56:46Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-02-18T15:56:46Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"sys_ppu_thread_create: minimum stack size and stack allocation unit applied.","sha":"73d9b58dfc3d94cc70c2c5263122318b2a975110"}
+{"author":{"avatar":null,"date":"2015-02-18T16:22:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-18T16:22:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Loader improved, ModuleManager refactored","sha":"af986d8f4cd14c903bc7c677c7083d27d274f520"}
+{"author":{"avatar":null,"date":"2015-02-18T16:28:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-18T16:28:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"1589b7269952956f85e59c72a60c2bd676281bb8"}
+{"author":{"avatar":null,"date":"2015-02-18T16:37:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-18T16:37:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"91c9fd3c3cb64d38de56a755d2e9c240a5d20c90"}
+{"author":{"avatar":null,"date":"2015-02-18T17:36:02Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-02-18T17:36:02Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1012 from Nekotekina/master\n\nReservations, memory system, module manager improved","sha":"cae85c6247cbbe6bebc996c053bbbd7d5d5393df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-02-18T17:44:07Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-02-18T17:44:07Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"sys_ppu_thread_create: Add warning when allocated more stack size than required.","sha":"ffb0454424bd1a8179459d924cf6b93ac67f5800"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-18T18:10:04Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-18T18:10:04Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"PPUJIT: Support stopping/pausing threads (does not always work)","sha":"681fb1eeaaaca8ec0795f763410649c9aa734bfd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-18T18:13:37Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-18T18:13:37Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge remote-tracking branch 'upstream/master'","sha":"85648da70657f0ceb5f78107313e0da974bbffda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-02-18T18:30:04Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-02-18T18:30:04Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Add iconv to linked libs on non-linux UNIX\n\nof course the correct solution would be to actually search for the symbols\nbut that seems like a lot of efford just for the sake of doing it right.\nThis should probably suffice for all relevant platforms for now.","sha":"a404f2e6fa6a9820c1c51241daf489406a7622e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-18T19:07:09Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-18T19:07:09Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"PPUJIT: Convert tabs to spaces","sha":"4272ec7a8204c11120337f8d614eff1666ec4f03"}
+{"author":{"avatar":null,"date":"2015-02-18T19:55:25Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-18T19:55:25Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1015 from gopalsr83/master\n\nMiscellaneous fixes and improvements to the PPU LLVM JIT","sha":"1003c4231096f76a60dcf8ec6cb456ea534f1797"}
+{"author":{"avatar":null,"date":"2015-02-18T21:23:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-18T21:23:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"ARMv7: loader fixed","sha":"d177b1adea075123f9f8e8c2d5435689433d3265"}
+{"author":{"avatar":null,"date":"2015-02-18T22:54:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-18T22:54:31Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"PRX_DEBUG removed","sha":"e84fc6426cad7c273e03f5f27c5102fbf142fa40"}
+{"author":{"avatar":null,"date":"2015-02-19T11:18:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-19T11:18:28Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"2d1d996c508d79b0f5ddffe3b6e99910997b5658"}
+{"author":{"avatar":null,"date":"2015-02-19T13:47:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-19T13:47:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Loader fix","sha":"fed1418c0eb921a0f6f7359c6bb468aba3f31bcb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-19T15:09:17Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-19T15:09:17Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1016 from Nekotekina/master\n\nCleanup","sha":"872e41825e3163ecd339761de0d601006bdbf6f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-19T15:10:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-19T15:10:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Minor formatting in GLProgram","sha":"39cf9359291b3497735db1ae7b2d7c94170aabfd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-19T15:15:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-19T15:15:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge upstream","sha":"4ad91a6fa8e30dabf84d7fb71564d781a9f105b4"}
+{"author":{"avatar":null,"date":"2015-02-19T17:15:56Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-02-19T17:15:56Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1011 from Bigpet/master\n\nOnly link to librt on Linux","sha":"fe376abe6c8a7fe1f72315c0b132b65775a03fb8"}
+{"author":{"avatar":null,"date":"2015-02-19T17:16:36Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-02-19T17:16:36Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1017 from tambry/Improvements\n\ncellCamera fix and update GLEXT.h","sha":"c1786df2a6ceb4110212367b9d7ce2e7d92e7697"}
+{"author":{"avatar":null,"date":"2015-02-19T19:17:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-19T19:17:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"libmixer fix","sha":"152feb898e8e58bbfb582485d6c08189c70313d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-19T18:24:57Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-19T19:45:33Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Fix some issues","sha":"796d96f06bcdd5831d6cf92395495fb3008a497c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-19T20:23:05Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-19T20:23:05Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: More fixes","sha":"68978a010949b368166249af730faddce2eeb5df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-19T20:27:46Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-19T20:27:46Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"Merge upstream","sha":"1356a17e849690a8c23e6e72db78ea62f7d96cf2"}
+{"author":{"avatar":null,"date":"2015-02-19T20:38:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-19T20:38:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"get_x64_reg_value fix","sha":"f9eb3f84766374261509dce2568a97d5f9cec133"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-19T20:46:25Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-19T20:46:25Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"msg":"SPURS: Disable kernel","sha":"26d3bfe9c2c5d447b17e78b5360f609c85921612"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-19T20:56:57Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-19T20:56:57Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement cellSaveDataListAutoLoad, fix textureProj","sha":"4b516273f68a74f01850a6839ffff5c6c7ae86ac"}
+{"author":{"avatar":null,"date":"2015-02-19T22:16:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-19T22:16:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1018 from gopalsr83/master\n\nFixed some issues in cellSpurs","sha":"d18b91e82813b25e023da0cca5da738e1ed5b25b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-20T10:58:30Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-20T10:58:30Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1013 from Syphurith/PPU-Thread-Stacksize\n\nAbout ppu thread stacksize","sha":"67c02274cb9f9b8d428959ee7e6577f5b6e24b36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-20T10:59:31Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-20T10:59:31Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge remote-tracking branch 'upstream/master' into Things","sha":"948758f7581787b4feebaea13eb2e35147775169"}
+{"author":{"avatar":null,"date":"2015-02-20T11:38:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-20T11:38:57Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"7ab1e64aab0cd3f0233b5f3f5a35b71ae7c3f318"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-20T13:55:00Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-20T13:55:00Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix stacksize","sha":"e2d2c9d377d216834c7d3d3d07136eb073fdc383"}
+{"author":{"avatar":null,"date":"2015-02-20T13:58:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-20T13:58:40Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"HLE function binding for PPU/ARMv7 simplified","sha":"655acc746d81418b66fce0cb576354799be9618b"}
+{"author":{"avatar":null,"date":"2015-02-20T14:04:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-20T14:04:11Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"fdad4019e5cfaa6216f40e2e8de1c2b97b6ab1e3"}
+{"author":{"avatar":null,"date":"2015-02-20T14:27:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-20T14:27:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"8cd00287cdf59f73931b4096d7bf95f6b5c6ecd4"}
+{"author":{"avatar":null,"date":"2015-02-20T14:42:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-20T14:42:41Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"8d13aa3f2ee874010e81eeea86c96a29e5902421"}
+{"author":{"avatar":null,"date":"2015-02-20T17:58:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-20T17:58:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"69a3db491c3eb068c6fa751149f928a7ae1d2240"}
+{"author":{"avatar":null,"date":"2015-02-20T18:00:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-20T18:00:53Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"0c1bfefbc85cf5a3f3be80ad01b5dbe66b036d46"}
+{"author":{"avatar":null,"date":"2015-02-20T18:05:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-20T18:05:45Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix_","sha":"0bb15b2ff72830baa419013f65857290cd46cf2f"}
+{"author":{"avatar":null,"date":"2015-02-20T18:11:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-20T18:11:21Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"a4a25dc28d99af96ab4d7e3d8b0f1efcc550ce19"}
+{"author":{"avatar":null,"date":"2015-02-20T18:14:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-20T18:14:34Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix (sc)","sha":"cd2eb59da667be6f898c1ebe53509f5e437ce5fb"}
+{"author":{"avatar":null,"date":"2015-02-20T19:45:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-20T19:45:00Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Test","sha":"303a9de04524745bf9bd0ae7557d96532ca15864"}
+{"author":{"avatar":null,"date":"2015-02-20T21:21:52Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-20T21:21:52Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some names fixed","sha":"e6b2be2bc9b70461acc1c9e5346a6e711de3fcdd"}
+{"author":{"avatar":null,"date":"2015-02-21T10:37:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-21T10:37:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Partial fix","sha":"18954ee5b8f1228bc60430a247117da622d55de2"}
+{"author":{"avatar":null,"date":"2015-02-21T11:30:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-21T11:30:26Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Fix","sha":"faaef03604a58a13e5ac22f8e9bfb481fea4bb65"}
+{"author":{"avatar":null,"date":"2015-02-21T12:03:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-21T12:03:37Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Some code moved","sha":"6b4b86434de8115576875afb5c31b97aa0e7bf8e"}
+{"author":{"avatar":null,"date":"2015-02-21T13:05:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-21T13:05:35Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_net fixed","sha":"a18274356159198e11cf73ecf880b9319774b201"}
+{"author":{"avatar":null,"date":"2015-02-21T14:07:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-21T14:07:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"StaticFuncManager removed","sha":"9ee9523680fbf15d32d703ebfe453a748a99e84e"}
+{"author":{"avatar":null,"date":"2015-02-21T14:35:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-21T14:35:23Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"55b348f4fcd96a6a89d985adc1b6ef9ade03eacb"}
+{"author":{"avatar":null,"date":"2015-02-21T16:06:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-02-21T16:06:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1019 from Nekotekina/master\n\nSome cleanup, HLE calls simplified","sha":"bdad5ef745e3b4bf993cc8e8e4c7b4cbf93a97b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-22T08:50:26Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-22T08:50:26Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Stub some modules","sha":"f9497e35e4ddf505704b5086297d8ce1b6bff46a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-22T08:58:18Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-22T08:58:18Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge upstream","sha":"e7d0aedfb4bd2a4fbc05f9d4b383fbea646032dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-22T11:38:14Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-22T11:38:14Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"More stubs","sha":"c13ebc86920c58217eba1141cf9f9f06177596f6"}
+{"author":{"avatar":null,"date":"2015-02-22T13:43:41Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-02-22T13:43:41Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1020 from tambry/Things\n\nImprovements and fixes","sha":"3a9cc0ab63a102ae53e08f3e0109251412820507"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-02-22T14:47:12Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-02-22T14:47:12Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Implemented binary fragment program disassembler","sha":"e84f356a29b3d232c7b0c59a4771ea83ab31de98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-22T14:50:11Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-22T14:50:11Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Improvements in cellSearch, cellUsbd and cellRudp","sha":"46e7207e939f1f620f10699b8012ca7827d0c288"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-22T14:52:20Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-22T14:52:20Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix m_inited","sha":"31b91c10ec60bcfd3d75eb1372b581ee1dc5bce9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-22T15:36:22Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-22T15:36:22Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix compiling","sha":"ef3a0119192757c01cd2ea8caf79fc32e0063003"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-02-22T15:47:44Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-02-22T15:47:44Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Oops","sha":"8d383ea15c818356207ad0191fde2ef3d8f2ea32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-02-22T16:06:42Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-02-22T16:06:42Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Conflicts fixed","sha":"4d27198ad764c7d3c3299e752b51bef52ad76b5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-02-22T18:53:26Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-02-22T18:53:26Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Used fmt::Format instead of sprintf","sha":"deebe3ca1fb4fc9d816010946ecd16f8e4b907e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-02-23T07:24:23Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-02-23T07:24:23Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1022 from O1L/master\n\nShaders disassembly tool","sha":"881dafcdff6b0243cef1689a8200c984d8a30ee1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-02-23T12:22:30Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-02-23T12:22:30Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Implemented binary vertex program disassembler","sha":"99ea666bf2eed0deb20848df86be5f73bbfca643"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-23T15:09:52Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-02-23T15:09:52Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix be_ts and fix loading in some modules","sha":"e6a47bfa89d3c71553696946862af092be3c8f1e"}
+{"author":{"avatar":null,"date":"2015-02-23T16:58:21Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-02-23T16:58:21Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1023 from O1L/master\n\nImplemented binary vertex program disassembler","sha":"5416782392d46c60b4f553bff5bb5cfa5fbed511"}
+{"author":{"avatar":null,"date":"2015-02-23T18:54:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-23T18:54:17Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Flags for HLE functions","sha":"07cb56e1ea26d9e5957e78e73a9be89e75c87155"}
+{"author":{"avatar":null,"date":"2015-02-24T11:06:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-24T11:06:24Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"1e28611435f78ae7e5a694f2b5da8471a614f58a"}
+{"author":{"avatar":null,"date":"2015-02-24T14:04:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-24T14:04:25Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"RTOC saving fixed","sha":"a8688bff855e2573a19bf9fc1710acd2e4344f33"}
+{"author":{"avatar":null,"date":"2015-02-24T16:38:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-24T16:38:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Size of injected code decreased","sha":"991fd015dee8b9a07666249e9f688e2e77f597b6"}
+{"author":{"avatar":null,"date":"2015-02-24T17:00:07Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-02-24T17:00:07Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1021 from tambry/Things\n\nImprovements in cellSearch, cellUsbd and cellRudp","sha":"dc90ab3cee645023ad3ed2ef9e60ab45da26375a"}
+{"author":{"avatar":null,"date":"2015-02-25T10:28:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-25T10:28:43Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Import fix","sha":"0e33636aaf9c5e3a09c617ec9088d734e0c88108"}
+{"author":{"avatar":null,"date":"2015-02-25T11:24:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-25T11:24:30Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"LLE logging","sha":"432f0c36307f06e2f6a8527d5bb5ebbb3fdc62eb"}
+{"author":{"avatar":null,"date":"2015-02-25T11:48:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-25T11:48:12Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Logging fixed","sha":"0b21474b79b45614956861cec25c7de6aa3a26fb"}
+{"author":{"avatar":null,"date":"2015-02-25T12:08:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-25T12:08:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Result logging restored","sha":"9afdb429fa79483ad5a9960f5a646f4f876d93be"}
+{"author":{"avatar":null,"date":"2015-02-25T12:26:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-25T12:26:22Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Small fix","sha":"99c5366f50571156cafef0e5989e871b399e8e71"}
+{"author":{"avatar":null,"date":"2015-02-25T17:25:01Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-02-25T17:25:01Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1024 from Nekotekina/master\n\nHLE binding improvements","sha":"9b2907dc6433b99b1b9513e0da49b7b639f427aa"}
+{"author":{"avatar":null,"date":"2015-02-26T00:54:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-26T00:54:49Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"PPCThread removed (it does nothing anyway)","sha":"be4e85f0f25d88c7c9fa3a569d63ff8e7b6046c8"}
+{"author":{"avatar":null,"date":"2015-02-26T18:26:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-26T18:26:44Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Insignificant changes","sha":"88476fe698748a3c1d250d5d10b839abb2efb79e"}
+{"author":{"avatar":null,"date":"2015-02-26T20:08:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-26T20:08:48Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_libc.cpp with memcpy","sha":"ae21783680e437d5ff5ed4b1798942d16d3865bd"}
+{"author":{"avatar":null,"date":"2015-02-26T23:17:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-26T23:17:33Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Improved readability","sha":"233f2e478a157c2a0156366d5ac5c499a102b391"}
+{"author":{"avatar":null,"date":"2015-02-27T18:11:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-27T18:11:07Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Success log level fixed","sha":"d62e95d0f84e288149d289a89cc800d939d22a6c"}
+{"author":{"avatar":null,"date":"2015-02-27T18:57:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-27T18:57:10Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Readability improved","sha":"e4bfe817120198121c9f9ddf342a98e3bf64ce86"}
+{"author":{"avatar":null,"date":"2015-02-28T12:37:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-28T12:37:06Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Unused code removed","sha":"6cbdeb9411e6cd5445fd94f2a89bb8171714fe46"}
+{"author":{"avatar":null,"date":"2015-02-28T12:49:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-28T12:49:09Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugfix","sha":"316bd8d1550725eb471b5f35fbad7c28f1a85f8c"}
+{"author":{"avatar":null,"date":"2015-02-28T14:41:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-28T14:41:15Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"sys_process_get_paramsfo implemented","sha":"942d984dc57109e5fc5592c3e25983619769c5ca"}
+{"author":{"avatar":null,"date":"2015-02-28T14:51:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-28T14:51:42Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Compilation fix","sha":"d76e801c47b61f53f43406940366d058e954b0a8"}
+{"author":{"avatar":null,"date":"2015-02-28T15:00:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"committer":{"avatar":null,"date":"2015-02-28T15:00:38Z","email":"fbx@3mf.ru","login":null,"name":"Nekotekina"},"msg":"Bugfix","sha":"c054d8e7dc267ba0a8deeaeb69a5499e7bd7a795"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-02-28T16:38:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-02-28T16:38:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"72dcbefff4839a58e3b89f172eea695634465133"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-02-28T18:47:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-02-28T18:47:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Imports fixed","sha":"eaf3787ae650417bce2cf022128f8b73167a71a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-02-28T19:37:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-02-28T19:37:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Possibly fix for OSX","sha":"619b8e473f10af71d32dc33539aab3f6004b2b89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-03-01T07:57:25Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-03-01T07:57:25Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1025 from Nekotekina/master\n\nVarious fixes","sha":"31bf130b1c7acf78ef334a2bdb0550971e6d2821"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-02T02:10:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-02T02:10:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"nyu","sha":"bc94d92cbab29d92389789c11cbdc2ed9557a3b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-02T21:09:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-02T21:09:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU refactoring","sha":"5f8cf18a5ade928ef146814057060225c72e9bf9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-02T23:34:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-02T23:34:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"8587ae5883dddd7e97df02529333592e96935887"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-03T20:09:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-03T20:09:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Some bicycle for PSV","sha":"78c37ff8b6030fb2ca27e05679ad6d205c9be5ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-04T04:42:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-04T04:42:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"event_queue_t, event_port_t rewritten","sha":"ad38e9f0fefcfa8c9bffac7da722f86614678f45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-04T11:38:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-04T11:38:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"30fe3dc6f504114af3e0456b2b90852dfa7bc07c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-04T21:51:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-04T21:51:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU syscall improvements","sha":"9e49a33b3c2027715eb7b323e909976b3d0f3137"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-04T23:34:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-04T23:34:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix\n\n+sys_spu_thread_group_disconnect_event_all_threads","sha":"f22001d52709e50088520eeb25d0531b8f3f2e15"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-05T00:01:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-05T00:01:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix","sha":"a2293d94f65705ea016527190f202c2b2e72494a"}
+{"author":{"avatar":null,"date":"2015-03-05T00:36:20Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-03-05T00:36:20Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1027 from Nekotekina/master\n\nEvent and SPU refactoring","sha":"8c046429cce9f4a9b9c0928f35b61b55e9ec8cf8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-05T13:18:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-05T13:18:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix, sys_spu_thread_group_connect_event implemented","sha":"5d768bd3cf034421108c43d6bb1375774247ca75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-05T21:29:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-05T21:29:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Event Flag refactoring, bugfixes","sha":"e2a2709ad02131a23ddea99ea936fb1c002bd7c4"}
+{"author":{"avatar":null,"date":"2015-03-05T22:01:07Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-03-05T22:01:07Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1029 from Nekotekina/master\n\nEvent Flag rewritten, bugfixes","sha":"48c1f0f03d375e049f559ccb8b9eef292b62f7c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-06T22:10:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-06T22:10:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Lv2 Cond/Mutex rewritten, bugfixes","sha":"ef65299dff61cce3cfd33288692cb26ef4eb61a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-06T22:24:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-06T22:24:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"428e51b61920122178ec76c383c71b3cda60cefa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-06T22:58:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-06T22:58:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"d234493b4aaf2fe091ed52712d706749716e821d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-07T00:37:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-07T00:37:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_spu_thread_group_terminate fixed","sha":"476b9020ce4ffd2921fed3fc80585600277da1f3"}
+{"author":{"avatar":null,"date":"2015-03-07T04:28:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-03-07T04:28:12Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1030 from Nekotekina/master\n\nlv2 cond/mutex, Id Manager fix","sha":"9d8e8028a68de18995a11183f12b1c10c3d7e822"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-07T13:39:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-07T13:39:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor cleanup","sha":"961fc272156890f66ca5cbfe235ebc1fea27bdc7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-07T16:03:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-07T16:03:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"More cleanup","sha":"4a6ef91eb31c96f3dcc4d8c33d158f924b0c98fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-07T17:39:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-07T17:39:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Video freezing fixed","sha":"cf335a5dc4bf13bad4d739c2b558ee3d33d7749a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-07T21:20:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-07T21:20:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Attempt to fix bug","sha":"1d2351bf853175e18990d8ddfd086f247b934f2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-08T02:32:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-08T02:32:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Lv2 Rwlock rewritten","sha":"dba249554d6d570879a2f407df3f5df1a9b8551e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-08T03:37:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-08T03:37:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Lv2 Semaphore rewritten","sha":"0f233beff91330d1895d454a203307632ede5de4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-03-08T13:00:54Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-03-08T13:00:54Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1032 from Nekotekina/master\n\nlv2 sema/rwlock, bugfox, cleanup","sha":"e5de176b162b70abfd72399d48e026d0ab64db6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-08T15:25:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-08T15:25:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Lv2 Timer rewritten","sha":"9883e1e8b8393826f61c91d26be4abedfb33a5e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-08T21:56:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-08T21:56:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Lv2 Lwmutex","sha":"507798c541a1934758ac374d1dbe0815f04e64ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-09T01:30:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-09T01:30:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Lv2 lwmutex \"true\" syscalls experimentally implemented","sha":"8155ef5e67fe0c8fe3c957940babb77caf0d9179"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-09T01:57:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-09T01:57:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Using \"using\" in vm::ptr/ref","sha":"1653991b9d03b9f17a6ed8fc9fb6ea645e13bf63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-09T02:05:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-09T02:05:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"2709dc2e36b6c2b16acccd2495d267c83a5b80d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-09T19:56:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-09T19:56:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_lwcond* funcs moved and rewritten","sha":"3cf80b08313f0633e11bb8a927866c38ea2f8297"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-10T14:42:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-10T14:42:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Lv2 lwcond \"true\" syscalls","sha":"befc0f62b828e1dc2343648ee80e329eb4a8247c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-10T16:27:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-10T16:27:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic_t specializations fixed","sha":"11b409907e9af69c60e8cf2855fdcea094558835"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-10T19:16:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-10T19:16:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"a62eeaaecc7f5ffbe13c208fd6b8aaf525ed50c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-10T21:47:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-10T21:47:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"fe4ab0abbb095b03bda957b65dea087a7dc66df4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-10T22:48:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-10T22:48:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"116638f3521d4c8e451b804db2b5f81e2c92eeb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T09:43:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T09:43:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Some diagnostic message","sha":"0a4820f4f8680bb41a1654ba8dca25bc99f31100"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T10:39:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T10:39:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"a19a13136c57096cf24555da59f7f41bdf76ad51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T10:41:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T10:41:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix","sha":"03219a9a4e9ee99aecf6a55f15de90c443cd3ed7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T11:12:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T11:12:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix","sha":"6e3e2cf0f3f888bafc4c66ac2c8e7076ebc61563"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T11:27:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T11:27:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"629206c0dc7d93f11ab6ce45c523268af4ba260c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T11:35:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T11:35:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"6de3a6090ad1e4bd13c2dd8f8d6a7312391cc9a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T11:45:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T11:45:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"daad7d71f9aec066ec5df89ffa69a73bf09a05ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-03-11T11:59:56Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-03-11T11:59:56Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1033 from Nekotekina/master\n\nCleanup, lv2 timer/lwmutex/lwcond rewritten","sha":"db7bde0a6f10e8d2a0969f4b1014c8ce5d04c5fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T15:30:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T15:30:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor cleanup","sha":"a3d400b5cca5d778e4ec6188f46663e7d621e804"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T16:58:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T16:58:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic_t operators update","sha":"bd517cf91596735d7807d43a316fcb90a4d3e711"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T17:50:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-11T17:50:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"0cf7bb056e67a85a59002846be5f24f49b69d695"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-12T19:02:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-12T19:02:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs syscalls detached from cellFs","sha":"583b6d92ecaf6114dcf8575a0b5ffd41a1879476"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-12T19:39:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-12T19:39:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"bcad7afcc97956798d8635fb82dec20065a527dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-12T23:03:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-12T23:03:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Small fix","sha":"5764ee7a2ab217912cb5bbb07eb39965238aa0bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-12T23:18:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-12T23:18:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic_t update","sha":"5c31037c044c1e969822e518898779f453412ca3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T01:09:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T01:09:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Small cleanup","sha":"c88e0a0eb91079c98f24ea622b174485c74daeb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T01:59:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T01:59:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"3e34bd64bf3a74a2eb1ce2f1da24ce86ccb15f11"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T15:06:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T15:06:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_open rewritten","sha":"6c36013e2a4f87a12ad5b04968925e513a546a48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T15:29:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T15:29:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix","sha":"fc81d79807e49bc30bb8cf493be01838c869bb69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T15:33:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T15:33:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix","sha":"aa4b74c194b61dda4fc166acc7d3cdb0d1eb77d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T15:36:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T15:36:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix","sha":"d209cc56718221043912737597f766faef44e0e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T15:37:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T15:37:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix","sha":"0fc6ec2df906bc9fee17d0dc2c04ab1ead1edc9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T20:43:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T20:43:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_open() update, octal formatting","sha":"139173caa05bf36dfb342cef286a689904df1ba9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T22:05:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-13T22:05:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFsWriteWithOffset","sha":"9bc5ce300ee0caa63854a791b6e3bca813974530"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-14T00:38:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-14T00:38:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Additional layer for opened file objects","sha":"ea8473943b96518c5e64c482be3b3a05faa7e1ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-14T11:29:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-14T11:29:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFsAioWrite implemented","sha":"5cb1a2f26d5c24d10629b6615e65c0cd9f6e5c3d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-14T15:46:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-14T15:46:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"start func running","sha":"614cb88116ffad78a7dc697a632c010ddc6fdf8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-14T20:28:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-14T20:28:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"_sys_heap*, _sys_malloc+, _sys_strcmp implemented","sha":"469926c5e1c44f8dc40d76f6f58b8c544f976152"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-03-14T21:07:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-03-14T21:07:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1035 from Nekotekina/master\n\nsys_fs review, cleanup","sha":"1f05275ac47d953a2e6c327101dfe8b63f95d8f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-15T00:41:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-15T00:41:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_test, sys_fs_fcntl draft","sha":"fae7ddc61148bf7957c9366fc015060150ca8cae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-15T09:20:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-15T09:20:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"IdManager cleaned","sha":"ff90ddbd2fe15ac7358c337b9abfd77085a3753a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-15T13:26:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-15T13:26:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Syscall names registered","sha":"3e412a2a1f7a5834bf878cc6482641effccb6707"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-15T17:23:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-15T17:23:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellAudio event queue fix","sha":"c125f5376cedd030de7facdd9bc1d95cd81ec5a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-16T00:21:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-16T00:21:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFsSt*","sha":"63b97d6817c1657fb926e1ec1e4a94b9fe6ff886"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-16T13:15:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-16T13:15:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFsSt* update","sha":"7ce45a3bae89bf6eafc1de7a01af1db8d965ef31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-16T16:20:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-16T16:20:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs bugfixes","sha":"bee6b8473333202057443aab3aff5472b44847e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-03-16T18:31:50Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-03-16T18:31:50Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1036 from Nekotekina/master\n\nsys_fs bugfixes","sha":"b5a4e21c818a7fbd4906aca9b7b11cc186fb2945"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-16T18:44:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-16T18:50:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Initial commit","sha":"6a0ce1850a5bc8e735f02865ca25c9170f9f4a8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-16T21:38:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-16T21:38:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Basic concept","sha":"a71cb5f52106119c8ddda966ba3de8148130caeb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-16T23:18:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-16T23:18:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Small update","sha":"0ca4c189a51cd56e3f357fdd1ed63a322841f24d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-17T00:44:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-17T00:44:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Small update","sha":"573f112b37f9e9623b47ae4654be5eeae78c0e4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-17T20:03:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-17T20:03:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Basic load","sha":"620e937473e9d46c8d550fd9013528c7976c652d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-03-17T21:33:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2836720?v=4","date":"2015-03-17T22:05:32Z","email":"jacky.kk.tsui@gmail.com","login":"jacky400","name":"raven02"},"msg":"Disable glDepthBoundsEXT for Intel HD graphics","sha":"9b41f846d662a54ada3b1b5af1b5cc15f879782f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-03-18T06:27:18Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-03-18T06:27:18Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1037 from raven02/patch-8\n\nDisable glDepthBoundsEXT for Intel HD graphics","sha":"903cb8d7e5d1682a27b9241ac771f41d941da4fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-03-18T14:30:47Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-03-18T14:30:47Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix intel HD graphics crash","sha":"9954b36ec7348e4036e194e8fcd3cb4cd7322544"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-03-18T14:32:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-03-18T14:32:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1039 from raven02/patch-1\n\nFix intel HD graphics crash","sha":"a342de614363e0894c5bf118519db5dfb0e5883c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-20T16:53:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-20T16:53:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU interpreter (basic concept)","sha":"63276a3f84528c5e19fcd918d541f9d01de1cf1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-20T17:30:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-20T17:30:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"spu_opcode_t","sha":"c8bb83b824bd72fb3be54600406e9b6ee8a1a3f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-20T23:36:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-20T23:36:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: some instructions updated","sha":"ef563f038d90099c7238c46ec0b500895ec9f6e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-21T14:29:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-21T14:29:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: some instructions updated","sha":"ff1708a899aa67467e4adcc6c87c4cf2b262932b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-21T15:36:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-21T15:36:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: some instructions updated","sha":"e477a0b8fc75650a1337c4f4eef774524a0e38b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-21T18:07:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-21T18:07:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: some instructions updated","sha":"a86317ce5abd123e1b4f919e724eb3bab4a70690"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-21T19:39:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-21T19:39:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: Floating Interpolate implemented","sha":"08dd95e52b75d4f6b7c7376c6e21f0533ab72371"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-21T22:03:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-21T22:03:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: completed","sha":"dc6c21833d8ade47a66246f92028e6d98957e09a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-21T23:22:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-21T23:22:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"f095dec43dfccad71bdd8553c4be8eb25d3acbcb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-24T15:17:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-24T15:17:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM stack overflow fix","sha":"ec8519b969f3d0a68daf3b6b058ceb99cf8158db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-03-24T17:58:31Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-03-24T17:58:31Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1043 from Nekotekina/master\n\nStack overflow fix","sha":"c4ec38f3581184a667bd916d5120329a78c773a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-24T19:54:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-24T19:54:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: some instruction replaced","sha":"75fa95c7ff7c33cdcd932bdc10c80b6e6fd2d27d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-26T18:42:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-26T18:42:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: some instructions replaced","sha":"d640aba903b05f2df373425d20b2996fc178f06f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5936843?v=4","date":"2015-03-27T07:56:13Z","email":"josh.slark@gmail.com","login":"joshslark","name":"joshslark"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5936843?v=4","date":"2015-03-27T07:56:13Z","email":"josh.slark@gmail.com","login":"joshslark","name":"joshslark"},"msg":"Add arch linux dependency instructions","sha":"55b83af845608541e27e00c621ea2bb1dea2e56b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-29T11:00:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-29T11:00:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: some instructions replaced","sha":"3247152ff7915dd469241d770491c56d17461799"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5936843?v=4","date":"2015-03-31T08:34:37Z","email":"josh.slark@gmail.com","login":"joshslark","name":"Joshua Clark"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5936843?v=4","date":"2015-03-31T08:34:37Z","email":"josh.slark@gmail.com","login":"joshslark","name":"Joshua Clark"},"msg":"Small fixes to allow compililation on linux","sha":"10983338d8a82ddecb747c6508ae9193025a91d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5936843?v=4","date":"2015-03-31T09:20:25Z","email":"josh.slark@gmail.com","login":"joshslark","name":"Joshua Clark"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5936843?v=4","date":"2015-03-31T09:20:25Z","email":"josh.slark@gmail.com","login":"joshslark","name":"Joshua Clark"},"msg":"proper fix for issue #1041","sha":"3c3e3baa14d6dddd3586552850e494fe7f4cf938"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-03-31T10:08:50Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-03-31T10:08:50Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1044 from joshslark/master\n\nSome fixes to allow compilation on linux","sha":"0b4105915a5654cfc62cc559a13746e57a7339e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-31T14:54:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-03-31T14:54:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: some instructions replaced","sha":"72fdcf120c7d9ef6fadd6e22cfa78ffc069110b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-01T14:01:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-01T14:01:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: some instructions replaced","sha":"6b9a6c50fe55fb193f5d749f0824b597cfcc4de3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-02T15:22:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-02T15:22:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: some instructions replaced","sha":"59effb34124ffe82d8dbed7caf8b56abfade6e43"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-04-03T12:07:35Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-04-03T12:07:35Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Update GLEXT.h to revision 30346","sha":"55c317c1cf33a4740a49f13f872a5a3df5cb6ce5"}
+{"author":{"avatar":null,"date":"2015-04-03T15:33:16Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-04-03T15:33:16Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1045 from Zangetsu38/master\n\nUpdate GLEXT.h to revision 30346","sha":"abdfcf9d0b252f57dd8d291455fbb5a6744f79e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-03T16:56:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-03T16:56:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfixes","sha":"1c82e8b1d507bd30921b215b6dc002154445261f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-04T16:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-04T16:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfixes","sha":"26b5eebc17cdffd37708642e43a857ef452ecc28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-04T16:16:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-04T16:16:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Small fix","sha":"9479bcf77b8d599a152948de45fb5ce0390c2790"}
+{"author":{"avatar":null,"date":"2015-04-04T17:03:18Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-04-04T17:03:18Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1046 from Nekotekina/new_interpreter\n\nAlternative interpreters","sha":"952098c00fff18d0c6c4797690c966708523e43b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-04T18:21:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-04T18:21:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPURecompiler cleanup","sha":"d2883fc554b6222a7916a70d3ba48b949507915d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-05T18:01:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-05T18:01:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPURecompiler improved","sha":"d1fbccc9ce7447ec9d944acce4948c69eeba81a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-04-08T20:43:29Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-04-08T20:43:29Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"remove the publicly accessible version of the template parameter in lwmutex::const_be_u32_t because it's never used and causes linker errors in clang 3.4 (and allegedly gcc 4.8.4)","sha":"d140cffc08abad816d9e0f9d28a39742fb10e4c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-08T15:04:01Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-04-08T22:09:03Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Stop overwriting the ADDITIONAL_LIBS setting for CMake.","sha":"080e42ec9fda4aef3153b4aed0ba2d376ade8b27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-08T18:02:54Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-09T07:11:32Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"Modify .travis.yml to enable Travis.\nFix the master git repo name in Github, also the one in git-version-gen.cmd.\nDisplay Shell Export List to help debugging our Travis Build.","sha":"da85fba0156ab66aa8b6bbdb6d82ac69c4417dca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-09T12:43:46Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-09T12:43:46Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"Small change for Badges in README.md.","sha":"a2ab685ba92f5251d165f712e2e3a4f6471632ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-09T13:30:24Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-09T13:30:24Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"Revert Non-Necessary Change. Thank Bigpet.","sha":"ef7166057a100c1e67235ee23f4597054c3ce0be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T11:12:08Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T11:12:08Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"CppCheck: Orz. fix out-bound reference of NONZEROCOEFFS in CellCameraAttributes.","sha":"30acfb89c3dc78d3a17a76d629e3583ac3c65cf7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T11:14:33Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T11:14:33Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"CppCheck: Make it return value not without return, in cellSpurs.cpp.","sha":"f6392baab3fa31beba42ab7ea4c5f02c6f8d507c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T11:20:50Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T11:20:50Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"CppCheck: Marked out case_range that in RSXThread.cpp. It seems missing its own break;.","sha":"d072eba68729194dd88c724aee52ef527d56b269"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T11:29:45Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T11:29:45Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"CppCheck: About assert side-effect and remove_if that i don't know enough..","sha":"cd23a2ecaff7d5675dcb4399bff1e6f837e7b9a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T12:13:25Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T12:13:25Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"CppCheck: Tried to classify and marked some lines that weird.","sha":"900389d857bc68b2d2c1784e15bb67367aebad17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T12:26:48Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T12:26:48Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"CppCheck: End of those marking. and removed one meaningless comparation in sys_spu.cpp.","sha":"e4a2a60f559be40afcb82c412326e802806a5fcb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T14:49:34Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T14:49:34Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"Added SysEmulationDir to set $(EmulationDir) to custom location.","sha":"5f6afca18a5eefd2b83b75e539d611f357e47dec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T15:10:02Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T15:10:02Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"Add notice for the custom path, and add an option to Configuration - System panel. Not Tested.","sha":"a3d69194317208e7c58fd5410a7519dc2c19e05d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T15:23:20Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T15:23:20Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"I forgot to save the EmulationDirEnable.. Also just show the bind once.","sha":"64ab14b237a34fe89bb1f193a41202cb304ee79c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T15:56:38Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T15:56:38Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"Tested Enable/Disable this Custom EmulationDir Feature, and it can check whether directory exists. But there is still problem with its log.","sha":"ea17e08ae65d7c8605fab45070b01183ffccf84f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T16:27:20Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T16:27:20Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"Removed some useless comments, thank Neko.","sha":"147c50e7cabac8ee930845bb8be9967efbd24bf4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T17:58:12Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-10T17:58:12Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"Restore what is directly truncated in sys_spu.cpp. @danilaml that may be someone used a wrong constant for the third condition.","sha":"94441d7df3b5ead9630e8c8b49fd4e1a04245184"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-11T05:31:28Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-11T05:31:28Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"Remove comments in confirmed files.","sha":"02c263fc19661ac1f866518db48c30697a1293a5"}
+{"author":{"avatar":null,"date":"2015-04-11T12:09:03Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-04-11T12:09:03Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1052 from Bigpet/master\n\nremove lwmutex::const_be_u32_t::value","sha":"721a0c8bcb78f64f4c95ce2905bb48a967d44079"}
+{"author":{"avatar":null,"date":"2015-04-11T12:09:19Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-04-11T12:09:19Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1053 from Bigpet/cmake_err\n\nStop overwriting the ADDITIONAL_LIBS setting for CMake.","sha":"18b8a7d473d4e859841ddc16f13df13eae1380e9"}
+{"author":{"avatar":null,"date":"2015-04-11T12:12:03Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-04-11T12:12:03Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1060 from Syphurith/p5-EmulationDir\n\nCustom EmulationDir","sha":"54b6616ec97c51b48bfb4e9544ea30baecf882ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-12T01:36:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-12T01:36:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Various changes","sha":"ea5110cec3c8d5e5f19166a131fc8f8658241f84"}
+{"author":{"avatar":null,"date":"2015-04-12T13:51:04Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-04-12T13:51:04Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1054 from Syphurith/p2Travis\n\nTravis Enabled.","sha":"4f21cef3af7049908cb0a5db0f64ffd8b4478903"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-12T16:37:58Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-12T16:37:58Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"Thanks to @Nekotekina, about his patience on SPUThread.h.","sha":"0233fbff518fea53dd8ce394ce68331f81546b44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-12T20:16:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-12T20:16:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfixes","sha":"fea6fd1a70377a38c8a565a12115ee1e99e6f6a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T13:32:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T13:32:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Events improved","sha":"85b63de63158e46e3ad456d50cd63ec2e0928190"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T14:05:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T14:05:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellGame slightly rearranged","sha":"94b3cdf9e7cdd447f859d54806dfc4a8ac5dc03d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T14:46:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T14:46:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS::CopyFile implemented","sha":"16fe7919a0b3dba91e6e43d972af79e064540654"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-09T16:53:10Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-04-13T15:45:16Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Enable Travis. Plus set Clang-3.6 for Travis build.\n\nshow version info about the $CXX not just gcc or clang.","sha":"7b276e38f4af502dadc60f2d811d49ee19aeeb3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T17:39:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T17:39:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPURS fixed","sha":"4d85a4966676e821dc0af7a316e430f7de581a8c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T18:10:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T18:10:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"getFileInfo fixed","sha":"a465c1aa0a27d3501e88eb4bde3609cc25f6ba99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T18:21:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T18:21:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CopyFile fixed","sha":"f8ad9d13f864b6fe71023af414970f233b48958e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T18:35:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T18:35:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CopyFile fixed","sha":"f8c64b1fb47f65b0e2b1757e6054eee8c1a6777d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T18:42:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T18:42:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CopyFile fixed (finally)","sha":"7e8e288ba2fd2fd386f93288413c97788c7a8c21"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T19:06:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-13T19:06:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CopyFile improved","sha":"39524318aae56244a3b19c0edc3c2f2aafb623a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-04-13T15:35:19Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-04-13T22:20:13Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"seperate repo adds into seperate commands, for consistency","sha":"92acfcf4540be4273f466e921233b86c7822cf81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-14T02:00:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-14T02:00:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"KernelExplorer fixed","sha":"d2ad84453dd0e77ab477437189a56a53892f1cf2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-14T10:35:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-14T10:35:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"b54a33efce8a26bc4478b3a7f5734e6a14039ec5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-14T11:35:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-14T11:35:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Small update","sha":"d8cc6b4c391220bb8f11c64677213f27d1afea4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-14T14:54:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-14T14:54:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Small update","sha":"2798827066009c88998db73e3d59c2125ac99404"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-15T14:27:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-15T14:27:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vfsLocalDir, rFile routines improved","sha":"d032bc5691fbd9e005c12a4e198450fb3cbc7bb8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-15T15:12:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-15T15:12:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"cfb41c4dab6de441b8d84793ff78c7a302ead2a3"}
+{"author":{"avatar":null,"date":"2015-04-15T16:14:44Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-04-15T16:14:44Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1063 from Bigpet/clangtravis\n\nuse clang 3.6 for travis","sha":"588d364efe942393c6b5742c511c42de91101428"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-15T18:33:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-15T18:33:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Abstract class for MsgDialog interface","sha":"00205bfa58989c194733ebb1452dce488afa454d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-15T23:17:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-15T23:17:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PSFLoader improved","sha":"37b22ec99dd96ce04f8f5287530254800e9056c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-16T15:33:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-16T15:33:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PSFLoader improved","sha":"b2111b3c3dff4255734948eac81ec235ce5ec693"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-16T16:19:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-16T16:19:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PSFLoader improved, saving implemented","sha":"94cbfd6a5cbff44f1a630d77d4731aabc30dfbdf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T04:37:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T04:37:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData improved","sha":"4874a81dc5bcbf5030c860a6cd79a9ce5fd27a5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T13:24:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T13:24:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellVdecGetPicture improved","sha":"be48a330b4e514eeb2b355aa16d35f0dee988961"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T13:56:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T13:56:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"9bedf0d13ef2fe187c9e092a6091842a881f4ba9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T14:05:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T14:05:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix 2","sha":"d9b53b476f2a09e8769c581a56d05979d5d8ab0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T17:09:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T17:09:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Merge branch 'master' of https://github.com/DHrpcs3/rpcs3","sha":"048cb7993d96cc89369f507bb8bb2b86bc3d04a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-17T19:12:25Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/883667?v=4","date":"2015-04-17T19:12:25Z","email":"luxsie@163.com","login":"LuxSyphurithSIe","name":"luxsie"},"msg":"Tab to Space.","sha":"0f1bb8545dd474111939d97a564472505784c610"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T19:46:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T19:46:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"_sys_ppu_thread_create fixed","sha":"ad02c8d510fee4d2047c310c20546b9aa102c52a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T20:16:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T20:16:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"8c9ef2eef4f876204701140d2ef9fb1725987636"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T20:43:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T20:43:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"747d53790c8b5d2401f0a06fd554784a57fde2ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T23:13:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-17T23:13:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"8bd7823b70261be7ac52a328964ec0a9e6b27fb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-18T00:25:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-18T00:25:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU stack fixed","sha":"b7fd09740b6815d6f468c755f1144ae31a59067f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-18T01:35:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-18T01:35:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU stack fixed (2)","sha":"b1f754343613772d82c4fdd0557fe1f25572055f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-18T13:38:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-18T13:38:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS::TruncateFile() implemented","sha":"f2276bb70ca04e368f47e944e7a173290f053f8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-18T17:18:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-18T17:18:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Small changes","sha":"2cafa84b754a4844369ba992061879beb1c5eb1c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-04-18T18:28:30Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-04-18T18:28:30Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Merge branch 'p4-Bundle'","sha":"fd34d11eec5069f8d39b51bab67c316ae6c057eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T13:19:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T13:19:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"wxFile removed (rFile -> rfile_t)","sha":"ab405901ee84dfa17dc432ef9a2b5d745bb5acaf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T16:02:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T16:02:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfixes","sha":"93ebce4162f35571264663a3368687076b13f4d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T17:14:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T17:14:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_ftruncate implemented, bugfixes\n\nEliminated using stat() for _WIN32 because it doesn't support unicode\ncorrectly, use rExists() or get_file_info() instead","sha":"3c872ab611a51e76566991979add6acfabe3a580"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T17:57:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T17:57:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_fstat fixed","sha":"73b00b844bfe9b6e47163758b305e8fed15118ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T19:25:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T19:25:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFsGetDirectoryEntries improved","sha":"339021ac1581debb0ece157151e27fa66299c6a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T22:26:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T22:26:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"3b260316928c902f01b31eebcfa4995261dbd41d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T23:49:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-19T23:49:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"935302b62019f71bd627253f5091f96ab4649a38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-20T01:54:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-20T01:54:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"8c1aa3ee1572964118aac5a7edb4e431afe6a274"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-20T15:53:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-20T15:53:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS::CreatePath fixed, bugfixes","sha":"56c64c804506878647e67026eda07b20d9204514"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-21T15:16:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-21T15:16:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Small fix","sha":"d05597ccdbe3b5fcbdd80f90f8867250b5ba499e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-21T18:18:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-21T18:18:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"978d578f4ebd7703d5f1240f9f9601be76d11281"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-21T19:35:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-21T19:35:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix unique_ptr usage","sha":"8b0c7724236f3f84f4c58147c63781a3b3ec956e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-21T19:43:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-21T19:43:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Some code simplified","sha":"5aa6daf58fbe78b22c4593881d1962fcd6a5abb2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-21T20:26:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-21T20:26:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::null usage","sha":"f4540c27931d69c4f42bdc5f3c78395bdb3c27a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-21T21:18:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-21T21:18:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Some code disabled","sha":"743421881e6bb5957f694f336c9b805929c97368"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-23T16:58:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-23T16:58:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"rFileName removed","sha":"fbc268e993da5549ceb03d477124a648adbafa21"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-24T00:35:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-24T00:35:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Adaptive /dev_bdvd/ mounting","sha":"2f4d6fc2a1e71cece3da88983958edd960029312"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-24T14:06:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-24T14:06:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"o_append implemented","sha":"ed6fb7cc430fef2fb9c3e25592fbbdd3b7457ee8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-24T15:12:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-24T15:12:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"b449545ae04acde3a16ea5c8f4074173b2568d0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-24T21:38:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-24T21:38:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"rfile_t renamed","sha":"74b3580b690a7ace325bccece34126de69dcb849"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-24T22:18:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-24T22:18:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix","sha":"5d6d058965e7723edbd0453337b912a58af1fc38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T13:29:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T13:29:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Logging fixed\n\nNow it displays messagebox if logging system isn't initialized.\nOtherwise it could cause stack overflow.","sha":"c5737d01c67f77563a9c2adc197bc61c32b3ebed"}
+{"author":{"avatar":null,"date":"2015-04-25T18:32:47Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-04-25T18:32:47Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1062 from Nekotekina/master\n\nSPURecompiler improved","sha":"d18d19870fca1bb9fd6b19e6aef62f80595d9d66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T19:15:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T19:15:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs::dir implemented, bugfixes","sha":"02ca97804e1c12845dd29f13319a4b496c4e28f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T20:10:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T20:10:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"dcf3e0776e1f6c4af5ca283a452d8d05420f7f89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T20:21:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T20:21:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"3cab629a670e8e66069bbf64d4e74e236ad042a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T20:24:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T20:24:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"442cf3e9375a5a9d427cca554a790fbbd7ace721"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T20:55:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T20:55:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs::dir::get_first fixed","sha":"31a41b795e9ee4876c7e3b9b8c745ed1ec651fd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T21:26:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T21:26:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vfsDir usage fixed","sha":"9cfdce91a10b3cf58e56db3cc537c5cfca68ae22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T22:56:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T22:56:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Interpreter2 initialization fix","sha":"ff359ed11883dd32a53bcf1e0541bcf5fab2715f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T23:29:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-04-25T23:29:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"e676d0bdcf7768ae89676d87747644fa9a6ad99d"}
+{"author":{"avatar":null,"date":"2015-04-26T12:17:42Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-04-26T12:17:42Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1068 from Nekotekina/master\n\nwxDir replaced","sha":"bb63ec0c834010ed7c7a2663204b8c0fdf7fca60"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-08T09:45:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-08T09:45:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fixes","sha":"f92c10ef719c308b7cd3dccb7c3cdb2d35a6063e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-08T15:42:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-08T15:42:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"8cf62e560ea02779b856dc694eeedd0d5607c9e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-05-08T19:25:17Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-05-08T19:25:17Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Update WxWidgets repository\n\nThis is in preparation to make it easy to compile with VS2015.\n\nAlso there's notables changes in wxWidgets that we might find very useful,\nsuch as being able to create OpenGL debug contexts.\n\nThe change in .gitmodules might make it necessary for people to run\n\"git submodule sync\" after pulling these changes","sha":"fe1b0e70b96609dd1a2059f227b22f65a04482dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-08T22:36:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-08T22:36:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFs fix","sha":"3ae43edc3e74fba596843b4f5b677a8e895da312"}
+{"author":{"avatar":null,"date":"2015-05-09T12:43:06Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-05-09T12:43:06Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1078 from Nekotekina/master\n\nSome fixes","sha":"2b48443b95d93d6585b48d1cfb227b3dac473eed"}
+{"author":{"avatar":null,"date":"2015-05-09T12:44:06Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-05-09T12:44:06Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1079 from Bigpet/master\n\nUpdate WxWidgets repository","sha":"45e9e9c93854f7da0829619187876ad8caf1c0d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-05-10T16:20:19Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-05-10T16:20:19Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu"},"msg":"Fixed Error rpcs3.sln after Launch compilation","sha":"46302084e7cb20ae281ead35372f2401d6e3fdd7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-15T19:48:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":null,"date":"2015-05-19T15:26:05Z","email":"vljn@ovi.com","login":null,"name":"Vincent Lejeune"},"msg":"RSX: Add a template class that helps caching programs.","sha":"145f4113245c9e114b7d101fb791a9dbc250bbfa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-15T23:10:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":null,"date":"2015-05-19T15:26:06Z","email":"vljn@ovi.com","login":null,"name":"Vincent Lejeune"},"msg":"GL: Use pipeline cache","sha":"2a7c65c0195ceee222dadefaa0443dbb3bd0104e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-19T19:32:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":null,"date":"2015-05-20T17:31:21Z","email":"vljn@ovi.com","login":null,"name":"Vincent Lejeune"},"msg":"gl: Fix swizzle for DIVRSQ, COS, SIN, EXP2, LOG2 in fragment shader\n\nThis fix rsx_fp_static_test2.ppu.elf, rsx_fp_static_test3.ppu.elf, rsx_fp_static_test5.ppu.elf.\nLikely rsx_fp_dynamic_test2.ppu.elf too","sha":"d58188d7bad99bb694de83bd8926179d53abc52d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-05-21T08:45:40Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-05-21T08:45:40Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Change `GetDeviceLocal` device selection\n\nFor `GetDeviceLocal` only consider a device if the full path to the device\nmatches the first part of the path to match.\n\nThe issue was that putting in a file that was not in a sub-path of an existing\nmounted device failed. So if the rpcs3 devices are in\nD:\\DEV\\rpcs3\\bin and you open D:\\DEV\\ps3autotests\\tests\\rsx\\primitives\\primitives.ppu.elf\nit would return\n/dev_usb000/ps3autotests\\tests\\rsx\\primitives\\primitives.ppu.elf\nwhich resolves to\nD:/DEV/rpcs3/bin/dev_usb000/ps3autotests/tests/rsx/primitives/primitives.ppu.elf\nand is wrong.\n\nCorrect are either /dev_usb000/../../../ps3autotests\\tests\\rsx\\primitives\\primitives.ppu.elf\nor /hostfs/D:\\DEV\\ps3autotests\\tests\\rsx\\primitives\\primitives.ppu.elf\n\nI chose to resolve without the \"..\" beyond root, since that just seems wrong\n(so it will now return the hostfs version).\n\nFixes #1090","sha":"0b0c8723eba01c09aa0b10352bb780dd0d9fa48d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-21T14:34:51Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-21T14:34:51Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"gl: Fix IFE instruction\n\nThis fixes the rsx_fp_static_test4.ppu.elf","sha":"d0c2addf915c1d12a4a19c9c60d35405fc068281"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-21T15:31:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-21T15:31:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #7 from raven02/patch-3\n\ngl: Fix IFE instruction","sha":"e2748c319e55613182b560a5c712c2388dba97ba"}
+{"author":{"avatar":null,"date":"2015-05-21T16:13:46Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-05-21T16:13:46Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1091 from vlj/shader-fix\n\ngl: Fix swizzle for DIVRSQ, COS, SIN in fragment shader","sha":"d5ead0d315f2344e56e33c0b5a526a1345c1c189"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2015-05-22T12:16:30Z","email":"877033040@qq.com","login":"Syphurith","name":"Syphurith"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8421531?v=4","date":"2015-05-22T12:16:30Z","email":"877033040@qq.com","login":"Syphurith","name":"Syphurith"},"msg":"Renamed LogSeverity Symbols, like.. LogSeveritySuccess from Succuess to avoid conflicts with macros such as those in X11 header.","sha":"5a6869fc5ec897d1147c5ac48b02175a65fcf51d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-22T16:25:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-22T16:25:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #10 from Syphurith/gl\n\nRenamed Symbols for `gl` branch","sha":"d5bdf78a29797666b09b3de5cf4a53325f9ba804"}
+{"author":{"avatar":null,"date":"2015-05-22T17:43:32Z","email":"vljn@ovi.com","login":null,"name":"Vincent Lejeune"},"committer":{"avatar":null,"date":"2015-05-22T17:43:32Z","email":"vljn@ovi.com","login":null,"name":"Vincent Lejeune"},"msg":"GL: Remove unused calls to glGetError()","sha":"7a5c8dd586ab0731c3ffceda2a7ccb8f64117d7a"}
+{"author":{"avatar":null,"date":"2015-05-22T23:53:48Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-05-22T23:53:48Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1089 from vlj/gl\n\nStore Vertex/Fragment program in a hashtable and do not rebuilt FP if a constant changes","sha":"2a6f11b390db3b803176c9f22f69b1955dc65110"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-19T16:17:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T18:45:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSX: Add a class factorizing decompiler code","sha":"2416d49dba12df2f7857b872dd0ef4b21067d55d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-19T17:43:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T18:45:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"GL: Use decompiler common class","sha":"df794b88b092386c840152718037ad123652f485"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-21T23:56:49Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T18:45:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"GL: fix IFE instruction","sha":"f961a2e3b478f8923eb3f8e05941841855f75984"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-22T00:09:53Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T18:45:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSX: DP2A for fragment decompiler","sha":"67e8e0a367f730b74bdc1e84dff4db6be52566d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-22T16:17:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T18:45:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSX : factorize DPH","sha":"79cb025d25ed8a4ed493dcf913b4c22e541fa4e6"}
+{"author":{"avatar":null,"date":"2015-05-22T17:18:20Z","email":"vljn@ovi.com","login":null,"name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T18:45:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"GL: Factorise getFloatTypeName, getFunction and compareFunction between Fragment and Vertex Decompiler","sha":"669a54d0711198475ef37c24b871767481cd193d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-23T14:28:22Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T18:45:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSX: use getFloatTypeName","sha":"bebd437a7e87776c7afcc4df6f984afe2a150127"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-23T14:43:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T18:45:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"FP: fix SFL instruction","sha":"eac5147a45a524f87a08be63127c061cc93a14d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-23T14:45:21Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T18:45:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"VP: use getFloatTypeName() with compare instructions","sha":"f98b03b61fa70f00f46ac6388cca44cb0f77d1b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-23T14:52:35Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T18:45:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"FP: RSQ instruction alternative","sha":"2d6dd873cdc5f7abb49bb2f2f1dd88d5d1cddedd"}
+{"author":{"avatar":null,"date":"2015-05-23T22:43:09Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-05-23T22:43:09Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1093 from vlj/common-decompiler\n\nExtract vertex/fragment decompiler code.","sha":"4c87c9a54549804089698e2b6ae5986470d9980e"}
+{"author":{"avatar":null,"date":"2015-05-23T23:09:51Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-05-23T23:09:51Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1092 from Bigpet/localdev\n\nChange `GetDeviceLocal` device selection","sha":"dcad0e286a7c2e03d0f05213369b6fc9a47259e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-24T15:05:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-24T15:09:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"GL: Fix output swizzling for fog and clip distance","sha":"2dbac656130fbcfb2c53c553c2dd4cd759b9de97"}
+{"author":{"avatar":null,"date":"2015-05-24T20:42:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-05-24T20:42:34Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1100 from vlj/master\n\nGL: Fix output swizzling for fog and clip distance","sha":"24278e0ecab6fe9d3ff092792b260de690a825da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-25T18:12:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-25T18:12:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"refcnt.h removed","sha":"98aee31c5aaa097f6ea404cc2cfeb2fb687aa46f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-25T19:11:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-25T19:11:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"cdf70e0b77359e23cd8c10f93754a1a56e0ef9c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T03:11:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T03:11:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"IdManager improved, atomic_t improved\n\nVarious changes","sha":"22b78fec7170249b3140716cd91f567c4bafca8b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T09:51:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T09:51:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"28239534892c4169ce5a91ba4bda08aa75e56c65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T10:02:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T10:02:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"f14b712f072e62c4378df392e68ecf0d674fdd20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T10:17:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T10:17:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"7037da80cb8d2112ef71de2ea65ecc7a62c7e4e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T10:55:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T10:55:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix","sha":"26e5a07905c76a1ed3a39f3ddd461f3fd82e56c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T11:05:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T11:05:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"fba8e8437030525d3fcd5b286c4029bcbed6a3c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T12:49:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-27T12:49:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix","sha":"f83306b0bfc0bbff7f923fff21e402d75b14e4db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-28T15:14:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-28T15:14:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Attribute macro changed\n\n__forceinline -> force_inline\n__noinline -> never_inline\nprintf_alike(x,y) added","sha":"78fdcf75e75e007492192abe956d50ae355f456e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-28T15:16:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-28T15:16:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Forgotten one","sha":"18fa6ca961197d64c0536ad6234508f1baaf34eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-28T15:23:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-28T15:23:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"74e13a4ef6da34613b9ec0c8bca040d73220fba9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-28T15:28:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-28T15:28:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"printf_alike removed","sha":"0724a9efa230d05fbf355087450a978890ac26d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-28T19:13:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-28T19:13:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"IdManager fix","sha":"a70d3058069ef80b8c7e3a85a9e6655f89b18e7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-28T22:49:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-28T22:49:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"MFF_NO_RETURN flag introduced","sha":"b84d831d8f91ebc788886283b7911927142496e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-03-31T23:49:39Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-05-29T01:34:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implemented some sys_prx syscalls\nFixed vm::ptr\n\nConflicts:\n\tUtilities/BEType.h\n\tUtilities/StrFmt.cpp\n\trpcs3/Emu/Memory/vm_ptr.h\n\trpcs3/Emu/SysCalls/lv2/sys_prx.cpp\n\trpcs3/Emu/SysCalls/lv2/sys_prx.h\n\nCherry-picked commit \"Implemented some sys_prx syscalls\"","sha":"39e679806b794eb0a71f594e3dcb546334ff166f"}
+{"author":{"avatar":null,"date":"2015-05-29T06:26:00Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-05-29T06:26:00Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1104 from Nekotekina/master\n\nSome things changed","sha":"8f9db92bf0d7f37947c11c66867d3c1359730c71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-29T13:59:51Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-29T13:59:51Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fix CELL_GCM_TEXTURE_CLAMP\n\nIt should be GL_CLAMP","sha":"e6df1ddcc0a682b17848f3643a0f80146d5c4218"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-31T10:35:15Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-31T10:35:15Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"RSX: simplify resolution rescale","sha":"f2c5dc2b5c3d4ab1075f79f80cfe9ddfc9adc01f"}
+{"author":{"avatar":null,"date":"2015-06-02T15:09:52Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-06-02T15:09:52Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1106 from raven02/scale\n\nRSX: simplify resolution rescale","sha":"3b8c34e47c456c3a7e946f982564ac77024187b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-06-02T19:20:59Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-06-02T20:11:46Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Make ppuJIT testlog more compact and easier to read","sha":"ee715d9d362afd3cf3227ca3e3c2a666be5d5be7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-08T16:06:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-08T16:11:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSX: Fix index gathering","sha":"02594c823975175bfd9b65c79d8fa1ca0fce5fd1"}
+{"author":{"avatar":null,"date":"2015-06-08T17:40:12Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-06-08T17:40:12Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1116 from vlj/rsx\n\nRSX: Fix index gathering","sha":"f935c789bd271f78fbc4e78283a5d0a5b7c6e1d7"}
+{"author":{"avatar":null,"date":"2015-06-08T17:41:13Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-06-08T17:41:13Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1111 from danilaml/improve-llvm-tests\n\nMake ppuJIT test log more compact and easier to read","sha":"d86c33c09e11639fa1c42084be1491a7083cf13a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-06-11T10:52:56Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-06-11T10:52:56Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Update glext.h on version 31191\nFix correct size icon with correct proportion","sha":"1dc2f6a1646173ede738f850b05e4f018f5e7789"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/540652?v=4","date":"2015-06-15T15:09:21Z","email":"m1el@ya.ru","login":"m1el","name":"Igor null"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/540652?v=4","date":"2015-06-15T15:09:21Z","email":"m1el@ya.ru","login":"m1el","name":"Igor null"},"msg":"changed broken breakpoints database format to a consistent format","sha":"5ae2349f361ffb183f17106619795270860afb50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-13T01:31:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T16:21:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"be_t simplified, vm::ref improved\n\nremove_be_t renamed to to_ne_t (to native endianness)\nle_t and to_le_t draft, bugfixes","sha":"1256d648c164d3017ae777231e6d477e83e3c166"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-13T14:48:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T16:21:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::ref improved, bugfixes","sha":"4d9add5e7cf22122622067f1b0ab6e0e056bf143"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-13T16:36:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T16:21:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"a77a75660bc891d820659e166b932d3fc60b5ca6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-13T18:16:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T16:21:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellGifDec, cellPngDec: small update","sha":"8c62a893a925ead9657b35a7afdb184c67277ead"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-14T21:52:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T16:21:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::ptr refactoring (operators improved)\n\nvm::pptr, vm::bpptr added for PS3\nis_le_t added\nsizeof32() added (32-bit sizeof macro)","sha":"3064560027f46634ebeaed055264a67876e11d01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-14T22:11:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T16:21:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::psv::pptr usage","sha":"93dcd704c58c79bbfae2bbfef3b4195d8df6005c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T01:22:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T16:21:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::ptr conversion operator fixed","sha":"b7d967361d440000025138e643bbf4744e7f34cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T11:37:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T16:21:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::ref improved (operators)\n\natomic operators fixed, vm::ptr operators improved","sha":"d7cb5a6e9ea62419543708745b952083acbd9dd3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T12:24:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T16:21:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"BEType improved (bugfix)","sha":"e833904b02b6c7620252097e31d31bb5cb353326"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T16:02:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T16:21:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::ref assignment operators fixed","sha":"d8b1c3118a8346c16adf899e76f5ecd96604bcd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T17:00:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-15T17:00:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"is_be_t, is_le_t fixed","sha":"9c1c3bffbef75fb2de19678674b0811ef36888d7"}
+{"author":{"avatar":null,"date":"2015-06-16T14:00:22Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-06-16T14:00:22Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1117 from Zangetsu38/master\n\nUpdate glext.h on version 31191","sha":"c51ce40d8db20a6e7442cc506afab23112b8b9fc"}
+{"author":{"avatar":null,"date":"2015-06-16T14:00:30Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-06-16T14:00:30Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1119 from Nekotekina/master\n\nbe_t, vm::ptr, vm::ref improved","sha":"de9a2fd556123a3bcde4752a9d419db045b10d00"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T14:26:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-17T20:08:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSXDebugger: Disasm a couple more command","sha":"4b0d8557b4d1a0061f54e26fb2a44632ec379b6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T16:35:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-17T20:09:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSXDebugger: Print more accurate semaphore","sha":"629c290faa4a83a27d96cca652d288fab3bae1ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-06T19:45:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-17T20:09:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSXDebugger: Add surface detail when parsing set surface format","sha":"cf7e5028a423a9a459b6288a24051749fcc2ae75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-06T20:19:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-17T20:09:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSXDebugger: Add clip details when parsing clip horizontal","sha":"e7b459573ef9b31d76febd60515d97abf26fe705"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-16T14:14:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-17T20:09:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSXDebugger: Display viewport size","sha":"b353cd4ecb00c37de5249e71f19de838f80fdeda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T14:35:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-17T20:09:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSXDebugger: Make bigger command list window","sha":"712a514c6dd825ecc367d7237b11ebc4fb3728bb"}
+{"author":{"avatar":null,"date":"2015-06-19T13:54:29Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-06-19T13:54:29Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1121 from vlj/rsx\n\nRsx: Improve debugger","sha":"596546df5a20c141a42f0ff9c0b8eb9379006f71"}
+{"author":{"avatar":null,"date":"2015-06-18T12:58:28Z","email":"vljn@ovi.com","login":null,"name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-19T22:52:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"SysGCM: Split default command buffer into 32kb big fragments and swap between them","sha":"9a91b188dfd1661e9934d5281eff87122c5ad6ea"}
+{"author":{"avatar":null,"date":"2015-06-20T14:25:46Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-06-20T14:25:46Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1122 from vlj/gcmsys\n\nSysGCM: Split default command buffer into 32kb big fragments and swap between them","sha":"b25eb39fbae8be86bf92b346ab8b779f0a95886d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-21T22:48:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-21T22:59:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"sysGCM: Fix for getNextCommandBufferBeginEnd\n\nWe were sometimes using memory outside of buffer.\nIt fixes vertex attribute test.","sha":"0993ee08e6862ea77fed6005a2021876ed295198"}
+{"author":{"avatar":null,"date":"2015-06-23T14:53:56Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-06-23T14:53:56Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1124 from vlj/gcmsys\n\nsysGCM: Fix for getNextCommandBufferBeginEnd","sha":"bf74c0c749ff0869e97ee86a5bda66ff0e7f89d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-06-28T16:09:28Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-06-28T16:09:28Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Remove -x64 on exe because now it is useless","sha":"5804ce5f84c6abfe0283212bedeb690e2d6d1a9f"}
+{"author":{"avatar":null,"date":"2015-06-30T16:26:01Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-06-30T16:26:01Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1128 from Zangetsu38/patch-1\n\nRemove -x64 on exe because now it is useless","sha":"01bb63b1a636c5ec90a806fb838d76ec1208df2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-06-30T18:36:46Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-06-30T18:36:46Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Add Icon on the .exe\nthx BigPet for you help","sha":"1b5f2579a596e4f4dab89c8c88b78d85a149c268"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-07-02T03:07:48Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-07-02T03:07:48Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Remove win32 Debug - MemLeak","sha":"c47082f72593a53d3b658403f7287c664eab138f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T16:35:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-02T17:01:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSX/GL/Null: Move semaphore handling to backend","sha":"288581cb43aafd9ad2b528d471b010a8fd891026"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-08T18:09:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-02T17:01:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSX: Do not emit error when parsing NV4097_SET_NO_PARANOID_TEXTURE_FETCHES\n\nThis opcode disables whole quad fetch on RSX, this is handled by drivers\non PC api.","sha":"4485e6b8695be4cdce3c56d325ff6768d1f784d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-03T16:49:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-02T17:01:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"GL/RSX: Let backend call LoadVertex themselves.","sha":"5abeec85ccd63d7cf819033020630ef5e3268dce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-09T08:41:40Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-02T17:01:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSX: Use CELL_GCM suffix for index array","sha":"3a0894aaeab34f20e9f00bcac8c383fba8771ee2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-02T17:05:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-02T17:05:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Memory: Add a callback allowing customisation of handle_access_violation.","sha":"4a7f6af8d97ff959a74b967218ea110908cf18ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-07-02T17:10:00Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-07-02T17:10:00Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Update Submpodule asmjit","sha":"7d576117f9fc41586b7870172fbceda38bbf4737"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-02T17:05:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-03T15:08:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Memory: Fix virtualProtect protecting too much memory.","sha":"972515938c945b55813e8d9fb1f87470c443373a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-02T16:52:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-03T15:08:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"RSX: Rename and document function member.","sha":"f4efeabcf34af5ff062714c7dc9711721d919631"}
+{"author":{"avatar":null,"date":"2015-07-04T11:02:30Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-07-04T11:02:30Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1133 from Zangetsu38/Zangetsu\n\nUpdate Submpodule asmjit","sha":"1e30077a65780b28e5ec879b6218b2b7ac625524"}
+{"author":{"avatar":null,"date":"2015-07-04T11:02:45Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-07-04T11:02:45Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1132 from vlj/rsx\n\nRsx: Some interface changes","sha":"a114dbcd763ea46b797afa7fac65a3a647997018"}
+{"author":{"avatar":null,"date":"2015-07-04T11:03:06Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-07-04T11:03:06Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1130 from Zangetsu38/Dante\n\nAdd Icon on the .exe","sha":"a27a51124f4f2dbb59450138876afe393f36eb05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-06T07:12:17Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-06T07:12:17Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Added NV4097_SET_TEXTURE_CONTROL2\n\nStill need to use the parameters that are passed.","sha":"30c25cb72245191c612feac368d42c6cd6144a4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-06T11:47:49Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-06T11:47:49Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Improve cellGameBootCheck","sha":"61cd591ad5e67889bd46caaf0fe8300bc7cb3662"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-08T16:16:18Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-08T16:16:18Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Make icon show on actual window","sha":"0acd37a328bbc046f6adafab0f49edd2a91ac676"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-09T17:19:29Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-09T17:19:29Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"SysCall improvements","sha":"909b5124933c95cd5d3957515f4c43929d36b7bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-09T17:42:39Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-09T17:42:39Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Re-do network status and add it to settings","sha":"f2721710995aad2255408710251c118db05455c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-05-31T22:13:18Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:26:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Swapped buttons positions in about dialog\n\nIt's much more intuitive (and common) to have OK in the bottom-right\ncorner.","sha":"ee2940c159c3bf97526ccd964fa583c5815e5627"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-05-31T23:01:54Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:26:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Deleted unneeded xaudio #ifs\n\nThere is no improvement in 2.8 and on my setup (8.1 x64) it always\npreferred minidx headers anyway (so it'd still load 2.7 dll).","sha":"6ce793d582a32cb081077ba82d4ab631289e661d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-06-01T23:28:04Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:26:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Initialize pointers to null on creation\n\nFixes access violation in hello_world.ppu.elf on window close.\nAs I understood the reason - when dtor of XAudioThread is called it\nchecks:\nif (m_source_voice) Quit();\nBut m_source_voice isn't initialized to 0 by default so when in Quit()\nin tries to call some funcs from unitialized ptrs and access violation\nhappens.","sha":"8483b1799545f8076fb1d417818ae34804892891"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-06-04T12:57:05Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:26:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Trying to fix potential resource leak","sha":"e338c3938b021698744b67a4e5339f61068d5dca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-18T11:55:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:30:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_open() O_APPEND support\n\nAdded vm::static_ptr_cast, vm::const_ptr_cast, vm::reinterpret_ptr_cast\nAdded pointer comparison with vm::null","sha":"63c5b2ab321b299e602a4d2eb58ab09a82d07ead"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-18T16:39:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:30:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::ptr fixes\n\nstd::function conversion removed (since it's convertible anyway),\npointer difference return type changed\nvm::cptr, vm::bcptr aliases added","sha":"7eacfe19f6eb71b6550e95c78d9054e1b6110644"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-19T15:49:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:30:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Using vm::ps3 namespace moved in proper places\n\nVarious fixes","sha":"edb95957213fad5b10aee65f202c38b96fcb6582"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-19T16:53:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:30:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"8229c0ed3d99a43785d2010e1a773c57df025dea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-20T23:04:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:30:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PSV modules refactoring","sha":"bc9481db1bf00645df05dc715dd583f5714fd5d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-21T00:17:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:30:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"6c4148a949d6c28f8b01a5f9ac381a006650c6d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-21T01:04:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:30:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ARMv7Context used through multiple inheritance\n\nForgive me...","sha":"a7f77c27f7d3497714061a7f63c8d7b2cd302c68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-21T14:48:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:30:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Added .aligned() method for vm::ptr\n\nAdded set_alignment() macro for setting alignment\nAdded alignof32() macro similar to sizeof32()\nAdded CHECK_SIZE, CHECK_ALIGN macro with static_assert\nMinor refactoring","sha":"e896da806444aee8723f1dc6878fb076f99235e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-21T22:27:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:30:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::cptr/bcptr/lcptr used widely for const pointers","sha":"317417d54119640cad6a7b2a03d1164536eaa4fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-22T00:03:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:30:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Small fix","sha":"c0fdef7a12b614a79e8e852458649e4cbed15890"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-20T18:35:02Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:30:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPURS: Implement SPURS SPU thread exit using throw\n\nConflicts:\n\trpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp","sha":"5b7f701878cc198cdbbf3b37be7af654012a751b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-02-21T20:54:53Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:30:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPURS: Implement some portions of spurs initialization\n\nConflicts:\n\trpcs3/Emu/SysCalls/Modules/cellSpurs.cpp\n\trpcs3/Emu/SysCalls/Modules/cellSpurs.h\n\trpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp\n\trpcs3/Emu/SysCalls/lv2/sys_event.cpp\n\trpcs3/Emu/SysCalls/lv2/sys_event.h\n\trpcs3/Emu/SysCalls/lv2/sys_lwmutex.cpp\n\trpcs3/Emu/SysCalls/lv2/sys_lwmutex.h\n\trpcs3/Emu/SysCalls/lv2/sys_semaphore.cpp\n\trpcs3/Emu/SysCalls/lv2/sys_semaphore.h\n\trpcs3/Emu/SysCalls/lv2/sys_spu.cpp\n\trpcs3/Emu/SysCalls/lv2/sys_spu.h","sha":"46e4f2d48c7d5b16f933f5340f8b355ee6e0191b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-22T20:01:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::var fix, vm::ptr improved\n\nGetCurrentPPUThread() removed","sha":"714da1aa7caecda992e1637c005a1ca3bc7286d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-03-05T20:08:19Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPURS: Implement some core functions\n\nConflicts:\n\trpcs3/Emu/SysCalls/Modules/cellSpurs.cpp\n\trpcs3/Emu/SysCalls/Modules/cellSpurs.h","sha":"dc92a79fcc0fe2f997a190bdd9281411ec6aaa00"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-03-08T13:48:29Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPURS: Use atomic ops to implement some portions of event flags and trace\n\nConflicts:\n\trpcs3/Emu/SysCalls/Modules/cellSpurs.cpp\n\trpcs3/Emu/SysCalls/Modules/cellSpurs.h\n\trpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp","sha":"fe67504ffcf4612bfc8adf473a6891a6c931f9c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8566303?v=4","date":"2015-03-09T19:21:05Z","email":"gopalsr83@users.noreply.github.com","login":"gopalsr83","name":"S Gopal Rajagopal"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPURS: Fix some bugs\n\nConflicts:\n\trpcs3/Emu/SysCalls/Modules/cellSpurs.cpp","sha":"a800d21a317412562b205e7243b9259d82927cce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-24T11:53:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"be_t constructor implemented, make() eliminated\n\nbe_t enums are forbidden, le_t improved, some operators cleaned.","sha":"ef6f9f6ded229f40f30f70c6871dea06cb305538"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-24T16:25:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"re32/se32/... macro eliminated, some fixes","sha":"39f836b4956c257c99d88442f44bd4cdf870550f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-25T23:26:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic_op() rewritten, atomic.h refactoring\n\ncellSync refactoring, wait_op() rewritten, bugfixes","sha":"c598fe7aa9f621b5525175ce43ff05292837ebfc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-26T14:45:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::var replaced, atomic_op simplified","sha":"ec68e012f97fe171fb2bebc3c572e2d83ab0ea7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-26T21:39:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellCamera fix","sha":"b7a320fbbd2d281e37445422f1116a332ba39e65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-06-30T22:25:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ThreadBase rewritten (wip)","sha":"3aefa2b4e19b612cb81a2fe25c9d914a88601d01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-01T17:09:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Some fixes","sha":"6f1e76198aeedecb4d5113f823a374cfde1293e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-02T01:54:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"EXCEPTION() macro usage, sceNpTrophy improved","sha":"32d3d1fbe5677a5b682e9f46f2f7f78f76d6208f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-02T10:54:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"8c00dcd02d147388fff27f9de70f6c416aee4b77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-02T23:11:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VM_CAST macro","sha":"721ad404d2f8f96dede02078d7e33d9e2e006165"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-03T16:07:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU fixes, various fixes","sha":"8f9e1100c82d3b9e4d94c3839dc7f5275b0f43fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-03T23:22:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CHECK_EMU_STATUS, autojoin_thread_t","sha":"3064cf8101ace399f0f457512ff4c0a4e62c060c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-04T19:23:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor cleanup","sha":"22e1da5e7697f8f08ca8a441569c8421544dcc74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-05T23:21:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_time_get_current_time fixed, CALL_FUNC draft","sha":"83321c5be7ee8236ff19e7eb8c9122c156b40ec8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-06T19:35:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPUThread fixes, thread_t cleanup","sha":"eafddd9e33198983057c38412f2efe94443409f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-07T22:33:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sleep_queue_t rewritten, used in sys_cond/sys_mutex\n\nSome synchronization fixes","sha":"c0f13f7084c062e21edf27dd4e1509db64905c6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-08T15:01:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Small fixes","sha":"82781e620a482005b138bbaa29b93aa9b55ec616"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-08T17:45:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SC_FUNC improved (faster compilation)","sha":"096fc86f17f8c49f159c679198b7d676e3bf0944"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-09T00:33:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ARMv7 func binder improved (faster compilation)","sha":"daa93a7226fc7b312828ba81e19dd0e40a4d0ffd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-09T15:30:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_lv2dbg added, bugfix","sha":"4bacfcf8472ab00ee148813944186ca687e50ad3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-09T19:55:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T01:31:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"IdManager collision threat fix","sha":"39629c5c7a9779101c4f37345f54478f2166ebee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T14:45:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T17:37:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_memory, sys_mmapper rewritten\n\nLogBase::Fatal() removed","sha":"2d37c6b5e2b9bfd37db6754befe56144beff0067"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-10T18:01:25Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-10T18:01:25Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Update travis to use gcc 4.9\n\nDue to this change: https://github.com/RPCS3/rpcs3/commit/de9a2fd556123a3bcde4752a9d419db045b10d00#commitcomment-12110160","sha":"b7c71489372704d2b2f5f0d2107e3682ee639d84"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T23:38:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-10T23:38:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Log style fix","sha":"06dacf04b59fb1fde0120960ea4268f581934284"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-11T00:15:07Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-11T01:46:27Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Fix for icons on OSes other than Windows. Small fixes for travis\n\nDidn't test. Also added memory monitoring to travis.","sha":"7795305c9fbf106bb37eaf2f6270f0587bd3c6ee"}
+{"author":{"avatar":null,"date":"2015-07-11T11:25:42Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-07-11T11:25:42Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1136 from Nekotekina/master\n\nVarious changes","sha":"b08c3186befb43d5703e3e69ff85c3a29241ac09"}
+{"author":{"avatar":null,"date":"2015-07-11T11:26:23Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-07-11T11:26:23Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1139 from danilaml/patch-2\n\nUpdate travis to use gcc 4.9","sha":"aad293df1a64fc6d87249ec882b6bcabba2d6db4"}
+{"author":{"avatar":null,"date":"2015-07-11T11:27:32Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-07-11T11:27:32Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1140 from danilaml/linux-icon-fix\n\nFix for icons on OSes other than Windows. Small fixes for travis","sha":"916967a7d7bf37f3eea638b597b77cff8ffb09c3"}
+{"author":{"avatar":null,"date":"2015-07-11T11:29:47Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-07-11T11:29:47Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Update MainFrame.cpp\n\nUse _WIN32 instead of __WINDOWS__","sha":"3896c39cebe5bc38729a96b356d17b156787faa5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-13T19:06:16Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-13T19:06:16Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix saving and some more logging\n\nFixes Shin Hayarigami (BLJS10279).","sha":"66cf864ee06e11dad4ed3a03233e5aa71a43ea47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-14T11:45:31Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-14T11:45:31Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Better fix for savedata and cellCamera improvements","sha":"ddcaf4972fc898697c9c045d1560530bd1301509"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-14T12:07:23Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-14T12:07:23Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Add sceNp2 and some sceNpMatching2 functions","sha":"80b544aa78def200d5bd0da14c08567fc749ee3b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-14T15:59:10Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-14T15:59:10Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix Travis compiling","sha":"2e3113b5f2f23550a45ff5d5e074ef1b76ba4d4d"}
+{"author":{"avatar":null,"date":"2015-07-14T17:03:33Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-07-14T17:03:33Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1144 from tambry/tea\n\nSaving fix and improvements to sceNp2 and cellCamera","sha":"93e850404eb0c469de311abeff2c1b642cfb3c5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-15T08:52:20Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-15T08:52:20Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"cellRudp improvements and fixes","sha":"82733e19439cc1d89b36145a41a0b7fcda62df0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-15T13:21:41Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-15T13:21:41Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Draft socketselect, other minor fixes","sha":"6beec80b60aa532a1547873e2f048c7ee6e99101"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-16T11:31:59Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-16T11:31:59Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Minor savedata fix and cellSail callback fixes","sha":"6305d4edf98449522e247d3df4d75e9b95e1adbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-16T14:09:42Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-16T14:09:42Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Huge improvements to cellNetCtlGetInfo","sha":"746be46f1eb8d6547fbc5bf9ce971339dee6c46c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-16T17:28:47Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-16T17:28:47Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"sys_net and cellRudp fixes","sha":"67e647a2ca4836600bd6cd4073191720e6fa5d55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-16T18:36:06Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-16T18:36:06Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix Travis compiling","sha":"5f43360711228c3aefad19e78823a8293db165ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-16T23:45:51Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-16T23:45:51Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Enable travis-ci for all branches\n\nexcept ppu_recompiler (dead branch).\r\nThat way it's much easier to setup travis on forks without messing with master yml.\r\nI see no reason to run travis on master only anyway.","sha":"8f7e70d959e2d573bf575bdc1435e2b5eb0821f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-17T00:25:47Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-17T00:30:45Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Enable colorized output for gcc\n\nSince we use 4.9 now. Makes reading logs much easier!","sha":"aad97aaea1e98dc1c434be6d620f3e1cfea44e8b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-11T20:44:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-18T00:12:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"\"Memory\" eliminated","sha":"48c75105e22c32d25a4c89f3c2d28b6276647527"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-12T11:52:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-18T00:12:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silly bugs fixed","sha":"b8a27d8a4cbf85cd17c11d2e3c8060dc43acba8c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-12T21:02:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-18T00:12:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_interrupt improved","sha":"3bc6c53eb372d46314d7493b093d83cf6c21fbf7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor bugfix, cleanup","sha":"a8fcf71f9c2d6faaec2cee1bed5e7d8df00a9e2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-15T11:58:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"waiter_map reintroduced, combined with vm","sha":"1e021cdbbaf9438271f77b9caa3bf2ee1167eccf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-15T18:11:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU_EVENT_LR improved","sha":"a7668ff57f716a657148625fbe6a7a04da2e2fbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-16T00:19:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Exceptions passed to wait_op caller","sha":"1519a2b468b8acf34e2da9e3090cde8e90da698a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-16T11:32:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Interrupt Enable Status implemented\n\nSPU Interrupts are still NOT implemented","sha":"5bd83516ba7030788e4b3a1e9286483bee1dc816"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-16T16:31:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Very bugfix\n\nI reverted cellSaveData changes since they were relying on the\nuninitialized local variable `save_entry` and thus were almost\ncompletely wrong.","sha":"9913c9059c035fb12214346f906e013e285ebf0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-17T16:27:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Channels improved","sha":"43d3ccce95c8b7021c4d0a0c01e000653720940f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-19T01:56:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_cond/sys_mutex improved","sha":"8175630619a850d41c88b39667140720a54ea31a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-19T11:36:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor style change","sha":"2f7fe35f5c0a79afc423a6cb61ac3ab2c32b25e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-19T12:58:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_event improved","sha":"bc91ad0f4dbc682f6eaa9f06e6eab3b590f7a152"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-19T21:29:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_event_flag improved","sha":"6255f3b07d99acc0be32a195d267a19324c4eef4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-20T16:46:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_rwlock improved","sha":"6019e024572348bd2a5fb0a8d75070b48b49f741"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-20T19:41:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_event improved, some unnamed functions named","sha":"0aefaec46ec6efb61cac11a3101288f72d116519"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T11:55:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_semaphore improved","sha":"023d385af8f6ab1785b1ac9913e95429ecc20300"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T14:39:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Some macro removed","sha":"6462201aacc931c00636992b8d06da036afe562f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T16:35:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T20:14:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_lwmutex, sys_lwcond syscalls improved","sha":"cdf38d15d21e01d0b4927b0c7758141c7d68e6bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-17T22:16:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T22:32:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/LLVM: Fix for callback spinning undefinitly\n\nThanks for Nekoteki for the fix","sha":"b7d5d70a92ba3716193a23418cbcb2607af35e4e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-21T15:33:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T22:32:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/LLVM: Fix branch detection\n\nThanks Nekotekina for the fix","sha":"cfa0079c3de605865b067421f5c1e20468594867"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-05-08T17:53:57Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T22:32:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"add various temporary VS2015 changes (some to fixup temporary bugs, don't merge)","sha":"ecf78dbafe7d29326c162b8ff75a1709ac2e3b7a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T23:10:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T23:10:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VS2015","sha":"b3dfa4f5a27d15166b8bad1fd9b5a7e1a6499278"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-21T15:11:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T23:10:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/LLVM: Fix build","sha":"7592b87a904b0e0403f7c8127f4fcf2f3003a2cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-21T15:11:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T23:10:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/LLVM: Rename ExecutionEngine to CPUHybridDecoderRecompiler\n\nIn order to avoid naming conflict with llvm own ExecutionEngine","sha":"abd61538ea4fcaf1db7000e4bf5817b27e460ffa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-21T15:15:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T23:10:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/LLVM: Do not cache block","sha":"4adb9a2683786b70145b7596524b193218f5e8b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-21T15:11:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T23:10:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/LLVM: Clean code\n\nReplace auto with real type, reduce indent and useless variables...","sha":"501c14fc65585176900ff11f8083bf5d4a378cf3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-21T15:14:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-21T23:11:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/LLVM: Remove duplicate m_address_to_ordinal map and improve cleaning","sha":"26f6b89530ecb6a9e8f0aa29e30dba484074b25b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-21T19:46:21Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-23T07:45:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Purge llvm compiling from travis (yay!)\n\nReduces build times greatly.","sha":"af90f03323190b4be4448ce115654de8cb90c015"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-21T19:47:35Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-23T07:46:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Change jit to mcjit in CMakeLists\n\nThis fixes compiling on linux","sha":"831858ce7eb97dd9746ec91283365ae0c99a278a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-21T19:55:02Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-23T07:46:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update .gitignore\n\nI think these files are sometimes generated by vs15","sha":"10c5d87f183f697c3e7aaf9e597a96c8579d585d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-07-23T09:38:11Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-07-23T10:17:58Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"use official wxWidgets repo","sha":"4624377942d4b09c4e3726c196af1a6d467f2a1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-07-23T11:53:10Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-07-23T13:05:23Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Some small change.\nUpdate README.md for VS 2015.\nremove sln buildbot\nremove unused appveyor config\nremove package.bat, no longer current, now found in bigpet/rpcs3-buildbot-tools","sha":"e47493e81bfb2dc4813510d050b73b254fb319be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-24T10:33:29Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-26T13:34:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Better cellNetCtlGetInfo logging\n\nAlso added back some more logging in cellSaveData, but this time only\nprinted as warnings.","sha":"9ecedfdf3cfc63b95abf13e44c64d1eb23a13e75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-24T14:53:26Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-26T13:42:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add NV4097_SET_TEX_COORD_CONTROL arguments\n\nAlso added a TODO for _cellSpursLFQueueInitialize.","sha":"45dda65ce9fce1fdab505b3ff9b8455da0bf3404"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-24T16:30:15Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-26T13:43:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFont cleanup","sha":"7b0b0440eff77cebc9e27b24108e50f425e8b59a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-24T16:31:16Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-26T13:44:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Split sceNp into sceNpUtil and register sceNpClans","sha":"6ef4cecf571fc8c640ad74c35b7c36efbf6732ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-26T08:14:56Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-26T13:44:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor formatting","sha":"14897b23b7705473d799814c09194de74d6c94b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-26T09:15:15Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-26T14:04:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSpurs additions and internal struct refactoring\n\nAlso updated the README.","sha":"a239eaf6302a929367cfbf0395e0ffbe510a0c39"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-21T19:53:02Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-26T15:09:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update llvm tests to work with new mcjit recomp\n\nWIP, also found some offending instructions with it.","sha":"68329101873e4245acd3627f6265e3e907d8cd3d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-23T17:28:03Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-26T15:09:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Tabify","sha":"6849192b39bba33c2ee5fc86d68a7278018924b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-23T20:55:42Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-26T15:09:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Clean up and fixes","sha":"e810eabd32c90ac5a9164fb2a32aa39514c75687"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-26T13:41:23Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-26T15:37:14Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Add missing override specifiers","sha":"5ae6586803fdcc5594ec83df4510bd2723c4c1c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-26T20:24:37Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-26T20:24:37Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Fixes for some of clang warnings","sha":"582329ffc638f55549c99b0d4b1f46fe336c0f92"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-26T20:48:59Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-26T20:48:59Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Fixes for trigraph, unused and tautological warning.","sha":"e0d5cdd5e150cc881a41cd976571a5b9360f58b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-26T22:48:17Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-27T00:01:43Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Fixes for abstract class without virtual destructor","sha":"9a37acee3e313b9e6087298b909fb8b9ced95fe1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-26T23:45:25Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-27T00:33:59Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Replace clang diagnostics with gcc\n\nClang understands both types of pragmas. Unfortunately it seems that due to bug in gcc (id=53431) this doesn't help","sha":"caa6db861768b6c1785111417169c081ba816edf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-27T00:40:42Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-07-27T00:40:42Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Try to disable -Wformat-security at all\n\nonly fmt triggered it (gcc bug?) and we have clang too so we can live\nwith that until they fix it.","sha":"6e6170ae1cff1970de45f6bfbf0c700ed7369f84"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2015-07-28T11:03:56Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/179760?v=4","date":"2015-07-28T11:43:35Z","email":"lw9k123@gmail.com","login":"darkf","name":"darkf"},"msg":"sys_net: Implement socketselect","sha":"2f8a41d8103e4b3ac7477776fe8bd58b0d26ca8c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8782059?v=4","date":"2015-07-31T20:15:07Z","email":"davellidavide@gmail.com","login":"KaOs1","name":"KaOs1"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8782059?v=4","date":"2015-07-31T20:15:07Z","email":"davellidavide@gmail.com","login":"KaOs1","name":"KaOs1"},"msg":"Install PKGs into custom folder","sha":"804ee1183bceaf73108fbc5985c776e48cdcb781"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-26T00:53:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:38:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"b8 type","sha":"ffc11bfda3247f4a7cffd618528d4c9133117866"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-26T11:21:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:38:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.h, sys_cond/sys_lwcond improved","sha":"31774b72626deecfe8c4533aa46e1b58e6a21d50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-26T12:10:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:38:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"func_def eliminated","sha":"be2f993155098052ffbf42db10c5749899b6a213"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-27T01:06:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:38:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellMsgDialog race condition fixed","sha":"3d665148cab6b2fb7169a2f3c821fad2b08a2fb0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-27T01:07:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:38:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPUInterpreter formal fix (affects nothing)","sha":"ff1f6d3d4f7ecb5cd967488f3b9f6ceb96774813"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-27T01:18:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:38:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::wait_op improved\n\nNow it accepts thread_t and its descendants (but may require adding\nfriend vm::waiter_lock_t class)","sha":"71a378a3fbf24975ea8845ffc1e4bdffe62e2379"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-27T01:27:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:38:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"semaphore_t, RSX fixes\n\n1) GS_LOCK_WAIT_FLUSH semaphore eliminated\n2) GS_LOCK_WAIT_FLIP semaphore left unused\n3) cellRescSetWaitFlip/cellGcmSetWaitFlip purged: they don't wait for\nflip, it's a nonsense, they only generate some RSX command\n4) Semaphores rewritten","sha":"8e1991c1e1d889edf0a63fc56e33be029b28c460"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-27T11:40:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:38:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"decode_x64_reg_op: MOVUPS support","sha":"16b7d204d211b8dc85b2617da958334d8b38e7a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-27T14:59:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor formatting fix, cellRudp fix","sha":"5815d90eb408da51ee7d1a5bdbe88c5f3b780d9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-27T15:43:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Added on_error handler for Module","sha":"25056f49c44a5c8bed3c0da3dcd39df1fc0d9710"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-27T15:50:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor formatting fix","sha":"a12220d2344afc5d9f4d4eaa2b0d7fbd24601c07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-28T01:38:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellAtracMulti stub added","sha":"3cc0383db7142753d876d277e8d2d99af1379983"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-28T02:08:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData module added","sha":"02c0b69adb02942dbd797020cde56fc94018b4ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-28T16:01:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fixes","sha":"badeb299018ed9a2132eff7e0db009298cfb6cd6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-28T21:34:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"File/dir descriptors numbering experimental impl","sha":"06ef95fbea3a2953ae29b671f7096aac3f6a4e48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-29T12:57:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellCelp8Enc, cellCelpEnc module added","sha":"13a5a961175fd6f9b3dc3c1439985d94b1d5e1dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-29T14:40:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellHttp, cellHttpUtil, cellSsl, cellBGDL added","sha":"5a9896c78ce8c14f48df972617915afc72f823de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-29T15:39:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellJpgEnc, cellKey2char, cellSheap added\n\nModuleManager cleanup","sha":"ae7333031453d089e598882ba5198cb28bf8165a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-29T16:08:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellPngEnc, cellSailRec, cellUsbPspcm modules","sha":"9b928ee83550b45f2f152e216fccbad882e4a0ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-29T18:35:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellDaisy, cellSpudll modules","sha":"776eafa0cefd78697014863633059e14e37d9837"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-29T20:55:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.h fixed","sha":"16ad4936eedc77f5d45f10bbff8e5aa7e9bb8c33"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-29T22:30:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellGameExec, cellAvconfExt, cellSysutilAvc2 modules","sha":"c364c6a7871657c8834e676b253e7208eca1dd98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-30T00:10:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellImeJp, cellMusic(|Decode|Export), cellSysutilMisc","sha":"7361b4e079a5f54387c757406b95448dab822f6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-30T01:43:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellOskDialog, cellPhoto(Decode|Export|Import)","sha":"2eaf5cdc013f864cf0296a25fd98be5c116a1375"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-30T01:56:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellPrint module added","sha":"08b6428d5cf50ed7f16656b6d6da672df73ce433"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-30T22:53:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellRec, cellRemotePlay, cellSysconf","sha":"137a38b3c68af8f5446be0c5fd849f786add5e8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-30T23:11:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellStorage.cpp, cellVideo(Export|Upload) modules","sha":"eb5974322fd126a9e00a79ca1dfadf1ca24684ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-31T18:48:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ModuleManager cleanup","sha":"a2646f98717ffe3e3043bccba7d5afbaba8be956"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-31T21:47:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Modules cleanup","sha":"b391e934667febe1a2abdc1c0e626a11fffd5304"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-07-31T22:48:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellL10n, cellRtc, cellSail cleanup","sha":"ce9cd13e42ffdb6b04ebf7d7222f8e33652789b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T01:46:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T11:39:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Some functions added","sha":"0b1e45b6b521647f794718044fef1e4f77582dbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T16:14:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-01T18:49:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSysutil crap split, cleanup, functions added","sha":"8fcaac5f1d2d88e982a7e8d67a7bd9685566c6de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-24T21:57:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-01T19:56:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Try to fix crash (again) when cleaning modules","sha":"8f490e8ecd3d938a20c776ef58a5b760de243b4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-02T01:06:59Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-02T01:06:59Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Log stdout and stderr on win\n\n(Some modules like llvm can repport errors to stderr).","sha":"8f00342612e6f28126d8ec75b6f5481129585029"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-02T01:04:02Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-02T01:16:44Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Fix crashes in tests with unresolved \"func\" errors\n\nand uncomment fixed tests","sha":"eac63f72659974888aae5511a362f672d24afaaf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-02T02:15:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-02T02:15:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sysPrxForUser module split","sha":"6da5138683b8083024c884d6c1d7457f9bd558f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-02T12:58:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-02T12:58:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #43 from danilaml/patch-2\n\nFix crashes in tests with unresolved \"func\" errors","sha":"8a6171caa591c0f51f36fcafa4f06cf7cc0d7d5b"}
+{"author":{"avatar":null,"date":"2015-08-02T15:53:59Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-08-02T15:53:59Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1168 from danilaml/logstd\n\nLog stdout and stderr on windows","sha":"2a096effa7092598c3a8a70e7c4da643fa0b7256"}
+{"author":{"avatar":null,"date":"2015-08-02T15:54:12Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-08-02T15:54:12Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1167 from vlj/llvm36\n\nPPU/LLVM: Try to fix crash (again) when cleaning modules","sha":"7aa86c50c666df80358e2a80fe9017407b47717b"}
+{"author":{"avatar":null,"date":"2015-08-02T15:54:27Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-08-02T15:54:27Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1161 from Nekotekina/master\n\nVarious changes","sha":"0541371a0ed1d3084f88bbc55b2d3a34d56e3f9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-03T19:07:12Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-04T15:47:02Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Add appveyor.yml","sha":"9a8fa127181f07e8f297270403e6caf1b2faf1e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-04T15:52:16Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-04T15:52:16Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Add appveyor badge","sha":"17a4222c3132e0daf0319d4ad09bb1cf84ef6374"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-04T16:23:35Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-04T19:29:03Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Try to use cache to speed up build","sha":"0f28879f8d5bc22d2cde176300589653b100824d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-04T16:57:41Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-05T00:38:26Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Be a little more consistent with travis\n\nand disable tests (we don't have any). Also cache didn't help much so disable it for now.","sha":"f35a2c8a04a013bfa0279bffed8a4c141f560bef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-05T10:12:05Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-05T10:12:05Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1170 from danilaml/appveyor\n\nAdd AppVeyor support.","sha":"c0f1913e4421e084cad588b3c50987b6fb9bfeec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-02T16:50:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-05T15:27:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Print PPC block before translated LLVM bytecode","sha":"fc3314ea967cfeb62ca815d2c1d9b76f1f589532"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-05T15:25:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-05T15:27:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Fix MTOCRF instruction","sha":"09347ba92a0bdf890d486678a1b12de57c76990c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-06T00:10:14Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-06T00:43:48Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Fix MTOCRF instruction\n\nto be the same as interpreter.","sha":"98a3cbdf84e3c7e8a6ed9f6a7be2b423be867572"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-06T00:16:52Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-06T00:43:49Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Add MTOCRF tests","sha":"a3c22eb8368b99f93251349c65abe9a35b9f3110"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-28T16:06:48Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-06T12:24:04Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"sceNpMatching2 stubs and some refactoring","sha":"91f67b683b7acf04805c6bf6e5e1156740fff65d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-28T20:05:44Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-06T12:24:08Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement _sys_printf and sys_prx improvements","sha":"c12af57bdd7010668aebd3c1e5c7a8b6b447e1a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-30T07:53:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-06T12:24:09Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"cellNetCtlGetInfo improvements and fixes","sha":"c69dfff16e2e4506f473ebd4352e26fb272bdfa2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-07-31T12:15:52Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-06T12:24:09Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Minor cellSysutil improvements, cellNetCtl fixes","sha":"1012a3e312ecc930ef74af13ba4f6916e0d3edca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-01T07:52:44Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-06T12:24:10Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Various stubbing","sha":"480996b14069188be4034bfbd2b1246aa0e677db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-02T09:50:02Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-06T12:24:10Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Minor sceNpManagerGetStatus improvements\n\nMight allow a couple games to go in-game. Also a couple other minor fixes.","sha":"48def8fa5b48a1c5aaff27cf7ebdde08305f89b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-05T06:33:45Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-06T12:24:11Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Minor fixes in cellNetCtl and cellSysutil\n\nAlso fixed a couple minor bugs relating to cache.","sha":"8fd52666b736cab4eb9c3b8cb55cc684e08a6247"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-06T21:42:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-06T21:42:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #44 from danilaml/patch-1\n\nCompletely fix MTOCRF","sha":"cc83a9df3b326fdbed48c5558356dd767f6277fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-04T16:57:41Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-07T15:30:08Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Fix OpenAL and and wxWidgets finding on cmake/win","sha":"fafdc213ed94ac715039c4459c2d9a2c0c961481"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-06T23:27:09Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-08T01:43:06Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Update OpenAL","sha":"36648805b848119cf4428b110818e598e40864e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-07T16:06:46Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-08T01:43:07Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"clean up","sha":"e91589cab5e7bea954939c814283f55128e3e1d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-07T00:35:43Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-08T01:43:08Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Make it possible to build rpcs3 via cmake/vs2015 combo.","sha":"ddff65d28896dffc2665728581ccc72588f9ff54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-07T21:34:37Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-08T01:43:08Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Use precompiled wxWidgets package\n\nhave to use gdrive until official 3.1 release","sha":"e06b33162d414627299339df4754ba5af434d89c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-08T15:35:29Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-08T15:35:29Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1171 from vlj/llvm-fix\n\nFix Sonic CD music with LLVM backend","sha":"fd5fbab1153850a1cd2a778ccb61dcdd0e6d547c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-07T21:53:39Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-09T22:59:03Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Small fixes and improvments","sha":"570e41f8e08d617c8635ffdb03ec52fb7d3f07f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-08T14:05:32Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-09T22:59:03Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Enable appveyor logger","sha":"6e70258d82343f33049e2485f1d4b2293a587314"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-08T17:07:20Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-09T22:59:04Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Fix LNK4098 warning","sha":"1af7e32c933cbd8dacdf33467bb6f4169101e43f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-09T19:05:16Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-09T22:59:05Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Enable artifacts\n\nnow appveyor builds can be downloaded for testing","sha":"6e84db45f2cc0603403df5bdd2d8053f0bbd0d76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-09T21:10:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-10T17:59:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Fix recursive call crashing llvm backend","sha":"53769ae1bd6f8cbb1caa1ef963338341b85d7974"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-10T18:32:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-10T18:32:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Avoid recompiler thread spinning forever","sha":"6e8a5f3a5fdd9959ba8370ab78268c771a1c0362"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-11T05:24:07Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-11T05:24:07Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1176 from vlj/llvm-fix\n\nPPU/LLVM: Fix recursive call crashing llvm backend","sha":"1e9c266457eca0f75c3936b0f8b084f37748f451"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-25T23:39:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T16:10:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Add debug tool for LLVM recompiler","sha":"e459d019272975b0f18b44db9a9803c053897289"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-11T17:44:22Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-11T17:44:22Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1175 from danilaml/appveyor-cmake\n\nMake it possible to compile rpcs3 on win via cmake and make win builds available for download on appveyor","sha":"d10c44ed3acf1b02eb7def96ac92a7d50c516267"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-09T23:05:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Start implementation","sha":"976d707596048f1d2f8dee6d05a2f1b1204ef24a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-10T00:21:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Create window","sha":"0b5816d6d60902612a7b35ce42d6143d6ec37dcd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-10T17:00:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Enable buffer flip","sha":"4f708ab9eec0d1d685765f895759ede1df23380c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-10T17:41:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use ifdef to guard code","sha":"5e7531b9bfd711d8e73d46e56082c172161c3954"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-10T18:17:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: backbuffer are properly cleared","sha":"777363140137cc91fdeb3ad33099c7699134ccab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-10T18:30:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Clean backbuffers and descriptors","sha":"b1c3e0915572a25aee2e8ab280953a14709d07d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-10T18:37:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix gfxcommandlist leak","sha":"2f5a6eb993ac997c6a311e33e0e43ba517e95b90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-10T21:49:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add fbo support and blit it before present","sha":"728736ccdd42956ad272a5ed1c51ec54ff285417"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-10T23:56:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Start caching shaders","sha":"d5b4a31c377d62fabff2f5a890e6f09c30cc9ae5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T12:43:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Update vs project files","sha":"3f24da47a0affbe964ae138563a2bdbd8f35644b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T16:04:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fragment Program caching works\n\nBut not VP...","sha":"c29616b341e70764f98e5ab3e406646f7613e006"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T16:18:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: VS Caching apparently fixed","sha":"0ebc22101100371c29e7070baeeea665b7494a0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T16:38:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: PSO caching works","sha":"e58292bb1151153e7975f26d0bcc7c2959c43fcf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T16:48:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: PSO related reorganisation","sha":"2734c987165fa481658b41098e9c79e987a68fac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T16:52:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add sensible default to PSO","sha":"34bf82d81caab1e33877c86869bd9ee44786d290"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T17:08:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Some fix for creation of PSO","sha":"c6e2f070ee95985b7848dad67598a4a9becf9031"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T17:18:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Some cleaning","sha":"d2889786a224b4416d1223f6441cb4245fb32b1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T18:20:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix some warning and start adding IALayout support","sha":"722e6b8ac5791551d2ee99d0a08280ab48d49407"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T18:45:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Start writing vertex/index buffer support","sha":"fedd35989cf3b195bc2e2bd4f447c7da10bb5f81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T20:46:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: make some shape appears","sha":"14e932315498f611c515bfb71ecf33a8288d0a7b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T21:03:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12; Factorise IALayout generation code","sha":"8ec9f84c1bb20f5648893df568538cf4497dae0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T22:06:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Vertex element are not interleaved.","sha":"9abaf80099a68b7d45b1b780c9f908f66fe42337"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-11T22:14:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix some warnings","sha":"646c908a93ec4fde6ebec5cbb5127923d0685a60"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-12T19:55:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix build with DX12_SUPPORT not def","sha":"6f487f910c663038c434d0be6a9a142f60b395e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-12T21:41:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Enable constant buffer support","sha":"65fbc572216630b131e7b6ff818d82935977c7e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-13T15:00:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix Input Layout","sha":"28b964aeb023735cb5f06e5bbe8b32c883d9ea0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-13T15:01:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Remove useless class member","sha":"1c2849a736a5a3389f8d885b8a423884a35256f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-13T15:04:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Stop emulation if program compilation fails","sha":"d627f9cb83beadfab4c30f1cbcc511898cff5eaa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-13T15:20:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use constant buffer content","sha":"411265d83a774da6ea68d8f6b04d5403da015743"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-13T15:48:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Something strange is happening to depth...","sha":"40e19e0c9513405c688f2c488ad6a0aaf857ac50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-13T16:39:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Separate scaleOffset and classic constants","sha":"07ea311b3a125dbbe781bbed9f2d392ca15ce534"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-13T16:55:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add missing hunk + properly clean our D3D allocations","sha":"b016fbc9e4f64952e1d1126c8e6f435b669d65cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-13T17:08:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Change some variable name to better reflect their behavior","sha":"da5b047c5821892cdd1f9c54873f75f6ebcb0349"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-13T20:24:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: cache PSO State too","sha":"75219be066868d8413a4dee68db114299a5dc857"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-13T20:33:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add support for various primitives","sha":"d93e95b614510ea6b290c86f090e5671a130975e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T15:16:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix some warning","sha":"87d51665dc684b7895943f1ad525476afe695587"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T15:56:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Start working on Vertex program decompilation","sha":"3853dffce235b8061847c74734c1fbcd082fbba6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T16:55:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Dump program parameters","sha":"5a1b756c14975dd6f64ccbaf01624997b3a9aa79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T17:25:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Some extra code again","sha":"96c4e87bf5d0beed47b9455cb66ff4145778eedc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T17:48:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use the compiler vertex program\n\nIt works with the primitive sample.","sha":"3960555e451a2b45f971d6f55987df71eea3b0e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T17:51:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix some warnings","sha":"16f40fb69c34310d5dbe27540ff57e86f265b428"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T17:52:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Some cleaning","sha":"caab6cbc6005b72d91b2468ba9d8123c29c4853d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T18:13:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Move/clean code","sha":"5da166b26bc2358da5264a1b60a15fed23a0a751"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T18:27:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Start working on fragment decompiler","sha":"bb643070bd8dd9df3f42f4d71958fec4e801349d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T18:57:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fragment program decompiler can decompile basic shader","sha":"9cb87552b81d6bde04137bd7327006716b78372c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T19:21:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Support for fragment constant buffer","sha":"ee3e5cfe1f50fff1660a56220afd0acb34f59d45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T22:18:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix linkage between VS and PS","sha":"a276391e870b64335a2a5e672fa47edaf1de4244"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T22:21:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Print fps in windows title","sha":"c96bc6231c6b28704d49d29e5d969718c07b4ada"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T22:51:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: some fix for fragment program decompiler","sha":"88aea7010018d7ff5e36fa201118e12922ea3cb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T22:56:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Support for fragment constants","sha":"b6cc7af8cd4b9eaf3441202609b2b1fb6d3ceedf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T23:03:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Inline constants\n\nIt's slow","sha":"98a924874f2f95911d8b7a59c6178236a3ad574d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T23:27:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Try to fix fragment shaders first test","sha":"f4465013399f605615e92b406b57d229688ea57c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-14T23:49:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Move Constant inside main","sha":"789ed767e23326bd46d925b35464c071e9baeb88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-15T15:38:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Avoid recompiling fragment shader if constants change","sha":"5cb0fe63b833bb0061c62a45660c86d79e160b06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-15T15:46:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use actual hw in release mode + honor vsync option","sha":"d1ebc47867523c7782e0ef8a480397d90569fd38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-15T18:00:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix hash/compare/getSize for fragment program\n\nIt didn't properly take constants into account","sha":"2ac3c66c80b7fda6380a60dbb539ea64a0e24d36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-15T18:23:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix reversed output","sha":"a58974eac83ba26fcc530e1f9dd9279db644a681"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-15T19:48:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use template class for caching","sha":"ba66992ee3bd06ad8e4cc42822329e9d8a805609"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-15T23:09:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix for d3d12 pipeline cache","sha":"9d1993cdee4063e9fadf0e7762eafb72c4d78f24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-16T16:37:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add fragment constant offset cache","sha":"7b6ad026c6da6e0e5b7e666e5e92a609a7880e46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-16T17:10:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Read constants directly from fp","sha":"c3e162b442079ea09be07470858e621dbee608bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-16T17:11:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Cleaning","sha":"f1ab5abe2e58ce32e3fd26274f8a5a450cefc891"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-17T21:16:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Make compilation more robust","sha":"16e8d6349e4aafde73f6d2728132cd7457f46865"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-17T21:34:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Some fix for VPDecompiler","sha":"43f4ed49b4f31cb9102bfc4791a217baf251f3e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-17T21:40:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Some fixes to VP/FP decompiler","sha":"263294d2635c8b940da548af97cd871ade9fd0f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-18T15:53:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Start implementing texture upload and usage","sha":"39039514d159dd22f26932056863b7e0d27af95d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-18T15:55:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add dump hlsl file to gitignore list","sha":"782a11b47fcb35a4215e4b6ea4269306fafd1b5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-18T16:07:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Some fixe to textures","sha":"3a75e6a357a4a6536bb9cb9f86d6957721a27bc1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-18T20:32:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add a swizzle to texture\n\nLooks like shader4componentmapping doesnt work, maybe a bug.","sha":"1f9c8f757a5f2875508cd52e6cc34cb467b737a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-18T20:46:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use correct VS debug macro + cleaning","sha":"4114df50c273546168a823b45989032ec3d193c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-18T20:46:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Forgot hunk","sha":"5640e81eb554fe19b35e17b42a77b663fe5a9427"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-18T21:02:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix depth being offseted by .5 + add depth buffer support","sha":"cbd7d3d6147ce5200994059dd828cd7996531b22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-18T21:41:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use an indexed draw for unindexed quad","sha":"a279aebf315406d3ebae8a5af67408727a8d4272"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-18T22:13:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use naive vertex buffer offset","sha":"2985f2d6e3e2e6395bd93d6a348ecfcc6cc63296"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-18T22:27:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use a default value of 1 for .w channel of output in Vertex Program","sha":"445c7dd884f957c60bcec4ddfd101bfb9ec835f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-18T22:57:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Some fix to quad emulation mode","sha":"edb9a97c172911b35249b4a5df54edc493b2ed96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-19T16:17:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use the fragment decompile class","sha":"c465b6699a368746d7f7ae7568220234ab7f9805"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-19T16:38:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Some work to decompiler","sha":"bf8a48e3bd87008e084cc78592c51a1fd10f1710"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-19T16:45:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add some more functions","sha":"72c84cb8aa51261e093c848190a17387f5fa4957"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-19T16:57:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add more functions","sha":"07449abfc68a41dfd18fb76324c77018179dd1ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-19T17:43:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Update","sha":"05d6c8df602eeb1a6263db85b63b340b02b821f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-19T17:43:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"GL: Forgot hunk","sha":"5681781ab03ece85ea49e5779381bfe575ba84ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-19T18:21:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Update","sha":"d2beafca4de19bd5b6af18ceb4d53ab655b300e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-19T23:21:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use VertexProgramDecompiler","sha":"422a9f1fdc84f4dd4ffc1f1412617545857abe07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-19T23:59:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Update","sha":"3f319760806f156105cc31e9f51e05670fa336dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-20T00:15:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: depth read doesnt crash anymore","sha":"7b25483b676567c4fe710be1d3fb116cee38b765"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-05-20T09:03:49Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Fix crash after launch game one mode release.\nFix Temporary.","sha":"2aedd0633f11b22827e99282169b69fe9ca14e5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-20T21:54:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use heap for vertex buffer\n\nIt should consume less memory.","sha":"f2985f12c145675b969eaedd927bedf74d0587e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-20T22:06:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix for fragment decompiler","sha":"eb1b8b748a399087e526776c4355e4d69a3cd08b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-20T22:33:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:23:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Pass first clear value as clear optimised value to RTTs","sha":"a9425fcf2aa0707055a5e88f63b8e0a6992bf44a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-20T23:14:21Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix for vertex decompiler","sha":"9fc50fcce5228ba8dcba653179e01fb00b6e3256"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-20T23:23:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use true default value for vertex decompiler","sha":"31ea9068dedf61c899263a4ebbe26213b4ba48f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-20T23:24:10Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: DP2A","sha":"b2577833f976e773c575bc9477be1b4d494b60ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-21T21:19:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix for vertex decompiler","sha":"b5f91a6e75720110c0177314573dd981185971de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-22T00:17:35Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"D3DGS naming fix","sha":"1471afcfe62903673fd05b0b390095295ebb311d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-22T19:05:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix fractal not animated in dynamic test 2","sha":"abbd244376eff60dd5de58a9d6e6e1d736675eb2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-22T19:19:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Move texture code to another file + add the copy command as soon as possible","sha":"5872144165c35124c2d7d81fb40cba9657e50ba5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-22T21:10:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Duplicate all resource to do real double buffering","sha":"71b9caf65ad41082181927eaedfef7654790c5ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-22T21:24:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Record command while gpu is busy rendering previous frame + cleaning fixes","sha":"727f54dd327947aeab79c2f108a89f4b1973f3a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-22T22:04:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"RSX: Fix for default value of temp reg","sha":"312ff7e8f5bcb078a4809ff5013260fff33a7b07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-22T22:45:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Implement blend decoding","sha":"4a89432d39eccd8eb3fdf26420fa39f869e1a8c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-22T23:18:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix single channel texture\n\nShould now display font properly","sha":"e6146e4ecbbde1af59ed0e5e60169a6ecf13855b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-22T23:22:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix depth format mismatch","sha":"740354d2c9bdcdfca3ed136e8cc1761bfb996b86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T16:34:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use a heap for scale offset and fragment buffer too","sha":"1076727c7532f7396fc24694c07b99d84fd6bf3f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T16:45:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: properly clean textures","sha":"75202ac55b5319d7c553e9b791c1a839230ecb5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T16:50:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: clean upload command lists as well","sha":"986a39fcfb64f568a8f018368e55d6dcd085c735"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T17:37:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Implement write depth buffer callback","sha":"fafcce6d5f49a30260930f812ade3f6c413492c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T18:13:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do transition when reading depth buffer","sha":"203194479273215573ae70bc710811ff72de4dfd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T18:27:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: src and dst were inverted, fix it\n\nnow depth buffer is properly read, but it is too little","sha":"c08ac779f4c0e482df0a03c0aa2f923772b175cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T18:28:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix depth read size","sha":"18e3e74070367605aa743dc41accae5095329326"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T22:00:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Add config option for d3d debug layer and adaptater","sha":"6e8b94a7e179f73ca19497d5d7bf4dfcf865d06f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T22:15:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Honor adaptater selection + debug output layer","sha":"cb14697aa0ab54b576c3c7702cbf78b715e5789b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T22:18:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix for Intel HD4600","sha":"e88d45b1bf2ee13e0f6f545af4203dcd169f3814"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T23:41:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Start implementing depth to u8 conversion shader\n\nNot used atm","sha":"487fd4dc2a91b9639de12950c920b5c3e1d54fde"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-23T23:49:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: make depth read optionnal","sha":"824b9aa628f261fcc7102f7de5ddb65aac600d05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-24T16:36:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix for rsx_fp_dynamic_test2\n\nThe compare function shouldn't be swizzled.","sha":"6d61e36f5d33cbcb2140a1f97ca70a8956791415"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-24T17:10:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use separate vertex constant buffer for good","sha":"12fc6e6145ceabf3ad30b07442992d6ce9b61dc4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-24T18:19:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use __mm_stream_si128 to send texture/constants data","sha":"bd68d382bd8963af032dcd041b537cc835ddb8ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-24T18:28:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Release index buffer and upload command allocator","sha":"5ce026126505821962845ad8b4ea62779a4a5eab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-24T22:23:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add support for indexed draw","sha":"232c97cc823eb9781d1734ccf0684e35e870da29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-24T22:54:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Try to fix forced quad indexed buffer","sha":"b8073b4e75865edaf75207bca09e8dd330e40b70"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-24T23:13:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use GL enum for primitive type","sha":"2df1220144849d3cb2c9cbe3200777ccfa95a357"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-24T23:41:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix to run fw_vertex_attribute.ppu.elf\n\nA little dirty, need to be improved.","sha":"cd951af664841b2784bd5eaca5fc1d32054876bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-25T08:12:13Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Tex: define more sampler parameters","sha":"9814a92a258d6447aca00f2f7114c20d5df07176"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-25T15:38:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12; Live buffer related code and factorise resource_desc for buffers","sha":"22f413be3a64c61e8d9abdde014463c21378a9ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-25T16:02:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Clean indexed draw buffer gen code","sha":"82545a7b5625cc576642dc6e21c572a53775f653"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-25T16:47:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix indexed quad draw\n\nWe were not positionning the index buffer correctly in the heap.","sha":"e9fab57a0e1be0c905b226e1a7f72f2f80a7809a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-25T16:50:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix var not initialized","sha":"a6770813b18b890fff0563e827fb0989f4797cc4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-25T17:14:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Reduce heap size","sha":"8b8385b0a49a10a838b0b978c6f58459c75e1250"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-25T17:49:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Try to use stream function that doesn't pollute cache","sha":"90e0a89e9b9cb67304a939fc906980bbd911a429"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-25T17:56:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use streaming buffer for index buffer","sha":"2709a3e49af71fda1d1dc09be669b875b3689bc9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-25T22:05:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Try to reconstruct packed vertex buffers","sha":"10cc2c080c8d18ffdbdaa42abb4222ed7dcf3304"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-25T22:09:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix powerOf2Align","sha":"8ad1bc197012506230bde7e47bce01a916fd5128"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-25T22:28:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix vertex buffer reconstruction with mismatching stride","sha":"8bd678afc0442fd0c7b67c5ccad9206ff7a0e4ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T13:48:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix stencil reflect test","sha":"233450a7ca9f082f5412b961074f37c6bda1ef88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T13:58:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Another fix for vertex buffer not big enough buffer","sha":"c5a1f8930fa55016cb5bbbdcfab6362932bdcf0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T16:36:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Implement semaphore","sha":"9c193e02829f63c653c3cc875479f2fc450710c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T16:57:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Make waiting thread sleeping","sha":"bc25f4d6ad74a3cfd2f68a0fe7b268f3b5cc6200"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T17:19:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: fix stencil reflect again","sha":"b72d435ce87d5ddd0a97fef7c7fab091b87017b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T20:59:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: DMA depth buffer when semaphore write is asked.","sha":"1228787355fdd618d4079aceed523f407cb7fe20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T21:04:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not bind depth stencil buffer if depth test is disabled","sha":"56853de0efbb7f7f4ab73d6663b4303f4e32db9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T22:06:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Convert depth buffer on gpu","sha":"b50ab149d6cb14c5b418e688c3ebdc853276fe81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T22:14:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix format of depth texture","sha":"f6182479377d352fce578d26b4f7765cc046c828"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T22:27:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use copy queue to transfer z buffer","sha":"7a431e85f6c054b2624e8601390ca33f0c3ea47f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-26T22:41:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix double release","sha":"b81fd132329726caee5d823e1699769de36552b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T16:05:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Revert back to a signel resource storage\n\nUsing two of them doesnt increase perf atm but eats twice the space","sha":"c167a1228efeec1f1748fb6b1c2172b9b5271997"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T16:36:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Start supporting mrt","sha":"f77e2acfbe99dbade0181f303f3815a02cbd37ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T16:49:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Disable depth test if not required","sha":"79420e52a24da203e02d0013ca6f6de4e4ab61c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T19:19:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use a dummy texture to fill unused slots","sha":"88d05a08cf18959915ea81863a66ad5316bb87d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T19:55:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add some other texture case + factorise resource desc code","sha":"52a68875fce53e23a83d1f239464ff31b40155ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T20:07:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:25:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Implement texture swizzling and untiling","sha":"b5a7637b49925582f95951d312a1decd01e400f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T20:29:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Start supporting dxtc1 format","sha":"7b571aab70b94b32437e6e7b5799e6754edd66f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T20:56:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix texture loading for fw_fog.ppu.elf\n\nColor are wrong though","sha":"68a62f897d6b5bbfffc16c2332bee3d18b9b728e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T21:00:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add D8R8G8B8 format to texture\n\nShould fix human.ppu.elf","sha":"3a029efbd3b3347ab0724671c20f032ca539e000"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T21:12:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Factorize resource state change","sha":"af69803ee087c3e6e5dd238dc0a28dcfaea2e8f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T21:15:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use graphic queue to download depth buffer\n\nFor now go to the easiest solution and improve later","sha":"74dab18174f03e17fd1d10ef2db50a30ccf1e85c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T21:48:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix a warning","sha":"53ac34db358848bc47372f1c7794738e497e99a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T21:57:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Send RTTs to cell memory when a semaphore is released","sha":"f12cb9b5196df975b62edb4805dad4dc8be00e65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T22:45:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Lower memory storage","sha":"906146d8f69a01e4b4ad7233f12fc475aa83424b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T22:59:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix copyToCellRamAndRelease copy size","sha":"262d3d0755d91905a6c3126614c304f975c837cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-28T23:09:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix increment size for sampler and row pitch for swizzled textures","sha":"3e11598941b49c9a193c40ac44ddbce9b7c450f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-29T14:56:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: First attempt at read color buffer using dma address change\n\nIf address of m_context_dma_color_a change, copy the RTT in a texture\nthat can be used for drawing.\nCurrently a bit broken, the rtt is used for others textures too...","sha":"595392428d06cb11c08326e903989ce80997b845"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-29T15:03:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix non mrt samples","sha":"cef58da8792be54b37b92d0676ed816448b23cee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-29T15:13:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix cube_mrt.ppu.elf\n\nIt should display a (single) blue cube","sha":"da328c078ae024e08ad310ef4af5b093c480b8cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-29T15:16:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix memleak","sha":"8e9cdc5fea88be477842a199de87543d396e3ba6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-29T15:45:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Enable multiple mrt read","sha":"f382ba03196a8873dc5cdb6610c5f6bdc3f4582b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-29T20:43:53Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add LogicOp","sha":"d8f76f5aeecce238943660f99b053dd3643f9ab7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-29T23:22:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12; Add a texture cache","sha":"90fb4396feb176ebc25c48250d69e315ae8d2565"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-29T23:58:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Start using heap for depth buffer readback","sha":"6877e5e3bac19edb518b164cc1b3e6c455c05f93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-30T15:55:35Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add DXT23 & DXT45","sha":"046e5228518d6ae2698141cd2f2e9ba4d8935a2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-30T16:36:25Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12  : add few more compressed format","sha":"28c125618a0b1bdfe9dbf01e4a1246bb8d5ef4c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-30T21:46:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use placed resource for mrt readback\n\nShould be slightly faster (no allocation)","sha":"2636fb457ec63e0e124210d4b23988e884f8c768"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-30T21:52:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use placed resource for depth conversion result","sha":"01ac9f02d29ab5e3b2182b3c22266c4bae91b12e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-30T21:55:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Forgot a hunk","sha":"5a57564b0c60847f0871e8461d239601b5bd322d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-31T18:10:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not copy fbo, just use new one","sha":"001dc7cf577788335eea82fa204abf1c5d143cd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-31T18:24:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Clean code + fix warnings","sha":"aac93b906377fcd024ca2a6bdcaef952296b0b8b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-31T18:30:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix depth buffer not being transitionned to generic read","sha":"e454f59f97e51569db3da761301e0ffe85ee600f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-31T18:33:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Raise texture upload heap to make multi texture work\n\nThe result is not in line with PS3 real output though","sha":"fdf24545afe00652ce58e5c3a904033206e72cbd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-31T15:55:47Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: minor fixes","sha":"0be60890e7da5f1eada2497178eb1e40e7c320b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-31T19:52:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix offset in scale offset\n\nDepth Buffer should be correctly positionned in depth_read test","sha":"3aafb60629f818b8ebd16ac6e915ad4abfec3549"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-31T20:37:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix some texture format swizzles.","sha":"0b435afd1d2215cca30f19f3855671358075b0eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-31T20:58:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not overwrite hlsl file","sha":"1c803e725b6edc188853c2dd809e415294bfd952"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-05-31T22:02:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix fragment constant filling\n\nThe command buffer does not necessarily set them in order...","sha":"043adab2cecd5a657cde729591586117d8a28221"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-01T15:20:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Ignore files in bin/","sha":"6d9e542cde94c55b87783421f0bc495b2b9c7388"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-01T15:44:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Consume less descriptor slot if not required","sha":"25b10c5e3ee35a18f1a76101aaa8527b732d6120"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-01T16:28:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Implement R5G6B5 texture format\n\nMake sonic works, but with wrong color","sha":"d8d72c4327fab6495b020cbc72e3ad0d50cc5da0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-01T16:55:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix R5G6B5 being byte swapped","sha":"5ca02a505390b891f4357a415a41131fac22c320"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-01T17:02:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix r5g6b5 only using half texture","sha":"c1abf80b40e3d7b04b6d702ef1228d6e1d94596d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-01T20:48:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Start using a ring-like buffer for constants","sha":"e0cff6b0b478fa5644757b5f4f41780c0f4a37ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-01T21:09:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Some fixes to avoid running out of constant spaces","sha":"59aca7566e2f47a436afda60ed2d5a030618fdde"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-01T21:18:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use ring like heap for vertex and fragment constants too","sha":"f721f2cbaadbcd6f1b0412cba2df9cdf9ff55fa5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-01T21:46:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use ring like buffer for vertex index data","sha":"6bb5dd212534404ea64173d597e1321bbaddd74d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-01T22:11:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use ring buffer for textures too\n\nIt looks like the texture size calculation is wrong, it can lead to\ncrash","sha":"9748007cd3551f1f204e09f1ce5390f3ba521347"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-01T22:15:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: fix crash when inferring texture size","sha":"3a6abe16564ceeb87806709e882e2fa6b0e5add9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-02T16:35:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Rebasing didn't went quite right...Fixes","sha":"878a116c4a434d93c5fca0830c9a6a16b9ed75af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-02T17:18:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Take alignment into account in streamBuffer\n\nAnd use it for texture upload","sha":"51d287d9b053a9025e96ab48a39c047381594090"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-02T17:22:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Cleaning","sha":"461bf12c4f515a5bfd62c4f80a315a6c13462d1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-02T21:54:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Ping pong between data to avoid gpu stall as much as possible","sha":"7db35996483b992c94e1df307a74bdaedd7547a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-02T22:02:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: fix memleak","sha":"9e2dfcaba34df125db2999ba28acc7f6f00d1609"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-02T22:25:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Swap current/non current right after present has been called","sha":"b63c77ca7d974fb7ade5c70be2cc476a462e559e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-03T16:57:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use custom loadvertex like call","sha":"ac352cd083d803cd7145361dc7475da93a466a92"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-03T18:30:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix interframe sync","sha":"a5fb8c95f4696990529c2fa6ca895272a08371b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-03T23:26:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Try not to overcommit texture memory","sha":"a751a06d01dbab0505dd2b243c57ada9e3424659"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-03T23:32:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix for size calculation","sha":"d886fd55d3d9712552b894c8cdbeb709dcddec3b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-03T23:35:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Double texture storage size","sha":"593b9a494d243e8f1f77c8e87be69a81eb21e511"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-04T12:51:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Implement A4R4G4B4 texture format with byte swapped\n\nMake the guided fate paradox works","sha":"76d52b4bb33a19e554ec5c11bf501b8583ee31f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-03T23:48:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix memleak","sha":"a2b8d3a885ec87d1b07ac919d5a5a9d509439d81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-04T15:21:49Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add Blend Op","sha":"25c09c508890977ab5c7ba54a8c20eb082d0ccb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-04T16:20:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix texture unswizzling","sha":"f31282623a2d074aa5da0dc39730c14cbce73552"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-04T16:57:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not use texture pitch but compute it ourself\n\nFix sonic cd splash screen","sha":"5882f9defb4c3302b298124060549ee6ba77466a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-04T17:03:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix crash at exit","sha":"caf863be4d2433c55609838cad8f02ee3f39a9b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-05-22T00:09:53Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"RSX: DP2A for fragment decompiler","sha":"ce857ab1da8e95ffd1323dc2acd074c6619f0c19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-04T20:12:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Factorize texture upload code","sha":"cfe058dc82d36ad3077e076927498b3420f04e81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-04T20:32:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use openMP to upload texture\n\nDoes not really increase performance so far","sha":"459ab17d74170f969f1d69a0bce552d4a455eed9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-04T20:43:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use openMP for vertex buffer mapping and factorize function","sha":"694d4e01a0af4ad40131c87d536ad0d586c232ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-04T21:31:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Fix texture unswizzling\n\nFix multi texture test","sha":"744b56b12d1822077796695b20cd4edce40a4b2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-04T21:45:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl : refix","sha":"ca90c05b0a73fec0f16a9df56d1b5ebe0e2c1a75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-04T22:44:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: sampler2d are constants","sha":"c3e19f34fae94d8aefb32fc2b22de07ed98ce73c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-05T18:47:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add some others texture format","sha":"22e67db0f240bf2ffa6d64635d2d4f388ad68066"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-05T18:53:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"DPH disappeared when merging, need to merge commit with the initial one","sha":"e4435a93080770514299a4a33b71282593f721b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-05T19:36:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Check IALayout equality in pipeline state","sha":"381260a4932af19a962a6f4bbffbd0db36ec828c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-05T19:57:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix vertex error in stencil reflect","sha":"e3b73f9ea0bfca78979a8402dbee37048e5b38cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-05T20:45:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Implement stencil states\n\nUnfortunatly it doesnt solve stencil reflect test atm","sha":"02f15810ee13593bf829843a41d5b97ef7d7ccc3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-05T21:18:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Write data to single vertex attrib\n\nstencil reflect has some color but it's still broken.","sha":"64a555cacad391691f0fd6d5c57881e4d67dd0ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-05T21:27:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use instancing to pass constant vertex attribute\n\nMaybe a bit hackish but it works.","sha":"5f46b32616b1457bdb58d972cf5b32fae5e7b9a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-05T21:41:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Check blend and depth stencil state when evaluating pso equality","sha":"b2ad49bac80a92037a4d1db050159d9acfca26ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-05T21:51:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use real depth function too","sha":"d564c2524129d667e37069e49a872278b63a9af6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-05T21:58:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Disable depth/color buffer write if not requested\n\nDoesnt really increase performance...","sha":"c73d19161b293379878ea841d33e2da72b19e6b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-06T00:02:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix stencil op\n\nThanks to raven02 for noticing them !","sha":"b465992178df642565b83aaaa73dbda4f986585b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-06T00:28:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add front/back face culling setting","sha":"acb8f82f84b22d03f7f5b10d3754a3f8b7298d5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-06T15:42:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add color masking","sha":"bdeb08e04523d6142544b523564703395b647bad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-06T15:58:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not set mask if not requested","sha":"27e56b61992fcdf01f75be67bbe5bfb69912b101"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-06T15:58:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix pitch for compressed textures","sha":"8474cd8064c5b8b7fd4740bcc553701cc6115e1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-06T09:43:51Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: use CELL_GCM suffix","sha":"e72d098ea16ab789766fb198f1d5198d6d15b843"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-06T10:22:33Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add blend for MRT","sha":"4ef66e6901113a9d65bbc2941a3e286d8891a954"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-06T10:58:51Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: minor cleanup","sha":"68d3f6f536ba87b0629597daf4ecd8b23ac4be5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-06T16:14:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix some src pitch","sha":"33daa81e6f0d5f0acc27664db1b4733f2578eed9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-06T20:31:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix rtt size (and crash in render_to_texture test)","sha":"b8ba9026573ce425f6e2b4725063a3c30716e76a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-06T21:01:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Handle w16Z16Y16X16 rtt format\n\nIt doesnt fix completly render_to_texture test but it helps.","sha":"c2d3c857b654ec01f5ac0b22ab5591195774ee5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-06T21:25:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use finer pitch when downloading rtt","sha":"ff9f348ec2651adc47200d39c15552a1f8eab650"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-06T21:52:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix rgba16float endianness for textures","sha":"e38bf8d51f9648e51ae5be394221f5438e550f57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-07T07:19:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Factorize common use functions among frag and vertex decompiler","sha":"1837f40ed4ca30a50cb1fedd58d87a232c95d9eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-07T17:12:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12; Clean resource sooner and fix crash with VS debugger.","sha":"4966ab565afd1871a388f55b15a53601e5bd06b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-07T17:16:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use RSXThread width height for viewport\n\nThanks to raven02 for finding this, it fixes render to texture test","sha":"10b92d45d185ec465417ef17cbee33ce77753e56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-07T18:38:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Async semaphore leads to deadlock, make it sync, but do resource garbage collection async","sha":"2d0dbf4949554ac7047fcbc66f9d801cef6f6bd3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-07T20:01:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Implement sampler filters properly\n\nFix menu in the guided fate paradox","sha":"8669dac5e7b168163198a6305fcdafd93abae610"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-07T21:43:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use h0 in fragment decompiler when there is no r0\n\nPartially fix alpha kill test.","sha":"e55949dbfa01e8ddabf8af4b2ba82d69d04fed9b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-08T01:00:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix vertex buffer sometimes incomplete.","sha":"ad55cced13a97c28cdc3c85fa44feb39a98063da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-08T14:52:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Move program related code out of D3D12GSRender and some get* format functions","sha":"224503d2dc54f61d05acfcf2a94009a289aebef0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-08T12:08:51Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: use CELL_GCM suffix for filter","sha":"48e6db3a2f5171cd0a6d1486d4dc123f74a58de5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-08T14:59:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix build","sha":"8b631d486c294771ad96000efa235e52da163bd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-08T16:09:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix index count","sha":"93e20c08538f2048bef99428b0047e8da5dafc12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-07T22:41:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"RSX: Fix NV3089\n\nMake convert_swizzle.elf works","sha":"a86e44deb4a80302f1ae5820307157a143ae76eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-08T16:51:41Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: warning log fix","sha":"724159c8b4159bfb430fe5559d00766b993cb4eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-08T17:33:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix color masking\n\nWasn't using the correct PSO state variable","sha":"dc1a57e71c8d2ecf9135a787a6b61a3b59f2180a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-08T17:59:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Implement discard\n\nShould make alpha test kill test almost working as it should.","sha":"70b537c8c285e255d5c1533e8fe12c5229b88cdf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-08T18:18:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix swizzling for D8R8G8B8\n\nFix human.ppu.elf demo","sha":"cfde5698c77f4a8bfc4a18e2e8edf83b372cabed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-08T20:05:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use dummy texture to fill empty texture slot\n\nvertex attribute test has a shader that reads a texture, but rpcs3\ndoesn't provide the texture ; this makes WARP crash.","sha":"24c23dc5f65bfcebdbbf8b2e430e097b3a44647b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-09T01:35:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix pitch in COMPRESSED_DXT23/DXT45\n\nMake pm_zcull.ppu.elf renders correctly.","sha":"cf27d4c2ca79ba58e7522a6efe1f24cc4cf4bc3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-09T12:11:06Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: declare bufferSize for allocation","sha":"da923f8a3db9e102ffb028257571c640ac598ff0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-10T15:46:40Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:26:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: set max_depth_value based on depth format","sha":"482a371bb09aa4b5d8aae139d6a5e8eba429fcaf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-11T17:26:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Make depth test optionnal and use (0,0,0,0) when texture unit is disabled","sha":"2f5448259210c4c4cdb9f499bcf57aa3bf51537b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-11T18:42:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use a commited resource for constant buffer\n\nSince we rarely use more than 1k of constant data we waste space due to\nalignment requirement with heap so use a commited resource instead.","sha":"d2c13bc4c10ebfd11d0f4e5bf6d2d95df4fdb1df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-11T19:01:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Emit an error if waiting for too long for semaphore","sha":"c53828787a07cd40fe99792cdd78e81f1c94d17f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-11T19:08:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Rewind constant buffers get value","sha":"75a52219e03936b6bb23b8d631fa504f553c8496"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-11T19:15:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix crash at exit + tweak heap sizes to make dice test working","sha":"17e169e65217806fc36764b3c392ea0ac73f0425"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-13T16:20:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix some warnings","sha":"41577b5018e579c288f1713a8a3dd306e83e3a3b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-13T17:43:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12; Fix swizzle for B8 texture format\n\nFix menu in guided fate paradox for WARP","sha":"e36c4f75e06dc7e295f65f28fcda9261322277a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2015-06-13T20:45:15Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: use gcm buffer width and height for copy texture region\n\nIt fixes crash in Voodoo Chronicles and Terraria","sha":"00c975b4696891332f0463c2cc5d60ae3b2a6fc6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-13T22:01:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Uncomment code that shouldn't have been commented out","sha":"006d9893049aaec58d82bb897213c293af49eb9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-13T23:07:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Load dll at runtime","sha":"f55bb7165c7891abd78871235d96544dd4a048bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-15T16:35:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add some code that will scale final render target","sha":"224bae383ca0aee94fa40f53d946fef0629491d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-15T17:09:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Enable scaling pass\n\nThe output is black and white, need to find out why.","sha":"281f8be76f9627e3405f2205d6e3d7c99c2a3e02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-15T17:13:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix color of scaling output","sha":"9fdb6f0dad8b61124fde1cb230a02503151ac415"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-16T13:33:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix crash with rescaling pass","sha":"2310ba137ff45e164f3524fc16cb7a4fa6dc489d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-16T13:48:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix crash with W16Z16Y16X16 texture format","sha":"09ccd7e436de01c9c14d517d0fc8c9edf8284761"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-16T13:55:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix scaling for terraria/Voodoo chronicles\n\nIt break render_to_target test but it looks like an issue with\nscale/offset buffer rather than viewport/scissor","sha":"f59bc86ac5bf965c69dc46549e171277791c2016"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-16T14:16:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use fixed width/height scale and use surface_clip info for scaleOffset matrix\n\nThanks to raven02 for the patch.","sha":"f2d39d0e82ff319449c1613e9290fab01188e304"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-16T14:59:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add some code documentation + rename some functions","sha":"aa66ddcd8608591a7b7b231bbac4a739a15fd014"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-16T16:15:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Factorize cleaning function for heaps","sha":"dca9ae6ab5d63e6a7bae7dd5ba9730550788a384"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-16T16:34:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Factorize ring buffer like code to depth/color buffer migration","sha":"d23cf861f1ee5e53dfc13c1c99c0de4d365d14f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-16T19:38:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Try implement mipmap\n\nThe mipmap level below 0 are currently wrong, find out why","sha":"178d0e0e85be08f2b1a9ef792bfc7bc243b47fe9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-16T19:41:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix mipmap data","sha":"eda3c9084e2a3656fd71c5a33bca42f44253891c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-16T22:06:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Clean up texture upload code\n\nShould be easier to read code (and spot bugs).\nFix crash with mipmap and DXTCn texture format.","sha":"dbcddcf5e23c9e434b7be80f929156214379db30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-16T22:26:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not reserve a lot more than necessary.","sha":"628acbf0b4ad7fec854893c2661d49ff1b70778f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-18T13:27:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not guess texture size but use actual value","sha":"ad3e50f90fb28cc8ce497a7f19b691fa895a30d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-18T20:29:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Ignore texture with 0 width/height\n\nFix crash in voodoo chronicles.","sha":"3f495689c075bddd32636c88862bf986f3ffa060"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-20T17:01:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Measure time spent uploading texture and vertex","sha":"03a84cb20861454e3df575dccee0d6753ccbf50b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-20T22:51:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Completly unclean way to track texture modification between frames","sha":"8cc9642b96ff5adc430c8e7ae7ceec71e7f309d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-21T16:13:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: enable texture caching\n\nBring a little more perf in arkedo 2","sha":"c6a5e905bc1a62e1ace617b78dcd967b15c8173c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-21T16:38:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix memleak","sha":"d29b82566ef99ddc152d4ba390ee2d7f197d948c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-21T16:41:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix a type warning","sha":"294d649012f6c17e7e4f4fbcb4e7d2befc91e6f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-21T21:45:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Implement intraframe vertex caching","sha":"4ee66a2680e6805f2c55c15994af9f5d105a6299"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-21T22:17:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Compute texture size in host mem","sha":"5102241ac2db0552f356c540e6b8526371c30028"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-25T15:07:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix left over commented code","sha":"d88d078f4af44a1bd77f19ae8870e1ff03004913"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-25T16:19:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Avoid copying 8k of constant data per draw call","sha":"8f31211557b653f591e46609d688a4e0353e4a52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-25T16:29:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Remove m_textureData heap since it wasn't used\n\nFree 512 mb","sha":"865445e29b1f8f75951a9f38aa7cfbe81ee8c5a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-25T16:34:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix crash + use ref instead of copying in some for loops","sha":"2c802735bda1ffc912c827a262c04906db3189f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-25T16:41:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use stream to buffer to upload vertex constants","sha":"73aeda1507017bc5c46b709e4d25e9cd6f26d254"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-25T19:12:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not cache non buffer vertex attribute\n\nFix dice test","sha":"141c7ef340bf0a8877137bbd88d834b6d754b0d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-25T19:41:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add a TODO notice at the beginning","sha":"5e33d5535d9a990e3aab6e1d140fef4a9f517bc8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-25T19:46:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use align instead of powerOf2Align","sha":"1c7bff4d36ce3c8fb5ba23f4bd9ec44adc54d1e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-25T20:04:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Try to factorise CPU/GPU descriptor handle gen\n\nI'm still not satisfied with it but I didn't find another way to make it\ncompact and readable.","sha":"d4b83bcf6f9803527284d68691d201a0d55a583f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-25T20:46:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix uninitialized variables","sha":"3472f75ae025e46238035784a7d6c277b46745f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-26T16:31:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix alloc function\n\nIt may generate wrong result in very rare circumstance, although I never\nexperienced it.","sha":"fd269f3adc6e3bb83068773bd0f11e9a73402da0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-26T16:33:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Make canAlloc function const","sha":"de55d64781641e0087e035d2faa5306b06aa4156"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-26T18:24:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use atomic for data heap","sha":"16fa3697db093de5fd9fc9db3a3410d0d2d091b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-26T18:56:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix a potential crash in GC thread","sha":"fc65f181a72544871c64e29c43525d641981fcf9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-26T19:08:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix unneeeded vectors","sha":"8cf6255d5d5df23a1c2dca12cc752472c2e54af4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-26T19:33:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add a (ugly) fix because of some race condition somewhere","sha":"a519aa835055c0bd26a68b799a364ff619fe0e51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-26T20:00:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Mark semaphore location as volatile","sha":"40a3b5c918dd852f30d46a2c2ed2cca3eefc30ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-26T22:22:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: support swizzled CELL_GCM_TEXTURE_A4R4G4B4\n\nFix terraria menu","sha":"6cb00e681b720f6dbc3bda72368abf80af72b722"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-27T00:09:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Mipmap offset is 512byte aligned\n\nFix retro city rampage crash at startup","sha":"45b7da6666eaf80780dcd4fcc69eac9b0d7417b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-27T17:06:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix m_ctrl not being properly passed to fragement decompiler\n\nFix Retro City Rampage","sha":"3cc397446630154754ffec4e49bd5b20db4dcf16"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-27T21:21:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix binding of tex/sampler","sha":"cb0ebad210479232411de60818ca70b044e105a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-27T22:24:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix A1R5G5B5 endianness\n\nFix color in Retro city rampage","sha":"2cd035d53037088d7c1cb29cfa91ffbf5551d500"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-28T15:38:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Move util shader creation in another file","sha":"428d66598d5827b49477c419922b06fea6ff4165"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-28T15:51:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix crash with write color/depth buffer enabled","sha":"6f0c74cf767ccba5d0a45c476822171186c54c8b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-28T20:35:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Support triangle fan\n\nFix missing character members in the guided fate paradox","sha":"bf394d4f56ecaa22d44b5eccf440662bfe26d9a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-28T22:43:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: use memcpy instead of streamToBuffer for alpha settings\n\nstreamToBuffer doesn't work well for data < 128 bits","sha":"91809c09d45859342edb62387a98d1e404df40c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-28T23:28:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Don't call GetAddress if context_dma is not set","sha":"1f3fbe91e269f17414d67a69f38f4e4511733885"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-29T17:20:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Refactor index management\n\nSeparates it from vertex management and move all the logic (forced\nindexing, index count calculation...) outside of GSRender.","sha":"8801abb93a5d72e70449d077bf0ae4b48e6d8ee8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-29T17:31:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add some comments","sha":"612d169b780cc3b597771b674ed8bf9f57eb68e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-29T17:40:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Factorise sampler desc creation in a separate function","sha":"ff219c6035b14e41c4a60b67455c850b780637e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-29T17:40:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix warnings","sha":"0e6cd8cd0ef89ee7f874659e6020d5768232654e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-29T17:58:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add some doc","sha":"725b0c606d6f25db1c8e4b4efd25e1fdb7e2c9ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-29T18:36:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Support targetless flip\n\nFix PS3Doom","sha":"265331117ee3d1489b4917ee65cf60e4d0631108"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-29T18:36:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix warning","sha":"af181395fcfa61ac0b4fddd09cfdf345ce8f2733"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-29T21:23:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix color for target_none","sha":"b839b8689558528de9648cf76a71fde41e53886a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-06-29T21:26:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Remove extra ,","sha":"d2edeafffe15818913689d5910213d055043111c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-01T20:52:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use another sampler heap when using more than 2048 samplers","sha":"38a809b48315f8f708e95ede95f6fa1a70788640"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-04T14:15:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix D3D12GSRender member name","sha":"37cc5e5c117b27138a55ff16695dbd081c3e8a7d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-04T14:17:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add semaphorePGRAPHTextureRead","sha":"6fcd0e04218810529f3d971b8ebfc111d9951b6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-29T22:13:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix build with latest master","sha":"9b10895c3823ca62f8118a05efa21226ef66b8b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-07-29T22:17:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Another fix","sha":"6a408301d78e7efd17c5dd33e75d61da6a7b49f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-01T20:51:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Clean an useless added line","sha":"11980346c9a74f23223115e6d49492bcc02abe6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-01T22:04:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Reset gfxHandler in dtor","sha":"3d486a8ba9a309a5f90d875abcb7b0167f54c847"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-01T21:51:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Add DX12 variant of debug/release with and without llvm","sha":"3fe90d9e8dab94ccfce22ccb98eea46ad7bf7c2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-08-02T17:30:31Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Fix file not found","sha":"f0a5641cf06c70e59aaf5a50826150558fbf31b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-02T20:16:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Move DX12_SUPPORT before ($preprocessor defenitions)","sha":"7843b23ee1d7105ade13d60f255e620405b9c815"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-10T22:37:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T22:28:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Signal thread termination request + use a producer/consumer pattern closer to other ones in rpcs3.","sha":"cf1c86bb2ff32f6a1566a263d381fccafddbf1f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-12T14:53:49Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-12T14:53:49Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1173 from vlj/llvm36-debug\n\nAdd debug options for llvm compiler","sha":"a775b428f4f8e169eee89bc5f5b27d41c1a3c18e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-08-12T15:41:46Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-08-12T15:41:46Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Fix correct size setting windows.\nAnd other small change","sha":"5e9eb9c3bb3612776dd9e5a06f48d877402d1d51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-11T20:04:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-12T20:59:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not detach garbage collection thread\n\nThanks Neko for the tips.","sha":"9cb733906762fa91d5d00f467a26c52e63ba71c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-12T17:20:58Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-12T20:59:56Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Add llvm build to appveyor","sha":"c63db8842cce4588f33564c61745c100e7c44f75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-12T21:34:54Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-12T22:12:15Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Fix wrong XAudio lib being linked","sha":"99156c61e47284d4f4b68b05db865102a234055a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-12T22:34:34Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-12T22:34:34Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Disable regular (non-llvm) builds to save time\n\nbecause appveyor wouldn't run them in parallel. llvm builds are only ~1\nmin longer anyway.","sha":"1d09408e38ba3e2d14bcfaa36ffe2b9ea9d4e116"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-13T06:31:42Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-13T06:31:42Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1178 from danilaml/appveyor-llvm-dx12\n\nAdd llvm build to appveyor and fix wrong xaudio lib with cmake","sha":"07f33a3809edd5e5d63587ff086e2bb21d668fc3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-13T21:50:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-13T22:29:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix non dx12 build config","sha":"abee3539b8bb2e31677b0f45f48bf4d082d430ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-14T14:44:27Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-14T14:44:27Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1169 from vlj/d3d12\n\nImplement a d3d12 backend","sha":"850416d5309d465241a88bd484302907cf1cf1f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-14T15:03:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-14T15:03:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not output scale if there is no rtt available\n\nFix crash in Disgaea 3","sha":"4185fcb6cda8be2db0b67ae344a6445444681ae1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-08-14T17:35:58Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-08-14T17:35:58Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Update with master and Fixed Conflict","sha":"732eef6c028101a87d4d991d7906101b38304ff6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-12T14:46:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-14T19:23:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not create/submit an extra command list for texture upload/rtt state change","sha":"befe93784f6d3ab09e43caa78abc910f8287f2e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8782059?v=4","date":"2015-08-13T16:39:35Z","email":"davellidavide@gmail.com","login":"KaOs1","name":"KaOs1"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-14T19:44:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_mempool implemented","sha":"bc13128afe63dd822b1e4fc42e132db4f2c01e7a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8782059?v=4","date":"2015-08-14T07:48:26Z","email":"davellidavide@gmail.com","login":"KaOs1","name":"KaOs1"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-14T19:44:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_mempool implementation fixes","sha":"f3d7c5da9d5d993488ff911867708a1417a74895"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-14T19:38:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-14T21:39:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use ThrowIfFailed instead of check to be inline with DX12 Samples","sha":"9cb88b3a8dab5ce7a1ffcba37361677550d8c9ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-14T21:29:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-14T21:39:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use ComPtr<> instead of manually releasing some structures","sha":"09cc127dd9d5a6e31acb1f41a2b6062da107e5ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-14T21:02:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-14T21:39:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add a dummy D3D12Lib struct that load/unload d3d12.dll\n\nIt allows to unload the lib after everything else has been released, it\nfixes a crash when leaving an app with d3d12 backend.","sha":"3b0afe92e3c63af32c3bc51735f3ad114931db56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-15T07:31:35Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-15T07:31:35Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1181 from vlj/d3d12\n\nD3d12: Fixes","sha":"a3dc6232703d237da9978516e0d6b6c2512ca2a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-15T07:38:29Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-15T07:38:29Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1177 from Zangetsu38/Getsuga\n\nFix correct size setting windows.","sha":"0ce4930c0f9da3d8d0dec9ada6d0a966bb2621e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T15:37:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T15:37:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert \"RSX: Fix NV3089\"\n\nThis reverts commit a86e44deb4a80302f1ae5820307157a143ae76eb.\nReasons: it's broken and not strictly related with d3d12 PR.","sha":"405d7cb70c3e8cb07945de77f00389abd6ad1870"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-14T19:06:32Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T20:40:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix openal lib name in debug-memleak\n\nis this config even working?","sha":"83b77ced9eeea555d88fa9ffcb0b25df13343886"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-14T23:35:36Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T20:40:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Ignore warnings in VS from llvm headers","sha":"aeee0758c2bf1fc2f1c857eb58a1f856eff345b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-14T22:14:49Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T20:40:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update Cotire to 1.7.3\n\nIt fixes some bugs. Also use add_compile_options instead of add_defenitions where necessary","sha":"0fb8ad8c5a264cdc2aacbf4883ad98a578f654f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-15T20:41:02Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T20:40:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove unneeded code (fixes flag \"conflicts\")\n\ncmake should add appropriate flags depending on build type automatically","sha":"5bf6c25652ed2fa44ece9f9b5b88e9af3b05d66a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-15T21:29:56Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T20:40:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix travis OoM crash with gcc and -O3\n\nUntil with move to containers.","sha":"7460d215fd436fb5da06206caeea1d6044655fe9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-15T23:02:21Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T20:40:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Don't print all env vars on travis\n\nclogs logs and might leak encrypted vars if we'll have any.","sha":"491d5528ed1f989127cebdcddeaad48df20be8b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-15T20:44:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T20:45:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"d3d12: Do not recreate fence/event each frame.","sha":"b54adebfc7d92c61b968af55b4d631bcdabfe5ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-15T21:31:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T20:45:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"d3d12: Use ComPtr for some others member.","sha":"c2430d3af19dfb24d4f133d0334626a384c47eac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-15T22:20:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T20:45:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"d3d12: Rewrite per frame resource cleaning function.","sha":"63a54dd70d9b004609422b0c99148a21e4d41b86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-15T22:34:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T20:45:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"d3d12: Do not invalidate surface texture if they are not set.\n\nFix hang with depth read texture and color buffer enabled.","sha":"06532e3263c24c52fd488fd3824f57a82c1183c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-15T23:02:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T20:45:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"d3d12: Disable openMP\n\nIt actually decreases performance.","sha":"a852d5cacaf4017b89e15ad17d48c6cfd8802716"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-15T23:13:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T20:45:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"d3d12: Remove preventive \"waitForCompletion\" after a flip.","sha":"a93a81997f56f453ac48b3da00ee23cc73f85a28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-16T15:34:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-16T21:00:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Reuse the same command list until flip or semaphoreRelease","sha":"80c25b8cedc5c7f454bd65999297a663c2f0e546"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-16T16:42:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-16T21:00:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Lower minidx9/Include priority","sha":"0e733b20de00dc658f146e906aae647f32fe0384"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-16T19:15:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-16T21:00:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Record draw call count and duration instead of vertex/texture upload","sha":"fcd579a7b55115bcd5293f6ecb3653521e79db9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-16T17:01:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-16T21:00:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add a d2d overlay to display debug text","sha":"be1511bd7a10bff23cd81a8862a09260e0a368ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-16T22:12:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-16T22:12:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix wrong index being used for sampler descriptor heap\n\nFix a crash in Disgaea 3 with debug output enabled.","sha":"592543c47f5ff736b13826f6aafc6721aae2de8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-17T09:26:44Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-17T09:26:44Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1188 from vlj/d3d12\n\nd3d12: Fix wrong index being used for sampler descriptor heap","sha":"61247831803cce4181d615830b38cb723369b66e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-17T20:12:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-17T20:12:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix blend alpha mode\n\nFollow GL spec.","sha":"1ee749a9a8163e9751876c6e1c35ebe36ee85405"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-21T21:23:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-21T21:23:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1191 from vlj/d3d12\n\nd3d12: Fix metal slug 3 crash","sha":"e8088d12167b714f1a1a738c9baad9c17190062b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-17T15:14:29Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-23T21:20:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix some compiling problems on OSX\n\nand enable osx builds on travis","sha":"009370f73cb3f8b38ba3a7c1bc0073c60bcbbba7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-18T21:27:41Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-23T21:20:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve clock_gettime on osx\n\nand some clean up","sha":"d0283265ccaad2802e08f81992b906f873239d8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-19T14:24:57Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-23T21:20:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Try to build with llvm\n\nand update readme","sha":"6c4f9683739e0b957a8b7da6fa1cd979e2316ae5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-19T14:57:44Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-23T21:20:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Don't init llvm on travis\n\nit should be installed from packages","sha":"8140ab459fbc82a72fd22228405995acd7b55ef0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-22T13:20:51Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-23T21:20:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Some fixes for possible *nix compiler errors","sha":"b01583f54bb288ed30f136cb1e2c5df1c85c9760"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-08-23T08:06:15Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-23T21:23:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Gui: separate 'Settings' code from MainFrame.cpp, minor cleanup","sha":"3c27bf0a6a04137160c6e99fd43546fbce922c96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-08-23T08:37:03Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-23T21:23:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"6ae7f450f101c88633dd5391f1528e7e85114c24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-08-24T16:07:15Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T17:54:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add LLVM Debug / Release configurations for gui solution. Disable some DX12-only options on non-DX12 builds","sha":"c0b90d01bd50124b8b205f1dff1f7a0ebae8779f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-02T22:00:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFont, cellFs, cellGcmSys funcs added, minor cleanup","sha":"c7ee8cadde633e0e8a50f4d5cbe368c815d91189"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-04T10:46:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"IdManager improved, added Fixed ID mechanism\n\nFixed UB in get_current_id()","sha":"9e5daa1737b4713a89c64ae435c50eb6baf2c6b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-04T14:47:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFont, cellRudp cleanup","sha":"2113fce2fbac96d863e96eb2bc4b4029b38935d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-04T14:48:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData definitions shortened","sha":"da8883d5d37bc88d9c069d57bc4102a81b39d96b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-05T15:30:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ID manager simplified\n\nID manager refactoring, redundant \"type\" information removed","sha":"dd665e7363508da5dab10d8613ebaf65e52317da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-05T23:59:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Added PSP PKG support","sha":"9923f96431cd02dc2127f81a5546e4d047ef6c11"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-06T13:05:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixed Object Manager (detached)","sha":"f8afee33251524719da36175f761d7ffe898623a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-06T13:31:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"u128 renamed to v128\n\nSince it's vector union type","sha":"6f3c50eba2deb53acbe55ba7cee84a5b0f93e0dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-06T15:55:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Added fxm::withdraw, cellGame improved","sha":"544fe531a348adb3292abba388d00c3fe6ff22da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-06T18:43:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"alignas() used instead of set_alignment macro","sha":"8d758b90880af1cffbb441b9808aa6a4894d0197"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-06T20:20:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"New u128 type stub","sha":"07b9379a7c80ae6a4708300a9fdeba6152c8f65f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-06T23:11:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PKG decryption without the intermediate","sha":"8b3c250702f318641934efd1b77939b44d204c7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-07T21:28:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"IdManager funcs added: idm::import, idm::withdraw","sha":"94d148825944e6b6b595e200098e64508ebd87ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-07T21:37:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sleep_queue_t moved to SleepQueue.cpp, cleanup\n\nUsed ARMv7Thread instead of ARMv7Context in PSV HLE functions and\ncallbacks. However, interpreter still uses ARMv7Context.\nVarious PSV functions partially implemented:\nsceKernelCreateEventFlag\nsceKernelDeleteEventFlag\nsceKernelOpenEventFlag\nsceKernelCloseEventFlag\nsceKernelWaitEventFlag\nsceKernelWaitEventFlagCB\nsceKernelPollEventFlag\nsceKernelSetEventFlag\nsceKernelClearEventFlag\nsceKernelCancelEventFlag\nsceKernelGetEventFlagInfo\nsceKernelCreateSema\nsceKernelDeleteSema\nsceKernelCreateMutex\nsceKernelDeleteMutex\nsceKernelCreateCond\nsceKernelDeleteCond","sha":"c6bdedf3b0705489f98a2abc9325e0b73eca6157"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-08T01:16:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"idm::get_type, sceKernelGetThreadmgrUIDClass","sha":"db88c539fb60675b8387c8dfaeb53bf55f829989"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-08T13:17:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS cleanup, some methods added\n\nVFS::DeleteAll, VFS::GetDirSize, VFS::Exists, VFS::Rename\n(VFS::RenameFile, VFS::RenameDir removed)","sha":"e18db20630b276375f4030db8b543dd11eedfad7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-08T17:59:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"KernelExplorer improved","sha":"eb63558c6d60fccb8540d4e3022c6fb2a4b2b049"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-10T19:39:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU Decoder Cache improved","sha":"be9a599beba7d0754471caee278432f2ccd1af0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-11T13:26:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"thread_t cleanup","sha":"d9403c2ed29a6785c457c5176f822079043a502b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-11T16:14:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"id_traits, idm::get_last_id() added\n\nid_traits for file/dir descriptors\nidm::get_current_id() removed, thread-local last ID","sha":"c2897cddd64577070e0c9f90050acc8ab265ac13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-12T01:52:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs:: const renaming, fs::g_tls_error stub","sha":"73b108765e1cf12909ba0ea3f1f10e7493e7ae9b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-12T12:19:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"wtf?","sha":"15057ffc5ebef97a5d0ebcfdc0cc12dc96ebb760"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-12T18:38:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fmt::by_value, fmt::Format removed","sha":"ce494f884755f40c794f12021df680985c5d04e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-13T00:42:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor style changes (sys_net)","sha":"9c8773252ace0904243761f197e7d96053564cc5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-13T13:28:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::var rewritten","sha":"fcd6b64f8f59353f6a3ce885e43885dcec056c88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-16T20:37:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData fix","sha":"6b6cd11fbefa66a5cf1b5b4c2964580b19e0ebbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-18T12:31:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"TLS for sys_net implemented\n\nMethod ptr for vm::ptr (renamed \"of\")\nMethod ref for vm::ptr (returns vm::ref)\nOperator & for vm::ref (returns vm::ptr)","sha":"168cd9bb7a3909f9d9ce880766db91586dce4c1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-19T11:04:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"noexcept usage fixed\n\nthread_t renamed to named_thread_t","sha":"5e143100717dbc32f6af131309770ea940081d80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-21T11:07:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-24T18:22:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"e551e2bc5d0970eef6e90bb4d9b6af835fae27e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-23T21:57:13Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-26T11:32:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix zlib lib linking order.\n\nIt should be AFTER lib that requires it.","sha":"4bf0deecb6684cab95523b1b348ea24bd8c28fed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-25T22:39:24Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-26T11:39:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/LLVM: Fix SUBFIC instruction\n\nFixes sprites in Disgaea 3","sha":"8ea7da56ecd2ac0b8b26e5067aa90ecb569d8cd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-25T22:48:11Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-26T11:39:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/LLVM: Add regression tests for SUBFIC","sha":"3468a7ebcfd1164c8feb8c16ba7e20dcdc39faaa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-24T16:03:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-26T16:45:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"RSX/D3D12/GL/Null: Notify backend of program/state change","sha":"9c24bb9d7566c197ae3ab061a89797fc93358970"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-24T18:27:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-26T16:45:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"RSX/D3D12: Improve shader lookup performance","sha":"095c8fa19b25c7d548e51f290bf7db045cf36125"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-24T18:39:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-26T16:45:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"D3D12: Add CELL_GCM_ZERO case to comparaison function.","sha":"e0aa74d3804b2a358c0b7ba6486d290e13c24ed5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-26T17:21:29Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-26T17:21:29Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1196 from vlj/d3d12\n\nD3d12/RSX: Some light improvement to program management.","sha":"99a9fd8505932547bd862554b3c4ff9b6158b0a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-17T19:51:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-26T19:54:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Replace magic number with opcode enum in GetBranchTypeFromInstruction.","sha":"f81192373fd3e8744d298f3e4358094e0b0bceca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-21T22:46:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-26T19:54:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Use ExecuteFunction in ExecuteTillReturn","sha":"b2ca9edde27a43b86d153881a32d5d201fe7d2fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-21T15:03:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-26T19:54:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Avoid using an indirect call for function call","sha":"eb90e509f9845d2c89acf63cd4e1377f26872c89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-25T21:43:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-26T19:54:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Properly print verification string","sha":"241dedef4e07b949da0cdc66ae0663d9cd4b0d54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-26T15:18:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-26T19:54:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Memory: Factorize virtual memory reservation/allocation code in function","sha":"942f26509bce02cbe6cf57564e58b0a91dbf4db2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-23T22:58:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-26T20:22:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Use a big table instead of an unordered_map to get compilation result.\n\nThe hashmap overhead may be really big in some case.","sha":"5fe3ea6440ab482b30434e69e1517b629ef15fca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-26T23:57:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-26T23:57:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fmt::format fixed","sha":"d1f31d6fda723e2bd1fb60bca8bb55e7acf630c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-28T22:20:19Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-08-28T22:20:19Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Small appveyor fix\n\nclone depth isn't very reliable for submodules. Still waiting for appveyor to update to 2.5.0 git.","sha":"4456d9fcf150097768b525e139a6b392e2c0ec9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-29T08:54:45Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-29T08:54:45Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1202 from danilaml/patch-1\n\nSmall appveyor fix","sha":"de7bbb56614b8b6520108a0bab4f4ad96dadd13d"}
+{"author":{"avatar":null,"date":"2015-08-31T03:26:16Z","email":"potmdehex@h3minternals.net","login":null,"name":"potmdehex"},"committer":{"avatar":null,"date":"2015-08-31T03:26:16Z","email":"potmdehex@h3minternals.net","login":null,"name":"potmdehex"},"msg":"Replace sprintf with fmt::format","sha":"665f316a3b16c28d0a143de881deac3d0558444d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-23T15:13:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-01T15:58:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/LLVM: Do not recompile blocks","sha":"f2c8db75bfcd1fe054a0777e1bc9f636717cd9e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-23T15:50:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-01T15:58:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/LLVM: Simplify trace management","sha":"02a1bffc126f1eec08994424330487136ad2a45b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-28T19:40:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-01T15:58:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/LLVM: Fix unsigned/signed type comparaison warning","sha":"60d5dd40f79fd07ea27e288ccc738710b5d828fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-28T23:12:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-01T15:58:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/LLVM: Remove indirect call completly","sha":"58181c5c1792e60dd448bb6aae63b2a1ef39f231"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-08-26T02:54:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-01T21:38:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Cleanup\n\nSPURecompiler improved\nOld SPU decoder removed\nSPU Interpreters merged","sha":"817fec9684b92005f133f3fa9d6e221b4160d740"}
+{"author":{"avatar":null,"date":"2015-09-02T18:04:10Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-09-02T18:04:10Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1199 from Nekotekina/master\n\nSPU Cleanup","sha":"ab1c05aa71940611c969f7e9c0ece5992261da80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-03T23:23:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-06T21:36:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Recompiler fixed","sha":"7e01c81154fc25a63eed78c14fe8f3f360afff06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-10T11:09:57Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-07T13:33:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement cellVideoOutGetGamma/SetGamma\n\nAlso fixed settings window being too small and some minor formatting.","sha":"ff3bfa1ca2cf783888b532a283d3cf1f51e06c69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-10T12:10:16Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-07T16:47:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSail improvements","sha":"c9f3871c68d559f8792ff3c200cf88ee0928c92c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-10T15:58:10Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-07T16:51:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Various cellSailPlayer improvements\n\nAdded default attributes, fixed a Travis error and added currently\nbroken player booting that I can't figure out.","sha":"5a7327492adda67817fa9dadb44fff40ddebd736"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-11T16:48:02Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-07T16:54:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"More cellSailFuture/Player improvements","sha":"218e823fdc90d4e3c4ee150d77f7a6b446a24bb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-21T20:57:49Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-07T17:00:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellGem and cellGameExec improvements","sha":"c923cb54d3e09ca47b17b5d3a099f2567294e997"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-08-22T08:20:48Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-07T17:00:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellVideoOut accuracy improved, logging additions\n\nNow basic settings are logged in the start of every log, to help devs in\ndetermining  possible problems, when users test or try to run certain\ngames.","sha":"09673c928c59d2123dae71ebcdb1c12383eef7f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-05T15:45:31Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-07T17:13:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add RPCS3 version to logging\n\nAlso fixed the link pointing to the RPCS3 forum.","sha":"de97c8e20f36bbe7cbc0ae4ae58e8a5d547a6166"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-06T12:49:02Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-07T17:14:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix BRI instruction, fixes #1165","sha":"4666f190db9bde82ce7fb082faf71f974302f600"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-08T10:47:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-08T10:47:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Various fixes","sha":"cbe83ad8dd052d00c415d489fcf4a95466690bea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-10T13:09:31Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-10T13:09:31Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"HddGameCheck fix and Music/Avc2 improvements","sha":"f9731de777377ff33b5161ee4972b3058ea6b5d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-10T14:13:31Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-10T14:13:31Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement NetStartDialogLoadAsync, L10N additions\n\nAlso improved cellPadPeriphGetInfo","sha":"cd7fbae5831fcd3db5dd504a16a09ba7bb1baf03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-10T14:30:14Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-12T11:11:26Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement console_write and GetHomeDataExportPath","sha":"ea376e7751c9fe1ec20968b134e2533b12bdfe89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3966556?v=4","date":"2015-09-12T23:35:10Z","email":"woohoomoo2u@gmail.com","login":"mmhobi7","name":"Aaahh Ahh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3966556?v=4","date":"2015-09-12T23:35:10Z","email":"woohoomoo2u@gmail.com","login":"mmhobi7","name":"Aaahh Ahh"},"msg":"Update README.md","sha":"4622914610f801e863abce48ff75d1e8834bb2e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-13T07:26:01Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-13T07:26:01Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement GetLicenseArea, category improvements\n\nAlso fixed newlines, CellSailEvent, fixed CellMusic changes, fixed\nconsole_write, fixed L10n changes and removed the login dialog for now,\nuntil a more proper implementation.","sha":"8204737efad3180865829121d9938aa7752d2bcd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-30T16:16:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-15T17:21:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Propagate exceptions\n\nIt fixes a crash in Retro City Rampage with low (ie 10) llvm threshold.","sha":"9d18bba1dfa0893aa34ec787da72504cb27b48f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-04T22:25:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-15T17:21:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Increase recompiler thread responsiveness.","sha":"359258c3d3164abd861869b5d04ba6c72a3eb013"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-04T22:28:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-15T17:21:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Rename ProcessExecutionTrace to better reflect what it does.","sha":"667cb64c29e026b5e30face9fdcf5c2a4301e3c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-04T22:45:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-15T17:21:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Remove lock in GetCompiledExecutableIfAvailable\n\nThis should increase performance a lot in some case.","sha":"ecb3d939189f8614efaf4339cec8d333e3fc23d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-04T23:20:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-15T17:21:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Do not notify already compiled block.\n\nAlso flush m_pending_address_start to avoid memory consumption\nexplosion.","sha":"c407c786cca9cc117e1f751f34c9d331178bf10a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3966556?v=4","date":"2015-09-16T03:50:32Z","email":"woohoomoo2u@gmail.com","login":"mmhobi7","name":"Aaahh Ahh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3966556?v=4","date":"2015-09-16T03:50:32Z","email":"woohoomoo2u@gmail.com","login":"mmhobi7","name":"Aaahh Ahh"},"msg":"Merge branch 'master' into patch-1","sha":"34622933f37035dc9afc2e64d1cb11b7478a07f4"}
+{"author":{"avatar":null,"date":"2015-09-16T16:18:40Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-09-16T16:18:40Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1218 from Aaahh/patch-1\n\nUpdate README.md","sha":"e86e72804b7481f1ce03f65a0976019dc4dbfa19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-16T18:31:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-16T18:31:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix issue #1223","sha":"91c98a95333f8c3d2c37b123dfa343114c748f5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-16T20:39:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-16T20:39:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Remove useless call to NotifyBlockStart\n\nLikely a rebase error, with this Metal Slug can run at 60 fps again.","sha":"05c5058dfdb0f64e314523e0aa7626f55f6a2283"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-15T12:31:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-18T20:36:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Build shader in debug mode if debug output is enabled.","sha":"7d15cc0dfdd71e835f18ede779c5b5c6f73759da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-15T12:38:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-18T20:36:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Submit command list every draw call in debug mode","sha":"bf04758285d9d952abb36ff38217ece338acfc0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-13T18:12:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-18T20:36:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Get rid of extra garbage collection off","sha":"72e55785950536172962b8192cffb0e364e725ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-15T13:52:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-18T20:36:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not init D2DStruct if uneeded","sha":"5f08cca849159df756f93c160c07940b7ec22ab6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-15T15:21:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-18T20:36:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix buffer upload with a base vertex.","sha":"0da893695e273ea0cfef4e02f973ac9beadf716b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-15T15:59:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-18T20:36:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix indexed triangle fan emulation.","sha":"12f00a5e167dc165672b0989d2223e0fbced1311"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-16T14:33:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-18T20:36:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix ARGB8 swizzle and support swizzling of rtts\n\nFix harem tengoku colors.","sha":"c31c0c40a4f55fb4f22e5c46727c90e51aac9b01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-16T21:18:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-18T20:36:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Properly clean protected page in dtor","sha":"97f62571ffee0f80f331161abb5b2b6ab3bde02a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-09-15T21:34:21Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-09-19T14:09:49Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"PPU/LLVM: Fix for crashes on exit with jit","sha":"3208a7713f0089b1a3140555ff4b3980d12fed77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-09-16T22:24:16Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-09-19T14:09:50Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"PPU/LLVM: Added noexcept and some fixes","sha":"11eeab0a1aef011a18ef27fcaea143efe98969d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-09-14T23:33:30Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-09-20T21:08:24Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Update submodule ffmpeg and wxWidgets.","sha":"da4bf43fb2e8c7823ec5029d860222803f861e61"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-08T11:29:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-22T10:28:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CALL_FUNC macro fixed\n\nNow it can call any HLE function, possibly using LLE if available.","sha":"093ecc0a02926582a36e34d1c4249547a373007c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-08T13:53:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-22T10:28:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Experimental class template Module<T>\n\nAllocates ps3 memory for specific instance T","sha":"12f36cf31fb605967da9178d987a53cc099ec178"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-12T22:37:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-22T10:28:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PKG Installer fixed, u128 improved","sha":"4e62ec7458f10edda27ad15a08c316d79e200b6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-14T16:32:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-22T10:28:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Cleanup, be_t fixed\n\nSome functions renamed:\nget_ps3_function_name\nexecute_syscall_by_index","sha":"59f1077a3675075e9d405ca97183a17c713e1540"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-15T16:23:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-22T10:28:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"be_t (se_t) optimizations","sha":"9d68c16c62a0ae4773c541a2b2116faaf5a496ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-17T22:41:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-22T13:48:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Some things improved\n\nshared_mutex_t implemented\nGUI Emu Callbacks rewritten\nfxm::import, fxm::import_always implemented\ncellMsgDialog rewritten\nEmu.CallAfter improved (returns std::future)","sha":"8ae3401ffadb436cedf0acfcf3cb552ae5685d5e"}
+{"author":{"avatar":null,"date":"2015-09-22T14:18:13Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-09-22T14:18:13Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1219 from Nekotekina/master\n\nTerrifying PKG installer fix","sha":"faf0a0d851db4882567d314c7216ac46c524a586"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-19T21:52:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-25T14:23:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add d3dx12.h from DX sample on github","sha":"fa6e2bfe02f3b3ba029fa3dd6a66f35efa29b2e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-19T22:02:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-25T14:24:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix a comment","sha":"ae51ce23499e73aea72b5de1a484a1e143e84dc3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-19T22:14:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-25T20:34:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use d3dx12.h defined struct.","sha":"f10c8123018aaadbf6f1bc53e2a59ee03431e2a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-20T16:34:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-25T20:35:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: clean code","sha":"23bd197bd4590e6e84d95f7cba2455b364b5e423"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-20T16:13:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-25T20:35:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Force command queue completion","sha":"de5a3451cd376d94c5366c68cc89a00d59f85475"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-20T16:07:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-25T20:35:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Copy vertexbuffer in vram for output scaling pass.","sha":"506fdec6dfe883c0bbdbe8811d75de5b6b4c1df1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-20T22:36:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-25T20:35:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add some more counter to debug overlay","sha":"8ba74a7f7db282854e4e0f342f08d96afb64a2dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-25T14:46:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-25T20:35:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use big buffer instead of placed resource for vertex index storage\n\nIncrease perf in Disgaea 3","sha":"37721d6b8a1392abb455c58f8a97f29b156f3fab"}
+{"author":{"avatar":null,"date":"2015-09-26T02:50:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-09-26T02:50:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1231 from vlj/d3d12\n\nD3d12: Code cleaning and minor fixes","sha":"286d2962c6f87e7b1afbc46502780fd351098486"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-09-26T22:36:44Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-09-26T22:36:44Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Adding the icon on window GL and DX12","sha":"f27e77c7e0aa7729ad29ee3d9f9144a8ac27d67f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-28T16:20:17Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-28T16:20:17Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1233 from Zangetsu38/Zangetsu\n\nAdding the icon on window GL and DX12","sha":"4ac6c23ced5f0b88d57cc7094d11eeec27c3d5b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-09-28T14:37:50Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-09-28T17:11:17Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Little fix correct path for Game Data","sha":"893a4e34a1bec4aeb00ee76e3e5613433edb6fd3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-28T17:34:31Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-09-28T17:34:31Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1235 from Zangetsu38/patch-1\n\nLittle fix correct path for Game Data","sha":"f6777825d5052f67eeee60978b49acf74366e3ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-02T16:55:18Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-02T16:55:18Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix Coverity and make Coverity branch master","sha":"fd9977d3bd28cf70f8fa986cb32e19d349d7200a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-02T18:43:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-02T18:43:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Bump version to 0.0.0.6","sha":"455d07e05b45405e431ae7c3a470290bda76dcfb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-03T05:46:43Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-03T05:46:43Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1238 from tambry/CoverityFix\n\nFix Coverity and bump the version.","sha":"f898ebff3f21be0369ca81d789ec8cb940be12f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-26T17:39:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-03T16:25:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not use array size to get vertex buffer element count.","sha":"703b1636c81af31407d829d0be73fa5cd7fbf4ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-26T22:56:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-03T16:25:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix sampler descriptor stride in UploadTextures.","sha":"8e83ad7b65bf5b7b2242711911ef9fba22c9f132"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-27T16:06:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-03T16:25:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use d3dx12.h defined structs for constant buffers code","sha":"9a0232bc87fd97e57cd7eda384950811028dd59b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-27T16:41:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-03T16:25:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use d3dx12 structs for Root signature declarations","sha":"f1f31e22f9d5575bc2f002433829c93110a2f2a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-27T17:04:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-03T16:25:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Suballocate from big buffer for texture upload too","sha":"07e13b86134cf359f84667f6495a2b93f7f7297c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-28T20:33:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-03T16:25:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Common: Move generic upload texture code from d3d12","sha":"62d7bf21598877bc8b93ed6b08fe2dc627563311"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-28T20:51:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-03T16:25:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Common: Move generic vertex buffer code from d3d12 backend","sha":"c7b7d1f71f89994d78bcc3b7563fb027ad47e056"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-28T19:46:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-03T16:25:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Wrap D3D11On12CreateDevice to avoid linking against D3D12  dll","sha":"442abcc6f11fc3cbafd346ae1957ef2e692b041d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-02T17:03:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-03T16:25:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Measure flip duration","sha":"6b0d29a72d09a2379542282d620f598d9f6dbac4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-02T21:11:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-03T16:25:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Clean dirty texture when releasing resource storage\n\nWhen an app is exiting, remaining dirty texture could be left uncleant.","sha":"3acc900363f47705356d0bb9603ddd029c5a4d41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-02T23:29:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-03T16:25:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not use atomic for heaps","sha":"81546d357c4dc15d8d1c7e71db5c45fbce081466"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-03T17:04:53Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-03T17:04:53Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1239 from vlj/d3d12\n\nD3d12: Various factorisations and fixes","sha":"55ca62537176f64b68b0fe194d560d328dd451f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-10-04T17:07:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-10-04T20:05:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Git version fixed","sha":"cd71125277965ebbd2127d47edb8abdfca0e2c79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-19T17:17:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-04T22:24:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Factorise texture cache management.","sha":"3d643fbc0bbb80f17ed14cfcdfdba5f6d4fd5e83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-09-30T21:50:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-04T22:24:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Reuse texture resources","sha":"8d986e77d168e9aa3f1ff2094fe13f28f230a778"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-03T22:14:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-04T22:24:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Do not regenerate RTTs if they didn't change between draw call.","sha":"a5ecbd0b2b92d831069eb916fb573782a434606c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-04T15:35:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-04T22:24:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Move adapter's description to settings.","sha":"2f211e4e5a0a2b1ebcf5838c49c63ee95ea27e34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-04T23:54:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-04T23:57:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Common: Fix element count computation if addr is null (RSXVertexData)","sha":"d511153836ae2b17044edf8ea457aacbbc52d3f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-05T04:53:01Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-05T04:53:01Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1243 from vlj/d3d12\n\nD3d12: Small code and performance improvements.","sha":"ebf28f8da0c3c9151aab678f649560ac597b929a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-03T22:43:54Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-05T09:56:05Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Added glm library","sha":"a7262d34f03598d368ebe9d265fa5fd5c0f6c6f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-03T22:45:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-05T09:56:05Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"rsx::thread moved from rsx2 branch\n\nTODO: cellResc module & RsxDebugger disabled, DX12 renderer not compilable","sha":"1e7ded2163a320498ac948a01b50bb2a19de0e88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-04T00:12:30Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-05T09:56:05Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"OpenGL: fixed nv4097_clear_surface implementation\nminor improvements","sha":"6cd62a9fd0c1ed24b4cb1fc0457fcdd00f29ed89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-04T00:29:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-05T09:56:05Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"OpenGL: do not align buffers","sha":"1c890f85c57f867857a600bf961524c56d856c3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-05T00:42:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-05T10:03:23Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"D3D12Renderer: fixed some compilation errors\nRemoved GSFrameBase2 and D3DGSFrame.\nAdded frame for NullRender.\nMinor improvements and fixes","sha":"4fdeeace6630dec84dd9e6e3da6adc818bbf4f77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-05T15:40:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-05T15:40:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed OpenGL renderer crash\nTemporary downgraded OpenGL requirements to OpenGL 3.1 (GLSL 1.40)\nFixed some D3D12 Renderer compilation errors","sha":"3721941ffbee16bc4c096d849ac29e96e8860edc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-05T22:22:21Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-05T22:22:21Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"rsx::thread: initialize flip_status\nFixed clear_surface (OpenGL)\nEnabled some RSXDebugger features (disasm and textures/buffers view)\nMinor improvements","sha":"86720f90cdc07156a41211e7ca80d8468ed9281d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-07T14:36:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-07T14:36:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Implemented fragment constants loading (OpenGL renderer)\nFixed nv308a::color\nMinor improvements","sha":"cc0c3fc98dc5405883b671026b3609767d02ff8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-07T16:02:10Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-07T21:05:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fix for gcc/clang build","sha":"6cb036d35fb5a21c21297570b828e81a5aa2bb60"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-07T22:18:59Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-07T22:18:59Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Merge branch 'DHrpcs3-master'","sha":"c15027b95ef124c5756f8d121aefb95b4ad662ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-07T22:30:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-07T22:30:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Try to avoid internal gcc error","sha":"e11e67df285706ef887f74c81b4deba60e910599"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-07T23:11:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-07T23:11:32Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1245 from DHrpcs3/master\n\nRewritten RSXThread, broken DX12 Renderer and another improvements","sha":"5feba39ff7814119d9b6ae0ddcd63d1f0f4c4c67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-08T09:28:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-08T09:28:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Merge branch 'master' of https://github.com/RPCS3/rpcs3","sha":"2bd6265a1747a5fbcd46cb03f556e3a1fb8d66db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-09T09:29:24Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-09T09:29:24Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Added @vlj to developers list (AboutDialog)","sha":"98943fc9e826eb250249e53bee386f2f948bdd89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-09T18:04:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-09T18:04:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Revert \"Merge pull request #1245 from DHrpcs3/master\"\n\nThis reverts commit 5feba39ff7814119d9b6ae0ddcd63d1f0f4c4c67, reversing\nchanges made to ebf28f8da0c3c9151aab678f649560ac597b929a.","sha":"f483c3b9ca8e5a38bdda80deac6c26f21a3f800c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-03T22:43:54Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-09T18:06:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Added glm library","sha":"fd6295c2f551c617081306033812ffaa6fd1c7a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-10-08T00:36:37Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/465677?v=4","date":"2015-10-12T10:10:22Z","email":"dravorek@gmail.com","login":"Bigpet","name":"Peter Tissen"},"msg":"Fix Compilation error with Release/Debug on LLVM","sha":"97a67746f152bedb9b071337dca8d02b827c2e94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-09T17:04:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Add Utilities/types.h","sha":"d86469c2f51aa93760b70ad16dd872365f78ff72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-08T00:43:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"RSX: Remove using namespace ps3 in header","sha":"0138a95567097e5465ef22c7ca927156c83777dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-08T00:44:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Remove D3DGSFrame","sha":"ceab44b9ab32341f132933ad1a17c7b24862205e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-08T01:05:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix build in debug","sha":"4cd9e5754ecf78a454177be842fafa3203d3c476"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-08T21:06:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove m_ prefix on some members of RSXThread","sha":"e3e5b46cbf07423977f976237234d6c40bcd1ecb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-08T13:53:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"RSX: Create a rsx namespace.\n\nPut get_address inside.","sha":"3de47c201c7c82b54c259cff61b2f0f8e92b3d76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-08T15:07:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"move linear to swizzle and get_size_type\n\nsymbol undef though","sha":"6f71d04aa4180de9ee25bd6f16c507c02912f5f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-08T21:12:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Use rsx::limits values","sha":"d27f6c8fa7b43685265417b9ee17cba3f54e8d84"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-09T20:20:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"remove m_ for textures","sha":"bf474f0cdb0d668eb5ab23138ccc30e72398dfc6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-09T20:48:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Rename some methods.","sha":"28cdfa9febe9959cb19a64a8df0b5e64f05c27c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-09T22:12:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove clear_surface_color","sha":"ed61023dd37b9a6872bd15caf36c97b096f2aad5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-09T22:28:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove depth","sha":"529efd6ac8c39d4c864e270b1ca4928402b89928"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-09T22:46:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove stencil","sha":"b2a7f0fd114af023a8552302a19ad6b2c62455b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-09T22:59:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove logic Op","sha":"71552f7ffe6d387c661d7eed9b5fadabd5d3d748"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-09T23:19:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove color target","sha":"8dd19d1446aa8ac65262dde8290e284020ef9b88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-09T23:25:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove color mask","sha":"403f585a1959beb3a00e337d328e4bf9932ff9ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-10T16:50:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove blend","sha":"537187687dceb2574d4fe41db0c17ec7213348e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-10T19:06:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove viewport clip","sha":"16311b36b024d849c14b08a3aeca3c4a9137d2f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-10T20:52:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"remove m_surface*","sha":"73535e0c04fce3779bb844c40beccfbba2f4ec04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-10T23:07:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove RSXVertexArray","sha":"60bccf0f109bf21a42dfe8d91f7f1b5773d853a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-10T16:58:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove alpha func","sha":"dd1afe85ae8bf86cbb522cdd0410003819d13b39"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-10T17:04:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove cull/front face","sha":"e086b7a522a2b70c80ede714b1fee47c294c011a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-11T17:31:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove transform constants","sha":"beabc88f79209ca21ff26dbefec8142b9883026c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-11T17:45:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove fragment constants","sha":"67f1f0fea310dd0f7c796c4f39fe6cb4e32e3ab6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-11T17:50:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove fragment program","sha":"1e431edf09aeedab7f3b8704bb73238004427a9f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-11T17:57:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"remove rsxtransformconstant","sha":"2679e4f52622f666f3a0086f0c8e683bccfd775f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-11T20:17:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove base offset","sha":"86fff9800f4b4ffd704cbc7fe77cbe12d8f16402"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-11T20:56:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove context_dma*","sha":"dd000caad7ad5b99e12723e3438b3cc69d4eeb0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-11T18:47:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Remove m_ prefix","sha":"b5127e68ded04ace16edf85537da39e9d6ab9937"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-11T18:59:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:04:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Rename RSXThread","sha":"4154a1026f13a8dc40c7f3d7231bd3b38f32a041"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-11T20:00:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-13T12:27:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Use files from master\n\n- Drop smart vertex storage and use OpenGL's one instead.","sha":"a63fdf6c45491d66c8948613c44fb8428fb45f17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-13T12:28:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-13T12:28:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Merge branch 'master' of https://github.com/RPCS3/rpcs3 into d3d12-fix","sha":"426c69710c6ae7acdb980479a5f34d996c3ee556"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-12T22:02:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-13T12:28:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"RSX: Let backend customize semaphore_*_release","sha":"fc40b0ed6bf9b3e594f11243f49e8cb6db89afad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-13T11:43:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-13T12:29:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"RSX: Fix debugger disasm.","sha":"3449bd3842990124aa67153c79bb2e9c292c75e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-13T11:52:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-13T12:29:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"fix dbg","sha":"2b60de32f94c7ffa4d53b5622cbf28f6a0a4a4ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-13T12:04:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-13T12:29:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"RSX: Fix immediate vertex values","sha":"ff01e26c5cc68a8d65e7070781ca14d4308bc456"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T12:52:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T12:52:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1249 from vlj/d3d12-fix\n\nFix d3d12 build.","sha":"bbfca3fc0db4488ba7c6dcf6a88af1cbf64c9fc4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T17:32:08Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T17:32:08Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Added new config system\nAdded emulator state class\nAdded emulator events\nMinor improvements","sha":"e4f6eb04e892b87c9c8f2345840fedb9101b29e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T17:39:36Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T17:39:36Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved NV4097_BACK_END_WRITE_SEMAPHORE_RELEASE and NV4097_TEXTURE_READ_SEMAPHORE_RELEASE commands handling","sha":"737080274afa0e16c087d9183c2577dee7b3c595"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T17:44:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T17:44:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Trying do not use macro for methods binding to range","sha":"07b3897499a0b70ae5ee7c1267e7620acb0ee3af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T18:09:42Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T19:47:17Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed compilation errors","sha":"9136cbfcf290252b10560b662cb914d5d8656600"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T19:59:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T19:59:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed bind rsx method to range implementation","sha":"5de1ea3fd424e130056fae84db0c88d4217cbb00"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T20:09:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T20:09:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1252 from DHrpcs3/master\n\nImplemented new config system. Minor improvements","sha":"d8d09b547257861bbc70a1d9c4361f7a5ce074bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-10-13T20:32:25Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-10-13T20:32:25Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Fix clang compiling","sha":"92e90101e250ac36692c76c256ee6c86a829d5de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-10-13T20:42:43Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-10-13T20:42:43Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Add missing override","sha":"74daf9145a8e285bfb683c566aaff67e171df794"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T21:19:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T21:19:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1253 from danilaml/patch-1\n\nFix clang compiling","sha":"6d9951648901f4f8dafc71cbb30adaccf561d6c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T22:45:18Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T22:49:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"rsx::thread: disable all vertex data at end command\nFixed OpenGL program attributes cache flush","sha":"37a3800597dd47b1c98e1b1f73a5884fd1fe5f5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T23:10:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-13T23:10:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1254 from DHrpcs3/master\n\nrsx thread & OpenGL renderer fixes","sha":"3f6b826ab0aa6e6821d891a78f7cc58150146e30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-14T00:15:23Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-14T00:16:39Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"OpenGL renderer improvements\nFlush program cache at thread exit\nUse cached locations","sha":"4a55ba30672175174523beaad38044a5ebbaf1d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-14T11:34:55Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-14T11:34:55Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"OpenGL renderer fixes\nFixed attributes loading\nFixed scale-offset matrix\nFixed attribute debug option","sha":"a443682aafc82426000ebb3770f9ad942e1b6c27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-14T12:13:06Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-14T12:13:06Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1255 from DHrpcs3/master\n\nOpenGL renderer improvements","sha":"4dcb63436c122c6a3431eae6fb48b19896167622"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-03T10:16:38Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-14T12:38:45Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Hopefully fix Coverity","sha":"9f3b42bd71a9b55b880b4dce9f8d6491e82e7222"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-03T13:16:05Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-14T12:38:45Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Progress on moving to container builds","sha":"decd2b4f5acc77bb8a5cc8588c442709b9e5d104"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-05T04:53:51Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-14T12:38:46Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Change branch_pattern back to coverity_scan\n\nDoesn't seem to play nicely with forks.","sha":"9ee9efeb76aec5a3c5750728e64759e8a09a13f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-14T14:40:17Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-14T14:40:17Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1240 from tambry/RealCoverityFix\n\nTry to really fix Coverity and progress on moving to container builds","sha":"cc02a147d36c8e2a7ba4772a3dec40f2219a00a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-09-26T20:46:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-10-14T15:17:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::var improved, cleanup\n\nMostly vm::var initialization introduced.\nAdded vm::make_var function.","sha":"a974ee009ec6c14fd06c75d06772d4bd620ea49e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-10-14T19:34:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-10-14T19:51:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RSX fix","sha":"ec0005195dbf99f90cb0631e700b958bfd38f65d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-15T15:05:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-15T15:05:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Fix d3d12 build.","sha":"5a064be49019bd32a8d5556ae0b397b106dfeebf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-05T16:25:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-15T15:13:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Make descriptor heap a little more compact.","sha":"0e98da23064d943081cbbfee8b5592d0d8c3f506"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-05T16:52:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-15T15:13:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Zero vertex shader output.","sha":"de97d3a7aaa82d0ed4478cbba976a1ac498608ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-05T17:30:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-15T15:13:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Common/GL/D3D12: Fix int vector ctor in vertex shader and a compare opcode.","sha":"b0f8611f490e6bd2ce9ba0fb0eb3bba7e3989abf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-14T17:47:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-15T15:13:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Avoid an extra vertex copy","sha":"a2997a11092d84571d2ef30fa4ba85196fc7e894"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-14T20:01:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-15T15:13:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Lower alignement constraint for vertex index","sha":"f5bd0440969b17810a1063e9beafbf46b94733a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-15T15:38:01Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-15T15:38:01Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1257 from vlj/d3d12\n\nD3d12: Fixes and speed improvements.","sha":"b3db9255e40780c4216692873f84f7658847f603"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-10-16T00:25:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-10-16T00:25:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bugfix","sha":"77bf86eaa5269a01cd148dcf5a5c93146fd366e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-06T14:02:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-17T02:15:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Move d3d12 files to separate solution.\n\nIt simplify solution configurations.","sha":"a462b4518c634c8079e8528bd398e00871e6ebe3"}
+{"author":{"avatar":null,"date":"2015-10-18T01:14:19Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-10-18T01:14:19Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1261 from vlj/module\n\nd3d12: Move d3d12 files to separate solution.","sha":"d1b5dcfdada812c0d3e1fc8d928fbdc6eaf15eb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-20T09:34:54Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-20T09:34:54Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix a savedata access violation","sha":"6f8544281a85433c5d633b1985a69c3e4a6aa293"}
+{"author":{"avatar":null,"date":"2015-10-20T14:56:35Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"committer":{"avatar":null,"date":"2015-10-20T14:56:35Z","email":"hykem@hotmail.com","login":null,"name":"Hykem"},"msg":"Merge pull request #1265 from tambry/savedatafix\n\nFix a save data access violation","sha":"b3b07c8248edf1c826ae64010cee981f2897fe7b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-10-20T15:55:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-10-20T15:55:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixes","sha":"8cfabf0ead1f7a6cf98870ecf25860d5ae2247f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-10-21T07:24:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-10-21T10:31:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"DX12 fix + rpcs3-tests project","sha":"d4e0da3f80d487817dbd012647015826ae30b71d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-10-22T16:30:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-10-22T19:38:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor changes","sha":"fd628d8345e1a34650ddd892a318ddd85034e7ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-24T10:38:24Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-24T10:38:24Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Use custom configurations","sha":"9d6df238d5d18760330a477836f7dfc064fdc147"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-24T11:46:31Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-24T11:46:31Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Compilation fix","sha":"bc8b71cbc16b539967e563e938fdeccbb1bc7406"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-24T12:18:40Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-24T12:18:40Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Compilation fix 2","sha":"a273768c4d184b6d2037e2da198096b1f3f285e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-24T18:48:07Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-24T18:48:07Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Do not try to change default config, use state configs.","sha":"1673ba217c2a71a5b15f165530aa77b46af96eab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-25T14:44:49Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-25T14:44:49Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Ported more options in new ini-manager. Use later.","sha":"89f14ec5ac7b51161d0346d49d756c9dd7206248"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-25T14:55:56Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-25T14:55:56Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Oops","sha":"c64bbcf87a27325cdcb52bbdb7d712feaa2ca770"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-25T15:06:01Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-25T15:06:01Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Again","sha":"e8ebb005fd2fc1d5419be969c2692e84095fa921"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-25T17:42:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-25T17:42:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1272 from O1L/master\n\nSupport of custom configurations","sha":"77c2ca68620a6794dc9e8e22288c20a9f5e3ca1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-26T21:09:31Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-26T21:09:31Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Old ini-manager only partially used in VFS. Global configuration used as defualt.","sha":"c0255208cccb559b9298a62607264686e375b04b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-26T21:41:12Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-10-26T21:41:12Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Removed unneeded config saves and misprints","sha":"f842c206f39657f3160a7ae01669d7e81fae3a5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-26T23:34:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-10-26T23:34:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1274 from O1L/master\n\nNext stage of removing of the old ini-manager.","sha":"08b03db5fac8146f4b3bd7ae783bfb35c3b47b94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-18T17:53:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-27T00:24:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Try to support undef vertex input","sha":"42f3296791778446e26f768d6015762d0c33af56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-16T16:57:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-27T00:24:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use provided constants to set alignments","sha":"fe902cbb1320e1c56a83969d2c037188c797e5ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-25T16:53:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-27T00:24:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add support for primitive restart.","sha":"bc7e30517bf670ee6aef4b05a34ad04a5d189883"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-15T21:06:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-27T00:24:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Avoid copying index data and use correct index range.\n\nThis fixes Braid.","sha":"9f49232cac82e213ea699648c69804bc664ac868"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-25T22:40:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-27T00:24:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"RSX: Returns texture bias as a float, considering the stored value is a half float.","sha":"8afa6e59b29d74fa25dbb73a7331a5ae189d9325"}
+{"author":{"avatar":null,"date":"2015-10-27T02:08:56Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-10-27T02:08:56Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1271 from vlj/d3d12\n\nD3d12: Perf and compat improvements","sha":"eec64ef1c0538e7940351f496029ef6427588b96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-28T21:40:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T17:48:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Rename d3d12.h to avoid conflicts","sha":"6133590903dbde02b59716c59b491ad28e89655c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-26T21:52:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T17:48:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add a unreachable function used as debug/optimisation hint","sha":"5c42a3cbc41122936e72bcf9618dffab8316fea1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-26T22:26:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T17:48:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Move enum conversion to a separate files.\n\n* Add noexcept\n* Use unreachable\n* Use a_b_c style","sha":"119126c60c8046d03116704d415f710fc1676c5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-26T22:51:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T17:48:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix sampler border color","sha":"0e3ab35e327bda7fd8804e3b799a934b025a08d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-26T22:58:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T17:48:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix some unintialised value warning.","sha":"8f84fca0f2aa25d523065f7ff60e7b157ca091d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-26T23:36:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T17:48:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"StrFmt: Fix unknow pragma on MSVC","sha":"9f51bce2aae78cfabdaf445d85b5355eadccc599"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-27T00:11:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T17:48:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"RSX/common: Clean TextureUtils code.\n\n* Use a_b_c code style\n* Add noexcept\n* Use anonymous namespace","sha":"42467ba40f02415ee9c02fe8dbb3001ea5d8365b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-27T00:19:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T17:48:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"RSX/common: Clean BufferUtils code\n\n* Add noexcept\n* Use a_b_c code style\n* Use anonymous namespace","sha":"1ec18bdf64f79c0ef6513c4503f02a19475210a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-27T17:09:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T17:48:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Clean D3D12GSRender\n\n* Use anonymous namespace\n* Use a_b_c code style\n* Fix static analysis warning.","sha":"59c549ac86c68e91155808adf0dad0f452104a7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-28T16:32:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T17:48:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Move empty texture slot filling code to D3D12Texture.","sha":"fdae12c52ebb05d557749f99fd4346b99293860a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-28T16:42:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T17:48:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Move storage helpers to their dedicated files.","sha":"124d0de325808d8ed7d61bf4803b88788e508190"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-28T18:02:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T17:48:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Rename D3D12GSRender function\n\nMatch a_b_c coding style.","sha":"c197b547742459de8c1e0af741fef0d2cddc9e48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T00:21:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T18:11:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Include some headers in stdafx_d3d12.h to speed up compilation","sha":"893175f511560011a6aea84098d8ee1659cb7f03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T17:50:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T18:12:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add newline at the end of every file","sha":"c570d60f4526659f54250f0b2127f4be8b8a4813"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T18:10:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T23:04:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Clean Overlay code","sha":"29cde1a6187acd5931c42492bf41f332903614de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T21:33:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-29T23:04:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add an extra varying.\n\nThis fixes shader compilation for SH3 HD.","sha":"a2f7f371dcb330cae43b2d88d62a7f6fe132154e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-30T17:10:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-30T17:10:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Suppress a warning if no rtt is bound\n\nRendering depth only is legal.","sha":"204318150108feec78df886df9cdd6ad43d49dc8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-30T17:12:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-30T17:28:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Support size changing depth buffer","sha":"449c41aca2b840439c58b70f4e44e556a381be3b"}
+{"author":{"avatar":null,"date":"2015-10-30T20:12:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-10-30T20:12:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1276 from vlj/d3d12\n\nD3d12: Code cleaning","sha":"b5cf7fba2e196363b137e81becf4d545c149266d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-11-04T13:33:24Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-11-04T13:52:06Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Install cmake from packages\n\nIt should be at least 2.8.12","sha":"ae38ae9affd5685c58d155ae8a3bc5ffe8417bd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-10-13T10:44:35Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-11-04T14:32:44Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Fix Full screen in DX12","sha":"61755ed01759fbc9ed9cc47525923dfb084ccd6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-31T17:08:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-06T19:08:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/d3d12: Move scale offset buffer setting to RSXThread","sha":"02ce78482cb55fbf3b93c54fe3666f149bd8c476"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-31T17:19:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-06T19:08:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/d3d12: Move vertex constants filling code to RSXThread","sha":"2ad705174635b6dfb7465293551ee25ade54723d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-31T17:43:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-06T19:08:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/d3d12: Move fragment constants filling code to ProgramStateCache","sha":"2a9895b7f0bd8fa60cbb976e1575662edfeea79b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-07T15:43:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-07T15:43:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1281 from vlj/rsx\n\nRsx: Factorise d3d12 constant loading code","sha":"adcb9864df984a926bda22c313db4421627f63bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-30T22:37:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-07T21:52:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Clean rtt related code","sha":"e76abf875f60585f622c0ff6ded239625d6b8f5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-01T20:23:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-07T21:52:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Comment out LLVM_BUILTIN_UNREACHABLE and display error msg in log","sha":"0cc4b555d1f08001721622511b20b4a9e4cb84a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-08T11:26:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-08T11:26:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1286 from vlj/d3d12\n\nd3d12: Clean rtt related code","sha":"896562238c11ca7259ecd7031eca2b98bcc0731b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-02T01:08:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-08T18:12:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Expand some rsx register disasm.","sha":"8da7361794860360a1a08c809d168761616f1243"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-05T23:56:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-08T18:34:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/d3d12: Record frame buffer content per draw call.","sha":"70b9271cd8e4ac21e0d6adcbab0f3e099bef4e4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-03T00:44:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-08T18:34:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Add gui element to enable capture frame","sha":"660bc34157ab83090d9ab118e9b3afb1522846fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-08T22:35:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-08T22:35:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1285 from vlj/rsx-debug\n\nRsx debug: Record per frame draw calls.","sha":"5dfc22a604c24880ebf9aa29e9d55243f0f68e1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-17T17:47:18Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-11-09T05:39:50Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Lots of defect fixes","sha":"fac9d74344cbe654466975ce5ca166054df6f6e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-23T14:42:34Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-11-09T05:39:50Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"More defect fixes, added some error codes","sha":"9c2f48cd1d0a48712fc978cf21e5ec6c9149fa02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-11-08T11:42:41Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-11-09T05:42:04Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Replace most returns with CHECK_ASSERTION\n\nAlso fix some Seek methods return types being unsigned, while returning\nnegative errors.\n\nAdded the CHECK_ASSERTION macro checks in a couple more places.\n\nSimplified CHECK_ASSERTION macro usage.","sha":"5d5a4f804b2b8fd711f13fefff53201081b9693b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-11-08T11:47:08Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-11-09T05:42:16Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Add new VS Update 1 database format to .gitignore\n\nIt can be enabled in options, under C/C++ -> Editor. It's experimental,\nbut should be faster. It will be introduced in Update 1.","sha":"2a5f5c0dc23782a4d35327f95a159eed677a29f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-11T20:18:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-11T20:18:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1262 from tambry/frog\n\nLots of defect fixes","sha":"231f322b607034411905e91fa34c4d16279063a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-31T22:06:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-12T17:29:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use ring buffer like rtv/dsv descriptor heap","sha":"925d6889a68964a0853e25dc4c4616efa133c801"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-10T21:34:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-12T17:29:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Take primitive restart index in account and turns it into -1.","sha":"ae5d95d462e45f350f5d9d204f018c879570ab08"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-01T00:07:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-12T17:29:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix depth range","sha":"917f08c5346f5bc8730d40ba54d8b74567d11609"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-01T19:56:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-12T17:29:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix wrong front_face_ccw value for Disgaea 3","sha":"c152c20d70fb85050f232f1786ec71303953731b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-06T21:16:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-12T17:29:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix scissor","sha":"039e729881ca88c4e13218fb8f2192f29852d1a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-14T11:01:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-14T11:01:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1289 from vlj/d3d12\n\nD3d12: Fixes","sha":"b46c66b4c7a3245920a434a71d3482919561b94e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-11-14T16:34:20Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-11-14T16:34:20Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Fix crash on exit in some tests\n\nIt started occurring recently though the problem seems to be old.\nOnly KeyboardHandlerBase is the fix, the MouseHandler one is to be safe.","sha":"009aa3dcb90210689c1c25bbe70d03f979aadeea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-01T10:33:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-14T17:26:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Added fs::file_ptr, fom::rewrite, cleanup","sha":"a4db58f5f29674f5f82b20b2dbe8e87d7a00f8de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-01T10:43:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-14T17:26:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"080e5039541bbceeea65c1643f90d96f125621a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-14T11:04:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-14T17:26:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PKG Installer fix","sha":"7dfe9415c4e62c8be3bdf70a6912a131f45d2a09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-11-14T19:59:46Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-11-14T19:59:46Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"Replace remained old ini-manager calls","sha":"fd13a495ded79cc4b098efc3353c958d525fb855"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-11-15T09:05:25Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2015-11-15T09:05:25Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"msg":"SimpleIni removed","sha":"f34bd724e3447f618da2cda3ce3cc1ab1138f556"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-09T21:27:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-15T16:20:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: reset register after each flip\n\nSome overlay operation are executed when a flip is requested, it may\nchange register states. Fix depth buffer in SH3","sha":"e9d9bad6439fd208a908797ce9725d04749fab02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-09T21:27:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-15T16:20:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Suppress cellResc function that modifies method_registers","sha":"daf2d3a02e254c56d6f1f967df36cbc81c5994ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-10T19:39:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-15T16:20:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Fix ARL register type and write function in vtx shader","sha":"a79ffdb4854ec0791b2700c4387ee58a95fe00a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-12T17:13:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-15T16:20:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Set registers individually\n\nNot all games set registers up to the third subcomponent. Fixes SH 3 HD\ntextures.","sha":"2ac47548b0788ea0078326efcddaa59f1b5dc276"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-15T18:29:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-15T18:29:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1290 from vlj/rsx\n\nRsx: Fixes","sha":"6e666b63fa7e54247d4fa66868c9298ff91db71d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-01T20:40:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-15T19:21:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use a_b_c style for D3D12GSRender.h members","sha":"570ca1c87f98ab64ef63d16d8635191eb460c2dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-15T20:29:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-15T20:29:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1303 from vlj/d3d12\n\nd3d12: Use a_b_c style for D3D12GSRender.h members","sha":"0fc55de7693b2e9391f128247714ddb454db4cee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-10T23:19:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-15T21:52:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Use factored scale offset function call","sha":"e2d0a63b98be4cacb90ebc6725904af652db29f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-15T22:44:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-15T22:44:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1292 from vlj/gl\n\ngl: Use factored scale offset function call","sha":"60dc4abc2bdadfb4c57a553efdb1e06d3809fc23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-16T15:04:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-16T16:12:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"MINGW64: Compilation fix","sha":"5f6caf33f0ed43d024b34e8af75f0bfa7de029dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-10-31T23:35:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-16T22:32:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add support for reading depth texture","sha":"432bca26ae4789bfed9eab97b64ad77187fa3dd4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-13T16:41:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-16T22:32:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Texcoord9 is actually stored in register 6.\n\nFix shadow mapping in SH3 HD.","sha":"bb4b12f253a40532780e2cd3f20a51555516e829"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-14T17:36:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-16T22:32:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix some typo in render target code\n\nShould bring performances back","sha":"471e807ea2e4491abe8148e3a5c3b5c568806372"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-11T19:54:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-16T22:32:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Support default value for stencil op\n\nRequested by Jet Set Radio.","sha":"307015382d484acca32c00637c5b5c741e3dad8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-17T16:57:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-17T16:57:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1308 from vlj/d3d12\n\nD3d12: fixes","sha":"8edef32c76b73be85466e77cc49d7b681a264a85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-15T23:27:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-17T18:00:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"DX12 dependencies fix","sha":"4a669fd86e63b05c9d00aa926cdf87ed105a68cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-15T23:37:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-19T18:24:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Make SCT/SCB/TEX SRB function complete member of FragmentProgram","sha":"9fdc458d69fbf7519d9b0b61c1466cc5864927fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-15T23:56:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-19T18:24:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Add missing SCB DIVSQ opcode support\n\nFix a lot of gfx glitches in SH3 HD","sha":"3e5f0e5c376bb5ca4f4539e4c139cc5a03df2177"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-19T19:22:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-19T19:22:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1305 from vlj/rsx\n\nRsx: Fix fragment decompiler","sha":"247af0ebbfd2e3a30bf2d33917dcbb3c11b79c0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-17T20:02:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-19T19:26:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Use uniform buffer for transform constants.","sha":"5447521ce5f6b68a63adca74ba55bd60cf940834"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-19T21:16:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-19T21:16:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1310 from vlj/gl\n\ngl: Use uniform buffer for transform constants.","sha":"68608ef8948029647d0fbd3c53913eac999a4a6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-09T22:47:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-24T22:14:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Dump captured commands to file","sha":"b238107a9932150a90eac303b902110be04d908a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-09T22:57:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-24T22:14:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: better naming for draw calls","sha":"b5add0f027dee3b2c3157fe4aaf0cb96143c99f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-09T23:06:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-24T22:14:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Add none target to gcm pretty printing","sha":"85cf918aeb60db5bc673065dc3d5d8ab3252cc1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-10T17:59:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-24T22:34:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/d3d12: dump program content when capturing frame","sha":"b9d8d9383addaeced4047ce26c7c55200e4d32bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-10T18:38:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-24T22:34:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Display programs associated with selected draw calls in debugger","sha":"d15300a54922798bb5f674042356c3a89d3eb695"}
+{"author":{"avatar":null,"date":"2015-11-25T00:24:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-11-25T00:24:52Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1291 from vlj/rsx-debug\n\nRsx debug: Add some features","sha":"d0338cddf7fd4f05ece7cd053939a95ed4dc7c8b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-25T16:54:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-25T16:54:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use a single big buffer to store readback data","sha":"0d2c4c24b4dd7ad8ca49cf4dd64b7a4b162832c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-11T19:54:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-26T17:04:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use INCR for stencil op when an unknow op is used.\n\nFixes shadows in Jet Set Radio.","sha":"7e938b23630888aebe444dc652df39d8add141ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-24T21:48:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-26T17:05:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Discard rtt if format has changed.","sha":"579096c6a8304435481feef39ea763400749e7e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-24T21:49:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-26T17:05:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add support for F_X32 surface format","sha":"fa845fa5c0acbc1d2422ecdd81903a2d7c8fccd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-01T21:34:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-26T17:05:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix depth readback format","sha":"984f5c691480e688e832c05401282e3e5ae3e262"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-26T17:04:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-26T17:05:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fallback to bilinear filtering if convolution min one is used.","sha":"115255c162a7c35aa9c996f28cf70dbce42a7ad5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-26T17:10:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-26T17:10:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use address instead of context_dma value to determine whether to write buffers\n\nFixed depth read test when write color buffer is enabled","sha":"f3dd9596cf25b4037fde1cdd8c43def7ea573284"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-26T19:21:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-26T19:21:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: fallback to linear filter when mag filter is not known.","sha":"a19a9b5585651360c404c6daeecae706ae1f099f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-27T21:02:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-27T21:02:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1316 from vlj/d3d12\n\nD3d12: some fixes","sha":"d511fd6529ac2e1ce94a1ef6589fc729a5253a44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-11-22T15:30:34Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-11-27T21:08:38Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Some dependency info updated","sha":"8d5d545f3f6496af691d0f29a96ca2b87146928c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-28T05:38:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-28T05:38:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1313 from danilaml/dep-upd\n\nSome dependency info updated","sha":"f438554fc1d55a6a305b9693d431615164d8724c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-28T19:41:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-28T19:41:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Use fill_gragment_constans_buffer","sha":"7a996648bb33b6998e2ce08d118eb1143ff6d89d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-28T19:58:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-28T19:58:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Remove getFragmentConstantOffsetsCache","sha":"c86cfef58e6b90bfacb424302fdd447ce7540964"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-29T17:20:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-29T17:20:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Use const and ref for loops in GLFragmentProgram.cpp","sha":"399478c2cdaad6164c166a989a11c8331f02e404"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-29T17:22:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-29T17:22:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Uncomment viewport setting code","sha":"1e9d1c1dd9dfe3a3b843fffc055ad3451346761f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-30T15:13:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-30T15:13:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1318 from vlj/gl\n\nGl: Use common code for fragment constants.","sha":"cdcef4c8ee0ed7bf2e55f7fe245c40dbf0d62064"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-29T22:05:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-30T16:35:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Avoid mixing float4 and int4 in declaration of AddrReg.","sha":"a21c9f9861e67b9c168d48d26f5b7f0ee8718199"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-12T21:51:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-30T18:09:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx-debug: Display color buffer content in separate frame.","sha":"3d2386f9033ed234281a8a702857b1dfd888ea2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-09T23:43:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-30T18:09:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx-debug: Move pretty_printing code to GCM.cpp and support transform constants and some texture opcodes","sha":"377bdae6a97d164d0e471f41a800b890cddcffac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-01T08:28:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-01T08:28:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1322 from vlj/rsx-debug\n\nRsx debug: UI improvement and more opcode disasm supported","sha":"ed3ac91263ae13e4bffb91fc733a6bdf62fe42da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-27T22:23:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-01T21:42:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix for case where fragment shaders samples textures starting from non first unit.","sha":"174fb97172c3ad63e682d5ea25fefea6d079d39d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-28T00:43:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-01T21:42:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix fragment shader accessing to gl_Position","sha":"f4091b1027eecea1afd48ed632e196af25fda9e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-28T00:43:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-01T21:42:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: In case of non supported rtt fallback to R8G8B8A8 format.","sha":"c9c436e6fcb3c79ad7f1d336bbe79208975ccb16"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-30T15:57:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-01T22:18:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Support unormalized texture coordinates","sha":"88d7feda5c1d29a994c8acc46811154693b2cff3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-12-01T03:15:55Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-01T22:18:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Fix Jet Set Radio","sha":"450c8245ed22a4f53b399e11dd7c9dd992d514d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-02T09:43:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-02T09:43:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1324 from vlj/d3d12\n\nD3d12: Fixes","sha":"6930cbc064d46b2475bc2dc0500efbcd7abc1906"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-01T13:54:15Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-02T10:22:16Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"gl: remove incorrect/unneeded glenable enum","sha":"8edf35a9e33b417c46261701ce0a1f77c03d5156"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-01T13:54:30Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-02T10:22:17Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"rsx: add missing transfer enums","sha":"83cb1377217f278a849f66ab01d07c7e8edd2617"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-01T13:55:15Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-02T10:22:18Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"rsx: Improve NV3089_IMAGE_IN_SIZE and use faster loop for swizzle conversions","sha":"178bcfc8df038fc7102f26be302696aefc4fc860"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-02T09:15:43Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-02T10:22:19Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"rsx: fix convert_linear_swizzle converting backwards","sha":"19cf749944c422021bf26b0c390d1abd999d29db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-02T09:44:56Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-02T13:06:40Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"rsx: Style changes","sha":"52be47ca89d4ca8f3092941984165168bddb510b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-03T15:17:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-03T15:17:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1327 from jarveson/rsxSwizzleFixes\n\nRSX improvements and gl fix","sha":"78bfd54ad4933dc50e8d8ef14d71a7c7ff2c083c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-26T08:06:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-04T20:37:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Threads improved, ID manager improved","sha":"ca6783ba9ac0335a8490631cf2b73fd4aef81b6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-26T08:13:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-04T20:37:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"MINGW64 fix","sha":"8a1ce6ba64583e7783aca70d721685bc21261f62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-26T08:14:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-04T20:37:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GL render crash fix","sha":"f3311bb5e53e07e1563138ac337c35e82898cfe3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-26T07:37:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-04T20:37:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GUI fixes","sha":"b18e337781486d41eb033b0d57f6998aa04acba8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-11-30T15:10:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-04T20:37:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SharedMutex improved","sha":"82cb8fe5bd9ce032131ac29951b1b8a4fe6dc788"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-01T14:48:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-04T20:37:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Custom hashers for ID manager","sha":"f245799479a862097b10ae0506dd27c48dc7e60a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-01T20:06:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-04T20:37:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"AutoPauseManager, SaveDataUtility fix\n\nRedundant stringstream removed","sha":"298eb46a31f7cd2480bdd2be979c1f53063b9e8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-02T09:23:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-04T20:37:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Optimization","sha":"24128ba450f37105474cfccd6d00f999832ab653"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-02T16:12:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-04T20:37:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Shared PCH (experimental)\n\n\"Rebuild\" is broken though.","sha":"3465106456283b2f460842ec8526de3514bd4df6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-10-25T14:27:04Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-12-05T12:22:51Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix cellGcmSetTile(Info)\n\nI didn't specifically write a test for it, but I did at some point\nmodify a couple samples to try and use 2048 and 2047. Anything above\n2047 didn't work.","sha":"efe430733b16138dd58dd81f46d9aab13900542b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-11-30T17:45:13Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-12-05T12:22:52Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Add AlexAltea to mention bot blacklist.","sha":"38709058a38a90d302f8dffd2ee5fd3be2debb9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-12-05T15:13:16Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-12-05T16:45:58Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"GUI: Fix removing game from game list\n\nFixes #1326","sha":"d01235ce2de4424b8705ffb3433a8301d920fcc6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-12-05T16:40:30Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2015-12-05T16:54:23Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"GUI: Fix wx assert on first right-click in game list\n\nDon't know why it was working before.\nAnyway, it seems ugly and it probably should be handled differently (the\nwhole function, or whole GUI ;P).","sha":"0d6297fef0985198fde87baa772f309087572305"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-05T18:14:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-05T21:17:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"llvm: Remove PPULLVMRecompilerTests.cpp","sha":"7ae1b51753cdd951c41330a7cc97ccd7af6a71fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-05T18:32:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-06T22:51:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"llvm: Make Compiler class a module builder only class.","sha":"8e451126acf419600537ffc308a79bb45ad31081"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-04T23:36:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-06T22:51:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"system: Do not send dbg command if dbg hook is not present.","sha":"6c01658d378a08b310f9a15f47d54cae5169df74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-05T19:34:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-06T22:51:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"System: Add a test mode that fakes running emulator.","sha":"0e27b68ba759f80f2b00bd5c877100dc7b98e1a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-02T19:40:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-06T22:51:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"llvm: Add ps3-ppu-llvm.cpp file that contains llvm tests","sha":"65750aea12c944e6ba9dbb894cedd062edf73ba7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-07T07:44:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-07T07:44:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1332 from vlj/llvm-tests\n\nMove llvm tests to VS unit testing framework","sha":"be1c9100cc22a6a4220270283ce41d298245e3e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-06T15:45:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-08T17:02:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Property sheets, configuration simplified\n\nMemLeak build fixed","sha":"8e4ad3dfcb8d8928af1f4bf8d06fd875276a146c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-06T17:18:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-08T17:02:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Memory leak fixed","sha":"717d99795c70c4b64531efa0f3648a4a3515a135"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-06T17:54:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-08T17:02:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GLGSRender.vcxproj added","sha":"d90850e6976047a92f1ac0a6a8f9fc975d9e72fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-12-12T15:01:27Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-12-12T22:21:24Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"Fix for Shovel Knight","sha":"27ad98ee984cfe1e24fb47db6b3f9a5c46dcb7b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-13T23:34:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-13T23:34:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1341 from Zangetsu38/patch-1\n\nFix for Shovel Knight","sha":"52129a3d715475b9166c93841940b40105273ced"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-11T16:59:11Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-15T01:16:12Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"rsx: NV3089_image_in: Fix braid and Jet Set Radio","sha":"6f584049a25cc2ca5f712fd13b2397b256820844"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-11T17:08:24Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-15T01:16:14Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"sys_mmapper: Allow 0 alignment to mapping to fix Psl1ght homebrew booting","sha":"08d05e245d33906778c1ae48beb65d92ead86f6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-11T17:09:24Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2015-12-15T01:16:15Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"CellUser: Fix cellUserInfoGetStat for 'userid_current'","sha":"266504a0ac0b21453e366b7e58af30a119ddef17"}
+{"author":{"avatar":null,"date":"2015-12-15T04:04:16Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2015-12-15T04:04:16Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1336 from jarveson/miscFixes4\n\nNV3089 and misc fixes","sha":"56704888b5c3534b2471cc822dccae1d3e684dd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-28T00:57:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-16T19:36:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"common/d3d12/gl: Add support for textureProj","sha":"6fae5863cfb4337e20620a9ebf29b425f3e9f22b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-30T18:39:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-16T19:36:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/d3d12/gl: Make output write backend dependent.","sha":"929f518ef3b2a932e5bfdb20c12117767c071d90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-07T21:09:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-16T19:36:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"common/d3d12: Clean texture upload code.\n\nSome typos are fixed in the process","sha":"80dc1227429d54fa6352e93e026cc52f86f5de8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-10T01:52:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-16T19:36:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"common/d3d12/gl: Start implementing cubemap sampling","sha":"6221fecf3bd584d1b036b2e9bd76ffd903192b5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-08T22:42:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-16T19:36:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"common/d3d12: emulate polygon mode","sha":"1cda2977bb79e85aa232bb318f06d0977fc3c8b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-12T17:53:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-16T19:36:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix handling of disabled texture\n\nFix After Burner Climax textures.","sha":"fcf775100845080974a3922b6051ff68d47e5417"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-30T19:16:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-16T19:36:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: D8R8G8B8 and A8R8G8B8 are essentially the same.","sha":"27807f3a618fd02f81007838427dd857fdef1a50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-07T23:35:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-16T19:36:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Support surface format R5G6B5","sha":"d7b4b2fd49eb9d8ae041410abee423a47d9be7c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-13T19:56:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-16T19:36:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add formatting abilities to unreachable macro","sha":"456f83671a305b038c8f7d0720d6b07642a9b7fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-11-29T16:31:02Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-16T19:36:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Add more log callback for support dev","sha":"81f05daff2919650d70649f36938c0b25f1b876e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-12-08T23:48:14Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-16T19:36:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Code style fix for function return","sha":"dc5a439ec9e4c5213740fb0636e5d5b4e22db1c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-12-13T22:08:49Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-16T19:36:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix error Last commit","sha":"a44c54b42883052221e207c2d90ffc1a6ee8741c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-14T22:40:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-16T19:36:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Vertex program condition swizzle should apply to cc0, not float4(0.)","sha":"69b3828086d6338052a5a1eccec94ee489368ac4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-16T19:59:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-16T19:59:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1344 from vlj/d3d12\n\nD3d12: Refactoring and fix","sha":"14123d67e1b4ca9005d9137a70bc6596143eb183"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-12-17T11:41:05Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-12-17T11:41:36Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix #1343","sha":"5672ba887bc1688c3d849ae9608a355c9e0408c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-20T08:16:31Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-20T08:16:31Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Ignore SPU sync channels","sha":"416d66a438352636ae58400967505dcb344a415f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-20T08:28:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-20T08:28:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"sys_mmapper improvements\nsys_mmapper_allocate_address: always set default value if aligment is 0\nsys_mmapper_map_memory: don't fire exception if memory already mapped","sha":"408581b7bc9fddbcd44f47b0fa45615d255c9a89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-20T08:39:07Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-20T08:39:07Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Implemented some cellSaveData functions\n\nImplemented cellSaveDataListSave, cellSaveDataListLoad,\ncellSaveDataFixedSave, cellSaveDataFixedLoad, cellSaveDataAutoSave,\ncellSaveDataAutoLoad","sha":"8a21e0fcb839bdf59eec2c8191652490b2cf8d75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-20T09:10:28Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-20T09:10:28Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1350 from DHrpcs3/master\n\nMinor improvements","sha":"d68c7489767f497fedffdbe17d37b61b829407ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/126009?v=4","date":"2015-12-20T10:20:48Z","email":"anthony@anjbe.name","login":"bentley","name":"Anthony J. Bentley"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/126009?v=4","date":"2015-12-20T10:20:48Z","email":"anthony@anjbe.name","login":"bentley","name":"Anthony J. Bentley"},"msg":"By definition, malloc() is available in stdlib.h. malloc.h is deprecated.","sha":"aa4fb80465122fe48e5635a094a124e789bed81c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-16T14:20:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-20T12:41:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Exception handling fix","sha":"56ba5a765ba8a8e222f50253225b3ef90329b576"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-16T19:50:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-20T12:41:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs::get_config_dir, fs::get_executable_dir","sha":"321e6d3a86bbcebd16a1b2ac6c7b2d183f7ad291"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-17T17:31:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-20T12:41:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Cleanup (noexcept, unreachable)\n\n%x formatting fixes","sha":"aa811b6eefad2d907261c17c056b26a37bd03d29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-18T11:11:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-20T12:41:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Error messages improved","sha":"a666318b95657105ed651c5d9e4d8a582672a843"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-19T11:40:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-20T12:41:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"rMsgBox eliminated","sha":"4b7f9c38a623b38520437e44535bb96d588f51e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-20T06:35:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-20T12:41:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ThrowIfFailed replaced with CHECK_HRESULT macro","sha":"f2df9b469a60eb22e3c50cd9beb7767d86e22284"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-20T13:27:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-20T13:27:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1347 from Nekotekina/master\n\nFixes","sha":"e4631f93bdf2799186d488fe6314e62dc1bd35af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-21T01:28:07Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-21T01:28:07Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed crash on start if config does not exists\nCleanup OpenGL renerer","sha":"7416fe91fc5a97deab4561a9fbdcdca049f27830"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-21T01:55:55Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-21T01:55:55Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Do not mix projects temporaries","sha":"a00111a86323f9a0ac1e2b2a40bb0b37e88f6386"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-21T02:14:56Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-21T02:14:56Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"GLTexture excluded from GLGSRender and renamed to rsx::gl::texture","sha":"ae83ab543673c5c8f025a8d9ce5146ff5ab8e33a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-21T03:35:56Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-21T03:35:56Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Do not use global static variables in headers","sha":"d8bef46c2afd444e72a4cb1af43de3f38575c754"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-21T06:48:33Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-21T06:48:33Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fixed conflict with X11\nAdded tmp folder to gitignore","sha":"3ca634138dce0742228f9d43febaf2a84d41bb3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-21T10:11:17Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2015-12-21T10:11:17Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1360 from DHrpcs3/master\n\nMinor fixes","sha":"e8310e6c50b797910034916248e3d70c6e2a5ef0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-22T19:24:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-22T20:11:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Changes done by [DH] rewritten\n\nAdded rsx_program_decompiler submodule\nAdded fs::dir iterator\nAdded fmt::match","sha":"3ed603074c98d02b3fd7004d24b75433aefaa907"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-21T01:22:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-23T16:02:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"llvm: Reenable debug info dump","sha":"743f5f07cb5b18311a4c24cea8a97532fe96fd7d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-22T17:12:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-23T16:02:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Call fast_stop when function returns and PC corresponds","sha":"e7df81ade0f930cb6f729f0d26984a03750bf534"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-08-03T21:37:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-23T16:03:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"PPU/LLVM: Use interp version of some instruction for debugging purpose.","sha":"243bc0d06e2ef831c3c064db29a1019f5aa40c43"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-18T23:32:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-23T21:26:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: If swizzle bit is not set then there is no padding, even for dxtc textures.\n\nFixes some textures in dbz and after burner climax.","sha":"a97dc349b72614db57d776b00424c3e85563e594"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-19T17:49:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-23T21:26:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12: Force depth to be at least 1.","sha":"9c6539ea2d17231e0e45cf70c9c9ef28f5bc4f47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-12-09T10:56:40Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-23T21:26:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: fix return correct value in d3d12format","sha":"64036e0478961122d5e7dae749baf5d88151e3e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-12T17:48:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-23T21:26:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Names PSO for debug purpose.","sha":"ecad5867394d9e949cdccc4583332b772493e84a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-19T18:34:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-23T21:26:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: name rtts/ds/texture for debugging purpose","sha":"b41fcf373420709275687e6a3c979ddd32ed1422"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-23T16:17:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-23T21:26:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix warnings andnable warnings as errors.","sha":"c4b3b967d9d55a09e64f3af789ecd7023862edc4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-24T10:39:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-24T10:39:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1365 from vlj/d3d12\n\nD3d12: Some fixes","sha":"813e753e3ddf6a93d1e16650eef8aea138f8a53e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10055601?v=4","date":"2015-12-22T17:31:47Z","email":"chaorenl@google.com","login":"chaoren","name":"Chaoren Lin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10055601?v=4","date":"2015-12-24T15:58:28Z","email":"chaorenl@google.com","login":"chaoren","name":"Chaoren Lin"},"msg":"Create config file if it doesn't exist.","sha":"d917cfa43f8d90b66e070a266045eb7ed6889a1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-12-24T19:39:50Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-12-24T19:39:50Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1366 from chaoren/master\n\nCreate config file if it doesn't exist.","sha":"0e0345824e410710df8b50305c4c3d41c1a4d79f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-25T00:18:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-27T23:19:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Revert some value in get_blend_factor_alpha\n\nfix crash in SH3","sha":"d6b2230b927247534d1f499a6f2ff1473a1db932"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-17T17:59:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-27T23:19:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Support early return in fragment shaders.","sha":"44840dbbcf789ff29d23a0b1566efdaef93812d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-29T12:17:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-29T12:17:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1378 from vlj/d3d12\n\nD3d12: Fixes","sha":"5a60a5bebd502dc011c9049096f80161bdc043ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-19T18:22:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-29T16:08:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Support RSX_FP_OPCODE_DIV for scb\n\nFix glitches in dbz","sha":"969e2d8c570647fa2ef7439ca751b77aa2d52511"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-29T16:37:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-29T16:37:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1379 from vlj/rsx\n\nrsx/common: Support RSX_FP_OPCODE_DIV for scb","sha":"702423158cda126f63bd7d629151ea7ddb6f5b50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-29T19:37:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-29T21:25:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"llvm: Increase test runs.","sha":"2da52d030906855e1a290ecfd831be1d7a1e1fb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-29T20:06:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-29T21:25:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"llvm: Implement trap instructions","sha":"082815f93eb4ac191d840b7bc20acb33fa3dbfb0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-30T14:46:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-30T14:46:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1382 from vlj/llvm\n\nLlvm: Increase test runs and implement TWI/TW/TDI/TD","sha":"e748fc294bfb7fa877957fda157060c5777ec050"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-23T21:25:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-30T16:04:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl: Use separate vertex array/vertex register states.","sha":"5f12a4f7b5d734344f2f9ea5f555495a138ced77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-31T08:33:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2015-12-31T08:33:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1383 from vlj/rsx\n\nrsx/common/d3d12/gl: Use separate vertex array/vertex register states.","sha":"68111953457cf438e8c7e6b6d0a98447f5e650fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-12-21T18:17:57Z","email":"achurch@users.noreply.github.com","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-12-31T10:12:32Z","email":"achurch@users.noreply.github.com","login":"achurch","name":"Andrew Church"},"msg":"cellL10n: Implement SJIS<->Unicode conversions.","sha":"3055de044437d983ee35f9bcf7d2facd1026451d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-12-25T00:01:23Z","email":"achurch@users.noreply.github.com","login":"achurch","name":"Andrew Church"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6619925?v=4","date":"2015-12-31T10:12:32Z","email":"achurch@users.noreply.github.com","login":"achurch","name":"Andrew Church"},"msg":"Allow a null destination pointer for cellL10n functions.","sha":"5a18c3f8ea325c012b8d9a31947d0d2c87a4c430"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-01T23:26:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-01T23:26:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1362 from achurch/cellL10n-sjis\n\ncellL10n: Implement SJIS<->Unicode conversions.","sha":"b1c8c0a4482746e9136b855c2acc12471284edd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-01T01:59:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-01T23:47:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Fix program state cache Shader program comparaison.\n\nComparaison was not taking the last instruction of shader into account.\nAlso remove \"constant masking\" since it wasn't actually usefull.\n\nFix DBZ: Burst Limits, SH3 and likely much more games.","sha":"3586c7613a1a9958a63a45a52c53029486ffa336"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-03T15:19:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-03T15:19:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1390 from vlj/rsx\n\nrsx/common: Fix program state cache Shader program comparaison.","sha":"2bccf3f2af9a2010c067113caa2b98be90028f62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-30T19:16:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T18:16:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx-debug: Dump some more opcodes.","sha":"4e7e8958224341c87d53a186da7db942ea9f0b51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-02T22:55:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T18:16:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx-debug: Dump anti aliasing mode.","sha":"d1e91433adc5b9931f545decf32e4a3962c6b9ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T01:12:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T18:16:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx-debug: dump anti aliasing control","sha":"bc3065939f8e7d3093be35ed14df1546ca0adf74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-03T18:47:40Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-03T18:47:40Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1377 from vlj/rsx-debug\n\nrsx-debug: Dump some more opcodes.","sha":"ed68e864c20ff7dd72b787c1e8d13c9901cea170"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-30T01:12:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T20:01:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Put XAudio and OpenAL files in separate projects.","sha":"02473324f4dedadf42dff92761a8faf833f63e64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-03T20:36:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-03T20:36:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1385 from vlj/build\n\nPut XAudio and OpenAL files in separate projects.","sha":"404b15b3c3f5f272edfe356dabca8e66ba28af5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-28T21:39:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T20:51:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Set command heap only when necessary.","sha":"8417e21e8d496c13a30a1e300ff6b651947d0ede"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-28T21:57:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T20:51:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Throw if program failed to build.","sha":"07f689662229705aab9ef07088d184b40e90c8a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-29T17:09:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T20:51:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Recreate RTTs if size doesn't match.\n\nFix Bomberman Ultra","sha":"324b2da3ec337383fc9bfc18ebdff92a9a4f9324"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-12-18T13:21:42Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T20:51:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix for BIT.TRIP Runner2","sha":"2a1f19b77633fc61ac9d77fdb480c7828cf97724"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2015-12-30T05:59:57Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T20:51:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix Super Dub 'a' Dub","sha":"3529554c88c5f1b45507206dfc09e08649284f7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-01T21:11:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T20:51:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Reenable missing case for CELL_GCM_PRIMITIVE_LINE_LOOP","sha":"854365e6cec75fe377ffe8ac212370d580897237"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-01T18:15:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T20:51:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Avoid implicit cast from int to bool in CHECK_HRESULT macro","sha":"f38d0e92e7ccf4c759e111e238881cf764672ec0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-04T16:25:51Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-04T16:25:51Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1393 from vlj/d3d12\n\nD3d12: Fixes","sha":"34336ebfcec766ec2f15deeb213d9d1a0ff4faa8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-12-31T18:15:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-04T23:31:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl: Implement draw inline array support","sha":"cae2d929abb9bada5f804a7de121570be7c4e68e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-05T19:36:44Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-05T19:36:44Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1395 from vlj/rsx\n\nrsx/common/d3d12/gl: Implement draw inline array support","sha":"2b40ebdbc087ccf51e921db95f97d2c4fc71c0db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10055601?v=4","date":"2015-12-24T07:22:09Z","email":"chaorenl@google.com","login":"chaoren","name":"Chaoren Lin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10055601?v=4","date":"2016-01-06T03:01:46Z","email":"chaorenl@google.com","login":"chaoren","name":"Chaoren Lin"},"msg":"Fix configuration path creation.\n\n* Simplify create_path\n* More sane permissions\n* Create entire path of configuration directory","sha":"7186b72a564388e724336ccdd008a54088893977"}
+{"author":{"avatar":null,"date":"2016-01-06T06:14:53Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2016-01-06T06:14:53Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1371 from chaoren/path\n\nFix configuration path creation.","sha":"4e08d35661ffc5d93defa3190f57dac4bff68f4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-05T16:26:44Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:30:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Implemented basic tiled regions support","sha":"5a4babb0fdbd13d87c0862bd6d90bdd9bfa59b40"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-05T16:42:54Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:30:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"rsx::pad_texture & rsx::convert_linear_swizzle moved to rsx_utils\nAdded rsx::convert_scale_image & rsx::clip_image to rsx_utils","sha":"836d14c8afecc21cf360083d3b7415c8cb289125"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-05T16:46:28Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:30:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Reimplemented nv3089::image_in","sha":"11ccc498fd02f8bbb1f38dc600179016681f7be2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-05T20:27:41Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:30:23Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"OpenGL renderer: use pitch as image row length\nFixed rsx_utils code style","sha":"509bbddac1c7dc58311eceabc0860c080d19f600"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-05T20:38:18Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:30:23Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"gl: fixed multiple textures binding","sha":"dbccf5fbad69dc9fd12cf35518662a79821eb61d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-05T20:55:43Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:30:23Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"gl: using tiled region for read/write color buffers and flip\ngl: fixed flip buffer row length\ncompilation fixes","sha":"ba12c489ec65e6070e78fcea5bc9ef719c2969b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-05T21:29:49Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:30:24Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"rsx methods moved from rsx thread","sha":"48919330d7a57cb97d1283c7365c0f23d7c20068"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-05T21:32:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:30:24Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Added missed files","sha":"c1be0cf3bf0e208823be259c41122a0060f7528c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-05T23:15:35Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:30:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"gl: fixed nv4097_clear_surface & front face selection\nadded window shader and clip plane constants to GCM.h","sha":"3ac9e0933fad212c11f47e29ad7b601061ce64e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-05T23:25:17Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:30:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"rsx: initialize vertex textures on reset","sha":"8912b9880e18a33cfa0d3ae6f00d0f26536e5655"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T00:24:57Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:30:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"fixed nv3089::image_in scale value","sha":"f7e787958ece6bb0045fbc20e0cb0b3c8c325c8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T01:37:38Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:30:26Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"nv3089::image_in: fixed reading from tiled regions","sha":"6406cece578942e9e61b71776b16483a61b14653"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:47:05Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T11:47:05Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"nv3089::image_in: use in_x/in_y & out_x/out_y","sha":"e9560da4e2bcafad4b988a5ccc3d1fe2b619f64e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T13:25:28Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-06T13:25:28Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1402 from RPCS3/rsx\n\nRSX emulation improvements","sha":"ecda02c0997ebdd289518b8bb84203812650b2b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-07T00:47:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-07T00:47:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Add shlwapi.lib to rpcs3-tests link dependencies.","sha":"f138be2e6c422a8ec16be1293ceeb9317bf9f069"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-07T01:08:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-07T01:08:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1404 from vlj/fix-tests\n\nAdd shlwapi.lib to rpcs3-tests link dependencies.","sha":"38514c291d2704d58240e75d7bcf68e1a7ea7b26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-07T16:12:11Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-07T16:14:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"elf64 loader: fixed too small primary stack size usage","sha":"657a6c9511540b3bfb0ddd8cd0befbefc190b87e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-07T19:22:36Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-07T19:22:36Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"PSF loader: implemented 0x0004 entry format","sha":"f97d791fe8ca578789d0c503f7cd1c197bc03233"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-07T20:02:35Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-07T20:02:35Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1406 from RPCS3/minor_fixes\n\nMinor fixes","sha":"b8486a489d88c58b958735271515ea6e437cca14"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2015-12-12T07:43:44Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-07T22:46:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Hopefully fix mention bot's ignore list","sha":"3281a1982e11bad9ae6b377b0e77009b86838d1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-07T23:51:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-07T23:51:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1409 from vlj/fix-mention-bot\n\nHopefully fix mention bot's ignore list","sha":"fef0b1dd46ee8530315568ded126f49c1e9d923b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T18:31:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-07T23:59:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Add Guidelines Support Library","sha":"e7591439f482d132461a21db9930fc4a974adc3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-08T01:09:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-08T01:09:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1394 from vlj/build\n\nAdd Guidelines Support Library","sha":"9d1208bf955605b4777427a770b3646d624ee7b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-01-04T09:04:58Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-01-08T06:39:33Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Various minor logging improvements\n\nAlso changed the default connection state, because chances are, that\nyou're connected to Internet.","sha":"8f937bda0f99aa7dc90dddab1574eb035efe136a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-01-04T10:14:00Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-01-08T06:39:34Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement inet_ntop and CELL_NET_CTL_INFO_LINK\n\nAlso fixed the default address not being set for all cases. Also tried\nto fix the Win32 version of CELL_NET_CTL_INFO_IP_ADDRESS failing the\nfirst time around.","sha":"f8446b227bbfeefa6befb27345c66282dbc214c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-01-06T10:47:06Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-01-08T06:39:34Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix #1368","sha":"3afc62e5252c74ad854c7458a9d0d3466b02d32e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-07T22:35:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-09T22:18:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl: Support for CMP/non pow of 2 size vertex formats.\n\nAlso use class enum for base_vertex_type everywhere.\nFix Bomberman Ultra color and Cubixx HD geometry.","sha":"d153575e59d8e5a72068d75e7248b25e38f2eeb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-09T16:23:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-09T22:18:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: reenable frame capture\n\nLikely commented out by accident.","sha":"31a925b4f060e30f45948b96de4ff5981b065315"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-03T17:40:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-09T22:18:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl: Mimic divsq and rsq fragment instruction behaviour with 0.\n\nFix Super Puzzle Turbo HD 2 and SH3 HD","sha":"675ccd4510b7dcd9a68d375a37e23fb3ead54a03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-09T23:16:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-09T23:16:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl: Support texture lod sampling.","sha":"4ef76866a52459f0131357aa678f539423a70566"}
+{"author":{"avatar":null,"date":"2016-01-10T00:44:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2016-01-10T00:44:29Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1414 from vlj/rsx\n\nRsx: Fix for vertex buffer filling and for some non IEEE compliant fragment instructions.","sha":"b055747d4f571a17d28340c6eeea156299a6152c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-10T21:22:55Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-10T21:22:55Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"nv4097::get_report: use DMA","sha":"a17c41b4e18ff0c5dda69dfdb7c911593b63485f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-10T21:28:30Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-10T21:28:30Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"d3d12 texture cache: align to bottom texture address","sha":"8297d963bfe4f799a1fbe2b42d90b103e2b5294a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-10T22:20:30Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-10T22:20:30Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1419 from RPCS3/minor_fixes\n\nMinor fixes","sha":"cc1efd2a46a83e4d85bf5985275150c61f2f07ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-10T19:09:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-11T18:21:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl: Clean ProgramStateCache\n\nUse a_b_c format.\nUse using =\nUse tuple as output\nUse RAII to delete program safely\nEnsure const correctness.","sha":"bab52c132db68d74c5547e8a6a66a79a836fa0e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-11T18:45:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-11T18:45:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1417 from vlj/rsx\n\nrsx/common/d3d12/gl: Clean ProgramStateCache","sha":"d08ce79d04aee992a90e99f4384eb583d41794b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2015-11-01T21:36:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-11T19:46:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Gather constant and vtx/idx heap and turn readback heap to buffer","sha":"0c5cfdddbab7e2ce738a95672abb458309fbdd7b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-06T18:45:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-11T19:47:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: factorize render_target code in a template class to be shared with others backends.","sha":"e6bd681227f973e40b1d8baccd581edc3498253f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-10T17:33:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-11T20:17:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Support mag filter 4","sha":"669a3277ffc0ee88c7c677ebb132adc13e2889bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-10T17:46:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-11T20:17:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use CHECK_HRESULT in D3D12Utils.cpp","sha":"08622a41b42106f5471df753ff4d5e07b60b32e6"}
+{"author":{"avatar":null,"date":"2016-01-11T22:52:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2016-01-11T22:52:45Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1415 from vlj/d3d12\n\nD3d12: Factoring","sha":"68f9898171f80b011406631a4009764908d5207c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-11T23:54:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-12T23:28:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12: Consider separate index range as a whole.\n\nFix Wolf of the Battlefield 3","sha":"689dee9944ce384b0734f79c637d60f9c7d4d3a1"}
+{"author":{"avatar":null,"date":"2016-01-13T00:08:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2016-01-13T00:08:23Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1428 from vlj/rsx\n\nrsx/common/d3d12: Consider separate index range as a whole.","sha":"5029dff73a78bfe7a6467df418d65c19e9ec885c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-05T23:52:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-13T11:12:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"File utility improved\n\n+ minor fixes","sha":"b3e3c68f15335cda4a7e4173abaf9c3df396c37e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-12T21:57:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-13T15:54:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Logging system rewritten\n\nGUI doesn't freeze anymore\nSome things simplified","sha":"38531459df73a3f6ea57d43815d6f496991b50e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-12T23:25:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-13T22:53:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Fix warnings and enable trat warning as error.","sha":"69272edba61945517fc9348686d2f1b4cdf7aa27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-13T23:28:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-13T23:28:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1431 from vlj/gl\n\ngl: Fix warnings and enable treat warning as error.","sha":"194c6b8bee8d4ba7ccc53211678bee62a4aeece2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-01-12T12:52:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-14T16:00:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use CELL_GCM_TEXTURE_CONVOLUTION_MAG for Mag 4","sha":"74ec128e62c1e8b86aef8ac3281711df32e0e2c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-14T12:56:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-14T16:07:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixes (#1432)\n\n/dev_bdvd/, rap file loading fix","sha":"8464ab6a23952e64052809abdba4f45c04c729d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-14T14:41:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-14T16:07:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"For #1356","sha":"83084467c66f9c27b719e2f11982bc7256fdcea7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-14T15:03:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-14T16:07:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"For #1355\n\noffsetof() eliminated\nOFFSET_32, SIZE_32, ALIGN_32 used","sha":"960668ecf141cfa31b6c56f21bf630d69841968a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-14T17:13:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-14T17:13:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Hotfix","sha":"2f5be3559eca59a1fd59af840566655b717356d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-14T17:31:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-14T17:41:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"\"Build Solution\" fix","sha":"efe1678088915cb7d7bc0562e3fdf12df11a598a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-14T18:42:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-14T18:42:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1355 from bentley/malloc-stdlib\n\nAlready implemented. Test.","sha":"8e12c4cb00199ceff4368f2607c63e03a265403d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-13T16:40:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-15T22:44:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Use enum class for surface related regs","sha":"3b4339c8e0ae3c8ee5a5b78b9431b075e5db662a"}
+{"author":{"avatar":null,"date":"2016-01-15T23:23:53Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2016-01-15T23:23:53Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1433 from vlj/rsx\n\nrsx: Use enum class for surface related regs","sha":"9c12d8ff22829ce97ec05ba99a41f5ab4bab2434"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-12T23:36:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-16T17:25:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Never pass nullptr as render target descriptor, even if unused.\n\nFunction interface doesn't allow this.","sha":"224facf3ba654bf67ef7f925787249769d3eaa05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-13T18:25:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-16T17:25:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use first color output for alpha discard instead of 0.\n\nFix Naruto 2 shader miscompilation.","sha":"b8e10225f9e3227422c4b3ec5d43ed89b26de34a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-16T01:04:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-16T17:25:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix texture proj\n\nI misinterpreted \"last component\" from glsl doc... it's w, not z.","sha":"5ace4438e268d7a30a0c9fe1e5c92d8a45bb6860"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-16T01:25:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-16T17:25:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix dsv increment size\n\nTypo.","sha":"26f329d186c65cad4b04190a8487ea6feff186d8"}
+{"author":{"avatar":null,"date":"2016-01-17T08:17:03Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2016-01-17T08:17:03Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1439 from vlj/d3d12\n\nD3d12: Fixes","sha":"8b5b23e6c0b2f44a3df8859241993560fac40927"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-16T19:07:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-17T19:02:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx-debug/d3d12: Support all rtt formats.","sha":"1ce49b60d9e63aae4375525d92f749c15251a077"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-18T15:11:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-18T15:11:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1442 from vlj/rsx-debug\n\nrsx-debug/d3d12: Support all rtt formats.","sha":"df3fddc02619e4700bbdfcb78555705ef07c04e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-15T16:29:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-18T23:45:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12/gl: Use r1 as depth output.\n\nThe \"Output_from_h0\" flag seems to concern color output.\nThere might be another flag for depth from half float value.","sha":"6aac972bda6da2dc3fafafb33d9657544042c1da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-19T00:16:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-19T00:16:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1445 from vlj/rsx\n\nd3d12/gl: Use r1 as depth output.","sha":"d95809a069a357ca9e76098fbaec776cb41b905e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-19T17:23:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-19T21:49:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12: Move surface_store in common","sha":"440c637b1fc3847d1769ef4cc4ab41da93feb4d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-19T22:24:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-19T22:24:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Fix int type not big enough\n\nFix glitch in After Burner Climax","sha":"f453194e32bdc9ee274b6db567cf311c2a24f452"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-19T22:51:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-19T22:51:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1446 from vlj/rsx\n\nrsx/common/d3d12: Move surface_store in common","sha":"9f7caf90e31d16839063a412b029721cdd8dafd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-20T12:46:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-20T12:46:58Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Access violation handled by rsx::thread\ngfxHandler -> rsx::g_access_violation_handler","sha":"685d5d3ea3d11c50dd4ca74ff1a3f89333e949e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-20T13:23:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-20T13:23:25Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Code style fixes #1","sha":"7972cb5bdc05e73a217d0a4064210cac0e4cbe45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-20T13:39:06Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-20T13:39:06Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Code style fixes #2","sha":"7523d01e0fcd1f4249b5ffd825f6b70a4af8499e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-20T14:12:49Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-20T14:12:49Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"rsx: implemented internal tasks queue (WIP)","sha":"2e58f312d57865e603290fef6b0b99f5c9c9366c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-20T17:12:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-20T17:12:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"rsx methods constants moved to rsx namespace\nminor fix","sha":"19ce0cdc0922bc48fd887a79d2644e65e72291cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-20T18:44:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-20T18:44:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Merge pull request #1447 from RPCS3/rsx_cache\n\nRSX vertex/OpenGL texture cache preparation","sha":"52110e0647eb59bdbeea7fa8c1d48e88b3c5ad66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-18T19:10:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-22T00:24:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Add vertex input and output in RSXVertexProgram.","sha":"4ce4cf52420c1d75972ab016bc90f3869baef593"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-23T22:59:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-23T22:59:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1448 from vlj/rsx\n\nrsx: Add vertex input and output in RSXVertexProgram.","sha":"9875bf9c7b2c471a8ecb81488a9477816da939fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-23T23:05:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-23T23:13:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Div is vector over scalar division\n\nAccording to investigation on Resogun.","sha":"9b8522e7346e5d135199503fbac82e0367bcb05e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-24T20:30:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-24T20:30:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1450 from vlj/rsx\n\nrsx/common: Div is vector over scalar division","sha":"39658c0c52cec3295b900c8aa2de7348cf0a235d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-19T23:07:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-25T17:48:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx-debug: Print number of vertex draw again.","sha":"b71caa94aca500572c2f0df80efb9a2a9c65df2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T16:45:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T16:45:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1452 from vlj/rsx-debug\n\nrsx-debug: Print number of vertex draw again.","sha":"40fa836b819e90b9043fe48ba8d3dacea6c1ce67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-24T21:24:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T16:56:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl: Add some texture info to RSXFragmentProgram","sha":"24255f7883557e8ea15ef13fbd6aa1a4d135b902"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-25T17:07:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T16:56:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12: Support 3d textures","sha":"3c3f92f29b940708b6aa8ebb28749ed7bff2ab80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T17:22:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T17:22:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1453 from vlj/rsx\n\nRSX: Start implementing texture3d support","sha":"ffb014ca3d47b2784702ee059025143bb7aa3d69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-18T15:50:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T22:13:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Store vertex attributes as SRV and disable Input_layout.","sha":"638454134529fa4c94f191de6b8baa1ef0ef5e91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-23T23:30:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T22:13:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Compare mipmap/depth count when checking texture compatibility.\n\nd3d12: Check for depth in texture cache.\n\nFix Resogun crash when loading a level.","sha":"6d70f3c23787045e97e1a5a5a3678d3d0f189cb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T22:20:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T22:20:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Make some memory helper structure uncopyable/unmovable.","sha":"aa450b56f12163214655bdd29eebfc50dcafc442"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-27T15:10:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-27T15:10:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1455 from vlj/d3d12\n\nD3d12: Drop IAInputLayout and use SV_VertexID + SRV instead","sha":"8e9f4560293997ee23fc9a22914cd171fd481878"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-07T22:12:33Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-27T15:14:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Reimplemented psf loader","sha":"220aab1fd0f31ebc7ac876984e40b1713b2eaa08"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-07T23:07:55Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-27T15:14:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"added psf::object::get","sha":"290bdc4566fec10e4689991dd9c1a9ff65595b64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-01-07T23:53:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-27T15:14:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed GameViewer crash if entry not exists\nfixed psf::entry::as_string & psf::entry::value(string)","sha":"e8a940172ce231b2846e85a8f50c3ab4bbca642a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-27T12:19:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-27T15:14:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GLGSRender fix","sha":"7417033d7f3f0524bc5b0ff63bfd34a55c05c2bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-26T18:13:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-27T16:17:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PSF Loader simplified","sha":"128ee67bbae18bf5dc389c03420f799977390dd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-27T16:39:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-27T16:39:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellGame fix","sha":"b77666cbbad44edcb992f49168d6b617c2a4152d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T22:42:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-27T21:05:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Base offset is actually correctly supported.\n\nOutrun uses it and cars are correctly displayed.","sha":"acd384ae2d57644ee8d9db829e4ad4ed33fd3216"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-27T21:28:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-27T21:28:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1457 from vlj/rsx\n\nrsx/common: Base offset is actually correctly supported.","sha":"46de48593cc781785e75bd99b27804f9234baf35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T23:05:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-27T21:41:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx-debug: Dump windows origin/pixel center.","sha":"3bd2114815484c272dcdb9dcd1c7350e7eae3deb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-27T22:11:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-27T22:11:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1456 from vlj/rsx-debug\n\nrsx-debug: Dump windows origin/pixel center.","sha":"791070c15811a3ebcd6bd1b9be9ebf2a34f18c27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T19:42:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-27T22:16:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Make RSXFragmentProgram key and not just pointer.","sha":"149fa9d75063b50b45217a6fc44d0c7d3cef37f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-01-28T05:42:08Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-01-28T05:42:08Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1458 from vlj/rsx\n\nrsx/common: Make RSXFragmentProgram key and not just pointer.","sha":"b4b4ae7a781ea8feb84fff0a638286ecb2319858"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-29T18:14:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-29T19:18:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix for #1459","sha":"d19d9ccd0b077b738dd7f19a4651351a734fc5c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-29T23:27:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-29T23:27:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1462 from vlj/d3d12\n\nd3d12: Fix for #1459","sha":"e1eb0756043bcf524828efcb50ef0543e1b5007a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T23:34:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-30T00:13:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12: Support for texture 1d too.\n\nThey are used in after burner climax","sha":"5f35f2ac7d58c7d77a7e7554b414b94182c80239"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-30T20:00:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-30T20:00:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1464 from vlj/rsx\n\nrsx/common/d3d12: Support for texture 1d too.","sha":"39bc897b9317c2eaf3ff5c88fd54c26fa0212b02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T23:30:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-30T20:58:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12: Support for shader window setting.","sha":"f6d2409b2082ead31366b61c5974dcdff49e4ca5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-26T19:25:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-30T21:04:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use unnormalized_coords info in RSXFragment","sha":"3d960064ef92dc6ff1dd325ae0dbec1fbe637b0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-31T20:36:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-31T20:36:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1469 from vlj/d3d12\n\nD3d12: Fix and improvement","sha":"670660c24458db967b96b3cebbfd3a6daa9049a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-01-18T14:37:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-01T17:11:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Rework OGL texture swizzles;\n\nDecode textures using TextureUtils\n\nShut compiler up about missing return value (unsure)\n\nRevert \"Shut compiler up about missing return value (unsure)\"\n\nThis reverts commit db43ba448776e6c0d6c90909b4037b6f698a545c.\n\nChange some functions in rsx::gl::texture to static.\n\nReplace large switch block in gl::textures::mandates_expansion with simple if tests","sha":"660f4913102b497aa952d10a51607449b06fa65b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-02T22:43:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-02T22:43:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1443 from kd-11/gl_swizzle_mem_vector\n\nRework OGL texture swizzles","sha":"1e1c2007a3bfedc3a2196ae5d796f8547890f22e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-01-28T17:01:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-03T10:38:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Add vertex texture buffers for VS input\n\nSupport vertex instancing in vertex shader using VertexID\n\nRelax OpenGL requirements by removing 4.5 features\n\nUse EXT version of TexBufferRange; Implement buffer copy using TexBuffer\n\nApply travis workaround by danilaml\n\nFix vertex upload in in case of inlined array","sha":"7b889a10ccd21a2544caeb28ea8fca2afb3848b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-04T00:24:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-04T00:24:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1461 from kd-11/gl_vertex_textures\n\nAdd vertex texture buffers for VS input and support attribute instancing using VertexID","sha":"e6d2e05b6e9790445a64610b4a9bb3c8e37ece5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-02T18:41:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-04T08:19:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Move program validation from link-time to draw-time to compy with spec","sha":"137821c8662667ead82d31304ca8757d8f5f3468"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-04T21:31:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-04T21:31:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1474 from kd-11/gl_shader_validate\n\ngl: Move program validation from link-time to draw-time to comply with spec","sha":"020d282868202182fc18d4beab4d12e9ca680fdc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-05T15:57:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-05T15:57:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix LLVM build by changing variable to appropriate type","sha":"d3405da5c4ba50d0b51bc6879a9c81bd446ca02d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-06T18:18:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-06T18:18:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1476 from kd-11/llvm_fix\n\nFix LLVM build by changing variable to appropriate type","sha":"f66468ffcde4aa2c1ea37d4868a51228c0d95212"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-03T10:05:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-07T05:57:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Implement rectangle textures natively on OpenGL","sha":"ddf5b523603383ece1961a47fb895d156e30d8d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-07T17:09:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-07T17:09:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1467 from kd-11/gl_shader_fixes\n\ngl: Support rectangle textures","sha":"2ead9b1f21f989de71d387dfe7c6bda07f069e68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-31T19:01:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-08T16:35:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl: Fix lit and rsq behavior near 0 in vertex shaders.","sha":"1f7a1e40783882d32cd7f6a247cf691ae9af37cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-04T22:25:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-08T16:35:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12: Use m_texture_dirty[i] to signal texture state change and avoid unecessary bind operation.","sha":"4efa2266e6739e05381ed3904a128fa10fd313d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-05T20:33:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-08T16:35:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12: Support back spec/diffuse color.\n\nFix green car in Outrun.","sha":"f0dc38caddc5af0147543b130c4e168d6b3f857e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-08T17:04:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-08T17:04:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1477 from vlj/rsx\n\nRsx: HLSL/GLSL fixes and support two side color.","sha":"303a109286f4212e8bcc4795fd6f1f847347d73c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-01-19T19:24:41Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-08T17:12:29Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Rewrite cellPngDec to use libpng\n\nImprovements made:\n* Supports tEXt chunks\n* Supports chunk information\n* Supports 16-bit depth image packing (fixes #1127)\n* Supports fixed alpha values\n* And more.","sha":"0c8c13b8b7166987b8a292a7581cbaa2ac23e7cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-03T17:34:51Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-08T17:12:30Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix compiling","sha":"1072540e3eda6b0dad5d28b0abb4648dbb579d3b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-12T13:08:10Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-12T13:08:10Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1359 from tambry/ostrich\n\ncellPngDec rewrite","sha":"f7f4c049fc295ed79b8eb947978a15235539d039"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-09T09:58:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-12T15:34:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fragment position is given as gl_FragCoord not gl_Position\n\nFix references to gl_Position in Dx12","sha":"843d0ed298c400677d9b08e2ee3333670d103c99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-13T15:51:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-13T15:51:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1491 from kd-11/fs_input_fix\n\nFragment position is given as gl_FragCoord not gl_Position","sha":"9e3132c3fcf03bdaca5bb4fcbd23f8fe3c0b5625"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-06T18:54:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-13T16:07:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12: Support non default alpha function\n\nFix After burner climax cloud effects.","sha":"837e06e85ba71432d15bcab1efa477a0d0874f7b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-13T16:22:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-13T16:22:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1497 from vlj/rsx\n\nrsx/common/d3d12: Support non default alpha function","sha":"035875825e50ad580f4c3f22b904ed5e396ef0ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-13T06:15:41Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-14T17:50:36Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix CMake libpng linking","sha":"9452c6b08c13c0b459f959b36f00b9ffab230cd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-14T18:08:56Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-14T18:08:56Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix rpcs3-tests to use default properties\n\nCut down some stuff in the file also.","sha":"6963157e6353128317b4ac5a168dab2b33dea2f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-14T21:06:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-14T21:06:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1499 from tambry/master\n\nFix CMake libpng linking","sha":"9671a654b7d2a025d244763f21d286cb12e3e2f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-11T11:51:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-15T08:15:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Correctly fetch correct pitch and depth for textures from RSX\n\nInclude vertex textures too\n\nSet correct stride for vertex texture params\n\nChange references to gl_Position in D3D12FragmentProgramDecompiler\n\nRevert bad commit","sha":"7d70be42af0fcbcb7e6bfb458e7e028c10aef341"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-15T09:03:48Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-15T09:03:48Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1496 from kd-11/rsx_textureinfo_fix\n\nCorrectly fetch correct pitch and depth for textures from RSX","sha":"787619cdba48becca894befeebc16b3f99beeef3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-13T10:26:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-15T09:53:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Speed up program constants upload by switching to glBufferSubData over glMapBuffer\n\nFix initialization for fragment constants buffer\n\nOrphan buffers before update. Remove redundant binding","sha":"2230975e5586933411100a0a86f2232c19d1be15"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-15T16:25:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-15T16:25:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1500 from kd-11/prog_constants_fix\n\ngl: Speed up program constants upload by switching to glBufferSubData","sha":"3b7d0bc3fc8bf55d5c7e5a76f2e619eead270488"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-15T08:00:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-16T12:39:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Properly handle inlined vertex data\n\nFix initial array offsets for dx12","sha":"3813c09be63d78246c5cec33ddf7fab1f8513be7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-16T17:07:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-16T17:07:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1501 from kd-11/gl_inline_array_fix\n\nProperly handle inlined vertex data","sha":"71a975c6853a066e087b92e178e0d7a0074edd98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-14T17:55:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-16T17:08:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl: Use gsl::span in TextureUtils.cpp\n\n* get_placed_texture_storage_size returns more accurate result (fix crash in Outrun)\n* Factors lot of code and use integer type more carrefully\n* Treat warning as error in TextureUtils.cpp","sha":"1675a82efdb0d155cf2a22a04887d45b44d9aa5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-16T18:20:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-16T18:20:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1504 from vlj/rsx\n\nrsx/common/d3d12/gl: Use gsl::span in TextureUtils.cpp","sha":"fe551148d80c17ebff841944c0961bd81a5fcd65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-15T09:50:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-17T13:00:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Enable texture and render target caching for OpenGL","sha":"a451bb574e9c60f7f657f54135192f13df3328f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-18T16:14:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-18T16:14:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1502 from kd-11/gl_staging\n\ngl: Enable texture and render target caching for OpenGL","sha":"b6323861a5b38417db3b2680d9c42e55d49c665e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-16T19:23:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-19T19:03:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Add relevant libs.","sha":"c0423d513d4db5710430cdc2b0a0e2180445d0fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-19T19:34:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-19T19:34:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1507 from vlj/vulkan\n\nVulkan: Add glslang and LoaderAndValidationLayers","sha":"a9180ce187fff4364f83dee097ab8808c5e9e512"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-15T21:34:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-21T16:11:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Pretty printing of error messages.","sha":"4b54d7ece1e94e67b0c1018801770a3170c3bd85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-21T16:55:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-21T16:55:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Use a shared root signature and add more slots\n\nThis allows for finer grained rebinding later.","sha":"9ef24509cb8031f740856e4655b4ac90ba0e584b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-21T20:29:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-21T20:29:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1508 from vlj/d3d12\n\nD3d12: Tweak root signature and improves HRESULT message","sha":"9404cd5cd896082bf7d12960ce887a582d16ec9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-21T17:56:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-21T20:29:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Track transform constant update.","sha":"79dc835378bae5ffddfdd3ddb41c3fab4436402e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-21T21:10:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-21T21:10:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1509 from vlj/rsx\n\nrsx/common: Track transform constant update.","sha":"4e4325a2bfe97a8f76ccfb09836f14ebb9e1e678"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-19T23:50:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-22T19:22:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl: Use span in vertex upload function.","sha":"5a14644cd45ed407e2cdf4a2c17c6dd3e0da5c68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-22T20:09:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-22T20:09:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1510 from vlj/rsx\n\nrsx/common/d3d12/gl: Use span in vertex upload function.","sha":"422f5c00083a40bee0aeddc18e551f2a35c4d4d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-24T11:50:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-24T14:44:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Handle swizzled CELL_GCM_B8 textures\n\nProperly handle swizzled single-channel textures","sha":"8a3d15d4fed3498cd1ff697f77daa14ea10071f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-24T23:23:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-24T23:23:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1516 from kd-11/rsx_textureutils_fix\n\nHandle swizzled CELL_GCM_B8 textures","sha":"0f0de47c830a0ae6b2754bd7da88c720c6ee8f9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-23T15:36:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-24T23:29:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Always bind null for unused shader inputs\n\nProperly rename index offsets to improve readability\nHandle indexed and other array cases","sha":"974ea68cf912cf531b097ae39748ccdd0442b690"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-25T05:54:05Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-25T05:54:05Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1512 from kd-11/gl_sampler_fix\n\ngl: Always bind null for unused shader inputs","sha":"635357520867389ff72e509b62b3167ad66991f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-16T18:54:09Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-25T05:58:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement _sys_memmove","sha":"41687af0777171506948cf972185f27d1e2dc08d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-18T18:05:50Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-25T05:58:21Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement UTF8stoUTF16s, minor cellPngDec fixes\n\nNeed to find games to test the case, when fixed alpha isn't specified.","sha":"047d59df0c9b42299c30adc3cd14f2e9d259b090"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-22T10:52:33Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-25T05:58:22Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Improve generalized exception messages\n\nAdded some basic information along with certain exceptions. This should\nprevent some types of useless reports and assist users in determining\ncertain issues with their setup.","sha":"5cbcd07ff141a7043ba0f3716432206efcb374be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-25T14:22:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-25T14:22:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1481 from tambry/racoon\n\nImplement _sys_memmove, minor fixes","sha":"a7fbd6c9a90c52338a219dae7e1fba09880f3a13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-24T08:33:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-25T14:41:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Remove normalization for natively normalized formats; fix cmp attribute type","sha":"c5b3359c4b3a685937ecebf8273950a8e275ce2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-25T16:20:25Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-25T16:20:25Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1514 from kd-11/gl_attrib_fix\n\ngl: Minor fixes and improvements","sha":"c07b0dc373af064e8d2ab777dc9e15edbcabc907"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-21T21:15:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-25T22:29:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Avoid uploading constant buffer every draw call","sha":"7ae680d9d103aec94195133efb862e4c6cad0bc6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-22T18:55:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-25T22:29:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Copy descriptors when reused instead of recreating them.\n\nThanks Matías N. Goldberg for the tip !","sha":"263e5beb26ae14001cc1cdb25470ff8d40a6aa5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-22T19:10:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-25T22:29:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Remove depth conversion shader\n\nIt's actually not needed, raw depth data should be sampled as RGBA8.","sha":"a78ba8a271f8eb3f8d79242d3bf38ba68097f74c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-25T23:35:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-25T23:35:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1511 from vlj/d3d12\n\nD3d12: Tweaks","sha":"09fc492257748a20d70f5e7759362f29781eaeee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-22T20:36:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-26T23:21:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Fix handling of UB256","sha":"5ef7f8bf3ec7d8079851bd77e3628f81927180ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-22T20:44:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-26T23:21:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Supports D24X8 texture format when copying\n\nSome app uses this type before setting proper depth surface","sha":"a6d8d1144c4f015e8f448b00ab885052d4f256a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-22T20:53:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-26T23:21:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12/gl: Supports SSA in Fragment Shader.","sha":"62246f75c8825f55c4c34ef753a3d29afb94f9fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-22T21:07:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-26T23:21:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/gl: s32k is actually signed short unormalized.\n\ngl fix","sha":"a6ba47265fdd17d7527d893c28c6f9ff0a8a82df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-24T17:45:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-26T23:21:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12: Separate int type buffer from float type buffer.","sha":"35db227af4718d9dc055cb2d5fd9b9cb95906d9f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-27T00:03:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-27T00:03:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1519 from vlj/rsx\n\nRsx: Vertex attribute format fixes + ssa variable support","sha":"0e5c54709d7fa2a76b8944ca999b5b28a722be31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-26T18:51:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-27T18:38:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Add supports for quads strip\n\nUsed in Hitman 2","sha":"9cdb74efc7109f52a2175ceaf89dcfdd11a7046f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-27T17:43:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-29T15:31:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl: Support for fog mode.\n\nFix hitman 2","sha":"32434dd84865a1e79bd176c583fb7ef48428625d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-29T17:24:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-29T17:24:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1522 from vlj/rsx\n\nRsx: Fix for hitman 2","sha":"19257b3121fd6c718102b65a78a2cd201d792fcb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-29T18:47:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-29T18:47:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Add texture3d sampling function","sha":"0ed770633b1a84b7b94df8f739a6ee21fb15ac68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-29T19:49:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-29T19:49:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1525 from vlj/gl\n\ngl: Add texture3d sampling function","sha":"12d8b795f7bbddef9912e57321954c50b3f959b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-01T22:09:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-01T22:09:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Allow attrib padding for types that require expansion","sha":"7eb5da73fe1a1182d8ab1e11d817564cb5fa1aaf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-02T13:03:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-02T13:03:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1528 from kd-11/gl_attrib_padding\n\ngl: Allow attrib padding for types that require expansion","sha":"674373dd6c51c4bf73d0528e25562a96a9fc0ef6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-28T22:59:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-02T13:53:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"build: Add a separate project for ppu llvm recompiler\n\nFix some defect found by static analysis.","sha":"72375d9e3d7ee100a5dee325d4e07c33657d0252"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-29T18:22:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-02T13:53:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"build: Define _SCL_SECURE_NO_WARNINGS for debug mode\n\nPartly fix build for Debug configurations.","sha":"c4dab6e644b663e4a58c719ebbd404f47664e967"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-02T14:34:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-02T14:34:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1524 from vlj/build\n\nbuild: Add a separate project for ppu llvm recompiler","sha":"2f89d15079339842799ea656bcd0334280cd7fdb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-02T15:34:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-02T15:34:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"The lod parameter is a single float value","sha":"094c4057bee06e131cc8920b6c7e679a6f161b44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-02T22:06:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-02T22:06:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1531 from kd-11/gl_texturelod_fix\n\ngl: The lod parameter in textureLod is a single float value","sha":"51462226a7e5f541f982a8195df466706ef77e59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-02T21:58:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-02T22:07:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Properly set up fog parameters for openGL","sha":"8d3235cd7c5ee0275f12cec786356dedcd06de2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6376307?v=4","date":"2016-03-03T10:30:25Z","email":"zerubeus@gmail.com","login":"zerubeus","name":"zerubeus"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6376307?v=4","date":"2016-03-03T10:30:25Z","email":"zerubeus@gmail.com","login":"zerubeus","name":"zerubeus"},"msg":"fix typo in readme","sha":"e80bdf120be03f72b51a588759497a24c5dc441a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-03T19:46:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-03T19:46:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1533 from kd-11/gl_fogc_fix\n\ngl: Properly set up fog parameters for openGL","sha":"b0a2f9f65a6a8da7893c96091cfbd29990b2bb20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6376307?v=4","date":"2016-03-03T23:05:13Z","email":"zerubeus@gmail.com","login":"zerubeus","name":"Aladeen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6376307?v=4","date":"2016-03-03T23:05:13Z","email":"zerubeus@gmail.com","login":"zerubeus","name":"Aladeen"},"msg":"Merge branch 'master' into master","sha":"77371e973f425d53567b3a62f790882abd5ed745"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-04T02:01:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-04T02:01:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1536 from zerubeus/featurebreanch\n\nreadme typo","sha":"5911b3c1f10eceda9f4d3749deb35cd13ea979a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-04T17:05:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-04T17:37:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"build: Fix rpcs3-tests by adding PPULLVMRecompiler reference.","sha":"e860f7fb14a4e4e8dd2169a7c17def8e39e7426e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-04T22:00:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-04T22:00:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1538 from vlj/build\n\nbuild: Fix rpcs3-tests by adding PPULLVMRecompiler reference.","sha":"4966d50e52b2484c95ff6d19d41d9b095c69a015"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-01-19T17:43:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-05T09:21:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Use shared surface store (updated)\n\nUpdate surface cache optimization to master; minor fixes\n\nFix mixed EOL\n\nRemove unused include; change null bindings to 0","sha":"81fcadac3804eff064cf7d4d6f25f5e509208115"}
+{"author":{"avatar":null,"date":"2016-03-05T10:51:25Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2016-03-05T10:51:25Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1530 from kd-11/gl_surface_cache_traits\n\ngl: Use shared surface store (updated)","sha":"a196ee195790649514b5e81977c80c9c436531c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-05T15:54:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-05T15:54:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Properly compute texture size","sha":"2ae687cf006b149b0010d2800d3beb7a40ce732f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-05T16:45:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-05T16:45:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1542 from kd-11/rsx_surface_store_fix\n\nrsx: Properly compute texture size for download","sha":"d74e031d4e06bcab059103c48b15de6b1877c9b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-04T16:53:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-05T17:25:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Reset fog mode/param to linear/1.;\n\nFix After Burner Climax fog","sha":"52e2800fb594714091c56e46ee845fcd3b0d1eb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-04T16:51:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-05T17:25:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12/gl: Separate fog distance and fog frag in fogc input.","sha":"1dcc6858b48f913a27a12043d49dbea67154cebb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-05T17:45:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-05T17:45:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1537 from vlj/rsx\n\nRsx: Fix fog (Fixes #1535)","sha":"05f2aaf2b9c319c4ff0cc9f1477d14afa7c33e05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-02-23T21:56:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-05T17:48:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx-debug: Record and display index buffer content.","sha":"4d71df70db01779f044e9361d2f86a9345910ac0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-05T18:20:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-05T18:20:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1518 from vlj/rsx-debug\n\nrsx-debug: Record and display index buffer content.","sha":"bcf4a6209e8c0df0081b3e1be2eba0547bdf42c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-02-26T14:22:57Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-03-05T18:21:43Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix directory opening on Linux systems","sha":"a6a40818940e5c4a8d2867efd6de9f002600f43f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-03-05T19:01:14Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-03-05T19:01:14Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1520 from tambry/shhh_penguin_is_ok\n\nFix directory opening on Linux systems (Fixes #1494)","sha":"06cbe4a0bce27e825b3cb9cb7a4246619d990c9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-05T11:29:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-05T19:19:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Checks for texture completeness, remove legacy GL_GENERATE_MIPMAP used wrongfully","sha":"a880ce89d1d170b1c5370d14315e59d5acadc12e"}
+{"author":{"avatar":null,"date":"2016-03-05T20:23:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2016-03-05T20:23:02Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1540 from kd-11/gl_nvidia_cache_fix\n\ngl: Checks for texture completeness, remove legacy GL_GENERATE_MIPMAP","sha":"b2b9f535dc280fd211be6cb02fa33e65274a83ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-05T15:55:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-05T21:04:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Factorize code in rsx_gl_texture.cpp","sha":"8831bd09188735f2204a0040c7b7017b79d132f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-05T17:46:22Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-05T21:04:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Use less costly glTexStorage2D instead of glTexImage2D.","sha":"9e01f2817fad5f6608da7978db09621f58e736b4"}
+{"author":{"avatar":null,"date":"2016-03-05T21:31:10Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2016-03-05T21:31:10Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1543 from vlj/gl\n\nGl: Factorisation of texture init code","sha":"dd233c9f385379ba3d665efab70fad3f8be46732"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-06T20:15:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-06T20:15:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"build: Update wxWidget to 3.1","sha":"c3fb1419fdc337e83381b696d436a12a6bad9003"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-06T21:35:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-06T21:35:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1551 from vlj/build\n\nbuild: Update wxWidget to 3.1","sha":"9adb534c7f20ef77bbfde5b392d6cd3c192341b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2016-03-07T01:09:42Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2016-03-07T01:09:42Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Fix for #1546","sha":"9b505984f238bf6680773e1c4be5ba848dc10d30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2016-03-07T01:23:00Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2016-03-07T01:48:05Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Update gslnag submodule. Fixes #1550","sha":"d0ea8d5262b66563014f496c76d5bfd96f25961c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-07T19:10:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-07T19:10:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1552 from danilaml/fixes\n\nFixes for #1550 and #1546","sha":"4b0b65c0c5c0747d0c628a3f30e28564a6c8d142"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-09T18:11:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-09T18:11:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Clean up invalidated resources","sha":"ee0eb70de44f93b43d8ac4e75b40a8f09cbfa96b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-03-09T18:58:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-03-09T18:58:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1559 from kd-11/gl_memory_leak_fix\n\ngl: Clean up invalidated resources to fix mem leak","sha":"4c133ab5bfb752a946c1a5bcb392e140f4b82e31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-21T15:49:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T20:55:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Add vulkan GS backend to project","sha":"d287ba44ce489c745c0fd5b90f2c3cbd78827594"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-02-21T15:50:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T20:55:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Rework vertex upload code and fix indexed renders\n\nRebase on current master; Refactor vertex upload code\n\nFix build; Minor fixes\n\nStart preparations for merge\n\nFix generic indexed drawing bugs\n\nDefine WIN32_KHR only for windows\n\nRemove linking against vulkan-1.lib","sha":"3b6e3fb3b43a8a1b4eb182c3fbc8c2392f4ab24d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-07T08:38:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T20:55:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix build for non-WIN32 platforms\n\nLink explicitly against vkstatic.1.lib\n\nfix linux path for vulkan glsl compiler\n\nRestore wxWidgets version","sha":"22d49ae96ab96417a7fa8067e92104272f8af64b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-07T14:24:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T20:55:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Exclude apple from vulkan windowing stuff as it is not supported","sha":"d58bd1c916660146b0360367adf6727fca9c3436"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-07T14:55:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T20:55:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix nvidia  crash (API version). Fix linux builds\n\nProperly set up vulkan API version when creating instance\n\nFix gcc error about passing function result by reference\n\nFix alot of warnings in VKGSRender project\n\nMore fixes for gcc\n\nFix texture create function","sha":"bd52bcf8d4bc3fa8af34e719684a918c32523f9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-07T17:51:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T20:55:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix build dependancies and fix gcc build\n\nFactor out _aligned_malloc functions to WIN32 only\n\nAttempt to fix CmakeLists error\n\nMore CMakeLists fixes (glslang)\n\nAdd OSDependent libs\n\nAdd OGLCompiler and SPIRV as well","sha":"f384d8704430e2e5248996825f91c05eb2f13f0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-07T21:21:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T20:55:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix vulkan swap modes for nvidia\nCMakeLists edits\n\nCheck for linear tiling support for all usage attributes","sha":"d910d2c5721fa13e546982ea0378c04cef63c601"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-07T21:56:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T20:55:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Make render-targets GPU resident\n\nFix minor regressions that occured during merge","sha":"b018c9113598b3ff923c242878f957c390570a5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-09T10:23:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T20:55:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Change render target layout before clearing\n\nUse LAYOUT_GENERAL during clear; move renderpass begin to draw call end","sha":"47d251a818a379558a9ea307a04ec88784fffbef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T12:57:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T20:55:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix apple build by excluding vk project","sha":"f0ded467538722145522b4f6a738ddc243770aa1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T15:14:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T20:55:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Support stencil formats\n\nFix appveyor build","sha":"26964efa7ecd6ead84551dbbd5de99fedcb4c3f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T17:45:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T20:55:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Move waiting for submit fence to the right place (nvidia crash)","sha":"93032be4aba36518ae501ca30171d1cdd0d82f18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T17:58:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-10T20:55:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Release dirty resources to prevent mem leak","sha":"cc713a0091500f68bde84607c9bb86b9cede79b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-10T23:08:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-10T23:08:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1548 from kd-11/vulkan-latest-wip\n\nAdd vulkan backend","sha":"01abb255b2d45b929c9bcd0086290df84ade7cd7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-11T08:05:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-11T15:02:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: support for more formats\n\nrsx: support R5G5B5A1 textures","sha":"82bc41f4ad602000d9d4c19242eeb66478110535"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-12T00:43:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-12T00:43:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1563 from kd-11/rsx_texture_formats\n\nrsx: support for more formats","sha":"4bfd019c0d16c617efa80a2eae477cf7adaa4228"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-11T19:38:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-12T14:23:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Uses debug output setting to enable debug layers.","sha":"26ff4fd6b7e7085c31681b1a115f92b2cc5e28c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-12T00:13:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-12T14:56:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Use d24_u8 or d32_u8 depending on hw support.","sha":"8604f5a02f48f2381743753b33d2b01b23f11ac1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-12T18:39:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-12T18:39:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1566 from vlj/vulkan\n\nVulkan: Uses d24_s8 or d32_s8 depending on availability.","sha":"c8cc6815918e391395b5dd24f3e22ec48350f6fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-12T21:22:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-12T21:22:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Zero initialize as much structure info as possible.\n\nThis fixes a crash with nvidia driver in present call (likely because of\nsome uninitialized member)","sha":"70a80b84d737956fff5e1610fa75791257caa5af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-12T23:10:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-12T23:10:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1569 from vlj/vulkan\n\nvulkan: Zero initialize as much structure info as possible.","sha":"bbe00f65052588231fef7b11e6cf3e85ae19516a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-01-15T14:30:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-03-13T17:39:54Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Build fixed","sha":"702193a6c7265ced949a959caf8f3c55499f0901"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-03-13T18:02:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-03-13T18:02:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1571 from tambry/build_fix\n\nFix Release build","sha":"9d7c186a4fce9724c6d34262ace7defd9bb6798e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-11T08:16:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-14T15:14:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add some more blend ops","sha":"34992d8a8fa46115170817fcd74b0422c8b9f55c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-11T19:25:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-14T15:14:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Immutable textures cannot be reused!","sha":"d9dbb1565a49672a2b72478a3ead9935d628031e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-03-14T17:38:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-03-14T17:38:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Merge pull request #1564 from kd-11/vulkan-wip\n\nvk/gl: Add some more blend ops for vulkan; fix immutable storage for opengl","sha":"e33c684b4929addba80cc67c6e9b91f2f79943d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-13T19:11:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-14T18:10:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl/vulkan: Unify texture upload code.","sha":"5de70628d70601e1e72d5a874eb2fcef66f1cd7a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-14T19:05:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-14T19:05:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1573 from vlj/rsx\n\nrsx/common/d3d12/gl/vulkan: Unify texture upload code.","sha":"bb722d5824576dc3a73439f5db92767bfb18bca7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/17981430?v=4","date":"2016-03-10T14:52:58Z","email":"MyaniPT@users.noreply.github.com","login":"MyaniPT","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-14T19:06:20Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"msg":"Set Write/Read Color/Depth Buffers to false by default\n\nSince they're not working properly right now, there's no reason for them to be enabled by default.","sha":"9fd244cf9ce63f621f00e12247c41c06731aa1e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-14T21:14:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-14T21:14:01Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1562 from MyaniPT/patch-1\n\nSet Write/Read Color/Depth Buffers to false by default","sha":"7584f29ec7e9bf58cf0480f109c99ce9e5e629bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-15T19:29:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-15T19:32:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Re-enable fog parameters for vulkan","sha":"f2d5542e667bf9d4019b2c3bf3ffe9d08b11c438"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-15T20:54:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-15T20:54:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1578 from kd-11/vulkan-wip\n\nvk: Re-enable fog parameters for vulkan","sha":"93b06f2a39fa6241a3970ef41dee20e76139dc4c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-14T18:52:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-15T21:02:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: precompute memory type mapping.","sha":"da2caa08816494bcea4473df95edf6d67613133b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-14T21:29:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-15T21:03:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Use ring allocation for uniform/index buffers by using simpler memory_block and buffer class.","sha":"63ad2cce728d9e4eee2c5ce516d5435d1cdd6f3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-15T17:33:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-15T21:03:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Remove redundant texture::create/init overloads","sha":"3b3fffa9624aa2ffd9cbefb67bdba3ec5ed62309"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-15T17:58:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-15T21:03:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Clear swapchain before usage.\n\nFix VkQueuePresentKHR error messages","sha":"61de5e88351f9a9285d347ae93b35a46d8b0c28e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-15T22:50:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-15T22:50:38Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1576 from vlj/vulkan\n\nVulkan: Turn uniform/index buffer into ring allocated buffer","sha":"bdecd3c180eb389af04d84ba00334d6b9c1a6cbe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-15T17:07:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-16T05:35:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Explicitly declare context attributes for GL canvas","sha":"15901589a538cfc62f3dbc4397044ddc26dbbaf6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T01:04:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T01:04:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1575 from kd-11/gl_canvas_fix\n\ngl: Explicitly declare context attributes for GL canvas","sha":"45e48c2499aa15c68db0f9f6ee3a81bf7c606e5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/17981430?v=4","date":"2016-03-16T19:48:02Z","email":"MyaniPT@users.noreply.github.com","login":"MyaniPT","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-17T10:04:03Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"msg":"Fixes #1584\n\nWhen DirectX 12 is missing, the emulator thinks Vulkan = DirectX 12 because Vulkan takes DX12's place in the box (id=2), and therefore runs DX12 when Vulkan is selected, crashing the emulator with an unhandled exception.\n\nFixes it by translating renderer string value to the respective enum class before sending the value to config.h instead of just relying on the box's selected id -> cbox_gs_render->GetSelection()\n\nAlso changes the order of the renderers (for convinience, now DX12 is id=3) from\nNull, OpenGL, DirectX 12, Vulkan\nto\nNull, OpenGL, Vulkan, DirectX 12","sha":"5250911a4085ca112df5da11d2a7d01a20d103c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T13:39:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T13:39:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1585 from MyaniPT/patch-2\n\nFixes #1584 (Vulkan not being usable in non-w10 systems)","sha":"cd5edc38ffe987cb21c3e8c1a0f27d84f1271b9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-17T16:43:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-17T16:43:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Indexing into mipmap lod is scalor not vector","sha":"26738762ea808243519d59aaf7c471f62c7518c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T17:52:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T17:52:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1589 from kd-11/vulkan-wip\n\nvk: Indexing into mipmap lod is scalar not vector","sha":"454fbce4c603e8bc909c9414d544856610bfe1a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-15T19:30:23Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-17T18:03:59Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"msg":"Updates stb_image from 1.33 to 2.10\n\nUpdates stb_image from 1.33 to 2.10 which deprecates stb_image.c and\nuses only stb_image.h","sha":"8cded28c45e65498591773635a43f0ac749aff4c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-15T19:47:38Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-17T18:03:59Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"msg":"Update stb_truetype from 0.7 to 1.09\n\nUpdates stb_truetype.h from 0.7 to 1.09\nFixes '>=' signed/unsigned mismatch at cellFont.cpp lines 328 and 333 by\nmaking both values unsigned (u32)","sha":"659f3d856a6355b2f069573b578fc2098214fcdf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-15T23:07:46Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-17T18:03:59Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"msg":"Adds the stb_truetype Mac OSX fix from 64cfab5\n\nAdds the stb_truetype Mac OSX fix from 64cfab5\nRemoves stb_image.c from the Visual Studio Project files since it got\ndeleted in previous commit","sha":"212fd4b3403548246faaf27d47c82cc5b8ef427f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T19:01:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T19:01:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1580 from MyaniPT/patch-1\n\nUpdates stblibs (stb_image and stb_truetype)","sha":"01ce1c31d17dd75f36fd578eecfaaacfdea6b5f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-16T16:41:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T19:03:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Fix for get_memory_mapping","sha":"7e971eb0328d5114cf273e67bce308be586c99ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-16T18:06:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T19:03:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Use a shared pipeline layout","sha":"6229733fbb64ab4fa659be84feb4d9171bfa7183"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T19:50:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T19:50:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1587 from vlj/vulkan\n\nVulkan: Use a common descriptor layout for all program","sha":"a0c433a065427763973d6800c4c7a0047515f0c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T20:31:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T23:08:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Precompute all possibles render pass","sha":"6a1f0aed360d7d5cd35f09f55602878a34552b71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T22:57:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-17T23:08:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Move descriptor sets and layout in VKGSRender class\n\nThey're now shared between all programs.","sha":"24eb5440465495f8e9aa6ec6f429d4522e97a401"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-18T16:52:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-18T16:52:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1592 from vlj/vulkan\n\nVulkan: Avoid recreating render pass and descriptor set","sha":"3506d03dc55488ed44459f150c72ff904a3ac9e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-18T22:30:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-18T23:16:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Do not create empty render pass.\n\nFix a crash with radeon crimson drivers.","sha":"d9eba433604860c0f00fb7fdab435b0727c38d8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-18T22:33:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-18T23:17:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Fix crash at exit","sha":"e083c1471c09f00a6fefc8ff9eec77d320f14d26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-19T00:13:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-19T00:13:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1599 from vlj/vulkan\n\nVulkan: Fixes","sha":"e34b5f1f556cb9b0e64c3c6e02c4fa0f39295fea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8584296?v=4","date":"2016-03-19T03:14:52Z","email":"mark.mauriello@uconn.edu","login":"mpm11011","name":"mpm11011"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8584296?v=4","date":"2016-03-19T03:14:52Z","email":"mark.mauriello@uconn.edu","login":"mpm11011","name":"mpm11011"},"msg":"End of Line Normalization","sha":"2060f026366c0242730ad0b3ec5c6e26ac6edae4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8584296?v=4","date":"2016-03-19T03:33:17Z","email":"mark.mauriello@uconn.edu","login":"mpm11011","name":"mpm11011"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8584296?v=4","date":"2016-03-19T03:33:17Z","email":"mark.mauriello@uconn.edu","login":"mpm11011","name":"mpm11011"},"msg":"Added zlib directory to include dirs in props","sha":"23f03a19e8794c3d00fb772c0b6d5639371cf277"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8584296?v=4","date":"2016-03-19T03:36:08Z","email":"mark.mauriello@uconn.edu","login":"mpm11011","name":"mpm11011"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8584296?v=4","date":"2016-03-19T03:36:08Z","email":"mark.mauriello@uconn.edu","login":"mpm11011","name":"mpm11011"},"msg":"MakeELF: Replaced wx streams with zlib functions","sha":"e7fc5228d592822ab32722301418ed74660b710a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8584296?v=4","date":"2016-03-19T14:49:40Z","email":"mark.mauriello@uconn.edu","login":"mpm11011","name":"mpm11011"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8584296?v=4","date":"2016-03-19T16:47:07Z","email":"mark.mauriello@uconn.edu","login":"mpm11011","name":"mpm11011"},"msg":"Adding zlib to rpcs3/CMakeLists.txt\n\nFix zlib location in cmakelists\n\nPotential fix to zlib include dir(s)","sha":"6adf086ed15a938d42da0321710649ac5e7331b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-19T17:07:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-19T17:07:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Do not copy texture inside a render pass","sha":"b6bcdade81527f006214def3503dd0c05cb11905"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-19T17:12:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-19T17:12:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Move vk_wrap_mode and max_aniso to vkFormat","sha":"4484e8c3f0eec1852229003c2179cac2d329d4ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-19T17:23:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-19T17:23:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Split get_compatible_sampler_format in two\n\nComponent mapping is not a sampler parameter.","sha":"6078f25aa7dd8dc2b50d635ef7c453d19f983abf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-19T17:47:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-19T17:47:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1602 from vlj/vulkan\n\nVulkan: some refactoring","sha":"8f788cb5228cbb55486ddb12b5c39738870d09fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8584296?v=4","date":"2016-03-19T17:51:44Z","email":"mark.mauriello@uconn.edu","login":"mpm11011","name":"mpm11011"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8584296?v=4","date":"2016-03-19T17:51:44Z","email":"mark.mauriello@uconn.edu","login":"mpm11011","name":"mpm11011"},"msg":"Merge remote-tracking branch 'refs/remotes/RPCS3/master'","sha":"854919b5e28cda949654f5ba3d926e9b9076858d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8584296?v=4","date":"2016-03-20T01:48:56Z","email":"mark.mauriello@uconn.edu","login":"mpm11011","name":"mpm11011"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8584296?v=4","date":"2016-03-20T01:48:56Z","email":"mark.mauriello@uconn.edu","login":"mpm11011","name":"mpm11011"},"msg":"Change size to u64","sha":"617a488a0a775b4b433fc89fc79f2ee909f60477"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-20T16:08:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-20T16:08:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1601 from mpm11011/master\n\nRemoving wx dependencies from Crypto/unself.cpp (attempt 3)","sha":"e91042af97d9267e9f1a2c3a6f9770427d8fc7ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-20T21:06:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-20T21:06:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Revert \"End of Line Normalization\"\n\nThis reverts commit 2060f026366c0242730ad0b3ec5c6e26ac6edae4.","sha":"f14a06938cb6ea93bd8db5e8d8ed54c6a00191fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-20T21:57:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-20T21:57:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1605 from vlj/master\n\nRevert \"End of Line Normalization\"","sha":"ed03e41f88cafd4811e7b5ce65f9cac4992b867d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-18T14:13:52Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-20T22:20:23Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"msg":"Moves GL, minidx12, OpenAL, stblib to 3rdparty\n\nMoves GL, minidx12, OpenAL, stblib to 3rdparty\n\nFixes AppVeyor and CMakeLists (travis-ci.yml doesn't need any changes)\n\nPoints directories in the VS solution files to the new ones on the\nexternals directory\n\nIncludes stuff with the < > syntax instead of \" \"","sha":"afefecf1f07529bdcb6e54e27473586bd945f9fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-20T00:05:12Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-20T22:21:35Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"msg":"Moves ffmpeg and minidx9 to 3rdparty","sha":"6182f5346d69c70eeca6eb99480529cce3bbaaaf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-20T01:05:03Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-20T22:24:21Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"msg":"Moves glm, GSL and libpng to 3rdparty\n\nMoves glm and GSL to 3rdparty\nMoves libpng to 3rdparty","sha":"38f93461d171992019c7252cfe8fbc7d0108b93f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-20T23:02:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-20T23:02:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1595 from MyaniPT/patch-1\n\nMove 3rdparty dependencies to 3rdparty (part 1)","sha":"6fab5a885f611a1d73783801af480b20a937209b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-15T23:34:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-20T23:03:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Remove buffer_deprecated completly.\n\nattrib_buffer now use the simpler buffer struct.","sha":"34eb85683c47cdaa021cb7879188ba510ce1dc30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-20T23:45:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-20T23:45:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1603 from vlj/vulkan\n\nvulkan: Remove buffer_deprecated completly.","sha":"1f500aad53f110dc6af2b2b172f19ece0ea4af47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-20T01:26:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-21T21:10:34Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Create program in program_state_cache<>::build_pipeline","sha":"6f9f5f79184496d94b02414ba9270e6eab1630fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-21T00:00:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-21T21:10:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Move sampler object outside of texture.","sha":"a14dd8ea512f463d5250c14f682de5d932142ff9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-21T17:20:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-21T21:56:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Simplify framebuffer class and release them at frame flip","sha":"4f2bda26fc200adf2129374d2c023ca377ff3cff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-21T22:46:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-21T22:46:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1608 from vlj/vulkan\n\nVulkan","sha":"efd52a0547b4b935e119ee304a3dc3f89be75862"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3931917?v=4","date":"2016-03-22T14:32:11Z","email":"mdeguzis@gmail.com","login":"mdeguzis","name":"mikeyd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3931917?v=4","date":"2016-03-22T14:32:11Z","email":"mdeguzis@gmail.com","login":"mdeguzis","name":"mikeyd"},"msg":"Add missing build deps\n\n* CMakeLists errors finding zlib library\r\n* build-essential does not include clang or cmake, added (gcc is of course)","sha":"29c29d007421b90c109079f2fb3a47ccc895629d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-22T18:05:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-22T18:05:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1609 from ProfessorKaos64/patch-1\n\nAdd missing build deps to readme","sha":"0a08f9595edad3eb3875eb2b0ad1bd5f69f4566e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-22T17:56:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-22T18:06:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Use protected instead of private for surface_store content.","sha":"284d2c43f9e585f99f0638ed6dd423ae1ed5d772"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-22T18:03:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-22T18:06:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Turn alignment constraints in textureUtils to multiple_of constraints.","sha":"b00acff9dda91b36d25a39c3ac5a113a8ed209df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-22T18:55:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-22T18:55:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1611 from vlj/rsx\n\nRsx: Slight interface changes.","sha":"f72f6fe9c591194389e4974de7b1f603cfd24d52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-01T20:42:46Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-22T20:39:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Expand index for quads/quad_strip/triangle_fan","sha":"23a0116975d6dbcc13cddb0d0dbbc679f0cb1b74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-22T21:23:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-22T21:23:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1613 from vlj/gl\n\ngl: Expand index for quads/quad_strip/triangle_fan","sha":"c6bd5d09f85a57d976c40cbbb8bf173c0e47503b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-15T23:42:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-23T20:09:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Use simpler texture object","sha":"36aace57cac906770b0f0be9cb34e29ae52e41a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-23T22:04:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-23T22:04:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1612 from vlj/vulkan\n\nvulkan: Use simpler image object","sha":"d995bfbdfb7e394aa03313186c3c5a582950798a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-23T20:31:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-24T07:52:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Set render target textures to clamp to border by default","sha":"a120414d322c4e25144d4030a7671caafe8990f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-23T21:35:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-03-24T07:52:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix quad strip triangle winding","sha":"0327e7632079dfbdf897a5ce394beb07de94db7b"}
+{"author":{"avatar":null,"date":"2016-03-24T11:25:14Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"committer":{"avatar":null,"date":"2016-03-24T11:25:14Z","email":"blackdaemon@rada.vn.ua","login":null,"name":"B1ackDaemon"},"msg":"Merge pull request #1619 from kd-11/gl_shadowmap_clamp\n\ngl: Fix RTT clamp mode; Fix vertex winding for emulated QUAD_STRIP triangles","sha":"cf402c8954cbf9212472596e53a9419f075be9c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-25T16:44:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-25T20:37:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/gl/d3d12/vulkan: Use exact mimap counts.\n\nFix invalid textures in gl backend.","sha":"9485fe2693b6695b6e41e077e42fc15b37d4d41c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-26T01:51:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-26T01:51:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1625 from vlj/rsx\n\nrsx/common/gl/d3d12/vulkan: Use exact mipmap counts.","sha":"0838e3209e2549d38b833848ce9e8b25fc31d1fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-24T22:28:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-26T16:45:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Clear framebuffer after flip.","sha":"1b33abf2871b06eeffd88366084b1b5bc71541aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-24T22:28:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-26T16:46:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Do not purge texture before flip","sha":"21e7206f7a628849cd4c090306cfeeef3b617be4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-26T17:20:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-26T17:20:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1626 from vlj/vulkan\n\nVulkan: Fix some cleaning behavior.","sha":"35570a5ebfb62b9165873dac09f4bef5a203792e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-22T21:26:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-27T01:45:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Enable core context and debug output.","sha":"855d6935d929e8dd9de13e34ab976a4950d3cd71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-27T02:17:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-27T02:17:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1618 from vlj/gl\n\ngl: Enable core context and debug output.","sha":"27a8c074fa52067025dc41e967541f8d9a1be10b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-27T19:25:07Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-27T19:25:07Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"AnnieL"},"msg":"Adds missing lib (libedit-dev) - Solves #1570\n\nFixes building on Ubuntu (tested on 15.10)","sha":"bbf7a070e7fbfdf4caeca4463ece9d05faf17cb9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-27T22:52:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-27T22:52:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1629 from AniLeo/patch-3\n\nAdds missing lib (libedit-dev) - Solves #1570","sha":"daabbba5fc9cc948bff79fdc4a077d26a2486cd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-03-25T21:14:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2016-03-28T00:10:33Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Fixed build for MSVC","sha":"b81cf0145641b03116a83052fed71ee0625ce638"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-28T01:08:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-28T01:08:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1627 from danilaml/compilation-fix\n\nFixed build for MSVC (DH)","sha":"9b18bd4cd75947444d5073636c5f7596700279ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-23T22:16:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-28T17:54:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Vulkan: Alloc a descriptor set at every draw call.","sha":"7a988c73a652e8738164a24bfa737b678accf602"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-23T22:22:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-28T17:54:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Only submit command buffer at flip and avoid extra sync.","sha":"aa3c97f9181a3cb0b65eb7bd5b2d63ce7baa155c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-28T18:27:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-28T18:27:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1630 from vlj/vulkan\n\nVulkan: Avoid extra sync","sha":"ccb2d89744cb6eba7c57625da51be46d4d163c4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-03-29T09:23:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-03-29T09:23:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Added yaml-cpp and pugixml submodules","sha":"8cd0aab129069a7ddefb2519611731f0cfab3b76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-21T12:47:25Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-29T17:51:54Z","email":"fox1999@live.com.pt","login":"AniLeo","name":"AnnieL"},"msg":"Slims down minidx9 to XAudio2_7\n\nRemoves minidx9 as a submodule\nSlims down minidx9 to have only the files XAudio2 (2.7) needs.\nThe other dx9 related files weren't being used.","sha":"9f257ee9f8552e5ee5e4e70eb92b4cd3be3dfa2d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-29T17:59:50Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-03-29T17:59:50Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"AnnieL"},"msg":"Making sure the right file is included","sha":"96329a6e29fbd39c1fde572e23dd3d9cc5e60cf7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-29T20:45:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-29T20:45:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1607 from AniLeo/patch-1\n\nSlims down minidx9 to keep XAudio2_7 files only","sha":"13d58ac355e48e092e8f9fa337d535cbaa533a01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-29T23:11:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T16:01:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Fix updated texture state","sha":"08b47616b6cdbcaafb7560488e63aa7de7b8e782"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T16:56:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T16:56:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1640 from vlj/d3d12\n\nd3d12: Fix updated texture state","sha":"c1e2b75a492188c8ad5c38afdf916531899f6bf1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2016-03-28T20:45:58Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2016-03-30T16:57:03Z","email":"flashmozzg@gmail.com","login":"danilaml","name":"Danila Malyutin"},"msg":"Don't build rsx_program_decompiler\n\nTo cut down on warning noise. We don't use it anywhere afaik (and newer sha with fixed warnings has conflicts with rpcs3).","sha":"5b181ed28c900d9788d8ab27ee4a70ba88897082"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T18:02:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T18:02:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1634 from danilaml/patch-2\n\nDon't build rsx_program_decompiler","sha":"d53a1d10ab6d68446a38055a7484959df521b6b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T16:30:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T18:03:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Use a typed class for texture dimension.","sha":"f2c82d3cf453946f1600e3bb02668aca8db8be15"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T16:55:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T18:03:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Use a typed enum for texture wrap mode.","sha":"7f25720bd318aae9ec91600f85fd76675456b9c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T17:20:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T18:03:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Use typed enum for max anisotropy.","sha":"d971c4e0f6f684182fa657b3eb0882de0eb7e19d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T18:00:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T18:03:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Use typed class for texture filters.","sha":"73233fd347a43c04b7d440dfc4ec9c071782a3bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T19:16:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T19:16:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1641 from vlj/rsx\n\nRsx: Use typed class for texture parameters","sha":"427270884cc8a329c3e647003d28bce80bf1345f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2016-03-25T01:28:12Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T19:16:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Add instruction for Persona 4 : Arena","sha":"3fbc3a3f001b54aff36794902c31dca2a1e834f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-28T18:46:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T19:16:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Fix stencil aspect mask sometimes missing.","sha":"d5e44f6224f3a7926fa9378006dd26c8e3624db3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-28T23:59:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T19:16:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Remove unneeded dirty_frame boolean.","sha":"38d57eb02c01081eb67bf4c2e580547744f9a6a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-29T00:01:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T19:16:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Do not acquireNextImage twice when no rtt is present.","sha":"f86c079acf5960490d477f0f734731028cef4d52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-29T21:03:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T19:16:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Reset command buffer after framebuffer flushing.\n\nFix a (false positive ?) layer error report about comand being called\nbefore vkBeginCommandBuffer has been called.","sha":"70903d46e6f7eb29b43f02c3da12a0c7d48436ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T18:23:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T19:16:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Fix all warnings in VKGSRender project.","sha":"77674be1c1a1cebfe2006b447464b6c94467818e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T20:18:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T20:18:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1639 from vlj/vulkan\n\nVulkan: Some fixes","sha":"0c231e657829ab81ef0d5114319494cdc3b2deb8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-29T16:24:25Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T20:19:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Make get_exact_mipmap_count take compressed format into account","sha":"b7c539ad7aade6f74a7a5b7d9258ae6b46e9bf53"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T19:52:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T20:19:29Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Use an help texture_dimension_extended to handle cubemap more cleanly.","sha":"91d0229bc550495b83862b289f6afe892ad62668"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T22:11:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T22:11:18Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1643 from vlj/rsx\n\nRsx: Fix get_exact_mipmap_count and add a more convenient way to get tex dim.","sha":"f712b8aca40b89bdac60facc3a73ac89b866e069"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-29T15:04:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T22:12:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Fix unnormalized coord sampling.","sha":"17c4b2387e891b3fa876a8d8c2a7109f4e783f52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-29T15:18:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T22:12:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Fix r5g6b5 format.","sha":"b6c827b17a058bb9c0f3532ea1b728f618ac4c32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-29T16:43:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T22:15:17Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Use right texture target.","sha":"51a6862bf4271250f4a05333e816767b106fd4bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-29T16:43:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T22:15:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Correctly upload cubemap texture.","sha":"4c0b5bbc620cfa8df40a5908c33e3db081821a9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T00:17:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T00:17:06Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1644 from vlj/gl\n\nGl: Fix for cubemap and R5G6B5 rtt format.","sha":"d5bb9512377788b2e11b8082e218e87d3eba6b60"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T19:04:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T15:56:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"d3d12: Move sampler DescriptorHeap selection in D3D12GSRender\n\nAvoid sampler descriptor being stored on 2 heaps inside a single draw\ncall. Fix somes crashes.","sha":"ce072f25e2131eb34b06e93a46eb095aebfe9662"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T18:06:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T18:06:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1642 from vlj/d3d12\n\nd3d12: Move sampler DescriptorHeap selection in D3D12GSRender","sha":"7542d38681fc202196fc86260de3f44763a3a9cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T16:14:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T18:40:19Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Remove extra \"-2\" in get_exact_mipmap_count non compressed format.","sha":"5a3cf5d9acb045f17e6bc298da45ad13bfdb59fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T21:49:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T21:49:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1649 from vlj/rsx\n\nrsx/common: Remove extra \"-2\" in get_exact_mipmap_count non compresse…","sha":"b46fc2fc49f497851e465554cdcf16cc73e9b904"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-30T22:21:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T21:50:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Always map at least 1 byte.","sha":"c95c4c32e6f983a21ef76082c63a8793910b2e4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T16:44:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T21:50:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vulkan: Support cube and 1D/3D textures.","sha":"69d08b669164e24995c7a44fc6ff5b8eeef693d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T22:48:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T22:48:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1648 from vlj/vulkan\n\nVulkan: Supports cubemap and 1D/3D texture.","sha":"f81a02ed5e18c988d947103f71cc47b253282efa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T22:49:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-03-31T22:52:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Supports 1D and 3D textures.","sha":"d59486295dafda8a708686269ee0fffc88a9a345"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-01T21:16:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-01T21:16:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1650 from vlj/gl\n\ngl: Supports 1D and 3D textures.","sha":"8413cd7b0a325eee230f94b2c4de95aa1df1ad80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-01T21:24:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-02T16:27:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Move vertex setting in a separate file.","sha":"bad2d7f1214006a4886b78350014dc0fd114eb2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-01T21:42:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-02T16:27:49Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Fix vertex buffer size.","sha":"99717b7902dcd03691093c7b2f8ef8cdc446ad71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-02T18:01:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-02T18:01:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1654 from vlj/gl\n\nGl: Fixes missing geometry","sha":"b21e226b1c0b8b68ee52e28902cae407ae9d5100"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-04-02T15:19:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-04-05T22:22:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Properly handle ssa input type (non-varying)\n\nProperly handle ssa input as local (non-varying)","sha":"e9766f1b765c06573597246b5d605345398bc09e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-05T23:37:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-05T23:37:13Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1657 from kd-11/vulkan-wip\n\nvulkan: Properly handle ssa variable as local","sha":"4eb1267c5c43026fd21169eab8082008c3dbb084"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-04-05T21:42:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-04-06T08:16:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Remove deprecated features from core profile","sha":"1a61ef0440ef0f94a8af0d735a5e83ecfb2680d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-04-05T21:43:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-04-06T08:16:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Specify buffers to read when blitting output to backbuffer","sha":"dab1dda90344169e61672433c9d3218c87b491b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-06T20:03:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-06T20:03:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1661 from kd-11/gl\n\ngl: Specify buffer to read for blitting during flip; Remove some deprecated gl from core","sha":"62258a1f1ac2e5bc34a346d4c91551273f869932"}
+{"author":{"avatar":null,"date":"2016-04-02T20:28:53Z","email":"markuscicero5@gmail.com","login":null,"name":"mpm11011"},"committer":{"avatar":null,"date":"2016-04-06T21:35:06Z","email":"markuscicero5@gmail.com","login":null,"name":"mpm11011"},"msg":"Pugixml to replace wx/xml in rXML\n\nPugixml to replace wx/xml in rXML\n\nChange reinterpret cast to static cast.\n\nPass name in pred by reference","sha":"b57daef75aee9cd476af9032353a9d398b4295aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T16:50:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T16:50:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1656 from mpm11011/master\n\nReplace wx/xml with pugixml in rXML","sha":"8189577e8f9fe6ef429a956d9a03c999312a52a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-03-29T15:58:59Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-07T18:34:32Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"HLE: Implement RGBA->GA support, minor fixes","sha":"cedc023922a3d6dd3e1a0bff67c4c4392b7ee42b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-02T15:24:20Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-07T18:34:32Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"DX12 texture format fixes and improvements","sha":"3ee56627eb9a1596d26656febb20d3cc7bd3b919"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-02T16:18:25Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-07T18:34:32Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix forced_unit for unimplemented instructions\n\nFor SCT and SCB, the forced unit is always set to FORCE_NONE before\nhandling of the instruction. This makes the error for unimplemented\ninstructions' forced unit be incorrect. This fixes that.","sha":"a8e15ce18ab49ab9f5420a6951bdecbe07b97235"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-02T16:19:06Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-07T18:34:32Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix jstrchk to be TODO\n\nIt's actually not implemented properly...","sha":"1ff4f77eafa27f0ead735ce81631156ecdd520c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-05T17:27:29Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-07T18:34:32Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Vulkan/DX12: Texture format fixes\n\nDX12 also had a couple fixes","sha":"5ad060f150608f8a301569a2471d8fcb48ed1f57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T19:31:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T19:31:54Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1653 from tambry/cloud\n\nHLE: cellPngDec fixes, Common/DX12/Vulkan: texture formats improved","sha":"960f4ceefcd0849a321fc1b600fbb767b0f50532"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-01T22:02:05Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T20:17:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common: Remove MIN2/MAX2 macro.","sha":"cbe119b457eb2d2b3a5f518ca7147ff54416f172"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-01T22:18:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T20:17:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/vulkan: Factorise data_heap between vulkan and d3d12.","sha":"2e17ea14909dd029cd22ec7dd213b3be62d1885e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-02T18:07:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T20:17:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl/vulkan: Use single overload for write_index_array_data_to_buffer.","sha":"2ae5a7ff39c009e349e29d8610a314c628f77805"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-05T17:12:08Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T20:17:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx/common/d3d12/gl/vulkan: Set dst stride in write_vertex_array_data_to_buffer.","sha":"3a3d264cb506febff60409ed5176207e8cb6f856"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T20:50:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T20:50:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1662 from vlj/rsx\n\nRsx/common: Some factorisation","sha":"56ac7f2572e1efa045c2f2499faa17c8861520aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T21:30:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T21:30:43Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Fix rpcs3-test build.","sha":"fefeba03b8c064fba115eae8d4b0209c9cfbea74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T22:01:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-04-07T22:01:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Merge pull request #1664 from vlj/rsx\n\nFix rpcs3-test build.","sha":"d846eac0f10e147a6d2a9c88b96cddaa556cd396"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2016-04-08T18:17:24Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-08T18:17:24Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"rXml: use pugixml in header-only mode (#1665)\n\nFixes compilation in VS","sha":"6b5ee57718f1c8b1ae1886f9ad05be8a6949ad22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-08T19:18:46Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-08T19:18:46Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Fix OpenGL crash (#1668)","sha":"7c1ab4726262420f3ed1a0fc58d833d2744df23a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-01T21:40:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: Preview","sha":"5fc6f59821c43b105b915b2aff4c98f58803125e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-01T21:55:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: Utilities","sha":"250ce635271cf033606e4195c9288ad2cf37414f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-01T21:47:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: Loader","sha":"2553e45d76025120b14b9559e80b74a078c029b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-03-21T19:42:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: Modules","sha":"7e30a0f46407a801aa8fa5218f203d498c31c8bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-03-21T19:43:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: Modules (cell)","sha":"5637c223639d42fc5c86d9ed06c86ec59a778b13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-13T22:23:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: Syscalls","sha":"42e1d4d7525a002c2898fe1b9aa3c52ff323fa3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-13T23:09:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: Cell","sha":"c4e99dbdb20225b9c08db40cb5ad3653ce92b1fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-13T23:09:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: Cell (deletions)","sha":"4cf41305e09ddec0e13bd0999f3a0f047d9a0632"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-01T21:50:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: RSX","sha":"b85a68e8a12e9bea9af04820dc04ab7d1aa15dee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-01T21:50:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: FS","sha":"984aa44220b12c60cd27a35eecc819e88b8242c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-01T21:51:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: IO","sha":"766f1b2b0110ddbc946df8ec93c77d1e27cc36ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-01T21:51:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: Audio","sha":"edd0965c1aab699f010386cbea5bc8251b56308b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-01T21:52:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: Crypto","sha":"b85fc50854940397d7cfef835ee981128fd9dbb8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-01T21:52:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: Memory","sha":"0c7f7638892e2808bae19f1e5444111082d4c3f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-01T21:53:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: ARMv7","sha":"643c15c4e960a4f2f70cb2e6835a73e86122c8a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-02-01T21:46:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: Gui","sha":"c7738b8b37ebf8071b17f859ea080022c17ca496"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-13T22:59:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:22:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: Emu (the rest)","sha":"f8f067ca7cd7891400f44da8c7fdb1b37d9e2d0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T16:54:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T17:19:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"rpcs3.rc recreated as rpcs3_.rc\n\nI have no idea why it didn't compile.\nAlso recreated without UTF-16 BOM.","sha":"6312bf53234d9b9df0a09fcbf5e984c0ba73d763"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T21:45:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-15T21:45:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"D3D12 Adapter setting fix","sha":"f63ec52479e460badee1215eaec70dd93832aa42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-16T08:10:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-16T08:10:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1521 from Nekotekina/master\n\nRPCS3 0.0.0.9 (caution: LLVM recompiler removed)","sha":"fe1e7a1bdbf4bdd71ead4c74164d7cfa5abc53fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2016-04-16T21:21:22Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-16T21:21:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rXml: fix broken things (#1669)\n\nNot sure if it works completely now but at least it doesn't crash in\r\nMetal Slug 3 now.","sha":"85d0fff23370c8502ffadd089c940f77fdd89544"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-16T22:23:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-16T22:23:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"3rdparty/glm removed (#1673)","sha":"81780d1932bb322ae04b72e8e7007ec10247489c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-19T13:04:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-19T13:04:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU channel optimization (#1675)","sha":"efc87792758d53ef6cd675b268e323579c1ad884"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-19T23:32:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-19T23:32:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GSL moved from stdafx.h (#1676)\n\nAdded GSL.h helper for correct including","sha":"75fe95eeb148270cd94212795f747856d8623769"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-25T10:49:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-25T10:49:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Optimizations (#1680)\n\n* Optimizations\r\n\r\n1) Some headers simplified for better compilation time\r\n2) Some templates simplified for smaller executable size\r\n3) Eliminate std::future to fix compilation for mingw64\r\n4) PKG installation can be cancelled now\r\n5) cellGame fixes\r\n6) XAudio2 fix for mingw64\r\n7) PPUInterpreter bug fixed (Clang)\r\n\r\n* any_pod<> implemented\r\n\r\nAliases: any16, any32, any64\r\nrsx::make_command fixed","sha":"da7472fe81fadbd4a0188fc238f01204fa884da5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-26T22:27:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-04-26T22:27:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Header optimizations (#1684)\n\nShouldn't break anything. I hope.","sha":"aafcf44581c875a095f785cad8ab6d6efe3269e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/295997?v=4","date":"2016-05-16T18:42:35Z","email":"itguy51@gmail.com","login":"itguy51","name":"Josh Pruim"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-16T18:42:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Added confirm to delete (#1698)","sha":"805c778f91193c1165692ad628c01adf9d9fe888"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1646210?v=4","date":"2016-05-19T16:15:56Z","email":"john.ettedgui@gmail.com","login":"John-Gee","name":"John"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-19T16:15:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Replace math macros by function calls from cmath. (#1695)","sha":"ce3fdeda5e42d2b7bc9b03f4118a3bff02052220"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-05-21T08:08:30Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-05-21T14:08:34Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Use native function for OP_CODE_PK2/UK2 and UP2/UK2","sha":"42423588c8da58a3bd613c4913b3a129827adfa0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-05-22T10:30:12Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"11DH11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-05-22T10:30:12Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"11DH11"},"msg":"Merge pull request #1700 from raven02/patch-1\n\nUse native function for OP_CODE_PK2 and UP2","sha":"5aae9b553693feb07039d1e4bfd911995cc1bf76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-05-23T10:08:34Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-23T10:08:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Display render on title frame (#1701)\n\n* Display render on title frame\r\n\r\n* Fix few typo\r\n\r\n* fix wrong condition","sha":"5c52521a0a022e592189f93bcfe8b268ed1042e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-13T10:17:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-23T13:22:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PSP2","sha":"38c444cfa1dbe152daa63b1703c12172078cd056"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-13T13:55:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-23T13:22:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Cell","sha":"e2d82394f6daba16aac7a79fed1dd4c116080381"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-13T14:01:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-23T13:22:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"The rest","sha":"266db1336d5e3d3a7790fae5e7096f19b978c393"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-23T13:53:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-23T13:53:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1696 from Nekotekina/master\n\nStyle fix, preparations","sha":"cdefb969ec46a7e817870374e335ed7d0e3a3bf6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-23T22:59:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-23T22:59:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Hotfix (#1705)","sha":"edc92843a7c95a8204aed17f7e499f924803182a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-05-26T18:47:37Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-26T18:47:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GL/Vulkan: write shader program log as .glsl and .spirv (#1720)\n\n* GL: write shader program log as .glsl\r\n\r\n* VK: write shader program log as .spirv","sha":"214d3d0f1aacd1376c4f74217024e3099b43fbe4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-05-29T15:33:41Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-29T15:33:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"FP: Implement texture lookup with explicit gradients (#1706)","sha":"fc1408e64300db53c329a8b216ec549d982ca493"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-05-29T21:53:28Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-29T21:53:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"DX12: fix for surface color format (#1709)\n\n#1652\r\n#1594","sha":"df6ee9c29da28af6c632b2749446610114784017"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-02T10:07:43Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-02T10:07:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GL/Vulkan: Implement DP2A (#1708)","sha":"ee645d054de2cb6ca6dd524d4402342d6618b05a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2016-06-02T20:58:04Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-02T20:58:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove some llvm packages from travis CI and switch to 14.04 (#1740)\n\nTrusty has good enough clang (3.5) to build rpcs3, as fo llvm:\r\nwe don't use it currently and travis fails due to: http://lists.llvm.org/pipermail/llvm-dev/2016-May/100303.html","sha":"713ae91e27dbf2ab872125592ae558e285adcdf6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-09T09:45:45Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-06-03T05:56:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement cellFsAllocateFileAreaWithoutZeroFill\n\nAnd a couple minor null pointer checks in sys_fs.","sha":"97083ebba44f578cb218714f47d61c36b739252c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-09T10:03:53Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-06-03T05:56:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"cellUserInfo: Cleanup, notify about errors","sha":"b073ead988761209f24bdf82571c76ab39feeeb2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-09T15:07:30Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-06-03T05:56:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Implement sceNpUtilCmpNpId\n\nWill need a full implementation of emulated network to be \"fully\"\nimplemented.","sha":"8d2b6f605498d239cad8c8275903e733b2e652e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-16T08:32:43Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-06-03T05:56:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Big sys_net improvements and fixes\n\n* Error codes are now properly handled\n* Couple more functions implemented\n* Support for setting certain socket information\n* socketselect() handles Unix waiting behaviour on Windows\n* accept() fixed","sha":"31ec26a7a1d0099157e5cce9a87f2efdec6a1a3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-18T07:06:22Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-06-03T05:56:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"sys_net: Use IDM, initialize networking on startup","sha":"2e5d20c3153e65e5920ee8f9065901b7273737f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-04-27T15:08:12Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-06-03T05:56:37Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"msg":"Change \"start after boot\" default value to true","sha":"92446de9d98b8f523342ce6954fd246f49071bb0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-03T07:46:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-03T07:46:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1670 from tambry/flower\n\nHLE: Improvements and fixes","sha":"ed93c77433a772afb9ae432dddd7be3b381e885d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-05-28T10:20:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-03T14:07:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Ignore clear if surface target is set to CELL_GCM_SURFACE_TARGET_NONE","sha":"2bcc755fcafc891fcc95eec191970185791f84bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-05-28T14:09:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-03T14:07:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Respect more requested surface format configurations","sha":"dc970c513a422c81f390382d94b6168fa050bde9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-05-30T14:02:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-03T14:07:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Disable user clip planes\n\nUse // for comments as requested","sha":"d22672b15620db87f7802df841594d40f991e8c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-05-30T14:28:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-03T14:07:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix rtt formats and component sampling\n\nvk: Fix for rtt image sampling","sha":"60a7f9b3f2b8ef2d8ec797a9dab0fa20850ba1fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-05-31T12:00:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-03T14:07:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: change default border color to black; fix GEQUAL compare op","sha":"6b3c47a42a26f6c718ac1342520cd250e7e57ed0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-03T15:18:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-03T15:18:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #1722 from kd-11/gl\n\ndx12/gl/vk: Rendering fixes; surface format enhancements and bugfixes for vulkan","sha":"136295f70ee64443dfd157a0fd9867cb7da49aa8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-04T07:23:45Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-04T07:23:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"FP: Implement REFL and LRP (#1712)","sha":"8f67c910abd18e39d339c668145404642cd71be8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-04T11:41:53Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-04T11:41:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GL: set texture bias (#1742)","sha":"e5a792515efb0fa38e66de7b07feb8e6ba09ee32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-04T16:12:14Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-04T16:12:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Texture bias minor fix (#1745)","sha":"39767b8d461640ecd1a66bd1f7472597a0665bc1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-05T08:11:58Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-05T08:11:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remap color component depends on RTT or RSX memory (#1744)","sha":"97100441343aa0ae9fc2476854601c8a07ad398d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-05T17:31:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-05T17:31:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vk/gl: Enable alpha test in shaders (#1743)","sha":"c4102f3b1816ceb9dd940eb3dd5e781e20955e67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-08T09:39:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-08T09:39:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gl/vk: Fix ub256 and s32k vertex attributes; silence some unnecessary debug errors (#1757)\n\n* gl/vk: Sample integer attribs with integer samplers\r\n\r\n* gl: silence useless DPRINTs where behaviour has already proven correct","sha":"4260f68f852a97093429ea61ce2edb2a387404ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-09T22:03:43Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-09T22:03:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"VP: add few opcodes  comment for vec/sca (#1750)","sha":"db27ea923d51aabaf508a322f6bcdf5ebc4679b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-10T11:42:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-10T11:42:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gl/vk/dx12: re-implement pack/unpack operations (#1764)\n\ndx12: implement pack/unpack operations\r\n\r\ndx12: Fix shader compilation when pack/unpack is used\r\n\r\ndx12: pk16/up16 - relax half-float range to more realistic values","sha":"35ab3b0cd844b2c83f9f47a2496293957fd5e735"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-11T13:24:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-11T13:24:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vk/gl/dx12: Dynamic cb flush for vulkan; fix glsl/hlsl vertex shader generation for some games; dx12: ignore fbo textures during flip if no surface target is set (#1766)\n\n* gl/vk/dx12: Fix vertex shader code generation for buggy games\r\n\r\ndx12: revert vsh attribute changes\r\n\r\n* vk: dynamically flush command buffers if we exceed available resources\r\n\r\n* dx12: do not prepare flip texture if it has not been initialized","sha":"3956b21cb74386bb2621cdfc1cebcc1cf65e7670"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-13T11:10:59Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-13T11:10:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Vulkan: add two sided stencil/logic op/depth bounds test support (#1767)\n\n* Vulkan: add two sided stencil support\r\n\r\n* Vulkan: add logic op support\r\n\r\n* Vulkan: add depth bound test support\r\n\r\n* Drop off wrong case\r\n\r\n* Minor fixes","sha":"caf5894152c227ab357f82119216a565fa0c7c6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-13T16:53:50Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-13T16:53:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Write shader log in seperate directory (#1755)\n\nWrite shader log in separate directory","sha":"ea528a1ced9614852b90735e9b08b635d80728e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-09T12:57:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-13T21:08:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: Quickly ignore access violations outside cache range","sha":"40a598b0ab6f7389470ce7ddd92f2e733cc37dce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-11T19:51:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-13T21:08:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: use unsynchronized buffer streaming for attribs\n\nfix linux build","sha":"ed946264118900755c2259fdf48f475b187e260c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-12T09:05:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-13T21:08:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: use streaming buffers for uniform & elem buffer as well\n\ngl: stream uniform data using stream buffer\n\ngl: vertex streaming improvements and bugfixes\n\ngl: add basic timing info check for profiling\n\ngl: ebo streaming fixes and enhancements","sha":"6761d4a30cb19a8466c4ff1f43d5e52ad64686ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-12T13:37:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-13T21:08:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Add a workaround for a khronos spec bug","sha":"28a5d4d4f063d6c9f8e6f0e72db6a3072660b43b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-12T15:54:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-13T21:08:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: dynamically determine texture buffer offset alignment\n\nfix alignment issues for gpus where align < 16 is ok","sha":"3a63b624868de0e4791ef128ab50a53ed866628b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-14T23:11:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-14T23:11:18Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1772 from kd-11/gl\n\nopengl performance fixes and improvements","sha":"a66147705f69125846ae8a156a3e5a072b71458e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-15T03:19:20Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-15T13:51:51Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"OGL: disable pixel processing test before flip","sha":"9f1ee5bd286695e6d006199757a5db3b9f74ba5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1827708?v=4","date":"2016-06-15T21:12:58Z","email":"raul.tambre@gmail.com","login":"tambry","name":"Raul Tambre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-15T21:12:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add myself to mention-bot blacklist. (#1779)","sha":"d66bd5f70f23d56f12d1f00c7bf4d3b242eca91e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-17T06:32:07Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-17T06:32:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Texture format W16_Z16_Y16_X16_FLOAT fix (#1777)","sha":"079411eee80f411449a275cda3bc2d6482e17a58"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-05-07T18:38:52Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-17T18:26:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Added rpcs3 version object\nRemoved _PRGVER_ macros","sha":"b52e885cde3af00ee6fc088de056ef3daf189b42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-05-08T07:38:40Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-17T18:26:05Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Added dynamic_library utility","sha":"795170635f53a11fb559ccbbdf12a31616a06d36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-05-08T13:19:24Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-17T18:26:06Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Added rpcs3 api (dynamic library)","sha":"bc63eaea48ca5e1f8ba3d01106018a0288da77b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-17T20:18:10Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-17T20:18:10Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Updated rsx_program_decompiler submodule","sha":"1e39c691dc47c60e5a526e74da600c0bf46671d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-17T20:58:31Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"11DH11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-17T20:58:31Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1790 from RPCS3/WIP\n\nVersion bump to the 0.0.1 pre alpha","sha":"9d0139673756c3aebe0128c57072f903e53b05c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-16T15:51:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-06-18T12:39:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Properly enable window resizing","sha":"833c100850fc61493de8ed761f06632281af2bea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-18T16:25:19Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-18T16:25:19Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1787 from kd-11/vulkan-wip\n\nvk: Properly enable window resizing","sha":"338fb6cc7e7ff1ab51da63840d2f13c220c0afdd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-18T16:28:02Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-18T16:28:02Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge branch 'master' into gl-flip","sha":"f6b5f0250163d6cc619a071ffe32e4f87c41b5c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-18T17:27:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-18T17:27:29Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1783 from RPCS3/gl-flip\n\nOGL: disable pixel processing test before flip","sha":"c4733a6eab04d5e0ef31e34dda0aba67a1a21ee2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-19T01:53:49Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-19T01:53:49Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"VK: add cull mode and front face (#1789)","sha":"28366d35d2c132fa7eeeb6272ac15b1c16f501f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-19T03:01:11Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-19T03:01:11Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"DX12:  set the heap size based on available vram (#1786)","sha":"244f3dfb899e28cb081ec07820a703f9878ab9a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-19T05:49:25Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-19T05:49:25Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: Better VRAM heap selection by memory properties (AMD)","sha":"298c9fea22e75b81d2ef4aeea5c96f69a39b7e9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-19T06:32:08Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-19T06:32:08Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1800 from RPCS3/heap\n\nvk: Better VRAM heap selection by memory properties (AMD)","sha":"ff0bb52689c4c42bd89e1c0d776595c3f287d553"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-05T10:14:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-19T17:50:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPUAnalyser.h added","sha":"6fa5e2cc7ccad0fdfde5e63c681686f051bbe4b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-07T20:24:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-19T18:29:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM AOT","sha":"a8bebcba55df655eb282df6d8ddc5ab5e51649bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-19T18:47:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-19T18:47:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"README.md updated","sha":"0cf4b378f9067b6cac24f133a23cf3eb5587381a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-19T19:50:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-19T19:50:05Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1758 from RPCS3/analyzer\n\nNevermerge AOT","sha":"863d963e97359ecd9fc2a70ee1650910900958f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-19T22:43:13Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-19T22:43:13Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix invalid map<K, T> key error (#1801)","sha":"c96057296a27943b76071b78d083fa00a3aafc2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-21T08:22:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-21T09:23:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"IdManager fix\n\nDebug build fixed\nAllowed get/remove with forward declarations","sha":"eb889920e69a7faabd981602a3ed527cea07f293"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-21T09:05:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-21T10:22:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"File op buffer","sha":"860926d7313ebbe3d3745a8b17335803f6b2ca02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/24647284?v=4","date":"2016-06-21T14:03:07Z","email":"GhettoGirl@users.noreply.github.com","login":"GhettoGirl","name":"Lena"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-21T14:03:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixed the frame icon (#1811)\n\nThere was a tiny duplicate of the icon itself in the left upper corner.","sha":"5853332db7101da8593dc04574d8b3b25c99dded"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-21T15:01:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-21T15:08:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: Some instructions simplified","sha":"251fb86ab0f16633a021479085c41719ea5d041b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2016-06-16T17:19:45Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-21T16:56:00Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Try to use new shaders decompiler in OpenGL backend","sha":"083c4fc85522df22de99370ca22e012eba1e5c45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2016-06-16T17:50:33Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-21T16:56:00Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Missed changes","sha":"8637754d6a90f8b3bc628ef2c36234d7c304793e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2016-06-17T21:36:20Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-21T16:56:01Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Use sampler buffers in vertex shaders","sha":"1778113b717ab2b5883773cfb34fd7254b4a9b27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2016-06-18T08:50:45Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-21T16:56:02Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Fill fragment constants","sha":"67fe5e110729e53f5a7c2793ea9fe0e38020eb13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2016-06-18T15:18:56Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-21T16:56:02Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Try to fix appveyor build","sha":"62a9c38754f61b08f4cf9ddbd4f86ae22fa6c911"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-18T16:48:39Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-21T16:56:03Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Updated rsx_program_decompiler","sha":"c299a65aabd2d4b7f8a1f8397c6914177f3fa362"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-18T18:41:17Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-21T16:56:04Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"Added rsx_program_decompiler to the CMakeLists","sha":"c0487a634e38871b2d5c86d6e56359bca84ecae3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-20T21:38:38Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-21T16:56:05Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"OpenGL renderer: use correct MVP matrix. Cleanup\nSimplified gl::ring_buffer helper","sha":"3b5cd4845e6885160649d11214e7a98b5b9b34fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-20T21:39:44Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-21T16:56:05Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"OpenGL renderer: Fixed texture bias setup.","sha":"e83c387ebe3d22333ceef766b882651c18a252ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-20T22:27:14Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-21T16:56:06Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"OpenGL renderer: check for gl errors in release builds.\nIgnore null-sized textures\nCleanup","sha":"8fd306490594e5e58743b84cb9e067dc92ff135e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-20T22:31:50Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-21T16:56:07Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"msg":"OpenGL renderer: Proper clipping implementation","sha":"cbf880fb711310d6335945bd4b79625e18b163d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-21T18:34:15Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-21T18:34:15Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1806 from RPCS3/WIP\n\nWIP Shaders Decompiler (OpenGL only)","sha":"d22ac91ee161d7fc600dffcd66b907b635b3f363"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-22T19:44:38Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-22T19:46:47Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"OpenGL renderer: improved vertex attributes setup\nMinor fixes","sha":"f30d71da6c6277646aa3738bbc88b95e260312ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-22T20:03:46Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-22T20:03:46Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed LLVM & MemLeak builds","sha":"001ab05f1a262b689e4ec3f115f67be625e4b40b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-22T22:01:29Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-22T22:01:29Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"OpenGL rendered: use textures cache","sha":"714e07b1dc25473fbb98718c41369545e4b42ac3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-22T23:55:40Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-22T23:55:40Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1816 from RPCS3/WIP\n\nOpenGL renderer: improved vertex attributes setup","sha":"d0442e140b207fb9540e5e611572ed7cbbef8b36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-23T01:54:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-23T01:54:46Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_net: set other options using setockopt() (#1815)\n\n* sys_net: set other options using setockopt()\r\n\r\n* typo fix\r\n\r\n* Typo fix #2","sha":"091b6711ae16fd80abe00451cb36c63916bd409c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-25T12:15:10Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-25T12:15:10Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"GL: fix few texture swizzle remap (#1823)\n\n* GL: fix few texture swizzle remap\r\n\r\n* GL: add texture format HILO8 & HILO_S8\r\n\r\n* VK: add mapping for X32_FLOAT","sha":"7779742ac1595384eb895c52bd8d275a6265202a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-25T14:36:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-25T14:36:48Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_ppu_thread_create break fix (#1824)","sha":"4a08e8cd0b9bb952b81e7d5753efb46506107001"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-26T13:25:25Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-26T13:25:25Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: push back border color to sampler (#1832)\n\n* vk: push back border color to sampler\r\n\r\n* use approximate color\r\n\r\n* Add TODO for VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK","sha":"d69a4173fa9ab0b07a20a558e7be1c981b005549"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-25T19:17:40Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-26T18:32:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Shaders decompiler: support non 2D textures\nDo not validate programs with undefined textures uniforms\nMinor fix","sha":"e296f81a378eeb0d11d220759107c03238ebdaa5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-25T19:39:41Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-26T18:32:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Do not throw exception if cellDiscGame* executed\nThat not a critical situation, simple message in the log should be a good enough","sha":"55bc9eda9a1a8edffc69a695848cbce621e1cf73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-26T12:47:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-26T18:32:49Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Avoid using flip hack if it's possible\nAlso added some documentation about it","sha":"bf8a20c4b976c6c69e9c3f1934ed84434add37ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-26T18:28:19Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-26T18:32:50Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"RSX: Added legacy non-array vertex attributes support (if count of elements > 1)\nFixed ps1ght games","sha":"6ae54ae27b048ce260d9067b09d08bcbbfdf1a68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-26T22:52:08Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-26T22:52:08Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Implemented alpha kill and fog","sha":"44879dd9f3d9415332e0f731c8ad6ad4fadf2d8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-27T00:22:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-27T00:22:22Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Fixed _var_base move ctor","sha":"67a341fded622985fa2ffa3de41d81eb9105336f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-27T01:00:45Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-27T01:00:45Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1828 from RPCS3/WIP\n\nRandom improvements","sha":"028277bd2d69092c6bf2b2c00de7146d84c7d229"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-27T12:40:53Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-27T12:40:53Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"DX12 : add remaining constant color/alpha blending (#1834)","sha":"2c103484085b23594b85782dd63c6dda82f8101a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-21T20:30:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-27T13:43:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: Thread context argument","sha":"73ea02052537378bac64b69e5d7ee73273953fdb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-22T13:37:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-27T13:43:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: Added JIT.cpp\n\nRefactoring, used -fno-rtti option","sha":"a19b721c2614f3b35e2c3af36b41c15b34f08518"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-22T21:39:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-27T13:43:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CMP, TEST instruction support","sha":"63e690ca11932cd26f27fb3f8631443f38b2fa0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-25T05:16:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-27T13:43:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Syscall analysis implemented","sha":"9db7de29fb4903afa734ad45abfc3a9d0b16e691"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-25T13:54:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-27T13:43:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cpu_thread compressed","sha":"7a921cbdf92d35f85fbc1f3d84c121971742d262"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-27T16:34:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-27T16:34:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: Indirect call map","sha":"0ea0c21fedd5da7d6772aca16f2cf6382996c530"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-27T17:52:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-27T17:52:38Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1813 from Nekotekina/llvm1\n\nPPU LLVM: Improvements","sha":"223979c0881c622e7d2244399468992f9b4574e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-27T18:53:56Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-27T18:53:56Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Improved shaders cache","sha":"32830d45ffaa9001713a93500d97a6d6471aa11b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-28T09:48:45Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-28T09:48:45Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"RSX: added proper nv0039::buffer_notify implementation from rsx_cache branch","sha":"e6c6a7fb8bcdbadb6f7dd220d6b7bd1d0ec9f1e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-28T09:52:10Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-28T09:52:10Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"RSX: added hack to the nv3089::image_in\nRemove it when textures cache will be implemented properly","sha":"086e1c34ddf1bdc1f88adc84cc2903bedcad46a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-28T09:54:08Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-28T09:54:08Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"RSX shaders cache: group programs by indexes","sha":"4d882964858d96664634a9c5f599f7df5e3c285e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-28T09:58:44Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-28T09:58:44Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Added WIP vertex textures support","sha":"989f95443225c1866d6a6342c0d1687338f51bdb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-28T10:24:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-28T10:24:48Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DH"},"msg":"Updated rsx_program_decompiler","sha":"d7358848e1c414dcf3eedffadf5a853ba816b47b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-06-28T11:22:12Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-28T11:22:12Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1840 from RPCS3/WIP\n\nRSX improvements","sha":"c7965405d31189e261108085ef41187f629d9ecf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-28T12:19:04Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-28T12:19:04Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"DX12: using better approximation for constant color/alpha blending (#1839)\n\n* DX12: using better approximation for constant color/alpha blending\r\n\r\n* typo fix\r\n\r\n* Comment updated.","sha":"d22017bfca15c5e36a116654ab67881234314446"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-06-30T04:46:25Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-06-30T04:46:25Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Vulkan/GL: add default case for front face in case of garbage value (#1844)","sha":"246b5937831b9df88a6b908150540c158ce93cee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/24647284?v=4","date":"2016-07-01T04:07:16Z","email":"GhettoGirl@users.noreply.github.com","login":"GhettoGirl","name":"Lena"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-01T04:07:16Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add optimal build options to CMakeLists (#1841)\n\nProvides two options when building RPCS3\r\n\r\n    USE_SYSTEM_FFMPEG BOOL (default: OFF)\r\n    USE_SYSTEM_LIBPNG BOOL (default: OFF)\r\n\r\nThese options lets the user select between the system provided and builtin libraries of ffmpeg and libpng to overcome possible system issues.\r\n\r\nAlso adds support for older libpng releases if the user doesn't have libpng 1.5 or higher.","sha":"869e10027d6e0bdd24c2d187c551926714879d41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-01T07:02:40Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-01T07:02:40Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"DX12: depth buffer compare should perform only if depth testing is enabled (#1848)","sha":"45d41267f54b707bd441a0559addcabec3ef0c4e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-01T12:47:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-01T12:47:56Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"GL: front face regression fix (#1854)","sha":"c3bac7c92b205ab8819f774f0dcbce553ef3e37b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/24647284?v=4","date":"2016-07-02T11:19:32Z","email":"GhettoGirl@users.noreply.github.com","login":"GhettoGirl","name":"Lena"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-02T11:19:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"GUI: Add bulk decryption of LLE modules (#1845)\n\nAdds a new menu to \"Tools\" called \"&Decrypt SPRX libraries\" which opens a dialog to select\r\nmultiple *.sprx files, which are than decrypted all at once.\r\nThis speeds up the LLE module decryption and saves users a lot of time.\r\n\r\nThe output path is the same where the input module resides and the extension is changed\r\nto *.prx","sha":"85c4392b3444c4083b78c71e3162d62cc31003a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-02T14:27:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-02T14:27:53Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"vk: Avoid double-copy for vertex attributes (#1852)\n\n* vk: Avoid double-copy for vertex attributes\r\n\r\nfix buffer overflow\r\n\r\nvk: Fix vertex attrib offset_in_dst for batched draw calls\r\n\r\n* whitespace fix only","sha":"a6b7c9c309cb1891bb4cd7764c780bc583c763ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-03T02:35:51Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-03T02:35:51Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Vulkan/DX12 : refactor cull face code (#1849)\n\n* Vulkan/DX12 : refactor cull face code\r\n\r\n1\r\n\r\n* Add optimal build options to CMakeLists (#1841)\r\n\r\nProvides two options when building RPCS3\r\n\r\n    USE_SYSTEM_FFMPEG BOOL (default: OFF)\r\n    USE_SYSTEM_LIBPNG BOOL (default: OFF)\r\n\r\nThese options lets the user select between the system provided and builtin libraries of ffmpeg and libpng to overcome possible system issues.\r\n\r\nAlso adds support for older libpng releases if the user doesn't have libpng 1.5 or higher.\r\n\r\n* DX12: depth buffer compare should perform only if depth testing is enabled (#1848)\r\n\r\n* GL: front face regression fix (#1854)\r\n\r\n* GUI: Add bulk decryption of LLE modules (#1845)\r\n\r\nAdds a new menu to \"Tools\" called \"&Decrypt SPRX libraries\" which opens a dialog to select\r\nmultiple *.sprx files, which are than decrypted all at once.\r\nThis speeds up the LLE module decryption and saves users a lot of time.\r\n\r\nThe output path is the same where the input module resides and the extension is changed\r\nto *.prx\r\n\r\n* vk: Avoid double-copy for vertex attributes (#1852)\r\n\r\n* vk: Avoid double-copy for vertex attributes\r\n\r\nfix buffer overflow\r\n\r\nvk: Fix vertex attrib offset_in_dst for batched draw calls\r\n\r\n* whitespace fix only","sha":"effd379c2556285221752695a655c59c019a1324"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/24647284?v=4","date":"2016-07-04T22:00:46Z","email":"GhettoGirl@users.noreply.github.com","login":"GhettoGirl","name":"GhettoGirl"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/24647284?v=4","date":"2016-07-04T22:00:46Z","email":"GhettoGirl@users.noreply.github.com","login":"GhettoGirl","name":"GhettoGirl"},"msg":"GUI: improve prx library selection\n\nSorts the libraries in the settings dialog alphabetically, so they are easier to find.\nSorts selected and unselected modules alphabetically seperatly.","sha":"5c4af45bf522267864755536fb3b7f72a10310b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/24647284?v=4","date":"2016-07-05T02:24:16Z","email":"GhettoGirl@users.noreply.github.com","login":"GhettoGirl","name":"GhettoGirl"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/24647284?v=4","date":"2016-07-05T18:46:51Z","email":"GhettoGirl@users.noreply.github.com","login":"GhettoGirl","name":"GhettoGirl"},"msg":"GUI: add prx library search functionality in settings dialog\n\nAdd the possibility too lookup specific libraries in the settings dialog.","sha":"758897a929c2396837dcbe3bc8bf1131c3001844"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-06T20:22:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-06T20:22:21Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1866 from GhettoGirl/gui-fixes\n\nGUI: improve prx library selection","sha":"0dc00b81044172ecfdaa0477f8e2a503dd0cd7f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-07T18:42:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-07T18:42:39Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PPU LLVM: New analyser (#1858)\n\nMinor fixes\r\nVEX prefix support","sha":"77594dc66c6f100a0fbc381bee570f40d94dd48e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-06-26T21:37:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-07T19:38:57Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Factorize rsx state","sha":"772706ca4cce840be2daf704e6fd81a43a2b15b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-07T20:49:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-07T20:49:23Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1865 from vlj/rsx-refactor\n\nFactorize rsx state","sha":"dcb3169f56203ffd5a14a76689f65897d21348ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-08T08:56:12Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-08T08:56:12Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"RSX: check vertex_draw_count","sha":"1f4ebf150168d3719535ffaaf95fdef5e457a0a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-08T13:54:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-08T13:54:33Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1869 from raven02/vertex\n\nRSX: check vertex_draw_count","sha":"71b21fe793e0706dfa6796788bfefbcacbdd2417"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-08T16:22:10Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-08T16:22:10Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"RSX: throw exception removal for user_command() (#1872)","sha":"70885ada6775bdbdb09ab3244e086a00ec24a73b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-08T17:00:15Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-08T17:00:15Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"DX12: get_scissor() fix (#1868)","sha":"dfa968863af10268a66d4daac28b3f340698dfbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-09T14:54:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-09T14:54:44Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"rsx: properly check for inlined array before discarding draw (#1877)","sha":"6705a6ecc9a15191628ecd6f5a078b011c440f72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-09T18:30:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-09T18:30:56Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_net: add few socket options (#1874)","sha":"d4da0e052d7f70fea2bd79d77e0fd1e824c820df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-09T20:32:09Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-09T20:32:09Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: add missing compare func not_equal (#1876)","sha":"ed8ebda804e0fe03cb6630b1b792f9e7af8399ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-10T00:33:20Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-10T00:33:20Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: add default case for to_front_face() (#1879)","sha":"47987efb75bb0c3cdfe7b3f5828e0ee08f9590cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/24647284?v=4","date":"2016-07-10T08:15:56Z","email":"GhettoGirl@users.noreply.github.com","login":"GhettoGirl","name":"Lena"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-10T08:15:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"CMake: improve compiler checks (#1847)\n\nMoves the compiler check out of rpcs3/CMakeLists.txt and adds them\r\ninto rpcs3/cmake_modules/ConfigureCompiler.cmake\r\nAdd better compiler checks and eliminate a TODO","sha":"8c3b3f7ab4518d01e5795388deff8248e9beb708"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-10T17:16:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-10T17:16:31Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"glsl; dump shaderlog (#1883)\n\nfix typo","sha":"bbf7e6332c5d6cc2cf5251f308748499f1bad46a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-11T01:05:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-11T01:05:13Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"glsl: not all shaders write to col0 (#1884)\n\nfix typo","sha":"59df7e7104473c5fc745b3e2845fab5af61369d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-11T13:00:04Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-11T13:00:04Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: set frame limiter before rsx->flip() (#1885)","sha":"b89961f01da962dd0663a6c9a8b7a95f6a9a6ef6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-08T22:36:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-11T13:30:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fixes\n\nelf_object\nLoader fix\nAnalyser fix","sha":"06c6c8212d515e625d4c8ee8a20749ce2d96c1c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-11T14:26:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-11T16:27:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update Vulkan submodules\n\nTemporarily disabled Vulkan build for Linux","sha":"11f7b167aece9ba34d78fda0e2278c334d7c8d36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-11T18:53:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-11T18:53:52Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"rsx: mark register access with divider op enabled and frequency 1 (#1892)","sha":"2c981cf940080e27f9198217a33e6c12ea8321ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-11T19:00:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-11T19:12:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs::get_data_dir implemented","sha":"ba8fd825ec6a6d6be8476c78fe85132c4bc36c23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-12T13:52:11Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-12T13:52:11Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Ignore clear if surface target is set to CELL_GCM_SURFACE_TARGET_NONE (#1898)","sha":"87e38118a5eac0d9d1c298d979a09cb2beefee1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-12T14:31:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-12T14:33:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM improvements\n\nRemoved interpreter dependencies\nReciprocal instructions improved","sha":"94da0dbd4d41185b1445351503163366a890cbad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-12T23:54:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-12T23:54:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU Analyser fix","sha":"0a5b518aea5f37b7f851cd3b042e131617ac8c05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-13T15:10:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-13T15:10:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Vulkan: glslang workaround","sha":"6bac4a535bd0046eba95a100bfdb080df004b765"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-09T14:21:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-13T18:01:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix primitive type checks","sha":"97581d8635cd70a7fae3ca2a4593df00e07abfde"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-12T20:10:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-13T18:01:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Properly determine front face winding","sha":"ea6f3ff5ede6274af492cab6fe5e40a70c561b91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-12T21:28:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-13T18:01:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: reset texture scaling factor during bind\n\nreset vertex textures as well","sha":"6401eefb26526ad0a04405cea2cd2c6e966a8719"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-13T21:01:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-13T21:01:22Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1902 from kd-11/master\n\ngl: bug fixes","sha":"4c4e4fc772aaa45f90d076142633ac0577783895"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-13T21:56:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-14T13:27:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: Analyser fix\n\nppu_branch_target removed","sha":"eb377f425ce6cebca685fc1c92a8f10c5e18cdde"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-14T16:28:26Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-14T16:28:26Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Modules: savedata fix (#1910)","sha":"d60b292ef1b4f3a421379b160fa68b9f498e19ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-14T18:25:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-14T18:25:38Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"gl: Fix fragment constants streaming (#1907)","sha":"ce56351554cd57232892d2a34edcdd89df0c3baf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-07-14T20:12:26Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-14T20:12:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGame: unknown category temporary fix (hack) (#1909)\n\nAll the games I've been trying to load from outside RPCS3's bin directory are returning me empty directories\r\n```\r\n{PPU[0x3] Thread (main_thread) [0x011223d8]} class fmt::exception thrown: cellGameBootCheck(): Unknown CATEGORY: \r\n```\r\n\r\nThis is a hack for when the category is empty or unknown. \r\nWe assume it's a disk game and proceed with the emulation.","sha":"ca835ba68ae7e9570522420632d13d15d7c8a077"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-07-14T21:02:07Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-14T21:02:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cell: add several error (return) codes and definitions (#1914)\n\n* cellHttp: add error codes\r\n\r\nAdds error codes for cellHttp and cellHttps\r\n\r\n* libDaisy: adds error codes and definitions\r\n\r\nAdds error codes, assertations and definitions for cellDaisy.\r\n\r\n* cellHttpUtil: add error codes\r\n\r\nAdds error codes for cellHttpUtil.\r\n\r\n* cellCelp8Enc: moves error codes, adds definitions\r\n\r\nMoves error codes to cellCelp8Enc.h, adds some definitions.\r\n\r\n* cellCelpEnc: moves error codes, adds definitions\r\n\r\n* cellJpgEnc: adds error codes and definitions\r\n\r\nMoves the existant error codes to cellJpgEnc.h and adds more error codes\r\n/ definitions.\r\n\r\n* cellVoice: moves error codes, adds definitions\r\n\r\nMoves error codes to cellVoice.h, adds most cellVoice definitions\r\n\r\n* Fix typos","sha":"dc34d5b350eeadeb6fea8a4c477af17e0ab31da0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-15T09:52:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-15T10:42:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU Analyser improved\n\nFix for old homebrews","sha":"c77dec6d6a7cf497166d4b5790067ec951d36579"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-15T17:19:15Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-15T17:19:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: typo fix (#1921)","sha":"2085d318bb1646874843d04d425de9d06ff3c672"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-14T19:46:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-15T23:20:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update donation link","sha":"5d6aecc59998708c8b0f302c9042d13ede4cb18b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-26T15:06:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-16T11:45:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"BEType: explicit alignment specifier","sha":"73c2115968cc3d6836fad280a920e4f98b4e3e24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-25T10:31:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-16T11:45:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: sys_vm","sha":"c95f6c8c560aac219babbb62b48fc9b402e76ac5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-25T10:55:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-16T11:45:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: sys_tty","sha":"f5e65e4ad9d34bced93967d8dd1b1601e4f2019e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-05-25T18:04:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-16T11:46:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: sys_memory, sys_mmapper","sha":"96728a83f6569a8413e6973d235d12594e80cb2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-16T17:58:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-16T23:23:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implemented thread_ctrl::interrupt","sha":"59433bfcd529675acc1b906df5de8a217203c2cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-06-02T15:16:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-16T23:27:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial commit: sys_fs","sha":"438e057dc8d5c4b99fdc4a91e98a1e03917db4e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-17T00:44:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-17T00:44:28Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1925 from Nekotekina/master\n\nCommit collection","sha":"260865de6d68b4647ef8cc6f61ac08c2cae30984"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-17T12:03:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-17T12:03:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"NV0039_OFFSET_IN fix","sha":"692d9dd4ae24c24b71dc0f5e2b9a3d7fbed7683c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-05T17:05:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-17T15:31:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Gather most rsx commands pretty printing and state modification function in a single file.\n\nrsx_decode.h implements a \"rsx_decoders\" template class that is specialized for most GCM command\nfound in rsx command buffer. 3 static members are defined : a \"decode\" function that turns command\nvalue into a more meaninfull type if applicable (for instance bool for _enabled* command, surface\nformats for set_surface_format command...), a \"commit_rsx_state\" that modifies a given rsx_state\nstructure when the command is parsed, and a \"dump\" function used in rsx_debugger for pretty printing.\nHopefully having the 3 functions in a single place for every command will act as a self documenting\nlist of rsx command buffer opcode.\n\nrsx_state is also expanded into several explicit variables instead of being stored into a u32 array.\nThis should makes debugging easier (Visual Studio will display the exact value of these member for instance)\nas well as preparing rsx_state for serialisation/deserialisation.\n\nThe vertex array and textures opcode are not concerned atm for bisecting purpose.","sha":"d97cdb9fbf33dfbdddfdb51d2eed195bc7f9f56a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-15T22:04:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-17T15:31:53Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Fix direct call to rsx::method_registers array.","sha":"c6ed5a8e6bf0c8561479bf7ebc202ce2d866b7a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-17T15:56:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-17T15:56:36Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1916 from vlj/rsx-refactor\n\nrsx: Gather most rsx commands pretty printing and state modification …","sha":"b2a7dac11bc95277125fd1cebc5ed68e3eccd2ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-17T16:57:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-17T16:57:50Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"vk/dx12: Enable/fix separate back and front lighting (#1927)\n\n* vk: separate specular color\r\n\r\nrsx: separate front color output from back color output\r\n\r\nre-enable front-back diffuse lighting\r\n\r\nvk: fix front face selection and actually enable face culling\r\n\r\n* dx12: Hide constant-key blended visuals (by common use of factor, 1-factor)\r\n\r\n* dx12: Fix 2 sided lighting when the shader does not compute both outputs\r\n\r\n* vk/dx12: confirm that src register exists before copying for 2-sided lighting","sha":"2337bf204cd60a85f8d349c34b189b6ef06d0821"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-17T19:55:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-17T19:55:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vk: Fix vertex winding (#1934)\n\n* vk: do not flip face winding based on shader origin\r\n\r\n* vk: disable face culling","sha":"2e5b01facad927112f3441fbe36c5a3eb4aa57ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-18T12:16:11Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-18T12:16:11Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"D3D12/Vulkan : swizzle texture format G8B8 (#1931)\n\n* D3D12: swizzle texture format G8B8\r\n\r\n* Vulkan: swizzle texture format G8B8","sha":"7ac9d3b6799e510014dac1435cc55ecdeff98a53"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-18T10:38:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-18T14:54:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixed thread interrupt and accvio","sha":"a186af32ec41c96dd73ec7ab33a9872ae2b5f6b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-18T18:28:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-18T18:28:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PKG installer fix","sha":"04926374f77115c8e388a8bc5a8c375af94f5bff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-19T08:52:14Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-19T08:52:14Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"D3D12: inline stencil test as GL and Vulkan backend (#1945)","sha":"6296453ef3cec69f600f68a2afe7ed4445aa14b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-18T23:33:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-19T11:06:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make TLS great again\n\nAnd clean System.h a bit","sha":"fc9fdca3f6e77800f2974fd372d16c3c0ed24983"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-19T11:06:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-19T11:17:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Typo fix: comparaison->comparison","sha":"ceb4cb59ac5f708775c36d278fc55f75b1d77667"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-19T14:50:40Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-19T14:50:40Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx:  use fragment_textures_count (#1948)\n\n* rsx:  use fragment_textures_count\r\n\r\n* Typo: unknow -> unknown","sha":"e1ff3f4674db91cf2ddb7b99953c2581c7151e30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-18T16:05:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-19T16:20:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"dx12: Constant color/alpha blending","sha":"d3837de57171163636174368dca68736cb10a8d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-19T16:20:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-19T16:20:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"dx12: simplify constant color blend equation/algorithm checks","sha":"854bc1db6072eeb278ab68dec0640581085b694b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-19T18:27:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-19T18:27:55Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1940 from kd-11/master\n\ndx12: Constant color/alpha blending","sha":"cc30e1aa47a36660385874ed621024e7b3c04576"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-13T16:18:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-19T18:28:32Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Use register_decoder for vertex attributes.","sha":"e9bee80f4b0aec3d4e7a9bf4bdefd74c231f1b1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-19T20:12:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-19T20:12:20Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1941 from vlj/rsx-refactor\n\nrsx: Use register_decoder for vertex attributes.","sha":"2af86e363cad6ad97989d028f60d1a2258640ae2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-20T12:16:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-20T12:16:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RSX exception fix\n\nVBlank thread management fix","sha":"ae634bb87ed9dcadb0cbc9fc79f254a66cab5a6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-20T15:45:26Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-20T15:45:26Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Obsolete 3D monitor (#1955)","sha":"8157e7cac8e40f1f2399269bcbf32b40820f5853"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-20T22:00:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-20T22:54:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GUI logging improved\n\nlogs::listener resurrected\nrpcs3 version: constexpr","sha":"0227c03366aaf4d02a27eabc868b317d11a924a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-21T05:35:06Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-21T05:35:06Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: refactor compare_op (#1959)","sha":"f36f4782817dcafbf435cb9c78ad560a1d951829"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-21T06:50:06Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-21T06:50:06Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"D3D12: revert heap size back to 896M (#1960)\n\n* D3D12: revert heap size back to 896M\r\n\r\n* Update D3D12GSRender.h","sha":"0ae8cc44675d1962628317b34a50c775ce66d5e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-21T13:41:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-21T14:46:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Dynamic XAudio version detection","sha":"a0c0df6e9da581d2992649db8dd3b685d60d086e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-21T23:31:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-21T23:31:58Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"gl: Clear depth surfaces before use; Vulkan cleanup (#1957)\n\n* vk: Clean up a few trap messages\r\n\r\nvk: silence a few compile errors\r\n\r\n* gl: Clear new depth surfaces to max_depth\r\n\r\ngl: use glClear to clear depth buffers","sha":"74fec275c71eaa4118bdca3eee3068c31f99c8be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-22T12:54:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-22T15:29:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellVdec fixed (requires LLE dmux)\n\nBasic MPEG2 support","sha":"5eb98b745f2048b310f369b5c98be4f3f1c93bda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-22T16:26:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-22T16:26:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial revert of 6ae54ae27b048ce260d9067b09d08bcbbfdf1a68","sha":"deeb4acbe571f97bbdad9de4c1166ad525fe4721"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-24T16:28:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-24T16:28:49Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"vk: Conform to current spec (#1981)\n\n* vk: define rtt images with transfer_dst set\r\n\r\n* vk: Bind a buffer view for attribs with undefined data\r\n\r\n* vk: Properly define renderpass clip region to fit the framebuffer\r\n\r\n* vk: respect type bits from returned memory requirements","sha":"09ae45c5667490bd42401dce3169904416f2b775"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-23T23:56:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-24T18:06:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Removed std::enable_shared_from_this\n\nMinor ID manager refactoring","sha":"7ccdea78226a971f3e47afb3bc2024c875e0a8fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-23T23:57:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-24T18:06:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_interrupt_thread_eoi fixed\n\nthread_ctrl::interrupt improved\nBIND_FUNC improved: preparations","sha":"a026d35c973fb0de23b34564b2390debf519edde"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-23T23:59:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-24T18:06:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU executable memory protection\n\nExperimental commit, not improved for PRX\nAlso fixed minor bug in PRX loader","sha":"39dadad534442df4ff37f584c3b8d342d5d49a77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-24T17:54:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-24T18:06:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU Analyser update\n\nWIP, nothing changed","sha":"712c04b2adf1ec5fcf48c70fee1179a780c3c10e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-24T17:56:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-24T18:47:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: New \"stack\" strategy\n\nMinor pessimization: all memory accesses are volatile\nSpecial handling of prologues and epilogues\nMinor optimizing assumption for SP","sha":"5c9f83c3a8ddf354c7fa2c9c7230573a77282375"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2016-07-24T23:39:09Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-24T23:39:09Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"update rsx_program_decompiler submodule (#1983)","sha":"132093c80e42d3af50e72e144d687fa096c1a615"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-25T00:25:02Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-25T00:25:02Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Audio : allow XAudio2 to run its own thread (#1980)","sha":"53b2e19d96dfacb48963e0fcd75884feed634cc8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-25T00:43:02Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-25T00:43:02Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PPU: register undocumented functions in cellSysmodule (#1987)","sha":"2a3029a62cf22cea3d310b3df9c54acb5c1cc63c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-25T01:09:14Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-25T01:09:14Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Revert \"Audio : allow XAudio2 to run its own thread\" (#1988)","sha":"1672c93a2db4314a2f0a8cfeee2471f60150428f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/958670?v=4","date":"2016-07-25T14:48:25Z","email":"ben@xnode.org","login":"Enverex","name":"Benjamin Hodgetts"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-25T14:48:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Clarify working GCC versions (#1851)\n\nGCC 6.1 cannot compile RPCS3 due to a regression within GCC itself, so note that here as it's the current version that a lot of people are likely to be using, with a link to the bug that contains further information.","sha":"c100328a6fee33b9b863fc0f425d2166345785e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-25T14:19:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-25T15:26:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: Use small code model\n\nGlobal variables modified:\n__mptr: pointer to memory base addr\n__cptr: pointer to function map addr\n\nUse 32 bit pointers in function map","sha":"44bee7d0baa30457288e20fcfec551329fa5377b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-25T16:30:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-25T16:30:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"XAudio 2.8 test fix","sha":"a8f977ed9ee9df6e059c2a90982e7f05865e8300"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/24647284?v=4","date":"2016-07-25T21:15:14Z","email":"GhettoGirl@users.noreply.github.com","login":"GhettoGirl","name":"Lena"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-25T21:15:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Ensure the 'shaderlog' directory exists (#1986)\n\nShould fix #1984","sha":"e377199e4103893e44daf27916f586114c65870d"}
+{"author":{"avatar":null,"date":"2016-07-26T11:39:12Z","email":"pekka.jylha.ollila@gmail.com","login":null,"name":"jypem"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-26T11:39:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Handle error when loading game icon (#1687)","sha":"2064f1cb80f9051fcb928d09d9cd23f8947d15d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-20T16:23:55Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-27T16:38:36Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Use bitfield template to decode values.","sha":"8b12379eb3321fcb68492f0734b7254bf35103fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-27T17:12:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-27T17:12:59Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1982 from vlj/rsx-refactor\n\nrsx: Use bitfield template to decode values.","sha":"e297984e591f8fa5ffa118bcb4b98703ce6911cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-17T17:16:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-27T18:20:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Copy state in capture frame call","sha":"ac771f951df51e79f379941386cfe6ca9654efd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-27T20:54:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-27T20:54:16Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1993 from vlj/rsx-refactor\n\nrsx: Copy state in capture frame call","sha":"2b6f8a075ea63b9d1475b91fc1147baa7ab3563d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-07-30T02:07:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-07-30T02:07:39Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"vk: optionally center/offset images when scaling (#1998)","sha":"33c59fa51b15565dfe67d01fadff882a8ac2e815"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-27T21:43:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-30T13:35:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPUThread refactoring\n\n`CallbackManager` removed, added _gcm_intr_thread for cellGcmSys\n`PPUThread` renamed to `ppu_thread`, inheritance allowed\nAdded lightweight command queue for `ppu_thread`\nImplemented call stack dump for PPU\n`get_current_thread_mutex` removed\n`thread_ctrl::spawn`: minor initialization fix\n`thread_ctrl::wait_for` added\n`named_thread`: some methods added\n`cpu_thread::run` added\nSome bugs fixes, including SPU channels","sha":"f8719c12308d61fecb426e23326f6049d1feb008"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-18T20:56:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-30T16:39:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Add cereal dependency","sha":"2528fc4555ea12aab607a9c24e9d6b95046d3155"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-18T21:39:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-30T16:39:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: implement serialization of rsx states.","sha":"15500d4ee95d1a8f91995b033eb57c70513dd67d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-28T20:55:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-30T16:39:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vm: Add missing headers.\n\nvm.h relies on memory (std::shared_ptr) and functionnal (std::function).","sha":"b9f4c15ec034efc4f5c9bd6f4a6eeaf9ceaaccb9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-30T16:52:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-30T16:52:39Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #1994 from vlj/rsx-refactor\n\nRsx refactor: Implement serialisation of debug data","sha":"33e13aa7e729818726fe399c10ef29c4ba63e980"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-30T14:10:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-30T17:25:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"XAudio2 version priority","sha":"0578430fd09dd7900ec5084ebe3faa31e51e65ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-28T21:20:39Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-31T14:48:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Inline rsx_state and texture constructors.","sha":"4c46bde315d7066f4fb2c72da8742463347455d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-31T14:41:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-31T15:04:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Move all gcm enums into separate header/cpp.","sha":"22a89a272e60e284965350670159f03e88b8e027"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-31T15:16:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-31T15:16:04Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2008 from vlj/rsx-refactor\n\nRsx: Inline some rsx_state member and split some headers.","sha":"190fc4301e43d6114d8f818fef818b2ac785882e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-31T08:09:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-31T15:16:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"rsx_methods.cpp fix","sha":"6a9f3040e18f63182bee82b691bc5963f5cb8932"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-31T13:34:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-31T15:16:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"rsx_method_t extended\n\nrsx_methods.cpp cleanup","sha":"1c69eb2b7306a5ba4a7b770a253c28f2fbe2d744"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-31T14:42:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-31T15:16:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implemented rsx::invalid_method","sha":"68cf570b581fd70f5a789a79c071dedf31d0856b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-31T17:11:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-31T17:19:21Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Fix warning because of unused arguments","sha":"9e7902455df29f15ed2f06f9d197827406bc8bd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-31T17:32:30Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-31T17:32:30Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2010 from vlj/rsx-refactor\n\nrsx: Fix warning because of unused arguments","sha":"32a03344b3d919820695a420df51152216586f17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-17T20:37:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-31T20:27:00Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx-debug: Add a separate qt app","sha":"7195b2e9077cfcf25ab417b6a7e5aaaaa57ec13d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-31T20:44:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-07-31T20:44:03Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2011 from vlj/rsx-dbg2\n\nrsx-debug: Add a separate qt app","sha":"470ed777c2637acdcda4e439e27c13b29060f012"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-31T22:35:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-31T22:35:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"emucore.vcxproj fix","sha":"3576e13e9a1dc60b20cf01db6a10efcbb9bafee0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-31T22:35:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-31T22:35:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"id_manager::id_key implemented","sha":"e585939ac26b2f7a26c48aff409dc715e70ab11f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-07-31T23:26:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-01T09:51:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"id_manager: embedded RTTI","sha":"e6bd91ada03b4655ffa83f997ff7869568b81c26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-01T11:47:14Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-01T11:47:14Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Regression fix #1995 (#2014)","sha":"61c6f82f74995ef14bb554fbb84acd676a9117b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-02T02:45:08Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-02T02:45:08Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"update submodule rsx_program_decompiler (#2015)","sha":"c618e02695ae451d835b0b45c4493842c6c96f13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-02T15:54:49Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-02T15:54:49Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: front_diff_color typo fix (#2016)\n\n* vk: typo fix\r\n\r\n* continue in for loop","sha":"208f4c3e270c4b3065b391259aade71bd2173d48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-03T01:45:10Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-03T01:45:10Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"update submodule rsx_program_decompiler (#2020)","sha":"9a081369c8907a4e66bbd5c3081b01f136f8f6e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-08-03T19:33:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-03T19:33:52Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"vk/gl: bug fixes (#2018)\n\n* vk: use null sampler for invalid/broken texture configurations\r\n\r\n* gl: Do not consider 32_BIT_EXPORTS flag for depth writes","sha":"47a9c8d731b346837013a84d30fd8c5793e4adc9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-04T09:54:34Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-04T09:54:34Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"texture: ignore when texture width > pitch","sha":"4dd67cdd5427e2a6287b1c474c54ad07ca4a5480"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-04T15:39:27Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-04T15:39:27Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2023 from raven02/texture\n\nIgnore texture upload if texture width > pitch","sha":"662fce38bdccb01cdb5e9b1287719ed51375423a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-03T20:51:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-04T18:34:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Formatting system improved\n\n`unveil<>` renamed to `fmt_unveil<>`, now packs args to u64 imitating va_args\n`bijective...` removed, `cfg::enum_entry` now uses formatting system\n`fmt_class_string<>` added, providing type-specific \"%s\" handler function\nAdded `fmt::append`, removed `fmt::narrow` (too obscure)\nUtilities/cfmt.h: C-style format template function (WIP)\nMinor formatting fixes and cleanup","sha":"5a36c57c57a90c5b620d21159ffbe1b57615988a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2715503?v=4","date":"2016-08-04T19:36:10Z","email":"dh.rpcs3@gmail.com","login":"DHrpcs3","name":"DHrpcs3"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-04T19:36:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Added DHrpcs3 to mention-bot ignore list (#2026)","sha":"dcd2bbaa3d450123f1cbfe23e3ef689420ece1c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-04T19:13:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-04T19:36:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSysutilCheckCallback fix","sha":"f7dcaa4a683895e068d26b38cc944208720c3402"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-05T06:38:58Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-05T06:38:58Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Regression fix #2029 (#2030)","sha":"8ff155a2c9c63e449bf1bb3345c15ee583dda3a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-07-31T21:01:31Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-05T15:54:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Move index pointer generation in rsx::thread.","sha":"7a6f5b6ee554756bb763e0699971afd89d8e57ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-05T16:08:03Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-05T16:08:03Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2021 from vlj/rsx-refactor\n\nrsx: Move index pointer generation in rsx::thread","sha":"98f09e4f27b74557e637519510c1946acea35d0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-05T16:49:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-05T17:59:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fmt/Log fixes","sha":"d646fbb94fcc81a1e642b9e6792ef3bac1ec8bf3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-04T17:59:50Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-05T21:33:40Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Use a \"draw clause\" object in rsx_state.","sha":"eb1d4811de22397250653526df3b60409ff28cbf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-05T21:48:48Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-05T21:48:48Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2033 from vlj/rsx-refactor\n\nrsx: Use a \"draw clause\" object in rsx_state.","sha":"247c776a1bc2e9f83335b590d511d077c17124d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-05T21:58:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-05T22:25:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: Returns u32 instead of size_t for get_index_count/type_size","sha":"fb479459308de451ddfaec85904ad1c197da182a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-05T22:51:23Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-05T22:51:23Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2034 from vlj/rsx-refactor\n\nrsx: Returns u32 instead of size_t for get_index_count/type_size","sha":"b61ac15c47e63f7473706789a2830b2a365db264"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T10:25:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T10:39:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fmt fix","sha":"3cd2f735a7be622cf8b5bf7be0717c79df82efb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T10:35:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T10:39:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM fix","sha":"c9a789bf762fb59c1723ad776513f9aa1bc39bd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T10:38:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T10:39:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Error loading image fix","sha":"7be259217a8802c827d866e911633ef5a6b3609c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T12:09:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T12:09:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve fatal error report","sha":"9245308ff2f4c96c3052e457f474ea60a6a79b46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T12:40:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T12:40:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Increase XAudio thread priority","sha":"4de513eb0147d050bbadeaf0b49300279eae0a2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T13:21:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T13:21:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Specify XAudio sample rate and ch num","sha":"0fcbd43db99ee70dd20b03ef38b1b8f88ea86aa3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T15:19:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-06T15:19:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"XAudio2.7 bug workaround","sha":"b7eda71673690214dbe5c49fe1e4003909f607b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-07T11:39:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-07T11:39:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Gui log bugfix","sha":"4438163da194fc3260b4bb67ff430827e8925706"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-07T13:59:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-07T14:05:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fmt_unveil<> fix","sha":"1a7ea2d235e71b7c421c277e7a42e8c04ba204ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-07T14:06:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-07T14:06:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"multicast<> rewritten","sha":"71441819e55aff688a7b4b300c50b6395c1d5d24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-07T19:01:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-08T13:29:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"New bitsets (experimental)","sha":"46735d6b3da32602c315ddaa46ff9b14667be84a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-08T16:01:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-08T16:19:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"EXCEPTION macro removed\n\nfmt::throw_exception<> implemented\n::narrow improved\nMinor fixes","sha":"a7e808b35bca478e3bbb848ae440a46b8b302fb2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-08-09T00:47:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-09T00:47:42Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"vk: delay texture removal when cache is clobbered (#2045)","sha":"44ae306e6b2752d2e12a9d30128baf6b743f423f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-09T07:55:11Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-09T07:55:11Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"XAudio : reorder versioning 2.9>2.7>2.8 (#2048)","sha":"009ac37a7d35a86ba4adc6f93952008cf9e27225"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-09T14:14:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-09T14:14:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cpu_type removed, system_type added\n\ncpu_state -> cpu_flag\nvm::stack_allocator template improved\nppu_cmd type changed to enum, cmd64 type added","sha":"bdeccd889f2cb1f8c971a187e66cf2e2f91b320b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-10T10:09:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-10T10:09:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: minor fixes (JIT.cpp)","sha":"912072e60cd4fc5d2e8353b1a8d3823c5205e356"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-10T11:17:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-10T11:17:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Error report fix","sha":"130f7905bac69cf7cbad6c96a93aeaaea3737106"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-10T12:48:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-10T13:12:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"bts/btr/btc support improved","sha":"8c8242345e81a224aa0a8014827c66b5755e915f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-10T23:29:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-11T13:47:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::ptr<char> formatting","sha":"fc56e70172e4cb38f1de0ed1676f7e56ae9289bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-09T18:16:47Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-11T17:47:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Add optional files.","sha":"c382ce52602b6ee154fad02bb5e229e86aaba645"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-04T21:21:45Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-11T17:47:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"vk: refactor VKVertexBuffers.","sha":"a94b9d38b036f2eff911b723eaf2152cf1ed6676"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-10T14:52:35Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-11T17:47:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"gl: Refactor vertex_buffer.cpp","sha":"b8721b64758cc1ce6a2df5365cb0bf10461dd166"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-10T19:43:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-11T17:47:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: remove vertex_draw_count","sha":"619d605a9e09fa4a438706dbc5d351ba3ef8c167"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-11T18:20:07Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-11T18:20:07Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2037 from vlj/rsx-refactor\n\nRsx: Remove vertex_draw_count (WIP)","sha":"65fe9b0927ff6c3931e26d35b75cf75d3311395a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-12T11:32:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-12T11:32:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":".clang-format added","sha":"1fd8c50d9506c0478d9cfb020b2d9c8a16c4773f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-12T14:13:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-12T14:13:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":".editorconfig added","sha":"f0459e389129486de36afea35c704ceeafbf154e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-12T16:24:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-12T16:31:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silly macro removed","sha":"7a2802a5e088e73420297fb31a734522bcffe1aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-12T19:33:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-12T20:45:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"XAudio2.8+ fix","sha":"2d512121f1145cdc40f007c35b78f6e7c67250f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-13T13:36:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-14T15:07:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Type hacks removed","sha":"949200cd3e5a0bfdd45607df7dcda75d463abea1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-13T14:58:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-14T15:07:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cpu_init removed","sha":"5e0489dcc0bc04f76011866157a8ce0851068d98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-14T00:22:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-14T15:19:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silly macro removed-2","sha":"0f87c4485d7002062fd7f357585f47ecc36881eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-14T17:22:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-14T17:28:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"New narrow() implementation","sha":"b0f5796c90fac4e19442f75e75739e79dc76e71b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-14T19:41:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-14T19:41:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ENSURES usage removed","sha":"1f3433464cc997d5746f286855a575abf22e6328"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-14T21:04:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-14T21:04:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LOG macro improved","sha":"cc46f2d7e6a7754241bf8ab4956391ff47b73cd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T00:11:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T00:13:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VERIFY macro removed","sha":"05fb57baffec26b8a779c162492a3cdfc79c5819"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T10:18:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T11:59:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"verify() fix","sha":"56b9b38c9c67241e91650d1ec0b5150c6633f08e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T13:29:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T13:29:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"EXPECTS usage removed","sha":"84d0d396ed973586d168f09aa787e181d7ba4012"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T13:57:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T13:57:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"%p fmt fix","sha":"dafb6b5c92692bc13e7f994fd86adc3c642c4f22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T14:11:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T14:11:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"WRAP_EXPR macro removed","sha":"dbcb5df1722a7df20039bd226facd5d30039ee14"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T15:30:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T15:30:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silly macro removed-3","sha":"3c82e1a58dca1df8c81fdc4652ff8b1fd29902fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T16:18:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-15T16:18:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ERROR_CODE macro removed","sha":"1c33c012ad0d359ecfccdab23fbd5dd60f1ba896"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-16T15:46:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-16T15:57:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"error_code implemented\n\nReports based on formatting system\nppu_error_code removed\narm_error_code removed","sha":"ad174eb12c89d76c8f16981994165391d1b56ff6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-17T16:50:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-17T16:50:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fixes\n\ncellSyncMutexTryLock fixed","sha":"bbb0effe237cba3291b5b6dc26160f0785914a9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-17T18:59:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-17T18:59:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellGameCreateGameData fixed\n\ncellGameDataCheck fixed\nPARAM.SFO creation fixed","sha":"066e3006bffa927ccd4078a4edfde3708c963df4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-18T10:27:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-18T10:29:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor diagnostic added","sha":"c20756136a74fa14afb3990460c67ecbd083876b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-18T12:14:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-18T12:14:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs::dir improved\n\nFindFirstFileExW used\nImmediate directory read","sha":"e3bc2273d31591c689b98d24fcdfcac6bb4a58d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-20T13:27:50Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-20T13:27:50Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Workaround id_min/max (#2079)","sha":"be9cebbc8f3abcf240c7518646dc165814fe9218"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-21T10:18:26Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-21T10:18:26Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Vulkan : Ignore clear if surface target is set to CELL_GCM_SURFACE_TARGET_NONE (#2081)","sha":"e04de77f821be1fcce6a1b01fffab5088c8ef8d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-22T15:14:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-22T15:14:32Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Vulkan: set ColorBlendState info (used by logicOp) (#2080)\n\n* Vulkan: set ColorBlendState info (used by logicOp)\r\n\r\n* fix attachmentCount","sha":"707523c67938ef42f266afb144303202d345f642"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-23T00:24:22Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-23T00:24:22Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Vulkan : refine 2-sided lighting approach (#2083)","sha":"d7a899f98431249f2cefa6fc344862070fcfe995"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-23T03:06:01Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-23T03:06:01Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"DX12: fix invalid dimension (#2086)\n\nDX12: workaround invalid texture dimension","sha":"51bdf1e3ed6565ceef9a657de4b1b68d088c098e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-23T08:18:58Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-23T08:18:58Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"RSX: fix wrong format 0x9c (#2087)","sha":"af1ff4439dd3e236e3927dd2e2b894dabe9a4707"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-23T11:07:51Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-23T11:07:51Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Vulkan : add structure type for color blend state (#2091)","sha":"2aa2c1811f902fdb97e70f2e0d47226775918ec1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-23T18:08:05Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-23T18:08:05Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"RSX: fix invalid format (0x1) (#2088)","sha":"12099b314488652bcf7f6140eece0a7dc4516005"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-08-24T00:50:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-24T00:50:07Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"vk/rsx: Bug fixes (#2092)\n\n* vk: fix separate front and back lighting\r\n\r\n* vk: Inlined arrays can have emulated primitives too!\r\n\r\n* vk: Use float input attribs for better compatibility\r\n\r\n* vk: Free resources during shutdown","sha":"9beb2d8ae09aa291480808fa5c0b9f8070eea1ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-08-24T09:31:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-24T09:31:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"gl: Dont use hard assertions on error, driver reporting is so much better (#2094)","sha":"8ebe9d7dc2fbea94d1f990f80c09470ff9691887"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-24T13:19:16Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-24T13:19:16Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"GL: ignore texture upload if invalid dimension found (#2097)","sha":"5b225ad59f4fdd7bec733abb2e3bf0d5e285d7b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-20T14:59:15Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-24T19:58:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"Add variant.hpp from mapbox","sha":"c24fba89e83b4576b707d25addcb5e83c174bf45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-21T17:17:09Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-24T19:58:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"Vincent Lejeune"},"msg":"rsx: use range for vertex buffer attribute.","sha":"42b518cf7e4ade403bc5b8f33d53639ecd23ea6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-25T19:14:51Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-25T19:14:51Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2084 from vlj/rsx-refactor\n\nRSX: Puts vertex buffer in array and in register in a variant type.","sha":"7f3cb4d3c987c06debc85ef2adb20f88440e12a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-26T14:23:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-26T14:23:23Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"GL: re-use common fp/vp decompiler (#2100)","sha":"a270ac7f021c5f43f9c385f45f2ca55ede330594"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-26T16:26:23Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-26T16:26:23Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"GL: enable 2-sided lighting (#2103)","sha":"6e07e07cd0d2ad38db305b12baa58958cba7671f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-08-27T06:12:44Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-27T06:12:44Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"GL: minor fixes (#2105)\n\n* Minor fixes\r\n\r\n* temporary disable 2-sided lighting\r\n\r\n* Disable user clip planes until they are properly handled","sha":"bb66b972517761044e8401c1c0871c15ec08b749"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-26T13:34:28Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-27T13:40:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Add a git pre-commit hook running clang-format","sha":"1ede5cbc4cd61217acaf1af4d6e507770fc4a3d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-26T13:45:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-27T13:40:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"rsx: Remove some unused code.","sha":"a64053fd684cd910464dfe83ec764e2278963698"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-26T13:46:44Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-27T13:40:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"rsx: Vertex array attributes don't need to be stored outside of regs.","sha":"11858dce1a5173107e13dae8d4bbd3df216ebec6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-26T14:30:04Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-27T13:40:41Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Remove settings UI change that accidently slipped in.","sha":"73e50b970d8c06a4ed456f43d03e6ab3fa5804c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-27T16:21:16Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-08-27T16:21:16Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2101 from vlj/rsx-refactor\n\nRsx refactor: Some cleanups","sha":"c0ab0dee6b638be270e167ccd918b74d908a4e59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-28T09:35:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-28T09:35:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":".clang-format restored","sha":"5f15c661c606e66eb86a148c9c8111f074e3eb5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-04T06:36:37Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-04T06:36:37Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"RSX: fix unknown vertex base type (#2120)","sha":"ebf54d6acdce7b0f33153810c8eca7ccb11f54d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-04T07:23:43Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-04T07:23:43Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"RSX: fix wrong format 0x9b (#2121)","sha":"691d87978bac7c2f316a56d53a340710e2202063"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-04T10:29:21Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-04T10:29:21Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Revert \"RSX: fix unknown vertex base type\" (#2122)","sha":"ad396151410c6d7e6785e1efe57adf686796770b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-05T00:47:45Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-05T00:47:45Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"DX12: Align to multiple of 4 block for DXTC format (#2125)","sha":"03a5b5be1af6727faf8109e2a7d060d76f564926"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-06T01:43:27Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-06T01:43:27Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Vulkan: enable cull face again (#2124)\n\n* Vulkan: enable cull face again\r\n\r\n* minor fix","sha":"d4a55f4b06dbb7d49c6b9f8bc90827bd365cdbc5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-07T01:26:01Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-07T01:26:01Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"DX12: temporary disable vertex base index check (#2128)","sha":"fc3179b698ef50b73f3319d9a49ec4778355d4ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-11T21:35:26Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-11T22:20:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"d3d12: Always set transform constant when debug output is enabled.","sha":"153f1cc50a0c511f9ce5634d897d16f065db1324"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-11T21:36:58Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-11T22:20:10Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"d3d12: Fix a potential race condition.","sha":"30b804e0bc7ca2609e91be6f9640f6edcf892334"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-11T22:05:14Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-11T22:20:11Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"d3d12: CMP vertex format has 4 members.\n\nFix 1878","sha":"14205d3d1cf3822ebbd86de1f2151f3b8f305e26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-12T18:38:56Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-12T18:38:56Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2134 from vlj/dx12-fix\n\nDx12 fixes","sha":"d43edb19d2dc90c569262ec499f749d0d5b861c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2016-09-12T23:28:34Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-09-12T23:28:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixed NV4097_SET_COLOR_CLEAR_VALUE (#2135)","sha":"e73fce2d6024468f201db588992f77940c1ee0b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2016-09-14T14:47:53Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-14T14:47:53Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Fixed fog and alphakill implementation in glsl (based on DH's old commits) (#2137)\n\n* Fixed NV4097_SET_COLOR_CLEAR_VALUE\r\n\r\n* Fixed fog and alphakill implementation in glsl (based on DH's old commits)","sha":"153a2d2b40be98d74c37833868b1906556b2c18d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-27T17:12:24Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-17T21:37:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"Tweak clang-format","sha":"ce21db2ce3bfd71f55762b846685868456cd195c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-27T17:22:12Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-17T21:37:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"rsx: Move inline array to draw_clause structure.","sha":"03c86ae43b8461dfe2278c53a6bbc10e7fcff892"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-08-28T15:00:02Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-17T21:37:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"rsx: Use variant based draw commands.","sha":"8d54bcbc0dc1d13892308f49ae82e860cf6ee25f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-12T21:50:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-17T21:37:52Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"rsx: Dump DRAW_ARRAYS and DRAW_INDEX_ARRAYS.","sha":"f87e396958b5262e3d783cc477cbb4cf47b31c21"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-17T21:53:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-17T21:53:59Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2112 from vlj/rsx-refactor\n\nRsx refactor: Use variant for draw commands.","sha":"11a442272d7b28bbac04b611a4723a4ac50091ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-18T05:19:26Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-18T05:19:26Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"GL: old recompiler clean up (#2142)","sha":"530ea688e472b690ff5ec521ab223fc3621dd154"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-19T01:25:49Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-19T01:25:49Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"RSX texture refactor (#2144)","sha":"77f8ce503dbbd3d56fb37d3a341dc82796d6c943"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-09-20T14:23:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-20T14:23:56Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"gl/vk: Enable vertex texture fetch (#2127)\n\n* gl: Enable vertex textures\r\n\r\n* rsx: use textureLod instead of generic texture sample\r\n\r\n* rsx: handle uploading of W32_X32_Y32_Z32\r\n\r\n* gl: Re-enable proper shader logging\r\n\r\nremove old logging method that overwrites single file\r\n\r\n* gl: Declare texture_coord_scale for vertex samplers\r\n\r\n* gl: texture remap fixes; enable remap for vertex textures\r\n\r\n* gl: offset texture indices to base layer 16\r\n\r\n* rsx: Fix W32_Z32_Y32_X32_FLOAT subresource layout\r\n\r\n* vk: Enable vertex textures\r\n\r\n* rsx: define special calls for vertex texture fetch\r\n\r\n* gl: improved vertex texture fetch setup\r\n\r\n* vk: Fix texture formats and component mapping\r\n\r\n* vk: Implement vertex texture fetch functions properly\r\n\r\n* vk/gl: proper fix for primitive restart index\r\n\r\nrevert inadvertent decompiler update\r\n\r\n* gl: Disable filtering for vertex textures","sha":"867e9210d78ae8887f057d5fc9d6d6e5e05a51bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2016-09-21T09:34:38Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-21T09:34:38Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Hopefully fix appveyor build (#2148)","sha":"0b080aeefcde77dfb509a9c8e7c96b358cd292cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-09-21T13:41:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-21T13:41:29Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"GL/Vulkan: Bug fixes and improvements; alphakill for vulkan (#2146)\n\n* vk: Zero-initialize some more structs\r\n\r\n* gl: Clean up fragment program generation code\r\n\r\n* vk: Enable alpha kill\r\n\r\n* vk: Fix surface clear; redirect output for surface_type:b\r\n\r\n* vk: Tie renderpass to program object to avoid incompatible passes","sha":"0d207a6c0d4754ed468a90a4a0ca93936a24f948"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-09-22T08:06:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-22T08:06:57Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"vk: Properly compute descriptor pool size (#2150)","sha":"66e57ae19b78af75fca86265a1b267433515fc26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-17T22:43:20Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-22T13:44:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"rsx: vertex attribute size is 1 again for CMP, let backend handles this formats properties.","sha":"6b7ce373746fbbd2e0b86839c7f05ca012cd2b9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-17T22:40:42Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-22T13:44:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"rsx: Set default attribute format to float.","sha":"8f5e94c1551e96c207854805ff35e2583e2d8ccb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-19T14:17:37Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-22T13:44:59Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"msg":"rsx: Move printing function in a separate header/cpp","sha":"9ff52cf063de695435842aaaa7cb56f5195710c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6413475?v=4","date":"2016-09-22T14:25:33Z","email":"vljn.ovi@gmail.com","login":"vlj","name":"vlj"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-22T14:25:33Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2140 from vlj/rsx-refactor\n\nRsx refactor","sha":"623ddd966cb278f2c0458faa02e95d1eb29448d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2016-09-24T10:21:41Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-24T10:21:41Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Porting of DH's user clip implementation in gl (#2139)\n\n* Porting of DH's user clip implementation in gl\r\n\r\n* Tweak clang-format\r\n\r\n* rsx: Move inline array to draw_clause structure.\r\n\r\n* rsx: Use variant based draw commands.\r\n\r\n* rsx: Dump DRAW_ARRAYS and DRAW_INDEX_ARRAYS.\r\n\r\n* GL: old recompiler clean up (#2142)\r\n\r\n* RSX texture refactor (#2144)\r\n\r\n* gl/vk: Enable vertex texture fetch (#2127)\r\n\r\n* gl: Enable vertex textures\r\n\r\n* rsx: use textureLod instead of generic texture sample\r\n\r\n* rsx: handle uploading of W32_X32_Y32_Z32\r\n\r\n* gl: Re-enable proper shader logging\r\n\r\nremove old logging method that overwrites single file\r\n\r\n* gl: Declare texture_coord_scale for vertex samplers\r\n\r\n* gl: texture remap fixes; enable remap for vertex textures\r\n\r\n* gl: offset texture indices to base layer 16\r\n\r\n* rsx: Fix W32_Z32_Y32_X32_FLOAT subresource layout\r\n\r\n* vk: Enable vertex textures\r\n\r\n* rsx: define special calls for vertex texture fetch\r\n\r\n* gl: improved vertex texture fetch setup\r\n\r\n* vk: Fix texture formats and component mapping\r\n\r\n* vk: Implement vertex texture fetch functions properly\r\n\r\n* vk/gl: proper fix for primitive restart index\r\n\r\nrevert inadvertent decompiler update\r\n\r\n* gl: Disable filtering for vertex textures\r\n\r\n* Hopefully fix appveyor build (#2148)\r\n\r\n* GL/Vulkan: Bug fixes and improvements; alphakill for vulkan (#2146)\r\n\r\n* vk: Zero-initialize some more structs\r\n\r\n* gl: Clean up fragment program generation code\r\n\r\n* vk: Enable alpha kill\r\n\r\n* vk: Fix surface clear; redirect output for surface_type:b\r\n\r\n* vk: Tie renderpass to program object to avoid incompatible passes\r\n\r\n* vk: Properly compute descriptor pool size (#2150)\r\n\r\n* rsx: Set default attribute format to float.\r\n\r\n* rsx: vertex attribute size is 1 again for CMP, let backend handles this formats properties.\r\n\r\n* rsx: Move printing function in a separate header/cpp\r\n\r\n* Porting of DH's user clip implementation in gl","sha":"b72f6da853482d7756f19718fa13be0f25b4e984"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-25T08:53:57Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-25T08:53:57Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Typo fix (#2153)","sha":"fcb853792d5f535271bce638f8ea47fa3a6b8c1c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-26T10:38:52Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-26T10:38:52Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"DX12: enable alpha kill (#2158)","sha":"38f35df7b6510cbe1c15694d3d4053c803ce9fd3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-09-26T12:21:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-26T12:21:17Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"gl/vk: Bug fixes and improvements (#2155)\n\n* gl: Fix broken buffer reserve computation\r\n\r\n* gl: Texture format fixes\r\n\r\n* gl: Two sided lighting\r\n\r\n* gl: Always update glsl output registers\r\n\r\n* gl: Simplify vertex input declaration\r\n\r\n* vk: Always write output registers\r\n\r\n* vk/gl: swizzle component read on depth textures\r\n\r\n* gl/vk: Use proper MVP matrix\r\n\r\ngl: fix broken mvp when window_origin=top\r\n\r\n* vk/gl: Move fragment operations block into the proxy function","sha":"7884356e90ebd443b1f527516ec7d2bef5ad5be3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-26T13:59:38Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-09-26T13:59:38Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"GL/Vulkan: not discard fragment when hits NEVER comparsion (#2156)\n\nGL/Vulkan: return no operation when comparison is never","sha":"528b2d6c7b00019617192a6ea8ca1711397458ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-09-27T07:34:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-27T07:34:01Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"gl: Reverse cull face when origin == top (#2161)","sha":"4f74cbe5103b83cb88a9d03433bd312a7ce4c27a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-09-27T09:54:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-27T23:22:45Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"gl/vk: Flip wpos if origin != top","sha":"38562155d43e37c51dd899574885e5fb1b7429c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-09-28T14:12:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-28T14:12:52Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"vk: Add a subpass dependancy (#2172)","sha":"9abb908226b1fc381f9a8c7dc8e476a58e8fa1fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-09-29T06:54:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-29T06:54:32Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"rsx/gl/vk/dx12: Add emulated texture fetch for depth read (#2173)\n\n* rsx/gl/vk/dx12: Add emulated texture fetch for depth read\r\n\r\ngl/vk/dx12: Simplify reinterpretation equation\r\n\r\n* gl: Remove unnecessary re-swizzle\r\n\r\n* glsl: explicitly cast uint to float","sha":"5430e1d31089eab725b61b4896355f051ec79292"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-09-29T07:16:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-09-29T07:16:00Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"gl/vk: Vertex attribute uploading and texture swizzle fixes (#2174)\n\n* gl/vk: Properly upload vertex attributes\r\n\r\n* vk: Fix cmp type\r\n\r\n* vk: Remap all texture formats","sha":"1c9718389fa163a35863745dd448e288df6b4674"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-09-30T21:59:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-09-30T22:21:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Paypal link removed","sha":"a342107021f56a8812a7256d5951a33443b9cb7a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-10-01T09:02:10Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-10-01T09:02:10Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Vulkan: fix G8B8 texture swizzle (#2181)","sha":"44b8556dc61592bb4c9f4e1e71025ae26c52b72d"}
+{"author":{"avatar":null,"date":"2016-10-01T19:13:15Z","email":"alegend45@gmail.com","login":null,"name":"Melissa Goad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-10-01T19:13:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Revamp PFIFO command submission emulation (#2179)","sha":"22b14000184c2a78b29e1b3478cfd9993b37535c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-10-04T13:51:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-10-04T13:51:40Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"gl/vk/dx12: Fix depth reconstruction bug; Fix sampler parameters (#2188)\n\nvulkan: Fix duplicated code bug\r\n\r\nfix rebase","sha":"7a9841bb2a1d703fd9269adda9e02f6ac4686de3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-10-11T00:55:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-10-11T00:55:42Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"gl/vk/rsx: Add a cross-platform overlay text; Minor perf improvements and rsx bugfixes (#2196)\n\n* gl/rsx: Implement platform-agnostic text overlays\r\n\r\ngl: Restore performance metrics using new text out helper\r\n\r\ngl/rsx: Refactor text generation class\r\n\r\n* vk: Enable text overlay\r\n\r\ngl/vk: Polish overlay counters implementation\r\n\r\ngl: Better resource shutdown for text writer\r\n\r\n* gl: Optimization, do not rebind TIUs every frame. Speedup\r\n\r\n* gl: Optimizations and improvements to vertex upload code\r\n\r\n* gl/vk: Texture format swizzles\r\n\r\nvk: Texture format fix\r\n\r\nvk: Fix YX format swizzles\r\n\r\n* rsx: Decode vertex texture index","sha":"8454949eea9d0fc9da55b719e9a02f5a022fd5f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-10-18T07:57:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-10-18T07:57:28Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"gl/vk: Bug fixes and improvements (#2206)\n\n* gl: Only bind attrib textures on thread startup\r\n\r\n* gl: Persistent mapped buffers\r\n\r\n* gl: Fix emulated primitives in an inlined array\r\n\r\n* gl: Do not re-update program information every draw call\r\n\r\n* gl/vk: s1 type is signed normalized not unsigned normalized\r\n\r\n* gl/rsx: Allow disabling of persistent buffers for debugging\r\n\r\ngl: Large heap size is more practical\r\n\r\ngl: Fix a bug with legacy opengl buffers\r\n\r\n* gl/rsx: Allow emulation of unsupported attribute formats\r\n\r\n* gl: Fix typos and remove dprints\r\n\r\ngl: cleanup debug prints\r\n\r\n* ui: Move the GL legacy buffer toggle to the left pane\r\n\r\n* vk/gl: Fix cmp type, its range is [-1,1] not [0,1] SNORM_INT","sha":"2c803dbe66cf0c94f835e918a5ea1c9ec56c39cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7020805?v=4","date":"2016-10-19T13:21:45Z","email":"yishuai@cis.upenn.edu","login":"liyishuai","name":"Yishuai Li"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-10-20T00:42:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fix type conflict with macOS (#2157)","sha":"80a9abcfc8bbe5900377af074f7681b3ff054909"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-10-20T03:20:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2016-10-20T03:20:45Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"gl: Disable overlay if required extension is not supported (#2212)","sha":"973bf5abdfe821b33963b712d00c92f3742cdf23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-12-02T10:40:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-12-02T18:16:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add \"License\" section","sha":"b6bd02daf098ac0e6e3b1e966188e8d3ccb4f776"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-12-02T10:53:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-12-02T18:16:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Relicense sceVideodec.h","sha":"684089ba816a2104787472c93a327433e24bd0ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9118023?v=4","date":"2016-12-05T17:35:05Z","email":"153277@niuitmo.ru","login":"itmo153277","name":"itmo153277"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/9118023?v=4","date":"2016-12-05T17:35:05Z","email":"153277@niuitmo.ru","login":"itmo153277","name":"itmo153277"},"msg":"Allow UE3 games to startup","sha":"124f5d0097f1e4efe42d39d248c4d657bbb459b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9118023?v=4","date":"2016-12-05T18:47:23Z","email":"153277@niuitmo.ru","login":"itmo153277","name":"Viktor Ivanov"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-12-05T18:47:23Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Log call to cellGameDataGetSizeKB","sha":"1a4b5413bd9550d7a35d2085a17a20737b5bd9f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-12-15T11:34:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-12-15T11:34:30Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2234 from itmo153277/master\n\nAllow UE3 games to startup","sha":"9cbecbd8cbec12e0d74bb84df56ca4ea90507e6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-10-21T12:38:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-12-15T11:36:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Decode dxt textures to a staging buffer","sha":"a1e725ffeb3ac092b4086532140b106d3c687580"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-12-15T10:31:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-12-15T11:36:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vs: decode sca ops after vec ops","sha":"fb5df3299091bd7ed8fe3829b0e5fbf724e1e199"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2016-12-15T17:26:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2016-12-15T17:26:13Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2237 from kd-11/gl_rsx_wip\n\nRSX/GL: Fix common vertex program decompiler bug; fix broken dxt mipmaps on openGL","sha":"9e84804eb0ce1fca9860e289e35bb0bb5f0ce8cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2016-12-20T23:47:08Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-12-30T11:27:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Check if gcc version is below 5.1 or equal to 6.1\n\nOutputs a fatal_error if a version of gcc below 5.1 or 6.1 is being used.\r\n#2236","sha":"2d9e02b0a7912527c4e12a0904afd3993e3ee49b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-01-18T13:57:50Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"AnnieL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-18T15:23:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update LLVM on Travis\n\nShould fix the issue with Travis (No available formula with the name \"llvm36\"). \r\nWe're using 3.8 so there's no reason for Travis to use 3.6.","sha":"b4c77afdc4ea6c4f66923b0bac19c1efd34567da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11020872?v=4","date":"2017-01-18T22:01:25Z","email":"chralf@kth.se","login":"al0xf","name":"al0xf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-18T22:01:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub cellOsk (#2264)\n\n* Stub cellOsk\r\n\r\nReturns the word \"rpcs3\" as OSK input for now. Tested and working in\r\nTerraria, Nier, and some homebrew. The next step would be to hook it up\r\nto the GUI so the user can enter any text.\r\n\r\n* Fix commit\r\n\r\n* Fix formatting\r\n\r\n* cellOsk improvements\r\n\r\n* cellOsk improvements","sha":"f2ba41af468cfbd09683b78b5cb6689b7f4a3726"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2017-01-20T02:48:17Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-01-20T02:48:17Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Bind SET_POLYGON_STIPPLE_PATTERN (#2259)\n\nCauses MGS4 to boot a little bit further","sha":"435ef04c3400d7d057d17ded3518c823e52c02be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-21T11:57:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-01-21T11:57:23Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Update README.md (#2267)\n\nAdded discord server address\r\nAdded patreon link","sha":"f881282a8b6a7b8d26e2e6c8c3614de983050953"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-21T13:06:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-01-21T13:06:28Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PKG Installer fix (#2268)\n\nFix homebrew pkg","sha":"fbf82316421f27e1b6002af73f99fd1e6b9b53b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-21T20:40:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-01-21T20:40:37Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"LLVM fix (skylake) (#2269)","sha":"fb56c14853ae9bb499d3d5283d45eeb218474214"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-22T10:46:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-22T15:50:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"is_leaf_function fix (Linux)","sha":"7a356d329421332128d8fec97860c868f299d598"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-22T14:57:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-22T15:50:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Linux build fix + instructions","sha":"6cf006b02bd3f5ceab48f5ae7a320d394d591d26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-22T19:03:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-22T19:44:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"LLVM: progress dialog","sha":"78ecb115f3d1298c7c2b4a64b5dab69270d2318c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11020872?v=4","date":"2017-01-23T17:14:12Z","email":"chralf@kth.se","login":"al0xf","name":"al0xf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-23T17:14:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add OSK GUI (#2275)\n\n* Initial commit of OSK GUI\r\n\r\nAlso handles character encoding, you can for instance input in Chinese.\r\n\r\n* Fixes for osk gui","sha":"aa357b9ae8e73b40793dbbd8f5a68d6b871bb432"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-23T18:11:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-23T18:25:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellOskDialog fix","sha":"d07ea314004300f987aa437e9261f1bf166670e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2017-01-23T18:45:37Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-23T20:49:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"VP decompiler: fixed condition update flags using","sha":"07a366b608bb7f0baded005b7918c1570139e367"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2017-01-23T18:53:14Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-23T20:49:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GL: fixed user clip implementation","sha":"6b48a72d4263fcde78decffe91ce718b8f59a0d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2017-01-23T18:59:54Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-23T20:49:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Added missing stencil op","sha":"778199ceb1c88bf15b6d9c20178e311c4f3d7720"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2017-01-23T19:11:59Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-23T20:49:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Seems like sfunc and zfunc comparison constants used by NV4097_SET_DEPTH_FUNC and NV4097_SET_STENCIL_FUNC","sha":"8318eed0685e3886d9a99351caa3fd79d0f85de0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-23T21:56:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-01-23T21:56:27Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fixes (#2279)\n\nFixed appveyor icon\r\nPPUAnalyser fix\r\nOSK dialog fix","sha":"46dde3f8f7270d5407eb6186b48f2f917f23400f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-23T23:04:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-24T21:38:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Test","sha":"8ad31d25593de1342d4559558156009d97a7c195"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-24T13:52:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-24T21:38:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"util::dynamic_import\n\nFutex implementation","sha":"98fc131d477d71748802f213d02e5f1d64eb5255"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-24T20:19:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-24T21:38:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"New shared_mutex\n\nExperimental sync utils\nNew semaphore<>\nNew cond_variable\nNew owned_mutex","sha":"1c14d872a852ae7cd5c9281dc14de8077b4d65a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-24T23:22:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-25T01:43:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor changes","sha":"9232ddf0ab53e38dde32968c943ed902d7bba9fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-25T00:45:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-25T01:43:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"IdManager sugar","sha":"a06223b844dbc3b9baa6ce79e023245416fd6bbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-01-25T17:32:55Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-25T17:32:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix corect number branch release llvm (#2285)","sha":"6c189511af23f1de413cc6f776aedcd9bac9bd64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-25T17:50:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-25T20:29:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"IdManager improved","sha":"591a6c86719b6f4e7a2a0301f676e4d5a0513691"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T01:03:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T01:22:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"IdManager fix","sha":"ee173dc3a21e61771eadc048dc71c5fa725c4814"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T01:12:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T01:22:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"lv2_fs_object fix","sha":"5db0f477106f1d07bd446b8fcb56c732cfe2a80a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T10:46:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T17:01:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"MFVSCR error removed","sha":"1705638e251d453e78ec70fe847dfcd16180dc81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T12:01:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T17:01:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellFsUtime implemented","sha":"4ecf05aa13867782f920fbfe8382747069c71201"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T14:51:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T17:01:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellVdecDecodeAu mode implemented","sha":"2bc87238242639e2982c997dda1a3fe7558e937d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T14:53:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T17:01:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellOskDialog fixes","sha":"33d2618e5bd7133f3f26681d4c119aa24b34f2fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T15:54:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T17:01:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellVdec: 2997/50 support","sha":"bdca52a95d71b198739aa1fb87625402bb29a903"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2017-01-23T16:41:47Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T21:38:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Un-malloc Crypto","sha":"fe23e0cc6e7bf8204991ac5f5f8dfc463474dc21"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-01-27T01:17:31Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-27T14:27:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Register missing cellSysutil and sysPrxForUser function.","sha":"b6f8eface7e4033861bd8273845e004a79eaddee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-01-27T17:17:34Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-27T17:17:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sceNp: Register missing functions (#2291)\n\nRegisters missing named functions exported from sceNp on firmware 4.76","sha":"5e8852af805876594e4d37febce1d5cef8023106"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1690697?v=4","date":"2017-01-27T22:52:43Z","email":"rymg19@gmail.com","login":"refi64","name":"Ryan Gonzalez"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-28T00:20:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add logic_set support to VKGSRender","sha":"b644d5b2ae4d25494c225fe51d003cb267be5d28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-26T21:34:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-28T00:21:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellVdec: minor fix","sha":"8693031b063fd7c7b17572a721181c9c69055a6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-27T17:46:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-28T00:21:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vcxproj fix","sha":"e32c49c12c3aea85aa0a504d50470db679b0a056"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-08-19T21:14:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-28T00:21:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fixes","sha":"df6607e2367f182505e35f67ceaa0501c83b5d4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-27T23:42:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-28T00:21:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellAudio fix","sha":"5ee0cea672054e14a1924d98d95adc8b11cf688d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-28T00:19:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-28T00:21:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"FPS counter fix","sha":"44b2df27eaab4bd114bd44c99aae03203fa912d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-28T10:11:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-28T10:11:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixed fs::file::open","sha":"307da1fe399fe79114f412fec1cd0275a0602c0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-28T12:32:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-28T12:32:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Debug build fix","sha":"d4c390535579fa2fc6c82c37e4d737925d8d3fea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-28T14:59:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-28T14:59:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"IdManager bugfixed","sha":"4203f53b6727b69b676c7845d2269f2a03bc8da9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1690697?v=4","date":"2017-01-28T23:00:49Z","email":"rymg19@gmail.com","login":"refi64","name":"Ryan Gonzalez"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-29T00:07:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Switch to always using a steady clock (closes #2200)","sha":"11e2965b5c361c0b0de683926275026f053e4153"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-01-29T05:21:58Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-01-29T05:21:58Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"fix osk dialog (#2302)","sha":"da878c36bd6b0f4240cf60461000ca4276c5ada2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2016-09-06T22:38:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-29T16:52:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Thread.cpp refinement\n\nHide thread mutex\nSafe notify() method\nOther refactoring","sha":"a5a2d43d7cae6af3721dc6100bcb8990d8a23a21"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-29T00:12:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-29T16:52:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"replace high_resolution_clock","sha":"be8d8ded3febe473361f81786932e78cd84b4a82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-29T16:50:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-29T18:37:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"IdManager improved\n\nlv2_obj for kernel objects\nSimple lookup (vector)\nAnother idm API refactoring","sha":"b21fce4d6f8062e0abd4ea9fe762dc940088c8c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-29T19:52:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-29T19:52:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix #2300","sha":"aef5113d4952166e726c76233cf2c9837b77beb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-29T22:50:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-29T22:50:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellVdec mem limit","sha":"c733d0352574f57cb97c7361c8c8b72c50cbf7df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-01-30T22:16:47Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-30T22:16:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Misc changes (#2309)\n\nAppVeyor: Improve artifact name\r\nTravis: Update notification email\r\nREADME: Fix forum link and remove coveralls\r\nsceNp2: Use UNIMPLEMENTED_FUNC macro instead of fmt::throw_exception\r\nVK: Fix pathing for linux\r\nAboutDialog: Fix forum link","sha":"35b7cf4c98e9966ecf4d174af2b9dbfba72d7009"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-31T12:57:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-31T12:57:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"IdManager fix","sha":"6433eebe1e6c1c941747adfe39b6fdb8e0b01f2b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-01-30T23:52:49Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-01-31T13:37:31Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"msg":"rsx: Fix error context dma","sha":"bd6a7dea7ed4a0be61b7f0fcc638fa5b7e7a81d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-01-31T14:09:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-01-31T14:09:46Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2312 from Zangetsu38/d3d12\n\nrsx: Add support for CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER","sha":"16d1577722c475783d0edf28c42278fa006d102f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-30T13:20:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-31T15:03:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_ppu\n\nLV2_LOCK removal\nerror_code introduction","sha":"dc7ac22f84292658605ec717c92c948c9a3a1027"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-30T23:09:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-31T16:36:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_semaphore...","sha":"213527ca714b56a355a3810cc5ea0bb34302ce5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-31T17:37:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-31T17:37:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"#2314 fix","sha":"b7a7a5c58221f1377f434c15d10a53934ebeaae6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-02-01T04:37:59Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-02-01T04:37:59Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Add Patreon link on about dialog (#2310)","sha":"13493ec0515c6c230c7f34dad718380fec3e851d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2581838?v=4","date":"2017-02-01T10:38:23Z","email":"george@moralis.gr","login":"gmoralis","name":"gmoralis"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-01T11:22:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"proper error code when file not found . This should fix issue #1923 at least bomberman works","sha":"9eba0ac58ce92140b3e24d2e6fa489ef3d69e480"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-02-02T17:36:07Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-02T18:15:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[O1L] cellVideoOut: X8B8G8R8 fix\n\nO1L's fix for cellVideoOut.","sha":"9916f0e5c5e13f735363ab3e9ef211b3152810e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16824659?v=4","date":"2017-02-02T23:10:16Z","email":"henrique_84@hotmail.com","login":"ikki84","name":"ikki84"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-02T23:10:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update ErrorCodes.h (#2332)","sha":"5aaee670d1075a243470bf39372b9efd25ccc941"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-02-03T08:20:23Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-03T08:20:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make RPCS3 compatible with QT5.8 (#2330)","sha":"3762f1e50d84dbdfd06f680c2b4de7389d7eaca3"}
+{"author":{"avatar":null,"date":"2017-02-03T16:34:21Z","email":"yukariin@yandex.ru","login":null,"name":"Yukarin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-03T18:15:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix rpcs3qt Linux build","sha":"fa6fd5980e1290e05822b8aeb34054ccbae2b239"}
+{"author":{"avatar":null,"date":"2017-02-03T17:19:10Z","email":"yukariin@yandex.ru","login":null,"name":"Yukarin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-03T18:15:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Files clean up","sha":"758f1bcdee4a54cb49fa148317cf83de2d4d5653"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2017-02-04T14:18:37Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T16:32:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implemented cellGcmSetDefaultCommandBufferAndSegmentWordSize","sha":"57ef6dae91c7236bffdcf8002d97895cfee6b756"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2017-02-04T14:23:37Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T16:32:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Set default values for NV4097_SET_SURFACE_FORMAT register","sha":"bf33a1827c8f85d79624ef0166a511a558ad1370"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2017-02-04T14:44:40Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"O1L"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T16:32:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GL: try to skip incorrectly prepared FBO's.","sha":"a809f33418ec41edccae0bc7a5bb93bbbe452a84"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-02T17:32:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T17:39:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"idm::check extended\n\nidm::check_unlocked\nidm::find_unlocked\nidm::get_unlocked","sha":"0674a5850226eb79f70153c95769ea5b1c2cc02d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-31T20:04:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T17:39:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_rwlock...","sha":"c4cc3ad81ec54646565d984745ca3ae18d573833"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-02T17:47:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T17:39:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_cond, sys_mutex","sha":"16944b0c4c4da0b1220a28275f696815e63f2729"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-02T23:16:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T17:39:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_lwcond, sys_lwmutex","sha":"3d85a89cc9fa8bf81633061f1239e8ac15cbe3be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-03T16:27:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T17:39:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_event_flag...","sha":"26ced19e185c7aa0efef36ae473ef4b60b719f7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-03T21:36:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T17:39:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_event_queue...","sha":"6537909fd2ebb8fe0600562d9998732ab307dcb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T14:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T17:39:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_timer...","sha":"e3e4decabf84067a480d8741aeecfde7261cb735"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T15:09:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T17:39:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"idm::last_id cleanup","sha":"fe26db4d363aaa4b0ef659d67579c421aaccef5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T16:30:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T17:39:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_interrupt...","sha":"68f0393cf37b2e32df7c8eeb92855a10dafc840d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T23:26:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-04T23:26:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_spu...","sha":"ec943b38a2f01ebd4252698e27f6bb1552b47a63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-05T00:06:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-05T00:06:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Report fixup","sha":"cb1f30e9d2f9b985a708058dc3819c34380f735c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-05T12:48:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-05T12:48:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_spu diag","sha":"11b0b6958ff2084745a8c39233efda3320ac2ec1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-05T12:49:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-05T12:49:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"16b atomic load fix","sha":"9767cc84b0f5d7bc5f775efbaffae40f18bbbe04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-05T13:07:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-05T13:07:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellHddGameGetSizeKB w/a","sha":"eebd48e51d1d3b23a2dd0d4f51532e10c6a6f746"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-05T13:35:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-05T13:35:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LV2_LOCK removed","sha":"bf6854d121c44b3c89c71828651857403cd72fc6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-05T14:06:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-05T14:35:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CHECK_EMU_STATUS removal","sha":"246b9f3182977db42ba9cc15abe4200dafe15914"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16824659?v=4","date":"2017-02-05T16:27:53Z","email":"henrique_84@hotmail.com","login":"ikki84","name":"ikki84"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-05T16:39:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellMusic.cpp Change Throw Exception into UNIMPLEMENTED_FUNC\n\nAlso return CELL_OK in function until the it become properly developed.","sha":"9b122e544985fea6bb1228395144a241b013319c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-02-06T07:59:22Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-06T09:34:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"D3D12: add missing logic set","sha":"f84b2f072f514403181a4e0f72e2b9b23befee72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16824659?v=4","date":"2017-02-07T10:00:19Z","email":"henrique_84@hotmail.com","login":"ikki84","name":"ikki84"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-07T10:00:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellMsgDialogOpen: Go further using cellMsgDialogOpen2. (#2345)\n\nNotes:\r\nNeeds proper implementation (!)\r\nThe functions shows similarities but the bits in argument \"type\" may vary a little.\r\nComparing both functions but testing in NPJA00014 I believe it could be acceptable until it be implemented properly\r\n\r\nFeel free to reject if it´s not allowed\r\n\r\nUpdate cellMsgDialog.cpp","sha":"05c4aa50176a94666b0e57542b676835088dafb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/13681488?v=4","date":"2017-02-07T12:28:19Z","email":"samsung-1@o2.pl","login":"SakataGintokiYT","name":"☠Emulator_Team☠"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-07T12:28:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Some changes (#2350)\n\ncellSysutilAvc2: Use UNIMPLEMENTED_FUNC macro instead of fmt::throw_exception.","sha":"8c4ba3257cd6f7820e3f29d100d94b199846c06c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-01-24T12:29:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-07T13:37:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor changes\n\nFix psv loader","sha":"ead67d8e670e1d2cda85863345f1c68b71ebee77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-07T13:14:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-07T13:37:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU fixes","sha":"47b4c649f12dca77269dbfe9df840b7bd5ac28ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5551509?v=4","date":"2017-02-07T20:59:59Z","email":"vasvasilew@yandex.ru","login":"O1L","name":"Oil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-07T20:59:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor changes (#2352)\n\n* More initial values for rsx method registers\r\n\r\n* Implemented spu decrementer event\r\n\r\n* Remove u32 cast","sha":"1669d0fdbdfe5ae7ff060b0b45aa3657f34a99b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-02-08T00:25:10Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-08T00:25:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellL10n: Small adjustements (#2320)\n\nl10n: Partial jstrnchk\r\nl10n: SBCSstoUTF8s\r\nl10n: Replace fmt::throw_exception() for cellL10n.todo() and\r\nreturn ConversionOK for String methods, 0 for character methods\r\nand the character itself for specific methods;","sha":"6c372d178146986658fea70f5ddc49b1271fe51a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-02-08T14:26:03Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-08T20:33:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"add missing LV2 error code","sha":"5a2a2f49ed35ab1df09855de35d993ec65cbd0ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-02-08T14:27:13Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-08T20:33:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"finding from @3141card on PS3 console","sha":"a1189fa37a54f09fdc4dc7fbae8cb40e453f6fe2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4313123?v=4","date":"2017-02-10T12:28:00Z","email":"giorgosmrls@gmail.com","login":"georgemoralis","name":"georgemoralis"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-10T12:28:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Joystick support using mmsystem library on windows (#2355)\n\n* Joystick support using mmsystem library on windows\r\n\r\n* fixed signed/unsigned issues with axes\r\n\r\n* joystick buttons are now configurable","sha":"6023794081e6cdea7a8584234e2c1faecac3f091"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/13280758?v=4","date":"2017-02-10T12:39:54Z","email":"magiruuvelvet@naver.com","login":"magiruuvelvet","name":"magiruuvelvet"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-10T13:24:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CMake: fix linkage on Linux, missing libdl","sha":"ff075955192327a7f431e3e745e898c43b30d47f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-09T22:51:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-10T13:33:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Debugger fix\n\nCrash fixes\nGUI fixes\nDebug enhancements","sha":"257b9a2015bca00d9427a5c9557756aad3900750"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-10T12:20:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-10T13:33:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU interpreter improved","sha":"8262d56574ce63ceeb21ef10f1e1588c32fefc4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-10T13:13:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-10T13:33:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU breakpoints resurrected\n\nNow with zero overhead","sha":"b20d7ff48c1e2331e89e6664d2e6bab9019e3f0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2016-08-10T18:13:24Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-10T19:04:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"d3d12: add x1r5g5b5_z1r5g5b5 and cleanup in D3D12Formats.\nAdd info in BufferUtils for log.","sha":"73906f9f299522fb698985fa0ba83bc40565af02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-10T19:56:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-10T20:27:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"memory fix","sha":"bb111d325fa40bb817c8d05285f7c2a91589b2d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-10T23:42:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-10T23:43:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Log empty functions","sha":"e899de88ff2476721d50aac19984d5bac03582fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-02-11T08:50:48Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-02-11T08:50:48Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"GUI: not displaying  _INSTALL , _DATA and _GAMEDATA in gameviewer (#2364)","sha":"0019ea28c3f26fbf1936881d2aab2f03236a42c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-10T09:08:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-11T12:45:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk/dx12: Fix texture scaling on unnormalized rtt access","sha":"d6159a35aa3bf0406e8584b2aa35b1c292bf1dbf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-11T12:58:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-02-11T12:58:26Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2357 from kd-11/master\n\nRTT shader access fix","sha":"e29747170f2b742ccd5a4937592295eaa89e6d85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-11T14:17:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-11T14:17:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU fix","sha":"3356a76c9b256d23d699bdbcbab5a1ab846a4c05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-11T16:05:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-11T16:05:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs::make_stream template","sha":"9e39c8cd64d2398e603350a1cf42f739ff1338b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-11T16:27:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-11T16:27:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs::memory_stream fixed\n\nseek() allows any offset\nread() cannot overflow","sha":"be5f780977498f217ebd1d13c452aba2f717b5fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-11T18:06:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-11T18:36:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"decrypt_self() function\n\nFixed SPU self decryption\nFixed PSV debug self load","sha":"e8bfce4ebdf712d35281df34bfa6ed432e23c562"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2017-02-11T19:11:04Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-11T19:11:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make APP packages bootable - from BlackDaemon (#2368)","sha":"b407d12ed13970a404c01468a8253cfa754d72b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-11T23:52:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-11T23:55:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"File: handle EACCES","sha":"ef1eff6d4853e01ca96165d6111f554e75d638c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-11T23:54:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-11T23:55:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Stub some functions","sha":"aff0484ea22db7e9857d5f218cbfcf2cadf65ffe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-12T18:03:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-12T18:03:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSysutil functions\n\nE1EC7B6A implemented","sha":"177084b1f4308fc2a9cd125314f5af24113e9412"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-12T18:12:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-12T18:12:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU analyser improved","sha":"f4b95c02265154908d08a2f2d5ae227f3a49dae8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-12T18:35:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-12T18:35:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Stub some modules","sha":"acd9d6ff24e4ecfd325aa8616d1379fbd95b1d52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-13T11:54:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-13T13:29:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"REG_FUNC simplified","sha":"64ac6a59c447b3464be69af0a536cd1082830d76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-13T13:12:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-13T13:29:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: IRET, SN event","sha":"d2ddb9882f8716e538a6b52bb0df2dd869a8dfa1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-13T14:50:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-13T14:50:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"0x2c8..0x2fc","sha":"763550c472ea596f2d22b364d64b17dd530c83cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-13T15:18:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-13T15:32:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Hack for 0x0","sha":"8891d85f75d025f7a3225fcb0bd02298034a645b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-13T15:31:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-13T15:33:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove unused code","sha":"436c245d13a96e7d276d39e0a8e9490bfd5b989b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-13T17:51:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-13T17:51:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: add check state","sha":"e4962054a4a014ac627bfb8b47c3844a6c16d733"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-06T18:36:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-13T19:26:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU thread scheduler","sha":"598c90f3762e3942d7924978887d1b2d8ca3ea89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-02-14T16:29:43Z","email":"dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-02-14T16:29:43Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"D3D12: add DXGI_FORMAT_B8G8R8A8_UNORM missing (#2385)","sha":"682924b51a67dd8a6de18ad0ede2e76a3b7d30e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4313123?v=4","date":"2017-02-14T17:46:56Z","email":"giorgosmrls@gmail.com","login":"georgemoralis","name":"georgemoralis"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-14T17:46:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fix up an issue with sceNpTrophyCreateContext (#2382)","sha":"5d705c0e9cb93262d80cbd4d0d14db25acaaa101"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-02-14T22:29:10Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-14T23:47:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Nekotekina: Fix loading nonexistent libs\n\nNekotekina's fix for preventing loading nonexistent libs","sha":"63169d767977faf50f55117174d4f62944631b11"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2581838?v=4","date":"2017-02-15T08:49:18Z","email":"george@moralis.gr","login":"gmoralis","name":"gmoralis"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/2581838?v=4","date":"2017-02-15T08:49:18Z","email":"george@moralis.gr","login":"gmoralis","name":"gmoralis"},"msg":"Implemented cellDiscGameGetBootDiscInfo","sha":"b4557789f8391900a18479b17e22e30e908edab7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2979772?v=4","date":"2017-02-15T10:57:31Z","email":"B1ackDaemon@users.noreply.github.com","login":"B1ackDaemon","name":"B1ackDaemon"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-02-15T10:57:31Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2390 from georgemoralis/master\n\nImplemented cellDiscGameGetBootDiscInfo","sha":"b637bd38667a4a2500094ecf3363269dc88339b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-15T15:07:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-15T21:13:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Busy waiting added","sha":"b1aa87b515843e655be558c3d636cf438851e122"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2017-02-16T02:15:00Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-02-16T02:15:00Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"PS3UPDAT.PUP installer (#2386)\n\n* Add PUP loader\r\n\r\n* Add .tar loader and update .pup loader\r\n\r\n* Add extract method + offset to TAR loader\r\n\r\nAlso adds error checking + operator bool overload\r\n\r\n* Add firmware decryption keys to key vault\r\n\r\n* Initial seperation of SELFDecrypter\r\n\r\nThis seperates SELFDecrypter into itself and SCEDecrypter.\r\nSCEDecrypter contains the logic to decrypt any file with an SCE Header.\r\nSELFDecrypter inherits from SCEDecrypter and contains the code\r\nspecifically to do with ELF. DecryptData could be deduplicated more.\r\n\r\n* Add \"Install Firmware\" option to tools menu\r\n\r\n* SCEDecrypter: put each segment in own file\r\n\r\nAlso, const-correctness, adjusted buffer size and better error handling\r\n\r\n* More SELFDecrypter refactoring\r\n\r\n* Compile fix\r\n\r\n* Add messageboxes to firmware install\r\n\r\n* Add progress bar to firmware install","sha":"458dbbd15d57ae6df928774d4dd83317635482e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-02-16T04:56:32Z","email":"mudroch.robert@gmail.com","login":"flash-fire","name":"flash-fire"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-16T09:14:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Simplify the popup menu. You can reuse the popup menu. So, no need to create/delete each time. Also, deleting stuff from a for each iterator is generally a bad idea.","sha":"0c8bda4f41dc9d69ecaf9899cae12a1b2f2fe4bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-16T13:56:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-16T14:14:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix #2397","sha":"3ecba8e57ff64698f4d97187da11a4f11a169e91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-02-16T16:47:18Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-16T23:07:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixes #2399\n\nDefaults dGPU on NVIDIA Optimus systems and requests High Performance\nmode on AMD systems.","sha":"5605b4ee70bc82b82535f0af8b3b74ee5c23eca2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-02-17T18:42:34Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-17T19:35:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Rough implementation of GCM_CONTEXT_DMA methods\n\nRough implementation of GCM_CONTEXT_DMA methods.\nFixes #1487","sha":"65104b590954404099b319dcb2734adff14aad06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-02-17T13:41:10Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-02-18T00:33:56Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"Fix nv3089_image_in\n- Restrict clip_x/y\n- Remove double offset addition","sha":"a886e28f87505f3ff8c738301d813fa60daf2cef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-18T12:36:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-02-18T12:36:45Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2405 from jarveson/imagein-fix\n\nFix nv3089_image_in","sha":"22c0f0d635fce043612459e05425bca91bad826b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-02-19T11:59:49Z","email":"jarveson@users.noreply.github.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-19T11:59:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve cellPngDec (#2394)\n\n* Improve cellPngDec\r\n- ReadHeader and SetParam corrected\r\n- Partial loading Implemented\r\n- Interlace Support added\r\n- Improve error handling\r\n\r\n* Use custom exception\r\n\r\n* Change to catch ref","sha":"47fdaf69027c1a4138f445a24ada9539a025f08e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T09:52:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T09:56:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Log timestamp added","sha":"f08579d201f393e814f5925824f573b30e419c99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T09:57:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T09:57:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"lf_spsc, lf_mpsc added","sha":"688097faa9841e9f5679abd3b9990ceb53978012"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T09:57:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T09:57:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fxm::check_unlocked added","sha":"4b6f8d2f62944299b5df2eaa97ef2bb515897d38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T10:10:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T10:23:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cpu_thread::test_state added\n\nlv2_obj::sleep adjustment\nsynchronization fixes","sha":"9000407a77470ff15cefa54dbef64b4f972475ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T10:13:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T10:23:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Prefer EBOOT.BIN","sha":"5e539f71e674857818ed2a81b20eb96055761146"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T12:21:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T12:21:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Cache decrypted EBOOT.BIN","sha":"4cba60b27f4450fc2bfb84c7a163f7d78b9e4d5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T13:08:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T14:17:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Ditch fs::get_executable_dir","sha":"baf22527b07c6ab620448bbe6ee45d1af5492886"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T14:22:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T14:29:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Automatic dev_* dir creation","sha":"dac72ff371ceadc4bfe0cb975a9c88b2f15eb322"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T21:35:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-22T21:35:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: block info fix","sha":"7c418f7ea571585db40f03a9a19e63f59897f2fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-02-22T22:27:35Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-02-22T22:27:35Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Hides D3D12 renderer on not supported OSes (#2416)\n\nSince Windows 10 is the only system supporting it there's no point in it being listed on other OSes. \r\nShould prevent users reporting D3D12 isn't working on their non-w10 OSes.","sha":"5fce74a2a6cf6d85acdde59c4d1cb32172c3a972"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4313123?v=4","date":"2017-02-23T15:08:52Z","email":"giorgosmrls@gmail.com","login":"georgemoralis","name":"georgemoralis"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-23T15:08:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"per game config.yml (#2418)","sha":"3e0c356b0ba4ba8bdb5778054d64c486a035d0e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4313123?v=4","date":"2017-02-24T11:05:42Z","email":"giorgosmrls@gmail.com","login":"georgemoralis","name":"georgemoralis"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-24T13:55:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"pergameconfig : create directory if not exists","sha":"e153df4d5b500178cf67c2f321dfe4ca1be9757f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4313123?v=4","date":"2017-02-24T11:48:55Z","email":"giorgosmrls@gmail.com","login":"georgemoralis","name":"georgemoralis"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-24T13:55:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"load config.yaml settings in a new  configpergame","sha":"14093c86a973a50af8d2ef48965bcd7af0e82839"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-24T13:18:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-24T13:57:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Disable PPU interpreter (precise)","sha":"5c8aab7917c2b381f809239eb62d9c23d33359f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-24T13:19:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-24T13:57:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_spu_thread_send_event fix","sha":"07d49b1bd87a448677cadd9bdd32d1a3bc88f41a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-24T13:28:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-24T13:57:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Complex STOP 0x0 hack","sha":"8369cb2af60bb751a25fa8a3ec8c9203b22e109c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-24T15:48:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-24T15:48:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_mutex fix (linux)","sha":"f35babad98fe3959497537d25f38e02f8d2fc595"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-24T16:56:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-24T16:56:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fix (linux)","sha":"c0589cab05738586089ca70c4ff1d48458f5951d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-25T16:29:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-25T16:29:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Stack overflow constrained","sha":"af53ce6f76bda4d5d6aacdc28a2a35f083b3910e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-25T18:24:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-25T18:30:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: block borders fixed","sha":"d0afef47f856ed397bb71fc78e5a6160e729464b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-02-25T23:27:31Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-02-25T23:27:31Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"libnet: recvfrom() fix (#2427)\n\nPrevents emulator crash when invalid socket is provided to the function","sha":"4d9b56c7f1642fd1fa2a0e99853bf59496b3f5d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-01-08T07:34:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-26T07:17:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"[rsx/vp] Improve BRB opcode implementation\n\nfix merge issues","sha":"9263999ad1ed8815dde435e17ee2a85fb1438107"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-26T11:42:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-02-26T11:42:01Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2426 from kd-11/gl_rsx_wip\n\nImplement BRB opcode","sha":"4aab8db42025afb3627ace33c82f71f1be1c9b19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-26T15:56:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-26T17:14:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: splitting and caching","sha":"0eb6bf6a678cee1fe7fd4eeba98bc1ffc05d7b2d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-02-26T20:44:48Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-26T20:44:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sceNp: Fix ExitSpawn, Implement VerifyUpgradeLicense (#2428)\n\n* sceNp: Fix ExitSpawn and ExitSpawn2\r\n\r\nFixes sceNpDrmProcessExitSpawn and sceNpDrmProcessExitSpawn2\r\nfunctions\r\n\r\nThe problem was that first argument klicensee was missing, therefore\r\nshifting every other argument out of place and throwing an access\r\nviolation at the end.\r\n\r\n* Use npDrmIsAvailable on sceNpDrmProcessExitSpawn\r\n\r\nTries to decrypt DRM file with provided klicensee\r\n\r\n* Implement sceNpDrmVerifyUpgradeLicense\r\n\r\nImplements sceNpDrmVerifyUpgradeLicense / sceNpDrmVerifyUpgradeLicense2","sha":"01ef9ecca46a3d49e3ee8b8b6740be4718bf1f4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-02-28T08:21:07Z","email":"jarveson@users.noreply.github.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-02-28T08:21:07Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"rsx: image_in fix for clipx/y (#2440)","sha":"c3b424eb113ff8f87757e8e3deabb6117a039243"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-28T09:22:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-28T13:18:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"unpkg improved\n\nInitial content_type parsing\nAdded PSP2 support","sha":"45bb51ded8f41f6a819201384b5258b9a61785c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-28T11:10:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-28T13:18:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixed VFS initialization order\n\nFixed RAP location for SELF\nFixed custom config loading","sha":"3751d5d5c1694078ace7e6ad2d9da9fd1b923f32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-28T14:16:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-28T14:16:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM fix","sha":"c785b14c1836bb322af56cc663186d8c5462c8fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-02-28T15:42:45Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-28T15:42:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellDiscGameGetBootDiscInfo (#2430)\n\ncellDiscGameGetBootDiscInfo is called by non-disc games for some reason.\r\nThat wasn't accounted for and therefore it would try to read PARAM.SFO\r\nfrom an unmounted path and throw an access violation.\r\n\r\nTested with NBA Live 08 Demo NPUB90029, probably fixes similar games as\r\nwell","sha":"557e1c3694f6c8f54b1ae82975076a82d069b535"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2017-02-28T16:15:11Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-28T16:15:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub sys_gamepad ycon interface (#2435)\n\n* Attempt to add sys_gamepad...\r\n\r\n* Stub ycon methods\r\n\r\nSigned-off-by: clienthax <clienthax@gmail.com>","sha":"bd85f23ed94a1b252e531dae8c3a4d6f30f5e6bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-13T14:22:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-28T21:16:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Rewrite texture cache\n\ngl: scale downloaded RTT images","sha":"96561c16ad2194aeb0bd4ee50688877bb96395dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-15T16:19:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-28T21:16:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor optimization (tangible boost)","sha":"1e826f5ccf4852b28102188a7ad5bbc0e8e70380"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-16T18:29:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-28T21:16:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl: Minor refactoring; prepare vulkan backend","sha":"7c73c3b75c581cade296ccc924bfac94261f05a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-27T12:50:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-28T21:16:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Change clear timing to immediate\n\ngl: Handle cell write to locked RTT region\n\naddendum: Fix buffer locking (personal 4)","sha":"ef8e92cbe30eee01f6af37f9ba3b75da62da096d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-27T19:39:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-28T21:16:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Ensure correct sized pbo is created upon reset","sha":"cee53fcecf7920c9904c81dcebfd0c8493c5a18c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-27T20:53:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-28T21:38:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix a fence deadlock in fence::wait_for_signal\n\ngl: Fix potential race condition when executing local work queue","sha":"7062efeb3e974dfbd23ff08e091a0db533536225"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-28T08:00:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-28T21:40:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Relax requirement to EXT_DSA from ARB_DSA to better support linux","sha":"69d044cd8daf3c38251831aa91e1e8917dd8a98d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-28T08:13:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-28T21:40:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix linux build (travis-ci)","sha":"10e218e224386c7b056639e82a44b794ed19d448"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-28T15:50:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-28T21:40:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix cache range computation","sha":"85c0219aed41af7e62d46aa67a4d5b77b6c30877"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-01T07:36:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-03-01T07:36:03Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2391 from kd-11/rsx_surface_tests\n\ngl/vk/rsx: Improve texture cache","sha":"4ab9a2a3a86a77ddad73f05f2af796f1aea3ad95"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-02-28T21:15:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-01T11:00:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk/cache: Fix invalidating intersecting and overlapping memory regions\n\nwhitespace fix","sha":"b8fcbb68b03fe888b4d748b73d642f043dd24714"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-01T11:44:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-03-01T11:44:14Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2447 from kd-11/cache_invalidation_fix\n\ngl/vk/cache: Fix invalidating intersecting and overlapping memory regions","sha":"1f45f05f8d376bf0c273f3ad6b7e70bbd20cb968"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9395168?v=4","date":"2017-03-02T21:49:42Z","email":"Chocobo1@users.noreply.github.com","login":"Chocobo1","name":"Chocobo1"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-02T21:49:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"TravisCI: use ccache (#2448)","sha":"f528aada24fb070888484cca95a4cb85775876f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-02T21:35:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-02T22:40:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Default LLE option","sha":"48b05838666cc1670ea10d83fe303c3cf1d104d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9395168?v=4","date":"2017-03-04T13:22:46Z","email":"Chocobo1@users.noreply.github.com","login":"Chocobo1","name":"Chocobo1"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-04T13:22:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"TravisCI improvements (#2460)\n\n* TravisCI: cleanup indentation\r\n\r\n2 spaces for indentation\r\n\r\n* TravisCI: make jobs drop to 3\r\n\r\nTravisCI allocates 2 cpus per build instance\r\n\r\n* TravisCI: move package installation to apt addon block\r\n\r\n* TravisCI: make pip install to user directory\r\n\r\nAlso disable sudo for faster bootup\r\n\r\n* TravisCI: expand if condition to multiple lines\r\n\r\nAlso remove outdated comment","sha":"ef5225b776c4592d4815ae6134e6174c65542da9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10865706?v=4","date":"2017-03-04T13:41:40Z","email":"WisterToub@users.noreply.github.com","login":"WisterToub","name":"Wilfried Rabouin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-04T13:41:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPUInterpreter: Fix undefined behavior of left rotate functions (#2469)\n\n* PPUInterpreter: Fix undefined behavior of rol8 and rol16 with inline assembly\r\n\r\n* PPUInterpreter: Fix undefined behavior of rol32 and rol64\r\n\r\n* PPUInterpreter: Change left rotate functions to inline functions and move to types.h","sha":"67ac8bf0706b4c8498d240fd790324d2acbd2d5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-04T11:54:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-04T13:54:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFsSdataOpenByFd draft\n\nLLE-compatible implementation\nlv2_file::make_view implemented","sha":"8e4a09d9e5971a436a325b95c8e8ae5e04a8a667"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-04T13:54:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-04T14:01:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"bf_t fix","sha":"d9c78cf495a5d3ffb272aad4d2ccc9fd61069bce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-04T14:14:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-04T14:14:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sceNpDrmVerifyUpgradeLicense fixed","sha":"74d47943e9194b94e92a9b109f33cafc92d3af0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-04T14:34:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-04T14:34:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ror64 added","sha":"3baf79f92908530ac57b4e31d4ed3ca5c9724a21"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-05T16:00:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-05T16:00:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix (mingw)","sha":"19a698682bd682a8fbb9abea67e54889b08f603b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-05T18:42:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-05T18:42:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix #2462","sha":"9a9455a69665ad5e4dfe303e3609b6737e121cd0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-05T18:42:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-05T18:42:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Speculative fix for fmt::format","sha":"a2200bd01e7d607d0c2668f388b9b2587bf19319"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-05T11:58:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-06T11:34:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk/dx12: Implement forced channel remapping\n\ngcc fix","sha":"1e71285de882e527c56df7af89beea2a874ba2d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-06T13:24:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-06T15:56:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix DRGB8 format","sha":"0fd888a42e6c521ca303903c66a355e34295f8a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-06T17:13:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-03-06T17:13:54Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2477 from kd-11/master\n\ngl/vk/dx12: Implement forced channel remapping","sha":"039e295e5326a297b93223f244f3db5836b5d6a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-03-07T00:59:05Z","email":"jarveson@users.noreply.github.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-03-07T00:59:05Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Mself / Sdata: on the fly partial decoding support (#2468)","sha":"87fe93ee9a4d8e36cd400c58efb9312c12154291"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-03-07T11:34:09Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-03-07T11:34:09Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"DX12: fix DRGB8 texture format (#2480)\n\n* DX12: set native sampler format to BGRA8\r\n\r\n* DX12: fix DRGB8 texture format","sha":"a168aa2df30a7b42be163dafbfd1247d8f1a9c41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-03-07T15:18:45Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-08T16:59:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add missing system languages\n\nAdds Portuguese (BR) which was introduced in firmware 4.00 alongside\nwith English (UK)\nAdds Turkish which was introduced in firmware 4.30","sha":"7cdb5f31238564454b03167fae5aedfabf51898d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-02-17T19:35:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-10T12:51:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"New reservations\n\nMemory system cleanup\nsys_memory_get_page_attribute","sha":"5e3bacbd9b3256942e973bbe74758ef7a0568a6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-10T13:27:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-10T16:11:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix texture cache bugs\n\nFix endianness bug\nFix r/w when real pitch is <= 64","sha":"1fd33f611c694543c1c4a131a53cf5dc0235c202"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-10T20:57:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-03-10T20:57:47Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2490 from kd-11/texture_cache_fix\n\ngl: Fix texture cache bugs","sha":"596db2c29cd8bc23f80c021240fa930bc9e2a164"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-03-10T09:06:36Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-03-11T01:39:01Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"Edat / Sdata: On the fly decryption for edat, fix EDAT_FLAG_0x20 decryption","sha":"a6f8e4f6b31c7c3bab5b6c19614a9ba223f605c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-03-11T07:13:53Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-03-11T07:13:53Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"msg":"Fixes: cellMsgDialog, cellPad","sha":"309f409554f53cf1bee7f2bedc63e80273fe141e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26231569?v=4","date":"2017-03-11T08:59:50Z","email":"Inviuz@users.noreply.github.com","login":"Inviuz","name":"Inviuz"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T08:59:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Handles directory creation in cellGameDataCheckCreate2 (#2488)\n\n* Handle directory creation in cellGameDataCheckCreate2\r\n\r\nStops some games from displaying information about not enough memory on\r\nhdd\r\n\r\n* Returning CELL_OK causes some games to loop on sceNp functions\r\n\r\nfor \"shaman magic\"\r\n\r\n* cellGameDataCheckCreate2 added param.sfo creating/rewriting\r\n\r\n* fix fs::file null\r\n\r\nand one readability change\r\n\r\n* For debugging purposes\r\n\r\nWhen fs::file problem is located will be improved\r\n\r\n* Fixed wrong operators\r\n\r\n* Conversion from vfs to fs\r\n\r\nShould take care of fs::null\r\n\r\n* Cleanup\r\n\r\nremoved some unnecessary logging\r\n\r\n* Fix successive function calls\r\n\r\nsecond call was always ending in error since it didn't create the conent\r\npermission\r\n\r\n* Changes according to Neko's review\r\n\r\n* Change to use u32 value","sha":"40a84dd477a9e53c354def845f239f34b9601a29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-10T23:14:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T12:48:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Reservation fix","sha":"4739eb36015ff1c1407b801fc5c267438cc27917"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T16:49:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T16:49:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"__chkstk workaround","sha":"1f171092030092f4d9ec750fb8cb25574877d662"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T18:37:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T18:37:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixes (sys_memory, sys_mmapper)\n\nDeS","sha":"ce35554a55d1c2e5ba538c957e37186f5af7bad9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T18:38:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T18:38:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"0.0.2 Alpha","sha":"d878a286bc0225effd38fce9694bf41b4a80b262"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T18:55:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T18:55:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ch69","sha":"7b65f939530736962a21a7a3861b02c300de1f68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T19:06:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T19:06:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Appveyor version fix","sha":"cdc49d166ed86088ffd652dcf631c21340505d9b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T21:41:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-11T21:41:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"wx: UTF8 path fix","sha":"14e5aa57c8d1975a4d2bca45600be471ac59184d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26231569?v=4","date":"2017-03-12T00:15:22Z","email":"Inviuz@users.noreply.github.com","login":"Inviuz","name":"Inviuz"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-12T00:15:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Mmapper with Neko's review fixes (#2503)","sha":"b70a1edbc7b6067ad3ce038eb7198fa58767576a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16824659?v=4","date":"2017-03-12T02:20:37Z","email":"henrique_84@hotmail.com","login":"ikki84","name":"ikki84"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-13T09:19:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub cellAvconfExt\n\nChanged \"fmt::throw_exception(\"Unimplemented\" HERE); \"\r\ninto:\r\n\"UNIMPLEMENTED_FUNC(cellAvconfExt); \"\r\n\"return CELL_OK;\"\r\n\r\nAllow NPEB01283 to go further in boot (pass the intro and reaches the menu)...","sha":"c8b9cc9fe5c6eb7041721eb6f5258b5e1f0cf36f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-13T09:44:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-13T09:44:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Lower restriction on render target pitch","sha":"fa6114719df11aaa97131382d4e875cb257a54d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-13T10:06:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-03-13T10:06:49Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #2522 from kd-11/experiments\n\ngl: Lower restriction on render target pitch","sha":"ed711c0e59abab4900f0ea2b30c084f4dacd8100"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-13T09:40:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-13T10:16:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"utils::memory_protect","sha":"d09dd29054fd15f34108febe5303d6de62807925"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-13T10:14:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-13T10:16:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"thread_ctrl::finalize crash fix","sha":"c72a5a5775095037e0bf306779033f83b3bf2ad2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-13T10:15:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-13T10:16:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use utils::memory_protect","sha":"78703cfe47797a5332ac5ead880c3ef47e135270"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-13T10:35:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-13T12:02:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor optimization","sha":"1ede0f4706d494901d1e9018a254d605ab802c6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-13T15:03:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-13T15:03:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Boot messages","sha":"1c8cb3b7d3a03cb3d079d5de1ea8efcb94eaf1f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-07T10:40:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-13T20:40:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Fix some decompiler bugs","sha":"be4bb48476893719184002882011ebf7c33d0f60"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-07T17:23:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-13T20:40:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: Ignore invalid texture uploads","sha":"818dd88390f2a991ebc4e18f982bde134df9a6e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-13T17:58:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-13T20:40:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Do not attempt to re-flush an address if another thread flushes it first","sha":"20931344202b55330f8b7a09a7921f7c14b77adf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-11T09:07:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-13T20:40:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Separate scale offset, fragment constants and transform constants uploads","sha":"8fc281e034b1029be4c1393a286e03128faea41a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-14T13:05:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-03-14T13:05:59Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx/vp: Fixes (#2533)\n\n* rsx/vp: Fix rsq opcode broken in previous commit\r\n\r\n* fix ms compiler error\r\n\r\n* fix another possible conflict with ms d3d compiler","sha":"1de2ceca9b56072bff71fe2c1db4d5312ce79f34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T12:03:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T13:12:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_lv2coredump, sys_crashdump modules","sha":"90479eaad687a1ae2d1cd51c583fce5137f9b294"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T12:03:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T13:12:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Auto LLE update\n\nlibdtslbrdec.sprx removed\nSome encoders added","sha":"3648a058d173b88a41d032c30b7ef57293b5b2d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T12:14:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T13:12:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Opt-in LLVM logs","sha":"b45cea14340ffabe61c4a400f0396e9f974065e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T12:23:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T13:12:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM CPU override option","sha":"07646c21248edc4a155112490fc641a1fa95cb09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T13:11:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T13:12:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Small fix","sha":"63a107acbc515968bdbcdfbe361c6a66e1899eae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T13:29:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T13:29:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Gui: TTY log fix","sha":"b3073bbf1e9388b772dc3eacb48f3bae245a849f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T16:13:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T16:13:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"About dialog updated","sha":"fc92040d7f8cb4dadd38277f23d50c367f078f10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T16:21:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-14T16:21:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Auto LLE: cellSsl","sha":"1b5a479bbdd7afd3f8cf026c8a5d44b080af00a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11020872?v=4","date":"2017-03-16T09:34:47Z","email":"chralf@kth.se","login":"al0xf","name":"al0xf"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-16T09:34:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix async OSK loading (#2531)","sha":"c5e66650105bd1943a79f8241f6c81a325faa7b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-17T17:08:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-17T17:08:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Stub sys_crash_dump_set_user_log_area","sha":"d45d8eb4bc1c14a6c9e2ef1cd72c925e7ea7be6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-17T17:22:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-17T17:22:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix UB in BitField.h","sha":"14b9b122111e1c676cd9dc8e09c1e5659951d9f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-17T17:23:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-17T17:23:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix UB in PPU interpreter","sha":"c4bdc930ca7532dcd58ac8b76fb633b413267528"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-17T17:23:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-17T17:23:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix override warning","sha":"cff39ec3a96b79aeccac9cd82e5af051358d71d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-17T17:51:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-17T17:51:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellVdec: default FRC workaround","sha":"2b79a3691f064362b4ee9fac9c316668fffe1d16"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-03-19T15:47:09Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-19T17:12:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update PPUFunction.cpp\n\nSource:\n- http://www.psdevwiki.com/ps3/LV2_Functions_and_Syscalls\n- http://www.psdevwiki.com/ps3/VSH_Exports","sha":"b32ad80c2354211936da5564014a25d8bc34d57b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-03-19T20:15:04Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-20T13:40:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update cellOvis\n- Add parameters to cellOvisInitializeOverlayTable, cellOvisFixSpuSegments and cellOvisInvalidateOverlappedSegments functions\n- Modify return type for cellOvisFixSpuSegments and cellOvisInvalidateOverlappedSegments functions\n- Replace UNIMPLEMENTED_FUNC by cellOvis.todo","sha":"5785ebb384d11614788fafff01852e282a092684"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26231569?v=4","date":"2017-03-21T13:02:00Z","email":"Inviuz@users.noreply.github.com","login":"Inviuz","name":"Inviuz"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-21T13:02:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use sys_vm_memory_map plus add default value for sys_allocate (#2560)\n\nfor different memory map(unconfirmed) also handle default action.\r\nFixes unknown syscall 313 error\r\nIssue 2510","sha":"c729d6d65a8952c4195b2beaaf83204a873cf2a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-19T11:49:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-21T17:16:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: volatile load for state","sha":"c2cd0c994fa6fa594048f86e85f636d13f7b845b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-19T12:50:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-21T17:16:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"utils::memory update","sha":"c7a9a8e8f12a1a708b86710ac6fb3170f03eb5f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-19T12:53:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-21T17:16:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: generate trampolines\n\nMust fix issues with older CPUs\nJIT.cpp refactored to use utils::memory*","sha":"560d6776afe2b66520f1a33021de1d87b703b553"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-19T18:12:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-21T17:16:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: fix FCTIWZ, FCTIDZ","sha":"aad035c4b5758d38f318f80dc4948fe4406f2ebe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-20T13:32:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-21T17:16:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: fix FCTIW, FCTID","sha":"4fc8276f0f4f89d0c07542883107adca0d7b1ccf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-20T13:23:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-21T17:16:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: load .pdata section","sha":"ad721681434d42d50439bd06be09e6493c58abd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-21T17:16:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-21T20:32:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use LLVM 4.0","sha":"3e6f9faf7119be09196930ac6f10c32a319986ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-21T22:21:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-21T22:21:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: enable New GVN Pass","sha":"1b5c0c68dd02347fce61fbb42c7e4818b3a309d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-21T22:33:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-21T22:33:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: Bump obj version","sha":"ddd6ebc58d8e4f2ef64277bb8375cf3de0746139"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-22T20:23:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-22T20:23:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: HACK instruction removed\n\nBreakpoints fixed","sha":"3bfe17a14f98fb9f3110015b6a45f65c35bfb59b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7094731?v=4","date":"2017-03-23T08:27:33Z","email":"twdarkeh@gmail.com","login":"twdarkeh","name":"twdarkeh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-23T08:27:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"remove custom config (#2574)\n\nAdd remove custom config to right click","sha":"ee8fecea21e0e1790655eb92cd4bc12909efb812"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6974432?v=4","date":"2017-03-23T16:43:18Z","email":"Morten242@gmail.com","login":"Morten242","name":"Mårten Nordheim"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-23T17:50:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Multithreaded compile on Windows for llvm, glsl, vulkan","sha":"458e5fa4e1df0a91d43104321fe5dc91328d4e88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-21T11:35:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-24T06:30:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"fix false alphakill flags when texture fetch is optimized away","sha":"8fa3f0721e3e9a1ebcc0477f0d9a14606f272a96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-21T11:41:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-24T06:30:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: Fix projected coordinate lookup on a cubemap sampler","sha":"f7d767d0e8ea7bed26b939d670ff13f6ad0ccdf6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-21T11:53:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-24T06:30:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: src3 workaround","sha":"ef822d785eae713a0cee9d99e5d298e9b6422a22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-21T11:58:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-24T06:30:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: recover from FIFO parse errors\n\n- Validate FIFO registers before access\n\n-- Validate the args ptr separate from the get ptr","sha":"34c2b8a55e612a95995327b8dbc5cef89d3e14aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11436215?v=4","date":"2017-03-25T10:27:42Z","email":"razmyslov@viva64.com","login":"SvyatoslavRazmyslov","name":"Svyatoslav"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-25T10:27:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PVS-Studio: fix V547 (#2543)","sha":"620ec7ef255b57b3d1353de0db8f8186e6408eea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2017-03-21T18:43:37Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-25T11:26:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixs for klics","sha":"44e62c5c92335978e39a3496330117e6be97e31b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-03-22T11:13:20Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-25T11:26:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Crypto: fix sprx/self check in npDrm and edata fixes","sha":"65696bf6a362f724576418432d8cd01a4d02aec3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-03-22T11:19:07Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-25T11:26:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Xinput/MMjoy: Fix connection status","sha":"f4a0ff19d565b2dbf37613952bc62e8bfc3d63c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-24T09:29:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-25T12:07:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: Fix stencil ops","sha":"5b0fddd3e8ed6aa2f83d335cb2cdc42385e1e30f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-03-24T20:17:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-25T22:04:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSysmodule: Register 0xF044, 0x0054, 0x005C modules\n\ncellSysmodule: Register 0xF044 module (cellSysutilNpEula)\nFound by debugging Uncharted 2 Demo (NPEA90055)\nHelps in all games that register sys module configuration 'multi-player'\n\ncellSysmodule: Register 0x0054 module (libmedi)\nFound on Motorstorm Apocalypse [NPEA00315] (thanks Zangetsu for the log)\n\ncellSysmodule: Register 0x005C module (cellCrossController)\nFound on LittleBigPlanet 2 [BCES00850] (thanks Zangetsu for the log)","sha":"7d59f7e69c8b96ecbca78b9812cc4b150d698532"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-03-25T14:25:24Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-25T22:04:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Register HLE libmedi, cellCrossController, cellSysutilNpEula\n\nMotorstorm Apocalypse calls for cellMediatorGetSignatureLength,\ncellMediatorCreateContext, cellMediatorGetProviderUrl,\ncellMediatorGetStatus\n\nLittleBigPlanet 2 and 3 may call for 0x37E1F502 (unknown name) on\ncellCrossController\n\nResistance 3 and Uncharted 2 may call for the functions registered\non cellSysutilNpEula","sha":"7ae2a8840b55ea25d404ce2b9d500dd38e0b4504"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-03-25T22:25:52Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-25T22:50:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Move module in correct path","sha":"0f9f787a55ae7f2280cf36a9d0cf64e31bf5eab6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-25T21:59:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-26T13:22:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Support immediate mode rendering","sha":"79d114cc060a22df40f7f9156ff68652f4a531fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-25T22:24:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-26T13:22:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Minor fixes to vertex counting and lower exception to notice if var does not exist","sha":"ba968048c9ea80bec2b8412f2beb1660881e0b1c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-26T09:01:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-26T13:22:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Support more base types for immediate rendering\n\nfix alignment","sha":"70d3a6d8404decaf619ebf0fde451d735c6e61be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-26T11:51:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-26T13:22:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix depth clears on z16 surfaces without stencil\n\nremove some debug code","sha":"3ec1fe9ee7734f4fe1b87a06a87055456205434d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-03-26T22:11:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-26T22:11:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add \"Open Game Folder\" Option\" (#2595)","sha":"51cd98c9f41fb7aa40ca6301e67616a176a35204"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-23T17:41:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-26T22:15:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: fix for mingw","sha":"e12a70803647caef6cf9b55d072eb754566b9d66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-23T18:32:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-26T22:15:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs:: handle negative seek","sha":"0393c7f52c58741807ea0a4a298c35623b05eee9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-23T20:16:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-26T22:15:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs::write_file aux","sha":"4bbe1b6bf35c88f600575c1f24e18e4511cefac9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-23T20:16:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-26T22:15:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"AutoLLE: libhttp.sprx added","sha":"cd9bd7963991cd96ba0ea8c0e823a6c03b1ffd2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-23T21:05:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-26T22:15:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU analyser fix","sha":"f1f53de24bdfdd0fd9c9be9fcbb602efa42f8092"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-25T15:52:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-26T22:15:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix check_addr arg","sha":"e4d1bdef077e2927e18a3e296a605371413fcd0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-25T15:53:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-26T22:15:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::g_exec_addr added\n\ns_ppu_compiled renamed\nException handling enabled","sha":"37a97a71e391323f9a1fbc2697d5b567b6d95c0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-25T15:56:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-26T22:15:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"util::memory_reserve fixed","sha":"98d96fd64953aefae9806d3226e428df44c7a0f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-25T16:43:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-26T22:15:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix cpu_thread pause","sha":"8590b66b4b41ffb761da8dc674d9ad7c63b9e6d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-25T21:25:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-26T22:15:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"_sys_sprintf implemented\n\n_sys_printf, _sys_snprintf fixed","sha":"e8984d976c36d406301f4352a22836aae4291bca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-26T09:08:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-26T22:15:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"libmedi fix","sha":"6b471d50ebea3ebe4adf5a46b6c982ff647166a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-27T09:44:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-27T09:44:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"OpenGameFolder simplified\n\nAdded menu separators","sha":"c1a98f76cde2b360b55a3db5b995cabd61454933"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-27T10:08:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-27T10:19:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"OpenConfigFolder","sha":"cec75e8567ad706465b04d3d4ab5c045afefc2f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26231569?v=4","date":"2017-03-22T10:09:10Z","email":"Inviuz@users.noreply.github.com","login":"Inviuz","name":"Inviuz"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-28T20:13:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"implement getSizeKB functions\nbugfix in sys_net. id 0 is acceptable socket id","sha":"149c08ba785154ac6849ff105cd0eafbaee171d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26231569?v=4","date":"2017-03-25T10:20:55Z","email":"Inviuz@users.noreply.github.com","login":"Inviuz","name":"Inviuz"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-28T20:13:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Check for invalid arguments\n\nCaused crash when recvfrom was using null buffer","sha":"08c9a7c184d736f9f766d80b98ac696632c7d6d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26231569?v=4","date":"2017-03-25T23:16:47Z","email":"Inviuz@users.noreply.github.com","login":"Inviuz","name":"Inviuz"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-28T20:13:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add simple divide to get kbytes\n\ninteger division","sha":"632287afe775f988f7f840538b20e6891a92f113"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-28T10:41:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-29T20:06:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Support indexed immediate draw via ArrayElement method","sha":"909f3e9b3e3736b71f1b6b5f09b0967a80c7ba03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-28T11:17:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-29T20:06:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Force alignment of DXT textures","sha":"ad12900397d68c7d59ea1a9476bdf9d67eab5920"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-28T21:32:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-29T20:06:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix mipmap count calculation","sha":"66835cf083081e4a51948d7001ddf2c725d47a27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-27T12:12:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-30T09:04:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RemoveGameConfig improved","sha":"4c789faea4f6b88b208c12cae87c806ac4effdd8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-27T22:33:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-30T09:04:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Alternative TLS allocation\n\nShould fix \"out of TLS memory\"","sha":"77e88741bcec1683565de9209b8d58fa6156e43b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-28T23:54:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-30T09:04:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simple patch engine","sha":"78b9c64f67aa0c6c52f7da31a59e4d5512a83c8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-29T09:32:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-30T09:04:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable patch engine for SPU images","sha":"3ec156b2f26ec95609d6bbc16e8e900cee3a9158"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-30T10:17:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-03-30T10:17:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Restore GD in game viewer","sha":"c4066b924bba399657b15ce65c781264044d3144"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-30T16:37:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-03-30T16:37:49Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"gl: Fix legacy clamp mode (#2612)","sha":"0fba38f69123447c56fb1b7f35f5637e3299d797"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1297639?v=4","date":"2017-03-16T22:04:43Z","email":"corneetraas@hotmail.com","login":"cornytrace","name":"Cornee Traas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-01T16:29:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix mounting bdvd when elf in subdirectory\n\nCauses MGS4 to boot further","sha":"901f503a3a14e8d3d6317448d85b3420dbe7cd91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-02T12:32:53Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-02T12:32:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub cellHttpUtil (#2611)","sha":"b54ba478705fe8ceeee60aeb22f558261deac27a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/778999?v=4","date":"2017-04-02T18:10:06Z","email":"romoper@yandex.ru","login":"jfhs","name":"Andrey"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-02T18:10:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Gdb debug server (#2542)","sha":"215a9f9e11b51772f950ae960a8406395a31cb9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1445782?v=4","date":"2017-04-03T10:17:20Z","email":"jjs@jjs.at","login":"jjsat","name":"Jochen Schleu"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-03T10:17:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Only pass positive values to sqrt and log2 in the fragment program. (#2624)","sha":"ce7d62968e75fbbbe4e01440c1da0cc747f4935b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-03T09:18:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-03T10:50:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Re-enable layout transitions in vulkan. Vulkan drivers take this hint seriously\n- Fix enum typo","sha":"d33bc540bc53d32929285a97f19e1f6b9ef86f20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-03T10:21:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-03T10:50:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix line_loop -> line_strip indexing","sha":"2d99f3556e352c26d39c3662a4694de14606ecbb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-03T13:01:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-03T13:02:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData workaround","sha":"65488078a465bf2191e4a760b3e19e2dd77deeea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-04T20:27:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-04-04T20:27:16Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix freezes on Linux (#2632)","sha":"1ae334e5006b112c20e02829af32951c613787ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26231569?v=4","date":"2017-04-05T13:08:58Z","email":"Inviuz@users.noreply.github.com","login":"Inviuz","name":"Inviuz"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-05T13:08:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSave fix plus bugfixes (#2631)\n\n* cellSave fix plus bugfixes\r\n\r\nallows allocation of last byte in memory block\r\nprevents rpcs3 from crashing when closing non existent socket\r\n\r\n* Fix overflow\r\n\r\n* add more socket options\r\nfix typo\r\n\r\nprevent sys_net from operating on nullptr sockets","sha":"22e679e23e5b3de3022e6288a259a180b6f5d5d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-05T19:25:28Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-06T09:55:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add cellRtc functions","sha":"c863da278f673a8325c8c86c0d0e51d9831a6269"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-04T22:12:15Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-06T11:58:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add few functions in cellSysutil.","sha":"ba8aa580a164dec9f1fcc88e6ee4da59b4fd978f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1445782?v=4","date":"2017-04-04T18:47:17Z","email":"jjs@jjs.at","login":"jjsat","name":"jjsat"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-06T17:58:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix isdenormal() for MS VC.","sha":"d8dc4f4474aa709f14a58702b7375f6e0ea82e60"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6450725?v=4","date":"2017-04-06T22:12:15Z","email":"Yukariin@users.noreply.github.com","login":"Yukariin","name":"Yukariin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-06T22:12:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[WIP] Update Qt interface (#2336)\n\n* Fix rpcs3qt Linux build\r\n\r\n* Files clean up\r\n\r\n* Add base MainWindow class\r\n\r\n* Add slot stubs\r\n\r\n* Update MainWindow::DecryptSPRXLibraries\r\n\r\n* Add SettingsDialog base class and tab stubs\r\n\r\n* Add CoreTab base layout\r\n\r\n* Add compile guards\r\n\r\n* Minor fixes\r\n\r\n* Add GraphicsTab base layout\r\n\r\n* Add OK button signal\r\n\r\n* Remove QML stuff\r\n\r\n* Fix indentation\r\n\r\n* Add AudioTab base layout\r\n\r\n* Add InputTab base layout\r\n\r\n* Fix layouts\r\n\r\n* Add MiscTab base layout\r\n\r\n* Fix layouts\r\n\r\n* Add NetworkingTab base layout\r\n\r\n* Add SystemTab base layout\r\n\r\n* Fix button layout in SettingsDialog\r\n\r\n* Make SettingsDialog resizable\r\n\r\n* Add base dock widget stubs\r\n\r\n* Add very base PadSettingsDialog layout\r\n\r\n* Add combo box entries\r\n\r\n* Abb LogFrame base layout\r\n\r\n* Fix indent\r\n\r\n* Abb GameListFrame base layout\r\n\r\n* Minor fixes\r\n\r\n* Add AutoPauseSettingsDialog base layout","sha":"74e806810dc1b6dd2e2c6ea3386c004e7da5ad2d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16824659?v=4","date":"2017-04-07T12:30:07Z","email":"henrique_84@hotmail.com","login":"ikki84","name":"ikki84"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T12:30:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Imejp: cellImeJpEnterChar (#2600)","sha":"27ea4285ef30495eb574baeb3bb38296bd2d1a4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-07T12:48:59Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T12:48:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add cellLibprof module (#2637)","sha":"a1cc40e7b1142f40197d203cd6d56647b4df1d27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-06T19:09:27Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T13:13:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Register cellSpursRemoveSystemWorkloadForUtility\n\nBefore\n! LDR: **** cellSpurs export: [0x31F5196B] at 0x13ab56c\n\nAfter\n! LDR: **** cellSpurs export: [cellSpursRemoveSystemWorkloadForUtility] at 0x13ab56c","sha":"7c2af5ceae1bc6f62e664463dea96c988a916889"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-06T21:13:48Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T13:36:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub cellBgdl module","sha":"219dba8aae74ca3f64924cac6b5477cd3746e1a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-06T20:48:01Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T15:53:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub cellSysconf module","sha":"22ec8c4dd2d3a998cb0903171a1ea46da27e44d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-07T16:45:38Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T16:45:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub cellVideoUpload module (#2642)","sha":"4c4b353766f00b1e17c168b066e1cd0a1401315c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-07T19:14:20Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T19:40:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub cellScreenshot module","sha":"d160c862c7a2505e7e4e3f6bddff65566d062c8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-07T20:52:31Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T21:09:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update cellSpudll\n- Stub cellSpudllGetImageSize\n- Implement cellSpudllHandleConfigSetDefaultValues","sha":"7a1fd27eccee857179cc5adbfe49193ab0a50c45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-06T13:57:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T21:56:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU Analyser fix","sha":"ed7883ba07640fed01710a799e18686b41eb6e90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-06T15:28:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T21:56:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update rpcs3.ico","sha":"8f0b55c2cbe30819b659f8279857557667578cef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-06T15:34:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T21:56:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update supporters","sha":"49daecc4eafbdede9d140ccd96e576dcf7efabad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T21:53:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T21:56:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixed auto LLE","sha":"69d86e39b94a7b1e8019823550736ac47ba11ad9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T21:55:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-07T21:56:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Warn about libfiber.sprx\n\nIt's currently incompatible with LLVM\nAlso fixed breakpoint bug","sha":"ac79654d1b8da4f5806dda5ac9646a8c6487a17b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-02-13T02:46:02Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-08T19:32:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Registers more functions missing.\nImplement and stub cell_FreeType2.\nReorder cellRtc.","sha":"b3cb82752677678f0ddb46ab778d0fd1356ba614"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-15T12:32:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-08T20:12:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Set up hw accelerated blit","sha":"d94986ff0de5a7cfbbad6ab39cc79533037716ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-29T19:27:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-08T20:12:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Use the GPU to scale textures; use ARB_sampler_object\n\nImprove scaling and separate sampler state from texture state\n\ngl: Unify all texture cache objects under one structure separate by use case\ngl: Texture cache fixes\n\n- Acquire lock when finding matching textures\n- Account for swizzled surfaces when deciding whether to cpu memcpy\n- Handle swizzled images on the GPU","sha":"6d6d0e4e369f520ed36892802c3d13f98364a067"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-05T15:11:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-08T20:12:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/ui: Add config toggle for GPU texture scaling/blit","sha":"adefd1fd63d755fa8adf0c0792a92132b2995e19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-08T12:09:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-08T20:51:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ppu_analyse: use entry point","sha":"d7c66fc94992d2e71729757bf0295a5712901d9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-08T20:20:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-08T20:51:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU disasm: print HLE index","sha":"fb9b09d0049ce5b0bff586e3ccc6d0ae30c41883"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-08T20:58:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-08T21:16:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU Analyser: TOC detection\n\nImproved TOC detection logic\nAdded \"PPU Debug\" option","sha":"dc3d38c25501e84723852c52596d9d869ff9749c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-09T12:59:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-09T16:45:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ALSA Audio Renderer (Linux)","sha":"4c741e93c315d6e3848371000eee9bda49e96f49"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-09T20:43:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-09T21:18:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Audio: downmix to stereo","sha":"77aa3142a9095d26da3685c41004c2785a155c09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-09T19:35:58Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-09T23:39:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Typo","sha":"49ba4bbfb544e6e89df7346d9b59e60e0b39d732"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-09T14:08:03Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-10T00:25:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add functions to cellSsl","sha":"7cd15a62029c2803bdb0c36918bc1a91afa6b406"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-08T15:42:28Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-10T01:08:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update sys_spu\n- Implement sys_spu_thread_group_set_priority\n- Implement sys_spu_thread_group_get_priority","sha":"9ba0a9189b4a06d86911c5ee5f118b85e2bb66a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-04-10T01:28:46Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-04-10T01:28:46Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"GL: fix wireframe in Catherine (#2660)","sha":"9b480743897b0ac0842e87d17ba31c8e9482b74e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-10T12:54:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-10T13:08:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Upload Travis builds","sha":"e786192766f0c819266816d6ab3092a575aba8b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-10T13:41:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-10T13:41:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix","sha":"ea098a920ea59d42c551c894aeb64c7597888ace"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-04T16:14:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-10T14:24:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Autodetect supported OpenGL extensions\n\ncleanup","sha":"ac3b22902a9ae1c601588e541e04c274ea85b737"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-09T08:30:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-10T14:24:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Update libglew-dev for travis\n\nUpdate libglew as well","sha":"d3e3e10b7d922d9f0bf880444f2dca914f929954"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-10T14:18:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-10T14:29:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix token","sha":"78080fd78289f5a8f269ec4316fdf7a7ca603039"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-10T15:14:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-10T20:30:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Travis fix","sha":"a01398eda0daec11cabf21fcf61023d05073effc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-10T21:10:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-10T21:48:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix zip cmd","sha":"3f20e0c5a8b5a97ff24764bf1c36266ab2f37b8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-11T09:15:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-11T10:19:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Throw if user attempts to use Vulkan/DX12 without driver support","sha":"3ce7947dd35278b5ec5a8ceec8d02e3a62b3923b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-12T09:24:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-12T09:58:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Travis fix","sha":"af8d7b9e4e703ccc4a82c03027a79b1002ed770e"}
+{"author":{"avatar":null,"date":"2017-04-11T22:45:38Z","email":"jeremiah9@outlook.com","login":null,"name":"Jeremiah"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-13T15:42:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update cellSaveDataGetListItem","sha":"370c2ecac5c6837448aa5b23a2621e14310a231b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-04-13T16:30:25Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-13T16:30:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Misc (#2614)\n\n* cellSysmodule: Register libad modules\r\n\r\nRegister libad_core, libad_async, libad_billboard_util\r\n\r\n* Misc\r\n\r\nsys_ss_get_console_open_psid (Called on Project Diva F 2nd),\r\nsys_ss_get_console_id\r\nStub cellWebBrowserGetUsrdataOnGameExit for Professional Baseball\r\nSpirits 2015\r\nFix two logs on GcmSys","sha":"94ab3ae7cf0a62c0c7c07ba3895a9622475a8f96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2017-04-13T17:29:47Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-13T17:29:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Trophy update (#2655)\n\n* Added checksum check to TROPHY.TRP loader\r\n\r\n* Implemented sceNpTrophyGetGameProgress, sceNpTrophyGetGameIcon & sceNpTrophyGetTrophyIcon\r\n\r\n* Updates to up to date APIs and tiny changes\r\n\r\n* Code style fixes for checksum verifier, and another fix for trophy functions\r\n\r\n* Format fix","sha":"a5fd7abcf7808a33523fab740ae35affbd865bac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-13T20:02:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-04-13T20:02:51Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"spu: Check exponent bits in FMA ops (#2683)","sha":"65bdcaed29aa26fc457b4c32120ff5832d990ed0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2017-04-14T10:08:17Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-14T10:08:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Trophy fixed (#2687)","sha":"617746606d881f57314fc48f93df1a8e9e086d5b"}
+{"author":{"avatar":null,"date":"2017-04-15T22:45:50Z","email":"TomiYuga@users.noreply.github.com","login":null,"name":"Jeremiah"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-15T22:45:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Properly overwrite param.sfo in savedata (#2690)","sha":"14f02b23c2f4dd5543ea597f0cc5138bfda2d061"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-12T23:31:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-16T14:44:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"HLE linkage rewritten","sha":"7428bb3025ca0ad4c6a3886e2755e95b4ff5e92e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-12T23:58:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-16T14:44:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_prx updated","sha":"2fd58dc7e8e70ffd495270aa46c473608cb5ef7b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-13T00:32:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-16T14:44:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM improved","sha":"b1f1a5885bb682fe483e5cf488f1ee31cb59de56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-13T15:32:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-16T14:44:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU fix","sha":"db1b012a261cbd1a13a40fa2c36d0ac26f2154b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-13T15:35:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-16T14:44:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_spu_image loading rewritten","sha":"402df6823513972d5fc35300a8f329173a9473f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-13T15:37:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-16T14:44:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"_mxr000 hack moved","sha":"4ceaab10a5ae3644f2eefea3480cc3e0336a52c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-13T15:37:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-16T14:44:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Error filtering updated","sha":"f0f8f50e129e13c0c4f0ed42ae43966bd39732cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-04-16T20:32:58Z","email":"AniLeo@users.noreply.github.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-04-16T20:32:58Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Add CONTRIBUTING.md guidelines (#2706)\n\nDue to the big amount of invalid issues being submitted later, I think we need to activate those.","sha":"fa782046f9dae597410cc167f1a25e03a96f2421"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-17T21:30:34Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-17T21:30:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Check variable before to execute remove, in GLGSRender::on_exit (#2682)","sha":"30eb680c9deacf801ed520fe560ab593c774c58f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16312324?v=4","date":"2017-04-17T18:43:09Z","email":"nicolas.werner@ymail.com","login":"deepbluev7","name":"Nicolas Werner"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-18T18:37:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix crash on linux when opening the settings dialog in debug mode\n\nD3D12 is not in the list of supported renderes on platforms other than windows.\nDeleting an item, that can't be found, triggers an assert in debug builds, so let's\navoid that.","sha":"cc12302dd4c8f5d33329bb39edb87cf16e300e89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1690697?v=4","date":"2017-04-16T01:31:58Z","email":"rymg19@gmail.com","login":"refi64","name":"Ryan Gonzalez"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-18T19:37:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Misc compile fixes","sha":"e447f071cea6e81aaeecf1dccb5d7830ec9d7ce5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-17T16:11:55Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-19T00:42:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add FTFaceH_GetMaxVerticalAdvance function","sha":"d27c3eee2468a2c13582b4cac37eb3f975949a9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-17T16:27:53Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-19T00:42:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add FT_Done_Library function","sha":"df8a0517dc6cd8b15bf9ab70a2f8eeb625dff000"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-17T16:46:42Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-19T00:42:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add cellFsAccess function","sha":"ba9fdfa802c14b2a48faa68a8f78336bf8b7d7ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-19T18:24:52Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-19T18:24:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add cellRtcAlarm module (#2703)","sha":"8060cf9b19940dea31719b29ef869906153b6ea5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-04-19T21:16:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-19T21:16:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Lib Loader Radiobutton (#2689)","sha":"ff5295de32fc29a80ca1b4edd4c09eb295b9dc36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-19T11:31:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-19T21:17:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"offset32(): pointer-to-member arithmetic","sha":"9b4320311140acec2162a2c937cc0125532d9c56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-19T21:52:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-19T21:52:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix Lib Loading","sha":"f7cb1aea640950ed3505fae99bb40130692a008e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-19T21:52:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-19T21:52:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Disable SPUJIT.log (opt-in)","sha":"463e18f893862dcfe50095e71c7fdd7d1b67e6ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-04-22T14:35:36Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-04-22T14:35:36Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: add source alpha saturate blend factor (#2724)","sha":"24fc1027ea71ee9888d46559152c889e531e450b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-22T14:06:37Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-23T13:02:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub new modules\n- cellGamePs1Emu\n- cellSysconfPs1emu\n- sysBdMediaId (which included sys_get_bd_media_id)\n- sysConsoleId (which included sys_get_console_id)\n- sysPs2Disc","sha":"8b2473251d15cf49486edf8343f0846935abb3e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-04-25T10:32:39Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-04-25T10:32:39Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"[Render] Userclip for d12/vk/ogl (#2719)","sha":"60ce85f840aaa728d51235e7c6a94824ddcddac4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-22T12:28:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-25T23:27:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use libfs.sprx (LLE)","sha":"d05b6135c67150ce520af979662b3f77d6602c32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-22T12:29:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-25T23:27:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFsGetDirectoryEntries rewritten","sha":"0f95736c365f5945fad90661d02a992fc5f9cb14"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-22T13:00:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-25T23:27:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU Debug fix","sha":"a626bbf63578fa9141a04ef029d26433bb2e7f94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-22T13:01:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-25T23:27:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: 0xc0000006 stub","sha":"d7c3d1ce125be4595599e383588a4c763538f66f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-22T14:58:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-25T23:27:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix module initialization","sha":"634f353ed4b3e2077ca89b477d81dbdfe9799ca3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-22T22:07:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-25T23:27:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFsSdataOpenByFd fixed","sha":"19fd8c109e876ef5d8b4618b9e1e638bc296ea68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-24T15:43:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-25T23:27:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_fsync implemented\n\nsys_fs_fdatasync implemented as equal function","sha":"256dfc5729451ff5b8a94c3a45a3b93c554cf88c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-24T15:45:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-25T23:27:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs::statfs implemented","sha":"f42b830ce975b05b88952c8394e4a85ba74ffe06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-24T16:49:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-25T23:27:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_test implemented","sha":"1bbb76fa20d413a90ccab73d9b2a8c618200f9ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-24T20:30:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-25T23:27:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_lsn_lock implemented","sha":"a95a63a58abc8bbc0824eedee854a4a9d7631817"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-25T00:13:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-25T23:27:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFsGetFreeSize implemented","sha":"c3c442ccb182d55e619069f59d73b2abc1e2ac72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-26T12:48:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-26T13:10:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_fcntl update","sha":"3f5951c9f83df25124c069372a2d60befa61dca6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-26T17:26:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-26T17:26:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_lsn_get_cda_size stub","sha":"b0a83cdb568a272bbe09cd37a06a67cf2fe3b823"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-26T17:31:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-26T17:31:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_fget_block_size improved","sha":"8055d83da204f9099b14d4a41d67bc1fb8655f97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-26T20:05:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-26T20:05:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellAudioAdd2chData fixed\n\ncellAudioAdd6chData fixed\nSpeculatively.","sha":"f6383f6e0632fe327533645ad5217def1b45aa7b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-26T20:38:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-26T20:38:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"REG_FUNC+ macro improved\n\nThis includes REG_FNID, REG_VAR, REG_VNID\nAllows to specify alternative function name","sha":"5f26c2fc8fef285895524adc2686a8793d9b0541"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-04-22T07:09:35Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-28T22:26:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[Crypto] Edat cleanup","sha":"16d7eb4f5592f96ad150f3137d6d4820406626f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-04-22T07:12:46Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-28T22:26:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Settings Fix","sha":"f064a26382bbbbaf2aed6b56631edbed71dfe342"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-04-25T16:07:23Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-28T22:26:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix typo/spacing from userclip","sha":"ac58953276b55b72199fa70452ebeb19aaac9c32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-04-26T03:05:48Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-28T22:26:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellGameContentErrorDialog freeze","sha":"c8252d2b28f0dd78d65e27174dd16a6dfd37431a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-04-28T01:02:21Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-28T22:26:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellPadGetData button reports","sha":"5f470b316a60ee1389f4d22aa9b8d67e37f8ea5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-04-28T07:17:31Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-28T22:26:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Partially implement cellPadGetDataExtra","sha":"ff366f4e4e082832d71e38e557dbc5c8221bcd5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-04-28T23:44:42Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-28T23:44:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub cellFiber module (#2704)","sha":"84ba7c3e73291d5adf94c0da25a4eea085205599"}
+{"author":{"avatar":null,"date":"2017-04-23T17:30:05Z","email":"pvezien@clever-age.com","login":null,"name":"Pierre Vezien"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-30T15:21:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub sceNp functions to return an offline status until further developement is done.","sha":"f40dcbfa30014551ee2c126a7047d60c3dda782d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10865706?v=4","date":"2017-04-30T18:05:50Z","email":"WisterToub@users.noreply.github.com","login":"WisterToub","name":"Wilfried Rabouin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-30T18:05:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU interpreter (precise): SAT bit implemented (#2736)","sha":"7ab210432e71a60284d180ed43e5b9d9f571ab78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-28T13:28:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-30T18:10:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Stack overflow detection\n\nAdded a gap between stack allocations\nPPU callstack improved","sha":"b349100d9daf06b61c3c9a056126ab50be3bf566"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-28T16:03:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-30T18:10:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Preserve original function names","sha":"eba44261c79dfe20c9aac47b8ad4c46a07ca734e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-28T15:20:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-30T18:10:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Organize cellDaisy","sha":"95c6278863e4fa508f6e7b8e416ebeee58115c50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-30T15:21:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-04-30T18:10:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Hide cursor in GSFrame\n\nImplements #2054","sha":"28456170537af065c12660f250706e7debcaae50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-05-01T18:35:49Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-01T18:35:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update sceNpSns (#2732)","sha":"e33c01131ec52de8bef9ca4f74fbd7b925ec67d7"}
+{"author":{"avatar":null,"date":"2017-05-02T17:03:03Z","email":"Xemnoras@users.noreply.github.com","login":null,"name":"Xemnoras"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-05-02T17:03:03Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix FAQ link (#2748)","sha":"bef67c8a2d5a4924e7007b306219402f5dcecbdc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-04-29T00:57:12Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-04T20:35:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add hidapi submodule, build updates / readme","sha":"6d7419be0e4af0a4e04f31b867dfa8ff114b188f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-04-29T01:02:28Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-04T20:35:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"DS4 Support. Supports sixaxis and vibrate","sha":"6bb32e4e80ae3937c9a29dcf9db08c1d5e27efac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-04-29T01:02:58Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-04T20:35:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"XInput vibrate support","sha":"b9ebf595e6588054fdedb482f1b9039555de70ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-01T18:34:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-04T21:11:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update supporters","sha":"e2478902c9bd3b8c90bca5084c477711a792d398"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-01T18:34:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-04T21:11:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_fsync fix","sha":"e8d76ede14abd768b873af6099fdb0f3a779537e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-06T22:08:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-07T12:24:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFs fixes\n\ncellFsAllocateFileAreaWithoutZeroFill implemented","sha":"b1e8eefad0fdb2e793c6d0da2ac6ca5f385fed10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-21T13:35:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-10T18:50:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Start work on buffer synchronization\n\naddendum - fix build\n\nvulkan: separate cached section lifetime management\n\nbug fixes","sha":"fd754a4ddce638ac6864fc3c6af38207bfe57e13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-21T19:55:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-10T18:50:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Use a parallel cb for texture cache ops; bug fixes\n\nvk: More surface fixes and debug stuff\n\nvk: Crude thread sync implementation to prevent cb desync crashes due to resource usage\n\nfix build\n\nmore fixes\n\nvulkan: Do not flush command queue if address cannot be flushed\n\nvk: More fixes for accuracy. Needs optimizations\n\nvk: Batch all flush-to-buffer operations in the non-critical path\n- More work is needed to make queue submission asynchronous","sha":"2b190312064158511b4856a42d03dbee18fa5897"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-22T14:56:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-10T18:50:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"clear up a spec misunderstanding","sha":"b78c6f71277ccab806d1dfc321c67f3c8ee92a87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-22T18:30:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-10T18:50:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Use non-blocking list of lists (WIP)\n\nwhitespace fix only\n\nfacepalm","sha":"c7db322873bebb0b254c20f2c2264bb324b4f26a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-23T09:32:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-10T18:50:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactor image scaling code; Scale downloaded surfaces with vulkan","sha":"e1a75deb25c9a6ffcc8162639894e06fc7a58e63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-23T12:00:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-10T18:50:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Buffer sync timing tweaks\n\nvulkan: more sync timing fixes","sha":"3b27b3c182fc0c23acd2609785fb284a1f5f372f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-23T14:17:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-10T18:50:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Mark of critical code from allowing cb split in exception handler\n\nvk: Shader loads are sacred","sha":"0ec88bb65d8a990c27cd9ab1cf7ebe9e0d2f4240"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-23T16:20:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-10T18:50:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Do not bother with cache checks if buffer sync is not managed\n\nintroduce pause intrin","sha":"4b5a30f53d548b37a2af241c3592c203790d4e2d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-23T20:09:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-10T18:50:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"spu: Speed hacks - Do not starve PPU threads\n\noptionally hint to the OS scheduler to give less attention to SPUs\n\nui: Add speed 'hacks' as configurable options","sha":"df7b4666569a53edd2558d0ad1a76b7398aabf49"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-09T14:41:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-10T18:50:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Enable GPU texture scaling by default","sha":"450d45354cdbf43eb85f47f20c109775f1bbcaed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-09T00:56:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-11T16:05:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_ppu_thread_once rewritten\n\nsys_initialize_tls moved\nsys_interrupt_thread_disestablish moved","sha":"5ffb4766b095506fe0f648fcec03cbddfbb0fcd4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-09T13:15:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-11T16:05:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Disable /host_root/ by default","sha":"d4146e4e689dba37b67af50084257f2a4090263f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-09T13:50:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-11T16:05:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_ppu_thread_register_atexit implemented","sha":"3a5efe980940205bab0988e0d20851522a2f2ef2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-09T15:17:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-11T16:05:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ppu_initialize_syscalls draft","sha":"8209e6c1e3ac1b2f1b25daacb3cb444618506637"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-09T15:51:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-11T16:05:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove AutoPause.cpp","sha":"08c955d177fcd58fe59234649e04b86b1fb65acd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-10T11:58:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-11T16:05:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellFsGetPath implemented","sha":"75017345beb6a947a4c47800fc4d9e6ecdd2fd54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-10T14:43:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-11T16:05:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Stub sys_fs syscalls","sha":"8df95dbe39c3a74aa8f4eb194c12129a91a5e757"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-11T16:05:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-11T16:19:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update yaml-cpp","sha":"07f0c7b4a55c162ca3b6d3ca41ab2b82452125a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-10T22:42:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-12T17:10:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Vertex program output fixes","sha":"c5975d5f66917c45deca5500aea1c3fbe8c20baf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-12T16:32:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-12T17:10:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Use strict vertex output declaration for better compatibility with mesa","sha":"7460bdfb1b396bf832cc9f21b452521b19d4efac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-12T16:33:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-12T17:10:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Workaround to detect opengl driver caps for intel","sha":"d24ba0da90d5c6469fe4475f5ab4ea4bd51c0999"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/12189224?v=4","date":"2017-05-14T04:56:24Z","email":"shameful@users.noreply.github.com","login":"shameful","name":"shameful"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-05-14T04:56:24Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"fix for shader fog mode exponential2_abs (#2781)\n\n* Update VKFragmentProgram.cpp\r\n\r\nadded missing exponent parameter\r\n\r\n* fixed misplaced exponent in VKFragmentProgram.cpp\r\n\r\nparameter that belonged to pow() was being passed to exp() instead, causing the shader compilation to fail\r\n\r\n* fix for opengl fog_mode exponential2\r\n\r\nsame fix as the vulkan version\r\n\r\n* directx fog_mode exponential2 fix\r\n\r\nmisplaced parameter\r\n\r\n* directx fog_mode exponential2_abs fix\r\n\r\n* vulkan fog_mode exponential2_abs fix\r\n\r\n* opengl fog_mode exponential2 fix","sha":"e93c4c42b61e83debdc86b147e727323040927d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-14T08:50:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-05-14T08:50:24Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"gl: Strict export of diff_color and spec_color for mesa compatibility (#2779)\n\n* gl: Strict export of diff_color and spec_color for mesa compatibility\r\n\r\n* gl: Relax the front_diff/spec rules a little","sha":"c26607de08cff21994a9142cf86545a3e3ed6769"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-05-15T11:30:14Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-15T11:30:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub cell (#2785)\n\n* Update cellGcmSys\r\n\r\n* Update cellStorage\r\n\r\n* Update cellSubdisplay\r\n\r\n* Update sceNpTrophy\r\n- Use error_code as return type\r\n- Add few checks\r\n\r\n* Update cellKey2char\r\n\r\n* Update cellKb:\r\n- Use error_code as return type\r\n- Replace UNIMPLEMENTED_FUNC by .todo\r\n\r\n* Update cellNetCtl\r\n\r\n* Update cellSpudll\r\n\r\n* Update cellSysutilAp\r\n\r\n* Update cellUserInfo\r\n\r\n* Stub sys_mempool_allocate_block (bad idea)","sha":"299f627321ad19d085b4997546472260ae87b6b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-13T18:30:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-15T11:37:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"config.yml: Log section optimized","sha":"88fef183a365bcf7c0fb264b8fcb6019f840383e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-14T20:29:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-15T11:37:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor StrFmt fix\n\nAdded fmt_unveil<f16>\nAdded enum helper (experimental)","sha":"3a1f1dbc1a327457a177cb5763a5705c1040b2b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-14T20:30:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-15T11:37:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Added CELL_CANCEL","sha":"81c8d3f27ab3dca17d05c81f6ff1d99c03852226"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-14T20:45:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-15T11:37:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs::statfs fixed","sha":"45908b9dd8f6fd55e6abcee83e5a877686e6a2b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-15T11:58:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-15T11:58:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CELL_OK cleanup","sha":"7ac64a6725e0f888bc327bcda954db5f1531a692"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-05-15T23:33:37Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-05-15T23:33:37Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Stub cellGcmSetWaitFlipUnsafe() (#2786)","sha":"f54628fcfd0614fc6c2d402ec64993a4b5f73422"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-05-18T11:22:45Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-18T11:22:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update asmjit submodule (Testers wanted!) (#2782)\n\n* Update asmjit submodule\r\n\r\n* Add myself as a contributor \t😉","sha":"c133db672118bce81ca627f938ce80dea96762f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-05-18T16:31:39Z","email":"Zangetsu38@users.noreply.github.com","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-18T16:31:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix compilation asmjit for VS. (#2791)","sha":"43b06c2a9cbc45096ffd81be3fc0a5b6943ef887"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-15T18:54:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-18T22:13:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix MFC_WrTagUpdate","sha":"b613fb70f15740e900be9e9a338075a489d8dde9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-15T19:49:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-18T22:13:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ALSA: decrease buffer","sha":"bd8dfac713b261d68a62565a16fc7cb351a01fb9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-16T11:29:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-18T22:13:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cfmt improved","sha":"d5107aab47c76dae4525dd024c491aa373f21bc8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-20T11:45:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-20T13:01:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Configuration simplified","sha":"f010b5b235a9cda9ad1bcf84ae972c7e6c3de76b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-20T16:26:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-20T16:26:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Config fix","sha":"1c2a423b146082d3004032cb1fafa6228ab4472c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-05-17T02:57:51Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-21T15:07:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Set TrophyRequiredSize to 0","sha":"7ccc5d391019342592fb0590620286571cad4d0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-05-17T04:20:04Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-21T15:07:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix C00 SPRX loading","sha":"4bcafb3e75f8b5a8265b8d47787a5c7080427fb6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-05-17T05:11:03Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-21T15:07:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Ignore LLE savedata modules","sha":"80fc471067c83a9fa0888da155999a3dd86796c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-05-19T03:06:31Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-21T15:07:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ds4: use controller calibration values for accel/gyro","sha":"674acd84317fbb7bcde4da1be608826dee7a9e5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-03-29T09:29:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-22T11:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Use faster upload path when conditions allow\n\nFix aligned memory access (SSE)\n\nrsx: BufferUtils; always use optimized paths","sha":"e8b4d332eb6c61a7784c23919b29739c1ff401bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-17T11:37:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-22T11:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add support for repeated data streams (broken attrib divisor?)","sha":"d4ddc40988f1bfbcd148b21b0446f5c321382658"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-17T11:37:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-22T11:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Relax restriction on vertex register data fetch","sha":"0efc3c1c6ce5eab0444fdf7815b5362986cc0b73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-21T16:30:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-22T11:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: bugfix - avoid a divide by zero","sha":"786bcb0d1b95625c88e9c9b9cfe8bd1fe6e738fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-21T16:53:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-22T11:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve flush queue sync between cell threads","sha":"ccb23d70a513f78f09943a9cb39f4c444fd74bc6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-21T19:14:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-22T11:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Better handling of flow control ops","sha":"18df292f909432b26160525eb888eb68ba5886bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-05-20T03:37:14Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-22T17:53:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update .xpm based on new .ico","sha":"7f2e87580f0e6a195e92fff189f97b8e7119305a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-05-20T03:38:53Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-22T17:53:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add installation for linux","sha":"83ffd7c9fb29f78e02b69197395567bb101f48f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/934782?v=4","date":"2017-05-23T14:18:49Z","email":"ubpd34th@gmail.com","login":"grimd34th","name":"Trevor"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-23T14:18:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add caching for dependencies in appveyor.yml (#2804)\n\n* Add caching for dependencies in appveyor.yml\r\n\r\n* Add cache clearing support for Appveyor\r\n\r\nClears the cached files if appveyor.yml changes","sha":"a5874d76d1d3ace0b72b6eed362f735edd9aa55b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-24T15:33:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-05-24T15:33:16Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"cmake: Link libllvm-4.0.so dynamically to avoid conflict with system libs (#2811)\n\n* cmake: Link libllvm dynamically to avoid conflict with other system libs","sha":"e82163bfb954f5922d7d7caba9bb3a43b1b9ba1c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1392608?v=4","date":"2017-05-25T15:46:28Z","email":"xperiancedapps@gmail.com","login":"xperia64","name":"xperia64"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-25T15:46:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Add option to select Vulkan device (#2814)","sha":"05b95759811abe42d82533a7b496ee591537a7cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1646210?v=4","date":"2017-05-25T08:39:41Z","email":"john.ettedgui@gmail.com","login":"John-Gee","name":"John-Gee"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-05-26T10:11:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Need to link to libatomic for objects with sizes that aren't supported natively by the CPU","sha":"63cadab042f9168ea1d2fda1ebe73d029b690164"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-26T14:10:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-26T15:26:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"ui/vk: Reimplement vulkan GS selection; minor fixes for broken contexts on unsupported devices","sha":"e6d55a6692d5d9f23602277a53761554a9eca4b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-01T12:53:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-06-01T12:53:25Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx/fp/gl: Minor fixes (#2823)\n\n* rsx/fp: expand glsl unpack instructions to vec4\r\n\r\n* rsx/fp: Ignore BRK outside LOOP/REP\r\n\r\n* fix string compare typo","sha":"d5df4a4616aa73d2a88b0509a943d82470230535"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-05-26T21:02:36Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-02T16:40:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"cellPadPeriphGetData impl","sha":"56b21fd4112258f585b04f57f259d40eb7014f0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-05-31T02:54:35Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-02T16:40:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"cellPad: Clear info structs before setting","sha":"195f24507b5caf08239a7f027c201390ddf1cbfc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-06-04T14:48:33Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-04T14:48:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"RPCS3 QT (#2645)\n\n* Fix windows build.  I made sure to do everything with a win32 prefix to not effect linux build.\r\n\r\n* Make the window resizable instead of fixed in the corner.\r\n\r\n* Ignore moc files and things in the debug/release folder.  I might also ignore rpcs3qt.vcxproj and its filters as they're autogenerated by importing the qt project file.  But, this helps clean out clutter for now.\r\n\r\n* Add cmake.  This doesn't interact with the rest of rpcs3 nor the main cmake file.  That's the next thing I'm doing. I'll probably need to modify them so it'll take me time to figure out. But, this will build rpcs3qt on linux and build as is with using qt.\r\n\r\n* The build works. I'd like to thank my friends, Google and Stackoverflow.\r\n\r\nSetted up by importing rpcs3Qt project using Qt's visual studio plugin.\r\n\r\n* Cleanup.  Remove all the stuff in the rpcs3qt folder as its incorporated elsewhere. Remove the rpcs3qt project file as its now built into the solution and cmake doesn't care about pro files.\r\n\r\n* Update readme to reflect getting Qt.\r\n\r\n* Remove wxwidgets as submodule and add zlib instead. Wxwidgets was our old way of having zlib. I also added build dependencies to rpcs3qt so you should no longer get link errors on the first clean rebuild.\r\n\r\n* Add rpcs3_version, few GUI tweaks\r\n\r\n* Set defaultSize to 70% of screen size\r\n\r\n* Add the view menu (#3)\r\n\r\n* Added the view menu with the corresponding elements. Now, the debugger/log are hidden by default. The view menu has a checkbox which you click to show/hide the dock widgets.\r\n\r\n* Make log visible by default\r\n\r\n* Improve UI by making it into a checkbox that's easier to use.\r\n\r\n* fix qt build for vs2017 (seems to work fine in 2015 with plugin but needs testing by other users)\r\n\r\n* updated readme for qt\r\n\r\n* update appveyor for qt\r\n- cleaned formatting for the post build command\r\n\r\n* fix build (#6)\r\n\r\n* fix build legit this time i promise\r\n\r\n* [Ready] Gamepadsettings (#4)\r\n\r\n* WIP Gamepadsettings\r\npushbutton Eventhandling missing\r\n\r\n* GamepadSettings should work except for cfg Init\r\nSome KeyInputs are missing\r\n\r\n* Update padsettingsdialog.h\r\n\r\n* Update padsettingsdialog.cpp (#5)\r\n\r\n* Update padsettingsdialog.cpp\r\n\r\nremoved silly tabs\r\n\r\n* Update padsettingsdialog.cpp\r\n\r\n* GetKeyCode simplified\r\n\r\n* rename pad settings to keyboard settings o.O\r\n\r\n* rename keyboard setting to input settings\r\n\r\n* Remvoed the QT_UI defines.\r\n\r\n* Readded new line at end of file. Replaced define in padsettings with constant.\r\n\r\n* GUI fixes (Settings)\r\n\r\n* Stub the logger UI. Nothing special besides a simple stub.\r\n\r\n* Unstub the log. I haven't tested TTY but it should work.\r\n\r\nOnly thing to do, but this is in general, is add persistent settings.\r\n\r\n* Minor refactoring to simplify code.\r\n\r\n* Fix image loading. I'm 90% sure it works because it loads the path as expected and that's the same format I used in my gamelist implementation for the images.\r\n\r\n* Made game lists much more functional than it was.\r\n\r\n* mainwindow\r\n\r\n* gamelist\r\n\r\n* Please forgive me for I have lambdaed.\r\n\r\nAdded the ability to toggle showing columns via a context menu.\r\n\r\n* Fix GameList further\r\n\r\n* sort by name on init fixed\r\n\r\n* Created the baseline refactoring. I'm going to start working on the callbacks now.  May need to implement other classes in the process. Fun stuff, I know.\r\n\r\n* adds InstallPkg (tested) and InstallPup (should work but makes unknown shenanigans) implementation\r\nadds RefreshGameList\r\nobliterates 10sec Refresh\r\n\r\n* messages\r\n\r\n* Rpcs3 gs frame (#16)\r\n\r\n* Messing with project settings try to get trails of cold steel to boot.bluh\r\n\r\nDefinitely one change is needed in linker settings for RPCS3 to not crash immediately.\r\n\r\nCan't even see how horribly botched my implementation of GSFrame is because we aren't booting lol. Something is gone awry with elf.\r\n\r\n* remove random ! not that it matters much right now\r\n\r\n* minor additions\r\n\r\n* \"Working\" with debug mode though you have to ignore an assert reached from Qt. Qt is upset that the rsx thread is calling stuff on the UI thread despite not owning it.  However, I can't do a thing to change that atm. (The fix would be to do what the TODO says in System.cpp-- making gsframe and stuff get initialized via system call)\r\n\r\nCrashes due to needing pad callback to be done.\r\n\r\n* With this build in debug mode, Trails of Cold steel will get FPS. (caveat. You have to ignore when Qt throws a debug assert lol)\r\n\r\n* Fix release mode.  Fix the Qt debug assert by using ancient occault rituals.  I want to be able to remove the blocking connects but it won't work right now without it.  It isn't perfect but it's good enough for now IMO.\r\n\r\n* Add enters to the end of files.\r\n\r\n* Removing target and setting source of events to be the application instead of the main window. The main window isn't the game window, and I don't really know what widget will be targetted for the game event.  Works, though, it's admittedly probably not optimal by ANY means.\r\n\r\n* Fix comment.\r\n\r\n* Fix libpng wit zlib.\r\n\r\n* Move Qt GUI into RPCS3Qt. (#17)\r\n\r\nRestore wx GUI.\r\n\r\n* fix install-progressdialogs randomly not showing\r\n\r\n* install-progressdialog cosmetics\r\n\r\n* add stylesheet file loading\r\n\r\n* apply request\r\n\r\n* Add stylesheet to git ignore.\r\n\r\n* XInput..\r\n\r\n* Joystick...\r\n\r\n* Rpcs3 qt small fixes (#20)\r\n\r\n* Small fixes.  Have emulator stop when x button is pressed on game window.  Have emulator/application stop when the main window is closed.\r\n\r\n* If I forget another new line ending for a file.............................................\r\n\r\n* Add CgDisasm (#21)\r\n\r\n* fix install-progressdialogs randomly not showing\r\n\r\n* install-progressdialog cosmetics\r\n\r\n* add stylesheet file loading\r\n\r\n* apply request\r\n\r\n* add CgDisasm\r\nadd code to disable contextmenu options\r\nfix gamelist issue\r\n\r\n* missing proj changes\r\n\r\n* Add ability to open stylesheets from menu.\r\n\r\n* Mega searcher (#23)\r\n\r\n* add MemoryStringSearcher\r\nset minimum Sizes for mainwindow and CgDisasm\r\n\r\n* minor fixes\r\n\r\n* Since the system.cpp callbacks for emulator state were unused, I removed them.  Then, I replaced them with callbacks for the Gui.\r\n\r\n* added stylesheet options\r\nsetfocus on settings fixed\r\nnewline added\r\n\r\n* added signals and slots for EmuRun and EmuStop\r\n\r\n* update ui\r\n\r\nupdate ui now works\r\nadded callback onReady\r\nadded EnableMenues\r\nadded ps3 commands\r\n\r\n* added restart logic to menu\r\n\r\n* newline\r\n\r\n* event header removed\r\n\r\n* Added graphic settings class. (#26)\r\n\r\n* Added graphic settings class. First thing is to have the dock widgets and window size/location be stateful.  Minor bug with debugger frame changing size on hide/show on default setup on second load. But, otherwise, fine. Also, the GUI doesn't update to accomodate the statefulness of the widgets.  But, that'll come in time as I update this class.\r\n\r\n* Add view debugger, logger, gamelist to settings and synchronize them.\r\n\r\n* Separate initializing actions from connects\r\n\r\n* Add invisible fullscreen cursor and double click event.\r\n\r\n* Add the UI log settings.\r\n\r\n* Add MemoryViewer (#30)\r\n\r\n* Add Memoryviewer\r\nImage Button crashes/not fully implemented\r\nfocus on some button annoying\r\n\r\nminor changes for question dialogs\r\n\r\n* GuiSettings Refactoring (#31)\r\n\r\n* Add settings for columns shown and which one is saved\r\n\r\n* I accidentally refactored the settings class.  Added ability to reset to default GUI.  Added statefulness to column widths.\r\n\r\n* add gui tab\r\n\r\n* Fix logging at startup.\r\n\r\n* Preset settings.I think I ironed out MOST of the glitches. Will work on the rest of it soon. Should be a lot simpler as I won't have to use the so-called meta settings. Also, renamed all settings methods to CapitalCase.\r\n\r\n* Removed dock widget controls.\r\n\r\n* Added style sheets. Removed the option from the menu.\r\n\r\n* Rewrite to use folder design. Much simpler! Yay! Simpler. Better, right?\r\n\r\n* It's remarkable how tricky this is.\r\n\r\n* Added convenience button to open up the settings folder in explorer\r\n\r\n* Add newlines at end of file\r\n\r\n* simplified logic. Fixed a bug.. hopefully not more bugs\r\n\r\n* Fix the undocumented feature\r\n\r\n* Make the dialog big enough to have entire text on title shown. If talkashie changes the font to size 1203482 I don't care lol\r\n\r\n* Make warning messagebox instead of changing the title of the dialog.\r\n\r\n* marking...\r\n\r\n* Hcorion suggested changes.\r\n\r\n* [WIP] autopause (#32)\r\n\r\n* autopause added\r\nneeds fixing\r\nheaders do not show text\r\n\r\n* fix compile stuff\r\n\r\n* Add MsgDialog + edge widgets (#33)\r\n\r\n* Add MsgDialog\r\nneeds magic\r\n\r\n* add \"Debugger\" Buttons to menubar\r\n\r\n* Adapt ds4 changes. I'm not sure if they work as I don't have a compatible controller.  But, at the same time, it's kind of silly all I had to do was remove stdguiafx to get compilation.\r\n\r\n* [Ready] Add KernelExplorer (#36)\r\n\r\n* KernelExplorer added\r\n\r\n* Fix build.  Connect mainwindow to show explorer.\r\n\r\n* qstr formatting added\r\nhid header, fixed button size\r\n\r\n* Taskbar Progress for install PUP/PKG (#37)\r\n\r\n* Add Taskbar Progress for both PKG and PUP installer\r\n\r\n* fix missing ifdefs for windows\r\n\r\n* add mainwindow icon + thumbnail toolbar\r\n\r\n* add game specific icons to the GSFrame\r\n\r\n* fix icon crash\r\n\r\n* fix appIcon's aspect ratio in SetAppIconFromPath\r\n\r\n* Fix black borders in RGB32 icons\r\n\r\n* rename thumbar related buttons\r\n\r\n* EmuSettings (#35)\r\n\r\n* Core tab done minus doing the library list.\r\n\r\n* Graphics tab.\r\n\r\n* Audio tab\r\n\r\n* Input tab\r\n\r\n* Added the other tabs\r\n\r\n* LLE part one-- load existing libraries sorted. (I'd finish it but I'm going to look at a PR by mega)\r\n\r\n* add search and add other libraries that aren't checked.\r\n\r\n* Finish adding lle selecting things.\r\n\r\n* marking my territory (#38)\r\n\r\nfixed settingsdialog glitch and width\r\nadded groupbox to gui buttons\r\nremoved parents from layouts\r\n\r\n* add debuggerframe + RSXDebugger (#34)\r\n\r\n* Add Debuggerframe\r\n\r\n* add RSXDebugger\r\n\r\n* add RSXDebugger fo real\r\n\r\n* RSXDebugger improved\r\nminor adjustments\r\n\r\n* add utf8 conversions like neko told me to\r\nhopefully i did not utf8-ise too many things xD\r\n\r\n* fix some variables\r\n\r\n* maybe fix image buffers in RSXDebugger\r\n\r\n* fixed image view (pretty sure)\r\n\r\n* fixed image buffer (hopefully)\r\n\r\n*  QT Opengl frame (#41)\r\n\r\n* fix RSX Debugger headers (#40)\r\n\r\n* fix some debugger layout issues\r\nfix RSX Debugger headers + some comments\r\n\r\n* add kd-11's SPU options\r\nfix D3D12 showing on non-compatible systems\r\ntidy up coretab\r\n\r\n* improve D3D12 behaviour in graphicstab:\r\nadapter selection and D3D12 render won't show on non-compatible systems\r\nadd monospace font to cgDisasm\r\n\r\n* enable update only on visibility\r\n\r\n* Rpcs3 qt llvm build (#42)\r\n\r\n* LLVM pushed so mega can test\r\n\r\n* probably is what is needed with Release LLVM\r\n\r\n* should probably have RPCS3-Qt be using release-llvm\r\n\r\n* include zlib the same way.\r\n\r\n* don't talk to me about how I made this happen.\r\n\r\n* I applied the magical treatment to debug mode too.  Though, it's entirely probably that doing it once in LLVM-release mode made this entirely redundant\r\n\r\n* hack\r\n\r\n* progress bar for LLVM spawns but doesn't close yet.\r\n\r\n* fix msgDialog (#43)\r\n\r\nfix oskDialog\r\n\r\n* Minor bug fixzz\r\n\r\n* fix osk and msgdialog for real (#44)\r\n\r\n* fix msgDialog\r\nfix oskDialog\r\n\r\n* fix OskDialog part 2\r\nfix MsgDialog part 2\r\n\r\n* This bug is evil, and it should be ashamed of itself.\r\n\r\n* Refactor YAML.  Commented out gui options that aren't added to config yet (add em back later when we merge that in)\r\n\r\n* Fix pad stuff.\r\n\r\n* add SaveDataUtility (#45)\r\n\r\n* add SaveDataUtility\r\n\r\n* fix slots\r\n\r\n* fix slots again\r\nfix lists not showing stuff\r\nfix dialogs not showing\r\nadd colClicked\r\nrefactor stuff and polish some layouts\r\n\r\n* add SaveDataDialog.h and SaveDataDialog.cpp\r\n\r\n* tidy up mainwindow\r\n\r\n* add callback\r\n\r\n* fix RegisterEditor (#47)\r\n\r\n* fix RegisterEditor\r\n\r\n* fix other dialogs' immortality (gasp...vampires)\r\n\r\n* remove debug leftovers\r\n\r\n* fix InstructionEditor (#46)\r\n\r\n* fix InstructionEditor\r\n\r\n* fix typo\r\n\r\n* Fix MouseClickEvents in RSXDebugger (#50)\r\n\r\n* Fix MouseClickEvents in RSXDebugger\r\nFix focus on MemoryViewer and RSXDebugger\r\nAdjust PadButtonWidth\r\n\r\n* fix another comment\r\n\r\n* fix debuggerframe events (#49)\r\n\r\n* Fix pad settings bro (#48)\r\n\r\n* Fix pad settings bro\r\n\r\n* fix comment\r\n\r\n* Icons and Menu-Additions (#39)\r\n\r\n* Add Icons and iconlogic to cornerWidget and actions\r\n\r\n* add cornerWidget toggle\r\nfix dockwidget action state on start\r\nremove DoSettings\r\n\r\n* fix game removal bug\r\nremove tableitem focus rectangle\r\ntherefore add TableItemDelegate.h\r\n\r\n* remove grid and focus rectangle from autopausedialog\r\n\r\n* add fullscreen checkbox to misctab\r\nminor padsettings layout improvements\r\n\r\n* Add show category submenu to view menu\r\nAdd gamelist filter accordingly\r\nfix minor bug where play icon was displayed despite pause label\r\nadd boolean b_fullscreen to mainwindow for later use in GSFrame\r\n\r\n* fix headers in autopausesettings\r\nfix remove bug in autopausesettings\r\nadd delete keypressevent in autopausesettings\r\nfix missing tr() and minor refactoring in gamelist\r\n\r\n* add default Icons for play/pause/stop/restart\r\n\r\n* Fix fullscreen start.  Some stuff was wrong with settings, just trust me.\r\n\r\n* remove fullscreen leftovers and fix merge\r\n\r\n* SPU stuff. (There was also a weird thing with config.h in GLGSFrame.h with an include that I removed to fix build)\r\n\r\n* please neko's lambda fetishes (#53)\r\n\r\n* please neko's lambda fetish in mainwindow\r\n\r\n* please neko's lambda fetish in gamelistframe\r\n\r\n* please neko's lambda fetish in logframe\r\n\r\n* fix neko's lambda fetish in debuggerframe\r\n\r\n* pleasefixdofetishsomething in Autopausesettingsdialog\r\n\r\n* fix sth sth lambda in cg disasm\r\n\r\n* lambda stuff in instructioneditor\r\n\r\n* lambda kernelexplorer\r\n\r\n* lambda-ise memoryviewer\r\n\r\n* lambda rsxdebugger\r\n\r\n* lambda savedatautil\r\nthis could be done even more, but the functions are not implemented\r\n\r\n* Rpcs3 qt fixes -- shadow taskbar bug (#52)\r\n\r\n* SShadow's bug of taskbar progress staying fixed on cancelling pkg install.\r\n\r\n* other taskbar\r\n\r\n* i'm still a baka\r\n\r\n* Fix a warning\r\n\r\n* qtQt refactoring (#54)\r\n\r\n* fix neko's snake fetish\r\n\r\n* File names should match headers. Are these the names I want?  Not necessarily.  But, this is much less confusing.\r\n\r\n* i thought I committed everything with stage all.........................\r\n\r\n* remove unused utilities\r\n\r\n* The most important commit of them all.\r\n\r\n* Disable legacy opengl buffers when not using opengl.\r\n\r\n* fix code review comment\r\n\r\n* Quick crash patch. Neko removed autopause. SO, I remove it too from emusettings/misc tab\r\n\r\n* Merge lovely things from master (#55)\r\n\r\n* Configuration simplified\r\n\r\n* untrivial parts of the merge\r\n\r\n* no need for these options anymore\r\n\r\n* Minor change to fix column widths at startup (not sure why it doesn't work already, but adding the true makes it work so......... whatever)\r\n\r\n* here ya go\r\n\r\n* FIx hitting okay in settings causing graphics to messup (#57)\r\n\r\n* fixes + msgdialog taskbarprogress (#56)\r\n\r\n* fix ok button in taskbar\r\nadd taskicon progressbar for msgdialog\r\nadd tablewidgetitem to rsxdebugger\r\nfix comments in save_data_utility.cpp\r\n\r\n* fix d3d adapter default\r\n\r\n* fix taskicon progressbar not being destroyed properly\r\n\r\n* add last_path to filedialogs\r\n\r\n* fix msgdialog crash on ok (#58)\r\n\r\n* fix thread stopping in debbugerFrame (#59)\r\n\r\n* Move Emu.init to be first.  This will fix the qt stuff seeming to ignore the virtual filesystem in the config. (VFS to be made soon maybe) (#60)\r\n\r\n* Fix full screen opening on double RIGHT click.\r\n\r\n* fix other instances of double click ...\r\n\r\n* Fix locaiton of gui config. (#61)\r\n\r\n* fix d3d bug (#62)\r\n\r\n* fix d3d bug\r\n\r\n* small utf8 addition\r\n\r\n* Fix cmake for qt (#64)\r\n\r\n* Initial CMake fix\r\n\r\n* Fix compilation with GCC\r\n\r\n* Get rid of awful hack\r\n\r\n* Update cotire with qt support\r\n\r\n* Maybe fix travis\r\n\r\n* Emergency Hack Relief Program Activated\r\n\r\n* Fix travis build (#65)\r\n\r\n* make about dialog great again (#67)\r\n\r\nand add previous additions\r\n\r\n* Fix library sort / smart gamelist context menu (#63)\r\n\r\n* fix library sort\r\n\r\n* add Title to custom game config dialog\r\n\r\n* disable options on gamelist context menu\r\n\r\n* use namespace for category Strings\r\n\r\n* introduce sstr\r\n\r\n* fix some tr nonsense\r\n\r\n* Rpcs3qt Appveyor (#68)\r\n\r\nFix appyveyor build!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\r\n\r\n* possible fix for gamelist icons (#69)\r\n\r\nadd warning for appicon\r\n\r\n* Fix clang build (#66)\r\n\r\nHcorion, the build savior.\r\n\r\n* Rpcs3 qt resources (#70)\r\n\r\n* Resource files attempt 1\r\n\r\n* Autorcc should probably be on?\r\n\r\n* forgot the most important file lol\r\n\r\n* Forgot an instance of the icon in the code...\r\n\r\n* Patch fix for clang build.\r\n\r\n* vulkan/d3d12 combobox merge (#71)\r\n\r\n* add vulkan adapterbox and merge with d3d12 box\r\n\r\n* fix adapter text on other renderer\r\n\r\n* gather render strings\r\n\r\n* attempt fix on gamelist row height\r\n\r\n* adjust adapter behaviour to new guideline\r\n\r\n* Compiler of Peace.\r\n\r\n* High critical hit rate.\r\n\r\n* Mugi eating strawberries is savage.\r\n\r\n* Apply KD-11 Hotfix (#73)\r\n\r\n* Most of Ani Adjusts (#72)\r\n\r\n* Most of the adjustments are made here.\r\n\r\n* fix gamelist rowheight\r\n\r\n* fix msg dialog layout and disable_cancel\r\n\r\n* cleanup\r\n\r\n* fix disable cancle again\r\n\r\n* fix debuggerframe buttons and doubleclick\r\n\r\n* Add a fun little bonus feature :) (#74)\r\n\r\n* category filters simplyfied (#75)\r\n\r\n* Cleaning up cmake a bit.\r\n\r\n* fixezzzzzz (#76)\r\n\r\n* upgrade Info Boxes\r\n\r\n* upgrade file explorer\r\n\r\n* refactor GetSettings and SetSettings\r\n\r\n* second refactoring\r\n\r\n* cleanup\r\n\r\n* travis is a grammar nazi\r\n\r\n* second travis shenanigans\r\n\r\n* third travis weirdo thingy\r\n\r\n* travis 4 mega fun\r\n\r\n* travis 5 default to def\r\n\r\n* finish refactoring for settings\r\nfix gamelist headers\r\n\r\n* hotfix msgdialog and infobox (#77)\r\n\r\n* msgdialog fix 1\r\n\r\n* fix zombie infobox\r\n\r\n* Rpcs3 Qt Welcome Page (#78)\r\n\r\n* Add a welcome dialog.\r\n\r\n* Add enter to end of file\r\n\r\n* i'm an idiot\r\n\r\n* last mistake i hope\r\n\r\n* sponsored via --> funded by\r\n\r\n* RPCS3 does not condone piracy.\r\n\r\n* Mega Adjusts\r\n\r\n* Ani Adjustments and a few refactorings\r\n\r\n* Yay\r\n\r\n* Add Gamelist Icon Sizes (#79)\r\n\r\n* Reverting Mega's suggestion.  If people can use alt-f4 to get around this dialog, they can probably use an emulator too.\r\n\r\n* Fix firmware file choice dialog in QT GUI (#80)\r\n\r\n* ani adjusts 2 + minor icon size simplifications (#81)\r\n\r\nFPS Additions\r\n\r\n* Update Travis to Qt 5.9 (#82)","sha":"6cfb184b1ec798eb209272a404040e7a582516a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-04T15:44:48Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-06-04T15:44:48Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Update Readme (#2829)","sha":"11f5f29c87f115675e2c133cbb2272d5540d1174"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-04T18:42:06Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-06-04T18:42:06Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Update TravisCI to build+upload AppImage for Linux (#2830)\n\n* Update TravisCI to build+upload AppImage for Linux\r\n\r\nSolves #2744 by @probonopd","sha":"3d284d3c8bbf3dd49decadc25a2dcc097a7aecf9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-04T19:52:57Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-06-04T19:52:57Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix travis (#2832)","sha":"1c91dac211da9ea6dc0c0c659155ed4dc55c5a90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2017-06-05T17:16:05Z","email":"talkashiegaming@gmail.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-05T17:16:05Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Update game_list_frame.cpp (#2835)\n\nFix two typos and make message less vague","sha":"761b74ec5914ae19d187d5be05b601a35f5e5d0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-04T22:29:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-06T23:01:45Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"fix shortcuts","sha":"8183449fb1c74cc2561b515e436e05f360f4f972"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-05T05:17:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-06T23:01:45Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"fix about dialog icon","sha":"35c80ab9fc8a2f70a8bd60a3c0b10594a499fe72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-05T05:59:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-06T23:01:45Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"fix game config saving to global if empty","sha":"6ab69012e3c6a60d0796c2b248c5a762abf8b6a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-05T06:18:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-06T23:01:45Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"maybe fix about dialog encoding","sha":"01ea3def5494abd9454054c94aebf0017077d2a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-05T18:50:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-06T23:01:45Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"add dpi scaling for windows\nfix welcome screen for all platforms (looks slightly different)","sha":"bda945218db378210d35bc85fbac6c0dbd818c78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-06T16:54:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-06T23:01:45Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"fix dpi scaling (for all ?)","sha":"affda37d043d61d4ad3fd8b604c6504ecacf0d30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-07T19:12:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-07T19:12:19Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"use global config as default for game config again (#2845)\n\nthis was missing as a result to the previous fix of the game configs","sha":"0f433ea8824097991e98d8bb7c563228cddd8b30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-08T12:52:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-08T12:52:18Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"GUI: Add recent games menu (#2843)\n\n* add recent games menu\r\n\r\n* remove invalid paths from list\r\n\r\n* push InvalidRecentAction into BootRecentAction\r\n\r\n* disable actions on boot\r\ndisable clear recent on freeze recent\r\n\r\n* fix gamelist games not booting on recent list\r\n\r\n* minor fix for list disable error","sha":"6cb7a178141f12834144235bad0c9d1ac6f4c71d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-05-29T16:24:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-08T16:08:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan bringup on linux\n\ncleanup: drop unused stuff","sha":"860b76452f1d63e1be7b40f93ecaf79561d79099"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-06T16:58:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-08T16:08:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"fixes to project files and build scripts\n\ncleanup","sha":"2556484c673bbcb49f8a608dbc924514f7ca14cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-06T22:43:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-08T16:08:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"update vulkan and glslang submodules\n\nupdate vulkan.7z","sha":"444c64ae757889b558d2364a699e465b25955adf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-07T19:45:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-08T16:08:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: API bug fixes - Improve spec conformity\n\nexplicitly request anisotropic filtering and BC compression\n\nclean up a leaking framebuffer handle reference when using debug overlay\n\nWait for device instead of queue to ensure no conflict during renderer shutdown\n\nClip scissor regions when doing surface clears","sha":"12da498001abe5bf3339dc7710aa8906c1cf1a0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-07T22:05:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-08T16:08:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix dpi awareness error; Enable program debug information on msvc","sha":"fab6951789c4ea783e26899eec7c1c204cdf0e87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/14922864?v=4","date":"2017-06-08T17:01:30Z","email":"areiser@hm.edu","login":"Areiser","name":"Areiser"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-08T17:01:30Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Add qt5-base dependency for arch linux (#2841)\n\nAdd Qt5 dependency for arch linux and debian/ubuntu","sha":"e5e95a31f1fae6b4646ab2b9dabbe9763ce0f181"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-08T18:59:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-08T18:59:07Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"GUI: Hotfix for Boot Recent (#2847)\n\n* fix recent list\r\ncheck for empty name\r\nonly change list enabled at aboutToShow\r\nonly AddRecentGame if Boot succeeded\r\n\r\n* use stringpairlist instead of two stringlists\r\nfix weird typo line\r\n\r\n* fix travis","sha":"d2518caf2eccbeef0224ae9cae7eb6a653fba9e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-06-09T22:40:10Z","email":"mudroch.robert@gmail.com","login":"flash-fire","name":"flash-fire"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-10T12:59:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix visual studio build since vulkan changed debug library names in update.","sha":"511ff9d12cb413ab43d49552d58a59e57555ab11"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-06-10T14:41:14Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-06-10T14:41:14Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"msg":"Grid Game Layout (#2854)\n\n* Grid layout\r\n\r\n* Add Tiny Mode\r\nfix scrolling\r\nfix maxGamesPerRow calculation\r\n\r\n* prime empty toolbar\r\n\r\n* Add Search Bar, Icon Size and List Mode to ToolBar\r\nFix some minor glitches\r\n\r\n* fix toolbar save and adjust default margin","sha":"3537671cb7ce8c718c7f6192193a3ca94d86a46c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-10T15:05:13Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-06-10T15:05:13Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Revert \"Grid Game Layout (#2854)\" (#2856)\n\nThis reverts commit 3537671cb7ce8c718c7f6192193a3ca94d86a46c.","sha":"5dd5323ad0b2a1972c8d12e4d9f7a9a038741c70"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-06-10T19:50:10Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-10T19:50:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Command line elf path fix (#2844)","sha":"0dd10d1457f941f4599184fd8d188b22076810d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-10T20:32:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-06-10T20:32:17Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx/vk: Fixes for ring buffer allocation and image clipping (#2850)","sha":"9aa632bcc1b80aa6d478e9eb73b369253ccbe649"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-11T14:07:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-11T14:07:00Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Grid Mode + Tool Bar (#2857)\n\n* Grid layout\r\n\r\n* Add Tiny Mode\r\nfix scrolling\r\nfix maxGamesPerRow calculation\r\n\r\n* prime empty toolbar\r\n\r\n* Add Search Bar, Icon Size and List Mode to ToolBar\r\nFix some minor glitches\r\n\r\n* fix toolbar save and adjust default margin\r\n\r\n* fix toolbar regression\r\nminor simplification in Refresh\r\n\r\n* Implement search and rename PopulateUI to PopulateGameList\r\n\r\n* minor refactoring hehehehehehe\r\n\r\n* Fix crash\r\n\r\n* refresh speedboost optimizations\r\n\r\n* Small refactoring of refresh to have default argument of false.\r\n\r\n* add icons to toolbar\r\n\r\n* fix scrambed order\r\n\r\n* search for serial as well","sha":"a3d1f7b7b0fc77796a903ca1232c6747ef8d862c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-06-12T15:47:26Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-12T15:47:26Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Add ability to boot elves in command line. (#2859)","sha":"5c7a4b14052470c4b8c3f321fd893ee9b10ee616"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-05-26T05:02:28Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-12T17:25:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement strncasecmp and strrchr","sha":"0c4cc34488b2c3163eea22e5caa76daf02109eda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-12T19:23:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-12T19:23:12Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Update Icons provided by Discord user rutantan (#2862)\n\n* update Icons + remove rightclick on toolbar\r\n* use better data icons\r\n* use better disc icons\r\n* Use better unknown icons\r\n* final adjustment (hdd icons)","sha":"25823a1f661e69eff808da5747dbcab480f43150"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-06-13T08:36:42Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-13T08:36:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Dx12/Vulk: Fix KernelBase.dll crash (#2870)","sha":"23d1ddbb8e2d5274110980e3408ab285d5eabc91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-06-12T18:45:29Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-14T17:45:14Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Misc organizing and bug fixing","sha":"e1a78abfc93c188f137c3940b19a7225417ad2f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-06-13T20:42:25Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-14T17:45:14Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Disable LLVM option in PPU when RPCS3 is not built with it","sha":"3f74bafa70e8f2e4e72faba1cb885e55c87f2f05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-06-13T22:03:23Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-14T17:45:14Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Add automated qt5 tech support in CMake","sha":"8872421785475f3859341dbb8e6c07a97ddd6051"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-06-14T00:51:02Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-14T17:45:14Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix annoying cmake output.","sha":"d6e456641876cd30d3121436a858dad2291192d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-06-15T10:22:06Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-15T10:22:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"  Include a VFS manipulation dialog (#2863)\n\n* VFS Dialog\r\n* Couple convenience changes. Refresh after dialog in case dev_hdd0 changes.  And, have add directory set which directory you're currently using as well.","sha":"f84f4ccd380957de831a964de0036e00df15f4e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-16T17:43:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-16T17:43:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix inconsistent selection in gamelist/grid (#2871)\n\n* use userrole instead of missingno\r\n\r\n* fix consistent gamelist selection\r\n\r\n* fix consistent gamegrid selection\r\n\r\n* scroll to selection on refresh\r\n\r\n* fix adapters not saved to config","sha":"aca5c73fb3a87e26efa35e960ba605dcbd337a65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-16T18:35:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-16T18:35:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Reimplement debugger resize & disassembly (#2876)\n\n* Reimplement debugger resize\r\nfix interrupt\r\n\r\n* add splitter to disassembly\r\nfix debugger regression of last commit\r\nfix gotoaddr pos\r\n\r\n* travis sth sth\r\n\r\n* add drag & drop to cg_disasm\r\n\r\n* check for invalid address on set breakpoint\r\nreenable debugger controls on Emu.IsReady()\r\n\r\n* check for valid address more thoroughly","sha":"31cedb619216515467d29e78bbe09f033c7e8257"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-17T18:55:28Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-17T19:42:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI: List SPRX modules only\n\nExcludes .prx modules from being listed, which prevents user from\ndownloading random folders from the web that only have .prx modules and\nbreak auto load.","sha":"fe8f6fb48ad131a95e3744de6b5835eadea73eb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-06-04T16:37:37Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-17T21:30:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix icon and exe name for VS.\nRename old rpcs3 project.\nRestored original name for rpcs3_.rc to rpcs3.rc.\nDelete old wxWidgets/setup.h & FindwxWidgets.cmake.","sha":"4c8cc7d5c28910a2e324cb3d6d5688c5af895ed8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-06-11T17:25:51Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-17T21:30:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Rename project rpcs3qt in rpcs3.","sha":"152ab8c13d223099e49c19d98a3a92c224206f25"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-06-16T15:15:40Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-18T17:09:41Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix refresh by having the save occur on accept instead of during the destructor.","sha":"40d1882db94db706bf96fda79b4608e177d9fd67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-06-16T15:42:13Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-18T17:09:41Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"EmuGameDir --> EmuConfigDir.\nGive QListWidget a parent to remove a slight memory leak.","sha":"8c9b816c3d103a15c2e00e7ef1f66ecb7369a712"}
+{"author":{"avatar":null,"date":"2017-06-18T18:05:02Z","email":"kirbyfan64@users.noreply.github.com","login":null,"name":"Ryan Gonzalez"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-18T18:05:02Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix message shown when Qt 5 is missing (#2884)","sha":"907c800e877917cc69803fa47787795529079f47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-18T20:47:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-18T20:47:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix hex_to_bytes","sha":"9cc52c75e30c434863f6bcf89205ff0178a7bb89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-06-03T02:42:34Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-21T16:28:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"kb/mouse: fix max in init","sha":"f77e9f8bc1e1c2ad42ebe867163249819ee6dbd6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-06-19T02:00:42Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-21T16:28:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Trophy: return size for GetRequiredDiskSpace again","sha":"03268b083878cdb78ef841d7da129f79744ecd6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-06-19T04:59:02Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-21T16:28:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Sprx: loading / reloc fixes","sha":"d3df83a3eacfedbd048135d4d1bf5863185ac564"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-06-19T05:17:19Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-21T16:28:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGem: Fix headers","sha":"72590e2c93e767b2346290a97a1ea640a8e41843"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-06-20T17:28:56Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T17:08:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub some cellHttpAuth* functions","sha":"45dc7fbac840aa6be47f6fb2302a26f9af72b97b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-06-20T17:30:05Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T17:08:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub sys_rsxaudio_ functions","sha":"4d294e7a699746b531b627afdd400f355d252a7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-06-21T19:28:17Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T17:08:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub cellMsgDialogOpenSimulViewWarning","sha":"fe67d51e5eaf438943ab481d1c31c0122fed5885"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2017-06-22T17:27:12Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T17:27:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"HLE cellHttpUtilParseUri, Also initalise networking with windows. (#2879)\n\nTODO: rewrite with <regex>","sha":"ac12fc8b44ec4cbaa075e49486bc3a648d01a3dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2017-06-22T18:03:41Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T18:03:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve portability for BSDs (#2813)\n\n* sys_net: don't use fds_bits from a system header on FreeBSD\r\n\r\nrpcs3/Emu/Cell/Modules/sys_net.cpp:137:14: error: no member named '__fds_bits' in\r\n      'sys_net::fd_set'; did you mean 'fds_bits'?\r\n                                if (src->fds_bits[i] & (1 << bit))\r\n                                         ^~~~~~~~\r\n                                         fds_bits\r\n/usr/include/sys/select.h:75:18: note: expanded from macro 'fds_bits'\r\n#define fds_bits        __fds_bits\r\n                        ^\r\nrpcs3/Emu/Cell/Modules/sys_net.h:114:13: note: 'fds_bits' declared here\r\n                be_t<u32> fds_bits[32];\r\n                          ^\r\n\r\n* GUI: fallback to xdg-open on other Unices\r\n\r\nrpcs3/Gui/GameViewer.cpp:289:26: error: use of undeclared identifier 'command'\r\n        wxExecute(fmt::FromUTF8(command));\r\n                                ^\r\n\r\n* File: FreeBSD never supported copyfile(3) but sendfile(2) works fine\r\n\r\nUtilities/File.cpp:114:10: fatal error: 'copyfile.h' file not found\r\n#include <copyfile.h>\r\n         ^~~~~~~~~~~~\r\n\r\n* Thread: add signal handling for BSDs\r\n\r\nUtilities/Thread.cpp:761:23: error: use of undeclared identifier 'REG_RAX'\r\nstatic const decltype(REG_RAX) reg_table[] =\r\n                      ^\r\nUtilities/Thread.cpp:763:2: error: use of undeclared identifier 'REG_RAX'\r\n        REG_RAX, REG_RCX, REG_RDX, REG_RBX, REG_RSP, REG_RBP, REG_RSI, REG_RDI,\r\n        ^\r\nUtilities/Thread.cpp:763:11: error: use of undeclared identifier 'REG_RCX'\r\n        REG_RAX, REG_RCX, REG_RDX, REG_RBX, REG_RSP, REG_RBP, REG_RSI, REG_RDI,\r\n                 ^\r\nUtilities/Thread.cpp:763:20: error: use of undeclared identifier 'REG_RDX'\r\n        REG_RAX, REG_RCX, REG_RDX, REG_RBX, REG_RSP, REG_RBP, REG_RSI, REG_RDI,\r\n                          ^\r\nUtilities/Thread.cpp:763:29: error: use of undeclared identifier 'REG_RBX'\r\n        REG_RAX, REG_RCX, REG_RDX, REG_RBX, REG_RSP, REG_RBP, REG_RSI, REG_RDI,\r\n                                   ^\r\nUtilities/Thread.cpp:763:38: error: use of undeclared identifier 'REG_RSP'\r\n        REG_RAX, REG_RCX, REG_RDX, REG_RBX, REG_RSP, REG_RBP, REG_RSI, REG_RDI,\r\n                                            ^\r\nUtilities/Thread.cpp:763:47: error: use of undeclared identifier 'REG_RBP'\r\n        REG_RAX, REG_RCX, REG_RDX, REG_RBX, REG_RSP, REG_RBP, REG_RSI, REG_RDI,\r\n                                                     ^\r\nUtilities/Thread.cpp:763:56: error: use of undeclared identifier 'REG_RSI'\r\n        REG_RAX, REG_RCX, REG_RDX, REG_RBX, REG_RSP, REG_RBP, REG_RSI, REG_RDI,\r\n                                                              ^\r\nUtilities/Thread.cpp:763:65: error: use of undeclared identifier 'REG_RDI'\r\n        REG_RAX, REG_RCX, REG_RDX, REG_RBX, REG_RSP, REG_RBP, REG_RSI, REG_RDI,\r\n                                                                       ^\r\nUtilities/Thread.cpp:764:2: error: use of undeclared identifier 'REG_R8'\r\n        REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15, REG_RIP\r\n        ^\r\nUtilities/Thread.cpp:764:10: error: use of undeclared identifier 'REG_R9'\r\n        REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15, REG_RIP\r\n                ^\r\nUtilities/Thread.cpp:764:18: error: use of undeclared identifier 'REG_R10'\r\n        REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15, REG_RIP\r\n                        ^\r\nUtilities/Thread.cpp:764:27: error: use of undeclared identifier 'REG_R11'\r\n        REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15, REG_RIP\r\n                                 ^\r\nUtilities/Thread.cpp:764:36: error: use of undeclared identifier 'REG_R12'\r\n        REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15, REG_RIP\r\n                                          ^\r\nUtilities/Thread.cpp:764:45: error: use of undeclared identifier 'REG_R13'\r\n        REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15, REG_RIP\r\n                                                   ^\r\nUtilities/Thread.cpp:764:54: error: use of undeclared identifier 'REG_R14'\r\n        REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15, REG_RIP\r\n                                                            ^\r\nUtilities/Thread.cpp:764:63: error: use of undeclared identifier 'REG_R15'\r\n        REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15, REG_RIP\r\n                                                                     ^\r\nUtilities/Thread.cpp:764:72: error: use of undeclared identifier 'REG_RIP'\r\n        REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15, REG_RIP\r\n                                                                              ^\r\nUtilities/Thread.cpp:792:26: error: no member named 'gregs' in '__mcontext'\r\n                const u64 reg_value = *X64REG(context, reg - X64R_RAX);\r\n                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:804:21: error: no member named 'gregs' in '__mcontext'\r\n                out_value = (u8)(*X64REG(context, reg - X64R_AL));\r\n                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:809:21: error: no member named 'gregs' in '__mcontext'\r\n                out_value = (u8)(*X64REG(context, reg - X64R_AH) >> 8);\r\n                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:815:31: error: no member named 'gregs' in '__mcontext'\r\n                const s8 imm_value = *(s8*)(RIP(context) + i_size - 1);\r\n                                            ^~~~~~~~~~~~\r\nUtilities/Thread.cpp:784:18: note: expanded from macro 'RIP'\r\n#define RIP(c) (*X64REG((c), 16))\r\n                 ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:827:33: error: no member named 'gregs' in '__mcontext'\r\n                const s16 imm_value = *(s16*)(RIP(context) + i_size - 2);\r\n                                              ^~~~~~~~~~~~\r\nUtilities/Thread.cpp:784:18: note: expanded from macro 'RIP'\r\n#define RIP(c) (*X64REG((c), 16))\r\n                 ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:836:33: error: no member named 'gregs' in '__mcontext'\r\n                const s32 imm_value = *(s32*)(RIP(context) + i_size - 4);\r\n                                              ^~~~~~~~~~~~\r\nUtilities/Thread.cpp:784:18: note: expanded from macro 'RIP'\r\n#define RIP(c) (*X64REG((c), 16))\r\n                 ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:846:20: error: no member named 'gregs' in '__mcontext'\r\n                out_value = (u32)RCX(context);\r\n                                 ^~~~~~~~~~~~\r\nUtilities/Thread.cpp:779:18: note: expanded from macro 'RCX'\r\n#define RCX(c) (*X64REG((c), 1))\r\n                 ^~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:851:19: error: no member named 'gregs' in '__mcontext'\r\n                const u32 _cf = EFLAGS(context) & 0x1;\r\n                                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:851:19: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:852:19: error: no member named 'gregs' in '__mcontext'\r\n                const u32 _zf = EFLAGS(context) & 0x40;\r\n                                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:852:19: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:853:19: error: no member named 'gregs' in '__mcontext'\r\n                const u32 _sf = EFLAGS(context) & 0x80;\r\n                                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:853:19: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:854:19: error: no member named 'gregs' in '__mcontext'\r\n                const u32 _of = EFLAGS(context) & 0x800;\r\n                                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:854:19: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:855:19: error: no member named 'gregs' in '__mcontext'\r\n                const u32 _pf = EFLAGS(context) & 0x4;\r\n                                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:855:19: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:885:12: error: no member named 'gregs' in '__mcontext'\r\n                case 1: *X64REG(context, reg - X64R_RAX) = value & 0xff | *X64REG(context, re...\r\n                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:885:62: error: no member named 'gregs' in '__mcontext'\r\n  ...*X64REG(context, reg - X64R_RAX) = value & 0xff | *X64REG(context, reg - X64R_RAX) & 0xffffff...\r\n                                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:886:12: error: no member named 'gregs' in '__mcontext'\r\n                case 2: *X64REG(context, reg - X64R_RAX) = value & 0xffff | *X64REG(context, ...\r\n                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:886:64: error: no member named 'gregs' in '__mcontext'\r\n  ...reg - X64R_RAX) = value & 0xffff | *X64REG(context, reg - X64R_RAX) & 0xffff0000; return true;\r\n                                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:887:12: error: no member named 'gregs' in '__mcontext'\r\n                case 4: *X64REG(context, reg - X64R_RAX) = value & 0xffffffff; return true;\r\n                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:888:12: error: no member named 'gregs' in '__mcontext'\r\n                case 8: *X64REG(context, reg - X64R_RAX) = value; return true;\r\n                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:913:3: error: no member named 'gregs' in '__mcontext'\r\n                EFLAGS(context) |= 0x1; // set CF\r\n                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:913:3: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:917:3: error: no member named 'gregs' in '__mcontext'\r\n                EFLAGS(context) &= ~0x1; // clear CF\r\n                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:917:3: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:922:3: error: no member named 'gregs' in '__mcontext'\r\n                EFLAGS(context) |= 0x40; // set ZF\r\n                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:922:3: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:926:3: error: no member named 'gregs' in '__mcontext'\r\n                EFLAGS(context) &= ~0x40; // clear ZF\r\n                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:926:3: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:931:3: error: no member named 'gregs' in '__mcontext'\r\n                EFLAGS(context) |= 0x80; // set SF\r\n                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:931:3: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:935:3: error: no member named 'gregs' in '__mcontext'\r\n                EFLAGS(context) &= ~0x80; // clear SF\r\n                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:935:3: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:940:3: error: no member named 'gregs' in '__mcontext'\r\n                EFLAGS(context) |= 0x800; // set OF\r\n                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:940:3: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:944:3: error: no member named 'gregs' in '__mcontext'\r\n                EFLAGS(context) &= ~0x800; // clear OF\r\n                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:944:3: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:953:3: error: no member named 'gregs' in '__mcontext'\r\n                EFLAGS(context) |= 0x4; // set PF\r\n                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:953:3: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:957:3: error: no member named 'gregs' in '__mcontext'\r\n                EFLAGS(context) &= ~0x4; // clear PF\r\n                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:957:3: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:962:3: error: no member named 'gregs' in '__mcontext'\r\n                EFLAGS(context) |= 0x10; // set AF\r\n                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:962:3: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:966:3: error: no member named 'gregs' in '__mcontext'\r\n                EFLAGS(context) &= ~0x10; // clear AF\r\n                ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:966:3: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:976:7: error: no member named 'gregs' in '__mcontext'\r\n                if (EFLAGS(context) & 0x400 /* direction flag */)\r\n                    ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:769:49: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                         ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:976:7: error: use of undeclared identifier 'REG_EFL'\r\nUtilities/Thread.cpp:769:55: note: expanded from macro 'EFLAGS'\r\n#define EFLAGS(context) ((context)->uc_mcontext.gregs[REG_EFL])\r\n                                                      ^\r\nUtilities/Thread.cpp:1020:25: error: no member named 'gregs' in '__mcontext'\r\n        auto code = (const u8*)RIP(context);\r\n                               ^~~~~~~~~~~~\r\nUtilities/Thread.cpp:784:18: note: expanded from macro 'RIP'\r\n#define RIP(c) (*X64REG((c), 16))\r\n                 ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:1146:3: error: no member named 'gregs' in '__mcontext'\r\n                RIP(context) += i_size;\r\n                ^~~~~~~~~~~~\r\nUtilities/Thread.cpp:784:18: note: expanded from macro 'RIP'\r\n#define RIP(c) (*X64REG((c), 16))\r\n                 ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:1368:47: error: no member named 'gregs' in '__mcontext'\r\n        const bool is_writing = context->uc_mcontext.gregs[REG_ERR] & 0x2;\r\n                                ~~~~~~~~~~~~~~~~~~~~ ^\r\nUtilities/Thread.cpp:1368:53: error: use of undeclared identifier 'REG_ERR'\r\n        const bool is_writing = context->uc_mcontext.gregs[REG_ERR] & 0x2;\r\n                                                           ^\r\nUtilities/Thread.cpp:1393:89: error: no member named 'gregs' in '__mcontext'\r\n  ...%s location %p at %p.\", cause, info->si_addr, RIP(context)));\r\n                                                   ^~~~~~~~~~~~\r\nUtilities/Thread.cpp:784:18: note: expanded from macro 'RIP'\r\n#define RIP(c) (*X64REG((c), 16))\r\n                 ^~~~~~~~~~~~~~~\r\nUtilities/Thread.cpp:767:55: note: expanded from macro 'X64REG'\r\n#define X64REG(context, reg) (&(context)->uc_mcontext.gregs[reg_table[reg]])\r\n                               ~~~~~~~~~~~~~~~~~~~~~~ ^\r\n\r\n* Thread: add explict casts for incomplete pthread_t on some platforms\r\n\r\nUtilities/Thread.cpp:1467:17: error: no viable overloaded '='\r\n        ctrl->m_thread = thread;\r\n        ~~~~~~~~~~~~~~ ^ ~~~~~~\r\nUtilities/Atomic.h:776:12: note: candidate function not viable: cannot convert argument of\r\n      incomplete type 'pthread_t' (aka 'pthread *') to 'const atomic_t<unsigned long>' for 1st\r\n      argument\r\n        atomic_t& operator =(const atomic_t&) = delete;\r\n                  ^\r\nUtilities/Atomic.h:902:7: note: candidate function not viable: cannot convert argument of\r\n      incomplete type 'pthread_t' (aka 'pthread *') to 'const type' (aka 'const unsigned long') for\r\n      1st argument\r\n        type operator =(const type& rhs)\r\n             ^\r\nUtilities/Thread.cpp:1656:3: error: no matching function for call to 'pthread_detach'\r\n                pthread_detach(m_thread.raw());\r\n                ^~~~~~~~~~~~~~\r\n/usr/include/pthread.h:218:6: note: candidate function not viable: no known conversion from 'type'\r\n      (aka 'unsigned long') to 'pthread_t' (aka 'pthread *') for 1st argument\r\nint             pthread_detach(pthread_t);\r\n                ^\r\n\r\n* build: dlopen() maybe in libc\r\n\r\n/usr/bin/ld: cannot find -ldl\r\nc++: error: linker command failed with exit code 1 (use -v to see invocation)\r\n\r\n* build: iconv() maybe available on some BSDs in libc\r\n\r\n/usr/bin/ld: cannot find -liconv\r\nc++: error: linker command failed with exit code 1 (use -v to see invocation)\r\n\r\n* build: hidapi-hidraw is only built on Linux\r\n\r\n/usr/bin/ld: cannot find -lhidapi-hidraw\r\nc++: error: linker command failed with exit code 1 (use -v to see invocation)\r\n\r\n* Thread: use getrusage() on more POSIX-like systems\r\n\r\n* Qt: don't return NULL handle on other platforms\r\n\r\nrpcs3/rpcs3qt/gs_frame.cpp:120:1: warning: control reaches end of non-void function [-Wreturn-type]\r\n}\r\n^\r\n\r\n* build: properly disable Vulkan on other platforms\r\n\r\nIn file included from rpcs3/rpcs3_app.cpp:40:\r\nIn file included from rpcs3/Emu/RSX/VK/VKGSRender.h:3:\r\nrpcs3/Emu/RSX/VK/VKHelpers.h:1209:42: error: unknown type name 'device_queues'\r\n                        std::vector<VkBool32> supportsPresent(device_queues);\r\n                                                              ^\r\nrpcs3/Emu/RSX/VK/VKHelpers.h:1211:4: error: expected member name or ';' after declaration specifiers\r\n                        for (u32 index = 0; index < device_queues; index++)\r\n                        ^\r\nrpcs3/Emu/RSX/VK/VKHelpers.h:1221:4: error: expected member name or ';' after declaration specifiers\r\n                        for (u32 i = 0; i < device_queues; i++)\r\n                        ^\r\nrpcs3/Emu/RSX/VK/VKHelpers.h:1256:4: error: expected member name or ';' after declaration specifiers\r\n                        if (graphicsQueueNodeIndex != presentQueueNodeIndex)\r\n                        ^\r\nrpcs3/Emu/RSX/VK/VKHelpers.h:1261:4: error: expected member name or ';' after declaration specifiers\r\n                        CHECK_RESULT(vkGetPhysicalDeviceSurfaceFormatsKHR(dev, surface, &formatCount, nullptr));\r\n                        ^\r\n[...]\r\n/usr/bin/ld: cannot find -lvulkan\r\nc++: error: linker command failed with exit code 1 (use -v to see invocation)\r\n\r\n* build: make install/strip work by moving commands\r\n\r\n* Qt: create surface for GL context if it wasn't ready\r\n\r\n  #0  strlen (str=0x0) at /usr/src/lib/libc/string/strlen.c:100\r\n  #1  0x000000000090f02e in std::__1::char_traits<char>::length (__s=0x0)\r\n      at /usr/include/c++/v1/__string:215\r\n  #2  std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::basic_string (__s=0x0, this=<optimized out>) at /usr/include/c++/v1/string:1547\r\n  #3  gl::capabilities::initialize (this=0x2ba32a0 <gl::g_driver_caps>)\r\n      at rpcs3/Emu/RSX/GL/GLHelpers.h:133\r\n  #4  0x000000000090d3dd in gl::get_driver_caps () at rpcs3/Emu/RSX/GL/GLHelpers.cpp:56\r\n  #5  0x00000000008fa511 in GLGSRender::on_init_thread (this=0x838d30018)\r\n      at rpcs3/Emu/RSX/GL/GLGSRender.cpp:484\r\n  #6  0x0000000000938f9e in rsx::thread::on_task (this=0x838d30018)\r\n      at rpcs3/Emu/RSX/RSXThread.cpp:334\r\n  #7  0x0000000000abc329 in task_stack::task_type<named_thread::start_thread(std::__1::shared_ptr<void> const&)::$_10>::invoke() ()\r\n  #8  0x0000000000abc114 in thread_ctrl::start(std::__1::shared_ptr<thread_ctrl> const&, task_stack)::$_7::__invoke(void*) ()\r\n  #9  0x0000000801e60c35 in thread_start (curthread=0x843650a00)\r\n      at /usr/src/lib/libthr/thread/thr_create.c:289\r\n  #10 0x0000000000000000 in ?? ()\r\n\r\n* build: don't abort without git metadata\r\n\r\n-- Found Git: /usr/local/bin/git (found version \"2.13.1\")\r\nfatal: Not a git repository (or any parent up to mount point /)\r\nStopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).\r\nCMake Warning at git-version.cmake:12 (message):\r\n  git rev-list failed, unable to include version.\r\n\r\n* build: non-parallel needs git-version.h earlier\r\n\r\nrpcs3/rpcs3_version.cpp:3:10: fatal error: 'git-version.h' file not found\r\n #include \"git-version.h\"\r\n          ^~~~~~~~~~~~~~~\r\n1 error generated.","sha":"392d91b6043f9858462f385ef5e23d14d50e2283"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-06-22T20:05:32Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-06-22T20:05:32Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix da build (#2900)\n\n* Add RelWithDebInfo\r\n\r\n* Fix the build","sha":"ea2970d6e5a15bc0faf8e69143960e72b552595d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-11T10:14:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix stencil initial values","sha":"423fd4a38841e4cc7010e9fb98daf4b9a95a173e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-11T14:26:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix depth-as-rgba read in fp","sha":"701728ecd716cdb075e5934218289627bb7a8058"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-11T22:27:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/wip: Fix depth surface reuse and clearing (fixes shadows)","sha":"5f66d0b99655b0ae3a051c3fce3525aecaa9862b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-12T09:42:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl/vk: Enable use of native PCF shadows","sha":"6a9eef038273907e73297679583ba02ec51ba0ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-12T13:24:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk/gl: Minor fixes","sha":"b50d5107b38f3347f38653acb5cf4916dad1a855"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-12T16:18:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix clip-space -> depth conversion. Fixes remaining depth read issues\n\n- Also set some default values for samplers in a cleaner way using their 'natural' float values","sha":"69d3d479017fd67009eb0a41c258d3f95914f81a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-13T22:33:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk/gl: Fix sampling of shadow2D textures","sha":"110974af0bc581a145d7ceb67ba122b2ea4374ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-13T22:36:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Discard surface store contents once per frame (temp workaround)\n\nNeed to find the proper command issued to discard all surfaces","sha":"db1a90d828953397dcff1bd938c38755c10715de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-13T22:38:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk/gl: Do not sample currently bound render targets\n\n- Create temporary copies for use with the draw call instead","sha":"0cb6dee47483fadfce79aff42e15c9f73e4708f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-13T22:39:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl/vk: Fix some warnings and whitespace issues (LF vs CRLF)","sha":"75964c686f091a37ac2dcd73c7b41dbf6e5a6f7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-14T15:47:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix clip space computations","sha":"98cf72e0fbff4edbd83d56130b25a751d9772ed0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-14T16:24:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Properly emulate signed normalized wide integers\n\nAnother fix for signed normalized formats; single component vectors are swizzled","sha":"30f276a49b1ef6bf431d37e4c28504292c082683"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-14T18:51:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl/vk: Invert default stencil values\n\n- Fixes stencil volume shadows in a few games. This is part of the surface invalidation workarounds","sha":"86adc42739ae39439b6fc3edcd42173de99530c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-14T19:27:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Silence log spam","sha":"84ae1c5214a8cf940b5c54ace1c669d122c7b8ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-14T21:48:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Prefer optimal formats when clearing buffers","sha":"5f180e0b3039f80f118b4e9709c210dfce19413f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-14T23:33:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Avoid constantly reinitializing the SH context when compiling SPIRV. Speedup","sha":"6013b0782ec9b1e41dd30ec151ba10ed87c02010"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-16T13:01:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Proper shutdown to avoid destroying resources still in use","sha":"13825c9ef7fb12d80dbd0ae856ce7ad40eb5e66e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-16T13:06:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Register NV4097_SET_COLOR_KEY_COLOR method.","sha":"5c6cf77c57e45bcf5005789f2a8f40ecd69a40e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-16T13:03:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Handle non-zero base vertex better\n\n- Vertex buffer contents treat the base vertex as vertex 0 so we do the same for indices\n\nrsx: Fix vertex base indexing\n\nrsx: Properly fix non-zero offset indexed rendering","sha":"11317acdbe14ffe61af8afc7fd38581da138652d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-18T14:53:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Code cleanup. Fixes several dozen warnings\n- Wrap unused parameters as comments to prevent C1400\n- Fix sized variable conversions with explicit casts","sha":"b2e906f4ccebf17bdb48818015077d49c4af5aec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-18T23:00:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/ui: Make a few settings configurable via the GUI","sha":"798f90dac22c6fe1ac2e789af97e2d8cf886c905"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-19T10:47:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Bug fixes\n\nrsx: Give more info when ring buffer allocations fail","sha":"590bb7cbe4419f0f2f6b9275aeca9c8309359770"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T17:09:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Do not sample as pcf shader if writing a vector result","sha":"17318112ebbea68fb432d6178062d5a0fa0d7df2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T17:25:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Move resource init/destroy to constructor and destructor","sha":"28f3e9a65b1f4aa48a41661002b6172cb1eb3763"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T17:30:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vs: drop user files from shipped vs files","sha":"d2b3cf22e3e225342a3a6b0d48ed6c9baf1e6bda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T18:25:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-22T20:36:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gui: Add a strict mode toggle. Also reorganizes the graphics tab a bit\n\ncode cleanup","sha":"72edf26fb8b726639f31dbc609e2290aefd74b83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-22T22:26:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T23:16:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"add No Thread option","sha":"51ce8f6c20fe6b23221632db899925d4d4421ee0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-23T12:08:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-23T12:08:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fix debugger o.O (#2903)\n\n* fix debugger o.O\r\n\r\n* minor simplification\r\n\r\n* how did I not see this the first time","sha":"4ce8e9ba16c7b1c500910cd77bd7e6e4bc7e1393"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-06-23T13:51:39Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-23T13:51:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Travis build (#2902)","sha":"b3c4ec4b555b4d147abf81bb5533f037eca25fe9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T13:41:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-23T17:09:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"qt: Fix logging","sha":"0da9c8d20c9518c906ce745c274f3536c823add4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T13:44:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-23T17:09:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"qt: Fix OutDir config","sha":"0890cc3e49973f5c6fe5d9997eb2a3e09d251178"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T21:39:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-23T17:09:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Added uptr type","sha":"0df861d7b5fd263fe782d78eb9aed1214ae9a6e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T21:40:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-23T17:09:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPUOpcodes.h updated","sha":"82a296f90047265060f17bbb0d307700dc2a0bd8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T21:41:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-23T17:09:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Workaround booting NP games","sha":"155f13ed54f51f8fb7f63ca8fc3fbdf24b51ec70"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T21:45:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-23T17:09:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"LLVM: implement STSWI, LSWI...\n\nFix DIVD, DIVDU, DIVW, DIVWU, MULHW\nRemoved __adde_get_ca in ADDE, SUBFE","sha":"a29d7d396211cc36c7de6f390704c40bfff9b2d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T21:52:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-23T17:09:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU LLVM: paradigm shift\n\nFor now, compile only one block at time\nUse tail calls to move between blocks\nFully write PPU context (except CIA)\n\nThis fixes many compatibility problems","sha":"aea094730bf926ffe26e2ad418dd9c7d4ab4d19f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-22T21:58:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-23T17:09:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove throw cpu_flag","sha":"d0b37777c317f4b5eba68f66226bac8d863d1ca9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-23T16:13:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-23T17:09:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"qt: Fix kb pad handler","sha":"321f50bf7bd05ddb1afb787a112f5b2d8a3d66b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-06-23T14:46:02Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T10:59:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix issue with msgdialog not passing event back properly.","sha":"5ecc7d5360637eda3b4a84e59fac075a4f4a802b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-23T19:33:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T11:25:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"qt: Update about dlg","sha":"79a3b308d161a7c519cbadc0f0a9db7011931bc0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T10:56:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T11:25:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"wxFuneral","sha":"fcefbf26c66294ff282937ed62562ca27effe3dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T11:06:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T11:25:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix tabs","sha":"d86858da64c4526ba2f95567e432466acaaaa743"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T11:13:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T11:25:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"qt: Remove emit","sha":"dd553331df8cbc1957e70e77bb087f0027a5bf73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T11:24:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T11:25:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"qt: Use #pragma once, Q_SIGNALS, Q_SLOTS","sha":"ef21e2253f7484445963edcf615a1d8d3d579757"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T15:36:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T16:12:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: multithread compilation","sha":"6561ddae41648f63413dabde8852949958552e56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-18T08:51:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T21:13:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Reenable Home and Audio/Video interactions","sha":"d11bb71a17ab6f239701a6962749eb7a0c6e7c3a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-18T15:43:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T21:13:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"add \"Other\" category\ninclude all categories to list and filters","sha":"a1c72de1eba62d36bc2afa20ccd202e5dda9e690"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-18T16:14:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T21:13:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"disable compat for non ps3 games","sha":"96a893120dcea69ec882ad5f870234ee80610836"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-21T21:21:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T21:13:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fix image load log message","sha":"8d0e7adb62a262fa8260bd1dc189d994adfb9727"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-25T23:44:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-25T23:44:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"dialog fixes for multithreading (#2913)\n\n* add appicon to msg_dialogs\r\n\r\n* give every msg_dialog its own taskprogress\r\n\r\n* weird little m*f* algorithm","sha":"cfbfdd7b8a6b60c2b7f7d6b09b79afd8729848c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26231569?v=4","date":"2017-06-26T05:37:28Z","email":"Inviuz@users.noreply.github.com","login":"Inviuz","name":"Inviuz"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-26T11:17:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"FREFS/weak imports and VREFS 4 and 6","sha":"81ab6ab8b4c1e7c5c7ddccecd6eae9f154d15d3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-24T19:01:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-26T13:56:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix #ifdef style","sha":"e5ae32e5f39109f67a7fb3b56817e250efe246bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-25T12:16:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-26T13:56:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: fix cancellation","sha":"9738ce0cf65ba8b944c47675298fdf7521902f76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-25T14:22:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-26T13:56:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: MFCR optimized","sha":"45fae363c6fa104c4d79a9da92309781e314faee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-25T20:34:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-26T13:56:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: v2, simplification (no allocas)","sha":"cd4f290d3dbe074f193b57ee3fa22ebfca00956d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-25T21:15:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-26T13:56:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: remove unnecessary code","sha":"1196e9deccaf84b6c4bf337ed517c94e44d6e951"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-25T21:29:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-26T13:56:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: disable unnecessary passes","sha":"f49a30bc1a248ec6abb90117eebc484784dd0e85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-25T22:44:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-26T13:56:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ppu_syscall_code type added (for fmt)","sha":"8034196c25737cdda5fa4324586abfce08ba1203"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-26T09:30:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-26T13:56:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: Improve FlushRegisters","sha":"061c92ba1f43377f009127ef4dfc679e69eef2b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-26T13:55:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-26T13:56:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: preparations (no fixes)","sha":"89f676de75e0406d67695d7afb2a0767f2cb4564"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-04-11T11:05:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-29T10:13:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"dx12: Fix error reporting","sha":"74d8619240106ca139f85b391ad9a409f335e0dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-26T21:34:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-29T10:13:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Emulated index buffers are based on vertex 0 with no disjoint ranges\n- Drop the 'first' argument as it is unused for now","sha":"47e5074dc542350dfaaa39b9bb62ff993e554223"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-26T13:41:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-29T10:13:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Initialize declared but unset varying variables to all ones","sha":"6e578c4fdedbd392aea43b9d7d26b435162d433c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-27T09:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-29T10:13:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Use loose memory protection on textures since they're almost guaranteed to be wholly moved when changing. Speedup.","sha":"1887e2460fe5314f7096a0f789354bbb8c3ed824"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-26T21:34:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-29T10:13:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"cellVideoOut: Enable 59.94 Hz required for some games","sha":"9cbaacb13fe96bbd95ef3aeda49b6a51ec932144"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-27T14:47:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-29T10:13:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix legacy ring buffer address alignment\n- Should always return a base address aligned to the buffers alignment.\n- Fixes renderdoc crashes when capturing","sha":"8a0f6f1cbc67b07937d51612768090c0e9594452"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-27T14:49:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-29T10:13:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix mapping of output colors to render target ranges","sha":"3651e67a25b14c8526225c72c73234d90232b2af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-27T15:19:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-29T10:13:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Avoid creating surface copies when strict mode is disabled.","sha":"9cb58a47cd1e0133b3678f327cfb26cb38026209"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-27T17:46:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-29T10:13:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Avoid using push_back/emplace_back on empty STL containers\n- Reckless management of STL containers causes significant slowdown\n- Also reorders vertex compare steps to fail quickly on simpler checks","sha":"459a7ba5a26bfd60462f96e0683dfd4299cf98f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-27T22:03:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-29T10:13:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Do not swizzle shadow lookups","sha":"d7662e54ccc1ba30bcda697521952af982ce7c02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-28T16:36:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-29T10:13:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/decompilers: Avoid std::endl like the plague. It adds extra processing overhead","sha":"a69f19a9ab9f2ad85b26399730f805939c3caa0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-28T11:51:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-29T14:48:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"umulh64, mulh64 moved; added ror8/16/32","sha":"22af341ad3172f1afda09a8e421e681118924ec8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-28T11:54:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-29T14:48:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Removed unnecessary code","sha":"fc2a45d6d6b0333115c8d5be9758b76a68b67016"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-28T11:54:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-29T14:48:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: VREFP, VRSQRTEFP changed","sha":"2629f9be442adb405481439a39118e65d1b0ded3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-28T11:56:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-29T14:48:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: some passes disabled","sha":"aa34fa8baa92581dc676c87fa29cdce0c5b9b077"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-28T11:58:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-29T14:48:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: less trash, fix crash","sha":"ef55d6fa0c2d20bb96ce2d0025dba639c1c3c68b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-28T17:33:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-29T14:48:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: MTOCRF optimization","sha":"85f8a42bd2be49a451b7bef0eecc7aeab5ed5609"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-29T14:25:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-29T14:48:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: new mptr/cptr format","sha":"3c064439b3edf17eb64cf5fee520c92f59308066"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-29T14:27:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-29T14:48:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: minor fix","sha":"da87bb6710768fa983d80547cd68afebea52a719"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-29T14:46:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-29T14:48:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: SSA reordering\n\nFetch indirect jump target\nFlush registers earlier","sha":"c087a9534af9fdc210b9ab9a439b21363831c744"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26231569?v=4","date":"2017-06-30T04:44:04Z","email":"Inviuz@users.noreply.github.com","login":"Inviuz","name":"Inviuz"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-30T11:24:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"REF 57 plus FREF fix\n\nkept bothering me until i realized what was wrong with it","sha":"645f0e63abe15864ee4156213c5a28ab304ceaa4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-30T12:41:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-30T12:41:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI fixes + log stacking (#2897)\n\n* Add Stacking option to log contextmenu\r\n\r\nSquashed commit:\r\n\r\n[69f296af] cleanup\r\n\r\n[4f4bf41f] use contextmenu instead\r\n\r\n[e67036bc] use gui settings instead (+1 squashed commits)\r\n\r\nSquashed commits:\r\n\r\n[b3913dbe] fix backwards selection (+1 squashed commits)\r\n\r\nSquashed commits:\r\n\r\n[1e150f04] add stacking option (+3 squashed commit)\r\n\r\nSquashed commit:\r\n\r\n[be78da4f] fix scroll\r\n\r\n[d3450c21] fix clearSelection\r\n\r\n[e962ec9c] fix log color issue\r\n\r\n* fix recent games related app crash\r\n\r\n* gamelist improvements\r\n\r\nSquashed commit:\r\n\r\n[aa1f79c2] fix title names & con background\r\n\r\n[d8381984] fix gamelist search\r\n\r\n* finally fix show menu bug\r\n\r\n* add rows to gamelist: resolutions, sound formats and parental level\r\n\r\n* fix gamelist loadsettings","sha":"fd4a153eef07a79de0cca0784e17ad59203652bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-06-30T02:06:02Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-30T15:40:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: add \"add_signed\" in blend op.","sha":"253e7a90b8be9ea742775e62292c51dc7f02f9ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-01T18:42:09Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-01T18:42:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Basic Save Manager (#2924)\n\n* The basic unstubbing.  Save entries will be listed and you can select a save.  If you select none, then it'll work as well.  WIP\r\n\r\n* Filled out the trivial parts of the info dialog.\r\n\r\n* Finish implementation and clean up.  No \"maintain\" dialog or context menu for now until the copy/delete functions are implemented.\r\n\r\n* Fix crash\r\n\r\n* Update cellSaveData.cpp","sha":"190a59ce03a5d55b9a81888c5b43082f6828fdc8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/181531?v=4","date":"2017-07-03T11:50:05Z","email":"martin-commit@ubique.se","login":"martinlindhe","name":"Martin Lindhe"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-03T16:32:14Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"qt: relax dependency to qt 5.7","sha":"2e9a543598ff3d7e94b03396133ab299d3905ab2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/181531?v=4","date":"2017-07-03T11:53:32Z","email":"martin-commit@ubique.se","login":"martinlindhe","name":"Martin Lindhe"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-03T16:32:14Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"README: relax qt5 version requirement to 5.7","sha":"be441bd3a7f1c051f70f6ab4eb243164d672ff2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/181531?v=4","date":"2017-07-03T02:29:18Z","email":"martin-commit@ubique.se","login":"martinlindhe","name":"Martin Lindhe"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-03T16:51:39Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"README: add fedora instructions","sha":"37898d38e536b752bb12bdcc0343bc4c8e6beda0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-07-03T18:30:34Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-03T18:30:34Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix CMake build instructions on Linux (#2946)\n\nFix CMake build instructions on Linux","sha":"233506480baf70571d61f4018210cef48cc5a399"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/181531?v=4","date":"2017-07-03T20:08:05Z","email":"martin-commit@ubique.se","login":"martinlindhe","name":"Martin Lindhe"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-03T20:30:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"remove invalid comment","sha":"051dd388d72dfc0e036d87d25f7c627b003f6887"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-03T16:17:40Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-03T20:56:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix akiba with cell cancel","sha":"458968658fd3d29d3399687fb8ae22ab580f49b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-03T16:55:02Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-03T20:56:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Change default selection button to select entry instead of cancel.","sha":"fd1ca2f102a0dab8266ca5bc6ba6bc2597eae7be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-30T22:53:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-03T23:04:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"bf_t: fix warning","sha":"9fccb47e7c26d3c9049fd0b24947111db944970e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-06-30T23:08:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-03T23:04:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: relocation support","sha":"f0d184f38b29ffe36465c5f425acd34160b242db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-03T11:27:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-03T23:04:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix Miku OP video\n\nAnd break something else","sha":"dda274afb0824fc20eb0138c63af85e95f3c98af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-06-25T09:31:50Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-04T13:16:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implements sys_fs_disk_free","sha":"d793f8ad788108db5aa621ced5b700faf531839e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-07-04T18:48:58Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-04T20:19:33Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Finalize AppImage build","sha":"78fad1a372c25b0599fa852c7c078e43ee975ec0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-06T10:38:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-06T22:53:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"msg_dialog_frame: hidpi fixes for m_dialog\n\nmove spacings up","sha":"cbb775322752c20d47ac7ec5401f455a89cac3fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-06T11:21:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-06T22:53:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"msg_dialog_frame: hidpi fixes for osk_dialog","sha":"e74d6446c8c623455a7b609b2fa255c439b2263d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-25T20:13:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-08T11:52:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"spu: dma tweaks","sha":"ab97a0a5a31cd60e0f31f1c097181725c8857caf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-25T20:14:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-08T11:52:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement skip draw. Also, start working on MT vertex upload","sha":"b95ffaf4dda949a4f9b4640644d2f490101c6da4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-29T22:20:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-08T11:52:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl/vk: Enable frame skipping","sha":"e9b8f94fb145dc5458e61ae2a3418a18df86a874"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-30T21:24:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-08T11:52:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl/vk: Enable contents transfer when a new framebuffer is created and not cleared","sha":"3d935b64f2ba0a749befbc32f9a26c022b244366"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-30T21:24:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-08T11:52:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix layout transitions","sha":"c788331e454c4df4fe8342fdfa656c5fe910c5c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-06-30T10:59:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-08T11:52:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix some fp bugs\n\nrsx/fp: Properly fix RCP\n- Input is always scalar, output is a vector\n\nrsx/fp: Ignore forced unit for SIP and TEX instructions","sha":"d43e06c0ea17fbfaa204c3979473411914ea81fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-04T22:16:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-08T11:52:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor bug fixes\n- vk: Do not select first available format when choosing a swapchain format\n- gl/vk: Ignore rendering zero sized framebuffers/scissors\n- fp: Re-enable range clamp on fp16 registers; fix fx12 clamping [-2, 2]","sha":"9e7a42d057383a51e322e31371a6a6faf1fc0861"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-06T15:40:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-08T11:52:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"spu: Reimplement FCGT and FCMGT to handle corner cases (such as comparisons against infinites and denormals)\n- Also optimize FMA/FMS/FNMS for recompiler","sha":"41d921808b48b3050a27b1f9d0b50d12508a3560"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3000282?v=4","date":"2017-07-08T13:06:11Z","email":"jacky.kktsui@yahoo.com.hk","login":"raven02","name":"raven02"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-08T13:06:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Add Stretch to Display Area option (#2961)","sha":"2e47c423670d30071082a4b0163b0cdb323bf914"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-06-30T20:03:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-10T13:15:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Dagimon rookie level\n\nfix lib stuff\n\nfix build\n\nadd slider amd searchbar\n\ndisable gamelist toolbar per default\n\nDagimon rookie level","sha":"9f8eb88a9f0adbbcb2fcf094d96dcfaf96b39d9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-05T01:16:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-10T13:15:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Dagimon champion level","sha":"c9e9fcd0a35622cb0227a4ce9d184c3d1451a40a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-05T03:31:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-10T13:15:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Dagimon ultra level\n\ngui new design: hidpi fixes\n\nsettings_dialog fix glitch\n\nwelcome dialog hdpi adjustments\n\nabout dialog hdpi adjustments\n\nabout dialog fix size\n\npad dialog hdpi adjustments\n\nsettings_dialog: remove SetActiveTab","sha":"457c2d364f941a3d152fe3127eb07d81a7fd511b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-06T09:48:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-10T13:15:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Dagimon mega level\n\nani fixes\n\nadd color options for toolbar and game icons","sha":"1a4e1919fc5590a9e2995e179a98f3e7ec6bea65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-08T13:56:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-10T13:15:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Dagimon super mega level\n\nadd stretchToDisplayArea to settingsdialog\n\nfix color picker and toolbar background\n\nsettingsdialog adjustments\n\nfix tooltips + .pup\n\nfix adapter box","sha":"b7aed7bbde3e4e59a44a4c9d18b454502432d539"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-10T13:43:57Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-10T13:43:57Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix VFS default button (#2975)","sha":"cea0ff45982b3e5e728d2a9a88a57626d07b4f75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-07-05T15:07:32Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-10T14:39:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Check if the pth is a valid directory before to look for icons.","sha":"5c60a99cc4e8f1dd8f9662816eb449c3df5a4d81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-07-09T23:34:05Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-10T15:42:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Stswi instruction","sha":"34709eb3996ea239d53f0162ce311a568ca64a06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-11T15:31:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-11T23:56:53Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"debugger_frame: remove pause button\n\nand move its functionality to run button","sha":"06f6ac66fa70b9cc02b2f89eb2ee5e856e1a7bd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-11T16:10:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-11T23:56:53Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"debugger_frame: transfer capture button from main_window menu\n\nand clean up some unused actions in main_window.ui","sha":"67f1fa086d8be3d2d57980aef7a989687b336a59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-10T21:49:57Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T00:19:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add ui_*.h to gitignore","sha":"0698136c63db48d2df8a7346a625375e6ba24f7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-10T22:45:40Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T00:19:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix a couple crashes","sha":"83df572604968ae11697f6616111cbbe42151f57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-10T23:27:58Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T00:19:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add $(EmulatorDir) to VFS dialog","sha":"0405b860c6abf6b36fadd62233b0e41fd741f2ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-10T23:42:12Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T00:19:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Disable remove custom config if no custom config exists.","sha":"9403948ce34a27de293ca70d82fbc4701e01e876"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-10T19:04:03Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T01:56:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Search for threads.","sha":"a426d32a36fbc85a83344b20202b9a369671bc75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-05T19:33:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:00:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: unuse FP_SAT_OP","sha":"bab537c7e2f611e2fad78252d578a1d4533ea8ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-05T19:42:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:00:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Store sys_spu_image value","sha":"9a38d636617d7f8f75f864fe45909761de75369e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-05T19:44:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:00:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: decommit by exec_addr","sha":"0ee454f44bff02433e138d50b16c265f2b124cdc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-05T19:52:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:00:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: free prx segments","sha":"74f2be73078ef90c1950a899275bab1f34811860"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-10T19:29:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:00:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: load only libsysmodule.sprx","sha":"3278062c29244ccca54c492234da732773421124"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-10T20:16:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:00:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GUI: add supporters","sha":"a51f82c949fa5dabbb1e4f4f3d17b86c410fc01b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-10T19:22:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:00:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: reuse loaded executables","sha":"73a2a937c4cb8fb5761e95322379bebc4402f7b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-10T23:05:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:00:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Do not load sprx twice","sha":"8202352452f916d5f4f5d6b7dc5653b7afe19f3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-11T21:49:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:00:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implemented _sys_memchr","sha":"4a512694d91ac9badaf581438f7ffc5518d9f51f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-11T21:50:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:00:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Force HLE for net-related libraries","sha":"ff53ff3bbf43eae802bdbda5fc99a49c1273fe12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:00:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:00:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GUI: Disable poorly designed limitations","sha":"ae265f7586cbed7649d1c2dfbcab8fea63b2feab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:07:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T11:07:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Cleaning after PoorRequest","sha":"420bfef21445cc1edd33dc9af925de91c8bdb56b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T13:38:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T13:38:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve booting disc games\n\nStore disc locations for disc games\nCreate /dev_hdd0/disc/ directory\nMove disc games from /dev_hdd0/game/ to /disc/ automatically\nLoad disc game patches automatically","sha":"08e9400870b752aa6409c7f946fcfc9647e4a68a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T13:58:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T15:16:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fill game list from all locations","sha":"3cd4256b9e634609e17c65c40eafb5e88a7834fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T14:22:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T15:16:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GUI: fix recent entry duplication","sha":"f7472d59aaade9d67eb5184c6b4408301095885b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T16:09:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T16:09:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_lwmutex_locker aux class","sha":"5ba23ac4c44c482f860848524bc721bb4edf401b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T16:10:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T16:11:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"_lv2prx mutex implemented","sha":"a5c431c2b7784db80b101f76fef35d511c11108d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T16:35:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T16:35:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix moving game dir","sha":"113b937263dec5631fb16787380e5f29cfb3968e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T16:41:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T16:41:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Refresh game list after booting","sha":"4913cac24f300481e3e19e86b9d94ff2e86690bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-12T14:53:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T18:00:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"minor menu fix","sha":"bb563b3eb7879654eb7014b5bd6462992a030ec8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T18:28:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-12T18:29:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: clean linkage info","sha":"7702eb2fa7a245d66c3149deef5077c031520f75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-13T03:05:29Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-13T03:05:29Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"fixz (#2996)\n\nPatch crash regression in game grid","sha":"dcfe8e1abdc04d4a2dad14d0b40e5380df68dd6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-07-12T15:04:13Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-13T12:43:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixes pkg overwriting files without the PKG_FILE_ENTRY_OVERWRITE flag","sha":"d410494a7dda235db68eb80259e22613ccf5841e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-13T00:59:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-13T13:38:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"game_list: enable deselection + fix entry selection","sha":"2cd5f63284c2817c22a09c7a8a02776fc0df6d83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-13T01:23:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-13T13:38:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"clean up some unused / redundant includes","sha":"e8ba5876ce287aa95de10db794e8834dd7aa6c93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-13T15:38:13Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-13T15:38:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve Save Manager (#2951)\n\n* Add the save icons to the save data entry and manager.\r\n\r\n* Simplify code slightly since I have an else now so no need for == false\r\n\r\n* Move the icon to the top of the list because it looks better.  Remove redundant settitle.\r\n\r\n* Fix size.  It's a bit forced but there wasn't any better way as far as I could see on stack overflow.\r\n\r\nAlso, add an error dialog if you have no entries.\r\n\r\nSimplify the logic slightly for the selected since with the no data case handled, I can make more assumptions about the return value.\r\n\r\n* save_data_utility: fix dialog sizes\r\n\r\n* CELL_OK\r\n\r\n* Retcon dialog to instead be error in log.\r\n\r\n* Dangle92 and I had some fun. Everything should be good now.\r\n\r\n* In dangle's code he disabled the icon, in mine I hide it if there is nothing. Having both isn't needed.  Yay merges resulting in doing stupid things.\r\n\r\n* Fix leek\r\n\r\n* Default size to zero for sanity. Shared pointer is fine handling null (tested with disgaea and renaming icon file)\r\n\r\n* Simplifying. Thanks for review and advice all","sha":"ab595d2b959c7e9f2a612b62b106343fecc94b6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-07-09T14:09:16Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-13T22:46:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove \"#pragma once\" directive in a cpp file","sha":"2d037fa1301fc9db547f46d10902816859d37636"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-07-13T17:44:08Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-13T22:46:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add cellHttp* functions","sha":"3a3e9770f3d837b762e5142b76096a3b0cffaba5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-07-13T17:44:35Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-13T22:46:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add sceNp* functions","sha":"9d8fa28dd987e27b00b6c8395c5515b745c48fed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-07-13T17:44:58Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-13T22:46:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add sceNp2* functions","sha":"ce7b55871b6a158f602e2e2ef538b49a7a873efa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-13T15:34:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-13T22:47:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix cmdline start","sha":"15fe8f1c51f2821c111671de3d1f363cb41fd407"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-13T15:35:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-13T22:47:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improved sprx boot (for devs only)","sha":"d8abe755267a3959bfa77522a8c1cf491ccd1fda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-13T23:58:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T00:39:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rearrange /dev_bdvd mounting logic\n\nPrevent booting patches without /dev_bdvd\nPrevent booting with foreign /dev_bdvd","sha":"25fcde9507ab900097b29501f18cbf5a610cc43b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2017-07-14T03:35:21Z","email":"talkashiegaming@gmail.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T10:54:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix various typos and capitalisation inconsistencies.\n\nalso Jarves please implement sysutils","sha":"3df960bb52dcfac532ea89a027518c520229d546"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-14T00:21:40Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T11:20:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Small main_window refactoring. Fixed one of the guiconfig crashes too somehow.","sha":"eb80b7ec34e282ba879147e70f410d13ff3a9ff3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-14T00:51:36Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T11:20:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"For the Neko","sha":"225af34ce96b1f301c298d42d62b942b3a013414"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-14T00:57:07Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T11:20:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Murdering a wx zombie","sha":"ced539579e62eb9516dd9403107d489c5517e547"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-12T16:52:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T14:20:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"game_list_frame: add method colorizedIcons","sha":"743a19027a35bf0ebb767c997b080423435c13d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-12T16:53:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T14:20:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gui_settings: add tool icon color","sha":"fb191693d1ae71c2c593d9336bb04a1117e7bcc4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-12T16:54:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T14:20:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"settings_dialog: add color picker for main window tool icons","sha":"cfa7d04c4927a639cae2feb948c651d7977d1e26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-12T16:55:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T14:20:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"main_window: repaint tool icons","sha":"73bbfcb24629bebae78a831c0e088fc666afe51a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-12T21:32:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T14:20:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"settings_dialog: add color picker for gamelist tool icons","sha":"c617b1703764729be489ab31c05b0f14c4ebaa05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-12T21:33:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T14:20:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gui_settings: add gamelist tool icon color","sha":"b586bd3b10a10c528513c59f536fd5e0c22e40f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-12T21:35:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T14:20:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"game_list_frame: repaint tool icons","sha":"97f59405aa09d1e52fc7053482b667bc79402541"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-12T21:36:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T14:20:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Icons (blue): fix inconsistent colors","sha":"a21ed06d270b612530d0d7aa2f44b9d58dffdbf1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-12T23:30:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T14:20:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"move colorizedIcon to gui_settings","sha":"ef608092197776c110ced5b90b6ac4d99fca1f88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-12T23:32:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T14:20:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"settings_dialog: add icon hints to color buttons","sha":"821a8c6e65d0af5f20838acee88528d35672b204"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-13T15:33:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T14:45:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Settings: fix cameraBox","sha":"d4c83e5dd21998738506a6035118ede4f6c636ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-14T13:25:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T14:45:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rename controls to keyboard","sha":"0adb579736f565377682c6972d2eba6282ffd417"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-14T15:10:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T15:10:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add game window resize on boot (#3000)","sha":"ad66dbfd0b4db8cdb1c312e4bd8e08515c290663"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/490500?v=4","date":"2017-07-14T15:34:05Z","email":"learath2@gmail.com","login":"Learath2","name":"Learath2"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T15:34:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add version to install firmware dialog (#2958)","sha":"504fa5ffdae00456ba2cb3a6f1df38bc741ca715"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/490500?v=4","date":"2017-07-15T00:38:10Z","email":"learath2@gmail.com","login":"Learath2","name":"Learath2"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-15T00:38:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix bug with std::stof being locale-dependant (#3012)","sha":"9c547d5eefbc097a0a713e83c6c6528eff06e2cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-15T18:22:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-15T18:22:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI: minor figgcess (#3010)\n\n* emulator tab: minor layout adjustment\r\n\r\n* tool bar: adjust size dynamically for hidpi\r\n\r\n* gamelist tool bar: adjust size dynamically for hidpi\r\n\r\n* gamelist search bar: adjust style\r\n\r\n* move game_list.h into rpcs3qt\r\n\r\n* hide game data by default","sha":"035a39a9a8d339b5fa63d9cb98c522b773425adc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-07-16T00:51:29Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-16T13:59:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix PIE being on by default","sha":"6597eb27c74469ef67ef03b041178f1f4358f6f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-16T14:36:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-16T14:36:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"add system_info.h (#2985)\n\nadd system info to log\r\nadd SSSE3 Error message to main_window","sha":"aed9b31294d34cfe1e95d29c1b79a3e6740850ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9249458?v=4","date":"2017-07-16T16:10:45Z","email":"Dangles91@users.noreply.github.com","login":"Dangles91","name":"Dangles"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-16T16:10:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor changes for save data utility (#3005)","sha":"6610abcd5f24da758f500b7f414309454bc4065e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-14T17:16:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-17T13:49:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Restore timeBeginPeriod","sha":"e875c911212632e72be33ab67448175d78eff7ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-15T09:20:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-17T13:49:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: simplify module loading","sha":"2ef2f0f63bb22cdef6858c2e728f68af5277027d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-17T13:20:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-17T13:49:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Patch system improved\n\nSPU patch rewritten\nPPU patch implemented","sha":"e39ee101050fd3fd99c32d2814fd0aa86b52e5ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-17T13:34:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-17T15:36:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Patch: add floating point support\n\nAlso count applied entries","sha":"f91f2e3e6dd9a54bc2f83cd433ee0cea478abd0c"}
+{"author":{"avatar":null,"date":"2017-07-18T00:04:53Z","email":"aidand91@hotmail.com","login":null,"name":"Dangles91"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-18T12:22:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixes for save_op_get_list_item\n\nOnly return data for dir and bind where requested. Some games like Akiba's Trip call this function but don't ask for any data back.","sha":"7426eb285feb5204ef7595f966034e8d60a0663d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-16T21:34:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-19T14:40:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"settings_dialog: get rid of string duplication\n\nuse enum to dictate button id","sha":"ae8f858c56df43e8cc079a68c9076de18dbf72f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-07-10T22:59:40Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-19T17:35:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implements deadzone for xinput","sha":"f0b1a587aa496cbeda1ed4f12ed5a021711442f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-18T17:24:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-19T18:16:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"debugger_frame fixerinno\n\ndelete zombie dialog\nclear breakpoints properly","sha":"67bbd59924d21782412067a653cae9003a68a666"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-18T17:25:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-19T18:16:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"main_window fixerinno\n\nremove sinful toolbar sorcery","sha":"ab534ac55df7206721191009f8a6de5dd8d8b867"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-07-17T05:21:46Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-19T18:41:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor sceNpBasicGetEvent Fix","sha":"0136215ef1a62bf772daca08e66267224e182248"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-10T20:45:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-19T20:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Optimize framebuffer lifetime management\n- Significant gains due to avoiding aggressive create-delete cycles every frame","sha":"f69121116ab9513129337c9047581df220a62ace"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-10T21:36:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-19T20:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"asmjit: Minimal locking when reading, also only lock when actually writing to the db","sha":"78f09d7645843315d76359fd65b12625e744f300"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-11T19:21:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-19T20:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"spu: Implement concurrent instruction execution watchdog for wrch\n\n- Delays threads by a predetermined amount to 'desync' spurs kernels.\n  Largely reduces lock contention issues as well as making spurs kernels\n  play nice with reservations\n- Also reduces number of lost notifications (SPU_EVENT_LR)","sha":"72e13ddeb22f8fabfd7743e8f46895bb4593f33c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-12T21:49:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-19T20:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk/rsx: Bug fixes and improvements\n- Improvements to framebuffer usage; Avoid creating new resources every frame\n- Handle null fragment program properly\n- Collect vertex upload statistics\n\n- vk: Pre-initialize 'unused' varying registers in the vertex shader in case it gets matched with a fs that consumes it\n -- Fixes a crash about fog_c not being declared\n\ngl/dx12/vk: Handle null fragment program\n\n- cleanup - use yield semantic instead of sleep(0) as yield is more cross-platform\n -- sleep(0) is a windows specific scheduler hint","sha":"05ffb50037facbae55db104cc94294cb75351b63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-14T14:00:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-19T20:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"spu: Add polling loop detection and clean up channel access contention code\n- spus run a tight gpu-style kernel with no multitasking on the cores themselves\n-- this does not map well to PC processor cores because they never sleep even when doing nothing\n-- the poll detection hack tries to find a good place to insert a scheduler yield\n-- RdDec is a good spot as it signifies the spu kernel is waiting on a timer","sha":"cbd1b28d0dfcc0a1da72cf454deef1d00e0cb02d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-17T16:52:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-19T20:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"fix build; restore asmjit reader_lock for now","sha":"94c1b74a170a37375ff6a6777285d5de828d304d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-17T22:12:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-19T20:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"spu: Simplify watchdog design (PC is purely HLE and occupies SPU code kernel space only, max 256K)","sha":"582913dc31c88dabe57969f9a47aefa02c16ea3b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-18T10:44:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-19T20:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Surface cache bug fixes\n- Properly handle data 'transfer' when recycling frame buffer images\n- Clear 'recycled' surfaces before use","sha":"2526626646dd5440730b19b74f92f9c76916237f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-19T16:35:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-19T20:28:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"spu: Clean up asmjit - avoid touching the shared db whenever possible\n- Gets around the locking issues when fetching from the shared db","sha":"99828a8f15c25698f5a08572f08f31e460a799aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2017-07-19T13:38:55Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-19T22:17:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Enable optimizations on travis","sha":"9fee2ebeb5b6ccc0abc262873c92c4ff9b684d82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2017-07-20T03:58:28Z","email":"talkashiegaming@gmail.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-20T12:43:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Correct typo\n\nNo classes or names or any of that poop are being changed here, only a text string.","sha":"3f6b24d33acb9ee61f8c03195c5fa6a203f35f99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-18T12:21:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-20T14:22:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve CPU feature check\n\nDamn exit on SSSE3 failure\nCheck AVX for Intel processors","sha":"0fa148e65e9c520339177d407b2029602b8912a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-18T17:03:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-20T14:22:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use RTM instructions (skylake+)","sha":"b24eb621ae141672898b8641ae762a61e4d33eff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-20T14:20:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-20T14:22:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU recompiler: minor optimization","sha":"291ec1eeb2fbf42c96225963b7311d2937583f41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-20T15:02:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-20T15:02:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Travis: do not zip","sha":"0dfd2eadc109d931a6504833c2c53e2d973477b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-20T15:05:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-20T15:05:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Version 0.0.3","sha":"d7e72797a8553210c1fc73f9cb7adfd8237aad6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-07-21T15:41:11Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-21T15:41:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Missing function names (HLE) and small fixes (#3038)\n\n* Add sceNpScoreGetFriendsRanking and sceNpScoreGetFriendsRankingAsync functions\r\n\r\n* Add sceNpSnsFbGetLongAccessToken function\r\n\r\n* Add new functions for the sceNpTus module\r\n\r\n* Add new functions for the cellSailRec module\r\n\r\n* Stub cellCrossControllerInitialize\r\n\r\n* Add sceNpAuth* functions for the sceNp2 module\r\n\r\n* Remove unnecessary call to c_str()\r\n\r\n* Add missing module id \"CELL_SYSMODULE_ADEC_AT3MULTI\"\r\n\r\n* Add Turkish keyboard mapping constant\r\n\r\n* Add cellOskDialogExtRegisterKeyboardEventHookCallbackEx function\r\n\r\n* Update cellSubDisplay\r\n\r\n* Update cotire version to 1.7.10\r\n\r\n* Replace cellSubdisplay by cellSubDisplay\r\n\r\n* Update cellSysutil.cpp with new functions stubbed","sha":"9747ab61f9f8f4db7525070915fe86fcd5d81076"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-21T22:54:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-07-21T22:54:28Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vulkan hotfix (#3046)\n\n* Rework vertex attribute binding for vulkan. Allows always providing a buffer view to the pipeline even if the game has the attribute disabled as long as it is consumed by the vertex shader.","sha":"df8fa74e2a9545a2af03a5d601230f2e0fe86417"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-07-21T23:03:27Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T06:41:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_timer: Fix initial timer state","sha":"7b3693bb29942fff1180d13a96ea2fa1480a65e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-07-21T23:23:24Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T06:41:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Fix vertex decompiler to support 2 arg destination","sha":"fde6099769db301436159a73e23c29e24df3450b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-22T14:34:49Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T17:09:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Scroll fix","sha":"2b24635ef7d24551848e6aeeb979b5d3e30e38c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-22T16:48:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T17:09:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Splitter fix","sha":"96dfa9b52683f284ea8a583bb577c104c0da71fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-20T08:24:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T17:34:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cg_disasm: fixerinno","sha":"f69e252c7a0d8f142c3ef436513f146bad36f71a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-20T14:10:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T17:34:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gs_frame: fix the mysterious \"second boot crash\"","sha":"f8c2e198c5380294ce4fb5068c79ebd8ac087d4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-20T20:29:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T17:34:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Merge pull request #3 from RipleyTom/OpenGLFix\n\nFix openGL","sha":"e93fbc6900f0660d6baaecc6856e2054b31e35a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-21T14:58:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T17:34:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"main_window: adjust toolbar size to prevent blurry icons","sha":"58816e314cc383519473e2f0ac3ee502ad7b81a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-21T15:57:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T17:34:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gs_frame: fix event","sha":"9bd6d285141c6fed409e8c57b5ac56669687207a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-23T07:55:08Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T07:55:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Save Data Note (#3054)\n\n* Split save_data_utility into two classes.\r\n\r\n* Add entry notes to saves.\r\n\r\n* Code review changes","sha":"5cc152b8ddcd94a474ce12366204b34d30e0f41b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T13:15:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T08:03:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix illegal instruction message","sha":"9dc9378bcc9f49038cdcf54c8d0e474a793cf9f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T13:16:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T08:03:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellGame: minor refactoring","sha":"c9abab6828c7b6eb9784fdf608d1718a25d0f8c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T13:28:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T08:03:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Set LLVM recompiler as default","sha":"23701248f358d94336a7bc14bed040d48c54e226"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T13:29:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T08:03:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Stub some SPU syscalls","sha":"3f9affd2ad74f4201c9382c8c4fa7bd7267c2003"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T13:30:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T08:03:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: minor bitcast avoidance","sha":"f9a69c449d8cedd042b07bd1b3b06461eb3f7c50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-22T13:39:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T08:03:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Force recompiling liblv2.sprx","sha":"42b06af5779a4fc38b5a11fb9be3028f779b98b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T07:54:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T08:03:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: Add error message","sha":"2bc57fbee3b5d904133b5839da6ebd40399bf5f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T13:01:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T13:01:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_rwlock_runlock fixed\n\nRegistered _sys_rwlock_trywlock","sha":"adf119e960cc455d526de650bc53901fc1755a40"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-21T23:23:06Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T14:27:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Log marking.  Useful for knowing when time based things happen in log.","sha":"0508e1e6385aabb52e6f86a99e8e3b57ea7920a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-07-21T18:02:15Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T15:30:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"xinput config file","sha":"5543441618020e580ed8eb2296807f93b6d97d74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-21T14:52:19Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T16:17:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add Q_EMITs and clean up a couple signals.","sha":"6648084c6406650c1c46f9330adec576cda49cc3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-18T19:34:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-24T13:52:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: More aggressive thread scheduling for vertex processing\n- Significantly helps vertex performance\n- Not recommended as more threads will harm performance if the PC does not have the cores for it","sha":"6557bf1b20e9854273f4f685a8ba0e1b6900eda5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-19T17:45:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-24T13:52:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"lower mt upload threshold to something useful","sha":"8db6555bdb3f7056c80699bb1c98854ed4286b51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-22T13:45:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-24T13:52:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan; Add a weak vertex cache with single frame validity","sha":"425821863bac0c4760ba8ff98b6022753be7b9be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-22T15:34:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-24T13:52:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix remainder/iteration computations in BufferUtils","sha":"a7c28f582797a0fe01dcfd1cc43f8ec4ec0e0d75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-23T13:34:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-24T13:52:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Avoid cache miss whenever possible if WCB is enabled","sha":"a24780fe5e8ab46b40d76065234e954910bfa81d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-23T14:11:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-24T13:52:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix framebuffer validity checks","sha":"cb194e06cef73aa429b407f39276123eb72d7d63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-23T14:45:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-24T13:52:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Avoid double flushing if a texture is externally synchronized","sha":"3b03f9a0106ea299541bcb151fd2c1508fa2db42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-24T00:21:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-24T20:21:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Settings Overhaul","sha":"a7802e9377963e9d863386e0b637c9ac37d035aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-24T17:00:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-24T20:21:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update Framelimiter Tooltip","sha":"f577af452d4b0d00d8439916a65630cdd1047fac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-24T17:12:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-24T20:21:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gamelist: scroll fix (workaround)","sha":"ab198c0c5f85a12d375fc8413517955f9cf153de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-07-24T20:53:20Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-24T20:53:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix PARAM.SFO filename case (#3081)\n\nFor (get_list_item)","sha":"b2fa0fdf53e07a1e9de0ef48db9de6764cb8c0d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18249536?v=4","date":"2017-07-24T23:27:23Z","email":"LambdaMan@users.noreply.github.com","login":"LambdaMan","name":"LambdaMan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-24T23:27:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Allow overlapping ranges in cellGcmMapEaIoAdress with coherency check (#3070)\n\nAccording to Jarves, lle-gcm branch already does the same thing so we know the behaviour should be correct","sha":"1bef748dc464db5e43171680a3dc1a8e7cb15b12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-07-21T19:43:08Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-25T01:41:05Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Linux builds now link LLVM statically, fixed Qt libpng issue, moved to single AppImage","sha":"f8e57147b08ac3cfe2ca2add8c2cfa348b18cfb0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-07-25T02:01:37Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-25T02:42:04Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fixes #3063","sha":"60e2928ec1cca60768bfb51a36e6a529c3d0219d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-25T09:30:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-25T14:37:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"game_list: fix sort and scroll","sha":"ff772dd28b1d7057647f69f44eb335c178061afb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-25T21:29:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-25T22:18:41Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"settings_dialog: make size consistent","sha":"37c26b77ee63a784e4a881991f33cddf02e0922b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-13T12:46:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T12:44:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"settings_dialog: enable LLE List multiselection","sha":"1c3b9754aa0a3272fb3f8593950cf197bdc533b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-25T14:43:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T14:00:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"settings_dialog.ui: just LINUX things","sha":"d260ccfc969c1833f5f421f303b80f09c149e39c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-25T14:46:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T14:00:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"game_list: enable stepless icon sizes","sha":"9f3f07f3ae931dfe6cdd5be33030e64b40adccf3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-07-23T20:45:12Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T14:49:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub cellRec functions","sha":"be84dd73a9153da1df88ae21ce623776f8a9dc4e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-07-23T20:46:16Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T14:49:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub some cellGameExec and cellResc functions","sha":"4c5921a7a4932c20f059fba1914bcc429073502f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-07-23T20:46:37Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T14:49:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Mixed minor changes","sha":"1899f399b6a128636964e9f228bf724dcfb91825"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-07-24T19:25:52Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T14:49:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub some cellSysutilAvc2 functions","sha":"173cc13d019e7bb438b189c144a79f4a343a8cbf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-06-22T19:08:17Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T17:27:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix issue #2788","sha":"54a38aa927644f274c78c59c93c37662ae3f9e65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-07-26T04:55:21Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T17:27:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Refactor setsockopt for better cross-platform-ness","sha":"08f00475294c0685a94c505bee36733a78d243a9"}
+{"author":{"avatar":null,"date":"2017-07-26T18:03:06Z","email":"kirbyfan64@users.noreply.github.com","login":null,"name":"Ryan Gonzalez"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T18:03:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Linux evdev joystick support (#2885)\n\n* Linux evdev joystick support (#2678)\r\n\r\n* Cleanup libevdev configure code\r\n\r\n* evdev fixes\r\n\r\n* Evdev joystick additions/fixes\r\n\r\n* Error message tweak\r\n\r\n* Fix evdev multiple joysticks (thanks @hcorion!)\r\n\r\n* Change by-id to by-path in evdev","sha":"dbd69536ed29bc69440982bdf0be7928e92c7851"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T20:14:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T18:03:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix sys_rwlock_wlock","sha":"5766fb1f3157ed163d3a5ba52804efa96e1792a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T20:15:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T18:03:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix sys_rwlock_wunlock","sha":"67b71c0f89e48952a7269d0d81e10fde972fa81f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-23T20:25:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T18:03:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Restore hook static functions","sha":"60c6bb98656e45d57eea0209668519d544962095"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-24T15:59:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T18:03:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"IPC support for lv2 sync objects","sha":"bf53035e3f7a3117495c51251b6dcf279b9606d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T18:09:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T18:09:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellRec: fix vm::bptr","sha":"f58652e51c8399b991c3e4246c3f6fa5f80f9da9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T18:19:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T18:27:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update tooltips","sha":"d2116a187e77f187c61f87f75969492a188a269b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T18:29:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T18:29:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Delete make_fself.cmd","sha":"6f6b23e8793c020a3532250ede78c2e9477c44bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T19:24:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T19:24:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add supporters","sha":"5d8640109df56c0196963c243ce45add65e10c04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T19:35:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-26T19:35:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix sys_semaphore_wait (on timeout)","sha":"7fa42cfaadfc330a50efad910750470bf5d5d524"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-24T17:49:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-27T11:33:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Vertex cache rewritten, add option to disable it as well\n- Also enable SPU loop detection by default while were at it","sha":"46fa6e47fe54c8ad32e7021fe8cc3ab4280e74e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-24T17:50:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-27T11:33:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Texture cache rewritten - Use a map of vectors instead of a flat array","sha":"dd196228235166110264a3921d34b480e685875d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-24T17:55:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-27T11:33:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"spu: acquire_pc rewritten to be more precise in timing\n- More accurate pauses may slightly reduce performance but makes it more viable\n  to allow more threads to participate without stuttering","sha":"17c399d4e883db973f5629ff32616242f168ba32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-24T18:47:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-27T11:33:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Workaround to avoid lockup due to double fault\n- TODO: Ensure no page faults occur within a page-fault handler!","sha":"fb7ccbd7b4d6ceaa4d39e2afff16c4176c5c5c64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-26T14:57:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-27T11:33:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"ui: Restore 'Strict Mode Rendering' to GPU tab. Also add an option to disable the vertex cache\n- Also, updates json tooltips for some options","sha":"fc6891a0e34cbae3c4a70de540b357e97d19af93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-26T16:32:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-27T11:33:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk/gl: Refactoring - Also adds a vertex cache to openGL as well","sha":"4cd5624fa7a51c3a97422eb5a89872cec16d31c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-26T18:18:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-27T11:33:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: Do not trust gcm buffer size to match internal rendering resolution\n- Should fix games with strange scaling artifacts due to upscaling from lower resolutions","sha":"f613901eac2960393a894ffb1cf2b8a05efca7e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2017-07-27T21:37:29Z","email":"talkashiegaming@gmail.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-27T21:37:29Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix missing newline, add periods, add tooltip for gs_resizeOnBoot (#3112)\n\n* Update settings_dialog.cpp\r\n\r\n* Update tooltips.json","sha":"7ac96f7526c2c57b7313efcc68704fcba59aceb6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-07-28T15:30:35Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-28T15:30:35Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix build (#3117)","sha":"9a1a7dd5316587c0846e927363a1b08efe924ab4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-28T20:03:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-28T20:03:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI: add custom config indicator (#3108)\n\n* game_list: add custom config indicator\r\n\r\n* icon resize: get rid of duplicate call (great performance boost)\r\n\r\n* icon resize: only save on slider release or clicks (performance)\r\n\r\nrefactoring shenanigans\r\n\r\n* game_list: skip filtered out games in Refresh (performance)\r\n\r\n* settings_dialog: remove unnecessary show() that caused glitches\r\n\r\n* gs_frame: add disableMouse setting\r\n\r\n* fix travis warnings","sha":"4dbc546e7bf10c76bd992b3828ada1c087e2ad09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-11T18:34:38Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-28T20:50:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Rewrite memory pool to be thread safe.","sha":"f9e996e006b36dd0fa26b2ad4c8af3689f83fede"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-07-29T03:39:20Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-07-29T03:39:20Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Bundle Qt5Svg.so, Fixes #3094 (#3120)\n\nBundle Qt5Svg.so, Fixes #3094","sha":"bc4d73da029def0c8a9a77ec622da24045fe8fc2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2017-07-29T21:50:47Z","email":"talkashiegaming@gmail.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-29T22:10:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update outdated firmware log message","sha":"aeb01bd21621c1315c7ee405c51bb351f918fd56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-29T13:07:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-29T22:09:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: minor optimization","sha":"f564a72d038339472a62980a7140b4ecca9f5340"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-29T13:07:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-29T22:09:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fix of sys_event_queue_receive","sha":"a209d0d7fa4e4f6eadd0d3f4ea567c06cd96942d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-29T18:01:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-29T22:09:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_lwmutex, sys_lwcond refactoring","sha":"93db420f80dd5a430982e1013519981a1edb1f8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-29T18:24:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-29T22:09:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix _sys_lwcond_signal, _sys_lwcond_signal_all","sha":"bf14cbdb27e844abdc0cb834b09c96f56b7ea850"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-29T18:30:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-07-29T22:09:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add supporters","sha":"77f58326afad7b01a79271d785a7b0f4950adc8c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/12694065?v=4","date":"2017-08-01T17:22:33Z","email":"martin.tillmann@gmail.com","login":"mp-t","name":"mp-t"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-01T17:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Code review (#3114)\n\n* Fix always-true conditions in sceNp module\r\n\r\n* gl_render_targets: useless check on unsigned variable, possible bug\r\n\r\n* fixed UB in crypto utility functions\r\n\r\n* copy-paste error in vk::init_default_resources\r\n\r\n* pass strings by const ref\r\n\r\n* Dont copy vectors. Make sure copies are not needed because functions are used in a multi-threaded context.","sha":"607d2486eac29f331fb41f05729b00e497358a3d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-07-26T02:33:32Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-01T22:33:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx/gcm: Implement rsx dma. Refactor gcm/rsx to not be as codependent","sha":"d9a693019b30e695f01300333d5b1242976de175"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-07-26T02:57:43Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-01T22:33:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_rsx: implement support for lle-gcm","sha":"21dd715b427abbdabb790db585f4ff6590a608b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-07-26T03:00:05Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-01T22:33:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"d3d12: Fix 0 sized framebuffer crashes","sha":"fff34a7f0fa99c55816990613f0ac0815448374b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-07-27T13:39:06Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-01T22:33:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add gcm to auto lle / liblv2","sha":"02845f546e8f91b5ae0fcbc6fcf5f1333755323d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-07-30T20:13:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-03T20:06:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI: fix icon sizes and exterminate gamelist bug\n\nrecreate old icon size values","sha":"d51a986dd45e3ef565d573b5c4a0265b861935fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-02T22:44:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-03T20:06:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"log_frame: fix random stack","sha":"930ce4af60cae07ca926b26823eda1e7e2b0832d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-02T10:22:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-04T11:33:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CFG: provide _int range in to_list()","sha":"faf9ed9fec3eff24b313085f6532219ebc6b4f37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-02T10:23:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-04T11:33:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CFG: catch exceptions","sha":"f6c8f46462f3f000177bd27ea6fa8a13e9e1ba87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-02T14:49:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-04T11:33:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement error report stacking","sha":"c14eb4e54a2d84fc29dd07ee3d1ecea409cf0a79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-04T11:33:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-04T11:33:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Relax allocations in ppu_load_exec","sha":"7b4c044480c8a9351c9007ef5bc333387962f367"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-05T14:07:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-05T14:07:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix Firmware message","sha":"b05434bc6f2cf0afc48dd97bde1ef0dfa605f0b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-08-06T00:46:01Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-06T00:46:01Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Yield instead of sleeping rsx thread. (#3158)\n\nAnother Yield","sha":"2d7e91ba8a3852dc3e6215732bed87d131626aff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2017-08-03T22:43:27Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-06T01:02:57Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Make ALSA optional","sha":"40d305b35d9a6549ba3ce5c312f0cf7559acbded"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-27T13:29:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-06T11:29:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement conditional locks","sha":"7ab1792ef73407d3c9ff83a8aed06f9acaf0ca0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-27T16:04:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-06T11:29:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Implement hardware zcull emulation\n\nrsx/gl: Support s1 immediate values; ogl minor refactoring","sha":"fcb7072feeca0acc8f500374ceb43041bd12ba10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-06T10:13:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-06T13:13:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix idm::init, fxm::init","sha":"7b27a8e993bebc80630a39456bfca0c6864ec283"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-06T19:29:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-06T19:29:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"drag and dropperinno (#3037)","sha":"f3ad922a8f878db4c68716afd472cd9e8aa00578"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2017-08-06T03:15:15Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-07T23:34:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fix segfault in boot recent list","sha":"009f53a2671779dd7daafc65f1d80a299333ee32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-08T19:13:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-08T19:17:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve error formatting","sha":"613214cdca216b49af47a0e71a7f6b08c619fe13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15310522?v=4","date":"2017-08-07T22:05:59Z","email":"aurora@aventine.se","login":"rawrafox","name":"Aurora"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-08T20:20:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make it build on macOS with Clang","sha":"7e1c6a5819e81a7d38bf7cf702fd14600b59ca22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15310522?v=4","date":"2017-08-07T22:44:02Z","email":"aurora@aventine.se","login":"rawrafox","name":"Aurora"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-08T20:20:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update hidapi","sha":"ce0e87373de407d4ca80061ba670fbcf7df57543"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15310522?v=4","date":"2017-08-08T11:59:37Z","email":"aurora@aventine.se","login":"rawrafox","name":"Aurora"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-08T20:20:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Disable PIE on macOS too","sha":"300b34e268b7d71603f8f3046295f4adbfaeb820"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15310522?v=4","date":"2017-08-08T14:11:47Z","email":"aurora@aventine.se","login":"rawrafox","name":"Aurora"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-08T20:20:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Reduce the zero-page size on macOS, so that PPUThread works","sha":"2fcd38c2bc7d8f1cc8c621a28315dcdb4808cc9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15310522?v=4","date":"2017-08-08T16:20:41Z","email":"aurora@aventine.se","login":"rawrafox","name":"Aurora"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-08T20:20:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update build instructions for macOS","sha":"e9b020beaa757454aee74794d483545c90fad958"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-08-08T23:45:57Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-09T11:19:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Fedora glew install instructions, Fixes #3182","sha":"b01e7e3362e8e55960109e3d14c8eb56deb70a50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-07-12T14:07:40Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-09T19:11:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Perform refactoring of pads to remove the ugly pad initialization.","sha":"d1cde4d0a758ee3729dd419f113c8e83b04d89c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-08-05T00:36:05Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-09T19:11:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add rpcs3 icon to save dialogs.","sha":"866b9524b3a334e7d75d5cb4239ceca30d586889"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-08-05T01:27:11Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-09T19:11:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove about 100 warnings from rpcs3qt code.","sha":"fa7407cd425b5c005f06d7abc2c44653b3b85ce7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-08-05T02:31:30Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-09T19:11:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Finesse size of goto address. Downgrade image loading failed to warning.","sha":"3f206981d9e973d58e1803dd2b55d3204d98ce05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-08-05T03:10:46Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-09T19:11:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove some warnings from Linux and fixed something from code review.","sha":"54d2e8bfddaaf145c177b0c9ed3647a099df480d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-06T07:56:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-09T20:44:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"use new range for combobox, remove obsolete code","sha":"ae440a92ac79c3bfa724a9ae7126f35b81d4ab32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-06T20:06:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-09T21:16:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl: Fix zcull queries and log conditional render modes\n- Fixes a situation where a query readback is requested while zcull render is still active","sha":"4c019c55d24fc7a257ec921c80a5b1d5b98bfb72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-07T10:09:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-09T21:16:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Properly initialize pipeline properties","sha":"ce437eb8d21d6ac2ed825d73c8f24ebafa4987b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-07T12:58:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-09T21:16:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix occlusion statistics clearing","sha":"e5e6af41a67d6e0301be3d43c9341a94b6842022"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-07T16:35:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-09T21:16:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix inconsistent state tracking","sha":"1e46cd255bf7bad6500b2aa6ffc6b4dbe35f8066"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-09T23:11:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-09T23:53:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fix resize on boot","sha":"0e5a862d8a47b9f1b02a5bf0a5d06cff85ee0d29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-09T16:38:27Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-10T12:03:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub cellSysutilAvc2 functions","sha":"2f977aae18d5d0981b576f7ddb4e29440a9e9e5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-09T16:40:11Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-10T12:03:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub cellAvconfExt functions","sha":"e9f12ae30ab4c0736e9387d7fada4f80fef930db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-09T16:40:56Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-10T12:03:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add cellVideoOutSetCopyControl function","sha":"6e81db7b43851f5b0c09637137ee49f513f946a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-09T16:41:09Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-10T12:03:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add cellSearchGetContentInfoSharable function","sha":"08e2698b9cd58db963c5537b8bda8e54fc1724a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-09T16:41:58Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-10T12:03:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add cellUsbdRegisterCompositeLdd, cellUsbdUnregisterCompositeLdd and cellUsbdResetDevice functions","sha":"108f87c08f889dcc8dd03010fdae25b622bcd4d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-09T16:42:13Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-10T12:03:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add _sce_net_add_name_server function","sha":"77354f0f90c2725b2e7095fb6a6c56229ff43fc9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-09T19:38:10Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-10T12:03:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add sceNpTssGetDataNoLimit and sceNpTssGetDataNoLimitAsync functions","sha":"98ef419abdb4a860367e50358927739d9bdf3120"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-08-10T05:23:46Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-10T12:34:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update ffmpeg","sha":"69a5f3d58b04687dd67155de7b98cc80fbd8c077"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2909949?v=4","date":"2017-08-10T21:41:13Z","email":"praydog@users.noreply.github.com","login":"praydog","name":"praydog"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-10T21:41:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor DS4 Bluetooth fix (#3140)\n\n* Fix DS4 input not working after controller restart (bluetooth)\r\n\r\n* Fix bad hid_free_enumeration logic\r\n\r\n* Tabbing\r\n\r\n* Proper way of telling DS4 to send 0x11 reports\r\n\r\n* Dead code removal","sha":"6136abd0f8854c515dc0bb3eb4a69fdca97f7199"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-12T09:10:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-12T09:53:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"game_list_frame: add scrollAfter option to Refresh for Talkashie","sha":"4c4204394035dd33839d7dbb7cf1e1aae3208010"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-12T09:12:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-12T09:53:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"emu_settings: fix faulty custom config file creation","sha":"eeb4d4d4dec4af7a15700c894629bbe41dae794d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2017-08-12T21:32:00Z","email":"talkashiegaming@gmail.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-12T21:32:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Register missing functions in cellSysutil (#3206)","sha":"a909bd6eddf59b611c19b1d72fa788ad486bfefc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-08-13T15:32:48Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-13T15:32:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"(#3214)\n\nAdds cpu to log.\r\nAdds [DO NOT USE] to D3D12 selection.","sha":"80fee5ac1ecc1aa584eb9d5a424400b7f56477a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-08T20:02:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-13T18:39:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update supporters","sha":"0d9b89fb34fe1516a4c1daa58de3ba927ceab5da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-08T23:52:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-13T18:39:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix deadlock in vm::unmap","sha":"af11ad62538689e1bc3b66a6d29b7435636629ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-11T11:07:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-13T18:39:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite Drag&Drop classification","sha":"b671bb72dc36aa94420396f2d5fe2218b2d54621"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-12T10:52:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-13T18:39:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Check FNID duplication","sha":"24f9f0627954edae05a645c3c778c17fc1136887"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-13T15:30:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-13T18:39:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CFG: print errors for enums","sha":"2047cb8d1d940b1ab48807aefada3c816e8d5164"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-13T18:38:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-13T20:26:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add build warning","sha":"d2fb69cda3e6dd94c6c13dc4834be4ff9e1b55f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-13T23:34:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-13T23:34:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix appveyor.yml","sha":"0ad05106246f80cc63844e95b754a29d66586747"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-13T23:48:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-13T23:48:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix appveyor.yml","sha":"b44f5e59ac0d9649b667e2a6ccf4f77489c62c32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2017-08-13T06:46:23Z","email":"talkashiegaming@gmail.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-14T15:17:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update cellHttp.cpp","sha":"2c611ec0ba44aec512e9d294a5c74ac89a4f4bcd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2017-08-13T07:42:24Z","email":"talkashiegaming@gmail.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-14T15:17:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update cellNetCtl.cpp","sha":"d8c449aadf7717509aff7521e1f5852d41fb340e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-07-29T23:44:56Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-15T11:30:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Adds support for multi-files pkg.","sha":"474bd7beaf967a6a0ebd593c6dd01a66451dbc0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-07-30T09:22:45Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-15T11:30:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Adds check for pkg signature in QT part","sha":"a38182b967ad0806f4dfdbd6c7a30fd974418463"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-08-07T12:33:07Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-15T12:28:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Resets sleep timer on button press\n\nAdds windows sleep timer reset on ds4 button input\n\nRefactoring\n\nShorter version","sha":"db9618ac2faafdf71739b0f3a695564331d7d432"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-08-15T12:08:16Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-15T12:58:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"unpkg fix","sha":"e0508c6c6485d5d6ad5d2ef50c07480517725b29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-08-13T21:14:33Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-15T18:14:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix rare occurence where there is a /PS3_GAME+something directory which leads to weird behavior","sha":"81da93a30276115d9d6a0d62972bd15ba3219e32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-08-13T23:52:20Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-15T18:14:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix search edit context menu weird color","sha":"844e09c40eefcacaf5c8cc2548ec166b44bcbaea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-11T19:35:53Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-15T18:34:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Simplify qstr function","sha":"ae156801dfeb2ecfcb588fd63863de36a7d7b9b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-11T19:36:50Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-15T18:34:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Simplify m_show_fps assignation","sha":"0c1d4e43e42d8b3e6ef7b6694fed86bf376bfd38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-11T21:50:08Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-15T18:34:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix the window title when the option \"show_fps_in_title\" is not checked","sha":"956117a74f58b433610feb74012ccadb8bd8a6f2"}
+{"author":{"avatar":null,"date":"2017-08-15T19:14:13Z","email":"kirbyfan64@users.noreply.github.com","login":null,"name":"Ryan Gonzalez"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-15T19:14:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Better evdev joystick axis scaling (#3202)\n\nFix evdev scaling when the minimum value is <0\r\nDeclare a trigger as pressed as long as any value >0 is given","sha":"6d14583f287c5b19ebb06636b9c6ecd1541436d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-15T20:03:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-16T15:11:11Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"stylesheets: fix default not working","sha":"ea462ae7d7f2bd41ac283c6f9b2b3da0e84a08d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-15T20:04:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-16T15:11:11Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"stylesheets: move white header section to default stylesheet","sha":"a18fddb8314e45dfb63a8c5e01bee52a3f3ca8dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-15T20:59:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-16T15:11:11Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"stylesheets: make toolbar styles more accessible","sha":"a0176775ff6e9225095cf0c70b4a349b8022d976"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-15T21:03:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-16T15:11:11Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"stylesheets: fix color settings","sha":"0020359b8fbb98e225fac9522c2592f7b0fcb133"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-16T07:41:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-16T15:11:11Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"stylesheets: fix gamegrid font","sha":"e668ecd45332a0b7e771557159b993b9f67741f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-31T11:38:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Move vertex processing to the GPU\n- Significant gains from greatly reduced CPU work\n- Also reorders command submission in end() to improve throughput\n\n- Refactors most of the vertex buffer handling\n- All vertex processing is moved GPU side","sha":"d54c2dd39ab534c2a636277c51adc7b9beb8d909"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-07-31T20:41:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add a few more depth format types to known behaviour paths","sha":"b2b5f564a14d9855f162f87368c2e8e63c0a81f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-01T20:37:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Workaround for depth/color format mismatch when using hardware blit","sha":"c0409a819e93c3f021286316175aa33ba66a11ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-04T14:11:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk/gl: Factorize shared GLSL code\n- prep vulkan for shared glsl backend","sha":"6a707f515e28573fde7373a7b318ac7dd2dea4a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-04T21:11:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl/vulkan: Refactoring and partial vulkan rewrite\n- Updates vulkan to use GPU vertex processing\n- Rewrites vulkan to buffer entire frames and present when first available to avoid stalls\n- Move more state into dynamic descriptors to reduce progam cache misses; Fix render pass conflicts before texture access\n- Discards incomplete cb at destruction to avoid refs to destroyed objects\n- Move set_viewport to the uninterruptible block before drawing in case cb is switched before we're ready\n- Manage frame contexts separately for easier async frame management\n- Avoid wasteful create-destroy cycles when sampling rtts","sha":"00b0311c867e4efc97e3947904b1f99296bfbc64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-07T21:54:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl/vk: Invalidate texture regions when memory is unmapped\n\n- Free GPU resources immediately if mappings change to avoid leaking VRAM","sha":"1da732bbf5841eca80a4c8a3958ae76e94203cb6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-09T11:30:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Implement shaders cache and fix broken pipeline_storage comparison and hash\n\n- Fix pipeline state storage to uniquely store each pipeline variant\n- Adds a progress bar to indicate loading is taking place","sha":"c7dca1dbefe7c55b11828c6d67569336e526e9a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-10T19:40:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/util: Add simple consistent hash function\n\nrsx/vk/shaders_cache: Move vp control mask to dynamic state\n\nrsx/vk/gl: adds a shader cache for GL. Also Separates pipeline storage for each backend\n\nrsx: Add more texture state variables to the cache","sha":"00c6a589a521308b72a4b0c5ff1298f004901481"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-11T11:49:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Zero-initialize the vertex register block\n- Some games reference constant regs that they never initialize","sha":"bbf2a97d2e35d1d6ef86ab19501b9bf59faee607"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-11T12:16:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Clamp depth range to [0,1]\n- Fixes remaining issues with Ni no Kuni","sha":"6eb178663592c942902ca49de8629c594b3dd698"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-11T12:39:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gui: Add delete shader cache option in the context menu","sha":"0dc24799f11faf9bc2a42d53d76df16fefa979a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-11T20:32:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"ui: Move disable vertex cache to debug. Also add an option to disable zcull emulation in the debugger","sha":"3c9bab856350b399aa46f3ee14de7cb18332a467"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-11T17:47:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Shader pipeline fixes and improvements\n- Do not set zfunc if alphakill is not enabled. This is because at the moment alphakill requires a different shader to be built\n\n- use glsl loop-unroll friendly comparison; skip vertex input compare if either key requests it\n\n- Minor tweaks to fp key generation","sha":"c04aa0539857cbadaced5ffcc8006d1332a12873"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-13T17:41:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix vsync; always use adaptive vsync instead of double-buffered","sha":"b86745ee4e4de7b3f8ed4b8851c251f5a9bd718f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-13T19:09:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix single vertex array input declarations","sha":"2fd4726919eede5aa17d9a14c8df0bd65a0f0bea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-14T12:45:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Workarounds for intel GPUs which dont seem to be truly GL4 compliant","sha":"650c1c64f1646503e3037af8c1ac2924a4b615e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T08:00:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Catch leaking imageview refs on resize","sha":"531b03e7afb448da6c398386d2d4ec3df66ca2b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T09:30:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Restructure frame queues","sha":"1b1c300aad2db0e0cb836ab3d1436e03544bcda9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-14T15:50:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Reimplement access violation sync handling","sha":"24002101448bc7eeff16d47806994ced775b268a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T12:19:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T20:58:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add a success message on program compile completion\n- Should help users wondering if rpcs3 'froze' during shader compile","sha":"334327df67acec9f7e53313b1719479d913ebb6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-16T21:10:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-18T13:51:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix immediate indexed drawing","sha":"142bfb52505139443f426f1baf78da921a1e9720"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-17T15:47:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-18T13:51:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve window resize handling\n- Be careful not to request images not available\n- Request a triple buffer at all times if available to keep acquisition from locking up","sha":"a8b989b51dc015841286531ca91488a90be55207"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-17T19:24:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-18T13:51:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Don't keep invalidated objects around too long\n\nGames like Tales of Vesperia seem to be using a random memory allocator with very low collision chance.\nThis means objects are very unlikely to be reused in such games leading to pile-up","sha":"f21a3069a5fdbaf50aa74dd8a066ad72fb85a531"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2480569?v=4","date":"2017-08-18T16:47:11Z","email":"probonopd@users.noreply.github.com","login":"probonopd","name":"probonopd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-18T17:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make it pass desktop-file-validate in Ubuntu 14.04","sha":"d6329eaa1a94cdd4d771f396c1b0a4497ace2bfc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-18T11:49:42Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-18T18:59:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Move sys_gamepad files to the correct directory","sha":"93bfe8164ca0dd5409ef68f74b605c8b6fe3a255"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-16T17:58:06Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-18T19:42:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add cellAtracGetSamplingRate and cellAtracMultiGetSamplingRate functions","sha":"dc9671c639457d72f95b9b8971c94e6eb1fc698f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2017-08-16T21:56:29Z","email":"d.maljutin@yandex.ru","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-18T20:09:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Silence some obvious warnings\n\nMakes travis logs a bit cleaner","sha":"9d1aebce7471dba37ff1350e99e45db60135af5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-08-04T04:50:56Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-19T09:27:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Ignore sending system reserved semaphores to renderer","sha":"7ecf6cb014794dd5ff3f381716ccf09f7cab2d13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-08-04T04:52:04Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-19T09:27:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"d3d12: ignore 0 sized rt dma copy","sha":"4d5f98017f4bd7cb612a6e5370d9b4fa3d710a4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-08-18T05:47:59Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-19T09:27:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Vertex Decompiler, fix sca register assignment","sha":"5d7c454e52f102f1ef42fb26218c1950211016a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-08-19T01:04:50Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-19T09:27:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"cellPad: remove unneeded &","sha":"650db9c96284da6e73b0197b94f7fed0e3662e07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-18T20:44:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-19T14:35:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite cellVideoOutConfigure","sha":"590ca7115fa1c507172ff9fb4b89a2bcb162fe3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-08-14T00:17:45Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-19T15:17:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement a proper save manager.","sha":"196cdfafa6843d7d78618d8ea4e6eb6f0f861eb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-08-14T02:35:40Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-19T15:17:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make removing a save fast","sha":"e9f057c91b6b381acee516088bcb9dd3a5c5775a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-08-16T16:57:38Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-19T17:05:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix evdev controller detection, add joystick squircling","sha":"66a43c35dbaa63c5ebba2690ad8ff0a982b882e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-08-16T20:28:46Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-19T17:05:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix linux builds giving experimental build even if not on experimental build.","sha":"bc7d728eb397c3b525a6c1b20f3704390789cdcd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-08-16T22:04:15Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-19T17:05:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update ffmpeg submodule with updated libs and headers for linux","sha":"36ac35361ffa729991a6d8e6bdd24c399d9a0212"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-08-16T23:23:06Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-19T17:05:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use newer binutils version to link against newer ffmpeg libraries","sha":"514a98321df1b481bf3d1ffb7ca39a6967a89466"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-08-18T19:26:39Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-19T17:05:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix evdev joystick detection","sha":"e6a07e80d716fbc39972d101ed58f808ae03ab1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-16T21:38:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-20T13:14:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"stylesheets: make UI Colors optional","sha":"fff62df6a2ad6808f86532b0d74d4cfbd016467c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-17T18:56:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-20T14:32:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"osk: fix backspace","sha":"fb816a0eb995ad82d92aef697ed4b03bd45b4045"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-18T07:39:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-20T14:32:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cg_disasm: fix frame by removing parent","sha":"713c1a7a86e768654345b223b4cab343aa37797f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-18T08:41:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-20T14:32:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"misc: get rid of some compiler warnings","sha":"0854ed2b51e4f91f5a1ffa0a87b507a47e4368fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-18T09:12:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-20T14:32:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"misc: add build warning to log","sha":"8b35df83274515efd67e2dfcef84622ab602f1b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-19T09:37:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-20T14:32:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI: hide utilities by default","sha":"33d3303bdfedde47c89162c45a36da2dcc014e86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-20T14:02:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-20T14:56:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"stylesheets: UI_Colors hotfix","sha":"a822d990d2fffafc67fbcd0ca2f2919c863ed187"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-20T16:10:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-20T22:05:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"stylesheets: UI Colors fixes","sha":"ee98683538a2b2d6a2111cd541a60dbbb4bb6342"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-20T17:44:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-20T22:05:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI: improve reset to deafult button","sha":"c85806c422bc79265023866edee00f07aa051352"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-08-19T20:04:11Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-21T14:32:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: implement pixel size 16.","sha":"37bc2b3bb96d43cfde48a0648aa8fb78068f4ab0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-08-22T07:20:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-22T12:28:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"stylesheets: add custom color to gamepad","sha":"c7c013978819d7c22f1ade584b3a3491c16a4936"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-20T21:58:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-22T18:06:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Ensure all log messages are displayed","sha":"a68983b551040fa10a6b7e8249a33740a1d07e61"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-22T18:05:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-22T18:18:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implemented fs::file::get_handle","sha":"d0e171784ce78f191a9bcb40857fc2656a1079d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-23T17:45:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-23T18:26:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix moving disc games with arbitrary dir name","sha":"1716db14ed5a7374d8afd6ae8e60ccd68679af1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-23T17:44:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-23T20:11:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Optimize RPCS3.log and limit it to 64 MiB\n\nUse memory-mapped file for writing","sha":"025a09ed878d3c1f353123b2b9e5e65c121675b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-23T20:14:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-24T13:27:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Reenable thread_local for all platforms","sha":"c1450ad61627cfb4d5e117b8b43af89b73a710ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/460342?v=4","date":"2017-08-24T08:42:01Z","email":"andy@andyofniall.net","login":"ajoneil","name":"Andrew O'Neil"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-24T14:43:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add PulseAudio audio backend","sha":"daf3760cd4fefef25c3441d08346fb21c3d745b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-24T18:19:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-24T18:20:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix log mapping (Linux)","sha":"00339cb99be6deac58e5098d9ec2c26b2e9038ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2017-08-24T19:15:09Z","email":"26035046+Talkashie@users.noreply.github.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-25T17:42:41Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Correct typo","sha":"86ef07b1666d99141a8b0b77dee3768c5b4fb064"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-08-20T23:10:28Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-25T18:31:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellOskDialogLoadAsync fix\nTakes into account text limit and initial text","sha":"5681801b854b78e1bf50c50ae0d595972d8b0edc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-25T11:50:31Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-25T19:20:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[Qt] Simplify firmware libraries searching","sha":"85199e200bbaf5d295d12666892c50e7e108434b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-18T18:10:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-26T18:53:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl/rsx: Fixes to zcull pixel counting","sha":"8358bda1330c1015804de7f23a1bdbc3e663a8a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-21T17:56:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-26T18:53:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Make fragment state dynamic to reduce shader permutations","sha":"f71f67c4ff0311a373e99572eb9b6fa78208b9ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-21T20:04:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-26T18:53:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Gracefully handle back-to-back flip request spam","sha":"462b93f62c5edf5c2002c8c8d60b6f78e768d4d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-23T19:49:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-26T18:53:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vp: ARL fix","sha":"9a7ce2fd293b3598e09c84508d7a74f943882ef4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-26T14:31:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-26T18:53:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Workaround for restrictive z range","sha":"e76b6e3f278be567afcac3fc53311274e6f0ea55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-26T15:17:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-26T18:53:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Do not modify bound depth/stencil buffers bound to zcull memory\n- Fixes some rare cases where zcull always fails","sha":"e56d8db6a3fdffbdd9b863c5692210b2a7b57abf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-26T15:54:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-26T18:53:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement QUAD_STRIP\n- QUAD_STRIP evaluates to TRIANGLE_STRIP in memory. The memory layout is identical.\n- The only difference between the two modes would be the primitive_ID but that doesnt matter on RSX\n- Its worth noting that results will be different between the two modes if input vertices are non-coplanar for every set of N verts","sha":"fe5828cb478c180ae21b435fb851a9ee8aa13bee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-26T17:18:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-26T18:53:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove index expansion for quad strips","sha":"2e9405db4c7c623ef08e638b1d69707c55eabd52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-26T13:38:52Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-26T21:03:15Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Update cell_FreeType2.cpp","sha":"8fdf1b23a356c4efe7f51a9d8869eeba658e8cb2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-26T05:36:06Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-26T21:32:40Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"[Qt] Replace deprecated qSort function by std::sort","sha":"cb00190c3e104d4c7998b6f80183202a15534bd3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-13T23:19:22Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-26T22:27:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix GitIgnore","sha":"95abf768a7ec434ef61b75a959f94b595280f1b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-13T23:20:28Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-26T22:27:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI: Add Kuroi (Dark) Theme\n\nNew and first theme for RPCS3.\nIt's based on a dark color scheme.","sha":"3d626e84efd203d0c9806169ea419db81458eed7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-22T23:15:26Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-26T22:27:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update Contributing Guidelines\n\nUpdates contributing guidelines to use Game Compatibility wiki page and new forums hyperlinks","sha":"68ecf340c5bcfdf0270e8faad4483e287cac252c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-08-22T23:17:43Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-26T22:27:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Point forums URLs to the new one\n\nUpdates forums URLs to our new forums","sha":"dfc970c926af193cf5e735f98cf9cca573dcf7b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-26T19:09:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-27T00:00:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"_sys_spu_image_import implemented\n\nvm:var<T[]> improved (begin/end)\nsys_spu_image_import rewritten","sha":"aa5dc5455e424947b8aef7e9ca5a1f1eedaaeb8c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-26T19:35:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-27T00:00:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make impossible to disable fatal errors","sha":"d98f739043a8b65fc64ca88b5738a356238eb131"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-26T20:03:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-27T00:00:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Reserve log space for higher severity levels","sha":"834712bb58c48bf6cf33227a3ef5719cf0f26c2b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-26T23:57:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-27T00:00:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Copy sys_spu_segment info in SPU TG\n\nNo idea whether it fixes something or not","sha":"f59a448f3f46f39e3dd2faa4552b4336c402f439"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-27T13:09:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-27T13:09:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Register Win32 error 32","sha":"25709112839adbf6175b4198c85cc03cfc33ab64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-08-28T01:52:32Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-28T15:43:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Spelling correction","sha":"818df50bb58f87489e28803dbcfe215b2290576f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-08-28T16:10:27Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-28T22:36:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make travis CI build with PulseAudio backend.","sha":"43b860d2672f5aebabd9f3c2ce0339bcdfd2f63c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/27258105?v=4","date":"2017-08-28T03:05:50Z","email":"gayfordgloop@yopmail.com","login":"JayC-03","name":"JayC-03"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-29T00:19:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add missing game categories\n\nUsed by some media apps, \r\nYouTube boots now.","sha":"64a6fbe39ff089d0155a36aeb0d3c6360d223ad9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-29T14:09:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-29T14:12:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fill log with \\n","sha":"a771fcb3970e37338d3647e7d33a4c9fa2321bf5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-29T14:11:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-29T14:12:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compress log to RPCS3.log.gz","sha":"26e13b4f5f59699ba723214e0c8d1bb202c2db6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-29T18:23:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-29T18:26:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix ipc_manager::add\n\nThanks to @Farseer2 for debugging","sha":"da3f3fd1fb1682d2b4f7c30600b6174942b71813"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-30T14:14:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-30T14:14:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs::rename fixed\n\nAdded overwriting policy\nsys_fs_rename improved","sha":"010b75251f15344dc7b6dd6605f37b7f297c6842"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-30T14:15:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-30T14:15:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Log backup rotation (incomplete)","sha":"7b96190e6cde47616ef71b96f938f23c6d660ecc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T02:21:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T02:21:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix fatal error dialog","sha":"14a62692430ecb35312fcea6b3119b640305d8ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T17:36:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T17:36:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_spu_image: minor update\n\nCleanup\nTemplates extended","sha":"b533d57717b801e05f2f66fca804b3af4bd4f04f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T17:37:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T17:37:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"+sys_spu_elf_get_information","sha":"8807cd06b78e85aabed21211aa0fd7cbabb4a2cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T17:38:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T17:38:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"+sys_spu_elf_get_segments","sha":"649d68a00f11e96bd2e3445868728bb3342c134d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T18:30:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T18:30:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implemented syscall _sys_spu_image_get_information","sha":"167d6a08f8a06d33e39716ce466287ac2fc6f296"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T18:39:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T18:39:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implemented syscall _sys_spu_image_get_segments","sha":"90b8346312998b0ad32512c06036ca5b7d1e81a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T18:44:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T18:44:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix sys_raw_spu_load","sha":"62c14e94370a4169243cc48b64874b24a381f35d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T18:44:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T18:44:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix sys_raw_spu_image_load","sha":"37d7fdbcae5f8331519552f8d1edf6c5ca82d8fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T18:46:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T18:46:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Load liblv2.sprx by default","sha":"cfb858a51cc1caacbe05900657b2203248f3852c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T19:03:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T19:03:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RawSPU: implement Prxy_TagStatus_offs\n\nRollback to immediate MFC transfers","sha":"3a08dd7ddebc8d969a947952cf0eaa857e59d67a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T19:10:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T19:10:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implemented syscall sys_event_port_connect_ipc","sha":"8f9410ceff69429e535f15a0309c6739ce8f8b6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T19:55:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T19:55:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RawSPU: implement read SPU_NPC_offs","sha":"20d48289b85a373ea0c783f8f0e1219ea4e3a1dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T20:22:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T20:22:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RawSPU: implemented read SPU_RunCntl_offs","sha":"9ba3cea2b17a32b8031a381d2593a6e2e2b14cbe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T21:59:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T21:59:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Protect SPU segments","sha":"05442bdb11d90b074d0c9b98f973e7ef2b143c76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T22:22:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T22:22:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix access violation handler","sha":"174f11bdbd165665c53449384f81c87917eacd98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T23:10:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-08-31T23:10:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix decrypt_self usage","sha":"5b00aaf5619e8df864015c345ecc4f20fcf76b06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-01T18:24:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-01T18:24:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Set PPU stack bounds","sha":"a85caaee1d530429ec1c11e9f5ea3a42597443c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-01T18:39:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-01T18:39:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add supporters","sha":"7e99f6bc5f78de43fe46c358ff2ca88952f31bb1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-01T17:13:09Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-01T20:10:50Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"libad: Enable LLE load\n\nRemoves libad from ignore list.\n\nIt will only affect games that call for it, making them progress further with the Recompiler instead of dying in Unregistered Function, as there's no HLE implementation of libad.\n\nTested with Guitar Hero 5 [BLES00576]","sha":"e57caefd096f98516c47d2c3fd9fcfc87c2ea86d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2017-09-02T01:21:42Z","email":"26035046+Talkashie@users.noreply.github.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-02T01:21:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_usbd stuff (#3346)\n\n* Create sys_usbd.cpp\r\n\r\n* Create sys_usbd.h\r\n\r\n* Update lv2.cpp","sha":"ca6064b1092946134a110d64285259c31013770e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-02T05:06:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-02T09:04:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fix da build","sha":"d3f13ab8a3a339617f75077e13d60fb65836b666"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2017-09-02T11:43:44Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-02T11:43:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Various fixes (Trophy, Gcm corrections, stack alloc) (#2894)\n\n* Fixed sys_get_random_number generating less bytes than needed, and ceiling the buffer size in 0x1000 instead of failing\r\n* Corrected alignment check in libgcm\r\n* Now calling callback of sceNpManagerRegisterCallback\r\n* Fixed trophies","sha":"caab400258f8486fbd3ab1f27ebd05ae41f65170"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-02T01:02:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-02T12:22:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI: Fix Repaint on stylesheet change","sha":"5cb6815bf3e7925089e5336df34250109d330019"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-02T01:04:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-02T12:22:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"settings_dialog: minor connect simplification","sha":"9440e65452403b5c6f81a1f8069e37d0ec7b0668"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-07-18T18:42:52Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-03T21:37:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement cellSslCertificateLoader","sha":"8ad44dd00fc6f3ed0a961499eb72f5f1aa923cc9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-08-02T20:36:44Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-03T21:37:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add cross-platform implementation of cellHttpUtilParseUri","sha":"cc880b53aa7218213f4e783ceba9d809f84683dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-09-02T14:05:03Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-03T22:12:36Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Remove old wxWidgets-related references","sha":"34cf1ff7c7b87db50fb16a22fb19b210294860cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-09-03T12:41:59Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-03T23:10:15Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"multi pkg fix","sha":"cde29aba646752ab042be031dc468dac961b02f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-02T14:14:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-03T23:15:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move sys_gamepad filter","sha":"9b9e2bcafbc42eb3d50be53618136183bb4dd745"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-02T20:51:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-03T23:15:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix sys_event_port_connect_ipc","sha":"1262263f5cd5a9ee37d52af413bc86152e4b216b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-03T19:29:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-03T23:15:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix rXml limitation\n\n(trophies)","sha":"2e510e5ca0ed9c6376a5db7d136bbc0b8fdbce9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-03T22:55:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-03T23:15:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs: atomic truncation","sha":"b415b0e737c029be99732957cb36230c6e004ffd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-03T23:09:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-03T23:15:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve sys_fs_ftruncate\n\nHandle stream API lock (EBUSY)\nHandle append mode","sha":"83e139cd1a0a831f2b2b01148f5f985ee3fadf22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-22T18:24:24Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-05T16:46:38Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Remove coverity and coveralls references","sha":"b60ac78c580e2ef032b38752f46a6258dc008a57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-23T11:29:13Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-05T16:46:38Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":".travis.yml: rework binutils package update","sha":"47ed9aa1b9b29879f8c21df28d5615fccc15e426"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-08-23T13:22:15Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-05T16:46:38Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":".travis.yml: remove GCC_COLORS variable export and duplicated \"brew update;\" instruction","sha":"21d70a75d5aaab2c69b79f3223a4b27b0c0655ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-09-01T19:36:45Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-05T16:46:38Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":".travis.yml: remove \"dist: trusty\" as it is now the default distribution","sha":"f4f36a3cb167537b038fab57f05af0c6572778aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-04T22:05:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-05T18:44:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"game_list_frame: force single line text in list items","sha":"d4d0d35e05a6a42b132351f1ffc1d970f254f022"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1445782?v=4","date":"2017-09-03T13:36:58Z","email":"jjs@jjs.at","login":"jjsat","name":"jjsat"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-05T21:14:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_tty_write() if called with pwritelen == NULL.","sha":"634c4119467f3f3db155dc3099a97c46d93f0610"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1445782?v=4","date":"2017-09-03T16:51:43Z","email":"jjs@jjs.at","login":"jjsat","name":"jjsat"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-05T21:14:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Convert endianess before passing buffers to setsockopt.","sha":"4558f93f92551ad165e9ed86e04e50aaaf0f3efd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-05T20:16:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-06T16:15:38Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"[Qt] style adjustments 1\n\nmainly move { to newline\nget rid of some lines here, add some lines there","sha":"205f6a900088458a1d6322e0693da4b214d5049b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-05T20:40:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-06T16:15:38Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"[Qt] style adjustments 2\n\nsome more of the same","sha":"8e955297ef5a6add2d8e67385da016b9ea6ede0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-09-05T22:29:46Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-06T20:44:58Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Add option to build using llvm shared libs and document other cmake options","sha":"d2cae96e8d829d242b8f9c34856893009e5eb51b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-09-05T23:43:24Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-06T20:44:58Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Change MacOSX -> MacOS, add warning about glvnd, Fixes #2949","sha":"11aa0be04a41b9b944dbb0aaa03913bc020377e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-09-06T19:09:58Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-06T20:44:58Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Implement progress bar in taskbar for non-windows platforms, Fixes #2605","sha":"bfe2bccc51174d851c2968d18006410ea5466090"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-09-06T19:35:15Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-06T20:44:58Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Weird tlou fix","sha":"7c897d5019e4706ef51205140114249f9fb251ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-07T06:52:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-07T20:26:44Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"use single line titles in gamelist and recent games menu","sha":"9a1ee9e984951584893e759179a548c6ffd239e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-08-22T21:42:12Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-07T21:06:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement _sys_prx_get_module_info","sha":"e4105f46dee97fdaa448df3fad4e378f30e71705"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-09-07T19:57:22Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-08T16:23:16Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix some of libpng known incorrect profile spam","sha":"d8f3354ce3d78b40b128275100ee27b1ea803148"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2017-09-05T22:19:47Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Farseer"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-08T17:10:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Trophy fixes\n\nShould fix Kung Fu Panda 2 Raging Blast 2","sha":"0cbbd3a5b1f340082972dd8d16aefd0852557318"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-06T17:00:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-08T18:23:34Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"[Qt] style adjustments 3\n\nrename some members and clean headers","sha":"a95e01290ee8cfd3ac9b5d03dbc0ad2e92f2d4d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-06T17:32:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-08T18:23:34Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"[Qt] style adjustments 4\n\nrename more members and clean headers\nadjust some connects","sha":"95231c4dee1435c874f5e33aab629e1f40e108cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-06T18:13:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-08T18:23:34Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"[Qt] style adjustments 5\n\nrename even more members and clean headers\nadjust some more connects\nmove some function bodies to cpp","sha":"43bae9f9d73ba76ab19829cc6a9b6bb2e6184f2b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-08T17:53:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-08T18:23:34Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"[Qt] style adjustments 6\n\nrename members and clean headers for gamelist and main window\nadjust some more connects","sha":"be46c82aaa91359d3cf0ce7e52746b3c291beeec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8931126?v=4","date":"2017-08-27T17:38:52Z","email":"07mcteaguepet@googlemail.com","login":"PeterMcteague","name":"Peter Mcteague"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-08T23:33:53Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Added ignoring of keyboard shortcuts to keyboard_pad_handler\n\nThis fixes an issue where pressing keyboard shortcuts will input them to\nthe game.","sha":"5326912bc0fa9fb668dfa6e6d1b212e545873bb9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8931126?v=4","date":"2017-09-04T12:41:43Z","email":"07mcteaguepet@googlemail.com","login":"PeterMcteague","name":"Peter Mcteague"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-08T23:33:53Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fixed a line where event->ingore() was called after break.","sha":"a6ba7ed21cc7b81d236b88c15e2b774fd515d0c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2017-08-15T12:03:07Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-08T23:55:03Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Pad Refactoring\nAdds a window to setup multiple input types as once\nAll controllers are now handled by a single thread\n[hcorion] evdev refactor","sha":"0457f23b13e2bdc907effe9365d56b7da478b5a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-09T07:12:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-09T18:46:10Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Qt: fix gamepad settings layout issue","sha":"4b11a62b4d0244d333078c4ea896ea6adcfe23bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-09T11:53:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-09T18:46:10Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Qt: add Refresh button to gamepad settings, minor cleanup","sha":"2db2114a4554f1172d8da7c7bc8629ab24a75f23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-09T14:14:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-09T18:46:10Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Qt / OpenGL: fix delete_context","sha":"cd4b28b4d79a39a569187d63a1654232b7ee7533"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-09-03T17:01:54Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-09T19:29:42Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"[Qt] Delete \"ui\" pointer in destructor","sha":"f39e2b999fa2e2beeba4725f7458444b958c538e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4898430?v=4","date":"2017-09-09T23:23:43Z","email":"henriquenj@gmail.com","login":"henriquenj","name":"Henrique Jung"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-10T00:27:22Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"VS build: copy Qt5WinExtras.dll to bin directory\n\nWhen building RPCS3 on Visual Studio, there's some DLLs that are copied\nfrom the local QT installation to the RPCS3's output directory using a\npost-build script. However, one of these DLL was missing, which is\nrequired for running the program on debug mode (for release versions,\nthe file is already present on git).\n\nThis commit just add the additional command that is needed to copy the\nfile.","sha":"84e7de0a78fca048d9602a67c43ef3679d0b1e82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-10T11:03:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-10T11:03:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[Qt] add scrollbar to about dialog (#3417)\n\n* Qt: add scrollbar to about dialog\r\n\r\n* move contributors","sha":"b11f9e0405b9f503f2ec7b08ffd9d57dd28d064a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-09-10T04:04:29Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-10T15:51:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"If the loop is never entered, then the jit is null.","sha":"47685bef39dfd45c139f0ea4438536a82a2f28eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4898430?v=4","date":"2017-09-10T00:52:10Z","email":"henriquenj@gmail.com","login":"henriquenj","name":"Henrique Jung"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-10T16:25:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"VS build: delete QT DLLs from bin directory\n\nCommit 6cfb184b1ec798eb209272a404040e7a582516a7 added these files when\nimplementing a very large code refactoring. They seems to be unecessary\nsince there's a couple of VS post-build scripts that copy the files from\nthe user local QT installation to the bin directory every time the rpcs3\nproject is built. So their presence in the repository only makes cloning\nit a little slower.","sha":"45cdf6af3b13c64c17e823d9c9951ef64789e5ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4898430?v=4","date":"2017-09-10T05:15:49Z","email":"henriquenj@gmail.com","login":"henriquenj","name":"Henrique Jung"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-10T16:25:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CMake build: copy QT DLLs files to bin directory\n\nAppVeyor build relies on CMake to build the VS project files, which then\nis used to build RPCS3, so we must tell CMake to copy Qt DLLs files the\nsame way VS build does.","sha":"4b9fa8ec6d1126e4812fb767d80647e26776b688"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-10T17:46:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-10T17:46:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[Qt] fix small buttons/missing icons in the toolbar (Doppelgänger) (#3413)\n\n* Qt: use lambda for colorizedIcon in main_window and game_list_frame\r\n\r\n* Qt: enable AA_UseHighDpiPixmaps for better looking icons\r\n\r\n* Qt: use iconSize instead of sizehint for linux, add some comments","sha":"f0358f85fc00017acfca58dc31f49cad75835676"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-10T21:16:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-11T20:17:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Remove duplicate gui repaints in settings dialog\n\nApplyGuiOptions(true) already forces GuiStylesheetRequest and therefore RepaintGui in main_window if necessary.\nWe don't need GuiRepaintRequest on accept because there should be no option left that doesn't repaint immediately","sha":"fac8a520f05af2bd7bd029aad1f726896c1f4c94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-10T21:31:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-11T20:17:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: improve gamelist refresh, fix some more scroll issues\n\ndespite earlier efforts with modelindex and so on the annoying scroll jump still surfaced sometimes, so we only scrollTo index on selected occasions from now on.\nFurthermore we don't need to refresh the gamelist if no custom config has been applied, so this will only be needed on accept from now on","sha":"553f67d7e39cd80b3923070006be595c7e4029a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-09-11T00:36:36Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-13T14:40:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix buffer overrun in cert loading, made it more accurate. Fixes #3408","sha":"4a10dcc5499e3e8455746a6fb12afc557ad5f215"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-08T14:14:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-13T21:23:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs: minor fix","sha":"e00aedd1a09d512c05ab22771f26362f189ae662"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-08T14:17:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-13T21:23:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: use g_tls_error for diagnostic\n\nAffected syscalls:\nsys_fs_open\nsys_fs_opendir\nsys_fs_stat\nsys_fs_mkdir\nsys_fs_fcntl (get free space)","sha":"ae1e9e78dbd80b7b348d5b0230f183501a1192d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-12T15:29:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-13T21:23:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_mmapper: minor range fix","sha":"0e691e2c51aef0f5535f9ca959e539161a4a4a03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-12T15:33:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-13T21:23:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve lv2_memory object","sha":"22d8b57027c928a9fce2349182e263c2c6221005"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-12T17:05:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-13T21:23:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement fs::error::notempty","sha":"669d95352984a896fb4d1c0199d65eb6ca8c3ac9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/208340?v=4","date":"2017-09-14T18:02:09Z","email":"greg@unrelenting.technology","login":"unrelentingtech","name":"myfreeweb"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-14T18:02:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Vulkan: use pkg-config instead of checking for Linux (#3440)\n\nMakes Vulkan optional on Linux / makes it possible on FreeBSD.","sha":"07af701afeb91d09ae25eff5520086e6fe881a10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26315797?v=4","date":"2017-09-14T23:44:34Z","email":"alextouchet@outlook.com","login":"atouchet","name":"Alex Touchet"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-15T07:53:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update Visual Studio 2015 URL","sha":"6a54b3929e574be38105bd4f3b24072b44097964"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8931126?v=4","date":"2017-09-16T11:54:25Z","email":"07mcteaguepet@googlemail.com","login":"PeterMcteague","name":"Peter Mcteague"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-16T11:54:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add git_branch to git-version.h, add display version info to gs_frame and add branch and version to log. (#3186)\n\n* Added version number and branch name to gs_frame and log file. This also involved making the files that generate git-version.h , get the branch.","sha":"c18e71ca2901885e5c8997216ad0aad9b3e87032"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-16T19:09:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T08:40:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: settings_dialog layout fix (hack)","sha":"db51779682f280917ade2e3bc430f8f3e166191b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-16T10:45:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T09:39:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add char count label to osk dialog","sha":"cad91e114df9df2d0c4695183a1e52fd526af835"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-13T21:40:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-17T20:05:54Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"[Qt] fix graphics adapter selection and rebase for less redundancy","sha":"b141b43c1c68786953521929cdeb476ff3ebc3e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-09-10T18:05:39Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-09-18T20:24:13Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"HGA calls sys_rsx_context_attribute before calling sys_rsx_memory_allocate. This inevitably causes RPCS3 to crash.  Add nullptr check to prevent this.","sha":"d5fb7180d0922b9f050193e1fd7106170086c96e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-09-12T21:42:00Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T10:21:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Silent some compiler warnings","sha":"01ffaab3e0e34fa949c75017b5d55323099354f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-16T11:52:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move sys_process_exit","sha":"669b1385cc12e8c34bd07bcab634befea83c028a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-16T17:36:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add <typeinfo>","sha":"837c5dddeef818a2878eeb9f90af8a928d3c55ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-16T17:37:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Backup logs to old_logs/","sha":"c7d4a306463ce26d778c1c236eb2f11e9abc7fd8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-16T17:38:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix initial log message","sha":"be44024a1ac10aa8d6c1d2544cbae02aa953485f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-16T17:39:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implemented MFF_HIDDEN for VNIDs\n\nMinor refactoring\nNow possible: ```REF_FUNC(...).flag(MFF_HIDDEN);```","sha":"e789b969b0e9939126bb2087af06040d33fcaf18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-16T17:43:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implemented syscall _sys_process_exit","sha":"b9b71ccbc1952c6d131b6bc01d1f54bbad672f5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-16T17:47:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Restore UTF-8 in Log.cpp","sha":"cc577198568b68ddaa1670c59f2a1a2f50d577dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-16T19:10:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixed global variables in Log.cpp","sha":"17175e1c2340e46a300b7edcf31274ae0a0724f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-16T19:11:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove unnecessary newline in Log.cpp","sha":"b83575bcbba78396dfba32cdc291d295282300ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T08:25:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implemented __sys_look_ctype_table\n\nImplemented _sys_tolower, _sys_toupper\nFixed _sys_strncasecmp","sha":"4fe4521881fa596e9ef2a95e7b2369f5384fabae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T09:19:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implemented _sys_prx_load_module_on_memcontainer","sha":"ae2ea023773a6b33813377c917e84a7b697adf55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T10:52:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite _sys_memcmp","sha":"83f93202d02a5ec4fbc6ea81fefe737225124eb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T10:53:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix _sys_strncasecmp","sha":"015b9fdf8b551e55f7cb6ff390b0d19ec7920c20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T11:05:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite _sys_strlen","sha":"800ba9d902ffd58baf77276ad2a89308ca459d68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T11:14:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite _sys_strcmp","sha":"ccc87081f3a6495eee101a5f7dec1b675a1d4db5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T11:16:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite _sys_strncmp","sha":"a4b824c50a0755579f0c309a7bd776674a3bb936"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T11:46:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite _sys_strcat","sha":"13304bd18bf25c9b829828fa2e15048da9c2c22c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T12:43:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite _sys_strcpy","sha":"0e72cc879f74646ecadc1dcca35b61be206a576c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T12:56:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite _sys_strchr","sha":"7a79e184c5c9b03a09f60370b24eac8a78a5e45b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T13:03:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite _sys_strrchr","sha":"871ccfd32c02613d1d9e9417294bd405a8915cbb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T13:49:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite _sys_strncpy","sha":"22ff8abd7d9331c24b36ee594ad4733162176a93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T15:28:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite _sys_strncat","sha":"bc098d6b9ce015e9ab7332d67c2f2b436d66b0f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-17T14:33:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Patch: new 'load' syntax\n\n[load, path_name1] - load sequence\n[load, path_name2, -0x40] - same, but modify the addresses by -64","sha":"18d472b7e1a837447b901d94db6a60793ae5a3ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-18T16:16:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Exitspawn support renewal\n\nImplemented _sys_process_exit2 syscall\nRewritten sys_game_process_exitspawn\nRewritten sys_game_process_exitspawn2\nImplemented _sys_process_atexitspawn\nImplemented _sys_process_at_Exitspawn\nAnd some other changes","sha":"519f21db18dd3f30f8cc860dadc4b4819af33ff8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-18T19:50:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix error on loading a library twice","sha":"3901f08fa07742ff56a23564347b2205318339c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-18T20:04:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_mkdir: implement ENOENT","sha":"a428dac71c064e13921c3678d97013f5326e4c01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-18T21:03:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-19T12:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Try to fix some fs errors","sha":"5c93acefd9c3ff85b208f78f9ec4f5e4112728e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-20T09:56:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-20T11:26:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix library loading mode 'both'","sha":"b9a0c107abde35b6deff2eafeb2b26c336c639f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-20T09:58:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-20T11:26:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove unnecessary include git-version.h","sha":"a6a0f13264954740302b18c14b11db4931863fdf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-20T10:01:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-20T11:27:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellAudio: use error_code","sha":"dd919c76b86bebbec5ea6364a5e365af2624f811"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-21T11:34:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-21T11:34:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor VFS fix","sha":"3e3160d7acb64bc6b847dd57345cd1b65972f6cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-13T21:27:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk/gl: Refactoring and reimplementation of blit engine\nFix rsx offscreen-render-to-display-buffer-blit surface reads\n- Also, properly scale display output height if reading from compressed tile\n\ngl: Fix broken dst height computation\n- The extra padding is only there to force power-of-2 sizes and isnt used\n\ngl: Ignore compression scaling if output is rendered to in a renderpass\n\nrsx/gl/vk: Cleanup for GPU texture scaling. Initial impl [WIP]\n- TODO: Refactor more shared code into RSX/common","sha":"2033f3f7dcae6fcdb9497d9ed8f46a9e2781c9a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-08-27T13:22:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Bug fixes\n- Make each frame context own its own memory\n- Fix GPU blit\n- Fix image layout transitions in flip\n\nvk: Improve frame-local memory usage tracking to prevent overwrites\n- Also slightly bumps VRAM requirements for stream buffers to help with running out of storage\n- Fixes flickering and missing graphics in some cases. Flickering is still there and needs more work\nvk: Up vertex attribute heap size and increase the guard size on it\nvulkan: Reorganize memory management\nvulkan: blit cleanup\nvulkan: blit engine improvements\n- Override existing image mapping when conflicts detected\n- Allow blitting of depth/stencil surfaces","sha":"deb590cb05333ec7ec30f117f0fea5f3328ab056"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-04T09:53:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Several fixes and improvements\n- Do not ignore non-centered pixel blitting\n- Register method ac00+16\n- Bump texture memory heap to account for GPU texture scaling requirements (vulkan)\n- Explicit MRT location index output to better convey intent (openGL)","sha":"73312fc363674bdfe7fbf21934028ebe4a3ab156"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-04T10:05:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"esx: Fixes to the texture cache\nrsx: Blit engine improvements\n- Always handle blits to and from framebuffers through the GPU\n- Handle depth surfaces properly when using GL\n- Check for format mismatches when blitting to the surface store [WIP]","sha":"2d0f1f27a8e7e6b42e8501e70e476746286c8459"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-05T13:25:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Shader decompiler fixes\n- Requires proper 2-pass impl\nrsx/fp: Catch hanging code blocks\nrsx/fp: Don't pause on scaling error","sha":"9359b8c17012c2fe1f05d2f542fe63e99a6e8b3b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-05T21:59:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Bug fixes and improvements\nrsx: Try to skip unknown commands without discarding entire cb","sha":"abb56a354d20ffdf23c827792cb2f2c30bf1daea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-07T19:32:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add support for batched multidraw\ngl: Fix multidraw [WIP]\nrsx: Ignore vertex base when data source is generated using arithmetic\nvk: Check pending flag before doing fence poke\nvk/gl: Fix for inlined array and immediate draws\nrsx: Collapse joined draws when batching","sha":"061824a7ec6f4348a8ffea5721b04e128a980c5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-08T21:22:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: cleanup; fix program linkage on mesa using GL_ARB_explicit_uniform_location, also make use of ARB_multidraw","sha":"07c83f6e449d70e971fb608d127f9b61ba5af76f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-08T14:52:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture cache fixes and improvments\ngl/vk/rsx: Refactoring; unify texture cache code\ngl: Fixups\n- Removes rsx::gl::texture class and leave gl::texture intact\n- Simplify texture create and upload mechanisms\n- Re-enable texture uploads with the new texture cache mechanism\nrsx: texture cache - check if bit region fits into dst texture before attempting to copy\ngl/vk: Cleanup\n- Set initial texture layout to DST_OPTIMAL since it has no data in it anyway at the start\n- Move structs outside of classes to avoid clutter","sha":"e37a2a8f7d0e629da4835c005dc435b40e02bee7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-14T11:37:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Minor optimizations\nrsx: Texture cache - improvements to locking\nrsx: Minor optimizations to get_current_vertex_program and begin-end batch flushes\nrsx: Optimize texture cache storage\n- Manages storage in blocks of 16MB\nrsx/vk/gl: Fix swizzled texture input\ngl: Hotfix for compressed texture formats","sha":"45d0e821dcdfd7c286d83b167c87440e7a420c46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-14T17:05:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix multidraw range splits again\nrsx: Hotfix for disjoint range detection","sha":"10e25eb362badd0727277e7a3598e21a751a0d51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-14T22:32:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture cache improvements\n- Limits buffer size to min 720 in the Y axis (1024 section causes conflicts in some cases - TODO)\nrsx: Fixups to allow large textures for blit operation\n- Also includes checks for both leaking sections and blit regions for vulkan\nhotfix for hanging when using WCB\naddendum - unlock both ro and no blocks before attempting to copy memory blocks\ngl: Fixups for ARB_explicit_uniform_location\n- Forces glsl v 430 to make use of the extension\nrsx/vk: Rework texture cache to minimize recursive access violations\n- Also modifies the vulkan commandbuffer begin/end/submit mechanism\ngl: Fix cached_texture_section::is_flushable to take memory protection into account\nrsx: Fix blit dst offset calculation","sha":"571dbfb7b1111d8a3fbf9ba56ddb3ce66390c543"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-18T17:22:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixups","sha":"3836b40bf7c25ceb5b36572a253828e69d1be61a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-18T17:58:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add support for non-projective shadow sampling\n- Fixes missing shadows in persona 5\n\nvk: Enable polygon depth bias a.k.a polygonOffset\n- Fixes shadow acne in persona 5","sha":"6b96a2022a4cec0e5ecf45294f6fced6f00427ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-19T12:46:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:17:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture cache fixes and improvements\nrsx: Conditional lock hack removed\nvulkan - Fixes\n- Remove unused texture class\n- Fix native pitch calculation (WCB)\nrsx: Catch hanging begin/end pairs when flushing deferred draw calls\nvulkan: Register DXT compressed formats\nvulkan: Register depth formats\ngl: Workaround for 'texture stitching' when gathering flip surface\n- TODO: Add a proper flip hack option\nrsx: Fix texture memory size calculation\n- DXT textures dont have real pitch. Since pitch is used to calculate memory size, make sure it always evaluates to rsx_size\nrsx: Fix cpu copy detection\nrsx: Validate blit dst surface and dont make assumptions about region blit order\n- Also relax restrictions on memory owned by the blit engine if strict rendering is not enabled\nrsx: Fix depth texture detection\nrsx: Do not manually offset into dst. The overlapped range check does so automatically\nrsx: Minor optimizations\nrsx: Minor fixes\n- Fix to detect incompatible formats when using GPU texture scaling and show message\n- Better 'is_depth_texture' algorithm to eliminate false positives","sha":"3499d089e74439192ab1cb52c88072e1d44020f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4898430?v=4","date":"2017-09-21T13:53:20Z","email":"henriquenj@gmail.com","login":"henriquenj","name":"Henrique Jung"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:53:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Deploy QT DLLs using windeployqt tool (#3432)\n\n* Deploy QT DLLs using windeployqt tool\r\n\r\nReplace the old mechanism that manually copy the DLLs using either CMake\r\nor VS built-in functions. The new approach uses the windeployqt tool\r\nprovided by the QT project that automatically detect the needed DLLs and\r\nperform the necessary copying.\r\n\r\nThis approach should be more robust if there's an upstream change on QT\r\nproject regarding DLLs usage.\r\n\r\n* QT DLLs: do not ship RPCS3 with ANGLE and software-OpenGL\r\n\r\nAccording to https://doc.qt.io/qt-5/windows-requirements.html ANGLE is\r\nuseful for applications that use OpenGL ES by removing the need to\r\ninstall OpenGL drivers, redirecting OpenGL calls to DirectX instead.\r\nRPCS does not uses OpenGL ES so it's better to just remove it from the\r\nbinary distribution.\r\n\r\nopengl32sw.dll is a fallback mechanism when ANGLE libraries are not\r\navailable that uses a software backend for OpenGL. It's unlikely that\r\nRPCS3 will work using software-OpenGL, so there's little point into\r\nshipping them.\r\n\r\n* QT DLLs: do not ship with SVG and translation files\r\n\r\nLike the other removed QT libraries: they are not needed right now. We\r\ncan deploy them if they become useful someday.","sha":"daa7520d1d5587be11a33428e1a289d34964326c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2017-09-21T08:21:43Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Farseer"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-21T14:31:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Allow null argument\n\nShould fix Jak 2","sha":"2b0edf6cde973c1e4dff0b99eb565179b3d976ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T13:24:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T17:05:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Check that fence is not empty before calling destroy","sha":"dfc564f837c16f76486ff5447bfe7f029f8041bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T15:40:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T17:05:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixes\n- Fix section scanning range for early reject\n- Specify IMAGE_ASPECT_STENCIL when uploading image_from_cpu","sha":"d0148728c6344beec70048d77f87861360d00967"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T16:07:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T17:05:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vs/qt: Explicitly reference target output to avoid failing post-build step\n- Referencing the whole build folder will err if there is any non-qt exe in the folder","sha":"c6e6f4afea218e235760f873c6e6ecd79ac183e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-09-22T10:26:43Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-22T10:26:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix branch name for AppVeyor Builds (#3472)","sha":"8e66e719faf9263946e84a28d59323c99eee683d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-21T18:00:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-23T13:46:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture cache fixes\n- Update section flags when requested\n- Fix nullptr dereference: cached_dest will be null if dst_is_render_target is true","sha":"4d83d749a0cfc846f070890764732e99a47be8bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-22T13:12:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-23T13:46:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Make the 3rd texture dimension matter\n- Affects cube maps and texture3D surfaces","sha":"b74cdcde00a947b59043f61335aca369fc779d65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-22T15:39:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-23T13:46:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Optimize memory allocation","sha":"9ee21af524d5816aabcd776c7b52c2d2effc1137"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-22T17:29:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-23T13:46:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Use frameid to determine texture storage to discard","sha":"a04ecdbe0a844ce046bef473d7cc14c7c2640f8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-22T20:09:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-23T13:46:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: New images always should be UNDEFINED or PREINITIALIZED","sha":"23ad687e7ebd416d588feae24b79c4ebd6c49ec2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-22T20:43:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-23T13:46:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Clean up debug overlays. Add unreleased textures metric to track texture memory","sha":"393e3b702f017cdd682277391eb9f3975425acfc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-23T13:30:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-23T13:46:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Clamp unreleased texture metric\n- TODO: Find the leaking references","sha":"e7db0c7d99a4e5dc7b2fa65c7b3533da1509c318"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-09-20T18:16:09Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-24T19:03:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ds4: Fix initial connection issue and hotplug/dongle calibration detection","sha":"2b1c7570845e3221947ab71884ba0c200e0a719a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-09-27T19:25:25Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-27T21:50:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"AppVeyor git branch in title fix #2","sha":"d36de7d54f5f597a9dfa5be4a57698c266dbb2be"}
+{"author":{"avatar":null,"date":"2017-09-27T22:13:57Z","email":"kirbyfan64@users.noreply.github.com","login":null,"name":"Ryan Gonzalez"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-27T22:13:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix evdev axis reversal (#3303)","sha":"85b9809b39c4334029cfb62af3dfbf90dd4fdd45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-15T19:01:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-27T22:46:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: implement GetOpaqueImageArea","sha":"77a75305c7a488ccda034584f948f84baf9ae82a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-15T19:03:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-27T22:46:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: support thumbnail icons in stylesheets","sha":"a358384900c7024e9f68870274564114a9de9bbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-16T07:53:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-27T22:46:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: use rgba lambda for default stylesheet","sha":"ca36d08893724c37cc500dd71c9e6abd1f54796b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-20T20:25:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-27T22:46:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add log colors to stylesheet\n\nand silence some compiler warnings","sha":"0b51102167c9aad363a9b3c5c141f6f45feaccfa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-20T23:40:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-27T22:46:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix log stacking bug when wordwrap occurs","sha":"9650218bb81a1602757455c219374eeb5823dc1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1445782?v=4","date":"2017-09-24T18:39:56Z","email":"jjs@jjs.at","login":"jjsat","name":"jjsat"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-28T09:15:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Respect the controller setting when returning data from cellPadGetData.","sha":"632c8872cdd477c5fe7818d05c76fdc76efb9e50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-28T13:23:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-28T15:23:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix tty objectname and add tty text color to stylesheet","sha":"3067c8bd27c417f6b222e376ad215494268778c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-28T13:24:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-28T15:23:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add old log style to Kuroi","sha":"eb8af974dc828a3f54716e6025a1e74f4774e022"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-02T18:27:55Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-02T21:41:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[Qt] Fix repository urls to install Qt","sha":"425ddd13e5e3cfd8201a16197049790227860bd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-28T23:40:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-02T22:34:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: disable viewport settings on custom configs","sha":"81b3e7e44936124a172d5f6d7dfc5aab59d9c6e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-04T17:58:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-10-04T17:58:06Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"spu: Fixes (#3526)\n\n* spu: Rewrite interpreter fast FM\r\n- Partially implement accurate FM\r\n- Fix FMA/FMS/FNMS by removing an optimization that does not work for INF (cmpunord)\r\n- cmpunord does not catch all cases of an extended result/overflow\r\n- NOTE: FM still does not handle corner cases well (e.g inf * 1.2 because SPU does not have concept of inf)","sha":"b338c81907a1102dcdbc52bf463dee4e0b657326"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-10-04T22:10:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-04T22:10:24Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Qt: include debug tool colors in stylesheet (#3527)\n\nQt: include debug tool colors in stylesheet","sha":"cf83b796e11d01c6d56329aaf46f1d895a1dc014"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7478580?v=4","date":"2017-10-05T01:59:35Z","email":"toccata10@users.noreply.github.com","login":"toccata10","name":"toccata10"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T01:59:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add Deadzones for evdev gamepads (#3519)","sha":"0c5cb4824b402f6cbd3616c95c6702638bf8e0e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-10-05T02:22:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T02:22:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[Qt] fix experimental build warning layout and smoothen gamelist scrolling (#3532)\n\n* Qt: fix layout of \"experimental build warning\" for dpi scaling\r\n\r\nand remove compiler warning in welcome_dialog.ui\r\n\r\n* Qt: smoothen gamelist/-grid scrolling by setting singlestep value\r\n\r\nand fix missing scroll and deselect on gamegrid\r\n\r\n* Qt: show all bootable categories in gamegrid","sha":"0ca1f820599557c637721cf7ff1181c1a2c95250"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-10-05T05:48:22Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-05T10:30:39Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Add a GitHub issue template, hopefully help with invalid issue spam.","sha":"33182650ca50a8339e18d192365559b63939cb84"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-10-05T15:39:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-05T16:10:18Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Qt: fix gamegrid regression: mismatch between entry count and grid size","sha":"b2605206b17be0e1760d2dd945c0eb714547cb88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2017-10-05T16:34:48Z","email":"26035046+Talkashie@users.noreply.github.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T16:34:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update tooltips.json (#3529)","sha":"6335fa8df1acd3390f1482922df5be83a86424a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-09-25T15:52:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T16:51:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_net full rewrite\n\nImplement sys_net syscalls\nClean libnet functions\nUse libnet.sprx\nUse libhttp.sprx\nUse libssl.sprx\nUse librudp.sprx\nImplement sys_ss_random_number_generator","sha":"e5f756205c7884ab117f05d2e5a40125bd8f595c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-01T01:00:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T16:51:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix cellKb","sha":"45a855ef1f9cdd44b1feae5e3e0bac52ebaf8410"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-01T01:01:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T16:51:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"libbeisobmf.sprx","sha":"d296e6021d27f5d84a239a60b62647378b552233"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-01T01:40:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T16:51:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement CALL_FUNC","sha":"144f6809bf2f18464b9867caae1d6e649a8977c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-01T01:40:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T16:51:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add cellVdec hack (stolen TLS)","sha":"ab4e66a0bfddcd234732ede90f0dc95356b952ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-04T05:03:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T16:51:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix /dev/urandom typo","sha":"3d64b65813492af41967a343194fc28f265ef34a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-04T17:02:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T16:51:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement SYS_NET_SO_REUSEPORT","sha":"3907dd04446051d136a25fbf6cec392516694709"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T12:09:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T16:51:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"mutex.cpp: minor update\n\nNew concept (incomplete)","sha":"beab5291bbb7614df1d843a49ca154eb102cb1fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T16:51:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T16:51:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add supporters","sha":"cc594ad353462b2949e346180717da60c7b5ba1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-19T18:07:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-08T10:34:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: move Render_Info to emu_settings.h","sha":"a84cc1d3bb5b7c3ab2186b90edbd77dcb2af0af6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-10-05T23:39:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-08T10:34:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add spu and ppu debug checkboxes to debug tab","sha":"93d2ac887d7785e7a7b76d8b3f0f86bb3ec06f62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-10-06T09:10:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-08T10:34:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: sort game_list_frame members","sha":"e272acd7c14ebec97ed4a934d75af30b92199755"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-10-06T19:13:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-08T10:34:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: extend drag and drop to mainwindow","sha":"b7f6bd4c9121deba08f590a174522840962efe63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-10-07T16:06:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-08T10:34:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix fullscreen icon","sha":"78ef46713820c39c299bac72d794557b07577023"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-06T18:52:08Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-08T11:50:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Change compiler requirements in cmake script to match with the values listed in the README.md file","sha":"d53b640bcfbc38ce10b049384218de1f5eeb56b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-10-08T20:37:54Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-08T20:37:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU Page Faults (#3309)\n\nI guess I'll merge it and fix some issues later myself.","sha":"47b121a700fc240e786d268203f0b657153b8912"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-25T14:57:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-09T17:25:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Set up patch functionality for program coeffecients","sha":"47202d5839a6db5abdd471d60176cf7dd5f63d52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-26T13:24:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-09T17:25:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl: Implement resolution scaling\n\nrsx: Revise wpos calculation to take resolution scale into account","sha":"12ab03b0b591d6daf9b8d0ecb694e2ff88e9b8c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-28T18:32:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-09T17:25:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl/wcb: Use temporary scaled image to implement bilinear filter","sha":"7bee4064a6efe8a8c13749e4d552546f75c2b60e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-26T15:22:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-09T17:25:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement AF override","sha":"6e8107a5cba2497b0d0e09d6eb83107d93c8e4d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-09-29T12:50:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-09T17:25:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Implement vsync","sha":"55df3cdf6714f0cb4e841ae68aee88647ae53be8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-02T13:53:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-09T17:25:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixups\n- gl: Remove redundant texstorage1D call\n- gl: Disable the wcb scaling code as it doesnt work right yet [WIP]\n- vk: Fix wcb reads","sha":"3fe37ede97f0c495cb735b1061cb1d1180234f9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-03T11:38:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-09T17:25:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Res scaling improvements\n- gl: Reintroduce the wcb hw downscaling\n- rsx: Clamp scalable render target size with a config var","sha":"fc0f98b5db21e6fa5359fcfaebe6addf6b28edbf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-09-30T01:31:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-09T17:25:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Qt: add high resolution settings to gui tab","sha":"20ad9a13b884a7e3c443cd1bca580cadb3a1d584"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-09T16:34:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-09T17:25:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Fix window resize race condition when doing flip","sha":"1d375cb13cf9473d0c9da0f12b038e50507cbffc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-10-09T18:00:45Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-09T21:46:36Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Revert \"Add option to build using llvm shared libs and document other cmake options\"\n\nThis reverts commit 6f33953861430882d318b6b96f7e59b06b6a4d4c.","sha":"a3c49bea2c6268f21f70aa42f59a311e45607fa5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-10-09T18:48:00Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-09T21:46:36Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix gentoo LLVM linking","sha":"6d6b281270731f985efae3f786692df54353ef1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-09T21:03:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-10T09:10:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Better VkResult handling","sha":"91ef202ee73100ae1c3f7e0c674eef3888388c39"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-04T17:54:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-10T09:10:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve memory protection behavior when strict mode is off","sha":"5a03db7d2e8f601c934ee158219c0f2ef5472e88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-10T22:22:32Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-10T22:22:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Remove unused rsx-debugger submodule and the rsx_program_decompiler entry in .gitmodules (#3542)","sha":"9bcc298b184b5d02045bfe09f4e196bbc3e76f6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3306201?v=4","date":"2017-10-10T22:50:43Z","email":"yzwduck@gmail.com","login":"yzwduck","name":"yzwduck"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-10T22:50:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Rename outputs correctly when writing default values to them (#3574)\n\n- Fix for undeclared variable errors","sha":"2e5f8c078607521896e27c035e94f9899ca64903"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-11T16:10:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-10-11T16:10:49Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: Better vsync mode selection (#3571)","sha":"f5d450f24cc36501ebb3f2cfa625a19b26ea4902"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-05T21:24:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-11T17:06:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add PPU instruction stat dumper\n\nNeeds PPU Debug option to activate and PPU Interpreter\nDumps after Resume (after Pause)\nFix utils::memory_decommit, clean vm.cpp","sha":"df2fc13b7af77f6574a2199b0b95eb92bfc09065"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-06T15:39:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-11T17:06:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix instruction editor a bit","sha":"efe140bc0c036b2ce5bbffbeed04d9bc6cccc462"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-10T13:40:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-11T17:06:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Optimize PPU module loading\n\nI'm garbage :facepalm:","sha":"ac64792d9946fd87ebcb527e67223a24e229af18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-10T13:41:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-11T17:06:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Allow shader cache dialog cancellation","sha":"19f3bb8cb0e3ddf5b26db8df56107c0a5abfb5b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-11T00:19:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-11T19:01:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Escape problematic characters in VFS\n\nWith full-width ＜＞：＂＼｜？＊","sha":"5b19908996125e7aa5c5d1af37d446f93a4d9e82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2017-10-08T18:56:29Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Farseer"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-12T01:46:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove sysutil callback","sha":"e8bde583ef2db0d9ad4f59a1c0647bbea10c9bc7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-10T22:09:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-12T10:51:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/qt: Implement native window hooks for win32 windows to allow communication between WndProc thread and rsx::thread\n- This communication is important in communicating window events. Helps properly synchronize swapchain management on vulkan and stops nvidia crashing\n- Do not block the message queue lest the driver detect window as not responding","sha":"58860614e361bb3f90a1c65b166e82dc46fcfe1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-10T22:31:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-12T10:51:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor fixes\n- Dont skip cb if a problem occurs, just spin on it instead to allow possibility of recovery\n- Vulkan cleanup for the die_with_error helper","sha":"9af71699a447c5b7d52530e534076b8718773d0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-12T09:42:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-12T10:51:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Stop executing broken command queues if the application fails to recover in 3 retries","sha":"c570410e0650dd3749bee9a053b93ad754a649fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-09T17:50:09Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-12T15:00:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Move optional.hpp as a submodule","sha":"0129c54ab6e8a38bb152f2c9a10a29a76f8dcbb0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-10-12T16:06:32Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-13T02:14:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix compile VS for Optional submodule","sha":"c63ff05e6e06d22af5d2d91eab5f7585f549fc2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-12T12:48:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-13T12:23:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture cache fixes\n- Fix src/dst framebuffer detection\n- Silence some warnings","sha":"eab9d0698149789ccda0c285a60dbe0538a0f0f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-12T20:51:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-13T12:23:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"travis: Dont try to upload appiamges if UPLOAD_URL is missing","sha":"bb398c4a086abea2efbbcc836ef2e6040766a9e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-12T19:07:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-14T11:19:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add a debug option to force full software emulation of blit engine","sha":"479aa9136832796396681e64617439a206356072"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-12T20:04:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-14T11:19:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix memory protection\n- Fixes hanging when wcb is enabled","sha":"86bf61ad35b117ddba2cf29b2f4f1a0a4cf2add5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-13T12:36:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-14T11:19:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"qt: Add cpu blit emulation override to the debug tab","sha":"1572d01c537cd577de13c06615f7a61cf726325f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4898430?v=4","date":"2017-10-01T06:26:42Z","email":"henriquenj@gmail.com","login":"henriquenj","name":"Henrique Jung"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-14T11:54:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"[CMake] Build LLVM from the submodule if there's no suitable version\n\nWhen RPCS3 is compiled with LLVM (default option), CMake only tries to\nfind LLVM on the default system installation. So the OS must have a\nsytstem-wide installation of LLVM of at least version 4.0, which is not\navailable on many GNU/Linux distributions (e.g. Ubuntu 16.04, Debian\nStretch). If CMake can not find a suitable version, it silently falls\nback to compile RPCS3 without LLVM.\n\nThis patch makes CMake defaults to compile the LLVM submodule if and\nonly if a suitable LLVM version is not found installed on the system.\nDue to a build time check on LLVM, in-tree builds will not work when\nbuilding the submodule (LLVM does not allow in-source builds). For this\nreason, the instruction for building on CMake were updated.","sha":"76b7103fed9782fb9dc7ee01fd68a9a53e382631"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-10-14T16:06:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-14T16:06:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"GUI: add some visual studio filters (#3375)","sha":"304a4a1b6104ccb3f5843618b29c5ed924d9c3a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-15T11:37:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-10-15T11:37:52Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"update vulkan submodules (#3600)","sha":"a11d66f52d072e05006ec6d4074abc6791a0e03f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-14T07:59:12Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-15T13:23:48Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"appveyor.yml: use Visual Studio solution to build the project and cleanup","sha":"64b2ae3cd592a7c2efb98aa968b4be1099eeb8c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-14T08:01:09Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-15T13:23:48Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"rpcs3.vcxproj: remove unused paths in AdditionalLibraryDirectories","sha":"f20e0c289895f5a4c44f7f65d0d55ef3bb732c90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-14T18:18:55Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-15T13:23:48Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Bump Qt version to 5.9.2 for Travis","sha":"c661578906cefa57b31d3314f01facd55e745ed2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-15T16:56:05Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-15T17:20:02Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Add BRANCH as a preprocessor definition taken from an environment variable","sha":"170a95f5df23c54d3a87afe4e0a83be81be6e1e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-10-16T04:52:11Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-16T15:42:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix compile VS","sha":"5146f3ec472137ff83b92748d7ff5f4fbbef9947"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-16T22:02:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-19T09:22:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Workaround for polaris primitive restart bug","sha":"3d05e61f7e1657339550ec82d115fc4a127d7122"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-17T10:09:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-19T09:22:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reimplement index buffer generation\n- Emulate primitive restart in software whenever we get the chance\n- Ensure PRIMITIVE_RESTART is never active when LIST topologies are active\n- Reimplement TRIANGLE_FAN, POLYGON and QUAD expansion","sha":"89dcafbe415689c91812b7bc6360cf284a840e55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-17T10:34:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-19T09:22:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: More fixes\n- Workaround for AMD glMultiDrawArrays bug\n- Disable disjoint command submission when multidraw support is disabled","sha":"5db45c3699a574be7dbe0ee11ab16560a4c5f9ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-17T14:27:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-19T09:22:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Allow clear_surface command for depth-only passes. Removes invalidate cache hack","sha":"a8e1754fa4f8f4fba56a8837146a7e0dcc2b571a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-18T10:42:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-19T09:22:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"general fixes; Force u32 return type for index_count and add RX Vega to primitive restart blacklist","sha":"ddcacb82589a37027db16d3468f58b22fef7c075"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-18T11:21:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-19T09:22:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"add RX 550 to AMD vulkan cards with restart bug","sha":"d8ee6a2edbbfa7b2078ae97978389af9fbed6f24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-18T14:39:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-19T09:22:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Check for vendor_string ATI for AMD cards. It seems AMD is still using the ATI openGL stack","sha":"472cb3b1c220fb22c6e8ff6360047aafcf487b99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-10-19T09:58:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-19T09:58:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"[Qt] Add syntax highlighter (#3550)\n\n* Qt: Add syntax highlighter\r\n\r\n* Qt: add syntax highlighter to cg_disasm\r\n\r\nThe glsl part is pretty much finished.\r\nThe asm is still missing a few rules.\r\nColors are not yet fully decided\r\n\r\n* Qt: add filter for syntax highlighter","sha":"200557c036f3041626f63869a46c714d66b339e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7478580?v=4","date":"2017-10-19T10:41:02Z","email":"toccata10@users.noreply.github.com","login":"toccata10","name":"toccata10"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-19T10:41:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"evdev: add analog to dpad option (#3551)\n\n* evdev Analog to digital option\r\n\r\n* rewrite conditions on axis rotation\r\n\r\n* a bit of cleanup","sha":"b90a7dc66ac126ae3fd7bbe52dbc88b2077a2ee2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-10-19T11:29:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-19T11:29:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"[Qt] UI improvements (#3558)\n\n* Qt: Show tooltips in description box\r\n\r\n* Qt: implement description subscription\r\n\r\n* Qt: add gamelist resize for ctrl-+/-/wheel (simple zoom)\r\n\r\n* Qt: handle strict mode in gui tab\r\n\r\n* Qt: more highdpi stuff\r\n\r\n* Qt: remove old tooltips from settings_dialog\r\n\r\n* Qt: conform cpublit tooltip to new subscription model","sha":"b3efa75206c6bc4230af3031e0d0453bfd98765c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-10-19T12:06:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-19T14:13:17Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Qt: add \"clear\" option to tty log contextmenu","sha":"34a6085cc08fc0623f070d8ca589bd1ec7b4ae6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-20T11:40:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-21T21:14:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Enable primitive restart workaround for polaris and vega on linux as well\n- Looks like it might be a hardware erratum","sha":"8f324dfc0a475b95861b97cce1be9e4640f523d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-21T14:58:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-21T21:14:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Silence annoying experimental build warning\n- Compiling locally on VS defines BRANCH to \"\" (empty $BRANCH envvar) and defines _MSC_VER. The pdb check is useless since it will never be reached","sha":"96fd8556f219396ea865f40111c9c06ac686a196"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-10-21T14:07:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-24T14:11:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Update Readme to Qt 5.8","sha":"dbf1573e890d5d0ae18ecda7e5cdc81e4dcefaa7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-10-24T15:09:38Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T15:09:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Save manager improvements (#3631)\n\n* Make size of manager only 60% of screen height initially at most.\r\n\r\n* Add ability to delete/select multiple entries.\r\n\r\n* Add ability to open up save dir and fix how it's done in\r\ngame_list_frame.\r\n\r\n* Make delete much cleaner.","sha":"779ed75a197d301bd0242e683bba334df9bc15ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-10-24T15:43:05Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T15:43:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Make a basic trophy notification dialog (#3204)\n\n* Make trophy notification dialog.\r\n\r\n* Fix bug where trophy state doesn't persist with game reboot.","sha":"b0737d1c907c57342091728dbf79171134e469f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-21T21:12:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T19:59:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Restructuring [WIP]\n- Refactor invalidate memory functions into one function\n- Add cached object rebuilding functionality to avoid throwing away useful memory on an invalidate\n- Added debug monitoring of texture unit VRAM usage","sha":"5e58cf60798024ad5d5b9f30746bc84f98770d5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-23T12:39:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T19:59:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture fixes continued\n- Fix buffer invalidate behaviour (wcb)\n- Disable auto rebuild with only framebuffer storage getting rebuilt\n- Fix vulkan subresource sampling","sha":"0de0dded53b8f061ca119ca2085deea063c42d39"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-23T12:54:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T19:59:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Only transfer framebuffer contents if memory contents are compatible","sha":"7a5c88a8d103de32b5affe0007ea30c9851685fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-23T15:17:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T19:59:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Even more texture cache fixes\n- Fix subresource sampling\n- Invalidate memory range before uploading textures to prevent hangs","sha":"f4a666345a160655aebc2471ac0d55ddccf1d7e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-23T16:06:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T19:59:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Workaround for 0 pitch textures.\n- Should these be ignored? Needs investigation","sha":"95e6d78689115ece0388d7f85bee4787dcba397c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-23T18:15:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T19:59:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"fix build","sha":"5fc36d64b62c705fc53b78e7ec1de2fef48d4db0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T10:59:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T19:59:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve separate treatment of write exceptions vs read exceptions\n- Optimizes search functionality and avoids thrashing valid sections","sha":"e9f293f522fd1b0f130950ae64e834f0591a8c21"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T12:58:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T19:59:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Be a little more frugal with texture memory to avoid running out of VRAM on 1GB cards","sha":"6918e265ec10a7ee74d32d72e3ec5bd94d4b74dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T13:22:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T19:59:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Better detection of framebuffer memory copy operations\n- Still requires texture stitching to work correctly, but matching dimensions works well for now","sha":"e6849a59a2f5e65f61ae50afa1f1a219b7e06b8b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T14:59:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-24T19:59:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix for infinite hanging in the access violation handler","sha":"882e949f8035d4968e66fd52230d839b365daf48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-25T10:48:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-25T21:35:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Disable draw call batching when strict mode is enabled\n- Minor bugs have been observed with it always enabled","sha":"d53673c6f75f8b529287f5ceda4f31b0c270b485"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-25T11:15:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-25T21:35:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix critical bug concerning transient data layout in memory","sha":"9c9495621cd22950bb7bcc3236b249477e1ca220"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-10-26T16:32:15Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-26T19:31:55Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix focus issue in trophies.","sha":"936c817bd81a392fd5df187690042accf5e15771"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-10-26T17:02:35Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-26T19:31:55Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix off by one error. Sigh.","sha":"4bf8d1e41f3ac0bc354b45c57d6761626bc6422b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2017-10-26T13:12:08Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-27T13:09:50Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Trophy: use system language setting","sha":"53f9defb079aa08d9aa4ed5f60fade7c42c9a299"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-09-14T22:59:00Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T09:46:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: make dmactrl get  'readonly'","sha":"626b9f93c49e0fd07820851e215617f7179886b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-10-26T01:28:33Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T09:46:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"spu: Implement readch(mfc_cmd)","sha":"0d46a8e7863f8600db659acfe4ed2eec2d1fc4a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-10-26T01:38:27Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T09:46:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"spu: save and restore mfc cmd after processing","sha":"494cbac78b42ef0799e39904cb3c4ded766f1c7b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-10-26T03:01:10Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T09:46:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: invalidate surface store address when tile is unbound","sha":"e0d1ac676e38e3b8212884af256f11260320bc5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-26T10:04:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T10:26:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Flush queue before attempting to copy texture memory!","sha":"11bd65c2b5f9652ce81a685a56ed0dee47ed86b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-26T13:20:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T10:26:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement memory tags for strict mode to validate render target memory","sha":"bf234dc6685f922090d49c96861e14306b18567a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-27T13:52:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T10:26:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixes\n- vk: Always reopen primary command buffers. They should only be closed in flush_command_queue\n- If uploading a texture and there are collisions with protected buffers, do not rebuild the cache\n- Perform writes via flush before reprotecting pages that were not trampled\n- Only flush no pages once","sha":"49f4da301695b99ccbd7601abdd56505e2352198"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-27T21:32:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T10:26:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Export more information about affected cache sections when handling violations\n- This allows for better handling of deferred flushes.\n-- There's still no guarantee that cache contents will have changed between the set acquisition and following flush operation\n-- Hopefully this is rare enough that it doesnt cause serious issues for now","sha":"055f0e2e4a253d9043b3288de0b8c9c21c8e251c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T08:45:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T10:26:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Avoid false positives by early rejection. Should keep cache thashing to a minimum","sha":"7abf755a5723f36a46391d0751ccae07a14ad5a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-20T19:38:14Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T10:56:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"[Qt] Fix uninitialised values before usage","sha":"dbb2251f93e4faf00bba44cad807e3e7d8aea69f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-12T14:58:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-28T20:24:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add cmdline support","sha":"00a0d374550b5e53d9da2e7ba0d0aa805eeeb4f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-13T02:13:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-28T20:24:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ppu_acontext draft","sha":"89fba1c3856dffbe2d7230b7fe4e14ee221659b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-28T20:23:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-28T20:24:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Audio: add Buffer Count setting","sha":"8520ca7ef702a29bd92bcc19f36c61202cca4501"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-28T20:39:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-28T20:39:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixup","sha":"1ffc1e82b0de8950669cd879493ceb60cc570da6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T12:34:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T12:25:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/qt: GsFrame improvements\n- Identify minimize/restore events as separate from regular resize and do not react to them\n- Enable message queue consumption after loading the shaders cache. Also hides the frame in this step\n-- This fixes the 'start fullscreen' bug when running vulkan","sha":"ce2b790d8f44fee4104e327dfe8a797a3ba85901"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T16:05:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T12:25:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gsframe: Break waiting is emulator is stopped suddenly\n- Keeps the queue from hanging the GUI","sha":"395b4bfa457ec4072176c0f8a946bab45d048807"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T19:17:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T12:25:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Tag cache blocks returned on access violation to validate data passed\nto flush_all is up to date. Should prevent recursive exceptions\n\nPartially revert Jarves' fix to invalidate cache on tile unbind. This will\nneed alot more work. Fixes hangs","sha":"361e80f7dc10396be1176d4bdb5cec0a0df37e02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-28T22:05:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T12:25:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"nvidia facepalm","sha":"7e6d6b45d4f9fc4d699308a8ab0e78a11619b870"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T09:57:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T12:25:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Allow swapchain create to fail with an error","sha":"f8f5f9f41880ba253f1debe989c0190f7076444c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T11:29:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T12:25:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix for rsx thread lockup due to nested access violations when WCB is enabled","sha":"c2ac05f734612e4c68744a9f96c00c9309315a93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-10-28T14:22:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T12:52:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Qt: Fix Save Data Dialog initial size","sha":"0741698f1306f53d5f813f4276ab5293d39f7a6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18136493?v=4","date":"2017-10-22T03:57:35Z","email":"oPryzeLP@gmail.com","login":"MRG95","name":"MRG95"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T13:17:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Repositioned current instruction to middle\n\nAs soon as I tried the debugger, i wanted to move it to the middle almost instantly. Checked the code and found it sitting right here but commented out. Why? This is awesome.","sha":"09a0d046f4b17de8c7ed7a0706c62874c7fd6616"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18136493?v=4","date":"2017-10-22T07:34:36Z","email":"oPryzeLP@gmail.com","login":"MRG95","name":"MRG95"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T13:17:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Added breakpoint list\n\nAdded a list widget that displays all the currently active breakpoints. You can rename each one for convenience, delete them in bulk, or double click to jump to that address.","sha":"c1f08ce58d13936cb7b427bb3273a974c47873c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-28T22:48:48Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T13:52:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Handle device not ready in fs::error. Solves #3592","sha":"9b8eb089b1a9b1c9996dce42f90ea2b37a2b8f75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-10-26T16:09:44Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T15:48:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Implement Trophy Manager.","sha":"4aa89132d7cf19ce486c9b36c65a82b45fc234d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-29T17:09:23Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-31T09:29:12Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Revert Qt requirements to version 5.7 for Linux","sha":"a1496eb1f191a4de4782c69b914f58e7469f79ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-29T17:13:07Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-10-31T09:29:12Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Update PPA urls to the latest version of Qt","sha":"db5c2500c2fab46d9ab69d2159fba936ea528e25"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-31T20:41:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-01T02:07:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add Delete LLVM Cache option","sha":"0b788f5b4340e90eb8ba54589108e9d7f52cf89f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-31T21:23:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-01T02:07:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix /dev_bdvd/ for exitspawn","sha":"0e7e40f2cbe2cce45fed49b6815e32fefc4e322e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-31T21:36:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-01T02:07:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix NPDRM exitspawn","sha":"af107df0b49b8d21b8db754dde728ec12fb23d58"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-10-31T22:49:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-01T02:07:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement set_native_priority (posix)","sha":"59cd0a9c7ffc7d4e6b03b1f4efc2d63f8aa40dc4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-01T01:58:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-01T02:07:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add supporters","sha":"b7c20884891e5d4357d4a3688ea12c67033e4064"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T12:31:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-02T11:35:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Experimental; Try to calculate pixel offset using nv3062 pitch register since we know the target block is defined with 3062 registers","sha":"e4ef85b6e044a6b2230fec56cf01e3ab3783647a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T12:32:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-02T11:35:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improved handling of swap_bytes behaviour when using WCB","sha":"f7063bb57be782320fd4d4c8c2761379d7dbe685"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-29T16:34:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-02T11:35:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Tweaks\n- Optimize get_surface_subresource\n- Add check_program_status time to draw call setup statistics. It can slow down games significantly","sha":"31b07f2c5cf1566d560e6939a241748b7973e4ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-01T14:27:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-02T11:35:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"disable fb testing for partial framebuffer resources","sha":"30bba09fed0c2e52ea2e08d62087da15ffeebeae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6381451?v=4","date":"2017-11-01T22:18:11Z","email":"xdemolish@hotmail.com","login":"takhlaq","name":"Tahir Akhlaq"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-03T11:17:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"change CryptAcquireContextW to try CRYPT_NEWKEYSET flag if key container doesnt exist already < https://msdn.microsoft.com/en-us/library/windows/desktop/aa379886(v=vs.85).aspx >","sha":"3d0dced4bdc9d5eca2f7cc88cfa9becfe3a9c769"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-10-30T03:32:51Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-03T18:15:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Make trophy dialog smarter and not need the silly file.  Can load all games by default now.","sha":"47bacc0ef05814980770f7271260b09ac78fa45c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-10-30T19:13:06Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-03T18:15:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Make it so that TROPUSR doesn't crash on \"bad\" imput.","sha":"b8c29ae957688ad8b0aadbb8f0ce2ea8a8ec18b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-10-31T01:57:15Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-03T18:15:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Have trophy manager reject games that have invalid usr data rather than dying.","sha":"328805068082181fa5c03c99c5327f0baaee91ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-03T14:17:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-03T21:08:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix for framebuffer validation","sha":"daaa83b9ca9f769b0083014486b4ca2c843bff72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-30T18:39:18Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-03T22:28:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"[RSX] Fix uninitialized value before usage","sha":"4600094829af4529b56612bc8e4d1396a1061501"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-11-03T01:02:04Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-04T19:55:32Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Make cellMouseGetDataList return CELL_MOUSE_ERROR_NO_DEVICE if mouse handler is set to null","sha":"6782b2263785bc50ca175cc8afdd7896e7384e5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-11-08T01:22:41Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-08T01:22:41Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix git-branch in title... again (#3704)\n\nFix git-branch in title... again","sha":"3a49a77c07e13919b24822c571297a5b747cc979"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-23T20:03:16Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-08T04:34:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPUTranslator minor changes","sha":"3e7ed8a831cb94cd5cab5d7fd1e081c84afc62ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-11-08T02:48:26Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-08T08:49:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"HEAD or master will no longer show up in the titlebar","sha":"865bb47462882a3dcab02e4cc53dd6f218509360"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-30T12:27:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Optimizations\n- Reimplement fragment program fetch and rewrite texture upload mechanism\n-- All of these steps should only be done at most once per draw call\n-- Eliminates continously checking the surface store for overlapping addresses as well\n\naddenda - critical fixes\n- gl: Bind TIU before starting texture operations as they will affect the currently bound texture\n- vk: Reuse sampler objects if possible\n- rsx: Support for depth resampling for depth textures obtained via blit engine\n\nvk/rsx: Minor fixes\n- Fix accidental imageview dereference when using WCB if texture memory occupies FB memory\n- Invalidate dirty framebuffers (strict mode only)\n- Normalize line endings because VS is dumb","sha":"173d05b54ff530be7054052218cd10c2877085be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-31T13:54:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Critical fixes\n- Remove generic throws from the rsx pipeline. Stops the rsx thread from silently dying leaving the emulator in a hung state\n- Hackplement add_signed and reverse_subtract_signed blend modes","sha":"963a87fed511ac488b29fe5d33f694e806129838"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-31T15:45:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: More fixes\n- Tag surface store to help determine when contents have been invalidated\n- Crop framebuffer textures if they are not the requested dimensions!","sha":"ec3e5c547ff326e4d9ececee34372f7c11f613fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-31T18:01:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve surface store resource management\n- vk: Use frame testing to determine invalidated resources that can be safely deleted","sha":"af1d3c2aa69d5144735dd8df05a4fb655d72a473"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-31T18:49:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor fixups\n- Optimize framebuffer memory invalidate conditions\n- Fix texture sampling of AA textures (wider by 2x surfaces)","sha":"b95630d84a928d1c0df304f8b3cbfb59ba283487"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-31T22:36:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fbo fixes 2\n- Use AA mode to predict surface compression. Compression mode is useless without AA activated\n- Rewrites most image subresource fetch routines to use the new heuristic\n- Fix rsx::thread::find_tile. FEED000(X) can be substituted for (X) in the code\n-- Fixes alot of failures when looking for tiled regions\n\nrsx: Fix antialiased unnormalized coords\n- scaling factors are inverse to allow proper coordinates to be computed in fs","sha":"bbcb6b6851337058af8df77b99a4e727a21d2b26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-01T12:34:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor optimization\n- Defer resolving image copy operations to the binding step","sha":"eed55a446c559ae2ed24bce1af1403e13ac14fe3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-01T13:38:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Shift code around to increase work done after memory transfer operations\n- The current code is slower because memory operations are too close to their draw calls\n-- This is mainly an issue with proprietary AMD drivers","sha":"2385029eabaa9baa4457847493817280ab01b140"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-02T12:10:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Workaround for missing AA flags on some surfaces\n- This just doesnt work right yet. It looks like AA is being used dynamically? (RDR)\n- TODO: Try to locate flags to set AA if AA mode is not changed","sha":"7037504dcf983a1292590b31f528ff12439b8bfa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-02T15:54:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement 1D<->2D image type casts","sha":"0961a4399735eaddde019778dce0c10d20e51eca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-02T16:12:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl: Addendum - Fix fragment shader to consume texture scale parameters","sha":"fbb7186e6637b83a6cab0ecd1e397ddf5a12f2b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-02T18:54:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement render-to-cubemap; Also simplify unnormalized samplers [WIP, DELETE SHADER CACHE, VERY SLOW]\n- Enables real-time cubemap reflections\n- TODO: Vulkan is broke; rsx is very slow with this feature","sha":"1fa18757fc95899c5ba64deea9901da206e3fd95"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-03T11:16:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactor create_subresource_view(deferred_subresource&) and implement a subresource cache\n- This limits the number of times an image is copied and improves performance","sha":"60c7a508a701830c570bf8415571302493b1971d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-03T12:48:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixes for cubemap reconstruction\n- Do not abort generation if sides are missing, replace with blank surfaces instead\n- Make cubemaps scale with res scaling","sha":"300a36d3d65a2b948ef0f1bda4144972d602f113"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-03T15:25:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix for unnormalized texture access","sha":"4ca98e53a6bcb8203ee68cd1ac36e480f401d40c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-03T17:43:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Rework context handling and stop leaking the GL ccontext\n- GL contexts are external handles that require manual lifecycle management","sha":"75504b3f5e5d60d43152f0ea255db069e96fad97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-03T18:09:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor optimization - dont update sampler state if texture state registers have not changed","sha":"0d35363ea0d7984047f166181646677d47b1d9c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-04T10:49:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: More fixes\n- Support for raster offsets in surface descriptors (looks to be unused)\n- Do not tag disabled render targets when using MRT (pitch = 64)\n- Add missing notify_surface_changed() call for openGL","sha":"3730b9d1da63ab78b6e99e281a97ecece5bfb0a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-04T13:29:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Rewrite invalidate_range_impl_base in a way that makes sense. Fixes wcb hanging","sha":"baa5a261a508be0b2437a3e09dca061e27f26c59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-04T14:30:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl/qt: Catch segfaults in wglDeleteContext with SEH (AMD windows driver)\n- In rare cases the driver derefs a nullptr and dies, taking the emulator with it\n- From testing, it seems the vram is indeed freed when this happens so its \"safe\" to continue","sha":"242611aa46c5d72b8e3b6a64574914584b3610c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-05T14:57:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor fixes\n- texture_cache: Fix internal size calculation for subresources\n- vk: Delay dynamic state updates until just about to draw to ensure no flush has discarded the cb state","sha":"8733505d0aa6a5580683eafb1cd472e30518e9b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-05T22:31:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Fix unnormalized converted textures","sha":"86fa379c78e8943bb3288028256649b5e481534b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-05T22:48:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk/gl: Cleanup and refector glsl::getFunctionImpl\n- Both backends now generate very similar code","sha":"4e9160104a4e201fdd6c4a903a127e1f086abae7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-05T23:06:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix shader logging\n- Do not overwrite logged programs","sha":"541cb4062b2a62818e972d90eab6b568b0443793"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-05T23:35:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Cleanup, simplify renderpass management","sha":"30b3af0d12e8dff4fbffcadde2f3e8973377de6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-06T00:26:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Hotfix\n- facepalm: Do not enable depth comparison mode if masquerading as RGBA color!","sha":"7b3e4f5e3dbf216ea6f89ab906374522b561a80c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-06T21:34:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:15:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor fixups\n- Fix texture cache blit behaviour when src has AA enabled and dst is a blit dst texture with or without AA\n-- This requires handling AA resolve by removing a half downscale on multisampled axes\n\n- Return all ones when a vertex attribute is disabled.\n-- Some games forget to enable vertex attributes actually needed by the fs","sha":"ed21bb309f65eaa3bd072c3fe0ac656b3d544c83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T10:40:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-09T11:39:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Bump shader cache ver and fix blit engine crash\n- Disables blit operations if the target will have a size of 0 in any dimension\n- Bumps shader cache ver to 1.1","sha":"b2a7eee1ec26c5c08f8c9935f456073934eba88e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T11:41:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-09T11:39:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix shader cache version check","sha":"8b4836a12fbf5eea9e469d2f4e6539c80b10ec8b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-08T13:27:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-09T11:39:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Ignore FENCE instruction as it seems like its ignored on realhw\n- This is likely a compiler hint for performance reasons and not a mandate","sha":"3c9126d91f52f6a2ee624c627166c53ebac93de8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2017-11-11T12:56:59Z","email":"26035046+Talkashie@users.noreply.github.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-11T12:56:59Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Correct two typos and a couple of other nitpicky things (#3721)\n\nCorrect two typos and a couple of other nitpicky things","sha":"8c0bdd71d981180c3429a529d43f72d6cf1fbdc1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2017-11-11T18:18:32Z","email":"26035046+Talkashie@users.noreply.github.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-11T18:18:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub sceNpSnsFbCheckConfig (#3720)","sha":"55d84414eebd26abbc2506164f24fbe452527e77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2017-11-11T22:22:38Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-11T22:22:38Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix cellGameGet(Set)Param (#3690)\n\n* Fix cellGameGet(Set)Param","sha":"8fc9862614ce9a6d359da0773ab9195daf0251fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2017-11-12T17:36:13Z","email":"packerkid2@yahoo.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-12T17:36:13Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix off by one error in trophies (#3715)","sha":"2c19fdf092f94db9e921ca3a2c08d114a776d044"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-12T14:52:59Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-12T18:13:22Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fixes commit count on GIT-VERSION\n\nAppVeyor: Fetches commit count from unshallowed upstream instead of fetching from HEAD (will always be 3 since we clone with depth of 3)","sha":"c7f7d7ef5b9f9404ea1bebc601a5595df839ec64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-12T17:11:08Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-12T18:13:22Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"GUI: Style fix for Kuroi (Dark)\n\nSmall style fix for Kuroi (Dark) Theme","sha":"4bdb6674eb662c2d5f83ef888e81f9c6edbbc9aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-12T17:51:12Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-12T18:13:22Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Bump version to 0.0.4","sha":"0064976c43250ea89a407225813a6f760894c7f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2017-11-14T18:24:55Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-14T18:24:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix bug in sys_spu_thread_group_create (#3734)","sha":"946ba3be2934a03fe8f3574aebc9306c15adcdf4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2017-11-14T20:10:31Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-14T22:26:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fire callback in cellSearchInitialize\n\nAllows BLJS10131 to get ingame ;)","sha":"9e0b881b2befc5dfed23befb30b572ea719f4178"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-07T12:30:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T18:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement set_ideal_processor_core (linux)","sha":"dbc9bdfe02ae2847c99a794b7a3ca47c0501bd4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-07T16:45:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T18:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ALSA audio backend fixes","sha":"f2980d57a12fec55714eeb1eb7a51e204b7e9b07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-08T16:32:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T18:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add supporters","sha":"f4eab0955722166cde0caa2521484d7f3bd8f8cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-09T00:49:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T18:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix command line args","sha":"9bc0ec586afc1c90443627d024d18859a1e071c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-09T17:33:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T18:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Optimize cpuid","sha":"916851bd4ae9fffbab6ee89932f5fe3ef940600b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-10T14:31:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T18:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RSX: Rewrite frame limit","sha":"9ef00b4a120bc7e63f123a3882592ebafabd186b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-14T10:35:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T18:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement _sys_prx_load_module_by_fd\n\nImplement _sys_prx_load_module_on_memcontainer_by_fd","sha":"0fbb8b9a18ca974c7e83d64b9ef998d526db7640"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-14T14:27:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T18:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fix (cellGame)","sha":"358afc045d31674af1dc082209ca0d78818dec47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-14T14:49:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T18:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData fixes","sha":"16d7023a92876edca388e3686438d7ac679ec910"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-14T14:57:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T18:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix cellMsgDialog","sha":"0d1cb8c87806654f432a9c4f5b9479eef7745299"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T17:56:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T18:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix fs::dir (const begin/end)","sha":"3792a8508449eaf08e7358c17e9454fe8f62a69b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T17:59:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T18:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement savedata delete op","sha":"c435b328c7349b7f353ec10b247eb1c45311d460"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-11-15T19:47:30Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-15T21:41:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Bump CMake requirement","sha":"223f17ac7e8e0b735bdd395805dbc665a59f9352"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-17T19:20:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-18T07:24:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix cond_variable timeout\n\nThanks @Farseer2 for debugging","sha":"c58738807e205fdbeb1a8b988f76d72f1da9e5eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-10-31T18:51:04Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-18T21:36:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use zeux/pugixml instead of RPCS3/pugixml","sha":"0870862898f01f3bbb506c4a49165c0e7477e912"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-11-19T17:49:21Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-19T18:25:13Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"AppVeyor Qt fix","sha":"214ea1e0f6e6b4310a25f8408f98ab4c4e2f7db4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-10-19T17:50:39Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-19T20:11:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Initial work on sys_usbd syscalls","sha":"12ecba7d4962a142df8ff707d77fa05ef5d7b409"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-11-19T22:02:35Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-19T22:02:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix set thread affinity on OS X (#3757)","sha":"222c0e0fc59c2971668972ecf96ecf2e02ad399c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-18T12:20:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-20T00:34:29Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Qt: Use global Appicon instead of setting it in every Dialog","sha":"61ca9df45ca99db301b96408783e0c5a3ca14285"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6381451?v=4","date":"2017-11-20T01:10:27Z","email":"xdemolish@hotmail.com","login":"takhlaq","name":"Tahir Akhlaq"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-20T01:10:27Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Updates ReadMe for Windows (#3713)\n\n- Includes prebuilt libraries in instructions","sha":"bd0d87ecaf8289936e4bb02acb69566776e54d45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-18T23:55:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-20T10:36:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Qt: move \"Disable Vertex Cache\" option back to gpu tab","sha":"59be9dc36e38d350f38ef948ac5b9d2ccee47a94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-09T16:47:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-20T12:18:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: research native texel byte order on cpu readback (WCB) [WIP]","sha":"be6b5922dd324a5edd07ee20ac2be5cb6a4492ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-10T12:13:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-20T12:18:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Enable hw blit engine for local->main memory blit operations as well","sha":"6d2dcbd164002f7ef484a93336f8881243b1216e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-10T13:42:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-20T12:18:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Abort all drawing commands if no swapchain exists\n- Should keep nvidia from consuming all device memory when minimized","sha":"bbb3bdf008557bdc094c14892127575cd98fe0c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-13T19:07:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-20T12:18:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: RE work on precision modifier bits\n- Testing DS2 has revealed clamping bits in SRC1 that were not respected and left negative values reaching the framebuffer","sha":"a8c0dd649ee6e0a0a848ca3e5df6e14870760cc3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-17T16:43:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-20T12:18:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: improve SRC modifier order\n- Neg modifier is applied after clamping. Abs has not been tested/proven so precision clamp goes first now, not last","sha":"f5addbf7516d97b86948159c33788b4720b46ee4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-17T21:53:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-20T12:18:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Give abs higher prio as it invalidates any precision checks","sha":"df7d52b177450491cadcf346678f8a23644d8ad5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-19T09:55:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-20T12:18:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Reset renderer status whenever a window geometry event is processed","sha":"5d87ef86b55064ee2522ba67cd83043549661834"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2017-11-20T13:42:16Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-20T13:42:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix regressions caused by network code. (#3702)\n\n* Stub SOCK_DGRAM_P2P to allow some games to load again.\r\n\r\n* Add 'support' for unspec sockets\r\n(Have only seen the youtube app using these so far)","sha":"86a34fbb455702d0c6726375c08a394dda9eed82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-12T11:27:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-20T14:55:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Handle Win32 error 87 ERROR_INVALID_PARAMETER with fs::error::inval","sha":"380f90b097d60ee2873612558787fa90fedc1c0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2017-11-20T21:56:25Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-20T21:56:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixes from FreeBSD package (#3765)\n\n* Thread: unbreak on BSDs after dbc9bdfe02ae\r\n\r\nUtilities/Thread.cpp:1920:2: error: unknown type name 'cpu_set_t'; did you mean 'cpusetid_t'?\r\n        cpu_set_t cs;\r\n        ^~~~~~~~~\r\n        cpusetid_t\r\n/usr/include/sys/types.h:84:22: note: 'cpusetid_t' declared here\r\ntypedef __cpusetid_t    cpusetid_t;\r\n                        ^\r\nUtilities/Thread.cpp:1921:2: error: use of undeclared identifier 'CPU_ZERO'\r\n        CPU_ZERO(&cs);\r\n        ^\r\nUtilities/Thread.cpp:1922:2: error: use of undeclared identifier 'CPU_SET'\r\n        CPU_SET(core, &cs);\r\n        ^\r\nUtilities/Thread.cpp:1923:48: error: unknown type name 'cpu_set_t'; did you mean 'cpusetid_t'?\r\n        pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cs);\r\n                                                      ^~~~~~~~~\r\n                                                      cpusetid_t\r\n\r\n* JIT: use MAP_32BIT on Linux and FreeBSD\r\n\r\nUnless RLIMIT_DATA is low enough FreeBSD by default reserves lower 2Gb\r\nfor brk(2) style heap, ignoring mmap(2) address hint requested by RPCS3.\r\nPassing MAP_32BIT fixes the following crash\r\n\r\nAssertion failed: ((Type == ELF::R_X86_64_32 && (Value <= UINT32_MAX)) || (Type == ELF::R_X86_64_32S && ((int64_t)Value <= INT32_MAX && (int64_t)Value >= INT32_MIN))), function resolveX86_64Relocation, file /usr/ports/devel/llvm40/work/llvm-4.0.1.src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp, line 287.\r\n\r\n* build: unbreak -DVULKAN_PREBUILT with system glslang on Unix\r\n\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:4:10: fatal error: '../../../../Vulkan/glslang/SPIRV/GlslangToSpv.h' file not found\r\n #include \"../../../../Vulkan/glslang/SPIRV/GlslangToSpv.h\"\r\n          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r\n\r\nrpcs3/CMakeFiles/rpcs3.dir/Emu/RSX/VK/VKCommonDecompiler.cpp.o: In function `vk::compile_glsl_to_spv(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >&, glsl::program_domain, std::__1::vector<unsigned int, std::__1::allocator<unsigned int> >&)':\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x50e): undefined reference to `glslang::TProgram::TProgram()'\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x51d): undefined reference to `glslang::TShader::TShader(EShLanguage)'\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x542): undefined reference to `glslang::TShader::setStrings(char const* const*, int)'\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x581): undefined reference to `glslang::TShader::parse(TBuiltInResource const*, int, EProfile, bool, bool, EShMessages, glslang::TShader::Includer&)'\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x5d6): undefined reference to `glslang::TProgram::link(EShMessages)'\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x5f1): undefined reference to `glslang::GlslangToSpv(glslang::TIntermediate const&, std::__1::vector<unsigned int, std::__1::allocator<unsigned int> >&, glslang::SpvOptions*)'\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x5ff): undefined reference to `glslang::TShader::getInfoLog()'\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x61a): undefined reference to `glslang::TShader::getInfoDebugLog()'\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x630): undefined reference to `glslang::TShader::~TShader()'\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x63c): undefined reference to `glslang::TProgram::~TProgram()'\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x6d2): undefined reference to `glslang::TShader::~TShader()'\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x6de): undefined reference to `glslang::TProgram::~TProgram()'\r\nrpcs3/CMakeFiles/rpcs3.dir/Emu/RSX/VK/VKCommonDecompiler.cpp.o: In function `vk::initialize_compiler_context()':\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x6f5): undefined reference to `glslang::InitializeProcess()'\r\nrpcs3/CMakeFiles/rpcs3.dir/Emu/RSX/VK/VKCommonDecompiler.cpp.o: In function `vk::finalize_compiler_context()':\r\nrpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x856): undefined reference to `glslang::FinalizeProcess()'\r\n\r\n* build/msvc: add missing glslang include directory after 6bb3f1b4d75c\r\n\r\n\"c:\\projects\\rpcs3\\rpcs3\\VKGSRender.vcxproj\" (default target) (15) ->\r\n(ClCompile target) ->\r\n  Emu\\RSX\\VK\\VKCommonDecompiler.cpp(4): fatal error C1083: Cannot open include file: 'SPIRV/GlslangToSpv.h': No such file or directory [c:\\projects\\rpcs3\\rpcs3\\VKGSRender.vcxproj]","sha":"dd5791a2cc47930c4cd28d4903d793ea5e49a2bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-01T11:55:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-20T23:02:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix \"Exit RPCS3 when process finishes\" command line crash\n\nAdded force_boot to force boot on cmdline boot.\nLoad() caused a Stop() that exited the application with \"Exit RPCS3 when process finishes\" enabled. Now Stop is only called if the emu is not stopped","sha":"de465cb9412a40e3cf7ccf9590e9fa040bf0f2e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-22T11:11:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-22T11:11:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Trophy: Save dialog state (#3729)\n\n* Trophy: Save dialog state and add show type settings\r\n\r\n* SaveDataManager: Save Dialog State\r\n\r\n* SaveDataList: Minor Optimization\r\n\r\n* Qt: Save icon size on mouseevent resizes\r\n\r\nit's a bit slower than using the slider because it saves every single resize. But better than not saving at all for now\r\n\r\n* SaveData: Optimize saving to settings a bit\r\n\r\nNo Saving needed there\r\n\r\n* Qt: get rid of all-uppercase enums and namespaces\r\n\r\n* Qt/Linux: adjust remaining DX12 tooltip\r\n\r\n* Qt: prevent dockwidget contextmenu","sha":"fb52cbb8b22b688c3508eb09f27b96ebe3a4da9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2017-11-22T22:02:23Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-22T22:02:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Check sys_spu_thread_group_create's nsize (#3742)\n\n* Check sys_spu_thread_group_create's nsize\r\n\r\n* cellSearch callback correction","sha":"58c42ad9c0f45bf52f99d9c38ba3a5d51f2a0ed0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2017-11-23T12:27:44Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T12:27:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellGameBootCheck for disc games (#3771)\n\nDon't return dirName","sha":"3628a8593facb4b32eb1ae728878fd9f00c52419"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-19T13:44:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T15:38:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement fs::unshare (linux)","sha":"6a5ce475b80d697b130c912365cfc4c9d8e6fb7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-19T14:09:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T15:38:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Log: improve messages for multiple RPCS3 instances","sha":"c247ebad0c7dc448d55cc695ac9ecfbd87561655"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-19T18:59:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T15:38:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"New logging strategy","sha":"868180eacd0b91a3a3a1a3abaeeb06e15936b49a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-19T22:01:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T15:38:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Restore log compression","sha":"d32a30bbeb001e056404a9087e23b023d380952a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-20T15:10:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T15:38:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert ERROR_INVALID_PARAMETERS\n\nI don't want to ignore serious problems in light of easy workarounds.","sha":"e77d5cf970c03a9e3d2e8c82bf739cb4d1f157a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-20T16:06:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T15:38:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Log sys_fs_utime values","sha":"74c248150b94a6c64aacf441a6b88d51033f4075"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-21T18:45:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T15:38:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Log: minor improvements","sha":"b60d3a3dae20cc7609f214e139e1ff9ff0f11f69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-22T10:50:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T15:38:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add libpulse-dev to README.md","sha":"ddbcbd0f1ca156d73cd38e060ce865c01435c484"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-22T21:04:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T15:38:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PKG installer update for DLC\n\nAlso:\n1) Don't ask for overwriting. It's outdated feature.\n2) Limit cancellation capabilities.","sha":"5fffef74a2c8d3b41fed62cbd1cc6e7644892835"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T00:49:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T15:38:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix free space check (Wnd)","sha":"cc4bc41cf4ee86b056add2ff63dc394f71a4b5c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T15:37:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T17:36:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use Qt for error reports","sha":"7d3a5288717b292c6ef4a90b00923c4cf57d10e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-11-22T20:54:38Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-25T14:07:11Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"cmake: check if ffmpeg libswscale is present","sha":"d05071221ecb327ca9bc65ab1f0f7a5fdff3b96e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-11-22T20:56:54Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-25T14:07:11Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"cmake: remove unused link to ffmpeg libswresample","sha":"78101a9e57461e1d5d164ae76115a063e4ab5b55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-11-25T18:57:22Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-26T00:11:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Update Fedora packages in the README file","sha":"477c6fdeddee562d08f8d5e256157ef76a4a949c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-23T19:18:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-26T06:02:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Clamp utime range (Wnd)","sha":"2ac773385f9852a165c3ae45e1bef02fb684f83d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-24T08:00:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-26T06:02:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix exitspawn (autoexit option)\n\nFix other situations affected by this options","sha":"f7803927d98439a811e8daf0c8d415bd78f205b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-25T13:42:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-26T06:02:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RSX: improve nv406e::semaphore_release","sha":"1344f15efdd3e7164f83dc50cd73d6767d7a7c2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-26T21:07:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-27T17:35:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: change settingsdialog to horizontal layout","sha":"b22f3d7a558c39578e11280b2b2276ecd3108f4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-11-27T18:04:55Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-27T18:04:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CMake minor improvements (#3783)\n\n* cmake: simplify GLEW integration\r\n\r\n* cmake: simplify ZLIB integration\r\n\r\n* cmake: simplify ALSA detection\r\n\r\n* cmake: check C++ compiler and flags instead of C ones\r\n\r\n* cmake: bring consistency in Qt packages detection and remove unnecessary related \"include_directories\"\r\n\r\n* cmake: harmonize coding style\r\n\r\n* cmake: set CMAKE_INCLUDE_CURRENT_DIR to ON only when necessary","sha":"5f07f78c231e7c4adcc2a205f49ac1bb7bfd4ddd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2017-11-24T18:56:51Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-27T18:35:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Avoid recreating SwsContext every frame\n\n* Applies to video decoding(`libvdec`) and post-processing(`libvpost`).","sha":"754cdea43528ab0d1b0bf3c24190b72a4d5e3e89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-25T12:59:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-27T19:16:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: remove some warnings","sha":"2f7d621fc856d38c95b8c7ae0836b168aafda832"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-25T13:01:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-27T19:16:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: implement progress_dialog","sha":"917ee472d47092325a2150de491b5e05e9c8d827"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-26T12:34:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-27T20:15:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix log limit","sha":"33aa2f0b62cc94c337aed2e74367bba6ed53b9f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-26T12:44:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-27T20:15:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RSX: fix fix (406E semaphore release)","sha":"d3668239490da0535258b4d709a662b8c134fdac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-26T14:22:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-27T20:15:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Change sys_usbd_receive_event","sha":"695b4c1f06e127c832871f1bdae1a43c20f319b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-27T21:31:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-27T21:31:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[Qt/Input] Improve pad_settings_dialog a bit (#3611)\n\n* Input: further work on remapping Xinput and begin work on remapping DS4\r\n\r\n* Input: Improve pad_settings_dialog a bit and begin Remapping for XInput\r\n\r\n* Input: begin evdev remapping and change all handlers to use cfg::string\r\n\r\n* Input: finish work on remapping evdev\r\n\r\nand some more crap\r\n\r\n* Input: finish work on remapping Xinput and DS4\r\n\r\n* Input: add DS4 Colors to DS4 config\r\n\r\n* Input: Improve DS4 deadzone scaling\r\n\r\nJarves made some mistakes, so I'll fix them in the follow up commit\r\n\r\n* Input: fix Jarves fixes on DS4 deadzone\r\n\r\nand remove unnecessary usage of toUtf8\r\n\r\n* Input: add primitive batterychecks to XInput and DS4\r\n\r\n* Input: add mmjoystick remapping\r\n\r\n* Input: Fix evdev and some Vibration issues\r\n\r\n* Input: adjust capabilities to fix stick input for games like LoS 2\r\n\r\nalso fix threshold slider minimum\r\nalso add ps button to all the handlers\r\n\r\n* Input: Further evdev work\r\n\r\nbased on danilaml code review and own debugging:\r\nFixed path issue, <= 0 issue, some captures, const, axis with same codes.\r\nAdds a map to each device that differentiates negative and positive axis mappings.\r\nadjusted rest of the file to tabs (ListDevices and beginning of threadProc)\r\n\r\n* Input: use 20ms vibration update time for xbox one elite controllers.\r\n\r\n* Input: Fix return type of Clamp()\r\n\r\n* Input: Evdev Fix\r\n\r\n* Input: Evdev Optional GetNextButtonPress\r\n\r\npresumably better than the other\r\n\r\n* Input: review changes\r\n\r\n* Input: evdev: fix wrong index in axis handling\r\n\r\nmove bindpadtodevice down to keep consistency between handlers and not get crazy\r\n\r\n* Input: evdev: fix expensive add_device in GetNextButtonPress\r\n\r\n* cleanup\r\n\r\n* Input: mmjoy: fix type\r\n\r\n* Input: evdev: final fixes\r\n\r\n* Input: evdev: exclude unnecessary buttons while mapping Xbox 360 or DS4\r\n\r\n* Input: add deadzone preview by passing necessary values in callback\r\n\r\nuse 0.5 of max value for threshold in pad dialog\r\n\r\n* Input: get rid of all-uppercase variables","sha":"662fe8cc957d8d4991bcb74f354b3b6dfab4ef4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-28T07:23:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-28T10:25:22Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Input: Fix Default XInput LB","sha":"4f5e93bd09a5fca7b0f0a7ee9e05524b26bbbb1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-28T09:57:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-28T10:25:22Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Input: fix currentText of device combobox","sha":"782156b26f034373da62cfb1aabc0afd5db6e2ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-28T10:01:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-11-28T10:25:22Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Input: fix MMJOY a bit","sha":"17ff1e41a556505bfb02faf94ca0178f58f02f3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-11-27T22:35:05Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-28T11:22:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update Qt to 5.9.3","sha":"8901cc9ae6215eba0f2e3c92646395e1fe78d51a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8931126?v=4","date":"2017-09-12T23:49:02Z","email":"07mcteaguepet@googlemail.com","login":"PeterMcteague","name":"Peter Mcteague"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-28T19:22:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Added installation for additional packages to game boot","sha":"6702c14b881379047e261d11896d5a214b905541"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-28T22:24:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-29T01:09:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Input: Fallback in FindKeyCode to prevent crashes on incompatible config","sha":"5810b292982b07d43adb98325579cb33b198830e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-29T09:20:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-29T11:57:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Input: MMJOY prioritize button presses due to constant axis events","sha":"dd4ccb059e8d1a9f96a38f2988a5846129a0d473"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-29T09:21:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-29T11:57:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt/Input: disable TabFocus while mapping buttons in order to map Tab key","sha":"2cd551a2224d352e794eed73af811159e54f05cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-29T09:23:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-29T11:57:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt/Input: Implement GetModifierCode to improve keyevents","sha":"a4de49509397e78edad56ad075639fc771750df6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2017-11-29T12:28:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-29T12:28:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU MFC: Clamp tag and size (#3803)","sha":"91fd1465f2ce35c889381768f18f996bb4a9ef8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-11-30T00:23:04Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-30T00:23:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Quick fix to prevent Qt download timeout (#3809)\n\n* Quick fix to prevent Qt download timeout\r\n\r\n* Switch back to 3.0.1","sha":"ae643135b58306f8977fbff721270f509ab2e5c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-29T19:26:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-30T15:06:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt/Input: disable config button when device combobox is empty","sha":"c2379b8337861c6f5a797db203c7d5d37eb2c92c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-29T19:28:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-30T15:06:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt/Input: Remove unsupported groupboxes from pad dialog and shorten text","sha":"25a1d8698608f66eabd1feab0e4a4bbf8600b271"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-29T23:38:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-30T15:06:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Input/MMJOY: use provided min and max. Move info and caps to MMJOYDevice","sha":"c04c23f33d693a73a1136c37bd0a18f02249bc4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-29T23:43:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-30T15:06:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt/Input: implement blacklist to Filter Noise in pad dialog","sha":"853c3f9e39c28cadf88965fbc2549d2f3f077388"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-11-02T06:27:57Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-30T15:07:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silence some warnings in some files in Utilities","sha":"b9b06143d2f278c7ccbcacafb67c63234acc6da8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-11-02T06:28:40Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-30T15:07:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silence warnings in lv2/Modules","sha":"8276d29d4f81e3491fa0a0e18c88f2a1fccdb63b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-11-02T06:29:17Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-30T15:07:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"silence warnings in RSX stuff","sha":"3a9ae2df9e98b4965c252aaaef8b69853d5ae531"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-11-02T06:30:34Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-11-30T15:07:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silence warnings in misc files (gui, psp2, mfc, mouse)","sha":"c424652b43f8c65dc0b04b77078a993e60bb249d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-12-01T03:01:09Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T17:29:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"sys_memory: Lower maximum size for memory block to fake OS size - Report available memory minus another fake block that can be used for the OS","sha":"17cf24d0edb0f005166a128bdf40c86afde0662f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-12-01T03:01:09Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T17:29:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"spu: Implement DFCMGT for interpreter and recompiler","sha":"ad97780c4ff81d25d6749c64106ccd17d428ec31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-12-01T02:50:01Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T17:29:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"spu: Recompiler Interrupt optimizations - Pigeonhole optimize for branching pattern that is used to enable and disable interrupts used in code, this should lower amount of blocks that are compiled and avoid falling out of a block - Recompiled interupt check in some cases to stay in block instead of falling out to dispatcher","sha":"8b476b5bfa04d975dc188d7e71dd4a9748a5ffd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-12-01T02:50:01Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T17:29:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"mfc: Fix support for list transfer stall bit with partial support for out of order execution - Also give Sync commands a size so they are properly detected by queue checks","sha":"34e01ba3d8ec11f610ff1206a4942c04d9b2f0b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-12-01T02:50:01Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T17:29:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"spu: Fix interrupt jump check - also change interrupt variable to atomic bool for ease of setting/checking","sha":"d17093e65bdf6fa558e3f2b1146ce297cebc06d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-13T20:39:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Invalidate both depth and color surfaces when binding a new surface","sha":"db58cd7513bb520573c841f737b049603e257428"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-14T13:41:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor improvements","sha":"0aaae000b338c3946b1d49b6f869cc5b967ad02b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-14T18:24:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add more validation to framebuffer setups. Game devs sometimes do crazy things","sha":"8646f51fa3f5420712dabf07d654a58926f777be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-15T12:02:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Major fixes\n- Handle aliased depth + color target by disabling depth writes. This looks to be the correct way\n- Add support for generic passes that cannot be done using general imaging operations. Lays the framework for tons of features and effects\n- Implement RGBA->D24D8 casting. Sometimes games will split depth texture into RGBA8 then use the new RGBA8 as a depth texture directly\n-- This happens alot in ps3 games and I'm not sure why. Its likely the ps3 did not sample fp values with linear filtering so this is a workaround\n-- Only implemented for openGL at the moment\n-- Requires a workaround for an AMD driver bug","sha":"33f3a3e014cf79c8d50c8a0a1d5ec15e1f0d6ab3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-15T14:15:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve framebuffer check heuristics for contested memory buffers","sha":"63f261a66d6b027fd388e00c1eae9dd843ddfb33"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-15T15:50:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Try to take the context for the surface creation into account","sha":"07f61db24a26f719dd91d22cfc473ef905bd90ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-15T17:38:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl: Use strict method of gathering the depth buffer bits\n- Performance difference on modern GPUs is negligible","sha":"30269e5bad208975d6d1cf43cd414563befc530b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-15T18:03:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Dont always assume framebuffers exist\n- TODO: Use temporary renderbuffers for these outputs","sha":"c9268687587e710080249383274cd12b20411144"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-16T21:52:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Zcull refactoring and vulkan implementation","sha":"680ca1d12a7c54de1762a430d4467afe9e3a8270"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-17T21:51:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Implement overlay shader passes\n- Implements vk::overlay_pass and vk::depth_convert_pass\n- Also added a sanity check in RSX core for depth replace shaders","sha":"ccc0383f75bd9a46bc62d6f99baae5d8ad1aa1c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-18T10:02:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"fp32 precision on GPUs is embarassing\n- Division seems to suffer from drift easily on GPUs due to limited precision","sha":"5cf2d774f3406e98f9cac6972ff18ed473886468"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-18T13:10:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reimplement depth <-> RGBA reinterpretation code\n- Implements proper channel order for fp24-ARGB8 conversion\n- Takes swizzle remap into account when reconstructing source bytes","sha":"de5a4fe083807f9dcccc6a4bb45fe10d21fe2aea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-18T14:23:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix face winding\n- Face winding is always calculated based off the top left corner","sha":"07fe5f87ae6beef327daab9ae1e0a3cf76703610"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-19T17:11:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: improve depth/color contested memory allocation heuristics\n- Needs more tests to prove correct behaviour","sha":"51891039ddfba659380061ffdbbd08e7c05332db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-22T14:37:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: More tuning for depth/color buffer selection","sha":"3bfdcf698df6adfc9926b091da50eb1f5aeec1a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-22T14:38:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Do not apply input mods to all types of inputs\n- Temp registers are confirmed to be affected\n- Const registers are confirmed to be unaffected\n- Varying inputs are not confirmed yet","sha":"4d75e986470cf6e82206bbe2f9a1316280f07ffe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-22T15:45:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Avoid null deref","sha":"75d0ff177d4a618491475466f218f2ddf909ef12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-24T13:45:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture cache hotfixes","sha":"145ecb00fc6d291b0092f769429c786b428b67a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-24T20:57:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixes\n- Discard intentionally invalidated framebuffer resources. These are created after a flush has happened, forcing reupload since contents cannot be guaranteed (strict mode only)\n- Fix for blits using vulkan; dont use the copy method if formats do not match, use generic blit instead","sha":"ddebc334bf5d6bbd0009730855641e6534a16aa2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-25T09:13:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixes for framebuffer setup code","sha":"3350e7ee559afc83c434754a4180bd9064de6fd7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-26T10:26:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Compliance fixes; vkCmd state affects currently bound descriptor set!","sha":"89bc3332950ec22ebd27c86ee27cea4464572317"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-26T12:15:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Changes to surface pitch handling\n- Zeta pitch is ignored by real HW for some reason\n- Monitor ptch value changes as well since they may affect disabled surfaces\n- TODO: Verify if MRT pitch is really taken into consideration","sha":"da1e97618b2508f8309bcf14d9d3ef8c17e351a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-26T12:51:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Discard queue if RET is found without CALL","sha":"90a3f3af3064deafbe0813bd1e9e522522063e12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-27T20:05:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: method register fixes\n- Fix VERTEX_DATA_3F_M element alignment (its 16 bytes per attribute)\n- Fix DATA_2S_X interpretation type. Its signed 16-bit unnormalized (s32k) and not signed normalized (s1)","sha":"17340c44cc8f3c75b61baf740c75001204401df9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-28T10:53:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix texture cache memory usage statistics","sha":"6c9c300fe030f2bbda180a77dcbf13d6e31118a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-29T14:05:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Minor wcb tweaks","sha":"9d27ac359b9b9112439df8118166fc14135a7fe9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-29T16:08:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: wcb scaling fixes","sha":"08b829dc22b67dc502d14896f671de6dc08679f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-29T16:09:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Reimplement PK(X) and UP(X) opcodes. The read back values are obviously in normalized range\n- Confirmed with a GOW shader which writes result of UP8 to BGRA8 output","sha":"a18ae0f6ac313a35945ccf4d9e7d1d1089af40d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-29T18:17:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Do not clear non-existent surfaces","sha":"44e34064de1da800baad19e6782ad09bc4041d59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-30T18:47:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Implement register gather (only for UP(X) instructions)\n- Workaround for temp register aliasing between H and R variants\n- TODO: Implement temp regs as 128 bit-blocks with r/w as pack/unpack","sha":"fe9090bd3949f5d5362bc13ecf72a27746559906"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-11-30T18:50:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Implement rgba8 -> fp16 casting pass\n-- Is this actually necessary? The two format are binary compatible","sha":"bec6c1a9392c36c01c262bdd883e8d4245356f6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T12:57:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Properly implement PK/UP instructions based on NV_fragment_program documentation","sha":"896c8991de627593619d57fc2a89d7cfc1a17dbd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T13:07:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-01T18:00:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: Better handling of inter-format data copies\n- RGBA8->RG16 does not require special instructions so the overlay pass is disabled for OGL","sha":"3fbc960c44403e9dce363941b07bf1aeadbc2937"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-30T20:13:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-12-01T20:28:06Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Input/MMJOY: handle Axis and POV capabilities","sha":"c870bbb8858c64049a1c566b5adcdca653d59673"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-30T23:06:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-12-01T20:28:06Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Input: Fix filter button for evdev and DS4","sha":"c077426e95cd217ffad01cd60d9771f7fda30b94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-11-30T23:37:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-12-01T20:28:06Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Qt: Fix SettingsDialog crash introduced by removal of groupboxes","sha":"7165001b68f29b57a879c3a349a968b92d9dd98e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-01T09:16:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-12-01T20:28:06Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Input: improve evdev and mmjoy stick input","sha":"2ec4f66427f2fd4b3b32cdf65e73a0a07da42e64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-01T09:18:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-12-01T20:28:06Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Input: handle MMJOY reconnection (pad still needs to be online on start)","sha":"8f314c5101791c60e74eac7fa8bf5f81f9a7e767"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-02T09:36:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-02T09:36:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_net: Force AF_INET","sha":"bfb3144f3476d1367da0fd9012e6475a0e6b9603"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-02T12:13:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-04T15:22:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Explicitly insert global functions.\n- Functions such as pack/unpack ops must exist before the shared gather functions are declared","sha":"cdd4fd98670ed9df3a8b17075324867a41bac23e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-02T12:15:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-04T15:22:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx:: fixes for framebuffer setup\n- provide a DSV if depth and/or stencil testing is enabled","sha":"960f26f84e753938519514f8dea1910dc6c1aa7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-02T12:19:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-04T15:22:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"d3d12: Fix fragment shader compile","sha":"f5145943b2ca9ebd480c75fee9eaaf33016582fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-02T15:20:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-04T15:22:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Program cache fixes\n- Reorganize storage hash vs ucode hash\n- Scan for actual fragment program start in case leading NOPed code precedes the actual instructions\n-- e.g FEAR2 Demo has over 32k of padding before actual program code that messes up hashes","sha":"90c2324e47c979122a7c38f2a3e29e2accd9d6bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-03T05:31:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-04T15:22:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vp: Decide default return values in case of undefined attributes based on location ID\n- Different default values should be returned for different attributes","sha":"9853027f7278cd1ffc08f0f55c9ee2b5f6264980"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-03T06:43:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-04T15:22:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Properly fix DATA3F_M register alignment","sha":"970d2a06e09b2e45dc65ff6e074baa0a7538ecbf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-04T20:59:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-05T12:53:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: implement compatibility column","sha":"03814e8d0203626aab2f4dd6852d0429c3baa0da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-03T21:54:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-05T12:55:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"savedata: avoid passing vm memory to fs::file","sha":"d8ae94df5b83b4e85d858745ec41ac4ad925e07d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-04T16:30:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-06T09:55:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reimplement invalidate_range_base_impl\n- Avoid unprotecting memory until just before we have to write the data\n- Avoids race conditions where the caller thread takes too long to enter the second phase and another thread accesses the \"bad\" memory","sha":"a2b4cf22b5697b4c5e2e539a04ae33eae1c1d014"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-04T21:33:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-06T09:55:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Framebuffer setup fix\n- Stencil flag is meaningless if surface does not support stencil","sha":"69eb483089e66372834fec55a7c49e654009afa0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-05T11:02:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-06T09:55:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Narrow the race condition window further\n- Needs aliased paging to be implemented to fix properly or a re-entrant global IO lock","sha":"0b3fbf1d4cc793d25819d642ac00084088fd0016"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-12-07T07:31:18Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-08T11:19:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: fix image_in swizzled texture crash","sha":"d0013679c09b2e5a36e9ac7b56d785e54b278c0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2017-12-07T17:53:03Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-08T11:19:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ds4: fix led on bluetooth","sha":"d7881c671464af8d0b2ac71c3fc3e34d4e762501"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-12-08T21:47:49Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-12-08T22:46:19Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Version adjustments","sha":"6b323d7e2e78d6b5b14eb13f00bcf04d742ec321"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-12-08T23:53:05Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-12-08T23:53:05Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Hotfix #3919 (#3920)\n\n* Restore GIT_BRANCH\r\nRemoved by mistake on previous commit\r\n\r\n* Fix commit count on AppVeyor builds","sha":"60f5929f811e073bbef1f0a4398dd6ade6371ea3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2017-12-05T05:32:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad335"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-10T12:19:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"disasm: display db[x]cyc","sha":"3aefd14b3d7dc6718b7ec24aadca493a00ec39df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-11-30T20:55:26Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-10T12:48:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add const and ref for loops","sha":"b4a97c99d8868cb2434d1602154656de754cfafc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-12-01T20:11:06Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-10T12:48:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Spaces to tabs","sha":"50f2be57f765b9282d4c27d1b0bd42925b27d918"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-12-01T21:51:00Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-10T12:48:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove redondant \"virtual\" keyword when \"override\" is used","sha":"c2ae7ee4024ef1a3f9d8cc95dfc4cdb048735589"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-12-01T22:47:05Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-10T12:48:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove std::move on a const variable","sha":"42c2df877fade84d06875e601390e9815f83b37e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-12-02T20:34:21Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-10T21:36:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add new functions to cellSysutil","sha":"6e9b064a0ff2ca4e50c2f67fcb2e29affa28ad87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/550290?v=4","date":"2017-12-05T23:10:35Z","email":"janisozaur@gmail.com","login":"janisozaur","name":"Michał Janiszewski"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-11T17:25:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Ninja","sha":"a1fa10ac70446ff5f4e0ba77068752bdbd0549f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-12-10T23:48:26Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-14T16:02:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add OpenSUSE building dependencies","sha":"04d6c80da532d15b665a1677b35766c24ca69802"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-12-10T23:51:08Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-14T16:02:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update to qt 5.10 on linux, Fix issues with Qt's new installer","sha":"a122924c8e6ca3bae0f1997a88044ede168a9de3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2017-12-16T00:03:49Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-16T00:03:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"various memory access violation fixes (and friends) (#3930)\n\n* various memory access violation fixes\r\n\r\n* Another fix, for motorstorm demo\r\n\r\n* Better stub cellGameUpdateCheckStartAsync and FinishAsync, Fixes #3934","sha":"17bfb3beaf1d2b67348d9258bfe2c5e32d5b4db6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-07T09:09:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement delayed swizzle remap for blit engine resources\n- Fixes remap vectors for memory copied via blit engine as it has no context","sha":"ac0022483ae92ddd82d95e90b28728aa6a87e985"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-07T12:08:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture cache fixes\n- Handle blit resources in a more consistent way\n- TODO: Handle some corner cases (piyotama)","sha":"95966a467e232f0f4c4b337927bd668d6a031925"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-07T12:40:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"fix linux builds","sha":"6dfe32c6d2a76ca84da2a6125a755eebd2994a74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-07T17:46:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix RGB565 blits. Data is byteswapped on input\n- Fixes messed up BG on retroarch glyphs","sha":"3338fdb9361f9c051e63f22de2fc11a610b6928c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-07T21:37:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor fixes\n- Abort nv406e semaphore acquire if the rsx thread stalls/crashes\n- Fix texture size approximation to take mipmaps into account. Fixes some games hanging with WCB","sha":"ff0f1510e5fbd50ea5214c75c533a686bf0e9e68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-08T09:48:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Framebuffer setup fixes\n- Sometimes square renders are done to surfaces with pitch=64 and re-uploaded with swizzle scanning\n-- This setup avoids discarding targets if they are square and pitch == 64","sha":"7c7cd4153efc1b5a0a39553446e9a44a108ef03b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-08T10:13:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/cfg: Lower the default scaling threshold to 16x16","sha":"71c8885678886563fe030ad965cf2a64ca497c96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-09T09:21:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: framebuffer textures do not have mipmaps!\n- Force mipmap count to 1 if sampling from an RTV/DSV\n- TODO: Better wcb flush detection, it should be better to re-upload the texture after it has been dwnloaded if expected mipmaps are > 1","sha":"6891323c18590cfe54f993a587500650523e4627"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-09T10:14:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Pause FIFO queue when changing ctrl registers","sha":"0d0821e914a2c9ea741c19152813c7277b30bc81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-09T20:08:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement variable point size","sha":"b1a1c0251f988ef10320766a2a3154c8cbcc2235"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-10T22:01:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Stuff\n- Implement BEM\n- Add LG2 to special instructions","sha":"6f8dd20f03cd5c9260676551d3d0d53f75e7d8a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-10T22:34:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Implement TEXBEM (untested)","sha":"f7c52d3bb7122a39135bc4ac86a792945b42248a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-11T08:37:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Implement TXPBEM","sha":"e89a035e8b685b43612fdc0be77a3db6f5a48f02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-11T09:03:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Hotfix for TEXBEM/TXPBEM","sha":"4e80858beda177c5d58d44ed92bc2d3b3fffc5b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-11T14:44:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Update FragmentProgramDecompiler.cpp","sha":"7dd349ae8e274e9f382722ffc26ea10d3b976c10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-12T20:29:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Fix typo","sha":"47060cdc5fe1f54db635bd8e8d040163982ef63e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-12T20:35:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T07:45:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Raise semaphore timeout duration bacause some games are very slow","sha":"de5dab35e0b39d76bfc34ddd67a7b99e0db1cc77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-05T20:48:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-19T21:04:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RSX: remove SSSE3 dependency","sha":"61de20a63333395801747a7947930daa9f0d7ab0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-09T14:57:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-19T21:04:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: remove SSSE3 dependency","sha":"4aee4ed6d7a110faa1d4d80a1166d1fbc71a3008"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-16T00:19:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-19T21:04:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: add some AVX-512 variants","sha":"6d34dcd75f90799526884fab05f8e410c68dd5b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-16T00:20:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-19T21:04:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: reorder some instructions for better throughput","sha":"d3198ddf60929bb3954c4fd1edf64f07a64da42b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-16T00:21:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-19T21:04:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: redesign LVSL, LVSR instructions","sha":"140a581d2364e029022a81675ac4343fe92e1b00"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-16T00:22:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-19T21:04:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: rewrite VMHRADDSHS without SSSE3","sha":"1ae8850b3f32a8406cb5effa03746b4b7c7a4073"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-19T21:01:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-19T22:21:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: remove SSSE3 dependency","sha":"83da7f9b63c5fcdca87a0051a8ef2e6f63632b9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-19T22:21:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-19T22:21:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fixes","sha":"f24491de84fd5c0edb73ad876d9b1c3cef5da1f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-20T19:10:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-20T19:10:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Pass TRAVIS env var","sha":"a08e79f4267b5e9fab82949a5f011eb40aca76b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-20T21:40:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-20T21:40:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix travis","sha":"a285409f59dbfce872c5bfeb84f35e78ac918c44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-01T13:21:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-21T14:42:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Input: improve MMJOY settings dialog / change threshold behaviour","sha":"6891371a79980ef35f47a94da4ee164d1929794d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-01T15:03:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-21T14:42:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Input: improve evdev settings dialog / change threshold behaviour","sha":"114dd2a723da4472b76536429cd823341f82ba26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-02T10:45:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-21T14:42:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Input: evdev fixes and first rumble implementation","sha":"2dd8a1afdba17dfef1190fea56edec12e6dcf87a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-02T18:15:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-21T14:42:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt/Input: implement mouse button mapping / improve keyboard","sha":"69283accd0fbae7c8d6f8bd4a738ce78ce70872c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-03T17:30:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-21T14:42:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Fix icon size actions","sha":"1b13b94095d24feba4461aac3c5071861ccc9cf5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-03T18:16:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-21T14:42:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Input: fix evdev directions, sticks and rumble\n\nminor style fix","sha":"8eb8755aea4d680f20b4c877e654f564aa76f611"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-10T09:41:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-21T14:42:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Input: Fix connection count\n\nand some minor commenting","sha":"106de04485709e4e3eff3c69215067ac6300b04d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-12-21T19:48:21Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-12-21T19:48:21Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"_sys_process_exit: Fix logging (#3963)","sha":"5e04a5f21ddf4fe38fbcfe409e8f06ae0b8e9a94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-21T19:43:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-21T21:26:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Input: fix initial DS4 connection (regression)","sha":"e9364bd87b55bf8d3a3bc3034d8f2d27730ec90c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/32562725?v=4","date":"2017-12-21T23:55:21Z","email":"32562725+themitosan@users.noreply.github.com","login":"themitosan","name":"J. Chiavelli"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-21T23:55:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"New themes for RPCS3 (#3741)\n\n* New Dark Theme for RPCS3\r\n\r\nA new dark theme for RPCS3\r\n\r\n* CSS Fixes\r\n\r\nSome errors have been fixed when you use the emulator on windows in high contrast mode and another small fixes.\r\n\r\n* Update Darker Style by TheMitoSan\r\n\r\n* CSS Fixes\r\n\r\nAll px's was converted to em and the pad settings dialog was fixed.\r\n\r\n* CSS Inprovements\r\n\r\n* Fixed all the broken buttons by removing the border-radius style. For now i will leave this part until i find a better way to implement this kind of style without messing up with everything;\r\n* The memory viewer colors has been fixed;\r\n* Now the QWidget has a lighter color to highlight the gear;\r\n* The slider (Game List) now is transparent... Again.\r\n\r\n* Minor update\r\n\r\n* [WIP] - ModernBlue Theme\r\n\r\nThis is a new theme for RPCS3 inspired on OBS Rachini theme. As the title says, still WIP, but i will improve it soon.\r\n\r\n* Final Changes\r\n\r\nWhat I really wanted to do unfortunately (at least for now) has no way. I was looking for a way to give the buttons a new look by using the 'border-radius' rule, but it ends up breaking the general layout (a good example is what Megamouse said about the pad dialog).\r\nI tried to fix these problems trying to change the width of some elements but even then it was not responsive / good. That's why I gave up (at least for now) to change these parameters. I decided to give a new aspect to this theme, slightly darker but without losing the essence.\r\n\r\n* Extension fix 1/2\r\n\r\n* Extension fix 2/2","sha":"cb627a6bd7937348d9aacf908522f289ceca09eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T09:02:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-22T17:08:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"c++ is hard\n- Remove unnecessary const definitions","sha":"4a0c4259f03980e79c69f53433328da81c3802f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-18T09:23:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-22T17:08:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Fix alphakill","sha":"320fb5f94c936d10b7aa644b95a207fcba10be41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-19T12:37:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-22T17:08:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: fix initial swizzle ordering for render target data","sha":"d6bc6ec2c1ef98efcef60ca8a68625445e60a962"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-20T08:47:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-22T17:08:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Modify semaphore_acquire timeout detection\n- Take paused state into account\n- Make timeout configurable","sha":"4819847c46bcfb4239a39552f5e895ea72533fe2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-21T13:27:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-22T17:08:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Tweaks to sampler state fallback paths\n- Make all texture access on non-existent textures return 0\n- If border color is closer to 0, then set alpha to 0 as well (might break some corner cases with alpha test)\n- Zero initialize null sampler","sha":"8b31a9448ad049b6446fd4ec338d01991054b3ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-22T16:03:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-22T22:01:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt/Input: fix numpad (regression)","sha":"58d8d126655f50f920e3afde47d63bec96a5e685"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2017-12-23T19:18:55Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-23T19:18:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Reset initial seek position in MSELF files (#3977)","sha":"a6208d2bd77ad67a3e3674cb5e75329b36a86807"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-23T11:28:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-23T20:27:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Input: evdev: add positive axis list yml to handle 0+ range sticks","sha":"8a3759f479e0f19610495f47a891516a14192b72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-24T14:47:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-12-24T14:47:36Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix cellPadSetPortSetting (#3980)\n\n* Don't skip setting port settings when no controller is connected\r\n* DS4: fix error message","sha":"fc2ef5529d1381e1239332ab5ee4c9cedfcbf6f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2017-12-25T11:47:28Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-25T11:47:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Set lv2_socket id_base (#3983)","sha":"3cf0fb60a45ffa9750617ca16a2546dbc6dc3ccf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-25T18:06:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-25T18:08:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix primary stack size","sha":"0a89f1db393f327bb3be27c599f122e36b2ea7c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-25T18:07:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-26T23:51:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: minor additions for AVX2+","sha":"39a3ed2d035c6b917d2347e667d19c219c257162"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-25T18:08:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-26T23:51:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix lv2_socket id_base","sha":"a60591972952ba547400527811334fdbc941f33c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-25T20:14:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-26T23:51:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove /app_home/ dependency\n\nShould also fix exitspawn","sha":"e768bdc80f8c301db49c76146839d60d9acb97b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-28T23:54:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-29T00:09:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix game category issues\n\nFix cellGameDataCheckCreate2 PARAM.SFO\nFix trophy initialization for gamedata (game patch)\nImplement psf::assign\nPotentially fix cellGameSetParamString","sha":"14929a14977aec3f2fd71fc3c7c021baafe74f70"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-28T23:56:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-29T00:09:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: minor addition for CFLTU, CUFLT","sha":"f271b650dae204b7460b7013ab10fa19adfde3d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-29T17:04:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-29T17:04:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellGame: don't write empty TITLE_IDs in PARAM.SFO","sha":"e836c33f372bbec95f45409f8f133ac8af86868d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-29T17:04:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-29T17:04:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Trophy: check both bdvd and hdd locations","sha":"a92bf39efa1c634d8a0b94335d8f52bb5d627edb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-29T17:05:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-29T17:05:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Warn about corrupted PARAM.SFO","sha":"78f7020ce60f471033c402016dbfecb5cad48c54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-31T01:43:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-12-31T01:43:56Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Qt: fix compat list sort (#4003)","sha":"90f825aa4986971d57e4e65c1f1981c79780f6fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-28T12:46:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-31T09:43:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Remove flag test optimization as it does not work properly\n- Most texture cache operations will break sampler state and the extra complexity is not worth the very small speed bump","sha":"688569e5c884efd809c5f710cd1bad1b9c9569cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-28T17:07:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-31T09:43:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Synchronize access to queue submit calls\n- Should prevent concurrent access on the present/graphics queue","sha":"4872be9de3fbf315c5ecaf09345874b8857cfe34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-29T16:57:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-31T09:43:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement depth clamping","sha":"d496dbecadbdcc5945482ca434f6e70822a1c755"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-30T09:30:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-31T09:43:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Invalidate surface configuration if stencil state is changed\n- Stencil state afects validity of a depth/stencil surface same as depth state","sha":"55c324e062e068682740e823869d25220108c3db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-31T07:08:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-12-31T09:43:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Workaround for nvidia linux\n- For some reason, using 1.E-x notation does not work on nvidia linux. Could be a bug in spir-v generator or the driver itself","sha":"1ea5e7404af33871a085a0418364d102a6b81fc9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2017-12-31T18:54:30Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2017-12-31T18:54:30Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Travis: Pass verbose to Qt installer (#4008)\n\nAttempt to see what's going on with Travis, as it has been failing randomly for the past days","sha":"6baba2875dcf55bd2f220e2fd656ada1182079dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-31T12:45:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-31T19:08:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: use shared jit_compiler instance\n\n(Linux) Fix deregisterEHFrames error message","sha":"d40aaf03910283ed755c42429d9beb47535ace9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2017-11-20T13:08:35Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-31T19:08:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Trophy: Return correct disk space requirements\n\nCloses #3763","sha":"489ded43b170c0738926204d5abdcad566bfcec0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3116769?v=4","date":"2017-12-12T14:45:49Z","email":"lewis@lewmpk.uk","login":"emuplz","name":"lewmpk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-31T19:08:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fix clang warning: logical-op-parentheses","sha":"d64e79bd9f7e24bfecbfe2c881372307cb5e6802"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2017-12-24T00:34:48Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-31T19:08:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"MsgDialog: Add SetMsg() for changing main text","sha":"7c64c2f703662a8dc5247b94062a719c735a1711"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2017-12-24T00:35:45Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2017-12-31T19:08:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"[gui] Show total number of llvm compilation dialogs\n\n- Doesn't account for dynamic libraries loaded after the fact,\n  but usually good enough since\n  1) Those aren't even present in some games\n  2) They usually only have about 1 or 2 fragments (dialogs) each.","sha":"383c501a3560b3eb079511f7144ac12611fcbff4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-01T07:40:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-01T07:41:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix #4005 regression\n\nDelay unregister EH frames (Linux)","sha":"198e9dce1d8ceea61226d5806e52d6a39e5fa8c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-01T08:43:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-02T18:17:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Robustness fixes\n- Track last working state and reset to it if RSX starts to desync\n-- This is especially useful when running vulkan since the renderer will easily outpace the rest of the system when merely recording draw commands\n- Ignore empty sets\n-- Mark empty/invalid IB sets as having 0 element counts.","sha":"ee009ec99c976ff6663419dee3835d0f4d3e6262"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-02T21:44:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-02T22:04:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add Start Threshold parameter (ALSA)","sha":"7050575fdb023181a35ff0c7912191f78040df0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-02T21:45:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-02T22:04:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve Restart function\n\nDon't erase boot args\nShould now work correctly with game launchers","sha":"af3e1fc58012ee1408aeefb9732cfec5faad3fc0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-02T22:03:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-02T22:04:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: rewrite ROTH (AVX-512)","sha":"83b541ea9dde745cbc37edfcbf32a9793209000f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-04T23:41:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-04T23:41:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: implement simple find dialog for logs (#3941)","sha":"19d181fa4c5d7493935cf6ca254c525ab273cc41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8276932?v=4","date":"2018-01-05T23:24:45Z","email":"smartychrisje@hotmail.com","login":"TGEnigma","name":"TGEnigma"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-06T00:45:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix debug build","sha":"d770a42349b3a7ca1b8b7ed3e672a8c3d45f0a1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-01-06T13:02:20Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-06T22:26:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":".travis.yml: set git depth to false","sha":"32468adb531ed97b9ba61bbcdf4fe0ab605d1bfd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-01-08T05:59:15Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-09T00:56:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Better stub cellGameUpdateCheckStartAsyncEx/FinishAsyncEx, fixes PAIN","sha":"8ee0ed84e496ed331584b37264b677c11e8f40f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-01-08T20:37:40Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-09T00:56:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Also stub some similar cellGameUpdate functions","sha":"4231ea2eb6c8130d38e8d36533c300a6b3c6b43e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-23T21:25:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-09T23:17:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt/Input: Introduce profiles","sha":"51a2b43d8195622328a30667c2b0662c8dc4fe65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/208340?v=4","date":"2017-12-31T15:33:43Z","email":"greg@unrelenting.technology","login":"unrelentingtech","name":"Greg V"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-11T09:26:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Add support for Vulkan on Wayland\n\nThe variable VK_USE_PLATFORM_WAYLAND_KHR is actually used by the Vulkan\nheader, so use it here too.","sha":"fbceec47b84c16d73ab53188ee33e504fbbb0808"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-09T14:41:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-11T09:26:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix windows build","sha":"5959411aeb204fdccf2798040f29a9906527d4e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-12T23:50:06Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-13T00:36:28Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"GUI/Themes: Fix GameList Icon Backgrounds\n\nCurrent approach was incorrectly using the background-color property instead of color.\nUsing transparent color, allowing for the icon's background to be the theme's background works with darker colors, as PS3 game icons are generally made for these kind of backgrounds.\n\nApplies to: Kuroi, Darker Style, ModernBlue","sha":"fb3dee0f3e6aeb389aee67fe3aad99a2f6d2e22c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-13T00:18:17Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-13T00:36:28Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"GUI/Themes: Fix GameList Toolbar Icon Color\n\nSimilar to previous fix.\n\nCurrent approach was incorrectly using background-color instead of color.\n\nApplies to: Kuroi, Darker Style, ModernBlue","sha":"c951601fa4a45502c561850cbfdf927cc1c23276"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-12T23:55:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-13T18:48:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Input: init pads as disconnected\n\ninlcudes simpsons \"hack\" as comment","sha":"9b4868f0170f1628fb7b1158d4ab4173e8093004"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-27T10:01:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-13T18:48:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"improve cellPad\n\nfix input regression and fix input for FIFA games\nfix input in NASCAR [BLUS30932]\nfix port status query -> disconnected devices don't cripple following devices by decreased now_connect","sha":"155f7a7d766b7969cc6bcfa6c97e4a44038a4079"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-12T11:35:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-13T19:38:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix register editor\n\nand remove a windowhint (?)","sha":"fbde1818a22b7029aa2b1dc20b03790a94256d10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-12T15:58:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-13T19:38:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix CurrentSelectionIconPath()","sha":"ef6a36241ea1c2bacb839a9270eefa16278274fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-12T11:33:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-13T19:38:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"handle some warnings","sha":"2053de08856a7cf44dfa865f195aa7c9a588aa0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-12T19:19:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-14T14:58:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"update vulkan submodules","sha":"d5c879e8e710b987685a3ae7697fb4b3cdca6cc8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-01-11T13:05:17Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-14T17:50:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: fix image_in arg and swizzle fix","sha":"ac53fc54dcec507b34de8659e153f8d3f517632f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-01-11T13:11:28Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-14T17:50:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"d3d12: fix invalid framebuffer crash and shader compile","sha":"c5074ba81fd0dadae79b59f405e0da917db4849a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-01-11T13:32:09Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-14T17:50:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix depth clipping","sha":"7ca2c444cc8f0d78b229a037f832e0c70edfc5ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-01-12T10:16:05Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-14T17:50:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: add log for potential source of error","sha":"0477f8ed3c23c58e5ffd25c478448fc0852b2fb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-01-12T23:18:57Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-14T17:50:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"cellGame: cellGameDataCheck arg validate","sha":"d216398596ddd9979529118295bcb9a28c27aa51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/208340?v=4","date":"2018-01-14T19:16:06Z","email":"greg@unrelenting.technology","login":"unrelentingtech","name":"myfreeweb"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-14T19:16:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Detect Vulkan Xlib/Wayland surface support at runtime (#4048)\n\nDetect Vulkan Xlib/Wayland surface support at runtime","sha":"15d0bdb7cfd35b66b82de5cf25176b2d90197d7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-14T16:56:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-14T19:23:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Qt: handler zero-width columns in gamelist","sha":"14ddeb07a576ecebfa9e6b56bf2c35e68e87bc97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-14T19:16:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-14T19:23:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix \"cellGame: cellGameDataCheck arg validate\"\n\nFixes #4058","sha":"435ea8d55379a887442916ff309c6f1e28fc9652"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8276932?v=4","date":"2018-01-15T16:23:36Z","email":"TGEnigma@users.noreply.github.com","login":"TGEnigma","name":"TGEnigma"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-15T16:23:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Add option to disable on-disk shader cache (#4041)","sha":"28a96f15437f975a17707bfe6d44b3ea3bb1db60"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-01-15T19:44:03Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-15T22:52:07Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Update current firmware version","sha":"ec41483e9bf07a7114392fe109fd69a6a9d02132"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-01-15T12:48:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-16T00:34:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Allow reading of the RdSRR0 channel\n\nstupid bug","sha":"5848864f559550be0ff243b77049d6d3e677a1c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-01-15T13:18:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-16T00:34:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Allow writing to the WrSRR0 channel","sha":"24e97b9e0371cff8ba2efb9829d32360d9de0b90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-15T23:15:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-16T01:05:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix deadzone preview size on high dpi","sha":"c5755b3633c5a014ef553cfe5731716211175ec0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-16T13:07:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-16T20:43:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt/Input: enable XInput configs with disconnected devices","sha":"d6c4d8eec0740d8f412d0308e9c04d7cb410e893"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-17T01:23:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-17T13:23:51Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Qt/Input: use name_string instead of hard coded strings\n\nhopefully prevents any more need for fixups like this lol\n+ tend to some warnings for rebase","sha":"7aa1707c2c0c16c99492c5f4a38d15a997585a6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-01-15T18:16:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-17T14:16:13Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"[GUI] add commit hash to game panel if not master\n\nalso cleaned up game id","sha":"ff26bf411b02a34b27d5883608021cf08f0135f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-01-15T18:16:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-17T14:16:13Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"[GUI] remove the letter v from the emu's version","sha":"cc02ef64a524a8c8b2bf2093e60f85d244094ae5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-01-14T23:31:26Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-17T15:17:06Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix #3950","sha":"34c49c77b26acb9338bbd8e74568af1851918c9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-17T16:14:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2018-01-17T16:14:00Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx/overlays: Introduce 'native' HUD UI and implement some common dialogs (#4011)","sha":"71f69d1d483efecdc224a70a1c74c5ca56d80c67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2017-12-28T21:38:29Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-18T14:40:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve cellSearch implementation","sha":"fbac1c304a1737537395a3f9638b5b4d1fe4e8d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-18T14:59:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-18T18:18:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Qt: remove obsolete and faulty m_icon_color. RepaintGui does it already\n\nalso remove some unused headers","sha":"42f56e357c0733cff4f45bd21baff157b82da60f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-18T17:07:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-18T18:18:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"RSX: properly handle disconnected pads","sha":"d238791b7d909cf13efff905ed8e7872fe9dbeac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-01-18T20:56:32Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-18T21:38:32Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"[Travis] Update urls to retrieve glew and vulkan deb packages","sha":"54fbde0de162e281896f35d9b629075770488565"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2017-10-21T11:21:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-19T09:03:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"cell/scheduler: Manage thread placement depending on cpu hardware","sha":"cbc8bf01a1b7cd87c1b67782237d558806d41773"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-15T19:28:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-19T09:03:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Synchronization improvements\n- Always flush the primary queue and wait if not involking readback from rsx thread\n-- Should fix some instances of device_lost when using WCB\n-- Marked remaining case as TODO\n-- TODO: optimize amount of time rsx waits for external threads trying to read","sha":"9ec23371927a87813518896b11632202d43fd5df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-18T10:14:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-19T09:03:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"overlay: Fixes\n- Add fallback fonts including attempting to find glyphs in dev_flash\n- Fix vulkan hang on startup if icons are not present","sha":"1a6e53ec98fc14e93a865a09bfbce2f859af5f75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-18T12:06:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-19T09:03:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl/vk: Simulate z clipping with selective depth clamp\n- The scale offset matrix is fine but on real hardware the z results seem to be independent of near/far clipping distances\n-- If depth falls within near/far, clamp depth value to [0,1]","sha":"0a2992839bb6f402f8b6814cd114ff6a734a8140"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-18T13:59:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-19T09:03:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/texture_cache: Remove hacks; it has been proven that in offsets are in x16 fixed point","sha":"6828fbf6580fcd97dc1f00a0acd2489c573e61ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-01-18T06:08:51Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-19T09:44:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"install icons to /usr/share and load them from there","sha":"49e64b9e82c4926c1d1d48ea7cc4ff11523de5cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-01-19T15:17:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-19T23:32:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU/MFC: check for sync command before doing a list transfer\n\nfixes #3828","sha":"f908daf323176789e089c777168835c1eb9258ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-19T09:19:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-22T08:43:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk/gl: Preserve clamped z precision to some extent\n- Use edges of depth range to map clamped stuff\n\nDisable range compression on regular draws vs extended range draws\n- Some applications require full 0-1 usage without compromises.\n-- TODO: This leaves the extended range z values to fight with regular draws in the .99 - 1.0 range","sha":"743928b3794a53668ccf5ac2a347ffd027af22e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-20T11:37:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-22T08:43:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture format fixes\n- Implement low bit decode override flags for 2-component textures\n- Properly implement alot of texture remaps according to the autotest results\n\nrsx: Do not unnecessarily shuffle WZYX->RGBA unless we have proof\n- From looking at format swizzles, this is incorrect","sha":"fcd702c8a624491f0b5ad35d73e7e6969b90b5a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-19T11:32:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-22T08:43:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"scheduler stuff\n- more threads for rsx\n- better 1600","sha":"ab17b49e15a6f293b2f9113aea3806d04df0bc55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-21T15:31:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-22T08:43:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl/vk: Fixes and optimizations\n- opengl driver optimization for nvidia. On nvidia glTextureBufferRange performance is horrendous\n-- Initialize texture buffer to whole buffer at startup and use absolute offsets to read data instead\n-- Over 2x performance in some cases (Resogun, TNT racers)\n- gl/vk: Do not flip non-existent display buffers. Fixes spec violation at boot in TNT racers demo\n- whitespace fixes for sys_rsx","sha":"3d9e3a16f1d2aee7ee5437b911692109709e1887"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-21T20:55:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-22T08:43:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Minor fixes\n- vulkan: Do not assume an aux frame context must exist in a well defined state as set in init_buffers() since the request might be external (via overlays path)\n- gl: Do not bother waiting for idle before servicing external flip requests\n- gl: Queue overlay cleanup requests to ensure only glthread attempts touching the context\n- overlays: Do not compute size metrics for invalid/unsupported glyphs","sha":"4f01794713b09bddc51998edd060caf4f1a5e487"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26231569?v=4","date":"2018-01-03T11:48:50Z","email":"Inviuz@users.noreply.github.com","login":"Inviuz","name":"Inviuz"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-24T15:21:24Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"improved hack/fix for cellsurmixer","sha":"cc0d7c5985803316e92fb1bc5a1dd3fae4d0eb35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-01-17T03:51:58Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-24T16:28:09Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"rsx: fix potential hang during thread close","sha":"2f414f96bf9a48c47878e5aff0b9141a11d76b24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-01-24T04:16:46Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-24T16:28:09Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"rsx: fixed emulated primitive restart","sha":"efe6a6cf53540309f059907aae7f765d3c0a1eda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2018-01-18T04:40:37Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-24T17:20:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"hle: Stub function Unimplemented in NpSns.","sha":"a9c26b40dd6e41cd83e4309cfc419dbaae012ef3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2018-01-23T11:08:43Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-24T17:20:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk/ogl: Fix regression for G8B8","sha":"c8965564e4e36476bed441522276d48c94f72a33"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-24T16:38:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-25T21:57:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt/Core: implement max llvm compile threads","sha":"b9c10a186da43f0de2c54af6419a1cd94e1fc9e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-01-26T18:18:09Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-01-26T18:18:09Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Use clang 5.0 in travis (#4115)\n\n* Use clang 5.0 in travis\r\n\r\n* Change clang-5.0 to just clang","sha":"9614fef4b9d027e1be9dbb766ed98ee5cb09df39"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2017-12-31T11:01:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-26T21:57:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"improve cellKB keyreleases and autorepeat","sha":"bb5bdb2e8c27fc766fc557a66a94c3fec8511add"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26828095?v=4","date":"2018-01-12T17:41:56Z","email":"devil0129@gmail.com","login":"isJuhn","name":"isJuhn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-27T22:50:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub some functions in cellWebBrowser","sha":"a27e2db4556e3f9bbe7d1da732ed08fa99d72039"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/35616470?v=4","date":"2018-01-29T18:58:25Z","email":"35616470+ZeroZero2018@users.noreply.github.com","login":"ZeroZero2018","name":"ZeroZero2018"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-29T18:58:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix to B8 format render target swizzling (#4123)","sha":"cd8e97a7c6551e58167095b9a1af4d5a536de74c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26828095?v=4","date":"2018-01-30T13:26:00Z","email":"devil0129@gmail.com","login":"isJuhn","name":"Juhn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-30T13:26:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix native UI save_dialog when there are no saves (#4113)\n\n- Also implements single action list view with cancel action only","sha":"d37aa466ff2125dc52fc1f15410ba895549cb1c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-22T10:07:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-30T18:16:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Implement swap control on linux","sha":"c05d164eee99f017631068fde7752c987930455d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-24T09:09:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-30T18:16:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp/vp: Epsilon value is too large!\n- Original epsilon value was 1.E-10 which nvidia linux driver could not read properly\n-- Restores the original value represented in decimal notation","sha":"648fc92184d8d0fe2d951be73c88ed23de736181"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-24T17:26:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-30T18:16:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: misc fixes\n- Supply explicit options for spv emit allowing optimizations (not yet compiled into the backend)\n- Add epsilon fix to glslcommon\n- Fix shader dialog crash when using qt (race condition)","sha":"2e04dceaf0dfa8d98c8ae7439c65c83a06f65845"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-24T21:09:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-30T18:16:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"glsl/fp/vp: Avoid shader clutter\n- Do not add unused subroutines in shaders unless necessary\n-- makes shaders easier to read and disassembled spir-v has less clutter\n- glsl: Replace switch block with lookup table","sha":"33bcdd476cea0a4c3a8960c4e7666db853bc1e01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-29T17:21:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-30T18:16:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Stuff\n- Remove subpass dependencies; transitions are handled via exicit imagememrybarriers\n- Reuse sampler objects whenever possible; create/delete cycles are not free","sha":"4f7d3e5dc1932e32b682858b70d69c3f536d94c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-01-27T03:56:32Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-30T21:01:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"remove libfreetype.so.6, fixes AppImages for some users","sha":"9d079ede85f797a50cbf01a232b4ece388067b09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-01-27T04:51:56Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-30T21:01:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Install and load icons from Icons in executable directory, fixes local builds using Icons","sha":"70fe0cc2249d00a20f64d2fa8e34e12749159106"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-01-18T19:14:56Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-01T13:19:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add callbacks for cellRec","sha":"f4e5bfbdf7bb50d3e5813f9be886cfbc12d924c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-01-18T19:15:18Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-01T13:19:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add callbacks for cellVideoExport","sha":"68143bc47ca78f30ac604032d0ace0a2b770ff0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-01-18T19:15:28Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-01T13:19:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add callbacks for cellVideoUpload","sha":"2821915eae0be7fb5e019f10a25f0fd00d6e68d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-01-31T16:11:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-02T07:07:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: API compliance fixes\n- Do not assume texture2D when creating new textures\n- Flag invalid texture cache if readonly texture is trampled by fbo memory.\n  Avoids binding a stale handle to the pipeline and is rare enough that it should not hurt performance","sha":"b9cca71c47085b47473909aa47e493a70ca6c51f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-01T07:44:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-02T07:07:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: implement proper texture read barriers","sha":"eeb6e29e391754e41118af076156eb9fa6621ccf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-01T12:11:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-02T07:07:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl/vk: Support for swizzled? context surfaces\n- For some surfaces, dimensions are passed via the log2 bits rather than surface pitch\n-- This is similar to the setup for nv406e and probably means the surfaces are padded and swizzled","sha":"ea8bdda9a30658aebca5869ee04f776be52c75c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-01T14:37:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-02T07:07:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Also discard background if window is too small in vertical axis","sha":"e7537cded5154232fb18b595ede31b3a9a9039cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8276932?v=4","date":"2018-01-27T14:01:33Z","email":"smartychrisje@hotmail.com","login":"TGEnigma","name":"TGEnigma"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-02T08:17:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"core/GUI: Fix null pointer dereference","sha":"55821041bfe5b7d5d5414cc4adb3407f7a784b32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-02T01:54:11Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T02:07:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"removed comments copied directly from appveyor docs, clone_folder is not needed since it's set to the default value","sha":"71c47734fbc2a58ed46b60a39ee91cb5c5fb9288"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-02T01:56:45Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T02:07:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"reformat llvm and vulkan libs fetching","sha":"13b3be3e7f94b6b4bcaaae4e825106751efa1d38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-02T02:05:36Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T02:07:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"reformat and move BRANCH and PATH setting, reformat submodules fetching","sha":"a226524e92cb8535a8e77e5dd786ac14515a8512"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-02T02:20:03Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T02:07:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"version and artifacts changes - fetch latest tag from git describe, use 7z for artifacts in after_build section","sha":"6275636adaefd7f0f33dff302cb49491a45754b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-02T02:22:16Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T02:07:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"nuke after_package, move stuff to after_build","sha":"d322a81bd11e12043ad4d6278a518585663b8184"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-02T02:23:53Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T02:07:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"add openssl artifact using prebuilt binaries from appveyor build env","sha":"6f8e1f648c66addf438d000f9fa1187f61ecd0ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-02T02:28:32Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T02:07:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"download and distribute compat db, cache db in case download fails","sha":"46dd7084f79c740327f1604263075e9d4af24728"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-02T02:30:22Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T02:07:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"update qt 5.9 -> 5.10.0","sha":"3e4d12ccf12bf17bbcb5273fc1fa3a9110b16bde"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-02T04:17:13Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T02:07:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"reformat libs fetching, fix appveyor build with luck","sha":"00cfe003f735a99b056d0a0a4058c4c86dff9052"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-02T22:38:56Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T02:07:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"minor refactoring","sha":"e8bae00f572ba7aea3836ef50361621c046510ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-02T22:41:39Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T02:07:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"package artifacts using 7z LZMA2 ultra compression","sha":"f290555e68c4e21d4fa52979bc472ce7213545e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-03T01:00:45Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T02:07:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"update av build version as late as possible to prevent webhook breakage","sha":"6b95d52ba3bab4747b3b35aa976933912d8f195b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-01-12T22:45:55Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T03:52:06Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Add callbacks for cellPhotoExport","sha":"6001808174e145f5bac47dbb4d53678a195f4be3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-02-03T13:07:41Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T14:07:38Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Add sceNpMatchingInt","sha":"cd9bfba790650e958f7512465a5d574e011af089"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8276932?v=4","date":"2018-02-03T19:50:48Z","email":"TGEnigma@users.noreply.github.com","login":"TGEnigma","name":"TGEnigma"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T19:50:48Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix gs_frame spawning on monitor other than the one the main window is on (#4029)\n\n* Fix gs_frame spawning on a screen other than the one the RPCS3 window is on for multi-monitor setups\r\n\r\n* Cleaned up code & refactored it into a utility function for reuse\r\n\r\n* Qt: take gs_frame's framemargins into account by using showEvent","sha":"f6b0b31e8b6889c9302bbc17a70c6a9078953e00"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/965509?v=4","date":"2018-02-03T02:00:18Z","email":"zeke@zekesonxx.com","login":"zekesonxx","name":"Zeke Sonxx"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-03T20:21:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make fs::dir::open skip forward on failed metadata instead of crashing","sha":"c21fa2d8bc2ecd20b60efee86cce0178864c29ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3586606?v=4","date":"2018-02-04T21:29:56Z","email":"nicba1010@gmail.com","login":"Nicba1010","name":"Nicba1010"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-04T21:29:56Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"appveyor: Add artifact sha-256 hash files (#4148)\n\n* Add artifact sha-256 hash files (for checksum)","sha":"06fc4233d298f40bcc72696164b3055435e217c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-02-04T11:47:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-06T00:09:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"mfc: dont check for one completed command if tag update requast is 2\n\nInstead check only for completed commads tag groups specified in the tag mask ( as real hw does )","sha":"a6fb6c865d5e7ad07398d4cd70a78976fd182ce2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-02-04T11:47:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-06T00:09:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"spu: add a missing STOP code\n\nshould fix #2456\nfor whatever reason, this call accepts only an empty ouput mailbox, otherwise break","sha":"956ae178761eb216d0e27bd8dcd31a65abecda0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-02-05T07:43:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-06T00:09:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: add a missing check in sys_spu\n\ncheck if exit code exists and the spu is stopped by a stop instruction\nand optimize the way were getting the exit code","sha":"5b5f2d4240fd685b674568142bf2ead7112b3c50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-07T02:10:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T17:46:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: 16-bit shifts for AVX2","sha":"84103b69cf5ef4c06aa75ef1d4ab4ef218ddd82b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-16T11:32:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T17:46:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: use XOP instructions","sha":"e2439e962cf4e2875c54901df2aba9af9ff1a522"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-16T14:57:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T17:46:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Handle exceptions at game list update\n\nShould fix #4056","sha":"17ce5d91175769029708e2a60e3ef3ec0e18d101"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-29T21:26:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T17:46:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Handle exceptions at loading patch file","sha":"d66e56392e7611cd1c75523e5feda31942f16b43"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-29T21:31:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T18:10:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Initial cpu_translator impl","sha":"db83113316d98dea18d8743c850c1ff1757bf0c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-29T21:33:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T18:10:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: emit VZEROUPPER\n\nWorkaround dirty AVX high state","sha":"9b9ac3ca62fb22f094dd334eb297de0291e1b2fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-29T21:34:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T18:10:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: rewrite ORX instruction","sha":"74834527eb64d4f8b3cbffe11210d17771181512"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-29T21:37:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T18:10:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: rewrite add/sub instructions\n\nUse new patterns for saturation instructions\nAvoid ZExt/SExt completely","sha":"93c0a0aa35524b8897696082b6b0b97eda536d66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-29T21:38:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T18:10:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: rewrite AVG instructions","sha":"b01e46086315a0c21b6afc366dd5315bd3821339"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-30T19:07:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T18:10:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM submodule URL","sha":"2a4f38959a52426c568a174ff1824c7b39e5bf52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-30T19:07:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T18:10:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add ignore=dirty to hidapi submodule","sha":"3972b176cd4a3fba2ad52b66d875bc62a34d286b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-01-31T21:53:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T18:10:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: minor change to ROTH instruction\n\nOnly AVX-512 path is changed (third version).\nThis instruction is extremely rare.\nAnd the code is probably not optimal.\nSo this commit is pretty useless.","sha":"c7c49ab286c0e2e681bf23a2f18a933655f7024d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-02T00:49:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T18:10:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: rewrite 128-bit shifts by bit\n\nSix instructions changed to use xmm registers instead of gpr.\nROTQBII, ROTQMBII, SHLQBII look better (shifts by imm)\nROTQBI, ROTQMBI, SHLQBI changed for consistency (shifts by variable)","sha":"439a78d12c7006e36f4bcb398ab4b6c83cdce236"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T17:45:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-08T18:10:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Game list: improve deduplication logic","sha":"13aa88c3c4d66ea8799e987f7d762d90943ab17b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-09T12:24:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-09T12:24:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove PSP2","sha":"76be7d40ac5dfdf56788c4ca55fdb56006d60e38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-09T14:49:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-09T14:49:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Clean vm::ps3 namespace use","sha":"cce0ad0c35499697b45b3fd2fbbc5d2fdce19e98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-10T12:57:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-10T12:57:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPUTranslator: add bitcast, trunc, zext, sext","sha":"fa04ff6d90457ee2eb3fb032dbac6fbd0fc361a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-11T16:52:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-11T16:52:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VK: add two options (workarounds)\n\nForce FIFO present mode option is workaround for recent MESA drivers\nForce primitive restart flag should also work on said drivers","sha":"d2652aedd25d1d045573eafbf4be1224f7f64a52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T03:13:57Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-11T21:58:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"openAL: Update to 1.18.2","sha":"372cb39ce81f8a93d3a61316d2f91d64332ad5e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T03:19:52Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-11T21:58:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove unused files (ps3emu_api)","sha":"6dd2c78b1bf681ae5f7b17d20be32198c63fa31a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T03:36:36Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-11T21:58:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove redundant imports\n\nThey are already included on the related rpcs3qt files","sha":"777cd9a8ae36302fc01082cf4c05d1b59b5a59b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T03:37:14Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-11T21:58:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rpcs3qt: Handle duplicate name warning\n\nThe name 'verticalLayout_29' (QVBoxLayout) is already in use, defaulting to 'verticalLayout_291'.","sha":"c689a9ba8e23aab119a7cf8ac988f77d110919eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T03:40:40Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-11T21:58:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GL: Update glext.h to ver 20180114","sha":"a994c462568865716e8a549796aefb569483eba7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-03T03:51:20Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-11T21:58:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Move Contributing to .github","sha":"2f7f8a629dea9cc837ac1ad41e6c50119a84a820"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-06T23:06:35Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-11T21:58:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gui: Update compatibility colors\n\nUpdate to the colors now used by the website","sha":"9caceeacd7c3f8929f87c5f97e5468389bdf5343"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-02-11T22:12:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-12T00:29:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: gpio syscalls\n\n* add sys_gpio_get, sys_gpio_set","sha":"95c6ac699b654e9c7ad35a5c63a9113db60ba125"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-02T06:25:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reorganize framebuffer setup code\n- Fixes some fast paths for framebuffer creation and binding","sha":"f20fd217f8c4c0102609d99066f86326e4f23b57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-02T07:04:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Reuse framebuffer textures whenever possible","sha":"98e50d3064efc77467201e3864037c5ae1c0152b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-02T12:25:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Cleanup some more things\n- Avoid referencing GL's null texture\n- Improve texture creation helpers\n- Remove useless __glcheck from GLHelpers.cpp","sha":"02e571adbcb633474d117765961e7fe1696b404f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-03T08:37:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: fbo fixes 2.5\n- Implement flush-always behaviour to partially fix readback from a currently bound fbo\n  - Without this, only the first read is correct, as more draws are added the results become 'wrong'\n  - Fixes WCB and cpublit behviour\n- Synchronize blit_dst surfaces to avoid data loss when gpu texture scaling is used\n  - Its still faster in such cases to disable gpu texture scaling but some types cannot be disabled without force cpu blit (e.g framebuffer transfers)\n- Memory management tuning\n  - rsx: on-demand texture cache rescanning for unprotected sections\n  - rsx: Only framebuffer resources are upscaled\n  - Do not resize regular blit engine resources\n  - Lazy initialize readback buffer when using opengl\n  -- These measures should help minimize vram usage","sha":"89c548b5d3f062aa1e82ba2234a480ef69c0b73e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-07T13:25:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/texture_cache: Do not access non-existent components","sha":"b67f28e00d12aa4917fa28bd39f8df6942e08310"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-08T14:49:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Discard shaders with undefined (non-existent) writes. On nvidia+vulkan, undefined writes autofill with blue color","sha":"a64bea128651fdbc6db0bfcf8bd3e6b17f8a7537"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-08T18:44:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix disjoint draw range splitting\n- Fixes flickering and missing draws in R&C and other games such as Motorstorm Apocalypse and Okami HD when strict mode is disabled","sha":"a5500ebfa4111ceb5304b319e0680425eebe11eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-09T10:32:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor optimizations","sha":"bd297d079d7ad92e43be7d10e70c7e2f9e56a444"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-09T15:03:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix save binding state for cube textures","sha":"3406cc988629f34375648cb2d2fd170fe2adbfe4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-10T08:52:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"infinitesimal fixes","sha":"3bbecd998a6050e54d9ec1c81164cedf78c9bc23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-03T13:42:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan API fixes\n- Fix for texture barriers\n- vulkan: Rework texture cache handling of depth surfaces\n- Support for scaled depth blit using overlay pass\n- Support proper readback of D24S8 in both D32F_S8 and D24U_S8 variants\n- Optimize the depth conversion routines with SSE\n- vulkan: Replace slow single element copy with std::memcpy\n- Check heap status before attempting blit operations\n- Bump guard size on upload buffer as well","sha":"c191a98ec31c3b55da2292ece21e79a29e3d1e4e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-10T16:21:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add cache pattern checking to blit engine resources\n\n- Feature was implemented long ago but was not functional due to bugs","sha":"1bd77c2f51bd4a1d041804c4fcc897614760e0a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-11T12:48:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add texture readback statistics to the texture cache and debug overlay","sha":"661b8b006fab9cd505ab2367afb3236e8f952bcb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-12T08:26:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Account for null blit ops (memcpy)\n- Do not perform extra memory tasks if no actual image copy was performed","sha":"a8ab408f640ec4ee2d8f7d009a09a3cfa22b2154"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-05T20:36:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Improve primitive restart workaround for vega/polaris\n- For some reason the hardware forgets that primitive restart is enabled and tries to actually read vertex index 65535\n- Works correctly if uint32 vertex indices are used instead of uint16 for cases where primitive restart is active","sha":"32f0e91893dddec644bd5f4f989caa6e92abc06c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-15T18:04:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk/drivers: Restore polaris+ patch to disable primitive restart","sha":"ebb9fc7cd92d13c95397e1ec3f4cca272563d311"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-15T18:37:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-16T13:14:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl: Hotfix for GL format compatibility check when high precision depth buffers is enabled","sha":"ee88e7f9480b239326189230935f34f46a75174f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-02-14T15:03:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-16T17:57:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: return enosys on unpresented syscalls","sha":"877b296fc3dbfaa46df78634cf973899f6f184f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2018-02-14T17:06:46Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-18T00:29:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add flag for rockband. Tests have shown it independent other flags.  But, actual use is currently not known.","sha":"00b1ff752d918d2690b1b87e63072d16c55b2788"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-02-16T23:01:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-18T21:23:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix gamegrid scroll\n\nscrollafter is useless in gamegrid, because the currentIndex was reset after PopulateGameGrid, so just ignore it.","sha":"95d232db4f61096b07fc4178e0c50985fa9d30b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-02-19T03:55:46Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-19T13:30:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add an easy way for package builders to disable native cpu optimizations","sha":"77b8f3a0f9780d5f4c79ddaa9e38ea429f723b6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-02-19T03:58:58Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-19T13:30:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Re-arrange VULKAN_PREBUILT option","sha":"f52fa5e46ca963e22dc29dca1d2b9159347fe415"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-02-18T07:30:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-19T19:07:22Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"add vscode files to gitignore\n\nsuch as .vscode\\settings.json","sha":"1a0b2bf050b36520c1b27d4a669dbcea79a79d8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-02-19T00:13:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-19T19:07:22Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"add kdevelop to gitignore","sha":"d5b9eb0caa5ef0ba82bd49b442a71f95528ddbe3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-02-20T14:36:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-20T16:27:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"disasm: clamp spu address","sha":"7c0fd5094e738c4f66cba3f30aeb1239a61b1f48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26828095?v=4","date":"2018-02-20T20:24:47Z","email":"devil0129@gmail.com","login":"isJuhn","name":"Juhn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-20T20:24:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement _sys_qsort in sys_libc_.cpp (#4176)","sha":"1b26ec56edcae7d825f44955d2996bed80149a02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-17T11:45:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-21T11:59:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Swapchains reimplemented\n- Adds support for abstract implementations\n- Adds native windowing implementations for WIN32 and X11 as fallbacks\n  when present support is lacking (headless configs)","sha":"77f2b521e11de25ed3a35d636e2ae6eea55f04b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-19T12:41:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-21T11:59:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Cleanup\n- Silence some warnings, remove dprints","sha":"4c6ceeff1137f2c1620d8111c822b96de5a15b83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-02-08T22:01:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-21T20:18:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: improve VFS dialog a bit\n\n\n- use normal selection instead of doubleclick\n- move SaveSettings out of the tabs to reduce file access\n- translate EmptyPath as well\n- some other minor refactors to reduce lines of code","sha":"bda466c3bd4d63edd0b93311682aeffb0febcb3d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-02-10T14:00:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-21T20:18:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add translation to save manager messageboxes","sha":"b60f29282a2b166fdb19fee79f510372a6f6ac07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-02-10T14:02:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-21T20:18:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sceNpTrophyGetRequiredDiskSpace: take vfs into account for trophy dir","sha":"ae7e275a9da3eac038c4c96347752a6a7d38c04e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-02-12T12:30:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-21T20:18:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: use setAttribute(AA_DisableWindowContextHelpButton) instead of flags\n\nprobably needs Qt 5.10.1 to work propery","sha":"cf1c45dfe86e71e40494eac05bc0df98deb3e767"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-02-22T22:08:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-22T22:08:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update for Qt 5.10 (#4202)\n\n* Update Readme for Qt 5.10\r\n\r\n* Update cmake for Qt 5.10\r\n\r\n* Update travis to Qt 5.10.1","sha":"5266dd6c60f366a590dc4db43ab2afa5f0bc7217"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1174810?v=4","date":"2018-02-23T18:44:29Z","email":"ab@fmap.me","login":"abbradar","name":"Nikolay Amiantov"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-23T19:06:37Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Fix quoting in cmake","sha":"41bd07274f15b8f1be2475d73c3c75ada913dabb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-01-12T20:51:22Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-23T22:38:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add callbacks for cellMusic","sha":"ede76033a7ab79f10065f90fa07c249b6740471e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-23T18:42:17Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-24T15:06:08Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"minor syntax changes","sha":"ca9c1674f7592b4b690e5b48f6e86f14bba0afdd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-23T19:41:05Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-24T15:06:08Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"windows artifact versioning changes, plus a small syntax fix","sha":"06546b51951ca346ee458f5877527e5fdc854ed6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-23T19:49:45Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-24T15:06:08Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"linux appimage versioning changes synced with windows artifact version","sha":"dc55d5be8f70c7c027765b86948cb8b0d3ea8806"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-02-24T19:54:58Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-24T19:54:58Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"RPCS3 0.0.5: Versioning Changes (Hotfix) (#4208)\n\n* travis hotfix\r\n\r\n* expose env vars for tag, hash and commit number\r\n\r\n* bump version\r\n\r\n* also update av version string\r\n\r\n* remove hash from av version for master builds\r\n\r\n* change hash encoding back to ascii","sha":"d78b0467d882418100bcadd2fb180d2aaf8064c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-02-11T15:25:36Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-25T13:17:38Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Checks for content_id in sceNpDrmVerifyUpgradeLicense and sceNpDrmVerifyUpgradeLicense2","sha":"aabf3c66955b11424fb564bcdf72ab867faaeced"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-01-11T21:14:21Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-25T13:17:38Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Add CELL_GAMEUPDATE_RESULT_STATUS_* enum","sha":"7753ac60b05bd6c77411c6e46bbbbc9ee9c7afb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-02-21T10:30:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-25T16:30:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fix spu interpreter single stepping","sha":"b61a69c877d9202d8d930cbaf8282b9a2a21dcb8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-02-27T23:27:32Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-28T00:21:54Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Refactor .travis.yml and qt installation","sha":"a766478e154296fd8c165196978f32cd92b8f173"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-01-12T20:07:06Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T10:47:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add callbacks for cellMusicDecode","sha":"1fb7cc40029c0e3e455c8df3052056b562fe83bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-01-12T21:45:50Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T11:58:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add callbacks for cellMusicExport","sha":"b63461f599aa2966dffab7a095d8a55d9d25140a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-01-12T23:17:38Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T11:58:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add callbacks for cellPhotoDecode","sha":"be834a67d188a72410aa40ab24b62d6ac401ed28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-02-01T22:57:29Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T11:58:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add callbacks for cellPrint","sha":"296052b1ff22ac73ba13c06c351e37ac6505abf6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-02-02T15:47:46Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T11:58:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add callbacks for cellCrossController","sha":"0772b9c8796014879193a4d88955826da8a1e235"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-02-03T08:51:57Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T11:58:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add callbacks for cellSysconf","sha":"aa30e865c2fc0bb2afb0884235d8ada08f63318d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-02-04T11:46:55Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T11:58:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add callbacks for cellPhotoImport","sha":"324d21d8492d3603ed4e3e61ed00f18583370a34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-02-08T20:56:38Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T11:58:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add callbacks for cellUserInfo","sha":"14e15b2feb142fc09084e49489ccf0c0346d12f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-02-26T21:54:47Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T11:58:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add callbacks for cellStorage","sha":"05354698f00abf993ee5b92396d3e05f21259cd3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-02-02T04:11:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T12:52:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: remove gamelist toolbar","sha":"9138d537c803198b8a9d72505fde18582ad20d67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-24T19:04:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T13:27:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix firmware installation for vfs","sha":"6141bc5598e65433e98434f9c7f2a508c5f4138d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-02-28T14:53:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T14:53:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: simplify Boot options a bit (#4158)","sha":"24443857634bab32e875152d3182ed90fea723bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/778999?v=4","date":"2018-02-28T15:31:39Z","email":"romoper@yandex.ru","login":"jfhs","name":"Andrey"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T15:31:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve GDB debug server (#4027)\n\n* Made GDB debugger working with IDA\r\n\r\n* Added async interrupts support\r\n\r\n* Report proper thread after pausing\r\n\r\n* Support attaching debugger before running app","sha":"e0f53ace19f72a2ddc43f2c6a4d5e644f2e0bc97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-02-28T16:06:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T16:06:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: ask for cache and config removal on app remove (#4016)","sha":"72e54e8b60d46116777ba80b9a87da492ad9b140"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-02-28T16:28:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T17:30:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"spu/interp: optimize floating point exception checking\n\nread once the MXCSR register and use his value to check for all exceptions","sha":"6e8ccbcf17a1ad823ac32767c7c874d68c6aef77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-02-04T21:43:22Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T18:25:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make cellNetCtlGetInfo returns the correct value in disconnected mode","sha":"31cee7e4c80acf1bb1228d89ef286473e8a09dbf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-02-28T00:21:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T19:44:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: enable custom fonts for stylesheets and add random object names","sha":"f786c078c2004d0b0b05e9793828d069104b09b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-02-28T17:47:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T19:44:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Boot regression introduced by #4158","sha":"3043c73745ec3f44b24ba69e686f1de78c04fbc2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-02-22T21:24:37Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-28T21:41:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Change return of function \"sceNpMatching2Init\" to CELL_OK","sha":"8d7620d95f8daa32d434b640f31597a3da82aa3d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-02-27T22:37:12Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-01T00:20:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add 2-channels mode for cellAudioOutGetDeviceInfo","sha":"dacc9af38f2ed5e415c36311ee5939546091483b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-02-28T01:19:29Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-01T01:34:11Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"gui/themes: YoRHa by Ani\n\nI hope you enjoy the theme as much as I enjoyed making it.\nBased on NieR Automata's YoRHa UI style.","sha":"7c6c33eef83afa976211f26f1f4739845612391f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-01T12:18:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-01T13:10:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix dockwidget background","sha":"900329a1ded25712275d867f4146026c38f97a47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-12T16:35:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-01T13:13:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPUTranslator: implement ICmp ops\n\nAdded operators ==, !=, >, <, >=, <=","sha":"53f8b03acc022e724b3a5797a1249aedcfeb2009"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-02-27T16:03:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-01T13:13:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Optimize SPU interpreter\n\nMade SPU decoder similar to PPU decoder","sha":"445b7c075856e3c1547c9ddfa471f3a1e2db6b08"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-01T10:48:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-01T13:28:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve TTY output\n\nUse atomic variable to sync TTY size\nImplement console_putc (liblv2)\nWrite plaintext instead of HTML\nSlightly improve performance\nFix random line breaks in TTY","sha":"f056b2f4abc381279a51ab4b7979583496f7fcaa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-01T10:51:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-01T13:28:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix boot game crash","sha":"f96e9b6ed7c1c57e37bfac269bd92dc2ed197693"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-03-02T16:51:21Z","email":"makren67@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-02T16:51:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[HLE] First steps to Playstation Move (#4083)\n\n* [sysutil] Add Magnetometer system param\r\n\r\n*  [ui] Add UI for Move handler\r\n\r\n Current options are \"Null\" and \"Fake\".\r\n\r\n* cellGem: Improvements\r\n\r\n* cellCamera: Improvements","sha":"504e3112ddc440f1d4eb4f236d4d39ab0f016513"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-01T23:45:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-02T17:50:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: enable background images for floating dock widgets","sha":"8db7ef4d5a690c127782031870c4e038004d60de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-03-02T23:11:25Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-02T23:11:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGame: Fix cellDiscGameGetBootDiscInfo return values (#4241)","sha":"ec0cd9f006b748056d62480a133f74097fd76e12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2018-03-05T18:28:10Z","email":"26035046+Talkashie@users.noreply.github.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-05T18:28:10Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"gui: Fix typos and clean up Engrish (#4250)","sha":"d4e88aa11c7471e1cd25fdb0d50fbef643b2e86c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-04T22:16:04Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-05T19:20:57Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"gui/themes: YoRHa by Ani - Bugfixes\n\n- Fixed Library List\n-- Removed uppercasing\n-- Formatted checkboxes\n-- Fixed selected text being white (unreadable)\n\n- Fixed Log readability issues\n-- Uses dark flat color background for improved readibility\n-- Uses default font family and size for improved readibiluty\n-- Adjusts success, always, stack and TTY colors\n\n- Fixed Debugger issues\n-- Removed uppercasing\n-- Restored default font family\n-- Restored default font size\n\n- Styled QSliders\n- Added border to SpinBox","sha":"91d05111544e5fb2f6a4741a4363691489f67cf4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-03-06T05:51:20Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-06T18:22:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update Vulkan-LoadAndValidationLayers to make CI work again","sha":"effdb65ae4f903c6603b475ba443977f72d0792c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-03-06T03:28:52Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-07T13:57:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: add vertex data base to offset and mask before translating address","sha":"7233640cf00fcb0f9235589502a73068135ac2d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-03-09T09:31:01Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-09T15:06:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix alpha test on VK/GL\nMoving alpha test outside of fp_main. This enforces alpha test is still done even if shader asm has early return","sha":"3a9428a88e0ecb0c0fce755f349c2d1cc2eafe90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-03-06T02:36:33Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-09T16:30:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu/sys_interrupt: add stack_reset command to fix sys_interrupt stack overflowing","sha":"7bbadfd08bc2d6c3da98ecc7edd00a7e837138e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3586606?v=4","date":"2018-03-11T16:13:56Z","email":"nicba1010@gmail.com","login":"Nicba1010","name":"Roberto Anić Banić"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T16:13:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Travis by using a PPA to install QT. (#4269)","sha":"c1f32aa5706d798f7e2c2a352918b6a3cc5332ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T16:28:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T16:33:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix safe_writer_lock (typo)","sha":"7f542a5c993a99ffbd4441be0dbf84c65cf61925"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-10T21:36:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T16:33:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Relax /dev_bdvd mounting requirements\n\nAllow some PSN games with DG category to boot","sha":"c8a6bc6e24d21a9e242bbbd6b86d0c57e83da578"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-10T23:35:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T16:33:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve boot dir access\n\nAdd Emu.GetDir() method","sha":"f4d2fccdfee73fb18f957c57e2b4954c61746fb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T10:05:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T16:33:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve vfs::mount\n\nMount /dev_bdvd/PS3_GAME if necessary","sha":"eea2c204206b7b972f30bb9a06684c5eb726b730"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T11:37:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T16:33:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix cellGameDataCheckCreate2","sha":"4fd69a09c7107767d5976929487a3f0a7b3dc369"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T11:42:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T16:33:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix argv for DG category","sha":"c0a0cb98c5c90c2d45b03bbc29546ea435a9ff35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T16:29:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T16:33:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix crash on exit after access violation","sha":"4b1c052030a6a6d1a72ef80131479bb295de1207"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T16:30:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T16:33:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use pthread_setname_np (Linux, GDB)","sha":"ac82ecf387c6412bdb49c8dcca0e8c8e11ff67e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3586606?v=4","date":"2018-03-11T23:07:37Z","email":"nicba1010@gmail.com","login":"Nicba1010","name":"Roberto Anić Banić"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-11T23:07:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Travis Fixup Fixup (#4273)","sha":"f2e5b6c35099cd7c575b350b997ca3793bf4f739"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-12T08:40:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-12T08:40:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix cellGame regression","sha":"f328cdbaef5a7c0d489b2c439fbcb57c1783d004"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-12T12:33:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-12T15:53:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve cellGameCreateGameData error checks","sha":"ba54f7ae39648a8179856e30e368200634a3d291"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-12T16:07:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-12T16:16:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellGameContentPermit workaround","sha":"817dfe865139351256047cf8915f8f7f5292379e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2046350?v=4","date":"2018-03-12T23:40:29Z","email":"danilaml@users.noreply.github.com","login":"danilaml","name":"Danila Malyutin"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-13T00:56:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use latest Qt patch level on appveyor.","sha":"bc9594ed5706f6b9dd7be3482d5e41aa274a685e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-03-12T20:13:49Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-13T08:51:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Thread: unbreak build on BSDs after ac82ecf387c6\n\nUtilities/Thread.cpp:1644:2: error: use of undeclared identifier 'pthread_setname_np'; did you mean 'pthread_set_name_np'?\n        pthread_setname_np(pthread_self(), m_name.substr(0, 15).c_str());\n        ^~~~~~~~~~~~~~~~~~\n        pthread_set_name_np\n/usr/include/pthread_np.h:58:6: note: 'pthread_set_name_np' declared here\nvoid pthread_set_name_np(pthread_t, const char *);\n     ^","sha":"e487480ca94ccbfa07e55e561ddca1f28747294d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8276932?v=4","date":"2018-03-13T12:23:12Z","email":"TGEnigma@users.noreply.github.com","login":"TGEnigma","name":"TGEnigma"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-13T12:23:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger improvements (#4026)\n\n* Improve debugger\r\n * Added 'Step Over' functionality\r\n * Added special SPU pause functionality that pauses the SPU thread when the tag mask is at 0x80000000 by holding ctrl while pausing\r\n  * Go to address dialog now evaluates expressions, including defined variables such as pc, r1, r2, etc\r\n    * Requires QtScript to be linked with the project\r\n  * Made the option to center shown addresses (Go to addr/pc) optional by making it an entry in the GUI ini config\r\n  * Shown addresses now appear 'selected'\r\n  * New keyboard shortcuts!\r\n    - Ctrl+G -> Go to address\r\n    - F10 -> Step Over\r\n    - F11 -> Step (Into)","sha":"cb9e6e75db7ad8444a3a550aff9b25fe3fdbf524"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-20T13:29:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Remove an ugly hack pertaining to partial framebuffer-resident texture data - Its better to fill in the missing information with a wrap or clamp than to fake the texture reads in valid regions - Texture coordinate scaling is used to fill in for the cropped dimension available","sha":"4487cc8e7a2913900276d12d6394144ab31732c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-21T10:46:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture cache fixes - Optionally attempt to merge framebuffers into an atlas if partial resources are missing - Support for data update requests to the temporary subresource handler This is useful for framebuffer feedback loops where a new copy is needed after every draw call (resource is always dirty)","sha":"01349b8cee7a922f26e75c967a25d31e8c49f86e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-21T17:50:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Optimize vertex data upload\n- Reuse buffer views as much as possible, vkCreateBufferView is slow on NV\n  Implemented as a large sliding window, reuseable until it is filled","sha":"8ccaabb50264ae249b6af21a1c91cea9b8764085"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-21T18:31:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: More optimizations\n- Do not bother rechecking the dirty sampler pool for hits. Its faster to create new sampler than to search the pool\n- Reserve some memory on vertex layout struct to reduce reallocation penalty","sha":"af1b13550b8b775f5ccbbcad7b7d303097a4ff75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-21T20:43:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl: Minor fixes\n- Identify depth textures reaching the gpu via shader_read upload path\n- Use correct timestamp counter for opengl\n- inline draw_state::test_property because msvc doesnt do it for us","sha":"07cbf3da48974ed49649b7823bdc75d444424e7d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-22T08:13:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl/vk: Improvements\n- gl: Do not call makeCurrent every flip - it is already called in set_current()\n- gl: Improve ring buffer behaviour; use sliding window to view buffers larger than maximum viewable hardware range\n  NV hardware can only view 128M at a time\n- gl/vk: Bump transform constant heap size When lots of draw calls are issued, the heap is exhaused very fast (8k per draw)\n- gl: Remove CLIENT_STORAGE_BIT from ring buffers. Performance is marginally better without this flag (at least on windows)","sha":"6b23e733d01346402e85556ff35720bef588681f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-23T08:30:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Nvidia driver compatibility workarounds\n- Sanitize NaN values before they reach the driver. On nvidia (X * NaN = X)","sha":"705820c430fc5ed0df61406dd2889cf825945a12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-23T14:35:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vulkan: Add post-compilation key validation and dynamically determine attachment write maks based on decompiled shader\n- A new step is added between decompilation and pipeline object creation allowing for properties to be updated based on shader contents\n- Allos masking off attachment writes that are unmodified in the shader","sha":"87741141f1b15c3c84c46d7063aa2ab20916008c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-23T19:48:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Improve rgister component gather detection\n- Also avoids clobbering register data by keeping gathered bits in a temp var","sha":"68b32297566e74ce6896b8e179e3ad0a7cd8a5ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-23T19:49:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk/gl: Enforce format matching for render target resources. Fall back to raw data copy if match fails\n- Forces Bitcast of texture data if input format cannot possibly be the\n  same as the existing texture format\n\n- rsx: Other minor improvements to texture cache :-\n  - remove obsolete blit engine incompatibility warning. The texture will be re-uploaded if it is indeed incompatible\n  - Implement warn_once and err_once to avoid spamming the log with systemic errors\n  - Track mispredicted flushes\n  - Reswizzle bitcasted texture data to native layout\n    TODO: Also needs reshuffle according to input remap vector","sha":"20d4c09a1c7aeaf8fcdbe3d763ce8c7705676c28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-25T09:48:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: Clean up some format casts\n- TODO: Byte ordering considerations on data casts","sha":"053ab585f407db82a537877f56d9be66262a3a23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-25T09:46:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Clear up confusion on depth writes.\n According to the NV_fragment_program spec, its not feasible to have 16-bit depth wries\n NOTE: NV_fragement_program precedes NV_fragment_program2 which is very\n close to what RSX consumes. It is hardware from that era afterall","sha":"4804efc17dd9a432363267ac097b4b2e32468191"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-25T13:07:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Color output registers are always present and zero initialized\n- According to NV_fragment_program spec, registers are zero initialized always\n- A program even without writing to these registers will have black (0, 0, 0, 0) output\n  Confirmed behaviour with MotorStorm games. Their engine uses this quirk to clear color buffers when doing depth replace\n  Might be an unfixed game bug","sha":"d41b49d8b4722c453ff1a13d2fae36dafae6d11d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-27T07:56:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Support APPLE\n- Adds support for compilation on MAC with moltenVK. Note that vulkan does\n  not work on MacOS yet. There are two main blockers:-\n  1) Texture component swizzles are not supported except for\n  RGBA8_UNORM->BGRA8_UNORM.\n  2) There is a bug in their SPIR-V -> MSL generator.\n  GLSL.std.450.xxxx functions are not implemented which breaks rpcs3\n  functionality. Trying to compile a vertex shader will throw because\n  unpackHalf2x16 is missing.","sha":"2855869530cee66a57e8d959a041f9ca95a85da7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-02-28T11:46:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Basic performance counters","sha":"84b8a08d264d66ee27a81f1390e481ad2549d9c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-01T12:09:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve FIFO commandlist flattening\n- TODO: Alot of work is still needed to execute draw commands out of order\n  Thats the only solution to games sending many draw calls with high frequency of state changes","sha":"0c8e4c088716c247f53ccb68d7d29c0ced705132"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-02T15:41:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Properly implement raster window offsets","sha":"e230867492bf84cd89967d4392265dd1860ae871"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-02T20:22:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Simplify MRT blend setup; Enable separable MRT blend on vulkan and fix corner cases for GL","sha":"a19ffba8e8ce8872230e23cd11e556133273da95"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-04T21:59:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve transform constants management\n- Removes the duplicate local_transform_constants\n- Resets the transform constants on every context reset\n- Simplifies the code abit which should make it faster\n- NOTE: Transform constants are persistent across context re-init events (VF5)","sha":"dece1e01f446b4e9d98948df24fa61ea612325cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-05T11:09:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: ZCULL rewrite and other improvements\n- ZCULL unit emulation rewritten\n- ZCULL reports are now deferred avoiding pipeline stalls\n- Minor optimizations; replaced std::mutex with shared_mutex where contention is rare\n- Silence unnecessary error message\n- Small improvement to out of memory handling for vulkan and slightly bump vertex buffer heap","sha":"315798b1f48cffeda8df6344f4f4617e9fd82ac7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T13:34:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: ZCULL synchronization fixes\n- Track asynchronous operations in RSX core\n- Add read barriers to force pending writes to finish.\n  Fixes zcull delay flicker in all UE3 titles without forcing hard stall\n- Increase zcull latency as all writes should be synchronized now","sha":"2dce55d036ed982f74a7583993e6f2639fa4ae30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-07T20:09:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rssx\" Halfplement alpha-to-coverage AA transparency","sha":"f00d9a7c7fa014b41ec335844d992ca58aed1fe8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-09T17:55:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement reading from cell if swap image isn't found","sha":"910fc54ee227845f0c002640be2b2822427ec9e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-10T13:51:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"fix linux builds","sha":"ffe6c9ba5a10dfccdf235446d974456ae5329880"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:15:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T15:55:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Disable async count verification to avoid lockup due to zombie reports in ZCULL","sha":"5f047034ae462fc63bcf326f8770580996272f95"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-03-05T17:26:18Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-16T18:16:49Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Make cellCameraInit returns CELL_OK when no camera is plugged in.","sha":"da635af0d6a55be3053f5450eae32e4b3e9d27c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-03-07T19:09:06Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-16T18:16:49Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Add return codes when camera handler is set to null","sha":"b232409cc56e2118123bcfc8a8096c6a9bf0ca96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-16T21:34:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-16T21:39:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Prevent accessing incomplete RPCS3.log.gz\n\nUse permissions to make it inaccessible\nOn Windows, autodelete the file\n\nImplement fs::unread for this purpose\nRename fs::unshare to fs::lock\nFix fs::lock correctness","sha":"f66d5adf5f25000f0f9d6a0c29e2bb78e529ed47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-18T07:47:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-19T09:13:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: fixups\ngl/vk: Bump shader cache version\ngl/vk: Disable anisotropic override when strict mode enabled as it is proven to alter some games negatively\ngl: Clamp buffer view range to not exceed the backing buffer size. Also add assert for the same condition","sha":"d13584f8587ec35fc3764098518a3083db8b92ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-19T20:43:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-19T21:11:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Compat support for mesa drivers Needs CLIENT_STORAGE bit set for persistent buffers to make them useful","sha":"92fb828d52d538b910eccbde3d5df2b8a09799db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-03-14T18:19:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-19T22:49:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"add enc_temp_folder to gitignore\n\nthis folder randomly pops up when you modify code files while debugging using VS","sha":"ce674dbc5d2f2afb09b652d93539535c0d715991"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-03-14T18:19:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-19T22:49:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"qt/spu: remove max dma write size setting\n\nThis wasn't really used for anything tbh","sha":"3426531e381f251efe85b2e57d2c7bae8e65c673"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-03-14T18:19:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-19T22:49:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"qt: make description of disabled AF setting a bit clearer","sha":"fc3698f831a70a19483a0957a22ef37a69815bec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-03-14T18:19:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-19T22:49:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"set logging stack mode to true by default","sha":"252ddf8085f0c5b0b1db03fa587e44325e49dc57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/27543170?v=4","date":"2018-03-21T08:58:47Z","email":"vvansteene@live.fr","login":"GeniusMage","name":"GeniusMage"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-21T10:40:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Teepo fix\n\n2D isn't always > 3D","sha":"4e2a8a3cdb0162399fd50486b057e646ed86ff66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-03-15T16:22:05Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-21T11:11:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Use \"USE_NATIVE_INSTRUCTIONS\" variable instead of a specific \"TRAVIS\" variable","sha":"526228442bd409b1a5f5f57e0302c80527318ee5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-03-18T07:59:46Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-21T11:11:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Check if the compiler supports \"-march=native\"","sha":"af89b62194de51daca109f32d783633a0b563bc0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-15T08:08:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-22T12:33:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"visual studio: add filters for some module headers","sha":"17d2124a719adcf878bb98e2f964ac027ef88cd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-20T01:10:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-22T12:33:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: enable hiding on game list and optimize the game list filter","sha":"5492e0eae11e3b7b4a4e086352ee770c49aa86c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-16T22:54:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-22T12:33:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: move compat_status to game_compatibility.h","sha":"c10e195dba4fe8355077ad54ebea000e7dc11ec2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-16T23:13:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-22T12:33:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: clean up gui_settings.h - move general functions to qt_utils.h","sha":"baea538c3272a67b6e90816a0365a6b26f357fbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-16T23:32:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-22T12:33:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: use QString::simplified() instead of get_single_line\n\nhopefully this works","sha":"9f1fe5775eaed7e7a9373e3a69d4f8857de6e1af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-18T20:56:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-22T12:33:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: sort the game list case insensitive initially","sha":"9fcba58537334f80deb135757a04e8dbd38ce79b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-20T01:00:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-22T12:33:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx/Qt: add option to disable the shader compilation hint","sha":"9d961f620ba2dce0cc8342d591d116dae71dd04e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-17T17:41:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-22T20:24:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement SPRX precompilation\n\nAutomatically precompile firmware modules\nAdd \"Create LLVM Cache\" menu (for games)\nReimplement jit_compiler::cpu as static method","sha":"19944eeed0a1b1686024616836c7b892eb587c85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-20T15:53:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-22T20:24:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement patch support for PRX\n\nStore SHA-1 hash in ppu_module","sha":"2c6c8f1a250eaafc766f8961a5afbc22a994fca3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-22T19:48:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-22T20:24:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement fmt::base57\n\nFor future use","sha":"20785b00f608d30f8d7001f34720aaa086bf3198"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-22T19:57:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-22T20:24:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use lowercase for FNIDs for consistency","sha":"78cfba158db389577c6e5ee8a0fff0d37581e6ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16286075?v=4","date":"2018-03-22T04:52:01Z","email":"psdev21@gmail.com","login":"pauls-gh","name":"pauls-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-23T09:01:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Remove Volume Texture Compression (VTC) tiling for Vulkan, DX12 and ATI (OpenGL).","sha":"fd8d2ecbf4033f7b066c576b6a8b5c06db47b064"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16286075?v=4","date":"2018-03-22T15:01:09Z","email":"psdev21@gmail.com","login":"pauls-gh","name":"pauls-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-23T09:01:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix code formatting","sha":"e6010ba2ca23ef3319c433843e64bef0c88a0689"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16286075?v=4","date":"2018-03-22T21:59:30Z","email":"psdev21@gmail.com","login":"pauls-gh","name":"pauls-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-23T09:01:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Add end condition for VTC copy.  This handles the case when depth is not a multiple of 4.","sha":"e5b47104712cd7cc22ef55cf5f042c18acefdfef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16286075?v=4","date":"2018-03-22T22:21:00Z","email":"psdev21@gmail.com","login":"pauls-gh","name":"pauls-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-23T09:01:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"VTC tiling - fix source offset increment.","sha":"d79a5443201692660673ddf9626989bb056aac61"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16286075?v=4","date":"2018-03-23T00:28:34Z","email":"psdev21@gmail.com","login":"pauls-gh","name":"pauls-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-23T09:01:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Fix VTC source index increment","sha":"44cddda4b4c2ab302660fd2142879d862cbaf0f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-22T13:51:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-23T16:46:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"stub sceNpScoreWaitAsync and sceNpScorePollAsync\n\nand sceNpScoreCreateTransactionCtx","sha":"50ff987850027bf2542d4cf52843eb831575a6ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-03-21T19:02:36Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-23T17:45:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_fs: returns the correct error value when the path is 0 or an empty string","sha":"1ae724f7390c33a67d8937fdfb39fd24c325ad83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1533879?v=4","date":"2018-03-23T06:33:36Z","email":"kevin@kevxu.net","login":"kevinxucs","name":"Kaiwen Xu"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-23T20:52:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix git-version.h not correctly updating.","sha":"32d38a46332272b1473fcd6772f40cc902a9b87b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6238428?v=4","date":"2018-03-23T22:08:13Z","email":"birk.magnussen@online.de","login":"BMagnu","name":"Birk Magnussen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-23T23:30:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix missing Detection for AVX OS Support","sha":"c5caaa92114c74d02780a42d2eba758d8f1166f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-03-24T09:04:47Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-24T11:14:40Z","email":"yuri@outlook.at","login":"AniLeo","name":"Ani"},"msg":"Partial compilation fixes for osx","sha":"50446f7feff4990052c78c53b30978acd92018bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/965509?v=4","date":"2018-03-07T18:26:41Z","email":"zeke@zekesonxx.com","login":"zekesonxx","name":"Zeke Sonxx"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-24T13:49:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_crash_dump user_log_area improvements\n\nGets Destiny BLUS31181 to Intro","sha":"3066a05df0e2d8acd3067a8951b70645dabdb5ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-03-23T12:59:43Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-24T15:48:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_spu: fix spu image loading address calculation\n\nby calculating mem_size after nsegs has being calculated","sha":"fad9cd6ef17dc1c16989e6fa43ed6e23b7d9aecc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-03-10T04:16:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-24T15:48:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"RawSPU/MFC: fix get start type proxy commands","sha":"d27a375363304c9d7e3070e4dc94f3bd9379b02e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-03-24T14:58:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-24T15:48:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_spu: dont check prio if spu group type is 0x20\n\nit's currently unknown whats the exact relationship between the prio and the group type SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM (0x20).\ntho we do know prio'es whom less than 16 are reserved for the system.","sha":"63fa50080d451cb8108aaa167e218719fe3aa386"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2018-03-24T16:21:50Z","email":"26035046+Talkashie@users.noreply.github.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-24T16:21:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"unimportant teepo fix (#4328)\n\n* ultra teepo fix part 1\r\n\r\n* super mega teepo fix part 2","sha":"a35bcb131e04f4d7b48f10c78eb405aa7a73b107"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T10:46:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T10:31:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture format fixes\n- Implement SRGB (gamma corrected) textures (DXT1, DXT3, DXT5, RGBA8 only)\n- Fix channel map decode for XY data texture formats\n- Fix remap layout for X16 textures (verified with Mass Effect 3)","sha":"5817f9fe3f80d7e98106f46a7c3349e8468f12fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-13T10:49:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T10:31:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Improvements\n- Export some debug information in the free texture register space components zw\n  Very useful when analysing renderdoc captures\n- Enable shadow comparison on depth as long as compare function is active and texture is uploaded for depth read\n  Some engines (UE3) read all the components in the shader and use mul/mad with the result","sha":"27552891addc415537f739e61f29f79e616d4cf6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-18T11:40:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T10:31:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl/vk: Obey channel remapping on framebuffer resources if requested","sha":"9f416e5ce106c394770aff6e3b801b60adde8ca4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-19T09:14:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T10:31:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix AMD primitive restart emulation when strict mode is active\n    The restart emulation is there to keep the proprietary drivers from randomly crashing when using primitive restart","sha":"aeebeed0f2be74690f922777180815ee6e91c55c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-21T09:02:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T10:31:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"video out: Set up video configuration options in fxm\n- TODO: Actually do something with the values","sha":"c6a2525c9b45bb85974fdc2442b54b187695e5e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-23T11:47:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T10:31:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Fragment program overhaul\n- Separate TXB from TXL: They are completely different!\n- Properly perform TMU emulation in the fragment shader. Implemens SRGB conversion and alphakill at the moment\n- Properly perform ROP emulation in the fragment shader. Implements FRAMEBUFFER_SRGB. While support on the chip looks to be incomplete (and wierd), it does work\n- Document some more bits in SHADER_CONTROL register","sha":"9fc174060855b81339d7eb5d55040a8f132c766f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-23T11:49:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T10:31:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Implement video-out calibration for gamma and dynamic range\n- Seems to be of limited use but if it is determined to be useful, a vulkan implementation can be done","sha":"9bb1ed78f9debe14ad36192fe2548ea68ac1fa82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-23T15:05:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T10:31:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Overhaul rendertarget sampling/shuffles\n- Reimplements render target views used for sampling\n- Optimizes access using an encoded control token\n- Adds proper encoding for 24-bit textures (DRGB8 -> ORGB/OBGR)\n- Adds proper encoding for ABGR textures (ABGR8 -> ARGB8)\n- Silence some compiler warnings as well\n- TODO: Real texture views for OGL current method is a hack","sha":"321c360dcbc1cd4f930c45a9c05f9c283aae1ed8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-23T16:24:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T10:31:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Always use indexed blend caps to avoid conflict with the state cache.\n- glEnable/glDisable should not be used with GL_BLEND as the main renderer uses the indexed variant","sha":"22af70d0d003a8b28238238802aa321962262100"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-24T09:53:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T10:31:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix leaking occlusion queries\n- GL queries share the target binding (not asynchronous!)\n- Discard active queries by closing them, leave closed queries alone (nothing to be done for discard op)","sha":"9fce5b0f7a337806f2f0dcae3212ed56e91de36a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-24T11:13:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T10:31:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix some texture cache problems\n- gl/vk: Properly handle remapping temporary resources","sha":"887ea43e395a99aab8453f24b9dc15f6922241e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T10:39:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T13:02:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Clamp negative fog distance","sha":"5aac8aa4246b6590b896eeee9a8afc9d91e83afe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T12:19:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-25T13:02:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vulkan-build: use stub sha1 to bypass spirv_tools check when running setup scripts","sha":"a36acf49d8fe1e8a777ded6182f92d99bc75c7ba"}
+{"author":{"avatar":null,"date":"2018-03-27T16:55:54Z","email":"coreybennett@bravevision.com","login":null,"name":"Asinine"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-27T16:55:54Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Update settings to indicate speed differences between Interpreters and Recompilers for less confusion (#4345)\n\n* Update settings_dialog.ui\r\n\r\n* Qt: completely detach ppu and spu ui texts from backend.","sha":"2172e61ce54f2d44add0be09ed6fcc94e5a5224b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/29986095?v=4","date":"2018-03-27T17:43:38Z","email":"joker46@seznam.cz","login":"Kravickas","name":"Kravickas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-27T17:43:38Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix a typo in gcm_enums.cpp (#4333)\n\n* Update gcm_enums.cpp","sha":"e6cb4df8774fb2d395fa21ddf458c4bcc786ba8c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-22T12:54:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-27T18:40:25Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: use seperate icon sizes for game list and game grid","sha":"05fc49506abcbd14560f81fcc8749c36dd01b910"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-26T11:40:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-28T08:30:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve compatibility workarounds\n- Disable fence reset on gcn1 - gcn3\n- Enable polaris+ workarounds on linux if proprietary driver is used","sha":"fca6c4fb7f1c119b4b3cbf80fc4b668ca576d57c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-28T02:30:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-28T15:01:32Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: minor fixes","sha":"70cc2e3665add97e292cc2a53916bbfd536cdc69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16286075?v=4","date":"2018-03-27T16:50:22Z","email":"psdev21@gmail.com","login":"pauls-gh","name":"pauls-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-29T08:01:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Strict Rendering Mode (SRM) fix.  Move old surface copy before texture upload.\n\nFixes the following issues on Tales of Vesperia which requires SRM.\n- Blacked out scene after the sleeping dog now renders correctly\n- Ghosting effect. The ghosting was most noticeable as a delay between the character rendering and the cell shading around the character. This appears to be gone with this change.","sha":"a17025c465d71c67a0c6efd0d78d46fbd1e33b1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-28T12:44:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-29T10:52:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Dubious fix for broken B8 swizzle remap","sha":"f559c088a1eff7988e71feb7e05dde303c944f10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-28T13:00:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-29T10:52:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Disable gamma control on WZYX textures\n- Gamma is seemingly used for (D/X/A)RGB only. Data textures are unaffected","sha":"7627ad04f1247ba4694fb738943f05f52898be0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-28T13:16:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-29T10:52:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix copypasta","sha":"ee0fe28ddcbebbdf977d6cba486930fce6d89cdf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-21T22:04:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-30T01:40:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"improve sceNpTrophyGetTrophyInfo and sceNpTrophyGetGameInfo","sha":"2d68aed68f83b402cff459bb101549f70e7dd2a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-25T14:07:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-30T01:40:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"remove redundant error messages in sceNpTrophy","sha":"3e863f2189308d1b386d5bc27bded82f9dafa1b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-03-29T05:42:44Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-30T10:30:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"dx12/vk/gl: implement use of vertex_data_base_index when calculating index","sha":"6d6d6fa82783a3699fd99ba57b1ff119dbd5a4d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-03-29T05:43:00Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-30T10:30:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"fix debug build","sha":"2c16dddd1e89a1ec020eed5df526181ae0fab3d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-03-13T19:37:40Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-30T19:50:31Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellCamera: Implement cellCamera*NotifyEventQueue and do some refactoring","sha":"bca46e92d453909a57aef3c9527f22b672d6a58a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-31T00:38:38Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-03-31T01:54:59Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"qt: Do not deploy Qt5Quick\n\nWe're using Qt5Qml but not Qt5Quick, therefore the extra extension can be removed","sha":"7359774c7686955eb43dedbc701916755f1c1442"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-24T21:04:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T13:51:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"[LLVM Cache] Minor workaround","sha":"c3a5e3f4919d92322321ab930352397e807e6a52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-26T21:54:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T17:35:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"[LLVM] Fix thread limiter\n\nAllow to apply max llvm threads setting as usual","sha":"a3db2774f1ddc3082356392d756ab04afa8a931d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-25T00:41:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T17:35:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RawSPU: reset status register on start\n\nWas proposed by @elad335\nImplemented as atomic op","sha":"78dbc4fb5fe8c81bd663995ac7fb5b7fa731bfc8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-24T21:03:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T18:13:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove mfc_thread\n\nClear mfc_queue on reset\nImprove MFC Proxy a bit","sha":"898637f83008bfa065b42a3d1f23c0a220ffffcd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1445782?v=4","date":"2018-02-12T20:51:33Z","email":"jjs@jjs.at","login":"jjsat","name":"jjsat"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T21:04:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Calculate save data file size more accurately and return size in savedata_get_list_item if requested.","sha":"d973337c4ed87fb38286d4e9c41bc49738edb04d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1445782?v=4","date":"2018-02-12T20:56:18Z","email":"jjs@jjs.at","login":"jjsat","name":"jjsat"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T21:04:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Handle some invalid save function parameters.","sha":"bba7184090051ec29a467a42bb6181ce7981f637"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1445782?v=4","date":"2017-12-16T15:12:25Z","email":"jjs@jjs.at","login":"jjsat","name":"jjsat"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T21:04:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Corrected logic for handling number of returned save data list entries and total number of save entries.","sha":"1dc87a070464c3e1dd519fd7d92553939a7c0023"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1445782?v=4","date":"2018-02-05T19:09:07Z","email":"jjs@jjs.at","login":"jjsat","name":"jjsat"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T21:04:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Return parameter error if the result of funcFixed is invalid.","sha":"4620fa8bd8c767c80d43e0623fa66a9282d56e8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-03-12T20:18:09Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T21:32:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPUTranslator: Ignore relative relocations","sha":"706faa1d32c652c54af3442d67b2cd99e0478b80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-31T22:03:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T22:03:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"stub cellGem some more (#4349)","sha":"755ceb50a4065b03077be661cec131e3264311fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-28T18:08:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T22:53:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: simplify resetGeometry occurances","sha":"92ec846375e82d91c2bbd0033ec0ca256cd8fa13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-28T18:37:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T22:53:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx_debugger: layout refactoring for highdpi and resizeability","sha":"4899e35fbb223026feaca71118751ad4cdef6ba5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-30T10:51:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T22:53:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx_debugger: save/restore table header states","sha":"d97d30ea2e5a7fd379f882c24553d00d1554e3c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-30T10:55:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T22:53:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx_debugger: move debugger table resize to qt_utils for reusability\n\nmaybe create a custom table class in the future","sha":"ed7d514c3150ee750d38d010ff9a9ff3ca0c8ba2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-30T15:14:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T22:53:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add show_windowed_image to qt_utils","sha":"ff89f7ca4562010c5977a99864aa9feadef29f4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-30T15:21:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T22:53:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx_debugger: handle show buffer per doubleclick through an event filter","sha":"b9318f73e668daf7ecc5c8018643642d6eb4c9a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-30T15:23:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T22:53:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx_debugger: use PerformJump on doubleclick instead of the mouse scroll","sha":"c42b25f10e20e1593f6bc14201f28797c4192fae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-30T20:44:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T22:53:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx_debugger: clear command count when not used","sha":"2bf405e36d30ccc65d85c01ec037005a80974b20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-03-31T14:09:30Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-03-31T23:36:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellVdec: log error when using interlaced frame instead of throwing an exception","sha":"717f2b0ac851d7bd6ae76eb98ffc2f925e41224a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-01T17:52:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-01T17:52:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix MFC_SYNC_CMD","sha":"bb0cfe383db1538443f9992d6b42250feafe9b60"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-01T18:48:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-01T19:39:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Process RawSPU MMIO in do_dma_transfer","sha":"d871675b3b8ef282051cf1029d057a6ac0aff86f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-01T19:13:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-01T19:39:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix vm::check_addr usage","sha":"402ca480cdce36a3b15955cc3bf4378b581095e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-01T19:37:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-01T19:39:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix MMIO on SPU\n\nThanks Digitaldude555 for reporting the bug and @elad335 for pinging me","sha":"0e74f2e34048445f4a24dbec5a9ae000e1c59d6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-02T11:27:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-02T13:27:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve save data dialog\n\nBug fix: don't display new data entry when not asked for\nUse icon/title provided by the game for the new data entry\nDisplay new data entry at the beginning of list when necessary\nMinor cellSaveData cleanup","sha":"da9baac84272f5a1064e0ba5925711d9fb040033"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-03-31T06:58:28Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-02T23:17:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make loading StyleSheets work for AppImages and if installed via make install","sha":"8c19ff4fb9a5c642374cc64ed159e5111bb1a8fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-03-31T06:58:50Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-02T23:17:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Silence some annoying terminal output","sha":"b0352d6ef789d8c5c5bf804b0a3bcf3f12978857"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-30T10:28:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-04T22:06:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture cache updates\n- Properly implement section gather for 3d and cubemaps\n  Implements render-to-3d and fixes some corner cases for render-to-cubemap","sha":"e2914942826d911c0b729c23eaf9802e3a8844df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-31T23:47:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-04T22:06:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement proper Z-order curve in 3 dimensions\n- Should fix garbage palette textures getting uploaded (LSD graphics)","sha":"53f2533a081afbe68d5d849d0f0da80847c9ea87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-01T10:18:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-04T22:06:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix vertex input detection\n- Properly detect inline array registers vs constant value registers\n- Silence needless spam, 306E is 2D surface engiine, the assumption that y is multiplied by 306E pitch is not crazy","sha":"93b2776604d0febf27f2b65cdcfa8194d01210b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-01T11:49:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-04T22:06:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix alphakill","sha":"cfd0b8a97590c0a98056e0ae6d48a09e7419d737"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-03T16:43:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-04T22:06:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"vk: Squash some spec violations that went unnoticed","sha":"568118634e8cbdee1bb3546248eee6fda23af639"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-04-04T21:24:44Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-05T22:20:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Bundle libstdc++6 with AppImage to make it work on trusty","sha":"90e0bade77741457c09305d3662538e17e5c738b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-03T13:09:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-06T12:47:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: cache barrier/fence masks","sha":"e88508b679f3d3e660ad5ecbf5920f730ff1079d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-03T14:19:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-06T12:47:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use vm::passive_lock for SPU threads","sha":"d392379c7aaa11b3446c58808fcc1e6dbba5eac8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-03T19:42:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-06T18:47:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: improve TSX usage\n\nReduce transaction failure amount\nRemove vm::try_to_lock","sha":"2b5cf2455fbad3b8b202ede553882c46d2b1963c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-07T14:43:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-07T17:51:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite vm::reservation\n\nUse flat virtual memory area","sha":"3681507136a60b46dbd9e2c70ccadb33ea1e9b25"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-06T23:16:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-07T17:51:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fix possible livelock\n\nThe bug affects TSX path","sha":"0797164fac4faf4b46ea84f23f01ae84c1f4f6a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-07T18:18:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-07T18:18:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement sys_vm_invalidate","sha":"c77b3104220ca5d639b37537d31d40dab435c63f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18520201?v=4","date":"2018-04-06T22:59:46Z","email":"kingsleywong@rocketmail.com","login":"GinkREAL","name":"GinkREAL"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-07T22:51:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellVdec: Do not decode next frame during end_sequence","sha":"8a51af0b56bccee20f9e8831d4f3818e43538385"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2018-04-08T00:01:39Z","email":"26035046+Talkashie@users.noreply.github.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-04-08T00:01:39Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix typos (#4410)\n\n* MASSIVE TYPO FIX part 1\r\n\r\n* ANOTHER HUUUUGE TYPO FIX part 2\r\n\r\n* thank you :hcorion: for all of your help. I could not have done this without you","sha":"64992f758d31ec9b304ee12abc55b7004049935b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-08T11:03:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-08T20:30:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fix non-TSX path","sha":"ea82b732a3e7ddc3cf15b7ad9956acd34eadc04f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2018-04-09T20:16:19Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-10T12:06:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"msg":"Minor bugfix","sha":"7303f04bc5a76f42c6f27747457bd087fc1ea85e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-04-13T19:25:38Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-13T21:10:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add appstream metadata for linux","sha":"78bb9a727898d9bf6c2c5a08b4737a104c89ef01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-04-07T17:36:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-04-15T14:49:01Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: Fix vfs dialog reset and add some translations\n\nReset would crash the app, because a cleared item received a signal on currentItemChanged.\nAlso, Reset did not reset the list as one might think, but clean it and then result in wrong behaviour.\nFurthermore the settings were saved, regardless of accepting the dialog or not.","sha":"69b5f25644ea6391f44e00bacaffd7c556d0f6d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-04-13T09:31:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-04-15T14:49:01Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Rename Supporter","sha":"41f4bb90164040c0b149af902f5e748857da90de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-04-12T08:20:47Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-04-16T01:30:23Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix AppImages for distros that are not ubuntu 14.04","sha":"d957531dabff7ffb37c066f2957e5b3cb1dad721"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-04-16T01:16:43Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-16T11:11:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix appstream copypasta, thanks to @Dominator56 for pointing it out","sha":"2bb0387fc5bfe1250adab867f47dda6d048a8129"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26828095?v=4","date":"2018-04-15T19:52:06Z","email":"devil0129@gmail.com","login":"isJuhn","name":"isJuhn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-16T11:53:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix setParam in cellGameDataCheckCreate2","sha":"da6f98f310610800733185c0ad9d35a636366295"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8276932?v=4","date":"2018-04-16T12:43:45Z","email":"smartychrisje@hotmail.com","login":"TGEnigma","name":"TGEnigma"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-16T15:02:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixes PPU disasm for branch opcodes","sha":"6baf675205880eacf965130f85a90ebfcac9b9b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-04-16T14:58:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-17T21:28:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: implement log Repaint","sha":"cecfc5904067b51718f5c9c8fb1c33cfbd7ceef0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10617775?v=4","date":"2018-04-18T14:17:55Z","email":"theanig@protonmail.com","login":"TheAnig","name":"TheAnig"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-18T14:17:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implemented sysCacheClear() (#4445)","sha":"eb3dfb6bb496d443ccee90c7836f472d719e328e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-04-18T17:12:55Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-18T22:30:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"remove glapi.so.0, and do some minor cleanup","sha":"c6f44299c3fa91a85ab81113f2174f2007506212"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-04-18T17:13:19Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-18T22:30:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove weird whitespace from appdata\nFixes xml validation","sha":"3d551482a98dd36f9c27294f5748b30633e5c734"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-04-06T03:28:22Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-19T00:47:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Discord Rich Presence Integration (Thanks to @Megamouse for fixing the windows build)","sha":"3b24e7e685d075fc08c81ae6839bb809ea8e3cd4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-04-08T20:34:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-20T13:09:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellPad: check for more invalid parameters","sha":"8f4fa8a5b6ccdb9427ef12c8228fd80841fcf591"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/208340?v=4","date":"2018-04-21T13:30:14Z","email":"greg@unrelenting.technology","login":"unrelentingtech","name":"Greg V"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T17:06:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix build with ffmpeg 4.0","sha":"633004c82032ff1aefd76d6ff54fe92a4741980b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6501945?v=4","date":"2018-03-02T21:40:29Z","email":"pirhomanic@gmail.com","login":"flash-fire","name":"Robbie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T18:21:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Refactor debugger_frame into subclasses.  Mostly trying to simplify\nbreakpoints.","sha":"477522210e5152f7cfdbaa3f64d773fe0be10383"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-09T14:45:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T21:06:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT v2.0\n\nUse X86Assembler and blocks","sha":"8ca33bcb94617c8caf64a7cd7a31b4ad0a5952a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-16T15:27:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T21:06:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: übertrampolines and spu_runtime\n\nUse opt-out shared spu_runtime to save memory (Option: SPU Shared Runtime)\nImplement \"übertrampolines\" for dispatching compiled blocks\nPatch fixed branch points to use trampolines after check failure","sha":"3ffafb741c3d6141aef5ecfd4c2db851c0d0340f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-15T12:37:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T21:06:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: rewrite spu_channel_t","sha":"9ad5fc8a08c402559389f068ecfa306933aaf99a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-15T13:46:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T21:06:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: inline RCHCNT","sha":"00ce814501a43dcf8fc606069beaec683359ea8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-19T17:13:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T21:06:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: inline RDCH","sha":"2418de7e8b31a7c70be97374d1dab53307c471c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T20:11:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T21:06:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fix MFC_WrTagUpdate","sha":"9516250bec3cd95e92c6790ed1fe7cbaa011b21a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T20:54:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T21:06:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: inline WRCH","sha":"738a7cac4fd3db315f3ab02db242e37137140353"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T20:55:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T21:06:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix warning (fmt_unveil)","sha":"841d8955de860007186f81c174ac0b0502761c97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T20:55:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T21:06:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix warning (vm::reservation_update)","sha":"ef0196d791828677a32ad997219139366fd8a802"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T20:56:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T21:06:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix game title if unset","sha":"da6afb11f0dc9d0e5b2f611c57a49605c7a4264d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T20:57:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-21T21:06:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix unnecessary cache dir","sha":"bd1d4de422cd3fbf6839e10012cc5d7873f4f114"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-01T13:41:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Workaround for G8B8 render targets\n- Mainly affected are colormasks and read swizzles\n\nNOTES:\n- Writes to G write to the second and fourth component (YW)\n- Writes to B write to first and third component (XZ)\n- This means the actual format layout is BGBG (RGBA) making RG mapping actually GR\n- Clear does not seem to have any intended effect on this format (TLOU)","sha":"c5cd7587007015f77a1f77dddaedcb38ce7da359"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-04T22:00:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve format mismatch detection hack","sha":"cf1b700ebcd8fdb145b3c5e3db76a6178575fdf2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-07T10:19:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Reimplement textures\n- Separate texture data from texture views","sha":"6d46ac1ad6cd48ba5463856c576cd0552a407771"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-10T12:52:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays/gl: minor fixes\n- fix ogl color map for overlay resources\n- fix label background for save dialog","sha":"bb5622401ce1e3e7432ad112f791bab6cfd90ad1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-07T15:16:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Blit engine fixes\n- Ignore unlocked blit sections [TODO]\n- Do not attempt blit on hw if bytesize is unsupported\n- gl: Implement typeless memory transfers\n  Uses pbo to handle type-agnostic memory transfer","sha":"9abbbb79ae687f14548f93334b0897e25dfc2caf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-12T11:13:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Framebuffer fixes\nPrimary:\n- Fix SET_SURFACE_CLEAR channel mask - it has been wrong for all these\n  years! Layout is RGBA not ARGB/BGRA like other registers\n\nOther Fixes:\n- vk: Implement subchannel clears using overla pass\n- vk: Simplify and clean up state management\n- gl: Fix nullptr deref in case of failed subresource copy\n- vk/gl: Ignore float buffer clears as hardware seems to do","sha":"63d9cb37ececd3294e347779de6a94a64d998fbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-13T20:59:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture fixes\n- gl/vk: Fix subresource copy/blit\n- gl/vk: Fix default_component_map reading\n- vk: Reimplement cell readback path and improve software channel decoder\n- Properly name the subresource layout field - its in blocks not bytes!\n- Implement d24s8 upload from memory correctly\n- Do not ignore DEPTH_FLOAT textures - they are depth textures and abide by the depth compare rules\n- NOTE: Redirection of 16-bit textures is not implemented yet","sha":"a42b00488d6966553ebb0803b902900a2faf6baf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-15T22:59:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Critical fixes\n- texture cache: Avoid leaking memory sections\n  - Avoid double ref increment on flush-always reprotection\n  - Detect invalidated_resources entries in surface cache when protecting fbo memory\n- vk: Copypasta bugfix, properly initialize aspect mask","sha":"da99f3cb9a762f973d6d4c39f1946029c0b2e692"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-14T22:53:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor fixes\n- vk: Clear dirty textures before copying 'old contents' in case the old data does not fill the new region\n- rsx: Properly decode border color - seems to be in BGRA format\n- vk: better approximation of border color to better choose between the presets\n- vk: Individually clear color images outside render pass and without scissor\n- vk: Fix renderpass selection for clear overlay pass\n- vk: Include scissor region when emulating clear mask\n\nNOTES:\n- vk: Completely avoid using vkClearXXXXimage - its 'broken' on nvidia drivers\n  Spec is vague about the function so its not an actual bug\n  ClearAttachment is clearly defined as bypassing bound state which works correctly\n- TODO: Implement memory sampling to simulate loading precleared memory if cell used memset to preinitialize the framebuffer\n  Autoclear depth to 1|255 and color to 0 is hacky!","sha":"91a6091d26caceb7927a4ec2af77aadfeeea4b76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-15T23:00:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix performance counters\n- Detect jump-to-self type idling","sha":"c5d1f30e82a93ee4ccbdda868420b8de8afc291d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-21T15:12:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix border color selection","sha":"40ae5e605d899975a1316aa3ad1906f996c9e851"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-21T18:47:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"fixups","sha":"291a8282178df7756d7aac63c553bfa6ede644a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-22T11:22:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Reorganize handling of formats support\n- Formats support is linked to the physical device and by extension the logical device derived from it\n  It therefore makes no sense to track this as a separate object.\n  Simplifies parameter passing and template specialization.\n  Also avoids corner cases with AMD hardware (where D24S8 is not supported)","sha":"7e32e7343a5f61d224770bb74e1428bf95ae4ad8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-22T19:08:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Restore component mapping override for depth textures","sha":"58035697d54a5a1cdc57f129db6728f709fab918"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-23T09:11:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Workaround for lost memory sections\n- TODO: surface_cache and texture_cache need a better method of persisting partial framebuffer resources","sha":"f3210a9a3377214847bc64aa94386d25d05d01e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-23T13:13:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Improve pixel transfer code and notify on AMD driver bug\n- Readback does not work at all with float textures on AMD openGL\n  Driver throws a bogus OUT_OF_MEMORY error regardless of amount of VRAM and system RAM available","sha":"ffa62918aab98ff316ac23bc6e05438fead803fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-24T18:04:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T16:14:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Workaround for AMD driver bug","sha":"98b715d8c89f3c57b5e0e9f0a541a53d13e96617"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26828095?v=4","date":"2018-04-21T23:45:30Z","email":"devil0129@gmail.com","login":"isJuhn","name":"isJuhn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-04-29T17:38:00Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Add Rich Presence option","sha":"f27f7d50c909dbd2c91fb1e491636a1894bf0499"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2018-04-30T09:23:40Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-30T09:23:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Readme (#4503)\n\n* Update VS 2017 instructions\r\n\r\n* Mention build config","sha":"25ec899cfe2ff656da4384bed8656d5ff5c75b45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-03T19:48:23Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-06T08:49:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: make cellSubDisplayInit returns CELL_SUBDISPLAY_ERROR_ZERO_REGISTERED","sha":"ff1b0d73b77d2e2e25b28dfe56323ced39f33088"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1360752?v=4","date":"2018-05-06T10:21:50Z","email":"max-8000@hotmail.it","login":"Maxetto","name":"Maxetto"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-06T10:21:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update some lv2 syscall names (#4490)","sha":"dca6f1f8634cbc5784b81c372964ea1afa4a844f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-07T02:30:40Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-07T19:04:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gui/themes: Refactor Kuroi\n\nAlso tweaks a few things visually and removes dead code","sha":"753d8170d18d87c2ff09cfd304cb6564dbd7705d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-28T17:09:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-08T10:05:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: improve LWARX/LDARX consistency","sha":"f4af3f2987a27a28025be2b7711be4b2771cebe9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-28T17:11:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-08T10:05:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fix MFC_PUTQLLUC_CMD fence trait","sha":"4d60d85db5a8bc7d61641ba7435656504a737d98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-28T17:13:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-08T10:05:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: rewrite halt instruction\n\nUse conditional memory access to invalid address.\nThis approach can allow continue (for debugging);\nbut at the same time it doesn't add function call to recompiled code.","sha":"2fecddcde29308bdf583262374f758e0040ff479"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-28T17:19:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-08T10:05:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: allow holes in raw block data\n\nThis is preparation for further changes.\nThis commit shouldn't affect anything.","sha":"df453d6d4f593847c58ad27ec2f05c16e04e0316"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-30T16:39:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-08T10:05:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: internal jumptable\n\nAllow indirect calls within current function using a jumptable\nThis restores some functionality removed in SPU ASMJIT 2.0\nChange SPUThread::get_ch_value prototype","sha":"767dfa271e31e8e5a62e51bdd6573a2a5a8a9fc6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-30T16:44:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-08T10:05:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Analyser improved\n\nThis restores some functionality removed in SPU ASMJIT v2.0\nAlso implements new experimental features","sha":"16f5167aedb2374838d77a08f9ab169a7133d192"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-04-30T17:52:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-08T10:05:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: minor update","sha":"db229dffb001bf36c6a820cc93b192d34ec19306"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-01T10:15:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-08T10:05:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update .clang-format","sha":"18f9781ea8ce886f483995c880c7ea211b7d9dd4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-02T22:44:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-08T10:05:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve dynamic_library","sha":"a7c34123a66f08c9691b1fa14fc549dfe84bae37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-01T10:21:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-08T10:05:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update cpu_translator","sha":"8b704588d0a63a36976cb1151e61babe464e269b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-01T10:20:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-08T10:05:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use LLVM 6","sha":"a975ecdc4ff93dc26953012ef3d2e87f2e92e099"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-02T18:49:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-09T19:19:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM Recompiler (preview)","sha":"1ca51a023c11f122b50225d2a964489749251595"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-03T12:55:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-09T19:19:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: simplify patchpoints\n\nRemove SPU thread reference from spu_recompiler_base\nDisable support for far jumps in pathpoints (they were rare and unsafe)","sha":"8f91917e8c27120f305050c3aed4d281b0bb560b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-04T20:48:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-09T19:19:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Cfg: add missing get() methods","sha":"88dc6b7700f1fba7db09bb36ec89bf6df88bb3fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-04T20:48:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-09T19:19:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve fs::create_path\n\nDon't fail if already exists","sha":"eae78a8711c453818c414c7e6107c21b4bf66719"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-04T20:49:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-09T19:19:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement fmt::to_lower\n\nIt was strangely removed...","sha":"cfa9b163fd621b7657ce9dee94c5dc9d22010311"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-04T20:51:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-09T19:19:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: improve jumptable detection","sha":"acfe22e5bc7cca305bf4a1488b49c833ea6e1f6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-04T20:52:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-09T19:19:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Convert newlines in game title","sha":"f5ee6fb1133186c78cecc58a9b6afb41241b4c1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-04T21:01:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-09T20:35:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement SPU recompiler cache\n\nShared between ASMJIT/LLVM recompilers, compiled at startup","sha":"fe4c3c4d8423671a33ad7312b68c524155675985"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-07T18:57:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-09T20:35:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Memory mirror support\n\nImplemented utils::memory_release (not used)\nImplemented utils::shm class (handler for shared memory)\nImproved sys_mmapper syscalls\nRewritten ppu_patch function\nImplemented vm::get_super_ptr (ignores memory protection)\nMinimal allocation alignment increased to 0x10000","sha":"5d15d64ec8e5c37eb1308ce1a139f31bd074d426"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-09T20:35:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-09T20:38:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Set DAZ and FTZ","sha":"737db90058beb93d83d12ea94c405476ee594bfc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-10T16:38:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-12T20:50:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Re: more precise jt generation\n\nImprove analyser, set v1\nFix branch indirect conditional","sha":"be5c18cc859f5274b03e9a0a9c499089c03d1a63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-12T19:56:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-12T21:03:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM commit, use small code model","sha":"a77896c1b65384b2e367d3237df8ed145f3809dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-12T19:55:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-12T21:03:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Opt-in set DAZ and FTZ","sha":"4c7afb6952c74c054ebb57d1dfba3da4e4aa1e86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-12T19:55:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-12T21:03:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Travis: remove LLVM for now","sha":"7cb4672344f04c0e65a016a8dad86c6f248ac906"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-05-13T08:34:33Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-13T08:34:33Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"VirtualMemory: add missing header after 5d15d64ec8e5 (#4532)\n\nUtilities/VirtualMemory.cpp:123:8: error: use of undeclared identifier 'errno'\r\n                        if (errno != EEXIST)\r\n                            ^\r\nUtilities/VirtualMemory.cpp:123:17: error: use of undeclared identifier 'EEXIST'\r\n                        if (errno != EEXIST)\r\n                                     ^","sha":"177da2984db338e0a3e080d30d5923dcc756b3f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-05-13T09:18:05Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-13T09:18:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: initial capture/replay functionality (#4510)\n\n* rsx: initial capture/replay functionality","sha":"75b40931fc1b8c1e4544f3de16fe25f549184d29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-03-20T11:14:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-13T11:44:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve fragment and vertex program usage\n- Introduces a gpu program analyser step to examine shader contents before attempting compilation or cache search\n  - Avoids detecting shader as being different because of unused textures having state changes\n  - Adds better program size detection for vertex programs\n- Improved vertex program decompiler\n  - Properly support CAL type instructions\n  - Support jumping over instructions marked with a termination marker with BRA/CAL class opcodes\n  - Fix SRC checks and abort\n  - Fix CC register initialization\n  - NOTE: Even unused SRC registers have to be valid (usually referencing in.POS)","sha":"a52ea7f8700b4205a186ed4d99d69a929a54465c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-10T15:06:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-13T11:44:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Optimizations for program management","sha":"440a31ef18f7a5f6e86de682d0270dd475144654"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-20T20:44:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-13T11:44:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Improvements and minor optimizations\n- Improve dirty state tracking affecting program state\n- vk: Refactor out transform constants upload into a separate channel to avoid if possible\n  transform data uploads are quite expensive","sha":"b7979d3f57bc078bb7bd27edf834ed7fab20af9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-21T15:02:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-13T11:44:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: AMD primitive restart bug workaround\n- Emulate primitive restart with degenerate triangles","sha":"eccb57d4b8e6d8ed197791748e678b6b5ac0387a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-29T13:14:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-13T11:44:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Improve AMD multidraw workaround\n- Reimplements the AMD workaround using an identity buffer to avoid the performance hit of doing multiple glDrawArrays for every single compiled set\n- Reimplements first/count allocation using a scratch buffer to reduce allocation overhead when large number of draw calls is used","sha":"1aa44ede3115a529c507a7e7c441d3627a54fb18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-06T10:37:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-13T11:44:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve puller state management\n- Properly identify puller spin primitives\n- Add a small wake delay after exiting a spin delay. Fixes desynchronization\n  It seems real hw has a small delay between cell edits to commandbuffer memory at the GET address and the changes becoming visible to the DMA puller\n  Simulated with a short busy_wait, large values will improve sync but degrade performance","sha":"bff6060bd6b56c88ffa8570b63b0b7698549a8e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-09T16:42:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-13T11:44:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Include RADV POLARIS and RADV VEGA in the primitive restart\nblacklist","sha":"9d1f4a25380ae74ea5590987b9af5c47299ad104"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-04-25T10:59:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-13T11:44:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"exclude qt autogen files","sha":"ad108720fb4358104a00ec0f0dabd49a93d74d63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-13T10:48:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-13T11:44:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix build","sha":"4836a03a7dbafd9a8899b8afccdb50ac452c021d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-12T16:22:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-13T14:39:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Create qt/plugins dir to tidy up our Visual Studio builds\n\nsee folders: bearer, imageformats, styles and platforms.\nThis will stay compatible with the old builds too, unless someone wisely put their plugin folders into a 'plugin' subdirectory","sha":"a39384cadda5244fe64e40bbae750c26d101463c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-13T16:22:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-13T17:02:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Use additional windows resource file for qt.conf\n\nfixup for a39384cadda5244fe64e40bbae750c26d101463c","sha":"84a4671a0edf046d92960c1d0ecef1d395deb21c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-13T17:34:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-13T17:40:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update SPU cache (v2)\n\nImprove SPU analyser: filter unreachable fragments\nMore strict NOP/LNOP analysis\nFill block predecessors info\nASMJIT: fix assertion and improve indirect branch","sha":"3c70645f0bd79603a51c0ca0c3e2c3205cff827c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-13T19:50:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-13T20:56:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Increase open file limit on Linux\n\nAdd some assertions to VirtualMemory.cpp","sha":"a46ef4f29ae3857747b2708d7d24a895701a6d50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/38361979?v=4","date":"2018-05-13T17:25:01Z","email":"38361979+creeperjedi@users.noreply.github.com","login":"paxsyr","name":"creeperjedi"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-14T13:41:50Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Added (experimental) next to LLVM Recompiler","sha":"819ed801a747ee2ff180c02d06368b846071d4b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/462484?v=4","date":"2018-05-14T14:32:47Z","email":"13thSlayer@gmail.com","login":"ooa113y","name":"tlm-2501"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-14T14:32:47Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Add description for SPU LLVM (#4558)\n\nNot entirely sure on the wording, but some form of a description seems necessary.","sha":"21dc05265d3628cca35b382cf3a9b98c644953b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-05-11T04:12:58Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-14T15:01:19Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"build/cmake: pass -DNDEBUG by default like msvc\n\nDownstream may override CMAKE_CXX_FLAGS_RELEASE in order to enforce\nconsistent optimization flags for every package. If -DNDEBUG is lost\nRPCS3 may run slower and fall victim to assertions in bundled libs.","sha":"2cfb2428d28e84284dc5316f7c4095199bd51d37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26828095?v=4","date":"2018-05-11T01:38:10Z","email":"devil0129@gmail.com","login":"isJuhn","name":"isJuhn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-14T15:56:47Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix setParam in cellHddGameCheck","sha":"fc23243d0124008cad19469a50eaf06e5ee83910"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-04-29T06:41:51Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-14T17:14:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"typos","sha":"04ad49de4dc85be73ef7be28f21b388577082783"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-05-15T00:27:50Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-15T12:06:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix xxhash and AppImages Fixes #4573","sha":"036448ac3f3d2b7532610097868963e2439b7e38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/13741880?v=4","date":"2018-05-15T16:40:45Z","email":"gavingao@zju.edu.cn","login":"sftt","name":"sftt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-15T16:40:45Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Avoid illegal available_user_memory in sys_memory (#4399)\n\njarveson says \"the comment and minus can be completely deleted/reverted\" in 17cf24d0edb0f005166a128bdf40c86afde0662f","sha":"27004eb93487d3e3ecfa8a480e093af4c714877b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-04-29T08:50:12Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-15T18:59:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: improve cellSync2 error checks and logging","sha":"196f985283adf08de5ba48c7377804f420a3b843"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-04-29T12:10:37Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-15T23:56:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rpcs3-tests: remove project\n\nIt is currently unmaintained and obsolete","sha":"b97a9d22f59d3949dd3c00f73fa205faced3b636"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-01T13:42:28Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-15T23:56:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ps3emu_api: remove leftover files\n\nInitial removal has been started with commit 6dd2c78b1bf681ae5f7b17d20be32198c63fa31a","sha":"7518200c7eb654d8a5fffcf95c5ae118a0a1b720"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-13T09:18:49Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-15T23:56:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"emu: remove wait_engine files\n\nThese files are empty and do not serve any purpose currently","sha":"fd8aae5725e55163ab0685f767eefaaa4a0b2c0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-14T20:06:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-16T12:48:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement build_function_asm\n\nUses ASMJIT to build function at startup","sha":"fd525ae1cf8330a8c66a5cffe6846fbb4cf15d8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-14T20:07:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-16T14:31:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Build transactions at runtime\n\nDrop _xbegin family intrinsics due to bad codegen\nImplemented `notifier` class, replacing vm::notify\nMinor optimization: detach transactions from global mutex on TSX path\nMinor optimization: don't acquire vm::passive_lock on PPU on TSX path","sha":"367f039523fb696ae2adda60b0eb0ac29eca75cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-05-12T18:25:24Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-16T20:01:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"re-enable LLVM for travis and build AppImages with LLVM 6","sha":"705525510e869f0842c80e9b8f0ab052192a4049"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-16T18:50:20Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-16T20:53:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Compilation fix for GCC 8 (at least)","sha":"70e2873e697bf2bfc46810bae534d77f234cdd20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-16T18:51:25Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-16T20:53:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove old references missed in commit b97a9d22f59d3949dd3c00f73fa205faced3b636","sha":"2bb5354fd930728aa21fe168ccccb7a88c0bfa57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/300430?v=4","date":"2018-05-01T23:10:19Z","email":"florent.castelli@gmail.com","login":"Orphis","name":"Florent Castelli"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-16T22:35:53Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Add EXCLUDE_FROM_ALL to add_subdirectory calls","sha":"afd55da8cb01076d73cf024f33f285ccc6abc3e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/300430?v=4","date":"2018-05-01T23:11:01Z","email":"florent.castelli@gmail.com","login":"Orphis","name":"Florent Castelli"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-16T22:35:53Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Link against the top-level LLVM targets only\n\nDependencies are still linked through usage requirements.","sha":"253248349f3cf960572ba9a104a5ac4370ec5d74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-05-16T23:38:14Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T00:42:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"JIT: add missing header after fd525ae1cf83\n\nIn file included from Utilities/JIT.cpp:1:\nUtilities/JIT.h:33:23: error: implicit instantiation of undefined template 'std::__1::array<asmjit::X86Gp, 4>'\n        std::array<X86Gp, 4> args;\n                             ^\n/usr/include/c++/v1/__tuple:223:64: note: template is declared here\ntemplate <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;\n                                                               ^","sha":"a68dac7282b66298278f39dcfeff98517f98eae2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-16T19:27:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-17T02:49:07Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"gitignore: improve bin","sha":"3e71284d563a80167ea5a640cb89787d9234f487"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-04-07T17:42:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T10:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Hide firmware and path columns by default","sha":"49a4015d5d5179966636003d7eb96dc496312c79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-04-07T17:48:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T10:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: use GameInfo's bootable instead of GUI_GameInfo's bootable member","sha":"28e19a1d1458af39b3e6a62fe0728bda21734d5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-04-07T17:52:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T10:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix gamelist sort by adding a sort_role to custom_list_widget_item","sha":"3ba133f485559e735e51e09e420c8c498404ea6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-02T15:59:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T10:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add \"Move Support\" column to the gamelist and load the info from psf","sha":"1cff1ca03ef06c0b90d558f1f26d92e9e6d99b26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-04-18T17:50:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T10:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: use NoEditTriggers instead of ItemIsEditable flags in the gamelist","sha":"8b54552ddf64d3579756cf491e62f61ca5b3a888"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-01T01:21:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T10:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: minor fix for compat downloader","sha":"baec681c9e0bf194c490bf663610e05d01ea5159"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-02T15:28:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T10:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: merge custom context menu functions","sha":"9a1c0e457786755060eb33f6a8994e121e285e37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-02T19:57:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T10:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: streamline game removal in game list and fix followed item selection","sha":"e43afa71480880ba0307d71ff097c5aaeac6b426"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-02T15:22:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T10:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: streamline custom config refresh in game list and thus ignore scroll\n\nmove l_GetItem lambda into custom_table_widget_item constructor","sha":"cafcac9ccde1b0322ed32f0a315c76735b068c23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-02T19:58:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T10:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Use pointer to game info instead of index in game list\n\nthis should fix differences between model and view","sha":"ff2c05da50b162f507ea3e5c8591093b8925c736"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-03T15:19:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T10:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add sanity check to remove game (prevent nasty system flush).\n\nand minor code refactor","sha":"29318803a6b656f64b84b0458b691aa37c675d3d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-04-18T17:40:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T10:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: simplify horizontal header text alignment in the gamelist\n\nNeeds reset of the gamelist state in the settings to work properly.\nAlso added minor refactor","sha":"2eae06454b7b8bb9ffc5846ebf31038bf4405268"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16286075?v=4","date":"2018-05-17T11:00:22Z","email":"psdev21@gmail.com","login":"pauls-gh","name":"pauls-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T11:00:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Set Windows timer resolution to 0,5ms (#4579)\n\n* Fix for https://github.com/RPCS3/rpcs3/issues/4569\r\n(Win 10 update 1803 performance regression)","sha":"fdef77d7798f3385fc65ce08f0c5058710cf187a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-04-29T06:40:50Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T14:42:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cmake: update cotire to 1.8.0","sha":"5ef1cab30bc5f5ab87b45092522dcc6d91bb57de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-02T18:29:38Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T14:42:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cmake: remove unused \"CMAKE_BUILD\" definition\n\nIt was introduced in commit 855d693 and used in the file rpcs3/Gui/GLGSFrame.cpp (wxWidgets) which doesn't exist anymore.","sha":"e1e0af5f8139ec57aacf1ce252516fcffca78d49"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-01T11:38:58Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T14:42:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cmake: remove leftover from #4329 about X11","sha":"580c8b88032becbc8e8e81f1b97d651f05eb7473"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-10T08:43:40Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T14:42:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cmake: use -Wno-unused-command-line-argument only with clang (gcc doesn't have this option)","sha":"3dfe46fc426ebb6ce16c8972d3793b5a5aaef87f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-04-29T06:39:12Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T14:42:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cmake: improve pthread inclusion","sha":"8f975e23298726bd277428e8a1a57134e9971f06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-01T12:51:13Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T15:20:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"travis: improve osx build (still not working and disabled)","sha":"3918a9b9fdefa2c0eb8e5248404f8d8558e24333"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-01T12:51:45Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T15:20:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"travis: remove Vulkan-LoaderAndValidationLayers submodule checkout","sha":"06a6cfb9f75b6319fedd224d65fe3a0eab6642bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-14T16:51:03Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T15:20:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"travis: minor qt cleanup and improvements","sha":"ae0f27a18e369de5e88ed08ad1a8ec258bd62111"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T14:39:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T15:33:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup (endless loop)","sha":"58e4d49bb5d1c4c59bc8d23aa17594d2c82e2f1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T14:40:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T15:33:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Cleanup: unused imports","sha":"08cd8e0cb12bc8e0ffd71e4809395ad0ac99fb55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T15:56:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T15:58:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"spu_putllc_tx: preload a little more (WIN32)","sha":"7afda26c699767bc89dcf4d751c0874c01ca84ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T16:34:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T18:21:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: Allow waiting on LR+TM events (fixup)","sha":"39088e50054516adb631df735e34d02b8019d156"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T18:29:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T18:29:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Change retire strategy in cond_variable::imp_wait (WIN32)\n\nInstead of waiting infinitely, try and yield until success","sha":"0b1c8bc6766c65d66e503f806f287333ad6d465d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T19:19:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-17T19:19:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Transactions: touch memory only after a failure\n\nMinor optimization","sha":"67391322f4d29cb0a707a6d76050739a088f6555"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-04-18T17:37:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T19:17:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"TROPUSR: add GetUnlockedTrophiesCount()","sha":"4e5cceb03e090e47c3448a924d92a02240a0c7a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-17T20:36:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T19:17:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: trophy manager overhaul","sha":"d275c36e0aab920322b4e5ca36604d44e8d54290"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-17T09:41:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T19:17:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: remove trophy_tree_widget_item.h","sha":"6f0bad34f4b7cc40813ef37ddfa071a380fb7542"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-17T17:30:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T19:17:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add game icons to the trophy manager\n\nand fix some header behaviour","sha":"bb8e89f84acf323beb666fe7d024b79ebd72da86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-17T20:31:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T19:17:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: rsx debugger replace wrong setSectionResize command","sha":"aee03114fd0566df27b3f14b4a207ff78c2fa95d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-17T20:33:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T19:17:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: improve game list header behavior","sha":"9c025be831b2a4610870079a5395a9f14604f904"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-17T22:05:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T19:17:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: refactor Get-/SetGamelistColVisibility","sha":"2b8f96dcec17a633da360cf8c13d163b5221423d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-18T07:01:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T19:17:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: refactor game list column initialization","sha":"d1a9afbd676439ad9c1e778eb85563f9ed61d15b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-18T07:18:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T19:17:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: use column names instead of numbers in gui_settings","sha":"99c52a0d0c025b5b31f4a9a1061562a6b7484934"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-18T07:20:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T19:17:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: resize initial game list headers to minimal size if necessary\n\nwe do this on showing columns already","sha":"9269d8a3703168bcfab58ac5e3a3555bbd5014f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-18T07:58:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T19:17:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: trophy manager - fix trophy sorting by ID + handle some warnings","sha":"6b3eebc907674fe6041aec452a6d3366509f3877"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-04-24T08:23:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-18T20:30:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: Enable all play options for the last played game on StartUp\n\n- main_window::CreateThumbnailToolbar into main_window::Init\n- also moved the log message for \"Recent Game Not Valid\" from Error to Warning (only the common occurance)","sha":"4e8ce7fac03e045ade2014ac087a911c443272af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-04-29T11:33:15Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-19T07:59:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"3rdparty: remove Vulkan/Vulkan-LoaderAndValidationLayers","sha":"6c5c89a4a3aece34a8d3a359986f792efe7cdf3b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-18T19:37:20Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-19T07:59:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"log: add Vulkan header version","sha":"bf2f00a163e6064466c95b54503c439c785c300f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-19T18:09:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-19T20:59:13Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: Fix compat download exception","sha":"67637dfaa454e8b725f40a0c5be1d74d4764033b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-19T20:21:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-19T20:59:13Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: Fix obnoxious glitch where game list columns ended up with 0 width\n\nQt can be messy at times","sha":"95951c31f8afc6b993449086e825cbdc5c4b3e9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-19T20:30:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-19T20:59:13Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"gitignore: also ignore .dat files and KD-11's weird backups","sha":"e1c9d8cb5978bb3d5dfad7711d96df804a4397c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-05-19T20:30:57Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-20T02:03:24Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"build: Add xxHash as an emucore dependency (fixes Windows build)\n\nPreviously needed to manually build the xxhash project before emucore (linker error)","sha":"05efa7d95798bb26189db8801f4f46824914ba22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-19T21:37:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-20T10:29:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Restrict trophy manager combo box size","sha":"4c03348e60e6d269a76281d94b4216022ef55cd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-20T00:14:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-20T10:29:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Change Trophy Manager to use item selection instead of double click","sha":"f8bbdc39c55f41d7b5b82b7aaf2d1b2a492a1b7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-20T02:53:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-20T10:29:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Fix missing rows in our beloved trophy manager","sha":"c61049b76fd9cc743066b5f190576f8335e1b022"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-04-06T12:19:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-20T19:16:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: don't return after funcStat was successful in savedata_op\n\nalso add some missing constants","sha":"68fff54a8b9b048dde3bea1f0efb308e410e0800"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-20T20:05:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2018-05-20T20:05:00Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Native UI refactored (#4623)\n\nRefactor and improve native overlays","sha":"f6f45b86995acd2421302f0b17abfce9e96071ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T15:51:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-20T21:18:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Transactions: move loops inside\n\nRewrite loops in assembler (minor optimization)","sha":"33a1c743a43997199c0ea8bd89b10100e20e6d1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T15:53:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-20T21:18:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update SPU dump: print current MFC cmd","sha":"8d5bbfb85082887e539c4a078724cf7007acd539"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-18T20:19:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-20T21:18:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Replace notifier::lock_shared() with try_lock_shared()\n\nAlso add notify_one(), try_lock() and unlock()\nMove some code in cond.cpp","sha":"a33f297315d566153fca7a55b79ba77afbf52dc1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-19T20:14:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-20T21:18:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"spu_putlluc_tx: diagnose loop count","sha":"295f782b30c9f346f4596d0f89dc69a4327be3c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-19T20:20:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-20T21:18:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"spu_getll_tx: diagnose loop count","sha":"7a6db3dd7eaf911c2c392d86852a5ab6e0693617"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-20T12:13:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-20T21:18:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix vm::reservation_notifier","sha":"fb0f5f0c8ba3b2efb7290abb5ad538db2a08d12a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-20T13:38:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-20T21:18:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Transactions: drop RDTSC usage\n\nUse simple increment (minor optimization)","sha":"6fd402bcf82903a210d5e5da22d5fc0b03464ba4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-21T12:21:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-21T12:55:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Facepalm\n- overlays: Do not free self handle!!!!","sha":"c9669818ebde71820ba243eaf668da2a162ca6ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-21T17:26:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-21T18:47:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData fix","sha":"182259e4a51208d64da4179248f77b4e6af475e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-21T17:25:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-21T18:56:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: use reservation spinlocks on writes (non-TSX)\n\nThis should decrease contention by avoiding global lock","sha":"72574b11ffe1e6f13213cbcfe46f4694f80c7bd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-10T23:02:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-22T15:27:33Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: include QButtonGroup in settings_dialog.cpp in order to fix Qt 5.11","sha":"598008868e8a5fe4846da299205a219f54feac6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-21T12:13:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-22T15:27:33Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: use correct menu icon for \"Play last played game\" on booting RPCS3","sha":"31101b482847505b73d0b0e11d030776e956ff44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-22T09:15:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-22T15:27:33Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: simplify occasions of restoreState","sha":"bff9a06f9fd5bdd982c12d4768835b1d41d3ef17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-22T09:38:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-22T15:27:33Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: apply header states after populating the tables","sha":"325048a134d859a26a8b8143a64db268c510af89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-22T09:39:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-22T15:27:33Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: disable resizing trophy tables to contents by default","sha":"f1670a9ea0e68f9dd328657e18e5e1b686aa790a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-22T12:13:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-22T15:27:33Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: resize game list columns by default with slight spacing","sha":"40d2341ef17d262c8c54231f4bca27c1ee439800"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-22T10:27:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-22T15:27:33Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: remove redundant visibility check in FixNarrowColumns","sha":"7c031c23303e509f9a44e3cb30447c37a622a6a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-22T09:02:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-22T15:27:33Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: set smaller default log frame height","sha":"62efe6e5be7d3ca78eb610b6bc78600541779fd6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-22T13:58:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-05-22T15:27:33Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: Workaround for yet another hidden column resize","sha":"b230b0df0d6abcea74c578dbae2d68ea488dd5d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-21T14:38:47Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T10:54:27Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: link with vulkan-1.lib instead of VKstatic.1.lib","sha":"2270b8d15c7c8d00e27f62671db60fd7e3ae0c96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-23T08:55:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-23T12:36:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: remove passive lock (fixup)","sha":"3e580afe2167844e38ede788378926f1fb87f402"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-23T12:34:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-23T12:36:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move SPU LLVM log file","sha":"c5d8d5090833c32e612c3f2da7fb325e98277350"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-23T12:36:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-23T12:36:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add Human=true in appveyor.yml","sha":"00f5335895f399ebbaf7fee2e63622091c0de7eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16286075?v=4","date":"2018-05-23T14:02:35Z","email":"psdev21@gmail.com","login":"pauls-gh","name":"pauls-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T14:02:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Performance enhancement - Vulkan memory allocator (#4635)\n\n* Incorporates the vulkan memory allocator from the AMD GPUOpen project","sha":"f8a0be8c3e7f70b4c60768631902d7244e5c7978"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-10T11:50:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T16:07:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture cache fixes\n1. rsx: Rework section synchronization using the new memory mirrors\n2. rsx: Tweaks\n    - Simplify peeking into the current rsx::thread instance.\n      Use a simple rsx::get_current_renderer instead of asking fxm for the same\n    - Fix global rsx super memory shm block management\n3. rsx: Improve memory validation. test_framebuffer() and\ntag_framebuffer() are simplified due to mirror support\n4. rsx: Only write back confirmed memory range to avoid overapproximation errors in blit engine\n5. rsx: Explicitly mark clobbered flushable sections as dirty to have them\nremoved\n6. rsx: Cumulative fixes\n    - Reimplement rsx::buffered_section management routines\n    - blit engine subsections are not hit-tested against confirmed/committed memory range\n      Not all applications are 'honest' about region bounds, making the real cpu range useless for blit ops","sha":"8fcd5c1e5a83a5159525cf8c723cd701ec8e26c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-18T20:55:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T16:07:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Lower format compatibility severity since it confuses some people","sha":"f2a3167193c523e19aa9f8ed827bf1c7ae36a479"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-18T21:16:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T16:07:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Silence some meaningless error","sha":"3f14bc6961c900b3973f12ac834de8bcb356e4d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-17T16:14:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T16:07:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Do not do extension test if in a fast context (enum only)","sha":"d283200e1336c96a0494aaf6bcb52f5980fd223b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-19T11:54:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T16:07:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix segmented memory access for rsx::super_ptr","sha":"fbf65812496091e265ad3bba180d9ebf09e53e99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-19T12:42:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T16:07:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"fixup - range check","sha":"f8d999b3846a4916a4261a263ebe90acd2d6567a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-21T07:58:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T16:07:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Optimized cached write-through\n- Allows grabbing an unsynchronized memory block if overwriting contents\nanyway\n- Allows flushing only specified range of memory","sha":"d2bf04796f105e1c02e67776ccb551a29d363428"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T09:55:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T16:07:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Avoid calling any blocking callbacks from threads that are not rsx::thread\n- Defers on_notity_memory_unmapped to only run from within rsx context\n- Avoids passive_lock + writer_lock deadlock","sha":"b957eac6e80b2ef1ad2f215a0449e4ab87a071c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T14:32:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T16:07:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"fixup - locking","sha":"92b5a705d8cefc022ca25e1145c91baa45155b8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T15:21:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T16:07:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Clean up memory allocation and fix GPUOpen VMA for Radeon","sha":"f38f61d110c14c80213ac404e89a2e12a7769164"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T18:13:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-24T07:36:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup - fix broken memory protection fail caused by region respec\n- Some applications will alternate memory between framebuffer and texture data","sha":"b030d1900c815869783cfdb8865445d25f941729"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-23T18:51:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-24T07:36:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"fixup - Improve invalidated region checks for performance","sha":"493d4e8613fd1ab966257dee531bf3ded6df9b7a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-24T06:20:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-24T07:36:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: fix wcb regression\n- Partial framebuffers and blit targets are possible!","sha":"0fc67aa2f60b7448c8d8681bb876e43dfdfad101"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-05-23T23:32:09Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-24T16:00:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GPUOpen: drop bogus include\n\nGNU libc and musl have aligned_alloc() in <stdlib.h> while on BSDs\n<malloc.h> shouldn't be used.\n\nIn file included from rpcs3/Emu/RSX/VK/VKMemAlloc.cpp:2:\nIn file included from rpcs3/../3rdparty/GPUOpen/include/vk_mem_alloc.h:2233:\n/usr/include/malloc.h:3:2: error: \"<malloc.h> has been replaced by <stdlib.h>\"\n #error \"<malloc.h> has been replaced by <stdlib.h>\"\n  ^","sha":"c09c79263658ffd7fb201df307adfb0b5d7ac970"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3586606?v=4","date":"2018-05-23T18:38:44Z","email":"nicba1010@gmail.com","login":"Nicba1010","name":"Roberto Anić Banić"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-25T12:56:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Vulkan SDK Mirror\n\nSetup Mirror for Vulkan SDK executable.\nLet's not be assholes and append ?Human=True to the link cause we might get ourselves put on a blacklist if we keeep using it after the requirement stops.\nIf the mirror is down it will fail back to lunar cdn.","sha":"fed94e3823164426c8e5fa9425f85e3f90d5be35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3586606?v=4","date":"2018-05-23T19:36:47Z","email":"nicba1010@gmail.com","login":"Nicba1010","name":"Roberto Anić Banić"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-25T12:56:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add SHA256 hash verification\n\nAmended 3 times because of my stupidity...","sha":"2bfafe4b0dcdbe3c19e8f87338b437293c8ecc72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-25T12:34:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T10:54:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Avoid race condition on remove-on-update views\n- Improves cleanup code to consist of 2 parts, remove then dispose. Remove\n  does not deallocate the item until dispose is called on it, allowing the\n  backends to first deallocate external references.\n- Caller is responsible for managing list locking and tracking disposable list\n  of items when external references have been cleaned up before using\n  dispose method.","sha":"2adb2ebb00eae46ad0c30b617254d9fefc6d2a7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-26T10:06:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T10:54:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"lv2: Reimplement sys_timer_usleep\n- Matches ps3 accuracy for all tested values with few exceptions\n- Do not enter the host OS kernel if waiting for less than 500us to avoid scheduler issues","sha":"be13a776f47dd8f8f5ef641887eb7be404d27cae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-26T10:37:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T10:54:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Promote FIFO optimizations outside of strict mode\n- The benefits of FIFO optimizations are huge in some cases.\n  The optimizations also do not break any tested applications so no need to disable with strict mode\n- A debug option is provided to disable this behaviour for testing","sha":"83f9be252419979b0064512fcf3e88bc2396248d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-28T13:52:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T10:54:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"lv2: Ease the pain of lower end CPUs\n- Avoid busy waiting in usleep code as much as possible, instead yield\n- Also avoid busy_wait for SPU concurrency choker","sha":"d48f391b414965b88ec84727376ee9b01fc95258"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T10:19:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T10:54:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"disable thread scheduler on intel","sha":"824340363d0c2564533156691aa8cf3d9a92ac63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-05-19T06:44:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T16:57:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx: fix unused pointer dereferencing","sha":"8eab9fe36ca78d243922b645849a96018f947dde"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-05-19T10:07:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T16:57:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx: fix mem_handle id","sha":"0a7902d313e551c54124da24ed3024f74842e90a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-05-19T12:46:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T16:57:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx/cellgcm: return EINVAL if the io map requast's size is 0","sha":"97515a09413de29efc54a56f3d97dd2346e83d94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-05-22T18:05:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T16:57:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cellgcm/sys_rsx: fix multiple io maps at the same effective address and vice verse\n\nfrom hw testing, as long as the io address is valid, it returns CELL_OK, even when it doesn't make much sense","sha":"c2b2dee56dbf54134ae52cec1d178f2387a15661"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-05-22T18:16:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T16:57:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cellgcm: use offset table to get the corresponding address to io address","sha":"ce98c962f8d752f557c943369c1d71808b155c4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-05-27T10:48:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T16:57:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"allow deallocations to unmap rsx mapped memory","sha":"23b380eb41fa1781bc7fef9f3a49b33531e4e0ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-05-25T03:52:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T16:57:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cellgcm: implement cellGcmTerminate","sha":"8826948c431ad7afa9328badc14d296665071bc4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-05-29T17:34:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-29T20:34:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fix memory mapping alignment","sha":"4576a31f47dbdb72a107c4d29cbb7761884d0bb9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-05-24T19:20:13Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-30T09:35:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"util: Class for getting overall CPU usage and thread count","sha":"5defa9c7b07db3e8c0aeffc4d90cda24a96f705c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-05-24T19:22:07Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-30T09:35:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"util/thread_ctrl: Method for measuring cycles a thread has run for\n\nAlso add a getter for the native thread handle.","sha":"8981227644a9d9f2a3f2ea87b3a409699f943529"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-05-29T21:37:59Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-30T09:35:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Allow for non-interactable UI components\n\n* Also fix a few warnings in overlay_controls","sha":"33b01d93069a022dabaebd0d80519f4e9dd32f82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-05-24T19:32:07Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-30T09:35:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Font improvements\n\n* Support for using arbitrary firmware fonts\n* Support for specifying font extension in `font` constructor (useful for most firmware fonts that use .TTF)","sha":"c2e17d04e13741d1c80f525728c3e7186b45848c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-05-29T21:38:21Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-30T09:35:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Performance Overlay","sha":"c8d8a81ccdbac6b74e423ba8a284ec2c37d69cbd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-05-24T15:33:23Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-30T09:35:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"CPUStats: add support for macOS and BSDs","sha":"3d632a37747547e8971d2d62ce7243285a41b7a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T11:53:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-30T10:30:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Avoid semaphore acquire deadlock","sha":"63629429288274438eba32d7ab8b209fcc4ae68a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T12:11:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-30T10:30:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/gl: Fix flush synchronization to be kinder to weaker CPUs but not harm higher end CPUs","sha":"f543fb0243f90591009c7857c5ea19f6d4033a59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-29T13:00:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-30T10:30:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"facepalm","sha":"cf2cb7978b69d1cafb33ba5b48360e54dde06b7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-29T21:25:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-30T17:31:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Add a gui tab to the settings dialog\n\nthis is mainly to make place in the emulator tab","sha":"cc50d503ef1868fc0e72489ae40636658453457c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-30T10:43:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-30T17:31:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Add performance overlay options to the emu tab in the settings dialog","sha":"c5709f71b3ef35b486c0908f20653a77355cce81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-24T14:18:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-30T17:35:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: improve SHUFB","sha":"944e89058e698556f1763b1d5eae7cb45c34822c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-27T10:30:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-30T17:35:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use memfd_create (Linux)","sha":"1193ab0b89daeae516fa055c93bb087b1be8f07d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-27T12:29:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-30T17:35:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Extend ppu_decoder/spu_decoder templates\n\nAutomatically dereference pointers","sha":"bebb1bdeda41f3f47f0cd92b2a4e194fad78b970"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-27T20:37:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-30T17:35:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: rewrite spu_interpreter::SHUFB\n\nUse ASMJIT to generate SSSE3+ code at runtime\nRemove static SSSE3 code from spu_interpreter","sha":"bdf654557164479f7d2e8f6758bac8566891ad54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-28T10:40:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-30T17:35:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix warning (ignored attributes)","sha":"55e9d437a981350cf22681ace529d2bdc118c6fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-28T17:02:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-30T17:35:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: rewrite FSM/FSMH/FSMB instructions\n\nRemove lookup tables","sha":"759370ea1b97e5c85c9291040b00c0187472e25e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-28T19:28:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-30T17:35:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: emulate PSHUFB\n\nFor targets without SSSE3 support","sha":"37577714faf2d46bf2d95933585d6630364b4511"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-28T19:30:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-30T17:35:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: fix *QBI instructions (UB)\n\nImprove codegen at the cost of unnecessary shuffle, use u64[2]","sha":"a2253e840f28c06546cdd8231e05be94e7c4ea2b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-30T17:34:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-05-30T17:35:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite LLVM compilation progress dialog\n\nUse a single dialog","sha":"b0ee369135631b6f3332e02a5b5b6ddd810142e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-31T05:43:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-31T08:22:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlay; Fix leak","sha":"9f9e1b5fe093496fa09a98b061e17f214dfe164d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-31T07:35:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-05-31T08:22:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vulkan improvements\n- Remove deprecated device layers\n- Reimplement overlays resource management using real heap instead of using first_vertex hack","sha":"87b510d5bfb3fe82e1acc74089cbb9d4a3078201"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1094884?v=4","date":"2018-06-01T16:49:29Z","email":"dcabecao@gmail.com","login":"Dravonic","name":"Dravonic"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-01T16:49:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Parallel shader cache loading (#4677)\n\n* Parallel shader cache loading","sha":"400079a0067cdf1bc3d58c2d256052fb07a721ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-06-01T17:36:34Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-06-01T17:36:34Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"appveyor: Fixes #4682 (#4685)\n\nOnly rename a build to master versioning if it succeeds","sha":"dcd7f442fac3b9b45ecaddf5460ecb8f7238df2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2018-06-02T19:29:41Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-02T20:35:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update Arch install directions, and other touchups","sha":"39e3fb46384123b13c453e31618039fd1d5a8d94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-28T11:01:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-03T09:28:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Discord: add some stuff","sha":"9dea602496e747f6aa21bb8f2c3a9f1318480f44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-06-02T09:38:12Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-03T12:37:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix msvc debug build","sha":"84ae6436925a0186187eeccdd2deb8e668128fe8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5672538?v=4","date":"2018-06-04T01:47:07Z","email":"theracermaster@gmail.com","login":"al3xtjames","name":"Alex James"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-04T10:55:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add additional Fedora dependencies\n\nThese are needed for evdev controllers and ALSA support.","sha":"311cd0ce76f9b3f3ade9e7564f4cdeae3316e7c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-05-28T20:16:29Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-04T13:00:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Unify Linux detection in CMake","sha":"4d3b60cf461dde4f91e4f8e52039d94c7d4637cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-05-28T20:28:19Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-04T13:00:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Convert all spaces to tabs in CMakeLists.txt","sha":"ea1bb3b90e56e9f36b1f0375c86abdeda2db8b15"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-01T12:52:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-04T13:01:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: use progress dialog","sha":"05e24f38f97e2baf5a244e231c5078ede1476a94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-01T21:33:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-04T13:01:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: improve analyser (v3)","sha":"1e107487da905eeb2af2f86cd725a34da49c761b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-01T21:46:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-04T13:01:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Block GUI after stopping emulation\n\nThis is necessary to prevent restarting the emulation until it's finished\nRemove \"process_events\" callback completely","sha":"7242387a425b959c659cc32b0d560a32697902a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-02T10:15:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-04T13:01:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: implement returnable check_state()","sha":"9fe03a94d8d28ac503673a8d99a59b560c7f2058"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-02T10:43:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-04T13:01:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fix PUTLLUC accuracy","sha":"a5f4e6ecef6dfe5be6211fae35fc55c05801a39a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-02T10:45:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-05T09:35:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: optimize GETLLAR (TSX)\n\nAdd an option \"Accurate GETLLAR\"","sha":"ec6d1fb1ba7e5c9e437d267c1ec5158388f953c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-03T09:49:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-05T09:35:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_timer_usleep: give Linux a partial exemption","sha":"df489d786a997e11538cf1eb7a8d438cf0beef26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-03T15:07:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-05T09:35:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: implement returnable check_state()\n\nCall it only at the beginning of loop entries","sha":"11bdb4102af4e832cbc5a3ccc55a07fcd156a841"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-03T21:20:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-05T09:35:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: Implement Mega block mode (experimental)\n\nDisable extra modes for SPU LLVM for now.\nIn Mega mode, SPU Analyser tries to determine complete functions.\nRecompiler tries to speed up returns via 'stack mirror'.","sha":"12eee6a19eb0b04c9e64d531bd7bb36c20d96732"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-03T23:13:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-05T09:35:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add \"SPU Verification\" option\n\nShould be always enabled","sha":"5d4c5ecc1cf2a1d05a2ccc3944eacf09bfb91fda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-03T23:21:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-05T09:35:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add \"SPU Cache\" option\n\nIf disabled, the cache will still be loaded, but never updated.","sha":"5c9d0e4b46074b56e0bf2fb4a192ee3793d868f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-06T12:45:28Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-06T12:45:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cmake: simplify glslang integration (#4652)\n\n* cmake: simplify glslang integration\r\n\r\n* Fix warning (ignored attributes), part 2","sha":"824ad4fea7ec9c28f601a6d35faa80e67c09a559"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16824659?v=4","date":"2018-05-22T03:04:29Z","email":"16824659+ikki84@users.noreply.github.com","login":"ikki84","name":"ikki84"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-06T15:14:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sceNpManagerRequestTicket2 (return offline)\n\nReturning CELL_OK in sceNpManagerRequestTicket2 makes NPEB01268 loop indefinitely trying to check the downloaded content.\r\nTelling that the system is offline escapes the loop and make the game go further.\r\nMoves NPEB01268/BLES01794 from Intro to Ingame.","sha":"83b09cf0473904a722f542c885751b4b53c19dec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16824659?v=4","date":"2018-05-23T03:56:38Z","email":"16824659+ikki84@users.noreply.github.com","login":"ikki84","name":"ikki84"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-06T15:14:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Return offline according to g_psn_connection_status.","sha":"73f7ab29bcf56f87d738e1385648d554489b9465"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26828095?v=4","date":"2018-06-06T18:24:55Z","email":"devil0129@gmail.com","login":"isJuhn","name":"isJuhn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-06T19:51:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellGameCreateGameData temporary path","sha":"dde4a9c6e72016f08fb188dc3902d9e401b2cee8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-05-31T23:59:44Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-06-08T04:10:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Deploy binaries to RPCS3/rpcs3-binaries-win","sha":"7b5dcd9d6a27d922de3d5292bb4ff290bf426fd7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/13266270?v=4","date":"2018-06-08T12:34:27Z","email":"Daniel-Valentine@users.noreply.github.com","login":"Daniel-Valentine","name":"Daniel Valentine"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-06-08T12:34:27Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Delay GDB server launch until emulator run (#4658)","sha":"fb20c27e7b40a5209dc54c340e5daf32df67a82d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-02T19:48:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T19:17:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Obey MSAA resolve during memory persistence transfer\n- Ugh. This is a bandaid on a festering wound, AA badly needs a rewrite\n\n Also silence some warnings","sha":"0f24379c0e519e2285914fd4d87c29c57fbe5d66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-03T11:52:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T19:17:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Preserve read AA state separate from write AA state\n- Some applications (e.g Backbreaker) use an evil hack to resolve MSAA.\n  The application respecifies a formerly AA region as a region with no AA then performs a framebuffer feedback lookup.\n  The old memory keeps AA during read, but writes back to itself with AA resolved.\n  This is evil on several levels but it just happens to work on PS3","sha":"3150619320e9f7f1c7547b7dfd5da21a6091341b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-04T16:57:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T19:17:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement depth scaling using hardware blit/copy engines\n- Removes the old depth scaling using an overlay.\n  It was never going to work properly due to per-pixel stencil writes being unavailable\n- TODO: Preserve stencil buffer during ARGB8->D32S8 shader conversion pass","sha":"fc18e17ba64ce49e47285b94d85cc1999060dd0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-06T12:17:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T19:17:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Update memory flags after memory transfer","sha":"1b9c9267f08a93a9ac4316fd443457387d4af15b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-06T15:37:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T19:17:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"fix some linux issues\n- Fix build\n- Fix VMA incompatibility with swapchain_NATIVE","sha":"e9c3ab7ae6df674c2b83e91ba1e07a84c0f973e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-03T07:26:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T19:17:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Avoid use-after-free fence object","sha":"1c5667f0cea61773fc2ea29ad6d167193ca8a6f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-05T10:15:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T19:17:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/debug: Fix rendering when FIFO reordering is disabled","sha":"c9e367befd4967f8312e16671a078815b39430e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-06T17:34:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T19:17:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Refactoring\n- Make the memory allocator a unique child of the render device.\n  Fixes object lifetime issues with swapchain management due to cyclic dependencies","sha":"63f803b68a57f2e4854bf8a10f2a4e9683a41fa3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T10:53:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T19:17:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: RADV support for depth scaling and transfer","sha":"00eaf39c0150175b931edf91a6d97470123bc95a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T12:03:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T19:17:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix overlays for variable sampler count","sha":"da9affb34806465d93eb474083507871778ae50e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-04T08:21:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T20:41:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Qt: Fix message dialog progress bars never reaching 100%\n\nand clean up a bit","sha":"38e88253ccbe127b2dafeb91818c6659491b3f66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-31T12:57:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T20:41:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Qt: remove multi message dialog code","sha":"7aa2cddb05bad76562ee3ccc89ab02932aa93878"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-04T18:17:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T20:41:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Qt/RSX: add window title to the shader compilation msg_dialog","sha":"edc9e9b4ec37613e970d2d9e727ebcc2a71a4a9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-04T19:22:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T20:41:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Qt/RSX: add taskbar progress in msg_dialog_frame for shader compilation","sha":"b9b6bd85a6808fa5354607d2051fcdfa4e0a1442"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-08T13:20:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T20:41:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Qt: set up taskbar progress for the gs_frame","sha":"17250bc2d4edb06d049bd1d9526c6c94f330f9a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-08T13:20:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T20:41:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"RSX: add taskbar progress to native ui progress dialogs","sha":"4003aacc6a11a4075080b052eba0548d305ef414"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-04T09:30:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-08T20:41:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cellSaveData: handle fatal error fs::file is_null (read-only files)","sha":"5454f57dd048001a0f3c8caddd502caf6089effb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-05-14T19:32:40Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-09T08:06:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"3rdparty: update stb_image.h and stb_truetype.h","sha":"db9a6113d7155eb14cb2770bbd6af46b26797fd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1445782?v=4","date":"2018-06-10T15:33:26Z","email":"jjs@jjs.at","login":"jjsat","name":"jjsat"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-10T16:12:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix VSLO and VSRO in the LLVM PPU recompiler","sha":"53ca2526edf9a74860e99fb423062349c187b12a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-11T12:31:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-11T13:24:51Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Qt: add counters to the find dialog","sha":"3dd45fc8597ec137328bcf05895c1aa33b28f8c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26828095?v=4","date":"2018-06-08T17:56:16Z","email":"devil0129@gmail.com","login":"isJuhn","name":"isJuhn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-11T17:48:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGameContentPermit: Don't set content and usrdir path on gamedata if cellGameCreateGameData was never called","sha":"88bfdb0c05c76a33c2c1107fad1081395d69adda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-09T14:27:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-11T19:41:38Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Qt: clamp progress bar values","sha":"2b8cab906cd3fd5d2defd6c127a9eb784be6d838"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-09T15:42:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-11T19:41:38Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"RSX: fix shader cache progress bar exit state shenanigans","sha":"a8f19fbfae2c069582d2c65f099f7a0c5b3d95c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-11T20:28:21Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-11T22:49:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"qt: rewrite syntax highlighter\n\n- fix multi-line comments\n- remove compilation warnings \"unknown escape sequence\"\n- fewer lines of code","sha":"626836f95b31fb3a21dbafbeabb6bf4e2dc6fa2b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-08T19:25:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-11T23:09:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: returnable STOP in Mega mode\n\nFix STOP, STOPD, SYNC, DSYNC in Safe mode","sha":"0a58464f010f9350b2c185fa677e07003e59dd41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-10T23:30:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-11T23:09:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: add 'Accurate PUTLLUC' option\n\nEffectively rollback previous PUTLLUC accuracy commit by default\nMinor changes in GETLLAR/PUTLLUC transactions","sha":"eb081bbcfaa6f1784e56774e2ff84b341278d47c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-11T23:08:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-11T23:09:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix cellGameContentPermit","sha":"88b6d51643df40b4b78ca76b7569f9957206b1d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-12T14:38:19Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-06-12T14:38:19Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"qt: fix asm instructions highlighting (#4745)\n\n* qt: fix asm instructions highlighting","sha":"cc22d25490c6cda089d83f4a843b28aed83b2914"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-06-12T15:12:37Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-06-12T15:12:37Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"evdev: Add nullptr check, fixes #4713 (#4744)","sha":"09c816223559ce4713c94b43356797f334e93938"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-05-17T17:39:40Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-06-12T15:51:26Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Prefer GLVND for OpenGL rather than legacy","sha":"67a6db8325b3814fa13e5df4ed2768438f04e8bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-05-17T18:36:49Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-06-12T15:51:26Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Enable wayland for AppImages","sha":"4db0cf005bbd030dc001b41e480a739db77db601"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-12T18:03:53Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-12T18:03:53Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"msg":"asmjit: update build integration","sha":"3a9778668aba3a19046a911f9bcb883bb35e393c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-12T20:19:10Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-12T20:28:30Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"msg":"cmake: don't use hardcoded lib names when using system ffmpeg and remove unneeded line","sha":"ea8397fbabc058405247f12329feb1420ead29e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-03-24T21:16:05Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-13T00:25:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"yaml-cpp: update submodule and build integration","sha":"14dc1fead63a844b00a6ac2cf1b7b230465d58dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2018-06-13T00:47:54Z","email":"26035046+Talkashie@users.noreply.github.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-13T07:00:32Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Update System.h","sha":"f491dc14135e070fa78048451fbfe2f63db4a163"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-13T07:27:12Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-13T07:27:12Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"msg":"Merge branch 'master' into asmjit","sha":"968f3995ff1f68fb84d30fa5ae2c8f44851ba9dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-13T16:41:28Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-13T18:22:53Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"msg":"fix compiler warning \"-Winconsistent-missing-override\"","sha":"6f3a63df944b4d92418ba18bd307cf074b4375a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-14T12:30:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2018-06-14T12:30:13Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #4748 from scribam/asmjit\n\nasmjit: update build integration","sha":"21a7f1a550adfe3042bd11d265bc588b4c803ed5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-11T17:38:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-14T14:35:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix settings dialog subscriptions for custom configs","sha":"661d19e33fd3224db9a774aaabe1692d892912e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-11T14:40:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-14T14:35:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: rename some members in game_list_frame to use m_","sha":"fddd39d50856a3f9cdf4bda505fa130112da48d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-11T14:32:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-14T14:35:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: don't adjust columns in case of empty results after filtering","sha":"61a517cc1a08e5978cdb42fe2585c6472bc15bc9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-11T17:19:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-14T14:35:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add notes as tooltips","sha":"d013524ea99c315af76f07185c9eb98601bc05d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-11T17:28:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-14T14:35:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Add copy to clipboard for game data","sha":"79dd62cda263e6638ea0563f984c3b89d6f29621"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-12T09:17:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-14T14:35:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: cleanup syntax_highlighter a bit","sha":"ddded7ba5c97586e1e9b3a343d7a83b02b185faf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-10T18:37:34Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-14T17:55:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"libpng: use official repository instead of the fork from RPCS3 and update submodule","sha":"9f420081fd4c47d3b7561c8118b51ff799597bd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-14T20:28:18Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-06-14T21:42:04Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"zlib.vcxproj: remove PreprocessorDefinitions \"Z_SOLO\"","sha":"903da117e5b1b32f1c3d95f12849bd039477c4ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2018-06-16T00:30:37Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-16T10:54:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix temp file folder for project pnglibconf and zlib.\nDelete win32 config in Project not needed.\nClean bin folder.","sha":"b2a4e759fcbd0778b152ea2cca5eef2ccaf4ea0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2018-06-16T12:11:38Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-16T15:05:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_spu_thread_connect event","sha":"2bc4cb4e5809229ebb3738f195df83a6df5d1ebf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-13T11:54:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-16T20:43:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"implement \"Enable TSX\" combobox","sha":"af71cf09220d0783e78ce1692ea02a1c6edbec15"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-06-17T15:00:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-17T19:20:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"mfc: clamp list transfer size","sha":"af62c92b7fed2acf186a06b3237118fcc8847451"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-10T19:40:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T14:32:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Avoid race conditions in unsynchronized unprotect","sha":"dd4c13b625a412b5cef9b881bc8880cd0863dd46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-09T13:12:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T14:32:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement typeless image transport","sha":"0d5c071eeea21b7cb49a77e9f67f2cb5d1aeb1cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-12T15:46:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T14:32:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add synchronous compute pipelines\n- Compute is now used to assist in some parts of blit operations, since there are no format conversions with vulkan like OGL does\n- TODO: Integrate this into all types of GPU memory conversion operations instead of downloading to CPU then converting","sha":"2afcf369ec64b93c5cefae38fc3f6891a9125c18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-12T16:22:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T14:32:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve GPU resource read prediction","sha":"d77e62c94e32e364568d14dbb1b14fc2a3f66131"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-14T17:58:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T14:32:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Performance fix for RADV\n- RADV does not keep a mapping ptr around for subsequent remap and falls back to heavy amdgpu methods every time\n  Explicitly manage pointer in the ring buffer structure to fix this","sha":"0d61bae1b9b629160c47f0526a7cc326b93ba5ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T08:25:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T14:32:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement safe typeless transfer\n - Used to transfer D32S8 data where it makes sense to use this variant\n - On nvidia cards, it is very slow to move aspects from D24S8 probably due to the format being faked.\n   For this reason, the unsafe variant is used for both D16 and D24S8 to avoid the heavy performance loss","sha":"c60f7b89ba68efa52cffa62662053f51c55262d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-06-10T16:31:40Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T19:34:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Utilities/geometry: Add unsigned specializations to typedefs","sha":"9d431e77a423af6e160b39dc5833c45d2cdf93d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-06-17T16:38:53Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T19:34:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Refactoring\n\n- Use names for overlay command config and vertex data instead of std::pair.\n- Make a couple of compiled_resource constructors explicitly named functions.","sha":"44449dd9e9f46774564cd050900f20e208e2f8b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-06-17T16:43:46Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T19:34:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Fix text rendering position\n\n- It should be offset by one line, not half\n- Also tweak every overlay element affected by this\n  to look as it used to","sha":"07731d02285e790d5e833b0d5afa4a5e31d3ec77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-06-17T16:48:43Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T19:34:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Change how padding and margin work\n\n- Also add 3 helper functions to compiled_resource","sha":"84d1cf5065924473eb8bdc24714132ff357d1fe2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-06-17T16:50:27Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T19:34:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Consider padding when auto-resizing label elements\n\n- Also make auto_resize return whether it changed the size","sha":"58f4b26134b25ec9a5752d4f054775f7256a7ed8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-06-17T18:02:20Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T19:34:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays/perf_overlay: Make pos, font, opacity, margin configurable\n\n- Also some perf overlay refactoring","sha":"dd0684b58ab4004ea73f2c15534a076c31d068e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-06-10T17:25:28Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-18T19:34:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Qt: Add perf overlay position to settings dialog","sha":"392a4bdc0bd2e191189e8f18c78db76a35c1a0e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-06-18T22:48:38Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-19T11:06:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Make register editor dialog work","sha":"87194e5887478735307f62c4fbeb434914f7ab53"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-18T19:51:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-19T14:13:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Qt: add boot by pressing enter or return while having an item selected","sha":"0c4cdaa7d37145e2c31f8249e01fa4dc89c07f36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-16T20:56:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-19T16:45:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Discord fixes","sha":"27a94308a7407e464a92a722d43dd8ccbc103f67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-19T16:13:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-19T16:45:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add possibility to copy 'Name [Serial]'","sha":"4419e5d8380d31b3a3c0200c156b85e4c4ab387c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-19T07:15:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-19T18:58:09Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Qt/RSX: reset gs_frame taskbar progr. when closing native progr. dialogs\n\nI forgot that the gs_frame's taskbar progress will stay unchanged due to its persistence, unlike the msgdialog.","sha":"0ffaf6c1ce5daeb912e4f7a7aa588e16072cdd82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-06-20T22:46:41Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-06-21T00:07:05Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Add missing Discord guard after 27a94308a740\n\n/usr/bin/ld: error: undefined symbol: Discord_Initialize\n>>> referenced by _discord_utils.cpp\n>>>               rpcs3/CMakeFiles/rpcs3.dir/rpcs3qt/_discord_utils.cpp.o:(discord::initialize(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&))\n\n/usr/bin/ld: error: undefined symbol: Discord_Shutdown\n>>> referenced by _discord_utils.cpp\n>>>               rpcs3/CMakeFiles/rpcs3.dir/rpcs3qt/_discord_utils.cpp.o:(discord::shutdown())\n\n/usr/bin/ld: error: undefined symbol: Discord_UpdatePresence\n>>> referenced by _discord_utils.cpp\n>>>               rpcs3/CMakeFiles/rpcs3.dir/rpcs3qt/_discord_utils.cpp.o:(discord::update_presence(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, bool))\nc++: error: linker command failed with exit code 1 (use -v to see invocation)","sha":"c776ff502075351b08a0e2244782639d7b8eec29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-19T17:54:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-21T10:08:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix region pitch inaccuracy\n- Region pitch of 64 (disabled) can be used to indicate packed contents - do not assume it is the actual pitch!\n- Also fixes interaction of AA factors with lockable_region size","sha":"8f1c36d79fb4093a8d497eaabe64c6a3e4d423de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-06-21T12:41:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-21T18:54:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"create the shaderlog dir in Emu.Init()","sha":"3e433ef05c12a9b3917d9e6d68d79b21fc3c6386"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-10T12:46:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-21T19:29:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: analyser v4 and fixes\n\nBuild SPU cache after PPU, fix mixing progress\nSPU ASMJIT: add support for Giga mode\nSPU ASMJIT: use the same spu.log location as SPU LLVM\nSPU: improve spu.log disasm\nSPU: improve trampolines, unify with SPU ASMJIT\nSPU: decode interrupt handler address from BR/BRA at 0x0\nSPU LLVM: support Mega/Giga modes\nSPU LLVM: implement function chunks\nSPU LLVM: use PHI nodes, value visibility across basic blocks\nSPU LLVM: implement function chunk table\nNew simple memory manager for LLVM (bugfix)","sha":"e4da284176dc219cdeec9bfc60e2b26d33882b06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-22T11:12:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-22T11:14:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove /dev_flash/ configuration\n\nSimplify code by using root config location for /dev_flash/\nHide Emu.GetEmuDir() function due to the risk of misuse","sha":"81e5f3b7f299942f56bcfdde54edd09c722b32d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-15T10:48:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-22T18:30:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: minor icon size action fix","sha":"cad017a64f93d501a64643988c55bce1d26dfc0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-15T14:46:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-22T18:30:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add more resize possibilities to the trophy manager","sha":"68bb1bd6ee8d722585157caf1739512207b558b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-15T15:29:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-22T18:30:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: use QDirIterator instead of fs::file stuff","sha":"e7a02f150689f8f600b3753ee7b268a1a18d21a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-15T15:50:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-22T18:30:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add DeleteSPUCache option","sha":"c3916fee9cf03d2cfcd814cb331a95236b17cd93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-16T13:41:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-22T18:30:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: workaround for settings_dialog resize","sha":"dab82b70f76d7672eb099ab3eb5e3f31cac49f89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-16T14:34:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-22T18:30:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: move ReadJSON in game compat to its own function","sha":"a96a8a9db0edb3445546708cfee78961f164a350"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-16T14:34:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-22T18:30:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix crash in progress dialog","sha":"dada341d4e7207ccf32e57cd3c4c8a8190cc110b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-17T07:29:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-22T18:30:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: emu_settings: close config files after loading and saving","sha":"64c04769d2d578b0e5f82a549009c83534417d5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-17T11:30:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-22T18:30:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellVdec: add more detail to the logging","sha":"4464951c77b2ead9752ece0113aeff496f5a113d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-20T00:15:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-22T18:30:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix minor bug in save_manager that occurred when sorting the tables","sha":"78ef205b4f88c82573b14b15a758637adde292c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-23T05:45:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-23T05:45:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM commit","sha":"b0cc1cf4727963fce08be84114d75e298147cd6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-23T05:46:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-23T05:46:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix SPU ASMJIT for SSE2 CPUs","sha":"cd92d9bcdfd735cfc39b4dc96808061c006554c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-23T06:26:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-23T06:26:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Restore /dev_flash/ config","sha":"d62b0c88b0169f9f43b2d11695817986a410430a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2018-06-23T09:36:16Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-23T12:34:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PS1 Classics","sha":"8b449ce76c91d5ff7a2829b233befe7d6df4b24f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-23T14:30:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-23T14:30:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixes for booting PS1 games","sha":"6229b3ca8db1c0029838a40508dc41db01999b5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2018-06-23T10:23:24Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-23T16:09:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update readme library links","sha":"acd83673e9fd078fa71f083f5c7d9552c006013f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26828095?v=4","date":"2018-06-23T16:44:47Z","email":"devil0129@gmail.com","login":"isJuhn","name":"isJuhn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-23T19:13:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add conditional reservation update to STW","sha":"83f096c43520e13f5959019373d2aecc5692067f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-07T16:38:19Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-23T22:02:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"pugixml: update submodule and build integration","sha":"3935cef6916fb89876a91359a557d2f01d29b626"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-06-02T15:59:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-24T07:57:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: fix hardcoded rsx allocation address","sha":"b456955688106ff24f3812a43c21c519c7b7c21c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-06-02T19:07:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-24T07:57:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cellgcm: fix regression","sha":"b3a933ba84016e3c9c35904c4fa848782ac156ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-06-21T01:50:57Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-24T10:29:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"elf: handle decompress flag for 32 bit elfs","sha":"095d02e41bc67efc65b0565074f5e927205bdd18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-06-07T11:17:47Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-24T10:29:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"loader: ignore invalid index_value and allow relative reloc 10","sha":"edeb858138ed1a2c4dc865d631675b38bf7f4315"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-06-15T08:28:32Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-24T10:29:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"trophy: zero out data before setting","sha":"e2c288ff8ad20321fa58b926559978d29cc12e57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-06-16T02:43:18Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-24T10:29:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: fix image_in to use in_pitch when swizzling","sha":"00c9b323c2c86d00ad3fc0527c4ff65a159ad602"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-06-24T09:56:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-24T12:14:37Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx-capture: unbreak","sha":"b9fd6ad37d9b2a488411a6128723e26dacdb6307"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-14T19:39:48Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-24T20:28:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cmake: add possibility to build zlib from submodule","sha":"3b8eab87dde5fc1ef58a8f2b1cb00d34e07ebfdf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-21T15:21:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-26T17:07:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"facepalm","sha":"278cb52f19f9ba9ee3f54e97fd1c18dedd0d7558"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-21T15:28:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-26T17:07:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix texture readback\n- gl: Fix up the calculation for internal image pitch\n- vk: Implement GPU-side resizing for read back textures (fixes WCB zoom)","sha":"f45dcfe18a31adeb48b47a35d47fd9412a4eccf9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-22T19:09:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-26T17:07:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk; Add more compute routines to handle texture format conversions\n- Implement le D24x8 to le D32 upload routine\n- Implement endianness swapping and depth format conversions routines (readback)","sha":"5fb4009a0781f9c4965ba492c03106562a1f829b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-22T19:22:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-26T17:07:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Addendum - Synchronize graphics and compute pipelines with barriers","sha":"d4842531365b035381099b061ac90f5ad9d71cd7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-23T12:15:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-26T17:07:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Tuning [WIP]\n- Unroll main compute queue loop\n- Do NOT run GPU cores on mappable memory! This has a dreadful impact on performance for obvious reasons\n- Enable dynamic SSBO indexing (affects AMD)\n- Make loop unrolling and loop length variable depending on hardware and find optimum","sha":"bda65f93a6c078560646025e914b93feba83720c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-23T14:50:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-26T17:07:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Rework memory protection management for framebuffer access\n- Avoid re-locking memory if there is no reason to do so (no draws issued)\n- Actively bound regions should always get written to the backing cache\n- Forcefully read memory during download if writes to the target have occured since last sync event","sha":"1730708f47c9f58a5998490d360aaa68f04a05bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-23T22:01:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-26T17:07:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fixup","sha":"1e375e521079c9b31553f6065c934496aed5e921"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-23T22:37:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-26T17:07:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Strip 'stencil' MSB when writing d24x8 data\n- Seems to contains garbage in MSB when DEPTH aspect is read back\n- TODO: Implement custom depth and stencil readback routine","sha":"df2137781d069bc5e7119cecd430a1bdaa040865"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-24T07:52:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-26T17:07:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"glslang: Bump to version 2776","sha":"c3d75e208fae73712e71b74ce6854ea0c673437e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-24T10:23:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-26T17:07:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve texture cache read speculation","sha":"24f4c927590893cfab7ce9edf015d9d75925314e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-25T19:23:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-26T17:07:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fixup","sha":"42851a93d46add5328c3ac449a7b93312b249c5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-06-27T04:06:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-06-27T18:59:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: more efficient command reading","sha":"345f92ab0a57a4f302f6fac651372bcf42005080"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/828557?v=4","date":"2018-06-28T22:05:18Z","email":"ryan@shopboxretail.com","login":"Cabalist","name":"Ryan Jarvis"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-06-29T18:37:09Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"White space and switch to .format() strings","sha":"a545e23b003aa3b3423a04dca47e1f7a7ecb5b26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-01T14:39:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-01T15:33:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add new spu options to the settings dialog\n\nAlso rework the layout a bit.\nWe need to think about creating a firmware tab","sha":"ca30131faaf94eff96b5b20159e5d16489b6d0ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2018-07-01T22:07:21Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-07-01T22:07:21Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix cellGameDataCheckCreate2 (#4832)\n\n* Fix cellGameDataCheckCreate2","sha":"5d3b0e73522dbb7b7138e6ee14c6580e07372d0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26828095?v=4","date":"2018-07-02T00:47:37Z","email":"devil0129@gmail.com","login":"isJuhn","name":"isJuhn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-02T11:19:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix LLVM STW reservation update","sha":"3d8223fcccef62cb032a7265ea903fc763200e70"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-07-03T20:36:47Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-07-03T20:36:47Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix issues with AppImages and Mesa 18.1.1 and greater. Fixes #4509 (#4846)","sha":"e2ee959ac8b90920f4c8568f1aa3a1af2f36c0fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-26T21:24:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-07-03T21:09:44Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"bump appveyor Qt version to 5.11","sha":"cd59bc3d6d99c43e7c7d03475402ff4685d31312"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-07-04T11:00:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T12:36:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cache directory","sha":"3b64e0fb3fbb0e660026bb7c557b1ce00a8fdb08"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-07-04T13:58:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T12:36:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellSysCacheClear","sha":"24699f0f965ac8d80cabeabb40da014ecd0d2868"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-07-04T14:01:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T12:36:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellSysCacheMount error checking","sha":"4db79c458dccda1b03aee8e4f444f96f06553cd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-02T23:31:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: toolbar adjustments","sha":"cb3933dcab0dcff16ba77de28ffa38084e85b71e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-04T07:44:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: update toolbar icons","sha":"4bddb6a9e3d73a5f641246d6695ddf018536c346"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-05-27T11:10:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: update default stylesheet (WIP)","sha":"23b10fc16d96f1637420e00ddac12723177270f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-26T00:33:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Fix style sheet edge case","sha":"19514128e305fe7a8d2b36ba5a87d451b741b98d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-26T14:00:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Use QStyledItemDelegate instead of QItemDelegate","sha":"01dc09c436a6e9fb1e156654b492c4d32eca7899"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-28T00:12:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: temporary game grid selection color adjustment","sha":"ff9024ae70404368a98055d33ed812e134f12be9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-28T00:47:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix icon repaint inaccuracy","sha":"ed4caf0fbe0185b621a24f2bfb8a20032a6742ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-29T02:25:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: update table item delegates","sha":"20d653b58a35aee42489790147f8d123e6c9ffd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-29T03:00:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: update stylesheet","sha":"124122839d7094aa9b7095f69e0ca6ecde2955ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-29T03:46:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: update custom ui colors","sha":"62cec24235618576d508755dd1ff18832773081d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-29T05:23:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: adjust table headers for Qt 5.11","sha":"1270ee4b387444d78ba0e042f65acd69e941dd7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-01T18:46:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: remove redundant custom toolbar colors.\n\nThey got too complicated when used with stylesheets. I left the gamelist icon color option since it does in no way interfere with the stylesheets","sha":"3a5ce901481853046eb66f3f705ca7ea7c2875e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-01T18:47:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: adjust custom stylesheets to work with the new toolbar slider","sha":"e6d49798cebaa78541f5dec741c61090eb5f78c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-01T19:58:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Add Classic (Bright) Stylesheet","sha":"c69bb3ca04ab173732617fbe828092ec96eca459"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-01T20:10:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix toolbar element sizes on every toolbar repaint","sha":"b9c9bb30bae4aff0460e8633f89ffb9e044dc22b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-01T22:59:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: improve docks and toolbar flat style","sha":"544f8711f0a6ec503fe91784fd4a116ea426583c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-02T18:03:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:22:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix table headers for Qt 5.10 and below","sha":"6a62de6d6809e33709803c45f95412d1bac7eaac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-25T10:58:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:26:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update cpu_translator\n\nAdd get_const_vector<v128>()\nAdd make_const_vector<v128>()\nAdd i2 and i4 types\nAdd build<>() for vector constants\nFix comparisons, allow EQ/NE for bool/char/i2/i4 types","sha":"88d0316aadd5a95be23694783b2a0eb80ee32807"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-25T11:04:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:26:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: improve function type\n\nUse pointers for args\nUse noalias attribute","sha":"ded9d1ddfd631a1ccedf2e810794fee54cbc22fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-25T11:26:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:26:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: use cpu_translator::build<>","sha":"a999bccc035540a41b324ed9bede12cbc185cde7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-26T12:00:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:26:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: fix jt target duplication bug","sha":"8ad05ce10ece558634c4f93ee532bb6b3ad586a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-27T12:44:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:26:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite cpu_translator::avg()","sha":"c86dc133cff317a0eedd0d01153bf29e31e0f896"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-27T16:16:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T19:26:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Funny workaround","sha":"1ac203a95821bed48540b2c62bf52d02ab993cdc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-27T18:19:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use LLVM 7 (master)","sha":"e009bbac1058c7c0e3de660ac9b1a92b647c8df7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-28T11:03:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement spu_iname helper\n\nRemove old code\nReport $SP anomalies","sha":"41eab62ed75e5743cd4e0bc63918a7ebe687aad3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-28T13:21:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement cpu_translator::pshufb<>()\n\nRemove spu_translator::pshufb<>()\nImprove PSHUFB emulation (pre-SSSE3)\nEmit static shufflevector for the constant mask\nPPU: Inline VPERM instruction","sha":"a0bf103e8bb665b97afc0f598e5b3065dc87c036"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T15:41:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: refactor halt instructions","sha":"513bac0304ab6917514e19cf5c488d9441e8e439"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-29T12:49:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: clean NOP/LNOP\n\nAdd volatile to state check and update_pc()","sha":"0910acad42fb2cc67e8d5791fb86d4b84405efb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-29T16:37:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: inline RCHCNT","sha":"c1385558ad9ee50fa576d799470ffe7ee5279073"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-29T23:19:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: inline RDCH","sha":"712632d28a38f09f7f23147c5df09bcf657a0983"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-06-29T23:07:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: improve analyser (v5)\n\nFix jumptable analysis","sha":"afd5af04f6e83df50c548798b65a73bc6e6f69e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-01T22:02:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: simplify unimplemented event check\n\nMove checks closer to the actual use","sha":"a0c0d8b99305551a85fb94c0b710cbd2328c92b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-04T09:14:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: rename block stats\n\nUse Block Weight and Retreats","sha":"20900ebea20ee7be798c93894d5ee965ff989959"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T12:26:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: fix constant propagation\n\nCompute constant bitcasts","sha":"c959ab2698278c453b665eafa700a309af1401d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T12:30:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: constant computation fixes\n\nFixed instructions:\nGather Bits: GB, GBH, GBB\nForm Select Mask: FSM, FSMH, FSMB","sha":"622f2f7f66aacbf7c3b2cd59b670876e94c73555"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T12:34:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: improve SHUFB with constant mask","sha":"253e8b44661b9d1287fa8640dd929ffc3e027927"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T12:35:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: combine SHUFB with CWD-alike instructions\n\nTurn SHUFB into a vector insert","sha":"2b9fa7ed23e1f4c5c383472f7977b770f0c69a79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T12:37:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: improve ROTMA and ROTMAH instructions\n\nAvoid sign extension, clamp shift amount with min op","sha":"b9c026d441997b24c8373f7f300f5098122ae430"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:30:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: improve SHL, SHLH, ROTM, ROTHM instructions\n\nAvoid zero extension, select undef result to zero","sha":"caf827344f8a4271d1758c89377bc144ca9618eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T16:39:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: simplify VADDCUW, VADDUBS, VADDUHS, VADDUWS","sha":"9d9869e8034ac6babbb6f913196f684f2e99f829"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T12:01:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T21:33:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: simplify VSUBCUW, VSUBUBS, VSUBUHS, VSUBUWS","sha":"2f0dc9bd0fac47055d875baeca1cada6fd4e4129"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T23:23:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-05T23:26:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: combine SELB with comparison instructions\n\nTurn bitwise select into a vector select","sha":"d856dc89a899cc81f49fc98ea456bc5086b819b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2018-07-06T23:14:15Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-07T10:26:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU analyser optimizations","sha":"dceba8a92b6048bfcfd0219b015ac82dcc9d8a0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-01T17:47:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-07T13:20:33Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix nv308a::color","sha":"66854b78fa2ff87a816b5082f4d10c66f44a91cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-01T17:55:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-07T13:20:33Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: vp decompiler fixes\n- Fix program abort logic to never abort before resolving later label addresses\n  Fixes jumping over broken code and jumping over END markers\n- TEXTURE_CONTROL2 has indexing range of [0..15] without stride skipping!\n  This register does not have interleaving with other texture registers\n- Track shader address poke as it seems to invalidate programs as well","sha":"bd915bfebd2653a2331460397f2a8efd4b534c89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-01T17:37:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-07T13:20:33Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vp: Improve vertex program analyser\n- Adds dead code elimination\n- Fix absolute branch target addresses to take base address into account\n- Patch branch targets relative to base address to improve hash matching\n- Bumps shader cache version\n- Enables shader logging option to write out vertex program binary,\n  helpful when debugging problems.","sha":"2ca935a26b5a165b8396d2db60969a6eb824551a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-04T19:41:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-07T13:20:33Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vp: Discard broken vertex programs with no writes to POS register","sha":"2c34195954a84e99f2fabf7d5351c1d27a897101"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-06T11:50:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-07T13:20:33Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vp: CodeGen improvements\n- Fix double destination writes on conditional write masking\n- Fix codegen to simplify simple scalar comparisons vs vector functions","sha":"d78957d1cfc11ed9fdcd780115067f735de91729"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-06T13:12:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-07T13:20:33Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Silence harmless warning","sha":"4d40ed9dbd4f7f51c4c139c5a1dcd36a680aa245"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-06T16:32:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-07T13:20:33Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/Qt: Fix Qt shader loading dialog crash","sha":"f0a9799b4becb3156db78657c72b08022fddc3f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-07T18:23:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-08T13:43:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: also repaint trophy game list background colors\n\nAnd refactor a bit","sha":"0d72889c52ec81aeb808bedfd874a19547093231"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-08T09:48:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-08T13:43:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: trophy repaint optimizations","sha":"1c9769670c28c4bc7560193615b7d2102e6a5ab3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-26T20:11:08Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-08T23:33:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu: improve fnmsub instruction","sha":"f1e6532ec02ad7671103ce29bc842092f8a35e77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-26T20:11:08Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-08T23:33:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu: improve fnmsubs instruction","sha":"733efc6b0ddc0f2c5e80304da285d757ece49a46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-26T20:23:23Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-08T23:33:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu: improve vnmsubfp instruction","sha":"2ed6e51d24c48eaf368917dbd7e493e7e6cbc9a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-28T11:59:27Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-08T23:33:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"spu: improve dfnma instruction","sha":"1b0f5b1ed9feeacbd630974d4bd21886df9d286a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-06-28T20:04:59Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-08T23:33:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cmake: remove obsolete command for glslang integration","sha":"1fdc070e4e24cee7a52915900c97c81a8296efe7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-09T09:16:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-09T10:06:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"facepalm\n- Fix openGL regression","sha":"1ddcad4fa4d6fe1ff42c96d5529dc03355897669"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-09T09:32:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-09T10:06:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"silence some annoying warnings","sha":"d266a25618d89029bad364708ea068ee20d268cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8276932?v=4","date":"2018-07-09T20:30:28Z","email":"smartychrisje@hotmail.com","login":"TGEnigma","name":"Chris Weermann (TGE)"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-09T21:47:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement sys_dbg_read_process_memory and sys_dbg_write_process_memory","sha":"c5dcef52fa293dcd0153e2037884517ad55ec77f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-07-10T08:25:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-10T10:54:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fix barrier type mfc transfers","sha":"a5d4e58ddda972aec8a9db9ea1988e04280194bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2018-07-10T18:07:53Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-10T22:16:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Change all hddFreeSizeKB to 40gb-1","sha":"d3596fbc953eb4e14d943da59b2aac992ef9d8b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-09T18:25:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-12T15:02:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"silence warning","sha":"c5b2469fe7586e5fb23856b6f4d9e840af8f663b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-09T18:31:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-12T15:02:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve vertex textures support\n- Adds proper support for vertex textures, including dimensions other than 2D textures\n- Minor analyser fixup, removes spurious 'analyser failed' errors\n- Minor optimizations for program state tracking","sha":"fa55a8072cd1c2d88892156ddb4c4bbb3fe017f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-06-21T12:24:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-13T21:40:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"mfc: clamp atomic cmd's addr","sha":"ac99fd764dd8b9039d585182e0392d644ab14278"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-11T20:51:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-14T12:19:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Async shader compilation\n- Defer compilation process to worker threads\n- vulkan: Fixup for graphics_pipeline_state.\n  Never use struct assignment operator on vk** structs due to padding after sType member (4 bytes)","sha":"e7f30640ef5ab8ce7b3647a3dea247d5e480cd83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-14T09:55:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-14T12:19:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"qt: Add async shaders toggle to the UI","sha":"77e2af8c0009b3dbb56098ea6388ee5252492c8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-14T11:03:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-14T12:19:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: cleanup/optimization, remove unnecessary initialization code","sha":"c35d0d16e7e8f253d31bce95d33299e86df4f5cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-14T11:51:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-14T12:19:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vm: Fix memory mirror performance regression","sha":"46abe0f31504d879e6046b82f0dda8ceedd23714"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-07-12T19:05:27Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-15T08:51:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"clang: fix compilation on 3.8","sha":"4babe9076b46ce55a2646fefd84eefc5370bb124"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-07-12T19:05:37Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-15T08:51:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"clang: fix compilation on 3.7","sha":"b09321354a365d66185ce9edcfe134bedf588679"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-07-12T19:15:07Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-15T08:51:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"clang: fix compilation on 3.6","sha":"b36d0fd59f0dda0fd670d9a2c0f71db5485760ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-07-12T18:59:11Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-15T08:51:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cmake: remove duplicated directive used to include cmake_modules","sha":"e18e6576f3b42c6d947f0a175268043f894ba296"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-07-14T19:37:58Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-15T08:51:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"clang-tidy: performance-faster-string-find\n\nhttps://clang.llvm.org/extra/clang-tidy/checks/performance-faster-string-find.html","sha":"65d270e5d8ef81d9cfe9f3adc60a73be1e1d9746"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-15T13:28:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-15T16:29:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: handle upstream trolling","sha":"de693b0da1c25479b7da1b126e0deacc59b46d18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-15T13:47:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-15T16:29:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gitignore: completely ignore the game folders, some games use TEST12345\n\nIt wasn't working anyway.\nTest-homebrews should be added by force in the future","sha":"29270ed673b7b941e7bebb495f30c3c37ddd5a8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-29T05:59:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-15T20:05:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"HLE/Qt: implement sys_tty_read","sha":"a19113025c53b6bd86f74489f4d3048204505004"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5672538?v=4","date":"2018-07-16T22:42:12Z","email":"theracermaster@gmail.com","login":"al3xtjames","name":"Alex James"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-18T11:32:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"VS: Fix QT deploy for paths with spaces","sha":"064d0619e8f75ebce516eac174550eee5aec5f3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-07-19T05:41:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-19T10:43:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_time_get_current_time","sha":"20e9ae069c578e859e30aa5f366c2aafe45ce789"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-18T05:56:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-19T18:37:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Async Shader Tooltip","sha":"05c5763492d205b7d111f6a376d9b8fc00ca47c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-18T06:20:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-19T18:37:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: allow bulk pkg installation","sha":"60a276e9cea895685646c18d4588254aa8d7996b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-18T21:56:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-19T18:37:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Add rrc capture replay per drag and drop","sha":"8bfe4c908c3fd64ccc24bd4b0735cb6e7fbdf9d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-07-15T11:37:47Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-20T11:22:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"spu-precise: fix double-precision floating-point exception checks","sha":"5828367013c862ad500c6d934ae3ade893003004"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1646210?v=4","date":"2018-07-20T23:02:07Z","email":"john.ettedgui@gmail.com","login":"John-Gee","name":"John"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-20T23:02:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add a channel map to the PA backend to fix surround sound (#4911)\n\n* Add a channel map to the PA backend to prevent issues with more than 6 channels\r\n\r\n* Arranged the mapping per cellAudio.cpp","sha":"6caffd0e3244aec74ebfe7b7cc40ba1b0f82987a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-09T10:09:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-21T09:18:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData: print SECUREFILE secureId\n\nThis can help to decrypt savedata","sha":"d2d07abcc53d257c0026041c9d4839a9019871b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-09T16:54:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-21T09:18:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: simplify VMSUMUHS","sha":"03e6725fcfe7abc23ab4d2e29db4fa0c334d25d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-09T16:54:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-21T09:18:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: simplify CG, CGX, BG, BGX","sha":"9b4e63df6dec7b8e09a86edec46c026746740318"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-09T16:55:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-21T09:18:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove cpu_translator::ucarry<>","sha":"89fe3705a4894c683086a9e5d92d304ac97ec43d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-21T09:14:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-21T09:18:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM\n\nFixes long pause/hang after loading PPU modules","sha":"9187911a29e43e9401e4892e3f54f0014bd2b904"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-04-18T06:20:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-21T11:32:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellvdec: stub unsupported video timebases","sha":"12b8908a00911a1b0717c3748258d916f9936adb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-22T08:57:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-22T10:50:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: remove obsolete and useless menu entry: \"Show Game Tool Bar\"","sha":"52bfe6d4fb488fbb78655613004ad3e5ea2e74ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-22T08:57:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-22T10:50:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: merge pad settings","sha":"d13e71eeb82653b7189345f260f62df5ea1fbd78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-22T09:52:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-22T10:50:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"MMJOYSTICK: fix nullpointer crash in GetMMJOYDevice","sha":"8b693ed7bbd962c4b0ea3aaaa3b44d916e25a196"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-17T16:42:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-22T14:19:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reimplement cached textures and their views","sha":"8695f952676ee294479670cb745e273f8dd90382"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-22T13:03:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-22T14:19:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl: Minor cleanup and optimization\n- Track register change status\n- Remove unused gl classes","sha":"19d808d3785f2c796fc8c1d0c710f1261b04eeab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-07-22T12:07:18Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-22T15:53:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu-precise: improve vaddsws and vadduws instructions","sha":"c5c0f68b3eb73a53f3a8ab404696d0bc1af234c7"}
+{"author":{"avatar":null,"date":"2018-03-17T06:17:27Z","email":"markuscicero5@gmail.com","login":null,"name":"mpm11011"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-25T23:16:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"user-manager: squash all commits for this feature.","sha":"948bd3673e943467b71355a351b8186d170c0bcb"}
+{"author":{"avatar":null,"date":"2018-06-13T22:11:51Z","email":"markuscicero5@gmail.com","login":null,"name":"mpm11011"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-25T23:16:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"user-manager: replacing fmt::format with string concat.\n\n(cherry picked from commit 63379afc7a402edb2159912318281febc3e7438a)","sha":"68202eb2b7e1f0def7de9eb220a3e85ebabd5b6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-20T00:11:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-25T23:16:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"user-manager: megamouse fixes\n\n(cherry picked from commit 949807c1cc689e12e5f0cea367564306ea36a759)","sha":"eef900ef418dc95f1ffd4a38217ee04062ff2b8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-20T04:44:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-25T23:16:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"user_manager: megamouse fixes 2\n\n(cherry picked from commit 89c7740df1b40095bfa715ff863056d5797b9f89)","sha":"622c8c27881df4b19c1142915cef65ac1a66f18f"}
+{"author":{"avatar":null,"date":"2018-07-17T00:29:23Z","email":"markuscicero5@gmail.com","login":null,"name":"mpm11011"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-25T23:16:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"user-manager: m_trophy_dir changed to lowercase.","sha":"9ca8ec8ec759d275132a5719bfdd0194f08ec418"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-23T21:55:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-25T23:16:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"user_manager: megamouse fixes 3","sha":"e58b7cbe1fb906e0fb9162c8b2c5f94e1c42e005"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-25T22:37:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-25T23:16:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"user_manager: megamouse fixes 4","sha":"f6a3659a1433fb63d81e1d56e145afeb4445de6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-26T19:12:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-27T05:41:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: only ignore highlights on specified tables","sha":"b0b4998050d551647e8e62ffb955fdd5b9bbc8e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-26T20:18:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-27T05:41:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix user manager button behaviour","sha":"847da3951c0d131c2dbb4947d0e51524dae63a07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-26T20:19:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-27T05:41:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: minor user manager style changes","sha":"2f6957c9c8dab03424c256b4853746c974eb765c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-26T20:28:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-27T05:41:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix user manager directory scan","sha":"c39bd490ba3835eeec520677fa946c99eddf6140"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-26T21:33:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-27T05:41:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add some hotkeys to some user account interactions","sha":"f84883223b7b40a3367c574889e6d0f967747fd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-26T22:12:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-27T05:41:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix user manager localusername and add textvalue to the inputdialog","sha":"e29ea61f7cb9ca7901197dcac9d32be8506cedfe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-27T06:08:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-27T17:56:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix pad settings keyboard input","sha":"01d8c3f616c4a9861759788ab0589f13f64b4f47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-27T06:14:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-27T17:56:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix initial deadzone label sizes","sha":"b0f464d1104d521eb546028f16a4ef02aeeea1b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-17T11:34:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-28T21:10:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: handle invalid entries in config files\n\nand improve error handling in enhancements","sha":"525c257c6ad0852f8e5fe18904c976b7a2f4e4f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-17T12:00:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-28T21:10:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: implement EnhanceSpinBox and EnhanceDoubleSpinBox","sha":"50dd704f2bc631cf9cb9582edcef41bd13ef8a63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-22T08:42:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-28T21:10:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: format category maps. they were ugly af","sha":"3ed98be6cdba8cce009ead4d786b89663e530f10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-22T08:49:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-28T21:10:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Loader: handle fs::file is Null fatal after decrypt self","sha":"ab84a6751110b6af0ace0706c52a7cec8b877986"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-23T02:06:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-28T21:10:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: implement tty auto scroll","sha":"7788007cbdaaab8814cb7aa00c50552ef1648e04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-24T10:43:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-28T21:10:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"change rsx_capture filename","sha":"f8d396ac9e9b50fe262adf9432b4a731a2a344d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-27T23:48:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-28T21:10:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix gui settings options","sha":"451d64407b952e450d320c3ba1363450ecf2cd0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-21T14:16:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-28T21:10:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX/Qt: add more performance overlay options to the gui","sha":"eecb9846899958b4171cba80053337099dcd404c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-21T15:20:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-28T21:10:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX: add config settings for shader compilation hint positions","sha":"bb8fa285218129c923a55a930b10ad717fd0ff29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-21T16:14:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-28T21:10:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX/Qt: Move rrc captures to captures dir","sha":"67aff85e8e4484ffb89e54b5a2b3e24147647c6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-21T19:37:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-28T21:10:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX/Qt: add the possibility to center the performance overlay","sha":"2211e95e411f67f1d9f5b2fdb9eb1a7e8dce5e18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-21T21:07:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-28T21:10:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX: Add performance overlay colors to configs\n\nuse a string hex color code. Allowed string formats are:\n#FFFFFF or #FFFFFFFF (or both without #)","sha":"f82739afb02883f05affb75cd80d8fbd577736eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-23T05:54:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-28T21:10:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX: use localtime_s instead of localtime","sha":"d057c797335e415e54a5c0ecb69a12e98402db2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-29T06:55:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-29T11:31:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix trophy table row selection","sha":"52e1a06f8c3d090808b9c2827b0b22391d68f504"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-29T07:47:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-29T11:31:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Emu: Fix RSX capture boot process","sha":"4f8b131e640f30e56934777eaff65fe5ad7c0067"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-29T12:54:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-30T18:58:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX Overlay: fix set text","sha":"8cb749110f9545b06ea6e47e66a74b93a79c20d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-24T19:57:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-01T22:24:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VS: move keyboard_pad_handler to a better filter","sha":"56a9966d69ce7ad0c1c6df6e8746bf8bc447a301"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-24T19:57:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-01T22:24:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix alignment in KeyboardHandler.h","sha":"6629983ca759b2b8f866e34c9d772dab99fd67d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-24T19:58:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-01T22:24:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellKb: improvements","sha":"bff038f55446c7c3e92b356e56a4d84bb99c0ca9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-07T07:59:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-01T22:24:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellMouse: improvements","sha":"27820f037169c86695ae9251fd35038e6962e100"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-07T13:26:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-01T22:24:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellPad: improvements","sha":"f8c8a3a26c29ba686e6835ef5d29339d883c9ffa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-07T07:59:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-01T22:24:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellMusic: improvements","sha":"456aa4ab8d90ee277c441a4e418dff00896b469e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-24T22:31:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-01T22:24:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellCamera: improvements","sha":"69af607491cfe8f359f92b60f17693e1cbd88f27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-08-02T11:25:31Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-07T00:54:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellCamera: Fixes\n\n- Fix regression from #4676\n- Refactoring of event queue management stuff\n- Some accuracy fixes","sha":"1625f4bcc9216c04cffeb541b0bb16b4658be651"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2018-08-07T04:05:22Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-07T10:10:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Readme update","sha":"451b3f3c9d73508ee583d0c555e23c1174c2ab57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1360752?v=4","date":"2018-08-11T12:46:44Z","email":"max-8000@hotmail.it","login":"Maxetto","name":"Maxetto"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-11T12:46:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update new LV2 names (#4886)","sha":"05c1f192f5b4d8b617fb1cb9b432d19e5602edbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-07-20T09:51:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-11T14:14:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_rsx_context_iounmap args","sha":"745ed8331cfc3fc4791984af1e9b07a472128261"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8276932?v=4","date":"2018-06-20T19:52:14Z","email":"smartychrisje@hotmail.com","login":"TGEnigma","name":"Chris Weermann (TGE)"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-11T16:56:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix overflow in PPUThread stack frame dump","sha":"fdcc5adc8d10383973852aadff746de3c9006696"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-22T16:06:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-11T23:42:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: fix phenoms","sha":"a424fcfcf78080398287745e80e10211cea46beb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-22T16:09:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-11T23:42:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: improve constant propagation\n\nPropagate constants in non-volatile registers between chunks\nDisable function table in Mega mode","sha":"d3ad44aec410117a8a19201989f29f0d53a78821"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-27T18:19:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-11T23:42:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: rewrite CGX","sha":"d01bf3bcb0311b97e0d99145cb3ecad13ce3849e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-25T13:39:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-11T23:42:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: inline WRCH (preview)\n\nWith lööps for TSX bróþers","sha":"711e0f75ee64bf9a23e013995cb32b02b8c1baa9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-03T12:34:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-11T23:42:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: improve debugging RPCS3\n\nBuild cache in reverse order\nCatch exceptions in instruction loop: print IR","sha":"14e6577700f3cc02cb01f12694ac48135961421f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-03T12:34:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-11T23:42:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: don't use transactions (test)","sha":"d1fd4d5000d72bac4b86f0a9c46ea70020d55d92"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-07-27T10:00:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-12T12:42:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: improve xfloat precision\n\nUse doubles for intermediate representation\nAdd option \"Accurate xfloat\" to enable","sha":"fdd4f03b93eeecafc5f4cc590a0a3787dd6ce382"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-11T23:42:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-12T12:42:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update supporters","sha":"359bfa88b792fe28301ca366f81677ad67d04dcf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-12T12:20:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-12T12:42:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: always link syscall_## functions\n\nRegardless of whether they have name or not\nShould fix \"Linkage failed\" errors introduced after #4886","sha":"801089cf445f248f12cc47b568cc6e71fdd50577"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-07-29T16:50:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-12T20:37:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Rsx: fix CALL and RET cmd","sha":"c80eb1ba0225d23f57a7eff8aade9771fa39c1b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-01T08:42:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-12T20:37:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Rsx: avoid invalid cmds execution","sha":"9e380a4a4a1d2784e2eaccc3d3da8da8183dca2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-07-27T19:07:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-13T13:16:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Rsx: rewrite address translation","sha":"f349695a75e77e27b76734b09430a7d3dd589d81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-11T11:06:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-13T13:16:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Rsx/vm: fix base addresses","sha":"449888b9db8349d7c008008858e0321334fcf6b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-13T06:13:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-13T16:44:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add the accurate xfloat option to the CPU tab","sha":"aaea9d6946a82a37f2f6cd87d1498888af978609"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-04T12:37:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-13T20:23:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix cellMouse lag + fullscreen mouse","sha":"1a5b950d8b3da05f60f332d5096d14febbb57ade"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-10T18:24:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-13T20:23:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"basic mouse handler: multi monitor adjustments","sha":"57ba9d39392c3c52adc46eb9142083023fc4684c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-12T22:06:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-14T09:46:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement fs::make_gather","sha":"441541a42fa3022bbd9d395769b9a935c201beae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-12T22:06:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-14T12:14:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_open: support split files","sha":"62f9a2dc4bb26ff10b8e75a8a047f9bd90fe5068"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-13T13:50:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-14T12:14:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: lower some log levels","sha":"9578e1e9234ef7e0944f1ffe3d63700ff1fec933"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-13T16:15:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-14T12:14:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement vm::find_map; improve memory allocation\n\nAdd vm::user64k and vm::user1m constants\nRemove vm::user_space, unreserve it","sha":"aa4040bb7b633653a98abb171655a37dcefce93b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-14T13:08:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-14T13:08:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup sys_vm_memory_map","sha":"a3daa99a3340f2c57c5635a4dd7b90bc501e2b5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-14T20:57:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-14T20:57:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix vm regression from #4975\n\nIncorrect vector management","sha":"5e20d4b481e7be66271f3744febdd7b969e28c83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-14T20:59:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-14T20:59:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix include in log_frame.cpp","sha":"6c62f42d8d74d245dcd4e468bc19ecc91ab6d654"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-15T20:12:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-15T23:27:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx-capture: unbreak","sha":"061c787e5688e25d87d6083ce9a6c7a3257e2c07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-15T20:16:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-15T23:27:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_memory: fix default alignment flag\n\nits 1mb","sha":"9d8c9c2460dfce8029eb1a583df2ed9d7bad9f85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-08-11T21:46:54Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-16T12:38:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix typo in buffered_section::overlaps_page\n\nIf \"address\" is not page-aligned, the calculated end address for the\ncorresponding page is incorrect which can lead to false positives,\ncausing some textures to be re-uploaded unnecessarily.\n\nThis commit fixes this typo.","sha":"f82ce06fdcac90cbda2d4becc53a17cd9333fbe9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-08-11T21:50:57Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-16T12:38:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix off-by-one error in get_intersecting_set\n\nWhen the trampled range changes, get_intersecting_set restarts the\nouter loop. However, due to an off-by-one error, it skips the first\ncache entry when doing so. This can cause a texture not to be\ncorrectly unlocked, which could lead to issues or even deadlocks.\n\nThis commit fixes this off-by-one error.","sha":"b534d49e48aeacf9fc2c3d8968940192d45cccbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-08-11T23:30:23Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-16T12:38:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Refactor get_intersecting_set\n\nThe existing implementation restarts the loop immediately after\nfinding a range_data instance that updates the trampled_range.\n\nThis commit refactors this method to continue the loop with the updated\ntrampled_range, and then repeat only those range_data instances that\nwere iterated through before the trampled_range was last updated.\nAs a result, the number of total iterations required is reduced.","sha":"fa6a5761b3c006c0c10b1465d3357cd299335c2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-08-13T19:40:32Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-16T12:38:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Mark unsync textures dirty when deferred flushing\n\ninvalidate_range_impl_base does not mark all textures that will only be\nunprotected as dirty when doing a deferred flush, since that is done by\nflush_all.\n\nHowever, if there are no sections to flush, the deferred flush will\nuse the same code path as non-deferred flushes for unprotecting textures\nand forget to mark them as dirty.\n\nThis commit fixes this bug.","sha":"23b52e1b1c0b74eb43faf0ff065ecfe44ee9131a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-19T06:08:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Synchronization rewritten\n- Do not do a full sync on a texture read barrier\n- Avoid calling zcull sync in FIFO spin wait\n- Do not flush memory to cache from the renderer side; this method is now obsolete","sha":"3b47e433803d3acbd2876f78c913ba468930f76a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-19T16:57:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"zcull synchronization tweaks\n- Implement forced reading when calling update method to sync partial lists\n- Defer conditional render evaluation and use a read barrier to avoid extra work\n- Fix HLE gcm library when binding tiles & zcull RAM","sha":"8800c104763ca872576cb2beb3f70c31dd758fd4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-22T09:14:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"ZCULL: lower notice severity to avoid spam","sha":"9f0fada17a43b576a244367e92e84fea0164c893"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-22T10:29:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Minor optimizations and fixes\n- FIFO: avoid multiline spam\n- VK: Fix program setup counter\n- FS: Precalculate fragment constants buffer size during analysis step","sha":"026722158639c7338f2e20a240435152efbfd819"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-23T21:55:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactor and fix framebuffer layout checks\n- Refactors shared code back into rsx core\n- Adds extra check to avoid contest confusion","sha":"d0165290b66db166b6bb89f52c0ac38842a1b232"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-24T20:41:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Optimize hash_struct; vk cleanup","sha":"1200ca8172326abb9f5972c4ba940b346f3d8fca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-24T21:33:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Timestamp accuracy workaround","sha":"373e02e91c5ee16275cc9553b43f6a01760f354d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-25T08:41:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fixups for type b surfaces","sha":"e9d609635643b53901148b1d8aa2a658f63e0a0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-26T17:52:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Fix blit engine transfer to ARGB8 render target memory","sha":"cc7848b3ef7b045d892f6fbbdc10c8108751c914"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-26T18:10:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Allow linear filtering when reading back GPU-resident memory","sha":"741ee9ac41f35605208e676d74647c9d1852a674"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-26T21:03:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Avoid acquiring the vm lock; deadlock evasion\n- A possible deadlock is still present if rsx is trying to get a super_ptr whilst the vm lock holder is in an access violation\n  This patch makes this scenario very unlikely since each block need only be touched once","sha":"38191c3013ed49a0116601d30268f0d0a5635c34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-27T18:33:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"zcull: Improve the delay algorithm to be more consistent\n- Use proper time checking; depending on what is being done one 'tick' can\n  be almost a millisecond long or several nanoseconds\n- Avoid spamming the system timer unless necessary","sha":"0f36e87010b672b6c0fe33ec11cef94452410cde"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-31T09:05:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Do not create secondary context if async is disabled\n- Some third party programs fall apart when multiple contexts are created","sha":"ba5b59dc595403fc06710aa2b8e24f485027448b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-01T20:55:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"[WIP] rsx: Improve memory inheritance hierachy\n- Cascade memory writes by invalidating 'downstream' subsurfaces\n- Fixup; always resolve for overlapping surfaces before sampling (force\n  atlas gather test)","sha":"f8a9b1fa30f72790fcf6dec4da9a4e0eb4ace659"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-02T20:14:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Enable swizzled decode for all formats unless proven otherwise\n- Some formats are proven to ignore swizzle flag\n  - DXT compressed textures\n  - COMPRESSED_BG_GB class textures\n- Some applications are using swizzled wide integer formats so those are confirmed to swizzle","sha":"cca488d0cf75d7b54bbbf677b9dbfac7632b69e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-08T21:48:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Reuse framebuffer resources\n- WIP optimizations for GL backend","sha":"8c93db342f12104c7efdcd689d22a4bd2a840a83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-09T12:36:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Avoid unnecessary scissor state change every draw call.","sha":"ec31157bc7d5b4679ae7cc2c43725156689b8c83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-14T19:58:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Followup to the memory inheritance hierachy patch\n- Tags framebuffer resources on first use (when on_write is called to verify memory)\n- Texture cache now selects the best match and even sorts atlas writes with memory write order to avoid older data showing over newer one","sha":"4b2b662c3a5401149787d293b0cf6eb968e97ca1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-13T17:19:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"fix gcc build","sha":"937f1e8cd08a1c35a99240b5d00e90d1eca6cd68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-16T17:41:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Force disable draw reordering when capturing a frame","sha":"dd21e43ed59de9f50753d0505f0d9c48a9db7aef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-17T18:59:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-18T13:14:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Do not overflow the program buffer!\n- Some games overflow the program buffer e.g Resistance games\n  The observed overflow is one instruction longer, likely an engine bug\nwith counting instructions","sha":"7915dcb23c25267d7e400582a449876ef3528dc2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-18T13:57:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-18T18:00:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix stylesheet warning","sha":"7cf82d25117854c06225355ce6bf8edc7eb3f241"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-18T18:01:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-18T18:01:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve vm::unmap\n\nPrevent unmapping predefined locations","sha":"182c04b59d8bcd9a452db29cb29a7a26a3a5a02e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-18T18:02:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-18T18:02:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Hardcode vm::user64k location","sha":"6ec4a88eb523ce7547884c0b076985572d1926df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-18T18:14:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-18T18:14:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve vm::reader_lock\n\nAdd upgrade() method","sha":"e8d144f3991b69d775664e66c88814a74f6fec46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-18T18:38:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-18T18:38:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Name missing vm::spu location","sha":"386e301ea0fb6b409361b9d85335d05a1f789caf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-19T12:34:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-19T12:56:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix present modes ordering\n- Newer nvidia drivers are not exposing IMMEDIATE present mode unless you change options in nvidia control panel\n  This can cause severe performance degradation unless the vsync option is set to \"off\" in control panel","sha":"25ec3789fe6a7835b8c3c189cb93ab7575e18db9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-08-19T16:47:54Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-19T20:12:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Revert d1fd4d5000d72bac4b86f0a9c46ea70020d55d92","sha":"6fc869e21b998761062559aa44d936410af9acd8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-20T17:54:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-20T18:19:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: only center basic mouse input on active fullscreens","sha":"d1d1b2effd1e94d474811f7bb540f6affb9dc433"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-20T10:44:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-22T09:20:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Rsx: fix translation when address is negative\n\nmove address shift to where it should be, extend io table to catch all possible values.","sha":"158019b50f3e82939c5a2a2a22e56bc82047ab99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-20T10:51:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-22T09:20:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix cellGcmInit\n\nadd a missing reset","sha":"18ec05c070c58787f9cc9ee77184f9bc5aac4b9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-20T12:13:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-22T09:20:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Rsx: fix cmd jump over put register","sha":"56d553f10d92b97468537646bd7bb33f2c3caa7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-17T19:11:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-22T10:19:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx-debugger: bugfixes and improvements\n\n*always translate given address\n*add a few missing methods names\n*fix branches","sha":"874d18f7611c71550e0f77d0d4611a7c0120062c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-22T13:59:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-22T14:22:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Rework section reuse logic","sha":"f3d3a1a4a5d7d32f4fbcf2057d7272ea40beeb2b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-22T11:18:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-23T19:54:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Support sw component swizzle decode because metal sucks","sha":"c6e35706a3a47368713939ad06afcd5eb04212eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-23T18:56:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-23T19:54:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement double-buffered heaps for platforms without universal support for host visibility (APPLE)","sha":"f0a91484a039714afab253463429f6039699f6b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6974432?v=4","date":"2018-05-12T08:03:01Z","email":"morten242@gmail.com","login":"Morten242","name":"Mårten Nordheim"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T10:46:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix compilation with VS2017","sha":"b095a0be904e0feb0ad7e44c4af956bd7cdc256e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-24T07:52:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-24T11:52:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Check for allowed texbuffer range instead of assuming 64M","sha":"76f102e8659059ad7a85dbd9648e5b030c77c9f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-24T08:30:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-24T11:52:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve fence wait logic","sha":"21e191111221fbfa86faadaa03e2df709b1c2d91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-23T15:33:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T13:44:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Travis: use gcc-8","sha":"fba4dbf498c837ec28753054e02bef8c4931de34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-23T21:31:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T13:44:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use std::void_t","sha":"6cc7d1fb264780b2edf215c6e544239d53b3e37f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-23T21:31:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T13:44:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add MATCH macro","sha":"76bac80dde1aaeb9fa4865ae7e34212a040a3d89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-23T21:32:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T13:44:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"[CMake] Use C++17","sha":"5afd12e8a4148e5fcf8bcc1bbea528a0d1f7ca47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-23T23:30:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T22:15:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rearrange atomic operator internals","sha":"56a165ecdccf7828d9ba94e8faa51212f85f892e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T11:01:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T22:15:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify error_code","sha":"3aa6741b8c8682ff43cb28cbed476723f331a408"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2016-12-19T19:46:08Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T22:15:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update Project to Visual Studio 2017.","sha":"c30a7c00412f821e1b894e5f11ec22b2459a8bdc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T11:38:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T22:15:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VS: enable C++17","sha":"6bbec61856b79b9f1db06877e51d0b476350cde2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T12:09:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T22:15:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Workaround MSVC bug\n\nIt fails to parse Args... in fmt::get_type_info<>()","sha":"bb19feca9605db73037fb91f44eb0a6b06fb4663"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T14:38:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T22:15:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite texture_cache::emit_once\n\nAlso trying to workaround MSVC bug","sha":"923314aef5e25fe1a976e9f8b6bf1e015d75dc3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T16:07:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T22:15:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update GSL and yaml-cpp submodules","sha":"1c6c24f8ac48278f7ed59f87199537bb0ff07918"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T22:47:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T22:47:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update dependencies","sha":"955be34914a5da5038723b8263874756753ffa1c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T22:47:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-24T22:58:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Disable texture_cache::emit_once (MSVC crash)","sha":"a93a40e8d9394434332b17f5153147e46eae45e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-25T09:06:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-25T09:06:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix hidapi URI","sha":"1d86c60548ebcefaf1859897c2e77e1d382503cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-25T09:06:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-25T09:06:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix type-safe formatting","sha":"57f394e15678d09c4ccc8d05ba91c49ad1aa494f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-25T12:39:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-25T12:39:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Reintroduce LOG_CHANNEL\n\nGroundwork for further improvements","sha":"363811981da92ff8b929b29e444bd79130e354b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-25T12:47:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-25T12:47:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Don't use std::aligned_storage\n\nDon't need its limiting behaviour anyway","sha":"84abb9923a0d0cb332a646c3d4f45141a0f6058b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-25T15:38:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-25T18:06:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add _ENABLE_EXTENDED_ALIGNED_STORAGE\n\nShould fix compilation error regarding std::aligned_storage","sha":"93a9201316f1d6d93c225664b9d667983bed5745"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-25T16:06:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-25T18:06:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Don't use decltype(spu_opcode_t::...)\n\nAdd static constant for this purpose\nTry to fix MSVC bug warning C4573","sha":"7b4f70390d4662f443cb4b32283c40510c41d534"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36057965?v=4","date":"2018-08-27T18:53:45Z","email":"36057965+zarroboogs@users.noreply.github.com","login":"zarroboogs","name":"zarroboogs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-27T18:53:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Git Revision Fix (#5043)\n\n* fix shotrened git revision in version string","sha":"23f5cee653029915362f624bf473772fedf687c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-23T07:16:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-28T07:47:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Rsx: add missing default vertex shader attributes registers states","sha":"e279bdb304a8e3370f8f2714754068fdbfe51d91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-24T05:44:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-28T07:47:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Rsx: fix flip method registers reset\n\ndriver flip does not reset registers","sha":"38a72cc6ee362d3c4706f7b36120d88641653854"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-26T12:18:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-28T07:47:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Rsx: fix unknown cull faces","sha":"acf1286b4925174859c89214250a61629185d0de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/546193?v=4","date":"2018-08-28T10:00:34Z","email":"moritzwarning@web.de","login":"mwarning","name":"Moritz Warning"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-28T16:29:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"add comma to readme","sha":"eaf20295acf56edf5183fa79a9d5d6ec36b63794"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/107301?v=4","date":"2018-08-18T01:13:25Z","email":"kvarkus@gmail.com","login":"kvark","name":"Dzmitry Malyshau"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-28T18:20:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Basic support for Vulkan Portability on OSX","sha":"c452b43ebccfcab3f59fcc7afd2bd9f7a0c31084"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-28T19:03:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-29T10:37:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Rsx: remove method registers reset\n\ncellGcm manually resets registers each flip, tested with cellGcmSetFlip","sha":"fc50e6abcb47f2465d48387e8e7c111c0459eee3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-29T08:12:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-29T10:37:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Rsx/cellgcm: complete rsx_state::reset()","sha":"37ee0a2f550aea1cb56a3abc88068764d13075b7"}
+{"author":{"avatar":null,"date":"2018-08-29T11:27:10Z","email":"jmatich@users.noreply.github.com","login":null,"name":"jmatich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-29T11:27:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Compilation fixes for Mingw64 (MSYS2) (#4899)\n\nfix compilation on mingw","sha":"b5dbd44087c4d2e4c7cb776a2a2ac67a528b14f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-03-14T20:27:56Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-29T12:15:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Initial work on cellMic","sha":"f9cab3270f8eca2092fe9720cbad5927525852ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-12T19:32:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-29T13:09:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cellGameExec: add param checks","sha":"d4285fb196dbb1939958a6f1bbbd17e1f39b7571"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-12T19:33:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-29T13:09:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cellMsgDialog: introduce open_msg_dialog","sha":"7208aa37cc133817c9cef7b7d49188c28276dbec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-25T21:32:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-29T13:09:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cellGame: implement error messages and some stubs","sha":"00b31c27a3713722ff22ddfe4c8c4ee17402a795"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-06-07T11:20:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-29T13:09:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cellMsgDialog: improvements","sha":"686d3eb1df36b1fb7520df6d9104fbdffef20ad8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2018-07-10T15:02:41Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-29T13:56:17Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Trophy fixes","sha":"4c1459534d0ec328d0b332c0fdc8da1ffa7db7f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-08-29T00:55:43Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-08-29T21:01:57Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Bump CMake Requirement to 3.8.2+\n\nWith older builds CMake will error out with `CXX_STANDARD is set to invalid value '17'`\n\nCXX_STANDARD 17 was added on CMake 3.8.X as found in the 3.8.2 documentation: https://cmake.org/cmake/help/v3.8/prop_tgt/CXX_STANDARD.html\n\nAlso removes leftover from old VS2015/2017 mixed instructions, removes \"Not GCC 6.1\" since we require 7.3+ now and bumps Xcode to 10. Proper MacOS instructions will be added afterwards by someone else.","sha":"4357892081e7d3de7b8d62e18a4178ef17b30fb8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-29T21:47:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-29T21:47:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix typos (#5054)","sha":"685eaedbf9bbdc9d957aef6bfff3bd04524fe5ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-05T17:03:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-30T05:38:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: implement first Mouse Movement for keyboard pad handler","sha":"1fbd918d59b7a67524b9b25aa934822ec4eb82c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-05T17:26:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-30T05:38:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Adjust to US keyboard... sigh","sha":"e53ca429a1b7dfed0514a37cacd16adc02a81a75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-10T18:45:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-08-30T05:38:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"keyboard_pad_handler: fix mouse for multimonitor fullscreen","sha":"f933947a27da2d641bfdc6f456ef8b7340aeae99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-26T21:38:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-30T11:56:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_stat: support split files\n\nWas forgotten after sys_fs_open","sha":"c49c7de42742e32a7bedfff629d9694a5fe68ef1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-27T14:52:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-30T11:56:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: allow 4k-aligned allocations for vm::stack\n\nFix utils::shm::map logic for MapViewOfFileEx","sha":"85fa0942e7a5a7c1f0eae0b8bdf2a53020dcc266"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-08-30T17:39:44Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-30T23:19:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Utilities: explicitly add more includes found by GCC\n\nUtilities/Log.cpp: In member function 'void logs::file_writer::log(logs::level, const char*, std::size_t)':\nUtilities/Log.cpp:559:9: error: 'memcpy' is not a member of 'std'\n    std::memcpy(pos, text, frag);\n         ^~~~~~\nUtilities/Log.cpp:559:9: note: suggested alternative: 'empty'\n    std::memcpy(pos, text, frag);\n         ^~~~~~\n         empty\nUtilities/Log.cpp:560:9: error: 'memcpy' is not a member of 'std'\n    std::memcpy(m_fptr, text + frag, size - frag);\n         ^~~~~~\nUtilities/Log.cpp:560:9: note: suggested alternative: 'empty'\n    std::memcpy(m_fptr, text + frag, size - frag);\n         ^~~~~~\n         empty\nUtilities/Log.cpp:564:9: error: 'memcpy' is not a member of 'std'\n    std::memcpy(pos, text, size);\n         ^~~~~~\nUtilities/Log.cpp:564:9: note: suggested alternative: 'empty'\n    std::memcpy(pos, text, size);\n         ^~~~~~\n         empty\nUtilities/sync.h: In member function 'int futex(int*, int, int, const timespec*, int*, int)::futex_map::operator()(int*, int, int, const timespec*, int*, uint)':\nUtilities/sync.h:110:20: error: 'find' is not a member of 'std'\n     map.erase(std::find(map.find(uaddr), map.end(), ref));\n                    ^~~~\nUtilities/sync.h:110:20: note: suggested alternative: 'rend'\n     map.erase(std::find(map.find(uaddr), map.end(), ref));\n                    ^~~~\n                    rend","sha":"cd6bf37d06636321ab0f420e445303a4a6c8fd04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1016937?v=4","date":"2018-08-29T17:20:52Z","email":"lassi.m.hamalainen@gmail.com","login":"kukkamario","name":"Lassi Hämäläinen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-31T13:49:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove Utilities/variant.hpp and use C++17 variant\n\n- Remove also Utilities/variant_visitor.hpp\n- Fix variant and variant_visitor usages and #includes","sha":"79cf2832ae0f59ffbae4c9cc4a132fe186019aea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-08-27T15:30:30Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-31T16:13:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"3rdparty: remove optional submodule","sha":"6c62d042c520fabd752d8669aab954fe8a61b7a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-08-29T17:34:18Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-31T16:13:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Compilation fixes for optional on osx","sha":"7d0e94ab0ae31fb0d839ae06d4e82e78ca0ccfb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-08-31T14:58:46Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-31T16:13:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update ConfigureCompiler.cmake to check for the same compiler versions as those set in README.md","sha":"c2973d2b821aebba3c8acacc48b84c01e72a46a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-08-31T15:02:18Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-31T16:13:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove useless #include","sha":"bf89b709cb14991f0287ba6e0c5393350cda8f28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-01T18:16:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-01T18:44:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_memory_free","sha":"9acaee563be8be55975d137de9fc368e0993f8fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-28T15:19:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-03T15:24:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix endianness order when immediate mode register is updated, but used as register lookup\n- Simplify the code by unifying all the register-backed memory","sha":"63998331829134214d788c9c7a25792f2258acd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-29T09:35:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-03T15:24:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"d3d12: restore working graphics","sha":"85d38b575130bde421955f3ae8ab12fe076bf35d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-29T09:35:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-03T15:24:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: whitespace fix only","sha":"e23435a190e5a2a888b3237afcf88745c765b457"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-29T12:49:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-03T15:24:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve logging of device names and driver versions","sha":"815f4aa63b1436fd5204dbb355a7f27cef6ba716"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-08-30T10:14:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-03T15:24:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: always clean up the heap when using legacy buffers","sha":"5a08b690d5cb701a9fc5c1162f793ee29b094925"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-03T14:14:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-03T15:24:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Possible fix for UB data type consistency","sha":"2e0ecb556ca5ae7f400555a850c016b0a09963ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-09-03T17:28:18Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-09-03T17:49:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix cellMic regression from #4467\n\ncellMicEnd would get stuck waiting for the cellMic thread to finish, but\nit never does because micInited is still true.\n\nFixes Resistance: Fall of Mankind getting stuck after the menu","sha":"1175658bd5bba19b63d9c8728c352fc7330c96cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-03T16:04:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-03T18:39:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix FP temp register count","sha":"dea5193fd7e944990913729de884df91dd7a3626"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-08-31T13:47:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-03T18:40:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove ALIGN_32 macro\n\nIt's never used in expressions like SIZE_32(T) * n, so it doesn't help to fix any warning issued due to truncation.","sha":"69f0ad0d68613841a79f46d44f796333629612cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-01T15:11:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-03T18:40:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove EXPECTS/ENSURES macro","sha":"01b4c68238f52e1891acc84131165661e716f317"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-01T15:12:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-03T18:40:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use fold expr in fs::write_file","sha":"a6d06b2e209fb9a5dad76114ecdf7f32954e6130"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-02T17:22:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-03T18:40:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Mega-cleanup for atomic_t<> and named bit-sets bs_t<>\n\nRemove \"atomic operator\" classes\nRemove test, test_and_set, test_and_reset, test_and_complement global functions\nSimplify atomic_t<> with constexpr if, remove some garbage\nRedesign bs_t<> to use class, mark its methods constexpr\nImplement atomic_bs_t<> for optimizations\nRemove unused __bitwise_ops concept (should be in other header anyway)\nBitsets can now be tested via safe bool conversion","sha":"8abe6489ed407f238646ce8d800da69f3bd1266c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-03T12:09:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-03T18:40:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make vm::var unmoveable\n\nFix bugs with discarding vm::make_var result","sha":"7bccdbf157912daf12ead7c8f26ce78b7a3d715c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-03T15:46:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-03T18:40:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Try to get rid of SIZE_32 macro","sha":"ce4c4696ddc1fb7ceef37d69a62873447eab956f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-03T17:08:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-03T18:40:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Adjust cellMic log levels","sha":"5e556a87ff93f64852178d35d97c91b0e8173711"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-03T19:28:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-03T20:00:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Cleanup semaphore<> (sema.h) and mutex.h (shared_mutex)\n\nRemove semaphore_lock and writer_lock classes, replace with std::lock_guard\nChange semaphore<> interface to Lockable (+ exotic try_unlock method)","sha":"ca5158a03e5ca66623ff39c8bda7185a51a05e9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-05T15:09:56Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-05T16:53:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_usbd: add sys_usbd_event_port_send function","sha":"02ba529eea9d4a267fa06e23375e959fb7835fde"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-05T20:52:30Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-06T10:15:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"c++17: use std::clamp","sha":"7724161c14f73251fa11ad7ee3955f195f50d1b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-05T20:52:31Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-06T10:15:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"c++17: use std::size","sha":"d7bb59cd994e0fc5be91c48225058ff933707450"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-05T20:52:32Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-06T10:15:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"clang-tidy: remove redundant \"apply_swizzle_remap\" declaration","sha":"c4cff9b543714d6c786345e662e9cdd4ff29fa80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-05T20:52:33Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-06T10:15:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"clang-tidy: use nullptr","sha":"f83d381e1e69e680ac70036647956df35e18cdc2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-05T20:52:34Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-06T10:15:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cleanup: remove compatibility code for old versions of clang","sha":"a745f02a07fb89428386787957ded172ace8d9b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-05T20:52:35Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-06T10:15:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cleanup: remove intermediate const char* variables","sha":"2834c88de7a55585886ac4b95b1091b87c93c437"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-05T20:52:36Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-06T10:15:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cleanup: remove recursive_wrapper.hpp","sha":"549a5370d8b85dcfef733bd4251bf79dca9b43d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-05T20:52:38Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-06T10:15:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cleanup: remove unnecessary return and namespace declaration","sha":"343656f66d4faa4814149b77b27c1f5594e25a56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-05T19:32:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-06T18:11:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Preserve fog coordinate across shader stages\n- The x value contains the VP output value interpolated across primitive surface\n- The y coordinate contains the fog fraction according to the selected fog formula","sha":"346b97f871155e64677d8fef2f2e82948e95b0df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-06T17:17:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-06T18:11:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/common: Clean up shared glsl header to minimize string concat operations","sha":"66610a28af4fb27a1af34a2aa3fcc97ce98c6de0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-09-06T00:35:53Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-07T09:38:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"better stub sceNpUtilBandwidthTestGetStatus","sha":"46812d46bac03ef6259a5d6124dad74c002b75bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/107301?v=4","date":"2018-09-07T11:35:40Z","email":"kvarkus@gmail.com","login":"kvark","name":"Dzmitry Malyshau"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-07T11:35:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add missing virtual desctructors (#5094)","sha":"27474316fdc20c8755223c4633ed47504806e7c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/318789?v=4","date":"2018-09-07T16:26:59Z","email":"ofeklavie@gmail.com","login":"Farseer2","name":"Ofek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-07T17:04:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix trophy regression\n\nHopefully\nCorrect status order","sha":"d7b0344091a2660ac4f29e5975a7e2f64f768327"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/107301?v=4","date":"2018-09-06T21:10:44Z","email":"kvarkus@gmail.com","login":"kvark","name":"Dzmitry Malyshau"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-09-07T18:11:34Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"[vk] fix cubic view construction","sha":"b454dde871a8fafd447740dcf682dc3a766c614b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/107301?v=4","date":"2018-09-06T19:39:45Z","email":"kvarkus@gmail.com","login":"kvark","name":"Dzmitry Malyshau"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-07T19:02:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"[vk] Check for BGRA8 linear image to support blitting","sha":"4e0957393749bc7b2f4c634f22c0441ad3270757"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-04T10:31:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-07T21:32:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"bs_t<>: add missing operators","sha":"ea4a3b2476db453b8627d58920d28a48cfd605d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-04T17:59:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-07T21:32:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use std::uncaught_exceptions()\n\nAlso remove wrong attributes","sha":"d750e955c3666124f7ddf5328613d70d61083572"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-05T12:10:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-07T21:32:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use std::invoke_result_t\n\nAlso simplify idm code","sha":"99ffc3fca9aa67131efaf4a5231cb79e9c7a7a50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-05T13:24:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-07T21:32:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove explicit_bool_t, ignore, multicast<>\n\nRemove vm::ptr operator %\nThis was a bad idea but explicit_bool_t was created almost for it\nOther removed types are unused and have little to no meaning","sha":"ee968073052daf1034ae1ac2bcad36c072c22e6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-05T16:57:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-07T21:32:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move rotate/cntlz/cnttz helpers to Utilities/asm.h","sha":"ed9fb8405b149f81081b5ebfca70931df9bb1bd0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-05T19:28:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-07T21:32:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic_t<>: extend fetch_op to support cancellation\n\nUse std::invoke inside atomic_op/fetch_op\nRemove op_fetch because it's easily replaced\nAdd fetch_dec_sat algorithm (conditional decrement)","sha":"fb5cdf9769ff5f5161ee77900d32affca3367cba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5672538?v=4","date":"2018-09-08T15:22:55Z","email":"theracermaster@gmail.com","login":"al3xtjames","name":"Alex James"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-08T17:07:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellCamera: Fix check_dev_num call in cellCameraOpenEx","sha":"5237779136c2e7ee5ce0f94e2351d3b9ddc37c0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-08T19:21:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-08T22:02:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add option \"HLE lwmutex\"\n\nReplaces lwmutex/lwcond implementation with alternative one","sha":"3ac1b46df2e74d13dd7effbf68e387cf53f6a83a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-09T09:59:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-09T09:59:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic_t<>: remove inline assignment\n\nAdd atomic_op/fetch_op overloads with template argument (may be removed in future)\nRemove args... in atomic_op (capturing lambda is preferred)","sha":"2226125728a49c51a9eea74fc84c284373bd33ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-10T10:22:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-10T12:43:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor texture cache fixes\n- Retag resources reprotected under flush_always rules\n- Properly check for blit resource fitting taking into account format\nmismatch, pitch mismatch and typeless transfers","sha":"f413996362d348747fad97fe76eae24085ac8907"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-09T15:03:16Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-10T16:59:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: add virtual destructor for default_vertex_cache","sha":"c8c8ce5e9e053a720b184e67f1dddb7e44ab9e3a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-09T15:05:56Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-10T16:59:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cpu: use correct type when defining llvm value is_int constexpr","sha":"3072571a4fed63755c47584b8c7aa4e199cdcde6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-07-16T01:12:43Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-11T09:02:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Travis refactor","sha":"635ecbeb902726919c828fbc07421b6cf7d78811"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-10T18:18:05Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-11T18:20:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu: improve lvebx/lvehx/lvewx instructions","sha":"f294729b286ba79ce659c5402692f69c9ebb61a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/107301?v=4","date":"2018-09-11T03:41:29Z","email":"kvarkus@gmail.com","login":"kvark","name":"Dzmitry Malyshau"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-11T20:44:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"[vk] check for attachment format properties before pre-creating render passes","sha":"89ddeda24af7c6a43a2fffdcb8509088524eddd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/107301?v=4","date":"2018-09-11T16:05:48Z","email":"kvark@mozilla.com","login":"kvark","name":"Dzmitry Malyshau"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-11T20:44:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"[vk] Throw an exception on using a repder pass that the driver doesn't support","sha":"7c4693e27132cb96d88fbf71c535ab592e332a01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-11T06:56:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-11T21:40:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: dont silently ignore null shader address","sha":"efbd77deb4270a56543f4204d3fe22f4dd6d4539"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-12T19:39:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-12T20:17:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu: Fix extreme reservation corner case","sha":"cd11ae5d8b621428f5c2ec8153dba37d096d5593"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-11T21:44:41Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-13T09:43:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: tiny zcull optimizations","sha":"4cb98014a218b99715f6d7b1f82b6d1a648d01b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/107301?v=4","date":"2018-09-12T20:55:09Z","email":"kvarkus@gmail.com","login":"kvark","name":"Dzmitry Malyshau"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-13T13:04:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"[vk] don't ask for VK_FORMAT_UNDEFINED support","sha":"d28c0d16f8529b33f0a4b412474e88ab6c7be6d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-13T04:38:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-13T13:49:58Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add a default shader address state","sha":"b9ad578b0054148e7d1a3a4c24b0d6f140b26733"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-13T05:45:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-13T13:49:58Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"typo fix\n\nshader's location is decremented by one to match cellGcm's constants.","sha":"d24f9194f7fe7866575898684ec4b1bed60e1075"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-16T23:23:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-09-13T20:01:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellKb/Qt: Improve basic keyboard \n\nSadly the shift in Qt is a bit counter productive.\nYou'll have to hack another key as shift until i figured it out","sha":"ed7012c9dbefd6b700f72b5b17d5e178ce8bf243"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-14T09:25:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-15T08:57:06Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vp: Fix ARL opcode properly\n- NOTE: The address swizzle index is only for use as src. The address registers are only used one channel at a time.\n- When the destination of ARL, the encoding is the same as the other temp registers","sha":"16dcbe8c74bd88b3bb860323fdaf5f402541729c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-11T16:02:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-15T14:09:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite vfs::get and vfs::mount\n\nPreprocess . and .. correctly\nDon't use recursive locking\nAlso use std::string_view\nFix format system for std::string and std::string_view\nFix fmt::merge for std::string_view","sha":"e8b555563089b72d30003204e4f203de280c138a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-11T16:03:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-15T14:09:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove safe_reader_lock, safe_writer_lock\n\nIt worked as a simple recursive locker for shared_mutex\nBut its design is flawed and thus can't be fully implemented","sha":"445e5def42bb8e5fb39f1b005d520d173eb9602c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-14T09:18:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-15T14:09:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix bitset formatting","sha":"d34714585593325781542b0f3d2fc649e78205eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-14T10:53:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-15T14:09:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU reservations: ensure aligned atomic ops\n\nStore aligned 64 bits to ppu.rdata\nDon't save reservation size","sha":"f2229a5f536ead43ecfacf4ce3108db1ec3bc423"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-15T11:42:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-15T14:09:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove thread_ctrl::atexit\n\nIt was only a workaround for poor C++11 thread_local support","sha":"c5676e5649ee88fcbb16aa649ecda414a2051e73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-15T14:04:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-15T14:18:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite sys_fs_opendir\n\nRewrite lv2_dir object\nSupport split files and mount points","sha":"b94e98aed55f8dddf59fae8b6bac4d8b1744c09e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-15T21:36:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-15T21:36:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Optimize logging via logs::channel\n\nUse constant-initialized severity subobjects instead of temporaries","sha":"ed8aa774bb59e7d155af95b52e9e7894c8777780"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-17T07:55:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-17T07:55:17Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Clamp texture offsets (#5137)\n\n* rsx: Clamp texture offsets\r\n\r\n* rsx: Remove texture location check/hack","sha":"0d4f0f95cc5b9cbeb7980358dbb7dd54f94ed5bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-16T09:46:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-17T09:18:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix trailing zeros in CPU brand","sha":"9de31fc5ceb82f069f7851ea983c36f6fdbf1634"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-16T15:18:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-17T09:18:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix .editorconfig encoding","sha":"a64beb583be5a43df9794469c7d523ac29d26536"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-17T09:18:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-17T09:18:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add forgotten SAFE_BUFFERS","sha":"4cebf431fd26227bbd238150925fae6f40abf0c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-17T13:45:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-17T14:24:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"spu: Fix MMIO index checking","sha":"05cd3712a336b075a7fe35398ad1b243167a2613"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-09-15T03:46:30Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-17T15:47:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix travis mac build regression","sha":"1a361e1f29f15275c9f12bc7a2e66412548bed9f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-09-15T04:09:57Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-17T15:47:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor cleanup and add back in xcb lib removal","sha":"e37da61a1c16c5ffed82767473740c2481a2f336"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1016937?v=4","date":"2018-09-18T10:07:33Z","email":"lassi.m.hamalainen@gmail.com","login":"kukkamario","name":"Lassi Hämäläinen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-18T10:07:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CMake: Refactor CMake build (#5032)\n\n* CMake: Refactor build to multiple libraries\r\n\r\n- Refactor CMake build system by creating separate libraries for\r\n  different components\r\n- Create interface libraries for most dependencies and add 3rdparty::*\r\n  ALIAS targets for ease of use and use them to try specifying correct\r\n  dependencies for each target\r\n- Prefer 3rdparty:: ALIAS when linking dependencies\r\n- Exclude xxHash subdirectory from ALL build target\r\n- Add USE_SYSTEM_ZLIB option to select between using included ZLib and\r\n  the ZLib in CMake search path\r\n\r\n* Add cstring include to Log.cpp\r\n\r\n* CMake: Add 3rdparty::glew interface target\r\n\r\n* Add Visual Studio CMakeSettings.json to gitignore\r\n\r\n* CMake: Move building and finding LLVM to 3rdparty/llvm.cmake script\r\n\r\n- LLVM is now built under 3rdparty/ directory in the binary directory\r\n\r\n* CMake: Move finding Qt5 to 3rdparty/qt5.cmake script\r\n\r\n- Script has to be included in rpcs3/CMakeLists.txt because it defines\r\n  Qt5::moc target which isn't available in that folder if it is\r\n  included in 3rdparty directory\r\n- Set AUTOMOC and AUTOUIC properties for targets requiring them (rpcs3\r\n  and rpcs3_ui) instead of setting CMAKE_AUTOMOC and CMAKE_AUTOUIC so\r\n  those properties are not defined for all targets under rpcs3 dir\r\n\r\n* CMake: Remove redundant code from rpcs3/CMakeLists.txt\r\n\r\n* CMake: Add BUILD_LLVM_SUBMODULE option instead of hardcoded check\r\n\r\n- Add BUILD_LLVM_SUBMODULE option (defaults to ON) to allow controlling\r\n  usage of the LLVM submodule.\r\n- Move option definitions to root CMakeLists\r\n\r\n* CMake: Remove separate Emu subtargets\r\n\r\n- Based on discussion in pull request #5032, I decided to combine\r\n  subtargets under Emu folder back to a single rpcs3_emu target\r\n\r\n* CMake: Remove utilities, loader and crypto targets: merge them to Emu\r\n\r\n- Removed separate targets and merged them into rpcs3_emu target as\r\n  recommended in pull request (#5032) conversations. Separating targets\r\n  probably later in a separate pull request\r\n\r\n* Fix relative includes in pad_thread.cpp\r\n\r\n* Fix Travis-CI cloning all submodules needlessly","sha":"7aef811ff7ea750b139b9b660c4881b93029dbf1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-07-28T16:06:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-18T13:24:13Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Allow custom background for message dialog","sha":"9f61fb5a78bedd40b96d8b31e174fe1ca9896330"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-17T11:48:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-18T13:24:13Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/overlays: Implement blur, darkening and ability to disable custom background","sha":"d6dc1493cb6c859c1234f16b3af31ae2722661b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1016937?v=4","date":"2018-09-18T15:06:49Z","email":"lassi.m.hamalainen@gmail.com","login":"kukkamario","name":"Lassi Hämäläinen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-18T22:59:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CMake: LLVM, Pulse, Alsa and libevdev being disabled\n\n- These dependencies have #defines which enable code related to them\n  in rpcs3 and rpcs3_ui targets. They are only used in rpcs3_emu but\n  HAVE_* defines have to be defined in rpcs3 and rpcs3_ui targets also,\n  so they have to have PUBLIC visibility so defines carried over\n\nCMake: Fix Alsa and Pulse audios being disabled\n\n- HAVE_PULSE and HAVE_ALSA were not defined in rpcs3 target\n\nFixup libevdev","sha":"566c88802ee1968fbe0a17b14708445a4e2f7e11"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1016937?v=4","date":"2018-09-18T15:23:56Z","email":"lassi.m.hamalainen@gmail.com","login":"kukkamario","name":"Lassi Hämäläinen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-18T22:59:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CMake: Fix Qt resource files not included in build\n\n- Move Qt resource initialization to rpcs3_qt target","sha":"9a457400e73c662f778b2c80c34874bbf02b2cf1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-19T11:07:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-19T11:07:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove explicit in atomic_t constructor\n\nMatch with std::atomic\nC++17 now allows writing std::atomic<int> x = 3;","sha":"11e297c9755301a80300bde36e4952565f48dcea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-19T11:14:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-19T11:14:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Optimize logs\n\nPass va_args instead of constructing a temporary array","sha":"26da91c972cb2813d89ea7a4d4608ef2736808a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-19T11:15:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-19T11:15:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rename lv2_spu_group::num to max_num","sha":"dce14a359abadd05df5f9bb7598f76e0203f6657"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-19T11:15:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-19T11:15:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS: fix /host_root","sha":"59090f6d268c808599d423bf72e34d734040dc57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1016937?v=4","date":"2018-09-19T16:26:11Z","email":"lassi.m.hamalainen@gmail.com","login":"kukkamario","name":"Lassi Hämäläinen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-19T18:17:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CMake: Fix Linux WITHOUT_LLVM build\n\n- _XABORT_RETRY is defined in immintrin.h which wasn't included","sha":"972de4c7303992e8aa85ecf5f3fd4a5593fce135"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-18T14:51:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-19T22:05:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/cellgcm: Implemet initialization registers reset","sha":"a8ea576b22c3bacecaab11465f7bf7fce513692c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-18T15:01:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-19T22:05:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve FIFO mem faults handling\n\nincrease the delay between faults, reduce log spam by allowing the messages to stack up","sha":"e6b68b260a8e43ea677db7460f2392cc5f410ca1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-19T05:32:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-19T22:05:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cellgcm: Fix SET_REFERENCE initial value","sha":"1a6c8191767dfc82c9b48275c4bb79cfc98c2139"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-09-20T18:07:35Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-20T20:15:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix travis timing out while silently cloning git submodules","sha":"dfd303595506d7f659188d3cb5344f93f7d8911d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-09-20T18:12:43Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-20T20:15:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Revert change to using --appimage-extract-and-run, as linuxdeployqt doesn't have it yet, Fixes #5148\nI really didn't want to do this, but no new AppImages suck.","sha":"afa7eacfac03e0f4ddbd8140705092a4c7efa859"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-18T18:06:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-21T13:32:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx; blit engine fixes\n- Forcefully downloads and reuploads data from the CPU in case of unexpected overlaps\n- Properly detect correct size of newly created blit targets\n- Remember to clear any existing views when changing the default component map!","sha":"a21bdb9f45ced84d504f8d40a8ea7dc9bd0a95c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-18T19:50:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-21T13:32:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix flip source selector","sha":"23dc9d54e39c21055928faa04c756ac275bc043e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-18T22:21:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-21T13:32:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Preserve memory order when doing flush\n- Orders flushing to preserve memory at all cost\n- Avoids false positive where flushing overlapping sections can falsely invalidate another with head/tail test","sha":"fc486a1baca4c406c6e5e6501260654792eac454"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-19T10:16:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-21T13:32:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix problems with framebuffer reuse\n- Matching attachments with resource id fails because drivers are reusing\n  handles!\n- Properly sets up stale fbo ref counting and removal\n- Properly sets up resource reference test with subsequent removal to\n  avoid using a broken fbo entry","sha":"2b6e6a9ae9bbd35671bfaf6c2a546f9a28a68d7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-20T14:07:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-21T13:32:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: temporary hack\n- Removes all use of valid_count as a metric until the new refactor is merged","sha":"dafc914bcc2b5cc435ac0fdb5f4ddc5e2fa758f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-09-21T19:23:19Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-22T07:35:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"build/cmake: add hidapi include directory on libusb platforms as well\n\n 3rdparty/hidapi/libusb/hid.c:52:10: fatal error: 'hidapi.h' file not found\n #include \"hidapi.h\"\n          ^~~~~~~~~~","sha":"1133fbb0174cab0405023ba4c31cf2697fcd0f4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-09-21T19:57:18Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-22T07:35:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"build/cmake: build everything with -pthread, not just GLEW\n\nerror: POSIX thread support was disabled in PCH file but is currently enabled","sha":"1c8fc6852af822550a6f1847e8e20eb1ab34d210"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-09-21T20:53:30Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-22T07:35:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"build/cmake: ADDITIONAL_LIBS satisfy dependency by other libraries\n\n/usr/bin/ld: undefined reference to symbol `libiconv_open' (try adding -liconv)","sha":"efb3b08f879b4da40cfa9aca3b35e840627fe260"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-09-21T21:54:16Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-22T07:35:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"build/cmake: properly disable assert() globally for release builds\n\nAssertion failed: (ObjectBufferMap.find(Key) == ObjectBufferMap.end() && \"Second attempt to perform debug registration.\"), function NotifyObjectEmitted, file llvm/lib/ExecutionEngine/GDBRegistrationListener.cpp, line 168.","sha":"0da556e1f8f2015b2c9d39bb2bf0bc5eafe0b95e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-09-19T18:54:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-09-23T00:49:58Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix Emu.Restart()","sha":"b7e010bbd06dd23dbec25158b9e807018b255932"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-24T07:07:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-24T10:25:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove shader address verification\n\nthis came from a misunderstanding of the register's use","sha":"e8474145a5e7149366a8a95018aee612eb72e397"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-24T07:07:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-24T10:25:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix vertex arrays fetch with inlined draws","sha":"e0a676a3fe29c9174ae955a72c942ec8f000e90b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-24T07:07:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-24T10:25:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix vertex count if all the streams are disabled","sha":"06572c6011620081ae864ae20f7e9d01dd17bec1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-09-06T21:20:39Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-24T12:26:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Avoid silent failures in RSX violation handler","sha":"13faf4e8162a957b3d1b12dbf1ed99c8113f38bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-09-06T21:04:26Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-24T12:26:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Update ASSUME, add ASSERT and AUDIT\n\n- ASSUME now uses __builtin_assume in clang\n- ASSERT defined as a wrapper around verify\n- AUDIT aliases ASSERT when _DEBUG or _AUDIT are set, otherwise empty","sha":"a07cbaca8e07c8c47ff37392b82005ad3e43abcd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-09-22T14:45:55Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-24T12:26:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Change Cell->RSX map/unmap notifications\n\nThis allows for further flexibility on the RSX side, allowing us to fix\nsome bugs and crashes in later commits.","sha":"f3029b2b4298c4207a326e98b032cae4bea4b539"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-09-22T15:03:00Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-24T12:26:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Implement address_range utility class","sha":"8b3d1c2c91e1bf2ed4d579996ece6725db8c746d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-09-22T00:14:26Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-24T12:26:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Texture cache cleanup, refactoring and fixes","sha":"35139ebf5d9f606ab19814294e77d9119c744f18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/536093?v=4","date":"2018-07-20T14:22:21Z","email":"jarveson@gmail.com","login":"jarveson","name":"Jake"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-24T13:44:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Move render flip from rsx queue command to flip command","sha":"699eadc84f39709fb1adc77eebb94ad220cb8169"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-22T07:51:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-24T13:44:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Cleanup changes for the flip patch","sha":"a3d44b5e1fbd2fbd6eb539cfb67acb1fba260f39"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-22T13:33:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-24T18:19:38Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Disable predictions if 50% of predictions are wrong\n- This happens often in loading screens where the memory usage pattern is often randomized by loading in of assets","sha":"dab30c005116cedf43b4e02debfaad84f18dacef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-25T17:29:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-25T19:03:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix vertex attrib parsing","sha":"f72157bcec170ed75b72dffeb2e5636d23036ec4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-25T15:23:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-25T21:58:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx-capture: Rewrite FIFO commands allocation","sha":"8e268aedc72536dbcd78468cf1261096832edb5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-26T08:41:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-26T14:55:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx-capture: Map dynamically rsx data injection addresses","sha":"5b0ed1e2eb32a2ca3df45da258365131664bc940"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-26T09:39:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-26T14:55:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx-capture: Save initial method registers state","sha":"f056ef7a80ce0453dffb6490eebe7910c8a0c9e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-25T19:45:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-26T16:41:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup flip behaviour\n- handle_emu_flip is very heavy, only fire","sha":"6a9f234dc72fa75d973b96d934265f848c5644b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-26T14:25:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-26T16:41:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for vertex attrib parsing\n- POS does not have to be fetched from ATTR[0]\n  - Confirmed with UC1 that uses WEIGHT for positions\n  - At least one POS stream has to exist to feed the position attribute which cannot repeat for a single triangle","sha":"bdf85ed90097e98c9ec8abddcbb36492dbf7294d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-21T17:17:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-27T09:16:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_mutex cleanup\n\nRewrite to use unsigned arithmetic, shrink to u32\nEnsure zero default unlocked state (will need it later)\nInline all public methods, rewrite lock_upgrade()\nRemove try_lock_degrade(), lock_degrade() methods\nImplement lock_downgrade() (now trivial)\nRemove is_reading(), added is_free()\nAdded reader_lock::try_upgrade()","sha":"9e5b633779ed404662a0975f12ce924580ac3b59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-21T17:38:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-27T09:16:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement lf_queue<>, lf_value<>\n\nlf_queue<>: unbound FIFO queue with dynamic linked-list\nlf_value<>: concurrently-assignable value readable without locking at the cost of memory (using dynamic linked list)\n\nAdd atomic_t<>::compare_exchange","sha":"a8a8cd88a040b26bd4f49ff7b46542b53601e034"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-22T19:35:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-27T09:16:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add missing deleted operators","sha":"a605dd0a3fad1c80321b6d546b67f41aac874308"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-22T20:14:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-27T09:16:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement utils::memory_reset","sha":"bb524db23655e34226cfeacad2d9dc3aa658a739"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-25T18:10:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-27T09:16:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: remove false alarm errors\n\nWritable sections ARE supported","sha":"b2f29cd4d460d9527153b6a5330b6127b4df1074"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-25T18:12:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-27T09:16:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix consistency in Emu::Stop()\n\nDon't clear force_boot on shortcut Load()","sha":"680aaf21f0447b9cd5ca3c52fecda2aaf103cace"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-27T09:15:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-27T11:04:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix cellVdecClose\n\nThanks Micaelis#6971","sha":"4ef384a1614e6db9cdc00999f7c2e6f4cca3f598"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-25T12:21:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-27T11:04:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"New named_thread template (preview)\n\nOld class named_thread renamed to old_thread\nIt's too hard to move in a single commit","sha":"306f95a9aeb98e8155a8fed0a71f146f65302186"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-27T12:17:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-27T14:47:32Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix pfifo nop cmd","sha":"a47ebad24cce8b52f6c43d553dcc36c488c3687d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-09-27T12:19:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-27T14:47:32Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix pfifo ret opcode","sha":"72ba062b1a06e0d9a910d308cbaf09dff5f9a840"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-27T20:04:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-27T20:37:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make vm::get_super_ptr return contiguous memory\n\nCleanup RSX code complexity","sha":"da6ce80f4fd81b6b3ceac386ca2633c3fc6196a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-01T17:31:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-01T18:10:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rebase LLVM fork","sha":"4a252e750f66640e77c64bc6fedd3137bdcc72cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-09-29T23:47:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-01T23:22:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"utils::typemap implemented\n\nContainer for all types","sha":"8a1b5abee1e9d1d3bb2b90b407f515f031f3a201"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-01T17:03:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-01T23:22:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement shared_mutex::lock_unlock\n\nMinor fix for shared_mutex::try_lock - don't optimize for pessimistic case","sha":"7a024f335576a1d0f9ec9ff742cd618236f7a105"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-01T17:05:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-01T23:22:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor thread fixes\n\nCall thread result destructor","sha":"3359e9a51be94385fcc307cab821874348528187"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-01T17:57:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-01T23:22:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add g_typemap and g_idm alias\n\nFuture idm/fxm replacement","sha":"19a64e0e94cc8c27e4f5d129ec2067f0bbca77fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-01T17:58:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-01T23:22:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Refactor audio/camera/mic threads","sha":"145667831658320263fbb6d5feabeb762d943a1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-01T20:33:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-02T07:28:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Add shader loading screen options to the settings dialog","sha":"c9adb52f635ecae07116c99d5e546ddac2a0e180"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-02T14:49:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-02T20:26:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rename thread_abort (name conflict)","sha":"4bef0f8dabaac6d9155774b7d61ff33c7deb644a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-02T14:50:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-02T20:26:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add cond_variable::wait_unlock","sha":"bc87c5808c070e221ff18d92504fdf7d4afa34ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-02T16:35:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-02T20:26:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rename -> typemap_ptr::unlock()","sha":"f6f72c1cf8f393895860bae3d15dce372cefa4f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-02T20:25:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-02T20:26:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"typemap improvements","sha":"a8a9c11bf805c2039dc5ddbc6ce3af8870af2153"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-02T08:40:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-02T20:26:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Refactor audio_thread (g_idm)","sha":"1b740995a4b6bc33a6896fb9cb1002f14d1c06f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-01T04:57:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-03T17:57:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove texture address hack","sha":"eacd1b8f1365f6bda09abbda80afe1e5477ad93f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-01T04:57:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-03T17:57:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove texture size hack","sha":"658609030781d6bea10572239a77ad5b47de8e5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-01T04:57:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-03T17:57:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove texture mipmap hack","sha":"a92ae827c1cc47b6d45ddc71aca4785b290329db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-01T04:57:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-03T17:57:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx: fix log spam","sha":"4174d7274d6b6119fb1788ff9a4983a21ba9c4f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-01T06:14:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-03T17:57:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix texture depth read","sha":"fa723f6dc4f27343af3daa475bb2f54e0ec70923"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-01T09:11:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-03T17:57:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix default texture dimensions\n\nhaha","sha":"62f97f2e5fed537a7560a1f1b741a67b96acbdd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-01T10:50:43Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-03T17:57:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix texture height read","sha":"348db050ae748e7cb5eeab7227723cbfbf21c6df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-02T18:27:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-03T19:37:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX/Overlays: formatted comments","sha":"9693d1c3a374da956ddea82b8bb05a31fc257939"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-02T18:25:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-03T19:37:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX/Overlays: don't press buttons on every iteration","sha":"76da3fa907dbbde47a727a3b9a9e72853d486d58"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-03T12:18:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-03T21:08:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX/Overlays: Add option for japanese button layout","sha":"49e5212a8fef3caa348996b520b1e56ab9031f78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-10-03T21:49:19Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-03T21:49:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu-interpreter: improve fnmadd/fnmadds instructions (#5183)\n\n* ppu-interpreter: improve fnmadd instruction\r\n\r\n* ppu-interpreter: improve fnmadds instruction","sha":"cc846eb67030fd56a72c0e2ec5709a4b79c7edc3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-10-07T19:40:39Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-07T21:15:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu-interpreter: improve vsl/vsr instructions","sha":"39272eef457f3bc38271834539cae85ace89447e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-05T14:57:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-08T13:39:47Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix restart index check for u16 index arrays\n\nDont ignore upper bits of the restart index with u16 types","sha":"e361e0daa6648802db2f77cb08880208f9fc0756"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-06T11:54:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-08T13:39:47Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix u16 index arrays overflow\n\nForce u32 index array destinations to avoid overflows when adding vertex base index.","sha":"83b6c98563ef161e0a2173ffbca6251182750119"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/12673964?v=4","date":"2018-10-10T01:24:48Z","email":"yeazelalex@protonmail.com","login":"TheTechnician27","name":"Alex Yeazel"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-10T22:18:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"README update\n\nMinor cleanup such as capitalization fixes, wording changes, and punctuation tweaks.","sha":"e52d33855298ba630bd8c4cfb48ef4b9a1c3c116"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/12673964?v=4","date":"2018-10-10T01:25:41Z","email":"yeazelalex@protonmail.com","login":"TheTechnician27","name":"Alex Yeazel"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-10T22:18:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"README update\n\nSpecified \"free and open-source\" instead of just \"open-source\".","sha":"d8424a1f355dd39d0edb356889bcc333815e9d17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-12T16:05:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-12T16:05:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx_capture/gcm: Fix tile binding (#5246)\n\n* gcm: Fix tile offset setting\r\n\r\nhighest bit signifyies location, so ignore that while reading the offset.\r\n\r\n* rsx-capture: Fix tile binding\r\n\r\nfixes division by zero when dividing by pitch when the tile is not bound.\r\n\r\n* rsx-capture: Fix zcull binding","sha":"623f1b35f6f705c45d9015254e9fcf3b03266cb6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-07-23T12:10:45Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-12T18:30:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu-interpreter: improve vminfp instruction","sha":"8540399ecb4723bff15c6be4ba7293c59456409d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2018-10-04T05:08:05Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-13T12:43:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Gitignore: Support CLion IDE","sha":"8cb0f5d2dd21f713f4bfb2052033f93cef4f0646"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2018-10-06T18:11:16Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-13T12:43:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Compatibility status to grid view\n\nIncludes icon drawing, menu option and settings entry.","sha":"90688c49707994cccb4ad2b19a1fdb18250fffaa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2018-10-13T14:34:00Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-13T15:05:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Save compatibility draw state","sha":"48416e81eb44547ba4a0bee8bb716a29fd4999fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-13T10:03:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-14T20:14:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add title to emulator message dialogs","sha":"4ab777b429b3a659be33e8a21b6a446c1cad2780"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-06T14:09:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-19T19:22:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove CALL_FUNC, implement ppu_execute<>()","sha":"73d35b02364b7978c37968c57291362031034106"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-06T14:35:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-19T19:22:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix audio_thread buffer deallocation race","sha":"430e2243ac48ed50fd0e0cf2b4ec95a739151478"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-11T10:57:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-19T19:22:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix thread_base::get_cycles (Linux/POSIX)","sha":"8ca6c9fff0449f0f4655043c7f1e07df92ef4dee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-10T22:17:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-19T19:22:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Migration to named_thread<>\n\nAdd atomic_t<>::try_dec instead of fetch_dec_sat\nAdd atomic_t<>::try_inc\nGDBDebugServer is broken (needs rewrite)\nRemoved old_thread class (former named_thread)\nRemoved storing/rethrowing exceptions from thread\nEmu.Stop doesn't inject an exception anymore\ntask_stack helper class removed\nthread_base simplified (no shared_from_this)\nthread_ctrl::spawn simplified (creates detached thread)\nImplemented overrideable thread detaching logic\nDisabled cellAdec, cellDmux, cellFsAio\nSPUThread renamed to spu_thread\nRawSPUThread removed, spu_thread used instead\nDisabled deriving from ppu_thread\nPartial support for thread renaming\nlv2_timer... simplified, screw it\nidm/fxm: butchered support for on_stop/on_init\nvm: improved allocation structure (added size)","sha":"1b37e775befd98af5b9e14ea73f14b8000c0ce4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-13T20:58:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-19T19:22:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Internal: register WaitOnAddress family functions (WinAPI)","sha":"f588454d261b07dac3c643b3ea24f8b54741765d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-20T13:00:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-20T13:00:53Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve inlined arrays (#5248)\n\n* rsx: Implement register reads in inlined arrays\r\n\r\n* rsx: Check for disabled streams in inlined arrays","sha":"6829fa0286879dcf4db25b48332ab72cf15b10cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2018-10-20T06:05:02Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-20T13:35:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add setting for master volume","sha":"56ea45f9d57be4c4d4fe1f0d08246858abf61a66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-10-19T03:33:07Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-20T16:49:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: set Vulkan surface in gs_frame","sha":"db40cbda58bcea126457f0b6e8b10b2d53d18f4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-20T08:11:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-20T17:19:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add master volume slider to the audio tab","sha":"da5385686cb00584666372bdee25d68d1dbe2f42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-20T09:34:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-20T17:19:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: refactor settings_dialog and add EnhanceSlider","sha":"c9d8cd3613633dbf660a76a2db6cae90604a05bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-20T10:13:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-20T17:19:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: also enable/disable overlay centering checkboxes","sha":"6e08d8e746f7c82c0566765ac0087ac0f71714f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-20T16:45:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-20T17:19:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add tick marks to Master Volume Slider","sha":"aed83e69c96a2afd2bdb939fecbb0a90a5b90adc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-10-14T06:33:20Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-20T18:42:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix command line arguments, add --version and set Qt application name","sha":"966c3fea5b420ba3d947416035cb01d6d65c5440"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-20T18:13:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-20T19:27:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"typo fix","sha":"d14c8a03b305391f1cf6648caf0a3ab5f6e59f5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-01-27T14:13:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-20T20:08:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix evdev device list","sha":"eba2216c4af2c2661f614cb091d99744862316f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-22T19:48:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-23T15:02:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx-capture: unbreak","sha":"5ee351234c2683c9bc4c6d4623622551ae5e9a00"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-23T05:52:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-23T15:02:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fixup for rsx debugging tools segfaults","sha":"dfacdd8a40b0b0db420ae27d8bd394222890e17a"}
+{"author":{"avatar":null,"date":"2018-10-23T15:49:01Z","email":"dluxen@lyft.com","login":null,"name":"Dennis Luxen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-23T15:49:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix a warning that shift overflows data type width (#5116)","sha":"36d4614d1256ce50bbea0fb8c4615a5c728259c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-23T17:26:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-23T20:35:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: rename deleteLLVMCache to removePPUCache","sha":"586c0ea1d0d5a67c8e09f517171d01346dabb051"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-27T00:17:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-27T00:37:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add option to add games to the main menu","sha":"1cf62e9ded17681978f7a7a9c1f31e8f4f47a18b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-10-27T10:06:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-27T10:06:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"RSX/Capture: fix filePath and remove strict mode check (#5283)\n\n- Fixes regression introduced by kd-11 when merging in jarves' flip rework.","sha":"d56c85fe015e51740fc06919d2e6560bb4935aa2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-27T19:02:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-10-28T17:09:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellGcmInit (workaround)","sha":"2058d024ce5c20ccee1a874583ff89e6a2a465c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-27T20:28:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-30T19:33:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx-debugger: ignore invalid cmds\n\nbasically ignore all non method cmds when scrolling to the next command, not only branches.","sha":"40694705857dc56c01f9a57592558c701c7bdca4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-27T20:37:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-30T19:33:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx-debugger: fix ret and nop cmd display","sha":"5270dc1c9e5ab2c3d86c5a6fb3df09add16904d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-27T20:43:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-30T19:33:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx enums: fix typos","sha":"fb30c8a93789226480cd6b6c08510335b8627b07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-27T20:50:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-30T19:33:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx-debugger: auto jump into get address on startup","sha":"68a8efdc3362d5cb3d37231bfba47bc5a7c39f51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-27T20:54:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-30T19:33:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx-debugger: add forgotten super ptrs","sha":"7056b5fc700485a69c6cc52c2ce520d7791c8821"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-20T06:30:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-01T23:16:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu: Fix stack base","sha":"3a7f5b970f1c3771141b9908e9e9a31d75ad0974"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-10-10T04:59:33Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-02T00:21:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix issue with memory validation","sha":"fa134337d9c471d187ca69abf97b44456b38ee1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/41875832?v=4","date":"2018-11-02T00:51:42Z","email":"41875832+HexyFify@users.noreply.github.com","login":"HexyFify","name":"HexyFify"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-11-02T00:51:42Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Update firmware latest version to 4.83","sha":"98f2967aace29eb0fd90ae5aec40ddaa2946852b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-17T18:57:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-02T16:47:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGame: Add missing nullptr checks\n\nif the param is null pointer, the library simply skips writing into it. also fix the order of writes.","sha":"43b75ccf047d98df2ed7c21c610c02b10bb064ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-10-26T04:14:02Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-11-02T18:16:08Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"msg":"Add libnsl.so.1 to the AppImage, print resulting upload url","sha":"2487a036484b5cb1d0fe77dfe698db0f6201a8aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-03T15:10:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-04T19:57:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix inlined vertex array validation","sha":"75221a6078226327ea90370ca179e8cd7b06ed1c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-01T10:21:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-05T10:14:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement \"Initialize Directories\" options\n\nIf disabled, /dev_hdd0, /dev_hdd1, etc, are not created automatically.","sha":"06253c8489508434181c9c64fb16367debcdee9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-01T10:23:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-05T10:14:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement cond_one sync primitive\n\nChange futex() args to use unsigned int","sha":"6104685ad6f2d918bdbfa0795bd041c8d081726c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-01T13:22:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-05T10:14:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData: anti-corruption precautions\n\nTry to commit changes atomically","sha":"eaa17b7f7c5ec3611417eceff2611a8e72dc0560"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-05T10:13:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-05T10:14:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Disable npc update for SPU thread groups","sha":"f06e6be2c16c2ae43b3863dc53a13bc043f52310"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-05T11:24:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-05T11:35:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix SPU STOP instruction\n\nCheck thread state after STOP instruction","sha":"488928eca21634f0908316a328e23319c2091e14"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-11-05T14:25:38Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-11-05T14:25:38Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Bluetooth returns select as KEY_BACK for XBOX ONE controller. (#5303)","sha":"9831bc6bc91f3af87cda757c0375af15b7f9d4fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-11-05T14:25:54Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2018-11-05T14:25:54Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge branch 'master' into fix-fedora","sha":"5f67c6050d1d680b30b60adc58488dc64d23679b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-11-05T15:20:58Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2018-11-05T15:20:58Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #5300 from hcorion/fix-fedora\n\nAdd libnsl.so.1 to the AppImage, print resulting upload url","sha":"11681f02cc29139a13fb6ff985714c22cc50e497"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-11-06T22:37:26Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-11-06T23:04:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"gui: Fix OpenCorrectionDialog message\n\nIt was incorrectly trying to get the previous setting value after updating the setting","sha":"2abbedcc5083b3d430d06e66732309d5824ac91b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-14T18:54:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-07T10:06:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix error code checking of sys_lwcond_signal_x","sha":"777f36e60449aa331d2749c4e918074010bfc697"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-17T05:16:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-07T10:06:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"lv2: Fix lwmutex locking","sha":"3faaf9e7fb92560b9c0b38f0eeeba4514cf5c0c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-17T08:55:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-07T10:06:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"lv2: Fix lwcond_queue_wait lock acquiring","sha":"3fd17e43a3dd3948ab93e00cd2d06070516e2e30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-18T20:02:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-07T10:06:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu: Fix threads scheduler\n\n*Set priority under a lock\n*Fix yield command making threads going out of scheduler control by removing it from the queue (not a bug that affects compatibility)","sha":"3332a100521d7447b715af1e44549e1411327a7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-05T19:34:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-07T12:46:51Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix cellPadGetData\n\n* Remove complete buffer clear\n* If pressure sensitivity option is not specified, write zeroes (should this be handled from our actual controller handler?)\n* Check sensor setting before reporting changes","sha":"90f816595a0bbf2e4c46e0b71e3cae0e0aabf40c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-09T12:19:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-09T13:19:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"qt: Add supporters","sha":"c17a98030a0d14e2d1f3c504390ceb0c1754165f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-09T12:25:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-09T13:19:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: check state in every callable chunk\n\nIt's often redundant but may be necessary","sha":"2fd384ae953cdf112d4bb4d3dcd39bd9abb8ebb8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-09T12:44:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-09T13:19:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_mutex: increase max_readers to 16383\n\nStandard requires at least 10000 for SharedMutex concept","sha":"6a30d5a6c139c3f69deaa8a622d0df5ed2b1f712"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-09T13:03:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-09T13:19:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"typemap: make use of volatile qualifier\n\nUse shared lock for volatile pointers\nUse no lock for const volatile pointers","sha":"7180c1f2d064761a6a37d973a9c26647f73b28cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-11-09T21:12:35Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-10T09:41:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Extra check when opening pup file","sha":"986bb243265af17256306e1931930ba6c919b716"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-11T18:56:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-11T20:17:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: inlined array stride fix","sha":"37b6afaf2cb7686d4ea8506b5f3234f2b7f359ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-11T09:54:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-12T10:28:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix typo in sys_fs_mkdir\n\ncreate_path is a less resticted version of create_dir, it doesnt check for EEXIST for one.","sha":"57b7892de6be380f4acd4baf8c9bc35f4a7b7f1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-11-10T21:23:17Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-12T12:09:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Increases stack allocation for callbacks.","sha":"fada8b6594cc3c4a8699e46ea30a1a66bef0c693"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-12T08:55:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-12T18:12:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement sys_spu_thread_tryreceive_event","sha":"2e1aec4de883a50cb58821b77bd870949f52371c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-11-05T11:38:35Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-13T07:19:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Ensures threads are stopped in join","sha":"0e0a82e5363cabdfd417d907847232ececb4fdd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-13T15:40:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-14T09:50:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Cleanup after #5310 (SPU thread groups)\n\nMove lambda into a cpu_stop()\nUse running thread counter to synchronize with sys_spu_thread_group_join()\nUse SPU_STATUS_STOPPED_BY_STOP exclusively for sys_spu_thread_exit() as before\nRemove unnecessary waiting in sys_spu_thread_group_exit()\nRollback some minor unnecessary changes\nUse shared_mutex in SPU TG","sha":"0044eb44e2f86c9511baea5337a756230808376e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-11-14T23:42:42Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-15T17:06:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellVdecGetPicture accurate error checking","sha":"f4fb5200a00fc20961810ca76c74ca8ceb3b0343"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26828095?v=4","date":"2018-11-13T23:47:58Z","email":"devil0129@gmail.com","login":"isJuhn","name":"isJuhn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-11-16T18:37:07Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Add null alloc_addr checks to sys_memory_allocate and sys_memory_allocate_from_container","sha":"225310e04bf54efb92dbe424b2dd222248fb07bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-16T11:31:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-17T11:40:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs: disable ctime (return mtime instead)","sha":"c719ae360d788b3ecc55a4e42b35dafed26a0336"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-16T11:34:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-17T11:40:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs: normalize atime (ensure atime >= mtime)","sha":"1fdd013e4b1df831d399829da12477d40ea64e6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-16T11:35:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-17T11:40:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData: restore atime/mtime for unmodified files","sha":"12ceceff19d0aaf7fc6dd8f970d93d7c687b787e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-17T11:39:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-17T11:40:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData: fix truncation size (regression)","sha":"65ca934452726ab8a667fe6a9c903489ddb67da9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4348897?v=4","date":"2018-11-10T14:43:38Z","email":"vit9696@users.noreply.github.com","login":"vit9696","name":"vit9696"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-19T11:39:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix macOS compilation","sha":"634a5fa31cf4dfe7583e73c0a140e0b75ccd34f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-09T08:11:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-19T16:05:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix libcamera regression","sha":"3c7f02d99d0deb22fbc05135c3fc1acf5240fb62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-21T18:13:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-22T07:21:13Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"qt/gs_frame: Hotfix\n- Dynamically check the loaded QT library version in case of mismatch\n- Fixes using 5.11.1 builds with non-buggy libraries and vice versa","sha":"f505ac7b638c36354e40d35dfb9a31edadc44af6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2018-10-31T18:38:48Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-11-23T19:29:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Load trophies in another thread","sha":"bf0e6ca17447a67f73b48542d6ea0419a6f8d10f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-11-07T21:05:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-11-23T19:29:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Support trophy manager moc'ing in vcxproj","sha":"0526bfd7de9ffce6fd6664310ff22e768b0d8698"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-23T16:38:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-23T23:54:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellFsOpen flag fix","sha":"4baa1595239dee1656cd05113240bc78640f8609"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-23T23:46:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-23T23:55:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix 16 bit audio mode\n\nPointed by @ruipin, some backends may be affected\nReuse float buffer for conversion result","sha":"7f1cbb1136c2e1c716f9af699c433ffcc7ce3d8c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-25T16:43:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-25T21:23:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement class cond_x16\n\nUse as reservation notifier\nLimited to 16 threads but allows more precise control of contention","sha":"febe4d4a10fdd672fd61c2f2fb5c872d94ac9bba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-27T17:00:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-27T20:37:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU TG: add thread group stop counter\n\nFix possible race condition introduced by waiting on `running` value","sha":"f442a8a84ca798f20f924279593106454c54cbb8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-26T15:55:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-11-28T22:30:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite condition variables\n\nImplement helper functions balanced_wait_until and balanced_awaken\nThey include new path for Windows 8.1+ (WaitOnAddress)\n\nshared_mutex, cond_variable, cond_one, cond_x16 modified to use it\nAdded helper function utils::popcnt16\nReplace most semaphore<> with shared_mutex","sha":"96cabeadff0c5a2052137a94f81c88912bcd5d44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-09-24T13:03:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactor FIFO\n- Removes fifo structures from common RSXThread\n- Sets up a dedicated FIFO controller\n- Allows for configurable queue optimizations","sha":"e01d2f08c9b46a13f28ba0cd7a9f6a265be7f936"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-01T20:05:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixups\n\n- Also fix visual corruption when using disjoint indexed draws\n\n- Refactor draw call emit again (vk)\n\n- Improve execution barrier resolve\n  - Allow vertex/index rebase inside begin/end pair\n  - Add ALPHA_TEST to list of excluded methods [TODO: defer raster state]\n\n- gl bringup\n\n- Simplify\n  - using the simple_array gets back a few more fps :)","sha":"677b16f5c68fbb2332bfa9f0ec2e746ebf49022e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-20T09:30:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Optimizations\n- Replace a few more vectors with simple_array<T>\n- Avoid unnecessary string comparisons in backends. We already know referenced textures from the program analysers!","sha":"b0a6b72ce846d38e59550945df2cd7ab3bc3fd3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-20T14:43:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Restructure programs\n\n- Also re-enable pipeline optimizations","sha":"1ad76ad33180c1e33b40ed616f1c3d464994362e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-28T12:20:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Critical pipeline fixes\n- Fix scissor and viewport binding behavior\n- Fixes recovery if empty scissor is specified and then 'fixed' later\n- Optimizes state binding a bit","sha":"54ec363e88198fe0b866876d9dfaf964f3d03542"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-28T12:21:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix some checks when using inlined array rendering","sha":"2d88e41583007fb490b99cbf2bb428b49789baf2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-28T13:23:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix fifo draw barriers","sha":"435afcb8654ac693f1fab69e9ce74b5134b40fae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-28T15:58:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Separate vertex env from program env","sha":"d6b4440ef9446f091bfee60f08edfa5af2ca3196"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-29T10:16:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Spec compliance.\n- TODO: Implement push_constants path instead of copy + bind descriptor sets","sha":"26a56ef1f17c2aed01c008db05e9b8ebd0cfca82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-29T11:02:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"fixup: It is possible for NOP commands to contain other garbage","sha":"9deecd506a6d15810d886d5eef28f5c290bc582f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-31T09:24:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Scrap the prebuffered queue approach\n\n- Basically starting over\n- The cost of making command copies into the queue has a measurable impact","sha":"2e32777375cd30742071a45f8f1f5c867e150d75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-10-31T21:25:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixups\n- Improve vertex attribute layout format. Allows for full 16-bit attribute divisor\n- Use actual pitch when declaring framebuffer rsx pitch instead of register value in case of swizzle? rendering","sha":"846daadd5dc70e069716c48997a88f9152a4552e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-01T10:28:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup; input attributes blob decoding\n- Use an unstructured blob and index into the vec4 structures to extract the real data","sha":"7b065d778186b582db57cc1dee44b579f8cb5578"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-07T09:34:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Enable dynamic FIFO preprocessing\n- Tries to detect when FIFO preprocessing is beneficial and only enables optimizations if the benefit outweighs the cost\n- Current threshold is at least 500 draw calls saved at over 2000 draw calls to justify the overhead\n- TODO: More tuning for other CPUs","sha":"5193c99973007ed57ae60c256d76205a6da6a2ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-09T14:57:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"[WIP] rsx: Rebase cleanup","sha":"833c25894f3a5d4e814d321926a6cadc96d9697f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-11T09:27:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"fixup: Clear disabled attrib entries","sha":"718a04c84fc094e0279a9d4160bb2c9daf0fe414"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-12T13:15:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Re-enable fifo error reset","sha":"1d19f71a46684d8e74c7b07ab9488dbad393ae53"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-13T10:12:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix insertion of execution barriers\n- Ignore barriers inserted after BEGIN but before any draw commands are emitted\n- Properly process tail barriers inserted before END but after draw commands are submitted\n- Ignore execution barriers with no effect (same register value written)","sha":"8a186bb97edff9bda39d64d968eb0a842ae16b77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-21T11:38:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Pipeline barriers fixed up\n- Ensure barriers are invoked even if no draw occurs!\n-- Ensures that deferred commands are executed eventually","sha":"5b6e1420f3425064c62cb35342564b8b904fc133"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-21T11:46:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup - undo vertex cache 'improvements'","sha":"f1c3b46d606ffc35e42d9d23eb74fc557cae7f92"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-29T10:20:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Do not rely on driver statistics for s3TC textures; they are inconsistent.","sha":"b96ed5cd4e19cb8c293119d8adffdafb55f2a6f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T09:29:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix flip regression\n- Restore graphics state after flip (including active fbo) because flip can be made through a syscall","sha":"2168159d03eb6e7fe2b9ac3e5d631e78e19c92a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T11:39:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-30T20:51:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Flip workarounds for applications that flip via syscall\n- Do not assume flip marks end-of-frame if executed via syscall\n- Also disables skip_frame for these applications as there is no frame boundary\n- NOTE: QUEUE_HEAD cannot be relied on as it is seemingly possible to flip the same head and not need to queue it","sha":"ec768afbd969b63f22ca6f4923899a94741347ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/550290?v=4","date":"2018-11-30T20:03:26Z","email":"janisozaur@users.noreply.github.com","login":"janisozaur","name":"Michał Janiszewski"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-01T11:17:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve path to discord-rpc with non-MSVC\n\nThe path is set in https://github.com/RPCS3/rpcs3/blob/96cabeadff0c5a2052137a94f81c88912bcd5d44/3rdparty/CMakeLists.txt#L159","sha":"62c9920f2ee408295b81502cc6f5f8d220263ac4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2018-12-01T12:16:32Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-01T15:56:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Category filter for PS1/PS2/PSP games","sha":"8afc035aac15832c3d2a0b84b48493f6c1dae213"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-12-01T15:55:05Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-01T19:20:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fixes maximize window to properly update the render surface in Vulkan","sha":"25414953e0426ad58e5231ee7a31d24eecfd4708"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/550290?v=4","date":"2018-12-02T20:33:52Z","email":"janisozaur+signed@gmail.com","login":"janisozaur","name":"Michał Janiszewski"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-02T20:59:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update hidapi to address mingw compilation issues\n\nIncludes https://github.com/RPCS3/hidapi/pull/5 to fix\nhttps://github.com/RPCS3/rpcs3/issues/5375","sha":"1001831c8e7bca475523fc3ac682a4f473870888"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-12-02T23:00:24Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-03T11:16:47Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fullscreen fix","sha":"7f3eaed435b92e0543240b5ee3e72fdbc3570ad5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-12-02T18:40:42Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-03T12:26:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sceNp: add SCE_NP_ERROR_ID_NOT_FOUND for sceNpBasic*Entry* functions","sha":"24a8d0aeefa3f7c7714db179637b4d6c12786013"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-02T12:41:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-03T17:01:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for the flattener\n- Reset the flattener before use\n- Better detection of FIFO misalignment","sha":"9d0042f509ac128554dfcef080b0b0b571c816ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-02T12:59:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-03T17:01:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix null renderer","sha":"f4c28eceef1afbc4c939e4e6c9db7b7aa8dc5a3f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-02T13:22:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-03T17:01:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor cleanup to silence stupid compiler warnings","sha":"504ab5a6d4d106dfa3425906f13e331afd84dfac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-02T13:27:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-03T17:01:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Silence log spam","sha":"a56ba737b56e809e9f42b097c99dbee82004bd3d"}
+{"author":{"avatar":null,"date":"2018-12-01T19:04:46Z","email":"gr1714@ic.ac.uk","login":null,"name":"U-GUILLAUME-LAPTO\\rameg"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-03T19:20:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Added ignore = dirty to all submodules to make git operations faster","sha":"6f086fd5afd3238d0dbe35c359270d981af23978"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-03T20:22:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-03T21:37:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix play icon default tooltip","sha":"87be1abb9ac4d84fa1838bde0cdc77f16d40c985"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-03T20:22:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-03T21:37:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VS: filter for trophy_manager_dialog.h","sha":"afdf0b74a04967684dee9a4e624da7d1bac16312"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6665256?v=4","date":"2018-12-03T22:46:01Z","email":"NicknineTheEagle@users.noreply.github.com","login":"NicknineTheEagle","name":"NicknineTheEagle"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-03T22:46:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Properly get PARAM.SFO and icons for C00 games (#5370)\n\n* Added a helper function for fetching game's PARAM.SFO path\r\n\r\nThis should properly get SFO path for unlocked C00 games\r\n\r\n* Normalized line endings\r\n\r\n* Refresh game list after installing a RAP file","sha":"32059bfaa2aeab9dece0a32d196cddb6622e2994"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-01T05:06:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-04T10:01:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx-capture: reduce capture size\n\n* Dont bother capturing 'destination' blocks with no data. instead premap all main memory to ensure allocated\n* Capture zcull and tile state as their compressed gcm forms\n* Fix index array capturing, ignore empty sets\n* hle gcm: Fix byteswaping in cellGcmSetZcull","sha":"b48a4b64595efe0fd2acccb553808a39adfbdd42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-01T05:06:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-04T10:01:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"remove unreachable code","sha":"4ddafc481ebba63aaef421e741a91d0a213eab49"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-01T05:06:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-04T10:01:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx image_in: remove clip h and w hack\n\nIf clip region is empty, dont execute","sha":"0a1da14a1563266ba1159cafaa63cf27a8604115"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-01T05:06:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-04T10:01:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx image_in: Fix src size calculation when in_pitch != line_lengh","sha":"d1d3ac984eb349db64598534a358dfb4a1e7efd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-01T05:06:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-04T10:01:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx image_in: Fix in_pitch 0\n\nThe hw doesnt fix pitch, when specifying src pitch 0 it copies the same pixels line to dst. keep in mind out_pitch = 0 is not allowed in image_in.\nSame goes for buffer_notify, though it allows out_pitch to be 0.","sha":"28e4a9e0d0a50a2fadb1bfa2ac9ce3478b34365a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-01T05:06:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-04T10:01:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: default lv2 semaphore context + dma_4097\n\nextracted from vsh","sha":"6ecf2fb3d04b5903cc8c2f288eacb4d65ee82015"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-01T18:44:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-04T10:01:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"throw exceptions in case of invalid/unknown operations in image_in","sha":"ce500c75c44378e2782865a4c682634b9244b222"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-01T20:48:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-04T10:01:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx image_in: Implement negative scaling","sha":"fa5652fceb1e0ca2549ca7a21f0b1051ded8be59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-03T19:06:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-04T10:01:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix segfault when scaled image dimension is less than clip's","sha":"45942c4962c79f6bac0478c4f2d68851734c5d4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-04T18:09:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-04T18:09:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU MFC: avoid copying of the lockline onto the stack in putllc/putlluc (#5392)","sha":"90265edfcdaf653e81519bc2cc1a05604287b4d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-02T17:36:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-04T20:41:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Detach VBlank and RSX Decompiler threads\n\nShould fix exception handling in RSX Thread","sha":"476090a747bb660acacdfd229813f0df9b7999ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-04T21:06:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-04T21:06:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix #5370 regression","sha":"92be67b4028a3eb91196bdc0837546180a765980"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-12-04T16:03:47Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-08T15:44:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Extra Handling of result value of funcStat CB.","sha":"5207b009736e0d471ea42ea2235c039fa3951984"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-23T10:49:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-09T22:34:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu: Set link unconditionally","sha":"fb8302817fd632df75801e6f631b081c288688c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-09T22:38:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-09T22:43:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CMake: use CMAKE_SOURCE_DIR instead of .. in some places","sha":"d98420fbc333cb9232bf059e36d1ac32ead1f05d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-09T22:40:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-09T22:43:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData: fix 'Already exists' error","sha":"d6afba96f1bce9942a72334214d3715025c2a3aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-11-03T20:56:57Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-10T11:24:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_fs_fcntl with parameter 0xC0000002 should extract device path from the given path and use that to gather free space information","sha":"077e710e3a29758bb832ad50b253ef474068651f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-09T15:33:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-10T17:50:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix silly edit bug that no one ever noticed","sha":"ead03caedcd1aa190f34149046d84a8b6f9ed252"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-09T17:36:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-10T17:50:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: implement custom titles","sha":"1ca02c7d17c51b5863c6d33a451adea2708e3253"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-10-18T22:22:00Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-11T19:37:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Texture cache section management fixups\n\nFixes VRAM leaks and incorrect destruction of resources, which could\nlead to drivers crashes.\n\nAdditionally, lock_memory_region is now able to flush superseded\nsections. However, due to the potential performance impact of this\nfor little gain, a new debug setting (\"Strict Flushing\") has been\nadded to config.yaml","sha":"af360b78f248ee1ce1892b3af6c99a09123607b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-10-28T13:59:39Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-11T19:37:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Implement dedicated texture cache predictor","sha":"9d1cdccb1a98ff9859d8128c579fed7c2afbf821"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-11-01T01:31:12Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-11T19:37:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Misc. Texture Cache fixes","sha":"bcdf91edbb794bfb2e1344ee6f8e05c409270dee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-09T16:49:41Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-11T19:37:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix xcode build","sha":"5ab7296665924b04195cce414f2c695a7682260e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-09T23:22:02Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-11T19:37:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Reimplement overlapping fbo \"hack\"\n\nTo avoid the need (and performance hit) of Read Color/Depth Buffers, we\nmay not invalidate overlapping fbos inside lock_memory_region unless\nthey are guaranteed to be superseded by the new one.\n\nThis avoids e.g. issues with overblooming, among others.","sha":"18b9ee454139c619249c1ec37abc0e9313682c84"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-09T23:38:00Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-11T19:37:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Add log warning on slow flush path","sha":"54bfe2e102f1ee1ee644c095c543d96014f8a28d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2018-12-10T00:10:09Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-11T19:37:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Add strict texture flushing to debug options","sha":"76f94940cd44e99ef2f8daa4674ae05ac619e712"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-15T08:54:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-15T12:13:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"XInput: fix usage of one controller for 2 players","sha":"2e7e2bb07e31df2af6e46646d82610ed64f8dcca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-13T05:24:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-15T12:51:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Do not rely on cellPadInit in native ui","sha":"8cbaa8627c63b115a90c02810a5486fba57d5f34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-05T08:54:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-15T16:40:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"log rsx get ctrl","sha":"415b995a54c6ac40eca23ac16ba7e922de1562e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-06T12:09:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-15T16:40:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"hle gcm: Fix cellGcmGetNotifyDataAddress","sha":"fd894d4c698408baf367a347f5e3ce7823930d51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-06T12:18:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-15T16:40:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement cellGcmSetNotify","sha":"835a552d8d6c1087bb28adfc222a90a969305626"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-07T04:53:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-15T16:40:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx fifo: Stability improvements\n\n* Restore stack in fifo error handling\n\n* Update get register after the cmd execution\n\n* Fix put pause in the middle of command\n\n* Add restore points when branching to self\n\n* Precise nopcmd detection\n\n* Test all invalid cmds for early treatment of queue corruption","sha":"87988e9da81959d83ea892b70151e21d31700663"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-09T12:55:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-15T16:40:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix rsx capture replay\n\nAllow to capture non-increment cmd flag that was missing in command.reg","sha":"45ed58cdaf4b87cf70f77395106dcf5f0bc4e84c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-09T12:50:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-15T16:40:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"reduce register_pair container","sha":"c2aa10cccda5c118a9973aea85b3c50f5745505c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-14T13:37:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-15T16:40:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx fifo: Fix call cmd offset mask\n\nhighest 3 bits are masked according to tests, also filter certainly invalid jumps with offset higher than max","sha":"098d634328f3b9702cbe6a7e67c6a97970454cfd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-14T14:55:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-15T16:40:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cleanup rsx fifo debugger command display","sha":"c50d459b1e84f01d1c9f68f4a1a5ed9cf72e7f10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4348897?v=4","date":"2018-11-24T00:27:33Z","email":"vit9696@users.noreply.github.com","login":"vit9696","name":"vit9696"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-16T15:17:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Support macOS bundling for binary distribution","sha":"5a40c1802b694251481d66b00608fb1a16d77288"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-17T18:13:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-17T18:41:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: Enable In-Game Pad Config Reset","sha":"bc3ab7a9d9f60cf9b0e703b21d593bf830caebaa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5176531?v=4","date":"2018-12-18T03:51:49Z","email":"sebastian.leifeld@web.de","login":"hrkrx","name":"Hrkrx"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-18T09:39:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"added libevdev-dev as requirement for Debian & Ubuntu","sha":"ae85c40a0aa10813780ddd3b1d6fd6f58773f30d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-18T22:59:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-20T07:02:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellCamera: fix read_mode","sha":"6b1d80ec25a57f64801f7685adbbb9e71f7b6d51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-19T20:26:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-20T07:52:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Added CAMERA_NOT_INIT checks for no camera setting","sha":"69fc1f26137e4c208df8dfb10f57a2c8da72b0c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2018-12-20T00:52:18Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-20T09:40:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Rewrite readme","sha":"d643dcb43b7e4a7dff4a57b9de2022817878caea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-12-20T05:55:05Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-20T10:29:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add CMake switch for disabling Discord Rich Presence and fix no llvm build","sha":"b5cbe02f4d749bff8b3102229bf234ea4d9feda4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-12-04T23:35:25Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-12-21T21:02:27Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"msg":"Remove distro whitelist and use the new automated stdc++ checker","sha":"c775e5fb97bb171305a9c50077963ee89266ce6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6324523?v=4","date":"2018-12-22T12:53:38Z","email":"sov.info@mail.ru","login":"isshininu","name":"isshininu"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-22T12:53:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNpTrophy: use SCE_NP_TROPHY_STATUS_INSTALLED instead of SCE_NP_TROPHY_STATUS_NOT_INSTALLED\n\n* Update sceNpTrophy.cpp\r\n\r\n* Revert \"Update sceNpTrophy.cpp\"\r\n\r\n* Update sceNpTrophy.cpp\r\n\r\n* Update sceNpTrophy.cpp","sha":"9717e19be2ab5aab2c133544857cb55b94089434"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-07-20T05:48:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-22T22:10:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/windows: use Qt's high dpi scaling","sha":"79003cd089a8c0028a036d59e3ddef93b6d0ce8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-17T22:00:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-22T22:10:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX/Qt: set min gs_frame size to 160x90 to prevent stupid new Vulkan bug","sha":"e80574cbd2178a7db167703ee1ef1150d3241f1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-20T12:00:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-23T03:13:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: disable mapping for unconnected pads","sha":"f617e4715245b4a6f9394d90b80ed7b84313e24a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-20T11:52:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-23T03:13:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: improve DS4 device list\n\nNeeded to move Reset out to main_window due to hid closing problems. It's better to have the reset logic outside anyway","sha":"91d834ce73c9a0edbf6a2606e355d01586c65d5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-22T11:49:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-23T03:13:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: use 1-n in the GUI instead of 1-(n-1)\n\nI didn't look into evdev","sha":"6e323622a58383825f1d3876fdc27a1430cb76cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-22T16:32:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-23T03:13:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: enable DS4 controller reconnect without refresh","sha":"bdb5606317c2c444a635c35c3c0d6f3d04d00565"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-22T16:48:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-23T03:13:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: add disconnected label to the devicenames","sha":"6dcf66b06408bda54da9d5e9c20e1e48dff22999"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-22T17:23:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-23T03:13:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: immediately abort remapping if the controller was disconnected\n\nadded some fixups","sha":"e80f2793eb0aae872405a1f64fdf05d5aa751fd6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-23T00:35:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-23T03:13:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: disable in-game controls while the pad settings are opened","sha":"b99a88afe2645e15c46da77b06e42db7804b154f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2018-12-23T21:18:47Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-23T21:18:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Clear disk cache if it grows too large (dev_hdd1/cache) (#5411)\n\n* Clear disk cache automatically\r\n\r\n* Add disk cache to UI","sha":"eba364c64c29e71934232234139bee117c2b91b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-12-23T21:49:57Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2018-12-23T21:49:57Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge branch 'master' into stdc++-auto-checker","sha":"fc25df84f8ebc1d3d53665d518904946d204448f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-12-23T23:47:09Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2018-12-23T23:47:09Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #5445 from hcorion/stdc++-auto-checker\n\nRemove distro whitelist and use the new automated stdc++ checker","sha":"25b8a42519ffd45e45f190a2886b62ffe5c83597"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-20T13:05:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-24T06:05:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: fix flip logic when grabbing output from the surface cache","sha":"c75749f8ce22e6fc62294947e0f68814a7ed0e36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-20T19:41:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-24T06:05:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reimplement conditional execution in shaders\n- Per-channel conditional execution introduces RAW hazards all over the place\n- Its cheaper to process both branches and select between the two\n- Also improves ShaderVariable functionality to allow functionality such as match_size and taking complex variables as inputs","sha":"696b91cb9bdcd2d5a012839bd1ccf23c3c639d3b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-24T12:54:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-24T06:05:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement stencil mirror views\n- Implements a mirror view of D24S8 data that accesses the stencil components.\n  Finishes the implementation of TEX2D_DEPTH_RGBA as the stencil component was previously missing from the reconstructed data\n- Add a few missing destructors\n  Image classes are inherited a lot and I forgot to make the dtors virtual","sha":"4b79ef1ad992be9a4fa6e0ab3fd9ad5b1baefa25"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-24T21:31:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-24T06:05:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixups for immediate rendering mode\n- Immediate mode is isolated from the rest of the vertex configuration\n- TODO: Verify register behaviour when immediate mode is used\n  Check if per-primitive const register values are supported (likely are)","sha":"f48abde14b8555afa10c08d979d41da095c4af40"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-25T17:35:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-24T06:05:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/capture: Force flip if no flip event was recorded","sha":"10d96a60f1a2e34ebd17bb97c579a88206cdaf44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-11-25T18:42:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-24T06:05:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vp: Fix double dst commands\n- Test the vec_result mask before assigning to actual output\n  Sometimes, VEC op is used to write to Rx, and SCA op is used to write to o[x]!","sha":"7555be232f3e43fc18f1380fe9bd316b6a1a9008"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-23T17:22:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-24T06:05:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Check av configuration when selecting display buffers!\n- Some applications have mismatch between video output configuration and display buffer sizes","sha":"9c46386dd45e18b6599b358814f99f22c61c11f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-10T11:40:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-24T13:04:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix cellFsGetFreeSize (following #5304)\n\nSimplify device name extraction","sha":"522f5ea64553cc7007f9b62ebe72028e5fe98c76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-18T16:43:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-24T13:04:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData: try to address #5415","sha":"f750b4c420e1e09f806e333ca3ae241ed6fa00e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-16T23:05:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-24T13:04:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: approximate xfloat option\n\nAdapt previous SPU ASMJIT changes made by @kd-11\nFM, FMA, FNMS, FMS are approximated.\nFCGT, FCMGT are accurate.","sha":"d7be0a96f3423a5af1775205185e7838cd7b9e90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2018-12-23T18:01:09Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-12-24T19:33:08Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Detect hyperthreading on Windows","sha":"1dd3a4b3f038225ed05953304dc27255e88aa060"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2018-12-24T05:31:57Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-12-24T19:33:08Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Disable thread assignment for Intel","sha":"dbd48145840d7ff0ef6be5b2c41368ba09d0b5d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-12-25T14:13:11Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-25T14:13:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sceNp: improve sceNpManagerGetNetworkTime function (#5451)","sha":"7c74bafaf3f6709223a66b73306c7cb7bf4a16c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-15T03:56:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-25T16:59:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Set group status INIT on last thread stopped\n\nthis fixes the group status after sys_spu_thread_exit when not joining the spu group","sha":"653a4ef0df475d387ed16db02b95a106e5b94410"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-26T14:28:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-26T20:03:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_semaphore_post count check","sha":"4b65c3943c3fffcee3ec2b82012832a23e1be6c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-12-22T23:16:03Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-27T18:11:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Trophy changes","sha":"aa306dd35609cdfbda234f45d22b6c0189b7650d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-28T10:59:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-28T16:10:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix game grid font for unfocused tiles","sha":"cfe07098674b46b10cfdb527dce9c405f54c7621"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-12-28T17:20:23Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-29T15:07:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fs: implement copy_file() fallback\n\nsendfile(2) on DragonFly and FreeBSD can only write into sockets.","sha":"33f7a39f5d81126dfb5f1308c39285dcdd4967da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2018-12-28T17:30:30Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-29T15:07:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"overlays: don't use /proc on BSDs as it may not be mounted","sha":"8d308bb4c0237f6ee3a5400e785a9c43c8211861"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/46253604?v=4","date":"2018-12-30T02:42:56Z","email":"46253604+fobb2@users.noreply.github.com","login":"fobb2","name":"fobb2"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-30T04:08:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"capitalize 'japanese' -> 'Japanese'","sha":"64ea7bf867d7d63afc1c25ae1abfc05deb57bb15"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-30T12:20:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-30T13:15:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Sort game list after load settings to prevent icon size mismatch\n\nThis was sorely needed when the app crashed after resizing icons","sha":"a1dd6e080ca9e8961c3ad8aa77df22acb5d400a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-28T16:02:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-30T14:04:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix rsx capture (again)","sha":"568206d11a2e357112a23da39a05daf340bd709b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-29T11:15:43Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-30T14:04:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"hle gcm: Fix cellGcmGetReportDataAddressLocation\n\n* Never return NULL (also apllies to similar functions)\n* Base offset is 0x0e000000 for main location\n* Default location is LOCAL\n\nInfo was taken from disasm of gcm","sha":"26d47afec64ebf8dc974bee4464b175283d0e5fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-12-29T21:11:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-30T14:04:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"rsx: Evaluate cond render test at set_render_enabled","sha":"db784556aab80e7eb6ddc561ddf43c3ca3db47a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-12-26T01:38:20Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-30T14:58:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cellVideoOutConfigure minor fix.","sha":"c6e47a573d7e039d2c7fc01ee9eb1b4b2c569efd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-30T15:19:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-30T16:47:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Settings Dialog Update","sha":"d1be1150c2b472de72dfa4c7557187ad8766ce94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2018-12-30T01:12:01Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-30T18:31:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix builds with musl c","sha":"be75a564caa7deed5d1416b7f7b1eb27a95dbaa0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-20T14:58:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-12-30T20:12:32Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"mmapper_allocate_memory improvement\n\nAdded cases 0 for allocation granularity size,\nalike sys_memory_allocate, the alignment of this case is 1mb.","sha":"c0eb4965f22e4775cb30f7d2345119b5982601a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-20T21:17:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-12-30T20:12:32Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Set total memory size according to sdkver","sha":"2ea061b9c7d7f6ef76af237d4944f09678643277"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-21T11:55:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-12-30T20:12:32Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Debug console emulation","sha":"79a6a2c7fbe59a94efa79c5f3177deec45dab58a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-21T12:03:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2018-12-30T20:12:32Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix sys_vm_memory_map address base","sha":"483ee5e48824557b63e7b6a25686c35a76f099b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-12-30T14:39:40Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-30T22:39:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixes issues where the mutex is destroyed while an unlock is happening","sha":"7ebd3bbcbf574dc988c7347e7ed2fa05b18d65a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-11-17T03:17:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-31T11:42:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: add config entries for mouse deadzones and acceleration","sha":"2db16c2c04bcfc056dcd26012abfb91e9f051bb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-28T20:36:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-31T11:42:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: add mouse settings to the pad settings dialog","sha":"a77bd41b509be08eaaa8005977e63b953d9ef741"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-29T14:56:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-31T11:42:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: add keyboard stick interpolation","sha":"632b0f489c851ba06acb32bbe6407fe5d8c6f201"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-12-31T00:37:43Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-31T17:06:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Migrate to seperate file for environmental variables","sha":"54d41f680507fa554f48217005133d7f50c04929"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2018-12-31T00:41:02Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-31T17:06:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Deploy linux binaries to RPCS3/rpcs3-binaries-linux via GitHub Releases","sha":"17d413c11048352194514417ef1b5848dd00d91e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-31T18:25:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-31T20:03:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add log messages for PPU compilation","sha":"a4f67ccb87a25c5b6db33be8c628901cf7629ac1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-28T13:05:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-02T14:45:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Overlays: fix input loop when no controllers are detected","sha":"8ad14c4ada61c52c5006d3dcb1d7e1c647b43dc1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-30T01:34:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-02T14:45:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"implement CELL_PAD_INFO_INTERCEPTED","sha":"6f7b25de90cb8db64d3ebfda06f32c3f36ee98af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-30T19:58:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-02T14:45:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: implement CellOskDialogInputFieldResult\n\nfixes abort and cancel","sha":"ad5cdc38cd3c30d3998e27d2eced4197ec5d125a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-30T21:26:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-02T14:45:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: add Constants","sha":"0e7fd45504eefaa0c4f9040e07cf29562a779e18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-30T21:27:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-02T14:45:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: add some param checks","sha":"3b83e223d8a421c0a7268c0e16c9476901004f8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-31T19:03:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-02T23:15:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSysutil: drain callback queue at single step\n\nThis way if a new callback is registered in a process,\nit will not be executed immediately in the same loop.\nRemove mutex, use lock-free queue.","sha":"7a4282b4c057640d41c63da2e441e1cc5d646db1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-01-02T22:35:39Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-02T23:15:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSysutilCheckCallback forced granularity","sha":"37c621ebbf8f9d97e15951f2464379a1908975a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-02T22:59:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-05T00:50:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: spawn Confirmation Dialog on exit","sha":"5f9b441dd72434ccdeabdf7e1c39e537b86734af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-03T16:13:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-05T00:50:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: spawn Confirmation Dialog on when booting games while Emu is running","sha":"daee2a27a3dd4f94734bf76a727aa05fa766a6c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-02T15:12:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-05T03:03:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix some warnings","sha":"bb464b0b64ab283b9219059c1a08e0aecdbdd876"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-02T16:41:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-05T03:03:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"prevent debugger crash when no thread is selected","sha":"6fe615605ad2eb863be306c5d1231eb1ad766822"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-02T17:00:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-05T03:03:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Assume go to address to be hexadecimal","sha":"6c10cb2eb5a017431aadd286efb4b6f71ba67d03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-05T18:01:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-05T18:31:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Spec fixups\n- Forgot to update descriptor pool init sizes over time\n- Also clamp swapchain resources to allowable surface extents","sha":"a13986ec5cb7de2fdcb7e86dd9f4a10c3b336f8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-12T08:58:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Avoid unnecessarily touching framebuffer memory\n- Do not bind companion framebuffer when clearing single aspect; let the\n  contest mechanism sort it out instead\n- Do not prematurely tag framebuffers, instead only do so at\n  write-confirmation time. Should avoid false tagging if setup does not\n  allow a render to occur.","sha":"15488eb2473c3d628f0ea5f5145d3540d53e398e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-12T08:59:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor cleanup","sha":"64a88296141d369b6ce198a8ccb498252b521807"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-12T09:24:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: bump max number of compute jobs from 120 to 1024\n- It is possible without bugs to have a very high number of compute invocations.","sha":"6d932b042b921d389c19043bd7af06bd61106dde"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-12T11:40:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Do not force upload for missing data\n- TODO: Finish implementing GPU RCB for mem-sync\n- TODO: Refactor mem-sync","sha":"50c07833e4c4e6c1d6c2a507fab2f68279588a73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-13T10:23:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix texture size calculations","sha":"97704d1396ba83e3055b8f11ce92ce459dca9fa4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-16T11:57:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Rewrite memory inheritance transfers\n- Implicitly invoke a memory barrier if actively reading from an unsynchronized texture\n- Simplify memory transfer operations\n- Should allow more games to work without strict mode","sha":"15d5507154d396d8f714a63b59404b9cbf958859"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-17T13:36:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"whitespace fix only","sha":"362eea09a140b3523bab649c041431fa2d87ee8c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-17T16:35:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"minor typo fix","sha":"474d0f61a2804fddd501aa4c6f8b54d1eb2b85c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-18T17:04:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Strictness cleanups\n- Also account for variable pitch textures (swizzled scan)","sha":"a95a44cf660ca804c8688aa8cb663038efaddfb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-20T19:38:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Handle rsx-self-tripping in draw call and triggering invalid invalidation\n- If draw call resources consume memory that intersects with NA parts of the texture cache, we get a framebuffer test mismatch.\n  This mismatch is false and happens because the thread has not yet reached the point of relocking the pages","sha":"3be4b474d9616c6c82514c1a063f598b83828a44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-21T14:17:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Remove old useless hack that interferes with memory inheritance","sha":"d8e45c86e6c42aba1d14f759ed4f67abfcdb11c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-22T10:26:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Reimplement typeless memory allocation to handle resolution upscaling","sha":"9c45ce6d37a832b7c71c0e539cec6d2225c8120f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-22T12:01:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reorganize write barrier implementation (either clear or memory barrier)","sha":"1ffadbe086f4313fc3a3235b343645b76f69a3be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-28T17:09:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reimplement pitch lookup\n- Remove the required_xxx_pitch constraint as it makes no sense. The pitch controls what can be written per line.\n- It is possible to have a huge surface width but only render to a small region at the beginning and have a smaller pitch than can fit the surface (NFS carbon)","sha":"0f64583c7a9276fa49eb884658593e53dff6762c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-29T13:28:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture cache refactor\n- gl: Include an execution state wrapper to ensure state changes are consistent. Also removes a lot of required 'cleanup' for helper methods\n- texture_cache: Make execition context a mandatory field as it is required for all operations. Also removes a lot of situations where duplicate argument is added in for both fixed and vararg fields\n- Explicit read/write barrier for framebuffer resources depending on\n  usage. Allows for operations like optional memory initialization before\n  reading","sha":"2a62fa892bfb2976dccc17231ad3af6c4b292768"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-30T14:43:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Typo fix\n- This silly typo broke the flip improvements in the GT fixes PR","sha":"c80c7f06bba1f079d26367f2191814cfb83e675e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-30T20:47:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix dirty flag reset after a partial attachment initialization\n- D24S8 targets have 2 aspects that are dealt with separately; Forcefully initialize the remaining data if a partial init is done. Its 'free' anyway\n- It seems that the stencil mask matters when clearing unlike the depth mask and color mask","sha":"475cc9911778570aba3e6d978121e32992b0fc9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-31T12:20:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve ARGB8->D24S8 casting\n- Set up partial transfers\n- Force clear of target before starting the transfer","sha":"95245bdd8377f0e917068228b80985c1a1fcade3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2018-12-31T18:11:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor hot-fix\n- Pitch 0 makes sense if width == 1 and height == 1","sha":"89c9c54743771cad7a2538a8ab4679977d07dc0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-05T10:12:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T07:44:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: improve memory coherency\n- Avoid tagging and rely on read/write barriers and the dirty flag mechanism. Testing is done with a weak 8-byte memory test\n- Introducing new data when tagging breaks applications with race conditions where tags can overwrite flushed data","sha":"52ac0a901acac98d05ed9c989069b9ea107082b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-01-08T11:33:29Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-01-09T00:48:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Update Readme\n\nAdd Qt5Qml dependency for Arch\nSolves #5518","sha":"d7cd280827c1a2d3e9cb5e7ae03b8055835aa5e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-10T09:25:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-10T10:32:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix travis","sha":"0236b994e431482e8a36e242f408b37efb378bb0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-08T21:32:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-10T11:14:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: make dockwidget title bars optional","sha":"1b2e512179fcec79da36ba8701ea576ea51ea103"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-04T01:02:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-10T12:05:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: properly handle dialog states to improve param checks","sha":"16f297579263c704450500a481a4fa33693464fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-04T03:33:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-10T12:05:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: don't send input signals without seperate screen enabled","sha":"cc30b4e5be733367da1083f82b818c99a3765d5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-04T13:05:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-10T12:05:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: add message","sha":"7cc4239cc2d1e29ae5741b1b42672c7ae1490e58"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-04T13:45:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-10T12:05:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"add error_code to cellOskDialog and cellMsgDialog","sha":"d5303b0b647e3825e66b9d2deee48c1d69b6de49"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-04T21:28:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-10T12:05:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"split MsgDialogBase","sha":"e0ac244fed82b542565a608771869bf800544fb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-05T00:32:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-10T12:05:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: cellOskDialogExtRegisterConfirmWordFilterCallback","sha":"4a8b30c62577ae02517fb6442f8a0e872fa3eaf7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-05T17:11:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-10T12:05:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: add multi-line option and handle more permutations (WIP)","sha":"17058113dfc3abd16ad12cc50d3a0e09b22597db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-06T12:40:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-10T12:05:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: initial code for cellOskDialogSetSeparateWindowOption","sha":"e5aede7aa7c5e1312827ba7a6e0afc9306548a26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-08T18:14:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-10T12:05:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: fixes for multi-line dialog","sha":"eb4d612bb92f3916c01c93499e29ac23a96294e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-08T21:10:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-10T12:05:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"rsx/input: fix rsx replay","sha":"d9d5f45e9eebddbf06db23f72f03606eedfccb66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-09T22:31:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-11T00:36:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGame: fix some installation issues\n\nfixes HAWX2 (at least until it crashes again)","sha":"e3ea29599d471e42211714ebd62bdfd25bc4129d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-01-12T05:33:01Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-12T05:59:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"revert part of #5529","sha":"fad80ed443b5334514ff5cf185cdabbf45f7a2ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-12T06:53:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-12T07:26:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOsk fixup","sha":"e18e9909af169c4b02c74c2ed8bb3393f1b28acb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-20T22:33:53Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Disable OpenAL backend temporarily","sha":"56962aa707d62e5e785fe45303242d743c7b7a37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-20T22:35:49Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Implement basic cellAudio buffering","sha":"2addbe6be2cc10dc1fb632409e573838a1b5d15b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-16T17:40:50Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Implement Audio Backend Capabilities querying\n\nAlso renames \"AudioThread\" to \"AudioBackend\". The new name is more\ndescriptive of what the class really is responsible for, since the\nbackends are not responsible for managing the audio thread.\n\nNOTE: Right now only XAudio2 is supported","sha":"5159d3559e25c1defcb13d5035be2f363c0b11d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-16T21:12:58Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Implement basic time stretching + Tweaks","sha":"892deb1552a27d18bec7648a08421750dcf95a78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-20T22:26:19Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Update OpenAL to 1.19.1","sha":"f90646ec88b2e6818863d0b0713f08f2f1577052"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-21T01:16:54Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Rewrite OpenAL backend to support new features","sha":"4f39457858c25fdc263fc1b94bce5f75618b6f3f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-21T02:13:22Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Various fixes\n\nIn addition, linux builds (and ALSA/PA) now work again","sha":"67f9397746818b152c23fdb8457337037452ca4e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-23T22:58:12Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Change cellAudio diagnostic messages to Trace","sha":"8f6043b568551e88da66e70765ddb4cf88befd5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-25T21:41:17Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Add timeout for untouched buffers","sha":"f17f9847212eed0d555629489ef36b7d53b83bcd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-25T21:49:33Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix game pausing/unpausing","sha":"650bc0c1f21bda55a4fce8705ec70197db174760"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-26T23:12:21Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Misc. Tweaks","sha":"48db0430d47e08365f72cb284e76d1a2d47d1da4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-12-26T23:58:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Qt/settings: add new audio buffering options","sha":"5e3311746c8fbfc15bf38698b90691f4eefc9637"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2018-12-27T01:10:58Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Change audio tooltips, audio backend order","sha":"fe9062671e0bd44a5949b88392ed6f75bd0d8cc5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2019-01-09T22:19:05Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fixups in audio backend\n\nRemoves 's_' prefix from variables that are no longer static and\nthread_local. Removes superfluous comments left behind due to copy-paste\nmistakes.","sha":"1e4513e2e36a5cfc97a5733722ee304ed4fb24b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2019-01-09T22:21:55Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T18:29:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Tweaks to buffering algorithm\n\nIncrease untouched buffer timeout when some of the buffers have been\ntouched. Might improve audio quality on games that suffered from\nminiscule popping even when buffering was enabled (such as DeS).\n\nIn addition, made time stretching algorithm slightly more aggressive.\n\nIncludes some other tiny tweaks as well.","sha":"49fbf9bf0f54f49e35929aa1f65da19adff4ca27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2019-01-12T18:42:00Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-12T19:22:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fixups for audio PR","sha":"3406acd8c99da9057d49f50582963eb72167fdfe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-12T08:23:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-12T22:39:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: fix cellOskDialogUnloadAsync return string\n\nfixes Class of Heroes 2G","sha":"f9c1b15bf46e371d78b45e1552674330c444b32e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-12T10:30:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-12T22:39:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: fix cellOskDialogAbort","sha":"fce9f352a937ed4c918cc6f5cc4e4507dae92f44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-12T11:00:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-12T22:39:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialogUnloadAsync: guarantee 0 terminated return string","sha":"d7cc97433d332b5cff7a6d1d829ff5f8970157a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-12T11:53:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-12T22:39:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: use atomic_op for state operations","sha":"022550a43b9e7ccdeaaec1ee024f92c4efd9c00c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-01-12T18:49:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-13T09:59:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Implement invalid NV4097_NOTIFY context handling","sha":"bc27f5f75c159c8844f26c663fc68f1282d102d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-24T15:46:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T11:45:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement RPCS3_CONFIG_DIR env variable (Win32)\n\nOverrides config location, should end with / or \\","sha":"20efed66e9208c8b1b311de160efc36c20f2138b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-24T15:47:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T11:45:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement fs::get_cache_dir\n\nWin32: equal to config dir for now\nLinux: respect XDG_CACHE_HOME if specified\nOSX: possibly incomplete","sha":"bd9131ae1c96bf3844326e684a4bca10a1f729c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-24T15:50:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T11:45:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData: workaround possible issues with symlinks\n\nDon't use ../ location for temporary directories","sha":"453344c23259006053fd182f65c41b64ab2a6649"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2018-12-25T17:23:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T11:45:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: ensure sys_spu_thread_group_join receives correct exit status\n\nFollowing #5334","sha":"cfdf50dcffff02146c52db7f241219a9fef5e8f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-03T15:18:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T11:45:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"lf_queue: add iterator support\n\nAllow range-for loop over an object returned by `pop_all()`","sha":"435f60d503ff7d62f9a76cd095349c7eb4bc5a1c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-03T15:51:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T11:45:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove lf_mpsc, lf_spsc\n\nNot practical","sha":"3fed4dcc5af35226004358b73ff1e5fe4d368f78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-05T10:34:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T11:45:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify gui_listener\n\nUse lf_queue","sha":"ac775cd75ea2f86f6e6c5923c7d080a19a28e078"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-11T17:44:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T11:45:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"lf_queue: implement wait() method\n\nSynchronization does not occupy additional space by reusing LSB","sha":"81c50bad69b89d461bd40e343af4121ba8ee127e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-12T19:14:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T21:01:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellAudio: fix template arg style\n\nAdd constexpr if","sha":"74d684b57ea2d1fdc375730393ddd13b23250b18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T13:26:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T21:01:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU analyser: fix branch to self\n\nFixed not filling the predeccessor list on BR-to-self on entry point\nVersion bumped (v1-tane)\nCloses #5353","sha":"aefee04c4a8dfe9e09039d25dfe8569dfb7a486b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T17:06:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T22:24:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move PPU and shader cache\n\nNew hash-based location (already used for SPU)\nBump PPU cache version, improve naming and decrease size\n\nRemove fs::get_data_dir\nDisable boot.elf cache","sha":"a419e98acb74d3650bdbb946025351d51a23345b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T21:03:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-13T22:24:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellVdec: fix minor race","sha":"c5026f7109d0a34391e4327539acc7b8247ff07a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-13T13:25:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-14T20:12:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: add error_code","sha":"58a22d1461f20647fc6a41463b35bcf2c85fe8ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-01-07T06:13:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-14T23:33:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"spu: Fix support for multiple lists when one is stalled","sha":"f19fd23227de20938824b9be7660bce980ba327b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-01-15T15:31:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-15T15:31:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU/PPU atomics performance and LR event fixes (#5435)\n\n* Fix SPU LR event setting in atomic commands according to hw test\r\n* MFC: increment timestamp for PUT cmd in non-tsx path\r\n* MFC: fix reservation lost test on non-tsx path in regard to the lock bit\r\n* Reservation notification moved out of writer_lock scope to reduce its lifetime\r\n* Use passive_lock/unlock in ppu atomic inctrustions to reduce redundancy\r\n* Lock only once for dma transfers (non-TSX)\r\n* Don't use RDTSC in reservation update logic\r\n* Remove MFC cmd args passing to process_mfc_cmd\r\n* Reorder check_state cpu_flag::memory check for faster unlocking\r\n* Specialization for 128-byte data copy in SPU dma transfers\r\n* Implement memory range locks and isolate PPU and SPU passive lock logic","sha":"fc92ae40854d7e9b69af81f3170461807e885de3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-01-15T17:38:13Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-16T06:43:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix cache removal","sha":"f902a7867cdd8742e9dc6a665e9cb659796aad4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-16T18:40:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-16T20:36:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellOskDialog/osk_dialog_frame: fix regexp for CELL_OSKDIALOG_NO_SPACE","sha":"5ed718110a92519435382b69a2f8a28a0517ec97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-01-17T16:31:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-17T18:58:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Patch ppu main thread prio","sha":"a11d76249d6d9dcfde93e944b92563e68e83b678"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-16T21:30:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-18T13:49:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rollback audio backend priority","sha":"cc430769c619a4ad4dcc18583d49204a77ec784f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-18T13:36:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-18T13:49:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellMsgDialog: fix error spam on CELL_OK","sha":"59e0296281272cc82811280842d4ff0357f4eb96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-18T13:48:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-18T13:49:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ALSA: disable recovery (experimental)","sha":"d4591b15083b8ae8b3429c2616e677c9fc016aab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-19T11:54:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-20T22:16:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: use patch version and firmware for PS3 disc games in the game list","sha":"fa00fb3eac3c6d721e45f21678c6a11c377d74cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-01-21T14:33:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-21T19:28:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix unknown vertex base types\n\nClamp vertex type field into 3-bits instead of 4-bit value\nCase 0 is UB256","sha":"688d5a99191cdd40cfcfa8c0565cf482eee3b6c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-22T00:21:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-22T09:04:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/Qt: fix some undefined behavior in progress_dialog CallAfters","sha":"8d5d44141e9aaa90c9450529b885a4afb0d5afd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-21T18:04:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-22T19:02:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: multithread compilation\n\nAllow parallel compilation of SPU code, both at startup and runtime\nRemove 'SPU Shared Runtime' option (it became obsolete)\nRefactor spu_runtime class (now is common for ASMJIT and LLVM)\nImplement SPU ubertrampoline generation in raw assembly (LLVM)\nMinor improvement of balanced_wait_until<> and balanced_awaken<>\nMake JIT MemoryManager2 shared (global)\nFix wrong assertion in cond_variable","sha":"4f152ad12696d47fdf3e052bfa87bb727651f730"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-22T19:00:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-22T19:02:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix le_t<> compilation error\n\nUse memcpy for copying","sha":"d5eda98e49cc81dbbd35e469bcda7504d29d9ddb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-01-22T20:10:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-22T20:10:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix spurious abort in sys_rwlock_tryrlock and sys_semaphore_trywait (#5579)\n\nUse full cmpxchg loop to prevent occasional return of CELL_EBUSY","sha":"afeacc171f1ffb990f5912bdfa1eb2697e3e3f98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-14T12:33:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-25T11:34:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactor index buffers\n- Index offset is ignored anyway and only used to calculate vertex attribute divisor index\n- Specialized optimization for untouched xfer without primitive restart","sha":"417a2e67316b675916cb942609a53b7b29ae14fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-14T14:41:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-25T11:34:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Disable rtt side-effects when async compilation is ongoing. Only real renders should promote buffer state from underined to drawn, otherwise keep previous contents intact.","sha":"8093c9b573e5a154c02a3ab9dffae6f3041aef4c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-15T11:31:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-25T11:34:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix silly regression with blit dst resource readback","sha":"7eec702c6dfe5c890a576cecda11222b90cb41f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-15T12:37:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-25T11:34:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Avoid potential deadlock in FIFO_ctrl","sha":"10a17feda2631757bee0c10361c901bb1fa2d5ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-16T17:06:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-25T11:34:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reimplement MSAA transparency\n- Apply dither to edges that almost fail the straight-up alpha test\n- Significantly improves alpha tested geometry far from the camera\n- Also removes blend factor overrides/hacks as they give incorrect results due to background bleeding","sha":"6fdc0fd7f001724b761ef817169ba4a0a2005ded"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-18T09:23:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-25T11:34:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Detect broken/NOP shaders automatically\n- Do not compile body if the shader is of no consequence, leave as a passthrough shader","sha":"736415fcd970c48956d8a5565261631dea6caf72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-21T18:07:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-25T11:34:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reimplement attrib divisor","sha":"fb778e4821f5241e75eecf5845f492c0d22c762f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-21T18:08:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-25T11:34:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: simple_array<T> improvements\n- Implement move and copy ctors","sha":"7e33cdcb0854bff57ed2d5292d41092875d81363"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-22T11:05:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-25T11:34:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Blit fixup\n- Typo fix. I meant to disable scissor test, not stencil test\n- Also clean up and simplify/optimize the core logic","sha":"5a4bea8c4fc18ad461e3b51c31b37c59e0a5cf51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-22T11:31:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-25T11:34:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Remove GL_R 'format'. There is no GL_R format, it part of the S-T-Q-R enums for texture coordinate space","sha":"521969bcc3f42f37347cd99b5fe298af0525ccdb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-23T21:40:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-25T11:34:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Typo fix","sha":"2163a59649ac218e105c97aeb16addd31618e5f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-23T21:58:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-25T11:34:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Spec fixups\n- Disable DEPTH<->RGBA typeless transfers for now as they require a lot more work to work for all vendors\n- Do not allow switching layouts to UNDEFINED/PREINITIALIZED formats","sha":"fa9b44868659b7746a8cd75b36c8550831dfae0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-23T22:16:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-25T11:34:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fixup - inline arrays","sha":"660bfeabae852dd0fb2bcffa5224488a5e98be23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-01-25T07:56:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-25T15:04:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Return error code in sys_ppu_thread_get_join_state","sha":"56b7581ade8186eef18b64cd83f31af7bf7ea5d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-01-25T10:32:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-25T15:04:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make ppu main_thread unjoinable","sha":"587fe421eef80112471320a85c8f6e701c48649b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2019-01-28T16:28:35Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"max"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-01-28T17:41:24Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Add QDoubleSpinBox styling\n\nUpdated themes\n - YoRHa by Ani\n - Kuroi (Dark) by Ani","sha":"d1f544c7551b96263e859cfb78e4bde14de8deee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-26T20:15:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-29T00:32:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Added jit_runtime class\n\nIs a memory manager for ASMJIT, replaces asmjit::JitRuntime\nUnified memory manager for ASMJIT and LLVM\nUnified SPU trampoline generation\nRemove previous workarounds","sha":"4292997a011c0d3beb551c46be74bf58719ae1fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-28T13:14:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-29T00:32:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove SPUThread::jit_dispatcher\n\nUse global array - save memory\nMove the array to JIT memory","sha":"50922faac906868a468a15f3dde770cb08b26f86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-28T15:39:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-29T00:32:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement atomic_t<>::release\n\nMore relaxed store with release memory order","sha":"2b66abaf10e86b134a34519f398737841e735a3d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-28T17:23:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-29T00:32:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"spu_runtime::add minor optimization\n\nUse preallocated vectors in trampoline generation subroutine","sha":"58358e85ddc864d42de081307f13f49a256ced0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-29T00:29:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-29T01:33:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Initial support for HLE in internal API\n\natomic_storage<>: add compare_exchange_hle_acq and fetch_add_hle_rel\nshared_mutex: add methods (un)lock_hle and (un)lock_shared_hle\nClang: 👅","sha":"f50d9cc136128a4940d5c9c363938b3e9ed5a884"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-30T00:11:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-30T00:11:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update About window\n\nUpdated supporters and contributors","sha":"039f8e1f9d6afe8df6ff47af894e07e702c38fc1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-01-27T18:59:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-30T15:44:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix potential crash in begin_occlusion_query() while closing the Emu","sha":"6f770c8e35e65e21a65d8d11047fda1468ba495d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-01-28T10:46:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-30T15:44:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Dont call std::terminate() after normal access violation handling","sha":"b61492ca305f7c46a63ad68c14a85b3931c9c9df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-01-28T12:05:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-30T15:44:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix access violations reporting on RSX\n\nand on other threads that do not have cpu_thread handler","sha":"25aa5f80a6ea321b4aa72189e120d1e25541fc2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-30T22:07:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-30T22:08:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData: try to handle occasional failures\n\nRetry moving directory on FILE_ACCESS_ERROR","sha":"400718dfd93fb8543b8e2fe8c65975bed044a7ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-01-04T16:42:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-31T13:03:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix DECR mode allocations (sys_memory)","sha":"d4a24433e87485594de5ad0bc148d8056147f25e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-01-04T18:37:43Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-01-31T13:03:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add debug console mode to settings","sha":"987b607cb0b5e5529828f0bc4dce688b2c127f37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-06T22:03:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-31T18:53:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/windows: Try to keep msq thread from ever stopping\n- NVIDIA drivers hook into the msq before our nativeEvent handler. This means NV is aware of events before rpcs3 is aware of them and sometimes stops until a new event is triggered.\n  If rpcs3 is inside a driver call at this time, the system will deadlock since the driver waits for msq which waits for the renderer which waits for the driver.\n- Use explicit hook management to control window events\n- Add fence timeout to attempt detection of surface loss events","sha":"3bfa564ef8fc8267bd886dc8f5a5efc0e690d453"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-29T18:57:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-31T18:53:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Use FIFO mode for vsync\n- Avoids tearing and also hides some driver bugs causing fullscreen bugs with mailbox mode","sha":"09a8f7ae5355e13c1f638dab0d361147f195b5f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-21T20:31:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-01-31T20:14:52Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"use \"config/custom_configs/\" for custom configs (backwards compatible)","sha":"27f6f497a2d9739e39e070f53a345aa1b0179fd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-31T20:28:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-31T21:22:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Hotfix for fullscreen not working on non-windows platforms","sha":"f47d3a761bb23473fec49f73e6b3b3740ff3cdc7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-01-31T21:47:37Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-01-31T22:08:45Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rpcs3_version: Bump to 0.0.6","sha":"f4afd56e67c8120df54a5259ddaf2a3b137484f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-31T22:41:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-01T14:47:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"facepalm: fix open_config_dir old vs. new location switch up","sha":"8920eda3217f5e320b26588662825ca10b244f85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-28T17:20:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-02T08:54:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Increase number of draw calls per frame for overlays to 1024\n- Allows for more complex interface design","sha":"9d4b19b97a9ec3f1aaf435d55f32b625697f7fcd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-29T16:29:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-02T08:54:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays/osk: Implement native osk interface","sha":"9ed9d7e9477ec801d18bffc792c6968f2464c054"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-30T09:50:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-02T08:54:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays/osk: Add more buttons to native dialog and other improvements\n- Adds all the major buttons to native dialog input options\n- Adds more button options for the native osk\n- Brighten osk cell backgrounds a bit to improve visibility","sha":"c434e0ce272c9f3162f4a356492bb896399d797c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-30T18:08:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-02T08:54:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Implement edit_text control","sha":"faf5221b0da977b0f6c74943c018fc4c6cd3985a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-31T11:01:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-02T08:54:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays/osk: Add support for edit text control and disabled cells\n- Allows to disable cells from being selectable.\n- Edit text control adds proper support for multiline and a functioning caret","sha":"3653c2eb0da6b27e3d20445dca7749911f6ae84d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-31T11:31:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-02T08:54:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: Fix clip region scaling for overlay elements","sha":"9e39e2d2c46af07d102c9e2753ddedc966792176"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-31T14:33:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-02T08:54:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays/util: Strip extended codes from utf-16 encoded strings","sha":"12990f3ca3e1fca8ec8f30c83147053b545fe579"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-01-31T17:43:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-02T08:54:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Allow use of extended ascii8\n- Use custom string conversion to ensure overlay deals with extended ascii whenever possible\n- Improves language compatibility greatly and avoids empty spaces for unknown glyphs","sha":"b36cb661292aef6dd246b267a48cc4dca1cef26f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-01T09:50:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-02T08:54:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"osk: Fixup attempt for hang in close callback where a sysutil_callback fails to fire.","sha":"27af05da1a7d12801aa0505b9bf9841c914af4bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-01T09:56:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-02T08:54:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Minor frame management improvements","sha":"a36d3af3b4fdbca94b84e590ec7df46f6caf0753"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-03T11:32:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-03T19:26:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays/util: Add support for glyph set lowering when mapping utf8 to ascii8\n- Lower fullwidth glyphs to halfwidth counterparts\n- Lower CJK punctuation glyphs\n- Lower general punctuation glyphs","sha":"67cdec577f0efcffc65811d0d0d3af99ad6728a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-03T12:43:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-03T19:26:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays/save_dialog: Layout improvements\n- Make detail a separate text entity as it often contains a lot of noise\n- Properly pad the entry if needed to avoid text sitting too close to the edge","sha":"4c593959fdad001f08052898d3df4cc420c04d41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-04T13:42:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-05T09:15:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: Improvements to overlay rendering\n- gl: Properly initialize and manage sampler states\n- gl/vk: Snap overlay elements to pixel grid by aligning to pixel centers\n- overlays: Disable grid snapping in stb since its now handled in the backend","sha":"38887bc03e0b019830e75549bee116148b53392a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-05T13:14:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-07T08:40:17Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix usage of VK_IMAGE_LAYOUT_GENERAL\n- Properly synchronize when transitioning to/from GENERAL layout.\n- General layout requires full pipeline dependency since its used in a 'general' sense. As such, its use is to be largely avoided.","sha":"19ff95da706ac87a7cde00fbc98a3f256a80e4fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-02-08T17:23:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-09T21:16:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make sys_spu_thread_group_join return once per termination","sha":"e3ee481f0166b2f9da0db578397fe0e2ae9f8bb6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-02-09T09:34:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-09T21:16:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make more use of the new atomic_t<>::release","sha":"08612262719194521ab66c31aeced8b6b7d94299"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-02-09T16:58:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-09T21:16:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add EFAULT checks to spu_thread_group_join, ppu_thread_join\n\nOrder of checks is based on firmware","sha":"84d42ecb655ef7ed302e7522db29050b613d30e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-02-10T02:05:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-10T15:20:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix race condion in sys_spu_thread_group_join","sha":"fa647bc12184f4d53f30ba0ef7e468a782a93f9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-02-01T11:00:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-10T22:13:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixup for sys_lwcond_signal_x error checking","sha":"d6995f40c7eb4f3b2c0c0a1aa5adf0bab55a44e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-02-10T15:41:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-02-11T19:34:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: only show supported resolutions in custom configs","sha":"982b2ab88fa1a3b5dc710a8ad963ccecdf03154c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-20T21:57:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-12T18:06:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGame: add error_code","sha":"17a5e0bc98ff2fb049d0dbf8abfcaa8b149d4937"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-20T21:57:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-12T18:06:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGame: improve exit functions","sha":"fe79e541dd4a8026df18daed17ab4f9e82ef6735"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-20T22:46:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-12T18:06:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellMsgDialog: optionally make dialogs blocking and fix exit condition\n\nand apply review fixes","sha":"4a1499e0bef16dd6a228d2c0a48f658a6d77febf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-12T21:10:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-12T22:55:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSysCacheMount: don't return RET_OK_RELAYED on empty cacheId\n\nThe system cache is supposed to be cleared but I don't think we wanna do that","sha":"d4888a49738d055122294eed44d8bc6a98bdb30c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4569691?v=4","date":"2019-02-13T18:14:16Z","email":"gasinvein@gmail.com","login":"gasinvein","name":"Filippe LeMarchand"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-14T00:10:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove zero-width spaces (u200b)","sha":"a8621ebc229f1409fc38c0b906bd1b0dddca5b5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4569691?v=4","date":"2019-02-13T18:18:12Z","email":"gasinvein@gmail.com","login":"gasinvein","name":"Filippe LeMarchand"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-14T00:10:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update rpcs3.appdata.xml\n\n- split description to paragraphs\r\n- add bugtracker and quickstart urls\r\n- add screenshot","sha":"56e24f8993d70ff19f69ae0fda3f8b9db720ece4"}
+{"author":{"avatar":null,"date":"2019-02-16T11:31:06Z","email":"37957125+EmulationChannel@users.noreply.github.com","login":null,"name":"EmulationChannel"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-02-16T12:59:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Update FW Latest Version\n\nUpdates the latest FW 4.84 version according to: https://www.playstation.com/en-us/support/system-updates/ps3/","sha":"92ff7c4c240954a8d05291979eeb5ba83050292b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-02-16T18:15:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-16T18:41:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix race in sys_lwcond_wait on error code","sha":"63a9421634c21bccf610d60c58768cd0fa362701"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/21138600?v=4","date":"2019-02-18T12:54:46Z","email":"GermanAizek@yandex.ru","login":"GermanAizek","name":"German"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-18T13:34:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix true clear string container in PPUModule.cpp","sha":"45c31a99a39aa893ebdc67d085a5b11ceee1ac6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/21138600?v=4","date":"2019-02-18T13:04:42Z","email":"GermanAizek@yandex.ru","login":"GermanAizek","name":"German"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-18T13:34:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix true clear string container in GameInfo.h","sha":"3b9f9dd4c5c46e411e774c090af4e8db7cd288d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/21138600?v=4","date":"2019-02-18T13:05:47Z","email":"GermanAizek@yandex.ru","login":"GermanAizek","name":"German"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-18T13:34:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix clear string container in CgBinaryFragmentProgram.cpp","sha":"4c72f7c1def4edc98167cd0da7e4838259ddf35d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-02-21T20:40:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-02-21T21:02:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: hide viewport settings on custom configs","sha":"14ddb0c5b4e494d5ac632e1e70fd1954e439b724"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-02-23T02:27:23Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-02-23T12:29:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"readme - direct qt link to avoid confused kot noises","sha":"c325534f0791ad4bf8372d7dced3202b76c9f87f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5672538?v=4","date":"2019-02-13T20:06:19Z","email":"theracermaster@gmail.com","login":"al3xtjames","name":"Alex James"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-02-26T21:09:18Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"CMake: Refactor git-version.cmake\n\nRefactor git-version.cmake to define the RPCS3_GIT_VERSION,\nRPCS3_GIT_BRANCH, and RPCS3_GIT_TAG variables, and move the generation\nof git-version.h to a function (gen_git_version).","sha":"923700a167735011b87501fc0137e3151202be4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5672538?v=4","date":"2019-02-13T20:11:44Z","email":"theracermaster@gmail.com","login":"al3xtjames","name":"Alex James"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-02-26T21:09:18Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"CMake: Use Info.plist template for macOS bundle\n\nDefine and use a template for Info.plist for the macOS bundle. The template\nuses the previously defined RPCS3_GIT_TAG variable for automatically\ngenerating the version strings, and also enables proper HiDPI support.","sha":"f5163cc4ff9d52d688a7be555f5958a031135d64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-14T20:50:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-02-26T21:53:59Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sysPrxForUser: improve crash dump functions\n\nthis might fix some crashes that could appear in the todo logging itself","sha":"b107718869e38f61ce439d195d8e782cedf40281"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-02-25T17:47:16Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-02-27T18:13:19Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Adds class type to controller options","sha":"ad6b0ee1225c62c1dfecf22983b6fe8d78dcea3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-02-22T10:47:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-27T19:16:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement _sys_lwmutex_unlock (SYS_SYNC_RETRY mode)","sha":"d4459af4b3bae97fc38efc2178449a8f1fb21f26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-02-22T12:45:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-27T19:16:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"exception throwing fix in sys_lwmutex_create\n\narg6 doesnt exist, if arg4 is not negative name is discarded and treated as 0.","sha":"a22297f205d0079d2f48eef6b8998241fb57cd87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-10-26T10:08:45Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-27T19:54:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Static hle implementation","sha":"de5379a69f8a4b0ff2be995dc118b63cc6bcbfed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2019-02-28T01:05:29Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-28T01:48:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Chase GIT_VERSION rename after 923700a16773","sha":"240ba39d167e93fab402b708f70ecfd4819433d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-01T20:11:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-28T21:08:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"typemap: improve pointer support\n\nIf stored object is a pointer, access dereferenced object directly via ->","sha":"6c5d9fffaa1fa7ab014b3f85251c015da509fbe3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-01T20:29:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-28T21:08:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement utils::refptr for typemap (with && syntax)\n\nRef-counted pointer, object is always allocated on heap.\nRvalue reference && in typemap is converted to refptr for convenience.","sha":"7b344b76542b936ea56d7ac67ace0ec5d217332c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-04T14:00:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-28T21:08:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve count leading/trailing zeros implementation\n\nUse x86 intrinsics if compiled with appropriate instruction support","sha":"9ee28672473d65d5f0054ded91ab1137aa3722f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-10T15:22:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-28T21:08:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix sys_spu_thread_group_join wait condition\n\nAfter waiting, thread group cannot be safely accessed\nFollowing #5643","sha":"f143035af1d53bbffe78c00d1148aef7676d5a78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-27T20:09:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-28T21:08:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Optimize SPU trampolines\n\nLoad values in EAX and reuse it if possible","sha":"765d15f23f3e1f801ca30e057443b0ccaccbd140"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-27T20:10:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-28T21:08:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add dummy __has_builtin macro, use rotate builtins if possible","sha":"7f6a4107708a1a68f787929198a4fd5f2a258eae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-27T22:08:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-28T21:08:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: reintroduce branch patchpoints\n\nPreviously only used on SPU ASMJIT, may improve perf in some cases.\nNow refactored to spu_runtime::make_branch_patchpoint.","sha":"fb64b288865d2f99298dfaf57c49d4b4d2ee3367"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-28T21:20:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-02-28T21:20:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: handle icelake-client and icelake-server CPU names\n\nCorrect AVX / AVX-512 disabling logic","sha":"ebb24375d15e96a3c0a7a49a02d1ad6e5832d8e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-02-21T10:39:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-05T18:23:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use sys_memory_allocate on rsx replayer to fix it","sha":"d82362fa1dd256bcadbda17337319fa6082d4ece"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-02-21T11:14:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-05T18:23:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"check address in sys_rsx_context_iomap\n\n* Fix 0 vm page flags to behave like 1m flags, follows c8a681e60\n* check if address exists and valid for rsx io allcations (must be allocated on 1m pages)","sha":"e38b7aee5ac35c575ac4fe3fa293b4b416a05799"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-05T18:46:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-05T18:47:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: handle cascadelake CPU name","sha":"efe067bfa00378ec5836172be8e992cb3275018c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-05T18:47:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-05T19:12:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS: fix sys_fs_opendir on root","sha":"986c750fdc6abfaef673bf4fa52a44a196472d10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-06T12:09:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-06T12:09:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update sys_lwmutex_lock and sys_lwmutex_unlock (liblv2 HLE)\n\nImplement missing SYS_SYNC_RETRY logic\nFollowing #5680","sha":"4ea76def7c42daac84e2eb66534babae2f141a16"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-08T16:07:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-03-08T16:07:14Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Yield before flushing io buffers in fsync (sys_fs) (#5506)","sha":"3c9f03968c09df9a39d66076345de61a5f3d3a78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-02-28T01:38:03Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-03-08T17:52:48Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Adds VID/PID for Guitar Hero guitar & drum","sha":"61bd2ea799bafcc4f69be2a1d2f9ec33f0baa3fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-02T06:13:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-08T20:44:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_lwmutex fixup after #5680\n\nsys_lwcond_wait unlocks always with the 'usual' unlocking flags","sha":"f272a5f779229c42d1febc00c91f6d6e7f9b7b61"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-02T08:27:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-08T20:44:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Treat X8R8G8B8 format as A8R8G8B8 in image_in, Fixes #5510","sha":"ce8c92262d36003e471eff24ffa827d7d30c0cc6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-02T09:14:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-08T20:44:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Release ppu thread before ShowSaveDataDialog, Fixes #4031","sha":"b7da3ea5cd620bba6b416556a4ded791858eb3db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-02T11:35:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-08T20:44:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Correctness fix for RSXIOMem\n\n- Make RSXIOMem volatile.\n- Hint the compiler to check only once the address returned.","sha":"fc253165e2ccee9af9e95616af86b023e9b76262"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-02T14:55:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"elad"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-08T20:44:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vulkan zcull: Fix deadlock in zcull flush waiting\n\nBlock adding additional flush requests until the first ones are treated (by adding missing lock)","sha":"bd259c8ae449c51dfd9404645e196dcbeb328eba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-05T16:41:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-08T20:44:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Small improvements to sys_event_flag\n\n- From RE, only protocols SYS_SYNC_FIFO and SYS_SYNC_PRIORITY are valid\n- Use conditional atomic op store in a few places\n- Properly revert changes in sys_event_flag_set when aomic op fails","sha":"26bcd0a4de8d535c8e75167103b9228d5edae0ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-08T08:08:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-08T20:44:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use error_code in sys_rsx","sha":"7470388e5a66c605e2dbd1658755e31c970ad94f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-08T09:21:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-08T20:44:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix shared memory page flags\n\nTODO: From hw testing, it seems like sys_memory_get_page_attribute and sys_rsx_context_iomap check page size a little differently\n\nget_page_attribute() always go by area flags, sys_rsx_context_iomap checks page by the page granularity\nThis means that if the area page size 64k, but shared memory is mapped with SYS_MEMORY_GRANULARITY_1M\nIt can be mapped for rsxio, but the page attribute will indicate 64k page size :thonk:\nrsxio memory is verified to need 1m pages.","sha":"a43e7c172c724378187c9b78a3fb94f3bda5c4a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-02T19:44:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Synchronize surface cache and texture cache data\n- TODO: The whole upload_texture thing is a big hack, fix it properly","sha":"ef071ebb6bac48c3554849e4c10990faf06867d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-02T21:36:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Handle mismatched/invalidated framebuffer sections when WCB is enabled","sha":"6ef9dcd62e2c14b378b7ae0dc1fbef71b1c6d785"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-25T15:03:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texture search rewrite\n- Perform a full search across all resource types as needed without\ntaking too many shortcuts/hacks","sha":"3a071a9c07118e76879bba0b6c89d7b265eeeca5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-25T19:30:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/surface_store: More aggressive tag sampling\n- Use a 5-point tap with an X pattern across the target's memory space to reduce chances of false positives\n- TODO: Potential false positives identified, requires some minor\nrestructuring of surface_store","sha":"fa628f0ac444c51e078a17ada87f0dc9e5bc9950"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-26T10:31:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/texture_cache: Fix 'AA' scaling hack and restore collection template selection","sha":"563e205a72ff4b431b02c57da901e1b155ade6a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-27T18:26:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/texture_cache: Improve framebuffer memory locking when WCB/WDB is not enabled\n- Adds a new mode that removes non-framebuffer stuff inside framebuffer range","sha":"10dc3dadee6f1a04648601d862f40a0e69c0cdb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-27T18:28:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/tecture_cache: Addendum - fix data cast with scaling conversion (AA emulation)\n- Blit operations do format conversion automatically which is NOT what we want!\n- Scale onto temp buffer with similar format before performing data cast.","sha":"0395fb9955964846ab2ef140c6e0277a2628a5e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-28T10:29:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix memory tag sampling\n- Also fixes a bad arg passed to glClearBuffer","sha":"a80f1a6ed44d002d62d5f48e083751dfdaed5853"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-02-28T10:42:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/texture_cache: Fixups for local resource hit and fast-path added","sha":"b9e7b085feb7083c0a290203377b7e429a918934"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-02T12:14:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/texture_cache: fixes to commit_framebuffer_memory","sha":"dccb4a4888fb48abe2a05991dee024f149ef1185"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-02T14:40:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement proper pitch compatibility lookup\n- When a single row is required or is all that is available, pitch has\nno meaning as the coordinate space changed to 1D","sha":"7c379432dd1eecd1eb7af516965eba428019efed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-03T12:47:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Properly decode packed renders from the type flag\n- Seems to occupy bits [8-9]","sha":"f4ebcb0029ffa16a84bebe15c4dbe217b6f71cdf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-04T11:24:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reimplement render target intersection tests when using hw accelerated blit engine\n- Properly collapse memory tree when scanning in case of overlaps!","sha":"9d4d3d94439d6da3a089ac29f2c3cf27b5de8e7d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-04T18:22:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Properly resolve data for upload when needed.\n- Avoids blindly reusing blit dst sections as they may contain garbage.\n  If a section was unlocked for a flush, just discard it as its reuse introduces potential data corruption.\n  Since the data needs to be reuploaded anyway (for now), its better to start afresh\n- In case of format mismatch, reset the calculated dst block\n- Add a bounds check to determine if data contained in an atlas is good enough for sampling the cache.\n  If not enough data is provided, fall back to full upload","sha":"21bc6c7a87a73e4317901fe770407a4513bf9b65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-05T14:52:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Properly generate render target data with all parameters provided\n- Build-up to variable-sized framebuffers and AA implementation\n- Also allows accurate range calculation for our hit testing","sha":"04dda44225fc6aa682f26b584ff25987b595965e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-07T15:17:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cleanup and fixups","sha":"358558aaa72b8a7069af46e0eb2e23f1df48457a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-08T08:27:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-10T13:09:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix buffer size calculations","sha":"1875dc3f188272e8ae8ebb38e790ca0e74b3e33e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-02-17T15:53:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T10:28:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement SPU page faults notifications\n\n* Implement both RawSPU and threaded SPU page fault recovery\n* Guard page_fault_notification_entries access with a mutex\n* Add missing lock in sys_ppu_thread_recover_page_fault/get_page_fault_context\n* Fix EINVAL check in sys_ppu_thread_recover_page_fault, previously when the event was not found begin() was erased and\nCELL_OK was returned.\n* Fixed page fault recovery waiting logic:\n- Do not rely on a single thread_ctrl notification (unsafe)\n- Avoided a race where ::awake(ppu) can be called before ::sleep(ppu) therefore nop-ing out the notification\n* Avoid inconsistencies with vm flags on page fault cause detection\n* Fix sys_mmapper_enable_page_fault_notification EBUSY check\nfrom RE it's allowed to register the same queue twice (on a different area) but not to enable page fault notifications twice","sha":"4a28319edf0147ae13739f90ea5bdffa9b44dfee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T20:55:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T20:55:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add _sys_lwmutex_unlock2 syscall name","sha":"688aabc6c9205d8f433b79ed1bce3ecda67ce7db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T21:06:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T21:16:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite mulh64/umulh64\n\nUse __int128_t/__uint128_t idioms on GCC/Clang.\nMay result in better codegen by avoiding inline asm.","sha":"eae5b9e0490b024de61e79c1688ad4c254342d8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T22:29:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T22:29:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update 3rdparty/pugixml","sha":"0aa92435571130d16bf4ed926c3894e0006b7db7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T22:32:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T22:32:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update 3rdparty/xxHash","sha":"30636f019930e0bd1d5475517d4e5369c8758134"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T22:33:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T22:33:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update 3rdparty/yaml-cpp","sha":"6d4c9f2d41e10de925621539425c204fbc88b6af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T22:34:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T22:34:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update 3rdparty/libpng","sha":"86238994999ec04079f8ca8b3dd04e26af350b49"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T22:56:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-12T22:56:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update asmjit","sha":"a08cd0fe38ce5766191c333b8906d2388cb2593f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-03-13T00:13:09Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-13T00:45:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"InstallPup: Fix exception on newline trim\n\nAvoid throwing fatal error when installing firmware without a \\n character on the version string\nFixes #5646","sha":"3b01e59cd4f431e9cf84f81c71c4a8db8edc331d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-03-13T11:52:02Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-13T12:59:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix lf_queue destructor","sha":"980c3d6fe879c55b9a6ee53befc6fe5332d7f29e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-13T17:52:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-13T18:14:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: fix SPU MMIO in TSX mode","sha":"388d49db80c5e3e7a6c90b5b07dcf53b3d848a9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-13T17:57:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-13T18:14:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: implement static branch weights\n\nMay help branch prediction in some cases","sha":"e9b6beadfc73d1c1a357669f8481922524805939"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-11T17:18:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-17T18:50:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove pointless assert","sha":"745f8f962739058ace09bbdc2ea6a0666ba34e92"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-11T17:34:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-17T18:50:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/blit: Remove workarounds/hacks added for master. Start implementation/stubs for blit engine rotations in GPU","sha":"17c49d21a5edd8e7600df700e1c3b392bdd3b5b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-11T20:18:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-17T18:50:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix zero-pitch textures\n- Assumption here is that only texel (0, 0) is accessible. Inline with other pitch 0 operations.\n- TODO: Verify pitch 0 does not advance in Y either","sha":"612160a8ffa8415371baa521685b7f188b86ef50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-11T20:22:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-17T18:50:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix texture transfer when pitch does not match exactly","sha":"3a4083263e221ef3c76e832f2294619c3ed3960a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-13T12:38:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-17T18:50:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/cache: Debugging bugs introduced by the atlas coverage check\n- Figured out why it breaks things, ofc can't actually check for coverage when there is no proper fbo data persistence","sha":"85cb7036330c71fe488f48a8079275e4ef612b88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-14T12:27:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-17T18:50:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/gl: Synchronization improvements\n- Properly wait for the buffer transfer operation to finish before map/readback!\n- Change vkFence to vkEvent which works more like a GL fence which is what is needed.\n- Implement supporting methods and functions\n- Do not destroy fence by immediately waiting after copying to dma buffer","sha":"a49a0f2a86d2e4cdeff6e1d65d2cfdc76e8ed6ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-15T12:22:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-17T18:50:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix dst upload block region\n- The section needed starts at image origin, not transfer origin!","sha":"1a4444625053665436399bb19f2b7e38b610601c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-15T15:00:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-17T18:50:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/gl: Improve memory tag sync and test\n- Properly pass parameters such as rsx-pitch to the surface store\n- Do not crash if a surface fails verification in flip, use fall-back instead","sha":"74eeacd091d5d5e2068643a4bc6081dd393de23a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-15T15:25:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-17T18:50:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/gl: Omit unlocked data when grabbing flip sources from texture cache","sha":"385485204bdaa776bcd29d27b65c1bdf0c707ec5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-16T09:14:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-17T18:50:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improvements to memory flush mechanism\n- Batch dma transfers whenever possible and do them in one go\n- vk: Always ensure that queued dma transfers are visible to the GPU before they are needed by the host\n  Requires a little refactoring to allow proper communication of the commandbuffer state\n- vk: Code cleanup, the simplified mechanism makes it so that its not necessary to pass tons of args to methods\n- vk: Fixup - do not forcefully do dma transfers on sections in an invalidation zone! They may have been speculated correctly already","sha":"5260f4b47d4b57ad0dc0f98b5905ef38c1055e1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-16T10:58:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-17T18:50:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement GPU acceleration for rotated images","sha":"bb65e456142248132b0bb9798579602e427d56e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-16T11:31:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-17T18:50:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix texture lookups and avoid out-of-bounds copies/transfers","sha":"3ef16bee475160f6d09ba66191438e51eaf1c081"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-02-02T13:48:21Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-18T16:05:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Adds libusb","sha":"f2aaad11bb26dbd87050b3891efa3f8c40543877"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-02-02T14:15:09Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-18T16:05:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"DS3 pad handler","sha":"63bbe459ea828c620b7839a91435eac2b8b1861e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16805474?v=4","date":"2019-03-18T18:45:33Z","email":"matimoran03@gmail.com","login":"RainbowCookie32","name":"Matias Morán"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-03-18T22:46:02Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Update DualShock 3 warning","sha":"3eb2bcad3945339a78345a5c01623e7d3c1a6ab2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2019-03-18T22:45:44Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-19T19:24:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Don't try to build libusb on FreeBSD\n\nCMake Error at 3rdparty/libusb/libusb/os/CMakeLists.txt:90 (message):\n  Unsupported platform FreeBSD.  Currently only support Windows, OSX, &\n  Linux.","sha":"1f845a3634ae34b79e1b4421b72f1a916c775cc6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2019-03-19T00:02:21Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-19T19:24:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"OpenBSD doesn't have mcontext_t\n\n`<signal.h>` provides `typedef struct sigcontext ucontext_t`","sha":"1a13d3ae4e28fc46baef52086c64189f84cf2b9f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-19T08:30:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-20T07:05:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix blit intersection falling outside the available texture\n- Just becaue we have a hit inside the tile of interest does not guarantee that it sits inside the texture!","sha":"03fca73cf411bb483026ac5d6e99c95d68d37bbb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-19T20:46:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-20T07:05:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix bpp calculation taking resolution scaling into account\n- Do not rely on image->width(), use surface_width() instead for unscaled values\n- Refactor/clean GL rendertarget class a bit","sha":"b879b322718cdf4552c5ceddb9b2bc688328624a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-20T22:55:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-22T18:27:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix blit transfers when texel sizes mismatch\n- Also refactors some bpp handling code\n- Simplify texture intersection test to use a normalized/uniform coordinate space\n- Fix broken bounds checking as well","sha":"adc59f98104cd7af37471ecca7024f0fbfb8122a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-21T07:55:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-22T18:27:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix typeless resource management\n- Fixes bugs that appear with high resolution scaling","sha":"d731c07adea6304791aede1d9be59bd9fbae0fc8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-21T09:48:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-22T18:27:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix use-after-modify condition when inserting a draw command out of order\n- Fixes barrier->range rebase after the insert","sha":"3a4e3fa53a1fc3b06a39b0f7ba38488f292e3539"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-21T09:48:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-22T18:27:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Silence some compiler noise","sha":"dbc8e70ddd10bd33f129bd6fd9183ebb49c8c5ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-21T17:22:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-22T18:27:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Rebase output region when using upload-fallback path","sha":"86ad20463626fcc66e083182af62fc6392f093ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-22T11:10:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-22T18:27:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Blit engine fixes\n- If a transfer writes to a RTT and depth mismatch happens, create a local target and the upload function will likely resolve between the two\n- If a surface is rejected, reset the target region!","sha":"41b87cf577d00411986e1e9eac1f046108738e65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-18T16:22:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-22T23:43:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: fix branch patchpoints\n\nForgot to passthrough 3rd arg (rip)","sha":"466d58ccefc42a2ea57a7dbf3431aacd798e306f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-18T16:24:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-22T23:43:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: add MemoryManager3\n\nFor temporary allocations.\nAdd flags in jit_compiler constructor.","sha":"849411693a1add4b766187eca43aa50a0d0d9d76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-18T16:33:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-22T23:43:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add cpu_flag::jit_return","sha":"3794f65bb61fc365afb85c32843337b0a98ee59a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-18T16:36:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-22T23:43:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU rec: refactor some trampoline generation\n\nMove branch/dispatch trampoline generation at startup.","sha":"31304f4234e760ed0f77a3646770e0d7e05bdb71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-18T16:40:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-22T23:43:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU recs: implement spu_runtime::find\n\nUse this function to link to existing functions from branch patchpoints.\nDon't compile from branch patchpoints.","sha":"1880a17f792edf232788b1707e013feaa48fe908"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-18T20:01:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-22T23:43:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement spu_runtime::reset\n\nTo handle JIT: Out Of Memory error.","sha":"4b381fbbb1697ca9ab8ae83450522794a8b4e9e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-22T01:19:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-22T23:43:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor optimization in SPU analyser\n\nReduce vector copy/allocation","sha":"7ea04d5d76ee16ffa560096a11f6fb2e9dbcfe16"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-03-23T22:09:41Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-24T14:29:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: Add cellNetAoi module","sha":"32ae7e466ca6dd3c6c26bbeb92df602f995c50b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-03-24T08:54:44Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-24T14:29:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: Add some sceNpMatchingInt functions","sha":"d6bf18eabc337553108810d93f753a114b121d9f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-03-24T08:29:49Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-24T16:16:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: Add cellDtcpIpUtility module","sha":"6c40b9f3e0ccf4047cb2b28ef17f152ab64358f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-03-24T13:09:08Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-24T16:16:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: Add cellPesmUtility module","sha":"581b205f7319de90846e14477b5da529eb1fa62b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-03-24T15:04:22Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-24T16:16:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: Add cellVideoPlayerUtility module","sha":"956d039415dbb863e0bb2bf2a6d15f71b9681782"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-03-26T18:04:43Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-26T20:19:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: Add sceNpEulaAbort function","sha":"a9eb3218145235ccabd3556413620127c0e0c19e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-25T18:31:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-27T17:33:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"New SPU interpreter (SPU fast)\n\nUse LLVM to build SPU interpreter.\nSimplify interpreter loop.","sha":"71b88cdc827f8cd8c0b6c87f18d14573917c3ef9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-03-25T19:32:03Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-03-27T21:41:44Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"hle: Add libad_async and libad_core modules","sha":"a254a203bb9d9c41e21e755287389de4043a2206"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-28T15:22:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-29T14:00:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: remove wrong dead code","sha":"d77fed6105c9e90b6105e590d1540f035198f951"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-29T22:14:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-29T22:36:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: implement get_vrs<>() adaptor\n\nMake use of structured bindings","sha":"7e0b941e9f1e838a89b52fcd17da9f56e733febb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-29T13:35:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-29T22:36:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use LLVM 9\n\nUse new add/sub with saturation intrinsics","sha":"d873802b9c7253239c291f0589559eaf7ca3db64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-03-29T21:46:57Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-30T20:52:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: Add cellFontInitLibraryFreeType function","sha":"0e9313d2dfd600ae1d540eb6fe956608e55ba9af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-03-29T22:21:17Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-30T20:52:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: Add FT_Get_X11_Font_Format function","sha":"f369aeab7a66db69b24de901f8cc1e14c0518385"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-03-29T23:28:24Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-30T20:52:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: Add cellSysmoduleUnloadModuleInternal and cellSysmoduleLoadModuleInternal functions","sha":"1916cc16912d09d2978853f84993b6aa321f03bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-03-24T19:59:18Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-30T21:55:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: Fix cellSysutilAvcExt module\n\nAnd add cellSysutilAvcExtSetChatMode and cellSysutilAvcExtSetChatGroup\nfunctions","sha":"f15eb88f59fbd872a0dd58fedcc8add5f16b6b68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-11T06:25:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T11:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix stack memory view on the debugger\n\nthe debugger uses super ptr which was unmapped for stack.","sha":"6502d933df598f01e4938d241b454efcff95b2e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-11T07:30:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T11:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor optimizations in cellPad\n\n- Dont bother with shared_ptr since all pad_t management is going under the pad mutex.\n\n- Change m_pads type into std::array since its size is known","sha":"47ca1b1dda06c59c65b8380a0d0a0c82bd6047cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-11T13:34:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T11:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellPadGetInfo port status returned\n\nASSIGN_CHANGES flag is not returned in this func.","sha":"d6025c676474cc7fc410b3f687b7cd37013377d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-11T19:31:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T11:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve error checking of cellVdecOpen\n\nThose are the initial argument checks done by the firmware","sha":"8eb59271a520888aa1eaae1eb90e7b8ff81b47c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-12T05:20:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T11:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove handle in cellVdecClose","sha":"f2bbae9db4b5661bf17ae6ddf92e0caa163476a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-12T15:45:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T11:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix page fault area range check\n\nRange end check was bugged (always true), also rewrite it so vm::get would be called only once","sha":"16f86b24584774e09470b535fb926a4fc3814033"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-13T07:14:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T11:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellVdecGetPicItem element popping behaviour","sha":"1ed2055ec1789bca26bd9c8c5953405ab25d86c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-13T10:12:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T11:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_process_exit2 when SPUs are at av handler","sha":"a3f65084df670d38bfd516acf789bb7acd9abfc0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-14T16:30:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T11:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Use relaxed store on fifo ctrl registers","sha":"801e6114b602bc84646c02cb94fd66220c51eb1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-15T17:06:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T11:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Improve vblank accuracy","sha":"8185ef7610f2eb7f154ffa89a2eda1ede3dfcf29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-23T07:08:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T11:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_timer_usleep specifically with 0 sleep time\n\nRemove context switch, replace it with host yield() for giving some cpu time for SPUs ans RSX","sha":"90490f775df07628eba478f0de62b36434aa657a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-26T19:08:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T11:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix timer state after event queue was destroyed\n\n* Hw tests show state is unaffected by external destruction of the event queue\n\n* Minor race regarding state check fixed (can result in an undestroyable state)","sha":"3c0564c9b72040d0af062c95a6b522aa5bc4a09c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-27T17:15:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T11:57:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement sys_vm_append/return_memory","sha":"182054b8af8000e76617063efe9a13b4c92cdc89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16121204?v=4","date":"2019-03-31T16:43:24Z","email":"jocker@lepouf.info","login":"Jocker666z","name":"Jocker666z"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-03-31T19:43:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"add qtdeclarative5-dev fo debian/ubuntu\n\nif not installed, cmake fail on -> '/usr/lib/x86_64-linux-gnu/cmake/Qt5Qml/Qt5QmlConfig.cmake'","sha":"2119566da711f6b031fa4d62a3aab1bc614584d8"}
+{"author":{"avatar":null,"date":"2019-04-01T10:14:22Z","email":"linkid26@gmail.com","login":null,"name":"Violette Jansson"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-01T10:46:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"updated domain name for vulkan mirror\n\nobk.ee expired the new domain is nkmk.ch, renewing a .ee domain is expensive and annoying so i moved to a new tld.\r\nthis .ch domain will not expire for around 3 years normally.","sha":"3bfe921a7a12b9b0b89a906577536da4524960ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5672538?v=4","date":"2019-04-01T22:41:32Z","email":"theracermaster@gmail.com","login":"al3xtjames","name":"Alex James"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-02T00:16:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix macOS compilation\n\nThis is needed for GL/glew.h to be found.","sha":"d7ad991b7ef7e73c36328c289d10ba9af82df55e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-04-05T06:45:49Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-04-05T16:28:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"hle: Add some missing functions\n\n0xBA50BC23 => cellCelpEncOpenExt\n0x1AC58D11 => cellHttpFlushCache\n0xA39FE9DC => cellHttpEndCache\n0xB4FA3111 => cellHttpInitCache\n0x4A18A89E => sceNpMatchingSetRoomInfoNoLimit\n0xB020684E => sceNpMatchingGetRoomInfoNoLimit","sha":"8dbf2638e2d7b0613444da987e5a072742e4db29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-04-06T03:17:54Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-06T13:52:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Correct travis deploy behavior (bug).\ncd returns an error code, thus overwriting '0'","sha":"7625f7df11323e14fcbe9727c338c74c03f384eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-04-05T18:14:01Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-07T20:31:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: Add more missing functions","sha":"f30af3ccd249d57358e1ef62c0375a8dd79e6a25"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-25T13:21:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-09T10:40:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Blit engine clipping fixes\n- Do not round up sub-pixel offsets, round down instead\n- Do not allow incomplete sources for hw blit transfer\n- Reimplement src clipping (slice_h)\n- Check 'area' of incoming texels and correct for them before RTT lookup/transfer\n- Filter out incomplete targets when performing RTT lookup (1 texel or less contribution)","sha":"443fde760f2b6744e5ffa3e35e02d14fe4d188bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-26T17:59:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-09T10:40:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Tighten format checks in cache hit tests","sha":"b7470cfc1a369739f83c5bf67ad84755f8804edf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-29T19:04:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-09T10:40:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Preliminary support for format conversions using typeless resolve","sha":"366e4c24228c61a3997397cafce711c3b3c3e6ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-02T12:16:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-09T10:40:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement copy-to-buffer and copy-from-buffer for depth_stencil\nformats\n- Allows D24S8 and D32S8 transport via typeless channels\n- Allows uploading and downloading D24S8 data easily\n- TODO: Implement optional byteswapping to fix flushed readbacks with\nthe same method","sha":"0f7af391d748508ee0e5afb41fdcdc280981424b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-03-30T11:33:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-09T10:40:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improvements to texture scanning\n- Removes CPU-only transforms that broke GPU-side code.\n -- Channels in GPU compute are laid out in cell-order, but CPU was uploading in favorable order and compensating with swizzles.\n -- This leads to 2 different layouts depending on the location of the data (CPU vs GPU)\n- Implement R8G8_R8B8 interleaved format decode\n- General improvements","sha":"32490005114397b843b1dffdbe498e7053fc52f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-01T15:45:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-09T10:40:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix temporary subresource caching behaviour\n- Do not cache if a gathered subresource contains a bound RTT\n- Change op to dynamic copy if parent is still bound","sha":"e4e86455f2119f6a7d0fcb3a9f066d0d03d688e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-03T08:47:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-09T10:40:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Register a few more missing formats for conversion","sha":"cc3809fbfe063f43a641f8e78399601ea1b3f45b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-03T09:51:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-09T10:40:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement RGB655 decode","sha":"0a604e39f1cb2cda8a3204e11a8341ddb4f5f072"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-03T17:48:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-09T10:40:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove some old restrictions affecting memory persistence","sha":"f04a0a2bb64c653950050b3a900a54917f306cba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-05T11:39:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-09T10:40:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixups for data cast operations via typeless transfer","sha":"a5ed30a8c0292f58a03f9bd7b0dc3a7865f6abe4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-06T14:59:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-09T10:40:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixups for swizzled texture scanning\n- Revert to using block metrics, but with optional per-channel decode\nstage for the final transfer. Much cleaner than hacking in the width to\nbe in channels instead of blocks.","sha":"a4495c35b734ef9d9421d469ada3eeb191044059"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-06T17:29:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-09T10:40:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Dynamic heap management to potentially fix ring buffer overflows\n- Allows checking one heap type at a time, on demand\n- Should avoid OOM situations unless inside an uninterruptible block","sha":"12dc3c18723788024fd62a8dd6dd0f24d830d479"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-02T10:12:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-10T10:58:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/SPU transactions: ease cache line interference (TSX path)\n\nTouch memory on the same memory page, but different cache lines.","sha":"3354f068fcde2b19f2e15592ef1ae958ad68ec90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-07T09:58:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-10T10:58:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement vfs::host::rename\n\nWith spurious access error workaround","sha":"9736773c04c319f53cf8963f5b4354ef5f534814"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-07T20:46:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-10T10:58:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify fs::file::get_handle\n\nVia fs::file_base::get_native_handle method","sha":"a54d9c527fd047ecfce7d01ac2808179d0896ee1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-07T20:55:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-10T10:58:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add fs::file::set_delete","sha":"0736fc8b28ec7f4113392025b8b771353ccfb688"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-07T21:53:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-10T10:58:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement vfs::host::unlink\n\nEmulate POSIX behaviour in sys_fs_unlink.\nThis should allow to delete opened files transparently on Windows.","sha":"40142420c17f9cf796e00922109a495a761dbea7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-04-09T20:13:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-04-10T14:37:37Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt: add version update hint to game list","sha":"ec2d8821999db81f4da975b00c632aa69226584e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-04-10T17:34:44Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-10T19:15:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: Add some more functions","sha":"1d947daa81cf6de96b15cb5c27003a1c6f8b6713"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26231569?v=4","date":"2017-12-31T14:38:02Z","email":"Inviuz@users.noreply.github.com","login":"Inviuz","name":"Inviuz"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-10T20:25:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Initial sys_overlay","sha":"52a12185a0a6ce94cf60c0b477752360bc66756e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-04-11T12:23:49Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T13:29:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix timespec for MSVC","sha":"af86d1d77a4521fe27f6ab1c134eb88f65c1e6f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-17T17:51:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T14:47:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Check start status in sys_prx_start/stop_module","sha":"d555eeb0f44fb61bb5404e20fc4ab683bbe2d6a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-18T19:29:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T14:47:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix default PPU nj status\n\nTODO: Support  it...","sha":"aa44ef1f44d6e566f272e182e8261e5b2901692e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-19T08:20:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T14:47:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu interpreter: Improve FPCC field handling","sha":"e21504d52ddfedb7a3c0cc5f5130e7eecfe9c19d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-19T20:05:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T14:47:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu Fast/Precise: Fix SIMD instructions VSUM2SWS, VPKSWSS, VPKSHUS, VPKSHSS\n\nAlso rewrite VPKSHUS for speed.","sha":"a9014a8cac3eb563ef0f4378bbd3f5e769fbf2e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-20T15:20:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T14:47:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement fallback for PPU LLVM\n\nThis matches with interpreter implementation, fixing unregistered functions in lost cases","sha":"f028737db87418f8c8dd5ffa0f215282b8fae894"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-21T19:32:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T14:47:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU LLVM: Fix STSWI and LSWI","sha":"3304e3b0b77db6c0c71b39695ffd5077414c0b18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-22T13:04:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T14:47:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make sure to update cia when calling in unknown hle table func access","sha":"1c462abc37240886a2f88bcc7081166f1f92f576"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-22T07:58:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T14:47:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Prefetch byteswapped opcodes in ppu interpreter","sha":"b307aff9eb093d3e21dbc30a672b92401f1caafb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-29T13:49:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T14:47:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Implement BISLED\n\nDFCMGT instruction removed, it was wrong to add to begin with\n\nASMJIT: Fix compilation of double compare instructions, move exception to runtime instead of compiletime!\nJarves confirmed that he implemented this instruction because of that bug with asmjit only, affected God Of War 3","sha":"969af86eba231a59717e237ee497bede54915fe0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-30T10:59:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T14:47:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Fix CFLTU\n\nClamp properly result from both sides!\n\nTODO: Figure out whats different CreateFPToUi has from CFLTU and why it fails here.","sha":"eba8e2284bb76792ee5bcea249a91d51f99b383f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-06T20:57:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T14:47:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Fix branch to self at start of block state check","sha":"8da78c098cbf592bada65a77ea9d1abcf84453fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8276932?v=4","date":"2018-04-06T20:57:33Z","email":"smartychrisje@hotmail.com","login":"TGEnigma","name":"TGEnigma"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T15:14:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add _sys_ppu_thread_create and sys_ppu_thread_rename error checks","sha":"38cc92ec459ffae037627393f3165cbd807384ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T15:57:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T15:57:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Travis: disable gcc build\n\nTemporary optimization","sha":"c34821ded24666869e538e6a028d461c6255c6fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T18:03:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-11T18:20:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix cellVdecOpen\n\nUse pseudo-address in sys_ppu_thread_create calls","sha":"f40320bcae0e5dc7bd5380fe511339424cd32420"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-12T09:24:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-12T09:24:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_unlink: add CELL_EISDIR check","sha":"0d415407c7b62ac1541fb5284e53d62b13683972"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-11T14:16:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-12T12:36:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve texture sourcing and clipping when reverse scanning is enabled\n- When reverse scanning, offsets are inverted and offset value of 0 is logically equivalent to an offset of -1\n- Add an explicit message if clipping happens to avoid silent errors/bugs","sha":"df3b46a6116b30b0fe16a98be6fcc2bcd7f40183"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-12T19:20:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-12T19:20:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM","sha":"fe593de6d7b7f91a34e9f68a557e163d32851831"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-13T10:46:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-13T19:56:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs::rename, use renameat2 on Linux","sha":"d52df9352c320f6e76591a0bd737984fc200b06f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-13T17:36:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-13T19:56:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"mutex.h: fix warning (unary minus unsigned)","sha":"e064b920586a4a192ac47673fbd24e7632f252da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-13T19:36:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-13T19:56:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: write cache before compiling","sha":"8deb20e92859a44facf48a213745e3476d9f9c8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-14T12:10:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-14T12:10:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: move vzeroupper a bit","sha":"c1edae73c55278ced0ba6ddd314aa582ee1b078f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-14T12:11:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-14T15:03:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Increase max stack size to 8 MB on Windows\n\nDefault is 1 MB and it could cause problems in compiling heavy SPU LLVM functions.","sha":"b97a1aeca29bb898071700a89b21187edc761a67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-14T13:18:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-14T15:03:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: avoid AVX in verification (experimental)","sha":"136fc8cfe33ab04a3302af8eb3adb5600838c8ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19982663?v=4","date":"2019-04-13T21:42:08Z","email":"jordyvieira@hotmail.com","login":"vieiraa","name":"Jordy Vieira"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-14T16:15:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Change EnhanceComboBox to optionally sort the settings list before adding it to the combo box","sha":"bad0415f056e2cbcb7710e88acabcd6adb64a034"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19982663?v=4","date":"2019-04-14T13:37:04Z","email":"jordyvieira@hotmail.com","login":"vieiraa","name":"Jordy Vieira"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-14T16:15:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Ignore sorting on ranged combobox and log message","sha":"f99577114327d59d583119b5ef8c2b30f7cd0f4c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-01-11T16:54:10Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-16T15:39:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Decrease severity of sys_net_bnet_close","sha":"baf42430d68d3f6798465794cfd886c31c4672f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-04-16T13:39:59Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-16T15:39:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Set stack limit properly","sha":"8f333117eb8d93450cae28c09b8df62e4cc9be7d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-04-01T21:19:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-04-16T19:39:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add more filters to firmware installation file dialogs","sha":"092cfef060c01b2ccce5b66234bdd1dc271007b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-02-16T13:05:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-04-16T20:13:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"implement get_firmware_version\n\nadd firmware version to the first line in the log","sha":"b929c13c4546b17b1ec6391a6bada6ebc8548c8b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-03-25T23:38:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-04-16T20:47:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"libusb VS stuff","sha":"1152317b477d7d97d40685a953e40440180b6b85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-15T12:52:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-16T20:49:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU transactions: add SSE path if AVX is not available\n\nThis handles hypothetical situation when AVX is disabled system-wise.\nAlso refactored register use, to match Windows path with Linux path.\nThis reduces read set a little at the cost of stack use.","sha":"9060177dbd45bf3f189c07ab02d9b857b10e7725"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-16T20:16:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-16T20:49:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert disabling AVX path in SPU verification.\n\nIt was experimental and builds for tests are available in history.","sha":"52c589ed3d6250b1b2a96c1386f7c73193a519f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-16T20:17:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-16T20:49:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix static_hle log channel definition","sha":"7865982208863c5209b8cf853e0fe37bb9ca24f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-18T18:43:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-18T19:23:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"misc: Lower default perf overlay detail\n\nBecause RSX Guest utilization confuses people and is only meaningful for debugging.","sha":"777a99d01b25e6373b06cb26d2069658a1b67eae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-31T15:47:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-19T22:04:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Write vblank semahpre, minor semaphore acquire optimization","sha":"f25587d24ca674b445f0552c33e1815cf4430c6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-03-31T15:56:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-19T22:04:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove reader_lock executed in every instruction by RSX\n\nUse optimistic double check instead, use one load instruction for the check to be atomic\n\n+ Read emu status once every FIFO iteration","sha":"888cb9d6738d8fdbdcb67cd5ffa80fac9b536560"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-01T12:30:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-19T22:04:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Put missing check_state() in some places\n\nFixes a few verification failures while closing the emulator with HLE liblv2","sha":"2b4bc588dcdd6d3fba04b0a7c51f35a2fa2b4402"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-01T16:53:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-19T22:04:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement initial arguments error checking for cellSaveData","sha":"9497270da592dfbfa22c64478c32842f9f077890"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-02T20:57:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-19T22:04:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve scheduler control for cellSaveData\n\nTODO: There are probably more spots where we should yield.\nA little more at the start because PacketRead is called twice.\nDont use sys_timer_usleep because it will just call this_thread::yield() repeatedly.","sha":"ff11d9a3bd23128ec908b1febe7318f60aa4bb8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-03T09:16:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-19T22:04:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_spu group ID","sha":"67f098627a1b20c6164f56259ff1d37649438678"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-03T13:42:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-19T22:04:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Fix race on clearing native_ui vs emu_requested flag","sha":"6f76e341048928fa16690ae3b6dbaecee0fdf822"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-04T10:27:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-19T22:04:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Handle a few more cellSaveData errors\n\n* Check directory existence if setParam is NULL (dont create directory)\n* Fix mask for reCreateMode\n* Check a few setParam fields including reserved buffers.\n* Fix sizeKb when the dir is empty except from PARAM.SFO\n* Fix error checking when CELL_SAVEDATA_RECREATE_YES is specified but setParam is NULL (Doesnt do anything, simply errors)","sha":"9446bd2d3ffb8ae908846087742a4eae44f9597c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-05T07:56:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-19T22:04:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Reschedule in cellMsgDialogOpen2","sha":"1e9d3346d1d69504216610742cf5c78e5f262ac5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-05T12:02:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-19T22:04:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellSaveDataListAutoSave/Load unk flags","sha":"ae5a4b697e2ef3f8db233a0f34b6b6bca6c89fc4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-20T18:05:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-04-20T19:43:58Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellSaveData: Add missing SDK version check for setParam->reserved2 check","sha":"450e2c9a0e6cb9587440c18bb69f668c62857b62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-20T19:25:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-04-20T19:43:58Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Print SPU Group ID on the debugger","sha":"3a5f4ed7572d93ce0397b9695e3055fba09e0e59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-04-20T21:41:25Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-04-20T22:17:13Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellPad: Update vendor and product IDs\n\n- Used IDs were not from the Guitar Hero instruments but in fact from the Rock Band ones. Sets the correct Guitar Hero IDs and adds the Rock Band ones on comments. TODO: Allow selecting the specific devices on the PAD Settings.\n- Adds DJ Hero Turntable VID/PID.\n- Adds Dance Dance Revolution Mat VID/PID.","sha":"a24ede4f40ec177c68ef26e7aadaea45012825df"}
+{"author":{"avatar":null,"date":"2019-04-20T23:41:20Z","email":"49168108+drysalter@users.noreply.github.com","login":null,"name":"drysalter"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-04-20T23:41:20Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Add Envy and Skyline themes (#5789)","sha":"258df80bf61ca1a27b3ae2fd92b8dbbf5d8d2354"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-02-24T15:03:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-04-24T19:48:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: go out of fullsceen if exit game pop up is triggered","sha":"bb0609372d21e1ee916f6da274b9ff889aa433c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-04-01T22:54:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-04-24T19:48:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: force always on top to fix dialogs appearing behind the game window","sha":"cb5dd1353b1c4a3f1d53deb69899056de53c3049"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-04-01T22:55:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-04-24T19:48:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: also spawn exit game dialog if rpcs3 is closed (e.g. by accident)","sha":"467ef2afca4f7f368d8da8f45e59c2bfdfb51d76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-17T00:00:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:55:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM DSL refactoring\n\nProperly forward value categories in expression structs.\nSimplify SFINAE tests (is_llvm_expr, llvm_common_t) in global operators.\nAdd llvm_const_int and remove llvm_add_const, llvm_sub_const, etc.\nAdd llvm_ord and llvm_uno for FP comparison via >=< operators.\nReplace cpu_translator::fcmp with fcmp_ord and fcmp_uno.","sha":"dc9118ef503d1fe426f9b0b32aea7941060541a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-17T17:58:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:55:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM DSL: fix pointer type traits\n\nClear and match 'void' type","sha":"3925cb59ac6b3ea4703a582214c29c606959c9d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-18T14:18:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:55:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM DSL: rewrite bitcast, zext, sext, trunc, select, min, max ops\n\nAre made composable in expressions similar to arithmetic ops.\nImplement noncast in addition to bitcast (no-op case).\nImplement bitcast constant folding.\nFixed some misuse of sext<>.","sha":"524aac75ed0b6c7405134106a2ad8911d16c70ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-19T10:27:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:55:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove cpu_translator::scarry, cpu_translator::merge","sha":"42448cf3e51d6c8abca6bcae0e14f869f5dad9d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-19T11:28:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:55:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite cpu_translator::rol, add fshl and fshr\n\nUse new funnel shift intrinsics","sha":"ac473eb400acd9c6730ae8954bcd2cd4473cb005"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-22T12:32:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:55:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM DSL: rewrite add_sat and sub_sat\n\nSimplify constant folding logic","sha":"2eac59f59a49fae67b94371ed6574646a191a388"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-22T19:51:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:55:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: minor bitcast cleanup\n\nRemove redundant explicit constand propagation in some instructions.","sha":"b7b93eae13ff372f5fb42c81d80c501f696c8e07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-23T12:07:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:55:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM DSL: rewrite extract and insert","sha":"c83e65f29efaf9ff58a2ccb0807b7cacf9eb92d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-23T17:08:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:55:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM DSL: rewrite splat, fsplat, vsplat\n\nAdd llvm_const_float and llvm_splat templates.","sha":"b02503963ed03b62f608ef67ff1e7f0d4b039902"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T13:05:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:55:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM DSL: rewrite zshuffle, shuffle2, build\n\nAdd llvm_const_vector template.","sha":"3e0b45719da886b10f9dc380980225fdbcae09f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T14:48:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:55:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: add get_vrs<> template","sha":"dd9bd1338bc21bfa36ea75194cbdc3e3cfd25d9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T17:09:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:55:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: add match_vr<> template\n\nReturns reg value only if type is compatible, avoiding bitcast.","sha":"8754bbd4448807e7f71b1467a5fb484c99814a87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:53:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-24T20:55:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM DSL: implement expression matching (preview)\n\nOnly literal match for binary ops implemented.","sha":"aca61fdcf9031c2aaf7c6f995a7940e4075e9797"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-25T00:33:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-25T00:33:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM DSL: expression matching (preview 2)\n\nImplement more instructions.","sha":"2ade3c594ca25c2faed007212c55d9b22bfe64d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-12T13:25:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T13:23:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement strict clamp16 operation needed for NVIDIA cards","sha":"ee319f7c130912c0248c77c2daec13a084d56405"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-12T21:25:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T13:23:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Use native half float types if available\n- Emulating f16 with f32 is not ideal and requires a lot of value clamping\n- Using native data type can significantly improve performance and accuracy\n- With openGL, check for the compatible extensions NV_gpu_shader5 and\nAMD_gpu_shader_half_float\n- With Vulkan, enable this functionality in the deviceFeatures if\napplicable. (VK_KHR_shader_float16_int8 extension)\n- Temporarily disable hw fp16 for vulkan","sha":"a668560c6820584dbb4056cf2f3151c2e932c166"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-13T10:20:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T13:23:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Shader decompiler cleanup and improvements\n- Improve support for float16_t by minimizing mixed inputs to functions\n(ambiguous overloads)\n- Minimize amount of downcasts in code by using opcode flags\n- Re-enable float16_t support for vulkan","sha":"06a85f00d1ff522e51564a399ba88f08ac136368"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-13T14:58:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T13:23:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Skip feature check if extension is not supported","sha":"7ad1646c2caaa31c65f3b6b5bf1a0d10c207f65f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-15T17:39:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T13:23:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve accuracy of shadow compare Ops when non-integer depth formats are used\n- The fixed-point D24S8 format does special Z clamping during compare which matches PS3 behaviour\n- D32S8 is a floating point format and comparison with Dref > 1 always fails causing black edges/borders","sha":"463b1b220d1d87fd7d154a7dc386a4630abf24d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-16T10:50:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T13:23:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Compensate for nvidia's low precision attribute interpolation\n- The hw generates inaccurate values when doing perspective-correct\n  interpolation of vertex output attributes and makes the comparison (a ==\n  b) fail even when they are a fixed constant value.\n- Increase equality tolerance when doing comparisons in fragment\n  shaders for NV cards only to work around this issue.\n- Teepo fix","sha":"60f3059d224d9383978fc37033883ed8e224378e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-16T18:57:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T13:23:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Proper workaround for broken DIVSQ instruction on realhw\n- While mul(0, nan) = nan and 0 / 0 = nan, 0 / sqrt(0) = 0 because of hw\ngremlins. normalize(0) is also nan so this behaviour does not work\naround that particular case either which makes it even more baffling.","sha":"abe7188acfac6eb54ddb2f5317ec415a7701d033"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-20T10:02:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T13:23:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fragment decompiler fixups\n- Properly test for NaN and Inf when clamping down to fp16\n- Optimize divsq a bit; mix(vec, vec, bvec) emits OpSelect which is what\nwe want here, instead of component-wise selection which is much slower.","sha":"f12bd8068cfaa6979136d74ec2671ee7256ffa5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-20T10:30:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T13:23:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Simplify use of some mixed input functions using OPFLAGS to avoid implicit conversions","sha":"32396ba36671ee1ad9279f3216d085b49baf3ad3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-20T11:57:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T13:23:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"\"rsx: Ignore argument sign for SQRT operations\"","sha":"4cd1c2572923ef26f0202233820c0f4b975587ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-23T14:53:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T13:23:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fragment shader decompiler cleanup\nTODO: Investigate the _s input modifier behaviour further, in case it can avoid generating zeroes from a MAD instruction.\nx = MAD(+ve, -ve, -ve) with _s input modifier in BFBC expects result to be Non-zero","sha":"3cbccdd760be60b94774e2868d4740d3ac68fba8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-24T15:12:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T13:23:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix VP writes to CC with a MOV instruction\n- When moving to CC, the operation has VEC flag disabled and also temp\nregs disabled. Looks to be the catch-all ELSE in the selection logic.","sha":"243df3836038f35ab94de1e3ed7d08d2ca6e82d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-04-19T12:05:47Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-25T17:20:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Print OS info to log\n\nCredit to @maximilian578 for help","sha":"be6d9af1abef5dd2d9a4bd38c56facf0440358de"}
+{"author":{"avatar":null,"date":"2019-04-29T19:02:50Z","email":"49168108+drysalter@users.noreply.github.com","login":null,"name":"drysalter"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-04-29T19:02:50Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Touch-ups to Skyline and Envy (#5884)\n\n* Touch-ups to Skyline and Envy\r\n\r\n* Match disabled colors on sliders, checkboxes and comboboxes\r\n\r\n* Align header titles with section contents\r\n\r\n* Make slider grooves clickable, add opacity to tooltips\r\n\r\n* Adjust opacity, clean some code\r\n\r\n* Correct slider margins, add hover effect to game table on Nightfall","sha":"468e1e90c8967119288b9584f913d00243745f2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-16T11:59:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-29T20:04:16Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix PPU Breakpoints and ppu_check_toc","sha":"ea1c9a2e1705d019b9d2b41ab094f7c45f31f9b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-16T13:33:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-29T20:04:16Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix Unregistered HLE function access","sha":"3bd29b8baca63eaceb72e15edbc9f79e0bda0502"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-04-26T11:25:27Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-29T21:31:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"DS3 Linux fix","sha":"301dd828198638fabdd862d37889ecc4c3556341"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/306953?v=4","date":"2019-04-30T10:01:12Z","email":"Johndeep@users.noreply.github.com","login":"Johndeep","name":"Deep Sleep"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-30T11:33:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update to README.md due to dependency\n\nAdd qtbase5-private-dev for Debian as dependency to the README.md since it is needed, probably due to qt5.11.3+.","sha":"c24b74398f269d9f34946099f691ea0eeb852497"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-25T17:18:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-30T11:33:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM DSL: expression matching (alpha)\n\nImplement remaining instructions.\nImplement match_expr method.\nImplement helper methods.","sha":"716737ecf23b0642c994c87dc84ad6cb425e0d77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-28T00:36:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-30T11:33:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU analyser: add spu_iflag\n\nRegister information about register accesses.","sha":"e09c6ea4b4fcbb4ff685f5393a3c7f48bf27c6d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-25T10:43:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-30T21:37:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: improve codegen in loops\n\nUse a trick in check_state to improve LICM pass.","sha":"1294e0d189441e75e0f5731851ce407cefcb4199"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-30T21:06:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-04-30T21:37:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: move reg origin search to analyser\n\nRefactor SPU analyser (block_info struct).\nFill register use info (currently unused).","sha":"1bc5e2750766f09150e4373d2671749ecebe06a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T14:07:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-01T12:36:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Remove workaround for AMD driver bug fixed in driver 19.4.3","sha":"f56a6548b0a7a520301372f8e456c7174b514a68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-25T14:25:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-01T12:36:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Ignore transfer offsets when wrapping behaviour is expected","sha":"6feffe6ff63b78e5403851007b03dc3b87ee8e45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-27T14:11:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-01T12:36:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix broken texture cache search when flipping","sha":"4e3ec162e2a00d77796439eb7365c3571c5235c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-29T11:37:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-01T12:36:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix section base offset calculation for blit_dst targets which affects confirmed memory range\n- Fixes flushes only writing partially to target memory","sha":"ec9aa740082ce9a047a81044fba7b3496c1a7dfa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-29T11:37:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-01T12:36:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: Minor cleanup","sha":"63f9b8e0c64bfbc1b6858ee6c9e241c520c42520"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-29T15:41:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-01T12:36:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Bounds check on local resource for atlas merge.\n- Local resources can also have padded pitch dimensions and false-positives on range overlap tests","sha":"48cb265c2c27ca5d15ad8075c52ac0f85aceaf69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-29T15:56:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-01T12:36:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Ignore stencil clear flag if the stencil write mask is disabled","sha":"1d5c52f4769aa56983f1e71f07ae291805e7e6d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-04-29T19:29:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-01T12:36:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Silence some diagnostics unless compiled with debugging options","sha":"6b7cd458e3956d381f92eeef595336f62ad7c227"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-05-02T08:20:34Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-02T10:39:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Put DS3/DS4 instructions to Wiki instead","sha":"bc42719c480eb1587ba55819dd20860a0032db74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-01T11:56:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-02T10:39:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fix excessive cache size regression","sha":"a4c4ee9cb21bb590bb8d12aee3050f009a2c1cd0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-01T11:58:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-02T10:39:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: minor analyser cleanup","sha":"69d2ea35b936aa31d7c5aa132f90258a06ecb18e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-01T12:31:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-02T10:39:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: fix perf regression\n\nBug in the analyser was created recently in #5882.","sha":"d48dc29e55ba24a35e3c9357fa97cba484f1be1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-02T10:36:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-02T10:39:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: fix xfloat regression\n\nIt was an old bug with possible hidden use of deleted instructions.","sha":"2b4da187097715b1c6c6a3bab9541ae4430904b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-02T14:59:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-02T15:00:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fix minor UB in STQD/LQD instructions","sha":"15bd3b8724bcec789f794ec3b00efd6cfd475bb8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-02T16:25:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-02T16:32:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU analyser: internal spu_itype optimization\n\nUse only 1 byte for instruction type.\nFlags are transformed into range comparisons.","sha":"54dc617f391f2a028e2c8efbab963334ae2d85fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-02T20:29:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-02T20:29:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU analyser: fix excessive workload list size\n\nTypo grade; regression","sha":"6c34d7104e1e8c3abcdac3da7443cb6a3ab071ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-03T11:18:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-03T11:18:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU analyser: minor logic fix and cleanup\n\nDon't fill any chunk info for now (design mistake).","sha":"4bd022f778d18a344b6591bdfbaf6002788bc423"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-04T15:29:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-04T15:29:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Analyser: fix reg origin regression\n\nPropagate phi instead of claiming new values","sha":"45ce8db6cb20494f2da3a7c66e7070d62aec5f61"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-04T15:33:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-04T15:33:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU analyser: remove use_ra from HBR\n\nSince this is a hint instruction, we don't really use reg value here.","sha":"ba1ec1d5d67a3e8a953491f80593153ee54faa37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-04T16:35:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-04T16:35:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: skip some unused analyser steps\n\nMay improve performance","sha":"a703460fc6837c4cd4799fa133955c939b5b974c"}
+{"author":{"avatar":null,"date":"2019-05-04T20:56:55Z","email":"49168108+drysalter@users.noreply.github.com","login":null,"name":"drysalter"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-04T20:56:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Minor Visual Fixes (#5899)\n\n* Increase minimum size of User Manager window so QPushButtons aren't squeezed together\r\n* Add spacing to the links in the About dialog to match all other buttons in the GUI\r\n* Make the links in the About dialog work on Linux\r\n* Turn the tooltip on \"Config\" in toolbar into an imperative like the rest of them","sha":"f246a8666abce466df810bcb73c4125db92ff080"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-04T13:56:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-05T10:37:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Allow some drivers to bypass window polling if not needed","sha":"2bec304ccab1877aad5c25283291a4ac6f007af8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-05T10:04:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-05T10:37:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: undo an accidental deletion","sha":"9c346c92f301eaec0b55700961bcadf8a65c7678"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-06T21:32:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-05T14:29:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add some batch operations","sha":"8a4778ba8c2d7037d6ad67bfe969d8ec24df1d73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-06T22:00:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-05T14:29:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Emu: msg_dialog_frame fixes","sha":"b0a24665e5e2d7483582d611c1727a1da5970d4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-01-06T22:30:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-05T14:29:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Emu/Qt: Fix Boot Recent when using BootGame(add_only=true)","sha":"b639584acc82b46e1ccbe92483f6d26fbe521287"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-05T09:16:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-05T14:29:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Emu: msg_dialog_frame fixup: don't reject on Close to prevent Emu.Stop()","sha":"c1e245ae7353dbcab203902ca02bd4b8c9f80522"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-05T12:48:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-05T14:29:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: show all unique game data entries","sha":"f480ba13c05b421e1632db08297dd4142300f23b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-04T16:13:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-06T18:00:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: smoother compat circles in list mode","sha":"ea0f04e130c2a6ef08f2e4b7997b6c9bd50d236f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-04T16:15:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-06T18:00:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: smoother game icons in list mode","sha":"caa6895310e224df841e3b2e177c1d5e235f418e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-04T17:04:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-06T18:00:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: smoother game grid icons","sha":"767eaaa82ad34fcb35b6ebb3469dfae75d982e83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-04T18:42:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-06T18:00:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: center compat circles","sha":"e883f4f880a44d11f5561c4690c9f9cdc8930533"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-04T19:17:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-06T18:00:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: smoother custom config icons","sha":"87d493fe1b9a9568893b1c8527927f017192cd18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-02-12T22:03:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-06T19:06:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"travis: update mac build","sha":"9aa9cbf1d8ff567c0ff1a0a49603364ec9ea92b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2019-05-05T06:30:24Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-06T20:00:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: Double dpad repeat rate","sha":"fd2bc95a7bb244bcaf2531314e54d035395ab2a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-05T12:48:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-06T20:00:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: add separate timestamp for the start of the d-pad interval","sha":"514159072968f9f60d7a4d6a8376a099d12f5e1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-05-02T12:16:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-07T05:58:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix sys_rwlock_runlock on waiting readers\n\nreaders can wait on the sleep queue if a writer lock has been blocked before it, in this case after runlock: writer should acquire the lock but the r's sleep queue is still not empty!","sha":"ca08418dc1a02135c3564b34764f364a4130dc03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-05-02T14:49:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-07T05:58:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix sys_rwlock_wlock timedout event\n\nIf the rwlock is currently acquired by a writer signaling readers is wrong and will lead to EPERM for wunlock!\nOnly signal blocked readers if the rwlock is currently acquired by readers","sha":"4e2650af91c381a8090a770d13a21914dfde6d21"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-05-03T07:15:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-07T05:58:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Return ESRCH if ppu thread ID was not found in sys_cond_signal_to","sha":"13d8e33d9ae3ea4ccf0e16e24d5fbfaccd36e918"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/50351074?v=4","date":"2019-05-07T04:57:54Z","email":"50351074+Exfiltratior@users.noreply.github.com","login":"Exfiltratior","name":"Exfiltratior"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-07T06:39:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"correct small mistake","sha":"f1ff75d815b692876e8d809f98e372ea2ea05113"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-07T06:02:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-07T06:39:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"typo fix\n\n- Minor argument change requested by Megamouse","sha":"feb77793dfccc404b1f683da233157ebd69f9173"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-05-08T14:44:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-08T20:48:39Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix 3d swizzled texture to linear conversation","sha":"7ead021aa7a0ee014d345d8dc98d47f9a3b05b4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-09T19:31:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-09T20:02:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/input: add LED color picker to pad settings dialog","sha":"fce9d6a7b851682e78814da813d4c0d9d98f6f81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-05T13:28:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-10T23:13:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU analyser: basic function detection in Giga mode\n\nMisc: fix EH frame registration (LLVM, non-Windows).\nMisc: constant-folding bitcast (cpu_translator).\nMisc: add syntax for LLVM arrays (cpu_translator).\nMisc: use function names for proper linkage (SPU LLVM).\n\nChanged function search and verification in Giga mode.\nBasic stack frame layout analysis.\nFunction detection in Giga mode.\nBasic use of new information in SPU LLVM.\nFixed jump table compilation in SPU LLVM.\nDisable broken optimization in Accurate xfloat mode.\nMake compiled SPU modules position-independent in SPU LLVM.\n\nOptimizations include but not limited to:\n * Compiling SPU functions as native functions when eligible\n * Avoiding register context write-out\n * Aligned stack assumption (CWD alike instruction)","sha":"7492f335e98e17b4217bf25cc04b2c9a2b51377e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-10T17:24:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-10T23:13:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable most warnings in GCC","sha":"5d33d9a3d92f30ce91c556bb7aa5e3497b6fb28a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-10T23:35:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-10T23:35:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: disable GHC CC for chunks on Windows\n\nCauses fatal error inside LLVM.","sha":"8194c92f1c2d68f755aae09bcf3701f7a1da1e6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-05-11T09:49:20Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-11T10:13:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: clear scissor_setup_invalid bit along with scissor_config_state_dirty bit","sha":"3623f4343fbc6b2a30f55a857270b60d93c3e5de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2019-05-11T21:12:09Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-11T21:39:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Fix Mega","sha":"1f82a26a9cec2ea865a46d08dee6a279d74f303d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-05-11T08:14:56Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-12T15:32:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove redundant semicolons\n\nFix \"-Wextra-semi\" warnings","sha":"6c5ea068c95a6c1ac258ea4f1095feb6e2f2d4d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-03-16T18:30:04Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-12T15:32:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use if constexpr in hash_struct function","sha":"786dc6ef40338a8eaec36fb9af011a8669161e68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-05-11T08:58:45Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-12T15:32:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GLTexture: add missing #pragma once directive","sha":"22f61caf9fef37357f3477c1584b3e06e3467dcb"}
+{"author":{"avatar":null,"date":"2019-05-07T15:20:05Z","email":"49168108+drysalter@users.noreply.github.com","login":null,"name":"drysalter"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-05-14T08:16:45Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Further changes to Skyline and Envy","sha":"6b01c2f9f5a1d765a03dbee9b209fdfce2f79642"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/12925873?v=4","date":"2019-05-14T17:32:42Z","email":"akz@tutanota.com","login":"z0z0z","name":"z0z0z"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-14T18:48:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use setenv instead of qputenv\n\nA user reported issues with Qt's hidpi scaling and RPCS3. They could not disable with their own environment variable because qputenv overwrites them, setenv with 0 as third arg doesn't.","sha":"7cf11c763796b6ccc999ea749faa0e0399ef6be1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-10T10:42:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-14T19:15:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: PIC support preview\n\nSPU ASMJIT not supported yet.\nGiga mode not supported properly.","sha":"cc8c6358552f47627e7fda422141615880a71bd7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-11T10:57:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-14T19:15:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: fix SPU termination (spu_escape) on Windows\n\nAdjust restored stack pointer for the lack of tail call.","sha":"a74fd27e3da4bf228c54a6840990921edeff1667"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-11T16:21:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-14T19:15:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: implement recompiler gateway function in assembly\n\nUse GHC calling convention directly for SPU object entry points.\nThis may address performance degradation after #5923.","sha":"f33b81545e46f2b2542fd874ae30a146e3bc243d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-11T17:48:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-14T19:15:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: regain some efficiency\n\nAvoid returns from the recompiler gateway, favoring tail calls.\nThis may address performance degradation after #5923.","sha":"2f6707d0a03f99766b4d196f246eb5a7494a4565"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-12T00:22:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-14T19:15:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: use branch patchpoints again\n\nRenewed and adapted for PIC and all branch types.\nThis may address performance degradation after #5923.","sha":"1eed4217740fbefc64e8e735e9a44ce771fb80fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-12T18:06:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-14T19:15:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement 'Max SPURS Threads' option (hack)\n\nPauses SPURS threads beyond limit automatically if set.","sha":"ea554ae8285e18d4ab4dcbded9ef1b94c78f9021"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-12T20:17:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-14T19:15:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: split LLVM IR dump to spu-ir.log\n\nAlso move disasm to spu_recompiler_base::dump.\nInterleave disasm with block target info for convenience.","sha":"82295d131a0df38c8a758bf07da240e0ffe1a569"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-13T18:17:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-14T19:15:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: add PIC support (fix)\n\nAlso cleanup and adapt for GHC CC.","sha":"c481472faf504f072d15e3aeb70f443dbe498461"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-14T15:55:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-14T19:15:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fix Giga mode (kinda)\n\nDon't scan before the entry point.\nDisable stack mirror in SPU LLVM.\nImprove analyser logic for holes.","sha":"3753d27aba27af07615c87bdb56d5854bef8c372"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-14T23:16:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-14T23:16:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: increase stack frame size\n\nIt seems Windows has minimal stack frame size 0x28.","sha":"09eb633f69b65866587f493263d2f696055aa3b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T12:17:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T12:17:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM DSL: simplify value_t template for array","sha":"b2d0ca83fb363496554688b6a5d3ddd892440ce9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T12:42:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T12:42:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: fix $SP passing in functions, write PC on halt\n\nAllows to skip updating $SP in optimizable functions.","sha":"16401722f12f906431dc78ee7f9d0b0b7274251f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T13:18:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T13:18:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: simplify function prototype\n\nPass only $3","sha":"adc7d966835315dc24e056a40f1bd81ed8536cd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T13:41:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T13:41:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: don't save $2 in optimized functions","sha":"4e75d2c2f74cd61f716722c7723659d2d7f81b72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T15:44:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T15:47:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: implement spu_runtime::g_tail_escape\n\nMay help to avoid gateway costs in some cases.","sha":"007108100edc80ba5d8d6cdd23159468327774c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T21:51:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T21:51:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM/ASMJIT: add missing PC clamping\n\nMinor fix, since it's mostly impossible to overflow.","sha":"43ae4b3f3315238348737c5c797d58e90d909f51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T21:52:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T21:52:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM/ASMJIT: remove minor unnecessary code","sha":"a921af1e9608688bf59deec8f97541a9f02372bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T21:53:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T21:53:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Disasm: fix absolute addressing in some instructions.\n\nSTQA, LQA, BRA, BRASL instructions.","sha":"b138d25b97edd0b6d1c81049f6c401fd11abdc20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T21:54:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T21:54:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: simplify jump table computation\n\nRemove one add operation and adjust constants instead.","sha":"f95ec8a37c64b45665e8199c4b99a7dc6a149784"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T23:41:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-15T23:41:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM/ASMJIT: fix BRA/BRASL instructions for PIC\n\nHandle absolute branch addressing correctly.","sha":"91897fa69d92ad7e45bb83c011232de65eef70f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-16T01:02:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-16T01:02:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: Fix Giga mode\n\nForgot to adjust global chunk table computation.","sha":"26d131ef29813c98d3dbd11b75120bf9c7ac7b5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-16T01:11:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-16T01:11:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: Fix Giga mode\n\nThis is embarassing.\nFixed local instruction table computation (indirect branch).","sha":"a69329fe02f30d77d07728a83794febf71ae51ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-16T01:12:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-16T01:12:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: re-enable stack mirror\n\nIt was disabled due to other bugs which should be fixed now.","sha":"a016728a9e0bc9933ee987e5a2685bac4019da52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-07T18:51:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement unaligned surface inheritance with hierachial contribution\n- Allows render targets to behave like stacked 3D views same as shader inputs are resolved\n- Basically implements most of 'Read Color/Depth Buffers\" option for 'free'.\n- Allows splitting RTV/DSV resources if they are superceded by a partial surface\n- Also allows intersecting new resources through the surface cache for proper inheritance from other scattered data\n- TODO: Refactor bind_surface_as_rtt and bind_surface_as_ds to reduce asinine code duplication","sha":"88c20afd3a00044c7c65b35041db87725bb48b26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-08T13:37:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix some spec violations","sha":"1c439f61984ddba3d9800687c09fe577b21498ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-08T14:16:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Prevent out-of-bounds writes when resolving shader input textures\n- The target area can also have padding!","sha":"e02e27b2b34e6240779ddeeacd3c2f2bd08e6f45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-10T07:50:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor fixes\n- Fix transfer scaling (inverted)\n- Fix under-estimated typeless acquisition when doing depth format scaling","sha":"e3cf3ab6b82530622c69d8350e749eacb9f3c3d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-10T20:04:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"[WIP] rsx: Use a sane reference counting model","sha":"b840f6da288ddaafa57cf323c695d03838cebb4c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-11T10:16:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix self-intersection with previous occupant of the address being replaced","sha":"4b443be881b86ca413d13f8d5e05a0c6dc9ac317"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-11T13:01:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix write tagging when comments are transferred in by blit engine","sha":"9f0090772a84b30783a14c237ba347b90e8ce9a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-11T15:31:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor texture/surface scanning optimization\n- Also re-enable optimization in blit engine accidentally disabled during debugging","sha":"3c7d8a109929e6e8db74c2a7af09f44e9e4573c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-13T17:53:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Propagate split section information back to the texture cache","sha":"4182f9984dcf042ecb4fd48cefdf319d26013af8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-13T16:39:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Hack around using data regions as transfer targets","sha":"88290d9fab1c619bd84f1460ae8cb18dde8f8d6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-14T16:50:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Always initialize memory unless it is guaranteed to be wiped","sha":"214bb3ec870b5feaee1b8dcec961aaf26ac13156"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-15T12:55:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix zombie image references from inside the texture cache\n- Do not add locked orphans to the flush_always cache! They will not remove their cache entries as they are not bound","sha":"05eb1e91938fe94eee20887745ca0925505c04c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-15T15:06:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for lost aliased surfaces\n- Intersection routines were changed and require explicit identification of the \"old surface\"","sha":"45a13d0319a8f95c93046b36fdca3d0d304b66bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T12:56:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T16:25:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for uninitialized surface antialiasing mode","sha":"cb78522620b2f8ce3402f5c630e8630f8908a93b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/14052998?v=4","date":"2018-11-20T15:35:06Z","email":"blackjacksuper@hotmail.it","login":"gidan80","name":"gidan80"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-16T18:37:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Add custom pad configs\n\nAdd a custom pad config for every game.","sha":"9aa08313e30318f9c0ac7b529a7c4ddee20ef2f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-17T12:46:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-17T13:41:17Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Workaround for cyclic feedback loops\n- Transition attachments to LAYOUT_GENERAL in case of a feedback loop\n  - Fixes appearance of garbage along polygon edges in some\npost-processing passes.\n  - Also reverse this transition when rendering goes back to normal","sha":"4037225e989ec798593d64e0ac1a1f887469d11e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-16T20:48:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-17T18:21:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: move some code to cpp files","sha":"32bdd8ef7baa77fd3454b69b6273949b8a745d5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-16T22:08:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-17T18:21:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: use L1 and R1 to step by 10 in the save data list","sha":"edb1a32bb1a1ae38b4188aa863254ce81e04f37c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-16T21:03:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-17T19:51:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Use a shared sampler pool instead of relying on the drivers","sha":"e3f68c66d8aa8b990d1b4c7e04cc0697a82bd967"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-05-17T10:00:02Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-17T20:43:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add max SPURS threads to settings","sha":"164a7636bf7ca8ff9964944c679f4867600e89b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-16T12:03:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-17T20:44:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU analyser: minor Safe fix\n\nProperly handle known indirect branch target as a function call target.","sha":"2cf139c7a80f322756a22a613cc1f68968b0f8e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-17T13:50:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-17T20:44:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fix spu_runtime::g_tail_escape (unused yet)","sha":"bf7ee2de4c722e34b89a6d6572278d7fe3ce83f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-17T19:26:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-17T20:44:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: fix indirect branch target order\n\nCheck stack mirror first, as in SPU LLVM.","sha":"6416fee9866a6dc253654ea2c67ca0f594a52248"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-17T19:28:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-17T20:44:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: fix BISLED\n\nProperly prevent losing branch target (addr) vs get_events result (flags).\nMove get_events() to the beginning.\nMatch BISL indirect_branch() args.","sha":"85920253b3fd9fc845057b2fa3972274e7b6607e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-17T20:08:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-19T14:33:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Bump max number of allocated draw calls from 4k to 16k","sha":"dc749d39751d64fd156a2742c144813913667a5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-17T20:12:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-19T14:33:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Use a saner model for swap queue handling\n- Use a simple queue to avoid redundant checks over all the contexts\n- Poll queue if RSX pipe is idle\n- Only check the queue when the frame context is dirty (after a queue operation)\n- Reset descriptors at the start of the frame context to avoid having to synchronize mid-frame\n- Fully synchronize if a descriptor reset is required mid-frame (spec compliance; also fixes flickering verts on some hardware)","sha":"0ef7b2aaff21852dce304480153aa774010ee1cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-18T07:23:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-19T14:33:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: DOuble general-purpose heap allocation to 128M and add a better diagnostic message for OOM","sha":"a245d9fb24f1cc336ed077f30ead80117d0b2337"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-19T09:50:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-19T14:33:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix upload block range optimization\n- The 'max' index should take the first assigned ID; fixes problems with divisors","sha":"8009e53642496729955692c62e1f648973561d06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-18T17:33:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-19T14:46:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Link LLVMAsmParser library","sha":"a6cde36dc46ceda9e85e6ddc20dbd0ba37662648"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-18T17:34:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-19T14:46:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM DSL: change array syntax again\n\nI probably misunderstand something.","sha":"ceaa66949432901fdd49c2778df3cb27299fcd90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-18T17:56:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-19T14:46:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: expand reservation lock bit area to 7 bit\n\nThis is minor change.","sha":"9abb3035694c22a70be10504b68c884a865eaf1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-18T20:47:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-20T11:32:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU/PPU: update reservation logic on TSX path transactions\n\nMake use of lock bits in reservation counters.\nOn PPU, fallback to compare_and_swap instead of desperate retry.\nOn SPU, lighten write set on retry by 'locking' outside of the transaction.","sha":"7de3c410cf696e0329c5ea883d9cf0c0ed930ba2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2019-05-20T11:29:17Z","email":"malcolmjestadt@gmail.com","login":"Whatcookie","name":"Malcolm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-21T10:01:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Overlays: Fix timing","sha":"9a26c0abdab4318ed3919b3961b427db9290804e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-19T18:29:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-21T22:18:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix staging buffer size calculation","sha":"c3b234f972f4ac39c6fab89466ad8fd1f2e8560f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-20T07:27:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-21T22:18:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Propagate more information to the driver\n- Pass \"correct\" layout to descriptors\n- TODO: Fix renderpass attachment descriptors which are inadvertently doing silent transitions","sha":"46ba53f1228a3b0853af6e416330fab12e73c092"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-21T17:17:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-21T22:18:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve descriptor pool management\n- Add double-buffered descriptor pools to avoid use-after-free situations\n- Make descriptor pools more configurable\n- Also adds in a hack to allow renderdoc to capture properly","sha":"370b9e196d8943d5d1937d72cbc7e15555c761b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-05-07T16:28:57Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-22T13:56:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Official ds3 driver support","sha":"d616ce223c1c6e1e1918080245e0472907d4d254"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2019-05-23T02:26:42Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-24T14:16:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Check_window_status fixups\nIntel ANV has been tested and verified to work without workaround\nAMDVLK and the proprietary AMD driver have been confirmed to require workaround for window resizing","sha":"6ab3011eef41843a3db7312d57a2dba6f630f658"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2019-05-23T02:29:11Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-24T14:16:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Warn AMD linux users about potential performance loss if not using RADV","sha":"c348fec84be065614bd3a28542ed32732ada7004"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-24T13:31:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-25T11:07:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Refactor renderpass management\n- Ensures the current renderpass matches the image properties even when a cyclic reference is detected\n- Solves SDK debug output error spam due to mismatching layouts and renderpasses","sha":"507ec8252b2c683a938f0b675de58e2706082313"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-25T16:56:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-25T18:41:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU TSX: restore busy_wait in GETLLAR","sha":"b839cc9d5bb1f2eb1666a4ee21f4cadc4bd6bf35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-25T19:23:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-25T19:23:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU TSX: implement Accurate PUTLLC option\n\nAllow spurious PUTLLC failure if disabled (default).","sha":"71b71537a06a6acf8571bc1dc728c01b50a0d2dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-27T09:16:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-28T12:28:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Refactor framebuffers\n- Refactor out framebuffers from the renderer core\n- Use a proper cache with sorted queues for faster searching","sha":"57eb8921533a7fc388c067645c7ae88d56ee195d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-27T10:44:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-28T12:28:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Bump shaders cache version\n- Pipeline properties changed with the renderpass update","sha":"d9ab2c7104286c7165db8fbdfba4141c6d42a134"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-16T18:49:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-28T19:47:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"handle some warnings","sha":"34964e0e4f052f8d45336a085bbe051be2bd357c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-16T19:14:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-28T19:47:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: Add simple stick multipliers","sha":"3a5d1c6b15f808e229f592480f9c34d0f86dce3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-21T20:59:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-28T19:47:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: properly disable the \"Filter Noise\" button in pad_settings_dialog","sha":"8ebe02ce32468deef166cdf2cf7af76faf78fedc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-24T21:54:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-28T19:47:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"handle some more warnings","sha":"f48589005d769152f05e7e2fd686ba438da2ae0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-24T22:01:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-28T19:47:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"PSF: Don't attempt to load files with size 0","sha":"e4fca8274e1bb12670b525083d5b56ca282abd19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-26T06:38:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-28T19:47:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Use correct LED color in pad settings dialog","sha":"5760aa2e578101fd1af268f546e6da6f97cd956c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-26T07:43:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-28T19:47:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: keep LED colors when setting vibration and merge pad functions","sha":"fb1d8cb548598eca61c50bcb5353144cb0c36cbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-17T21:06:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-28T19:47:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix a crash when closing rpcs3 after downloading the compat database","sha":"c638e826787d154f9548dd0cb62d3c7d5346df93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-28T13:37:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-30T08:48:38Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"update glslang","sha":"e118c9e5dacff324a16db1bba6f639909f588951"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-30T16:52:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-31T10:27:43Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Do not reset descriptors from the aux buffer when things are running slow\n- The aux buffer borrows its descriptors from the lagging frame, so they are still in use until the frame completes.","sha":"6e925160709c06b34d06817c32f7ee526c2ad945"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-29T06:52:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-31T10:27:43Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactor out GLSLTypes from GLSLCommon to avoid warning spam due to unused functions when included in settings dialog code","sha":"f2cac2615489b5c2a3897590192829e2b4c3727b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-05-31T14:41:33Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-31T16:49:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Limit shaderlog writing behind log_programs setting","sha":"ef587d4cdc259f3f156eecee6065af19892b2e5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-05-31T16:30:31Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-31T16:49:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove SPU verification from settings","sha":"32776db8a620cee78b3a1c36be206b7269df0aff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-05-31T18:06:35Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-31T21:01:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vk: remove duplicate condition in pipeline_props struct equal operator","sha":"d9d7634f8b6d8420512be7b717f53b1d7e56cdca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-05-31T18:09:01Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-31T21:01:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cmake: do not build glslang SPVRemapper","sha":"141d78344abb385743469f44a412eb3dc67a8b6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-05-31T22:12:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-31T22:12:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Better Support For Game Collections (#4450)","sha":"cafa4521eebe6f4677cb18e37e6a927c8fe6ef20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2019-06-01T03:34:46Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-01T14:46:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Detect tsx_force_abort presence and print to log","sha":"f90f68d129d47f07217302594d04ffb3d3ef38b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-01T12:41:02Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-01T19:59:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Use clear() instead of resize(0)\n\nThe result is the same but clear [1] has slightly less code than resize [2] and signals better the intent IMHO.\n\n[1] https://github.com/gcc-mirror/gcc/blob/fb7fb646fa1631f429dcca7201f4a1a77f876667/libstdc%2B%2B-v3/include/bits/stl_vector.h#L1495\n[2] https://github.com/gcc-mirror/gcc/blob/fb7fb646fa1631f429dcca7201f4a1a77f876667/libstdc%2B%2B-v3/include/bits/stl_vector.h#L934","sha":"78c7ef30397addab70e2afd8ed5f41ab0b5f9a80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-01T13:03:08Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-01T19:59:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use the more efficient character literal overload for find_first_of/find_last_of\n\nRecommendation from Clang-Tidy: https://clang.llvm.org/extra/clang-tidy/checks/performance-faster-string-find.html","sha":"bf557ea6e6f5ac10326a7a535d5cb59b68199af7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-01T13:25:33Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-01T19:59:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use empty() instead of comparing size() with 0\n\nRecommendation from Clang-Tidy: https://clang.llvm.org/extra/clang-tidy/checks/readability-container-size-empty.html","sha":"09c9996f3157b4e3f912b1b339320fdc24768fdc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-01T13:52:39Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-01T19:59:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Access class static methods with \"::\"\n\nRecommendation from Clang-Tidy: https://clang.llvm.org/extra/clang-tidy/checks/readability-static-accessed-through-instance.html","sha":"8a6b5ca71f0eff0157dcd22e805b75a11f1b8983"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-01T14:19:30Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-01T19:59:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"keyboard: Replace integer literals by bool when relevant\n\nRecommendation from Clang-Tidy: https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-bool-literals.html","sha":"66946a83e65ae13e3ee5b3914ba19e15404143d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-05-19T16:53:09Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-01T19:59:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vk: Fix memory value in comments to match with the code below","sha":"99c1f87289426a6395dedd0f4084e480a381eecf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-05-12T21:01:28Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-01T19:59:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix some \"-Wpedantic\" warnings","sha":"790962425cfb893529f72b3ef0dd1424fcc42973"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-01T21:12:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-02T20:22:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement std::bit_cast<>\n\nPartial implementation of std::bit_cast from C++20.\nAlso fix most strict-aliasing rule break warnings (gcc).","sha":"dfd50d01854af53e7d787cfbe6a9dfb15dfe90a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-01T21:16:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-02T20:22:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Change utils::popcnt16 to popcnt32\n\nUse __builtin_popcount if available.","sha":"03339427958bfe9298224c5a78a7c4bbf2a3d2ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-02T20:21:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-02T20:22:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rename cond_one to unique_cond\n\nRemove redundant in_cv in cellVdec","sha":"31994dd3b21f64ae9b2287b4e1e8339e5e84fd06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-03T19:57:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-03T20:18:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement fs::file::write_gather (Vectored I/O)","sha":"447029a70064e886d3b0b5ec24413ffd202420f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-04T13:37:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-04T13:37:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rename cond_x16 to shared_cond\n\nExtend capacity from 16 to 32.\nRemove redundant m_total counter.","sha":"9dc036807959b035da41d17f6ac49e20252c47c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-04T16:13:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-04T16:13:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix sad bug","sha":"b2e08100ff0661fb4b8dcaf43abef5a43df99b14"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-05T12:51:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-05T12:51:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix lf_queue_base::wait\n\nAdd missing state change","sha":"1dedeb37bf23689c9ac38ba4a214440a0e94291e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-07T21:02:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-08T12:47:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fix games.yml","sha":"e8a516529bab045e1f90e40472978c2ac3c67011"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-08T16:34:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-08T16:34:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: yield PPU on disk access ops","sha":"2bc0ea37ab0e595a5786ea8fad06a070a25096e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-05-30T10:50:50Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-06-09T22:09:11Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rsx: TextGlyphs optimizations","sha":"f9ad6358563ba873988b473be84bfadc6ced2a2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-02T07:44:05Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-06-09T22:43:57Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"ci/vk: Bump Vulkan version (1.1.73.0/1.1.97.0 => 1.1.106.0)\n\nVULKAN_SDK_MIRROR removed as the server is down","sha":"39fa1d7031e3cca4cd61b0f283473348614e1bf9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-02T08:03:52Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-06-09T22:43:57Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"3rdparty/vk: Update VulkanMemoryAllocator to version v2.2.0","sha":"b190e1f50b70105fa16561888a28bf95a3a3de5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-02T08:05:55Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-06-09T22:43:57Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"3rdparty: Update stb_image.h and stb_truetype.h","sha":"8646e908329f768d3a71b20a24528ed9e134530b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16805474?v=4","date":"2019-06-09T05:28:28Z","email":"matimoran03@gmail.com","login":"RainbowCookie32","name":"RainbowCookie32"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-06-09T23:52:22Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Update DS3 message in Pads settings","sha":"652e32341daebba8f5ad08c818e2ef1d44abc02f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26035046?v=4","date":"2019-06-10T10:03:55Z","email":"26035046+Talkashie@users.noreply.github.com","login":"Talkashie","name":"Talkashie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-10T10:03:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"important fix (#6067)\n\nFix typo in Pad Settings Dialog","sha":"527f7a437af23220591bb5e3654a312aa837f093"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-09T09:48:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-10T11:57:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Move frame present synchronization to the driver\n- Just use a semaphore and let the driver handle it instead of manual framepacing.\n  We lose framepace control but drivers have matured in the past few years so it should work fine.","sha":"57196f0504138ff5d1e7074e34d679012bd0bd4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-10T09:29:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-10T11:57:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Clean up window management code\n- Removes a lot of wm_event code that was used to perform window management and is no longer needed.\n- Significantly simplifies the vulkan code.\n- Implements resource management when vulkan window is minimized to allow resources to be freed.","sha":"d361eedbec88327bfefdeae2899dbd8d3bbf7eaf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-10T19:52:07Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-10T21:48:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Set minimum supported version of GCC to 8.x\n\nAnd update the documentation accordingly","sha":"b3513cd7fa207acd249973c753b1bb8c218c678e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-06-11T08:00:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-11T09:18:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"misc atomics: Use std::atomic_thread_fence (MSVC)","sha":"d6db61c5944ec421d65cf5afa5de68afbee14a47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-02T17:51:25Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-06-12T09:59:31Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rsx: Use constexpr for flattening_helper::m_register_properties","sha":"65581acbf9d771b3c1f3c0c169828f97a389d934"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-03T06:04:51Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-06-12T09:59:31Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"utilities: Add constexpr to color4_base\n\nFor consistency with the others colorX_base","sha":"497f0c26e741bf99885996c4ed37b67166e93f54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-09T07:03:27Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-06-12T09:59:31Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"gl/vk: Add constexpr to varying_registers and sync functions between the two backends","sha":"c4667133c46c0ae72afea7102302762a45a889ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-07T19:56:30Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"readability-container-size-empty\"","sha":"81a3b49c2f214f6a1e243c788c9f04f64fe788f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T05:58:04Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"performance-unnecessary-value-param\"","sha":"db926ee671e11ecfb0e8f0849edf28d91432fc20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T06:01:28Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"performance-for-range-copy\"","sha":"331fe017623648e34ebbf518f03e3629dd6d6645"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T06:04:56Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"readability-redundant-string-init\"","sha":"8f2647555ad39f603ea25977901817dd3e14225d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T06:11:42Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"performance-type-promotion-in-math-fn\"","sha":"c9b0a4afd0f982e78ac89617168e48c409cfb5e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T06:22:09Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"readability-inconsistent-declaration-parameter-name\"","sha":"801fa0113fbdf5fcb98e9440236a2aadc081c0ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T06:25:58Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"readability-redundant-smartptr-get\"","sha":"ac7e89660f94bd6b02e467b09480acb39122881e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T06:27:44Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"readability-string-compare\"","sha":"35dc98be067ad1084c7e33b07fdb0e2c66508184"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T06:30:15Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"readability-non-const-parameter\"","sha":"349e7c8708460fcb525cec8a0388cdccf94e1c8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T06:32:09Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"modernize-use-bool-literals\"","sha":"b91bcdbbca0ef3ba0896cd1d72fcda86493870bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T06:47:51Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"modernize-make-unique\"","sha":"a02a8642b0a18b839dad747bb22dcfd49188af54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T07:06:35Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"modernize-pass-by-value\"","sha":"cba828384d991bc153c1c3b256252f430376191a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T07:14:48Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"modernize-deprecated-headers\"","sha":"a555504142ef1fa5d78d7ae786513b713050cd02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T07:22:42Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"modernize-use-emplace\"","sha":"635695ac781727aca26c42e5e4e4c33fc59f4dbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T07:33:48Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"modernize-use-equals-default\"","sha":"44265aa27db5c53ac80ebcce8fe7f023e2eabcc5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T07:49:47Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"modernize-use-override\"","sha":"f1e939936a345baa121897a07391c2fdf22b8937"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T07:54:38Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"modernize-use-using\"","sha":"0b97d12a7be80f1d9e96ce681d69addac22486c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T08:04:53Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"readability-simplify-subscript-expr\"","sha":"370dcd9d6e9137b12c3cc46a1ac1f816a2ce459d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T08:07:31Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"readability-avoid-const-params-in-decls\"","sha":"1e327ad31b0c65b66401b965dfd67fe6911592b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-08T08:35:09Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:11:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Apply Clang-Tidy fix \"modernize-loop-convert\" + const when relevant","sha":"13671d9684ce77321ba003f8acaf43f602b46d82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-05-25T08:58:55Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-12T15:20:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add FUNDING.yml","sha":"595ad15499fcff023d7347a07bfc70ca0192361f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-13T05:42:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-13T17:12:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: fix evdev buttons","sha":"ac3982d2b0334bc2cbfd88b6e9b70ec5dc9bd48f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-20T14:14:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove surface aa_mode hacks","sha":"0d906d697412e0928cdc95332c330a3de11dfe77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-21T12:49:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"d3d12: Remove all shared code with other backends","sha":"db5d56a22d1bec96ae5e869403a1c962af40c5c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-21T17:56:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactoring and cleanup after d3d12 separation\n- Remove deprecated functionality\n- Refactor to share code between common routines","sha":"655eff29e8f005527303d224ca55201e58454caf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-21T18:36:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix AA coordinate transforms\n- Requires native_pitch value to take samples into account","sha":"f6f3b40eccc40d8768e3b9a53ecc4942b224ce35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-30T15:38:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Enable MSAA\n\n- vk: Enable depth buffer resolve+unresolve\n- vk: Add AMD stenciling extension support\n- rsx: Temporarily disables MSAA-compatible hacks such as transparency AA\n- TODO: Add paths to optionally disable MSAA","sha":"4a5bbba2778efee7151ce5b5a876917ca10f1b49"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-05-31T14:18:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for resolution scaling support","sha":"acb14320da837b05eb527db1319d1e584a33bbbe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-04T16:01:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Re-enable optional sample-to-pixel transformation","sha":"ea8409dcfd86aed4c448f4cdae74ad2352720d51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-06T10:25:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add option to toggle MSAA","sha":"bca5f94b3f9208bf8fb99a8344c083721ea6cac0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-06T10:26:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Correctly count number of valid entries if there are broken entries in the cache","sha":"9d314ca4ca995354b7178663e918257491f51f1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-07T18:31:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Clean up WCB readbacks when resource is multisampled\n- Resolve image first before performing any transfer operations","sha":"5f34c0c59af2808f656373a577bcd0a889018090"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-08T10:15:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Ease pressure on fragment shaders when emulating clamp16\n- TODO: Option to completely skip clamping in some architectures as it is not needed in most games\n- Mostly affects older GPUs that do not have access to native fp16","sha":"c655036920d06754679bd4f0e59266562a5e218f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-08T17:26:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve overlay passes for resolve/unreolve\n- Refactor overlays and resolve passes to support use of push constants instead of relying buffer map/unmap\n- Add support for nvidia resolve (NV is the only vendor not supporting shader_stencil_export)","sha":"ca82dd7200756559c205a604b13b55e007303ccc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-08T20:47:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Attempt to reduce stencil load overhead for nvidia cards","sha":"8a1cf2c913772153e1e9ca6cb0e9857f9371a1f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-11T15:30:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix typo\n- Arguments to the transform function are xxyy not xyxy","sha":"e4671c29a6fd3fcaec05d30e16272178b09d8dbe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-11T15:30:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add some missing barriers","sha":"9d0f5aedf38fc17be3ed818cb0533b8d8b113ecb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-11T16:57:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix WCB for antialiased memory","sha":"296e0105c46b3528729afb36a1f2bad02d26ced4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-11T17:06:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Force invalidate of children by issuing a resolve notification whenever the parent is written to\n- Fixes successive reads of an antialiased surface that is still bound between reads","sha":"9d166c5bed089ddb7d64e0ea0894b0f9ed0db3a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T11:27:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Typo fix","sha":"86119f58d6f994bcdc2c4f07e7056b98401e4d80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T11:41:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Simplify WCB heuristics and fix out-of-bounds access","sha":"4104d7a6a1155009b0edd2c08dc2eb25932df043"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-12T12:00:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Avoid submitting wrong sample count in overlay passes","sha":"98156d2a2c9970b497d81bc3f508abf292f7df81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-13T15:57:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Do not use pixel_center_origin as its use is explicitly restricted by spec","sha":"c90186cf356af1c0c149ea09401189148413bb8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T12:52:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:19:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fixup for missing resource reference\n- Missing ref increment when using framebuffer could lead to use-after-free.\n  How master was not crashing is surprising","sha":"e515d9b83ad096284009550f857b9f8220e5d08e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T13:27:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-14T14:19:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cfg: Default MSAA level to auto","sha":"8dafc8e542b5e22ee9602dff1141fe797edadc12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-01T07:46:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-14T22:24:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellMsgDialogAbort: don't call on_close and properly re-enable pads","sha":"3f00b485a0c5aa9cd435751ff864a832f68e942e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-13T19:15:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-14T22:24:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellPad: set len to 0 if pads are being intercepted by the system","sha":"b29a89807e03db2c45e5b0967636e4ac5a25ff39"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2019-06-16T15:11:13Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-16T18:31:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix dynamic_library::loaded","sha":"b94730fa95d559267f06d6ddc34cd813db362214"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-15T17:54:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-16T20:07:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add Remove All Caches to the game context menu","sha":"5928dd826cf3251832a691569d370f66b7012657"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-14T16:35:56Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-16T21:31:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Minor cleanup after #6055","sha":"185fd3d257769182e488353d23b9c2f5299d4a88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-13T17:55:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-16T22:17:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add sys_rsx_context_iomap workaround\n\nDon't fail with CELL_EINVAL on vm::main.","sha":"0fe26f829383d16932a6229ce63420a597d4877a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-06-16T17:52:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-16T23:52:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"minor UB fix","sha":"d52953fca6ea5ae3ae0eee52cc91507c52bd8ff2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-17T18:52:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-18T16:15:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"gui/input: add evdev callback when no button was pressed","sha":"17d0dcb7a2616710839b1a8263a280526469182d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-06T18:32:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-19T17:36:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement cpu_thread::suspend_all\n\nRemove Accurate PUTLLC option.\nImplement fallback path for SPU transactions.","sha":"5d45a3e47d6da6d5469afd4053ab9cc05e4c80d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-08T22:38:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-19T17:39:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_cond: add vm::temporary_unlock","sha":"89a31292dcb518ed5953e52024d7042fbaf25429"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-08T23:03:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-19T17:39:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_mutex: add vm::temporary_unlock","sha":"d021d9e14aac5a54324a9b84848ae93e482afdff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-19T17:45:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-19T17:45:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_memory: add vm::temporary_unlock","sha":"5753b3222eb30e025e04e86ec0a0b9d5163fc79f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-20T07:10:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-20T08:23:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"gui/input: improve log message for GetNextButtonPress","sha":"a0f2ade55d77dad6f8e97824018f27243b26c1a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-20T07:12:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-20T08:23:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: raise max mouse acceleration to x10","sha":"3602d45cb7c21f5f65dcb1986697bcde701ca250"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-20T01:32:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-20T11:46:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix SPU Loop Detection","sha":"b9b591bf02c2f099907091358d95e807bcb5f57c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-20T11:42:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-20T11:46:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_lwmutex: add vm::temporary_unlock","sha":"a935203a18a2e2a29a89c727b83e734ae507a0db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-20T11:45:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-20T11:46:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_lwcond: add vm::temporary_unlock","sha":"517a2bc34a6479ed011dff64d215c47dfae64614"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-06-20T19:35:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-20T21:02:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix potential overflow in sys_vm","sha":"ade291e73d901b67dac638f766e5c27ba5f7d43e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-06-21T16:29:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-21T16:29:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix BE endianess arch support in semaphore_406e (#6116)\n\nAdd raw() methods for endianness support types and make use of it.","sha":"cd0ef99df5af1dfb82b591d286c001146cf633c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-06-22T09:10:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-22T09:10:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixup for #6115 (#6120)","sha":"806a7bbf0480a3f6c53053b6e5696362f92addaf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-23T13:41:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-23T18:08:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: add more filters to the decryption file dialog and fix file endings","sha":"8e942eb50c58657b47bfb1298895280b3997de8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1016937?v=4","date":"2018-09-25T20:34:45Z","email":"lassi.m.hamalainen@gmail.com","login":"kukkamario","name":"Lassi Hämäläinen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-25T14:11:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Split Emu/Memory into more logical headers\n\n- Add vm_locking.h and vm_reservation.h and move relevant functions\n  and types to these headers.\n- Change include order and make vm_ptr.h, vm_var.h and vm_ref.h headers\n  usable invidually and them including vm.h instead of other way around\n- Because usage of vm::ptr now requires including vm_ptr.h instead of\n  vm.h updated multiple #includes\n- Added additional #includes to vm_reservation.h and vm_locking to\n  where vm::reservation_* and locking related functions are used","sha":"499035512b43f87eb396206b464eeb05da767314"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1016937?v=4","date":"2018-09-25T22:14:10Z","email":"lassi.m.hamalainen@gmail.com","login":"kukkamario","name":"Lassi Hämäläinen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-25T14:11:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add missing #includes to header files\n\n- Multiple header files where missing #includes to other headers that\n  where used in the header. Correct header was included in correct\n  order in source files which caused everything to compile.\n- Added missing #includes so header files correctly include all their\n  dependencies and fixes problems with IDEs being unable to parse\n  headers correctly due to missing symbols","sha":"e9e87b8bd990f1354bd30da80e25127e9a8877fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1016937?v=4","date":"2018-09-28T20:20:38Z","email":"lassi.m.hamalainen@gmail.com","login":"kukkamario","name":"Lassi Hämäläinen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-25T14:11:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Move rsx::constants and rsx::limits to rsx_utils.h","sha":"a070a414a66a5f6f2b48b8d8f07680e9ee8a6bdc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1016937?v=4","date":"2018-09-28T20:44:46Z","email":"lassi.m.hamalainen@gmail.com","login":"kukkamario","name":"Lassi Hämäläinen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-25T14:11:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CMake: Disable RTTI for jit.cpp on MSVC","sha":"23432d420db400292dab250fa76ac5da4dd4b97c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1016937?v=4","date":"2018-09-28T22:12:00Z","email":"lassi.m.hamalainen@gmail.com","login":"kukkamario","name":"Lassi Hämäläinen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-25T14:11:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove unnecessary header includes\n\n- Manually removed lot of unneeded #includes to clean code and reduce\n  compilation time\n- Reordered some of the #includes to be in more logical order","sha":"c963c51a6071746255d71b9521e06591914d3f90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-15T13:15:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"glsl: Refactoring, cleanup and optimizations\n- Avoid generating unused code\n- Reduce GPR usage in emitted code","sha":"6be7c58fa4a9a009c7d12ee2eb83b9095344dc3a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-15T13:16:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Use explicit fma for MAD emulation","sha":"c9501b60abff86c6473ee7ff11b1c1a0d89892cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-16T11:14:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Avoid some useless memory barriers\n- Do format conversions only when necessary","sha":"f113cfe5c00b2687f7c528925bbe02bbd7cc23ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-16T11:15:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: API update\n- use KHRONOS_validation instead of LUNARG_standard_validation which is deprecated","sha":"25bba9bf56d06a8b6dd9a59c6e3500b9e5c9d39c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-16T13:37:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Refactor device management and improve driver detection","sha":"b645ebdb04419181d602d163461b7ce770075feb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-17T12:20:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Use SSE to accelerate index buffer uploads","sha":"358169507cbe806afe0b33f91e124cf0022b61e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-17T19:59:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Asynchronous data transfer","sha":"0fa3bcc336b43613ab8d9636e955043b77a0bd6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-17T20:08:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Disable vertex cache if multithreaded memory access is enabled\n- When multithreaded RSX is enabled, the vertex cache just lowers performance\n- The small cost of upload is paid by the asynchronous thread, allowing RSX to work optimally","sha":"59ee74a2757d3ea3640db58905c7fa76e85addfe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-18T13:38:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reimplement vertex layout streaming\n- Remove string comparisons from the hot-path!\n- Use attribute streaming and push constants to avoid forcing a descriptor block copy every other draw call/pass.\n  While this isn't so bad on nvidia cards, it makes AMD cards a slideshow.","sha":"6a32f716db2dc5989b1c3802c55317455b157043"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-18T13:49:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Minor API tweaks\n- Avoid spamming the driver with samplerParameter calls unless the parameters have actually changed","sha":"c32c1b0a62ab0297bd019592e1eee418cf8651fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-18T16:47:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Rework RSX offloading\n- Use a lockless queue\n- Do not enqueue small transfers","sha":"b893a7500258c368263019ed07054f71d6460e14"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-18T18:31:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve profiling setup\n- Avoid spamming QPC when not needed\n- Free performance when debug overlay is not enabled","sha":"d26b25816d94512de309666df4851d20eabaa90e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-18T18:32:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Use rpcs3 thread construct for the offloader thread","sha":"2b9c315374fa300eeb90929a294ac2cd8720303a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-18T18:48:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"facepalm of the year\n- Typo fix\n- This check leads to forever relocating memory if size never exceeds capacity!","sha":"1ee675e1f449c0e5cd16c91ed853c0a7270ad4be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-18T21:26:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Optimize occlusion pool management\n- Do not consume a slot every draw call, instead batch as many draws as possible\n- Since renderpasses are dispatched per-draw-clause, keeping occlusion queries outside the renderpasses works fine\n- If renderpasses are reorganized, occlusion tasks will have to be reorganized again","sha":"8249d51aa8ab58eddd914b3d3aedc62de34f159f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-19T19:01:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve balancing of the offloader thread\n- Use two counters to avoid atomic operations\n- Yield instead of sleeping because some games are very sensitive to timing","sha":"4ff77a8555b3878d9d91dd17c16d3ba1a4149569"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-24T10:45:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix broken layout stream on first draw call","sha":"009c55fcbae89623c3f2db69f09ab218be3b3f1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:20:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-25T17:50:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add LLVM8 warning for RADV drivers","sha":"9ce7b8a401a133b864d6ddcb41d460af4ff857bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2019-06-18T22:37:44Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-06-25T19:20:05Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"lv2: sys_timer_usleep improvements for linux\n-The minimum quantum on linux appears to be 50 microseconds by default, not 100\n-Do not wait for the last quantum to avoid sleeping too long","sha":"31afd046b0b9b9fc8427b14a966299a2826087cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-25T19:16:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-25T19:21:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix UTF-8 BOM in vm.cpp","sha":"1641be5e0cf2f1ab7cca8351a32cbc992e4e129e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-06-23T05:54:42Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-06-26T03:36:32Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"msg":"CMake refactor","sha":"27fca2ed330dd4de6a0c1198f9c1f0de6ca7c172"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-05-21T21:08:23Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-06-26T03:36:32Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"msg":"asmjit cleaned up their cmake warnings (no code change)","sha":"1fcf62fdf0ec4cda8d8c3ddf9ec05d7f3f6f1006"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-05-15T04:33:01Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-06-26T03:36:32Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"msg":"Disable warnings for stb_image.cpp. Should this file be moved to\n3rdparty?","sha":"32f8f40a4aa13fb16eaf0a0f1b9f6fa1ed72633c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-04-06T06:15:04Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-06-26T03:36:32Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"msg":"Fix warnings related to parentheses","sha":"be521ff0abf2e3b4849d8e1a88c871d0035a1542"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-05-11T05:36:16Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-27T22:40:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix warnings related to -Wswitch\nAdd default cases.\nMove default breaks to newline\nAdd proper handling in some instances.\nAdd missing enums to switches","sha":"23094b48bbb4743382bf361aa3c913ad883a6f4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-05-15T06:52:40Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-27T22:40:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Properly ignore SIMD macros to avoid warning","sha":"ebb1ae64087c7b0a535d2a5873e80aa197e12e7b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-05-11T07:27:39Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-27T22:40:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Explcitly mark overflow in various SIMD functions. Doing so silently\ncreated warnings.","sha":"22917084d9181947876d2b99b0e495109014c291"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-05-22T03:47:47Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-27T22:45:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix -Wsign-compare a little bit\nExplicitly mark loop types (per review)","sha":"d0eae7bab195e8724f4dce6507927d6cf65382df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-04-06T06:48:58Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-27T22:45:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove braces around shader source strings (warnings)","sha":"a124ec4a26268070523fdca03ad46c51a9022d28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-06-07T03:42:18Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-27T22:45:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove unecessary vulkan loader check var, per kd","sha":"948c1df96975c4620637439acd777c8d14b7c440"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-06-07T04:27:49Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-27T22:45:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Various small warning fixes\n-Indentation warnings\n-prevent shift overflow\n-This was declared extern in all contexts. Remove this for initialization\n-Fix main return types. OH CANADA!\n-Silence extraneos 'unused expression' warning\n-Force use return value (warning)\n-Remove tautological compare copy-pasta (char always < 256)","sha":"232a35b6fcddfa39f22594cbc0650156c29b9327"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-06-27T15:18:24Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-28T20:34:13Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Add timeout for vulkan device enumeration","sha":"e043412be4023b6340609542bd7581b9f549224a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-06-28T22:27:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-28T22:27:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Refactoring (#6143)\n\n    Prefer vm::ptr<>::ptr over vm::get_addr.\r\n    Prefer vm::_ptr/base over vm::g_base_addr with offset.\r\n    Added methods atomic_t<>::bts and atomic_t<>::btr .\r\n    Removed obsolute rsx::thread::Read/WriteIO32 methods.\r\n    Removed wrong check in semaphore_release.\r\n    Added handling for PUTRx commands for RawSPU MFC proxy.\r\n    Prefer overloaded methods of v128 instead of _mm_... in VPKSHUS ppu interpreter precise.\r\n    Fixed more potential overflows that may result in wrong behaviour.\r\n    Added io/size alignment check for sys_rsx_context_iounmap.\r\n    Added rsx::constants::local_mem_base which represents RSX local memory base address.\r\n    Removed obsolute rsx::thread::main_mem_addr/ioSize/ioAddress members.","sha":"1ee7b91646e82b0bca9d15d7e4627054d3ae588e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-06-29T15:48:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-29T15:48:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixup after #6143 (#6146)\n\n    vm::spu max address was overflowing resulting in issues, so cast to u64 where needed. Fixes #6145.\r\n    Use vm::get_addr instead of manually substructing vm::base(0) from pointer in texture cache code.\r\n    Prefer std::atomic_thread_fence over _mm_?fence(), adjust usage to be more correct.\r\n    Used sequantially consistent ordering in semaphore_release for TSX path as well.\r\n    Improved memory ordering for sys_rsx_context_iounmap/map.\r\n    Fixed sync bugs in HLE gcm because of not using atomic instructions.\r\n    Use release memory barrier in lwsync for PPU LLVM, according to this xbox360 programming guide lwsync is a hw release memory barrier.\r\n    Also use release barrier where lwsync was originally used in liblv2 sys_lwmutex and cellSync.\r\n    Use acquire barrier for isync instruction, see https://devblogs.microsoft.com/oldnewthing/20180814-00/?p=99485","sha":"43f919c04b6f6ce6bad1cf61d9e641147d5f4475"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-06-30T09:47:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-30T09:47:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixup for fixup (#6153)\n\n* Fixup for fixup\r\n\r\n* Fix memory ordering for MTRSX\r\n\r\nvolatile doesnt block reordering.\r\n\r\n* ugh","sha":"2bce3674881cd86869e47085384efa39b8ecd3d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-06-28T04:15:49Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-01T01:20:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Disable more 3rdparty warnings","sha":"3d8389457ecb0c1d7809df04c6c49af45031bb1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-06-28T09:01:32Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-01T01:20:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silence some warnings\n\nThese are technically UB but work just fine","sha":"13a557fe672ea39e027480d921b6abc58311a08c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-06-28T05:24:28Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-01T01:33:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Do not use negative unsigned literals","sha":"146e43b6ecb4e0312cc2ef5c74f3c1a1bc328b8c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-06-28T12:41:47Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-01T01:33:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Explicitly cast size_t to integer types","sha":"d57124d075566db9ff14fc3191c259bdb0e77b21"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-06-28T17:43:36Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-01T01:33:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Explicitly downcast integers","sha":"503e0238157a0a49640b08087b48ad4a4852c8c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-06-28T13:30:00Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-01T01:33:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update libusb","sha":"1e0289bcb25ad4a083edda5db7fb361c1c9bf093"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-06-28T07:16:14Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-01T01:33:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fixes\n\n- Fix a typo in OpenAL\n- Fix typo in cellHttp.h\n- Unused variables in catch\n- Use 64-bit shifts\n- Use use_count with shared pointers, unique is depracated and getting removed\n- Explicitly cast boolean to int\n- Signed/unsigned issues with loop variables\n- Fix missing return statement (the code path is unreachable, but compiler wants a return)\n- */ ouside of comment\n- Fix duplicate layout name","sha":"690cdff0d3f14a0375a193d3cee1f64a853d0b04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2019-07-03T02:27:54Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-03T08:28:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Workaround slow PBO usage with Mesa\n-Mesa is currently fastest with GL_STREAM_COPY\n-See https://gitlab.freedesktop.org/mesa/mesa/commit/a338dc01866ce50bf7555ee8dc08491c7f63b585\n-Also see https://bugs.freedesktop.org/show_bug.cgi?id=111043","sha":"b5d5113803f03cdaa549a490caf30aee4b7b8b6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-26T15:12:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-03T12:52:16Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix event signal race when speculation fails to avoid a cache miss\n- TODO: Proper GC for stale events","sha":"ce04a797c3bd569a31e3e1b87dd17039aa7bfa19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-28T17:33:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-03T12:52:16Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Restructure commandbuffer submission into tagged event IDs\n- Tagged eventIDs can be used to safely delete resources that are no\nlonger used\n- TODO: Expand gc to collect images as well\n- TODO: Fix the texture cache to avoid over-allocating image resources","sha":"d69e8288ad8b7b8ab4e1adba2b56076c1c37cc49"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-06-28T18:35:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-03T12:52:16Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Handle emergency commandbuffer close with dangling queries\n- TODO: Refactoring","sha":"ae93b417ec9dadc9fac13ddc62524998afd1c173"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-01T10:08:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-03T12:52:16Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Refactor gc","sha":"0f11939faf6d1a8d87e6636deb8f0a077f24a56e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-01T19:52:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-03T12:52:16Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement dma abort in case of a reset after misprediction","sha":"71e809a78bce45b1b51e7a821df475cc485c86a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-01T11:09:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-03T12:52:16Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Reuse discarded memory whenever possible instead of recreating new\nobjects\n- Memory allocations are surprisingly expensive when spammed","sha":"ad10eb391e905ce2f818216c2359bb7c4488f293"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-04T18:27:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-04T19:35:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix possible inconsistencies for sys_memory mem stats report","sha":"4c2fb54b9961dea6fba3daff07135c28e16924e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-06T16:35:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-06T17:58:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Clamp fragment shaders address","sha":"6d65d3424f5a58fa5bdfa21a0ba7cb9f7ba8a36b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2504890?v=4","date":"2019-07-07T13:15:06Z","email":"arabek@users.noreply.github.com","login":"arabek","name":"arabek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-07-08T02:38:18Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix build with cotire and clang-8.0 branch\n\nWithout this patch, build fails when using\ncotire, because pch headers are missing\nthe pthread flag when using Clang","sha":"b6cfa5c9b9f920144287b2beb0ca0beff3aceb65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-07-07T20:18:19Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-07-08T04:37:46Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Adds spurs_test.self to test bins","sha":"20dd7c0200056c844b23056a9ca4e9891b64ede4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-05T12:12:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-08T15:04:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix native pitch computation","sha":"50736263d209e541885fa4baf4825e9a96b9ca74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-08T13:53:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-08T16:39:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Build with -fno-strict-aliasing\n\nDoesn't affect MSVC build since MSVC already works in a similar manner.","sha":"92c08be387e7f9f066c669039a97d9d877a9ee87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-08T15:16:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-08T16:43:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add RESTRICT macro\n\nApplied as C keyword 'restrict'","sha":"db4bc6f6be2a7f4ab833f5d5fee2a9198d81ecd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-07T08:53:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T08:52:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactor rsx_decode.h and bugfixes","sha":"d57b4dc8f36bb06b5f941985d2cab1988e0a8ae4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-07T18:32:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T08:52:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Make more use of the new get_int_t","sha":"9d9e158b9af1a4c833b25eb2359d9caf4b8a66bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-08T17:00:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T08:52:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Misc correctness improvement\n\nUse let_<u64> for name_64 and prefer it when possible.","sha":"6fba3dd90c05e1bb0dae5d90fd015199f0722875"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-09T09:07:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-09T09:07:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert incorrect usage of le_t in name_u64","sha":"d1db6a6827b0063e2c8f24123ee6e2220b43145a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-09T09:09:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-09T09:09:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove redundant const on return value in rsx_methods.h","sha":"b9130dd6631f9955277fa74811bde73952961d2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-05T15:26:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T13:27:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix frame skipping","sha":"c47f4fd59ec33bd4daa504f20deaaaaa14012fa7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-05T18:21:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T13:27:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup nv3089::image_in\n- Correct pitch when sourcing from temp block\n- Remove obsolete? double transfer that also introduced a stale pointer reference to freed memory","sha":"7840cd914e16cc4c209e1788d0f4cbbea0c41eb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-06T09:48:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T13:27:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: If no array streams are enabled, mark inline array as disabled (null render)","sha":"219a5382f750fcd56c1ac7fc229d714cf40d2e8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-06T14:03:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T13:27:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: \"Improve\" initialization hack\n- Change default alpha to 1 from 0\n- TODO: Implement memory tagging for synchronizing this","sha":"0cc672dcb390e50346691612d7a44e00b922fa90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-08T17:48:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T13:27:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: When reusing resources, make sure to reinitialize the component layout","sha":"9ca6546dec64f7118ad710d581b63598368f89c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-08T17:49:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T13:27:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add support for slice padding rows when gathering slices for cubemap/3d","sha":"c072c511a1be99e8148e8339020b3613d84cd520"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-08T17:49:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T13:27:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Add readback/writeback config for format GL_R16","sha":"956270d9be8569ce8ccaab8636edee95feb0e4cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-08T18:46:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T13:27:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve AMD driver support\n- Workaround broken fp16 in AMDVLK/RADV\n- Do not disable primitive restart as the issue seems to have been fixed","sha":"2548057ea09cafdd36c13dc36bc68dbc91139366"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-09T19:01:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T19:47:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Typo fix","sha":"78e447e28cf47526795bdc230f4c1200476a17cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3462541?v=4","date":"2019-07-10T02:11:03Z","email":"Margen67@users.noreply.github.com","login":"Margen67","name":"Margen67"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-10T05:55:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix #6180 (typo in UI options)","sha":"ab228d64075b5ff3a876f05ffa4a0320f8b787b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-07-09T20:20:55Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-10T10:14:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixed behaviour of buttons in Welcome, Find, Settings, VFS and Debugger dialogs - now reacting to button click, not press","sha":"2016a33277a20a817c83091af8a85997e49019d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-14T18:28:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-10T14:35:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Log currently PPU HLE function executed after access violation\n\nold functionality retrieved","sha":"0979207cc6958038c22600d488c30619b7fe848b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-09T04:30:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-10T14:35:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"MFC: Fix Tag Status report for sync/eieio/barrier commands","sha":"d7a2d42d8f4b60284775d35ef2f06044cd8d35c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-09T17:44:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-10T14:35:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Log last function on debug pause or exception, dump cpu_thread state on access violation","sha":"537d3f25487e025cb197fed15ebc64e74c7cf9a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T18:32:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-11T10:22:13Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Do not allow framebuffer surfaces that exceed their allocated pitch dimensions\n- Truncate surfaces to forcefully fit inside the declared region","sha":"d8f753f1e822a97db9562218dbb53d9a7918d2cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-09T21:03:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-11T10:22:13Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement texel border decode\n- Texel borders are no longer actually supported in modern APIs\n- Removes the border texels and uses border color instead which is incorrect but should work fine","sha":"fc0957264857451c493b53112f1176393f075618"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-10T08:18:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-11T10:22:13Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Silence some debug prints\n- This message confuses some users","sha":"2898309f6882289ac33dc08a1bc5d0b0d929f7fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2018-12-20T22:36:56Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-07-11T19:13:12Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Microphone implementation","sha":"6c6b973342ca9a454520d420f4dc4a677fcfd53b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-07-10T19:54:37Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-11T19:51:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Swap R and B channels in SET_BLEND_COLOR since this color is BGRA, not RGBA","sha":"f3551cedb715adcd79fe813dc88faab5e009d83e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-11T13:22:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-11T20:34:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Emu.Stop() with vulkan device enumeration hack","sha":"efbae02a227ef20d99c4bee2c63b3a57be91f4f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-11T05:34:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-11T21:19:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Allow to configure vblank rate\n\nRemoved \"HLE protection\" hack from sys_rsx_context_attribute","sha":"c4d8ef43402fb3dc5480ab0d01714fa39c565223"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-11T20:28:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-11T21:19:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Debugger output text fix","sha":"17c8ac9ab8864553b1670f4625b4dce4766f03cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/17715080?v=4","date":"2019-07-11T18:21:53Z","email":"asfix1@hotmail.com","login":"Yahfz","name":"yahfz"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-11T21:39:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Set the default SPU Decoder to LLVM and rename SPU LLVM to \"fastest\"","sha":"ae055f6792e3388c862d38f599f4fcbd20dd040d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2019-07-12T07:33:17Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-12T09:25:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix Linux Vega float16_t workaround\n- It was disabling float16_t for non Vega cards","sha":"94af3b3f03fc576f8e9867cf673ec03fcf891dc7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-13T08:18:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-13T08:50:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix app versions after a patch was removed from the game list","sha":"3d6c2113821b115b41427e64a6d75d73e7227e6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-10T19:56:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-13T13:59:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Dealloc exec cache after sys_prx/overlay_unload_module\n\nMust come before vm::dealloc of it.","sha":"3de885c7a623e2aef0c1058333a1a0ac14f9e3be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-11T16:21:43Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-13T13:59:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix g_exec_addr addres check for access violations","sha":"c727760537ebd8a1e62d90036d4e819c0a11b557"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-13T10:14:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-14T14:19:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix small controller icon in pad settings for high dpi modes","sha":"9ff6486c856099f39678da64628166080de2864e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-06-29T20:41:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T14:33:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU TSX: fix \"Preferred SPU Threads\"","sha":"22e4ef147a5cc4e6deaf367eab5119bd83a700af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T14:37:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T14:37:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_event_flag: add vm::temporary_unlock","sha":"7398cfc95064603f249c4c1057310abd19db289e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T14:48:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T14:51:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_mmapper: add vm::temporary_unlock","sha":"38d4e3c184bc293fafd181f5e7ea57a3aa368961"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T14:55:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T14:55:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_vm: add vm::temporary_unlock","sha":"cbfa6cc91fa55f3ef9b3829d1d58d3b840a81e91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:06:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:06:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_event: add vm::temporary_unlock","sha":"0a88a23bf5e29e046072a5871d0c477ecad18854"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:08:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:08:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_interrupt: add vm::temporary_unlock","sha":"f5ee8c129213a151d5b3273a928a14de7719aaf8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:11:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:11:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_net: add vm::temporary_unlock","sha":"e1293b14f877e59b468a04af24dbdac29c172bfd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:14:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:14:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_rwlock: add vm::temporary_unlock","sha":"6126a98111d99876ab41c273541cec2bb16d1d8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:18:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:18:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_semaphore: add vm::temporary_unlock","sha":"bc1617758c39c1cd5ef16c60351bd23d7c0ee373"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:21:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:21:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_timer: add vm::temporary_unlock","sha":"1a1eff66bca262ad55de952fed6045efef270475"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:33:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-14T15:33:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_spu: add vm::temporary_unlock","sha":"cfa1416d6437218daa68dc462daaab2f7a0667a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-15T12:46:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-15T12:46:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Avoid transitive include of vm_ref.h\n\nAdd forward declarations of vm::_ref_base\nRemove default AT = u32 in _ptr_base and _ref_base (doesn't play well).","sha":"c01f1a8968da98912f8b3f2e17ee39c5142ecdb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-13T09:31:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-15T12:50:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"kernel explorer typo fix","sha":"1e2f81dd33ed465e3ac8ce576120e5144d592226"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-15T13:16:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-15T13:34:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix SPU Interpreter regression after #6147","sha":"cb5c26f2b51c65aad067f1030190d5c629908987"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-15T14:20:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-15T14:20:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add experimental TSC frequency detection","sha":"c062000288b1ab074af65c66cbff05c498205a94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-15T16:51:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-15T16:51:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup for SPU Recompilers, regression after #6210","sha":"736ec4035edf32b1a9fad02d83acc3ba2bb7f958"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5672538?v=4","date":"2019-07-16T00:26:22Z","email":"theracermaster@gmail.com","login":"al3xtjames","name":"Alex James"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-16T12:58:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt/game_list_frame: Ignore file entries when adding disc/game directories\n\nFixes #6212.","sha":"397e5dd1ea1a63a4169f5c960840b0b7a85e9b45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-13T14:52:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-17T10:29:42Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Set up for multi-section inheritance","sha":"009e01a347673abb771b801b2f3122ba1a3b1f0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-15T16:36:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-17T10:29:42Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix reference leak when cloning surfaces","sha":"998717659f9184f1f4c519498870048910a820a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-15T18:48:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-17T10:29:42Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Handle lost data due to unused data sections\n- After splitting, the sections may not be referenced at all for anything other than just pixel storage\n- In such cases, either merge down or sample from the upstream source instead","sha":"34b06453f9690d1183501ab01e00c9f1a3869b18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-16T09:10:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-17T10:29:42Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Handle cyclic references when doing memory inheritance","sha":"113a49e00cf563c864d26073c582391386debfa9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-16T19:23:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-17T10:29:42Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixups","sha":"ea2f4d57fa16ad0719d1218d837b3944af6e0921"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-12T20:51:40Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-17T14:56:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Use macros from Vulkan SDK","sha":"a26841512171c258db7146c6059889f838583e67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-07-17T08:17:26Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-18T17:16:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Keep custom name when adding/removing game-specific config","sha":"d9c311737dc500351efae1e1212afcd5c34f4ace"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-07-18T07:21:50Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-18T17:16:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Tiny typo fix","sha":"95b6883ad4185a4aadbbbc96ac16f6c8757f8486"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-18T15:40:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-19T01:56:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Recompiler: optimize JIT memory consumption\n\nAvoid rebuilding trampoline for every function at startup.\nThis should fix Out of Memory error in some cases.","sha":"1b140c8e979d80fb690ef2ba97024b84f9b1ea7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-18T13:50:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-19T11:21:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement separate viewport raster clipping\n- Merge viewport raster window and scissor into one clipping region\n- Viewport raster clip is different from viewport geometry clipping in\nhardware as the latter is configurable separately","sha":"b5a2f0df683d04f84fd04183afc4e3d81d68c5d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2019-07-19T04:45:34Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-19T11:46:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix decryption filtering for case sensitive platforms\n- Filter for .BIN instead of .bin","sha":"79ddf5593732c5a06c4a871019fc1a305eff6e40"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-18T17:15:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-19T12:49:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Support CSAA transparency without multiple rasterization samples enabled","sha":"e2574ff1007aa621ccf3ae65b6052506ceefeef8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-20T12:57:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-20T12:58:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Expand thread affinity mask to u64\n\nAlso fix and note __APPLE__ path.","sha":"4e4c89613661ee6c000b50092a4a51468dc5e32b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-20T11:58:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-20T13:39:32Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Do not clip scissor to viewport when doing buffer clear","sha":"9a7c2784f06bff485b3aa83ef3b47cfa94580a8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-16T20:51:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-21T08:18:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input:  keep pads intercepted while regular buttons are still pressed","sha":"78ecacabcb8911554a9e85564e1babba4cf3f98d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-07-21T07:44:03Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-21T11:25:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Use move semantics with several shared pointers in vfs_dialog, they need not be copied","sha":"f5f0a5aa194d1dfc9312e0da0a3662392aba1903"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-07-21T08:07:20Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-21T11:25:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Improvements to Virtual File System dialog:\n\n- Replace Add Directory and Reset buttons with + and - buttons\n- Add a confirmation message before Reset All\n- Rename \"Okay\" to \"Save\" (to be in line with the rest of the UI) and add a Close option to quit without savin","sha":"66c1143a652a7a0ec94955c67c8b4ad08a28e274"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-21T17:44:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-21T18:07:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: make text labels in about dialog selectable","sha":"6128fffd3eeb15bb563fd0746b677fe1a2c4559e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2019-07-09T22:47:08Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-21T20:02:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"thread scheduler: Add scheduler for zen2 and refactor for zen(+).","sha":"a98a2b79d0da8f67346adba2b63aae60e9b7a6e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11169970?v=4","date":"2019-04-01T21:37:56Z","email":"rui@ruipinheiro.eu","login":"ruipin","name":"Rui Pinheiro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-21T23:44:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Initial sys_config implementation","sha":"070c3af50f6b42a736e9e746f9678fc607d2f907"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-20T21:26:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-22T12:16:43Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix sys_rsx_context_iounmap partial unmapping","sha":"492c9e3c7c778ce88995c54d13efbfca1832baed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-20T23:30:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-22T12:16:43Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"correctness fix\n\nNot that it really matters because of gcm's lwmutex but just in case the syscall is useb directly.","sha":"2b721b9e29f60c31053a10be78bba90085f714dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-21T00:53:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-22T12:16:43Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"typo fix (to squash)","sha":"cf4d7152847736f1c162792132723de70c7f1c0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-22T04:34:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-22T12:16:43Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix similar bug in sys_rsx_context_iomap\n\nTODO: Is there an rsxmem unmap event for those cases?","sha":"d17be2c2ec1cfca4146dfd6fb26061dc66247522"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-14T03:55:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-07-22T23:09:01Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Timers scaling and fixes","sha":"85b1152e29e2965586d41b6c0ace6ac702e00ee4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-23T22:13:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-23T22:13:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Prefetch MFC list elements (#5345)\n\n* Prefetch mfc list elemets to protect from overwriting\r\n\r\nAlso move some stuff away from command processing such as a few constant arguments setup","sha":"49aefc079545826a74fc151ea44b8b2485a2aac6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-22T21:37:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-24T14:25:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"TSX: Improve cpu_thread::suspend_all implementation\n\nImplement low_lock and vip_lock (for shared_mutex).\nTry to simplify suspend_all implementation with updated shared_mutex.","sha":"090c71aa7c618fa3cc309f7e553cc30448068180"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-19T19:36:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-25T06:53:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Emu/overlays: fix background picture path","sha":"71c56b719caf04a3ede698677b00c922564ad86e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-19T20:47:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-25T06:53:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: cleanup some comments","sha":"b44b44b3c448592373a8f0ad66d66d407f7fa0a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-19T20:49:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-25T06:53:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Emu: set m_title to the actual disc game title","sha":"b56b425b19f46aa19e776e7c072d3a82d9413c4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-25T13:12:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-26T18:27:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix gcm unmap events","sha":"c53f0dd7b5f3b53f804c36f5d7f5673a69a6d636"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-25T14:24:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-26T18:27:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix cellCamera events support with clocks scaling","sha":"22994d15fbefb9ece00c6708e46b96236415255b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-26T05:05:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-26T18:27:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Write atomically semaphore updates and fix zcull timestamp","sha":"fcc75c8b0f7d3dffef3a3ef465c718e9ff7801ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-27T02:57:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-07-27T03:03:29Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fixup","sha":"230c3d55b67d5ef0d1fd2965dbd13015bb5687bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2022-02-02T14:36:15Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-27T09:48:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Save manager improvements","sha":"738cfccbbaf2f637307d982517600eb56cb93688"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-20T16:18:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-27T13:09:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve aliased data preservation\n- Carve out inherited region if any\n- Perform pitch compatibility test before assigning old_surface","sha":"1de90bdb1f8e31914c875c5b3b8cb1e9626ee094"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-27T08:21:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-27T13:29:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: simplify game list icon resize","sha":"76a1fd5c88ffd03890267b0967d4739fe23166d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-27T08:57:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-27T13:29:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: properly scale icons in trophy manager","sha":"65134f73d6e87d1060ca6e4c144c4f9655b5caec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-03T17:17:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-28T11:23:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vm/sys_overlay Improvements\n\n- Implement sys_overlay_load_module_by_fd.\n- Implement special segment allocation when ppc_seg flag is specified.","sha":"997e3046e303662e73cc595997d4776e09100165"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-26T16:00:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-28T21:12:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Correct get_int_t to get_uint_t.\n\nAdd get_sint_t.","sha":"ec2db8edbcc9a7ff3f54e5e1a4b71315e13ef50b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-26T22:34:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-29T00:04:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement waitable atomics\n\nMoved Atomic.h to util/atomic.hpp\nList source files in CMakeLists.txt","sha":"f63e89f9b4220b3d6c768b0912dc9f37d1610888"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-27T14:08:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-29T00:04:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use atomic wait in shared_mutex and semaphore","sha":"88864140133e5eb50f17fbe94ae4336f9ab9ae10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-29T14:51:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-29T15:28:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu disasm: Improve ORI and ORIS disassembly","sha":"829047ecdb7f9f6ecb1d0665f73f93af3d68e6d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-29T12:12:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-29T18:55:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove ignored bits in waitable atomics\n\nIt was not implemented correctly.","sha":"e1db6cef6f6501385778c0eb074b2c2bafdebdc5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-29T17:28:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-29T18:55:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Change bits of waitable atomics\n\nReduce max waiter count to 2^14.\nRefactor code to use waiter_mask and signal_mask constants.","sha":"c6993d3f1c75b58a904f27333be34e3c5a033790"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-29T18:49:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-29T18:55:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix sys_config_get_io_event syscall name","sha":"949f33c8a4bb03aa14cc40ef0e52fce4e574f07d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-10T14:32:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-29T18:55:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"make sys_fs_closedir atomic","sha":"1e5e0f3b5e86fb6acb72d0fee98924e91739c6c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-30T06:53:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-29T18:55:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add EAGAIN check for sys_memory_contianer_create","sha":"7508ae6e6503c075b3d52f0989188581940e28ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-05-07T19:05:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-07-29T18:58:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_lwcond: Extract protocol from lwmutex at creation\n\nThis is the only reason theres a need to specify lwmutex_sq id at creation. unlike sys_cond, lwcond isn't connected to lwmutex at the lv2 level.\nSYS_SYNC_RETRY fix is done explicitly at the firmware level.\nThis fixes issues when the original lwcond and lwmutexol data got corrupted or deallocated, this can happen when the program simply memcpy the control data to somewhere else.\nOr if it uses direct lv2 the lwcond conrol param can even be NULL which will make it access violate when dereferncing it. (This param is unchecked and can be anything)","sha":"e40b76b25362ccaf28bfa8f547abe03c64681fd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2019-07-30T04:10:45Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-30T16:56:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Don't warn RADV users on LLVM 8.0.1\n- The 'back screen' issue on RADV was resolved with LLVM 8.0.1","sha":"d689a6e47b907a462b8a25339b6db6099e3d5efd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-30T12:22:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-07-30T18:13:42Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Conditional render sync optimization\n- ZCULL queue was updated to one-per-cb but the conditional render sync hint was not updated.\n- Do not unconditionally flush the queue unless the upcoming ref is contained in the active CB.\n- This avoids spamming queue flush, which frees up resources and improves performance","sha":"f0bd0b5a7c25cd33194c996f2a5b9c1cb2f687dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-30T14:15:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-01T20:38:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"perf hotfix for sys_timer_usleep","sha":"72fb3ba794c8956aa33b3e7e396c8ac75e4e84e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-01T22:23:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-02T15:37:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add fallback implementation for waitable atomics\n\nMay improve perf on OSX/BSD","sha":"5bd17a44c972ebe5f87391a86d10fdd9a115a103"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-29T17:49:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-03T13:29:17Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_vm: Fix sys_vm_invalidate","sha":"c219417f62f18fd964ab801717593168ad127871"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-01T19:20:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-04T06:45:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: select custom configs when opening the custom config folder","sha":"4ad784d614a55e61d4009c227cbb959c20ccaf4e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1712979?v=4","date":"2019-08-04T09:52:48Z","email":"dsdominykas@gmail.com","login":"xddxd","name":"xddxd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-04T11:29:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Update game_list_frame.cpp","sha":"6e89e4ebbf158473904e768815935895228a9543"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-08-04T13:21:19Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-04T18:16:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixes suspend+stop threads not stopping","sha":"05813c7e9080dd58de024c4e86775b012b13817b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-07T15:41:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-07T15:41:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Allow to load liblv2.sprx with manual/both lib loading options (#6274)","sha":"112ad9dda2d3968786dee3eb48143975803c67a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-08T12:43:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-08T12:48:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor fixup for nv3089::image_in\n- Typo scale_x->scale_y\n- Remove convoluted temp buffer creation and just use vector instead","sha":"033836d88cafc3a10bc01487a76710f40d175b97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T07:45:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T09:02:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Update Appveyor to Qt 5.13","sha":"e21b8eb95bc0a9c0f0e2e6b0b48ef563aa744079"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T08:40:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T09:02:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"silence some warnings","sha":"01720afba95d74d5a0a936ca11e38636c412263a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T09:18:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T13:13:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix initial trophy icon background color","sha":"efcb46658b35adebae13e7dbc9a134c6f78f2d76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T11:47:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T13:13:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix some warnings","sha":"0559e929d42fadbf6e3c1e852b52dbc0f533421e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T11:50:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T13:13:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add some sanity checks to prevent list crashes","sha":"697128464b60f40c29abb6bfec6f566d5c056937"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T11:51:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T13:13:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: change default icon background color to something friendlier looking","sha":"d4c635a83ccad544f91d08cbdddbb1ecc06005ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T11:53:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T13:13:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add setting for save manager background icon colors + fix icon size","sha":"2f12226ff9d744426b7eadb15f48ab80840a90e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T12:06:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T13:13:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add setting for trophy manager icon background color","sha":"f051f53e15c5c099ec78b37a03cfbc4b8392af4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-08-10T11:24:14Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-10T14:15:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt warnings cleanup","sha":"8150095e8fcab96f3fffaeddeb1e2fa9d67b8781"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-09T19:54:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-10T15:45:02Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rsx: Cleanup for blit engine fixes","sha":"8866a3d6a9a43183df693238a890c96a30932da1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-09T19:03:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-10T16:47:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix vm::check_addr memory state check","sha":"25e47e0de02ef3b73ae9abb2f273a40612362ef4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-10T12:57:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-10T16:47:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Write zero in attr->pad (sys_memory_get_page_attribute)\n\nIts included in lv2 as well.","sha":"94d33003a3c3a8e0d7bb43237a5059648a43ba56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-11T18:04:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-11T18:04:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement vm::page_executable (#6330)\n\nFixes segfaults when attenpting to set segfaults on non-executable memory.","sha":"3ce18fd96002e7c4a2bc36d1cda78e29a6279a67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-27T04:51:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-11T18:43:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu: Stack size allocation improvements","sha":"cbcd06d1dcd4a2cfc32d593404d24d9b7998d9a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-27T07:15:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-11T18:43:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix max allocations for DECR mode (sys_memory)","sha":"5c904bf3e2400ad918b23c9a56f80095c43819c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-27T10:59:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-11T18:43:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"idm: Fix bug in ID searching\n\n* ID checking now checks if (id % step) == 0\n* Extend possible ID range to allow UINT32_MAX (as long as base is non-zero)","sha":"96527eee5bc0a7726c468f06a1b640dccbce393e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-27T14:09:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-11T18:43:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix CELL_CAMERA_ERROR_NOT_INIT check in cellCameraSetNotifyEventQueue when camera set to null\n\nDon't worry, this was a duplicated check for null camera setting.","sha":"ecb3b62787528b28bbe06ee79effba34faa0667c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-28T20:41:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-11T18:43:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_vm address boundary checks (fix vsize)","sha":"a8325812014daa0ad957e41c851a7e3bee90cdfe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-28T21:45:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-11T18:43:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add missing EALIGN check for sys_mmapper_search_and_map","sha":"0a5b6ad928806e920659a64f56e090a799dcf754"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-11T10:05:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-12T11:37:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Return immediatly from fs::remove_all on failure to remove entries\n\nThis way error code will be reflected properly","sha":"d48d424b191491020d0c35e6afce7f93ad911216"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-31T17:35:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-13T01:56:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu: Improve FCTIW, FCTIWZ, FCTID and FCTIDZ","sha":"a560498cd4d18b4dff820c35f9cb3a5f00fbf630"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-01T05:10:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-13T01:56:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu interpreter: Improve SRD/SLD","sha":"6d0f2ae58adf99c0eb79d265a7299b34f41058d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-01T08:22:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-13T01:56:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_time_get_current_time() date","sha":"629d8e3a519c6ae7e1bf55862e80c198da153176"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-01T16:27:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-13T01:56:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use error_code in mmapper_thread_recover_page_fault","sha":"cd4e895c0450e8e3ab2eab2e7b5b942026c04382"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-01T19:32:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-13T01:56:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix possible infinite loop on vm area searching (sys_mmapper_allocate_address)\n\nSpecifically when allocation with 0x8000'0000 alignment fails.","sha":"a6c94a0eafba8b73680f38144cd102572342848e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-02T18:53:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-13T01:56:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"core config: Expose min/max ranges of integral settings and use it","sha":"6d3fc3a3864d043d624a2f7a60ef64e3e68aa257"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-11T15:00:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-13T01:56:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu interpreter: Allow non-ssse3 to use fast path\n\nbyte shuffle is now removed which was the barrier for ssse3 check.","sha":"4f00af6000220d5118c6b8649d4992a099eeaf89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-09T16:35:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-13T01:56:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu: Improve LWSYNC\n\nBlock load<->load reordering as real lwsync.","sha":"4b82006984cabba32ad3e711fdc1a76ae6a41bdb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-12T04:31:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-13T01:56:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Avoid using _sys_ppu_thread_exit in _sys_interrupt_thread_disestablish","sha":"14ac70dfbfb6ac5040543d4c1bc17a6f44bbddc4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-12T04:56:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-13T01:56:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix race on notifying vdec thread in cellVdecGetPicture\n\nCan dereference nullptr if cellVdecClose was called simultaneously.","sha":"30c72b105e6091b6df398d99cf2bc1c98a9e080e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-12T04:58:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-13T01:56:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix race on cellVdecClose TLS cleanup","sha":"a4896eb6dff4460d109d77c88985cf21c1048505"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-12T12:35:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-13T01:56:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixup after #6329","sha":"95f22b76c60474729dadf33c9b3072c8ca810287"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-13T05:11:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-13T10:34:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fixup after #6286","sha":"a902874b010b317d8b2d1678b512369bfeff489c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-13T16:49:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-13T16:55:45Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fixup for fixup","sha":"19825366f53695f49714e42b14311994c2c91662"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-10T04:07:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-13T19:48:50Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rsx: Fix overlapping transfer of nv3089::image_in when out_pitch != in_pitch\n\nor out_pitch != out_bpp * out_w","sha":"527b1bb071408fe0c6d6409c03dcaf6b6a232937"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-10T04:53:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-13T19:48:50Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rsx: Fix nv0039::buffer_notify","sha":"519fe9309e9e59db6e6f1e106f7aa0f4fc6c0917"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-10T10:03:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-13T19:48:50Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rsx: UB fix (signed vs unsigned mismatch)","sha":"7fda07eb5b263c3a047106e5c787da62d7b78058"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/20027681?v=4","date":"2019-08-13T23:38:52Z","email":"jm_vent@hotmail.com","login":"MarioSonic2987","name":"MarioSonic2987"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-14T03:44:59Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Update \"Enable native user interface\" description\n\nSince the merge of native OSK, back in February 2019, RPCS3 is able to support more languages with native UI. However, the description hasn't been updated since then. \r\n\r\nAs far as I know, the languages that are now supported are English, French, German, Italian and Spanish. \r\nBoth Greek and Russian use different alphabets from Latin, therefore they aren't supported. Polish or Norwegian uses special Latin characters that aren't covered in extended ASCII character set. Chinese, Japanese and Korean aren't also supported.","sha":"b3f4cd3a9580e201e1ef4316326b4f5a7739cce5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-08-10T16:49:57Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-14T17:24:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Screenshot function","sha":"87bf0386c4b01bde942e4ea194db1c16c9cf1359"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-06T17:59:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-14T17:28:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement lib_loading_type::liblv2both","sha":"ae46333e99c9a30840facbfc423564f50f206d25"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-06T18:52:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-14T17:28:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement lib_loading_type::liblv2list","sha":"cf16ee5eb5966dfe52d3e7246341b453fe10092c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-07T00:56:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-14T17:28:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove dumb overloads of atomic_op, fetch_op\n\nAnd lf_queue::apply.\nFix inlining problem by passing F by value.","sha":"4f22559ff0255982265eb0589f6ab88965810cfe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-07T17:46:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-14T17:28:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove lib_loading_type::automatic\n\nThis is former default and is now obsolete.","sha":"d45c743877bdc87a0cf0b7401df0e5c7cb8199e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-11T20:31:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-14T17:28:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Always check page_allocated in vm::check_addr","sha":"f8f3067debe12cd106f2162ed8f10135c197389e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-14T14:14:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-14T17:28:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"typemap: remove \"polymorphic\" type support\n\nUnnecessary complexity","sha":"d41d7b5e2451722954306a99bea534060c23bd28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-14T14:33:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-14T17:28:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"typemap: remove \"shared\" type support\n\nNeed to fix design mistakes of putting too much into the same bag.","sha":"9f9309055f5ab462d71c8e4d1eb2b618eb9d54b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-14T17:27:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-14T18:04:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement stx::typeinfo_v (util/typeindices.hpp)\n\nMove and generalize logic from typemap.h","sha":"4df1c16099dc6b8df66e0d53b7b8158071590eee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-18T02:02:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-14T21:54:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Create headless application [WIP]","sha":"08c581947d86e11336258bae9f5194ef70645e27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-06-20T13:51:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-14T21:54:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"handle empty callback returns","sha":"8debdfcd094bfa9c1952f96a3121fcbb1fc70ba5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-06-21T11:33:32Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-14T21:54:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"header shuffling","sha":"2040a11585851e1578cd2da33e5eeb7ad8019d81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-11T21:11:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-14T21:54:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"update some comments","sha":"13367071b097847432ac942c55bb4c168619b81a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-11T23:32:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-14T21:54:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add cli arg for hidpi","sha":"0dc7841d0f4fad4de713c641e11a5dc5cd677cc0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-14T18:01:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-14T21:54:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"rename rpcs3_app to headless_application","sha":"503d43889dd751a6b46dae8cd732bc17c7e18ff1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-14T18:30:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-14T21:54:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: move default stylesheet to stylesheets.h","sha":"9f854dba98f8788a8741b39ee2c58369c19f9209"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-13T12:56:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-15T11:00:17Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Add support for 4444 typeless texture","sha":"7f85b18b46d2d4d26e96cc213f4839df5f4a4e6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-13T13:29:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-15T11:00:17Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl:Implement proper support for packed 16-bit rendertargets\n- Also some minor refactoring","sha":"a0f0c418d7fac376c34e33c83020f1a403343f0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-13T14:03:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-16T07:45:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Change default Sleep Timers Accuracy setting's value to \"Usleep Only\"","sha":"f0c267ecb0e92a4130b393ac900e78d9f0fb5653"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-13T15:32:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-16T07:45:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Improve unknown settings values dialog text message","sha":"f2a2dfda3a0a8136e6089ec1f616587052728505"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-08-15T16:01:19Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-16T16:58:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add advanced tab","sha":"42ff93d30ca4c68d76b3b10b00381795cef7bee0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/529930?v=4","date":"2019-08-16T06:12:04Z","email":"git@plagman.net","login":"Plagman","name":"Pierre-Loup A. Griffais"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-16T17:09:37Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: don't die on VK_SUBOPTIMAL_KHR in AcquireNextImage, and recreate swapchain\n\nvkAcquireNextImageKHR can also return VK_SUBOPTIMAL_KHR and is non-fatal.\n\nHowever, it's a good idea to still recreate the swap chain later to maintain\noptimal presentation paths after temporary occlusion.","sha":"56011cbddd6932de754b8bdf9982514016dccd90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/529930?v=4","date":"2019-08-16T06:09:57Z","email":"git@plagman.net","login":"Plagman","name":"Pierre-Loup A. Griffais"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-16T17:37:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Work around a crash on startup on current versions of KDE on Linux.\n\nhttps://bugs.kde.org/show_bug.cgi?id=401637","sha":"f342f4b826f69015c0261b8b8a45c50cbe92a5cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-15T11:05:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-16T19:55:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add another pattern to ppu analyzer imports","sha":"6540fecdc3548c99ce24b184c1c4c52b716b1674"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-14T15:18:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-16T20:49:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub sys_process_get_number_of_object(object == SYS_TRACE_OBJECT)","sha":"80827aa31a2aa8e35fa168397de4b52c47e0db13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-14T17:00:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-16T20:49:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement lv2_spu_image\n\n- Improved sys_spu_image_.. error checking\n- sys_process SYS_SPUIMAGE_OBJECT handling implemented","sha":"0dce6be8cb026ccebdb6aa1b77125ab0fad9b3b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-14T18:02:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-16T20:49:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub sys_process_get_number_of_object(object == SYS_SPUPORT_OBJECT)","sha":"d8402008ddc23300c278e28e50a70313fc923ef6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-06-11T19:45:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-16T21:42:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add new accuracy control for PUTLLUC accuracy setting (non-TSX)\n\nWith the option enabled GET commands are blocked until the current PUTLLC/PUTLLUC executer on that address finishes\n\nAdditional improvements:\n- Minor race fix of sys_ppu_thread_exit (wait until the writer finishes)\n- Max number of ppu threads bumped to 8","sha":"0d88f037ffa245a4bea57d2dc1f8c5fc513b54c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-17T00:38:39Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-17T00:41:05Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"gui: Remove fallback font from YoRHa theme\n\nStarting with QT 5.13, having both fonts causes stylesheets to use the fallback font even if the first font is present, but uses the first font when there's no fallback font.\nThe fallback font (Arial) can safely be removed as the default one is 'good enough' for the intended purpose of having a fallback.","sha":"51188db717e192b8c703778f514309a37d73369e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-17T10:17:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-17T16:26:04Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rsx: Fix potential out of range methods execution (can result in segfaults)","sha":"500a4fa2fb680e9b3e5bf4207262f301160e1e95"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-25T14:27:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-17T19:46:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU/LV2: Make thread-lists scheduling atomic","sha":"050339bb3e01d15137b9eb8edd8ad06b3ed02ac5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/17715080?v=4","date":"2019-08-17T18:28:22Z","email":"asfix1@hotmail.com","login":"Yahfz","name":"yahfz"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-17T20:11:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"lv2: Allow sys_sync_priority_inherit","sha":"1444492eab1ad51130ba3e1a1294202b49a2814d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2019-07-23T16:06:29Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"max"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-17T20:30:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[MSbuild] Detect and use MSVC version for NMake CL.\n\n - llvm and glslang projects modified to detect and use Visual Studio Version.\n - Added `-Thost=x64` to llvm NMake CL (warning in cmake lists)\nNote: `-A` option is used to set platform since rpcs3 requires cmake 3.8.3+ anyway.","sha":"4cfff8ea4a3bf81da4da07671d7f64f1086745c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2019-07-24T16:01:55Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"max"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-17T20:30:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[MSbuild] Extend support to v142 toolset\n\n - Added support for current default toolset, explitly specified c++17 standard and 8.1 win sdk.\n  - properties were defined via `common_default.props` and `common_default_macros.props`\n Note: There are 2 files because some properties need to be imported before `Microsoft.Cpp.Default.props` , but other common properties can be imported after but they require marco defined in `Microsoft.Cpp.Default.props`.\n- Added hidapi and libusb project files to repository to simplify msbuild changes.","sha":"c5440c95c8aa63ac813a4bbd2c226b69573852d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2019-07-24T16:21:19Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"max"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-17T20:30:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[rpcs3] refactor includes and additional dependencies","sha":"92e6dee60f83730dd54b93dfd50e07ee6e0d7988"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-15T21:59:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-17T20:40:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"typeindices.hpp - start index from 0\n\nStarting it from 1 makes it more error-prone to use.","sha":"11a43e25d778f063ddb4173119de3cb4dafccac6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-17T20:53:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-17T21:19:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix _sys_lwcond_signal_all\n\nFixup after #5883","sha":"6535fb0603e56bbebb0b86d5a325640a6805eb74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-17T21:00:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-17T21:19:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix _sys_lwcond_queue_wait\n\nFixup after #5883","sha":"dd86aa472dc73c56788573452de08fdf5220a642"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-04-18T08:58:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-18T01:01:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU Precise: FPCC handling on float ops implemented","sha":"0af342a978d5bc09dc3c02b48dd03f808704ea59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-06-19T19:29:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-18T01:01:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Partial compilation fix for WTH_GDB build","sha":"960c8e653894be99ba0144895880755c45626f5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-17T21:40:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-18T01:01:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Do not allow SYS_SYNC_PRIORITY_INHERIT in sys_semaphore_create (EINVAL)","sha":"62414cee158cf24d4696d9a50688ee9a66f73a36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-12T22:17:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-18T06:18:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/input: windows workaround to fix shift on the basic keyboard handler","sha":"8a31c7a7c848d90906c2d3335e8fc8efbeb530bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-17T14:08:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-18T06:18:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add option for keyboard layout","sha":"86a8b5924a5ac39eacb8f0132500e534ee73195f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-17T14:21:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-18T06:18:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellKb: improve key conversion","sha":"7408f50d71c5890bc45055c6fd85b15ea77ef3f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-17T18:57:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-18T06:18:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix diacritics in keyboard handler","sha":"eedf96e1f4497f83828dbf0cff5a81fd5cd285f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-17T19:28:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-18T06:18:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellKb: fix large ASCII characters for some compilers","sha":"b3aff3a1c68701aeec95e765662bda159bf332f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-07-14T15:47:06Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-18T16:03:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Improvements to XInput vibration:\n\n- use std::chrono to measure 20ms between XInputSetState calls, because clock() measures cpu time and not real time (so calls were made more often than intended)\n- fixup data types for cached vibration values to prevent u8 values overflowing and giving false positives on m_dev->newVibrateData","sha":"87ffa04a2b85cbbca3c01fead3216850a8e9a7f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-08-18T03:32:08Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-18T16:39:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix mismatched enum string formats in sys_config","sha":"5817e2a359779f90d08a985baaca4a8267d50487"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-06T11:46:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-18T17:45:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Surface cache restructuring\n- Further improve aliased data preservation by unconditionally scanning.\n  Its is possible for cache aliasing to occur when doing memory split.\n- Also sets up for RCB/RDB implementation","sha":"dfe709d46448a215b0fe11ab202faf6d9825d933"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-06T11:51:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-18T17:45:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Restructure surface access barriers and implement RCB/RDB\n\n- Implements render target data load (aka Read Color Buffer/Read Depth Buffer)\n- Refactors vulkan surface barrier to be much cleaner.\n- Removes redundant surface barrier invocations after doing a merged load\n  from surface cache.\n- Adds explicit access modes when gathering surfaces from cache.","sha":"5e299111cc4908092da67475dcc9d15dc6af5b82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-08T17:37:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-18T17:45:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Temporary workaround for race condition in blit engine","sha":"dca29def5e80add0afec2737682b1aaacba59db9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-08-19T16:12:27Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-19T17:12:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Reapply old template depth to compilers (fixes Gentoo building)","sha":"bd8cbcdb216c1bcbb09d2fe671ae988db28fa06b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5672538?v=4","date":"2018-07-05T01:45:32Z","email":"theracermaster@gmail.com","login":"al3xtjames","name":"Alex James"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-19T20:39:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"crypto: implement AES-NI acceleration\n\nThis is based off the upstream implementation in mbedTLS as well as an\nexternal pull request [1] for MSVC support (using intrinsics).\n\n1: https://github.com/ARMmbed/mbedtls/pull/1355","sha":"b0d0f51d8d05b486393fd91d24bc6e1a4ef3e73e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-20T18:21:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-21T05:57:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fall back to VERSION in game list","sha":"9c64318e8a00ee7353bce38ed6bd6bdce1822355"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-19T15:21:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-21T18:17:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fixup for D24S8 readback","sha":"35e61c77e0e6de05ff08fd567e3c98b3ae6eeaa7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-19T15:36:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-21T18:17:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Zero-initialize FragDepth register to match hw","sha":"67dac9470423aba8192ecce00e90373897b3e5a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-19T17:00:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-21T18:17:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix surface split logic\n- Calculations are supposed to be done based on the properties of the outgoing surface","sha":"be98554b40c802986b2b89ae278b833a1582894c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-19T17:20:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-21T18:17:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Free memory 'held hostage' by storage sections in the surface cache\n- Once the memory has been captured by another surface, release the allocation","sha":"9cd5325962d3272a00956b880584d9502abf251b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-19T19:40:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-21T18:17:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix handling of ARGB8 memory\n- Load into memory as straightforward BGRA\n- Fixes a bug in vulkan caused by byte shuffling in blit engine vs shader access\n- Removes the need for memory shuffling when transferring into a rendertarget","sha":"141072023bc93f0683c585e110968790932e2cb0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-19T20:41:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-21T18:17:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Invalidate range before reading to prevent deadlock","sha":"ca8b0da14158007b8b1187fff65eb13da7402745"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-20T20:22:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-21T18:17:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix reference leaks in texture_cache<->surface_cache communication\n- Properly commit orphaned blocks not invalidating existing cache structures\n- Do not ignore overwritten objects when commiting as unprotected fbo. Avoids stale references to invalidated surface objects.","sha":"5d1b7eb9454fc69aee47c8b157cbcec08463a845"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-20T21:49:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-21T18:17:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for blit engine range calculations","sha":"c67c97844e8a2c56f0c4ad1a6b420d32e7136dc2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-21T17:39:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-21T18:17:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Update tag timestamp to match newest inherited data\n- Avoids memory appearing older when used for depth test without depth write\n  The write_barrier before the call will inherit new data but the tag will not update as no new information is added.","sha":"7c5bde4aebf0251a5566d3fd133687dc9ae0f7e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-18T02:19:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:13:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"StrFmt.h: remove some dead code with UB\n\nGlobal variable is unused but written concurrently.","sha":"7a3aa02dc14ee9f5f40286f36d39d08ec910a29e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-18T13:29:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:13:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Don't call lv2_obj::awake_all with empty list\n\nFixup after #5883","sha":"7db2e2537fad292edcf18bca6d2301d0661996be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-20T01:49:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:13:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add new typemap for always existing objects\n\nNot to be confused with singletons or global variables.","sha":"8517ccfdfa08d5ec2ba324f694a50de104e02ee2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-20T16:07:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:13:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement cpu_thread::stop_all()","sha":"2882220cbd879b490fe71dc217c9fa2e6c2d72a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T17:29:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:13:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for cellMusic\n\nReplace music_t with music_state","sha":"606601441d503a5ddb0b60c1ca4a163e83fe28bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T17:30:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:13:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for page_fault_event_entries","sha":"a85a8796d3ee2969b3ee15dd690e13ad0421f420"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T17:33:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:13:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for LoadedNpdrmKeys_t\n\nRename to loaded_npdrm_keys","sha":"54952f6ad63015762b64fd9fbc1a9c9f2a17bff5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T19:27:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:13:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for page_fault_notification_entries","sha":"2740fafa6441bba62376acb6bf769e5d8cf23d63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T19:39:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:13:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for cellRec\n\nRename rec_t -> rec_info","sha":"93d5c0a38ed2d4b0c449b58d1b8a6ded291ca2c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T19:43:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:13:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for vfs_manager","sha":"4ac1e2d8f56f0e02113b78f915ea7c3e7f863caa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T19:51:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:13:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for cellSearch\n\nRename search_t -> search_info","sha":"02fe1ef7ffc03f2936f941c009947f516dcd7302"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T19:58:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:13:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo in cellRudp\n\nRename rudp_t -> rudp_info","sha":"2b55bde1049047e80967530258df049f1361ddff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T20:11:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:13:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for cellWebBrowser\n\nRename browser_t -> browser_info","sha":"8cf025bf7105918b9e6f813fd04ab90b3e48b86d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:46:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-21T23:46:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix VFS initialization","sha":"c43a126f6210373db9b249eae9d80ca47d647705"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-20T20:18:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-22T00:53:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix vm::reserve_map logic","sha":"ec9b896fbf6339911b9b8dd1b2feae88ca68df96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-13T19:35:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-22T06:05:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData/overlays/Qt: fix some warnings and a possible nullptr deref","sha":"b3c175985305612e0bfec1aca540a4f841b12fa7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-13T19:43:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-22T06:05:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData/overlays: initialize with focused entry","sha":"2d29a33ea889b742469cb4dd837e88d92487e1ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-13T19:43:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-22T06:05:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: ignore dot and dotdot","sha":"0b720aeb5974b949e81feb4d50299cc1ba85530e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-13T19:48:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-22T06:05:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData/cellMsgDialog: implement cellSaveDataDelete","sha":"896cfd2adecbc9bf40b5aa49f0466400992ad5e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-13T23:30:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-22T06:05:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: improve param.sfo creation","sha":"94dd6c2007971080a3d0030f123fee0c3aa8e3ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-22T00:52:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-22T12:14:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for avconf_manager","sha":"6165bd68c06d5aec98187dd089bb5b690aa4f42f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-22T12:13:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-22T16:09:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Appveyor: use VS 2019","sha":"b70908c8f3d42af99f6880d3013ebbacacfabe0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-25T15:47:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-25T19:09:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix offloader deadlock\n- Do not allow offloader to handle its own faults. Serialize them on RSX instead.\n  This approach introduces a GPU race condition that should be avoided with improved synchronization.\n- TODO: Use proper GPU-side synchronization to avoid this situation","sha":"9d981de96d6084e68eae139b483f6d6bffc48320"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-25T23:59:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-26T04:28:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"appveyor: Update OpenSSL DLLs to 1.1.1\n\n- QT 5.13 requires 1.1.1, default \"OpenSSL-Win64\" folder on AppVeyor currently points to 1.0.2s","sha":"0aea33687ef516371b6ecc824638b03f698687a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-13T22:38:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-26T17:03:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement depth_buffer_float support.\n- Since this is transparent to the application at all time, it only becomes a problem when doing memory transfer or DEPTH->RGBA conversion in shaders.","sha":"f9aea076aeed5e82f83c5dbdf3b69bfdae4d3183"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-14T16:35:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-26T17:03:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Decompiler fixups for conditional execution\n- Cond actually obeys vector mask","sha":"fe6ff8622aaa3c53d456cd4b2585286e12b518e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-23T16:36:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-26T17:03:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/decompiler: Restructure program register behavior\n- Fix reading of varying registers in FP\n  Different registers have different behavior\n- Always write to varying registers. If a register is not written to, it is initialized to (0, 0, 0, 1)\n- Reimplements two-sided lighting correctly without hacks\n- Also bumps shader cache version","sha":"3e28e4b1e03ddb79317392f801211c47e233c3ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-25T14:23:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-26T17:03:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Decompiler fixups and improvements\n- Fix 2D coordinate sampling of W coordinate.\n  W is actually HPOS.w and not 1. Z is however always 0.\n- Optimize register usage a bit\n  Disassembling compiled SPV shows that global declaration results in less ops than using inout modifiers. Modifiers generate extra mov instructions.","sha":"eed32cf3a46138b3e2b65f3f79909c2dabe017ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-25T06:06:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-26T19:09:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData/overlays: prevent possible array out of bounds in list view","sha":"32b5b11a830aa144a7a5a419d42200eefd01aeb6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-26T18:41:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-26T19:33:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Hotfix for semaphore timeout bug\n- Add pending flip requests as a reason to invoke the RSX local task handler and release the vblank semaphore","sha":"3317e13b6451329509854578dd80dcf9db14c73b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-25T03:06:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:44:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_cond_wait: Wait for rescheduling before relocking","sha":"35a3bed91aa4598a5a81aa3dd807d9dc57f9643b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-08-25T07:05:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:44:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"lv2: Wait for rescheduling before confirming ETIMEOUT","sha":"a921fe3351831cae331ff44a39313ed231ffc8aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-24T15:10:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for sysutil_cb_manager","sha":"8304043d000cc6fdf1eb0e35ced5bd9755146f5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-24T16:50:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for lv2_config","sha":"cf44038435327c5bacc79be12d6f05596a0a1ba0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-24T22:09:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for SysRsxConfig\n\nRename to lv2_rsx_config","sha":"38a06c4b149d5ec25fbcc964ca027b264a0ab662"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T00:20:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for fs_aio_manager (dummy)","sha":"9a2338a5ca4c063f99ef47e11ef92cee3d573489"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T00:44:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for cellGcm\n\nRename CellGcmSysConfig -> gcm_config","sha":"1d3c18f4e23a1a0e470cf49349f26f727978dd34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T00:52:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for cellGem\n\nRename gem_t -> gem_config","sha":"e4a7e8c058136974a378db3fc818079f068366ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T00:54:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for gem_camera_shared","sha":"7b0d834477b92cfa60bf9e4fb4268772d65c3104"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T01:02:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for cellMusicDecode","sha":"cfdd29869384ce32665f98b5f6edec89c90dd7b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T11:55:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for patch_engine","sha":"7a00b5f809b919cafa4155566f50a7a22791bbba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T12:04:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for rsx::avconf","sha":"928719b6583c53b6dac4a475beabfe0396a3c8c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T12:42:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for cellPad\n\nRename pad_t -> pad_info","sha":"2a37a4bcea02cb9a3b982acd25598853626a2f3f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T14:08:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for ppu_linkage_info","sha":"84e44d337292dfb66b59b587b36595a86410356a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T14:11:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for statichle_handler","sha":"ebdb0781faf6a48be84db9a7232b486a7b299c7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T14:17:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Init g_fxo in SPRX Loader mode","sha":"232e815f17487bc3f56449143057010bce9ca6e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T14:21:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo in PPUThread.cpp misc\n\nReplace fxm::get_always","sha":"3dd6961ee52e0753cad71611444372665c0b0e16"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T14:27:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for jit_core_allocator","sha":"4ec3e968ff87bcc700f0fa9f2e62aaa519afd756"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T14:28:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Deprecate fxm::get_always\n\nAnd also its unused fxm::import_always counterpart","sha":"fcbf91b7cba730efff5ef305fc77ea6ac698dcc0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-25T21:25:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use parentheses for new T() syntax\n\nMSVC keeps being dumb...","sha":"6811ec562ce9082afcc56a7cd18e44502d25d7bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-26T00:08:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for display_manager","sha":"d2eba2387b6381204b87b14d36f2ebf1c4be3038"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-26T13:04:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for cellSysCache","sha":"e41b234dc4fe07207f5df952ebd9eb31e7724c33"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-26T13:58:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T00:50:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove fxm::make_always","sha":"dd79a5efb79ec74f23a47f84c14b2555e7f97e9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T10:56:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T10:56:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silence statichle","sha":"796a6646f7018126e45c6f48602a23d62dbbc38a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T10:57:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T10:57:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix SPRX loader crash","sha":"ede816387fa1f01c25de7b47e87a625c0f682014"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T11:05:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T11:05:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert PR 6405","sha":"fd839243ecc2ae8f0ffb6ddd822870459d9fd808"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T12:01:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T12:13:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix sys_cond_wait\n\nSchedule PPU thread before relocking.\nDon't lock mutex in notify functions.","sha":"ec8c5453bcb4e2a608eca3c0b9916cb34f58fec8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T12:38:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T12:38:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_cond_wait fixup","sha":"b6b7d7b48cda5c674364187788a8205779907c3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T14:25:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T14:25:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix SPRX building on AppImage builds","sha":"9672ad53cdb3efb8fed1b87d4a7d2d8d3ebf12be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-20T18:01:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-27T18:59:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Restructure buffer objects to give more control over usage\n- This allows creating buffers with no MAP bits set which should ensure they are created for VRAM usage only\n- TODO: Implement compute kernels to avoid software fallback mode for pack/unpack operations","sha":"27aeaf66bc0be26ef8eee60208513b25ee6431d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-27T11:55:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-27T18:59:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement per-RTT color masks\n- Also refactors and simplifies some common code in surface store and rsx core","sha":"2962e05f26d49853df8dfe6d00d0d6f9d58c7623"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-27T14:45:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-27T18:59:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"emucore: Initialize fxo on loading RSX captures\n- Fixes crash on capture replay","sha":"64aff7f019af148e7455ee29458c342511a95321"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-08-27T21:55:48Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T22:26:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix improper string concatenation in rsx_decode.","sha":"cca6a19cdd05a44e3122077005a70e37096cd938"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-27T19:05:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-28T11:54:51Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix surface cache hit tests\n- Avoid silly broken tests due to queue_tag being called before pitch is initialized.\n- Return actual memory range covered and exclude trailing padding.\n- Coordinates in src are to be calculated with src_pitch, not required_pitch.","sha":"e334a43169454b1b5c413c4691060aff71d382f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-28T09:54:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-28T11:54:51Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Workarounds for some buggy games\n- Replace assert with log message until hardware testing confirms findings","sha":"e55d216619dc2f52310ea64ef4ddd3e99e3afc4e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-28T12:16:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-28T13:12:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for MRT color write lookup and surface_target_a","sha":"04c808b8abde175cb9e440832c614127b891003a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-27T22:22:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-28T23:44:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Put lv2_obj::awake calls under mutex","sha":"b3f5d6d85b688aa9b9260cb4d003e6066786b48c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-28T23:41:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-28T23:44:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS: Escape Control Characters 0-31\n\nEscaping NUL is formal, it's not expected on input.","sha":"801adb09473ee0723f19a7accf5507d381583761"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-30T02:04:38Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-08-30T02:09:59Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rpcs3_version: Bump to 0.0.7","sha":"c4d99f93db05058b34f7be48bb800e96902e754e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-30T17:49:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-30T18:45:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Check for stencil writes when determining zeta_write flag","sha":"e0a7912d7c83587336f26bc43eac0a81c4f12f37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-27T14:01:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-30T18:46:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Allow GPU-accelerated stream manipulation when doing texture uploads","sha":"99fb6d6a5d7aac6b9c5122d577baa4b99574bf4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-30T11:46:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-30T18:46:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Workgroup tuning for different vendors","sha":"61af2b7dfc0119c6d03f52bb5600039edc4b0686"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-30T12:21:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-30T18:46:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for surface_target_a flag being broken\n- While the mask for surface_a is at index 0, the surface cache expects the order to be maintained correctly!\n  Set the correct mask since surface store now checks each RTT individually","sha":"7f99de36c1340e11b15c1d0fdf6e8a1fabc1ed6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-30T16:47:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-30T19:02:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix system time wraparound\n\nImplement utils::udiv128, utils::div128","sha":"81a110f3469a54e843e72fc314731d726d15213b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-08-31T14:40:01Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-08-31T14:56:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update BUILDING.md after #6394","sha":"4f389757ee0c34fcc57addc130ecdb65e1d645e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-25T07:40:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-31T15:08:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix cli args and app version/name","sha":"7cf037bd492c40b8bde6951e379b6cbee22f3f70"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-25T09:51:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-31T15:08:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add --no-gui mode","sha":"432364cb049dbca4c29e81421242ada2f058da88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-31T11:30:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T15:59:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Warnings cleanup","sha":"a7b9ff33d87136d4d7274b4606d6365a38f08eda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-31T11:30:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T15:59:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Warnings cleanup","sha":"756fdedbf60e2b8f286655f1c5e53cf3b5b88c44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-31T11:31:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T15:59:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Warnings cleanup","sha":"0ee9d7b46dae9aa713c19204d8a8bae62544a94b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-31T11:31:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T15:59:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vp: Warnings cleanup","sha":"94656ac1e39dd8873547d52950a19f312a8d93fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-31T11:31:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T15:59:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Warnings cleanup","sha":"6504daa713245c6d88279ab0da9675f2f4caf0ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-31T11:32:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T15:59:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/buffers: Warnings cleanup","sha":"652f18ebaa19b4ec69de85eb01c29b8d3b52709f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-31T11:32:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T15:59:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/prog: Warnings cleanup","sha":"401bd9112a93d0ac607412f89e0d16ade2dcca4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-31T11:32:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T15:59:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/textures: Warnings cleanup","sha":"0158a88c889d573a11cb757130f31cd5b2359979"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-31T11:34:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T15:59:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/util: Warnings cleanup","sha":"7f7b499303521955fc9eb0792b2206b5e27da44a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-31T11:33:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T15:59:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/methods: Warnings cleanup","sha":"f8617500b52403aebce8e5275ef324fce6a0fb6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-31T11:33:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T15:59:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/cache: Warnings cleanup","sha":"33609717f8ce34811ff21ab864b8350e6fcf017e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-31T11:34:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T15:59:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/ring_buffer: Warnings cleanup","sha":"27fabd7607b1c46a95c05d6295cd4db2416c1294"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-31T11:35:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T15:59:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/texture_cache_utils: Warnings cleanup","sha":"e99e8460fef88aad988d14a9209104494050b9eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/53271430?v=4","date":"2019-09-01T16:19:11Z","email":"53271430+Joaozin-tech@users.noreply.github.com","login":"Joaozin-tech","name":"JoãoPaulo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-09-01T16:19:11Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Update FW 4.85 Latest Version (#6437)\n\n* Update FW Latest Version\r\n\r\nUpdates the latest FW version according to: https://www.playstation.com/en-us/support/system-updates/ps3/\r\n\r\nCo-Authored-By: MsDarkLow <msdarklow@gmail.com>","sha":"0dfe85dc14a7448aab401dd0062e5ffcde69b23c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-02T11:41:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-02T11:43:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"[noexcept] Don't throw on unimplemented HLE functions.\n\nGetting rid of exceptions.","sha":"a5be410e3f03fb5a6e21ebe109715850694b368a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-01T14:20:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-02T13:49:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Do not include ro data when attempting to do section merge\n- Avoids crazy situations like trying to merge from a 3d or cubemap in memory","sha":"9dc06cef7fb8482d15483904157fec99a574f786"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26828095?v=4","date":"2019-01-14T18:41:06Z","email":"devil0129@gmail.com","login":"isJuhn","name":"isJuhn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-03T00:19:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"File.cpp: add rounding_alignment argument to get_dir_size to allow GetSizeKB functions to report size more accurately","sha":"08c12f4c0094046528c0731edafb69e063b752ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-09-03T04:39:25Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-03T06:46:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Revert File.h encoding.","sha":"6bdab5322c7590d58fb6ca4ee79610fc8ad55447"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26828095?v=4","date":"2019-09-04T02:01:01Z","email":"devil0129@gmail.com","login":"isJuhn","name":"isJuhn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-04T11:05:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPUInterpreter.cpp: remove SSE4.1 requirement in FCTIWZ, FCTID and FCTIDZ","sha":"aaae437ca327dae4062c97d083cba29e00687af0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-09-03T00:39:24Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-05T00:01:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Simulate BSD FS for file order presentation in savedata","sha":"8de1239132dc572e41c6dbec72f6619a3ba2504b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-08-28T17:20:45Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-05T06:39:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add user message for uppercase RAP","sha":"80d18190f9143f85d35a810350dac6717b3936b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-05T11:48:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-05T11:49:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData fixup (#6393)\n\nIncrease entry max size","sha":"d0db7ca6bd396dc182d808bf365360f329962345"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-05T11:38:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-05T16:43:39Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Restructure commandbuffer scoping to allow faults in vertex upload\n- Defer renderpass open to allow recovery after fault in the middle of vertex upload","sha":"360c0e9af6fbe7faaaaca469a515713f5edd4adb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-05T12:19:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-05T16:43:39Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Remember to allocate enough vertex layout storage objects!\n- vertex_layout_storage descriptors were added but the descriptor count was not updated","sha":"14aa3b3360e22ec78427202aaf37ff1e17d53999"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1533879?v=4","date":"2019-09-02T02:50:44Z","email":"kevin@kevxu.net","login":"kevinxucs","name":"Kaiwen Xu"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-05T20:05:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Convert EROFS error","sha":"68071ddf838258ac55a409bb0ed250877c98b394"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-05T21:49:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-06T14:08:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"glsl: Explicitly declare const inputs as such\n- Avoids copying the values to temp variables before invoking function calls\n- Generates shorter, cleaner AST and SPV bytecode","sha":"f8dbe281a5bd24b035567eb3f6ae4116e460695d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-05T21:50:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-06T14:08:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vp: Set default inputs to (0, 0, 0, 1)\n- From some hw tests, it seems this is the default.","sha":"efa501dac67bc8980f9c85036dca5d417a90ad9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-06T14:48:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-07T13:23:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor texture optimizations","sha":"a3a0cb8c17e613348a13e3067e3d361ca92efca0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-06T15:38:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-07T13:23:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Prefer using native alignment when uploading.\n- Allows using fast copy paths and reduces memory and compute footprint","sha":"6aa0b49dbcf61a921f2ad1f35bbf97b4fba727f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-06T21:20:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-07T13:23:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Batch compute jobs when doing texture upload\n- Reduces overall number of invocations","sha":"440d58f2ffd9cc8174319366494f6030e30dbab2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-07T17:43:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-07T17:43:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix passive reservation locks checking at Emu.Stop() (#6482)","sha":"10c81fbdf94066fc45a87bc3201fce079f5a801a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-08-31T10:50:28Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-07T20:01:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix deprecation warnings\n\nwarning C4996: 'QPalette::Foreground': Use QPalette::WindowText instead\nwarning C4996: 'QPalette::Background': Use QPalette::Window instead","sha":"84867b0848d2036b8437082f5fa3c5f663404476"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-09-07T14:39:40Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-07T20:01:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add cache removal to UI","sha":"5ed700db5d31ec44b3495feb9a52acd53dbcd5c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-01T09:29:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-08T06:49:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellPad: disable reserved bit check in cellPadSetActDirect","sha":"cddc045c6949fc93e53fa09c1e6a57cb34baffef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-08T06:57:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-08T07:06:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: increase mouse acceleration max to x30","sha":"fa2034087db7e2058c14e9594b74d4b935c83068"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-07T15:31:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-08T10:56:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Do not byteswap uint24_8 as it needs a custom 8_24 decoder","sha":"48a5cd545fff0aa6806b32bd91a1359b4bbafd7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-07T15:31:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-08T10:56:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix depth_stencil scaling","sha":"cbce309199d76c5d9b305d3dcbaa707cd3eb97c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-07T15:32:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-08T10:56:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix surface_transform::argb_to_bgra transfers when no scaling is requested","sha":"312bf6840eccc4a00daae50b510bd98570a6be79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-07T15:33:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-08T10:56:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Deprecate surface_transform::argb_to_bgra which is no longer required.\n - vulkan now uses native swizzle mapping for both surface and texture","sha":"0af9685381f689aa7655c6be2157ad4e4b0d47d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-07T17:44:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T11:50:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove spin wait loop in cpu_thread::check_state\n\nIt was mostly dead code.\nlock_unlock() method already has spin waiting logic.","sha":"798434aada4af4c0c7922dde7eac745eb01decd4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-07T17:52:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T11:50:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix ppu_interpreter::MTFSFI\n\nOut of bounds error.","sha":"0c69b7da8fdc6de203b0ec4874517d50993aed28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-08T12:43:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-08T15:22:27Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix fast texture copy when src_pitch != width * block_size\n- Happens on mipmapped linear images","sha":"f53361b96677d7c21f9be4a162e3dbc258c6fe9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-08T13:21:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-08T15:22:27Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Crop malformed image descriptors\n- Some image descriptors (lle vdec?) are malformed with pitch being smaller than width\n- Crop these for now pending hardware tests","sha":"d1603fbb0bed3d197f476a1ca7f009227d4a404d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-08T15:36:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T15:36:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sceNp: add error_code and some param checks (#6416)\n\n* sceNp: add error_code and basic implementations\r\n\r\n* sceNp: and fix some structs\r\n\r\n* sceNpSns: improvements\r\n\r\n* sceNpUtil: improvements\r\n\r\n* sceNpTus: improvements","sha":"cb00b71c4b4aa76e36557f5c9b23a04dfe09db68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T16:26:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T16:26:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix compilation","sha":"693d54553c82eba1236b0279ec2e24c9f75010cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T16:27:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T16:27:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix gcc warning in bit_cast","sha":"aaf1b4c668a56be199d32e6b4a9d52e9af981d96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T17:45:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T17:49:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Audio: restore snd_pcm_recover for ALSA backend\n\nBut don't push audio data after recover as before.","sha":"0fcddf656898b62a22503559d80511be836ae8be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-08T14:09:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T17:54:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGem: add error_code","sha":"c11120963970721b8a318c5f47fa0d887c5565f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-08T15:04:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T17:54:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellMouse: add error_code","sha":"6aacec4694735bdd06a8c42fab6ae027506ea61b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-08T15:13:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T17:54:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellVdec: add error_code","sha":"aa262889f27d321de53d2b74bd8205d2dcfc9326"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2504890?v=4","date":"2019-09-09T13:08:29Z","email":"arabek@users.noreply.github.com","login":"arabek","name":"Wojtek Arabczyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-09T16:16:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix warnings in rpcs3/Emu/Cell/Modules/sceNp.cpp","sha":"cb66d05693504f4e453999af489786d05d2a8e51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-09T16:14:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-10T13:54:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Modify find_cached_texture to respect gcm_format. Can pass 0 for \"dont care\"","sha":"75fcfac00ea4a399210a5d690386eb14d984847f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-09T16:55:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-10T13:54:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Allow sampling from shader_read resources for blit engine\n- With harmonization between all texture types implemented, there is no difference between blit_engine_src and shader_read for supported formats\n- Adds extra format filtering to ensure no conflicts when copying data","sha":"412c620b9daad5c606d9792222f08301f7a1d6e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2019-09-10T07:28:11Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T14:41:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Thread: drop is_leaf_function after 5e3bacbd9b32","sha":"53e7f6c5a5932b21a483825fa6dcaa424e42969e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T19:48:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T14:43:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: implement wait callback interface\n\nWill be used to wake up threads uniformly.","sha":"1668d6ee1b20079e8d93571f2340f1f7191e0185"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T20:27:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T15:48:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"named_thread: install atomic wait callback","sha":"faba366f89c67c98d79349fd66954d19a5d39509"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T21:55:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T16:25:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove timeout support from lf_queue::wait\n\nAdd notify method and use atomic wait","sha":"b91661ae71adb837666e5a0bf504ca4729a12739"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T22:29:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T16:25:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove `notifier` class\n\nPoorly implemented condition variable.","sha":"a45f86a4a28b9804e8e9e6f28d48a24ae22c931b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T23:42:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T16:25:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: add timeout support","sha":"aa99faa85d3a1d856075f33382e7f60600db7d66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-09T01:32:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T16:25:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: optimize internal logic\n\nMove waiter count to highest bits to prevent false futex wakeups.\nTest pointer bits properly in notify_all to avoid false wakeups.","sha":"a808c2aaf6d937725ffd37db7147082f25053ad6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-09T01:41:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T16:25:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove `unique_cond`\n\nNot very useful.","sha":"92a75cfa80767257b2fd1a0ab4820aeb2d6da00f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-09T02:28:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T16:25:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: fix signal saturation logic\n\nMake sure to notify_all at max signal count.","sha":"67f31c17d1a70340f4033c58e7062451c44b5f12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-09T08:09:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T16:25:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite `cond_variable` to use waitable atomics\n\nIncrease max_timeout and fix max_timeout usage","sha":"d13ff285d1bcbb7d503fe94b64ee184459f3bc04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-09T08:29:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T16:25:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove `shared_cond` and simplify reservation waiting\n\nUse atomic wait for reservations\nCleanup some obsolete code","sha":"0a96497e135bc6564bdc686407f75706fe62c92e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-09T09:28:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T16:25:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: implement collision fallback properly\n\nShould prevent devastating effect of collisions","sha":"4504ac2d124832dbc03364e0748e66716e60a71d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T15:56:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-10T16:25:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify thread_base::join()\n\nUse waitable atomics","sha":"c1b0934f72a684d08361fc03dfe65820d1f5b948"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-10T23:53:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-11T20:30:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for blit engine when moving inverted regions\n- Properly calculate overlap range when sections are inverted\n- Simplify transfer logic for inverted regions","sha":"27af75fe71308215b949a75bf7471ab40a97111a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-11T14:41:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-12T11:08:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve use of CPU vector extensions\n- Allow use of intrinsics when SSSE3 and SSSE4.1 are not available in the build target environment\n- Properly separate SSE4.1 code from SSSE3 code for some older proceessors without SSE4.1","sha":"60845daf456657f56c6637efb9967cad90c7dae8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-11T15:55:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-12T11:08:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove log spam for cond render","sha":"7fdb4976d8197aa58589ca543194f4896292012e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-17T11:06:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-12T20:32:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: RDB fixup","sha":"f06559412ef3ac82ce680a3ee12d44da0937ee6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-08-17T11:06:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-12T20:32:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Reimplement DMA synchronization","sha":"212ac19c118efb9a2a895af1e41cd39fa3b50d63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-04T19:19:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-12T20:32:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Experiments with nul sink","sha":"858014b71812bbb6ccfaec6e520a92f2be7a2288"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-05T13:08:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-12T20:32:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Do not use nul section if resolution scaling is active on a surface","sha":"cd1345b6bb477548c89f9b183a19c000216ecb6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-06T13:39:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-12T20:32:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Check if memory actually exists when overallocating blit targets","sha":"9842823a8c1e3bc79fdf71cb57704ae0197f7abd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-12T14:33:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-12T20:32:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve hit testing when scanning for overlapping surfaces\n- Calculate exact sizes when doing hit tests to avoid false negatives\n- Defer page checking until actually require to do memory setup\n- Introduce align2 helper to do non-pow2 alignments","sha":"cc313b052f2e4294b90d024827072bfd72c973f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-12T15:35:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-12T20:32:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Workaround for exit deadlock\n- Avoids games locking up when the stop button is pressed","sha":"52e8747b83f410a77c75f1166ad412f839c0debe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-12T18:51:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-13T04:18:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNp: fixups","sha":"32a4c2242baae000978cd3eca7a3dee13f6d7759"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-09-13T07:14:52Z","email":"CookiePLMonster@users.noreply.github.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-13T07:14:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Make \"Clear shader cache\" clear all caches, not just the first (#6538)\n\n* Use QFileInfo::suffix to obtain and check for file extension when clearing caches\r\n\r\n* Clear all shader caches for the game, not just the first","sha":"3e9ed9a17dbac989e2ffa253e89f218c448f54f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-08T16:27:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-13T08:30:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Enable stylesheet cli args and add stylesheet option \"None\"","sha":"2ab19efb90693a88c7ea333c06b1aade20d62731"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-08T20:49:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-13T08:30:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add --styles cli arg","sha":"dadfdc35f4bbd664f0fb22f6d4049b92a4e10a17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-12T23:53:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-13T09:28:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Allow only sse4.1 capable CPUs to take the accelerated index path\n- Older sets lack the required min/max functionality","sha":"c59cb1bdd3e4e55f15534739c072019a5b2cfd35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-12T12:43:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-13T12:53:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: add atomic wait mask support","sha":"2fc88443150e30f262dc8a0a2735140fb0fa35ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-12T14:14:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-13T12:53:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: increase hashtable capacity\n\nDouble size and ignore 2 lowest bits (effectively x8)","sha":"e982871ab52485abb4653ea680247c85dd78f097"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-08T20:59:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-13T12:53:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Abort named_thread in cpu_thread::stop_all","sha":"223319dd2e49de450c70bdfb88df787b9608062a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-13T20:52:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-13T20:52:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix lf_queue::wait\n\nRemove incorrect loop","sha":"c9170bbb88e26120a0216dbd5f3415709c8dc514"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-13T20:54:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-13T21:02:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert \"Remove `shared_cond` and simplify reservation waiting\"\n\nThis reverts commit 0a96497e135bc6564bdc686407f75706fe62c92e.","sha":"b70c08a2e84add040c3a04ba3edad37d1947d4b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-09-14T20:11:17Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-09-14T22:46:12Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Update CMake version in BUILDING.md","sha":"fb8e70d7f62fb8ddb375f9f8692921b975a46ba1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-09-07T10:31:48Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-15T20:48:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Pad settings dialog improvements","sha":"8f965ccd48247e387dec0b2bc42166fc64924742"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-09-16T01:24:06Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-09-16T03:00:49Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Report filesize in bytes","sha":"794a1fef1daefffc7194d083b2735842af052bc9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/45379459?v=4","date":"2019-09-16T18:38:30Z","email":"45379459+youwereeatenbyalid@users.noreply.github.com","login":"youwereeatenbyalid","name":"youwereeatenbyalid"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-16T18:38:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add a \"stack mode\" to the TTY. (#6542)\n\n* Added stack mode to TTY\r\n\r\n* fix declarations\r\n\r\n* Fixed spacing, removed namechange to preserve user settings, removed debug string\r\n\r\n* removed rename of \"stack\"\r\n\r\n* Add menu separator and remove whitespace","sha":"cea975f6a6ebf2a0bf57b4cc642fe08bc6ea0e54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5692900?v=4","date":"2019-09-15T09:46:39Z","email":"5692900+windyboy1704@users.noreply.github.com","login":"auranticus","name":"Windy Boy"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-16T19:08:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"TSX instruction tooltip typo\n\nShould be \"CPU\" instead of \"cpu\"","sha":"d782abb3fd888f8e5812b2fd733e7fec891376fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-04-26T18:44:40Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-16T22:17:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Adds md5 hash to Crypto implementations","sha":"2f884de885b67532d30c1ca86176310d6a390312"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-02-25T10:23:15Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-16T22:17:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_usbd implementation","sha":"e98c7f4e1a535e7841a6e860331cf61177fe748f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-04-28T21:35:11Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-16T22:17:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CellPadLdd functions implementation","sha":"2b8890b1936e10ae87437d842c62e0c3d1f02e2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-14T21:15:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-16T23:46:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::gvar: add array support","sha":"584174d371dd8689259c2cbdc9a75734f9d166f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-14T23:04:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-16T23:46:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellAudio: use vm::gvar to allocate working memory","sha":"76314520ef2531c540ad73f2bee7dc8fd45cbd9b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-15T12:19:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-16T23:46:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"named_thread: implement default thread name support","sha":"75941e62a8a396f7df22a937082acf0f66306569"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-15T12:19:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-16T23:46:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellAudio: use g_fxo","sha":"36a528067c63a4951561eb9e6957b12251fc2ebe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-15T16:47:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-16T23:46:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellMic: use g_fxo","sha":"c2fe2ac4a4a018b036e4de123839b0df0bc86697"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-17T12:10:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-17T12:10:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_usbd: rearrange includes","sha":"7e2edc22329d7103640a984a24d2a35a54973de0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-17T12:23:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-17T12:23:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_usbd: use g_fxo","sha":"3eba0f45239ea0a4d3a735e3397382e0d6178a1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-17T12:29:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-17T12:55:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Delete g_idm\n\nNeeds to be reimplemented","sha":"c900fb0d77e2b17412ab4ca9379ba49ba7400ac4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-17T12:44:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-18T12:42:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Properly test MSAA sample mask when switching between states inside a RSX renderpass.\n- Before, these changes would be lost if the same RTT config was used with varying mask setups","sha":"bd4d86f87a29cb2d64a9e3f56a6221688dfe5e1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-09-18T16:41:25Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T18:19:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Adds initialization checks back in sys_usbd","sha":"7e2bb0fd1ffb99873eb1fb609ed418752fb5bfd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-17T20:26:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T18:24:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix vm::reserve_map NRVO","sha":"20cb19618d84df3c428bc2f498685f813a85bc0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-17T20:46:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T18:24:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for global lv2_memory_container","sha":"a4951ec40723a8be0051fe6b4db7e15e1fc5c4d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-17T21:14:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T23:16:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellCamera: use g_fxo","sha":"353a7ff8e6c4a498a5a475558aca242d6be68fdb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-17T23:50:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T23:16:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix manual_fixed_typemap::init result (g_fxo)\n\nReturn uncasted pointer to created type","sha":"8054735cab406d00d790131cde7b1ff026cc13ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T12:26:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T23:16:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"typeindices.hpp: fix constexpr constructor\n\nSerious bug...","sha":"be61499790bb34dbffc203058c117c0e51c9727f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T12:30:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T23:16:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"typeindices.hpp: rename typeinfo_v to typelist_v","sha":"c7bf6421f49764ba516587ef124606c0ea68feaf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T12:40:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T23:16:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"typeindices.hpp: add typeindex() helper","sha":"309291452711de03b3051fa2ded14dcaff4099ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-17T23:44:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T23:16:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for pad_handler","sha":"4bba1e3337d88cd4ecaed30d48e658949ce00ac2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T22:36:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T23:16:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add init_mutex.hpp\n\nPseudo-mutex to protect initialization and finalization","sha":"17d764409e2b4f1780a58a3196167ac94473420b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T22:50:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T23:16:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for cellKb, cellMouse\n\nUse init_mutex","sha":"4b19e55fcce21cec0155ce5c4d5fcce3d9d27f48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T22:51:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T23:16:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silence skylander message","sha":"538a5cc9d8aaa08a5d7d23beb086bac8c3295747"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-18T17:37:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-19T06:26:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix sceNp2Init","sha":"c50119aefa3529ac6c364657d70be653fdbcf0c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-17T11:26:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-19T20:10:09Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Restructure flip code and frame scoping\n- Add an explicit frame scope marker tied in with the queue_prepare command\n  Since queue_prepare is emitted at the end of a frame, it can be used as end-of-frame in games that emit this\n- If this command is not emitted, fifo flatenner and frameskip will not work","sha":"2c76f47eec999faed76c0fa5cf2a57a4592e9e35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-19T17:08:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-19T20:10:09Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactoring and improvement\n- Separate displayed statistics from actual backend statistics.\n  Allows asynchronous flipping to work correctly as it just uses display stats.\n  The real stats are used by the frame scope marker to determine behavior like engaging the FIFO optimizer or skipping draw calls correctly.","sha":"e0005ec347087e552c6e8c20a4e3f8b69b9d04dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-19T17:06:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-20T08:53:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: fix enter button assignment in osk","sha":"aa7eb1536a595ecd70763bb9e1f0883eb25fb8fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-09-19T22:14:09Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-20T09:00:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Forces numeric locale to default","sha":"7818d0767b5d84cdc3321698caa70d1b9d275db9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-20T10:01:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-20T12:08:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Avoid recursion in flip handler","sha":"1a892c6b1bf7b2be5e189bb940399bee3c16a9ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-20T06:11:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-20T20:12:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: Remove unused flush member","sha":"7193d407b96921612ddafd52968b20e242199615"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-20T07:01:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-20T20:12:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: Ignore unused reserved button (key code 0 was used twice)","sha":"8a63ac033eee3ff02f606929f953b16915b20da4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-20T07:44:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-20T20:12:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellPad: fix out of bounds warning","sha":"571bb914f5571dad77195741570f0f866793ada4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-20T08:12:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-20T20:12:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: don't intercept pads after system dialogs, but still ignore input","sha":"caef52e3b3cf9f2c22e1d5d29ec8416b4941ce73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-19T12:57:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-21T00:59:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve strcpy_trunc\n\nZero all remaining array","sha":"a797b350a0258794067be60cdd81d11e31f2dffa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-19T12:58:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-21T00:59:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix unwanted statichle_handler init","sha":"e7d67f9732aeaf7ac9ece9684d87529ac3a8c85b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-20T12:40:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-21T00:59:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cond_variable: fix warning in cond.h for MSVC","sha":"3121fecc8f6822793f5b658f39b75127507a853f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-21T12:31:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-21T16:55:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"dont escape from check_state() before ensuring signal is resetted.","sha":"399ea2edb2bbe2be936d8162792ec03c356118a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-08T12:11:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-22T08:16:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNpTrophy: add errors from RE","sha":"2dc71cfe511f690c337f520e058a8b956f4ca833"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-13T08:21:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-22T08:16:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNpSns: add more logging","sha":"88388f1efc545e866e04ef7733bdeb0fbf244bbf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-09-22T09:22:42Z","email":"CookiePLMonster@users.noreply.github.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-22T09:22:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add SCP extension support to XInput pad handler (#6524)\n\n* Add SCP extension support to XInput pad handler\r\n\r\n* Add SCP mention in xinput handler description tooltip","sha":"a44b1018b527ff70547d8b8b8f9b314d7656109b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-14T18:00:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-22T23:35:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu disasm: Improve disassembly of BCTR and LWSYNC","sha":"2c47e39f08ff680e9e32e60af35f6fad83b7976d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-19T07:39:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-22T23:35:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu disasm: Improve BC formatting","sha":"718491c56dc7279dbb9dc70cdeb7aaee9dbe6669"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-23T00:07:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-23T00:07:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Log param error code (#6587)","sha":"24940913532eeb095049edd5ad009de021a80b4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-23T00:15:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-23T00:15:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData fixup","sha":"40fcd457bf31adea35b3989ca3d7ef420322d0b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2019-09-23T13:47:13Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-23T22:00:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: unbreak build with Clang 9\n\nld: error: rpcs3/CMakeFiles/rpcs3.dir/main_application.cpp.o: unable to find library from dependent library specifier: opengl32.lib\nld: error: rpcs3/Emu/librpcs3_emu.a(GLGSRender.cpp.o): unable to find library from dependent library specifier: opengl32.lib\nld: error: rpcs3/Emu/librpcs3_emu.a(GLRenderTargets.cpp.o): unable to find library from dependent library specifier: opengl32.lib\nld: error: rpcs3/Emu/librpcs3_emu.a(GLVertexBuffers.cpp.o): unable to find library from dependent library specifier: opengl32.lib","sha":"5ec35c7daadff8e3487581174c73d7402a601edc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-18T23:57:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-24T02:01:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert \"Revert \"Remove `shared_cond` and simplify reservation waiting\"\"\n\nThis reverts commit b70c08a2e84add040c3a04ba3edad37d1947d4b6.","sha":"feee3838eb7e0833696ec3b35cfc9c536b5ef813"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-21T11:02:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-24T02:01:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: fixup for atomic waiting","sha":"74471e8ea3f6fdf506223db6f62919a0578f9e66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-21T18:20:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-24T02:01:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: fix pointer mask","sha":"95c939f01406999953301195b23a53ec900faebf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-21T22:31:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-24T02:01:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: use native semaphores on Windows\n\nWindows: drop keyed events\nLinux: keep using native futex\nImplement unused POSIX semaphore path\nImplement fallback semaphore with pure std (OSX, BSD, etc)","sha":"9710473a2e3e006e659cef4601bd8b5db1036fc4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-23T17:37:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-24T02:01:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make errors in Emu::Init verbose and don't crash\n\nAllow TTY.log to be disabled if file access failed\nAdd fs::error::isdir","sha":"aa8a7b3e8a7b7a483a4644864fe29df41f26606e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-09-09T20:39:53Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-24T07:11:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix null pointer check (clang warnings)","sha":"c62a667fb1964cc5febeaf10fd12f62bf0baf793"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-09-23T10:45:12Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-24T07:18:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Implement sys_usbd_event_port_send","sha":"4de301a96182d0e8631b635fde17114f4fdeb4c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-24T13:17:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-24T13:18:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix fs::create_path\n\nDon't try to create already existing parents","sha":"8f47f9517a35e2419d86872f8662eb23f92f588f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-20T14:28:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-24T19:09:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: move some pad handler logic to the parent class","sha":"459414840976a8e999b3ed40600444d26587df28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-09-24T21:56:18Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-24T22:07:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Only free the list if libusb_get_device_list succeeded","sha":"e0d501124fc28349dfad7be25f59c8690aa82c19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-24T22:27:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-24T22:30:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: fix missing override in keyboard pad handler","sha":"41050c436453176bd2b47f749bff67f195ed2fb0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-24T22:37:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-25T05:33:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix some new warnings","sha":"297016aba3d9fd387361f161204313f8de1995ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-24T22:49:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-25T15:47:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData: add auto maintenance routine in Emu.Init()\n\nThis routine:\n1) Removes junk backup directories\n2) Fixes interrupted save data process in edge case\nThis case can happen if emu terminates between two atomic renames.\n\nAlso use directory renaming technique for delete op.\nAlso rewrite recreate operation to be part of atomic process.","sha":"f841b47b6b9378aedd00f3355e0fc52736ba0827"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-25T01:13:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-25T15:47:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData: always commit changes on error in funcFile loop\n\nMake sure the changes which are already done are written.","sha":"cd843bda6e78ffd713e0bf718f24946685d1accc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-25T01:57:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-25T15:47:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve vfs::host::unlink on Windows (for sys_fs_rmdir)\n\nPossibly fixes sys_fs_rmdir and other cases of directory removal.\nMake sure the directory with deleted files always becomes empty.\nFor this purpose, temp files are moved to the root of the device.","sha":"ccf9543b44fdd039dabf5c3cf3cef3ba8e3ea67b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-25T18:20:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-25T19:13:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: fix DS3 button presses (forgot the non pressure sensitive ones)","sha":"839fe786a2a54e742a833bf992ae2d04b4018a14"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-09-14T03:05:00Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-25T20:20:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix debug build\n\nSeems to be a compiler bug","sha":"5ac631e03b5e3c8004b96224ab1f30e74ce3a413"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-26T11:06:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-26T17:12:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add chip family detection","sha":"acc986be3fdd79cc1bf9c001a579687bf69b675e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-26T11:46:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-26T17:12:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add turing workaround\n- Turing crashes if using the depth->color transfer hack","sha":"ee0633f43a9caff75a8585e72838372ac9ee36fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T13:10:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T20:26:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellGameData: use g_fxo for content_permission","sha":"240b4a8bd8f05a9a28b6f79da9b7b21798527763"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T14:06:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T20:26:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for global ppu_module instance\n\nAlso fix autonomous PRX/SPU loading sequence.","sha":"b48cdc2260793563948b4515d4256a409a4c09da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T15:32:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T20:26:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for rsx::thread","sha":"5f9c5e8765366672bd795fec066c85309e9dfe82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T15:45:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T20:26:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for spu_cache","sha":"a6edcca6e653929c2a61df333633f9b6a6113cb1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T16:07:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T20:26:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for rsx::rsx_replay_thread","sha":"50fc5dfde5a8da6b93532ea233cf1a49b850da89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T18:35:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T20:26:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellOskDialog: use g_fxo","sha":"3c72069ae6270950ad6a43627a4b2c7d8161d58b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T18:50:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T20:26:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellMsgDialog: use g_fxo","sha":"c065a21b744e78320f8cc596bb6889a83d73159c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T18:55:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T20:26:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Finally remove fxm from IdManager","sha":"465b16e78660864d84b8484ac425394bc6c51bee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-27T16:00:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-27T16:04:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData: fix VFS escape usage","sha":"57f2189b1a3e293ab29b7717f631b68556c019af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-09-27T16:27:17Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-27T17:01:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Log game version","sha":"6979b96225d622d5303b0715ae3ed5b5cfdee8f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-27T18:02:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-27T18:07:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add missing initialization","sha":"e53e98749fe3384e07dce3dd2df758601a87c453"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-27T09:34:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-28T00:16:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_rsx: Format special sys_rsx invalid param error, warning fixes","sha":"7f725e065531fed44e9bd536b467ff58dadf1fb2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-27T14:22:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-28T00:16:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SCE_NP_ERROR_OFFLINE logging disabled","sha":"d0503dc937e4ea0ed850453d57130daee8f4e107"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-20T10:14:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-28T00:42:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Rewrite CGX","sha":"e315b39822d8c6a9fbfe8f19bd12e8ed0d007020"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-20T12:13:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-28T00:42:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Rewrite BGX","sha":"feabe7118378cec374680710c79892d07891b94d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-27T18:57:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-28T10:24:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Remove a debug print","sha":"28534e8833b90f465ecb2bf48be61cc425b9f292"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-28T09:53:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-28T10:24:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Properly scale overlay passes to match drawable area","sha":"2275259bf5160c98fc51515280e80ce75f65e622"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-27T16:59:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-28T12:39:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix wrong comments in CPUThread.h\n\nIt's not an upcast.","sha":"c7c12941bc55800647fc8eac3968ba4ff125bff7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-26T18:57:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-28T12:39:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Tidy endianness support (se_t) implementation\n\nMove se_t and se_storage to util/endian.hpp\nUse single template instead of two specializations.\nAdd minor optimization for MSVC.\nRemove v128 dependency.\nTry to enable intrinsics for unaligned data.\nFix minor bug in u16/u32/u64 specializations.","sha":"bd1a24b894278adeb7145aa6345dd03eb80e0ac1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-27T19:04:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-28T12:39:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve to_se conversion template\n\nAdd sizeof check instead of filtering out 1-byte types.","sha":"21885264f7d1d68eec23f7ed3be09e8d114d63aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-27T19:25:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-28T12:39:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Restore experimental optimized operators == != for se_t<>","sha":"046f8510fa4ab8ea14a75d1e1c221b0b73ec27d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-28T11:32:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-28T13:02:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Bugfix for sceNpUtilCmpNpId\n\nFix checking bounds, use memcmp\nFix result store on sceNpUtilCmpNpIdInOrder","sha":"b9b879c3d303092bcb92cdd82958301b87a071bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-28T12:30:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-28T18:13:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Restructure deferred flip queue handling\n- Allows frameskipping to occur naturally if RSX thread is bombarded with flip requests but just jumping to the last one if possible\n- See request_emu_flip() for async frame submission and implicit skipping\n- Also allows display queue to fill faster than the flip thread can drain the queue","sha":"14640694764bebbd7d1df03ed5e1bf5af6f93031"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-28T17:29:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-29T08:39:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Check frame descriptors before rendering in case of a flip request between begin() and end()\n- There is no reason to delay async flip requests since most of the work can be handled during rendering anyway","sha":"69c090b14a34f94b1346bdd209eaea0866366e07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-28T17:52:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-29T08:39:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Align width properly when normalizing to avoid fractional results being lowered to 0","sha":"ef5b56bc48f07c851a4ede2938d0e89e5e5da1b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-28T18:10:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-29T08:39:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Increase wait timeout in case of problematic GPU loads causing heavy stutter\n- When compiling LLVM objects, it is possible to starve the driver thread and cause the timeouts to trigger\n- Observed in RE6 when using SPU LLVM since the game generates a very large number of objects \"infinitely\"","sha":"8cfd3b56d61fa128bce2780591cea02f57774279"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-28T07:29:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-29T10:05:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Avoid unsigned/signed mismatch with fifo ret addr","sha":"822287b4188e9649621bc371df6959020784ee46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-28T07:31:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-29T10:05:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Mask FIFO PUT on rsx execution","sha":"319fc8c55da1626d914ff187e31becca8c1b8542"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-29T14:55:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-29T19:00:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"config: dynamically show_fps_in_title","sha":"19e0d099b68156dfe7f773f5d85ccfebb5c87713"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-29T09:11:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-29T22:40:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix missing point size export\n\n- Sometimes program-point-size is enabled, but the vs does not actually\nwrite to the point size register. In this case, pass the incoming point\nsize along instead of the default register init.","sha":"bcf8799079a45834ab8bb41fda6e0592a8a66202"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-29T17:23:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-30T14:30:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Optimize FIFO PUT masking","sha":"70b4ae6bd61709443177475acf1c14c6ede2cff9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-29T17:54:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-30T14:30:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Flush FIFO GET before smeaphore_acquire","sha":"0b2fa6ffdc6e6c4a1a00a628b003b1f44e93a14b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-29T09:41:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-30T18:52:43Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Remember to unbind attachments from active framebuffer after clear\n\n- If a stale reference is left lying around (e.g the texture bound to\ndepth has been deleted and we attach a color image) no operations\nactually take place. glCheckFramebufferStatus also does not catch this\nproblem.","sha":"88229f4716c7f3a5994b1a83312927e4069eefa3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-29T09:55:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-09-30T18:52:43Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Add missing input declarations for 2-sided lighting","sha":"7aed9c3f135abd30e63b6e20fdab37cdddbe3374"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-28T16:34:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-30T19:26:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Restore experimental optimized operators &= |= ^= for se_t\n\nThey were removed approximately 3 years ago due to their rarity.","sha":"0f567abdd8585e426cf5e712cf2fa8066dc7d820"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-29T13:01:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-30T19:26:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix enum vs integer comparison in se_t::operator==\n\nNeed to convert left part to its underlying type.","sha":"5f29840348c4105e54aa39c9a3746f2156dd880b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-29T17:26:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-30T19:26:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement optimized operator~ for se_t<>","sha":"e56ffc1e69e628eb1d9794b03d9b8a963e98eb7d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-30T12:55:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-09-30T19:32:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement optimized operators &|^ for se_t","sha":"f83385926b6448de8c240255d2e4d38b85116d96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-29T10:55:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-02T00:52:42Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sceNp2Init: use u32 in poolsize","sha":"286d62d09cfdee53faf59554efc574fb879b6594"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-03T20:05:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-03T20:05:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_cond fixes (#6584)\n\n* sys_cond fixes\r\n\r\nsys_cond_wait is now signaled atomically (regression fix)\r\nFix a corner case with sys_cond_wait and sys_cond_destroy EBSUY check (waiter count was inaccurate if thread is not the owner of mutex)\r\nAdd not about EBUSY corner case (TODO)\r\n\r\n* Fix inconcistency in sys_cond_destroy and ETIMEDOUT\r\n\r\n .. event at sys_cond_wait regarding waiters count.\r\n\r\nNow waiters count is properly connected to the mutex owner actions after ETIMEDOUT in sys_cond_wait.","sha":"08e674aa282c12a1a6ddbe64b1260eb04b114481"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-02T16:27:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-04T15:10:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Explicity describe transfer regions for both source and destination blocks","sha":"4a19a2dd24f18b02e8a36a117f4ee3e386c57b82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-04T13:04:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-04T18:22:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"evdev: add missing override\n\nremoves a warning","sha":"df5af508664080e45e213318b1ae70aa47358075"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-04T13:26:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-04T18:22:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"mmjoy: fix connection update spam","sha":"f7ec6792427bcb4e939dba331c13233c4d7a5116"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-04T16:04:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-04T21:05:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix high dpi setting","sha":"91f53a366b0876f99427c02b6bd3ebcd2abe9853"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-04T12:52:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-04T21:06:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: use Qt standard button layout in settings_dialog","sha":"f97ed7738de6701c03c6b56c7585daf9cd0fa0cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-04T20:47:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-04T21:06:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: use Qt standard button layout in vfs_dialog","sha":"04a6b065b4a0100d46e443783ee130c5d6144e8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-05T08:59:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-05T09:01:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"typo fix","sha":"305a5bd717c75dd15505154119550620b0d394d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/205276?v=4","date":"2019-10-05T00:30:59Z","email":"admin@rajko.info","login":"rajkosto","name":"Rajko Stojadinovic"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-05T11:25:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make windows_file::stat return the same mtime as fs::stat","sha":"297e3c5996d97ede5b9897720251160f752f1cb1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-05T10:41:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-05T12:00:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Default initailize zcull reports padding","sha":"9e929a25d4599c4b99c735c440e10b7346825003"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-10-05T13:23:12Z","email":"CookiePLMonster@users.noreply.github.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-05T13:23:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Create emulator directories after changing dev_*** directories (#6707)\n\n* Make pkg_install create path to the game recursively\r\n\r\n* Create emulator directories after changing dev_*** dir paths","sha":"f5d8110ead670e0981b9fd9754cd5afd56d36e12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-01T14:45:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-06T10:33:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fixup for se_t operators &= |= ^=","sha":"86fb2993ad24d62f3d7b4d3f5a2ab41e85ab9fe2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-06T10:30:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-06T13:03:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add dummy alert param to thread_ctrl::wait API","sha":"803118037336be6a63a950eaadb1970eb0074c47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-03T16:57:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-06T13:03:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: optimize function dispatch in trampolines\n\nAdd a top-level hashtable","sha":"239f53568c572aea517e1e9310ddb2da2e17e360"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-06T10:32:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-06T13:03:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Prioritize vip_lock in shared_mutex\n\nShould fix some deadlock issues.","sha":"cf13dee1f3df62df18abddd8b4dd236d9e241d07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-06T17:40:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-06T17:40:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix minor warning","sha":"aa659f3c36d595ad28abbbbed2626b80e8bbac8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-06T09:32:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-07T17:25:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellOskDialog: add some param checks","sha":"d402507be2aba6440086fe45ceb4766478d80bd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-06T10:35:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-07T17:25:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellPadGetData: clear buttons if input is ignored but not intercepted.\n\nneeded in Hotline Miami and NinJa Gaiden Sigma, fixes Gran Turismo 6 regression","sha":"3455d7697036f06e8829cc4e13343e724adafc4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-01T07:06:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-07T23:52:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"spu: Mask SRR0 at write","sha":"c2278fb87985b738b1ec9cff28927f9e87ff4a6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-01T09:11:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-07T23:52:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_gpio Cleanup","sha":"36de3d4f4c1f9772de921290c21daf1cecc9a277"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-29T07:56:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-08T06:21:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellMic: add some params\n\nmakes me wonder if dev_num should always be s32","sha":"f8c6cc247699c1c18cab9aae068f9504cb9b494a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-29T09:01:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-08T06:21:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"add error code to cellPadInfoPressMode and cellPadInfoSensorMode","sha":"29c77132cb4f053525f9bcfbead6db94c7e56bf5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-29T07:58:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-08T06:21:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"add cellPadFilter functions","sha":"278050f8d0dbc417056755b283bcfbe37cbd114c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-04T12:37:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-08T20:12:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGemUpdateStart/Finish error checking improved\n\n* camera_frame = NULL is now checked for CELL_GEM_NO_VIDEO (applied both on start and finish)\n* camera_frame = NULL on Start() still starts the update\n* Implemented NOT_FINISHED/STARTED\n\nAll of those were reversed and hw tested.","sha":"af417c93d078a3d29ff657180e9b3375b7f99242"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-05T03:05:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-08T20:12:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix verification failure on Emu.Stop() at sys_cond_wait","sha":"0f3c5f9e5ab019871f4a4689d73f18707ae32418"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-08T00:04:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-08T20:12:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for network thread\n\nMinor refactoring","sha":"9d4de51cb6edd23256d5d0cf02ba31b7864e5ad3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-08T00:19:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-08T21:11:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GDB Server: fix and cleanup\n\nMove source files to Emu/GDB.cpp, GDB.h\nRemove \"WITH_GDB\" option, enable GDB Server by default.\nChange class name to gdb_thread.\nAlias for external access gdb_server.\nChange config option name to \"GDB Server\"\nBind on 127.0.0.1 by default.","sha":"a29d4150dfada33afcc12d70a485e541bd195521"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-08T23:14:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-08T23:14:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix log format misuse\n\nHarden log channel methods against non-constant string.","sha":"8f604dddedfdb9801d8bb24781f7a08eb802e45d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-09T00:06:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-09T00:06:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GDB Server: format cleanup","sha":"ad5afc074ea967d2885f91778a700b73b141d155"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-09T00:12:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-09T00:12:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GDB Server: fix ppu_thread access cast","sha":"23bbeb7f8f35a8720215ae6e47a68571bdcbdf30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-09T00:17:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-09T00:17:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GDB Server: fix selecting ppu_thread","sha":"91dcc3f60c71143c524d96705f5be3827513a78e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-09T13:35:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-09T13:41:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GDB Server: parse 'GDB Server' config entry\n\nAdd support for unix sockets.","sha":"6b1e1e4020496d2cdfe4a9e9d7b375a8b77f347f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10179087?v=4","date":"2019-10-09T17:03:34Z","email":"plappermaul@users.noreply.github.com","login":"plappermaul","name":"plappermaul"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-09T17:03:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use Linux timers for sleeps up to 1ms (#6697)\n\n* Use Linux timers for sleeps up to 1ms (v3)\r\nThe current sleep timer implementation basically offers two variants. Either\r\nwait the specified time exactly with a condition variable (as host) or use a\r\ncombination of it with a thread yielding busy loop afterwards (usleep timer).\r\n\r\nWhile the second one is very precise it consumes CPU loops for each wait call\r\nbelow 50us. Games like Bomberman Ultra spam 30us waits and the emulator hogs\r\nlow power CPUs. Switching to host mode reduces CPU consumption but gives a\r\n~50us penalty for each wait call. Thus extending all sleeps by a factor of\r\nmore than two.\r\n\r\nThe following bugfix tries to improve the system timer for Linux by using\r\nLinux native timers for small wait calls below 1ms. This has two effects.\r\n\r\n- Host wait setting has much less wait overhead\r\n- usleep wait setting produces lower CPU overhead","sha":"925f2ce02f31efe332b9813002423d53b8c4a9af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-10-07T15:04:30Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-09T18:21:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Validate firmware before installing","sha":"e9ea226e309431198ff2970e225a774da22e7f26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-10T13:50:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-10T16:34:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Register some more methods","sha":"2eaf5df60b9fbbe17b3a6af8687d248ff4fae7bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-09T17:45:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-10T16:34:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Recover from invalid writes to CELL_GCM_NV4097_SET_INDEX_ARRAY_DMA\n\nAlso: Trigger a FIFO recovery when encountering an invalid method.","sha":"06017cb14ef8273cd2a7b2175f6b77f6f1b4e39b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-09T18:24:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-10T16:34:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve FIFO recovery from flip","sha":"9242f16560c38bd823d3c18a8d4f941dd69c34f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-11T06:22:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-11T09:34:53Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix FIFO_DRAW_BARRIER substituation","sha":"397007cf8baf7b6f4d492e86e137810b30165398"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10179087?v=4","date":"2019-10-10T18:14:31Z","email":"stockhausen@collogia.de","login":"plappermaul","name":"Markus Stockhausen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-11T18:16:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Error handling for vkCreateInstance()\n\nCry in log if initialization failed.","sha":"f5817cb43034a9587143b2ea97306fa5d29114f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10179087?v=4","date":"2019-10-11T15:23:43Z","email":"stockhausen@collogia.de","login":"plappermaul","name":"Markus Stockhausen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-11T18:16:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Patch for vkCreateInstance()\n\npatch as requested","sha":"8adcb8046bfa939da5e157b0fa5896e4bec4ffd8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10179087?v=4","date":"2019-10-11T15:54:28Z","email":"stockhausen@collogia.de","login":"plappermaul","name":"Markus Stockhausen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-11T18:16:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Patch v2 for vkCreateInstance()\n\nas requested","sha":"4d99169d5120cea13f147db2030b2ca2ba45be81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-11T17:21:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-11T19:55:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellCamera: Log error code","sha":"5cc12ef22e6f3449fb3231ed1bcba884f0d6f061"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-11T18:57:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-11T19:55:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix cellCameraInit (camera_handler::null)","sha":"0172e097f725b0aadf2406797a0639d2fc2ab665"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-24T14:42:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-12T08:16:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"stub cellVoice","sha":"07022fd3b6d05b982b6357e8d331c757cb825f18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5672538?v=4","date":"2019-10-12T12:40:47Z","email":"theracermaster@gmail.com","login":"al3xtjames","name":"Alex James"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T12:40:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add option for preventing display sleep (#5783)\n\nAdds support for preventing the display from sleeping while a game is\r\nrunning. Supports Windows, Linux (with the org.freedesktop.ScreenSaver\r\nD-Bus service), and macOS.","sha":"3ad743ecaa28447fcf3adb30ad09f4295f8037f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-11T13:57:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T12:41:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"[SPU, TSX] Fix reservation corruption in PUTLLC\n\nChange reservation locking logic.","sha":"49e96b39dddc545ca417d90b9e6e7fdc45fecc76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T13:42:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T13:45:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove g_thread_count\n\nUnnecessary global which is bad to reason about.\nPossibly fix a but in SPRX loader.","sha":"8e21f4d5d42072e96fa56522d3b1cf96bd1071a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T16:14:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T16:14:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Deprecate thread_ctrl::spawn","sha":"6a443c0fbd725ca70769c0104fbd53094dd9dceb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T17:58:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T17:58:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"g_fxo: destroy objects in reverse creation order\n\nMaintain creation order internally.","sha":"9ae08946acef83058e08ac10c0e5fd52b0e1fb97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T18:12:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T18:12:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Replace some uses of Emu.IsStopped()\n\nPoll thread state instead.","sha":"16dd72b3e3c7e28e02e69f20f1738e8a6dc57286"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T19:37:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T19:37:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"lf_queue: add range-for support (endless loop with waiting)","sha":"5624b001aedd5e2eb51c61541dd6454675e494dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T19:45:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T19:45:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"lf_queue: remove explicit notify(), notify in push() instead\n\nShould be cheap enough now if there are no waiters.","sha":"ac712bf4e306cfa3cecb4055457ad02cde1b8a51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5672538?v=4","date":"2019-10-12T19:12:03Z","email":"theracermaster@gmail.com","login":"al3xtjames","name":"Alex James"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T21:02:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CMake: Generate compilation database","sha":"9bcd7b534b7dc9f9c0251c21b15c0ba44d4d1eb6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-01T23:26:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-13T16:00:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Add a framework for compute shaders","sha":"7a6e2e716fa33e7e29038336ed29eb84265c1f76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-02T00:47:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-13T16:00:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Use compute shaders for typeless texture decode","sha":"105d4b51e68c0b38a5417930e4219cf42ad950fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-02T10:39:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-13T16:00:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Windows bringup","sha":"b39bfa02a60719d4a09aaed52d99094b2c3703a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-02T10:39:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-13T16:00:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Refactoring and fallback support for compute acceleration","sha":"d9a9766e41b48eff0d98225f0f517ccdb4737059"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-11T22:05:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-13T16:00:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Rewrite image transfer operations to support image subregions\n- Working exclusively with full sized images is very expensive","sha":"27f48fbc065cd57f73e4fef3f26ced2c5635db13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-11T22:10:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-13T16:00:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix missing case","sha":"776fa54d2213cab9cc1d1149ea64509cb6587df3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-12T10:32:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-13T16:00:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Vendor-specific tuning","sha":"42aa4c5000f6d1023d8ef31be915983f540b989a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-13T16:26:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-13T16:26:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix state reset in cellMic, cellAudio, cellCamera (#6761)","sha":"1d07c40aa506b2f638669c114054babcf69b3c92"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-12T21:02:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-13T16:35:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"[TSX] Fix XABORT handling\n\nBreak repeat loop after explicit transaction abort.\nMay have performance consequences.","sha":"c4ccac9a9c28be3c1f8884e188c7f80119c02cb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-26T19:31:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-14T12:54:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"ppu disasm: Fix AA BC formatting","sha":"5978b1f28f7c13cf5eb0f5fc8d3ba27a787a607d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-07T16:16:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-14T12:54:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"ppu disasm: Implement BCLR's, BCCTR's and BC's extended mnemonics\n\nAlso:\nBCCTR cr bit is now shown as cr(bit/4)[bit % 4]\nBLRL is now shown properly\nBDN?Z[TF](LR?)L?A? branches are now implemented.","sha":"1e303e9f975e73ec849d3fe36a33a9d53bb0885e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-09-17T15:37:14Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-14T12:57:36Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Update git-version generation","sha":"6a0ce010eb1d56871e0beba2b167d5bb822d4276"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-09-17T20:17:20Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-14T12:57:36Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Unify versioning\n\nUse the same version value across all scripts instead of program side version and repository side version separatedly","sha":"f8153fca58018c35eea22060bf288f86be1cbf58"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-14T13:26:13Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2019-10-14T13:26:13Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Hotfix for #6573","sha":"85b8583208ee1c2e3906e06827527cb147b47a74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-14T13:33:01Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-14T14:52:24Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Hotfix for #6573\n\nFix path for rpcs3_version.cpp","sha":"4d0291ed71b0f3d9520f3d4d6a2055f6242c461a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-13T17:22:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-14T16:42:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs: add long path support on Windows\n\nExtend path limit with \\\\?\\ prefix.","sha":"6b1df1ce31c80df352fe6a789f96d1e2f8464e68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-14T16:42:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-14T16:42:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Random space fixes","sha":"076a80d71eea4d545cb703040d2e03501f300801"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-14T09:40:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-14T17:44:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Log fs::g_tls_error on ACCESS_ERROR errors","sha":"75ee66892203ae4293afe9e148b0702394f4c276"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-14T13:08:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-14T17:44:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix unknown BCLR forms formatting","sha":"3910b2465eac1db7c0c1bfed2e21a64f5c02ccee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-14T13:25:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-14T17:44:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ppu disasm: Improve CR bits manipulation instructions formatting","sha":"7e08fff91d7c9e3619fc040ca077d07e5153eba1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10179087?v=4","date":"2019-10-14T18:26:31Z","email":"plappermaul@users.noreply.github.com","login":"plappermaul","name":"plappermaul"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-14T18:26:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"minor optimization for FIFO_control::read_put() (#6768)","sha":"2171ffdab2f2af789311b2264fa9e8183dca8e2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2019-10-14T17:04:47Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-14T21:32:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Linux: Change default Sleep Timers accuracy to host\n- This doesn't change existing configs\n- Also sets the host_min_quantum to the true value\n- Restores lost TODO: comment","sha":"1a9e06d3c66621f66bccf05962b6d5c29587c206"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-14T17:41:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-15T14:42:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Profiler preview\n\nAdd option \"SPU Profiler\" (disabled by default).\nWorks only with SPU recompilers.\nResults are flushed on pausing.","sha":"c69fe0f66404677e06b09b8b57cdb30acb9aded1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-15T14:43:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-15T15:04:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: Always use linux-gnu target triple (affects Windows)\n\nUnify internal code generation to make better use of GHC calling convention.\nIdeally, it would just work on Windows as well, but some random bug appeared.\nThis bug was causing freezes on SPU LLVM compilation.\nThis commit desperately attempts to workaround it.","sha":"eafbc77c0d2b7fecb6e055a1c13230c7beff500d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-15T15:57:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-15T15:57:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Workaround fs::create_path for drive roots\n\nShould fix the regression from #6763","sha":"7ca76ae5a8a560fbe27f4d64cfbd4bfa6c8be9fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-15T06:33:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-15T21:50:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"spu disasm: Show interrupts status modifiers on indirect branches\n\nThat's how the assembler represents it as well.","sha":"80b4ac23e58c47450a24acc3ee6a3c1f242038af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-15T11:19:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-15T21:50:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sceNpTrophyRegisterContext verbose logging in TROPHY_ERROR_ILLEGAL_UPDATE error\n\nAlso use safer checking when creating trophy ctxt dir","sha":"ab02c567250094fb5c88abeaabb967db7527ce6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-14T20:36:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-15T21:50:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_cond_wait: Fix mutex acquire when signaling thread didnt pass ownership immediatly","sha":"b03c2fc85660741b54873c3a9cd2083e2cf156d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-15T14:04:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-15T21:50:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"error checking bugfix for sceNpTrophyCreateContext\n\noptions = 1 is allowed.","sha":"4ed2c7b5949e055546d63e58f8cae7a9cc10be01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-16T11:14:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-16T11:20:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix \"SPU Interpreter (fast)\"\n\nRegression after #6770","sha":"0fe46934de258826e72bfb00eb20c606d0a635cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-16T03:50:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-16T18:11:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"spu/ppu-diasm: Fixup for #6772, #6722","sha":"47c3d945aa63f1167d6954febf6a6d705b1d9fdc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-16T03:46:43Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-16T18:11:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixes for cellUserInfoGetList\n\n- Don't allow all args to be nullptr at once.\n- Fill listBuf with zeroes for unwritten entries\n- Fix userId set in listBuf\n\nSimilarly to what the firmware does","sha":"6dd96d3db9c89fa3f6a1ffd783879502071c0a51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-11-19T06:07:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-16T18:11:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_spu: Don't reset snr config at group_start()\n\nAlso first check for EINVAL in sys_spu_thread_set_spu_cfg","sha":"95752607ea68ae42d4ca3e69bf0f8bbac6691e3f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-16T14:19:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-16T19:40:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add kepler and maxwell tables","sha":"4f088a102caba6092106bd8783b77d8ca588b3e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-15T14:35:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-16T19:40:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add workaround for broken format conversion in older GeForce cards","sha":"a6e143254a05f93038065a687220a285fd899645"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-16T14:23:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-16T19:40:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Proper workaround for VEGA float16_t bugs","sha":"d29b6cdb59f25ef1c99b6d64805e743690956ef8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-16T22:56:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-16T23:30:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fixup\n- Removes incorrect line writing stencil flags to a regular texture.","sha":"5c7bbb33543ad54d6bf55fa6db830595aa22f188"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-16T23:01:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-16T23:30:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Runtime check on RTT cast","sha":"cb362b4085389afc742f26fdbc8f0d145f35380d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-08T15:07:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T15:18:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactoring\n- Move some helper routines out of the cache core\n- Prep for multi-layered image search","sha":"d6d8766f8d7d94e5a92e2afa714a4d2513a1c133"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-09T19:29:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T15:18:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement mipmap gathering from texture cache","sha":"840b52fe80256dace15bfce55f86aa859c5cea4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-10T15:32:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T15:18:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add some texture search options for the cache\n- Potentially optimizes texture cache searching using explicit options","sha":"1ac976771c4e8bea7f1fc45fa5c6db11d6d2e584"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-12T11:11:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T15:18:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for surface cache scanning\n- Fix regression when gathering cubemaps","sha":"c9e3a321b2a9338b5a0694c9300010e436a3d4a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-10T17:00:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T15:18:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add explicit range to cached subresource descriptors","sha":"fbb9ed4e2570a052b353dcc06548f2cde8846fca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-10T18:40:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T15:18:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement range-based subresource descriptor cache\n- The previous address-based approach was pretty awful when it comes to invalidating","sha":"f0ed0285f3e42add670848fc19ff5bb7fa288d2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-10T19:09:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T15:18:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove the alpha-to-coverage hack that was added to hide the missing mipmaps in games\n- Moves to a purely stochastic function using dithering to simlulate coverage","sha":"0c35595ce2d6500a5d75c030eaaafaa30fdc939f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-12T13:36:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T15:18:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix visibility of blit destination targets","sha":"e166dbccc891e85174b61e517f424f00693160f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-13T14:32:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T15:18:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix rsx capture crash.\n- Pixel coordinates are top-left not bottom-right\n- Solves out of bounds access","sha":"e47b4ffb8f09cd966fdf0203799370ed0c9eee96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-13T14:41:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T15:18:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for slice gathering for structures with multiple mipmap levels\n- TODO: Proper multi-level assembly for non-2D structures","sha":"a936e43ff6da02761a14b65cec18bd2630ea4483"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-16T20:21:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T15:18:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix decoding of some fixed point texture parameters\n- Checked envydocs and found the correct format as fixed-point 4.8 with optional sign bit","sha":"5af8a9fbbcba6e683a8a0a89ff733e548215a3e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-17T16:24:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-17T16:57:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix sys_vm_t destructor\n\nIt's not a destructor's job to free vm like this.","sha":"00895862e10bbbcc39b75380904a112e2496a661"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-12T10:48:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-17T18:32:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"stub cellSsl","sha":"60f3ed76072e7af6776c432075078df9076a51ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10179087?v=4","date":"2019-10-15T12:59:37Z","email":"stockhausen@collogia.de","login":"plappermaul","name":"Markus Stockhausen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-17T19:15:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"avoid update of window title\n\nonly update title if user really wants to display the FPS during gameplay.","sha":"2850d0c6bc115577d4114d257fceeffe9d1bb297"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-29T01:01:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-17T19:24:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellScreenshot: initial implementation","sha":"0bad56da67473331ebbb7417b60b34f017435701"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T15:49:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T21:32:38Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix some uninitialized variables flagged by valgrind","sha":"1046184dd055f2c2c6dd20051ce252216278a6c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-17T18:30:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-18T07:20:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: avoid exception while no keyboard is registered","sha":"d6664450dfcecd76e82e7b0beb93d544c035559a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T18:20:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-18T11:46:37Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add video memory manager to monitor VRAM usage","sha":"97ed95d21b9624b4ff4ac4b3566ce790dc17043a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T18:35:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-18T11:46:37Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Notify the backend to release or delete temporary surfaces after we're done with them.","sha":"decf9cfcf6f79c60313b5aa2ce8ec09e12ba3b05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T19:52:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-18T11:46:37Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Track uncached cache resources\n- Uncacheable resources can be reused as soon as they're made visible to the draw call.\n- Since they're likely to be reused every draw call until the shader changes, it is important to reuse as much as possible","sha":"eee2237e19312646f7bd707e8c24fd8473c1702f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T20:08:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-18T11:46:37Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Check for cyclic references if sampler is marked as do-not-cache.\n- Usually an indication of surface/texture cache interaction.","sha":"70642484cd995bb11a8c19391baaa6cae015fb5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T20:16:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-18T11:46:37Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Remove a redundant memory barrier","sha":"bd1bcc6be7990565959044ddd33e74472c7c07bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T20:30:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-18T11:46:37Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor cache fixup for cyclic references.\n- Logic was broken by mipmaps PR. Do not issue a texture barrier if a temp copy is being done.","sha":"eff4e95c99d7842fad516b0923948240ddae3664"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-17T21:21:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-18T11:46:37Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Force-align compressed formats to 4x4 texel blocks and disable 1D compressed textures.\n- The PS3 allows defining 1D compressed images but this obviously doesn't work well on desktop.","sha":"404073c74aba4c979d93de6bb422d218a1015bbb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-18T11:07:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-18T11:46:37Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Disable mipmap sampling if sampling mode is does not have a mipmap filtering mode.\n- GL_LINEAR and GL_NEAREST always sample LOD0 so make vulkan behave the same way","sha":"299b98b30a7f718c33a5958b83978a1891601baf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-17T20:39:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-18T12:41:39Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx util: Implement decode_fxp<>","sha":"d4ba7f37b67e7b19601a37a2cfd296b9c25eafee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-18T20:08:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-18T20:08:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Restore using keyed events in waitable atomics on Windows","sha":"db7042b986abe7a588aa306a31d84fd976c65951"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-19T11:01:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-19T11:01:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"init_mutex: implement init_always()","sha":"2446bb5d4006acbf7d9d5c803f210156a4848288"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-19T11:02:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-19T11:02:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cond_variable: improve wait a bit\n\nMask signal bits","sha":"3304cfacdef02bb22055bdfca00148e1624d9df0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-19T11:08:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-19T11:08:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"59382e023d3468602614dad6db9edd3a58537799"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-09-08T14:32:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-19T17:13:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"stub cellKey2Char","sha":"e6aeb7ecb9f5c8d9a4f48fd028b82e9a32c5cceb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-17T21:01:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-19T17:20:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellNetCtl: improve param checks","sha":"0ef7ad129d3e17483dd577c0b2e375012053c26f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-20T11:53:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-20T12:25:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for aspect mismatch","sha":"996534c559b28829d0fd3fc4c3fc87e184048a46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-28T11:32:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-20T13:56:44Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sceNpUtil Improvements","sha":"d9a97d867406c7cf4d910f67c9b52670a6a20fb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-28T23:14:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-20T13:56:44Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sceNpBasicGetEvent error checks improved","sha":"fa7317575455f9cb35800274cf6781a682fbbc0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-12T18:28:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-20T14:16:53Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellVoice: Initial Implementation\n\nImplement system service events, error checking and some functions.","sha":"6c2307fb96697f92cd0eceb163b5480f45e872e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-29T05:47:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-20T14:28:26Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_usbd Tiny update","sha":"d90696be90e35115b272bf51ac000dc3aa1379ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-29T06:03:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-20T14:28:26Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Forcefully awake waiters in sys_usbd_finalize\n\nThis is a no-op from cellUsbd side but happens on lv2 side as well.","sha":"a1e7cdf1e911476040c4a9ce7fdc1d89d46c0ff5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-29T06:25:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-20T14:28:26Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Add exception for sys_usbd_initialize","sha":"79a3a7ce4c05165b172e4081e1ce00d6e1b38d5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-19T23:41:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-20T15:29:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: rewrite collision handling\n\nRemove \"fallback\" code path.\nRemove USE_FUTEX code path temporarily.","sha":"e0f60c5dcee50bc7f1f5ce14d2d79d373ef00e75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-20T15:19:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-20T17:05:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: reimplement USE_FUTEX path for Linux","sha":"56b310ebac38555f3a6563c4f250412ecd441622"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-20T17:08:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-20T17:08:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: improve internal data layout\n\nPut semaphore control variable together in hashtable.\nAvoid unnecessary allocation of extents.","sha":"4d46e66833f5c893e96162aa04f527ba0549d490"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-14T09:00:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-20T17:58:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU Precise: Fix fused float ops misaccuracy by using fma\n\nAlso cleanup add64_flags, remove redundent copy of s_ppu_itype.","sha":"c16319f9591b72a070dfb06f6ac63d125a639f56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-13T19:56:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-20T18:38:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Minor improvement to fbo region invalidation\n- When commiting a block as fbo, keep blit_dst data as well.\n- Avoids removing (and losing data from) blit targets that just happen to share a page with a framebuffer.","sha":"868547aec806cad2b2f9c00e123ffd5f084154fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-20T12:43:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-20T18:38:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Tweak behaviour of the \"Use GPU texture scaling\" option\n- If either source data or dest is a render target, do image operations on the GPU same as before\n- If swizzle is desired, use CPU fallback\n- If no scaling and no format conversion is required, use CPU fallback\n- If scaling is desired and the transfer target is in local memory, use the GPU\n- When doing trivial copies, use the routine in rsx_methods instead of\n  duplicating code. Also has the benefit of better range checking.","sha":"09de3b7974aca2ca51e1b3efecd81f12a8e715ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-20T14:01:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-20T18:38:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix minification filter description for NEAREST_MIPMAP_NEAREST. Just a typo.\n- Also remove mipmap filter for CONVOLUTION","sha":"f40f2c6215ce9cb6250b861893d85e91dbbc3dbe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-20T17:52:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-20T18:38:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix copypasta\n- MSAA is still unimplemented in OGL","sha":"3c440656840051884c925c35e9a8ff411fe329ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-20T19:01:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-20T20:06:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: fix internal resource deallocation\n\nAlso remove debug printf.","sha":"2dde133e1f61bc82781883d85ec8eda92b371d10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-20T19:52:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-20T20:06:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: remove <string> dependency","sha":"b844cd81e89973416bca3bdc014dd9e9c6651892"}
+{"author":{"avatar":null,"date":"2019-10-20T19:42:59Z","email":"marin6314@gmail.com","login":null,"name":"Marin Baron"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-20T21:40:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Debug build : Check ObjectFile before reading.\n\nCheck LLVM ObjectFile state before access to avoid llvm assertion failure.\n\nExpected<T> must be checked before access or destruction.\nExpected<T> value was in success state. (Note: Expected<T> values in success mode must still be checked prior to being destroyed).","sha":"90aaaceba00c528b8543a3fd8a28cc1643a6ebf0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-10-31T02:40:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-21T12:31:45Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx: Improve allocations and error checks\n\n* allow sys_rsx_device_map to be called twice: in this case the DEVICE address retrived from the previous call returned\n* Add ENOMEM checks for sys_rsx_memory_allocate and sys_rsx_context_allocate\n* add EINVAL check for sys_rsx_context_allocate if memory handle is not found\n* Separate sys_rsx_device_map allocation from sys_rsx_context_allocate's\n* Implement sys_rsx_memory_free; used by cellGcmInit upon failure\n* Added context_id checks\n* Throw if sys_rsx_context_allocate was called twice.","sha":"730e9cde8443ddefd143514f9ca13852fad2a41e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-19T19:53:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-21T12:31:45Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Report full method range on invalid methods\n\nAlso report full command on fifo desync event for the first time","sha":"5de0005f5adb62222fbe8218d333e7293e1c4476"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-20T10:54:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-21T12:31:45Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cellGcm: Fix driver_info->memory_size\n\nbased hw test","sha":"cbecbc264e391adda09b7c620c3e29a7f038d8a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-21T11:03:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-21T12:31:45Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix vblank signals flood after Emu.Resume()","sha":"29cddc30f0ce70ed38e913520bdd7b2c2f4819ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-05-17T20:54:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-21T16:29:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: implemented asynchronous compilation\n\nImplemented interpreter-based pre-recompiler.\nInterpreter functions are build with SPU LLVM.","sha":"b329bb604cd6275f6afff8dae7bdbf24553e0994"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-21T20:52:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-21T20:52:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"MSVC: disable new exception handling (FH4)\n\nShould fix countless issues with vcruntime140_1.dll not found.","sha":"f7ebc553268cb45bb3a43f999b41f902aee57af8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-09-13T21:02:10Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-21T23:51:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Adds 7z sdk to 3rdparty","sha":"56e6dd1c466da630b6d926a569073561707f13cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-09-11T07:55:43Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-21T23:51:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Auto-updater","sha":"9f9ac4b696cba2bdbb1747e288d00f984f2ce188"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-10-22T03:12:44Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-22T05:43:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix for auto updater","sha":"f8e4079c41dc9be9074a43425d521e53335d7c74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-22T10:29:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-10-22T10:42:49Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Partially revert git-version.cmake","sha":"407be4506950b9981b89c4a82370a055eefcd26e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-13T19:37:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-22T10:44:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement packed format renormalization\n- Renormalizes arbitrary N-bit values as 8-bit normalized.\n- NV hardware performs integer normalization at 8 bits if the size is less than 8.\n- This can cause significant arithmetic drift because the error is multiplied by a huge number when sampling.","sha":"f7842b765f0490e85a993eb84515c911fb426ccd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-13T21:30:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-22T10:44:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Replace pointless f32[4] restriction on texture parameters.\n- Use a struct instead to improve readability and remove pointless OpBitCast","sha":"901942f24a20f4696aed72a4e721553c00f569b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-13T22:24:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-22T10:44:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add support for delayed shader discard.\n- Noticed a glitch on AMD hw and windows drivers where discard seems to affect entire 4x4 cells.\n- Dead fragments (outside the primitive boundary) could have their discards trigger as they do not have proper access to variables.\n- This introduces dead fragments along triangle edges, causing a diagonal line pattern across the screen that is very annoying.","sha":"0b2f9f0f17641dcfe552e0d865a50d6e0cef3697"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-21T13:15:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-22T10:44:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Silly copypasta","sha":"3bb70e837a0e069e286cd794b6fdb960c66dd496"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-21T19:59:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-22T10:45:09Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Align down index array offset\n\n* Also use improved to_be_t<> template (recetly ignoring one byte long types) for vm gsl::byte referencing, remove redundent narrow<> cast (same type)","sha":"945abcc6cd9966d458b94b5cdc37f018cadc4bb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-21T20:07:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-22T10:45:09Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix cellGcm HLE regression\n\nAlso correct flags.","sha":"586fe11e2243d74b9d40f8fab6c60e53ccc4c73b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-10-22T09:33:29Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-22T13:11:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Avoid std::move() for copy elision\n\nThis could disable zero-copy optimisations, which is the opposite of\nwhat we want.","sha":"9d1b7af2eb879aa7651c843178f70bcc9cf0ff70"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-10-22T11:18:56Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-22T13:11:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix misleading indent.","sha":"14c63ec014c7a984a3d8a57290144d4db754f819"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-22T16:09:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-22T18:45:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Drop d3d12 backend","sha":"00bc3fe658685b107ffa8ebef61b288ddf1c67f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2019-06-20T02:58:46Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-22T18:52:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Bump version built on to 16.04, Update clang to 8, update Qt to 5.12.3","sha":"f1d474f93294c2cca7bef81f12f0bd99ee3bd2b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-22T21:41:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-22T21:50:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Copypasta fix\n- r1 is always float4 never half4. Its a full-width register unlike the\nother outputs which are optionally half-width.","sha":"e04b6cd7c02cb726b6960dc2bddc1a022b8f252e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-22T19:57:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-22T22:03:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Remove further occurrences of DirectX 12","sha":"2cc71afdcdb6aa74ad00a8cd9801218aebb260c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-10-22T10:19:11Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-23T09:19:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Support fullscreen properly on Wayland\n\nThe current behaviour when going fullscreen from windowed was to keep\nthe previous size of the swapchain, with black borders on all sides,\nwhich looks quite ugly.\n\nThe root of this issue is that rpcs3 only checks for frame resize if\nvkQueuePresent() returns VK_SUBOPTIMAL_KHR, which drivers can’t do on\nWayland, see https://gitlab.freedesktop.org/mesa/mesa/issues/1979","sha":"54d95373d0a88d5356f7825e96e59a766a57e977"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-22T21:52:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-23T09:20:06Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Restore vega native use of FP16 in shaders\n- AMD proprietary drivers should work fine","sha":"d53d7bb598545bf74836bfa2a3af96bb88880d3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-23T10:09:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-23T13:01:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM (10)","sha":"6e19881b821a9aa4b3afa62fa7a8d93ea1ed8855"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-23T10:11:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-23T13:01:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify lf_queue<>\n\nIt doesn't need reinterpret_cast anymore.","sha":"050e5b4aec533da248478bd5bf7abd0784e5d805"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-23T10:11:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-23T13:01:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: fix typo","sha":"ec1ea466fd6fe65e4934a4343bbcd9685ee08274"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-23T15:10:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-23T15:10:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM (fixup)","sha":"ed0c25f7606b862fcc314ac5b68f5327a2a4829f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-23T18:11:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-23T18:35:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Remove VS D3D12 Dependencies","sha":"c88654bc8f4f3c9414816fbf6866ec06e12e9269"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-23T18:32:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-23T18:35:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix weird filters for display sleep files\n\nFor some reason kd-11 thought generated files was a good place to put them","sha":"d0ea71289e4fed12e0c21f54c4c2c4feb2864f08"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-23T18:53:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-23T18:55:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert \"Simplify lf_queue<>\"\n\nThis reverts commit 050e5b4aec533da248478bd5bf7abd0784e5d805.","sha":"6867fc5f06c59f01e743930aa69f36c5850fc5e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-27T12:37:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-23T22:26:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: multithreaded icon resize","sha":"5b59c18dcc969a6af691ea119149c39cba27ae3a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-27T14:27:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-23T22:26:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: multi thread game list refresh from drive","sha":"b805238b8a3ae9542a406bd81e8d4289a0d5d27c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-27T14:28:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-23T22:26:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: indent try and catch block","sha":"221508fa07681e34a000b7c3ab33d11f538189c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-07-27T14:30:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-23T22:26:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: multi thread trophy loading","sha":"56a249fd5a8aeb1c04ce3ad949fa5e256e8aa43b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-08-11T12:36:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-23T22:26:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: don't update the gui from QtConcurrent","sha":"a360836fef94041f8584e039b1783b5accf08bbf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-10-22T21:59:09Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-24T11:16:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Audio: don’t build XAudio2 backend on Linux\n\nThe files already had a #ifdef _WIN32, but this avoid even trying to\ncompile their translation unit.\n\nI was surprised to see XAudio2 being mentioned on Linux, this makes sure\nno one else will get this surprise.","sha":"9253f7d645c891cb57a8785bdaeb93d02a80f307"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-10-23T23:15:47Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-24T11:19:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update cellVoice.cpp\n\nCaused warnings. Not sure what the actual intention was, this may need to be inverted.\nThis commit assumes that erase() returning 0 is a sign that deletion\nfailed, or that there was corruption. There should be a port there.","sha":"0842724f9433117a08053b0709d04154bc99a66e"}
+{"author":{"avatar":null,"date":"2019-10-20T19:33:42Z","email":"marin6314@gmail.com","login":null,"name":"Marin Baron"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-24T11:34:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix debug build gcc/clang linker.\n\nCreate temporary variable to resolve undefined reference.\n\n[ 98%] Linking CXX executable ../bin/rpcs3\n/usr/bin/ld : Emu/librpcs3_emu.a(sys_vm.cpp.o) : dans la fonction « sys_vm_t::~sys_vm_t() » :\n/mnt/raid/Git/rpcs3/rpcs3/Emu/Cell/lv2/sys_vm.cpp:21 : référence indéfinie vers « id_manager::id_traits<sys_vm_t, void>::invalid »\ncollect2: erreur: ld a retourné le statut de sortie 1\nmake[2]: *** [rpcs3/CMakeFiles/rpcs3.dir/build.make:426: bin/rpcs3] Error 1","sha":"4599d5841353fdf8096191c30a592fedc844efce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-10-22T14:05:52Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-24T16:36:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Check if we're in the process of restarting when trying to open the log","sha":"c89ad38ef121e08d01e7d5881e4f1c03f9519c71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-10-24T19:13:51Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-24T19:22:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Conserve error value when trying to open log file","sha":"a32f979814bfebfcaad5a03d15ae372b9a4673be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8129300?v=4","date":"2019-10-24T19:26:29Z","email":"Oschowa@web.de","login":"Oschowa","name":"Oschowa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-24T19:26:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement FAudio backend (#6374)","sha":"06433d614acdb46ba4a7f8635445eafe8038d0bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8129300?v=4","date":"2019-10-24T21:21:35Z","email":"oschowa@web.de","login":"Oschowa","name":"Oschowa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-24T21:56:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"3rdparty: only build FAudio with SDL >= 2.0.9","sha":"d8ff7c759b0be6e1da8671ac51ca0a30021da6a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8129300?v=4","date":"2019-10-24T19:43:07Z","email":"oschowa@web.de","login":"Oschowa","name":"Oschowa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-24T21:56:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"3rdparty: update FAudio to 19.10\n\nand add 'ignore = dirty' to faudio submodule","sha":"9e753e1ffdc448c76ced18a1ef0ccb0b47d3ca9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8129300?v=4","date":"2019-10-24T19:46:01Z","email":"oschowa@web.de","login":"Oschowa","name":"Oschowa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-24T21:56:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rpcs3qt/settings_dialog: fix Audio Buffering setting for FAudio backend","sha":"6944e180c81f26495de22980d40697911c27de48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2504890?v=4","date":"2019-10-25T09:56:47Z","email":"arabek@users.noreply.github.com","login":"arabek","name":"arabek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-25T09:56:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Normalize audio when downmixing to avoid clipping (#6867)\n\n* Normalize audio when downmixing to avoid clipping\r\n\r\nIdea came from this topic:\r\nhttps://hydrogenaud.io/index.php?topic=104214.msg855199#msg855199\r\n\r\nFixes very loud audio in Motorstorm (and probably other games\r\nwhen playing over headphones/stereo speakers with\r\nDownmix to Stereo option enabled)","sha":"63a0b97dd18047ec6916b993ccdac942a6090122"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-25T08:26:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-25T10:10:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add mutex to game list creation\n\nshould prevent random crashes when accessing maps","sha":"89a2d04f9621566a65ef36341d4c492390e8b6d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-10-25T10:32:21Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-25T10:32:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Small warnings cleanup (#6671)\n\n* Ignore more warnings\r\n\r\nThese are intentional\r\n\r\n* Signed/unsigned mismatch when comparing\r\n\r\n* Explictly cast values\r\n\r\n* Intentionally discard a nodiscard value\r\n\r\n* Change ppu_tid to u32\r\n\r\n* Do not use POSIX function name on Windows\r\n\r\n* Qt: Use horizontalAdvance instead of width\r\n\r\n* Change progress variables to u32","sha":"f3ed26e9dbbb5aa31c7ddb5fb1f252f22bfb78a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-10-26T02:19:07Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-26T18:23:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt version bump\n\nAlso gives a tip about the Qt5_DIR definition.","sha":"a4d8cab67e4861a0d2524365e5f177dae08cf4f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-23T10:11:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-26T18:24:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify lf_queue<> (second attempt)\n\nIt doesn't need reinterpret_cast anymore.","sha":"0c06456950a201c98beb97c3ac37f5b1befb4b95"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-25T11:33:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-26T18:24:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: Make JIT allocator lock-free on all platforms","sha":"2e85b5ebaae275452b143bda157be447c8338e18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-25T12:15:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-26T18:24:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement lf_bunch<>\n\nSimple concurrent container without erase support.","sha":"7a32af7a574cb211899475217fdc25202638d96b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-25T14:20:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-26T18:24:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: cleanup former OOM handling\n\nRemove cpu_flag::jit_return.\nIt's obsolete now, and worked only in SPU ASMJIT anyway.","sha":"9ac6ef649488d9bd9994cf22b33bc6c8fc5c20b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-25T21:52:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-26T20:33:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: Make recompilers lock-free.","sha":"8c28c4e8ec8c6160945ef2bbc46a40caea445ee6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-22T23:04:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-27T07:02:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add quickstart link to SSL warnings","sha":"59747fd7081d7503efdbdbdfbff9797ff6119605"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-22T23:18:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-27T07:02:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: connect compat error handling to error signal","sha":"200162cf2ae2ab4df98beeed587621b3fc464802"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-25T14:04:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-27T07:02:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: disable progress_dialog resize","sha":"6fe32887b2d185c3fa011ae030a446e9abdea17e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-26T21:16:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-27T10:04:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: Enable \"Giga table\" in Mega mode\n\nWas previously only enabled in Giga mode.\nAlso fill the table with branch patchpoints.","sha":"37dbbce194943cdcc6d1fc3dd94b1beff2c9adb2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-27T09:57:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-27T10:04:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fixup for duplicates in recompilers\n\nFixup for the edge case.","sha":"5f00b3286748166fb1ae06f5cde03e307195880c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-27T09:58:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-27T10:04:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Analyser: don't compile on \"analyser failed\"","sha":"16edb5bdd03e36202c866773f0d263a1333d9782"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-27T10:03:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-27T10:04:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: verbose patchpoints in \"giga table\"","sha":"83f253636a802448cebcbc6dd9c88476928e49de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-14T15:34:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-27T12:56:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSysCacheClear/Mount() improved\n\nClear() error checking simplified a bit\nMount() now clears cache if ID was changed from last or NULL specified.\n\nImplemented vfs::host::remove_all():\nClear() now uses vfs::host::remove_all() to match behaviour on Windows with ps3","sha":"65e47490c4eab63d7db1472986e2513bc7954a0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-27T15:39:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-27T15:53:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix long path support on Windows for UNC path\n\nSuch as network locations.","sha":"839e088ae585266826cd7df18d5913890ebcac8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-27T16:17:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-27T16:17:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix long path support in fs::statfs on Windows","sha":"46d692d5a63d2c16ce6e3678fff17e624c49dd32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-10-27T21:55:19Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-28T10:28:51Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Make input_is_swizzled a template parameter\n\nThis lowers the relative cost of this function from ~2.25% to ~1.80% on\ngcc 9 which I found quite surprising, some of it probably gets inlined\nbetter in the callers, but I haven’t been able to isolate which parts.","sha":"69e9ee26f67a2d18501fcc20dccc892e5466e0d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-25T15:32:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-28T12:20:45Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Allow compressed textures to be unaligned in size\n- Align based on row length but let the texture itself be of arbitrary dimensions","sha":"d04241ad25d62f5784fa3f5c4a195e82ba87cfad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-25T17:06:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-28T12:20:45Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx:: Use fcmp correctly","sha":"ad2add9574761b597c9164fd42648a0b248c42a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-25T22:06:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-28T12:20:45Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Modify sampler cache to uniquely identify all the input parameters\n- Avoids iteration when variable mipmap counts or lod bias parameters change","sha":"3e8dfede1c4d4b9dec778e9a199fc24ab402e222"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-25T22:30:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-28T12:20:45Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Round lod bias to the nearest 0.5 to lower number of permutations when nearest mipmap sampling is used\n- The lambda values will be rounded to the nearest integer anyway","sha":"b0708367c2e976ba0156f880fc4a904a86c9acf6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-28T09:44:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-28T12:20:45Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix uninitialized (and wrong) variable access","sha":"479d92d075b161b27101a9ba683a0a23b800bf30"}
+{"author":{"avatar":null,"date":"2019-10-28T14:44:44Z","email":"herrhulahoop@gmail.com","login":null,"name":"Hula Hoop"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-28T14:44:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Super-important PR (#6900)\n\n* Fix capitalisation errors and typos\r\n\r\n* Oops","sha":"200ec5c4b31ee97b762bd6d39df601c8a30c9c89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2019-10-27T11:28:11Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Max"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-28T15:59:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[msbuild] 7zlib msbuild changes\n\n - move project file to 3rdparty for consistency\n - add common_default props\n - fixes 7zlib.vcxproj.FileListAbsolute.txt being detected as change","sha":"8c3d2363bf3fabc34f448780c5afefe606632f5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2019-10-28T17:28:08Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-28T18:00:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"msbuild: Add 7zlib to rpcs3 project dependencies","sha":"0b3939a58a9e1d78c9e296f0b2543ea6065bfaf3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-28T19:59:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-28T19:59:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Qt: fix crash on startup in game_list_frame::Refresh\n\nQList isn't supposed to be modified concurrently.\nUse lf_queue to collect game_info data.","sha":"83cf6e6fa391effb3b6a38d80030de9067986d12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-28T20:16:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-28T20:16:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Enable primitive restart index only when needed (#6889)\n\n* rsx: Enable primitive restart index only when needed\r\n\r\n* rsx: Use if with initializer in read_put()","sha":"42fc69818650f0efbcb4d0babe38115de567f55d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/205276?v=4","date":"2019-10-28T22:01:07Z","email":"admin@rajko.info","login":"rajkosto","name":"Rajko Stojadinovic"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-28T22:01:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Rewrite the way LLVM JIT does memory allocation to allow use of more than one contiguous segment (#6771)","sha":"b49b4c8096568558954e11220ca42ee62e9f18fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-25T12:59:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-29T15:15:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_rwlock_wlock: Fix typo","sha":"3e4cbf67f671e54865503f584a942b08ccec4751"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-25T14:15:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-29T15:15:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Kernel Explorer: Don't hardcode endianness in name64","sha":"f7c177d79e57c31f9ba63cfc8f053bcad362243a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-25T14:50:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-29T15:15:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"lv2: Correct alignment of some attributes structs","sha":"8b6383b489612dda661add5e950c41785a81bed4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-26T06:28:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-29T15:15:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove unjustified use of idm::import_existing in sys_config","sha":"114b9498bf7b1b1cd30abc87b1b243108c2a287e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-26T07:46:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-29T15:15:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix lv2_config_service_event event id reset","sha":"f88a135b5b3427a9905e436ca8ab8997e90aadb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-21T10:41:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-29T15:16:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: fix MFC CMD enqueuing","sha":"739f68271f465c3852c889bf7446f1707c9f037a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-24T18:03:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-29T15:34:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_spu: Fix SNR and Inbound Mailbox state reset\n\nAlso remove bugged ESTAT check at sys_spu_thread_write_spu_mb.","sha":"b99992d57092ee018d5b893cc57649dc1277e87e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-28T18:06:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-29T17:03:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Separate subresource_layout:dim_in_block and\nsubresource_layout::dim_in_texel\n\n- These two are not always linked when working with compressed textures.\nThe actual texels extend past the actual size of the image if the size\nis not aligned. e.g if height is 1, the real height is 4, but its not\npossible to determine this from the aligned size. It could be 1, 2, 3 or\n4 for example.\n- Fixes image out-of-bounds writes when uploading from CPU","sha":"aa3eeaa4171e7ca26febfe44357af0fc54d428cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-28T20:11:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-29T17:03:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Minor spec touchups\n\n- Simplify active instance management. While multicontext support will\nbe required in future, this is better done with multiple logical devices\nrather than multiple instances.\n- Destroy the WSI surface on exit\n- Enable depthBoundsTest explicitly. TODO: Properly check for supported\nfeatures.","sha":"7a5c20ef858979e35c9655e682add93f6d24b8c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-28T21:07:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-29T17:03:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Optionally ignore depth bounds testing on hardware that does not\nsupport it.","sha":"eda09489b2dc23fef6d0a1e47aa97f9f12f59012"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-29T19:32:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-29T20:13:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_spu Fixup after #6864","sha":"f41f5054f781215b484a8134c09f3ba3fd52f911"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-29T20:34:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-29T22:06:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add checks for alphaToOne support\n- This feature is very rarely used, as alphaToCoverage is commonly used as a replacement for blending, not in addition to it.","sha":"35794dc3f2ffa677aabad797868dd75ed0fa57d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-10-30T13:42:44Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"linkmauve"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-30T13:42:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Optimise primitive_restart::upload_untouched() (#6881)\n\n* rsx: Optimise primitive_restart::upload_untouched() with SSE4.1\r\n\r\nThis optimisation is only applied when skip_restart is false.\r\n\r\nI’ve only tested the u16 codepath, as it is the one used in NieR.\r\n\r\nIn some very unscientific profiling, this function used to take 2.76% of\r\nthe total frame time at the save point of the port town, it now takes\r\nabout 0.40%.\r\n\r\n* rsx: Mark all SSE4.1 functions with attributes on gcc and clang\r\n\r\nThis assures the compiler we will take care of only calling these\r\nfunctions after having checked that the CPU does support these\r\ninstructions.\r\n\r\n* rsx: Add an AVX2 implementation of primitive restart ibo upload\r\n\r\n* rsx: Remove redefinition of SSE4.1 instructions\r\n\r\nNow that clang is aware that our functions are compiled with SSE4.1, it\r\nlets us generate this code using its intrinsics.\r\n\r\n* rsx: Optimise vector to scalar conversion\r\n\r\nThis is done using minpos and srli intrinsics and generate less code\r\nthan before.\r\n\r\nThanks Nekotekina for the suggestion!","sha":"cfd5cf6bdb56ea52a0b2cf56c1d83b081cb0fadc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-30T14:53:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-30T14:53:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor cleanup in BufferUtils.cpp\n\nReplace inline asm with intrinsic using target attribute trick.","sha":"b1968769b776e27cf30f3ea29bae8855b28cf568"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-30T15:22:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-30T15:52:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor optimization in BufferUtils.cpp\n\nDon't use PSHUFB for horizontal operations.\nUtilize PHMINPOSUW to compute max as well:\n + sse41_hmin_epu16\n + sse41_hmax_epu16","sha":"e3e7051ed3fb3924c616a7160fb5d369f9bcca8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-30T15:01:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-31T11:43:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/overlays: Add support for other primitive types other than triangle_strips","sha":"78aefe5b5ee22300542169f2daa60e697bb6608d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-30T17:23:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-31T11:43:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add video out calibration pass\n- Adds gamma correction and RGB range filters to output to match PS3","sha":"63bbf11a76920e64a381b561c39008ea0ed38619"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-10-27T22:49:31Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-10-31T12:46:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Audio: don’t build ALSA, PulseAudio or FAudio backends when disabled","sha":"03a2d36c7e76415046c9e318ef58b4473b553e6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-01T14:52:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-01T16:35:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add explicit support for identity image views\n- Allows bypassing all remap shenanigans to make some operations that\nrely on the raw image to work correctly.","sha":"bbed791ee094df01d0ab9be35322d5e8707f6f79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-01T16:10:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-01T17:41:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement multi_cas with atomic2 type\n\nstx::atomic2 is a \"fat atomic\" for use with multi_cas.\nstx::multi_cas is minimal transaction routine.","sha":"35249d2578555e51e816c79355303e6813be0228"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-01T16:13:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-01T17:41:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix ALSA and PULSE building on Linux (workaround)","sha":"f75661bfae9005db0586b68d4ef334f8a5d652a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-11-01T22:33:56Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-02T09:31:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stop autoupdater renaming file across devices","sha":"35c0c05707c047ff3883c07f31bdfb5361465ad4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-31T06:59:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-02T11:48:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: implement time played and last played","sha":"3be92ec52b31fc2f8321555e3c197b8650feae96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-26T19:51:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-03T11:59:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add missng check for key in cellAudioSetNotifyEventQueue\n\nkey is checked once according to hw test.","sha":"33fe0fdd6bc4f98fdb6c77fe657fbc63550c9a21"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-27T06:13:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-03T11:59:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"bf_t: Remove <limits> lib dependency","sha":"d2f3ada31272aa651aabb23940a3edbfca16b70e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-01T19:22:43Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-03T11:59:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"lv2: Check ipc_key value if object is process shared","sha":"7475be99ab888ed38801e3a8e4565e81d9d8aa23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-11-03T14:01:35Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-03T19:13:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix context menu showing twice in Game List","sha":"e1638b93261414dcfc43df05d41bcdf7adbf691a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/33754783?v=4","date":"2019-11-03T20:22:23Z","email":"33754783+ipkpjersi@users.noreply.github.com","login":"ipkpjersi","name":"ipkpjersi"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-03T20:22:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fixed plurals of time played strings (#6937)","sha":"8ed45a055360d6266eed695ab178727c57104a79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-04T09:40:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-04T13:56:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improved crash message for missing MSAA features","sha":"6b3af09fa5d550a9d9cc4370ecb8252955bc0686"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-04T13:22:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-04T13:56:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Allow u32 restart index with full index width","sha":"df63de8f160a04628a1518cddeefc7a86c2537f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-23T14:27:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-04T15:48:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement backend notification for upcoming zcull reads","sha":"51e0eaaddc5a59e5b3c6350b29acaac157849a4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-23T14:28:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-04T15:48:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Reimplement occlusion result reading\n\n- Implement partial result reads","sha":"fe3c290d030747bb05f1deebbd79954ab96b42e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-23T14:29:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-04T15:48:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve zcull synchronization\n\n- Use zcull sync hints more aggressively","sha":"3e0f9dff4dca940c1cc779f4f343815e3a98004b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-24T20:02:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-04T15:48:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement report transfer deferring\n\n- Allow delaying report flushes triggered by image_in or buffer_notify\n- When the report is ready, all the delayed transfers will automatically\nbe done.\n- TODO: Make this configurable?","sha":"2a8f2c64d20ea2cf238f88d2713540ea90db1554"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-04T10:52:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-04T15:48:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Take empty queries into account for engines that spam report reads.\n\n- Some games will spam the report queue with requests but have zpass\nstatistics enabled.","sha":"57d3c9e1719f9194cf621e841a385166d6501cc2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-03T10:36:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-04T19:52:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: Disable \"special\" branch patchpoints","sha":"da135fbfccb19171a16d240734ac536d1033552c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-04T16:08:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-04T19:52:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Linux: disable update check at startup if not running from AppImage","sha":"1f9250e39ae4d1bcb6317afe2d88286b46381d68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-01T22:58:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-04T19:52:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic2: add TSX path for multi_cas","sha":"be306afae98a264140ce2ff4de7d8f8a211c0144"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-04T19:52:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-04T19:52:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic2: fix corruption bug","sha":"ec25deed2be5e39c523517af3e362f39709b0722"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-04T19:53:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-04T19:53:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic2: fix pessimisations","sha":"531afe0f97ab80459b97e6d9c7cab7c95256c2aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-29T12:13:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-05T19:07:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Set up framework for hw deswizzle","sha":"9cd3530c98d36689d9965d4f7a6ecaa982a5426a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-10-29T12:21:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-05T19:07:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Enable gpu deswizzling","sha":"1266b6313584fac6fde6062bc6f21766a944fa77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-02T18:15:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-05T19:07:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Minor compute optimizations\n- Remove use of uniform buffers for compute static data. Use push\nconstants instead.\n- Minor touchups to the deswizzle code to avoid redundant data copies.","sha":"7a0b94f34363c8582ee7045be99c230e57cb2a76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-05T14:00:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-05T19:07:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement layer batching for the GPU swizzle decoder\n\n- Handles all LODs per layer meaning cubemaps are now fully handled in 6 passes instead of 6 * (log2(width)) passes.\n- Handles all LODs of a 3D texture in one pass as well.\n- The improvements do warrant dropping down the number of allowed compute invocations a bit","sha":"99d71fdc2a362e3af0e53b791ce88a8556353aad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-05T14:03:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-05T19:07:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Compute kernel fixups\n\n- Adhere to workgroup count limits as exposed by the GPU vendor.\n  They already execute properly even when going beyond the limits but this removes validation noise.\n- Fix invocation counts for deswizzle kernel. The count was incorrect if blocksize was not 4, causing a bunch of useless work to be done.","sha":"508ffcb7759b1a9290e61e86a62775757b66b0c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-05T15:09:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-06T11:12:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Virtualize cellSysCache\n\nAllows caches from multiple games to coexist.\nAlso change the way of handling cache IDs (file-less).","sha":"03b9ee27c577c480edc61e68dd0ffe366089873a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-05T16:53:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-06T18:26:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: adjust custom context menu positions","sha":"77ac875b0b49474692f4ba3c6ce39fccd3522626"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-06T15:17:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-07T08:32:44Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Validate depth test setup to avoid address contention","sha":"8d1505752f5ec18e11607f5f51a18effbf5530f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-06T20:15:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-07T11:09:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU Disasm: Fix RC OE enabled instructions view","sha":"af0bd7136daf3f4778b847588145959b3f34be41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-11-05T16:34:04Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-07T12:02:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixes evdev settings & multiple pads handling","sha":"4ff6acf6ba4994a1b25bdee15c792848ba41aa93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-07T18:10:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-07T18:21:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix vfs::host::remove_all\n\nSeparate WIN32-specific logic.\nDon't call fs::remove_all on WIN32 path.","sha":"24fdd24808853bdc018e379c6a3d5624cd99804c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-08T13:12:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-08T16:11:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement full color remap for the D24S8->ARGB8 converter","sha":"63673b1a9f9dae686c1377f4a5602a39d20f9b5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-07T20:46:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-08T16:27:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix vfs::host::unlink (Win32)\n\nUse fs::get_virtual_device properly.","sha":"d6087978b576b1c2baf6dacd573ccb778a4799f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-07T21:18:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-08T16:27:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove fs::file::set_delete\n\nSince it's Windows-only functionality with limited use.","sha":"742bd633d857bcfbc2dc090f476cd4a24a76b70b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-07T21:30:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-08T16:27:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Don't throw in operators _u16 _u32 _u64","sha":"b33801463941e808d6dbda37a774e5ea98517ae6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-07T21:36:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-08T16:27:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify fmt::throw_exception\n\nGradual exception deprecation: disallow choosing exception type.\nHowever, the function itself can remain here forever.","sha":"587ae17aa2ac8b6d0da47640bbbb779197e1a51c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-07T22:11:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-08T16:27:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GDB: remove wrong_checksum_exception","sha":"e74a311931826eb2cf0d4dd8540a156fe85e1055"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-07T22:36:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-08T16:27:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove throwing and catching cpu_flag::stop\n\nSince there is spu_runtime::g_escape function now.","sha":"ccac9d477783a4502fa56133f24d4fac9c685620"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-08T14:32:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-08T16:27:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Avoid exceptions in cfg::try_to_int64 and cfg::try_to_enum_value\n\nUse std::from_chars plus minimal hex prefix support.","sha":"218758183ddfca85b22f23c2e670e2cb1c42ceea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-08T15:58:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-08T16:27:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use std::from_chars in Emulator::SetUsr","sha":"81c61e230f3f96f4427d87833b033c949af3aac5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-08T17:19:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-09T09:50:53Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement point sprite coordinate generation\n\n- When the point sprite flag is set, overrides the input similar to the\n2D mask. The returned X and Y values are always the gl_PointCoord values\nfor the fragment.\n- Stacks with the 2D mask to override the z and w coordinates.","sha":"7072489a6e95a62bcb6131f641ffd51e9bb85a41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-08T20:24:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-09T11:43:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSysCache: keep mounted /dev_hdd1 after exitspawn","sha":"e0bc2762057df82772ad6d9e1dbdb1a36b01ff22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-09T11:35:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-09T11:43:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSysCache: return /dev_hdd1 root\n\nIt simplifies internal logic a little.","sha":"73ee6abb0f058330647e9ea6690c15408938fa24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-09T11:35:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-09T11:50:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSysCache: poison opened cache files on cache clear\n\nMake opened files return CELL_EIO after cache clear.","sha":"0d629743cad4198c55b3d897baa9c162b4ba2548"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-09T16:11:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-09T16:11:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove gsl::finally only use","sha":"191675bf31771553564c15f97f820b60d9cb3280"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-09T17:10:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-09T17:10:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix SSSE3 usage in PPUThread.cpp\n\nRemove legacy ifdefs, allow SSSE3 usage in AppImages.","sha":"1cca00ec3a80b85b6fe1369bf3d7294a0c7ed998"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-09T17:39:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-09T17:39:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix SSSE3 usage in PPUInterpreter.cpp\n\nFixup","sha":"6ea02c23a040e7d21b48698d22c24011e05c5c9b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T14:17:41Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T18:30:05Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"msg":"rsx: Replace gsl::byte with C++17’s std::byte","sha":"ef368c51718d2849043009213635e75b049d726b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-09T16:11:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T18:30:06Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"msg":"Remove gsl::finally only use","sha":"a83cbf63c6cc086e09eec5ac2fde5a9512aa7ffd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T15:09:09Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T18:30:06Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"msg":"Add tcbrindle’s span implementation","sha":"25144caf12309a5e0f1a9954e808268d1de7c86c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T14:45:32Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T18:30:06Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"msg":"Replace gsl::span’s implementation with tcbrindle’s\n\nThis implementation optimises correctly on all relevant compilers,\nunlike GSL’s which gave extremely slow code on any compiler other than\nMSVC.\n\nSupersedes #6948.","sha":"72cdf0b04c13c1a20f8557d4aa0e62d530aa3789"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T15:51:53Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T18:30:06Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"msg":"Remove extraneous ::narrow<int>() calls\n\nGSL’s gsl::span didn’t use the correct type for its index_type, which is\nwhy they were needed.","sha":"f76720ceb03a929126f54b3b6640e5fe7a7a9e8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T15:13:20Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T18:30:06Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"msg":"Remove GSL as we don’t use it anymore","sha":"7e4d1426824c79db465ee8286406479fd3486c5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T15:43:10Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T18:30:06Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"msg":"Fix CI","sha":"4401ad6747c4970e269a7fc18a462c3cf477ccaa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T17:20:20Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T18:30:06Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"msg":"s/GSL/span/ in XML files too\n\nThis is completely untested, as I can’t run Visual Studio.","sha":"f29fcc10cf75d905b5032a4122ec39041bbf078c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T19:00:31Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T19:00:50Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"msg":"rsx: Wrap gsl::span definition into Utilities/span.h","sha":"56f82d2701603672b81ea4b9b5dd97be414a6074"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-09T20:07:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2019-11-09T20:07:58Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #6970 from linkmauve/switch-gsl-tcb\n\nSwitch gsl::span from GSL to tcbrindle’s implementation","sha":"7519e36317bab93003530f5780ee1a9da51506b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-08T16:40:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-10T11:32:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement sysutil_check_name_string\n\n* Fully implement 3, 4, 16 and 17 error checks of cellSaveData.\n* cellSysCacheMount restrict characters in ID.\n* cellHddGameCheck restricts characters in dirName.","sha":"1986944c613ae9dbe12e7920a8dac4911a894a0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-08T16:46:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-10T11:32:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Loader: Fix default sdk version\n\nNote: sdk version checks are unsigned checks, such value results in always true.","sha":"e8cc9d1f5254fd8e5a534e2bd68a86ec9cd0c31c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-09T06:09:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-10T11:32:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix string length check in cellGameThemeInstall\n\nvm::ptr::size() returns sizeof type instead.","sha":"3f3ce53c6751e6ef79b01b2705f2382b07013a5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-09T11:58:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-10T14:53:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Clean up some unused legacy methods unnecessary after d3d removal","sha":"5f39a594aca3c933d2f2e1697df8ba0ed353e2b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-09T13:14:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-10T14:53:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement mutable ring buffers with grow support","sha":"f3593427211a1e860048497ae06ea1462740c18d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-09T13:31:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-10T14:53:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement explicit runtime flags to manage events like heap sync","sha":"357e0d2097c90fbc624d90eb6e3bdb48d1633556"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-10T07:34:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-10T14:53:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Enable auto-growing of the data heaps for the performance case","sha":"0a32d478dfa44681ff509f36cca9981075fcf8db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-09T13:34:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-10T14:53:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Reduce memory allocation sizes of default heaps\n\n- The heaps will grow as desired, no need to overallocate to cater to\nthe most resource-hungry games","sha":"8ea9bc98743037b05cd51474e470c4b319ecf0de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-10T08:27:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-10T14:53:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Initialize queries before use\n\n- The spec does not guarantee that queries are initialized. In fact, it\nnow says all queries must be reset before they are used for the first\ntime.","sha":"5968427a2fb5ef4c2eeeca7058d16377ea07fa13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-10T09:51:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-10T14:53:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Check for heap change events after a grow to avoid spec violations\n\n- Avoid referencing the old buffer in stale views. Status can be set\nglobally if requested during heap creation.","sha":"8234bdb8f000e1dc2c11523ba596007dabe3f78a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-11T20:12:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-11T20:12:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Don't break blocks on DSYNC instruction in Safe mode (#6731)","sha":"a21d7def33a05fa1ad3ae51a9740c843ba601d86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-10T22:10:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-11T20:13:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: add SPU profiling to compilation thread\n\nRun another thread to collect profile data from SPU threads.\nUse this data to prioritize compiling hot spot SPU blocks.\nImplement stx::init_mutex::wait_for_initialized() helper.","sha":"abbf3c4d16f7b1e7a3a2b29ff7546750625318f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T23:05:59Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-12T16:51:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Utilities: Remove unused headers\n\nAtomicPtr.h has never been used since its introduction in\nda7472fe81fadbd4a0188fc238f01204fa884da5.\n\nSame for Interval.h, since 4fedf5749e24f791ddda9f9abb7f3c3acdb72d47.\n\nevent.h’s last usage got removed in\n70e2873e697bf2bfc46810bae534d77f234cdd20.","sha":"0ff5938b1f435e7444713211f969fe2efa0b59a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-11-10T05:48:42Z","email":"msuih@users.noreply.github.com","login":"MSuih","name":"msuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-12T18:36:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix bitfield warning","sha":"1af948a7d4803199e7361a9447f45a632665656d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2019-10-30T01:49:40Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-12T19:43:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlay: Performance graphs","sha":"cc59d319e1ef8162b9b7a841a4b756335a3d2d20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-05-28T19:14:26Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-12T21:53:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Cheat engine","sha":"8e39c778a15b6315f395f8aa2f1203a64a8d2efb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-14T16:09:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-14T16:09:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: Add workaround for znver2","sha":"fcc841eaa1360b8fae961f1c690f9c2ff7bfbd46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7157389?v=4","date":"2019-11-15T08:04:21Z","email":"anuskuss@googlemail.com","login":"Anuskuss","name":"Anuskuss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-15T09:08:16Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Intel iGPU needs workaround on Windows","sha":"7e31c301330de82961ae27e6e2b99583e80e2772"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-18T01:11:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-15T13:53:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"settings: fix performance overlay margin checkbox","sha":"b84fd29abc6e6dfd8182c25149faac79e7fe32cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-18T01:16:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-15T13:53:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: perf_metrics_overlay to seperate header\n\nthis is done to prevent severe conflicts with upcoming changes","sha":"d6b0361a023a8aee028b8f57f3f48994bbc5c293"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-12T22:33:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-15T13:53:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: fix center options when graphs are shown","sha":"dd1707bd46adf2ab1a534f4c4c0379704233246e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-14T19:10:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-15T13:53:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: add settings for overlay graphs","sha":"fb96047d2f47ac1f31a8dac158fe413345ec7bf4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-14T19:10:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-15T13:53:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: avoid division by zero","sha":"a17a5a76a0eca08628a338efdeb063942fa290d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-14T10:48:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-15T19:17:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Restore cellPadSetActDirect's reserved error check","sha":"25382a7dae12376bc403965344cb921a7b9f5e78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-07T14:30:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-15T19:17:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSysutil: Log error code","sha":"894658f14cb5ec7cae014732bb696940114f0371"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-15T17:17:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-15T19:17:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSysUtil: Add a few CELL_SYSUTIL_ERROR_VALUE checks","sha":"da1296989831a4ffbb272fa3c952867c11791711"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-15T17:25:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-15T19:17:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSysutilGetSystemParamInt(ID_PAD_RUMBLE) changed to return ON status","sha":"610463a425a4cf22756db4879a8b843247595f1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-15T19:56:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-16T08:21:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Disallow NaN in cellVideoOutSetGamma","sha":"0f2adab05fa9c65a99e040284a63afb96755eed2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-15T19:15:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-16T09:38:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"HLE: add more error_code","sha":"0b28f0fa14127dbc5f6c951fc4b760a4b26e720d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-16T14:30:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-16T15:11:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: rename pad_info to pad_device_info for ODR","sha":"9a8c59a1ff2e479bd26c826f0d172d196fb42a64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/24961652?v=4","date":"2019-11-17T09:57:21Z","email":"marin.baron.pro@gmail.com","login":"Niram7777","name":"Niram7777"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-17T09:57:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Avoid Start/StopPlaytime when installing firmware.","sha":"2de3c0678161de746f09b9e08f2e2e09593b2a27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-17T19:07:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-17T19:07:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: change patchpoint name generation\n\nAllow 2 or more patchpoint from a single address.","sha":"f30b81f8b0b3f4fb257adac25a35f54d87650268"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-17T19:09:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-17T19:15:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: use updateGlobalMapping instead of addGlobalMapping\n\n...Where appropriate.\nFix to incorrect addGlobalMapping usage.\nAlso use clearAllGlobalMappings at compilation start.","sha":"db4e201feee922f06c9288e5da612d3b8ba84eb9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2019-11-18T02:06:19Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-18T06:33:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix typo in update manager","sha":"e53be99e1afaea06a250e24873ad2ea6041d1e0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-12T12:48:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-18T10:17:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove more deprecated methods","sha":"c10aa360b1a6bcfc41c3f42349b40be23df7c02a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-12T19:54:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-18T10:17:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Do not ignore clamping for some routines that do not have implied range","sha":"240892280623d00faf69e8b26a8295dcf1b662a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-13T13:51:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-18T10:17:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Clamp buffer row length to never be less than declared width\n- Fixes some games with broken textures","sha":"c415578e79060ef8190cf2aed08e94e45578a88f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-17T20:03:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-18T10:17:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve format validation for blit engine\n\n- Check all possible cases where format mismatch is possible.\n- Warn if a slow path is going to be taken. Should help with future\noptimizations.","sha":"4a0e1c79ed64113d263800a69bdf84e772c1c2a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-17T20:30:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-18T10:17:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add missing format check for the RTV<->DSV transfer case\n- TODO: Rewrite resource handling routines","sha":"9dab0575fa3fd8ba0c3e089464427723f750ca6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-16T22:30:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-18T22:42:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"HLE: add even more error_code","sha":"ca59ab59e9fdd239d5e425b4f5a4b3db44e185dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-16T22:31:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-18T22:42:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"HLE: stub cellCelpEnc and cellCelp8Enc","sha":"41505117a7f4c5c495c6d2adbefcb48d546fce5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-16T23:22:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-18T22:42:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"HLE: stub cellCrossController some more","sha":"2152a770058cb965f5b59790a476d420af38e498"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-18T18:39:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-19T10:18:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix invalid format checks for DMA sections which are typeless","sha":"41c318027621d818eeabf56189b678eaa676994a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-18T19:11:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-19T10:18:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve blit format mismatch detection","sha":"fd751e3e7bd12aebe4f7745138f92eba47cd193a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-18T19:13:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-19T10:18:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Select correct image aspect for blit engine targets.","sha":"41e7d2aa0a05bb81a037d5f9b556a6de58a454d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-10T07:09:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-19T15:04:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: remove unused rsx debugger code","sha":"223d1473b0a6b39e04448e006e30551f446899cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10179087?v=4","date":"2019-11-01T11:47:29Z","email":"stockhausen@collogia.de","login":"plappermaul","name":"Markus Stockhausen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-19T15:10:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Lightweight putllc() for non-TSX if no data changed\n\nThis replaces the totally messed up PR #6728\n\nSome games make heavy use of getllar() & putllc() without even changing data.\nIn this case avoid unneccesary heavy locking of the PPU threads on non-TSX\nhosts.","sha":"cd6b6c8a4f19595ac339efbf86602ecf59b5a497"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-19T19:17:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-20T18:58:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Clamp volume in cellAudioAdd/2c/6c/Data\n\nSame as firmware, NaN and Inf are flushed to zero.","sha":"8d5ef2c7b919f48161c5d3d3663f59a6cd1ad53b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-21T16:44:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-21T19:51:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_net: Add error_code","sha":"6ad8b0a443f35e0c48efc64df32300216f5aaf39"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-21T22:01:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-22T15:56:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_net: format both negative and positive sys_net_error values","sha":"5c55d4f2fe24df05215fcf19fd0c4e627aef12fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-22T15:56:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-22T15:56:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_net: don't report SYS_NET_EWOULDBLOCK in blocking syscalls","sha":"f31233b822422ff18efa91f3e2a2af1082109eef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-23T12:11:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-23T13:11:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove redundant check","sha":"429a76a140a7940ecdb3002922eeb5e0a6323df1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-12T13:46:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-24T16:01:57Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remember to min-max the anchor indices of a polygon or triangle fan","sha":"8ca53f9c843712c25988f44761417f526fc26212"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-07-26T08:47:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-11-25T09:04:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_prx: Tiny improvement","sha":"fd433779bbb844e481b2436b37fc0e4bdc7d83f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-24T15:41:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-11-25T09:04:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellVoice Update\n\n* Use shared lock wherever possible.\n* Fix cellVoiceSetVolume.\n* Fix error logging of cellVoiceCreateNotifyEventQueue, cellAudioCreateNotifyEventQueue","sha":"c9066e72367d8c6fcbc54f711759f15ba772e190"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-26T03:39:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-11-25T09:04:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellVoice: Fix NOT_INIT checks, implement 0 event source handling","sha":"f4ac8a2e0c9dd9df297c25e90916731703874dac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-26T04:07:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-11-25T09:04:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellAudio: Implement event source","sha":"1233c48d9222162ede8d19a801f6c0fd1a4e0cc4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-26T05:27:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-11-25T09:04:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix cellVoiceCreatePort","sha":"40db205f5db1795701cc1d9c01bfbc04d4ec43e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-26T17:21:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-11-25T09:04:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Implement cellAudioCreateNotifyEventQueueEx","sha":"17ae70b93504e63184cf132812e1442a9883f9af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-26T19:02:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-11-25T09:04:56Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix cellAudioCreateNotifyEventQueue queue depth\n\nTODO: global sdk value used is set in cellAudioInit, which means sdk var value is 0 before it's initialization, currently safely set queue size to 8 in this case.","sha":"70ace4bb83d26dce13f7997799658a6d2f6242a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-11-24T09:18:10Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-25T20:08:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cmake: Add post-build commands for Windows","sha":"f29709105f59e7a23252242921533d596a5652c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-11-24T10:32:21Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-25T20:08:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cmake: Set LLVM_INCLUDE_BENCHMARKS to OFF","sha":"e735346d269d472a19605c74252edd9c54abd716"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-23T16:31:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-25T21:01:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: detect mpy32 pattern","sha":"4caf747729431fd9f93619761effac79c162c33a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-23T16:30:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-25T21:01:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: internal refactoring, add spu_program\n\nUse struct (spu_program) instead of std::vector<u32>.","sha":"1b9a3e6077052539b8d484c6c368e485e146c7f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-25T21:01:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-25T21:12:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: implement vm::try_access, vm::ptr::try_read/write","sha":"2290c389d630b4d39456796cb071b6cd37a42199"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-14T08:26:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-11-26T20:21:33Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellSysutilGetSystemParamString improvements\n\n- Check bufsize, must match to max string length\n- Add missing cases for ParamId 0x1008, 0x1011, 0x1012, 0x1024\n- Set actual current username in buffer on id == ID_CURRENT_USERNAME","sha":"b5f6b27f86f5307fe87b9eb5f5b73a94212765f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-10-18T01:16:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-27T09:34:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: add dynamic switch for perf overlay","sha":"f2b530823b66555c029e6b3f9181e472a00fbfb1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-14T21:45:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-27T09:34:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"settings: enable dynamic reload of some emu values","sha":"d91f8193b001ec04a7799a28b7ffc7f6ea6b1db3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-21T10:25:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-27T20:41:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Decrease memory stats in cellGemInit if needed\n\nAlso:\n* fix state reset of cellGem\n* Check max_connect == 0 in cellGemInit","sha":"3b06214f88d5b208f4fb4b4ada16c69c0857b67d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-09-21T11:43:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-11-27T20:41:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Avoid calling lv2_obj::sleep sequantially in sceNpTrophyRegisterContext\n\nAlso fix a correctness issue with queued.","sha":"038c6bb23429cb9f29787fe0d2453cbaae586cd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-21T21:29:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-27T22:54:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Stub sys_spu_thread_group_log","sha":"b8220ec12f72a6db0b7e2e14365b8142225c05b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-22T12:45:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-27T22:54:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix possible division by zero in sys_spu_thread_write/read_ls","sha":"9cc3838e491ea690582da98997df949092328642"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-27T19:52:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-27T22:54:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_spu_thread_un/bind_queue queue existence check","sha":"8bd52c98438a45cbaa11e44becb509a4a8a2bf68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-28T18:18:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-28T21:35:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"C-style cast cleanup (partial)\n\nReplace C-style casts with C++ casts.","sha":"5b9df53c13e021dbc78f4db1b37609cea002a29d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-29T22:28:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-30T15:17:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"C-style cast cleanup II","sha":"ad9c9f01833f12d9e01b6c854906e143714e7b31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-29T23:11:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-11-30T21:32:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"C-style cast cleanup III","sha":"28eacc616ae8a111061dab549f6d5c174ef3d8a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-30T21:16:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-01T18:11:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sceNpTrophyRegisterContext hack","sha":"37c220af729cbf3a49a4cf4543c896cdd5c3d929"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-01T05:14:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-01T18:11:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGameBootCheck Improvements\n\n* size->sysSizeKB returns 4kb. (hw tested, unknown if in different situations this value changes)\n* Return CELL_GAME_ERROR_BROKEN on failure to init. (hw tested)\n* Write to dirName only when type is HDD game. (REd)\n* Don't write to *size on errors, make it happen after *attributes and *type writes. (REd)","sha":"1a6e8e20dca9fd259e03c607d4c9d93ae5375298"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-01T05:30:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-01T18:11:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix error checking of cellGameContentPermit","sha":"d45fbc331ca153ccdef3f454fdbf1639470bfe42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-01T17:14:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-01T19:12:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"C-style cast cleanup IV","sha":"bf11a28fb5fcecb101d202a4708f7a00101ddd72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-02T23:47:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-03T06:59:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: avoid nullptr if there is no dialog","sha":"d73f04da139094fa8d7f3fe52c02215106ca396b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-02T23:55:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-03T06:59:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: skip in-game Qt dialogs if no-gui was used","sha":"84f9911163aadf12322243c04433e096154be65b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-03T07:32:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-03T08:12:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add Emu.HasGui() to properly hide Qt dialogs in no-gui mode","sha":"46ca39ec4dfb3c04eabb943d3c69385bd39ecbf0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-02T21:31:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-03T14:23:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"C-style cast cleanup V","sha":"185c067d5b02b571495f9370a95dd9d9ae84cb94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-12-01T09:06:56Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-04T09:59:38Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add sampleRateShading to the list of device enabled features","sha":"2eaaf5b132573861f25510a3f17ecec336b58fba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-27T10:39:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-04T10:48:39Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"ds4: Add workarounds for some 3rd party controllers","sha":"6ae8fd0d347c96b6a28694608bb14bb30a6b513f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-03T21:24:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-04T10:48:39Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"ds4: Cleanup\n\n- Simplify helpers to read integers HID feature report buffers. They're\nsimple LE values.\n- Improve calibration format detection by just checking the returned\nvalues and not relying on bluetooth check. PS4 does not seem to do it\nthis way as it accepts 3rd party controllers with inverted format. The\nonly other request 0xA3 seems unrelated to device capabilities.","sha":"d973835bef74c5517de4b491a2afa8d865841df4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-03T22:34:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-04T14:56:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"C-style cast cleanup VI","sha":"377e7d2a73fb2c83da73f65a5983b02499613e51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-04T18:32:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-04T18:32:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Commit 377e7d2a73fb2c83da73f65a5983b02499613e51","sha":"d2fd3c6bc4396c8472e09cecfc724d5fbf216527"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-04T20:56:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-04T23:10:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"C-style cast cleanup VII","sha":"835892aa51be06036dd99396d55188c26b135da9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-05T08:28:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-05T08:28:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Compilation fix for NetBSD (#7067)","sha":"c3862b74b104f01660423cf7ffa4b902888c81f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-03T14:55:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-05T20:31:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_spu_thread_group_dis/connect_event Improvements","sha":"a2c69e4a2ec3139b6a0e273f4ee97985f9fdd6d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-03T14:57:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-05T20:31:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Revert part of #7044\n\noops.","sha":"401813f9623f8b89e83fdd3487194d78af851480"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-05T13:34:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-05T20:31:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make sys_tty accurate in release console mode, message saving in log","sha":"98970884c8348f2331a000748b6861f9bcaca0da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-05T13:48:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-05T20:31:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Move size write in cellGamePatchCheck","sha":"e050dcbc52d692465d365c3519d126344923f2ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-02T23:44:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-06T16:59:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_spu: Fix SPU Thread Id\n\n* Removed wrong code in sys_spu_thread_group_terminate.\n* SPU Thread ID is accurate, including 5th thread id \"rule\".\n* Fixed possible use-after-free access of spu_thread::group member.\n* RawSPU ID management simplified.","sha":"5631382623004c749d9deb43c43a640382d0ef0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-06T06:34:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-06T16:59:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor fixup after #7068","sha":"5142d7c01122cae0872c6d76234e5bad9a578ede"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-07T01:35:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-07T09:22:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNpBasicAddPlayersHistory(Async) fixes\n\n* Check if count == 0.\n* u64 typos fixed.\n* description won't be checked if null.\n* Check each npid provided, not only the first.","sha":"963d5fb981cb0712ed97cb20a8c6ce2a783c43cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-07T06:19:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-07T09:22:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNpBasicAddBlockListEntry: Add connection check","sha":"a5b3b0df4089b65677981f70cf158fdb582062db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-07T06:19:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-07T09:22:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix warning about truncation","sha":"6a4ba9d562193228fc90e0d73252775cfafb20b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-07T17:07:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-10T21:11:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Ignore or recover from unknown primitives\n\nThis also fixes a bug when recovering FIFO or creating such recovery point inside in_begin_end == true scope.","sha":"7260af032e0922c86b04cb9ced2acd74bd742b7a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2018-01-24T00:27:25Z","email":"makren67@gmail.com","login":"VelocityRa","name":"VelocityRa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-10T22:20:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"PSMove: Rudimentary mouse emulation.","sha":"ac2b0c9752f6e41596c29e05b5e1c3a3406ecd15"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5261759?v=4","date":"2018-07-23T17:57:40Z","email":"Dante38@free.fr","login":"Zangetsu38","name":"Zangetsu38"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-10T22:20:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Modules/cellGem: Implement pos, quat and handle_pos in Gemstate for mouse.\nModules/cellGem: Fix name for gem_image_state.\nModules/cellGem: Implement projectiion(x/y) in gem_image_State for mouse.\nModules/cellGem: Add cross, triangle, circle and start with use middle click for mouse.\nModules/cellGem: Refactor global code.\nModules/cellGem: fix some warning with initializing value.","sha":"af8ebc76e242c468eb20daf15b7834a737717559"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-10T19:17:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-10T22:20:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: cleanup some spacings","sha":"691c7cde670585b1348c8098bd732517b200427f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-10T19:35:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-10T22:20:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: add some explanatory comments","sha":"038694ae287fd9b6d3e2713a2d560ca748519aec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-12T12:38:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-12T12:38:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Delay FIFO recovery point creation if is in in_begin_end scope (#7080)","sha":"6a926daee721dc530793331ba8e5c0632ba6d482"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-12T13:29:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2019-12-12T13:29:55Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: Remove some outdated code (#7060)","sha":"73236efe5887ea6644572fd651d930c8b408ea9f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-10T16:17:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-12T23:08:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix some warnings","sha":"69e81da57b06e7d80ad3526c7b184972e08cab62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-12T23:11:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-12T23:11:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: add workaround for cascadelake CPU\n\nNeed to investigate it later.","sha":"dbece4d00fc8b6d815f33e596f0bd81bf35e4937"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-13T00:21:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-13T00:21:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix missing-braces warnings","sha":"321f7e71977f9f7d32766e159a67debe7ebc2c36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-13T13:19:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-13T13:19:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: remove cascadelake workaround and update LLVM fork\n\nVPTERNLOG fix may be necessary.","sha":"e3e97da7bb6c4b58dc89da78223efeb208efb76f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5298497?v=4","date":"2019-12-04T19:55:40Z","email":"jayveerk@gmail.com","login":"Jayveer","name":"Jayveer"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-13T18:52:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Updated sys_net to use WSAPoll on win32 as this fixes connection issues\nin Metal Gear Online. Also aligns with implementations on non win32\nplatforms","sha":"364ba95d261616e16a73e21e2f4d03af7da23297"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-14T11:48:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2019-12-14T11:48:34Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Qt: Use QT_ENABLE_HIGHDPI_SCALING starting with Qt 5.14 (#7090)\n\n* Qt: Use QT_ENABLE_HIGHDPI_SCALING starting with Qt 5.14\r\n\r\n* Qt: Add QT_SCALE_FACTOR_ROUNDING_POLICY starting with Qt 5.14\r\n\r\n* Qt: remove style path for Qt versions below 5.11 (5.11.0 is min version)\r\n\r\n* Qt: Fix dpi-rounding cli arg\r\n\r\n* Qt: use rounding policy PassThrough as default dpi scaling policy\r\n\r\n* Qt: add missing Qt Version check (facepalm)","sha":"97fb08935e41ecbe7764253e36c29eaa591f581f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-14T11:14:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-14T14:15:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: move firmware settings to the advanced tab","sha":"725761f28221d53983d2f3c692d284c6015fbff9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-15T08:22:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-15T16:55:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU DisAsm: Again","sha":"3efd5f360c269914c3f6f2bff2bff62eb91ebbf7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-17T22:43:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-12-17T22:43:00Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix sceNpTrophyGetGameProgress (#7103)\n\n* Fix sceNpTrophyGetGameProgress\r\n\r\nWas missing multiplication by 100.\r\n\r\n* apply requested changes\r\n\r\n* Enforce round-to-nearest rounding mode","sha":"e380a8c279e9179fc6d0a3f6cd0531ccea5bf8fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-17T17:21:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-18T12:07:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Hotfix sceNpTrophyGetTrophyUnlockState","sha":"8d955cfb8cdbb22d9052a52211d1ce429ba14bff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-18T13:35:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-18T14:41:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: minor optimizations in trophy_manager_dialog","sha":"91ad3d371f51bcd337dec27348115532b07e2cf6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-18T14:14:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-18T14:41:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add platinum relevance to trophy_manager_dialog","sha":"6388c9807310508833e2581f43cd7e14a798adae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-19T01:57:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-19T17:15:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNpTrophy: minor optimizations","sha":"7fcef227afca27697a9985e9fcd2902067dfed10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-12-18T22:30:29Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-19T23:19:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Look for custom game titles when filtering via Search","sha":"95f363c174c6b2da742d8d9ec8bb6d0b23d58f5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-20T06:45:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-20T09:20:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix cellNetCtlNetStartDialogUnloadAsync","sha":"6dd40031549f4f98aae64b89a39cf1151d03ff2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-20T15:53:41Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-12-20T10:48:03Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rsx: Make X11 optional on Linux\n\nThis makes it possible to build rpcs3 on a pure Wayland system, without\nthe Xlib installed.","sha":"e30173a835f905a3d304b34e4d18fc58b802f683"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-16T19:56:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-20T11:47:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Implement rounded_div\n\nRound-to-nearest integral based division, optimized for unsigned integral.\nUsed in sceNpTrophyGetGameProgress.\nDo not allow signed values for aligned_div(), align().","sha":"db4041e079f4707ed5d8e2d6786bcec215695569"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-20T12:29:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-20T13:57:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cmake: Fix vulkan on X11","sha":"fff1007d9a5d5894481dce9a027e58c3b842269b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-20T12:29:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-20T13:57:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"appveyor: Update vulkan SDK version to 1.1.126.0","sha":"4a5c8c392c9014766ebc7cdfcc25a5dc5ec4bdd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-20T18:11:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-20T18:11:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPUTranslator: detect FMA feature","sha":"068450d4feb43afd97dfa95e2e3ebd2f9a64116e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-20T18:24:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-21T14:53:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: use FMA with approx xfloat when available\n\nEmulate FMA with double precision if unsupported natively.","sha":"3b46c9cb6a173ec853392a3283541908209b48dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10179087?v=4","date":"2019-10-26T20:51:38Z","email":"stockhausen@collogia.de","login":"plappermaul","name":"Markus Stockhausen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-21T22:26:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve approximate xfloat\n\n- Disable denormals for SPU threads\n- Add clamping helpers","sha":"a36f0497ce91628782fa33248d30894c28460e87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-21T07:12:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-22T01:35:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Avoid shifting by greater/equal than max bits values in ppu_rotate_mask","sha":"c65bb0d267e1d25e08ec0fe2c37332c8bd0a42d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-12-21T14:51:41Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-22T14:54:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Simplify custom titles and notes\n\nBy adding some code to notes/titles reading,\nit is possible to leverage default value behaviour in QMap value()\nwhich simplifies code a bit.","sha":"f03cb5c9c03c6382ad67a11591f8832e995a507f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-12-22T16:39:42Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"linkmauve"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-22T16:39:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Move input to its own directory (#7126)","sha":"e9c5c6e6bf08a3f4bfdc59474bbaa9edea8d1da3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-09T17:13:42Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-22T21:02:57Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"RSX: Remove two empty cpp files","sha":"9b77febd109210d54efdba9b616c6ff22ff109e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-12-17T03:00:29Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-23T19:31:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"WSAPoll workaround","sha":"90e4fe23c597eaa6b67a36aca53879c7fc6b2c5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-23T19:36:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-23T19:39:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_net: fixup for race condition\n\nDon't reset is_connecting without checking correctness.\nAlso cleanup dead WIN32 code.","sha":"abe2cc196abe26a1c309d66c97c6466dc17fffb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-23T19:51:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-23T19:56:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix UB in to_u8\n\nPossible signed shift overflow.","sha":"baf9a20c08738d3a207a3a9277ea7fe08fb16cdf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-18T22:48:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-24T10:54:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"stub cellRemotePlay and cellResc and cellStorage","sha":"e83dfedff9e8bb83f867bf649f78da29579e5d9b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-20T22:29:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-24T12:06:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add plaintext log and more log options","sha":"e54438d3a7f07fed2366c1de7eeb286443787fe3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-27T19:50:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-27T20:12:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: compress PPU cache\n\nCompress PPU modules to .gz (backward compatible with uncompressed cache)","sha":"70e26eeb4561b9a394545c69968f8a3461c080bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-26T20:01:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-28T14:40:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"silence some annoying warnings","sha":"ef6f565dbd4178754a10015cb203350a89535387"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-28T17:43:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-28T18:44:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix removal functions after cache compression","sha":"096a08aca12d4435262043d5b3ccca83595f2fb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/29986095?v=4","date":"2019-12-28T19:45:12Z","email":"joker46@seznam.cz","login":"Kravickas","name":"Kravickas"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-28T19:45:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"rename Searchbar to Search bar in style sheet comments (#7140)","sha":"f73107b46ae962011815650bd90fd7cb672d607d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-28T20:34:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-28T21:24:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: apply more specific file filters for cache removal","sha":"9f106be36d2eb023aff5c4930bcd27e72f1b1a73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-27T09:35:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-29T00:19:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: add confirmation dialog for save data interactions","sha":"47da90736631198b5ee649c4c626dc72c4b1e062"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-27T09:50:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-29T00:19:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: add error dialog to callback result errors","sha":"bb7848f6e5740fb524164151d61a3b18f73c0f17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-27T10:41:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-29T00:19:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: add more constants","sha":"ff0089bc6fcbba428ef83b4ff3ef674130086fc3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-27T10:45:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-29T00:19:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: get confirmation if not CELL_SAVEDATA_OPTION_NOCONFIRM","sha":"0b784043374f8470aad3455523750899250bd802"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-04T12:07:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-29T10:49:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove deprecated do_method path that has been superceded by c++ inheritance for many years","sha":"8dfea032f2fa367028c24fe4112f4e3638c51ec0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-11-30T12:44:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-29T10:49:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Restructure ZCULL report retirement\n\n- Prefer lazy retire model. Sync commands are sent out and the reports will be\n  retired when they are available without forcing.\n\n- To make this work with conditional rendering, hardware support is\n  required where the backend will automatically determine visibility by\n  itself during rendering.","sha":"5be7f08965d5125463b3270e4ce20d84ef0058c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-07T13:28:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-29T10:49:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement multithreaded command submission\n\n- A few nagging issues remain, specifically that partial command stream\n  largely caused by poor synchronization structures for partial CS flush\n  and also the fact that occlusion map entries wait on a command buffer\n  and not an EID!","sha":"a51395370e1bfc52b49bdb02b0158108cbc5b8ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-10T04:56:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-29T10:49:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement hw conditional rendering","sha":"93895838c78bec46e885bdcd600a6db887e456c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-10T06:10:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-29T10:49:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Emulate conditional rendering for AMD","sha":"cdd9c12132d082bf4dcabdb70d641198a72395a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-10T06:14:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-29T10:49:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Switch occlusion pool to FIFO rather than LIFO to avoid hard stall","sha":"55ad9244c0d39b35bbf506cdf09ee36fac8ac67a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-11T16:28:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-29T10:49:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Refactoring and optimizations to query handling\n\n- Caches query results when looking up report availability to avoid\n  entering driver code twice.\n- Minor code restructuring","sha":"9f94a6dc1198f08e791e8f34ba25198caed2b01c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-11T16:28:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-29T10:49:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add toggle for zcull sync behaviour - Adds a relaxed sync mode where ZCULL reports are lazily nudged into flushing and the main core does not actually wait for the event to finish before proceeding - Can drastically improve performance in cases where the game actually does not utilize the report data","sha":"fdb638436f1892b8cfee125cdee260a13662b781"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-11T19:07:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-29T10:49:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Zcull synchronization tuning\n\n- Also fixes a bug where sync_hint would erroneously update the sync tag\n  even for old lookups (e.g conditional render using older query)","sha":"ed2bdb8e0cdc7ddd1b42230b545ae795528b688a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-15T10:38:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-29T10:49:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix linux build","sha":"e1b734fd12326e8c23b9f9835a2399e982b8e396"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-19T12:25:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-29T10:49:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix cb chunk synchronization deadlock","sha":"24cb48971eb47d2229ed951bfcbc28ecd8d68fd0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-23T11:27:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-29T10:49:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"settings: Add relaxed zcull toggle to advanced tab","sha":"1b27ccecf83e183407f85f65e8ca1a62a6a05faf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2019-12-29T07:33:15Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-29T11:45:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add support for mousewheel movement","sha":"6cfcb7b4f389d42c32fe282035f8ea07dc56d1d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-29T00:01:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-29T13:22:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: don't pause apps during dialogs","sha":"c4b4ce46b8c2d58016415f1a5d711a7b95ed7837"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-29T12:08:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-29T13:22:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: improve ppu schedule during dialogs","sha":"45dc5d9b02d1b433e8e018f6047bbdbbc8fc2225"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-29T16:03:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-29T18:24:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_net: add a workaround for WSAPoll with timeout\n\nDon't call WSAPoll with empty socket list.","sha":"01b1b21efd47b13b6a8d3606db6f5f487e82394e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-29T18:53:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-29T18:53:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_net: fix sys_net_bnet_connect on Windows\n\nProperly write is_connecting variable.","sha":"ef8872c0d73be185de0c710aacac5a7d9ab684e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-10-25T08:03:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-30T19:20:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: rewrite comparison on non-xfloat path of CFLTU, CFLTS\n\nCFLTU on non-xfloat path is accurate as xfloat path now.\n* Also optimize FCTIW like FCTIWZ (PPU)","sha":"923cd7ad720ae1d55de61e19f7fb213d00f210aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-21T06:16:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-30T20:46:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Allow sys_raw_spu_create_tag to be called more than once","sha":"45cff1219c2f29fe4267758a2a3cc6f50f1e66d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-22T06:55:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-30T20:46:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor fixup after #6894","sha":"b59a825e48db7bf6cfd04e5586805bff4a1c80a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-30T17:40:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-30T20:48:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Allow unimplemented HLE functions detection by bot","sha":"3e80727f8eef5e0898664c0584cf7f99b00de674"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-30T17:38:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-30T20:53:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"update glslang","sha":"bb75174f3615fa5e80d445a3f49f2d2ddbda6d58"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-30T17:41:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-30T20:53:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"3rdparty: Update vulkan memory allocator (GPUOpen)","sha":"33f7d235719efaf86d71aedc7830e7175de2bd08"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-31T09:57:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2019-12-31T10:56:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Do not leak mapped memory","sha":"915cf0bae8d6b6507be67971b0273cfc8b9f1323"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-31T12:24:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-31T13:15:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: only show dialogs in fixed functions","sha":"a5c592746819a60cb04e690501bcd047154cc93c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-31T15:02:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2019-12-31T15:02:10Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Improve cellImeJp (#7014)\n\n* HLE: add error_code and definitions for cellImeJp\r\n\r\n* HLE: add function parameters to cellImeJp\r\n\r\n* HLE: improve cellImeJp\r\n\r\n* HLE: further improve cellImeJp\r\n\r\n* HLE: simplify cellImeJp","sha":"93a6e9e4e41faf631289ac6df70f61e7b1bce917"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-14T21:03:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T15:57:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement runtime PPU executable code modification via Cheat Manager","sha":"8427af888645336a70cfe23980e854a0cf3398de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-15T10:17:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T15:57:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix ppu_patch invalid address check","sha":"ec9622b5138067dc6d834ca607a40a0b42cdf301"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-01T10:57:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T16:05:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor spu_channel_4_t optimization","sha":"3257552227e06a602a775297387b101363922456"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-01T10:58:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T16:05:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make spu_channel_4_t::clear() atomic\n\nBy removing separate value3 write, fixes a rare race introduced by #6917.","sha":"9958a83d101fe65727dd3ff7f8c302c7a682f264"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-31T14:02:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T16:05:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update cellVoiceCreatePort syntax","sha":"b30be0fbc160b5b0ce9b5b8baa01c7deb05e690c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-10-05T15:22:40Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T16:24:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add progress_dialog::SignalFailure()\n\nTurns the taskbar progress bar red, commonly used on Windows\nin cases like this to signal failure.","sha":"abfa1114bc228cf7d3a12fa0ac21a9e08bce4439"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-10-05T15:25:07Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T16:24:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Handle ERROR_FILENAME_EXCED_RANGE error on Windows","sha":"9e66f3694225e844562a13d2734d5e4e32f65c36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-10-06T10:30:48Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T16:24:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fail pkg_install if any files fail to be created\n\nThis could happen if eg. paths are too long or some files\ncould not be overwritten. Until now, installation happily\nreported success regardless.","sha":"b591633cb9fcda82d59221ed3c6dcc1c5d665b5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2019-10-06T10:32:08Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T16:24:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use path_append instead of operator + to concat paths\n\nThis allows to cleanly prevent double // slashes when appending paths\nWhile this should not be a problem, Windows seems to have problems\nwith such paths when paths are very long - and preventing this\nis trivial enough.","sha":"974bce19ed9a7ec688cee37f199be46f575d2f3d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-01T19:21:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T19:22:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement ps3 application root flags detection","sha":"c2eb9a583d35618808fa06c9d6e51d5e6b306192"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2019-12-11T22:33:26Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T19:23:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Avoid using vfs::get to let decrypt work on PSN binaries","sha":"5de83e0425a98abcabd594939724f316b56bd3e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-20T03:51:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T19:27:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Some cleanup\n\n* Prefer default initializer over std::memset 0 when possible and more readable.\n* Use std::format in trophy files name obtaining.\n* Use vm::ptr<>::operator bool() instead of comparing vm::ptr to vm::null or using addr().\n* Add a few std::memset calls in hle where it matters (or in some places just to document an actual firmware memcpy call).","sha":"9690854e58b3e316d1d23fd072b0fb3c61adecef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-20T07:17:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T19:27:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Silence some log messages","sha":"71c4a2a15ffcfd5a0d51ac0dbd8207d840419c9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-17T19:55:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2019-12-31T19:32:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement sceNpTrophyTerm resources deallocation\n\n- Implement sceNpTrophyAbortHandle, if handle is aborted an error code will be returned on its usage.\n- Free context & handles in sceNpTrophyTerm.\n- Return SCE_NP_TROPHY_ERROR_INVALID_ARGUMENT on invalid context & handles ids.\n- Implement id resource shortage error checking.\n- Check negative sceNpTrophyGetTrophyInfo trophy id.\n- Minor error checking fix for sceNpTrophySetSoundLevel","sha":"7cc6881a579869ad544e8b7f7fd81b99d4983116"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-12-31T22:51:35Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2019-12-31T23:20:49Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rpcs3_version: Bump to 0.0.8","sha":"341fdf7eb14763fd06e2eab9a4b2b8f1adf9fdbd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-01T17:38:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-01-01T17:38:05Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fixup after #6933 (#7166)\n\n* fixup\r\n\r\n* Get rid of obsolute arg in lv2_obj::awake\r\n\r\n* nvm ill do this later\r\n\r\n* Typo fix of the decade","sha":"4c20881f8f40f4dfd45ffb3eca94ac206a56e7f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-01T18:52:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-01T19:39:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Clamp depth export in FS\n\n- PS3 matches OGL behavior where writing to the depth export\nregister results in clamping.","sha":"c4e59b51151ec80dc61770314f036856f8b94c75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-01T20:23:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-01T21:53:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update ffmpeg","sha":"2c4ecc55af1e27267e25b1f1a351c655107d0dda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-02T04:21:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-02T04:49:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: use errDialog to skip error dialogs","sha":"7af2ebb6f43799349b0cfc7ed1846569b26a299e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-02T03:05:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-02T10:35:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: repaint all related icons for custom configs","sha":"02ca8f0002a07bf5f77b0760020ddeb251a0eb82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-02T15:02:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-03T07:35:53Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve MTRSX synchronization\n\n- Properly synchronize DMA transfers when handling RSX pipeline\nbarriers. Texture read barrier is used to signify completion of DMA\nroutines and is often used to signal that Cell can overwrite vertex\ndata!","sha":"7786681954e6485baa9dc323d66701a8f94eebf9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-02T21:48:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-03T07:35:53Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Change default vertex output value\n\n- Prefer w!=0 to avoid a situation where xyz/w = nan. More of a\ntheoretical problem, but some calculations break down in such a\nsituation.","sha":"d12762414a83d052f61c786d43fe6b438c7a036b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-03T11:00:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-03T13:22:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VK: remove unused init function declaration","sha":"c9aee27d48f66468d58662e4cf85dfc8b08c5765"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-03T11:01:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-03T13:22:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: fix non-interactive dialog loops","sha":"d94d094a7ecdacf3ef47d119710bc7710aff96cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-03T11:04:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-03T13:22:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: refactor shader loading dialogs","sha":"5e7d25ad354eb4b2078dabb1ba63e96870eda338"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-03T11:32:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-03T13:22:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: remove duplicate yield","sha":"b3ad89cc8bdbc3faaa1089e6e07dd11e937a2636"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-03T12:41:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-03T17:33:32Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/overlays: Add support for animations\n\n- Adds animation support. This commit adds the base framework and\nimplements a translate animation used to slide elements around the\nscreen. This is then used to implement the sliding animation for the\ntrophy notification.","sha":"31b07fece51e082850beb0afd7e525c9d07b3d08"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-01-03T08:42:08Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-03T18:45:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Link Bcrypt with ffmpeg","sha":"ca52c1e2d138604fb9f7d89805de933fc6a3955f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-03T18:53:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-03T18:54:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update ffmpeg fork URL","sha":"7af7e3cec10d9e469ca696e81797668ee45045d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-03T22:30:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-03T22:30:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Inject rpcs3_glslang.props to glslang build\n\nDisable new exception format to remove vcruntime140_1.dll dependency.","sha":"671ae20876f5d1395e95785f316b8144a48e0e35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-03T22:32:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-03T22:32:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add BOM to sys_tty.cpp","sha":"691a57a4dabff542ba74f378b05ca35f9aebc167"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-03T22:50:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-03T22:50:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update glslang.7z","sha":"49d5ce3ba4e2c428f0e9d75c54235afd4d9c2a22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-03T17:43:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-04T13:36:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/overlays: Implement trophy notification queue\n\n- Allows to display more than one trophy at a time. Trophy notifications\nwill simply get queued up and displayed at appropriate time.","sha":"3ada97d2d361f65ff44bc0ae8d2418a0db249d28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-03T18:20:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-04T13:36:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/overlays: Improve space usage on trophy dialog\n\n- Slightly increases the size of the trophy dialog and the font size.\n  The old dimensions did not work with some libre fonts causing\nalignment errors and other problems.","sha":"bdb5115c7f38522ba7dc2070b6a948b12abf6424"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-01-03T19:16:58Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-04T16:10:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Add tooltips to Virtual File System buttons","sha":"f92794360d9cf2f8daacbe33f1e281be4eadc666"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-01-03T06:46:00Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-04T17:58:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Change Null microphone to Disabled","sha":"69f11d82d1cf70448525f27209f7af89defdb54d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-01-03T20:07:40Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-04T17:58:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Slight cleanup of mousewheel pr\n\nFixes theoretical uninitialized variable and micro-optimizes scrollwheel stop code","sha":"049f852a9c5df90d1d9327684a5c22bae78d1da4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-01-04T15:39:16Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-04T17:58:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Disable AA for renderers which do not support it","sha":"5534c9e27c6f01550c08d2c29060e4cd812f9e1c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-04T17:10:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-04T18:44:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix lv2_fs_object::name\n\nRecreate path from actual decoded components.","sha":"28fb0d1741f0955cf33f0639d2fc818f78227009"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-03T20:29:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-04T19:38:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellFs: Improve cellFsGetDirectoryEntries","sha":"9d2c9e5d62d50b9d445e5b1fce31e62684a1ff87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-03T20:32:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-04T19:38:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellFs: Fix cellFsLseek with negative whence","sha":"872be25ed12675267e65d5654105ff5490ae248f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-01-03T18:27:47Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-05T10:01:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add a dialog to Batch PKG Install\n\nDialog allows users to preview the order in which PKG's will be installed\nand allows users to move items around if needed.\n\nBecause clicking \"Install\" on this new dialog acts as a confirmation\nand user has a second chance to eyeball what is to be installed,\n\"Install package X?\" dialogs have been removed and instead user\nis only notified of success. In case of failure, batch installation\naborts with a descriptive error.","sha":"e7ddc5187ad3c3fe8259197d809dd2866ffcbaa8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-01-03T18:40:16Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-05T10:01:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Minor cleanup in InstallPkg and InstallPup","sha":"b88fb43acc6298cf464d2ac242b6310067759571"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-04T12:02:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-05T15:06:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vp: Properly initialize output registers.\n\n- All registers tested on hw show contents to be 0, 0, 0, 1.\n  Make default output registers match this pattern.","sha":"7f09def94ec9703b3c7657852c9c4e2efa650c3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-04T20:12:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-05T15:15:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement lv2_fs_mount_point with mount point flags\n\nImplement some actual mount points\nImplement lv2_mp_flag::no_uid_gid","sha":"d5f095755872afb2a49c49ced419e7d1fb6eebe5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-04T21:55:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-05T15:15:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: implement CELL_EROFS error\n\nImplement lv2_mp_flag::read_only.\nCurrently only /dev_bdvd is affected.","sha":"bed2d558a697d2a75ca2def437c67863adff2cc4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-05T14:31:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-05T15:15:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs_stat: fix split file handling\n\nAllow single-file case (consistently with sys_fs_open)","sha":"9fc0aec0663882dc957b27c67583d6d11818625b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-05T15:14:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-05T15:15:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: fix CELL_FS_O_APPEND emulation\n\nDon't use fs::append (not capable of).\nFix sys_fs_ftruncate (remove wrong workaround).","sha":"4450ae0c7a6e41fd726f0029585eb45a48b99877"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-21T10:46:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-05T18:47:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNpTrophy: unlock platinum trophies","sha":"e7845357e21bb79c799f2f0b9b99b80a713a000c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-24T14:32:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-06T09:47:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGame: add more checks","sha":"632cc79c5454597584ad45892e89e5564da33936"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1094884?v=4","date":"2020-01-06T18:59:59Z","email":"dcabecao@gmail.com","login":"Dravonic","name":"Dravonic"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-06T18:59:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Multithreaded shader compliation follow-up (#7190)\n\n* Multithreaded load pipeline entries shader compliation stage\r\n\r\nCo-authored-by: kd-11 <15904127+kd-11@users.noreply.github.com>","sha":"94d2f97f27dc5888690d85f0eddf0a9f45bfc168"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2020-01-04T06:13:05Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-06T19:42:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Update vblank count in LLE mode","sha":"192912131e3a316fb3454a086e59084d9fd010f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2020-01-06T17:56:17Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-06T19:42:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Move vertex & vector utility classes to new file","sha":"28770c1580fafdb4d54fa3bc46354a6061cfa221"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2020-01-06T17:56:46Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-06T19:42:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Redesign animation system (add easing functions, fix bugs)\n\nInstead of speed, direction and distance, the user now specifies\nstart/end offsets and how much time the transition should take.\n\nFixes:\n- Stuttering caused from framerate estimation.\n- An edge case where animations would go over their supposed limit.\n\nAdds:\n- The ability to specify arbitrary easing functions for the animations\n  - Implemented quadratic ease in and ease out and cubic ease in/out.\n- Usage of cubic ease in/out in the trophy notification","sha":"5bace118a74e74dbb2b5d1ed9a7e73d5ed6a5b34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-06T20:14:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-06T20:23:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix sys_tty_write (UTF-8 encoding of literals)","sha":"55f9a56e4512866fa01de2dbc7ca79880d41e2e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-06T20:44:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-06T20:44:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix format string in log_frame.cpp","sha":"c51779d4d3c83e88d81c1debe364db8d83424494"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-06T21:48:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-07T12:56:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"video: Remove pointless aspect ratio option\n\n- The auto option is used when requesting the system is works like a\n\"dont care\" specifier to tell the system to use what settings have been\npassed in by HDMI EDID or the user TV type setting. Since this option\nsimulates the \"TV type setting\", auto makes no sense and is also not\nsomething you can select on a PS3.\n- Also adds a few missing checks.","sha":"ad845861be8190f3d6d08fb0df9e8a0bf84372db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-07T14:10:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-07T18:31:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"geometry: Allow basic color arithmetic","sha":"071e73a68ef4a244c93a8e3185efbaca6aab0343"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-07T14:10:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-07T18:31:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add color interpolation animation\n\n- Adds color interpolation and modulation pass and refactors the code a\nbit. Elements with this pass applied have their color modulated by the\nanimated color from the pass. Modulation transform is multiplicative.","sha":"ecf00be155ffeb0c196187bb4678dc00518bda16"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-07T14:12:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-07T18:31:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays/osk: Add linear fade-in/out effect to OSK","sha":"3f34a0196cc56e19f4b248d6833fb56f153ab432"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-07T00:05:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-07T18:55:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: Adjust flags of /app_home mountpoint","sha":"f3d52de429738331f3a4a9331c8249387502267b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-07T00:13:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-07T18:55:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: disable sys_fs_lsn_lock/unlock\n\nAccording to test, nothing seems to happen.\nDisable CELL_EBUSY errors associated with Stream Support API.","sha":"9c54305e105d9595777f60359487c54a0d2d54b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-07T18:54:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-07T18:55:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: fix sys_fs_fget_block_size\n\nReturn flags via last argument.","sha":"63e669c0cfa79246c0201eac0d546c2324e19d68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-07T19:14:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-07T20:16:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: improve sys_fs_get_block_size values\n\nAffected other syscalls:\nsys_fs_fget_block_size\nsys_fs_stat\nsys_fs_fstat\nsys_fs_fcntl (cellFsGetDirectoryEntries, cellFsGetFreeSize)\n\nFor default values:\nReturn sector_size = 512.\nReturn 4th arg = 512.\nFod /dev_bdvd:\nSector size = 2048.\nBlock size = 2048.","sha":"f5cb147f8d403891c3a6c675be5f24430b0baa56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-08T14:43:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-08T16:02:45Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Workaround for NVIDIA occlusion query failure\n\n- When using partial results on NVIDIA, a non-zero result is returned even when the draw is fully occluded.\n  This, I believe, violates spec which says the partial result shall be between 0 and the final result.","sha":"ef3b0db7d85ca4e4d21bc7fcd6fb185ab94b510e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-09T00:25:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-09T01:15:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: fix mountpoint detection","sha":"d477889763611a7ae9720526a736ef1e47d7164c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-09T00:26:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-09T01:15:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: fix logging in sys_fs_get_block_size","sha":"9075208c805e10014df3aaf845f41411ad2b2d8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-09T00:57:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-09T01:15:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: return CELL_ENOTSUP in sys_fs_fcntl(0xc0000006)","sha":"7523416a12a93d1f0dc8296c06ea4654b51f2a9b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-01-08T13:17:58Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-01-09T07:51:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Add buzz controllers to usb whitelist","sha":"4a5559ee65f8e9537da17544dd31cc1196dc244a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-08T16:30:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-09T12:38:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Generate dynamic binding table based on the capability of the drivers\n\n- This alleviates constraints imposed on shaders to allow running on some not-so-great platforms.","sha":"db5d03c3407f272966411ae97342f26ed60a648f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-09T19:23:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-01-09T20:43:03Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_vm_get_statistics: Write timestamp","sha":"71df5044fc9cc6849683f2101906f92892270efd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-10T00:03:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-10T00:21:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_net: fix sys_net_bnet_select arg check (nfds)","sha":"a8e1afa0afbf9f9a8122546fd5a369cea8b3dcb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-10T00:17:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-10T02:19:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: fix sys_fs_get_block_size\n\nDon't check file existence on /dev_hdd0.\nRelax check on some mountpoints.\nFix CELL_EISDIR error condition.","sha":"0b4b87f069f167fede4554269688290cf597c9ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-10T02:24:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-10T02:24:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: correct block size for /dev_hdd1","sha":"582ee80552f5b93b93b11f6d2e79056a917f78fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-10T22:09:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-10T22:09:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: improve sys_fs_fcntl(0xc0000002)\n\nAlways obtain free space on /dev_hdd0.","sha":"7e35fd54a831576b0a7d775c7ff29a80a09c6321"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-10T22:10:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-10T22:10:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: improve sys_fs_disk_free\n\nFix error codes and arg checks.","sha":"87cd653c6e96823e0f4cdeacb99dea5490d2d959"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-10T22:55:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-10T22:55:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS: minor change in handling /host_root path","sha":"41f2ee7b6c9724922044b692b92e15f016a308e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-11T00:05:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-11T00:05:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: adjust /dev_bdvd block size\n\nFrom test.","sha":"fc6356a74c703fb899e4d8960dee067571501862"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-11T00:44:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-11T00:44:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: improve sys_fs_lsn_lock\n\nIt appears it does nothing only on /dev_hdd0 or /host_root (HOSTFS).","sha":"8447d75dda3d3fc4805792e5215ff4836409c867"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-11T01:48:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-11T01:48:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: adjust permissions for /dev_bdvd\n\nRemove write permissions returned by stat, fstat, etc.\nAlso make sys_fs_open return CELL_EPERM on write attempt.","sha":"aeed349a99e6d11ff1d9b4c8aaab20238a62a45e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-11T19:36:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-11T19:56:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Optimize gpr reset for MSVC","sha":"765bd6b6c6a2148a0c7c9610751d993c5333d857"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-06T08:47:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-13T21:50:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNpTrophy: deny unlocking of platinum trophies","sha":"be2d225d96e6ea2d14c9a14c27092073dc16412c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-07T21:44:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-14T08:27:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: smoother batch package installation","sha":"542d2ef8da50f141f86d27921579a1f998b81093"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-11T08:08:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-14T09:15:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Update Appveyor to Qt 5.14","sha":"a24514651c1b03843162c93765dcbe1bb932dbe9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-13T17:46:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-14T11:32:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Restructure command queue flushing behavior to avoid deadlock\n\n- Queueing commands on the offloader is a good idea but unfortunately\npage faults can still happen causing a cyclic dependency and eventual\ndeadlock. Characterized by a vk::wait_for_event timed out error\naccompanied by severe hitching.\n\n- Drain the fault-able commands before pushing a submit operation to the\nqueue. If a fault is in progress, bypass the queue system and submit\nraw. Technically this is incorrect but there isn't much that can be\ndone about it right now.","sha":"8bbda3dedb87b26f9047362a56cb9f5a3ed9a032"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-14T18:32:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-14T18:32:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_process: Fix sys_process_get_id, add error_code (#7246)","sha":"01035d35bd3e7b7da95e856ec44a36a30dbd844d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-14T13:50:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-15T10:23:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Verify local memory offset","sha":"1ccb3c449282b52ed12ddb8fd2828f9a8ad66d67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-14T13:21:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-15T12:42:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement dynamic sized compute heap\n\n- Implements a dynamically sized compute heap to allow growing up the\nsize if it is too small.","sha":"3d96fe79cc1d51830b4d26a2ca5134f3b00ae77e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-14T13:22:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-15T12:42:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Lower default compute heap size to 64M\n\n- There is no need to guess and use a large memory footprint as the heap is\nnow dynamic.","sha":"175f78f5b3eef52830b3ecb7114d15cc8997c58a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-14T13:32:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-15T12:42:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix word index counting for shuffle tasks","sha":"ac4cadf538fde4919d65b92d8016c72df3d0fcf9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-14T13:40:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-15T12:42:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix invocation alignment to support non-power-of-2 alignment","sha":"29843003851306a1d4fe4f72bbbb857ade25d402"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-07T20:22:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-15T16:54:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: FIFO wake-up pause control","sha":"85695c8bac7a342e4df816f97514eb002e9f8e17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-01-08T14:36:15Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-15T16:54:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Add wake-up delay to settings","sha":"556ac1cf2200aa6f16cd9af72a4514bba88f6015"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-14T13:42:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-15T16:54:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Add description for rsx wake-up delay","sha":"05e5e6058f650ec47a366453a585caf38a2f77d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-15T13:06:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-15T18:12:51Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fixup for cs_scatter job\n\n- Access to the stencil output has to be atomic as each 'word' is shared among 4 adjacent texels\n- TODO: Can be optimized using mirrored buffer views","sha":"74ad525566f4e7e5384b8d562d6e0b270fb93136"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-15T21:42:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-15T22:29:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Update cellVdecSetFrameRate error checking","sha":"9084209cfcc42e115fedb27b5f5da0089bfc8c94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-15T13:12:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-16T08:12:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Touch locked dst memory after blit transfer operations in case it is locked by WCB/WDB","sha":"309251ce7a564ef73315971d52ba510a8c7069c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-15T16:16:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-16T08:12:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add some missing image memory barriers causing artifacting on AMD cards\n\n- There needs to be a memory barrier after each step.\n- TODO: Optimize scale_typeless_safe function","sha":"086ecf4ba6e55ad91bd399acb78b19053263e77e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-15T16:49:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-16T08:12:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix D32S8 interpolation by using integer interpolation instead of floating point\n\n- Interpolating floats is not the same as interpolating their bits!\n  Use integer format to interpolate linearly for D32F formats instead of using R32F as intermediary","sha":"621fab2ad9b7d35f6f4863a94a97572af375b6e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-16T11:35:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-16T14:57:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix section length calculations when generating new blit targets.","sha":"db014d8a582c21992c8a12667bae46888c18b2a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-16T12:09:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-16T14:57:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix uninitialized variable","sha":"47b196e9d00e696b2b43280c17b0bacf218c36b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-16T14:24:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-16T19:29:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Optimize image operations\n\n- Avoid double transfers where a transfer to a temp image is done\nwithout scaling and then a secondary transfer follows. Combines the two\nsteps into one whenever possible which can significantly alleviate\nbandwidth problems at higher resolutions. Significant speedup, upto 90%\nin some cases (PDF, PDF2)","sha":"82af17beb16c10152e4ac96a4c33bd2408ef4dca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-16T14:48:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-16T19:29:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Optimize image transfers\n\n- Adds the same optimization/simplification steps to complex image\ntransfer routines. Whenever possible, multi-step transfers are collapsed\ninto a single operation.","sha":"9b34f00241eceabfba5494ddb99ef7c275ffff63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-15T15:58:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-16T20:42:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Fix FREST","sha":"c9b0f0e7343cb82c18cb9189917d7be258c104a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-01-16T17:29:37Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-16T20:54:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use floating point pixel ratio","sha":"833fbe015edbe267124892603a9646e4289bf33c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-15T22:09:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-16T21:24:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"lf_fifo: fix UB and fix size()\n\nSimplify internal counter to atomic<u64>.\nMake size() return correct difference between push and pop pointers.","sha":"7fcc49004d18e4091ba31c071acd7b824876966a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-15T22:10:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-16T21:24:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: use constant in sys_fs_disk_free","sha":"a005090d3d4041311c9fde365305604a96b68ee9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-16T19:10:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-16T21:24:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: always close locked file in sys_fs_close\n\nSyscall returns EBUSY but succeeds nevertheless.","sha":"e2512e78b6711abd1cd2bd9d00882f264e76b765"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-12T21:17:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-17T06:43:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: use persistent_settings for playtimes","sha":"449cbb7281b878294ee28918ef23f4c619a6214f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2020-01-01T16:50:14Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-17T07:31:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Optimise the SVG logo with svgcleaner\n\nIt still contained Inkscape leftovers, which are of no use for anything.\nThere are no functional changes.\n\nSee https://github.com/razrfalcon/svgcleaner","sha":"ca5bc512aee1c3d18b88897af24bce51e2755243"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-17T10:58:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-17T11:31:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fixup\n\n- Scaling is not needed for a direct typeless transfer!","sha":"0a2b6a290d23e629e5a4edd788b206186ae455c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-17T22:14:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-18T08:17:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fixup for total number of combined samplers using the dynamic binding structure","sha":"b36b9e482262feb90622c8727e5b5bad50be535a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-18T12:01:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-18T12:56:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Write nread/nwrite in cellFsWrite/Read regardless of error checks","sha":"14b99d9e8be192e6e346de93362e1b317962022f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-17T14:01:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-18T15:46:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_ppu_thread_create/rename thread name range","sha":"9d15083c61f43dd78222329a936b188a9c07f7ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-18T14:01:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-18T15:46:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_spu_thread_initialize for attr->name_len is 0 and attr->name is not null\n\nIf name_len is 0 name is empty, in any other case name is not empty (attr->name == nullptr isn't allowed in this case).\nCheck name_len and option for invalid values as fw.","sha":"b07b5c9005fd60686a80f042645e1652bf68af6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-17T16:24:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-18T16:52:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactor out complex present code into separate files\n\n- Also restructures present code to have image lookup in a separate\nre-usable function.","sha":"7453e46a7c9cc6d522e05f9d267b4e57d26362d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-17T19:44:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-18T16:52:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve present image scanning\n\n- Adds support for partial (letterboxed) source images by taking insets\ninto account.\n- Bugfix for potential access violation when capturing screenshot on\nvulkan","sha":"bad4d1ff05de288e27cffbd566d6b292973fa613"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-17T20:17:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-18T16:52:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"formatting: Unify indentation type in the newly added files to tabs","sha":"48407752a674c01cf1e06c3fbf06afc578a80765"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-18T09:21:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-18T16:52:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for missing visuals when framebuffer is larger than requested\ndisplay dimensions.","sha":"5e0ca4c0c42ffbe713a74ad7dd9cc4599ada455c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-18T14:30:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-18T16:52:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve window border detection and clearing\n\n- Improves logic to detect if the frame requires letterboxing and\nproperly clears the background appropriately.","sha":"22ca2827de654054171a24c1f7fd1ec07cd9eb27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-01-15T16:55:13Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T08:09:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add slider snapping","sha":"807d6cfea44bd63e959eca84c8a0f5f1b2cd0906"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-01-16T05:26:03Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T08:09:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add snapping and limit range for wakeup delay","sha":"cbaa8f33291d7cbe2500b69e88d16e997a9a9607"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-01-16T16:26:20Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T08:09:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add pagesteps for some controls\n\nWith the snap changes the default pagestep of 1 is ignored because of rounding.","sha":"9ef96e827429fc624d0a74f288a9ef8acf8c4177"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T08:16:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T11:40:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: enlarge some tooltip hover areas in settings","sha":"30d5a849e3fc5f80bc24e2c62ab0434247cb27c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T13:00:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T15:38:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix deprecation warnings","sha":"485b22d664712b5943fe1ac31e60ededf47464d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T13:46:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T15:38:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix some random warnings","sha":"4dbad6cce6dfb63c3dd0dbbfd6f22f8888da6a0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T13:47:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T15:38:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VS: fix filter facepalm","sha":"858ce014fd22b2ea6942e245863d5c37baf11d68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-02T15:46:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T23:33:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellVdec: improve error checks","sha":"9a27cc94422dcc4a97ef7d6dfa439e2207991bbb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T22:41:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-19T23:33:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellVdec: (experimental) allow AV_PIX_FMT_YUVJ420P","sha":"5ef3465f652d5fcc31a07682a49483ee442aeada"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-18T20:23:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-20T13:00:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: fix CELL_EIO condition in cellFsReadWithOffset","sha":"55cb96ab3be45ab96bcf6ba01c6e12d064dc8ccf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-18T20:41:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-20T13:00:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: add /dev_flash mountpoint","sha":"1b1b804d7e031b4583706a79ba996e77fd9c218d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-18T22:20:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-20T13:00:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: better stub sys_fs_fcntl(0xc0000006)\n\nThis syscall does something to classify filesystems by mountpoint.","sha":"63f67c88ccaee22103e67924f4c1ff5a61e07523"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-19T01:25:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-20T13:00:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: avoid possible out of memory on file reads/writes\n\nUse fixed-sized intermediate buffer.","sha":"3617f12a1e8fcf9b95f935640ca6939ba5a1eaf8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-20T13:00:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-20T13:53:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement shared_cptr and atomic_cptr\n\nLimited shared_ptr with atomic support.\nAtomic version is only partially implemented.","sha":"1e7a02badb39b0b83befaaf967f2eee3f880678c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-20T16:08:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-20T18:51:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup shared_cptr, atomic_cptr","sha":"0147bc2c72e64b4673f37e163ecf6a45a6f9323a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-20T16:08:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-20T18:51:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make system config thread-safe (almost)","sha":"0f87c6c7c31f3cc09c8c3aee69d6e0024d78c2ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-20T20:40:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-20T20:40:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: properly support STOP 0x0 instruction","sha":"98a8eeaac25a12722fc7f236c59dc6dd372d620c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-09T06:52:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-21T11:08:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"RawSPU: fix race between spu start and stop\n\nThis race could lead to spu status bits indicate RUNNING status, but cpu state being stopped.\r\nFix it by making sure cpu state is set before spu status.","sha":"9993df9b8ba540b934a728cbc12c1aa03592098c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-21T12:51:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-21T13:32:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fixup for STOP 0w0","sha":"ddda09607d70a5644918f1a3189dda521e41b755"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-21T12:52:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-21T13:45:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix lv2_file::op_write regression","sha":"f05a3da96457802ac52d854f23d79c51e4d4ea26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-21T12:55:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-21T13:45:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Minor FREST bugfix","sha":"160ddcf86b8252821a402c9961f60b25e56bd3b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-21T13:08:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-21T13:45:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Add SPU LS to debugger","sha":"fe381b85817ebc599635431d9331b44bc3dc15f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-21T13:24:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-21T13:45:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellVdecSetFrameRate error check","sha":"949cfa7fdbb32c7c33535cd04fa304006672f503"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-19T15:48:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-21T19:21:51Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Optionally sync on texture read semaphore\n\n- Some games use texture semaphore for zcull sync which is rather bizzare.\n  However, it works on realhw as the depth test happens before fragment shader completion\n- Due to the high performance penalty incurred by this act, this\nbehavior is only enabled by the \"strict rendering mode\" option.","sha":"adcc3e9c4bcd5f56fbf47f2163e445ad1adf0ea0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4844306?v=4","date":"2020-01-22T12:28:48Z","email":"ntfs.hard@gmail.com","login":"ntfshard","name":"Maksim Derbasov"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-01-22T12:28:48Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"small improvement (#7288)\n\n* small improvement\r\n\r\n* comments addressed\r\n\r\nCo-authored-by: kd-11 <15904127+kd-11@users.noreply.github.com>","sha":"1abdee242abf39bc216d10169147c567c3a5066e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-22T18:25:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-23T09:50:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"HLE: Fix error checks in cellAudioInRegisterDevice","sha":"18f167ddd088e5d15523a7b34cd4fcb0b4e6d7e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-22T21:36:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-23T09:50:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"HLE: add some more constants","sha":"3e8a5c639526d5567cfe54bc239ee7bb86f78347"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-22T21:45:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-23T09:50:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"HLE: add error checks to cellAudioInGetDeviceInfo","sha":"3f076d63e331c527f8477399ceca6ffe9b38d09c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-16T21:31:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-01-24T19:25:52Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellGcm HLE: Add error_code","sha":"95ed2ef62ec2486f22ba63dbe99ceffe929b4b79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-17T07:49:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-01-24T19:25:52Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_usbd: Add error_code","sha":"46df58b662bb59e722baf89192eec92c09f9b0a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-02T16:07:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-01-24T20:08:30Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"VSH: sys_mmapper\n\n* Implement syscalls sys_mmapper_allocate_shared_memory_ext, sys_mmapper_allocate_shared_memory_from_container_ext.\n* Implement multi-process shared memory allocations.","sha":"e4ba09619064c2a239c37551c95e8cdf5fb622c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-01-25T15:19:25Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-25T18:28:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Present game removal failure to the user\n\nAll the required information was already there,\nbut UI always reported success","sha":"331c1a394a82e16a3fe3a0205f202ad4463b7a91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-23T19:35:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-26T10:58:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix incomplete blit operations getting used as texture inputs\n\n- Raise passing 'score' from 50% to 90% to filter out very incomplete\nmerge operations.\n- Catch unfit sections passing the match test; possible for blit_dst\ndata but will likely be always harmless. Disabled in release builds by default.","sha":"7a275eaa3a8f76087fa9c95dd5926d3f67ab274f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-23T20:20:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-26T10:58:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Blit engine tuning\n\n- Attempt to identify blit operations that will be flushed immediately\nafter and just do them on CPU instead if the transformation is trivial.\n- If only a single blit section is contributing to an atlas merge op, the\nthreshold should be 100%. The only acceptable result here is a\ntruncation.","sha":"44f2cacf7ba06a07405ce29a2ae84ae8369bb065"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-24T16:53:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-26T10:58:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Use appropriate layouts depending on use case when creating new textures to avoid needless barriers","sha":"1166ae19bb7b7e5ac49df7634dc5216989ed0418"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-24T17:01:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-26T10:58:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix DMA data leak\n\n- There still does not exist a ranged flush implementation which is required.\n- TODO: Implement this properly","sha":"698702cd4a6a3c13d9e6d1ee5ce2a908ef83f611"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-25T11:39:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-26T10:58:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Workaround for broken rtt resampling\n\n- Avoids WCB requirement for now to keep res scaling working correctly.\n- TODO: Fix this properly","sha":"79216917b375b5e43db92b12009ce4ad4e616e73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2020-01-24T12:55:03Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-26T16:55:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays/perf: Graph label tune-up\n\nPlace graph text on top, split in 2 lines, center it horizontally.\nAlso if it's wider than the graph, match up graph's width to it.","sha":"1e69de12055834294fc0628d225c996842467080"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-26T15:34:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-26T17:46:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Change some labels","sha":"b341113ad87273361d18854a4aa4ac552e6f7944"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-02T04:45:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-01-26T18:37:07Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU LLVM: Improve approximate FCMGT","sha":"a9162a3f57cc4e8f280432360fb1eeb1a459e116"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-23T17:09:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-01-26T20:32:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellGameGet/SetParamString: Implement CELL_GAME_ERROR_NOTSUPPORTED","sha":"d481c3c7fd473004f56e5c1ae03b9477b63b4dbc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-23T19:32:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-01-26T20:32:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix logging of ppu name in sys_ppu_thread_create/rename","sha":"7ae679adbecfcaf0baf59504975b6eaeddf96d47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-23T20:24:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-01-26T20:32:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Log sys_spu thread group and thread names\n\nAlso safely read thread name after relevant error checks passed.","sha":"4e0070f16d999d12752ef88be097322227062609"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-03T05:38:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-01-27T01:21:40Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"ppu: Log SELF header information and CIA of caller HLE functions","sha":"a7aef227545825b40a7f0646cf0a3b7099fd8e8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-01-18T03:35:00Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-01-27T02:13:30Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Increases number of buffers when buffering","sha":"610a6a14047ed734a0b42f1c50301bdd1dafa315"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-27T04:04:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-27T04:05:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Partial revert of #7180\n\nPC is PS","sha":"7f07b79c046c97d9c533577e88cb1fea2ef9082a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-01-07T09:10:23Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-27T23:13:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Embedded SPU elf patching\n- PS3 games include both PPU and SPU code in their PPU executables, so to make patching games that make use of the same SPU libraries easier, we add a system to find and patch them.\n- Patches for this system still use SPU LS (Local Storage) addresses despite the fact that we aren't loading anything into SPU LS at this time. The patches are checked against each segment and patched in place.","sha":"ad8988afd3612eaf43b4e9c77c4860be65bd3c1c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-01-28T09:47:46Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-28T16:16:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add mutex guard for s_unfire","sha":"795bc5d52ba22470b97d70a26531a74636c87075"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/14265316?v=4","date":"2020-01-28T23:39:05Z","email":"14265316+TotalCaesar659@users.noreply.github.com","login":"TotalCaesar659","name":"TotalCaesar659"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-01-28T23:39:05Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Qt: change labels in package installer (#7325)","sha":"c1d7b4623559728b02a2f99d8592878f9689141c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-27T15:11:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-29T09:54:06Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Tweak blit engine heurestics a bit\n\n- Reject writes to RTT if the source data is of unknown origin.\n  non-RTT data and only 1 line in length is suspicious and often GPU data like programs or other rendering inputs.","sha":"1206a5d4b793fdc2104ab0ac861f6782dd8aa23b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-29T20:42:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-01-29T20:42:41Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Increase Maximum Vblank Rate and Clocks Scale\n\nAllow x30 times the speed of vblank rate + clocks scale of original PS3.\r\nIn theory a 60 fps limit game which scales frame limit perfectly with vblank rate can be played at up to 1800 fps with this change.\r\n\r\nAnd:\r\n* Fixed lv2 sleep with Clocks Scaling\r\n* Make these settings dynamicaly adjustable.\r\n* Avoid code duplication","sha":"92466165f60ea894253d9d6b7be834d84f496c78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-01-30T10:53:59Z","email":"CookiePLMonster@users.noreply.github.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-30T13:06:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix ellipsis\n\n… is an UTF-8 character and those don't really belong in messages like this anyway","sha":"360e484b083596cc37936e1bba6ab790e264d05c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-28T21:04:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-30T17:21:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Prevent Qt from blocking the explorer during installations","sha":"336cd6e33a2479893c9700cd6273fd87da3d18ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-29T06:44:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-30T17:21:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add early out to pkg_install","sha":"8ef69429d84053c547cb8b26511d3e78fe230d53"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-29T13:29:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-30T18:07:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Preserve pixel data when splitting sections\n\n- Ironically rhis data leak is caused by trying to fix another type of data leak","sha":"c9e35926f5a3fa79191a50fd35314ff18e72dc08"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-30T16:49:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-30T20:49:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Display \"Reboot With Custom/Global config\" on running game","sha":"232c6c3aaf3e8b574695d856cc25e34af45ea886"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-30T19:05:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-01-30T20:49:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Bugfixes regarding usage of ShowConfirmationBox","sha":"48a847d1b6114e8bd03595bea16fa88e02a2cc8c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-01-30T21:02:08Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T08:23:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Debug - LLVM in VS project files","sha":"aeebcfe141be0045245eccd889c1e52826c31f1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-01-30T21:03:36Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T08:23:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix code relying on initialization order\n\nAllows Debug - LLVM to boot","sha":"9f678cc47abfc9bbc18a9a9cefc47502e1974c59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-30T00:04:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T09:09:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement fat atomics\n\nAtomics with embedded mutex bit.","sha":"59a0f810b92f578ea209007f262271a06247365a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T09:01:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T09:09:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup for LOG system.\n\nRegister all channels at program initialization and allow duplicates.","sha":"007a7a5859189ab7ff4d4d6b1ad127960d76eedc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T09:09:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T09:09:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement logs::get_level","sha":"e7b24461ec650320e2358799764aaba3e1b2e50f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-31T09:54:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-31T11:56:53Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Plug texture data leak in the 'exact match' path.\n\n- Followup to previous texture data leak fix for the replaced section path.","sha":"36d5db7f3085d6ed862702e224494afe98598085"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15137035?v=4","date":"2020-01-31T13:13:55Z","email":"15137035+Asinin3@users.noreply.github.com","login":"Asinin3","name":"Asinine"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-01-31T13:13:55Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Update missing rap file error","sha":"e6f7467f67336a1aa6a811f9051dab0fff983b0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T11:20:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T13:44:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"logs: remove legacy MEMORY channel\n\nAdd channels vm_log, sig_log.","sha":"26cccead6e31afa4331c4f55426ecf9d1d3c43e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T12:04:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T13:44:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"logs: implement logs::get_channels()","sha":"a867522b16bfde5ae869e3d2442dc3209601e333"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T12:05:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T13:44:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"logs: cleanup for audio backends\n\nIn process of removing GENERAL log channel.","sha":"67075dfc6c304703d407b893446da6aa3770f755"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T12:18:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T13:44:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement logs::silence\n\nDisables all log channels.\nAlso disables unsupported \"default\" log level for log channels.","sha":"d5f019c3d3f8e483988f1de4c040a905e706fa7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T13:43:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-01-31T13:44:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"logs: add more log channels instead of GENERAL","sha":"1d0f359406a3220baa8f5b32a1691b44ee5d5afc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-31T20:15:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T02:50:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Hotfix after #7351","sha":"943368912b08de50ae9cf322f35ba24321d7d940"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T04:14:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T04:49:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add config to silence all logs","sha":"efafda2650c6840b60e45497f3021cbfbca2d1d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T04:15:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T04:49:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove legacy GENERAL log channel\n\nAdd some more log channels instead.","sha":"d9a0619dddba1c29ef6dc9d526cfbeeb5bfef8d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T04:36:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T04:49:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove legacy LOADER log channel","sha":"3eca2d5d6ceeba157563b3464d124c2be0874177"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T07:30:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T07:30:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"logs: use relaxed atomics\n\nMay help with optimizations.","sha":"ec80932c2170337fc8eebba30ed890d1ce6ac2a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T07:43:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T07:43:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Give log channels fancier names\n\nImprove LOG_CHANNEL macro to accept custom name.","sha":"3c0bd821c8609f17ce87709ce004167cbf241133"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T08:07:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T08:52:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Modernize RSX logging (rsx_log variable)","sha":"15391f45d05122c76e1fad396376f0883c6af12b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T08:23:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T08:52:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove HLE log channel","sha":"21f7b0ff0faffbf4911183aad0416ad21d531f69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T08:31:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T08:52:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Modernize PPU logging (ppu_log variable)","sha":"327bb2d8f046b0e1d6a9473b07458889a0ee1804"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T08:36:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T08:52:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Modernize SPU logging (spu_log variable) and remove log legacy\n\nRemove legacy macro (LOG_ERROR, etc)","sha":"6dfd97f0b6b3463b025ff7344ecb48c5f1782e48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/22731889?v=4","date":"2020-01-31T20:01:44Z","email":"webmaster@invoxiplaygames.uk","login":"InvoxiPlayGames","name":"InvoxiPlayGames"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T09:34:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_usbd: Fix bug preventing multiple USB devices","sha":"c1180d76dd31510bb7f5d269b652de10d2261fda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T10:33:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T10:34:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix FAudio logging","sha":"f6e90b4c720ae6eb25b495fb7dd7b62310dcc523"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-31T19:40:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-01T12:14:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove sections that are wholly inherited by new blocks\n\n- Allows sections reclaimed by the surface store due to overlap/inheritance to be identified and removed.\n- Additionally, potentially lowers the number of flushes required per block with multiple overlaps improving efficiency and theoretically performance.","sha":"7d2ed9200d041ebfa424c033c121e3d2c5cde69f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T16:05:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-01T16:05:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update llvm (fixup)","sha":"32df80962632c9158eac3acba2fe63b54de9f296"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-01T12:14:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-02T06:01:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellVdec: Improve cellVdecQuery and cellVdecOpen","sha":"e57c01907e4b823399a894bdf4337dd1abb7da2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-02T11:09:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-02T11:12:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move logs::channel registration out of the constructor\n\nAllow constinit initialization of logs::channel.","sha":"87a5dd66ab35a98599ffecb37e8988967121736e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-02T11:32:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-02T11:32:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"logs: allow disabling RPCS3.log.gz\n\nDisabled by creating a directory with the same name.","sha":"0a2874405ded726403f5a0021f8aa1f5a429ae35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-02-02T15:50:58Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-02T19:28:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Protect m_storage.find(key) to fix a race","sha":"7f4e546f1910756ca6e30bd23521ce3083541696"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-03T08:15:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-03T08:16:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: gisable NewGVN pass\n\nIt goes into an endless loop with memory leak for some reason.","sha":"f9a8efe406b8192e7928f7a3c43347588f6c137e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-03T08:16:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-03T08:16:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Space fix commit","sha":"c4a01875d091560c0bc5e6caa3f51a13069dd7c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-03T10:24:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-03T20:22:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix gamelist sorting for playtimes","sha":"1759d6d90a0dc8e4e15c2926eb39ec01ed6fe264"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-03T22:43:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-04T08:18:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: use current locale for last played in gamelist\n\nThis also sets the basic groundwork for Qt translations","sha":"d47a8b49a4fc27a3cc3bc2a51d7ed58d197285e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-03T16:06:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-04T13:20:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Allow for proper data checks when WCB/WDB is enabled","sha":"b9ec01292276db884dc4c3b391461a4893e81ba4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-03T17:31:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-04T13:20:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Rewrite coverage test to take sum of areas into account.\n\n- TODO: A proper sweep algorithm to calculate sum of overlapping rectangles","sha":"9d9b5c4d665ac05b8152d6bb4ae514187cea475d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-02T22:03:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-04T15:29:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Avoid out of memory with cellGameGetParamString","sha":"4488312e811b1e8d88514552bd9c67ddc913f9bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-03T07:31:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-04T15:29:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGame: report fs::remove_all failure","sha":"cb52ee0a4d96fcc786d2d0d972794cf55b432db3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-03T10:31:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-04T15:29:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGame: report not found sfo params","sha":"e9e8f0c5b7b337dec52abdcd7828e51a70c4d784"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-04T18:37:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-04T20:43:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make RPCS3 compile in C++2a mode","sha":"1a78e0e80cc95d38e837273a49c333935cc6da7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-03T15:31:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-05T05:01:07Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix cellVdecGetPicItem\n\nFix potential overflow, race condition and correctness fixes for picInfo_addr","sha":"acc7320caec1af614ab9bedc95591c759d5ba990"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-04T13:15:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-05T05:01:07Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellVdecQueryAttrEx: Add workaround for codec specific info","sha":"6a32ceaab536480de07a56cc462f5ec2aef8914e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-04T20:00:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-05T05:01:07Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellVdecQueryAttrEx: Add some error checks for MPEG2","sha":"49e11b7cfd3c207d267c2cd267f6667fd9e441f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-05T07:00:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-05T07:42:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use attributes for LIKELY/UNLIKELY\n\nRemove LIKELY/UNLIKELY macro.","sha":"c0f80cfe7a2a05011bffc51b9bb85c18478af637"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-05T04:41:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-05T10:06:07Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Make sleep timers accuracy dynamically adjustable","sha":"9a64d08c9fdabad2329b170e049c54b1f5dc660b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-05T04:44:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-05T10:06:07Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Make preferred spu threads dynamically adjustable","sha":"049e392a9702543b485f51d4064b7739edd9d723"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-04T18:26:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-05T15:18:09Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup\n\n- Destination Y coordinate must be 'rebased' onto the current slice by subtracting its offset.\n  Only the local path was affected this time","sha":"b6422c9a338976ba5684dd39be547ff65016d694"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-05T13:23:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-05T15:18:09Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix broken image transfer operations","sha":"3cc42c1bf84cd92174d13c2e38d46e17cd1a65ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-05T20:46:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-02-05T20:46:05Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_spu: Implement proper SPU group flags (#7320)\n\n* sys_spu: Implement proper SPU group flags","sha":"f8b3c48af75da35719c474d60422b88b759b38c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-02-05T18:38:57Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-05T23:21:32Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Include trailing separators in section split\n\nThis fixes the case on Windows where one of the paths ends up consisting\nonly of a drive letter and no trailing slash - in which case Windows\ntreats it as \"current directory on drive X\" and not \"root of drive X\"\nand GetFileAttributes throws an invalid param error","sha":"fbbad7c85159e7d1ee8e844591c246f416cd9267"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-01T08:15:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-06T00:27:17Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU reservations: Do not access violate under vm::writer_lock\n\nTODO: Throw exception when encountering page faults notification enabled memory","sha":"37513b189877792924d567dad31a7cf022bc834c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-05T15:40:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-06T09:44:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix per-level sub-image sizes to comply with OpenGL guidelines for compressed textures","sha":"18e055943815d23258ae045e2a888734a76d572f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-05T19:54:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-06T09:44:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix a long-standing regression with typeless transfer caused by a typo.\n\n- The parameters for the final upload should be 'unpack_info' not 'pack_info'!","sha":"50b1e26b1755e69828542be3e0922164499331db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-26T10:28:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-06T14:54:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix memory barrier implementation and stub for RCB/RDB\n\n- It's a miracle it even compiled","sha":"2b5c24b304d37c3ebe129e17bbb19d4fe178c4ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-26T10:47:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-06T14:54:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Implement RCB/RDB","sha":"43dae6c14d82c4997b938ecf627502530d3ecc99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-26T10:54:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-06T14:54:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix a bug in RCB/RDB when MSAA is set to disabled.\n\n- Initially MSAA option was hardcoded to be always enabled, this bug is a remnant of that time.","sha":"0bba04ef8d41319ecfe81850ab7ffcde9c507c5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-04T12:40:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-06T16:41:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: use config to load translation file on startup","sha":"efe907ffae741973ffacfa0051c97ab5f867b0b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-05T10:07:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-06T16:41:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add language menu","sha":"c13d3456045697d4e6ba764f610c0841212cc81a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-06T09:37:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-06T16:41:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: do not use localized filenames for default current config and default stylesheet","sha":"1bbc60c3e7cf0cbb6ccb0174b4e931387fb8c3b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-06T13:21:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-06T16:41:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: set Tooltips.h to UTF-8 in order to fix translation with special characters","sha":"382bdcdcb7e1a25a6b9ca041f10045e930661111"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-06T18:32:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-06T18:58:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix game grid regression","sha":"edcd2fc14ab35fc1d749c0dcd7c3ecb645f73e33"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-07T21:00:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-06T20:43:38Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"RawSPU: execute MFC proxy cmd after reading CMDStatus\n\nImplement MFC proxy argument sequence checking.","sha":"f901846acb541aed8f6d29c57031217ae1901776"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-02-06T18:37:57Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-06T22:15:58Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Enable C++20 for MSVC in CMakeLists.txt","sha":"17df6c88786a246634194e909170e55e6f717f94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-06T20:20:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-07T13:15:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Remove an overzealous assert","sha":"d59c449ff66db0e305dacb64ab849a6a6cde67fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-07T09:57:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-07T13:15:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Fix use after free\n\n- Overlay can be closed when secondary thread is asleep!\n  Wait for it to wake before proceeding with deletion.","sha":"e45360de2ba1f24395579e9cb3836cdd7a82cff6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-07T16:02:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-07T16:28:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Fixup\n\n- Avoid calling join on self thread.\n- Avoid use-after-free.","sha":"54da9ac7e57df4cdd9aabcfc0026bb8d01d8ec40"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-07T20:55:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-08T06:13:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Only start the playtime clock if it makes sense","sha":"901fc87bca9f26f4bbc06806c06810220308ab21"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-08T08:42:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-08T10:04:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix Boot inconsistencies for Reloads","sha":"7abda27b46c3930405eea7f367e4f5b3d15f9fe0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-08T09:02:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-08T10:04:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Restart games with the same config instead of global","sha":"5dcb91b671cdebe742b1be83128edc6a8d81682b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-08T09:10:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-08T10:04:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix game category localization","sha":"0c8611bd497fd9333a78d5417b402b3059271c53"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-06T19:52:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-08T11:11:59Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sceNpTrophyGetGameProgress Fix","sha":"1f94c8f2727c380975e121a55447945195424585"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-06T20:14:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-08T11:11:59Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sceNpTrophy: Implement SCE_NP_TROPHY_ERROR_CONTEXT_NOT_REGISTERED","sha":"629eddfb9fd5fc5740b08deaf77965c1ec731044"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-08T14:26:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-08T15:13:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Clean up graphics state notifications and add notification for change in point size\n\n- Adds a backend notification when point size changes.\n- Refactors all those separate notifiers into one reusable template.","sha":"c64935f9dd38459d5e7a3a2f352d1c4545524c03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-30T15:44:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-08T19:18:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Make rsx::get_address report caller location","sha":"b7043ce0004b8b6af69099eea4e81006b1809314"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-31T13:59:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-08T19:18:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"cellGcm HLE: fix cellGcmMapMainMemory\n\nFix arguments order, softcode RsxReports::report offset.","sha":"9d1bb60ad798265f6ca2a52dca5d1a02b68ca2b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-07T09:31:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-08T20:07:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"VSH: Stubs","sha":"1915fe75a400e8184f3326473fc419129d150dc0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-08T20:41:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-09T06:48:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Compilation fix for VSH pr","sha":"11675d764506789fbd2c1208899b1b232cdc77ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36445?v=4","date":"2020-02-08T14:07:27Z","email":"ilya.veselov@gmail.com","login":"13xforever","name":"13xforever"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-09T08:29:33Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"update issue templates","sha":"7973b01b1c957faccc12ecd1a2d301f9f95b15ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-08T17:55:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-09T09:55:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/overlays: Fix clipped rendering of UI elements\n\n- Take viewport offset into account when applying window transforms.\n  This is necessary because gl_FragCoord is based on the framebuffer and not the viewport.","sha":"792c481f6d33ab6862102830f28eb19bebb26029"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-09T10:01:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-09T10:45:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fixup for VK_ERROR_SUBOPTIMAL_KHR\n\n- break from a switch does not break out of the external scope!","sha":"efc8c3f4a9d130a5589d244c9abb93156f94d569"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-08T19:42:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-09T11:09:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Atomic fix\n\nFix possible pointer arithmetic ops.\nFix fat atomics (currently unused).","sha":"7ea4eb00959eddde8d8b16bd26bd615589d9789e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-09T05:47:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-09T12:31:55Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellAudio: Implement cellAudioSet/RemoveNotifyEventQueueEx","sha":"80eff5895042e356c49ce6b37ebe654c9be1f2da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-02-07T12:25:05Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-09T14:32:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[props] Move stdcpplatest and FH4 to common_default.props\n\nThis way stdcpplatest  and FH4 disabling propagates to all projects except llvm and glslang.","sha":"16bbd93885646e91f85f3d4093497d87905e8543"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-02-10T04:41:18Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-10T08:45:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"make decrypt default to All Binaries","sha":"762718002ebc9b2d46bdf0925251779e978ed460"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-02-09T21:09:30Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T10:31:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Bump Docker version, update clang10+gcc9, CMake 3.16, adds SDL2, LLD\n\nThe vulkan library and SDL2 libraries are now self-built, due to distro packages being too low version","sha":"af9bc631cc84bca80b96508ca479cea38ed5977c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-02-09T22:22:18Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T10:31:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Bump glslang to fix issues with LLVM 10","sha":"77aa1fbeea3a1f8bbadad352cdb3428ee6d3f9d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-02-10T00:20:53Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T10:31:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Disable FAudio due to upstream packaging issues","sha":"d3abff548626ddd72ee0fd79a52873728835d247"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-10T09:57:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T11:05:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: set min version to 5.14","sha":"5d82b0f4c4442f7389f3914c3ae740d972cf642f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-09T11:17:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T11:08:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Set cmake min version and CXX_STANDARD to 20","sha":"1bc9fd2863d7fcd06e4bd2d9b1098f2da2c75da5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T08:55:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T11:47:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silence deprecation warning (implicit capture of this on [=])","sha":"4bc431ec3145497ab88a6d861513d4803116c8cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T09:06:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T11:47:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silence unused parameter warning","sha":"5a41d75eb85c0c3cfa4742b7f2b1a7c78f7f7119"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T11:06:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T11:47:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add option USE_COTIRE=ON (by default)\n\nPrecompiled headers cause rebuild problems with ninja, for example.","sha":"491526b42185c864883176f5000e144b9ac3c83e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T11:08:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T11:47:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Bump minimal compiler versions: gcc-9 and clang-10.","sha":"9569ae24e01f5021b72e6cf115f889d7021314ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T11:46:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T11:47:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM for C++2a workaround","sha":"6e47a6fb7684e1d88557173e670d22e6979c3b52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T13:57:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T13:57:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix","sha":"034267adb22cc50ec7a7fd34fc5d1020f1db7383"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-08T16:35:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T14:27:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make handle_access_violation noexcept","sha":"639245c07116d254c0e456fa6e390eb57285e598"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-09T21:41:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-10T16:38:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: icon overhaul","sha":"6862790cf7ed30a0f88cf0dedd9101a6e8c315c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-02-10T16:57:23Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T18:46:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Bump minimum Qt5 version to 5.14.0 in CMake","sha":"896d16ec7b86efef3b676c049668628d36c12711"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-10T18:24:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T18:47:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix visual studio filters after someone tinkered with the files","sha":"6847e52364df48188384bc04557397896a9486f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-02-10T07:46:23Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T18:47:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Small sys_usbd changes","sha":"98f91457bff8f8d3787fef302600c4e8ca97cde6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-10T10:06:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T18:48:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt/linux: set DISPLAY variable if undefined","sha":"30d176ac5e96fe27b87874c271f1172a39ef8211"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-09T13:04:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T18:48:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Typo fix in audit condition","sha":"3787108ee7ecbae3e750bb4b30eafbf4ed98bc2d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-09T13:21:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T18:48:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Validate memory blocks before checking for overlap","sha":"f47333997fc8deb556dee328826d33ae1df10a73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-16T20:40:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-10T21:39:39Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rsx: rewrite io mappings\n\nAlong with some with fixes to cellGcmSys HLE.","sha":"bdab26ec09b651c9c5865e8905dfdc8050f1c46e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-17T11:49:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-10T21:39:39Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rsx capture: Fix capture recovery after a crash","sha":"dcb30df7c863d1d0b691f8adf114bc555b33a5b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-10T14:27:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-11T10:21:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"geometry.h: make conversion operators explicit\n\nIt requires static_cast<> to call them.","sha":"bcbe324534067eff05a462115cfd5ae518133e4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-02-08T10:07:18Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-12T09:49:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSearch updates from Brolijah\n\nCo-authored-by: Brolijah <brolijahrh@gmail.com>","sha":"d2b83c69bb19122dbba5244c484b89ff03678c62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-02-08T20:40:21Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-12T09:49:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Move SearchState to a fxo object so it resets with emulation","sha":"e30637351e2b9e17d9f1056eb8fa4cc632bca1e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-02-08T17:07:18Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-12T09:49:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement links as a cellSearch specific concept\n\nLinking in VFS is done only from cellSearchPrepareFile and works\nby mounting virtual files to host FS files","sha":"3006b003c4749c7aa88bb85f4837d5efe6760196"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-02-12T09:30:16Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-12T09:49:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add a check for GLIBCXX_3.4.26 support in the AppImage checker binary","sha":"bacd2342588af7ad17d2a0d74bc39345d944deda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-12T09:44:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-12T09:50:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"geometry.h: more cleanup\n\nRemove wrong constructors.","sha":"7137142351dfc246dff08e3e95c18d9168520c2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-12T09:46:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-12T09:50:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"geometry.h: remove MSVC workaround","sha":"e8988faed53830d4769be935d4accec65cebc11c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-12T15:17:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-02-12T15:17:45Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"cellSearch: Fix id memory access (#7476)","sha":"9760053c8c88a2e8ea9cc68d429373a9cc206ed9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-12T16:33:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-12T17:02:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSearch: another memory access fix","sha":"78c49e7331cbd8300e6eb37210f533e0901a3d43"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-08T01:07:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-13T11:14:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Avoid closing the emulator after access violation","sha":"606693a9f7223c7843b785b34ef6bdd1aa5413f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-12T20:52:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-13T18:24:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"GUI: implement custom title format\n\nNew option \"Window Title Format\" in Misc.\nBackward compatible with FPS disabler.\nMake rpcs3:::get_branch() return string_view.","sha":"0d7aa5e3106a02d3b8ecfaade34110161ab45a67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-11T21:31:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-14T14:11:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"HLE cellGcmSys: Fix unmapping","sha":"ddeb39d8de4a98ba98940407fd5604fa2f577dd8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-11T21:46:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-14T14:11:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: ZCULL typo fix","sha":"07f300a14e75330c8586ee624bddbb61f635d48c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-11T05:00:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-14T14:11:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Unify FIFO recovery methods\n\nTODO: Maybe consider fifo stack content when recovering.","sha":"9344b21484d0cbd937404b169c535a99b0f2dc46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-13T02:00:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-15T07:41:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Idm: Minor assert fix","sha":"1d4595a349be70364d12157d0496bcde298eae61"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-12-13T01:41:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-15T07:41:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Log returned reqspace in sceNpTrophyGetRequiredDiskSpace","sha":"fa9330d0e0039c3472559af2eef4935145474ba3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-14T16:10:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-15T07:41:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix recursive locking in sceNpTrophyUnlockTrophy","sha":"cdda19c79f36e86f582b4acf4ebc0ad1b7a8ba48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-14T10:40:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-15T07:41:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx debugger: Fix a crash on opening before rsx was intialized","sha":"e98fcfdf770426c218ddb050f3cb991b0cbc0dad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-14T12:11:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-15T08:37:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"atomic.hpp: C-style casts cleanup","sha":"eb8710d3c1f353d1e728ebaca183e1654007e779"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-15T08:25:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-15T08:37:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Whitespace fix after #7087\n\nWas this close to enter programmers' hell.","sha":"04e0bf2eff5704631e77f05c2c19ed5e6f80b133"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-15T09:21:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-15T10:36:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix gamelist version check regression after localization changes","sha":"687bb1697b26ea224c5f6d9493a6f3387c2cbf4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-15T09:23:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-15T10:36:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: simplify category localization in gamelist refresh","sha":"1c2df15755b52f65de21f178143d26bb26a0291c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-15T09:24:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-15T10:36:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: only add version update hint to bootable applications","sha":"1cb1d14d0cd12279737510973cc8c3e881b0db5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-15T09:29:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-15T10:36:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Allow for duplications in game list\n\nThis fixes app versions when multiple game data directories were found.\nWe only removed duplications because we didn't wanna see multiple disc games from different locations","sha":"e645627b7896c37bfa7ec98364e518ddd6a78f5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-15T06:56:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-15T11:07:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"HLE cellGcmSys: Make cellGcmAddressToOffset accurate","sha":"299af768e847fc5240ad05ff4144fe39111f41ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-15T10:58:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-15T11:07:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"atomic_t: Fix regression from #7489","sha":"ddf87864dead398b4f4db9c1368dff6bc62da9c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-15T10:22:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-15T11:08:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"game_list: fix duplicate removal from games.yml\n\nAlso add some warnings.","sha":"4018b833ad612c7529b3f4128e07e48373bb3247"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-15T07:37:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-15T18:45:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Explicitly declare null subpass dependencies\n\n- We do not want any actual dependencies, but it turns out removing them\n  entirely makes the driver add even worse dependencies.","sha":"23f151544817886d1461fc77cee3bcebbb159a74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-14T00:08:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-15T19:33:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: add custom title format to settings dialog","sha":"ee54ba970a48183d0db24ebd92eac86a93352483"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-15T19:28:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-15T19:34:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix startup failure on invalid games.yml\n\nAdd some exception checking/ignoring.","sha":"634c4355fe3e69f2ba5bf419028ea4364a6446fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-15T17:46:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-15T22:32:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix sceNpTrophyGetTrophyInfo\n\n* Only writeback data on success.\n* Fix a typo on error code of invalid trophy ID.","sha":"d03804b5238beb9b171136e4c51be65cc52456b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-15T18:03:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-15T22:32:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNpTrophyRegisterContext: Fix values passed to first callback","sha":"4421831c8b3e9962c332f59c62edae49635c8a06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-15T18:30:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-15T22:32:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNpTrophyRegisterContext: Fix off by one progress callbacks count","sha":"c1bdaccd8c27816f2a418c46e3336b36a74eee4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-16T10:47:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-16T12:56:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add reset button to game window title and center the label","sha":"b5ed73ebe05d9482ba2f0aa1a4855d415a51d7fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2020-02-15T22:04:18Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-16T14:09:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix #7445","sha":"a08ed0d22ea1b2b1d7d3ab2aa1ca3817ba24565e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-16T14:15:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-16T15:00:06Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Only declare explicit subpass dependencies for RADV","sha":"5e6b1003ec2e90f4751db8327fe17d3372285e45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-16T20:48:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-02-16T20:48:23Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PPU exec/ovlm ldr: restrict allocations","sha":"812d03894b5e3f3675d8fa7c175079eb9954d673"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-15T22:36:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T12:08:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"move config structs to own files and clean up some headers","sha":"fe75311be2c3b97005f3276b54ba33a5354c2732"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-16T20:27:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T12:08:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"move enum formatters from system to config files","sha":"7a7ac625cd35c3d59f1d109aa791f2964073c2b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-17T15:57:35Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T17:29:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gitmodules: Fix LLVM branch\n\ngitmodules contained some old unused branch","sha":"afb594c2335b59674ddcd4978aade013a15dce2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-02-15T19:50:37Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T17:34:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Disable vertex cache checkbox with MTRSX","sha":"aa14432846a5ecfbd6aa69ada2418b935ecf1729"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T17:47:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T17:56:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Try to ignore some annoying warning (seems CIB)","sha":"244e74ebe225c1ffeca0e5720542cecad79b707d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T17:55:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T18:33:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use std::endian for endianness test\n\nRemove legacy IS_LE_MACHINE IS_BE_MACHINE macro.","sha":"6a1a0bf48da64ce12bd4249aa242aed66d5af042"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T19:00:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T19:00:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"endian.hpp: fix zero array warning","sha":"6e7fbc5c5c406c0f88ff566dafd4e916462edae8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T19:00:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T19:00:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cheat_manager: minor fix for T to be_t transition","sha":"950940febeb4fa872f29e9f50292018e03c8c4e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T19:01:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T19:01:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Try to fix MSVC warning (std::iterator deprecation)","sha":"5c42d29c981b865f5d93751c42a25380600ca2c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-02-17T22:05:25Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-17T23:25:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Update Game List Icon on changing Game List Mode","sha":"ea9abe77016a245dd32f258475748a2fbbda7fa3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-17T23:32:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-18T09:14:14Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"appv","sha":"90f4023cb8682ed6d5ca2feab4c91c5024697f0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-17T21:43:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-18T11:53:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use more starts_with/ends_with.\n\nRemove ends_with global func.","sha":"f08c778d2cb787055a52483cc45af51309be61d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-18T11:28:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-18T11:53:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silence C++17 std::iterator deprecation warning","sha":"a1456da24ebb2c885d31f26d830dd0f387dfd1b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-18T11:34:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-18T11:53:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use strcpy_trync in cellAvConfExt.cpp (silence warnings)","sha":"ee6494c14b706044b63e990d3e1faaa8d82c46e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-18T11:50:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-18T11:53:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_sync.h: fix warning (signed prio)","sha":"c48ceafc158968e2ecfcc174c49a467d52d5c3af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-18T11:59:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-18T11:59:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix warning in lf_fifo<>::push_begin()","sha":"0ee2f761ae68dcb9c73c5d2036d9c1225828f923"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-18T14:09:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-18T14:37:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Restore -Wenum-compare and fix some [=] warnings","sha":"8a176de6a132b7a91346431817ffb57f8c840d8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-21T16:40:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-18T18:09:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_spu: protect sys_spu_image members in kernel mode\n\nSave relevant info in idm, set sys_spu_image segs and nsegs members to 0.","sha":"fad8b38b28f3b64b740953f77d8c4ad102cad77f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-01-21T18:05:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-18T18:09:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"RawSPU: protect NPC from writes/reads in running state","sha":"727d7839594367c01ed81df3a96835fb79a6f63d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-18T18:03:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-18T19:20:40Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix max SPURS threads regression","sha":"f02b4801b20daffe466d24935c4d9520517cac34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-02-19T05:52:33Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T07:08:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Re-eanble gcc matrix in Travis CI, thanks to Neko for the hint","sha":"57a984427966458ee5537acf55cc8028cae6214c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-11T21:36:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-19T18:11:30Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"RSX/SPU: Accurate reservation access","sha":"df8d0cde4ad8f72cbe43b366bab891df1889123b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-15T12:25:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-19T18:11:30Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"HLE cellGcmSys: Make cellGcmUnmapEaIoAddress accurate","sha":"1aa11440e0f6f94807df57add03462df3c8571d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-15T16:11:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-19T18:11:30Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"HLE cellGcmSys: Make IOTable accurate\n\nAffects cellGcmAddressToOffset when using addresses above 0xC0000000","sha":"6de91a169169eae945e90d792e529f1682bcd155"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-19T14:35:25Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T18:15:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"OpenAL: Update to 1.20.1","sha":"b96f0648683cacfa34c6897e9f4cf6cc401dafc1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-07T01:15:09Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T18:15:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"themes/YoRHa: Workaround broken Trophy Manager bg","sha":"85bde0f43ffcc26ba30c04eb027c77700eb28991"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-19T14:22:11Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T18:15:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":".gitignore: maintenance, add missing files","sha":"583220b95aedf488c2a8ca7c84210d2be6a5c0e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-02-19T16:17:43Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T18:16:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Bump FAudio depedency, set FAudio to build statically, enable FAudio in the build script","sha":"9d1833c5a87365a1866e72a908f2bca54fdda239"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-02-19T16:20:39Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T18:16:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Switch the AppImage building over to gcc from clang\n\nTurns out the current version of clang doesn't support the [[likely]] and [[unlikely]] attributes, so to ensure good performance, we'll be switching to gcc, at least for now.","sha":"aa9055f4c35c84962e34bef00f0d933ef58719c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T05:37:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T18:17:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove -Wno-sign-compare","sha":"762c8d54302cfad486e8755cd1cf2f274b4b8cef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T06:14:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T18:17:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add \"-Wno-macro-redefined\" for clang spam","sha":"70bcb1cd52f40761b6f5e9fc3415abfcfdf27a61"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T16:34:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T19:54:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement umax global variable (max unsigned value)\n\nImplements operators == and != comparisons.","sha":"0cf35e3b22f629ae125c451ac60c975c77092f7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T15:26:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T19:54:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"First part of fixing sign-compare warning (inside be_t).","sha":"771eff273bac635ab3c159a37edfce9324e48a0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T17:03:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-19T19:54:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix signed-unsigned comparisons and mark warning as error (part 2).","sha":"92e3eaf3ffd948daf58eb62a626dc5a4b984c39c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T09:43:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T09:43:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Restore some /dev_flash logic","sha":"da036de3e46071a15f14a3a3ca40a876c2f5498d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T10:02:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T10:02:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Maintenance: disable cotire on travis (Linux)","sha":"48c47eede4970001668cf1ff8526194273401675"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T10:13:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T10:13:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Travis: allow failure for osx","sha":"81f974125cc2196fe05f334fe761f12081d6edf8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T10:45:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T10:45:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert \"Maintenance: disable cotire on travis (Linux)\"\n\nThis reverts commit 48c47eede4970001668cf1ff8526194273401675.","sha":"580b5cda0ea58ddca303fa29b75ef6b714660f50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T11:07:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T11:07:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Allow empty /dev_flash cfg (fixup)","sha":"78cc36cdd8ac97a652cd41b4d78f6e2dfe46eed2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T11:38:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T11:38:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fixup for /dev_flash creation","sha":"987223da3f43c5e55e3b1910162bc2790e8cdf2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T12:00:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T12:18:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Another attempt on umax","sha":"2f255a528e61a40bdea31499cf0d78f19e8ea66b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2020-02-20T07:52:51Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T13:23:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cmake: Update glslang build options","sha":"4662ee0255369d786e98280427024ef98c451d3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T13:54:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T13:54:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Another attempt to fix OSX","sha":"3e0e1f668ca971f2a3298a4db38c9a9fb0977cfe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T14:13:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T14:13:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"umax: restore \"natural\" operation order","sha":"4d1f818162175fd11c33c69e2241f5ac4ce72d1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T14:42:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T14:42:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Change stdafx.h to trigger pch regeneration","sha":"9e9ddf42c9a418b4d92508c6de463a4ecf2c7ac5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-20T16:59:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T17:31:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixup for #7304","sha":"dd85e733d392b04293eec33257268eb559b20696"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-20T02:55:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-20T19:07:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add more game window title options","sha":"0dd417e5f25bdfd8a3b08f5100b09c134f88ddeb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-02-17T21:31:49Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T20:33:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Replace XAudio2 implementation with an unified Xaudio2Redist\n\nThis removes dual implementation for 2.7 and 2.8/2.9 interfaces\nand also removes reliance on DirectX End User Runtimes for Windows 7.","sha":"312fc94daa46a840a8538186d18696d7ae138963"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-02-18T19:42:55Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-20T20:33:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Gracefully fall back to a null renderer if XAudio2 fails to Init\n\nThis can happen as a non-error condition if user has no output\naudio devices enabled.","sha":"e005581ddae1fdf690f51e48d070f54281a47c1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-20T21:20:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-21T09:08:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add apply button to settings dialog","sha":"0ed87be47aa5dea0444633809f3fe7ea71911ddd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-20T20:10:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-21T11:49:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor improvements to sys_ss_random_number_generator\n\n* Replace CELL_EABORT with exception.\n* Improve error codes a bit.\n* pkg_id == 1 should not return an error if root permission is present.\n* Avoid passing vm pointers to native API, use temp buffer instead.","sha":"0c757222cb0208abac05628d79d4876f5f8075e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-20T21:21:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-21T11:49:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGameDataCheckCreate(2): Check dirName","sha":"4d7e53d7a09e00fb0426ac1198ed489829c447ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-20T22:11:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-21T11:49:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellDiscGameGetBootDiscInfo on error\n\n* Always set first dword to 0, other bytes are untouched,","sha":"0ba1f8f4ef72990b5da3af3202dc596bc90ab87b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-21T08:40:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-21T11:49:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGameDataCheckCreate(2): Set nullptr in setParam\n\n* setParam is nullptr by default.\n* if setParam is null and it's new data, return error code.","sha":"54f2c27ba024e4e072012de05b93dbb1b32bb3a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-21T12:20:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-21T12:20:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove -Wno-reorder and make it an error","sha":"972e0ab31d89c0af03e8f4f53d9e0519eb235220"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-21T12:39:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-21T14:03:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Disable cotire on travis\n\nMake some workarounds for clang because it poorly supports -Wold-style-cast","sha":"5e75a0c4978066b90a681c206b5080e8662ce71e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-21T16:14:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-21T16:36:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Re-enable warning \"macro redefined\" (clang)","sha":"145b80d26205efa8f88c2d499231cb263fd9f1e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-21T16:09:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-21T18:15:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGameDataCheckCreate(2): More improvements\n\n* IsNewData is false only if PARAM.SFO exists.\n* Don't create directory on error (setParam == nullptr && isNewData).\n* Return CELL_GAMEDATA_ERROR_BROKEN if PARAM.SFO exists on target directory yet is not from GD category.","sha":"24d3e2b2b81613cff0ebe3bffcc2f464d6afb730"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-19T23:12:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-21T20:00:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Do not reset PS3_GAME when booting disc patches","sha":"c4a1c6f845dc439a2c1c0163dd6b5492a650c260"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-20T20:52:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-21T20:00:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Skip some logging in add_only Load","sha":"b47a8b99957c049b84272022f378bd4929118c54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-20T22:39:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-21T20:00:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: simplify blockingMap occurances","sha":"313b967217051a95f4b954fb008e3593296cd3fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-20T22:39:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-21T20:00:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: remove duplicate paths in game list","sha":"171e6c6e545fa6e37dd69d3b8a79be96251f7c80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-22T10:58:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-02-22T10:58:42Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Add more information for segfault reports (#7538)","sha":"6bb083a77c54bdeb9c84a8c8fc0e8bc06df61761"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-19T15:48:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-22T12:07:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Migrate to wide-char strings","sha":"6178a0ab254edc85c88b2a96d7691c698f3001d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-19T15:49:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-22T12:07:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Support new glyph format with array textures","sha":"1df1ceb4eada02cc75c80e4a8f952106517b2f10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-19T15:50:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-22T12:07:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement 2D array textures required for new font subsystem","sha":"6220206cbc87295c0a7fe7394d619fdeb6336c37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-19T18:10:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-22T12:07:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Add basic font substitution system and separate JPN from Latin-1 set\n\n- Gets JP glyphs to render correctly, but the generalization may negatively affect other CJK glyph sets.\n  PS3 doesn't seem to use other glyph sets much however.","sha":"8e68427daff2ff54458736bea27f2ff51ae1deb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-20T17:50:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-22T12:07:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Font system improvements\n\n- Add support for Hangul blocks (korean)\n- Restructure font fallback system to allow the user to 'install' fonts if missing.\n  Should allow fonts to work with no firmware on open systems like linux","sha":"19350d024b028aa67c863a207e116f51d48546ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-20T18:14:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-22T12:07:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: More unicode utilities","sha":"703ec9f89619e0967ae5d8a4307a9f09d3cef6a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-20T18:14:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-22T12:07:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays/osk: Migrate to multibyte encoding","sha":"cb2129c7e48ddf619c65b3085f7c8b8046460e37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-20T18:16:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-22T12:07:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays/save_dialog: Migrate to multibyte strings","sha":"b8f51398b795432dfa8217ca1dc53d2af2adc128"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-20T18:17:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-22T12:07:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays/trophy: Migrate to multibyte strings","sha":"fa41297b273a078bce2dcfc5b025f6754bbc66bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-22T11:46:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-22T12:17:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Test: disable warning for \"macro redefined\" spam","sha":"300170105951031c8dd7734197faee0fbd728603"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-22T11:46:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-22T12:17:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement cellMsgDialog closing thread\n\nFixing deprecation warning.","sha":"96be40bf30e6938fefe21a026a97130d5009cc04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-02-21T19:41:34Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-22T13:02:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use official libusb repo","sha":"4befa36365211986f0401908b9e618bc70afdeec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-20T17:34:09Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-22T13:03:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: cellAuthDialog\n\nBasic RE of cellAuthDialog, stubs functions","sha":"3aa293a7a3a8521dca8f9ee078297054f8d1fc4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-22T13:02:45Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-22T14:27:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: Fix cellAvconfExt function registrations\n\nCo-authored-by: Clienthax <clienthax@gmail.com>","sha":"fa3fde7a29f31ec74f2884dcbd2f438a2398784c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-22T16:40:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-22T16:41:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix deprecation warning in System.cpp","sha":"2bab3afae00bef5bc28ae0ebc6b3669057b7f94a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-02-22T22:31:44Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-23T00:22:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"File.cpp: Make var ref instead of copy","sha":"7eccbecb2f619181ea7095b1ff1e56f286d6781d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-02-22T23:11:25Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T06:38:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Set required Clang to 9\n- 10 is not yet required and is not very available","sha":"7b54d386f2213f24949428a3365b2f42ae355cd8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-02-23T00:54:48Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T06:38:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove some inline compiler pragmas","sha":"479a64c4e8f57f934da3ce7ddb1b338ee7aa02ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-02-23T01:07:33Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T06:38:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"game_list_frame.cpp: Fix progress dialog constructor arguments","sha":"b9ee53d82a203e5db7e2d09647e3616bd05a1692"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-02-23T02:03:01Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T06:38:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData.cpp: Use ref instead of copy","sha":"9b7d28b5dda9abb7787d5bc5ccc8ed3ce3af06b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-02-23T02:03:58Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T06:38:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"memory_string_searcher: Change to std strings\n - Compiler warnings indicated that the call to toStdString() did not\n   create an object that lived long enough be used. Simply use std\n   string ahead of time.","sha":"cc71d2c4bf37cab492ed1e3bcb6e941d33cd31fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-02-23T02:25:56Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T06:38:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"AudioBackend.cpp: Implicit enum to float conversions are deprecated","sha":"758902382d9b92de8b0bbcea1e92c49db3043bae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T07:29:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T07:42:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix \"unknown pragma\" on zlib clang workarounds","sha":"fa0bf6a92c4bfad919d62d0f9b77f52d3ace6182"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T10:12:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T10:12:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RSX: move g_dma_manager to g_fxo","sha":"7069e7265f05cded408019de33bb4a4066be75fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T11:19:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T11:19:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix warning in RSXOffload.cpp (rewrite thread)","sha":"18db020b93331c8920d9d2933b22257198a69991"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T12:03:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T12:03:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove \"thread_ctrl::spawn\"","sha":"8b4b859091e39a8b8a3d355d71a161d2de5a77f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T12:41:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T13:21:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add more thread information (context switch, page faults).\n\nOnly implemented on Linux, possibly works on some BSD.","sha":"e772dde3cc8aadd9d0775eee53309dcb8be98f19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-23T14:28:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T16:57:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Fix NULL renderer","sha":"522daf5eacd09b3d650933b6be80c591d85ab84d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T17:08:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T17:21:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix some deprecation warnings (plunder cellAdec btw)","sha":"f1241c572cf3e19e240bdf5e10af185a01c5df0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-10-25T15:19:12Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T17:21:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellVdec: replace deprecated ffmpeg function\n\navcodec_decode_video2() is deprecated, now replaced with\navcodec_send_packet() and avcodec_receive_frame().","sha":"1a702de9e4c898b680cad98b0adfcb8de201cecd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T17:45:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-23T17:58:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Avoid deprecated av_register_all with version check.","sha":"1dc2eb1cc84773c96137a8894a55de9be7ce39f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-23T10:32:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-24T07:56:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: misc updates to some functions in PadHandler","sha":"17f335648caf75b766ff76c544f9eb71b427c3f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-23T10:35:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-24T07:56:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: use std::lerp instead of lerp template","sha":"64ed2f1151e73eaad677f7650b85b2723c8f0655"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-23T10:48:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-24T07:56:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: Add config lerp factor for buttons and triggers\n\nAdds new lerp factors to the keyboard pad handler In order to simulate triggers and analog buttons.\nSee \"Analog Button Lerp Factor\" and \"Trigger Lerp Factor\" in the yml in InputConfigs/Keyboard/.\nValues Range from 0-100 as before, where 100 is instant press and 0 is never.\n\nCurrently I'm not planning any GUI element for this.","sha":"7b49249f5f09a7864a4ed740491959fa656a288c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-22T19:42:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-24T15:31:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Untangle GUI and input includes","sha":"f7666f44da5408bbfa38eb6a475bb75dfc1eaec8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-02-24T17:29:16Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-24T18:45:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Change logging level for invalid disc path","sha":"df5059b1429b78b3a5e26a09c834add80605c9b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-02-24T17:40:30Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-24T18:45:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix native UI tooltip","sha":"13ef0cc8c4b9fe29061157b438e2d1812c817745"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-24T16:03:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-24T20:33:47Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Ditch wstring for u32string\n\n- Turns out wstring is not the same as u32string on windows.","sha":"f6ebd8868768f46fb4d3eae148827dac9cb04981"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-24T16:30:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-24T20:33:47Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: Avoid race condition between rendering and layout operations for system widgets\n\n- System widgets are callable from outside RSX code.\n- Responding to draw requests while setup is in progress can cause malformed cached output\n- Fixes glitched layouts for system message dialogs","sha":"cd40bc8c612d4e483f661fc5cdc10ed0fddd166a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T08:43:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T08:51:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Restore thread counter (world may be not ready yet)\n\nRemove dumb 1300ms timeout.","sha":"7eebe0693189c931e493842dea69a0865943d4b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T08:51:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T08:51:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add g_fxo->init_crtp to simplify thread construction","sha":"fa02a04baaf8846a4c3d6b52510ec83f06b5978d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T09:33:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T11:03:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Try to fix OSK","sha":"318a364d096e05ec39d5655905091bfbda2cbdd6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T11:07:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T11:07:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix wrong g_fxo->init_crtp name, use just init<>","sha":"9c9c2eb2c9717aa9a24a1723e9465f3ec3adbfff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T11:31:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T11:34:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix g_fxo->init internal logic for CTAD (use () not {})\n\nAlso improve comments to the functions.","sha":"136d769895e369dc4565efdde7b35ca0542222a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T12:36:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T12:36:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Threads: Remove unused on_wait() detection to simplify code","sha":"3f943945a7d00864b7418bbcab33a135fde75840"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T12:48:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T12:48:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Threads: removed outdated on_abort detection deemed unnecessary\n\nMay cause regressions.","sha":"b59bb16fad0f7f253017eb7de1579cc54fa13510"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T12:57:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T12:57:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Threads: remove some unused code (remnants from thread spawn)","sha":"b083edccd3079bef6c4aeb78bc88bc75f0d27d9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T15:27:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T15:27:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed_typemap.hpp: minor fixup","sha":"4e33ae319be63bfa79576172fdba1f15dd1af7d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-02-25T15:33:06Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T16:42:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add information about boot process","sha":"33abcf74f2a7cd4215526803f2cd27ec845efa17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-24T19:09:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T18:57:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"overlays: add overlay_osk.h","sha":"2341749485062a24146272c7d511114e0838ec9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-24T20:00:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T18:57:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"overlays: fix overlay_utils.h filter","sha":"69b2e746fa65035469c59f4f6ea3b826c93332e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-24T20:07:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T18:57:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"overlays: move code to overlay_utils.cpp","sha":"620cfd506365a41f914da816313bfa12cd8272f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-25T00:44:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T18:57:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"overlays: Fix find and replace regression","sha":"3f4226b70e1c96dbab85211ab484e553bd2b90c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-24T23:53:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T18:57:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"overlays: add layer modes to osk","sha":"e719bcf3387e957eb11647738f3cf07305e604cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T19:50:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T19:50:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Try to fix msg dialog breakage","sha":"144c20649f65a66e271c5cfbe2450b923a3cb3b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T19:56:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T19:56:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"overlays: remove unused threadpool","sha":"982856e70d4f0567be2d682d3d85214efdb05654"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T20:16:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T20:16:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add thread_count instead of former thread pool","sha":"ff16e678a5d0625b63e4b968820435b9147552da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T20:43:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-25T20:43:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"overlays: hotfix for waiting on thread_count","sha":"df1813b4e25bc63c84872d927326e8bcd75db390"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-22T15:19:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-26T16:40:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Restructure ZCULL query triggers\n\n- Both ZCULL stats and ZPASS stats require hardware queries, but\n  ZCULL stats should not contribute to ZPASS stats and vice versa!\n\n- Disables hardware queries for ZCULL stats by themselves, we cannot\n  generate them correctly anyway and no game so far has been found to\n  actually use them. Should lessen the load on the backend for games\n  that do not actually require it.","sha":"6e9392fb4519fbbaa9e41d90c451d976ab306f83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-26T16:15:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-26T16:40:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix typo. Noted by github user @gamerforEA","sha":"569e1c2df68f354f8dc2b9e2770bcf615f5458da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-22T15:04:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-26T18:17:13Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"fs: Make fs::get_dir_size able to report an error","sha":"0d4f8ca23487adfd4aade4119a9f3a7e7883c562"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-22T09:11:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-26T18:17:13Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Stub sys_spu_thread_group_set_cooperative_victims and syscall_253","sha":"4d3cdca7f6fd9531a57a0aaaa0e50e11e8ce27ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T17:42:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T18:23:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix one bug with MsgDialog thread (freeze on exit)\n\nForgot to check thread state","sha":"b35a5982e81d5749aa1f3a34542986dda8534d1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T17:43:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T18:23:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed_typemap: implement need<> method\n\nIt may be used in constructors of other objects to assert a dependency.\nIt also helps to ensure reverse destruction order of that dependency.","sha":"5e59f1872064835f3747a311e7090ae16dab7925"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T17:45:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T18:23:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add message on exit if some thread are still waiting","sha":"e102dc2a9472c2ec7338badaaf155a9d0f1b734b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T18:00:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T18:23:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"named_thread: allow default constructor only with thread_name\n\nIn C++20, lambdas may be default-constructible allowing nasty stuff.","sha":"a0d2bc9769b882282dcdcfc42c63e1536e21d1ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T18:56:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T18:57:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix RSX Offloader thread name","sha":"5094ab8283c8b2273521b910328fd29dfde8bb31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-02-26T18:18:55Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T19:06:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Auto-updater minifix","sha":"abfa303e07f240a37800dcb5e26021ec8dcb3328"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5559457?v=4","date":"2020-02-26T15:41:23Z","email":"gamerforEA@gmail.com","login":"gamerforEA","name":"gamerforEA"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T21:38:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add missing include guards","sha":"49294a3dd22e1c9552d014b6aced5a357026012b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5559457?v=4","date":"2020-02-26T16:09:45Z","email":"gamerforEA@gmail.com","login":"gamerforEA","name":"gamerforEA"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T21:38:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove unnamed namespaces from headers","sha":"c0fbf3091e1917bcf23cc3592c0af0a6142bc1b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5559457?v=4","date":"2020-02-26T20:13:54Z","email":"gamerforEA@gmail.com","login":"gamerforEA","name":"gamerforEA"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T21:38:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Apply some Clang-Tidy fixes","sha":"93552a5958641b25f4e40065ca94d3b69b89ec4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5559457?v=4","date":"2020-02-26T20:23:06Z","email":"gamerforEA@gmail.com","login":"gamerforEA","name":"gamerforEA"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T21:38:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_prx_.cpp: Fix RAII locks usage (without local variables they destroyed immediately after construction)","sha":"762c106e19b124241a1b7e2564416ca10b7be3b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-25T21:42:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-26T22:43:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"move overlays code to headers","sha":"ee46ad1ca91d94ed9ec910e41c2b2c83222275e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-26T22:21:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T10:04:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"g_fxo: implement logging for object creation/destruction.\n\nOnly logged at automated phase for initial/final processing.","sha":"f71cdb4eb8e8e45f19f7ed5b2d6f8a18b10333e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T09:48:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T10:04:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed_typemap.hpp: forgot destructor","sha":"d5c85f308aec2da5381e94fb09a7410a37d8c349"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T15:30:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T16:14:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed_typemap.hpp: polish move constructor a bit\n\nGitHub, plz.","sha":"d0b2eecc9abf3a95b5fbc409a8220e8046631f1c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T14:28:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T16:14:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"overlays: add \"thread bits\" to wait on and avoid lockup\n\nAdd TLS variable to store its own bit.","sha":"ecd68dfc703409496eb44497ce83878995d6e4c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-02-26T21:31:46Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T18:31:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update BUILDING.md and CMakeLists.txt\n\nSeveral parts of the guide had fallen out of sync, notably the Ubuntu section. I've tried to clean it up a bit.\nIn addition, I matched some of the version numbers to what is found in the CI system here: https://github.com/hcorion/rpcs3-docker/blob/master/xenial/Dockerfile","sha":"00b74fb9514c14467a1ba0f9d58f24ce8b3b6784"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/27400393?v=4","date":"2020-02-15T14:33:14Z","email":"sards3@gmail.com","login":"sards3","name":"Stephen McKinney"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T19:30:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Don't improperly resolve symlinks when booting games.","sha":"2b853cc8bc0d808baf86bb0b327f9f4d06bddcfc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-27T15:07:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T19:31:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: do not fail on empty directory","sha":"556aba46b56db4790926a0662bebdf541808c76d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-27T15:24:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T19:31:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Avoid passing vm pointer to native API","sha":"42a0512c6663b1feee262860cc25549d3b30ea18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-27T15:34:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T19:31:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: reset fileSet and fileGet->reserved everytime","sha":"d86241bbcd101286976147f35eabd598afab4497"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-27T15:37:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T19:31:31Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSavedata: reset padding of g_savedata_context","sha":"0eabfdcadd699031def7218e38c55e0a9dc7b8fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T19:55:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-02-27T19:55:30Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Merge pull request #7506 from elad335/patch-1\n\nPPU exec/ovlm ldr: restrict allocations","sha":"e133c7a7dc854dff14b2c0dd3967aca1ec734459"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T18:41:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T20:04:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed_typemap.hpp: minor cleanup","sha":"bacd1698fc302460a9a1480258999baf94da1b67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T20:57:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T21:04:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed_typemap.hpp: remove <algorithm> dep in header\n\nCreate fixed_typemap.cpp","sha":"447475716273cbb24b412eb691166712fdf271c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T21:16:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-27T21:16:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed_typemap.hpp: reset creation index to avoid confusion","sha":"08ab9c4b04ab28ef722f61d1896814c8f12921c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-28T11:28:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-02-28T15:47:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: Implement/Fix param error 22 for funcFile, funcDone, funcFixed and funcList","sha":"30f7c81cc509ecaeec1f64f21503abc8cf3893d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T06:56:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T15:54:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove unused lf_hashmap\n\nThere are better ways to implement this.","sha":"bf4bdf73b79c28be36b0ef75343f44fd860a970c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T07:43:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T15:54:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove cancerous lf_value<>\n\nReplace thread names (generic, PPU, SPU) with new shared pointers.\nDevirtualize cpu_thread::get_name (used in single case).","sha":"65eeee0f4cd0109094218837a2058990704b2da4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-28T06:20:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T16:10:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve sceNpDrmVerifyUpgradeLicense(2), sceNpDrmIsAvailable(2)\n\n* sceNpDrmVerifyUpgradeLicense(2): copied string from content_id is 47 chars in length at max, is no null term was found it forces string termiation.\n* sceNpDrmIsAvailable(2): Same with drm path just that it's 256 chars at max.","sha":"05bb6e1545f08d6e2c6dcb9140452a544d16fd96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T16:43:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T16:43:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix RSX Offloader thread exit (MTRSX fix)\n\nHangs on exit if MTRSX is enabled.","sha":"f335d034fcdc6bb0cf8d4e27bc0864643552e2a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T16:55:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T16:55:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RSXOffload: fix dma_manager::sync() freeze on exit\n\nIts logic was completely broken.","sha":"ac2581659a6fac4008d0140c61d1553f2d191f54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-28T17:27:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-02-28T17:27:31Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Disable zstat checks to avoid unnecessary stream splitting (#7624)","sha":"cb047fcc7596d5b83f2773d969b57cc34ff5a7be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T17:45:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T18:11:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Try to purge thread_state::detached\n\nIt's rarely necessary, but can cause unexpected problems.","sha":"490f58ff3c916e2afcf3bf5981dd9d7893d3923e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T18:50:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T18:50:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove global thread counter (again)\n\nSeems fine without it now.","sha":"799c3f97081901e18bc041256573474c72af7fa5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T18:52:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-28T18:59:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move Progress Dialog Server to named_thread\n\nMake it a global variable, but that can be actually destructed at exit.","sha":"be0e4e9879da26b99daf11deb94b1db1e54b83e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-29T08:32:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-29T09:13:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fixup for RCB/RDB in special cases\n\n- Images must be in TRANSFER_DST_OPTIMAL or GENERAL layouts to call the image upload routines.","sha":"08f346036560455dc06684e6acaf2667bd50369d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T09:09:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T09:15:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_ss: use BCryptGenRandom on Win32","sha":"a84077f1743693acb56a0dc393d8f6c77fe88f30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-28T17:47:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T10:06:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Allow 0x30000000 > addr >= 0x2000000 ppu loader exec allocations (workaround)","sha":"d7dd4897f8bfbb031bdbc7daae56f84ac95b3c8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-29T05:29:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T10:06:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Use more starts_with","sha":"8762f2a5889bcbcf062214b205eabc663f305c63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-29T05:55:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T10:06:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Add error param 72, 73 checks for file write ops","sha":"34a0c3f488769b49c5f4762fb0d5a8864b0fc22c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-29T09:41:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T10:06:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_timer_destroy\n\nAlso some cleanup.","sha":"5a73943be6e4e8dae5fd753838fbc0a87b6bdb2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-29T09:04:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-29T11:23:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix zcull clear command; do not clear ZPASS when ZSTATS is cleared.","sha":"198c84cabfc35544548fdc044571e0136e980304"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-29T09:12:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-29T11:23:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reset ZCULL statistics at the end of a frame\n\n- Workaround for games that leak zpass/zstats.\n  The information is useless anyway without a clear op so it should be fine.","sha":"eb140c52a4d84a9ce881477f0686aece2bd128a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T11:57:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T13:55:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement named_thread_group","sha":"f72971f19f3659cf4b2c9ea4a0e98946567f3de8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T12:35:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T13:55:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use named_thread_group in rsx_cache.h","sha":"8e5a03f17126db1f5b857746851428965adef98d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-29T14:15:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-02-29T14:15:25Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Improve sys_timer_get_information (#7638)\n\n* Improve sys_timer_get_information\r\n\r\n* sys_timer_disconnect_event_queue sets STATE_STOP regardless of port connection status.\r\n* sys_timer_get_information sets 0 for period and next_expire if the timer is stopped.\r\n\r\n* Fix two minor races in lv2_timer thread\r\n\r\n* If the timer thread is about to fire an event of queue x, then another thread disconnects the queue, then restarts the timer and connects the event queue, then the timer thread sends an event - event data combination (source, data1, data2, next) may be inaccurate.\r\n\r\n* If the timer thread is about to send an event (periodically), then another thread stops the timer and starts it again with sys_timer_start_periodic_absolute, timer.expire in info->timer_state in sys_timer_get_information may be inaccurate.","sha":"50f51be06a4c2105ec7556a8e80d5e7b8506dcaf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-29T06:14:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T14:16:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Segfault/exceptions reports: Get rid of unhandled exeption handler, log memory bases\n\n* Getting rid of handled exception handler fixes 2 things:\n- Visual Studio debugger won't force it's own handler on unhandled exception.\n- SPU segfaults in recompiler can now be reported.\n\n* Log vm memory bases.","sha":"5871c4e93f06b233abe9c54411e4e0fec8bff1d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T14:19:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T15:29:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Shut up all channels on exit at some point\n\nSome object are getting destroyed.\nMakes valgrind more quiet.","sha":"d37e770497468b3471718c0e0b505e1a4378698e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T15:36:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T15:39:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Partial revert of 5871c4e93f06b233abe9c54411e4e0fec8bff1d2","sha":"cb252b1ce2336c3cc77f445247c9048f8162cfcf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T18:13:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T18:16:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compilation fix\n\nShould fix #7642","sha":"e28e51463b1df7d8035400627f72c508d4d9bdcd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-02-29T08:05:27Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T18:19:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add error for missing firmware","sha":"94478ad4a0af1b45e9f2e184e96e5ffeb30e6037"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2020-02-15T21:21:27Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T18:24:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Change key_vault to use version ranges.","sha":"7e590eaa2f5660b24a4f80d4b70be0c663cf6426"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/22731889?v=4","date":"2020-02-29T18:40:44Z","email":"webmaster@invoxiplaygames.uk","login":"InvoxiPlayGames","name":"InvoxiPlayGames"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-02-29T18:40:44Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_usbd: Guitar Hero Live controller emulation (#7336)\n\n* Initial GHLtar emulation\r\n\r\n* Add GHLtar to CMakeLists and VS project, zero the buffer and remove unused header values\r\n\r\n* Fix coding style issues and include headers\r\n\r\n* Remove redundant if, improve code formatting\r\n\r\n* Remove needless includes\r\n\r\nCo-authored-by: Ivan <Nekotekina@users.noreply.github.com>","sha":"ef6854ca466a6385464425770b5e85f2b8f6d32c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-19T20:25:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T18:54:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"RawSPU: fix race condition in RunCntl stop request","sha":"c11074a128e94591e6bb58e763cbad83659719f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-02-29T20:25:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T21:14:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Add null funcStat check\n\nit's ordered specially for some functions","sha":"655f7ce8a2cd3781a0bbfd14b863938f07644d98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-29T12:13:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T21:16:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vk: Add execution barriers.\n\n- Useful for debugging","sha":"5eb314fbbb12db9256e9ab5576b1d2b7d7e72ea4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-29T14:44:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T21:16:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vk: Improve events\n\n- Make events properly managed objects.\n- Add a workaround for AMD's broken event status query","sha":"9af52d12a88b8c9c164926e09fd785f8d7f59546"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-29T20:30:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T21:16:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vk: Fix dma resource leak\n\n- Fix broken check; a relic of the past where flush method would reset the fence","sha":"76bbbe27f1c93913bbc44741be358670be4045b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-29T15:59:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T21:16:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"video-out: Allow applications to successfully change display resolution\n\n- Avoids a situation where a game configures output correctly but gets back bogus information later when querying.\n- Should fix games being broken at some resolutions but not others.","sha":"14aebeac58e6d04b852929ca390b80563425dfd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-02-29T15:59:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T21:16:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vk: Properly use declared pitch when loading simple images","sha":"7fe9802f8711ae9e3671f00bc2bc881f5ae72a13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-02-29T20:21:14Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-29T21:17:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rpcs3_version: Bump to 0.0.9","sha":"fbe6900b287423da98ae07278f9614734e151d67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-01T05:10:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-01T08:56:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"cellSaveData: Add some error checks for fixedSet, fileSet params","sha":"ffd5a9e91c9d1ee3ec5738da58204e501b3ac132"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-01T15:30:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-01T15:30:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_ppu: Hotfix for detached threads","sha":"b05b16aedcd83f6200e9f1c3199be2da808b3636"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-01T17:00:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-01T17:09:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: followup to #7652","sha":"7dfd50d5cc4a9935453e4fb2dcf120ebe8179037"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-01T16:24:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-01T17:10:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"videoOut: Resolve 'auto' aspect ratio\n\n- 'Auto' is not an actual aspect ratio, just a dont-care flag to set the\n  display to the best fit aspect ratio.\n  Decay this option into a proper ratio for cellVideoOutGetState to\nreturn legal values.","sha":"582c98359e45ca9e850657c154c4115f0f863639"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/22731889?v=4","date":"2020-03-01T01:12:03Z","email":"webmaster@invoxiplaygames.uk","login":"InvoxiPlayGames","name":"InvoxiPlayGames"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-01T17:10:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix duplicate inputs for GHLtar strumming","sha":"752c4a7b0dc7dae58786d6bdb915733753bbb708"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-01T19:17:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-01T19:29:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_ppu_thread: fixing detached threads","sha":"6ee91533295c688ab07123f74769db09a6892499"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-01T19:40:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-01T19:40:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup","sha":"c7fa4e237520b0398460417f5f015bf453b03e6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-01T12:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-01T21:00:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: remove game window title size restriction\n\n- Elide game window title label\n- Add tooltip with format and resolved title\n- Remove max length (do not wrap text to show how ridiculous it will look if it's too long)","sha":"73a99462124772d949d63d70c342f8f556407cbb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-02T07:35:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-02T07:35:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_ppu: another fixup","sha":"bd234a76685adad12ae4a067c5da16f390748f71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-03-02T06:53:18Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-02T09:31:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add time logging for updater\n\nMight help diagnose issues","sha":"7129902b25f14aaa6bc2e82f1bae6c8b62161162"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-03-02T06:53:30Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-02T09:31:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor cleanup\n\n- Remove log prefix as auto-updater no longer uses general channel for logging\n- Swap some C-style nulls for nullpointers\n- Other misc changes","sha":"d94b8751870637c125f0e19699229c992098ddad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-02T17:17:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-02T17:48:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Print PPU Syscall Usage Stats\n\n* Every 10 seconds\n* On normal exit","sha":"3105b21909837f223207c461adfa0eb94286061b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-03-02T22:55:05Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-02T22:55:05Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Azure (#7673)\n\n* Set up CI with Azure Pipelines","sha":"87c8d1800b5e1617b6d1b0e7b65157b9d61fdf46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-03-03T02:42:28Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-03T07:39:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Properly setup Azure Pipelines using current system\n\nAlso sets up Azure artifacts (including for PRs) for AppImages","sha":"0f1fd059fc81cdca42d380781abe6940e30c9280"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-03T08:24:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-03T08:24:49Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"cellSaveData: fix doneGet->sizeKB (#7674)\n\n* cellSaveData: fix doneGet->sizeKB\r\n\r\n* [⚠️] Warning: beware of typos [⚠️]","sha":"de1774d8f27bba6923f84c87dd4d3252b8f36996"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-02T20:28:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-03T08:31:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: Rewrite fma32x4 to match FM and older asmjit stuff","sha":"01db83bc365e7a7c5f0f608d3779de8710ceea90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-03T15:02:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-03T15:31:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellGameDataCheck's game data creation with PARAM.SFO set/get","sha":"5c3d417b35404c75de69c9c5185b631008c7cf06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-03T12:21:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-03T15:33:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix ppu_syscall_usage thread waiting\n\nFixed 10s hang on exit","sha":"68f50c7035c62aef16a8b334d16f4a0f1f0b0107"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-02-24T17:39:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-03T15:33:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM to new llvm-mirror (LLVM 11)\n\nUse clang-cl to build LLVM on Windows.","sha":"5b0476e77212c96a10f096cc37b2018a2db52a0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-03T13:36:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-03T15:33:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Threads: move linux m_timer to static thread_local variable\n\nAllows lazy allocation of the timer handle.","sha":"6c6615337251e0d74ac941b5d6cab3782a939ce3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-03T14:51:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-03T15:33:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Thread: removed unused wait() with predicate.\n\nIt doesn't work this way anyway.","sha":"d594490329aed615c64ebcec6c4c224e796024e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-03T14:53:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-03T17:26:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Thread: internal cleanup\n\nUse different, simpler algorithm in wait_for.\nAlthough the very idea of such notifications was rotten.","sha":"8d847d6f1c423eef63b818563ee02050b688f15a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-03T19:37:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-04T11:10:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: use named_thread_group to compile modules\n\nImproves internal logic by not using too many threads.","sha":"bdbc7b5f1d395e04c84978c77a8b8f9cd0220947"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-04T11:17:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-04T11:39:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update thread_base::notify_abort()","sha":"bb1b4bac9b7466ec1e689a9910f56d6d2f9a970e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-03-04T13:55:35Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-04T13:55:35Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fake PSN (#7516)","sha":"f1f5c91386e017f0a4fc1af4ba5ffeb2f575f0a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-03T19:54:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-04T18:21:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/blit-engine: Account for a rare corner case\n\n- It is possible to have a RTV<->DSV transfer with compatible-sized formats.\n  Mark the depth size as typeless in such a situation to avoid crossing the aspect barrier with the API.","sha":"54775d91dc0809c0f3e9f7469f5e93ef77ca098b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-04T12:29:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina Aux1"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-04T18:23:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix warnings in GLGSRender","sha":"c3f3451269e1b13040e0b80ba8bfb17a7c15fdf3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-04T12:36:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina Aux1"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-04T18:23:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix warnings in VKGSRender","sha":"f2f33219520d7505f378dc6fd5a38e3605280c99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-04T14:08:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina Aux1"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-04T18:23:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix warnings in emucore","sha":"250736ece5758a557e3e0ddb746a7958a3544106"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-04T20:46:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-04T21:28:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix ui and sys_net warnings","sha":"21b6495aaa5dcaea55fc5927de76f9798cf5c93f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-04T20:39:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-04T21:31:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Crypto/utils.cpp: extract_file_name","sha":"39eafc1f3bb64b44d27886300249a35eb2673276"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-04T21:09:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-04T22:58:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix 7z for Debug and Release","sha":"f1147f70f47fe95ce6dbf64c68d9b8e4dc96e3c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-05T07:38:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-05T08:07:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: fix regression from warning fixes\n\nForgot that negative power is used here.","sha":"0a4199981807c1a61aab2a81161de04e2a0f2a48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-05T11:05:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-05T11:05:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Replace std::string::npos with umax","sha":"7a8772dafacb2b6df34f5c5f4b4eb4bb2a455972"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-05T14:12:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-05T15:28:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix _sys_prx_get_module_info p0pt->filename writing with 0 size","sha":"f6cf36f6a77de8a2d2828cc6fa05d1f64f166db0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-05T17:28:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-05T17:33:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix llvm link","sha":"0361184930d8931246f12d1aeadaa1f916c80bf6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7739280?v=4","date":"2020-03-05T18:02:28Z","email":"me@dmitryponkin.name","login":"Adiost","name":"Adiost"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-05T21:37:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: new ds4 LED settings","sha":"f776910966fbbbc0e4a985b6d308cb3ab48d7bbd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-05T20:20:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-05T21:37:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: piggyback on existing callback for battery_level\n\nremoves ds4 timer workaround","sha":"9e449db0c287efca5523e361773741ad427d42a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-05T21:13:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-05T21:37:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix led dialog layout and use hidpi painting","sha":"e1b4cf1557ae69bddaa3c4a0b1f53f991009c808"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-06T04:09:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-06T05:39:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix SPRX/firmware installation (use a mutex)","sha":"7514e533851f150f093d2cc551dc3788e3314573"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-06T06:42:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-06T06:42:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Try to use designated initializers","sha":"acd50eefafa3e760222a100371907debf14ff80a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-06T12:47:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-06T18:16:46Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement lv2_file::open()\n\nReturn accurate error codes in prx_load_module, sys_spu_image_open and overlay_load_module.","sha":"1669e95870c2c5dd523753c6a33eb8a7047b7c69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-06T18:11:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T07:49:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Logs: remove mem-mapped buffer and move instance lock to main.cpp\n\nPart of the work to untangle utilities from RPCS3-specific things.","sha":"2209be5216a97a612f7ed2943c1a2000012c4d1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-06T19:29:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T08:15:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Logs.cpp: more code moved to main.cpp","sha":"66b0b78055dbbe5ff17bc71ded2c2fbe7d270a82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T08:18:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T08:22:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add fs::error::unknown, don't throw","sha":"8461a5cbe271b8751d599bf7161547cc882ece14"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T08:52:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T08:52:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Don't throw on invalid whence (return fs::error::einval)","sha":"a166d3680ef5f62eed608e12d4a1cd2201222106"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T09:29:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T09:29:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move Log.h to util/logs.hpp","sha":"e4a81b1d13a1d890e2ff10dc0cc151c8b31d7799"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T10:31:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T10:31:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move Log.cpp to util/logs.cpp\n\nMinor cleanup","sha":"12a3cdf0e8f47378e11658851d92dc269ca22788"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T10:43:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T10:52:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"logs.hpp: minor optimization for non-formatting logs\n\nAlso use single template with CharT to match fmt::format.","sha":"b726aa5a3e9525881a8c5609accaf3bdeda72747"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T11:38:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T11:38:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"logs.cpp: print some errors if failed to create logs","sha":"7599c666390bab6ebaac092117dd09851daaeafb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T12:26:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T12:33:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"logs.cpp: fix log format for backward compatibility\n\nDon't add prefix for first messages.","sha":"19107b2de5dda63f2a5d2aeb67f51e5dcf70f120"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-07T16:07:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-07T13:58:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"video: Allow selection of 3D stereo resolutions","sha":"6e3406b3f5372cb4fa707e990c34431c231c0e83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-01-07T18:29:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-07T13:58:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add anaglyph 3D filter","sha":"1725f7a34b681cbb9e56c08eac06bb946ed7e4fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-04T18:59:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-07T13:58:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix image properties for flip temporary images to be samplable.\n\n- In case of gamma correction or other effects, they may require shader access.\n- BGRA8_UNORM is usually safe to use directly without staging memory.","sha":"93295f7f50e2222f8bd1a364c2b8b0d4154cb574"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-04T19:25:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-07T13:58:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/gl: Use best-fit semantics when scanning texture cache for flippable images\n\n- Allows sourcing flip data from the blit engine resources which avoids expensive flush and re-upload","sha":"70f2577b9e3c21ddfa39cdc117575598ab246fa3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-07T13:35:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T14:23:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gl: Restore commented out line\n\n- Byte order step was disabled for debugging and not restored","sha":"149d550f7ea58622e734e934baf98fb41e217320"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T15:33:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T15:34:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix llvm_build.vcxproj instructions","sha":"e74d3c2674d740b20fbc09843a9c83d63c991ff7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-07T16:15:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-07T18:17:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Make force cpu blit setting dynamic","sha":"5e86ef2371e8269fa60483730309dbb2bb8d889c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-07T14:01:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-07T19:03:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Atomic sys_prx_load_module_list error checks","sha":"deb6bd3e25f94311d1177df578e388111aa0f5e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-07T22:11:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-07T22:11:35Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Improve frame-limiter (#7723)\n\n* rsx: Improve frame-limiter accuracy\r\n\r\n* lv2: Improve lv2_obj::wait_timeout response time for aborting threads\r\n\r\n* rsx: Make stretch to display area setting dynamic\r\n\r\n* rsx: Redefine 'auto' frame limiter to obey vblank rate\r\n\r\n* rsx: Make frame limiter setting dynamic\r\n\r\n* rsx: Make frame-limiter compatible with dynamic changes","sha":"892f74d76233c3503eb773bf86b70450eba02154"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-06T21:34:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T23:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Add missing boot error dialog","sha":"e56b3256b04ec38bfe2515b808866055b250f0c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-06T21:36:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T23:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Add title and title id to button tooltips","sha":"0c454571014487fe1bed3b5a4c91f43aab2de2e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T01:01:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T23:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix CurrentSelectionIconPath for game grid\n\nFixes deselection issue when booting a game in the game grid","sha":"7dd36ff8294c875667b5b3f560f9ea5b1702883c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T01:04:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T23:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Prefer currently selected game when pressing the play button\n\nAlso rename Start to Play","sha":"426643c44db8fd450f18781949682fe16d42375d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T17:01:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T23:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: some code cleanup in gui files","sha":"934a2eb9fa7bd2df60de3da021348e73f5420d6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T18:47:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T23:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix play button state when booting rpcs3 for the first time","sha":"091dcc10525929a332875a7f3219629507e658f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T19:54:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T23:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: more code cleanup in gui files","sha":"11bc7de0ca019f65ecc983fa3a02a9aea9438da4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T19:55:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T23:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: remove gui settings default shenanigans","sha":"53676067fc3b8b5f1a07f4284c91dff4a2cd2706"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T19:58:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T23:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Backup current gui config before applying another one\n\nAlso fixes some strange issues caused by the pointer","sha":"5f247cbedcf23862fe8e81f3b417e32fdf93480f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T21:24:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T23:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Improve tooltip areas in network tab","sha":"9b672cb969df4f6710ed361ee846c684e8c27640"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T21:27:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-07T23:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: don't create stupid default.ini file when resetting gui configs","sha":"ab4189998cc2cbf2ef2ce7eedd0d3b43b6baabda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-07T19:20:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-08T07:30:13Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Blit engine improvements\n\n- Detect writes to the display output memory and handle it specially.\n  It already defines a known 2D region.\n- Try and detect situations where raw transfers would be of benefit.","sha":"84a542fbce92545da47fc38c8392f785a2bd0b3f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-08T07:02:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-08T08:43:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix framebuffer native layout for X32_FLOAT\n\n- It was not matching the order laid out for normal textures uploaded from CPU.","sha":"8214425a3c17948b460e480aa5ab47729232b861"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-06T17:56:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T09:49:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sceNpUtilCmpNpId","sha":"5692c3de0482659e723e821338febd8c9b5d1255"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/37698908?v=4","date":"2020-03-08T10:57:17Z","email":"37698908+illusion0001@users.noreply.github.com","login":"illusion0001","name":"illusion0001"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T12:05:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"overlay: set minimum update interval to 1ms","sha":"814c73407de41213b31ad4552ed2fba23f54b133"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T11:48:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T12:11:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement thread_ctrl::emergency_exit()\n\nReplace exception throws with this.","sha":"07e1766a7ce880a0c1a71be2be6c18e94f31f7a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T13:13:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T17:45:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Pause emulation on any fatal log message.","sha":"e40019354cdf21aaf52d48c28749c6222b80bf1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T15:23:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T17:45:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify report_fatal_error\n\nThose semaphores didn't achieve anything.\nLaunch separate process if Qt is already initialized.","sha":"1bbe2e9b15734a37d43d0e48ddb8f1b425243d46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T17:40:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T17:45:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use _wexecl on Windows\n\nAllows original path to contain any Unicode character.","sha":"c87beaa69400c9dcfc7981fef8106d2550b36858"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T18:54:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T19:03:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve report_fatal_error()\n\nPreviously it could cause secondary segfault on Linux.","sha":"6268a2d384cf4fde8173ba1304d1aa0ba1b33d83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T19:00:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-08T19:03:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup for Emu.Pause()\n\nRemove some reduntant calls.\nDon't pause on unknown sys_fs_fcntl operation.","sha":"9dca2887d8f60ffba21cf768112830017d8bffb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-03-08T14:27:12Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-08T20:56:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix framelimit/aspect ratio width","sha":"a2b6546d3745fe05a254889146887fd9f068061b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-09T09:41:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-09T10:20:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement stop watchdog\n\nShows fatal error if stopping takes more than 5s.","sha":"609c0d46afee25dbf96b4875f5769d1efa5503db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-09T09:15:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-09T11:59:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Rewrite async decompiler","sha":"2985a39d2e5a2b04ec3f3541db6fe84144b205f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-07T17:36:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-09T13:07:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add forgotten error check in sys_spu_thread_group_connect_event","sha":"af7cdcb5c78c71d6620a91f472c42a79bcdb2347"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-08T06:29:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-09T13:07:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"HLE cellGcmSys: Avoid calling sys_rsx syscalls in rsx code","sha":"636ed4a48bf34b96851807905811579ff1a53742"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-08T06:45:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-09T13:07:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI: followup to #7347\n\nShow \"Reboot\" on current running game when there's no config.","sha":"5751b7768817134429b60c447776fb9ec1c5683d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-09T12:18:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-09T14:20:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Fix copypasta","sha":"12b73c8bdc68832ef92eef0b112426654ca74901"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T08:23:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T08:23:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Logs: add 'always' method for debugging","sha":"d3eb267ba9c35823a0ebcd63008e69a4c5fda970"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T08:24:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T08:26:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Pause only on fatal messages\n\nAlso make some access violation an error since we don't pause on it.","sha":"87d4b14ca960a23464db55fc5f2ab1fb703b42ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T08:31:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T10:28:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Break in the debugger in thread_ctrl::emergency_exit\n\nImplement IsDebuggerPresent analog for non-Windows systems.","sha":"adfd8ab43c5b80c6a654e11719abd677b4d283f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T11:06:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T11:06:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use TRAP on segfault with debugger (Linux)","sha":"1678b37aa063469f73ce1d6ea41dd1930e353ea0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T15:43:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T15:45:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix narrow warning in ds4_pad_handler.cpp","sha":"b4f416cb760b68b2f797b296026239b70061b4d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-03-10T16:21:00Z","email":"44116740+sampletext32@users.noreply.github.com","login":"sampletext32","name":"Bird Egop"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-10T16:21:00Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Explicitly rename has_512 into has_avx512 (#7751)","sha":"4e25daffa645b45482aafd0340a02afc2598c6d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-09T22:00:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-10T18:04:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input/overlays: fix premature pad interception removal\n\nshader compilation and trophy notifications shouldn't cancel the pad interception during proper dialogs","sha":"3ea94c286bc299db2d901b4f414af9f8ec328408"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-10T11:30:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-10T19:02:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Properly release dma resources.","sha":"7989de9d169c3ed52f0aa9dd17ed9cf70c91c20a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T19:37:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T19:42:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fatal errors: concatenate multiple args after --error\n\nIt should fix error dialogs on Windows since it decomposes the arg string.","sha":"656db6c6687d7df84b6c8a11aeaebadf4775b955"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T19:58:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T20:00:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve Stop Watchdog\n\nMake it less possible to interfere with the debugger.","sha":"92eeec39b71ad87a668cf58bf73026e4e51dd519"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T20:23:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-10T20:23:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix thread_base::finalize (and emergency_exit, collaterally)\n\nForgot to reset futex callback. Could cause crashes.","sha":"6bd96a4590aa2050cc53eff0867d6426a9d82732"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-11T09:45:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-11T13:29:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Change texture cache memory management for disposed textures\n\n- Use global resource manager instead of using the 2-frame hold behavior.\n- Fixes high VRAM usage in some games","sha":"47bbfdd2aaab3efc764c5104586c4a5f39dbed7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-09T16:18:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-12T13:03:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Disable exception handling.\n\nUse -fno-exceptions in cmake.\nOn MSVC, enable _HAS_EXCEPTION=0.\nCleanup throw/catch from the source.\nCreate yaml.cpp enclave because it needs exception to work.\nDisable thread_local optimizations in logs.cpp (TODO).\nImplement cpu_counter for cpu_threads (moved globals).","sha":"04dedb17eb758feba19ceb3abaad5cdb1ba50074"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-12T13:04:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-12T13:04:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove -fno-strict-aliasing\n\nIt was added due to miscommunication.","sha":"d802b3d8b2fed810f4dd50688fc9cd1a4f79b444"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-12T09:32:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-12T18:43:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"evdev: Some random cleanup","sha":"9c5da55dca9a028905489f5c632e4af1b3766ee4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-12T09:37:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-12T18:43:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"evdev: remove unused call to update_device","sha":"e7adef9fe1437599a5825fab70062624a6ba9e1c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-12T13:33:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-12T18:43:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"evdev: add more buttons to button list","sha":"f0edcc16fe5258620759958e5f0bbe24db4e0eee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-12T19:29:58Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-12T19:29:58Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: Fix MTRSX deadlock (#7766)","sha":"7e9dbeff7b15e70ba82afa18a438a5931c432a64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-09T19:06:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-12T20:36:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"rsx capture: Fix exceptions handler, fix tiny race condition on capture new capture","sha":"c04abac63029372c30183e3c50edb1f8ee0f0970"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-12T19:19:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-12T20:36:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI/rsx capture: Disable capturing if no game is running!","sha":"28e9cade2cf9899e7cd34190fa39a7372caafd13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-12T19:22:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-12T20:36:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"rsx: Fix initial boolean state of m_textures_dirty and m_vertex_textures_dirty","sha":"f3877d11e8a5f7642f1008f4d3f68fa1988e893b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-13T17:58:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-13T19:06:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix potential MTRSX deadlock in case of a race condition","sha":"2ae83782e181ee1c1e745a41b82171adc87605b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-09T18:18:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-13T19:43:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: refactor param error 70 checks\n\nAlso extend the check to check empty name.","sha":"fdf47f43d8be7a91869838e7fbde96ddabf917e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-12T16:46:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-13T19:43:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: funcFile fixes\n\n* Allow '_' at filenames start and extension.\n* Check if reading offset is valid, fix error code to CELL_SAVEDATA_ERROR_FAILURE.\n* Don't create empty file on error of write ops.\n* Don't allow \".\" and \"..\" filenames on funcFile, return CELL_SAVEDATA_ERROR_BROKEN.","sha":"54af8ec54483b11c4b17c8bac6fbbc28fa46d6a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-13T13:01:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-13T19:43:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Add some listSet error checks\n\n* Check listSet->fixedListNum.\n* Check listSet->fixedList for nullptr and its directory items names.\n* Check listSet->focusDirName for nullptr and directory name.\n* Check listSet->newData->iconPosition.\n* Check listSet->newData->dirName for nullptr and directory string.\n* Check statSet->setParam->parental_level for old sdk.\n* Return an error if listSet->focusPosition is NEWDATA and listSet->newData is nullptr.\n* Simplify savedata directory list selection.","sha":"d58f52ff31ed7f72c0bca6595ae3470f30f5bbe2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-13T14:36:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-13T19:43:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Fixed savedata lock after fmt::throw_exception","sha":"b21b4faca809c31c0fe4fc40b04196746abfaa4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-13T15:34:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-13T19:43:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Filter directory lists to allowed savedata directories\n\nFilters \".\" and \"..\", as well as possible wrong directories added by the user.","sha":"5d78d81c003c9088732d7c622b488dc246cb6da9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T09:18:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T09:34:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS: escape multidot names like ...","sha":"0c65a1721daf61f6cbfd9ac1b6eae66dbbb92b22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T09:59:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T10:15:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS: fix out of range problem in vfs::unescape\n\nAlso improve unescape with \"！\" allowing any character","sha":"bf957a575c9134732718906b9271a9d87972a561"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T10:33:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T10:33:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS: Fix possible out of range in vfs::escape","sha":"6c234b48ce5834d054fd1cdc18914df3e125a26e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T11:25:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T11:25:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS: fix vfs::get\n\nEscape each path element separately.","sha":"6a8f5e6b383a38936c1f3324dde49f1d51dcf823"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T12:07:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T12:07:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS: improve vfs::escape (escape NUL, LPT, COM...)\n\nWindows legacy trash.","sha":"70cd8afafa4fa64e261dcbf85338d39234bb1fce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T13:01:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T13:01:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS: clarify escape/unescape cannot work on paths\n\nWith recent changes, it can only work with file or directory name.","sha":"9176ca084c0ab564fff7fd3fcc0be53286d3b44f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T06:20:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T13:12:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: return ERROR_FAILURE on funcFile deletion failures","sha":"88ee198d78cd280c86282ff5599e77141a90e8f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T06:44:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T13:12:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Fix adding file entries to PARAM.SFO on error","sha":"db71d4852abdd4f089ed59a7d3c51d96b8bb0682"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T08:00:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T13:12:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU Disasm: Fix branches spacing\n\nNull terminator was added at the end which prevented proper spacing.","sha":"ff341fe59709ea9a5aa6e170efe2c5687fd3f27c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T09:00:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T13:12:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: do not allow to read/write/delete system files in funcFile\n\nReturn param error 70 as realhw in this case.","sha":"c3d36940c755ddb43d8e6d7cc8f34c054e89d620"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-03T20:39:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T16:30:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"sys_ppu_thread: Make PPU id removal after exit atomic with descheduling\n\n* Make PPU id removal after exit atomic with descheduling\n* Make joining thread scheduling atomic with thread exit sleep.\n* Update sys_ppu_thread_stop/restart.\n* Add idm::remove_verify.","sha":"efe6e1eb0a04dda4c256235dd788c3039451bf67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T11:27:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T16:30:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"idm: Fix minor race in cellVdecClose, sys_raw_spu_destroy...\n\nBecause of racing removal of IDs vs the shared pointer owned object","sha":"c16124f0d97f8bb025d5d8f0174e13e3c7ee7920"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T14:17:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T16:30:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"PPU Disasm: Fixup BCCTR after #7775","sha":"83a2204f8762ed6b42831d2173cad7f14edae9d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T14:29:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T16:30:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"vm: Log all guest memory bases at startup","sha":"cb4192bce93f6987910107aeda2f3ae7b2eee5fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T17:11:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T17:26:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"PPU Disasm: Fix non-link extended BCCTR forms","sha":"74c05ec5ee5062d9d31061df04870f6e5b8124e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T17:24:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T17:26:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"Minor idm::remove_verify usage optimization in sys_interrupty.cpp\n\nAvoid copying a shared ptr, create a weak ptr instead.","sha":"4e6934c9dc6977b18d3e4ed0605590163ea09f1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T17:06:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T17:36:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: minor fix for ppu_join_status::max\n\nDon't treat it as special \"invalid\" value.","sha":"45389dca51764f59ba7c6bb67afb89bd77b53e6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/57449001?v=4","date":"2020-03-14T17:45:41Z","email":"57449001+riotflowerpew@users.noreply.github.com","login":"rpomykala","name":"Rose"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-14T17:45:41Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"[UI] Grey out AA and Aniso settings under strict rendering (#7773)\n\n* Grey out AA and aniso under strict rendering\r\n\r\n* Сhange aniso UI string to 'Auto'\r\n\r\nCo-authored-by: Ivan <Nekotekina@users.noreply.github.com>","sha":"231e837f9b157185a23054a7e31f1447c8abd357"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T19:50:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T19:50:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Try to re-enable Azure Pipelines for PRs","sha":"11d5bd345225525ad721f2e1c18609c57d6b120a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T20:07:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-14T20:07:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Disable failing OSX build on travis\n\nSince we have Azure maybe someone will have better luck with it.","sha":"a0612ff4a7cd5ade10276d2e6f1dce227a2b0f0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-14T20:47:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-15T06:53:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix unknown Blend equation","sha":"377e06a4a297a4035c22c797383b9217c4348011"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-14T19:42:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-15T13:51:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement cross-aspect slice gathering\n\n- Fixes a data leak that can happen when a surface is rejected due to aspect mismatch.\n- Mismatch can lead to rejection due to area covered excluding the RTT and inevitable upload a texture from CPU at the same location.\n- Overlapping fbo/shader_read resources are not allowed.","sha":"a756c0679e0de81b5ba07c39686ba37c9ea42b7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-14T20:23:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-15T13:51:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve section scanning when updating surface cache resources in blit engine.","sha":"7025985c0d2b07dac2919fdbb2fa4ada0fe4fd7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-10T11:05:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-15T15:39:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vk: Lazy evaluate renderpass scope\n- Spamming the driver with renderpass open/close cycles is bad for performance.","sha":"d25ba03e82c2f386568303015b67f2a451cf197e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-15T14:49:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-15T17:41:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"log: properly escape all html except newlines","sha":"33d01fd2526f82cb5af0de3fd5b9c0fa0101a377"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-15T06:10:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-16T18:06:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_raw_spu_destroy","sha":"9e14e835e718aa3d07333f7721742fd2fc051f28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-15T10:42:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-16T18:06:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellVdecClose: Followup fix to #7663\n\nAvoid executing sys_interrupt_thread_disestablish on different ppu thread with the same ID.","sha":"7e224c5585e6e980889cd8f8db172eb88c85d8a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-15T10:49:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-16T18:06:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add missing lv2_obj::sleep when joining interrupt thread","sha":"3566faabd94cf043a6272561f8307c746b521ce2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-16T13:56:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-17T15:22:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"lv2: Uncomment sys_ppu_thread_stop/restart","sha":"00d25a191b2de0af8036abc5f606cd207ae5655c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-16T14:55:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-17T15:22:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add return value of sys_ppu_thread_yield","sha":"664d606123b79d0553fb046a02ce83c12382b7ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-17T03:08:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-17T15:22:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_spu: Fix oops in sys_raw_spu_destroy after #7782\n\n'id' is not the idm id, also explicitly join the thread so a situation where the thread is still active and communicating other threads (e.g via MMIO or MFC) yet its ID is removed won't happen. (logic breakage, destroyed thread can't be  active)","sha":"a9f492b605e8e18966a632169c0399e4d75986c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-17T07:59:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-17T15:22:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Log sys_lwmutex/sys_lwcond names as strings\n\nUse std::string_view instead of creating a temporary NTS string when reading object name.","sha":"03a6d67c6c63ea29ad04199d44975b7cf9fd73a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-17T13:05:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-17T15:22:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"BEType.h: use common initial sequance in v128\n\nPartially obey 'strict type aliasing' rule.","sha":"c9b5ba4a5c7eab652c6685eb0cdee0b4af1489fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-03-17T05:31:41Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-18T08:38:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Change default audio backend on non-windows\n\nFAudio is preferred, but if we didn't build with FAudio, we default to OpenAL\nAlso changed it to explicitly use xaudio backend on windows, rather than the static cast we had before.","sha":"2678ac638288b04664b1079b85a81c266709abe4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-03-17T05:54:47Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-18T10:07:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Build rpcs3's AppImages with link time optimization\n\nOn the clang build we now link with lld, and on GCC we now link with Gold","sha":"6ec149d8f5b2a60a9d8926d6767c1be9c5c675fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-17T17:10:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-18T15:28:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU profiler: minor change\n\nUse std::greater to sort","sha":"20f7544a8a7366742ad1c46e992327a86ff57658"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-17T17:10:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-18T15:28:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: print current chunk hash in dump","sha":"6a2571d0e1a350e27b0f40f621f4c559736f2f47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-18T15:27:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-18T15:28:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Cleanup std::is_pod usage (deprecated in C++20)","sha":"aa5c6c4d2b2c04c797d9fe5dc9ad247e5dd1a8c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-18T14:47:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-19T03:45:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix lv2 sys_lwcond/sys_lwmutex kernel explorer names","sha":"7be35315da90789c55bbf5731f5c544286a10291"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-18T19:44:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-19T03:45:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor fix of sys_ppu_thread_yield return value\n\nAccount for a special case where threads were rotated but no context\nswitch was made.","sha":"b11e8f8b8d40e8c2b6fabbb40061d27f3490fec3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-03-18T06:43:46Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-19T03:47:16Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU LLVM: Improve VMADDFP and VNMSUBFP\n- Use native FMA to emulate VMADDFP, with a fallback for processors that don't support FMA\n- Use native FMA to emulate VNMSUBFP as well, but note that it differs from the emulated path with regards to negative zero","sha":"0bfdc1f62e1fd027e8fe638260fb8d5a10af8859"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-19T03:55:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-19T04:22:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix bug introduced by #7797","sha":"7139c4fbab299d3b0a3a51d21108a63d2d54209e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-19T04:52:43Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-19T11:18:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix a segfault in memory viewer\n\nAlso a memory leak.","sha":"e3668cc26cbb61afce7e8802d226f8a46c3816d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-19T05:11:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-19T11:18:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"debugger: Force aligned memory view\n\nFixes a corner case viewing unaligned memory at the end of spu memory.\nAlso unaligned view isn't suitable for the debugger, for these purposes the memory viewer should be used instead.","sha":"fd45bf5fbab66f5e1c3bc6d2aa168957f4a105e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-19T05:17:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-19T11:18:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"disasm: Improve instructions spacing","sha":"f2d6a1ff608773f146395610459636da53a5d27f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-19T05:43:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-19T11:18:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix memory leak in rsx debugger","sha":"a3289e9d40c30790ffa2a2d578c1fc887f0c43af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-19T10:29:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-19T11:18:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Avoid a segfault when reading ppu stack contents in debuggers\n\nTODO: lock vm mutex.","sha":"1dbb5422a2ceba4c5738ce4e60ba5c3b055fa68a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-03-19T07:22:42Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-19T16:20:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Partially revert 6ec149d. Fixes #7799\n\nTurns out linking with LTO still doesn't play nice with Qt.\nFor reference:\nhttps://github.com/InBetweenNames/gentooLTO/issues/444\nhttps://bugreports.qt.io/browse/QTBUG-61710","sha":"5ba07ed50f5d49f132c829fa9e1a36ae52ac779b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-03-19T07:49:40Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-19T16:20:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix clang warnings","sha":"27367dc493a0d2a8fc9a51a3cc6102c0c041a465"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-14T21:03:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-19T20:10:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: implement osk panels","sha":"f1127f1894828f3a4d2a77dd464eb9b53daee271"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-15T11:27:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-19T20:10:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays/osk: do not change the preview text on empty input\n\nThis prevents that the placeholder disappears","sha":"a1f70bf96e79a3002e20494b74f4bbe7c64c9fd0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-15T12:53:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-19T20:10:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays/osk: fix full width characters","sha":"c63f77e3b0f4634ae996c2750a40588264c4279b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-15T13:17:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-19T20:10:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays/osk: fix selection after changing panels\n\nWe now try to keep the current x and y selected after panel changes.\nAlso change some copy to ref","sha":"fd8cda0f2b34c89006049b2a78c65181d8a8736b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-19T23:49:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-20T00:43:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix some translation bubus","sha":"eb2dcaf602d7a91ed5c3cf232dd3655e21c98080"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-20T17:18:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-20T18:31:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement thread_state::errored\n\nState after calling thread emergency_exit() function.\nAlso default-construct thread result in this case.","sha":"c577bd21119e84c40820ab0f45c36fe030dcc335"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T07:36:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T07:36:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix thread_base::join","sha":"7f5dd1dd621c164fd0dedc737782509f6d9cc778"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-21T07:26:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T09:37:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix OSK thread exit condition","sha":"9acf8e283d2dcf5920393309265ece6a7e77a43d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T09:38:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T09:38:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update llvm hash","sha":"ebb007ecb4605f3f81c3124e418302739bb5cc74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T10:20:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T10:20:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Appveyor: use previous VS 2019 image (workaround)","sha":"ad552c6b787810de4559fe3ab2d1336cb200867c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T10:49:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T10:49:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Thread.h: fix warning","sha":"49d8731c1c6534cfe44b202fd3108c2ceb2998ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-21T09:45:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T13:31:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Dont spam syscalls stats if emu is paused","sha":"3a36b713ceb347eabe32ac3252fe921a0e1acab9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-21T10:44:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T13:32:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU Precise: Fix FMADDS, FMSUBS, FNMSUBS, FNMADDS","sha":"e1cb8274885ed7e67675876caeaaf674b5d84700"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-20T05:01:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T16:05:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Add CELL_SAVEDATA_ERROR_NOUSER","sha":"fae46bf1940bab35e2a08a580a8e9a8dee717185"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-20T05:39:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T16:05:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Set listSet->focusPosition to LISTHEAD by default","sha":"66916df4ae19669b5825ed86a746e88ff3d38d97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-20T11:05:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T16:05:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Add error checks for cellSaveData(User)GetListItem","sha":"be0e586671390f3410cb5586ae3dcaebe064ab96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-20T11:15:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T16:05:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor fix of cellUserInfoGetStat\n\nstat == nullptr is allowed, fix invalid id error code.","sha":"ae14eb07478162a774a8352262f57b0a944745ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-20T11:15:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T16:05:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Skip directory items in savedata_get_list_item","sha":"b6a288d383bb1ed460e9c9fb5e1c54fe9a435133"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-20T16:39:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T16:05:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Clear traces of setList setup from setBuf->buf, add missing memset\n\n* Always memset 0 setBuf->buf (to bufSize) before funcStat if the direcory is not new.\n* Always memset 0 setBuf->buf (to bufSize) if listGet->dirNum became non-zero (listGet->dirListNum can be zero yet memset still occurs) .\n* Clear traces of setList setup before funcStat (after funcFixed/List, only if listGet->dirNum != 0, callback can hack this value and prevent the memset).","sha":"ceaee0ec6837454e0588ce451b6c36c2ed746483"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-20T18:34:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-21T16:05:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Ensure savedata_context members are 16-byte aligned\n\nI saw stvx v128{0} (aligned 16-bytes store) usage on the first 16-bytes of CellSaveDataCBResult before funcStat in fw.\nAlso I saw 4 stw of u32{0} on it as well before funcFile, funcFixed and funcList.\nSo just add the resets for result before all callbacks, and make all\nmembers of savedata_ontext 16 -byte aligned in case there are more\nmembers guaranteed to be aligned.","sha":"01cafc042d6256648c84a8fd6886f01b62330709"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-21T17:34:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-22T07:57:47Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Properly calculate vertex range when divisor is active\n\n- The upper bound is to be rounded up, not down.","sha":"12044bd8b0b66fd9e84eed9712ccf3b5c1abd1ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-21T21:02:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-22T09:41:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel explorer: Implement ability to view lwmutex owner","sha":"f1cf62ac576b480f8d63520daee9eacaad1a954d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-22T08:35:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-22T09:41:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"lv2: Do not lose r3 data on syscalls\n\nAllows to get the ID of the lv2 sync objects in the debugger by looking at r3's content.","sha":"dc839e1784398b2bfd48cd0bd4893dca901203a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-22T08:44:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-22T09:41:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel explorer: Add information about memory containers","sha":"132c3e1c1ad8ec067f714d0cda956cb2fdebf721"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-03-13T17:34:08Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-22T10:48:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Replace QNetwork operations with libcurl + wolfssl","sha":"b1d8bf754e63fe988e6ac0e9642e112ffa4dc097"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-21T21:17:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-22T10:48:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix curl threads","sha":"09a897478639e42c51f4216f69a4844d45883370"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-03-21T23:26:40Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-22T10:48:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove Qt5Network Qt5OpenGL and Qt5QML dependencies","sha":"af4efafae195dab20ff218eb882be21b350c0458"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T10:11:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-22T11:13:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: use QDateTime in update manager","sha":"7d33ca70590c730e43324e0196ce0d986dac9280"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-22T09:23:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-22T11:13:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Memoize and print r3-r6 under Current function in the ppu_thread::dump()","sha":"e606130262ddfc053260c8732e4e2132eb4b4505"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-22T11:10:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-22T11:13:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CURL_STATICLIB macro cleanup\n\nAlso move includes from headers. CURL is just void.","sha":"52618864491377fff1826a95bef59a04db749f6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2019-11-20T15:53:22Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-22T12:51:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: Copy with memcpy() instead of hand-rolled SSE2\n\nIn some very unscientific benchmark:\nspu_thread::do_dma_transfer() was taking 2.27% of my CPU before, now\n0.07%, while __memmove_avx_unaligned_erms() was taking 1.47% and now\n2.88%, which added makes about 0.8% saved.","sha":"425e032a62fee3ed295454bf20c8be0252de9d3b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T15:15:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T18:16:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: use Localized::GetVerboseTimeByMs","sha":"13e166084d7aea91968dfa3c5c203db5d01e481f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T13:49:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T18:16:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: show welcome dialog before showing the app\n\nFixes interference with update manager","sha":"532215fb81a1024c94e6ef5e1f918654cccc40d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T13:58:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T18:16:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix log message in update manager","sha":"7f8d802bd51c22898a48f9e036af9151f3c5b621"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T14:09:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T18:16:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: simplify current_build in update manager","sha":"da09badd8d07e84955a27be58acfcac3b9e773e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T16:53:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T18:16:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix double slash in updater tmp_folder","sha":"3c63db93edec58febbe2d16b67b602efbdf74c22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T16:49:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T18:16:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: use simple curl wrapper to avoid some pitfalls","sha":"b447e6f55dd19c8fbbfc666ea14d6193b44160f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T21:32:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-22T22:40:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Add basic screenshot manager","sha":"ef10ed4499e8791c78477fe0b83aa79a0fa79863"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/462213?v=4","date":"2020-03-23T01:55:03Z","email":"sl1pkn07@gmail.com","login":"sl1pkn07","name":"sL1pKn07"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T04:23:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix build with Qt 5.15+","sha":"9de9ec1f01ae89d8c71a42cebbd5f1d6dd32aed5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-23T07:30:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-23T07:30:17Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_lwmutex/lwcond: track lwcond waiters (#7826)\n\nIn lwmutex destroy syscall, wait for pending waiters.","sha":"cccc32fa9daedc70962dac0c5a922cb428b0484c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-23T07:51:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T07:59:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor fixup after #7826","sha":"017ef5a94eae496a34773f6bf71bdc7249a05989"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-23T08:35:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T08:54:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Another fixup after #7826","sha":"537f175f52644cb5103a0dd5d8fdf31414771bf2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/37698908?v=4","date":"2020-03-23T08:37:16Z","email":"37698908+illusion0001@users.noreply.github.com","login":"illusion0001","name":"illusion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T09:23:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[README.md] Update to Visual C++ Redistributable 2019","sha":"a0509328d45da7a905e7e0c9e82047ad00b38b1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-22T10:20:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-23T11:47:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: Refactor draw call handling and stub shader interpreter\n\n- Refactors backend draw call management to make it easier to extend\n  functionality.\n- Stubs shader interpreter functionality.","sha":"4965bf7d7a0d354d32c1f180d7d315b141f39274"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T11:38:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T11:48:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Workaround for VS 16.5\n\nStrange codegen bug didn't promote s32 to u64.","sha":"5ebc538d7e7787f3b1b3022afe704a4599035afb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-23T11:39:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T12:10:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellGem: fix move_handler::mouse left click","sha":"1537f505a5210ca58a6a79bbdd3684b81a9e5c94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-23T11:22:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T18:37:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"_sys_lwcond_signal: Make mode 3 respect ordering of the sleep queue","sha":"3de41bfea7c7f27f4ca39469f7d2c59089c455f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-23T11:37:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T18:37:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor warning fixes","sha":"08e66ab14cf26cfb125535f03a8a530c8df0e890"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-23T16:24:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T18:37:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"liblv2 HLE: Fix sys_lwmutex_lock assertation","sha":"52360b3f98fbe15af8dfd0cad3123b9e89253a67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T19:18:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T19:18:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Debug: measure initialization time (before main() function)","sha":"3d78694590691bbbdf94c93e9289aa0d66b4f32e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T19:49:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T19:52:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Auto-Updater: increase lock file waiting timeout in the case of updating\n\nNormal case: timeout reduced from 3s to 2s.\nUpdating case: increased timeout to 10s.","sha":"19e20d9c199d77da08455dd678a9299f07eac84b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-23T19:37:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T20:18:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make sceNpDrmProcessExitSpawn(2) execute sys_game calls correctly","sha":"2aff36647a4f6bd267d74c75ac6ec8728126d112"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-23T19:39:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-23T20:18:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"_sys_lwmutex_lock: log new case of ESRCH","sha":"eb1de04ca85c8919ecaabcfc1da5c6c8d73a9aec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-24T08:40:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-24T09:18:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make spu_decoder<> objects constexpr","sha":"a936533eb1e067c75a18665d8494d0771dde70c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-24T09:27:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-24T09:28:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Roll back to VS 16.4 on Appveyor\n\nWorkaround VCRUNTIME140_1.dll dependency.","sha":"ecb6d3845110327f277551abcba9d2dbdd1177db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-24T10:09:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-24T10:46:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make ppu_decoder<> objects constexpr (partial)","sha":"1ceb779a38a0eed1f4533b75c6760bdd7334bf2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-24T14:57:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-25T02:54:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays/osk: add more panels","sha":"fd3522436a9a494cec888dd0e9c7848316afcfea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-24T17:07:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-25T08:18:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Finalize constexpr ppu_decoder<> thing\n\nMove SSSE3 checks to runtime in PPUInterpreter.cpp","sha":"471db3219db9a4b002f76f0dd0dde27a5e7cd72c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-24T18:12:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-25T08:18:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement SAFE_BUFFERS as __attribute__((no_stack_protector))\n\nIt was doing nothing outside of MSVC. Still seems doing nothing.","sha":"b33648fd14dc1990bd3a16df392b3cc6fb922331"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-25T08:23:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-25T08:23:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix \"Unknown option: updating\"","sha":"89514c043a82c659087cd81c6859ad4e074807c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-24T19:56:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-25T10:50:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: move open_dir to qt_utils","sha":"bd49ad358c8c1cb5868cec01211f7f78f485adf9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-24T20:10:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-25T10:50:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add open file location to screenshot preview\n\nRemove duplicate slash from screenshot path","sha":"f27de28ee9709586c6a3a42ca996b59db096e08a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-24T22:24:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-25T10:50:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add naive lazy loading to screenshot manager","sha":"844f9683ec8c88a08eb3a476c00cabeb1edc4a16"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-25T01:58:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-25T10:50:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix mem leaks in screenshot and save managers","sha":"a11c77c009d9dc39249af90d3a4399fed04a0a64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-24T08:17:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-25T13:22:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_prx: Implement sys_prx_get_module_list","sha":"717dd1625c3dc17b6f992e7324611cd448c29d4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-24T11:56:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-25T13:22:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_prx: Improve sys_prx_start/stop_module\n\n* Add missing error codes, \"internal\" errors are ones which are not reachable from liblv2.sprx functions\n\n* Implement SYS_PRX_NO_RESIDENT (unloading module) for _sys_prx_start_module.","sha":"e1f2f3f081e48e2dcbd8fba7476903e5bf9d0fd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-24T12:55:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-25T13:22:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_prx_unload_module: Implement CELL_PRX_ERROR_NOT_REMOVABLE","sha":"150d1bcdd5081f71444a39c725288ee8841a8eb2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-24T09:47:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-25T14:51:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Improve NV308A_COLOR\n\n* Fix NV308A_COLOR methods range.\n* Batch NV308A_COLOR methods execution together.\n* Fix termination of bind_range<> in rsx methods binding.","sha":"768b4f8c65553c041ed163e018a6db26f0694976"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-25T08:10:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-25T14:51:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Reset all method registers at rsx_state::init()","sha":"158e34faca4baa8b3a25efb0379c38b7aba0fbeb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-03-25T14:29:26Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:21:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[MSVC] Move libcurl and wolfssl project files\n\nlibcurl and wolfssl were moved to rpcs3 source control to make buildsystem changes easier.\n\ncommon_default.props and common_default_macros.props included to project files.\nInt and Out Dirs changed to default:\n<OutDir>$(SolutionDir)lib\\$(Configuration)-$(Platform)\\</OutDir>   <IntDir>$(SolutionDir)tmp\\$(ProjectName)-$(Configuration)-$(Platform)\\</IntDir>","sha":"d26c465911aee327fb69a07aa08909e7226388b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-03-25T14:31:23Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:21:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[MSVC] Added common props to llvm and glslang\n\ncommon_default.props are now imported when building LLVM and glslang via MSVC.","sha":"3b9f419859f23e3f6eb9ba52bbf673af66f7f5e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-03-25T14:37:15Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:21:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[MSVC] Disable exceptions and spectre mitigation in common_default.props\n\nDisabling exceptions in common_default.props ensures that all projects do not use them since not all projects import rpcs3_default.props.\n\nSpectre mitigation is disabled by default unless WDK is installed so this is more of a just in case measure since rpcs3 does not need it.","sha":"70f1302fa7d4565fc423a7a8e39dfb9dd912721f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-03-25T18:04:15Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:21:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix curl","sha":"e58fa7d51f01528d86d4f4c0430c2b6787ef5c96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-03-25T18:26:14Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:21:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"static RT","sha":"ec4287cbd37e1ed0e85f8df45a7df0a2904daf09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-03-26T11:07:50Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:21:53Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[appveyor] Update glslang and LLVM links","sha":"433a21286a913fef35f2f77fa1d4e08cca1359bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-26T07:05:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:22:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Implement basic infinite FIFO desync detection","sha":"38c8dd98b43db9a6b8a94f1b9804a562fdf01b04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-26T08:49:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:22:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Log IDs of loaded prx modules","sha":"ccc7cb7994a1f44d2f35ba4055a23aabf88a106b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-26T10:21:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:22:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU LLVM: Log unsupported relocation opcode","sha":"453478c98b76a3a8463d62b7c27ff27789ab936e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:23:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:26:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"spu_iname: refactor to use actual strings","sha":"8d1a9dce9155847ded801891412b6be519710a9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:26:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:28:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"ppu_iname: refactor to use actual strings","sha":"fa29c5aa94dfe07d4e544a393499441011ceb651"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:29:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:29:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Adjust llvm hash (affects nothing)","sha":"15a36bb844331a9fc1546ed53b0cbc2fd095b936"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-03-26T12:31:15Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T12:56:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[MSVC] Remove unnecessary configurations and properly fix curl","sha":"30a8cadf6088b7b2230ff8168b0c861e91daba72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T13:48:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T13:48:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Return Appveyor to VS 16.5","sha":"214a3ba21b56625af110f482ce9028c001cc140e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T13:53:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T13:53:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix windeployqt command line for release builds","sha":"a5ba4a18dfed96a24e98c512013322aae385559e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-26T13:01:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T14:52:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU LLVM: Add relocation 5 for ADDIS\n\n+ Add some more for u16 relocations (4, 5, 6), simplify logic.","sha":"7ed570dc4af44013f4e5fc59843ced9d53221904"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-26T13:57:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T14:52:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: More strict infinite desync detection\n\n6 desyncs per second for 1.5 seconds is pretty bad already.","sha":"9d971e3b07dca25cff8af233ae4954a5de011b6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-26T14:40:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T14:52:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"liblv2 HLE: Fix entryx of start/stop prx functions","sha":"36d8553f9c1f5bd47dbb0da3e4616cf0b9caabbd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T15:32:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-26T15:32:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix PS1 game_path\n\nDon't assume local path has '/dev_hdd0' in it.","sha":"17a9ce6fb9236bef24f3ed1bb3ce7b7df761ae85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-03-26T17:03:00Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-26T17:03:00Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"System/Load: Handle PSP Remaster (#7857)\n\nThis just makes RPCS3 execute PSP Remaster games through \r\npsp_emulator.self\r\npspemu does not work yet, so the boot will fail, but at the least it \r\nstarts loading","sha":"e8177906e7e2aa0473d8a735a114b9b766bb4a98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2020-03-27T00:33:07Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-27T00:33:07Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"cmake: Fix windeployqt command line for release builds (#7871)","sha":"a2bf0719ea4fa62a16c50eb24cd5eaa4bb2ecf42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10439488?v=4","date":"2020-03-27T07:34:13Z","email":"10439488+dio-gh@users.noreply.github.com","login":"dio-gh","name":"dio-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-27T07:34:13Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Update building instructions (#7872)\n\n* Update building instructions\r\n\r\nMakes the link for the prebuilt LLVM point to the `_mt` version now, since the previous one will fail to compile on latest.\r\n\r\n* Update glslang link\r\n\r\nReplaces the outdated not-shady-at-all link with the new, shiny and correct one.\r\n\r\n* Fixing a 'the'\r\n\r\nFixes a 'the'.\r\n\r\nCo-authored-by: Ani <ani-leo@outlook.com>","sha":"2aac46efcc167a6f1d42ffa428d47dc040113b03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-03-26T20:48:56Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-27T11:23:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Gives ANSI path to curl CURLOPT_CAINFO","sha":"cd4eed0704b91f8beba9f5b21e6296891cd44114"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-03-26T20:10:24Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-27T12:26:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"hle: cellSysutilNpEula\n\nAdd missing function names and stub all functions\n\nCo-Authored-By: Eladash <elad3356p@gmail.com>\n\nCo-Authored-By: Eladash <elad3356p@gmail.com>","sha":"c00ee7ed5b0210ba152f4006d9bdbeb9ffba0eaa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-03-26T20:13:53Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-27T12:26:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":".gitignore: Ignore cmake autogen libusb files\n\nCo-Authored-By: Eladash <elad3356p@gmail.com>","sha":"96185af64f5e0c894e9344a4bc05e99d0fe2d07d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-03-27T13:37:27Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-27T13:37:27Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"CI: Port Windows build to Azure Pipelines (#7757)\n\n* CI: Port Windows build to Azure Pipelines from Appveyor\r\n\r\n* CI: Split Windows build into scripts\r\n\r\n* CI: Remove Appveyor\r\n\r\n* CI: Add GitHub Release deployment to Azure Windows Build\r\n\r\n* VCS: Add full branch name function to rpcs3_version\r\n\r\nThe STRINGIZE macro was a little awkward, and difficult to control\r\nat configure time. Since other version information is already\r\nincluded, the full branch name is now added as a function. It's\r\nruntime instead of compile-time checking, but it seems worth it.\r\n\r\n* CI: Overhaul Windows setup script\r\n\r\nPreviously, there was no way of forcing a re-download\r\nof cached dependencies when they were replaced by new ones. In\r\naddition, there was really no verification of downloads or cache.\r\nNow, changing a few lines at the top of the file will automagically\r\nforce a cache update.","sha":"70d6a128942569b533b18eb7c678f6f0e80eff83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-03-27T15:26:41Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-27T15:47:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"azure: Fix win releases repository","sha":"4e28aa4681537054b53f65971b9055aee4693f29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-03-27T16:18:21Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-27T16:21:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Change target to the correct commit SHA on RPCS3/RPCS3-binaries-win side","sha":"d6258fce54387e19679ca2c927af34c7695ed8a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-03-27T19:11:16Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-27T20:00:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Build: Do not warn for local builds","sha":"6712ac0a726efe55637f9747e6faf332d913ed2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-03-27T19:44:10Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-27T20:00:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CD: Fix experimental build warning for Travis","sha":"f5a51599d9bf31559065d850603e2e233dd85d87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-03-28T00:49:31Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-28T00:49:31Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"build/cmake: add option to use system-wide libcurl package (#7882)","sha":"58492ef92d441a8bc57844f7891988cca483972f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-03-28T01:57:41Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-28T01:57:41Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Implement IsDebuggerPresent on BSDs (#7880)","sha":"777f0a7c829b269f5af24012005e8e8c9acd209b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1712979?v=4","date":"2020-03-28T02:46:48Z","email":"dsdominykas@gmail.com","login":"xddxd","name":"xddxd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-28T02:46:48Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Rename current_instrution to current_instruction (#7883)","sha":"d96dabcd60933f893049fd4e001e1c186008901e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-28T03:16:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-28T03:16:59Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"lv2: Wait for rescheduling before confirming timeouts (#7875)","sha":"66bd8308d9f0d70116298b880db4f2cbe04d922a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/17715080?v=4","date":"2020-03-28T03:27:37Z","email":"asfix1@hotmail.com","login":"Yahfz","name":"unknown"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-28T06:42:13Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"RSX: Restrict analyser loop error","sha":"049825812eb84686f316b624ed25cb1d9dd41ac9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-28T07:24:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-28T08:07:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix typo in NV4097_SET_TRANSFORM_PROGRAM range","sha":"4215499b7faf1da62f89dbc29f91cfa92cbf0c47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/37698908?v=4","date":"2020-03-28T10:38:38Z","email":"37698908+illusion0001@users.noreply.github.com","login":"illusion0001","name":"illusion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-28T10:38:38Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"readme.md: Fix Azure Badge URL (#7888)\n\npreviously leads to RPCS3.glslang instead of RPCS3.RPCS3","sha":"c2a24fd047cdbce94d102bdd5dfdac51e49ec7e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-27T11:20:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-28T14:17:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: log hash in some places","sha":"9db088e17bdcaf81cf21ad325b7764dc407b9164"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-28T08:05:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-28T14:17:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"named_thread_group: add a default constructor","sha":"aae338a91c5de7e78d6b2280c008afdfd61838c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-28T08:06:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-28T14:17:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: runtime multithreaded compilation\n\nActive for CPU with 12 or more threads.","sha":"dcc269128fe34eaa56d79158e96413fe20fa652b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-28T14:21:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-28T14:21:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CMake: add /MT for MSVC","sha":"cba9ed3527ca88e821bc2235981bc42290330091"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-03-29T02:54:45Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Whatcookie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-29T02:54:45Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix alignment on embedded spu elf searching (#7894)\n\n- They are actually 128 byte (1024 bit) aligned.","sha":"cc100f40085fc6ee5ff1b7a294ffe71e69618adc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-03-28T00:19:44Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-29T11:10:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CI: Add workaround for exporting variables in Azure\n\nUsing '-x' to echo commands in the shell causes\nthe Azure process commands to be processed twice","sha":"8581a2775af56d2e965b9d035ef4b5a399272a6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-03-28T00:21:04Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-29T11:10:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Build: Fix potential issue with Windows builds not receiving correct\nbranch info","sha":"ad13075b365c307d4d1089ec10c4312d1fefa0c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-03-28T20:13:55Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-29T11:10:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CI: Update Azure cache task to newer version","sha":"6d32ebeccaab010cea74f6a07d5abf8199892fe8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-30T04:53:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-30T04:53:17Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_net: Fix access violation handling (#7901)\n\nShould fix page faults notifications on unmapped menory on Gran Turismo 5.","sha":"019aae8bec39a4bc2a031391f70262df0d060a0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-03-30T00:09:35Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-30T08:52:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add more headers for non-Vulkan\n\nrpcs3/rpcs3qt/emu_settings.cpp:111:44: error: use of undeclared identifier 'g_cfg'\n        for (const auto& v : cfg_adapter::get_cfg(g_cfg, begin, end).to_list())\n                                                  ^\nrpcs3/rpcs3qt/emu_settings.cpp:262:60: error: use of undeclared identifier 'Emulator'\n        fs::create_path(title_id.empty() ? fs::get_config_dir() : Emulator::GetCustomConfigDir());\n                                                                  ^\nrpcs3/rpcs3qt/emu_settings.cpp:276:39: error: use of undeclared identifier 'Emulator'\n                const std::string config_path_new = Emulator::GetCustomConfigPath(m_title_id);\n                                                    ^\nrpcs3/rpcs3qt/emu_settings.cpp:277:39: error: use of undeclared identifier 'Emulator'\n                const std::string config_path_old = Emulator::GetCustomConfigPath(m_title_id, true);\n                                                    ^\nrpcs3/rpcs3qt/emu_settings.cpp:308:17: error: use of undeclared identifier 'Emulator'\n                config_name = Emulator::GetCustomConfigPath(m_title_id);\n                              ^\nrpcs3/rpcs3qt/emu_settings.cpp:319:21: error: use of undeclared identifier 'g_cfg'\n        if (config_name == g_cfg.name || m_title_id == Emu.GetTitleID())\n                           ^\nrpcs3/rpcs3qt/emu_settings.cpp:319:49: error: use of undeclared identifier 'Emu'\n        if (config_name == g_cfg.name || m_title_id == Emu.GetTitleID())\n                                                       ^\nrpcs3/rpcs3qt/emu_settings.cpp:322:3: error: use of undeclared identifier 'g_cfg'\n                g_cfg.from_string(config.to_string(), true);\n                ^\nrpcs3/rpcs3qt/emu_settings.cpp:324:8: error: use of undeclared identifier 'Emu'\n                if (!Emu.IsStopped()) // Don't spam the log while emulation is stopped. The config will be logged on boot anyway.\n                     ^\nrpcs3/rpcs3qt/emu_settings.cpp:326:51: error: use of undeclared identifier 'g_cfg'\n                        cfg_log.notice(\"Updated configuration:\\n%s\\n\", g_cfg.to_string());\n                                                                       ^","sha":"afce3ee2ed178141922ebf27b25c055555d5dd2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-29T19:53:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-30T11:22:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_rwlock_wlock timeout event","sha":"1510505b303cf928959f892fb3d5c84396eb4772"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-31T04:12:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-31T04:12:30Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Implement DECR memory layout (#7906)","sha":"29be8153028de62eb143c58f3203e8340eef6e9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-31T13:44:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-31T13:44:50Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Some typos (#7908)\n\n* sys_lwcond: replace writer lock with reader lock\r\n\r\n* sys_rsx: Typo fix\r\n\r\n* sys_net: Fixup for buffer reading","sha":"fdd7f0645dfd195652f03ab899d6ce82eb58f134"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-28T14:25:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-31T16:06:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"change sig_log to SIG","sha":"a76a4d81369d08f9eaec058d0666f2fafd3524d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-28T14:26:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-31T16:06:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"add missing files to visual studio project","sha":"28bea14d7218f7875b0c0c2fa069765e228fd835"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-30T10:02:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-31T16:06:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"add cacert.pem to gitignore","sha":"f079eb402616991d6e25c00fc0e40eef610fe8c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-30T12:00:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-31T16:06:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"set key_vault log spam to trace","sha":"d6b8213c9f4f2a6b06a654a0db645709d5293baa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-28T14:28:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-03-31T16:06:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Emu: make \"Silence All Logs\" dynamic","sha":"fc3a134e7d6148f388b31ac7237921290511d20f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-31T17:01:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-03-31T17:01:10Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PPU LLVM: Add FMA accuracy setting (#7874)\n\n* PPU LLVM : Match PS3 for the instructions fmadd, fmadds, fmsub, fmsubs, fnmadd, fnmadds, fnmsub, fnmsubs\r\n\r\nCo-authored-by: doesthisusername <yfirestorm@gmail.com>","sha":"92f821aeb101beee9b6ce092384ba0ce69e75181"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-31T16:31:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-31T17:53:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Avoid query log spam if no program is loaded","sha":"b327e329d6291d2db315924bce993560eaf07f06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-31T16:19:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-31T17:53:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Remove RADV workaround regarding renderpass barriers\n\n- The situation was clarified in the official vulkan spec to allow this\n  behavior.\n  Barriers are now only inserted by the driver when layout\ntransitions are requested.","sha":"8c847d3a4ba1fb6612e805cdb7cd04625184458f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-31T16:23:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-31T17:53:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Remove NVIDIA workaround for broken partial occlusion queries\n\n- This bug has been fixed in the latest drivers.","sha":"69d90f6fec9f131c2063759ae06da19b95e7c5f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-31T18:50:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-31T18:50:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CFG: minor cleanup","sha":"ba7f4af02b3ad9c304cf0af3894c51ba16663aaf"}
+{"author":{"avatar":null,"date":"2020-03-31T19:00:07Z","email":"61922384+EmulationChannel@users.noreply.github.com","login":null,"name":"EmulationChannel"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-03-31T19:37:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update FW 4.86 Latest Version\n\nUpdates the latest FW version according to: https://www.playstation.com/en-us/support/system-updates/ps3/\r\n\r\n    What's New in Version 4.86\r\n* This system software update improves system performance.","sha":"85c4321c24e76b4afbec611d08fab5798fec4546"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-28T09:53:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-02T17:42:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Batch vertex program load methods","sha":"d97e9f7b4ad8d0ba70374481d33568ba17a554d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-28T10:11:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-02T17:42:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Get rid of invalid_command_interrupt_raised","sha":"2ed370093e2cac291e4250e4d75f280dd030687b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-28T10:17:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-02T17:42:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix and improve fp program data invalidation","sha":"c2c50052789016a65ebde15dd5c9cec9fc2861c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-03-28T10:20:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-02T17:42:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Reset vertex program/constants at each boot","sha":"72c0aed4c1594804ae2b4c60f5f29b374e5275c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2020-03-31T00:11:37Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-03T00:36:35Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"CPUThread: Split dump() info to separate methods","sha":"1231274e0f5c7c10d1c612ca91a0b986e439e3cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2020-03-31T00:45:25Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-03T00:36:35Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt/Debugger: Split register misc state info to separate panels","sha":"9024ba69b46498122c6502b32982863413f0c16e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2020-03-31T00:40:24Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-03T00:36:35Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt/MemoryViewer: Make it vertically resizable","sha":"1113221340df68061f97f404865e4a57b4451b2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2020-03-31T00:46:37Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-03T00:36:35Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt/Debugger: Call Stack panel","sha":"2eea18469d8e24ae89b9014f198a7faead0080b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2020-03-31T00:57:54Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-03T00:36:35Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"PPUThread: String & hex previews for register pointers in register dump","sha":"6cbb12e5cd64318c74a2aa2388dbdb490abf99ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2020-03-31T22:02:24Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-03T00:36:35Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Qt/Debugger: Don't move entire list if it's not needed\n\nWith 4 buffer spaces at the bottom.","sha":"2fb600e4580f86ebfaac8b96ee4aed0479db6018"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/37698908?v=4","date":"2020-04-03T02:20:33Z","email":"37698908+illusion0001@users.noreply.github.com","login":"illusion0001","name":"illusion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-03T02:20:33Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Add accurate PPU FMA to advanced tab (#7915)","sha":"7c972c88601d4dadd8a22a0a257f3df1a7451f4c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-02T09:57:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-03T09:32:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Allow AppImage to spawn its own rpcs3 process for fatal error dialog (Linux)","sha":"39796141fcf4dec540eb00e9faff2a61c5446dff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-03T09:45:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-03T09:45:59Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix sys_cond_destroy (#7931)\n\nDereference cond count in sys_cond_destroy","sha":"3f559cd86eff0998baff25048a2c7f210fbbefb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-03T08:21:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-03T15:37:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor debugger fixups","sha":"0beea91d5e83659575e6f008da0eaf617fee6515"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-03T09:18:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-03T15:37:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU debugger: Show channels data","sha":"13820d680220c642ba7a0fd38e89ce18e8ca36a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-03T15:11:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-03T16:42:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"liblv2 HLE: Fix sys_lwcond_signal mode 3","sha":"55baaea8e76f625031016276dd6fd749a87c7ef7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-03T20:20:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-03T21:06:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix ppu_thread::dump_callstack()","sha":"63080c22a37b26ca81e2f75068ae64c57cde10de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-04-04T18:12:06Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Whatcookie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-04T18:12:06Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Util: Add FMA and INVARIANT_TSC detection (#7937)","sha":"dd8a3eaac57ae36938d824ea3dc4620a162d44fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-04T14:11:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-04T18:36:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_fs: Limit NPDRM FDs to 16\n\nCo-Authored-By: Silent <cookieplmonster@users.noreply.github.com>","sha":"a1783740526c64cf576a8495aa65a11085af63a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-04T17:06:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-04T18:36:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_fs: Lock dev_hdd1 mount point at cellSysCacheClear","sha":"0b24b09a06b3ad8b71c559899a13e42da88d273b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-04T17:18:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-04T18:38:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix nullptr","sha":"cd64990558686a671f9a47595797c3aa89636bfd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-04T12:31:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-04T18:38:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: make LS loads/stores volatile\n\nFixes PS1 classics and possibly something else.","sha":"f05e24e8e86f734fc89a6d14136f1aefc7b373c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-04T12:33:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-04T18:38:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement cfg::uint for unsigned integers","sha":"7f9d41ac4761d093a5d9feb25c8e706b7f8649ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-04T12:34:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-04T18:38:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: add alternative ROTQBY implementation\n\nUsed if SSSE3 is not available (exec_rotqby).","sha":"a53d0d50b3dd20acfcb4cb6a4e52302e68edf110"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-04T12:35:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-04T18:38:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU DisAsm: fix disasm for BINZ and similar instruction","sha":"18dbd788e6bf27157a8b9695e5d80c6d0d682e01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-04T12:36:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-04T18:38:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: implement bisect helper (debugging tool)\n\nAdded two new settings: SPU LLVM Lower/Upper Bound\nBy manipulating values, conditionally avoid compiling programs.\nIt uses hash of the programs (64-bit start hash of SHA-1).\nPrograms which aren't compiled run with interpreter.","sha":"8053d2602a50c691457d93eba4e6cedf014dc71d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-04T18:33:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-04T18:40:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: improve stack mirror format in Mega mode\n\nStore first instruction for additional validation.\nShould fix some problems.\nI didn't touch ASMJIT.","sha":"ae140a1ac9841f0cfe71194cacf0be60b109562a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-04-05T01:56:04Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-05T11:23:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add Lego Dimensions Portal to usb passthroughs","sha":"f33373ca1b450d449be9c284d3e6fa258668f32a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-04-05T08:26:57Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-05T11:27:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Always launch rpcs3.exe on restart","sha":"f36686b1a78db62aa99ec58183462083bebccc40"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-04T07:51:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-05T12:21:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Batch transform contants load methods","sha":"72d1efa383f0071b21e4794aededdc1ecb04edd8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-04T19:49:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-05T12:23:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_ppu_thread: reduce global memory stats after thread creation","sha":"dc5cdb3bb49712908cf7f129696505d901b7a6da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-05T11:16:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-05T13:35:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gl: Fix async shader compiler\n\n- Removes glFinish hack.\n- Adds proper server-side synchronization.\n- Adds primary context detection to allow worker threads to be identified.","sha":"b301fecfd85b81a4ec95dde631b5c440dbcc9f4e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-05T11:22:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-05T13:35:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Fix DST instruction\n\n- It's the old-school distance vector, not the more modern distance() function\n- There is seemingly no glsl function that maps to it directly.","sha":"0b6e2b26facbbdb4cccf3fa29ee41f1321048d4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-04-04T19:19:16Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-05T13:35:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSearch: Change search state before invoking callbacks","sha":"fd09dde911b069f7910f42f0252ca7178e94bb71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-04T09:04:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-05T14:40:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make vm::_test_map aware of overflow\n\n+ remove vm::find_map 1024mb limit.","sha":"bbbd06dcee26c0ceabf43555b96beafb94cc66de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-04T09:19:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-05T14:40:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Adjust FIFO recovery to be a bit more merciful","sha":"e7d5d17fd81db7157d7f025c81e2f8ed6a77a7b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T06:51:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T18:59:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: const, const everywhere","sha":"89f16548f3fe2a59693e2064ecb8096e7e2e5e3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T06:57:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T18:59:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Move some format functions","sha":"b1fdbc7fccd7c497e22318a11056804bb4af32a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T07:37:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T18:59:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: make comboboxes in settings dialog translateable","sha":"133e897c8b71b4303acd2ece6b75f45c85d87ecf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T15:54:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T18:59:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix some translation nitpicks","sha":"e6a6d7e9bc500fb18c6e8d0c755e77e925fb59bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T16:29:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T18:59:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: pad handlers translateable","sha":"7a409af0b04f800cc8da78234f9ad688b30180d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T17:25:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T18:59:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix lupdate warnings (used for translation)","sha":"078c31c1dade20ccadc3c945842af9541f313c04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T18:08:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T18:59:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: implement EnhanceRadioButton","sha":"96086d57fab96cd8add5607736bd893666f4ccc3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T18:22:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T18:59:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: make cheat_type combobox translateable","sha":"2bd4485082eecdb654df8c2d73bea3ebd1858962"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/107301?v=4","date":"2020-04-06T18:11:56Z","email":"kvarkus@gmail.com","login":"kvark","name":"Dzmitry Malyshau"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-06T20:23:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix CMake path to IOKit","sha":"b6e52ad975989923660a83a7f34a3ae250117265"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-06T15:23:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-06T21:10:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement TSC calibration\n\nTry to get rough TSC frequency by sampling it.","sha":"15f01a1bf637840ba1f0bfa46a8dceb1446e8a2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-06T19:29:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-06T21:10:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Round TSC calibration result towards speculated CPU base frequency","sha":"3c3ccdbf1e9544f01050340ec708a1fea0265247"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T20:55:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T22:26:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: mic_none and enter_button_assign translations","sha":"cc6a03cbd7cc4bd0901523d101bf7a9fc3649c7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T20:57:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T22:26:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add disambiguations for settings translations\n\nThis prevents that the Qt linguist omits duplicate strings, which are actually supposed to be individually translateable.","sha":"5e6928a18221fe07932ceca427a04f4377fee6bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T21:23:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-06T22:26:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: make trophy type translateable","sha":"4aae9a17c16c5882aaff828ee833e4b664a9fc75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-07T00:13:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-07T06:10:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix mic_none and move microphone creator code","sha":"4ff69dc0cd99253ba439aa1cf9e239496d82e737"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-07T08:02:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-07T08:02:12Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix utils::get_tsc_freq() (#7974)\n\nUse magic static for once-initialization","sha":"5834a466cd784c719f5badc61d8a2f0c6e3f0930"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-07T11:03:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-07T11:03:03Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix cellGameDataCheckCreate2 error broken check (#7976)","sha":"8f3ad8b81a2fd8359d9f7695f1430a5d698d5ea3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-07T12:41:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-07T12:42:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: Fix SPU Precise interpreter","sha":"3eabec0030e6ea14e22222a5c32da03e05abefa8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-07T12:53:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-07T12:55:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Shorten SPU LLVM Worker name to SPUW.#\n\nFor debugging.","sha":"79391601783c7ba2a676d2a86a2dd31a9a90e796"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-07T13:09:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-07T13:09:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement jit_compiler::check\n\nInstead of checking file existence (because file may be damaged).","sha":"91d80aa7b9bbbf077a048029e0681967855032ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-07T13:26:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-07T13:51:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: fix crash on damaged cache files","sha":"6c8d844ec535d8e4db0c6aabfae3317aa8aa3926"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5641681?v=4","date":"2020-04-07T15:10:04Z","email":"IlDucci@users.noreply.github.com","login":"IlDucci","name":"Víctor \"IlDucci"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-07T15:10:04Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Linguistic changes (#7917)","sha":"a38d2461c9c30b0dd9f1a5c871a80bd0377d1aa3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-07T10:18:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-07T17:43:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx: Minor atomicity fixes","sha":"3f48450408476d4b70aa74b3171b9698e02b98ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-07T15:31:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-07T17:43:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx: Fix gcm events spam\n\nIn realhw the events are only sent if they are masked in driver_info->handlers as well.","sha":"f7536bbce0030f34670af9139dd1478b251ad7ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-04-06T20:06:35Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-08T04:39:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fix AddLddPad when more than one ldd pad","sha":"dce81d4a66f900112dce6df75167677d22876b5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-08T07:14:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-08T08:33:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx: Fixup after #7978","sha":"995fa63f4cf5fb80a363cdb1fe8e41cc81f70cbd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-07T17:53:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-08T09:43:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix renderer translation\n\nmove render creator to own class","sha":"2e18df7223444b9068f8639996ad6222ecb28f5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-08T08:19:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-08T11:35:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixup ppu/spu_thread::dump_all()","sha":"cc8f024c6c7c5de12a3a60775aed9385334dbeec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-08T08:43:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-08T11:35:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU debugger: dump reservation address","sha":"c0f4fb6e35be03d3a4a8b479100f9bac8d4d56c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-08T15:47:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-08T16:20:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix time played","sha":"8c838698afc97312e805a4898d0595f61d8de5b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-08T11:26:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-08T16:23:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_ppu_thread_create: read function descriptor immediately and save it","sha":"c948c9305ccabd4f06a474699b334903789d0009"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-08T14:56:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-08T16:23:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"spu: typo fix","sha":"cce946f10e809319020a2c2559b0f3ab9af5a527"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-04-07T01:38:38Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-09T10:02:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CI: Prevent Azure from publishing empty files","sha":"6fe671a5e885b12031d5f99d7654c48e58cb6abf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-04-07T02:01:52Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-09T10:02:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CI: Fix facepalm bug in Azure build","sha":"c2ae8be3ebf81c3bc70bfeb98c1f4f84d1bec609"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-04-07T02:53:23Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-09T10:02:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CI: Maintenance\n\n- Rename .travis dir to .ci, since it isn't just for Travis\n- Convert Linux build scripts to posix sh\n- Clean up some scripts per shellcheck","sha":"c4a21438ad1fe5f89714ba9af33b841714ef4cbd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-04-09T04:33:38Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-09T10:02:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CI: Unify spacing for build scripts","sha":"e8f9fd5430134e11e98bc6bbaff3c40a8c1f20ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-09T12:53:43Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-09T12:53:43Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Optimize transform constants load methods (#7992)","sha":"36fd1d0f0d82e420b50cfcc3f8694910fb110fad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2020-04-09T12:54:41Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-09T12:54:41Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Implement cellRtc HLE (#7933)","sha":"765b14a8ba1670f0ce1aef379f87cf67f7f6a49f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-09T12:31:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-09T13:23:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Tweak TSC calibration\n\nRound to 3 digits after dot (count in MHz).","sha":"1b68f90e42e87d9a9cdb932c9ed0dfccf9af0c73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-03T05:11:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-09T14:27:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Add accurate double-precision FMA support","sha":"158b24ec2521cded7643607a11801740169623bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-03T13:27:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-09T14:27:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Improve FNMS\n\nShould be more accurate with postive/negative zero inputs according to docs while being more optimized.\nTODO: Check SPU precise interptreter.","sha":"d451a0b7b76ef2ee001dd62bed847ee6f33ac9ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/37698908?v=4","date":"2020-04-05T07:56:57Z","email":"37698908+illusion0001@users.noreply.github.com","login":"illusion0001","name":"illusion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-09T16:22:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gui: don't allow cpu with fma support disable accurate path","sha":"df20410cf1bc77c7344f8182261969287d070177"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16805474?v=4","date":"2020-04-10T17:11:33Z","email":"matimoran03@gmail.com","login":"RainbowCookie32","name":"RainbowCookie32"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-11T07:48:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Show state of Accurate LLVM DFMA option in GUI for CPUs that support FMA","sha":"11b980c9ac3d878dcc78f33c46c323c297dce5f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-09T16:05:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-11T07:58:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"idm: Minor update to use std::static_pointer_cast","sha":"93b8f3b5db55e72657707af6b5f16598688ec741"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-10T19:14:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-11T18:21:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx: Implement LLE cellGcmSysGetLastVBlankTime","sha":"5ba26e247b8d68cb3e0deb274d500e50f9824b0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-10T19:19:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-11T18:21:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx: Implement error checks for Zcull/Tiles binding\n\n* Check zcull/tiles offset if bigger than max MAIN/LOCAL size.\n* Check memory mapping of offset if location is MAIN.\n* Check pitch/size for 0 as coming from hw tests.\n* In addition: fix 'bound' check of tiles, seem to rely on the bits location is in.\n* Add locks for zcull/tiles/displaybuffer binding.","sha":"1f9f455801b190467e70c735bf887bf752eb09dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-10T19:25:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-11T18:21:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx: Warn if RSX is not idle during crucial points","sha":"8228fa1ece49280d09ef8c6a3a769ec559a07292"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-10T20:09:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-11T18:21:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix grammer issue (binded -> bound)","sha":"504ba8d82447f3ac93e04c7fc24a41623d6f0be7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-11T06:51:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-11T18:21:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix vblank thread stop regression","sha":"d69bec8f59815bca1ca38ea60922d1be85040a02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-11T10:07:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-11T18:21:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix get_optimal_blit_target_properties for local memory","sha":"ff74c241c7a359c183fb88bba5d3d4cdfe445ee2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-11T11:56:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-11T18:21:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Write ref+get atomically\n\nMay contribute to better FIFO synchronization in some cases.","sha":"e407018bb5672f3c333b7eb4a81a8868a2d30d35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-11T18:34:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-11T18:58:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement ::as_rvalue","sha":"141d62fbf9f292156b27dea0ed3d7c5ecf705e59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-11T19:52:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-11T19:55:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixup ::as_rvalue","sha":"8e61c65c0d622a9d75f220a18ca947d785b44637"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-04-12T08:52:21Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Whatcookie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-12T08:52:21Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PPU LLVM: Optimize altivec FMA with 0 addend (#8013)\n\n- When VMADDFP and VNMSUBFP are used with a constant addend of 0, they can be simplified into a single floating multiply","sha":"6b0f7a8f555058f1edda1c3b027a6805e07f43a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-02T19:18:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-12T09:30:38Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"vm: Fix possible IDM deadlock with Page Fault Notifications (partial)","sha":"bb950cbb3b1355c85814e96957450854cae669d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-02T19:20:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-12T09:30:38Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Reduce log level of page fault notifications\n\nLog current hle function.","sha":"c3a4e57efeeb810f37db6330c961e654022a2627"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-09T14:45:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-12T09:30:38Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"ppu exec loader: Log TLS image information","sha":"ae1ff1e96dcb917852d94c06a507fa8d6fb85544"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-10T07:05:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-12T13:48:43Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx fp/vp analyzers: Fix strict type aliasing and improve codegen","sha":"cb14805d78ea68c449485df3441b6982760853cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-10T13:57:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-12T13:56:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fat atomics: implement exchange() and compare_exchange()\n\nAlso includes compare_and_swap() and compare_and_swap_test().\nAlso includes fixes for load(), store(), and atomic_op().","sha":"17f3a114becf3ff99eb0bcff29f8938496aaa8c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-11T21:47:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-12T13:56:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve TAR loader\n\nDon't overwrite unchanged files.\nPrint error if failed to overwrite.\nThis commit affects PS3 firmware installation.\nTrying to workaround a bug where some files cannot be overwritten.","sha":"5524cd1e757ef0a57dd896c6c5bc0e8fc6b8952f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-04-10T18:48:32Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"sampletext32"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-12T14:29:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix various explicitness, laziness, hard codes","sha":"c69691f19b87de868da2dc824cb00d4f0f76086d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-12T05:11:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-13T03:34:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Another ::as_rvalue fixup","sha":"926e0467cfaa946806dbc92d68a14558b8749974"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-12T06:47:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-13T03:34:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_net: Fix sys_net_bnet_poll page faults","sha":"179a9b3bf00a54434b11bffdde0672d12b497963"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-12T07:51:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-13T03:34:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_net: Fix sys_net_bnet_select page faults","sha":"00957ca4bf861b4650ff8022b5605cf4d25a2629"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-12T08:28:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-13T03:34:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_net: Fix sys_net_bnet_connect page faults\n\n+ EINVAL checks","sha":"c4f6968aaeb91dd5f926245c2647cd487c630c19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-12T08:38:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-13T03:34:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_net: Fix sys_net_bnet_getpeername page faults\n\n+ EINVAL checks","sha":"7399a3f1e9b362f0920d7ed1c2e9ac8977fef856"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-12T08:40:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-13T03:34:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_net: Fix sys_net_bnet_getsockname page faults\n\n+ EINVAL checks","sha":"60a63fa4b638462b8bc8ef1ff78417d09725e463"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-12T08:51:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-13T03:34:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_net: EINVAL checks in sys_net_bnet_recvfrom","sha":"063902728bc259c7bfc8e76d291173392a0e0102"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-12T09:03:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-13T03:34:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_net: EINVAL checks in sys_net_bnet_accept","sha":"442035c25180a080b3c9433f9ed7251ca584d87a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-12T09:16:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-13T03:34:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_net: EINVAL check in sys_net_bnet_listen","sha":"d91d420981a3fb8961f6b266dff53400a6d8a1ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-12T09:53:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-13T03:34:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_net: Fix sys_net_bnet_getsockopt\n\n+ EINVAL checks","sha":"9fb30f130aebb62acace89a269e1527050cbf73e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-12T10:15:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-13T03:34:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_net: Fix sys_net_bnet_sendto","sha":"8f32d44635cce5ca1a9d2f7bc012bc0d50d19bfa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-12T16:10:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-13T03:34:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"CPUThread.cpp: Minor indetation fixup","sha":"492a80f6c58254c478ffaa17dba7037722ac1a3a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-12T16:21:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-13T03:34:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_net: Fix sys_net_bnet_bind page faults\n\n+ EINVAL checks","sha":"b45d836b896cc383ed15a6d42894d5bbae664406"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-04-13T10:49:42Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-13T10:49:42Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Add Disney Portal to passthroughs (#8022)","sha":"791c0da236d54851fb48fe8e94f9faa149a8b770"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-13T10:29:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-13T11:34:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU: Merge reservations store functions into one","sha":"c8b8cafeec21309efaddd7d070b8d11e2ba0c203"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-04-11T20:12:07Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-13T11:37:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix order of operations warning","sha":"f0b1c8302ab383e46243208e5402c0aa94e44ffa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-04-11T20:13:56Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-13T11:37:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellRtc: Extend before shift, per decompiled output","sha":"a8a83c9724149ae20f11b871fc357de3e380b128"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-04-11T20:14:50Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-13T11:37:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Prevent unecessary copy in loop","sha":"4838f72e50499fae4ba8e84fafab6e768f830cd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-04-11T20:15:35Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-13T11:37:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix overloaded virtual warning","sha":"167159698dca5718483cdd232e99b711579b3e61"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-13T17:49:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-13T17:49:12Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix sys_net_bnet_sendto (#8026)","sha":"2dcc3255b229c91586abeea82e4a247d64bb90b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-04-14T07:15:05Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-14T07:15:05Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"CI: Auto update LLVM and GLSLANG when those releases change (#8021)","sha":"adfc9d93c367e6528869e3c479e85897ac2b48e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-13T12:31:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-14T13:05:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Replace utils::cnttz{32,64} with std::countr_{zero,one}\n\nMake #include <bit> mandatory.","sha":"d0c199d455cab275c9b5aff903e861a2418efc9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-13T18:57:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-14T13:05:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Replace utils::cntlz{32,64} with std::countl_zero","sha":"032e7c0491296d8177eef0f363fdb02bdfac5a05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-13T18:58:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-14T13:05:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Replace utils::popcnt32 with std::popcount\n\nCleanup includes.","sha":"f72af2973d12d663afe25ec3556eaf93d09e01fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-13T19:25:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-14T13:05:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Replace rotate utils with std::rotl\n\nMore include cleanup.","sha":"4d8bfe328bdb5e0b988e300e44269f759044ad82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2018-09-06T11:28:12Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-14T14:06:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add fallthrough attribute","sha":"f37adc4188038f4db63188f9a9606669d8c2e001"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2020-04-13T21:02:15Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-14T14:06:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add missing break in cheat_manager.cpp","sha":"7e0bc262411d1d00ed4f980eea6bc50d97b015c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2019-06-12T18:02:51Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-14T14:06:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Typos","sha":"2e397e38a48a0a48e2396233a2b067af6751c26d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-13T18:53:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-14T14:09:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU debugger: Implement blocking functions dumping","sha":"ec1e82bc9df827fbf7ad7193ae00b327228206f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-13T18:54:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-14T14:09:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"minor ppu fixup\n\ndoes not affect anything except consistency.","sha":"63be05d5d3ec5dc3ac5d671ad8e4e2521570aa77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-14T15:49:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-14T16:10:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix ppu_rotate_mask","sha":"bc3b70c338005530ef0629e795a1dc3203965300"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-14T16:41:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-14T16:45:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert \"Replace rotate utils with std::rotl\" (partial)\n\nThis reverts commit 4d8bfe328bdb5e0b988e300e44269f759044ad82.","sha":"b1b67a13c62d18c7fa0e153267e1f95c445f8fb0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2020-02-20T07:53:10Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-14T20:00:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cmake: Add support for target_precompiled_headers if available","sha":"20f53e65eb53248462bf0be17d90bf7e4b5a05b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-15T09:19:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-15T09:19:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix regression in SPU ASMJIT\n\nIncorrect arithmetics.","sha":"074b9f94db23af0b971d0182c93dc7449a185fef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-14T17:13:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-15T16:25:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"some more dynamic settings","sha":"cf229a8e9f688d0d36cf9ea221af7ca71120d885"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-15T20:19:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-15T20:19:46Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"liblv2 HLE: Fix spu_elf_info loader for SCE SPU images (#8045)","sha":"8cb1f4fe260a7cb3eaa2be77cf517ff32baab0d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-11T08:16:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-15T23:25:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Experimental squashing of reservation memory area.\n\nEnables trivial synchronization between shared mem.\nReduces memory usage, but potentially degrades performance.\nRename an overload of vm::passive_lock to vm::range_lock.","sha":"c7fe8567b8b5ca03168bb5ca8338e5b1fad443a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-15T18:06:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-15T23:25:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Expand vm::g_addr_lock to 64 bit to support ranges\n\nOptimization.","sha":"0f6a0d2740b6e0f1e5a8a6662b4d121aaf403bab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/55668713?v=4","date":"2020-04-15T20:55:13Z","email":"rexys@protonmail.com","login":"rxys","name":"rexys"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-16T09:59:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Fix is_fifo_idle with hle gcm","sha":"8f3b04cbd63fe3b298ff69ac827e1516a7f2dfa9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-15T08:35:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-17T10:41:50Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"lv2: Log all arguments of unimplemented syscalls","sha":"921b1aadfbe45046648e7effed47e964c92c19d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-15T09:55:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-17T10:41:50Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_isolated_spu","sha":"a3f2dfa2325804993dafc7feaaae8af3bd294c66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-17T07:04:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-17T10:41:50Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sceNp: Override k_licensee for PE game category\n\nCo-Authored-By: AniLeo <ani-leo@outlook.com>","sha":"06d4505992837c814dec8b640adbcf8777137f77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-17T08:06:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-17T11:30:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: minor cleanup","sha":"e361bac945564198c28d3ba0e3e74b210c6028d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-17T08:09:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-17T11:30:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: implement GetIsDynamicConfig in emu_settings\n\n- unused at this point","sha":"ec4e8eda04d617ad186f4f24c22843eb8563d58b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-17T08:28:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-17T11:30:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix localization in change_microphone_type\n\nDon't rely on localized text at all. Use the setting's index and formatted string instead","sha":"171367fe884bf615bc7981d92207ee0ee7f20fa6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-17T10:59:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-17T11:30:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: adjust max llvm thread tooltip","sha":"7ba5f1f5037caa016848f024e600f641dd3610e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-17T12:22:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-17T13:46:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: move code from emu_settings to config_adapter","sha":"0df6c415562b05268eca6977015edac0699dae8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-18T05:10:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-18T07:20:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx: Fix tiles on MAIN memory error checking","sha":"6210507a374c1b8c8b263eb0f69433ea8372e1bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-15T03:08:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T17:11:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Crypto: add log verbosity to pkg installations\n\nalso enables installation with one more filetype","sha":"3b9dc29781922aaa37b31dbcdb3f944c42027dbb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T08:39:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T17:11:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Crypto: read and log PSP and PSVita headers","sha":"3a6bda4d932a0711776bb9edf09b2dff9cafb360"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T10:17:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T17:11:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Crypto: fix magical type","sha":"e4b6de409a1cb23a98c14addb7b9f6b5ed4156e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T11:08:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T17:11:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Crypto: fix metadata variable names\n\nheader_size was just wrong, on PS3 games it just happens to match the meta offset, which is half of data_offset\nPS3: meta_offset + meta_size = data_offset\nPSP: meta_offset + meta_size = metadata_header_hmac_offset\nPSP: metadata_header_hmac_offset + ext_data_size = data_offset","sha":"17623247022e2d25c787e14f175992dd30ea649f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T13:56:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T17:11:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Crypto: interpret metadata versions","sha":"22d01e4d05255b0009e215492222bbee3c21d1e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T15:30:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T17:11:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Crypto: PSVita metadata and missing entry type","sha":"d35a29bbe4061fa3b84f82fe2d06e61a89646f83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T15:54:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T17:11:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Crypto: move PSVita keys to key vault","sha":"56573636421938183c8145017d06fbac2011cc5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T16:11:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-18T17:11:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Crypto: add another file type for PSVita","sha":"2094e52d7db0440b4e79a54dd6927d545042deb0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-16T18:16:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-19T09:56:42Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"debugger: Rephrase \"Current function\" to \"In function\"\n\nTakes less space which makes actual function name display a bit nicer.\nAlso the meaning is clearer.","sha":"83c7f6f149f18e49845ef4ccbc99a71a4e337201"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-16T18:35:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-19T09:56:42Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"PPU debugger: read 32-bit pointer instead of 64-bit\n\nPPU ABI supports only 32-bit pointers in userland, also fix it to use super ptr.","sha":"368bd7cf020e1a650499aece3cba88dab887336d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-17T06:15:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-19T09:56:42Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"PPU debugger: report functions on registers display","sha":"0bf73ba0bc6a1b61cd57504cba137656710368ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-17T12:19:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-19T09:56:42Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Minor fixup for unimplemented syscall args dump","sha":"1cb3bf6dabcd5718cdb1426e60b63d13740d73f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-17T13:45:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-19T09:56:42Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"PPUAnalyzer: Check if TOC from OPD is a valid address","sha":"5960de2e204015bd47b30c7f882545e6d8d420f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/55668713?v=4","date":"2020-04-19T18:17:19Z","email":"rexys@protonmail.com","login":"rxys","name":"rxys"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-19T18:17:19Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix FMA copypasta (#8060)","sha":"5101bc189e3cd13c2904a269dcb9d58236257ce4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-19T19:55:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-04-19T19:55:26Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PPU LLVM: Fix rounding regression of FNMADDS, FNMSUBS (#8066)\n\n* PPU LLVM: Fix rounding regression of FNMADDS, FNMSUBS","sha":"dbce10d0e38bd623c56d81125b59cdb2c7bf3c60"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-20T18:22:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-20T18:56:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"settings: fix clocks scale default","sha":"c3af19148f9f39928903429c52b85aecee26f988"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-20T18:23:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-20T18:56:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"settings: remove legacy settings","sha":"a203ff677b1cc5baf4f7692a4d6c01c191df9559"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-18T15:46:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-21T15:18:32Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rsx: More strict zcull stats enabling","sha":"b94e4247ccf867b2026303ae30a8c1a1777e481a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-18T19:26:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-21T15:18:32Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_rsx: More error checks for ZCULL area binding\n\nAnd clamp zcull offset to 256MB, it's unknown if only the error check clamps or it is clamped entirely.","sha":"8c747bf0a29af6857c9f4e5723da155b67703535"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T09:32:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T14:58:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Add Firmware Cache options to main window menu","sha":"ebd92a2f2f505e1016b2aa2946864b1103c7b973"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T11:08:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T14:58:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Add confirmation dialogs before closing games","sha":"2b6afb69163a1de721fb46990b6b4403db92e337"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-20T20:22:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T14:58:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: move GetSettingName to cfg_adapter","sha":"1a374126e1953bbd457c1c8fcb210b64bd148e42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-20T21:43:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T14:58:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: some cleanup","sha":"18e0b83ac9fc34b930c971080f4683f03c791121"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T18:08:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T19:43:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: enum class drop_type","sha":"193837298bbfd92be0c3ef7260a8ab2d29ff3267"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T18:14:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T19:43:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Add confirmation dialogs on drag and drop","sha":"b4b8c1e4b2f5245b91e4e06bec1e72f067815714"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T18:23:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T19:43:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: move GetBootConfirmation to gui_settings","sha":"1805cb44e60221b52db2558bf26305977d65d2f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T18:36:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-22T19:43:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: move rsx capture to Utilities menu","sha":"18219afbf727deddb17fd43f9124c14b8c3523e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-22T17:49:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-23T11:01:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx: Fix zcull bind error checking regression","sha":"c48ccc6f3c9417452e9ce8011aa25d616b5cc1f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-22T17:52:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-23T11:01:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"sys_rsx: Fix error code instead of success on invalid context","sha":"256c74def28cfc7ea5a37a45c1ab17a67dd14428"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-24T20:49:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T08:17:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/input/cellpad: enable product choice","sha":"4e6d95c5b82e60207cbe54612f22cfbda9571b79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T00:12:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T08:17:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellpad: add pclass_profile flags","sha":"e4cb9ef7cd6fdb2802b7a208ec7818b74eccacb6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T00:13:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T08:17:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: add Rock Revolution Drum Controller product info","sha":"de58f1986600521423dec50d968fdf8bc2eac189"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-24T14:23:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T08:50:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"evdev: relax controller criteria","sha":"3937733182a38af293b72ab3ccbb3e93b6552856"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2020-04-22T15:33:17Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-25T11:56:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"spu: Add some \"if constexpr\"","sha":"3fd3bd7ca16a8c2756cb7f29f0c2a06fe9fedc07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25406440?v=4","date":"2020-04-22T15:34:15Z","email":"scribam@users.noreply.github.com","login":"scribam","name":"scribam"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-25T11:56:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Remove \"#pragma once\" in a cpp file","sha":"1791bb50598b46b8efc44cf1f29c25290e24e75c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6559034?v=4","date":"2020-04-24T23:37:57Z","email":"klhinsd@gmail.com","login":"jacob1218","name":"jacob1218"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-25T12:27:18Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"change minimum audio buffer duration","sha":"72ab5f05f4d15c38e6bbef6fa6504b9caf8644a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-23T16:17:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T13:17:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Rename some functions in settings_dialog","sha":"af854835b2c172a32738bf223e37ec33d855126a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-24T17:31:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T13:17:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Crypto/Qt: check target app version for packages","sha":"773448a8f68d672991346f1d4a6a15d4affe5172"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T11:38:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T13:17:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Crypto: read sfo in memory instead of tmp file","sha":"b923eb058a347d6594ed7c6a919cf0a3de0f2cf7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T14:12:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T14:37:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"evdev: fixup for relax controller criteria","sha":"3788ef3e27b347038462a7dd7696c55f28068389"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-25T15:01:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-25T15:01:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Don't use std::popcount (workaround)\n\nIt seems MSVC uses POPCNT instruction when compiling for SSE2.","sha":"58ba6d68bb7909562df3278a3d334846bc6b0495"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T17:40:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-25T20:55:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"evdev: add keys used by wii controller driver\n\nI'll probably rework the current system sometime soon so that I don't have to add keys every now and then\n(or I'll just add them all XD)","sha":"8e95c0e44d9b97fb094a472d90671dba62388f3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-04-26T13:21:01Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-26T15:28:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[llvm_build, msbuild] Minor refactor","sha":"c5d390c9792caa146147549a8a9fa2cc3ce221e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-26T16:34:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-26T19:36:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement mov_rdata_avx","sha":"8ae255450585f34b6c816b9f75a1646b533c869a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-26T16:46:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-26T19:36:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU DMA: disable memcpy path\n\nDue to update of the alternative path (SSE/AVX)","sha":"4f71c570bd7cca02c96a7c49909bfd9fd8c2c910"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-27T14:46:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-27T15:05:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU DMA: more tuning for mov_rdata_avx\n\nAvoid unaligned stores.\nPrefer asm path if __AVX2__ is not set.\nDon't emit vzeroupper if __AVX__ is set.","sha":"3ec73b651e983acfd0e5b927993005392a1eaae2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-16T19:45:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T11:27:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: New GETLLAR technique","sha":"e423128a32aa83e927b62b8a7059b5ccdcdd0be5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-17T05:13:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T11:27:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU: Fix LWARX/LDARX on TSX path","sha":"3be687cd1813648f7ccb38df930fcc6909cac052"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-26T02:48:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T11:27:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Detect reservation spinning loop","sha":"7d7909149f8d6d8d3ee5817ef067357053d2da63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-23T16:26:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T11:27:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU debugger: dump Stall Stat and SRR0","sha":"9506676223b18dc29aee904c104d2671584f537b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-16T16:33:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T11:58:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make ESTAT consistent in sys_spu_thread_group_terminate","sha":"fe7933b0d2cf13986a7b2e91ade494baac1b27a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-16T16:40:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T11:58:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add missing cpu state check sys_spu_thread_receive_event","sha":"a9c18964b68bd200ab9be4abdd1b4ad36f6a1646"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-16T17:08:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T11:58:17Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Wait for SPU event to be received in sys_spu_thread_group_exit\n\nAlso use atomic check for group->run_state outside the mutex,\nexplicitly forbid group termination while we are waiting for an event to be received.","sha":"7da8ba5c15530e8292aa1e717fdff3cab4279164"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T14:23:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T14:58:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU DMA: implement cmp_rdata_avx\n\nUse technique similar to mov_rdata_avx with inline assembly.","sha":"790fd9ce14188484d68acc295c482e3aada14978"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T15:05:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T15:05:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: modernize inline assembly for lock bts/btr/btc\n\nUse flag output (requires clang 9+).","sha":"98ab5d5ba202fbe7924dab5daf88fc6adfcc9a18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-28T16:48:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T17:20:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Partial revert of 3be687cd1813648f7ccb38df930fcc6909cac052","sha":"a505d87565232e599e6428820e56749cde5fcc28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-28T17:12:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-28T17:44:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: update playtime every 10 seconds","sha":"e095eaf16e655ece70d5e0f239df051f8b861d60"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-16T09:54:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T18:07:15Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Fix zcull time to not time travel to the future","sha":"833ace11908e32e4c1ac5655eb002746a648138d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T18:15:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T21:09:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove test_stopped() check from ppu_load_acquire_reservation\n\nFixes warning.","sha":"689419b0ca257271faf16124e2bc301822266e55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T18:49:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T21:09:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement thread_ctrl::get_thread_affinity_mask()","sha":"76294beae1019905c4b3208b4a139631dd4834f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T18:52:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-28T21:09:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"TSC calibration improvements\n\nBind main thread to a single core for calibration.\nIssue RDTSC after clock probing, may improve accuracy.","sha":"d66bdf1653c9f8f5997aa91d0487407035429c87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-29T02:24:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-29T02:56:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"Fixup for cpu_flag::pause state check after #8114","sha":"954e3f6e6c43fb61a85caa4261c21953afbbc35b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-13T06:54:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-29T02:56:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"sys_rwlock: Do not allow SYS_SYNC_PRIORITY_INHERIT","sha":"791ec9531373fc7d7791b9b04e4a83b1b6657b56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-29T03:46:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-29T03:47:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"Fix address_range start_length() constructor\n\nFixes an underflow when constructing start_length(0, 0).","sha":"0db91aa56b694a458a5d23687909cab526c473c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-29T04:46:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-29T04:47:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"Make spu_mfc_cmd fmt properly show stalled commands","sha":"69f82a731126b95bc26b6516b7cfaf0a8deb5241"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-29T04:57:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-29T04:57:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"Fix sys_ppu_thread_get_priority page faults","sha":"c1dc6838fae67ebf8a1f13abb50b38cdb5d03224"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-29T05:03:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-29T05:58:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"Fix sys_ppu_thread_start error checking, fix rare bug in sys_ppu_thread_create\n\n* Correct error code to EBUSY.\n* lv2_obj::awake was called even when EBSUY should be returned.\n* Fix sys_ppu_thread_create for a newly created thread with the same id as ppu_thread::id_base. (can happen if main thread exited before its creation)","sha":"dd6825a7bdfbdd32e670c78ee573f4b478e16697"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-29T06:49:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-29T12:32:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"kernel explorer: Add more information about SPU/PPU threads","sha":"f4f0fb88b1c66dcd2f4c5c29402ac834420865f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-29T12:40:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-29T12:40:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU DMA: Fix PUTLLUC (TSX)\n\nPrevent edge case of missing store.","sha":"19acf260d8916d16126b4358f4cd19bdd42d0cf3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-04T13:03:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-30T12:02:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"config: Register shader interpreter modes","sha":"65e9e568b5905f0603351b693dd2204465086915"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-03-24T21:22:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-30T12:02:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx/gl: Add basic interpreter support to OGL\n\n- Adds basic interpreter functionality.\n- Flow control and other instructions not yet implemented.","sha":"0072df7f20a29dda78728b0dac2e36b86a887915"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-09T17:50:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-30T12:02:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vk: Integrate shader interpreter","sha":"b4bf48c33b411906a8adafd1fbb15cbc2f7db6a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-18T17:38:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-30T12:02:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx/interpreter: Improve instructions support\n\n- Must statically write the gl_ClipDistance registers else you get uninitialized trash.\n  This problem is more readily apparent on NVIDIA technology but even AMD is not completely immune.","sha":"930bc9179d6ceac1172c301e01712e2d4cc65179"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-19T17:23:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-30T12:02:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx/gl: Implement variable path interpreter for optimal performance","sha":"bc5c4c920561fc627cfdf8af9eb35bc4ede8d809"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-20T18:17:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-30T12:02:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vk: Implement optimized pipeline cache","sha":"fc5b4026e15c1e4689daf6188399b51ef08e644a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-23T21:38:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-30T12:02:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx/interpreter: Improve instruction accuracy\n\n- Fix DIV instruction\n- Add EXP_TEX modifier\n- Implement WPOS register read\n- Swap 3D and Cubemap enums to match RSX ids\n- Adds two extra instruction classes: flow control and packing control\n- Implement remaining FP instructions with exception of the rare projected texture lookups\n- Fix typo causing output color index > 0 to not work\n- Fix KIL instruction\n- Implement conditional vertex program writes","sha":"2ed50ba263a912a5e90c3a5e66d767287c8a81d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-04-26T22:12:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-30T12:02:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix build","sha":"2281c4f662ad94b7fd6d81fe0984fff4598b8fe2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-27T14:37:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-30T12:02:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx/interpreter: merge shader settings\n\n- merge disable_asynchronous_shader_compiler and interpreter_mode\n- removes disable_asynchronous_shader_compiler setting\n- Adds the resulting settings as radio buttons to the gui tab","sha":"8f0af6a6feb69ac3fcab3e65f9bb49931616d1b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-30T07:39:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-30T12:45:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellAudioOut Improvements","sha":"37110098c7644fa6e58da5962ab525faf6528836"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-09T16:05:43Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-30T15:58:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_event_queue: Fix ports disconnection after queue destruction","sha":"2b75df22d92e386c55ca34fc08689a0125c17cec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-30T18:16:09Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-04-30T18:40:32Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rpcs3_version: Bump to 0.0.10","sha":"7df82585519278764c6d49b60fa7d89fdcaffa98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-01T08:01:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-01T10:03:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"evdev: revert facepalm change","sha":"2de6a9bc4446351c8732174a5cce0b8ceb3f1351"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-01T09:01:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-01T10:03:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"evdev: simplify evdevbutton madness a bit\n\nI hope this doesn't regress anything","sha":"a568c958afb83ba3b4ad31f357896c803c759464"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-05-01T09:05:24Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-01T14:52:10Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Optimize FMA ops with 0 addend","sha":"c1bd154bcdb3c93843b122282fe9bfaf288d0098"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-29T19:11:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-01T19:00:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement thread_ctrl::get_process_affinity_mask()","sha":"f6200ba6351eea404c9d315a3835e7cdd9c6067a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-30T16:06:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-01T19:00:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use utils::get_cpu_brand when applicable","sha":"31035608eeee10b83048ae6a2c32dfb62f5b1722"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-04-30T19:42:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-01T19:00:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RSX: fix new warnings","sha":"cda8b3a59e4c9d08f51a505d832240897db34436"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-01T15:48:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-01T19:00:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM DSL: fix FNeg pattern matching","sha":"fc68c508c821f711a207b937bf1c17174cfcddd6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-04-14T15:35:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-02T07:27:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: show mouse in fullscreen","sha":"2b69a68ef6657d857bec77a2871ecd2945635953"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-05-02T06:04:05Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-02T11:54:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add fs::error for when disk is full","sha":"b18dcd766034aed6bd5cddc1fb1d4848ec040c66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-02T05:16:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-02T11:57:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU GETLLAR: Don't use loop detection for TSX","sha":"0e6937a35905fd7dae02b6032fbea339c99cd52d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-01T05:59:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-02T11:57:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU: Clear reservation on context switch\n\nEnsure that only 2 PPU reservations exist at maximum at a time.","sha":"72bef8dd7f557d3aac09829e2d1069a2d98182bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-02T08:01:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-03T22:10:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_cond_signal_all: Use SYS_SYNC_PRIORITY protocol to signal threads","sha":"b84b8f4db44b2c8c5823af6ed72baf57ef4dcc26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-02T08:18:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-03T22:10:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"lv2: Minor optimization for \"awake all\" threads in sleep queue","sha":"37ce7056ac53aafe7ce8e478b4335ea11ba19f17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-02T08:22:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-03T22:10:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_event_queue: Fix forced event queue destruction\n\nAdd missing last existence check at sys_spu_thread_(try)receive_event and lv2_event_queue::send.","sha":"edde7485190db573e5d794c36c605093b9c4540c"}
+{"author":{"avatar":null,"date":"2020-05-02T14:56:09Z","email":"seraph.divine.sd@gmail.com","login":null,"name":"Pavel"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-03T22:10:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Option to disable keyboard hotkeys","sha":"9a4c26dc8c69f4ea5d35c61a7e90e6e9292c635e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-01T21:25:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-05T10:18:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"glsl: Improve VGPR usage\n\n- VGPR usage lowered from 159 -> 127 for texturing. Occupancy doubled from 1 to 2\n- Eliminate most temporary registers","sha":"4f7c020e6336fa17f2792a465c802e40a9c740f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-02T13:28:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-05T10:18:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vulkan: Import spirv-tools subproject and update glslang","sha":"f72385b00c38ece6c5903b7614ab156bf64ff0b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-03T12:18:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-05T10:18:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Enable optimization passes for generated SPIRV","sha":"a0f63a31e32be0982c3e1283b1079b3fe93f61b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-03T13:27:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-05T10:18:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/interpreter: Fix DIVSQ instruction","sha":"a3f25bc7c7661f4764c9845cc184926660086f46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-03T20:32:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-05T10:18:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix linux build","sha":"fb3d5827f0ed25a7c18bdb4845ad82068d8de9bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-04T18:22:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-05T10:18:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix windows build","sha":"142a1da0e06433023897d5017cb4d3c0b5cf6296"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-05T04:23:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-05T10:46:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU/PPU debugger: use ':' instead of '='","sha":"1bd6cb21052e35b815261c2c9ca7005c72ac6659"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-05T18:37:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-05T18:44:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix get_thread_affinity_mask (Linux/BSD)\n\nUninitialized variable (facepalm).","sha":"a6f0b1b53267869b1b644c48d9df066ca26f66a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-05T18:55:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-05T18:55:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix some warnings (GCC)","sha":"907adc817ef0cad3f0a4a5d33737301712927c06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-04T14:02:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-06T07:33:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: remame some functions","sha":"d4606cfdb9874aebcdbee849d4515864ddd75711"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-04T14:15:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-06T07:33:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: fix trigger scaling\n\nthis is not a problem at the moment, but if you increase the trigger_max then the old code reports values bigger than 255","sha":"f95bf01c783f319ac90d986d0791e05d661bf03e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-04T14:31:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-06T07:33:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: fix xinput deadzones","sha":"5c4b8e8deeb6b4a7ba5c69ff36a2eef9900d51a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-06T07:04:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-06T15:03:37Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vm: reset stack memory after deallocation","sha":"a6025df7de0e0c21a8f76eb279c50bbd25436f28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-06T15:18:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-06T15:20:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Get rid of \"module\" keyword\n\nWorkaround some intellisense problems.","sha":"e1042bc631cfed5b7567599d6edd0e69ddf71523"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-07T01:31:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-07T16:10:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Don't load custom configs when adding games","sha":"8e2b2bc1791159d57d834d02be7ee6ce0967969b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-07T18:00:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-07T21:02:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Fix alpha ref\n\n- The alpha ref register is compared directly to the ROP output register in realhw\n- alpha ref content must match bit-width of ROP register, which means fp16 values are possible","sha":"a1b6415c5af951475e09848131ec49f8babde226"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-07T21:22:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-08T11:35:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Move analyser dump to its own config option","sha":"79c54aeba9c6a60c0529033cbde4dc9493061594"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-08T06:08:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-08T11:35:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Disable SCA writes to output register if vec result flag is set.\n\n- Noticed when debugging X-men origins: wolverine which has a bogus SCA op whilst writing vector to output\n- It makes no sense for both SCA and VEC to both write to the same register in the same instruction as memory ordering becomes an issue","sha":"14969cd8d07459f44f51c6290b9e8fd95ec75b87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-09T16:49:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-10T02:46:11Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_spu: Improve sys_spu_thread_get_exit_status","sha":"09797c3584081f222e4bce5693ad680ffa675f01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-09T16:54:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-10T02:46:11Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_spu: reset group exit status in sys_spu_thread_group_start","sha":"bd61347b21ded2d914226a19462c2a1710cc551a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-10T17:14:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-10T18:54:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix NOP shader passing\n\n- NOP shaders are used to stub rendering when a pass is supposed to be disabled","sha":"79e2a87bc58e3d8cb3f9a47445d7adfa9b9b4a1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-05-07T12:55:27Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-10T20:13:04Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"[msbuild] Change vulkan libs dir search priority\n\nVulkanSDK 1.2.135.0+ comes with a lot more libs including glslang.lib and SPIRV*.lib. This allows to load all rpcs built libs first.","sha":"04ead3cba41866c42428d022d35af54abdff82c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-05-07T12:55:49Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-10T20:13:04Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"[msbuild] Exctract Cmake cmd line to variable\n\nSame change as was made for llvm_build","sha":"48ecc003681fb09719058337da95c9bbd879e0ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-05-07T13:33:43Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-10T20:13:04Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"[CI] Update VulkanSDK to 1.2.135.0","sha":"5dc8b052755a3aa41976ee07ac11fdf646eac043"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-09T12:36:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-11T08:37:00Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rsx/fp: Fix PK2/UP2 instruction\n\n- These variants take unsigned scalar inputs, not signed.\n- Fixes ARGB8->X16Y16 in SR: Gat out of Hell","sha":"b6e856053257d7e901dccfcb9be1d898b504d9e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-05-11T10:57:13Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-11T10:57:13Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Improves skylander generation (#8177)","sha":"dd5c54290c9b523a0586692bfc963eb7c15e19dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-05-11T11:48:37Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-11T13:40:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"[CI] xenial 1.2->1.3","sha":"d67e77899f92a95c1970d454d2b247ed50a6e4e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-11T18:24:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-11T18:24:04Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_spu: Fix race in sys_spu_thread_group_destroy and other minor fixes (#8182)\n\n* sys_spu: Fix race in sys_spu_thread_group_destroy and other minor fixes\r\n\r\n* SPU: Wait for all threads to have error codes if exited by sys_spu_thread_exit\r\n\r\nOn last thread in group to run.\r\n\r\n* sys_spu: Fix sys_spu_thread_group_start\r\n\r\n* fixup ad fix sys_spu_thread_group_terminate\r\n\r\nidk why \"- !group->running\" was put in the first place but its probably no longer relevant due to other changes and was causing other issues such as not always waiting for last SPU thread to set group state to INITIALIZED.","sha":"f95b81574f3bba2da01ad81a1e7e1d0832911265"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-12T07:05:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-12T14:48:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: remove debug tab wall for Utilities menu\n\nIn order to make it easier for the user to take RSX captures.","sha":"6374a9f19b56575b1492db7fed4713795e27e627"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-05-12T15:54:31Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"sampletext32"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-12T16:28:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix possible cur_ip nullptr usage in np_handler.cpp","sha":"86cf8a1717de8631c75353cd49be3172a3e042a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-12T21:36:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-12T21:36:55Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: Remove deprecated enum VK_DYNAMIC_STATE_RANGE_SIZE (#8202)","sha":"dd9397473a42d3929d39b82ac4ddf7e956d1e502"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-05-13T01:52:01Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-13T01:52:01Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: Remove more deprecated VK_DYNAMIC_STATE_RANGE_SIZE usage (#8206)","sha":"69ea573b0dc314208d5d432b96ec12e6219d6666"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-08T19:41:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-13T09:17:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: remember registered ldd controllers\n\n- Don't reset ldd pads when saving a pad config\n- Prevent configuration of registered ldd pads in the gui while ingame","sha":"eb5ec211c28fc409f7b1f3bb22d87b2f316b9e8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-08T17:41:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-13T10:10:13Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU/PPU reservations: Optimizations part 1\n\n- Implement vm::reservation_trylock, optimized locking on reservation stores with no waiting. Always fail if reservation lock bitsa are set.\n- Make SPU accurate GET transfers on non-TSX not modify reservation lock bits.\n- Add some optimization regarding to unmodified data reservations writes.","sha":"525453794fddbbdbadeac943aa2302739bc00729"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-09T05:42:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-13T10:10:13Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU: Use optimized PPU signaling to SPU on reservation pause","sha":"b38580bf32f4f1bb46e80227e62f44825754ee72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-09T18:00:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-13T10:10:13Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU LLVM: Improve MFC transfers recompilation for non-TSX","sha":"12f027880856ba1f3345757d2a76bdc0b24678c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-12T21:09:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-13T11:33:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Rewrite data texture remap expansion\n\n- 16-bit channel formats have special 0x4|0xE encoding for only 2 channels, not 4\n- float textures do not take any remapping and crash if you try it.\n  Depth float textures work fine though.","sha":"118bfbbe988f97161c6f36ad52c92701da59d895"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-13T12:13:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-13T13:53:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU: Use optimized reservation waiting for reservation load (non-TSX)","sha":"5c4c8f45391f2e6553608c00b6d2287615ac7e29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-13T13:04:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-13T13:53:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vm: Fix vm::passive_lock regression (#8175)\n\npossible broken signaling in rare occusions.","sha":"93122196d9fe6aab1df6fc4c253d8232b72a17b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-12T01:46:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-13T16:36:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_spu: Minor cleanup of group termination process","sha":"7ff25588f48dc7976605222325f0bd08e2549051"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-12T07:12:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-13T16:36:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_spu: Add short sleep in sys_spu_thread_group_terminate","sha":"8cca113ef477e2705408564be0024846bf1f183b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-12T16:17:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-13T16:36:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Implement spu_channel_(4_)t::try_read","sha":"9266507e4cbed7bfbf56fdbc107d46f54497bc79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-13T04:01:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-13T16:36:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor EFAULT fix in sys_semaphore_get_value/sys_event_flag_get\n\nESRCH preceeds EFAULT in both syscalls.","sha":"7680466e0d456097344e5acba440032ff415480f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-12T20:52:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-13T19:20:43Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Support more types of texture access\n\n- Allows more instructions to correctly decode depth textures","sha":"ed82288c1bacbe5d8e9674022b81dc9924be9fa1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-13T17:53:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-13T19:20:43Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Properly fix dynamic state descriptors","sha":"cc723ed45c2c8d6eb77340e87078b48512b1a5f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2020-05-03T01:29:02Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-14T10:14:28Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"PPU LLVM: Accurate vector instruction NaNs\n\nTested with https://github.com/RPCS3/ps3autotests/tree/master/tests/cpu/ppu_vpu,\nresults in that test improved by about half.","sha":"78ac2a86bb133f0b28b5c8998dc0989bff141f6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2020-05-03T06:32:10Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-14T10:14:28Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"PPU Interpreter: Accurate vector instruction NaNs\n\nTested with https://github.com/RPCS3/ps3autotests/tree/master/tests/cpu/ppu_vpu.\nThis commit gets us from 2746 to 353 different lines compared to realhw.","sha":"20d8d38e534f4cb94280997d2c29f0cf8248aba4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2020-05-13T13:47:36Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-14T10:14:28Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Emu/Config: Add option for accurate PPU LLVM vector NaNs\n\nTurned off by default.","sha":"b1fb5b62395e8a9ec984abf8bfe40ce5af0085f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-14T11:57:58Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-14T11:57:58Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Improve blit engine memory validation (#8215)\n\n- In blit engine logic there is a tendancy to over-allocate so as to avoid having to sticth together textures later\r\n- Sometimes this can lead to out of bounds access and crash applications, so memory must be validated","sha":"310f367fb1174117c42b1e13d695149f52e7287f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-14T12:34:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-14T12:34:14Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU LLVM: fixup after #8175 (#8214)\n\nMask out RESULT cmd bit, do not create unbound branch blocks. (non-TSX)","sha":"91d06a97296e5e418fb601284577475d8c7dfbaf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-14T14:43:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-14T15:58:50Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_spu: Fix sys_spu_thread_group_terminate vs sys_spu_thread_group_exit race on values","sha":"54dd9f4eae02d0a7580eeaa11248abf1f6fc1ca5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-14T15:07:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-14T15:58:50Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU: Minor cleanup of exception in stop_and_signal","sha":"61f43d78dff98ea5cfad3c6dfccd1eae77ecce2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/17685135?v=4","date":"2020-05-14T18:42:21Z","email":"Mrlinkwii@users.noreply.github.com","login":"Mrlinkwii","name":"Mrlinkwii"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-14T18:42:21Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Spelling fix in texture_cache.h (#8219)\n\nheurestic_end -> heuristic_end","sha":"c22d778143e655f1ca6119ec1edab75564729c97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-14T18:39:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-14T18:42:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove std::rotr usage for now\n\nIt seems to be missing on some std implementations.","sha":"7824419bbfe2205a1169c896e86dc174b27b7e3f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-14T21:50:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-14T21:50:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update Supporters","sha":"cccc5bc18d11314b212aacc6b05e33330eb3ba55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-14T21:53:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-14T21:53:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update Developers","sha":"e186ef949047a8be5bc332e8a0739f44b88041ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-14T21:59:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-14T22:46:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update Contributors","sha":"67b002f5861dd893a2d57e30a7c94f84ef807b71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-05-15T03:04:24Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-15T03:04:24Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Bump Linux CI version (#8226)\n\nThis updates Qt to 5.14.2, Ninja to 1.10.0, SDL2 to 2.0.12","sha":"b5dbb2eb36d22d83eef165628ef2ad9068d145e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/37698908?v=4","date":"2020-05-14T19:43:46Z","email":"37698908+illusion0001@users.noreply.github.com","login":"illusion0001","name":"illusion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-15T17:01:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI followup for https://github.com/RPCS3/rpcs3/pull/8148","sha":"db4414ca87d6b50dcc61118e02195892829d1607"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-14T12:23:15Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T07:29:00Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"gl: Rewrite Debug Output\n\nRemove Windows restriction, enable Debug Output for every supported OS\nFilter our severity by Khronos severity\nHandle and log source and type enums","sha":"308cdfac3569913483fea071ad0271adbfb17d8b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-14T12:23:44Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T07:29:00Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"glext.h: update from 20180114 to 20200423\n\nInclude newly added khrplatform.h as well","sha":"d4333788e269c0ec67b305c7e5d26a14ba82e952"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-14T12:53:40Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T07:29:00Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"gl: Avoid issuing glDelete calls with m_id == GL_NONE\n\nApplies GL_NONE macro usage where it makes sense","sha":"3ad12cf5f82db941be8a855297c717e9bb14bc03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T06:33:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T07:29:00Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"gl: Remove older debug code\n\nKHR_DEBUG path makes this obsolete, usage of this older path has been \nremoved a long time ago","sha":"eecb22e749853b051affd3226c733258751e497f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-16T08:55:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-16T08:55:56Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Fix data written to RSX semaphores and the initial data of them (#8235)","sha":"8a0425570c7e97cdb81ec31a4c6ca753572912c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-15T23:10:53Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T10:45:59Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"glsl: Avoid implicit int->uint conversions\n\nSilences debug output regarding implicit int -> uint conversions","sha":"99f5145aab66ca45f1c186fdee540ec6a4b40807"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T10:28:54Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T13:50:05Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"gl: Check for EXT_depth_bounds_test\n\nAvoid glEnable/glDisable GL_DEPTH_BOUNDS_TEST_EXT flood that returns \nGL_INVALID_ENUM if the feature isn't supported","sha":"661636efeff375f361d7341fba083052df2e77ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T05:50:28Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T15:16:17Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"gl: Refactor shader compilation","sha":"3db2f23e0243ecfdf373a5a10215a734867fc8d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T06:31:25Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T15:16:17Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"gl: Refactor shader type usage\n\nUse Common/GLSLTypes.h program_domain instead of duplicated own internal\ntype","sha":"b0d3c4d75e9860b7be1fca5455216fb3bffcc1c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T07:19:42Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"AniLeo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T15:16:17Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"gl: Only log shaders if g_cfg.video.log_programs is enabled","sha":"a8bca8b2ed7356d77109d16d7bf0fe2f0b7866ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-16T17:23:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-17T06:11:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Fix precision clamping on MAD instruction","sha":"37df3c6f9613b7ed517106f1c468164f1be40667"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-17T05:59:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-17T11:20:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU reservations (TSX): Remove wait flag in PUTQLLUC","sha":"a2653532efe7b218d0f9487341d1fec746e872f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-17T14:48:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-17T14:48:35Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Write 4-byte long data to all semaphores (#8246)\n\n* rsx: Write 4-byte long data to all semaphores","sha":"377e2ce3e82e8704815c863d34c87d848acc5a4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-16T11:35:01Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-17T14:49:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"gl: Restrict insert_vertex_input_fetch workaround to Intel proprietary\n\nIt works fine on Mesa iris\nFixes detection of Mesa as recent Mesa does not have \"x.org\" on vendor string, allowing vendor_MESA to become true instead of vendor_INTEL on Mesa Intel","sha":"581176fb1a8ba0b04d573376ba8cba0388eae350"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-05-17T20:19:17Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-17T21:01:59Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Dev: Switch to alternate Qt host for reliability","sha":"a2327de3cb08e0fe13a9ea91261c0f589e589869"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-05-17T20:19:53Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-17T21:01:59Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Dev: Switch to dropbox for Vulkan SDK for reliability","sha":"2591d99db118d02b1d1de408c0e3ece30027f717"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-14T12:21:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-17T21:35:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU interpreters: Implement AltiVec NaNs precedence and data preservation","sha":"201d54ee08b75c63851ad2b6b937d2e2bcbfa3b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-17T18:33:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-17T21:51:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement std::countl_zero and friends\n\nTrying to fix macos build.","sha":"ae519200ede6535ec8d920a9ebe263e126918dda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-17T19:53:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-17T21:51:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"rsx_utils.h: fix signed/unsigned comparison","sha":"72fedccaba421616567fdb87c882a69b7e104f93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-18T12:38:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-18T15:46:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: properly handle strict rendering mode switch","sha":"1fffffad7a2aad95a2c0594875615d17c4b72392"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-18T13:02:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-18T15:46:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: disable TSX in the config.yml if not supported","sha":"703841e251a0b734b42d77e38201b5a91f217dec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-05-19T01:11:12Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"sampletext32"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-19T06:18:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Optimize Qt properties in about_dialog\nhttps://doc.qt.io/qt-5/qt.html#TextInteractionFlag-enum","sha":"3d320aea2cce4293f05843e4f336db7f84eabd1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-05-20T06:40:14Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"ZeeWanderer"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-20T06:40:14Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"[msbuild] only link llvm libs to Applications (#8262)\n\nPreviously llvm libs were linked into all lib pjojects that import `rpcs3_llvm.props` which resulted in 200+ MB libs and probably longer compile time.","sha":"91ee480e568f22c81813565593108be6c4dfeff2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-05-12T16:57:03Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-20T18:55:01Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Optimize FCGT\n- Optimize FCGT to a single signed integer comparison when possible\n- Add is_spu_float_zero helper","sha":"c47d04fd2f025483e1166616e1fbb784d0c40a4c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-05-19T18:11:53Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"sampletext32"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-20T19:53:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix some misspells\nNote: in main.cpp there are many dirs similar to Program Files, so tip should be appropriate.","sha":"1a8fb613734ce2804dfabfe11251eb09c53883e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-16T17:03:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-20T19:55:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU MFC: Implement MFC_SDCRZ_CMD","sha":"81684919f55a54df9723e6fc96f120a70d586df7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-16T17:29:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-20T19:55:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU MFC: Fix SN interrupts","sha":"4405f46aeca57b257223df691c234943cd87e2f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-16T18:43:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-20T19:55:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU MFC: Fix MFC_WrListStallAck on interpreters","sha":"7c3166a0c60114dd1e72549a97a8425a2f41dc0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-20T19:51:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-21T16:27:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement masked stencil buffer clears\n\n- Partial stencil buffer clears were not implemented. This is for example where a game can choose to clear only some bits from the stencil buffer.\n- Vulkan does not support masked stencil clears natively, it has to be implemented as a graphics operation.\n- Also refactors vulkan overlay passes to use global resource system instead of forcing the render backend to own all of them and manage lifetimes.","sha":"7080305d828e31e51e2f435accc3b967af19feed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-22T01:48:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-22T14:37:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU disasm: do not disassmble non-executable memory","sha":"0e6abd66cace7af44443124cdcb6047d98988012"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-22T02:12:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-22T14:37:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU/PPU disasm: replace \"illegal address\" with question marks","sha":"2d1d36678dcd870afb3c42d5a8507a45b65cd809"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-22T04:21:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-22T14:37:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU/PPU disasm: replace unknown instructions message with question marks","sha":"81749f43539be01549b118a388431f9e5b8f55d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-22T09:37:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-22T14:37:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel explorer: Add information about first PRX/overlay segment","sha":"a703f6febb5ff348e873b13c68b4326cbdc29c98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/17685135?v=4","date":"2020-05-22T12:41:21Z","email":"Mrlinkwii@users.noreply.github.com","login":"Mrlinkwii","name":"Mrlinkwii"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-22T19:19:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update cellSpurs.h","sha":"68bee397eb68227ec85582e80b5816abb58652ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-21T09:46:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-22T21:48:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Fix page faults notifications","sha":"b8f86eb78df6a8a7a856b70699eabfd446f5ec5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-05-22T21:54:28Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-22T21:54:28Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Add FreeBSD to CI (#8261)\n\n* CI: add FreeBSD job\r\n\r\n* CI: add FreeBSD job on CirrusCI\r\n\r\n* CI: disable Travis on FreeBSD due to broken ccache","sha":"3048bb1a75b9e890b4ef641a9a5792395b7dd00c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-05-23T00:04:58Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-23T10:52:17Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"[CI, Windows] build SPIRV-Tools separately","sha":"6efc735728671694d41789a7670ffe9696737aa6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-05-23T00:08:10Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"Maxim Kulyk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-05-23T10:52:17Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"[CI, sh, Windows] Do shallow submodule init. History is not needed.","sha":"ab6942d9746cb7774e561f905830d11174b71fda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-05-23T13:53:49Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"ZeeWanderer"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-23T13:53:49Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"[MSVC 16.6] Microsoft.MakeFile.Targets(46,5) :thisisfine: (#8279)","sha":"695b6e8f4698121bbc59dbea1de1abe3b897874b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-23T17:00:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-24T08:31:37Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"nv3089: Account for subpixel addressing\n\n- Those strange offsets noted in some games seem to match to subpixel addressing.\n  For example, when scaling down by a factor of 4, a pixel offset of 2 will end up inside pixel 0 of the output","sha":"bd41a108d813979c3d711850eb9123a8c37c7698"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-24T10:12:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-24T10:51:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix data format remapping\n\n- Includes missing 0xEE and 0x44 variants of the 2-component data format remapper","sha":"224a0e4b1a1da556e2aad7cbb7045863ddf5b8d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2019-11-28T10:17:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-24T16:24:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"idm: Implement creation/destruction invalidation counter\n\n* \"Ensures\" newely created IDs won't have the same ID as old destroyed objects for lv2_obj. (256 tries cycle)\n\nSimilar to how the kernel implements it.","sha":"3265772ae4d5dc32fcd499c276f20f110c3bedd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-23T10:42:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-24T16:24:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_mmapper: Fix possible memory leak on error of create_lv2_shm","sha":"865180e63e10b5336ca062829d6b1fad8618a3c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1712979?v=4","date":"2020-05-25T19:07:11Z","email":"dsdominykas@gmail.com","login":"xddxd","name":"xddxd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-25T19:07:11Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Copypasta fix (#8289)","sha":"f56b362769e9bdad15681485aa9ab84c2a020f99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2020-05-25T23:33:59Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"ZeeWanderer"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-05-25T23:33:59Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"[CI, Cache] Add proper cache versioning (#8285)","sha":"9d02231074e23c110babf03c5fab18f81c926c52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-27T15:41:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-27T15:41:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix warnings","sha":"abf9a08ee3556c261ec78b1cabc1d2abe07f0ed4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-27T15:53:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-27T15:53:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: implement get_segment_base()\n\nFake function used to compute 32-bit offset of local functions.","sha":"8e9d2fa70e43235faca1b539378453ea367bdb1c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-15T15:57:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-27T19:39:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU: Implement PPU Traps Stubbing option","sha":"f0cdd8ace6946c0643fee501e360004d46090b71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-27T17:58:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-28T09:56:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"rsx: Fix possible case NULL zcull_ctrl in on_exit()","sha":"3d20ce70f5d1f4812835713f940c8ca559092b7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-23T13:36:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-28T20:23:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Fix page faults notifications (non-TSX)","sha":"a199c71a55becbb0d5188c63cce159444be91610"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-24T03:51:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-28T20:23:11Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Fix possible deadlock after access violation via DMA transfers","sha":"3df83e03a9f5b33529ea2a1e52dc7757d64e0c09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-28T21:51:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-30T11:47:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement stippled rendering","sha":"1677618c75d7cdc015898b5d1ab0ea68b83bc2fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-30T10:48:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-30T11:47:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add stippled rendering support to interpreters","sha":"542a6aed5137e7c6c157ee595281168747341731"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-28T21:52:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-30T11:47:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix shader logging","sha":"59d44cd1ccebc51dc51bab173ac9d704f78d4ebc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-30T11:09:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-05-30T11:47:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Typo fix\n\nCo-authored-by: Megamouse <studienricky89@googlemail.com>","sha":"c9a978a03e38df3134a76ffbd6bc6c2935a40bf3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-29T23:17:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-30T23:26:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Compile EBOOT.BIN on 'Create PPU Caches'","sha":"377ad9887cb2484d49e106193d1aa9f8eb3d430d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-30T10:41:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-31T05:37:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VS: randomly changed project files","sha":"3e2aede85ce985559d06c1065594b5d5b367e3bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-30T10:43:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-31T05:37:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellAudio: make master volume dynamic","sha":"99895471ae97ef2dedc245134f30d32be05e941e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-31T11:21:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-31T18:02:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Avoid copying std::shared_ptr in sys_semaphore","sha":"675fde69aa183d932d43ef46fa5ecf69d872c92b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-31T18:54:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-31T18:54:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: fix spu_cache dependency\n\nShould fix possible crash on exit.","sha":"1507a597863230238825f767fbcf907711e4d71c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-31T20:06:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-31T20:06:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add game patch support in 'Create PPU Caches'\n\nTry to compile patched version of EBOOT.BIN","sha":"2d2ed7efd0708fe57d4947e8f8b6a695ce013c38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-31T23:27:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-31T23:27:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve Stop Watchdog\n\nPrevent termination if PPU LLVM compilation is in progress.","sha":"938ca90a02c055816156ba30bd91c6860860f45e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-01T15:34:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-01T16:05:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"XAudio2: remove nasty 4x volume factor","sha":"66d13da2acfa288d2413d179fcb56a1a0adcf2c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-06-01T01:40:48Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-01T18:39:28Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Use clamping helpers for FMA32x4 and FM","sha":"c601374b1f70cb3c2a48854a609949dd4c43d8d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-01T18:11:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-01T19:24:27Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve surface cache resource management\n\n- Do not allocate too many objects. This is a problem in games using dynamic memory allocators that can make it rare for a surface to fall on the same address twice, keeping zombie RTVs and DSVs alive much longer than needed.\n- Current limit used is 256M of virtual VRAM which is impossible on retail PS3","sha":"b353bf6c563f7994a2f953e2f7437b1f64bd1309"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-02T17:50:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-02T18:37:57Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Properly account for memory sizes of reused surfaces","sha":"26b2e4253d27a4cc14d13335f99c9114dea0b432"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-02T20:00:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-03T06:45:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Ignore self-referencing register writes.\n\n- Sometimes, usually with shaders that do pack/unpack operations, there is a write-to-self operation.\n  For example r0.xy = r0.xy\n  Obviously no new data was introduced into \"r0\" by this, so we should not mark the register as having new data.\n\n- TODO: Investigate on realhw if self-reference is needed to \"cast\" the overlapping half registers to their full register counterparts.","sha":"73fe9b51de22ab7cbf1795072cec294a95fce83f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-03T18:19:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-03T19:05:33Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix fragment state updates\n\n- Fix copypasta for POLYGON_STIPPLE_PATTERN vs SET_POLYGON_STIPPLE method binding\n- Use proper enums for ROP_control bits to avoid confusion","sha":"650152e05f34a1ece34e7d40329cc9dd1d0b207e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-06-04T16:30:11Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-06-04T16:30:11Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix sys_net_bnet_poll regression (#8337)\n\nCo-authored-by: Eladash <elad3356p@gmail.com>","sha":"9657b3f1d4f2a4b5ea3cf874fee6ee28f8c051d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-06-04T06:19:56Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"sampletext32"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-04T16:48:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix some checks","sha":"437f374baee7bf6a9df554caacb9a937d859708d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/37698908?v=4","date":"2020-06-01T05:58:14Z","email":"37698908+illusion0001@users.noreply.github.com","login":"illusion0001","name":"illusion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-04T17:10:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Audio dumper: append filename with titleid and date-time\n\nprevents overwrite of old file\n\nCo-authored-by: Megamouse <studienricky89@googlemail.com>","sha":"0315781306b92607723d3e5338201ea6726e29a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-01T10:19:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-04T20:09:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellAudio improvements\n\n- use CELL_AUDIO_BLOCK_32 where possible\n- use CELL_AUDIO_BLOCK_SAMPLES where possible\n- remove redundant logging\n- return CELL_AUDIO_ERROR_AUDIOSYSTEM in cellAudioGetPortConfig (probably unreachable code anyway)\n- return CELL_AUDIO_ERROR_PORT_OPEN in cellAudioPortOpen\n- stub cellAudioSetPersonalDevice cellAudioUnsetPersonalDevice and cellAudioMiscSetAccessoryVolume","sha":"41eb6d44614ae3e8f4ee0c3e62533b07beb14679"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/32246627?v=4","date":"2020-05-31T20:36:58Z","email":"ibrakap@gmail.com","login":"ibrakap","name":"ibrakap"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-04T20:10:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove mentionbot config","sha":"776c2ada6a92edf006b07c5d92e135813912f097"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2018-03-26T10:21:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-04T20:13:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"stub sceNpTus","sha":"caa1324457ce474a3a9e156c17ae470b6036246d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-30T18:00:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-04T20:13:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"stub sceNpCommerce2","sha":"8a8edb1b6231f26b03df56f834218174efebcd4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-30T18:11:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-04T20:13:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add error_code to cellPngDec","sha":"413f87b737c301e666495eebb2d6a657da81305d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-05-30T18:55:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-04T20:13:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"stub cellPngEnc","sha":"1cb4fb9c503648ec73b118f78c1b332209c693c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-06-05T00:45:21Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"Bird Egop"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-06-05T00:45:21Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Add Cirrus CI FreeBSD badge (#8350)","sha":"334d0bbc86f1403d19d65cba192b6c82223aa6c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-04T18:45:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-05T14:19:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix query reset when renderpass is active\n\n- Performs delayed query reset on-demand","sha":"69c2150fbdee3cd6cf00779764c3273de404b852"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-04T18:46:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-05T14:19:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Make the depth-convert pass multisample aware","sha":"d47d597b3449f3c3911189a3f0e1cceb05ce9444"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-06-03T22:38:07Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-06T19:27:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Fix theoretical issue with FCGT optimizations","sha":"289c5941873848980488a15d04dd86ecf4322569"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-06-04T04:52:08Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-06T19:27:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Partial revert for FM/FMA changes and other improvements\n- Revert changes to FM and FMA instructions\n- Allow non accurate/approx FMA family instructions to use native FMA\n- Minor optimization for FMA ops with a constant 0 multiply","sha":"39149fd84dca517baa9eb2f26ae9147db78a5ed0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-06-05T08:18:11Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-06T19:27:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Additional FCGT optimizations","sha":"8357523ec0215430de45d97dd6d4802381eeea15"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-06-05T08:19:15Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-06T19:27:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Optimize FM when op.ra == op.rb","sha":"dcf5c06d6d020f9374f690c0e9a6964e432ee541"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-06T16:46:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-07T09:07:27Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Separate SRC precision modifiers\n\n- SRC0, SRC1 and SRC2 have different bits for precision modifiers all stored inside SRC1\n- This explains the strange observed behavior of the MAD instruction which has 3 inputs","sha":"87cc937d4e2e377c2c38698202dc88d9a3f90f62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-07T08:13:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-07T09:54:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Improve async compiler synchronization with initialization\n\n- On multithreaded mesa, the program initialization routine was not\n  being flushed correctly. Set up synchronization fence after initialization\nis complete.","sha":"ebbf329b6aea41a42daf96902b4f19375c05c67d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-05T14:51:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-07T19:44:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement v128::fma32f","sha":"3b8e7d0967627eb48f3cda77c7c9c6109cf04a6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-07T19:43:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-07T19:44:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: implement VNMSUBFP (precise variant)","sha":"5d27f1c7329de165570b8ae98cf726fdb1aa835b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-06T00:10:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-07T19:44:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove lambda in sys_net_bnet_poll","sha":"3d7c38ff9dd70f6f16043abcca1c885c395e2d80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-07T19:20:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-07T19:44:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Atomically overwrite games.yml\n\nReduce chances of losing information.","sha":"bfee541540f6351b5c572d723a50362f99df972c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-06-08T01:31:12Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"sampletext32"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-08T02:38:39Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Unify Azure artifacts names and produce them only on successful build.","sha":"f75b26d1c9bbd5567df420dcd272ca87ee30b8db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-29T14:59:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-08T02:46:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel explorer: Improvements","sha":"c36c425fb9e4b7075a7098aaacb2d1e9eb45d8fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-06-04T20:54:34Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"sampletext32"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-08T02:51:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve tooltips","sha":"b75af69cf90418d18af2fa9af282e23b772e53d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-08T10:33:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-09T14:48:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"kernel_explorer: keep existing trees expanded","sha":"66f1cbfb3412839bde38e6598570953b89068d02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-06-11T03:14:09Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-06-11T03:14:09Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Update Azure config to fix Windows Azure build (#8399)\n\nCo-authored-by: Eladash <elad3356p@gmail.com>","sha":"1668900fb8778316365dcb42b57b67160416605b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-02T08:39:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-11T11:15:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager","sha":"2dca8d84e106f607ff27c5f1c2bed35098c61109"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-09T03:32:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-11T11:31:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU interpreters: Fix VRFIM, VRFIN, VRFIP, VRFIZ","sha":"0bf8f2a527f0bc83e6fabf06bd077d46ed2181b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36445?v=4","date":"2020-06-11T09:40:21Z","email":"36445+13xforever@users.noreply.github.com","login":"13xforever","name":"Ilya"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-11T12:08:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Workaround broken Azure badge link\n\nLooks like Azure has broken API a bit, so link to the full list of the latest builds in the meantime","sha":"768bb8d31f706ba1ad5df2e7830cbe1c32cbc298"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-11T13:12:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-11T14:31:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: add checkbox for \"enable legacy\"","sha":"4a03f06175d1ff780ecca48792a931d27c330c6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-11T11:35:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-11T17:03:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_memory: Improve allocation/deallocation syscalls","sha":"b9cb1816919ce679f1743659f60257ae3a18d0c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-11T19:49:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-11T20:23:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: hotfix for legacy patches\n\nAssignment of invalid YAML nodes is not possible after all","sha":"22b1cc765aa22c0b81954520ef783c2b69a79357"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-09T15:35:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-12T07:28:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"kernel_explorer: More Improvements","sha":"689239969985c549ae073e6c1c1390ba91d6dbe0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-10T21:52:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-12T17:19:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement signed normalized texture formats\n\n- Already partially supported via EXP option in the shader opcode, but format decoding was disabled.\n- Noticed in some UE3 games which use _SNORM variants on PC but _UNORM on rpcs3","sha":"ce587f43a0c503951b20287c941f75d1fda78203"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-11T19:46:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-12T17:19:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Merge instruction expand flag with the other sign expand flags\n\n- Avoids double expansion when both the exp_tex flag is set AND the texture also is sampled as signed\n- Should fix missing eyeballs in Mass Effect 1 with the previous sign expansion fix","sha":"f4ec28d9326f539f8f3a02ff828ee7703b25fd91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-12T16:49:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-12T17:49:47Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Fix depth buffer byteswap hint\n\n- uint24_8 is not actually swapped, it is decoded in a special way","sha":"e1183f6919c01275822aedc3c5f1c4b959e986c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-07T14:15:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-12T19:12:36Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"IDM: Implement idm::clear<typename>","sha":"f0d526411cc0cd7992a160cba136a51f4aa1e9db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-12T09:48:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-12T19:39:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_net: Stub sys_net_infoctl command 9","sha":"4bc157881d152d9622d1b3c8ff8f3f9687e715cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-12T10:23:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-12T19:39:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_net: Fix sys_net_bnet_setsockopt page faults","sha":"e1f8573c6863541ac810afe45705c23c470903c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-08T03:59:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-12T19:40:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Optimize rsx::rsx_iomap_table construction","sha":"bd6fdf3f2d9b5feecd4db67769bbb8e7c7176ff1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-08T02:28:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-12T19:41:50Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Atomically overwrite config.yml\n\nProtection against data corruption.","sha":"e485c9c79c0fd402858e3b688f2ac667cc49616c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-06-13T20:31:11Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-13T21:18:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix embedded spu elf patching","sha":"746615a93709694e542901dcab8388f48d052d0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-13T16:16:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-13T23:08:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix debugger breakpoints","sha":"56962a58da9f62546b28c15c723a4e7991f5ff45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-13T20:17:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-13T23:08:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"debugger: Fix instructions foreground/background color changes on non-executable memory","sha":"5d0066029f169ba64e5240da013319fbcccce767"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-13T20:37:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-13T23:08:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"debugger: Always show zeroes on no thread's instructions positions","sha":"5bc4f9df0d1ffd0d68dd35e9613e33481abfc46d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-13T08:35:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-13T23:25:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix lv2_obj::name64 regression","sha":"aa4fdff82cea9ca5fef2443e37d5fe52292a89ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-04T17:54:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-13T23:31:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellAudio: Fix event queue attachment","sha":"ff04cd6d6926598985ac8975df9a9e0d8bdbcdc7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-14T14:27:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-06-14T14:27:34Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_vm: Limit total process vsize to 256MB (#8431)","sha":"54308920522adc7c850335f607f2fc44cd5b6797"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-14T11:18:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-14T17:13:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve surface options invalidation","sha":"3663a8ab4d01b85f17fd304914c57fd0636b52c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-15T13:02:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-06-14T17:45:46Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rsx: Make \"Disable ZCull Occlusion\" setting dynamic","sha":"e2248332ae656a1412ebb8e4ea3fcbe617a28a42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-14T04:20:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-06-14T17:45:46Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellAudio: Minor fixup","sha":"88a0e0fe2d81523a2e590d1c97978e61927ad286"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-14T20:00:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-14T20:30:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix surface option invalidation\n\n- Depth buffers can be in special \"read\" state when writes are disabled. Account for this.","sha":"2e737ad4837b50d0f1921caee8ce5c424ce4ab30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-06-14T13:15:47Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"sampletext32"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-14T21:46:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Create Github Issue Template: Feature Request","sha":"717e851a996d76f2d44e55e9bb5d67eb41afb7ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-14T18:39:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-15T11:18:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove ARGB->D24S8 conversion shader which has been deprecated for years since compute capabilities were added to the emulator","sha":"8d8fb4a2e4570762ba3275de91c4a1b20643f66c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-04T03:37:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-15T14:08:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_cond/mutex: Fix race between sys_cond_create and sys_mutex, Fix IPC support in sys_cond/mutex","sha":"92b7c56f296098fb25257794998e1688c7e64eb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-04T06:42:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-15T14:08:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_event_queue: Fix IPC support","sha":"a0f0f58fc595d708eb81badad32406f186da9d42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-04T10:27:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-15T14:08:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_cond: Fix spurious EBUSY in sys_cond_destroy\n\nIncrement waiters count inside IDM's mutex lock scope.","sha":"314dc4c5de7bcba8407ca6cd0c34580777f3ba62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-04T11:27:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-15T14:08:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Move check_state() outside of mutex scope\n\nCan result in a deadlock in some cases, cpu flags are checked after this function as well anyways.","sha":"c15b5f1ecabfcb0d7d57ef97049e882879cd0067"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-04T19:32:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-15T14:08:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sus_lwcond_signal_all: use protocol specified in lwmutex\n\nTrying to fix a nearly impossible corner case.","sha":"5fda9a4efb20f62c8cffd055f002932144699e9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-06T14:08:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-15T14:08:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Implement EBUSY error on non-empty mailbox (sys_spu_thread_send_event/sys_event_flag_set_bit)\n\nWrite into inbound mailbox under mutex.","sha":"5777a1d42609325f6926a05e415175cd7493cd57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-15T14:24:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-06-15T14:24:04Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"v128: A few optimizations (#8432)","sha":"731d4330fe7d1a568156aae9467cc2e85ef611db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-06-05T14:35:53Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"sampletext32"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-15T19:26:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Avoid string reallocation in swizzle CgBinaryProgram","sha":"0ad4e91001b72238a752aedb4456145b9df26f57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-06-16T00:06:15Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-06-16T00:06:15Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"std header guard in BEType.h (#8448)","sha":"3d3c91d654e70f7380cfbb4ebadd3652b591f883"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-15T19:06:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-16T16:12:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve mipmap gathering\n\n- Account for source offsets when grabbing subregions\n- Scale input accordingly when sourcing from fbo in all paths","sha":"83d818d96f788db9f6d1a34d6e6f863e80f36be6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-16T18:24:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-16T19:36:38Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Properly handle conversion of G8B8 and related formats\n\n- These formats are 16-bit packed, not separate 8-bit channels. Conversion requires byteswap for them.","sha":"c764925b4d976cc62b60257e56348cc0e51d8e79"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-06-11T22:37:50Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"sampletext32"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-17T12:46:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update Github Issue Template: Bug","sha":"4092e3e95f9405e04d89bcba172b7d4a718379ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-17T18:32:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-17T19:18:47Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Account for subpixel precision when converting DST coordinates to\nSRC coordinates\n\n- When extracting a 1x1 texture from another texture of a different\n  format, width conversion can result in a dimension of 0 if the\nextracted texel is not a full texel in SRC","sha":"2086e7f2e8d16bd40cce3368cdf21f4679cbb7c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-17T17:19:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-18T03:47:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Avoid bad optimization in FCGT","sha":"5c6dae498bdb3df25195e21930cde2c43714e9fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-17T17:25:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-18T03:47:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"fixup","sha":"3ee1d8aed118fd2e3392bc202862a3e79ac30882"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-06-11T18:44:35Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"sampletext32"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-18T03:49:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update Github Issue Template: Regression","sha":"249686708cf3e4941feb0250de269c87b6f0b9ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-21T16:47:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-18T17:13:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_mmapper: rewrite page fault thread notifications\n\n* Fix a corner case where SPU thread has the same ID as a PPU thread.\n* Fix a potential deadlock on Emu.Stop() while sending event in EBUSY loop.\n* Thread specific notifications.","sha":"d86c9a254974806e78c3a234c985fd1be9ac7fa9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8129300?v=4","date":"2020-06-20T09:39:10Z","email":"oschowa@web.de","login":"Oschowa","name":"Oschowa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-20T10:42:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"FAudio: remove 4x volume factor\nSame as commit 66d13da2acfa288 for the XAudio2 backend","sha":"5c1ce6350b8d6cfe6d799aa49d327c526cc0967b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-19T10:08:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-20T15:12:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Improve update manager messages\n\n- Add restart hint to success message\n- Use days to measure time greater than 24 hours","sha":"fd048a75da3852e298200f4dcad411100ecc1bc9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1392608?v=4","date":"2020-06-20T20:44:38Z","email":"xperiancedapps@gmail.com","login":"xperia64","name":"xperia64"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-06-20T20:44:38Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Change DLL permissions so Windows clients which respect permissions set them correctly (#8470)","sha":"7d5c8fe5534a775d0dbbffaeb1820a901796d917"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-12T19:09:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: import patches","sha":"a7ee059419133b312979fa28c8ddc0691c3408f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-13T00:16:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: improve error handling\n\nThere shouldn't be much left that can crash this thing","sha":"cc5c89539b9534b9fa267496ecc2fb6d9ac429c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-19T11:46:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: move title + serials to patch level\n\nAlso bump patch file version to 1.1","sha":"2323cd2a2d1d4cb4346d012638af1883b3276fd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-19T12:04:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: avoid patch import inconsistencies\n\nSave the original patch value instead of the interpreted value","sha":"591624b96c961e258bab74b01ccedfdb63b23691"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-19T12:34:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: move try catch block to yaml.cpp","sha":"1c7a3184136006942fb60598bab0d38f2b470940"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-19T12:37:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: replace Version and Title keys\n\nWith Patch Version and Game Title","sha":"d3c6472c0fd2d12f42b5469b8734bb4a0fb4d871"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-19T13:38:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: properly check patch versions\n\nAlso abort patch import of lower patch versions","sha":"bf978ac8cab89f53b2065cbe3b8455ea0aed3b3f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-19T14:13:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: Skip lower patch_versions","sha":"fd2cd8455557cf5174894185f5d191e2c9a0b1d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-19T14:43:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: \"Show Patch File\" in context menu","sha":"b212f29cf2a4492178a683e4385c7b60e2ba2469"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-19T16:59:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: Properly hide legacy patches","sha":"7d9d58f38fb912dd815c8a1c4ce2d368ad9de675"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-19T17:00:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: fix tree refresh and item expansion","sha":"c4fe418f66bbbbccf1cc5b950ef1346a98b933d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-19T17:47:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: Add patch removal to context menu\n\nAlso avoid saving empty patch maps","sha":"cd4ed1170053e5af5d37412a863b42ac8b3d9e6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-19T19:48:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: Allow partial patch file import","sha":"5affc459a2aaffc74b11da02f4e0a47166f52095"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-19T20:06:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: Fix load order","sha":"8659994b2c319e0718da784cd1d188b9ce4cbca8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-20T11:44:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-21T13:48:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch manager: Skip legacy patch.yml in the GUI\n\nThe legacy patches aren't supposed to be shown in the GUI anyway.","sha":"1974911a71e156348aa01c7862df4edfc427c48c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-21T13:41:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-22T17:12:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Support DRGB8 sampling of render targets","sha":"e992cbe01b24f10378636db9c8bb26e682703df1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-22T16:13:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-22T17:12:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix ABGR decoding for colormask and clear color\n\n- The bytes in these values are based on the format according to hw tests\n- G8B8 is unaffected as the first two bytes are already G8B8 for A8R8G8B8 standard layout (BGRA)\n- A8B8G8R8 and its derivatives have words 0 and 2 exchanged.","sha":"7f917c8ba55050c63be1541ee11b360b88ab8feb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-22T21:26:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-23T01:34:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Update readme badges","sha":"7e3ece7d9f125882dcdc12ce63cc0728860849df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-22T17:16:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-23T09:15:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fixup: Fix color clear logic\n\n- Enable fast clears on ABGR formats in vulkan\n- Fix disabling color clears for unsupported formats in GL","sha":"c6a9a5d5d73c743edcbde909ed4fe04a3817a636"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-22T18:27:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-23T09:15:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix surface options hint mechanism\n\n- Silly typo","sha":"f3637cdfdb89ebde1d2b66bbad3d687786124c58"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-22T18:37:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-23T09:15:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Validate stencil op to match realhw behavior","sha":"a14e0a0104f4d83f3d410f5823ff001a931e0537"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-22T18:38:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-23T09:15:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Validate blend factors according to hardware testing","sha":"628cb1c779d42bd9041d313192b239c309553704"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-23T19:31:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-24T13:31:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: fix missing config path","sha":"431e0eb30caa15cc0306b36b05173d8effa31736"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-24T09:09:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-24T13:31:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: add hash to applied log message","sha":"abec8503791916883f0ca23b779258e35f43ca3f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-06-23T17:34:30Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-24T14:10:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Update BUILDING.md\n\nChange Qt version to reflect the fact that nothing older or newer than 5.14.2 will build. Sad times.","sha":"e353ad3557097fa5b4ac11829de3695b11d68bff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-23T16:20:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-24T15:44:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"debugger: Shortend SPU/PPU thread names","sha":"e45d37073ae63c5d20cb7dcfc9c53af077aa5935"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-25T13:50:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-06-25T16:50:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Emulate PPU processing of auto/list post-fixed callback","sha":"ab9cdc70adec072e43f1dc46493b449fc8787fc9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-25T16:26:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-25T18:49:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: save widget layout","sha":"7d3389d54889d7a8ab694f196c8c7cc4fe05ed39"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-25T18:53:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-25T20:14:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: more information for branch nodes","sha":"9679ae68cb73c3ae7e370b715e963a084fac9fe7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-24T15:01:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-26T02:42:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: Use global variables for pad modifications","sha":"76faaf43f7a77fff5f428d3ad93c8f70dd130175"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-25T18:11:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-26T06:24:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Force flushing of NaN/INF to zero\n\n- This option was always enabled for NVIDIA cards, but it seems some games would benefit from the option on other GPUs as well.\n- TODO: Hwtest to verify correct behavior and plan how to safely implement in hw","sha":"5ea6535fd575760d159f72a494f9e437dec035cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-26T06:40:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-26T07:28:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"pad_thread facepalm","sha":"ab4c40c988ebab7129c9b85dedf0680ab69a49ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-26T06:57:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-26T07:28:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: skip keyboard input when pads are disabled","sha":"5a8eb9d3d7043efa9790e26dbf27f5840676539b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-26T16:10:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-06-27T06:04:37Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU LLVM: Fix WRCH instruction to WrTagMask","sha":"d7842b7de22c27c156c867fb71199cc5f21f066d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-26T16:25:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-06-27T06:04:37Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU debugger: Add atomic status and tag update channels information","sha":"f29589e5cf5601fb787ed676b849d59fc18ce6dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-25T15:21:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-06-27T08:02:55Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Make error_code::value member private","sha":"9cb4402c16bda5b3930ee1ad7501d5503c11ae22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/37698908?v=4","date":"2020-06-27T18:19:35Z","email":"37698908+illusion0001@users.noreply.github.com","login":"illusion0001","name":"illusion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-06-27T18:19:35Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"ui: add rsx some options to gui (#8512)\n\ndisable hw fp16 to advanced\r\n3d tv support to gpu","sha":"11e75853a6e1c3d426f9db49a932a8e2390cdc65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-26T16:25:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-06-27T19:42:41Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU LLVM: Fix WRCH instruction to WrTagUpd","sha":"20fcc6530f05cca90ee47abcde8b4a49220fc71c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-27T07:47:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-06-27T19:42:41Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU: Use named constants for MFC tag updates","sha":"2c93fecd8bc369b0b04af8c5306d7c4ccc2c5868"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-27T10:45:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-28T09:51:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"debugger: Fix registers editor","sha":"9fcbad326ac8d5575b155624b5e5955006fe947e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-28T18:57:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-28T19:54:58Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve nvidia speedhack for non-turing cards\n\n- Inverts the chip family check to skip any unidentified GPUs altogether","sha":"b437794e92fa429188186f157ff383b2d6157f28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-28T19:15:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-28T19:54:58Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add more GPUs to nvidia chip table\n\n- Registers more TU116 and TU117 variants\n- Registers GA100","sha":"5e29bdbe222878d640f6da12944c7b270919e758"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-20T05:05:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-06-28T22:26:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Remove devKlic/rifKey reset","sha":"97717defa5d784d6e60f722af219e878598a254c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-20T11:12:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-06-28T22:26:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix race in Crypto/unedat.cpp, Make NPDRM keys usage atomic","sha":"2483cc6f8d8b3116ff6e9ebcbe05c42113df2e50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-06T16:23:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-06-29T02:10:05Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"types.h: Fix ASSUME macro side-effects mismatch between compilers","sha":"d9e3f0ccfa75ffff0d59319cf499dc120865b7d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-01T13:12:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T07:06:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellAudio: use downmix formula based on documentation","sha":"5269b69bc5144c6b71c9900e79ec24b52f9df80e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-28T07:59:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T08:36:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Use proper install paths depending on pkg content","sha":"fa81146b7923f4e4c3024915d72208bf3b7df666"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-29T17:03:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-06-29T17:03:38Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"remove redundent include in Crypto/unedat.cpp (#8527)","sha":"a7a5034958de8c5827b7d6fb310cd4b1f9ba6df2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-26T00:58:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: implement serials and app_versions","sha":"12dded403fdfa967aabf4dc488f1ecbfc30eeb43"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-26T16:31:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: add option to only show owned games\n\nand remove the app version level from the gui","sha":"695cfead163aec39f5299d7e1c6773cb12ca7bf5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-26T22:23:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: add expand and collapse\n\nAlso reorder the context menu and remove some options if not applicable","sha":"3ea33763bce13b879175a7bd76a0886b8eba9c35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-27T08:32:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: add All override\n\nAll can now be used as a key for title, serial and/or app version.\nIf you check a patch for all ... then the patch will be applied regardless of what's checked for the game specifically, because we do not save 'Unchecked' patches.","sha":"e43db24b2c2302518207f922f8659415e3fbadb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-27T12:13:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: only apply one patch per group\n\nSo far this was purely handled in the GUI","sha":"6a486d34029e391c127a07151322141064d81f4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-27T12:14:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: prefer serial patches over All","sha":"c72a6f8e6fbdea3e244cb1aaa66b6577641d135c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-27T12:41:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: don't hide \"All Serials\" in 'owned'","sha":"7d2ecbf29ae009e6a587a503afa32ef9997a87dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-27T13:24:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: restrict All serials to All titles","sha":"3a17eefde7fea997cf7bec7ad75ed7cb2b9ed6bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-27T13:26:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: Always move All titles to the top","sha":"e5bb5f02e076cf33c7018754f3b398cd172e6f3d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-28T11:26:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: one patch per group across hashes","sha":"cf2e2a0511b7c84faa02215763b77bc4410bd616"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-28T12:19:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: prefer specific > global (per hash)","sha":"a5368d766a4b73975cf957320eec6e333ca22596"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-28T13:16:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: fix owned games o. for all versions","sha":"ef203f6bcbdd6f6f3ce480436e6f482b52400571"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T11:53:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: allow Notes as sequence","sha":"541e20cbec81fc3f927eef2dd8fe2617647ecd2b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T17:40:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: fix legacy patches again","sha":"98eb0cd3f2dce679dcceb4bdbcd4108c0cf3560e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T18:04:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: fix sorting of item counters >= 10\n\nThis only deals with less than 100 items (that amount is undesirable in the first place)","sha":"372eff2d8fd6967339d268bfe79da20ff8d932aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T18:34:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T21:56:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: improve import logging\n\nimported_patch.yml has to be the latest version too","sha":"c6190fa95d4506f2e0aebc3e2ad314f2ab3d6637"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T22:16:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T22:45:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: fix import, use constants as keys\n\nAnd improve import logging again","sha":"6742fad753b33288c9c7bf732d70f709053295fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-29T23:14:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-30T01:04:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: fix import dialog close button","sha":"45e1a8756faa831acfa7f63346ccd859f31d417d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-30T00:13:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-30T01:04:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: fix items across refreshs","sha":"5867b3b72e29612edaff22fe536e4b8f2f16ed75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-29T17:03:27Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-30T12:00:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Disable primitive restart for old GCN cards\n\n- Also adds more Navi 14 chips to detection table","sha":"bd14429f2062522054eb39c89714b8e40ed37c0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-30T19:35:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-06-30T19:35:15Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"patch_manager: warning for incompatible patches (#8535)\n\n* patch_manager: warning for incompatible patches\r\n\r\nThis will open a warning dialog whenever the patch manager is opened and incompatible patches are detected.\r\n\r\n* Apply suggestions from code review\r\n\r\nCo-authored-by: Bird Egop <sampletext32@bk.ru>\r\n\r\nCo-authored-by: Bird Egop <sampletext32@bk.ru>","sha":"55e907385bb9d818d7b097631562e1c893feef2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-06-30T12:02:24Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-06-30T21:35:17Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rpcs3_version: Bump to 0.0.11","sha":"6a9fe8e3c4a1a409e6e31d079640faa45797679c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-07-02T07:06:37Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"Bird Egop"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-07-02T07:06:37Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Implement Caret upwards and downwards move in overlay_edit_text (#8342)\n\n* Implement caret upwards and downwards move in overlay_edit_text\r\n\r\n* Optimize caret up and down movement\r\n\r\nCo-authored-by: Megamouse <studienricky89@googlemail.com>","sha":"eea12bad07f0bdae5a7799fc07dc67657647ddb9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9306961?v=4","date":"2020-07-02T07:39:10Z","email":"jacques.yakoub@gmail.com","login":"jy95","name":"Jacques Yakoub"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-07-02T07:39:10Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"localized.h: follow Sony Naming Conventions (#8539)\n\n* localized.h: follow Sony Naming Conventions\r\n\r\nSee this : https://github.com/RPCS3/rpcs3/issues/4259 (Main Window -> (Localized) Replace the category names with either something more gramatically correct or something used in Sony Naming Conventions)","sha":"36cf5dca823636d25dd2475fe5b3ed5af1a80e66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-22T14:31:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-02T10:55:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: remove unused function: GetModifierCode","sha":"1f2592438410112b15f489b7bdf1cfdcd7086a9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-22T14:38:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-02T10:55:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: update keyboard_pad_handler shortcuts\n\nThis is just some patchwork before the shortcuts get refactored eventually","sha":"bec6bde9192d4c9561a5384c0347a57436706d90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-22T18:19:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-02T10:55:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Windows: distinguish left and right modifiers\n\nThis is just some workaround until we either use a different input api for keyboards or until we refactor the keyboard_pad_handler to use Qt with native scan codes","sha":"b5f01372eeaf31c7b70e11c62448a057d5e36056"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-30T17:31:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-02T17:11:57Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix leaking ZCULL queries after a barrier\n\n- Multiple queries can be queued up, process them all before completing the barrier","sha":"d7ffc8b4acef309bf81b653c2d35e60068eb6ee1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-06-30T17:41:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-02T17:11:57Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement fast ZCULL barrier when query object is already known","sha":"c9c0d7361ddfb6fe37f428051ca26d2b792282b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-01T18:45:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-02T18:22:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: random cleanups","sha":"3bdce6050be3b886355b1156b8d7a4c7142f654a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-01T18:46:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-02T18:22:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix random QWinTaskbarProgress crashes","sha":"c495ef10b0187a3e7ad37407081f578b5c581835"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-01T18:48:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-02T18:22:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: refactor curl stuff into a downloader\n\nAnd add 'Background' updater","sha":"14200c1a1fcdd71724829e54a7471f38ecab9d43"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-02T16:46:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-02T19:46:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Fix barrier commands enqueuing","sha":"72337f267882ef0ce329d210e2253410390414be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-02T21:21:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-02T22:21:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: remove automatic param from update logic\n\nAt that point we already had user interaction, so there is no point in hiding the error dialogs","sha":"78eb7e73bc9baa21b8566ddd938ca6e5592265ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-02T21:29:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-02T22:21:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix signal_update_available\n\nm_update_message has to be non empty","sha":"ddd202b5ff5640f031b4685cbcd90f894de97975"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-02T17:45:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-03T11:29:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix transfer descriptors for partially overlapping slices in head\n\n- Height must be corrected to skip the piece that exists before the current slice","sha":"acf51f0ead97f03aa629714baa80027aec1a61ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-03T15:38:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-03T16:09:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: save \"owned games only\" state","sha":"f8920edb2e1579ee1dd56b1ac3f05739d5d5e534"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-03T19:16:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-04T12:28:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Add stick multipliers to the pad dialog","sha":"99be645fcc46622f485e8489b82a831505b0c54e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-04T09:58:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-04T12:28:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Random unimportant stuff","sha":"e4a9c177e67346bf7beb482e9a97091feaa22d6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-04T10:21:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-04T12:28:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add scrollarea to pad settings dialog","sha":"be8980fc2344f0154bbb95d69e9a6427f50d7fc0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-04T11:05:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-04T12:28:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: use button box for most buttons","sha":"ea4cc0b3958166e6d79f8620f9786c350db397d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-04T11:18:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-04T12:28:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input/Qt: Check if gui callbacks are nullptr","sha":"f1b1c9053c1c53c92da8c8009bee3a835011aab3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-05T09:03:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-05T13:58:44Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve ZCULL queued requests finalization\n\n- Unifies the code\n- Allows conditionals to be evaluated with a forwarder present","sha":"3fe8499956ac7c83a9559d351182c3dfd14dd17e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-05T13:11:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-05T13:58:44Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Silence warnings","sha":"05dc6ad610a5bf763285d0d357aaf2c298fc043e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-03T03:18:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-06T16:58:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"PPU debugger: Fix functions stack bounds check","sha":"c98ec4d014d2c86e7d4222de8f9f251661c1e03c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-03T04:56:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-06T16:58:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"PPU debugger: Show stack address of each function","sha":"dc25a3fa2a47f374fd5aeae8abcdb28d245281b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-03T10:11:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-06T19:14:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Remove obsolete main window close()\n\nThe gui settings aren't part of the main window anymore","sha":"332f9cae77748d9d016fc3e74abf7a01e192c3bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-03T15:11:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-06T19:14:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Emu: always use Emu.Quit() to quit RPCS3\n\nThis creates a single possible point of failure for calling quit()","sha":"d91551c27796b1c0342006b28179e366906408cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-03T15:12:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-06T19:14:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Emu: Make prevent_display_sleep dynamic","sha":"8d2ce2815c2b1b975e432ddda2aab93d49e41b6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-06T18:46:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-06T19:14:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Emu: simplify Emu::Stop some more","sha":"171e4fafed5d08a723e1256dd6a58047c78f720b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/595907?v=4","date":"2020-07-07T06:25:29Z","email":"infalen@gmail.com","login":"GHzGangster","name":"Derrik Touve"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-07-07T06:25:29Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_net: Use np_handler dns if possible for sys_net_infoctl (#8557)\n\nWithout this, cellHttpSendRequest will use the hardcoded dns 192.168.1.1, which won't work if you're not on that network.","sha":"cb08c53f2f08a909a17bb316b9ccca4cb1c45c21"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-06T21:52:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-07T07:43:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"HLE: fix sceNpDrmGetTimelimit invalid param error","sha":"5fae1b36379282ecd25e5e29526f754a7a13ef67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-07T19:39:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-08T16:23:29Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Inject memory barrier upon conclusion of a framebuffer feedback loop\n\n- Do not write to the texture until previous draw call is completed using it.\n- This is usually not much of a problem until blending operations come into play.","sha":"987ede2e6c7916765c5974e116aef754c3492d69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-01T18:36:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-08T19:11:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellAudio: implement downmix to 5.1","sha":"bb0aaea92d0fe37ab78714f6c2873a449b48c9e8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-20T00:36:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-08T19:11:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VS: show linux audio backends in solution explorer","sha":"8add57f8e970ada4ad41e0bf52e1047fc5dfd079"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-20T00:38:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-08T19:11:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"XAudio2: print readable errors","sha":"5b7ee43352ab69dee2a3f4ad38b9e25640838809"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-20T00:43:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-08T19:11:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"XAudio2: Call CoInitializeEx to prevent errors\n\nI could not properly reset the audio backend and call CreateMasteringVoice without getting errors","sha":"8ee953ef8e275fcb1cb0001c419924e85dc4b2ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-06-20T00:44:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-08T19:11:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Try to make most audio configs dynamic","sha":"20d6664dc1dae43575f5098c1441fb48158d892b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-06T15:38:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-08T19:11:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Only reboot audio if a relevant setting changed","sha":"e2fd4e46f765acf702dac38a17fcbd6c57c40243"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-08T18:42:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-08T19:11:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"audio: rename audio channels to audio downmix\n\nThe setting does not actually define the channels themselves, only the downmix option that the PS3 provides.\nChannels might be changed seperately in the future.","sha":"53b95fea19d80e747b5b18b59b1e2139a8b5b3be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-08T19:49:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-08T20:21:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix update menu for linux","sha":"e09c4b72c8d1dfe4c0fe54661590b1b68165ac51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-05T09:36:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-07-09T02:17:35Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU/PPU reservations: Optimizations for reservation locks and check_state()  (non-TSX)","sha":"d9750e8f9ff1ecefc6d3a227c6ee9bf652cba1ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-05T15:43:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-07-09T02:17:35Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU: Implement GETLLAR polling detection","sha":"f8dbfa1d1e8705a072b081461c00bd443734b152"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-11T10:57:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-07-09T02:17:35Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU: Disable PUTLLC NOP transfers detection on TSX path","sha":"84470c34db47655df52b5e3b95b791708d966dbe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-08T21:20:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-09T06:20:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix scrollArea focus during pad button choice\n\nAssigning arrow keys was broken because of this","sha":"a3e79fc1053f0e622501fc2227998a848719a693"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-08T21:47:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-09T06:20:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix pad settings resize when switching tabs","sha":"0756fd9c7e74842e1ceaa5340cba70a9c3d159f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-09T09:21:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-09T20:24:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"RawSPU: Log MMIO access","sha":"eb993781efd7fea5302afb28c8a169f021eaeb7a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-02T14:06:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-09T23:52:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU MFC: Fix MFC_WrTagUpdate channel count\n\nAlways report available, in realhw this is just a hint if the previous tag update hasnt been checked yet by the MFC, avoiding blocking writes and allowing the SPU to execute some code while it processes the previous update request.\nExcept for MFC_TAG_UPDATE_IMMEDIATE, where it also waits for MFC to process it.","sha":"5d1fc546a81c746683f4c53350d90076ab45747d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-02T15:10:43Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-09T23:52:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU MFC: Never clear tag status in WrTagUpdate","sha":"235d12aa6b761b53380ce7e92cc3c518042366c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-02T15:57:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-09T23:52:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Optimize non-constant Tag Update requests","sha":"282b00674a468c3eea8b3cfa3f3e398e6e9fbe28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-08T20:47:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-10T12:26:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Support partial texture descriptors\n\n- It is safe to declare w > pitch and it works as long as sampling inside the legal 2D area is obeyed.","sha":"632af8d723ad4125ad5fbc6b576fbac4478a1ad3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-09T16:29:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-10T12:59:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix depth bounds test\n\n- Allow depth bounds test to access the Z buffer even when depth test is disabled.","sha":"ab3d36f0f3b500936fee9cb6552890aeb9aef0d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-12T10:40:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-07-12T10:40:47Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"RSX debugger: fix command count on non-method commands (#8578)\n\n* RSX debugger: fix command count on non-method commands\r\n\r\n* fixup\r\n\r\n* constants and variables","sha":"d6623e0f22edd84d1b14e44ec42b42e188eb83e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-12T17:30:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-13T19:23:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: use left and right squircle values","sha":"4d9533ea54b43b339ce5d4810aa8643eb8202605"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-12T17:32:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-13T19:23:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/input: add squircle to pad settings dialog","sha":"e1af6dc4af53bb15c9a75424aa1c10ffc0839474"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-12T18:43:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-13T19:23:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/input: show emulated sticks in pad settings","sha":"881e8e472393e43de7bf8a4c05738bae74a33b27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-13T07:01:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-13T19:23:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/input: fix stick preview for disconnected pads","sha":"2f2a03b37be16b8afeddf836a501affea845c101"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-13T16:30:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-13T19:23:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/input: add checkbox for emulated stick values","sha":"ad0f12c742f9da23209760378ddc496e55ca1d77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/37698908?v=4","date":"2020-07-13T19:49:13Z","email":"37698908+illusion0001@users.noreply.github.com","login":"illusion0001","name":"illusion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-13T20:33:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"move applied patch log level to success","sha":"60f05fdbf30f718ddec3e3a8ffd4a2d96c7c97d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-13T19:45:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-13T22:06:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/input: add tooltips to pad settings","sha":"fe8bcac270b99b5b2b7aeb0b14b0faf05be533fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-13T23:20:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-14T00:08:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix Skyline's QSpinBox and QDoubleSpinBox buttons","sha":"d3459162417447e92444fac50d62e246aba78ef4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-13T23:31:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-14T00:08:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix YoRHa background for some widgets","sha":"e70e534bfa502061dd6cadf2098faa6163a357b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-07-13T22:08:08Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-14T06:33:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/input: unbreak with Qt 5.15 after 881e8e472393\n\nrpcs3/rpcs3qt/pad_settings_dialog.cpp:674:16: error: variable has incomplete type 'QPainterPath'\n                QPainterPath path;\n                             ^\n/usr/local/include/qt5/QtGui/qmatrix.h:54:7: note: forward declaration of 'QPainterPath'\nclass QPainterPath;\n      ^","sha":"d00f882c23f078571f6693775fa223c9680a01ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-25T17:48:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-14T09:14:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement constexpr byteswapping","sha":"07a44d0ff916ffb15f188ec56c7c1059296fd0f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-26T03:45:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-14T09:14:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Make std::bit_cast hack-implementation constexpr in simple cases","sha":"58e2465369a35acb6779479a2a6effd6c69a8db1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-13T21:25:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-14T13:04:44Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix draw count append when draw ranges are out of order\n\n- It is common for draw counts to truncate at 256 even when it makes no sense to do so.\n- e.g 256 is not a multiple of 3 so triangles will glitch out","sha":"182b20c33dd5aae53bb946044a6b80f6bcd7e91e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-15T17:45:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-16T16:11:26Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Brute-force removal of superseded surfaces","sha":"42a9ac9e6ce4f0588955b5b1817df9386cae9d04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-16T12:02:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-16T17:26:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"rsx: Fix false desync events","sha":"268bcd1c7b1f527e4b36e8caa2a3460a362bbe06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-15T13:02:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-16T18:52:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor fixup after #8501","sha":"c1a80b81464dbaccccb0fdde257afd5b40ad6531"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-15T18:57:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-17T23:01:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: LS Memory Mirrors (Optimize loads/stores)","sha":"af1ceb115184719716e3db8e4fa6d6309a65e22f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-07-04T03:49:30Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-19T14:56:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Avoid negative clamping when the input is known to be positive","sha":"6cc0fe422162164e2005a9ebb7f9d7786a158cb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-17T08:18:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-19T14:58:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Make spu_thread::offset private","sha":"c37bc3c55c16d4f2e2cb1b0d4a8ef58c8edf7d7d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-18T10:37:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-19T14:58:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU/Linux: Ensure aligned 64k allocations in utils::memory_reserve","sha":"0d8152cd4e1743362836eee325879aa16edce1f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-19T03:44:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-19T14:58:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU/Windows: Fix LS memory mirrors\n\nThis is a workaround but this is because of how utils::shm works on Windows path.","sha":"f8d2d8ca11c7a10ad5185ebe761271e960e7cb5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/37698908?v=4","date":"2020-07-21T23:41:59Z","email":"37698908+illusion0001@users.noreply.github.com","login":"illusion0001","name":"illusion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-22T08:51:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"move executable hash log level to success","sha":"3157a10428b3a04892cbb89062d7e781c71ff790"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-26T09:17:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-23T10:45:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Use waitable atomics for SPU channels interface","sha":"a029a94c7368dea0774efff1500e57faf978a296"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-06-26T14:48:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-23T10:45:58Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveData: Increase sleep time","sha":"54b87b6dbb203316c0714063b0fcae803acfe179"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-15T19:44:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-24T12:47:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellMusic: add error_code","sha":"7437c324c6298b8d4a9532e8e2b8ca5092ea8d86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-15T20:44:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-24T12:47:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellMic: error_code, random cleanup and stubbing","sha":"c2f4244c4db39590a1734dc2d88ad58739e4e5a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-15T21:16:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-24T12:47:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellFont: add error_code","sha":"a00ebacef3c8f3511c74594546e68c742de61f81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-16T10:14:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-24T12:47:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"add a gazillion more error_code","sha":"d854a3950090deff1330c8b6bcce9d6c4a7ff19d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-16T17:04:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-24T12:47:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix sceNpCommerce2CreateCtx log message","sha":"f76a011ba0d47a80b7cb828a20dcb17e8078af2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-16T17:10:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-24T12:47:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix truncation warnings","sha":"5e7c6853c27f015415f985e68770c172116f2493"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-16T17:51:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-24T12:47:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"use not_an_error in sys_spinlock_trylock","sha":"6e25fea16ae7ac48aef9cc2fd34c91ea90c76711"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-17T07:45:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-24T12:47:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellMic: use s32 consistently","sha":"bb3ac621268abff10b586754277a74013b9204f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-24T15:53:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-07-24T15:53:48Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU/PPU LLVM: Improve expressions matching (#8620)","sha":"3354c800d7cee19a838916e3d22a496c006036b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-25T06:41:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-07-25T06:41:41Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PPU Precise/LLVM: Support NJ modes (#8617)","sha":"917069e31a673256e7a2cf04da47ad626b000794"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-24T23:14:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-25T07:21:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"overlays: try to fix unexpected font crop","sha":"de80a4b6c710d1e8e75d389f7ca0e6f90c99109a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-07-25T08:46:47Z","email":"bevanweiss@users.noreply.github.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-07-25T08:46:47Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Update types.h to fix static_cast test (#8627)\n\nTrivial fix up to resolve invalid is_constructible test (To,To) to match desired (To,From)","sha":"c5d39ace2b6dbb6697a753be1619a2357898e6fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-23T19:46:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-25T11:48:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve typeless texture succession\n\n- Ensure incoming texture is large enough that the original one fits inside it to avoid back-and-forth succession.\n- Make use of the resource manager to remove the obsolete textures to avoid holding on to the them which \"leaks\" VRAM.\n  The memory isn't leaking, it's just wasting space in temporary pool until renderer is closed.","sha":"4d8de282f9e4a325f59f717c127478eac1031d36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-23T20:13:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-25T11:48:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve video memory manager to attempt recovery in out of memory situations","sha":"b0c7ca6d1fc2b36aee1fbe43fd16a5c616a93032"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-23T20:30:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-07-25T11:48:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fixup for PR #8590\n\n- This change was lost during rebase","sha":"be4b71b8052d06a4d1d300d279a7bd734f555ff2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-25T16:13:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-07-25T16:13:58Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PPU: Fix DIVW, DIVWU, MULHW, MULLW, MULHWU when op.rc is set (#8630)","sha":"da44d5f10dcfafe6e3c04050dad376143aa89e80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-07-25T16:59:35Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Whatcookie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-07-25T16:59:35Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU/PPU LLVM: Optimize VSEL/SELB with constant mask (#8559)","sha":"9f829b375a69ee933af1c90c2dc78fe28e872ba0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-07-26T07:47:50Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-07-26T07:47:50Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Fix cache skipping shaders on load+compile (#8633)\n\nWhen on single worker mode (OpenGL or an hypothetical scenario of a \r\nsingle core PC with Vulkan), load and compile would skip 10% of the \r\nshaders on queue each stage.\r\n\r\nCo-authored-by: kd-11 <karokidii@gmail.com>","sha":"74c8a44d847a8a1f99f46437da02daf455c17676"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-06-30T15:33:22Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-07-26T10:36:50Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU LLVM: Avoid redundant endian swapping\n- PSHUFB operates in reverse byte order from SHUFB, so we can take advantage of that to swap endianness without additional transformations in some situations","sha":"824be77bba531b0d769778a4c7bf5e4b624a07b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-07-12T22:21:23Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-07-26T10:36:50Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU LLVM: Avoid additional endian swapping\n- Avoid additional endian swapping with the ROTQBY and ROTQBYBI instructions\n- ROTQBYI is left out intentionally, since it caused worse codegen","sha":"a9d0ffcac1b4ad33f2f2c99c40287a43c0b1eece"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-07-25T12:00:04Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-26T12:27:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"VK_REMAP enum is signed.. but later case comparison is unsigned\n\nanother clang directed fix up... might be involved with swizzle..","sha":"7898ae6fe66aead95c748ef525209d67e9c72919"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-07-25T10:52:56Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-26T14:23:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update cellAudio to use float constants instead of doubles\n\nAnother simple Clang recommendation","sha":"609182b1315210190158985757b1727a2704d37c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-28T16:04:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-28T18:07:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix download menu visibility","sha":"e58e1ebfd977e3c42edd0d32254ccc0a19b9d512"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19759300?v=4","date":"2020-07-28T18:17:11Z","email":"MSuih@users.noreply.github.com","login":"MSuih","name":"MSuih"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-28T18:55:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Improve error messages in firmware install","sha":"2ce49e367412aec320206034542b029550f313c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-26T15:32:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-29T00:32:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Minor cleanup after #8559","sha":"21a1072117beda326fac134fd49db873846a1341"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-28T17:01:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T09:28:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Improve error handling during config loading","sha":"ef3e8d26ce1a41f8b7084dbde4b2cacfc1939b61"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-28T21:11:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T09:28:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Improve error handling of config nodes\n\nThese conditions are most likely only gonna be met during development","sha":"1c6003acd5daf4dd48c6f2006572226aff2d80e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-21T07:50:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T11:18:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cheat_manager: fix long search result lists","sha":"16212854b48845e949209aafc3800fc473fed500"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-21T08:04:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T11:18:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cheat_manager: disable search buttons if nothing was entered in the search field","sha":"f820a7a205cd784ed8233531805a6f512a2eb95e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-21T09:02:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T11:18:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cheat_manager: use enum values for columns","sha":"cb6e536fbd0ff1d1c90b161a11fa08cfc02c1cc6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-22T20:02:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T11:18:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cheat_manager: move cheats.yml to patches folder","sha":"d0bb9d2b62014409a8fb8663fc2d0e3a1b642831"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-27T07:38:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T11:18:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cheat_manager: improve parser errors","sha":"47040be3add3b1346c0878023db043b3a4ab57ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-27T07:44:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T11:18:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: fix minor warning","sha":"f073ff8fe8a7df94e7c75f46e969c4b3037a8793"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T10:24:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T11:18:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cheat_manager: make sure that the patches path exists","sha":"4315363f4b2c666ae2688f27a8ae24f74748cac2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T10:37:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T11:18:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cheat_manager: notify if no game is running","sha":"ebf832214ebd2e9ee46e8cbdb3f3ba2af19f770b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-30T09:07:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-07-30T09:07:18Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Fix spu_thread::cpu_stop() missed executions (#8656)","sha":"82068cf8025fac7adb48d54298b85741277964a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T11:16:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-30T10:17:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Don't open an error dialog in headless mode","sha":"03ae1481fb121f07f6cb5dee73e6d4c781c5ebe1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-30T13:01:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-07-30T13:01:25Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Implement SYS_SPU_THREAD_OPTION_DEC_SYNC_TB_ENABLE (#8657)","sha":"e52dd9dc6f6ceb9dd24d38fc8866a992a5175571"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-29T17:24:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-07-30T16:06:24Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU/PPU LLVM: Fix cpu_translator::get_const_vector<v128>()","sha":"f6764767f68fea0d3939d4010332758a6d3656d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-29T20:13:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-07-30T16:06:24Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"PPU LLVM: Fix constant folding of BitCast","sha":"dd497625a5e5fcc9380a1adafea9fe41a9eda7d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-30T11:23:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-30T18:03:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Gracefully abort headless mode with unsupported video renderers\n\nAlso fix no_return bug","sha":"3bba9708d94239740010e4a83fd0039a56f02d55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-07-27T16:16:15Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-30T21:36:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"CI: Avoid trying to publish builds on forks","sha":"e11734f9716ad0952816a849944da5265b0191f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-30T21:37:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-30T23:13:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix missing GPU in game window title","sha":"107129f95a9766ace412581101506c9348a2e8f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-01T11:27:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-02T13:14:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Propagate raster type of fbo sourced data throughout the pipeline.\n\n- Tracks which kind of raster was done (Z-ordered vs linear) throughout the application.\n- This allows to identify if data is in the expected format or not.","sha":"4df933275b664cc81d903a914dc8f57323a41af9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-01T11:57:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-02T13:14:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Decode swizzled GPU data on CPU readback\n\n- Currently this conversion is being done on the CPU to reuse as much code as possible.\n  The expectation is that this almost never happens, so there is not point in increasing maintenance burden by adding compute paths","sha":"bd21930d1aa08988f69f59a4172e360f7e8ca267"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-14T19:33:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-08-02T23:57:20Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"lv2: Minor fix of \"unspecific ppu\" path of _sys_lwcond_signal","sha":"17f965c17167a6ed1dc007deb9039d96db42f166"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-30T15:39:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-03T14:43:00Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"PPU LLVM: Fix VMAXFP, VMINFP NaN handling","sha":"6a51c27fde3daaed219c4e68142096600109c974"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-07-30T17:03:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-03T14:43:00Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"PPU interpreters: Fix VMAXFP NaN and signed zeroes handling","sha":"70fb5712e58083592a1cbb8ac7d6d5ac8b190589"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-02T14:03:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-03T18:17:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: move some more settings to persistent_settings","sha":"8799eebfe19a475591f67f04de0e673014eab58c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-02T15:36:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-03T18:17:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: do not use on_<obj>_<action> syntax for slots\n\nQt tries to auto connect those","sha":"2cdb46b167d6db57b8091b0bfb0c5174a898772d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10439488?v=4","date":"2020-08-03T17:18:32Z","email":"10439488+dio-gh@users.noreply.github.com","login":"dio-gh","name":"dio-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-03T18:59:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"make some cfg logs error instead of fatal\n\n- in case there's a default value to fall back to, log with error\n  instead of with a fatal","sha":"938bf8624cdd6dbcca35791185c208f1b7cb8c30"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-03T13:17:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-03T19:31:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add config override as cli arg: --config <path>\n\nAnd add some more logging","sha":"d633a266c19f839cf8ae9274d0c38841cf2cc1e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-07-29T11:21:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-03T20:03:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Try to fix ugly GUIs","sha":"25d73f5a706b9ae31eecb03cba9d61e3f7fba206"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-04T13:10:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-04T14:15:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix input lag in pad settings\n\nLooks like repainting stuff inside a resizeable layout is slow AF","sha":"815d6f42233a6482ed66b6e320b408fb4bad22e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-04T11:55:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-05T06:10:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add rap files to pkg install file dialog","sha":"fab1f7d939004653b0dea4839dcd5fe25a01cbf3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-04T17:03:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-05T06:10:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: unify package installation logic","sha":"17557df9f4d2d0727fc6f5593e625d555208960c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-05T19:50:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-05T20:23:38Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve swizzled layout detection\n\n- Reset swizzle flag to false automatically on section reset.\n- Detect render target payload and extract swizzle information from it.","sha":"7109fe9889315fd29ef728ac5327c2630c3a4823"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-08-04T10:42:27Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-06T10:01:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sys_usbd tidy ups\n\nTidy up fake transfer iterator handling. erase invalidates all iterators including the current iterator (i.e. 'it'), given precedence ordering this was UB prior to C++17.  Splitting out to use return iterator from erase seems cleaner.\nAlso added some additional info to usb debug message to potentially help with #8666, and used the atomic (dev_counter) less often","sha":"eb5ae94c242af3da03513029d7a957fd34cfd640"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-08-05T12:36:15Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-06T10:01:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix for incorrect assignment of ghlguitar\n\nfound_ghltar was potentially being overwritten if multiple USB devices were present","sha":"eee5e812f75600f61ff498ab334499e6d625c507"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-08-06T10:34:08Z","email":"bevanweiss@users.noreply.github.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-06T10:34:08Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Replace ppu_module_manager Function Static with Class Static variable (static module map) (#8669)\n\n* Replace ppu_module_manager Function Static with Class Static\r\n\r\nMakes for a slightly 'cleaner' interface in my opinion, may also assist with adding thread read/write concurrency support in future if ever required (have left that out of this commit to match existing function).\r\n\r\nVery slight performance improvements were seen in representative testing.\r\nhttps://quick-bench.com/q/GMbgeNc-mZc21aqOKCofnbzPZvg\r\n\r\nI didn't investigate whether static initialisation of the static_modules might actually be possible here, perhaps there's a way to do a constexpr / consteval of this.\r\n\r\n* Fix up for old style cast syntax..\r\n\r\n* Fixups from PR comments\r\n\r\nPlus remove spurious type_traits include (from me) not picked up in previous PR\r\n\r\n* Remove old code\r\n\r\n* Update rpcs3/Emu/Cell/PPUModule.h\r\n\r\nCo-authored-by: Eladash <elad3356p@gmail.com>\r\n\r\n* Fix naming of static variable\r\n\r\nCo-authored-by: Eladash <elad3356p@gmail.com>","sha":"ada6db2df464a8f7b1b94ba515ec2d45fb8db6b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-06T14:57:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-06T15:32:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fixup for PKG installation","sha":"06c42bba5d356b5ec21280184391ea9ab1b579f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-03T18:16:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-06T17:34:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Generate valid image+image_view combinations for placeholder texture descriptors","sha":"22f5e7a9be9e5c6dd7a84a6920540a7323b3ac85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/37698908?v=4","date":"2020-08-07T03:13:47Z","email":"37698908+illusion0001@users.noreply.github.com","login":"illusion0001","name":"illusion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-07T07:34:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"add missing settings to configure","sha":"c0c86521a2a62763d85e1af870e6e58e1724e286"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/37698908?v=4","date":"2020-08-07T03:16:09Z","email":"37698908+illusion0001@users.noreply.github.com","login":"illusion0001","name":"illusion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-07T07:34:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"move accurate rsx reservation to advanced","sha":"d3585e1f802150524a065bff9feec3ac0172b29c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-06T17:04:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-07T19:57:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Log username","sha":"96428a75555035b9672d9bd97c66e1aee17aa7ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-08-06T19:37:10Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-07T22:33:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Utils: Add detection for Icelake-client tier AVX-512\n- Implies support for everything that Skylake-X supports as well as AVX512IFMA, AVX512VBMI, AVX512VBMI2, AVX512VPOPCNTDQ, AVX512BITALG, AVX512VNNI, AVX512VPCLMULQDQ, AVX512GFNI, AVX512VAES","sha":"f1885896856f8211d9f9d4d07148c41e37a80002"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-05T15:03:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-08T21:21:22Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU/PPU LLVM: Fix FMA signed zeroes handling","sha":"7e118553303511e8b190cffc99156120759de3d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-05T15:38:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-08T21:21:22Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPU LLVM: Fix signed zeroes handling on Accurate xfloat","sha":"57471f8c94af9667a762e90924b28a38ad2021a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-08T22:40:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-08T22:40:47Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"cellSaveData: Fix loss of \"BLIST\" and files' information in PARAM.SFO (#8706)","sha":"0c85d4c0d0e9a738a8beaff22f16be5cbf953fb9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-08-09T00:50:26Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Whatcookie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-09T00:50:26Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PPU LLVM: Use VPERM2B to emulate VPERM (#8704)\n\n- The VPERM2B instructions are a match of VPERM's behavior, besides operating in reverse byte order","sha":"4ce2ad54a8f957b04834bbdfc856e07020456b2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-09T13:28:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-10T10:31:22Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Unify composite texture creation and management\n\n- Some texture accesses require image compositing steps to assemble the requested image from existing subresources.\n  Handle all the common routines in a unified manner to avoid having one broken path (e.g mipmap gather not supporting bitcast operations)","sha":"6850533b50a6717cf2dc62bd2c8ab76608284f7d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-10T19:13:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-12T17:19:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Proper support for typeless transform of ABGR framebuffers using the RGBA8 format","sha":"b41349546c3b1f0d660b30b5e75045644f67c015"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-10T19:18:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-12T17:19:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Warn if GPU does not support RGBA8 natively","sha":"56c63170b9c4fc757be064b766760d84fb0a57ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-11T17:25:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-12T17:19:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Support XBGR flip image load from Cell memory","sha":"7e1b24224d0b4f1bbae94890555aabcdc19a11c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-11T17:35:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-12T17:19:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix XBGR vs XRGB screenshots","sha":"fd2607ad52cc81ce7322ac65cd5ff70fb69232e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-12T23:00:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-12T23:00:37Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Implement RSX accurate reservations on TSX (#8721)","sha":"0f8ca1f7c54cb4da77d8ccc0cd366c1e9d008590"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-13T01:13:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-13T01:13:08Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU/PPU LLVM: Improve 0 addend FMA detection (#8709)","sha":"8cdfe5952a687d48ca5b8f7fcfa2b13143b21446"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-08-13T14:00:56Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Whatcookie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-13T14:00:56Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU LLVM: Add icelake optimized paths for SHUFB (#8712)","sha":"9e4f43f4d1d92e4ef860b13ca7167a6a4a9f5a55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-08-14T04:33:06Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-14T17:34:34Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"MSVC changes\n\nAdd support for compilation on x64 toolchain (x86 cl.exe was running out of heap space in vm.cpp)\n\nAlso took the opportunity to change compile optimisation from /Ox to /O2, as /O2 provides better optimisation than does /Ox\n\nAlso, we shouldn't be explicitely setting compiler tool defines (__cpp_lib_bitops), so remove that from types.h","sha":"a11afe05bf6f35cda60afec04211c9ada0edefce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-08-14T16:11:35Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-14T17:34:34Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Bring back the non-compliant define, but version limited\n\nAs noted, we've done something we shouldn't have with MSVC compiler specific defines.  But to avoid breaking the MSVC build environment, leave this define in there until the MSVC version when it is actually exposed by the compiler itself (v16.8).","sha":"01d3585bf38e8ac6bc9063bc5b6d6c931ad58efc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-14T18:33:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-14T18:33:35Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU LLVM: Improve approx FCGT (#8728)","sha":"995cb8125e3dd643ba872d76a321da373e5bd9de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-13T20:09:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-08-15T17:39:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Minor rsx::ceil_log2 bugfix","sha":"853e2b90a3a63e1390695702db2c62e62bf02052"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-08-15T19:46:53Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-15T19:46:53Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Manually upload Windows Github Release using curl. Actually fixes #7938 (#8715)\n\nFor some reason Azure would evaluate the GitHub release instantly and\r\ncomplain about missing/invalid GitHub Release deployment and fail to\r\neven start the build, this fixes the issue by just manually uploading it\r\nvia the GitHub API and curl.","sha":"c3709fa7444360588118613f050fec0292ad287b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-08-16T00:44:08Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-16T16:35:19Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Windows GitHub release hotfix\n\nImprove id variable parsing and print release.json to catch error","sha":"cd94d9849d21921442c623e53be06e730fc23d69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-08-16T01:30:25Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-16T16:35:19Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Ensure pushing builds to Github is only done on master branch","sha":"acee590733c9e3826707816d88cc2210ba66aba0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-15T04:56:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-08-16T19:58:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix vm::reservation_update","sha":"ee953f79538b79971acf071eabb05a77857cda4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-17T14:19:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-17T16:36:27Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix bitops test","sha":"25dee4a78ef7019191a5c3b6b3a0a131ff19c2a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-17T14:22:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-17T16:36:27Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix truncation warning in sys_cond.cpp","sha":"19500ac9ade335668bb9c401556295c7a0ee4f16"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-13T15:52:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-18T08:04:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix YoRHa QTreeWidget item style for CheckBoxes","sha":"e958c3cc6ab1637365c7af0862e249aa3ba118a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-13T15:53:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-18T08:04:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Linux: fix QT_AUTO_SCREEN_SCALE_FACTOR typo","sha":"e6e753f37f695039e54361894401a4a2dd963579"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-06T10:17:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-18T09:00:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: speed up list refresh","sha":"715f4f0669e7faeaa846b2b3e0b4ea516ec37ccf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-18T08:59:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-18T16:29:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"evdev: log axis information in pad settings","sha":"9af66e22dae94ddb0a4815c523ee2f9761007fe2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-19T05:22:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-19T07:09:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"kernel-explorer: Add RSX handlers events info","sha":"2a19d0a57999a47ece9393ff4915dd997963948e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-19T17:28:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-19T18:48:35Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Debugger: Fix PPU stepping on non-TSX","sha":"bcddbc15f0a80eaba9baf51d936b3c43169072c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-20T21:07:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-20T21:07:31Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Debugger: Use Signed Hexadecimal formatting (#8751)","sha":"4a40ef6a19c3019b54de8957fc10c9a2cfb93bb0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-21T06:25:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-21T07:51:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Revert \"Qt: speed up list refresh\"\n\nThis reverts commit 715f4f0669e7faeaa846b2b3e0b4ea516ec37ccf.","sha":"b487c09d340729a0d0a82a9fb5bdd06ae11146f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-21T22:55:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-21T22:55:17Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PSF: Avoid redundent string copies in psf::array/string/get_string (#8707)","sha":"edc09e22b453bd79ec24a30f51eb3b0b741e8168"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-22T03:53:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-22T09:55:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"[HOTFIX] Fix UB in Emu/System.cpp","sha":"27e331744993b021b0700f505e67c04a9cbe5fe9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-08-22T13:41:08Z","email":"bevanweiss@users.noreply.github.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-22T13:41:08Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Support for Namco GCon3 gun (#8757)\n\nThis gun now works (passes calibration) in Time Crisis 4.","sha":"ab0df0a0f5695e0db4c71153cf1995a718fbcdaa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-20T17:36:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-08-23T22:57:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Fix timer events","sha":"841b8fad38095aefc2fa37b9187191427cccd927"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-20T05:20:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-08-23T23:10:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger: Implement PPU SLWI, SRWI, SLDI mnemonics","sha":"c5aebe456411f08d7159e6a2cdfe7f3d9e6ec9b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-21T09:08:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-25T15:43:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Debugger: Fix scrolling using PageUp, PageDown, KeyUp, KeyDown","sha":"6f42297b58a0f9508703011bb9ca6ed91852f483"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-21T09:10:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-25T15:43:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Debugger: Fix instructions editor","sha":"3ce7fd78941c6b3d9a4b7d570bd4c9e4e5d05eb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-21T10:17:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-25T15:43:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Debugger: Register Editor Improvements","sha":"d356e0d1e76f7730a1f70ad8a4f1726b2e030bf4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-21T17:49:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-25T15:43:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Debugger: Add missing PPU stack register checks","sha":"7fe98d8d6694182b8954296e5f3e04daf43d9099"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-21T17:58:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-25T15:43:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Debugger: Disable PPU address redirection\n\nIt causes more confusion than it helps.","sha":"c099bb817f08140a7a8f73457ef34648cddda3e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-26T05:23:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-26T06:20:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix empty input in Registers Editor","sha":"bccfb1cda7c70d3f3b59b8e1765f9b56f8be9f23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-08-26T19:18:04Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-27T04:39:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Forces MSVC Toolkit to 14.25.28610 in Azure Pipelines","sha":"c177bf7480e31de282119123464862411d1dfa0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/24612088?v=4","date":"2020-08-27T05:15:24Z","email":"andryshik9@gmail.com","login":"Andryshik345","name":"GooseWing"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-27T05:15:24Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Add Nekotekina skin (#8776)\n\n* adding kots\r\n\r\n* More sharper neko on background\r\n\r\nCo-authored-by: Megamouse <studienricky89@googlemail.com>","sha":"700c540434d52ef27650a1481aac83c64b9e17f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-15T09:20:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-27T09:52:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Basic support for creating depth float formats","sha":"faaf28b41d60239eaeacb264183af62e492587ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-15T11:07:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-27T09:52:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Separate uint depth formats from float depth formats","sha":"a5ac5a9861551a69f70bcda9a52b2db79e218f7d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-15T17:28:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-27T09:52:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Do not create depth textures as blit engine targets.","sha":"794378d5e910a5429412236a30abc225c013d332"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-15T18:37:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-27T09:52:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement transport for D24S8_FLOAT data","sha":"f6c6c04648f2177f1ddece65e8585cd7661c6a4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-15T21:33:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-27T09:52:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactor and improve image memory manipulation routines","sha":"65ead0888087403a0c5caeefdad4b0c42ff2f27d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-25T18:18:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-27T09:52:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix some missing render target declarations","sha":"9e4bec8cec8cf07cc58b25e3441732b498f1e8d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-25T20:02:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-27T09:52:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix format matching when aggregating textures\n- When copying depth-depth, prefer own format over depth int format","sha":"9828d6146b890728b427898cb440888d068b4744"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-25T20:03:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-27T09:52:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add some more diagnostic messages for unoptimized image transfer setups","sha":"d257ba5156d4c1a3dca704c4d523cff88540a738"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-26T20:55:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-27T09:52:28Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix some minor spec violation\n\n- Stencil clear pass does not consume an image, do not bind one.\n- Add push_barrier to allow push-pop semantics for texture barrier insert.","sha":"d000d648b030e1aefe7eb1a9120d632fa172dc93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-08-27T19:47:04Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-27T19:47:04Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"RPCN Client (#8663)","sha":"190822c2b28d75f23c8447b2f81dc0589da37765"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-27T20:36:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-27T20:36:54Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Fix events ACK, minor optimizations (#8771)","sha":"47b545282e9815d9b842beebdcf649b77b6b6956"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-27T15:40:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-27T22:52:37Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"PPU: log LR in HLE functions","sha":"933737e8f0d597dc16a4ded1685132ce1a30fba3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-27T15:43:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-27T22:52:37Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Log PRX segment end for usage with kernel explorer","sha":"17f7f329a897c23773aace7434d389bb605e1cc3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-14T15:00:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-27T22:52:37Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Implement HLE cellSpursAddUrgentCommand","sha":"019d2d5dcfa57e7e40cb3ae4842aa467d04dc29a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-27T21:42:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-27T22:52:37Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Fix UB in Emulator::Load","sha":"48f70fbf10cdcefcb4ce5c374f8daa643f62e4fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-07-02T23:46:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-08-27T22:54:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use g_fxo for progress_dialog_server","sha":"bfa4fcf5842e3c52d6c80e0493b59f618cbe409b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-08-27T22:18:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-08-27T22:54:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Restore some code","sha":"ebc4a0188ad73bb7e6bb6e1337e4b0acaff7e0bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-08-27T22:22:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-08-27T22:54:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix some warnng in lv2.cpp","sha":"bd40430d2b710ba0a1618aefdc3436cba396e85b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-08-28T00:06:01Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-28T00:06:01Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"tcp_timeout_monitor deadlock fix (#8783)","sha":"4317291827b74bdb52ee80ba399d5af9aa88de36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-28T06:52:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-28T18:44:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Debugger: Replace SPU register perefix '$' with 'r'","sha":"6952be5ce495ee4887a9b1bdcba3cd3c5e992e26"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-28T18:23:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-29T01:03:09Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"vk: Fix depth format mismatch detection in copy_image","sha":"e8274d5a596c8fdbb3117ac4325ffecccd892d54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-28T21:27:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-29T01:03:09Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"glsl: Properly implement shadow filtering when running emulated shadow compare\n\n- Previous code was completely borked","sha":"e9cdb248a0baabdc15947fe207bf852dbc96c2a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-08-29T09:59:30Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-29T14:14:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Added settings and logic for auto-hide of mouse cursor.\n\nIn line with the Show Cursor in Fullscreen settings, these settings are only updated when the render window is first launched, and not during the game.\nThis could be revised (along with the Fullscreen Cursor) if it's more desired.","sha":"22c33d4fb42f1dce5e860ef285aa6bf75da8e866"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-08-29T12:04:03Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-29T14:14:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Used new Qt connect syntax\nFixed indenting\nRenamed click callback argument from 'val'->'checked'\nConverted m_gui re-usage to just reference ui\nRemoved implicit capture from spinbox lambda\nCorrected millisecond acronym from mS->ms\nRemoved superfluous QTimer include in gs_frame.cpp","sha":"3c0f6a29191ec2dcdf0eae54c21a7ccb9d97d9c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-08-29T12:19:13Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-29T14:14:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Woops... premature commit/push.\nFixed up the usage of connect","sha":"144b1858025bd78cccb22de5eac2f6fca94ea9ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-08-29T12:29:35Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-29T14:14:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Remove call to start m_mousehide_timer in gs_frame constructor","sha":"9a51f222653ee3b5c91f78995a80c5502a3af3df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-29T14:06:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-30T06:26:37Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve D16F handling\n\n- Adds upload and download routines. Mostly untested, which is why the error message exists","sha":"af9e217fa4fe5939a611d5fd1b1b28a79ecaa36d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-31T04:35:42Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-31T04:35:42Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"gui/themes: Convert kot-bg to jpg (95%) (#8809)\n\nNo perceived loss of image quality, reduces size from 8.1 MB to 2.0 MB","sha":"21b535b5c5637224855404b459f6eb1a1aa7a3a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-31T21:57:38Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-31T21:57:38Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk/sdk: Sync with vulkan SDK v148 (#8814)\n\n- Sync with vulkan SDK 148\r\n- glslang library was split into several smaller libraries\r\n- HLSL is no longer needed","sha":"a917f55ef89bec0b211dfc6286b080abc23326e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-08-31T22:38:51Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-08-31T22:38:51Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rpcs3_version: Bump to 0.0.12 (#8815)","sha":"a86a3d2fee6b0bd6f3a5e872aedea9188ea94f61"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-08-30T05:12:36Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-02T12:22:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Mouse Hide and Lock Keyboard Shortcut\n\nThis should address the second point of #4502.\n\nA few notes:\n1. it changes the current behaviour of the 'Fullscreen cursor'.  Currently it defaults to be captive.  This changes it so that it defaults to NOT being captive, but can be made captive with the CTRL+L key combination.\n2. There are situations when in windowed mode it's possible to escape the captivity (it's like a minigame if you will).  This requires the mouse movement to exceed the bounds of the window in a single event scan.  It will just show up as a temporary visibility of the cursor when outside of the window bounds.  It's not too difficult to 'fix', but might not be a likely enough scenario to warrant either.\n3. There currently isn't an ability to change what this keyboard combo maps to, but it's inline with a collection of other similar keyboard mappings.  I think adding such a more generic keyboard mapping system (not for just keypad items, but system items.. e.g. so that Emulator stop could be mapped to something other than CTRL+S etc) is a bit out-of-scope of this particular PR.","sha":"ca3ee019ccc8968724c847d4125e31aa615b8465"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-08-30T14:09:38Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-02T12:22:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Use dynamic_cast to convert QWindow m_target to gs_frame\n\nUsed to access get_mouse_lock_state rather than going through the QWindow property tables.\n\nModify mouse hide and lock to default OFF when entering Windowed mode, and to default ON when entering Fullscreen unless 'show cursor in fullscreen' is configured","sha":"ae0e454fc2c5d1da0d954dd53fd64fa0007a97af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-31T12:47:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-02T12:22:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Update mouse lock logic\n\n- fix headers\n- update cursor whenever the mouse is moved\n- unify cursor logic\n- move m_mouse_hide_and_lock logic to handle_cursor (toggle_fullscreen is the trigger, not the handler)\n- disable mouse lock and idle timer if the window is inactive","sha":"1dac01498c82545956b979874763b50aeb8661a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-31T23:59:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-02T12:22:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix idle timer","sha":"006f546e7c32ff5f78fcb8f02f10de1554e187cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9306961?v=4","date":"2020-09-02T16:06:16Z","email":"jacques.yakoub@gmail.com","login":"jy95","name":"Jacques Yakoub"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-02T16:06:16Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Qt: simplify GetVerboseTimeByMs logic (#8824)\n\n* Qt: simplify GetVerboseTimeByMs logic\r\n\r\nFollow recommandation from QT : https://doc.qt.io/qt-5/i18n-source-translation.html#handling-plurals\r\n#8473","sha":"ddfa077c3e4efaa17aa9ada338b9de635a446365"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-02T21:58:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-02T21:58:29Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Implement Accurate DMA (#8822)","sha":"73d23eb6e6b154220ec009b22ca52742e4b925ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-09-03T07:19:27Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-03T09:49:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Internationalisation updates\n\nAdded description 'Never played' for games with no elapsed time indicated.\n\nTidied up game list times to handle translation for larger unit of time in each time pairing.\nNOTE: Latin will be a problem (sorry for any native Latin speakers)","sha":"610e71b71b4c6ccdda80b49dcd0e6d6713116184"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-09-03T08:10:35Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-03T16:31:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Tooltips for mouse hide if idle and resize on boot\n\nThe original commits for the mouse hide on idle included definitions for tooltips, but didn't assign them correctly.\nThis fixes that up, so that tooltips exist.\n\nAnd the resize height / width settings didn't have any tooltip applied.\nSo this extends the current resize setting tooltip to also trigger on the height / width hover (at least indicating that they are associated with this setting).","sha":"875e252db33bb77f85fbd8f330dad83dccaee038"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-03T10:43:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-03T16:31:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"improve tooltip coverage","sha":"21f06e10741f13857f1e007c5637c4b49e4c665f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-03T17:56:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-04T06:34:13Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix execution barrier insertion\n\n- In case of element re-arrangement, the barrier should obey the current insertion pointer","sha":"3c43d8fe05e13224315e5e63629d8582553da31b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-03T14:49:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-04T08:20:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"SPU: Make GET's  full and aligned cache line accesses atomic with Accurate DMA","sha":"c5c9ea1b214171b7c19ad0de7000d1f9bcbafdaf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-04T06:52:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-04T08:20:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"SPU: Cleanup for Accurate PUTLLUC\n\nShould no longer affect GET commands because Accurate DMA is available for this functionality.","sha":"4ffc58a8ce7755186ed5a56936498d879c519343"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-04T07:23:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-04T08:20:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"SPU: Make Accurate GETLLAR, PUTLLUC settings dynamically adjustable","sha":"0b023d4e2869619afe542b7b1f4d56d84663ecfd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-01T14:36:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-04T20:35:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNpDrm: Relax file extension checks","sha":"8e2b07ba9e508943fe8e1984c2033bc8985e5c4e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-09-03T13:35:59Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-05T07:38:32Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"RSX: Update manual string creation -> std::string()\n\nReplace manual string creation with call to std::string() constructor passing in char*\nThis appears to drastically reduce the cache impact here","sha":"baf96b3eb6b6a151a8d6164a29033b9c50fdc4c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-05T16:04:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-05T19:23:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Fix not acuiring reservation locks on DMA with more than one cache line (Accurate DMA)","sha":"c7a185d4e7118e8e49515538d7ecfdc86ba2598f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-05T17:16:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-05T19:23:55Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Do not ignore pending PUT tranfers just becase GET may not be cache-line atomic\n\nThis is not the proper way to emulate non-atomic GET tranfers, as it makes it seems as if PUT atomic tranfers arent atomic. (TODO)\nIncomplete GET cache line accesses still do not verify data though.","sha":"e4abd3dc5a5e6c443dc52923f7e33c30f99361e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-06T03:15:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-06T04:51:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Use unaligned AVX instructions for cmp_data_avx","sha":"2688081656d5b1094f582cc4b4c115dc911541cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-09-03T07:48:48Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-06T09:50:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Additional translation entries\n\nA few more items:\nStandardising on 'OK' for all base language uses (rather than 'Ok', or 'Okay').\nIt's perceived as the 'most correct' variant, and importantly having a single variant is best from a translation perspective.\n\nAdded plurality handling for multiple PPU caches created.\n\nAdded plurality handling for multiple items deleted in save manager.\n\nCapitalised trophy grade to align with Sony terminology.\nBrought trophy name position into translatable string (for languages that might really want to deviate from SVO)","sha":"e1adb18491ff97e19a50d04ef78c84cfe8121f61"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-06T11:09:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-06T11:09:14Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Make PUT transfers use SEQ-CST ordering on Accurate DMA (#8844)","sha":"abc715bc5cd68f98a2a4b5062439081f607541a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-05T15:27:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-07T15:25:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Accelerate D24X8_UINT operations\n\n- Adds compute decoding for D24X8_UINT on both download and upload routines\n- Adds support for D24X8_UINT operations for typeless copy","sha":"220e86bbd1da0cd85ac5aa73602320c049f644df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-05T22:36:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-07T15:25:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix fconvert job issues\n\n- Fix compilation bug caused by typo\n- Invert to/from for consistent declarations\n- Fix dst_swap when From == 2","sha":"85dd1b4ea981f470c3fa40bfce70f4a9ca227062"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-06T15:17:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-07T15:25:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Overhaul upload and download routines for textures to go through shared image_to_buffer and buffer_to_image routines.\n\n- This automatically adds support for depth float textures as well","sha":"85e5b077f7da1497d83bc2d74d49246d059a47ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-07T18:53:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-07T19:31:57Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: Support swizzled data for RCB/RDB","sha":"6d2cb94e3e081531db49bd6c6d6ca072ee778841"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-07T20:32:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-07T20:32:44Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Use unaligned instructions in mov_rdata_avx (MSVC) (#8851)","sha":"5060c779da85c313537b63705d627812569d0233"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-07T21:06:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-07T21:06:09Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PPU: Cleanup & unify reservation loads (#8849)","sha":"2f3e0044f1be042a48f5168261149ec3f521e7c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-09-07T21:50:17Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-07T21:50:17Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Implement sceNpSignaling & signaling improvements (#8836)","sha":"10820fa1351b52111a77e620c3867c0c53c2607e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-08T02:38:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-08T05:36:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sys_process: Implement exitspawn error checking","sha":"9134388f944f327426ee0dc50e64add631f65419"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/70681639?v=4","date":"2020-09-07T22:20:35Z","email":"70681639+quaddamage1@users.noreply.github.com","login":"quaddamage1","name":"QuadDamage"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-08T06:20:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VFS: fix off-by-one error in vfs::escape()","sha":"60f8fc293d50abcba08c2d263a004ff7bde32283"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/41945903?v=4","date":"2020-08-26T05:30:03Z","email":"mikrutrafal54@gmail.com","login":"qarmin","name":"Rafał Mikrut"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-08T07:12:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Update Building.md for Ubuntu based distros","sha":"5669c7497dc2d9a49dfc67580da6497cbd937bd3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-08-26T08:07:29Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-08T07:38:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix Windows UNC Path Handling\n\nIn Windows, when using Open Install Folder etc with UNC paths, nothing would happen.\nThis replaces the \"file://\"+path usage with QUrl::fromLocalFile(path) which appears to handle this better.\nNeeds testing under non-Windows.","sha":"c39ad1ee12cae40e107f1764266618b519819ed9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-04T11:22:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-08T10:05:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix some warnings","sha":"fee96ec92d0d84c8a79f0631c6c069e074d98664"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-07T19:42:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-08T10:53:06Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gl: Refactoring and cleanup\n\n- Fix incorrect memory requirement calculation for D32FS8X24_PACK64 data type on GL\n- Removes a lot of spaghetti code in GL backend from years of accumulation\n- Retires several now-useless methods from RSX util toolbox","sha":"2e88924cb9100c0458fd93ca08cd5c7df223a9e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-16T09:48:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-08T12:33:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Enable support for extended range in depth buffer\n\n- Software clipping emulation is used here as OpenGL does not have explicit clip control.\n- Hardware clip control for vulkan to be enabled after this.","sha":"dc465df3bc39431fc97715f601f169051a60b2d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-08-18T16:51:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-08T12:33:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix depth clipping\n\n- Fix special case where n=f making (f-n) = 0\n- Dynamically update depth range by setting dirty bits\n- Fix depth bounds when n=f and bounds test is disabled","sha":"6380e67af97752c588cb5ed209c7dffbfb21a5f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-08T09:22:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-08T13:23:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"PPU: reduce LARX logging level to warning","sha":"43fce92aa9296375f6d3de0a6a99a78c70eb3a0e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-09-08T14:12:47Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-08T14:12:47Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"hle: Implement ID_CURRENT_USER_HAS_NP_ACCOUNT (#8864)","sha":"22dc2947b3c57b4800fa53b9a684e10f88d65305"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-08T16:30:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-08T22:22:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input/Qt: Dont lock unused mouse in keyboard pad","sha":"f0053bfc1a5087b268e73bc3ac7b9fcb298be6a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-08T16:52:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-08T22:22:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input/Qt: Properly reset mouse hide timer","sha":"a845a0395abfc87f319603b28affe15871f0a6ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-08T17:46:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-08T22:22:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Update tooltip for \"disable keyboard hotkeys\"","sha":"3e1b76258e592976fc4d06bf5f453c798568ef00"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-09T10:36:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-09T10:36:04Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Remove STOP 0x0 hack (#8873)","sha":"1e4655aef6bb0925245ddfe2c54db2afb099534c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-06T09:47:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-09T18:34:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: add download button","sha":"46e8b4f56173569eebff2d178422f4cf28fc723b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-06T10:27:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-09T18:34:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: layout fixes","sha":"ca076058357b38243faee13158863a0ca062b623"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-07T12:10:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-09T18:34:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: handle sha256 checksum","sha":"570eee320236fb2f4ee64a7f65a47ef78bf14c04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-09T18:02:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-09T18:34:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: fix success message","sha":"1d04f14a5367058aa779cd1cf9278b224b32999d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-08T18:52:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-09T19:11:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Simplify shadow comparison operations for non-integer formats\n\n- Just use hardware PCF, it makes everyone's life easier.","sha":"da6760ed98c36743302b72b72ae35062e76e5b89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-04T14:03:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-09T19:57:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Win32 FS: Use FindFirstFileExW in fs::stat, fs::exists, fs::is_dir, fs::is_file\n\nCo-Authored-By: Bevan Weiss <bevanweiss@users.noreply.github.com>","sha":"8c8048f03732ea2b3c977cb4a611556fb8c9c4fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-09-08T22:19:57Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-09T21:56:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Makes DNS processing more consistent","sha":"d9d354c981ac0432be0709961d8d414bf2693d98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-09-09T18:49:58Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-09T21:56:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Only bind 3658 with RPCN","sha":"676fed7cfceb813efe07f604ca97556733b1e666"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-09T20:25:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-10T04:58:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: log g_tls_error","sha":"fb62c297fa7e5ca9d4c3876bcf050e6a034bab81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-09T21:43:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-10T04:58:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix fs::copy_file on linux","sha":"44371dedd97fe3f7a63675fd99391ce0b8b8a61d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-09T23:16:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-10T04:58:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: use rename to back up old patch file","sha":"8d56dd196910d087d19112f640c818dde246f1e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-10T06:13:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-10T07:13:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: fix downloader location\n\nit was spawning on the main window instead of the patch manager","sha":"595fdb2f57c544e3908e2b5c1954c8d3a6f0270d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-10T03:27:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-10T11:35:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"PPU: Do not allow unaligned/unmapped reservation addresses","sha":"d489b02fc1f07fdb19f609d1cfc8b29e6688caad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-10T16:13:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-10T17:04:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix bitfield operator &=","sha":"b48c03663670614e4716819bb12aa64791df61c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-09-08T09:23:47Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-10T21:09:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Updates wolfssl and curl to official repos","sha":"54493747a86fb30a24843d684d6e3648c642797b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-10T18:54:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-11T07:02:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"SPU: Remove \"Accurate PUTLLUC\" setting (always accurate)","sha":"4f0125a0e9670c7ebd040c98975447b4803a1cce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-11T03:49:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-11T07:02:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"SPU: Make PUTLLUC LR event accurate","sha":"9ff0b460a2fa361d4ee66caee093bc4866b80f3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-11T14:02:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-11T19:54:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Register Editor: Allow to modify PPU priority","sha":"9d034ea4a262c13ee34f5ca965986c01005d18b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-12T07:16:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-12T07:56:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add more defines to cellSysutil","sha":"639650c65aa789698758b1b21588066e5ffe4ee8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-11T14:02:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-12T09:00:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSysUtil: Implement CELL_SYSUTIL_SYSTEMPARAM_ID_LICENSE_AREA","sha":"81eceb1728dc50a728257328d429a6aeee48cfa1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-12T08:08:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-12T09:00:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGame: Implement cellHddGameCheck2","sha":"5db142792337e60969f58c4e85745d1d42b2f04c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-09T15:10:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-12T15:49:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Use ASM for AVX2 coompilation instead of intrinsics","sha":"7ce790f36988bac09813bf9b10ce3be4ebfabffb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-12T14:16:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-12T19:11:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_spu: Fix overexecution of cpu_return()","sha":"3206378ae6c01926f95a3a41e7384ee3758e93ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-12T15:28:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-12T19:11:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"atomic.hpp: Fix atomic_storage_futex::raw_notify","sha":"fe9c61fe73b82cd230c180659275a581e3da292c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-02T14:20:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-14T16:24:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/overlays: Localize most rsx overlays","sha":"460a933267aa1a76c82a5e9debc8196353c7371f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-03T16:30:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-14T16:24:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/overlays: use Argument list for translatable strings\n\nThis is somewhat crippled for now. It only takes a single argument in the callback","sha":"d0ffbbfc4d23fdc508415f2fd78b70d7f84fc77b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-03T18:56:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-14T16:24:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"HLE: localize most - if not all - exposed strings","sha":"a2da18761596442801c08385854c58678f637f53"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-04T08:39:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-14T16:24:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"move localized_string_id to own file\n\nI dont know if there was a circular dependency issue","sha":"f84697ad5ca997ec5d750632ed3c383730079081"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-14T15:47:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-14T16:24:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add disambiguations to the new translations\n\nWe need this in case there are identical strings in the same file","sha":"8df1d74395ed4973227d451077c9cff2db8cbda7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-14T05:08:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-15T09:20:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"PPU: Use SEQ-CST memory barrier in reservation load","sha":"a52a16807f6a3d67c54899039df5ce9b40528fd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-14T19:47:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-15T14:37:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add support for mixed data types when sampling shadow coordinates","sha":"92d65ff3c2c8cadbb2c0df4f5e7dee8d59a8f230"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-15T16:48:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-16T06:07:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"kernel-explorer: Fix lwmutex owner display","sha":"05364908f3134235ab6dda84097bddc07e64bdd4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-16T11:49:33Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-16T12:31:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"kernel-explorer: Account for PPU IDs invalidation in lwmutex","sha":"0eb739756ef4b3cc768f70c8db854ba8ccc908c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-16T16:39:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-16T17:14:44Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix nul section crash due to unexpected format (B8)","sha":"7900780cea9d4c15429ddbd7ad242b121c425385"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-16T19:15:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-16T19:15:14Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"atomic.cpp: Optimize sema_get to not always use atomic instruction (#8907)","sha":"17c8b340883dad5e1810062ff309979f394d3b1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-16T18:24:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-16T19:57:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add rsx capture shortcut","sha":"4c708645881e999ca5dc0fcfbad50582c137b201"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/70444390?v=4","date":"2020-09-16T20:36:06Z","email":"70444390+SEt-t@users.noreply.github.com","login":"SEt-t","name":"SEt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-16T20:36:06Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Improve pad support (#8800)\n\n* Add support for another DS3 HID Report ID for Win7\r\n* Add support for reading accel/gyro pad data over SCP","sha":"9a6aac1662ed975a26a758cc9a52e8f645952c9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-16T21:32:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-16T21:32:27Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Qt: allow handling of the game window while the settings dialog is open (#8921)\n\nThis should make it easier to handle dynamic settings.","sha":"3f534b33ec5030aaba3ef97f5de84306188e89b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-12T12:52:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-16T22:39:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Look for rap file for network license\n\nA network license should be the same as a local license, with the difference that a local license is only checked online once, while a network license is checked online on each boot.\nSince we don't check online anyway, the two should theoretically be identical for our purposes.","sha":"6540393df51769c953a09fe0d99d2ad62264bfde"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-09-03T07:55:48Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-18T06:21:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Small changes to terminology\n\nIn line with #4259\nTrophies are changed to be 'Earned' / 'Not Earned', which also matches both the RSX displays the notification frame\nAnd changed window title of Screenshot Preview -> Screenshot Viewer because as mentioned in the issue, the screenshot has been taken already, so it's not a preview (it is the view).","sha":"cdc3ee6c1cbaf7436988b2daa5f0da67ef6422d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2018-08-06T07:19:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-18T18:57:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"SPU: Implement events channel count, minor interrupts fixes","sha":"36ac68b4362d757564d18b459e0829b86e835e3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-18T12:23:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-18T22:55:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Release misconfigured texture memory before attempting reupload","sha":"d3898fda5740f21d3b5da36df4a2be141c31df9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-18T18:06:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-18T22:55:59Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Lower error message to warning\n\n- Mismatched texture handling is a TODO that will be handled with texturing rewrites","sha":"9db97278f351ab62fc5904215b43fab1f4943fdf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-19T12:08:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-19T12:08:35Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Implement channels 70, 71, add naming for channel 69 (#8932)","sha":"c436ef0c6ffb77686e193f901ff1da11ff0ba0c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-29T18:20:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-09-19T12:53:04Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellGame: Improvements","sha":"ed032dc985e938577cb033ccdb3b15d6535c472e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-08-29T18:29:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-09-19T12:53:04Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellFsStat Improvements","sha":"b31a0115b28263dd22a90ac3b5db8d84bde5da72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-18T19:11:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-09-19T12:53:04Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Always reset size in cellGameGetSizeKB\n\nReversed.","sha":"f1e8739608b8bc04378b8175b63e60115b3ec73b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-18T19:21:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-09-19T12:53:04Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellSaveData: Minor fix","sha":"2620a51cc9d75dedf35793f98b96286ac3b08367"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-18T19:34:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-09-19T12:53:04Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_fs: Do not expose real hard drive available space!!!!!!!!!!!!!","sha":"762ceaf87e2dba398f7fc6d1fc2dd354aaa5f354"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-18T19:52:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-09-19T12:53:04Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"sys_fs: Fix sys_fs_disk_free","sha":"a21790b9922215993b399fb402f35a613ab31f9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-18T21:30:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-09-19T12:53:04Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"cellFs: Rewrite cellFsGetFreeSize","sha":"0d183a24be893deaf9ad741cdc074fadcf3ae24d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-19T18:38:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-19T18:38:22Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix cellGamePatchCheck (#8933)","sha":"5ac6f090fc7e313f04725ca2ed85136fd3f9db5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-20T17:24:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-21T03:35:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Win32 FS: Fix fs::stat for drives","sha":"9031c5a6e0cd894222861e3dba7a5fde9ab6815f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-20T08:07:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-21T03:36:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cellGameBootCheck PARAM.SFO reads","sha":"75c3fdcb6fdc52e5162d81206943c52f91922397"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-21T09:04:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-21T09:59:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_engine: Apply patch when APP_VER is unknown","sha":"511e9920c2aa1b4a428894516cc950f15fa0ff4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-18T22:59:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-21T13:32:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"HLE: Fix sceNpTrophyCreateContext\n\nfixes #7431 Soldner-X\nAssuming that a SceNpCommunicationId should have a format like \"TEST12345\", then there is no need to delete termination characters after we already created a truncated string with 9 characters + null terminator.\nThe current behaviour does not work at all, because in case that we actually have a non-null termination character, deleteTerminateChar will step over the last x chars in the already truncated ID until it forcefully finds a character of its liking. eg. term='2': \"TEST12345\" => \"TEST1\" => \"TEST1_00\"","sha":"4c4be331f513712ae85eebeb5836831fb8638585"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-21T11:48:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-21T13:32:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNpTrophyCreateContext: improve commId logging","sha":"0b42cf06f8f30562b5eb27ee8bf80745550fb07c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-21T18:54:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-21T20:17:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix playtime datatype","sha":"34eff440eb4610478070b75cfc130d725dbafc0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-21T20:16:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-22T04:59:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: fix default pad handler\n\nWe accidentally always saved keyboard to Player 1 if null was selected.\nThe new code will only apply keyboard by default if the config file was not found.","sha":"5d50602397f76f03967c78c6d7bd8e72f22c418b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-22T08:30:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-22T08:30:31Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"HLE: Implement ERROR_BROKEN in cellGameDataCheck (#8945)","sha":"cf61198fe3c3b5d15694770f86cdd4c2c131b0a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-21T21:00:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-22T09:19:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Always force typeless copy if memory is crossing aspect boundary","sha":"7ed82c0791ee91a589716e9b33f6e9ec862662d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-21T21:12:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-22T09:19:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve image transfer and scaling\n\n- Handle typeless src and dst with aliased typeless format\n- Optimize typeless transfers by only dealing with affected texels.\n  * Eliminates redundant dst->typeless transfer of full image (very expensive)\n  * Eliminates full src->typeless transfer of full image and replaces with only affected region\n  * Requires significantly smaller output buffers, saving on VRAM cost","sha":"d012abd92430c4f75d70e90b4f1d1048dfe63618"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-21T21:15:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-22T09:19:54Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Properly pass format_class information during RTV/DSV resource barrier\n\n- Also takes the opportunity to remove repeating code in a minor refactor.","sha":"a50ea09053084c536b5b098de6a5b426d26a6c57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-20T06:27:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-22T16:46:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sceNpTrophyRegisterContext: Atomically create trophy data","sha":"3a96d9918792051327e150f1382c7e6cf4ff6596"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-20T08:24:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-22T16:46:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sceNpTrophyRegisterContext: Implement SCE_NP_TROPHY_STATUS_NOT_INSTALLED","sha":"89905bc1c455165f6413255630c24193ff9222c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-20T08:55:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-22T16:46:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sceNpTrophy: Add logging of commSign","sha":"418968d974ace14c3479d55c20076508dd22aed4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-19T16:40:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-22T16:47:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Implement many missing channel counts","sha":"ad37259ccc6321135200c90f38d990df97d5b16d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-20T04:06:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-22T16:47:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Fix unregistered channels in RCHCNT\n\nShouldn't throw exception on realhw.","sha":"bfa78870cb9c0abf8650a72671ae42ac2370fbb0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-22T18:29:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-22T19:42:43Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Trophy fixup","sha":"97e26f9d6cfcae258c0efc4d4371000ec208570d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7947461?v=4","date":"2020-09-22T20:51:22Z","email":"zdanio95@gmail.com","login":"CookiePLMonster","name":"Silent"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-22T22:06:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add playtime to the value from settings\n\nFixes playtime being wiped out when running\nthe game with --no-gui.","sha":"e938ddda2cd75d7e52a3cf95dcea4cea83c238f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-23T02:47:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-23T02:47:54Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"TROPUSR.DAT fixup (#8960)","sha":"0c3c34179ea72065a24ce7d3bd9ebfc3be307f4e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-09-23T09:19:29Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-23T10:44:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"MSVC 16.8 Preview 3.1 compiler fix\n\nThe latest MSVC 16.8 Preview 3.1 cl.exe no longer likes the implicit conversion from false->std::shared_ptr\nBut it's happy with nullptr\n\nNot the ideal solution, but it will kick the can down the road a little.","sha":"04deb97f94088be7293448115ccc68a13bd9fddd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-22T17:15:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-23T17:24:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"HLE: Always return empty paths if game content does not exist in cellGameContentPermit","sha":"5a049322ed8ac5bd0ca2a045f531d93bc7b97500"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1286822?v=4","date":"2020-09-22T03:40:42Z","email":"morgan@creekmore.email","login":"gamingrobot","name":"Morgan Creekmore"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-23T17:27:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Added missing NV methods for gcm_printing","sha":"f44e696edff15ec020714b14ade820fabb4d029a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1286822?v=4","date":"2020-09-22T04:34:47Z","email":"morgan@creekmore.email","login":"gamingrobot","name":"Morgan Creekmore"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-23T17:27:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix methods_name indentation","sha":"b45d6fee2d4689a28ca33094487263530592dc02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1286822?v=4","date":"2020-09-22T05:14:05Z","email":"morgan@creekmore.email","login":"gamingrobot","name":"Morgan Creekmore"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-23T17:27:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add additional NV4097 methods to gcm_printing","sha":"ff8a94714f231e2eb0b0734807003733b31080be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1286822?v=4","date":"2020-09-22T17:18:10Z","email":"morgan@creekmore.email","login":"gamingrobot","name":"Morgan Creekmore"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-23T17:27:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixed formatting","sha":"4fe29515099da9928d4762f2086626fb0b26e7f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-23T17:35:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-23T17:35:06Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"cellGameContentPermit: Fix missing PARAM.SFO writeback (#8934)","sha":"3372409590b92aa190acd08cf6a79d8ac8af515f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-09-04T13:26:46Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-23T19:15:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Core: Add date/time offset capability for console time\n\nProvides a setting which can be applied per game, and allows for a custom date/time to be set.\nThe console time will then apply this as an offset to the computer wallclock.\n\nThis allows for games which look at the console time to determine their gameplay to be adjusted.","sha":"53212ba7a9cb1a320574efe633905caeb5419fdd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-09-17T10:02:45Z","email":"bevanweiss@users.noreply.github.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-23T19:15:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Update rpcs3/Emu/system_config.h\n\nCo-authored-by: Megamouse <studienricky89@googlemail.com>","sha":"20f1eb865b978b73f49eaae7922e3af311637b3b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-23T17:11:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-23T22:30:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Properly initialize float64 support for SPIRV","sha":"9ea478008ce49c727cbd14f724c4efc4e07dfa94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-24T09:44:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-24T09:44:17Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Registers Editor: Implement PPU/SPU reservation control (#8968)","sha":"22269ca0d73a10e23f5fe443b01686680521d771"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-11T11:06:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-24T15:06:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Win32 FS: Rewrite (fix) vfs::host::rename","sha":"b8fa6fb4c4bfc21a210c55c37c16d3a8f76f0839"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-11T19:14:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-24T15:06:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Win32 FS: Fix fs::utime for directories","sha":"d0f1b29b39071c8c172fa161e4e5d40f0f11fd08"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-12T04:13:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-24T15:06:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Win32 FS: Always use FILE_SHARE_DELETE","sha":"6b11d82dd0df0a117a65ef6e70955ec1827caef3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-15T14:37:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-24T15:06:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel-explorer: Implement Filesystem Destcriptors information","sha":"7b3c0a69f31ec0bd326fd73c63ab80f5270b80d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-15T19:20:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-24T15:06:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSysCache: Global hdd1 lock\n\nTake advantage of recursive locking.","sha":"183aa31319f0a041bfbfc693f0b018362d952706"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-24T17:13:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-24T17:13:19Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Implement cellGameDeleteGameData (#8962)","sha":"c806da51f8c8971c2f6194bad735b158b146097e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-24T17:37:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-24T18:00:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Compilation fix","sha":"6164b3d2e2f1b59fdfbc811c9f544403b3d6e231"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-25T06:42:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-25T10:26:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"MSVC bug workaround","sha":"3b11f220621a0a476fff75b7d34e6bc25db9a4e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-09-24T10:23:04Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-25T14:40:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Fix exception on invalid AudioRenderer\n\nThe findData() on the invalid value correction wasn't working, and was still returning -1.\nThis was then used in the enable_buffering lambda as the IndexChanged callback, and throwing the Assert.\n\nHave replaced this usage with a lambda to manually find the appropriate entry. Since we localise the text displayed, neither findData nor findText of the combo box did the job.\nI haven't touched the is_ranged use of findData.","sha":"92efaf0bba4c854705d3c4e1305b53e474401548"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-26T16:28:19Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-26T16:28:19Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"cellSearch: use std::hash (#8981)","sha":"b79d236bfa4a36f7f93d15f160cf375fff24770b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-26T17:06:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-26T17:06:06Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_mmapper: return ENOMEM on memory greater than UINT32_MAX (#8982)","sha":"0f67c689939f035c926dba7f772c89e32295db5d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-26T18:18:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-26T18:18:32Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix fs::delim type, fix \".\" and \"..\" processing in fs::get_parent_dir (#8975)\n\n* Fix fs::delim type\r\n\r\n* Fix fs::get_parent_dir: \".\" and \"..\" processing","sha":"8ad36e2526600541dd1e61463799f302a7a7f0a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-26T07:08:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-26T18:48:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement HLE sys_config stack allocation","sha":"83d71519e0306ee2dbce8a106cb04c24b4096af2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-26T07:08:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-26T18:48:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_memory: Improve sys_memory_get_page_attribute for stack","sha":"f22348a9f90cf04dd1df7b6361033a47109a0b7a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-26T07:08:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-26T18:48:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vm: Fix stack memory release, always reset memory flags","sha":"53c8ed6a63acc0c60e1153baf6d164239ffa9de9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-09-27T00:10:31Z","email":"bevanweiss@users.noreply.github.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-09-27T00:10:31Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"xxHash: Update to v0.8.0 xxHash (#8980)\n\n* xxHash: Update to v0.8.0 xxHash\r\n\r\nRemoved build of XXHSUM test application for xxHash also.","sha":"264df11132f222ba7c2dcdada79909ece21f1316"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-24T18:58:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-27T15:56:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Disable spirv optimizer\n\n- I've not found it to be very useful and it just breaks good code right now.\n  TODO: Re-enable when things improve.","sha":"259844f4f3504f192475111d428f2385172165c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-25T18:48:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-27T15:56:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Optimize vertex decoder to generate simpler code\n\n- Significantly improves compilation speed by simplifying most of the code and doing something similar to LICM.\n  * Actual decoding is now vectorized and performed in one step rather than in a loop.\n  * Switches inside loops are removed and replaced with simple comparison. Generates much nicer (and smaller) GCN bytecode.","sha":"a14a358b7313df99007fb00dadccc484c07c889f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-26T17:42:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-27T15:56:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Emit simpler fragment program code\n\n- Optimize clamp16\n- Use bfe instead of shift-and","sha":"9baef8c705e0efea1fc7ef015fcebe55a647e9ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-25T14:29:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-27T17:09:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU/PPU: Implement Atomic Cache Line Stores","sha":"09cddc84be2bf6956ac8ffa0ca86ef365dcf7090"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-28T18:47:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-28T19:18:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/codegen: Workaround for borked hardware\n\n- Bitwise or does not evaluate correctly for some hardware.\n  Substitute with subtraction instead.","sha":"04ff7913b4bf79d7b0614ef9e9d1f28192459d17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-05-01T20:52:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-28T19:34:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU: Upgrade reservations to 8-byte always","sha":"3f7eba19c842fb541ac1e73266a83b046d68adfb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-04-07T17:29:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-09-28T19:34:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU: Implement support for 128-byte reservations coherency","sha":"f4ca6f02a19cbd6addb4fd9529366f8c3092a5ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-28T21:16:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-29T06:44:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGameSetParamString: fix string sizes","sha":"531eb04fd74eaba9601dedebd06ad87ddb9e173d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-29T07:25:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-29T08:26:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add Accurate PPU 128 Reservations to Debug tab","sha":"046923d9f7f8c62d50279a7920e749785aa331dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-29T16:26:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-01T07:19:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Emu: use vulkan as default renderer","sha":"5226076676e6690d9e9da1a92335c60ed5bc854b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-29T18:02:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-01T10:26:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Overlays: Use Back instead of Cancel","sha":"ef0faf03fd73145526eca563a134e9f7fe25a204"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-01T15:15:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-01T15:15:07Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PPU: fixup for Accurate 128-byte reservations (#8998)","sha":"871b15f6e113ad58ba345fcb1e2bed4acdf50c76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-26T19:28:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-01T15:16:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implemnt various HLE CellSpurs functions","sha":"aed560b6302af95ecd92fcef08d4cb4c819f8fc3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-27T16:11:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-01T15:16:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSpurs: Add error codes formatting (unused)","sha":"1f28bee86a2ac4c327fcecf04e6095d48bc5a80d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-28T12:20:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-01T15:16:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSpurs: Add CellSpursJobOpcode definitions","sha":"7fdf3dd760fc945408616692b56d85128cf841da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-30T18:08:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-01T16:51:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Set max PPU threads to 100","sha":"04c3d8d1bb625f1446b000e4e4513339fa2d8c92"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-01T16:52:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-01T16:52:39Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Simplify logging of MFC commands (#9004)","sha":"56cebd99c2b965543c6489d42866b29d625661a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-01T19:00:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-01T19:00:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve Trophy Installer robustness\n\nRelax paranoidal mount point locking and temp dir creation mechanism.\nIt was incompatible with a setup where user directory is symlinked.\nInstead, create temp dir as close to target as possible (see savedata).","sha":"0ac3dbfec9cb8f171b2e98c9a9b8e6dcb2717a71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-01T19:07:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-02T09:32:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs: improve mountpoint detection\n\nProperly handle . and .. path components in mountpoint detection.\nRemove app_home mountpoint and use mountpoint from argv[0] instead.\nAdd dev_root mountpoint for special purposes.","sha":"9b22661c19fd44dcdc34ef053b3ae01d33dc08e5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-02T11:37:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-02T11:37:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs: improve handling root mountpoint\n\nPath such as simply \"/\" falls into this category.","sha":"ee00fdb61b0956ccda738ee228b5774ad0280e6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1030614?v=4","date":"2020-10-02T16:12:40Z","email":"x.wserfer@gmail.com","login":"webserfer","name":"Roman"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-02T19:46:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Update BUILDING.md\n\nWrong link to the VS Qt Plugin (2017 instead of 2019)","sha":"bddfa76b2eadb213d59fc5207fd83243bf7c218b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-03T08:31:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-03T08:31:28Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Fix extremely rare bug of GETLLAR (#9011)","sha":"493e57837b6e3985951088a11acffb2b8b73367d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-03T16:05:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-03T16:09:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_fs: return ENOENT for relative paths","sha":"888b520b31fcdf0921a6f79ec8824071c96bc766"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-03T10:31:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-03T17:31:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Remove dead additions in Accurate Xfloat","sha":"4cafd5a31c762bbe505d36e54f98b43b20ca9e77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-02T12:15:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-03T19:35:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSpurs: Fix HLE workload signalling, taskset fixes","sha":"a0b387e0a959f9fc3ed968d0b84c7e7883847f1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-04T15:11:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-04T16:54:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement sys_process_is_spu_lock_line_reservation_address","sha":"ac6e04222360341cdf35768baadc152130818e07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-04T15:51:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-04T16:54:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor cellSpurs fixup","sha":"ec1244bb827d75cf983669473908e0e03ee8585d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-05T05:39:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-05T05:39:56Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix GCC compilation (#9035)","sha":"2a258dc21e9d6ac1bcb3da58056a9bb276545ef1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-10-04T17:50:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-10-06T09:02:53Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Reimplement GPU query management","sha":"d5f7e7b179256d41e2bd96b2f9b0108e26ef50b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-03T05:07:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-06T10:06:25Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Embedded PRX/overlay image patching and dumping","sha":"983547af7e08eb0a468079a30ab0e5978f157ed4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-04T17:37:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-06T11:20:23Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel-explorer: Initial SPURS debugger","sha":"a5cff8b18679a988e1fb4cbfb523b6a458f30ee2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-05T12:37:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-06T22:12:21Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSpurs: Implement more HLE functions (part 1)","sha":"c6281475217daa0c8c6d85338ad1f2242b4f968b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-06T15:24:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-06T22:12:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Prettify SPU image name of dumped images","sha":"59be63167fe78101c1ae7f83627a5cea32991871"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-06T22:14:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-07T17:11:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement vm::reservation_op\n\nImplement vm::reservation_peek (memory load)\nImplement vm::unsafe_ptr_cast helper\nExample use in cellSpurs.cpp\nFix dma_lockb value and description","sha":"89f124814089981aeedcf1d1edab987d9ba31c88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-08T05:27:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-08T16:05:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix SPU ELF loader","sha":"73f96f48ee393c20a87a031a84b8ecb303f91552"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-08T06:14:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-08T16:05:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU Local Storage capture","sha":"865464f60721aeda87881a51777016d4ecaeba76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-08T08:46:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-08T16:05:14Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add some more info to SPURS kernel explorer","sha":"ffea52dc36100f27996048c62645750b9c3c3b7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-10-10T09:02:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-10T09:02:55Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: Open CB before doing frame cleanup so that callbacks work (#9041)","sha":"bca3a3f4ed56ae1ad7385d1a9ab8fd3408134b23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-10-10T02:48:05Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-10T10:57:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"wolfssl: Add WC_NO_HARDEN suppression to compiler defines, and remove duplicate defines in MSVC\n\nSilence the wolf from telling us:\n#warning \"For timing resistance / side-channel attack prevention consider using harden options\"\n\nAlso removed duplicate defines for Visual Studio project, to remove some additional warnings there.","sha":"d962bb018d103736950d2c610e71327be5b39ae4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-08T13:13:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-10T10:58:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: rewrite reservation bits\n\nImplement classic unique/shared locking concept.\nImplement vm::reservation_light_op.","sha":"346a1d4433621db384005eff587e69dceb46dd47"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-09T14:39:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-10T10:58:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: remove ppu_stcx_tx\n\nVery small transaction, benefit questionable.","sha":"6d83c9cc0ea54d5e907f13bc8b9fa9d31b03271a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-09T17:33:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-10T10:58:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite cpu_thread::suspend_all\n\nNow it's a function of higher order.\nMake only one thread do the hard work of thread pausing.","sha":"050c3e1d6b56b2cad3cfc41bde2b641a7403beab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-10T06:32:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-10T11:12:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Optimize cpu_thread::suspend_all\n\nReduce internal thread status polling.\nRefactor utility functions.","sha":"b74c5e04f581ebc9b5fa97da9a7e8e5ffd38055b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-10T11:22:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-10T11:22:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"More optimization for cpu_thread::suspend_all\n\nTry to not pause inactive threads.","sha":"ec7d243ee942a56a76f7f0a1734f92aea7de7b95"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-10T14:36:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-10T14:36:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: improve LWARX/LDARX progression\n\nShould reduce spam (\"...took too long\")","sha":"e8e3a3b2a2ebd8619c72ab1921df22b3fed03606"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-10-10T07:19:49Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-10T20:09:05Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"FIX: MAX_PATH is used within Windows headers, we should use a different define internally\n\nReplace MAX_PATH usage with EMU_MAX_PATH, this prevents the redefine warning, and ensures that we don't mess up other usages (which will likely want MAX_PATH as 260, like Windows defines, not 4096 like we do).\nThe replacement has been done based on what MSVC was telling me the define values were at each point (i.e. whether we wanted it or not, these usages were using our 4906 value, not the 260 value from Windows)","sha":"2c8b3f05ac0b5d09835079b0fc8696b3d22586b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-11T11:59:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-11T11:59:18Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Fix minor segfaults (#9015)\n\nSPU: Remove \"RawSPU Not Found\" exception.\r\nFix edge case in access violation handler.","sha":"3c935f78342d1fe494a102d4bb83b420284f0099"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-05-19T16:09:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-11T14:22:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"JIT cleanup for PPU LLVM\n\nRemove MemoryManager3 as unnecessary.\nRewrite MemoryManager1 to use its own 512M reservations.\nDisabled unwind info registration on all platforms.\nUse 64-bit executable pointers under vm::g_exec_addr area.\nStop relying on deploying PPU LLVM objects in first 2G of address space.\nImplement jit_module_manager, protect its data with mutex.","sha":"f2d2a6b605894cd514ac13a376f784bc1987adbd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-11T14:13:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-11T14:22:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: minor improvement for LWARX/LDARX\n\nImprove chances of loading actual data in memory.","sha":"2f329cf7b59bed4d674948d695fd0f8267c390b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-11T14:18:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-11T14:22:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve vm::reservation_update\n\nOnly respect unique lock.","sha":"1885e4345c3b0dc6efb707f45f0be0a8c935347c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-11T14:32:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-11T16:52:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: fix LDARX/LWARX in accurate mode (closes #9058)\n\nFixup after #9048\nUse SSE intrinsics in mov_rdata.","sha":"5bd5a382c0e52dafa34474ab4e345f11b57bd13c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-12T12:20:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-12T12:20:06Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Validate reservation in GET commands (Accurate DMA) (#9062)","sha":"95c1443e306767370717f18ffe2fb1a7cd0a3422"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-12T12:09:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-12T12:20:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement utils::tx_start (for TSX)\n\nImplement utils::tx_abort helper.","sha":"b57a9c31f049a612c73fe321edb1988cf5293d1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-12T14:19:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-12T18:41:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: Implement S1/S2 (SNR) events (closes #8789)\n\nAdd TSX path in push_snr()\nAdd locks bits in ch_events","sha":"a806be8bc4b40e80c922e04347d3fe83fc83b9a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-12T18:23:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-12T18:41:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: fix file opening from /app_home\n\nTypo.","sha":"4ff23a9943010faa86bc7b4918a30a9dac67594c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-12T21:12:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-12T21:12:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: Report 'GETLLAR took too long'\n\nAlso move similar code in PPU.","sha":"dc39a9b84f102a03b195b73d2fe99758ad7dd98d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-12T21:27:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-12T21:33:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPU: print and reset suspend_all statistics","sha":"1606f9717711037c5ad48c73e4dfcb743529ecc7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T07:54:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T07:54:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: cleanup for TSX path remnant","sha":"17f805ae64af9a16d2b8ae7002a29223986cbb8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T08:05:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T08:06:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: Add loop logging in STWCX/STDCX","sha":"7a76fb14697e4559d425fc13aa3470e2039b4963"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T08:07:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T09:04:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix remaining vm::reservation_lock usages (for now)\n\nOptimization can be restored later.","sha":"dcff8c2637c6583d855bd8e2abc33e33b6931bfb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T14:46:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T14:46:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fix PUTLLC (TSX-FA)\n\nSome forgotten checks may affect performance.","sha":"91db4b724c1639cb297730d268c7f3eade9c9606"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T17:23:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T18:10:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"TSX: reimplement spu_getllar_tx\n\nOnly used as a backup method of reading reservation data.\nIncrease long GETLLAR reporting threshold.","sha":"97cd641da9f71debf9974810e045009507da6db6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T23:53:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T23:53:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fix spu_getllar_tx\n\nWas not executing.","sha":"3bddba0c7a2201b5182e51a44a959364b34b1b54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T23:53:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-13T23:53:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use std::invoke in cpu_thread::suspend_all","sha":"40558e7ac179789941ad4d6cc3546500add0ae97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-15T11:33:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-15T14:18:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: restore some LR event setting logic after #9048","sha":"1b89ad00e7497f548172d7b4cb277dd1c0476035"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-15T09:40:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-15T14:18:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU/SPU: give up on conditional stores if locking fails\n\nRestores Non-TSX behaviour partially.","sha":"494953997e783d929c6392e281cc9344ac7effa0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-15T16:24:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-15T16:24:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: fix ppu_stcx_accurate_tx\n\nDon't destroy xmm6/xmm7 state on exit.\nImprove addr arg handling (simplify).","sha":"facde634602f670be9c2f1f35ab5ee38d4f33565"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-15T17:43:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-15T17:58:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RSX: fix rsx::nv406e::semaphore_release partially\n\nProperly release reservation (non-TSX path).\nAt least update and notify reservation (TSX).","sha":"492ed2749501020c9fdf3f8c3cee0675d995b141"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-15T20:27:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-16T09:14:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: return some give-up behaviour for PUTLLC (TSX)\n\nDespite using concept of \"shared\" lock, allow only first to proceed.\nThis is similar how conditional stores for PPU are implemented.","sha":"583ed6171280ee6af777458a9f56d470b5498652"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-16T17:35:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-16T17:35:20Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"CellSpurs: JobChain functions and some more (#9080)","sha":"5185ddb8b5b249406c95034d1dfa0980758f29bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-16T18:09:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-16T19:48:02Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix ppu_execute<Func> for HLE functions","sha":"953663e00bec0215a63ffbca18977a277d10e55d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-13T19:36:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-16T19:51:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU: Handle cache line inconsistencies (PPU 128 reservations)","sha":"443c2b920d32db269d866c1bc644a16c323e424e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-10-13T12:13:08Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-16T19:51:52Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"LibUSB: Update to upstream master (and turn off YAML_CPP_INSTALL CMake property)\n\nMay resolve some outstanding issues around libusb/hidapi (i.e. DS4 not being released on rpcs3 shutdown etc..) or may not.\nFixes three outstanding compile warnings on non-Windows OS... introduces a few more warnings in WindowsOS (issue raised upstream with libusb around WINAPI_CHECK macro)\nRe-ordered the 3rd party CMake so libusb is in file order above hidapi (just to have document flow match logical flow)\n\nAlso took this opportunity to remove the YAML INSTALL action (by setting YAML_CPP_INSTALL to OFF)\nProvided capability to use system library for libusb by providing USE_SYS_LIBUSB option to CMAKE\n\nTested under:\n- [X] Windows 10 2004 OS with DS4 controller\n- [X] Windows 10 2004 OS with GCon3 controller\n- [X] Linux (Mint 20) with DS4 controller","sha":"1e83d2a4e9a70edffd392c1dd3e5808f553d62ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-09-23T18:12:42Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-16T19:53:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add notification logging","sha":"ea1171f62460562b7ed3c68f3280234cc4500d0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-09-24T19:28:27Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-16T19:53:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"sceNpManagerGetAccountRegion impl","sha":"abaa8f855f18e0c17210e5bd73c073582286ea07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-09-25T10:45:38Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-16T19:53:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Avoid double locking with start_sig","sha":"344c813eb10760392dfac8acd9ad4278181376b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-10-07T02:50:01Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-16T19:53:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve poll for p2p sockets","sha":"bbda618bebed1c73cf4f36da6f3ed93c125aee03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-10-07T23:25:35Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-16T19:53:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add better handling of RTT for STREAM_P2P","sha":"2babe4c236e6bb08f7476cbca2af00b2a88a90e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-10-08T06:18:04Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-16T19:53:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixes setsockopt","sha":"073772a801fae33c37d0b5016da7a7874e894f63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-10-09T00:55:26Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-16T19:53:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add sys_net error for EISCONN","sha":"e9914f30040e247c9dd5d4960a143d532ba44d6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-10-09T20:37:01Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-16T19:53:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix getsockname on windows for unbound sockets","sha":"1393bb2caf23fa276699caacd799dedd4aac0e5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-10-11T03:02:33Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-16T19:53:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement ethernet address determination","sha":"9e14d240a82fa0645de5073aebafa30bf7288e6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-10-17T12:41:59Z","email":"bevanweiss@users.noreply.github.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-17T12:41:59Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"BUGFIX: LibUSB Transfer list deletion (#9084)\n\nIt looks like I was too hasty in picking the latest libusb commit (to fix a few Windows build warnings) prior to landing my merged PR.\r\nlibusb commit eee6998 had a transfer list bug.  Have just tested on c33990a and it's resolved now.","sha":"a0d95a823e0b9b6aa6d7de14b1e863ead18940a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-17T16:28:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-17T18:25:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Reimplement ASMJIT runtime\n\nTry to emplace generated code in lower address area.\nProtect generated code from writing.","sha":"3d980a9f6657a6384277dafcee66834eb36c2e2d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-17T18:26:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-17T18:26:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix ppu_stcx_accurate_tx (operand size mismatch)","sha":"4078f439849cd4554601f550bf164cbe3e4a1c8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-17T18:27:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-17T18:27:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix spu_putlluc_tx (insignificant)","sha":"d0057c92e46bb4c3936184e8fc0c9fca9ba4d73f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-17T18:55:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-17T18:55:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add assert in build_function_asm to not ignore errors","sha":"15efb73aae8ab2220f920a4534e6ea54f29c8c45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-17T17:15:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-17T19:00:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU Debugger: Improve move from/to CR registers instructions","sha":"fa0b02ed30e243fb85508100d43b612c9bf09361"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-17T18:03:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-17T19:00:22Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU Debugger: fix typo in STDX","sha":"6590366f8e4f0d096f6cda7535c76a96d8f45495"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-18T08:07:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-18T08:07:01Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Improve SPURS debugger (#9090)","sha":"701f7f39d662f01d6d62e3eea7a4dc49ff5ad163"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-18T08:01:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-18T08:42:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Touch unmapoed memory in reservation mismatch","sha":"402e8b12a66ee234aeaa56e840c8d5e0e7a57613"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-10-18T15:41:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-10-18T16:30:40Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add VK_FORMAT_D32_SFLOAT to format conversion table\n\n- This format is required to emulate RSX_FORMAT_CLASS_D16_FLOAT","sha":"a90801e2aa2d77ab369a087529d6199257692f13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-17T11:30:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-18T17:10:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement priorities for cpu_thread::suspend_all tasks\n\nGive PUTLLUC increased priority.","sha":"f5c575961fe9f7ba3ab3e3f87cb2b66ef27bfdbb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-17T11:55:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-18T17:10:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement cpu_thread::if_suspended\n\nUse it for opportunistic guaranteed GETLLAR execution (TSX-FA).","sha":"adf50b7c4bb6681a5890bb03a3ee74b46844fec3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-18T12:00:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-19T16:41:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement perf stat counter for PPU/SPU reservation ops\n\nAdds Emu/perf_meter.hpp header file.\nUses RDTSC for speed.\nPrints stats at exit.","sha":"120849c73455f1aed35a68d1aaa9464b4da2f6d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-18T17:09:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-19T16:41:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve cpu_thread::suspend_all (TSX-FA)\n\nAdd prefetching of cpu->state fields.","sha":"a5eb11d79f458f947ab28a8b401286ebd8b48c91"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-18T21:43:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-19T16:41:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"TSX: improve transaction repeat handling\n\nHandle status 0 as fatal.","sha":"44c90c060ad6061e0959267e1bf48aa7e0524dc6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-19T09:19:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-19T16:41:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: fix GETLLAR regression\n\nMisplaced mov_rdata","sha":"311682b341e4cbbd8afa6e20fe8a4fe6b9ac4190"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-19T12:20:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-19T16:41:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"TSX: add prefetchw instruction in transaction code","sha":"8ce53923904bfe91843c8d1945d19942d843ac22"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-19T12:31:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-19T16:41:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: report too many PUTLLC attempts (TSX)\n\nMirrored to PPU STCX code and PUTLLUC (STORE128).","sha":"72d1ac22aa18ccb37ff93b6f05681e195fa2a572"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-19T18:25:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-19T18:25:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup for perf_meter.hpp\n\nDon't try to push reports if they are empty.","sha":"ea8e435b324e723f4af27ca29dd6d966c8488589"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-20T04:09:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-20T04:09:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add \"Enable Performance Report\" debug setting","sha":"182a998cb6ca87ac02533178bc8301cb728d771d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-20T05:22:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-20T06:10:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove XABORT in PPU/SPU transactions.\n\nIt's expensive for unknown reason. Simply XEND is usually much cheaper.\nAdd some minor improvements. Use g_sudo_addr.","sha":"dc8252bb9fd9c3ea3929533a4c50f1947d475ed9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-20T05:41:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-20T06:10:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve vm::reservation_op\n\nRemove XABORT, sync status handling with SPU/PPU transaction.\nLimit max number of transaction attempts in loop.\nAdd Ack template parameter, as in vm::reservation_light_op.\nRemove utils::tx_abort, improve utils::tx_start as well.","sha":"4384ae15b46f3444f98f8c5a2a5167b00298c02e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-20T19:00:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-20T21:22:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Atomics: use WaitOnAddress if available (Win8+)","sha":"f0fd7e2e19975fe442455080475e74ec43a3f520"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-21T05:18:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-21T05:18:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: fixup for WaitOnAddress path\n\nAlso fix wait quantum.","sha":"3b8bce1bed967082ccb8a4c7490abd137892c563"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-21T06:54:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-21T06:54:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert \"atomic.cpp: fixup for WaitOnAddress path\"\n\nThis reverts commit 3b8bce1bed967082ccb8a4c7490abd137892c563.","sha":"306593a0c501d2778c020646f0b4b721be2d43a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-21T06:54:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-21T06:59:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert \"Atomics: use WaitOnAddress if available (Win8+)\"\n\nThis reverts commit f0fd7e2e19975fe442455080475e74ec43a3f520.","sha":"59d9e7ce98b10481a7005b012850ee72bc50b711"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-21T07:04:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-21T07:04:34Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"LV2: cleanup syscall table (#9106)\n\nRemove old ppu_get_syscall_name from PPUFunction.cpp for deduplication.","sha":"b998852385ddcd7c315d583e0a6919095fcc1daf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-22T12:16:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T10:13:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel-explorer: Add SPURS wkl arg","sha":"8c927d3cc8b3937f541444865505bf5daf9b8806"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-22T12:23:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T10:13:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU Debugger: Add made-up MR mnemonic","sha":"e70f430b5a86de430dbd48877a07e89751d0ff88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-22T12:52:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T10:13:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger: Optimize thread disasm type select\n\nSome correctness fixes as well: dont use raw pointers where its not compatible, use std::weak_ptr instead.","sha":"6d3c42182334b8518da1ede1fda5d1555988a2e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-22T13:38:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T10:13:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU Debugger: Implement basic instructions's constants propagation\n\nOnly functional in WRCH and ILHU+IOHL pattern atm.\nILHU+IOHL is extremely common pattern to create 32-bit constants such as SPPU libraries error codes.","sha":"abcf265bc710e24894955b9a3f2d5654b348b479"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-22T15:28:56Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T10:13:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: cleanup channels logging","sha":"b56bc7e0879b83df3196bf33a2996d192a6ad791"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-22T16:05:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T10:13:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger: Simplify thread pause state change","sha":"0bb3609cad32be12445ee79685314b454c1d6d90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-22T21:09:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T10:13:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger: Fix SignedHex\n\nIt didnt take into account INTx_MIN. (UB for std::abs)","sha":"552d8e6aecf7e57b0a8a37d9f0c8c5b99de30cf4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-07T12:20:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-23T21:13:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add custom game icons\n\nThis shouldn't interfere with emulation as replacing actual files would","sha":"fe3c7926f77bbe2c8593220fc0d900c727ce391c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-28T19:18:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T21:26:41Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"HLE: improve cellHddGameCheck","sha":"27643cb715e511e091182fbb0ce3d077ffea28d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-24T07:54:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-24T11:13:19Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Save LS capture executable in one segment","sha":"49610f52f53650f18907ba77853334d318244a94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T10:00:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-24T11:16:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve raw_notify a bit","sha":"10caa2981fffd46580506776ed8529576e0cfb50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T15:20:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-24T11:16:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: integrate callback check in ptr_cmp function","sha":"d48d67767a8808a476e3a29c1433599b9eb3c7d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T16:31:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-24T11:16:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: rewrite internals (again)\n\nUse individual semaphore for each thread.\nUnfortunately, limit max thread waiting for single address (60).\nIf limit is reached, use busy waiting.","sha":"8628fc441db320d8e8770dfb5346e3ebee5ad7ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T19:43:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-24T11:16:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: experimental optimization (Win7+)\n\nTry non-blocking wake up function first.","sha":"c479d431a458ed3bc6f5cbc45a136ae28d125f3d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T21:55:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-24T11:16:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: use normal notify() thread function\n\nUsing raw_notify() everywhere was overkill.","sha":"2b52b4a749af10e8e531ef546cf91857a5dc09b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-24T01:21:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-24T11:16:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix UTF-8 strings in perf_meter files","sha":"89d9813a45e23c260789b89db3fbacf736baaca8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-23T22:08:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-24T11:16:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add imports for some undocumented NTDLL functions\n\nSome of them are available only since Windows 8.","sha":"97ae5ab56165bd3371060344bd19ba8b6693dc2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-24T01:40:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-24T16:06:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: use new thread alerting API (Win8+)\n\nWin7 will remain using old API (keyed events).","sha":"7db77a55807f7a81fa37470f160a8db7e594defa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-25T07:08:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-25T13:39:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Fix LS capture entry point","sha":"4ea7628204ef48ff641d2c3d9fe3050d42ac3d38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-17T09:20:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-25T13:43:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CellSpurs: Minor fixes","sha":"1e7bf218e07f6df8c028210de723d3f66ed8d4a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-24T07:48:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-25T13:43:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPURS: Implement spursJobchainPopUrgentCommand","sha":"0fcf767ee9a8db3bf7ba525329a6cad4a6fdf3e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-10-25T05:59:14Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-25T13:44:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ci: Set GLSLANG_URL back to auto-builds","sha":"eec2dfad7b667aaf73149c49eb2b064f38a6dbca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-25T00:17:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-25T13:45:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: add std primitive fallback for other platforms\n\nOther platforms = not Windows or Linux.","sha":"af6fcb19a8aeaf3ebc13aa1a32296d3075702214"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-09-14T20:38:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-10-25T17:21:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Block-level reservation access","sha":"18ca3ed449762e82e0a08fd6615cf826c419c0a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-25T17:06:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-25T18:48:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement cpu_flag::temp flag\n\nAccompanies wait flag, indicating that it was set in limited conditions.\nSuch condition don't allow thread to terminate after its removal.","sha":"130a0ef20efdd546d30e883aec3fa395cc296c70"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-25T21:28:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-25T22:15:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: add sparse atomics\n\nSet alignment as second template argument (typically cache line).","sha":"d344701fd56bd6f76c49be38e8526be886e807cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-25T22:16:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-25T22:18:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup for cpu_flag::temp\n\nWrong check_state() result was triggering assertion.","sha":"f1e66085cd28ae897295db59672f0ac378937883"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/14168726?v=4","date":"2020-10-22T19:43:45Z","email":"cebtenzzre@gmail.com","login":"Cebtenzzre","name":"Cebtenzzre"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-26T01:12:04Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Partially revert \"Fix debug build gcc/clang linker.\"\n\nThis reverts commit 4599d5841353fdf8096191c30a592fedc844efce.\n\nThe issue this works around was fixed in 3265772 (\"idm: Implement\ncreation/destruction invalidation counter\") by making the variables\nconstexpr.\n\nFixes #6896","sha":"2b6a56c21c1f60cfbb044af3d67d25df5aeaed68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-10-26T02:28:59Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-26T03:16:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"ci: Set glslang checksum back to auto-builds\n\nForgot to set on #9124","sha":"8307f82f86e499c74fa724770cb2b29aebcba190"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-27T02:47:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-27T02:47:07Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Qt: move TTY option to TTY tab (#9147)","sha":"8ce0eaa9d08b87db2b1a2c2ab883a59582851ae1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-10-27T10:22:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-27T10:22:15Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Driver compatibility improvements (#9131)\n\n* rsx: Refactor vertex clip emit to avoid using f64 unnecessarily\r\n\r\n- Fixes driver crash on intel\r\n\r\n* vk: Add NVIDIA driver version check\r\n\r\n- Warn if user has outdated drivers with known problems","sha":"b32eecb5a71e6c61dafe227f3d62183b51bc77c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-26T22:50:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-27T11:50:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix never played nonsense","sha":"15e8cba39835ff8f37da10ee52d2809cbff80008"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-25T19:59:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-27T14:25:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"DS4: Add error logging and remove some unused code","sha":"0a121e9d26936cc8b57be00a9680b8c94905f520"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-26T01:02:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-27T14:56:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: implement notify callback\n\nNotification can be very heavy, especially if we need to wake many threads.\nCallback is set for cpu_thread in order to set wait flag accordingly.","sha":"6806e3d5c73e472b497140dff9fc5058976c4997"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-26T01:05:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-27T14:56:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: improve range_lock and shareable cache (Non-TSX)\n\nAllocate \"personal\" range lock variable for each spu_thread.\nSwitch from reservation_lock to range lock for all stores.\nDetect actual memory mirrors in shareable cache setup logic.","sha":"4966f6de73c390a7f2314c8b45f7e4db7fdd97a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-26T01:25:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-27T14:56:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove some vm::reservation_lock instances","sha":"13de7734869fb9d277ebcc2dfb6825ea68e264b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-26T20:32:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-28T00:47:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomics.cpp: add support for waiting on 128-bit atomics\n\nComplementarily.\nAlso refactored to make waiting mask non-template arg.","sha":"c50233cc923c3bbc638a80fa7f853c772219279e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-27T18:34:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-28T00:47:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: improve accurate DMA\n\nRemove vm::reservation_lock from it.\nUse lock bits to prevent memory clobbering in GETLLAR.\nImprove u128 for MSVC since it's used for bitlocking.\nImprove 128 bit atomics for the same reason.\nImprove vm::reservation_op and friends.","sha":"c491b73f3a7bc5dfd17ed8c96b44f39ae11e72e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-27T19:25:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-28T11:00:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: make vm::check_addr checks safe under vm::range_lock\n\nReuse some internal locking mechanisms.\nAlso fix vm::range_lock missing check.","sha":"86785dffa4827713d5cc88e57c4bd6d1c0bea038"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-26T17:14:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-28T11:00:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix cpu_flag::temp, make sure it removes cpu_flag::wait","sha":"d6daa0d05bc0d423e1f3558b8badc1d8ceb2a3c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-28T02:57:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-28T11:00:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"TSX: adjust transaction logic\n\nAllow more in first-chance transactions.\nAllow abandonment of PUTLLC as in original path.\nMake PUTLLUC unconditionally shared-locked.\nGive PUTLLC +1 priority (minor change).","sha":"ff550b5c3cd819bd1938c66835c0dc4fb0adf5cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-10-28T05:57:26Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-28T17:44:38Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Revert part of CellHddGameCheck","sha":"6f5bbf550a48e791c6106b0780fd8789c54ca5f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-28T14:39:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-28T17:45:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"atomic.cpp: fix memory ordering loads and release stores","sha":"e791678dfc46209ced5faafbab91cf9949d305ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2055446?v=4","date":"2020-10-25T11:02:57Z","email":"bevan.weiss@gmail.com","login":"bevanweiss","name":"Bevan Weiss"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-28T17:54:29Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"NET: Add SO_RCVBUF / SO_SNDBUF defaults to .._bnet_socket\n\nThe OS defaults for SO_RCVBUF / SO_SNDBUF may not match what the defaults for the PS3 are.\nAnd the code may be happy with the PS3 defaults, so may not set this explicitly.\nSo we'll do it when we establish the socket.\nIt also looks like the Windows recv behaviour is different for the MSG_PEEK option (and possibly in all situations where a smaller buffer is provided). I believe other platforms will return the size of the data received into the socket buffer, even if the supplied user buffer is smaller. Windows returns WSAEMSGSIZE instead. For the length of '1' MSG_PEEK request that is currently seen, we just mask this and return the full size of the buffer. This might need to be the case in all situations, I assume there will be applications that will supply an artificially small buffer and resize it as necessary based on the size of the received packet.\nAdd some additional translations from native->PS3 error codes\n\nRewrote handling of MSG_PEEK to just be a copy of what GalCiv suggested\nAdded WSAESHUTDOWN, and WSASetLastError as done by Cygwin","sha":"f4070731a857c9e56385ed5c32499c0072985a10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-28T18:58:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-28T18:59:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert \"TSX: adjust transaction logic\"\n\nThis reverts commit ff550b5c3cd819bd1938c66835c0dc4fb0adf5cd.","sha":"280958ee747465850f5f7edb8d5ac9ce315c93f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-10-28T23:44:21Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-10-29T03:57:39Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"ci: Use system cURL on Linux build","sha":"3641926333d575dfb6ec5233ba9e592d113ecb2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-10-29T01:14:52Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-10-29T03:57:39Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"ci: Update docker to 1.6\n\nBumps Windows VulkanSDK version to 1.2.154.1 to stay synchronised with\ndocker","sha":"ea1cdbfdd84f4ca1898291a5c6b2ec96adac7500"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-29T06:02:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-29T06:02:05Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Qt: Add \"Configure Game Patches\" to game list (#9154)","sha":"59b3a3d26b6dad27dc13d68e73aec7e6ece8ecc1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-28T20:12:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T15:57:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"TSX tweaks\n\nAllow to do more in first-chance transactions.\nGive PUTLLC +1 priority (minor change).","sha":"688a456642ec3779f8548561158b95805247d21f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T02:01:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T15:57:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: add stx/ftx counters\n\nJust count pure transaction successes and failures.","sha":"8ce0819b42921b9de7cbb699e2f3dcce52748002"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T02:09:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T15:57:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Logs: add callback for cpu_thread to set cpu_flag::wait\n\nMay improve waiting time in critical suspend_all ops.","sha":"95dbcf2fd752b4a87ef0a96398aa4f41234d6456"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T16:29:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T23:58:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPU: improve cpu_thread::suspend_all (TSX)\n\nTry to make more clever busy-waiting on cpu_flag::pause.","sha":"d5667a859acd909a870d3277f62a13870465a65b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T02:35:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T23:58:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: load previous data on PUTLLC failure\n\nSince it will most likely execute GETLLAR to load it again.\nOnly implemented for TSX at moment.","sha":"425fce5070b56c489c7028251a4c228f8c1a5e7e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T18:46:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T23:58:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: add LARX perf counter\n\nAlso refactor ppu_store_reservation a bit.","sha":"fb24b06a5dc5e429022ce0e6744a1273054672bc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T22:22:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T23:58:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: reload old data on STCX failure\n\nIn 128-byte reservation mode, it can reload the whole cache line.","sha":"4378a0986719ef78bff72c77cc32ec5481d05614"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T23:07:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-29T23:58:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: make do_dma_transfer() static with _this arg\n\nInstead of this, nullptr will be passed from another thread.\nMMIO via MMIO is disabled if it even possible.","sha":"006c783aba482c0516ea7c231488f1fe5b1573ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T00:19:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T00:19:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"perf_meter.hpp: fix double rdtsc bug, add restart() method","sha":"e794109a67f2edf79c52afb370aeb5907926cc64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T02:17:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T02:22:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPU: improve cpu_thread::suspend_all for cache efficiency (TSX)\n\nAdd prefetch hint list parameter.\nWorkloads may be executed by another thread on another CPU core.\nIt means they may benefit from directly prefetching the data as hinted.\nAlso implement mov_rdata_nt, for \"streaming\" data from such workloads.","sha":"0da24f21d65f3a6a1bd8e92cc0c2d27d3432bb04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T04:58:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T04:58:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: add extern clear_range_locks function\n\nAllows to wait for range locks to clear for specified range.\nvm::range_lock now monitors specified reservation lock as well.","sha":"3419d15878dbcd4b1d4e473c6661b08cff6060fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-30T06:40:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-30T08:49:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"PPU: Optimize reservation load for success","sha":"f03d4cf8fdc842f13cde072b62ab4a5419066194"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T13:32:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T14:03:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Allow cpu_thread& arg passed to the syscalls\n\nMinor cleanup. cpu_mem(), cpu_unmem() removed.","sha":"150e18539cc6c2d441ea8b96c59d04606c918552"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T14:09:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T14:36:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Derive RSX Replay thread from cpu_thread\n\nIts id is set to 0, so fix some id_type() usages.","sha":"f972fa26a43f1c05fe9bf8897d593044af29b773"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T14:43:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T14:49:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_event: cleanup (replace vm::temporary_unlock)\n\nAlso made minor changes in sys_rsx.cpp.\nRemoved unused exception std headers.","sha":"605d57c541ee63c8f7f633f9c29a012ddf7ebf75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T15:00:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T15:00:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_rsx: add cpu_flag::wait","sha":"95aeebe4b5dfde5c802b30be4f4e4f0f4753fb2d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T15:09:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T15:09:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_memory: add cpu_flag::wait","sha":"13c564f2afbc0b589325d7b301b1db421d82cc69"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T15:24:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T15:27:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_ppu_thread: add cpu_flag::wait","sha":"58adb6a1aa31ce5ca61eca699f4e20159a8980ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T17:14:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T17:14:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs/sys_usbd: add cpu_flag::wait","sha":"cb0431d9602f84bb9f69375f00b2dce7d6f0fc09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T19:20:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T19:20:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: optimize range lock slot allocations\n\nDoesn't seem to need a barrier.","sha":"7dd85b207f536c2a597c14f41bbe138917d7531a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T19:25:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T19:25:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Actually start rsx replay thread","sha":"c4e89f8bb41f290e2c945a527c37601454307cb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-03T08:36:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T23:08:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Fix transform contants load","sha":"b5014d56ab2209687daf1f71edc57095c26c00bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-30T22:37:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T23:08:42Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Fix Resolution combobox default value","sha":"5ca2b1200dba1e397681a9320cba5874a4b4a322"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-30T19:54:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T23:10:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add License Area Setting","sha":"54fd224fd8b513acb3c6c1629d73a0e4a0a76763"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-04T19:11:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T23:11:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"HLE: Add some constants","sha":"c65b7d0aea1860fb229d1c31634701aeb70a26ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-04T20:46:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T23:11:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"implement interception for cellKb and cellMouse\n\nthis needs to be tested","sha":"4984e87776976a5b124a9f23e4d965748c21cf1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-31T01:40:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-31T01:40:38Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"cellSubDisplay: Add some constants (#9178)","sha":"5d55e509ecea10067db5ee57202ebb05970f825f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-30T20:26:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-31T10:53:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Cleanup some includes","sha":"2cee26c3e7dc91053bee57d346f8db3a85738734"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T20:43:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-31T12:08:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rename vm::reservation_light_op -> light_op\n\nRename vm::reservation_peek_op -> peek_op\nAlso remove overkill assertion for cpu_flag::temp.","sha":"ba26e164112b1239ef37a57f7046b447dd0af522"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-31T10:33:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-31T12:08:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: rename g_addr_lock to g_range_lock\n\nReduce size to 29 bits and use 3 bits to communicate some information.\nThis information can be used to to a very cheap lock-free access tests.","sha":"80530e8aef742399008d6e8ec3bed8ab398403fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-30T22:52:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-31T12:34:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"TSX: new fallback method (time-based)\n\nBasically, using timestamp counter.\nRewritten vm::reservation_op with the same principle.\nRewritten another transaction helper.\nAdd two new settings for configuring fallbacks.\nTwo limits are specified in nanoseconds (first and second).\nFix PUTLLC reload logic (prevent reusing garbage).","sha":"86fc842c89565b696263353785f9f5db35b9000d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-30T10:30:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-31T14:15:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU Debugger: SHUFB insertion patterns","sha":"5e8419af0d63ef71b10921c160babf361d8c1ddb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-31T11:29:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-31T14:15:47Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Disasm: do not allow to access previous instructions in non-interpreter mode","sha":"c2c559f8d93c35c2c7360c39fb2c5d90538fa5e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-31T16:32:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-10-31T16:32:31Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"overlays: kinda fix performance graph margins (#9181)","sha":"36149fd9867f9e7af2a1c10fe3a96fb8b205db1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-31T18:39:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-31T19:44:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Pass events to dialog when not remapping","sha":"a42663b09bcfa8fc7d20d272c2451e65220b036a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-31T16:17:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-31T20:53:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve vm::range_lock\n\nNot sure how it ever worked\nClear redundant vm::clear_range_lock usage","sha":"78c986b5dd1e9175f225d4f430dfc75813c8bb03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-31T17:27:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-31T21:35:48Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Fix Accurate DMA edge case","sha":"3c639ff8e1d0ce7a81fd64a8e167cf5cf4169039"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-31T21:34:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-10-31T23:30:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix vm::page_protect and range flags\n\nShould fix assertion in vm.cpp\nMinor refactoring of internal locking","sha":"ca57f25f261ab255681e94fb4c6df87dc5ed234e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-01T11:28:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-01T11:44:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"TSX: tiny optimization of transaction functions\n\nBecause new memory manager puts them in first 2G.","sha":"fe03b55046ba0ea6479f3523a88b3822b7d43b36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-01T11:45:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-01T11:58:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"TSX: fix transaction limit settings","sha":"8d1281600196e41c2bcab3700a114e4f9b7c24af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-01T13:46:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-01T13:46:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Optimize vm::range_lock\n\nOnly test address on `range_locked`\nDon't check current transaction\nRemove vm::clear_range_locks completely","sha":"46d3066c6294a738a51eb7b344047a705de4710c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-01T20:29:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-01T20:29:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::range_lock cleanup and minor optimization\n\nRemoved unused arg.\nLinearized some branches.","sha":"06ecc2ae68ebdd27455b4ebbdc789478a574de0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-02T03:07:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-02T18:23:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Upgrade to LLVM 11 Stable","sha":"1b8bf081b52190278fe7f2503645324a60181535"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-11-02T20:20:12Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-11-02T20:20:12Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rpcs3_version: Bump to 0.0.13 (#9192)","sha":"09a9d08466583df18925c59c8fec74f956ff0b1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-02T21:28:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-03T05:42:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Log Qt version","sha":"ef9638e094c28ffde1d6c45740bbafe5b2a0c7eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-02T22:33:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-03T05:42:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add option to log qDebug","sha":"088931525d0dbdf0cce92608dacc6448c0ede2a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-03T15:09:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-04T11:13:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Set some things to log level always","sha":"91b8e7504e795ec283c3848cf8aa44d8d7fb0686"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-03T15:39:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-04T11:13:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add Quadro to fast version of VK get_driver_vendor","sha":"027eba2b59d2c9b020862c1107e2299c1ab94aea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-02T21:12:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-04T11:59:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Optimize cpu check_state() a bit\n\nMove cpu_flag::dbg_pause check from the start.\nTo the moment before it actually goes to sleep.","sha":"dea8aa675a46cf179c727eec7dd35ab907d93c52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-03T01:12:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-04T11:59:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix NEVER_INLINE attribute\n\nSimilarly to FORCE_INLINE, it doesn't imply inline on some compilers.","sha":"2d38d8a639bbc2a618de6d592e366726fddb74f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-03T01:16:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-04T11:59:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix some switch warnings","sha":"9b595c68a5dc16558057abc5188cc6d43abbc17c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-03T04:23:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-04T11:59:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: minor refactoring\n\nRenamed internal main range locking method.","sha":"5d7acda80eb0caafdf7d35aacd336a971e1b3f9d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-03T12:05:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-04T11:59:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_prx: add cpu_flag::wait","sha":"d022e7cd27251ad68c20a7df98b7bd72940b889d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-03T20:09:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-04T11:59:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve cpu_flag::temp handling\n\nIgnore cpu_flag::suspend\nIgnore cpu_flag::signal","sha":"8d5e1195820795480f3a9c13b0a063eb8dd52666"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-03T04:18:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-04T11:59:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix vm::lock_range wrong check\n\nMinor header refactoring.","sha":"ba5ed5f3805dac9d48a4358058dd07b8400d42a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-04T11:56:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-04T11:59:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve low-level mmap utilities (Linux/BSD)\n\nAdd madvise (MADV_WILLNEED) on utils::memory_commit\nAdd madvise (MADV_FREE or MADV_DONTNEED) on utils::memory_decommit\nImprove shm_open pseudo-random name (not used on Linux)","sha":"b66628baca83b1b2a552c45f8b8950303fb6ef04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-04T14:19:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T02:51:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: improvements.\n\nReduced static memory amount for waitable atomics.\nAllow notifier to skip notifications if wait/notify masks don't overlap.\nImprove raw_notify to wake up the thread by its id, add thread_id arg.\nAdd optional mask argument to notify_one() and notify_all().","sha":"5248240e104bc2be76ca23e680d7aa24dda0da31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T03:45:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T03:45:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix 1 warning in MSVC","sha":"ebdf93e5dc3b87568faaeb4a61ece3383bbace4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T03:45:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T03:45:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM commit id","sha":"fc77fb9b4c16e69a29f66516ffd67652059ce00c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T15:50:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T15:50:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix HAS_OVERCOMMIT usage in JIT.cpp","sha":"7d56069243793aa1d8008d5e69fecfe52172c0a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T15:59:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T21:10:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve cond_var notifiers\n\nBut nobody uses it anyway, so clean up includes.","sha":"34fa01060198e4da2613db3ae9122ea95a9710c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T16:15:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T21:10:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve shared_mutex\n\nWait/notify only on c_sig, should reduce spurious wakeup noise.","sha":"cc07e5306e8238c3bcb9938c94a2e17ebf9c795a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T16:18:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T21:10:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: various cleanups and fixes\n\nAdd pointer comparison to notifiers (to prevent spurious wakeups).\nFix a bug with a possible double notification in raw_notify().\nFix a bug with incorrect allocatin bit slots for cond_handle.\nAdd a semaphore counter to track max allowed number of threads.\nUse #define for some constants to STRINGIZE them in errors.\nAdd some error messages when certain limits are reached.\nFix a bug with a wrong check simply throwing std::abort.\nUse \"special\" notify_all patch with batch processing for every arch.\nFix Win7 bug who no one probably noticed.","sha":"1bb7c74c93083728d80b4bf79d8798536acac462"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T21:06:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T21:14:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: more improvements\n\nAdd ref counters for internal semaphores for concurrent notifying.\nLack of them could result in loss of notification.","sha":"9fb8d449fec6d4bc7cb53b5a3a544aba2f662ccd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-05T23:43:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T01:44:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: remove load() from notify functions\n\nOnly compare masks for overlap for second overload (with mask provided).\nExplicit \"new value\" can be provided in new 3-arg overloads.\nAlso rename atomic_storage_futex -> atomic_wait_engine.","sha":"557f0c5a8a41b0570b6002531439ee40d45dfe2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-11-06T09:53:58Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T10:54:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Extend timeout on travis","sha":"4554eedd190cb24f0be2dd49fbe3990bc9f4ec09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-11-06T11:41:51Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-11-06T11:41:51Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"llvm: Update submodule (Zen3 workaround) (#9212)","sha":"f9c8f78000b442e8777798d084662e7a2dbaff2d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T07:56:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T13:48:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove unused atomic with lock bit","sha":"1e4543749843fd870595fa1fcb9b67985aa8a3c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T08:55:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T13:56:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: fix cond_handle data structures\n\nFix a critical bug with possible id out of range.","sha":"bfe958055136e65757508845b68599ffa1aa2b78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T09:48:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T14:15:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: refactor native signaling functions\n\nAdd native_alert() and try_native_alert()","sha":"ad4df2d9462018b5d9379a8a3c05bb5b916effdd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T09:53:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T14:15:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: upgrade raw_notify()\n\nNow it searches all semaphores if data arg is nullptr.\nAlso it tries to wake up all threads if thread_id is 0.","sha":"0a5742587a82f8d77ec83852a6984d3d1b906a86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-07-12T20:43:44Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-11-06T18:20:23Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"CI/FreeBSD: stop forcing ccache after f528aada24fb","sha":"debd44fa9b53e0b47236e69437e5d67ee510c264"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-07-12T23:15:32Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-11-06T18:20:23Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"CI/FreeBSD: clear ccache stats, so new hits are easier to notice","sha":"4075f5c497f8554e320a6208e14f7ac99d345d05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-07-12T23:20:09Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-11-06T18:20:23Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"CI/FreeBSD: avoid downloading commit history in submodules","sha":"c2cb7e1004f3ccc12828954f86026c0e92a8751e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-11-06T13:49:51Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-11-06T18:20:23Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"CI/FreeBSD: switch CirrusCI to 12.2-RELEASE","sha":"fde7cf1fab9deaf5538e7b90daf2c66c1e8e7a9f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-07-12T20:44:34Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-11-06T18:20:23Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"CI/FreeBSD: enable on TravisCI as ccache works nowadays","sha":"acb17b02988922f607013addb40e872c77bfbc84"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-11-06T14:57:33Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-11-06T18:20:23Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"CI/FreeBSD: switch TravisCI to Clang 11","sha":"e2303f337804f7c0f6489797d4fb0581d8b239cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-06T17:45:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-06T21:14:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"More Header cleanup","sha":"a3eb5c2d633ff0d023ec25435256dcfdf886ab3d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1286822?v=4","date":"2020-11-07T09:47:44Z","email":"morgan@creekmore.email","login":"gamingrobot","name":"Morgan Creekmore"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-11-07T09:47:44Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Set AccountAge to 18 to fix age restriction checks, fix incorrect logged function name (#9218)","sha":"a28ab0a408d0e05f9c17d90a43340ba8919ce5b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-09-15T18:19:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-07T11:03:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU reservations: Do not illegally dereference reservation data","sha":"6dcd482dd09e7fd99acf743f9dbe8a07e5e02057"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T19:42:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-07T12:08:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: maintenance of wait() function\n\nMove hashtable allocation into another function.","sha":"3e445eff8e7cddab6304f00e6cc769ef2212c56b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T21:00:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-07T12:08:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: add minor safety check","sha":"31f0a0c0641eda157f20787afb5934dbc1c5b000"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T22:17:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-07T12:08:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: adjust assumed pointer mask\n\nIncrease waiter mask (allow 65535 waiters).\nAssume 47-bit pointers instead of 48-bit.","sha":"bd0b292b39518b58590ebd952b064190246d930e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-06T22:23:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-07T15:18:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: allow waiting on multiple variables simultaneously\n\nArbitrary maximum set to 8, but really we need 2, maybe 3.\nAdded atomic_wait::list object for multi-waiting.\nAdded atomic_wait::get_unique_tsc just in case.","sha":"0bd989b118b6094bd814dd7da4d74ded0f024bc1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-07T16:18:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-07T16:18:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: fix 3-arg notify functions\n\nThird arg forces comparison with itself, and possibly forced wakeup.","sha":"fd7ea8296569ad68538cc54e31e7f4e3f8044b06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-07T16:12:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-07T17:45:57Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger: Implement SPU callstack, fix PPU callstack","sha":"3cb5fd8ebc817af35c6b23698caf15b185c6be14"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-07T17:21:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-07T18:22:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"unify patch log","sha":"6fcc68699acf074045c86c64f368b5bc2d2a1a38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-07T19:05:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T06:17:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger: Improve SPU/PPU callstack handling","sha":"516da4ecdd0a652abcabcca4455d97188eeac4e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-08T05:18:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T06:17:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel-explorer: Add basic process info","sha":"5265eb81e0a45c8a3226d84720aed08f4a5120a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-08T13:42:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-11-08T13:42:20Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Debugger fixups (#9226)\n\n Fix logic error in callstacks handling code, always set first to false after first iteration.\r\n Add explicit check for zero return addresses. Current code validity checks may not check for it properly when it sits on interrupt handler entry point (which may contain valid code).\r\n Do not allow 0x3FFF0 to be a back chain address because it needs space for LR save area, only 0x3FFE0 and below satisfy this criteria.","sha":"bacfa9be19ef27183aa8b4f8df918e0a3a500591"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-07T21:14:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T13:43:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: refactor vm::range_lock again\n\nMove bits to the highest, set RWX order.\nUse only one reserved value (W = locked).\nAssume lock size 128 for range_locked.\nAdd new \"Size\" template argument that replaces normal argument.","sha":"b68bdafadc6b3d0d942c9ca4576937c75c5d31e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-07T22:56:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T13:43:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: add map_self() method to utils::shm\n\nAdd complementary unmap_self() method.\nMove VirtualMemory to util/vm.hpp\nMinor associated include cleanup.\nMove asm.h to util/asm.hpp","sha":"1c99a2e7fb2b640900166f3806ed43df990bb696"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T04:07:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T13:43:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: implement g_shmem for range locks\n\nRenamed from g_shareable. Contains pointers instead of bits.\nUsed in range locks to prevent any \"collision\" between memory.","sha":"21ec32b465f73f808ae46a933def322abe954981"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T05:01:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T13:43:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: improve spu_thread::reservation_check\n\nUse optimistic locking and optimistic loop (expecting 1 iteration).","sha":"3507cd0a379e74c6fc65c9a2381b119b80516677"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T14:21:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T14:23:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU/vm: Improve vm::range_lock a bit\n\nUse some prefetching\nUse optimistic locking","sha":"8bc9868c1fb9b8a661da8d34fd20153b7882da31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T16:03:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T16:03:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_semaphore: add state check to sys_semaphore_get_value\n\nAlso to sys_semaphore_create, although we don't do it.","sha":"733b46d51ab583ddadbe7b07805fa2041edd96ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T19:15:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-08T19:15:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Hotfix for shm->map_self()\n\nMake sure mmap returns 64K-aligned results, as on Windows.","sha":"b05d12df0e54cb868047fca99afe8ae4e34dd8b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-11-09T09:07:19Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T11:23:54Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix path not being saved on install pkgs","sha":"8a50880613af0eadebb6822a52cefae74e43098b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T00:41:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T19:57:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPU: use unsigned (u8) priority in suspend_all","sha":"bc61835d9742a3262fbcfa5c22e8f0180d9e4604"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T14:14:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T19:57:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: remove unnecessary memset() on stop","sha":"d1988d384c9942b8c8b3cb1754c228a97cc83387"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T14:15:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T19:57:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement utils::memory_lock","sha":"e98eb4659e1c5c2b0afd0df1a207febaa3882eb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T14:34:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T20:54:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: lock memory under \"sudo\" addr\n\nRemove memory touching from transactions.","sha":"083397a5555f06330c87847015abde25a6b4fe5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T19:53:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T20:54:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPU: Improve suspend_all g_suspend_counter handling\n\nIncrease in two stages, giving more chances to use it.\nSecond stage is when all wait flags have been seen.","sha":"cdaa8cb5c49433e96cbff4c62698beeeafb6a74e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T22:11:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T22:44:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve DYNAMIC_IMPORT\n\nDon't call get_proc_address every time if if failed.\nAlso rename Utilities/dynamic_library.h to util/dyn_lib.hpp","sha":"bd5253047b18570b44bdaeb2102bf9af4909ae42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-09T22:40:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-10T00:04:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Import VirtualAlloc2 if available (Win10+)\n\nImport MapViewOfFile3 as well.\nUnused, this crap is tricky.","sha":"dcbe8ef5f4afd39286a563fe86a4196a9a3c078e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-10T02:56:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-10T03:05:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make memory locking optional (mlock, VirtualLock).\n\nFix desired locking operation (to fix \"sudo\" memory).\nIt was discovered that some systems have outdated configuration.\nWith too tight limit, it's almost impossible to lock anything in memory.","sha":"d1ee7c651f423285340a4db75e5fd2fc3d427f96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-10T01:07:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-10T03:30:35Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix PPU stack contents on allocation","sha":"b32d989a101175598f720e4abcf328e619c9ba52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-11-10T08:55:49Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-11-10T08:55:49Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rpcn 0.3.5 (#9227)","sha":"a83df01bfda14054f13068fb9971676f8b418454"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-10T14:57:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-10T19:51:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"SPU Debugger: Improve registers panel","sha":"52fa69d93de821734e675e1eb6de2c49f03043d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T01:08:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T02:35:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: waitable atomics got brutally rewritten\n\nHashtable increased and flatten, tree-alike extensions removed.\nSome things simplified, so it can actually decrease perf a bit.\nBut most platforms shouldn't be affected.\nRemoved limit of 56 waiters per pointer.\nReal limit now is about 65535.","sha":"c047ab6147fd83cc6351469df7de3f13464ae316"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-11-11T03:18:22Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T04:16:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix missing controller mapping","sha":"908b2703f37a8eb09286fd4ad7bbb9dc153eadef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-11T03:59:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T07:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger: Improve SPU/PPU vector registers","sha":"74274f6d77bdb38faa9e0152433b0bb1825558d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-11T05:11:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T07:27:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Registers Editor: Implement SPU/PPU register value broadcast","sha":"6e27ab60ca630baef1b519150e6e5ccfe61a7959"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-10T17:09:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T07:30:09Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix vm::range_lock, imporve vm::check_addr","sha":"fefab50e0699db15f96493f4a4ffb6774a822f8f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-11T11:03:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-11T14:40:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix vm::check_addr calls in Thread.cpp","sha":"829a697c390385e2f07b358deb33bc5bc1e91540"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T07:25:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T17:46:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: implement some atomic wait operations.\n\nInstead of plain waiting while equal to some value,\nit can be something like less, or greater, or even bitcount.\nBut it's a draft and untested. Hopefully doesn't break anything.","sha":"7cd1e767beffb4d6d63162129050c07da7710b72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T12:31:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T19:43:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: restore notify_all() behaviour\n\nRestore batch notification with non-blocking attempts.","sha":"4b823469f74e68f63daedd654828bb03a8867e55"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T08:32:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T20:51:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: minor notification improvement\n\nCheck mask before locking the reference.\nCan help to not bother non-eligible waiters.","sha":"d391133524e60cfb9fc194cfb4fc8cd8bf390342"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T20:59:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T20:59:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: don't load actual memory on empty mask\n\nIt's not an optimization. It just allows some tricks safely.","sha":"ad013d59f400a80c320ceb712ed0da7e95d7f7e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T21:29:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-11T22:06:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: combine two atomics (ref ctr and wait ptr)\n\nShould fit into cache line perfectly.\nAlso makes ptr check more robust.","sha":"350b704cd796c6ebe1082546df6b72bc9afab854"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-12T00:14:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-12T00:39:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: merge more atomic variables for simplicity\n\nCompress 16-bit ref counter and two 48+64 bit slot allocators.\nThis allowed to remove some weird unnecessary logic paths.\nAdjust hashtable size to keep it the same.","sha":"c30cdfb3a7067165d0d0d20e0f457a1a8199e814"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-12T00:41:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-12T00:41:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: minor optimization\n\nSilly MSVC emits unnecessary initialize-on-first-use code guards.\nDidn't check other compiler. But workaround just works anyway.","sha":"e37df998e9e5809dfb56b02218b2140565149d86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-12T01:20:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-12T02:01:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: fix notification bug from few commits before\n\nMake sure forced notification ignores mask comparison.\nAlso fix masks provided by smaller types to correct ones.","sha":"70761a4ef0c97bc9009b8dea6ff4a5e8069458a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-12T02:52:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-12T02:52:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: print some stats on stop","sha":"3888b0429c25a1ad90abeeb28d9f802439a0e3ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-11-11T21:59:30Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-12T04:08:59Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Adds SIGPIPE to ignored exceptions(unix)","sha":"1378645413c291ad18e5d18b6d919b366507f9d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-12T20:29:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-12T20:43:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add .gdbinit config file\n\nSet to ignore SIGSEGV and SIGPIPE signals.","sha":"50d80c64fa0d00cf09e57437f20b1f8ee392413f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-12T20:24:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-13T00:32:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement simple thread pool","sha":"67785a918cc96708b64d28ed72da2a996dd647ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-11-12T05:22:08Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-13T02:28:00Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add some error checking in sceNp2.cpp","sha":"e6f2f8ad0df1c5d7ad02a94c717dd0082d250fe2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-11-12T20:38:57Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-13T04:05:06Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve disconnected state handling of dns queries","sha":"debfae06a8e9d9f74fbb1f54fa7e0cce14aaf149"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-13T02:32:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-13T04:05:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: optimize raw_notify() for unspecified pointer mode\n\nRemove unnecessary optimization from cond_alloc().\nOptimistic case was absolutely dominating anyway.\nAlthough the whole function is a dirty hack.\nNow scanning through all threads is faster.","sha":"cfda4d0ade2e7c1732aec00efe719d3b762ae690"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-13T02:36:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-13T09:40:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: continuation of fixing all-ones masks\n\nAlso added missing const noexcept.","sha":"e48f160a2973e8c466dcd0e5128d7327cef780f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-13T08:32:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-13T10:32:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixed thread pool a bit\n\nUse 128-bit allocator instead of queue.\nWhen pool is full (128), threads just terminate as before.","sha":"ab365fe494a67000bfb97c97d688c90137868e5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-13T13:59:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-13T14:17:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix thread pool resource management.\n\nMake sure no tail call happens (change ret address to a trampoline).\nMake sure thread handles don't leak if the pool is full.","sha":"0c7f9458c0bc81dc2b07f50bb84d3e0c0d1889d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-14T06:03:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-14T06:03:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Don't add lonely cpu_flag::memory on TSX path (bug)","sha":"71ca41306788fe44c19b24e4e7ac2c3b8430a4f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-14T07:56:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-14T07:56:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix suspend_all bug (TSX, TSX-FA)\n\nCould cause freezes.","sha":"5b69eda39aebbac1e81ae7343d7c50530c51efb8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-14T08:12:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-14T08:12:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Temporarily disable memory locking if TSX is not used\n\nIt's a very heavy operation that could cause some problem under mutex lock.","sha":"1e269751bf767395bacf08df10f34879b57d322a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-14T10:47:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-14T10:56:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: fix rare overload scenario\n\nIf slot allocation fails, increase reference counter in every slot.\nThis prevents search routine from \"losing\" some slots.","sha":"00f877e812ccb7a3fc87f9d3fe117279fa7db7f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-14T14:24:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-14T14:25:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: fix waiting on multiple variables\n\nSilly bugs are so silly...","sha":"3ac819ee70ee11101aecb290031919fab9116dae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-13T16:06:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-14T15:16:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp/threads: remove old wait callback\n\nAdd new wait callback which simply collects statistics.\nShift workarounds towards actual problem detection.","sha":"badb3dc2ddf80604aebcf39f9cf29125cbef04b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-15T01:40:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-15T01:40:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: fix notification on windows","sha":"333fe9a561c6de59322d3549b7577e2a32dcd511"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-15T00:26:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-15T01:41:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: Fix some stat printing","sha":"dfae7bd073145914fbcd98542b91c975beb77fed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-15T05:45:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-11-15T05:45:28Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU Debugger: Implement float registers view + General debugger fixes (#9265)\n\n* SPU Debugger: Fix try_get_insert_mask_info\r\n* Debugger: Always update thread state on context's data change\r\nNo longer needing to press on thread's instructions for actions to work!","sha":"b1710bb7125012d513e2cd5040db2cea05a6d2aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-15T04:37:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-16T09:46:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: don't allocate SPU LS in vm::main\n\nCreate its own shared memory object.\nUse vm::spu to allocate all SPU types.\nUse vm::writer_lock for shm::map_critical.","sha":"eaf0bbc108c10f79a16b17240986d7afd6338fd1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-15T00:26:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-16T09:46:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: memory locking rewritten\n\nAdded vm::lock_sudo method (wrapper for utils::memory_lock).\nPut locking outside of vm::g_mutex scope.\nPrelock sudo memory for RSX, vm::stack, vm::main.\nPrelock sudo memory for shared memory objects.\nDon't check for TSX path.","sha":"ea5f5aea5fcb14534b1e4192f74f48b8f281b2d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T02:08:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T02:33:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: respect initial protection for allocation mapping\n\nUnused yet.","sha":"d7e1cf7dd2a6b486e9bdb36debfae4841ee5e5f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-16T10:57:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T02:33:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add thread_ctrl::get_thread_stack\n\nReturns addr and size of current thread's stack.","sha":"d789250976bc4bc98ec16ac0f2e2cbdbba70dad7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-17T05:38:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-17T08:04:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGame fixes","sha":"992a372fc765441001da7137d3d974ef2e11b49d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-16T22:46:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-17T08:39:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Debugger: Fix scrolling in first registers panel","sha":"50ea1a12c901ced41639397ba386bf79c8816ac0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T11:46:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T12:22:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Potential fix for Linux compilation","sha":"984e97cbdc5fd50d7685a4a5b2970fc2f42c08fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T11:47:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T12:22:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: remove tiny redundancy","sha":"3dd48a24ce16ace03afca2206061ced6b66d092c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T11:50:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T12:22:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_memory: HORRIBLE HACK for sys_memory_get_page_attributes","sha":"f8d1f070f50db0580e104c090db98ec42a0b6718"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T11:53:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T12:22:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: absolutely unacceptable hack for SPU LS\n\nMake normal threads inaccessible in PS3 memory.","sha":"0fec99e75b3ae510ca7a281041b4f875cae7d2cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T12:00:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T12:22:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: increase max SPU count\n\nAccording to max SPU TG count.","sha":"ccd0d2046df424ea0842cc1ab71d50c5af8b5beb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T12:20:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T12:22:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix memory viewer for SPU LS","sha":"65c81c5e83a91a42e34e067d57e5d7d8dcddbc0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T12:40:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T12:40:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update hidapi","sha":"a4e28df9cf4368dc7affd7af716df1663b51f074"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T13:21:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-17T13:32:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Debugger: fill stack guard with STACKGRD","sha":"68931b4c431761cbbeba79bdc4fa3aa248900711"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-17T20:56:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-18T06:29:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Resolution scaling overhaul\n\n- Enforce square pixels instead of per-axis scaling","sha":"0e7a705254f3cb24a1b9fe9ac7cf245894df03af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-18T11:36:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-11-18T11:36:26Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU LLVM: fix AND instruction family (#9290)\n\nIncorrect immediate test (looks like copypasta)","sha":"28cbba5a7d6e12b58c92e14f309cc7c40fb48f95"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-18T06:17:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-18T11:38:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPU: Fix g_suspend_counter waiting logic","sha":"190676c982ad3da1c0c3a185f5b0bcb68083d79d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-18T16:15:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-18T16:15:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPU: update suspend interface (dummy)","sha":"e9f7c100a04863ef16aa7e00b546292c12096833"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-19T06:12:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-19T06:46:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPU: remove cpu_counter from g_fxo\n\nConvert it to a namespace, simplify add/remove functions.\nDon't add() threads just creates, they are trapped in check_state() anyway.\nDon't add() threads which are leaving check_state() because stopped.","sha":"6d37bc62a5289aa2c4e6c051892165caeb2cff54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-19T10:21:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-19T11:44:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm.cpp: minor optimization for filling stack guards\n\nUse REP STOSQ on all compilers.","sha":"3e1344e4e40f4b52ee62493d6725fcaf91ca9343"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-19T08:12:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-19T11:44:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix perf_meter<> after adding thread pool.\n\nPrint and reset sorted information after emulation stop/pause.\nPrint useless average value.","sha":"d4d5dc99f307de3aaf9836c80edd0ec17220e8f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-19T13:05:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-19T13:05:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPU: use u128 in bit counter\n\nApparently, u64 was not enough.","sha":"292af1e4cd952b54a1ac645ebc886d2fa9699c8c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-19T13:38:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-19T13:38:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix u128 type on MSVC (subtraction, minus)\n\nAll subtraction operations were broken.","sha":"36f11934979659468db3ce376a8044763dab833d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-19T20:55:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-11-19T20:55:06Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Update disc boot detection and hope it works","sha":"3087f15dd8a1017d3751ce2c8227ef992ef513ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-19T22:20:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-19T22:53:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"hotfix for infinite loop when booting game data","sha":"5b207c3b9566d02e0f687398566efe10f825fc7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-20T10:53:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-11-20T10:53:16Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU: Log STOP full opcode (#9292)\n\nCo-authored-by: Ani <ani-leo@outlook.com>","sha":"85880ffded1b5aae67594c58504ad496e292c3ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-20T05:40:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-20T10:53:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"CPU: remove descheduled threads from suspend_all list","sha":"5bcaa25c020bec0d42b78fad01418110f6387d63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-20T01:59:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-20T12:04:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: use some actual hash for hashtable (std::minstd_rand)\n\nShould only take about 5ns for initialization.\nShould also make collisions almost impossible.\n\nI also suspect I fixed some bad bug in process...","sha":"72ac1aa53752755e397f40304861d8289f48f901"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-20T10:36:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-20T12:04:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: use deterministic \"cond\" allocation\n\nTakes ~80 ns instead of ~40 ns, same about deallocation.\nLoops don't exist here, only 4-level semaphore tree.\nWorst case only happens with concurrence, not from looping.\nThis optimization is not really necessary at current state of RPCS3.\nThis is more like to test C++ compilers and MSVC u128 implementation.","sha":"6c18e009771cc5e12409e02a11a5a3b7587cb1a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-20T12:01:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-20T12:04:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Basic constexpr support for u128 (MSVC)\n\nAdded explicit conversion op to u64.\nAdded constexpr path for +,-,>>,<< ops.\nMake almost all methods constexpr.\nRemoved a lot of redundancy.","sha":"c0f3d1f06d577b1d902288989400c3c625f65117"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-20T16:13:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-20T16:13:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: optimize \"cond\" allocation with TLS\n\nBillions of events can reduce to thousands, saving CPU time a few s.\nOnly 4 slots are available (arbitrarily), and only 1 is usually used.\nOther slots are used only for waiting on multiple atomics.","sha":"5f010c2f4c39d75d92569353d4c39db18fad4d66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-21T02:03:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-21T04:09:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Attempt to fix #9271","sha":"60cff6f3d4980afaaf3223cef09557f291140cbe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-21T04:56:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-21T14:18:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix thread pool entry point and get_cycles()\n\nFix possible race between thread handle availability.\nDon't treat zero thread as invalid one.\nNow entry point is full is assembly.\nAttempt to fix #9282\nAlso fix some TLS.","sha":"71f1021648df008715e00c2021cc880d3a583fef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-21T14:23:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-21T15:27:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Attempt to fix Emu.Quit()\n\nThere was some kind of \"initialization order fiasco\" of g_fxo.\nNot only should it be used after main, but also destroyed before exit.","sha":"e89a568765bb16fa055c8d1134cb2cebd2aa5fe6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-10-27T20:41:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-21T17:43:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Use multithreaded shader compiler backend","sha":"3ddfa288cfd4f1e42998e81be0fbf623e861a1f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-09T18:43:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-21T17:43:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Thread shader source compilation dispatch\n\n- glCompileShader is in itself much slower than anticipated","sha":"755342913096a2a06337e2e74e13dd9203fc1870"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-13T17:03:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-21T17:43:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"qt: Add shader compiler threads to GUI","sha":"14358d5e84b91ae027b9feb36735e50c88c02f68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-14T11:58:51Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-21T17:43:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Some shader compiler threads tuning\n\n- Allow more threads for wide CPUs\n- Simplify 'auto' selection a bit","sha":"cab4c78b7bee01840c48df942171f1c367832710"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-22T09:00:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-22T09:07:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: remove redundant constexpr\n\nStatic initialization is all-zeros anyway.\nBut constexpr was killing my intellisense.\nAnd probably also affected compile time.\n\nAlso make some internal structures hidden (\"static\").","sha":"d70ab114776a2d1e49ca03b0a87a117226ccdd24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-22T09:45:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-22T09:45:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Second attempt to fix hanging RPCS3 process\n\nNow fix exit logic a bit.\nRemove Init() call from Stop().\nRemove Stop() call from Quit().","sha":"6cf50f8f6c3f4d240d0487bb42dc564439daaaa2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-22T09:57:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-22T09:57:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Attempt to fix #9316","sha":"f85c8584b0e6b976ec8ba01fcda2f56b033f56cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-22T14:03:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-22T14:03:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Removed .travis.yml\n\nNon-functional CI","sha":"41320688b782b35f3a086ab03d40314531be1e6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-22T14:28:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-22T15:29:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Azure: try to deploy GCC artifact (upload to github)","sha":"a2c189b45ace9d6c3e36e7f7dbc674a50472e652"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-22T16:21:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-22T16:24:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Attempt 2: Try to make Azure push linux builds","sha":"7d00c69a4f7017a46e911eea4d78d4b3748cb3c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2020-11-22T23:07:21Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T03:50:27Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Pushing master AppImage Artifacts to GitHub Releases via Azure","sha":"a27bd2275c17fcb0150b3a18ef81f2afb69194dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T06:22:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T06:22:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove old travis badge (kill it with fire)","sha":"e38eaa7cd760cc838681936df64f91b3804d3ce7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T06:24:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T06:24:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: redefine op::ne to actually mean \"not equal\"\n\nWTF is \"native endianness\", it's native by default.","sha":"280f5f0b5470d1cff436e9d412165c63b2f213f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T06:25:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T06:26:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: fix atomic_wait::list regression\n\nTypo-regressions. Also improve static asserts.","sha":"16cc88dd0e35afe2af9173179f29109d7ba85b44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T06:28:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T07:20:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Clean thread pool at exit.\n\nExecute TLS destructors.\nTest atomic wait list.","sha":"a4458e2c8c3d7cd32556d5d3619b6081cfeeb638"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T08:32:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T08:32:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify communication with thread pool\n\nAdd \"entry_point\" member to \"thread_base\".\nDon't use \"m_thread\" to exchange values.","sha":"d4c17ecda56626908d8d0f63d8484e1d0ae91f7a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-23T15:41:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-23T16:20:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve support for RDNA\n\n- Add support for RDNA2\n- Add RDNA MSAA workaround","sha":"f1c65dcefc32fff3fd81fdb5e977253b2c1fa64e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T12:50:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T22:09:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Threads: minor simplification","sha":"b954a41f2a0ed0625628d8379e2fcb5a0dd61b85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T13:58:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T22:09:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: don't use empty notify callback\n\nInstead, allow setting it to null and check for null.\nSimilar could be done for wait cb, but it's set for all named threads.","sha":"14fa96fdef07cd4d53b69eaff44ae2e9eb22e4da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T21:50:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-23T22:09:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: adjustments\n\nIncrease max range lock size (less than 512 MiB)\nRemove \"range_executable\" flag, make it reserved.","sha":"f0cba1371ccc998ac06296a95cd9c0b7a51b7913"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-23T18:02:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T00:44:30Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix SPU LS MMIO","sha":"3f028fbb831ba81e9eaf9f8f45f889ed97c92a88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T00:23:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T05:11:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove any mentions of scam CI","sha":"b55c759f719b8f390f8e780491a5bc14e0725a4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T00:43:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T05:11:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Azure: attempt to produce clang artifact","sha":"721883f64ef53212fe856f778879bff53326ad62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-23T16:19:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-24T08:10:43Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Disable depth test before rendering text to the backbuffer which does have a Z buffer","sha":"8228a4adcdfaf45ea4d8875bec9d3affcb2945c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-08-28T21:00:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T08:17:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix auto exit\n\n- Don't quit on stop if force boot was set\n- Don't stop the emulator on gs_frame close when it was already stopped. This would remove the force boot flag by mistake.","sha":"5076da8f77d2091ed041b77246ecdc52e619a80e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T05:18:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T09:31:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement prefetch_write() and prefetch_exec() wrappers\n\nDo some refactoring to prefetch_read() in util/asm.hpp as well.\nMake all these function constexpr because they are no-ops.","sha":"43952e18e264abdeb15979dae419a8f0ecfc74e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T07:03:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T09:31:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: alter atomic_storage<>::store a bit\n\nAlways fallback to exchange. May improve codegen on gcc.","sha":"27097cbcfe064835e712c08bf4d115becf479280"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T07:04:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T09:31:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native.cpp: add MADV_HUGEPAGE\n\nIt enables Transparend Huge Pages for some regions on Linux.\nAlthough it can't be actively useful, it seems to do something.\nMaybe it's even harmful for recompilers.","sha":"ab248e170cdedf1c3772e28566cae43a8987a4cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T09:30:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-24T10:20:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"asm.hpp: constexpr refactoring\n\nRemoved asm (what an irony), made many functions constexpr.\nRemoved some unused function, readding them should be trivial.","sha":"d8e9382573eb2401a79c89d93d4885a6b88e23d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-24T18:13:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-24T23:11:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Minor changes related to Emu.Stop()","sha":"9efedbe76a472da3bdfdc13d0ce67a7863bc4d25"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-25T00:41:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-25T07:41:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement \"slow mutex\" without spin-waiting.\n\nBenefits: only 1 byte.\nTesting atomic wait.","sha":"00e64920c8afee1263d9c0ecd4613fc1fcf19f2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-25T01:01:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-25T07:41:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: fix windows/std path\n\nAlways check condition after rearming internal semaphore.","sha":"600c0ea5bab5e67e8fb2028be9c4c5b956f7cb67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-25T01:04:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-25T07:41:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Linux: remove assertions on MADV_HUGEPAGE\n\nIt's a hint and is allowed to fail.","sha":"487b572aa63f19fcfff77b8692263f5253d7973e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-25T04:16:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-25T07:41:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"utils::shm: allow 2M hugepages on demand","sha":"2b674d4d8c603d252c2e3385d4de6480597f9eda"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-25T04:26:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-25T07:41:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"perf_meter.hpp: move logic to noinline function\n\nMay improve performance if perf meter is disabled.","sha":"95b8467a765acc4e53d7fc2d036523a5da4411e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-25T04:58:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-25T07:41:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"JIT: increase likeliness of allocating 2M large pages\n\nOn top of enabled transparent hugepages hint (Linux).","sha":"ca9898e838cf1f3345f59ce5c1b918c75ebc365a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-25T23:06:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-25T23:45:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Handle some undefined behavior regarding null pads","sha":"9e352da052ad9517549284e198e3939d0021e353"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-25T12:20:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-26T03:31:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: remove/deprecate incomplete notify features\n\nNotification with \"phantom value\" could be useful in theory.\nAs an alternative way of sending signal from the notifier.\nBut current implementation is just useless.\nAlso fixed slow_mutex (not used anywhere).","sha":"8b6d615aa60212c51d1ff77ca221fd793a6cd47e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-26T04:35:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-26T17:11:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: shrink and simplify main hashtable\n\nReduce collision detection to 1 or 0 for now.\nI think it should be offloaded to notifiers.","sha":"bd90e3e37f48043931ecf89511a85bd3fc5a11be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-26T09:30:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-26T17:11:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Homebrew atomic_ptr rewritten (util/shared_ptr.hpp)\n\nIt's analogous to C++20 atomic std::shared_ptr\n\nThe following things brought into global namespace:\nsingle_ptr\nshared_ptr\natomic_ptr\nmake_single","sha":"b5d498ffdafbb67cfa48d178751f8a51ee634b4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-26T13:30:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-26T17:11:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Threads: fix minor race\n\nHas already been in \"fixed\" state in past...","sha":"22a24446c1f3c0323f1f0155d964d4484a37dbb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-26T05:33:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-26T17:11:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor debugging enhancement\n\nUse raise(SIGTRAP) in failed SIGSEGV handling and return.","sha":"089275899410a6c65e855f1671879814ab05938e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-27T07:00:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-27T11:32:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: fix critical bugs\n\nFix array initialization.\nFix reference counting.\nFix offset to refctr.\nAdd some features.","sha":"872655369a81fb24c48d28cb5d620765530b8acc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-27T11:47:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-27T11:49:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Try to set 2-3 GiB working space and show error if it's failed (Windows)","sha":"2bee096246916e8114225378dcc3e65c18111f97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-29T12:03:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-29T12:35:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"stdafx.h: remove BOM from custom included headers\n\nAlso add warnings about adding them.","sha":"3b8e3a97147de8a735dadc50250b50527a71205b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-29T13:17:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-29T13:18:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove unneeded non-ASCII character (unedat.cpp)","sha":"e0635cf65c0510bba967442107434163235c7dae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6511230?v=4","date":"2020-11-28T22:48:06Z","email":"dylanjamesfenn@gmail.com","login":"osirase","name":"Dylan Fenn"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-29T18:41:03Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add missing Fedora dependancy to BUILDING.md","sha":"924774d3efccd0ffd544e270c3a9890864de3f87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-29T18:06:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-29T19:39:52Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix RSX replay thread lifecycle","sha":"845a7d996862021de19fb8b61f9b3909f0562471"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-29T18:27:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-29T21:46:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix uncaught depth-func changes\n\n- Depth func of always or never usually disqualifies depth testing.\n  Invalidate contested surfaces when depth func is changed.","sha":"67f48ce21c625cc33921a6d6c86593512399d5a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-29T16:30:55Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-11-29T22:20:17Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix upscaled image reconstruction\n\n- Base the upscaling on the real source and not the \"attr\" parameter.\n- In case of reconstruction, the source is much larger than the subslice in \"attr\"","sha":"2aa5c437e883e3bdad929ec308617144f722e42d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-30T00:18:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-30T00:21:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sceNp.cpp: fix some UTF-8 string mismatch","sha":"cad3a6c5475292e22acee866f0089b5cc951e811"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-11-30T00:48:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-01T07:18:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make cpu_counter::remove() async\n\nRemove both mutex and assertion from it.","sha":"32f39fec1c8dfc09c44ffc741d61b17f76ed5ee4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-01T07:19:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-01T07:19:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: improve hashtable access\n\nSimplified, tried to use all ptr bits.\nTry to prevent self-collisions (bug).\nHashtable size doubled (to 8 MiB).","sha":"13a0b88755e8043b959b1ac8f9d9b7be451003e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/53271430?v=4","date":"2020-12-03T17:16:38Z","email":"53271430+Joaozin-tech@users.noreply.github.com","login":"Joaozin-tech","name":"JoãoPaulo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-12-03T17:16:38Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Update FW 4.87 Latest Version (#9366)\n\nUpdates the latest FW version according to: https://www.playstation.com/en-us/support/system-updates/ps3/\r\nList of changes:\r\n・ Updated blu-ray keys for new movie releases\r\n・ Minor security fix","sha":"c2a85bde089e933140b90db4ae8316010f037658"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-01T12:20:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-04T11:10:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: improve atomic_ptr methods","sha":"332410d20bfd7e7a1de2d2d2eafcaaf71d96b436"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-01T16:50:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-04T11:10:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: more phase splitting in notify_all()","sha":"019f5662394f3f3e24c3528aec702da207cacd87"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-02T16:21:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-04T11:10:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: fixups and updates\n\nFix atomic_ptr load() edge case.\nImplement atomic_ptr::peek_op() to make possible to reduce load() overhead.\nImplement atomic_ptr::compare_exchange() and friends.\nImplement null_ptr constant, remove nullptr_t assignment/construction.","sha":"983439076b55db78bf942d1070664dd244336220"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-03T11:47:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-04T11:33:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: simplify and unify bit test instructions\n\nAlso make them available on all platform.\nRename some rare methods.","sha":"8efc22bd45a9b3048c51180bc69405cbbd6295d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-04T15:03:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-04T16:11:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic_t: cleanup type requirements\n\nAdd C++17 requirements.\nRemove alignment requirements (auto-align type).\nWhat's missing is to detect padding and forbid it.","sha":"d1e783742293bf9516f50863dedca175a6b98b4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-12-05T11:55:00Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-06T12:30:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Set default to utf-8 for MSVC","sha":"7b694ebeb467b8c994f01c7f39565a1978de4ef6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-12-05T12:08:24Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-06T12:30:12Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove BOM markers","sha":"af8c661a644cfc4279da56dd9e415b39f9089fe4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-23T15:58:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-06T12:32:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger: rewrite GetPc()","sha":"427cf914474fb218a56f589c580b39822d3bb756"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-11-23T17:57:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-06T12:32:13Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger: Implement code flow tracking","sha":"15a12afe25042f884ed719f40e489fcb1d400102"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-03T18:11:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-06T21:45:27Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Separate program environment state from program ucode state\n\n- Allows for conservative texture uploads\n- Allows to update a program object without running full ucode analysis for no reason","sha":"3a0b3a85a5eaa1899a3bfb211ca85cf171680333"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-06T08:13:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-07T12:33:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: add trivial conversion for shared/single types\n\nThese conversions don't exist in std::shared_ptr-alike types.\nBut I don't want to bother with == operators until we have proper C++20.\nRemoved trivial conversion for atomic_ptr because it's heavyweight.","sha":"77aa9e58f2c45f507248923b948921293332cec7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-06T09:10:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-07T14:13:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: add some features and optimizations\n\nAdd atomic_t<>::observe() (relaxed load)\nAdd atomic_fence_XXX() (barrier functions)\nGet rid of MFENCE instruction, replace with no-op LOCK OR on stack.\nRemove <atomic> dependence from stdafx.h and relevant headers.","sha":"b16cc618b524f35fa60bf496fe01892f76c238b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-06T12:15:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-07T14:13:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: replace std::atomic with atomic_t\n\nDual dependency is nothing good.","sha":"eb663029079ef0ed386d7c163d6128315c0dcc43"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-06T13:32:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-07T14:13:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: add atomic_t<bool> specialization\n\nMay be required in future, plus adds/hides some methods.","sha":"24e4e329edb37abdf5783c9e04e8206e9a21cc56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-12-06T16:34:16Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-07T17:03:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove bom from .hpp files","sha":"51dcb4a79d6d6c31662ab5b7d5f050fba3e8c9ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-07T17:10:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-12-07T17:10:34Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Allow emulation to work without firmware (#9367)\n\n* Allow emulation to work without firmware\r\n* Fix HLE prx path detection.\r\n* Fix manual list loading bugs.\r\n* Fix HLE gcm\r\n* GUI: Fix fonts search\r\n* GUI: Hardcode sprx list\r\nDo not depend on /dev_flash/sys/external/ contents.","sha":"2602be426f8ca8200c9ff1f1cb23805f576ca6fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-08T05:51:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-08T05:51:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: fixup (rsp addressing)","sha":"062c605eb115cdd0d9c6cf34ed4a7a97e26d68f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-08T21:22:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-12-08T21:22:08Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Qt 5.15.2 (#8867)\n\n* Qt15: replace deprecated stuff\r\n\r\n* Use Qt 5.15.1\r\n\r\n* Move windows to Qt 5.15.2\r\n\r\n* Move Ubuntu to Qt 5.15.2","sha":"a7e5c255b4ec97152273a1099389f043c7d369c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-09T02:06:27Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-12-09T02:06:27Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: Properly register D32_SFLOAT as a depth-stencil format (#9396)","sha":"f8d2830ac77a11d49ca4be8f1f77e31ca39a19b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-11-18T16:19:01Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-09T08:15:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Set msvc toolkit back to mainline","sha":"33635c57231428497593da1cf934211c24ded020"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-12-05T23:16:57Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-09T08:15:08Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Simplify g_pages\n\nThis was done because otherwise msvc runs out of heap space on azure.","sha":"d0c271e5349e25c40a5a2ac7e4183b7ff543c38e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-08T06:25:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-09T08:15:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU ASMJIT: fixup mfence replacement","sha":"38745e5782a8e6250e2511373a48af73d50d081c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-09T07:47:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-09T12:43:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Replace verify() with ensure() with auto src location.\n\nExpression ensure(x) returns x.\nUsing comma operator removed.","sha":"e055d16b2c9489cb3bec9952434152dca3413ea5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-09T13:03:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-09T13:26:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve narrow() and size32() with src_loc detection","sha":"5d934c875928654d8e80bcbee6bdaa873b5158fc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-09T16:52:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-09T18:30:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add even more D32_SFLOAT missing locations","sha":"aac874a842f36d929a6a5016add4679d6dd03639"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-09T17:17:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-09T18:30:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Validate image creation inputs\n\n- Should avoid things like res scaling breaking when very large scaling is in use","sha":"d25c401aec927e69cbf8cbba719761f40bfd6068"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-09T15:04:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-10T09:30:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove HERE macro\n\nSome cleanup.\nAdd location to some functions.","sha":"36c8654fb8bc38a479b8f602c0212a74908ff4b1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-10T09:42:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-10T09:43:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Always print system error code on 'throwing' errors.\n\nPrint system error code in src_loc fmt.\nError code may be irrelevant though.","sha":"61b882b2a6dbe27b581662860da1361d986d136d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-10T10:37:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-10T11:08:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove ASSUME macro\n\nIt's dangerous and sometimes bluntly misused feature.\nIts optimization potential is near-zero.","sha":"b382d3b3e9a49854e7fb672c8ba09be0a64b73a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-10T12:06:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-10T12:06:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove constexpr from ppu/spu decoders.\n\nWe don't need them at compile time (yet).\nBut can reduce compile time and complexity.","sha":"65c04e4ddd7aa44d555e57d7be9231624e703dec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-10T15:44:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-10T15:58:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use atomic_t<> in VKMemAlloc","sha":"72284b4530fc0b75c77f866b573c973f1e6fd9c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-11T04:33:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-11T04:33:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup for fs::file::read","sha":"12a48fc6d13b5146e06675ab967d56763a6e7227"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-11T13:31:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-11T16:01:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"std::chrono cleanup: always use steady_clock","sha":"aa3aef4beb9e261ec177aaeb08031dd057ad728c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-11T14:52:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-11T16:05:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VKMemAlloc.cpp: use shared_mutex in vk_mem_alloc.h\n\nBecause it allows to use custom implementation.\nAlso fix compilation.","sha":"7a015b6fc013748cfd9154de83d9652fb532503e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-11T18:06:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-11T19:00:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"endian.hpp: minor simplification\n\nAnd stop pretending...","sha":"33c39770368495b99d652ca5e88bc7414854004b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T06:40:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T06:54:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix u128 constructors (MSVC)","sha":"cb19316a17fc6f15abd45e0216e4220e11d12452"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T08:38:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T08:38:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RSX: remove overly long integer sequence (opcode_list)\n\nConvert to constexpr array and move to gcm_printing.cpp","sha":"bc7acf9f7ac1a2f2f53530244e60b1946e9f0519"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T09:00:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T09:35:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Reduce std::numeric_limits dependency\n\nPlease, stop pretending...\nYou need these templates for generic code.\nIn other words, in another templates.\nStop increasing compilation time for no reason.","sha":"6e05dcadb6eaff7dcf3de670b1d78fcd8b6998d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T10:12:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T10:12:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove any_pod<> from types.h\n\nAdd simplified any32 to GCM.h\nAdd simplified cmd64 to PPUThread.h","sha":"b09b7c1184bc02f3e7e6a7ac5eca0c04239836ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T11:24:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T12:12:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move error_code to ErrorCodes.h","sha":"dff4392c1043c2748d70c52a888bf19e1869d679"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T11:38:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T12:12:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove ceil2/floor2 from types.h","sha":"666a18f5e5ba35a9f0cd97abc54eb40bfd43f7fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T12:01:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T12:12:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move types.h to util/types.hpp","sha":"b59f142d4e4c00a46d52ce2e78b9cee36c3ff1ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T13:29:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-12T13:29:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use uptr (std::uintptr_t alias)","sha":"a6a5292cd745b3259da0e43b9e4bb381871dc67c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/38363715?v=4","date":"2020-12-12T16:16:15Z","email":"38363715+Frozenreflex@users.noreply.github.com","login":"Frozenreflex","name":"Fro Zen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-12-12T16:16:15Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Update skylander_dialog.cpp (#9419)","sha":"ee814cfd0c8446a93195db139f25ab5335cd6980"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/47072419?v=4","date":"2020-12-12T23:00:45Z","email":"lukebarr@outlook.com","login":"lbfs","name":"Luke Barr"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-12-12T23:00:45Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Initial DualSense Support (#9308)\n\n* Initial DualSense Support\r\n\r\n* Add Vibration Support\r\n\r\n* Add CRC32 Validation to Incoming Bluetooth Packets\r\nCleanup report sizes\r\n\r\n* Consistency, remove button comments, add two buttons.\r\n\r\nCo-authored-by: Ani <ani-leo@outlook.com>","sha":"cb8ef46ec786853ad3d3b88b959e81a9e5782719"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/38363715?v=4","date":"2020-12-13T11:30:38Z","email":"38363715+Frozenreflex@users.noreply.github.com","login":"Frozenreflex","name":"Fro Zen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-12-13T11:30:38Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Add variant support for Skylanders (#9424)\n\n* Update skylander_dialog.cpp\r\n\r\nCo-authored-by: RipleyTom <RipleyTom@users.noreply.github.com>","sha":"8e07b19bc77ad4ebeab5cb2025f8f35065953e19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-13T10:39:58Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-13T12:38:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Move shader analysis+prefetch to the end of the draw call","sha":"d775c8dc73a51ae348f21c17a59b7425076060ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-13T11:54:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-13T12:38:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Restructure and simplify some header include chains","sha":"f83c2f0b6bd737c41f5ff5966d0b62047ffd8944"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-13T07:44:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-13T12:39:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: fix is_same_ptr<>() trait\n\nImplemented as constexpr function.","sha":"09d293592e32aab7549b03edcc3d0cbbeaeb02db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-13T12:38:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-13T12:39:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: initialize g_pages at vm::init\n\nCan reduce compile time/overhead.","sha":"62fdcf50ea9f91fa5ce2f9a638b492cfc3a94683"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-13T13:34:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-13T13:34:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Split BEType.h to util/v128.hpp and util/to_endian.hpp","sha":"e321765c54c706d7ae5fd6d35eb05f3699ebaba4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-08T19:22:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-13T18:52:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Firmware libraries settings overhaul","sha":"e5603fec1e3cf6647bceed251a34c36d38f8046e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-13T20:50:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-14T06:01:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove BOM from new files","sha":"35ecd005597bfd5e40a8f75f9e295aff8b2751a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-13T20:57:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-14T06:01:07Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor tooltip grammar fix","sha":"ab23e5ca0e8e319865daebac032e174532b70fa3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-14T13:33:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-12-14T13:33:43Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Salvaging code (#9432)\n\n* Minor input refactoring\r\n\r\n* fix sys_config_unregister_io_error_listener log message\r\n\r\n* Remove unused variables in RepaintTextColors\r\n\r\nCo-authored-by: GermanAizek <GermanAizek@yandex.ru>","sha":"03ad5c6830a347671137e935b33327502bb4d218"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-14T06:03:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-15T08:16:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PRX loader: Fix libfs_155.sprx loading\n\nFix relocations' segments referencing when there are \"empty\" (memsize=0) LOAD segments.","sha":"7eb16e13bbfb4036bd9f5b4fd218dda2af90bdd0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-14T08:31:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-15T08:16:45Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"FW SPRX install: Fix IDM ID's leak","sha":"0445ef393ff41c890e662203ddf5e107366b8d23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-14T11:32:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-15T08:18:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU: Allow HLE execution from pure instruction decoder type interpreter","sha":"bfe1a8673aa0c7e146b68b0b119273d0d5aafc02"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-15T08:19:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-15T09:50:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: use SFINAE for waitable atomic detection\n\nAdd default_mask<> variable.\nRefactor get_value<>().","sha":"4a883ba6eab66c3e4a123f805a388506b463cd36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-15T09:52:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-15T09:52:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: add wait support for atomic_ptr<>\n\nAs well as default mask and value transformation function overload.","sha":"ca5f0444bfcf03e2ba7e15cb44cc760a0f9050f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-15T15:06:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-15T16:19:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make lf_queue<> compatible with atomic_wait","sha":"e39348ad9621d14dc33a169f90d578768b8fde29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-15T17:01:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-15T17:01:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix potential thread_pool crash on exit\n\nMinor issue.","sha":"24c246a9f6f96a4b5de901e503e4ff189be435c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-15T17:10:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-15T17:10:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: fix warnings and add narrow cast for u64 ptrs","sha":"e82bef425fdbb1583a0c51a424457a773bab97c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-14T17:24:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-16T07:10:06Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix sampler descriptor updates for framebuffer resources\n\n- Each desc manages its own lifetime now instead of relying on global timestamp check\n- Fixes situation where same object remains active without update for long","sha":"0ef57432617d68d77c26d630c29d97dcc9a3ebca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-14T17:26:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-16T07:10:06Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Make debug overlay dynamic","sha":"fb1c790350c384650d8e7d649bf63063e34598e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-14T18:29:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-16T07:10:06Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add some texture upload statistics to the texture cache","sha":"d3686dbb752293d947f8053c737e216545329100"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-14T18:40:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-16T07:10:06Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Clean up some leftovers from shader decompiler rewrites","sha":"42f4e831a2df7ae2dcbb526853d60beec4da09b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-15T17:40:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-16T07:10:06Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix build","sha":"035a76f26db278e2d9555b07137b77cb22b7dcc0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-15T21:29:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-16T08:01:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix stop during shader compilation","sha":"0bfec59af86e9597706c5ee024de14034ad22574"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-15T22:31:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-16T08:01:51Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix unresponsive UI during SPU compilation","sha":"d21f87af5de8076306c4521b126f9b9b12f3d91e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/38363715?v=4","date":"2020-12-16T08:02:59Z","email":"38363715+Frozenreflex@users.noreply.github.com","login":"Frozenreflex","name":"Fro Zen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-12-16T08:02:59Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Almost all Skylander variants (#9443)\n\n* Update skylander_dialog.cpp\r\n\r\n* Fix formatting, sorted\r\n\r\n* Support for skylanders variant\r\n\r\n* Remove duplicate Legendary Hand of Fate\r\n\r\n* Removed accidental Series 2 Dark Spyro\r\n\r\nThere is no series 2 dark spyro, also im removing these as im finding them so sorry if theres tons of commits\r\n\r\n* Add LightCore Hex\r\n\r\n* Remove Vehicle tag\r\n\r\n* Add Big Bang Trigger Happy\r\n\r\nCo-authored-by: RipleyTom <RipleyTom@users.noreply.github.com>","sha":"3dbecada4eecd23c6787bb722feb12c7234de280"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-16T08:07:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-16T08:57:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Hotfix: useless error","sha":"6b3f722ff0a2a3a15ae62ab293d19ade84d9e65f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-16T18:05:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-17T06:36:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Workaround for validation layers bug","sha":"0a865bd9dcad8a6cf2bdb2a867e2cf23baef58ea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-16T18:56:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-17T06:36:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Force ampere GPUs to use the slower but spec-compliant depth-color resize route\n\n- TODO: More investigation and optimizations","sha":"cfbde005fbfea25432c009f75e26c2423ca09075"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-16T22:30:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-17T06:36:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Do not reset vertex program texture mask when updating ucode analysis\n\n- Fixes incorrect texture type detection in some games after program env/ucode separation","sha":"235db57f0ee15c05aee4e75d853b39a3dab9faee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-17T13:45:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-17T13:47:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM commit (minor fixups)","sha":"2acead357b69d0d0ee3fce78a983f8d2e67a4305"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-17T13:46:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-17T13:47:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed_typemap.hpp: Fix assignment operator for g_ptr\n\nMaybe RPCS3 hangs will finally be gone.","sha":"c16fb61bead5877994967ef89e84caafec1f19e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-17T14:00:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-17T14:00:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix hexadecimal line numbers in error reports","sha":"3c86e14ea4ddb99025897b8c47c6f256e2f4f774"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-17T14:39:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-17T16:56:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Register ampere GPU PCI IDs","sha":"fb47d1f7880c5e7567e90b52ec30f015c0d24eb9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-14T18:19:43Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-17T17:49:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Improve PS3 decryption tool","sha":"ba03df85111faea8c758d20ff4542b15906440fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-16T22:11:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-17T18:36:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Link the memory viewer with the debugger","sha":"2172974db90f361c91c80d0cc26e4200276154c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-17T14:36:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-17T21:57:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Polish the memory viewer","sha":"6c1ca7d7976b1ca1f85c04882b2a55c60b12afcf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-17T17:11:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-17T21:57:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Make memory viewer address edit accept 0x/0X prefixes\n\nMax length is 10, added regexp validator accordinally.","sha":"c8947eee6a1b2c7001ec9c65a0051395f9d34efc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-17T21:30:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T08:58:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"memory viewer cleanup","sha":"3cfead4ca686a6469bfbd7528bebd13d3019798a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-17T22:02:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T08:58:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"memory viewer: fix horrible overflow that freezes rpcs3","sha":"ed8e5498d14709bc6e572ba34861c40d918e2902"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-17T22:11:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T08:58:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"memory viewer: more cleanup","sha":"343d006ae24412efb7d65869da22c1ff851adbfd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-17T22:36:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T08:58:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"memory viewer: use enum for color formats","sha":"ec7963df3dd6c86a0a3b8660ef93d1e60d2e84f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-17T23:31:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T08:58:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"memory viewer: fix RGB Image viewer crash","sha":"112ac7bd13df432ffdd569798b3ea078bb963ba1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T00:17:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T08:58:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"memory viewer: check width and height in image viewer","sha":"e8556738026db4594d03225eece980b5436e21df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T02:37:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T08:58:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix warning","sha":"a7f10d142e9beabd5628dbaeab3c28b4dec43855"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T03:19:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T08:58:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"memory viewer: improve layout and resize","sha":"908465b2745af8873cde339fbf264f4618c0fc43"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T06:47:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T09:23:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move busy_wait() to asm.hpp","sha":"4cfa9b11f3c0667e588281a8a0c6be915f794613"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T07:01:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T09:23:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify f16 type","sha":"360c4d1554ce9369ce5f54c9975ba4d348c996ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T07:39:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T09:23:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add usz alias for std::size_t","sha":"fb29933d3d1aaa5ee62dc57ac4e70f227a0e0b00"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T08:19:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T09:23:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Replace uint8_t with u8","sha":"534c63bf57d1ae3fa589a02285ae120dd0248857"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T08:24:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T09:23:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Replace uint16_t with u16","sha":"d6042cf891c6c71dd9427bc46f9d44c93f7986c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T08:27:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T09:23:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Replace int32_t with s32","sha":"ae633292c06e70f419891852bfe374644d287bd7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T08:34:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T09:23:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Replace uint32_t with u32","sha":"77352a2a8697e74aee7b10ac7c8afc603cf7c1d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T08:43:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T09:23:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Replace uint64_t with u64","sha":"05099e2ae147a6bd0c3034f6e62a9623859127d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T09:55:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T09:55:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Cleanup and move sysinfo.h -> util/sysinfo.hpp","sha":"db9b7db531a379b4a3be76958ee1f9e2e5b93f04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T10:37:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T10:37:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Hotfix: Emu.Quit after Emu.Stop","sha":"1adec3d8e58da3ab2525ea8ad737b59e4a125d2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T11:40:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T15:05:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Emu: implement on_exit callback","sha":"b655e4aa47a01d9c39254e0f10fe586d979faabf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T11:28:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T15:07:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix bug with vector arg alignment in BIND_FUNC and callbacks.","sha":"d254a5736b10d5be0adfccdcd6cf2b16b8ebbc36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T14:43:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-18T15:07:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move align helpers to util/asm.hpp\n\nAlso add some files:\nGLTextureCache.cpp\nVKTextureCache.cpp","sha":"eec11bfba93e4e1c8d0c6105685ea70aee8000c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-18T15:48:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T20:00:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"memory viewer: Fix resizing down","sha":"c74b2cb08583f32a46e1d84f263fa239c4b9fcb8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-18T17:35:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-19T07:33:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"minor cleanup","sha":"066e53da5564c43d3332c14e600fa0fe4dfdbccd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-18T20:11:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-19T09:58:44Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fixup for renderpass issues","sha":"e449111c33bd0ee72f977c264639e1c2e7d1a624"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-16T06:53:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-21T10:46:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Cleanup disasm classes a bit","sha":"ef884642e40a047412d42666fbdad941ea99676b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-16T14:44:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-21T10:46:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger: correctness fixes and cleanup\n\n* Remove m_current_choice, it's not correct to rely on thread name entry. In extreme corner cases a newly thread can be created, old destroyed with the same entry name. (reoccuring LV2 SPU/PPU ID)\n* Remove m_no_thread_selected, can be easily replaced with std::weak_ptr expired() function and is more accurate this way.\n* In HandleBreakpointRequest: only remove breakpoint on valid PPU thread and not any thread! also fix potential nullptr deref if thread has recently been destroyed.","sha":"2c06043617f769afa4aea90f4831fe11d2a8964c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-16T16:50:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-21T10:46:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Disasm: read instruction contents only once\n\nMemory is volatile and may be changed by guest threads, ensure the decoded instruction matches with the data.","sha":"59ed2222057585d6ca6c03dc6ca4d05120c0e44d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-17T03:58:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-21T10:46:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Mask PC in debugger_frame::keyPressEvent for SPU\n\nSPU only has 256kb of memory, need to work with this.","sha":"2b9c407dc3bd396fbed780fab0f70c8bae9d099e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-17T03:48:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-21T10:46:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU memory must be exec memory when using debugger's \"Next Instruction\" feature","sha":"74a09a6338c9504bd4135b31b6afc89ce6e215b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-18T07:12:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-21T10:46:26Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger: Switch from NoThread when the emulation is running\n\nAnd fix UpdateUnitList() when the emulation is stopped at initial startup.","sha":"43c87e99b0316d4328b597ad50ff415ef42a73af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-20T06:27:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-21T10:51:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: use u128 as storage for masks/values","sha":"5f618814f6e0f8c54d723f763823ccd57869b54a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-21T14:12:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-21T18:11:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"types.hpp: remove intrinsic includes\n\nReplace v128 with u128 in some places.\nRemoved some unused files.","sha":"bd269bccaf68caff66324580c0417ca68fc5805c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-12-22T03:37:14Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T06:00:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CI: switch FreeBSD to Clang 11 (similar to e2303f337804)","sha":"b9b9a0465f19f0e82de4a7e3b2d9b86cca4b8d80"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-12-22T03:38:34Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T06:00:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"CMake: bump minimum Clang to 11","sha":"5cb70ddbd58cc98e338b492da22db37a729af541"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2020-12-22T03:40:10Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T06:00:34Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"atomic.hpp: revert Clang < 11 workaround for u128","sha":"96bde3df811e6919d14dcdbb0b562738fab99a1e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/38363715?v=4","date":"2020-12-18T00:01:22Z","email":"frozenreflex1@gmail.com","login":"Frozenreflex","name":"Fro Zen"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-22T07:58:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Change skylander variants to use hex","sha":"acadaeed3a6de2284175bf35fae1a667cb5b4bb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/44116740?v=4","date":"2020-12-21T15:22:18Z","email":"sampletext32@bk.ru","login":"sampletext32","name":"Bird Egop"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T11:31:44Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Add PR-BUILD.md and Pull Request Template","sha":"6c1b6c1704f69e34fb8b566fc8b7c9ece6e7b01a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T07:02:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T11:32:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"MSVC: remove MemLeak build support\n\nThere are better memleak detection tools.\n1) Requires to guard placement new and external libs\n2) Doesn't work thoroughly","sha":"41ee792f95d674f281a956d9e65518234efb8f5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T08:42:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T11:32:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Don't randomly include \"stdafx.h\"\n\nIt's file for precompiled headers.\nInclude what is used, don't rely on transitive includes.","sha":"b7bf316c1a146d225aace4af2efb9901b84c0422"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T11:05:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T11:32:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Butcher narrow cast a little (don't print value).\n\nAlso remove some forward declarations from util/types.hpp\nIf they don't work properly, it's easier to remove them.","sha":"43a58df8a0d28c1131afc09992447a0572cf2130"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T11:08:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T11:32:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"perf_meter.cpp: register only named threads\n\nCan workaround some possible problems.","sha":"6357b9a04f46682e5fcdfb60aabe81ee97db48e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T15:04:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-22T16:08:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"types.hpp: more cleanup\n\nAlso fix compilation.","sha":"a8e0d261b7b8ce14d7a731f7f803cfded895c4d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-18T06:28:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-23T05:25:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI: Rewrite GOTO address tools in debugger tools","sha":"020acc823520ceaa7610e23f57b71dc20489e53f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-18T06:32:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-23T05:25:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixup memory viewer SPU headers for RawSPU","sha":"2c6b974f24cec521bb869ca320cdf564ecb70a5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-18T08:10:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-23T05:25:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"memory viewer: Only allow \"words\" steps in powers of 2","sha":"87b62842758ec55fff2ae5b72aabfcaa0b8370c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-19T07:48:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-23T05:25:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU Debugger: Print reservation data","sha":"d17d22139e1666c0e1422103f77dddb336cca9cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-22T12:57:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-23T05:25:56Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Partial revert of 43c87e99b0316d4328b597ad50ff415ef42a73af","sha":"0055d84bd6310ada1f7ba48235ecc760f65962fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-22T13:21:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-23T17:50:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix SPU ELF loader","sha":"72e6e87d822a6b1acd904313a4cf0f724f2bb52e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-22T13:29:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-23T17:50:33Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix minor typo","sha":"c94a98e15a62b68384ddaff2455d7e2206d0682b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-24T11:55:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-24T11:55:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement util/auto_typemap.hpp\n\nUsed in vm::block_t as an example.","sha":"567d23d856473297541ea189f67cafa0d5b1b3eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-19T09:57:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-24T23:39:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix more spec violations","sha":"d9cb1a63194eb5d2005c4453fc005ec84627c6dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-19T11:28:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-24T23:39:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactor shader codegen and fix shadow sampling on depth-float","sha":"bee76fc8d14284602a2f715fa886c20297a324b9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-24T18:44:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-24T23:39:08Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Do not rely on program env state, instead, always use program ucode analysis results when doing codegen\n\n- Some things can be present in program env but not ucode state\n  e.g A texture can be active and bound in a redirected manner but not actually be used in ucode\n  In such a case, only the ucode analysis or decompilation can decide whether to inject decoding routines","sha":"a96b4412d373b3172f61c9b9cacd54644627a866"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-12-25T02:18:36Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-25T07:07:40Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove bom in Utilities dir","sha":"bef2c50b03068b3a0b835af94b901b70cbe03a99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2995486?v=4","date":"2020-12-24T22:42:05Z","email":"Florin9doi@users.noreply.github.com","login":"Florin9doi","name":"Florin9doi"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-25T11:27:24Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"Allow USB passthrough for THQ uDraw GameTablet","sha":"733f31f90ec54a48940bf4564b70d71eece53668"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-12-25T20:41:49Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-12-25T20:41:49Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Disables precompiled headers by default (#9499)","sha":"4399324955e90f166076bb445365c0e397046e6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-26T10:04:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-26T14:56:49Z","email":"Nekotekina@users.noreply.github.com","login":"Nekotekina","name":"Ivan"},"msg":"vm: Fix access violations on super memory, support super memory in vm::get_addr","sha":"66581d115bc2987d813566a49a7cf750705a9815"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/24961652?v=4","date":"2020-12-26T20:41:20Z","email":"marin.baron.pro@gmail.com","login":"Niram7777","name":"Marin Baron"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-26T21:30:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove std typeinfo","sha":"92e5bb88e80698d42aea17f6f6103294861b45aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-27T07:18:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-27T07:20:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use MAP_NORESERVE when available in mmap (Linux)\n\nUsed in: memory_reserve, memory_decommit (vm_native.cpp)","sha":"1e32311a650bb209e50a489852ce054bebcb109b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-27T09:19:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-27T09:19:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native.cpp: conditionally define c_madv_free","sha":"e3dec420a2320cc89e84beeceb4a3ae44b3ce5e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2020-12-18T03:04:41Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-27T21:20:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Improve skylander portal emulator","sha":"4a8a161a43a1ffd5acc572d4ff63304bc4b7c1be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-28T16:59:31Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-28T18:49:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Allow attempted fetch of non-existent surface","sha":"f87dd91b52fe7ba4692d61e1c37d772170eb5705"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-28T17:29:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-28T18:49:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Revert an accidental deletion","sha":"18c120ab9f882dede46718c431b297b43486af19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-12-29T01:05:35Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-29T11:17:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Warnings: Ensure death functions are all marked noreturn","sha":"76b1acf99dc76a5a921397c0dd49cfcfb1e8619e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-12-29T01:06:45Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-29T11:17:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Warnings: Warnings use kebab case, Mr. Kot","sha":"02b684b8108769af553b1a4731661c4eb91b0b5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-12-29T01:07:41Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-29T11:17:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Warnings: Silence false warnings about fatal code paths","sha":"e04b2eebc3e3cc626dac1027daa6e9bd92bfc088"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-12-29T01:08:37Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-29T11:17:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Types: Use nullptr over 0","sha":"57621d1c4ed6fdc934c566e81b0edf5c40b2116b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-29T12:28:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-29T12:28:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Reimplement utils::popcnt64\n\nImplement utils::popcnt128","sha":"6b9680711235cee63f40f2c39977d8cc0fa54c43"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-29T17:19:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-29T18:04:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove deprecated _bit accessor from v128\n\nComplicated (a lot of code), confusing (ambiguous)","sha":"35322b5d14803369d4e0a95b2162116bb4f98151"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2020-12-29T08:15:28Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-29T19:01:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Fix edgecase in icelake codegen","sha":"c952e99f3e41183e662789ca485f42f102fca21c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-12-30T00:14:55Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-30T06:03:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"CMake: Update required Qt version","sha":"9c3e55787e2aa77f26bec13ba53194dd12d55263"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-12-30T00:47:37Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-30T06:03:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Docs: Update BUILDING.md","sha":"220b69058cd0eb5437cdbb051e9544746305e81b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2020-12-29T21:40:16Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-30T12:24:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Format: Update clang format\n\nOld clang format file was extremely broken, causing issues when viewing\ncode on github, and also featuring stale values.\n\n- Fix indentation information\n- Force wrapping on lambdas","sha":"e68027b4640829001942eeb86307cd668cbfed3a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-24T14:56:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-30T12:37:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Move Anisotropic Filter Override to RSX state","sha":"7db13fdeff1fcda5c534ff95be04812aa68120fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-24T15:01:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-30T12:37:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Fix RSXTexture.h spacing","sha":"c0e121abefe9ccaca280499f2050c18b73e7ad8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-24T16:35:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-30T12:37:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Implement Texture LOD Bias addend setting","sha":"7fc26b1fab5bf06f41baf1c6e39e4f2f3cd6e467"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-12-29T17:57:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-30T12:42:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"memory viewer: Implement SPU mode, fix address GOTO","sha":"c4c6dc19a5f4de38924f98a731e6b24682ede8e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-30T14:06:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-30T17:11:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: implement vm::atomic_op, fetch_op helpers\n\nCan help to reduce lambda depth hell a little.","sha":"5227e6580870af36a682bb36b1e6860b090c2230"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-31T17:04:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-31T17:07:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement util/fifo_mutex.hpp\n\nPrototype. Uses 2 bytes.\nAdded minor fix to slow_mutex.hpp as well.","sha":"8a5620592b4578d8193a3b4aa845b98d53fb0445"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2995486?v=4","date":"2020-12-31T18:02:03Z","email":"2995486+Florin9doi@users.noreply.github.com","login":"Florin9doi","name":"Florin9doi"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-12-31T18:02:03Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Buzz! emulated controller (#9504)\n\n* Buzz emulated controller\r\nCo-authored-by: Florin9doi <Florin9doi@users.noreply.github.com>\r\nCo-authored-by: Ivan <nekotekina@gmail.com>","sha":"f1c61067bc6108f88ad58f0cfd47fee342ca6ed9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/878225?v=4","date":"2020-12-31T19:47:09Z","email":"gladiac@gmail.com","login":"gladiac1337","name":"Chris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2020-12-31T19:47:09Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Initial playlist-based custom soundtracks support (#9362)\n\n* Initial playlist-based custom soundtracks support\r\n\r\nThis is the initial implementation of playlist-based (cellSearch) custom soundtracks support.\r\nIt is based on the initial work by @Megamouse and currently uses a directory-based approach to manage albums and utilizes FFMPEG to read audio metadata.\r\n\r\nBackground: The real PS3 can import music in XMB from USB into its internal storage (/dev_hdd0/music) and additionally stores metadata (artist, trackname, tracknumber, ...) in a database (/dev_hdd0/mms/db/metadata_db_hdd). Games can make use of imported music via cellSearch.\r\n\r\nFor the time being, this implementation does NOT make use of metadata_db_hdd as the db-format is not well understood and a folder-based approch is easier to use. Users only have to create folders inside /dev_hdd0/music and add music to it to create a \"playlist\". This playlists contents will be sorted alphabetically. As a result, users could prefix numbers to the audio-files to force a specific order.\r\n\r\nThe only really supported audio format is MP3. I also added support for AAC, AC3, WMA, ATRAC3 and ATRAC3 plus, however, non of these formats were successfully tested for several reasons. AC3 and WMA are not enabled in the current FFMPEG build which makes reading codec-specific data impossible. We could enable these later if we want to. AAC actually could work but I was not able to get it working in WipeOut HD Fury. My guess is that the game does not support AAC. Finally, I could not find any ATRAC3 (or Plus) music to test with.\r\n\r\nThis implementation currently only implements parts of cellSearchStartListSearch() and cellSearchStartContentSearchInList(). There are several other functions which are still completely unimplemented and will probably be needed by other games. However, this implementation is a starting-point and is enough for WipeOut and maybe a few other games.\r\n\r\nA video which showcases this custom soundtrack support is available here: https://www.youtube.com/watch?v=4nu1OCtONTY\r\n\r\nNext steps:\r\n - Utilize sortKey in cellSearchStartContentSearchInList()\r\n - Eliminate TODOs\r\n - Implement the missing other functions\r\n - Test on more games - I do not own many that support custom soundtracks\r\n\r\nSigned-off-by: gladiac1337 <gladiac@gmail.com>\r\n\r\nCo-authored-by: Megamouse <studienricky89@googlemail.com>\r\nCo-authored-by: Ani <ani-leo@outlook.com>\r\nCo-authored-by: Ivan <nekotekina@gmail.com>","sha":"f8589de4760511960caa40ad555e5dbc989f12c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-24T10:49:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-31T19:57:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"VK: refactoring part 1","sha":"d9eb31000d57c0f56d966339f77fded613a166ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-30T09:32:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-31T19:57:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"VK: move helpers to vkutils","sha":"7a51b7a0199dbb687a37c77f6da4bbae8083f9ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-30T09:42:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-31T19:57:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"VK: move static chip_family_tables to cpp","sha":"6f80fd0063d839946dfe4122ecf85f0a8fd0479d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-30T09:52:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-31T19:57:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"VK: make static chip_family_tables const","sha":"7262f3d0b7eaabe82ba23f41ac27c4be7802bca0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2020-12-31T19:12:20Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2020-12-31T20:15:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"rpcs3_version: Bump to 0.0.14","sha":"2b8eb8deb6e86deca9c677c8b300da3762532075"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-02T05:20:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-02T22:47:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Shaders cache loading and saving bugfixes\n\n* Fixed crash whenever files are missing from the cache.\n* Fixed crash whenever files are empty.\n* Fixed crash whenever file creation/overwrite of cache files failed. (handled by fs::write_file)\n* Fixed crash whenever there are any subdirectories inside the pipelines cache directories.\n* Overwrite invalid shader cache files if encountered such.\n* Optimizations have been added.","sha":"247e90b3d09d9dca3c67a9f773a4515f10da083b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-02T07:51:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-02T22:47:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix shader cache of 2 or less pipelines","sha":"21d725daa584fc1a12de592005f75665caba10de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-02T09:22:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-02T22:47:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Make FP shader cache load lock-free","sha":"0e278d2299c81fe51051d499351d2c95ae5864af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-09T18:29:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-03T16:31:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Improved Zen chip detection","sha":"cbe0000d234e895c80ef1e8d83b3ef4fd5567978"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-02T17:24:53Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-03T16:31:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Update Utilities/Thread.cpp\n\nCo-authored-by: Bird Egop <sampletext32@bk.ru>","sha":"5f8564c6558958dc5626a26004bd0af3a697d5b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-03T19:01:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-03T23:28:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix ambiguous call to min(float16_t, float)","sha":"3f9b699eef24992748c37cdd3463b364f088101a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/12038583?v=4","date":"2021-01-04T05:50:48Z","email":"matoro@users.noreply.github.com","login":"matoro","name":"matoro"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-04T07:04:51Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Build: Add include for building on certain configs","sha":"187216096d464ff8755f7885c3c109710d549895"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10002815?v=4","date":"2021-01-05T02:28:23Z","email":"me+github@jlay.io","login":"joshlay","name":"Josh Lay"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-05T07:27:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Docs: Update BUILDING.md (Fedora)\n\nThe package `qt5-devel` isn't available, but the `qt5-qtbase-devel` package is :smile: \r\n\r\nBefore:\r\n```\r\n[root@workstation ~]# dnf install alsa-lib-devel cmake glew glew-devel libatomic libevdev-devel libudev-devel openal-devel qt5-devel qt5-qtbase-private-devel vulkan-devel\r\nLast metadata expiration check: 0:06:39 ago on Mon 04 Jan 2021 08:00:59 PM CST.\r\n\r\nPackage alsa-lib-devel-1.2.4-5.fc33.x86_64 is already installed.\r\nPackage cmake-3.18.4-2.fc33.x86_64 is already installed.\r\nPackage glew-2.1.0-8.fc33.x86_64 is already installed.\r\nPackage libatomic-10.2.1-9.fc33.i686 is already installed.\r\nPackage libatomic-10.2.1-9.fc33.x86_64 is already installed.\r\nPackage systemd-devel-246.7-2.fc33.x86_64 is already installed.\r\nNo match for argument: qt5-devel\r\nPackage vulkan-loader-devel-1.2.148.1-1.fc33.x86_64 is already installed.\r\nError: Unable to find a match: qt5-devel\r\n[root@workstation ~]#\r\n```\r\nAfter:\r\n```\r\n[root@workstation ~]# dnf install alsa-lib-devel cmake glew glew-devel libatomic libevdev-devel libudev-devel openal-devel qt5-qtbase-devel qt5-qtbase-private-devel vulkan-devel\r\n[...]\r\nInstalled:\r\n  cups-devel-1:2.3.3op1-1.fc33.x86_64            glew-devel-2.1.0-8.fc33.x86_64  libevdev-devel-1.9.1-3.fc33.x86_64  openal-soft-devel-1.19.1-9.fc33.x86_64 \r\n  qt5-qtbase-private-devel-5.15.2-2.fc33.x86_64 \r\n\r\nComplete!\r\n[root@workstation ~]# \r\n```\r\nBuild verified working on Fedora 33 with 187216096d464ff8755f7885c3c109710d549895","sha":"65f81aca0fd1d1933c8a5caf61502209cb226206"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-05T07:49:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-01-05T07:49:03Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"VK refactoring Part 2 (#9542)","sha":"11db3151ae38890340137aa2b4828fc3ac1a4cf3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-01T10:07:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-05T13:15:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"VFS: Escape path components which end with space or period","sha":"d1e1c14dc3c5292a48818f3132ec53967352306c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-05T13:08:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-05T13:16:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed_typemap.hpp: remove useless reporters","sha":"673e84920b77cafb4de40e2e7f7c4d6fa6aa161d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-05T13:10:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-05T13:16:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"VFS: fixup handling . and .. after #9528","sha":"6ae1f1b02cf20244b70028b36489431940ec364d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-05T13:15:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-06T20:21:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"PS3 Loader: Fix sections memorizing","sha":"951fe3491e9d0f8f5c2c6e477127e77cd8c44275"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-06T20:32:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-06T20:33:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove redundant #pragma once","sha":"9ba8f4795c041b45b9c66854c4c28048da25618a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-06T20:33:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-07T08:56:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Error on no return type warning\n\nAdded non-existing noreturn destructor to fmt::throw_exception (for clang).","sha":"1dcf5e4f85516d0701f67a0d3694e2b1f0747c66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-07T09:42:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-07T09:42:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silence one warning (clang)","sha":"6231b07d2a69b3dcd0e96753a996b2fb360caa53"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-07T09:46:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-07T09:46:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Silence another warning (clang)","sha":"586440622b1155d21f6a0a13d4d76f4174e1af6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-07T10:18:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-07T10:18:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix or silence Qt warnings","sha":"1ad0f24ecdb876c6ca7c81abffbf6ba67fcc88d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-07T18:07:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-08T11:36:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"game_list: fix deprecation warning\n\nWe only need to check if the data is valid for clicks on empty space in the game grid. I don't remember why I initially checked < 0","sha":"ed1b8f254551f5c4f7b012d5df9e9f7e1d167a4f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-07T19:00:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-08T11:36:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: ugly fix for ugly deprecation warning\n\nApparently Qt wants us to implement each comparison on our own, and there is no simple replacement for this.","sha":"72e1d03860162b53110b8d2f2e9bfb0b6517b543"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-07T18:00:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-08T11:36:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Add comment for deprecated avcodec_register_all\n\nApparently this is now done automatically and doesn't even need to be called at all","sha":"36159c2bd4e35e838054a72363929e7033647a95"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-05T15:34:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-08T19:23:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Utils: Rewrite fmt::split","sha":"bf6f43ec3adc289538aba760153e37d1c86eda0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-08T16:46:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-09T08:05:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update ASMJIT submodule URL","sha":"c5b9ab3aca81b3641d57c9007c2bec28fe53acf5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-09T06:33:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-09T08:05:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update ASMJIT to oldstable","sha":"86fb5412fae0b6065e458be762166c1b8d9b2893"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-09T07:10:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-09T08:05:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM to latest commit","sha":"a36f25c7b2c3eea098b4fdbe29117a645115ae9f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-09T11:38:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-09T11:38:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix compilation for gcc-11\n\nIn response to #9557","sha":"9d74d42f2a8f7509a4a9000ea472475f71c059fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-09T18:46:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-10T09:04:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Refactor some uber-headers\n\n- VKHelpers was the rug everything was swept under for a long time.\n  This commit essentially deprecates its usage across most of the backend.","sha":"c2cbc62be66144c7ad8cdb813bb6da2446e680ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-05T13:42:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-10T15:40:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Fix index array offset bits","sha":"07c925223b740f9fb0365d364df6f9ae763ac51c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-08T19:05:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-10T19:30:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"kernel explorer: Make it single-instance tool","sha":"70804e2ba637bf318422635143959c1adf367a6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-10T19:59:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-11T10:04:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"tiny include fix","sha":"838cbe18408b81581cb82f9cbaa6224ac8ed7d5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T09:59:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-01-12T09:59:50Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Random stuff (#9589)\n\n* minor coding style adjustment\r\n\r\n* Qt: simplify osk dialog buttons\r\n\r\n* replace std::find_if with convenience functions\r\n\r\n* RSX: use sv in swizzle comparison\r\n\r\nidk, I'll remove this if it was intentional.\r\n\r\n* overlays/osk: rename enter to return\r\n\r\nThis one confused me and make me look for a bug that caused the \"enter\" key to be disabled, while it was actually the return key (obviously xD).","sha":"52deff06baf6523d7d39bf022f08caf0beeb1853"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-08T19:30:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-12T10:01:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable -Wcomment warning","sha":"d3a66af7d6dfb53c700ee9ea67c9913f74b48aaf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-08T20:22:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-12T10:01:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable -Winvalid-offsetof","sha":"ed345e5b651c1b6cabf54c55402301f8c5b81820"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-10T16:06:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-12T10:01:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable -Wunknown-pragmas","sha":"631d7d0ce7a7978e13414b68eb267ce0db2264e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-12T10:01:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-12T11:34:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable -Wunused-variable","sha":"db8e6fe7a71c223f0f7a42bbe0ec82c3f917f47a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-12T12:06:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-12T12:06:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"RSX: Fix possible bug in memory streaming utils","sha":"0af452720ecc4ddd2dcdbc1c735301cca6aa54d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-12T12:06:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-12T12:39:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: log certain null functions","sha":"f14d47bfe647091a9871f7ffeba3747b5712fd18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-07T22:01:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Read patchsets from compat db","sha":"68d411918dc5a483578d8077bd15e6127b2b18fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-11T17:28:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Rename package_reader member variables","sha":"ccec6e53c0f7dcb2557f3cce41ae422aeafbf2d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-17T16:18:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Use package reader in pkg_install_dialog","sha":"0624bdc72d49f9d67de4e1f72f181697dae6925a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-18T07:22:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"unpkg: add missing break and some cleanup","sha":"4d50d9daa4f82dcb5c7e369a1734619332236e70"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-19T19:18:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add more info to PKG install progress dialog\n\nAnd fix installation of single packages","sha":"df94c906dab430dd1a573147272b36e3ff18b9b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-19T19:54:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add VERSION fallback to GetPkgInfo","sha":"deb4b0320054dc48ab0a6422bd6a984caddd91f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-19T20:02:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Minor include cleanup in utlis.h","sha":"4a75f44d475471f7a22a57380fde105218bb70c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-19T20:30:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Use boolean values in unedat","sha":"56488a4ac9f6af10cdc8443a1961d20781032023"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-19T20:46:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Don't hide the PKG install progress dialog after each package","sha":"321e7d6977d5ae0248135edea8a844dd1c1052df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-19T22:41:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix linux compilation","sha":"fbe91fb245882052cf927c8815d97959013897f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-25T17:14:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Try to distinguish between Update and DLC","sha":"1500e5f58872c4ec181550c9c97c57eb0961d02d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-25T17:40:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Move blocking code in order to free the explorer","sha":"cde802b16ce1d264cce9bccb4b844d57baa60678"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-25T18:04:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Try to distinguish between Update and DLC (Part 2)","sha":"36189b8c3b8cd0ed9ab730a7b35f7eb3a0fc5b13"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-12-21T23:16:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix rebase conflicts","sha":"7c7af2e102a74c2c1d75d2731cb0dc6332d055fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T12:13:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add filename to single pkg installation\n\nSome file info is indistinguishable otherwise","sha":"46dc40f3f1c1ed059256123a42fe29e8342fd21c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T12:15:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Simplify numbered_widget_item","sha":"dd41ee68de1feb41a889b6340538e4b9b232dc6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T12:16:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add filename to multi pkg installation\n\nSome packages are indistinguishable otherwise","sha":"270d602a265ccc3dbccc832bc492eb413a1cc177"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T12:16:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T13:13:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Implement richtext_item_delegate\n\nAnd use it in pkg_install_dialog","sha":"eb77495d5f0f3d1787de13ca7d223ad6806ad5f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-12T16:14:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-01-12T16:14:51Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sceNpTrophy: Fix sceNpTrophyRegisterContext for handler abortion (#9586)\n\n* Implement handler abortion during context registration.\r\n* Fixed recursive calls to sceNpTrophy functions such as by callbacks from registering context.\r\n* Turns out the reader lock for context registeration was incorrect because ctxt->tropusr and trophy directory are being modified. Made it an exclusive lock after callback.","sha":"e1f95ceb54bb5ed178992c5d5c1e98a1d0120641"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-12T16:53:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-01-12T16:53:18Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"utils::shm: Make map_self() atomic (#9578)","sha":"c50b9bc4b4fa60fa548a10ff91c98e4ce474244a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-12T18:54:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-12T20:57:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"utils::shm: Hotfix after #9578","sha":"923fcc3b3df65d4426edda65e7a53a227d4e70d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-12T18:56:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-12T20:57:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"memory viewer: Close all instances after emulation exit","sha":"e05f1c37ad08af716a121e62e77be98602f9c6aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-08T17:36:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-13T09:39:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Remove legacy patch support","sha":"a692adefd77a387c42895b955df99ceebc0ecb53"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-09-09T00:00:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-13T10:25:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: Use ellipsis as \"mouse deadzone\"\n\nThis is experimental and smoothens the existing square shaped deadzone","sha":"8eaf76394ce12b0bc66d5d32adcdaa7cd75ccad7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-12T22:57:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-13T16:01:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt/curl: fix segfault in curl\n\nThe QThread lived longer than the m_curl object.\nThis lead to a crash when closing RPCS3 while the download is still in progress.","sha":"cfe660ab357942e6b109a1be11025913741487fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-13T15:16:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-13T16:02:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Crypto: workaround -Wunused-variable\n\nIgnore for key vault for now.","sha":"6cf73fad13bc82254b692dcb5496c7172a4c99fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-13T18:55:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-13T18:57:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Crypto: don't modify EDAT_IV (all zeros)\n\nI didn't notice where it gets restored to zeros.","sha":"caf02d18419e17e0d36ee9da0903f6a97bf6c1db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-14T09:00:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-14T09:01:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Crypto: make global vars in ec.cpp thread_local","sha":"376e564cff9e18988b36441a0694a7745e5803fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-14T10:27:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-14T12:17:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Crypto: modernize ec.h\n\nAdd const, use u8","sha":"8b01d0514646fada0c77dac0d916e0106368899d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-14T10:37:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-14T12:23:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Crypto: modernize key_vault.h\n\nUse constexpr, remove warning guards","sha":"4bee8dc37ff798b76189f8029f05a856f43e1b6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-14T15:04:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-14T15:04:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Memory: fix critical bug in shm::unmap_critical (Linux)\n\nIt was leaving holes in reserved areas.\nWindows is unaffected.","sha":"ea916fd7e18f35a4fff5c15ab44300acebecc3d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-09T14:35:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-15T14:37:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"vm: Remove vm::dealloc_verbose_nothrow","sha":"e4c3b1c2bd314a13a7eb4774a16c8793b5ef29b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-14T16:59:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-15T16:54:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Memory: use MADV_DONTDUMP if available (Linux)\n\nAlso refactor other madvise() usage","sha":"b5837d1271115515f4f18856888ba14779afc7aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-15T16:56:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-15T17:11:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use different approach in shm::unmap_critical (Linux)\n\nFor now, set protection to PROT_NONE.\nAttempt to address #9609","sha":"4ed76a15ffd4117486f222be37b73dec8748e2e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-15T17:11:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-15T17:12:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: Minor fix in vm::close\n\nSupplied size was wrong.","sha":"aaaeb66cc89b9dea327a33a447af43b85b6f35db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-15T17:54:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-15T18:38:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"LLVM: generate trampolines for \"null\" functions\n\nEmbed name into the trampoline for easier debugging.\nOnly warn about it during the compilation phase.","sha":"3567c43fb5fa297de0d6a3bc663a6445b39f4d2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5672538?v=4","date":"2021-01-16T08:15:06Z","email":"theracermaster@gmail.com","login":"al3xtjames","name":"Alex James"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-17T10:51:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"CMake: Use find_package to find SDL2\n\nThis ensures that the SDL2 uses an absolute library path, which is\nnecessary when SDL2 isn't present in the default link directories (e.g.\non macOS).","sha":"d7a8d385d84fc8a9d40a78676237a2c416133a88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5672538?v=4","date":"2021-01-16T20:37:25Z","email":"theracermaster@gmail.com","login":"al3xtjames","name":"Alex James"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-17T10:51:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"CMake: Unset LIBUSB_LIBRARIES when using libusb submodule\n\nIf the system has libusb installed but USE_SYS_LIBUSB is false, the\nstatic libusb will link against the system libusb (as pkg_check_modules\nsets LIBUSB_LIBRARIES, and 3rdparty/libusb_cmake/libusb.cmake links the\nusb-1.0-static target with LIBUSB_LIBRARIES). Unset LIBUSB_LIBRARIES to\navoid this when using the libusb submodule.","sha":"c06707c891bd28938b0607d1027aaf7f85ed5990"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-17T12:13:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-17T12:13:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: add splat_scalar helper\n\nUnrolls into zshuffle from the preferred slot.","sha":"def364fe288262e6f8d55488a43b734782ba6586"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-17T12:14:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-17T12:14:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native.cpp: minor compilation fix","sha":"0ac68def492553767a02aacf5667a89a7bc285f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2021-01-17T08:45:56Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-17T13:52:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Optimize FSM following comparison\n- FSM following a comparison instruction can be optimized to a single shuffle instruction","sha":"a2e8e3090c992402fb8723761319cb03e4b5f9ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-18T10:41:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-01-18T10:41:39Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Compilation fix (#9622)","sha":"0070fce2867e31bec514b3a980c1ce179869a090"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-18T10:49:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-18T10:49:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite fmt::throw_exception destructor\n\nAdd _DEBUG in debug mode for consistency with MSVC.","sha":"e07484f057e8fb9fe25a2de021dbfe99e9889d11"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-18T10:49:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-18T10:49:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"texture_cache: fix some warnings in AUDIT","sha":"8a2a76da1e1f5048236a98013f4665e2c80553f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-18T17:30:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-18T18:19:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix fmt::throw_exception destructor v2\n\nRemove destructor for MSVC.","sha":"6cf0c5cd6d0f2419dfa927af84103beb49a91863"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-18T18:34:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-18T18:58:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Refactor some 'offending' code a bit (no effect)\n\nIt appears linkage errors were rare even in debug mode (GCC/clang).","sha":"f9bc682115e7bd4db841222f59b276ab3d9fb1ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-18T21:01:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-18T21:41:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: hotfix for downloader\n\nI accidentally broke the download progress bar in the last related PR.\nI should've put more trust in the sanity of the younger version of myself.\nThis should fix it.","sha":"62cb532460d504533c2c3cbf5b32a8c1249d70a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-15T18:28:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-19T19:55:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Introducing RSX debugger entry (main debugger)","sha":"dbecf0fa503e4850ca8efcc80bd7d108484b570b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2021-01-19T20:07:25Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-20T05:46:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Change the way skylander ID is generated","sha":"566286773055e61724edd98861a17397fecdb97f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-19T20:02:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-20T06:02:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove unnecessary fmt::throw_exception destructor body\n\nTested with GCC and Clang in Debug mode, it now works.","sha":"c66b155dcb328d898f0b71b5d14a916f33236af9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-20T06:59:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-20T09:26:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix old warnings: remove strncpy\n\nUse strcpy_trunc instead.\nChange some sce structs.","sha":"f944573b3c8304b385e85bd5b8248960f67430e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-20T06:00:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-20T09:27:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix new warnings\n\nAdded CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0+ enums.\nAdded CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY0+ enums.\n\nCo-authored-by: Eladash <elad3356p@gmail.com>","sha":"241989c5fa9eb46dbe74d030bdbf3e612cd61453"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-20T19:15:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-21T07:24:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Use unsigned variables to avoid sign problems when calculating stipple bits","sha":"b6b908577333c629ea1c1714035f68ec64a5a7b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-20T20:23:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-21T07:24:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add support shadow1D and shadowCube","sha":"eb086b0e3fad107f637587009ec6f32409a6e77c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-19T18:15:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-21T15:31:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove SPU and PPU destructors","sha":"f81674232e0241d3c567843e06df6eb9444a7ec2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-21T15:03:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-21T15:31:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement thread_ctrl::wait_on (see #9208)","sha":"12e1be2626325e4b87063fe577210385591f33fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-21T16:29:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-21T18:32:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: fixup after #9630\n\nCo-Authored-By: Ivan <nekotekina@gmail.com>","sha":"a58c12db0b4a4bd9c27daffc131e433271696f8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-21T17:04:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-21T18:32:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve ppu_thread_cleaner a bit\n\nAlways join thread.","sha":"7f28489c70cd457db27c8712baacfc85dea54b75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-21T18:44:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-21T23:39:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"debugger: Implement F1 helper","sha":"142b44d4bece55ee57b2dae213df7e28569248f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2021-01-22T15:46:58Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-22T17:51:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"fix UserInfo2_to_SceNpUserInfo2","sha":"00ff53499af7d8639e5b4a7ee26495d99d8c047b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-21T16:16:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-23T09:45:53Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/gui: Delay game window pop-up until first frame","sha":"79513f06a432376e0b87b7102d565c882b489a12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-22T08:29:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-23T09:45:53Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve gs frame exit workaround\n\nMove to close(), hide before potential hanging at Emu.Stop()","sha":"b96864c7e64368907f5da1fe3bfab52ee63bcfb0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-17T18:33:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: DMA stuff","sha":"77660760424f7fbc4e458d119300e861bf36b60c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-29T19:53:08Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/dma: Disable memory inheritance\n\n- It is not possible to emulate passthrough memory cleanly, and we don't need to\n  A stupid race condition appears when trying to synchronize DMA blocks with memory inheritance.\n  Since the usage pattern is to acquire a range and then load or write+flush, this new data is going to be..\n  overwritten by the commandbuffer execution sequence later. Acquiring a scratch buffer to hold CPU content during the transition is not worth the effort..\n  as the data will be destroyed anyway during the transfer process immediately afterwards.\n\n  Fixes data corruption when moving data around using the emulated DMA passthrough","sha":"59e46f09b785470fc05d2d323fe3493100406225"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-12-29T20:16:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/rsx: Fix some more bugs","sha":"a1ab6c28c1d420f5eb66878e8b5b82fdb3b21572"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-10T17:25:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add host-imported DMA buffers","sha":"58d367d7049ab0a64b9600cc3f962fc667103831"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-10T17:26:17Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"win32: Be a bit more optimistic with allocated ranges; we get contiguous ranges more often than not","sha":"ead180aa601eaa9620c06b9bfffc66a51e247421"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-11T18:30:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/dma: Modify default page size to 64k","sha":"e1c0a917fa30ab3f2b3ad263391c7278c3075b7d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-11T18:51:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Polishing and cleanup\n\nSome spec violations fixes\nMake the option dynamic","sha":"7de0ff337bb8c42a4671d9efbdb2d204d66be9d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-14T20:07:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix custom event signals","sha":"f7fdfe52bc39fbee754f36073209f879cd9edc2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-16T11:48:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Workaround for amdgpu kernel driver","sha":"e56da4eb46fdfdb46d21f4edd6c586563becc3aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-18T21:40:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/dma: Allow interoperability between pass-through and write-back DMA caching types","sha":"67949bb5b784ad72094507ca685299aad0a1a387"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-19T20:37:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/dma: Fix multiple logical bugs\n\n- Fix range chaining.\n- Add validation checks that no overlaps exist.","sha":"f93cb262ba64d050c3470d56a6cdcdd4c8eb6521"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-20T17:46:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Avoid type shenanigans used to fake byteswap for select formats\n\n- Just use the reversed type instead.\n  The new uploader backend combines swizzle+swap so there is no need for tricks anymore","sha":"bcb69a54b20b35a3c12f36a75dcff0e1c16a04a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-23T11:32:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/dma: Unmap pages from GPU when they are unmapped in Cell","sha":"90ac9165e2dfe519ffc79f9509b80b53f962a87a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-23T13:30:21Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-24T11:24:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/dma: Disable pasthrough DMA for NVIDIA+windows\n\n- The driver seems to cache page mapping as long as allocation has not been removed\n- This is undesirable as we cannot stop the emulator to remove stale allocations every time a page is unmapped","sha":"22584fb2d1a786a2d0a0994810b9df6602ece598"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-01-24T12:23:10Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-24T13:40:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"spu: Restore workers priority after initialization","sha":"7c62574e59d85a5d7fa2e72840891c2de057b1fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-24T13:45:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-24T13:45:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Thread pool: reset priority","sha":"848067470882b8967629ab52703df6b4dab0bef9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2021-01-24T05:36:39Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-25T10:18:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Optimize ROTQBY family for VBMI\n- Avoid masking pshufb index by 0xf by using vpermb instead.\n- Also fix conversion of vperm2b index to ShuffleVector index.","sha":"486d48e4f88302000cfe5c5c46351a89d7790dd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-25T13:55:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-25T13:55:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native.cpp: implement shm::try_map\n\nTreats addr as a hint, emulating windows behaviour.","sha":"caa83d20f73ea5ab9d5a983d0cbf0fe97f30af4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-25T14:45:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-25T14:45:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU: Don't use shm::map_critical in SPU LS allocations\n\nUse shm::try_map instead until proper area is found.","sha":"a69248299d82577bf3a1223dad365867fa5fe805"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-25T18:49:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-25T18:49:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement thread_ctrl::scoped_priority\n\nRAII priority control (+1, or -1)","sha":"ee288340b039a3b350b8139745814b8eed5c8d09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-25T18:50:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-25T19:05:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Thread pool: reset thread affinity mask","sha":"eb72cc9f04a99890974bb32d239db3cefa144f5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-26T13:45:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-26T13:45:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Thread pool: try to fix resetting affinity mask\n\nAttempt to address #9657","sha":"f10ea1fb9b5e23fc14d584b088b95b9f894e18ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-26T16:58:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-26T16:58:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Threads: fix typo in emergency_exit (dump useful info)","sha":"c24d89dd34fba24225af00108dc1171d8f046e63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-26T16:59:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-26T16:59:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add trace logging to thread_ctrl::set_thread_affinity_mask","sha":"22c55cbcfae5499ffe0fedda177826d59f8f3b68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-23T15:13:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-27T08:53:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Detect execution access violation\n\nDon't try to handle it, treat as fatal.","sha":"c652d0b1836ffdae1c833b3cb4d6bca1c49b979e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-27T11:23:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-27T11:23:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"UI: Add supporters","sha":"15ed963a290fea0d998d57ab42df2b87905ba372"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-27T13:08:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-27T15:03:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: implement ppu_finalize\n\nProperly free certain compiled PRX/OVL modules (except dev_flash)","sha":"53267e283bd7b64295aa42ea79f56baba692d60c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-27T15:50:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-27T18:54:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Unfatal Segfaults","sha":"28feea0447a544ce2be70123d73bcb23c95a8897"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-27T19:46:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-28T07:23:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Purge unused typeid() invocations","sha":"34274ec391b0cff053157c3b475838e4d11c1b2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-28T07:29:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-28T07:48:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Seal cereal includes in util/cereal.cpp","sha":"67dd6754a6256ce1829eda7dd1235d22f733a506"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-22T08:11:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-28T14:40:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"New RSX Debugger","sha":"06528702046dde739eae87b82925b496c71be1d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-28T16:32:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-28T17:02:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: remove debug error","sha":"51d19e7c311365b1533385df64d091af06a9908d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-28T17:23:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-28T17:23:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Check for rsx::thread existence in Emu.Stop/Pause/Resume","sha":"6784301376749f6fa5bd55ff0633558e19e8ba10"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-28T18:56:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-28T19:54:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Handle missing cases of Emu.BootGame failure","sha":"33594581758c5d16df92a79a44b9e4f8649c8668"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-27T18:08:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-29T07:31:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix GCM HLE\n\nOops.","sha":"70346028c5e075b99d1e592e7d5b5ef196de247d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-29T06:45:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-29T07:31:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Do not account RSX for TSX pauses","sha":"a742501a4fd28d21b608808af597c83c78c3a0a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-29T10:32:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-29T10:34:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add MSELF support to SPRX precompilation.\n\nAdd ppu_precompile() function in PPUThread.cpp\n\nCo-authored-by: Eladash <elad3356p@gmail.com>","sha":"11ba6e45aba70325315260f300b061d1b103f170"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-28T18:33:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-29T15:23:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix minor issue with usage of STL thread::hardware_concurrency()","sha":"d3bc96a2010bcbec642995ccb69a9c3b512851dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-29T18:06:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-29T18:26:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup for preloading SPRX from MSELF\n\nForgot to append the offset.\nForgot to use different loop variable.","sha":"bb2cc196a6c641983607e400b904da63083ffdc2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-30T13:08:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-01-30T13:08:22Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PPU LLVM: Precompile all executable (PRX, MSELF, overlay) code at startup (#9680)\n\n* Precompile LLVM cache at startup of games, like the GUI \"Create PPU Cache\" option.\r\n* Allow OVL (overlay) precompilation as well (used by certain games).\r\n\r\nCo-authored-by: Megamouse <studienricky89@googlemail.com>\r\nCo-authored-by: Nekotekina <nekotekina@gmail.com>","sha":"e3b3b0cda7fd3f1fa52fdd402686f7eef2cf4279"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-30T11:18:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-30T13:53:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Set frame limit to auto by default","sha":"6b3b06df25d632948905c189b7b778938dbe4f75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-30T16:05:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-01-30T16:05:02Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix #9680 (#9687)\n\nFix regression from #9680","sha":"16c6b44f555492b734c5211c93d6a82f6c5e1943"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-30T18:38:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-30T20:34:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix ppu compilation progress dialog\n\nWe could only increase the value because we completely based the dialog on cellMsgDialog.\nThis led to an issue where the dialog would increase its maximum and thus decrease the current percentage.\nIt then couldn't decrease and was stuck on the old percentage.","sha":"1078626eeabf7a3010488867a7027a91d55dd57d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-30T15:18:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-31T08:42:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Search for more game data directories.\n\nAlso properly remove duplicate paths","sha":"2025f02105b11d386eddbba7e049b5b0f6c67d8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-30T22:03:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-31T09:18:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Simplify compile threads","sha":"7bddb87306ea67e1c473d15a40b99208a8f806df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-30T22:04:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-31T09:18:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor optimization for check_only ppu_initialize","sha":"670d2b191c95ff61b2cf513cd9fafd3c61f7b7bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-30T22:04:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-31T09:18:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix stop exit of check_only ppu_initialize","sha":"c464e90d5d457ccd7a68f087db1427db70561976"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-30T22:45:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-31T09:18:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Prevent minor race in Progress Dialog Server","sha":"31cdd7bdd23f74a6d245893b298d95d1a3fc0d42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-31T05:11:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-31T11:55:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix potential crash of progress dialog","sha":"b3fbada10e2fe3e2ad4bce0eae92cce80a618061"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-31T05:30:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-31T11:55:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix ppu progress dialog percentage","sha":"8d15f44b3316c2700306632fc4d0f66fefae3b24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-31T06:29:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-31T11:55:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add missing destructor of progress dialog","sha":"9077563dacddf14a35df814539e8defa3d985719"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-30T14:25:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-31T12:47:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement standalone OVL (overlay) loading mode\n\n* Allow to load OVL alone.\n* Add error checks in ppu_load_exec(), do not crash on error.\n* Fix crash on exit from standalone PRX mode, allow kernel explorer to work with it as well for the added OVL mode.","sha":"82c86ed2f7bd7cb77d41156c2a9bdbe552caf572"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-31T02:36:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-31T14:02:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX: update shader loading dialog at 60 fps\n\nLooks much smoother","sha":"df79b6c238bd1fcdec4ac88587a1364cce834673"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-31T03:06:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-31T14:02:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX: Implement set_value for progress dialogs","sha":"be26810cd78105b5f26496ce96a9aac0b230d42f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-28T23:14:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-01-31T14:51:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"More informative Error message on Vulkan driver crash\n\nThe message might not be the only reason, but at least it might help someone like me, who had no idea what he was looking at.","sha":"9feb92df1bc2770a4fe69bcc3d25342a789a226d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-31T17:00:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-31T17:00:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: fix some typos in asm code","sha":"cf6606065d9c9a83d752e68a9b5f5380d8d0431b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-31T18:25:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-31T21:21:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger: Allow to unpause a thread which has been paused by global pause","sha":"cfc7865f8294e8e1f9ebcc48e5eb9278224c1256"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-31T18:33:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-31T21:21:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Debugger: Add some more shortcut descriptions in F1 helper","sha":"e71c2df39d579753546e4f0e95ce04a96be763a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-19T17:40:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T08:30:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: improve analyser\n\nCompile possibly executable holes between detected functions.\nAdd unused \"PPU LLVM Greedy Mode\" option (for future updates).\nAdd \"nounwind\" attribute to compiled functions (reduces size).","sha":"f9ee8978ff6d86cd8394210b72f2ba694bc19e07"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-24T12:13:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T08:30:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: Implement inline __add_get_ov","sha":"382509d778738d3f53ec9f038802956f0d82882d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-25T13:34:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T08:30:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU Analyser: use reloc info (disabled for now)\n\nAdd blocks from relocations.","sha":"891ebd0cb1eb8b87431154cb2f87afe2b04604bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-27T08:50:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T08:30:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU Analyser: compile certain functions on per-instruction basis\n\nPPU LLVM: optimize small blocks","sha":"8a029159cdedc94538c0d206acf7e49332e4c66e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-28T11:22:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T08:30:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: don't use module name as PRX indicator","sha":"c89362f6a28cded7e140f77e1d7fff24d9ea6d74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-28T18:32:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T08:30:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU Analyser: better constraints for SPRX","sha":"d5f16ce2722a9a079294b741c28cdc990b5a80a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-31T18:38:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T08:30:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fixups","sha":"aeeceb7d0bdf027ffdcf1d3716705a0c04ee7e8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-01-31T18:38:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T08:30:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: upgrade to GHC call conv\n\nGet rid of some global variables.\nImplement ppu_escape (unused yet).\nBump PPU cache version to v4.","sha":"0c034ad7de82774e53693070fba00e800ddf7a62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T11:46:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T16:14:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix freezes in HLE Vdec and SPU LLVM precompilation.\n\nFreezes could accidentally occur on close or ingame.\nDeprecate range-for loop on lf_queue.\nThis is a part of PR #9208\n\nCo-authored-by: Eladash <elad3356p@gmail.com>","sha":"d0126f0fa044f653bede0b66a25abc162aaff94e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T11:55:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T16:14:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove unused header","sha":"7b40859eff5e7061d8ee55d609619cecff74f254"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T15:24:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T16:14:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"TSX: workaround for check_state freezes","sha":"390b192f0af58733c94f08ab129367a0f85b5dd7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T15:33:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T16:14:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU Analyser: fix constraints for all elfs.\n\nAdded for main executable and OVLs.\nForgot to use it not just for SPRX.","sha":"58eef983e23c770c34a0c797017c5de27c7ae7ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-01T19:15:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-01T20:44:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Print report_fatal_error to cmd\n\nuseful if used like:\nstart /w ./rpsc3 --headless <path>","sha":"8c6aa9db31c719a7ed34714cd2e0b0d9f4abd465"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-14T17:54:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T22:05:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"memory viewer: Implement RSX mode\n\n* Set the ground for RSX modes of register editor and insttruction editor, do not use shared ptrs directly.\n* Make register editor and instruction editor modeless to allow to copypaste values from thread context etc in the background.","sha":"2005c89baac943abba6476557b47c77dc87c00ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T21:57:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-01T22:05:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix fs::unread (Linux)\n\nDetach from fs::lock\nHandle existing file case (unlink it).","sha":"78bad361ab46b03866468ac4d0415ddf71438c6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-02T07:33:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-02T07:33:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: workaround patch handling\n\nTry to address #9704","sha":"08aaae799970e0136f5ac20bbac24a141d970325"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-01T20:47:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-02T12:21:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Allow BootGame with indirect paths","sha":"2c32a721fc77c9eb48af1f32edd1ac66a4e18f1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-02T12:20:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-02T14:46:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Remove tooltip event filter from gamelist\n\nFixes a weird issue where tooltips for the wrong game would popup.\nI don't know why the event filter was needed.\nMaybe the tooltips didn't work otherwise back then or it was just some copy paste from google.","sha":"6ed9251f440485d7d5ed45a8a155782a37fe56ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-01T22:34:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-02T17:37:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"optimize add_only boot process\n\nNo need for hardcore stuff while adding games to the list","sha":"89942ed92ab8d2b5df64dbf48f618a3d394fb433"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-01T22:53:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-02T17:37:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Disable LimitCacheSize option in custom configs\n\nIt doesn't make sense on a per game basis and is used before loading them anyway","sha":"714eb6dcc59fa8283f36b3354f3e1050ec992314"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-03T11:20:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-03T12:05:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Tiny fix for zombie PPU threads","sha":"478ae0715e9c7e84c852f887b4a8408da1b0558a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-03T11:59:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-03T12:05:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Always signal the debugger about termination","sha":"4f85f151fd392a86b2344b8d1dccf6ad9d39c5d6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-04T12:08:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-04T22:11:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: remove Q_OBJECT for mouse/kb handlers\n\nHad to move QObject in parent list for g_fxo changes.","sha":"a6a92f7b6b3b86c18fa1dec5620a32f84dda13c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-02T18:20:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-04T22:11:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Rename some variables to snake_case","sha":"fd1f2ca1c6956c8375a2cb67b3b4a1c1972353c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-04T19:14:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-04T22:11:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix rpcs3.vcxproj","sha":"7e0fdbbe9952bc03552637d04d60070731733073"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-05T14:07:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-05T14:07:17Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Support logger stopping at std::exit (#9722)","sha":"7ce835e878288200a9a7b3c5b2a7cd1f8f5cdaab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-05T14:36:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-05T16:32:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Don't use std::exit during Qt initialization","sha":"2865865382d5fa378e820a8d1e3f1e1390944baf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-05T18:42:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-05T19:22:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Clear vertex output register if nothing is written to it\n\n- On NVIDIA GPUs, gl_Position is not initialized. Always clear to 0 to avoid on-screen crap","sha":"ddac4686a78eb38cf93becfb02a91b01e61cbc1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-05T19:03:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-05T21:37:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Create mini-cache for commits\n\nLocated in bin/git/commits.lst;\nCreated with GitHub API with --get-commit-db key.\nCan be lazily appended with the same key.","sha":"c32fec774f71cc25fe13f1d0441d72b29d12df43"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-05T20:53:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-05T21:37:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Updater: add minor sanity check","sha":"d6dcab443d2ca3576c2a7a2564cfb30a762d2bb8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-05T20:56:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-05T21:37:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add supporters","sha":"cb32fd15eec4b999333f964339f1cc65bf0296f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-06T08:21:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-06T09:55:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make out of source builds get copy of /GuiConfigs/, /git/, etc.\n\nReduce quality of kot-bg.jpg.","sha":"25827c12a38b103fcccbfc1a66d9c129fa178c44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-06T09:57:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-06T09:57:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update commits.lst (example)","sha":"1b34fa26ac797ffe34772f04e337e9af457c7b11"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-06T12:21:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-06T12:21:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup for downloader","sha":"5063eefa966ea2ea2b02a144d31b5567a213f921"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-06T21:25:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-06T21:25:40Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix tiny race in PPU breakpoints (#9731)\n\nIf the PPU has just being paused by the debugger, before it entered the breakpoint handler, the PPU would continue onto the next instruction skipping the breakpoint but then being paused on it instead.","sha":"fad89f1c3b7217068f4ba901889d971f8590480b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-02T16:18:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-07T08:02:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Patch system: export some info for future use\n\nFor now it's just a list of addresses.\nFor now it's not used (just a stub).","sha":"b7ff2ecffb3c304c6718c6d695010acafd68bb86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-02T16:54:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-07T08:02:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU Analyser: minor fixups for `end` pointer\n\nAdd more sanity checks for sections.\nRemove some redundancy.","sha":"9463238490d96149aa973378add7675e2932707d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-02T18:14:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-07T08:02:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU LLVM: compile instructions from patches\n\nFor now, only as a single instruction at a time.","sha":"9e9a55df4656d98c7829ae9247d5327119e9a3e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-06T16:33:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-07T08:02:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU Analyser: follow fallbacks in some cases\n\nFallback is an \"invisible\" branch to the next instruction.\nThis may be necessary for certain cases when patches are used.","sha":"0057c89eaa5d7abd4e0edc05c1d22756e4b32ac3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-07T08:54:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-07T11:09:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Qt: fix stylesheets on various platforms\n\nReplace relative paths to resources.\nPaths should start from GuiConfigs.","sha":"632e36ab44b4af2e1c8219a5f342431464a4d5dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-07T12:14:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-07T17:07:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Simplify stylesheet logic","sha":"62ca7a9b605061c0353ae759ddd9ddc02060b0da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-07T14:07:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-07T17:07:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Fix weird naming issue on linux","sha":"7c683c368d9ef6f7361908ed76cf2fed3bb13181"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-07T15:34:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-07T17:07:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Replace relative paths in stylesheets instead of changing the working directory","sha":"44ab50553dd03a5429b10beb643d83386f804375"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-07T18:01:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-08T10:24:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Repaint log on stylesheet change","sha":"dc2a1e270ad72af4c0852183d08d342d2fc96dc0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-08T16:57:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-08T20:38:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix firmware updating/reinstallation","sha":"e38cd5149a8ab68fa03ffea40dc797759c871a34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-08T19:15:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-08T20:38:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Always remove manually added fonts in OnChangeStyleSheetRequest()","sha":"78811b88161a61c239c19b6c1009edf13fbf54ed"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-08T22:11:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-08T22:11:01Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: Improve spec compliance (#9748)\n\n- Always comply when running under strict mode\r\n- Only allow hacky transport for known-to-work GPUs","sha":"2d62f9c4c53cece40a6d84f377d55bafc1185b14"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-08T15:47:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-09T09:06:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add -fstack-protector (Non-MSVC)","sha":"3e496f6625f249618f64c5b2a29464d4ec935fcc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-09T09:33:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-09T09:33:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix SAFE_BUFFERS attribute for GCC","sha":"4f8cac731b2997c43e2a137df67cac78772d96cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/19982663?v=4","date":"2021-02-09T04:52:05Z","email":"jordyvieira@hotmail.com","login":"vieiraa","name":"Jordy Vieira"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-09T17:06:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Replace GetEmuDir() with GetExeDir() in handle_rpcs3","sha":"f9eb6a31bd94ae918d86c09f2b5199890d23a96e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-04T21:05:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T18:21:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: add gyro support","sha":"3e8f4ba018ea24b3d716facee4803cbee35a0faa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-08T20:07:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T18:21:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: add mic button","sha":"ff61bc9e7c4aa6eb802d1d9ccf47067bd2b416db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-08T21:57:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T18:21:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: rename some functions","sha":"25a66da4ca3689a6673ac6c5f30bb8325c214d4c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-08T22:02:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T18:21:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: minor simplification\n\nThis might prevent some copy paste error in the future","sha":"08f48d27e885bfd1c9fc4ab6d7bcd984398b7225"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-08T22:05:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T18:21:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: implement SetPadData for rumble in GUI","sha":"a9418fa1e74675963f1bacc3683579f5ccfe2ce0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-08T22:58:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T18:21:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: add output report structs based on linux driver","sha":"a9b8a50c3132a78577f3ec80a9bf4920eeead508"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-08T22:59:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T18:21:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: fix switched motors\n\nThe left one seems to be the large motor","sha":"7795f5207f779ba6525d7299536eb878f438c384"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-08T23:31:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T18:21:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: add lightbar support","sha":"1af6550db73cc6068e0e27799e12e2f73442ea6e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T00:02:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T18:21:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: add player LED support","sha":"db402cb8af696b8d8dd2e874c1bc92307439313e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T00:27:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T18:21:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"LED settings: set modal and add has_battery check","sha":"b31d38eef756616c085b7bffef3cc7d45b14bd75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T00:32:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T18:21:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: update description","sha":"e5f95a450d4465106db403b333b6e9073e86c7cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T01:24:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T18:21:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: implement player LEDs","sha":"bc938ce630def96e532fe902ba43341f90dab70c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-09T19:18:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-09T19:24:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Revert \"Replace GetEmuDir() with GetExeDir() in handle_rpcs3\"\n\nThis reverts commit f9eb6a31bd94ae918d86c09f2b5199890d23a96e.","sha":"04c187deb5ca30a2cc00b2af986e3b3f2c6bb5bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-10-26T19:20:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-09T21:56:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: initial log viewer","sha":"8d6504d6e3ee5294724a65063d1ad069f158945f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-25T16:31:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-10T08:37:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactor texture cache utils\n\n- Also lays groundwork for optional hashed sections","sha":"1bad9a939f965e6446a691cc0745668e32ed5a36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-25T21:27:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-10T08:37:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Lower cache block length to 256 pages\n\n- Drastically lowers time wasted iterating blocks when many small objects\n  are present","sha":"0c10f47e85cc1f80b3f56da7b6ae38d78d4f3f54"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-26T20:46:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-10T08:37:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/texture_cache: Add support for reusing dirty images if possible\n\n- Avoids a silly situation where a texture is discarded and an identical copy created immediately afterward.\n  Unfortunately allocating memory blocks is really slow so avoid it as much as possible.","sha":"bf66c36ba46fab87a28bb77beca170d40900ee59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-26T20:47:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-10T08:37:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/vma: Always use aligned requests\n\n- Performance optimization when combined with vma optimizations added by me","sha":"6f4dbf4fcd3ad0516a0826df14a8cc10fc39e9dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-26T20:50:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-10T08:37:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gpu-open/vma: Optimize CheckAllocation method\n\n- Avoids doing useless work. The scanning algorithm is painfully slow on hardware with alignment requirement > 1\n- Upto 50ms saved for ~600 allocations when many small allocations exist","sha":"5a049d41fd06fb4f75cfb0d955cdbe8f0c5d921e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-27T16:36:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-10T08:37:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Relax inheritance checks a bit\n\n- It is not a fatal error for a texture to be defined where a framebuffer once existed.","sha":"bec91aab7be53f8af7a20778b46720ebbf013890"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-27T17:19:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-10T08:37:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Offload garbage collection to offloader thread","sha":"0a34fc4bcd7754888b5ebd3a318c484b38f16bbb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-28T18:11:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-10T08:37:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix protection bug","sha":"52acc23ecf263616a5d958b972a59b6af2a889ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-01-28T18:53:49Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-10T08:37:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve texture cache invalidate\n\n- Bunch of improvements\n- Properly signal renderer to rebind textures!\n- TODO: Range checks, should be pretty easy","sha":"195fb1cf66480a9968e979a1c9201503c66cf9af"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-02-10T22:00:48Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-11T11:49:37Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Support incomplete lavapipe\n\nDisable features still unimplemented by lavapipe when using it:\n- samplerAnisotropy\n- shaderStorageBufferArrayDynamicIndexing\n- wideLines\nas of mesa 21.1.0-dev (aea36ee05e9, 2020-02-10)","sha":"b858fceb4f3539f1ec195588fedafeed44ac168b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9490724?v=4","date":"2021-02-12T11:39:35Z","email":"saveau.alexandre@gmail.com","login":"SUPERCILEX","name":"Alex Saveau"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-12T11:39:35Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fixup for multi-thread shader compilation (loading stage) (#9762)\n\n* Multi-thread shader compilation\r\n\r\nThis offers a huge improvement in startup performance. With around 13,000 shaders we go from ~1:30 to under 10 seconds. It looks like this was the original intention of the author given the outer scope recompile variable.\r\n\r\nSigned-off-by: Alex Saveau <saveau.alexandre@gmail.com>","sha":"48296c2ba6eaf91d9f20da647c86119d9531b4cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-08T15:04:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-12T12:27:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Reimplement/fix PRX patches","sha":"e26ae9899c51217ce08b57c88c5c1b49fd0b04a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-08T15:38:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-12T12:27:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel explorer: Display all PRX/OVL segments","sha":"5401cb7392fbadfb668897d5454c84f03fe11ecc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-12T14:02:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-12T16:39:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix PS3 process exit/exitspawn","sha":"5ed0cc293d7352fa024e62c36849534b87cd6d1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-12T12:08:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-12T18:43:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add commits to the list","sha":"00be2479134845f8ebbc8429bf7eb59a678b5a0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-12T12:02:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-12T18:43:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Patch engine: add bd32, bd64 and utf8 patch types\n\nbd32 is the same as be32 with a hint it's not executable.\nutf8 is NOT null-terminated string, null can be added manually.","sha":"629d608d4ffed8863e83a586a2248ab0a4f913fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-12T12:59:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-12T18:43:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite fs::get_parent_dir\n\nDon't analyse full path if possible.","sha":"0a23a5ef50e6c5dc7935e0d29811a944896c9a94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-12T11:40:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-13T10:05:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU LLVM: Reduce PRX/OVL compilation memory usage a little","sha":"423cc1685ce6f3cbe2609a1878c4153143ac34a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-13T08:13:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-13T13:00:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"debugger: Improve PPU string constraints","sha":"cf384795d2ef05e59f3288f6a1171cce9ce0dd97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-13T14:50:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-13T14:50:07Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Atomic waiting refactoring (#9208)\n\n* Use atomic waitables instead instead of global thread wait as often as possible.\r\n* Add ::is_stopped() and and ::is_paued() which can be used in atomic loops and with atomic wait. (constexpr cpu flags test functions)\r\n* Fix notification bug of sys_spu_thread_group_exit/terminate. (old bug, enhanced by #9117)\r\n* Function time statistics at Emu.Stop() restored. (instead of current \"X syscall failed with 0x00000000 : 0\")","sha":"f43260bd585c749d21c48f45405c72ab658c9a48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-13T16:35:43Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-14T08:35:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Update log messages of PPU/SPU hashes and patches applied","sha":"f009d368111c21a56ad670d58a5b385cb89c54ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-14T10:19:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-14T10:19:14Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix vm::falloc() for misaligned args (#9764)\n\nForce addr/size alignment.","sha":"5b044a93c131102d88ff17910ce63e9743e6aeac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-13T14:34:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-14T17:42:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Silence some compiler warnings","sha":"b8311caa6b6106359895d4e93cd6ef7d67a00b38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-13T14:35:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-14T17:42:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add duplicate section detection when there are too many sections in the surface cache\n\n- Check for useless sections.\n  Helps in games that create a bunch of sections randomly for one-time use","sha":"eba7d3b172a9b92b80db39a7eee1b6cecd0eaeea"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/36445?v=4","date":"2021-02-14T10:25:25Z","email":"ilya.veselov@gmail.com","login":"13xforever","name":"13xforever"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-14T19:01:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"add a hidden option to prevent switching to exclusive full screen mode\n\nthis is helpful for people streaming RPCS3, or to prevent disabling HDR mode in Windows","sha":"76518d4c590051944ff978b594361c0a65059002"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-14T20:49:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-15T07:27:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fixup and refactor for exclusive fullscreen stuff","sha":"9f97bab717df74069128b8d5c62aca48f6770c41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-15T07:56:44Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-15T08:50:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Log \"Missing Firmware\" if firmware is missing","sha":"4c1026436fecebe233c3af22165ccd0dc52c4f06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-15T11:34:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-15T11:39:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable -Wunused-function warning","sha":"8e6e57de86c47cad2efd3a67ed60758f9b97074e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-15T11:40:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-15T11:40:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Reset -ftemplate-depth to normal\n\nIt became obsolete.","sha":"035ab590ec4b1fac00ba1faff7dda4e648bb41e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-15T12:34:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-15T12:50:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Make -Woverloaded-virtual an error\n\nHad to devirtualize some functions.","sha":"0bcece4585906476248037272df2be13aa5d8bdc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-15T13:50:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-15T14:05:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix regression (incorrectly removed specialization)\n\nChanged CRLF->LF in VKPipelineCompiler.h","sha":"3bcd76bd4ebae9a97a3ecb79b912c9be05fc0f82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-15T15:45:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-15T17:21:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add error on missing 'override'\n\nFor consistency.","sha":"1446254a038dd0d2b1c81beb11c751ce977c9044"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2021-02-17T13:24:41Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-17T15:15:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix mic device default in config","sha":"6786734d959cc47492884b91b57139a098d3c2c7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-17T19:58:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-17T19:59:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix almost all GCC warnings","sha":"038148bf06e7134ee54ffb1e266367db66181b00"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-18T11:07:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-18T11:07:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix -Wself-assign (clang)","sha":"428771f1d78f6c86a2af0b6a18aaa92cc77e1376"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-18T11:15:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-18T11:15:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix -Wsometimed-uninitialized (Clang)","sha":"2c18d6776960cadfa46b27f8377fe9351b0831ad"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-18T11:38:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-18T11:38:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix -Wpessimizing-move (Clang)","sha":"c8fefc44342a53736ce42ff4dcf8c61b72f0d25c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-18T16:38:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-18T16:38:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix -Wstring-aliasing (gcc)","sha":"e76d8eb04655fa9da27b6450edeebf3480418049"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-19T11:53:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-19T11:53:09Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"debugger: Fix single stepping (#9793)","sha":"20eb4352fbc4099848b52c4168041b9c670b489f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-19T09:14:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-19T13:10:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix potential overflows in utils::aligned_div, utils::rounded_div","sha":"b86ec2ffcf61718ba632cc27dd1d4c0d437dca23"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2021-02-18T05:59:03Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-20T06:39:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"check alcGetString return pointers","sha":"5129d0da45ed8bff2ff8e16b98e06e94d449490e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8129300?v=4","date":"2021-02-09T12:19:10Z","email":"oschowa@web.de","login":"Oschowa","name":"Oschowa"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-20T11:31:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Audio/AL: Request our default sampling rate (48kHz) from AL when creating the\ncontext.\nOtherwise AL might downsample and output in 44.1kHz unnecessarily, which\nhappens at least on my system. Also tested on an audio device that\ndoesn't support 48kHz to makes sure that still works.","sha":"a47bda026bf61999d6cecda0297c9154f51b090d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-21T13:43:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-21T13:43:02Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix most of \"[x] thread is too sleepy\" at Emu.Stop() (#9813)\n\n* Fixes some thread sleep/wait calls","sha":"eb0d006168eefa903b4b5bd48bbb9c8a9cf6501e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2021-02-20T20:10:09Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-21T15:04:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove now useless code from sys_bnet_connect","sha":"81270f3142317595a2e13c3579d41a72120cb728"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2021-02-20T21:33:17Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-21T15:04:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Add mutex lock for NP changes","sha":"8be2a55ccc3b3763e2bae078ef55d8668bd79062"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-21T18:54:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-21T22:13:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix cyclic read-write in dma_block::load/flush\n\nSome DMA block entries are stubs whose parents are DMA_block_EXT\nentries.\nPerforming load() in this case becomes a memcpy(address,\nsame_address_again, length) which wastes performance and introduces\nbugs.","sha":"b7c2bfbcded84b1a7efd17e8598834bf08df86d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-01T00:11:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T09:45:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"DS4: enumerate devices periodically","sha":"d0cc5c0fc765abeb7f764015dbe002d13da8783f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-11T21:13:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T09:45:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"DS4: inherit from hid_pad_handler","sha":"b9a4abce0e0e74bb6deb6e220f1efb11619d5b06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-11T22:27:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T09:45:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"DualSense: inherit from hid_pad_handler","sha":"fbb93968131e0cb984b94158cc2061ed7944b664"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-12T00:07:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T09:45:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"DS3: inherit from hid_pad_handler","sha":"aaae30cb84d583af881d8ce54c8e344b4e0cae8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-12T00:44:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T09:45:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: unify some more code","sha":"f6d465667a49d1c4e977974c0fd7b55b19e5a138"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-12T00:55:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T09:45:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: replace a bunch of static_pointer_cast","sha":"870d26f9d80b5086657569eec4a4b43087424c2f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-12T01:31:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T09:45:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellPad: minor optimization","sha":"f0b7afd7cc00e6152cc250ac7620a495c8f2d54a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-12T01:44:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T09:45:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: fix build","sha":"1479468730874f6ac87ed663e3c58ceb7280f64a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-12T21:42:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T09:45:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"only call hid_exit when all hid_handlers are done","sha":"1b2260132b88ea00f30df17e1fd8d209d1430c52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-13T00:25:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T09:45:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"hid: log more info when adding a device\n\nAnd minor format changes","sha":"5a9b29b73a2986d7360bf5115ce5fbb4c1a16735"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T08:52:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T09:45:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"evdev: fix build","sha":"2e5f321583be9aa95c53b4dd8fcfeec190dd2f81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-21T14:16:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-22T09:47:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove cpu_thread destructor","sha":"96400234a8861aed30112f39bf320e73f5fc359c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-22T09:36:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-22T09:47:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove vm::cleanup_unlock","sha":"73d45f3bf0cbde4b1d2547b34960598f04083086"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-19T13:18:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-22T10:00:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify utils::align() a bit\n\nstd::is_unsigned implies std::is_integral I believe.","sha":"9dc238187f0c0e45276b2104e4b4ec125c542e0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-22T09:43:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-22T10:00:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix minor inconsistency in utils::memory_reset (Linux)","sha":"ad1027455aac982fe6e3ae6288cfa3f1eff2ae31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-22T10:32:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-22T10:35:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"JIT.cpp: fix overcommit bug (should have been Linux-specific)\n\nCloses #9820\n\nCo-authored-by: Eladash <elad3356p@gmail.com>","sha":"980be9e0e821d66d78684b4e641b750b80592524"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-22T16:37:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-22T16:37:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add commits","sha":"85bebebb36621e7c6a14a0fb596d84284333a983"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-22T16:37:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-22T16:37:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add supporters","sha":"4b858648e51e508d61168285507c7e5afa5e8793"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-22T19:18:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-22T21:04:53Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/dma: Simplify map_dma interface","sha":"3632412c481eb11591ff9821f92b4341f215167a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-22T19:44:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-22T21:04:53Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Move queue family management from swapchain to logical device","sha":"cb7cf40b5e70777e77b293cb02ef3d644a8c9492"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T17:22:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-23T04:03:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix no-gui crash if no firmware was installed\n\nIt's a bit mysterious, but the confirmation box doesn't like being called in this mode.\nSo let's just return false.","sha":"037586d7bb3a39885f5db4d0a821056efcb75543"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-23T03:34:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-23T04:03:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"remove unused variable","sha":"0878db4e170d20418eb2133ec75499f74d5a0037"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-21T19:55:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T08:29:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Atomic PARAM.SFO writes","sha":"932f31e37bead478d1375ba447d7f02cab9643e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-22T12:36:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T08:29:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix atomicity of savedata/trophy data writes","sha":"d4af8dd89abb7b2f13ff67444dbf615ada63bd14"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-23T04:29:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T08:29:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Atomic SPU LS capture writes","sha":"9ccf39b27f01ea0788b1aeff4e2594fb68521dcb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-23T04:35:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T08:29:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Atomic RSX capture writes","sha":"447d2b6f9330876b06e2d02031f028ce37dc7fbf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2021-02-22T19:27:43Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T10:17:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix rpcn registration","sha":"801467e565ce18dadcd90c3042477e6841ae3b7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T21:04:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T10:27:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"overlays: Fix frametime graph spikes\n\nThe frametime_timer was restarted at the end of the update method, instead of immediately after reading its value.\nThis means that the frametime was lower than expected when an expensive task was executed in-between.","sha":"663b2c9c5e9e58e1a97f665044983179a1b08fd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T22:00:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T10:27:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"overlays: Fix perf_metrics_overlay visibility\n\nAlso change auto type to compiled_resource in order to silence a warning about accidental copy by value","sha":"e91df31f8c97907f4fcf820f8ce4ea795df726fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T22:25:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T10:27:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"overlays: fix perf_metrics_overlay division by 0","sha":"7cc8380330e0091253f37524fa8648fb94085ab5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T23:43:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T10:27:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"overlays: fix initial size of perf_overlay body\n\nYou could see that it was not properly adjusted in the first frame in high detail mode.","sha":"79b5b79de1b206e04cfa44ab3590131ab5ebcfbb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-22T23:56:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T10:27:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"overlays: fix perf overlay switching detail levels\n\nThe body was lagging behind the text. This was fixed by calling an updated version of init() on settings change.\nThis introduced spikes in the frametime graph, so the data had to become members and m_force_update was adjusted to not interfere with data aquisition.","sha":"a771f168eb13d24a1f3f19421fad97e96839a71d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-23T14:09:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T14:35:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Minor GUI fix for PPU interpreter at \"precompilation\"","sha":"68a878264ca203be07ee9acc80517abee790af46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-13T16:05:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T14:55:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Emulation::CallAfter\n\nMost CallAfter usages were extremely wrong when ordered after Emu.Stop(). could result in anywhere from emulation stopping hangs to even segfaults.\ntrack_emu_state = true is now the default, I haven't found cases which need need it disabled.","sha":"112b7f65719b2034952d2cda51d2f0d0d5a7bf15"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-23T15:23:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-23T15:23:53Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"product_info: add Harmonix Pro-Drum Kit (#9822)\n\nCo-authored-by: DrGeelfood <79338929+DrGeelfood@users.noreply.github.com>","sha":"b83cb2dbf53490d060580b6f33582508ad5816d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T09:08:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T15:24:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"cellSaveData: fix minor issues","sha":"014846cf318aacb62af9ea6bf29c692d068ea708"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T10:09:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T15:24:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement fs::sync (Linux/POSIX)","sha":"090a769bf60326cd4db834d587c95895726e577f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T10:52:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T15:24:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Move CPUStats.h -> util/cpu_stats.cpp","sha":"cd01a1eb09fd3992efce61db698c3e2b0b56ea24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T11:19:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T15:24:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove garbage SPUW perf report","sha":"a90ad62fc0dc29f720183dab005a99d79f7f1071"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T11:22:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-23T16:46:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vk::render_device::create: try to remove failing assertion","sha":"3063369322fe2cc23da664bbc684602c0ac6783b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-22T19:54:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-23T20:22:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Formatting fixes only\n\n- Mostly remove camelcase usage in old code.\n- Properly annotate vulkan API imports with _vk prefix to make it clear they are not regular variables.","sha":"d459da137852ea6843812ba00b642428fa32bc44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-23T19:38:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-23T20:22:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Handle old GPUs without proper async queues","sha":"0e7e5b59ae699bf516e6a45a789a97f31d665e3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-23T18:47:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-24T13:42:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix TTY handling of control characters","sha":"0012f39384099eca8859f5d4cf5d325ccbd4f98a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-24T19:35:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-25T10:08:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"overlays: Fix cpu usage in low detail mode","sha":"6db25aa7facbed5451c87b20c39cc85eb9e01ee5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-24T22:20:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-25T10:08:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Nan in cpu_stats::get_usage\n\nAnd apply same logic to linux and windows","sha":"e940632d9305818f38e0d6bc32655da98d2bb7ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-25T11:37:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-25T11:37:31Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix stop count incremention in Emu.Stop (#9843)\n\nUntil emulation is completely stopped, further CallAfter callbacks may be issued with incorrect stop count memorized.","sha":"c13039396c00b9b2dc6e15059da264b89066d239"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2021-02-25T19:17:03Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-26T08:58:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Add CELL_NET_CTL_INFO_DHCP_HOSTNAME impl","sha":"67378c7dea3790fe60869f377ef4ee4623594d43"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-25T18:57:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-26T12:08:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add support for queue family migration and refactor some texture upload code","sha":"be1238cc95952611511bf95645be52275f686046"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-25T19:11:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-26T12:08:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add per-queue-family scratch resources and double buffer them","sha":"12cad7c39347f1c0a71766995db46fe0f7d0b460"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-25T19:23:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-26T12:08:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Explicit initialization of command pool queue family","sha":"d2de8a87bf15581900b3734356fa16dd6c02db33"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-28T13:59:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-28T15:00:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix inadvertent self-assign","sha":"4bef176e9b3924523df4b51eb6efc65ddd36b90a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-27T21:36:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-28T15:48:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"remove unused variable","sha":"a4d4ab1df91b7a201574cc499994528399f9c188"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-27T21:37:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-28T15:48:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: set parent for QThread\n\nThis may or may not have caused a leak","sha":"7cb32a3680b2075967b0bd4505c2587f66920922"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-24T10:45:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-28T17:16:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"named_thread: rewrite result_storage\n\nUse SFINAE as permitted by std::invoke_result_t<>","sha":"29e7eda887243cf0df0fdc07a8c7c9730a2149ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-24T10:56:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-28T17:16:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"named_thread: implement \"default\" event loop\n\nFixup \"sleepy\" thread at startup on Windows.\nPermit threads which lack operator()() overload.","sha":"3aaa0172d54f2e7082e337fe83840effc32421e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-28T11:39:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-28T17:20:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"named_thread: implement task queue\n\natomic_ptr: implement push_head()\n\nthread_ctrl::state() triggers task queue execution.","sha":"de9d859f4ac4e4272f21f803f7e6671db9347540"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-28T14:25:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-28T17:20:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rewrite cellNetCtlNetStartDialogLoadAsync hack","sha":"f580bee32ca2d57facfe6565852a17840f430d4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-28T19:05:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-28T19:05:04Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Improve cellScreenshot (#9851)\n\n* Fix screenshot logging\r\n\r\n* Update libpng to 1.6.37\r\n\r\n* cellScreenshot: Write text chunks\r\n* cellScreenshot: add overlay image\r\n* screenshot_manager: add /dev_hdd0/photo/\r\n\r\n* read_png_file: use deleter instead of manual close\r\n\r\n* cellScreenshot: use Qt for overlays\r\n* cellScreenshot: don't apply overlay to regular img\r\n* screenshot_manager: add mount hack for VFS\r\n* cellScreenshot: escape the whole path","sha":"a7c9827ad48bcfb31239290c34eee7e60d22e977"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2995486?v=4","date":"2020-12-27T14:51:55Z","email":"Florin9doi@users.noreply.github.com","login":"Florin9doi","name":"Florin9doi"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-28T19:36:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Buzz settings","sha":"dfee46604af8a1c5d0e43f43beba809993f350c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-28T19:59:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-28T19:59:27Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Firmware installation bugfixes (#9855)\n\n* Fix race condition in PUP installation abortion.\r\n* Fix freezes of emulator in case the PUP installation failed due to filesystem errors.\r\n* Use fs::create_path as opposed to fs::create_dir as it is can create upper directories in case they are missing and is better in error handling.\r\n* Report TAR errors on failure to create directories.\r\n* Fix pup_object constructor to not crash on invalid PUP file header. (report an error)\r\n* Fix pup_object::validate_hashes to not crash on invalid PUP file entries. (report an error)\r\n* Do not call Qt functions inside a named_thread because it is wrong.","sha":"461fa6a88a17f823dd405615a36295c710823c04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-28T21:22:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-28T21:22:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Tentative fix for -Wattributes\n\nThese warnings enabled conditionally for GCC 10.1+.","sha":"b7c579adf9e70f7504cb5804caddb79c5ca5c873"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-28T21:28:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-28T21:28:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: minor fixup","sha":"71e16bfac3790c462d830f03f735a0f2e6ddd76e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-28T22:06:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-28T22:06:48Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Report deadlocked thread names in failures to stop emulation (#9865)\n\n* Report deadlocked thread names in failures to stop emulation\r\n\r\nCo-authored-by: Nekotekina <nekotekina@gmail.com>","sha":"48cd56acc2c55e80d7ae0943d4194ab43e009809"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-28T23:00:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-28T23:00:49Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"cellScreenshot: fix overlay scaling (#9867)\n\n* cellScreenshot: fix overlay scaling","sha":"0b5c6350aeba9547dfaad0899a477447564926e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-02-28T23:32:23Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-02-28T23:32:23Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rpcs3_version: Bump to 0.0.15 (#9866)","sha":"8e4451d1ab2f973240a1547623a955a2fc3d6611"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-28T00:05:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T13:37:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"DS3: implement player LEDs","sha":"10a55f16cc7a4506a8e1aa86097f7792ac1b1a98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-28T03:32:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T13:37:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: add some sanity checks","sha":"22b8cfd0bac6bb19f83c531bc2a7838c798d150d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-28T03:50:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T13:37:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"ds3: add led battery indicators (Linux only atm)\n\nneeds testing. maybe doesn't work","sha":"c2467b7b3818916fb39c505754e495da12b486b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-02-28T04:14:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T13:37:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/Input: set player LED in pad settings","sha":"805d52987f1d99008cfb4550b0dda8d8cd444d75"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T08:24:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T13:37:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"DS3: fix battery_level aquisition","sha":"2dc798d539ced803430dcaf55e7d5a06edff729b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T12:49:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T13:37:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"DS3: fix regression: pad data is cleared even if there is no new data","sha":"b5d4b5a21c7e4ca7167c6784079e6699b186891c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T22:58:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T23:45:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"DS3: fix linux output report","sha":"3452e18da1f9bac904b94ac9e2294269a5164419"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T23:54:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-02T00:29:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"DS3: fix LED battery status","sha":"930895a218100e81db2ab85b3a131cc4047c907a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-01T13:11:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T13:07:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"LLVM: Do not crash on failure to create cache file","sha":"ff211a9508bfd8909d464316ed02e70b9f3682a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-03T19:01:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T13:08:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: minor fixup for arrays","sha":"aa7e2376ec62f1920f20a6cb6fad816604a96bfe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-03T14:05:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T13:08:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"typeindices.hpp: upgrade with size and align info\n\nThis allows contiguous allocation (as in an aggregate).","sha":"5cc9bd770284a74fd85cf45a2412b34cf137b212"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-03T14:51:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T13:08:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"auto_typemap.hpp: reduce indirection\n\nImplement is_init() method.\nImplement optional Size template arg for further optimization.","sha":"8a9320c4efdb90e1cf855220022d47ab36234321"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-02-03T18:14:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T13:08:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed_typemap.hpp: reduce indirection\n\nBackported some changes from auto_typemap.hpp\nImplemented methods init(), reset(), clear()\nDisabled recreation support.","sha":"d788b12a8eba7266861d6df3a11c2743b6725dac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-01T15:02:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T13:08:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"named_thread: fix bugs in std::forward usage\n\nFix few misused threads and other bugs.","sha":"bbf52f3cead888fa682d311018fa5bf9477a6b32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T11:59:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T13:08:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed_typemap.hpp: return reference","sha":"ea5e837bd63d6cc6595bf4833e4122deec63f1c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-02T15:13:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T16:19:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Atomic trophy status updates","sha":"d0edd44a6994454a8b03e48bc79941af8b55f5d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-02-26T09:20:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T18:57:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU debugger: Implement MFC journal\n\n* Allow to dump up to 1820 commands with up 128 bytes of data each, using key D with the debugger.","sha":"004ebfdaee385e80da65101eb2b3b7bd8385d0a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T16:22:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T18:58:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed_typemap.hpp: make it a bit fool-proof\n\nRequire objects to be non-copyable (move is still allowed).","sha":"52fe86b56c7eb5cadf059a54646215eab8547d06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T18:07:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-02T18:58:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"PPU: remove artificial 0x20000000 barrier for debug stats\n\nChange it to 0xE0000000 (SPU demarcation line)","sha":"c71bc25090656162e3727434aadbed3e9d206892"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T19:37:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-02T23:33:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"perf overlays: add detail level none (hides FPS)","sha":"038c708a0accecfda9cd93210e9ab58faf4e906e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T19:38:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-02T23:33:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"perf overlays: fix dynamic font resize of graphs","sha":"e1e370999eee2d7faad94aa7f6389abaaed08c48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T19:59:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-02T23:33:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"perf overlay: add datapoint count config settings","sha":"86dbb859b7afe16327c10871443bf56e193fadb2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T21:44:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-02T23:33:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"perf overlay: add datapoint settings to GUI","sha":"73ca2119ed6fbb2a094c1dcf7b1073936ff49ff0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T22:02:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-02T23:33:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"perf overlay: add missing graph vertex\n\nAnd fix potential division by 0","sha":"fa852c7dbe6c482c30215be366b99d6396c79544"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-01T22:05:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-02T23:33:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"perf overlay: Don't allow 0 or 1 datapoint count\n\nDoesn't render anyway","sha":"7c0b93f8150a47e57bd7674dd0ea019c85b3c83d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-02T21:49:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-03T10:17:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Remove redundant double barrier\n\n- Luckily it was not too harmful in single queue submissions","sha":"1becd2f788b7c014ff2cdc2e6efaf5fdfb2f3caf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2021-02-09T16:05:09Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-03T14:30:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Add some GT6 devices to whitelist","sha":"0eb0b1e1c98466d46a0ee7512fcc541ef7db1d6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-03T14:37:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-03T14:37:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"endian.hpp: simplify be_t/le_t constructors","sha":"e6a3b59229fa3b538831b1ce3a8d5ec86e24c3a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-03T14:38:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-03T14:38:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add commits","sha":"8b8120cfb77a8a8fb5510d55b501cd6cb7b84f34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/211316?v=4","date":"2021-03-03T19:50:14Z","email":"tredaelli@redhat.com","login":"drizzt","name":"Timothy Redaelli"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-04T09:17:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPUThread.cpp: remove \"__attribute__((always_inline))\"\n\ncmp_rdata and mov_rdata are using __attribute__((always_inline)),\nwithout inline, that is not supported on current g++ (see RPCS3#1546).\n\nMoreover __attribute__((always_inline)) is a noop if used without inline so\njust remove it.\n\nA proper fix is to move the 2 functions in an header file as static\n(with FORCE_INLINE) so it can be correctly inlined by the compiler.","sha":"fa5a2b6a8523b25152564ac641c1f7cd873a5e5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/211316?v=4","date":"2021-03-03T21:01:34Z","email":"tredaelli@redhat.com","login":"drizzt","name":"Timothy Redaelli"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-04T09:22:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix linking with system curl","sha":"826dc7d5a6b51c5c2272ec52c607565aee2e6c5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-04T10:44:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-05T11:46:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"VS 16.9.0 compilation workaround","sha":"b09ac19e61d6f7d090fa7ac7e86dbcca1941c01f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-04T10:44:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-05T11:46:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix settings_dialog layout. Add stretches.","sha":"f88c3ae417101112589b8041616041b796942643"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-02T22:23:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T01:07:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: reset battery progress bar when not supported.","sha":"bdd94f053c973989b7da7a945f8ff9a92a0110ac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-02T22:24:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T01:07:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: minor cleanup","sha":"b836d2497d9a70e76adc01cfcdc0fdefc257e82a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-02T23:33:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T01:07:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: implement battery level","sha":"cdffaa1598855341a12cdc6079b44726d7efad78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-05T18:14:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T01:07:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: get hardware and firmware version","sha":"c8e7530e372a014883e4bbaaf1c91e9f3430a881"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-05T19:32:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T01:07:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: fix LED updates","sha":"06d2c5357b150ca28bc94a2000c3e9ebc5cbf304"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-05T21:08:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T01:07:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"dualsense: implement lightbar pulse (low battery)","sha":"dbb03ae2d710987d0adec5f7fc7e04d81a11ac9a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-05T21:09:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T01:07:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"DS3/DS4: fix battery LED update","sha":"3e7e077fad94df1510904e67bd13923e50381980"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-01-27T16:22:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T09:34:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Improve missing firmware handling\n\n* Install PS3UPDAT.PUP at the spot when booting games whenever firmware is missing. The option to boot games without firmware is still supported when all firmware SPRX are HLEd in firmware settings.\n* Pop-up a confirmation dialog in firmware installation if firmware is already installed.","sha":"a5d74c5e96468fd10c4c95436d815727b115b21a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T09:43:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T10:15:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"DualSense: Fix initial ingame LED update","sha":"d2b0b019ec99ca81dff4b7987a078bd70a85ad12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-05T14:18:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T11:53:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix utils::get_firmware_version()\n\n* Do not crash on invalid file contents.\n* Do not crash on unexpected file.open() error.","sha":"228988ca2b2ecfa71721e7b91d598b5016c7a1b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/12022598?v=4","date":"2021-03-06T13:01:04Z","email":"arus@poczta.onet.pl","login":"GitArUs","name":"GitArUs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-03-06T13:01:04Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Allow games to list all savedata (#9547)\n\n* cellSaveData - allow games to list all savedata, not only those they own.\r\n\r\nCo-authored-by: Megamouse <studienricky89@googlemail.com>","sha":"f8097a428c851e1b35b0962e47bdda1bce5b0092"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T14:23:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T15:06:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"add some log messages for debugging","sha":"7205a937511350dca1c31e660f4a2488171b9c59"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-05T19:05:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T15:07:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable -Wunused-parameter","sha":"87af90501811b7d3432ce5bafa70d7eaac4f5cb6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T16:26:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T16:26:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fix for fmt::split with empty string\n\nDoesn't affect existing code, I believe.\nReturn at least 1 empty string if is_skip_empty=false.","sha":"7cd79714facb8e42c7279d5504c9df0b9fe09741"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T16:30:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T16:30:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Another minor fix for fmt::split\n\nDoesn't affect existing code.\nIf there are 2 or more separator, choose closest.","sha":"c69c70cf5fc6a10d3c03b6e0f581ac9b0b0885b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T17:02:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T20:10:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sysinfo.cpp: Implement utils::main_tid (main thread id)\n\nCareful.","sha":"ded828dfc94f947a64ce2f0760e50b70dae418a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T17:10:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T20:10:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement thread_ctrl::get_tid()","sha":"55c75d2c873885cfda9b21cfc011855ef1f68520"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T18:02:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T20:10:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement thread_ctrl::is_main()","sha":"3609eb25c95624368e9da36824136dc01330aa5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T15:40:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T22:56:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix auto updates. Don't pass exe as arg0 to execl","sha":"9da7910fc90825e4260cae065ee2b29204048f6c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T20:10:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T22:56:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Cleanup Emu before the update reboot","sha":"dab53f4e41c0812847329c943ebcd2e1c00e4605"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T20:32:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-06T22:56:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: Do not allow updates during emulation","sha":"3ae7debc17371e6b0d4825a6b8365d8fbe4513b0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T10:51:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-06T23:52:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: don't count initial garbage values.\n\nThis might also shave off some microseconds.","sha":"a3a4c0a9062ea9f5b708cd2d35647fb1698f2dc6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-07T00:53:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-07T10:48:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input/Qt: implement XInput battery level","sha":"1b5cf118e7a4747b3e64aa20f0abaece6cbc9dd5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-07T16:59:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-03-07T16:59:37Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"GUI: Implement MSELF extraction tool (#9909)\n\n* MSELF: fix overflow\r\n\r\n* GUI: Implement MSELF extraction tool\r\n\r\n* VS: fix mself files in vcxproj\r\n\r\n* fix\r\n\r\n* Update mself.cpp\r\n\r\n* fixed","sha":"2afc7cbaaab7962e9623a0666683b70628297f6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-07T18:55:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-08T11:05:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: expand first search results","sha":"935e398930f43ccaf68da682808f30bc5e4beed4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1712979?v=4","date":"2021-03-06T19:56:58Z","email":"dsdominykas@gmail.com","login":"xddxd","name":"xddxd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-08T12:46:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Possible workaround for mobile Kepler chips","sha":"6d91a9fe6f9b9c850266df3bf06e88b28952d480"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2021-03-04T17:16:12Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-08T12:48:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Rearange FM instruction for better performance\n- Doesn't eliminate any instructions, but allows for better out of order execution.","sha":"e5d0e035d0b6358b154242ffd3a5d7b5622ff496"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1712979?v=4","date":"2021-03-08T15:28:07Z","email":"dsdominykas@gmail.com","login":"xddxd","name":"xddxd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-08T19:57:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Move sys_crashdump to it's own file and make it a module itself","sha":"df338f05526c9e7c4f0dcdb0c223d2902eb6cef6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-07T20:42:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-08T19:58:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"make from_hdd0_game check lowercase","sha":"1a3c01154ac2d13d14166221bf0fcad946d3a216"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10439488?v=4","date":"2021-03-08T21:29:56Z","email":"10439488+dio-gh@users.noreply.github.com","login":"dio-gh","name":"dio-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-09T00:07:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix debugger instr coloring\n\nFixes the missing color highlights from the currently executing instruction and the breakpoints.","sha":"aad06faf1f0a4282010481ac8df8004c269d00a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10439488?v=4","date":"2021-03-08T22:06:15Z","email":"10439488+dio-gh@users.noreply.github.com","login":"dio-gh","name":"dio-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-09T00:07:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix colors for skyline (bright)\n\nFixes debugger colors and the notice-level log message colors, the latter to the gray that is noted in the color palette.","sha":"324fa10918572f7569f4d7281255f7c3641c11f1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10439488?v=4","date":"2021-03-08T22:07:01Z","email":"10439488+dio-gh@users.noreply.github.com","login":"dio-gh","name":"dio-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-09T00:07:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix colors for skyline (dark)\n\nFixes debugger colors in the dark Skyline stylesheet.","sha":"5dfe3f414d649ad9d7bcef6e71fabe5a8b3b2d40"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-07T15:48:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-09T00:09:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove some redundant code\n\nPotential fix for future warnings.","sha":"5bdd1cf837ffa3a7f31334249ac5d9a850b35f98"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-07T15:49:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-09T00:09:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add/fix warning -Wignored-qualifiers (GCC/clang)\n\nFix simple_array::const_iterator as a part of it.","sha":"53af2dbb3f517ac254a8809d89f54d07e48d02f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-07T16:47:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-09T00:10:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add -Wclobbered and -Wcast-function-type (no effect)","sha":"3990e2d3e62ec83f197084da36318bc153ba85d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-08T20:41:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-09T00:10:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable -Wstrict-aliasing=1 (GCC)\n\nFixed partially.","sha":"a4fdbf0a8879abead165f350b286409da5d8c8a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-09T12:50:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-03-09T12:50:58Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Workaround segfaults in Vulkan enumeration thread (#9935)\n\n* Workaround segfaults in Vulkan enumeration thread","sha":"52a0b38379718fbda3fb47d6fbeb22ab4b33f2b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-01T12:03:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-09T12:54:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add -Wnull-dereference (commented out)","sha":"19b5b47b26e7f68b2a6ee83b862001c386eeebbd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-09T11:02:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-09T12:54:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup write_gather (Linux, BSD)\n\nSplit iovec into small portions (256 for now)","sha":"a6350d5dd1aa4e9f0ad5645b56ebbd268b53d3e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-09T16:19:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-09T16:19:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Revert changes in BufferUtils.cpp\n\nShould fix #9933","sha":"9cbe77904def228097cb5488a25a046e83aa7686"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-09T23:58:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-03-09T23:58:08Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Move code to cpp (#9938)\n\n* GL: move GLOverlays code to cpp\r\n* GL: move GLCompute code to cpp\r\n* VK: move VKOverlays code to cpp\r\n* VK: move VKCompute code to cpp","sha":"cbd895a29c86f4e044ca00d55dff12e3705897ee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-10T08:43:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-10T10:41:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU interpreter hotfix","sha":"63ecb56b51fecac82d3748a6e09a4372b8bda0ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-10T12:54:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-10T13:02:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement utils::bless (pointer cast)\n\nTries to workaround strict aliasing troubles.\nDon't confuse with std::bless which works differently.","sha":"03332c340d9e5487bf7f3727abef553235e47f1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-10T13:11:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-10T13:11:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix std::bit_cast misuse","sha":"4adf4120495cd6a866a8bfb0a72cfb1fe183764d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-10T23:26:39Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-03-10T23:26:39Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Improve TAR loader (#9908)\n\n* Fix header magic test.\r\n* Rewrite code to not use so many filesystem calls.\r\n* Add many more error checks.\r\n* Add missing NUL filetype.\r\n* octalToDecimal(header.size) has been fixed to use fixed 12 characters range instead of endless string.\r\n* Add many optimizations.\r\n* Fix possible signed overflows with int, use the unisgned u64 type instead which allows for greater files as well.\r\n* Log errors.","sha":"0958c10f88de148931576315e6e46d6dd2d24dbd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/2504890?v=4","date":"2021-03-11T10:56:17Z","email":"arabek@users.noreply.github.com","login":"arabek","name":"arabek"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-11T11:33:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Use maybe_unused macro for chip var\n\nVar chip is only used in the WIN32 ifdef block - use maybe_unused to silence the compiler warning about unused variable.","sha":"bdefeaf6f96fe6da9a48508c3590c22a14699900"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-08T16:43:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-11T12:23:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Loader: Log FNID of imported/exported functions","sha":"cfa2d4aaa8a675fd315bcd532d1f890d385ce2ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-09T19:40:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-11T19:48:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Overlays: Implement individual pulse","sha":"40f3adc45f328825dbc8f4da616a68cfd39b7c2b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-01T11:58:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-11T19:55:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Add information about unnamed/main threads in logs and fatal dialog\n\n* If thread is unnamed, keep log name empty for main thread, otherwise print thread id. In fatal dialog, main thread can be handled differently (with special remark that it's main thread).\n* Always print thread id in fatal dialog, regardless of thread type.\n\nCo-authored-by: Nekotekina <nekotekina@gmail.com>","sha":"cd6ef2958b7e70de0c6e7a23e303c1ecf0768ba0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-28T18:11:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add the async task scheduler","sha":"77e312fb9993a363ff22d8de90ca29fc42ab8c15"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-28T18:42:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Lazy-initialize image resource on first use when owned by a separate queue","sha":"d2993474fbc8855cc62c0f79aab47a7e945629f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-28T19:00:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Sync main pipe with async jobs if any","sha":"41f5158247a9bcf087b397501b5a0619d665026b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-28T19:18:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Properly clean up async scheduler","sha":"c9e8b87c6013ff219b08e511ff79c9f08c197ac6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-02-28T19:34:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Optimization - avoid touching the mutex at all if possible even when there is no contention","sha":"589ac1c5d4184f7e7a3193c05599e01d560ffbaa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-02T21:52:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Flip on async texture uploads","sha":"b4e821c28d82e0ef0575a8c69bbab6abcf2058c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-03T21:23:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Support new fxo usage pattern","sha":"585837a3f0721efc95c8f9fa0af47ea9b916de8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-03T21:23:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Tune event polling for higher throughput","sha":"bd6c187fcdd3e53fd7010413efc2b900692ec1fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-08T17:22:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add an alternate async queue scheduler\n\n- This version violates spec but does not rely on CPU threads to keep the GPU from hanging. It's ironically much safer to use.","sha":"48d0f80a865a15aa6618da550259fc59c990e37d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-08T17:47:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add options to system configuration","sha":"7d5a72c9e08e5bb3ec47382a6513eb61cfc1d765"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-08T19:57:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Basic fixups","sha":"3e8a00d2641bd0b308929c907f6947232cc48099"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-09T21:46:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Solve GPU hang/reset due to waiting on events that are never signaled\n\n- TODO: Some refactoring may be required to pair the primary and secondary CB and avoid such blunders","sha":"608f8de347501c9bfbf4ef875ec0c01243ac3473"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-10T20:30:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Check for uninitialized target before going into any scaling op","sha":"a5f0faefc36848a9afad54776bb63feaeb39a51f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T19:40:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-11T23:27:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Add asynchronous streaming to the GUI and auto-enable it\n\n- Hopefully not many users are on very weak GPUs","sha":"140c5bfc3e3b8547773eb147713ad9b7bb95ea17"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-12T08:18:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-12T10:01:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"debugger: Fix PPU threads pausing","sha":"729cd9284edbac224cff603b66f5115e0000d924"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-12T08:15:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-12T18:01:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sysutil_send_system_cmd at Emu.Stop()","sha":"923ba6f3bb413f13076863821efd730b36c32094"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/154165?v=4","date":"2021-03-12T23:11:02Z","email":"154165+jtscott@users.noreply.github.com","login":"jtscott","name":"jtscott"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-13T00:16:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Resolve minor typo 'verion'","sha":"e3a7fddddfb0142645405735419deb7c56905b29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-12T17:52:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-13T09:19:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Import Custom Icons","sha":"8c139206d7cfdccc9c2dd4b9eddd4ca2c2d781cf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-12T20:10:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-13T09:19:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Center Custom Icons","sha":"161d8ef47a393d7d47929112779db30c8cfcd06b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-12T21:24:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-13T09:19:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Option for Custom Icons","sha":"8d0947f07f4c2f434281f97df81c49f307c07014"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-12T22:16:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-13T09:19:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix square custom icons","sha":"c0d823f1d842cc4ad2bb71ff55fddcaa33dd4be9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-13T01:51:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-13T10:51:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Handle uppercase RAP file extension","sha":"d1e07434a163b639908f5cb05aece1e2f3969c16"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-13T05:51:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-13T10:51:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Handle all PUP files in drag-and-drop","sha":"bdf6a1c70e3f9247f6a07cafdbfcde7b9db2938f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-13T06:19:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-13T10:51:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Atomic RAP file installation","sha":"7a7b168af312d2d7f841b99a10602e8168f28851"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-13T06:21:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-13T10:51:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"SCE Decryption: Detect illegal RAP files","sha":"aff63028d4f493066580fc4727132374eaeeb28f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-13T15:02:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-13T15:02:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Continue fixing strict aliasing warnings","sha":"c22e1e71f0bb5f9e77f0e136bd97089c1b301643"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-13T15:03:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-13T15:03:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable -Wduplicated-branches (GCC)","sha":"ccdea1c4ad67431d3ba2460d8aab49f27d110da3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-13T15:46:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-13T15:46:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable -Wduplicated-cond (GCC)","sha":"0327ecc5c108189c939a63ae2112b396668ef82a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-13T20:01:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-13T20:01:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable -Wtautological-compare","sha":"bb9b5e6affff63b5b9aaaeb6dcd59a20c1840baf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-14T12:20:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-14T13:39:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Disable async streaming by default","sha":"c9214ce6c002bb62fac80afd44cb3b36c3822ecb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-13T15:46:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-14T15:46:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Import Custom Shader Loading Icons\n\nand refactor icon import","sha":"2239a52e9be4ffb0431a5b84eb1d73a0599f7278"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-14T09:24:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-14T15:46:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix game icon canvas size","sha":"8b0cd60be99ab481b7205b4760b97445f0152a56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-14T10:38:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-14T15:46:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: Fix aspect ratio of custom bakground images","sha":"1a5a0f5eca8f665402a8884621460ebb0e23fb3f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-14T11:13:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-14T15:46:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"workaround for clang compilation","sha":"c1de0bc28c5e1d03ad6d5a807288283598d31ed1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-14T17:42:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-14T18:56:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix PaintedPixmap crash if icon is null","sha":"1e09be19f57c0dcedc718e5299889fa30d929bc1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-14T17:53:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-14T18:56:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix wide game icons (weird copy pasta error)","sha":"f83b19cecf5560d4ffcdec2e526a5e463a607459"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-14T18:27:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-14T18:56:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: dont scale small icons, deal with size instead","sha":"f93dbb8f49e1c5f1ad83277c67c2f787a87d2fa1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/27760396?v=4","date":"2021-03-14T20:48:50Z","email":"shockdudex@gmail.com","login":"shockdude","name":"shockdude"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-03-14T20:48:50Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_usbd: DJ Hero Turntable Emulation (#9965)\n\n* Initial Turntable Emulation","sha":"6a14849381ffdc7ad954812cc095c2681d9c4fdc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-15T15:38:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-15T17:41:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Thread.cpp: Add missing newline","sha":"a5bb925a3d909342dbfe388a70f5aff06030739b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-15T19:31:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-15T19:31:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPIRV: disable error on warnings","sha":"1b6c14be8da691cc9f3252a6f5da50764973474d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-15T20:25:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-15T21:41:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add bright arrows for tree views","sha":"f8e9ea45ba115c55a24f7977855211a91509e132"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-16T11:03:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-03-16T11:03:58Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Improve fs::container_stream::write (#9976)\n\nAdd overflow condition.","sha":"4c7fc8a70a9f14d4faaa8d489429cfefd5cdff1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-16T13:20:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-03-16T13:20:45Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"PPU Debugger: Fixup for syscall arguments (#9932)","sha":"a9b0d25c01a5aa351d8154cc367253ddb84851b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-12T14:25:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-16T16:31:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Make gamedata installation atomic as real PS3","sha":"d7b47530070db9855db5ef33351a3cfdd23a00a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-16T13:25:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-16T16:31:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_raw_spu_destroy","sha":"8716ac554fcbab9afa15996f2f71807f45cf21d0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-16T13:41:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-16T16:33:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Save all 8 syscall_args","sha":"f801dc65585056dab67bd477662ba4b7f4e1e0d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-16T16:37:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-16T16:37:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement lv2_mp_flag::cache\n\nIdentify /dev_hdd1 without unsafe path comparison.","sha":"8fcebebae35595d26d4453f3519ed91779a6e0e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-16T23:39:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-17T07:49:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: make some scrollbars thicker.\n\nHow are we supposed to grab them if they are so tiny?","sha":"6cc5428d5e000d9ad4b802cd00ed506b35f904f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-17T14:19:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-03-17T14:19:35Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Replace some log errors (#9980)","sha":"1213708b72e7d29b4461ec0fd4efffd926772315"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-12T06:33:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-17T19:31:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sceNpTrophyGet(Trophy/Game)Icon","sha":"1d7fbd6a9a519a235dbd4d8018b86e1ee2407af6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-17T20:49:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-17T20:49:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Rename and move g_tls_current_cpu_thread inside cpu_thread\n\nDon't declare extern inside get_current_cpu_thread().\nPossible workaround for gcc-11.","sha":"2decf1ecda937c4741e35976abbde066029f65c3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-17T20:53:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-17T20:53:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add supporters","sha":"ee4009e1239e3fb9d17f07dadab2557af4b5fa40"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-17T20:53:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-17T20:53:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add commits","sha":"83fdcff178d91ca8eff0881fa7b768cb41d4e03a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-17T07:48:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-18T08:11:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSaveDataEnableOverlay","sha":"43ac33c2b46198c6e8bde9ed9e7fb2d72bb8dc57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-18T09:09:42Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-03-18T09:09:42Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix race in render_creator (#9939)","sha":"ad49c54531d308f04f69e37ee7b3ba3f71991768"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-05T14:34:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-19T16:51:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Improve firmware installation error handling\n\n* Add new error types and descriptions.\n* Do not crash on missing 0x100 and 0x300 PUP file entries.\n* Report an error on missing PUP package inner files.\n* Fix overflow in file-size against header check.\n* Move all header errors to pup_object class.\n* Move verbose error descriptions to pup_object class.\n* Minor optimizations.","sha":"314670a34755869c57ced92ac19ca195ec492949"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-05T16:07:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-19T16:51:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Implement full extraction of PUP\n\n* Implement full extraction of PS3UPDAT.PUP.\n* Implement TAR extraction via GUI.\n* Use VFS to implement missing PS3 filesystem characters escaping.\n* Use VFS to error on illegal paths. (illegal paths such as malware pointing to \"/../../..and so on../C:/Windows\")","sha":"a9ddb1d3b3bd38e8959a20202e5336c6a092a994"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-19T14:39:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-19T16:52:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"VS: move projects to 3rdParty","sha":"c4a8bb26fb2f7761478ec7dcf2befde61750e643"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-19T18:07:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-19T19:25:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix SPU mapped memory page size","sha":"18644195615ed4ddf31361c9cc6825cc078059a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-19T14:54:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-19T19:26:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix NtSetTimerResolution in no-gui mode (Win32)\n\nAdd dummy persistent timer with 10ms period.\nReplace QTimer invocation with Emu.CallAfter().\nThis way, headless and no-gui modes should be affected by it.","sha":"379138af2785a571da82ce787c2892a45487456b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/3001093?v=4","date":"2020-11-26T13:22:59Z","email":"romain.tisserand@gmail.com","login":"rtissera","name":"Romain TISSERAND"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-20T10:57:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add command-line option to install firmware","sha":"b5698ee101bdc9a2f5d2b60f1071f10ed9864e2c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-20T10:17:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-20T10:57:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Make cli fw installation more foolproof","sha":"70c98fff1951bce91984052d2d72199efa637777"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2021-03-20T06:11:37Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-20T12:09:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Run shellcheck on all build scripts to ensure quality","sha":"ca0c4f2cc0be650824d8672c1b074fd4b5e1895b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2021-03-20T06:13:40Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-20T12:09:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix some minor shellcheck errors in github upload and windows build scripts","sha":"2766e5ca6f75c0fc5682b3b2a62ecf63e3b64025"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-20T16:06:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-20T17:54:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"cfg: move get_name to _base","sha":"ae01e1d2c3942a741ff061aefb9f8ceb01f8af45"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-20T13:19:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-20T17:54:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"cfg: log unused config entries","sha":"cb9e7358d2c77e62b7f61d64da4fa32df61eaed5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-20T17:06:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-20T17:54:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"cfg: simplify get_nodes","sha":"2c05e9719db6d30498c9009631723a1344a90463"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-21T16:18:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-21T17:44:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Allow package installation through cli\n\nAdds --installpkg cli option","sha":"554ba9d6a673f2760c0c2ce7b41ddd83fa61456a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-21T19:33:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-22T09:44:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix debugger step shortcuts","sha":"399f20ae54d668a1291fce6af5c138b19fd5861f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-19T15:25:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-22T15:37:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Memory string searcher improvements\n\n* Search the entire PS3 4GB address space instead of a small area of memory which is meant mostly for PRX/SELF memory aka vm::main segment. This limitation rendered string searcher nearly useless.\n* Implement hexadecimal byte-string, hexadecimal integer, float and double value search formats.\n* Multi-thread searching.\n* Optimize searching algorithm vastly.\n* Fix crash on empty string, report an error.\n* Implement case-insensitive string search.","sha":"b0a0533a4fd0798943455c76b5b5b2aea0729d7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-22T18:05:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-22T19:19:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VS: fix AdditionalIncludeDirectories","sha":"54d078f379d8d53325ce9009ba9d47a9cca0baac"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-22T18:11:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-22T19:19:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VS: fix release Optimization","sha":"b518a9a33877150e35693e3cbd657f6e2c2c03fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-22T20:08:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-22T22:47:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: prepare for removal of deprecated GUI settings\n\nIf you remove a custom name and already had a deprecated name before, you'll never get rid of it.\nThis applies to all of the deprecated settings.","sha":"6892cb1c7ef3f2d67e43c538549913f7e0b9668a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-22T22:49:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-22T23:46:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VS: fix release build","sha":"cd07ab5b5fb4dcf31fdace0e66cf43a9c013c78a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-22T23:25:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-23T08:11:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VS: try to unbreak debug builds","sha":"dedf09017ac851e2111e9a685dbe21e0cc20c17d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-23T10:33:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-03-23T10:33:07Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"debugger: Fix SPU memory viewing (#10007)\n\n* debugger: Fix SPU memory viewing\r\n\r\n* Fix terminal recovery from page faults (hack allocation)","sha":"a67b3479664de7d5b708bd69fb327e81c3ed5fe0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-21T05:03:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-23T13:05:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve ELF/Trophy loader's error checking","sha":"2f333424a67084fab02e7550930ca55b36911566"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-21T15:02:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-23T13:40:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add some warnings (GCC, clang)","sha":"e0790f758e1759e71e3b7a500f84e169205a9623"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-23T17:19:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-23T17:19:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: remove raw_notify and simplify internal logic\n\nAlso permit zero size in waiters.","sha":"820390b7eddd1d05bbd1a0e8c7773b0d35d54622"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-23T17:52:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-23T17:52:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.cpp: allow non-standard sizes in atomic wait (>16)","sha":"393f9d329dfa7de5837ac6663a2d639ad2b01cb9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-23T17:58:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-23T17:58:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"atomic.hpp: allow raw notify_all by pointer","sha":"729757b1ddacd9de90e6688843d38167d2266c24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-23T18:09:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-23T18:09:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: fix reservation_update notification\n\nRare function.","sha":"5dc3467337162d2327cfc0544fc16a360bf54d4c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-23T19:32:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-23T19:48:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add and fix -Wredundant-decls (GCC)","sha":"b3fb6d7d1874f0d874fa267518ab7020260916a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-23T19:39:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-24T19:47:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: some cleanup in debugger","sha":"ba45daff354a7f328bbfe961d54458244f547433"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-23T19:51:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-24T19:47:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: select target item in debugger list\n\nThis should make it easier to spot the item","sha":"452fb59c7472cebd191f357641f38b6c9049207b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-23T22:23:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-24T19:47:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix debugger breakpoint deletion","sha":"8d5445398143757af4475ebf6e07c1bcc6031fbb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-20T17:58:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-25T19:34:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Remove unused GUI entries when saving a config","sha":"a7acb84b8b76e8b3adc01e7e0e11badd17166442"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1712979?v=4","date":"2021-03-17T16:28:03Z","email":"dsdominykas@gmail.com","login":"xddxd","name":"xddxd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-25T21:29:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Scheduler overhaul","sha":"9d895e6b15607826e00ce12877a78094377dd2a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-25T21:55:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-25T22:39:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: don't show updater if booted with cli arg","sha":"9f80a55652f1ec84c0c4bc973588e00ce1923f5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-25T22:52:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-26T08:08:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: clean global cfg before adding custom cfgs","sha":"6565855005a803510875a5c428418b65ff04bf11"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1712979?v=4","date":"2021-03-26T10:36:04Z","email":"dsdominykas@gmail.com","login":"xddxd","name":"xddxd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-26T17:56:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Wording changes and tooltip fix for unsupported CPUs","sha":"b978aa6dca7d077cbf43fae4246726bdb18c4033"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1712979?v=4","date":"2021-03-26T18:53:37Z","email":"dsdominykas@gmail.com","login":"xddxd","name":"xddxd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-28T14:24:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"LLVM Clang-cl support and ninja build\nAlso update the submodule","sha":"916ce7899ba431dd6914176e56be74b907dfddae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-29T12:04:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-29T17:19:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add option to hide the log prefix","sha":"0b2ba9823818576eae7ff211ab2355a83b826da5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-29T14:12:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-29T17:19:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: set find_dialog \"next\" button to default","sha":"90ac24e524a3da38ae8dafddc7e8788d9bb3b438"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-29T17:20:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-29T18:37:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Properly set QT_SCALE_FACTOR_ROUNDING_POLICY","sha":"d62983e1a255fc483fb9376bf1b820d13b0f2932"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-29T17:43:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-29T18:37:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Drop int for QT_SCALE_FACTOR_ROUNDING_POLICY","sha":"a982280400423427ba25cbd6c9ae3135b1845d28"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10439488?v=4","date":"2021-03-27T22:07:16Z","email":"10439488+dio-gh@users.noreply.github.com","login":"dio-gh","name":"dio-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-29T19:24:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"upgrade icons to a modern design\n\nCredits go to @DAGINATSUKO, and @hcorion for the svg version.","sha":"3e48c9744b48d0e4faa61246c9856369b9b035a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1712979?v=4","date":"2021-03-29T19:45:48Z","email":"dsdominykas@gmail.com","login":"xddxd","name":"xddxd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-03-29T19:45:48Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Get rid of non-LLVM build configurations (#10030)\n\nCo-authored-by: Megamouse <studienricky89@googlemail.com>","sha":"7cbafd603a3ee1078569d9088c0c65bed8439be3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-29T20:21:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-29T21:32:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"add AppIcon to fatal_error_dialog","sha":"66df38957b9eb2beb38ea2b0fe16921ccfe53a97"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-02T14:56:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-30T07:21:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Emulator::IsPaused()","sha":"aad52837869641f0252c52f7b7155e3b8cf30f19"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-02T15:00:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-30T07:21:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Emulator::Pause race with IDM","sha":"d51bb8b1cc7972a399adfb3eaadf8d602a41f386"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-02T19:51:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-30T07:21:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Emu: Do not obey auto-exit setting after creating firmware cache","sha":"e9bea1c742afe273cff9ce0364248d9b4799f773"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-03T04:05:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-30T07:21:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix Emulator::Stop race with IDM\n\nNewly created threads' state could have not been flagged with exit.","sha":"dea1d01de2051a99a2a811e551fe9f427be36129"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-21T16:55:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-30T08:13:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Compile shaders when CELL is not running","sha":"1e71deb0db481761db96ba495b88e4beab756387"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-29T20:05:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-30T08:13:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"thread-pool: Fix default rounding mode","sha":"5a3c218239516957502c3eae048a2447c9985702"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-29T22:24:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-30T17:09:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: gs_frame position updates","sha":"e557c962fbeb319dddf7652fde9f0bea235e469e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2019-12-04T22:17:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-31T07:38:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Emu/overlay: ingame native overlay PPU compilation","sha":"870224cde007d65edc335d5211b8391883b59115"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-29T13:20:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-31T08:27:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable -Wdeprecated-copy\n\nSome classes violated the Rule of 3(5) in their special operator definitions.","sha":"deacf057698d9fc5746333bf01f26e7de6a3c569"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-30T15:31:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-31T08:27:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix some -Weffc++ warnings (part 1)","sha":"2212a131ef049d261f901b412c76a0790830a4c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-03-31T13:31:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-03-31T21:40:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Implement scoped_progress_dialog\n\nCreate Emu/system_progress.hpp\nRemove atomic g_progr_show","sha":"e9a45a2f45e32bda9102cb18c8c99da2b98e22cb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-31T18:17:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-01T11:09:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix #9879 and fix firmware confirmation dialog when auto-start is disabled","sha":"55c98bfaefa62eeaceb4234088c2c38ba583a8f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-31T17:08:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-01T16:11:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"debugger: Implement ability to pause entire emulation on breakpoint","sha":"7b57b8f2cac6d00136b457e554ff33b069d1bf6a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-02T00:46:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-02T05:14:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Move system info to extra line","sha":"98687d474b51a00316e89b0ecc1a7e0966e09965"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-01T22:54:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-02T09:50:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cli: set user-id per command line","sha":"9c7230e79faf26b903c9d632bdbef0f3929de740"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-02T16:09:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-02T18:54:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Set userland firmware SPRX directory as the default PS3 decryption tool path","sha":"a1d31f640ac75c78cf304a7f697c0565c45e2993"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-02T04:52:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-03T06:47:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Output all fatal log messages to Console/debugger as well","sha":"73320d4180b7210226ecba048a80232f5453a00e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-02T17:39:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-03T14:23:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement get_cellos_appname()\n\nIdentifying vsh.self and possibly other operating system executables in the future.","sha":"878da3b474f19a976b9afc52011a547cb192458c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-02T15:33:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-03T14:23:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement _sys_prx_register_module loading imports/exports functionality","sha":"32116086b3164529bc769cdc59b2391886c919c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-02T16:00:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-03T14:23:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Quick sys_sm_get_params implementation","sha":"e57f36fc5bdddaab049700f1f06a74d564674158"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-03T17:15:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-03T18:37:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"hotfix: skip progr dialogs if msg dialogs are open","sha":"b7eefeac8bb358bc2d9342e39df7c22055b0fb6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-03T15:11:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-03T18:54:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix some typos","sha":"1ddeef71c69832841c9ae089b1e0c1e847927bc3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-03T15:22:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-03T18:54:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update commits","sha":"c1f1b1174d3dec341ce1713d4b5b207d9f6ec6d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-03T16:38:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-03T18:54:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix some -Weffc++ warnings (part 2)","sha":"963d150e93af6ec2c9a390f0bf05940fd5c5fb74"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-03T19:07:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-03T19:38:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor progress dialog refactoring\n\nAdd rsx::overlays::progress_dialog class (identical to message_dialog).\nDon't use Emu.CallAfter() for native dialogs.\nMake g_progr_ptotal waitable.","sha":"6f1f75bc8f5d918a1af632172da36d1d99c157b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-03T20:01:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-03T20:25:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup for progress dialog closing logic\n\nCo-authored-by: Megamouse <studienricky89@googlemail.com>","sha":"ed8f60431ffd887ebefcaff4cf72bc67a9f0674b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-03T20:19:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-04T10:38:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"overlays: fix taskbar progress reset","sha":"bf1756448e766694fdbe588ac2ab89db05fad8f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-30T16:37:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-04T14:29:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"core: Move IDM to FXO","sha":"4a9be0a8d2757d351b32b8f6d82ff6450236518d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9744201?v=4","date":"2021-04-05T07:20:51Z","email":"cglmrfreeman@users.noreply.github.com","login":"cglmrfreeman","name":"cglmrfreeman"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-05T08:14:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Update OpenSUSE dependencies\n\nAdded `libqt5gui-private-headers-devel` dependency to fix `fatal error: qpa/qplatformnativeinterface.h: No such file or directory`","sha":"f64a7bb82062d73a30a378d9cc240938a47c1310"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2021-04-06T07:44:50Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-06T10:07:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"vm: Flag names (refactoring)","sha":"396c129d41af24f0ba21b79c381c561dad7f41e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-03T21:02:23Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-06T12:23:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"moved build options to options.cmake","sha":"5ddb1d664996cdb31872bfaab6681d4cd20f5ae1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-06T16:43:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-06T18:39:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"progress_dialog fixes","sha":"497fbb17a8829c9b83e5cf39e147d7754f905ca7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-06T18:05:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-06T18:39:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Workaround: Skip progress_dialog during gameplay","sha":"02febd3f6598adacd047361b83fecefbbca0a7b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-07T15:52:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-08T07:29:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: improve is_same_ptr<> trait\n\nDon't always return true on MSVC.","sha":"94c62b1eec83350b8e0c5ebc38b37195d4214bd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-07T21:52:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-08T07:29:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add -Werror=missing-noreturn (GCC, clang)\n\nMay be useful to diagnose functions which fail assertions unconditionally.","sha":"95725bf7fcce4ae46c75c89fb093bc36d6e34f96"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-06T20:16:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-08T20:57:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Emulation: Fix boot path resolving\n\n* Fix /dev_flash executables path arg. (/host_root is wrong for it)\n* Fix usage of /host_root for homebrew applications when it is not mounted, use /app_home.\n* Fix path source detection. (don't get fooled by path slashes repetitions, symlinks, '.', \"..\" and ('\\' on Windows))\n* Unescape tail of /dev_hdd0 paths.","sha":"49c5ce30cc541e03fb96d9463cafe30456bc4589"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-08T18:02:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-08T20:57:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Log error about HG games booted outside of /dev_hdd0","sha":"d2b761b7de708d592ec217c8931f56bf5a76b053"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-07T20:37:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-09T06:47:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"DRM: Search all user directories for rap files","sha":"d10584ac6c286e551043ae4db14fc21a266ad9d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-08T12:38:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-09T07:26:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: minor optimization (GCC hotfix)\n\nUse thread_local for dummy objects (doesn't work on MSVC).\nCouldn't find better way to remove fake static objects completely.\nIn a sense that they don't appear in object files.","sha":"332c512eed3ab59b0613c8202aae708c20a02de4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-08T15:45:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-09T07:26:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: further fixes\n\nImproved is_same_ptr() trait (added third \"maybe\" category).\nFallback to pseudo-runtime check in certain cases (if \"maybe\").\nFix single_ptr moving assignment operator.","sha":"8c5f2b249ca3f2c19a334ba7494250df87db23b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-08T22:36:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-09T07:26:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix some warnings (deprecate enum arithmetics)","sha":"10bbb7fa1f61e106c247ff8ae445421a5dd33c7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-30T21:44:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-09T17:58:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Loader/cellGame: Do not crash on invalid PSF files","sha":"a8d5a8734a729466ec8432d5b6fa2c6d97b0f8c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-31T05:20:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-09T17:58:30Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"PSF: Fix string_view optimization\n\nAvoid redundant copies of std::string.","sha":"a3e8a61547507eef75e14e250a5830f15dbd9c35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-07T21:05:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-09T19:03:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Emu: some cleanup","sha":"03b76b46061da558172b04fea03fadc8091acff6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-09T20:37:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-04-09T20:37:57Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sceNp: fix rap file regression (#10084)","sha":"17f5fec538409d66382866db4e31cff589a90570"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-09T21:43:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-09T21:43:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix psf::load error for error::stream","sha":"3107f37864c87d5ec517079688d915c798cc491c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-03T09:12:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-10T08:37:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Suggest adding RPCS3 to anti-virus whitelist on firmware/PKG installation failure","sha":"86ddc00bb1abbd945f8a83f642bc6f1299285493"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-10T09:11:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-10T13:18:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Remove deprecated user management code","sha":"5b0dac797c8cf1e0d8972b8cdf70c77508cc8615"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-10T09:54:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-10T13:18:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Log firmware after Emu was initialized","sha":"332eb5fbd6a36d871768d98e6659cf409df808a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-10T12:39:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-10T13:18:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix vfs dir remove button enabled state","sha":"7a105333dc49a2a6ddfcda0a9bd7f09ca1f5eaf3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1712979?v=4","date":"2021-04-04T08:34:12Z","email":"dsdominykas@gmail.com","login":"xddxd","name":"xddxd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-10T14:21:01Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Cirrus build","sha":"024b1840086199c9eb20d62c6c5c80a075f47838"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-10T11:43:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-10T15:06:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement \"PPU LLVM Precompilation\" control setting","sha":"5ca638162424f5634b465bc5e32a3fea7a8bbda5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-10T04:41:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-10T20:51:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Win32 FS: Improve fs::create_dir","sha":"11824b3916a197cb83d5d9a1b5027cf945995add"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-10T05:06:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-10T20:51:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Enforce backslash at the end of emulated drives paths","sha":"56d34e0e80a3f02d0717cd78e4d0b77382a9933f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1712979?v=4","date":"2021-04-10T21:12:23Z","email":"dsdominykas@gmail.com","login":"xddxd","name":"xddxd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-10T22:18:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Cirrus warning fix","sha":"a485957130877cd2d16114a8aab54897a32371be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-09T19:12:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-11T11:01:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"More random changes","sha":"a16d8ba3ead71f98c91a54ab40d884394707d455"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-11T13:36:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-11T13:36:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Minor fixups (removed unnecessary code)","sha":"ccb46df9050c308114091250e53a53ba14695484"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-11T15:36:36Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-11T15:38:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"added inline suggestion to settings_location to prevent duplicate includes","sha":"4048b1e515c332bce554c668d2ca00f7ed109dd6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-11T17:23:26Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-11T16:44:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"added pvs-studio artifacts to gitignore","sha":"e4059dfe6abef25e1aa87c9fe72bcc3e414fc271"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-10T20:11:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-11T18:36:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix decompression of RB_RG textures.\n\n- Removes several subtle hacks that hid the real issue.\n  A compressed texture has more than one texel per 'block'.","sha":"06dc99ab85e2c876e5feda262e61de4f6e9d1169"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-12T20:56:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-12T21:14:16Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix mip level packed pitch calculation","sha":"8d1fc18941b878c8f510190962fc99cac1536463"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-12T12:14:08Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-13T06:14:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":" added inline suggestion to patch_engine_version to prevent duplicate includes","sha":"1de7ac3c67a064261bef9943181877a1c1a8beee"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/12850581?v=4","date":"2021-04-11T21:03:34Z","email":"michal.karczewsky@gmail.com","login":"mkmodrzew","name":"Michał Karczewski"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-13T07:00:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Update BUILDING.md\n\nThere is no `qt515-meta-minimal` package under mentioned package repository, but `qt515base` allows to build CMake configuration","sha":"006b8574aec9cf6a40020dcc778599f44e6731a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-13T00:09:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-13T17:13:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Properly disable perfoverlay datapoint sliders","sha":"20076ed57e727d4eda18caa81443df954a11ba35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-13T00:11:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-13T17:13:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: dynamically change dialog background","sha":"f5415fb4aca9fb8d228d55cf12ea9af4ad7abc8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-13T18:00:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-13T18:26:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Handle rare rounding issue where position.w is very close to zero","sha":"14a64e25295bb0aaa005383a612ced5acaf271c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-12T20:23:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-13T18:57:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"misc: fix old some style casts and redundancies","sha":"fc9b3c13e640cce125b25e0bc53eb462662c5815"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-12T13:14:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-13T18:57:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: fix osk placeholder","sha":"088d22675b420e15fc3b17b4ee19721fce4cf03d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-12T17:28:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-13T18:57:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: implement OSK password mode","sha":"bdc5ed094b0fe3e4d95e4c9a096282e2f119e7b5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-12T21:09:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-13T18:57:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: make auto-repeat buttons configurable\n\nand properly reset the auto-repeat timer whenever a new button was pressed","sha":"20c69a0e3e053f093def5b3f5b4fbfb96139c781"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/14265316?v=4","date":"2021-04-14T13:15:36Z","email":"14265316+TotalCaesar659@users.noreply.github.com","login":"TotalCaesar659","name":"TotalCaesar659"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-14T18:01:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix typo","sha":"ba1699a8312bf8b4e250452db01d00ff16616f03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-15T05:38:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-15T07:31:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"lv2: Remove flags from IPC-supported objects","sha":"a16cc3ac8a73e3e3ebae3a17aca14fd398deef88"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-14T19:44:37Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-15T08:05:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"small collection of fixes","sha":"c9d2aed286c4b9c9754870ea11cf2828260db67c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-12T16:42:27Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-15T09:37:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"removed extra perentheses pair","sha":"6cab5b559109ae3b1d343bd42cbd71fdf1d79126"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-13T20:07:13Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-15T09:37:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"removed whitespace\n\nCo-authored-by: Megamouse <studienricky89@googlemail.com>","sha":"24983ea3292a93a5f688faad5ee52f80b3673c20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1772474?v=4","date":"2021-04-02T23:49:17Z","email":"desterly@stressfactor.net","login":"Desterly","name":"Desterly"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-15T10:10:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Skylander - Change portal version\n\nSwitch emulation to the Traptanium portal.   This portal is universal\nand works with all games.","sha":"63e4ac80bd97397d8088c26d361f8f46b3e02a2d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1772474?v=4","date":"2021-04-08T19:43:36Z","email":"desterly@stressfactor.net","login":"Desterly","name":"Desterly"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-15T10:10:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Skylander - Traptanium portal cleanup\n\n- Remove \"Status\" query responses from reset request\n- Add additional request types for newer portal","sha":"99d6f9c7a91acec0905fdd72e8fe19aadcbc4960"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-11T15:58:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-15T12:23:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove unnecessary default:breaks","sha":"19763f8973d3e18df110515d9ae9ad113afe4c3d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-12T13:39:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-15T14:26:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: use for fs::virtual_device\n\nAdd new constructors for single_ptr and shared_ptr.\nChange virtual device prefix format.","sha":"a211895e2842c4dacc9e318d23829f3442ee1df8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-15T14:27:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-15T17:01:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fxo: add debug name to the typeinfo","sha":"408ffd3d2cbb34a28c5e369f1692bf12a8c975ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2021-04-12T06:26:48Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-16T06:35:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: add AVX-512 SPU verification\n- This is hidden behind a new setting, as some cpus may downclock agressively when executing 512 wide instructions","sha":"0a7df9d02e6eed08b91bd3eb6ec7e592619c7b1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-15T20:52:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-16T09:21:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: use gifs as icons on hover if available.","sha":"53f317e076c6f9917064c125945effa7d8e28952"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-16T00:02:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-16T09:21:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: optimize game list repaint with new logic\n\nWe now pass a shared pointer to the icon items, so there is no need to trigger a full refresh of the list anymore.\nSadly this doesn't apply to the game grid.","sha":"bff938ccf512c717fe67425e58bcaa0404f4898f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-16T18:53:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-16T19:26:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: remove uncritical deprecated notes and titles\n\nThis also fixes a savedata notes bug.\nThe detail section notes were always taken from the deprecated settings.","sha":"27975e9dfda499c9876fea0bdd776f7cda010b73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-16T19:07:58Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-16T19:26:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: smoother scrolling in savedata manager","sha":"ae8d1a3a609094765944f6c19f439e9987fcd3c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-16T20:00:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-16T21:18:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: fix dirty state of message dialog","sha":"7bc673002f13d36bd059cdd44343e0c0f4947b32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-16T20:37:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-16T21:18:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: unify some movie hover code and fix cellLeave","sha":"330dea181a7e4a708cc58563bb08ca7fc87de932"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-16T03:40:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-17T07:27:55Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Replace simple_type with std::common_type","sha":"67e2e154fa5f7fe812bebb147dd287490e21afcf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-17T09:22:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-17T12:03:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"basic keyboard: release all keys on FocusOut event","sha":"5416f606437bb48166b574196ba4ea7e6ecf0356"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-17T09:36:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-17T12:03:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"keyboard pads: release all keys on FocusOut event","sha":"691b986e36de77f3292400c718fe0947228fce9c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-17T13:40:24Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-17T12:54:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"replaced CMAKE_COMPILER_IS_GNUCXX with CMAKE_CXX_COMPILER_ID","sha":"896db3806dce60f010484f376c17a0cc0062f767"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-17T12:39:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-17T12:54:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"bs_t<>: fix/cleanup some operators","sha":"9d4fcbf94651de9869defab97df081c7db775248"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-17T13:26:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-17T13:26:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix condition for -Wno-attributes (regression)","sha":"d623720f4d0c24856ae94eb34acb42b2e27fa6d5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-17T13:32:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-17T16:23:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"bs_t<>: create BitSetEnum concept\n\nTry concepts instead of SFINAE.","sha":"fb26da1cb091711c000bde07b32732b4b3956ae7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4922778?v=4","date":"2021-04-17T16:46:07Z","email":"devnexen@gmail.com","login":"devnexen","name":"David Carlier"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-17T17:47:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"VM: FreeBSD c_madv_no_dump/dump constants support.","sha":"266c4209c453e3cddd027eaf9be3eee2b0f672c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-18T07:37:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-18T07:58:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix type mismatch crash of game grid items","sha":"bdac1d9bfdcb3674f439a3737881efab5a8d137e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-18T06:29:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-18T10:13:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native: supply only one madvise flag at a time","sha":"c061991c43ce1d0bf2d47641893a9bd6ac662e72"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-18T10:12:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-18T10:13:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native: document some unmap_critical behaviour (posix)","sha":"7a9561b966f41c6777d99eca6b18edce9b6f3b46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2021-04-17T14:22:17Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-18T11:49:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Add dev_flash2+3","sha":"68fa377d1346ffea2863b3fe340e1d4ef2d18e0b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4922778?v=4","date":"2021-04-18T10:26:49Z","email":"devnexen@gmail.com","login":"devnexen","name":"David Carlier"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-18T14:18:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"MacOs build fix proposal.\nMade on Big Sur, removing few unnecessary old specifics.\nBuild with LLVM homebrew.","sha":"b6732fbae9f80df2af52754a7cffb1b1a680623e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4922778?v=4","date":"2021-04-16T19:54:34Z","email":"devnexen@gmail.com","login":"devnexen","name":"David Carlier"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-18T16:56:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"FreeBSD/clang update proposal.\n\nsilence few build warnings, VKDMA: disable Intel chipset for host buffer as it requires root privilege.","sha":"7618e7f3fb9df21132ddc477ba773e1d7c4999e6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-18T14:36:00Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-19T05:59:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"removed space between  and its opening parentheses","sha":"b812ef2771bed4f6779fbb744a41f17cb9390a1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-18T09:48:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-19T08:44:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix initial gs_frame position on multi-monitor","sha":"b2317543c818e964456d5dc1af3cc2215e83e1f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-18T20:06:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-19T09:33:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"MSVC: disable throwing new","sha":"ccb89bd76ad4a39bd18226e739c0fc286647f0c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-19T08:11:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-19T09:33:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement fill_array() utility","sha":"7dae376646211752fceb68262dc7e867295f9602"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-19T11:22:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-19T13:51:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use requires syntax in more places\n\nChange style in some places.","sha":"0c9c481cee81addf3127156643c42a19b80f246f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-19T18:14:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-19T19:25:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Speed up Log Viewer","sha":"3c4c830e202c70e714472ab6a705f63e450ce4a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-19T19:33:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-19T19:54:27Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix null chars in hostname log message","sha":"01d14aed80234ce0bb34df8f7eb2efb2e3422e66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-19T17:45:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-19T20:18:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Reduce precompilation failure log level (error -> notice)","sha":"a0d1cf26d003dfd09cc9d687a8a04c0d9eda59df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-19T21:09:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-19T22:06:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: avoid mouse events when unused","sha":"aa0afc9a4e792c9e86c81ad4b180942e1713d946"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-19T22:26:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-19T22:42:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: hotfix for dialog interaction\n\nTurns out there was an undocumented reason for this.\nNobody warned me that \"It's a trap!\".\nI wonder how this hasn't summoned a shitstorm yet.","sha":"3e33f064bf9544aa3d564610389d74cc220d9bb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2021-04-20T05:32:16Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-20T10:07:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Final fixup for icelake shufb paths\n- The cause of the problems was due to the constant mask for gf2p9affineqb being used as the first argument, instead of the second argument.","sha":"53f13a9721cbf13c4886ef09c46c302c8ffb9b66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10439488?v=4","date":"2021-04-20T02:56:21Z","email":"10439488+dio-gh@users.noreply.github.com","login":"dio-gh","name":"dio-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-20T16:46:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI: take out some unwise shortcuts\n\nRemoves the ability to stop or restart emulation via keyboard shortcuts\nwhile the game is running. Prevents loss of work that can happen due to\nthe current bindings conflicting with very-widely established shortcuts.\n\nCtrl+C and Ctrl+E will now be unbound, and Ctrl+R will now mean Resume.\nStrings that mention these keybinds were adjusted accordingly.","sha":"ddea45160b08219bc0ec28961fede85a1485042c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-20T19:11:17Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-20T18:38:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"unified missmatched indentation in CMake files","sha":"bcfae17219d029276cb73dbde898b92de3ead7a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-20T19:11:50Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-20T18:38:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"swap STREQUAL for MATCHES","sha":"9e008996ab84dfdf35635566d6abeeee66f44b01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-20T19:12:18Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-20T18:38:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"removed redundant cmake version check","sha":"e9d785475e2936afa26d268338d887525ce1b48a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-20T19:13:14Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-20T18:38:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"moved cmake_modules to project root","sha":"01703b1350d1bf74dcba404e8779bef2782bcf7d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2021-04-20T18:52:34Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-20T20:24:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Remove icelake shufb paths for now","sha":"551472220eca747376761dcd811b525b09b3586a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2021-04-20T19:09:51Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-20T20:24:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Improve byteswap elimination\n- Use the data before it has been swapped rather than relying on a second byteswap to cancel out the first","sha":"efd38fa9408bac6cf7821b0cfec75b9e7684f480"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2021-04-21T03:10:57Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-21T08:00:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Absolute final fixes for icelake shufb paths\n- The constant mask was accessing bits in reverse order of what was expected","sha":"6247969edec377fd23c03cb02149b4cba8c95c24"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-21T10:33:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-21T10:33:44Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: restore lost comment","sha":"67649d7976f4c7f4a3869d332666248a51d4ec1c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-21T14:19:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-21T14:19:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"named_thread: use concepts, improve constructors\n\nBetter default thread name detection.","sha":"61450335a5f6621d25669f452d6fd45a057805e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-21T21:20:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-23T02:50:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Implement most of cellUserInfo","sha":"087dccd194c4d122c6ca60863e779f77dd1d1cf2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4922778?v=4","date":"2021-04-22T19:52:40Z","email":"devnexen@gmail.com","login":"devnexen","name":"David Carlier"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-23T12:20:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Following up on MacOS build fix.\n\nSpecialisation of llvm_value_t to allow build with LLVM this time.","sha":"082bbc7336faebea4d861cbfe637b8de65680093"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-23T14:01:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-23T17:59:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix emulation restart","sha":"c7b5bbd467cd0b998544ed645e3830e1083c6292"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-04-23T17:21:45Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-23T18:34:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel-explorer: Show bound queue to port information\n\nShow its IPC key or ID, depends on the queue's type.","sha":"72c85744b975fe04256d6b6cd98110ce814a4942"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-23T18:25:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-23T20:02:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"some more constants","sha":"41b68ef353a4289b7ad0650391e557d751bc26ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-23T18:56:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-23T20:02:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix typo causing unreachable code","sha":"4a88ffe250c891fe3d314c02ea49d0a393d73ea3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-23T19:16:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-23T20:02:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sys_prx: more constants","sha":"617d21fa84ea2a4a8e93ec774a492b82d0639f04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-23T19:16:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-23T20:46:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sys: more constants","sha":"8fd3b26308e90c4de38cc7de6fbb4c103c268af6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-23T20:43:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-23T21:19:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix broken FBO swizzle for depth textures. WDB was basically broken for these.","sha":"4c2a11b6d0e4edef24b7a26fd01f3fc59c820221"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-21T20:12:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-24T08:21:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Move unspecific Emulator code out of System.cpp","sha":"1caf81811ad8b79ef6549efda7766648bee1d68f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-24T08:42:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-24T09:46:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix formatting (somehow broken by copy pasta)","sha":"1015c126d705d5246f34d4da6d7dd7a05cdf251c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-24T09:00:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-24T09:46:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix window position of update dialog","sha":"486ba6121d1fbc151b797ff18431a5a6b428d8ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4922778?v=4","date":"2021-04-24T08:11:27Z","email":"devnexen@gmail.com","login":"devnexen","name":"David Carlier"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-24T09:55:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Mac OS build update and simplification, recent releases of macOS has clock_gettime support.","sha":"0b9e4ffe5405146e1fc9d7ec29964262172deded"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2021-04-24T18:43:09Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-04-24T18:43:09Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fcntl e0000025 (#10172)\n\nCo-authored-by: Eladash <elad3356p@gmail.com>","sha":"7197dd751a5049ab2cbfce232a5dc50a16a2411e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-24T10:48:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-25T15:17:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: add invoke operator","sha":"e34c956196abe12afdd141028beca51385c1656b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-24T11:29:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-25T15:17:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: implement make_single_value(), make_shared_value()\n\nA function that constructs single_ptr from its argument.\nType can be deduced from the argument (unlike make_single).","sha":"b704cc8375770ba03a82e41832789a547e53c866"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-24T16:05:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-25T15:17:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"u128: add multiplication support (for MSVC)","sha":"4d9a167f56025cfbacc104f30c88731a087726c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-24T12:28:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-25T15:17:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fmt: support numeric u128 formatting","sha":"b5e9f099721e3690d318c015b578a38c476d616d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-25T15:55:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-25T16:00:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Test alterable aggregates via overriding be_t\n\nChecking how it might look like without introducing too many changes.\nAlteration of its behaviour as a \"template template\" argument allows:\n - normal access\n - easier aggregate inspection\n - memory access interception","sha":"86a8e0716fb02823dd99ac524b6580a424cefb1f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-25T20:57:26Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-25T21:33:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Refactor render target code","sha":"9609767c516b039761120fc866a29a8d17254b38"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-26T18:12:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-27T19:21:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement sys_time_get_timezone syscall\n\nTry to get system timezone automatically.\nAttempt to address #10195.","sha":"a049c6fd6b097bb26c219adc2459d269d08d33ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-27T20:29:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-27T21:33:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Rename Rockband to Rock Band","sha":"f1a9f6263e1ca1fde3299c2e58d70931f4207116"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-27T20:13:43Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-28T13:53:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Make renderdoc compatibility mode a general option","sha":"8b0e1d6c03bb8ff51b658f8b84a47914f717485c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-27T21:11:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-28T13:53:02Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add support for tagging objects to ease debugging\n\n- Makes use of VK_EXT_debug_utils","sha":"1d9dd8d29d42a3e7a10ece75fedd9cf81906eaae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2021-04-25T01:08:24Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-28T17:44:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"CI/FreeBSD: stop caching downloaded packages\n\nPackages on /latest get out of date pretty quickly, anyway.","sha":"dc2ec1788636c8405bb4e2d88c4847c248a72d0f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1712979?v=4","date":"2021-04-13T13:02:18Z","email":"dsdominykas@gmail.com","login":"xddxd","name":"xddxd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-28T20:50:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Toolchain upgrades\n\nCI/FreeBSD: unbreak build with bundled libc++ 12\n\nCo-authored-by: Jan Beich <jbeich@FreeBSD.org>","sha":"64a109d28a92a7d8fb72cd256ec6b32019719220"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-28T21:07:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-28T21:07:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup for sys_time_get_timezone (3rd path)\n\nAlso simplify Linux path a bit.","sha":"703ec474f5349d6790a71e6805c3314ead276784"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-28T21:10:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-29T06:45:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify utils::umulh64 (MSVC)","sha":"b1736b641120b768d48af159a8bb309304c2184a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-28T21:13:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-29T09:21:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify umax\n\nAdd operator less and conversion operator.","sha":"5724d2d4c73de8035e28cd69544fe2ee6fa5e375"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-04-29T15:50:18Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-04-29T15:50:18Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"BUILD: Refactor libusb submodule (#10169)\n\n* relocate module files\r\n* fix cmake errors\r\n* moved & updated libusb MSVC build file","sha":"dece8a69f66bd0fba7aa1a6e0aaa070577321935"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-29T18:57:00Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-29T19:20:40Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"glslang: Update to 11.4.0\n\nFrom SDK-candidate-26-Jul-2020","sha":"6423c23a9a88d58ad3a99e076607b6c99b557862"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-29T18:57:38Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-29T19:20:40Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"glslang: Disable precompile headers","sha":"98c0b3a2b1dfd7a9d7e51ee928dc277860ae6947"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-29T17:53:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-29T19:57:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Remove redundant operators !=","sha":"f8e05f8e3c124c1511084dacdbc3de48f91d3587"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-29T17:54:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-29T20:16:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Use consteval (experimental)","sha":"3fc6375ec5010628e2d2c7af05cf76072c7d0190"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-24T13:02:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-29T22:30:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: keep focus after confirmation cancel\n\nIt was very annoying to be thrown to beginning of the list after cancelling the confirmation.","sha":"11f57f259c9143aec2aadaa41fa10f0f7f7995ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-24T12:46:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-29T22:30:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"save-overlays: change list entry contents.\n\nThere's no need to tell the user that the entry is for game xy, they are already playing that game.\nOn a real PS3 only the subtitle and the date are displayed.","sha":"5720a32bc5104599075560fa7adcda8f56d728b8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-24T14:00:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-29T22:30:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"save-overlays: add localization","sha":"14b6d6291bb1d249cfe98c03f2acf26b3b3062c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-24T15:59:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-29T22:30:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"save-overlays: add entry size info","sha":"3c37036f7ae7096941dda375b6dadde7a49581d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-24T20:52:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-29T22:30:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"user-overlays: add sanity check for enter button","sha":"035a187c425b59f0239c904a71a63a50c2b02ccd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-24T21:30:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-29T22:30:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: implement text_align::right","sha":"d331ff3193989b6067dc018e5f98b98cb8049b41"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-29T16:41:47Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-29T23:02:08Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"FAudio: Update from 20.03-git to 21.04","sha":"f1be9bbf6cc0a0bc3d0a95f6091b56ca2573aff2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-29T17:02:49Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-29T23:02:08Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"XAudio2: Update from 1.2.0 to 1.2.6\n\nMicrosoft.XAudio2.Redist 1.2.0 to 1.2.6","sha":"e192869e15f9b5d381a112edb36641cb32200fce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-29T18:31:49Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-29T23:02:08Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"OpenAL: Update include from 1.20.1 to 1.21.1","sha":"f9d52ea5b9d6acea6981a03c9ca3cbd6ed1d1fa7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-11T13:55:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-30T06:23:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GL: resharper findings (too lazy for const functions)","sha":"a50be7a91209a173e68e51aec5fdbfdc9773752e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-11T14:51:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-30T06:23:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VK: ReSharper warning fixes","sha":"1f295bba5b144dfd5fec432d02526d03d351f7f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-29T18:18:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-30T06:23:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GL: Remove unused copy functions","sha":"37425d6fcdd5a3139489bf19b8f475759cdc7d1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-29T18:28:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-30T06:23:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"rsx: remove unused tile functions","sha":"71d58e3a6729f4f42c7f416afe04cb1bcc2d2346"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T02:41:53Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T16:07:05Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"pugixml: Update from v1.9-git to v1.11.4","sha":"f0907d6f96669a04bbc4e9929082a6fa8692b095"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T02:45:43Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T16:07:05Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"stblib: Update stb_image from v2.22 to v2.26","sha":"9b083f801c345c2885b3838bfd7603cee8463dfc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T02:45:58Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T16:07:05Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"stblib: Update stb_truetype from v1.21 to v1.24","sha":"18e1b45388e64d7116882377a42e22541c7a84e7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T02:58:44Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T16:07:05Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"curl: Update from v7.72.0 to v7.76.1","sha":"d17784b231a5c6d547595033cc8c39c986e90854"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T15:42:30Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T16:07:05Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"stblib: Ignore new 3rdparty warnings","sha":"37331d8ead3261700c434f4627c131da1e1ff44e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-30T07:02:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T16:07:05Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"curl: fix visual studio build","sha":"ba35619718991a3d09b254364d2025630bd38ae5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-29T23:17:15Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T20:14:51Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":".github: Update CONTRIBUTING.md\n\nModernize it a little bit","sha":"9856f170a7ff8b1f72777783cceb5e1101da7b9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-29T23:28:51Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T20:14:51Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Update BUILDING.md\n\n- Update Vulkan SDK references to match the version currently used in CI \n(1.2.154)\n- Update Python to the oldest still supported version (3.6), also the \nversion currently available on bionic\n- Update leftover minimum required CMake version to 3.16.9","sha":"a86cce5d702e92a5181fa7f11d7be59f01bcb5a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-29T23:48:14Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T20:14:51Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":".github: Update PR-BUILD.md","sha":"2fa5f6f242951ed32539d5a08d229a92e9d719ae"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T16:18:33Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T20:14:51Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":".github: Update issue templates\n\nMention settings must be as close to defaults as possible and that game \npatches must be disabled when reporting issues","sha":"2f44523e6d5a674dc1fd12e248e93d4e66fd830c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T20:12:08Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-04-30T20:42:14Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rpcs3_version: Bump to 0.0.16","sha":"b8477a470f151ea46ec033b3c49987f5e8bec463"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-01T06:34:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-01T15:08:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Simplify named_thread construction","sha":"daa53b77cfac391130c7c232bee215a0a6c887f0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-01T16:07:28Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-01T16:07:28Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"BUILD: Refactor 7zlib (#10222)\n\n* relocate 7z files\r\n\r\n* fix MSVC build\r\n\r\n* fix cmake build","sha":"b62ac7a04651c45c87eb135ce64146b90152859a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-01T17:14:28Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-01T16:38:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix relative links to common_default* props","sha":"ca0d38d19d27d757309e9e503c9394989e791920"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-01T14:34:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-01T16:43:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU TG: Simplify state of saved SPU image data\n\nSave only entry points instead of sys_spu_image structure.","sha":"0224c7a9ebcef0765671d70b61a3dff5736cdcc7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-01T19:56:56Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-01T19:56:56Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"BUILD: Refactor curl submodule (#10228)\n\n* relocate curl files\r\n\r\n* fix cmake build\r\n\r\n* fix MSVC build","sha":"b09b0bc43b0c4d40fa27d95d8813928b2cf1349e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2021-05-01T18:57:36Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-01T20:25:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Bundle libOpengl.so.0 manually. Fixes issue #10226","sha":"1ac82546ecfb2307a574b53921efc3c2a6ffb6fb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/31934788?v=4","date":"2021-05-02T08:26:32Z","email":"herrhulahoop@tutanota.com","login":"HerrHulaHoop","name":"HerrHulaHoop"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-02T10:39:50Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Correct mismatched licenses in Crypto\n5 files in Crypto were licensed under GPL-3.0-only which is\nincompatible with our project's GPL-2.0-only license. They have now\nbeen corrected to use GPL-2.0-or-later.","sha":"c3bf9bd4a0c2ec58ce11e0fe3cbb58c67bde1c06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-02T17:59:38Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-02T17:59:38Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"BUILD: Refactor asmjit submodule (#10230)\n\n* relocated asmjit files\r\n\r\n* fix cmake build\r\n\r\n* fix MSVC build","sha":"df39bac4499c0921be68c9c3d5fc3c8d9bdb7fb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-02T19:59:32Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-03T06:01:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"buildsystem refactoring cleanup","sha":"c6c5faa95cc40a6d88e5842858aae47ddf89e04a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-03T20:08:26Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-03T23:27:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"changed USE_SYS_LIBUSB to USE_SYSTEM_LIBUSB","sha":"1745c8c607c6009e2bbca15d88a7b00cdc68b740"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-03T20:10:12Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-03T23:27:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"relocated discord-rpc cmake","sha":"7ab13a44d77b5111690cbf6163e88e6832a99978"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-03T20:35:43Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-03T23:27:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"relocated stblib files","sha":"2447fdb90d1f67c62fdcd95fe74b9f95d818a6e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-03T21:09:38Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-03T23:27:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"relocated openal cmake","sha":"f27325fd98685599f6b1c0ac9754dd848408b051"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-03T22:05:11Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-03T23:27:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"changed discord-rpc to discordRPC","sha":"35ee550171fc347179d4a7eadbea4bc056a13d44"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-30T14:18:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-04T06:53:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native: add cow flag to map functions\n\nCoW is copy-on-write mapping type.","sha":"e327d4716938bc1dba7293f397c1aea593de7525"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-04-30T14:28:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-04T15:02:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: add \"hook\" memory (32G)\n\nImplement overcommit emulation for shm.","sha":"1b0b2fe21e56b3a650c90e2ee2a7f4a5eabca5e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-02T15:16:29Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-04T15:02:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement s128 type (based on u128)","sha":"327c000c8215f83aae589cf1b2a9016a8b3c26eb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-04T16:18:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-04T16:18:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: disable locking main/video/stack for now (TODO)","sha":"546b52200b7c0d00edbc22d55a7b4bb1b9497f94"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-05T07:42:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-05T16:38:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs: implement fs::get_temp_dir() (Win32)\n\nTrying to workaround issues with sparse files (#10231)","sha":"e24ada37bfd758263561a68771476f63b1db85e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4922778?v=4","date":"2021-05-07T00:26:21Z","email":"devnexen@gmail.com","login":"devnexen","name":"David CARLIER"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-07T00:26:21Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"stblib: disable another unsupported clang warning (#10244)","sha":"f56ecb6d3ff43009178fcbb840b831f817e7fbc8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2021-05-07T02:14:31Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-07T02:14:31Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Remove libopengl.so.0 hack, and use LEGACY CMake OpenGL option for AppImage builds (#10234)","sha":"a043e95d24f607c196d050ade8ae3f9533a32b0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-07T06:58:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-07T06:58:30Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"LV2: Improve IPC support (#10206)\n\n* Remove custom event queue's IPC management of favour of universal LV2 approach.\r\n* Move ipc_manager to FXO.\r\n* Fix ipc_manager internal storage memory leak: deallocate entry when IPC object destroyed.\r\n* Rewrite lv2_obj::create to be simpler (remove many duplicated code).\r\n* Always execute lv2_obj::create under both IPC and IDM mutexes at once (not in non-atomic single-steps). Fixing potential case where concurrency can cause IDM to contain 2 or more different objects with the same IPC key with SYS_SYNC_NOT_CARE (instead of the same object).\r\n* Do not rely on smart ptr reference count to tell if the object exists. Use similar approach as event queues as it makes error checkings accurate.\r\n* Optimize lv2_event_port by using std::shared_ptr for queue which wasn't allowed before.","sha":"7b6482c01ded4069dc8d20e911bb7f6a2a84cb48"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-07T08:07:42Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-07T08:07:42Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"BUILD: Refactor libpng submodule (#10238)\n\n* relocate libpng files\r\n\r\n* fix cmake build\r\n\r\n* fix MSVC build","sha":"ce94a4eceae1aa66c5a2907a5212d073969263a4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-07T08:34:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-07T08:34:25Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_event: Typo fix (#10246)","sha":"900ebf6583e26e36ff88a6c2e659c9371ff2656b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-07T10:08:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-07T11:58:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"LV2: Fixup for IPC\n\n* Fix typo in lv2_obj::create.\n* Always save ipc_key as 0 for non-shared object creations, regardless of thbe value set by creation attribute.\n* Show IPC key of shared memory (sys_mmapper) memory objects in kernel explorer.","sha":"64997662d27ab5b4db138c8a0c3a341fd1c293be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-07T20:10:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-07T20:51:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: allow renaming of the current user\n\nSince the dialog cannot be opened ingame, there should be no reason to disable the rename user option.","sha":"96fa53156651b69cb8a2afa1e3ea90261c9ac311"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-07T20:29:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-07T20:51:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VS: fix some filters","sha":"52930a7597d3c741e88674ddcbd06c19147b1944"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4922778?v=4","date":"2021-05-09T07:05:48Z","email":"devnexen@gmail.com","login":"devnexen","name":"David Carlier"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-09T07:25:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"couple of warning build fixes","sha":"b09970f1591fe1c6cc14b2861f28837e907cac90"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-07T17:48:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-09T07:58:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_event: Save ID of self event queue","sha":"363cc60c82fafbf436a9f1ee56981fcc20295b5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-07T18:55:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-09T07:58:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_interrupt: Save ID of self tag/handler","sha":"1e1880893a2f4be0566af4c4cfca32b647879833"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-07T19:19:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-09T07:58:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel explorer: Implement interrupt handler/service information","sha":"7a4918e4a4ece9112012507401757405c21050d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-08T17:08:25Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-09T07:58:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"event queue: Structure size efficiency","sha":"31b55e0030d35e20f8afd2f27becfbf143d3d169"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-08T07:47:09Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-09T10:07:47Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Ignore write-to-self via blit engine.","sha":"b085284c5511bcf0aa3de2e991b909c035ffe083"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-08T16:08:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-09T10:07:47Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Handle transfer_read differently from transfer_write\n\n- Transfer writes are expected to clobber surface cache contents. Do NOT reload from CPU memory for writes.\n- TODO: During transfer write to surface cache objects, lock memory if it was unlocked to avoid silly problems.","sha":"e3944bc67fdd6ae542aae4b2fec75441f7f804a5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-08T16:08:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-09T10:07:47Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Allow flipping without wait","sha":"0b18ec8208d90bb9a70dabd0f035b43f549c6766"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-08T16:09:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-09T10:07:47Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add some more debugging utils for RDC captures\n\n- Labels make life so much easier","sha":"a4f4b81e6b0c00f4c30f9f5f182e5fe56f9fb03c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-09T18:16:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-09T18:16:14Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Move sys_rsx info to rsx::thread (#10258)","sha":"acded1e08a5207fb050425f3128abcf353db8834"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-09T12:41:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-09T21:39:28Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Don't fatal on sparse file initialization failure\n\nAlso try two different locations (Win32).","sha":"0bd64a0e72864ab9b49c7a5d9306132ee988161d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-11T19:09:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-12T09:12:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"fs: Optimize filesystem handle reconstruction","sha":"f7b845d49c10806d1d076915c8fbb0c834532ef5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-11T21:44:40Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-12T09:32:24Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix transfer barriers not triggering resolve target initialization","sha":"1a73b0a0da30fac8d2c3726c22793955153eae8b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-11T22:27:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-12T10:04:09Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Ensure MSAA surfaces are in RW state before attempting to transfer data.","sha":"675c9a7945e047b2426eedb6f62179bef8a2c4b7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7278312?v=4","date":"2021-05-09T18:32:16Z","email":"polluxyz@gmail.com","login":"octopoulos","name":"octopoulo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-12T12:28:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Intel GPU shader fix","sha":"b8928d230aa2256c493088d3677501963b496ff8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7278312?v=4","date":"2021-05-09T18:36:21Z","email":"polluxyz@gmail.com","login":"octopoulos","name":"octopoulo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-12T12:28:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"reverted comment","sha":"fe17c83020533ac12b3c4dd8321aa46850d8610a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-12T15:39:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-13T07:23:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native: improve sparse file handling\n\nDon't specify O_TRUNC every time.\nAdd portable support test (Linux/Unix).\nUse PAGE_WRITECOPY (Windows).","sha":"126141cdce5c7471a8bff1253dd51b6f825023a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-12T15:41:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-13T07:23:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Enable -Wattributes warnings","sha":"5b6537674fff252762735fc3990ffabf258221e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-12T15:44:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-13T07:23:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"lv2_obj::create: fix pessimizing move\n\nCould have been preventing copy elision.","sha":"8ae727ca0493e1171dc3e9688fd4769240ac7a4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-12T15:41:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-13T07:23:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement const_str_t<> helper","sha":"f0ad20a2506c36493dee63d0e1b7f9539a315601"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/25939765?v=4","date":"2021-05-13T08:34:37Z","email":"25939765+Cereal-Killa@users.noreply.github.com","login":"Cereal-Killa","name":"Paul"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-13T08:34:37Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Add Intel's Rocket Lake 11th gen cpu. (#10205)\n\nThis does nothing but may be required later.","sha":"4e12e70929a28b6eae3709752f441be2b65247d7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-13T10:49:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-13T10:49:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix page mapping rights to file mapping","sha":"2a26bc66680baf5c6781a14e708e8295f3e62eb9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-13T13:18:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-13T20:16:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM commit\n\n* Improve (V)PMADDWD detection (should fix #9999).\n  Implements #9999 in a different manner.\n* Update PreserveAll CC to save full AVX-512 state.\n* More fixes for gcc-11 (actually workarounds).","sha":"cdf25d902a19d9a7eed755a93563765ca18be863"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-13T20:14:27Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-13T20:16:53Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU LLVM: improve MPYH instruction\n\nRewritten to use 16-bit multiplication, as in SPU ASMJIT.","sha":"6dca58837033b7850cd5747643390070e931d89c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-14T08:21:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-14T12:35:07Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Emulation stopping bugfix","sha":"cacb852a1e4b37178dc300026e0a10b2c205ea00"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-14T11:21:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-14T21:31:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Optimize SPU ports/queues","sha":"56471f4ad407a1d5d508ffe7fb5a3e3f56b52c8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-14T12:09:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-14T21:31:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"CPU Profiler: weak_ptr -> shared_ptr","sha":"94e2f464e336949218289ee4a3fe32eb47fa907d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-14T12:18:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-14T21:31:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"cellAudio: weak_ptr -> shared_ptr","sha":"a992a5fba9eb878a4966962a341bcbe742a4784c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-14T12:24:41Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-14T21:31:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_spu: weak_ptr -> shared_ptr","sha":"47436bd774ca856492787a3a5befd0ba111f2b3f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-14T14:46:16Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-14T21:31:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_timer: weak_ptr -> shared_ptr","sha":"33580e0aa136c084e43e3739105cf33a6141128d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-14T14:55:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-14T21:31:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_interrupt: weak_ptr -> shared_ptr","sha":"c681395fb2584157fcc3d90a9b18f608faba9c4b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-14T17:10:47Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-14T21:31:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Remove lv2_event_queue::check(weak_ptr)","sha":"8bd58b1ad4f4dc58653d0692128c403129437777"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-12T05:12:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-15T06:00:12Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel-explorer: Implement SPU ports/interrupt tags information","sha":"7a9a46e0930840c5942193cff2aab1707a62cbfa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-15T18:20:12Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-15T18:20:12Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"BUILD: Move buildfiles & improved prop includes (#10251)\n\n* moved buildfiles to subdirectory\r\n\r\n* fix msvc build\r\n\r\n* fix cmake build","sha":"11bace8804e5a0541ba4575bebf29fc2a8b68d8e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-12T21:56:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-15T20:51:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Refactor program texture state handling to be persistent across shader swaps","sha":"c5a06dab0a9404c627bba187e0d8534a1566cfba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-12T22:02:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-15T20:51:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Update cmakelists","sha":"af05ebe4282c26abd2b22fc8751d772e64d6e05c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-15T18:45:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-15T20:51:12Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fixup\n\nFreeBSD + concepts = fail","sha":"a84cf030bbff20ec9d89853b738d4d0fce7444ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-16T06:07:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-16T06:31:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix azure builds","sha":"73b77525eb19cfbb2b3758cac8e114b3f19f0c0c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/31934788?v=4","date":"2021-05-16T10:42:42Z","email":"herrhulahoop@tutanota.com","login":"HerrHulaHoop","name":"Hula Hoop"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-17T10:15:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Make RPCS3 license explicit in README","sha":"13e2f26a67309613b1ac4de166d0d204690b8b5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-16T04:52:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-17T10:17:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"lv2: Fix overflows of periodic timers","sha":"2e28e2d2935e9dcff4d4ff6cbbe090e0736b4be1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-17T11:22:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-17T11:22:27Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Move HLE table address to FXO (#10284)","sha":"57cd4ff3c6cde7722c69490f591d762e95de0bb3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2021-05-15T10:30:38Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-17T13:59:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Optimize branching\n- Detect a pattern where vpmovmskb and a check against the sign bit can be used instead of checking against zero","sha":"52780e65e71ffba0eb636b9fc6eac056c75f55ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2021-05-17T15:02:07Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-17T18:29:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"3rdparty: Fix building with system wolfssl\n\nIt only installs a .pc file and nothing cmake, so we can use pkg-config\ninstead.\n\nhttps://github.com/wolfSSL/wolfssl/pull/4043 is required when building\nwolfssl against gcc 11.\n\nSigned-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>","sha":"f6a70e2e085b20ba52804e223f3b1d48bd844d65"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2021-05-17T15:03:34Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-17T18:29:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"3rdparty: Add option to build against system flatbuffers\n\nSigned-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>","sha":"8f271861f5527790fd93cd90dcfcc25031a38c77"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2021-05-17T15:03:43Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-17T18:29:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"3rdparty: Add option to build against system pugixml\n\nSigned-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>","sha":"8ed42410bf362453199d92a196fc6e1302623792"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2021-05-17T15:03:47Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-17T18:29:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"3rdparty: Add option to build against system xxhash\n\nSigned-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>","sha":"73982009809ba3156fd4fb48813ff8ece72333a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-18T10:31:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-18T10:31:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm: disable sparse files on win7","sha":"6e497ae372b6d7b39f38f42cbafce3b1b06040d3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-18T14:27:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-18T14:27:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update LLVM\n\nIncludes some fixups and more PMADDWD/PMULHW detections.","sha":"e91dd3e373ae5e8a9fbab315edf9bf0297a2f86c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-18T18:40:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-18T18:40:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"bs_t<>: add all_of() and none_of()\n\nConvenience functions.","sha":"d3b0a3dc4654f553c714c970435865f442e4bfdc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-18T20:21:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-18T20:21:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Downgrade LLVM to previous commit (fixup)","sha":"cd7253bac9c8f8599d351eab56511d4bedbf8aec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-18T21:32:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-18T21:48:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Simplify error_code class\n\nRemove \"not an error\" detection trait. Use fixed CellNotAnError class.\nUse constructor overload to disable reporting it.","sha":"8217840accab93dd99f57357c0b08b61426445a8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5477973?v=4","date":"2021-05-18T15:14:30Z","email":"jerome@prmntr.me","login":"Lctrs","name":"Lctrs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-19T16:55:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"metainfo: make license explicit","sha":"ffc9211ce2e760d3b80ff6fcf553f0290814272d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5477973?v=4","date":"2021-05-18T15:15:03Z","email":"jerome@prmntr.me","login":"Lctrs","name":"Lctrs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-19T16:55:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"metainfo: move away from deprecated appdata","sha":"0042f4e16eb8908ef3fb76fd36bf088ee46bdc05"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2020-11-26T16:48:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-19T18:24:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Minor change in msg_dialog_frame\n\nThis shouldn't have any impact","sha":"7832acbcebda806bc754f09a5fddbc56bda5ba71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-19T18:19:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-19T19:09:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"edat: Remove redundant logging","sha":"1dc00ccedd106d8f9bf1ba6f9d0d9bf5c410fe8d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-19T17:04:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-19T19:41:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Add supporters","sha":"4b11a4256e73e4cb11d1dc398cc6056b74da8ad8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-19T17:07:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-19T19:41:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Update commits","sha":"88bfd3c3a763fde168494585a96b1cc903592188"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-19T13:34:31Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-19T19:41:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native: sparse file fixup (Win32)\n\nClear file if it occupies blocks.\nMakes it more fool-proof and fixes possible bug.","sha":"16620f6835ea815d35282a221ed4d327f723849d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-19T07:12:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-19T19:41:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Improve error_code (new formatting constructor)\n\nMinor cleanup in formatting utilities.","sha":"1d0f6eebdc66dbc1ef983c18bb4237075feed478"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-19T11:30:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-19T22:08:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"logs.hpp: refactoring (logs::message)\n\nMake .error/.warning/... callable objects which can be pointed to.\nMake .always() more hard to access.\nMemory layout optimizations.","sha":"04cac6cd33be679d92f898bd53628299ddd56231"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-20T04:00:22Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-20T06:25:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"Improve get_current_cpu_thread()","sha":"638f20c80f3d5cf99320f57cc9b73ac6f06b168f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-20T06:24:31Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-20T06:25:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"Update sys_rsx_context_attribute","sha":"3abf14beef761800401afd0d1813451fad38d4c1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-20T06:25:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-20T06:25:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"Fix bug of sys_rsx_context_attribute\n\nMistake of reversing.","sha":"0811d2d527846efcb859167b3c035dfbf5a01df5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-20T10:21:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-20T11:38:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix bugs due to clocks scale setting being dynamic","sha":"f0c4aa6777196ca32e4d029ec4b0de2a9722b716"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-20T16:10:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-20T16:10:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"logs.hpp: fix fatal typo","sha":"de94f6c2f69b0e54591bab5e41b04ab26db54e29"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-20T21:02:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-20T21:41:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"logs.hpp: another fixup for RPCS3.log\n\nDon't print channel names for initial messages.","sha":"c646476ca8076727a9f290b51b94cd1d8f74e1c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/4922778?v=4","date":"2021-04-18T18:33:38Z","email":"devnexen@gmail.com","login":"devnexen","name":"David Carlier"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-21T13:34:38Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"crypto light refactoring.\nusing volatile f/p guaranting assembly will generate call* instruction on memset for secure buffer zeroing. usage in sha1 api as well.","sha":"1f93fc902b89fe649b96f7831b9617f95809b486"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-13T13:36:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-21T13:43:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"TROPUSR: Loader Improvements\n\n* Replace invalid TROPUSR.DAT with empty new ones. (+report an error)\n* Fix return code of Load whenever TROPUSR.DAT hadn't existed before.\n* Add header magic test.\n* sceNpTrophyRegisterContext will abort if TROPUSR.DAT generation failed.","sha":"48870f3e8bae9441c43ab096863909a05f92a5a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-03-13T13:42:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-21T13:43:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"TROPUSR: Optimization","sha":"3a2b9f83ec471c09909653d0ea677a90c8cacead"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-21T07:57:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-21T14:37:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"kernel-explorer: Fix horrible performance","sha":"a7d0c4fb1e5e3a3d85628f0425d55baada53a218"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-21T05:48:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-21T16:12:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"kernel-explorer: Implement PPU scheduler state information","sha":"dcfd29c2d9e911d96b1da5d6dced5443c525de52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-21T13:48:39Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-22T05:16:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native: try to workaround another bug (Win32)\n\nResize sparse file gradually.","sha":"613777afdea3d491b5121a97906c3669357f5bb4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-22T07:35:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-22T09:10:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"types.hpp: implement smin, smax, amin, amax\n\nRewritten the following global utility constants:\n`umax` returns max number, restricted to unsigned.\n`smax` returns max signed number, restricted to integrals.\n`smin` returns min signed number, restricted to signed.\n`amin` returns smin or zero, less restricted.\n`amax` returns smax or umax, less restricted.\n\nFix operators == and <=> for synthesized rel-ops.","sha":"160b131de3d689d29b3af2f7940ae9e3a894a0f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2021-05-22T10:36:23Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-22T10:36:23Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Bump gcc to 11, shellcheck and SDL2 (#10324)","sha":"18627960d7d71d1e7212053919fa6a185773688e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-22T17:42:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-23T02:37:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel-explorer: Save self mem-container ID and use it","sha":"309759b725bd23bcb30466d949a57f761969c3de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-22T11:26:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-23T04:33:19Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"types.hpp: replace custom std::bit_cast\n\nRemove memcpy version.\nUse builtin instead.","sha":"2768727e2fecbeb501968ca2cb1dcafd3658653b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-22T13:41:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-23T04:33:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"types.hpp: rewrite _u16-_u64 suffixes\n\n_u48 is unused and gone, blends into _u64.","sha":"4b239a0b878bb9c3e992b90771191921737e202a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-22T18:46:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-23T16:43:51Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"types.hpp: implement min_v<>, max_v<>, SignedInt, UnsignedInt, FPInt concepts\n\nRestrict smax to only work with signed values for consistency.\nCleanup <climits> includes.\nCleanup <limits> includes.","sha":"2491aad6f2caa5cd1138e244021d28564c3b11f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-23T17:50:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-24T15:21:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native: improve sparse file implementation (Win32)\n\nFix sparse attribute set/check, improve logic.\nImplement actual check of file data.\nAsk to restart RPCS3 first time (Win7 bug).","sha":"191cb9230003d5ccd611b9de46c45a2a8678c128"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-24T08:06:26Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-24T15:21:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native: improve sparse file check (Linux/BSD)\n\nUse lseek(FIND_DATA) to check for sparse file support.","sha":"5db38c01274ea484acfa2f6006226a75f1c72afb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-22T02:54:52Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-24T20:16:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_mmapper: Fix IPC-enabled instances memory consumption","sha":"9ba3e6d3f792d0d6c8b0257758f369ea17d48e36"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-25T06:51:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-25T06:55:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native: fix Linux/Posix sparse file check\n\nFix fast path condition (xnor is not ==, facepalm).\nIncrease probe size.\nShould fix #10334\nCloses #10335\n\nCo-authored-by: Jan Beich <jbeich@FreeBSD.org>","sha":"7311c161f6adaee92d51f63ac4760b3e84a2370e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-22T19:36:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-25T08:04:45Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"perf_overlay: update interval config update","sha":"ac5907307190874c068223fbb71f82aac6b173dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8901018?v=4","date":"2021-05-25T14:50:04Z","email":"jedistephen@hotmail.com","login":"JohnHolmesII","name":"JohnHolmesII"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-25T15:45:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"CI: Add FreeBSD 13","sha":"c882c8f417acbc6dcff7eae39e3d97dfc2894214"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-03-13T09:42:10Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-25T17:54:17Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add workarounds to disable incompatible options","sha":"7508949ca89259b71e8f257d23c601fd5294287c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-25T16:10:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-25T17:54:17Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Avoid repeated chip_class lookup by using generic global function","sha":"122bb4d8291f5a6b4662f9c622b124010692db1d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-25T16:18:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-25T17:54:17Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Lock passthrough DMA behind the async streaming option\n\n- Without async streaming this option can introduce artifacts.\n  The correct fix for it is to use async streaming which allows the GPU to process texture data in parallel with rendering.\n  Without streaming enabled the GPU can sometimes pull stale data via DMA when rendering and find the CPU has modified it.","sha":"156b092dc9bcf71831f7aa9a66ace9483b2c0ed2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-25T17:04:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-25T17:54:17Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Use backend configuration to track options that can be modified on a per-device basis","sha":"a736350859f74080cf78e34f0c8825bba36a6555"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-25T19:40:53Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-25T19:40:53Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: Fixup on linux + RADV combo (#10341)","sha":"338dc62474cd49e3e596223f920fc483fef8258d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-22T06:02:30Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-25T19:47:23Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Simplify PPU exit","sha":"44f0ca08e28c078fcf684c0e8902dcead6105f5c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-25T22:16:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-26T18:31:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"scale debug overlay based on current dpi settings\n\nDepending on the dpi settings, the debug overlay was almost unreadable.\nI also took the liberty to refactor some redundant client size calls and to add some margin to the left of the debug text.","sha":"83d3658ef01f61204ac5fa1dc8b8fd54c5ca481e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-26T19:03:53Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-26T19:03:53Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Refactor hidapi submodule (#10346)\n\nCo-authored-by: Megamouse <studienricky89@googlemail.com>","sha":"177933e212a6ef5974871b4663ac65abeaf225cd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-26T19:21:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-26T19:43:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Set min gcc version to 11","sha":"5b4631dcf91a4942d0ec9b11e4b9d9845a3cd438"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-26T20:38:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-26T20:38:17Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_prx/overlay: Fix disambiguator of module names opened by FD (#10340)\n\nDon't append zero offset.","sha":"f103004aa00229917a7facb194ab5a345663cf52"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-19T19:14:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-26T21:26:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"perf_overlays: add avg and 1p high/low","sha":"98b668b3a8772c4eeede25423fbbbabad9815394"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-21T20:07:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-26T21:26:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"perf_overlays: only compile dirty graphs\n\nThis should give a small performance boost","sha":"befd38d9ae5ab17a823b4ba007058ec408281946"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-21T20:31:10Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-26T21:26:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"perf_overlays: only calculate metrics on update\n\nThis should give a significant performance boost","sha":"6fed80333cab00bf6300479f0e4d8ea6077c32a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-26T19:59:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-26T22:27:15Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Workaround for slow bo transfer (pinned<->VRAM) when using RADV\n\n- perf shows extremely high number of cycles wasted in memmove glibc method","sha":"56f7359da4a7f9105f1b0ab624040ec803eec2d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-27T18:16:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-27T19:49:13Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix slow bo upload + copy when using RADV\n\n- This reverts commit dbcf1b5a03bfef18f404aa6827515af319abd744.\n- Avoid unmapping buffers used for GPU upload/download. It is very slow\n  on some platforms.","sha":"f9d9d12f11dc10bc86d1928439252d5929d77ba4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-27T22:03:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-27T22:03:46Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: Forcefully unmap DMA blocks before destroying them (#10359)\n\n- While the vulkan spec explicitly allows destroying mapped blocks, GPUOpen vma_alloc does not.\r\n- Strangely, this issue does not afflict linux users, only windows.","sha":"763828837b3f8a4605b90ef2a384376e2c369d31"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-27T22:44:07Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-27T22:44:07Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Minor refactoring (#10358)\n\n- Fix some misnomers.\r\n- Allow finer grained control over texture section creation routines.","sha":"9e62e98f798b534ccb89910eb47a3ba1c82caab5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-27T19:50:09Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-28T17:25:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix reservations handling in logs\n\nRemove reservation cb.","sha":"5f47730fc010267e6ac8e8be16a376674ac82764"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-28T08:56:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-28T17:25:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix cpu_thread::check_state() cpu_flag::temp support","sha":"6ff9aab2ca5f3f6035db9471bb2f0a1eb7aa0972"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-28T09:35:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-28T17:25:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"cellPad: do not use recusrive mutex","sha":"7d8993862471ff4d81f927e78c7b64f8d4b9cc7f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T04:27:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T05:43:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"try to fix pad interception","sha":"046d029e89fe6c325232a0fa51ff40006b0a72da"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T01:30:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T06:17:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"perf_overlay: fix guide line locations\n\nThe guide lines falsely started from the top and not from the bottom, as all datapoints do.","sha":"210999b8744676ec6f99520391cdbe803d7dba0d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T01:55:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T06:17:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix some warning spam","sha":"f18e80e899f7996e0525b785c892fcf77cc7052b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T05:37:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T06:17:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"VS: fix libPng ProjectReference in emucore","sha":"0d64b0f94d0d3d313331025c7b58e226768a830b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-05-29T06:47:51Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-29T06:47:51Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"BUILD: Refactor glslang submodule (#10361)\n\nCo-authored-by: Megamouse <studienricky89@googlemail.com>","sha":"7c7cc3914dc83dc7634275eaf196d105ecfea22e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-26T18:29:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T08:09:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"overlays: move more code to cpp","sha":"5a0b93742cad43f81ea418b09712a0e85940d1c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-27T18:28:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T08:09:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Include limits.h","sha":"99af70ae5958384fc7a99c983611e820192a8ab0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2021-05-27T06:55:49Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Malcolm Jestadt"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-29T10:07:35Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Expand branch optimizations for more instructions","sha":"7c2b08b9b67a257fb642291cf72e0a8e4cf94ca7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T08:23:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T10:46:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellVdec: silence \"Unsupported time_base\" error log spam","sha":"a2da5250644ff1eca454525a8db2147ffb72988d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T09:45:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-29T10:46:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"pads: Remove outdated DualSense battery note","sha":"3cbe42df0a0264f676a280a03b48aeb8c6e03579"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-05-29T10:39:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-29T12:26:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU LLVM: Add missing WRCH PC updates","sha":"d81a5b1423e236d4df05190e867a1d2d5d43d9be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-29T15:30:06Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-29T15:32:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"types.hpp: add PtrCastable concept","sha":"eec95786193c198b9a8a1e9ef0eb76a94aecde57"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-29T08:21:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-30T12:07:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"shared_ptr.hpp: don't use fake objects\n\nThis lifts the limitation for casting with abstract classes.\nUse new C++20 feature (constexpr allocator) to test viability.\nAdd SamePtr concept to types.hpp","sha":"f5e529db619e903278f6dea4fbc35a14d0a270ef"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-05-30T14:10:46Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-05-30T14:10:46Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Replace gsl::span for std::span (c++20) (#7531)\n\n* Replace gsl::span for std::span (c++20)\r\n* Replace gsl::byte with std::byte\r\n\r\nCo-authored-by: Bevan Weiss <bevan.weiss@gmail.com>","sha":"a49446c9e993404380151001a082c3ae5122ee7c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-29T11:54:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-30T19:35:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve compatibility with sub-par drivers and hardware\n\n- Adds workarounds for INTEL + MSAA\n- Adds support for younger drivers where all features may not be\n  implemented.\n  Things that won't out-right break the emulation can be\ndisabled.","sha":"9199b1b1d8164da057efeb01c3f5bbd4e0d395ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-30T17:53:13Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-30T19:35:34Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Validate pipeline state before compiling in case of shader cache moved between GPUs/drivers","sha":"4a32b70aecdd18ff58db74154e7b6200c47c7990"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-30T18:13:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-31T12:31:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Don't use -fconcepts anymore","sha":"63210449c6dc31724aed342e9218a5a76c2c8088"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-30T20:23:56Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-31T12:31:20Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm::ref: remove erroneous default constructor","sha":"d8628174856fbab7534b867981f4978b712e63a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-31T12:25:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-31T12:46:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"span: implement as_span workarounds as utils::bless\n\nMinor cleanup.","sha":"a1608b636f0e1e054c668b16f3cc74c7be4e0d6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-31T18:45:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-31T20:01:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"impressive typo fix","sha":"ac83871214cbf7df9d706ff4576dfb64f8fce47d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-31T18:46:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-05-31T20:01:13Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"remove cirrus FreeBSD 12.2 build","sha":"a7d4da25a4da8c2e131e1af04c7d5e708bf34303"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-05-31T20:52:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-01T07:31:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix game list custom config icon refresh\n\nI accidentally forgot to update the custom config icon after custom config creation/removal.\nThis happened during some refactoring back in mid-april.","sha":"20e25cd928b538e536325c4e3173716efa99a5d8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-06-01T07:53:58Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-06-01T07:53:58Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"BUILD: Refactor spirv submodule (#10384)\n\n* relocated SPIRV files\r\n\r\n* updated gitmodule paths for Vulkan submodules\r\n\r\n* cleaned up Vulkan child builds\r\n\r\n* updated gitignore","sha":"b8b5b93b63c959a28cd5358998bd3b0c8a46f732"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-31T19:59:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-01T09:54:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Enable use of input attachments","sha":"f85881c18c338d3c8d47e6485ec106f785def287"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-05-31T20:51:14Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-01T09:54:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Rewrite partial clear shader\n\n- Completely removes the feedback loop and replaces with hardware channel masking","sha":"98f534b1bddf6a140709da37744650d8b52fa8c0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2021-06-01T08:54:47Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-06-01T15:41:57Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Explicitely include CMakeDependantOption for CMAKE_DEPENDANT_OPTION","sha":"0fc3e5fa1e5e46e8ea4729c2a1dc8e11d7410276"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2021-06-01T08:56:08Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-06-01T15:41:57Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"Bump GLIBCXX version requirement to 3.4.29 thanks to using brand new compiler features Fixes #10378","sha":"ff8aa9112a775a5fa509b0194e5d0b9f26624314"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-01T08:40:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-01T16:42:10Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Unify .gitmodules url as relative ones.\n\nDon't specify SSH or HTTPS explicitly.","sha":"3321ada41e8005fb4d6000ca0d50baaa2ab21855"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/53271430?v=4","date":"2021-06-01T09:40:57Z","email":"53271430+Joaozin-tech@users.noreply.github.com","login":"Joaozin-tech","name":"JoãoPaulo"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-01T17:20:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Update FW 4.87 Latest Version\n\nUpdates the latest FW version according to: https://www.playstation.com/en-us/support/system-updates/ps3/\r\nList of changes:","sha":"8405314399f3e097419ff61af40de55c0bb8c338"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-01T17:28:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-01T18:18:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix span copy after refactoring\n\n- Add range check at fast path.\n- Fix typo in element by element copying.\nShould fix #10385","sha":"f2d6b52561ced66199017418911357c2db2d4dc5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-06-02T05:33:50Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-06-02T05:33:50Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"BUILD: Refactor zlib submodule (#10393)","sha":"6c44664c1934b2ed3cab8564ae6609861fe873ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-04T18:06:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-06-04T18:06:04Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix missing game licence logging (#10402)","sha":"a7f1e788e6f9fb4e9d84f2975f6691ea976c052b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2021-06-05T01:07:09Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion Nimchuk"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-05T04:46:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Revert \"moved build options to options.cmake\"\n\nThis reverts commit 5ddb1d664996cdb31872bfaab6681d4cd20f5ae1.","sha":"baa422e65b8006233589f3997786ae1b11adbe6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-05T13:41:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-06-05T13:41:02Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix sys_event_flag_wait result set (#10404)\n\nSet result upon syscall exit, not at the beginning.","sha":"11ab9b7fa96fd03ca3d90e127574604cbff9af18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-04T23:40:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-05T18:02:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement proper decoding for some obscure fragment instructions\n\nPK4UBG and UP4UBG were dropped from the NV_fragment_program spec in 2002.\nNot much information about them remains but seems pretty straightforward.","sha":"39815801aac8d50f292abbaae81d7c71bd129d83"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-05T14:27:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-05T18:02:14Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl: Add some debug visualization to internally verify consistency","sha":"6ac9e6f9c42c85553c0349d1a322f96dab2d2dbb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1712979?v=4","date":"2021-06-05T16:07:08Z","email":"dsdominykas@gmail.com","login":"xddxd","name":"xddxd"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-06T06:07:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Get rid of mobile Kepler class and add some missing GPUs","sha":"b5f1f50a16f14d45b55d60fbfb9f3f1b971adb0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-04-16T01:53:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-06T07:38:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: kind of lazy loading icons","sha":"f5366c91a7d8b80df88dd0217ebd38d40bf9bf50"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-05T17:05:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-06T12:37:47Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix expired sampler descriptors\n\n- Rebuilding when strict mode is enabled was incomplete.\n  The copy has to be redone if the source has been updated.","sha":"568af756cc26ac82ab8199016b3061808272b700"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-06T08:00:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-06T17:26:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: simplify zero padding in trophy icon path","sha":"4ab2e40d8ae9fd07456bcf2225a61f8f3eafebdc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-06T08:26:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-06T17:26:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Only load trophy icons on a need to know basis\n\nAlso cache existing trophy icons","sha":"70c24a9466a444b3b769299e6a38806157a3191a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-06T08:43:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-06T17:26:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix concurrency bug in trophy manager\n\nThe missing mutex frequently caused a crash after I improved the individual trophy folder parsing by deferring icon loading to when it is actually needed.","sha":"2eebecfb179c5033188672347f6177da7b36d12c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-06T20:08:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-06T22:03:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix surface deduplication crash","sha":"3f80d0b7d812b6b35745f527de494f025cd84a5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-06T21:29:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-06T22:03:49Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix depth/color mismatch resolve in texture cache\n\n- Sometimes we need a depth texture but only a color texture is available.","sha":"ddbe4960976c84e15b9f465e5a3c0d6d97696ac6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-01T16:13:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-07T13:28:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement serialization.hpp, remove cereal submodule\n\nBump RSX capture version, use new serializer.","sha":"2169e8d935b0f14dd00622724fd64fdb43781a46"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-05T19:15:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-08T15:26:14Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve emulation stopping speed\n\nSplit phases of signalling threads and joining them.","sha":"76bf720adf25701dd89ca17115348b744119c3df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-08T16:05:05Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-08T16:29:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixup serialization utility","sha":"e7b1fc66962e1fda5c2eee51af0f59e2bd42f731"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-08T16:08:23Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-08T16:29:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"System.cpp: Move some Emu.Stop() code to a more strategic placement","sha":"4a4f318e248dbc04034f6098e80ac1f359862faf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-08T16:12:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-08T16:29:46Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Make rsx::simple_array compatible with serialization","sha":"c918f395b912da96e2ec9f7cf7cad23938c40deb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-08T16:57:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-08T17:12:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Hotfix #10411","sha":"4f762115511077bf64910e48c59171e6f4e38c3c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-08T20:12:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-08T21:07:15Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fixed_typemap.hpp: add range iterator\n\nRemove recently added functions.","sha":"2d3fe7ce1cac50590aa05ec11aba31f600bd4474"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-08T22:37:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-09T07:55:55Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Add floor workaround for GPUs with rounding issues\n\n- Mainly affects nvidia where x/w * w can sometimes return a value smaller than x.\n  In such conditions, floor(x) will return x-1 if x is an integer which is horribly wrong and exaggerates minor precision drift to great proportions.","sha":"20bd723e7c843009f92e4789659e56eba3306728"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-09T18:03:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-09T19:35:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Properly destroy renderpass cache","sha":"cd6552d3445c8dbd1edb747127901e065c8682fa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-07T19:08:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-09T21:35:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Rebase hidapi","sha":"d0c4b2de9fbc5482062ffecc8bb7d031d53f6caf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-09T21:52:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-09T22:24:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: invalidate invisible game item pointers","sha":"27cc5c8a63db921d4b6b572f8998c2b3b54731aa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-09T21:53:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-09T22:24:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix possible race in RepaintIcons\n\nThis might also improve performance while scrubbing the icon size slider","sha":"2dc6adc03897e13e820449402aa26ff62d1f013b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-10T10:55:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-10T15:45:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix empty game list phenomenon","sha":"766cc2d42f9a10d63ee19b6bd39ce5c0a9e7dd5b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-09T16:05:25Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-10T18:16:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Implement fmt::ensure (assert-like with formatted message) + fmt::tie\n\nArguments should be provided via fmt::tie() due to some limitations.\nAllow to specify simple message (non-formatting) for plain ::ensure().\nRemove redundant function for narrow error.","sha":"696be6aacd9bdb044ef4a521795add790aadcd32"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-10T15:34:35Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-11T05:59:02Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"serialization.hpp: Fixes","sha":"0628a5d9315a9ddc07ca7cd6cbf3b822e0067ee6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-10T18:10:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-11T06:28:42Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Fix Play/Pause/Resume Shortcuts","sha":"9cbcce671d39e24a1cc78dc4c4880b310254828c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-11T12:09:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-11T13:54:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Improve bitwise serialization trait","sha":"76bfe54c7e8e695aae097052c55226d22f5538ec"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-11T07:19:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-11T16:15:21Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native.cpp: change rpcs3_vm name/location priority (Win32)\n\nPrefer temp directory, rename to rpcs3_vm_sparse.tmp\nTry to remove archive attribute (doesn't work well).","sha":"dfbd63df94c4513e1bad63763fffe9075144e21b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-12T05:53:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-12T10:14:04Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Logs: Prevent minor race in Emu.Run() regarding logging levels","sha":"cb0929d9339b7266ff4c53f4ae066364089cc819"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-12T16:12:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-12T16:12:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"vm_native: bypass rpcs3_vm creation if overcommit is enabled (Linux)\n\nUnfortunately, different systems need different approach here.","sha":"6f874be41b5c284e18d5e735690e9c30198eb0f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-13T20:34:01Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-14T07:24:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Pass vertex attributes streamed via register write in PS3-correct format\n\n- TODO: Optimize this, we can avoid the double bswap in FIFO and then in attribute push\n  Not very important since nobody is doing register push in high-performance path.","sha":"d3ff67ffb510cc6a5109bd909df36fe7efc6c0f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-12T13:04:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-14T17:02:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add missing key auto repeat checks","sha":"35a380676e869c00e9fb84f9833cce13579d99a3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-14T18:38:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-14T20:20:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup for byte order when passing data via vertex registers that are not inline arrays (register vertex data and push buffers)","sha":"c3415bcff263a22d4718da0b869af75373f2af03"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-15T12:04:51Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-06-15T12:04:51Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"lv2_timer: manage timers by separate thread (#10445)\n\nSubstitutes missing abort op for lv2_obj manager.","sha":"24e4a43ec47cbf3d9377404110753477d250ddcf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-04-18T18:42:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-15T12:42:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Refactor surface inheritance logic","sha":"78972cd611a1fc048c63606128fe89fbe3a7e2e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2020-10-20T20:38:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-15T12:42:16Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Resync excluded memory regions to avoid memory tests failing after flush events\n\n- This is a mostly correct fix, but a corner case exists that can leak old data to the surface cache","sha":"966aec7ad766b9793ce707a2a8004ea896ce6b71"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-16T20:19:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-16T21:43:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Remove unused variable leftover from refactoring","sha":"4bf970056229fce8e9e98c7544767e69c7bfe2e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-16T20:20:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-16T21:43:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Ensure async scheduler thread is never auto-spawned by fxo\n\n- This thread is a resource hog for design reasons.","sha":"9fadd48ea3ac846f86a59285fb5310d98a51f69f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-17T17:20:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-17T18:43:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fix cellMouse/Keyboard initialization","sha":"039ca6e8398889fca65e280e77bd298e4e8c3ecd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-18T14:10:58Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-18T14:47:49Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_fs: improve sys_fs_open accuracy for /dev_bdvd\n\nBased on software test.","sha":"72680c7707d16baddf48001de750bfc3412d5917"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-19T13:57:07Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-06-19T13:57:07Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"RSX Cache: Prevent crash on failure to obtain cache directory (#10474)","sha":"bbaa93c84647370fb7aad588f9eefea53f255455"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2020-10-02T15:50:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-20T16:27:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"GUI: Add PPU threads to debug tab","sha":"40493c564fd76d86ade153e941db3f65cb50ce20"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-20T17:00:12Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-06-20T17:00:12Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Fix emulation stopping in cpu_thread::is_paused poll (#10475)\n\nIgnore pause flags if thread is stopped.","sha":"0531b3d80170b671b509d0de968b03f4869edf3e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-20T18:25:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-06-20T18:25:13Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"cellCamera/cellGem: Fix time stretching setting (#10476)","sha":"aaa20c0ff0e531691663e239db5eae6b23f2be0a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-20T11:45:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-20T19:08:24Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"fs: alternative fs::pending_file implementation (Win32)\n\nUse MOVEFILE_WRITE_THROUGH instead of sync() on commit().","sha":"3c614d95b86fc617118aef5cc11797205181c217"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-24T13:47:14Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-06-24T13:47:14Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"kernel-explorer: devirtualize lv2_fs_object and print more information (#10487)\n\n* Make lv2_fs_object an \"abstract\" structure with protected constructor.\r\n* Improve kernel-explorer information for filesystem objects.","sha":"50be3bd2e5e6c6b33f0db84c35f73ad512161ba9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-17T19:39:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-25T06:41:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"sceNp: add some more constants","sha":"7e0f2f9b12f1551456f8bbac057cc5c9c3e6d6e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-17T22:23:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-25T06:41:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Qt: fix warning","sha":"f4bcf9ad1d1bcba30a064127044285247682dbc0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-19T10:40:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-25T06:41:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"move try_to_int64 to StrUtil","sha":"2c2003aa5b552b1751aa2e896444b55023a505d2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-17T20:44:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-25T06:41:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSearch: move audio info to separate util file","sha":"68a1da31a04f85408fd80e068c5eb2f4b48da3c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-24T19:26:40Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-25T06:41:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"cellSearch: extend media_info for video files","sha":"b6128c5dfae2db68e284e0981ae8dedfee671653"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-24T20:00:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-25T06:41:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"media_info: improve error logging","sha":"fad79a96a216934042c1abff70e53cd0a15f17c6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-24T20:46:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-25T11:45:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Don't leak data during partial clears\n\n- Partial clears either in active clear channels or scissor region must get barrier inserts to load previous data.\n- Fixes some incorrectly discarded data during clear where data in untouched/uninitialized channels is lost.","sha":"cd8cb9cced5fd887feaebc8ae92eed499fa45a34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-24T21:06:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-25T11:45:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Remove unused input from attachment clear pass","sha":"926fa73feecf4565ee0521475415c31fcd0a803e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16064499?v=4","date":"2021-06-25T13:25:44Z","email":"Kilowog01@gmail.com","login":"Kilowog01","name":"Kilowog01"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-06-25T13:25:44Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Trophy notification improvements (#10482)\n\n* Makes the text more similar to the original PS3 trophy notification.","sha":"d59707bc4b5ff064a0a77e6509af315d7af686b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/73825967?v=4","date":"2021-06-25T16:40:42Z","email":"73825967+Long-FA@users.noreply.github.com","login":"Long-FA","name":"Long"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-06-25T16:40:42Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Increase some icons' visibility in dark themes. (#10485)\n\n* Update custom config, controller, combo icons.\r\n\r\nCo-authored-by: Megamouse <studienricky89@googlemail.com>","sha":"400002e64cb20dcf9cc97134b1a6b567e383800d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-25T17:39:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-25T17:58:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: replace old grey config icons in gamegrid mode","sha":"e7234fd4b29c1619fe879d8d591a3d53a0283541"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-25T17:55:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-06-25T18:27:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: apply gui settings on regular apply and save\n\nThis fixes the annoying issue of accidentally clicking the dialogs save or apply buttons after changing stylesheets.","sha":"bba52857408ec3b7b5df919b4982600dd505466a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-25T19:54:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-26T11:53:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_fs: Fix ENOTMOUNTED of open","sha":"58847fa2ca08096e7e2afb3007b0b37230d5f4bb"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-27T08:43:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-06-27T08:43:48Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Improve thread aborting mechanism (#10490)\n\nCall pseudo-virtual operator=(thread_state) of thread context.","sha":"0aed00a75850b78e9c686d24cde0db8c522bfced"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-27T10:18:48Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-27T11:02:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup for #10490\n\nRestore explicit signaling of RSX thread for now.","sha":"571bdfc82863a4afa35b4730fc1145ddddd3cf2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-26T05:54:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-27T13:39:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"rsx: Improve VBLANK accuracy","sha":"dcb2e8cd9eb1971dc5386ec6a1673867d3978784"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-24T17:57:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-06-27T14:49:33Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"VFS: Fix paths override","sha":"3cbdc3a19887ebd8a3625f913e97d8b50b78c37f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-27T12:36:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-28T07:52:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement support for extended vertex programs\n\n- Some games are kinda pushing it with RSX register space and spilling VP data into adjacent unused space.","sha":"2c7c1c501d999d718c6a003ede8cab530014182c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-26T10:04:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-28T11:01:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"vm_ptr.h: Use concepts","sha":"23468a2d0772f4a267087a03290efa75d2bf7d37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-26T11:15:10Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-28T11:09:24Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"Improve ppu_thread::stack_push\n\nSave actual stack memory allocation size locally. (not in PS3 memory)","sha":"b6fccee6a4970acf2eda76979d8fc5042397ae09"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-28T10:57:57Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-06-28T11:31:28Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"msg":"Fix HLE callbacks within context of HLE PPU stack variables","sha":"9b050a33e40cffa87e9385d73d5352c981e95982"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-29T23:05:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-06-30T07:07:33Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement dynamic vertex offset updates\n\n- Vertex offsets can be updated mid-draw to dynamically render different meshes without breaking up draws","sha":"194bfc54d16cefef57456a50048d7d9847085959"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-06-30T16:39:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-06-30T19:14:13Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"rpcs3_version: Bump to 0.0.17","sha":"020fdcc781a9d279ce654eb8725b7f424c5b4b99"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-01T20:15:25Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-01T21:09:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sceNp: fix invalid ctx dereference\n\nFixes \"Buzz! Quiz Player\" Offline Gameplay","sha":"e212f16962a90e976fb9ba498b6515e16cb3c090"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-01T21:02:20Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-02T10:29:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Improve kernel-explorer's user experience\n\n* Default width of dialog has been increased to fit PPU, SPURS and filesystem objects' description length.\n* Height has been increased as well to allow viwing more objects at once.\n* Added title of the game to the kernel explorer's windows' title.","sha":"fe8d524352e19b432e0f857c34bcb84ca7e584dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-02T07:06:26Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-02T10:29:59Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"kernel-explorer: Add logging ability","sha":"a2d4bd4fff3e57a9f3a7ac170faa0dff33c0f989"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-02T17:19:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-02T17:34:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add PPU LLVM Java Mode Handling to debug tab","sha":"770a607ba5a528338723ebf031bedf85d1f8b61c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-07-08T19:31:45Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-07-08T19:31:45Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Refactor faudio submodule (#10397)\n\n* updated bad header import\r\n* added faudio shared library option","sha":"285b9dad833fbeb8cb9db2033217f544db9f01e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-01T18:01:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-08T20:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: show patch version for disc games regardless of the patch category\n\nPatches for disc games can also appear as \"TV App\" etc.","sha":"544a458f20a739f2572d560f470192a671d457d1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-01T18:36:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-08T20:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Mount bdvd_dir regardless of patch category","sha":"8f8605ab2f54b83fb01045d4b3ad5eaa9a8ca30a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-01T18:37:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-08T20:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGame: improve logging","sha":"161fa9506639b27cbfe4dcf532c3297b63f1d4b2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-01T18:39:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-08T20:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGame: treat media apps as CELL_GAME_GAMETYPE_HDD\n\nThis is kinda hacky but it fixes some errors in PlayTv","sha":"e75de44907acdb280285cbb1d19a50f79c652502"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-02T14:34:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-08T20:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sys_usbd: add PlayTV SCEH-0036","sha":"fcbacf8afdb12e754d76cebddcc3a272f633f9d4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-08T20:54:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-10T06:18:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: kernel_explorer optimizations\n\n- roughly 10 times faster update from scratch on average\n- removed some unused function\n- added fatals for unexpected node failure","sha":"7f7bd961e2fa2d9434b8eabfe8ba72c47c63cc68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-10T11:10:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-10T11:29:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add more Qt blockingMapped workarounds\n\nThis probably won't fix anything, but better be safe than sorry","sha":"f4d02613872d3ac51fea87ddd68460459f12b2b4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-09T01:47:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-10T19:20:37Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"kernel_explorer: Atomic PPU state updates","sha":"6a7324ab3ef234626112a93a1164e50e3444de27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6031700?v=4","date":"2021-07-13T23:11:14Z","email":"RipleyTom@users.noreply.github.com","login":"RipleyTom","name":"RipleyTom"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-07-13T23:11:14Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix deref in sceNpMatching2CreateContext (#10539)","sha":"a34201ebff23f05154ffbb2fc93261714d6f79cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-13T20:05:30Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-14T09:43:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"FAudio: Update from 21.04 to 21.07","sha":"8f19d11f298fb1456f2e77762a496398cdc8c393"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-13T20:07:47Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-14T09:43:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"glslang: Update from 11.4.0 to 11.5.0","sha":"0a6968cfe51ab73c01a013091acfbbb96dda3805"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-13T20:09:45Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-14T09:43:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"curl: Update from 7.76.1 to 7.77.0","sha":"f16b387ad934455e9be04624579b2b23e84785f7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-13T20:11:36Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-14T09:43:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"stb_image: Update from 2.26 to 2.27","sha":"2aec81330bd36e2d7e98c386482c9c1a53c5f1b3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-13T20:11:51Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-14T09:43:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"stb_truetype: Update from 1.24 to 1.25","sha":"3cc212940c6a077eff0594281bcfe2061edf6964"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-13T20:16:52Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-14T09:43:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"glext: Update from 2020.04.23 to 2021.04.20","sha":"b16434556175dad44104d4e0f016828c92f86902"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-13T20:25:51Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-14T09:43:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"VulkanSDK: Update from 1.2.154.1 to 1.2.182.0","sha":"89c2bb5cf1cf0c1d86f0d4a109b3e1fb21b010e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-13T21:51:40Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-14T09:43:16Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPIRV-Tools: Update from 2020.4 to 2020.5","sha":"2f361e94dd4fc20e100bc655f50a413e5ab9c22c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-14T10:05:30Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-14T10:25:05Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"azure: Update VulkanSDK checksum\n\nFrom 1.2.154.1 to 1.2.182.0","sha":"b6a0296d00e03084ccea231080e35b2f4e3049e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-14T18:30:44Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-07-14T18:51:36Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"msg":"SPIRV-Tools: Revert to 2020.4\n\nCurrently not being used, could eventually be removed","sha":"15ae06a7c46ecdaed30c6803840abc43d05079fe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-10T13:03:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-15T14:07:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"fmt: implement char8_t string support","sha":"ea0c559bc397fef59f48c698962c98237423eee4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-10T18:11:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-15T14:07:41Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"fmt: add support for std::u8string","sha":"5dfa9088355740402f5aed593eafa02acf746e85"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-13T20:34:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix invalid reference when purging unlocked sections","sha":"71a5e5333a64168c0e314667daa5c7ef9c276d67"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-13T21:26:02Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Introduce the concept of VRAM allocation pools\n\n- Each buffer or image has to declare which pool it belongs to. This will aid with memory management down the line.","sha":"88abf3a6ba932f9f59f760553de3ab38aaae2fb5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-13T21:27:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Expose memory heap sizes to the runtime.\n\n- This will help to make decisions regarding VRAM utilization instead of relying on budget blindly","sha":"342b25d00ec570fec56ed68087efc1268f4bb3f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-13T21:35:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve memory load balancing and reporting\n\n- Track pool usage\n- Take allocation percentages into account when making decisions on whether there is overloading or not","sha":"53c9fb3e00fa4d9c5387d6c055553304a3f5c204"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-13T21:57:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Rename rsx::vk_render_targets to vk::surface_cache\n\n- Makes some changes much easier going forward to pull in vk-specific stuff into vk namespace.\n- TODO: The same thing needs to happen with GL","sha":"2ffa8f4623303c7c74e63c7304dfce6fb1b07d18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-13T22:14:39Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Refactor surface cache by moving code to cpp file","sha":"000414c47de2bc81829691a020cddab97b708a66"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-13T22:19:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement VRAM spilling\n\n- The idea is to shift memory to \"shared graphics memory\" when VRAM is running out","sha":"c18e5e07cc63ad215a415df02fdedf5836295073"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-13T22:25:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Refactor VkTextureCache by moving most of the code to cpp file\n\n- Makes adding next set of changes easier","sha":"5f6d1644cf7f220ce768eafc0c8b809dfb613ba6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-13T22:26:20Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add overallocation quota for texture cache","sha":"09f9f21261235a40558be8458085e7c42d987885"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-13T22:31:15Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Minor whitespace fix\n\n- Non-functional formatting and warning fixes","sha":"77c9dff0541a7ba3f0426ce665d9754ce0a597e9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-13T22:34:00Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement a simple cache eviction routine\n\n- Can remove all non-essential textures from the cache except those passed as an exclusion list","sha":"a2f93b0696b4c4d09af3dc53b027471f55b6a7e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-13T22:43:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Switch on the new VRAM management system","sha":"d906ccc77ef1a763aa6a160f600f1b4b66c09ebf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-14T17:09:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve handling of texture cache temporary resources\n\n- Temp resources from the texture cache are used to hold composite objects being sent to the GPU and can waste a lot of memory.\n- Remove them if we run out of memory as they can linger around for a long time.","sha":"2524c35638d0d884d24797753340707fe482948e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-14T17:16:57Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Formatting fixes\n\n- Non-functional stuff, move along","sha":"369f1132f30926e5e8d47bd0e3df24efb6d3f9c8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-14T17:18:53Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix linux build","sha":"974a3c8807b2f72c650f5c57c1cd8323f1380a93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-14T19:36:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-15T15:05:35Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Clang workaround for c++20 non-compliance","sha":"aaac4c1bdee66b0053bf86895575e6177c61fb7b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-15T17:39:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-16T15:48:20Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Win32 FS: Implement support for large reads/writes","sha":"66368debf82152ce5f12e61480e9f702c331e4e1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/8377469?v=4","date":"2021-07-15T18:37:10Z","email":"mxx888777@gmail.com","login":"ZeeWanderer","name":"ZeeWanderer"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T00:52:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"[MSVC] glslang fix + vs2022 fixes\n\n - glslang - fixed wrong path to common props\n - emucore - fixed for VS2022, its a 64 bit app now\n - common_default.props - use C++20 standard for VS2022 and further","sha":"6250e478f4138225d9097953eaa37333b595247d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2021-04-25T14:23:37Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T12:39:36Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Hack for msmw2.sprx timeout.","sha":"85b33e9caedfc173bd97c0c4d9809e7e534ca086"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2021-04-25T14:18:50Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T15:06:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Stub sys_io for vsh.","sha":"c2f0fbcd82c9b340d50e358af726aa797db10c40"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-10T08:56:48Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T15:28:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"PPU debugger: Implement PPU calling history","sha":"8e2c34a00381aebf7f67b88d5a324df9877249ca"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-09T17:28:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T15:50:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Implement TAR-based directory archiver\n\n* Implement the ability to save directory contents as TAR.\n  With the ability to customize saving of specific files and also select which files are saved and which aren't.\n\n* Implement full original TAR USTAR 255 characters path support.\n* Implement file modification time and access time support for extracted/archived TAR.","sha":"1f6ca258208fe01293f9eff114c187bc7c790969"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-17T08:36:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T16:10:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Formatting Library: Implement byte arrays formatting","sha":"1e9afdc289b339e1428091b6314fe4c42bf274e4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2021-04-25T15:05:38Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T16:35:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sys_sm_get_ext_event2 stub","sha":"1e605de31ec1ade4e182fe60d982ffec48e9048e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2021-07-17T11:08:21Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T16:56:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Stub libfs_utility_init to bypass FSCK checks by vsh.","sha":"9c5c4457b688cd505450d02f54f52a9f4bac27df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2021-07-17T17:19:13Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-07-17T17:19:13Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Stub sys_fs mount functions for vsh (#10561)\n\nCo-authored-by: Eladash <elad3356p@gmail.com>","sha":"7fe15f5f8d1caf6d19a229bccc715e75d707f6a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-17T17:30:21Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T18:02:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Fixup byte array formatter","sha":"70a3c5d440bfad7cfcdeaacb7a36d29a03db077d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-17T09:30:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T18:02:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"LV2: Fix IPC key reading from attributes","sha":"81805945ce78016a6b494b997614632d5c7c43db"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-17T16:21:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T18:02:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Minor fixup of vm::ptr\n\nconst pointers shouldn't disable reading, they should disable writing.","sha":"a981c65d2ff8bf30e82c4fa786a22196e3b269dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-17T16:40:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T18:02:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"vm_ptr.h: Do not allow dereferencing for void ptr\n\nDo not create vm::ref from it as well.","sha":"9a392d2b5cdd4eb6576c293ae46492144b112c04"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-17T16:55:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T18:02:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Make little use of formatting byte arrays","sha":"59402472006920832c417054a5807ccb3a70e44c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-16T19:02:28Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-17T18:28:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/vk: Improve recovery during OOM situations\n\n- Do not spill when running on IGP with only one heap as it will just crash anyway.\n- Do not handle collapse operations when OOM. This will likely just crash and there are better ways to handle old surfaces.\n- Spill or remove everything not in the current working set\n- TODO: MSAA spill without VRAM allocations","sha":"d53f2f10fbb9cfbb2116648d5e6656b1251b2b68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-16T21:02:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-17T18:28:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix null deref in texture cache when dumping temporary storage","sha":"b7df539871f5ec8ecf4a022ee25c4d180f476440"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-16T21:22:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-17T18:28:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix nul deref in spill code\n\n- Restores code lost in a rebase","sha":"2d4df57d87d430ed9e3b43d2d66544ef53e78c5f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-16T21:36:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-17T18:28:11Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix double-spill for invalidated resources","sha":"0d87d909c6460858e5bb1b77f04c1d527b6f4667"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2021-04-25T15:16:25Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T19:35:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sys_ss vsh stubs","sha":"e75e437a4a8cbd8f9f9a60fbfee884c1361b2ee5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2021-07-17T20:06:40Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-07-17T20:06:40Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"sys_storage vsh implementation (#10559)\n\nCo-authored-by: Eladash <elad3356p@gmail.com>","sha":"441713d959bb24aedd948ad1779ece5ea2fc67f5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-17T18:09:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-17T21:30:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellSaveData: Fixup funcDone result check","sha":"6f6503ee32723ca0d6a30297e93e4ca9733baa4d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-18T07:51:01Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-18T11:23:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"PPU debugger: Add instruction disasm for PPU calling history","sha":"904ec44a8c3e130945e80bd06f7bd99cf450743e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-18T09:18:02Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-18T11:23:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"PPU debugger: Implement function names at the starting instruction","sha":"b087d79a082dfe4d74da469eb87238a7917630c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-18T11:13:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-18T11:44:23Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"rsx: Fix vertical windows' clip","sha":"6f901636bfb175748cc69be2320d9ff1c34eb9c5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2021-04-25T15:21:31Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-18T12:20:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sys_hid vsh","sha":"d099148961cc2fb4ab71ca8ca65a4a4417ac07ba"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/1056270?v=4","date":"2021-04-25T14:35:12Z","email":"clienthax@gmail.com","login":"clienthax","name":"clienthax"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-18T18:08:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"stub rsxaudio","sha":"65b2a0d5383380e9c054ff3c77feac56fd916175"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-18T19:08:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-07-18T19:08:04Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"cellSaveData/UNIX: Optimize IO (#10574)","sha":"a5c3c7d2e53253decd04db36a3a2adfd5f4c3c8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-18T14:02:34Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-19T07:28:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"PPU debugger: Make calling history detect common LLE functions trampolines","sha":"83a2f06e3a80547c6659d9446d22e9c6f7c98dbe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-18T18:06:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-19T07:28:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Extend ppu_thread::call_history_t formatter","sha":"e6e0210e73458415027055774ccd7442106860dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-18T10:01:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-19T10:37:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sys_ppu: Implement sys_ppu_thread_rename","sha":"98e40d12ef4de1790210c3a276d33589f6700963"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16190165?v=4","date":"2021-07-03T05:52:39Z","email":"16190165+Vestrel@users.noreply.github.com","login":"Vestrel","name":"Ilya Oleinik"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-19T16:20:43Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Initial implementation of sys_uart","sha":"e51d16aa37d4efa263c5e6f264fed335498fc6f9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16805474?v=4","date":"2021-07-19T19:47:21Z","email":"matimoran03@gmail.com","login":"RainbowCookie32","name":"Matias"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-07-19T19:47:21Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Include different case files on file selection filters (#10587)\n\n* Include upper-case .PUP files on firmware selection window filter\r\n* Include uppercase files on a few more filters","sha":"aa08df04553ee5015431345dc33892b649961b63"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-19T22:36:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-07-19T22:36:32Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vsh.self: Fix execution on default settings (#10586)","sha":"c84e5489f2ec95d8e46af893c5a7005db8bb4b5a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-19T21:25:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-20T07:46:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Add Boot VSH option","sha":"2a8d740d6310ab08259b8b43ce5c4dcbc0519c01"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-19T21:27:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-20T07:46:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Add VSH to BatchCreatePPUCaches","sha":"f83a8773310d308b630cf5ea617ee58e297f4624"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-19T21:43:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-20T07:46:51Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix BatchCreatePPUCaches cancel","sha":"954d83b6a04887af668e3bde2fe2ec6cc4dbe09b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-19T22:23:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-20T17:47:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"replace some random Emu.Pause with fatal errors","sha":"50354253c8fc65ac54c2272b5bed408ca2ed1e37"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-20T19:28:37Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-20T20:00:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Disable async texture streaming on all NVIDIA cards","sha":"0502f7881f81b3f9aa8b2ec0b151144500d53868"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-07-12T10:14:14Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-20T22:24:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"system faudio fix","sha":"3a026a7dc347f8624de8db58a3c2a96dbc3896fd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-07-12T20:40:51Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"p01arst0rm"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-20T22:24:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix shared FAudio build","sha":"1d85c9d2010d0a9b905b88cedcc62a4036cfa00b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-20T22:06:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-20T23:15:01Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix game window positions if the window is bigger than the screen\n\nIf the screen was smaller than the game window, then the window would pop up top right offscreen.\nThe fix itself was really simple and obvious from the beginning, just some missing clamping.\nBut I figured it might be less confusing if I add some prosa.\nEspecially because it took me a couple of hours to figure out why I made it so complex in the first place.\nBtw, there might still be some offset to the left occasionally, but that seems to be an upstream issue","sha":"66371457fd81430648c2e9302286de60194ef21e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-20T23:57:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-21T00:39:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: use last window state when leaving fullscreen","sha":"737b0dfd424c90d9d65409222a30f3283932c552"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-07-22T02:11:03Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-07-22T02:11:03Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fixed issue with SDL2 version sometimes casuing build failure (#10599)","sha":"fdc9619e7c6c2c76953985b2698dadfeae245e64"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-22T21:38:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-22T22:09:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add option to auto install updates","sha":"202aed560b616042df5cd3e0838f43ef95b31f93"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-22T21:24:56Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-22T22:09:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix warning","sha":"867f0e1f0267d9161ad821224e5bdf1c2a649e6f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-22T12:10:40Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-24T11:23:47Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Make sys_prx_unload_module use success type logging","sha":"be9be6e5c986fe7253adb16c402b00b4679bb3dd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-20T15:05:12Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-25T17:55:09Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Implement heap aggregation\n\n- Aggregate heaps of same type under one object and allow allocator to try each matching type.","sha":"59e7379010ac7664f89dec82df858001e725808a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-20T17:08:11Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-25T17:55:09Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Dynamically select panic boundaries based on resolution scale","sha":"7d3bbd3cf7c7c750c6cb7901f56302a00d4bcae3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-20T17:08:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-25T17:55:09Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Scrap minimum scratch buffer size and just allocate what is requested.","sha":"de7ed1cbe9831e68b9ed4962073ea95d46f6edc0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-23T16:46:45Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-25T17:55:09Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Make use of multi-pool memory types","sha":"69bdbe97a81132cb0233b0a6992669a5a94f6523"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-23T17:15:07Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-25T17:55:09Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix use-after-free hazard by checking if we're faulting from within the texture cache\n\n- If we're using the texture cache, DO NOT delete resources.","sha":"6a9d1edee17248ef14d64e3cf96eb5050ad144dc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-25T19:14:47Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-27T07:52:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Try to spread memory usage evenly across compatible types if possible\n\n- Avoids running into budget constraints if you just dump everything into one heap","sha":"13abe785a947119fe27227e8664a5e0e69020334"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-26T16:14:18Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-27T07:52:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Allocate enough scratch memory for GPU deswizzle\n\n- Forgot to take alignment into account.","sha":"abd8bbd6efbd3afd33afb6f099c30ae1a3d64b73"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-26T16:43:42Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-27T07:52:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Set composite images upload context based on their actual contents","sha":"92d153491789c93f5c8f31c5c293ab1bd9511ce9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-26T18:12:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-27T07:52:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Allow creating temporary subresources to fail if we run out of memory.","sha":"9d11c8cbb5bac60b124aeca720ccdf5b7c90cba2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-26T19:31:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-27T07:52:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix undefined format class for typeless helpers","sha":"99bbcd15e19bb495ef95d60b50d793500c180b12"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-26T19:32:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-27T07:52:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Force explicit minimum size declaration for scratch buffers","sha":"a4cd9e022aafb6c73a4ac01e019c1a56ac88e51f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-26T20:07:34Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-27T07:52:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix comparison between composite memory types","sha":"e5029c532b0d6deab3735174be5a49c7d678f1f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-26T21:16:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-27T07:52:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Handle out of memory errors that are deferred during texture binding\n\n- Set out-of-memory flag if we have a failure to build a subresource.\n- Mark textures as requiring reload in case of references to invalid data.\n- TODO: This is overly complicated and can be handled better with a smart restructure.","sha":"c54ddabe0b336edc0406600ca59226cf53300215"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-27T09:10:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-27T09:37:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"StrFmt: fix comma placement in format_byte_array","sha":"0aa1aff6ba5b9c83dacdb97bcf31086aee2e59bd"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-27T16:42:41Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-27T16:56:31Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix scratch allocation when doing GPU deswizzle\n\n- We have to use double the memory because the transformation does not occur in-place like normal bswap","sha":"ace187cdd03c43234099cbfdbb584268d514e549"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-27T15:51:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-27T21:59:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"RSX: fix 'Working buffer not big enough'","sha":"0a7a12bbff6e34ec897baac5a3429f5b66146843"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-26T23:29:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T08:18:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: disable VSH boot if not installed","sha":"56d46b5a499e9b1732bf55f04ec50bc20165be2e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-27T00:00:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T08:18:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: Compile entire sys folder for firmware","sha":"c390c02acb6548879c78f6757c3e518274a4f716"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-27T00:13:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T08:18:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix vsh ppu compilation and add compile stage\n\nIt was aborted immediately (hilarious).","sha":"c2c74982c4250caa82b8cb846f71d382def46633"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-27T00:43:32Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T08:18:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: compile vsh/module instead of vsh.self","sha":"f0e01ceb8f8604be33a8f36b9e91d52dbfa56a95"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-27T01:54:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T08:18:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"System: make IsPathInsideDir a member function","sha":"03a46a499e20b545127898a92ab1b0df87f3b848"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-27T02:09:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T08:18:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"System: add vsh.self when scanning vsh/module","sha":"22e51e1615b6d4ef9a8ab26436254a8d3632ff76"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-27T03:08:12Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T08:18:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Remove unused ppu_initialize declaration","sha":"bb9c063e8012150427698ebb50f877e7ad0447d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-28T21:43:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T08:18:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt/System: reset boot path after directory scan\n\nThis should fix the \"Play\" Button after batch compiling PPU caches.\nPreviously you would start the last compiled game, which was kinda weird.","sha":"2efc4812d7bc3d316b3034da6470d5756afdc3ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-28T22:40:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T08:18:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add nullptr checks in msg_dialog_frame","sha":"6dc35a3772e1ffe1573af8b14a656dec73c6d0a0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-28T23:50:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T08:18:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: abort batch PPU compilation on dialog cancel","sha":"7aca2785b6cf16be558c2420bc3bf6997da7c935"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T08:50:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T10:42:04Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: move java mode setting to advanced tab","sha":"0262076bfeddcbd00f400f79ceb004fd623b6136"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2021-07-27T22:13:35Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-29T17:48:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vm_native: enable memfd_create on FreeBSD","sha":"de6f3b56538821de6db437dd43c0886605850051"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11153579?v=4","date":"2021-07-28T23:57:17Z","email":"jbeich@FreeBSD.org","login":"jbeich","name":"Jan Beich"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-29T17:48:10Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vm_native: add workaround for FreeBSD 12\n\nrpcs3/util/vm_native.cpp:302:16: error: no member named 'memfd_create' in the global namespace\n                                m_file = ::memfd_create_(\"2M\", c_mfd_huge_2mb);\n                                         ~~^\nrpcs3/util/vm_native.cpp:34:23: note: expanded from macro 'memfd_create_'\n #define memfd_create_ memfd_create\n                       ^\nrpcs3/util/vm_native.cpp:308:15: error: no member named 'memfd_create' in the global namespace\n                        m_file = ::memfd_create_(\"\", 0);\n                                 ~~^\nrpcs3/util/vm_native.cpp:34:23: note: expanded from macro 'memfd_create_'\n #define memfd_create_ memfd_create\n                       ^","sha":"3a6399aaaa230b9e6b5ab5b71473524b963b8350"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-29T18:14:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-07-29T18:14:29Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vm_ptr.h: Improve try_read() (#10627)","sha":"d85bb3f4eb4df20be2c6f72a77d7a5b95e083069"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16029517?v=4","date":"2021-07-29T18:33:33Z","email":"git.ibancel@gmail.com","login":"ibancel","name":"ibancel"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T20:55:55Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: add fullscreen mouse lock setting","sha":"77c191df4293f80237d55fe98702716fd680d962"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-27T06:26:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-30T06:21:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix CPU Profiler regression","sha":"2f6db5802ff7ab522f77f1c0c0532cb0a5164ad2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-27T06:27:03Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-30T06:21:11Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Cache: allow to dump cache upon startup\n\nPrint also some stats (if SPU Debug is enabled).","sha":"fc5840cda6bc86a0ba20aaa43621098387c88792"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-30T06:31:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-30T06:31:36Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix some warnings","sha":"658b4f70ef48c6e8c0c59700aae1828e3c07d5f6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-29T16:21:24Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-30T09:43:21Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix a few incorrectly calculated scratch buffer sizes","sha":"f6e4cc14a27a0cbd720988eed24f9438a9c18a1b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-24T21:31:37Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-30T14:22:43Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_storage_read","sha":"a06a93d5baf39aa7505c727b6d4f530fd06826f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-30T18:30:29Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-31T13:27:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Debugger: Add some error pop-ups for invalid operations\n\n* Show error window when setting breakpoints on these conditions:\n- SPU/RSX are selected. (not supported)\n- When using non-interpreters decoders.\n- Non-executable memory is specified.\n* Do not allow instruction stepping for non-interpreters decoders.\n* Clear breakpoints when the game is stopped.\n* Fix setting breakpoints on HLE functions.","sha":"f39a0a5fbe1e95653f3c6710c7d3e5d6c66f5066"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T19:31:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-31T14:06:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"System: add progress update on existing modules\n\nThis could cause dialogs to seemingly finish at e.g. 50/100 modules because the existing modules weren't accounted for.","sha":"6527eef655a5b7bc99465eacf7dd7a7fcb48abd2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-31T17:29:36Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-31T18:47:22Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix HLE LWMutex setting - Implement dynamic initialization of HLE functions","sha":"a0c1b250b659559b10121575a318b8e6e5cff644"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-07-31T08:10:05Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-01T06:59:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"SPU Profiler: adjust accumulation logic\n\nDon't append trampoline time to verification time.","sha":"286e154d051a1c95159859f283cad1579853a786"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-01T06:40:42Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-01T06:59:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix thread time/cycles report with respect to thread pool\n\nFix all RUSAGE stats as well (POSIX)","sha":"5ba8daf5183dc6c76e964b98736d5b739101fb6b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-01T07:12:00Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-01T07:12:08Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fixup for SPU Debug mode (bad SHA1)\n\nShould fix crashes due to read out of bounds.","sha":"05d1b3605e0ba224f4c29b42c8af07023d1137ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/7755816?v=4","date":"2021-07-31T18:35:52Z","email":"linkmauve@linkmauve.fr","login":"linkmauve","name":"Emmanuel Gil Peyrot"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-01T09:21:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Crypto/ec: Make internal functions static\n\nThis reduces the size of the stripped .o by 3 KiB, and the non-stripped\none by 21 KiB, when not doing LTO.","sha":"8af694da2efc39ec8b45940d5fc71410bbd70d18"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-30T23:50:22Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-02T21:36:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Do not use VTC tiling on NPOT textures\n\n- Seems to be ignored for 'normal' textures. Mostly verified through games.","sha":"0ec526c5f1eecea5957d571e4e7ed21890b62cdf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-31T09:42:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-02T21:36:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement vtc encoding for NVIDIA OpenGL support","sha":"b3c65b7bca932ddc1e3d02c311a93596624324bf"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-07-31T14:27:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-02T21:36:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve unnormalized coordinate sampling\n\n- Improve rounding when sampling nearest neighbour. This is mostly a problem with NVIDIA\n- Implement unnormalized 3D sampling","sha":"99b6963fab159f6a15fe5f89951d9964ce5a4b35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-02T20:06:54Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-02T21:36:04Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Use c++20 has_single_bit for POT test","sha":"8aec94309302f71925c66d337a6439e097eb4031"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-28T18:34:05Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-03T06:39:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sys_prx_unload_module: fix log message","sha":"dc0a08640065701ba63e4b46325c2459a76ef563"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-02T21:24:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-03T06:39:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"ppu compilation: fix facepalm (double increase)","sha":"af89eb5404d416c77667174c6b3689ee4f7c1910"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-30T15:48:32Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-04T05:26:32Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Implement sys_spu_initialize and limit of physical SPU threads","sha":"06f4dfb9f1a22a3cb80fe2f8905d6b336fc47c35"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-30T12:22:00Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-04T06:03:17Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Bugfix of sys_lwmutex_destroy","sha":"8c3a4c260e63d509f495867ee1ef6681395059ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-27T16:05:43Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-04T15:18:59Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"PPU: Improve accuracy of \"Accurate PPU 128 reservations\" mode","sha":"f807ebf9ba5851229370ed9e8ca6734b9ebcae1a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-04T16:58:03Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-04T17:28:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix interpreter texture fetch","sha":"daa8265a4778e7ca81a839441f1b2ed771da7b5e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-04T17:05:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-04T17:28:25Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Revert use of std::has_single_bit\n\n- Zero is not a power of 2 in this situation, and we do not want to treat it as such","sha":"da3c9948e668ae2e6dbcb91183dae88272172e8a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T20:34:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T18:28:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: fix typos, add some comments and reorder","sha":"999252a80692fb1c5cc4985b42012288940c9399"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T20:33:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T18:28:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: add ext_id and SHARP_SHOOTER_DEVICE_ID","sha":"1d3f91a1b84ee79e24983d4a3d3b0cd88d785742"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T20:36:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T18:28:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: fix fake move calibration status flag\n\nApparently OCCURRED means that there are flags to be checked, while SUCCEEDED means that everything went smoothly.","sha":"fd29382290f77128956a29110e49e47e7182186a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T20:53:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T18:28:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: improve hue handling","sha":"0c68a6afdd54d8cd29f375c2e31f1b18ac4b104a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T20:59:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T18:28:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: disable tracking in cellGemForceRGB","sha":"3b581aaf943a10a1fb0c6e6da94af6308222afa0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T22:32:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T18:28:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: add some more error checks","sha":"3ddcf60a114417202686e8b326d7add295dc5f39"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T22:46:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T18:28:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: add more mouse buttons","sha":"4d0179174aa4b68b4ac6bf15b97470b2eac6480d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-29T23:52:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T18:28:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: update cellGemGetState","sha":"ccb75312895a9c2b3853531c699f0da83e251cfc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-30T13:55:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T18:28:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: fix mouse positions","sha":"dd7f24b20e39711b2882e3f7d5508dfb2287124e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-02T21:17:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T18:28:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: cellGemPrepareVideoConvert update","sha":"2dd0f488a108cead2fa02ad9ae502f184220089b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-01T05:19:58Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-04T18:39:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixup HLE lwmutex","sha":"9d71369b2ca8e76259d39a49461f173a2811b0c4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-04T16:09:15Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-04T18:39:57Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"sys_spu: Add one more limiting SPU threads creation condition","sha":"9f67e00e40e6c802419702bc9e80dc0ad6ccd8e3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T20:53:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-05T00:02:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: implement cellGemHSVtoRGB","sha":"0b88d5f07741ba7f28ab59deff82b2d562ca6eb1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T20:57:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-05T00:02:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: set cellGemGetCameraState values","sha":"f2bca2ef67cecb71c4b9251448efce1a5f01e70e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T22:35:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-05T00:02:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: add some more checks","sha":"e03f323fddf885d782adc717861ab36e4c2e9e78"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T22:35:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-05T00:02:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: reset struct on controller reset","sha":"995e9b5f9fe2bc023174467d4b8ff8c32070a470"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T22:36:13Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-05T00:02:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: fix controller connection check","sha":"6de4c27b32438044e8f544a0560419f7d9d10a34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T22:38:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-05T00:02:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: add calibration logic with 0.5 second delay","sha":"87c07679e14fd2be098f3b1614f74942b4b24a4a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-04T23:46:21Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-05T00:02:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: fix Deadstorm Pirates regression","sha":"9c21f43df6a1e9b061d95d15a13e6c37e53edbd9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-05T00:11:28Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-05T00:26:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: use existing constant for sphere radius","sha":"3ccfb86e1b841e0ccaa71b7098a16555187a8d84"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-05T03:19:27Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-05T05:12:34Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_spu_thread_group_create","sha":"9ecb6c4e34b5cded95c86189941fcf0dac97e0ce"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-05T10:19:57Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-05T11:10:08Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: Disable Alignment Checks","sha":"a146aabcaf608f16bc015e516790c32bfd350e68"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-07-16T17:49:00Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-05T20:56:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: purge gui settings","sha":"b7e4de6ea58f7eb8868d150689e31b2d09c70591"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-05T05:04:52Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-06T07:41:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"Fix warnings","sha":"064fc81697710957761174f44e91f6db7357939c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-05T05:07:18Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-06T07:41:40Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Nekotekina"},"msg":"sys_net/NP: set some init dependencies\n\nEnsure finalization order of network threads.\nThis should prevent some crashes.","sha":"86d2316089ea27b2d565fbf4d3acdb5c720b42c2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-03T23:29:16Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T14:18:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk/device: Formatting fixes only (EOL)","sha":"6f6eda6413456be86a932735ead8ef9754bafcc1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-03T23:29:38Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T14:18:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Unbind global renderer if it is destroyed","sha":"9a63ed6c50ab9420de840c231bfad10ae9e1163a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-04T00:05:23Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T14:18:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Simplify compute job cleanup on exit\n\n- Just call destroy automatically on object destruct","sha":"69b34693f0d8d4f9603c503865585bccde2a0b82"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-04T00:04:48Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T14:18:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add basic support for FSR 1.0\n\n- Only implemented for image upscaling.\n- Disabled by default. Emulators cannot ensure upscalers are injected at the right rendering step.\n- GUI integration not implemented.","sha":"d0a824996b133c529b1bc765b49b01c214e73514"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T12:49:39Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T14:18:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Fix 3rdparty imports for case-sensitive platforms (fixes *NIX build)","sha":"a4c1fcb59ade5b9f3427c0ac09cc253dc1a9d5e0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T13:33:50Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T14:18:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Disable warnings around 3rdparty header","sha":"0f5603a4bc5d973a4d1544ec40c8f1f637d719ab"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T13:35:30Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T14:18:48Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Formatting fix","sha":"dff5707e19cd78b337a29113d2f0880338eaae34"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/16805474?v=4","date":"2021-08-06T16:00:15Z","email":"matimoran03@gmail.com","login":"RainbowCookie32","name":"Matias Moran"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T16:43:03Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"ui: fix spacing on gpu tab\n\njust changed back what didn't seem important from kd's changes lol","sha":"4035dcf8e3cda24654a87a5dce17eea8e7dee1be"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T18:37:06Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T19:07:23Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Do not force check for successful texture cache load\n\nThe following set of conditions can fail\n1. We hit a RTT owned texture\n2. The texture is invalidated (failed memory integrity test) and set to write/read-through\n\nIn this situation, RTT overlap check will skip this surface, and a match can be found in texture cache if WCB/WDB is enabled.\nThe incoming hit however has no managed payload. This is expected behavior, the search should load from CPU.","sha":"456b649b19431d7bbb122d9e27d6809b921dfbc3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-06T21:49:50Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-06T21:49:50Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"rsx: Fix coordinate scaling for shadow access (#10668)\n\n- For shadow2DProj the 3rd coordinate is actually the depth value, do not scale","sha":"f745971cc8e85d8f71622c9e6ce25437febb50a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-07T16:04:19Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-07T16:38:39Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Check all attachments when generating pipeline hash key","sha":"0031c41630bbc89767712f4b37cd6117ee438889"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-06T00:08:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-07T19:03:34Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: Add pressure sensitivity button","sha":"d4802cc7669bb0d8343d6cc2c1534b1ddbd55476"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-07T19:38:03Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-07T19:38:03Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"kernel_explorer: Fix VM object formatting (#10666)\n\n* kernel_explorer: Fix VM object formatting\r\n* kernel-explorer: Fix type of tree_item_names\r\nunordered_map is completely unordered.. while with array-alike type (such as initializer_list) you can control the order of elements.\r\n* kernel_explorer: Add control data ptr info (lwcond/lwmutex)\r\n* kernel_explorer: Restrict lwmutex data reading furthher","sha":"0556837e3be55026a1d0d7a8175ca8c3795f5466"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-07T22:42:02Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-08T19:06:07Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"sys_net: add missing range checks","sha":"430fd759feefa12b238b92c60d63a9cd9c6f0f6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-08T14:45:45Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-08T23:05:15Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: fix pressure sensitivity button","sha":"2b188131159f803caf06615f76a2392ec931de42"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9814000?v=4","date":"2021-08-08T22:50:10Z","email":"zionnimchuk@gmail.com","login":"hcorion","name":"Zion"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-09T07:08:44Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Add startupWMClass to linux .desktop Fixes #10685","sha":"3fa9d236275f3c1894dce1ff02804effd955c8a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-08T16:50:37Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-09T09:29:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: fix minor data race\n\nWhile usually not exposed to the user, there was a slight chance that user input was read in a dirty state.\nThis became apparent during usage of the new pressure sensitivity button","sha":"f0d51899c1c26dc4e12c4d3592b60652a258c86f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-09T11:30:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-09T12:38:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"evdev: fix axis_orientations index","sha":"1b775febcdada4f9fb4ba2d2e62cdcff1e0c1149"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-09T11:57:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-09T12:38:33Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: fix keyboard pad handler","sha":"27c86422c79da4020f3b54f6f7c9225e7a3878e2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-07T05:54:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-09T16:12:17Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"patch_manager: Prefer specific patches over global patches","sha":"7fdbadf645f38ff96f41a05d72dd0899b91471f8"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-09T16:53:25Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-10T09:02:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Significantly reduce the applied subpixel bias when handling unnormalized access\n\n- If a large value is set (e.g 0.5) rounding will sample 'up' and we can read the wrong texel","sha":"c9afb3daaa43224626fa38a62d495188d878a2de"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10439488?v=4","date":"2021-08-10T18:15:34Z","email":"10439488+dio-gh@users.noreply.github.com","login":"dio-gh","name":"dio-gh"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-10T18:36:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Change the FSR tooltip to not Bri'ish English\n\nApparently artefacts is not a typo, but the en-gb spelling?","sha":"6e1c7a2c1673673e4c743716701e12a7dea015c9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-09T21:41:49Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-10T19:31:29Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: fix player id if handler has 2 or more pads","sha":"5816505e612336452b0b7cb1a3ba0a9bad83e0f4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-07-28T04:36:46Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-12T19:24:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU/event queue: Atomically resume SPU group","sha":"bf61c826d5cceb97c326394bc053e52de0ae4ba0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-06T09:15:04Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-12T19:24:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fix sys_spu_thread_group_resume\n\nDo not remove suspend flag when SPU group state is not SPU_THREAD_GROUP_STATUS_RUNNING after operation!","sha":"91737b11fecaf59fb6dfaa648bf094c61d39d1a1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-12T18:58:18Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-12T19:24:54Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"Fixup PPU breakpoints","sha":"5784ffc972e5ee87a9bdff93065d1b4ff2cede62"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-13T03:22:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-13T05:58:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU: Remove outdated assertation","sha":"f1f93b8f81fdf71ce5080a50c33d3d21e893fe9e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-13T03:38:53Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/6028184?v=4","date":"2021-08-13T05:58:09Z","email":"nekotekina@gmail.com","login":"Nekotekina","name":"Ivan"},"msg":"SPU/event queue: Implement protocol for SPU queue","sha":"063df64108e53de55531e718d770c6ace619e9df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-13T18:16:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-13T18:45:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix updater menu button\n\nIt kept auto accepting","sha":"adece0b73e97168e9338695c8dd7c4e0dab25b86"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-13T18:20:19Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-13T18:45:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"cellGem: fix floating point warning","sha":"53bfc6fa59ee1c79223ceb2bbed60338158037a6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-13T17:08:52Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-13T19:46:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Properly calculate cubemap memory size","sha":"b5faa8f83cbc5412c7bee8c70cc215fd83343bf4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-13T18:17:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-13T19:46:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Silence maybe-uninitialized warnings","sha":"4b2562d02a3634b98eb614226ec90a3e4cb7604f"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-13T18:21:56Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-13T19:46:36Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Fix unused variable error","sha":"b928cb02236f961e64d9903bf807c212a3e948cc"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-14T18:20:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-14T18:20:11Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Remove old RSX instructions viewer (#10710)","sha":"62beaf299fc56573dbcc1e4213dbdac8d82db40e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-14T16:50:11Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-14T21:26:11Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"GUI: Display PKG information & installation confirmation from main menu","sha":"41cfa6349a4ea9e715fa29760fcb400931c0d2ff"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-10T19:45:26Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-15T06:24:35Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: redesign pad profiles","sha":"cad96cef725fc8c7cd840bcc177f3974f1f5fd81"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-15T16:43:48Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-15T19:02:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix some warnings","sha":"ac986c7c613368fdd6686827d09eb51d9794b033"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-15T17:41:06Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-15T19:02:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: fix pad defaults when config file was empty","sha":"aa48bd91f4d48212763431fa5f16924e5633b430"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/5477973?v=4","date":"2021-08-15T19:37:05Z","email":"Lctrs@users.noreply.github.com","login":"Lctrs","name":"Lctrs"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-15T19:37:05Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"support building with system faudio 21.08+ (#10708)","sha":"24d7374a22e6449e28f1f6d2d19cdcb615028068"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-13T16:24:50Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-17T13:40:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement crash-proofing for 308A_COLOR dst address","sha":"2ce164be0993f155b099c38ba162500aa84c015d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-13T16:36:55Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-17T13:40:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement crash-proofing for src/dst image_in address","sha":"83624e1f68827d2eb7e04879ed955671d697dd27"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-13T17:12:54Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-17T13:40:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement crash-proofing for image_in dst/src formats","sha":"107641626aa3a0fd0359be2e6359bf85fa9cc5df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-13T18:46:38Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-17T13:40:41Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Improve rsx::recover_fifo() to take a hint from driver wake-up delay","sha":"a346767a72d22613e61132ab3da1144802a42ba4"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/6632271?v=4","date":"2021-08-14T16:46:05Z","email":"velocityra@gmail.com","login":"VelocityRa","name":"Nick Renieris"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-17T16:29:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"gl/vk: Scale line width & point size by resolution scaling","sha":"47e784d5d08b62b6b7b8c74c2b017aaf685aadc7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-17T12:47:29Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-17T17:19:45Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Improve driver compatibility\n\n- Add workarounds to disable compression on mesa drivers\n- Separate intel proprietary vs mesa into two enumerants","sha":"8848dc6673894a9623ccf3376da341bc6cad0079"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-17T19:58:33Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-17T20:10:42Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fixup image-in data length calculations","sha":"705693ecf8ca00f22f6f4fbbdaa84eb357be6eb7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18597453?v=4","date":"2021-08-18T04:16:38Z","email":"cpluspluspython@gmail.com","login":"supperpiccle","name":"Justin Lewis"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-18T04:16:38Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Fix warnings about using deprecated inet_ntoa function (#10698)\n\n* Replaced inet_ntoa with inet_ntop.\r\n\r\nThe warning in question is: \"Warning\tC4996\t'inet_ntoa': Use\r\ninet_ntop() or InetNtop() instead or define\r\n_WINSOCK_DEPRECATED_NO_WARNINGS\"","sha":"c13a46b07b11eb7c40220a6fabc4845e25209471"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-19T05:49:59Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-19T05:49:59Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Loader: Improve just-in-time installation of disc game files (#10719)\n\n* rsx: Indexed access to surface attributes","sha":"fcfeac818fdc6f64cc24d7235e1fbd5854a520d9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-18T21:12:46Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-20T08:59:05Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Fix indexed TEX[n] loads","sha":"3eb37344cdd0c492d0b619c8a8bc2f081a052ae2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-20T14:45:09Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-20T22:56:50Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Input: fix keyboard stick lerp","sha":"62102293b5e0db1fe34626ebb1a85ca5741928a2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/9196583?v=4","date":"2021-08-21T08:08:56Z","email":"marcoluc97@users.noreply.github.com","login":"marcoluc97","name":"Marco"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-21T08:08:56Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Whitelist Kamen Rider Summonride Portal sys_usbd (#10722)\n\n\r\nCo-authored-by: Megamouse <studienricky89@googlemail.com>","sha":"5c0bf145548d0c333b004d5a1349ad3727b62d51"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-21T17:52:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-21T18:40:19Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Add workaround for wayland session","sha":"4953e79588efd69b4ffe6f3afff46f4d3ee7cf2a"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2021-08-22T07:13:34Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Whatcookie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-22T07:13:34Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"SPU LLVM: Add approximate FCEQ/FCMEQ (#8729)\n\n- It's 100% accurate, but will sit under approx xfloat anyways\r\n- Attempts to use a single instruction when 1 value is constant","sha":"c62deeefd411939fb1d3bef646abbb87829e8087"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/10283761?v=4","date":"2021-08-22T12:18:38Z","email":"ani-leo@outlook.com","login":"AniLeo","name":"Ani"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-22T12:18:38Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vk: Register newer Navi GPUs (#10740)","sha":"1cdb2c6a26dbaf7a80591a6cef51279a1e7ffcf6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-21T13:24:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-23T06:34:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add RADV to list of drivers with unreliable 'OUT_OF_DATE' notification when window size changes","sha":"afc71341a5a51ea7a6646857b3fb60b9e4fba391"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-21T13:25:05Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-23T06:34:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Add support for other formats as FSR output","sha":"9080d09583d4cc41c7ee8b33100f2c21bfa8fde5"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-21T14:03:44Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-23T06:34:56Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vk: Experimental workaround to just disable compression\n\nApplies some flags to disable aggressive optimizations on some hw.\nCurrently applies to AMD cards which will avoid compression if mutable\nformat is enabled.\nThis is a temporary workaround.","sha":"92749f011ee038fc13919c83e26e9063cd4e6a6d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/26352541?v=4","date":"2021-08-23T12:06:02Z","email":"MalcolmJestadt@gmail.com","login":"Whatcookie","name":"Whatcookie"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-23T12:06:02Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Offset get_timebased_time at game boot (#10744)\n\n- Avoids game bugs in the case where games convert the value read from the clock to a float before performing delta time calculations","sha":"d0451932bf75f004ec952e390533f279ac9ba2a9"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-23T21:46:18Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-23T22:01:38Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"mmjoy: fix pressure sensitivity button\n\nIt defaulted to JOY_POVFORWARD (same dumb facepalm bug as with XInput earlier)","sha":"f44e50b9cd8689067dd309599d7ee90a780cfd56"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/11366022?v=4","date":"2021-08-24T05:39:26Z","email":"polar@ever3st.com","login":"p01arst0rm","name":"polar"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-24T05:39:26Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"BUILD: Refactor yaml-cpp submodule (#10745)\n\n* moved yaml-cpp files into seperate directory","sha":"d84d82c166c801da0783410972b52e066e25f803"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23005148?v=4","date":"2021-08-24T07:10:28Z","email":"cjj19970505@live.cn","login":"cjj19970505","name":"陈俊嘉"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-24T07:10:28Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Checkout wolfssl to v4.8.1-stable. (#10732)\n\n* Checkout wolfssl to v4.8.1-stable.\r\nSome CMake config fixes for wolfssl.\r\n\r\n* Remove unnecessary wolfssl config.","sha":"4b2f56e03552a3b60c900d07106c5b57ef679700"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-24T09:36:04Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-24T12:30:46Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"fsr: Mark output images explicitly as nonreadable","sha":"c1f31d37f5faf6eda1a4955ba7ed1b4126660054"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-23T08:48:32Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-24T13:52:18Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Implement indexed dynamic attribute load","sha":"57b9acec62420345a8affc66cba601cc3c603f06"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-24T14:43:06Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-24T15:52:01Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"vm: Fix vm::page_protect error checking","sha":"4e139ee080c2166b4c2472b0a1f7f7a9ec63baa2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-23T19:33:20Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-25T20:44:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Windows/Audio: add listener for device change\n\nFor some reason XAudio2 doesn't automatically change the device anymore.\nSo let's just listen for the OnDefaultDeviceChanged event and update the cell audio thread if necessary.","sha":"72f0637efe3935ab558130dc66e39b8afad9c48b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-26T02:06:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-26T03:01:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"fix MSVC filters","sha":"ae1729bd8a7d959c00e25c692306c52bf43681df"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-26T02:20:41Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-26T03:01:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: fix keyboard handler port status\n\n:facepalm:","sha":"38097783b8ddcc53667d302708218c6b60420793"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-26T02:55:24Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-26T06:48:03Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: revert stupid ideas\n\nIn order to make input more \"atomic\" I added man in the middle interfaces to decrease the delay between input and cellPad.\nBut I failed to notice that this introduced a data race between both ends of the pipeline.\nI hope the new mutex location doesn't cause any noticeable input lag.","sha":"970fe0df12c75a7a94f2dfdff1adc207fb71fa00"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-25T16:15:35Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-26T10:55:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Texcoord control mask affects decompiler output!","sha":"b0e5de4c9c7419191f16e94481793ad2675e9cf0"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-24T14:10:59Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-26T10:55:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx/fp: Fix perspective correction handling\n\n- Perspective correction flag multiplies VP output by HPOS.w.\n  NOTE: Not the same as division by w when it comes to NaN/Inf problems!!\n- Restructure indexed loads a bit to avoid re-initializing registers unnecessarily","sha":"2ff407ac6a8d0994f070d0da8df021e0ff15d7a7"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-26T10:20:17Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-26T10:55:00Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Add missing const","sha":"b0e352c44e0c2d957cbd4f17212e0b9ecef51288"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-26T15:14:08Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-26T15:14:08Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"vm: Fix an overflow at vm::alloc, fix vm::find_map (#10760)\n\n* The statement addr += align could have overflowed resulting in either infinite loop or allocating memory outside of the region (illegal).\r\nAdd a check checking if it's the last iteration of the loop, then break without adding.\r\n\r\n* vm::find_map condition didn't consider the size of the map to be allocated, allowing illegal occupation of [<=0xB000'0000]-0xCFFF'FFFF. (0xC000'0000-0xCFFF'FFFF is reserved for RSX)","sha":"2d9929059f1d9524946ee2feb53b912bbaeda38c"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-23T13:21:49Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-26T20:04:32Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"Patches/LLVM: Implement Complex Patches Support","sha":"ddb042148d15165ec2fe324c6548600d62720945"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T06:42:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T09:15:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: remove obsolete lambda","sha":"e1a5a24a93c2d77a647b4be59c12e90a15a126f3"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T07:34:14Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T09:15:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Qt: fix newlines. someone:tm: changed to richtext","sha":"a09c2dbdd72a6f2d5fc11b7d0c632770909d8c89"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T08:17:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T09:15:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"pad settings: disable more stuff during key input","sha":"28b9f4238acb65bd4be0c79bf0d147fa51d389f2"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T07:49:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T09:15:43Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"pad settings: Check duplicate button assignment","sha":"5aee8a8a8174f97f3791598edcd22f2a06321daa"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T14:11:53Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T15:37:52Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"curl: log errors","sha":"1060e93783e7d0b0d68ecb56c8747366d115d366"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T16:14:47Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T16:29:46Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"windows: fix get-commit-db","sha":"2431fcc2a1cd4c54c4caf16bbcf39022e8df2220"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-28T16:21:13Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T18:35:30Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"Mark \"Disable Logging\", add explanatory log message","sha":"f185aba5fcdc527bb591a077c1cf6a71d45b9cbe"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-29T07:53:36Z","email":"karokidii@gmail.com","login":"kd-11","name":"kd-11"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/15904127?v=4","date":"2021-08-29T08:10:30Z","email":"15904127+kd-11@users.noreply.github.com","login":"kd-11","name":"kd-11"},"msg":"rsx: Fix surface access bit flags\n\n- The previous enumeration was a holdover from older access management.\n- A bitflag of 0 seriously messes up the mask tests","sha":"3ab9e04db74ee9e92a6fa59ed212b23da175a3b6"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-28T19:26:54Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-29T08:41:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"add log message for downloader","sha":"9ecd1e37fa975f6be4aa5a3ea45b73f830f7e41e"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-29T06:39:16Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-29T08:41:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: rename some variables","sha":"2eb0d19a75a1764a6b3cc3e2a85b0a2cdf10725d"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-29T06:40:39Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-29T08:41:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: remove inconvenient pad mutex\n\nIt takes too long to wait for some handlers after all, causing stutter.","sha":"a33b2afe088627fca57c5e1081530d3702ad4ad1"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-29T06:56:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-29T08:41:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: use buffers during button translation\n\nThis should reduce some random noise by assgning the values once instead of twice","sha":"977d729ee050693a68678f29dcd8b9859d156059"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-29T07:08:31Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/23019877?v=4","date":"2021-08-29T08:41:22Z","email":"studienricky89@googlemail.com","login":"Megamouse","name":"Megamouse"},"msg":"input: move pressure sensitivity to the handlers\n\nThis removes a data race where the button was kept pressed but the values ingame could vary","sha":"b07960d3bccdcb8d3050774b8502573f98f3455b"}
+{"author":{"avatar":"https://avatars.githubusercontent.com/u/18193363?v=4","date":"2021-08-29T19:03:17Z","email":"elad3356p@gmail.com","login":"elad335","name":"Eladash"},"committer":{"avatar":"https://avatars.githubusercontent.com/u/19864447?v=4","date":"2021-08-29T19:03:17Z","email":"noreply@github.com","login":"web-flow","name":"GitHub"},"msg":"Patch cooperate with system SPU group creation (#10791)","sha":"67813737279dba78593b13e2407b71b37bb1d9f8"}
diff --git a/bin/xaudio2_9redist.dll b/bin/xaudio2_9redist.dll
new file mode 100755
index 0000000000..99b073a067
Binary files /dev/null and b/bin/xaudio2_9redist.dll differ
diff --git a/buildfiles/cmake/ConfigureCompiler.cmake b/buildfiles/cmake/ConfigureCompiler.cmake
index c1a30d4f93..49af51a61f 100644
--- a/buildfiles/cmake/ConfigureCompiler.cmake
+++ b/buildfiles/cmake/ConfigureCompiler.cmake
@@ -1,49 +1,31 @@
 # Check and configure compiler options for RPCS3
 
 if(MSVC)
-	add_compile_options(/Zc:throwingNew- /constexpr:steps16777216)
-	add_compile_definitions(
-		_CRT_SECURE_NO_DEPRECATE=1 _CRT_NON_CONFORMING_SWPRINTFS=1 _SCL_SECURE_NO_WARNINGS=1
-		NOMINMAX _ENABLE_EXTENDED_ALIGNED_STORAGE=1 _HAS_EXCEPTIONS=0)
-	add_link_options(/DYNAMICBASE:YES)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:throwingNew- /constexpr:steps16777216 /D _CRT_SECURE_NO_DEPRECATE=1 /D _CRT_NON_CONFORMING_SWPRINTFS=1 /D _SCL_SECURE_NO_WARNINGS=1")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D NOMINMAX /D _ENABLE_EXTENDED_ALIGNED_STORAGE=1 /D _HAS_EXCEPTIONS=0 /MT")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /DYNAMICBASE:NO /BASE:0x10000 /FIXED")
 
 	#TODO: Some of these could be cleaned up
 	add_compile_options(/wd4805) # Comparing boolean and int
 	add_compile_options(/wd4804) # Using integer operators with booleans
 	add_compile_options(/wd4200) # Zero-sized array in struct/union
+	add_link_options(/ignore:4281) # Undesirable base address 0x10000
 
 	# MSVC 2017 uses iterator as base class internally, causing a lot of warning spam
-	add_compile_definitions(_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1")
 
 	# Increase stack limit to 8 MB
-	add_link_options(/STACK:8388608,1048576)
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:8388608,1048576")
 else()
-	check_cxx_compiler_flag("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE)
-	check_cxx_compiler_flag("-msse -msse2 -mcx16" COMPILER_X86)
-	if (APPLE)
-		check_cxx_compiler_flag("-march=armv8.4-a" COMPILER_ARM)
-	else()
-		check_cxx_compiler_flag("-march=armv8.1-a" COMPILER_ARM)
-	endif()
+	# Some distros have the compilers set to use PIE by default, but RPCS3 doesn't work with PIE, so we need to disable it.
+	CHECK_CXX_COMPILER_FLAG("-no-pie" HAS_NO_PIE)
+	CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE)
 
 	add_compile_options(-Wall)
 	add_compile_options(-fno-exceptions)
 	add_compile_options(-fstack-protector)
-
-	if(USE_NATIVE_INSTRUCTIONS AND COMPILER_SUPPORTS_MARCH_NATIVE)
-		add_compile_options(-march=native)
-	elseif(COMPILER_ARM)
-		# This section needs a review. Apple claims armv8.5-a on M-series but doesn't support SVE.
-		# Note that compared to the rest of the 8.x family, 8.1 is very restrictive and we'll have to bump the requirement in future to get anything meaningful.
-		if (APPLE)
-			add_compile_options(-march=armv8.4-a)
-		else()
-			add_compile_options(-march=armv8.1-a)
-		endif()
-	elseif(COMPILER_X86)
-		# Some compilers will set both X86 and ARM, so check explicitly for ARM first
-		add_compile_options(-msse -msse2 -mcx16)
-	endif()
+	add_compile_options(-msse -msse2 -mcx16)
 
 	add_compile_options(-Werror=old-style-cast)
 	add_compile_options(-Werror=sign-compare)
@@ -51,7 +33,6 @@ else()
 	add_compile_options(-Werror=return-type)
 	add_compile_options(-Werror=overloaded-virtual)
 	add_compile_options(-Werror=missing-noreturn)
-	add_compile_options(-Werror=implicit-fallthrough)
 	add_compile_options(-Wunused-parameter)
 	add_compile_options(-Wignored-qualifiers)
 	add_compile_options(-Wredundant-move)
@@ -68,46 +49,53 @@ else()
 	add_compile_options(-Wstrict-aliasing=1)
 	#add_compile_options(-Wnull-dereference)
 
-	if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 		add_compile_options(-Werror=inconsistent-missing-override)
-		add_compile_options(-Werror=delete-non-virtual-dtor)
-	elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+	elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
 		add_compile_options(-Werror=suggest-override)
 		add_compile_options(-Wclobbered)
-		# add_compile_options(-Wcast-function-type)
+		add_compile_options(-Wcast-function-type)
 		add_compile_options(-Wduplicated-branches)
 		add_compile_options(-Wduplicated-cond)
 	endif()
 
 	#TODO Clean the code so these are removed
-	if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 		add_compile_options(-fconstexpr-steps=16777216)
 		add_compile_options(-Wno-unused-lambda-capture)
 		add_compile_options(-Wno-unused-private-field)
+		add_compile_options(-Wno-delete-non-virtual-dtor)
 		add_compile_options(-Wno-unused-command-line-argument)
-		add_compile_options(-Wno-elaborated-enum-base)
-	elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+	elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
 		add_compile_options(-Wno-class-memaccess)
 	endif()
 
-	# Note that this refers to binary size optimization during linking, it differs from optimization compiler level
-	add_link_options(-Wl,-O2)
+	if(USE_NATIVE_INSTRUCTIONS AND COMPILER_SUPPORTS_MARCH_NATIVE)
+		add_compile_options(-march=native)
+	endif()
 
 	if(NOT APPLE AND NOT WIN32)
 		# This hides our LLVM from mesa's LLVM, otherwise we get some unresolvable conflicts.
-		add_link_options(-Wl,--exclude-libs,ALL)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--exclude-libs,ALL")
+
+		if(HAS_NO_PIE)
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")
+		endif()
+	elseif(APPLE)
+		add_compile_options(-stdlib=libc++)
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-image_base,0x10000 -Wl,-pagezero_size,0x10000")
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_pie")
 	elseif(WIN32)
-		add_compile_definitions(__STDC_FORMAT_MACROS=1)
+		set(CMAKE_RC_COMPILER_INIT windres)
+		enable_language(RC)
+		set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
+
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_FORMAT_MACROS=1")
 
 		# Workaround for mingw64 (MSYS2)
-		add_link_options(-Wl,--allow-multiple-definition)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--allow-multiple-definition")
 
 		# Increase stack limit to 8 MB
-		add_link_options(-Wl,--stack -Wl,8388608)
-	endif()
-
-	# Specify C++ library to use as standard C++ when using clang (not required on linux due to GNU)
-	if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND (APPLE OR WIN32))
-		add_compile_options(-stdlib=libc++)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--stack -Wl,8388608")
 	endif()
 endif()
diff --git a/buildfiles/cmake/CopyRuntimeDependencies.cmake b/buildfiles/cmake/CopyRuntimeDependencies.cmake
deleted file mode 100644
index 6724d332da..0000000000
--- a/buildfiles/cmake/CopyRuntimeDependencies.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copy remaining DLLS
-
-cmake_path(GET exe PARENT_PATH exe_dir)
-cmake_path(CONVERT "${MSYS2_CLANG_BIN}" TO_CMAKE_PATH_LIST msys2_clang_bin)
-cmake_path(CONVERT "${MSYS2_USR_BIN}" TO_CMAKE_PATH_LIST msys2_usr_bin)
-
-message(STATUS "Getting runtime dependencies for '${exe}' in '${exe_dir}'")
-message(STATUS "Dependency dirs: '${msys2_clang_bin}', '${msys2_usr_bin}'")
-
-file(GET_RUNTIME_DEPENDENCIES EXECUTABLES ${exe}
-    RESOLVED_DEPENDENCIES_VAR resolved_deps
-    UNRESOLVED_DEPENDENCIES_VAR unresolved_deps
-    DIRECTORIES ${msys2_clang_bin} ${msys2_usr_bin})
-
-foreach(dep IN LISTS resolved_deps)
-    cmake_path(GET dep FILENAME dep_filename)
-    cmake_path(GET dep PARENT_PATH dep_dir_raw)
-    cmake_path(CONVERT "${dep_dir_raw}" TO_CMAKE_PATH_LIST dep_dir)
-
-    string(COMPARE EQUAL "${dep_dir}" "${msys2_clang_bin}" is_clang_path)
-    string(COMPARE EQUAL "${dep_dir}" "${msys2_usr_bin}" is_usr_path)
-
-    set(same_path FALSE)
-    if(is_clang_path OR is_usr_path)
-        set(same_path TRUE)
-    endif()
-
-    if(same_path)
-        set(dest "${exe_dir}/${dep_filename}")
-        if(NOT EXISTS "${dest}")
-            file(COPY "${dep}" DESTINATION "${exe_dir}")
-            message(STATUS "Copied '${dep_filename}' to '${exe_dir}'")
-        else()
-            message(STATUS "Already exists: '${dest}', skipping.")
-        endif()
-    else()
-        message(STATUS "Found and ignored '${dep}' in '${dep_dir}'. Is clang path: ${is_clang_path}, is usr path: ${is_usr_path}")
-    endif()
-endforeach()
-
-# Warn about unresolved dependencies
-if(unresolved_deps)
-    message(WARNING "Unresolved dependencies:")
-    foreach(dep IN LISTS unresolved_deps)
-        cmake_path(GET dep PARENT_PATH dep_dir)
-        string(TOLOWER "${dep_dir}" dep_dir_lower)
-        if(NOT dep_dir_lower MATCHES ".*(windows[/\\]system32|windows[/\\]winsxs|program files).*")
-            message(STATUS " - ${dep_dir}/${dep}")
-        endif()
-    endforeach()
-endif()
diff --git a/buildfiles/cmake/FindFFMPEG.cmake b/buildfiles/cmake/FindFFMPEG.cmake
index f4f62034a8..510f53fa58 100644
--- a/buildfiles/cmake/FindFFMPEG.cmake
+++ b/buildfiles/cmake/FindFFMPEG.cmake
@@ -1,4 +1,4 @@
-# - Try to find ffmpeg libraries (libavcodec, libavformat, libavutil, libswresample and libswscale)
+# - Try to find ffmpeg libraries (libavcodec, libavformat, libavutil and libswscale)
 # Once done this will define
 #
 #  FFMPEG_FOUND - system has ffmpeg or libav
@@ -8,7 +8,6 @@
 #  FFMPEG_LIBAVFORMAT
 #  FFMPEG_LIBAVUTIL
 #  FFMPEG_LIBSWSCALE
-#  FFMPEG_LIBSWRESAMPLE
 #
 #  Copyright (c) 2008 Andreas Schneider <mail@cynapses.org>
 #  Modified for other libraries by Lasse Kärkkäinen <tronic>
@@ -21,7 +20,7 @@
 if (FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR)
   # in cache already
   set(FFMPEG_FOUND TRUE)
-else ()
+else (FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR)
   # use pkg-config to get the directories and then use these values
   # in the FIND_PATH() and FIND_LIBRARY() calls
   find_package(PkgConfig)
@@ -30,8 +29,7 @@ else ()
     pkg_check_modules(_FFMPEG_AVFORMAT libavformat)
     pkg_check_modules(_FFMPEG_AVUTIL libavutil)
     pkg_check_modules(_FFMPEG_SWSCALE libswscale)
-    pkg_check_modules(_FFMPEG_SWRESAMPLE libswresample)
-  endif ()
+  endif (PKG_CONFIG_FOUND)
 
   find_path(FFMPEG_AVCODEC_INCLUDE_DIR
     NAMES libavcodec/avcodec.h
@@ -59,15 +57,9 @@ else ()
     PATHS ${_FFMPEG_SWSCALE_LIBRARY_DIRS} /usr/lib /usr/local/lib /opt/local/lib /sw/lib
   )
 
-  find_library(FFMPEG_LIBSWRESAMPLE
-    NAMES swresample
-    PATHS ${_FFMPEG_SWRESAMPLE_LIBRARY_DIRS} /usr/lib /usr/local/lib /opt/local/lib /sw/lib
-  )
-
-  find_package_handle_standard_args(FFMPEG
-    DEFAULT_MSG
-    FFMPEG_LIBAVCODEC FFMPEG_LIBAVFORMAT FFMPEG_LIBSWSCALE FFMPEG_LIBSWRESAMPLE
-  )
+  if (FFMPEG_LIBAVCODEC AND FFMPEG_LIBAVFORMAT AND FFMPEG_LIBSWSCALE)
+    set(FFMPEG_FOUND TRUE)
+  endif()
 
   if (FFMPEG_FOUND)
     set(FFMPEG_INCLUDE_DIR ${FFMPEG_AVCODEC_INCLUDE_DIR})
@@ -77,9 +69,19 @@ else ()
       ${FFMPEG_LIBAVFORMAT}
       ${FFMPEG_LIBAVUTIL}
       ${FFMPEG_LIBSWSCALE}
-      ${FFMPEG_LIBSWRESAMPLE}
     )
 
-  endif ()
+  endif (FFMPEG_FOUND)
+
+  if (FFMPEG_FOUND)
+    if (NOT FFMPEG_FIND_QUIETLY)
+      message(STATUS "Found FFMPEG or Libav: ${FFMPEG_LIBRARIES}, ${FFMPEG_INCLUDE_DIR}")
+    endif (NOT FFMPEG_FIND_QUIETLY)
+  else (FFMPEG_FOUND)
+    if (FFMPEG_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find libavcodec or libavformat or libavutil or libswscale")
+    endif (FFMPEG_FIND_REQUIRED)
+  endif (FFMPEG_FOUND)
+
+endif (FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR)
 
-endif ()
diff --git a/buildfiles/cmake/FindWayland.cmake b/buildfiles/cmake/FindWayland.cmake
index 6ace12a523..f93218b873 100644
--- a/buildfiles/cmake/FindWayland.cmake
+++ b/buildfiles/cmake/FindWayland.cmake
@@ -49,11 +49,11 @@ IF (NOT WIN32)
 
   include(FindPackageHandleStandardArgs)
 
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_CLIENT  REQUIRED_VARS  WAYLAND_CLIENT_LIBRARIES  WAYLAND_CLIENT_INCLUDE_DIR NAME_MISMATCHED)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_SERVER  REQUIRED_VARS  WAYLAND_SERVER_LIBRARIES  WAYLAND_SERVER_INCLUDE_DIR NAME_MISMATCHED)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_EGL     REQUIRED_VARS  WAYLAND_EGL_LIBRARIES     WAYLAND_EGL_INCLUDE_DIR NAME_MISMATCHED)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_CURSOR  REQUIRED_VARS  WAYLAND_CURSOR_LIBRARIES  WAYLAND_CURSOR_INCLUDE_DIR NAME_MISMATCHED)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND         REQUIRED_VARS  WAYLAND_LIBRARIES         WAYLAND_INCLUDE_DIR NAME_MISMATCHED)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_CLIENT  DEFAULT_MSG  WAYLAND_CLIENT_LIBRARIES  WAYLAND_CLIENT_INCLUDE_DIR)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_SERVER  DEFAULT_MSG  WAYLAND_SERVER_LIBRARIES  WAYLAND_SERVER_INCLUDE_DIR)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_EGL     DEFAULT_MSG  WAYLAND_EGL_LIBRARIES     WAYLAND_EGL_INCLUDE_DIR)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_CURSOR  DEFAULT_MSG  WAYLAND_CURSOR_LIBRARIES  WAYLAND_CURSOR_INCLUDE_DIR)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND         DEFAULT_MSG  WAYLAND_LIBRARIES         WAYLAND_INCLUDE_DIR)
 
   MARK_AS_ADVANCED(
         WAYLAND_INCLUDE_DIR         WAYLAND_LIBRARIES
diff --git a/buildfiles/cmake/FindWolfSSL.cmake b/buildfiles/cmake/FindWolfSSL.cmake
deleted file mode 100644
index d2e30be60b..0000000000
--- a/buildfiles/cmake/FindWolfSSL.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(WOLFSSL_LIBRARY ON)
-set(WOLFSSL_INCLUDE_DIR ON)
-set(WOLFSSL_LIBRARIES wolfssl)
-set(WOLFSSL_FOUND TRUE)
diff --git a/buildfiles/cmake/FindZLIB.cmake b/buildfiles/cmake/FindZLIB.cmake
deleted file mode 100644
index 0a29abafa9..0000000000
--- a/buildfiles/cmake/FindZLIB.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-if(USE_SYSTEM_ZLIB)
-    list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-    find_package(ZLIB)
-    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-else()
-    add_library(ZLIB::ZLIB INTERFACE IMPORTED)
-    set_target_properties(ZLIB::ZLIB PROPERTIES
-        INTERFACE_LINK_LIBRARIES zlibstatic
-        INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/3rdparty/zlib/zlib;${CMAKE_BINARY_DIR}/3rdparty/zlib/zlib")
-    set(ZLIB_FOUND TRUE)
-endif()
diff --git a/buildfiles/cmake/cotire.cmake b/buildfiles/cmake/cotire.cmake
new file mode 100644
index 0000000000..97275d6497
--- /dev/null
+++ b/buildfiles/cmake/cotire.cmake
@@ -0,0 +1,4190 @@
+# - cotire (compile time reducer)
+#
+# See the cotire manual for usage hints.
+#
+#=============================================================================
+# Copyright 2012-2018 Sascha Kratky
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#=============================================================================
+
+if(__COTIRE_INCLUDED)
+	return()
+endif()
+set(__COTIRE_INCLUDED TRUE)
+
+# call cmake_minimum_required, but prevent modification of the CMake policy stack in include mode
+# cmake_minimum_required also sets the policy version as a side effect, which we have to avoid
+if (NOT CMAKE_SCRIPT_MODE_FILE)
+	cmake_policy(PUSH)
+endif()
+cmake_minimum_required(VERSION 2.8.12)
+if (NOT CMAKE_SCRIPT_MODE_FILE)
+	cmake_policy(POP)
+endif()
+
+set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}")
+set (COTIRE_CMAKE_MODULE_VERSION "1.8.0")
+
+# activate select policies
+if (POLICY CMP0025)
+	# Compiler id for Apple Clang is now AppleClang
+	cmake_policy(SET CMP0025 NEW)
+endif()
+
+if (POLICY CMP0026)
+	# disallow use of the LOCATION target property
+	cmake_policy(SET CMP0026 NEW)
+endif()
+
+if (POLICY CMP0038)
+	# targets may not link directly to themselves
+	cmake_policy(SET CMP0038 NEW)
+endif()
+
+if (POLICY CMP0039)
+	# utility targets may not have link dependencies
+	cmake_policy(SET CMP0039 NEW)
+endif()
+
+if (POLICY CMP0040)
+	# target in the TARGET signature of add_custom_command() must exist
+	cmake_policy(SET CMP0040 NEW)
+endif()
+
+if (POLICY CMP0045)
+	# error on non-existent target in get_target_property
+	cmake_policy(SET CMP0045 NEW)
+endif()
+
+if (POLICY CMP0046)
+	# error on non-existent dependency in add_dependencies
+	cmake_policy(SET CMP0046 NEW)
+endif()
+
+if (POLICY CMP0049)
+	# do not expand variables in target source entries
+	cmake_policy(SET CMP0049 NEW)
+endif()
+
+if (POLICY CMP0050)
+	# disallow add_custom_command SOURCE signatures
+	cmake_policy(SET CMP0050 NEW)
+endif()
+
+if (POLICY CMP0051)
+	# include TARGET_OBJECTS expressions in a target's SOURCES property
+	cmake_policy(SET CMP0051 NEW)
+endif()
+
+if (POLICY CMP0053)
+	# simplify variable reference and escape sequence evaluation
+	cmake_policy(SET CMP0053 NEW)
+endif()
+
+if (POLICY CMP0054)
+	# only interpret if() arguments as variables or keywords when unquoted
+	cmake_policy(SET CMP0054 NEW)
+endif()
+
+if (POLICY CMP0055)
+	# strict checking for break() command
+	cmake_policy(SET CMP0055 NEW)
+endif()
+
+include(CMakeParseArguments)
+include(ProcessorCount)
+
+function (cotire_get_configuration_types _configsVar)
+	set (_configs "")
+	if (CMAKE_CONFIGURATION_TYPES)
+		list (APPEND _configs ${CMAKE_CONFIGURATION_TYPES})
+	endif()
+	if (CMAKE_BUILD_TYPE)
+		list (APPEND _configs "${CMAKE_BUILD_TYPE}")
+	endif()
+	if (_configs)
+		list (REMOVE_DUPLICATES _configs)
+		set (${_configsVar} ${_configs} PARENT_SCOPE)
+	else()
+		set (${_configsVar} "None" PARENT_SCOPE)
+	endif()
+endfunction()
+
+function (cotire_get_source_file_extension _sourceFile _extVar)
+	# get_filename_component returns extension from first occurrence of . in file name
+	# this function computes the extension from last occurrence of . in file name
+	string (FIND "${_sourceFile}" "." _index REVERSE)
+	if (_index GREATER -1)
+		math (EXPR _index "${_index} + 1")
+		string (SUBSTRING "${_sourceFile}" ${_index} -1 _sourceExt)
+	else()
+		set (_sourceExt "")
+	endif()
+	set (${_extVar} "${_sourceExt}" PARENT_SCOPE)
+endfunction()
+
+macro (cotire_check_is_path_relative_to _path _isRelativeVar)
+	set (${_isRelativeVar} FALSE)
+	if (IS_ABSOLUTE "${_path}")
+		foreach (_dir ${ARGN})
+			file (RELATIVE_PATH _relPath "${_dir}" "${_path}")
+			if (NOT _relPath OR (NOT IS_ABSOLUTE "${_relPath}" AND NOT "${_relPath}" MATCHES "^\\.\\."))
+				set (${_isRelativeVar} TRUE)
+				break()
+			endif()
+		endforeach()
+	endif()
+endmacro()
+
+function (cotire_filter_language_source_files _language _target _sourceFilesVar _excludedSourceFilesVar _cotiredSourceFilesVar)
+	if (CMAKE_${_language}_SOURCE_FILE_EXTENSIONS)
+		set (_languageExtensions "${CMAKE_${_language}_SOURCE_FILE_EXTENSIONS}")
+	else()
+		set (_languageExtensions "")
+	endif()
+	if (CMAKE_${_language}_IGNORE_EXTENSIONS)
+		set (_ignoreExtensions "${CMAKE_${_language}_IGNORE_EXTENSIONS}")
+	else()
+		set (_ignoreExtensions "")
+	endif()
+	if (COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS)
+		set (_excludeExtensions "${COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS}")
+	else()
+		set (_excludeExtensions "")
+	endif()
+	if (COTIRE_DEBUG AND _languageExtensions)
+		message (STATUS "${_language} source file extensions: ${_languageExtensions}")
+	endif()
+	if (COTIRE_DEBUG AND _ignoreExtensions)
+		message (STATUS "${_language} ignore extensions: ${_ignoreExtensions}")
+	endif()
+	if (COTIRE_DEBUG AND _excludeExtensions)
+		message (STATUS "${_language} exclude extensions: ${_excludeExtensions}")
+	endif()
+	if (CMAKE_VERSION VERSION_LESS "3.1.0")
+		set (_allSourceFiles ${ARGN})
+	else()
+		# as of CMake 3.1 target sources may contain generator expressions
+		# since we cannot obtain required property information about source files added
+		# through generator expressions at configure time, we filter them out
+		string (GENEX_STRIP "${ARGN}" _allSourceFiles)
+	endif()
+	set (_filteredSourceFiles "")
+	set (_excludedSourceFiles "")
+	foreach (_sourceFile ${_allSourceFiles})
+		get_source_file_property(_sourceIsHeaderOnly "${_sourceFile}" HEADER_FILE_ONLY)
+		get_source_file_property(_sourceIsExternal "${_sourceFile}" EXTERNAL_OBJECT)
+		get_source_file_property(_sourceIsSymbolic "${_sourceFile}" SYMBOLIC)
+		if (NOT _sourceIsHeaderOnly AND NOT _sourceIsExternal AND NOT _sourceIsSymbolic)
+			cotire_get_source_file_extension("${_sourceFile}" _sourceExt)
+			if (_sourceExt)
+				list (FIND _ignoreExtensions "${_sourceExt}" _ignoreIndex)
+				if (_ignoreIndex LESS 0)
+					list (FIND _excludeExtensions "${_sourceExt}" _excludeIndex)
+					if (_excludeIndex GREATER -1)
+						list (APPEND _excludedSourceFiles "${_sourceFile}")
+					else()
+						list (FIND _languageExtensions "${_sourceExt}" _sourceIndex)
+						if (_sourceIndex GREATER -1)
+							# consider source file unless it is excluded explicitly
+							get_source_file_property(_sourceIsExcluded "${_sourceFile}" COTIRE_EXCLUDED)
+							if (_sourceIsExcluded)
+								list (APPEND _excludedSourceFiles "${_sourceFile}")
+							else()
+								list (APPEND _filteredSourceFiles "${_sourceFile}")
+							endif()
+						else()
+							get_source_file_property(_sourceLanguage "${_sourceFile}" LANGUAGE)
+							if ("${_sourceLanguage}" STREQUAL "${_language}")
+								# add to excluded sources, if file is not ignored and has correct language without having the correct extension
+								list (APPEND _excludedSourceFiles "${_sourceFile}")
+							endif()
+						endif()
+					endif()
+				endif()
+			endif()
+		endif()
+	endforeach()
+	# separate filtered source files from already cotired ones
+	# the COTIRE_TARGET property of a source file may be set while a target is being processed by cotire
+	set (_sourceFiles "")
+	set (_cotiredSourceFiles "")
+	foreach (_sourceFile ${_filteredSourceFiles})
+		get_source_file_property(_sourceIsCotired "${_sourceFile}" COTIRE_TARGET)
+		if (_sourceIsCotired)
+			list (APPEND _cotiredSourceFiles "${_sourceFile}")
+		else()
+			get_source_file_property(_sourceCompileFlags "${_sourceFile}" COMPILE_FLAGS)
+			if (_sourceCompileFlags)
+				# add to excluded sources, if file has custom compile flags
+				list (APPEND _excludedSourceFiles "${_sourceFile}")
+			else()
+				get_source_file_property(_sourceCompileOptions "${_sourceFile}" COMPILE_OPTIONS)
+				if (_sourceCompileOptions)
+					# add to excluded sources, if file has list of custom compile options
+					list (APPEND _excludedSourceFiles "${_sourceFile}")
+				else()
+					list (APPEND _sourceFiles "${_sourceFile}")
+				endif()
+			endif()
+		endif()
+	endforeach()
+	if (COTIRE_DEBUG)
+		if (_sourceFiles)
+			message (STATUS "Filtered ${_target} ${_language} sources: ${_sourceFiles}")
+		endif()
+		if (_excludedSourceFiles)
+			message (STATUS "Excluded ${_target} ${_language} sources: ${_excludedSourceFiles}")
+		endif()
+		if (_cotiredSourceFiles)
+			message (STATUS "Cotired ${_target} ${_language} sources: ${_cotiredSourceFiles}")
+		endif()
+	endif()
+	set (${_sourceFilesVar} ${_sourceFiles} PARENT_SCOPE)
+	set (${_excludedSourceFilesVar} ${_excludedSourceFiles} PARENT_SCOPE)
+	set (${_cotiredSourceFilesVar} ${_cotiredSourceFiles} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_objects_with_property_on _filteredObjectsVar _property _type)
+	set (_filteredObjects "")
+	foreach (_object ${ARGN})
+		get_property(_isSet ${_type} "${_object}" PROPERTY ${_property} SET)
+		if (_isSet)
+			get_property(_propertyValue ${_type} "${_object}" PROPERTY ${_property})
+			if (_propertyValue)
+				list (APPEND _filteredObjects "${_object}")
+			endif()
+		endif()
+	endforeach()
+	set (${_filteredObjectsVar} ${_filteredObjects} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_objects_with_property_off _filteredObjectsVar _property _type)
+	set (_filteredObjects "")
+	foreach (_object ${ARGN})
+		get_property(_isSet ${_type} "${_object}" PROPERTY ${_property} SET)
+		if (_isSet)
+			get_property(_propertyValue ${_type} "${_object}" PROPERTY ${_property})
+			if (NOT _propertyValue)
+				list (APPEND _filteredObjects "${_object}")
+			endif()
+		endif()
+	endforeach()
+	set (${_filteredObjectsVar} ${_filteredObjects} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_source_file_property_values _valuesVar _property)
+	set (_values "")
+	foreach (_sourceFile ${ARGN})
+		get_source_file_property(_propertyValue "${_sourceFile}" ${_property})
+		if (_propertyValue)
+			list (APPEND _values "${_propertyValue}")
+		endif()
+	endforeach()
+	set (${_valuesVar} ${_values} PARENT_SCOPE)
+endfunction()
+
+function (cotire_resolve_config_properties _configurations _propertiesVar)
+	set (_properties "")
+	foreach (_property ${ARGN})
+		if ("${_property}" MATCHES "<CONFIG>")
+			foreach (_config ${_configurations})
+				string (TOUPPER "${_config}" _upperConfig)
+				string (REPLACE "<CONFIG>" "${_upperConfig}" _configProperty "${_property}")
+				list (APPEND _properties ${_configProperty})
+			endforeach()
+		else()
+			list (APPEND _properties ${_property})
+		endif()
+	endforeach()
+	set (${_propertiesVar} ${_properties} PARENT_SCOPE)
+endfunction()
+
+function (cotire_copy_set_properties _configurations _type _source _target)
+	cotire_resolve_config_properties("${_configurations}" _properties ${ARGN})
+	foreach (_property ${_properties})
+		get_property(_isSet ${_type} ${_source} PROPERTY ${_property} SET)
+		if (_isSet)
+			get_property(_propertyValue ${_type} ${_source} PROPERTY ${_property})
+			set_property(${_type} ${_target} PROPERTY ${_property} "${_propertyValue}")
+		endif()
+	endforeach()
+endfunction()
+
+function (cotire_get_target_usage_requirements _target _config _targetRequirementsVar)
+	set (_targetRequirements "")
+	get_target_property(_librariesToProcess ${_target} LINK_LIBRARIES)
+	while (_librariesToProcess)
+		# remove from head
+		list (GET _librariesToProcess 0 _library)
+		list (REMOVE_AT _librariesToProcess 0)
+		if (_library MATCHES "^\\$<\\$<CONFIG:${_config}>:([A-Za-z0-9_:-]+)>$")
+			set (_library "${CMAKE_MATCH_1}")
+		elseif (_config STREQUAL "None" AND _library MATCHES "^\\$<\\$<CONFIG:>:([A-Za-z0-9_:-]+)>$")
+			set (_library "${CMAKE_MATCH_1}")
+		endif()
+		if (TARGET ${_library})
+			list (FIND _targetRequirements ${_library} _index)
+			if (_index LESS 0)
+				list (APPEND _targetRequirements ${_library})
+				# BFS traversal of transitive libraries
+				get_target_property(_libraries ${_library} INTERFACE_LINK_LIBRARIES)
+				if (_libraries)
+					list (APPEND _librariesToProcess ${_libraries})
+					list (REMOVE_DUPLICATES _librariesToProcess)
+				endif()
+			endif()
+		endif()
+	endwhile()
+	set (${_targetRequirementsVar} ${_targetRequirements} PARENT_SCOPE)
+endfunction()
+
+function (cotire_filter_compile_flags _language _flagFilter _matchedOptionsVar _unmatchedOptionsVar)
+	if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+		set (_flagPrefix "[/-]")
+	else()
+		set (_flagPrefix "--?")
+	endif()
+	set (_optionFlag "")
+	set (_matchedOptions "")
+	set (_unmatchedOptions "")
+	foreach (_compileFlag ${ARGN})
+		if (_compileFlag)
+			if (_optionFlag AND NOT "${_compileFlag}" MATCHES "^${_flagPrefix}")
+				# option with separate argument
+				list (APPEND _matchedOptions "${_compileFlag}")
+				set (_optionFlag "")
+			elseif ("${_compileFlag}" MATCHES "^(${_flagPrefix})(${_flagFilter})$")
+				# remember option
+				set (_optionFlag "${CMAKE_MATCH_2}")
+			elseif ("${_compileFlag}" MATCHES "^(${_flagPrefix})(${_flagFilter})(.+)$")
+				# option with joined argument
+				list (APPEND _matchedOptions "${CMAKE_MATCH_3}")
+				set (_optionFlag "")
+			else()
+				# flush remembered option
+				if (_optionFlag)
+					list (APPEND _matchedOptions "${_optionFlag}")
+					set (_optionFlag "")
+				endif()
+				# add to unfiltered options
+				list (APPEND _unmatchedOptions "${_compileFlag}")
+			endif()
+		endif()
+	endforeach()
+	if (_optionFlag)
+		list (APPEND _matchedOptions "${_optionFlag}")
+	endif()
+	if (COTIRE_DEBUG AND _matchedOptions)
+		message (STATUS "Filter ${_flagFilter} matched: ${_matchedOptions}")
+	endif()
+	if (COTIRE_DEBUG AND _unmatchedOptions)
+		message (STATUS "Filter ${_flagFilter} unmatched: ${_unmatchedOptions}")
+	endif()
+	set (${_matchedOptionsVar} ${_matchedOptions} PARENT_SCOPE)
+	set (${_unmatchedOptionsVar} ${_unmatchedOptions} PARENT_SCOPE)
+endfunction()
+
+function (cotire_is_target_supported _target _isSupportedVar)
+	if (NOT TARGET "${_target}")
+		set (${_isSupportedVar} FALSE PARENT_SCOPE)
+		return()
+	endif()
+	get_target_property(_imported ${_target} IMPORTED)
+	if (_imported)
+		set (${_isSupportedVar} FALSE PARENT_SCOPE)
+		return()
+	endif()
+	get_target_property(_targetType ${_target} TYPE)
+	if (NOT _targetType MATCHES "EXECUTABLE|(STATIC|SHARED|MODULE|OBJECT)_LIBRARY")
+		set (${_isSupportedVar} FALSE PARENT_SCOPE)
+		return()
+	endif()
+	set (${_isSupportedVar} TRUE PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_target_compile_flags _config _language _target _flagsVar)
+	string (TOUPPER "${_config}" _upperConfig)
+	# collect options from CMake language variables
+	set (_compileFlags "")
+	if (CMAKE_${_language}_FLAGS)
+		set (_compileFlags "${_compileFlags} ${CMAKE_${_language}_FLAGS}")
+	endif()
+	if (CMAKE_${_language}_FLAGS_${_upperConfig})
+		set (_compileFlags "${_compileFlags} ${CMAKE_${_language}_FLAGS_${_upperConfig}}")
+	endif()
+	if (_target)
+		# add target compile flags
+		get_target_property(_targetflags ${_target} COMPILE_FLAGS)
+		if (_targetflags)
+			set (_compileFlags "${_compileFlags} ${_targetflags}")
+		endif()
+	endif()
+	if (UNIX)
+		separate_arguments(_compileFlags UNIX_COMMAND "${_compileFlags}")
+	elseif(WIN32)
+		separate_arguments(_compileFlags WINDOWS_COMMAND "${_compileFlags}")
+	else()
+		separate_arguments(_compileFlags)
+	endif()
+	# target compile options
+	if (_target)
+		get_target_property(_targetOptions ${_target} COMPILE_OPTIONS)
+		if (_targetOptions)
+			list (APPEND _compileFlags ${_targetOptions})
+		endif()
+	endif()
+	# interface compile options from linked library targets
+	if (_target)
+		set (_linkedTargets "")
+		cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
+		foreach (_linkedTarget ${_linkedTargets})
+			get_target_property(_targetOptions ${_linkedTarget} INTERFACE_COMPILE_OPTIONS)
+			if (_targetOptions)
+				list (APPEND _compileFlags ${_targetOptions})
+			endif()
+		endforeach()
+	endif()
+	# handle language standard properties
+	if (CMAKE_${_language}_STANDARD_DEFAULT)
+		# used compiler supports language standard levels
+		if (_target)
+			get_target_property(_targetLanguageStandard ${_target} ${_language}_STANDARD)
+			if (_targetLanguageStandard)
+				set (_type "EXTENSION")
+				get_property(_isSet TARGET ${_target} PROPERTY ${_language}_EXTENSIONS SET)
+				if (_isSet)
+					get_target_property(_targetUseLanguageExtensions ${_target} ${_language}_EXTENSIONS)
+					if (NOT _targetUseLanguageExtensions)
+						set (_type "STANDARD")
+					endif()
+				endif()
+				if (CMAKE_${_language}${_targetLanguageStandard}_${_type}_COMPILE_OPTION)
+					list (APPEND _compileFlags "${CMAKE_${_language}${_targetLanguageStandard}_${_type}_COMPILE_OPTION}")
+				endif()
+			endif()
+		endif()
+	endif()
+	# handle the POSITION_INDEPENDENT_CODE target property
+	if (_target)
+		get_target_property(_targetPIC ${_target} POSITION_INDEPENDENT_CODE)
+		if (_targetPIC)
+			get_target_property(_targetType ${_target} TYPE)
+			if (_targetType STREQUAL "EXECUTABLE" AND CMAKE_${_language}_COMPILE_OPTIONS_PIE)
+				list (APPEND _compileFlags "${CMAKE_${_language}_COMPILE_OPTIONS_PIE}")
+			elseif (CMAKE_${_language}_COMPILE_OPTIONS_PIC)
+				list (APPEND _compileFlags "${CMAKE_${_language}_COMPILE_OPTIONS_PIC}")
+			endif()
+		endif()
+	endif()
+	# handle visibility target properties
+	if (_target)
+		get_target_property(_targetVisibility ${_target} ${_language}_VISIBILITY_PRESET)
+		if (_targetVisibility AND CMAKE_${_language}_COMPILE_OPTIONS_VISIBILITY)
+			list (APPEND _compileFlags "${CMAKE_${_language}_COMPILE_OPTIONS_VISIBILITY}${_targetVisibility}")
+		endif()
+		get_target_property(_targetVisibilityInlines ${_target} VISIBILITY_INLINES_HIDDEN)
+		if (_targetVisibilityInlines AND CMAKE_${_language}_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN)
+			list (APPEND _compileFlags "${CMAKE_${_language}_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN}")
+		endif()
+	endif()
+	# platform specific flags
+	if (APPLE)
+		get_target_property(_architectures ${_target} OSX_ARCHITECTURES_${_upperConfig})
+		if (NOT _architectures)
+			get_target_property(_architectures ${_target} OSX_ARCHITECTURES)
+		endif()
+		if (_architectures)
+			foreach (_arch ${_architectures})
+				list (APPEND _compileFlags "-arch" "${_arch}")
+			endforeach()
+		endif()
+		if (CMAKE_OSX_SYSROOT)
+			if (CMAKE_${_language}_SYSROOT_FLAG)
+				list (APPEND _compileFlags "${CMAKE_${_language}_SYSROOT_FLAG}" "${CMAKE_OSX_SYSROOT}")
+			else()
+				list (APPEND _compileFlags "-isysroot" "${CMAKE_OSX_SYSROOT}")
+			endif()
+		endif()
+		if (CMAKE_OSX_DEPLOYMENT_TARGET)
+			if (CMAKE_${_language}_OSX_DEPLOYMENT_TARGET_FLAG)
+				list (APPEND _compileFlags "${CMAKE_${_language}_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}")
+			else()
+				list (APPEND _compileFlags "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+			endif()
+		endif()
+	endif()
+	if (COTIRE_DEBUG AND _compileFlags)
+		message (STATUS "Target ${_target} compile flags: ${_compileFlags}")
+	endif()
+	set (${_flagsVar} ${_compileFlags} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_target_include_directories _config _language _target _includeDirsVar _systemIncludeDirsVar)
+	set (_includeDirs "")
+	set (_systemIncludeDirs "")
+	# default include dirs
+	if (CMAKE_INCLUDE_CURRENT_DIR)
+		list (APPEND _includeDirs "${CMAKE_CURRENT_BINARY_DIR}")
+		list (APPEND _includeDirs "${CMAKE_CURRENT_SOURCE_DIR}")
+	endif()
+	set (_targetFlags "")
+	cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags)
+	# parse additional include directories from target compile flags
+	if (CMAKE_INCLUDE_FLAG_${_language})
+		string (STRIP "${CMAKE_INCLUDE_FLAG_${_language}}" _includeFlag)
+		string (REGEX REPLACE "^[-/]+" "" _includeFlag "${_includeFlag}")
+		if (_includeFlag)
+			set (_dirs "")
+			cotire_filter_compile_flags("${_language}" "${_includeFlag}" _dirs _ignore ${_targetFlags})
+			if (_dirs)
+				list (APPEND _includeDirs ${_dirs})
+			endif()
+		endif()
+	endif()
+	# parse additional system include directories from target compile flags
+	if (CMAKE_INCLUDE_SYSTEM_FLAG_${_language})
+		string (STRIP "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" _includeFlag)
+		string (REGEX REPLACE "^[-/]+" "" _includeFlag "${_includeFlag}")
+		if (_includeFlag)
+			set (_dirs "")
+			cotire_filter_compile_flags("${_language}" "${_includeFlag}" _dirs _ignore ${_targetFlags})
+			if (_dirs)
+				list (APPEND _systemIncludeDirs ${_dirs})
+			endif()
+		endif()
+	endif()
+	# target include directories
+	get_directory_property(_dirs DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" INCLUDE_DIRECTORIES)
+	if (_target)
+		get_target_property(_targetDirs ${_target} INCLUDE_DIRECTORIES)
+		if (_targetDirs)
+			list (APPEND _dirs ${_targetDirs})
+		endif()
+		get_target_property(_targetDirs ${_target} INTERFACE_SYSTEM_INCLUDE_DIRECTORIES)
+		if (_targetDirs)
+			list (APPEND _systemIncludeDirs ${_targetDirs})
+		endif()
+	endif()
+	# interface include directories from linked library targets
+	if (_target)
+		set (_linkedTargets "")
+		cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
+		foreach (_linkedTarget ${_linkedTargets})
+			get_target_property(_linkedTargetType ${_linkedTarget} TYPE)
+			if (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE AND NOT CMAKE_VERSION VERSION_LESS "3.4.0" AND
+				_linkedTargetType MATCHES "(STATIC|SHARED|MODULE|OBJECT)_LIBRARY")
+				# CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE refers to CMAKE_CURRENT_BINARY_DIR and CMAKE_CURRENT_SOURCE_DIR
+				# at the time, when the target was created. These correspond to the target properties BINARY_DIR and SOURCE_DIR
+				# which are only available with CMake 3.4 or later.
+				get_target_property(_targetDirs ${_linkedTarget} BINARY_DIR)
+				if (_targetDirs)
+					list (APPEND _dirs ${_targetDirs})
+				endif()
+				get_target_property(_targetDirs ${_linkedTarget} SOURCE_DIR)
+				if (_targetDirs)
+					list (APPEND _dirs ${_targetDirs})
+				endif()
+			endif()
+			get_target_property(_targetDirs ${_linkedTarget} INTERFACE_INCLUDE_DIRECTORIES)
+			if (_targetDirs)
+				list (APPEND _dirs ${_targetDirs})
+			endif()
+			get_target_property(_targetDirs ${_linkedTarget} INTERFACE_SYSTEM_INCLUDE_DIRECTORIES)
+			if (_targetDirs)
+				list (APPEND _systemIncludeDirs ${_targetDirs})
+			endif()
+		endforeach()
+	endif()
+	if (dirs)
+		list (REMOVE_DUPLICATES _dirs)
+	endif()
+	list (LENGTH _includeDirs _projectInsertIndex)
+	foreach (_dir ${_dirs})
+		if (CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE)
+			cotire_check_is_path_relative_to("${_dir}" _isRelative "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}")
+			if (_isRelative)
+				list (LENGTH _includeDirs _len)
+				if (_len EQUAL _projectInsertIndex)
+					list (APPEND _includeDirs "${_dir}")
+				else()
+					list (INSERT _includeDirs _projectInsertIndex "${_dir}")
+				endif()
+				math (EXPR _projectInsertIndex "${_projectInsertIndex} + 1")
+			else()
+				list (APPEND _includeDirs "${_dir}")
+			endif()
+		else()
+			list (APPEND _includeDirs "${_dir}")
+		endif()
+	endforeach()
+	list (REMOVE_DUPLICATES _includeDirs)
+	list (REMOVE_DUPLICATES _systemIncludeDirs)
+	if (CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES)
+		list (REMOVE_ITEM _includeDirs ${CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES})
+	endif()
+	if (WIN32 AND NOT MINGW)
+		# convert Windows paths in include directories to CMake paths
+		if (_includeDirs)
+			set (_paths "")
+			foreach (_dir ${_includeDirs})
+				file (TO_CMAKE_PATH "${_dir}" _path)
+				list (APPEND _paths "${_path}")
+			endforeach()
+			set (_includeDirs ${_paths})
+		endif()
+		if (_systemIncludeDirs)
+			set (_paths "")
+			foreach (_dir ${_systemIncludeDirs})
+				file (TO_CMAKE_PATH "${_dir}" _path)
+				list (APPEND _paths "${_path}")
+			endforeach()
+			set (_systemIncludeDirs ${_paths})
+		endif()
+	endif()
+	if (COTIRE_DEBUG AND _includeDirs)
+		message (STATUS "Target ${_target} include dirs: ${_includeDirs}")
+	endif()
+	set (${_includeDirsVar} ${_includeDirs} PARENT_SCOPE)
+	if (COTIRE_DEBUG AND _systemIncludeDirs)
+		message (STATUS "Target ${_target} system include dirs: ${_systemIncludeDirs}")
+	endif()
+	set (${_systemIncludeDirsVar} ${_systemIncludeDirs} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_target_export_symbol _target _exportSymbolVar)
+	set (_exportSymbol "")
+	get_target_property(_targetType ${_target} TYPE)
+	get_target_property(_enableExports ${_target} ENABLE_EXPORTS)
+	if (_targetType MATCHES "(SHARED|MODULE)_LIBRARY" OR
+		(_targetType STREQUAL "EXECUTABLE" AND _enableExports))
+		get_target_property(_exportSymbol ${_target} DEFINE_SYMBOL)
+		if (NOT _exportSymbol)
+			set (_exportSymbol "${_target}_EXPORTS")
+		endif()
+		string (MAKE_C_IDENTIFIER "${_exportSymbol}" _exportSymbol)
+	endif()
+	set (${_exportSymbolVar} ${_exportSymbol} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_target_compile_definitions _config _language _target _definitionsVar)
+	string (TOUPPER "${_config}" _upperConfig)
+	set (_configDefinitions "")
+	# CMAKE_INTDIR for multi-configuration build systems
+	if (NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+		list (APPEND _configDefinitions "CMAKE_INTDIR=\"${_config}\"")
+	endif()
+	# target export define symbol
+	cotire_get_target_export_symbol("${_target}" _defineSymbol)
+	if (_defineSymbol)
+		list (APPEND _configDefinitions "${_defineSymbol}")
+	endif()
+	# directory compile definitions
+	get_directory_property(_definitions DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMPILE_DEFINITIONS)
+	if (_definitions)
+		list (APPEND _configDefinitions ${_definitions})
+	endif()
+	get_directory_property(_definitions DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMPILE_DEFINITIONS_${_upperConfig})
+	if (_definitions)
+		list (APPEND _configDefinitions ${_definitions})
+	endif()
+	# target compile definitions
+	get_target_property(_definitions ${_target} COMPILE_DEFINITIONS)
+	if (_definitions)
+		list (APPEND _configDefinitions ${_definitions})
+	endif()
+	get_target_property(_definitions ${_target} COMPILE_DEFINITIONS_${_upperConfig})
+	if (_definitions)
+		list (APPEND _configDefinitions ${_definitions})
+	endif()
+	# interface compile definitions from linked library targets
+	set (_linkedTargets "")
+	cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
+	foreach (_linkedTarget ${_linkedTargets})
+		get_target_property(_definitions ${_linkedTarget} INTERFACE_COMPILE_DEFINITIONS)
+		if (_definitions)
+			list (APPEND _configDefinitions ${_definitions})
+		endif()
+	endforeach()
+	# parse additional compile definitions from target compile flags
+	# and do not look at directory compile definitions, which we already handled
+	set (_targetFlags "")
+	cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags)
+	cotire_filter_compile_flags("${_language}" "D" _definitions _ignore ${_targetFlags})
+	if (_definitions)
+		list (APPEND _configDefinitions ${_definitions})
+	endif()
+	list (REMOVE_DUPLICATES _configDefinitions)
+	if (COTIRE_DEBUG AND _configDefinitions)
+		message (STATUS "Target ${_target} compile definitions: ${_configDefinitions}")
+	endif()
+	set (${_definitionsVar} ${_configDefinitions} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_target_compiler_flags _config _language _target _compilerFlagsVar)
+	# parse target compile flags omitting compile definitions and include directives
+	set (_targetFlags "")
+	cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags)
+	set (_flagFilter "D")
+	if (CMAKE_INCLUDE_FLAG_${_language})
+		string (STRIP "${CMAKE_INCLUDE_FLAG_${_language}}" _includeFlag)
+		string (REGEX REPLACE "^[-/]+" "" _includeFlag "${_includeFlag}")
+		if (_includeFlag)
+			set (_flagFilter "${_flagFilter}|${_includeFlag}")
+		endif()
+	endif()
+	if (CMAKE_INCLUDE_SYSTEM_FLAG_${_language})
+		string (STRIP "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" _includeFlag)
+		string (REGEX REPLACE "^[-/]+" "" _includeFlag "${_includeFlag}")
+		if (_includeFlag)
+			set (_flagFilter "${_flagFilter}|${_includeFlag}")
+		endif()
+	endif()
+	set (_compilerFlags "")
+	cotire_filter_compile_flags("${_language}" "${_flagFilter}" _ignore _compilerFlags ${_targetFlags})
+	if (COTIRE_DEBUG AND _compilerFlags)
+		message (STATUS "Target ${_target} compiler flags: ${_compilerFlags}")
+	endif()
+	set (${_compilerFlagsVar} ${_compilerFlags} PARENT_SCOPE)
+endfunction()
+
+function (cotire_add_sys_root_paths _pathsVar)
+	if (APPLE)
+		if (CMAKE_OSX_SYSROOT AND CMAKE_${_language}_HAS_ISYSROOT)
+			foreach (_path IN LISTS ${_pathsVar})
+				if (IS_ABSOLUTE "${_path}")
+					get_filename_component(_path "${CMAKE_OSX_SYSROOT}/${_path}" ABSOLUTE)
+					if (EXISTS "${_path}")
+						list (APPEND ${_pathsVar} "${_path}")
+					endif()
+				endif()
+			endforeach()
+		endif()
+	endif()
+	set (${_pathsVar} ${${_pathsVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_source_extra_properties _sourceFile _pattern _resultVar)
+	set (_extraProperties ${ARGN})
+	set (_result "")
+	if (_extraProperties)
+		list (FIND _extraProperties "${_sourceFile}" _index)
+		if (_index GREATER -1)
+			math (EXPR _index "${_index} + 1")
+			list (LENGTH _extraProperties _len)
+			math (EXPR _len "${_len} - 1")
+			foreach (_index RANGE ${_index} ${_len})
+				list (GET _extraProperties ${_index} _value)
+				if (_value MATCHES "${_pattern}")
+					list (APPEND _result "${_value}")
+				else()
+					break()
+				endif()
+			endforeach()
+		endif()
+	endif()
+	set (${_resultVar} ${_result} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_source_compile_definitions _config _language _sourceFile _definitionsVar)
+	set (_compileDefinitions "")
+	if (NOT CMAKE_SCRIPT_MODE_FILE)
+		string (TOUPPER "${_config}" _upperConfig)
+		get_source_file_property(_definitions "${_sourceFile}" COMPILE_DEFINITIONS)
+		if (_definitions)
+			list (APPEND _compileDefinitions ${_definitions})
+		endif()
+		get_source_file_property(_definitions "${_sourceFile}" COMPILE_DEFINITIONS_${_upperConfig})
+		if (_definitions)
+			list (APPEND _compileDefinitions ${_definitions})
+		endif()
+	endif()
+	cotire_get_source_extra_properties("${_sourceFile}" "^[a-zA-Z0-9_]+(=.*)?$" _definitions ${ARGN})
+	if (_definitions)
+		list (APPEND _compileDefinitions ${_definitions})
+	endif()
+	if (COTIRE_DEBUG AND _compileDefinitions)
+		message (STATUS "Source ${_sourceFile} compile definitions: ${_compileDefinitions}")
+	endif()
+	set (${_definitionsVar} ${_compileDefinitions} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_source_files_compile_definitions _config _language _definitionsVar)
+	set (_configDefinitions "")
+	foreach (_sourceFile ${ARGN})
+		cotire_get_source_compile_definitions("${_config}" "${_language}" "${_sourceFile}" _sourceDefinitions)
+		if (_sourceDefinitions)
+			list (APPEND _configDefinitions "${_sourceFile}" ${_sourceDefinitions} "-")
+		endif()
+	endforeach()
+	set (${_definitionsVar} ${_configDefinitions} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_source_undefs _sourceFile _property _sourceUndefsVar)
+	set (_sourceUndefs "")
+	if (NOT CMAKE_SCRIPT_MODE_FILE)
+		get_source_file_property(_undefs "${_sourceFile}" ${_property})
+		if (_undefs)
+			list (APPEND _sourceUndefs ${_undefs})
+		endif()
+	endif()
+	cotire_get_source_extra_properties("${_sourceFile}" "^[a-zA-Z0-9_]+$" _undefs ${ARGN})
+	if (_undefs)
+		list (APPEND _sourceUndefs ${_undefs})
+	endif()
+	if (COTIRE_DEBUG AND _sourceUndefs)
+		message (STATUS "Source ${_sourceFile} ${_property} undefs: ${_sourceUndefs}")
+	endif()
+	set (${_sourceUndefsVar} ${_sourceUndefs} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_source_files_undefs _property _sourceUndefsVar)
+	set (_sourceUndefs "")
+	foreach (_sourceFile ${ARGN})
+		cotire_get_source_undefs("${_sourceFile}" ${_property} _undefs)
+		if (_undefs)
+			list (APPEND _sourceUndefs "${_sourceFile}" ${_undefs} "-")
+		endif()
+	endforeach()
+	set (${_sourceUndefsVar} ${_sourceUndefs} PARENT_SCOPE)
+endfunction()
+
+macro (cotire_set_cmd_to_prologue _cmdVar)
+	set (${_cmdVar} "${CMAKE_COMMAND}")
+	if (COTIRE_DEBUG)
+		list (APPEND ${_cmdVar} "--warn-uninitialized")
+	endif()
+	list (APPEND ${_cmdVar} "-DCOTIRE_BUILD_TYPE:STRING=$<CONFIGURATION>")
+	if (XCODE)
+		list (APPEND ${_cmdVar} "-DXCODE:BOOL=TRUE")
+	endif()
+	if (COTIRE_VERBOSE)
+		list (APPEND ${_cmdVar} "-DCOTIRE_VERBOSE:BOOL=ON")
+	elseif("${CMAKE_GENERATOR}" MATCHES "Makefiles")
+		list (APPEND ${_cmdVar} "-DCOTIRE_VERBOSE:BOOL=$(VERBOSE)")
+	endif()
+endmacro()
+
+function (cotire_init_compile_cmd _cmdVar _language _compilerLauncher _compilerExe _compilerArg1)
+	if (NOT _compilerLauncher)
+		set (_compilerLauncher ${CMAKE_${_language}_COMPILER_LAUNCHER})
+	endif()
+	if (NOT _compilerExe)
+		set (_compilerExe "${CMAKE_${_language}_COMPILER}")
+	endif()
+	if (NOT _compilerArg1)
+		set (_compilerArg1 ${CMAKE_${_language}_COMPILER_ARG1})
+	endif()
+	if (WIN32)
+		file (TO_NATIVE_PATH "${_compilerExe}" _compilerExe)
+	endif()
+	string (STRIP "${_compilerArg1}" _compilerArg1)
+	if ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
+		# compiler launcher is only supported for Makefile and Ninja
+		set (${_cmdVar} ${_compilerLauncher} "${_compilerExe}" ${_compilerArg1} PARENT_SCOPE)
+	else()
+		set (${_cmdVar} "${_compilerExe}" ${_compilerArg1} PARENT_SCOPE)
+	endif()
+endfunction()
+
+macro (cotire_add_definitions_to_cmd _cmdVar _language)
+	foreach (_definition ${ARGN})
+		if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+			list (APPEND ${_cmdVar} "/D${_definition}")
+		else()
+			list (APPEND ${_cmdVar} "-D${_definition}")
+		endif()
+	endforeach()
+endmacro()
+
+function (cotire_add_includes_to_cmd _cmdVar _language _includesVar _systemIncludesVar)
+	set (_includeDirs ${${_includesVar}} ${${_systemIncludesVar}})
+	if (_includeDirs)
+		list (REMOVE_DUPLICATES _includeDirs)
+		foreach (_include ${_includeDirs})
+			if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+				file (TO_NATIVE_PATH "${_include}" _include)
+				list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+			else()
+				set (_index -1)
+				if ("${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" MATCHES ".+")
+					list (FIND ${_systemIncludesVar} "${_include}" _index)
+				endif()
+				if (_index GREATER -1)
+					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+				else()
+					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+				endif()
+			endif()
+		endforeach()
+	endif()
+	set (${_cmdVar} ${${_cmdVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_add_frameworks_to_cmd _cmdVar _language _includesVar _systemIncludesVar)
+	if (APPLE)
+		set (_frameworkDirs "")
+		foreach (_include ${${_includesVar}})
+			if (IS_ABSOLUTE "${_include}" AND _include MATCHES "\\.framework$")
+				get_filename_component(_frameworkDir "${_include}" DIRECTORY)
+				list (APPEND _frameworkDirs "${_frameworkDir}")
+			endif()
+		endforeach()
+		set (_systemFrameworkDirs "")
+		foreach (_include ${${_systemIncludesVar}})
+			if (IS_ABSOLUTE "${_include}" AND _include MATCHES "\\.framework$")
+				get_filename_component(_frameworkDir "${_include}" DIRECTORY)
+				list (APPEND _systemFrameworkDirs "${_frameworkDir}")
+			endif()
+		endforeach()
+		if (_systemFrameworkDirs)
+			list (APPEND _frameworkDirs ${_systemFrameworkDirs})
+		endif()
+		if (_frameworkDirs)
+			list (REMOVE_DUPLICATES _frameworkDirs)
+			foreach (_frameworkDir ${_frameworkDirs})
+				set (_index -1)
+				if ("${CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG}" MATCHES ".+")
+					list (FIND _systemFrameworkDirs "${_frameworkDir}" _index)
+				endif()
+				if (_index GREATER -1)
+					list (APPEND ${_cmdVar} "${CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG}${_frameworkDir}")
+				else()
+					list (APPEND ${_cmdVar} "${CMAKE_${_language}_FRAMEWORK_SEARCH_FLAG}${_frameworkDir}")
+				endif()
+			endforeach()
+		endif()
+	endif()
+	set (${_cmdVar} ${${_cmdVar}} PARENT_SCOPE)
+endfunction()
+
+macro (cotire_add_compile_flags_to_cmd _cmdVar)
+	foreach (_flag ${ARGN})
+		list (APPEND ${_cmdVar} "${_flag}")
+	endforeach()
+endmacro()
+
+function (cotire_check_file_up_to_date _fileIsUpToDateVar _file)
+	if (EXISTS "${_file}")
+		set (_triggerFile "")
+		foreach (_dependencyFile ${ARGN})
+			if (EXISTS "${_dependencyFile}")
+				# IS_NEWER_THAN returns TRUE if both files have the same timestamp
+				# thus we do the comparison in both directions to exclude ties
+				if ("${_dependencyFile}" IS_NEWER_THAN "${_file}" AND
+					NOT "${_file}" IS_NEWER_THAN "${_dependencyFile}")
+					set (_triggerFile "${_dependencyFile}")
+					break()
+				endif()
+			endif()
+		endforeach()
+		if (_triggerFile)
+			if (COTIRE_VERBOSE)
+				get_filename_component(_fileName "${_file}" NAME)
+				message (STATUS "${_fileName} update triggered by ${_triggerFile} change.")
+			endif()
+			set (${_fileIsUpToDateVar} FALSE PARENT_SCOPE)
+		else()
+			if (COTIRE_VERBOSE)
+				get_filename_component(_fileName "${_file}" NAME)
+				message (STATUS "${_fileName} is up-to-date.")
+			endif()
+			set (${_fileIsUpToDateVar} TRUE PARENT_SCOPE)
+		endif()
+	else()
+		if (COTIRE_VERBOSE)
+			get_filename_component(_fileName "${_file}" NAME)
+			message (STATUS "${_fileName} does not exist yet.")
+		endif()
+		set (${_fileIsUpToDateVar} FALSE PARENT_SCOPE)
+	endif()
+endfunction()
+
+macro (cotire_find_closest_relative_path _headerFile _includeDirs _relPathVar)
+	set (${_relPathVar} "")
+	foreach (_includeDir ${_includeDirs})
+		if (IS_DIRECTORY "${_includeDir}")
+			file (RELATIVE_PATH _relPath "${_includeDir}" "${_headerFile}")
+			if (NOT IS_ABSOLUTE "${_relPath}" AND NOT "${_relPath}" MATCHES "^\\.\\.")
+				string (LENGTH "${${_relPathVar}}" _closestLen)
+				string (LENGTH "${_relPath}" _relLen)
+				if (_closestLen EQUAL 0 OR _relLen LESS _closestLen)
+					set (${_relPathVar} "${_relPath}")
+				endif()
+			endif()
+		elseif ("${_includeDir}" STREQUAL "${_headerFile}")
+			# if path matches exactly, return short non-empty string
+			set (${_relPathVar} "1")
+			break()
+		endif()
+	endforeach()
+endmacro()
+
+macro (cotire_check_header_file_location _headerFile _insideIncludeDirs _outsideIncludeDirs _headerIsInside)
+	# check header path against ignored and honored include directories
+	cotire_find_closest_relative_path("${_headerFile}" "${_insideIncludeDirs}" _insideRelPath)
+	if (_insideRelPath)
+		# header is inside, but could be become outside if there is a shorter outside match
+		cotire_find_closest_relative_path("${_headerFile}" "${_outsideIncludeDirs}" _outsideRelPath)
+		if (_outsideRelPath)
+			string (LENGTH "${_insideRelPath}" _insideRelPathLen)
+			string (LENGTH "${_outsideRelPath}" _outsideRelPathLen)
+			if (_outsideRelPathLen LESS _insideRelPathLen)
+				set (${_headerIsInside} FALSE)
+			else()
+				set (${_headerIsInside} TRUE)
+			endif()
+		else()
+			set (${_headerIsInside} TRUE)
+		endif()
+	else()
+		# header is outside
+		set (${_headerIsInside} FALSE)
+	endif()
+endmacro()
+
+macro (cotire_check_ignore_header_file_path _headerFile _headerIsIgnoredVar)
+	if (NOT EXISTS "${_headerFile}")
+		set (${_headerIsIgnoredVar} TRUE)
+	elseif (IS_DIRECTORY "${_headerFile}")
+		set (${_headerIsIgnoredVar} TRUE)
+	elseif ("${_headerFile}" MATCHES "\\.\\.|[_-]fixed" AND "${_headerFile}" MATCHES "\\.h$")
+		# heuristic: ignore C headers with embedded parent directory references or "-fixed" or "_fixed" in path
+		# these often stem from using GCC #include_next tricks, which may break the precompiled header compilation
+		# with the error message "error: no include path in which to search for header.h"
+		set (${_headerIsIgnoredVar} TRUE)
+	else()
+		set (${_headerIsIgnoredVar} FALSE)
+	endif()
+endmacro()
+
+macro (cotire_check_ignore_header_file_ext _headerFile _ignoreExtensionsVar _headerIsIgnoredVar)
+	# check header file extension
+	cotire_get_source_file_extension("${_headerFile}" _headerFileExt)
+	set (${_headerIsIgnoredVar} FALSE)
+	if (_headerFileExt)
+		list (FIND ${_ignoreExtensionsVar} "${_headerFileExt}" _index)
+		if (_index GREATER -1)
+			set (${_headerIsIgnoredVar} TRUE)
+		endif()
+	endif()
+endmacro()
+
+macro (cotire_parse_line _line _headerFileVar _headerDepthVar)
+	if (MSVC)
+		# cl.exe /showIncludes produces different output, depending on the language pack used, e.g.:
+		# English: "Note: including file:   C:\directory\file"
+		# German: "Hinweis: Einlesen der Datei:   C:\directory\file"
+		# We use a very general regular expression, relying on the presence of the : characters
+		if (_line MATCHES "( +)([a-zA-Z]:[^:]+)$")
+			string (LENGTH "${CMAKE_MATCH_1}" ${_headerDepthVar})
+			get_filename_component(${_headerFileVar} "${CMAKE_MATCH_2}" ABSOLUTE)
+		else()
+			set (${_headerFileVar} "")
+			set (${_headerDepthVar} 0)
+		endif()
+	else()
+		if (_line MATCHES "^(\\.+) (.*)$")
+			# GCC like output
+			string (LENGTH "${CMAKE_MATCH_1}" ${_headerDepthVar})
+			if (IS_ABSOLUTE "${CMAKE_MATCH_2}")
+				set (${_headerFileVar} "${CMAKE_MATCH_2}")
+			else()
+				get_filename_component(${_headerFileVar} "${CMAKE_MATCH_2}" REALPATH)
+			endif()
+		else()
+			set (${_headerFileVar} "")
+			set (${_headerDepthVar} 0)
+		endif()
+	endif()
+endmacro()
+
+function (cotire_parse_includes _language _scanOutput _ignoredIncludeDirs _honoredIncludeDirs _ignoredExtensions _selectedIncludesVar _unparsedLinesVar)
+	if (WIN32)
+		# prevent CMake macro invocation errors due to backslash characters in Windows paths
+		string (REPLACE "\\" "/" _scanOutput "${_scanOutput}")
+	endif()
+	# canonize slashes
+	string (REPLACE "//" "/" _scanOutput "${_scanOutput}")
+	# prevent semicolon from being interpreted as a line separator
+	string (REPLACE ";" "\\;" _scanOutput "${_scanOutput}")
+	# then separate lines
+	string (REGEX REPLACE "\n" ";" _scanOutput "${_scanOutput}")
+	list (LENGTH _scanOutput _len)
+	# remove duplicate lines to speed up parsing
+	list (REMOVE_DUPLICATES _scanOutput)
+	list (LENGTH _scanOutput _uniqueLen)
+	if (COTIRE_VERBOSE OR COTIRE_DEBUG)
+		message (STATUS "Scanning ${_uniqueLen} unique lines of ${_len} for includes")
+		if (_ignoredExtensions)
+			message (STATUS "Ignored extensions: ${_ignoredExtensions}")
+		endif()
+		if (_ignoredIncludeDirs)
+			message (STATUS "Ignored paths: ${_ignoredIncludeDirs}")
+		endif()
+		if (_honoredIncludeDirs)
+			message (STATUS "Included paths: ${_honoredIncludeDirs}")
+		endif()
+	endif()
+	set (_sourceFiles ${ARGN})
+	set (_selectedIncludes "")
+	set (_unparsedLines "")
+	# stack keeps track of inside/outside project status of processed header files
+	set (_headerIsInsideStack "")
+	foreach (_line IN LISTS _scanOutput)
+		if (_line)
+			cotire_parse_line("${_line}" _headerFile _headerDepth)
+			if (_headerFile)
+				cotire_check_header_file_location("${_headerFile}" "${_ignoredIncludeDirs}" "${_honoredIncludeDirs}" _headerIsInside)
+				if (COTIRE_DEBUG)
+					message (STATUS "${_headerDepth}: ${_headerFile} ${_headerIsInside}")
+				endif()
+				# update stack
+				list (LENGTH _headerIsInsideStack _stackLen)
+				if (_headerDepth GREATER _stackLen)
+					math (EXPR _stackLen "${_stackLen} + 1")
+					foreach (_index RANGE ${_stackLen} ${_headerDepth})
+						list (APPEND _headerIsInsideStack ${_headerIsInside})
+					endforeach()
+				else()
+					foreach (_index RANGE ${_headerDepth} ${_stackLen})
+						list (REMOVE_AT _headerIsInsideStack -1)
+					endforeach()
+					list (APPEND _headerIsInsideStack ${_headerIsInside})
+				endif()
+				if (COTIRE_DEBUG)
+					message (STATUS "${_headerIsInsideStack}")
+				endif()
+				# header is a candidate if it is outside project
+				if (NOT _headerIsInside)
+					# get parent header file's inside/outside status
+					if (_headerDepth GREATER 1)
+						math (EXPR _index "${_headerDepth} - 2")
+						list (GET _headerIsInsideStack ${_index} _parentHeaderIsInside)
+					else()
+						set (_parentHeaderIsInside TRUE)
+					endif()
+					# select header file if parent header file is inside project
+					# (e.g., a project header file that includes a standard header file)
+					if (_parentHeaderIsInside)
+						cotire_check_ignore_header_file_path("${_headerFile}" _headerIsIgnored)
+						if (NOT _headerIsIgnored)
+							cotire_check_ignore_header_file_ext("${_headerFile}" _ignoredExtensions _headerIsIgnored)
+							if (NOT _headerIsIgnored)
+								list (APPEND _selectedIncludes "${_headerFile}")
+							else()
+								# fix header's inside status on stack, it is ignored by extension now
+								list (REMOVE_AT _headerIsInsideStack -1)
+								list (APPEND _headerIsInsideStack TRUE)
+							endif()
+						endif()
+						if (COTIRE_DEBUG)
+							message (STATUS "${_headerFile} ${_ignoredExtensions} ${_headerIsIgnored}")
+						endif()
+					endif()
+				endif()
+			else()
+				if (MSVC)
+					# for cl.exe do not keep unparsed lines which solely consist of a source file name
+					string (FIND "${_sourceFiles}" "${_line}" _index)
+					if (_index LESS 0)
+						list (APPEND _unparsedLines "${_line}")
+					endif()
+				else()
+					list (APPEND _unparsedLines "${_line}")
+				endif()
+			endif()
+		endif()
+	endforeach()
+	list (REMOVE_DUPLICATES _selectedIncludes)
+	set (${_selectedIncludesVar} ${_selectedIncludes} PARENT_SCOPE)
+	set (${_unparsedLinesVar} ${_unparsedLines} PARENT_SCOPE)
+endfunction()
+
+function (cotire_scan_includes _includesVar)
+	set(_options "")
+	set(_oneValueArgs COMPILER_ID COMPILER_EXECUTABLE COMPILER_ARG1 COMPILER_VERSION LANGUAGE UNPARSED_LINES SCAN_RESULT)
+	set(_multiValueArgs COMPILE_DEFINITIONS COMPILE_FLAGS INCLUDE_DIRECTORIES SYSTEM_INCLUDE_DIRECTORIES
+		IGNORE_PATH INCLUDE_PATH IGNORE_EXTENSIONS INCLUDE_PRIORITY_PATH COMPILER_LAUNCHER)
+	cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+	set (_sourceFiles ${_option_UNPARSED_ARGUMENTS})
+	if (NOT _option_LANGUAGE)
+		set (_option_LANGUAGE "CXX")
+	endif()
+	if (NOT _option_COMPILER_ID)
+		set (_option_COMPILER_ID "${CMAKE_${_option_LANGUAGE}_ID}")
+	endif()
+	if (NOT _option_COMPILER_VERSION)
+		set (_option_COMPILER_VERSION "${CMAKE_${_option_LANGUAGE}_COMPILER_VERSION}")
+	endif()
+	cotire_init_compile_cmd(_cmd "${_option_LANGUAGE}" "${_option_COMPILER_LAUNCHER}" "${_option_COMPILER_EXECUTABLE}" "${_option_COMPILER_ARG1}")
+	cotire_add_definitions_to_cmd(_cmd "${_option_LANGUAGE}" ${_option_COMPILE_DEFINITIONS})
+	cotire_add_compile_flags_to_cmd(_cmd ${_option_COMPILE_FLAGS})
+	cotire_add_includes_to_cmd(_cmd "${_option_LANGUAGE}" _option_INCLUDE_DIRECTORIES _option_SYSTEM_INCLUDE_DIRECTORIES)
+	cotire_add_frameworks_to_cmd(_cmd "${_option_LANGUAGE}" _option_INCLUDE_DIRECTORIES _option_SYSTEM_INCLUDE_DIRECTORIES)
+	cotire_add_makedep_flags("${_option_LANGUAGE}" "${_option_COMPILER_ID}" "${_option_COMPILER_VERSION}" _cmd)
+	# only consider existing source files for scanning
+	set (_existingSourceFiles "")
+	foreach (_sourceFile ${_sourceFiles})
+		if (EXISTS "${_sourceFile}")
+			list (APPEND _existingSourceFiles "${_sourceFile}")
+		endif()
+	endforeach()
+	if (NOT _existingSourceFiles)
+		set (${_includesVar} "" PARENT_SCOPE)
+		return()
+	endif()
+	# add source files to be scanned
+	if (WIN32)
+		foreach (_sourceFile ${_existingSourceFiles})
+			file (TO_NATIVE_PATH "${_sourceFile}" _sourceFileNative)
+			list (APPEND _cmd "${_sourceFileNative}")
+		endforeach()
+	else()
+		list (APPEND _cmd ${_existingSourceFiles})
+	endif()
+	if (COTIRE_VERBOSE)
+		message (STATUS "execute_process: ${_cmd}")
+	endif()
+	if (MSVC_IDE OR _option_COMPILER_ID MATCHES "MSVC")
+		# cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared
+		unset (ENV{VS_UNICODE_OUTPUT})
+	endif()
+	execute_process(
+		COMMAND ${_cmd}
+		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+		RESULT_VARIABLE _result
+		OUTPUT_QUIET
+		ERROR_VARIABLE _output)
+	if (_result)
+		message (STATUS "Result ${_result} scanning includes of ${_existingSourceFiles}.")
+	endif()
+	cotire_parse_includes(
+		"${_option_LANGUAGE}" "${_output}"
+		"${_option_IGNORE_PATH}" "${_option_INCLUDE_PATH}"
+		"${_option_IGNORE_EXTENSIONS}"
+		_includes _unparsedLines
+		${_sourceFiles})
+	if (_option_INCLUDE_PRIORITY_PATH)
+		set (_sortedIncludes "")
+		foreach (_priorityPath ${_option_INCLUDE_PRIORITY_PATH})
+			foreach (_include ${_includes})
+				string (FIND ${_include} ${_priorityPath} _position)
+				if (_position GREATER -1)
+					list (APPEND _sortedIncludes ${_include})
+				endif()
+			endforeach()
+		endforeach()
+		if (_sortedIncludes)
+			list (INSERT _includes 0 ${_sortedIncludes})
+			list (REMOVE_DUPLICATES _includes)
+		endif()
+	endif()
+	set (${_includesVar} ${_includes} PARENT_SCOPE)
+	if (_option_UNPARSED_LINES)
+		set (${_option_UNPARSED_LINES} ${_unparsedLines} PARENT_SCOPE)
+	endif()
+	if (_option_SCAN_RESULT)
+		set (${_option_SCAN_RESULT} ${_result} PARENT_SCOPE)
+	endif()
+endfunction()
+
+macro (cotire_append_undefs _contentsVar)
+	set (_undefs ${ARGN})
+	if (_undefs)
+		list (REMOVE_DUPLICATES _undefs)
+		foreach (_definition ${_undefs})
+			list (APPEND ${_contentsVar} "#undef ${_definition}")
+		endforeach()
+	endif()
+endmacro()
+
+macro (cotire_comment_str _language _commentText _commentVar)
+	if ("${_language}" STREQUAL "CMAKE")
+		set (${_commentVar} "# ${_commentText}")
+	else()
+		set (${_commentVar} "/* ${_commentText} */")
+	endif()
+endmacro()
+
+function (cotire_write_file _language _file _contents _force)
+	get_filename_component(_moduleName "${COTIRE_CMAKE_MODULE_FILE}" NAME)
+	cotire_comment_str("${_language}" "${_moduleName} ${COTIRE_CMAKE_MODULE_VERSION} generated file" _header1)
+	cotire_comment_str("${_language}" "${_file}" _header2)
+	set (_contents "${_header1}\n${_header2}\n${_contents}")
+	if (COTIRE_DEBUG)
+		message (STATUS "${_contents}")
+	endif()
+	if (_force OR NOT EXISTS "${_file}")
+		file (WRITE "${_file}" "${_contents}")
+	else()
+		file (READ "${_file}" _oldContents)
+		if (NOT "${_oldContents}" STREQUAL "${_contents}")
+			file (WRITE "${_file}" "${_contents}")
+		else()
+			if (COTIRE_DEBUG)
+				message (STATUS "${_file} unchanged")
+			endif()
+		endif()
+	endif()
+endfunction()
+
+function (cotire_generate_unity_source _unityFile)
+	set(_options "")
+	set(_oneValueArgs LANGUAGE)
+	set(_multiValueArgs
+		DEPENDS SOURCES_COMPILE_DEFINITIONS
+		PRE_UNDEFS SOURCES_PRE_UNDEFS POST_UNDEFS SOURCES_POST_UNDEFS PROLOGUE EPILOGUE)
+	cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+	if (_option_DEPENDS)
+		cotire_check_file_up_to_date(_unityFileIsUpToDate "${_unityFile}" ${_option_DEPENDS})
+		if (_unityFileIsUpToDate)
+			return()
+		endif()
+	endif()
+	set (_sourceFiles ${_option_UNPARSED_ARGUMENTS})
+	if (NOT _option_PRE_UNDEFS)
+		set (_option_PRE_UNDEFS "")
+	endif()
+	if (NOT _option_SOURCES_PRE_UNDEFS)
+		set (_option_SOURCES_PRE_UNDEFS "")
+	endif()
+	if (NOT _option_POST_UNDEFS)
+		set (_option_POST_UNDEFS "")
+	endif()
+	if (NOT _option_SOURCES_POST_UNDEFS)
+		set (_option_SOURCES_POST_UNDEFS "")
+	endif()
+	set (_contents "")
+	if (_option_PROLOGUE)
+		list (APPEND _contents ${_option_PROLOGUE})
+	endif()
+	if (_option_LANGUAGE AND _sourceFiles)
+		if ("${_option_LANGUAGE}" STREQUAL "CXX")
+			list (APPEND _contents "#ifdef __cplusplus")
+		elseif ("${_option_LANGUAGE}" STREQUAL "C")
+			list (APPEND _contents "#ifndef __cplusplus")
+		endif()
+	endif()
+	set (_compileUndefinitions "")
+	foreach (_sourceFile ${_sourceFiles})
+		cotire_get_source_compile_definitions(
+			"${_option_CONFIGURATION}" "${_option_LANGUAGE}" "${_sourceFile}" _compileDefinitions
+			${_option_SOURCES_COMPILE_DEFINITIONS})
+		cotire_get_source_undefs("${_sourceFile}" COTIRE_UNITY_SOURCE_PRE_UNDEFS _sourcePreUndefs ${_option_SOURCES_PRE_UNDEFS})
+		cotire_get_source_undefs("${_sourceFile}" COTIRE_UNITY_SOURCE_POST_UNDEFS _sourcePostUndefs ${_option_SOURCES_POST_UNDEFS})
+		if (_option_PRE_UNDEFS)
+			list (APPEND _compileUndefinitions ${_option_PRE_UNDEFS})
+		endif()
+		if (_sourcePreUndefs)
+			list (APPEND _compileUndefinitions ${_sourcePreUndefs})
+		endif()
+		if (_compileUndefinitions)
+			cotire_append_undefs(_contents ${_compileUndefinitions})
+			set (_compileUndefinitions "")
+		endif()
+		if (_sourcePostUndefs)
+			list (APPEND _compileUndefinitions ${_sourcePostUndefs})
+		endif()
+		if (_option_POST_UNDEFS)
+			list (APPEND _compileUndefinitions ${_option_POST_UNDEFS})
+		endif()
+		foreach (_definition ${_compileDefinitions})
+			if (_definition MATCHES "^([a-zA-Z0-9_]+)=(.+)$")
+				list (APPEND _contents "#define ${CMAKE_MATCH_1} ${CMAKE_MATCH_2}")
+				list (INSERT _compileUndefinitions 0 "${CMAKE_MATCH_1}")
+			else()
+				list (APPEND _contents "#define ${_definition}")
+				list (INSERT _compileUndefinitions 0 "${_definition}")
+			endif()
+		endforeach()
+		# use absolute path as source file location
+		get_filename_component(_sourceFileLocation "${_sourceFile}" ABSOLUTE)
+		if (WIN32)
+			file (TO_NATIVE_PATH "${_sourceFileLocation}" _sourceFileLocation)
+		endif()
+		list (APPEND _contents "#include \"${_sourceFileLocation}\"")
+	endforeach()
+	if (_compileUndefinitions)
+		cotire_append_undefs(_contents ${_compileUndefinitions})
+		set (_compileUndefinitions "")
+	endif()
+	if (_option_LANGUAGE AND _sourceFiles)
+		list (APPEND _contents "#endif")
+	endif()
+	if (_option_EPILOGUE)
+		list (APPEND _contents ${_option_EPILOGUE})
+	endif()
+	list (APPEND _contents "")
+	string (REPLACE ";" "\n" _contents "${_contents}")
+	if (COTIRE_VERBOSE)
+		message ("${_contents}")
+	endif()
+	cotire_write_file("${_option_LANGUAGE}" "${_unityFile}" "${_contents}" TRUE)
+endfunction()
+
+function (cotire_generate_prefix_header _prefixFile)
+	set(_options "")
+	set(_oneValueArgs LANGUAGE COMPILER_EXECUTABLE COMPILER_ARG1 COMPILER_ID COMPILER_VERSION)
+	set(_multiValueArgs DEPENDS COMPILE_DEFINITIONS COMPILE_FLAGS
+		INCLUDE_DIRECTORIES SYSTEM_INCLUDE_DIRECTORIES IGNORE_PATH INCLUDE_PATH
+		IGNORE_EXTENSIONS INCLUDE_PRIORITY_PATH COMPILER_LAUNCHER)
+	cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+	if (NOT _option_COMPILER_ID)
+		set (_option_COMPILER_ID "${CMAKE_${_option_LANGUAGE}_ID}")
+	endif()
+	if (NOT _option_COMPILER_VERSION)
+		set (_option_COMPILER_VERSION "${CMAKE_${_option_LANGUAGE}_COMPILER_VERSION}")
+	endif()
+	if (_option_DEPENDS)
+		cotire_check_file_up_to_date(_prefixFileIsUpToDate "${_prefixFile}" ${_option_DEPENDS})
+		if (_prefixFileIsUpToDate)
+			# create empty log file
+			set (_unparsedLinesFile "${_prefixFile}.log")
+			file (WRITE "${_unparsedLinesFile}" "")
+			return()
+		endif()
+	endif()
+	set (_prologue "")
+	set (_epilogue "")
+	if (_option_COMPILER_ID MATCHES "Clang")
+		set (_prologue "#pragma clang system_header")
+	elseif (_option_COMPILER_ID MATCHES "GNU")
+		set (_prologue "#pragma GCC system_header")
+	elseif (_option_COMPILER_ID MATCHES "MSVC")
+		set (_prologue "#pragma warning(push, 0)")
+		set (_epilogue "#pragma warning(pop)")
+	elseif (_option_COMPILER_ID MATCHES "Intel")
+		# Intel compiler requires hdrstop pragma to stop generating PCH file
+		set (_epilogue "#pragma hdrstop")
+	endif()
+	set (_sourceFiles ${_option_UNPARSED_ARGUMENTS})
+	cotire_scan_includes(_selectedHeaders ${_sourceFiles}
+		LANGUAGE "${_option_LANGUAGE}"
+		COMPILER_LAUNCHER "${_option_COMPILER_LAUNCHER}"
+		COMPILER_EXECUTABLE "${_option_COMPILER_EXECUTABLE}"
+		COMPILER_ARG1 "${_option_COMPILER_ARG1}"
+		COMPILER_ID "${_option_COMPILER_ID}"
+		COMPILER_VERSION "${_option_COMPILER_VERSION}"
+		COMPILE_DEFINITIONS ${_option_COMPILE_DEFINITIONS}
+		COMPILE_FLAGS ${_option_COMPILE_FLAGS}
+		INCLUDE_DIRECTORIES ${_option_INCLUDE_DIRECTORIES}
+		SYSTEM_INCLUDE_DIRECTORIES ${_option_SYSTEM_INCLUDE_DIRECTORIES}
+		IGNORE_PATH ${_option_IGNORE_PATH}
+		INCLUDE_PATH ${_option_INCLUDE_PATH}
+		IGNORE_EXTENSIONS ${_option_IGNORE_EXTENSIONS}
+		INCLUDE_PRIORITY_PATH ${_option_INCLUDE_PRIORITY_PATH}
+		UNPARSED_LINES _unparsedLines
+		SCAN_RESULT _scanResult)
+	cotire_generate_unity_source("${_prefixFile}"
+		PROLOGUE ${_prologue} EPILOGUE ${_epilogue} LANGUAGE "${_option_LANGUAGE}" ${_selectedHeaders})
+	set (_unparsedLinesFile "${_prefixFile}.log")
+	if (_unparsedLines)
+		if (COTIRE_VERBOSE OR _scanResult OR NOT _selectedHeaders)
+			list (LENGTH _unparsedLines _skippedLineCount)
+			if (WIN32)
+				file (TO_NATIVE_PATH "${_unparsedLinesFile}" _unparsedLinesLogPath)
+			else()
+				set (_unparsedLinesLogPath "${_unparsedLinesFile}")
+			endif()
+			message (STATUS "${_skippedLineCount} line(s) skipped, see ${_unparsedLinesLogPath}")
+		endif()
+		string (REPLACE ";" "\n" _unparsedLines "${_unparsedLines}")
+	endif()
+	file (WRITE "${_unparsedLinesFile}" "${_unparsedLines}\n")
+endfunction()
+
+function (cotire_add_makedep_flags _language _compilerID _compilerVersion _flagsVar)
+	set (_flags ${${_flagsVar}})
+	if (_compilerID MATCHES "MSVC")
+		# cl.exe options used
+		# /nologo suppresses display of sign-on banner
+		# /TC treat all files named on the command line as C source files
+		# /TP treat all files named on the command line as C++ source files
+		# /EP preprocess to stdout without #line directives
+		# /showIncludes list include files
+		set (_sourceFileTypeC "/TC")
+		set (_sourceFileTypeCXX "/TP")
+		if (_flags)
+			# append to list
+			list (APPEND _flags /nologo "${_sourceFileType${_language}}" /EP /showIncludes)
+		else()
+			# return as a flag string
+			set (_flags "${_sourceFileType${_language}} /EP /showIncludes")
+		endif()
+	elseif (_compilerID MATCHES "GNU")
+		# GCC options used
+		# -H print the name of each header file used
+		# -E invoke preprocessor
+		# -fdirectives-only do not expand macros, requires GCC >= 4.3
+		if (_flags)
+			# append to list
+			list (APPEND _flags -H -E)
+			if (NOT "${_compilerVersion}" VERSION_LESS "4.3.0")
+				list (APPEND _flags -fdirectives-only)
+			endif()
+		else()
+			# return as a flag string
+			set (_flags "-H -E")
+			if (NOT "${_compilerVersion}" VERSION_LESS "4.3.0")
+				set (_flags "${_flags} -fdirectives-only")
+			endif()
+		endif()
+	elseif (_compilerID MATCHES "Clang")
+		if (UNIX)
+			# Clang options used
+			# -H print the name of each header file used
+			# -E invoke preprocessor
+			# -fno-color-diagnostics do not print diagnostics in color
+			# -Eonly just run preprocessor, no output
+			if (_flags)
+				# append to list
+				list (APPEND _flags -H -E -fno-color-diagnostics -Xclang -Eonly)
+			else()
+				# return as a flag string
+				set (_flags "-H -E -fno-color-diagnostics -Xclang -Eonly")
+			endif()
+		elseif (WIN32)
+			# Clang-cl.exe options used
+			# /TC treat all files named on the command line as C source files
+			# /TP treat all files named on the command line as C++ source files
+			# /EP preprocess to stdout without #line directives
+			# -H print the name of each header file used
+			# -fno-color-diagnostics do not print diagnostics in color
+			# -Eonly just run preprocessor, no output
+			set (_sourceFileTypeC "/TC")
+			set (_sourceFileTypeCXX "/TP")
+			if (_flags)
+				# append to list
+				list (APPEND _flags "${_sourceFileType${_language}}" /EP -fno-color-diagnostics -Xclang -H -Xclang -Eonly)
+			else()
+				# return as a flag string
+				set (_flags "${_sourceFileType${_language}} /EP -fno-color-diagnostics -Xclang -H -Xclang -Eonly")
+			endif()
+		endif()
+	elseif (_compilerID MATCHES "Intel")
+		if (WIN32)
+			# Windows Intel options used
+			# /nologo do not display compiler version information
+			# /QH display the include file order
+			# /EP preprocess to stdout, omitting #line directives
+			# /TC process all source or unrecognized file types as C source files
+			# /TP process all source or unrecognized file types as C++ source files
+			set (_sourceFileTypeC "/TC")
+			set (_sourceFileTypeCXX "/TP")
+			if (_flags)
+				# append to list
+				list (APPEND _flags /nologo "${_sourceFileType${_language}}" /EP /QH)
+			else()
+				# return as a flag string
+				set (_flags "${_sourceFileType${_language}} /EP /QH")
+			endif()
+		else()
+			# Linux / Mac OS X Intel options used
+			# -H print the name of each header file used
+			# -EP preprocess to stdout, omitting #line directives
+			# -Kc++ process all source or unrecognized file types as C++ source files
+			if (_flags)
+				# append to list
+				if ("${_language}" STREQUAL "CXX")
+					list (APPEND _flags -Kc++)
+				endif()
+				list (APPEND _flags -H -EP)
+			else()
+				# return as a flag string
+				if ("${_language}" STREQUAL "CXX")
+					set (_flags "-Kc++ ")
+				endif()
+				set (_flags "${_flags}-H -EP")
+			endif()
+		endif()
+	else()
+		message (FATAL_ERROR "cotire: unsupported ${_language} compiler ${_compilerID} version ${_compilerVersion}.")
+	endif()
+	set (${_flagsVar} ${_flags} PARENT_SCOPE)
+endfunction()
+
+function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersion _prefixFile _pchFile _hostFile _flagsVar)
+	set (_flags ${${_flagsVar}})
+	if (_compilerID MATCHES "MSVC")
+		file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
+		file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative)
+		file (TO_NATIVE_PATH "${_hostFile}" _hostFileNative)
+		# cl.exe options used
+		# /Yc creates a precompiled header file
+		# /Fp specifies precompiled header binary file name
+		# /FI forces inclusion of file
+		# /TC treat all files named on the command line as C source files
+		# /TP treat all files named on the command line as C++ source files
+		# /Zs syntax check only
+		# /Zm precompiled header memory allocation scaling factor
+		set (_sourceFileTypeC "/TC")
+		set (_sourceFileTypeCXX "/TP")
+		if (_flags)
+			# append to list
+			list (APPEND _flags /nologo "${_sourceFileType${_language}}"
+				"/Yc${_prefixFileNative}" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}" /Zs "${_hostFileNative}")
+			if (COTIRE_PCH_MEMORY_SCALING_FACTOR)
+				list (APPEND _flags "/Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}")
+			endif()
+		else()
+			# return as a flag string
+			set (_flags "/Yc\"${_prefixFileNative}\" /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"")
+			if (COTIRE_PCH_MEMORY_SCALING_FACTOR)
+				set (_flags "${_flags} /Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}")
+			endif()
+		endif()
+	elseif (_compilerID MATCHES "GNU")
+		# GCC options used
+		# -x specify the source language
+		# -c compile but do not link
+		# -o place output in file
+		# note that we cannot use -w to suppress all warnings upon pre-compiling, because turning off a warning may
+		# alter compile flags as a side effect (e.g., -Wwrite-string implies -fconst-strings)
+		set (_xLanguage_C "c-header")
+		set (_xLanguage_CXX "c++-header")
+		if (_flags)
+			# append to list
+			list (APPEND _flags -x "${_xLanguage_${_language}}" -c "${_prefixFile}" -o "${_pchFile}")
+		else()
+			# return as a flag string
+			set (_flags "-x ${_xLanguage_${_language}} -c \"${_prefixFile}\" -o \"${_pchFile}\"")
+		endif()
+	elseif (_compilerID MATCHES "Clang")
+		if (UNIX)
+			# Clang options used
+			# -x specify the source language
+			# -c compile but do not link
+			# -o place output in file
+			# -fno-pch-timestamp disable inclusion of timestamp in precompiled headers (clang 4.0.0+)
+			set (_xLanguage_C "c-header")
+			set (_xLanguage_CXX "c++-header")
+			if (_flags)
+				# append to list
+				list (APPEND _flags -x "${_xLanguage_${_language}}" -c "${_prefixFile}" -o "${_pchFile}")
+				if (NOT "${_compilerVersion}" VERSION_LESS "4.0.0")
+					list (APPEND _flags -Xclang -fno-pch-timestamp)
+				endif()
+			else()
+				# return as a flag string
+				set (_flags "-x ${_xLanguage_${_language}} -c \"${_prefixFile}\" -o \"${_pchFile}\"")
+				if (NOT "${_compilerVersion}" VERSION_LESS "4.0.0")
+					set (_flags "${_flags} -Xclang -fno-pch-timestamp")
+				endif()
+			endif()
+		elseif (WIN32)
+			# Clang-cl.exe options used
+			# /Yc creates a precompiled header file
+			# /Fp specifies precompiled header binary file name
+			# /FI forces inclusion of file
+			# /Zs syntax check only
+			# /TC treat all files named on the command line as C source files
+			# /TP treat all files named on the command line as C++ source files
+			set (_sourceFileTypeC "/TC")
+			set (_sourceFileTypeCXX "/TP")
+			if (_flags)
+				# append to list
+				list (APPEND _flags "${_sourceFileType${_language}}"
+						"/Yc${_prefixFile}" "/Fp${_pchFile}" "/FI${_prefixFile}" /Zs "${_hostFile}")
+			else()
+				# return as a flag string
+				set (_flags "/Yc\"${_prefixFile}\" /Fp\"${_pchFile}\" /FI\"${_prefixFile}\"")
+			endif()
+		endif()
+	elseif (_compilerID MATCHES "Intel")
+		if (WIN32)
+			file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
+			file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative)
+			file (TO_NATIVE_PATH "${_hostFile}" _hostFileNative)
+			# Windows Intel options used
+			# /nologo do not display compiler version information
+			# /Yc create a precompiled header (PCH) file
+			# /Fp specify a path or file name for precompiled header files
+			# /FI tells the preprocessor to include a specified file name as the header file
+			# /TC process all source or unrecognized file types as C source files
+			# /TP process all source or unrecognized file types as C++ source files
+			# /Zs syntax check only
+			# /Wpch-messages enable diagnostics related to pre-compiled headers (requires Intel XE 2013 Update 2)
+			set (_sourceFileTypeC "/TC")
+			set (_sourceFileTypeCXX "/TP")
+			if (_flags)
+				# append to list
+				list (APPEND _flags /nologo "${_sourceFileType${_language}}"
+					"/Yc" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}" /Zs "${_hostFileNative}")
+				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+					list (APPEND _flags "/Wpch-messages")
+				endif()
+			else()
+				# return as a flag string
+				set (_flags "/Yc /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"")
+				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+					set (_flags "${_flags} /Wpch-messages")
+				endif()
+			endif()
+		else()
+			# Linux / Mac OS X Intel options used
+			# -pch-dir location for precompiled header files
+			# -pch-create name of the precompiled header (PCH) to create
+			# -Kc++ process all source or unrecognized file types as C++ source files
+			# -fsyntax-only check only for correct syntax
+			# -Wpch-messages enable diagnostics related to pre-compiled headers (requires Intel XE 2013 Update 2)
+			get_filename_component(_pchDir "${_pchFile}" DIRECTORY)
+			get_filename_component(_pchName "${_pchFile}" NAME)
+			set (_xLanguage_C "c-header")
+			set (_xLanguage_CXX "c++-header")
+			set (_pchSuppressMessages FALSE)
+			if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*")
+				set(_pchSuppressMessages TRUE)
+			endif()
+			if (_flags)
+				# append to list
+				if ("${_language}" STREQUAL "CXX")
+					list (APPEND _flags -Kc++)
+				endif()
+				list (APPEND _flags -include "${_prefixFile}" -pch-dir "${_pchDir}" -pch-create "${_pchName}" -fsyntax-only "${_hostFile}")
+				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+					if (NOT _pchSuppressMessages)
+						list (APPEND _flags -Wpch-messages)
+					endif()
+				endif()
+			else()
+				# return as a flag string
+				set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-create \"${_pchName}\"")
+				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+					if (NOT _pchSuppressMessages)
+						set (_flags "${_flags} -Wpch-messages")
+					endif()
+				endif()
+			endif()
+		endif()
+	else()
+		message (FATAL_ERROR "cotire: unsupported ${_language} compiler ${_compilerID} version ${_compilerVersion}.")
+	endif()
+	set (${_flagsVar} ${_flags} PARENT_SCOPE)
+endfunction()
+
+function (cotire_add_prefix_pch_inclusion_flags _language _compilerID _compilerVersion _prefixFile _pchFile _flagsVar)
+	set (_flags ${${_flagsVar}})
+	if (_compilerID MATCHES "MSVC")
+		file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
+		# cl.exe options used
+		# /Yu uses a precompiled header file during build
+		# /Fp specifies precompiled header binary file name
+		# /FI forces inclusion of file
+		# /Zm precompiled header memory allocation scaling factor
+		if (_pchFile)
+			file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative)
+			if (_flags)
+				# append to list
+				list (APPEND _flags "/Yu${_prefixFileNative}" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}")
+				if (COTIRE_PCH_MEMORY_SCALING_FACTOR)
+					list (APPEND _flags "/Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}")
+				endif()
+			else()
+				# return as a flag string
+				set (_flags "/Yu\"${_prefixFileNative}\" /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"")
+				if (COTIRE_PCH_MEMORY_SCALING_FACTOR)
+					set (_flags "${_flags} /Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}")
+				endif()
+			endif()
+		else()
+			# no precompiled header, force inclusion of prefix header
+			if (_flags)
+				# append to list
+				list (APPEND _flags "/FI${_prefixFileNative}")
+			else()
+				# return as a flag string
+				set (_flags "/FI\"${_prefixFileNative}\"")
+			endif()
+		endif()
+	elseif (_compilerID MATCHES "GNU")
+		# GCC options used
+		# -include process include file as the first line of the primary source file
+		# -Winvalid-pch warns if precompiled header is found but cannot be used
+		# note: ccache requires the -include flag to be used in order to process precompiled header correctly
+		if (_flags)
+			# append to list
+			list (APPEND _flags -Winvalid-pch -include "${_prefixFile}")
+		else()
+			# return as a flag string
+			set (_flags "-Winvalid-pch -include \"${_prefixFile}\"")
+		endif()
+	elseif (_compilerID MATCHES "Clang")
+		if (UNIX)
+			# Clang options used
+			# -include process include file as the first line of the primary source file
+			# note: ccache requires the -include flag to be used in order to process precompiled header correctly
+			if (_flags)
+				# append to list
+				list (APPEND _flags -include "${_prefixFile}")
+			else()
+				# return as a flag string
+				set (_flags "-include \"${_prefixFile}\"")
+			endif()
+		elseif (WIN32)
+			# Clang-cl.exe options used
+			# /Yu uses a precompiled header file during build
+			# /Fp specifies precompiled header binary file name
+			# /FI forces inclusion of file
+			if (_pchFile)
+				if (_flags)
+					# append to list
+					list (APPEND _flags "/Yu${_prefixFile}" "/Fp${_pchFile}" "/FI${_prefixFile}")
+				else()
+					# return as a flag string
+					set (_flags "/Yu\"${_prefixFile}\" /Fp\"${_pchFile}\" /FI\"${_prefixFile}\"")
+				endif()
+			else()
+				# no precompiled header, force inclusion of prefix header
+				if (_flags)
+					# append to list
+					list (APPEND _flags "/FI${_prefixFile}")
+				else()
+					# return as a flag string
+					set (_flags "/FI\"${_prefixFile}\"")
+				endif()
+			endif()
+		endif()
+	elseif (_compilerID MATCHES "Intel")
+		if (WIN32)
+			file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
+			# Windows Intel options used
+			# /Yu use a precompiled header (PCH) file
+			# /Fp specify a path or file name for precompiled header files
+			# /FI tells the preprocessor to include a specified file name as the header file
+			# /Wpch-messages enable diagnostics related to pre-compiled headers (requires Intel XE 2013 Update 2)
+			if (_pchFile)
+				file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative)
+				if (_flags)
+					# append to list
+					list (APPEND _flags "/Yu" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}")
+					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+						list (APPEND _flags "/Wpch-messages")
+					endif()
+				else()
+					# return as a flag string
+					set (_flags "/Yu /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"")
+					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+						set (_flags "${_flags} /Wpch-messages")
+					endif()
+				endif()
+			else()
+				# no precompiled header, force inclusion of prefix header
+				if (_flags)
+					# append to list
+					list (APPEND _flags "/FI${_prefixFileNative}")
+				else()
+					# return as a flag string
+					set (_flags "/FI\"${_prefixFileNative}\"")
+				endif()
+			endif()
+		else()
+			# Linux / Mac OS X Intel options used
+			# -pch-dir location for precompiled header files
+			# -pch-use name of the precompiled header (PCH) to use
+			# -include process include file as the first line of the primary source file
+			# -Wpch-messages enable diagnostics related to pre-compiled headers (requires Intel XE 2013 Update 2)
+			if (_pchFile)
+				get_filename_component(_pchDir "${_pchFile}" DIRECTORY)
+				get_filename_component(_pchName "${_pchFile}" NAME)
+				set (_pchSuppressMessages FALSE)
+				if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*")
+					set(_pchSuppressMessages TRUE)
+				endif()
+				if (_flags)
+					# append to list
+					list (APPEND _flags -include "${_prefixFile}" -pch-dir "${_pchDir}" -pch-use "${_pchName}")
+					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+						if (NOT _pchSuppressMessages)
+							list (APPEND _flags -Wpch-messages)
+						endif()
+					endif()
+				else()
+					# return as a flag string
+					set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-use \"${_pchName}\"")
+					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+						if (NOT _pchSuppressMessages)
+							set (_flags "${_flags} -Wpch-messages")
+						endif()
+					endif()
+				endif()
+			else()
+				# no precompiled header, force inclusion of prefix header
+				if (_flags)
+					# append to list
+					list (APPEND _flags -include "${_prefixFile}")
+				else()
+					# return as a flag string
+					set (_flags "-include \"${_prefixFile}\"")
+				endif()
+			endif()
+		endif()
+	else()
+		message (FATAL_ERROR "cotire: unsupported ${_language} compiler ${_compilerID} version ${_compilerVersion}.")
+	endif()
+	set (${_flagsVar} ${_flags} PARENT_SCOPE)
+endfunction()
+
+function (cotire_precompile_prefix_header _prefixFile _pchFile _hostFile)
+	set(_options "")
+	set(_oneValueArgs COMPILER_EXECUTABLE COMPILER_ARG1 COMPILER_ID COMPILER_VERSION LANGUAGE)
+	set(_multiValueArgs COMPILE_DEFINITIONS COMPILE_FLAGS INCLUDE_DIRECTORIES SYSTEM_INCLUDE_DIRECTORIES SYS COMPILER_LAUNCHER)
+	cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+	if (NOT _option_LANGUAGE)
+		set (_option_LANGUAGE "CXX")
+	endif()
+	if (NOT _option_COMPILER_ID)
+		set (_option_COMPILER_ID "${CMAKE_${_option_LANGUAGE}_ID}")
+	endif()
+	if (NOT _option_COMPILER_VERSION)
+		set (_option_COMPILER_VERSION "${CMAKE_${_option_LANGUAGE}_COMPILER_VERSION}")
+	endif()
+	cotire_init_compile_cmd(_cmd "${_option_LANGUAGE}" "${_option_COMPILER_LAUNCHER}" "${_option_COMPILER_EXECUTABLE}" "${_option_COMPILER_ARG1}")
+	cotire_add_definitions_to_cmd(_cmd "${_option_LANGUAGE}" ${_option_COMPILE_DEFINITIONS})
+	cotire_add_compile_flags_to_cmd(_cmd ${_option_COMPILE_FLAGS})
+	cotire_add_includes_to_cmd(_cmd "${_option_LANGUAGE}" _option_INCLUDE_DIRECTORIES _option_SYSTEM_INCLUDE_DIRECTORIES)
+	cotire_add_frameworks_to_cmd(_cmd "${_option_LANGUAGE}" _option_INCLUDE_DIRECTORIES _option_SYSTEM_INCLUDE_DIRECTORIES)
+	cotire_add_pch_compilation_flags(
+		"${_option_LANGUAGE}" "${_option_COMPILER_ID}" "${_option_COMPILER_VERSION}"
+		"${_prefixFile}" "${_pchFile}" "${_hostFile}" _cmd)
+	if (COTIRE_VERBOSE)
+		message (STATUS "execute_process: ${_cmd}")
+	endif()
+	if (MSVC_IDE OR _option_COMPILER_ID MATCHES "MSVC")
+		# cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared
+		unset (ENV{VS_UNICODE_OUTPUT})
+	elseif (_option_COMPILER_ID MATCHES "Clang" AND _option_COMPILER_VERSION VERSION_LESS "4.0.0")
+		if (_option_COMPILER_LAUNCHER MATCHES "ccache" OR
+			_option_COMPILER_EXECUTABLE MATCHES "ccache")
+			# Newer versions of Clang embed a compilation timestamp into the precompiled header binary,
+			# which results in "file has been modified since the precompiled header was built" errors if ccache is used.
+			# We work around the problem by disabling ccache upon pre-compiling the prefix header.
+			set (ENV{CCACHE_DISABLE} "true")
+		endif()
+	endif()
+	execute_process(
+		COMMAND ${_cmd}
+		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+		RESULT_VARIABLE _result)
+	if (_result)
+		message (FATAL_ERROR "cotire: error ${_result} precompiling ${_prefixFile}.")
+	endif()
+endfunction()
+
+function (cotire_check_precompiled_header_support _language _target _msgVar)
+	set (_unsupportedCompiler
+		"Precompiled headers not supported for ${_language} compiler ${CMAKE_${_language}_COMPILER_ID}")
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC")
+		# PCH supported since Visual Studio C++ 6.0
+		# and CMake does not support an earlier version
+		set (${_msgVar} "" PARENT_SCOPE)
+	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "GNU")
+		# GCC PCH support requires version >= 3.4
+		if ("${CMAKE_${_language}_COMPILER_VERSION}" VERSION_LESS "3.4.0")
+			set (${_msgVar} "${_unsupportedCompiler} version ${CMAKE_${_language}_COMPILER_VERSION}." PARENT_SCOPE)
+		else()
+			set (${_msgVar} "" PARENT_SCOPE)
+		endif()
+	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Clang")
+		if (UNIX)
+			# all Unix Clang versions have PCH support
+			set (${_msgVar} "" PARENT_SCOPE)
+		elseif (WIN32)
+			# only clang-cl is supported under Windows
+			get_filename_component(_compilerName "${CMAKE_${_language}_COMPILER}" NAME_WE)
+			if (NOT _compilerName MATCHES "cl$")
+				set (${_msgVar} "${_unsupportedCompiler} version ${CMAKE_${_language}_COMPILER_VERSION}. Use clang-cl instead." PARENT_SCOPE)
+			endif()
+		endif()
+	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Intel")
+		# Intel PCH support requires version >= 8.0.0
+		if ("${CMAKE_${_language}_COMPILER_VERSION}" VERSION_LESS "8.0.0")
+			set (${_msgVar} "${_unsupportedCompiler} version ${CMAKE_${_language}_COMPILER_VERSION}." PARENT_SCOPE)
+		else()
+			set (${_msgVar} "" PARENT_SCOPE)
+		endif()
+	else()
+		set (${_msgVar} "${_unsupportedCompiler}." PARENT_SCOPE)
+	endif()
+	# check if ccache is used as a compiler launcher
+	get_target_property(_launcher ${_target} ${_language}_COMPILER_LAUNCHER)
+	get_filename_component(_realCompilerExe "${CMAKE_${_language}_COMPILER}" REALPATH)
+	if (_realCompilerExe MATCHES "ccache" OR _launcher MATCHES "ccache")
+		# verify that ccache configuration is compatible with precompiled headers
+		# always check environment variable CCACHE_SLOPPINESS, because earlier versions of ccache
+		# do not report the "sloppiness" setting correctly upon printing ccache configuration
+		if (DEFINED ENV{CCACHE_SLOPPINESS})
+			if (NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "pch_defines" OR
+				NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "time_macros")
+				set (${_msgVar}
+					"ccache requires the environment variable CCACHE_SLOPPINESS to be set to \"pch_defines,time_macros\"."
+					PARENT_SCOPE)
+			endif()
+		else()
+			if (_realCompilerExe MATCHES "ccache")
+				set (_ccacheExe "${_realCompilerExe}")
+			else()
+				set (_ccacheExe "${_launcher}")
+			endif()
+			execute_process(
+				COMMAND "${_ccacheExe}" "--print-config"
+				WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+				RESULT_VARIABLE _result
+				OUTPUT_VARIABLE _ccacheConfig OUTPUT_STRIP_TRAILING_WHITESPACE
+				ERROR_QUIET)
+			if (_result)
+				set (${_msgVar} "ccache configuration cannot be determined." PARENT_SCOPE)
+			elseif (NOT _ccacheConfig MATCHES "sloppiness.*=.*time_macros" OR
+				NOT _ccacheConfig MATCHES "sloppiness.*=.*pch_defines")
+				set (${_msgVar}
+					"ccache requires configuration setting \"sloppiness\" to be set to \"pch_defines,time_macros\"."
+					PARENT_SCOPE)
+			endif()
+		endif()
+	endif()
+	if (APPLE)
+		# PCH compilation not supported by GCC / Clang for multi-architecture builds (e.g., i386, x86_64)
+		cotire_get_configuration_types(_configs)
+		foreach (_config ${_configs})
+			set (_targetFlags "")
+			cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags)
+			cotire_filter_compile_flags("${_language}" "arch" _architectures _ignore ${_targetFlags})
+			list (LENGTH _architectures _numberOfArchitectures)
+			if (_numberOfArchitectures GREATER 1)
+				string (REPLACE ";" ", " _architectureStr "${_architectures}")
+				set (${_msgVar}
+					"Precompiled headers not supported on Darwin for multi-architecture builds (${_architectureStr})."
+					PARENT_SCOPE)
+				break()
+			endif()
+		endforeach()
+	endif()
+endfunction()
+
+macro (cotire_get_intermediate_dir _cotireDir)
+	# ${CMAKE_CFG_INTDIR} may reference a build-time variable when using a generator which supports configuration types
+	get_filename_component(${_cotireDir} "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${COTIRE_INTDIR}" ABSOLUTE)
+endmacro()
+
+macro (cotire_setup_file_extension_variables)
+	set (_unityFileExt_C ".c")
+	set (_unityFileExt_CXX ".cxx")
+	set (_prefixFileExt_C ".h")
+	set (_prefixFileExt_CXX ".hxx")
+	set (_prefixSourceFileExt_C ".c")
+	set (_prefixSourceFileExt_CXX ".cxx")
+endmacro()
+
+function (cotire_make_single_unity_source_file_path _language _target _unityFileVar)
+	cotire_setup_file_extension_variables()
+	if (NOT DEFINED _unityFileExt_${_language})
+		set (${_unityFileVar} "" PARENT_SCOPE)
+		return()
+	endif()
+	set (_unityFileBaseName "${_target}_${_language}${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}")
+	set (_unityFileName "${_unityFileBaseName}${_unityFileExt_${_language}}")
+	cotire_get_intermediate_dir(_baseDir)
+	set (_unityFile "${_baseDir}/${_unityFileName}")
+	set (${_unityFileVar} "${_unityFile}" PARENT_SCOPE)
+endfunction()
+
+function (cotire_make_unity_source_file_paths _language _target _maxIncludes _unityFilesVar)
+	cotire_setup_file_extension_variables()
+	if (NOT DEFINED _unityFileExt_${_language})
+		set (${_unityFileVar} "" PARENT_SCOPE)
+		return()
+	endif()
+	set (_unityFileBaseName "${_target}_${_language}${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}")
+	cotire_get_intermediate_dir(_baseDir)
+	set (_startIndex 0)
+	set (_index 0)
+	set (_unityFiles "")
+	set (_sourceFiles ${ARGN})
+	foreach (_sourceFile ${_sourceFiles})
+		get_source_file_property(_startNew "${_sourceFile}" COTIRE_START_NEW_UNITY_SOURCE)
+		math (EXPR _unityFileCount "${_index} - ${_startIndex}")
+		if (_startNew OR (_maxIncludes GREATER 0 AND NOT _unityFileCount LESS _maxIncludes))
+			if (_index GREATER 0)
+				# start new unity file segment
+				math (EXPR _endIndex "${_index} - 1")
+				set (_unityFileName "${_unityFileBaseName}_${_startIndex}_${_endIndex}${_unityFileExt_${_language}}")
+				list (APPEND _unityFiles "${_baseDir}/${_unityFileName}")
+			endif()
+			set (_startIndex ${_index})
+		endif()
+		math (EXPR _index "${_index} + 1")
+	endforeach()
+	list (LENGTH _sourceFiles _numberOfSources)
+	if (_startIndex EQUAL 0)
+		# there is only a single unity file
+		cotire_make_single_unity_source_file_path(${_language} ${_target} _unityFiles)
+	elseif (_startIndex LESS _numberOfSources)
+		# end with final unity file segment
+		math (EXPR _endIndex "${_index} - 1")
+		set (_unityFileName "${_unityFileBaseName}_${_startIndex}_${_endIndex}${_unityFileExt_${_language}}")
+		list (APPEND _unityFiles "${_baseDir}/${_unityFileName}")
+	endif()
+	set (${_unityFilesVar} ${_unityFiles} PARENT_SCOPE)
+	if (COTIRE_DEBUG AND _unityFiles)
+		message (STATUS "unity files: ${_unityFiles}")
+	endif()
+endfunction()
+
+function (cotire_unity_to_prefix_file_path _language _target _unityFile _prefixFileVar)
+	cotire_setup_file_extension_variables()
+	if (NOT DEFINED _unityFileExt_${_language})
+		set (${_prefixFileVar} "" PARENT_SCOPE)
+		return()
+	endif()
+	set (_unityFileBaseName "${_target}_${_language}${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}")
+	set (_prefixFileBaseName "${_target}_${_language}${COTIRE_PREFIX_HEADER_FILENAME_SUFFIX}")
+	string (REPLACE "${_unityFileBaseName}" "${_prefixFileBaseName}" _prefixFile "${_unityFile}")
+	string (REGEX REPLACE "${_unityFileExt_${_language}}$" "${_prefixFileExt_${_language}}" _prefixFile "${_prefixFile}")
+	set (${_prefixFileVar} "${_prefixFile}" PARENT_SCOPE)
+endfunction()
+
+function (cotire_prefix_header_to_source_file_path _language _prefixHeaderFile _prefixSourceFileVar)
+	cotire_setup_file_extension_variables()
+	if (NOT DEFINED _prefixSourceFileExt_${_language})
+		set (${_prefixSourceFileVar} "" PARENT_SCOPE)
+		return()
+	endif()
+	string (REGEX REPLACE "${_prefixFileExt_${_language}}$" "${_prefixSourceFileExt_${_language}}" _prefixSourceFile "${_prefixHeaderFile}")
+	set (${_prefixSourceFileVar} "${_prefixSourceFile}" PARENT_SCOPE)
+endfunction()
+
+function (cotire_make_prefix_file_name _language _target _prefixFileBaseNameVar _prefixFileNameVar)
+	cotire_setup_file_extension_variables()
+	if (NOT _language)
+		set (_prefixFileBaseName "${_target}${COTIRE_PREFIX_HEADER_FILENAME_SUFFIX}")
+		set (_prefixFileName "${_prefixFileBaseName}${_prefixFileExt_C}")
+	elseif (DEFINED _prefixFileExt_${_language})
+		set (_prefixFileBaseName "${_target}_${_language}${COTIRE_PREFIX_HEADER_FILENAME_SUFFIX}")
+		set (_prefixFileName "${_prefixFileBaseName}${_prefixFileExt_${_language}}")
+	else()
+		set (_prefixFileBaseName "")
+		set (_prefixFileName "")
+	endif()
+	set (${_prefixFileBaseNameVar} "${_prefixFileBaseName}" PARENT_SCOPE)
+	set (${_prefixFileNameVar} "${_prefixFileName}" PARENT_SCOPE)
+endfunction()
+
+function (cotire_make_prefix_file_path _language _target _prefixFileVar)
+	cotire_make_prefix_file_name("${_language}" "${_target}" _prefixFileBaseName _prefixFileName)
+	set (${_prefixFileVar} "" PARENT_SCOPE)
+	if (_prefixFileName)
+		if (NOT _language)
+			set (_language "C")
+		endif()
+		if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang|Intel|MSVC")
+			cotire_get_intermediate_dir(_baseDir)
+			set (${_prefixFileVar} "${_baseDir}/${_prefixFileName}" PARENT_SCOPE)
+		endif()
+	endif()
+endfunction()
+
+function (cotire_make_pch_file_path _language _target _pchFileVar)
+	cotire_make_prefix_file_name("${_language}" "${_target}" _prefixFileBaseName _prefixFileName)
+	set (${_pchFileVar} "" PARENT_SCOPE)
+	if (_prefixFileBaseName AND _prefixFileName)
+		cotire_check_precompiled_header_support("${_language}" "${_target}" _msg)
+		if (NOT _msg)
+			if (XCODE)
+				# For Xcode, we completely hand off the compilation of the prefix header to the IDE
+				return()
+			endif()
+			cotire_get_intermediate_dir(_baseDir)
+			if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC")
+				# MSVC uses the extension .pch added to the prefix header base name
+				set (${_pchFileVar} "${_baseDir}/${_prefixFileBaseName}.pch" PARENT_SCOPE)
+			elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Clang")
+				# Clang looks for a precompiled header corresponding to the prefix header with the extension .pch appended
+				set (${_pchFileVar} "${_baseDir}/${_prefixFileName}.pch" PARENT_SCOPE)
+			elseif (CMAKE_${_language}_COMPILER_ID MATCHES "GNU")
+				# GCC looks for a precompiled header corresponding to the prefix header with the extension .gch appended
+				set (${_pchFileVar} "${_baseDir}/${_prefixFileName}.gch" PARENT_SCOPE)
+			elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Intel")
+				# Intel uses the extension .pchi added to the prefix header base name
+				set (${_pchFileVar} "${_baseDir}/${_prefixFileBaseName}.pchi" PARENT_SCOPE)
+			endif()
+		endif()
+	endif()
+endfunction()
+
+function (cotire_select_unity_source_files _unityFile _sourcesVar)
+	set (_sourceFiles ${ARGN})
+	if (_sourceFiles AND "${_unityFile}" MATCHES "${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}_([0-9]+)_([0-9]+)")
+		set (_startIndex ${CMAKE_MATCH_1})
+		set (_endIndex ${CMAKE_MATCH_2})
+		list (LENGTH _sourceFiles _numberOfSources)
+		if (NOT _startIndex LESS _numberOfSources)
+			math (EXPR _startIndex "${_numberOfSources} - 1")
+		endif()
+		if (NOT _endIndex LESS _numberOfSources)
+			math (EXPR _endIndex "${_numberOfSources} - 1")
+		endif()
+		set (_files "")
+		foreach (_index RANGE ${_startIndex} ${_endIndex})
+			list (GET _sourceFiles ${_index} _file)
+			list (APPEND _files "${_file}")
+		endforeach()
+	else()
+		set (_files ${_sourceFiles})
+	endif()
+	set (${_sourcesVar} ${_files} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_unity_source_dependencies _language _target _dependencySourcesVar)
+	set (_dependencySources "")
+	# depend on target's generated source files
+	get_target_property(_targetSourceFiles ${_target} SOURCES)
+	cotire_get_objects_with_property_on(_generatedSources GENERATED SOURCE ${_targetSourceFiles})
+	if (_generatedSources)
+		# but omit all generated source files that have the COTIRE_EXCLUDED property set to true
+		cotire_get_objects_with_property_on(_excludedGeneratedSources COTIRE_EXCLUDED SOURCE ${_generatedSources})
+		if (_excludedGeneratedSources)
+			list (REMOVE_ITEM _generatedSources ${_excludedGeneratedSources})
+		endif()
+		# and omit all generated source files that have the COTIRE_DEPENDENCY property set to false explicitly
+		cotire_get_objects_with_property_off(_excludedNonDependencySources COTIRE_DEPENDENCY SOURCE ${_generatedSources})
+		if (_excludedNonDependencySources)
+			list (REMOVE_ITEM _generatedSources ${_excludedNonDependencySources})
+		endif()
+		if (_generatedSources)
+			list (APPEND _dependencySources ${_generatedSources})
+		endif()
+	endif()
+	if (COTIRE_DEBUG AND _dependencySources)
+		message (STATUS "${_language} ${_target} unity source dependencies: ${_dependencySources}")
+	endif()
+	set (${_dependencySourcesVar} ${_dependencySources} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_prefix_header_dependencies _language _target _dependencySourcesVar)
+	set (_dependencySources "")
+	# depend on target source files marked with custom COTIRE_DEPENDENCY property
+	get_target_property(_targetSourceFiles ${_target} SOURCES)
+	cotire_get_objects_with_property_on(_dependencySources COTIRE_DEPENDENCY SOURCE ${_targetSourceFiles})
+	if (COTIRE_DEBUG AND _dependencySources)
+		message (STATUS "${_language} ${_target} prefix header dependencies: ${_dependencySources}")
+	endif()
+	set (${_dependencySourcesVar} ${_dependencySources} PARENT_SCOPE)
+endfunction()
+
+function (cotire_generate_target_script _language _configurations _target _targetScriptVar _targetConfigScriptVar)
+	set (_targetSources ${ARGN})
+	cotire_get_prefix_header_dependencies(${_language} ${_target} COTIRE_TARGET_PREFIX_DEPENDS ${_targetSources})
+	cotire_get_unity_source_dependencies(${_language} ${_target} COTIRE_TARGET_UNITY_DEPENDS ${_targetSources})
+	# set up variables to be configured
+	set (COTIRE_TARGET_LANGUAGE "${_language}")
+	get_target_property(COTIRE_TARGET_IGNORE_PATH ${_target} COTIRE_PREFIX_HEADER_IGNORE_PATH)
+	cotire_add_sys_root_paths(COTIRE_TARGET_IGNORE_PATH)
+	get_target_property(COTIRE_TARGET_INCLUDE_PATH ${_target} COTIRE_PREFIX_HEADER_INCLUDE_PATH)
+	cotire_add_sys_root_paths(COTIRE_TARGET_INCLUDE_PATH)
+	get_target_property(COTIRE_TARGET_PRE_UNDEFS ${_target} COTIRE_UNITY_SOURCE_PRE_UNDEFS)
+	get_target_property(COTIRE_TARGET_POST_UNDEFS ${_target} COTIRE_UNITY_SOURCE_POST_UNDEFS)
+	get_target_property(COTIRE_TARGET_MAXIMUM_NUMBER_OF_INCLUDES ${_target} COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES)
+	get_target_property(COTIRE_TARGET_INCLUDE_PRIORITY_PATH ${_target} COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH)
+	cotire_get_source_files_undefs(COTIRE_UNITY_SOURCE_PRE_UNDEFS COTIRE_TARGET_SOURCES_PRE_UNDEFS ${_targetSources})
+	cotire_get_source_files_undefs(COTIRE_UNITY_SOURCE_POST_UNDEFS COTIRE_TARGET_SOURCES_POST_UNDEFS ${_targetSources})
+	set (COTIRE_TARGET_CONFIGURATION_TYPES "${_configurations}")
+	foreach (_config ${_configurations})
+		string (TOUPPER "${_config}" _upperConfig)
+		cotire_get_target_include_directories(
+			"${_config}" "${_language}" "${_target}" COTIRE_TARGET_INCLUDE_DIRECTORIES_${_upperConfig} COTIRE_TARGET_SYSTEM_INCLUDE_DIRECTORIES_${_upperConfig})
+		cotire_get_target_compile_definitions(
+			"${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_DEFINITIONS_${_upperConfig})
+		cotire_get_target_compiler_flags(
+			"${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig})
+		cotire_get_source_files_compile_definitions(
+			"${_config}" "${_language}" COTIRE_TARGET_SOURCES_COMPILE_DEFINITIONS_${_upperConfig} ${_targetSources})
+	endforeach()
+	get_target_property(COTIRE_TARGET_${_language}_COMPILER_LAUNCHER ${_target} ${_language}_COMPILER_LAUNCHER)
+	# set up COTIRE_TARGET_SOURCES
+	set (COTIRE_TARGET_SOURCES "")
+	foreach (_sourceFile ${_targetSources})
+		get_source_file_property(_generated "${_sourceFile}" GENERATED)
+		if (_generated)
+			# use absolute paths for generated files only, retrieving the LOCATION property is an expensive operation
+			get_source_file_property(_sourceLocation "${_sourceFile}" LOCATION)
+			list (APPEND COTIRE_TARGET_SOURCES "${_sourceLocation}")
+		else()
+			list (APPEND COTIRE_TARGET_SOURCES "${_sourceFile}")
+		endif()
+	endforeach()
+	# copy variable definitions to cotire target script
+	get_cmake_property(_vars VARIABLES)
+	string (REGEX MATCHALL "COTIRE_[A-Za-z0-9_]+" _matchVars "${_vars}")
+	# omit COTIRE_*_INIT variables
+	string (REGEX MATCHALL "COTIRE_[A-Za-z0-9_]+_INIT" _initVars "${_matchVars}")
+	if (_initVars)
+		list (REMOVE_ITEM _matchVars ${_initVars})
+	endif()
+	# omit COTIRE_VERBOSE which is passed as a CMake define on command line
+	list (REMOVE_ITEM _matchVars COTIRE_VERBOSE)
+	set (_contents "")
+	set (_contentsHasGeneratorExpressions FALSE)
+	foreach (_var IN LISTS _matchVars ITEMS
+		XCODE MSVC CMAKE_GENERATOR CMAKE_BUILD_TYPE CMAKE_CONFIGURATION_TYPES
+		CMAKE_${_language}_COMPILER_ID CMAKE_${_language}_COMPILER_VERSION
+		CMAKE_${_language}_COMPILER_LAUNCHER CMAKE_${_language}_COMPILER CMAKE_${_language}_COMPILER_ARG1
+		CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_SEP_${_language}
+		CMAKE_INCLUDE_SYSTEM_FLAG_${_language}
+		CMAKE_${_language}_FRAMEWORK_SEARCH_FLAG
+		CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG
+		CMAKE_${_language}_SOURCE_FILE_EXTENSIONS)
+		if (DEFINED ${_var})
+			string (REPLACE "\"" "\\\"" _value "${${_var}}")
+			set (_contents "${_contents}set (${_var} \"${_value}\")\n")
+			if (NOT _contentsHasGeneratorExpressions)
+				if ("${_value}" MATCHES "\\$<.*>")
+					set (_contentsHasGeneratorExpressions TRUE)
+				endif()
+			endif()
+		endif()
+	endforeach()
+	# generate target script file
+	get_filename_component(_moduleName "${COTIRE_CMAKE_MODULE_FILE}" NAME)
+	set (_targetCotireScript "${CMAKE_CURRENT_BINARY_DIR}/${_target}_${_language}_${_moduleName}")
+	cotire_write_file("CMAKE" "${_targetCotireScript}" "${_contents}" FALSE)
+	if (_contentsHasGeneratorExpressions)
+		# use file(GENERATE ...) to expand generator expressions in the target script at CMake generate-time
+		set (_configNameOrNoneGeneratorExpression "$<$<CONFIG:>:None>$<$<NOT:$<CONFIG:>>:$<CONFIGURATION>>")
+		set (_targetCotireConfigScript "${CMAKE_CURRENT_BINARY_DIR}/${_target}_${_language}_${_configNameOrNoneGeneratorExpression}_${_moduleName}")
+		file (GENERATE OUTPUT "${_targetCotireConfigScript}" INPUT "${_targetCotireScript}")
+	else()
+		set (_targetCotireConfigScript "${_targetCotireScript}")
+	endif()
+	set (${_targetScriptVar} "${_targetCotireScript}" PARENT_SCOPE)
+	set (${_targetConfigScriptVar} "${_targetCotireConfigScript}" PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_pch_file_compilation _language _target _targetScript _prefixFile _pchFile _hostFile)
+	set (_sourceFiles ${ARGN})
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" OR
+		(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
+		# for MSVC, Intel and Clang-cl, we attach the precompiled header compilation to the host file
+		# the remaining files include the precompiled header, see cotire_setup_pch_file_inclusion
+		if (_sourceFiles)
+			set (_flags "")
+			cotire_add_pch_compilation_flags(
+				"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
+				"${_prefixFile}" "${_pchFile}" "${_hostFile}" _flags)
+			set_property (SOURCE ${_hostFile} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
+			set_property (SOURCE ${_hostFile} APPEND PROPERTY OBJECT_OUTPUTS "${_pchFile}")
+			# make object file generated from host file depend on prefix header
+			set_property (SOURCE ${_hostFile} APPEND PROPERTY OBJECT_DEPENDS "${_prefixFile}")
+			# mark host file as cotired to prevent it from being used in another cotired target
+			set_property (SOURCE ${_hostFile} PROPERTY COTIRE_TARGET "${_target}")
+		endif()
+	elseif ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
+		# for makefile based generator, we add a custom command to precompile the prefix header
+		if (_targetScript)
+			cotire_set_cmd_to_prologue(_cmds)
+			list (APPEND _cmds -P "${COTIRE_CMAKE_MODULE_FILE}" "precompile" "${_targetScript}" "${_prefixFile}" "${_pchFile}" "${_hostFile}")
+			if (MSVC_IDE)
+				file (TO_NATIVE_PATH "${_pchFile}" _pchFileLogPath)
+			else()
+				file (RELATIVE_PATH _pchFileLogPath "${CMAKE_BINARY_DIR}" "${_pchFile}")
+			endif()
+			# make precompiled header compilation depend on the actual compiler executable used to force
+			# re-compilation when the compiler executable is updated. This prevents "created by a different GCC executable"
+			# warnings when the precompiled header is included.
+			get_filename_component(_realCompilerExe "${CMAKE_${_language}_COMPILER}" ABSOLUTE)
+			if (COTIRE_DEBUG)
+				message (STATUS "add_custom_command: OUTPUT ${_pchFile} ${_cmds} DEPENDS ${_prefixFile} ${_realCompilerExe} IMPLICIT_DEPENDS ${_language} ${_prefixFile}")
+			endif()
+			set_property (SOURCE "${_pchFile}" PROPERTY GENERATED TRUE)
+			add_custom_command(
+				OUTPUT "${_pchFile}"
+				COMMAND ${_cmds}
+				DEPENDS "${_prefixFile}" "${_realCompilerExe}"
+				IMPLICIT_DEPENDS ${_language} "${_prefixFile}"
+				WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+				COMMENT "Building ${_language} precompiled header ${_pchFileLogPath}"
+				VERBATIM)
+		endif()
+	endif()
+endfunction()
+
+function (cotire_setup_pch_file_inclusion _language _target _wholeTarget _prefixFile _pchFile _hostFile)
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" OR
+		(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
+		# for MSVC, Intel and clang-cl, we include the precompiled header in all but the host file
+		# the host file does the precompiled header compilation, see cotire_setup_pch_file_compilation
+		set (_sourceFiles ${ARGN})
+		list (LENGTH _sourceFiles _numberOfSourceFiles)
+		if (_numberOfSourceFiles GREATER 0)
+			# mark sources as cotired to prevent them from being used in another cotired target
+			set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}")
+			set (_flags "")
+			cotire_add_prefix_pch_inclusion_flags(
+				"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
+				"${_prefixFile}" "${_pchFile}" _flags)
+			set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
+			# make object files generated from source files depend on precompiled header
+			set_property (SOURCE ${_sourceFiles} APPEND PROPERTY OBJECT_DEPENDS "${_pchFile}")
+		endif()
+	elseif ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
+		set (_sourceFiles ${_hostFile} ${ARGN})
+		if (NOT _wholeTarget)
+			# for makefile based generator, we force the inclusion of the prefix header for a subset
+			# of the source files, if this is a multi-language target or has excluded files
+			set (_flags "")
+			cotire_add_prefix_pch_inclusion_flags(
+				"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
+				"${_prefixFile}" "${_pchFile}" _flags)
+			set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
+			# mark sources as cotired to prevent them from being used in another cotired target
+			set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}")
+		endif()
+		# make object files generated from source files depend on precompiled header
+		set_property (SOURCE ${_sourceFiles} APPEND PROPERTY OBJECT_DEPENDS "${_pchFile}")
+	endif()
+endfunction()
+
+function (cotire_setup_prefix_file_inclusion _language _target _prefixFile)
+	set (_sourceFiles ${ARGN})
+	# force the inclusion of the prefix header for the given source files
+	set (_flags "")
+	set (_pchFile "")
+	cotire_add_prefix_pch_inclusion_flags(
+		"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
+		"${_prefixFile}" "${_pchFile}" _flags)
+	set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
+	# mark sources as cotired to prevent them from being used in another cotired target
+	set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}")
+	# make object files generated from source files depend on prefix header
+	set_property (SOURCE ${_sourceFiles} APPEND PROPERTY OBJECT_DEPENDS "${_prefixFile}")
+endfunction()
+
+function (cotire_get_first_set_property_value _propertyValueVar _type _object)
+	set (_properties ${ARGN})
+	foreach (_property ${_properties})
+		get_property(_propertyValue ${_type} "${_object}" PROPERTY ${_property})
+		if (_propertyValue)
+			set (${_propertyValueVar} ${_propertyValue} PARENT_SCOPE)
+			return()
+		endif()
+	endforeach()
+	set (${_propertyValueVar} "" PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_combine_command _language _targetScript _joinedFile _cmdsVar)
+	set (_files ${ARGN})
+	set (_filesPaths "")
+	foreach (_file ${_files})
+		get_filename_component(_filePath "${_file}" ABSOLUTE)
+		list (APPEND _filesPaths "${_filePath}")
+	endforeach()
+	cotire_set_cmd_to_prologue(_prefixCmd)
+	list (APPEND _prefixCmd -P "${COTIRE_CMAKE_MODULE_FILE}" "combine")
+	if (_targetScript)
+		list (APPEND _prefixCmd "${_targetScript}")
+	endif()
+	list (APPEND _prefixCmd "${_joinedFile}" ${_filesPaths})
+	if (COTIRE_DEBUG)
+		message (STATUS "add_custom_command: OUTPUT ${_joinedFile} COMMAND ${_prefixCmd} DEPENDS ${_files}")
+	endif()
+	set_property (SOURCE "${_joinedFile}" PROPERTY GENERATED TRUE)
+	if (MSVC_IDE)
+		file (TO_NATIVE_PATH "${_joinedFile}" _joinedFileLogPath)
+	else()
+		file (RELATIVE_PATH _joinedFileLogPath "${CMAKE_BINARY_DIR}" "${_joinedFile}")
+	endif()
+	get_filename_component(_joinedFileBaseName "${_joinedFile}" NAME_WE)
+	get_filename_component(_joinedFileExt "${_joinedFile}" EXT)
+	if (_language AND _joinedFileBaseName MATCHES "${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}$")
+		set (_comment "Generating ${_language} unity source ${_joinedFileLogPath}")
+	elseif (_language AND _joinedFileBaseName MATCHES "${COTIRE_PREFIX_HEADER_FILENAME_SUFFIX}$")
+		if (_joinedFileExt MATCHES "^\\.c")
+			set (_comment "Generating ${_language} prefix source ${_joinedFileLogPath}")
+		else()
+			set (_comment "Generating ${_language} prefix header ${_joinedFileLogPath}")
+		endif()
+	else()
+		set (_comment "Generating ${_joinedFileLogPath}")
+	endif()
+	add_custom_command(
+		OUTPUT "${_joinedFile}"
+		COMMAND ${_prefixCmd}
+		DEPENDS ${_files}
+		COMMENT "${_comment}"
+		WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+		VERBATIM)
+	list (APPEND ${_cmdsVar} COMMAND ${_prefixCmd})
+	set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_target_pch_usage _languages _target _wholeTarget)
+	if (XCODE)
+		# for Xcode, we attach a pre-build action to generate the unity sources and prefix headers
+		set (_prefixFiles "")
+		foreach (_language ${_languages})
+			get_property(_prefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER)
+			if (_prefixFile)
+				list (APPEND _prefixFiles "${_prefixFile}")
+			endif()
+		endforeach()
+		set (_cmds ${ARGN})
+		list (LENGTH _prefixFiles _numberOfPrefixFiles)
+		if (_numberOfPrefixFiles GREATER 1)
+			# we also generate a generic, single prefix header which includes all language specific prefix headers
+			set (_language "")
+			set (_targetScript "")
+			cotire_make_prefix_file_path("${_language}" ${_target} _prefixHeader)
+			cotire_setup_combine_command("${_language}" "${_targetScript}" "${_prefixHeader}" _cmds ${_prefixFiles})
+		else()
+			set (_prefixHeader "${_prefixFiles}")
+		endif()
+		if (COTIRE_DEBUG)
+			message (STATUS "add_custom_command: TARGET ${_target} PRE_BUILD ${_cmds}")
+		endif()
+		# because CMake PRE_BUILD command does not support dependencies,
+		# we check dependencies explicity in cotire script mode when the pre-build action is run
+		add_custom_command(
+			TARGET "${_target}"
+			PRE_BUILD ${_cmds}
+			WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+			COMMENT "Updating target ${_target} prefix headers"
+			VERBATIM)
+		# make Xcode precompile the generated prefix header with ProcessPCH and ProcessPCH++
+		set_target_properties(${_target} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
+		set_target_properties(${_target} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${_prefixHeader}")
+	elseif ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
+		# for makefile based generator, we force inclusion of the prefix header for all target source files
+		# if this is a single-language target without any excluded files
+		if (_wholeTarget)
+			set (_language "${_languages}")
+			# for MSVC, Intel and clang-cl, precompiled header inclusion is always done on the source file level
+			# see cotire_setup_pch_file_inclusion
+			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" AND NOT
+				(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
+				get_property(_prefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER)
+				if (_prefixFile)
+					get_property(_pchFile TARGET ${_target} PROPERTY COTIRE_${_language}_PRECOMPILED_HEADER)
+					set (_options COMPILE_OPTIONS)
+					cotire_add_prefix_pch_inclusion_flags(
+						"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
+						"${_prefixFile}" "${_pchFile}" _options)
+					set_property(TARGET ${_target} APPEND PROPERTY ${_options})
+				endif()
+			endif()
+		endif()
+	endif()
+endfunction()
+
+function (cotire_setup_unity_generation_commands _language _target _targetScript _targetConfigScript _unityFiles _cmdsVar)
+	set (_dependencySources "")
+	cotire_get_unity_source_dependencies(${_language} ${_target} _dependencySources ${ARGN})
+	foreach (_unityFile ${_unityFiles})
+		set_property (SOURCE "${_unityFile}" PROPERTY GENERATED TRUE)
+		# set up compiled unity source dependencies via OBJECT_DEPENDS
+		# this ensures that missing source files are generated before the unity file is compiled
+		if (COTIRE_DEBUG AND _dependencySources)
+			message (STATUS "${_unityFile} OBJECT_DEPENDS ${_dependencySources}")
+		endif()
+		if (_dependencySources)
+			# the OBJECT_DEPENDS property requires a list of full paths
+			set (_objectDependsPaths "")
+			foreach (_sourceFile ${_dependencySources})
+				get_source_file_property(_sourceLocation "${_sourceFile}" LOCATION)
+				list (APPEND _objectDependsPaths "${_sourceLocation}")
+			endforeach()
+			set_property (SOURCE "${_unityFile}" PROPERTY OBJECT_DEPENDS ${_objectDependsPaths})
+		endif()
+		if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+			# unity file compilation results in potentially huge object file,
+			# thus use /bigobj by default unter cl.exe and Windows Intel
+			set_property (SOURCE "${_unityFile}" APPEND_STRING PROPERTY COMPILE_FLAGS "/bigobj")
+		endif()
+		cotire_set_cmd_to_prologue(_unityCmd)
+		list (APPEND _unityCmd -P "${COTIRE_CMAKE_MODULE_FILE}" "unity" "${_targetConfigScript}" "${_unityFile}")
+		if (CMAKE_VERSION VERSION_LESS "3.1.0")
+			set (_unityCmdDepends "${_targetScript}")
+		else()
+			# CMake 3.1.0 supports generator expressions in arguments to DEPENDS
+			set (_unityCmdDepends "${_targetConfigScript}")
+		endif()
+		if (MSVC_IDE)
+			file (TO_NATIVE_PATH "${_unityFile}" _unityFileLogPath)
+		else()
+			file (RELATIVE_PATH _unityFileLogPath "${CMAKE_BINARY_DIR}" "${_unityFile}")
+		endif()
+		if (COTIRE_DEBUG)
+			message (STATUS "add_custom_command: OUTPUT ${_unityFile} COMMAND ${_unityCmd} DEPENDS ${_unityCmdDepends}")
+		endif()
+		add_custom_command(
+			OUTPUT "${_unityFile}"
+			COMMAND ${_unityCmd}
+			DEPENDS ${_unityCmdDepends}
+			COMMENT "Generating ${_language} unity source ${_unityFileLogPath}"
+			WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+			VERBATIM)
+		list (APPEND ${_cmdsVar} COMMAND ${_unityCmd})
+	endforeach()
+	set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_prefix_generation_command _language _target _targetScript _prefixFile _unityFiles _cmdsVar)
+	set (_sourceFiles ${ARGN})
+	set (_dependencySources "")
+	cotire_get_prefix_header_dependencies(${_language} ${_target} _dependencySources ${_sourceFiles})
+	cotire_set_cmd_to_prologue(_prefixCmd)
+	list (APPEND _prefixCmd -P "${COTIRE_CMAKE_MODULE_FILE}" "prefix" "${_targetScript}" "${_prefixFile}" ${_unityFiles})
+	set_property (SOURCE "${_prefixFile}" PROPERTY GENERATED TRUE)
+	# make prefix header generation depend on the actual compiler executable used to force
+	# re-generation when the compiler executable is updated. This prevents "file not found"
+	# errors for compiler version specific system header files.
+	get_filename_component(_realCompilerExe "${CMAKE_${_language}_COMPILER}" ABSOLUTE)
+	if (COTIRE_DEBUG)
+		message (STATUS "add_custom_command: OUTPUT ${_prefixFile} COMMAND ${_prefixCmd} DEPENDS ${_unityFile} ${_dependencySources} ${_realCompilerExe}")
+	endif()
+	if (MSVC_IDE)
+		file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileLogPath)
+	else()
+		file (RELATIVE_PATH _prefixFileLogPath "${CMAKE_BINARY_DIR}" "${_prefixFile}")
+	endif()
+	get_filename_component(_prefixFileExt "${_prefixFile}" EXT)
+	if (_prefixFileExt MATCHES "^\\.c")
+		set (_comment "Generating ${_language} prefix source ${_prefixFileLogPath}")
+	else()
+		set (_comment "Generating ${_language} prefix header ${_prefixFileLogPath}")
+	endif()
+	# prevent pre-processing errors upon generating the prefix header when a target's generated include file does not yet exist
+	# we do not add a file-level dependency for the target's generated files though, because we only want to depend on their existence
+	# thus we make the prefix header generation depend on a custom helper target which triggers the generation of the files
+	set (_preTargetName "${_target}${COTIRE_PCH_TARGET_SUFFIX}_pre")
+	if (TARGET ${_preTargetName})
+		# custom helper target has already been generated while processing a different language
+		list (APPEND _dependencySources ${_preTargetName})
+	else()
+		get_target_property(_targetSourceFiles ${_target} SOURCES)
+		cotire_get_objects_with_property_on(_generatedSources GENERATED SOURCE ${_targetSourceFiles})
+		if (_generatedSources)
+			add_custom_target("${_preTargetName}" DEPENDS ${_generatedSources})
+			cotire_init_target("${_preTargetName}")
+			list (APPEND _dependencySources ${_preTargetName})
+		endif()
+	endif()
+	add_custom_command(
+		OUTPUT "${_prefixFile}" "${_prefixFile}.log"
+		COMMAND ${_prefixCmd}
+		DEPENDS ${_unityFiles} ${_dependencySources} "${_realCompilerExe}"
+		COMMENT "${_comment}"
+		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+		VERBATIM)
+	list (APPEND ${_cmdsVar} COMMAND ${_prefixCmd})
+	set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_prefix_generation_from_unity_command _language _target _targetScript _prefixFile _unityFiles _cmdsVar)
+	set (_sourceFiles ${ARGN})
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang")
+		# GNU and Clang require indirect compilation of the prefix header to make them honor the system_header pragma
+		cotire_prefix_header_to_source_file_path(${_language} "${_prefixFile}" _prefixSourceFile)
+	else()
+		set (_prefixSourceFile "${_prefixFile}")
+	endif()
+	cotire_setup_prefix_generation_command(
+		${_language} ${_target} "${_targetScript}"
+		"${_prefixSourceFile}" "${_unityFiles}" ${_cmdsVar} ${_sourceFiles})
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang")
+		# set up generation of a prefix source file which includes the prefix header
+		cotire_setup_combine_command(${_language} "${_targetScript}" "${_prefixFile}" _cmds ${_prefixSourceFile})
+	endif()
+	set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_prefix_generation_from_provided_command _language _target _targetScript _prefixFile _cmdsVar)
+	set (_prefixHeaderFiles ${ARGN})
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang")
+		# GNU and Clang require indirect compilation of the prefix header to make them honor the system_header pragma
+		cotire_prefix_header_to_source_file_path(${_language} "${_prefixFile}" _prefixSourceFile)
+	else()
+		set (_prefixSourceFile "${_prefixFile}")
+	endif()
+	cotire_setup_combine_command(${_language} "${_targetScript}" "${_prefixSourceFile}" _cmds ${_prefixHeaderFiles})
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang")
+		# set up generation of a prefix source file which includes the prefix header
+		cotire_setup_combine_command(${_language} "${_targetScript}" "${_prefixFile}" _cmds ${_prefixSourceFile})
+	endif()
+	set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_init_cotire_target_properties _target)
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER TRUE)
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_ADD_UNITY_BUILD SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_ADD_UNITY_BUILD TRUE)
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_ADD_CLEAN SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_ADD_CLEAN FALSE)
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_IGNORE_PATH SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_IGNORE_PATH "${CMAKE_SOURCE_DIR}")
+		cotire_check_is_path_relative_to("${CMAKE_BINARY_DIR}" _isRelative "${CMAKE_SOURCE_DIR}")
+		if (NOT _isRelative)
+			set_property(TARGET ${_target} APPEND PROPERTY COTIRE_PREFIX_HEADER_IGNORE_PATH "${CMAKE_BINARY_DIR}")
+		endif()
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_INCLUDE_PATH SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_INCLUDE_PATH "")
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH "")
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_PRE_UNDEFS SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_PRE_UNDEFS "")
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_POST_UNDEFS SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_POST_UNDEFS "")
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY")
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES SET)
+	if (NOT _isSet)
+		if (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES)
+			set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES "${COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES}")
+		else()
+			set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES "")
+		endif()
+	endif()
+endfunction()
+
+function (cotire_make_target_message _target _languages _disableMsg _targetMsgVar)
+	get_target_property(_targetUsePCH ${_target} COTIRE_ENABLE_PRECOMPILED_HEADER)
+	get_target_property(_targetAddSCU ${_target} COTIRE_ADD_UNITY_BUILD)
+	string (REPLACE ";" " " _languagesStr "${_languages}")
+	math (EXPR _numberOfExcludedFiles "${ARGC} - 4")
+	if (_numberOfExcludedFiles EQUAL 0)
+		set (_excludedStr "")
+	elseif (COTIRE_VERBOSE OR _numberOfExcludedFiles LESS 4)
+		string (REPLACE ";" ", " _excludedStr "excluding ${ARGN}")
+	else()
+		set (_excludedStr "excluding ${_numberOfExcludedFiles} files")
+	endif()
+	set (_targetMsg "")
+	if (NOT _languages)
+		set (_targetMsg "Target ${_target} cannot be cotired.")
+		if (_disableMsg)
+			set (_targetMsg "${_targetMsg} ${_disableMsg}")
+		endif()
+	elseif (NOT _targetUsePCH AND NOT _targetAddSCU)
+		set (_targetMsg "${_languagesStr} target ${_target} cotired without unity build and precompiled header.")
+		if (_disableMsg)
+			set (_targetMsg "${_targetMsg} ${_disableMsg}")
+		endif()
+	elseif (NOT _targetUsePCH)
+		if (_excludedStr)
+			set (_targetMsg "${_languagesStr} target ${_target} cotired without precompiled header ${_excludedStr}.")
+		else()
+			set (_targetMsg "${_languagesStr} target ${_target} cotired without precompiled header.")
+		endif()
+		if (_disableMsg)
+			set (_targetMsg "${_targetMsg} ${_disableMsg}")
+		endif()
+	elseif (NOT _targetAddSCU)
+		if (_excludedStr)
+			set (_targetMsg "${_languagesStr} target ${_target} cotired without unity build ${_excludedStr}.")
+		else()
+			set (_targetMsg "${_languagesStr} target ${_target} cotired without unity build.")
+		endif()
+		if (_disableMsg)
+			set (_targetMsg "${_targetMsg} ${_disableMsg}")
+		endif()
+	else()
+		if (_excludedStr)
+			set (_targetMsg "${_languagesStr} target ${_target} cotired ${_excludedStr}.")
+		else()
+			set (_targetMsg "${_languagesStr} target ${_target} cotired.")
+		endif()
+	endif()
+	set (${_targetMsgVar} "${_targetMsg}" PARENT_SCOPE)
+endfunction()
+
+function (cotire_choose_target_languages _target _targetLanguagesVar _wholeTargetVar)
+	set (_languages ${ARGN})
+	set (_allSourceFiles "")
+	set (_allExcludedSourceFiles "")
+	set (_allCotiredSourceFiles "")
+	set (_targetLanguages "")
+	set (_pchEligibleTargetLanguages "")
+	get_target_property(_targetType ${_target} TYPE)
+	get_target_property(_targetSourceFiles ${_target} SOURCES)
+	get_target_property(_targetUsePCH ${_target} COTIRE_ENABLE_PRECOMPILED_HEADER)
+	get_target_property(_targetAddSCU ${_target} COTIRE_ADD_UNITY_BUILD)
+	set (_disableMsg "")
+	foreach (_language ${_languages})
+		get_target_property(_prefixHeader ${_target} COTIRE_${_language}_PREFIX_HEADER)
+		get_target_property(_unityBuildFile ${_target} COTIRE_${_language}_UNITY_SOURCE)
+		if (_prefixHeader OR _unityBuildFile)
+			message (STATUS "cotire: target ${_target} has already been cotired.")
+			set (${_targetLanguagesVar} "" PARENT_SCOPE)
+			return()
+		endif()
+		if (_targetUsePCH AND "${_language}" MATCHES "^C|CXX$" AND DEFINED CMAKE_${_language}_COMPILER_ID)
+			if (CMAKE_${_language}_COMPILER_ID)
+				cotire_check_precompiled_header_support("${_language}" "${_target}" _disableMsg)
+				if (_disableMsg)
+					set (_targetUsePCH FALSE)
+				endif()
+			endif()
+		endif()
+		set (_sourceFiles "")
+		set (_excludedSources "")
+		set (_cotiredSources "")
+		cotire_filter_language_source_files(${_language} ${_target} _sourceFiles _excludedSources _cotiredSources ${_targetSourceFiles})
+		if (_sourceFiles OR _excludedSources OR _cotiredSources)
+			list (APPEND _targetLanguages ${_language})
+		endif()
+		if (_sourceFiles)
+			list (APPEND _allSourceFiles ${_sourceFiles})
+		endif()
+		list (LENGTH _sourceFiles _numberOfSources)
+		if (NOT _numberOfSources LESS ${COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES})
+			list (APPEND _pchEligibleTargetLanguages ${_language})
+		endif()
+		if (_excludedSources)
+			list (APPEND _allExcludedSourceFiles ${_excludedSources})
+		endif()
+		if (_cotiredSources)
+			list (APPEND _allCotiredSourceFiles ${_cotiredSources})
+		endif()
+	endforeach()
+	set (_targetMsgLevel STATUS)
+	if (NOT _targetLanguages)
+		string (REPLACE ";" " or " _languagesStr "${_languages}")
+		set (_disableMsg "No ${_languagesStr} source files.")
+		set (_targetUsePCH FALSE)
+		set (_targetAddSCU FALSE)
+	endif()
+	if (_targetUsePCH)
+		if (_allCotiredSourceFiles)
+			cotire_get_source_file_property_values(_cotireTargets COTIRE_TARGET ${_allCotiredSourceFiles})
+			list (REMOVE_DUPLICATES _cotireTargets)
+			string (REPLACE ";" ", " _cotireTargetsStr "${_cotireTargets}")
+			set (_disableMsg "Target sources already include a precompiled header for target(s) ${_cotireTargets}.")
+			set (_disableMsg "${_disableMsg} Set target property COTIRE_ENABLE_PRECOMPILED_HEADER to FALSE for targets ${_target},")
+			set (_disableMsg "${_disableMsg} ${_cotireTargetsStr} to get a workable build system.")
+			set (_targetMsgLevel SEND_ERROR)
+			set (_targetUsePCH FALSE)
+		elseif (NOT _pchEligibleTargetLanguages)
+			set (_disableMsg "Too few applicable sources.")
+			set (_targetUsePCH FALSE)
+		elseif (XCODE AND _allExcludedSourceFiles)
+			# for Xcode, we cannot apply the precompiled header to individual sources, only to the whole target
+			set (_disableMsg "Exclusion of source files not supported for generator Xcode.")
+			set (_targetUsePCH FALSE)
+		elseif (XCODE AND "${_targetType}" STREQUAL "OBJECT_LIBRARY")
+			# for Xcode, we cannot apply the required PRE_BUILD action to generate the prefix header to an OBJECT_LIBRARY target
+			set (_disableMsg "Required PRE_BUILD action not supported for OBJECT_LIBRARY targets for generator Xcode.")
+			set (_targetUsePCH FALSE)
+		endif()
+	endif()
+	if (_targetAddSCU)
+		# disable unity builds if automatic Qt processing is used
+		get_target_property(_targetAutoMoc ${_target} AUTOMOC)
+		get_target_property(_targetAutoUic ${_target} AUTOUIC)
+		get_target_property(_targetAutoRcc ${_target} AUTORCC)
+		if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
+			if (_disableMsg)
+				set (_disableMsg "${_disableMsg} Target uses automatic CMake Qt processing.")
+			else()
+				set (_disableMsg "Target uses automatic CMake Qt processing.")
+			endif()
+			set (_targetAddSCU FALSE)
+		endif()
+	endif()
+	set_property(TARGET ${_target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER ${_targetUsePCH})
+	set_property(TARGET ${_target} PROPERTY COTIRE_ADD_UNITY_BUILD ${_targetAddSCU})
+	cotire_make_target_message(${_target} "${_targetLanguages}" "${_disableMsg}" _targetMsg ${_allExcludedSourceFiles})
+	if (_targetMsg)
+		if (NOT DEFINED COTIREMSG_${_target})
+			set (COTIREMSG_${_target} "")
+		endif()
+		if (COTIRE_VERBOSE OR NOT "${_targetMsgLevel}" STREQUAL "STATUS" OR
+			NOT "${COTIREMSG_${_target}}" STREQUAL "${_targetMsg}")
+			# cache message to avoid redundant messages on re-configure
+			set (COTIREMSG_${_target} "${_targetMsg}" CACHE INTERNAL "${_target} cotire message.")
+			message (${_targetMsgLevel} "${_targetMsg}")
+		endif()
+	endif()
+	list (LENGTH _targetLanguages _numberOfLanguages)
+	if (_numberOfLanguages GREATER 1 OR _allExcludedSourceFiles)
+		set (${_wholeTargetVar} FALSE PARENT_SCOPE)
+	else()
+		set (${_wholeTargetVar} TRUE PARENT_SCOPE)
+	endif()
+	set (${_targetLanguagesVar} ${_targetLanguages} PARENT_SCOPE)
+endfunction()
+
+function (cotire_compute_unity_max_number_of_includes _target _maxIncludesVar)
+	set (_sourceFiles ${ARGN})
+	get_target_property(_maxIncludes ${_target} COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES)
+	if (_maxIncludes MATCHES "(-j|--parallel|--jobs) ?([0-9]*)")
+		if (DEFINED CMAKE_MATCH_2)
+			set (_numberOfThreads "${CMAKE_MATCH_2}")
+		else()
+			set (_numberOfThreads "")
+		endif()
+		if (NOT _numberOfThreads)
+			# use all available cores
+			ProcessorCount(_numberOfThreads)
+		endif()
+		list (LENGTH _sourceFiles _numberOfSources)
+		math (EXPR _maxIncludes "(${_numberOfSources} + ${_numberOfThreads} - 1) / ${_numberOfThreads}")
+	elseif (NOT _maxIncludes MATCHES "[0-9]+")
+		set (_maxIncludes 0)
+	endif()
+	if (COTIRE_DEBUG)
+		message (STATUS "${_target} unity source max includes: ${_maxIncludes}")
+	endif()
+	set (${_maxIncludesVar} ${_maxIncludes} PARENT_SCOPE)
+endfunction()
+
+function (cotire_process_target_language _language _configurations _target _wholeTarget _cmdsVar)
+	set (${_cmdsVar} "" PARENT_SCOPE)
+	get_target_property(_targetSourceFiles ${_target} SOURCES)
+	set (_sourceFiles "")
+	set (_excludedSources "")
+	set (_cotiredSources "")
+	cotire_filter_language_source_files(${_language} ${_target} _sourceFiles _excludedSources _cotiredSources ${_targetSourceFiles})
+	if (NOT _sourceFiles AND NOT _cotiredSources)
+		return()
+	endif()
+	set (_cmds "")
+	# check for user provided unity source file list
+	get_property(_unitySourceFiles TARGET ${_target} PROPERTY COTIRE_${_language}_UNITY_SOURCE_INIT)
+	if (NOT _unitySourceFiles)
+		set (_unitySourceFiles ${_sourceFiles} ${_cotiredSources})
+	endif()
+	cotire_generate_target_script(
+		${_language} "${_configurations}" ${_target} _targetScript _targetConfigScript ${_unitySourceFiles})
+	# set up unity files for parallel compilation
+	cotire_compute_unity_max_number_of_includes(${_target} _maxIncludes ${_unitySourceFiles})
+	cotire_make_unity_source_file_paths(${_language} ${_target} ${_maxIncludes} _unityFiles ${_unitySourceFiles})
+	list (LENGTH _unityFiles _numberOfUnityFiles)
+	if (_numberOfUnityFiles EQUAL 0)
+		return()
+	elseif (_numberOfUnityFiles GREATER 1)
+		cotire_setup_unity_generation_commands(
+			${_language} ${_target} "${_targetScript}" "${_targetConfigScript}" "${_unityFiles}" _cmds ${_unitySourceFiles})
+	endif()
+	# set up single unity file for prefix header generation
+	cotire_make_single_unity_source_file_path(${_language} ${_target} _unityFile)
+	cotire_setup_unity_generation_commands(
+		${_language} ${_target} "${_targetScript}" "${_targetConfigScript}" "${_unityFile}" _cmds ${_unitySourceFiles})
+	cotire_make_prefix_file_path(${_language} ${_target} _prefixFile)
+	# set up prefix header
+	if (_prefixFile)
+		# check for user provided prefix header files
+		get_property(_prefixHeaderFiles TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER_INIT)
+		if (_prefixHeaderFiles)
+			cotire_setup_prefix_generation_from_provided_command(
+				${_language} ${_target} "${_targetConfigScript}" "${_prefixFile}" _cmds ${_prefixHeaderFiles})
+		else()
+			cotire_setup_prefix_generation_from_unity_command(
+				${_language} ${_target} "${_targetConfigScript}" "${_prefixFile}" "${_unityFile}" _cmds ${_unitySourceFiles})
+		endif()
+		# check if selected language has enough sources at all
+		list (LENGTH _sourceFiles _numberOfSources)
+		if (_numberOfSources LESS ${COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES})
+			set (_targetUsePCH FALSE)
+		else()
+			get_target_property(_targetUsePCH ${_target} COTIRE_ENABLE_PRECOMPILED_HEADER)
+		endif()
+		if (_targetUsePCH)
+			cotire_make_pch_file_path(${_language} ${_target} _pchFile)
+			if (_pchFile)
+				# first file in _sourceFiles is passed as the host file
+				cotire_setup_pch_file_compilation(
+					${_language} ${_target} "${_targetConfigScript}" "${_prefixFile}" "${_pchFile}" ${_sourceFiles})
+				cotire_setup_pch_file_inclusion(
+					${_language} ${_target} ${_wholeTarget} "${_prefixFile}" "${_pchFile}" ${_sourceFiles})
+			endif()
+		elseif (_prefixHeaderFiles)
+			# user provided prefix header must be included unconditionally
+			cotire_setup_prefix_file_inclusion(${_language} ${_target} "${_prefixFile}" ${_sourceFiles})
+		endif()
+	endif()
+	# mark target as cotired for language
+	set_property(TARGET ${_target} PROPERTY COTIRE_${_language}_UNITY_SOURCE "${_unityFiles}")
+	if (_prefixFile)
+		set_property(TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER "${_prefixFile}")
+		if (_targetUsePCH AND _pchFile)
+			set_property(TARGET ${_target} PROPERTY COTIRE_${_language}_PRECOMPILED_HEADER "${_pchFile}")
+		endif()
+	endif()
+	set (${_cmdsVar} ${_cmds} PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_clean_target _target)
+	set (_cleanTargetName "${_target}${COTIRE_CLEAN_TARGET_SUFFIX}")
+	if (NOT TARGET "${_cleanTargetName}")
+		cotire_set_cmd_to_prologue(_cmds)
+		get_filename_component(_outputDir "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}" ABSOLUTE)
+		list (APPEND _cmds -P "${COTIRE_CMAKE_MODULE_FILE}" "cleanup" "${_outputDir}" "${COTIRE_INTDIR}" "${_target}")
+		add_custom_target(${_cleanTargetName}
+			COMMAND ${_cmds}
+			WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+			COMMENT "Cleaning up target ${_target} cotire generated files"
+			VERBATIM)
+		cotire_init_target("${_cleanTargetName}")
+	endif()
+endfunction()
+
+function (cotire_setup_pch_target _languages _configurations _target)
+	if ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
+		# for makefile based generators, we add a custom target to trigger the generation of the cotire related files
+		set (_dependsFiles "")
+		foreach (_language ${_languages})
+			set (_props COTIRE_${_language}_PREFIX_HEADER COTIRE_${_language}_UNITY_SOURCE)
+			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" AND NOT
+				(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
+				# MSVC, Intel and clang-cl only create precompiled header as a side effect
+				list (INSERT _props 0 COTIRE_${_language}_PRECOMPILED_HEADER)
+			endif()
+			cotire_get_first_set_property_value(_dependsFile TARGET ${_target} ${_props})
+			if (_dependsFile)
+				list (APPEND _dependsFiles "${_dependsFile}")
+			endif()
+		endforeach()
+		if (_dependsFiles)
+			set (_pchTargetName "${_target}${COTIRE_PCH_TARGET_SUFFIX}")
+			add_custom_target("${_pchTargetName}" DEPENDS ${_dependsFiles})
+			cotire_init_target("${_pchTargetName}")
+			cotire_add_to_pch_all_target(${_pchTargetName})
+		endif()
+	else()
+		# for other generators, we add the "clean all" target to clean up the precompiled header
+		cotire_setup_clean_all_target()
+	endif()
+endfunction()
+
+function (cotire_filter_object_libraries _target _objectLibrariesVar)
+	set (_objectLibraries "")
+	foreach (_source ${ARGN})
+		if (_source MATCHES "^\\$<TARGET_OBJECTS:.+>$")
+			list (APPEND _objectLibraries "${_source}")
+		endif()
+	endforeach()
+	set (${_objectLibrariesVar} ${_objectLibraries} PARENT_SCOPE)
+endfunction()
+
+function (cotire_collect_unity_target_sources _target _languages _unityTargetSourcesVar)
+	get_target_property(_targetSourceFiles ${_target} SOURCES)
+	set (_unityTargetSources ${_targetSourceFiles})
+	foreach (_language ${_languages})
+		get_property(_unityFiles TARGET ${_target} PROPERTY COTIRE_${_language}_UNITY_SOURCE)
+		if (_unityFiles)
+			# remove source files that are included in the unity source
+			set (_sourceFiles "")
+			set (_excludedSources "")
+			set (_cotiredSources "")
+			cotire_filter_language_source_files(${_language} ${_target} _sourceFiles _excludedSources _cotiredSources ${_targetSourceFiles})
+			if (_sourceFiles OR _cotiredSources)
+				list (REMOVE_ITEM _unityTargetSources ${_sourceFiles} ${_cotiredSources})
+			endif()
+			# add unity source files instead
+			list (APPEND _unityTargetSources ${_unityFiles})
+		endif()
+	endforeach()
+	# handle object libraries which are part of the target's sources
+	get_target_property(_linkLibrariesStrategy ${_target} COTIRE_UNITY_LINK_LIBRARIES_INIT)
+	if ("${_linkLibrariesStrategy}" MATCHES "^COPY_UNITY$")
+		cotire_filter_object_libraries(${_target} _objectLibraries ${_targetSourceFiles})
+		if (_objectLibraries)
+			cotire_map_libraries("${_linkLibrariesStrategy}" _unityObjectLibraries ${_objectLibraries})
+			list (REMOVE_ITEM _unityTargetSources ${_objectLibraries})
+			list (APPEND _unityTargetSources ${_unityObjectLibraries})
+		endif()
+	endif()
+	set (${_unityTargetSourcesVar} ${_unityTargetSources} PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_unity_target_pch_usage _languages _target)
+	foreach (_language ${_languages})
+		get_property(_unityFiles TARGET ${_target} PROPERTY COTIRE_${_language}_UNITY_SOURCE)
+		if (_unityFiles)
+			get_property(_userPrefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER_INIT)
+			get_property(_prefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER)
+			if (_userPrefixFile AND _prefixFile)
+				# user provided prefix header must be included unconditionally by unity sources
+				cotire_setup_prefix_file_inclusion(${_language} ${_target} "${_prefixFile}" ${_unityFiles})
+			endif()
+		endif()
+	endforeach()
+endfunction()
+
+function (cotire_setup_unity_build_target _languages _configurations _target)
+	get_target_property(_unityTargetName ${_target} COTIRE_UNITY_TARGET_NAME)
+	if (NOT _unityTargetName)
+		set (_unityTargetName "${_target}${COTIRE_UNITY_BUILD_TARGET_SUFFIX}")
+	endif()
+	# determine unity target sub type
+	get_target_property(_targetType ${_target} TYPE)
+	if ("${_targetType}" STREQUAL "EXECUTABLE")
+		set (_unityTargetSubType "")
+	elseif (_targetType MATCHES "(STATIC|SHARED|MODULE|OBJECT)_LIBRARY")
+		set (_unityTargetSubType "${CMAKE_MATCH_1}")
+	else()
+		message (WARNING "cotire: target ${_target} has unknown target type ${_targetType}.")
+		return()
+	endif()
+	# determine unity target sources
+	set (_unityTargetSources "")
+	cotire_collect_unity_target_sources(${_target} "${_languages}" _unityTargetSources)
+	# prevent AUTOMOC, AUTOUIC and AUTORCC properties from being set when the unity target is created
+	set (CMAKE_AUTOMOC OFF)
+	set (CMAKE_AUTOUIC OFF)
+	set (CMAKE_AUTORCC OFF)
+	if (COTIRE_DEBUG)
+		message (STATUS "add target ${_targetType} ${_unityTargetName} ${_unityTargetSubType} EXCLUDE_FROM_ALL ${_unityTargetSources}")
+	endif()
+	# generate unity target
+	if ("${_targetType}" STREQUAL "EXECUTABLE")
+		add_executable(${_unityTargetName} ${_unityTargetSubType} EXCLUDE_FROM_ALL ${_unityTargetSources})
+	else()
+		add_library(${_unityTargetName} ${_unityTargetSubType} EXCLUDE_FROM_ALL ${_unityTargetSources})
+	endif()
+	# copy output location properties
+	set (_outputDirProperties
+		ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_<CONFIG>
+		LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_<CONFIG>
+		RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_<CONFIG>)
+	if (COTIRE_UNITY_OUTPUT_DIRECTORY)
+		set (_setDefaultOutputDir TRUE)
+		if (IS_ABSOLUTE "${COTIRE_UNITY_OUTPUT_DIRECTORY}")
+			set (_outputDir "${COTIRE_UNITY_OUTPUT_DIRECTORY}")
+		else()
+			# append relative COTIRE_UNITY_OUTPUT_DIRECTORY to target's actual output directory
+			cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties})
+			cotire_resolve_config_properties("${_configurations}" _properties ${_outputDirProperties})
+			foreach (_property ${_properties})
+				get_property(_outputDir TARGET ${_target} PROPERTY ${_property})
+				if (_outputDir)
+					get_filename_component(_outputDir "${_outputDir}/${COTIRE_UNITY_OUTPUT_DIRECTORY}" ABSOLUTE)
+					set_property(TARGET ${_unityTargetName} PROPERTY ${_property} "${_outputDir}")
+					set (_setDefaultOutputDir FALSE)
+				endif()
+			endforeach()
+			if (_setDefaultOutputDir)
+				get_filename_component(_outputDir "${CMAKE_CURRENT_BINARY_DIR}/${COTIRE_UNITY_OUTPUT_DIRECTORY}" ABSOLUTE)
+			endif()
+		endif()
+		if (_setDefaultOutputDir)
+			set_target_properties(${_unityTargetName} PROPERTIES
+				ARCHIVE_OUTPUT_DIRECTORY "${_outputDir}"
+				LIBRARY_OUTPUT_DIRECTORY "${_outputDir}"
+				RUNTIME_OUTPUT_DIRECTORY "${_outputDir}")
+		endif()
+	else()
+		cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+			${_outputDirProperties})
+	endif()
+	# copy output name
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_<CONFIG>
+		LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_<CONFIG>
+		OUTPUT_NAME OUTPUT_NAME_<CONFIG>
+		RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_<CONFIG>
+		PREFIX <CONFIG>_POSTFIX SUFFIX
+		IMPORT_PREFIX IMPORT_SUFFIX)
+	# copy compile stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		COMPILE_DEFINITIONS COMPILE_DEFINITIONS_<CONFIG>
+		COMPILE_FLAGS COMPILE_OPTIONS
+		Fortran_FORMAT Fortran_MODULE_DIRECTORY
+		INCLUDE_DIRECTORIES
+		INTERPROCEDURAL_OPTIMIZATION INTERPROCEDURAL_OPTIMIZATION_<CONFIG>
+		POSITION_INDEPENDENT_CODE
+		C_COMPILER_LAUNCHER CXX_COMPILER_LAUNCHER
+		C_INCLUDE_WHAT_YOU_USE CXX_INCLUDE_WHAT_YOU_USE
+		C_VISIBILITY_PRESET CXX_VISIBILITY_PRESET VISIBILITY_INLINES_HIDDEN
+		C_CLANG_TIDY CXX_CLANG_TIDY)
+	# copy compile features
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED
+		CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED
+		COMPILE_FEATURES)
+	# copy interface stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN
+		COMPATIBLE_INTERFACE_STRING
+		INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS
+		INTERFACE_INCLUDE_DIRECTORIES INTERFACE_SOURCES
+		INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
+		INTERFACE_AUTOUIC_OPTIONS NO_SYSTEM_FROM_IMPORTED)
+	# copy link stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		BUILD_WITH_INSTALL_RPATH BUILD_WITH_INSTALL_NAME_DIR
+		INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH SKIP_BUILD_RPATH
+		LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED
+		LINK_FLAGS LINK_FLAGS_<CONFIG>
+		LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_<CONFIG>
+		LINK_INTERFACE_MULTIPLICITY LINK_INTERFACE_MULTIPLICITY_<CONFIG>
+		LINK_SEARCH_START_STATIC LINK_SEARCH_END_STATIC
+		STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_<CONFIG>
+		NO_SONAME SOVERSION VERSION
+		LINK_WHAT_YOU_USE BUILD_RPATH)
+	# copy cmake stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		IMPLICIT_DEPENDS_INCLUDE_TRANSFORM RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK)
+	# copy Apple platform specific stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		BUNDLE BUNDLE_EXTENSION FRAMEWORK FRAMEWORK_VERSION INSTALL_NAME_DIR
+		MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_RPATH
+		OSX_ARCHITECTURES OSX_ARCHITECTURES_<CONFIG> PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST
+		IOS_INSTALL_COMBINED XCODE_EXPLICIT_FILE_TYPE XCODE_PRODUCT_TYPE)
+	# copy Windows platform specific stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		GNUtoMS
+		COMPILE_PDB_NAME COMPILE_PDB_NAME_<CONFIG>
+		COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG>
+		PDB_NAME PDB_NAME_<CONFIG> PDB_OUTPUT_DIRECTORY PDB_OUTPUT_DIRECTORY_<CONFIG>
+		VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION
+		VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE
+		VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK
+		VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION
+		VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER
+		VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION
+		VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES
+		WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS
+		DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE
+		VS_SDK_REFERENCES VS_USER_PROPS VS_DEBUGGER_WORKING_DIRECTORY)
+	# copy Android platform specific stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		ANDROID_API ANDROID_API_MIN ANDROID_GUI
+		ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES
+		ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR
+		ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES
+		ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH
+		ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE)
+	# copy CUDA platform specific stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		CUDA_PTX_COMPILATION CUDA_SEPARABLE_COMPILATION CUDA_RESOLVE_DEVICE_SYMBOLS
+		CUDA_EXTENSIONS CUDA_STANDARD CUDA_STANDARD_REQUIRED)
+	# use output name from original target
+	get_target_property(_targetOutputName ${_unityTargetName} OUTPUT_NAME)
+	if (NOT _targetOutputName)
+		set_property(TARGET ${_unityTargetName} PROPERTY OUTPUT_NAME "${_target}")
+	endif()
+	# use export symbol from original target
+	cotire_get_target_export_symbol("${_target}" _defineSymbol)
+	if (_defineSymbol)
+		set_property(TARGET ${_unityTargetName} PROPERTY DEFINE_SYMBOL "${_defineSymbol}")
+		if ("${_targetType}" STREQUAL "EXECUTABLE")
+			set_property(TARGET ${_unityTargetName} PROPERTY ENABLE_EXPORTS TRUE)
+		endif()
+	endif()
+	# enable parallel compilation for MSVC
+	if (MSVC AND "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+		list (LENGTH _unityTargetSources _numberOfUnityTargetSources)
+		if (_numberOfUnityTargetSources GREATER 1)
+			set_property(TARGET ${_unityTargetName} APPEND PROPERTY COMPILE_OPTIONS "/MP")
+		endif()
+	endif()
+	cotire_init_target(${_unityTargetName})
+	cotire_add_to_unity_all_target(${_unityTargetName})
+	set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_TARGET_NAME "${_unityTargetName}")
+endfunction(cotire_setup_unity_build_target)
+
+function (cotire_target _target)
+	set(_options "")
+	set(_oneValueArgs "")
+	set(_multiValueArgs LANGUAGES CONFIGURATIONS)
+	cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+	if (NOT _option_LANGUAGES)
+		get_property (_option_LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
+	endif()
+	if (NOT _option_CONFIGURATIONS)
+		cotire_get_configuration_types(_option_CONFIGURATIONS)
+	endif()
+	# check if cotire can be applied to target at all
+	cotire_is_target_supported(${_target} _isSupported)
+	if (NOT _isSupported)
+		get_target_property(_imported ${_target} IMPORTED)
+		get_target_property(_targetType ${_target} TYPE)
+		if (_imported)
+			message (WARNING "cotire: imported ${_targetType} target ${_target} cannot be cotired.")
+		else()
+			message (STATUS "cotire: ${_targetType} target ${_target} cannot be cotired.")
+		endif()
+		return()
+	endif()
+	# resolve alias
+	get_target_property(_aliasName ${_target} ALIASED_TARGET)
+	if (_aliasName)
+		if (COTIRE_DEBUG)
+			message (STATUS "${_target} is an alias. Applying cotire to aliased target ${_aliasName} instead.")
+		endif()
+		set (_target ${_aliasName})
+	endif()
+	# check if target needs to be cotired for build type
+	# when using configuration types, the test is performed at build time
+	cotire_init_cotire_target_properties(${_target})
+	if (NOT CMAKE_CONFIGURATION_TYPES)
+		if (CMAKE_BUILD_TYPE)
+			list (FIND _option_CONFIGURATIONS "${CMAKE_BUILD_TYPE}" _index)
+		else()
+			list (FIND _option_CONFIGURATIONS "None" _index)
+		endif()
+		if (_index EQUAL -1)
+			if (COTIRE_DEBUG)
+				message (STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} not cotired (${_option_CONFIGURATIONS})")
+			endif()
+			return()
+		endif()
+	endif()
+	# when not using configuration types, immediately create cotire intermediate dir
+	if (NOT CMAKE_CONFIGURATION_TYPES)
+		cotire_get_intermediate_dir(_baseDir)
+		file (MAKE_DIRECTORY "${_baseDir}")
+	endif()
+	# choose languages that apply to the target
+	cotire_choose_target_languages("${_target}" _targetLanguages _wholeTarget ${_option_LANGUAGES})
+	if (NOT _targetLanguages)
+		return()
+	endif()
+	set (_cmds "")
+	foreach (_language ${_targetLanguages})
+		cotire_process_target_language("${_language}" "${_option_CONFIGURATIONS}" ${_target} ${_wholeTarget} _cmd)
+		if (_cmd)
+			list (APPEND _cmds ${_cmd})
+		endif()
+	endforeach()
+	get_target_property(_targetAddSCU ${_target} COTIRE_ADD_UNITY_BUILD)
+	if (_targetAddSCU)
+		cotire_setup_unity_build_target("${_targetLanguages}" "${_option_CONFIGURATIONS}" ${_target})
+	endif()
+	get_target_property(_targetUsePCH ${_target} COTIRE_ENABLE_PRECOMPILED_HEADER)
+	if (_targetUsePCH)
+		cotire_setup_target_pch_usage("${_targetLanguages}" ${_target} ${_wholeTarget} ${_cmds})
+		cotire_setup_pch_target("${_targetLanguages}" "${_option_CONFIGURATIONS}" ${_target})
+		if (_targetAddSCU)
+			cotire_setup_unity_target_pch_usage("${_targetLanguages}" ${_target})
+		endif()
+	endif()
+	get_target_property(_targetAddCleanTarget ${_target} COTIRE_ADD_CLEAN)
+	if (_targetAddCleanTarget)
+		cotire_setup_clean_target(${_target})
+	endif()
+endfunction(cotire_target)
+
+function (cotire_map_libraries _strategy _mappedLibrariesVar)
+	set (_mappedLibraries "")
+	foreach (_library ${ARGN})
+		if (_library MATCHES "^\\$<LINK_ONLY:(.+)>$")
+			set (_libraryName "${CMAKE_MATCH_1}")
+			set (_linkOnly TRUE)
+			set (_objectLibrary FALSE)
+		elseif (_library MATCHES "^\\$<TARGET_OBJECTS:(.+)>$")
+			set (_libraryName "${CMAKE_MATCH_1}")
+			set (_linkOnly FALSE)
+			set (_objectLibrary TRUE)
+		else()
+			set (_libraryName "${_library}")
+			set (_linkOnly FALSE)
+			set (_objectLibrary FALSE)
+		endif()
+		if ("${_strategy}" MATCHES "COPY_UNITY")
+			cotire_is_target_supported(${_libraryName} _isSupported)
+			if (_isSupported)
+				# use target's corresponding unity target, if available
+				get_target_property(_libraryUnityTargetName ${_libraryName} COTIRE_UNITY_TARGET_NAME)
+				if (TARGET "${_libraryUnityTargetName}")
+					if (_linkOnly)
+						list (APPEND _mappedLibraries "$<LINK_ONLY:${_libraryUnityTargetName}>")
+					elseif (_objectLibrary)
+						list (APPEND _mappedLibraries "$<TARGET_OBJECTS:${_libraryUnityTargetName}>")
+					else()
+						list (APPEND _mappedLibraries "${_libraryUnityTargetName}")
+					endif()
+				else()
+					list (APPEND _mappedLibraries "${_library}")
+				endif()
+			else()
+				list (APPEND _mappedLibraries "${_library}")
+			endif()
+		else()
+			list (APPEND _mappedLibraries "${_library}")
+		endif()
+	endforeach()
+	list (REMOVE_DUPLICATES _mappedLibraries)
+	set (${_mappedLibrariesVar} ${_mappedLibraries} PARENT_SCOPE)
+endfunction()
+
+function (cotire_target_link_libraries _target)
+	cotire_is_target_supported(${_target} _isSupported)
+	if (NOT _isSupported)
+		return()
+	endif()
+	get_target_property(_unityTargetName ${_target} COTIRE_UNITY_TARGET_NAME)
+	if (TARGET "${_unityTargetName}")
+		get_target_property(_linkLibrariesStrategy ${_target} COTIRE_UNITY_LINK_LIBRARIES_INIT)
+		if (COTIRE_DEBUG)
+			message (STATUS "unity target ${_unityTargetName} link strategy: ${_linkLibrariesStrategy}")
+		endif()
+		if ("${_linkLibrariesStrategy}" MATCHES "^(COPY|COPY_UNITY)$")
+			get_target_property(_linkLibraries ${_target} LINK_LIBRARIES)
+			if (_linkLibraries)
+				cotire_map_libraries("${_linkLibrariesStrategy}" _unityLinkLibraries ${_linkLibraries})
+				set_target_properties(${_unityTargetName} PROPERTIES LINK_LIBRARIES "${_unityLinkLibraries}")
+				if (COTIRE_DEBUG)
+					message (STATUS "unity target ${_unityTargetName} link libraries: ${_unityLinkLibraries}")
+				endif()
+			endif()
+			get_target_property(_interfaceLinkLibraries ${_target} INTERFACE_LINK_LIBRARIES)
+			if (_interfaceLinkLibraries)
+				cotire_map_libraries("${_linkLibrariesStrategy}" _unityLinkInterfaceLibraries ${_interfaceLinkLibraries})
+				set_target_properties(${_unityTargetName} PROPERTIES INTERFACE_LINK_LIBRARIES "${_unityLinkInterfaceLibraries}")
+				if (COTIRE_DEBUG)
+					message (STATUS "unity target ${_unityTargetName} interface link libraries: ${_unityLinkInterfaceLibraries}")
+				endif()
+			endif()
+			get_target_property(_manualDependencies ${_target} MANUALLY_ADDED_DEPENDENCIES)
+			if (_manualDependencies)
+				cotire_map_libraries("${_linkLibrariesStrategy}" _unityManualDependencies ${_manualDependencies})
+				if (_unityManualDependencies)
+					add_dependencies("${_unityTargetName}" ${_unityManualDependencies})
+				endif()
+			endif()
+		endif()
+	endif()
+endfunction(cotire_target_link_libraries)
+
+function (cotire_cleanup _binaryDir _cotireIntermediateDirName _targetName)
+	if (_targetName)
+		file (GLOB_RECURSE _cotireFiles "${_binaryDir}/${_targetName}*.*")
+	else()
+		file (GLOB_RECURSE _cotireFiles "${_binaryDir}/*.*")
+	endif()
+	# filter files in intermediate directory
+	set (_filesToRemove "")
+	foreach (_file ${_cotireFiles})
+		get_filename_component(_dir "${_file}" DIRECTORY)
+		get_filename_component(_dirName "${_dir}" NAME)
+		if ("${_dirName}" STREQUAL "${_cotireIntermediateDirName}")
+			list (APPEND _filesToRemove "${_file}")
+		endif()
+	endforeach()
+	if (_filesToRemove)
+		if (COTIRE_VERBOSE)
+			message (STATUS "cleaning up ${_filesToRemove}")
+		endif()
+		file (REMOVE ${_filesToRemove})
+	endif()
+endfunction()
+
+function (cotire_init_target _targetName)
+	if (COTIRE_TARGETS_FOLDER)
+		set_target_properties(${_targetName} PROPERTIES FOLDER "${COTIRE_TARGETS_FOLDER}")
+	endif()
+	set_target_properties(${_targetName} PROPERTIES EXCLUDE_FROM_ALL TRUE)
+	if (MSVC_IDE)
+		set_target_properties(${_targetName} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
+	endif()
+endfunction()
+
+function (cotire_add_to_pch_all_target _pchTargetName)
+	set (_targetName "${COTIRE_PCH_ALL_TARGET_NAME}")
+	if (NOT TARGET "${_targetName}")
+		add_custom_target("${_targetName}"
+			WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+			VERBATIM)
+		cotire_init_target("${_targetName}")
+	endif()
+	cotire_setup_clean_all_target()
+	add_dependencies(${_targetName} ${_pchTargetName})
+endfunction()
+
+function (cotire_add_to_unity_all_target _unityTargetName)
+	set (_targetName "${COTIRE_UNITY_BUILD_ALL_TARGET_NAME}")
+	if (NOT TARGET "${_targetName}")
+		add_custom_target("${_targetName}"
+			WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+			VERBATIM)
+		cotire_init_target("${_targetName}")
+	endif()
+	cotire_setup_clean_all_target()
+	add_dependencies(${_targetName} ${_unityTargetName})
+endfunction()
+
+function (cotire_setup_clean_all_target)
+	set (_targetName "${COTIRE_CLEAN_ALL_TARGET_NAME}")
+	if (NOT TARGET "${_targetName}")
+		cotire_set_cmd_to_prologue(_cmds)
+		list (APPEND _cmds -P "${COTIRE_CMAKE_MODULE_FILE}" "cleanup" "${CMAKE_BINARY_DIR}" "${COTIRE_INTDIR}")
+		add_custom_target(${_targetName}
+			COMMAND ${_cmds}
+			WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+			COMMENT "Cleaning up all cotire generated files"
+			VERBATIM)
+		cotire_init_target("${_targetName}")
+	endif()
+endfunction()
+
+function (cotire)
+	set(_options "")
+	set(_oneValueArgs "")
+	set(_multiValueArgs LANGUAGES CONFIGURATIONS)
+	cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+	set (_targets ${_option_UNPARSED_ARGUMENTS})
+	foreach (_target ${_targets})
+		if (TARGET ${_target})
+			cotire_target(${_target} LANGUAGES ${_option_LANGUAGES} CONFIGURATIONS ${_option_CONFIGURATIONS})
+		else()
+			message (WARNING "cotire: ${_target} is not a target.")
+		endif()
+	endforeach()
+	foreach (_target ${_targets})
+		if (TARGET ${_target})
+			cotire_target_link_libraries(${_target})
+		endif()
+	endforeach()
+endfunction()
+
+if (CMAKE_SCRIPT_MODE_FILE)
+
+	# cotire is being run in script mode
+	# locate -P on command args
+	set (COTIRE_ARGC -1)
+	foreach (_index RANGE ${CMAKE_ARGC})
+		if (COTIRE_ARGC GREATER -1)
+			set (COTIRE_ARGV${COTIRE_ARGC} "${CMAKE_ARGV${_index}}")
+			math (EXPR COTIRE_ARGC "${COTIRE_ARGC} + 1")
+		elseif ("${CMAKE_ARGV${_index}}" STREQUAL "-P")
+			set (COTIRE_ARGC 0)
+		endif()
+	endforeach()
+
+	# include target script if available
+	if ("${COTIRE_ARGV2}" MATCHES "\\.cmake$")
+		# the included target scripts sets up additional variables relating to the target (e.g., COTIRE_TARGET_SOURCES)
+		include("${COTIRE_ARGV2}")
+	endif()
+
+	if (COTIRE_DEBUG)
+		message (STATUS "${COTIRE_ARGV0} ${COTIRE_ARGV1} ${COTIRE_ARGV2} ${COTIRE_ARGV3} ${COTIRE_ARGV4} ${COTIRE_ARGV5}")
+	endif()
+
+	if (NOT COTIRE_BUILD_TYPE)
+		set (COTIRE_BUILD_TYPE "None")
+	endif()
+	string (TOUPPER "${COTIRE_BUILD_TYPE}" _upperConfig)
+	set (_includeDirs ${COTIRE_TARGET_INCLUDE_DIRECTORIES_${_upperConfig}})
+	set (_systemIncludeDirs ${COTIRE_TARGET_SYSTEM_INCLUDE_DIRECTORIES_${_upperConfig}})
+	set (_compileDefinitions ${COTIRE_TARGET_COMPILE_DEFINITIONS_${_upperConfig}})
+	set (_compileFlags ${COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig}})
+	# check if target has been cotired for actual build type COTIRE_BUILD_TYPE
+	list (FIND COTIRE_TARGET_CONFIGURATION_TYPES "${COTIRE_BUILD_TYPE}" _index)
+	if (_index GREATER -1)
+		set (_sources ${COTIRE_TARGET_SOURCES})
+		set (_sourcesDefinitions ${COTIRE_TARGET_SOURCES_COMPILE_DEFINITIONS_${_upperConfig}})
+	else()
+		if (COTIRE_DEBUG)
+			message (STATUS "COTIRE_BUILD_TYPE=${COTIRE_BUILD_TYPE} not cotired (${COTIRE_TARGET_CONFIGURATION_TYPES})")
+		endif()
+		set (_sources "")
+		set (_sourcesDefinitions "")
+	endif()
+	set (_targetPreUndefs ${COTIRE_TARGET_PRE_UNDEFS})
+	set (_targetPostUndefs ${COTIRE_TARGET_POST_UNDEFS})
+	set (_sourcesPreUndefs ${COTIRE_TARGET_SOURCES_PRE_UNDEFS})
+	set (_sourcesPostUndefs ${COTIRE_TARGET_SOURCES_POST_UNDEFS})
+
+	if ("${COTIRE_ARGV1}" STREQUAL "unity")
+
+		if (XCODE)
+			# executing pre-build action under Xcode, check dependency on target script
+			set (_dependsOption DEPENDS "${COTIRE_ARGV2}")
+		else()
+			# executing custom command, no need to re-check for dependencies
+			set (_dependsOption "")
+		endif()
+
+		cotire_select_unity_source_files("${COTIRE_ARGV3}" _sources ${_sources})
+
+		cotire_generate_unity_source(
+			"${COTIRE_ARGV3}" ${_sources}
+			LANGUAGE "${COTIRE_TARGET_LANGUAGE}"
+			SOURCES_COMPILE_DEFINITIONS ${_sourcesDefinitions}
+			PRE_UNDEFS ${_targetPreUndefs}
+			POST_UNDEFS ${_targetPostUndefs}
+			SOURCES_PRE_UNDEFS ${_sourcesPreUndefs}
+			SOURCES_POST_UNDEFS ${_sourcesPostUndefs}
+			${_dependsOption})
+
+	elseif ("${COTIRE_ARGV1}" STREQUAL "prefix")
+
+		if (XCODE)
+			# executing pre-build action under Xcode, check dependency on unity file and prefix dependencies
+			set (_dependsOption DEPENDS "${COTIRE_ARGV4}" ${COTIRE_TARGET_PREFIX_DEPENDS})
+		else()
+			# executing custom command, no need to re-check for dependencies
+			set (_dependsOption "")
+		endif()
+
+		set (_files "")
+		foreach (_index RANGE 4 ${COTIRE_ARGC})
+			if (COTIRE_ARGV${_index})
+				list (APPEND _files "${COTIRE_ARGV${_index}}")
+			endif()
+		endforeach()
+
+		cotire_generate_prefix_header(
+			"${COTIRE_ARGV3}" ${_files}
+			COMPILER_LAUNCHER "${COTIRE_TARGET_${COTIRE_TARGET_LANGUAGE}_COMPILER_LAUNCHER}"
+			COMPILER_EXECUTABLE "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER}"
+			COMPILER_ARG1 ${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_ARG1}
+			COMPILER_ID "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_ID}"
+			COMPILER_VERSION "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_VERSION}"
+			LANGUAGE "${COTIRE_TARGET_LANGUAGE}"
+			IGNORE_PATH "${COTIRE_TARGET_IGNORE_PATH};${COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_PATH}"
+			INCLUDE_PATH ${COTIRE_TARGET_INCLUDE_PATH}
+			IGNORE_EXTENSIONS "${CMAKE_${COTIRE_TARGET_LANGUAGE}_SOURCE_FILE_EXTENSIONS};${COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_EXTENSIONS}"
+			INCLUDE_PRIORITY_PATH ${COTIRE_TARGET_INCLUDE_PRIORITY_PATH}
+			INCLUDE_DIRECTORIES ${_includeDirs}
+			SYSTEM_INCLUDE_DIRECTORIES ${_systemIncludeDirs}
+			COMPILE_DEFINITIONS ${_compileDefinitions}
+			COMPILE_FLAGS ${_compileFlags}
+			${_dependsOption})
+
+	elseif ("${COTIRE_ARGV1}" STREQUAL "precompile")
+
+		set (_files "")
+		foreach (_index RANGE 5 ${COTIRE_ARGC})
+			if (COTIRE_ARGV${_index})
+				list (APPEND _files "${COTIRE_ARGV${_index}}")
+			endif()
+		endforeach()
+
+		cotire_precompile_prefix_header(
+			"${COTIRE_ARGV3}" "${COTIRE_ARGV4}" "${COTIRE_ARGV5}"
+			COMPILER_LAUNCHER "${COTIRE_TARGET_${COTIRE_TARGET_LANGUAGE}_COMPILER_LAUNCHER}"
+			COMPILER_EXECUTABLE "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER}"
+			COMPILER_ARG1 ${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_ARG1}
+			COMPILER_ID "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_ID}"
+			COMPILER_VERSION "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_VERSION}"
+			LANGUAGE "${COTIRE_TARGET_LANGUAGE}"
+			INCLUDE_DIRECTORIES ${_includeDirs}
+			SYSTEM_INCLUDE_DIRECTORIES ${_systemIncludeDirs}
+			COMPILE_DEFINITIONS ${_compileDefinitions}
+			COMPILE_FLAGS ${_compileFlags})
+
+	elseif ("${COTIRE_ARGV1}" STREQUAL "combine")
+
+		if (COTIRE_TARGET_LANGUAGE)
+			set (_combinedFile "${COTIRE_ARGV3}")
+			set (_startIndex 4)
+		else()
+			set (_combinedFile "${COTIRE_ARGV2}")
+			set (_startIndex 3)
+		endif()
+		set (_files "")
+		foreach (_index RANGE ${_startIndex} ${COTIRE_ARGC})
+			if (COTIRE_ARGV${_index})
+				list (APPEND _files "${COTIRE_ARGV${_index}}")
+			endif()
+		endforeach()
+
+		if (XCODE)
+			# executing pre-build action under Xcode, check dependency on files to be combined
+			set (_dependsOption DEPENDS ${_files})
+		else()
+			# executing custom command, no need to re-check for dependencies
+			set (_dependsOption "")
+		endif()
+
+		if (COTIRE_TARGET_LANGUAGE)
+			cotire_generate_unity_source(
+				"${_combinedFile}" ${_files}
+				LANGUAGE "${COTIRE_TARGET_LANGUAGE}"
+				${_dependsOption})
+		else()
+			cotire_generate_unity_source("${_combinedFile}" ${_files} ${_dependsOption})
+		endif()
+
+	elseif ("${COTIRE_ARGV1}" STREQUAL "cleanup")
+
+		cotire_cleanup("${COTIRE_ARGV2}" "${COTIRE_ARGV3}" "${COTIRE_ARGV4}")
+
+	else()
+		message (FATAL_ERROR "cotire: unknown command \"${COTIRE_ARGV1}\".")
+	endif()
+
+else()
+
+	# cotire is being run in include mode
+	# set up all variable and property definitions
+
+	if (NOT DEFINED COTIRE_DEBUG_INIT)
+		if (DEFINED COTIRE_DEBUG)
+			set (COTIRE_DEBUG_INIT ${COTIRE_DEBUG})
+		else()
+			set (COTIRE_DEBUG_INIT FALSE)
+		endif()
+	endif()
+	option (COTIRE_DEBUG "Enable cotire debugging output?" ${COTIRE_DEBUG_INIT})
+
+	if (NOT DEFINED COTIRE_VERBOSE_INIT)
+		if (DEFINED COTIRE_VERBOSE)
+			set (COTIRE_VERBOSE_INIT ${COTIRE_VERBOSE})
+		else()
+			set (COTIRE_VERBOSE_INIT FALSE)
+		endif()
+	endif()
+	option (COTIRE_VERBOSE "Enable cotire verbose output?" ${COTIRE_VERBOSE_INIT})
+
+	set (COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_EXTENSIONS "inc;inl;ipp" CACHE STRING
+		"Ignore headers with the listed file extensions from the generated prefix header.")
+
+	set (COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_PATH "" CACHE STRING
+		"Ignore headers from these directories when generating the prefix header.")
+
+	set (COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS "m;mm" CACHE STRING
+		"Ignore sources with the listed file extensions from the generated unity source.")
+
+	set (COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES "2" CACHE STRING
+		"Minimum number of sources in target required to enable use of precompiled header.")
+
+	if (NOT DEFINED COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT)
+		if (DEFINED COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES)
+			set (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT ${COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES})
+		elseif ("${CMAKE_GENERATOR}" MATCHES "JOM|Ninja|Visual Studio")
+			# enable parallelization for generators that run multiple jobs by default
+			set (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT "-j")
+		else()
+			set (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT "0")
+		endif()
+	endif()
+	set (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES "${COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT}" CACHE STRING
+		"Maximum number of source files to include in a single unity source file.")
+
+	if (NOT COTIRE_PREFIX_HEADER_FILENAME_SUFFIX)
+		set (COTIRE_PREFIX_HEADER_FILENAME_SUFFIX "_prefix")
+	endif()
+	if (NOT COTIRE_UNITY_SOURCE_FILENAME_SUFFIX)
+		set (COTIRE_UNITY_SOURCE_FILENAME_SUFFIX "_unity")
+	endif()
+	if (NOT COTIRE_INTDIR)
+		set (COTIRE_INTDIR "cotire")
+	endif()
+	if (NOT COTIRE_PCH_ALL_TARGET_NAME)
+		set (COTIRE_PCH_ALL_TARGET_NAME "all_pch")
+	endif()
+	if (NOT COTIRE_UNITY_BUILD_ALL_TARGET_NAME)
+		set (COTIRE_UNITY_BUILD_ALL_TARGET_NAME "all_unity")
+	endif()
+	if (NOT COTIRE_CLEAN_ALL_TARGET_NAME)
+		set (COTIRE_CLEAN_ALL_TARGET_NAME "clean_cotire")
+	endif()
+	if (NOT COTIRE_CLEAN_TARGET_SUFFIX)
+		set (COTIRE_CLEAN_TARGET_SUFFIX "_clean_cotire")
+	endif()
+	if (NOT COTIRE_PCH_TARGET_SUFFIX)
+		set (COTIRE_PCH_TARGET_SUFFIX "_pch")
+	endif()
+	if (MSVC)
+		# MSVC default PCH memory scaling factor of 100 percent (75 MB) is too small for template heavy C++ code
+		# use a bigger default factor of 170 percent (128 MB)
+		if (NOT DEFINED COTIRE_PCH_MEMORY_SCALING_FACTOR)
+			set (COTIRE_PCH_MEMORY_SCALING_FACTOR "170")
+		endif()
+	endif()
+	if (NOT COTIRE_UNITY_BUILD_TARGET_SUFFIX)
+		set (COTIRE_UNITY_BUILD_TARGET_SUFFIX "_unity")
+	endif()
+	if (NOT DEFINED COTIRE_TARGETS_FOLDER)
+		set (COTIRE_TARGETS_FOLDER "cotire")
+	endif()
+	if (NOT DEFINED COTIRE_UNITY_OUTPUT_DIRECTORY)
+		if ("${CMAKE_GENERATOR}" MATCHES "Ninja")
+			# generated Ninja build files do not work if the unity target produces the same output file as the cotired target
+			set (COTIRE_UNITY_OUTPUT_DIRECTORY "unity")
+		else()
+			set (COTIRE_UNITY_OUTPUT_DIRECTORY "")
+		endif()
+	endif()
+
+	# define cotire cache variables
+
+	define_property(
+		CACHED_VARIABLE PROPERTY "COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_PATH"
+		BRIEF_DOCS "Ignore headers from these directories when generating the prefix header."
+		FULL_DOCS
+			"The variable can be set to a semicolon separated list of include directories."
+			"If a header file is found in one of these directories or sub-directories, it will be excluded from the generated prefix header."
+			"If not defined, defaults to empty list."
+	)
+
+	define_property(
+		CACHED_VARIABLE PROPERTY "COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_EXTENSIONS"
+		BRIEF_DOCS "Ignore includes with the listed file extensions from the generated prefix header."
+		FULL_DOCS
+			"The variable can be set to a semicolon separated list of file extensions."
+			"If a header file extension matches one in the list, it will be excluded from the generated prefix header."
+			"Includes with an extension in CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS are always ignored."
+			"If not defined, defaults to inc;inl;ipp."
+	)
+
+	define_property(
+		CACHED_VARIABLE PROPERTY "COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS"
+		BRIEF_DOCS "Exclude sources with the listed file extensions from the generated unity source."
+		FULL_DOCS
+			"The variable can be set to a semicolon separated list of file extensions."
+			"If a source file extension matches one in the list, it will be excluded from the generated unity source file."
+			"Source files with an extension in CMAKE_<LANG>_IGNORE_EXTENSIONS are always excluded."
+			"If not defined, defaults to m;mm."
+	)
+
+	define_property(
+		CACHED_VARIABLE PROPERTY "COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES"
+		BRIEF_DOCS "Minimum number of sources in target required to enable use of precompiled header."
+		FULL_DOCS
+			"The variable can be set to an integer > 0."
+			"If a target contains less than that number of source files, cotire will not enable the use of the precompiled header for the target."
+			"If not defined, defaults to 2."
+	)
+
+	define_property(
+		CACHED_VARIABLE PROPERTY "COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES"
+		BRIEF_DOCS "Maximum number of source files to include in a single unity source file."
+		FULL_DOCS
+			"This may be set to an integer >= 0."
+			"If 0, cotire will only create a single unity source file."
+			"If a target contains more than that number of source files, cotire will create multiple unity source files for it."
+			"Can be set to \"-j\" to optimize the count of unity source files for the number of available processor cores."
+			"Can be set to \"-j jobs\" to optimize the number of unity source files for the given number of simultaneous jobs."
+			"Is used to initialize the target property COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES."
+			"Defaults to \"-j\" for the generators Visual Studio, JOM or Ninja. Defaults to 0 otherwise."
+	)
+
+	# define cotire directory properties
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_ENABLE_PRECOMPILED_HEADER"
+		BRIEF_DOCS "Modify build command of cotired targets added in this directory to make use of the generated precompiled header."
+		FULL_DOCS
+			"See target property COTIRE_ENABLE_PRECOMPILED_HEADER."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_ADD_UNITY_BUILD"
+		BRIEF_DOCS "Add a new target that performs a unity build for cotired targets added in this directory."
+		FULL_DOCS
+			"See target property COTIRE_ADD_UNITY_BUILD."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_ADD_CLEAN"
+		BRIEF_DOCS "Add a new target that cleans all cotire generated files for cotired targets added in this directory."
+		FULL_DOCS
+			"See target property COTIRE_ADD_CLEAN."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_PREFIX_HEADER_IGNORE_PATH"
+		BRIEF_DOCS "Ignore headers from these directories when generating the prefix header."
+		FULL_DOCS
+			"See target property COTIRE_PREFIX_HEADER_IGNORE_PATH."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_PREFIX_HEADER_INCLUDE_PATH"
+		BRIEF_DOCS "Honor headers from these directories when generating the prefix header."
+		FULL_DOCS
+			"See target property COTIRE_PREFIX_HEADER_INCLUDE_PATH."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH"
+		BRIEF_DOCS "Header paths matching one of these directories are put at the top of the prefix header."
+		FULL_DOCS
+			"See target property COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_UNITY_SOURCE_PRE_UNDEFS"
+		BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file before the inclusion of each source file."
+		FULL_DOCS
+			"See target property COTIRE_UNITY_SOURCE_PRE_UNDEFS."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_UNITY_SOURCE_POST_UNDEFS"
+		BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file after the inclusion of each source file."
+		FULL_DOCS
+			"See target property COTIRE_UNITY_SOURCE_POST_UNDEFS."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES"
+		BRIEF_DOCS "Maximum number of source files to include in a single unity source file."
+		FULL_DOCS
+			"See target property COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_UNITY_LINK_LIBRARIES_INIT"
+		BRIEF_DOCS "Define strategy for setting up the unity target's link libraries."
+		FULL_DOCS
+			"See target property COTIRE_UNITY_LINK_LIBRARIES_INIT."
+	)
+
+	# define cotire target properties
+
+	define_property(
+		TARGET PROPERTY "COTIRE_ENABLE_PRECOMPILED_HEADER" INHERITED
+		BRIEF_DOCS "Modify this target's build command to make use of the generated precompiled header."
+		FULL_DOCS
+			"If this property is set to TRUE, cotire will modify the build command to make use of the generated precompiled header."
+			"Irrespective of the value of this property, cotire will setup custom commands to generate the unity source and prefix header for the target."
+			"For makefile based generators cotire will also set up a custom target to manually invoke the generation of the precompiled header."
+			"The target name will be set to this target's name with the suffix _pch appended."
+			"Inherited from directory."
+			"Defaults to TRUE."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_ADD_UNITY_BUILD" INHERITED
+		BRIEF_DOCS "Add a new target that performs a unity build for this target."
+		FULL_DOCS
+			"If this property is set to TRUE, cotire creates a new target of the same type that uses the generated unity source file instead of the target sources."
+			"Most of the relevant target properties will be copied from this target to the new unity build target."
+			"Target dependencies and linked libraries have to be manually set up for the new unity build target."
+			"The unity target name will be set to this target's name with the suffix _unity appended."
+			"Inherited from directory."
+			"Defaults to TRUE."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_ADD_CLEAN" INHERITED
+		BRIEF_DOCS "Add a new target that cleans all cotire generated files for this target."
+		FULL_DOCS
+			"If this property is set to TRUE, cotire creates a new target that clean all files (unity source, prefix header, precompiled header)."
+			"The clean target name will be set to this target's name with the suffix _clean_cotire appended."
+			"Inherited from directory."
+			"Defaults to FALSE."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_PREFIX_HEADER_IGNORE_PATH" INHERITED
+		BRIEF_DOCS "Ignore headers from these directories when generating the prefix header."
+		FULL_DOCS
+			"The property can be set to a list of directories."
+			"If a header file is found in one of these directories or sub-directories, it will be excluded from the generated prefix header."
+			"Inherited from directory."
+			"If not set, this property is initialized to \${CMAKE_SOURCE_DIR};\${CMAKE_BINARY_DIR}."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_PREFIX_HEADER_INCLUDE_PATH" INHERITED
+		BRIEF_DOCS "Honor headers from these directories when generating the prefix header."
+		FULL_DOCS
+			"The property can be set to a list of directories."
+			"If a header file is found in one of these directories or sub-directories, it will be included in the generated prefix header."
+			"If a header file is both selected by COTIRE_PREFIX_HEADER_IGNORE_PATH and COTIRE_PREFIX_HEADER_INCLUDE_PATH,"
+			"the option which yields the closer relative path match wins."
+			"Inherited from directory."
+			"If not set, this property is initialized to the empty list."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH" INHERITED
+		BRIEF_DOCS "Header paths matching one of these directories are put at the top of prefix header."
+		FULL_DOCS
+			"The property can be set to a list of directories."
+			"Header file paths matching one of these directories will be inserted at the beginning of the generated prefix header."
+			"Header files are sorted according to the order of the directories in the property."
+			"If not set, this property is initialized to the empty list."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_UNITY_SOURCE_PRE_UNDEFS" INHERITED
+		BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file before the inclusion of each target source file."
+		FULL_DOCS
+			"This may be set to a semicolon-separated list of preprocessor symbols."
+			"cotire will add corresponding #undef directives to the generated unit source file before each target source file."
+			"Inherited from directory."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_UNITY_SOURCE_POST_UNDEFS" INHERITED
+		BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file after the inclusion of each target source file."
+		FULL_DOCS
+			"This may be set to a semicolon-separated list of preprocessor symbols."
+			"cotire will add corresponding #undef directives to the generated unit source file after each target source file."
+			"Inherited from directory."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES" INHERITED
+		BRIEF_DOCS "Maximum number of source files to include in a single unity source file."
+		FULL_DOCS
+			"This may be set to an integer > 0."
+			"If a target contains more than that number of source files, cotire will create multiple unity build files for it."
+			"If not set, cotire will only create a single unity source file."
+			"Inherited from directory."
+			"Defaults to empty."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_<LANG>_UNITY_SOURCE_INIT"
+		BRIEF_DOCS "User provided unity source file to be used instead of the automatically generated one."
+		FULL_DOCS
+			"If set, cotire will only add the given file(s) to the generated unity source file."
+			"If not set, cotire will add all the target source files to the generated unity source file."
+			"The property can be set to a user provided unity source file."
+			"Defaults to empty."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_<LANG>_PREFIX_HEADER_INIT"
+		BRIEF_DOCS "User provided prefix header file to be used instead of the automatically generated one."
+		FULL_DOCS
+			"If set, cotire will add the given header file(s) to the generated prefix header file."
+			"If not set, cotire will generate a prefix header by tracking the header files included by the unity source file."
+			"The property can be set to a user provided prefix header file (e.g., stdafx.h)."
+			"Defaults to empty."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_UNITY_LINK_LIBRARIES_INIT" INHERITED
+		BRIEF_DOCS "Define strategy for setting up unity target's link libraries."
+		FULL_DOCS
+			"If this property is empty or set to NONE, the generated unity target's link libraries have to be set up manually."
+			"If this property is set to COPY, the unity target's link libraries will be copied from this target."
+			"If this property is set to COPY_UNITY, the unity target's link libraries will be copied from this target with considering existing unity targets."
+			"Inherited from directory."
+			"Defaults to empty."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_<LANG>_UNITY_SOURCE"
+		BRIEF_DOCS "Read-only property. The generated <LANG> unity source file(s)."
+		FULL_DOCS
+			"cotire sets this property to the path of the generated <LANG> single computation unit source file for the target."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_<LANG>_PREFIX_HEADER"
+		BRIEF_DOCS "Read-only property. The generated <LANG> prefix header file."
+		FULL_DOCS
+			"cotire sets this property to the full path of the generated <LANG> language prefix header for the target."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_<LANG>_PRECOMPILED_HEADER"
+		BRIEF_DOCS "Read-only property. The generated <LANG> precompiled header file."
+		FULL_DOCS
+			"cotire sets this property to the full path of the generated <LANG> language precompiled header binary for the target."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_UNITY_TARGET_NAME"
+		BRIEF_DOCS "The name of the generated unity build target corresponding to this target."
+		FULL_DOCS
+			"This property can be set to the desired name of the unity target that will be created by cotire."
+			"If not set, the unity target name will be set to this target's name with the suffix _unity appended."
+			"After this target has been processed by cotire, the property is set to the actual name of the generated unity target."
+			"Defaults to empty string."
+	)
+
+	# define cotire source properties
+
+	define_property(
+		SOURCE PROPERTY "COTIRE_EXCLUDED"
+		BRIEF_DOCS "Do not modify source file's build command."
+		FULL_DOCS
+			"If this property is set to TRUE, the source file's build command will not be modified to make use of the precompiled header."
+			"The source file will also be excluded from the generated unity source file."
+			"Source files that have their COMPILE_FLAGS property set will be excluded by default."
+			"Defaults to FALSE."
+	)
+
+	define_property(
+		SOURCE PROPERTY "COTIRE_DEPENDENCY"
+		BRIEF_DOCS "Add this source file to dependencies of the automatically generated prefix header file."
+		FULL_DOCS
+			"If this property is set to TRUE, the source file is added to dependencies of the generated prefix header file."
+			"If the file is modified, cotire will re-generate the prefix header source upon build."
+			"Defaults to FALSE."
+	)
+
+	define_property(
+		SOURCE PROPERTY "COTIRE_UNITY_SOURCE_PRE_UNDEFS"
+		BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file before the inclusion of this source file."
+		FULL_DOCS
+			"This may be set to a semicolon-separated list of preprocessor symbols."
+			"cotire will add corresponding #undef directives to the generated unit source file before this file is included."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		SOURCE PROPERTY "COTIRE_UNITY_SOURCE_POST_UNDEFS"
+		BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file after the inclusion of this source file."
+		FULL_DOCS
+			"This may be set to a semicolon-separated list of preprocessor symbols."
+			"cotire will add corresponding #undef directives to the generated unit source file after this file is included."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		SOURCE PROPERTY "COTIRE_START_NEW_UNITY_SOURCE"
+		BRIEF_DOCS "Start a new unity source file which includes this source file as the first one."
+		FULL_DOCS
+			"If this property is set to TRUE, cotire will complete the current unity file and start a new one."
+			"The new unity source file will include this source file as the first one."
+			"This property essentially works as a separator for unity source files."
+			"Defaults to FALSE."
+	)
+
+	define_property(
+		SOURCE PROPERTY "COTIRE_TARGET"
+		BRIEF_DOCS "Read-only property. Mark this source file as cotired for the given target."
+		FULL_DOCS
+			"cotire sets this property to the name of target, that the source file's build command has been altered for."
+			"Defaults to empty string."
+	)
+
+	message (STATUS "cotire ${COTIRE_CMAKE_MODULE_VERSION} loaded.")
+
+endif()
diff --git a/buildfiles/msvc/ci_only.targets b/buildfiles/msvc/ci_only.targets
deleted file mode 100644
index 0275047c3a..0000000000
--- a/buildfiles/msvc/ci_only.targets
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-</Project>
\ No newline at end of file
diff --git a/buildfiles/msvc/common_default.props b/buildfiles/msvc/common_default.props
index 04f6502839..957bd5ba13 100644
--- a/buildfiles/msvc/common_default.props
+++ b/buildfiles/msvc/common_default.props
@@ -18,7 +18,7 @@
       <ExceptionHandling>false</ExceptionHandling>
       <AdditionalOptions>-d2FH4- %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary Condition = "$(Configuration.Contains('Release'))">MultiThreaded</RuntimeLibrary>
-      <RuntimeLibrary Condition = "$(Configuration.Contains('Debug'))">MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary Condition = "$(Configuration.Contains('Debug'))">MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <AdditionalOptions>-d2:-FH4- %(AdditionalOptions)</AdditionalOptions>
diff --git a/buildfiles/msvc/common_default_clang_cl.props b/buildfiles/msvc/common_default_clang_cl.props
index c955b638cc..8a64d1bdf9 100644
--- a/buildfiles/msvc/common_default_clang_cl.props
+++ b/buildfiles/msvc/common_default_clang_cl.props
@@ -17,7 +17,7 @@
       <ExceptionHandling>false</ExceptionHandling>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary Condition = "$(Configuration.Contains('Release'))">MultiThreaded</RuntimeLibrary>
-      <RuntimeLibrary Condition = "$(Configuration.Contains('Debug'))">MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary Condition = "$(Configuration.Contains('Debug'))">MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
diff --git a/buildfiles/msvc/common_default_macros.props b/buildfiles/msvc/common_default_macros.props
index 9a5a0f6ba7..5939a53568 100644
--- a/buildfiles/msvc/common_default_macros.props
+++ b/buildfiles/msvc/common_default_macros.props
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?> 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <!-- Common default props for defining properties with macros. Import right after Microsoft.Cpp.Default.props -->
   <ImportGroup Label="PropertySheets" />
@@ -8,4 +8,4 @@
   </PropertyGroup>
   <ItemDefinitionGroup />
   <ItemGroup />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/buildfiles/msvc/rpcs3_debug.props b/buildfiles/msvc/rpcs3_debug.props
index 877dcc77f8..a75bc968ad 100644
--- a/buildfiles/msvc/rpcs3_debug.props
+++ b/buildfiles/msvc/rpcs3_debug.props
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?> 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
@@ -10,13 +10,59 @@
     <ClCompile>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PreprocessorDefinitions>LLVM_AVAILABLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Debug'">%(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
+      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Debug'">%(AdditionalLibraryDirectories);..\llvm_build\Debug\lib</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);
+                LLVMProfileData.lib;
+                LLVMDebugInfoCodeView.lib;
+                LLVMDebugInfoMSF.lib;
+                LLVMInstrumentation.lib;
+                LLVMMCJIT.lib;
+                LLVMRuntimeDyld.lib;
+                LLVMVectorize.lib;
+                LLVMX86CodeGen.lib;
+                LLVMGlobalISel.lib;
+                LLVMX86Disassembler.lib;
+                LLVMExecutionEngine.lib;
+                LLVMAsmPrinter.lib;
+                LLVMSelectionDAG.lib;
+                LLVMCodeGen.lib;
+                LLVMScalarOpts.lib;
+                LLVMInstCombine.lib;
+                LLVMTransformUtils.lib;
+                LLVMAnalysis.lib;
+                LLVMTarget.lib;
+                LLVMX86Desc.lib;
+                LLVMObject.lib;
+                LLVMMCParser.lib;
+                LLVMBitReader.lib;
+                LLVMCore.lib;
+                LLVMMC.lib;
+                LLVMX86Info.lib;
+                LLVMSupport.lib;
+                LLVMMCDisassembler.lib;
+                LLVMipo.lib;
+                LLVMBinaryFormat.lib;
+                LLVMPasses.lib;
+                LLVMIRReader.lib;
+                LLVMLinker.lib;
+                LLVMAsmParser.lib;
+                LLVMX86AsmParser.lib;
+                LLVMDemangle.lib;
+                LLVMDebugInfoDWARF.lib;
+                LLVMRemarks.lib;
+                LLVMBitstreamReader.lib;
+                LLVMTextAPI.lib;
+                LLVMCFGuard.lib;
+                LLVMAggressiveInstCombine.lib;
+                LLVMBitWriter.lib;
+                LLVMCoroutines.lib;
+                LLVMObjCARCOpts.lib;
+      </AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/buildfiles/msvc/rpcs3_default.props b/buildfiles/msvc/rpcs3_default.props
index d8df69d503..b3ac8aae1c 100644
--- a/buildfiles/msvc/rpcs3_default.props
+++ b/buildfiles/msvc/rpcs3_default.props
@@ -3,19 +3,17 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <IncludePath>.\;..\;$(SolutionDir)3rdparty\asmjit\asmjit\src;$(SolutionDir)3rdparty\yaml-cpp\yaml-cpp\include;$(SolutionDir)3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)3rdparty\libpng\libpng;$(SolutionDir)3rdparty\GL;$(SolutionDir)3rdparty\stblib\stb;$(SolutionDir)3rdparty\openal\openal-soft\include\AL;$(SolutionDir)3rdparty\pugixml\src;$(SolutionDir)3rdparty\hidapi\hidapi</IncludePath>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <LibraryPath>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-    <GTestPath>$(SolutionDir)packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets</GTestPath>
-    <GTestInstalled Condition="Exists('$(GTestPath)')">true</GTestInstalled>
+    <IncludePath>.\;..\;..\3rdparty\asmjit\asmjit\src;..\..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\libpng\libpng;..\3rdparty\GL;..\3rdparty\stblib\include;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\hidapi\hidapi;..\3rdparty\Optional;..\3rdparty\xxhash</IncludePath>
+    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
+    <LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Lib>
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
     </Lib>
     <ClCompile>
-      <PreprocessorDefinitions>NOMINMAX;PUGIXML_HEADER_ONLY;YAML_CPP_STATIC_DEFINE;_ENABLE_EXTENDED_ALIGNED_STORAGE;_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;PUGIXML_HEADER_ONLY;_ENABLE_EXTENDED_ALIGNED_STORAGE;_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>false</SDLCheck>
@@ -25,114 +23,8 @@
       <AdditionalOptions>/utf-8 /Zc:throwingNew- /constexpr:steps16777216 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>
-        ws2_32.lib;
-        Iphlpapi.lib;
-        Bcrypt.lib;
-        avcodec.lib;
-        avformat.lib;
-        avutil.lib;
-        swresample.lib;
-        swscale.lib;
-        LLVMAggressiveInstCombine.lib;
-        LLVMAnalysis.lib;
-        LLVMAsmParser.lib;
-        LLVMAsmPrinter.lib;
-        LLVMBinaryFormat.lib;
-        LLVMBitReader.lib;
-        LLVMBitstreamReader.lib;
-        LLVMBitWriter.lib;
-        LLVMCFGuard.lib;
-        LLVMCodeGen.lib;
-        LLVMCodeGenData.lib;
-        LLVMCodeGenTypes.lib;
-        LLVMCore.lib;
-        LLVMCoroutines.lib;
-        LLVMCoverage.lib;
-        LLVMDebugInfoBTF.lib;
-        LLVMDebugInfoCodeView.lib;
-        LLVMDebuginfod.lib;
-        LLVMDebugInfoDWARF.lib;
-        LLVMDebugInfoGSYM.lib;
-        LLVMDebugInfoLogicalView.lib;
-        LLVMDebugInfoMSF.lib;
-        LLVMDebugInfoPDB.lib;
-        LLVMDemangle.lib;
-        LLVMDlltoolDriver.lib;
-        LLVMDWARFLinker.lib;
-        LLVMDWARFLinkerClassic.lib;
-        LLVMDWARFLinkerParallel.lib;
-        LLVMDWP.lib;
-        LLVMExecutionEngine.lib;
-        LLVMExtensions.lib;
-        LLVMFileCheck.lib;
-        LLVMFrontendDriver.lib;
-        LLVMFrontendHLSL.lib;
-        LLVMFrontendOffloading.lib;
-        LLVMFrontendOpenACC.lib;
-        LLVMFrontendOpenMP.lib;
-        LLVMFuzzerCLI.lib;
-        LLVMFuzzMutate.lib;
-        LLVMGlobalISel.lib;
-        LLVMHipStdPar.lib;
-        LLVMInstCombine.lib;
-        LLVMInstrumentation.lib;
-        LLVMIntelJITEvents.lib;
-        LLVMIntelJITProfiling.lib;
-        LLVMInterfaceStub.lib;
-        LLVMInterpreter.lib;
-        LLVMipo.lib;
-        LLVMIRPrinter.lib;
-        LLVMIRReader.lib;
-        LLVMJITLink.lib;
-        LLVMLibDriver.lib;
-        LLVMLineEditor.lib;
-        LLVMLinker.lib;
-        LLVMLTO.lib;
-        LLVMMC.lib;
-        LLVMMCA.lib;
-        LLVMMCDisassembler.lib;
-        LLVMMCJIT.lib;
-        LLVMMCParser.lib;
-        LLVMMIRParser.lib;
-        LLVMObjCARCOpts.lib;
-        LLVMObjCopy.lib;
-        LLVMObject.lib;
-        LLVMObjectYAML.lib;
-        LLVMOption.lib;
-        LLVMOrcDebugging.lib;
-        LLVMOrcJIT.lib;
-        LLVMOrcShared.lib;
-        LLVMOrcTargetProcess.lib;
-        LLVMPasses.lib;
-        LLVMProfileData.lib;
-        LLVMRemarks.lib;
-        LLVMRuntimeDyld.lib;
-        LLVMSandboxIR.lib;
-        LLVMScalarOpts.lib;
-        LLVMSelectionDAG.lib;
-        LLVMSupport.lib;
-        LLVMSymbolize.lib;
-        LLVMTableGen.lib;
-        LLVMTableGenBasic.lib;
-        LLVMTableGenCommon.lib;
-        LLVMTarget.lib;
-        LLVMTargetParser.lib;
-        LLVMTextAPI.lib;
-        LLVMTextAPIBinaryReader.lib;
-        LLVMTransformUtils.lib;
-        LLVMVectorize.lib;
-        LLVMWindowsDriver.lib;
-        LLVMWindowsManifest.lib;
-        LLVMX86AsmParser.lib;
-        LLVMX86CodeGen.lib;
-        LLVMX86Desc.lib;
-        LLVMX86Disassembler.lib;
-        LLVMX86Info.lib;
-        LLVMX86TargetMCA.lib;
-        LLVMXRay.lib;
-      </AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\ffmpeg\lib\windows\x86_64</AdditionalLibraryDirectories>
+      <AdditionalDependencies>xxhash.lib;ws2_32.lib;Iphlpapi.lib;Bcrypt.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\3rdparty\ffmpeg\windows\x86_64</AdditionalLibraryDirectories>
       <StackReserveSize>8388608</StackReserveSize>
       <StackCommitSize>1048576</StackCommitSize>
     </Link>
diff --git a/buildfiles/msvc/rpcs3_release.props b/buildfiles/msvc/rpcs3_release.props
index 378ba797d6..d2526fefdf 100644
--- a/buildfiles/msvc/rpcs3_release.props
+++ b/buildfiles/msvc/rpcs3_release.props
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?> 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
@@ -15,9 +15,55 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Release'">%(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
+      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Release'">%(AdditionalLibraryDirectories);..\llvm_build\Release\lib</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);
+                LLVMProfileData.lib;
+                LLVMDebugInfoCodeView.lib;
+                LLVMDebugInfoMSF.lib;
+                LLVMInstrumentation.lib;
+                LLVMMCJIT.lib;
+                LLVMRuntimeDyld.lib;
+                LLVMVectorize.lib;
+                LLVMX86CodeGen.lib;
+                LLVMGlobalISel.lib;
+                LLVMX86Disassembler.lib;
+                LLVMExecutionEngine.lib;
+                LLVMAsmPrinter.lib;
+                LLVMSelectionDAG.lib;
+                LLVMCodeGen.lib;
+                LLVMScalarOpts.lib;
+                LLVMInstCombine.lib;
+                LLVMTransformUtils.lib;
+                LLVMAnalysis.lib;
+                LLVMTarget.lib;
+                LLVMX86Desc.lib;
+                LLVMObject.lib;
+                LLVMMCParser.lib;
+                LLVMBitReader.lib;
+                LLVMCore.lib;
+                LLVMMC.lib;
+                LLVMX86Info.lib;
+                LLVMSupport.lib;
+                LLVMMCDisassembler.lib;
+                LLVMipo.lib;
+                LLVMBinaryFormat.lib;
+                LLVMPasses.lib;
+                LLVMIRReader.lib;
+                LLVMLinker.lib;
+                LLVMAsmParser.lib;
+                LLVMX86AsmParser.lib;
+                LLVMDemangle.lib;
+                LLVMDebugInfoDWARF.lib;
+                LLVMRemarks.lib;
+                LLVMBitstreamReader.lib;
+                LLVMTextAPI.lib;
+                LLVMCFGuard.lib;
+                LLVMAggressiveInstCombine.lib;
+                LLVMBitWriter.lib;
+                LLVMCoroutines.lib;
+                LLVMObjCARCOpts.lib;
+      </AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/darwin/util/sysinfo_darwin.mm b/darwin/util/sysinfo_darwin.mm
deleted file mode 100644
index 0be5eec7f0..0000000000
--- a/darwin/util/sysinfo_darwin.mm
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
-#import <Foundation/Foundation.h>
-#pragma GCC diagnostic pop
-
-namespace Darwin_Version
-{
-    NSOperatingSystemVersion osver = NSProcessInfo.processInfo.operatingSystemVersion;
-
-    int getNSmajorVersion()
-    {
-        return osver.majorVersion;
-    }
-
-    int getNSminorVersion()
-    {
-        return osver.minorVersion;
-    }
-
-    int getNSpatchVersion()
-    {
-        return osver.patchVersion;
-    }
-}
-
-namespace Darwin_ProcessInfo
-{
-	bool getLowPowerModeEnabled()
-	{
-		return NSProcessInfo.processInfo.isLowPowerModeEnabled;
-	}
-}
diff --git a/llvm b/llvm
new file mode 160000
index 0000000000..5836324d64
--- /dev/null
+++ b/llvm
@@ -0,0 +1 @@
+Subproject commit 5836324d6443a62ed09b84c125029e98324978c3
diff --git a/3rdparty/llvm/llvm_build.vcxproj b/llvm_build/llvm_build.vcxproj
similarity index 52%
rename from 3rdparty/llvm/llvm_build.vcxproj
rename to llvm_build/llvm_build.vcxproj
index 160ec50222..37dcbf9aaa 100644
--- a/3rdparty/llvm/llvm_build.vcxproj
+++ b/llvm_build/llvm_build.vcxproj
@@ -14,9 +14,9 @@
     <ProjectGuid>{8BC303AB-25BE-4276-8E57-73F171B2D672}</ProjectGuid>
     <Keyword>MakeFileProj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
+  <Import Project="..\buildfiles\msvc\common_default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
+  <Import Project="..\buildfiles\msvc\common_default_macros.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -39,17 +39,10 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
-      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_BUILD_DOCS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_BUILD_TESTS=OFF\ -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INSTALL_UTILS=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DLLVM_ENABLE_PDB=OFF -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
-    </CmakeReleaseCLI>
+      cmake -G Ninja -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT ../llvm</CmakeReleaseCLI>
     <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
-      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_BUILD_DOCS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_BUILD_TESTS=OFF\ -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INSTALL_UTILS=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DLLVM_ENABLE_PDB=OFF -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
-    </CmakeDebugCLI>
-    <CmakeCleanCLI>
-      echo Cleaning..
-      rmdir /s /q "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build"
-      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
+      cmake -G Ninja -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="./Debug" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT ../llvm</CmakeDebugCLI>
+    <CmakeCleanCLI>echo Cleaning..
       for /F "delims= eol=|" %%f in ('
       dir /b ^| findstr /V "[^.]*\build[^.]*\.vcxproj"') do (
       echo Deleting .\%%f
@@ -64,15 +57,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <NMakePreprocessorDefinitions>
     </NMakePreprocessorDefinitions>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-    <NMakeBuildCommandLine>
-      $(CmakeDebugCLI)
+    <NMakeBuildCommandLine>$(CmakeDebugCLI)
       ninja
       ninja install
     </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>
-      $(CmakeCleanCLI)
+    <NMakeReBuildCommandLine>del CMakeCache.txt
       $(CmakeDebugCLI)
       ninja
       ninja install
@@ -82,17 +71,12 @@
     </NMakeCleanCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-    <NMakeBuildCommandLine>
-      $(CmakeReleaseCLI)
+    <NMakePreprocessorDefinitions />
+    <NMakeBuildCommandLine>$(CmakeReleaseCLI)
       ninja
       ninja install
     </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>
-      $(CmakeCleanCLI)
+    <NMakeReBuildCommandLine>del CMakeCache.txt
       $(CmakeReleaseCLI)
       ninja
       ninja install
diff --git a/3rdparty/llvm/llvm_build.vcxproj.filters b/llvm_build/llvm_build.vcxproj.filters
similarity index 100%
rename from 3rdparty/llvm/llvm_build.vcxproj.filters
rename to llvm_build/llvm_build.vcxproj.filters
diff --git a/3rdparty/llvm/llvm_build_clang_cl.vcxproj b/llvm_build/llvm_build_clang_cl.vcxproj
similarity index 53%
rename from 3rdparty/llvm/llvm_build_clang_cl.vcxproj
rename to llvm_build/llvm_build_clang_cl.vcxproj
index c0ccb204c6..a0f24875d2 100644
--- a/3rdparty/llvm/llvm_build_clang_cl.vcxproj
+++ b/llvm_build/llvm_build_clang_cl.vcxproj
@@ -14,9 +14,9 @@
     <ProjectGuid>{A37E4273-85DB-4217-B775-CE971B87D9DF}</ProjectGuid>
     <Keyword>MakeFileProj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_clang_cl.props" />
+  <Import Project="..\buildfiles\msvc\common_default_clang_cl.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
+  <Import Project="..\buildfiles\msvc\common_default_macros.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -39,17 +39,10 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
-      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_BUILD_DOCS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_BUILD_TESTS=OFF\ -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INSTALL_UTILS=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DLLVM_ENABLE_PDB=OFF -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
-    </CmakeReleaseCLI>
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DCMAKE_INSTALL_PREFIX="./Release" -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT ../llvm</CmakeReleaseCLI>
     <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
-      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_BUILD_DOCS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_BUILD_TESTS=OFF\ -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INSTALL_UTILS=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DLLVM_ENABLE_PDB=OFF -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
-    </CmakeDebugCLI>
-    <CmakeCleanCLI>
-      echo Cleaning..
-      rmdir /s /q "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build"
-      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DCMAKE_INSTALL_PREFIX="./Debug" -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT ../llvm</CmakeDebugCLI>
+    <CmakeCleanCLI>echo Cleaning..
       for /F "delims= eol=|" %%f in ('
       dir /b ^| findstr /V "[^.]*\build[^.]*\.vcxproj"') do (
       echo Deleting .\%%f
@@ -64,15 +57,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <NMakePreprocessorDefinitions>
     </NMakePreprocessorDefinitions>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-    <NMakeBuildCommandLine>
-      $(CmakeDebugCLI)
+    <NMakeBuildCommandLine>$(CmakeDebugCLI)
       ninja
       ninja install
     </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>
-      $(CmakeCleanCLI)
+    <NMakeReBuildCommandLine>del CMakeCache.txt
       $(CmakeDebugCLI)
       ninja
       ninja install
@@ -82,17 +71,12 @@
     </NMakeCleanCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-    <NMakeBuildCommandLine>
-      $(CmakeReleaseCLI)
+    <NMakePreprocessorDefinitions />
+    <NMakeBuildCommandLine>$(CmakeReleaseCLI)
       ninja
       ninja install
     </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>
-      $(CmakeCleanCLI)
+    <NMakeReBuildCommandLine>del CMakeCache.txt
       $(CmakeReleaseCLI)
       ninja
       ninja install
diff --git a/3rdparty/llvm/llvm_build_clang_cl.vcxproj.filters b/llvm_build/llvm_build_clang_cl.vcxproj.filters
similarity index 100%
rename from 3rdparty/llvm/llvm_build_clang_cl.vcxproj.filters
rename to llvm_build/llvm_build_clang_cl.vcxproj.filters
diff --git a/objdump.cpp b/objdump.cpp
deleted file mode 100644
index 76caef1c9b..0000000000
--- a/objdump.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-// objdump injection utility for Linux perf tools.
-// Profiling JIT generated code is always problematic.
-// On Linux, perf annotation tools do not automatically
-// disassemble runtime-generated code.
-// However, it's possible to override objdump utility
-// which is used to disassemeble executables.
-// This tool intercepts objdump commands, and if they
-// correspond to JIT generated objects in RPCS3,
-// it should be able to correctly disassemble them.
-// Usage:
-// 1. Make sure ~/.cache/rpcs3/ASMJIT directory exists.
-// 2. Build this utility, for example:
-//    g++-11 objdump.cpp -o objdump
-// 3. Run perf, for example:
-//    perf record -b -p `pgrep rpcs3`
-// 4. Specify --objdump override, for example:
-//    perf report --objdump=./objdump --gtk
-
-#include <cstring>
-#include <cstdio>
-#include <cstdint>
-#include <unistd.h>
-#include <sys/file.h>
-#include <sys/mman.h>
-#include <string>
-#include <vector>
-#include <charconv>
-
-std::string to_hex(std::uint64_t value, bool prfx = true)
-{
-	char buf[20]{}, *ptr = buf + 19;
-	do *--ptr = "0123456789abcdef"[value % 16], value /= 16; while (value);
-	if (!prfx) return ptr;
-	*--ptr = 'x';
-	*--ptr = '0';
-	return ptr;
-}
-
-int main(int argc, char* argv[])
-{
-	std::string home;
-
-	if (const char* d = ::getenv("XDG_CACHE_HOME"))
-		home = d;
-	else if (const char* d = ::getenv("XDG_CONFIG_HOME"))
-		home = d;
-	else if (const char* d = ::getenv("HOME"))
-		home = d, home += "/.cache";
-
-	// Get cache path
-	home += "/rpcs3/ASMJIT/";
-
-	// Get objects
-	int fd = open((home + ".objects").c_str(), O_RDONLY);
-
-	if (fd < 0)
-		return 1;
-
-	// Map 4GiB (full size)
-	const auto data = mmap(nullptr, 0x10000'0000, PROT_READ, MAP_SHARED, fd, 0);
-
-	struct entry
-	{
-		std::uint64_t addr;
-		std::uint32_t size;
-		std::uint32_t off;
-	};
-
-	// Index part (precedes actual data)
-	const auto index = static_cast<const entry*>(data);
-
-	const entry* found = nullptr;
-
-	std::string out_file;
-
-	std::vector<std::string> args;
-
-	for (int i = 0; i < argc; i++)
-	{
-		// Replace args
-		std::string arg = argv[i];
-
-		if (std::uintptr_t(data) != -1 && arg.find("--start-address=0x") == 0)
-		{
-			// Decode address and try to find the object
-			std::uint64_t addr = -1;
-
-			std::from_chars(arg.data() + strlen("--start-address=0x"), arg.data() + arg.size(), addr, 16);
-
-			for (int j = 0; j < 0x100'0000; j++)
-			{
-				if (index[j].addr == 0)
-				{
-					break;
-				}
-
-				if (index[j].addr == addr)
-				{
-					found = index + j;
-					break;
-				}
-			}
-
-			if (found)
-			{
-				// Extract object into a new file (read file name from the mapped memory)
-				const char* name = static_cast<char*>(data) + found->off + found->size;
-
-				if (name[0])
-				{
-					out_file = home + name;
-				}
-				else
-				{
-					out_file = "/tmp/rpcs3.objdump." + std::to_string(getpid());
-					unlink(out_file.c_str());
-				}
-
-				const int fd2 = open(out_file.c_str(), O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-
-				if (fd2 > 0)
-				{
-					// Don't overwrite if exists
-					write(fd2, static_cast<char*>(data) + found->off, found->size);
-					close(fd2);
-				}
-
-				args.emplace_back("--adjust-vma=" + to_hex(addr));
-				continue;
-			}
-		}
-
-		if (found && arg.find("--stop-address=0x") == 0)
-		{
-			continue;
-		}
-
-		if (found && arg == "-d")
-		{
-			arg = "-D";
-		}
-
-		if (arg == "-l")
-		{
-			arg = "-Mintel,x86-64";
-		}
-
-		args.emplace_back(std::move(arg));
-	}
-
-	if (found)
-	{
-		args.pop_back();
-		args.emplace_back("-b");
-		args.emplace_back("binary");
-		args.emplace_back("-m");
-		args.emplace_back("i386:x86-64");
-		args.emplace_back(std::move(out_file));
-	}
-
-	args[0] = "/usr/bin/objdump";
-
-	std::vector<char*> new_argv;
-
-	for (auto& arg : args)
-	{
-		new_argv.push_back(arg.data());
-	}
-
-	new_argv.push_back(nullptr);
-
-	if (found)
-	{
-		int fds[2];
-		pipe(fds);
-
-		if (fork() > 0)
-		{
-			close(fds[1]);
-			char c = 0;
-			std::string buf;
-
-			while (read(fds[0], &c, 1) != 0)
-			{
-				if (c)
-				{
-					buf += c;
-
-					if (c == '\n')
-					{
-						write(STDOUT_FILENO, buf.data(), buf.size());
-						buf.clear();
-					}
-				}
-
-				c = 0;
-			}
-
-			return 0;
-		}
-		else
-		{
-			while ((dup2(fds[1], STDOUT_FILENO) == -1) && (errno == EINTR)) {}
-			close(fds[1]);
-			close(fds[0]);
-			// Fallthrough
-		}
-	}
-
-	return execv(new_argv[0], new_argv.data());
-}
diff --git a/rpcs3.sln b/rpcs3.sln
index acc5528038..dd6f05c4de 100644
--- a/rpcs3.sln
+++ b/rpcs3.sln
@@ -1,18 +1,15 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32929.385
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29306.81
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "3rdparty\asmjit\asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emucore", "rpcs3\emucore.vcxproj", "{C4A10229-4712-4BD2-B63E-50D93C67A038}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2C902C67-985C-4BE0-94A3-E0FE2EB929A3} = {2C902C67-985C-4BE0-94A3-E0FE2EB929A3}
-		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF} = {3C67A2FF-4710-402A-BE3E-31B0CB0576DF}
-		{5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0} = {5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0}
-		{8846A9AA-5539-4C91-8301-F54260E1A07A} = {8846A9AA-5539-4C91-8301-F54260E1A07A}
+		{939FE206-1182-ABC3-1234-FEAB88E98404} = {939FE206-1182-ABC3-1234-FEAB88E98404}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build", "3rdparty\llvm\llvm_build.vcxproj", "{8BC303AB-25BE-4276-8E57-73F171B2D672}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build", "llvm_build\llvm_build.vcxproj", "{8BC303AB-25BE-4276-8E57-73F171B2D672}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLGSRender", "rpcs3\GLGSRender.vcxproj", "{3384223A-6D97-4799-9862-359F85312892}"
 EndProject
@@ -20,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "rpcs3.emu", "rpcs3.emu", "{
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XAudio", "rpcs3\XAudio.vcxproj", "{78CB2F39-B809-4A06-8329-8C0A19119D3D}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenAL", "rpcs3\OpenAL.vcxproj", "{30A05C4D-F5FD-421C-A864-17A64BDEAA75}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pnglibconf", "3rdparty\libpng\pnglibconf.vcxproj", "{EB33566E-DA7F-4D28-9077-88C0B7C77E35}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "3rdparty\libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}"
@@ -43,76 +42,42 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaml-cpp", "3rdparty\yaml-c
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxproj", "{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2C902C67-985C-4BE0-94A3-E0FE2EB929A3} = {2C902C67-985C-4BE0-94A3-E0FE2EB929A3}
-		{3384223A-6D97-4799-9862-359F85312892} = {3384223A-6D97-4799-9862-359F85312892}
-		{349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {349EE8F9-7D25-4909-AAF5-FF3FADE72187}
-		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF} = {3C67A2FF-4710-402A-BE3E-31B0CB0576DF}
-		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D} = {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}
-		{508C291A-3D18-49F5-B25D-F7C8DB92CB21} = {508C291A-3D18-49F5-B25D-F7C8DB92CB21}
-		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C} = {5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}
-		{60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF}
-		{78CB2F39-B809-4A06-8329-8C0A19119D3D} = {78CB2F39-B809-4A06-8329-8C0A19119D3D}
-		{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD} = {81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD}
-		{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA} = {8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}
-		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C} = {8F85B6CC-250F-4ACA-A617-E820A74E3E3C}
-		{9610627D-20FE-4B07-8CE3-9FF68A5F1EC2} = {9610627D-20FE-4B07-8CE3-9FF68A5F1EC2}
-		{A107C21C-418A-4697-BB10-20C3AA60E2E4} = {A107C21C-418A-4697-BB10-20C3AA60E2E4}
 		{AC40FF01-426E-4838-A317-66354CEFAE88} = {AC40FF01-426E-4838-A317-66354CEFAE88}
+		{A107C21C-418A-4697-BB10-20C3AA60E2E4} = {A107C21C-418A-4697-BB10-20C3AA60E2E4}
 		{C4A10229-4712-4BD2-B63E-50D93C67A038} = {C4A10229-4712-4BD2-B63E-50D93C67A038}
+		{78CB2F39-B809-4A06-8329-8C0A19119D3D} = {78CB2F39-B809-4A06-8329-8C0A19119D3D}
+		{3384223A-6D97-4799-9862-359F85312892} = {3384223A-6D97-4799-9862-359F85312892}
+		{30A05C4D-F5FD-421C-A864-17A64BDEAA75} = {30A05C4D-F5FD-421C-A864-17A64BDEAA75}
+		{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}
-		{FDA7B080-03B0-48C8-B24F-88118981422A} = {FDA7B080-03B0-48C8-B24F-88118981422A}
 		{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}
+		{349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {349EE8F9-7D25-4909-AAF5-FF3FADE72187}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidapi", "3rdparty\hidapi\hidapi.vcxproj", "{A107C21C-418A-4697-BB10-20C3AA60E2E4}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xxhash", "3rdparty\xxhash.vcxproj", "{939FE206-1182-ABC3-1234-FEAB88E98404}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "3rdparty\libusb\libusb_static.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wolfssl", "3rdparty\wolfssl\wolfssl.vcxproj", "{73973223-5EE8-41CA-8E88-1D60E89A237B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7zlib", "3rdparty\7z\7zlib.vcxproj", "{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wolfssl", "3rdparty\wolfssl.vcxproj", "{73973223-5EE8-41CA-8E88-1D60E89A237B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "3rdparty\curl\libcurl.vcxproj", "{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{73973223-5EE8-41CA-8E88-1D60E89A237B} = {73973223-5EE8-41CA-8E88-1D60E89A237B}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV", "3rdparty\SPIRV\spirv.vcxproj", "{4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rdParty", "3rdParty", "{6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build_clang_cl", "3rdparty\llvm\llvm_build_clang_cl.vcxproj", "{A37E4273-85DB-4217-B775-CE971B87D9DF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cubeb", "rpcs3\Cubeb.vcxproj", "{9610627D-20FE-4B07-8CE3-9FF68A5F1EC2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcubeb", "3rdparty\cubeb\libcubeb.vcxproj", "{FDA7B080-03B0-48C8-B24F-88118981422A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soundtouch", "3rdparty\SoundTouch\soundtouch.vcxproj", "{508C291A-3D18-49F5-B25D-F7C8DB92CB21}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "discord-rpc", "3rdparty\discord-rpc\discord-rpc.vcxproj", "{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "3rdparty\libsdl-org\SDL.vcxproj", "{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pine", "pine", "{A55DA1B5-CC17-4525-BE7F-1659CE17BB56}"
-	ProjectSection(SolutionItems) = preProject
-		3rdparty\pine\pine_server.h = 3rdparty\pine\pine_server.h
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniupnpc_static", "3rdparty\miniupnp\miniupnpc_static.vcxproj", "{5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtmidi", "3rdparty\rtmidi\rtmidi.vcxproj", "{2C902C67-985C-4BE0-94A3-E0FE2EB929A3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "3rdparty\zstd\zstd.vcxproj", "{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7zip", "3rdparty\7zip\7zip.vcxproj", "{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal-soft", "3rdparty\openal\openal-soft.vcxproj", "{8846A9AA-5539-4C91-8301-F54260E1A07A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fusion", "3rdparty\fusion\fusion.vcxproj", "{3C67A2FF-4710-402A-BE3E-31B0CB0576DF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "rpcs3.test", "rpcs3.test", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3_test", "rpcs3\tests\rpcs3_test.vcxproj", "{D1CBF84E-07F8-4ACB-9CD2-BD205FDEEE1E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12} = {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build_clang_cl", "llvm_build\llvm_build_clang_cl.vcxproj", "{A37E4273-85DB-4217-B775-CE971B87D9DF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -138,22 +103,24 @@ Global
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D}.Debug|x64.Build.0 = Debug|x64
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D}.Release|x64.ActiveCfg = Release|x64
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D}.Release|x64.Build.0 = Release|x64
+		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Debug|x64.ActiveCfg = Debug|x64
+		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Debug|x64.Build.0 = Debug|x64
+		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Release|x64.ActiveCfg = Release|x64
+		{30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Release|x64.Build.0 = Release|x64
 		{EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|x64.ActiveCfg = Release|x64
 		{EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|x64.Build.0 = Release|x64
 		{EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|x64.ActiveCfg = Release|x64
 		{EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|x64.Build.0 = Release|x64
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.ActiveCfg = Debug|x64
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.Build.0 = Debug|x64
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.ActiveCfg = Release|x64
-		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.Build.0 = Release|x64
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.ActiveCfg = Debug Library|x64
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.Build.0 = Debug Library|x64
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.ActiveCfg = Release Library|x64
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.Build.0 = Release Library|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.ActiveCfg = Debug|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.Build.0 = Debug|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.ActiveCfg = Release|x64
 		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.Build.0 = Release|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Debug|x64.ActiveCfg = Debug|x64
-		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Debug|x64.Build.0 = Debug|x64
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Release|x64.ActiveCfg = Release|x64
-		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Release|x64.Build.0 = Release|x64
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug|x64.ActiveCfg = Debug|x64
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug|x64.Build.0 = Debug|x64
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Release|x64.ActiveCfg = Release|x64
@@ -170,10 +137,18 @@ Global
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug|x64.Build.0 = Debug|x64
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release|x64.ActiveCfg = Release|x64
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release|x64.Build.0 = Release|x64
+		{939FE206-1182-ABC3-1234-FEAB88E98404}.Debug|x64.ActiveCfg = Debug|x64
+		{939FE206-1182-ABC3-1234-FEAB88E98404}.Debug|x64.Build.0 = Debug|x64
+		{939FE206-1182-ABC3-1234-FEAB88E98404}.Release|x64.ActiveCfg = Release|x64
+		{939FE206-1182-ABC3-1234-FEAB88E98404}.Release|x64.Build.0 = Release|x64
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64
+		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug|x64.ActiveCfg = Debug|x64
+		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug|x64.Build.0 = Debug|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|x64.ActiveCfg = Debug|x64
 		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.Build.0 = Debug|x64
 		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|x64.ActiveCfg = Release|x64
@@ -182,56 +157,10 @@ Global
 		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug|x64.Build.0 = Debug|x64
 		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release|x64.ActiveCfg = Release|x64
 		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release|x64.Build.0 = Release|x64
+		{4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1}.Debug|x64.ActiveCfg = Debug|x64
+		{4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1}.Release|x64.ActiveCfg = Release|x64
 		{A37E4273-85DB-4217-B775-CE971B87D9DF}.Debug|x64.ActiveCfg = Debug|x64
 		{A37E4273-85DB-4217-B775-CE971B87D9DF}.Release|x64.ActiveCfg = Release|x64
-		{9610627D-20FE-4B07-8CE3-9FF68A5F1EC2}.Debug|x64.ActiveCfg = Debug|x64
-		{9610627D-20FE-4B07-8CE3-9FF68A5F1EC2}.Debug|x64.Build.0 = Debug|x64
-		{9610627D-20FE-4B07-8CE3-9FF68A5F1EC2}.Release|x64.ActiveCfg = Release|x64
-		{9610627D-20FE-4B07-8CE3-9FF68A5F1EC2}.Release|x64.Build.0 = Release|x64
-		{FDA7B080-03B0-48C8-B24F-88118981422A}.Debug|x64.ActiveCfg = Debug|x64
-		{FDA7B080-03B0-48C8-B24F-88118981422A}.Debug|x64.Build.0 = Debug|x64
-		{FDA7B080-03B0-48C8-B24F-88118981422A}.Release|x64.ActiveCfg = Release|x64
-		{FDA7B080-03B0-48C8-B24F-88118981422A}.Release|x64.Build.0 = Release|x64
-		{508C291A-3D18-49F5-B25D-F7C8DB92CB21}.Debug|x64.ActiveCfg = Debug|x64
-		{508C291A-3D18-49F5-B25D-F7C8DB92CB21}.Debug|x64.Build.0 = Debug|x64
-		{508C291A-3D18-49F5-B25D-F7C8DB92CB21}.Release|x64.ActiveCfg = Release|x64
-		{508C291A-3D18-49F5-B25D-F7C8DB92CB21}.Release|x64.Build.0 = Release|x64
-		{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD}.Debug|x64.ActiveCfg = Debug|x64
-		{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD}.Debug|x64.Build.0 = Debug|x64
-		{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD}.Release|x64.ActiveCfg = Release|x64
-		{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD}.Release|x64.Build.0 = Release|x64
-		{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}.Debug|x64.ActiveCfg = Debug|x64
-		{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}.Debug|x64.Build.0 = Debug|x64
-		{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}.Release|x64.ActiveCfg = Release|x64
-		{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}.Release|x64.Build.0 = Release|x64
-		{5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0}.Debug|x64.ActiveCfg = Debug|x64
-		{5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0}.Debug|x64.Build.0 = Debug|x64
-		{5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0}.Release|x64.ActiveCfg = Release|x64
-		{5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0}.Release|x64.Build.0 = Release|x64
-		{2C902C67-985C-4BE0-94A3-E0FE2EB929A3}.Debug|x64.ActiveCfg = Debug|x64
-		{2C902C67-985C-4BE0-94A3-E0FE2EB929A3}.Debug|x64.Build.0 = Debug|x64
-		{2C902C67-985C-4BE0-94A3-E0FE2EB929A3}.Release|x64.ActiveCfg = Release|x64
-		{2C902C67-985C-4BE0-94A3-E0FE2EB929A3}.Release|x64.Build.0 = Release|x64
-		{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}.Debug|x64.ActiveCfg = Debug|x64
-		{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}.Debug|x64.Build.0 = Debug|x64
-		{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}.Release|x64.ActiveCfg = Release|x64
-		{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}.Release|x64.Build.0 = Release|x64
-		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug|x64.ActiveCfg = Debug|x64
-		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug|x64.Build.0 = Debug|x64
-		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Release|x64.ActiveCfg = Release|x64
-		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Release|x64.Build.0 = Release|x64
-		{8846A9AA-5539-4C91-8301-F54260E1A07A}.Debug|x64.ActiveCfg = Debug|x64
-		{8846A9AA-5539-4C91-8301-F54260E1A07A}.Debug|x64.Build.0 = Debug|x64
-		{8846A9AA-5539-4C91-8301-F54260E1A07A}.Release|x64.ActiveCfg = Release|x64
-		{8846A9AA-5539-4C91-8301-F54260E1A07A}.Release|x64.Build.0 = Release|x64
-		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF}.Debug|x64.ActiveCfg = Debug|x64
-		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF}.Debug|x64.Build.0 = Debug|x64
-		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF}.Release|x64.ActiveCfg = Release|x64
-		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF}.Release|x64.Build.0 = Release|x64
-		{D1CBF84E-07F8-4ACB-9CD2-BD205FDEEE1E}.Debug|x64.ActiveCfg = Debug|x64
-		{D1CBF84E-07F8-4ACB-9CD2-BD205FDEEE1E}.Debug|x64.Build.0 = Debug|x64
-		{D1CBF84E-07F8-4ACB-9CD2-BD205FDEEE1E}.Release|x64.ActiveCfg = Release|x64
-		{D1CBF84E-07F8-4ACB-9CD2-BD205FDEEE1E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -242,30 +171,21 @@ Global
 		{8BC303AB-25BE-4276-8E57-73F171B2D672} = {B0AC29FD-7B01-4B5E-9C8D-0A081E4C5668}
 		{3384223A-6D97-4799-9862-359F85312892} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
+		{30A05C4D-F5FD-421C-A864-17A64BDEAA75} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
 		{EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{60F89955-91C6-3A36-8000-13C592FEC2DF} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
+		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C} = {B0AC29FD-7B01-4B5E-9C8D-0A081E4C5668}
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
 		{FDC361C5-7734-493B-8CFB-037308B35122} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
+		{939FE206-1182-ABC3-1234-FEAB88E98404} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
+		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{73973223-5EE8-41CA-8E88-1D60E89A237B} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
+		{4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1} = {B0AC29FD-7B01-4B5E-9C8D-0A081E4C5668}
 		{A37E4273-85DB-4217-B775-CE971B87D9DF} = {B0AC29FD-7B01-4B5E-9C8D-0A081E4C5668}
-		{9610627D-20FE-4B07-8CE3-9FF68A5F1EC2} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
-		{FDA7B080-03B0-48C8-B24F-88118981422A} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{508C291A-3D18-49F5-B25D-F7C8DB92CB21} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{A55DA1B5-CC17-4525-BE7F-1659CE17BB56} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{2C902C67-985C-4BE0-94A3-E0FE2EB929A3} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{8846A9AA-5539-4C91-8301-F54260E1A07A} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{D1CBF84E-07F8-4ACB-9CD2-BD205FDEEE1E} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {06CC7920-E085-4B81-9582-8DE8AAD42510}
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index b1d10d38eb..7a63931362 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -1,5 +1,7 @@
-# Define GNU standard installation directories
-include(GNUInstallDirs)
+
+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)
@@ -11,218 +13,167 @@ include(CheckFunctionExists)
 set(CMAKE_CXX_STANDARD 20)
 
 set(ADDITIONAL_LIBS "")
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(CMAKE_SYSTEM MATCHES "Linux")
     #on some Linux distros shm_unlink and similar functions are in librt only
-    list(APPEND ADDITIONAL_LIBS "rt")
-elseif(NOT WIN32 AND NOT CMAKE_CXX_FLAGS MATCHES "LIBICONV_PLUG")
+    set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "rt")
+elseif(NOT MSVC AND NOT CMAKE_CXX_FLAGS MATCHES "LIBICONV_PLUG")
     #it seems like glibc includes the iconv functions we use but other libc
     #implementations like the one on OSX don't seem implement them
-    list(APPEND ADDITIONAL_LIBS "iconv")
+    set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "iconv")
 endif()
 
-if(UNIX AND NOT APPLE AND NOT ANDROID)
-    add_compile_definitions(DATADIR="${CMAKE_INSTALL_FULL_DATADIR}/rpcs3")
+if(UNIX AND NOT APPLE)
     # Optionally enable X11 for window management
     find_package(X11)
     if(X11_FOUND)
-        add_compile_definitions(HAVE_X11)
-    endif()
-    find_package(Wayland)
-    if(WAYLAND_FOUND)
-        add_compile_definitions(HAVE_WAYLAND)
+        add_definitions(-DHAVE_X11)
     endif()
 endif()
 
-if (NOT ANDROID)
-    # Qt
-    # finds Qt libraries and setups custom commands for MOC and UIC
-    # Must be done here because generated MOC and UIC targets cant
-    # be found otherwise
-    include(${CMAKE_SOURCE_DIR}/3rdparty/qt6.cmake)
+if(NOT RPCS3_SRC_DIR)
+    set(RPCS3_SRC_DIR ${CMAKE_CURRENT_LIST_DIR})
+    message("-- Initializing RPCS3_SRC_DIR=${RPCS3_SRC_DIR}")
+else()
+    message("-- Using Custom RPCS3_SRC_DIR=${RPCS3_SRC_DIR}")
 endif()
 
+# Qt5
+# finds Qt libraries and setups custom commands for MOC and UIC
+# Must be done here because generated MOC and UIC targets cant
+# be found otherwise
+include(${CMAKE_SOURCE_DIR}/3rdparty/qt5.cmake)
+
 # subdirectories
 add_subdirectory(Emu)
+add_subdirectory(rpcs3qt)
 
-if (NOT ANDROID)
-    add_subdirectory(rpcs3qt)
-endif()
+set(RPCS3_SRC
+    display_sleep_control.cpp
+    headless_application.cpp
+    main.cpp
+    main_application.cpp
+    rpcs3_version.cpp
+    stb_image.cpp
+    stdafx.cpp
 
-gen_git_version(${CMAKE_CURRENT_SOURCE_DIR})
+    Input/basic_keyboard_handler.cpp
+    Input/basic_mouse_handler.cpp
+    Input/ds3_pad_handler.cpp
+    Input/ds4_pad_handler.cpp
+    Input/dualsense_pad_handler.cpp
+    Input/evdev_joystick_handler.cpp
+    Input/hid_pad_handler.cpp
+    Input/keyboard_pad_handler.cpp
+    Input/mm_joystick_handler.cpp
+    Input/pad_thread.cpp
+    Input/xinput_pad_handler.cpp
+)
 
-if (NOT ANDROID)
-    # Build rpcs3_lib
-    add_library(rpcs3_lib STATIC)
-
-    if(WIN32)
-        target_compile_definitions(rpcs3_lib PRIVATE UNICODE _UNICODE)
-    endif()
-
-    set_target_properties(rpcs3_lib
+if(WIN32)
+    add_executable(rpcs3 WIN32 ${RPCS3_SRC})
+elseif(APPLE)
+    add_executable(rpcs3 MACOSX_BUNDLE ${RPCS3_SRC} "${RPCS3_SRC_DIR}/rpcs3.icns")
+    set_target_properties(rpcs3
         PROPERTIES
-            AUTOMOC ON
-            AUTOUIC ON)
+            MACOSX_BUNDLE_INFO_PLIST "${RPCS3_SRC_DIR}/rpcs3.plist.in")
+else()
+    add_executable(rpcs3 ${RPCS3_SRC})
+endif()
 
-    target_link_libraries(rpcs3_lib
-        PUBLIC
-            3rdparty::stblib
-            3rdparty::libevdev
-            rpcs3_emu
-        PRIVATE
-            rpcs3_ui
-            3rdparty::discordRPC
-            3rdparty::qt6
-            3rdparty::hidapi
-            3rdparty::libusb
-            3rdparty::wolfssl
-            3rdparty::libcurl
-            3rdparty::zlib
-            3rdparty::opencv
-            3rdparty::fusion
-            ${ADDITIONAL_LIBS})
+gen_git_version(${RPCS3_SRC_DIR})
+set_target_properties(rpcs3
+    PROPERTIES
+        AUTOMOC ON
+        AUTOUIC ON)
 
-    # Unix display manager
-    if(X11_FOUND)
-        target_link_libraries(rpcs3_lib PRIVATE X11::X11)
-    elseif(USE_VULKAN AND UNIX AND NOT WAYLAND_FOUND AND NOT APPLE AND NOT ANDROID)
-        # Wayland has been checked in 3rdparty/CMakeLists.txt already.
-        message(FATAL_ERROR "RPCS3 requires either X11 or Wayland (or both) for Vulkan.")
-    endif()
+target_link_libraries(rpcs3 rpcs3_emu rpcs3_ui)
+target_link_libraries(rpcs3 3rdparty::discordRPC 3rdparty::qt5 3rdparty::hidapi 3rdparty::libusb 3rdparty::wolfssl 3rdparty::libcurl)
+target_link_libraries(rpcs3 ${ADDITIONAL_LIBS})
 
-    if(UNIX)
-        set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-        find_package(Threads REQUIRED)
-        target_link_libraries(rpcs3_lib PRIVATE Threads::Threads)
-    endif()
+# Win resource file
+if(WIN32)
+    target_sources(rpcs3 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.rc")
+endif()
 
-    if(WIN32)
-        target_link_libraries(rpcs3_lib PRIVATE ws2_32 Iphlpapi Winmm Psapi gdi32 setupapi)
+# Unix display manager
+if(X11_FOUND)
+    target_include_directories(rpcs3 PUBLIC ${X11_INCLUDE_DIR})
+    target_link_libraries(rpcs3 ${X11_LIBRARIES})
+elseif(USE_VULKAN AND UNIX AND NOT WAYLAND_FOUND AND NOT APPLE)
+    # Wayland has been checked in 3rdparty/CMakeLists.txt already.
+    message(FATAL_ERROR "RPCS3 requires either X11 or Wayland (or both) for Vulkan.")
+endif()
+
+if(UNIX)
+    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+    find_package(Threads REQUIRED)
+    target_link_libraries(rpcs3 Threads::Threads)
+endif()
+
+if(WIN32)
+    target_link_libraries(rpcs3 ws2_32.lib Iphlpapi.lib Winmm.lib Psapi.lib gdi32.lib setupapi.lib)
+else()
+    target_link_libraries(rpcs3 ${CMAKE_DL_LIBS})
+endif()
+
+if(USE_PRECOMPILED_HEADERS)
+    if(COMMAND target_precompile_headers)
+        target_precompile_headers(rpcs3 PRIVATE "${RPCS3_SRC_DIR}/stdafx.h")
     else()
-        target_link_libraries(rpcs3_lib PRIVATE ${CMAKE_DL_LIBS})
-    endif()
+        set_target_properties(rpcs3 PROPERTIES
+            COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h"
+            COTIRE_ADD_UNITY_BUILD OFF)
 
-    if(USE_PRECOMPILED_HEADERS)
-        target_precompile_headers(rpcs3_lib PRIVATE stdafx.h)
-    endif()
-
-    # Build rpcs3 executable
-    if(WIN32)
-        add_executable(rpcs3 WIN32)
-        target_sources(rpcs3 PRIVATE rpcs3.rc)
-        target_compile_definitions(rpcs3 PRIVATE UNICODE _UNICODE)
-    elseif(APPLE)
-        add_executable(rpcs3 MACOSX_BUNDLE)
-        target_sources(rpcs3 PRIVATE rpcs3.icns update_helper.sh)
-        set_source_files_properties(update_helper.sh PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-        set_target_properties(rpcs3
-            PROPERTIES
-                MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.plist.in")
-    else()
-        add_executable(rpcs3)
-    endif()
-
-    target_sources(rpcs3
-        PRIVATE
-            main.cpp
-    )
-
-    target_link_libraries(rpcs3
-        PRIVATE
-            rpcs3_lib
-    )
-
-    if(USE_PRECOMPILED_HEADERS)
-        target_precompile_headers(rpcs3 PRIVATE stdafx.h)
-    endif()
-
-    # Copy icons to executable directory
-    if(APPLE)
-        if (CMAKE_BUILD_TYPE MATCHES "Debug" OR CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
-            set(QT_DEPLOY_FLAGS "-no-strip")
-        else()
-            set(QT_DEPLOY_FLAGS "")
-        endif()
-        qt_finalize_target(rpcs3)
-        add_custom_command(TARGET rpcs3 POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.icns $<TARGET_FILE_DIR:rpcs3>/../Resources/rpcs3.icns
-            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/../Resources/Icons
-            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/../Resources/GuiConfigs
-            COMMAND "${MACDEPLOYQT_EXECUTABLE}" "${PROJECT_BINARY_DIR}/bin/rpcs3.app" "${QT_DEPLOY_FLAGS}")
-    elseif(UNIX)
-        add_custom_command(TARGET rpcs3 POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons
-            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs)
-    elseif(WIN32)
-        add_custom_command(TARGET rpcs3 POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons
-            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs
-            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/test $<TARGET_FILE_DIR:rpcs3>/test
-            COMMAND "${WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime --no-opengl-sw --no-patchqt
-                --no-translations --no-system-d3d-compiler --no-system-dxc-compiler --no-quick-import
-                --plugindir "$<IF:$<CXX_COMPILER_ID:MSVC>,$<TARGET_FILE_DIR:rpcs3>/plugins,$<TARGET_FILE_DIR:rpcs3>/share/qt6/plugins>"
-                --verbose 0 "$<TARGET_FILE:rpcs3>")
-    endif()
-
-    # Unix installation
-    if(UNIX AND NOT APPLE)
-        # Install the binary
-        install(TARGETS rpcs3 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-        # Install the application icon and menu item
-        install(FILES rpcs3.svg
-            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
-        install(FILES rpcs3.png
-            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps)
-        install(FILES rpcs3.desktop
-            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
-        install(FILES rpcs3.metainfo.xml
-            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
-        # Install other files
-        install(DIRECTORY ../bin/Icons
-            DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
-        install(DIRECTORY ../bin/GuiConfigs
-            DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
-        install(DIRECTORY ../bin/test
-            DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
+        cotire(rpcs3)
     endif()
 endif()
 
-# Unit tests
-if(BUILD_RPCS3_TESTS)
-    find_package(GTest REQUIRED)
-
-    message(STATUS "Building unit tests...")
-
-    add_executable(rpcs3_test)
-
-    target_sources(rpcs3_test
-        PRIVATE
-            tests/test.cpp
-            tests/test_fmt.cpp
-            tests/test_simple_array.cpp
-            tests/test_address_range.cpp
-    )
-
-    target_link_libraries(rpcs3_test
-        PRIVATE
-            rpcs3_lib
-            rpcs3_emu
-            GTest::gtest
-    )
-
-    target_include_directories(rpcs3_test
-        PUBLIC
-            ${CMAKE_CURRENT_SOURCE_DIR}
-            ${CMAKE_CURRENT_SOURCE_DIR}/..
-    )
-
-    include(GoogleTest)
-    gtest_discover_tests(rpcs3_test)
-
-    if(RUN_RPCS3_TESTS)
-        add_custom_target(run_tests
-            ALL
-            COMMAND ${CMAKE_CTEST_COMMAND} -j -VV --output-on-failure
-            DEPENDS rpcs3_test
-     )
-    endif()
+# Copy icons to executable directory
+if(APPLE)
+    add_custom_command(TARGET rpcs3 POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy
+            ${RPCS3_SRC_DIR}/rpcs3.icns $<TARGET_FILE_DIR:rpcs3>/../Resources/rpcs3.icns
+            COMMAND ${CMAKE_COMMAND} -E copy_directory
+            ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/../Resources/Icons
+            COMMAND ${CMAKE_COMMAND} -E copy_directory
+            ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/../Resources/GuiConfigs
+            COMMAND ${CMAKE_COMMAND} -E copy_directory
+            ${CMAKE_SOURCE_DIR}/bin/git $<TARGET_FILE_DIR:rpcs3>/../Resources/git
+            COMMAND "${Qt5_DIR}/../../../bin/macdeployqt" "${PROJECT_BINARY_DIR}/bin/rpcs3.app")
+elseif(UNIX)
+    add_custom_command(TARGET rpcs3 POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_directory
+            ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons)
+    add_custom_command(TARGET rpcs3 POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_directory
+            ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs)
+    add_custom_command(TARGET rpcs3 POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_directory
+            ${CMAKE_SOURCE_DIR}/bin/git $<TARGET_FILE_DIR:rpcs3>/git)
+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" --release "$<TARGET_FILE:rpcs3>")
+endif()
+
+# Unix installation
+if(UNIX AND NOT APPLE)
+    # Install the binary
+    install(TARGETS rpcs3 RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+    # Install the application icon and menu item
+    install(FILES rpcs3.svg
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
+    install(FILES rpcs3.png
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps)
+    install(FILES rpcs3.desktop
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+    install(FILES rpcs3.metainfo.xml
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
+    # Install other files
+    install(DIRECTORY ../bin/Icons
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/rpcs3)
+    install(DIRECTORY ../bin/GuiConfigs
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/rpcs3)
+    install(DIRECTORY ../bin/git
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/rpcs3)
 endif()
diff --git a/rpcs3/Crypto/aes.cpp b/rpcs3/Crypto/aes.cpp
index 1cfc72aaab..dae680de3e 100644
--- a/rpcs3/Crypto/aes.cpp
+++ b/rpcs3/Crypto/aes.cpp
@@ -32,8 +32,6 @@
 #include "aes.h"
 #include "aesni.h"
 
-#include <algorithm>
-
 /*
  * 32-bit integer manipulation macros (little endian)
  */
@@ -461,10 +459,8 @@ int aes_setkey_enc( aes_context *ctx, const unsigned char *key, unsigned int key
 
     ctx->rk = RK = ctx->buf;
 
-#if defined(__SSE2__) || defined(_M_X64)
     if( aesni_supports( POLARSSL_AESNI_AES ) )
         return( aesni_setkey_enc( reinterpret_cast<unsigned char*>(ctx->rk), key, keysize ) );
-#endif
 
     for( i = 0; i < (keysize >> 5); i++ )
     {
@@ -566,14 +562,12 @@ int aes_setkey_dec( aes_context *ctx, const unsigned char *key, unsigned int key
     if( ret != 0 )
         return( ret );
 
-#if defined(__SSE2__) || defined(_M_X64)
     if( aesni_supports( POLARSSL_AESNI_AES ) )
     {
         aesni_inverse_key( reinterpret_cast<unsigned char*>(ctx->rk),
                            reinterpret_cast<const unsigned char*>(cty.rk), ctx->nr );
         goto done;
     }
-#endif
 
     SK = cty.rk + cty.nr * 4;
 
@@ -598,12 +592,8 @@ int aes_setkey_dec( aes_context *ctx, const unsigned char *key, unsigned int key
     *RK++ = *SK++;
     *RK++ = *SK++;
 
-#if defined(__SSE2__) || defined(_M_X64)
 done:
-#endif
-
-    // Wipe the stack buffer clean
-    std::fill_n(reinterpret_cast<volatile char*>(&cty), sizeof(cty), 0);
+    memset( &cty, 0, sizeof( aes_context ) );
 
     return( 0 );
 }
@@ -665,10 +655,8 @@ int aes_crypt_ecb( aes_context *ctx,
     int i;
     uint32_t *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
 
-#if defined(__SSE2__) || defined(_M_X64)
     if( aesni_supports( POLARSSL_AESNI_AES ) )
         return( aesni_crypt_ecb( ctx, mode, input, output ) );
-#endif
 
     RK = ctx->rk;
 
@@ -897,7 +885,7 @@ unsigned char const_Zero[16] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-void leftshift_onebit(const unsigned char *input, unsigned char *output)
+void leftshift_onebit(unsigned char *input, unsigned char *output)
 {
 	int i;
     unsigned char overflow = 0;
@@ -910,7 +898,7 @@ void leftshift_onebit(const unsigned char *input, unsigned char *output)
 	}
 }
 
-void xor_128(const unsigned char *a, const unsigned char *b, unsigned char *out)
+void xor_128(unsigned char *a, unsigned char *b, unsigned char *out)
 {
 	int i;
 	for (i = 0; i < 16; i++)
@@ -945,9 +933,10 @@ void generate_subkey(aes_context *ctx, unsigned char *K1, unsigned char *K2)
     }
 }
 
-void padding(const unsigned char *lastb, unsigned char *pad, size_t length)
+void padding (unsigned char *lastb, unsigned char *pad, int length)
 {
-	for (unsigned int i = 0; i < 16; i++)
+	int i;
+	for (i = 0; i < 16; i++)
 	{
 		if (i < length)
 			pad[i] = lastb[i];
@@ -958,14 +947,14 @@ void padding(const unsigned char *lastb, unsigned char *pad, size_t length)
 	}
 }
 
-void aes_cmac(aes_context *ctx, size_t length, unsigned char *input, unsigned char *output)
+void aes_cmac(aes_context *ctx, int length, unsigned char *input, unsigned char *output)
 {
     unsigned char X[16], Y[16], M_last[16], padded[16];
     unsigned char K1[16], K2[16];
-    int i, flag;
+    int n, i, flag;
     generate_subkey(ctx, K1, K2);
 
-    size_t n = (length + 15) / 16;
+    n = (length + 15) / 16;
     if (n == 0)
 	{
         n = 1;
@@ -986,7 +975,7 @@ void aes_cmac(aes_context *ctx, size_t length, unsigned char *input, unsigned ch
     }
 
     for (i = 0; i < 16; i++) X[i] = 0;
-    for (size_t i = 0; i < n - 1; i++)
+    for (i = 0; i < n - 1; i++)
     {
         xor_128(X, &input[16*i], Y);
 		aes_crypt_ecb(ctx, AES_ENCRYPT, Y, X);
diff --git a/rpcs3/Crypto/aes.h b/rpcs3/Crypto/aes.h
index 42e20e664d..2b5d0f0f71 100644
--- a/rpcs3/Crypto/aes.h
+++ b/rpcs3/Crypto/aes.h
@@ -124,7 +124,7 @@ int aes_crypt_cbc( aes_context *ctx,
  * both encryption and decryption. So a context initialized with
  * aes_setkey_enc() for both AES_ENCRYPT and AES_DECRYPT.
  *
- * both
+ * both 
  * \param ctx      AES context
  * \param mode     AES_ENCRYPT or AES_DECRYPT
  * \param length   length of the input data
@@ -172,7 +172,7 @@ int aes_crypt_ctr( aes_context *ctx,
                        const unsigned char *input,
                        unsigned char *output );
 
-void aes_cmac(aes_context *ctx, size_t length, unsigned char *input, unsigned char *output);
+void aes_cmac(aes_context *ctx, int length, unsigned char *input, unsigned char *output);
 
 #ifdef __cplusplus
 }
diff --git a/rpcs3/Crypto/aesni.cpp b/rpcs3/Crypto/aesni.cpp
index 05bb65fe7f..c0e3fa90cf 100644
--- a/rpcs3/Crypto/aesni.cpp
+++ b/rpcs3/Crypto/aesni.cpp
@@ -1,5 +1,3 @@
-#if defined(__SSE2__) || defined(_M_X64)
-
 /*
  *  AES-NI support functions
  *
@@ -682,5 +680,3 @@ int aesni_setkey_enc( unsigned char *rk,
 
     return( 0 );
 }
-
-#endif
diff --git a/rpcs3/Crypto/decrypt_binaries.cpp b/rpcs3/Crypto/decrypt_binaries.cpp
deleted file mode 100644
index 6205ac6d4f..0000000000
--- a/rpcs3/Crypto/decrypt_binaries.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-#include "stdafx.h"
-#include "decrypt_binaries.h"
-#include "unedat.h"
-#include "unself.h"
-#include "Emu/IdManager.h"
-#include "Emu/System.h"
-#include "Utilities/StrUtil.h"
-
-#include <charconv>
-#include <iostream>
-
-LOG_CHANNEL(dec_log, "DECRYPT");
-
-usz decrypt_binaries_t::decrypt(std::string_view klic_input)
-{
-	if (m_index >= m_modules.size())
-	{
-		std::cout << "No paths specified" << std::endl; // For CLI
-		m_index = umax;
-		return umax;
-	}
-
-	if (m_klics.empty())
-	{
-		dec_log.notice("Decrypting binaries...");
-		std::cout << "Decrypting binaries..." << std::endl; // For CLI
-
-		// Always start with no KLIC
-		m_klics.emplace_back(u128{});
-
-		if (const auto keys = g_fxo->try_get<loaded_npdrm_keys>())
-		{
-			// Second klic: get it from a running game
-			if (const u128 klic = keys->last_key())
-			{
-				m_klics.emplace_back(klic);
-			}
-		}
-
-		// Try to use the key that has been for the current running ELF
-		m_klics.insert(m_klics.end(), Emu.klic.begin(), Emu.klic.end());
-	}
-
-	if (std::string_view text = klic_input.substr(klic_input.find_first_of('x') + 1); text.size() == 32)
-	{
-		// Allowed to fail (would simply repeat the operation if fails again)
-		u64 lo = 0;
-		u64 hi = 0;
-		bool success = false;
-
-		if (auto res = std::from_chars(text.data() + 0, text.data() + 16, lo, 16); res.ec == std::errc() && res.ptr == text.data() + 16)
-		{
-			if (res = std::from_chars(text.data() + 16, text.data() + 32, hi, 16); res.ec == std::errc() && res.ptr == text.data() + 32)
-			{
-				success = true;
-			}
-		}
-
-		if (success)
-		{
-			lo = std::bit_cast<be_t<u64>>(lo);
-			hi = std::bit_cast<be_t<u64>>(hi);
-
-			if (u128 input_key = ((u128{hi} << 64) | lo))
-			{
-				m_klics.emplace_back(input_key);
-			}
-		}
-	}
-
-	while (m_index < m_modules.size())
-	{
-		const std::string& _module = m_modules[m_index];
-		const std::string old_path = _module;
-
-		fs::file elf_file;
-		fs::file internal_file;
-
-		bool invalid = false;
-		usz key_it = 0;
-		u32 file_magic{};
-
-		while (true)
-		{
-			for (; key_it < m_klics.size(); key_it++)
-			{
-				internal_file.close();
-
-				if (!elf_file.open(old_path) || !elf_file.read(file_magic))
-				{
-					file_magic = 0;
-				}
-
-				switch (file_magic)
-				{
-				case "SCE\0"_u32:
-				{
-					// First KLIC is no KLIC
-					elf_file = decrypt_self(elf_file, key_it != 0 ? reinterpret_cast<u8*>(&m_klics[key_it]) : nullptr);
-
-					if (!elf_file)
-					{
-						// Try another key
-						continue;
-					}
-
-					break;
-				}
-				case "NPD\0"_u32:
-				{
-					// EDAT / SDAT
-					internal_file = std::move(elf_file);
-					elf_file = DecryptEDAT(internal_file, old_path, key_it != 0 ? 8 : 1, reinterpret_cast<u8*>(&m_klics[key_it]));
-
-					if (!elf_file)
-					{
-						// Try another key
-						continue;
-					}
-
-					break;
-				}
-				default:
-				{
-					invalid = true;
-					break;
-				}
-				}
-
-				if (invalid)
-				{
-					elf_file.close();
-				}
-
-				break;
-			}
-
-			if (elf_file)
-			{
-				const std::string exec_ext = fmt::to_lower(_module).ends_with(".sprx") ? ".prx" : ".elf";
-				const std::string new_path = file_magic == "NPD\0"_u32 ? old_path + ".unedat" :
-					old_path.substr(0, old_path.find_last_of('.')) + exec_ext;
-
-				if (fs::file new_file{new_path, fs::rewrite})
-				{
-					// 16MB buffer
-					std::vector<u8> buffer(std::min<usz>(elf_file.size(), 1u << 24));
-
-					elf_file.seek(0);
-
-					while (usz read_size = elf_file.read(buffer.data(), buffer.size()))
-					{
-						new_file.write(buffer.data(), read_size);
-					}
-
-					dec_log.success("Decrypted %s -> %s", old_path, new_path);
-					std::cout << "Decrypted " << old_path << " -> " << new_path << std::endl; // For CLI
-					m_index++;
-				}
-				else
-				{
-					dec_log.error("Failed to create %s", new_path);
-					std::cout << "Failed to create " << new_path << std::endl; // For CLI
-					m_index = umax;
-				}
-
-				break;
-			}
-
-			if (!invalid)
-			{
-				// Allow the user to manually type KLIC if decryption failed
-				return m_index;
-			}
-
-			dec_log.error("Failed to decrypt \"%s\".", old_path);
-			std::cout << "Failed to decrypt \"" << old_path << "\"." << std::endl; // For CLI
-			return m_index;
-		}
-	}
-
-	dec_log.notice("Finished decrypting all binaries.");
-	std::cout << "Finished decrypting all binaries." << std::endl; // For CLI
-	return m_index;
-}
diff --git a/rpcs3/Crypto/decrypt_binaries.h b/rpcs3/Crypto/decrypt_binaries.h
deleted file mode 100644
index 09eeaf6d33..0000000000
--- a/rpcs3/Crypto/decrypt_binaries.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-class decrypt_binaries_t
-{
-    std::vector<u128> m_klics;
-    std::vector<std::string> m_modules;
-    usz m_index = 0;
-
-public:
-    decrypt_binaries_t(std::vector<std::string> modules) noexcept
-        : m_modules(std::move(modules))
-    {
-    }
-
-    usz decrypt(std::string_view klic_input = {});
-
-    bool done() const
-    {
-        return m_index >= m_modules.size();
-    }
-
-    const std::string& operator[](usz index) const
-    {
-        return ::at32(m_modules, index);
-    }
-};
diff --git a/rpcs3/Crypto/ec.cpp b/rpcs3/Crypto/ec.cpp
index 3789928492..c614f6200c 100644
--- a/rpcs3/Crypto/ec.cpp
+++ b/rpcs3/Crypto/ec.cpp
@@ -2,12 +2,24 @@
 // Licensed under the terms of the GNU GPL, version 2
 // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
-#include "util/types.hpp"
+#include "utils.h"
 #include <cstring>
 
-static inline int bn_compare(const u8* a, const u8* b, u32 n)
+static void bn_zero(u8* d, u32 n)
 {
-	for (u32 i = 0; i < n; i++)
+	memset(d, 0, n);
+}
+
+static void bn_copy(u8* d, u8* a, u32 n)
+{
+	memcpy(d, a, n);
+}
+
+static int bn_compare(u8* a, u8* b, u32 n)
+{
+	u32 i;
+
+	for (i = 0; i < n; i++)
 	{
 		if (a[i] < b[i])
 			return -1;
@@ -18,12 +30,16 @@ static inline int bn_compare(const u8* a, const u8* b, u32 n)
 	return 0;
 }
 
-static u8 bn_add_1(u8* d, const u8* a, const u8* b, u32 n)
+static u8 bn_add_1(u8* d, u8* a, u8* b, u32 n)
 {
-	u8 c = 0;
-	for (u32 i = n - 1; i != umax; i--)
+	u32 i;
+	u32 dig;
+	u8 c;
+
+	c = 0;
+	for (i = n - 1; i < n; i--)
 	{
-		const u32 dig = a[i] + b[i] + c;
+		dig  = a[i] + b[i] + c;
 		c    = dig >> 8;
 		d[i] = dig;
 	}
@@ -31,12 +47,16 @@ static u8 bn_add_1(u8* d, const u8* a, const u8* b, u32 n)
 	return c;
 }
 
-static u8 bn_sub_1(u8* d, const u8* a, const u8* b, u32 n)
+static u8 bn_sub_1(u8* d, u8* a, u8* b, u32 n)
 {
-	u8 c = 1;
-	for (u32 i = n - 1; i != umax; i--)
+	u32 i;
+	u32 dig;
+	u8 c;
+
+	c = 1;
+	for (i = n - 1; i < n; i--)
 	{
-		const u32 dig = a[i] + 255 - b[i] + c;
+		dig  = a[i] + 255 - b[i] + c;
 		c    = dig >> 8;
 		d[i] = dig;
 	}
@@ -44,13 +64,13 @@ static u8 bn_sub_1(u8* d, const u8* a, const u8* b, u32 n)
 	return 1 - c;
 }
 
-static void bn_reduce(u8* d, const u8* N, u32 n)
+static void bn_reduce(u8* d, u8* N, u32 n)
 {
 	if (bn_compare(d, N, n) >= 0)
 		bn_sub_1(d, d, N, n);
 }
 
-static void bn_add(u8* d, const u8* a, const u8* b, const u8* N, u32 n)
+static void bn_add(u8* d, u8* a, u8* b, u8* N, u32 n)
 {
 	if (bn_add_1(d, a, b, n))
 		bn_sub_1(d, d, N, n);
@@ -58,7 +78,7 @@ static void bn_add(u8* d, const u8* a, const u8* b, const u8* N, u32 n)
 	bn_reduce(d, N, n);
 }
 
-static void bn_sub(u8* d, const u8* a, const u8* b, const u8* N, u32 n)
+static void bn_sub(u8* d, u8* a, u8* b, u8* N, u32 n)
 {
 	if (bn_sub_1(d, a, b, n))
 		bn_add_1(d, d, N, n);
@@ -83,14 +103,17 @@ static constexpr u8 inv256[0x80] = {
 	0x11, 0x3b, 0x5d, 0xc7, 0x49, 0x33, 0x55, 0xff,
 };
 
-static void bn_mon_muladd_dig(u8* d, const u8* a, u8 b, const u8* N, u32 n)
+static void bn_mon_muladd_dig(u8* d, u8* a, u8 b, u8* N, u32 n)
 {
+	u32 dig;
+	u32 i;
+
 	const u8 z = -(d[n - 1] + a[n - 1] * b) * inv256[N[n - 1] / 2];
 
-	u32 dig = d[n - 1] + a[n - 1] * b + N[n - 1] * z;
+	dig = d[n - 1] + a[n - 1] * b + N[n - 1] * z;
 	dig >>= 8;
 
-	for (u32 i = n - 2; i < n; i--)
+	for (i = n - 2; i < n; i--)
 	{
 		dig += d[i] + a[i] * b + N[i] * z;
 		d[i + 1] = dig;
@@ -106,58 +129,62 @@ static void bn_mon_muladd_dig(u8* d, const u8* a, u8 b, const u8* N, u32 n)
 	bn_reduce(d, N, n);
 }
 
-static void bn_mon_mul(u8* d, const u8* a, const u8* b, const u8* N, u32 n)
+static void bn_mon_mul(u8* d, u8* a, u8* b, u8* N, u32 n)
 {
 	u8 t[512];
-	memset(t, 0, n);
+	u32 i;
 
-	for (u32 i = n - 1; i != umax; i--)
+	bn_zero(t, n);
+
+	for (i = n - 1; i < n; i--)
 		bn_mon_muladd_dig(t, a, b[i], N, n);
 
-	memcpy(d, t, n);
+	bn_copy(d, t, n);
 }
 
-static void bn_to_mon(u8* d, const u8* N, u32 n)
+static void bn_to_mon(u8* d, u8* N, u32 n)
 {
-	for (u32 i = 0; i < 8 * n; i++)
+	u32 i;
+
+	for (i = 0; i < 8 * n; i++)
 		bn_add(d, d, d, N, n);
 }
 
-static void bn_from_mon(u8* d, const u8* N, u32 n)
+static void bn_from_mon(u8* d, u8* N, u32 n)
 {
 	u8 t[512];
 
-	memset(t, 0, n);
+	bn_zero(t, n);
 	t[n - 1] = 1;
 	bn_mon_mul(d, d, t, N, n);
 }
 
-static void bn_mon_exp(u8* d, const u8* a, const u8* N, u32 n, const u8* e, u32 en)
+static void bn_mon_exp(u8* d, u8* a, u8* N, u32 n, u8* e, u32 en)
 {
 	u8 t[512];
+	u32 i;
+	u8 mask;
 
-	memset(d, 0, n);
+	bn_zero(d, n);
 	d[n - 1] = 1;
 	bn_to_mon(d, N, n);
 
-	for (u32 i = 0; i < en; i++)
-	{
-		for (u8 mask = 0x80; mask != 0; mask >>= 1)
+	for (i = 0; i < en; i++)
+		for (mask = 0x80; mask != 0; mask >>= 1)
 		{
 			bn_mon_mul(t, d, d, N, n);
 			if ((e[i] & mask) != 0)
 				bn_mon_mul(d, t, a, N, n);
 			else
-				memcpy(d, t, n);
+				bn_copy(d, t, n);
 		}
-	}
 }
 
-static void bn_mon_inv(u8* d, const u8* a, const u8* N, u32 n)
+static void bn_mon_inv(u8* d, u8* a, u8* N, u32 n)
 {
 	u8 t[512], s[512];
 
-	memset(s, 0, n);
+	bn_zero(s, n);
 	s[n - 1] = 2;
 	bn_sub_1(t, N, s, n);
 	bn_mon_exp(d, a, N, n, t, n);
@@ -176,42 +203,52 @@ static thread_local u8 ec_N[21]{};
 static thread_local point ec_G{}; // mon
 static thread_local point ec_Q{}; // mon
 static thread_local u8 ec_k[21]{};
-static thread_local bool ec_curve_initialized{};
-static thread_local bool ec_pub_initialized{};
 
-static inline bool elt_is_zero(const u8* d)
+static void elt_copy(u8* d, u8* a)
 {
-	for (u32 i = 0; i < 20; i++)
-		if (d[i] != 0)
-			return false;
-
-	return true;
+	memcpy(d, a, 20);
 }
 
-static void elt_add(u8* d, const u8* a, const u8* b)
+static void elt_zero(u8* d)
+{
+	memset(d, 0, 20);
+}
+
+static int elt_is_zero(u8* d)
+{
+	u32 i;
+
+	for (i = 0; i < 20; i++)
+		if (d[i] != 0)
+			return 0;
+
+	return 1;
+}
+
+static void elt_add(u8* d, u8* a, u8* b)
 {
 	bn_add(d, a, b, ec_p, 20);
 }
 
-static void elt_sub(u8* d, const u8* a, const u8* b)
+static void elt_sub(u8* d, u8* a, u8* b)
 {
 	bn_sub(d, a, b, ec_p, 20);
 }
 
-static void elt_mul(u8* d, const u8* a, const u8* b)
+static void elt_mul(u8* d, u8* a, u8* b)
 {
 	bn_mon_mul(d, a, b, ec_p, 20);
 }
 
-static void elt_square(u8* d, const u8* a)
+static void elt_square(u8* d, u8* a)
 {
 	elt_mul(d, a, a);
 }
 
-static void elt_inv(u8* d, const u8* a)
+static void elt_inv(u8* d, u8* a)
 {
 	u8 s[20];
-	memcpy(s, a, 20);
+	elt_copy(s, a);
 	bn_mon_inv(d, s, ec_p, 20);
 }
 
@@ -227,27 +264,29 @@ static void point_from_mon(point* p)
 	bn_from_mon(p->y, ec_p, 20);
 }
 
-static inline void point_zero(point* p)
+static void point_zero(point* p)
 {
-	memset(p->x, 0, 20);
-	memset(p->y, 0, 20);
+	elt_zero(p->x);
+	elt_zero(p->y);
 }
 
-static inline bool point_is_zero(const point* p)
+static int point_is_zero(point* p)
 {
 	return elt_is_zero(p->x) && elt_is_zero(p->y);
 }
 
-static void point_double(point* r, const point* p)
+static void point_double(point* r, point* p)
 {
 	u8 s[20], t[20];
+	point pp;
+	u8 *px, *py, *rx, *ry;
 
-	point pp = *p;
+	pp = *p;
 
-	const u8* px = pp.x;
-	const u8* py = pp.y;
-	u8* rx = r->x;
-	u8* ry = r->y;
+	px = pp.x;
+	py = pp.y;
+	rx = r->x;
+	ry = r->y;
 
 	if (elt_is_zero(py))
 	{
@@ -272,31 +311,33 @@ static void point_double(point* r, const point* p)
 	elt_sub(ry, ry, py); // ry = -s*(rx-px) - py
 }
 
-static void point_add(point* r, const point* p, const point* q)
+static void point_add(point* r, point* p, point* q)
 {
 	u8 s[20], t[20], u[20];
+	u8 *px, *py, *qx, *qy, *rx, *ry;
+	point pp, qq;
 
-	point pp = *p;
-	point qq = *q;
+	pp = *p;
+	qq = *q;
 
-	const u8* px = pp.x;
-	const u8* py = pp.y;
-	const u8* qx = qq.x;
-	const u8* qy = qq.y;
-	u8* rx = r->x;
-	u8* ry = r->y;
+	px = pp.x;
+	py = pp.y;
+	qx = qq.x;
+	qy = qq.y;
+	rx = r->x;
+	ry = r->y;
 
 	if (point_is_zero(&pp))
 	{
-		memcpy(rx, qx, 20);
-		memcpy(ry, qy, 20);
+		elt_copy(rx, qx);
+		elt_copy(ry, qy);
 		return;
 	}
 
 	if (point_is_zero(&qq))
 	{
-		memcpy(rx, px, 20);
-		memcpy(ry, py, 20);
+		elt_copy(rx, px);
+		elt_copy(ry, py);
 		return;
 	}
 
@@ -326,22 +367,23 @@ static void point_add(point* r, const point* p, const point* q)
 	elt_sub(ry, ry, py); // ry = -s*(rx-px) - py
 }
 
-static void point_mul(point* d, const u8* a, const point* b) // a is bignum
+static void point_mul(point* d, u8* a, point* b) // a is bignum
 {
+	u32 i;
+	u8 mask;
+
 	point_zero(d);
 
-	for (u32 i = 0; i < 21; i++)
-	{
-		for (u8 mask = 0x80; mask != 0; mask >>= 1)
+	for (i = 0; i < 21; i++)
+		for (mask = 0x80; mask != 0; mask >>= 1)
 		{
 			point_double(d, d);
 			if ((a[i] & mask) != 0)
 				point_add(d, d, b);
 		}
-	}
 }
 
-static bool check_ecdsa(const struct point* Q, u8* R, u8* S, const u8* hash)
+static int check_ecdsa(struct point* Q, u8* R, u8* S, u8* hash)
 {
 	u8 Sinv[21];
 	u8 e[21];
@@ -382,10 +424,8 @@ static bool check_ecdsa(const struct point* Q, u8* R, u8* S, const u8* hash)
 	return (bn_compare(rr, R, 21) == 0);
 }
 
-void ecdsa_set_curve(const u8* p, const u8* a, const u8* b, const u8* N, const u8* Gx, const u8* Gy)
+int ecdsa_set_curve(const u8* p, const u8* a, const u8* b, const u8* N, const u8* Gx, const u8* Gy)
 {
-	if (ec_curve_initialized) return;
-
 	memcpy(ec_p, p, 20);
 	memcpy(ec_a, a, 20);
 	memcpy(ec_b, b, 20);
@@ -398,18 +438,14 @@ void ecdsa_set_curve(const u8* p, const u8* a, const u8* b, const u8* N, const u
 
 	point_to_mon(&ec_G);
 
-	ec_curve_initialized = true;
+	return 0;
 }
 
 void ecdsa_set_pub(const u8* Q)
 {
-	if (ec_pub_initialized) return;
-
 	memcpy(ec_Q.x, Q, 20);
-	memcpy(ec_Q.y, Q + 20, 20);
+	memcpy(ec_Q.y, Q+20, 20);
 	point_to_mon(&ec_Q);
-
-	ec_pub_initialized = true;
 }
 
 void ecdsa_set_priv(const u8* k)
@@ -417,7 +453,7 @@ void ecdsa_set_priv(const u8* k)
 	memcpy(ec_k, k, sizeof ec_k);
 }
 
-bool ecdsa_verify(const u8* hash, u8* R, u8* S)
+int ecdsa_verify(u8* hash, u8* R, u8* S)
 {
 	return check_ecdsa(&ec_Q, R, S, hash);
 }
diff --git a/rpcs3/Crypto/ec.h b/rpcs3/Crypto/ec.h
index f5ee60ba52..3ad8cf98cb 100644
--- a/rpcs3/Crypto/ec.h
+++ b/rpcs3/Crypto/ec.h
@@ -6,7 +6,7 @@
 
 #include "util/types.hpp"
 
-void ecdsa_set_curve(const u8* p, const u8* a, const u8* b, const u8* N, const u8* Gx, const u8* Gy);
+int ecdsa_set_curve(const u8* p, const u8* a, const u8* b, const u8* N, const u8* Gx, const u8* Gy);
 void ecdsa_set_pub(const u8* Q);
 void ecdsa_set_priv(const u8* k);
-bool ecdsa_verify(const u8* hash, u8* R, u8* S);
+int ecdsa_verify(u8* hash, u8* R, u8* S);
diff --git a/rpcs3/Crypto/key_vault.cpp b/rpcs3/Crypto/key_vault.cpp
index 2533b4d7fc..ab99514b27 100644
--- a/rpcs3/Crypto/key_vault.cpp
+++ b/rpcs3/Crypto/key_vault.cpp
@@ -20,7 +20,6 @@ SELF_KEY::SELF_KEY(u64 ver_start, u64 ver_end, u16 rev, u32 type, const std::str
 
 KeyVault::KeyVault()
 {
-	std::memcpy(klicensee_key, NP_KLIC_FREE, sizeof(klicensee_key));
 }
 
 void KeyVault::LoadSelfLV0Keys()
@@ -752,17 +751,18 @@ SELF_KEY KeyVault::FindSelfKey(u32 type, u16 revision, u64 version)
 	return key;
 }
 
-void KeyVault::SetKlicenseeKey(const u8* key)
+void KeyVault::SetKlicenseeKey(u8* key)
 {
-	std::memcpy(klicensee_key, key, 0x10);
+	klicensee_key = std::make_unique<u8[]>(0x10);
+	memcpy(klicensee_key.get(), key, 0x10);
 }
 
-const u8* KeyVault::GetKlicenseeKey() const
+u8* KeyVault::GetKlicenseeKey() const
 {
-	return klicensee_key;
+	return klicensee_key.get();
 }
 
-void rap_to_rif(const unsigned char* rap, unsigned char* rif)
+void rap_to_rif(unsigned char* rap, unsigned char* rif)
 {
 	int i;
 	int round;
diff --git a/rpcs3/Crypto/key_vault.h b/rpcs3/Crypto/key_vault.h
index 4dff84992b..71a3fa6e08 100644
--- a/rpcs3/Crypto/key_vault.h
+++ b/rpcs3/Crypto/key_vault.h
@@ -33,37 +33,6 @@ struct SELF_KEY
 	SELF_KEY(u64 ver_start, u64 ver_end, u16 rev, u32 type, const std::string& e, const std::string& r, const std::string& pb, const std::string& pr, u32 ct);
 };
 
-constexpr u32 PASSPHRASE_KEY_LEN = 16;
-constexpr u32 PASSPHRASE_OUT_LEN = 4096;
-
-constexpr u8 SC_ISO_SERIES_KEY_1[PASSPHRASE_KEY_LEN] = {
-	0xD4, 0x13, 0xB8, 0x96, 0x63, 0xE1, 0xFE, 0x9F, 0x75, 0x14, 0x3D, 0x3B, 0xB4, 0x56, 0x52, 0x74 // D413B89663E1FE9F75143D3BB4565274
-};
-
-constexpr u8 SC_ISO_SERIES_KEY_2[PASSPHRASE_KEY_LEN] = {
-	0xFA, 0x72, 0xCE, 0xEF, 0x59, 0xB4, 0xD2, 0x98, 0x9F, 0x11, 0x19, 0x13, 0x28, 0x7F, 0x51, 0xC7 // FA72CEEF59B4D2989F111913287F51C7
-};
-
-constexpr u8 SC_KEY_FOR_MASTER_1[PASSPHRASE_KEY_LEN] = {
-	0xDA, 0xA4, 0xB9, 0xF2, 0xBC, 0x70, 0xB2, 0x80, 0xA7, 0xB3, 0x40, 0xFA, 0x0D, 0x04, 0xBA, 0x14 // DAA4B9F2BC70B280A7B340FA0D04BA14
-};
-
-constexpr u8 SC_KEY_FOR_MASTER_2[PASSPHRASE_KEY_LEN] = {
-	0x29, 0xC1, 0x94, 0xFF, 0xEC, 0x1F, 0xD1, 0x4D, 0x4A, 0xAE, 0x00, 0x6C, 0x32, 0xB3, 0x59, 0x90 // 29C194FFEC1FD14D4AAE006C32B35990
-};
-
-constexpr u8 SC_ISO_SERIES_INTERNAL_KEY_1[PASSPHRASE_KEY_LEN] = {
-	0x73, 0x63, 0x6B, 0x65, 0x79, 0x5F, 0x73, 0x65, 0x72, 0x69, 0x65, 0x73, 0x6B, 0x65, 0x79, 0x00 // 73636B65795F7365726965736B657900
-};
-
-constexpr u8 SC_ISO_SERIES_INTERNAL_KEY_2[PASSPHRASE_KEY_LEN] = {
-	0x73, 0x63, 0x6B, 0x65, 0x79, 0x5F, 0x73, 0x65, 0x72, 0x69, 0x65, 0x73, 0x6B, 0x65, 0x79, 0x32 // 73636B65795F7365726965736B657932
-};
-
-constexpr u8 SC_ISO_SERIES_INTERNAL_KEY_3[PASSPHRASE_KEY_LEN] = {
-	0x73, 0x63, 0x6B, 0x65, 0x79, 0x5F, 0x66, 0x6F, 0x72, 0x5F, 0x6D, 0x61, 0x73, 0x74, 0x65, 0x72 // 73636B65795F666F725F6D6173746572
-};
-
 constexpr u8 PKG_AES_KEY_IDU[0x10] = {
 	0x5d, 0xb9, 0x11, 0xe6, 0xb7, 0xe5, 0x0a, 0x7d, 0x32, 0x15, 0x38, 0xfd, 0x7c, 0x66, 0xf1, 0x7b
 };
@@ -211,104 +180,6 @@ constexpr u8 PUP_KEY[0x40] = {
 	0x30, 0xCE, 0x83, 0x66
 };
 
-                                             // name; location; notes
-constexpr s64 PAID_01 = 0x0003CD28CB47D3C1L; // spu_token_processor.self; CoreOS; Only for 2E - 083.007
-constexpr s64 PAID_02 = 0x1010000001000001L; // vsh / games / utilities; /dev_flash/, cell_root/target/images; only for 2E - 080.006
-constexpr s64 PAID_03 = 0x1010000001000003L; // retail games and their updates
-constexpr s64 PAID_04 = 0x1010000002000003L;
-constexpr s64 PAID_05 = 0x1020000401000001L; // ps2emu; /dev_flash/ps2emu; CEX DEX DECR ?
-constexpr s64 PAID_06 = 0x1050000003000001L; // lv2_kernel.self; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_07 = 0x1070000001000002L; // onicore_child.self; /dev_flash/vsh/module; same for CEX DEX DECR
-constexpr s64 PAID_08 = 0x1070000002000002L; // mcore.self; /dev_flash/vsh/module; same for CEX DEX DECR
-constexpr s64 PAID_09 = 0x1070000003000002L; // mgvideo.self; /dev_flash/vsh/module; same for CEX DEX DECR
-constexpr s64 PAID_10 = 0x1070000004000002L; // swagner / swreset; /dev_flash/vsh/module; DTCP-IP DRM modules
-constexpr s64 PAID_11 = 0x107000000E000001L; // vtrm_server.fself; lv1
-constexpr s64 PAID_12 = 0x107000000F000001L; // update_manager_server.fself; lv1
-constexpr s64 PAID_13 = 0x1070000010000001L; // sc_manager_server.fself; lv1
-constexpr s64 PAID_14 = 0x1070000011000001L; // secure_rtc_server.fself; lv1
-constexpr s64 PAID_15 = 0x1070000012000001L; // spm_server.fself; lv1
-constexpr s64 PAID_16 = 0x1070000013000001L; // sb_manager_server.fself; lv1
-constexpr s64 PAID_17 = 0x1070000014000001L; // framework.fself; lv1
-constexpr s64 PAID_18 = 0x1070000015000001L; // lv2_loader.fself; lv1
-constexpr s64 PAID_19 = 0x1070000016000001L; // profile_loader.fself; lv1
-constexpr s64 PAID_20 = 0x1070000017000001L; // ss_init.fself; lv1
-constexpr s64 PAID_21 = 0x1070000018000001L; // individual_info_mgr_server.fself; lv1
-constexpr s64 PAID_22 = 0x1070000019000001L; // app_info_manager_server.fself; lv1
-constexpr s64 PAID_23 = 0x107000001A000001L; // ss_sc_init_pu.fself; JIG lv1 proc
-constexpr s64 PAID_24 = 0x107000001C000001L; // updater_frontend.fself; lv1
-constexpr s64 PAID_25 = 0x107000001D000001L; // sysmgr_ss.fself; lv1
-constexpr s64 PAID_26 = 0x107000001F000001L; // sb_iso_spu_module.self; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_27 = 0x1070000020000001L; // sc_iso.self / sc_iso_factory.self; CoreOS / [2.43 JIG PUP]; same for CEX DEX DECR
-constexpr s64 PAID_28 = 0x1070000021000001L; // spp_verifier.self; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_29 = 0x1070000022000001L; // spu_pkg_rvk_verifier.self; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_30 = 0x1070000023000001L; // spu_token_processor.self; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_31 = 0x1070000024000001L; // sv_iso_spu_module.self; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_32 = 0x1070000025000001L; // aim_spu_module.self; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_33 = 0x1070000026000001L; // ss_sc_init.self; [2.43 JIG PUP]
-constexpr s64 PAID_34 = 0x1070000027000001L; // dispatcher.fself; lv1;
-constexpr s64 PAID_35 = 0x1070000028000001L; // factory_data_mngr_server.fself; JIG lv1 proc
-constexpr s64 PAID_36 = 0x1070000029000001L; // fdm_spu_module.self; [2.43 JIG PUP]
-constexpr s64 PAID_37 = 0x107000002A000001L;
-constexpr s64 PAID_38 = 0x1070000031000001L;
-constexpr s64 PAID_39 = 0x1070000032000001L; // ss_server1.fself; lv1
-constexpr s64 PAID_40 = 0x1070000033000001L; // ss_server2.fself; lv1
-constexpr s64 PAID_41 = 0x1070000034000001L; // ss_server3.fself; lv1
-constexpr s64 PAID_42 = 0x1070000037000001L; // mc_iso_spu_module.self; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_43 = 0x1070000039000001L; // bdp_bdmv.self; /dev_flash/bdplayer
-constexpr s64 PAID_44 = 0x107000003A000001L; // bdj.self; /dev_flash/bdplayer
-constexpr s64 PAID_45 = 0x1070000040000001L; // sys/external modules; /dev_flash/sys/external; same for CEX DEX DECR (incl. liblv2dbg_for_cex.sprx + liblv2dbg_for_dex.sprx)
-constexpr s64 PAID_46 = 0x1070000041000001L; // ps1emu; /dev_flash/ps1emu; CEX DEX DECR ?
-constexpr s64 PAID_47 = 0x1070000043000001L; // me_iso_spu_module.self; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_48 = 0x1070000044000001L; // (related to usb dongle)
-constexpr s64 PAID_49 = 0x1070000045000001L; // USB Dongle Authenticator; ss_server1.fself; same for CEX DEX DECR
-constexpr s64 PAID_50 = 0x1070000046000001L; // spu_mode_auth.self; [2.43 JIG PUP]
-constexpr s64 PAID_51 = 0x1070000047000001L; // otheros.self; otheros.self
-constexpr s64 PAID_52 = 0x1070000048000001L; // ftpd; cell_root/target/images; DECR
-constexpr s64 PAID_53 = 0x107000004C000001L; // spu_utoken_processor.self; CoreOS (since FW 2.40)
-constexpr s64 PAID_54 = 0x107000004E000001L; // (syscall 878)
-constexpr s64 PAID_55 = 0x107000004F000001L;
-constexpr s64 PAID_56 = 0x1070000050000001L;
-constexpr s64 PAID_57 = 0x1070000051000001L;
-constexpr s64 PAID_58 = 0x1070000052000001L; // sys/internal CEX + vsh/module modules CEX; /dev_flash/sys/internal + /dev_flash/vsh/module; Differs between CEX (this authid) and DECR
-constexpr s64 PAID_59 = 0x1070000054000001L; // (syscall 21)
-constexpr s64 PAID_60 = 0x1070000055000001L; // manu_info_spu_module.self; CoreOS (since FW 3.50)
-constexpr s64 PAID_61 = 0x1070000058000001L; // me_iso_for_ps2emu.self; CoreOS (since FW 3.70)
-constexpr s64 PAID_62 = 0x1070000059000001L; // sv_iso_for_ps2emu.self; CoreOS (since FW 3.70)
-constexpr s64 PAID_63 = 0x1070000300000001L; // Lv2diag.self; BD-remarry toolkit
-constexpr s64 PAID_64 = 0x10700003FC000001L; // emer_init.self; CoreOS (since FW 2.00)
-constexpr s64 PAID_65 = 0x10700003FD000001L; // ps3swu; PUP root; same for CEX DEX DECR
-constexpr s64 PAID_66 = 0x10700003FD000001L; // PS3ToolUpdater; cell_root/target/images; Only DECR
-constexpr s64 PAID_67 = 0x10700003FD000001L; // manufacturing_updater_for_reset.self; BD-remarry toolkit
-constexpr s64 PAID_68 = 0x10700003FE000001L; // sys_agent.self DECR; /dev_flash/sys/internal; DECR
-constexpr s64 PAID_69 = 0x10700003FF000001L; // db_backup, mkfs, mkfs_085, mount_hdd, registry_backup, set_monitor, most sys/internal modules DECR + most vsh/module modules DECR; /dev_flash/sys/internal + /dev_flash/vsh/module + cell_root/target/images; Differs between DECR (this authid) and CEX
-constexpr s64 PAID_70 = 0x1070000400000001L; // vsh / games / utilities; /dev_flash/, cell_root/target/images; only for 081.003 - 083.007
-constexpr s64 PAID_71 = 0x1070000409000001L; // psp_emulator.self; /dev_flash/pspemu/psp_emulator.self; CEX DEX DECR ?
-constexpr s64 PAID_72 = 0x107000040A000001L; // psp_translator.self; /dev_flash/pspemu/psp_translator.self; CEX DEX DECR ?
-constexpr s64 PAID_73 = 0x107000040B000001L; // emulator_api.sprx and other .sprx; /dev_flash/pspemu/release/; CEX DEX DECR ?
-constexpr s64 PAID_74 = 0x107000040C000001L; // emulator_drm.sprx; /dev_flash/pspemu/release/emulator_drm.sprx; CEX DEX DECR ?
-constexpr s64 PAID_75 = 0x107000040C000001L; // libchnnlsv.sprx; /dev_flash/sys/internal/; CEX DEX DECR ?
-constexpr s64 PAID_76 = 0x107000040D000001L; // ?psp related?; ?/dev_flash/pspemu/release/?; CEX DEX DECR ?
-constexpr s64 PAID_77 = 0x1070000500000001L; // cellftp; cell_root/target/images/; DECR
-constexpr s64 PAID_78 = 0x1070000501000001L; // hdd_copy.self; CoreOS (since FW 3.10)
-constexpr s64 PAID_79 = 0x10700005FC000001L; // sys_audio; /dev_flash/sys/internal; CEX
-constexpr s64 PAID_80 = 0x10700005FD000001L; // sys_init_osd; /dev_flash/sys/internal; CEX
-constexpr s64 PAID_81 = 0x10700005FF000001L; // vsh.self; /dev_flash/vsh/; CEX
-constexpr s64 PAID_82 = 0x1070001002000001L; // PvrRecSvr.sprx; BCJB95006\USRDIR\v320; CEX
-constexpr s64 PAID_83 = 0x1070200056000001L; // cachemgr.self; WebMAF apps/USRDIR
-constexpr s64 PAID_84 = 0x1070200057000001L; // EBOOT.BIN.self + .sprx files; WebMAF apps/USRDIR/prx/ps3; Demen_prx.ppu.sprx + WebMAF sprx files
-constexpr s64 PAID_85 = 0x1FF0000001000001L; // lv0; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_86 = 0x1FF0000002000001L; // lv1.self; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_87 = 0x1FF0000008000001L; // lv1ldr; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_88 = 0x1FF0000009000001L; // lv2ldr; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_89 = 0x1FF000000A000001L; // isoldr; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_90 = 0x1FF000000B000001L; // rvkldr; CoreOS; same for CEX DEX DECR
-constexpr s64 PAID_91 = 0x1FF000000C000001L; // appldr; CoreOS; same for CEX DEX DECR
-
-constexpr s64 LAID_1 = 0x1070000001000001L; // (= HV processes / SCE_CELLOS_PME); flash and vflash
-constexpr s64 LAID_2 = 0x1070000002000001L; // (= GameOS / PS3_LPAR); flash and vflash
-constexpr s64 LAID_3 = 0x1020000003000001L; // (= PS2_LPAR / PS2_GX_LPAR / PS2_SW_LPAR / PS2_NE_LPAR); (used in ps3vflashc region inside vflash in NOR consoles, and ps3db region)... dev_flash and dev_hdd0 regions
-constexpr s64 LAID_4 = 0x1080000004000001L; // (= LINUX_LPAR); (used in ps3vflashf region inside vflash in NOR consoles)... otheros bootloader region
-
 class KeyVault
 {
 	std::vector<SELF_KEY> sk_LV0_arr{};
@@ -319,13 +190,13 @@ class KeyVault
 	std::vector<SELF_KEY> sk_LDR_arr{};
 	std::vector<SELF_KEY> sk_UNK7_arr{};
 	std::vector<SELF_KEY> sk_NPDRM_arr{};
-	u8 klicensee_key[16]{};
+	std::unique_ptr<u8[]> klicensee_key{};
 
 public:
 	KeyVault();
 	SELF_KEY FindSelfKey(u32 type, u16 revision, u64 version);
-	void SetKlicenseeKey(const u8* key);
-	const u8* GetKlicenseeKey() const;
+	void SetKlicenseeKey(u8* key);
+	u8* GetKlicenseeKey() const;
 
 private:
 	void LoadSelfLV0Keys();
@@ -347,4 +218,4 @@ private:
 };
 
 // RAP to RIF function.
-void rap_to_rif(const unsigned char* rap, unsigned char* rif);
+void rap_to_rif(unsigned char* rap, unsigned char* rif);
diff --git a/rpcs3/Crypto/lz.cpp b/rpcs3/Crypto/lz.cpp
index f8a5aa0101..da2b05c361 100644
--- a/rpcs3/Crypto/lz.cpp
+++ b/rpcs3/Crypto/lz.cpp
@@ -2,8 +2,6 @@
 // Licensed under the terms of the GNU GPL, version 2.0 or later versions.
 // http://www.gnu.org/licenses/gpl-2.0.txt
 
-#include <string.h>
-#include <vector>
 #include "lz.h"
 
 void decode_range(unsigned int *range, unsigned int *code, unsigned char **src)
@@ -124,17 +122,19 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size)
 {
 	int result;
 
+	unsigned char *tmp = new unsigned char[0xCC8];
+
 	int offset = 0;
 	int bit_flag = 0;
 	int data_length = 0;
 	int data_offset = 0;
 
 	unsigned char *tmp_sect1, *tmp_sect2, *tmp_sect3;
-	const unsigned char *buf_start, *buf_end;
+	unsigned char *buf_start, *buf_end;
 	unsigned char prev = 0;
 
 	unsigned char *start = out;
-	const unsigned char *end = (out + size);
+	unsigned char *end = (out + size);
 	unsigned char head = in[0];
 
 	unsigned int range = 0xFFFFFFFF;
@@ -153,8 +153,6 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size)
 	else
 	{
 		// Set up a temporary buffer (sliding window).
-		std::vector<unsigned char> tmp_vec(0xCC8);
-		unsigned char* tmp = tmp_vec.data();
 		memset(tmp, 0x80, 0xCA8);
 		while (true)
 		{
@@ -255,12 +253,14 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size)
 				// Underflow.
 				if (buf_start < out)
 				{
+					delete[] tmp;
 					return -1;
 				}
 
 				// Overflow.
 				if (buf_end > end)
 				{
+					delete[] tmp;
 					return -1;
 				}
 
@@ -278,5 +278,6 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size)
 		}
 		result = static_cast<int>(start - out);
 	}
+	delete[] tmp;
 	return result;
 }
diff --git a/rpcs3/Crypto/lz.h b/rpcs3/Crypto/lz.h
index 5ad68ea66e..b8ad0f3a0e 100644
--- a/rpcs3/Crypto/lz.h
+++ b/rpcs3/Crypto/lz.h
@@ -6,6 +6,8 @@
 
 // Reverse-engineered custom Lempel–Ziv–Markov based compression.
 
+#include <string.h>
+
 void decode_range(unsigned int *range, unsigned int *code, unsigned char **src);
 int decode_bit(unsigned int *range, unsigned int *code, int *index, unsigned char **src, unsigned char *c);
 int decode_number(unsigned char *ptr, int index, int *bit_flag, unsigned int *range, unsigned int *code, unsigned char **src);
diff --git a/rpcs3/Crypto/unedat.cpp b/rpcs3/Crypto/unedat.cpp
index 1ffaa33fc3..756e5e7293 100644
--- a/rpcs3/Crypto/unedat.cpp
+++ b/rpcs3/Crypto/unedat.cpp
@@ -4,16 +4,17 @@
 #include "sha1.h"
 #include "lz.h"
 #include "ec.h"
-#include "utils.h"
 
-#include "Emu/system_utils.hpp"
+#include "Utilities/mutex.h"
+#include <cmath>
 
 #include "util/asm.hpp"
-#include <algorithm>
-#include <span>
 
 LOG_CHANNEL(edat_log, "EDAT");
 
+// Static variables are being modified concurrently in ec.cpp, for now use a mutex
+static shared_mutex ec_mtx;
+
 void generate_key(int crypto_mode, int version, unsigned char *key_final, unsigned char *iv_final, unsigned char *key, unsigned char *iv)
 {
 	int mode = crypto_mode & 0xF0000000;
@@ -67,7 +68,7 @@ void generate_hash(int hash_mode, int version, unsigned char *hash_final, unsign
 	};
 }
 
-bool decrypt(int hash_mode, int crypto_mode, int version, unsigned char *in, unsigned char *out, usz length, unsigned char *key, unsigned char *iv, unsigned char *hash, unsigned char *test_hash)
+bool decrypt(int hash_mode, int crypto_mode, int version, unsigned char *in, unsigned char *out, int length, unsigned char *key, unsigned char *iv, unsigned char *hash, unsigned char *test_hash)
 {
 	// Setup buffers for key, iv and hash.
 	unsigned char key_final[0x10] = {};
@@ -136,9 +137,9 @@ std::tuple<u64, s32, s32> dec_section(unsigned char* metadata)
 	dec[0x0E] = (metadata[0x6] ^ metadata[0x2] ^ metadata[0x1E]);
 	dec[0x0F] = (metadata[0x7] ^ metadata[0x3] ^ metadata[0x1F]);
 
-	u64 offset = read_from_ptr<be_t<u64>>(dec, 0);
-	s32 length = read_from_ptr<be_t<s32>>(dec, 8);
-	s32 compression_end = read_from_ptr<be_t<s32>>(dec, 12);
+	u64 offset = swap64(*reinterpret_cast<u64*>(&dec[0]));
+	s32 length = swap32(*reinterpret_cast<s32*>(&dec[8]));
+	s32 compression_end = swap32(*reinterpret_cast<s32*>(&dec[12]));
 
 	return std::make_tuple(offset, length, compression_end);
 }
@@ -150,7 +151,7 @@ u128 get_block_key(int block, NPD_HEADER *npd)
 	u128 dest_key{};
 	std::memcpy(&dest_key, src_key, 0xC);
 
-	s32 swappedBlock = std::bit_cast<be_t<s32>>(block);
+	s32 swappedBlock = swap32(block);
 	std::memcpy(reinterpret_cast<uchar*>(&dest_key) + 0xC, &swappedBlock, sizeof(swappedBlock));
 	return dest_key;
 }
@@ -158,55 +159,63 @@ u128 get_block_key(int block, NPD_HEADER *npd)
 // for out data, allocate a buffer the size of 'edat->block_size'
 // Also, set 'in file' to the beginning of the encrypted data, which may be offset if inside another file, but normally just reset to beginning of file
 // returns number of bytes written, -1 for error
-s64 decrypt_block(const fs::file* in, u8* out, EDAT_HEADER *edat, NPD_HEADER *npd, u8* crypt_key, u32 block_num, u32 total_blocks, u64 size_left, bool is_out_buffer_aligned = false)
+s64 decrypt_block(const fs::file* in, u8* out, EDAT_HEADER *edat, NPD_HEADER *npd, u8* crypt_key, u32 block_num, u32 total_blocks, u64 size_left)
 {
 	// Get metadata info and setup buffers.
 	const int metadata_section_size = ((edat->flags & EDAT_COMPRESSED_FLAG) != 0 || (edat->flags & EDAT_FLAG_0x20) != 0) ? 0x20 : 0x10;
 	const int metadata_offset = 0x100;
 
+	std::unique_ptr<u8[]> enc_data;
+	std::unique_ptr<u8[]> dec_data;
 	u8 hash[0x10] = { 0 };
 	u8 key_result[0x10] = { 0 };
 	u8 hash_result[0x14] = { 0 };
 
 	u64 offset = 0;
 	u64 metadata_sec_offset = 0;
-	u64 length = 0;
+	s32 length = 0;
 	s32 compression_end = 0;
 	unsigned char empty_iv[0x10] = {};
 
+	const u64 file_offset = in->pos();
+	memset(hash_result, 0, 0x14);
+
 	// Decrypt the metadata.
 	if ((edat->flags & EDAT_COMPRESSED_FLAG) != 0)
 	{
 		metadata_sec_offset = metadata_offset + u64{block_num} * metadata_section_size;
 
-		u8 metadata[0x20]{};
+		in->seek(file_offset + metadata_sec_offset);
 
-		in->read_at(metadata_sec_offset, metadata, 0x20);
+		unsigned char metadata[0x20];
+		memset(metadata, 0, 0x20);
+		in->read(metadata, 0x20);
 
 		// If the data is compressed, decrypt the metadata.
 		// NOTE: For NPD version 1 the metadata is not encrypted.
 		if (npd->version <= 1)
 		{
-			offset = read_from_ptr<be_t<u64>>(metadata, 0x10);
-			length = read_from_ptr<be_t<s32>>(metadata, 0x18);
-			compression_end = read_from_ptr<be_t<s32>>(metadata, 0x1C);
+			offset = swap64(*reinterpret_cast<u64*>(&metadata[0x10]));
+			length = swap32(*reinterpret_cast<s32*>(&metadata[0x18]));
+			compression_end = swap32(*reinterpret_cast<s32*>(&metadata[0x1C]));
 		}
 		else
 		{
 			std::tie(offset, length, compression_end) = dec_section(metadata);
 		}
 
-		std::memcpy(hash_result, metadata, 0x10);
+		memcpy(hash_result, metadata, 0x10);
 	}
 	else if ((edat->flags & EDAT_FLAG_0x20) != 0)
 	{
 		// If FLAG 0x20, the metadata precedes each data block.
 		metadata_sec_offset = metadata_offset + u64{block_num} * (metadata_section_size + edat->block_size);
+		in->seek(file_offset + metadata_sec_offset);
 
-		u8 metadata[0x20]{};
-		in->read_at(metadata_sec_offset, metadata, 0x20);
-
-		std::memcpy(hash_result, metadata, 0x14);
+		unsigned char metadata[0x20];
+		memset(metadata, 0, 0x20);
+		in->read(metadata, 0x20);
+		memcpy(hash_result, metadata, 0x14);
 
 		// If FLAG 0x20 is set, apply custom xor.
 		for (int j = 0; j < 0x10; j++)
@@ -221,9 +230,9 @@ s64 decrypt_block(const fs::file* in, u8* out, EDAT_HEADER *edat, NPD_HEADER *np
 	else
 	{
 		metadata_sec_offset = metadata_offset + u64{block_num} * metadata_section_size;
+		in->seek(file_offset + metadata_sec_offset);
 
-		in->read_at(metadata_sec_offset, hash_result, 0x10);
-
+		in->read(hash_result, 0x10);
 		offset = metadata_offset + u64{block_num} * edat->block_size + total_blocks * metadata_section_size;
 		length = edat->block_size;
 
@@ -232,82 +241,59 @@ s64 decrypt_block(const fs::file* in, u8* out, EDAT_HEADER *edat, NPD_HEADER *np
 	}
 
 	// Locate the real data.
-	const usz pad_length = length;
-	length = utils::align<usz>(pad_length, 0x10);
+	const int pad_length = length;
+	length = (pad_length + 0xF) & 0xFFFFFFF0;
 
 	// Setup buffers for decryption and read the data.
-	std::vector<u8> enc_data_buf(is_out_buffer_aligned || length == pad_length ? 0 : length);
-	std::vector<u8> dec_data_buf(length);
+	enc_data.reset(new u8[length]{ 0 });
+	dec_data.reset(new u8[length]{ 0 });
+	memset(hash, 0, 0x10);
+	memset(key_result, 0, 0x10);
 
-	// Try to use out buffer for file reads if no padding is needed instead of a new buffer
-	u8* enc_data = enc_data_buf.empty() ? out : enc_data_buf.data();
-
-	// Variable to avoid copies when possible
-	u8* dec_data = dec_data_buf.data();
-
-	std::memset(hash, 0, 0x10);
-	std::memset(key_result, 0, 0x10);
-
-	in->read_at(offset, enc_data, length);
+	in->seek(file_offset + offset);
+	in->read(enc_data.get(), length);
 
 	// Generate a key for the current block.
 	auto b_key = get_block_key(block_num, npd);
 
 	// Encrypt the block key with the crypto key.
 	aesecb128_encrypt(crypt_key, reinterpret_cast<uchar*>(&b_key), key_result);
-
 	if ((edat->flags & EDAT_FLAG_0x10) != 0)
-	{
 		aesecb128_encrypt(crypt_key, key_result, hash);  // If FLAG 0x10 is set, encrypt again to get the final hash.
-	}
 	else
-	{
-		std::memcpy(hash, key_result, 0x10);
-	}
+		memcpy(hash, key_result, 0x10);
 
 	// Setup the crypto and hashing mode based on the extra flags.
 	int crypto_mode = ((edat->flags & EDAT_FLAG_0x02) == 0) ? 0x2 : 0x1;
 	int hash_mode;
 
-	if ((edat->flags & EDAT_FLAG_0x10) == 0)
+	if ((edat->flags  & EDAT_FLAG_0x10) == 0)
 		hash_mode = 0x02;
 	else if ((edat->flags & EDAT_FLAG_0x20) == 0)
 		hash_mode = 0x04;
 	else
 		hash_mode = 0x01;
 
-	if ((edat->flags & EDAT_ENCRYPTED_KEY_FLAG) != 0)
+	if ((edat->flags  & EDAT_ENCRYPTED_KEY_FLAG) != 0)
 	{
 		crypto_mode |= 0x10000000;
 		hash_mode |= 0x10000000;
 	}
 
-	const bool should_decompress = ((edat->flags & EDAT_COMPRESSED_FLAG) != 0) && compression_end;
-
-	if ((edat->flags & EDAT_DEBUG_DATA_FLAG) != 0)
+	if ((edat->flags  & EDAT_DEBUG_DATA_FLAG) != 0)
 	{
 		// Reset the flags.
 		crypto_mode |= 0x01000000;
 		hash_mode |= 0x01000000;
-
 		// Simply copy the data without the header or the footer.
-		if (should_decompress)
-		{
-			std::memcpy(dec_data, enc_data, length);
-		}
-		else
-		{
-			// Optimize when decompression is not needed by avoiding 2 copies
-			dec_data = enc_data;
-		}
+		memcpy(dec_data.get(), enc_data.get(), length);
 	}
 	else
 	{
 		// IV is null if NPD version is 1 or 0.
 		u8* iv = (npd->version <= 1) ? empty_iv : npd->digest;
-
 		// Call main crypto routine on this data block.
-		if (!decrypt(hash_mode, crypto_mode, (npd->version == 4), enc_data, dec_data, length, key_result, iv, hash, hash_result))
+		if (!decrypt(hash_mode, crypto_mode, (npd->version == 4), enc_data.get(), dec_data.get(), length, key_result, iv, hash, hash_result))
 		{
 			edat_log.error("Block at offset 0x%llx has invalid hash!", offset);
 			return -1;
@@ -315,9 +301,9 @@ s64 decrypt_block(const fs::file* in, u8* out, EDAT_HEADER *edat, NPD_HEADER *np
 	}
 
 	// Apply additional de-compression if needed and write the decrypted data.
-	if (should_decompress)
+	if (((edat->flags & EDAT_COMPRESSED_FLAG) != 0) && compression_end)
 	{
-		const int res = decompress(out, dec_data, edat->block_size);
+		const int res = decompress(out, dec_data.get(), edat->block_size);
 
 		size_left -= res;
 
@@ -329,20 +315,42 @@ s64 decrypt_block(const fs::file* in, u8* out, EDAT_HEADER *edat, NPD_HEADER *np
 				return -1;
 			}
 		}
-
 		return res;
 	}
-
-	if (dec_data != out)
+	else
 	{
-		std::memcpy(out, dec_data, pad_length);
+		memcpy(out, dec_data.get(), pad_length);
+		return pad_length;
+	}
+}
+
+// EDAT/SDAT decryption.
+// reset file to beginning of data before calling
+int decrypt_data(const fs::file* in, const fs::file* out, EDAT_HEADER *edat, NPD_HEADER *npd, unsigned char* crypt_key, bool /*verbose*/)
+{
+	const int total_blocks = static_cast<int>((edat->file_size + edat->block_size - 1) / edat->block_size);
+	u64 size_left = edat->file_size;
+	std::unique_ptr<u8[]> data(new u8[edat->block_size]);
+
+	for (int i = 0; i < total_blocks; i++)
+	{
+		in->seek(0);
+		memset(data.get(), 0, edat->block_size);
+		u64 res = decrypt_block(in, data.get(), edat, npd, crypt_key, i, total_blocks, size_left);
+		if (res == umax)
+		{
+			edat_log.error("Decrypt Block failed!");
+			return 1;
+		}
+		size_left -= res;
+		out->write(data.get(), res);
 	}
 
-	return pad_length;
+	return 0;
 }
 
 // set file offset to beginning before calling
-bool check_data(u8* key, EDAT_HEADER* edat, NPD_HEADER* npd, const fs::file* f, bool verbose)
+int check_data(unsigned char *key, EDAT_HEADER *edat, NPD_HEADER *npd, const fs::file* f, bool verbose)
 {
 	u8 header[0xA0] = { 0 };
 	u8 empty_header[0xA0] = { 0 };
@@ -357,7 +365,7 @@ bool check_data(u8* key, EDAT_HEADER* edat, NPD_HEADER* npd, const fs::file* f,
 		if (edat->flags & 0x7EFFFFFE)
 		{
 			edat_log.error("Bad header flags!");
-			return false;
+			return 1;
 		}
 	}
 	else if (npd->version == 2)
@@ -365,7 +373,7 @@ bool check_data(u8* key, EDAT_HEADER* edat, NPD_HEADER* npd, const fs::file* f,
 		if (edat->flags & 0x7EFFFFE0)
 		{
 			edat_log.error("Bad header flags!");
-			return false;
+			return 1;
 		}
 	}
 	else if ((npd->version == 3) || (npd->version == 4))
@@ -373,13 +381,13 @@ bool check_data(u8* key, EDAT_HEADER* edat, NPD_HEADER* npd, const fs::file* f,
 		if (edat->flags & 0x7EFFFFC0)
 		{
 			edat_log.error("Bad header flags!");
-			return false;
+			return 1;
 		}
 	}
 	else
 	{
 		edat_log.error("Unknown version!");
-		return false;
+		return 1;
 	}
 
 	// Read in the file header.
@@ -415,7 +423,7 @@ bool check_data(u8* key, EDAT_HEADER* edat, NPD_HEADER* npd, const fs::file* f,
 		if ((edat->flags & EDAT_DEBUG_DATA_FLAG) != EDAT_DEBUG_DATA_FLAG)
 		{
 			edat_log.error("RAP/RIF/KLIC key is invalid!");
-			return false;
+			return 1;
 		}
 	}
 
@@ -427,35 +435,27 @@ bool check_data(u8* key, EDAT_HEADER* edat, NPD_HEADER* npd, const fs::file* f,
 			edat_log.warning("COMPRESSED data detected!");
 	}
 
-	if (!edat->block_size)
-	{
-		return false;
-	}
-
-	const usz block_num = utils::aligned_div<u64>(edat->file_size, edat->block_size);
-	constexpr usz metadata_offset = 0x100;
-	const usz metadata_size = utils::mul_saturate<u64>(metadata_section_size, block_num);
+	const int block_num = static_cast<int>((edat->file_size + edat->block_size - 1) / edat->block_size);
+	const int metadata_offset = 0x100;
+	const int metadata_size = metadata_section_size * block_num;
 	u64 metadata_section_offset = metadata_offset;
 
-	if (utils::add_saturate<u64>(utils::add_saturate<u64>(file_offset, metadata_section_offset), metadata_size) > f->size())
-	{
-		return false;
-	}
+	long bytes_read = 0;
+	long bytes_to_read = metadata_size;
+	std::unique_ptr<u8[]> metadata(new u8[metadata_size]);
+	std::unique_ptr<u8[]> empty_metadata(new u8[metadata_size]);
 
-	u64 bytes_read = 0;
-	const auto metadata = std::make_unique<u8[]>(metadata_size);
-	const auto empty_metadata = std::make_unique<u8[]>(metadata_size);
-
-	while (bytes_read < metadata_size)
+	while (bytes_to_read > 0)
 	{
 		// Locate the metadata blocks.
-		const usz offset = file_offset + metadata_section_offset;
+		f->seek(file_offset + metadata_section_offset);
 
 		// Read in the metadata.
-		f->read_at(offset, metadata.get() + bytes_read, metadata_section_size);
+		f->read(metadata.get() + bytes_read, metadata_section_size);
 
 		// Adjust sizes.
 		bytes_read += metadata_section_size;
+		bytes_to_read -= metadata_section_size;
 
 		if (((edat->flags & EDAT_FLAG_0x20) != 0)) // Metadata block before each data block.
 			metadata_section_offset += (metadata_section_size + edat->block_size);
@@ -481,37 +481,33 @@ bool check_data(u8* key, EDAT_HEADER* edat, NPD_HEADER* npd, const fs::file* f,
 		unsigned char signature_s[0x15] = { 0 };
 		unsigned char zero_buf[0x15] = { 0 };
 
+		std::lock_guard lock(ec_mtx);
+
 		// Setup ECDSA curve and public key.
 		ecdsa_set_curve(VSH_CURVE_P, VSH_CURVE_A, VSH_CURVE_B, VSH_CURVE_N, VSH_CURVE_GX, VSH_CURVE_GY);
 		ecdsa_set_pub(VSH_PUB);
 
 		// Read in the metadata and header signatures.
-		f->seek(0xB0);
+		f->seek(file_offset + 0xB0);
 		f->read(metadata_signature, 0x28);
 		f->read(header_signature, 0x28);
 
 		// Checking metadata signature.
 		// Setup signature r and s.
-		signature_r[0] = 0;
-		signature_s[0] = 0;
-		std::memcpy(signature_r + 1, metadata_signature, 0x14);
-		std::memcpy(signature_s + 1, metadata_signature + 0x14, 0x14);
-		if ((!std::memcmp(signature_r, zero_buf, 0x15)) || (!std::memcmp(signature_s, zero_buf, 0x15)))
-		{
+		memcpy(signature_r + 01, metadata_signature, 0x14);
+		memcpy(signature_s + 01, metadata_signature + 0x14, 0x14);
+		if ((!memcmp(signature_r, zero_buf, 0x15)) || (!memcmp(signature_s, zero_buf, 0x15)))
 			edat_log.warning("Metadata signature is invalid!");
-		}
 		else
 		{
 			// Setup signature hash.
 			if ((edat->flags & EDAT_FLAG_0x20) != 0) //Sony failed again, they used buffer from 0x100 with half size of real metadata.
 			{
-				const usz metadata_buf_size = block_num * 0x10;
-
-				std::vector<u8> metadata_buf(metadata_buf_size);
-
-				f->read_at(file_offset + metadata_offset, metadata_buf.data(), metadata_buf_size);
-
-				sha1(metadata_buf.data(), metadata_buf_size, signature_hash);
+				int metadata_buf_size = block_num * 0x10;
+				std::unique_ptr<u8[]> metadata_buf(new u8[metadata_buf_size]);
+				f->seek(file_offset + metadata_offset);
+				f->read(metadata_buf.get(), metadata_buf_size);
+				sha1(metadata_buf.get(), metadata_buf_size, signature_hash);
 			}
 			else
 				sha1(metadata.get(), metadata_size, signature_hash);
@@ -526,23 +522,20 @@ bool check_data(u8* key, EDAT_HEADER* edat, NPD_HEADER* npd, const fs::file* f,
 
 		// Checking header signature.
 		// Setup header signature r and s.
-		signature_r[0] = 0;
-		signature_s[0] = 0;
-		std::memcpy(signature_r + 1, header_signature, 0x14);
-		std::memcpy(signature_s + 1, header_signature + 0x14, 0x14);
+		memset(signature_r, 0, 0x15);
+		memset(signature_s, 0, 0x15);
+		memcpy(signature_r + 01, header_signature, 0x14);
+		memcpy(signature_s + 01, header_signature + 0x14, 0x14);
 
-		if ((!std::memcmp(signature_r, zero_buf, 0x15)) || (!std::memcmp(signature_s, zero_buf, 0x15)))
-		{
+		if ((!memcmp(signature_r, zero_buf, 0x15)) || (!memcmp(signature_s, zero_buf, 0x15)))
 			edat_log.warning("Header signature is invalid!");
-		}
 		else
 		{
 			// Setup header signature hash.
-			std::memset(signature_hash, 0, 20);
-
-			u8 header_buf[0xD8]{};
-
-			f->read_at(file_offset, header_buf, 0xD8);
+			memset(signature_hash, 0, 20);
+			u8 header_buf[0xD8];
+			f->seek(file_offset);
+			f->read(header_buf, 0xD8);
 			sha1(header_buf, 0xD8, signature_hash);
 
 			if (!ecdsa_verify(signature_hash, signature_r, signature_s))
@@ -550,33 +543,34 @@ bool check_data(u8* key, EDAT_HEADER* edat, NPD_HEADER* npd, const fs::file* f,
 		}
 	}
 
-	return true;
+	return 0;
 }
 
 bool validate_dev_klic(const u8* klicensee, NPD_HEADER *npd)
 {
-	if ((npd->license & 0x3) != 0x3)
-	{
-		return true;
-	}
-
-	unsigned char dev[0x60]{};
+	unsigned char dev[0x60] = { 0 };
 
 	// Build the dev buffer (first 0x60 bytes of NPD header in big-endian).
-	std::memcpy(dev, npd, 0x60);
+	memcpy(dev, npd, 0x60);
 
 	// Fix endianness.
-	s32 version = std::bit_cast<be_t<s32>>(npd->version);
-	s32 license = std::bit_cast<be_t<s32>>(npd->license);
-	s32 type = std::bit_cast<be_t<s32>>(npd->type);
-	std::memcpy(dev + 0x4, &version, 4);
-	std::memcpy(dev + 0x8, &license, 4);
-	std::memcpy(dev + 0xC, &type, 4);
+	int version = swap32(npd->version);
+	int license = swap32(npd->license);
+	int type = swap32(npd->type);
+	memcpy(dev + 0x4, &version, 4);
+	memcpy(dev + 0x8, &license, 4);
+	memcpy(dev + 0xC, &type, 4);
 
 	// Check for an empty dev_hash (can't validate if devklic is NULL);
 	u128 klic;
 	std::memcpy(&klic, klicensee, sizeof(klic));
 
+	if (!klic)
+	{
+		// Allow empty dev hash.
+		return true;
+	}
+
 	// Generate klicensee xor key.
 	u128 key = klic ^ std::bit_cast<u128>(NP_OMAC_KEY_2);
 
@@ -584,25 +578,15 @@ bool validate_dev_klic(const u8* klicensee, NPD_HEADER *npd)
 	return cmac_hash_compare(reinterpret_cast<uchar*>(&key), 0x10, dev, 0x60, npd->dev_hash, 0x10);
 }
 
-bool validate_npd_hashes(std::string_view file_name, const u8* klicensee, NPD_HEADER* npd, EDAT_HEADER* edat, bool verbose)
+bool validate_npd_hashes(const char* file_name, const u8* klicensee, NPD_HEADER *npd, bool verbose)
 {
-	// Ignore header validation in DEBUG data.
-	if (edat->flags & EDAT_DEBUG_DATA_FLAG)
+	if (!file_name)
 	{
-		return true;
+		fmt::throw_exception("Empty filename");
 	}
 
-	if (!validate_dev_klic(klicensee, npd))
-	{
-		return false;
-	}
-
-	if (file_name.empty())
-	{
-		return true;
-	}
-
-	const usz buf_len = 0x30 + file_name.size();
+	const usz file_name_length = std::strlen(file_name);
+	const usz buf_len = 0x30 + file_name_length;
 
 	std::unique_ptr<u8[]> buf(new u8[buf_len]);
 	std::unique_ptr<u8[]> buf_lower(new u8[buf_len]);
@@ -610,16 +594,14 @@ bool validate_npd_hashes(std::string_view file_name, const u8* klicensee, NPD_HE
 
 	// Build the title buffer (content_id + file_name).
 	std::memcpy(buf.get(), npd->content_id, 0x30);
-	std::memcpy(buf.get() + 0x30, file_name.data(), file_name.size());
+	std::memcpy(buf.get() + 0x30, file_name, file_name_length);
 
 	std::memcpy(buf_lower.get(), buf.get(), buf_len);
 	std::memcpy(buf_upper.get(), buf.get(), buf_len);
 
-	const auto buf_span = std::span(buf.get(), buf.get() + buf_len);
-	const auto it = std::find(buf_span.rbegin(), buf_span.rend() - 0x30, '.');
-	for (usz i = std::distance(it, buf_span.rend()) - 1; i < buf_len; ++i)
+	for (usz i = std::basic_string_view<u8>(buf.get() + 0x30, file_name_length).find_last_of('.'); i < buf_len; i++)
 	{
-		const u8 c = buf[i];
+		const u8 c = static_cast<u8>(buf[i]);
 		buf_upper[i] = std::toupper(c);
 		buf_lower[i] = std::tolower(c);
 	}
@@ -639,32 +621,155 @@ bool validate_npd_hashes(std::string_view file_name, const u8* klicensee, NPD_HE
 			edat_log.warning("NPD title hash is invalid!");
 	}
 
-	return title_hash_result;
+	const bool dev_hash_result = validate_dev_klic(klicensee, npd);
+
+	return title_hash_result && dev_hash_result;
 }
 
 void read_npd_edat_header(const fs::file* input, NPD_HEADER& NPD, EDAT_HEADER& EDAT)
 {
-	char npd_header[0x80]{};
-	char edat_header[0x10]{};
+	char npd_header[0x80];
+	char edat_header[0x10];
+	input->read(npd_header, sizeof(npd_header));
+	input->read(edat_header, sizeof(edat_header));
 
-	usz pos = input->pos();
-	pos += input->read_at(pos, npd_header, sizeof(npd_header));
-	input->read_at(pos, edat_header, sizeof(edat_header));
+	memcpy(&NPD.magic, npd_header, 4);
+	NPD.version = swap32(*reinterpret_cast<s32*>(&npd_header[4]));
+	NPD.license = swap32(*reinterpret_cast<s32*>(&npd_header[8]));
+	NPD.type = swap32(*reinterpret_cast<s32*>(&npd_header[12]));
+	memcpy(NPD.content_id, &npd_header[16], 0x30);
+	memcpy(NPD.digest, &npd_header[64], 0x10);
+	memcpy(NPD.title_hash, &npd_header[80], 0x10);
+	memcpy(NPD.dev_hash, &npd_header[96], 0x10);
+	NPD.unk1 = swap64(*reinterpret_cast<u64*>(&npd_header[112]));
+	NPD.unk2 = swap64(*reinterpret_cast<u64*>(&npd_header[120]));
 
-	std::memcpy(&NPD.magic, npd_header, 4);
-	NPD.version = read_from_ptr<be_t<s32>>(npd_header, 4);
-	NPD.license = read_from_ptr<be_t<s32>>(npd_header, 8);
-	NPD.type = read_from_ptr<be_t<s32>>(npd_header, 12);
-	std::memcpy(NPD.content_id, &npd_header[16], 0x30);
-	std::memcpy(NPD.digest, &npd_header[64], 0x10);
-	std::memcpy(NPD.title_hash, &npd_header[80], 0x10);
-	std::memcpy(NPD.dev_hash, &npd_header[96], 0x10);
-	NPD.activate_time = read_from_ptr<be_t<s64>>(npd_header, 112);
-	NPD.expire_time = read_from_ptr<be_t<s64>>(npd_header, 120);
+	EDAT.flags = swap32(*reinterpret_cast<s32*>(&edat_header[0]));
+	EDAT.block_size = swap32(*reinterpret_cast<s32*>(&edat_header[4]));
+	EDAT.file_size = swap64(*reinterpret_cast<u64*>(&edat_header[8]));
+}
 
-	EDAT.flags = read_from_ptr<be_t<s32>>(edat_header, 0);
-	EDAT.block_size = read_from_ptr<be_t<s32>>(edat_header, 4);
-	EDAT.file_size = read_from_ptr<be_t<u64>>(edat_header, 8);
+bool extract_all_data(const fs::file* input, const fs::file* output, const char* input_file_name, unsigned char* devklic, unsigned char* rifkey, bool verbose)
+{
+	// Setup NPD and EDAT/SDAT structs.
+	NPD_HEADER NPD;
+	EDAT_HEADER EDAT;
+
+	// Read in the NPD and EDAT/SDAT headers.
+	read_npd_edat_header(input, NPD, EDAT);
+
+	unsigned char npd_magic[4] = {0x4E, 0x50, 0x44, 0x00};  //NPD0
+	if (memcmp(&NPD.magic, npd_magic, 4))
+	{
+		edat_log.error("%s has invalid NPD header or already decrypted.", input_file_name);
+		return true;
+	}
+
+	if (verbose)
+	{
+		edat_log.notice("NPD HEADER");
+		edat_log.notice("NPD version: %d", NPD.version);
+		edat_log.notice("NPD license: %d", NPD.license);
+		edat_log.notice("NPD type: %d", NPD.type);
+	}
+
+	// Set decryption key.
+	u128 key{};
+
+	// Check EDAT/SDAT flag.
+	if ((EDAT.flags & SDAT_FLAG) == SDAT_FLAG)
+	{
+		if (verbose)
+		{
+			edat_log.notice("SDAT HEADER");
+			edat_log.notice("SDAT flags: 0x%08X", EDAT.flags);
+			edat_log.notice("SDAT block size: 0x%08X", EDAT.block_size);
+			edat_log.notice("SDAT file size: 0x%08X", EDAT.file_size);
+		}
+
+		// Generate SDAT key.
+		key = std::bit_cast<u128>(NPD.dev_hash) ^ std::bit_cast<u128>(SDAT_KEY);
+	}
+	else
+	{
+		if (verbose)
+		{
+			edat_log.notice("EDAT HEADER");
+			edat_log.notice("EDAT flags: 0x%08X", EDAT.flags);
+			edat_log.notice("EDAT block size: 0x%08X", EDAT.block_size);
+			edat_log.notice("EDAT file size: 0x%08X", EDAT.file_size);
+		}
+
+		// Perform header validation (EDAT only).
+		char real_file_name[CRYPTO_MAX_PATH];
+		extract_file_name(input_file_name, real_file_name);
+		if (!validate_npd_hashes(real_file_name, devklic, &NPD, verbose))
+		{
+			// Ignore header validation in DEBUG data.
+			if ((EDAT.flags & EDAT_DEBUG_DATA_FLAG) != EDAT_DEBUG_DATA_FLAG)
+			{
+				edat_log.error("NPD hash validation failed!");
+				return true;
+			}
+		}
+
+		// Select EDAT key.
+		if ((NPD.license & 0x3) == 0x3)           // Type 3: Use supplied devklic.
+			memcpy(&key, devklic, 0x10);
+		else if ((NPD.license & 0x2) == 0x2)      // Type 2: Use key from RAP file (RIF key).
+		{
+			memcpy(&key, rifkey, 0x10);
+
+			// Make sure we don't have an empty RIF key.
+			if (!key)
+			{
+				edat_log.error("A valid RAP file is needed for this EDAT file! (local activation)");
+				return true;
+			}
+		}
+		else if ((NPD.license & 0x1) == 0x1)      // Type 1: Use network activation.
+		{
+			memcpy(&key, rifkey, 0x10);
+
+			// Make sure we don't have an empty RIF key.
+			if (!key)
+			{
+				edat_log.error("A valid RAP file is needed for this EDAT file! (network activation)");
+				return true;
+			}
+		}
+
+		if (verbose)
+		{
+			be_t<u128> data;
+
+			std::memcpy(&data, devklic, sizeof(data));
+			edat_log.notice("DEVKLIC: %s", data);
+			std::memcpy(&data, rifkey, sizeof(data));
+			edat_log.notice("RIF KEY: %s", data);
+		}
+	}
+
+	if (verbose)
+	{
+		edat_log.notice("DECRYPTION KEY: %s", std::bit_cast<be_t<u128>>(key));
+	}
+
+	input->seek(0);
+	if (check_data(reinterpret_cast<uchar*>(&key), &EDAT, &NPD, input, verbose))
+	{
+		edat_log.error("Data parsing failed!");
+		return true;
+	}
+
+	input->seek(0);
+	if (decrypt_data(input, output, &EDAT, &NPD, reinterpret_cast<uchar*>(&key), verbose))
+	{
+		edat_log.error("Data decryption failed!");
+		return true;
+	}
+
+	return false;
 }
 
 u128 GetEdatRifKeyFromRapFile(const fs::file& rap_file)
@@ -674,12 +779,12 @@ u128 GetEdatRifKeyFromRapFile(const fs::file& rap_file)
 
 	rap_file.read<u128>(rapkey);
 
-	rap_to_rif(reinterpret_cast<const uchar*>(&rapkey), reinterpret_cast<uchar*>(&rifkey));
+	rap_to_rif(reinterpret_cast<uchar*>(&rapkey), reinterpret_cast<uchar*>(&rifkey));
 
 	return rifkey;
 }
 
-bool VerifyEDATHeaderWithKLicense(const fs::file& input, const std::string& input_file_name, const u8* custom_klic, NPD_HEADER* npd_out)
+bool VerifyEDATHeaderWithKLicense(const fs::file& input, const std::string& input_file_name, const u8* custom_klic, std::string* contentID)
 {
 	// Setup NPD and EDAT/SDAT structs.
 	NPD_HEADER NPD;
@@ -688,7 +793,8 @@ bool VerifyEDATHeaderWithKLicense(const fs::file& input, const std::string& inpu
 	// Read in the NPD and EDAT/SDAT headers.
 	read_npd_edat_header(&input, NPD, EDAT);
 
-	if (NPD.magic != "NPD\0"_u32)
+	unsigned char npd_magic[4] = { 0x4E, 0x50, 0x44, 0x00 };  //NPD0
+	if (memcmp(&NPD.magic, npd_magic, 4))
 	{
 		edat_log.error("%s has invalid NPD header or already decrypted.", input_file_name);
 		return false;
@@ -701,34 +807,30 @@ bool VerifyEDATHeaderWithKLicense(const fs::file& input, const std::string& inpu
 	}
 
 	// Perform header validation (EDAT only).
-	char real_file_name[CRYPTO_MAX_PATH]{};
+	char real_file_name[CRYPTO_MAX_PATH];
 	extract_file_name(input_file_name.c_str(), real_file_name);
-	if (!validate_npd_hashes(real_file_name, custom_klic, &NPD, &EDAT, false))
+	if (!validate_npd_hashes(real_file_name, custom_klic, &NPD, false))
 	{
-		edat_log.error("NPD hash validation failed!");
-		return false;
-	}
-
-	if (npd_out)
-	{
-		*npd_out = NPD;
+		// Ignore header validation in DEBUG data.
+		if ((EDAT.flags & EDAT_DEBUG_DATA_FLAG) != EDAT_DEBUG_DATA_FLAG)
+		{
+			edat_log.error("NPD hash validation failed!");
+			return false;
+		}
 	}
 
+	*contentID = std::string(reinterpret_cast<const char*>(NPD.content_id));
 	return true;
 }
 
 // Decrypts full file
-fs::file DecryptEDAT(const fs::file& input, const std::string& input_file_name, int mode, u8 *custom_klic)
+fs::file DecryptEDAT(const fs::file& input, const std::string& input_file_name, int mode, const std::string& rap_file_name, u8 *custom_klic, bool verbose)
 {
-	if (!input)
-	{
-		return {};
-	}
-
 	// Prepare the files.
 	input.seek(0);
 
-	// Set DEVKLIC
+	// Set keys (RIF and DEVKLIC).
+	u128 rifKey{};
 	u128 devklic{};
 
 	// Select the EDAT key mode.
@@ -773,30 +875,35 @@ fs::file DecryptEDAT(const fs::file& input, const std::string& input_file_name,
 		return fs::file{};
 	}
 
-	// Delete the bad output file if any errors arise.
-	auto data = std::make_unique<EDATADecrypter>(input, devklic, input_file_name, false);
-
-	if (!data->ReadHeader())
+	// Read the RAP file, if provided.
+	if (!rap_file_name.empty())
 	{
+		const fs::file rap(rap_file_name);
+
+		rifKey = GetEdatRifKeyFromRapFile(rap);
+	}
+
+	// Delete the bad output file if any errors arise.
+	fs::file output = fs::make_stream<std::vector<u8>>();
+	if (extract_all_data(&input, &output, input_file_name.c_str(), reinterpret_cast<uchar*>(&devklic), reinterpret_cast<uchar*>(&rifKey), verbose))
+	{
+		output.release();
 		return fs::file{};
 	}
 
-	fs::file output;
-	output.reset(std::move(data));
-
+	output.seek(0);
 	return output;
 }
 
 bool EDATADecrypter::ReadHeader()
 {
 	edata_file.seek(0);
-
 	// Read in the NPD and EDAT/SDAT headers.
 	read_npd_edat_header(&edata_file, npdHeader, edatHeader);
 
-	if (npdHeader.magic != "NPD\0"_u32)
+	unsigned char npd_magic[4] = { 0x4E, 0x50, 0x44, 0x00 };  //NPD0
+	if (memcmp(&npdHeader.magic, npd_magic, 4))
 	{
-		edat_log.error("Not an NPDRM file");
 		return false;
 	}
 
@@ -808,44 +915,33 @@ bool EDATADecrypter::ReadHeader()
 	}
 	else
 	{
-		// extract key from RIF
-		char real_file_name[CRYPTO_MAX_PATH]{};
-		extract_file_name(m_file_name.c_str(), real_file_name);
-
-		if (!validate_npd_hashes(real_file_name, reinterpret_cast<const u8*>(&dec_key), &npdHeader, &edatHeader, false))
+		// verify key
+		if (!validate_dev_klic(reinterpret_cast<uchar*>(&dev_key), &npdHeader))
 		{
-			edat_log.error("NPD hash validation failed!");
-			return true;
+			edat_log.error("Failed validating klic");
+			return false;
 		}
 
 		// Select EDAT key.
-		if (m_is_key_final)
+		if ((npdHeader.license & 0x3) == 0x3)           // Type 3: Use supplied devklic.
+			dec_key = std::move(dev_key);
+		else if ((npdHeader.license & 0x2) == 0x2)      // Type 2: Use key from RAP file (RIF key).
 		{
-			// Already provided
-		}
-		// Type 3: Use supplied dec_key.
-		else if ((npdHeader.license & 0x3) == 0x3)
-		{
-			//
-		}
-		// Type 2: Use key from RAP file (RIF key). (also used for type 1 at the moment)
-		else 
-		{
-			const std::string rap_path = rpcs3::utils::get_rap_file_path(npdHeader.content_id);
+			dec_key = std::move(rif_key);
 
-			if (fs::file rap{rap_path}; rap && rap.size() >= sizeof(dec_key))
-			{
-				dec_key = GetEdatRifKeyFromRapFile(rap);
-			}
-
-			// Make sure we don't have an empty RIF key.
 			if (!dec_key)
 			{
-				edat_log.error("A valid RAP file is needed for this EDAT file! (license=%d)", npdHeader.license);
-				return true;
+				edat_log.warning("Empty Dec key for local activation!");
 			}
+		}
+		else if ((npdHeader.license & 0x1) == 0x1)      // Type 1: Use network activation.
+		{
+			dec_key = std::move(rif_key);
 
-			edat_log.trace("RIFKEY: %s", std::bit_cast<be_t<u128>>(dec_key));
+			if (!dec_key)
+			{
+				edat_log.warning("Empty Dec key for network activation!");
+			}
 		}
 	}
 
@@ -853,74 +949,52 @@ bool EDATADecrypter::ReadHeader()
 
 	// k the ecdsa_verify function in this check_data function takes a ridiculous amount of time
 	// like it slows down load time by a factor of x20, at least, so its ignored for now
-	//if (!check_data(reinterpret_cast<u8*>(&dec_key), &edatHeader, &npdHeader, &edata_file, false))
-	//{
-	//	edat_log.error("NPDRM check_data() failed!");
-	//	return false;
-	//}
+
+	/*if (check_data(dec_key._bytes, &edatHeader, &npdHeader, &sdata_file, false))
+	{
+		return false;
+	}*/
 
 	file_size = edatHeader.file_size;
-	total_blocks = ::narrow<u32>(utils::aligned_div(edatHeader.file_size, edatHeader.block_size));
-
-	// Try decrypting the first block instead
-	u8 data_sample[1];
-
-	if (file_size && !ReadData(0, data_sample, 1))
-	{
-		edat_log.error("NPDRM ReadData() failed!");
-		return false;
-	}
+	total_blocks = utils::aligned_div(edatHeader.file_size, edatHeader.block_size);
 
 	return true;
 }
 
 u64 EDATADecrypter::ReadData(u64 pos, u8* data, u64 size)
 {
-	size = std::min<u64>(size, pos > edatHeader.file_size ? 0 : edatHeader.file_size - pos);
-
-	if (!size)
-	{
+	if (pos > edatHeader.file_size)
 		return 0;
-	}
 
-	// Now we need to offset things to account for the actual 'range' requested
+	// now we need to offset things to account for the actual 'range' requested
 	const u64 startOffset = pos % edatHeader.block_size;
 
-	const u64 num_blocks = utils::aligned_div(startOffset + size, edatHeader.block_size);
-
-	// Find and decrypt block range covering pos + size
-	const u32 starting_block = ::narrow<u32>(pos / edatHeader.block_size);
-	const u32 ending_block = ::narrow<u32>(std::min<u64>(starting_block + num_blocks, total_blocks));
-
-	u64 writeOffset = 0;
-
-	std::vector<u8> data_buf(edatHeader.block_size + 16);
-
-	for (u32 i = starting_block; i < ending_block; i++)
+	const u32 num_blocks = static_cast<u32>(utils::aligned_div(startOffset + size, edatHeader.block_size));
+	const u64 bufSize = num_blocks*edatHeader.block_size;
+	if (data_buf_size < (bufSize))
 	{
-		u64 res = decrypt_block(&edata_file, data_buf.data(), &edatHeader, &npdHeader, reinterpret_cast<uchar*>(&dec_key), i, total_blocks, edatHeader.file_size, true);
+		data_buf.reset(new u8[bufSize]);
+		data_buf_size = bufSize;
+	}
 
+	// find and decrypt block range covering pos + size
+	const u32 starting_block = static_cast<u32>(pos / edatHeader.block_size);
+	const u32 ending_block = std::min(starting_block + num_blocks, total_blocks);
+	u64 writeOffset = 0;
+	for (u32 i = starting_block; i < ending_block; ++i)
+	{
+		edata_file.seek(0);
+		u64 res = decrypt_block(&edata_file, &data_buf[writeOffset], &edatHeader, &npdHeader, reinterpret_cast<uchar*>(&dec_key), i, total_blocks, edatHeader.file_size);
 		if (res == umax)
 		{
 			edat_log.error("Error Decrypting data");
 			return 0;
 		}
-
-		const usz skip_start = (i == starting_block ? startOffset : 0);
-
-		if (skip_start >= res)
-		{
-			break;
-		}
-
-		const usz end_pos = (i != total_blocks - 1 ? edatHeader.block_size : (edatHeader.file_size - 1) % edatHeader.block_size + 1);
-		const usz read_end = std::min<usz>(res, i == ending_block - 1 ? std::min<usz>(end_pos, (startOffset + size - 1) % edatHeader.block_size + 1) : end_pos);
-
-		std::memcpy(data + writeOffset, data_buf.data() + skip_start, read_end - skip_start);
-		std::memset(data_buf.data(), 0, read_end - skip_start);
-
-		writeOffset += read_end - skip_start;
+		writeOffset += res;
 	}
 
-	return writeOffset;
+	const u64 bytesWrote = std::min<u64>(writeOffset - startOffset, size);
+
+	memcpy(data, &data_buf[startOffset], bytesWrote);
+	return bytesWrote;
 }
diff --git a/rpcs3/Crypto/unedat.h b/rpcs3/Crypto/unedat.h
index 31fce60d4e..2c6a70d63e 100644
--- a/rpcs3/Crypto/unedat.h
+++ b/rpcs3/Crypto/unedat.h
@@ -1,6 +1,9 @@
 #pragma once
 
 #include <array>
+
+#include "utils.h"
+
 #include "Utilities/File.h"
 
 constexpr u32 SDAT_FLAG = 0x01000000;
@@ -13,28 +16,9 @@ constexpr u32 EDAT_DEBUG_DATA_FLAG = 0x80000000;
 
 struct loaded_npdrm_keys
 {
-	atomic_t<u128> dec_keys[16]{};
-	atomic_t<u64> dec_keys_pos = 0;
-	u128 one_time_key{}; // For savestates
+	atomic_t<u128> devKlic{};
+	atomic_t<u128> rifKey{};
 	atomic_t<u32> npdrm_fds{0};
-
-	void install_decryption_key(u128 key)
-	{
-		dec_keys_pos.atomic_op([&](u64& pos) { dec_keys[pos++ % std::size(dec_keys)] = key; });
-	}
-
-	// TODO: Check if correct for ELF files usage
-	u128 last_key(usz backwards = 0) const
-	{
-		backwards++;
-		const usz pos = dec_keys_pos;
-		return pos >= backwards ? dec_keys[(pos - backwards) % std::size(dec_keys)].load() : u128{};
-	}
-
-	SAVESTATE_INIT_POS(2);
-	loaded_npdrm_keys() = default;
-	loaded_npdrm_keys(utils::serial& ar);
-	void save(utils::serial& ar);
 };
 
 struct NPD_HEADER
@@ -43,12 +27,12 @@ struct NPD_HEADER
 	s32 version;
 	s32 license;
 	s32 type;
-	char content_id[0x30];
+	u8 content_id[0x30];
 	u8 digest[0x10];
 	u8 title_hash[0x10];
 	u8 dev_hash[0x10];
-	s64 activate_time;
-	s64 expire_time;
+	u64 unk1;
+	u64 unk2;
 };
 
 struct EDAT_HEADER
@@ -59,20 +43,16 @@ struct EDAT_HEADER
 };
 
 // Decrypts full file, or null/empty file
-extern fs::file DecryptEDAT(const fs::file& input, const std::string& input_file_name, int mode, u8 *custom_klic);
+extern fs::file DecryptEDAT(const fs::file& input, const std::string& input_file_name, int mode, const std::string& rap_file_name, u8 *custom_klic, bool verbose);
 
-extern void read_npd_edat_header(const fs::file* input, NPD_HEADER& NPD, EDAT_HEADER& EDAT);
-extern bool VerifyEDATHeaderWithKLicense(const fs::file& input, const std::string& input_file_name, const u8* custom_klic, NPD_HEADER *npd_out = nullptr);
+extern bool VerifyEDATHeaderWithKLicense(const fs::file& input, const std::string& input_file_name, const u8* custom_klic, std::string* contentID);
 
 u128 GetEdatRifKeyFromRapFile(const fs::file& rap_file);
 
 struct EDATADecrypter final : fs::file_base
 {
 	// file stream
-	fs::file m_edata_file;
-	const fs::file& edata_file;
-	std::string m_file_name;
-	bool m_is_key_final = true;
+	const fs::file edata_file;
 	u64 file_size{0};
 	u32 total_blocks{0};
 	u64 pos{0};
@@ -80,36 +60,39 @@ struct EDATADecrypter final : fs::file_base
 	NPD_HEADER npdHeader{};
 	EDAT_HEADER edatHeader{};
 
+	// Internal data buffers.
+	std::unique_ptr<u8[]> data_buf{};
+	u64 data_buf_size{0};
+
 	u128 dec_key{};
 
+	// edat usage
+	u128 rif_key{};
+	u128 dev_key{};
 public:
-	EDATADecrypter(fs::file&& input, u128 dec_key = {}, std::string file_name = {}, bool is_key_final = true) noexcept
-		: m_edata_file(std::move(input))
-		, edata_file(m_edata_file)
-		, m_file_name(std::move(file_name))
-		, m_is_key_final(is_key_final)
-		, dec_key(dec_key)
-	{
-	}
-
-	EDATADecrypter(const fs::file& input, u128 dec_key = {}, std::string file_name = {}, bool is_key_final = true) noexcept
-		: m_edata_file(fs::file{})
-		, edata_file(input)
-		, m_file_name(std::move(file_name))
-		, m_is_key_final(is_key_final)
-		, dec_key(dec_key)
-	{
-	}
+	// SdataByFd usage
+	EDATADecrypter(fs::file&& input)
+		: edata_file(std::move(input)) {}
+	// Edat usage
+	EDATADecrypter(fs::file&& input, const u128& dev_key, const u128& rif_key)
+		: edata_file(std::move(input))
+		, rif_key(rif_key)
+		, dev_key(dev_key) {}
 
+	~EDATADecrypter() override {}
 	// false if invalid
 	bool ReadHeader();
 	u64 ReadData(u64 pos, u8* data, u64 size);
 
-	fs::stat_t get_stat() override
+	fs::stat_t stat() override
 	{
-		fs::stat_t stats = edata_file.get_stat();
-		stats.is_writable = false; // TODO
+		fs::stat_t stats;
+		stats.is_directory = false;
+		stats.is_writable = false;
 		stats.size = file_size;
+		stats.atime = -1;
+		stats.ctime = -1;
+		stats.mtime = -1;
 		return stats;
 	}
 
@@ -125,11 +108,6 @@ public:
 		return bytesRead;
 	}
 
-	u64 read_at(u64 offset, void* buffer, u64 size) override
-	{
-		return ReadData(offset, static_cast<u8*>(buffer), size);
-	}
-
 	u64 write(const void*, u64) override
 	{
 		return 0;
@@ -153,16 +131,4 @@ public:
 	}
 
 	u64 size() override { return file_size; }
-
-	fs::file_id get_id() override
-	{
-		fs::file_id id = edata_file.get_id();
-		id.type.insert(0, "EDATADecrypter: "sv);
-		return id;
-	}
-
-	u128 get_key() const
-	{
-		return dec_key;
-	}
 };
diff --git a/rpcs3/Crypto/unpkg.cpp b/rpcs3/Crypto/unpkg.cpp
index bc7481fcd6..45268062de 100644
--- a/rpcs3/Crypto/unpkg.cpp
+++ b/rpcs3/Crypto/unpkg.cpp
@@ -4,28 +4,25 @@
 #include "key_vault.h"
 #include "util/logs.hpp"
 #include "Utilities/StrUtil.h"
-#include "Utilities/Thread.h"
 #include "Emu/System.h"
 #include "Emu/system_utils.hpp"
 #include "Emu/VFS.h"
 #include "unpkg.h"
-#include "util/sysinfo.hpp"
 #include "Loader/PSF.h"
 
-#include <filesystem>
-
 LOG_CHANNEL(pkg_log, "PKG");
 
-package_reader::package_reader(const std::string& path, fs::file file)
+package_reader::package_reader(const std::string& path)
 	: m_path(path)
-	, m_file(std::move(file))
 {
-	if (!m_file && !m_file.open(path))
+	if (!fs::is_file(path))
 	{
 		pkg_log.error("PKG file not found!");
 		return;
 	}
 
+	m_filelist.emplace_back(fs::file{path});
+
 	m_is_valid = read_header();
 
 	if (!m_is_valid)
@@ -40,13 +37,6 @@ package_reader::package_reader(const std::string& path, fs::file file)
 		return;
 	}
 
-	m_is_valid = set_decryption_key();
-
-	if (!m_is_valid)
-	{
-		return;
-	}
-
 	const bool param_sfo_found = read_param_sfo();
 
 	if (!param_sfo_found)
@@ -61,7 +51,7 @@ package_reader::~package_reader()
 
 bool package_reader::read_header()
 {
-	if (m_path.empty() || !m_file)
+	if (m_path.empty() || m_filelist.empty())
 	{
 		pkg_log.error("Reading PKG header: no file to read!");
 		return false;
@@ -73,8 +63,7 @@ bool package_reader::read_header()
 		return false;
 	}
 
-	pkg_log.notice("Path: '%s'", m_path);
-	pkg_log.notice("Header: pkg_magic = 0x%x = \"%s\"", +m_header.pkg_magic, std::string_view(reinterpret_cast<const char*>(&m_header.pkg_magic), 4).substr(1)); // Skip 0x7F
+	pkg_log.notice("Header: pkg_magic = 0x%x = \"%s\"", +m_header.pkg_magic, std::string(reinterpret_cast<const char*>(&m_header.pkg_magic), 4));
 	pkg_log.notice("Header: pkg_type = 0x%x = %d", m_header.pkg_type, m_header.pkg_type);
 	pkg_log.notice("Header: pkg_platform = 0x%x = %d", m_header.pkg_platform, m_header.pkg_platform);
 	pkg_log.notice("Header: meta_offset = 0x%x = %d", m_header.meta_offset, m_header.meta_offset);
@@ -86,7 +75,7 @@ bool package_reader::read_header()
 	pkg_log.notice("Header: data_size = 0x%x = %d", m_header.data_size, m_header.data_size);
 	pkg_log.notice("Header: title_id = %s", m_header.title_id);
 	pkg_log.notice("Header: qa_digest = 0x%x 0x%x", m_header.qa_digest[0], m_header.qa_digest[1]);
-	pkg_log.notice("Header: klicensee = %s", m_header.klicensee.value());
+	//pkg_log.notice("Header: klicensee = 0x%x = %d", header.klicensee, header.klicensee);
 
 	// Get extended PKG information for PSP or PSVita
 	if (m_header.pkg_platform == PKG_PLATFORM_TYPE_PSP_PSVITA)
@@ -101,7 +90,7 @@ bool package_reader::read_header()
 			return false;
 		}
 
-		pkg_log.notice("Extended header: magic = 0x%x = \"%s\"", +ext_header.magic, std::string_view(reinterpret_cast<const char*>(&ext_header.magic), 4).substr(1));
+		pkg_log.notice("Extended header: magic = 0x%x = \"%s\"", +ext_header.magic, std::string(reinterpret_cast<const char*>(&ext_header.magic), 4));
 		pkg_log.notice("Extended header: unknown_1 = 0x%x = %d", ext_header.unknown_1, ext_header.unknown_1);
 		pkg_log.notice("Extended header: ext_hdr_size = 0x%x = %d", ext_header.ext_hdr_size, ext_header.ext_hdr_size);
 		pkg_log.notice("Extended header: ext_data_size = 0x%x = %d", ext_header.ext_data_size, ext_header.ext_data_size);
@@ -120,12 +109,6 @@ bool package_reader::read_header()
 		return false;
 	}
 
-	if (u64{umax} / sizeof(PKGEntry) < u64(m_header.file_count))
-	{
-		pkg_log.error("PKG file count is too large! (0x%x)", m_header.file_count);
-		return false;
-	}
-
 	switch (const u16 type = m_header.pkg_type)
 	{
 	case PKG_RELEASE_TYPE_DEBUG:   break;
@@ -148,7 +131,7 @@ bool package_reader::read_header()
 	}
 	}
 
-	if (m_header.pkg_size > m_file.size())
+	if (m_header.pkg_size > m_filelist[0].size())
 	{
 		// Check if multi-files pkg
 		if (!m_path.ends_with("_00.pkg"))
@@ -157,15 +140,11 @@ bool package_reader::read_header()
 			return false;
 		}
 
-		std::vector<fs::file> filelist;
-		filelist.emplace_back(std::move(m_file));
-
 		const std::string name_wo_number = m_path.substr(0, m_path.size() - 7);
-		u64 cursize = filelist[0].size();
-
+		u64 cursize = m_filelist[0].size();
 		while (cursize < m_header.pkg_size)
 		{
-			const std::string archive_filename = fmt::format("%s_%02d.pkg", name_wo_number, filelist.size());
+			const std::string archive_filename = fmt::format("%s_%02d.pkg", name_wo_number, m_filelist.size());
 
 			fs::file archive_file(archive_filename);
 			if (!archive_file)
@@ -174,20 +153,9 @@ bool package_reader::read_header()
 				return false;
 			}
 
-			const usz add_size = archive_file.size();
-
-			if (!add_size)
-			{
-				pkg_log.error("%s is empty, cannot read PKG", archive_filename);
-				return false;
-			}
-
-			cursize += add_size;
-			filelist.emplace_back(std::move(archive_file));
+			cursize += archive_file.size();
+			m_filelist.emplace_back(std::move(archive_file));
 		}
-
-		// Gather files
-		m_file = fs::make_gather(std::move(filelist));
 	}
 
 	if (m_header.data_size + m_header.data_offset > m_header.pkg_size)
@@ -201,9 +169,15 @@ bool package_reader::read_header()
 
 bool package_reader::read_metadata()
 {
+	if (!decrypt_data())
+	{
+		return false;
+	}
+
 	// Read title ID and use it as an installation directory
 	m_install_dir.resize(9);
-	archive_read_block(55, &m_install_dir.front(), m_install_dir.size());
+	archive_seek(55);
+	archive_read(&m_install_dir.front(), m_install_dir.size());
 
 	// Read package metadata
 
@@ -299,7 +273,7 @@ bool package_reader::read_metadata()
 
 			if (packet.size == m_metadata.title_id.size())
 			{
-				archive_read(&m_metadata.title_id.front(), m_metadata.title_id.size());
+				archive_read(&m_metadata.title_id, m_metadata.title_id.size());
 				m_metadata.title_id = fmt::trim(m_metadata.title_id);
 				pkg_log.notice("Metadata: Title ID = %s", m_metadata.title_id);
 				continue;
@@ -315,7 +289,7 @@ bool package_reader::read_metadata()
 			if (packet.size == sizeof(m_metadata.qa_digest))
 			{
 				archive_read(&m_metadata.qa_digest, sizeof(m_metadata.qa_digest));
-				pkg_log.notice("Metadata: QA Digest = %s", std::span<const u8>(m_metadata.qa_digest, sizeof(m_metadata.qa_digest)));
+				pkg_log.notice("Metadata: QA Digest = 0x%x", m_metadata.qa_digest);
 				continue;
 			}
 			else
@@ -487,7 +461,7 @@ bool package_reader::read_metadata()
 	return true;
 }
 
-bool package_reader::set_decryption_key()
+bool package_reader::decrypt_data()
 {
 	if (!m_is_valid)
 	{
@@ -502,76 +476,12 @@ bool package_reader::set_decryption_key()
 		aes_context ctx;
 		aes_setkey_enc(&ctx, m_metadata.content_type == 0x15u ? PKG_AES_KEY_VITA_1 : m_metadata.content_type == 0x16u ? PKG_AES_KEY_VITA_2 : PKG_AES_KEY_VITA_3, 128);
 		aes_crypt_ecb(&ctx, AES_ENCRYPT, reinterpret_cast<const uchar*>(&m_header.klicensee), m_dec_key.data());
-		return true;
+		decrypt(0, m_header.file_count * sizeof(PKGEntry), m_dec_key.data());
 	}
-
-	std::memcpy(m_dec_key.data(), PKG_AES_KEY, m_dec_key.size());
-
-	if (std::vector<PKGEntry> entries; !read_entries(entries))
+	else
 	{
-		pkg_log.notice("PKG may be IDU, retrying with IDU key.");
-
-		std::memcpy(m_dec_key.data(), PKG_AES_KEY_IDU, m_dec_key.size());
-
-		if (!read_entries(entries))
-		{
-			pkg_log.error("PKG decryption failed!");
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool package_reader::read_entries(std::vector<PKGEntry>& entries)
-{
-	entries.clear();
-	entries.resize(m_header.file_count + BUF_PADDING / sizeof(PKGEntry) + 1);
-
-	const usz read_size = decrypt(0, m_header.file_count * sizeof(PKGEntry), m_header.pkg_platform == PKG_PLATFORM_TYPE_PSP_PSVITA ? PKG_AES_KEY2 : m_dec_key.data(), entries.data());
-
-	if (read_size < m_header.file_count * sizeof(PKGEntry))
-	{
-		return false;
-	}
-
-	entries.resize(m_header.file_count);
-
-	const usz fsz = m_file.size() - m_header.data_offset;
-
-	// Data integrity validation
-	for (const PKGEntry& entry : entries)
-	{
-		if (!entry.name_size)
-		{
-			continue;
-		}
-
-		if (entry.name_size > PKG_MAX_FILENAME_SIZE)
-		{
-			return false;
-		}
-
-		if (fsz < entry.name_size || fsz - entry.name_size < entry.name_offset)
-		{
-			// Name exceeds file(s)
-			return false;
-		}
-
-		if (entry.file_size)
-		{
-			if (fsz < entry.file_size || fsz - entry.file_size < entry.file_offset)
-			{
-				// Data exceeds file(s)
-				return false;
-			}
-
-			if (entry.name_offset == entry.file_offset)
-			{
-				// Repeated value: odd
-				return false;
-			}
-		}
+		std::memcpy(m_dec_key.data(), PKG_AES_KEY, m_dec_key.size());
+		decrypt(0, m_header.file_count * sizeof(PKGEntry), m_header.pkg_platform == PKG_PLATFORM_TYPE_PSP_PSVITA ? PKG_AES_KEY2 : m_dec_key.data());
 	}
 
 	return true;
@@ -579,57 +489,49 @@ bool package_reader::read_entries(std::vector<PKGEntry>& entries)
 
 bool package_reader::read_param_sfo()
 {
-	std::vector<PKGEntry> entries;
-
-	if (!read_entries(entries))
+	if (!decrypt_data())
 	{
 		return false;
 	}
 
-	std::vector<u8> data_buf;
+	std::vector<PKGEntry> entries(m_header.file_count);
 
-	for (const PKGEntry& entry : entries)
+	std::memcpy(entries.data(), m_buf.get(), entries.size() * sizeof(PKGEntry));
+
+	for (const auto& entry : entries)
 	{
-		if (entry.name_size > PKG_MAX_FILENAME_SIZE)
+		if (entry.name_size > 256)
 		{
-			pkg_log.error("PKG name size is too big (size=0x%x, offset=0x%x)", entry.name_size, entry.name_offset);
+			pkg_log.error("PKG name size is too big (0x%x)", entry.name_size);
 			continue;
 		}
 
 		const bool is_psp = (entry.type & PKG_FILE_ENTRY_PSP) != 0u;
 
-		std::string name(entry.name_size + BUF_PADDING, '\0');
+		decrypt(entry.name_offset, entry.name_size, is_psp ? PKG_AES_KEY2 : m_dec_key.data());
 
-		if (usz read_size = decrypt(entry.name_offset, entry.name_size, is_psp ? PKG_AES_KEY2 : m_dec_key.data(), name.data()); read_size < entry.name_size)
-		{
-			pkg_log.error("PKG name could not be read (size=0x%x, offset=0x%x)", entry.name_size, entry.name_offset);
-			continue;
-		}
-
-		fmt::trim_back(name, "\0"sv);
+		const std::string name{reinterpret_cast<char*>(m_buf.get()), entry.name_size};
 
 		// We're looking for the PARAM.SFO file, if there is any
-		if (usz ndelim = name.find_first_not_of('/'); ndelim == umax || name.substr(ndelim) != "PARAM.SFO")
+		if (name != "PARAM.SFO")
 		{
 			continue;
 		}
 
 		// Read the package's PARAM.SFO
-		fs::file tmp = fs::make_stream<std::vector<uchar>>();
+		if (fs::file tmp = fs::make_stream<std::vector<uchar>>())
 		{
 			for (u64 pos = 0; pos < entry.file_size; pos += BUF_SIZE)
 			{
 				const u64 block_size = std::min<u64>(BUF_SIZE, entry.file_size - pos);
 
-				data_buf.resize(block_size + BUF_PADDING);
-
-				if (decrypt(entry.file_offset + pos, block_size, is_psp ? PKG_AES_KEY2 : m_dec_key.data(), data_buf.data()) != block_size)
+				if (decrypt(entry.file_offset + pos, block_size, is_psp ? PKG_AES_KEY2 : m_dec_key.data()) != block_size)
 				{
 					pkg_log.error("Failed to decrypt PARAM.SFO file");
 					return false;
 				}
 
-				if (tmp.write(data_buf.data(), block_size) != block_size)
+				if (tmp.write(m_buf.get(), block_size) != block_size)
 				{
 					pkg_log.error("Failed to write to temporary PARAM.SFO file");
 					return false;
@@ -638,27 +540,26 @@ bool package_reader::read_param_sfo()
 
 			tmp.seek(0);
 
-			m_psf = psf::load_object(tmp, name);
-
-			if (m_psf.empty())
-			{
-				// Invalid
-				continue;
-			}
+			m_psf = psf::load_object(tmp);
 
 			return true;
 		}
+		else
+		{
+			pkg_log.error("Failed to create temporary PARAM.SFO file");
+			return false;
+		}
 	}
 
 	return false;
 }
 
 // TODO: maybe also check if VERSION matches
-package_install_result package_reader::check_target_app_version() const
+package_error package_reader::check_target_app_version() const
 {
 	if (!m_is_valid)
 	{
-		return {package_install_result::error_type::other};
+		return package_error::other;
 	}
 
 	const auto category       = psf::get_string(m_psf, "CATEGORY", "");
@@ -669,13 +570,13 @@ package_install_result package_reader::check_target_app_version() const
 	if (category != "GD")
 	{
 		// We allow anything that isn't an update for now
-		return {package_install_result::error_type::no_error};
+		return package_error::no_error;
 	}
 
 	if (title_id.empty())
 	{
 		// Let's allow packages without ID for now
-		return {package_install_result::error_type::no_error};
+		return package_error::no_error;
 	}
 
 	if (app_ver.empty())
@@ -687,25 +588,24 @@ package_install_result package_reader::check_target_app_version() const
 		}
 
 		// This is probably not a version dependant patch, so we may install the package
-		return {package_install_result::error_type::no_error};
+		return package_error::no_error;
 	}
 
-	const std::string sfo_path = rpcs3::utils::get_hdd0_dir() + "game/" + std::string(title_id) + "/PARAM.SFO";
-	const fs::file installed_sfo_file(sfo_path);
+	const fs::file installed_sfo_file(rpcs3::utils::get_hdd0_dir() + "game/" + std::string(title_id) + "/PARAM.SFO");
 	if (!installed_sfo_file)
 	{
 		if (!target_app_ver.empty())
 		{
 			// We are unable to compare anything with the target app version
-			pkg_log.error("A target app version is required (%s), but no PARAM.SFO was found for %s. (path='%s', error=%s)", target_app_ver, title_id, sfo_path, fs::g_tls_error);
-			return {package_install_result::error_type::app_version, {std::string(target_app_ver)}};
+			pkg_log.error("A target app version is required (%s), but no PARAM.SFO was found for %s", target_app_ver, title_id);
+			return package_error::app_version;
 		}
 
 		// There is nothing we need to compare, so we may install the package
-		return {package_install_result::error_type::no_error};
+		return package_error::no_error;
 	}
 
-	const auto installed_psf = psf::load_object(installed_sfo_file, sfo_path);
+	const auto installed_psf = psf::load_object(installed_sfo_file);
 
 	const auto installed_title_id = psf::get_string(installed_psf, "TITLE_ID", "");
 	const auto installed_app_ver  = psf::get_string(installed_psf, "APP_VER", "");
@@ -713,7 +613,7 @@ package_install_result package_reader::check_target_app_version() const
 	if (title_id != installed_title_id || installed_app_ver.empty())
 	{
 		// Let's allow this package for now
-		return {package_install_result::error_type::no_error};
+		return package_error::no_error;
 	}
 
 	std::add_pointer_t<char> ev0, ev1;
@@ -722,7 +622,7 @@ package_install_result package_reader::check_target_app_version() const
 	if (installed_app_ver.data() + installed_app_ver.size() != ev0)
 	{
 		pkg_log.error("Failed to convert the installed app version to double (%s)", installed_app_ver);
-		return {package_install_result::error_type::other};
+		return package_error::other;
 	}
 
 	if (target_app_ver.empty())
@@ -734,17 +634,17 @@ package_install_result package_reader::check_target_app_version() const
 		if (app_ver.data() + app_ver.size() != ev1)
 		{
 			pkg_log.error("Failed to convert the package's app version to double (%s)", app_ver);
-			return {package_install_result::error_type::other};
+			return package_error::other;
 		}
 
 		if (new_version >= old_version)
 		{
 			// Yay! The patch has a higher or equal version than the installed game.
-			return {package_install_result::error_type::no_error};
+			return package_error::no_error;
 		}
 
 		pkg_log.error("The new app version (%s) is smaller than the installed app version (%s)", app_ver, installed_app_ver);
-		return {package_install_result::error_type::app_version, {std::string(app_ver), std::string(installed_app_ver)}};
+		return package_error::app_version;
 	}
 
 	// Check if the installed app version matches the target app version
@@ -754,29 +654,27 @@ package_install_result package_reader::check_target_app_version() const
 	if (target_app_ver.data() + target_app_ver.size() != ev1)
 	{
 		pkg_log.error("Failed to convert the package's target app version to double (%s)", target_app_ver);
-		return {package_install_result::error_type::other};
+		return package_error::other;
 	}
 
 	if (target_version == old_version)
 	{
 		// Yay! This patch is for the installed game version.
-		return {package_install_result::error_type::no_error};
+		return package_error::no_error;
 	}
 
 	pkg_log.error("The installed app version (%s) does not match the target app version (%s)", installed_app_ver, target_app_ver);
-	return {package_install_result::error_type::app_version, {std::string(target_app_ver), std::string(installed_app_ver)}};
+	return package_error::app_version;
 }
 
-bool package_reader::set_install_path()
+bool package_reader::extract_data(atomic_t<double>& sync)
 {
 	if (!m_is_valid)
 	{
 		return false;
 	}
 
-	m_install_path.clear();
-
-	// Get full path
+	// Get full path and create the directory
 	std::string dir = rpcs3::utils::get_hdd0_dir();
 
 	// Based on https://www.psdevwiki.com/ps3/PKG_files#ContentType
@@ -806,195 +704,47 @@ bool package_reader::set_install_path()
 		break;
 	}
 
-	// TODO: Verify whether other content types require appending title ID
-	if (m_metadata.content_type != PKG_CONTENT_TYPE_LICENSE)
-		dir += m_install_dir + '/';
+	dir += m_install_dir + '/';
 
 	// If false, an existing directory is being overwritten: cannot cancel the operation
-	m_was_null = !fs::is_dir(dir);
+	const bool was_null = !fs::is_dir(dir);
 
-	m_install_path = dir;
-	return true;
-}
-
-bool package_reader::fill_data(std::map<std::string, install_entry*>& all_install_entries)
-{
-	if (!m_is_valid)
+	if (!fs::create_path(dir))
 	{
+		pkg_log.error("Could not create the installation directory %s", dir);
 		return false;
 	}
 
-	if (!fs::create_path(m_install_path))
+	if (!decrypt_data())
 	{
-		pkg_log.error("Could not create the installation directory %s (error=%s)", m_install_path, fs::g_tls_error);
 		return false;
 	}
 
-	m_install_entries.clear();
-	m_bootable_file_path.clear();
-	m_entry_indexer = 0;
-	m_written_bytes = 0;
-
 	usz num_failures = 0;
 
-	std::vector<PKGEntry> entries;
+	std::vector<PKGEntry> entries(m_header.file_count);
 
-	if (!read_entries(entries))
-	{
-		return false;
-	}
+	std::memcpy(entries.data(), m_buf.get(), entries.size() * sizeof(PKGEntry));
 
-	// Create directories first
 	for (const auto& entry : entries)
 	{
-		if (entry.name_size > PKG_MAX_FILENAME_SIZE)
+		if (entry.name_size > 256)
 		{
 			num_failures++;
-			pkg_log.error("PKG name size is too big (size=0x%x, offset=0x%x)", entry.name_size, entry.name_offset);
-			break;
-		}
-
-		std::string name(entry.name_size + BUF_PADDING, '\0');
-
-		const bool is_psp = (entry.type & PKG_FILE_ENTRY_PSP) != 0u;
-
-		if (const usz read_size = decrypt(entry.name_offset, entry.name_size, is_psp ? PKG_AES_KEY2 : m_dec_key.data(), name.data()); read_size < entry.name_size)
-		{
-			num_failures++;
-			pkg_log.error("PKG name could not be read (size=0x%x, offset=0x%x)", entry.name_size, entry.name_offset);
-			break;
-		}
-
-		fmt::trim_back(name, "\0"sv);
-
-		std::string path = m_install_path + vfs::escape(name);
-
-		if (entry.pad || (entry.type & ~PKG_FILE_ENTRY_KNOWN_BITS))
-		{
-			pkg_log.todo("Entry with unknown type or padding: type=0x%08x, pad=0x%x, name='%s'", entry.type, entry.pad, name);
-		}
-		else
-		{
-			pkg_log.notice("Entry: type=0x%08x, name='%s'", entry.type, name);
-		}
-
-		const u8 entry_type = entry.type & 0xff;
-
-		switch (entry_type)
-		{
-		case PKG_FILE_ENTRY_FOLDER:
-		case 0x12:
-		{
-			if (fs::is_dir(path))
-			{
-				pkg_log.warning("Reused existing directory %s", path);
-			}
-			else if (fs::create_path(path))
-			{
-				pkg_log.notice("Created directory %s", path);
-			}
-			else
-			{
-				num_failures++;
-				pkg_log.error("Failed to create directory %s", path);
-				break;
-			}
-
-			break;
-		}
-		default:
-		{
-			// TODO: check for valid utf8 characters
-			const std::string true_path = std::filesystem::weakly_canonical(path).string();
-			if (true_path.empty())
-			{
-				num_failures++;
-				pkg_log.error("Failed to get weakly_canonical path for '%s'", path);
-				break;
-			}
-
-			auto map_ptr = &*all_install_entries.try_emplace(true_path).first;
-
-			m_install_entries.push_back({
-				.weak_reference = map_ptr,
-				.name = std::string(name),
-				.file_offset = entry.file_offset,
-				.file_size = entry.file_size,
-				.type = entry.type,
-				.pad = entry.pad
-			});
-
-			if (map_ptr->second && !(entry.type & PKG_FILE_ENTRY_OVERWRITE))
-			{
-				// Cannot override
-				continue;
-			}
-
-			// Link
-			map_ptr->second = &m_install_entries.back();
-			continue;
-		}
-		}
-	}
-
-	if (num_failures != 0)
-	{
-		pkg_log.error("Package installation failed: %s", m_install_path);
-		return false;
-	}
-
-	return true;
-}
-
-fs::file DecryptEDAT(const fs::file& input, const std::string& input_file_name, int mode, u8 *custom_klic);
-
-void package_reader::extract_worker()
-{
-	std::vector<u8> read_cache;
-
-	while (m_num_failures == 0 && !m_aborted)
-	{
-		// Make sure m_entry_indexer does not exceed m_install_entries
-		const usz index = m_entry_indexer.fetch_op([this](usz& v)
-		{
-			if (v < m_install_entries.size())
-			{
-				v++;
-				return true;
-			}
-
-			return false;
-		}).first;
-
-		if (index >= m_install_entries.size())
-		{
-			break;
-		}
-
-		const install_entry& entry = ::at32(m_install_entries, index);
-
-		if (!entry.is_dominating())
-		{
-			// Overwritten by another entry
-			m_written_bytes += entry.file_size;
+			pkg_log.error("PKG name size is too big (0x%x)", entry.name_size);
 			continue;
 		}
 
 		const bool is_psp = (entry.type & PKG_FILE_ENTRY_PSP) != 0u;
 
-		const std::string& path = entry.weak_reference->first;
-		const std::string& name = entry.name;
+		decrypt(entry.name_offset, entry.name_size, is_psp ? PKG_AES_KEY2 : m_dec_key.data());
 
-		if (entry.pad || (entry.type & ~PKG_FILE_ENTRY_KNOWN_BITS))
-		{
-			pkg_log.todo("Entry with unknown type or padding: type=0x%08x, pad=0x%x, name='%s'", entry.type, entry.pad, name);
-		}
-		else
-		{
-			pkg_log.notice("Entry: type=0x%08x, name='%s'", entry.type, name);
-		}
+		const std::string name{reinterpret_cast<char*>(m_buf.get()), entry.name_size};
+		const std::string path = dir + vfs::escape(name);
 
-		switch (const u8 entry_type = entry.type & 0xff)
+		pkg_log.notice("Entry 0x%08x: %s", entry.type, name);
+
+		switch (entry.type & 0xff)
 		{
 		case PKG_FILE_ENTRY_NPDRM:
 		case PKG_FILE_ENTRY_NPDRMEDAT:
@@ -1020,198 +770,41 @@ void package_reader::extract_worker()
 				break;
 			}
 
-			const bool is_buffered = entry_type == PKG_FILE_ENTRY_SDAT;
-
-			if (entry_type == PKG_FILE_ENTRY_NPDRMEDAT)
-			{
-				pkg_log.warning("NPDRM EDAT!");
-			}
-
-			if (fs::file out{ path, did_overwrite ? fs::rewrite : fs::write_new })
+			if (fs::file out{ path, fs::rewrite })
 			{
 				bool extract_success = true;
-
-				struct pkg_file_reader : fs::file_base
+				for (u64 pos = 0; pos < entry.file_size; pos += BUF_SIZE)
 				{
-					const std::function<u64(u64, void*, u64)> m_read_func;
-					const install_entry& m_entry;
-					usz m_pos;
+					const u64 block_size = std::min<u64>(BUF_SIZE, entry.file_size - pos);
 
-					explicit pkg_file_reader(std::function<u64(u64, void* buffer, u64)> read_func, const install_entry& entry) noexcept
-						: m_read_func(std::move(read_func))
-						, m_entry(entry)
-						, m_pos(0)
+					if (decrypt(entry.file_offset + pos, block_size, is_psp ? PKG_AES_KEY2 : m_dec_key.data()) != block_size)
 					{
+						extract_success = false;
+						pkg_log.error("Failed to extract file %s", path);
+						break;
 					}
 
-					fs::stat_t get_stat() override
+					if (out.write(m_buf.get(), block_size) != block_size)
 					{
-						fs::stat_t stat{};
-						stat.size = m_entry.file_size;
-						return stat;
+						extract_success = false;
+						pkg_log.error("Failed to write file %s", path);
+						break;
 					}
 
-					bool trunc(u64) override
+					if (sync.fetch_add((block_size + 0.0) / m_header.data_size) < 0.)
 					{
-						return false;
-					}
-
-					u64 read(void* buffer, u64 size) override
-					{
-						const u64 result = pkg_file_reader::read_at(m_pos, buffer, size);
-						m_pos += result;
-						return result;
-					}
-
-					u64 read_at(u64 offset, void* buffer, u64 size) override
-					{
-						return m_read_func(offset, buffer, size);
-					}
-
-					u64 write(const void*, u64) override
-					{
-						return 0;
-					}
-
-					u64 seek(s64 offset, fs::seek_mode whence) override
-					{
-						const s64 new_pos =
-							whence == fs::seek_set ? offset :
-							whence == fs::seek_cur ? offset + m_pos :
-							whence == fs::seek_end ? offset + size() : -1;
-
-						if (new_pos < 0)
+						if (was_null)
 						{
-							fs::g_tls_error = fs::error::inval;
-							return -1;
+							pkg_log.error("Package installation cancelled: %s", dir);
+							out.close();
+							fs::remove_all(dir, true);
+							return false;
 						}
 
-						m_pos = new_pos;
-						return m_pos;
+						// Cannot cancel the installation
+						sync += 1.;
 					}
-
-					u64 size() override
-					{
-						return m_entry.file_size;
-					}
-
-					fs::file_id get_id() override
-					{
-						fs::file_id id{};
-
-						id.type.insert(0, "pkg_file_reader: "sv);
-						return id;
-					}
-				};
-
-				read_cache.clear();
-
-				auto reader = std::make_unique<pkg_file_reader>([&, cache_off = u64{umax}](usz pos, void* ptr, usz size) mutable -> u64
-				{
-					if (pos >= entry.file_size || !size)
-					{
-						return 0;
-					}
-
-					size = std::min<u64>(entry.file_size - pos, size);
-
-					u64 size_cache_end = 0;
-					u64 read_size = 0;
-
-					// Check if exists in cache
-					if (!read_cache.empty() && cache_off <= pos && pos < cache_off + read_cache.size())
-					{
-						read_size = std::min<u64>(pos + size, cache_off + read_cache.size()) - pos;
-
-						std::memcpy(ptr, read_cache.data() + (pos - cache_off), read_size);
-						pos += read_size;
-					}
-					else if (!read_cache.empty() && cache_off < pos + size && cache_off + read_cache.size() >= pos + size)
-					{
-						size_cache_end = size - (std::max<u64>(cache_off, pos) - pos);
-
-						std::memcpy(static_cast<u8*>(ptr) + (cache_off - pos), read_cache.data(), size_cache_end);
-						size -= size_cache_end;
-					}
-
-					if (pos >= entry.file_size || !size)
-					{
-						return read_size + size_cache_end;
-					}
-
-					// Try to cache for later
-					if (size <= BUF_SIZE && !size_cache_end && !read_size)
-					{
-						const u64 block_size = std::min<u64>({BUF_SIZE, std::max<u64>(size * 5 / 3, 65536), entry.file_size - pos});
-
-						read_cache.resize(block_size + BUF_PADDING);
-						cache_off = pos;
-
-						const usz advance_size = decrypt(entry.file_offset + pos, block_size, is_psp ? PKG_AES_KEY2 : m_dec_key.data(), read_cache.data());
-
-						if (!advance_size)
-						{
-							cache_off = umax;
-							return 0;
-						}
-
-						read_cache.resize(advance_size);
-
-						size = std::min<usz>(advance_size, size);
-						std::memcpy(ptr, read_cache.data(), size);
-						return size;
-					}
-
-					while (read_size < size)
-					{
-						const u64 block_size = std::min<u64>(BUF_SIZE, size - read_size);
-
-						const usz advance_size = decrypt(entry.file_offset + pos, block_size, is_psp ? PKG_AES_KEY2 : m_dec_key.data(), static_cast<u8*>(ptr) + read_size);
-
-						if (!advance_size)
-						{
-							break;
-						}
-
-						read_size += advance_size;
-						pos += advance_size;
-					}
-
-					return read_size + size_cache_end;
-				}, entry);
-
-				fs::file in_data;
-				in_data.reset(std::move(reader));
-
-				fs::file final_data;
-
-				if (is_buffered)
-				{
-					final_data = DecryptEDAT(in_data, name, 1, reinterpret_cast<u8*>(&m_header.klicensee));
 				}
-				else
-				{
-					final_data = std::move(in_data);
-				}
-
-				if (!final_data)
-				{
-					m_num_failures++;
-					pkg_log.error("Failed to decrypt EDAT file %s (error=%s)", path, fs::g_tls_error);
-					break;
-				}
-
-				// 16MB buffer
-				std::vector<u8> buffer(std::min<usz>(entry.file_size, 1u << 24) + BUF_PADDING);
-
-				while (usz read_size = final_data.read(buffer.data(), buffer.size() - BUF_PADDING))
-				{
-					out.write(buffer.data(), read_size);
-					m_written_bytes += read_size;
-				}
-
-				final_data.close();
-				out.close();
 
 				if (extract_success)
 				{
@@ -1222,191 +815,139 @@ void package_reader::extract_worker()
 					else
 					{
 						pkg_log.notice("Created file %s", path);
-
-						if (name == "USRDIR/EBOOT.BIN" && entry.file_size > 4)
-						{
-							// Expose the creation of a bootable file
-							m_bootable_file_path = path;
-						}
 					}
 				}
 				else
 				{
-					m_num_failures++;
+					num_failures++;
 				}
 			}
 			else
 			{
-				m_num_failures++;
-				pkg_log.error("Failed to create file %s (is_buffered=%d, did_overwrite=%d, error=%s)", path, is_buffered, did_overwrite, fs::g_tls_error);
+				num_failures++;
+				pkg_log.error("Failed to create file %s", path);
 			}
 
 			break;
 		}
+
+		case PKG_FILE_ENTRY_FOLDER:
+		case 0x12:
+		{
+			if (fs::create_dir(path))
+			{
+				pkg_log.notice("Created directory %s", path);
+			}
+			else if (fs::is_dir(path))
+			{
+				pkg_log.warning("Reused existing directory %s", path);
+			}
+			else
+			{
+				num_failures++;
+				pkg_log.error("Failed to create directory %s", path);
+			}
+
+			break;
+		}
+
 		default:
 		{
-			m_num_failures++;
+			num_failures++;
 			pkg_log.error("Unknown PKG entry type (0x%x) %s", entry.type, name);
-			break;
 		}
 		}
 	}
-}
 
-package_install_result package_reader::extract_data(std::deque<package_reader>& readers, std::deque<std::string>& bootable_paths)
-{
-	package_install_result::error_type error = package_install_result::error_type::no_error;
-	usz num_failures = 0;
-
-	// Set paths first in order to know if the install dir was empty before starting any installations.
-	// This will also allow us to remove all the new packages in one path at once if any of them fail.
-	for (package_reader& reader : readers)
+	if (num_failures == 0)
 	{
-		reader.m_result = result::not_started;
-
-		if (!reader.set_install_path())
-		{
-			error = package_install_result::error_type::other;
-			reader.m_result = result::error; // We don't know if it's dirty yet.
-			return {error};
-		}
+		pkg_log.success("Package successfully installed to %s", dir);
 	}
-
-	for (package_reader& reader : readers)
+	else
 	{
-		// Use a seperate map for each reader. We need to check if the target app version exists for each package in sequence.
-		std::map<std::string, install_entry*> all_install_entries;
-
-		if (error != package_install_result::error_type::no_error || num_failures > 0)
-		{
-			ensure(reader.m_result == result::error || reader.m_result == result::error_dirty);
-			return {error};
-		}
-
-		// Check if this package is allowed to be installed on top of the existing data
-		const package_install_result version_check = reader.check_target_app_version();
-
-		if (version_check.error != package_install_result::error_type::no_error)
-		{
-			reader.m_result = result::error; // We don't know if it's dirty yet.
-			return version_check;
-		}
-
-		reader.m_result = result::started;
-
-		// Parse the files to be installed and create all paths.
-		if (!reader.fill_data(all_install_entries))
-		{
-			error = package_install_result::error_type::other;
-			// Do not return yet. We may need to clean up down below.
-		}
-
-		reader.m_num_failures = error == package_install_result::error_type::no_error ? 0 : 1;
-
-		if (reader.m_num_failures == 0)
-		{
-			const usz thread_count = std::min<usz>(utils::get_thread_count(), reader.m_install_entries.size());
-
-			named_thread_group workers("PKG Installer "sv, std::max<u32>(::narrow<u32>(thread_count), 1) - 1, [&]()
-			{
-				reader.extract_worker();
-			});
-
-			reader.extract_worker();
-			workers.join();
-		}
-
-		num_failures += reader.m_num_failures;
-
-		// We don't count this package as aborted if all entries were processed.
-		if (reader.m_num_failures || (reader.m_aborted && reader.m_entry_indexer < reader.m_install_entries.size()))
-		{
-			// Clear boot path. We don't want to propagate potentially broken paths to the caller.
-			reader.m_bootable_file_path.clear();
-
-			bool cleaned = reader.m_was_null;
-
-			if (reader.m_was_null && fs::is_dir(reader.m_install_path))
-			{
-				pkg_log.notice("Removing partial installation ('%s')", reader.m_install_path);
-
-				if (!fs::remove_all(reader.m_install_path, true))
-				{
-					pkg_log.notice("Failed to remove partial installation ('%s') (error=%s)", reader.m_install_path, fs::g_tls_error);
-					cleaned = false;
-				}
-			}
-
-			if (reader.m_num_failures)
-			{
-				pkg_log.error("Package failed to install ('%s')", reader.m_install_path);
-				reader.m_result = cleaned ? result::error : result::error_dirty;
-			}
-			else
-			{
-				pkg_log.warning("Package installation aborted ('%s')", reader.m_install_path);
-				reader.m_result = cleaned ? result::aborted : result::aborted_dirty;
-			}
-
-			break;
-		}
-
-		reader.m_result = result::success;
-
-		if (reader.get_progress(1) != 1)
-		{
-			pkg_log.warning("Missing %d bytes from PKG total files size.", reader.m_header.data_size - reader.m_written_bytes);
-			reader.m_written_bytes = reader.m_header.data_size; // Mark as completed anyway
-		}
-
-		// May be empty
-		bootable_paths.emplace_back(std::move(reader.m_bootable_file_path));
+		fs::remove_all(dir, true);
+		pkg_log.error("Package installation failed: %s", dir);
 	}
 
-	if (error == package_install_result::error_type::no_error && num_failures > 0)
-	{
-		error = package_install_result::error_type::other;
-	}
-
-	return {error};
+	return num_failures == 0;
 }
 
 void package_reader::archive_seek(const s64 new_offset, const fs::seek_mode damode)
 {
-	if (m_file) m_file.seek(new_offset, damode);
-}
+	if (damode == fs::seek_set)
+		m_cur_offset = new_offset;
+	else if (damode == fs::seek_cur)
+		m_cur_offset += new_offset;
+
+	u64 _offset = 0;
+	for (usz i = 0; i < m_filelist.size(); i++)
+	{
+		if (m_cur_offset < (_offset + m_filelist[i].size()))
+		{
+			m_cur_file = i;
+			m_cur_file_offset = m_cur_offset - _offset;
+			m_filelist[i].seek(m_cur_file_offset);
+			break;
+		}
+		_offset += m_filelist[i].size();
+	}
+};
 
 u64 package_reader::archive_read(void* data_ptr, const u64 num_bytes)
 {
-	return m_file ? m_file.read(data_ptr, num_bytes) : 0;
-}
+	ensure(m_filelist.size() > m_cur_file && m_filelist[m_cur_file]);
 
-std::span<const char> package_reader::archive_read_block(u64 offset, void* data_ptr, u64 num_bytes)
-{
-	const usz read_n = m_file.read_at(offset, data_ptr, num_bytes);
+	const u64 num_bytes_left = m_filelist[m_cur_file].size() - m_cur_file_offset;
 
-	return {static_cast<const char*>(data_ptr), read_n};
-}
+	// check if it continues in another file
+	if (num_bytes > num_bytes_left)
+	{
+		m_filelist[m_cur_file].read(data_ptr, num_bytes_left);
 
-usz package_reader::decrypt(u64 offset, u64 size, const uchar* key, void* local_buf)
+		if ((m_cur_file + 1) < m_filelist.size())
+		{
+			++m_cur_file;
+		}
+		else
+		{
+			m_cur_offset += num_bytes_left;
+			m_cur_file_offset = m_filelist[m_cur_file].size();
+			return num_bytes_left;
+		}
+		const u64 num_read = m_filelist[m_cur_file].read(static_cast<u8*>(data_ptr) + num_bytes_left, num_bytes - num_bytes_left);
+		m_cur_offset += (num_read + num_bytes_left);
+		m_cur_file_offset = num_read;
+		return (num_read + num_bytes_left);
+	}
+
+	const u64 num_read = m_filelist[m_cur_file].read(data_ptr, num_bytes);
+
+	m_cur_offset += num_read;
+	m_cur_file_offset += num_read;
+
+	return num_read;
+};
+
+u64 package_reader::decrypt(u64 offset, u64 size, const uchar* key)
 {
 	if (!m_is_valid)
 	{
 		return 0;
 	}
 
-	if (m_header.data_offset > ~offset)
+	if (!m_buf)
 	{
-		return 0;
+		// Allocate buffer with BUF_SIZE size or more if required
+		m_buf.reset(new u128[std::max<u64>(BUF_SIZE, sizeof(PKGEntry) * m_header.file_count) / sizeof(u128)]);
 	}
 
+	archive_seek(m_header.data_offset + offset);
+
 	// Read the data and set available size
-	const auto data_span = archive_read_block(m_header.data_offset + offset, local_buf, size);
-	ensure(data_span.data() == static_cast<void*>(local_buf));
+	const u64 read = archive_read(m_buf.get(), size);
 
 	// Get block count
-	const u64 blocks = (data_span.size() + 15) / 16;
-	const auto out_data = reinterpret_cast<u8*>(local_buf);
+	const u64 blocks = (read + 15) / 16;
 
 	if (m_header.pkg_type == PKG_RELEASE_TYPE_DEBUG)
 	{
@@ -1424,15 +965,15 @@ usz package_reader::decrypt(u64 offset, u64 size, const uchar* key, void* local_
 			// Initialize stream cipher for current position
 			input[7] = offset / 16 + i;
 
-			struct sha1_hash
+			union sha1_hash
 			{
 				u8 data[20];
-			} hash{};
+				u128 _v128;
+			} hash;
 
 			sha1(reinterpret_cast<const u8*>(input), sizeof(input), hash.data);
 
-			const u128 v = read_from_ptr<u128>(out_data, i * 16);
-			write_to_ptr<u128>(out_data, i * 16, v ^ read_from_ptr<u128>(hash.data));
+			m_buf[i] ^= hash._v128;
 		}
 	}
 	else if (m_header.pkg_type == PKG_RELEASE_TYPE_RELEASE)
@@ -1452,8 +993,7 @@ usz package_reader::decrypt(u64 offset, u64 size, const uchar* key, void* local_
 
 			aes_crypt_ecb(&ctx, AES_ENCRYPT, reinterpret_cast<const u8*>(&input), reinterpret_cast<u8*>(&key));
 
-			const u128 v = read_from_ptr<u128>(out_data, i * 16);
-			write_to_ptr<u128>(out_data, i * 16, v ^ key);
+			m_buf[i] ^= key;
 		}
 	}
 	else
@@ -1461,24 +1001,6 @@ usz package_reader::decrypt(u64 offset, u64 size, const uchar* key, void* local_
 		pkg_log.error("Unknown release type (0x%x)", m_header.pkg_type);
 	}
 
-	if (blocks * 16 != size)
-	{
-		// Put NTS and other zeroes on unaligned reads
-		std::memset(out_data + size, 0, blocks * 16 - size);
-	}
-
 	// Return the amount of data written in buf
-	return std::min<usz>(size, data_span.size());
-}
-
-int package_reader::get_progress(int maximum) const
-{
-	const usz wr = m_written_bytes;
-
-	return wr >= m_header.data_size ? maximum : ::narrow<int>(wr * maximum / m_header.data_size);
-}
-
-void package_reader::abort_extract()
-{
-	m_aborted = true;
-}
+	return read;
+};
diff --git a/rpcs3/Crypto/unpkg.h b/rpcs3/Crypto/unpkg.h
index d253561509..8c751b04f4 100644
--- a/rpcs3/Crypto/unpkg.h
+++ b/rpcs3/Crypto/unpkg.h
@@ -6,15 +6,12 @@
 #include "Utilities/File.h"
 #include <sstream>
 #include <iomanip>
-#include <span>
-#include <deque>
 
 // Constants
-enum : u32
+enum
 {
 	PKG_HEADER_SIZE  = 0xC0, // sizeof(pkg_header) + sizeof(pkg_unk_checksum)
 	PKG_HEADER_SIZE2 = 0x280,
-	PKG_MAX_FILENAME_SIZE = 256,
 };
 
 enum : u16
@@ -38,8 +35,6 @@ enum : u32
 
 	PKG_FILE_ENTRY_OVERWRITE      = 0x80000000,
 	PKG_FILE_ENTRY_PSP            = 0x10000000,
-
-	PKG_FILE_ENTRY_KNOWN_BITS     = 0xff | PKG_FILE_ENTRY_PSP | PKG_FILE_ENTRY_OVERWRITE,
 };
 
 enum : u32
@@ -297,107 +292,47 @@ public:
 	} self_info;
 };
 
-struct package_install_result
+enum class package_error
 {
-	enum class error_type
-	{
-		no_error,
-		app_version,
-		other
-	} error = error_type::no_error;
-	struct version
-	{
-		std::string expected;
-		std::string found;
-	} version;
+	no_error,
+	app_version,
+	other
 };
 
 class package_reader
 {
-	struct install_entry
-	{
-		typename std::map<std::string, install_entry*>::value_type* weak_reference{};
-		std::string name;
-
-		u64 file_offset{};
-		u64 file_size{};
-		u32 type{};
-		u32 pad{};
-
-		// Check if the entry is the same one registered in entries to install
-		bool is_dominating() const
-		{
-			return weak_reference->second == this;
-		}
-	};
-
 public:
-	package_reader(const std::string& path, fs::file file = {});
+	package_reader(const std::string& path);
 	~package_reader();
 
-	enum result
-	{
-		not_started,
-		started,
-		success,
-		aborted,
-		aborted_dirty,
-		error,
-		error_dirty
-	};
-
 	bool is_valid() const { return m_is_valid; }
-	package_install_result check_target_app_version() const;
-	static package_install_result extract_data(std::deque<package_reader>& readers, std::deque<std::string>& bootable_paths);
-	const psf::registry& get_psf() const { return m_psf; }
-	result get_result() const { return m_result; };
-
-	int get_progress(int maximum = 100) const;
-
-	void abort_extract();
-
-	fs::file &file()
-	{
-		return m_file;
-	}
+	package_error check_target_app_version() const;
+	bool extract_data(atomic_t<double>& sync);
+	psf::registry get_psf() const { return m_psf; }
 
 private:
 	bool read_header();
 	bool read_metadata();
 	bool read_param_sfo();
-	bool set_decryption_key();
-	bool read_entries(std::vector<PKGEntry>& entries);
-	void archive_seek(s64 new_offset, const fs::seek_mode damode = fs::seek_set);
-	u64 archive_read(void* data_ptr, u64 num_bytes);
-	bool set_install_path();
-	bool fill_data(std::map<std::string, install_entry*>& all_install_entries);
-	std::span<const char> archive_read_block(u64 offset, void* data_ptr, u64 num_bytes);
-	usz decrypt(u64 offset, u64 size, const uchar* key, void* local_buf);
-	void extract_worker();
+	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);
 
-	std::deque<install_entry> m_install_entries;
-	std::string m_install_path;
-	atomic_t<bool> m_aborted = false;
-	atomic_t<usz> m_num_failures = 0;
-	atomic_t<usz> m_entry_indexer = 0;
-	atomic_t<usz> m_written_bytes = 0;
-	bool m_was_null = false;
-
-	static constexpr usz BUF_SIZE = 8192 * 1024; // 8 MB
-	static constexpr usz BUF_PADDING = 32;
+	const usz BUF_SIZE = 8192 * 1024; // 8 MB
 
 	bool m_is_valid = false;
-	result m_result = result::not_started;
 
 	std::string m_path{};
 	std::string m_install_dir{};
-	fs::file m_file{};
+	std::vector<fs::file> m_filelist{};
+	usz m_cur_file = 0;
+	u64 m_cur_offset = 0;
+	u64 m_cur_file_offset = 0;
+	std::unique_ptr<u128[]> m_buf{};
 	std::array<uchar, 16> m_dec_key{};
 
 	PKGHeader m_header{};
 	PKGMetaData m_metadata{};
 	psf::registry m_psf{};
-
-	// Expose bootable file installed (if installed such)
-	std::string m_bootable_file_path;
 };
diff --git a/rpcs3/Crypto/unself.cpp b/rpcs3/Crypto/unself.cpp
index 3c187400cb..65e00092dc 100644
--- a/rpcs3/Crypto/unself.cpp
+++ b/rpcs3/Crypto/unself.cpp
@@ -1,10 +1,13 @@
 #include "stdafx.h"
 #include "aes.h"
+#include "utils.h"
 #include "unself.h"
-#include "util/asm.hpp"
+#include "Emu/VFS.h"
 #include "Emu/System.h"
 #include "Emu/system_utils.hpp"
-#include "Crypto/unzip.h"
+
+#include <algorithm>
+#include <zlib.h>
 
 inline u8 Read8(const fs::file& f)
 {
@@ -189,58 +192,60 @@ void WriteShdr(const fs::file& f, Elf32_Shdr& shdr)
 }
 
 
-void program_identification_header::Load(const fs::file& f)
+void AppInfo::Load(const fs::file& f)
 {
-	program_authority_id = Read64(f);
-	program_vendor_id    = Read32(f);
-	program_type         = Read32(f);
-	program_sceversion   = Read64(f);
-	padding              = Read64(f);
+	authid    = Read64(f);
+	vendor_id = Read32(f);
+	self_type = Read32(f);
+	version   = Read64(f);
+	padding   = Read64(f);
 }
 
-void program_identification_header::Show() const
+void AppInfo::Show() const
 {
-	self_log.notice("AuthID: 0x%llx", program_authority_id);
-	self_log.notice("VendorID: 0x%08x", program_vendor_id);
-	self_log.notice("SELF type: 0x%08x", program_type);
-	self_log.notice("Version: 0x%llx", program_sceversion);
+	self_log.notice("AuthID: 0x%llx", authid);
+	self_log.notice("VendorID: 0x%08x", vendor_id);
+	self_log.notice("SELF type: 0x%08x", self_type);
+	self_log.notice("Version: 0x%llx", version);
 }
 
-void segment_ext_header::Load(const fs::file& f)
+void SectionInfo::Load(const fs::file& f)
 {
-	offset      = Read64(f);
-	size        = Read64(f);
-	compression = Read32(f);
-	unknown     = Read32(f);
-	encryption  = Read64(f);
+	offset     = Read64(f);
+	size       = Read64(f);
+	compressed = Read32(f);
+	unknown1   = Read32(f);
+	unknown2   = Read32(f);
+	encrypted  = Read32(f);
 }
 
-void segment_ext_header::Show() const
+void SectionInfo::Show() const
 {
 	self_log.notice("Offset: 0x%llx", offset);
 	self_log.notice("Size: 0x%llx", size);
-	self_log.notice("Compression: 0x%08x", compression);
-	self_log.notice("Unknown: 0x%08x", unknown);
-	self_log.notice("Encryption: 0x%08x", encryption);
+	self_log.notice("Compressed: 0x%08x", compressed);
+	self_log.notice("Unknown1: 0x%08x", unknown1);
+	self_log.notice("Unknown2: 0x%08x", unknown2);
+	self_log.notice("Encrypted: 0x%08x", encrypted);
 }
 
-void version_header::Load(const fs::file& f)
+void SCEVersionInfo::Load(const fs::file& f)
 {
 	subheader_type = Read32(f);
 	present        = Read32(f);
 	size           = Read32(f);
-	unknown4       = Read32(f);
+	unknown        = Read32(f);
 }
 
-void version_header::Show() const
+void SCEVersionInfo::Show() const
 {
 	self_log.notice("Sub-header type: 0x%08x", subheader_type);
 	self_log.notice("Present: 0x%08x", present);
 	self_log.notice("Size: 0x%08x", size);
-	self_log.notice("Unknown: 0x%08x", unknown4);
+	self_log.notice("Unknown: 0x%08x", unknown);
 }
 
-void supplemental_header::Load(const fs::file& f)
+void ControlInfo::Load(const fs::file& f)
 {
 	type = Read32(f);
 	size = Read32(f);
@@ -248,45 +253,45 @@ void supplemental_header::Load(const fs::file& f)
 
 	if (type == 1)
 	{
-		PS3_plaintext_capability_header.ctrl_flag1 = Read32(f);
-		PS3_plaintext_capability_header.unknown1 = Read32(f);
-		PS3_plaintext_capability_header.unknown2 = Read32(f);
-		PS3_plaintext_capability_header.unknown3 = Read32(f);
-		PS3_plaintext_capability_header.unknown4 = Read32(f);
-		PS3_plaintext_capability_header.unknown5 = Read32(f);
-		PS3_plaintext_capability_header.unknown6 = Read32(f);
-		PS3_plaintext_capability_header.unknown7 = Read32(f);
+		control_flags.ctrl_flag1 = Read32(f);
+		control_flags.unknown1 = Read32(f);
+		control_flags.unknown2 = Read32(f);
+		control_flags.unknown3 = Read32(f);
+		control_flags.unknown4 = Read32(f);
+		control_flags.unknown5 = Read32(f);
+		control_flags.unknown6 = Read32(f);
+		control_flags.unknown7 = Read32(f);
 	}
 	else if (type == 2)
 	{
 		if (size == 0x30)
 		{
-			f.read(PS3_elf_digest_header_30.constant_or_elf_digest, sizeof(PS3_elf_digest_header_30.constant_or_elf_digest));
-			f.read(PS3_elf_digest_header_30.padding, sizeof(PS3_elf_digest_header_30.padding));
+			f.read(file_digest_30.digest, 20);
+			file_digest_30.unknown = Read64(f);
 		}
 		else if (size == 0x40)
 		{
-			f.read(PS3_elf_digest_header_40.constant, sizeof(PS3_elf_digest_header_40.constant));
-			f.read(PS3_elf_digest_header_40.elf_digest, sizeof(PS3_elf_digest_header_40.elf_digest));
-			PS3_elf_digest_header_40.required_system_version = Read64(f);
+			f.read(file_digest_40.digest1, 20);
+			f.read(file_digest_40.digest2, 20);
+			file_digest_40.unknown = Read64(f);
 		}
 	}
 	else if (type == 3)
 	{
-		PS3_npdrm_header.npd.magic = Read32(f);
-		PS3_npdrm_header.npd.version = Read32(f);
-		PS3_npdrm_header.npd.license = Read32(f);
-		PS3_npdrm_header.npd.type = Read32(f);
-		f.read(PS3_npdrm_header.npd.content_id, 48);
-		f.read(PS3_npdrm_header.npd.digest, 16);
-		f.read(PS3_npdrm_header.npd.title_hash, 16);
-		f.read(PS3_npdrm_header.npd.dev_hash, 16);
-		PS3_npdrm_header.npd.activate_time = Read64(f);
-		PS3_npdrm_header.npd.expire_time = Read64(f);
+		npdrm.magic = Read32(f);
+		npdrm.unknown1 = Read32(f);
+		npdrm.license = Read32(f);
+		npdrm.type = Read32(f);
+		f.read(npdrm.content_id, 48);
+		f.read(npdrm.digest, 16);
+		f.read(npdrm.invdigest, 16);
+		f.read(npdrm.xordigest, 16);
+		npdrm.unknown2 = Read64(f);
+		npdrm.unknown3 = Read64(f);
 	}
 }
 
-void supplemental_header::Show() const
+void ControlInfo::Show() const
 {
 	self_log.notice("Type: 0x%08x", type);
 	self_log.notice("Size: 0x%08x", size);
@@ -294,41 +299,41 @@ void supplemental_header::Show() const
 
 	if (type == 1)
 	{
-		self_log.notice("Control flag 1: 0x%08x", PS3_plaintext_capability_header.ctrl_flag1);
-		self_log.notice("Unknown1: 0x%08x", PS3_plaintext_capability_header.unknown1);
-		self_log.notice("Unknown2: 0x%08x", PS3_plaintext_capability_header.unknown2);
-		self_log.notice("Unknown3: 0x%08x", PS3_plaintext_capability_header.unknown3);
-		self_log.notice("Unknown4: 0x%08x", PS3_plaintext_capability_header.unknown4);
-		self_log.notice("Unknown5: 0x%08x", PS3_plaintext_capability_header.unknown5);
-		self_log.notice("Unknown6: 0x%08x", PS3_plaintext_capability_header.unknown6);
-		self_log.notice("Unknown7: 0x%08x", PS3_plaintext_capability_header.unknown7);
+		self_log.notice("Control flag 1: 0x%08x", control_flags.ctrl_flag1);
+		self_log.notice("Unknown1: 0x%08x", control_flags.unknown1);
+		self_log.notice("Unknown2: 0x%08x", control_flags.unknown2);
+		self_log.notice("Unknown3: 0x%08x", control_flags.unknown3);
+		self_log.notice("Unknown4: 0x%08x", control_flags.unknown4);
+		self_log.notice("Unknown5: 0x%08x", control_flags.unknown5);
+		self_log.notice("Unknown6: 0x%08x", control_flags.unknown6);
+		self_log.notice("Unknown7: 0x%08x", control_flags.unknown7);
 	}
 	else if (type == 2)
 	{
 		if (size == 0x30)
 		{
-			self_log.notice("Digest: %s", PS3_elf_digest_header_30.constant_or_elf_digest);
-			self_log.notice("Unknown: 0x%llx", PS3_elf_digest_header_30.padding);
+			self_log.notice("Digest: %s", file_digest_30.digest);
+			self_log.notice("Unknown: 0x%llx", file_digest_30.unknown);
 		}
 		else if (size == 0x40)
 		{
-			self_log.notice("Digest1: %s", PS3_elf_digest_header_40.constant);
-			self_log.notice("Digest2: %s", PS3_elf_digest_header_40.elf_digest);
-			self_log.notice("Unknown: 0x%llx", PS3_elf_digest_header_40.required_system_version);
+			self_log.notice("Digest1: %s", file_digest_40.digest1);
+			self_log.notice("Digest2: %s", file_digest_40.digest2);
+			self_log.notice("Unknown: 0x%llx", file_digest_40.unknown);
 		}
 	}
 	else if (type == 3)
 	{
-		self_log.notice("Magic: 0x%08x", PS3_npdrm_header.npd.magic);
-		self_log.notice("Version: 0x%08x", PS3_npdrm_header.npd.version);
-		self_log.notice("License: 0x%08x", PS3_npdrm_header.npd.license);
-		self_log.notice("Type: 0x%08x", PS3_npdrm_header.npd.type);
-		self_log.notice("ContentID: %s", PS3_npdrm_header.npd.content_id);
-		self_log.notice("Digest: %s", PS3_npdrm_header.npd.digest);
-		self_log.notice("Inverse digest: %s", PS3_npdrm_header.npd.title_hash);
-		self_log.notice("XOR digest: %s", PS3_npdrm_header.npd.dev_hash);
-		self_log.notice("Activation time: 0x%llx", PS3_npdrm_header.npd.activate_time);
-		self_log.notice("Expiration time: 0x%llx", PS3_npdrm_header.npd.expire_time);
+		self_log.notice("Magic: 0x%08x", npdrm.magic);
+		self_log.notice("Unknown1: 0x%08x", npdrm.unknown1);
+		self_log.notice("License: 0x%08x", npdrm.license);
+		self_log.notice("Type: 0x%08x", npdrm.type);
+		self_log.notice("ContentID: %s", npdrm.content_id);
+		self_log.notice("Digest: %s", npdrm.digest);
+		self_log.notice("Inverse digest: %s", npdrm.invdigest);
+		self_log.notice("XOR digest: %s", npdrm.xordigest);
+		self_log.notice("Unknown2: 0x%llx", npdrm.unknown2);
+		self_log.notice("Unknown3: 0x%llx", npdrm.unknown3);
 	}
 }
 
@@ -348,10 +353,10 @@ void MetadataInfo::Show() const
 	std::string iv_pad_str;
 	for (int i = 0; i < 0x10; i++)
 	{
-		fmt::append(key_str, "%02x", key[i]);
-		fmt::append(key_pad_str, "%02x", key_pad[i]);
-		fmt::append(iv_str, "%02x", iv[i]);
-		fmt::append(iv_pad_str, "%02x", iv_pad[i]);
+		key_str += fmt::format("%02x", key[i]);
+		key_pad_str += fmt::format("%02x", key_pad[i]);
+		iv_str += fmt::format("%02x", iv[i]);
+		iv_pad_str += fmt::format("%02x", iv_pad[i]);
 	}
 
 	self_log.notice("Key: %s", key_str.c_str());
@@ -362,14 +367,22 @@ void MetadataInfo::Show() const
 
 void MetadataHeader::Load(u8* in)
 {
+	memcpy(&signature_input_length, in, 8);
+	memcpy(&unknown1, in + 8, 4);
+	memcpy(&section_count, in + 12, 4);
+	memcpy(&key_count, in + 16, 4);
+	memcpy(&opt_header_size, in + 20, 4);
+	memcpy(&unknown2, in + 24, 4);
+	memcpy(&unknown3, in + 28, 4);
+
 	// Endian swap.
-	signature_input_length = read_from_ptr<be_t<u64>>(in);
-	unknown1               = read_from_ptr<be_t<u32>>(in, 8);
-	section_count          = read_from_ptr<be_t<u32>>(in, 12);
-	key_count              = read_from_ptr<be_t<u32>>(in, 16);
-	opt_header_size        = read_from_ptr<be_t<u32>>(in, 20);
-	unknown2               = read_from_ptr<be_t<u32>>(in, 24);
-	unknown3               = read_from_ptr<be_t<u32>>(in, 28);
+	signature_input_length = swap64(signature_input_length);
+	unknown1 = swap32(unknown1);
+	section_count = swap32(section_count);
+	key_count = swap32(key_count);
+	opt_header_size = swap32(opt_header_size);
+	unknown2 = swap32(unknown2);
+	unknown3 = swap32(unknown3);
 }
 
 void MetadataHeader::Show() const
@@ -385,17 +398,28 @@ void MetadataHeader::Show() const
 
 void MetadataSectionHeader::Load(u8* in)
 {
+	memcpy(&data_offset, in, 8);
+	memcpy(&data_size, in + 8, 8);
+	memcpy(&type, in + 16, 4);
+	memcpy(&program_idx, in + 20, 4);
+	memcpy(&hashed, in + 24, 4);
+	memcpy(&sha1_idx, in + 28, 4);
+	memcpy(&encrypted, in + 32, 4);
+	memcpy(&key_idx, in + 36, 4);
+	memcpy(&iv_idx, in + 40, 4);
+	memcpy(&compressed, in + 44, 4);
+
 	// Endian swap.
-	data_offset = read_from_ptr<be_t<u64>>(in);
-	data_size   = read_from_ptr<be_t<u64>>(in, 8);
-	type        = read_from_ptr<be_t<u32>>(in, 16);
-	program_idx = read_from_ptr<be_t<u32>>(in, 20);
-	hashed      = read_from_ptr<be_t<u32>>(in, 24);
-	sha1_idx    = read_from_ptr<be_t<u32>>(in, 28);
-	encrypted   = read_from_ptr<be_t<u32>>(in, 32);
-	key_idx     = read_from_ptr<be_t<u32>>(in, 36);
-	iv_idx      = read_from_ptr<be_t<u32>>(in, 40);
-	compressed  = read_from_ptr<be_t<u32>>(in, 44);
+	data_offset = swap64(data_offset);
+	data_size = swap64(data_size);
+	type = swap32(type);
+	program_idx = swap32(program_idx);
+	hashed = swap32(hashed);
+	sha1_idx = swap32(sha1_idx);
+	encrypted = swap32(encrypted);
+	key_idx = swap32(key_idx);
+	iv_idx = swap32(iv_idx);
+	compressed = swap32(compressed);
 }
 
 void MetadataSectionHeader::Show() const
@@ -586,18 +610,18 @@ void SceHeader::Load(const fs::file& f)
 	se_esize = Read64(f);
 }
 
-void ext_hdr::Load(const fs::file& f)
+void SelfHeader::Load(const fs::file& f)
 {
-	ext_hdr_version = Read64(f);
-	program_identification_hdr_offset = Read64(f);
-	ehdr_offset = Read64(f);
-	phdr_offset = Read64(f);
-	shdr_offset = Read64(f);
-	segment_ext_hdr_offset = Read64(f);
-	version_hdr_offset = Read64(f);
-	supplemental_hdr_offset = Read64(f);
-	supplemental_hdr_size = Read64(f);
-	padding = Read64(f);
+	se_htype = Read64(f);
+	se_appinfooff = Read64(f);
+	se_elfoff = Read64(f);
+	se_phdroff = Read64(f);
+	se_shdroff = Read64(f);
+	se_secinfoff = Read64(f);
+	se_sceveroff = Read64(f);
+	se_controloff = Read64(f);
+	se_controlsize = Read64(f);
+	pad = Read64(f);
 }
 
 SCEDecrypter::SCEDecrypter(const fs::file& s)
@@ -615,7 +639,7 @@ bool SCEDecrypter::LoadHeaders()
 	// Check SCE magic.
 	if (!sce_hdr.CheckMagic())
 	{
-		self_log.error("Not a SELF file!");
+		self_log.error("SELF: Not a SELF file!");
 		return false;
 	}
 
@@ -659,7 +683,7 @@ bool SCEDecrypter::LoadMetadata(const u8 erk[32], const u8 riv[16])
 	if ((meta_info.key_pad[0] != 0x00) ||
 		(meta_info.iv_pad[0] != 0x00))
 	{
-		self_log.error("Failed to decrypt SCE metadata info!");
+		self_log.error("SELF: Failed to decrypt metadata info!");
 		return false;
 	}
 
@@ -764,32 +788,72 @@ std::vector<fs::file> SCEDecrypter::MakeFile()
 	u32 data_buf_offset = 0;
 
 	// Write data.
-	for (u32 i = 0; i < meta_hdr.section_count; i++)
+	for (unsigned int i = 0; i < meta_hdr.section_count; i++)
 	{
-		const MetadataSectionHeader& hdr = meta_shdr[i];
-		const u8* src = data_buf.get() + data_buf_offset;
 		fs::file out_f = fs::make_stream<std::vector<u8>>();
 
-		bool is_valid = true;
+		bool isValid = true;
 
 		// Decompress if necessary.
-		if (hdr.compressed == 2)
+		if (meta_shdr[i].compressed == 2)
 		{
-			is_valid = unzip(src, hdr.data_size, out_f);
+			const usz BUFSIZE = 32 * 1024;
+			u8 tempbuf[BUFSIZE];
+			z_stream strm;
+			strm.zalloc = Z_NULL;
+			strm.zfree = Z_NULL;
+			strm.opaque = Z_NULL;
+			strm.avail_in = ::narrow<uInt>(meta_shdr[i].data_size);
+			strm.avail_out = BUFSIZE;
+			strm.next_in = data_buf.get()+data_buf_offset;
+			strm.next_out = tempbuf;
+#ifndef _MSC_VER
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+			int ret = inflateInit(&strm);
+#ifndef _MSC_VER
+#pragma GCC diagnostic pop
+#endif
+			while (strm.avail_in)
+			{
+				ret = inflate(&strm, Z_NO_FLUSH);
+				if (ret == Z_STREAM_END)
+					break;
+				if (ret != Z_OK)
+					isValid = false;
+
+				if (!strm.avail_out) {
+					out_f.write(tempbuf, BUFSIZE);
+					strm.next_out = tempbuf;
+					strm.avail_out = BUFSIZE;
+				}
+				else
+					break;
+			}
+
+			int inflate_res = Z_OK;
+			inflate_res = inflate(&strm, Z_FINISH);
+
+			if (inflate_res != Z_STREAM_END)
+				isValid = false;
+
+			out_f.write(tempbuf, BUFSIZE - strm.avail_out);
+			inflateEnd(&strm);
 		}
 		else
 		{
 			// Write the data.
-			out_f.write(src, hdr.data_size);
+			out_f.write(data_buf.get()+data_buf_offset, meta_shdr[i].data_size);
 		}
 
 		// Advance the data buffer offset by data size.
-		data_buf_offset += ::narrow<u32>(hdr.data_size);
+		data_buf_offset += ::narrow<u32>(meta_shdr[i].data_size);
 
 		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());
 
-		if (is_valid) vec.push_back(std::move(out_f));
+		if (isValid) vec.push_back(std::move(out_f));
 	}
 
 	return vec;
@@ -809,30 +873,30 @@ bool SELFDecrypter::LoadHeaders(bool isElf32, SelfAdditionalInfo* out_info)
 
 	if (out_info)
 	{
-		*out_info = {};
+		out_info->valid = false;
 	}
 
 	// Check SCE magic.
 	if (!sce_hdr.CheckMagic())
 	{
-		self_log.error("Not a SELF file!");
+		self_log.error("SELF: Not a SELF file!");
 		return false;
 	}
 
 	// Read SELF header.
-	m_ext_hdr.Load(self_f);
+	self_hdr.Load(self_f);
 
 	// Read the APP INFO.
-	self_f.seek(m_ext_hdr.program_identification_hdr_offset);
-	m_prog_id_hdr.Load(self_f);
+	self_f.seek(self_hdr.se_appinfooff);
+	app_info.Load(self_f);
 
 	if (out_info)
 	{
-		out_info->prog_id_hdr = m_prog_id_hdr;
+		out_info->app_info = app_info;
 	}
 
 	// Read ELF header.
-	self_f.seek(m_ext_hdr.ehdr_offset);
+	self_f.seek(self_hdr.se_elfoff);
 
 	if (isElf32)
 		elf32_hdr.Load(self_f);
@@ -845,10 +909,10 @@ bool SELFDecrypter::LoadHeaders(bool isElf32, SelfAdditionalInfo* out_info)
 		phdr32_arr.clear();
 		if(elf32_hdr.e_phoff == 0 && elf32_hdr.e_phnum)
 		{
-			self_log.error("ELF program header offset is null!");
+			self_log.error("SELF: ELF program header offset is null!");
 			return false;
 		}
-		self_f.seek(m_ext_hdr.phdr_offset);
+		self_f.seek(self_hdr.se_phdroff);
 		for(u32 i = 0; i < elf32_hdr.e_phnum; ++i)
 		{
 			phdr32_arr.emplace_back();
@@ -861,11 +925,11 @@ bool SELFDecrypter::LoadHeaders(bool isElf32, SelfAdditionalInfo* out_info)
 
 		if (elf64_hdr.e_phoff == 0 && elf64_hdr.e_phnum)
 		{
-			self_log.error("ELF program header offset is null!");
+			self_log.error("SELF: ELF program header offset is null!");
 			return false;
 		}
 
-		self_f.seek(m_ext_hdr.phdr_offset);
+		self_f.seek(self_hdr.se_phdroff);
 
 		for (u32 i = 0; i < elf64_hdr.e_phnum; ++i)
 		{
@@ -874,51 +938,36 @@ bool SELFDecrypter::LoadHeaders(bool isElf32, SelfAdditionalInfo* out_info)
 		}
 	}
 
+
 	// Read section info.
-	m_seg_ext_hdr.clear();
-	self_f.seek(m_ext_hdr.segment_ext_hdr_offset);
+	secinfo_arr.clear();
+	self_f.seek(self_hdr.se_secinfoff);
 
-	for(u32 i = 0; i < (isElf32 ? elf32_hdr.e_phnum : elf64_hdr.e_phnum); ++i)
+	for(u32 i = 0; i < ((isElf32) ? elf32_hdr.e_phnum : elf64_hdr.e_phnum); ++i)
 	{
-		if (self_f.pos() >= self_f.size())
-		{
-			return false;
-		}
-
-		m_seg_ext_hdr.emplace_back();
-		m_seg_ext_hdr.back().Load(self_f);
-	}
-
-	if (m_ext_hdr.version_hdr_offset == 0 || utils::add_saturate<u64>(m_ext_hdr.version_hdr_offset, sizeof(version_header)) > self_f.size())
-	{
-		return false;
+		secinfo_arr.emplace_back();
+		secinfo_arr.back().Load(self_f);
 	}
 
 	// Read SCE version info.
-	self_f.seek(m_ext_hdr.version_hdr_offset);
-
-	m_version_hdr.Load(self_f);
+	self_f.seek(self_hdr.se_sceveroff);
+	scev_info.Load(self_f);
 
 	// Read control info.
-	m_supplemental_hdr_arr.clear();
-	self_f.seek(m_ext_hdr.supplemental_hdr_offset);
+	ctrlinfo_arr.clear();
+	self_f.seek(self_hdr.se_controloff);
 
-	for (u64 i = 0; i < m_ext_hdr.supplemental_hdr_size;)
+	for (u64 i = 0; i < self_hdr.se_controlsize;)
 	{
-		if (self_f.pos() >= self_f.size())
-		{
-			return false;
-		}
-
-		m_supplemental_hdr_arr.emplace_back();
-		supplemental_header& cinfo = m_supplemental_hdr_arr.back();
+		ctrlinfo_arr.emplace_back();
+		ControlInfo &cinfo = ctrlinfo_arr.back();
 		cinfo.Load(self_f);
 		i += cinfo.size;
 	}
 
 	if (out_info)
 	{
-		out_info->supplemental_hdr = m_supplemental_hdr_arr;
+		out_info->ctrl_info = ctrlinfo_arr;
 	}
 
 	// Read ELF section headers.
@@ -928,11 +977,11 @@ bool SELFDecrypter::LoadHeaders(bool isElf32, SelfAdditionalInfo* out_info)
 
 		if (elf32_hdr.e_shoff == 0 && elf32_hdr.e_shnum)
 		{
-			self_log.warning("ELF section header offset is null!");
+			self_log.warning("SELF: ELF section header offset is null!");
 			return true;
 		}
 
-		self_f.seek(m_ext_hdr.shdr_offset);
+		self_f.seek(self_hdr.se_shdroff);
 
 		for(u32 i = 0; i < elf32_hdr.e_shnum; ++i)
 		{
@@ -945,11 +994,11 @@ bool SELFDecrypter::LoadHeaders(bool isElf32, SelfAdditionalInfo* out_info)
 		shdr64_arr.clear();
 		if (elf64_hdr.e_shoff == 0 && elf64_hdr.e_shnum)
 		{
-			self_log.warning("ELF section header offset is null!");
+			self_log.warning("SELF: ELF section header offset is null!");
 			return true;
 		}
 
-		self_f.seek(m_ext_hdr.shdr_offset);
+		self_f.seek(self_hdr.se_shdroff);
 
 		for(u32 i = 0; i < elf64_hdr.e_shnum; ++i)
 		{
@@ -974,11 +1023,11 @@ void SELFDecrypter::ShowHeaders(bool isElf32)
 	self_log.notice("----------------------------------------------------");
 	self_log.notice("SELF header");
 	self_log.notice("----------------------------------------------------");
-	m_ext_hdr.Show();
+	self_hdr.Show();
 	self_log.notice("----------------------------------------------------");
 	self_log.notice("APP INFO");
 	self_log.notice("----------------------------------------------------");
-	m_prog_id_hdr.Show();
+	app_info.Show();
 	self_log.notice("----------------------------------------------------");
 	self_log.notice("ELF header");
 	self_log.notice("----------------------------------------------------");
@@ -991,17 +1040,17 @@ void SELFDecrypter::ShowHeaders(bool isElf32)
 	self_log.notice("----------------------------------------------------");
 	self_log.notice("Section info");
 	self_log.notice("----------------------------------------------------");
-	for(unsigned int i = 0; i < m_seg_ext_hdr.size(); i++)
-		m_seg_ext_hdr[i].Show();
+	for(unsigned int i = 0; i < secinfo_arr.size(); i++)
+		secinfo_arr[i].Show();
 	self_log.notice("----------------------------------------------------");
 	self_log.notice("SCE version info");
 	self_log.notice("----------------------------------------------------");
-	m_version_hdr.Show();
+	scev_info.Show();
 	self_log.notice("----------------------------------------------------");
 	self_log.notice("Control info");
 	self_log.notice("----------------------------------------------------");
-	for(unsigned int i = 0; i < m_supplemental_hdr_arr.size(); i++)
-		m_supplemental_hdr_arr[i].Show();
+	for(unsigned int i = 0; i < ctrlinfo_arr.size(); i++)
+		ctrlinfo_arr[i].Show();
 	self_log.notice("----------------------------------------------------");
 	self_log.notice("ELF section headers");
 	self_log.notice("----------------------------------------------------");
@@ -1013,44 +1062,57 @@ void SELFDecrypter::ShowHeaders(bool isElf32)
 bool SELFDecrypter::DecryptNPDRM(u8 *metadata, u32 metadata_size)
 {
 	aes_context aes;
+	ControlInfo *ctrl = NULL;
 	u8 npdrm_key[0x10];
 	u8 npdrm_iv[0x10];
 
+	// Parse the control info structures to find the NPDRM control info.
+	for(unsigned int i = 0; i < ctrlinfo_arr.size(); i++)
+	{
+		if (ctrlinfo_arr[i].type == 3)
+		{
+			ctrl = &ctrlinfo_arr[i];
+			break;
+		}
+	}
+
 	// Check if we have a valid NPDRM control info structure.
 	// If not, the data has no NPDRM layer.
-	const NPD_HEADER* npd = GetNPDHeader();
-	if (!npd)
+	if (!ctrl)
 	{
-		self_log.trace("No NPDRM control info found!");
+		self_log.trace("SELF: No NPDRM control info found!");
 		return true;
 	}
 
-	if (npd->license == 1)  // Network license.
+	if (ctrl->npdrm.license == 1)  // Network license.
 	{
 		// Try to find a RAP file to get the key.
-		if (!GetKeyFromRap(npd->content_id, npdrm_key))
+		if (!GetKeyFromRap(ctrl->npdrm.content_id, npdrm_key))
 		{
-			self_log.error("Can't decrypt network NPDRM!");
+			self_log.error("SELF: Can't decrypt network NPDRM!");
 			return false;
 		}
 	}
-	else if (npd->license == 2)  // Local license.
+	else if (ctrl->npdrm.license == 2)  // Local license.
 	{
 		// Try to find a RAP file to get the key.
-		if (!GetKeyFromRap(npd->content_id, npdrm_key))
+		if (!GetKeyFromRap(ctrl->npdrm.content_id, npdrm_key))
 		{
-			self_log.error("Can't find RAP file for NPDRM decryption!");
+			self_log.error("SELF: Can't find RAP file for NPDRM decryption!");
 			return false;
 		}
 	}
-	else if (npd->license == 3)  // Free license.
+	else if (ctrl->npdrm.license == 3)  // Free license.
 	{
-		// Use klicensee if available. (may be set to NP_KLIC_FREE if none is set)
-		std::memcpy(npdrm_key, key_v.GetKlicenseeKey(), 0x10);
+		// Use klicensee if available.
+		if (key_v.GetKlicenseeKey() != nullptr)
+			memcpy(npdrm_key, key_v.GetKlicenseeKey(), 0x10);
+		else
+			memcpy(npdrm_key, NP_KLIC_FREE, 0x10);
 	}
 	else
 	{
-		self_log.error("Invalid NPDRM license type!");
+		self_log.error("SELF: Invalid NPDRM license type!");
 		return false;
 	}
 
@@ -1068,21 +1130,7 @@ bool SELFDecrypter::DecryptNPDRM(u8 *metadata, u32 metadata_size)
 	return true;
 }
 
-const NPD_HEADER* SELFDecrypter::GetNPDHeader() const
-{
-	// Parse the control info structures to find the NPDRM control info.
-	for (const supplemental_header& info : m_supplemental_hdr_arr)
-	{
-		if (info.type == 3)
-		{
-			return &info.PS3_npdrm_header.npd;
-		}
-	}
-
-	return nullptr;
-}
-
-bool SELFDecrypter::LoadMetadata(const u8* klic_key)
+bool SELFDecrypter::LoadMetadata(u8* klic_key)
 {
 	aes_context aes;
 	const auto metadata_info = std::make_unique<u8[]>(sizeof(meta_info));
@@ -1098,7 +1146,7 @@ bool SELFDecrypter::LoadMetadata(const u8* klic_key)
 	self_f.read(metadata_headers.get(), metadata_headers_size);
 
 	// Find the right keyset from the key vault.
-	SELF_KEY keyset = key_v.FindSelfKey(m_prog_id_hdr.program_type, sce_hdr.se_flags, m_prog_id_hdr.program_sceversion);
+	SELF_KEY keyset = key_v.FindSelfKey(app_info.self_type, sce_hdr.se_flags, app_info.version);
 
 	// Set klic if given
 	if (klic_key)
@@ -1130,7 +1178,7 @@ bool SELFDecrypter::LoadMetadata(const u8* klic_key)
 	if ((meta_info.key_pad[0] != 0x00) ||
 		(meta_info.iv_pad[0] != 0x00))
 	{
-		self_log.error("Failed to decrypt SELF metadata info!");
+		self_log.error("SELF: Failed to decrypt metadata info!");
 		return false;
 	}
 
@@ -1240,14 +1288,14 @@ fs::file SELFDecrypter::MakeElf(bool isElf32)
 	return e;
 }
 
-bool SELFDecrypter::GetKeyFromRap(const char* content_id, u8* npdrm_key)
+bool SELFDecrypter::GetKeyFromRap(u8* content_id, u8* npdrm_key)
 {
 	// Set empty RAP key.
 	u8 rap_key[0x10];
 	memset(rap_key, 0, 0x10);
 
 	// Try to find a matching RAP file under exdata folder.
-	const std::string ci_str = content_id;
+	const std::string ci_str = reinterpret_cast<const char*>(content_id);
 	const std::string rap_path = rpcs3::utils::get_rap_file_path(ci_str);
 
 	// Open the RAP file and read the key.
@@ -1281,46 +1329,25 @@ static bool IsSelfElf32(const fs::file& f)
 
 	f.seek(0);
 
-	SceHeader hdr{};
-	ext_hdr sh{};
+	SceHeader hdr;
+	SelfHeader sh;
 	hdr.Load(f);
 	sh.Load(f);
 
 	// Locate the class byte and check it.
 	u8 elf_class[0x8];
 
-	f.seek(sh.ehdr_offset);
+	f.seek(sh.se_elfoff);
 	f.read(elf_class, 0x8);
 
 	return (elf_class[4] == 1);
 }
 
-static bool IsDebugSelf(const fs::file& f)
-{
-	if (f.size() < 0x18)
-	{
-		return false;
-	}
-
-	// Get the key version.
-	f.seek(0x08);
-
-	const u16 key_version = f.read<le_t<u16>>();
-
-	// Check for DEBUG version.
-	if (key_version == 0x80 || key_version == 0xc0)
-	{
-		return true;
-	}
-
-	return false;
-}
-
-static fs::file CheckDebugSelf(const fs::file& s)
+static bool CheckDebugSelf(fs::file& s)
 {
 	if (s.size() < 0x18)
 	{
-		return {};
+		return false;
 	}
 
 	// Get the key version.
@@ -1336,33 +1363,32 @@ static fs::file CheckDebugSelf(const fs::file& s)
 		// Get the real elf offset.
 		s.seek(0x10);
 
-		// Read the real elf offset.
-		usz read_pos = key_version == 0x80 ? +s.read<be_t<u64>>() : +s.read<le_t<u64>>();
+		// Start at the real elf offset.
+		s.seek(key_version == 0x80 ? +s.read<be_t<u64>>() : +s.read<le_t<u64>>());
 
 		// Write the real ELF file back.
 		fs::file e = fs::make_stream<std::vector<u8>>();
 
 		// Copy the data.
-		std::vector<u8> buf(std::min<usz>(s.size(), 4096));
-
-		while (const u64 size = s.read_at(read_pos, buf.data(), buf.size()))
+		char buf[2048];
+		while (const u64 size = s.read(buf, 2048))
 		{
-			e.write(buf.data(), size);
-			read_pos += size;
+			e.write(buf, size);
 		}
 
-		return e;
+		s = std::move(e);
+		return true;
 	}
 
 	// Leave the file untouched.
-	return {};
+	return false;
 }
 
-fs::file decrypt_self(const fs::file& elf_or_self, const u8* klic_key, SelfAdditionalInfo* out_info)
+fs::file decrypt_self(fs::file elf_or_self, u8* klic_key, SelfAdditionalInfo* out_info)
 {
 	if (out_info)
 	{
-		*out_info = {};
+		out_info->valid = false;
 	}
 
 	if (!elf_or_self)
@@ -1373,17 +1399,8 @@ fs::file decrypt_self(const fs::file& elf_or_self, const u8* klic_key, SelfAddit
 	elf_or_self.seek(0);
 
 	// Check SELF header first. Check for a debug SELF.
-	u32 file_type = umax;
-	elf_or_self.read_at(0, &file_type, sizeof(file_type));
-
-	if (file_type == "SCE\0"_u32)
+	if (elf_or_self.size() >= 4 && elf_or_self.read<u32>() == "SCE\0"_u32 && !CheckDebugSelf(elf_or_self))
 	{
-		if (fs::file res = CheckDebugSelf(elf_or_self))
-		{
-			// TODO: Decrypt
-			return res;
-		}
-
 		// Check the ELF file class (32 or 64 bit).
 		const bool isElf32 = IsSelfElf32(elf_or_self);
 
@@ -1393,56 +1410,39 @@ fs::file decrypt_self(const fs::file& elf_or_self, const u8* klic_key, SelfAddit
 		// Load the SELF file headers.
 		if (!self_dec.LoadHeaders(isElf32, out_info))
 		{
-			self_log.error("Failed to load SELF file headers!");
+			self_log.error("SELF: Failed to load SELF file headers!");
 			return fs::file{};
 		}
 
 		// Load and decrypt the SELF file metadata.
 		if (!self_dec.LoadMetadata(klic_key))
 		{
-			(klic_key ? self_log.notice : self_log.error)("Failed to load SELF file metadata!");
+			self_log.error("SELF: Failed to load SELF file metadata!");
 			return fs::file{};
 		}
 
 		// Decrypt the SELF file data.
 		if (!self_dec.DecryptData())
 		{
-			(klic_key ? self_log.notice : self_log.error)("Failed to decrypt SELF file data!");
+			self_log.error("SELF: Failed to decrypt SELF file data!");
 			return fs::file{};
 		}
 
 		// Make a new ELF file from this SELF.
 		return self_dec.MakeElf(isElf32);
 	}
-	else if (Emu.GetBoot().ends_with(".elf") || Emu.GetBoot().ends_with(".ELF"))
-	{
-		// Write the file back if the main executable is not signed
-		fs::file e = fs::make_stream<std::vector<u8>>();
 
-		// Copy the data.
-		std::vector<u8> buf(std::min<usz>(elf_or_self.size(), 4096));
-
-		usz read_pos = 0;
-		while (const u64 size = elf_or_self.read_at(read_pos, buf.data(), buf.size()))
-		{
-			e.write(buf.data(), size);
-			read_pos += size;
-		}
-
-		return e;
-	}
-
-	return {};
+	return elf_or_self;
 }
 
-bool verify_npdrm_self_headers(const fs::file& self, u8* klic_key, NPD_HEADER* npd_out)
+bool verify_npdrm_self_headers(const fs::file& self, u8* klic_key)
 {
 	if (!self)
 		return false;
 
 	self.seek(0);
 
-	if (self.size() >= 4 && self.read<u32>() == "SCE\0"_u32 && !IsDebugSelf(self))
+	if (self.size() >= 4 && self.read<u32>() == "SCE\0"_u32)
 	{
 		// Check the ELF file class (32 or 64 bit).
 		const bool isElf32 = IsSelfElf32(self);
@@ -1453,61 +1453,20 @@ bool verify_npdrm_self_headers(const fs::file& self, u8* klic_key, NPD_HEADER* n
 		// Load the SELF file headers.
 		if (!self_dec.LoadHeaders(isElf32))
 		{
-			self_log.error("Failed to load SELF file headers!");
+			self_log.error("SELF: Failed to load SELF file headers!");
 			return false;
 		}
 
 		// Load and decrypt the SELF file metadata.
 		if (!self_dec.LoadMetadata(klic_key))
 		{
-			self_log.error("Failed to load SELF file metadata!");
+			self_log.error("SELF: Failed to load SELF file metadata!");
 			return false;
 		}
-
-		if (npd_out)
-		{
-			if (const NPD_HEADER* npd = self_dec.GetNPDHeader())
-			{
-				memcpy(npd_out, npd, sizeof(NPD_HEADER));
-			}
-		}
 	}
-
 	return true;
 }
 
-bool get_npdrm_self_header(const fs::file& self, NPD_HEADER &npd_out)
-{
-	if (!self)
-		return false;
-
-	self.seek(0);
-
-	if (self.size() >= 4 && self.read<u32>() == "SCE\0"_u32 && !IsDebugSelf(self))
-	{
-		// Check the ELF file class (32 or 64 bit).
-		const bool isElf32 = IsSelfElf32(self);
-
-		// Start the decrypter on this SELF file.
-		SELFDecrypter self_dec(self);
-
-		// Load the SELF file headers.
-		if (!self_dec.LoadHeaders(isElf32))
-		{
-			self_log.error("Failed to load SELF file headers!");
-			return false;
-		}
-
-		if (const NPD_HEADER* npd = self_dec.GetNPDHeader())
-		{
-			memcpy(&npd_out, npd, sizeof(NPD_HEADER));
-			return true;
-		}
-	}
-
-	return false;
-}
-
 u128 get_default_self_klic()
 {
 	return std::bit_cast<u128>(NP_KLIC_FREE);
diff --git a/rpcs3/Crypto/unself.h b/rpcs3/Crypto/unself.h
index 1279bc961d..e3977c1ef7 100644
--- a/rpcs3/Crypto/unself.h
+++ b/rpcs3/Crypto/unself.h
@@ -7,117 +7,54 @@
 #include "Utilities/File.h"
 #include "util/logs.hpp"
 
-#include "unedat.h"
-
 LOG_CHANNEL(self_log, "SELF");
 
-// SCE-specific definitions for e_type:
-enum
+struct AppInfo
 {
-	ET_SCE_EXEC         = 0xFE00, // SCE Executable - PRX2
-	ET_SCE_RELEXEC      = 0xFE04, // SCE Relocatable Executable - PRX2
-	ET_SCE_STUBLIB      = 0xFE0C, // SCE SDK Stubs
-	ET_SCE_DYNEXEC      = 0xFE10, // SCE EXEC_ASLR (PS4 Executable with ASLR)
-	ET_SCE_DYNAMIC      = 0xFE18, // ?
-	ET_SCE_IOPRELEXEC   = 0xFF80, // SCE IOP Relocatable Executable
-	ET_SCE_IOPRELEXEC2  = 0xFF81, // SCE IOP Relocatable Executable Version 2
-	ET_SCE_EERELEXEC    = 0xFF90, // SCE EE Relocatable Executable
-	ET_SCE_EERELEXEC2   = 0xFF91, // SCE EE Relocatable Executable Version 2
-	ET_SCE_PSPRELEXEC   = 0xFFA0, // SCE PSP Relocatable Executable
-	ET_SCE_PPURELEXEC   = 0xFFA4, // SCE PPU Relocatable Executable
-	ET_SCE_ARMRELEXEC   = 0xFFA5, // ?SCE ARM Relocatable Executable (PS Vita System Software earlier or equal 0.931.010)
-	ET_SCE_PSPOVERLAY   = 0xFFA8, // ?
-};
-
-enum
-{
-	ELFOSABI_CELL_LV2 = 102 // CELL LV2
-};
-
-enum
-{
-	PT_SCE_RELA         = 0x60000000,
-	PT_SCE_LICINFO_1    = 0x60000001,
-	PT_SCE_LICINFO_2    = 0x60000002,
-	PT_SCE_DYNLIBDATA   = 0x61000000,
-	PT_SCE_PROCPARAM    = 0x61000001,
-	PT_SCE_UNK_61000010 = 0x61000010,
-	PT_SCE_COMMENT      = 0x6FFFFF00,
-	PT_SCE_LIBVERSION   = 0x6FFFFF01,
-	PT_SCE_UNK_70000001 = 0x70000001,
-	PT_SCE_IOPMOD       = 0x70000080,
-	PT_SCE_EEMOD        = 0x70000090,
-	PT_SCE_PSPRELA      = 0x700000A0,
-	PT_SCE_PSPRELA2     = 0x700000A1,
-	PT_SCE_PPURELA      = 0x700000A4,
-	PT_SCE_SEGSYM       = 0x700000A8,
-};
-
-enum
-{
-	PF_SPU_X = 0x00100000,
-	PF_SPU_W = 0x00200000,
-	PF_SPU_R = 0x00400000,
-	PF_RSX_X = 0x01000000,
-	PF_RSX_W = 0x02000000,
-	PF_RSX_R = 0x04000000,
-};
-
-enum
-{
-	SHT_SCE_RELA    = 0x60000000,
-	SHT_SCE_NID     = 0x61000001,
-	SHT_SCE_IOPMOD  = 0x70000080,
-	SHT_SCE_EEMOD   = 0x70000090,
-	SHT_SCE_PSPRELA = 0x700000A0,
-	SHT_SCE_PPURELA = 0x700000A4,
-};
-
-struct program_identification_header
-{
-	u64 program_authority_id;
-	u32 program_vendor_id;
-	u32 program_type;
-	u64 program_sceversion;
+	u64 authid;
+	u32 vendor_id;
+	u32 self_type;
+	u64 version;
 	u64 padding;
 
 	void Load(const fs::file& f);
 	void Show() const;
 };
 
-struct segment_ext_header
+struct SectionInfo
 {
-	u64 offset;      // Offset to data
-	u64 size;        // Size of data
-	u32 compression; // 1 = plain, 2 = zlib
-	u32 unknown;     // Always 0, as far as I know.
-	u64 encryption;  // 0 = unrequested, 1 = completed, 2 = requested
+	u64 offset;
+	u64 size;
+	u32 compressed;
+	u32 unknown1;
+	u32 unknown2;
+	u32 encrypted;
 
 	void Load(const fs::file& f);
 	void Show() const;
 };
 
-struct version_header
+struct SCEVersionInfo
 {
-	u32 subheader_type; // 1 - sceversion
-	u32 present;        // 0 = false, 1 = true
-	u32 size;           // usually 0x10
-	u32 unknown4;
-
-	void Load(const fs::file& f);
-	void Show() const;
-};
-
-struct supplemental_header
-{
-	u32 type; // 1=PS3 plaintext_capability; 2=PS3 ELF digest; 3=PS3 NPDRM, 4=PS Vita ELF digest; 5=PS Vita NPDRM; 6=PS Vita boot param; 7=PS Vita shared secret
+	u32 subheader_type;
+	u32 present;
 	u32 size;
-	u64 next; // 1 if another Supplemental Header element follows else 0
+	u32 unknown;
+
+	void Load(const fs::file& f);
+	void Show() const;
+};
+
+struct ControlInfo
+{
+	u32 type;
+	u32 size;
+	u64 next;
 
 	union
 	{
-		// type 1, 0x30 bytes
-		struct // 0x20 bytes of data
+		// type 1 0x30 bytes
+		struct
 		{
 			u32 ctrl_flag1;
 			u32 unknown1;
@@ -127,28 +64,41 @@ struct supplemental_header
 			u32 unknown5;
 			u32 unknown6;
 			u32 unknown7;
-		} PS3_plaintext_capability_header;
 
-		// type 2, 0x40 bytes
-		struct // 0x30 bytes of data
-		{
-			u8 constant[0x14]; // same for every PS3/PS Vita SELF, hardcoded in make_fself.exe: 627CB1808AB938E32C8C091708726A579E2586E4
-			u8 elf_digest[0x14]; // SHA-1. Hash F2C552BF716ED24759CBE8A0A9A6DB9965F3811C is blacklisted by appldr
-			u64 required_system_version; // filled on Sony authentication server, contains decimal PS3_SYSTEM_VER value from PARAM.SFO
-		} PS3_elf_digest_header_40;
+		} control_flags;
 
-		// type 2, 0x30 bytes
-		struct // 0x20 bytes of data
+		// type 2 0x30 bytes
+		struct
 		{
-			u8 constant_or_elf_digest[0x14];
-			u8 padding[0xC];
-		} PS3_elf_digest_header_30;
+			u8 digest[20];
+			u64 unknown;
 
-		// type 3, 0x90 bytes
-		struct // 0x80 bytes of data
+		} file_digest_30;
+
+		// type 2 0x40 bytes
+		struct
 		{
-			NPD_HEADER npd;
-		} PS3_npdrm_header;
+			u8 digest1[20];
+			u8 digest2[20];
+			u64 unknown;
+
+		} file_digest_40;
+
+		// type 3 0x90 bytes
+		struct
+		{
+			u32 magic;
+			u32 unknown1;
+			u32 license;
+			u32 type;
+			u8 content_id[48];
+			u8 digest[16];
+			u8 invdigest[16];
+			u8 xordigest[16];
+			u64 unknown2;
+			u64 unknown3;
+
+		} npdrm;
 	};
 
 	void Load(const fs::file& f);
@@ -233,7 +183,7 @@ struct Signature
 
 struct SelfSection
 {
-	u8* data;
+	u8 *data;
 	u64 size;
 	u64 offset;
 
@@ -242,26 +192,25 @@ struct SelfSection
 
 struct Elf32_Ehdr
 {
-	//u8 e_ident[16];      // ELF identification
 	u32 e_magic;
 	u8 e_class;
 	u8 e_data;
 	u8 e_curver;
 	u8 e_os_abi;
 	u64 e_abi_ver;
-	u16 e_type;          // object file type
-	u16 e_machine;       // machine type
-	u32 e_version;       // object file version
-	u32 e_entry;         // entry point address
-	u32 e_phoff;         // program header offset
-	u32 e_shoff;         // section header offset
-	u32 e_flags;         // processor-specific flags
-	u16 e_ehsize;        // ELF header size
-	u16 e_phentsize;     // size of program header entry
-	u16 e_phnum;         // number of program header entries
-	u16 e_shentsize;     // size of section header entry
-	u16 e_shnum;         // number of section header entries
-	u16 e_shstrndx;      // section name string table index
+	u16 e_type;
+	u16 e_machine;
+	u32 e_version;
+	u32 e_entry;
+	u32 e_phoff;
+	u32 e_shoff;
+	u32 e_flags;
+	u16 e_ehsize;
+	u16 e_phentsize;
+	u16 e_phnum;
+	u16 e_shentsize;
+	u16 e_shnum;
+	u16 e_shstrndx;
 
 	void Load(const fs::file& f);
 	static void Show() {}
@@ -272,16 +221,16 @@ struct Elf32_Ehdr
 
 struct Elf32_Shdr
 {
-	u32 sh_name;      // section name
-	u32 sh_type;      // section type
-	u32 sh_flags;     // section attributes
-	u32 sh_addr;      // virtual address in memory
-	u32 sh_offset;    // offset in file
-	u32 sh_size;      // size of section
-	u32 sh_link;      // link to other section
-	u32 sh_info;      // miscellaneous information
-	u32 sh_addralign; // address alignment boundary
-	u32 sh_entsize;   // size of entries, if section has table
+	u32 sh_name;
+	u32 sh_type;
+	u32 sh_flags;
+	u32 sh_addr;
+	u32 sh_offset;
+	u32 sh_size;
+	u32 sh_link;
+	u32 sh_info;
+	u32 sh_addralign;
+	u32 sh_entsize;
 
 	void Load(const fs::file& f);
 	void LoadLE(const fs::file& f);
@@ -290,14 +239,14 @@ struct Elf32_Shdr
 
 struct Elf32_Phdr
 {
-	u32 p_type;   // Segment type
-	u32 p_offset; // Segment file offset
-	u32 p_vaddr;  // Segment virtual address
-	u32 p_paddr;  // Segment physical address
-	u32 p_filesz; // Segment size in file
-	u32 p_memsz;  // Segment size in memory
-	u32 p_flags;  // Segment flags
-	u32 p_align;  // Segment alignment
+	u32 p_type;
+	u32 p_offset;
+	u32 p_vaddr;
+	u32 p_paddr;
+	u32 p_filesz;
+	u32 p_memsz;
+	u32 p_flags;
+	u32 p_align;
 
 	void Load(const fs::file& f);
 	void LoadLE(const fs::file& f);
@@ -306,26 +255,25 @@ struct Elf32_Phdr
 
 struct Elf64_Ehdr
 {
-	//u8 e_ident[16];      // ELF identification
 	u32 e_magic;
 	u8 e_class;
 	u8 e_data;
 	u8 e_curver;
 	u8 e_os_abi;
 	u64 e_abi_ver;
-	u16 e_type;          // object file type
-	u16 e_machine;       // machine type
-	u32 e_version;       // object file version
-	u64 e_entry;         // entry point address
-	u64 e_phoff;         // program header offset
-	u64 e_shoff;         // section header offset
-	u32 e_flags;         // processor-specific flags
-	u16 e_ehsize;        // ELF header size
-	u16 e_phentsize;     // size of program header entry
-	u16 e_phnum;         // number of program header entries
-	u16 e_shentsize;     // size of section header entry
-	u16 e_shnum;         // number of section header entries
-	u16 e_shstrndx;      // section name string table index
+	u16 e_type;
+	u16 e_machine;
+	u32 e_version;
+	u64 e_entry;
+	u64 e_phoff;
+	u64 e_shoff;
+	u32 e_flags;
+	u16 e_ehsize;
+	u16 e_phentsize;
+	u16 e_phnum;
+	u16 e_shentsize;
+	u16 e_shnum;
+	u16 e_shstrndx;
 
 	void Load(const fs::file& f);
 	static void Show() {}
@@ -335,16 +283,16 @@ struct Elf64_Ehdr
 
 struct Elf64_Shdr
 {
-	u32 sh_name;      // section name
-	u32 sh_type;      // section type
-	u64 sh_flags;     // section attributes
-	u64 sh_addr;      // virtual address in memory
-	u64 sh_offset;    // offset in file
-	u64 sh_size;      // size of section
-	u32 sh_link;      // link to other section
-	u32 sh_info;      // miscellaneous information
-	u64 sh_addralign; // address alignment boundary
-	u64 sh_entsize;   // size of entries, if section has table
+	u32 sh_name;
+	u32 sh_type;
+	u64 sh_flags;
+	u64 sh_addr;
+	u64 sh_offset;
+	u64 sh_size;
+	u32 sh_link;
+	u32 sh_info;
+	u64 sh_addralign;
+	u64 sh_entsize;
 
 	void Load(const fs::file& f);
 	static void Show(){}
@@ -352,14 +300,14 @@ struct Elf64_Shdr
 
 struct Elf64_Phdr
 {
-	u32 p_type;   // Segment type
-	u32 p_flags;  // Segment flags
-	u64 p_offset; // Segment file offset
-	u64 p_vaddr;  // Segment virtual address
-	u64 p_paddr;  // Segment physical address
-	u64 p_filesz; // Segment size in file
-	u64 p_memsz;  // Segment size in memory
-	u64 p_align;  // Segment alignment
+	u32 p_type;
+	u32 p_flags;
+	u64 p_offset;
+	u64 p_vaddr;
+	u64 p_paddr;
+	u64 p_filesz;
+	u64 p_memsz;
+	u64 p_align;
 
 	void Load(const fs::file& f);
 	static void Show(){}
@@ -380,18 +328,18 @@ struct SceHeader
 	bool CheckMagic() const { return se_magic == 0x53434500; }
 };
 
-struct ext_hdr
+struct SelfHeader
 {
-	u64 ext_hdr_version;
-	u64 program_identification_hdr_offset;
-	u64 ehdr_offset;
-	u64 phdr_offset;
-	u64 shdr_offset;
-	u64 segment_ext_hdr_offset;
-	u64 version_hdr_offset;
-	u64 supplemental_hdr_offset;
-	u64 supplemental_hdr_size;
-	u64 padding;
+	u64 se_htype;
+	u64 se_appinfooff;
+	u64 se_elfoff;
+	u64 se_phdroff;
+	u64 se_shdroff;
+	u64 se_secinfoff;
+	u64 se_sceveroff;
+	u64 se_controloff;
+	u64 se_controlsize;
+	u64 pad;
 
 	void Load(const fs::file& f);
 	static void Show(){}
@@ -400,8 +348,8 @@ struct ext_hdr
 struct SelfAdditionalInfo
 {
 	bool valid = false;
-	std::vector<supplemental_header> supplemental_hdr;
-	program_identification_header prog_id_hdr;
+	std::vector<ControlInfo> ctrl_info;
+	AppInfo app_info;
 };
 
 class SCEDecrypter
@@ -439,8 +387,8 @@ class SELFDecrypter
 
 	// SCE, SELF and APP headers.
 	SceHeader sce_hdr{};
-	ext_hdr m_ext_hdr{};
-	program_identification_header m_prog_id_hdr{};
+	SelfHeader self_hdr{};
+	AppInfo app_info{};
 
 	// ELF64 header and program header/section header arrays.
 	Elf64_Ehdr elf64_hdr{};
@@ -453,9 +401,9 @@ class SELFDecrypter
 	std::vector<Elf32_Phdr> phdr32_arr{};
 
 	// Decryption info structs.
-	std::vector<segment_ext_header> m_seg_ext_hdr{};
-	version_header m_version_hdr{};
-	std::vector<supplemental_header> m_supplemental_hdr_arr{};
+	std::vector<SectionInfo> secinfo_arr{};
+	SCEVersionInfo scev_info{};
+	std::vector<ControlInfo> ctrlinfo_arr{};
 
 	// Metadata structs.
 	MetadataInfo meta_info{};
@@ -476,11 +424,10 @@ public:
 	fs::file MakeElf(bool isElf32);
 	bool LoadHeaders(bool isElf32, SelfAdditionalInfo* out_info = nullptr);
 	void ShowHeaders(bool isElf32);
-	bool LoadMetadata(const u8* klic_key);
+	bool LoadMetadata(u8* klic_key);
 	bool DecryptData();
 	bool DecryptNPDRM(u8 *metadata, u32 metadata_size);
-	const NPD_HEADER* GetNPDHeader() const;
-	static bool GetKeyFromRap(const char *content_id, u8 *npdrm_key);
+	static bool GetKeyFromRap(u8 *content_id, u8 *npdrm_key);
 
 private:
 	template<typename EHdr, typename SHdr, typename PHdr>
@@ -547,7 +494,7 @@ private:
 		}
 
 		// Write section headers.
-		if (m_ext_hdr.shdr_offset != 0)
+		if (self_hdr.se_shdroff != 0)
 		{
 			e.seek(ehdr.e_shoff);
 
@@ -559,8 +506,7 @@ private:
 	}
 };
 
-fs::file decrypt_self(const fs::file& elf_or_self, const u8* klic_key = nullptr, SelfAdditionalInfo* additional_info = nullptr);
-bool verify_npdrm_self_headers(const fs::file& self, u8* klic_key = nullptr, NPD_HEADER* npd_out = nullptr);
-bool get_npdrm_self_header(const fs::file& self, NPD_HEADER& npd);
+fs::file decrypt_self(fs::file elf_or_self, u8* klic_key = nullptr, SelfAdditionalInfo* additional_info = nullptr);
+bool verify_npdrm_self_headers(const fs::file& self, u8* klic_key = nullptr);
 
 u128 get_default_self_klic();
diff --git a/rpcs3/Crypto/unzip.cpp b/rpcs3/Crypto/unzip.cpp
deleted file mode 100644
index 6485e4d947..0000000000
--- a/rpcs3/Crypto/unzip.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-#include "stdafx.h"
-#include "unzip.h"
-
-#include <zlib.h>
-
-#include "util/serialization_ext.hpp"
-
-std::vector<u8> unzip(const void* src, usz size)
-{
-	if (!src || !size) [[unlikely]]
-	{
-		return {};
-	}
-
-	std::vector<uchar> out(size * 6);
-
-	z_stream zs{};
-#ifndef _MSC_VER
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-	int res = inflateInit2(&zs, 16 + 15);
-	if (res != Z_OK)
-	{
-		return {};
-	}
-#ifndef _MSC_VER
-#pragma GCC diagnostic pop
-#endif
-	zs.avail_in = static_cast<uInt>(size);
-	zs.next_in = reinterpret_cast<const u8*>(src);
-	zs.avail_out = static_cast<uInt>(out.size());
-	zs.next_out  = out.data();
-
-	while (zs.avail_in)
-	{
-		switch (inflate(&zs, Z_FINISH))
-		{
-		case Z_OK:
-		case Z_STREAM_END:
-			break;
-		case Z_BUF_ERROR:
-			if (zs.avail_in)
-				break;
-			[[fallthrough]];
-		default:
-			inflateEnd(&zs);
-			return out;
-		}
-
-		if (zs.avail_in)
-		{
-			const auto cur_size = zs.next_out - out.data();
-			out.resize(out.size() + 65536);
-			zs.avail_out = static_cast<uInt>(out.size() - cur_size);
-			zs.next_out = &out[cur_size];
-		}
-	}
-
-	out.resize(zs.next_out - out.data());
-
-	res = inflateEnd(&zs);
-
-	return out;
-}
-
-bool unzip(const void* src, usz size, fs::file& out)
-{
-	if (!src || !size || !out)
-	{
-		return false;
-	}
-
-	bool is_valid = true;
-
-	constexpr usz BUFSIZE = 32ULL * 1024ULL;
-	std::vector<u8> tempbuf(BUFSIZE);
-	z_stream strm{};
-	strm.avail_in = ::narrow<uInt>(size);
-	strm.avail_out = static_cast<uInt>(tempbuf.size());
-	strm.next_in = reinterpret_cast<const u8*>(src);
-	strm.next_out = tempbuf.data();
-#ifndef _MSC_VER
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-	int res = inflateInit(&strm);
-	if (res != Z_OK)
-	{
-		return false;
-	}
-#ifndef _MSC_VER
-#pragma GCC diagnostic pop
-#endif
-	while (strm.avail_in)
-	{
-		res = inflate(&strm, Z_NO_FLUSH);
-		if (res == Z_STREAM_END)
-			break;
-		if (res != Z_OK)
-			is_valid = false;
-
-		if (strm.avail_out)
-			break;
-
-		if (out.write(tempbuf.data(), tempbuf.size()) != tempbuf.size())
-		{
-			is_valid = false;
-		}
-
-		strm.next_out = tempbuf.data();
-		strm.avail_out = static_cast<uInt>(tempbuf.size());
-	}
-
-	res = inflate(&strm, Z_FINISH);
-
-	if (res != Z_STREAM_END)
-		is_valid = false;
-
-	if (strm.avail_out < tempbuf.size())
-	{
-		const usz bytes_to_write = tempbuf.size() - strm.avail_out;
-
-		if (out.write(tempbuf.data(), bytes_to_write) != bytes_to_write)
-		{
-			is_valid = false;
-		}
-	}
-
-	res = inflateEnd(&strm);
-
-	return is_valid;
-}
-
-bool zip(const void* src, usz size, fs::file& out, bool multi_thread_it)
-{
-	if (!src || !size || !out)
-	{
-		return false;
-	}
-
-	utils::serial compressor;
-	compressor.set_expect_little_data(!multi_thread_it || size < 0x40'0000);
-	compressor.m_file_handler = make_compressed_serialization_file_handler(out);
-
-	std::string_view buffer_view{static_cast<const char*>(src), size};
-
-	while (!buffer_view.empty())
-	{
-		if (!compressor.m_file_handler->is_valid())
-		{
-			return false;
-		}
-
-		const std::string_view slice = buffer_view.substr(0, 0x50'0000);
-
-		compressor(slice);
-		compressor.breathe();
-		buffer_view = buffer_view.substr(slice.size());
-	}
-
-	compressor.m_file_handler->finalize(compressor);
-
-	if (!compressor.m_file_handler->is_valid())
-	{
-		return false;
-	}
-
-	return true;
-}
diff --git a/rpcs3/Crypto/unzip.h b/rpcs3/Crypto/unzip.h
deleted file mode 100644
index 58de49ca0a..0000000000
--- a/rpcs3/Crypto/unzip.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-std::vector<u8> unzip(const void* src, usz size);
-
-template <typename T>
-inline std::vector<u8> unzip(const T& src)
-{
-	return unzip(src.data(), src.size());
-}
-
-bool unzip(const void* src, usz size, fs::file& out);
-
-template <typename T>
-inline bool unzip(const std::vector<u8>& src, fs::file& out)
-{
-	return unzip(src.data(), src.size(), out);
-}
-
-bool zip(const void* src, usz size, fs::file& out, bool multi_thread_it = false);
-
-template <typename T>
-inline bool zip(const T& src, fs::file& out)
-{
-	return zip(src.data(), src.size(), out);
-}
diff --git a/rpcs3/Crypto/utils.cpp b/rpcs3/Crypto/utils.cpp
index 1858fb1fa0..1eb02b727f 100644
--- a/rpcs3/Crypto/utils.cpp
+++ b/rpcs3/Crypto/utils.cpp
@@ -5,8 +5,6 @@
 #include "utils.h"
 #include "aes.h"
 #include "sha1.h"
-#include "sha256.h"
-#include "key_vault.h"
 #include <cstring>
 #include <stdio.h>
 #include <time.h>
@@ -66,7 +64,7 @@ void hex_to_bytes(unsigned char* data, const char* hex_str, unsigned int str_len
 
 
 // Crypto functions (AES128-CBC, AES128-ECB, SHA1-HMAC and AES-CMAC).
-void aescbc128_decrypt(unsigned char *key, unsigned char *iv, unsigned char *in, unsigned char *out, usz len)
+void aescbc128_decrypt(unsigned char *key, unsigned char *iv, unsigned char *in, unsigned char *out, int len)
 {
 	aes_context ctx;
 	aes_setkey_dec(&ctx, key, 128);
@@ -76,7 +74,7 @@ void aescbc128_decrypt(unsigned char *key, unsigned char *iv, unsigned char *in,
 	memset(iv, 0, 0x10);
 }
 
-void aescbc128_encrypt(unsigned char *key, unsigned char *iv, unsigned char *in, unsigned char *out, usz len)
+void aescbc128_encrypt(unsigned char *key, unsigned char *iv, unsigned char *in, unsigned char *out, int len)
 {
 	aes_context ctx;
 	aes_setkey_enc(&ctx, key, 128);
@@ -93,7 +91,7 @@ void aesecb128_encrypt(unsigned char *key, unsigned char *in, unsigned char *out
 	aes_crypt_ecb(&ctx, AES_ENCRYPT, in, out);
 }
 
-bool hmac_hash_compare(unsigned char *key, int key_len, unsigned char *in, usz in_len, unsigned char *hash, usz hash_len)
+bool hmac_hash_compare(unsigned char *key, int key_len, unsigned char *in, int in_len, unsigned char *hash, int hash_len)
 {
 	const std::unique_ptr<u8[]> out(new u8[key_len]);
 
@@ -102,12 +100,12 @@ bool hmac_hash_compare(unsigned char *key, int key_len, unsigned char *in, usz i
 	return std::memcmp(out.get(), hash, hash_len) == 0;
 }
 
-void hmac_hash_forge(unsigned char *key, int key_len, unsigned char *in, usz in_len, unsigned char *hash)
+void hmac_hash_forge(unsigned char *key, int key_len, unsigned char *in, int in_len, unsigned char *hash)
 {
 	sha1_hmac(key, key_len, in, in_len, hash);
 }
 
-bool cmac_hash_compare(unsigned char *key, int key_len, unsigned char *in, usz in_len, unsigned char *hash, usz hash_len)
+bool cmac_hash_compare(unsigned char *key, int key_len, unsigned char *in, int in_len, unsigned char *hash, int hash_len)
 {
 	const std::unique_ptr<u8[]> out(new u8[key_len]);
 
@@ -118,7 +116,7 @@ bool cmac_hash_compare(unsigned char *key, int key_len, unsigned char *in, usz i
 	return std::memcmp(out.get(), hash, hash_len) == 0;
 }
 
-void cmac_hash_forge(unsigned char *key, int /*key_len*/, unsigned char *in, usz in_len, unsigned char *hash)
+void cmac_hash_forge(unsigned char *key, int /*key_len*/, unsigned char *in, int in_len, unsigned char *hash)
 {
 	aes_context ctx;
 	aes_setkey_enc(&ctx, key, 128);
@@ -139,106 +137,8 @@ char* extract_file_name(const char* file_path, char real_file_name[CRYPTO_MAX_PA
 	return real_file_name;
 }
 
-std::string sha256_get_hash(const char* data, usz size, bool lower_case)
-{
-	u8 res_hash[32];
-	mbedtls_sha256_context ctx;
-	mbedtls_sha256_init(&ctx);
-	mbedtls_sha256_starts_ret(&ctx, 0);
-	mbedtls_sha256_update_ret(&ctx, reinterpret_cast<const unsigned char*>(data), size);
-	mbedtls_sha256_finish_ret(&ctx, res_hash);
-
-	std::string res_hash_string("0000000000000000000000000000000000000000000000000000000000000000");
-
-	for (usz index = 0; index < 32; index++)
-	{
-		const auto pal                   = lower_case ? "0123456789abcdef" : "0123456789ABCDEF";
-		res_hash_string[index * 2]       = pal[res_hash[index] >> 4];
-		res_hash_string[(index * 2) + 1] = pal[res_hash[index] & 15];
-	}
-
-	return res_hash_string;
-}
-
 void mbedtls_zeroize(void *v, size_t n)
 {
 	static void *(*const volatile unop_memset)(void *, int, size_t) = &memset;
 	(void)unop_memset(v, 0, n);
 }
-
-
-// SC passphrase crypto
-
-void sc_form_key(const u8* sc_key, const std::array<u8, PASSPHRASE_KEY_LEN>& laid_paid, u8* key)
-{
-	for (u32 i = 0; i < PASSPHRASE_KEY_LEN; i++)
-	{
-		key[i] = static_cast<u8>(sc_key[i] ^ laid_paid[i]);
-	}
-}
-
-std::array<u8, PASSPHRASE_KEY_LEN> sc_combine_laid_paid(s64 laid, s64 paid)
-{
-	const std::string paid_laid = fmt::format("%016llx%016llx", laid, paid);
-	std::array<u8, PASSPHRASE_KEY_LEN> out{};
-	hex_to_bytes(out.data(), paid_laid.c_str(), PASSPHRASE_KEY_LEN * 2);
-	return out;
-}
-
-std::array<u8, PASSPHRASE_KEY_LEN> vtrm_get_laid_paid_from_type(int type)
-{
-	// No idea what this type stands for
-	switch (type)
-	{
-	case 0: return sc_combine_laid_paid(0xFFFFFFFFFFFFFFFFL, 0xFFFFFFFFFFFFFFFFL);
-	case 1: return sc_combine_laid_paid(LAID_2, 0x1070000000000001L);
-	case 2: return sc_combine_laid_paid(LAID_2, 0x0000000000000000L);
-	case 3: return sc_combine_laid_paid(LAID_2, PAID_69);
-	default:
-		fmt::throw_exception("vtrm_get_laid_paid_from_type: Wrong type specified (type=%d)", type);
-	}
-}
-
-std::array<u8, PASSPHRASE_KEY_LEN> vtrm_portability_laid_paid()
-{
-	// 107000002A000001
-	return sc_combine_laid_paid(0x0000000000000000L, 0x0000000000000000L);
-}
-
-int sc_decrypt(const u8* sc_key, const std::array<u8, PASSPHRASE_KEY_LEN>& laid_paid, u8* iv, u8* input, u8* output)
-{
-	aes_context ctx;
-	u8 key[PASSPHRASE_KEY_LEN];
-	sc_form_key(sc_key, laid_paid, key);
-	aes_setkey_dec(&ctx, key, 128);
-	return aes_crypt_cbc(&ctx, AES_DECRYPT, PASSPHRASE_OUT_LEN, iv, input, output);
-}
-
-int vtrm_decrypt(int type, u8* iv, u8* input, u8* output)
-{
-	return sc_decrypt(SC_ISO_SERIES_KEY_2, vtrm_get_laid_paid_from_type(type), iv, input, output);
-}
-
-int vtrm_decrypt_master(s64 laid, s64 paid, u8* iv, u8* input, u8* output)
-{
-	return sc_decrypt(SC_ISO_SERIES_INTERNAL_KEY_3, sc_combine_laid_paid(laid, paid), iv, input, output);
-}
-
-const u8* vtrm_portability_type_mapper(int type)
-{
-	// No idea what this type stands for
-	switch (type)
-	{
-	//case 0: return key_for_type_1;
-	case 1: return SC_ISO_SERIES_KEY_2;
-	case 2: return SC_ISO_SERIES_KEY_1;
-	case 3: return SC_KEY_FOR_MASTER_2;
-	default:
-		fmt::throw_exception("vtrm_portability_type_mapper: Wrong type specified (type=%d)", type);
-	}
-}
-
-int vtrm_decrypt_with_portability(int type, u8* iv, u8* input, u8* output)
-{
-	return sc_decrypt(vtrm_portability_type_mapper(type), vtrm_portability_laid_paid(), iv, input, output);
-}
diff --git a/rpcs3/Crypto/utils.h b/rpcs3/Crypto/utils.h
index 25cdeb7193..d1c81a6ba8 100644
--- a/rpcs3/Crypto/utils.h
+++ b/rpcs3/Crypto/utils.h
@@ -10,26 +10,46 @@
 
 enum { CRYPTO_MAX_PATH = 4096 };
 
-char* extract_file_name(const char* file_path, char real_file_name[CRYPTO_MAX_PATH]);
+// Auxiliary functions (endian swap, xor, and file name).
+inline u16 swap16(u16 i)
+{
+#if defined(__GNUG__)
+	return __builtin_bswap16(i);
+#else
+	return _byteswap_ushort(i);
+#endif
+}
 
-std::string sha256_get_hash(const char* data, usz size, bool lower_case);
+inline u32 swap32(u32 i)
+{
+#if defined(__GNUG__)
+	return __builtin_bswap32(i);
+#else
+	return _byteswap_ulong(i);
+#endif
+}
+
+inline u64 swap64(u64 i)
+{
+#if defined(__GNUG__)
+	return __builtin_bswap64(i);
+#else
+	return _byteswap_uint64(i);
+#endif
+}
+
+char* extract_file_name(const char* file_path, char real_file_name[CRYPTO_MAX_PATH]);
 
 // Hex string conversion auxiliary functions.
 u64 hex_to_u64(const char* hex_str);
 void hex_to_bytes(unsigned char *data, const char *hex_str, unsigned int str_length);
 
 // Crypto functions (AES128-CBC, AES128-ECB, SHA1-HMAC and AES-CMAC).
-void aescbc128_decrypt(unsigned char *key, unsigned char *iv, unsigned char *in, unsigned char *out, usz len);
-void aescbc128_encrypt(unsigned char *key, unsigned char *iv, unsigned char *in, unsigned char *out, usz len);
+void aescbc128_decrypt(unsigned char *key, unsigned char *iv, unsigned char *in, unsigned char *out, int len);
+void aescbc128_encrypt(unsigned char *key, unsigned char *iv, unsigned char *in, unsigned char *out, int len);
 void aesecb128_encrypt(unsigned char *key, unsigned char *in, unsigned char *out);
-bool hmac_hash_compare(unsigned char *key, int key_len, unsigned char *in, usz in_len, unsigned char *hash, usz hash_len);
-void hmac_hash_forge(unsigned char *key, int key_len, unsigned char *in, usz in_len, unsigned char *hash);
-bool cmac_hash_compare(unsigned char *key, int key_len, unsigned char *in, usz in_len, unsigned char *hash, usz hash_len);
-void cmac_hash_forge(unsigned char *key, int key_len, unsigned char *in, usz in_len, unsigned char *hash);
+bool hmac_hash_compare(unsigned char *key, int key_len, unsigned char *in, int in_len, unsigned char *hash, int hash_len);
+void hmac_hash_forge(unsigned char *key, int key_len, unsigned char *in, int in_len, unsigned char *hash);
+bool cmac_hash_compare(unsigned char *key, int key_len, unsigned char *in, int in_len, unsigned char *hash, int hash_len);
+void cmac_hash_forge(unsigned char *key, int key_len, unsigned char *in, int in_len, unsigned char *hash);
 void mbedtls_zeroize(void *v, size_t n);
-
-// SC passphrase crypto
-
-int vtrm_decrypt(int type, u8* iv, u8* input, u8* output);
-int vtrm_decrypt_master(s64 laid, s64 paid, u8* iv, u8* input, u8* output);
-int vtrm_decrypt_with_portability(int type, u8* iv, u8* input, u8* output);
diff --git a/rpcs3/Cubeb.vcxproj.filters b/rpcs3/Cubeb.vcxproj.filters
deleted file mode 100644
index 396ad1527d..0000000000
--- a/rpcs3/Cubeb.vcxproj.filters
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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>{F573EFFC-2BB8-43DF-AEFA-4E9EA31A817F}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Emu\Audio\Cubeb\CubebBackend.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Audio\Cubeb\cubeb_enumerator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Emu\Audio\Cubeb\CubebBackend.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Audio\Cubeb\cubeb_enumerator.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
diff --git a/rpcs3/Emu/Audio/AL/OpenALBackend.cpp b/rpcs3/Emu/Audio/AL/OpenALBackend.cpp
new file mode 100644
index 0000000000..78820c8fd3
--- /dev/null
+++ b/rpcs3/Emu/Audio/AL/OpenALBackend.cpp
@@ -0,0 +1,212 @@
+#include "stdafx.h"
+
+#include "OpenALBackend.h"
+
+#ifdef _MSC_VER
+#pragma comment(lib, "OpenAL32.lib")
+#endif
+
+LOG_CHANNEL(OpenAL);
+
+#define checkForAlError(sit) do { ALenum g_last_al_error = alGetError(); if(g_last_al_error != AL_NO_ERROR) OpenAL.error("%s: OpenAL error 0x%04x", sit, g_last_al_error); } while(0)
+#define checkForAlcError(sit) do { ALCenum g_last_alc_error = alcGetError(m_device); if(g_last_alc_error != ALC_NO_ERROR) { OpenAL.error("%s: OpenALC error 0x%04x", sit, g_last_alc_error); return; }} while(0)
+
+OpenALBackend::OpenALBackend()
+	: AudioBackend()
+{
+	ALCint attribs[] = {ALC_FREQUENCY, DEFAULT_AUDIO_SAMPLING_RATE, 0, 0};
+
+	ALCdevice* m_device = alcOpenDevice(nullptr);
+	checkForAlcError("alcOpenDevice");
+
+	ALCcontext* m_context = alcCreateContext(m_device, attribs);
+	checkForAlcError("alcCreateContext");
+
+	alcMakeContextCurrent(m_context);
+	checkForAlcError("alcMakeContextCurrent");
+
+	switch (m_channels)
+	{
+	case 2:
+		m_format = (m_sample_size == 2) ? AL_FORMAT_STEREO16 : AL_FORMAT_STEREO_FLOAT32;
+		break;
+	case 6:
+		m_format = (m_sample_size == 2) ? AL_FORMAT_51CHN16 : AL_FORMAT_51CHN32;
+		break;
+	default:
+		m_format = (m_sample_size == 2) ? AL_FORMAT_71CHN16 : AL_FORMAT_71CHN32;
+		break;
+	}
+}
+
+OpenALBackend::~OpenALBackend()
+{
+	if (alIsSource(m_source))
+	{
+		Close();
+	}
+
+	if (ALCcontext* m_context = alcGetCurrentContext())
+	{
+		ALCdevice* m_device = alcGetContextsDevice(m_context);
+		alcMakeContextCurrent(nullptr);
+		alcDestroyContext(m_context);
+		alcCloseDevice(m_device);
+	}
+}
+
+void OpenALBackend::Play()
+{
+	AUDIT(alIsSource(m_source));
+
+	ALint state;
+	alGetSourcei(m_source, AL_SOURCE_STATE, &state);
+	checkForAlError("Play->alGetSourcei(AL_SOURCE_STATE)");
+
+	if (state != AL_PLAYING)
+	{
+		alSourcePlay(m_source);
+		checkForAlError("Play->alSourcePlay");
+	}
+}
+
+void OpenALBackend::Pause()
+{
+	AUDIT(alIsSource(m_source));
+
+	alSourcePause(m_source);
+	checkForAlError("Pause->alSourcePause");
+}
+
+bool OpenALBackend::IsPlaying()
+{
+	AUDIT(alIsSource(m_source));
+
+	ALint state;
+	alGetSourcei(m_source, AL_SOURCE_STATE, &state);
+	checkForAlError("IsPlaying->alGetSourcei(AL_SOURCE_STATE)");
+
+	return state == AL_PLAYING;
+}
+
+void OpenALBackend::Open(u32 num_buffers)
+{
+	AUDIT(!alIsSource(m_source));
+
+	// Initialize Source
+	alGenSources(1, &m_source);
+	checkForAlError("Open->alGenSources");
+
+	alSourcei(m_source, AL_LOOPING, AL_FALSE);
+	checkForAlError("Open->alSourcei");
+
+	// Initialize Buffers
+	alGenBuffers(num_buffers, m_buffers);
+	checkForAlError("Open->alGenBuffers");
+
+	m_num_buffers = num_buffers;
+	m_num_unqueued = num_buffers;
+}
+
+void OpenALBackend::Close()
+{
+	if (alIsSource(m_source))
+	{
+		// Stop & Kill Source
+		Pause();
+		alDeleteSources(1, &m_source);
+
+		// Free Buffers
+		alDeleteBuffers(m_num_buffers, m_buffers);
+		checkForAlError("alDeleteBuffers");
+	}
+}
+
+bool OpenALBackend::AddData(const void* src, u32 num_samples)
+{
+	AUDIT(alIsSource(m_source));
+
+	// Unqueue processed buffers, if any
+	unqueue_processed();
+
+	// Fail if there are no free buffers remaining
+	if (m_num_unqueued == 0)
+	{
+		OpenAL.warning("No unqueued buffers remaining");
+		return false;
+	}
+
+	// Copy data to the next available buffer
+	alBufferData(m_buffers[m_next_buffer], m_format, src, num_samples * m_sample_size, m_sampling_rate);
+	checkForAlError("AddData->alBufferData");
+
+	// Enqueue buffer
+	alSourceQueueBuffers(m_source, 1, &m_buffers[m_next_buffer]);
+	checkForAlError("AddData->alSourceQueueBuffers");
+
+	m_num_unqueued--;
+	m_next_buffer = (m_next_buffer + 1) % m_num_buffers;
+
+	return true;
+}
+
+void OpenALBackend::Flush()
+{
+	AUDIT(alIsSource(m_source));
+
+	// Stop source first
+	alSourceStop(m_source);
+	checkForAlError("Flush->alSourceStop");
+
+	// Unqueue processed buffers (should now be all of them)
+	unqueue_processed();
+}
+
+void OpenALBackend::unqueue_processed()
+{
+	AUDIT(alIsSource(m_source));
+
+	// Get number of buffers
+	ALint num_processed;
+	alGetSourcei(m_source, AL_BUFFERS_PROCESSED, &num_processed);
+	checkForAlError("Flush->alGetSourcei(AL_BUFFERS_PROCESSED)");
+
+	if (num_processed > 0)
+	{
+		// Unqueue all buffers
+		ALuint x[MAX_AUDIO_BUFFERS];
+		alSourceUnqueueBuffers(m_source, num_processed, x);
+		checkForAlError("Flush->alSourceUnqueueBuffers");
+
+		m_num_unqueued += num_processed;
+	}
+}
+
+u64 OpenALBackend::GetNumEnqueuedSamples()
+{
+	AUDIT(alIsSource(m_source));
+
+	// Get number of buffers queued
+	ALint num_queued;
+	alGetSourcei(m_source, AL_BUFFERS_QUEUED, &num_queued);
+	checkForAlError("GetNumEnqueuedSamples->alGetSourcei(AL_BUFFERS_QUEUED)");
+	AUDIT(static_cast<u32>(num_queued) <= m_num_buffers - m_num_unqueued);
+
+	// Get sample position
+	ALint sample_pos;
+	alGetSourcei(m_source, AL_SAMPLE_OFFSET, &sample_pos);
+	checkForAlError("GetNumEnqueuedSamples->alGetSourcei(AL_SAMPLE_OFFSET)");
+
+	// Return
+	return (num_queued * AUDIO_BUFFER_SAMPLES) + (sample_pos % AUDIO_BUFFER_SAMPLES);
+}
+
+f32 OpenALBackend::SetFrequencyRatio(f32 new_ratio)
+{
+	new_ratio = std::clamp(new_ratio, 0.5f, 2.0f);
+
+	alSourcef(m_source, AL_PITCH, new_ratio);
+	checkForAlError("SetFrequencyRatio->alSourcei(AL_PITCH)");
+
+	return new_ratio;
+}
\ No newline at end of file
diff --git a/rpcs3/Emu/Audio/AL/OpenALBackend.h b/rpcs3/Emu/Audio/AL/OpenALBackend.h
new file mode 100644
index 0000000000..ef077f729a
--- /dev/null
+++ b/rpcs3/Emu/Audio/AL/OpenALBackend.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include "Emu/Audio/AudioBackend.h"
+#include "3rdparty/OpenAL/include/alext.h"
+
+class OpenALBackend : public AudioBackend
+{
+private:
+	ALint m_format{};
+	ALuint m_source{};
+	ALuint m_buffers[MAX_AUDIO_BUFFERS]{};
+	ALsizei m_num_buffers{};
+
+	u32 m_next_buffer = 0;
+	u32 m_num_unqueued = 0;
+
+	void unqueue_processed();
+
+public:
+	OpenALBackend();
+	~OpenALBackend() override;
+
+	const char* GetName() const override { return "OpenAL"; }
+
+	static const u32 capabilities = PLAY_PAUSE_FLUSH | IS_PLAYING | GET_NUM_ENQUEUED_SAMPLES | SET_FREQUENCY_RATIO;
+	u32 GetCapabilities() const override { return capabilities; }
+
+	void Open(u32 num_buffers) override;
+	void Close() override;
+
+	void Play() override;
+	void Pause() override;
+	bool IsPlaying() override;
+
+	bool AddData(const void* src, u32 num_samples) override;
+	void Flush() override;
+
+	u64 GetNumEnqueuedSamples() override;
+	f32 SetFrequencyRatio(f32 new_ratio) override;
+};
diff --git a/rpcs3/Emu/Audio/ALSA/ALSABackend.cpp b/rpcs3/Emu/Audio/ALSA/ALSABackend.cpp
new file mode 100644
index 0000000000..51f74bc7c6
--- /dev/null
+++ b/rpcs3/Emu/Audio/ALSA/ALSABackend.cpp
@@ -0,0 +1,166 @@
+#ifndef HAVE_ALSA
+#error "ALSA support disabled but still being built."
+#endif
+
+#include "stdafx.h"
+#include "Emu/system_config.h"
+
+#include "ALSABackend.h"
+
+LOG_CHANNEL(ALSA);
+
+static void error(int err, const char* reason)
+{
+	ALSA.error("ALSA: %s failed: %s\n", reason, snd_strerror(err));
+}
+
+static bool check(int err, const char* reason)
+{
+	if (err < 0)
+	{
+		error(err, reason);
+		return false;
+	}
+
+	return true;
+}
+
+ALSABackend::ALSABackend()
+	: AudioBackend()
+{
+}
+
+ALSABackend::~ALSABackend()
+{
+	if (tls_sw_params || tls_hw_params || tls_handle)
+	{
+		Close();
+	}
+}
+
+void ALSABackend::Open(u32 num_buffers)
+{
+	if (!check(snd_pcm_open(&tls_handle, "default", SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK), "snd_pcm_open"))
+		return;
+
+	if (!check(snd_pcm_hw_params_malloc(&tls_hw_params), "snd_pcm_hw_params_malloc"))
+		return;
+
+	if (!check(snd_pcm_hw_params_any(tls_handle, tls_hw_params), "snd_pcm_hw_params_any"))
+		return;
+
+	if (!check(snd_pcm_hw_params_set_access(tls_handle, tls_hw_params, SND_PCM_ACCESS_RW_INTERLEAVED), "snd_pcm_hw_params_set_access"))
+		return;
+
+	if (!check(snd_pcm_hw_params_set_format(tls_handle, tls_hw_params, m_convert_to_u16 ? SND_PCM_FORMAT_S16_LE : SND_PCM_FORMAT_FLOAT_LE), "snd_pcm_hw_params_set_format"))
+		return;
+
+	uint rate = m_sampling_rate;
+	if (!check(snd_pcm_hw_params_set_rate_near(tls_handle, tls_hw_params, &rate, nullptr), "snd_pcm_hw_params_set_rate_near"))
+		return;
+
+	if (!check(snd_pcm_hw_params_set_channels(tls_handle, tls_hw_params, m_channels), "snd_pcm_hw_params_set_channels"))
+		return;
+
+	//uint period = 5333;
+	//if (!check(snd_pcm_hw_params_set_period_time_near(tls_handle, tls_hw_params, &period, nullptr), "snd_pcm_hw_params_set_period_time_near"))
+	//	return;
+
+	//if (!check(snd_pcm_hw_params_set_periods(tls_handle, tls_hw_params, 4, 0), "snd_pcm_hw_params_set_periods"))
+	//	return;
+
+	snd_pcm_uframes_t bufsize_frames = num_buffers * AUDIO_BUFFER_SAMPLES;
+	snd_pcm_uframes_t period_frames = AUDIO_BUFFER_SAMPLES;
+
+	if (!check(snd_pcm_hw_params_set_buffer_size_near(tls_handle, tls_hw_params, &bufsize_frames), "snd_pcm_hw_params_set_buffer_size_near"))
+		return;
+
+	if (!check(snd_pcm_hw_params_set_period_size_near(tls_handle, tls_hw_params, &period_frames, 0), "snd_pcm_hw_params_set_period_size"))
+		return;
+
+	if (!check(snd_pcm_hw_params(tls_handle, tls_hw_params), "snd_pcm_hw_params"))
+		return;
+
+	if (!check(snd_pcm_hw_params_get_buffer_size(tls_hw_params, &bufsize_frames), "snd_pcm_hw_params_get_buffer_size"))
+		return;
+
+	if (!check(snd_pcm_hw_params_get_period_size(tls_hw_params, &period_frames, nullptr), "snd_pcm_hw_params_get_period_size"))
+		return;
+
+	if (!check(snd_pcm_sw_params_malloc(&tls_sw_params), "snd_pcm_sw_params_malloc"))
+		return;
+
+	if (!check(snd_pcm_sw_params_current(tls_handle, tls_sw_params), "snd_pcm_sw_params_current"))
+		return;
+
+	period_frames *= m_start_threshold;
+
+	if (!check(snd_pcm_sw_params_set_start_threshold(tls_handle, tls_sw_params, period_frames + 1), "snd_pcm_sw_params_set_start_threshold"))
+		return;
+
+	if (!check(snd_pcm_sw_params_set_stop_threshold(tls_handle, tls_sw_params, bufsize_frames), "snd_pcm_sw_params_set_stop_threshold"))
+		return;
+
+	if (!check(snd_pcm_sw_params(tls_handle, tls_sw_params), "snd_pcm_sw_params"))
+		return;
+
+	if (!check(snd_pcm_prepare(tls_handle), "snd_pcm_prepare"))
+		return;
+
+	ALSA.notice("bufsize_frames=%u, period_frames=%u", bufsize_frames, period_frames);
+}
+
+void ALSABackend::Close()
+{
+	if (tls_sw_params)
+	{
+		snd_pcm_sw_params_free(tls_sw_params);
+		tls_sw_params = nullptr;
+	}
+
+	if (tls_hw_params)
+	{
+		snd_pcm_hw_params_free(tls_hw_params);
+		tls_hw_params = nullptr;
+	}
+
+	if (tls_handle)
+	{
+		snd_pcm_close(tls_handle);
+		tls_handle = nullptr;
+	}
+}
+
+bool ALSABackend::AddData(const void* src, u32 num_samples)
+{
+	u32 num_frames = num_samples / m_channels;
+
+	int res = snd_pcm_writei(tls_handle, src, num_frames);
+
+	if (res == -EAGAIN)
+	{
+		ALSA.warning("EAGAIN");
+		return false;
+	}
+
+	if (res < 0)
+	{
+		res = snd_pcm_recover(tls_handle, res, 0);
+
+		if (res < 0)
+		{
+			ALSA.warning("Failed to recover (%d)", res);
+			return false;
+		}
+
+		return false;
+	}
+
+	if (res + 0u != num_frames)
+	{
+		ALSA.warning("Error (%d)", res);
+		return false;
+	}
+
+	return true;
+}
diff --git a/rpcs3/Emu/Audio/ALSA/ALSABackend.h b/rpcs3/Emu/Audio/ALSA/ALSABackend.h
new file mode 100644
index 0000000000..5da05b807b
--- /dev/null
+++ b/rpcs3/Emu/Audio/ALSA/ALSABackend.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#ifndef HAVE_ALSA
+#error "ALSA support disabled but still being built."
+#endif
+
+#include "Emu/Audio/AudioBackend.h"
+
+#include <alsa/asoundlib.h>
+
+class ALSABackend : public AudioBackend
+{
+	snd_pcm_t* tls_handle{};
+	snd_pcm_hw_params_t* tls_hw_params{};
+	snd_pcm_sw_params_t* tls_sw_params{};
+
+public:
+	ALSABackend();
+	virtual ~ALSABackend() override;
+
+	ALSABackend(const ALSABackend&) = delete;
+	ALSABackend& operator=(const ALSABackend&) = delete;
+
+	virtual const char* GetName() const override { return "ALSA"; }
+
+	static const u32 capabilities = 0;
+	virtual u32 GetCapabilities() const override { return capabilities; }
+
+	virtual void Open(u32) override;
+	virtual void Close() override;
+
+	virtual bool AddData(const void* src, u32 num_samples) override;
+};
diff --git a/rpcs3/Emu/Audio/AudioBackend.cpp b/rpcs3/Emu/Audio/AudioBackend.cpp
index e0d96c8c2b..65add4fb22 100644
--- a/rpcs3/Emu/Audio/AudioBackend.cpp
+++ b/rpcs3/Emu/Audio/AudioBackend.cpp
@@ -1,20 +1,45 @@
 #include "stdafx.h"
 #include "AudioBackend.h"
-#include "Emu/IdManager.h"
-#include "Emu//Cell/Modules/cellAudioOut.h"
+#include "Emu/system_config.h"
 
-AudioBackend::AudioBackend() {}
-
-void AudioBackend::SetWriteCallback(std::function<u32(u32 /* byte_cnt */, void* /* buffer */)> cb)
+AudioBackend::AudioBackend()
 {
-	std::lock_guard lock(m_cb_mutex);
-	m_write_callback = cb;
-}
+	m_convert_to_u16 = static_cast<bool>(g_cfg.audio.convert_to_u16);
+	m_sample_size = m_convert_to_u16 ? sizeof(u16) : sizeof(float);
+	m_start_threshold = g_cfg.audio.start_threshold;
 
-void AudioBackend::SetStateCallback(std::function<void(AudioStateEvent)> cb)
-{
-	std::lock_guard lock(m_state_cb_mutex);
-	m_state_callback = cb;
+	const u32 sampling_period_multiplier_u32 = g_cfg.audio.sampling_period_multiplier;
+
+	if (sampling_period_multiplier_u32 == 100)
+	{
+		m_sampling_rate = DEFAULT_AUDIO_SAMPLING_RATE;
+	}
+	else
+	{
+		const f32 sampling_period_multiplier = sampling_period_multiplier_u32 / 100.0f;
+		const f32 sampling_rate_multiplier = 1.0f / sampling_period_multiplier;
+		m_sampling_rate = static_cast<u32>(f32{ DEFAULT_AUDIO_SAMPLING_RATE } *sampling_rate_multiplier);
+	}
+
+	const audio_downmix downmix = g_cfg.audio.audio_channel_downmix.get();
+
+	switch (downmix)
+	{
+	case audio_downmix::no_downmix:
+		m_channels = 8;
+		break;
+	case audio_downmix::downmix_to_stereo:
+		m_channels = 2;
+		break;
+	case audio_downmix::downmix_to_5_1:
+		m_channels = 6;
+		break;
+	case audio_downmix::use_application_settings:
+		m_channels = 2; // TODO
+		break;
+	default:
+		fmt::throw_exception("Unknown audio channel mode %s (%d)", downmix, static_cast<int>(downmix));
+	}
 }
 
 /*
@@ -22,12 +47,12 @@ void AudioBackend::SetStateCallback(std::function<void(AudioStateEvent)> cb)
  */
 u32 AudioBackend::get_sampling_rate() const
 {
-	return static_cast<std::underlying_type_t<decltype(m_sampling_rate)>>(m_sampling_rate);
+	return m_sampling_rate;
 }
 
 u32 AudioBackend::get_sample_size() const
 {
-	return static_cast<std::underlying_type_t<decltype(m_sample_size)>>(m_sample_size);
+	return m_sample_size;
 }
 
 u32 AudioBackend::get_channels() const
@@ -35,171 +60,47 @@ u32 AudioBackend::get_channels() const
 	return m_channels;
 }
 
-audio_channel_layout AudioBackend::get_channel_layout() const
+bool AudioBackend::get_convert_to_u16() const
 {
-	return m_layout;
+	return m_convert_to_u16;
 }
 
-bool AudioBackend::get_convert_to_s16() const
+bool AudioBackend::has_capability(u32 cap) const
 {
-	return m_sample_size == AudioSampleSize::S16;
+	return (cap & GetCapabilities()) == cap;
 }
 
-void AudioBackend::convert_to_s16(u32 cnt, const f32* src, void* dst)
+void AudioBackend::dump_capabilities(std::string& out) const
 {
-	for (u32 i = 0; i < cnt; i++)
+	u32 count = 0;
+	const u32 capabilities = GetCapabilities();
+
+	if (capabilities & PLAY_PAUSE_FLUSH)
 	{
-		static_cast<s16*>(dst)[i] = static_cast<s16>(std::clamp(src[i] * 32768.5f, -32768.0f, 32767.0f));
+		fmt::append(out, "PLAY_PAUSE_FLUSH");
+		count++;
+	}
+
+	if (capabilities & IS_PLAYING)
+	{
+		fmt::append(out, "%sIS_PLAYING", count > 0 ? " | " : "");
+		count++;
+	}
+
+	if (capabilities & GET_NUM_ENQUEUED_SAMPLES)
+	{
+		fmt::append(out, "%sGET_NUM_ENQUEUED_SAMPLES", count > 0 ? " | " : "");
+		count++;
+	}
+
+	if (capabilities & SET_FREQUENCY_RATIO)
+	{
+		fmt::append(out, "%sSET_FREQUENCY_RATIO", count > 0 ? " | " : "");
+		count++;
+	}
+
+	if (count == 0)
+	{
+		fmt::append(out, "NONE");
 	}
 }
-
-f32 AudioBackend::apply_volume(const VolumeParam& param, u32 sample_cnt, const f32* src, f32* dst)
-{
-	ensure(param.ch_cnt > 1 && param.ch_cnt % 2 == 0); // Tends to produce faster code
-
-	const f32 vol_incr = (param.target_volume - param.initial_volume) / (VOLUME_CHANGE_DURATION * param.freq);
-	f32 crnt_vol = param.current_volume;
-	u32 sample_idx = 0;
-
-	if (vol_incr >= 0)
-	{
-		for (sample_idx = 0; sample_idx < sample_cnt && crnt_vol != param.target_volume; sample_idx += param.ch_cnt)
-		{
-			crnt_vol = std::min(param.current_volume + (sample_idx + 1) / param.ch_cnt * vol_incr, param.target_volume);
-
-			for (u32 i = 0; i < param.ch_cnt; i++)
-			{
-				dst[sample_idx + i] = src[sample_idx + i] * crnt_vol;
-			}
-		}
-	}
-	else
-	{
-		for (sample_idx = 0; sample_idx < sample_cnt && crnt_vol != param.target_volume; sample_idx += param.ch_cnt)
-		{
-			crnt_vol = std::max(param.current_volume + (sample_idx + 1) / param.ch_cnt * vol_incr, param.target_volume);
-
-			for (u32 i = 0; i < param.ch_cnt; i++)
-			{
-				dst[sample_idx + i] = src[sample_idx + i] * crnt_vol;
-			}
-		}
-	}
-
-	if (sample_cnt > sample_idx)
-	{
-		apply_volume_static(param.target_volume, sample_cnt - sample_idx, &src[sample_idx], &dst[sample_idx]);
-	}
-
-	return crnt_vol;
-}
-
-void AudioBackend::apply_volume_static(f32 vol, u32 sample_cnt, const f32* src, f32* dst)
-{
-	for (u32 i = 0; i < sample_cnt; i++)
-	{
-		dst[i] = src[i] * vol;
-	}
-}
-
-void AudioBackend::normalize(u32 sample_cnt, const f32* src, f32* dst)
-{
-	for (u32 i = 0; i < sample_cnt; i++)
-	{
-		dst[i] = std::clamp<f32>(src[i], -1.0f, 1.0f);
-	}
-}
-
-std::pair<AudioChannelCnt, AudioChannelCnt> AudioBackend::get_channel_count_and_downmixer(u32 device_index)
-{
-	audio_out_configuration& audio_out_cfg = g_fxo->get<audio_out_configuration>();
-	std::lock_guard lock(audio_out_cfg.mtx);
-	const audio_out_configuration::audio_out& out = ::at32(audio_out_cfg.out, device_index);
-	return out.get_channel_count_and_downmixer();
-}
-
-AudioChannelCnt AudioBackend::get_max_channel_count(u32 device_index)
-{
-	audio_out_configuration& audio_out_cfg = g_fxo->get<audio_out_configuration>();
-	std::lock_guard lock(audio_out_cfg.mtx);
-	const audio_out_configuration::audio_out& out = ::at32(audio_out_cfg.out, device_index);
-
-	AudioChannelCnt count = AudioChannelCnt::STEREO;
-
-	for (const CellAudioOutSoundMode& mode : out.sound_modes)
-	{
-		switch (mode.channel)
-		{
-		case 6:
-			count = AudioChannelCnt::SURROUND_5_1;
-			break;
-		case 8:
-			return AudioChannelCnt::SURROUND_7_1; // Max possible count. So let's return immediately.
-		default:
-			break;
-		}
-	}
-
-	return count;
-}
-
-u32 AudioBackend::default_layout_channel_count(audio_channel_layout layout)
-{
-	switch (layout)
-	{
-	case audio_channel_layout::mono: return 1;
-	case audio_channel_layout::stereo: return 2;
-	case audio_channel_layout::stereo_lfe: return 3;
-	case audio_channel_layout::quadraphonic: return 4;
-	case audio_channel_layout::quadraphonic_lfe: return 5;
-	case audio_channel_layout::surround_5_1: return 6;
-	case audio_channel_layout::surround_7_1: return 8;
-	default: fmt::throw_exception("Unsupported layout %d", static_cast<u32>(layout));
-	}
-}
-
-u32 AudioBackend::layout_channel_count(u32 channels, audio_channel_layout layout)
-{
-	if (channels == 0)
-	{
-		fmt::throw_exception("Unsupported channel count");
-	}
-
-	return std::min(channels, default_layout_channel_count(layout));
-}
-
-audio_channel_layout AudioBackend::default_layout(u32 channels)
-{
-	switch (channels)
-	{
-	case 1: return audio_channel_layout::mono;
-	case 2: return audio_channel_layout::stereo;
-	case 3: return audio_channel_layout::stereo_lfe;
-	case 4: return audio_channel_layout::quadraphonic;
-	case 5: return audio_channel_layout::quadraphonic_lfe;
-	case 6: return audio_channel_layout::surround_5_1;
-	case 7: return audio_channel_layout::surround_5_1;
-	case 8: return audio_channel_layout::surround_7_1;
-	default: return audio_channel_layout::stereo;
-	}
-}
-
-void AudioBackend::setup_channel_layout(u32 input_channel_count, u32 output_channel_count, audio_channel_layout layout, logs::channel& log)
-{
-	const u32 channels = std::min(input_channel_count, output_channel_count);
-
-	if (layout != audio_channel_layout::automatic && output_channel_count > input_channel_count)
-	{
-		log.warning("Mixing from %d to %d channels is not implemented. Falling back to automatic layout.", input_channel_count, output_channel_count);
-		layout = audio_channel_layout::automatic;
-	}
-
-	if (layout != audio_channel_layout::automatic && channels < default_layout_channel_count(layout))
-	{
-		log.warning("Can't use layout %s with %d channels. Falling back to automatic layout.", layout, channels);
-		layout = audio_channel_layout::automatic;
-	}
-
-	m_layout = layout == audio_channel_layout::automatic ? default_layout(channels) : layout;
-	m_channels = layout_channel_count(channels, m_layout);
-}
diff --git a/rpcs3/Emu/Audio/AudioBackend.h b/rpcs3/Emu/Audio/AudioBackend.h
index cbd8e045c9..c5b7aeff9c 100644
--- a/rpcs3/Emu/Audio/AudioBackend.h
+++ b/rpcs3/Emu/Audio/AudioBackend.h
@@ -1,62 +1,24 @@
 #pragma once
 
 #include "util/types.hpp"
-#include "util/logs.hpp"
-#include "Utilities/mutex.h"
 #include "Utilities/StrFmt.h"
-#include "Emu/system_config_types.h"
-#include <numbers>
 
 enum : u32
 {
 	DEFAULT_AUDIO_SAMPLING_RATE = 48000,
 	MAX_AUDIO_BUFFERS = 64,
-	AUDIO_BUFFER_SAMPLES = 256,
-	AUDIO_MAX_CHANNELS = 8,
-};
-
-enum class AudioFreq : u32
-{
-	FREQ_32K  = 32000,
-	FREQ_44K  = 44100,
-	FREQ_48K  = 48000,
-	FREQ_88K  = 88200,
-	FREQ_96K  = 96000,
-	FREQ_176K = 176400,
-	FREQ_192K = 192000,
-};
-
-enum class AudioSampleSize : u32
-{
-	FLOAT = sizeof(float),
-	S16 = sizeof(s16),
-};
-
-// This enum is only used for emulation
-enum class AudioChannelCnt : u32
-{
-	STEREO       = 2,
-	SURROUND_5_1 = 6,
-	SURROUND_7_1 = 8,
-};
-
-enum class AudioStateEvent : u32
-{
-	UNSPECIFIED_ERROR,
-	DEFAULT_DEVICE_MAYBE_CHANGED,
+	AUDIO_BUFFER_SAMPLES = 256
 };
 
 class AudioBackend
 {
 public:
-
-	struct VolumeParam
+	enum Capabilities : u32
 	{
-		f32 initial_volume = 1.0f;
-		f32 current_volume = 1.0f;
-		f32 target_volume = 1.0f;
-		u32 freq = 48000;
-		u32 ch_cnt = 2;
+		PLAY_PAUSE_FLUSH = 0x1, // Implements Play, Pause, Flush
+		IS_PLAYING = 0x2, // Implements IsPlaying
+		GET_NUM_ENQUEUED_SAMPLES = 0x4, // Implements GetNumEnqueuedSamples
+		SET_FREQUENCY_RATIO = 0x8, // Implements SetFrequencyRatio
 	};
 
 	AudioBackend();
@@ -64,58 +26,73 @@ public:
 	virtual ~AudioBackend() = default;
 
 	/*
-	 * Virtual methods
+	 * Pure virtual methods
 	 */
-	virtual std::string_view GetName() const = 0;
+	virtual const char* GetName() const = 0;
+	virtual u32 GetCapabilities() const = 0;
 
-	// (Re)create output stream with new parameters. Blocks until data callback returns.
-	// If dev_id is empty, then default device will be selected.
-	// May override channel count if device has smaller number of channels.
-	// Should return 'true' on success.
-	virtual bool Open(std::string_view dev_id, AudioFreq freq, AudioSampleSize sample_size, AudioChannelCnt ch_cnt, audio_channel_layout layout) = 0;
-
-	// Reset backend state. Blocks until data callback returns.
+	virtual void Open(u32 num_buffers) = 0;
 	virtual void Close() = 0;
 
-	// Sets write callback. It's called when backend requests new data to be sent.
-	// Callback should return number of submitted bytes. Calling other backend functions from callback is unsafe.
-	virtual void SetWriteCallback(std::function<u32(u32 /* byte_cnt */, void* /* buffer */)> cb);
+	virtual bool AddData(const void* src, u32 num_samples) = 0;
 
-	// Sets error callback. It's called when backend detects event in audio chain that needs immediate attention.
-	// Calling other backend functions from callback is unsafe.
-	virtual void SetStateCallback(std::function<void(AudioStateEvent)> cb);
-
-	/*
-	 * All functions below require that Open() was called prior.
-	 */
-
-	// Returns length of one write callback frame in seconds. Open() must be called prior.
-	virtual f64 GetCallbackFrameLen() = 0;
-
-	// Returns true if audio is currently being played, false otherwise. Reflects end result of Play() and Pause() calls.
-	virtual bool IsPlaying() { return m_playing; }
-
-	// Start playing enqueued data.
-	virtual void Play() = 0;
-
-	// Pause playing enqueued data. No additional callbacks will be issued. Blocks until data callback returns.
-	virtual void Pause() = 0;
 
 	/*
 	 * This virtual method should be reimplemented if backend can fail to be initialized under non-error conditions
 	 * eg. when there is no audio devices attached
 	 */
-	virtual bool Initialized() { return true; }
+	virtual bool Initialized() const { return true; }
 
 	/*
-	 * This virtual method should be reimplemented if backend can fail during normal operation
+	 * Virtual methods - should be implemented depending on backend capabilities
 	 */
-	virtual bool Operational() { return true; }
 
-	/*
-	 * This virtual method should be reimplemented if backend can report device changes
-	 */
-	virtual bool DefaultDeviceChanged() { return false; }
+	// Start playing enqueued data
+	// Should be implemented if capabilities & PLAY_PAUSE_FLUSH
+	virtual void Play()
+	{
+		fmt::throw_exception("Play() not implemented");
+	}
+
+	// Pause playing enqueued data
+	// Should be implemented if capabilities & PLAY_PAUSE_FLUSH
+	virtual void Pause()
+	{
+		fmt::throw_exception("Pause() not implemented");
+	}
+
+	// Pause audio, and unqueue all currently queued buffers
+	// Should be implemented if capabilities & PLAY_PAUSE_FLUSH
+	virtual void Flush()
+	{
+
+		fmt::throw_exception("Flush() not implemented");
+	}
+
+	// Returns true if audio is currently being played, false otherwise
+	// Should be implemented if capabilities & IS_PLAYING
+	virtual bool IsPlaying()
+	{
+		fmt::throw_exception("IsPlaying() not implemented");
+	}
+
+	// Returns the number of currently enqueued samples
+	// Should be implemented if capabilities & GET_NUM_ENQUEUED_SAMPLES
+	virtual u64 GetNumEnqueuedSamples()
+	{
+		fmt::throw_exception("GetNumEnqueuedSamples() not implemented");
+		return 0;
+	}
+
+	// Sets a new frequency ratio. Backend is allowed to modify the ratio value, e.g. clamping it to the allowed range
+	// Returns the new frequency ratio set
+	// Should be implemented if capabilities & SET_FREQUENCY_RATIO
+	virtual f32 SetFrequencyRatio(f32 /* new_ratio */) // returns the new ratio
+	{
+		fmt::throw_exception("SetFrequencyRatio() not implemented");
+		return 1.0f;
+	}
+
 
 	/*
 	 * Helper methods
@@ -125,266 +102,17 @@ public:
 	u32 get_sample_size() const;
 
 	u32 get_channels() const;
-	audio_channel_layout get_channel_layout() const;
 
-	bool get_convert_to_s16() const;
+	bool get_convert_to_u16() const;
 
-	/*
-	 * Convert float buffer to s16 one. src and dst could be the same. cnt is number of buffer elements.
-	 */
-	static void convert_to_s16(u32 cnt, const f32* src, void* dst);
+	bool has_capability(u32 cap) const;
 
-	/*
-	 * Apply volume parameters to the buffer. Gradually changes volume. src and dst could be the same.
-	 * Number of channels must be >1 and multiple of 2.
-	 * sample_cnt is number of buffer elements. Returns current volume.
-	 */
-	static f32 apply_volume(const VolumeParam& param, u32 sample_cnt, const f32* src, f32* dst);
-
-	/*
-	 * Apply volume value to the buffer. src and dst could be the same. sample_cnt is number of buffer elements.
-	 * Returns current volume.
-	 */
-	static void apply_volume_static(f32 vol, u32 sample_cnt, const f32* src, f32* dst);
-
-	/*
-	 * Normalize float samples in range from -1.0 to 1.0.
-	 */
-	static void normalize(u32 sample_cnt, const f32* src, f32* dst);
-
-	/*
-	 * Returns the output channel count and downmix mode.
-	 */
-	static std::pair<AudioChannelCnt, AudioChannelCnt> get_channel_count_and_downmixer(u32 device_index);
-
-	/*
-	 * Returns the max supported channel count.
-	 */
-	static AudioChannelCnt get_max_channel_count(u32 device_index);
-
-	/*
-	 * Get default channel count for a layout
-	 */
-	static u32 default_layout_channel_count(audio_channel_layout layout);
-
-	/*
-	 * Converts raw channel count to value usable by backends
-	 */
-	static u32 layout_channel_count(u32 channels, audio_channel_layout layout);
-
-	/*
-	 * Get the default layout for raw channel count
-	 */
-	static audio_channel_layout default_layout(u32 channels);
-
-	/*
-	 * Downmix audio stream.
-	 */
-	template<AudioChannelCnt src_ch_cnt, audio_channel_layout dst_layout>
-	static void downmix(u32 sample_cnt, const f32* src, f32* dst)
-	{
-		const u32 dst_ch_cnt = default_layout_channel_count(dst_layout);
-		if (static_cast<u32>(src_ch_cnt) <= dst_ch_cnt) fmt::throw_exception("src channel count must be bigger than dst channel count");
-
-		static constexpr f32 center_coef = std::numbers::sqrt2_v<f32> / 2;
-		static constexpr f32 surround_coef = std::numbers::sqrt2_v<f32> / 2;
-
-		for (u32 src_sample = 0, dst_sample = 0; src_sample < sample_cnt; src_sample += static_cast<u32>(src_ch_cnt), dst_sample += dst_ch_cnt)
-		{
-			const f32 left  = src[src_sample + 0];
-			const f32 right = src[src_sample + 1];
-			
-			if constexpr (src_ch_cnt == AudioChannelCnt::STEREO)
-			{
-				if constexpr (dst_layout == audio_channel_layout::mono)
-				{
-					dst[dst_sample + 0] = left + right;
-				}
-			}
-			else if constexpr (src_ch_cnt == AudioChannelCnt::SURROUND_5_1)
-			{
-				const f32 center     = src[src_sample + 2];
-				const f32 low_freq   = src[src_sample + 3];
-				const f32 side_left  = src[src_sample + 4];
-				const f32 side_right = src[src_sample + 5];
-
-				if constexpr (dst_layout == audio_channel_layout::quadraphonic || dst_layout == audio_channel_layout::quadraphonic_lfe)
-				{
-					const f32 mid = center * center_coef;
-					dst[dst_sample + 0] = left + mid;
-					dst[dst_sample + 1] = right + mid;
-					dst[dst_sample + 2] = side_left;
-					dst[dst_sample + 3] = side_right;
-
-					if constexpr (dst_layout == audio_channel_layout::quadraphonic_lfe)
-					{
-						dst[dst_sample + 4] = low_freq;
-					}
-				}
-				else if constexpr (dst_layout == audio_channel_layout::stereo || dst_layout == audio_channel_layout::stereo_lfe)
-				{
-					const f32 mid = center * center_coef;
-					dst[dst_sample + 0] = left + mid + side_left * surround_coef;
-					dst[dst_sample + 1] = right + mid + side_right * surround_coef;
-
-					if constexpr (dst_layout == audio_channel_layout::stereo_lfe)
-					{
-						dst[dst_sample + 2] = low_freq;
-					}
-				}
-				else if constexpr (dst_layout == audio_channel_layout::mono)
-				{
-					dst[dst_sample + 0] = left + right + center + side_left + side_right;
-				}
-			}
-			else if constexpr (src_ch_cnt == AudioChannelCnt::SURROUND_7_1)
-			{
-				const f32 center     = src[src_sample + 2];
-				const f32 low_freq   = src[src_sample + 3];
-				const f32 rear_left  = src[src_sample + 4];
-				const f32 rear_right = src[src_sample + 5];
-				const f32 side_left  = src[src_sample + 6];
-				const f32 side_right = src[src_sample + 7];
-
-				if constexpr (dst_layout == audio_channel_layout::surround_5_1)
-				{
-					dst[dst_sample + 0] = left;
-					dst[dst_sample + 1] = right;
-					dst[dst_sample + 2] = center;
-					dst[dst_sample + 3] = low_freq;
-					dst[dst_sample + 4] = side_left + rear_left;
-					dst[dst_sample + 5] = side_right + rear_right;
-				}
-				else if constexpr (dst_layout == audio_channel_layout::quadraphonic || dst_layout == audio_channel_layout::quadraphonic_lfe)
-				{
-					const f32 mid = center * center_coef;
-					dst[dst_sample + 0] = left + mid;
-					dst[dst_sample + 1] = right + mid;
-					dst[dst_sample + 2] = side_left + rear_left;
-					dst[dst_sample + 3] = side_right + rear_right;
-
-					if constexpr (dst_layout == audio_channel_layout::quadraphonic_lfe)
-					{
-						dst[dst_sample + 4] = low_freq;
-					}
-				}
-				else if constexpr (dst_layout == audio_channel_layout::stereo || dst_layout == audio_channel_layout::stereo_lfe)
-				{
-					const f32 mid = center * center_coef;
-					dst[dst_sample + 0] = left + mid + (side_left + rear_left) * surround_coef;
-					dst[dst_sample + 1] = right + mid + (side_right + rear_right) * surround_coef;
-
-					if constexpr (dst_layout == audio_channel_layout::stereo_lfe)
-					{
-						dst[dst_sample + 2] = low_freq;
-					}
-				}
-				else if constexpr (dst_layout == audio_channel_layout::mono)
-				{
-					dst[dst_sample + 0] = left + right + center + side_left + rear_left + side_right + rear_right;
-				}
-			}
-		}
-	}
-
-	static void downmix(u32 sample_cnt, u32 src_ch_cnt, audio_channel_layout dst_layout, const f32* src, f32* dst)
-	{
-		const u32 dst_ch_cnt = default_layout_channel_count(dst_layout);
-
-		if (src_ch_cnt <= dst_ch_cnt)
-		{
-			return;
-		}
-
-		switch (src_ch_cnt)
-		{
-		case static_cast<u32>(AudioChannelCnt::SURROUND_7_1):
-		{
-			switch (dst_layout)
-			{
-			case audio_channel_layout::mono:
-				AudioBackend::downmix<AudioChannelCnt::SURROUND_7_1, audio_channel_layout::mono>(sample_cnt, src, dst);
-				break;
-			case audio_channel_layout::stereo:
-				AudioBackend::downmix<AudioChannelCnt::SURROUND_7_1, audio_channel_layout::stereo>(sample_cnt, src, dst);
-				break;
-			case audio_channel_layout::stereo_lfe:
-				AudioBackend::downmix<AudioChannelCnt::SURROUND_7_1, audio_channel_layout::stereo_lfe>(sample_cnt, src, dst);
-				break;
-			case audio_channel_layout::quadraphonic:
-				AudioBackend::downmix<AudioChannelCnt::SURROUND_7_1, audio_channel_layout::quadraphonic>(sample_cnt, src, dst);
-				break;
-			case audio_channel_layout::quadraphonic_lfe:
-				AudioBackend::downmix<AudioChannelCnt::SURROUND_7_1, audio_channel_layout::quadraphonic_lfe>(sample_cnt, src, dst);
-				break;
-			case audio_channel_layout::surround_5_1:
-				AudioBackend::downmix<AudioChannelCnt::SURROUND_7_1, audio_channel_layout::surround_5_1>(sample_cnt, src, dst);
-				break;
-			default:
-				fmt::throw_exception("Invalid downmix combination: %u -> %s", src_ch_cnt, dst_layout);
-			}
-			break;
-		}
-		case static_cast<u32>(AudioChannelCnt::SURROUND_5_1):
-		{
-			switch (dst_layout)
-			{
-			case audio_channel_layout::mono:
-				AudioBackend::downmix<AudioChannelCnt::SURROUND_5_1, audio_channel_layout::mono>(sample_cnt, src, dst);
-				break;
-			case audio_channel_layout::stereo:
-				AudioBackend::downmix<AudioChannelCnt::SURROUND_5_1, audio_channel_layout::stereo>(sample_cnt, src, dst);
-				break;
-			case audio_channel_layout::stereo_lfe:
-				AudioBackend::downmix<AudioChannelCnt::SURROUND_5_1, audio_channel_layout::stereo_lfe>(sample_cnt, src, dst);
-				break;
-			case audio_channel_layout::quadraphonic:
-				AudioBackend::downmix<AudioChannelCnt::SURROUND_5_1, audio_channel_layout::quadraphonic>(sample_cnt, src, dst);
-				break;
-			case audio_channel_layout::quadraphonic_lfe:
-				AudioBackend::downmix<AudioChannelCnt::SURROUND_5_1, audio_channel_layout::quadraphonic_lfe>(sample_cnt, src, dst);
-				break;
-			default:
-				fmt::throw_exception("Invalid downmix combination: %u -> %s", src_ch_cnt, dst_layout);
-			}
-			break;
-		}
-		case static_cast<u32>(AudioChannelCnt::STEREO):
-		{
-			switch (dst_layout)
-			{
-			case audio_channel_layout::mono:
-				AudioBackend::downmix<AudioChannelCnt::STEREO, audio_channel_layout::mono>(sample_cnt, src, dst);
-				break;
-			default:
-				fmt::throw_exception("Invalid downmix combination: %u -> %s", src_ch_cnt, dst_layout);
-			}
-			break;
-		}
-		default:
-		{
-			fmt::throw_exception("Invalid downmix combination: %u -> %s", src_ch_cnt, dst_layout);
-		}
-		}
-	}
+	void dump_capabilities(std::string& out) const;
 
 protected:
-	void setup_channel_layout(u32 input_channel_count, u32 output_channel_count, audio_channel_layout layout, logs::channel& log);
-
-	AudioSampleSize m_sample_size = AudioSampleSize::FLOAT;
-	AudioFreq       m_sampling_rate = AudioFreq::FREQ_48K;
-	u32             m_channels = 2;
-	audio_channel_layout m_layout = audio_channel_layout::automatic;
-
-	std::timed_mutex m_cb_mutex{};
-	std::function<u32(u32, void *)> m_write_callback{};
-
-	shared_mutex m_state_cb_mutex{};
-	std::function<void(AudioStateEvent)> m_state_callback{};
-
-	bool m_playing = false;
-
-private:
-
-	static constexpr f32 VOLUME_CHANGE_DURATION = 0.016f; // sec
+	bool m_convert_to_u16 = false;
+	u32 m_sample_size = sizeof(float);
+	u32 m_sampling_rate = DEFAULT_AUDIO_SAMPLING_RATE;
+	u32 m_channels = 0;
+	u32 m_start_threshold = 1;
 };
diff --git a/rpcs3/Emu/Audio/AudioDumper.cpp b/rpcs3/Emu/Audio/AudioDumper.cpp
index 783adf66ed..8082bff347 100644
--- a/rpcs3/Emu/Audio/AudioDumper.cpp
+++ b/rpcs3/Emu/Audio/AudioDumper.cpp
@@ -4,87 +4,38 @@
 #include "Utilities/date_time.h"
 #include "Emu/System.h"
 
-#include <bit>
-
-AudioDumper::AudioDumper()
+AudioDumper::AudioDumper(u16 ch)
+	: m_header(ch)
 {
+	if (GetCh())
+	{
+		std::string path = fs::get_cache_dir() + "audio_";
+		if (const std::string id = Emu.GetTitleID(); !id.empty())
+		{
+			path += id + "_";
+		}
+		path += date_time::current_time_narrow<'_'>() + ".wav";
+		m_output.open(path, fs::rewrite);
+		m_output.write(m_header); // write initial file header
+	}
 }
 
 AudioDumper::~AudioDumper()
-{
-	Close();
-}
-
-void AudioDumper::Open(AudioChannelCnt ch, AudioFreq sample_rate, AudioSampleSize sample_size)
-{
-	Close();
-
-	m_header = WAVHeader(ch, sample_rate, sample_size);
-	std::string path = fs::get_cache_dir() + "audio_";
-	if (const std::string id = Emu.GetTitleID(); !id.empty())
-	{
-		path += id + "_";
-	}
-	path += date_time::current_time_narrow<'_'>() + ".wav";
-	m_output.open(path, fs::rewrite);
-	m_output.seek(sizeof(m_header));
-}
-
-void AudioDumper::Close()
 {
 	if (GetCh())
 	{
-		if (m_header.Size & 1)
-		{
-			const u8 pad_byte = 0;
-			m_output.write(pad_byte);
-			m_header.RIFF.Size += 1;
-		}
-
 		m_output.seek(0);
-		m_output.write(m_header); // write file header
-		m_output.close();
-		m_header.FMT.NumChannels = 0;
+		m_output.write(m_header); // rewrite file header
 	}
 }
 
 void AudioDumper::WriteData(const void* buffer, u32 size)
 {
-	if (GetCh() && size && buffer)
+	if (GetCh())
 	{
-		const u32 blk_size = GetCh() * GetSampleSize();
-		const u32 sample_cnt_per_ch = size / blk_size;
-
-		ensure(size - sample_cnt_per_ch * blk_size == 0);
-
-		if constexpr (std::endian::big == std::endian::native)
-		{
-			std::vector<u8> tmp_buf(size);
-
-			if (GetSampleSize() == sizeof(f32))
-			{
-				for (u32 sample_idx = 0; sample_idx < sample_cnt_per_ch * GetCh(); sample_idx++)
-				{
-					std::bit_cast<f32*>(tmp_buf.data())[sample_idx] = static_cast<const be_t<f32>*>(buffer)[sample_idx];
-				}
-			}
-			else
-			{
-				for (u32 sample_idx = 0; sample_idx < sample_cnt_per_ch * GetCh(); sample_idx++)
-				{
-					std::bit_cast<s16*>(tmp_buf.data())[sample_idx] = static_cast<const be_t<s16>*>(buffer)[sample_idx];
-				}
-			}
-
-			ensure(m_output.write(tmp_buf.data(), size) == size);
-		}
-		else
-		{
-			ensure(m_output.write(buffer, size) == size);
-		}
-
+		ensure(size);
+		ensure(m_output.write(buffer, size) == size);
 		m_header.Size += size;
 		m_header.RIFF.Size += size;
-		m_header.FACT.SampleLength += sample_cnt_per_ch;
 	}
 }
diff --git a/rpcs3/Emu/Audio/AudioDumper.h b/rpcs3/Emu/Audio/AudioDumper.h
index 1fff1352bf..c8fd92e43c 100644
--- a/rpcs3/Emu/Audio/AudioDumper.h
+++ b/rpcs3/Emu/Audio/AudioDumper.h
@@ -2,71 +2,60 @@
 
 #include "util/types.hpp"
 #include "Utilities/File.h"
-#include "Emu/Audio/AudioBackend.h"
 
 struct WAVHeader
 {
 	struct RIFFHeader
 	{
-		u8 ID[4] = { 'R', 'I', 'F', 'F' };
-		le_t<u32> Size{}; // FileSize - 8
-		u8 WAVE[4] = { 'W', 'A', 'V', 'E' };
+		u32 ID; // "RIFF"
+		u32 Size; // FileSize - 8
+		u32 WAVE; // "WAVE"
 
 		RIFFHeader() = default;
 
 		RIFFHeader(u32 size)
-			: Size(size)
+			: ID("RIFF"_u32)
+			, Size(size)
+			, WAVE("WAVE"_u32)
 		{
 		}
 	} RIFF;
 
 	struct FMTHeader
 	{
-		u8 ID[4] = { 'f', 'm', 't', ' ' };
-		le_t<u32> Size = 16;
-		le_t<u16> AudioFormat{}; // 1 for PCM, 3 for IEEE Floating Point
-		le_t<u16> NumChannels{}; // 1, 2, 6, 8
-		le_t<u32> SampleRate{}; // 44100-192000
-		le_t<u32> ByteRate{}; // SampleRate * NumChannels * BitsPerSample/8
-		le_t<u16> BlockAlign{}; // NumChannels * BitsPerSample/8
-		le_t<u16> BitsPerSample{}; // SampleSize * 8
+		u32 ID; // "fmt "
+		u32 Size; // 16
+		u16 AudioFormat; // 1 for PCM, 3 for IEEE Floating Point
+		u16 NumChannels; // 1, 2, 6, 8
+		u32 SampleRate; // 48000
+		u32 ByteRate; // SampleRate * NumChannels * BitsPerSample/8
+		u16 BlockAlign; // NumChannels * BitsPerSample/8
+		u16 BitsPerSample; // sizeof(float) * 8
 
 		FMTHeader() = default;
 
-		FMTHeader(AudioChannelCnt ch, AudioFreq sample_rate, AudioSampleSize sample_size)
-			: AudioFormat(sample_size == AudioSampleSize::FLOAT ? 3 : 1)
-			, NumChannels(static_cast<u16>(ch))
-			, SampleRate(static_cast<u32>(sample_rate))
-			, ByteRate(SampleRate * NumChannels * static_cast<u32>(sample_size))
-			, BlockAlign(NumChannels * static_cast<u32>(sample_size))
-			, BitsPerSample(static_cast<u32>(sample_size) * 8)
+		FMTHeader(u16 ch)
+			: ID("fmt "_u32)
+			, Size(16)
+			, AudioFormat(3)
+			, NumChannels(ch)
+			, SampleRate(48000)
+			, ByteRate(SampleRate * ch * sizeof(float))
+			, BlockAlign(ch * sizeof(float))
+			, BitsPerSample(sizeof(float) * 8)
 		{
 		}
 	} FMT;
 
-	struct FACTChunk
-	{
-		u8 ID[4] = { 'f', 'a', 'c', 't' };
-		le_t<u32> ChunkLength = 4;
-		le_t<u32> SampleLength = 0; // total samples per channel
-
-		FACTChunk() = default;
-
-		FACTChunk(u32 sample_len)
-			: SampleLength(sample_len)
-		{
-		}
-	} FACT;
-
-	u8 ID[4] = { 'd', 'a', 't', 'a' };
-	le_t<u32> Size{}; // size of data (256 * NumChannels * sizeof(f32))
+	u32 ID; // "data"
+	u32 Size; // size of data (256 * NumChannels * sizeof(float))
 
 	WAVHeader() = default;
 
-	WAVHeader(AudioChannelCnt ch, AudioFreq sample_rate, AudioSampleSize sample_size)
+	WAVHeader(u16 ch)
 		: RIFF(sizeof(RIFFHeader) + sizeof(FMTHeader))
-		, FMT(ch, sample_rate, sample_size)
-		, FACT(0)
+		, FMT(ch)
+		, ID("data"_u32)
 		, Size(0)
 	{
 	}
@@ -78,13 +67,9 @@ class AudioDumper
 	fs::file m_output{};
 
 public:
-	AudioDumper();
+	AudioDumper(u16 ch);
 	~AudioDumper();
 
-	void Open(AudioChannelCnt ch, AudioFreq sample_rate, AudioSampleSize sample_size);
-	void Close();
-
 	void WriteData(const void* buffer, u32 size);
 	u16 GetCh() const { return m_header.FMT.NumChannels; }
-	u16 GetSampleSize() const { return m_header.FMT.BitsPerSample / 8; }
 };
diff --git a/rpcs3/Emu/Audio/Cubeb/CubebBackend.cpp b/rpcs3/Emu/Audio/Cubeb/CubebBackend.cpp
deleted file mode 100644
index dbaf4aa8db..0000000000
--- a/rpcs3/Emu/Audio/Cubeb/CubebBackend.cpp
+++ /dev/null
@@ -1,585 +0,0 @@
-#include "Emu/Audio/Cubeb/CubebBackend.h"
-
-#include <algorithm>
-#include <cstdarg>
-#include "util/logs.hpp"
-#include "Emu/Audio/audio_device_enumerator.h"
-
-#ifdef _WIN32
-#include <Windows.h>
-#include <system_error>
-#endif
-
-LOG_CHANNEL(Cubeb);
-
-CubebBackend::CubebBackend()
-	: AudioBackend()
-{
-#ifdef _WIN32
-	// Cubeb requires COM to be initialized on the thread calling cubeb_init on Windows
-	if (HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED); SUCCEEDED(hr))
-	{
-		m_com_init_success = true;
-	}
-#endif
-
-	cubeb *ctx{};
-	if (int err = cubeb_init(&ctx, "RPCS3", nullptr))
-	{
-		Cubeb.error("cubeb_init() failed: %i", err);
-		return;
-	}
-
-	if (int err = cubeb_register_device_collection_changed(ctx, CUBEB_DEVICE_TYPE_OUTPUT, device_collection_changed_cb, this))
-	{
-		Cubeb.error("cubeb_register_device_collection_changed() failed: %i", err);
-	}
-	else
-	{
-		m_dev_collection_cb_enabled = true;
-	}
-
-	cubeb_set_log_callback(CUBEB_LOG_NORMAL, log_cb);
-
-	Cubeb.notice("Using backend %s", cubeb_get_backend_id(ctx));
-
-	std::lock_guard cb_lock{m_state_cb_mutex};
-	m_ctx = ctx;
-}
-
-CubebBackend::~CubebBackend()
-{
-	Close();
-
-	if (m_dev_collection_cb_enabled)
-	{
-		if (int err = cubeb_register_device_collection_changed(m_ctx, CUBEB_DEVICE_TYPE_OUTPUT, nullptr, nullptr))
-		{
-			Cubeb.error("cubeb_register_device_collection_changed() failed: %i", err);
-		}
-	}
-
-	if (m_ctx)
-	{
-		cubeb_destroy(m_ctx);
-	}
-
-#ifdef _WIN32
-	if (m_com_init_success)
-	{
-		CoUninitialize();
-	}
-#endif
-}
-
-bool CubebBackend::Initialized()
-{
-	return m_ctx != nullptr;
-}
-
-bool CubebBackend::Operational()
-{
-	return m_stream != nullptr && !m_reset_req.observe();
-}
-
-bool CubebBackend::DefaultDeviceChanged()
-{
-	if (m_default_device.empty() || m_reset_req.observe())
-	{
-		return false;
-	}
-
-	device_handle device = GetDevice();
-	if (!device.handle)
-	{
-		Cubeb.error("Selected device not found. Trying alternative approach...");
-		device = GetDefaultDeviceAlt(m_sampling_rate, m_sample_size, m_channels);
-	}
-
-	return !device.handle || device.id != m_default_device;
-}
-
-bool CubebBackend::Open(std::string_view dev_id, AudioFreq freq, AudioSampleSize sample_size, AudioChannelCnt ch_cnt, audio_channel_layout layout)
-{
-	if (!Initialized())
-	{
-		Cubeb.error("Open() called uninitialized");
-		return false;
-	}
-
-	Close();
-	std::lock_guard lock{m_cb_mutex};
-
-	const bool use_default_device = dev_id.empty() || dev_id == audio_device_enumerator::DEFAULT_DEV_ID;
-
-	if (use_default_device) Cubeb.notice("Trying to open default device");
-	else Cubeb.notice("Trying to open device with dev_id='%s'", dev_id);
-
-	device_handle device = GetDevice(use_default_device ? "" : dev_id);
-
-	if (!device.handle)
-	{
-		if (use_default_device)
-		{
-			device = GetDefaultDeviceAlt(freq, sample_size, static_cast<u32>(ch_cnt));
-
-			if (!device.handle)
-			{
-				Cubeb.error("Cannot detect default device. Channel count detection unavailable.");
-			}
-		}
-		else
-		{
-			Cubeb.error("Device with id=%s not found", dev_id);
-			return false;
-		}
-	}
-
-	if (device.ch_cnt == 0)
-	{
-		Cubeb.error("Device reported invalid channel count, using stereo instead");
-		device.ch_cnt = 2;
-	}
-
-	Cubeb.notice("Channel count is %d", device.ch_cnt);
-
-	if (use_default_device)
-	{
-		std::lock_guard lock{m_state_cb_mutex};
-		m_default_device = device.id;
-	}
-
-	m_sampling_rate = freq;
-	m_sample_size = sample_size;
-
-	setup_channel_layout(static_cast<u32>(ch_cnt), device.ch_cnt, layout, Cubeb);
-
-	full_sample_size = get_channels() * get_sample_size();
-
-	cubeb_stream_params stream_param{};
-	stream_param.format = get_convert_to_s16() ? CUBEB_SAMPLE_S16NE : CUBEB_SAMPLE_FLOAT32NE;
-	stream_param.rate = get_sampling_rate();
-	stream_param.channels = get_channels();
-	stream_param.layout = [&]()
-	{
-		switch (m_layout)
-		{
-		case audio_channel_layout::automatic:        break;
-		case audio_channel_layout::mono:             return CUBEB_LAYOUT_MONO;
-		case audio_channel_layout::stereo:           return CUBEB_LAYOUT_STEREO;
-		case audio_channel_layout::stereo_lfe:       return CUBEB_LAYOUT_STEREO_LFE;
-		case audio_channel_layout::quadraphonic:     return CUBEB_LAYOUT_QUAD;
-		case audio_channel_layout::quadraphonic_lfe: return CUBEB_LAYOUT_QUAD_LFE;
-		case audio_channel_layout::surround_5_1:     return CUBEB_LAYOUT_3F2_LFE;
-		case audio_channel_layout::surround_7_1:     return CUBEB_LAYOUT_3F4_LFE;
-		}
-
-		fmt::throw_exception("Invalid audio layout %d", static_cast<u32>(m_layout));
-	}();
-	stream_param.prefs = m_dev_collection_cb_enabled && device.handle ? CUBEB_STREAM_PREF_DISABLE_DEVICE_SWITCHING : CUBEB_STREAM_PREF_NONE;
-
-	u32 min_latency{};
-	if (int err = cubeb_get_min_latency(m_ctx, &stream_param, &min_latency))
-	{
-		Cubeb.error("cubeb_get_min_latency() failed: %i", err);
-		min_latency = 0;
-	}
-
-	const u32 stream_latency = std::max(static_cast<u32>(AUDIO_MIN_LATENCY * get_sampling_rate()), min_latency);
-
-	if (int err = cubeb_stream_init(m_ctx, &m_stream, "Main stream", nullptr, nullptr, device.handle, &stream_param, stream_latency, data_cb, state_cb, this))
-	{
-		Cubeb.error("cubeb_stream_init() failed: %i", err);
-		m_stream = nullptr;
-		return false;
-	}
-
-	if (int err = cubeb_stream_start(m_stream))
-	{
-		Cubeb.error("cubeb_stream_start() failed: %i", err);
-		Close();
-		return false;
-	}
-
-	if (int err = cubeb_stream_set_volume(m_stream, 1.0))
-	{
-		Cubeb.error("cubeb_stream_set_volume() failed: %i", err);
-	}
-
-	return true;
-}
-
-void CubebBackend::Close()
-{
-	if (m_stream != nullptr)
-	{
-		if (int err = cubeb_stream_stop(m_stream))
-		{
-			Cubeb.error("cubeb_stream_stop() failed: %i", err);
-		}
-
-		cubeb_stream_destroy(m_stream);
-	}
-
-	{
-		std::lock_guard lock{m_cb_mutex};
-		m_stream = nullptr;
-		m_playing = false;
-		m_last_sample.fill(0);
-	}
-
-	std::lock_guard lock{m_state_cb_mutex};
-	m_default_device.clear();
-}
-
-void CubebBackend::Play()
-{
-	if (m_stream == nullptr)
-	{
-		Cubeb.error("Play() called uninitialized");
-		return;
-	}
-
-	if (m_playing) return;
-
-	std::lock_guard lock(m_cb_mutex);
-	m_playing = true;
-}
-
-void CubebBackend::Pause()
-{
-	if (m_stream == nullptr)
-	{
-		Cubeb.error("Pause() called uninitialized");
-		return;
-	}
-
-	if (!m_playing) return;
-
-	std::lock_guard lock(m_cb_mutex);
-	m_playing = false;
-	m_last_sample.fill(0);
-}
-
-f64 CubebBackend::GetCallbackFrameLen()
-{
-	if (m_stream == nullptr)
-	{
-		Cubeb.error("GetCallbackFrameLen() called uninitialized");
-		return AUDIO_MIN_LATENCY;
-	}
-
-	u32 stream_latency{};
-	if (int err = cubeb_stream_get_latency(m_stream, &stream_latency))
-	{
-		Cubeb.error("cubeb_stream_get_latency() failed: %i", err);
-		stream_latency = 0;
-	}
-
-	return std::max<f64>(AUDIO_MIN_LATENCY, static_cast<f64>(stream_latency) / get_sampling_rate());
-}
-
-CubebBackend::device_handle CubebBackend::GetDevice(std::string_view dev_id)
-{
-	const bool default_dev = dev_id.empty();
-
-	if (default_dev) Cubeb.notice("Searching for default device");
-	else Cubeb.notice("Searching for device with dev_id='%s'", dev_id);
-
-	cubeb_device_collection dev_collection{};
-	if (int err = cubeb_enumerate_devices(m_ctx, CUBEB_DEVICE_TYPE_OUTPUT, &dev_collection))
-	{
-		Cubeb.error("cubeb_enumerate_devices() failed: %i", err);
-		return {};
-	}
-
-	if (dev_collection.count == 0)
-	{
-		Cubeb.error("No output devices available");
-		if (int err = cubeb_device_collection_destroy(m_ctx, &dev_collection))
-		{
-			Cubeb.error("cubeb_device_collection_destroy() failed: %i", err);
-		}
-		return {};
-	}
-
-	Cubeb.notice("Found %d possible output devices", dev_collection.count);
-
-	device_handle result{};
-
-	for (u64 dev_idx = 0; dev_idx < dev_collection.count; dev_idx++)
-	{
-		const cubeb_device_info& dev_info = dev_collection.device[dev_idx];
-
-		device_handle device{};
-		device.handle = dev_info.devid;
-		device.ch_cnt = dev_info.max_channels;
-
-		if (dev_info.device_id)
-		{
-			device.id = dev_info.device_id;
-		}
-
-		if (device.id.empty())
-		{
-			Cubeb.error("device_id is missing from device");
-			continue;
-		}
-
-		if (default_dev)
-		{
-			if (dev_info.preferred & CUBEB_DEVICE_PREF_MULTIMEDIA)
-			{
-				result = std::move(device);
-				break;
-			}
-		}
-		else if (device.id == dev_id)
-		{
-			result = std::move(device);
-			break;
-		}
-	}
-
-	if (result.handle)
-	{
-		Cubeb.notice("Found device '%s' with %d channels", result.id, result.ch_cnt);
-	}
-	else
-	{
-		Cubeb.notice("No device found for dev_id='%s'", dev_id);
-	}
-
-	if (int err = cubeb_device_collection_destroy(m_ctx, &dev_collection))
-	{
-		Cubeb.error("cubeb_device_collection_destroy() failed: %i", err);
-	}
-
-	return result;
-};
-
-CubebBackend::device_handle CubebBackend::GetDefaultDeviceAlt(AudioFreq freq, AudioSampleSize sample_size, u32 ch_cnt)
-{
-	Cubeb.notice("Starting alternative search for default device with freq=%d, sample_size=%d and ch_cnt=%d", static_cast<u32>(freq), static_cast<u32>(sample_size), static_cast<u32>(ch_cnt));
-
-	cubeb_stream_params param =
-	{
-		.format   = sample_size == AudioSampleSize::S16 ? CUBEB_SAMPLE_S16NE : CUBEB_SAMPLE_FLOAT32NE,
-		.rate     = static_cast<u32>(freq),
-		.channels = static_cast<u32>(ch_cnt),
-		.layout   = CUBEB_LAYOUT_UNDEFINED,
-		.prefs    = CUBEB_STREAM_PREF_DISABLE_DEVICE_SWITCHING
-	};
-
-	u32 min_latency{};
-	if (int err = cubeb_get_min_latency(m_ctx, &param, &min_latency))
-	{
-		Cubeb.error("cubeb_get_min_latency() failed: %i", err);
-		min_latency = 100;
-	}
-
-	cubeb_stream* tmp_stream{};
-	static auto dummy_data_cb = [](cubeb_stream*, void*, void const*, void*, long) -> long { return 0; };
-	static auto dummy_state_cb = [](cubeb_stream*, void*, cubeb_state) {};
-
-	if (int err = cubeb_stream_init(m_ctx, &tmp_stream, "Default device detector", nullptr, nullptr, nullptr, &param, min_latency, dummy_data_cb, dummy_state_cb, nullptr))
-	{
-		Cubeb.error("cubeb_stream_init() failed: %i", err);
-		return {};
-	}
-
-	cubeb_device* crnt_dev{};
-
-	if (int err = cubeb_stream_get_current_device(tmp_stream, &crnt_dev); err != CUBEB_OK || !crnt_dev)
-	{
-		Cubeb.error("cubeb_stream_get_current_device() failed: err=%i, crnt_dev=%d", err, !!crnt_dev);
-		cubeb_stream_destroy(tmp_stream);
-		return {};
-	}
-
-	std::string out_dev_name;
-
-	if (crnt_dev->output_name)
-	{
-		out_dev_name = crnt_dev->output_name;
-	}
-
-	if (int err = cubeb_stream_device_destroy(tmp_stream, crnt_dev))
-	{
-		Cubeb.error("cubeb_stream_device_destroy() failed: %i", err);
-	}
-
-	cubeb_stream_destroy(tmp_stream);
-
-	if (out_dev_name.empty())
-	{
-		Cubeb.notice("No default device available");
-		return {};
-	}
-
-	return GetDevice(out_dev_name);
-}
-
-long CubebBackend::data_cb(cubeb_stream* stream, void* user_ptr, void const* /* input_buffer */, void* output_buffer, long nframes)
-{
-	if (nframes <= 0)
-	{
-		Cubeb.error("data_cb called with nframes=%d", nframes);
-		return 0;
-	}
-
-	if (!output_buffer)
-	{
-		Cubeb.error("data_cb called with invalid output_buffer");
-		return CUBEB_ERROR;
-	}
-
-	if (!stream)
-	{
-		Cubeb.error("data_cb called with invalid stream");
-		return CUBEB_ERROR;
-	}
-
-	CubebBackend* const cubeb = static_cast<CubebBackend*>(user_ptr);
-	ensure(cubeb);
-
-	std::unique_lock lock(cubeb->m_cb_mutex, std::defer_lock);
-
-	if (!cubeb->m_reset_req.observe() && lock.try_lock_for(std::chrono::microseconds{50}) && cubeb->m_write_callback && cubeb->m_playing)
-	{
-		if (stream != cubeb->m_stream)
-		{
-			// Cubeb.error("data_cb called with unknown stream");
-			return CUBEB_ERROR;
-		}
-
-		const u32 sample_size = cubeb->full_sample_size.observe();
-		const u32 bytes_req = nframes * sample_size;
-		u32 written = std::min(cubeb->m_write_callback(bytes_req, output_buffer), bytes_req);
-		written -= written % sample_size;
-
-		if (written >= sample_size)
-		{
-			memcpy(cubeb->m_last_sample.data(), static_cast<u8*>(output_buffer) + written - sample_size, sample_size);
-		}
-
-		for (u32 i = written; i < bytes_req; i += sample_size)
-		{
-			memcpy(static_cast<u8*>(output_buffer) + i, cubeb->m_last_sample.data(), sample_size);
-		}
-	}
-	else
-	{
-		// Stream parameters are modified only after stream_destroy. stream_destroy will return
-		// only after this callback returns, so it's safe to access full_sample_size here.
-		memset(output_buffer, 0, nframes * cubeb->full_sample_size);
-	}
-
-	return nframes;
-}
-
-void CubebBackend::state_cb(cubeb_stream* stream, void* user_ptr, cubeb_state state)
-{
-	if (!stream)
-	{
-		Cubeb.error("state_cb called with invalid stream");
-		return;
-	}
-
-	CubebBackend* const cubeb = static_cast<CubebBackend*>(user_ptr);
-	ensure(cubeb);
-
-	std::lock_guard lock(cubeb->m_state_cb_mutex);
-
-	if (stream != cubeb->m_stream)
-	{
-		Cubeb.error("state_cb called with unknown stream");
-		return;
-	}
-
-	switch (state)
-	{
-	case CUBEB_STATE_ERROR:
-	{
-		Cubeb.error("Stream entered error state");
-
-		if (!cubeb->m_reset_req.test_and_set() && cubeb->m_state_callback)
-		{
-			cubeb->m_state_callback(AudioStateEvent::UNSPECIFIED_ERROR);
-		}
-
-		break;
-	}
-	case CUBEB_STATE_STARTED:
-	{
-		Cubeb.notice("Stream started");
-		break;
-	}
-	case CUBEB_STATE_STOPPED:
-	{
-		Cubeb.notice("Stream stopped");
-		break;
-	}
-	case CUBEB_STATE_DRAINED:
-	{
-		Cubeb.notice("Stream drained");
-		break;
-	}
-	default:
-	{
-		Cubeb.notice("Stream entered unknown state %d", static_cast<u32>(state));
-		break;
-	}
-	}
-}
-
-void CubebBackend::device_collection_changed_cb(cubeb* context, void* user_ptr)
-{
-	Cubeb.notice("Device collection changed");
-
-	if (!context)
-	{
-		Cubeb.error("device_collection_changed_cb called with invalid stream");
-		return;
-	}
-
-	CubebBackend* const cubeb = static_cast<CubebBackend*>(user_ptr);
-	ensure(cubeb);
-
-	if (cubeb->m_reset_req.observe())
-	{
-		return;
-	}
-
-	std::lock_guard cb_lock{cubeb->m_state_cb_mutex};
-
-	if (context != cubeb->m_ctx)
-	{
-		Cubeb.error("device_collection_changed_cb called with unknown context");
-		return;
-	}
-
-	// Non default device is used (or default device cannot be detected)
-	if (cubeb->m_default_device.empty())
-	{
-		Cubeb.notice("Skipping default device notification");
-		return;
-	}
-
-	if (cubeb->m_state_callback)
-	{
-		cubeb->m_state_callback(AudioStateEvent::DEFAULT_DEVICE_MAYBE_CHANGED);
-	}
-}
-
-void CubebBackend::log_cb(const char* fmt, ...)
-{
-	char buf[256]{};
-
-	va_list va;
-	va_start(va, fmt);
-	vsnprintf(buf, sizeof(buf) - 1, fmt, va);
-	va_end(va);
-
-	Cubeb.notice("Cubeb log: %s", buf);
-}
diff --git a/rpcs3/Emu/Audio/Cubeb/CubebBackend.h b/rpcs3/Emu/Audio/Cubeb/CubebBackend.h
deleted file mode 100644
index 1f230ec238..0000000000
--- a/rpcs3/Emu/Audio/Cubeb/CubebBackend.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#pragma once
-
-#include "util/atomic.hpp"
-#include "Emu/Audio/AudioBackend.h"
-
-#include "cubeb/cubeb.h"
-
-class CubebBackend final : public AudioBackend
-{
-public:
-	CubebBackend();
-	~CubebBackend() override;
-
-	CubebBackend(const CubebBackend&) = delete;
-	CubebBackend& operator=(const CubebBackend&) = delete;
-
-	std::string_view GetName() const override { return "Cubeb"sv; }
-
-	bool Initialized() override;
-	bool Operational() override;
-	bool DefaultDeviceChanged() override;
-
-	bool Open(std::string_view dev_id, AudioFreq freq, AudioSampleSize sample_size, AudioChannelCnt ch_cnt, audio_channel_layout layout) override;
-	void Close() override;
-
-	f64 GetCallbackFrameLen() override;
-
-	void Play() override;
-	void Pause() override;
-
-private:
-	static constexpr f64 AUDIO_MIN_LATENCY = 512.0 / 48000; // 10ms
-
-	cubeb* m_ctx = nullptr;
-	cubeb_stream* m_stream = nullptr;
-#ifdef _WIN32
-	bool m_com_init_success = false;
-#endif
-
-	std::array<u8, sizeof(float) * static_cast<u32>(AudioChannelCnt::SURROUND_7_1)> m_last_sample{};
-	atomic_t<u8> full_sample_size = 0;
-
-	atomic_t<bool> m_reset_req = false;
-
-	// Protected by callback mutex
-	std::string m_default_device{};
-
-	bool m_dev_collection_cb_enabled = false;
-
-	// Cubeb callbacks
-	static long data_cb(cubeb_stream* stream, void* user_ptr, void const* input_buffer, void* output_buffer, long nframes);
-	static void state_cb(cubeb_stream* stream, void* user_ptr, cubeb_state state);
-	static void device_collection_changed_cb(cubeb* context, void* user_ptr);
-	static void log_cb(const char *fmt, ...);
-
-	struct device_handle
-	{
-		cubeb_devid handle{};
-		std::string id;
-		u32 ch_cnt{};
-	};
-
-	device_handle GetDevice(std::string_view dev_id = "");
-	device_handle GetDefaultDeviceAlt(AudioFreq freq, AudioSampleSize sample_size, u32 ch_cnt);
-};
diff --git a/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.cpp b/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.cpp
deleted file mode 100644
index c669d0e87f..0000000000
--- a/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include "Emu/Audio/Cubeb/cubeb_enumerator.h"
-#include "util/logs.hpp"
-#include <algorithm>
-
-#ifdef _WIN32
-#include <Windows.h>
-#include <system_error>
-#endif
-
-LOG_CHANNEL(cubeb_dev_enum);
-
-cubeb_enumerator::cubeb_enumerator() : audio_device_enumerator()
-{
-#ifdef _WIN32
-	// Cubeb requires COM to be initialized on the thread calling cubeb_init on Windows
-	HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
-	if (SUCCEEDED(hr))
-	{
-		com_init_success = true;
-	}
-#endif
-
-	if (int err = cubeb_init(&ctx, "RPCS3 device enumeration", nullptr))
-	{
-		cubeb_dev_enum.error("cubeb_init() failed: %i", err);
-		ctx = nullptr;
-	}
-}
-
-cubeb_enumerator::~cubeb_enumerator()
-{
-	if (ctx)
-	{
-		cubeb_destroy(ctx);
-	}
-
-#ifdef _WIN32
-	if (com_init_success)
-	{
-		CoUninitialize();
-	}
-#endif
-}
-
-std::vector<audio_device_enumerator::audio_device> cubeb_enumerator::get_output_devices()
-{
-	if (ctx == nullptr)
-	{
-		return {};
-	}
-
-	cubeb_device_collection dev_collection{};
-	if (int err = cubeb_enumerate_devices(ctx, CUBEB_DEVICE_TYPE_OUTPUT, &dev_collection))
-	{
-		cubeb_dev_enum.error("cubeb_enumerate_devices() failed: %i", err);
-		return {};
-	}
-
-	if (dev_collection.count == 0)
-	{
-		cubeb_dev_enum.error("No output devices available");
-		if (int err = cubeb_device_collection_destroy(ctx, &dev_collection))
-		{
-			cubeb_dev_enum.error("cubeb_device_collection_destroy() failed: %i", err);
-		}
-		return {};
-	}
-
-	std::vector<audio_device> device_list{};
-
-	for (u64 dev_idx = 0; dev_idx < dev_collection.count; dev_idx++)
-	{
-		const cubeb_device_info& dev_info = dev_collection.device[dev_idx];
-
-		if (dev_info.state == CUBEB_DEVICE_STATE_UNPLUGGED)
-		{
-			continue;
-		}
-
-		audio_device dev =
-		{
-			.id = std::string{dev_info.device_id},
-			.name = std::string{dev_info.friendly_name},
-			.max_ch = dev_info.max_channels
-		};
-
-		if (dev.id.empty())
-		{
-			cubeb_dev_enum.warning("Empty device id - skipping");
-			continue;
-		}
-
-		if (dev.name.empty())
-		{
-			dev.name = dev.id;
-		}
-
-		cubeb_dev_enum.notice("Found device: id=%s, name=%s, max_ch=%d", dev.id, dev.name, dev.max_ch);
-		device_list.emplace_back(dev);
-	}
-
-	if (int err = cubeb_device_collection_destroy(ctx, &dev_collection))
-	{
-		cubeb_dev_enum.error("cubeb_device_collection_destroy() failed: %i", err);
-	}
-
-	std::sort(device_list.begin(), device_list.end(), [](const audio_device_enumerator::audio_device& a, const audio_device_enumerator::audio_device& b)
-	{
-		return a.name < b.name;
-	});
-
-	return device_list;
-}
diff --git a/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.h b/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.h
deleted file mode 100644
index 586521028f..0000000000
--- a/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "Emu/Audio/audio_device_enumerator.h"
-
-#include "cubeb/cubeb.h"
-
-class cubeb_enumerator final : public audio_device_enumerator
-{
-public:
-
-	cubeb_enumerator();
-	~cubeb_enumerator() override;
-
-	std::vector<audio_device> get_output_devices() override;
-
-private:
-
-	cubeb* ctx{};
-#ifdef _WIN32
-	bool com_init_success = false;
-#endif
-};
diff --git a/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp b/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp
index d0e5728b27..16110f0b67 100644
--- a/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp
+++ b/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp
@@ -4,40 +4,41 @@
 
 #include "stdafx.h"
 #include "FAudioBackend.h"
+#include "Emu/system_config.h"
 #include "Emu/System.h"
-#include "Emu/Audio/audio_device_enumerator.h"
-#include "Utilities/StrUtil.h"
 
 LOG_CHANNEL(FAudio_, "FAudio");
 
 FAudioBackend::FAudioBackend()
 	: AudioBackend()
 {
-	FAudio *instance;
-
-	if (u32 res = FAudioCreate(&instance, 0, FAUDIO_DEFAULT_PROCESSOR))
+	u32 res = FAudioCreate(&m_instance, 0, FAUDIO_DEFAULT_PROCESSOR);
+	if (res)
 	{
-		FAudio_.error("FAudioCreate() failed(0x%08x)", res);
+		FAudio_.fatal("FAudioCreate() failed(0x%08x)", res);
 		return;
 	}
 
-	OnProcessingPassStart = nullptr;
-	OnProcessingPassEnd = nullptr;
-	OnCriticalError = OnCriticalError_func;
-
-	if (u32 res = FAudio_RegisterForCallbacks(instance, this))
+	res = FAudio_CreateMasteringVoice(m_instance, &m_master_voice, m_channels, 48000, 0, 0, nullptr);
+	if (res)
 	{
-		// Some error recovery functionality will be lost, but otherwise backend is operational
-		FAudio_.error("FAudio_RegisterForCallbacks() failed(0x%08x)", res);
+		FAudio_.fatal("FAudio_CreateMasteringVoice() failed(0x%08x)", res);
+		return;
 	}
-
-	// All succeeded, "commit"
-	m_instance = instance;
 }
 
 FAudioBackend::~FAudioBackend()
 {
-	Close();
+	if (m_source_voice != nullptr)
+	{
+		FAudioSourceVoice_Stop(m_source_voice, 0, FAUDIO_COMMIT_NOW);
+		FAudioVoice_DestroyVoice(m_source_voice);
+	}
+
+	if (m_master_voice != nullptr)
+	{
+		FAudioVoice_DestroyVoice(m_master_voice);
+	}
 
 	if (m_instance != nullptr)
 	{
@@ -48,230 +49,127 @@ FAudioBackend::~FAudioBackend()
 
 void FAudioBackend::Play()
 {
-	if (m_source_voice == nullptr)
+	AUDIT(m_source_voice != nullptr);
+
+	const u32 res = FAudioSourceVoice_Start(m_source_voice, 0, FAUDIO_COMMIT_NOW);
+	if (res)
 	{
-		FAudio_.error("Play() called uninitialized");
-		return;
+		FAudio_.fatal("FAudioSourceVoice_Start() failed(0x%08x)", res);
 	}
-
-	if (m_playing) return;
-
-	std::lock_guard lock(m_cb_mutex);
-	m_playing = true;
 }
 
 void FAudioBackend::Pause()
 {
-	if (m_source_voice == nullptr)
-	{
-		FAudio_.error("Pause() called uninitialized");
-		return;
-	}
-
-	if (!m_playing) return;
+	AUDIT(m_source_voice != nullptr);
 
+	const u32 res = FAudioSourceVoice_Stop(m_source_voice, 0, FAUDIO_COMMIT_NOW);
+	if (res)
 	{
-		std::lock_guard lock(m_cb_mutex);
-		m_playing = false;
-		m_last_sample.fill(0);
-	}
-
-	if (u32 res = FAudioSourceVoice_FlushSourceBuffers(m_source_voice))
-	{
-		FAudio_.error("FAudioSourceVoice_FlushSourceBuffers() failed(0x%08x)", res);
+		FAudio_.fatal("FAudioSourceVoice_Stop() failed(0x%08x)", res);
 	}
 }
 
-void FAudioBackend::CloseUnlocked()
+void FAudioBackend::Flush()
 {
-	if (m_source_voice != nullptr)
+	AUDIT(m_source_voice != nullptr);
+
+	const u32 res = FAudioSourceVoice_FlushSourceBuffers(m_source_voice);
+	if (res)
 	{
-		if (u32 res = FAudioSourceVoice_Stop(m_source_voice, 0, FAUDIO_COMMIT_NOW))
-		{
-			FAudio_.error("FAudioSourceVoice_Stop() failed(0x%08x)", res);
-		}
-
-		FAudioVoice_DestroyVoice(m_source_voice);
-		m_source_voice = nullptr;
+		FAudio_.fatal("FAudioSourceVoice_FlushSourceBuffers() failed(0x%08x)", res);
 	}
+}
 
-	if (m_master_voice)
-	{
-		FAudioVoice_DestroyVoice(m_master_voice);
-		m_master_voice = nullptr;
-	}
+bool FAudioBackend::IsPlaying()
+{
+	AUDIT(m_source_voice != nullptr);
 
-	m_playing = false;
-	m_last_sample.fill(0);
+	FAudioVoiceState state;
+	FAudioSourceVoice_GetState(m_source_voice, &state, FAUDIO_VOICE_NOSAMPLESPLAYED);
+
+	return state.BuffersQueued > 0 || state.pCurrentBufferContext != nullptr;
 }
 
 void FAudioBackend::Close()
 {
-	std::lock_guard lock(m_cb_mutex);
-	CloseUnlocked();
+	Pause();
+	Flush();
 }
 
-bool FAudioBackend::Initialized()
+void FAudioBackend::Open(u32 /* num_buffers */)
 {
-	return m_instance != nullptr;
-}
-
-bool FAudioBackend::Operational()
-{
-	return m_source_voice != nullptr && !m_reset_req.observe();
-}
-
-bool FAudioBackend::Open(std::string_view dev_id, AudioFreq freq, AudioSampleSize sample_size, AudioChannelCnt ch_cnt, audio_channel_layout layout)
-{
-	if (!Initialized())
-	{
-		FAudio_.error("Open() called uninitialized");
-		return false;
-	}
-
-	std::lock_guard lock(m_cb_mutex);
-	CloseUnlocked();
-
-	const bool use_default_dev = dev_id.empty() || dev_id == audio_device_enumerator::DEFAULT_DEV_ID;
-	u64 devid{};
-	if (!use_default_dev)
-	{
-		if (!try_to_uint64(&devid, dev_id, 0, UINT32_MAX))
-		{
-			FAudio_.error("Invalid device id - %s", dev_id);
-			return false;
-		}
-	}
-
-	if (u32 res = FAudio_CreateMasteringVoice(m_instance, &m_master_voice, FAUDIO_DEFAULT_CHANNELS, FAUDIO_DEFAULT_SAMPLERATE, 0, static_cast<u32>(devid), nullptr))
-	{
-		FAudio_.error("FAudio_CreateMasteringVoice() failed(0x%08x)", res);
-		m_master_voice = nullptr;
-		return false;
-	}
-
-	FAudioVoiceDetails vd{};
-	FAudioVoice_GetVoiceDetails(m_master_voice, &vd);
-
-	if (vd.InputChannels == 0)
-	{
-		FAudio_.error("Channel count of 0 is invalid");
-		CloseUnlocked();
-		return false;
-	}
-
-	FAudio_.notice("Channel count is %d", vd.InputChannels);
-
-	m_sampling_rate = freq;
-	m_sample_size = sample_size;
-
-	setup_channel_layout(static_cast<u32>(ch_cnt), vd.InputChannels, layout, FAudio_);
-
 	FAudioWaveFormatEx waveformatex;
-	waveformatex.wFormatTag = get_convert_to_s16() ? FAUDIO_FORMAT_PCM : FAUDIO_FORMAT_IEEE_FLOAT;
-	waveformatex.nChannels = get_channels();
-	waveformatex.nSamplesPerSec = get_sampling_rate();
-	waveformatex.nAvgBytesPerSec = static_cast<u32>(get_sampling_rate() * get_channels() * get_sample_size());
-	waveformatex.nBlockAlign = get_channels() * get_sample_size();
-	waveformatex.wBitsPerSample = get_sample_size() * 8;
-	waveformatex.cbSize = 0;
+	waveformatex.wFormatTag      = m_convert_to_u16 ? FAUDIO_FORMAT_PCM : FAUDIO_FORMAT_IEEE_FLOAT;
+	waveformatex.nChannels       = m_channels;
+	waveformatex.nSamplesPerSec  = m_sampling_rate;
+	waveformatex.nAvgBytesPerSec = static_cast<u32>(m_sampling_rate * m_channels * m_sample_size);
+	waveformatex.nBlockAlign     = m_channels * m_sample_size;
+	waveformatex.wBitsPerSample  = m_sample_size * 8;
+	waveformatex.cbSize          = 0;
 
-	OnVoiceProcessingPassStart = OnVoiceProcessingPassStart_func;
-	OnVoiceProcessingPassEnd = nullptr;
-	OnStreamEnd = nullptr;
-	OnBufferStart = nullptr;
-	OnBufferEnd = nullptr;
-	OnLoopEnd = nullptr;
-	OnVoiceError = nullptr;
-
-	if (u32 res = FAudio_CreateSourceVoice(m_instance, &m_source_voice, &waveformatex, 0, FAUDIO_DEFAULT_FREQ_RATIO, this, nullptr, nullptr))
+	const u32 res = FAudio_CreateSourceVoice(m_instance, &m_source_voice, &waveformatex, 0, FAUDIO_DEFAULT_FREQ_RATIO, nullptr, nullptr, nullptr);
+	if (res)
 	{
-		FAudio_.error("FAudio_CreateSourceVoice() failed(0x%08x)", res);
-		CloseUnlocked();
+		FAudio_.fatal("FAudio_CreateSourceVoice() failed(0x%08x)", res);
+	}
+
+	AUDIT(m_source_voice != nullptr);
+	FAudioVoice_SetVolume(m_source_voice, 1.0f, FAUDIO_COMMIT_NOW);
+}
+
+bool FAudioBackend::AddData(const void* src, u32 num_samples)
+{
+	AUDIT(m_source_voice != nullptr);
+
+	FAudioVoiceState state;
+	FAudioSourceVoice_GetState(m_source_voice, &state, FAUDIO_VOICE_NOSAMPLESPLAYED);
+
+	if (state.BuffersQueued >= MAX_AUDIO_BUFFERS)
+	{
+		FAudio_.warning("Too many buffers enqueued (%d)", state.BuffersQueued);
 		return false;
 	}
 
-	if (u32 res = FAudioSourceVoice_Start(m_source_voice, 0, FAUDIO_COMMIT_NOW))
+	FAudioBuffer buffer;
+	buffer.AudioBytes = num_samples * m_sample_size;
+	buffer.Flags      = 0;
+	buffer.LoopBegin  = FAUDIO_NO_LOOP_REGION;
+	buffer.LoopCount  = 0;
+	buffer.LoopLength = 0;
+	buffer.pAudioData = static_cast<const u8*>(src);
+	buffer.pContext   = nullptr;
+	buffer.PlayBegin  = 0;
+	buffer.PlayLength = AUDIO_BUFFER_SAMPLES;
+
+	const u32 res = FAudioSourceVoice_SubmitSourceBuffer(m_source_voice, &buffer, nullptr);
+	if (res)
 	{
-		FAudio_.error("FAudioSourceVoice_Start() failed(0x%08x)", res);
-		CloseUnlocked();
+		FAudio_.fatal("FAudioSourceVoice_SubmitSourceBuffer() failed(0x%08x)", res);
 		return false;
 	}
 
-	if (u32 res = FAudioVoice_SetVolume(m_source_voice, 1.0f, FAUDIO_COMMIT_NOW))
-	{
-		FAudio_.error("FAudioVoice_SetVolume() failed(0x%08x)", res);
-	}
-
-	m_data_buf.resize(get_sampling_rate() * get_sample_size() * get_channels() * INTERNAL_BUF_SIZE_MS / 1000);
-
 	return true;
 }
 
-f64 FAudioBackend::GetCallbackFrameLen()
+u64 FAudioBackend::GetNumEnqueuedSamples()
 {
-	constexpr f64 _10ms = 0.01;
+	FAudioVoiceState state;
+	FAudioSourceVoice_GetState(m_source_voice, &state, 0);
 
-	if (m_instance == nullptr)
-	{
-		FAudio_.error("GetCallbackFrameLen() called uninitialized");
-		return _10ms;
-	}
-
-	f64 min_latency{};
-
-	u32 samples_per_q = 0, freq = 0;
-	FAudio_GetProcessingQuantum(m_instance, &samples_per_q, &freq);
-
-	if (freq)
-	{
-		min_latency = static_cast<f64>(samples_per_q) / freq;
-	}
-
-	return std::max<f64>(min_latency, _10ms);
+	// all buffers contain AUDIO_BUFFER_SAMPLES, so we can easily calculate how many samples there are remaining
+	return (AUDIO_BUFFER_SAMPLES - state.SamplesPlayed % AUDIO_BUFFER_SAMPLES) + (state.BuffersQueued * AUDIO_BUFFER_SAMPLES);
 }
 
-void FAudioBackend::OnVoiceProcessingPassStart_func(FAudioVoiceCallback *cb_obj, u32 BytesRequired)
+f32 FAudioBackend::SetFrequencyRatio(f32 new_ratio)
 {
-	FAudioBackend *faudio = static_cast<FAudioBackend *>(cb_obj);
+	new_ratio = std::clamp(new_ratio, FAUDIO_MIN_FREQ_RATIO, FAUDIO_DEFAULT_FREQ_RATIO);
 
-	std::unique_lock lock(faudio->m_cb_mutex, std::defer_lock);
-	if (BytesRequired && !faudio->m_reset_req.observe() && lock.try_lock_for(std::chrono::microseconds{50}) && faudio->m_write_callback && faudio->m_playing)
+	const u32 res = FAudioSourceVoice_SetFrequencyRatio(m_source_voice, new_ratio, FAUDIO_COMMIT_NOW);
+	if (res)
 	{
-		ensure(BytesRequired <= faudio->m_data_buf.size(), "FAudio internal buffer is too small. Report to developers!");
-
-		const u32 sample_size = faudio->get_sample_size() * faudio->get_channels();
-		u32 written = std::min(faudio->m_write_callback(BytesRequired, faudio->m_data_buf.data()), BytesRequired);
-		written -= written % sample_size;
-
-		if (written >= sample_size)
-		{
-			memcpy(faudio->m_last_sample.data(), faudio->m_data_buf.data() + written - sample_size, sample_size);
-		}
-
-		for (u32 i = written; i < BytesRequired; i += sample_size)
-		{
-			memcpy(faudio->m_data_buf.data() + i, faudio->m_last_sample.data(), sample_size);
-		}
-
-		FAudioBuffer buffer{};
-		buffer.AudioBytes = BytesRequired;
-		buffer.pAudioData = static_cast<const u8*>(faudio->m_data_buf.data());
-		// Avoid logging in callback and assume that this always succeeds, all errors are caught by error callback anyway
-		FAudioSourceVoice_SubmitSourceBuffer(faudio->m_source_voice, &buffer, nullptr);
-	}
-}
-
-void FAudioBackend::OnCriticalError_func(FAudioEngineCallback *cb_obj, u32 Error)
-{
-	FAudio_.error("OnCriticalError() failed(0x%08x)", Error);
-
-	FAudioBackend *faudio = static_cast<FAudioBackend *>(cb_obj);
-
-	std::lock_guard lock(faudio->m_state_cb_mutex);
-
-	if (!faudio->m_reset_req.test_and_set() && faudio->m_state_callback)
-	{
-		faudio->m_state_callback(AudioStateEvent::UNSPECIFIED_ERROR);
+		FAudio_.fatal("FAudioSourceVoice_SetFrequencyRatio() failed(0x%08x)", res);
+		return 1.0f;
 	}
+
+	return new_ratio;
 }
diff --git a/rpcs3/Emu/Audio/FAudio/FAudioBackend.h b/rpcs3/Emu/Audio/FAudio/FAudioBackend.h
index 734f56156e..7d46205c66 100644
--- a/rpcs3/Emu/Audio/FAudio/FAudioBackend.h
+++ b/rpcs3/Emu/Audio/FAudio/FAudioBackend.h
@@ -5,11 +5,15 @@
 #endif
 
 #include "Emu/Audio/AudioBackend.h"
-
 #include "FAudio.h"
 
-class FAudioBackend final : public AudioBackend, public FAudioVoiceCallback, public FAudioEngineCallback
+class FAudioBackend : public AudioBackend
 {
+private:
+	FAudio* m_instance{};
+	FAudioMasteringVoice* m_master_voice{};
+	FAudioSourceVoice* m_source_voice{};
+
 public:
 	FAudioBackend();
 	~FAudioBackend() override;
@@ -17,36 +21,27 @@ public:
 	FAudioBackend(const FAudioBackend&) = delete;
 	FAudioBackend& operator=(const FAudioBackend&) = delete;
 
-	std::string_view GetName() const override { return "FAudio"sv; }
+	const char* GetName() const override
+	{
+		return "FAudio";
+	}
 
-	bool Initialized() override;
-	bool Operational() override;
+	static const u32 capabilities = PLAY_PAUSE_FLUSH | IS_PLAYING | GET_NUM_ENQUEUED_SAMPLES | SET_FREQUENCY_RATIO;
+	u32 GetCapabilities() const override
+	{
+		return capabilities;
+	}
 
-	bool Open(std::string_view dev_id, AudioFreq freq, AudioSampleSize sample_size, AudioChannelCnt ch_cnt, audio_channel_layout layout) override;
+	void Open(u32 /* num_buffers */) override;
 	void Close() override;
 
-	f64 GetCallbackFrameLen() override;
-
 	void Play() override;
 	void Pause() override;
+	bool IsPlaying() override;
 
-private:
-	static constexpr u32 INTERNAL_BUF_SIZE_MS = 25;
+	bool AddData(const void* src, u32 num_samples) override;
+	void Flush() override;
 
-	FAudio* m_instance{};
-	FAudioMasteringVoice* m_master_voice{};
-	FAudioSourceVoice* m_source_voice{};
-
-	std::vector<u8> m_data_buf{};
-	std::array<u8, sizeof(float) * static_cast<u32>(AudioChannelCnt::SURROUND_7_1)> m_last_sample{};
-
-	atomic_t<bool> m_reset_req = false;
-
-	// FAudio voice callbacks
-	static void OnVoiceProcessingPassStart_func(FAudioVoiceCallback *cb_obj, u32 BytesRequired);
-
-	// FAudio engine callbacks
-	static void OnCriticalError_func(FAudioEngineCallback *cb_obj, u32 Error);
-
-	void CloseUnlocked();
+	u64 GetNumEnqueuedSamples() override;
+	f32 SetFrequencyRatio(f32 new_ratio) override;
 };
diff --git a/rpcs3/Emu/Audio/FAudio/faudio_enumerator.cpp b/rpcs3/Emu/Audio/FAudio/faudio_enumerator.cpp
deleted file mode 100644
index fdbfd2a6af..0000000000
--- a/rpcs3/Emu/Audio/FAudio/faudio_enumerator.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef HAVE_FAUDIO
-#error "FAudio support disabled but still being built."
-#endif
-
-#include "Emu/Audio/FAudio/faudio_enumerator.h"
-#include <algorithm>
-#include "Utilities/StrUtil.h"
-#include "util/logs.hpp"
-
-LOG_CHANNEL(faudio_dev_enum);
-
-faudio_enumerator::faudio_enumerator() : audio_device_enumerator()
-{
-	FAudio *tmp{};
-
-	if (u32 res = FAudioCreate(&tmp, 0, FAUDIO_DEFAULT_PROCESSOR))
-	{
-		faudio_dev_enum.error("FAudioCreate() failed(0x%08x)", res);
-		return;
-	}
-
-	// All succeeded, "commit"
-	instance = tmp;
-}
-
-faudio_enumerator::~faudio_enumerator()
-{
-	if (instance != nullptr)
-	{
-		FAudio_StopEngine(instance);
-		FAudio_Release(instance);
-	}
-}
-
-std::vector<audio_device_enumerator::audio_device> faudio_enumerator::get_output_devices()
-{
-	if (!instance)
-	{
-		return {};
-	}
-
-	u32 dev_cnt{};
-	if (u32 res = FAudio_GetDeviceCount(instance, &dev_cnt))
-	{
-		faudio_dev_enum.error("FAudio_GetDeviceCount() failed(0x%08x)", res);
-		return {};
-	}
-
-	if (dev_cnt == 0)
-	{
-		faudio_dev_enum.warning("No devices available");
-		return {};
-	}
-
-	std::vector<audio_device> device_list{};
-
-	for (u32 dev_idx = 0; dev_idx < dev_cnt; dev_idx++)
-	{
-		FAudioDeviceDetails dev_info{};
-
-		if (u32 res = FAudio_GetDeviceDetails(instance, dev_idx, &dev_info))
-		{
-			faudio_dev_enum.error("FAudio_GetDeviceDetails() failed(0x%08x)", res);
-			continue;
-		}
-
-		audio_device dev =
-		{
-			.id = std::to_string(dev_idx),
-			.name = utf16_to_utf8(std::bit_cast<char16_t*>(&dev_info.DisplayName[0])),
-			.max_ch = dev_info.OutputFormat.Format.nChannels
-		};
-
-		if (dev.name.empty())
-		{
-			dev.name = "Device " + dev.id;
-		}
-
-		faudio_dev_enum.notice("Found device: id=%s, name=%s, max_ch=%d", dev.id, dev.name, dev.max_ch);
-		device_list.emplace_back(dev);
-	}
-
-	std::sort(device_list.begin(), device_list.end(), [](audio_device_enumerator::audio_device a, audio_device_enumerator::audio_device b)
-	{
-		return a.name < b.name;
-	});
-
-	return device_list;
-}
diff --git a/rpcs3/Emu/Audio/FAudio/faudio_enumerator.h b/rpcs3/Emu/Audio/FAudio/faudio_enumerator.h
deleted file mode 100644
index 406bfa09a4..0000000000
--- a/rpcs3/Emu/Audio/FAudio/faudio_enumerator.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#ifndef HAVE_FAUDIO
-#error "FAudio support disabled but still being built."
-#endif
-
-#include "Emu/Audio/audio_device_enumerator.h"
-#include "FAudio.h"
-
-class faudio_enumerator final : public audio_device_enumerator
-{
-public:
-
-	faudio_enumerator();
-	~faudio_enumerator() override;
-
-	std::vector<audio_device> get_output_devices() override;
-
-private:
-
-	FAudio* instance{};
-};
diff --git a/rpcs3/Emu/Audio/Null/NullAudioBackend.h b/rpcs3/Emu/Audio/Null/NullAudioBackend.h
index abb78ff460..5e0297b2e6 100644
--- a/rpcs3/Emu/Audio/Null/NullAudioBackend.h
+++ b/rpcs3/Emu/Audio/Null/NullAudioBackend.h
@@ -2,27 +2,23 @@
 
 #include "Emu/Audio/AudioBackend.h"
 
-class NullAudioBackend final : public AudioBackend
+class NullAudioBackend : public AudioBackend
 {
 public:
 	NullAudioBackend() {}
-	~NullAudioBackend() {}
+	virtual ~NullAudioBackend() {}
 
-	std::string_view GetName() const override { return "Null"sv; }
+	virtual const char* GetName() const override { return "Null"; }
 
-	bool Open(std::string_view /* dev_id */, AudioFreq /* freq */, AudioSampleSize /* sample_size */, AudioChannelCnt /* ch_cnt */, audio_channel_layout /*layout*/) override
-	{
-		Close();
-		return true;
-	}
-	void Close() override { m_playing = false; }
+	static const u32 capabilities = PLAY_PAUSE_FLUSH;
+	virtual u32 GetCapabilities() const override { return capabilities; }
 
-	f64 GetCallbackFrameLen() override { return 0.01; };
+	virtual void Open(u32) override {}
+	virtual void Close() override {}
 
-	void Play() override { m_playing = true; }
-	void Pause() override { m_playing = false; }
-	bool IsPlaying() override { return m_playing; }
+	virtual void Play() override {}
+	virtual void Pause() override {}
 
-private:
-	bool m_playing = false;
+	virtual bool AddData(const void*, u32) override { return true; }
+	virtual void Flush() override {}
 };
diff --git a/rpcs3/Emu/Audio/Null/null_enumerator.h b/rpcs3/Emu/Audio/Null/null_enumerator.h
deleted file mode 100644
index 9a889cdcee..0000000000
--- a/rpcs3/Emu/Audio/Null/null_enumerator.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "Emu/Audio/audio_device_enumerator.h"
-
-class null_enumerator final : public audio_device_enumerator
-{
-public:
-
-	null_enumerator() {};
-	~null_enumerator() override {};
-
-	std::vector<audio_device> get_output_devices() override { return {}; }
-};
diff --git a/rpcs3/Emu/Audio/Pulse/PulseBackend.cpp b/rpcs3/Emu/Audio/Pulse/PulseBackend.cpp
new file mode 100644
index 0000000000..8474fafa53
--- /dev/null
+++ b/rpcs3/Emu/Audio/Pulse/PulseBackend.cpp
@@ -0,0 +1,88 @@
+#ifndef HAVE_PULSE
+#error "PulseAudio support disabled but still being built."
+#endif
+
+#include "Emu/System.h"
+#include "PulseBackend.h"
+
+#include <pulse/simple.h>
+#include <pulse/error.h>
+
+PulseBackend::PulseBackend()
+	: AudioBackend()
+{
+}
+
+PulseBackend::~PulseBackend()
+{
+	this->Close();
+}
+
+void PulseBackend::Close()
+{
+	if (this->connection)
+	{
+		pa_simple_free(this->connection);
+		this->connection = nullptr;
+	}
+}
+
+void PulseBackend::Open(u32 /* num_buffers */)
+{
+	pa_sample_spec ss;
+	ss.format = (m_sample_size == 2) ? PA_SAMPLE_S16LE : PA_SAMPLE_FLOAT32LE;
+	ss.rate = m_sampling_rate;
+
+	pa_channel_map channel_map;
+
+	if (m_channels == 2)
+	{
+		channel_map.channels = 2;
+		channel_map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+		channel_map.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+	}
+	else if (m_channels == 6)
+	{
+		channel_map.channels = 6;
+		channel_map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+		channel_map.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+		channel_map.map[2] = PA_CHANNEL_POSITION_FRONT_CENTER;
+		channel_map.map[3] = PA_CHANNEL_POSITION_LFE;
+		channel_map.map[4] = PA_CHANNEL_POSITION_REAR_LEFT;
+		channel_map.map[5] = PA_CHANNEL_POSITION_REAR_RIGHT;
+	}
+	else
+	{
+		channel_map.channels = 8;
+		channel_map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+		channel_map.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+		channel_map.map[2] = PA_CHANNEL_POSITION_FRONT_CENTER;
+		channel_map.map[3] = PA_CHANNEL_POSITION_LFE;
+		channel_map.map[4] = PA_CHANNEL_POSITION_REAR_LEFT;
+		channel_map.map[5] = PA_CHANNEL_POSITION_REAR_RIGHT;
+		channel_map.map[6] = PA_CHANNEL_POSITION_SIDE_LEFT;
+		channel_map.map[7] = PA_CHANNEL_POSITION_SIDE_RIGHT;
+	}
+	ss.channels = channel_map.channels;
+
+	int err;
+	this->connection = pa_simple_new(NULL, "RPCS3", PA_STREAM_PLAYBACK, NULL, "Game", &ss, &channel_map, NULL, &err);
+	if (!this->connection)
+	{
+		fprintf(stderr, "PulseAudio: Failed to initialize audio: %s\n", pa_strerror(err));
+	}
+}
+
+bool PulseBackend::AddData(const void* src, u32 num_samples)
+{
+	AUDIT(this->connection);
+
+	int err;
+	if (pa_simple_write(this->connection, src, num_samples * m_sample_size, &err) < 0)
+	{
+		fprintf(stderr, "PulseAudio: Failed to write audio stream: %s\n", pa_strerror(err));
+		return false;
+	}
+
+	return true;
+}
diff --git a/rpcs3/Emu/Audio/Pulse/PulseBackend.h b/rpcs3/Emu/Audio/Pulse/PulseBackend.h
new file mode 100644
index 0000000000..85f82aa7b5
--- /dev/null
+++ b/rpcs3/Emu/Audio/Pulse/PulseBackend.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#ifndef HAVE_PULSE
+#error "PulseAudio support disabled but still being built."
+#endif
+
+#include <pulse/simple.h>
+#include "Emu/Audio/AudioBackend.h"
+
+class PulseBackend : public AudioBackend
+{
+public:
+	PulseBackend();
+	virtual ~PulseBackend() override;
+
+	PulseBackend(const PulseBackend&) = delete;
+	PulseBackend& operator=(const PulseBackend&) = delete;
+
+	virtual const char* GetName() const override { return "Pulse"; }
+
+	static const u32 capabilities = 0;
+	virtual u32 GetCapabilities() const override { return capabilities; }
+
+	virtual void Open(u32) override;
+	virtual void Close() override;
+
+	virtual bool AddData(const void* src, u32 num_samples) override;
+
+private:
+	pa_simple* connection{};
+};
diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp
index b9a4daeecc..defd8a3cc3 100644
--- a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp
+++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp
@@ -5,418 +5,192 @@
 #include <algorithm>
 #include "util/logs.hpp"
 #include "Emu/System.h"
-#include "Emu/Audio/audio_device_enumerator.h"
-#include "Utilities/StrUtil.h"
 
 #include "XAudio2Backend.h"
 #include <Windows.h>
 #include <system_error>
 
-#ifndef XAUDIO2_USE_DEFAULT_PROCESSOR
-#define XAUDIO2_USE_DEFAULT_PROCESSOR XAUDIO2_DEFAULT_PROCESSOR
-#endif
+#pragma comment(lib, "xaudio2_9redist.lib")
 
 LOG_CHANNEL(XAudio);
 
-template <>
-void fmt_class_string<ERole>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-	{
-		switch (value)
-		{
-		case eConsole: return "eConsole";
-		case eMultimedia: return "eMultimedia";
-		case eCommunications: return "eCommunications";
-		case ERole_enum_count: return unknown;
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<EDataFlow>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-	{
-		switch (value)
-		{
-		case eRender: return "eRender";
-		case eCapture: return "eCapture";
-		case eAll: return "eAll";
-		case EDataFlow_enum_count: return unknown;
-		}
-
-		return unknown;
-	});
-}
-
 XAudio2Backend::XAudio2Backend()
 	: AudioBackend()
 {
-	Microsoft::WRL::ComPtr<IXAudio2> instance{};
-	Microsoft::WRL::ComPtr<IMMDeviceEnumerator> enumerator{};
+	Microsoft::WRL::ComPtr<IXAudio2> instance;
 
 	// In order to prevent errors on CreateMasteringVoice, apparently we need CoInitializeEx according to:
 	// https://docs.microsoft.com/en-us/windows/win32/api/xaudio2fx/nf-xaudio2fx-xaudio2createvolumemeter
-	if (HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED); SUCCEEDED(hr))
+	HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
+	if (FAILED(hr) && hr != RPC_E_CHANGED_MODE)
 	{
-		m_com_init_success = true;
+		XAudio.error("CoInitializeEx() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
+		return;
 	}
 
-	if (HRESULT hr = XAudio2Create(&instance, 0, XAUDIO2_USE_DEFAULT_PROCESSOR); FAILED(hr))
+	hr = XAudio2Create(instance.GetAddressOf(), 0, XAUDIO2_DEFAULT_PROCESSOR);
+	if (FAILED(hr))
 	{
 		XAudio.error("XAudio2Create() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
 		return;
 	}
 
-	if (HRESULT hr = instance->RegisterForCallbacks(this); FAILED(hr))
+	hr = instance->CreateMasteringVoice(&m_master_voice, m_channels, 48000);
+	if (FAILED(hr))
 	{
-		// Some error recovery functionality will be lost, but otherwise backend is operational
-		XAudio.error("RegisterForCallbacks() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-	}
-
-	// Try to register a listener for device changes
-	if (HRESULT hr = CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&enumerator)); FAILED(hr))
-	{
-		XAudio.error("CoCreateInstance() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
+		XAudio.error("CreateMasteringVoice() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
 		return;
 	}
 
 	// All succeeded, "commit"
 	m_xaudio2_instance = std::move(instance);
-	m_device_enumerator = std::move(enumerator);
 }
 
 XAudio2Backend::~XAudio2Backend()
-{
-	Close();
-
-	if (m_device_enumerator != nullptr)
-	{
-		m_device_enumerator->UnregisterEndpointNotificationCallback(this);
-		m_device_enumerator = nullptr;
-	}
-
-	if (m_xaudio2_instance != nullptr)
-	{
-		m_xaudio2_instance->StopEngine();
-		m_xaudio2_instance = nullptr;
-	}
-
-	if (m_com_init_success)
-	{
-		CoUninitialize();
-	}
-}
-
-bool XAudio2Backend::Initialized()
-{
-	return m_xaudio2_instance != nullptr;
-}
-
-bool XAudio2Backend::Operational()
-{
-	return m_source_voice != nullptr && !m_reset_req.observe();
-}
-
-bool XAudio2Backend::DefaultDeviceChanged()
-{
-	std::lock_guard lock{m_state_cb_mutex};
-	return !m_reset_req.observe() && m_default_dev_changed;
-}
-
-void XAudio2Backend::Play()
-{
-	if (m_source_voice == nullptr)
-	{
-		XAudio.error("Play() called uninitialized");
-		return;
-	}
-
-	if (m_playing) return;
-
-	std::lock_guard lock(m_cb_mutex);
-	m_playing = true;
-}
-
-void XAudio2Backend::CloseUnlocked()
 {
 	if (m_source_voice != nullptr)
 	{
-		if (HRESULT hr = m_source_voice->Stop(); FAILED(hr))
-		{
-			XAudio.error("Stop() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-		}
-
+		m_source_voice->Stop();
 		m_source_voice->DestroyVoice();
-		m_source_voice = nullptr;
 	}
 
 	if (m_master_voice != nullptr)
 	{
 		m_master_voice->DestroyVoice();
-		m_master_voice = nullptr;
 	}
 
-	m_device_enumerator->UnregisterEndpointNotificationCallback(this);
+	if (m_xaudio2_instance != nullptr)
+	{
+		m_xaudio2_instance->StopEngine();
+	}
+}
 
-	m_playing = false;
-	m_last_sample.fill(0);
+void XAudio2Backend::Play()
+{
+	AUDIT(m_source_voice != nullptr);
 
-	std::lock_guard lock(m_state_cb_mutex);
-	m_default_dev_changed = false;
-	m_current_device.clear();
+	const HRESULT hr = m_source_voice->Start();
+	if (FAILED(hr))
+	{
+		XAudio.fatal("Start() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
+	}
 }
 
 void XAudio2Backend::Close()
 {
-	std::lock_guard lock(m_cb_mutex);
-	CloseUnlocked();
+	Pause();
+	Flush();
 }
 
 void XAudio2Backend::Pause()
 {
-	if (m_source_voice == nullptr)
-	{
-		XAudio.error("Pause() called uninitialized");
-		return;
-	}
-
-	if (!m_playing) return;
+	AUDIT(m_source_voice != nullptr);
 
+	const HRESULT hr = m_source_voice->Stop();
+	if (FAILED(hr))
 	{
-		std::lock_guard lock(m_cb_mutex);
-		m_playing = false;
-		m_last_sample.fill(0);
-	}
-
-	if (HRESULT hr = m_source_voice->FlushSourceBuffers(); FAILED(hr))
-	{
-		XAudio.error("FlushSourceBuffers() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
+		XAudio.fatal("Stop() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
 	}
 }
 
-bool XAudio2Backend::Open(std::string_view dev_id, AudioFreq freq, AudioSampleSize sample_size, AudioChannelCnt ch_cnt, audio_channel_layout layout)
+void XAudio2Backend::Open(u32 /* num_buffers */)
 {
-	if (!Initialized())
-	{
-		XAudio.error("Open() called uninitialized");
-		return false;
-	}
-
-	std::lock_guard lock(m_cb_mutex);
-	CloseUnlocked();
-
-	const bool use_default_device = dev_id.empty() || dev_id == audio_device_enumerator::DEFAULT_DEV_ID;
-	std::string selected_dev_id{};
-
-	if (use_default_device)
-	{
-		Microsoft::WRL::ComPtr<IMMDevice> default_dev{};
-		if (HRESULT hr = m_device_enumerator->GetDefaultAudioEndpoint(eRender, eConsole, &default_dev); FAILED(hr))
-		{
-			XAudio.error("GetDefaultAudioEndpoint() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-			return false;
-		}
-
-		LPWSTR default_id{};
-		if (HRESULT hr = default_dev->GetId(&default_id); FAILED(hr))
-		{
-			XAudio.error("GetId() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-			return false;
-		}
-
-		selected_dev_id = wchar_to_utf8(std::wstring_view{default_id});
-		CoTaskMemFree(default_id);
-		if (selected_dev_id.empty())
-		{
-			XAudio.error("Default device id is empty");
-			return false;
-		}
-	}
-
-	if (HRESULT hr = m_xaudio2_instance->CreateMasteringVoice(&m_master_voice, 0, 0, 0, utf8_to_wchar(use_default_device ? selected_dev_id : dev_id).c_str()); FAILED(hr))
-	{
-		XAudio.error("CreateMasteringVoice() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-		m_master_voice = nullptr;
-		return false;
-	}
-
-	XAUDIO2_VOICE_DETAILS vd{};
-	m_master_voice->GetVoiceDetails(&vd);
-
-	if (vd.InputChannels == 0)
-	{
-		XAudio.error("Channel count 0 is invalid");
-		CloseUnlocked();
-		return false;
-	}
-
-	XAudio.notice("Channel count is %d", vd.InputChannels);
-
-	m_sampling_rate = freq;
-	m_sample_size = sample_size;
-
-	setup_channel_layout(static_cast<u32>(ch_cnt), vd.InputChannels, layout, XAudio);
-
 	WAVEFORMATEX waveformatex{};
-	waveformatex.wFormatTag = get_convert_to_s16() ? WAVE_FORMAT_PCM : WAVE_FORMAT_IEEE_FLOAT;
-	waveformatex.nChannels = get_channels();
-	waveformatex.nSamplesPerSec = get_sampling_rate();
-	waveformatex.nAvgBytesPerSec = static_cast<DWORD>(get_sampling_rate() * get_channels() * get_sample_size());
-	waveformatex.nBlockAlign = get_channels() * get_sample_size();
-	waveformatex.wBitsPerSample = get_sample_size() * 8;
+	waveformatex.wFormatTag = m_convert_to_u16 ? WAVE_FORMAT_PCM : WAVE_FORMAT_IEEE_FLOAT;
+	waveformatex.nChannels = m_channels;
+	waveformatex.nSamplesPerSec = m_sampling_rate;
+	waveformatex.nAvgBytesPerSec = static_cast<DWORD>(m_sampling_rate * m_channels * m_sample_size);
+	waveformatex.nBlockAlign = m_channels * m_sample_size;
+	waveformatex.wBitsPerSample = m_sample_size * 8;
 	waveformatex.cbSize = 0;
 
-	if (HRESULT hr = m_xaudio2_instance->CreateSourceVoice(&m_source_voice, &waveformatex, 0, XAUDIO2_DEFAULT_FREQ_RATIO, this); FAILED(hr))
+	const HRESULT hr = m_xaudio2_instance->CreateSourceVoice(&m_source_voice, &waveformatex, 0, XAUDIO2_DEFAULT_FREQ_RATIO);
+	if (FAILED(hr))
 	{
-		XAudio.error("CreateSourceVoice() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-		CloseUnlocked();
+		XAudio.fatal("CreateSourceVoice() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
+		return;
+	}
+
+	AUDIT(m_source_voice != nullptr);
+	m_source_voice->SetVolume(1.0f);
+}
+
+bool XAudio2Backend::IsPlaying()
+{
+	AUDIT(m_source_voice != nullptr);
+
+	XAUDIO2_VOICE_STATE state;
+	m_source_voice->GetState(&state, XAUDIO2_VOICE_NOSAMPLESPLAYED);
+
+	return state.BuffersQueued > 0 || state.pCurrentBufferContext != nullptr;
+}
+
+bool XAudio2Backend::AddData(const void* src, u32 num_samples)
+{
+	AUDIT(m_source_voice != nullptr);
+
+	XAUDIO2_VOICE_STATE state;
+	m_source_voice->GetState(&state, XAUDIO2_VOICE_NOSAMPLESPLAYED);
+
+	if (state.BuffersQueued >= MAX_AUDIO_BUFFERS)
+	{
+		XAudio.warning("Too many buffers enqueued (%d)", state.BuffersQueued);
 		return false;
 	}
 
-	if (HRESULT hr = m_source_voice->Start(); FAILED(hr))
+	XAUDIO2_BUFFER buffer{};
+	buffer.AudioBytes = num_samples * m_sample_size;
+	buffer.Flags = 0;
+	buffer.LoopBegin = XAUDIO2_NO_LOOP_REGION;
+	buffer.LoopCount = 0;
+	buffer.LoopLength = 0;
+	buffer.pAudioData = static_cast<const BYTE*>(src);
+	buffer.pContext = nullptr;
+	buffer.PlayBegin = 0;
+	buffer.PlayLength = AUDIO_BUFFER_SAMPLES;
+
+	const HRESULT hr = m_source_voice->SubmitSourceBuffer(&buffer);
+	if (FAILED(hr))
 	{
-		XAudio.error("Start() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-		CloseUnlocked();
+		XAudio.fatal("AddData() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
 		return false;
 	}
 
-	if (HRESULT hr = m_device_enumerator->RegisterEndpointNotificationCallback(this); FAILED(hr))
-	{
-		XAudio.error("RegisterEndpointNotificationCallback() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-		CloseUnlocked();
-		return false;
-	}
-
-	if (HRESULT hr = m_source_voice->SetVolume(1.0f); FAILED(hr))
-	{
-		XAudio.error("SetVolume() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-	}
-
-	m_data_buf.resize(get_sampling_rate() * get_sample_size() * get_channels() * INTERNAL_BUF_SIZE_MS / 1000);
-
-	if (use_default_device)
-	{
-		m_current_device = selected_dev_id;
-	}
-
 	return true;
 }
 
-f64 XAudio2Backend::GetCallbackFrameLen()
+void XAudio2Backend::Flush()
 {
-	constexpr f64 _10ms = 0.01;
+	AUDIT(m_source_voice != nullptr);
 
-	if (m_xaudio2_instance == nullptr)
+	const HRESULT hr = m_source_voice->FlushSourceBuffers();
+	if (FAILED(hr))
 	{
-		XAudio.error("GetCallbackFrameLen() called uninitialized");
-		return _10ms;
-	}
-
-	Microsoft::WRL::ComPtr<IXAudio2Extension> xaudio_ext{};
-	f64 min_latency{};
-
-	if (HRESULT hr = m_xaudio2_instance.As(&xaudio_ext); FAILED(hr))
-	{
-		XAudio.error("QueryInterface() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-	}
-	else
-	{
-		u32 samples_per_q = 0, freq = 0;
-		xaudio_ext->GetProcessingQuantum(&samples_per_q, &freq);
-
-		if (freq)
-		{
-			min_latency = static_cast<f64>(samples_per_q) / freq;
-		}
-	}
-
-	return std::max<f64>(min_latency, _10ms); // 10ms is the minimum for XAudio
-}
-
-void XAudio2Backend::OnVoiceProcessingPassStart(UINT32 BytesRequired) noexcept
-{
-	std::unique_lock lock(m_cb_mutex, std::defer_lock);
-	if (BytesRequired && !m_reset_req.observe() && lock.try_lock_for(std::chrono::microseconds{50}) && m_write_callback && m_playing)
-	{
-		ensure(BytesRequired <= m_data_buf.size(), "XAudio internal buffer is too small. Report to developers!");
-
-		const u32 sample_size = get_sample_size() * get_channels();
-		u32 written = std::min(m_write_callback(BytesRequired, m_data_buf.data()), BytesRequired);
-		written -= written % sample_size;
-
-		if (written >= sample_size)
-		{
-			memcpy(m_last_sample.data(), m_data_buf.data() + written - sample_size, sample_size);
-		}
-
-		for (u32 i = written; i < BytesRequired; i += sample_size)
-		{
-			memcpy(m_data_buf.data() + i, m_last_sample.data(), sample_size);
-		}
-
-		XAUDIO2_BUFFER buffer{};
-		buffer.AudioBytes = BytesRequired;
-		buffer.pAudioData = static_cast<const BYTE*>(m_data_buf.data());
-		// Avoid logging in callback and assume that this always succeeds, all errors are caught by error callback anyway
-		m_source_voice->SubmitSourceBuffer(&buffer);
+		XAudio.fatal("FlushSourceBuffers() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
 	}
 }
 
-void XAudio2Backend::OnCriticalError(HRESULT Error) noexcept
+u64 XAudio2Backend::GetNumEnqueuedSamples()
 {
-	XAudio.error("OnCriticalError() called: %s (0x%08x)", std::system_category().message(Error), static_cast<u32>(Error));
+	AUDIT(m_source_voice != nullptr);
 
-	std::lock_guard lock(m_state_cb_mutex);
+	XAUDIO2_VOICE_STATE state;
+	m_source_voice->GetState(&state);
 
-	if (!m_reset_req.test_and_set() && m_state_callback)
-	{
-		m_state_callback(AudioStateEvent::UNSPECIFIED_ERROR);
-	}
+	// all buffers contain AUDIO_BUFFER_SAMPLES, so we can easily calculate how many samples there are remaining
+	return static_cast<u64>(AUDIO_BUFFER_SAMPLES - state.SamplesPlayed % AUDIO_BUFFER_SAMPLES) + (state.BuffersQueued * AUDIO_BUFFER_SAMPLES);
 }
 
-HRESULT XAudio2Backend::OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR new_default_device_id)
+f32 XAudio2Backend::SetFrequencyRatio(f32 new_ratio)
 {
-	XAudio.notice("OnDefaultDeviceChanged(flow=%s, role=%s, new_default_device_id=0x%x)", flow, role, new_default_device_id);
+	new_ratio = std::clamp(new_ratio, XAUDIO2_MIN_FREQ_RATIO, XAUDIO2_DEFAULT_FREQ_RATIO);
 
-	if (!new_default_device_id)
+	const HRESULT hr = m_source_voice->SetFrequencyRatio(new_ratio);
+	if (FAILED(hr))
 	{
-		XAudio.notice("OnDefaultDeviceChanged(): new_default_device_id empty");
-		return S_OK;
+		XAudio.fatal("SetFrequencyRatio() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
+		return 1.0f;
 	}
 
-	// Listen only for one device role, otherwise we're going to receive more than one notification for flow type
-	if (role != eConsole)
-	{
-		XAudio.notice("OnDefaultDeviceChanged(): we don't care about this device");
-		return S_OK;
-	}
-
-	std::lock_guard lock(m_state_cb_mutex);
-
-	// Non default device is used
-	if (m_current_device.empty())
-	{
-		return S_OK;
-	}
-
-	const std::string new_device_id = wchar_to_utf8(std::wstring_view{new_default_device_id});
-
-	if (flow == eRender || flow == eAll)
-	{
-		if (!m_reset_req.observe() && new_device_id != m_current_device)
-		{
-			m_default_dev_changed = true;
-
-			if (m_state_callback)
-			{
-				m_state_callback(AudioStateEvent::DEFAULT_DEVICE_MAYBE_CHANGED);
-			}
-		}
-	}
-
-	return S_OK;
+	return new_ratio;
 }
diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h
index 1bab624d67..4c74d520f8 100644
--- a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h
+++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h
@@ -6,13 +6,17 @@
 
 #include "Emu/Audio/AudioBackend.h"
 
-#include <initguid.h>
-#include <xaudio2.h>
+#include <xaudio2redist.h>
 #include <wrl/client.h>
-#include <MMDeviceAPI.h>
 
-class XAudio2Backend final : public AudioBackend, public IXAudio2VoiceCallback, public IXAudio2EngineCallback, public IMMNotificationClient
+
+class XAudio2Backend final : public AudioBackend
 {
+private:
+	Microsoft::WRL::ComPtr<IXAudio2> m_xaudio2_instance{};
+	IXAudio2MasteringVoice* m_master_voice{};
+	IXAudio2SourceVoice* m_source_voice{};
+
 public:
 	XAudio2Backend();
 	~XAudio2Backend() override;
@@ -20,62 +24,23 @@ public:
 	XAudio2Backend(const XAudio2Backend&) = delete;
 	XAudio2Backend& operator=(const XAudio2Backend&) = delete;
 
-	std::string_view GetName() const override { return "XAudio2"sv; }
+	const char* GetName() const override { return "XAudio2"; }
 
-	bool Initialized() override;
-	bool Operational() override;
-	bool DefaultDeviceChanged() override;
+	static const u32 capabilities = PLAY_PAUSE_FLUSH | IS_PLAYING | GET_NUM_ENQUEUED_SAMPLES | SET_FREQUENCY_RATIO;
+	u32 GetCapabilities() const override { return capabilities;	}
 
-	bool Open(std::string_view dev_id, AudioFreq freq, AudioSampleSize sample_size, AudioChannelCnt ch_cnt, audio_channel_layout layout) override;
+	bool Initialized() const override { return m_xaudio2_instance != nullptr; }
+
+	void Open(u32 /* num_buffers */) override;
 	void Close() override;
 
-	f64 GetCallbackFrameLen() override;
-
 	void Play() override;
 	void Pause() override;
+	bool IsPlaying() override;
 
-private:
-	static constexpr u32 INTERNAL_BUF_SIZE_MS = 25;
+	bool AddData(const void* src, u32 num_samples) override;
+	void Flush() override;
 
-	Microsoft::WRL::ComPtr<IXAudio2> m_xaudio2_instance{};
-	IXAudio2MasteringVoice* m_master_voice{};
-	IXAudio2SourceVoice* m_source_voice{};
-	bool m_com_init_success = false;
-
-	Microsoft::WRL::ComPtr<IMMDeviceEnumerator> m_device_enumerator{};
-
-	// Protected by state callback mutex
-	std::string m_current_device{};
-	bool m_default_dev_changed = false;
-
-	std::vector<u8> m_data_buf{};
-	std::array<u8, sizeof(float) * static_cast<u32>(AudioChannelCnt::SURROUND_7_1)> m_last_sample{};
-
-	atomic_t<bool> m_reset_req = false;
-
-	// XAudio voice callbacks
-	void OnVoiceProcessingPassStart(UINT32 BytesRequired) noexcept override;
-	void OnVoiceProcessingPassEnd() noexcept override {}
-	void OnStreamEnd() noexcept override {}
-	void OnBufferStart(void* /* pBufferContext */) noexcept override {}
-	void OnBufferEnd(void* /* pBufferContext*/) noexcept override {}
-	void OnLoopEnd(void* /* pBufferContext */) noexcept override {}
-	void OnVoiceError(void* /* pBufferContext */, HRESULT /* Error */) noexcept override {}
-
-	// XAudio engine callbacks
-	void OnProcessingPassStart() noexcept override {};
-	void OnProcessingPassEnd() noexcept override {};
-	void OnCriticalError(HRESULT Error) noexcept override;
-
-	// IMMNotificationClient callbacks
-	IFACEMETHODIMP_(ULONG) AddRef() override { return 1; };
-	IFACEMETHODIMP_(ULONG) Release() override { return 1; };
-	IFACEMETHODIMP QueryInterface(REFIID /*iid*/, void** /*object*/) override { return E_NOINTERFACE; };
-	IFACEMETHODIMP OnPropertyValueChanged(LPCWSTR /*device_id*/, const PROPERTYKEY /*key*/) override { return S_OK; };
-	IFACEMETHODIMP OnDeviceAdded(LPCWSTR /*device_id*/) override { return S_OK; };
-	IFACEMETHODIMP OnDeviceRemoved(LPCWSTR /*device_id*/) override { return S_OK; };
-	IFACEMETHODIMP OnDeviceStateChanged(LPCWSTR /*device_id*/, DWORD /*new_state*/) override { return S_OK; };
-	IFACEMETHODIMP OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR new_default_device_id) override;
-
-	void CloseUnlocked();
+	u64 GetNumEnqueuedSamples() override;
+	f32 SetFrequencyRatio(f32 new_ratio) override;
 };
diff --git a/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.cpp b/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.cpp
deleted file mode 100644
index e170addb0e..0000000000
--- a/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-#ifndef _WIN32
-#error "XAudio2 can only be built on Windows."
-#endif
-
-#include "Emu/Audio/XAudio2/xaudio2_enumerator.h"
-#include "util/logs.hpp"
-#include "Utilities/StrUtil.h"
-#include <algorithm>
-
-#include <wrl/client.h>
-#include <Windows.h>
-#include <system_error>
-#include <mmdeviceapi.h>
-#include <Functiondiscoverykeys_devpkey.h>
-
-LOG_CHANNEL(xaudio_dev_enum);
-
-xaudio2_enumerator::xaudio2_enumerator() : audio_device_enumerator()
-{
-}
-
-xaudio2_enumerator::~xaudio2_enumerator()
-{
-}
-
-std::vector<audio_device_enumerator::audio_device> xaudio2_enumerator::get_output_devices()
-{
-	Microsoft::WRL::ComPtr<IMMDeviceEnumerator> devEnum{};
-	if (HRESULT hr = CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&devEnum)); FAILED(hr))
-	{
-		xaudio_dev_enum.error("CoCreateInstance() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-		return {};
-	}
-
-	Microsoft::WRL::ComPtr<IMMDeviceCollection> devices{};
-	if (HRESULT hr = devEnum->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE | DEVICE_STATE_DISABLED, &devices); FAILED(hr))
-	{
-		xaudio_dev_enum.error("EnumAudioEndpoints() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-		return {};
-	}
-
-	UINT count = 0;
-	if (HRESULT hr = devices->GetCount(&count); FAILED(hr))
-	{
-		xaudio_dev_enum.error("devices->GetCount() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-		return {};
-	}
-
-	if (count == 0)
-	{
-		xaudio_dev_enum.warning("No devices available");
-		return {};
-	}
-
-	std::vector<audio_device> device_list{};
-
-	for (UINT dev_idx = 0; dev_idx < count; dev_idx++)
-	{
-		Microsoft::WRL::ComPtr<IMMDevice> endpoint{};
-		if (HRESULT hr = devices->Item(dev_idx, &endpoint); FAILED(hr))
-		{
-			xaudio_dev_enum.error("devices->Item() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-			continue;
-		}
-
-		LPWSTR id = nullptr;
-		if (HRESULT hr = endpoint->GetId(&id); FAILED(hr))
-		{
-			xaudio_dev_enum.error("endpoint->GetId() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-			continue;
-		}
-
-		if (std::wstring_view{id}.empty())
-		{
-			xaudio_dev_enum.error("Empty device id - skipping");
-			CoTaskMemFree(id);
-			continue;
-		}
-
-		audio_device dev{};
-		dev.id = wchar_to_utf8(id);
-
-		CoTaskMemFree(id);
-
-		Microsoft::WRL::ComPtr<IPropertyStore> props{};
-		if (HRESULT hr = endpoint->OpenPropertyStore(STGM_READ, &props); FAILED(hr))
-		{
-			xaudio_dev_enum.error("endpoint->OpenPropertyStore() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-			continue;
-		}
-
-		PROPVARIANT var;
-		PropVariantInit(&var);
-
-		if (HRESULT hr = props->GetValue(PKEY_Device_FriendlyName, &var); FAILED(hr))
-		{
-			xaudio_dev_enum.error("props->GetValue() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-			PropVariantClear(&var);
-			continue;
-		}
-
-		if (var.vt != VT_LPWSTR)
-		{
-			PropVariantClear(&var);
-			continue;
-		}
-
-		dev.name = wchar_to_utf8(var.pwszVal);
-		if (dev.name.empty())
-		{
-			dev.name = dev.id;
-		}
-
-		PropVariantClear(&var);
-		dev.max_ch = 2;
-
-		if (HRESULT hr = props->GetValue(PKEY_AudioEngine_DeviceFormat, &var); SUCCEEDED(hr))
-		{
-			if (var.vt == VT_BLOB)
-			{
-				if (var.blob.cbSize == sizeof(PCMWAVEFORMAT))
-				{
-					const PCMWAVEFORMAT* pcm = std::bit_cast<const PCMWAVEFORMAT*>(var.blob.pBlobData);
-					dev.max_ch = pcm->wf.nChannels;
-				}
-				else if (var.blob.cbSize >= sizeof(WAVEFORMATEX))
-				{
-					const WAVEFORMATEX* wfx = std::bit_cast<const WAVEFORMATEX*>(var.blob.pBlobData);
-					if (var.blob.cbSize >= sizeof(WAVEFORMATEX) + wfx->cbSize || wfx->wFormatTag == WAVE_FORMAT_PCM)
-					{
-						dev.max_ch = wfx->nChannels;
-					}
-				}
-			}
-		}
-		else
-		{
-			xaudio_dev_enum.error("props->GetValue() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
-		}
-
-		PropVariantClear(&var);
-
-		xaudio_dev_enum.notice("Found device: id=%s, name=%s, max_ch=%d", dev.id, dev.name, dev.max_ch);
-		device_list.emplace_back(dev);
-	}
-
-	std::sort(device_list.begin(), device_list.end(), [](const audio_device_enumerator::audio_device& a, const audio_device_enumerator::audio_device& b)
-	{
-		return a.name < b.name;
-	});
-
-	return device_list;
-}
diff --git a/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.h b/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.h
deleted file mode 100644
index e96e3fe9b5..0000000000
--- a/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#ifndef _WIN32
-#error "XAudio2 can only be built on Windows."
-#endif
-
-#include "Emu/Audio/audio_device_enumerator.h"
-
-class xaudio2_enumerator final : public audio_device_enumerator
-{
-public:
-
-	xaudio2_enumerator();
-	~xaudio2_enumerator() override;
-
-	std::vector<audio_device> get_output_devices() override;
-};
diff --git a/rpcs3/Emu/Audio/audio_device_enumerator.h b/rpcs3/Emu/Audio/audio_device_enumerator.h
deleted file mode 100644
index 6c81dedee7..0000000000
--- a/rpcs3/Emu/Audio/audio_device_enumerator.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-#include <vector>
-#include <string>
-
-class audio_device_enumerator
-{
-public:
-
-	static constexpr std::string_view DEFAULT_DEV_ID = "@@@default@@@";
-
-	struct audio_device
-	{
-		std::string id{};
-		std::string name{};
-		usz max_ch{};
-	};
-
-	audio_device_enumerator() {};
-
-	virtual ~audio_device_enumerator() = default;
-
-	// Enumerate available output devices.
-	virtual std::vector<audio_device> get_output_devices() = 0;
-};
diff --git a/rpcs3/Emu/Audio/audio_device_listener.cpp b/rpcs3/Emu/Audio/audio_device_listener.cpp
new file mode 100644
index 0000000000..03f86d620c
--- /dev/null
+++ b/rpcs3/Emu/Audio/audio_device_listener.cpp
@@ -0,0 +1,107 @@
+#include "stdafx.h"
+#include "audio_device_listener.h"
+#include "util/logs.hpp"
+#include "Utilities/StrUtil.h"
+#include "Emu/Cell/Modules/cellAudio.h"
+#include "Emu/IdManager.h"
+
+LOG_CHANNEL(IO);
+
+audio_device_listener::audio_device_listener()
+{
+#ifdef _WIN32
+	// Try to register a listener for device changes
+	HRESULT hr = CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&m_device_enumerator));
+	if (hr != S_OK)
+	{
+		IO.error("CoCreateInstance() failed: %s (0x%08x)", std::system_category().message(hr), static_cast<u32>(hr));
+	}
+	else if (m_device_enumerator)
+	{
+		m_device_enumerator->RegisterEndpointNotificationCallback(&m_listener);
+	}
+	else
+	{
+		IO.error("Device enumerator invalid");
+	}
+#endif
+}
+
+audio_device_listener::~audio_device_listener()
+{
+#ifdef _WIN32
+	if (m_device_enumerator != nullptr)
+	{
+		m_device_enumerator->Release();
+	}
+#endif
+}
+
+#ifdef _WIN32
+template <>
+void fmt_class_string<ERole>::format(std::string& out, u64 arg)
+{
+	format_enum(out, arg, [](auto value)
+	{
+		switch (value)
+		{
+		case eConsole: return "eConsole";
+		case eMultimedia: return "eMultimedia";
+		case eCommunications: return "eCommunications";
+		}
+
+		return unknown;
+	});
+}
+
+template <>
+void fmt_class_string<EDataFlow>::format(std::string& out, u64 arg)
+{
+	format_enum(out, arg, [](auto value)
+	{
+		switch (value)
+		{
+		case eRender: return "eRender";
+		case eCapture: return "eCapture";
+		case eAll: return "eAll";
+		}
+
+		return unknown;
+	});
+}
+
+HRESULT audio_device_listener::listener::OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR new_default_device_id)
+{
+	IO.notice("OnDefaultDeviceChanged(flow=%s, role=%s, new_default_device_id=0x%x)", flow, role, new_default_device_id);
+
+	if (!new_default_device_id)
+	{
+		IO.notice("OnDefaultDeviceChanged(): new_default_device_id empty");
+		return S_OK;
+	}
+
+	// Only listen for console and communication device changes.
+	if ((role != eConsole && role != eCommunications) || (flow != eRender && flow != eCapture))
+	{
+		IO.notice("OnDefaultDeviceChanged(): we don't care about this device");
+		return S_OK;
+	}
+
+	const std::wstring tmp(new_default_device_id);
+	const std::string new_device_id = wchar_to_utf8(tmp.c_str());
+
+	if (device_id != new_device_id)
+	{
+		device_id = new_device_id;
+
+		IO.warning("Default device changed: new device = '%s'", device_id);
+
+		if (auto& g_audio = g_fxo->get<cell_audio>(); g_fxo->is_init<cell_audio>())
+		{
+			g_audio.m_update_configuration = true;
+		}
+	}
+
+	return S_OK;
+}
+#endif
diff --git a/rpcs3/Emu/Audio/audio_device_listener.h b/rpcs3/Emu/Audio/audio_device_listener.h
new file mode 100644
index 0000000000..4d5e51fe01
--- /dev/null
+++ b/rpcs3/Emu/Audio/audio_device_listener.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#ifdef _WIN32
+#include <MMDeviceAPI.h>
+#endif
+
+class audio_device_listener
+{
+public:
+	audio_device_listener();
+	~audio_device_listener();
+
+private:
+#ifdef _WIN32
+	struct listener : public IMMNotificationClient
+	{
+		std::string device_id;
+
+		IFACEMETHODIMP_(ULONG) AddRef() override { return 1; };
+		IFACEMETHODIMP_(ULONG) Release() override { return 1; };
+		IFACEMETHODIMP QueryInterface(REFIID iid, void** object) override { return S_OK; };
+		IFACEMETHODIMP OnPropertyValueChanged(LPCWSTR device_id, const PROPERTYKEY key) override { return S_OK; };
+		IFACEMETHODIMP OnDeviceAdded(LPCWSTR device_id) override { return S_OK; };
+		IFACEMETHODIMP OnDeviceRemoved(LPCWSTR device_id) override { return S_OK; };
+		IFACEMETHODIMP OnDeviceStateChanged(LPCWSTR device_id, DWORD new_state) override { return S_OK; };
+		IFACEMETHODIMP OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR new_default_device_id) override;
+	} m_listener;
+
+	IMMDeviceEnumerator* m_device_enumerator = nullptr;
+#endif
+};
diff --git a/rpcs3/Emu/Audio/audio_resampler.cpp b/rpcs3/Emu/Audio/audio_resampler.cpp
deleted file mode 100644
index 32c7109b4c..0000000000
--- a/rpcs3/Emu/Audio/audio_resampler.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "stdafx.h"
-#include "Emu/Audio/audio_resampler.h"
-#include <algorithm>
-
-audio_resampler::audio_resampler()
-{
-	resampler.setSetting(SETTING_SEQUENCE_MS, 20); // Resampler frame size (reduce latency at cost of slight sound quality degradation)
-	resampler.setSetting(SETTING_USE_QUICKSEEK, 1); // Use fast quick seeking algorithm (substantally reduces computation time)
-}
-
-audio_resampler::~audio_resampler()
-{
-}
-
-void audio_resampler::set_params(AudioChannelCnt ch_cnt, AudioFreq freq)
-{
-	flush();
-	resampler.setChannels(static_cast<u32>(ch_cnt));
-	resampler.setSampleRate(static_cast<u32>(freq));
-}
-
-f64 audio_resampler::set_tempo(f64 new_tempo)
-{
-	new_tempo = std::clamp(new_tempo, RESAMPLER_MIN_FREQ_VAL, RESAMPLER_MAX_FREQ_VAL);
-	resampler.setTempo(new_tempo);
-	return new_tempo;
-}
-
-void audio_resampler::put_samples(const f32* buf, u32 sample_cnt)
-{
-	resampler.putSamples(buf, sample_cnt);
-}
-
-std::pair<f32* /* buffer */, u32 /* samples */> audio_resampler::get_samples(u32 sample_cnt)
-{
-	// NOTE: Make sure to get the buffer first because receiveSamples advances its position internally
-	//       and std::make_pair evaluates the second parameter first...
-	f32 *const buf = resampler.bufBegin();
-	return std::make_pair(buf, resampler.receiveSamples(sample_cnt));
-}
-
-u32 audio_resampler::samples_available() const
-{
-	return resampler.numSamples();
-}
-
-f64 audio_resampler::get_resample_ratio()
-{
-	return resampler.getInputOutputSampleRatio();
-}
-
-void audio_resampler::flush()
-{
-	resampler.clear();
-}
diff --git a/rpcs3/Emu/Audio/audio_resampler.h b/rpcs3/Emu/Audio/audio_resampler.h
deleted file mode 100644
index 56630df74d..0000000000
--- a/rpcs3/Emu/Audio/audio_resampler.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-#include "Emu/Audio/AudioBackend.h"
-
-#ifndef _MSC_VER
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsuggest-override"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include "SoundTouch.h"
-#ifndef _MSC_VER
-#pragma GCC diagnostic pop
-#endif
-
-constexpr f64 RESAMPLER_MAX_FREQ_VAL = 1.0;
-constexpr f64 RESAMPLER_MIN_FREQ_VAL = 0.1;
-
-class audio_resampler
-{
-public:
-	audio_resampler();
-	~audio_resampler();
-
-	void set_params(AudioChannelCnt ch_cnt, AudioFreq freq);
-	f64 set_tempo(f64 new_tempo);
-
-	void put_samples(const f32* buf, u32 sample_cnt);
-	std::pair<f32* /* buffer */, u32 /* samples */> get_samples(u32 sample_cnt);
-
-	u32 samples_available() const;
-	f64 get_resample_ratio();
-
-	void flush();
-
-private:
-	soundtouch::SoundTouch resampler{};
-};
diff --git a/rpcs3/Emu/Audio/audio_utils.cpp b/rpcs3/Emu/Audio/audio_utils.cpp
deleted file mode 100644
index bcff7bf947..0000000000
--- a/rpcs3/Emu/Audio/audio_utils.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "stdafx.h"
-#include "audio_utils.h"
-#include "Emu/system_config.h"
-#include "Emu/System.h"
-#include "Emu/IdManager.h"
-#include "Emu/RSX/Overlays/overlay_message.h"
-
-namespace audio
-{
-	f32 get_volume()
-	{
-		return g_fxo->get<audio_fxo>().audio_muted ? 0.0f : g_cfg.audio.volume / 100.0f;
-	}
-
-	void toggle_mute()
-	{
-		audio_fxo& fxo = g_fxo->get<audio_fxo>();
-		fxo.audio_muted = !fxo.audio_muted;
-		Emu.GetCallbacks().update_emu_settings();
-
-		rsx::overlays::queue_message(fxo.audio_muted ? localized_string_id::AUDIO_MUTED : localized_string_id::AUDIO_UNMUTED, 3'000'000);
-	}
-
-	void change_volume(s32 delta)
-	{
-		// Ignore if muted
-		if (g_fxo->get<audio_fxo>().audio_muted) return;
-
-		const s32 old_volume = g_cfg.audio.volume;
-		const s32 new_volume = old_volume + delta;
-
-		if (old_volume == new_volume) return;
-
-		g_cfg.audio.volume.set(std::clamp<s32>(new_volume, g_cfg.audio.volume.min, g_cfg.audio.volume.max));
-		Emu.GetCallbacks().update_emu_settings();
-
-		rsx::overlays::queue_message(get_localized_string(localized_string_id::AUDIO_CHANGED, fmt::format("%d%%", g_cfg.audio.volume.get()).c_str()), 3'000'000);
-	}
-}
diff --git a/rpcs3/Emu/Audio/audio_utils.h b/rpcs3/Emu/Audio/audio_utils.h
deleted file mode 100644
index 048776c1c1..0000000000
--- a/rpcs3/Emu/Audio/audio_utils.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-namespace audio
-{
-	struct audio_fxo
-	{
-		atomic_t<bool> audio_muted {false};
-	};
-
-	f32 get_volume();
-
-	void toggle_mute();
-	void change_volume(s32 delta);
-}
diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt
index 3793c94ea1..38c8f29a53 100644
--- a/rpcs3/Emu/CMakeLists.txt
+++ b/rpcs3/Emu/CMakeLists.txt
@@ -1,109 +1,85 @@
-add_library(rpcs3_emu STATIC
+add_library(rpcs3_emu
     cache_utils.cpp
-    games_config.cpp
     IdManager.cpp
     localized_string.cpp
-    savestate_utils.cpp
-    scoped_progress_dialog.cpp
-    stb_image.cpp
     System.cpp
     system_config.cpp
     system_config_types.cpp
     system_progress.cpp
     system_utils.cpp
-    vfs_config.cpp
     VFS.cpp
     GDB.cpp
     title.cpp
     perf_meter.cpp
-    perf_monitor.cpp
-    IPC_config.cpp
-    IPC_socket.cpp
 )
 
-if(USE_LTO)
-    set_target_properties(rpcs3_emu PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
-endif()
+# prevent WolfSSL from warning about not having harden options
+add_compile_definitions(WC_NO_HARDEN)
 
-if(USE_ASAN)
-    set_source_files_properties(../../Utilities/Thread.cpp PROPERTIES COMPILE_DEFINITIONS USE_ASAN)
-endif()
+target_link_libraries(rpcs3_emu
+    PRIVATE
+        3rdparty::zlib 3rdparty::yaml-cpp
+    PUBLIC
+        3rdparty::libevdev 3rdparty::flatbuffers)
 
-if(NOT USE_SYSTEM_OPENAL)
-    target_compile_definitions(rpcs3_emu PUBLIC AL_LIBTYPE_STATIC)
-endif()
 
-if(HAS_MEMORY_BREAKPOINTS)
-    target_compile_definitions(rpcs3_emu PRIVATE RPCS3_HAS_MEMORY_BREAKPOINTS)
-endif()
+find_package(Threads REQUIRED)
+target_link_libraries(rpcs3_emu
+    PUBLIC Threads::Threads)
 
 # For stdafx.h
 target_include_directories(rpcs3_emu
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/../..
-        ${CMAKE_CURRENT_SOURCE_DIR}/..
-)
+        ${RPCS3_SRC_DIR})
 
-target_include_directories(rpcs3_emu
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty
-)
 
 # Utilities
 target_sources(rpcs3_emu PRIVATE
     ../util/atomic.cpp
-    ../util/console.cpp
-    ../util/emu_utils.cpp
     ../util/media_utils.cpp
-    ../util/video_provider.cpp
     ../util/logs.cpp
     ../util/yaml.cpp
     ../util/vm_native.cpp
     ../util/dyn_lib.cpp
     ../util/sysinfo.cpp
     ../util/cpu_stats.cpp
-    ../util/serialization_ext.cpp
     ../../Utilities/bin_patch.cpp
     ../../Utilities/cheat_info.cpp
     ../../Utilities/cond.cpp
     ../../Utilities/Config.cpp
-    ../../Utilities/date_time.cpp
     ../../Utilities/File.cpp
-    ../../Utilities/JITASM.cpp
-    ../../Utilities/JITLLVM.cpp
+    ../../Utilities/JIT.cpp
     ../../Utilities/LUrlParser.cpp
     ../../Utilities/mutex.cpp
     ../../Utilities/rXml.cpp
     ../../Utilities/sema.cpp
-    ../../Utilities/simple_ringbuf.cpp
-    ../../Utilities/stack_trace.cpp
     ../../Utilities/StrFmt.cpp
     ../../Utilities/Thread.cpp
     ../../Utilities/version.cpp
 )
-if(APPLE)
-    target_sources(rpcs3_emu PRIVATE
-        ../../darwin/util/sysinfo_darwin.mm
-    )
-endif()
 
 target_include_directories(rpcs3_emu PUBLIC "${CMAKE_SOURCE_DIR}")
 
-set_source_files_properties("../../Utilities/JITLLVM.cpp" "../../Utilities/JITASM.cpp" PROPERTIES
-    COMPILE_FLAGS "$<IF:$<CXX_COMPILER_ID:MSVC>,/GR-,-fno-rtti>"
-    SKIP_PRECOMPILE_HEADERS ON
-)
+target_link_libraries(rpcs3_emu
+    PUBLIC
+        3rdparty::pugixml)
 
-set_source_files_properties("../util/yaml.cpp" PROPERTIES
-    COMPILE_FLAGS "$<IF:$<CXX_COMPILER_ID:MSVC>,/EHsc,-fexceptions>"
-    SKIP_PRECOMPILE_HEADERS ON
-)
+if(MSVC)
+    set_source_files_properties("../../Utilities/JIT.cpp" PROPERTIES COMPILE_FLAGS /GR-)
+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
     ../Crypto/aes.cpp
     ../Crypto/aesni.cpp
-    ../Crypto/decrypt_binaries.cpp
     ../Crypto/ec.cpp
     ../Crypto/key_vault.cpp
     ../Crypto/lz.cpp
@@ -113,13 +89,11 @@ target_sources(rpcs3_emu PRIVATE
     ../Crypto/unedat.cpp
     ../Crypto/unpkg.cpp
     ../Crypto/unself.cpp
-    ../Crypto/unzip.cpp
     ../Crypto/utils.cpp
 )
 
 # Loader
 target_sources(rpcs3_emu PRIVATE
-    ../Loader/disc.cpp
     ../Loader/ELF.cpp
     ../Loader/mself.cpp
     ../Loader/PSF.cpp
@@ -129,42 +103,52 @@ target_sources(rpcs3_emu PRIVATE
     ../Loader/TRP.cpp
 )
 
+
 # Audio
 target_sources(rpcs3_emu PRIVATE
-    Audio/audio_resampler.cpp
-    Audio/audio_utils.cpp
+    Audio/audio_device_listener.cpp
     Audio/AudioDumper.cpp
     Audio/AudioBackend.cpp
-    Audio/Cubeb/CubebBackend.cpp
-    Audio/Cubeb/cubeb_enumerator.cpp
+    Audio/AL/OpenALBackend.cpp
 )
 
+if(USE_ALSA)
+    find_package(ALSA)
+    if(ALSA_FOUND)
+        target_sources(rpcs3_emu PRIVATE Audio/ALSA/ALSABackend.cpp)
+        target_link_libraries(rpcs3_emu PUBLIC 3rdparty::alsa)
+    endif()
+endif()
+
+if(USE_PULSE AND PULSE_FOUND)
+    target_sources(rpcs3_emu PRIVATE Audio/Pulse/PulseBackend.cpp)
+    target_link_libraries(rpcs3_emu PUBLIC 3rdparty::pulse)
+endif()
+
 if(USE_FAUDIO)
-    find_package(SDL3)
-    if(SDL3_FOUND AND SDL3_VERSION VERSION_GREATER_EQUAL 3.2.0)
-        target_sources(rpcs3_emu PRIVATE
-            Audio/FAudio/FAudioBackend.cpp
-            Audio/FAudio/faudio_enumerator.cpp
-        )
+    find_package(SDL2)
+    if(SDL2_FOUND AND NOT SDL2_VERSION VERSION_LESS 2.0.9)
+        target_sources(rpcs3_emu PRIVATE Audio/FAudio/FAudioBackend.cpp)
         target_link_libraries(rpcs3_emu PUBLIC 3rdparty::faudio)
     endif()
 endif()
 
 if(WIN32)
-    if(NOT MSVC)
-        target_link_libraries(rpcs3_emu PRIVATE xaudio2_9)
-    endif()
+    target_include_directories(rpcs3_emu PUBLIC "${RPCS3_SRC_DIR}/../3rdparty/XAudio2Redist/include")
+    target_link_libraries(rpcs3_emu PRIVATE "${RPCS3_SRC_DIR}/../3rdparty/XAudio2Redist/libs/xaudio2_9redist.lib")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:xaudio2_9redist.dll")
     target_sources(rpcs3_emu PRIVATE
         Audio/XAudio2/XAudio2Backend.cpp
-        Audio/XAudio2/xaudio2_enumerator.cpp
     )
-    target_compile_definitions(rpcs3_emu PRIVATE UNICODE _UNICODE _WIN32_WINNT=0x0A00)
-    target_link_libraries(rpcs3_emu PRIVATE pdh bcrypt)
 endif()
 
+target_link_libraries(rpcs3_emu
+    PUBLIC
+        3rdparty::openal)
+
+
 # Cell
 target_sources(rpcs3_emu PRIVATE
-    Cell/ErrorCodes.cpp
     Cell/MFC.cpp
     Cell/PPUAnalyser.cpp
     Cell/PPUDisAsm.cpp
@@ -178,8 +162,7 @@ target_sources(rpcs3_emu PRIVATE
     Cell/SPUASMJITRecompiler.cpp
     Cell/SPUDisAsm.cpp
     Cell/SPUInterpreter.cpp
-    Cell/SPUCommonRecompiler.cpp
-    Cell/SPULLVMRecompiler.cpp
+    Cell/SPURecompiler.cpp
     Cell/SPUThread.cpp
     Cell/lv2/lv2.cpp
     Cell/lv2/sys_bdemu.cpp
@@ -192,7 +175,6 @@ target_sources(rpcs3_emu PRIVATE
     Cell/lv2/sys_event.cpp
     Cell/lv2/sys_event_flag.cpp
     Cell/lv2/sys_fs.cpp
-    Cell/lv2/sys_game.cpp
     Cell/lv2/sys_gamepad.cpp
     Cell/lv2/sys_gpio.cpp
     Cell/lv2/sys_hid.cpp
@@ -204,14 +186,6 @@ target_sources(rpcs3_emu PRIVATE
     Cell/lv2/sys_mmapper.cpp
     Cell/lv2/sys_mutex.cpp
     Cell/lv2/sys_net.cpp
-    Cell/lv2/sys_net/lv2_socket.cpp
-    Cell/lv2/sys_net/lv2_socket_native.cpp
-    Cell/lv2/sys_net/lv2_socket_raw.cpp
-    Cell/lv2/sys_net/lv2_socket_p2p.cpp
-    Cell/lv2/sys_net/lv2_socket_p2ps.cpp
-    Cell/lv2/sys_net/network_context.cpp
-    Cell/lv2/sys_net/nt_p2p_port.cpp
-    Cell/lv2/sys_net/sys_net_helpers.cpp
     Cell/lv2/sys_overlay.cpp
     Cell/lv2/sys_ppu_thread.cpp
     Cell/lv2/sys_process.cpp
@@ -234,7 +208,6 @@ target_sources(rpcs3_emu PRIVATE
     Cell/Modules/cellAdec.cpp
     Cell/Modules/cellAtrac.cpp
     Cell/Modules/cellAtracMulti.cpp
-    Cell/Modules/cellAtracXdec.cpp
     Cell/Modules/cellAudio.cpp
     Cell/Modules/cellAudioOut.cpp
     Cell/Modules/cellAuthDialog.cpp
@@ -246,7 +219,6 @@ target_sources(rpcs3_emu PRIVATE
     Cell/Modules/cellCrossController.cpp
     Cell/Modules/cellDaisy.cpp
     Cell/Modules/cellDmux.cpp
-    Cell/Modules/cellDmuxPamf.cpp
     Cell/Modules/cellDtcpIpUtility.cpp
     Cell/Modules/cellFiber.cpp
     Cell/Modules/cellFont.cpp
@@ -272,7 +244,6 @@ target_sources(rpcs3_emu PRIVATE
     Cell/Modules/cellMsgDialog.cpp
     Cell/Modules/cellMusic.cpp
     Cell/Modules/cellMusicDecode.cpp
-    Cell/Modules/cellMusicSelectionContext.cpp
     Cell/Modules/cellMusicExport.cpp
     Cell/Modules/cellNetAoi.cpp
     Cell/Modules/cellNetCtl.cpp
@@ -329,7 +300,6 @@ target_sources(rpcs3_emu PRIVATE
     Cell/Modules/cellVoice.cpp
     Cell/Modules/cellVpost.cpp
     Cell/Modules/cellWebBrowser.cpp
-    Cell/Modules/HLE_PATCHES.cpp
     Cell/Modules/libad_async.cpp
     Cell/Modules/libad_core.cpp
     Cell/Modules/libmedi.cpp
@@ -341,14 +311,13 @@ target_sources(rpcs3_emu PRIVATE
     Cell/Modules/sceNpCommerce2.cpp
     Cell/Modules/sceNp.cpp
     Cell/Modules/sceNpMatchingInt.cpp
-    Cell/Modules/sceNpPlus.cpp
     Cell/Modules/sceNpSns.cpp
     Cell/Modules/sceNpTrophy.cpp
     Cell/Modules/sceNpTus.cpp
     Cell/Modules/sceNpUtil.cpp
     Cell/Modules/StaticHLE.cpp
     Cell/Modules/sys_crashdump.cpp
-    Cell/Modules/sys_game_.cpp
+    Cell/Modules/sys_game.cpp
     Cell/Modules/sys_heap.cpp
     Cell/Modules/sys_io_.cpp
     Cell/Modules/sys_libc_.cpp
@@ -369,83 +338,47 @@ target_sources(rpcs3_emu PRIVATE
 )
 
 if(NOT MSVC)
-    set_source_files_properties(Cell/PPUTranslator.cpp PROPERTIES
-        COMPILE_FLAGS -fno-rtti
-        SKIP_PRECOMPILE_HEADERS ON
-    )
+    set_source_files_properties(Cell/PPUTranslator.cpp PROPERTIES COMPILE_FLAGS -fno-rtti)
 endif()
 
+target_link_libraries(rpcs3_emu
+    PRIVATE
+        3rdparty::stblib 3rdparty::libpng)
+
+
 # CPU
 target_sources(rpcs3_emu PRIVATE
     CPU/CPUThread.cpp
     CPU/CPUTranslator.cpp
 )
 
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64|arm64|aarch64")
-    target_sources(rpcs3_emu PRIVATE
-        CPU/Backends/AArch64/AArch64ASM.cpp
-        CPU/Backends/AArch64/AArch64Common.cpp
-        CPU/Backends/AArch64/AArch64JIT.cpp
-        CPU/Backends/AArch64/AArch64Signal.cpp
-    )
-endif()
+target_link_libraries(rpcs3_emu
+    PUBLIC 3rdparty::llvm 3rdparty::asmjit)
 
 
 # Io
 target_sources(rpcs3_emu PRIVATE
-    Io/Buzz.cpp
-    Io/camera_config.cpp
-    Io/Dimensions.cpp
-    Io/evdev_gun_handler.cpp
-    Io/GameTablet.cpp
-    Io/GHLtar.cpp
-    Io/GunCon3.cpp
-    Io/Infinity.cpp
     Io/interception.cpp
     Io/KeyboardHandler.cpp
-    Io/midi_config_types.cpp
-    Io/mouse_config.cpp
-    Io/MouseHandler.cpp
     Io/pad_config.cpp
     Io/pad_config_types.cpp
-    Io/pad_types.cpp
     Io/PadHandler.cpp
-    Io/rb3drums_config.cpp
-    Io/RB3MidiDrums.cpp
-    Io/RB3MidiGuitar.cpp
-    Io/RB3MidiKeyboard.cpp
-    Io/recording_config.cpp
-    Io/Skylander.cpp
-    Io/TopShotElite.cpp
-    Io/TopShotFearmaster.cpp
-    Io/Turntable.cpp
     Io/usb_device.cpp
-    Io/usb_vfs.cpp
-    Io/usio.cpp
-    Io/LogitechG27.cpp
-    Io/LogitechG27Config.cpp
+    Io/Skylander.cpp
+    Io/GHLtar.cpp
+    Io/Buzz.cpp
+    Io/Turntable.cpp
 )
 
 # Np
 target_sources(rpcs3_emu PRIVATE
     NP/fb_helpers.cpp
-    NP/np_cache.cpp
-    NP/np_gui_cache.cpp
     NP/np_contexts.cpp
-    NP/np_dnshook.cpp
-    NP/np_requests_gui.cpp
     NP/np_handler.cpp
-    NP/np_helpers.cpp
-    NP/np_notifications.cpp
-    NP/np_requests.cpp
     NP/signaling_handler.cpp
     NP/np_structs_extra.cpp
     NP/rpcn_client.cpp
     NP/rpcn_config.cpp
-    NP/rpcn_countries.cpp
-    NP/upnp_config.cpp
-    NP/upnp_handler.cpp
-    NP/ip_address.cpp
 )
 
 # Memory
@@ -453,123 +386,69 @@ target_sources(rpcs3_emu PRIVATE
     Memory/vm.cpp
 )
 
+
 # RSX
 target_sources(rpcs3_emu PRIVATE
-    RSX/Capture/rsx_capture.cpp
-    RSX/Capture/rsx_replay.cpp
+    RSX/gcm_enums.cpp
+    RSX/gcm_printing.cpp
+    RSX/GSRender.cpp
+    RSX/RSXFIFO.cpp
+    RSX/rsx_methods.cpp
+    RSX/RSXOffload.cpp
+    RSX/RSXTexture.cpp
+    RSX/RSXThread.cpp
+    RSX/rsx_utils.cpp
+    RSX/RSXDisAsm.cpp
     RSX/Common/BufferUtils.cpp
     RSX/Common/surface_store.cpp
     RSX/Common/TextureUtils.cpp
     RSX/Common/texture_cache.cpp
-    RSX/Common/texture_cache_types.cpp
-    RSX/Core/RSXContext.cpp
-    RSX/Core/RSXDisplay.cpp
-    RSX/Core/RSXDrawCommands.cpp
-    RSX/gcm_enums.cpp
-    RSX/gcm_printing.cpp
-    RSX/GSRender.cpp
-    RSX/Host/MM.cpp
-    RSX/Host/RSXDMAWriter.cpp
     RSX/Null/NullGSRender.cpp
-    RSX/NV47/FW/draw_call.cpp
-    RSX/NV47/FW/reg_context.cpp
-    RSX/NV47/HW/common.cpp
-    RSX/NV47/HW/nv0039.cpp
-    RSX/NV47/HW/nv3089.cpp
-    RSX/NV47/HW/nv308a.cpp
-    RSX/NV47/HW/nv406e.cpp
-    RSX/NV47/HW/nv4097.cpp
-    RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp
-    RSX/Overlays/HomeMenu/overlay_home_menu.cpp
-    RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp
-    RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp
-    RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp
-    RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp
-    RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp
-    RSX/Overlays/HomeMenu/overlay_home_menu_savestate.cpp
-    RSX/Overlays/Network/overlay_recvmessage_dialog.cpp
-    RSX/Overlays/Network/overlay_sendmessage_dialog.cpp
-    RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp
-    RSX/Overlays/overlays.cpp
-    RSX/Overlays/overlay_animated_icon.cpp
     RSX/Overlays/overlay_animation.cpp
-    RSX/Overlays/overlay_compile_notification.cpp
     RSX/Overlays/overlay_controls.cpp
-    RSX/Overlays/overlay_cursor.cpp
-    RSX/Overlays/overlay_debug_overlay.cpp
     RSX/Overlays/overlay_edit_text.cpp
     RSX/Overlays/overlay_fonts.cpp
     RSX/Overlays/overlay_list_view.cpp
-    RSX/Overlays/overlay_manager.cpp
-    RSX/Overlays/overlay_media_list_dialog.cpp
-    RSX/Overlays/overlay_message.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
-    RSX/Overlays/overlay_trophy_notification.cpp
     RSX/Overlays/overlay_user_list_dialog.cpp
     RSX/Overlays/overlay_utils.cpp
-    RSX/Overlays/overlay_video.cpp
+    RSX/Overlays/overlays.cpp
+    RSX/Overlays/overlay_shader_compile_notification.cpp
+    RSX/Overlays/overlay_trophy_notification.cpp
     RSX/Overlays/Shaders/shader_loading_dialog.cpp
     RSX/Overlays/Shaders/shader_loading_dialog_native.cpp
-    RSX/Program/CgBinaryProgram.cpp
     RSX/Program/CgBinaryFragmentProgram.cpp
     RSX/Program/CgBinaryVertexProgram.cpp
     RSX/Program/FragmentProgramDecompiler.cpp
-    RSX/Program/FragmentProgramRegister.cpp
     RSX/Program/GLSLCommon.cpp
-    RSX/Program/ProgramStateCache.cpp
     RSX/Program/program_util.cpp
-    RSX/Program/SPIRVCommon.cpp
+    RSX/Program/ProgramStateCache.cpp
     RSX/Program/VertexProgramDecompiler.cpp
-    RSX/GSFrameBase.cpp
-    RSX/RSXDisAsm.cpp
-    RSX/RSXFIFO.cpp
-    RSX/RSXOffload.cpp
-    RSX/RSXTexture.cpp
-    RSX/RSXThread.cpp
-    RSX/RSXZCULL.cpp
-    RSX/rsx_methods.cpp
-    RSX/rsx_utils.cpp
-    RSX/rsx_vertex_data.cpp
+    RSX/Capture/rsx_capture.cpp
+    RSX/Capture/rsx_replay.cpp
+    RSX/GL/GLCommonDecompiler.cpp
+    RSX/GL/GLCompute.cpp
+    RSX/GL/GLDraw.cpp
+    RSX/GL/GLFragmentProgram.cpp
+    RSX/GL/GLGSRender.cpp
+    RSX/GL/GLHelpers.cpp
+    RSX/GL/GLOverlays.cpp
+    RSX/GL/GLPipelineCompiler.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
+    RSX/GL/GLTextureCache.cpp
+    RSX/GL/OpenGL.cpp
 )
 
-if(NOT ANDROID)
-    target_sources(rpcs3_emu PRIVATE
-        RSX/GL/GLCommonDecompiler.cpp
-        RSX/GL/GLCompute.cpp
-        RSX/GL/GLDMA.cpp
-        RSX/GL/GLDraw.cpp
-        RSX/GL/GLFragmentProgram.cpp
-        RSX/GL/GLGSRender.cpp
-        RSX/GL/GLHelpers.cpp
-        RSX/GL/GLOverlays.cpp
-        RSX/GL/GLPipelineCompiler.cpp
-        RSX/GL/GLPresent.cpp
-        RSX/GL/GLRenderTargets.cpp
-        RSX/GL/GLResolveHelper.cpp
-        RSX/GL/GLShaderInterpreter.cpp
-        RSX/GL/GLTexture.cpp
-        RSX/GL/GLTextureCache.cpp
-        RSX/GL/glutils/blitter.cpp
-        RSX/GL/glutils/buffer_object.cpp
-        RSX/GL/glutils/capabilities.cpp
-        RSX/GL/glutils/common.cpp
-        RSX/GL/glutils/fbo.cpp
-        RSX/GL/glutils/image.cpp
-        RSX/GL/glutils/program.cpp
-        RSX/GL/glutils/ring_buffer.cpp
-        RSX/GL/glutils/sampler.cpp
-        RSX/GL/GLVertexBuffers.cpp
-        RSX/GL/GLVertexProgram.cpp
-        RSX/GL/OpenGL.cpp
-        RSX/GL/upscalers/fsr1/fsr_pass.cpp
-    )
-endif()
-
 if(TARGET 3rdparty_vulkan)
     target_sources(rpcs3_emu PRIVATE
         RSX/VK/upscalers/fsr1/fsr_pass.cpp
@@ -578,13 +457,10 @@ if(TARGET 3rdparty_vulkan)
         RSX/VK/vkutils/chip_class.cpp
         RSX/VK/vkutils/commands.cpp
         RSX/VK/vkutils/data_heap.cpp
-        RSX/VK/vkutils/descriptors.cpp
         RSX/VK/vkutils/image.cpp
         RSX/VK/vkutils/image_helpers.cpp
-        RSX/VK/vkutils/instance.cpp
         RSX/VK/vkutils/scratch.cpp
         RSX/VK/vkutils/sync.cpp
-        RSX/VK/vkutils/swapchain.cpp
         RSX/VK/vkutils/memory.cpp
         RSX/VK/vkutils/device.cpp
         RSX/VK/vkutils/sampler.cpp
@@ -592,9 +468,7 @@ if(TARGET 3rdparty_vulkan)
         RSX/VK/VKAsyncScheduler.cpp
         RSX/VK/VKCommandStream.cpp
         RSX/VK/VKCommonDecompiler.cpp
-        RSX/VK/VKCommonPipelineLayout.cpp
         RSX/VK/VKCompute.cpp
-        RSX/VK/VKDataHeapManager.cpp
         RSX/VK/VKDMA.cpp
         RSX/VK/VKDraw.cpp
         RSX/VK/VKFormats.cpp
@@ -617,53 +491,38 @@ if(TARGET 3rdparty_vulkan)
         RSX/VK/VKVertexBuffers.cpp
         RSX/VK/VKVertexProgram.cpp
         RSX/VK/VKTextureCache.cpp
-        RSX/VK/VulkanAPI.cpp
     )
 endif()
 
-find_package(Threads REQUIRED)
-
 target_link_libraries(rpcs3_emu
     PUBLIC
-        3rdparty::llvm
-        3rdparty::asmjit
         3rdparty::ffmpeg
-        3rdparty::sdl3
-        3rdparty::opengl
-        3rdparty::stblib
-        3rdparty::vulkan
-        3rdparty::glew
-        3rdparty::libusb
-        3rdparty::wolfssl
-        3rdparty::openal
-        3rdparty::cubeb
-        3rdparty::soundtouch
-        3rdparty::miniupnpc
-        3rdparty::libevdev
-        3rdparty::flatbuffers
-        3rdparty::pugixml
-        Threads::Threads
+        3rdparty::opengl 3rdparty::stblib
+        3rdparty::vulkan 3rdparty::glew
+        3rdparty::libusb 3rdparty::wolfssl
     PRIVATE
-        3rdparty::glslang
-        3rdparty::libpng
-        3rdparty::rtmidi
-        3rdparty::yaml-cpp
-        3rdparty::zlib
-        3rdparty::zstd
+        3rdparty::xxhash
 )
 
 if(APPLE)
     check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
-    if (HAVE_CLOCK_GETTIME)
-        target_compile_definitions(rpcs3_emu PUBLIC -DHAVE_CLOCK_GETTIME)
+    if (${HAVE_CLOCK_GETTIME})
+	    target_compile_definitions(rpcs3_emu PUBLIC -DHAVE_CLOCK_GETTIME)
     endif()
 endif()
 
 
 if(USE_PRECOMPILED_HEADERS)
-    target_precompile_headers(rpcs3_emu PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../stdafx.h")
-endif()
+    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)
 
-if(WAYLAND_FOUND)
-    target_link_libraries(rpcs3_emu PRIVATE OpenGL::EGL)
+        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)
+    endif()
 endif()
diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.cpp b/rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.cpp
deleted file mode 100644
index 4c8a01e0e2..0000000000
--- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-#include "stdafx.h"
-#include "AArch64ASM.h"
-
-#include "Utilities/StrFmt.h"
-
-namespace aarch64
-{
-    using fmt_replacement_list_t = std::vector<std::pair<std::string, std::string>>;
-
-    void UASM::embed_args(compiled_instruction_t& instruction, const std::vector<Arg>& args, const std::vector<gpr>& clobbered)
-    {
-        for (const auto& arg : args)
-        {
-            switch (arg.type)
-            {
-            case ArgType::Immediate:
-            case ArgType::Register:
-            case ArgType::SRegister:
-                // Embedded directly
-                break;
-            case ArgType::LLVMInt:
-                instruction.constraints.push_back("i");
-                instruction.args.push_back(arg.value);
-                break;
-            case ArgType::LLVMReg:
-                instruction.constraints.push_back("r");
-                instruction.args.push_back(arg.value);
-                break;
-            case ArgType::LLVMPtr:
-                instruction.constraints.push_back("m");
-                instruction.args.push_back(arg.value);
-                break;
-            default:
-                break;
-            }
-        }
-
-        for (const auto& reg : clobbered)
-        {
-            const auto clobber = fmt::format("~{%s}", gpr_names[static_cast<int>(reg)]);
-            instruction.constraints.push_back(clobber);
-        }
-    }
-
-    void UASM::emit0(const char* inst)
-    {
-        compiled_instruction_t i{};
-        i.asm_ = inst;
-        m_instructions.push_back(i);
-    }
-
-    void UASM::emit1(const char* inst, const Arg& arg0, const std::vector<gpr>& clobbered)
-    {
-        int arg_id = 0;
-        fmt_replacement_list_t repl = {
-            { "{0}", arg0.to_string(&arg_id) }
-        };
-
-        compiled_instruction_t i{};
-        i.asm_ = fmt::replace_all(inst, repl);
-        embed_args(i, { arg0 }, clobbered);
-        m_instructions.push_back(i);
-    }
-
-    void UASM::emit2(const char* inst, const Arg& arg0, const Arg& arg1, const std::vector<gpr>& clobbered)
-    {
-        int arg_id = 0;
-        fmt_replacement_list_t repl = {
-            { "{0}", arg0.to_string(&arg_id) },
-            { "{1}", arg1.to_string(&arg_id) },
-        };
-
-        compiled_instruction_t i{};
-        i.asm_ = fmt::replace_all(inst, repl);
-        embed_args(i, { arg0, arg1 }, clobbered);
-        m_instructions.push_back(i);
-    }
-
-    void UASM::emit3(const char* inst, const Arg& arg0, const Arg& arg1, const Arg& arg2, const std::vector<gpr>& clobbered)
-    {
-        int arg_id = 0;
-        fmt_replacement_list_t repl = {
-            { "{0}", arg0.to_string(&arg_id) },
-            { "{1}", arg1.to_string(&arg_id) },
-            { "{2}", arg2.to_string(&arg_id) },
-        };
-
-        compiled_instruction_t i{};
-        i.asm_ = fmt::replace_all(inst, repl);
-        embed_args(i, { arg0, arg1, arg2 }, clobbered);
-        m_instructions.push_back(i);
-    }
-
-    void UASM::emit4(const char* inst, const Arg& arg0, const Arg& arg1, const Arg& arg2, const Arg& arg3, const std::vector<gpr>& clobbered)
-    {
-        int arg_id = 0;
-        fmt_replacement_list_t repl = {
-            { "{0}", arg0.to_string(&arg_id) },
-            { "{1}", arg1.to_string(&arg_id) },
-            { "{2}", arg2.to_string(&arg_id) },
-            { "{3}", arg3.to_string(&arg_id) },
-        };
-
-        compiled_instruction_t i{};
-        i.asm_ = fmt::replace_all(inst, repl);
-        embed_args(i, { arg0, arg1, arg2, arg3 }, clobbered);
-        m_instructions.push_back(i);
-    }
-
-    void UASM::insert(llvm::IRBuilder<>* irb, llvm::LLVMContext& ctx) const
-    {
-        for (const auto& inst : m_instructions)
-        {
-            auto constraints = fmt::merge(inst.constraints, ",");
-            llvm_asm(irb, inst.asm_, inst.args, constraints, ctx);
-        }
-    }
-
-    void UASM::append(const UASM& that)
-    {
-        m_instructions.reserve(m_instructions.size() + that.m_instructions.size());
-        std::copy(that.m_instructions.begin(), that.m_instructions.end(), std::back_inserter(this->m_instructions));
-    }
-
-    void UASM::prepend(const UASM& that)
-    {
-        auto new_instructions = that.m_instructions;
-        new_instructions.reserve(m_instructions.size() + that.m_instructions.size());
-        std::copy(m_instructions.begin(), m_instructions.end(), std::back_inserter(new_instructions));
-        m_instructions = std::move(new_instructions);
-    }
-
-    // Convenience arg wrappers
-    UASM::Arg UASM::Int(llvm::Value* v)
-    {
-        return Arg {
-            .type = ArgType::LLVMInt,
-            .value = v
-        };
-    }
-
-    UASM::Arg UASM::Imm(s64 v)
-    {
-        return Arg {
-            .type = ArgType::Immediate,
-            .imm = v
-        };
-    }
-
-    UASM::Arg UASM::Reg(gpr reg)
-    {
-        return Arg {
-            .type = ArgType::Register,
-            .reg = reg
-        };
-    }
-
-    UASM::Arg UASM::Reg(spr reg)
-    {
-        return Arg {
-            .type = ArgType::SRegister,
-            .sreg = reg
-        };
-    }
-
-    UASM::Arg UASM::Ptr(llvm::Value* v)
-    {
-        return Arg {
-            .type = ArgType::LLVMPtr,
-            .value = v
-        };
-    }
-
-    UASM::Arg UASM::Var(llvm::Value* v)
-    {
-        return Arg {
-            .type = ArgType::LLVMReg,
-            .value = v
-        };
-    }
-
-    void UASM::mov(gpr dst, gpr src)
-    {
-        emit2("mov {0}, {1}", Reg(dst), Reg(src), { dst });
-    }
-
-    void UASM::mov(gpr dst, const Arg& src)
-    {
-        emit2("mov {0}, {1}", Reg(dst), src, { dst });
-    }
-
-    void UASM::movnt(gpr dst, const Arg& src)
-    {
-        emit2("mov {0}, {1}", Reg(dst), src, {});
-    }
-
-    void UASM::str(gpr src, gpr base, const Arg& offset)
-    {
-        emit3("str {0}, [{1}, {2}]", Reg(src), Reg(base), offset, {});
-    }
-
-    void UASM::str(const Arg& src, spr base, const Arg& offset)
-    {
-        emit3("str {0}, [{1}, {2}]", src, Reg(base), offset, {});
-    }
-
-    void UASM::ldr(gpr dst, gpr base, const Arg& offset)
-    {
-        emit3("ldr {0}, [{1}, {2}]", Reg(dst), Reg(base), offset, { dst });
-    }
-
-    void UASM::ldr(gpr dst, spr base, const Arg& offset)
-    {
-        emit3("ldr {0}, [{1}, {2}]", Reg(dst), Reg(base), offset, { dst });
-    }
-
-    void UASM::stp(gpr src0, gpr src1, gpr base, const Arg& offset)
-    {
-        emit4("stp {0}, {1}, [{2}, {3}]", Reg(src0), Reg(src1), Reg(base), offset, {});
-    }
-
-    void UASM::ldp(gpr dst0, gpr dst1, gpr base, const Arg& offset)
-    {
-        emit4("ldp {0}, {1}, [{2}, {3}]", Reg(dst0), Reg(dst1), Reg(base), offset, { dst0, dst1 });
-    }
-
-    void UASM::b(const Arg& target)
-    {
-        emit1("b {0}", target, {});
-    }
-
-    void UASM::br(gpr target)
-    {
-        emit1("br {0}", Reg(target), {});
-    }
-
-    void UASM::br(const Arg& target)
-    {
-        emit1("br {0}", target, {});
-    }
-
-    void UASM::ret()
-    {
-        emit0("ret");
-    }
-
-    void UASM::adr(gpr dst, const Arg& src)
-    {
-        emit2("adr {0}, {1}", Reg(dst), src, { dst });
-    }
-
-    void UASM::add(spr dst, spr src0, const Arg& src1)
-    {
-        emit3("add {0}, {1}, {2}", Reg(dst), Reg(src0), src1, {});
-    }
-
-    void UASM::sub(spr dst, spr src0, const Arg& src1)
-    {
-        emit3("sub {0}, {1}, {2}", Reg(dst), Reg(src0), src1, {});
-    }
-
-    void UASM::nop(const std::vector<Arg>& refs)
-    {
-        emit0("nop");
-        embed_args(m_instructions.back(), refs, {});
-    }
-
-    void UASM::brk(int mark)
-    {
-        emit1("brk {0}", Imm(mark), {});
-    }
-
-    std::string UASM::Arg::to_string(int* id) const
-    {
-        // Safety checks around the optional arg incrementer
-        int dummy = 0;
-        if (!id)
-        {
-            id = &dummy;
-        }
-
-        switch (type)
-        {
-        case ArgType::Immediate:
-            return std::string("#") + std::to_string(imm);
-        case ArgType::Register:
-            return gpr_names[static_cast<int>(reg)];
-        case ArgType::SRegister:
-            return spr_asm_names[static_cast<int>(sreg)];
-        case ArgType::LLVMInt:
-        case ArgType::LLVMReg:
-        case ArgType::LLVMPtr:
-        default:
-            // Return placeholder identifier
-            return std::string("$") + std::to_string(*id++);
-        }
-    }
-}
diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.h b/rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.h
deleted file mode 100644
index f494fafc63..0000000000
--- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#pragma once
-
-#include "AArch64Common.h"
-
-namespace aarch64
-{
-    // Micro-assembler
-    class UASM
-    {
-    public:
-        enum ArgType
-        {
-            Register = 0,
-            SRegister,
-            Immediate,
-            LLVMInt,
-            LLVMPtr,
-            LLVMReg
-        };
-
-        struct Arg
-        {
-            ArgType type;
-            union
-            {
-                llvm::Value* value;
-                gpr reg;
-                spr sreg;
-                s64 imm;
-            };
-
-            std::string to_string(int* id = nullptr) const;
-        };
-
-    protected:
-        struct compiled_instruction_t
-        {
-            std::string asm_;
-            std::vector<std::string> constraints;
-            std::vector<llvm::Value*> args;
-        };
-
-        std::vector<compiled_instruction_t> m_instructions;
-
-        void emit0(const char* inst);
-        void emit1(const char* inst, const Arg& arg0, const std::vector<gpr>& clobbered);
-        void emit2(const char* inst, const Arg& arg0, const Arg& arg1, const std::vector<gpr>& clobbered);
-        void emit3(const char* inst, const Arg& arg0, const Arg& arg1, const Arg& arg2, const std::vector<gpr>& clobbered);
-        void emit4(const char* inst, const Arg& arg0, const Arg& arg1, const Arg& arg2, const Arg& arg3, const std::vector<gpr>& clobbered);
-
-        void embed_args(compiled_instruction_t& instruction, const std::vector<Arg>& args, const std::vector<gpr>& clobbered);
-
-    public:
-        UASM() = default;
-
-        // Convenience wrappers
-        static Arg Int(llvm::Value* v);
-        static Arg Imm(s64 v);
-        static Arg Reg(gpr reg);
-        static Arg Reg(spr reg);
-        static Arg Ptr(llvm::Value* v);
-        static Arg Var(llvm::Value* v);
-
-        void mov(gpr dst, gpr src);
-        void mov(gpr dst, const Arg& src);
-        void movnt(gpr dst, const Arg& src);
-
-        void adr(gpr dst, const Arg& src);
-
-        void str(gpr src, gpr base, const Arg& offset);
-        void str(gpr src, spr base, const Arg& offset);
-        void str(const Arg& src, gpr base, const Arg& offset);
-        void str(const Arg& src, spr base, const Arg& offset);
-        void ldr(gpr dst, gpr base, const Arg& offset);
-        void ldr(gpr dst, spr base, const Arg& offset);
-
-        void stp(gpr src0, gpr src1, gpr base, const Arg& offset);
-        void stp(gpr src0, gpr src1, spr base, const Arg& offset);
-        void ldp(gpr dst0, gpr dst1, gpr base, const Arg& offset);
-        void ldp(gpr dst0, gpr dst1, spr base, const Arg& offset);
-
-        void add(spr dst, spr src0, const Arg& src1);
-        void add(gpr dst, gpr src0, const Arg& src1);
-        void sub(spr dst, spr src0, const Arg& src1);
-        void sub(gpr dst, gpr src0, const Arg& src1);
-
-        void b(const Arg& target);
-        void br(gpr target);
-        void br(const Arg& target);
-        void ret();
-
-        void nop(const std::vector<Arg>& refs = {});
-        void brk(int mark = 0);
-
-        void append(const UASM& other);
-        void prepend(const UASM& other);
-
-        void insert(llvm::IRBuilder<>* irb, llvm::LLVMContext& ctx) const;
-    };
-
-    using ASMBlock = UASM;
-}
diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp
deleted file mode 100644
index e2468655a8..0000000000
--- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-#include "stdafx.h"
-#include "AArch64Common.h"
-
-#include <thread>
-#include <map>
-
-#if defined(__APPLE__)
-#include <sys/sysctl.h>
-#endif
-
-namespace aarch64
-{
-#if !defined(__APPLE__)
-    struct cpu_entry_t
-    {
-        u32 vendor;
-        u32 part;
-        const char* arch;
-        const char* family;
-        const char* name;
-    };
-
-    struct cpu_vendor_t
-    {
-        u32 id;
-        const char* name;
-        const char* short_name;
-    };
-
-    static cpu_vendor_t s_vendors_list[] =
-    {
-        { 0x41, "Arm Limited.", "ARM" },
-        { 0x42, "Broadcom Corporation.", "Broadcom" },
-        { 0x43, "Cavium Inc.", "Cavium" },
-        { 0x44, "Digital Equipment Corporation.", "DEC" },
-        { 0x46, "Fujitsu Ltd.", "Fujitsu" },
-        { 0x49, "Infineon Technologies AG.", "Infineon" },
-        { 0x4D, "Motorola or Freescale Semiconductor Inc.", "Motorola" },
-        { 0x4E, "NVIDIA Corporation.", "NVIDIA" },
-        { 0x50, "Applied Micro Circuits Corporation.", "AMCC" },
-        { 0x51, "Qualcomm Inc.", "Qualcomm" },
-        { 0x56, "Marvell International Ltd.", "Marvell" },
-        { 0x69, "Intel Corporation.", "Intel" },
-        { 0xC0, "Ampere Computing", "Ampere" },
-
-        // Unofficial but existing in the wild
-        { 0x61, "Apple Inc.", "Apple" },
-    };
-
-    static cpu_entry_t s_cpu_list[] =
-    {
-        // ARM
-        { 0x41, 0xd01, "armv8-a+crc+simd", "", "Cortex-A32" },
-        { 0x41, 0xd04, "armv8-a+crc+simd", "", "Cortex-A35" },
-        { 0x41, 0xd03, "armv8-a+crc+simd", "", "Cortex-A53" },
-        { 0x41, 0xd07, "armv8-a+crc+simd", "", "Cortex-A57" },
-        { 0x41, 0xd08, "armv8-a+crc+simd", "", "Cortex-A72" },
-        { 0x41, 0xd09, "armv8-a+crc+simd", "", "Cortex-A73" },
-        { 0x41, 0xd05, "armv8.2-a+fp16+dotprod", "", "Cortex-A55" },
-        { 0x41, 0xd0a, "armv8.2-a+fp16+dotprod", "", "Cortex-A75" },
-        { 0x41, 0xd0b, "armv8.2-a+fp16+dotprod", "", "Cortex-A76" },
-        { 0x41, 0xd0e, "armv8.2-a+fp16+dotprod", "", "Cortex-A76ae" },
-        { 0x41, 0xd0d, "armv8.2-a+fp16+dotprod", "", "Cortex-A77" },
-        { 0x41, 0xd41, "armv8.2-a+fp16+dotprod", "", "Cortex-A78" },
-        { 0x41, 0xd42, "armv8.2-a+fp16+dotprod", "", "Cortex-A78ae" },
-        { 0x41, 0xd4b, "armv8.2-a+fp16+dotprod", "", "Cortex-A78c" },
-        { 0x41, 0xd47, "armv9-a+fp16+bf16+i8mm", "", "Cortex-A710" },
-        { 0x41, 0xd44, "armv8.2-a+fp16+dotprod", "", "Cortex-X1" },
-        { 0x41, 0xd4c, "armv8.2-a+fp16+dotprod", "", "Cortex-X1c" },
-        { 0x41, 0xd0c, "armv8.2-a+fp16+dotprod", "", "Neoverse-N1" },
-        { 0x41, 0xd40, "armv8.4-a+fp16+bf16+i8mm", "", "Neoverse-V1" },
-        { 0x41, 0xd49, "armv8.5-a+fp16+bf16+i8mm", "", "Neoverse-N2" },
-        { 0x41, 0xd23, "armv8.1-m.main+pacbti+mve.fp+fp.dp", "", "Cortex-M85" },
-        { 0x41, 0xd13, "armv8-r+crc+simd", "", "Cortex-R52" },
-        { 0x41, 0xd16, "armv8-r+crc+simd", "", "Cortex-R52+" },
-
-        // APPLE
-        { 0x61, 0x22, "armv8.5-a", "M1", "Firestorm" },
-        { 0x61, 0x23, "armv8.5-a", "M1", "IceStorm" },
-        { 0x61, 0x28, "armv8.5-a", "M1 Max", "Firestorm" },
-        { 0x61, 0x29, "armv8.5-a", "M1 Max", "Icestorm" },
-        { 0x61, 0x24, "armv8.5-a", "M1 Pro", "Firestorm" },
-        { 0x61, 0x25, "armv8.5-a", "M1 Pro", "Icestorm" },
-        { 0x61, 0x32, "armv8.5-a", "M2", "Avalanche" },
-        { 0x61, 0x33, "armv8.5-a", "M2", "Blizzard" },
-
-        // QUALCOMM
-        { 0x51, 0x01, "armv8.5-a", "Snapdragon", "X-Elite" },
-    };
-
-    static const cpu_vendor_t* find_cpu_vendor(u64 id)
-    {
-        for (const auto& vendor : s_vendors_list)
-        {
-            if (id == vendor.id)
-            {
-                return &vendor;
-            }
-        }
-
-        return nullptr;
-    }
-
-    static const cpu_entry_t* find_cpu_part(u64 vendor, u64 part)
-    {
-        for (const auto& cpu : s_cpu_list)
-        {
-            if (cpu.vendor == vendor && cpu.part == part)
-            {
-                return &cpu;
-            }
-        }
-
-        return nullptr;
-    }
-
-    // Read main ID register
-    static u64 read_MIDR_EL1([[maybe_unused]] u32 cpu_id)
-    {
-#if defined(__linux__)
-        const std::string path = fmt::format("/sys/devices/system/cpu/cpu%u/regs/identification/midr_el1", cpu_id);
-        if (!fs::is_file(path))
-        {
-            return umax;
-        }
-
-        std::string value;
-        if (!fs::file(path, fs::read).read(value, 18))
-        {
-            return 0;
-        }
-        return std::stoull(value, nullptr, 16);
-#else
-        // Unimplemented
-        return 0;
-#endif
-    }
-
-    std::string get_cpu_name()
-    {
-        std::map<u64, int> core_layout;
-        for (u32 i = 0; i < std::thread::hardware_concurrency(); ++i)
-        {
-            const auto midr = read_MIDR_EL1(i);
-            if (midr == umax)
-            {
-                break;
-            }
-
-            core_layout[midr]++;
-        }
-
-        if (core_layout.empty())
-        {
-            return {};
-        }
-
-        const cpu_entry_t* lowest_part_info = nullptr; 
-        for (const auto& [midr, count] : core_layout)
-        {
-            const auto implementer_id = (midr >> 24) & 0xff;
-            const auto part_id = (midr >> 4) & 0xfff;
-
-            const auto part_info = find_cpu_part(implementer_id, part_id);
-            if (!part_info)
-            {
-                return {};
-            }
-
-            if (lowest_part_info == nullptr || lowest_part_info > part_info)
-            {
-                lowest_part_info = part_info;
-            }
-        }
-
-        return lowest_part_info ? lowest_part_info->name : "";
-    }
-
-    std::string get_cpu_brand()
-    {
-        // Fetch vendor and part numbers. ARM CPUs often have more than 1 architecture on the SoC, so we check all of them.
-        std::map<u64, int> core_layout;
-        for (u32 i = 0; i < std::thread::hardware_concurrency(); ++i)
-        {
-            const auto midr = read_MIDR_EL1(i);
-            if (midr == umax)
-            {
-                break;
-            }
-
-            core_layout[midr]++;
-        }
-
-        if (core_layout.empty())
-        {
-            return "Unidentified CPU";
-        }
-
-        std::string vendor_name;
-        std::string part_family;
-        std::vector<std::string> core_names;
-        for (const auto& [midr, count] : core_layout)
-        {
-            const auto implementer_id = (midr >> 24) & 0xff;
-            const auto part_id = (midr >> 4) & 0xfff;
-
-            if (vendor_name.empty())
-            {
-                const auto vendor_info = find_cpu_vendor(implementer_id);
-                vendor_name = vendor_info ? vendor_info->short_name : "Unknown";
-            }
-
-            const auto part_info = find_cpu_part(implementer_id, part_id);
-            if (!part_info)
-            {
-                core_names.push_back(fmt::format("%dx\"Unidentified cores\"", count));
-                continue;
-            }
-
-            if (part_family.empty() && part_info->family)
-            {
-                part_family = part_info->family;
-            }
-
-            core_names.push_back(fmt::format("%dx\"%s\"", count, part_info->name));
-        }
-
-        // Assemble everything
-        std::string result = vendor_name + " ";
-        std::string suffix;
-        if (!part_family.empty())
-        {
-            // Since we have a known family name, the core layout is just extra info.
-            // Wrap core layout in brackets.
-            result += part_family + " (";
-            suffix = ")";
-        }
-        result += fmt::merge(core_names, " + ");
-        result += suffix;
-        return result;
-    }
-#else
-    static std::string sysctl_s(const std::string_view& variable_name)
-    {
-        // Determine required buffer size
-        size_t length = 0;
-        if (sysctlbyname(variable_name.data(), nullptr, &length, nullptr, 0) == -1)
-        {
-            return "";
-        }
-
-        // Allocate space for the variable.
-        std::vector<char> text(length + 1);
-        text[length] = 0;
-        if (sysctlbyname(variable_name.data(), text.data(), &length, nullptr, 0) == -1)
-        {
-            return "";
-        }
-
-        return text.data();
-    }
-
-    static u64 sysctl_u64(const std::string_view& variable_name)
-    {
-        u64 value = 0;
-        size_t data_len = sizeof(value);
-        if (sysctlbyname(variable_name.data(), &value, &data_len, nullptr, 0) == -1)
-        {
-            return umax;
-        }
-        return value;
-    }
-
-    // We can get the brand name from sysctl directly
-    // Once we have windows implemented, we should probably separate the different OS-dependent bits to avoid clutter
-    std::string get_cpu_brand()
-    {
-        const auto brand = sysctl_s("machdep.cpu.brand_string");
-        if (brand.empty())
-        {
-            return "Unidentified CPU";
-        }
-
-        // Parse extra core information (P and E cores)
-        if (sysctl_u64("hw.nperflevels") < 2)
-        {
-            return brand;
-        }
-
-        u64 pcores = sysctl_u64("hw.perflevel0.physicalcpu");
-        u64 ecores = sysctl_u64("hw.perflevel1.physicalcpu");
-
-        if (sysctl_s("hw.perflevel0.name") == "Efficiency")
-        {
-            std::swap(ecores, pcores);
-        }
-
-        return fmt::format("%s (%lluP+%lluE)", brand, pcores, ecores);
-    }
-#endif
-}
diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.h b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.h
deleted file mode 100644
index dff06dfb81..0000000000
--- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include "../../CPUTranslator.h"
-
-namespace aarch64
-{
-    enum gpr : s32
-    {
-        x0 = 0,
-        x1, x2, x3, x4, x5, x6, x7, x8, x9,
-        x10, x11, x12, x13, x14, x15, x16, x17, x18, x19,
-        x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30
-    };
-
-    enum spr : s32
-    {
-        xzr = 0,
-        pc,
-        sp
-    };
-
-    static const char* gpr_names[] =
-    {
-        "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9",
-        "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18", "x19",
-        "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27", "x28", "x29", "x30"
-    };
-
-    static const char* spr_names[] =
-    {
-        "xzr", "pc", "sp"
-    };
-
-    static const char* spr_asm_names[] =
-    {
-        "xzr", ".", "sp"
-    };
-
-    std::string get_cpu_name();
-    std::string get_cpu_brand();
-}
diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.cpp b/rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.cpp
deleted file mode 100644
index 91aedffd85..0000000000
--- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.cpp
+++ /dev/null
@@ -1,550 +0,0 @@
-#include "stdafx.h"
-
-#include "AArch64JIT.h"
-#include "AArch64ASM.h"
-
-LOG_CHANNEL(jit_log, "JIT");
-
-#define STDOUT_DEBUG 0
-
-#define DPRINT1(...)\
-    do {\
-        printf(__VA_ARGS__);\
-        printf("\n");\
-        fflush(stdout);\
-    } while (0)
-
-#if STDOUT_DEBUG
-#define DPRINT DPRINT1
-#else
-#define DPRINT jit_log.trace
-#endif
-
-namespace aarch64
-{
-    using instruction_info_t = GHC_frame_preservation_pass::instruction_info_t;
-    using function_info_t = GHC_frame_preservation_pass::function_info_t;
-
-    GHC_frame_preservation_pass::GHC_frame_preservation_pass(const config_t& configuration)
-        : m_config(configuration)
-    {}
-
-    void GHC_frame_preservation_pass::reset()
-    {
-        m_visited_functions.clear();
-    }
-
-    void GHC_frame_preservation_pass::force_tail_call_terminators(llvm::Function& f)
-    {
-        // GHC functions are not call-stack preserving and can therefore never return if they make any external calls at all.
-        // Replace every terminator clause with a tail call explicitly. This is already done for X64 to work, but better safe than sorry.
-        for (auto& bb : f)
-        {
-            auto bit = bb.begin(), prev = bb.end();
-            for (; bit != bb.end(); prev = bit, ++bit)
-            {
-                if (prev == bb.end())
-                {
-                    continue;
-                }
-
-                if (llvm::isa<llvm::ReturnInst>(&*bit))
-                {
-                    if (auto ci = llvm::dyn_cast<llvm::CallInst>(&*prev))
-                    {
-                        // This is a "ret" that is coming after a "call" to another funciton.
-                        // Enforce that it must be a tail call.
-                        if (!ci->isTailCall())
-                        {
-                            ci->setTailCall();
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    function_info_t GHC_frame_preservation_pass::preprocess_function(const llvm::Function& f)
-    {
-        function_info_t result{};
-        result.instruction_count = f.getInstructionCount();
-
-        // Blanket exclusions. Stubs or dispatchers that do not compute anything themselves.
-        if (f.getName() == "__spu-null")
-        {
-            // Don't waste the effort processing this stub. It has no points of concern
-            result.num_external_calls = 1;
-            return result;
-        }
-
-        if (m_config.use_stack_frames)
-        {
-            // Stack frame estimation. SPU code can be very long and consumes several KB of stack.
-            u32 stack_frame_size = 128u;
-            // Actual ratio is usually around 1:4
-            const u32 expected_compiled_instr_count = f.getInstructionCount() * 4;
-            // Because GHC doesn't preserve stack (all stack is scratch), we know we'll start to spill once we go over the number of actual regs.
-            // We use a naive allocator that just assumes each instruction consumes a register slot. We "spill" every 32 instructions.
-            // FIXME: Aggressive spill is only really a thing with vector operations. We can detect those instead.
-            // A proper fix is to port this to a MF pass, but I have PTSD from working at MF level.
-            const u32 spill_pages = (expected_compiled_instr_count + 127u) / 128u;
-            stack_frame_size *= std::min(spill_pages, 32u); // 128 to 4k dynamic. It is unlikely that any frame consumes more than 4096 bytes
-
-            result.stack_frame_size = stack_frame_size;
-        }
-
-        result.instruction_count = f.getInstructionCount();
-        result.num_external_calls = 0;
-
-        // The LR is not spared by LLVM in cases where there is a lot of spilling.
-        // This is much easier to manage with a custom LLVM branch as we can just mark X30 as off-limits as a GPR.
-        // This is another thing to be moved to a MachineFunction pass. Ideally we should check the instruction stream for writes to LR and reload it on exit.
-        // For now, assume it is dirtied if the function is of any reasonable length.
-        result.clobbers_x30 = result.instruction_count > 32;
-        result.is_leaf = true;
-
-        for (auto& bb : f)
-        {
-            for (auto& inst : bb)
-            {
-                if (auto ci = llvm::dyn_cast<llvm::CallInst>(&inst))
-                {
-                    if (llvm::isa<llvm::InlineAsm>(ci->getCalledOperand()))
-                    {
-                        // Inline ASM blocks are ignored
-                        continue;
-                    }
-
-                    result.num_external_calls++;
-                    if (ci->isTailCall())
-                    {
-                        // This is not a leaf if it has at least one exit point / terminator that is not a return instruction.
-                        result.is_leaf = false;
-                    }
-                    else
-                    {
-                        // Returning calls always clobber x30
-                        result.clobbers_x30 = true;
-                    }
-                }
-            }
-        }
-
-        return result;
-    }
-
-    instruction_info_t GHC_frame_preservation_pass::decode_instruction(const llvm::Function& f, const llvm::Instruction* i)
-    {
-        instruction_info_t result{};
-        if (auto ci = llvm::dyn_cast<llvm::CallInst>(i))
-        {
-            // Watch out for injected ASM blocks...
-            if (llvm::isa<llvm::InlineAsm>(ci->getCalledOperand()))
-            {
-                // Not a real call. This is just an insert of inline asm
-                return result;
-            }
-
-            result.is_call_inst = true;
-            result.is_returning = true;
-            result.preserve_stack = !ci->isTailCall();
-            result.callee = ci->getCalledFunction();
-            result.is_tail_call = ci->isTailCall();
-
-            if (!result.callee)
-            {
-                // Indirect call (call from raw value).
-                result.is_indirect = true;
-                result.callee_is_GHC = ci->getCallingConv() == llvm::CallingConv::GHC;
-                result.callee_name = "__indirect_call";
-            }
-            else
-            {
-                result.callee_is_GHC = result.callee->getCallingConv() == llvm::CallingConv::GHC;
-                result.callee_name = result.callee->getName().str();
-            }
-            return result;
-        }
-
-        if (auto bi = llvm::dyn_cast<llvm::BranchInst>(i))
-        {
-            // More likely to jump out via an unconditional...
-            if (!bi->isConditional())
-            {
-                ensure(bi->getNumSuccessors() == 1);
-                auto targetbb = bi->getSuccessor(0);
-
-                result.callee = targetbb->getParent();
-                result.callee_name = result.callee->getName().str();
-                result.is_call_inst = result.callee_name != f.getName();
-            }
-
-            return result;
-        }
-
-        if (auto bi = llvm::dyn_cast<llvm::IndirectBrInst>(i))
-        {
-            // Very unlikely to be the same function. Can be considered a function exit.
-            ensure(bi->getNumDestinations() == 1);
-            auto targetbb = ensure(bi->getSuccessor(0)); // This is guaranteed to fail but I've yet to encounter this
-
-            result.callee = targetbb->getParent();
-            result.callee_name = result.callee->getName().str();
-            result.is_call_inst = result.callee_name != f.getName();
-            return result;
-        }
-
-        if (auto bi = llvm::dyn_cast<llvm::CallBrInst>(i))
-        {
-            ensure(bi->getNumSuccessors() == 1);
-            auto targetbb = bi->getSuccessor(0);
-
-            result.callee = targetbb->getParent();
-            result.callee_name = result.callee->getName().str();
-            result.is_call_inst = result.callee_name != f.getName();
-            return result;
-        }
-
-        if (auto bi = llvm::dyn_cast<llvm::InvokeInst>(i))
-        {
-            ensure(bi->getNumSuccessors() == 2);
-            auto targetbb = bi->getSuccessor(0);
-
-            result.callee = targetbb->getParent();
-            result.callee_name = result.callee->getName().str();
-            result.is_call_inst = result.callee_name != f.getName();
-            return result;
-        }
-
-        return result;
-    }
-
-    gpr GHC_frame_preservation_pass::get_base_register_for_call(const std::string& callee_name, gpr default_reg)
-    {
-        // We go over the base_register_lookup table and find the first matching pattern
-        for (const auto& pattern : m_config.base_register_lookup)
-        {
-            if (callee_name.starts_with(pattern.first))
-            {
-                return pattern.second;
-            }
-        }
-
-        return default_reg;
-    }
-
-    void GHC_frame_preservation_pass::run(llvm::IRBuilder<>* irb, llvm::Function& f)
-    {
-        if (f.getCallingConv() != llvm::CallingConv::GHC)
-        {
-            // If we're not doing GHC, the calling conv will have stack fixup on its own via prologue/epilogue
-            return;
-        }
-
-        if (f.getInstructionCount() == 0)
-        {
-            // Nothing to do. Happens with placeholder functions such as branch patchpoints
-            return;
-        }
-
-        const auto this_name = f.getName().str();
-        if (m_visited_functions.find(this_name) != m_visited_functions.end())
-        {
-            // Already processed. Only useful when recursing which is currently not used.
-            DPRINT("Function %s was already processed. Skipping.\n", this_name.c_str());
-            return;
-        }
-
-        if (this_name != "__spu-null") // This name is meaningless and doesn't uniquely identify a function
-        {
-            m_visited_functions.insert(this_name);
-        }
-
-        if (m_config.exclusion_callback && m_config.exclusion_callback(this_name))
-        {
-            // Function is explicitly excluded
-            return;
-        }
-
-        // Preprocessing.
-        auto function_info = preprocess_function(f);
-        if (function_info.num_external_calls == 0 && function_info.stack_frame_size == 0)
-        {
-            // No stack frame injection and no external calls to patch up. This is a leaf function, nothing to do.
-            DPRINT("Ignoring function %s", this_name.c_str());
-            return;
-        }
-
-        // Force tail calls on all terminators
-        force_tail_call_terminators(f);
-
-        // Check for leaves
-        if (function_info.is_leaf && !m_config.use_stack_frames)
-        {
-            // Sanity check. If this function had no returning calls, it should have been omitted from processing.
-            ensure(function_info.clobbers_x30, "Function has no terminator and no non-tail calls but was allowed for frame processing!");
-            DPRINT("Function %s is a leaf.", this_name.c_str());
-            process_leaf_function(irb, f);
-            return;
-        }
-
-        // Asm snippets for patching stack frame
-        ASMBlock frame_prologue, frame_epilogue;
-
-        if (function_info.stack_frame_size > 0)
-        {
-            // NOTE: The stack frame here is purely optional, we can pre-allocate scratch on the gateway.
-            // However, that is an optimization for another time, this helps make debugging easier.
-            frame_prologue.sub(sp, sp, UASM::Imm(function_info.stack_frame_size));
-            frame_epilogue.add(sp, sp, UASM::Imm(function_info.stack_frame_size));
-
-            // Emit the frame prologue. We use a BB here for extra safety as it solves the problem of backwards jumps re-executing the prologue.
-            auto functionStart = &f.front();
-            auto prologueBB = llvm::BasicBlock::Create(f.getContext(), "", &f, functionStart);
-            irb->SetInsertPoint(prologueBB, prologueBB->begin());
-            frame_prologue.insert(irb, f.getContext());
-            irb->CreateBr(functionStart);
-        }
-
-        // Now we start processing
-        bool terminator_found = false;
-        for (auto& bb : f)
-        {
-            for (auto bit = bb.begin(); bit != bb.end();)
-            {
-                const auto instruction_info = decode_instruction(f, &(*bit));
-                if (!instruction_info.is_call_inst)
-                {
-                    ++bit;
-                    continue;
-                }
-
-                std::string callee_name = "__unknown";
-                if (const auto cf = instruction_info.callee)
-                {
-                    callee_name = cf->getName().str();
-                    if (cf->hasFnAttribute(llvm::Attribute::AlwaysInline) || callee_name.starts_with("llvm."))
-                    {
-                        // Always inlined call. Likely inline Asm. Skip
-                        ++bit;
-                        continue;
-                    }
-
-                    // Technically We should also ignore any host functions linked in, usually starting with ppu_ or spu_ prefix.
-                    // However, there is not much guarantee that those are safe with only rare exceptions, and it doesn't hurt to patch the frame around them that much anyway.
-                }
-
-                if (instruction_info.preserve_stack)
-                {
-                    // Non-tail call. If we have a stack allocated, we preserve it across the call
-                    ++bit;
-                    continue;
-                }
-
-                ensure(instruction_info.is_tail_call);
-                terminator_found = true;
-
-                // Now we patch the call if required. For normal calls that 'return' (i.e calls to C/C++ ABI), we do not patch them as they will manage the stack themselves (callee-managed)
-                bit = patch_tail_call(irb, f, bit, instruction_info, function_info, frame_epilogue);
-
-                // Next
-                if (bit != bb.end())
-                {
-                    ++bit;
-                }
-            }
-        }
-
-        if (!terminator_found)
-        {
-            // If we got here, we must be using stack frames.
-            ensure(function_info.is_leaf && function_info.stack_frame_size > 0, "Leaf function was processed without using stack frames!");
-
-            // We want to insert a frame cleanup at the tail at every return instruction we find.
-            for (auto& bb : f)
-            {
-                for (auto& i : bb)
-                {
-                    if (is_ret_instruction(&i))
-                    {
-                        irb->SetInsertPoint(&i);
-                        frame_epilogue.insert(irb, f.getContext());
-                    }
-                }
-            }
-        }
-    }
-
-    llvm::BasicBlock::iterator
-    GHC_frame_preservation_pass::patch_tail_call(
-        llvm::IRBuilder<>* irb,
-        llvm::Function& f,
-        llvm::BasicBlock::iterator where,
-        const instruction_info_t& instruction_info,
-        const function_info_t& function_info,
-        const UASM& frame_epilogue)
-    {
-        auto ci = llvm::dyn_cast<llvm::CallInst>(where);
-        irb->SetInsertPoint(ensure(ci));
-
-        const auto this_name = f.getName().str();
-
-        // Insert breadcrumb info before the call
-        // WARNING: This can corrupt the call because LLVM somehow ignores the clobbered register during a call instruction for some reason
-        // In case of a blr on x27..x29 you can end up corrupting the binary, but it is invaluable for debugging.
-        // Debug frames are disabled in shipping code so this is not a big deal.
-        if (m_config.debug_info)
-        {
-            // Call-chain tracing
-            ASMBlock c;
-            c.mov(x29, x28);
-            c.mov(x28, x27);
-            c.adr(x27, UASM::Reg(pc));
-            c.insert(irb, f.getContext());
-        }
-
-        // Clean up any injected frames before the call
-        if (function_info.stack_frame_size > 0)
-        {
-            frame_epilogue.insert(irb, f.getContext());
-        }
-
-        // Insert the next piece after the call, before the ret
-        ++where;
-        ensure(llvm::isa<llvm::ReturnInst>(where));
-        irb->SetInsertPoint(llvm::dyn_cast<llvm::Instruction>(where));
-
-        if (instruction_info.callee_is_GHC &&                    // Calls to C++ ABI will always return
-            !instruction_info.is_indirect &&                     // We don't know enough when calling indirectly to know if we'll return or not
-            !is_faux_function(instruction_info.callee_name))     // Ignore branch patch-points and imposter functions. Their behavior is unreliable.
-        {
-            // We're making a one-way call. This branch shouldn't even bother linking as it will never return here.
-            ASMBlock c;
-            c.brk(0x99);
-            c.insert(irb, f.getContext());
-            return where;
-        }
-
-        // Patch the return path. No GHC call shall ever return to another. If we reach the function endpoint, immediately abort to GW
-        auto thread_base_reg = get_base_register_for_call(f.getName().str());
-        auto arg_index = static_cast<int>(thread_base_reg) - static_cast<int>(x19);
-        ASMBlock c;
-
-        auto thread_arg = ensure(f.getArg(arg_index)); // Guaranteed to hold our original 'thread'
-        c.mov(x30, UASM::Var(thread_arg));
-        c.ldr(x30, x30, UASM::Imm(m_config.hypervisor_context_offset));
-        c.insert(irb, f.getContext());
-
-        // Next
-        return where;
-    }
-
-    bool GHC_frame_preservation_pass::is_ret_instruction(const llvm::Instruction* i)
-    {
-        if (llvm::isa<llvm::ReturnInst>(i))
-        {
-            return true;
-        }
-
-        // Check for inline asm invoking "ret". This really shouldn't be a thing, but it is present in SPULLVMRecompiler for some reason.
-        if (auto ci = llvm::dyn_cast<llvm::CallInst>(i))
-        {
-            if (auto asm_ = llvm::dyn_cast<llvm::InlineAsm>(ci->getCalledOperand()))
-            {
-                if (asm_->getAsmString() == "ret")
-                {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    bool GHC_frame_preservation_pass::is_inlined_call(const llvm::CallInst* ci)
-    {
-        const auto callee = ci->getCalledFunction();
-        if (!callee)
-        {
-            // Indirect BLR
-            return false;
-        }
-
-        const std::string callee_name = callee->getName().str();
-        if (callee_name.starts_with("llvm."))
-        {
-            // Intrinsic
-            return true;
-        }
-
-        if (callee->hasFnAttribute(llvm::Attribute::AlwaysInline))
-        {
-            // Assume LLVM always obeys this
-            return true;
-        }
-
-        return false;
-    }
-
-    bool GHC_frame_preservation_pass::is_faux_function(const std::string& function_name)
-    {
-        // Is it a branch patch-point?
-        if (function_name.find("-pp-") != umax)
-        {
-            return true;
-        }
-
-        // Now we search the known imposters list
-        if (m_config.faux_function_list.empty())
-        {
-            return false;
-        }
-
-        const auto& x = m_config.faux_function_list;
-        return std::find(x.begin(), x.end(), function_name) != x.end();
-    }
-
-    void GHC_frame_preservation_pass::process_leaf_function(llvm::IRBuilder<>* irb, llvm::Function& f)
-    {
-        for (auto &bb : f)
-        {
-            for (auto bit = bb.begin(); bit != bb.end();)
-            {
-                auto i = llvm::dyn_cast<llvm::Instruction>(bit);
-                if (!is_ret_instruction(i))
-                {
-                    ++bit;
-                    continue;
-                }
-
-                // Insert sequence before the return
-                irb->SetInsertPoint(llvm::dyn_cast<llvm::Instruction>(bit));
-
-                if (m_config.debug_info)
-                {
-                    // We need to save the chain return point.
-                    ASMBlock c;
-                    c.mov(x29, x28);
-                    c.mov(x28, x27);
-                    c.adr(x27, UASM::Reg(pc));
-                    c.insert(irb, f.getContext());
-                }
-
-                // Now we need to reload LR. We abuse the function's caller arg set for this to avoid messing with regs too much
-                auto thread_base_reg = get_base_register_for_call(f.getName().str());
-                auto arg_index = static_cast<int>(thread_base_reg) - static_cast<int>(x19);
-                ASMBlock c;
-
-                auto thread_arg = ensure(f.getArg(arg_index)); // Guaranteed to hold our original 'thread'
-                c.mov(x30, UASM::Var(thread_arg));
-                c.ldr(x30, x30, UASM::Imm(m_config.hypervisor_context_offset));
-                c.insert(irb, f.getContext());
-
-                if (bit != bb.end())
-                {
-                    ++bit;
-                }
-            }
-        }
-    }
-}
diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.h b/rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.h
deleted file mode 100644
index 701fe85be9..0000000000
--- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#pragma once
-
-#ifndef ARCH_ARM64
-#error "You have included an arm-only header"
-#endif
-
-#include "AArch64Common.h"
-
-#include <unordered_set>
-
-namespace aarch64
-{
-    class UASM;
-    using ASMBlock = UASM;
-
-    // On non-x86 architectures GHC runs stackless. SP is treated as a pointer to scratchpad memory.
-    // This pass keeps this behavior intact while preserving the expectations of the host's C++ ABI.
-    class GHC_frame_preservation_pass : public translator_pass
-    {
-    public:
-        struct function_info_t
-        {
-            u32 instruction_count;
-            u32 num_external_calls;
-            u32 stack_frame_size;     // Guessing this properly is critical for vector-heavy functions where spilling is a lot more common
-            bool clobbers_x30;
-            bool is_leaf;
-        };
-
-        struct instruction_info_t
-        {
-            bool is_call_inst;        // Is a function call. This includes a branch to external code.
-            bool preserve_stack;      // Preserve the stack around this call.
-            bool is_returning;        // This instruction "returns" to the next instruction (typically just llvm::CallInst*)
-            bool callee_is_GHC;       // The other function is GHC
-            bool is_tail_call;        // Tail call. Assume it is an exit/terminator.
-            bool is_indirect;         // Indirect call. Target is the first operand.
-            llvm::Function* callee;   // Callee if any
-            std::string callee_name;  // Name of the callee.
-        };
-
-        struct config_t
-        {
-            bool debug_info = false;           // Record debug information
-            bool use_stack_frames = true;      // Allocate a stack frame for each function. The gateway can alternatively manage a global stack to use as scratch.
-            bool optimize = true;              // Optimize instructions when possible. Set to false when debugging.
-            u32 hypervisor_context_offset = 0; // Offset within the "thread" object where we can find the hypervisor context (registers configured at gateway).
-            std::function<bool(const std::string&)> exclusion_callback;    // [Optional] Callback run on each function before transform. Return "true" to exclude from frame processing.
-            std::vector<std::pair<std::string, gpr>> base_register_lookup; // [Optional] Function lookup table to determine the location of the "thread" context.
-            std::vector<std::string> faux_function_list;                   // [Optional] List of faux block names to treat as untrusted - typically fake functions representing codecaves.
-        };
-
-    protected:
-        std::unordered_set<std::string> m_visited_functions;
-
-        config_t m_config;
-
-        void force_tail_call_terminators(llvm::Function& f);
-
-        function_info_t preprocess_function(const llvm::Function& f);
-
-        instruction_info_t decode_instruction(const llvm::Function& f, const llvm::Instruction* i);
-
-        bool is_ret_instruction(const llvm::Instruction* i);
-
-        bool is_inlined_call(const llvm::CallInst* ci);
-
-        bool is_faux_function(const std::string& function_name);
-
-        gpr get_base_register_for_call(const std::string& callee_name, gpr default_reg = gpr::x19);
-
-        void process_leaf_function(llvm::IRBuilder<>* irb, llvm::Function& f);
-
-        llvm::BasicBlock::iterator patch_tail_call(
-            llvm::IRBuilder<>* irb,
-            llvm::Function& f,
-            llvm::BasicBlock::iterator where,
-            const instruction_info_t& instruction_info,
-            const function_info_t& function_info,
-            const ASMBlock& frame_epilogue);
-    public:
-
-        GHC_frame_preservation_pass(const config_t& configuration);
-        ~GHC_frame_preservation_pass() = default;
-
-        void run(llvm::IRBuilder<>* irb, llvm::Function& f) override;
-        void reset() override;
-    };
-}
diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.cpp b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.cpp
deleted file mode 100644
index 48b651d1a3..0000000000
--- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-#include <stdafx.h>
-#include "AArch64Signal.h"
-
-namespace aarch64
-{
-    // Some of the EC codes we care about
-    enum class EL1_exception_class
-    {
-        undefined = 0,
-
-        instr_abort_0 = 32,     // PAGE_FAULT - Execute, change in EL
-        instr_abort_1 = 33,     // PAGE_FAULT - Execute, same EL
-        data_abort_0 = 36,      // PAGE_FAULT - Generic, causing change in EL (e.g kernel sig handler back to EL0)
-        data_abort_1 = 37,      // PAGE_FAULT - Generic, no change in EL, e.g EL1 driver fault
-
-        illegal_execution = 14, // BUS_ERROR
-        unaligned_pc = 34,      // BUS_ERROR
-        unaligned_sp = 38,      // BUS_ERROR
-
-        breakpoint = 60,        // BRK
-    };
-
-#ifdef __linux__
-    constexpr u32 ESR_CTX_MAGIC = 0x45535201;
-
-    const aarch64_esr_ctx* find_EL1_esr_context(const ucontext_t* ctx)
-    {
-        u32 offset = 0;
-        const auto& mctx = ctx->uc_mcontext;
-
-        while ((offset + 4) < sizeof(mctx.__reserved))
-        {
-            const auto head = reinterpret_cast<const aarch64_cpu_ctx_block*>(&mctx.__reserved[offset]);
-            if (!head->magic)
-            {
-                // End of linked list
-                return nullptr;
-            }
-
-            if (head->magic == ESR_CTX_MAGIC)
-            {
-                return reinterpret_cast<const aarch64_esr_ctx*>(head);
-            }
-
-            offset += head->size;
-        }
-
-        return nullptr;
-    }
-
-    u64 _read_ESR_EL1(const ucontext_t* uctx)
-    {
-        auto esr_ctx = find_EL1_esr_context(uctx);
-        return esr_ctx ? esr_ctx->esr : 0;
-    }
-#elif defined(__APPLE__)
-    u64 _read_ESR_EL1(const ucontext_t* uctx)
-    {
-        // Easy to read from mcontext
-        const auto darwin_ctx = reinterpret_cast<aarch64_darwin_mcontext64*>(uctx->uc_mcontext);
-        return darwin_ctx->es.ESR;
-    }
-#else
-    u64 _read_ESR_EL1(const ucontext_t*)
-    {
-        // Unimplemented
-        return 0;
-    }
-#endif
-
-    fault_reason decode_fault_reason(const ucontext_t* uctx)
-    {
-        auto esr = _read_ESR_EL1(uctx);
-        if (!esr)
-        {
-            return fault_reason::undefined;
-        }
-
-        // We don't really care about most of the register fields, but we can check for a few things.
-        const auto exception_class = (esr >> 26) & 0b111111;
-        switch (static_cast<EL1_exception_class>(exception_class))
-        {
-        case EL1_exception_class::breakpoint:
-            // Debug break
-            return fault_reason::breakpoint;
-        case EL1_exception_class::illegal_execution:
-        case EL1_exception_class::unaligned_pc:
-        case EL1_exception_class::unaligned_sp:
-            return fault_reason::illegal_instruction;
-        case EL1_exception_class::instr_abort_0:
-        case EL1_exception_class::instr_abort_1:
-            return fault_reason::instruction_execute;
-        case EL1_exception_class::data_abort_0:
-        case EL1_exception_class::data_abort_1:
-            // Page fault
-            break;
-        default:
-            return fault_reason::undefined;
-        }
-
-        // Check direction bit
-        const auto direction = (esr >> 6u) & 1u;
-        return direction ? fault_reason::data_write : fault_reason::data_read;
-    }
-}
diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.h b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.h
deleted file mode 100644
index ed743ff9ba..0000000000
--- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-
-#ifndef _WIN32
-#include <sys/ucontext.h>
-#else
-using ucontext_t = void;
-#endif
-
-namespace aarch64
-{
-    // Some renamed kernel definitions, we don't need to include kernel headers directly
-#pragma pack(push, 1)
-
-#if defined(__linux__)
-    struct aarch64_cpu_ctx_block
-    {
-        u32 magic;
-        u32 size;
-    };
-
-    struct aarch64_esr_ctx
-    {
-        aarch64_cpu_ctx_block head;
-        u64 esr;      // Exception syndrome register
-    };
-#elif defined(__APPLE__)
-    struct aarch64_exception_state
-    {
-        u64 FAR;      // Fault address reg
-        u32 ESR;      // Exception syndrome reg (ESR_EL1)
-        u32 exception_id;
-    };
-
-    struct aarch64_darwin_mcontext64
-    {
-        aarch64_exception_state es;
-        // Other states we don't care about follow this field
-    };
-#endif
-
-#pragma pack(pop)
-
-    // Fault reason
-    enum class fault_reason
-    {
-        undefined = 0,
-        data_read,
-        data_write,
-        instruction_execute,
-        illegal_instruction,
-        breakpoint
-    };
-
-    fault_reason decode_fault_reason(const ucontext_t* uctx);
-}
diff --git a/rpcs3/Emu/CPU/CPUDisAsm.h b/rpcs3/Emu/CPU/CPUDisAsm.h
index 9e9054d62b..c7f8a5b7e9 100644
--- a/rpcs3/Emu/CPU/CPUDisAsm.h
+++ b/rpcs3/Emu/CPU/CPUDisAsm.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <string>
-#include "Emu/CPU/CPUThread.h"
 #include "Utilities/StrFmt.h"
 
 enum class cpu_disasm_mode
@@ -11,7 +10,6 @@ enum class cpu_disasm_mode
 	normal,
 	compiler_elf,
 	list, // RSX exclusive
-	survey_cmd_size, // RSX exclusive
 };
 
 class cpu_thread;
@@ -19,14 +17,12 @@ class cpu_thread;
 class CPUDisAsm
 {
 protected:
-	cpu_disasm_mode m_mode{};
-	const u8* m_offset{};
-	const u32 m_start_pc;
-	std::add_pointer_t<const cpu_thread> m_cpu{};
-	shared_ptr<cpu_thread> m_cpu_handle;
+	const cpu_disasm_mode m_mode{};
+	const std::add_pointer_t<const u8> m_offset{};
+	const std::add_pointer_t<const cpu_thread> m_cpu{};
 	u32 m_op = 0;
 
-	void format_by_mode()
+	void Write(const std::string& value)
 	{
 		switch (m_mode)
 		{
@@ -36,27 +32,28 @@ protected:
 					static_cast<u8>(m_op >> 24),
 					static_cast<u8>(m_op >> 16),
 					static_cast<u8>(m_op >> 8),
-					static_cast<u8>(m_op >> 0), last_opcode);
+					static_cast<u8>(m_op >> 0), value);
 				break;
 			}
 
 			case cpu_disasm_mode::interpreter:
 			{
-				last_opcode.insert(0, fmt::format("[%08x]  %02x %02x %02x %02x: ", dump_pc,
+				last_opcode = fmt::format("[%08x]  %02x %02x %02x %02x: %s", dump_pc,
 					static_cast<u8>(m_op >> 24),
 					static_cast<u8>(m_op >> 16),
 					static_cast<u8>(m_op >> 8),
-					static_cast<u8>(m_op >> 0)));
+					static_cast<u8>(m_op >> 0), value);
 				break;
 			}
 
 			case cpu_disasm_mode::compiler_elf:
 			{
-				last_opcode += '\n';
+				last_opcode = value + '\n';
 				break;
 			}
 			case cpu_disasm_mode::normal:
 			{
+				last_opcode = value;
 				break;
 			}
 			default: fmt::throw_exception("Unreachable");
@@ -67,51 +64,30 @@ public:
 	std::string last_opcode{};
 	u32 dump_pc{};
 
-	cpu_disasm_mode change_mode(cpu_disasm_mode mode)
+	template <typename T, std::enable_if_t<std::is_base_of_v<CPUDisAsm, T>, int> = 0>
+	static T copy_and_change_mode(const T& dis, cpu_disasm_mode mode)
 	{
-		return std::exchange(m_mode, mode);
-	}
-
-	const u8* change_ptr(const u8* ptr)
-	{
-		return std::exchange(m_offset, ptr);
-	}
-
-	cpu_thread* get_cpu() const
-	{
-		return const_cast<cpu_thread*>(m_cpu);
-	}
-
-	void set_cpu_handle(shared_ptr<cpu_thread> cpu)
-	{
-		m_cpu_handle = std::move(cpu);
-
-		if (!m_cpu)
-		{
-			m_cpu = m_cpu_handle.get();
-		}
-		else
-		{
-			AUDIT(m_cpu == m_cpu_handle.get());
-		}
+		return T{mode, dis.m_offset, dis.m_cpu};
 	}
 
 protected:
-	CPUDisAsm(cpu_disasm_mode mode, const u8* offset, u32 start_pc = 0, const cpu_thread* cpu = nullptr)
+	CPUDisAsm(cpu_disasm_mode mode, const u8* offset, const cpu_thread* cpu = nullptr)
 		: m_mode(mode)
-		, m_offset(offset - start_pc)
-		, m_start_pc(start_pc)
+		, m_offset(offset)
 		, m_cpu(cpu)
 	{
 	}
 
+	CPUDisAsm(const CPUDisAsm&) = delete;
+
 	CPUDisAsm& operator=(const CPUDisAsm&) = delete;
 
+	virtual ~CPUDisAsm() = default;
+
 	virtual u32 DisAsmBranchTarget(s32 /*imm*/);
 
 	// TODO: Add builtin fmt helpper for best performance
-	template <typename T>
-		requires std::is_integral_v<T>
+	template <typename T, std::enable_if_t<std::is_integral_v<T>, int> = 0>
 	static std::string SignedHex(T value)
 	{
 		const auto v = static_cast<std::make_signed_t<T>>(value);
@@ -133,17 +109,16 @@ protected:
 		return fmt::format("%s%s", v < 0 ? "-" : "", av);
 	}
 
-	// Signify the formatting function the minimum required amount of characters to print for an instruction
-	// Padding with spaces
-	int PadOp(std::string_view op = {}, int min_spaces = 0) const
+	std::string FixOp(std::string op) const
 	{
-		return m_mode == cpu_disasm_mode::normal ? (static_cast<int>(op.size()) + min_spaces) : 10;
+		if (m_mode != cpu_disasm_mode::normal)
+		{
+			op.resize(std::max<usz>(op.length(), 10), ' ');
+		}
+
+		return op;
 	}
 
 public:
-	virtual ~CPUDisAsm() = default;
-
 	virtual u32 disasm(u32 pc) = 0;
-	virtual std::pair<const void*, usz> get_memory_span() const = 0;
-	virtual std::unique_ptr<CPUDisAsm> copy_type_erased() const = 0;
 };
diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp
index 242dcb9d9f..68f6eefb04 100644
--- a/rpcs3/Emu/CPU/CPUThread.cpp
+++ b/rpcs3/Emu/CPU/CPUThread.cpp
@@ -5,10 +5,8 @@
 #include "Emu/System.h"
 #include "Emu/system_config.h"
 #include "Emu/Memory/vm_locking.h"
-#include "Emu/Memory/vm_reservation.h"
 #include "Emu/IdManager.h"
 #include "Emu/GDB.h"
-#include "Emu/Cell/lv2/sys_spu.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/SPUThread.h"
 #include "Emu/RSX/RSXThread.h"
@@ -18,11 +16,8 @@
 #include <thread>
 #include <unordered_map>
 #include <map>
-#include <shared_mutex>
 
-#if defined(ARCH_X64)
 #include <emmintrin.h>
-#endif
 
 DECLARE(cpu_thread::g_threads_created){0};
 DECLARE(cpu_thread::g_threads_deleted){0};
@@ -37,7 +32,6 @@ static thread_local u32 s_tls_thread_slot = -1;
 static thread_local u64 s_tls_sctr = -1;
 
 extern thread_local void(*g_tls_log_control)(const char* fmt, u64 progress);
-extern thread_local std::string(*g_tls_log_prefix)();
 
 template <>
 void fmt_class_string<cpu_flag>::format(std::string& out, u64 arg)
@@ -53,14 +47,8 @@ void fmt_class_string<cpu_flag>::format(std::string& out, u64 arg)
 		case cpu_flag::pause: return "p";
 		case cpu_flag::suspend: return "s";
 		case cpu_flag::ret: return "ret";
-		case cpu_flag::again: return "a";
 		case cpu_flag::signal: return "sig";
 		case cpu_flag::memory: return "mem";
-		case cpu_flag::pending: return "pend";
-		case cpu_flag::pending_recheck: return "pend-re";
-		case cpu_flag::notify: return "ntf";
-		case cpu_flag::yield: return "y";
-		case cpu_flag::preempt: return "PREEMPT";
 		case cpu_flag::dbg_global_pause: return "G-PAUSE";
 		case cpu_flag::dbg_pause: return "PAUSE";
 		case cpu_flag::dbg_step: return "STEP";
@@ -77,87 +65,6 @@ void fmt_class_string<bs_t<cpu_flag>>::format(std::string& out, u64 arg)
 	format_bitset(out, arg, "[", "|", "]", &fmt_class_string<cpu_flag>::format);
 }
 
-enum cpu_threads_emulation_info_dump_t : u32 {};
-
-template<>
-void fmt_class_string<cpu_threads_emulation_info_dump_t>::format(std::string& out, u64 arg)
-{
-	// Do not dump all threads, only select few
-	// Aided by thread ID for filtering
-	const u32 must_have_cpu_id = static_cast<u32>(arg);
-
-	// Dump main_thread
-	const auto main_ppu = idm::get_unlocked<named_thread<ppu_thread>>(ppu_thread::id_base);
-
-	if (main_ppu)
-	{
-		fmt::append(out, "\n%s's thread context:\n", main_ppu->get_name());
-		main_ppu->dump_all(out);
-	}
-
-	if (must_have_cpu_id >> 24 == ppu_thread::id_base >> 24)
-	{
-		if (must_have_cpu_id != ppu_thread::id_base)
-		{
-			const auto selected_ppu = idm::get_unlocked<named_thread<ppu_thread>>(must_have_cpu_id);
-
-			if (selected_ppu)
-			{
-				fmt::append(out, "\n%s's thread context:\n", selected_ppu->get_name());
-				selected_ppu->dump_all(out);
-			}
-		}
-	}
-	else if (must_have_cpu_id >> 24 == spu_thread::id_base >> 24)
-	{
-		const auto selected_spu = idm::get_unlocked<named_thread<spu_thread>>(must_have_cpu_id);
-
-		if (selected_spu)
-		{
-			if (selected_spu->get_type() == spu_type::threaded && selected_spu->group->max_num > 1u)
-			{
-				// Dump the information of the entire group
-				// Do not block because it is a potentially sensitive context
-				std::shared_lock rlock(selected_spu->group->mutex, std::defer_lock);
-
-				for (u32 i = 0; !rlock.try_lock() && i < 100; i++)
-				{
-					busy_wait();
-				}
-
-				if (rlock)
-				{
-					for (const auto& spu : selected_spu->group->threads)
-					{
-						if (spu && spu != selected_spu)
-						{
-							fmt::append(out, "\n%s's thread context:\n", spu->get_name());
-							spu->dump_all(out);
-						}
-					}
-				}
-				else
-				{
-					fmt::append(out, "\nFailed to dump SPU thread group's thread's information!");
-				}
-
-				// Print the specified SPU thread last
-			}
-
-			fmt::append(out, "\n%s's thread context:\n", selected_spu->get_name());
-			selected_spu->dump_all(out);
-		}
-	}
-	else if (must_have_cpu_id >> 24 == rsx::thread::id_base >> 24)
-	{
-		if (auto rsx = rsx::get_current_renderer())
-		{
-			fmt::append(out, "\n%s's thread context:\n", rsx->get_name());
-			rsx->dump_all(out);
-		}
-	}
-}
-
 // CPU profiler thread
 struct cpu_prof
 {
@@ -166,35 +73,41 @@ struct cpu_prof
 
 	struct sample_info
 	{
+		// Pointer to the thread
+		std::shared_ptr<cpu_thread> ptr;
+
 		// Block occurences: name -> sample_count
 		std::unordered_map<u64, u64, value_hash<u64>> freq;
 
 		// Total number of samples
 		u64 samples = 0, idle = 0;
 
-		// Total number of sample collected in reservation operation
-		u64 reservation_samples = 0;
-
-		// Avoid printing replicas or when not much changed
-		u64 new_samples = 0;
-
-		static constexpr u64 min_print_samples = 500;
-		static constexpr u64 min_print_all_samples = min_print_samples * 20;
+		sample_info(const std::shared_ptr<cpu_thread>& ptr)
+			: ptr(ptr)
+		{
+		}
 
 		void reset()
 		{
 			freq.clear();
 			samples = 0;
 			idle = 0;
-			new_samples = 0;
-			reservation_samples = 0;
 		}
 
-		static std::string format(const std::multimap<u64, u64, std::greater<u64>>& chart, u64 samples, u64 idle, bool extended_print = false)
+		// Print info
+		void print(u32 id) const
 		{
+			// Make reversed map: sample_count -> name
+			std::multimap<u64, u64, std::greater<u64>> chart;
+
+			for (auto& [name, count] : freq)
+			{
+				chart.emplace(count, name);
+			}
+
 			// Print results
 			std::string results;
-			results.reserve(extended_print ? 10100 : 5100);
+			results.reserve(5100);
 
 			// Fraction of non-idle samples
 			const f64 busy = 1. * (samples - idle) / samples;
@@ -210,116 +123,20 @@ struct cpu_prof
 				// Print chunk address from lowest 16 bits
 				fmt::append(results, "...chunk-0x%05x]: %.4f%% (%u)", (name & 0xffff) * 4, _frac * 100., count);
 
-				if (results.size() >= (extended_print ? 10000 : 5000))
+				if (results.size() >= 5000)
 				{
 					// Stop printing after reaching some arbitrary limit in characters
 					break;
 				}
 			}
 
-			return results;
-		}
-
-		static f64 get_percent(u64 dividend, u64 divisor)
-		{
-			if (!dividend)
-			{
-				return 0;
-			}
-
-			if (dividend >= divisor)
-			{
-				return 100;
-			}
-
-			return 100. * dividend / divisor;
-		}
-
-		// Print info
-		void print(const shared_ptr<cpu_thread>& ptr)
-		{
-			if (new_samples < min_print_samples || samples == idle)
-			{
-				if (cpu_flag::exit - ptr->state)
-				{
-					profiler.notice("Thread \"%s\" [0x%08x]: %u samples (%.4f%% idle), %u new, %u reservation (%.4f%%): Not enough new samples have been collected since the last print.", ptr->get_name(), ptr->id, samples, get_percent(idle, samples), new_samples, reservation_samples, get_percent(reservation_samples, samples - idle));
-				}
-
-				return;
-			}
-
-			// Make reversed map: sample_count -> name
-			std::multimap<u64, u64, std::greater<u64>> chart;
-
-			for (auto& [name, count] : freq)
-			{
-				chart.emplace(count, name);
-			}
-
-			// Print results
-			const std::string results = format(chart, samples, idle);
-			profiler.notice("Thread \"%s\" [0x%08x]: %u samples (%.4f%% idle), %u new, %u reservation (%.4f%%):\n%s", ptr->get_name(), ptr->id, samples, get_percent(idle, samples), new_samples, reservation_samples, get_percent(reservation_samples, samples - idle), results);
-
-			new_samples = 0;
-		}
-
-		static void print_all(std::unordered_map<shared_ptr<cpu_thread>, sample_info>& threads, sample_info& all_info)
-		{
-			u64 new_samples = 0;
-
-			// Print all results and cleanup
-			for (auto& [ptr, info] : threads)
-			{
-				new_samples += info.new_samples;
-				info.print(ptr);
-			}
-
-			std::multimap<u64, u64, std::greater<u64>> chart;
-
-			for (auto& [_, info] : threads)
-			{
-				// This function collects thread information regardless of 'new_samples' member state
-				for (auto& [name, count] : info.freq)
-				{
-					all_info.freq[name] += count;
-				}
-
-				all_info.samples += info.samples;
-				all_info.idle += info.idle;
-				all_info.reservation_samples += info.reservation_samples;
-			}
-
-			const u64 samples = all_info.samples;
-			const u64 idle = all_info.idle;
-			const u64 reservation = all_info.reservation_samples;
-			const auto& freq = all_info.freq;
-
-			if (samples == idle)
-			{
-				return;
-			}
-
-			if (new_samples < min_print_all_samples && thread_ctrl::state() != thread_state::aborting)
-			{
-				profiler.notice("All Threads: %u samples (%.4f%% idle), %u new, %u reservation (%.4f%%): Not enough new samples have been collected since the last print.", samples, get_percent(idle, samples), new_samples, reservation, get_percent(reservation, samples - idle));
-				return;
-			}
-
-			for (auto& [name, count] : freq)
-			{
-				chart.emplace(count, name);
-			}
-
-			const std::string results = format(chart, samples, idle, true);
-			profiler.notice("All Threads: %u samples (%.4f%% idle), %u new, %u reservation (%.4f%%):%s", samples, get_percent(idle, samples), new_samples, reservation, get_percent(reservation, samples - idle), results);
+			profiler.notice("Thread [0x%08x]: %u samples (%.4f%% idle):%s", id, samples, 100. * idle / samples, results);
 		}
 	};
 
-	sample_info all_threads_info{};
-
 	void operator()()
 	{
-		std::unordered_map<shared_ptr<cpu_thread>, sample_info> threads;
+		std::unordered_map<u32, sample_info, value_hash<u64>> threads;
 
 		while (thread_ctrl::state() != thread_state::aborting)
 		{
@@ -335,15 +152,15 @@ struct cpu_prof
 					continue;
 				}
 
-				shared_ptr<cpu_thread> ptr;
+				std::shared_ptr<cpu_thread> ptr;
 
 				if (id >> 24 == 1)
 				{
-					ptr = idm::get_unlocked<named_thread<ppu_thread>>(id);
+					ptr = idm::get<named_thread<ppu_thread>>(id);
 				}
 				else if (id >> 24 == 2)
 				{
-					ptr = idm::get_unlocked<named_thread<spu_thread>>(id);
+					ptr = idm::get<named_thread<spu_thread>>(id);
 				}
 				else
 				{
@@ -353,13 +170,14 @@ struct cpu_prof
 
 				if (ptr && cpu_flag::exit - ptr->state)
 				{
-					auto [found, add] = threads.try_emplace(std::move(ptr));
+					auto [found, add] = threads.try_emplace(id, ptr);
 
 					if (!add)
 					{
-						// Overwritten (impossible?): print previous data
-						found->second.print(found->first);
+						// Overwritten: print previous data
+						found->second.print(id);
 						found->second.reset();
+						found->second.ptr = std::move(ptr);
 					}
 				}
 			}
@@ -367,33 +185,24 @@ struct cpu_prof
 			if (threads.empty())
 			{
 				// Wait for messages if no work (don't waste CPU)
-				thread_ctrl::wait_on(registered);
+				thread_ctrl::wait_on(registered, nullptr);
 				continue;
 			}
 
 			// Sample active threads
-			for (auto& [ptr, info] : threads)
+			for (auto& [id, info] : threads)
 			{
-				if (auto state = +ptr->state; cpu_flag::exit - state)
+				if (cpu_flag::exit - info.ptr->state)
 				{
 					// Get short function hash
-					const u64 name = atomic_storage<u64>::load(ptr->block_hash);
+					const u64 name = atomic_storage<u64>::load(info.ptr->block_hash);
 
 					// Append occurrence
 					info.samples++;
 
-					if (cpu_flag::wait - state)
+					if (!(info.ptr->state & (cpu_flag::wait + cpu_flag::stop + cpu_flag::dbg_global_pause)))
 					{
 						info.freq[name]++;
-						info.new_samples++;
-
-						if (auto spu = ptr->try_get<spu_thread>())
-						{
-							if (spu->raddr)
-							{
-								info.reservation_samples++;
-							}
-						}
 
 						// Append verification time to fixed common name 0000000...chunk-0x3fffc
 						if (name >> 16 && (name & 0xffff) == 0)
@@ -401,84 +210,48 @@ struct cpu_prof
 					}
 					else
 					{
-						if (state & (cpu_flag::dbg_pause + cpu_flag::dbg_global_pause))
-						{
-							// Idle state caused by emulation pause is not accounted for
-							continue;
-						}
-
 						info.idle++;
 					}
 				}
+			}
+
+			// Cleanup and print results for deleted threads
+			for (auto it = threads.begin(), end = threads.end(); it != end;)
+			{
+				if (cpu_flag::exit & it->second.ptr->state)
+					it->second.print(it->first), it = threads.erase(it);
 				else
-				{
-					info.print(ptr);
-				}
+					it++;
 			}
 
 			if (flush)
 			{
 				profiler.success("Flushing profiling results...");
 
-				all_threads_info = {};
-				sample_info::print_all(threads, all_threads_info);
+				// Print all results and cleanup
+				for (auto& [id, info] : threads)
+				{
+					info.print(id);
+					info.reset();
+				}
 			}
 
-			if (Emu.IsPaused())
-			{
-				thread_ctrl::wait_for(5000);
-				continue;
-			}
-
-			if (!g_cfg.core.spu_debug)
-			{
-				// Reduce accuracy in favor of performance when enabled alone
-				thread_ctrl::wait_for(60, false);
-				continue;
-			}
-
-			// Wait, roughly for 20us
+			// Wait, roughly for 20µs
 			thread_ctrl::wait_for(20, false);
 		}
 
 		// Print all remaining results
-		sample_info::print_all(threads, all_threads_info);
+		for (auto& [id, info] : threads)
+		{
+			info.print(id);
+		}
 	}
 
 	static constexpr auto thread_name = "CPU Profiler"sv;
 };
 
-
 using cpu_profiler = named_thread<cpu_prof>;
 
-extern f64 get_cpu_program_usage_percent(u64 hash)
-{
-	if (auto prof = g_fxo->try_get<cpu_profiler>(); prof && *prof == thread_state::finished)
-	{
-		if (Emu.IsStopped())
-		{
-			u64 total = 0;
-
-			for (auto [name, count] : prof->all_threads_info.freq)
-			{
-				if ((name & -65536) == hash)
-				{
-					total += count;
-				}
-			}
-
-			if (!total)
-			{
-				return 0;
-			}
-
-			return std::max<f64>(0.0001, static_cast<f64>(total) * 100 / (prof->all_threads_info.samples - prof->all_threads_info.idle));
-		}
-	}
-
-	return 0;
-}
-
 thread_local DECLARE(cpu_thread::g_tls_this_thread) = nullptr;
 
 // Total number of CPU threads
@@ -503,10 +276,10 @@ namespace cpu_counter
 {
 	void add(cpu_thread* _this) noexcept
 	{
-		switch (_this->get_class())
+		switch (_this->id_type())
 		{
-		case thread_class::ppu:
-		case thread_class::spu:
+		case 1:
+		case 2:
 			break;
 		default: return;
 		}
@@ -630,13 +403,30 @@ namespace cpu_counter
 
 void cpu_thread::operator()()
 {
-	const auto old_prefix = g_tls_log_prefix;
-
 	g_tls_this_thread = this;
 
 	if (g_cfg.core.thread_scheduler != thread_scheduler_mode::os)
 	{
-		thread_ctrl::set_thread_affinity_mask(thread_ctrl::get_affinity_mask(get_class()));
+		thread_ctrl::set_thread_affinity_mask(thread_ctrl::get_affinity_mask(id_type() == 1 ? thread_class::ppu : thread_class::spu));
+	}
+	if (id_type() == 2)
+	{
+		if (g_cfg.core.lower_spu_priority)
+		{
+			thread_ctrl::set_native_priority(-1);
+		}
+
+		// force input/output denormals to zero for SPU threads (FTZ/DAZ)
+		_mm_setcsr( _mm_getcsr() | 0x8040 );
+
+		const volatile int a = 0x1fc00000;
+		__m128 b = _mm_castsi128_ps(_mm_set1_epi32(a));
+		int c = _mm_cvtsi128_si32(_mm_castps_si128(_mm_mul_ps(b,b)));
+
+		if (c != 0)
+		{
+			sys_log.fatal("Could not disable denormals.");
+		}
 	}
 
 	while (!g_fxo->is_init<cpu_profiler>())
@@ -650,14 +440,14 @@ void cpu_thread::operator()()
 		thread_ctrl::wait_for(1000);
 	}
 
-	switch (get_class())
+	switch (id_type())
 	{
-	case thread_class::ppu:
+	case 1:
 	{
 		//g_fxo->get<cpu_profiler>().registered.push(id);
 		break;
 	}
-	case thread_class::spu:
+	case 2:
 	{
 		if (g_cfg.core.spu_prof)
 		{
@@ -672,11 +462,33 @@ void cpu_thread::operator()()
 	// Register thread in g_cpu_array
 	s_cpu_counter++;
 
+	atomic_wait_engine::set_notify_callback([](const void*, u64 progress)
+	{
+		static thread_local bool wait_set = false;
+
+		cpu_thread* _cpu = get_current_cpu_thread();
+
+		// Wait flag isn't set asynchronously so this should be thread-safe
+		if (progress == 0 && cpu_flag::wait - _cpu->state)
+		{
+			// Operation just started and syscall is imminent
+			_cpu->state += cpu_flag::wait + cpu_flag::temp;
+			wait_set = true;
+			return;
+		}
+
+		if (progress == umax && std::exchange(wait_set, false))
+		{
+			// Operation finished: need to clean wait flag
+			ensure(!_cpu->check_state());
+			return;
+		}
+	});
+
 	static thread_local struct thread_cleanup_t
 	{
 		cpu_thread* _this = nullptr;
 		std::string name;
-		std::string(*log_prefix)() = nullptr;
 
 		void cleanup()
 		{
@@ -690,6 +502,8 @@ void cpu_thread::operator()()
 				ptr->compare_and_swap(_this, nullptr);
 			}
 
+			atomic_wait_engine::set_notify_callback(nullptr);
+
 			g_tls_log_control = [](const char*, u64){};
 
 			if (s_tls_thread_slot != umax)
@@ -701,8 +515,6 @@ void cpu_thread::operator()()
 
 			s_cpu_counter--;
 
-			g_tls_log_prefix = log_prefix;
-
 			g_tls_this_thread = nullptr;
 
 			g_threads_deleted++;
@@ -722,7 +534,6 @@ void cpu_thread::operator()()
 
 	cleanup._this = this;
 	cleanup.name = thread_ctrl::get_name();
-	cleanup.log_prefix = old_prefix;
 
 	// Check thread status
 	while (!(state & cpu_flag::exit) && thread_ctrl::state() != thread_state::aborting)
@@ -738,7 +549,6 @@ void cpu_thread::operator()()
 		if (!(state0 & cpu_flag::stop))
 		{
 			cpu_task();
-			state += cpu_flag::wait;
 
 			if (state & cpu_flag::ret && state.test_and_reset(cpu_flag::ret))
 			{
@@ -748,7 +558,7 @@ void cpu_thread::operator()()
 			continue;
 		}
 
-		state.wait(state0);
+		thread_ctrl::wait_on(state, state0);
 
 		if (state & cpu_flag::ret && state.test_and_reset(cpu_flag::ret))
 		{
@@ -791,32 +601,24 @@ cpu_thread::cpu_thread(u32 id)
 	}
 
 	g_threads_created++;
-
-	if (u32* pc2 = get_pc2())
-	{
-		*pc2 = umax;
-	}
 }
 
 void cpu_thread::cpu_wait(bs_t<cpu_flag> old)
 {
-	state.wait(old);
+	thread_ctrl::wait_on(state, old);
 }
 
-static atomic_t<u32> s_dummy_atomic = 0;
-
 bool cpu_thread::check_state() noexcept
 {
 	bool cpu_sleep_called = false;
-	bool cpu_memory_checked = false;
 	bool cpu_can_stop = true;
-	bool escape{}, retval{};
+	bool escape, retval;
 
 	while (true)
 	{
 		// Process all flags in a single atomic op
 		bs_t<cpu_flag> state1;
-		auto state0 = state.fetch_op([&](bs_t<cpu_flag>& flags)
+		const auto state0 = state.fetch_op([&](bs_t<cpu_flag>& flags)
 		{
 			bool store = false;
 
@@ -856,6 +658,7 @@ bool cpu_thread::check_state() noexcept
 			{
 				// Sticky flag, indicates check_state() is not allowed to return true
 				flags -= cpu_flag::temp;
+				flags -= cpu_flag::wait;
 				cpu_can_stop = false;
 				store = true;
 			}
@@ -867,12 +670,6 @@ bool cpu_thread::check_state() noexcept
 				store = true;
 			}
 
-			if (flags & cpu_flag::notify)
-			{
-				flags -= cpu_flag::notify;
-				store = true;
-			}
-
 			// Can't process dbg_step if we only paused temporarily
 			if (cpu_can_stop && flags & cpu_flag::dbg_step)
 			{
@@ -894,10 +691,10 @@ bool cpu_thread::check_state() noexcept
 			}
 
 			// Atomically clean wait flag and escape
-			if (!is_stopped(flags) && flags.none_of(cpu_flag::ret))
+			if (!(flags & (cpu_flag::exit + cpu_flag::ret + cpu_flag::stop)))
 			{
 				// Check pause flags which hold thread inside check_state (ignore suspend/debug flags on cpu_flag::temp)
-				if (flags & cpu_flag::pause || (!cpu_memory_checked && flags & cpu_flag::memory) || (cpu_can_stop && flags & (cpu_flag::dbg_global_pause + cpu_flag::dbg_pause + cpu_flag::suspend + cpu_flag::yield + cpu_flag::preempt)))
+				if (flags & (cpu_flag::pause + cpu_flag::memory) || (cpu_can_stop && flags & (cpu_flag::dbg_global_pause + cpu_flag::dbg_pause + cpu_flag::suspend)))
 				{
 					if (!(flags & cpu_flag::wait))
 					{
@@ -905,43 +702,24 @@ bool cpu_thread::check_state() noexcept
 						store = true;
 					}
 
-					if (flags & (cpu_flag::yield + cpu_flag::preempt) && cpu_can_stop)
-					{
-						flags -= (cpu_flag::yield + cpu_flag::preempt);
-						store = true;
-					}
-
 					escape = false;
 					state1 = flags;
 					return store;
 				}
 
-				if (flags & (cpu_flag::wait + cpu_flag::memory))
+				if (flags & cpu_flag::wait)
 				{
-					flags -= (cpu_flag::wait + cpu_flag::memory);
+					flags -= cpu_flag::wait;
 					store = true;
 				}
 
-				if (s_tls_thread_slot == umax)
-				{
-					if (cpu_flag::wait - this->state.load())
-					{
-						// Force wait flag (must be set during ownership of s_cpu_lock), this makes the atomic op fail as a side effect
-						this->state += cpu_flag::wait;
-						store = true;
-					}
-
-					// Restore thread in the suspend list
-					cpu_counter::add(this);
-				}
-
 				retval = false;
 			}
 			else
 			{
-				if (flags & cpu_flag::wait)
+				if (cpu_can_stop && !(flags & cpu_flag::wait))
 				{
-					flags -= cpu_flag::wait;
+					flags += cpu_flag::wait;
 					store = true;
 				}
 
@@ -953,57 +731,12 @@ bool cpu_thread::check_state() noexcept
 			return store;
 		}).first;
 
-		if (state0 & cpu_flag::preempt && cpu_can_stop)
-		{
-			if (cpu_flag::wait - state0)
-			{
-				if (!escape || !retval)
-				{
-					// Yield itself
-					state0 += cpu_flag::yield;
-					escape = false;
-				}
-			}
-
-			if (const u128 bits = s_cpu_bits)
-			{
-				reader_lock lock(s_cpu_lock);
-
-				cpu_counter::for_all_cpu(bits & s_cpu_bits, [](cpu_thread* cpu)
-				{
-					if (cpu->state.none_of(cpu_flag::wait + cpu_flag::yield))
-					{
-						cpu->state += cpu_flag::yield;
-					}
-
-					return true;
-				});
-			}
-		}
-
 		if (escape)
 		{
-			if (vm::g_range_lock_bits[1] && vm::g_tls_locked && *vm::g_tls_locked == this)
+			if (s_tls_thread_slot == umax && !retval)
 			{
-				state += cpu_flag::wait + cpu_flag::memory;
-				cpu_sleep_called = false;
-				cpu_memory_checked = false;
-				continue;
-			}
-
-			if (cpu_can_stop && state0 & cpu_flag::pending)
-			{
-				// Execute pending work
-				cpu_work();
-
-				if ((state1 ^ state) - cpu_flag::pending)
-				{
-					// Work could have changed flags
-					// Reset internal flags as if check_state() has just been called
-					cpu_sleep_called = false;
-					cpu_memory_checked = false;
-					continue;
-				}
+				// Restore thread in the suspend list
+				cpu_counter::add(this);
 			}
 
 			if (retval)
@@ -1019,7 +752,6 @@ bool cpu_thread::check_state() noexcept
 		{
 			cpu_sleep();
 			cpu_sleep_called = true;
-			cpu_memory_checked = false;
 
 			if (s_tls_thread_slot != umax)
 			{
@@ -1044,7 +776,6 @@ bool cpu_thread::check_state() noexcept
 			if (state0 & cpu_flag::memory)
 			{
 				vm::passive_lock(*this);
-				cpu_memory_checked = true;
 				continue;
 			}
 
@@ -1065,7 +796,7 @@ bool cpu_thread::check_state() noexcept
 						else
 						{
 							// TODO: fix the workaround
-							g_suspend_counter.wait(ctr, atomic_wait_timeout{10'000});
+							g_suspend_counter.wait(ctr, -4, atomic_wait_timeout{100});
 						}
 					}
 					else
@@ -1074,39 +805,6 @@ bool cpu_thread::check_state() noexcept
 						break;
 					}
 				}
-
-				continue;
-			}
-
-			if (state0 & cpu_flag::yield && cpu_can_stop)
-			{
-				if (auto spu = try_get<spu_thread>())
-				{
-					if (spu->raddr && spu->rtime == vm::reservation_acquire(spu->raddr) && spu->getllar_spin_count < 10)
-					{
-						// Reservation operation is a critical section (but this may result in false positives)
-						continue;
-					}
-				}
-				else if (auto ppu = try_get<ppu_thread>())
-				{
-					if (u32 usec = ppu->hw_sleep_time)
-					{
-						thread_ctrl::wait_for_accurate(usec);
-						ppu->hw_sleep_time = 0;
-						ppu->raddr = 0; // Also lose reservation if there is any (reservation is unsaved on hw thread switch)
-						continue;
-					}
-
-					if (ppu->raddr && ppu->rtime == vm::reservation_acquire(ppu->raddr))
-					{
-						// Same
-						continue;
-					}
-				}
-
-				// Short sleep when yield flag is present alone (makes no sense when other methods which can stop thread execution have been done)
-				s_dummy_atomic.wait(0, atomic_wait_timeout{80'000});
 			}
 		}
 	}
@@ -1117,140 +815,60 @@ void cpu_thread::notify()
 	state.notify_one();
 
 	// Downcast to correct type
-	switch (get_class())
-	{
-	case thread_class::ppu:
+	if (id_type() == 1)
 	{
 		thread_ctrl::notify(*static_cast<named_thread<ppu_thread>*>(this));
-		break;
 	}
-	case thread_class::spu:
+	else if (id_type() == 2)
 	{
 		thread_ctrl::notify(*static_cast<named_thread<spu_thread>*>(this));
-		break;
 	}
-	case thread_class::rsx:
-	{
-		break;
-	}
-	default:
+	else if (id_type() != 0x55)
 	{
 		fmt::throw_exception("Invalid cpu_thread type");
 	}
-	}
 }
 
 cpu_thread& cpu_thread::operator=(thread_state)
 {
-	if (state & cpu_flag::exit)
-	{
-		// Must be notified elsewhere or self-raised
-		return *this;
-	}
-
-	const auto old = state.fetch_add(cpu_flag::exit);
-
-	if (old & cpu_flag::wait && old.none_of(cpu_flag::again + cpu_flag::exit))
-	{
-		state.notify_one();
-
-		if (auto thread = try_get<spu_thread>())
-		{
-			if (u32 resv = atomic_storage<u32>::load(thread->raddr))
-			{
-				vm::reservation_notifier_notify(resv);
-			}
-		}
-	}
-
+	state += cpu_flag::exit;
+	state.notify_one(cpu_flag::exit);
 	return *this;
 }
 
-void cpu_thread::add_remove_flags(bs_t<cpu_flag> to_add, bs_t<cpu_flag> to_remove)
-{
-	bs_t<cpu_flag> result{};
-
-	if (!to_remove)
-	{
-		state.add_fetch(to_add);
-		return;
-	}
-	else if (!to_add)
-	{
-		result = state.sub_fetch(to_remove);
-	}
-	else
-	{
-		result = state.atomic_op([&](bs_t<cpu_flag>& v)
-		{
-			v += to_add;
-			v -= to_remove;
-			return v;
-		});
-	}
-
-	if (!::is_paused(to_remove) && !::is_stopped(to_remove))
-	{
-		// No notable change requiring notification
-		return;
-	}
-
-	if (::is_paused(result) || ::is_stopped(result))
-	{
-		// Flags that stop thread execution
-		return;
-	}
-
-	state.notify_one();
-}
-
 std::string cpu_thread::get_name() const
 {
 	// Downcast to correct type
-	switch (get_class())
-	{
-	case thread_class::ppu:
+	if (id_type() == 1)
 	{
 		return thread_ctrl::get_name(*static_cast<const named_thread<ppu_thread>*>(this));
 	}
-	case thread_class::spu:
+
+	if (id_type() == 2)
 	{
 		return thread_ctrl::get_name(*static_cast<const named_thread<spu_thread>*>(this));
 	}
-	default:
-	{
-		if (cpu_thread::get_current() == this && thread_ctrl::get_current())
-		{
-			return thread_ctrl::get_name();
-		}
 
-		if (get_class() == thread_class::rsx)
-		{
-			return fmt::format("rsx::thread");
-		}
-
-		return fmt::format("Invalid cpu_thread type (0x%x)", id_type());
-	}
-	}
+	fmt::throw_exception("Invalid cpu_thread type");
 }
 
 u32 cpu_thread::get_pc() const
 {
 	const u32* pc = nullptr;
 
-	switch (get_class())
+	switch (id_type())
 	{
-	case thread_class::ppu:
+	case 1:
 	{
 		pc = &static_cast<const ppu_thread*>(this)->cia;
 		break;
 	}
-	case thread_class::spu:
+	case 2:
 	{
 		pc = &static_cast<const spu_thread*>(this)->pc;
 		break;
 	}
-	case thread_class::rsx:
+	case 0x55:
 	{
 		const auto ctrl = static_cast<const rsx::thread*>(this)->ctrl;
 		return ctrl ? ctrl->get.load() : umax;
@@ -1263,17 +881,17 @@ u32 cpu_thread::get_pc() const
 
 u32* cpu_thread::get_pc2()
 {
-	switch (get_class())
+	switch (id_type())
 	{
-	case thread_class::ppu:
+	case 1:
 	{
 		return &static_cast<ppu_thread*>(this)->dbg_step_pc;
 	}
-	case thread_class::spu:
+	case 2:
 	{
 		return &static_cast<spu_thread*>(this)->dbg_step_pc;
 	}
-	case thread_class::rsx:
+	case 0x55:
 	{
 		const auto ctrl = static_cast<rsx::thread*>(this)->ctrl;
 		return ctrl ? &static_cast<rsx::thread*>(this)->dbg_step_pc : nullptr;
@@ -1284,57 +902,22 @@ u32* cpu_thread::get_pc2()
 	return nullptr;
 }
 
-cpu_thread* cpu_thread::get_next_cpu()
+std::string cpu_thread::dump_all() const
 {
-	switch (get_class())
-	{
-	case thread_class::ppu:
-	{
-		return static_cast<ppu_thread*>(this)->next_cpu;
-	}
-	case thread_class::spu:
-	{
-		return static_cast<spu_thread*>(this)->next_cpu;
-	}
-	default: break;
-	}
-
-	return nullptr;
-}
-
-extern std::shared_ptr<CPUDisAsm> make_disasm(const cpu_thread* cpu, shared_ptr<cpu_thread> handle);
-
-void cpu_thread::dump_all(std::string& ret) const
-{
-	std::any func_data;
-
+	std::string ret = cpu_thread::dump_misc();
+	ret += '\n';
 	ret += dump_misc();
 	ret += '\n';
-	dump_regs(ret, func_data);
+	ret += dump_regs();
 	ret += '\n';
 	ret += dump_callstack();
-	ret += '\n';
 
-	if (u32 cur_pc = get_pc(); cur_pc != umax)
-	{
-		// Dump a snippet of currently executed code (may be unreliable with non-static-interpreter decoders)
-		auto disasm = make_disasm(this, null_ptr);
-
-		const auto rsx = try_get<rsx::thread>();
-
-		for (u32 i = (rsx ? rsx->try_get_pc_of_x_cmds_backwards(20, cur_pc).second : cur_pc - 4 * 20), count = 0; count < 30; count++)
-		{
-			u32 advance = disasm->disasm(i);
-			ret += disasm->last_opcode;
-			i += std::max(advance, 4u);
-			disasm->dump_pc = i;
-			ret += '\n';
-		}
-	}
+	return ret;
 }
 
-void cpu_thread::dump_regs(std::string&, std::any&) const
+std::string cpu_thread::dump_regs() const
 {
+	return {};
 }
 
 std::string cpu_thread::dump_callstack() const
@@ -1358,7 +941,7 @@ std::vector<std::pair<u32, u32>> cpu_thread::dump_callstack_list() const
 
 std::string cpu_thread::dump_misc() const
 {
-	return fmt::format("Type: %s; State: %s\n", get_class() == thread_class::ppu ? "PPU" : get_class() == thread_class::spu ? "SPU" : "RSX", state.load());
+	return fmt::format("Type: %s\n" "State: %s\n", id_type() == 1 ? "PPU" : id_type() == 2 ? "SPU" : "CPU", state.load());
 }
 
 bool cpu_thread::suspend_work::push(cpu_thread* _this) noexcept
@@ -1527,10 +1110,7 @@ bool cpu_thread::suspend_work::push(cpu_thread* _this) noexcept
 
 void cpu_thread::cleanup() noexcept
 {
-	if (u64 count = s_cpu_counter)
-	{
-		fmt::throw_exception("cpu_thread::cleanup(): %u threads are still active! (created=%u, destroyed=%u)", count, +g_threads_created, +g_threads_deleted);
-	}
+	ensure(!s_cpu_counter);
 
 	sys_log.notice("All CPU threads have been stopped. [+: %u]", +g_threads_created);
 
@@ -1557,205 +1137,3 @@ u32 CPUDisAsm::DisAsmBranchTarget(s32 /*imm*/)
 	// Unused
 	return 0;
 }
-
-extern bool try_lock_spu_threads_in_a_state_compatible_with_savestates(bool revert_lock, std::vector<std::pair<shared_ptr<named_thread<spu_thread>>, u32>>* out_list)
-{
-	if (out_list)
-	{
-		out_list->clear();
-	}
-
-	auto get_spus = [old_counter = u64{umax}, spu_list = std::vector<shared_ptr<named_thread<spu_thread>>>()](bool can_collect, bool force_collect) mutable
-	{
-		const u64 new_counter = cpu_thread::g_threads_created + cpu_thread::g_threads_deleted;
-
-		if (old_counter != new_counter)
-		{
-			if (!can_collect)
-			{
-				return decltype(&spu_list){};
-			}
-
-			const u64 current = get_system_time();
-
-			// Fetch SPU contexts
-			spu_list.clear();
-
-			bool give_up = false;
-
-			idm::select<named_thread<spu_thread>>([&](u32 id, spu_thread& spu)
-			{
-				spu_list.emplace_back(ensure(idm::get_unlocked<named_thread<spu_thread>>(id)));
-
-				if (spu.current_func && spu.unsavable)
-				{
-					const u64 start = spu.start_time;
-
-					// Automatically give up if it is asleep 15 seconds or more
-					if (start && current > start && current - start >= 15'000'000)
-					{
-						give_up = true;
-					}
-				}
-			});
-
-			if (!force_collect && give_up)
-			{
-				return decltype(&spu_list){};
-			}
-
-			old_counter = new_counter;
-		}
-
-		return &spu_list;
-	};
-
-	// Attempt to lock for a second, if somehow takes longer abort it
-	for (u64 start = 0, passed_count = 0; passed_count < 15;)
-	{
-		if (revert_lock)
-		{
-			// Revert the operation of this function
-			break;
-		}
-
-		if (!start)
-		{
-			start = get_system_time();
-		}
-		else if (get_system_time() - start >= 150'000)
-		{
-			passed_count++;
-			start = 0;
-			continue;
-		}
-
-		// Try to fetch SPUs out of critical section
-		const auto spu_list = get_spus(true, false);
-
-		if (!spu_list)
-		{
-			// Give up for now
-			std::this_thread::sleep_for(10ms);
-			passed_count++;
-			start = 0;
-			continue;
-		}
-
-		// Avoid using suspend_all when more than 2 threads known to be unsavable
-		u32 unsavable_threads = 0;
-
-		for (auto& spu : *spu_list)
-		{
-			if (spu->unsavable)
-			{
-				unsavable_threads++;
-
-				if (unsavable_threads >= 3)
-				{
-					break;
-				}
-			}
-		}
-
-		if (unsavable_threads >= 3)
-		{
-			std::this_thread::yield();
-			continue;
-		}
-
-		// Flag for optimization
-		bool paused_anyone = false;
-
-		if (cpu_thread::suspend_all(nullptr, {}, [&]()
-		{
-			if (!get_spus(false, true))
-			{
-				// Avoid locking IDM here because this is a critical section
-				return true;
-			}
-
-			bool failed = false;
-			const bool is_emu_paused = Emu.IsPaused();
-
-			for (auto& spu : *spu_list)
-			{
-				if (spu->unsavable)
-				{
-					failed = true;
-					break;
-				}
-
-				if (is_emu_paused)
-				{
-					// If emulation is paused, we can only hope it's already in a state compatible with savestates
-					if (!(spu->state & (cpu_flag::dbg_global_pause + cpu_flag::dbg_pause)))
-					{
-						failed = true;
-						break;
-					}
-				}
-				else
-				{
-					paused_anyone = true;
-					ensure(!spu->state.test_and_set(cpu_flag::dbg_global_pause));
-				}
-			}
-
-			if (failed && paused_anyone)
-			{
-				// For faster signalling, first remove state flags then batch notifications
-				for (auto& spu : *spu_list)
-				{
-					spu->state -= cpu_flag::dbg_global_pause;
-				}
-			}
-
-			return failed;
-		}))
-		{
-			if (Emu.IsPaused())
-			{
-				return false;
-			}
-
-			if (!paused_anyone)
-			{
-				// Need not do anything
-				std::this_thread::yield();
-				continue;
-			}
-
-			for (auto& spu : *spu_list)
-			{
-				if (spu->state & cpu_flag::wait)
-				{
-					spu->state.notify_one();
-				}
-			}
-
-			std::this_thread::yield();
-			continue;
-		}
-
-		if (out_list)
-		{
-			for (auto& spu : *spu_list)
-			{
-				out_list->emplace_back(spu, spu->pc);
-			}
-		}
-
-		return true;
-	}
-
-	for (auto& spu : *get_spus(true, true))
-	{
-		if (spu->state.test_and_reset(cpu_flag::dbg_global_pause))
-		{
-			spu->state.notify_one();
-		}
-	};
-
-	return false;
-}
diff --git a/rpcs3/Emu/CPU/CPUThread.h b/rpcs3/Emu/CPU/CPUThread.h
index 5e3484f7f5..6172432bb3 100644
--- a/rpcs3/Emu/CPU/CPUThread.h
+++ b/rpcs3/Emu/CPU/CPUThread.h
@@ -4,7 +4,6 @@
 #include "../Utilities/bit_set.h"
 
 #include <vector>
-#include <any>
 
 template <typename Derived, typename Base>
 concept DerivedFrom = std::is_base_of_v<Base, Derived> &&
@@ -20,14 +19,8 @@ enum class cpu_flag : u32
 	pause, // Thread suspended by suspend_all technique
 	suspend, // Thread suspended
 	ret, // Callback return requested
-	again, // Thread must complete the syscall after deserialization
 	signal, // Thread received a signal (HLE)
 	memory, // Thread must unlock memory mutex
-	pending, // Thread has postponed work
-	pending_recheck, // Thread needs to recheck if there is pending work before ::pending removal
-	notify, // Flag meant solely to allow atomic notification on state without changing other flags
-	yield, // Thread is being requested to yield its execution time if it's running
-	preempt, // Thread is being requested to preempt the execution of all CPU threads
 
 	dbg_global_pause, // Emulation paused
 	dbg_pause, // Thread paused
@@ -39,7 +32,7 @@ enum class cpu_flag : u32
 // Test stopped state
 constexpr bool is_stopped(bs_t<cpu_flag> state)
 {
-	return !!(state & (cpu_flag::stop + cpu_flag::exit + cpu_flag::again));
+	return !!(state & (cpu_flag::stop + cpu_flag::exit));
 }
 
 // Test paused state
@@ -118,11 +111,6 @@ public:
 		return id >> 24;
 	}
 
-	thread_class get_class() const
-	{
-		return static_cast<thread_class>(id_type()); // Static cast for performance reasons
-	}
-
 	template <DerivedFrom<cpu_thread> T>
 	T* try_get()
 	{
@@ -149,14 +137,11 @@ public:
 
 	u32 get_pc() const;
 	u32* get_pc2(); // Last PC before stepping for the debugger (may be null)
-	cpu_thread* get_next_cpu(); // Access next_cpu member if the is one
 
 	void notify();
 	cpu_thread& operator=(thread_state);
 
-	// Add/remove CPU state flags in an atomic operations, notifying if required
-	void add_remove_flags(bs_t<cpu_flag> to_add, bs_t<cpu_flag> to_remove);
-
+public:
 	// Thread stats for external observation
 	static atomic_t<u64> g_threads_created, g_threads_deleted, g_suspend_counter;
 
@@ -164,10 +149,10 @@ public:
 	std::string get_name() const;
 
 	// Get CPU state dump (everything)
-	virtual void dump_all(std::string&) const;
+	virtual std::string dump_all() const;
 
 	// Get CPU register dump
-	virtual void dump_regs(std::string& ret, std::any& custom_data) const;
+	virtual std::string dump_regs() const;
 
 	// Get CPU call stack dump
 	virtual std::string dump_callstack() const;
@@ -184,16 +169,13 @@ public:
 	// Callback for cpu_flag::suspend
 	virtual void cpu_sleep() {}
 
-	// Callback for cpu_flag::pending
-	virtual void cpu_work() { state -= cpu_flag::pending + cpu_flag::pending_recheck; }
-
 	// Callback for cpu_flag::ret
 	virtual void cpu_return() {}
 
 	// Callback for thread_ctrl::wait or RSX wait
 	virtual void cpu_wait(bs_t<cpu_flag> old);
 
-	// Callback for function abortion stats on Emu.Kill()
+	// Callback for function abortion stats on Emu.Stop()
 	virtual void cpu_on_stop() {}
 
 	// For internal use
diff --git a/rpcs3/Emu/CPU/CPUTranslator.cpp b/rpcs3/Emu/CPU/CPUTranslator.cpp
index f6893358ff..16d69cb9ed 100644
--- a/rpcs3/Emu/CPU/CPUTranslator.cpp
+++ b/rpcs3/Emu/CPU/CPUTranslator.cpp
@@ -3,88 +3,15 @@
 #include "CPUTranslator.h"
 
 #include "util/v128.hpp"
-#include "util/logs.hpp"
-
-LOG_CHANNEL(llvm_log, "LLVM");
+#include "util/v128sse.hpp"
 
 llvm::LLVMContext g_llvm_ctx;
 
-llvm::Value* peek_through_bitcasts(llvm::Value* arg)
-{
-	llvm::CastInst* i;
-
-	while ((i = llvm::dyn_cast_or_null<llvm::CastInst>(arg)) && i->getOpcode() == llvm::Instruction::BitCast)
-	{
-		arg = i->getOperand(0);
-	}
-
-	return arg;
-}
-
 cpu_translator::cpu_translator(llvm::Module* _module, bool is_be)
     : m_context(g_llvm_ctx)
 	, m_module(_module)
 	, m_is_be(is_be)
 {
-	register_intrinsic("x86_pshufb", [&](llvm::CallInst* ci) -> llvm::Value*
-	{
-		const auto data0 = ci->getOperand(0);
-		const auto index = ci->getOperand(1);
-		const auto zeros = llvm::ConstantAggregateZero::get(get_type<u8[16]>());
-
-		if (m_use_ssse3)
-		{
-#if defined(ARCH_X64)
-			return m_ir->CreateCall(get_intrinsic(llvm::Intrinsic::x86_ssse3_pshuf_b_128), {data0, index});
-#elif defined(ARCH_ARM64)
-			// Modified from sse2neon
-			// movi    v2.16b, #143
-			// and     v1.16b, v1.16b, v2.16b
-			// tbl     v0.16b, { v0.16b }, v1.16b
-			auto mask = llvm::ConstantInt::get(get_type<u8[16]>(), 0x8F);
-			auto and_mask = llvm::ConstantInt::get(get_type<bool[16]>(), true);
-			auto vec_len = llvm::ConstantInt::get(get_type<u32>(), 16);
-			auto index_masked = m_ir->CreateCall(get_intrinsic<u8[16]>(llvm::Intrinsic::vp_and), {index, mask, and_mask, vec_len});
-			return m_ir->CreateCall(get_intrinsic<u8[16]>(llvm::Intrinsic::aarch64_neon_tbl1), {data0, index_masked});
-#else
-#error "Unimplemented"
-#endif
-		}
-		else
-		{
-			// Emulate PSHUFB (TODO)
-			const auto mask = m_ir->CreateAnd(index, 0xf);
-			const auto loop = llvm::BasicBlock::Create(m_context, "", m_ir->GetInsertBlock()->getParent());
-			const auto prev = ci->getParent();
-			const auto next = prev->splitBasicBlock(ci->getNextNode());
-
-			llvm::cast<llvm::BranchInst>(m_ir->GetInsertBlock()->getTerminator())->setOperand(0, loop);
-
-			llvm::Value* result;
-			//m_ir->CreateBr(loop);
-			m_ir->SetInsertPoint(loop);
-			const auto i = m_ir->CreatePHI(get_type<u32>(), 2);
-			const auto v = m_ir->CreatePHI(get_type<u8[16]>(), 2);
-			i->addIncoming(m_ir->getInt32(0), prev);
-			i->addIncoming(m_ir->CreateAdd(i, m_ir->getInt32(1)), loop);
-			v->addIncoming(zeros, prev);
-			result = m_ir->CreateInsertElement(v, m_ir->CreateExtractElement(data0, m_ir->CreateExtractElement(mask, i)), i);
-			v->addIncoming(result, loop);
-			m_ir->CreateCondBr(m_ir->CreateICmpULT(i, m_ir->getInt32(16)), loop, next);
-			m_ir->SetInsertPoint(next->getFirstNonPHI());
-			result = m_ir->CreateSelect(m_ir->CreateICmpSLT(index, zeros), zeros, result);
-
-			return result;
-		}
-	});
-
-	register_intrinsic("any_select_by_bit4", [&](llvm::CallInst* ci) -> llvm::Value*
-	{
-		const auto s = bitcast<s8[16]>(m_ir->CreateShl(bitcast<u64[2]>(ci->getOperand(0)), 3));;
-		const auto a = bitcast<u8[16]>(ci->getOperand(1));
-		const auto b = bitcast<u8[16]>(ci->getOperand(2));
-		return m_ir->CreateSelect(m_ir->CreateICmpSLT(s, llvm::ConstantAggregateZero::get(get_type<s8[16]>())), b, a);
-	});
 }
 
 void cpu_translator::initialize(llvm::LLVMContext& context, llvm::ExecutionEngine& engine)
@@ -92,13 +19,7 @@ void cpu_translator::initialize(llvm::LLVMContext& context, llvm::ExecutionEngin
 	m_context = context;
 	m_engine = &engine;
 
-	auto cpu = m_engine->getTargetMachine()->getTargetCPU();
-
-	if (cpu == "generic")
-	{
-		// Detection failed, try to guess
-		cpu = fallback_cpu_detection();
-	}
+	const auto cpu = m_engine->getTargetMachine()->getTargetCPU();
 
 	// Test SSSE3 feature (TODO)
 	if (cpu == "generic" ||
@@ -115,39 +36,29 @@ void cpu_translator::initialize(llvm::LLVMContext& context, llvm::ExecutionEngin
 		m_use_ssse3 = false;
 	}
 
-	// Test AVX feature (TODO)
-	if (cpu == "sandybridge" ||
-		cpu == "ivybridge" ||
-		cpu == "bdver1")
-	{
-		m_use_avx = true;
-	}
-
 	// Test FMA feature (TODO)
 	if (cpu == "haswell" ||
 		cpu == "broadwell" ||
 		cpu == "skylake" ||
-		cpu == "alderlake" ||
-		cpu == "raptorlake" ||
-		cpu == "meteorlake" ||
 		cpu == "bdver2" ||
 		cpu == "bdver3" ||
 		cpu == "bdver4" ||
-		cpu == "znver1" ||
-		cpu == "znver2" ||
-		cpu == "znver3")
+		cpu.startswith("znver"))
 	{
 		m_use_fma = true;
-		m_use_avx = true;
 	}
 
 	// Test AVX-512 feature (TODO)
 	if (cpu == "skylake-avx512" ||
 		cpu == "cascadelake" ||
 		cpu == "cannonlake" ||
-		cpu == "cooperlake")
+		cpu == "cooperlake" ||
+		cpu == "icelake" ||
+		cpu == "icelake-client" ||
+		cpu == "icelake-server" ||
+		cpu == "tigerlake" ||
+		cpu == "rocketlake")
 	{
-		m_use_avx = true;
 		m_use_fma = true;
 		m_use_avx512 = true;
 	}
@@ -155,46 +66,21 @@ void cpu_translator::initialize(llvm::LLVMContext& context, llvm::ExecutionEngin
 	// Test VNNI feature (TODO)
 	if (cpu == "cascadelake" ||
 		cpu == "cooperlake" ||
-		cpu == "alderlake" ||
-		cpu == "raptorlake" ||
-		cpu == "meteorlake")
+		cpu == "alderlake")
 	{
 		m_use_vnni = true;
 	}
 
-	// Test GFNI feature (TODO)
-	if (cpu == "tremont" ||
-		cpu == "gracemont" ||
-		cpu == "alderlake" ||
-		cpu == "raptorlake" ||
-		cpu == "meteorlake")
-	{
-		m_use_gfni = true;
-	}
-
 	// Test AVX-512_icelake features (TODO)
 	if (cpu == "icelake" ||
 		cpu == "icelake-client" ||
 		cpu == "icelake-server" ||
 		cpu == "tigerlake" ||
 		cpu == "rocketlake" ||
-		cpu == "sapphirerapids" ||
-		(cpu.starts_with("znver") && cpu != "znver1" && cpu != "znver2" && cpu != "znver3"))
+		cpu == "sapphirerapids")
 	{
-		m_use_avx = true;
-		m_use_fma = true;
-		m_use_avx512 = true;
 		m_use_avx512_icl = true;
 		m_use_vnni = true;
-		m_use_gfni = true;
-	}
-
-	// Aarch64 CPUs
-	if (cpu == "cyclone" || cpu.contains("cortex"))
-	{
-		m_use_fma = true;
-		// AVX does not use intrinsics so far
-		m_use_avx = true;
 	}
 }
 
@@ -204,9 +90,9 @@ llvm::Value* cpu_translator::bitcast(llvm::Value* val, llvm::Type* type) const
 	uint s2 = val->getType()->getScalarSizeInBits();
 
 	if (type->isVectorTy())
-		s1 *= llvm::cast<llvm::FixedVectorType>(type)->getNumElements();
+		s1 *= llvm::cast<llvm::VectorType>(type)->getNumElements();
 	if (val->getType()->isVectorTy())
-		s2 *= llvm::cast<llvm::FixedVectorType>(val->getType())->getNumElements();
+		s2 *= llvm::cast<llvm::VectorType>(val->getType())->getNumElements();
 
 	if (s1 != s2)
 	{
@@ -222,7 +108,7 @@ llvm::Value* cpu_translator::bitcast(llvm::Value* val, llvm::Type* type) const
 }
 
 template <>
-std::pair<bool, v128> cpu_translator::get_const_vector<v128>(llvm::Value* c, u32 _pos, u32 _line)
+std::pair<bool, v128> cpu_translator::get_const_vector<v128>(llvm::Value* c, u32 a, u32 b)
 {
 	v128 result{};
 
@@ -245,12 +131,12 @@ std::pair<bool, v128> cpu_translator::get_const_vector<v128>(llvm::Value* c, u32
 			return {true, result};
 		}
 
-		fmt::throw_exception("[0x%x, %u] Not a vector", _pos, _line);
+		fmt::throw_exception("[0x%x, %u] Not a vector", a, b);
 	}
 
-	if (auto v = llvm::cast<llvm::FixedVectorType>(t); v->getScalarSizeInBits() * v->getNumElements() != 128)
+	if (auto v = llvm::cast<llvm::VectorType>(t); v->getScalarSizeInBits() * v->getNumElements() != 128)
 	{
-		fmt::throw_exception("[0x%x, %u] Bad vector size: i%ux%u", _pos, _line, v->getScalarSizeInBits(), v->getNumElements());
+		fmt::throw_exception("[0x%x, %u] Bad vector size: i%ux%u", a, b, v->getScalarSizeInBits(), v->getNumElements());
 	}
 
 	const auto cv = llvm::dyn_cast<llvm::ConstantDataVector>(c);
@@ -259,21 +145,16 @@ std::pair<bool, v128> cpu_translator::get_const_vector<v128>(llvm::Value* c, u32
 	{
 		if (llvm::isa<llvm::ConstantAggregateZero>(c))
 		{
-			return {true, result};
+			return {};
 		}
 
-		std::string result;
-		llvm::raw_string_ostream out(result);
-		c->print(out, true);
-		out.flush();
-
 		if (llvm::isa<llvm::ConstantExpr>(c))
 		{
 			// Sorry, if we cannot evaluate it we cannot use it
-			fmt::throw_exception("[0x%x, %u] Constant Expression!\n%s", _pos, _line, result);
+			fmt::throw_exception("[0x%x, %u] Constant Expression!", a, b);
 		}
 
-		fmt::throw_exception("[0x%x, %u] Unexpected constant type!\n%s", _pos, _line, result);
+		fmt::throw_exception("[0x%x, %u] Unexpected constant type", a, b);
 	}
 
 	const auto sct = t->getScalarType();
@@ -322,188 +203,51 @@ std::pair<bool, v128> cpu_translator::get_const_vector<v128>(llvm::Value* c, u32
 	}
 	else
 	{
-		fmt::throw_exception("[0x%x, %u] Unexpected vector element type", _pos, _line);
+		fmt::throw_exception("[0x%x, %u] Unexpected vector element type", a, b);
 	}
 
 	return {true, result};
 }
 
 template <>
-llvm::Constant* cpu_translator::make_const_vector<v128>(v128 v, llvm::Type* t, u32 _line)
+llvm::Constant* cpu_translator::make_const_vector<v128>(v128 v, llvm::Type* t)
 {
 	if (const auto ct = llvm::dyn_cast<llvm::IntegerType>(t); ct && ct->getBitWidth() == 128)
 	{
-		return llvm::ConstantInt::get(t, llvm::APInt(128, llvm::ArrayRef(reinterpret_cast<const u64*>(v._bytes), 2)));
+		return llvm::ConstantInt::get(t, llvm::APInt(128, llvm::makeArrayRef(reinterpret_cast<const u64*>(v._bytes), 2)));
 	}
 
 	ensure(t->isVectorTy());
-	ensure(128 == t->getScalarSizeInBits() * llvm::cast<llvm::FixedVectorType>(t)->getNumElements());
+	ensure(128 == t->getScalarSizeInBits() * llvm::cast<llvm::VectorType>(t)->getNumElements());
 
 	const auto sct = t->getScalarType();
 
 	if (sct->isIntegerTy(8))
 	{
-		return llvm::ConstantDataVector::get(m_context, llvm::ArrayRef(reinterpret_cast<const u8*>(v._bytes), 16));
+		return llvm::ConstantDataVector::get(m_context, llvm::makeArrayRef(reinterpret_cast<const u8*>(v._bytes), 16));
 	}
 	if (sct->isIntegerTy(16))
 	{
-		return llvm::ConstantDataVector::get(m_context, llvm::ArrayRef(reinterpret_cast<const u16*>(v._bytes), 8));
+		return llvm::ConstantDataVector::get(m_context, llvm::makeArrayRef(reinterpret_cast<const u16*>(v._bytes), 8));
 	}
 	if (sct->isIntegerTy(32))
 	{
-		return llvm::ConstantDataVector::get(m_context, llvm::ArrayRef(reinterpret_cast<const u32*>(v._bytes), 4));
+		return llvm::ConstantDataVector::get(m_context, llvm::makeArrayRef(reinterpret_cast<const u32*>(v._bytes), 4));
 	}
 	if (sct->isIntegerTy(64))
 	{
-		return llvm::ConstantDataVector::get(m_context, llvm::ArrayRef(reinterpret_cast<const u64*>(v._bytes), 2));
+		return llvm::ConstantDataVector::get(m_context, llvm::makeArrayRef(reinterpret_cast<const u64*>(v._bytes), 2));
 	}
 	if (sct->isFloatTy())
 	{
-		return llvm::ConstantDataVector::get(m_context, llvm::ArrayRef(reinterpret_cast<const f32*>(v._bytes), 4));
+		return llvm::ConstantDataVector::get(m_context, llvm::makeArrayRef(reinterpret_cast<const f32*>(v._bytes), 4));
 	}
 	if (sct->isDoubleTy())
 	{
-		return llvm::ConstantDataVector::get(m_context, llvm::ArrayRef(reinterpret_cast<const f64*>(v._bytes), 2));
+		return llvm::ConstantDataVector::get(m_context, llvm::makeArrayRef(reinterpret_cast<const f64*>(v._bytes), 2));
 	}
 
-	fmt::throw_exception("[line %u] No supported constant type", _line);
-}
-
-void cpu_translator::replace_intrinsics(llvm::Function& f)
-{
-	for (llvm::BasicBlock& bb : f)
-	{
-		std::set<std::string, std::less<>> names;
-
-		using InstListType = llvm::BasicBlock::InstListType;
-
-		std::function<InstListType::iterator(InstListType::iterator)> fix_funcs;
-
-		fix_funcs = [&](InstListType::iterator inst_bit)
-		{
-			auto ci = llvm::dyn_cast<llvm::CallInst>(&*inst_bit);
-
-			if (!ci)
-			{
-				return std::next(inst_bit);
-			}
-
-			const auto cf = ci->getCalledFunction();
-
-			if (!cf)
-			{
-				return std::next(inst_bit);
-			}
-
-			std::string_view func_name{cf->getName().data(), cf->getName().size()};
-
-			const auto it = m_intrinsics.find(func_name);
-
-			if (it == m_intrinsics.end())
-			{
-				return std::next(inst_bit);
-			}
-
-			if (!names.empty())
-			{
-				llvm_log.trace("cpu_translator::replace_intrinsics(): function '%s' names_size=%d, names[0]=%s", func_name, names.size(), *names.begin());
-			}
-
-			if (names.contains(func_name))
-			{
-				fmt::throw_exception("cpu_translator::replace_intrinsics(): Recursion detected at function '%s'!", func_name);
-			}
-
-			names.emplace(std::string(func_name));
-
-			// Set insert point after call instruction
-			// In order to obtain a clear range of the inserted instructions
-			if (llvm::Instruction* next = ci->getNextNode())
-			{
-				m_ir->SetInsertPoint(next);
-			}
-			else
-			{
-				m_ir->SetInsertPoint(std::addressof(bb));
-			}
-
-			ci->replaceAllUsesWith(it->second(ci));
-
-			InstListType::iterator end = m_ir->GetInsertPoint();
-
-			for (InstListType::iterator next_it = ci->eraseFromParent(), inner = next_it; inner != end;)
-			{
-				if (llvm::isa<llvm::CallInst>(&*inner))
-				{
-					inner = fix_funcs(inner);
-				}
-				else
-				{
-					inner++;
-				}
-			}
-
-			// TODO: Simplify in C++23 with 'names.erase(func_name);'
-			names.erase(ensure(names.find(func_name), FN(x != names.end())));
-			return end;
-		};
-
-		for (auto bit = bb.begin(); bit != bb.end(); bit = fix_funcs(bit))
-		{
-		}
-	}
-}
-
-void cpu_translator::run_transforms(llvm::Function& f)
-{
-	// This pass must run first because the other passes may depend on resolved names.
-	replace_intrinsics(f);
-
-	for (auto& pass : m_transform_passes)
-	{
-		pass->run(m_ir, f);
-	}
-}
-
-void cpu_translator::register_transform_pass(std::unique_ptr<translator_pass>& pass)
-{
-	m_transform_passes.emplace_back(std::move(pass));
-}
-
-void cpu_translator::clear_transforms()
-{
-	m_transform_passes.clear();
-}
-
-void cpu_translator::reset_transforms()
-{
-	for (auto& pass : m_transform_passes)
-	{
-		pass->reset();
-	}
-}
-
-void cpu_translator::erase_stores(llvm::ArrayRef<llvm::Value*> args)
-{
-	for (auto v : args)
-	{
-		for (auto it = v->use_begin(); it != v->use_end(); ++it)
-		{
-			llvm::Value* i = *it;
-			llvm::CastInst* bci = nullptr;
-
-			// Walk through bitcasts
-			while (i && (bci = llvm::dyn_cast<llvm::CastInst>(i)) && bci->getOpcode() == llvm::Instruction::BitCast)
-			{
-				i = *bci->use_begin();
-			}
-
-			if (auto si = llvm::dyn_cast_or_null<llvm::StoreInst>(i))
-			{
-				si->eraseFromParent();
-			}
-		}
-	}
+	fmt::throw_exception("No supported constant type");
 }
 
 #endif
diff --git a/rpcs3/Emu/CPU/CPUTranslator.h b/rpcs3/Emu/CPU/CPUTranslator.h
index 8d1a5d42aa..003dd5c3a2 100644
--- a/rpcs3/Emu/CPU/CPUTranslator.h
+++ b/rpcs3/Emu/CPU/CPUTranslator.h
@@ -2,12 +2,6 @@
 
 #ifdef LLVM_AVAILABLE
 
-#include "util/types.hpp"
-#include "util/sysinfo.hpp"
-#include "Utilities/StrFmt.h"
-#include "Utilities/JIT.h"
-#include "util/v128.hpp"
-
 #ifdef _MSC_VER
 #pragma warning(push, 0)
 #else
@@ -19,33 +13,25 @@
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #pragma GCC diagnostic ignored "-Weffc++"
 #pragma GCC diagnostic ignored "-Wmissing-noreturn"
-#pragma GCC diagnostic ignored "-Wredundant-decls"
 #endif
 #include "llvm/IR/LLVMContext.h"
-#include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Target/TargetMachine.h"
-#include "llvm/Support/KnownBits.h"
 #include "llvm/Analysis/ConstantFolding.h"
-#include "llvm/Analysis/ValueTracking.h"
 #include "llvm/IR/IntrinsicsX86.h"
-#ifdef ARCH_ARM64
-#include "llvm/IR/IntrinsicsAArch64.h"
-#endif
-#include "llvm/IR/InlineAsm.h"
-
 #ifdef _MSC_VER
 #pragma warning(pop)
 #else
 #pragma GCC diagnostic pop
 #endif
 
-#include <functional>
-#include <unordered_map>
+#include "util/types.hpp"
+#include "Utilities/StrFmt.h"
+#include "Utilities/BitField.h"
+#include "Utilities/JIT.h"
 
-// Helper function
-llvm::Value* peek_through_bitcasts(llvm::Value*);
+#include "util/v128.hpp"
 
 enum class i2 : char
 {
@@ -55,77 +41,10 @@ enum class i4 : char
 {
 };
 
-template <typename T>
-concept LLVMType = (std::is_pointer_v<T>) && (std::is_base_of_v<llvm::Type, std::remove_pointer_t<T>>);
-
-template <typename T>
-concept LLVMValue = (std::is_pointer_v<T>) && (std::is_base_of_v<llvm::Value, std::remove_pointer_t<T>>);
-
-template <typename T>
-concept DSLValue = requires(T& v, llvm::IRBuilder<>* ir) {
-	{ v.eval(ir) } -> LLVMValue;
-};
-
-template <usz N>
-struct get_int_bits
-{
-};
-
-template <>
-struct get_int_bits<1>
-{
-	using utype = bool;
-};
-
-template <>
-struct get_int_bits<2>
-{
-	using utype = i2;
-};
-
-template <>
-struct get_int_bits<4>
-{
-	using utype = i4;
-};
-
-template <>
-struct get_int_bits<8>
-{
-	using utype = u8;
-};
-
-template <>
-struct get_int_bits<16>
-{
-	using utype = u16;
-};
-
-template <>
-struct get_int_bits<32>
-{
-	using utype = u32;
-};
-
-template <>
-struct get_int_bits<64>
-{
-	using utype = u64;
-};
-
-template <>
-struct get_int_bits<128>
-{
-	using utype = u128;
-};
-
-template <usz Bits>
-using get_int_vt = typename get_int_bits<Bits>::utype;
-
 template <typename T = void>
 struct llvm_value_t
 {
-	static_assert(std::is_same_v<T, void>, "llvm_value_t<> error: unknown type");
+	static_assert(std::is_same<T, void>::value, "llvm_value_t<> error: unknown type");
 
 	using type = void;
 	using base = llvm_value_t;
@@ -148,9 +67,9 @@ struct llvm_value_t
 		return value;
 	}
 
-	std::tuple<> match(llvm::Value*& value, llvm::Module*) const
+	std::tuple<> match(llvm::Value*& value) const
 	{
-		if (peek_through_bitcasts(value) != peek_through_bitcasts(this->value))
+		if (value != this->value)
 		{
 			value = nullptr;
 		}
@@ -417,7 +336,7 @@ struct llvm_value_t<f64> : llvm_value_t<void>
 template <typename T>
 struct llvm_value_t<T*> : llvm_value_t<T>
 {
-	static_assert(!std::is_void_v<T>, "llvm_value_t<> error: invalid pointer to void type");
+	static_assert(!std::is_void<T>::value, "llvm_value_t<> error: invalid pointer to void type");
 
 	using type = T*;
 	using base = llvm_value_t<T>;
@@ -434,7 +353,7 @@ struct llvm_value_t<T*> : llvm_value_t<T>
 
 	static llvm::Type* get_type(llvm::LLVMContext& context)
 	{
-		return llvm::PointerType::getUnqual(context);
+		return llvm_value_t<T>::get_type(context)->getPointerTo();
 	}
 };
 
@@ -477,36 +396,34 @@ struct llvm_value_t<T[N]> : llvm_value_t<std::conditional_t<(std::extent_v<T> >
 template <typename T>
 using llvm_expr_t = std::decay_t<T>;
 
-template <typename T>
+template <typename T, typename = void>
 struct is_llvm_expr
 {
 };
 
-template <DSLValue T>
-struct is_llvm_expr<T>
+template <typename T>
+struct is_llvm_expr<T, std::void_t<decltype(std::declval<T>().eval(std::declval<llvm::IRBuilder<>*>()))>>
 {
 	using type = typename std::decay_t<T>::type;
 };
 
-template <typename T, typename Of>
+template <typename T, typename Of, typename = void>
 struct is_llvm_expr_of
 {
 	static constexpr bool ok = false;
 };
 
 template <typename T, typename Of>
-	requires(requires { typename is_llvm_expr<T>::type; } && requires { typename is_llvm_expr<Of>::type; })
-struct is_llvm_expr_of<T, Of>
+struct is_llvm_expr_of<T, Of, std::void_t<typename is_llvm_expr<T>::type, typename is_llvm_expr<Of>::type>>
 {
 	static constexpr bool ok = std::is_same_v<typename is_llvm_expr<T>::type, typename is_llvm_expr<Of>::type>;
 };
 
 template <typename T, typename... Types>
-	requires(is_llvm_expr_of<T, Types>::ok && ...)
-using llvm_common_t = typename is_llvm_expr<T>::type;
+using llvm_common_t = std::enable_if_t<(is_llvm_expr_of<T, Types>::ok && ...), typename is_llvm_expr<T>::type>;
 
 template <typename... Args>
-using llvm_match_tuple = decltype(std::tuple_cat(std::declval<llvm_expr_t<Args>&>().match(std::declval<llvm::Value*&>(), nullptr)...));
+using llvm_match_tuple = decltype(std::tuple_cat(std::declval<llvm_expr_t<Args>&>().match(std::declval<llvm::Value*&>())...));
 
 template <typename T, typename U = llvm_common_t<llvm_value_t<T>>>
 struct llvm_match_t
@@ -523,8 +440,7 @@ struct llvm_match_t
 	template <typename... Args>
 	bool eq(const Args&... args) const
 	{
-		llvm::Value* lhs = nullptr;
-		return value && (lhs = peek_through_bitcasts(value)) && ((lhs == peek_through_bitcasts(args.value)) && ...);
+		return value && ((value == args.value) && ...);
 	}
 
 	llvm::Value* eval(llvm::IRBuilder<>*) const
@@ -532,9 +448,9 @@ struct llvm_match_t
 		return value;
 	}
 
-	std::tuple<> match(llvm::Value*& value, llvm::Module*) const
+	std::tuple<> match(llvm::Value*& value) const
 	{
-		if (peek_through_bitcasts(value) != peek_through_bitcasts(this->value))
+		if (value != this->value)
 		{
 			value = nullptr;
 		}
@@ -555,7 +471,7 @@ struct llvm_placeholder_t
 		return nullptr;
 	}
 
-	std::tuple<llvm_match_t<T>> match(llvm::Value*& value, llvm::Module*) const
+	std::tuple<llvm_match_t<T>> match(llvm::Value*& value) const
 	{
 		if (value && value->getType() == llvm_value_t<T>::get_type(value->getContext()))
 		{
@@ -583,7 +499,7 @@ struct llvm_const_int
 		return llvm::ConstantInt::get(llvm_value_t<T>::get_type(ir->getContext()), val, ForceSigned || llvm_value_t<T>::is_sint);
 	}
 
-	std::tuple<> match(llvm::Value*& value, llvm::Module*) const
+	std::tuple<> match(llvm::Value*& value) const
 	{
 		if (value && value == llvm::ConstantInt::get(llvm_value_t<T>::get_type(value->getContext()), val, ForceSigned || llvm_value_t<T>::is_sint))
 		{
@@ -611,7 +527,7 @@ struct llvm_const_float
 		return llvm::ConstantFP::get(llvm_value_t<T>::get_type(ir->getContext()), val);
 	}
 
-	std::tuple<> match(llvm::Value*& value, llvm::Module*) const
+	std::tuple<> match(llvm::Value*& value) const
 	{
 		if (value && value == llvm::ConstantFP::get(llvm_value_t<T>::get_type(value->getContext()), val))
 		{
@@ -639,7 +555,7 @@ struct llvm_const_vector
 		return llvm::ConstantDataVector::get(ir->getContext(), data);
 	}
 
-	std::tuple<> match(llvm::Value*& value, llvm::Module*) const
+	std::tuple<> match(llvm::Value*& value) const
 	{
 		if (value && value == llvm::ConstantDataVector::get(value->getContext(), data))
 		{
@@ -670,7 +586,7 @@ struct llvm_add
 		return ir->CreateBinOp(opc, v1, v2);
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -680,21 +596,9 @@ struct llvm_add
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
-				{
-					return std::tuple_cat(r1, r2);
-				}
-			}
-
-			v1 = i->getOperand(0);
-			v2 = i->getOperand(1);
-
-			// Argument order does not matter here, try when swapped
-			if (auto r1 = a1.match(v2, _m); v2)
-			{
-				if (auto r2 = a2.match(v1, _m); v1)
+				if (auto r2 = a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -737,7 +641,7 @@ struct llvm_sum
 		return ir->CreateAdd(ir->CreateAdd(v1, v2), v3);
 	}
 
-	llvm_match_tuple<A1, A2, A3> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2, A3> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -747,7 +651,7 @@ struct llvm_sum
 		{
 			v3 = i->getOperand(1);
 
-			if (auto r3 = a3.match(v3, _m); v3)
+			if (auto r3 = a3.match(v3); v3)
 			{
 				i = llvm::dyn_cast<llvm::BinaryOperator>(i->getOperand(0));
 
@@ -756,9 +660,9 @@ struct llvm_sum
 					v1 = i->getOperand(0);
 					v2 = i->getOperand(1);
 
-					if (auto r1 = a1.match(v1, _m); v1)
+					if (auto r1 = a1.match(v1); v1)
 					{
-						if (auto r2 = a2.match(v2, _m); v2)
+						if (auto r2 = a2.match(v2); v2)
 						{
 							return std::tuple_cat(r1, r2, r3);
 						}
@@ -794,7 +698,7 @@ struct llvm_sub
 		return ir->CreateBinOp(opc, v1, v2);
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -804,9 +708,9 @@ struct llvm_sub
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
+				if (auto r2 = a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -855,7 +759,7 @@ struct llvm_mul
 		return ir->CreateBinOp(opc, v1, v2);
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -865,21 +769,9 @@ struct llvm_mul
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
-				{
-					return std::tuple_cat(r1, r2);
-				}
-			}
-
-			v1 = i->getOperand(0);
-			v2 = i->getOperand(1);
-
-			// Argument order does not matter here, try when swapped
-			if (auto r1 = a1.match(v2, _m); v2)
-			{
-				if (auto r2 = a2.match(v1, _m); v1)
+				if (auto r2 = a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -918,7 +810,7 @@ struct llvm_div
 		return ir->CreateBinOp(opc, v1, v2);
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -928,9 +820,9 @@ struct llvm_div
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
+				if (auto r2 = a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -948,14 +840,6 @@ inline llvm_div<T1, T2> operator /(T1&& a1, T2&& a2)
 	return {a1, a2};
 }
 
-inline llvm::Constant* getZeroValueForNegation(llvm::Type* Ty)
-{
-	if (Ty->isFPOrFPVectorTy())
-		return llvm::ConstantFP::getNegativeZero(Ty);
-
-	return llvm::Constant::getNullValue(Ty);
-}
-
 template <typename A1, typename T = llvm_common_t<A1>>
 struct llvm_neg
 {
@@ -984,7 +868,7 @@ struct llvm_neg
 		// TODO: return value ?
 	}
 
-	llvm_match_tuple<A1> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 
@@ -994,7 +878,7 @@ struct llvm_neg
 			{
 				v1 = i->getOperand(0);
 
-				if (auto r1 = a1.match(v1, _m); v1)
+				if (auto r1 = a1.match(v1); v1)
 				{
 					return r1;
 				}
@@ -1005,9 +889,9 @@ struct llvm_neg
 		{
 			v1 = i->getOperand(1);
 
-			if (i->getOperand(0) == getZeroValueForNegation(v1->getType()))
+			if (i->getOperand(0) == llvm::ConstantFP::getZeroValueForNegation(v1->getType()))
 			{
-				if (auto r1 = a1.match(v1, _m); v1)
+				if (auto r1 = a1.match(v1); v1)
 				{
 					return r1;
 				}
@@ -1042,7 +926,7 @@ struct llvm_shl
 		return ir->CreateShl(v1, v2);
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -1052,9 +936,9 @@ struct llvm_shl
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
+				if (auto r2 = a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -1097,7 +981,7 @@ struct llvm_shr
 		return ir->CreateBinOp(opc, v1, v2);
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -1107,9 +991,9 @@ struct llvm_shr
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
+				if (auto r2 = a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -1176,7 +1060,7 @@ struct llvm_fshl
 		return ir->CreateCall(get_fshl(ir), {v1, v2, v3});
 	}
 
-	llvm_match_tuple<A1, A2, A3> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2, A3> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -1188,11 +1072,11 @@ struct llvm_fshl
 			v2 = i->getOperand(1);
 			v3 = i->getOperand(2);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
+				if (auto r2 = a2.match(v2); v2)
 				{
-					if (auto r3 = a3.match(v3, _m); v3)
+					if (auto r3 = a3.match(v3); v3)
 					{
 						return std::tuple_cat(r1, r2, r3);
 					}
@@ -1248,7 +1132,7 @@ struct llvm_fshr
 		return ir->CreateCall(get_fshr(ir), {v1, v2, v3});
 	}
 
-	llvm_match_tuple<A1, A2, A3> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2, A3> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -1260,11 +1144,11 @@ struct llvm_fshr
 			v2 = i->getOperand(1);
 			v3 = i->getOperand(2);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
+				if (auto r2 = a2.match(v2); v2)
 				{
-					if (auto r3 = a3.match(v3, _m); v3)
+					if (auto r3 = a3.match(v3); v3)
 					{
 						return std::tuple_cat(r1, r2, r3);
 					}
@@ -1302,7 +1186,7 @@ struct llvm_rol
 		return ir->CreateCall(llvm_fshl<A1, A1, A2>::get_fshl(ir), {v1, v1, v2});
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -1314,9 +1198,9 @@ struct llvm_rol
 
 			if (i->getOperand(1) == v1)
 			{
-				if (auto r1 = a1.match(v1, _m); v1)
+				if (auto r1 = a1.match(v1); v1)
 				{
-					if (auto r2 = a2.match(v2, _m); v2)
+					if (auto r2 = a2.match(v2); v2)
 					{
 						return std::tuple_cat(r1, r2);
 					}
@@ -1346,7 +1230,7 @@ struct llvm_and
 		return ir->CreateAnd(v1, v2);
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -1356,9 +1240,9 @@ struct llvm_and
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
+				if (auto r2 = a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -1399,7 +1283,7 @@ struct llvm_or
 		return ir->CreateOr(v1, v2);
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -1409,9 +1293,9 @@ struct llvm_or
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
+				if (auto r2 = a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -1452,7 +1336,7 @@ struct llvm_xor
 		return ir->CreateXor(v1, v2);
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -1462,9 +1346,9 @@ struct llvm_xor
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
+				if (auto r2 = a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -1524,7 +1408,7 @@ struct llvm_cmp
 		return ir->CreateICmp(pred, v1, v2);
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -1534,9 +1418,9 @@ struct llvm_cmp
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
+				if (auto r2 = a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -1584,7 +1468,7 @@ struct llvm_ord
 		return ir->CreateFCmp(pred, v1, v2);
 	}
 
-	llvm_match_tuple<Cmp> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<Cmp> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -1594,9 +1478,9 @@ struct llvm_ord
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = cmp.a1.match(v1, _m); v1)
+			if (auto r1 = cmp.a1.match(v1); v1)
 			{
-				if (auto r2 = cmp.a2.match(v2, _m); v2)
+				if (auto r2 = cmp.a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -1609,8 +1493,7 @@ struct llvm_ord
 };
 
 template <typename T>
-	requires is_llvm_cmp<std::decay_t<T>>::value
-llvm_ord(T&&) -> llvm_ord<T&&>;
+llvm_ord(T&&) -> llvm_ord<std::enable_if_t<is_llvm_cmp<std::decay_t<T>>::value, T&&>>;
 
 template <typename Cmp, typename T = llvm_common_t<Cmp>>
 struct llvm_uno
@@ -1638,7 +1521,7 @@ struct llvm_uno
 		return ir->CreateFCmp(pred, v1, v2);
 	}
 
-	llvm_match_tuple<Cmp> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<Cmp> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -1648,9 +1531,9 @@ struct llvm_uno
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = cmp.a1.match(v1, _m); v1)
+			if (auto r1 = cmp.a1.match(v1); v1)
 			{
-				if (auto r2 = cmp.a2.match(v2, _m); v2)
+				if (auto r2 = cmp.a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -1663,8 +1546,7 @@ struct llvm_uno
 };
 
 template <typename T>
-	requires is_llvm_cmp<std::decay_t<T>>::value
-llvm_uno(T&&) -> llvm_uno<T&&>;
+llvm_uno(T&&) -> llvm_uno<std::enable_if_t<is_llvm_cmp<std::decay_t<T>>::value, T&&>>;
 
 template <typename T1, typename T2>
 inline llvm_cmp<T1, T2, llvm::ICmpInst::ICMP_EQ> operator ==(T1&& a1, T2&& a2)
@@ -1762,11 +1644,11 @@ struct llvm_noncast
 		return a1.eval(ir);
 	}
 
-	llvm_match_tuple<A1> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1> match(llvm::Value*& value) const
 	{
 		if (value)
 		{
-			if (auto r1 = a1.match(value, _m); value)
+			if (auto r1 = a1.match(value); value)
 			{
 				return r1;
 			}
@@ -1809,7 +1691,7 @@ struct llvm_bitcast
 
 		if (const auto c1 = llvm::dyn_cast<llvm::Constant>(v1))
 		{
-			const auto result = llvm::ConstantFoldCastOperand(llvm::Instruction::BitCast, c1, rt, ir->GetInsertBlock()->getParent()->getParent()->getDataLayout());
+			const auto result = llvm::ConstantFoldCastOperand(llvm::Instruction::BitCast, c1, rt, _module->getDataLayout());
 
 			if (result)
 			{
@@ -1820,13 +1702,13 @@ struct llvm_bitcast
 		return ir->CreateBitCast(v1, rt);
 	}
 
-	llvm_match_tuple<A1> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1> match(llvm::Value*& value) const
 	{
 		if constexpr (llvm_value_t<T>::is_int == llvm_value_t<U>::is_int && llvm_value_t<T>::is_vector == llvm_value_t<U>::is_vector)
 		{
 			if (value)
 			{
-				if (auto r1 = a1.match(value, _m); value)
+				if (auto r1 = a1.match(value); value)
 				{
 					return r1;
 				}
@@ -1843,7 +1725,7 @@ struct llvm_bitcast
 
 			if (llvm_value_t<U>::get_type(v1->getContext()) == i->getDestTy())
 			{
-				if (auto r1 = a1.match(v1, _m); v1)
+				if (auto r1 = a1.match(v1); v1)
 				{
 					return r1;
 				}
@@ -1855,58 +1737,9 @@ struct llvm_bitcast
 			const auto target = llvm_value_t<T>::get_type(c->getContext());
 
 			// Reverse bitcast on a constant
-			if (llvm::Value* cv = llvm::ConstantFoldCastOperand(llvm::Instruction::BitCast, c, target, _m->getDataLayout()))
+			if (llvm::Value* cv = llvm::ConstantFoldCastOperand(llvm::Instruction::BitCast, c, target, _module->getDataLayout()))
 			{
-				if (auto r1 = a1.match(cv, _m); cv)
-				{
-					return r1;
-				}
-			}
-		}
-
-		value = nullptr;
-		return {};
-	}
-};
-
-template <typename U, typename A1, typename T = llvm_common_t<A1>>
-struct llvm_fpcast
-{
-	using type = U;
-
-	static constexpr auto opc =
-		llvm_value_t<T>::is_sint ? llvm::Instruction::SIToFP :
-		llvm_value_t<U>::is_sint ? llvm::Instruction::FPToSI :
-		llvm_value_t<T>::is_int ? llvm::Instruction::UIToFP :
-		llvm_value_t<U>::is_int ? llvm::Instruction::FPToUI :
-		llvm_value_t<T>::esize > llvm_value_t<U>::esize ? llvm::Instruction::FPTrunc :
-		llvm_value_t<T>::esize < llvm_value_t<U>::esize ? llvm::Instruction::FPExt : llvm::Instruction::BitCast;
-
-	llvm_expr_t<A1> a1;
-	static_assert(llvm_value_t<T>::is_float || llvm_value_t<U>::is_float, "llvm_fpcast<>: invalid type(s)");
-	static_assert(opc != llvm::Instruction::BitCast, "llvm_fpcast<>: possible cast to the same type");
-	static_assert(llvm_value_t<T>::is_vector == llvm_value_t<U>::is_vector, "llvm_fpcast<>: vector element mismatch");
-
-	static constexpr bool is_ok =
-		(llvm_value_t<T>::is_float || llvm_value_t<U>::is_float) && opc != llvm::Instruction::BitCast &&
-		llvm_value_t<T>::is_vector == llvm_value_t<U>::is_vector;
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		return ir->CreateCast(opc, a1.eval(ir), llvm_value_t<U>::get_type(ir->getContext()));
-	}
-
-	llvm_match_tuple<A1> match(llvm::Value*& value, llvm::Module* _m) const
-	{
-		llvm::Value* v1 = {};
-
-		if (auto i = llvm::dyn_cast_or_null<llvm::CastInst>(value); i && i->getOpcode() == opc)
-		{
-			v1 = i->getOperand(0);
-
-			if (llvm_value_t<U>::get_type(v1->getContext()) == i->getDestTy())
-			{
-				if (auto r1 = a1.match(v1, _m); v1)
+				if (auto r1 = a1.match(cv); cv)
 				{
 					return r1;
 				}
@@ -1941,7 +1774,7 @@ struct llvm_trunc
 		return ir->CreateTrunc(a1.eval(ir), llvm_value_t<U>::get_type(ir->getContext()));
 	}
 
-	llvm_match_tuple<A1> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 
@@ -1951,7 +1784,7 @@ struct llvm_trunc
 
 			if (llvm_value_t<U>::get_type(v1->getContext()) == i->getDestTy())
 			{
-				if (auto r1 = a1.match(v1, _m); v1)
+				if (auto r1 = a1.match(v1); v1)
 				{
 					return r1;
 				}
@@ -1986,7 +1819,7 @@ struct llvm_sext
 		return ir->CreateSExt(a1.eval(ir), llvm_value_t<U>::get_type(ir->getContext()));
 	}
 
-	llvm_match_tuple<A1> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 
@@ -1996,7 +1829,7 @@ struct llvm_sext
 
 			if (llvm_value_t<U>::get_type(v1->getContext()) == i->getDestTy())
 			{
-				if (auto r1 = a1.match(v1, _m); v1)
+				if (auto r1 = a1.match(v1); v1)
 				{
 					return r1;
 				}
@@ -2031,7 +1864,7 @@ struct llvm_zext
 		return ir->CreateZExt(a1.eval(ir), llvm_value_t<U>::get_type(ir->getContext()));
 	}
 
-	llvm_match_tuple<A1> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 
@@ -2041,7 +1874,7 @@ struct llvm_zext
 
 			if (llvm_value_t<U>::get_type(v1->getContext()) == i->getDestTy())
 			{
-				if (auto r1 = a1.match(v1, _m); v1)
+				if (auto r1 = a1.match(v1); v1)
 				{
 					return r1;
 				}
@@ -2074,7 +1907,7 @@ struct llvm_select
 		return ir->CreateSelect(cond.eval(ir), a2.eval(ir), a3.eval(ir));
 	}
 
-	llvm_match_tuple<A1, A2, A3> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2, A3> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -2086,11 +1919,11 @@ struct llvm_select
 			v2 = i->getOperand(1);
 			v3 = i->getOperand(2);
 
-			if (auto r1 = cond.match(v1, _m); v1)
+			if (auto r1 = cond.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
+				if (auto r2 = a2.match(v2); v2)
 				{
-					if (auto r3 = a3.match(v3, _m); v3)
+					if (auto r3 = a3.match(v3); v3)
 					{
 						return std::tuple_cat(r1, r2, r3);
 					}
@@ -2124,7 +1957,7 @@ struct llvm_min
 		return ir->CreateSelect(ir->CreateICmp(pred, v1, v2), v1, v2);
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -2138,9 +1971,9 @@ struct llvm_min
 			{
 				if (v1 == j->getOperand(0) && v2 == j->getOperand(1))
 				{
-					if (auto r1 = a1.match(v1, _m); v1)
+					if (auto r1 = a1.match(v1); v1)
 					{
-						if (auto r2 = a2.match(v2, _m); v2)
+						if (auto r2 = a2.match(v2); v2)
 						{
 							return std::tuple_cat(r1, r2);
 						}
@@ -2173,7 +2006,7 @@ struct llvm_max
 		return ir->CreateSelect(ir->CreateICmp(pred, v1, v2), v2, v1);
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -2187,9 +2020,9 @@ struct llvm_max
 			{
 				if (v1 == j->getOperand(0) && v2 == j->getOperand(1))
 				{
-					if (auto r1 = a1.match(v1, _m); v1)
+					if (auto r1 = a1.match(v1); v1)
 					{
-						if (auto r2 = a2.match(v2, _m); v2)
+						if (auto r2 = a2.match(v2); v2)
 						{
 							return std::tuple_cat(r1, r2);
 						}
@@ -2250,7 +2083,7 @@ struct llvm_add_sat
 		return ir->CreateCall(get_add_sat(ir), {v1, v2});
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -2260,21 +2093,9 @@ struct llvm_add_sat
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
-				{
-					return std::tuple_cat(r1, r2);
-				}
-			}
-
-			v1 = i->getOperand(0);
-			v2 = i->getOperand(1);
-
-			// Argument order does not matter here, try when swapped
-			if (auto r1 = a1.match(v2, _m); v2)
-			{
-				if (auto r2 = a2.match(v1, _m); v1)
+				if (auto r2 = a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -2332,7 +2153,7 @@ struct llvm_sub_sat
 		return ir->CreateCall(get_sub_sat(ir), {v1, v2});
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -2342,9 +2163,9 @@ struct llvm_sub_sat
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = a2.match(v2, _m); v2)
+				if (auto r2 = a2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -2378,7 +2199,7 @@ struct llvm_extract
 		return ir->CreateExtractElement(v1, v2);
 	}
 
-	llvm_match_tuple<A1, I2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, I2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -2388,9 +2209,9 @@ struct llvm_extract
 			v1 = i->getOperand(0);
 			v2 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = i2.match(v2, _m); v2)
+				if (auto r2 = i2.match(v2); v2)
 				{
 					return std::tuple_cat(r1, r2);
 				}
@@ -2427,7 +2248,7 @@ struct llvm_insert
 		return ir->CreateInsertElement(v1, v3, v2);
 	}
 
-	llvm_match_tuple<A1, I2, A3> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, I2, A3> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -2439,11 +2260,11 @@ struct llvm_insert
 			v2 = i->getOperand(2);
 			v3 = i->getOperand(1);
 
-			if (auto r1 = a1.match(v1, _m); v1)
+			if (auto r1 = a1.match(v1); v1)
 			{
-				if (auto r2 = i2.match(v2, _m); v2)
+				if (auto r2 = i2.match(v2); v2)
 				{
-					if (auto r3 = a3.match(v3, _m); v3)
+					if (auto r3 = a3.match(v3); v3)
 					{
 						return std::tuple_cat(r1, r2, r3);
 					}
@@ -2479,7 +2300,7 @@ struct llvm_splat
 		return ir->CreateVectorSplat(llvm_value_t<U>::is_vector, v1);
 	}
 
-	llvm_match_tuple<A1> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 
@@ -2495,7 +2316,7 @@ struct llvm_splat
 					{
 						v1 = j->getOperand(1);
 
-						if (auto r1 = a1.match(v1, _m); v1)
+						if (auto r1 = a1.match(v1); v1)
 						{
 							return r1;
 						}
@@ -2528,7 +2349,7 @@ struct llvm_zshuffle
 		return ir->CreateShuffleVector(v1, llvm::ConstantAggregateZero::get(v1->getType()), index_array);
 	}
 
-	llvm_match_tuple<A1> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 
@@ -2540,7 +2361,7 @@ struct llvm_zshuffle
 			{
 				if (i->getShuffleMask().equals(index_array))
 				{
-					if (auto r1 = a1.match(v1, _m); v1)
+					if (auto r1 = a1.match(v1); v1)
 					{
 						return r1;
 					}
@@ -2574,7 +2395,7 @@ struct llvm_shuffle2
 		return ir->CreateShuffleVector(v1, v2, index_array);
 	}
 
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
+	llvm_match_tuple<A1, A2> match(llvm::Value*& value) const
 	{
 		llvm::Value* v1 = {};
 		llvm::Value* v2 = {};
@@ -2588,9 +2409,9 @@ struct llvm_shuffle2
 			{
 				if (i->getShuffleMask().equals(index_array))
 				{
-					if (auto r1 = a1.match(v1, _m); v1)
+					if (auto r1 = a1.match(v1); v1)
 					{
-						if (auto r2 = a2.match(v2, _m); v2)
+						if (auto r2 = a2.match(v2); v2)
 						{
 							return std::tuple_cat(r1, r2);
 						}
@@ -2604,448 +2425,6 @@ struct llvm_shuffle2
 	}
 };
 
-template <typename A1, typename T = llvm_common_t<A1>>
-struct llvm_ctlz
-{
-	using type = T;
-
-	llvm_expr_t<A1> a1;
-
-	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint, "llvm_ctlz<>: invalid type");
-
-	static constexpr bool is_ok = llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint;
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		llvm::Value* v = a1.eval(ir);
-
-		if (llvm::isa<llvm::Constant>(v))
-		{
-			return llvm::ConstantFoldInstruction(ir->CreateIntrinsic(llvm::Intrinsic::ctlz, {v->getType()}, {v, ir->getFalse()}), llvm::DataLayout(""));
-		}
-
-		return ir->CreateIntrinsic(llvm::Intrinsic::ctlz, {v->getType()}, {v, ir->getFalse()});
-	}
-
-	llvm_match_tuple<A1> match(llvm::Value*& value, llvm::Module* _m) const
-	{
-		llvm::Value* v1 = {};
-
-		if (auto i = llvm::dyn_cast_or_null<llvm::CallInst>(value); i && i->getIntrinsicID() == llvm::Intrinsic::ctlz)
-		{
-			v1 = i->getOperand(0);
-
-			if (i->getOperand(2) == llvm::ConstantInt::getFalse(value->getContext()))
-			{
-				if (auto r1 = a1.match(v1, _m); v1)
-				{
-					return r1;
-				}
-			}
-		}
-
-		value = nullptr;
-		return {};
-	}
-};
-
-template <typename A1, typename T = llvm_common_t<A1>>
-struct llvm_ctpop
-{
-	using type = T;
-
-	llvm_expr_t<A1> a1;
-
-	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint, "llvm_ctpop<>: invalid type");
-
-	static constexpr bool is_ok = llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint;
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		llvm::Value* v = a1.eval(ir);
-
-		if (llvm::isa<llvm::Constant>(v))
-		{
-			return llvm::ConstantFoldInstruction(ir->CreateUnaryIntrinsic(llvm::Intrinsic::ctpop, v), llvm::DataLayout(""));
-		}
-
-		return ir->CreateUnaryIntrinsic(llvm::Intrinsic::ctpop, v);
-	}
-
-	llvm_match_tuple<A1> match(llvm::Value*& value, llvm::Module* _m) const
-	{
-		llvm::Value* v1 = {};
-
-		if (auto i = llvm::dyn_cast_or_null<llvm::CallInst>(value); i && i->getIntrinsicID() == llvm::Intrinsic::ctpop)
-		{
-			v1 = i->getOperand(0);
-
-			if (auto r1 = a1.match(v1, _m); v1)
-			{
-				return r1;
-			}
-		}
-
-		value = nullptr;
-		return {};
-	}
-};
-
-template <typename A1, typename A2, typename T = llvm_common_t<A1, A2>>
-struct llvm_avg
-{
-	using type = T;
-
-	llvm_expr_t<A1> a1;
-	llvm_expr_t<A2> a2;
-
-	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint, "llvm_avg<>: invalid type");
-
-	static constexpr bool is_ok = llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint;
-
-	static constexpr auto cast_op = llvm_value_t<T>::is_sint ? llvm::Instruction::SExt : llvm::Instruction::ZExt;
-
-	static llvm::Type* cast_dst_type(llvm::LLVMContext& context)
-	{
-		llvm::Type* cast_to = llvm::IntegerType::get(context, llvm_value_t<T>::esize * 2);
-		if constexpr (llvm_value_t<T>::is_vector != 0)
-			cast_to = llvm::VectorType::get(cast_to, llvm_value_t<T>::is_vector, false);
-
-		return cast_to;
-	}
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		const auto v1 = a1.eval(ir);
-		const auto v2 = a2.eval(ir);
-
-		const auto dty = cast_dst_type(ir->getContext());
-		const auto axt = ir->CreateCast(cast_op, v1, dty);
-		const auto bxt = ir->CreateCast(cast_op, v2, dty);
-		const auto cxt = llvm::ConstantInt::get(dty, 1, false);
-		const auto abc = ir->CreateAdd(ir->CreateAdd(axt, bxt), cxt);
-		return ir->CreateTrunc(ir->CreateLShr(abc, 1), llvm_value_t<T>::get_type(ir->getContext()));
-	}
-
-	llvm_match_tuple<A1, A2> match(llvm::Value*& value, llvm::Module* _m) const
-	{
-		llvm::Value* v1 = {};
-		llvm::Value* v2 = {};
-
-		const auto dty = cast_dst_type(value->getContext());
-
-		if (auto i = llvm::dyn_cast_or_null<llvm::CastInst>(value); i && i->getOpcode() == llvm::Instruction::Trunc && i->getSrcTy() == dty)
-		{
-			const auto cxt = llvm::ConstantInt::get(dty, 1, false);
-
-			if (auto j = llvm::dyn_cast_or_null<llvm::BinaryOperator>(i->getOperand(0)); j && j->getOpcode() == llvm::Instruction::LShr && j->getOperand(1) == cxt)
-			{
-				if (j = llvm::dyn_cast_or_null<llvm::BinaryOperator>(j->getOperand(0)); j && j->getOpcode() == llvm::Instruction::Add && j->getOperand(1) == cxt)
-				{
-					if (j = llvm::dyn_cast_or_null<llvm::BinaryOperator>(j->getOperand(0)); j && j->getOpcode() == llvm::Instruction::Add)
-					{
-						auto a = llvm::dyn_cast_or_null<llvm::CastInst>(j->getOperand(0));
-						auto b = llvm::dyn_cast_or_null<llvm::CastInst>(j->getOperand(1));
-
-						if (a && b && a->getOpcode() == cast_op && b->getOpcode() == cast_op)
-						{
-							v1 = a->getOperand(0);
-							v2 = b->getOperand(0);
-
-							if (auto r1 = a1.match(v1, _m); v1)
-							{
-								if (auto r2 = a2.match(v2, _m); v2)
-								{
-									return std::tuple_cat(r1, r2);
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		value = nullptr;
-		return {};
-	}
-};
-
-template <typename A1, typename T = llvm_common_t<A1>>
-struct llvm_fsqrt
-{
-	using type = T;
-
-	llvm_expr_t<A1> a1;
-
-	static_assert(llvm_value_t<T>::is_float, "llvm_fsqrt<>: invalid type");
-
-	static constexpr bool is_ok = llvm_value_t<T>::is_float;
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		llvm::Value* v = a1.eval(ir);
-
-		if (llvm::isa<llvm::Constant>(v))
-		{
-			if (auto c = llvm::ConstantFoldInstruction(ir->CreateUnaryIntrinsic(llvm::Intrinsic::sqrt, v), llvm::DataLayout("")))
-			{
-				// Will fail in some cases (such as negative constant)
-				return c;
-			}
-		}
-
-		return ir->CreateUnaryIntrinsic(llvm::Intrinsic::sqrt, v);
-	}
-
-	llvm_match_tuple<A1> match(llvm::Value*& value, llvm::Module* _m) const
-	{
-		llvm::Value* v1 = {};
-
-		if (auto i = llvm::dyn_cast_or_null<llvm::CallInst>(value); i && i->getIntrinsicID() == llvm::Intrinsic::sqrt)
-		{
-			v1 = i->getOperand(0);
-
-			if (auto r1 = a1.match(v1, _m); v1)
-			{
-				return r1;
-			}
-		}
-
-		value = nullptr;
-		return {};
-	}
-};
-
-template <typename A1, typename T = llvm_common_t<A1>>
-struct llvm_fabs
-{
-	using type = T;
-
-	llvm_expr_t<A1> a1;
-
-	static_assert(llvm_value_t<T>::is_float, "llvm_fabs<>: invalid type");
-
-	static constexpr bool is_ok = llvm_value_t<T>::is_float;
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		llvm::Value* v = a1.eval(ir);
-
-		if (llvm::isa<llvm::Constant>(v))
-		{
-			return llvm::ConstantFoldInstruction(ir->CreateUnaryIntrinsic(llvm::Intrinsic::fabs, v), llvm::DataLayout(""));
-		}
-
-		return ir->CreateUnaryIntrinsic(llvm::Intrinsic::fabs, v);
-	}
-
-	llvm_match_tuple<A1> match(llvm::Value*& value, llvm::Module* _m) const
-	{
-		llvm::Value* v1 = {};
-
-		if (auto i = llvm::dyn_cast_or_null<llvm::CallInst>(value); i && i->getIntrinsicID() == llvm::Intrinsic::fabs)
-		{
-			v1 = i->getOperand(0);
-
-			if (auto r1 = a1.match(v1, _m); v1)
-			{
-				return r1;
-			}
-		}
-
-		value = nullptr;
-		return {};
-	}
-};
-
-template <typename A1, typename A2, typename A3, typename T = llvm_common_t<A1, A2, A3>>
-struct llvm_fmuladd
-{
-	using type = T;
-
-	llvm_expr_t<A1> a1;
-	llvm_expr_t<A2> a2;
-	llvm_expr_t<A3> a3;
-	bool strict_fma;
-
-	static_assert(llvm_value_t<T>::is_float, "llvm_fmuladd<>: invalid type");
-
-	static constexpr bool is_ok = llvm_value_t<T>::is_float;
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		llvm::Value* v1 = a1.eval(ir);
-		llvm::Value* v2 = a2.eval(ir);
-		llvm::Value* v3 = a3.eval(ir);
-
-		if (llvm::isa<llvm::Constant>(v1) && llvm::isa<llvm::Constant>(v2) && llvm::isa<llvm::Constant>(v3))
-		{
-			return llvm::ConstantFoldInstruction(ir->CreateIntrinsic(llvm::Intrinsic::fma, {v1->getType()}, {v1, v2, v3}), llvm::DataLayout(""));
-		}
-
-		return ir->CreateIntrinsic(strict_fma ? llvm::Intrinsic::fma : llvm::Intrinsic::fmuladd, {v1->getType()}, {v1, v2, v3});
-	}
-
-	llvm_match_tuple<A1, A2, A3> match(llvm::Value*& value, llvm::Module* _m) const
-	{
-		llvm::Value* v1 = {};
-		llvm::Value* v2 = {};
-		llvm::Value* v3 = {};
-
-		if (auto i = llvm::dyn_cast_or_null<llvm::CallInst>(value); i && i->getIntrinsicID() == (strict_fma ? llvm::Intrinsic::fma : llvm::Intrinsic::fmuladd))
-		{
-			v1 = i->getOperand(0);
-			v2 = i->getOperand(1);
-			v3 = i->getOperand(2);
-
-			if (auto r1 = a1.match(v1, _m); v1)
-			{
-				if (auto r2 = a2.match(v2, _m); v2)
-				{
-					if (auto r3 = a3.match(v3, _m); v3)
-					{
-						return std::tuple_cat(r1, r2, r3);
-					}
-				}
-			}
-
-			v1 = i->getOperand(0);
-			v2 = i->getOperand(1);
-			v3 = i->getOperand(2);
-
-			// With multiplication args swapped
-			if (auto r1 = a1.match(v2, _m); v2)
-			{
-				if (auto r2 = a2.match(v1, _m); v1)
-				{
-					if (auto r3 = a3.match(v3, _m); v3)
-					{
-						return std::tuple_cat(r1, r2, r3);
-					}
-				}
-			}
-		}
-
-		value = nullptr;
-		return {};
-	}
-};
-
-template <typename RT, typename... A>
-struct llvm_calli
-{
-	using type = RT;
-
-	llvm::StringRef iname;
-
-	std::tuple<llvm_expr_t<A>...> a;
-
-	std::array<usz, std::max<usz>(sizeof...(A), 1)> order_equality_hint = []()
-	{
-		std::array<usz, std::max<usz>(sizeof...(A), 1)> r{};
-
-		for (usz i = 0; i < r.size(); i++)
-		{
-			r[i] = i;
-		}
-
-		return r;
-	}();
-
-	llvm::Value*(*c)(llvm::Value**, llvm::IRBuilder<>*){};
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		return eval(ir, std::make_index_sequence<sizeof...(A)>());
-	}
-
-	template <usz... I>
-	llvm::Value* eval(llvm::IRBuilder<>* ir, std::index_sequence<I...>) const
-	{
-		llvm::Value* v[std::max<usz>(sizeof...(A), 1)]{std::get<I>(a).eval(ir)...};
-
-		if (c && (llvm::isa<llvm::Constant>(v[I]) || ...))
-		{
-			if (llvm::Value* r = c(v, ir))
-			{
-				return r;
-			}
-		}
-
-		const auto _rty = llvm_value_t<RT>::get_type(ir->getContext());
-		const auto type = llvm::FunctionType::get(_rty, {v[I]->getType()...}, false);
-		const auto func = llvm::cast<llvm::Function>(ir->GetInsertBlock()->getParent()->getParent()->getOrInsertFunction(iname, type).getCallee());
-		return ir->CreateCall(func, v);
-	}
-
-	template <typename F>
-	llvm_calli& if_const(F func)
-	{
-		c = +func;
-		return *this;
-	}
-
-	template <typename... Args> requires (sizeof...(Args) == sizeof...(A))
-	llvm_calli& set_order_equality_hint(Args... args)
-	{
-		order_equality_hint = {static_cast<usz>(args)...};
-		return *this;
-	}
-
-	llvm_match_tuple<A...> match(llvm::Value*& value, llvm::Module* _m) const
-	{
-		return match(value, _m, std::make_index_sequence<sizeof...(A)>());
-	}
-
-	template <usz... I>
-	llvm_match_tuple<A...> match(llvm::Value*& value, llvm::Module* _m, std::index_sequence<I...>) const
-	{
-		llvm::Value* v[sizeof...(A)]{};
-
-		if (auto i = llvm::dyn_cast_or_null<llvm::CallInst>(value))
-		{
-			if (auto cf = i->getCalledFunction(); cf && cf->getName() == iname)
-			{
-				((v[I] = i->getOperand(I)), ...);
-
-				std::tuple<decltype(std::get<I>(a).match(v[I], _m))...> r;
-
-				if (((std::get<I>(r) = std::get<I>(a).match(v[I], _m), v[I]) && ...))
-				{
-					return std::tuple_cat(std::get<I>(r)...);
-				}
-
-				if constexpr (sizeof...(A) >= 2)
-				{
-					if (order_equality_hint[0] == order_equality_hint[1])
-					{
-						// Test if it works with the first pair swapped
-						((v[I <= 1 ? I ^ 1 : I] = i->getOperand(I)), ...);
-
-						if (((std::get<I>(r) = std::get<I>(a).match(v[I], _m), v[I]) && ...))
-						{
-							return std::tuple_cat(std::get<I>(r)...);
-						}
-					}
-				}
-			}
-		}
-
-		value = nullptr;
-		return {};
-	}
-};
-
-class translator_pass
-{
-public:
-	translator_pass() = default;
-	virtual ~translator_pass() {}
-
-	virtual void run(llvm::IRBuilder<>* irb, llvm::Function& func) = 0;
-	virtual void reset() = 0;
-};
-
 class cpu_translator
 {
 protected:
@@ -3069,42 +2448,21 @@ protected:
 	// Allow FMA
 	bool m_use_fma = false;
 
-	// Allow AVX
-	bool m_use_avx = false;
-
 	// Allow skylake-x tier AVX-512
 	bool m_use_avx512 = false;
 
 	// Allow VNNI
 	bool m_use_vnni = false;
 
-	// Allow GFNI
-	bool m_use_gfni = false;
-
 	// Allow Icelake tier AVX-512
 	bool m_use_avx512_icl = false;
 
 	// IR builder
 	llvm::IRBuilder<>* m_ir = nullptr;
 
-	// CUstomized transformation passes. Technically the intrinsics replacement belongs here.
-	std::vector<std::unique_ptr<translator_pass>> m_transform_passes;
-
 	void initialize(llvm::LLVMContext& context, llvm::ExecutionEngine& engine);
 
-	// Run intrinsics replacement pass
-	void replace_intrinsics(llvm::Function&);
-
 public:
-	// Register a transformation pass to be run before final compilation by llvm
-	void register_transform_pass(std::unique_ptr<translator_pass>& pass);
-
-	// Delete all transform passes
-	void clear_transforms();
-
-	// Reset internal state of all passes to evict caches and such. Use when resetting a JIT.
-	void reset_transforms();
-
 	// Convert a C++ type to an LLVM type (TODO: remove)
 	template <typename T>
 	llvm::Type* GetType()
@@ -3149,11 +2507,11 @@ public:
 	}
 
 	// Call external function: provide name and function pointer
-	template <typename RetT = void, typename RT, typename... FArgs, LLVMValue... Args>
+	template <typename RT, typename... FArgs, typename... Args>
 	llvm::CallInst* call(std::string_view lame, RT(*_func)(FArgs...), Args... args)
 	{
 		static_assert(sizeof...(FArgs) == sizeof...(Args), "spu_llvm_recompiler::call(): unexpected arg number");
-		const auto type = llvm::FunctionType::get(get_type<std::conditional_t<std::is_void_v<RetT>, RT, RetT>>(), {args->getType()...}, false);
+		const auto type = llvm::FunctionType::get(get_type<RT>(), {args->getType()...}, false);
 		const auto func = llvm::cast<llvm::Function>(m_module->getOrInsertFunction({lame.data(), lame.size()}, type).getCallee());
 #ifdef _WIN32
 		func->setCallingConv(llvm::CallingConv::Win64);
@@ -3161,29 +2519,12 @@ public:
 		m_engine->updateGlobalMapping({lame.data(), lame.size()}, reinterpret_cast<uptr>(_func));
 
 		const auto inst = m_ir->CreateCall(func, {args...});
-		inst->setTailCallKind(llvm::CallInst::TCK_NoTail);
 #ifdef _WIN32
 		inst->setCallingConv(llvm::CallingConv::Win64);
 #endif
 		return inst;
 	}
 
-	template <typename RT, typename... FArgs, DSLValue... Args> requires (sizeof...(Args) != 0)
-	auto call(std::string_view name, RT(*_func)(FArgs...), Args&&... args)
-	{
-		llvm_value_t<RT> r;
-		r.value = call(name, _func, std::forward<Args>(args).eval(m_ir)...);
-		return r;
-	}
-
-	template <typename RT, DSLValue... Args>
-	auto callf(llvm::Function* func, Args&&... args)
-	{
-		llvm_value_t<RT> r;
-		r.value = m_ir->CreateCall(func, {std::forward<Args>(args).eval(m_ir)...});
-		return r;
-	}
-
 	// Bitcast with immediate constant folding
 	llvm::Value* bitcast(llvm::Value* val, llvm::Type* type) const;
 
@@ -3199,20 +2540,11 @@ public:
 		return {};
 	}
 
-	template <typename T>
-		requires requires { typename llvm_common_t<T>; }
-	static auto match_expr(llvm::Value* v, llvm::Module* _m, T&& expr)
-	{
-		auto r = expr.match(v, _m);
-		return std::tuple_cat(std::make_tuple(v != nullptr), r);
-	}
-
-	template <typename T, typename U>
-		requires requires { typename llvm_common_t<T, U>; }
-	auto match_expr(T&& arg, U&& expr) -> decltype(std::tuple_cat(std::make_tuple(false), expr.match(std::declval<llvm::Value*&>(), nullptr)))
+	template <typename T, typename U, typename = llvm_common_t<T, U>>
+	auto match_expr(T&& arg, U&& expr) -> decltype(std::tuple_cat(std::make_tuple(false), expr.match(std::declval<llvm::Value*&>())))
 	{
 		auto v = arg.eval(m_ir);
-		auto r = expr.match(v, m_module);
+		auto r = expr.match(v);
 		return std::tuple_cat(std::make_tuple(v != nullptr), r);
 	}
 
@@ -3223,369 +2555,175 @@ public:
 		return (pred(llvm_placeholder_t<Types>{}) || ...);
 	}
 
-	template <typename T, typename F>
-	struct expr_t
-	{
-		using type = llvm_common_t<T>;
-
-		T a;
-		F match;
-
-		llvm::Value* eval(llvm::IRBuilder<>* ir) const
-		{
-			return a.eval(ir);
-		}
-	};
-
-	template <typename T, typename F>
-	static auto expr(T&& expr, F matcher)
-	{
-		return expr_t<T, F>{std::forward<T>(expr), std::move(matcher)};
-	}
-
-	template <typename T>
-		requires is_llvm_cmp<std::decay_t<T>>::value
+	template <typename T, typename = std::enable_if_t<is_llvm_cmp<std::decay_t<T>>::value>>
 	static auto fcmp_ord(T&& cmp_expr)
 	{
 		return llvm_ord{std::forward<T>(cmp_expr)};
 	}
 
-	template <typename T>
-		requires is_llvm_cmp<std::decay_t<T>>::value
+	template <typename T, typename = std::enable_if_t<is_llvm_cmp<std::decay_t<T>>::value>>
 	static auto fcmp_uno(T&& cmp_expr)
 	{
 		return llvm_uno{std::forward<T>(cmp_expr)};
 	}
 
-	template <typename U, typename T>
-		requires llvm_noncast<U, T>::is_ok
+	template <typename U, typename T, typename = std::enable_if_t<llvm_noncast<U, T>::is_ok>>
 	static auto noncast(T&& expr)
 	{
 		return llvm_noncast<U, T>{std::forward<T>(expr)};
 	}
 
-	template <typename U, typename T>
-		requires llvm_bitcast<U, T>::is_ok
-	static auto bitcast(T&& expr)
+	template <typename U, typename T, typename = std::enable_if_t<llvm_bitcast<U, T>::is_ok>>
+	auto bitcast(T&& expr)
 	{
-		return llvm_bitcast<U, T>{std::forward<T>(expr)};
+		return llvm_bitcast<U, T>{std::forward<T>(expr), m_module};
 	}
 
-	template <typename U, typename T>
-		requires llvm_fpcast<U, T>::is_ok
-	static auto fpcast(T&& expr)
-	{
-		return llvm_fpcast<U, T>{std::forward<T>(expr)};
-	}
-
-	template <typename U, typename T>
-		requires llvm_trunc<U, T>::is_ok
+	template <typename U, typename T, typename = std::enable_if_t<llvm_trunc<U, T>::is_ok>>
 	static auto trunc(T&& expr)
 	{
 		return llvm_trunc<U, T>{std::forward<T>(expr)};
 	}
 
-	template <typename U, typename T>
-		requires llvm_sext<U, T>::is_ok
+	template <typename U, typename T, typename = std::enable_if_t<llvm_sext<U, T>::is_ok>>
 	static auto sext(T&& expr)
 	{
 		return llvm_sext<U, T>{std::forward<T>(expr)};
 	}
 
-	template <typename U, typename T>
-		requires llvm_zext<U, T>::is_ok
+	template <typename U, typename T, typename = std::enable_if_t<llvm_zext<U, T>::is_ok>>
 	static auto zext(T&& expr)
 	{
 		return llvm_zext<U, T>{std::forward<T>(expr)};
 	}
 
-	template <typename T, typename U, typename V>
-		requires llvm_select<T, U, V>::is_ok
+	template <typename T, typename U, typename V, typename = std::enable_if_t<llvm_select<T, U, V>::is_ok>>
 	static auto select(T&& c, U&& a, V&& b)
 	{
 		return llvm_select<T, U, V>{std::forward<T>(c), std::forward<U>(a), std::forward<V>(b)};
 	}
 
-	template <typename T, typename U>
-		requires llvm_min<T, U>::is_ok
+	template <typename T, typename U, typename = std::enable_if_t<llvm_min<T, U>::is_ok>>
 	static auto min(T&& a, U&& b)
 	{
 		return llvm_min<T, U>{std::forward<T>(a), std::forward<U>(b)};
 	}
 
-	template <typename T, typename U>
-		requires llvm_min<T, U>::is_ok
+	template <typename T, typename U, typename = std::enable_if_t<llvm_min<T, U>::is_ok>>
 	static auto max(T&& a, U&& b)
 	{
 		return llvm_max<T, U>{std::forward<T>(a), std::forward<U>(b)};
 	}
 
-	template <typename T, typename U, typename V>
-		requires llvm_fshl<T, U, V>::is_ok
+	template <typename T, typename U, typename V, typename = std::enable_if_t<llvm_fshl<T, U, V>::is_ok>>
 	static auto fshl(T&& a, U&& b, V&& c)
 	{
 		return llvm_fshl<T, U, V>{std::forward<T>(a), std::forward<U>(b), std::forward<V>(c)};
 	}
 
-	template <typename T, typename U, typename V>
-		requires llvm_fshr<T, U, V>::is_ok
+	template <typename T, typename U, typename V, typename = std::enable_if_t<llvm_fshr<T, U, V>::is_ok>>
 	static auto fshr(T&& a, U&& b, V&& c)
 	{
 		return llvm_fshr<T, U, V>{std::forward<T>(a), std::forward<U>(b), std::forward<V>(c)};
 	}
 
-	template <typename T, typename U>
-		requires llvm_rol<T, U>::is_ok
+	template <typename T, typename U, typename = std::enable_if_t<llvm_rol<T, U>::is_ok>>
 	static auto rol(T&& a, U&& b)
 	{
 		return llvm_rol<T, U>{std::forward<T>(a), std::forward<U>(b)};
 	}
 
-	template <typename T, typename U>
-		requires llvm_add_sat<T, U>::is_ok
+	template <typename T, typename U, typename = std::enable_if_t<llvm_add_sat<T, U>::is_ok>>
 	static auto add_sat(T&& a, U&& b)
 	{
 		return llvm_add_sat<T, U>{std::forward<T>(a), std::forward<U>(b)};
 	}
 
-	template <typename T, typename U>
-		requires llvm_sub_sat<T, U>::is_ok
+	template <typename T, typename U, typename = std::enable_if_t<llvm_sub_sat<T, U>::is_ok>>
 	static auto sub_sat(T&& a, U&& b)
 	{
 		return llvm_sub_sat<T, U>{std::forward<T>(a), std::forward<U>(b)};
 	}
 
-	template <typename T, typename U>
-		requires llvm_extract<T, U>::is_ok
+	template <typename T, typename U, typename = std::enable_if_t<llvm_extract<T, U>::is_ok>>
 	static auto extract(T&& v, U&& i)
 	{
 		return llvm_extract<T, U>{std::forward<T>(v), std::forward<U>(i)};
 	}
 
-	template <typename T>
-		requires llvm_extract<T, llvm_const_int<u32>>::is_ok
+	template <typename T, typename = std::enable_if_t<llvm_extract<T, llvm_const_int<u32>>::is_ok>>
 	static auto extract(T&& v, u32 i)
 	{
 		return llvm_extract<T, llvm_const_int<u32>>{std::forward<T>(v), llvm_const_int<u32>{i}};
 	}
 
-	template <typename T, typename U, typename V>
-		requires llvm_insert<T, U, V>::is_ok
+	template <typename T, typename U, typename V, typename = std::enable_if_t<llvm_insert<T, U, V>::is_ok>>
 	static auto insert(T&& v, U&& i, V&& e)
 	{
 		return llvm_insert<T, U, V>{std::forward<T>(v), std::forward<U>(i), std::forward<V>(e)};
 	}
 
-	template <typename T, typename V>
-		requires llvm_insert<T, llvm_const_int<u32>, V>::is_ok
+	template <typename T, typename V, typename = std::enable_if_t<llvm_insert<T, llvm_const_int<u32>, V>::is_ok>>
 	static auto insert(T&& v, u32 i, V&& e)
 	{
 		return llvm_insert<T, llvm_const_int<u32>, V>{std::forward<T>(v), llvm_const_int<u32>{i}, std::forward<V>(e)};
 	}
 
-	template <typename T>
-		requires llvm_const_int<T>::is_ok
+	template <typename T, typename = std::enable_if_t<llvm_const_int<T>::is_ok>>
 	static auto splat(u64 c)
 	{
 		return llvm_const_int<T>{c};
 	}
 
-	template <typename T>
-		requires llvm_const_float<T>::is_ok
+	template <typename T, typename = std::enable_if_t<llvm_const_float<T>::is_ok>>
 	static auto fsplat(f64 c)
 	{
 		return llvm_const_float<T>{c};
 	}
 
-	template <typename T, typename U>
-		requires llvm_splat<T, U>::is_ok
+	template <typename T, typename U, typename = std::enable_if_t<llvm_splat<T, U>::is_ok>>
 	static auto vsplat(U&& v)
 	{
 		return llvm_splat<T, U>{std::forward<U>(v)};
 	}
 
-	template <typename T, typename... Args>
-		requires llvm_const_vector<sizeof...(Args), T>::is_ok
+	template <typename T, typename... Args, typename = std::enable_if_t<llvm_const_vector<sizeof...(Args), T>::is_ok>>
 	static auto build(Args... args)
 	{
 		return llvm_const_vector<sizeof...(Args), T>{static_cast<std::remove_extent_t<T>>(args)...};
 	}
 
-	template <typename T, typename... Args>
-		requires llvm_zshuffle<sizeof...(Args), T>::is_ok
+	template <typename T, typename... Args, typename = std::enable_if_t<llvm_zshuffle<sizeof...(Args), T>::is_ok>>
 	static auto zshuffle(T&& v, Args... indices)
 	{
 		return llvm_zshuffle<sizeof...(Args), T>{std::forward<T>(v), {static_cast<int>(indices)...}};
 	}
 
-	template <typename T, typename U, typename... Args>
-		requires llvm_shuffle2<sizeof...(Args), T, U>::is_ok
+	template <typename T, typename U, typename... Args, typename = std::enable_if_t<llvm_shuffle2<sizeof...(Args), T, U>::is_ok>>
 	static auto shuffle2(T&& v1, U&& v2, Args... indices)
 	{
 		return llvm_shuffle2<sizeof...(Args), T, U>{std::forward<T>(v1), std::forward<U>(v2), {static_cast<int>(indices)...}};
 	}
 
-	template <typename T>
-		requires llvm_ctlz<T>::is_ok
-	static auto ctlz(T&& a)
-	{
-		return llvm_ctlz<T>{std::forward<T>(a)};
-	}
-
-	template <typename T>
-		requires llvm_ctpop<T>::is_ok
-	static auto ctpop(T&& a)
-	{
-		return llvm_ctpop<T>{std::forward<T>(a)};
-	}
-
 	// Average: (a + b + 1) >> 1
-	template <typename T, typename U>
-		requires llvm_avg<T, U>::is_ok
-	static auto avg(T&& a, U&& b)
-	{
-		return llvm_avg<T, U>{std::forward<T>(a), std::forward<U>(b)};
-	}
-
 	template <typename T>
-		requires llvm_fsqrt<T>::is_ok
-	static auto fsqrt(T&& a)
+	inline auto avg(T a, T b)
 	{
-		return llvm_fsqrt<T>{std::forward<T>(a)};
-	}
+		//return (a >> 1) + (b >> 1) + ((a | b) & 1);
 
-	template <typename T>
-		requires llvm_fabs<T>::is_ok
-	static auto fabs(T&& a)
-	{
-		return llvm_fabs<T>{std::forward<T>(a)};
-	}
+		value_t<typename T::type> result;
+		static_assert(result.is_sint || result.is_uint);
+		const auto cast_op = result.is_sint ? llvm::Instruction::SExt : llvm::Instruction::ZExt;
+		llvm::Type* cast_to = m_ir->getIntNTy(result.esize * 2);
+		if constexpr (result.is_vector != 0)
+			cast_to = llvm::VectorType::get(cast_to, result.is_vector, false);
 
-	// Optionally opportunistic hardware FMA, can be used if results are identical for all possible input values
-	template <typename T, typename U, typename V>
-		requires llvm_fmuladd<T, U, V>::is_ok
-	static auto fmuladd(T&& a, U&& b, V&& c, bool strict_fma)
-	{
-		return llvm_fmuladd<T, U, V>{std::forward<T>(a), std::forward<U>(b), std::forward<V>(c), strict_fma};
-	}
-
-	// Opportunistic hardware FMA, can be used if results are identical for all possible input values
-	template <typename T, typename U, typename V>
-		requires llvm_fmuladd<T, U, V>::is_ok
-	auto fmuladd(T&& a, U&& b, V&& c)
-	{
-		return llvm_fmuladd<T, U, V>{std::forward<T>(a), std::forward<U>(b), std::forward<V>(c), m_use_fma};
-	}
-
-	// Absolute difference
-	template <typename T, typename U, typename CT = llvm_common_t<T, U>>
-	static auto absd(T&& a, U&& b)
-	{
-		return expr(max(a, b) - min(a, b), [](llvm::Value*& value, llvm::Module* _m) -> llvm_match_tuple<T, U>
-		{
-			static const auto M = match<CT>();
-
-			if (auto [ok, _max, _min] = match_expr(value, _m, M - M); ok)
-			{
-				if (auto [ok1, a, b] = match_expr(_max.value, _m, max(M, M)); ok1 && !a.eq(b))
-				{
-					if (auto [ok2, c, d] = match_expr(_min.value, _m, min(M, M)); ok2 && !c.eq(d))
-					{
-						if ((a.eq(c) && b.eq(d)) || (a.eq(d) && b.eq(c)))
-						{
-							if (auto r1 = llvm_expr_t<T>{}.match(a.value, _m); a.eq())
-							{
-								if (auto r2 = llvm_expr_t<U>{}.match(b.value, _m); b.eq())
-								{
-									return std::tuple_cat(r1, r2);
-								}
-							}
-						}
-					}
-				}
-			}
-
-			value = nullptr;
-			return {};
-		});
-	}
-
-	// Infinite-precision shift left
-	template <typename T, typename U, typename CT = llvm_common_t<T, U>>
-	auto inf_shl(T&& a, U&& b)
-	{
-		static constexpr u32 esz = llvm_value_t<CT>::esize;
-
-		return expr(select(b < esz, a << b, splat<CT>(0)), [](llvm::Value*& value, llvm::Module* _m) -> llvm_match_tuple<T, U>
-		{
-			static const auto M = match<CT>();
-
-			if (auto [ok, b, a, b2] = match_expr(value, _m, select(M < esz, M << M, splat<CT>(0))); ok && b.eq(b2))
-			{
-				if (auto r1 = llvm_expr_t<T>{}.match(a.value, _m); a.eq())
-				{
-					if (auto r2 = llvm_expr_t<U>{}.match(b.value, _m); b.eq())
-					{
-						return std::tuple_cat(r1, r2);
-					}
-				}
-			}
-
-			value = nullptr;
-			return {};
-		});
-	}
-
-	// Infinite-precision logical shift right (unsigned)
-	template <typename T, typename U, typename CT = llvm_common_t<T, U>>
-	auto inf_lshr(T&& a, U&& b)
-	{
-		static constexpr u32 esz = llvm_value_t<CT>::esize;
-
-		return expr(select(b < esz, a >> b, splat<CT>(0)), [](llvm::Value*& value, llvm::Module* _m) -> llvm_match_tuple<T, U>
-		{
-			static const auto M = match<CT>();
-
-			if (auto [ok, b, a, b2] = match_expr(value, _m, select(M < esz, M >> M, splat<CT>(0))); ok && b.eq(b2))
-			{
-				if (auto r1 = llvm_expr_t<T>{}.match(a.value, _m); a.eq())
-				{
-					if (auto r2 = llvm_expr_t<U>{}.match(b.value, _m); b.eq())
-					{
-						return std::tuple_cat(r1, r2);
-					}
-				}
-			}
-
-			value = nullptr;
-			return {};
-		});
-	}
-
-	// Infinite-precision arithmetic shift right (signed)
-	template <typename T, typename U, typename CT = llvm_common_t<T, U>>
-	auto inf_ashr(T&& a, U&& b)
-	{
-		static constexpr u32 esz = llvm_value_t<CT>::esize;
-
-		return expr(a >> select(b > (esz - 1), splat<CT>(esz - 1), b), [](llvm::Value*& value, llvm::Module* _m) -> llvm_match_tuple<T, U>
-		{
-			static const auto M = match<CT>();
-
-			if (auto [ok, a, b, b2] = match_expr(value, _m, M >> select(M > (esz - 1), splat<CT>(esz - 1), M)); ok && b.eq(b2))
-			{
-				if (auto r1 = llvm_expr_t<T>{}.match(a.value, _m); a.eq())
-				{
-					if (auto r2 = llvm_expr_t<U>{}.match(b.value, _m); b.eq())
-					{
-						return std::tuple_cat(r1, r2);
-					}
-				}
-			}
-
-			value = nullptr;
-			return {};
-		});
+		const auto axt = m_ir->CreateCast(cast_op, a.eval(m_ir), cast_to);
+		const auto bxt = m_ir->CreateCast(cast_op, b.eval(m_ir), cast_to);
+		const auto cxt = llvm::ConstantInt::get(cast_to, 1, false);
+		const auto abc = m_ir->CreateAdd(m_ir->CreateAdd(axt, bxt), cxt);
+		result.value = m_ir->CreateTrunc(m_ir->CreateLShr(abc, 1), result.get_type(m_context));
+		return result;
 	}
 
 	template <typename... Types>
@@ -3595,6 +2733,89 @@ public:
 		return llvm::Intrinsic::getDeclaration(_module, id, {get_type<Types>()...});
 	}
 
+	template <typename T>
+	auto ctlz(T a)
+	{
+		value_t<typename T::type> result;
+		result.value = m_ir->CreateCall(get_intrinsic<typename T::type>(llvm::Intrinsic::ctlz), {a.eval(m_ir), m_ir->getFalse()});
+		return result;
+	}
+
+	template <typename T>
+	auto ctpop(T a)
+	{
+		value_t<typename T::type> result;
+		result.value = m_ir->CreateCall(get_intrinsic<typename T::type>(llvm::Intrinsic::ctpop), {a.eval(m_ir)});
+		return result;
+	}
+
+	template <typename T>
+	auto sqrt(T a)
+	{
+		value_t<typename T::type> result;
+		result.value = m_ir->CreateCall(get_intrinsic<typename T::type>(llvm::Intrinsic::sqrt), {a.eval(m_ir)});
+		return result;
+	}
+
+	template <typename T>
+	auto fabs(T a)
+	{
+		value_t<typename T::type> result;
+		result.value = m_ir->CreateCall(get_intrinsic<typename T::type>(llvm::Intrinsic::fabs), {a.eval(m_ir)});
+		return result;
+	}
+
+	// Opportunistic hardware FMA, can be used if results are identical for all possible input values
+	template <typename T>
+	auto fmuladd(T a, T b, T c)
+	{
+		value_t<typename T::type> result;
+		const auto av = a.eval(m_ir);
+		const auto bv = b.eval(m_ir);
+		const auto cv = c.eval(m_ir);
+		result.value = m_ir->CreateCall(get_intrinsic<typename T::type>(llvm::Intrinsic::fmuladd), {av, bv, cv});
+		return result;
+	}
+
+	// TODO: Support doubles
+	template <typename T, typename = std::enable_if_t<llvm_value_t<typename T::type>::esize == 32u && llvm_value_t<typename T::type>::is_float>>
+	auto fre(T a)
+	{
+		value_t<typename T::type> result;
+		const auto av = a.eval(m_ir);
+		result.value  = m_ir->CreateCall(m_module->getOrInsertFunction("llvm.x86.sse.rcp.ps", av->getType(), av->getType()), {av});
+		return result;
+	}
+
+	template <typename T, typename = std::enable_if_t<llvm_value_t<typename T::type>::esize == 32u && llvm_value_t<typename T::type>::is_float>>
+	auto frsqe(T a)
+	{
+		value_t<typename T::type> result;
+		const auto av = a.eval(m_ir);
+		result.value  = m_ir->CreateCall(m_module->getOrInsertFunction("llvm.x86.sse.rsqrt.ps", av->getType(), av->getType()), {av});
+		return result;
+	}
+
+	template <typename T, typename U, typename = std::enable_if_t<std::is_same_v<typename T::type, typename U::type> && llvm_value_t<typename T::type>::esize == 32u && llvm_value_t<typename T::type>::is_float>>
+	auto fmax(T a, U b)
+	{
+		value_t<typename T::type> result;
+		const auto av = a.eval(m_ir);
+		const auto bv = b.eval(m_ir);
+		result.value  = m_ir->CreateCall(m_module->getOrInsertFunction("llvm.x86.sse.max.ps", av->getType(), av->getType(), av->getType()), {av, bv});
+		return result;
+	}
+
+	template <typename T, typename U, typename = std::enable_if_t<std::is_same_v<typename T::type, typename U::type> && llvm_value_t<typename T::type>::esize == 32u && llvm_value_t<typename T::type>::is_float>>
+	auto fmin(T a, U b)
+	{
+		value_t<typename T::type> result;
+		const auto av = a.eval(m_ir);
+		const auto bv = b.eval(m_ir);
+		result.value  = m_ir->CreateCall(m_module->getOrInsertFunction("llvm.x86.sse.min.ps", av->getType(), av->getType(), av->getType()), {av, bv});
+		return result;
+	}
+
 	template <typename T1, typename T2>
 	value_t<u8[16]> gf2p8affineqb(T1 a, T2 b, u8 c)
 	{
@@ -3649,7 +2870,7 @@ public:
 
 			if (cv || llvm::isa<llvm::ConstantAggregateZero>(c))
 			{
-				result.value = llvm::ConstantDataVector::get(m_context, llvm::ArrayRef(reinterpret_cast<const u8*>(&mask), 16));
+				result.value = llvm::ConstantDataVector::get(m_context, llvm::makeArrayRef(reinterpret_cast<const u8*>(&mask), 16));
 				result.value = m_ir->CreateZExt(result.value, get_type<u32[16]>());
 				result.value = m_ir->CreateShuffleVector(data0, zeros, result.value);
 				return result;
@@ -3663,11 +2884,6 @@ public:
 	template <typename T1, typename T2, typename T3>
 	value_t<u8[16]> vperm2b(T1 a, T2 b, T3 c)
 	{
-		if (!utils::has_fast_vperm2b())
-		{
-			return vperm2b256to128(a, b, c);
-		}
-
 		value_t<u8[16]> result;
 
 		const auto data0 = a.eval(m_ir);
@@ -3692,7 +2908,7 @@ public:
 
 			if (cv || llvm::isa<llvm::ConstantAggregateZero>(c))
 			{
-				result.value = llvm::ConstantDataVector::get(m_context, llvm::ArrayRef(reinterpret_cast<const u8*>(&mask), 16));
+				result.value = llvm::ConstantDataVector::get(m_context, llvm::makeArrayRef(reinterpret_cast<const u8*>(&mask), 16));
 				result.value = m_ir->CreateZExt(result.value, get_type<u32[16]>());
 				result.value = m_ir->CreateShuffleVector(data0, data1, result.value);
 				return result;
@@ -3703,20 +2919,18 @@ public:
 		return result;
 	}
 
-	// Emulate the behavior of VPERM2B by using a 256 bit wide VPERMB
-	template <typename T1, typename T2, typename T3>
-	value_t<u8[16]> vperm2b256to128(T1 a, T2 b, T3 c)
+	template <typename T1, typename T2>
+	value_t<u8[16]> pshufb(T1 a, T2 b)
 	{
 		value_t<u8[16]> result;
 
 		const auto data0 = a.eval(m_ir);
-		const auto data1 = b.eval(m_ir);
-		const auto index = c.eval(m_ir);
+		const auto index = b.eval(m_ir);
+		const auto zeros = llvm::ConstantAggregateZero::get(get_type<u8[16]>());
 
-		// May be slower than non constant path?
 		if (auto c = llvm::dyn_cast<llvm::Constant>(index))
 		{
-			// Convert VPERM2B index back to LLVM vector shuffle mask
+			// Convert PSHUFB index back to LLVM vector shuffle mask
 			v128 mask{};
 
 			const auto cv = llvm::dyn_cast<llvm::ConstantDataVector>(c);
@@ -3726,256 +2940,71 @@ public:
 				for (u32 i = 0; i < 16; i++)
 				{
 					const u64 b = cv->getElementAsInteger(i);
-					mask._u8[i] = b & 0x1f;
+					mask._u8[i] = b < 128 ? b % 16 : 16;
 				}
 			}
 
 			if (cv || llvm::isa<llvm::ConstantAggregateZero>(c))
 			{
-				result.value = llvm::ConstantDataVector::get(m_context, llvm::ArrayRef(reinterpret_cast<const u8*>(&mask), 16));
+				result.value = llvm::ConstantDataVector::get(m_context, llvm::makeArrayRef(reinterpret_cast<const u8*>(&mask), 16));
 				result.value = m_ir->CreateZExt(result.value, get_type<u32[16]>());
-				result.value = m_ir->CreateShuffleVector(data0, data1, result.value);
+				result.value = m_ir->CreateShuffleVector(data0, zeros, result.value);
 				return result;
 			}
 		}
 
-		const auto zeroes = llvm::ConstantAggregateZero::get(get_type<u8[16]>());
-		const auto zeroes32 = llvm::ConstantAggregateZero::get(get_type<u8[32]>());
-
-		value_t<u8[32]> intermediate;
-		value_t<u8[32]> shuffle;
-		value_t<u8[32]> shuffleindex;
-
-		u8 mask32[32] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
-		u8 mask16[16] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-
-		// insert the second source operand into the same vector as the first source operand and expand to 256 bit width
-		shuffle.value = llvm::ConstantDataVector::get(m_context, llvm::ArrayRef(reinterpret_cast<const u8*>(&mask32), 32));
-		shuffle.value = m_ir->CreateZExt(shuffle.value, get_type<u32[32]>());
-		intermediate.value = m_ir->CreateShuffleVector(data0, data1, shuffle.value);
-
-		// expand the shuffle index to 256 bits with zeroes
-		shuffleindex.value = m_ir->CreateShuffleVector(index, zeroes, shuffle.value);
-
-		// permute
-		intermediate.value = m_ir->CreateCall(get_intrinsic(llvm::Intrinsic::x86_avx512_permvar_qi_256), {intermediate.value, shuffleindex.value});
-
-		// convert the 256 bit vector back to 128 bits
-		result.value = llvm::ConstantDataVector::get(m_context, llvm::ArrayRef(reinterpret_cast<const u8*>(&mask16), 16));
-		result.value = m_ir->CreateZExt(result.value, get_type<u32[16]>());
-		result.value = m_ir->CreateShuffleVector(intermediate.value, zeroes32, result.value);
-		return result;
-	}
-
-	template <typename T1, typename T2, typename T3>
-	value_t<f32[4]> vfixupimmps(T1 a, T2 b, T3 c, u8 d, u8 e)
-	{
-		value_t<f32[4]> result;
-
-		const auto data0 = a.eval(m_ir);
-		const auto data1 = b.eval(m_ir);
-		const auto data2 = c.eval(m_ir);
-		const auto immediate = (llvm_const_int<u32>{d});
-		const auto imm32 = immediate.eval(m_ir);
-		const auto immediate2 = (llvm_const_int<u8>{e});
-		const auto imm8 = immediate2.eval(m_ir);
-		result.value = m_ir->CreateCall(get_intrinsic(llvm::Intrinsic::x86_avx512_mask_fixupimm_ps_128), {data0, data1, data2, imm32, imm8});
-		return result;
-	}
-
-	llvm::Value* load_const(llvm::GlobalVariable* g, llvm::Value* i, llvm::Type* type = nullptr)
-	{
-		return m_ir->CreateLoad(type ? type : g->getValueType(), m_ir->CreateGEP(g->getValueType(), g, {m_ir->getInt64(0), m_ir->CreateZExtOrTrunc(i, get_type<u64>())}));
-	}
-
-	template <typename T>
-	llvm::Value* load_const(llvm::GlobalVariable* g, llvm::Value* i)
-	{
-		return load_const(g, i, get_type<T>());
-	}
-
-	template <typename T, typename I>
-		requires requires(I& i, llvm::IRBuilder<>* ir) { i.eval(ir); }
-	value_t<T> load_const(llvm::GlobalVariable* g, I i)
-	{
-		value_t<T> result;
-		result.value = load_const<T>(g, i.eval(m_ir));
-		return result;
-	}
-
-	template <typename T>
-	llvm::GlobalVariable* make_local_variable(T initializing_value)
-	{
-		return new llvm::GlobalVariable(*m_module, get_type<T>(), false, llvm::GlobalVariable::PrivateLinkage, llvm::ConstantInt::get(get_type<T>(), initializing_value));
-	}
-
-	template <typename R = v128>
-	std::pair<bool, R> get_const_vector(llvm::Value*, u32 pos, u32 = __builtin_LINE());
-
-	template <typename T = v128>
-	llvm::Constant* make_const_vector(T, llvm::Type*, u32 = __builtin_LINE());
-
-	template <typename T>
-	llvm::KnownBits get_known_bits(T a)
-	{
-		return llvm::computeKnownBits(a.eval(m_ir), m_module->getDataLayout());
-	}
-
-	template <typename T>
-	llvm::KnownBits kbc(T value)
-	{
-		return llvm::KnownBits::makeConstant(llvm::APInt(sizeof(T) * 8, u64(value)));
-	}
-
-private:
-	// Custom intrinsic table
-	std::unordered_map<std::string_view, std::function<llvm::Value*(llvm::CallInst*)>> m_intrinsics;
-
-public:
-	// Call custom intrinsic by name
-	template <typename RT, typename... Args>
-	llvm::CallInst* _calli(std::string_view name, Args... args)
-	{
-		const auto type = llvm::FunctionType::get(get_type<RT>(), {args->getType()...}, false);
-		const auto func = llvm::cast<llvm::Function>(m_module->getOrInsertFunction({name.data(), name.size()}, type).getCallee());
-		return m_ir->CreateCall(func, {args...});
-	}
-
-	// Initialize custom intrinsic
-	template <typename F>
-	void register_intrinsic(std::string_view name, F replace_with)
-	{
-		if constexpr (std::is_same_v<std::invoke_result_t<F, llvm::CallInst*>, llvm::Value*>)
+		if (m_use_ssse3)
 		{
-			m_intrinsics.try_emplace(name, replace_with);
+			result.value = m_ir->CreateCall(get_intrinsic(llvm::Intrinsic::x86_ssse3_pshuf_b_128), {data0, index});
 		}
 		else
 		{
-			m_intrinsics.try_emplace(name, [=, this](llvm::CallInst* ci)
-			{
-				return replace_with(ci).eval(m_ir);
-			});
+			// Emulate PSHUFB (TODO)
+			const auto mask = m_ir->CreateAnd(index, 0xf);
+			const auto loop = llvm::BasicBlock::Create(m_context, "", m_ir->GetInsertBlock()->getParent());
+			const auto next = llvm::BasicBlock::Create(m_context, "", m_ir->GetInsertBlock()->getParent());
+			const auto prev = m_ir->GetInsertBlock();
+
+			m_ir->CreateBr(loop);
+			m_ir->SetInsertPoint(loop);
+			const auto i = m_ir->CreatePHI(get_type<u32>(), 2);
+			const auto v = m_ir->CreatePHI(get_type<u8[16]>(), 2);
+			i->addIncoming(m_ir->getInt32(0), prev);
+			i->addIncoming(m_ir->CreateAdd(i, m_ir->getInt32(1)), loop);
+			v->addIncoming(zeros, prev);
+			result.value = m_ir->CreateInsertElement(v, m_ir->CreateExtractElement(data0, m_ir->CreateExtractElement(mask, i)), i);
+			v->addIncoming(result.value, loop);
+			m_ir->CreateCondBr(m_ir->CreateICmpULT(i, m_ir->getInt32(16)), loop, next);
+			m_ir->SetInsertPoint(next);
+			result.value = m_ir->CreateSelect(m_ir->CreateICmpSLT(index, zeros), zeros, result.value);
 		}
+
+		return result;
 	}
 
-	// Finalize processing
-	void run_transforms(llvm::Function&);
-
-	// Erase store instructions of provided
-	void erase_stores(llvm::ArrayRef<llvm::Value*> args);
-
-	template <typename... Args>
-	void erase_stores(Args... args)
+	llvm::Value* load_const(llvm::GlobalVariable* g, llvm::Value* i)
 	{
-		erase_stores({args.value...});
+		return m_ir->CreateLoad(m_ir->CreateGEP(g, {m_ir->getInt64(0), m_ir->CreateZExtOrTrunc(i, get_type<u64>())}));
 	}
 
-	template <typename T, typename U>
-	static auto pshufb(T&& a, U&& b)
+	template <typename T, typename I>
+	value_t<T> load_const(llvm::GlobalVariable* g, I i)
 	{
-		return llvm_calli<u8[16], T, U>{"x86_pshufb", {std::forward<T>(a), std::forward<U>(b)}}.if_const([](llvm::Value* args[], llvm::IRBuilder<>* ir) -> llvm::Value*
-		{
-			const auto zeros = llvm::ConstantAggregateZero::get(llvm_value_t<u8[16]>::get_type(ir->getContext()));
-
-			if (auto c = llvm::dyn_cast<llvm::Constant>(args[1]))
-			{
-				// Convert PSHUFB index back to LLVM vector shuffle mask
-				v128 mask{};
-
-				const auto cv = llvm::dyn_cast<llvm::ConstantDataVector>(c);
-
-				if (cv)
-				{
-					for (u32 i = 0; i < 16; i++)
-					{
-						const u64 b = cv->getElementAsInteger(i);
-						mask._u8[i] = b < 128 ? b % 16 : 16;
-					}
-				}
-
-				if (cv || llvm::isa<llvm::ConstantAggregateZero>(c))
-				{
-					llvm::Value* r = nullptr;
-					r = llvm::ConstantDataVector::get(ir->getContext(), llvm::ArrayRef(reinterpret_cast<const u8*>(&mask), 16));
-					r = ir->CreateZExt(r, llvm_value_t<u32[16]>::get_type(ir->getContext()));
-					r = ir->CreateShuffleVector(args[0], zeros, r);
-					return r;
-				}
-			}
-
-			return nullptr;
-		});
+		value_t<T> result;
+		result.value = load_const(g, i.eval(m_ir));
+		return result;
 	}
 
-	// (m << 3) >= 0 ? a : b
-	template <typename T, typename U, typename V>
-	static auto select_by_bit4(T&& m, U&& a, V&& b)
-	{
-		return llvm_calli<u8[16], T, U, V>{"any_select_by_bit4", {std::forward<T>(m), std::forward<U>(a), std::forward<V>(b)}};
-	}
+	template <typename R = v128>
+	std::pair<bool, R> get_const_vector(llvm::Value*, u32 a, u32 b);
 
-	template <typename T>
-		requires std::is_same_v<llvm_common_t<T>, f32[4]>
-	static auto fre(T&& a)
-	{
-#if defined(ARCH_X64)
-		return llvm_calli<f32[4], T>{"llvm.x86.sse.rcp.ps", {std::forward<T>(a)}};
-#elif defined(ARCH_ARM64)
-		return llvm_calli<f32[4], T>{"llvm.aarch64.neon.frecpe.v4f32", {std::forward<T>(a)}};
-#endif
-	}
-
-	template <typename T>
-		requires std::is_same_v<llvm_common_t<T>, f32[4]>
-	static auto frsqe(T&& a)
-	{
-#if defined(ARCH_X64)
-		return llvm_calli<f32[4], T>{"llvm.x86.sse.rsqrt.ps", {std::forward<T>(a)}};
-#elif defined(ARCH_ARM64)
-		return llvm_calli<f32[4], T>{"llvm.aarch64.neon.frsqrte.v4f32", {std::forward<T>(a)}};
-#endif
-	}
-
-	template <typename T, typename U>
-		requires std::is_same_v<llvm_common_t<T, U>, f32[4]>
-	static auto fmax(T&& a, U&& b)
-	{
-#if defined(ARCH_X64)
-		return llvm_calli<f32[4], T, U>{"llvm.x86.sse.max.ps", {std::forward<T>(a), std::forward<U>(b)}};
-#elif defined(ARCH_ARM64)
-		return llvm_calli<f32[4], T, U>{"llvm.aarch64.neon.fmax.v4f32", {std::forward<T>(a), std::forward<U>(b)}};
-#endif
-	}
-
-	template <typename T, typename U>
-		requires std::is_same_v<llvm_common_t<T, U>, f32[4]>
-	static auto fmin(T&& a, U&& b)
-	{
-#if defined(ARCH_X64)
-		return llvm_calli<f32[4], T, U>{"llvm.x86.sse.min.ps", {std::forward<T>(a), std::forward<U>(b)}};
-#elif defined(ARCH_ARM64)
-		return llvm_calli<f32[4], T, U>{"llvm.aarch64.neon.fmin.v4f32", {std::forward<T>(a), std::forward<U>(b)}};
-#endif
-	}
-
-	template <typename T, typename U>
-		requires std::is_same_v<llvm_common_t<T, U>, u8[16]>
-	static auto vdbpsadbw(T&& a, U&& b, u8 c)
-	{
-		return llvm_calli<u16[8], T, U, llvm_const_int<u32>>{"llvm.x86.avx512.dbpsadbw.128", {std::forward<T>(a), std::forward<U>(b), llvm_const_int<u32>{c}}};
-	}
-
-	template <typename T, typename U>
-		requires std::is_same_v<llvm_common_t<T, U>, f32[4]>
-	static auto vrangeps(T&& a, U&& b, u8 c, u8 d)
-	{
-		return llvm_calli<f32[4], T, U, llvm_const_int<u32>, T, llvm_const_int<u8>>{"llvm.x86.avx512.mask.range.ps.128", {std::forward<T>(a), std::forward<U>(b), llvm_const_int<u32>{c}, std::forward<T>(a), llvm_const_int<u8>{d}}};
-	}
+	template <typename T = v128>
+	llvm::Constant* make_const_vector(T, llvm::Type*);
 };
 
 // Format llvm::SizeType
 template <>
-struct fmt_unveil<llvm::TypeSize>
+struct fmt_unveil<llvm::TypeSize, void>
 {
 	using type = usz;
 
@@ -3985,53 +3014,19 @@ struct fmt_unveil<llvm::TypeSize>
 	}
 };
 
-// Inline assembly wrappers.
-// TODO: Move these to proper location and replace macros with templates
-static inline
-llvm::InlineAsm* compile_inline_asm(
-	llvm::Type* returnType,
-	llvm::ArrayRef<llvm::Type*> argTypes,
-	const std::string& code,
-	const std::string& constraints)
+#ifndef _MSC_VER
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-attributes"
+#endif
+
+template <>
+inline llvm::Type* cpu_translator::get_type<__m128i>()
 {
-	const auto callSig = llvm::FunctionType::get(returnType, argTypes, false);
-	return llvm::InlineAsm::get(callSig, code, constraints, true, false);
+	return llvm::VectorType::get(llvm::Type::getInt8Ty(m_context), 16, false);
 }
 
-// Helper for ASM generation with dynamic number of arguments
-static inline
-llvm::CallInst* llvm_asm(
-	llvm::IRBuilder<>* irb,
-	const std::string& asm_,
-	llvm::ArrayRef<llvm::Value*> args,
-	const std::string& constraints,
-	llvm::LLVMContext& context)
-{
-	llvm::ArrayRef<llvm::Type*> types_ref = std::nullopt;
-	std::vector<llvm::Type*> types;
-	types.reserve(args.size());
-
-	if (!args.empty())
-	{
-		for (const auto& arg : args)
-		{
-			types.push_back(arg->getType());
-		}
-		types_ref = types;
-	}
-
-	auto return_type = llvm::Type::getVoidTy(context);
-	auto callee = compile_inline_asm(return_type, types_ref, asm_, constraints);
-	auto c = irb->CreateCall(callee, args);
-	c->addFnAttr(llvm::Attribute::AlwaysInline);
-	return c;
-}
-
-#define LLVM_ASM(asm_, args, constraints, irb, ctx)\
-	llvm_asm(irb, asm_, args, constraints, ctx)
-
-// Helper for ASM generation with 0 args
-#define LLVM_ASM_VOID(asm_, irb, ctx)\
-	llvm_asm(irb, asm_, {}, "", ctx)
+#ifndef _MSC_VER
+#pragma GCC diagnostic pop
+#endif
 
 #endif
diff --git a/rpcs3/Emu/CPU/Hypervisor.h b/rpcs3/Emu/CPU/Hypervisor.h
deleted file mode 100644
index f40428cc48..0000000000
--- a/rpcs3/Emu/CPU/Hypervisor.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-
-namespace rpcs3
-{
-#if defined(ARCH_x64)
-	union hypervisor_context_t
-	{
-		u64 regs[1];
-		struct
-		{
-			u64 rsp;
-		} x86;
-	};
-
-	static_assert(sizeof(hypervisor_context_t) == 8);
-#else
-	union alignas(16) hypervisor_context_t
-	{
-		u64 regs[16];
-
-		struct
-		{
-			u64 pc;
-			u64 sp;
-
-			u64 x18;
-			u64 x19;
-			u64 x20;
-			u64 x21;
-			u64 x22;
-			u64 x23;
-			u64 x24;
-			u64 x25;
-			u64 x26;
-			u64 x27;
-			u64 x28;
-			u64 x29;
-			u64 x30;
-
-			// x0-x17 unused
-		} aarch64;
-	};
-#endif
-}
diff --git a/rpcs3/Emu/CPU/sse2neon.h b/rpcs3/Emu/CPU/sse2neon.h
deleted file mode 100644
index dfb0b1a0e1..0000000000
--- a/rpcs3/Emu/CPU/sse2neon.h
+++ /dev/null
@@ -1,8807 +0,0 @@
-#ifndef SSE2NEON_H
-#define SSE2NEON_H
-
-// This header file provides a simple API translation layer
-// between SSE intrinsics to their corresponding Arm/Aarch64 NEON versions
-//
-// This header file does not yet translate all of the SSE intrinsics.
-//
-// Contributors to this work are:
-//   John W. Ratcliff <jratcliffscarab@gmail.com>
-//   Brandon Rowlett <browlett@nvidia.com>
-//   Ken Fast <kfast@gdeb.com>
-//   Eric van Beurden <evanbeurden@nvidia.com>
-//   Alexander Potylitsin <apotylitsin@nvidia.com>
-//   Hasindu Gamaarachchi <hasindu2008@gmail.com>
-//   Jim Huang <jserv@biilabs.io>
-//   Mark Cheng <marktwtn@biilabs.io>
-//   Malcolm James MacLeod <malcolm@gulden.com>
-//   Devin Hussey (easyaspi314) <husseydevin@gmail.com>
-//   Sebastian Pop <spop@amazon.com>
-//   Developer Ecosystem Engineering <DeveloperEcosystemEngineering@apple.com>
-//   Danila Kutenin <danilak@google.com>
-//   François Turban (JishinMaster) <francois.turban@gmail.com>
-//   Pei-Hsuan Hung <afcidk@gmail.com>
-//   Yang-Hao Yuan <yanghau@biilabs.io>
-//   Syoyo Fujita <syoyo@lighttransport.com>
-//   Brecht Van Lommel <brecht@blender.org>
-
-/*
- * sse2neon is freely redistributable under the MIT License.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-// Suppress old-style casts in this file on Clang ARM64
-#if defined(__clang__) && defined(ARCH_ARM64)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#endif
-
-/* Tunable configurations */
-
-/* Enable precise implementation of math operations
- * This would slow down the computation a bit, but gives consistent result with
- * x86 SSE. (e.g. would solve a hole or NaN pixel in the rendering result)
- */
-/* _mm_min|max_ps|ss|pd|sd */
-#ifndef SSE2NEON_PRECISE_MINMAX
-#define SSE2NEON_PRECISE_MINMAX (0)
-#endif
-/* _mm_rcp_ps and _mm_div_ps */
-#ifndef SSE2NEON_PRECISE_DIV
-#define SSE2NEON_PRECISE_DIV (0)
-#endif
-/* _mm_sqrt_ps and _mm_rsqrt_ps */
-#ifndef SSE2NEON_PRECISE_SQRT
-#define SSE2NEON_PRECISE_SQRT (0)
-#endif
-/* _mm_dp_pd */
-#ifndef SSE2NEON_PRECISE_DP
-#define SSE2NEON_PRECISE_DP (0)
-#endif
-
-/* compiler specific definitions */
-#if defined(__GNUC__) || defined(__clang__)
-#pragma push_macro("FORCE_INLINE")
-#pragma push_macro("ALIGN_STRUCT")
-#define FORCE_INLINE static inline __attribute__((always_inline))
-#define ALIGN_STRUCT(x) __attribute__((aligned(x)))
-#define _sse2neon_likely(x) __builtin_expect(!!(x), 1)
-#define _sse2neon_unlikely(x) __builtin_expect(!!(x), 0)
-#else /* non-GNU / non-clang compilers */
-#warning "Macro name collisions may happen with unsupported compiler."
-#ifndef FORCE_INLINE
-#define FORCE_INLINE static inline
-#endif
-#ifndef ALIGN_STRUCT
-#define ALIGN_STRUCT(x) __declspec(align(x))
-#endif
-#define _sse2neon_likely(x) (x)
-#define _sse2neon_unlikely(x) (x)
-#endif
-
-#include <stdint.h>
-#include <stdlib.h>
-
-/* Architecture-specific build options */
-/* FIXME: #pragma GCC push_options is only available on GCC */
-#if defined(__GNUC__)
-#if defined(__arm__) && __ARM_ARCH == 7
-/* According to ARM C Language Extensions Architecture specification,
- * __ARM_NEON is defined to a value indicating the Advanced SIMD (NEON)
- * architecture supported.
- */
-#if !defined(__ARM_NEON) || !defined(__ARM_NEON__)
-#error "You must enable NEON instructions (e.g. -mfpu=neon) to use SSE2NEON."
-#endif
-#if !defined(__clang__)
-#pragma GCC push_options
-#pragma GCC target("fpu=neon")
-#endif
-#elif defined(__aarch64__)
-#if !defined(__clang__)
-#pragma GCC push_options
-#pragma GCC target("+simd")
-#endif
-#else
-#error "Unsupported target. Must be either ARMv7-A+NEON or ARMv8-A."
-#endif
-#endif
-
-#include <arm_neon.h>
-
-/* Rounding functions require either Aarch64 instructions or libm failback */
-#if !defined(__aarch64__)
-#include <math.h>
-#endif
-
-/* RPCS3 additions */
-#if defined(_WIN32)
-static inline int posix_memalign(void** memptr, size_t alignment, size_t size)
-{
-    // Check for valid alignment (must be a power of two and multiple of sizeof(void*))
-    if (alignment == 0 || (alignment & (alignment - 1)) != 0 || alignment % sizeof(void*) != 0)
-        return EINVAL;
-
-    // Allocate memory using _aligned_malloc
-    void* ptr = _aligned_malloc(size, alignment);
-    if (!ptr)
-        // NOTE: _aligned_malloc sets errno, ideally we should use that to generate the return code
-        return ENOMEM;
-
-    // Success
-    *memptr = ptr;
-    return 0;
-}
-#endif
-/* End RPCS3 additions */
-
-/* "__has_builtin" can be used to query support for built-in functions
- * provided by gcc/clang and other compilers that support it.
- */
-#ifndef __has_builtin /* GCC prior to 10 or non-clang compilers */
-/* Compatibility with gcc <= 9 */
-#if defined(__GNUC__) && (__GNUC__ <= 9)
-#define __has_builtin(x) HAS##x
-#define HAS__builtin_popcount 1
-#define HAS__builtin_popcountll 1
-#else
-#define __has_builtin(x) 0
-#endif
-#endif
-
-/**
- * MACRO for shuffle parameter for _mm_shuffle_ps().
- * Argument fp3 is a digit[0123] that represents the fp from argument "b"
- * of mm_shuffle_ps that will be placed in fp3 of result. fp2 is the same
- * for fp2 in result. fp1 is a digit[0123] that represents the fp from
- * argument "a" of mm_shuffle_ps that will be places in fp1 of result.
- * fp0 is the same for fp0 of result.
- */
-#define _MM_SHUFFLE(fp3, fp2, fp1, fp0) \
-    (((fp3) << 6) | ((fp2) << 4) | ((fp1) << 2) | ((fp0)))
-
-/* Rounding mode macros. */
-#define _MM_FROUND_TO_NEAREST_INT 0x00
-#define _MM_FROUND_TO_NEG_INF 0x01
-#define _MM_FROUND_TO_POS_INF 0x02
-#define _MM_FROUND_TO_ZERO 0x03
-#define _MM_FROUND_CUR_DIRECTION 0x04
-#define _MM_FROUND_NO_EXC 0x08
-#define _MM_FROUND_RAISE_EXC 0x00
-#define _MM_FROUND_NINT (_MM_FROUND_TO_NEAREST_INT | _MM_FROUND_RAISE_EXC)
-#define _MM_FROUND_FLOOR (_MM_FROUND_TO_NEG_INF | _MM_FROUND_RAISE_EXC)
-#define _MM_FROUND_CEIL (_MM_FROUND_TO_POS_INF | _MM_FROUND_RAISE_EXC)
-#define _MM_FROUND_TRUNC (_MM_FROUND_TO_ZERO | _MM_FROUND_RAISE_EXC)
-#define _MM_FROUND_RINT (_MM_FROUND_CUR_DIRECTION | _MM_FROUND_RAISE_EXC)
-#define _MM_FROUND_NEARBYINT (_MM_FROUND_CUR_DIRECTION | _MM_FROUND_NO_EXC)
-#define _MM_ROUND_NEAREST 0x0000
-#define _MM_ROUND_DOWN 0x2000
-#define _MM_ROUND_UP 0x4000
-#define _MM_ROUND_TOWARD_ZERO 0x6000
-/* Flush zero mode macros. */
-#define _MM_FLUSH_ZERO_MASK 0x8000
-#define _MM_FLUSH_ZERO_ON 0x8000
-#define _MM_FLUSH_ZERO_OFF 0x0000
-/* Denormals are zeros mode macros. */
-#define _MM_DENORMALS_ZERO_MASK 0x0040
-#define _MM_DENORMALS_ZERO_ON 0x0040
-#define _MM_DENORMALS_ZERO_OFF 0x0000
-
-/* indicate immediate constant argument in a given range */
-#define __constrange(a, b) const
-
-/* A few intrinsics accept traditional data types like ints or floats, but
- * most operate on data types that are specific to SSE.
- * If a vector type ends in d, it contains doubles, and if it does not have
- * a suffix, it contains floats. An integer vector type can contain any type
- * of integer, from chars to shorts to unsigned long longs.
- */
-typedef int64x1_t __m64;
-typedef float32x4_t __m128; /* 128-bit vector containing 4 floats */
-// On ARM 32-bit architecture, the float64x2_t is not supported.
-// The data type __m128d should be represented in a different way for related
-// intrinsic conversion.
-#if defined(__aarch64__)
-typedef float64x2_t __m128d; /* 128-bit vector containing 2 doubles */
-#else
-typedef float32x4_t __m128d;
-#endif
-typedef int64x2_t __m128i; /* 128-bit vector containing integers */
-
-// __int64 is defined in the Intrinsics Guide which maps to different datatype
-// in different data model
-#if !(defined(_WIN32) || defined(_WIN64) || defined(__int64))
-#if (defined(__x86_64__) || defined(__i386__))
-#define __int64 long long
-#else
-#define __int64 int64_t
-#endif
-#endif
-
-/* type-safe casting between types */
-
-#define vreinterpretq_m128_f16(x) vreinterpretq_f32_f16(x)
-#define vreinterpretq_m128_f32(x) (x)
-#define vreinterpretq_m128_f64(x) vreinterpretq_f32_f64(x)
-
-#define vreinterpretq_m128_u8(x) vreinterpretq_f32_u8(x)
-#define vreinterpretq_m128_u16(x) vreinterpretq_f32_u16(x)
-#define vreinterpretq_m128_u32(x) vreinterpretq_f32_u32(x)
-#define vreinterpretq_m128_u64(x) vreinterpretq_f32_u64(x)
-
-#define vreinterpretq_m128_s8(x) vreinterpretq_f32_s8(x)
-#define vreinterpretq_m128_s16(x) vreinterpretq_f32_s16(x)
-#define vreinterpretq_m128_s32(x) vreinterpretq_f32_s32(x)
-#define vreinterpretq_m128_s64(x) vreinterpretq_f32_s64(x)
-
-#define vreinterpretq_f16_m128(x) vreinterpretq_f16_f32(x)
-#define vreinterpretq_f32_m128(x) (x)
-#define vreinterpretq_f64_m128(x) vreinterpretq_f64_f32(x)
-
-#define vreinterpretq_u8_m128(x) vreinterpretq_u8_f32(x)
-#define vreinterpretq_u16_m128(x) vreinterpretq_u16_f32(x)
-#define vreinterpretq_u32_m128(x) vreinterpretq_u32_f32(x)
-#define vreinterpretq_u64_m128(x) vreinterpretq_u64_f32(x)
-
-#define vreinterpretq_s8_m128(x) vreinterpretq_s8_f32(x)
-#define vreinterpretq_s16_m128(x) vreinterpretq_s16_f32(x)
-#define vreinterpretq_s32_m128(x) vreinterpretq_s32_f32(x)
-#define vreinterpretq_s64_m128(x) vreinterpretq_s64_f32(x)
-
-#define vreinterpretq_m128i_s8(x) vreinterpretq_s64_s8(x)
-#define vreinterpretq_m128i_s16(x) vreinterpretq_s64_s16(x)
-#define vreinterpretq_m128i_s32(x) vreinterpretq_s64_s32(x)
-#define vreinterpretq_m128i_s64(x) (x)
-
-#define vreinterpretq_m128i_u8(x) vreinterpretq_s64_u8(x)
-#define vreinterpretq_m128i_u16(x) vreinterpretq_s64_u16(x)
-#define vreinterpretq_m128i_u32(x) vreinterpretq_s64_u32(x)
-#define vreinterpretq_m128i_u64(x) vreinterpretq_s64_u64(x)
-
-#define vreinterpretq_f32_m128i(x) vreinterpretq_f32_s64(x)
-#define vreinterpretq_f64_m128i(x) vreinterpretq_f64_s64(x)
-
-#define vreinterpretq_s8_m128i(x) vreinterpretq_s8_s64(x)
-#define vreinterpretq_s16_m128i(x) vreinterpretq_s16_s64(x)
-#define vreinterpretq_s32_m128i(x) vreinterpretq_s32_s64(x)
-#define vreinterpretq_s64_m128i(x) (x)
-
-#define vreinterpretq_u8_m128i(x) vreinterpretq_u8_s64(x)
-#define vreinterpretq_u16_m128i(x) vreinterpretq_u16_s64(x)
-#define vreinterpretq_u32_m128i(x) vreinterpretq_u32_s64(x)
-#define vreinterpretq_u64_m128i(x) vreinterpretq_u64_s64(x)
-
-#define vreinterpret_m64_s8(x) vreinterpret_s64_s8(x)
-#define vreinterpret_m64_s16(x) vreinterpret_s64_s16(x)
-#define vreinterpret_m64_s32(x) vreinterpret_s64_s32(x)
-#define vreinterpret_m64_s64(x) (x)
-
-#define vreinterpret_m64_u8(x) vreinterpret_s64_u8(x)
-#define vreinterpret_m64_u16(x) vreinterpret_s64_u16(x)
-#define vreinterpret_m64_u32(x) vreinterpret_s64_u32(x)
-#define vreinterpret_m64_u64(x) vreinterpret_s64_u64(x)
-
-#define vreinterpret_m64_f16(x) vreinterpret_s64_f16(x)
-#define vreinterpret_m64_f32(x) vreinterpret_s64_f32(x)
-#define vreinterpret_m64_f64(x) vreinterpret_s64_f64(x)
-
-#define vreinterpret_u8_m64(x) vreinterpret_u8_s64(x)
-#define vreinterpret_u16_m64(x) vreinterpret_u16_s64(x)
-#define vreinterpret_u32_m64(x) vreinterpret_u32_s64(x)
-#define vreinterpret_u64_m64(x) vreinterpret_u64_s64(x)
-
-#define vreinterpret_s8_m64(x) vreinterpret_s8_s64(x)
-#define vreinterpret_s16_m64(x) vreinterpret_s16_s64(x)
-#define vreinterpret_s32_m64(x) vreinterpret_s32_s64(x)
-#define vreinterpret_s64_m64(x) (x)
-
-#define vreinterpret_f32_m64(x) vreinterpret_f32_s64(x)
-
-#if defined(__aarch64__)
-#define vreinterpretq_m128d_s32(x) vreinterpretq_f64_s32(x)
-#define vreinterpretq_m128d_s64(x) vreinterpretq_f64_s64(x)
-
-#define vreinterpretq_m128d_u64(x) vreinterpretq_f64_u64(x)
-
-#define vreinterpretq_m128d_f32(x) vreinterpretq_f64_f32(x)
-#define vreinterpretq_m128d_f64(x) (x)
-
-#define vreinterpretq_s64_m128d(x) vreinterpretq_s64_f64(x)
-
-#define vreinterpretq_u32_m128d(x) vreinterpretq_u32_f64(x)
-#define vreinterpretq_u64_m128d(x) vreinterpretq_u64_f64(x)
-
-#define vreinterpretq_f64_m128d(x) (x)
-#define vreinterpretq_f32_m128d(x) vreinterpretq_f32_f64(x)
-#else
-#define vreinterpretq_m128d_s32(x) vreinterpretq_f32_s32(x)
-#define vreinterpretq_m128d_s64(x) vreinterpretq_f32_s64(x)
-
-#define vreinterpretq_m128d_u32(x) vreinterpretq_f32_u32(x)
-#define vreinterpretq_m128d_u64(x) vreinterpretq_f32_u64(x)
-
-#define vreinterpretq_m128d_f32(x) (x)
-
-#define vreinterpretq_s64_m128d(x) vreinterpretq_s64_f32(x)
-
-#define vreinterpretq_u32_m128d(x) vreinterpretq_u32_f32(x)
-#define vreinterpretq_u64_m128d(x) vreinterpretq_u64_f32(x)
-
-#define vreinterpretq_f32_m128d(x) (x)
-#endif
-
-// A struct is defined in this header file called 'SIMDVec' which can be used
-// by applications which attempt to access the contents of an __m128 struct
-// directly.  It is important to note that accessing the __m128 struct directly
-// is bad coding practice by Microsoft: @see:
-// https://docs.microsoft.com/en-us/cpp/cpp/m128
-//
-// However, some legacy source code may try to access the contents of an __m128
-// struct directly so the developer can use the SIMDVec as an alias for it.  Any
-// casting must be done manually by the developer, as you cannot cast or
-// otherwise alias the base NEON data type for intrinsic operations.
-//
-// union intended to allow direct access to an __m128 variable using the names
-// that the MSVC compiler provides.  This union should really only be used when
-// trying to access the members of the vector as integer values.  GCC/clang
-// allow native access to the float members through a simple array access
-// operator (in C since 4.6, in C++ since 4.8).
-//
-// Ideally direct accesses to SIMD vectors should not be used since it can cause
-// a performance hit.  If it really is needed however, the original __m128
-// variable can be aliased with a pointer to this union and used to access
-// individual components.  The use of this union should be hidden behind a macro
-// that is used throughout the codebase to access the members instead of always
-// declaring this type of variable.
-typedef union ALIGN_STRUCT(16) SIMDVec {
-    float m128_f32[4];     // as floats - DON'T USE. Added for convenience.
-    int8_t m128_i8[16];    // as signed 8-bit integers.
-    int16_t m128_i16[8];   // as signed 16-bit integers.
-    int32_t m128_i32[4];   // as signed 32-bit integers.
-    int64_t m128_i64[2];   // as signed 64-bit integers.
-    uint8_t m128_u8[16];   // as unsigned 8-bit integers.
-    uint16_t m128_u16[8];  // as unsigned 16-bit integers.
-    uint32_t m128_u32[4];  // as unsigned 32-bit integers.
-    uint64_t m128_u64[2];  // as unsigned 64-bit integers.
-} SIMDVec;
-
-// casting using SIMDVec
-#define vreinterpretq_nth_u64_m128i(x, n) (((SIMDVec *) &x)->m128_u64[n])
-#define vreinterpretq_nth_u32_m128i(x, n) (((SIMDVec *) &x)->m128_u32[n])
-#define vreinterpretq_nth_u8_m128i(x, n) (((SIMDVec *) &x)->m128_u8[n])
-
-/* SSE macros */
-#define _MM_GET_FLUSH_ZERO_MODE _sse2neon_mm_get_flush_zero_mode
-#define _MM_SET_FLUSH_ZERO_MODE _sse2neon_mm_set_flush_zero_mode
-#define _MM_GET_DENORMALS_ZERO_MODE _sse2neon_mm_get_denormals_zero_mode
-#define _MM_SET_DENORMALS_ZERO_MODE _sse2neon_mm_set_denormals_zero_mode
-
-// Function declaration
-// SSE
-FORCE_INLINE unsigned int _MM_GET_ROUNDING_MODE();
-FORCE_INLINE __m128 _mm_move_ss(__m128, __m128);
-FORCE_INLINE __m128 _mm_or_ps(__m128, __m128);
-FORCE_INLINE __m128 _mm_set_ps1(float);
-FORCE_INLINE __m128 _mm_setzero_ps(void);
-// SSE2
-FORCE_INLINE __m128i _mm_and_si128(__m128i, __m128i);
-FORCE_INLINE __m128i _mm_castps_si128(__m128);
-FORCE_INLINE __m128i _mm_cmpeq_epi32(__m128i, __m128i);
-FORCE_INLINE __m128i _mm_cvtps_epi32(__m128);
-FORCE_INLINE __m128d _mm_move_sd(__m128d, __m128d);
-FORCE_INLINE __m128i _mm_or_si128(__m128i, __m128i);
-FORCE_INLINE __m128i _mm_set_epi32(int, int, int, int);
-FORCE_INLINE __m128i _mm_set_epi64x(int64_t, int64_t);
-FORCE_INLINE __m128d _mm_set_pd(double, double);
-FORCE_INLINE __m128i _mm_set1_epi32(int);
-FORCE_INLINE __m128i _mm_setzero_si128();
-// SSE4.1
-FORCE_INLINE __m128d _mm_ceil_pd(__m128d);
-FORCE_INLINE __m128 _mm_ceil_ps(__m128);
-FORCE_INLINE __m128d _mm_floor_pd(__m128d);
-FORCE_INLINE __m128 _mm_floor_ps(__m128);
-FORCE_INLINE __m128d _mm_round_pd(__m128d, int);
-FORCE_INLINE __m128 _mm_round_ps(__m128, int);
-// SSE4.2
-FORCE_INLINE uint32_t _mm_crc32_u8(uint32_t, uint8_t);
-
-/* Backwards compatibility for compilers with lack of specific type support */
-
-// Older gcc does not define vld1q_u8_x4 type
-#if defined(__GNUC__) && !defined(__clang__) &&                        \
-    ((__GNUC__ <= 10 && defined(__arm__)) ||                           \
-     (__GNUC__ == 10 && __GNUC_MINOR__ < 3 && defined(__aarch64__)) || \
-     (__GNUC__ <= 9 && defined(__aarch64__)))
-FORCE_INLINE uint8x16x4_t _sse2neon_vld1q_u8_x4(const uint8_t *p)
-{
-    uint8x16x4_t ret;
-    ret.val[0] = vld1q_u8(p + 0);
-    ret.val[1] = vld1q_u8(p + 16);
-    ret.val[2] = vld1q_u8(p + 32);
-    ret.val[3] = vld1q_u8(p + 48);
-    return ret;
-}
-#else
-// Wraps vld1q_u8_x4
-FORCE_INLINE uint8x16x4_t _sse2neon_vld1q_u8_x4(const uint8_t *p)
-{
-    return vld1q_u8_x4(p);
-}
-#endif
-
-/* Function Naming Conventions
- * The naming convention of SSE intrinsics is straightforward. A generic SSE
- * intrinsic function is given as follows:
- *   _mm_<name>_<data_type>
- *
- * The parts of this format are given as follows:
- * 1. <name> describes the operation performed by the intrinsic
- * 2. <data_type> identifies the data type of the function's primary arguments
- *
- * This last part, <data_type>, is a little complicated. It identifies the
- * content of the input values, and can be set to any of the following values:
- * + ps - vectors contain floats (ps stands for packed single-precision)
- * + pd - vectors cantain doubles (pd stands for packed double-precision)
- * + epi8/epi16/epi32/epi64 - vectors contain 8-bit/16-bit/32-bit/64-bit
- *                            signed integers
- * + epu8/epu16/epu32/epu64 - vectors contain 8-bit/16-bit/32-bit/64-bit
- *                            unsigned integers
- * + si128 - unspecified 128-bit vector or 256-bit vector
- * + m128/m128i/m128d - identifies input vector types when they are different
- *                      than the type of the returned vector
- *
- * For example, _mm_setzero_ps. The _mm implies that the function returns
- * a 128-bit vector. The _ps at the end implies that the argument vectors
- * contain floats.
- *
- * A complete example: Byte Shuffle - pshufb (_mm_shuffle_epi8)
- *   // Set packed 16-bit integers. 128 bits, 8 short, per 16 bits
- *   __m128i v_in = _mm_setr_epi16(1, 2, 3, 4, 5, 6, 7, 8);
- *   // Set packed 8-bit integers
- *   // 128 bits, 16 chars, per 8 bits
- *   __m128i v_perm = _mm_setr_epi8(1, 0,  2,  3, 8, 9, 10, 11,
- *                                  4, 5, 12, 13, 6, 7, 14, 15);
- *   // Shuffle packed 8-bit integers
- *   __m128i v_out = _mm_shuffle_epi8(v_in, v_perm); // pshufb
- *
- * Data (Number, Binary, Byte Index):
-    +------+------+-------------+------+------+-------------+
-    |      1      |      2      |      3      |      4      | Number
-    +------+------+------+------+------+------+------+------+
-    | 0000 | 0001 | 0000 | 0010 | 0000 | 0011 | 0000 | 0100 | Binary
-    +------+------+------+------+------+------+------+------+
-    |    0 |    1 |    2 |    3 |    4 |    5 |    6 |    7 | Index
-    +------+------+------+------+------+------+------+------+
-
-    +------+------+------+------+------+------+------+------+
-    |      5      |      6      |      7      |      8      | Number
-    +------+------+------+------+------+------+------+------+
-    | 0000 | 0101 | 0000 | 0110 | 0000 | 0111 | 0000 | 1000 | Binary
-    +------+------+------+------+------+------+------+------+
-    |    8 |    9 |   10 |   11 |   12 |   13 |   14 |   15 | Index
-    +------+------+------+------+------+------+------+------+
- * Index (Byte Index):
-    +------+------+------+------+------+------+------+------+
-    |    1 |    0 |    2 |    3 |    8 |    9 |   10 |   11 |
-    +------+------+------+------+------+------+------+------+
-
-    +------+------+------+------+------+------+------+------+
-    |    4 |    5 |   12 |   13 |    6 |    7 |   14 |   15 |
-    +------+------+------+------+------+------+------+------+
- * Result:
-    +------+------+------+------+------+------+------+------+
-    |    1 |    0 |    2 |    3 |    8 |    9 |   10 |   11 | Index
-    +------+------+------+------+------+------+------+------+
-    | 0001 | 0000 | 0000 | 0010 | 0000 | 0101 | 0000 | 0110 | Binary
-    +------+------+------+------+------+------+------+------+
-    |     256     |      2      |      5      |      6      | Number
-    +------+------+------+------+------+------+------+------+
-
-    +------+------+------+------+------+------+------+------+
-    |    4 |    5 |   12 |   13 |    6 |    7 |   14 |   15 | Index
-    +------+------+------+------+------+------+------+------+
-    | 0000 | 0011 | 0000 | 0111 | 0000 | 0100 | 0000 | 1000 | Binary
-    +------+------+------+------+------+------+------+------+
-    |      3      |      7      |      4      |      8      | Number
-    +------+------+------+------+------+------+-------------+
- */
-
-/* Constants for use with _mm_prefetch.  */
-enum _mm_hint {
-    _MM_HINT_NTA = 0,  /* load data to L1 and L2 cache, mark it as NTA */
-    _MM_HINT_T0 = 1,   /* load data to L1 and L2 cache */
-    _MM_HINT_T1 = 2,   /* load data to L2 cache only */
-    _MM_HINT_T2 = 3,   /* load data to L2 cache only, mark it as NTA */
-    _MM_HINT_ENTA = 4, /* exclusive version of _MM_HINT_NTA */
-    _MM_HINT_ET0 = 5,  /* exclusive version of _MM_HINT_T0 */
-    _MM_HINT_ET1 = 6,  /* exclusive version of _MM_HINT_T1 */
-    _MM_HINT_ET2 = 7   /* exclusive version of _MM_HINT_T2 */
-};
-
-// The bit field mapping to the FPCR(floating-point control register)
-typedef struct {
-    uint16_t res0;
-    uint8_t res1 : 6;
-    uint8_t bit22 : 1;
-    uint8_t bit23 : 1;
-    uint8_t bit24 : 1;
-    uint8_t res2 : 7;
-#if defined(__aarch64__)
-    uint32_t res3;
-#endif
-} fpcr_bitfield;
-
-// Takes the upper 64 bits of a and places it in the low end of the result
-// Takes the lower 64 bits of b and places it into the high end of the result.
-FORCE_INLINE __m128 _mm_shuffle_ps_1032(__m128 a, __m128 b)
-{
-    float32x2_t a32 = vget_high_f32(vreinterpretq_f32_m128(a));
-    float32x2_t b10 = vget_low_f32(vreinterpretq_f32_m128(b));
-    return vreinterpretq_m128_f32(vcombine_f32(a32, b10));
-}
-
-// takes the lower two 32-bit values from a and swaps them and places in high
-// end of result takes the higher two 32 bit values from b and swaps them and
-// places in low end of result.
-FORCE_INLINE __m128 _mm_shuffle_ps_2301(__m128 a, __m128 b)
-{
-    float32x2_t a01 = vrev64_f32(vget_low_f32(vreinterpretq_f32_m128(a)));
-    float32x2_t b23 = vrev64_f32(vget_high_f32(vreinterpretq_f32_m128(b)));
-    return vreinterpretq_m128_f32(vcombine_f32(a01, b23));
-}
-
-FORCE_INLINE __m128 _mm_shuffle_ps_0321(__m128 a, __m128 b)
-{
-    float32x2_t a21 = vget_high_f32(
-        vextq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a), 3));
-    float32x2_t b03 = vget_low_f32(
-        vextq_f32(vreinterpretq_f32_m128(b), vreinterpretq_f32_m128(b), 3));
-    return vreinterpretq_m128_f32(vcombine_f32(a21, b03));
-}
-
-FORCE_INLINE __m128 _mm_shuffle_ps_2103(__m128 a, __m128 b)
-{
-    float32x2_t a03 = vget_low_f32(
-        vextq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a), 3));
-    float32x2_t b21 = vget_high_f32(
-        vextq_f32(vreinterpretq_f32_m128(b), vreinterpretq_f32_m128(b), 3));
-    return vreinterpretq_m128_f32(vcombine_f32(a03, b21));
-}
-
-FORCE_INLINE __m128 _mm_shuffle_ps_1010(__m128 a, __m128 b)
-{
-    float32x2_t a10 = vget_low_f32(vreinterpretq_f32_m128(a));
-    float32x2_t b10 = vget_low_f32(vreinterpretq_f32_m128(b));
-    return vreinterpretq_m128_f32(vcombine_f32(a10, b10));
-}
-
-FORCE_INLINE __m128 _mm_shuffle_ps_1001(__m128 a, __m128 b)
-{
-    float32x2_t a01 = vrev64_f32(vget_low_f32(vreinterpretq_f32_m128(a)));
-    float32x2_t b10 = vget_low_f32(vreinterpretq_f32_m128(b));
-    return vreinterpretq_m128_f32(vcombine_f32(a01, b10));
-}
-
-FORCE_INLINE __m128 _mm_shuffle_ps_0101(__m128 a, __m128 b)
-{
-    float32x2_t a01 = vrev64_f32(vget_low_f32(vreinterpretq_f32_m128(a)));
-    float32x2_t b01 = vrev64_f32(vget_low_f32(vreinterpretq_f32_m128(b)));
-    return vreinterpretq_m128_f32(vcombine_f32(a01, b01));
-}
-
-// keeps the low 64 bits of b in the low and puts the high 64 bits of a in the
-// high
-FORCE_INLINE __m128 _mm_shuffle_ps_3210(__m128 a, __m128 b)
-{
-    float32x2_t a10 = vget_low_f32(vreinterpretq_f32_m128(a));
-    float32x2_t b32 = vget_high_f32(vreinterpretq_f32_m128(b));
-    return vreinterpretq_m128_f32(vcombine_f32(a10, b32));
-}
-
-FORCE_INLINE __m128 _mm_shuffle_ps_0011(__m128 a, __m128 b)
-{
-    float32x2_t a11 = vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(a)), 1);
-    float32x2_t b00 = vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(b)), 0);
-    return vreinterpretq_m128_f32(vcombine_f32(a11, b00));
-}
-
-FORCE_INLINE __m128 _mm_shuffle_ps_0022(__m128 a, __m128 b)
-{
-    float32x2_t a22 =
-        vdup_lane_f32(vget_high_f32(vreinterpretq_f32_m128(a)), 0);
-    float32x2_t b00 = vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(b)), 0);
-    return vreinterpretq_m128_f32(vcombine_f32(a22, b00));
-}
-
-FORCE_INLINE __m128 _mm_shuffle_ps_2200(__m128 a, __m128 b)
-{
-    float32x2_t a00 = vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(a)), 0);
-    float32x2_t b22 =
-        vdup_lane_f32(vget_high_f32(vreinterpretq_f32_m128(b)), 0);
-    return vreinterpretq_m128_f32(vcombine_f32(a00, b22));
-}
-
-FORCE_INLINE __m128 _mm_shuffle_ps_3202(__m128 a, __m128 b)
-{
-    float32_t a0 = vgetq_lane_f32(vreinterpretq_f32_m128(a), 0);
-    float32x2_t a22 =
-        vdup_lane_f32(vget_high_f32(vreinterpretq_f32_m128(a)), 0);
-    float32x2_t a02 = vset_lane_f32(a0, a22, 1); /* TODO: use vzip ?*/
-    float32x2_t b32 = vget_high_f32(vreinterpretq_f32_m128(b));
-    return vreinterpretq_m128_f32(vcombine_f32(a02, b32));
-}
-
-FORCE_INLINE __m128 _mm_shuffle_ps_1133(__m128 a, __m128 b)
-{
-    float32x2_t a33 =
-        vdup_lane_f32(vget_high_f32(vreinterpretq_f32_m128(a)), 1);
-    float32x2_t b11 = vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(b)), 1);
-    return vreinterpretq_m128_f32(vcombine_f32(a33, b11));
-}
-
-FORCE_INLINE __m128 _mm_shuffle_ps_2010(__m128 a, __m128 b)
-{
-    float32x2_t a10 = vget_low_f32(vreinterpretq_f32_m128(a));
-    float32_t b2 = vgetq_lane_f32(vreinterpretq_f32_m128(b), 2);
-    float32x2_t b00 = vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(b)), 0);
-    float32x2_t b20 = vset_lane_f32(b2, b00, 1);
-    return vreinterpretq_m128_f32(vcombine_f32(a10, b20));
-}
-
-FORCE_INLINE __m128 _mm_shuffle_ps_2001(__m128 a, __m128 b)
-{
-    float32x2_t a01 = vrev64_f32(vget_low_f32(vreinterpretq_f32_m128(a)));
-    float32_t b2 = vgetq_lane_f32(b, 2);
-    float32x2_t b00 = vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(b)), 0);
-    float32x2_t b20 = vset_lane_f32(b2, b00, 1);
-    return vreinterpretq_m128_f32(vcombine_f32(a01, b20));
-}
-
-FORCE_INLINE __m128 _mm_shuffle_ps_2032(__m128 a, __m128 b)
-{
-    float32x2_t a32 = vget_high_f32(vreinterpretq_f32_m128(a));
-    float32_t b2 = vgetq_lane_f32(b, 2);
-    float32x2_t b00 = vdup_lane_f32(vget_low_f32(vreinterpretq_f32_m128(b)), 0);
-    float32x2_t b20 = vset_lane_f32(b2, b00, 1);
-    return vreinterpretq_m128_f32(vcombine_f32(a32, b20));
-}
-
-// Kahan summation for accurate summation of floating-point numbers.
-// http://blog.zachbjornson.com/2019/08/11/fast-float-summation.html
-FORCE_INLINE void _sse2neon_kadd_f32(float *sum, float *c, float y)
-{
-    y -= *c;
-    float t = *sum + y;
-    *c = (t - *sum) - y;
-    *sum = t;
-}
-
-#if defined(__ARM_FEATURE_CRYPTO)
-// Wraps vmull_p64
-FORCE_INLINE uint64x2_t _sse2neon_vmull_p64(uint64x1_t _a, uint64x1_t _b)
-{
-    poly64_t a = vget_lane_p64(vreinterpret_p64_u64(_a), 0);
-    poly64_t b = vget_lane_p64(vreinterpret_p64_u64(_b), 0);
-    return vreinterpretq_u64_p128(vmull_p64(a, b));
-}
-#else  // ARMv7 polyfill
-// ARMv7/some A64 lacks vmull_p64, but it has vmull_p8.
-//
-// vmull_p8 calculates 8 8-bit->16-bit polynomial multiplies, but we need a
-// 64-bit->128-bit polynomial multiply.
-//
-// It needs some work and is somewhat slow, but it is still faster than all
-// known scalar methods.
-//
-// Algorithm adapted to C from
-// https://www.workofard.com/2017/07/ghash-for-low-end-cores/, which is adapted
-// from "Fast Software Polynomial Multiplication on ARM Processors Using the
-// NEON Engine" by Danilo Camara, Conrado Gouvea, Julio Lopez and Ricardo Dahab
-// (https://hal.inria.fr/hal-01506572)
-static uint64x2_t _sse2neon_vmull_p64(uint64x1_t _a, uint64x1_t _b)
-{
-    poly8x8_t a = vreinterpret_p8_u64(_a);
-    poly8x8_t b = vreinterpret_p8_u64(_b);
-
-    // Masks
-    uint8x16_t k48_32 = vcombine_u8(vcreate_u8(0x0000ffffffffffff),
-                                    vcreate_u8(0x00000000ffffffff));
-    uint8x16_t k16_00 = vcombine_u8(vcreate_u8(0x000000000000ffff),
-                                    vcreate_u8(0x0000000000000000));
-
-    // Do the multiplies, rotating with vext to get all combinations
-    uint8x16_t d = vreinterpretq_u8_p16(vmull_p8(a, b));  // D = A0 * B0
-    uint8x16_t e =
-        vreinterpretq_u8_p16(vmull_p8(a, vext_p8(b, b, 1)));  // E = A0 * B1
-    uint8x16_t f =
-        vreinterpretq_u8_p16(vmull_p8(vext_p8(a, a, 1), b));  // F = A1 * B0
-    uint8x16_t g =
-        vreinterpretq_u8_p16(vmull_p8(a, vext_p8(b, b, 2)));  // G = A0 * B2
-    uint8x16_t h =
-        vreinterpretq_u8_p16(vmull_p8(vext_p8(a, a, 2), b));  // H = A2 * B0
-    uint8x16_t i =
-        vreinterpretq_u8_p16(vmull_p8(a, vext_p8(b, b, 3)));  // I = A0 * B3
-    uint8x16_t j =
-        vreinterpretq_u8_p16(vmull_p8(vext_p8(a, a, 3), b));  // J = A3 * B0
-    uint8x16_t k =
-        vreinterpretq_u8_p16(vmull_p8(a, vext_p8(b, b, 4)));  // L = A0 * B4
-
-    // Add cross products
-    uint8x16_t l = veorq_u8(e, f);  // L = E + F
-    uint8x16_t m = veorq_u8(g, h);  // M = G + H
-    uint8x16_t n = veorq_u8(i, j);  // N = I + J
-
-    // Interleave. Using vzip1 and vzip2 prevents Clang from emitting TBL
-    // instructions.
-#if defined(__aarch64__)
-    uint8x16_t lm_p0 = vreinterpretq_u8_u64(
-        vzip1q_u64(vreinterpretq_u64_u8(l), vreinterpretq_u64_u8(m)));
-    uint8x16_t lm_p1 = vreinterpretq_u8_u64(
-        vzip2q_u64(vreinterpretq_u64_u8(l), vreinterpretq_u64_u8(m)));
-    uint8x16_t nk_p0 = vreinterpretq_u8_u64(
-        vzip1q_u64(vreinterpretq_u64_u8(n), vreinterpretq_u64_u8(k)));
-    uint8x16_t nk_p1 = vreinterpretq_u8_u64(
-        vzip2q_u64(vreinterpretq_u64_u8(n), vreinterpretq_u64_u8(k)));
-#else
-    uint8x16_t lm_p0 = vcombine_u8(vget_low_u8(l), vget_low_u8(m));
-    uint8x16_t lm_p1 = vcombine_u8(vget_high_u8(l), vget_high_u8(m));
-    uint8x16_t nk_p0 = vcombine_u8(vget_low_u8(n), vget_low_u8(k));
-    uint8x16_t nk_p1 = vcombine_u8(vget_high_u8(n), vget_high_u8(k));
-#endif
-    // t0 = (L) (P0 + P1) << 8
-    // t1 = (M) (P2 + P3) << 16
-    uint8x16_t t0t1_tmp = veorq_u8(lm_p0, lm_p1);
-    uint8x16_t t0t1_h = vandq_u8(lm_p1, k48_32);
-    uint8x16_t t0t1_l = veorq_u8(t0t1_tmp, t0t1_h);
-
-    // t2 = (N) (P4 + P5) << 24
-    // t3 = (K) (P6 + P7) << 32
-    uint8x16_t t2t3_tmp = veorq_u8(nk_p0, nk_p1);
-    uint8x16_t t2t3_h = vandq_u8(nk_p1, k16_00);
-    uint8x16_t t2t3_l = veorq_u8(t2t3_tmp, t2t3_h);
-
-    // De-interleave
-#if defined(__aarch64__)
-    uint8x16_t t0 = vreinterpretq_u8_u64(
-        vuzp1q_u64(vreinterpretq_u64_u8(t0t1_l), vreinterpretq_u64_u8(t0t1_h)));
-    uint8x16_t t1 = vreinterpretq_u8_u64(
-        vuzp2q_u64(vreinterpretq_u64_u8(t0t1_l), vreinterpretq_u64_u8(t0t1_h)));
-    uint8x16_t t2 = vreinterpretq_u8_u64(
-        vuzp1q_u64(vreinterpretq_u64_u8(t2t3_l), vreinterpretq_u64_u8(t2t3_h)));
-    uint8x16_t t3 = vreinterpretq_u8_u64(
-        vuzp2q_u64(vreinterpretq_u64_u8(t2t3_l), vreinterpretq_u64_u8(t2t3_h)));
-#else
-    uint8x16_t t1 = vcombine_u8(vget_high_u8(t0t1_l), vget_high_u8(t0t1_h));
-    uint8x16_t t0 = vcombine_u8(vget_low_u8(t0t1_l), vget_low_u8(t0t1_h));
-    uint8x16_t t3 = vcombine_u8(vget_high_u8(t2t3_l), vget_high_u8(t2t3_h));
-    uint8x16_t t2 = vcombine_u8(vget_low_u8(t2t3_l), vget_low_u8(t2t3_h));
-#endif
-    // Shift the cross products
-    uint8x16_t t0_shift = vextq_u8(t0, t0, 15);  // t0 << 8
-    uint8x16_t t1_shift = vextq_u8(t1, t1, 14);  // t1 << 16
-    uint8x16_t t2_shift = vextq_u8(t2, t2, 13);  // t2 << 24
-    uint8x16_t t3_shift = vextq_u8(t3, t3, 12);  // t3 << 32
-
-    // Accumulate the products
-    uint8x16_t cross1 = veorq_u8(t0_shift, t1_shift);
-    uint8x16_t cross2 = veorq_u8(t2_shift, t3_shift);
-    uint8x16_t mix = veorq_u8(d, cross1);
-    uint8x16_t r = veorq_u8(mix, cross2);
-    return vreinterpretq_u64_u8(r);
-}
-#endif  // ARMv7 polyfill
-
-// C equivalent:
-//   __m128i _mm_shuffle_epi32_default(__m128i a,
-//                                     __constrange(0, 255) int imm) {
-//       __m128i ret;
-//       ret[0] = a[imm        & 0x3];   ret[1] = a[(imm >> 2) & 0x3];
-//       ret[2] = a[(imm >> 4) & 0x03];  ret[3] = a[(imm >> 6) & 0x03];
-//       return ret;
-//   }
-#define _mm_shuffle_epi32_default(a, imm)                                   \
-    __extension__({                                                         \
-        int32x4_t ret;                                                      \
-        ret = vmovq_n_s32(                                                  \
-            vgetq_lane_s32(vreinterpretq_s32_m128i(a), (imm) & (0x3)));     \
-        ret = vsetq_lane_s32(                                               \
-            vgetq_lane_s32(vreinterpretq_s32_m128i(a), ((imm) >> 2) & 0x3), \
-            ret, 1);                                                        \
-        ret = vsetq_lane_s32(                                               \
-            vgetq_lane_s32(vreinterpretq_s32_m128i(a), ((imm) >> 4) & 0x3), \
-            ret, 2);                                                        \
-        ret = vsetq_lane_s32(                                               \
-            vgetq_lane_s32(vreinterpretq_s32_m128i(a), ((imm) >> 6) & 0x3), \
-            ret, 3);                                                        \
-        vreinterpretq_m128i_s32(ret);                                       \
-    })
-
-// Takes the upper 64 bits of a and places it in the low end of the result
-// Takes the lower 64 bits of a and places it into the high end of the result.
-FORCE_INLINE __m128i _mm_shuffle_epi_1032(__m128i a)
-{
-    int32x2_t a32 = vget_high_s32(vreinterpretq_s32_m128i(a));
-    int32x2_t a10 = vget_low_s32(vreinterpretq_s32_m128i(a));
-    return vreinterpretq_m128i_s32(vcombine_s32(a32, a10));
-}
-
-// takes the lower two 32-bit values from a and swaps them and places in low end
-// of result takes the higher two 32 bit values from a and swaps them and places
-// in high end of result.
-FORCE_INLINE __m128i _mm_shuffle_epi_2301(__m128i a)
-{
-    int32x2_t a01 = vrev64_s32(vget_low_s32(vreinterpretq_s32_m128i(a)));
-    int32x2_t a23 = vrev64_s32(vget_high_s32(vreinterpretq_s32_m128i(a)));
-    return vreinterpretq_m128i_s32(vcombine_s32(a01, a23));
-}
-
-// rotates the least significant 32 bits into the most significant 32 bits, and
-// shifts the rest down
-FORCE_INLINE __m128i _mm_shuffle_epi_0321(__m128i a)
-{
-    return vreinterpretq_m128i_s32(
-        vextq_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(a), 1));
-}
-
-// rotates the most significant 32 bits into the least significant 32 bits, and
-// shifts the rest up
-FORCE_INLINE __m128i _mm_shuffle_epi_2103(__m128i a)
-{
-    return vreinterpretq_m128i_s32(
-        vextq_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(a), 3));
-}
-
-// gets the lower 64 bits of a, and places it in the upper 64 bits
-// gets the lower 64 bits of a and places it in the lower 64 bits
-FORCE_INLINE __m128i _mm_shuffle_epi_1010(__m128i a)
-{
-    int32x2_t a10 = vget_low_s32(vreinterpretq_s32_m128i(a));
-    return vreinterpretq_m128i_s32(vcombine_s32(a10, a10));
-}
-
-// gets the lower 64 bits of a, swaps the 0 and 1 elements, and places it in the
-// lower 64 bits gets the lower 64 bits of a, and places it in the upper 64 bits
-FORCE_INLINE __m128i _mm_shuffle_epi_1001(__m128i a)
-{
-    int32x2_t a01 = vrev64_s32(vget_low_s32(vreinterpretq_s32_m128i(a)));
-    int32x2_t a10 = vget_low_s32(vreinterpretq_s32_m128i(a));
-    return vreinterpretq_m128i_s32(vcombine_s32(a01, a10));
-}
-
-// gets the lower 64 bits of a, swaps the 0 and 1 elements and places it in the
-// upper 64 bits gets the lower 64 bits of a, swaps the 0 and 1 elements, and
-// places it in the lower 64 bits
-FORCE_INLINE __m128i _mm_shuffle_epi_0101(__m128i a)
-{
-    int32x2_t a01 = vrev64_s32(vget_low_s32(vreinterpretq_s32_m128i(a)));
-    return vreinterpretq_m128i_s32(vcombine_s32(a01, a01));
-}
-
-FORCE_INLINE __m128i _mm_shuffle_epi_2211(__m128i a)
-{
-    int32x2_t a11 = vdup_lane_s32(vget_low_s32(vreinterpretq_s32_m128i(a)), 1);
-    int32x2_t a22 = vdup_lane_s32(vget_high_s32(vreinterpretq_s32_m128i(a)), 0);
-    return vreinterpretq_m128i_s32(vcombine_s32(a11, a22));
-}
-
-FORCE_INLINE __m128i _mm_shuffle_epi_0122(__m128i a)
-{
-    int32x2_t a22 = vdup_lane_s32(vget_high_s32(vreinterpretq_s32_m128i(a)), 0);
-    int32x2_t a01 = vrev64_s32(vget_low_s32(vreinterpretq_s32_m128i(a)));
-    return vreinterpretq_m128i_s32(vcombine_s32(a22, a01));
-}
-
-FORCE_INLINE __m128i _mm_shuffle_epi_3332(__m128i a)
-{
-    int32x2_t a32 = vget_high_s32(vreinterpretq_s32_m128i(a));
-    int32x2_t a33 = vdup_lane_s32(vget_high_s32(vreinterpretq_s32_m128i(a)), 1);
-    return vreinterpretq_m128i_s32(vcombine_s32(a32, a33));
-}
-
-// FORCE_INLINE __m128i _mm_shuffle_epi32_splat(__m128i a, __constrange(0,255)
-// int imm)
-#if defined(__aarch64__)
-#define _mm_shuffle_epi32_splat(a, imm)                          \
-    __extension__({                                              \
-        vreinterpretq_m128i_s32(                                 \
-            vdupq_laneq_s32(vreinterpretq_s32_m128i(a), (imm))); \
-    })
-#else
-#define _mm_shuffle_epi32_splat(a, imm)                                      \
-    __extension__({                                                          \
-        vreinterpretq_m128i_s32(                                             \
-            vdupq_n_s32(vgetq_lane_s32(vreinterpretq_s32_m128i(a), (imm)))); \
-    })
-#endif
-
-// NEON does not support a general purpose permute intrinsic
-// Selects four specific single-precision, floating-point values from a and b,
-// based on the mask i.
-//
-// C equivalent:
-//   __m128 _mm_shuffle_ps_default(__m128 a, __m128 b,
-//                                 __constrange(0, 255) int imm) {
-//       __m128 ret;
-//       ret[0] = a[imm        & 0x3];   ret[1] = a[(imm >> 2) & 0x3];
-//       ret[2] = b[(imm >> 4) & 0x03];  ret[3] = b[(imm >> 6) & 0x03];
-//       return ret;
-//   }
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/5f0858x0(v=vs.100).aspx
-#define _mm_shuffle_ps_default(a, b, imm)                                  \
-    __extension__({                                                        \
-        float32x4_t ret;                                                   \
-        ret = vmovq_n_f32(                                                 \
-            vgetq_lane_f32(vreinterpretq_f32_m128(a), (imm) & (0x3)));     \
-        ret = vsetq_lane_f32(                                              \
-            vgetq_lane_f32(vreinterpretq_f32_m128(a), ((imm) >> 2) & 0x3), \
-            ret, 1);                                                       \
-        ret = vsetq_lane_f32(                                              \
-            vgetq_lane_f32(vreinterpretq_f32_m128(b), ((imm) >> 4) & 0x3), \
-            ret, 2);                                                       \
-        ret = vsetq_lane_f32(                                              \
-            vgetq_lane_f32(vreinterpretq_f32_m128(b), ((imm) >> 6) & 0x3), \
-            ret, 3);                                                       \
-        vreinterpretq_m128_f32(ret);                                       \
-    })
-
-// Shuffles the lower 4 signed or unsigned 16-bit integers in a as specified
-// by imm.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/y41dkk37(v=vs.100)
-// FORCE_INLINE __m128i _mm_shufflelo_epi16_function(__m128i a,
-//                                                   __constrange(0,255) int
-//                                                   imm)
-#define _mm_shufflelo_epi16_function(a, imm)                                  \
-    __extension__({                                                           \
-        int16x8_t ret = vreinterpretq_s16_m128i(a);                           \
-        int16x4_t lowBits = vget_low_s16(ret);                                \
-        ret = vsetq_lane_s16(vget_lane_s16(lowBits, (imm) & (0x3)), ret, 0);  \
-        ret = vsetq_lane_s16(vget_lane_s16(lowBits, ((imm) >> 2) & 0x3), ret, \
-                             1);                                              \
-        ret = vsetq_lane_s16(vget_lane_s16(lowBits, ((imm) >> 4) & 0x3), ret, \
-                             2);                                              \
-        ret = vsetq_lane_s16(vget_lane_s16(lowBits, ((imm) >> 6) & 0x3), ret, \
-                             3);                                              \
-        vreinterpretq_m128i_s16(ret);                                         \
-    })
-
-// Shuffles the upper 4 signed or unsigned 16-bit integers in a as specified
-// by imm.
-// https://msdn.microsoft.com/en-us/library/13ywktbs(v=vs.100).aspx
-// FORCE_INLINE __m128i _mm_shufflehi_epi16_function(__m128i a,
-//                                                   __constrange(0,255) int
-//                                                   imm)
-#define _mm_shufflehi_epi16_function(a, imm)                                   \
-    __extension__({                                                            \
-        int16x8_t ret = vreinterpretq_s16_m128i(a);                            \
-        int16x4_t highBits = vget_high_s16(ret);                               \
-        ret = vsetq_lane_s16(vget_lane_s16(highBits, (imm) & (0x3)), ret, 4);  \
-        ret = vsetq_lane_s16(vget_lane_s16(highBits, ((imm) >> 2) & 0x3), ret, \
-                             5);                                               \
-        ret = vsetq_lane_s16(vget_lane_s16(highBits, ((imm) >> 4) & 0x3), ret, \
-                             6);                                               \
-        ret = vsetq_lane_s16(vget_lane_s16(highBits, ((imm) >> 6) & 0x3), ret, \
-                             7);                                               \
-        vreinterpretq_m128i_s16(ret);                                          \
-    })
-
-/* MMX */
-
-//_mm_empty is a no-op on arm
-FORCE_INLINE void _mm_empty(void) {}
-
-/* SSE */
-
-// Adds the four single-precision, floating-point values of a and b.
-//
-//   r0 := a0 + b0
-//   r1 := a1 + b1
-//   r2 := a2 + b2
-//   r3 := a3 + b3
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/c9848chc(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_add_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_f32(
-        vaddq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-}
-
-// adds the scalar single-precision floating point values of a and b.
-// https://msdn.microsoft.com/en-us/library/be94x2y6(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_add_ss(__m128 a, __m128 b)
-{
-    float32_t b0 = vgetq_lane_f32(vreinterpretq_f32_m128(b), 0);
-    float32x4_t value = vsetq_lane_f32(b0, vdupq_n_f32(0), 0);
-    // the upper values in the result must be the remnants of <a>.
-    return vreinterpretq_m128_f32(vaddq_f32(a, value));
-}
-
-// Computes the bitwise AND of the four single-precision, floating-point values
-// of a and b.
-//
-//   r0 := a0 & b0
-//   r1 := a1 & b1
-//   r2 := a2 & b2
-//   r3 := a3 & b3
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/73ck1xc5(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_and_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_s32(
-        vandq_s32(vreinterpretq_s32_m128(a), vreinterpretq_s32_m128(b)));
-}
-
-// Computes the bitwise AND-NOT of the four single-precision, floating-point
-// values of a and b.
-//
-//   r0 := ~a0 & b0
-//   r1 := ~a1 & b1
-//   r2 := ~a2 & b2
-//   r3 := ~a3 & b3
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/68h7wd02(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_andnot_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_s32(
-        vbicq_s32(vreinterpretq_s32_m128(b),
-                  vreinterpretq_s32_m128(a)));  // *NOTE* argument swap
-}
-
-// Average packed unsigned 16-bit integers in a and b, and store the results in
-// dst.
-//
-//   FOR j := 0 to 3
-//     i := j*16
-//     dst[i+15:i] := (a[i+15:i] + b[i+15:i] + 1) >> 1
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_avg_pu16
-FORCE_INLINE __m64 _mm_avg_pu16(__m64 a, __m64 b)
-{
-    return vreinterpret_m64_u16(
-        vrhadd_u16(vreinterpret_u16_m64(a), vreinterpret_u16_m64(b)));
-}
-
-// Average packed unsigned 8-bit integers in a and b, and store the results in
-// dst.
-//
-//   FOR j := 0 to 7
-//     i := j*8
-//     dst[i+7:i] := (a[i+7:i] + b[i+7:i] + 1) >> 1
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_avg_pu8
-FORCE_INLINE __m64 _mm_avg_pu8(__m64 a, __m64 b)
-{
-    return vreinterpret_m64_u8(
-        vrhadd_u8(vreinterpret_u8_m64(a), vreinterpret_u8_m64(b)));
-}
-
-// Compares for equality.
-// https://msdn.microsoft.com/en-us/library/vstudio/36aectz5(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_cmpeq_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_u32(
-        vceqq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-}
-
-// Compares for equality.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/k423z28e(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpeq_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_cmpeq_ps(a, b));
-}
-
-// Compares for greater than or equal.
-// https://msdn.microsoft.com/en-us/library/vstudio/fs813y2t(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_cmpge_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_u32(
-        vcgeq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-}
-
-// Compares for greater than or equal.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/kesh3ddc(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpge_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_cmpge_ps(a, b));
-}
-
-// Compares for greater than.
-//
-//   r0 := (a0 > b0) ? 0xffffffff : 0x0
-//   r1 := (a1 > b1) ? 0xffffffff : 0x0
-//   r2 := (a2 > b2) ? 0xffffffff : 0x0
-//   r3 := (a3 > b3) ? 0xffffffff : 0x0
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/11dy102s(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_cmpgt_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_u32(
-        vcgtq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-}
-
-// Compares for greater than.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/1xyyyy9e(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpgt_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_cmpgt_ps(a, b));
-}
-
-// Compares for less than or equal.
-//
-//   r0 := (a0 <= b0) ? 0xffffffff : 0x0
-//   r1 := (a1 <= b1) ? 0xffffffff : 0x0
-//   r2 := (a2 <= b2) ? 0xffffffff : 0x0
-//   r3 := (a3 <= b3) ? 0xffffffff : 0x0
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/1s75w83z(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_cmple_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_u32(
-        vcleq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-}
-
-// Compares for less than or equal.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/a7x0hbhw(v=vs.100)
-FORCE_INLINE __m128 _mm_cmple_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_cmple_ps(a, b));
-}
-
-// Compares for less than
-// https://msdn.microsoft.com/en-us/library/vstudio/f330yhc8(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_cmplt_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_u32(
-        vcltq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-}
-
-// Compares for less than
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/fy94wye7(v=vs.100)
-FORCE_INLINE __m128 _mm_cmplt_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_cmplt_ps(a, b));
-}
-
-// Compares for inequality.
-// https://msdn.microsoft.com/en-us/library/sf44thbx(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_cmpneq_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_u32(vmvnq_u32(
-        vceqq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b))));
-}
-
-// Compares for inequality.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/ekya8fh4(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpneq_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_cmpneq_ps(a, b));
-}
-
-// Compares for not greater than or equal.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/wsexys62(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpnge_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_u32(vmvnq_u32(
-        vcgeq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b))));
-}
-
-// Compares for not greater than or equal.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/fk2y80s8(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpnge_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_cmpnge_ps(a, b));
-}
-
-// Compares for not greater than.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/d0xh7w0s(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpngt_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_u32(vmvnq_u32(
-        vcgtq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b))));
-}
-
-// Compares for not greater than.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/z7x9ydwh(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpngt_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_cmpngt_ps(a, b));
-}
-
-// Compares for not less than or equal.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/6a330kxw(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpnle_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_u32(vmvnq_u32(
-        vcleq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b))));
-}
-
-// Compares for not less than or equal.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/z7x9ydwh(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpnle_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_cmpnle_ps(a, b));
-}
-
-// Compares for not less than.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/4686bbdw(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpnlt_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_u32(vmvnq_u32(
-        vcltq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b))));
-}
-
-// Compares for not less than.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/56b9z2wf(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpnlt_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_cmpnlt_ps(a, b));
-}
-
-// Compares the four 32-bit floats in a and b to check if any values are NaN.
-// Ordered compare between each value returns true for "orderable" and false for
-// "not orderable" (NaN).
-// https://msdn.microsoft.com/en-us/library/vstudio/0h9w00fx(v=vs.100).aspx see
-// also:
-// http://stackoverflow.com/questions/8627331/what-does-ordered-unordered-comparison-mean
-// http://stackoverflow.com/questions/29349621/neon-isnanval-intrinsics
-FORCE_INLINE __m128 _mm_cmpord_ps(__m128 a, __m128 b)
-{
-    // Note: NEON does not have ordered compare builtin
-    // Need to compare a eq a and b eq b to check for NaN
-    // Do AND of results to get final
-    uint32x4_t ceqaa =
-        vceqq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a));
-    uint32x4_t ceqbb =
-        vceqq_f32(vreinterpretq_f32_m128(b), vreinterpretq_f32_m128(b));
-    return vreinterpretq_m128_u32(vandq_u32(ceqaa, ceqbb));
-}
-
-// Compares for ordered.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/343t62da(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpord_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_cmpord_ps(a, b));
-}
-
-// Compares for unordered.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/khy6fk1t(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpunord_ps(__m128 a, __m128 b)
-{
-    uint32x4_t f32a =
-        vceqq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a));
-    uint32x4_t f32b =
-        vceqq_f32(vreinterpretq_f32_m128(b), vreinterpretq_f32_m128(b));
-    return vreinterpretq_m128_u32(vmvnq_u32(vandq_u32(f32a, f32b)));
-}
-
-// Compares for unordered.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/2as2387b(v=vs.100)
-FORCE_INLINE __m128 _mm_cmpunord_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_cmpunord_ps(a, b));
-}
-
-// Compares the lower single-precision floating point scalar values of a and b
-// using an equality operation. :
-// https://msdn.microsoft.com/en-us/library/93yx2h2b(v=vs.100).aspx
-FORCE_INLINE int _mm_comieq_ss(__m128 a, __m128 b)
-{
-    uint32x4_t a_eq_b =
-        vceqq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b));
-    return vgetq_lane_u32(a_eq_b, 0) & 0x1;
-}
-
-// Compares the lower single-precision floating point scalar values of a and b
-// using a greater than or equal operation. :
-// https://msdn.microsoft.com/en-us/library/8t80des6(v=vs.100).aspx
-FORCE_INLINE int _mm_comige_ss(__m128 a, __m128 b)
-{
-    uint32x4_t a_ge_b =
-        vcgeq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b));
-    return vgetq_lane_u32(a_ge_b, 0) & 0x1;
-}
-
-// Compares the lower single-precision floating point scalar values of a and b
-// using a greater than operation. :
-// https://msdn.microsoft.com/en-us/library/b0738e0t(v=vs.100).aspx
-FORCE_INLINE int _mm_comigt_ss(__m128 a, __m128 b)
-{
-    uint32x4_t a_gt_b =
-        vcgtq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b));
-    return vgetq_lane_u32(a_gt_b, 0) & 0x1;
-}
-
-// Compares the lower single-precision floating point scalar values of a and b
-// using a less than or equal operation. :
-// https://msdn.microsoft.com/en-us/library/1w4t7c57(v=vs.90).aspx
-FORCE_INLINE int _mm_comile_ss(__m128 a, __m128 b)
-{
-    uint32x4_t a_le_b =
-        vcleq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b));
-    return vgetq_lane_u32(a_le_b, 0) & 0x1;
-}
-
-// Compares the lower single-precision floating point scalar values of a and b
-// using a less than operation. :
-// https://msdn.microsoft.com/en-us/library/2kwe606b(v=vs.90).aspx Important
-// note!! The documentation on MSDN is incorrect!  If either of the values is a
-// NAN the docs say you will get a one, but in fact, it will return a zero!!
-FORCE_INLINE int _mm_comilt_ss(__m128 a, __m128 b)
-{
-    uint32x4_t a_lt_b =
-        vcltq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b));
-    return vgetq_lane_u32(a_lt_b, 0) & 0x1;
-}
-
-// Compares the lower single-precision floating point scalar values of a and b
-// using an inequality operation. :
-// https://msdn.microsoft.com/en-us/library/bafh5e0a(v=vs.90).aspx
-FORCE_INLINE int _mm_comineq_ss(__m128 a, __m128 b)
-{
-    return !_mm_comieq_ss(a, b);
-}
-
-// Convert packed signed 32-bit integers in b to packed single-precision
-// (32-bit) floating-point elements, store the results in the lower 2 elements
-// of dst, and copy the upper 2 packed elements from a to the upper elements of
-// dst.
-//
-//   dst[31:0] := Convert_Int32_To_FP32(b[31:0])
-//   dst[63:32] := Convert_Int32_To_FP32(b[63:32])
-//   dst[95:64] := a[95:64]
-//   dst[127:96] := a[127:96]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvt_pi2ps
-FORCE_INLINE __m128 _mm_cvt_pi2ps(__m128 a, __m64 b)
-{
-    return vreinterpretq_m128_f32(
-        vcombine_f32(vcvt_f32_s32(vreinterpret_s32_m64(b)),
-                     vget_high_f32(vreinterpretq_f32_m128(a))));
-}
-
-// Convert packed single-precision (32-bit) floating-point elements in a to
-// packed 32-bit integers, and store the results in dst.
-//
-//   FOR j := 0 to 1
-//       i := 32*j
-//       dst[i+31:i] := Convert_FP32_To_Int32(a[i+31:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvt_ps2pi
-FORCE_INLINE __m64 _mm_cvt_ps2pi(__m128 a)
-{
-#if defined(__aarch64__)
-    return vreinterpret_m64_s32(
-        vget_low_s32(vcvtnq_s32_f32(vrndiq_f32(vreinterpretq_f32_m128(a)))));
-#else
-    return vreinterpret_m64_s32(vcvt_s32_f32(vget_low_f32(
-        vreinterpretq_f32_m128(_mm_round_ps(a, _MM_FROUND_CUR_DIRECTION)))));
-#endif
-}
-
-// Convert the signed 32-bit integer b to a single-precision (32-bit)
-// floating-point element, store the result in the lower element of dst, and
-// copy the upper 3 packed elements from a to the upper elements of dst.
-//
-//   dst[31:0] := Convert_Int32_To_FP32(b[31:0])
-//   dst[127:32] := a[127:32]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvt_si2ss
-FORCE_INLINE __m128 _mm_cvt_si2ss(__m128 a, int b)
-{
-    return vreinterpretq_m128_f32(
-        vsetq_lane_f32((float) b, vreinterpretq_f32_m128(a), 0));
-}
-
-// Convert the lower single-precision (32-bit) floating-point element in a to a
-// 32-bit integer, and store the result in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvt_ss2si
-FORCE_INLINE int _mm_cvt_ss2si(__m128 a)
-{
-#if defined(__aarch64__)
-    return vgetq_lane_s32(vcvtnq_s32_f32(vrndiq_f32(vreinterpretq_f32_m128(a))),
-                          0);
-#else
-    float32_t data = vgetq_lane_f32(
-        vreinterpretq_f32_m128(_mm_round_ps(a, _MM_FROUND_CUR_DIRECTION)), 0);
-    return (int32_t) data;
-#endif
-}
-
-// Convert packed 16-bit integers in a to packed single-precision (32-bit)
-// floating-point elements, and store the results in dst.
-//
-//   FOR j := 0 to 3
-//      i := j*16
-//      m := j*32
-//      dst[m+31:m] := Convert_Int16_To_FP32(a[i+15:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtpi16_ps
-FORCE_INLINE __m128 _mm_cvtpi16_ps(__m64 a)
-{
-    return vreinterpretq_m128_f32(
-        vcvtq_f32_s32(vmovl_s16(vreinterpret_s16_m64(a))));
-}
-
-// Convert packed 32-bit integers in b to packed single-precision (32-bit)
-// floating-point elements, store the results in the lower 2 elements of dst,
-// and copy the upper 2 packed elements from a to the upper elements of dst.
-//
-//   dst[31:0] := Convert_Int32_To_FP32(b[31:0])
-//   dst[63:32] := Convert_Int32_To_FP32(b[63:32])
-//   dst[95:64] := a[95:64]
-//   dst[127:96] := a[127:96]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtpi32_ps
-FORCE_INLINE __m128 _mm_cvtpi32_ps(__m128 a, __m64 b)
-{
-    return vreinterpretq_m128_f32(
-        vcombine_f32(vcvt_f32_s32(vreinterpret_s32_m64(b)),
-                     vget_high_f32(vreinterpretq_f32_m128(a))));
-}
-
-// Convert packed signed 32-bit integers in a to packed single-precision
-// (32-bit) floating-point elements, store the results in the lower 2 elements
-// of dst, then covert the packed signed 32-bit integers in b to
-// single-precision (32-bit) floating-point element, and store the results in
-// the upper 2 elements of dst.
-//
-//   dst[31:0] := Convert_Int32_To_FP32(a[31:0])
-//   dst[63:32] := Convert_Int32_To_FP32(a[63:32])
-//   dst[95:64] := Convert_Int32_To_FP32(b[31:0])
-//   dst[127:96] := Convert_Int32_To_FP32(b[63:32])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtpi32x2_ps
-FORCE_INLINE __m128 _mm_cvtpi32x2_ps(__m64 a, __m64 b)
-{
-    return vreinterpretq_m128_f32(vcvtq_f32_s32(
-        vcombine_s32(vreinterpret_s32_m64(a), vreinterpret_s32_m64(b))));
-}
-
-// Convert the lower packed 8-bit integers in a to packed single-precision
-// (32-bit) floating-point elements, and store the results in dst.
-//
-//   FOR j := 0 to 3
-//      i := j*8
-//      m := j*32
-//      dst[m+31:m] := Convert_Int8_To_FP32(a[i+7:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtpi8_ps
-FORCE_INLINE __m128 _mm_cvtpi8_ps(__m64 a)
-{
-    return vreinterpretq_m128_f32(vcvtq_f32_s32(
-        vmovl_s16(vget_low_s16(vmovl_s8(vreinterpret_s8_m64(a))))));
-}
-
-// Convert packed single-precision (32-bit) floating-point elements in a to
-// packed 16-bit integers, and store the results in dst. Note: this intrinsic
-// will generate 0x7FFF, rather than 0x8000, for input values between 0x7FFF and
-// 0x7FFFFFFF.
-//
-//   FOR j := 0 to 3
-//     i := 16*j
-//     k := 32*j
-//     IF a[k+31:k] >= FP32(0x7FFF) && a[k+31:k] <= FP32(0x7FFFFFFF)
-//       dst[i+15:i] := 0x7FFF
-//     ELSE
-//       dst[i+15:i] := Convert_FP32_To_Int16(a[k+31:k])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtps_pi16
-FORCE_INLINE __m64 _mm_cvtps_pi16(__m128 a)
-{
-    const __m128 i16Min = _mm_set_ps1((float) INT16_MIN);
-    const __m128 i16Max = _mm_set_ps1((float) INT16_MAX);
-    const __m128 i32Max = _mm_set_ps1((float) INT32_MAX);
-    const __m128i maxMask = _mm_castps_si128(
-        _mm_and_ps(_mm_cmpge_ps(a, i16Max), _mm_cmple_ps(a, i32Max)));
-    const __m128i betweenMask = _mm_castps_si128(
-        _mm_and_ps(_mm_cmpgt_ps(a, i16Min), _mm_cmplt_ps(a, i16Max)));
-    const __m128i minMask = _mm_cmpeq_epi32(_mm_or_si128(maxMask, betweenMask),
-                                            _mm_setzero_si128());
-    __m128i max = _mm_and_si128(maxMask, _mm_set1_epi32(INT16_MAX));
-    __m128i min = _mm_and_si128(minMask, _mm_set1_epi32(INT16_MIN));
-    __m128i cvt = _mm_and_si128(betweenMask, _mm_cvtps_epi32(a));
-    __m128i res32 = _mm_or_si128(_mm_or_si128(max, min), cvt);
-    return vreinterpret_m64_s16(vmovn_s32(vreinterpretq_s32_m128i(res32)));
-}
-
-// Convert packed single-precision (32-bit) floating-point elements in a to
-// packed 32-bit integers, and store the results in dst.
-//
-//   FOR j := 0 to 1
-//       i := 32*j
-//       dst[i+31:i] := Convert_FP32_To_Int32(a[i+31:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtps_pi32
-#define _mm_cvtps_pi32(a) _mm_cvt_ps2pi(a)
-
-// Convert packed single-precision (32-bit) floating-point elements in a to
-// packed 8-bit integers, and store the results in lower 4 elements of dst.
-// Note: this intrinsic will generate 0x7F, rather than 0x80, for input values
-// between 0x7F and 0x7FFFFFFF.
-//
-//   FOR j := 0 to 3
-//     i := 8*j
-//     k := 32*j
-//     IF a[k+31:k] >= FP32(0x7F) && a[k+31:k] <= FP32(0x7FFFFFFF)
-//       dst[i+7:i] := 0x7F
-//     ELSE
-//       dst[i+7:i] := Convert_FP32_To_Int8(a[k+31:k])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtps_pi8
-FORCE_INLINE __m64 _mm_cvtps_pi8(__m128 a)
-{
-    const __m128 i8Min = _mm_set_ps1((float) INT8_MIN);
-    const __m128 i8Max = _mm_set_ps1((float) INT8_MAX);
-    const __m128 i32Max = _mm_set_ps1((float) INT32_MAX);
-    const __m128i maxMask = _mm_castps_si128(
-        _mm_and_ps(_mm_cmpge_ps(a, i8Max), _mm_cmple_ps(a, i32Max)));
-    const __m128i betweenMask = _mm_castps_si128(
-        _mm_and_ps(_mm_cmpgt_ps(a, i8Min), _mm_cmplt_ps(a, i8Max)));
-    const __m128i minMask = _mm_cmpeq_epi32(_mm_or_si128(maxMask, betweenMask),
-                                            _mm_setzero_si128());
-    __m128i max = _mm_and_si128(maxMask, _mm_set1_epi32(INT8_MAX));
-    __m128i min = _mm_and_si128(minMask, _mm_set1_epi32(INT8_MIN));
-    __m128i cvt = _mm_and_si128(betweenMask, _mm_cvtps_epi32(a));
-    __m128i res32 = _mm_or_si128(_mm_or_si128(max, min), cvt);
-    int16x4_t res16 = vmovn_s32(vreinterpretq_s32_m128i(res32));
-    int8x8_t res8 = vmovn_s16(vcombine_s16(res16, res16));
-    static const uint32_t bitMask[2] = {0xFFFFFFFF, 0};
-    int8x8_t mask = vreinterpret_s8_u32(vld1_u32(bitMask));
-
-    return vreinterpret_m64_s8(vorr_s8(vand_s8(mask, res8), vdup_n_s8(0)));
-}
-
-// Convert packed unsigned 16-bit integers in a to packed single-precision
-// (32-bit) floating-point elements, and store the results in dst.
-//
-//   FOR j := 0 to 3
-//      i := j*16
-//      m := j*32
-//      dst[m+31:m] := Convert_UInt16_To_FP32(a[i+15:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtpu16_ps
-FORCE_INLINE __m128 _mm_cvtpu16_ps(__m64 a)
-{
-    return vreinterpretq_m128_f32(
-        vcvtq_f32_u32(vmovl_u16(vreinterpret_u16_m64(a))));
-}
-
-// Convert the lower packed unsigned 8-bit integers in a to packed
-// single-precision (32-bit) floating-point elements, and store the results in
-// dst.
-//
-//   FOR j := 0 to 3
-//      i := j*8
-//      m := j*32
-//      dst[m+31:m] := Convert_UInt8_To_FP32(a[i+7:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtpu8_ps
-FORCE_INLINE __m128 _mm_cvtpu8_ps(__m64 a)
-{
-    return vreinterpretq_m128_f32(vcvtq_f32_u32(
-        vmovl_u16(vget_low_u16(vmovl_u8(vreinterpret_u8_m64(a))))));
-}
-
-// Convert the signed 32-bit integer b to a single-precision (32-bit)
-// floating-point element, store the result in the lower element of dst, and
-// copy the upper 3 packed elements from a to the upper elements of dst.
-//
-//   dst[31:0] := Convert_Int32_To_FP32(b[31:0])
-//   dst[127:32] := a[127:32]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsi32_ss
-#define _mm_cvtsi32_ss(a, b) _mm_cvt_si2ss(a, b)
-
-// Convert the signed 64-bit integer b to a single-precision (32-bit)
-// floating-point element, store the result in the lower element of dst, and
-// copy the upper 3 packed elements from a to the upper elements of dst.
-//
-//   dst[31:0] := Convert_Int64_To_FP32(b[63:0])
-//   dst[127:32] := a[127:32]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsi64_ss
-FORCE_INLINE __m128 _mm_cvtsi64_ss(__m128 a, int64_t b)
-{
-    return vreinterpretq_m128_f32(
-        vsetq_lane_f32((float) b, vreinterpretq_f32_m128(a), 0));
-}
-
-// Copy the lower single-precision (32-bit) floating-point element of a to dst.
-//
-//   dst[31:0] := a[31:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtss_f32
-FORCE_INLINE float _mm_cvtss_f32(__m128 a)
-{
-    return vgetq_lane_f32(vreinterpretq_f32_m128(a), 0);
-}
-
-// Convert the lower single-precision (32-bit) floating-point element in a to a
-// 32-bit integer, and store the result in dst.
-//
-//   dst[31:0] := Convert_FP32_To_Int32(a[31:0])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtss_si32
-#define _mm_cvtss_si32(a) _mm_cvt_ss2si(a)
-
-// Convert the lower single-precision (32-bit) floating-point element in a to a
-// 64-bit integer, and store the result in dst.
-//
-//   dst[63:0] := Convert_FP32_To_Int64(a[31:0])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtss_si64
-FORCE_INLINE int64_t _mm_cvtss_si64(__m128 a)
-{
-#if defined(__aarch64__)
-    return (int64_t) vgetq_lane_f32(vrndiq_f32(vreinterpretq_f32_m128(a)), 0);
-#else
-    float32_t data = vgetq_lane_f32(
-        vreinterpretq_f32_m128(_mm_round_ps(a, _MM_FROUND_CUR_DIRECTION)), 0);
-    return (int64_t) data;
-#endif
-}
-
-// Convert packed single-precision (32-bit) floating-point elements in a to
-// packed 32-bit integers with truncation, and store the results in dst.
-//
-//   FOR j := 0 to 1
-//      i := 32*j
-//      dst[i+31:i] := Convert_FP32_To_Int32_Truncate(a[i+31:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtt_ps2pi
-FORCE_INLINE __m64 _mm_cvtt_ps2pi(__m128 a)
-{
-    return vreinterpret_m64_s32(
-        vget_low_s32(vcvtq_s32_f32(vreinterpretq_f32_m128(a))));
-}
-
-// Convert the lower single-precision (32-bit) floating-point element in a to a
-// 32-bit integer with truncation, and store the result in dst.
-//
-//   dst[31:0] := Convert_FP32_To_Int32_Truncate(a[31:0])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtt_ss2si
-FORCE_INLINE int _mm_cvtt_ss2si(__m128 a)
-{
-    return vgetq_lane_s32(vcvtq_s32_f32(vreinterpretq_f32_m128(a)), 0);
-}
-
-// Convert packed single-precision (32-bit) floating-point elements in a to
-// packed 32-bit integers with truncation, and store the results in dst.
-//
-//   FOR j := 0 to 1
-//      i := 32*j
-//      dst[i+31:i] := Convert_FP32_To_Int32_Truncate(a[i+31:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvttps_pi32
-#define _mm_cvttps_pi32(a) _mm_cvtt_ps2pi(a)
-
-// Convert the lower single-precision (32-bit) floating-point element in a to a
-// 32-bit integer with truncation, and store the result in dst.
-//
-//   dst[31:0] := Convert_FP32_To_Int32_Truncate(a[31:0])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvttss_si32
-#define _mm_cvttss_si32(a) _mm_cvtt_ss2si(a)
-
-// Convert the lower single-precision (32-bit) floating-point element in a to a
-// 64-bit integer with truncation, and store the result in dst.
-//
-//   dst[63:0] := Convert_FP32_To_Int64_Truncate(a[31:0])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvttss_si64
-FORCE_INLINE int64_t _mm_cvttss_si64(__m128 a)
-{
-    return (int64_t) vgetq_lane_f32(vreinterpretq_f32_m128(a), 0);
-}
-
-// Divides the four single-precision, floating-point values of a and b.
-//
-//   r0 := a0 / b0
-//   r1 := a1 / b1
-//   r2 := a2 / b2
-//   r3 := a3 / b3
-//
-// https://msdn.microsoft.com/en-us/library/edaw8147(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_div_ps(__m128 a, __m128 b)
-{
-#if defined(__aarch64__) && !SSE2NEON_PRECISE_DIV
-    return vreinterpretq_m128_f32(
-        vdivq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-#else
-    float32x4_t recip = vrecpeq_f32(vreinterpretq_f32_m128(b));
-    recip = vmulq_f32(recip, vrecpsq_f32(recip, vreinterpretq_f32_m128(b)));
-#if SSE2NEON_PRECISE_DIV
-    // Additional Netwon-Raphson iteration for accuracy
-    recip = vmulq_f32(recip, vrecpsq_f32(recip, vreinterpretq_f32_m128(b)));
-#endif
-    return vreinterpretq_m128_f32(vmulq_f32(vreinterpretq_f32_m128(a), recip));
-#endif
-}
-
-// Divides the scalar single-precision floating point value of a by b.
-// https://msdn.microsoft.com/en-us/library/4y73xa49(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_div_ss(__m128 a, __m128 b)
-{
-    float32_t value =
-        vgetq_lane_f32(vreinterpretq_f32_m128(_mm_div_ps(a, b)), 0);
-    return vreinterpretq_m128_f32(
-        vsetq_lane_f32(value, vreinterpretq_f32_m128(a), 0));
-}
-
-// Extract a 16-bit integer from a, selected with imm8, and store the result in
-// the lower element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_extract_pi16
-#define _mm_extract_pi16(a, imm) \
-    (int32_t) vget_lane_u16(vreinterpret_u16_m64(a), (imm))
-
-// Free aligned memory that was allocated with _mm_malloc.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_free
-FORCE_INLINE void _mm_free(void *addr)
-{
-    free(addr);
-}
-
-// Macro: Get the flush zero bits from the MXCSR control and status register.
-// The flush zero may contain any of the following flags: _MM_FLUSH_ZERO_ON or
-// _MM_FLUSH_ZERO_OFF
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_MM_GET_FLUSH_ZERO_MODE
-FORCE_INLINE unsigned int _sse2neon_mm_get_flush_zero_mode()
-{
-    union {
-        fpcr_bitfield field;
-#if defined(__aarch64__)
-        uint64_t value;
-#else
-        uint32_t value;
-#endif
-    } r;
-
-#if defined(__aarch64__)
-    asm volatile("mrs %0, FPCR" : "=r"(r.value)); /* read */
-#else
-    asm volatile("vmrs %0, FPSCR" : "=r"(r.value)); /* read */
-#endif
-
-    return r.field.bit24 ? _MM_FLUSH_ZERO_ON : _MM_FLUSH_ZERO_OFF;
-}
-
-// Macro: Get the rounding mode bits from the MXCSR control and status register.
-// The rounding mode may contain any of the following flags: _MM_ROUND_NEAREST,
-// _MM_ROUND_DOWN, _MM_ROUND_UP, _MM_ROUND_TOWARD_ZERO
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_MM_GET_ROUNDING_MODE
-FORCE_INLINE unsigned int _MM_GET_ROUNDING_MODE()
-{
-    union {
-        fpcr_bitfield field;
-#if defined(__aarch64__)
-        uint64_t value;
-#else
-        uint32_t value;
-#endif
-    } r;
-
-#if defined(__aarch64__)
-    asm volatile("mrs %0, FPCR" : "=r"(r.value)); /* read */
-#else
-    asm volatile("vmrs %0, FPSCR" : "=r"(r.value)); /* read */
-#endif
-
-    if (r.field.bit22) {
-        return r.field.bit23 ? _MM_ROUND_TOWARD_ZERO : _MM_ROUND_UP;
-    } else {
-        return r.field.bit23 ? _MM_ROUND_DOWN : _MM_ROUND_NEAREST;
-    }
-}
-
-// Copy a to dst, and insert the 16-bit integer i into dst at the location
-// specified by imm8.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_insert_pi16
-#define _mm_insert_pi16(a, b, imm)                               \
-    __extension__({                                              \
-        vreinterpret_m64_s16(                                    \
-            vset_lane_s16((b), vreinterpret_s16_m64(a), (imm))); \
-    })
-
-// Loads four single-precision, floating-point values.
-// https://msdn.microsoft.com/en-us/library/vstudio/zzd50xxt(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_load_ps(const float *p)
-{
-    return vreinterpretq_m128_f32(vld1q_f32(p));
-}
-
-// Load a single-precision (32-bit) floating-point element from memory into all
-// elements of dst.
-//
-//   dst[31:0] := MEM[mem_addr+31:mem_addr]
-//   dst[63:32] := MEM[mem_addr+31:mem_addr]
-//   dst[95:64] := MEM[mem_addr+31:mem_addr]
-//   dst[127:96] := MEM[mem_addr+31:mem_addr]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_load_ps1
-#define _mm_load_ps1 _mm_load1_ps
-
-// Loads an single - precision, floating - point value into the low word and
-// clears the upper three words.
-// https://msdn.microsoft.com/en-us/library/548bb9h4%28v=vs.90%29.aspx
-FORCE_INLINE __m128 _mm_load_ss(const float *p)
-{
-    return vreinterpretq_m128_f32(vsetq_lane_f32(*p, vdupq_n_f32(0), 0));
-}
-
-// Loads a single single-precision, floating-point value, copying it into all
-// four words
-// https://msdn.microsoft.com/en-us/library/vstudio/5cdkf716(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_load1_ps(const float *p)
-{
-    return vreinterpretq_m128_f32(vld1q_dup_f32(p));
-}
-
-// Sets the upper two single-precision, floating-point values with 64
-// bits of data loaded from the address p; the lower two values are passed
-// through from a.
-//
-//   r0 := a0
-//   r1 := a1
-//   r2 := *p0
-//   r3 := *p1
-//
-// https://msdn.microsoft.com/en-us/library/w92wta0x(v%3dvs.100).aspx
-FORCE_INLINE __m128 _mm_loadh_pi(__m128 a, __m64 const *p)
-{
-    return vreinterpretq_m128_f32(
-        vcombine_f32(vget_low_f32(a), vld1_f32((const float32_t *) p)));
-}
-
-// Sets the lower two single-precision, floating-point values with 64
-// bits of data loaded from the address p; the upper two values are passed
-// through from a.
-//
-// Return Value
-//   r0 := *p0
-//   r1 := *p1
-//   r2 := a2
-//   r3 := a3
-//
-// https://msdn.microsoft.com/en-us/library/s57cyak2(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_loadl_pi(__m128 a, __m64 const *p)
-{
-    return vreinterpretq_m128_f32(
-        vcombine_f32(vld1_f32((const float32_t *) p), vget_high_f32(a)));
-}
-
-// Load 4 single-precision (32-bit) floating-point elements from memory into dst
-// in reverse order. mem_addr must be aligned on a 16-byte boundary or a
-// general-protection exception may be generated.
-//
-//   dst[31:0] := MEM[mem_addr+127:mem_addr+96]
-//   dst[63:32] := MEM[mem_addr+95:mem_addr+64]
-//   dst[95:64] := MEM[mem_addr+63:mem_addr+32]
-//   dst[127:96] := MEM[mem_addr+31:mem_addr]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_loadr_ps
-FORCE_INLINE __m128 _mm_loadr_ps(const float *p)
-{
-    float32x4_t v = vrev64q_f32(vld1q_f32(p));
-    return vreinterpretq_m128_f32(vextq_f32(v, v, 2));
-}
-
-// Loads four single-precision, floating-point values.
-// https://msdn.microsoft.com/en-us/library/x1b16s7z%28v=vs.90%29.aspx
-FORCE_INLINE __m128 _mm_loadu_ps(const float *p)
-{
-    // for neon, alignment doesn't matter, so _mm_load_ps and _mm_loadu_ps are
-    // equivalent for neon
-    return vreinterpretq_m128_f32(vld1q_f32(p));
-}
-
-// Load unaligned 16-bit integer from memory into the first element of dst.
-//
-//   dst[15:0] := MEM[mem_addr+15:mem_addr]
-//   dst[MAX:16] := 0
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_loadu_si16
-FORCE_INLINE __m128i _mm_loadu_si16(const void *p)
-{
-    return vreinterpretq_m128i_s16(
-        vsetq_lane_s16(*(const int16_t *) p, vdupq_n_s16(0), 0));
-}
-
-// Load unaligned 64-bit integer from memory into the first element of dst.
-//
-//   dst[63:0] := MEM[mem_addr+63:mem_addr]
-//   dst[MAX:64] := 0
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_loadu_si64
-FORCE_INLINE __m128i _mm_loadu_si64(const void *p)
-{
-    return vreinterpretq_m128i_s64(
-        vcombine_s64(vld1_s64((const int64_t *) p), vdup_n_s64(0)));
-}
-
-// Allocate aligned blocks of memory.
-// https://software.intel.com/en-us/
-//         cpp-compiler-developer-guide-and-reference-allocating-and-freeing-aligned-memory-blocks
-FORCE_INLINE void *_mm_malloc(size_t size, size_t align)
-{
-    void *ptr;
-    if (align == 1)
-        return malloc(size);
-    if (align == 2 || (sizeof(void *) == 8 && align == 4))
-        align = sizeof(void *);
-    if (!posix_memalign(&ptr, align, size))
-        return ptr;
-    return NULL;
-}
-
-// Conditionally store 8-bit integer elements from a into memory using mask
-// (elements are not stored when the highest bit is not set in the corresponding
-// element) and a non-temporal memory hint.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_maskmove_si64
-FORCE_INLINE void _mm_maskmove_si64(__m64 a, __m64 mask, char *mem_addr)
-{
-    int8x8_t shr_mask = vshr_n_s8(vreinterpret_s8_m64(mask), 7);
-    __m128 b = _mm_load_ps((const float *) mem_addr);
-    int8x8_t masked =
-        vbsl_s8(vreinterpret_u8_s8(shr_mask), vreinterpret_s8_m64(a),
-                vreinterpret_s8_u64(vget_low_u64(vreinterpretq_u64_m128(b))));
-    vst1_s8((int8_t *) mem_addr, masked);
-}
-
-// Conditionally store 8-bit integer elements from a into memory using mask
-// (elements are not stored when the highest bit is not set in the corresponding
-// element) and a non-temporal memory hint.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_m_maskmovq
-#define _m_maskmovq(a, mask, mem_addr) _mm_maskmove_si64(a, mask, mem_addr)
-
-// Compare packed signed 16-bit integers in a and b, and store packed maximum
-// values in dst.
-//
-//   FOR j := 0 to 3
-//      i := j*16
-//      dst[i+15:i] := MAX(a[i+15:i], b[i+15:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_max_pi16
-FORCE_INLINE __m64 _mm_max_pi16(__m64 a, __m64 b)
-{
-    return vreinterpret_m64_s16(
-        vmax_s16(vreinterpret_s16_m64(a), vreinterpret_s16_m64(b)));
-}
-
-// Computes the maximums of the four single-precision, floating-point values of
-// a and b.
-// https://msdn.microsoft.com/en-us/library/vstudio/ff5d607a(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_max_ps(__m128 a, __m128 b)
-{
-#if SSE2NEON_PRECISE_MINMAX
-    float32x4_t _a = vreinterpretq_f32_m128(a);
-    float32x4_t _b = vreinterpretq_f32_m128(b);
-    return vreinterpretq_m128_f32(vbslq_f32(vcgtq_f32(_a, _b), _a, _b));
-#else
-    return vreinterpretq_m128_f32(
-        vmaxq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-#endif
-}
-
-// Compare packed unsigned 8-bit integers in a and b, and store packed maximum
-// values in dst.
-//
-//   FOR j := 0 to 7
-//      i := j*8
-//      dst[i+7:i] := MAX(a[i+7:i], b[i+7:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_max_pu8
-FORCE_INLINE __m64 _mm_max_pu8(__m64 a, __m64 b)
-{
-    return vreinterpret_m64_u8(
-        vmax_u8(vreinterpret_u8_m64(a), vreinterpret_u8_m64(b)));
-}
-
-// Computes the maximum of the two lower scalar single-precision floating point
-// values of a and b.
-// https://msdn.microsoft.com/en-us/library/s6db5esz(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_max_ss(__m128 a, __m128 b)
-{
-    float32_t value = vgetq_lane_f32(_mm_max_ps(a, b), 0);
-    return vreinterpretq_m128_f32(
-        vsetq_lane_f32(value, vreinterpretq_f32_m128(a), 0));
-}
-
-// Compare packed signed 16-bit integers in a and b, and store packed minimum
-// values in dst.
-//
-//   FOR j := 0 to 3
-//      i := j*16
-//      dst[i+15:i] := MIN(a[i+15:i], b[i+15:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_min_pi16
-FORCE_INLINE __m64 _mm_min_pi16(__m64 a, __m64 b)
-{
-    return vreinterpret_m64_s16(
-        vmin_s16(vreinterpret_s16_m64(a), vreinterpret_s16_m64(b)));
-}
-
-// Computes the minima of the four single-precision, floating-point values of a
-// and b.
-// https://msdn.microsoft.com/en-us/library/vstudio/wh13kadz(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_min_ps(__m128 a, __m128 b)
-{
-#if SSE2NEON_PRECISE_MINMAX
-    float32x4_t _a = vreinterpretq_f32_m128(a);
-    float32x4_t _b = vreinterpretq_f32_m128(b);
-    return vreinterpretq_m128_f32(vbslq_f32(vcltq_f32(_a, _b), _a, _b));
-#else
-    return vreinterpretq_m128_f32(
-        vminq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-#endif
-}
-
-// Compare packed unsigned 8-bit integers in a and b, and store packed minimum
-// values in dst.
-//
-//   FOR j := 0 to 7
-//      i := j*8
-//      dst[i+7:i] := MIN(a[i+7:i], b[i+7:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_min_pu8
-FORCE_INLINE __m64 _mm_min_pu8(__m64 a, __m64 b)
-{
-    return vreinterpret_m64_u8(
-        vmin_u8(vreinterpret_u8_m64(a), vreinterpret_u8_m64(b)));
-}
-
-// Computes the minimum of the two lower scalar single-precision floating point
-// values of a and b.
-// https://msdn.microsoft.com/en-us/library/0a9y7xaa(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_min_ss(__m128 a, __m128 b)
-{
-    float32_t value = vgetq_lane_f32(_mm_min_ps(a, b), 0);
-    return vreinterpretq_m128_f32(
-        vsetq_lane_f32(value, vreinterpretq_f32_m128(a), 0));
-}
-
-// Sets the low word to the single-precision, floating-point value of b
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/35hdzazd(v=vs.100)
-FORCE_INLINE __m128 _mm_move_ss(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_f32(
-        vsetq_lane_f32(vgetq_lane_f32(vreinterpretq_f32_m128(b), 0),
-                       vreinterpretq_f32_m128(a), 0));
-}
-
-// Moves the upper two values of B into the lower two values of A.
-//
-//   r3 := a3
-//   r2 := a2
-//   r1 := b3
-//   r0 := b2
-FORCE_INLINE __m128 _mm_movehl_ps(__m128 __A, __m128 __B)
-{
-    float32x2_t a32 = vget_high_f32(vreinterpretq_f32_m128(__A));
-    float32x2_t b32 = vget_high_f32(vreinterpretq_f32_m128(__B));
-    return vreinterpretq_m128_f32(vcombine_f32(b32, a32));
-}
-
-// Moves the lower two values of B into the upper two values of A.
-//
-//   r3 := b1
-//   r2 := b0
-//   r1 := a1
-//   r0 := a0
-FORCE_INLINE __m128 _mm_movelh_ps(__m128 __A, __m128 __B)
-{
-    float32x2_t a10 = vget_low_f32(vreinterpretq_f32_m128(__A));
-    float32x2_t b10 = vget_low_f32(vreinterpretq_f32_m128(__B));
-    return vreinterpretq_m128_f32(vcombine_f32(a10, b10));
-}
-
-// Create mask from the most significant bit of each 8-bit element in a, and
-// store the result in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_movemask_pi8
-FORCE_INLINE int _mm_movemask_pi8(__m64 a)
-{
-    uint8x8_t input = vreinterpret_u8_m64(a);
-#if defined(__aarch64__)
-    static const int8x8_t shift = {0, 1, 2, 3, 4, 5, 6, 7};
-    uint8x8_t tmp = vshr_n_u8(input, 7);
-    return vaddv_u8(vshl_u8(tmp, shift));
-#else
-    // Refer the implementation of `_mm_movemask_epi8`
-    uint16x4_t high_bits = vreinterpret_u16_u8(vshr_n_u8(input, 7));
-    uint32x2_t paired16 =
-        vreinterpret_u32_u16(vsra_n_u16(high_bits, high_bits, 7));
-    uint8x8_t paired32 =
-        vreinterpret_u8_u32(vsra_n_u32(paired16, paired16, 14));
-    return vget_lane_u8(paired32, 0) | ((int) vget_lane_u8(paired32, 4) << 4);
-#endif
-}
-
-// NEON does not provide this method
-// Creates a 4-bit mask from the most significant bits of the four
-// single-precision, floating-point values.
-// https://msdn.microsoft.com/en-us/library/vstudio/4490ys29(v=vs.100).aspx
-FORCE_INLINE int _mm_movemask_ps(__m128 a)
-{
-    uint32x4_t input = vreinterpretq_u32_m128(a);
-#if defined(__aarch64__)
-    static const int32x4_t shift = {0, 1, 2, 3};
-    uint32x4_t tmp = vshrq_n_u32(input, 31);
-    return vaddvq_u32(vshlq_u32(tmp, shift));
-#else
-    // Uses the exact same method as _mm_movemask_epi8, see that for details.
-    // Shift out everything but the sign bits with a 32-bit unsigned shift
-    // right.
-    uint64x2_t high_bits = vreinterpretq_u64_u32(vshrq_n_u32(input, 31));
-    // Merge the two pairs together with a 64-bit unsigned shift right + add.
-    uint8x16_t paired =
-        vreinterpretq_u8_u64(vsraq_n_u64(high_bits, high_bits, 31));
-    // Extract the result.
-    return vgetq_lane_u8(paired, 0) | (vgetq_lane_u8(paired, 8) << 2);
-#endif
-}
-
-// Multiplies the four single-precision, floating-point values of a and b.
-//
-//   r0 := a0 * b0
-//   r1 := a1 * b1
-//   r2 := a2 * b2
-//   r3 := a3 * b3
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/22kbk6t9(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_mul_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_f32(
-        vmulq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-}
-
-// Multiply the lower single-precision (32-bit) floating-point element in a and
-// b, store the result in the lower element of dst, and copy the upper 3 packed
-// elements from a to the upper elements of dst.
-//
-//   dst[31:0] := a[31:0] * b[31:0]
-//   dst[127:32] := a[127:32]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_mul_ss
-FORCE_INLINE __m128 _mm_mul_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_mul_ps(a, b));
-}
-
-// Multiply the packed unsigned 16-bit integers in a and b, producing
-// intermediate 32-bit integers, and store the high 16 bits of the intermediate
-// integers in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_mulhi_pu16
-FORCE_INLINE __m64 _mm_mulhi_pu16(__m64 a, __m64 b)
-{
-    return vreinterpret_m64_u16(vshrn_n_u32(
-        vmull_u16(vreinterpret_u16_m64(a), vreinterpret_u16_m64(b)), 16));
-}
-
-// Computes the bitwise OR of the four single-precision, floating-point values
-// of a and b.
-// https://msdn.microsoft.com/en-us/library/vstudio/7ctdsyy0(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_or_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_s32(
-        vorrq_s32(vreinterpretq_s32_m128(a), vreinterpretq_s32_m128(b)));
-}
-
-// Average packed unsigned 8-bit integers in a and b, and store the results in
-// dst.
-//
-//   FOR j := 0 to 7
-//     i := j*8
-//     dst[i+7:i] := (a[i+7:i] + b[i+7:i] + 1) >> 1
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_m_pavgb
-#define _m_pavgb(a, b) _mm_avg_pu8(a, b)
-
-// Average packed unsigned 16-bit integers in a and b, and store the results in
-// dst.
-//
-//   FOR j := 0 to 3
-//     i := j*16
-//     dst[i+15:i] := (a[i+15:i] + b[i+15:i] + 1) >> 1
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_m_pavgw
-#define _m_pavgw(a, b) _mm_avg_pu16(a, b)
-
-// Extract a 16-bit integer from a, selected with imm8, and store the result in
-// the lower element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_m_pextrw
-#define _m_pextrw(a, imm) _mm_extract_pi16(a, imm)
-
-// Copy a to dst, and insert the 16-bit integer i into dst at the location
-// specified by imm8.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=m_pinsrw
-#define _m_pinsrw(a, i, imm) _mm_insert_pi16(a, i, imm)
-
-// Compare packed signed 16-bit integers in a and b, and store packed maximum
-// values in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_m_pmaxsw
-#define _m_pmaxsw(a, b) _mm_max_pi16(a, b)
-
-// Compare packed unsigned 8-bit integers in a and b, and store packed maximum
-// values in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_m_pmaxub
-#define _m_pmaxub(a, b) _mm_max_pu8(a, b)
-
-// Compare packed signed 16-bit integers in a and b, and store packed minimum
-// values in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_m_pminsw
-#define _m_pminsw(a, b) _mm_min_pi16(a, b)
-
-// Compare packed unsigned 8-bit integers in a and b, and store packed minimum
-// values in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_m_pminub
-#define _m_pminub(a, b) _mm_min_pu8(a, b)
-
-// Create mask from the most significant bit of each 8-bit element in a, and
-// store the result in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_m_pmovmskb
-#define _m_pmovmskb(a) _mm_movemask_pi8(a)
-
-// Multiply the packed unsigned 16-bit integers in a and b, producing
-// intermediate 32-bit integers, and store the high 16 bits of the intermediate
-// integers in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_m_pmulhuw
-#define _m_pmulhuw(a, b) _mm_mulhi_pu16(a, b)
-
-// Loads one cache line of data from address p to a location closer to the
-// processor. https://msdn.microsoft.com/en-us/library/84szxsww(v=vs.100).aspx
-FORCE_INLINE void _mm_prefetch(const void *p, int i)
-{
-    (void) i;
-    __builtin_prefetch(p);
-}
-
-// Compute the absolute differences of packed unsigned 8-bit integers in a and
-// b, then horizontally sum each consecutive 8 differences to produce four
-// unsigned 16-bit integers, and pack these unsigned 16-bit integers in the low
-// 16 bits of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=m_psadbw
-#define _m_psadbw(a, b) _mm_sad_pu8(a, b)
-
-// Shuffle 16-bit integers in a using the control in imm8, and store the results
-// in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_m_pshufw
-#define _m_pshufw(a, imm) _mm_shuffle_pi16(a, imm)
-
-// Compute the approximate reciprocal of packed single-precision (32-bit)
-// floating-point elements in a, and store the results in dst. The maximum
-// relative error for this approximation is less than 1.5*2^-12.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_rcp_ps
-FORCE_INLINE __m128 _mm_rcp_ps(__m128 in)
-{
-    float32x4_t recip = vrecpeq_f32(vreinterpretq_f32_m128(in));
-    recip = vmulq_f32(recip, vrecpsq_f32(recip, vreinterpretq_f32_m128(in)));
-#if SSE2NEON_PRECISE_DIV
-    // Additional Netwon-Raphson iteration for accuracy
-    recip = vmulq_f32(recip, vrecpsq_f32(recip, vreinterpretq_f32_m128(in)));
-#endif
-    return vreinterpretq_m128_f32(recip);
-}
-
-// Compute the approximate reciprocal of the lower single-precision (32-bit)
-// floating-point element in a, store the result in the lower element of dst,
-// and copy the upper 3 packed elements from a to the upper elements of dst. The
-// maximum relative error for this approximation is less than 1.5*2^-12.
-//
-//   dst[31:0] := (1.0 / a[31:0])
-//   dst[127:32] := a[127:32]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_rcp_ss
-FORCE_INLINE __m128 _mm_rcp_ss(__m128 a)
-{
-    return _mm_move_ss(a, _mm_rcp_ps(a));
-}
-
-// Computes the approximations of the reciprocal square roots of the four
-// single-precision floating point values of in.
-// The current precision is 1% error.
-// https://msdn.microsoft.com/en-us/library/22hfsh53(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_rsqrt_ps(__m128 in)
-{
-    float32x4_t out = vrsqrteq_f32(vreinterpretq_f32_m128(in));
-#if SSE2NEON_PRECISE_SQRT
-    // Additional Netwon-Raphson iteration for accuracy
-    out = vmulq_f32(
-        out, vrsqrtsq_f32(vmulq_f32(vreinterpretq_f32_m128(in), out), out));
-    out = vmulq_f32(
-        out, vrsqrtsq_f32(vmulq_f32(vreinterpretq_f32_m128(in), out), out));
-#endif
-    return vreinterpretq_m128_f32(out);
-}
-
-// Compute the approximate reciprocal square root of the lower single-precision
-// (32-bit) floating-point element in a, store the result in the lower element
-// of dst, and copy the upper 3 packed elements from a to the upper elements of
-// dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_rsqrt_ss
-FORCE_INLINE __m128 _mm_rsqrt_ss(__m128 in)
-{
-    return vsetq_lane_f32(vgetq_lane_f32(_mm_rsqrt_ps(in), 0), in, 0);
-}
-
-// Compute the absolute differences of packed unsigned 8-bit integers in a and
-// b, then horizontally sum each consecutive 8 differences to produce four
-// unsigned 16-bit integers, and pack these unsigned 16-bit integers in the low
-// 16 bits of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sad_pu8
-FORCE_INLINE __m64 _mm_sad_pu8(__m64 a, __m64 b)
-{
-    uint64x1_t t = vpaddl_u32(vpaddl_u16(
-        vpaddl_u8(vabd_u8(vreinterpret_u8_m64(a), vreinterpret_u8_m64(b)))));
-    return vreinterpret_m64_u16(
-        vset_lane_u16(vget_lane_u64(t, 0), vdup_n_u16(0), 0));
-}
-
-// Macro: Set the flush zero bits of the MXCSR control and status register to
-// the value in unsigned 32-bit integer a. The flush zero may contain any of the
-// following flags: _MM_FLUSH_ZERO_ON or _MM_FLUSH_ZERO_OFF
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_MM_SET_FLUSH_ZERO_MODE
-FORCE_INLINE void _sse2neon_mm_set_flush_zero_mode(unsigned int flag)
-{
-    // AArch32 Advanced SIMD arithmetic always uses the Flush-to-zero setting,
-    // regardless of the value of the FZ bit.
-    union {
-        fpcr_bitfield field;
-#if defined(__aarch64__)
-        uint64_t value;
-#else
-        uint32_t value;
-#endif
-    } r;
-
-#if defined(__aarch64__)
-    asm volatile("mrs %0, FPCR" : "=r"(r.value)); /* read */
-#else
-    asm volatile("vmrs %0, FPSCR" : "=r"(r.value)); /* read */
-#endif
-
-    r.field.bit24 = (flag & _MM_FLUSH_ZERO_MASK) == _MM_FLUSH_ZERO_ON;
-
-#if defined(__aarch64__)
-    asm volatile("msr FPCR, %0" ::"r"(r)); /* write */
-#else
-    asm volatile("vmsr FPSCR, %0" ::"r"(r));        /* write */
-#endif
-}
-
-// Sets the four single-precision, floating-point values to the four inputs.
-// https://msdn.microsoft.com/en-us/library/vstudio/afh0zf75(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_set_ps(float w, float z, float y, float x)
-{
-    float ALIGN_STRUCT(16) data[4] = {x, y, z, w};
-    return vreinterpretq_m128_f32(vld1q_f32(data));
-}
-
-// Sets the four single-precision, floating-point values to w.
-// https://msdn.microsoft.com/en-us/library/vstudio/2x1se8ha(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_set_ps1(float _w)
-{
-    return vreinterpretq_m128_f32(vdupq_n_f32(_w));
-}
-
-// Macro: Set the rounding mode bits of the MXCSR control and status register to
-// the value in unsigned 32-bit integer a. The rounding mode may contain any of
-// the following flags: _MM_ROUND_NEAREST, _MM_ROUND_DOWN, _MM_ROUND_UP,
-// _MM_ROUND_TOWARD_ZERO
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_MM_SET_ROUNDING_MODE
-FORCE_INLINE void _MM_SET_ROUNDING_MODE(int rounding)
-{
-    union {
-        fpcr_bitfield field;
-#if defined(__aarch64__)
-        uint64_t value;
-#else
-        uint32_t value;
-#endif
-    } r;
-
-#if defined(__aarch64__)
-    asm volatile("mrs %0, FPCR" : "=r"(r.value)); /* read */
-#else
-    asm volatile("vmrs %0, FPSCR" : "=r"(r.value)); /* read */
-#endif
-
-    switch (rounding) {
-    case _MM_ROUND_TOWARD_ZERO:
-        r.field.bit22 = 1;
-        r.field.bit23 = 1;
-        break;
-    case _MM_ROUND_DOWN:
-        r.field.bit22 = 0;
-        r.field.bit23 = 1;
-        break;
-    case _MM_ROUND_UP:
-        r.field.bit22 = 1;
-        r.field.bit23 = 0;
-        break;
-    default:  //_MM_ROUND_NEAREST
-        r.field.bit22 = 0;
-        r.field.bit23 = 0;
-    }
-
-#if defined(__aarch64__)
-    asm volatile("msr FPCR, %0" ::"r"(r)); /* write */
-#else
-    asm volatile("vmsr FPSCR, %0" ::"r"(r));        /* write */
-#endif
-}
-
-// Copy single-precision (32-bit) floating-point element a to the lower element
-// of dst, and zero the upper 3 elements.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_set_ss
-FORCE_INLINE __m128 _mm_set_ss(float a)
-{
-    float ALIGN_STRUCT(16) data[4] = {a, 0, 0, 0};
-    return vreinterpretq_m128_f32(vld1q_f32(data));
-}
-
-// Sets the four single-precision, floating-point values to w.
-//
-//   r0 := r1 := r2 := r3 := w
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/2x1se8ha(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_set1_ps(float _w)
-{
-    return vreinterpretq_m128_f32(vdupq_n_f32(_w));
-}
-
-// FIXME: _mm_setcsr() implementation supports changing the rounding mode only.
-FORCE_INLINE void _mm_setcsr(unsigned int a)
-{
-    _MM_SET_ROUNDING_MODE(a);
-}
-
-// FIXME: _mm_getcsr() implementation supports reading the rounding mode only.
-FORCE_INLINE unsigned int _mm_getcsr()
-{
-    return _MM_GET_ROUNDING_MODE();
-}
-
-// Sets the four single-precision, floating-point values to the four inputs in
-// reverse order.
-// https://msdn.microsoft.com/en-us/library/vstudio/d2172ct3(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_setr_ps(float w, float z, float y, float x)
-{
-    float ALIGN_STRUCT(16) data[4] = {w, z, y, x};
-    return vreinterpretq_m128_f32(vld1q_f32(data));
-}
-
-// Clears the four single-precision, floating-point values.
-// https://msdn.microsoft.com/en-us/library/vstudio/tk1t2tbz(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_setzero_ps(void)
-{
-    return vreinterpretq_m128_f32(vdupq_n_f32(0));
-}
-
-// Shuffle 16-bit integers in a using the control in imm8, and store the results
-// in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_shuffle_pi16
-#if __has_builtin(__builtin_shufflevector)
-#define _mm_shuffle_pi16(a, imm)                                           \
-    __extension__({                                                        \
-        vreinterpret_m64_s16(__builtin_shufflevector(                      \
-            vreinterpret_s16_m64(a), vreinterpret_s16_m64(a), (imm & 0x3), \
-            ((imm >> 2) & 0x3), ((imm >> 4) & 0x3), ((imm >> 6) & 0x3)));  \
-    })
-#else
-#define _mm_shuffle_pi16(a, imm)                                               \
-    __extension__({                                                            \
-        int16x4_t ret;                                                         \
-        ret =                                                                  \
-            vmov_n_s16(vget_lane_s16(vreinterpret_s16_m64(a), (imm) & (0x3))); \
-        ret = vset_lane_s16(                                                   \
-            vget_lane_s16(vreinterpret_s16_m64(a), ((imm) >> 2) & 0x3), ret,   \
-            1);                                                                \
-        ret = vset_lane_s16(                                                   \
-            vget_lane_s16(vreinterpret_s16_m64(a), ((imm) >> 4) & 0x3), ret,   \
-            2);                                                                \
-        ret = vset_lane_s16(                                                   \
-            vget_lane_s16(vreinterpret_s16_m64(a), ((imm) >> 6) & 0x3), ret,   \
-            3);                                                                \
-        vreinterpret_m64_s16(ret);                                             \
-    })
-#endif
-
-// Guarantees that every preceding store is globally visible before any
-// subsequent store.
-// https://msdn.microsoft.com/en-us/library/5h2w73d1%28v=vs.90%29.aspx
-FORCE_INLINE void _mm_sfence(void)
-{
-    __sync_synchronize();
-}
-
-// FORCE_INLINE __m128 _mm_shuffle_ps(__m128 a, __m128 b, __constrange(0,255)
-// int imm)
-#if __has_builtin(__builtin_shufflevector)
-#define _mm_shuffle_ps(a, b, imm)                                \
-    __extension__({                                              \
-        float32x4_t _input1 = vreinterpretq_f32_m128(a);         \
-        float32x4_t _input2 = vreinterpretq_f32_m128(b);         \
-        float32x4_t _shuf = __builtin_shufflevector(             \
-            _input1, _input2, (imm) & (0x3), ((imm) >> 2) & 0x3, \
-            (((imm) >> 4) & 0x3) + 4, (((imm) >> 6) & 0x3) + 4); \
-        vreinterpretq_m128_f32(_shuf);                           \
-    })
-#else  // generic
-#define _mm_shuffle_ps(a, b, imm)                          \
-    __extension__({                                        \
-        __m128 ret;                                        \
-        switch (imm) {                                     \
-        case _MM_SHUFFLE(1, 0, 3, 2):                      \
-            ret = _mm_shuffle_ps_1032((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(2, 3, 0, 1):                      \
-            ret = _mm_shuffle_ps_2301((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(0, 3, 2, 1):                      \
-            ret = _mm_shuffle_ps_0321((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(2, 1, 0, 3):                      \
-            ret = _mm_shuffle_ps_2103((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(1, 0, 1, 0):                      \
-            ret = _mm_movelh_ps((a), (b));                 \
-            break;                                         \
-        case _MM_SHUFFLE(1, 0, 0, 1):                      \
-            ret = _mm_shuffle_ps_1001((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(0, 1, 0, 1):                      \
-            ret = _mm_shuffle_ps_0101((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(3, 2, 1, 0):                      \
-            ret = _mm_shuffle_ps_3210((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(0, 0, 1, 1):                      \
-            ret = _mm_shuffle_ps_0011((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(0, 0, 2, 2):                      \
-            ret = _mm_shuffle_ps_0022((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(2, 2, 0, 0):                      \
-            ret = _mm_shuffle_ps_2200((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(3, 2, 0, 2):                      \
-            ret = _mm_shuffle_ps_3202((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(3, 2, 3, 2):                      \
-            ret = _mm_movehl_ps((b), (a));                 \
-            break;                                         \
-        case _MM_SHUFFLE(1, 1, 3, 3):                      \
-            ret = _mm_shuffle_ps_1133((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(2, 0, 1, 0):                      \
-            ret = _mm_shuffle_ps_2010((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(2, 0, 0, 1):                      \
-            ret = _mm_shuffle_ps_2001((a), (b));           \
-            break;                                         \
-        case _MM_SHUFFLE(2, 0, 3, 2):                      \
-            ret = _mm_shuffle_ps_2032((a), (b));           \
-            break;                                         \
-        default:                                           \
-            ret = _mm_shuffle_ps_default((a), (b), (imm)); \
-            break;                                         \
-        }                                                  \
-        ret;                                               \
-    })
-#endif
-
-// Computes the approximations of square roots of the four single-precision,
-// floating-point values of a. First computes reciprocal square roots and then
-// reciprocals of the four values.
-//
-//   r0 := sqrt(a0)
-//   r1 := sqrt(a1)
-//   r2 := sqrt(a2)
-//   r3 := sqrt(a3)
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/8z67bwwk(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_sqrt_ps(__m128 in)
-{
-#if SSE2NEON_PRECISE_SQRT
-    float32x4_t recip = vrsqrteq_f32(vreinterpretq_f32_m128(in));
-
-    // Test for vrsqrteq_f32(0) -> positive infinity case.
-    // Change to zero, so that s * 1/sqrt(s) result is zero too.
-    const uint32x4_t pos_inf = vdupq_n_u32(0x7F800000);
-    const uint32x4_t div_by_zero =
-        vceqq_u32(pos_inf, vreinterpretq_u32_f32(recip));
-    recip = vreinterpretq_f32_u32(
-        vandq_u32(vmvnq_u32(div_by_zero), vreinterpretq_u32_f32(recip)));
-
-    // Additional Netwon-Raphson iteration for accuracy
-    recip = vmulq_f32(
-        vrsqrtsq_f32(vmulq_f32(recip, recip), vreinterpretq_f32_m128(in)),
-        recip);
-    recip = vmulq_f32(
-        vrsqrtsq_f32(vmulq_f32(recip, recip), vreinterpretq_f32_m128(in)),
-        recip);
-
-    // sqrt(s) = s * 1/sqrt(s)
-    return vreinterpretq_m128_f32(vmulq_f32(vreinterpretq_f32_m128(in), recip));
-#elif defined(__aarch64__)
-    return vreinterpretq_m128_f32(vsqrtq_f32(vreinterpretq_f32_m128(in)));
-#else
-    float32x4_t recipsq = vrsqrteq_f32(vreinterpretq_f32_m128(in));
-    float32x4_t sq = vrecpeq_f32(recipsq);
-    return vreinterpretq_m128_f32(sq);
-#endif
-}
-
-// Computes the approximation of the square root of the scalar single-precision
-// floating point value of in.
-// https://msdn.microsoft.com/en-us/library/ahfsc22d(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_sqrt_ss(__m128 in)
-{
-    float32_t value =
-        vgetq_lane_f32(vreinterpretq_f32_m128(_mm_sqrt_ps(in)), 0);
-    return vreinterpretq_m128_f32(
-        vsetq_lane_f32(value, vreinterpretq_f32_m128(in), 0));
-}
-
-// Stores four single-precision, floating-point values.
-// https://msdn.microsoft.com/en-us/library/vstudio/s3h4ay6y(v=vs.100).aspx
-FORCE_INLINE void _mm_store_ps(float *p, __m128 a)
-{
-    vst1q_f32(p, vreinterpretq_f32_m128(a));
-}
-
-// Store the lower single-precision (32-bit) floating-point element from a into
-// 4 contiguous elements in memory. mem_addr must be aligned on a 16-byte
-// boundary or a general-protection exception may be generated.
-//
-//   MEM[mem_addr+31:mem_addr] := a[31:0]
-//   MEM[mem_addr+63:mem_addr+32] := a[31:0]
-//   MEM[mem_addr+95:mem_addr+64] := a[31:0]
-//   MEM[mem_addr+127:mem_addr+96] := a[31:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_store_ps1
-FORCE_INLINE void _mm_store_ps1(float *p, __m128 a)
-{
-    float32_t a0 = vgetq_lane_f32(vreinterpretq_f32_m128(a), 0);
-    vst1q_f32(p, vdupq_n_f32(a0));
-}
-
-// Stores the lower single - precision, floating - point value.
-// https://msdn.microsoft.com/en-us/library/tzz10fbx(v=vs.100).aspx
-FORCE_INLINE void _mm_store_ss(float *p, __m128 a)
-{
-    vst1q_lane_f32(p, vreinterpretq_f32_m128(a), 0);
-}
-
-// Store the lower single-precision (32-bit) floating-point element from a into
-// 4 contiguous elements in memory. mem_addr must be aligned on a 16-byte
-// boundary or a general-protection exception may be generated.
-//
-//   MEM[mem_addr+31:mem_addr] := a[31:0]
-//   MEM[mem_addr+63:mem_addr+32] := a[31:0]
-//   MEM[mem_addr+95:mem_addr+64] := a[31:0]
-//   MEM[mem_addr+127:mem_addr+96] := a[31:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_store1_ps
-#define _mm_store1_ps _mm_store_ps1
-
-// Stores the upper two single-precision, floating-point values of a to the
-// address p.
-//
-//   *p0 := a2
-//   *p1 := a3
-//
-// https://msdn.microsoft.com/en-us/library/a7525fs8(v%3dvs.90).aspx
-FORCE_INLINE void _mm_storeh_pi(__m64 *p, __m128 a)
-{
-    *p = vreinterpret_m64_f32(vget_high_f32(a));
-}
-
-// Stores the lower two single-precision floating point values of a to the
-// address p.
-//
-//   *p0 := a0
-//   *p1 := a1
-//
-// https://msdn.microsoft.com/en-us/library/h54t98ks(v=vs.90).aspx
-FORCE_INLINE void _mm_storel_pi(__m64 *p, __m128 a)
-{
-    *p = vreinterpret_m64_f32(vget_low_f32(a));
-}
-
-// Store 4 single-precision (32-bit) floating-point elements from a into memory
-// in reverse order. mem_addr must be aligned on a 16-byte boundary or a
-// general-protection exception may be generated.
-//
-//   MEM[mem_addr+31:mem_addr] := a[127:96]
-//   MEM[mem_addr+63:mem_addr+32] := a[95:64]
-//   MEM[mem_addr+95:mem_addr+64] := a[63:32]
-//   MEM[mem_addr+127:mem_addr+96] := a[31:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_storer_ps
-FORCE_INLINE void _mm_storer_ps(float *p, __m128 a)
-{
-    float32x4_t tmp = vrev64q_f32(vreinterpretq_f32_m128(a));
-    float32x4_t rev = vextq_f32(tmp, tmp, 2);
-    vst1q_f32(p, rev);
-}
-
-// Stores four single-precision, floating-point values.
-// https://msdn.microsoft.com/en-us/library/44e30x22(v=vs.100).aspx
-FORCE_INLINE void _mm_storeu_ps(float *p, __m128 a)
-{
-    vst1q_f32(p, vreinterpretq_f32_m128(a));
-}
-
-// Stores 16-bits of integer data a at the address p.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_storeu_si16
-FORCE_INLINE void _mm_storeu_si16(void *p, __m128i a)
-{
-    vst1q_lane_s16((int16_t *) p, vreinterpretq_s16_m128i(a), 0);
-}
-
-// Stores 64-bits of integer data a at the address p.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_storeu_si64
-FORCE_INLINE void _mm_storeu_si64(void *p, __m128i a)
-{
-    vst1q_lane_s64((int64_t *) p, vreinterpretq_s64_m128i(a), 0);
-}
-
-// Store 64-bits of integer data from a into memory using a non-temporal memory
-// hint.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_stream_pi
-FORCE_INLINE void _mm_stream_pi(__m64 *p, __m64 a)
-{
-    vst1_s64((int64_t *) p, vreinterpret_s64_m64(a));
-}
-
-// Store 128-bits (composed of 4 packed single-precision (32-bit) floating-
-// point elements) from a into memory using a non-temporal memory hint.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_stream_ps
-FORCE_INLINE void _mm_stream_ps(float *p, __m128 a)
-{
-#if __has_builtin(__builtin_nontemporal_store)
-    __builtin_nontemporal_store(a, (float32x4_t *) p);
-#else
-    vst1q_f32(p, vreinterpretq_f32_m128(a));
-#endif
-}
-
-// Subtracts the four single-precision, floating-point values of a and b.
-//
-//   r0 := a0 - b0
-//   r1 := a1 - b1
-//   r2 := a2 - b2
-//   r3 := a3 - b3
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/1zad2k61(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_sub_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_f32(
-        vsubq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-}
-
-// Subtract the lower single-precision (32-bit) floating-point element in b from
-// the lower single-precision (32-bit) floating-point element in a, store the
-// result in the lower element of dst, and copy the upper 3 packed elements from
-// a to the upper elements of dst.
-//
-//   dst[31:0] := a[31:0] - b[31:0]
-//   dst[127:32] := a[127:32]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sub_ss
-FORCE_INLINE __m128 _mm_sub_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_sub_ps(a, b));
-}
-
-// Macro: Transpose the 4x4 matrix formed by the 4 rows of single-precision
-// (32-bit) floating-point elements in row0, row1, row2, and row3, and store the
-// transposed matrix in these vectors (row0 now contains column 0, etc.).
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=MM_TRANSPOSE4_PS
-#define _MM_TRANSPOSE4_PS(row0, row1, row2, row3)         \
-    do {                                                  \
-        float32x4x2_t ROW01 = vtrnq_f32(row0, row1);      \
-        float32x4x2_t ROW23 = vtrnq_f32(row2, row3);      \
-        row0 = vcombine_f32(vget_low_f32(ROW01.val[0]),   \
-                            vget_low_f32(ROW23.val[0]));  \
-        row1 = vcombine_f32(vget_low_f32(ROW01.val[1]),   \
-                            vget_low_f32(ROW23.val[1]));  \
-        row2 = vcombine_f32(vget_high_f32(ROW01.val[0]),  \
-                            vget_high_f32(ROW23.val[0])); \
-        row3 = vcombine_f32(vget_high_f32(ROW01.val[1]),  \
-                            vget_high_f32(ROW23.val[1])); \
-    } while (0)
-
-// according to the documentation, these intrinsics behave the same as the
-// non-'u' versions.  We'll just alias them here.
-#define _mm_ucomieq_ss _mm_comieq_ss
-#define _mm_ucomige_ss _mm_comige_ss
-#define _mm_ucomigt_ss _mm_comigt_ss
-#define _mm_ucomile_ss _mm_comile_ss
-#define _mm_ucomilt_ss _mm_comilt_ss
-#define _mm_ucomineq_ss _mm_comineq_ss
-
-// Return vector of type __m128i with undefined elements.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=mm_undefined_si128
-FORCE_INLINE __m128i _mm_undefined_si128(void)
-{
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wuninitialized"
-#endif
-    __m128i a;
-    return a;
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-}
-
-// Return vector of type __m128 with undefined elements.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_undefined_ps
-FORCE_INLINE __m128 _mm_undefined_ps(void)
-{
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wuninitialized"
-#endif
-    __m128 a;
-    return a;
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-}
-
-// Selects and interleaves the upper two single-precision, floating-point values
-// from a and b.
-//
-//   r0 := a2
-//   r1 := b2
-//   r2 := a3
-//   r3 := b3
-//
-// https://msdn.microsoft.com/en-us/library/skccxx7d%28v=vs.90%29.aspx
-FORCE_INLINE __m128 _mm_unpackhi_ps(__m128 a, __m128 b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128_f32(
-        vzip2q_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-#else
-    float32x2_t a1 = vget_high_f32(vreinterpretq_f32_m128(a));
-    float32x2_t b1 = vget_high_f32(vreinterpretq_f32_m128(b));
-    float32x2x2_t result = vzip_f32(a1, b1);
-    return vreinterpretq_m128_f32(vcombine_f32(result.val[0], result.val[1]));
-#endif
-}
-
-// Selects and interleaves the lower two single-precision, floating-point values
-// from a and b.
-//
-//   r0 := a0
-//   r1 := b0
-//   r2 := a1
-//   r3 := b1
-//
-// https://msdn.microsoft.com/en-us/library/25st103b%28v=vs.90%29.aspx
-FORCE_INLINE __m128 _mm_unpacklo_ps(__m128 a, __m128 b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128_f32(
-        vzip1q_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-#else
-    float32x2_t a1 = vget_low_f32(vreinterpretq_f32_m128(a));
-    float32x2_t b1 = vget_low_f32(vreinterpretq_f32_m128(b));
-    float32x2x2_t result = vzip_f32(a1, b1);
-    return vreinterpretq_m128_f32(vcombine_f32(result.val[0], result.val[1]));
-#endif
-}
-
-// Computes bitwise EXOR (exclusive-or) of the four single-precision,
-// floating-point values of a and b.
-// https://msdn.microsoft.com/en-us/library/ss6k3wk8(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_xor_ps(__m128 a, __m128 b)
-{
-    return vreinterpretq_m128_s32(
-        veorq_s32(vreinterpretq_s32_m128(a), vreinterpretq_s32_m128(b)));
-}
-
-/* SSE2 */
-
-// Adds the 8 signed or unsigned 16-bit integers in a to the 8 signed or
-// unsigned 16-bit integers in b.
-// https://msdn.microsoft.com/en-us/library/fceha5k4(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_add_epi16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s16(
-        vaddq_s16(vreinterpretq_s16_m128i(a), vreinterpretq_s16_m128i(b)));
-}
-
-// Adds the 4 signed or unsigned 32-bit integers in a to the 4 signed or
-// unsigned 32-bit integers in b.
-//
-//   r0 := a0 + b0
-//   r1 := a1 + b1
-//   r2 := a2 + b2
-//   r3 := a3 + b3
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/09xs4fkk(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_add_epi32(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s32(
-        vaddq_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(b)));
-}
-
-// Adds the 4 signed or unsigned 64-bit integers in a to the 4 signed or
-// unsigned 32-bit integers in b.
-// https://msdn.microsoft.com/en-us/library/vstudio/09xs4fkk(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_add_epi64(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s64(
-        vaddq_s64(vreinterpretq_s64_m128i(a), vreinterpretq_s64_m128i(b)));
-}
-
-// Adds the 16 signed or unsigned 8-bit integers in a to the 16 signed or
-// unsigned 8-bit integers in b.
-// https://technet.microsoft.com/en-us/subscriptions/yc7tcyzs(v=vs.90)
-FORCE_INLINE __m128i _mm_add_epi8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s8(
-        vaddq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
-}
-
-// Add packed double-precision (64-bit) floating-point elements in a and b, and
-// store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_add_pd
-FORCE_INLINE __m128d _mm_add_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vaddq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#else
-    double *da = (double *) &a;
-    double *db = (double *) &b;
-    double c[2];
-    c[0] = da[0] + db[0];
-    c[1] = da[1] + db[1];
-    return vld1q_f32((float32_t *) c);
-#endif
-}
-
-// Add the lower double-precision (64-bit) floating-point element in a and b,
-// store the result in the lower element of dst, and copy the upper element from
-// a to the upper element of dst.
-//
-//   dst[63:0] := a[63:0] + b[63:0]
-//   dst[127:64] := a[127:64]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_add_sd
-FORCE_INLINE __m128d _mm_add_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return _mm_move_sd(a, _mm_add_pd(a, b));
-#else
-    double *da = (double *) &a;
-    double *db = (double *) &b;
-    double c[2];
-    c[0] = da[0] + db[0];
-    c[1] = da[1];
-    return vld1q_f32((float32_t *) c);
-#endif
-}
-
-// Add 64-bit integers a and b, and store the result in dst.
-//
-//   dst[63:0] := a[63:0] + b[63:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_add_si64
-FORCE_INLINE __m64 _mm_add_si64(__m64 a, __m64 b)
-{
-    return vreinterpret_m64_s64(
-        vadd_s64(vreinterpret_s64_m64(a), vreinterpret_s64_m64(b)));
-}
-
-// Adds the 8 signed 16-bit integers in a to the 8 signed 16-bit integers in b
-// and saturates.
-//
-//   r0 := SignedSaturate(a0 + b0)
-//   r1 := SignedSaturate(a1 + b1)
-//   ...
-//   r7 := SignedSaturate(a7 + b7)
-//
-// https://msdn.microsoft.com/en-us/library/1a306ef8(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_adds_epi16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s16(
-        vqaddq_s16(vreinterpretq_s16_m128i(a), vreinterpretq_s16_m128i(b)));
-}
-
-// Add packed signed 8-bit integers in a and b using saturation, and store the
-// results in dst.
-//
-//   FOR j := 0 to 15
-//     i := j*8
-//     dst[i+7:i] := Saturate8( a[i+7:i] + b[i+7:i] )
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_adds_epi8
-FORCE_INLINE __m128i _mm_adds_epi8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s8(
-        vqaddq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
-}
-
-// Add packed unsigned 16-bit integers in a and b using saturation, and store
-// the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_adds_epu16
-FORCE_INLINE __m128i _mm_adds_epu16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u16(
-        vqaddq_u16(vreinterpretq_u16_m128i(a), vreinterpretq_u16_m128i(b)));
-}
-
-// Adds the 16 unsigned 8-bit integers in a to the 16 unsigned 8-bit integers in
-// b and saturates..
-// https://msdn.microsoft.com/en-us/library/9hahyddy(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_adds_epu8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u8(
-        vqaddq_u8(vreinterpretq_u8_m128i(a), vreinterpretq_u8_m128i(b)));
-}
-
-// Compute the bitwise AND of packed double-precision (64-bit) floating-point
-// elements in a and b, and store the results in dst.
-//
-//   FOR j := 0 to 1
-//     i := j*64
-//     dst[i+63:i] := a[i+63:i] AND b[i+63:i]
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_and_pd
-FORCE_INLINE __m128d _mm_and_pd(__m128d a, __m128d b)
-{
-    return vreinterpretq_m128d_s64(
-        vandq_s64(vreinterpretq_s64_m128d(a), vreinterpretq_s64_m128d(b)));
-}
-
-// Computes the bitwise AND of the 128-bit value in a and the 128-bit value in
-// b.
-//
-//   r := a & b
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/6d1txsa8(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_and_si128(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s32(
-        vandq_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(b)));
-}
-
-// Compute the bitwise NOT of packed double-precision (64-bit) floating-point
-// elements in a and then AND with b, and store the results in dst.
-//
-//   FOR j := 0 to 1
-// 	     i := j*64
-// 	     dst[i+63:i] := ((NOT a[i+63:i]) AND b[i+63:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_andnot_pd
-FORCE_INLINE __m128d _mm_andnot_pd(__m128d a, __m128d b)
-{
-    // *NOTE* argument swap
-    return vreinterpretq_m128d_s64(
-        vbicq_s64(vreinterpretq_s64_m128d(b), vreinterpretq_s64_m128d(a)));
-}
-
-// Computes the bitwise AND of the 128-bit value in b and the bitwise NOT of the
-// 128-bit value in a.
-//
-//   r := (~a) & b
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/1beaceh8(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_andnot_si128(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s32(
-        vbicq_s32(vreinterpretq_s32_m128i(b),
-                  vreinterpretq_s32_m128i(a)));  // *NOTE* argument swap
-}
-
-// Computes the average of the 8 unsigned 16-bit integers in a and the 8
-// unsigned 16-bit integers in b and rounds.
-//
-//   r0 := (a0 + b0) / 2
-//   r1 := (a1 + b1) / 2
-//   ...
-//   r7 := (a7 + b7) / 2
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/y13ca3c8(v=vs.90).aspx
-FORCE_INLINE __m128i _mm_avg_epu16(__m128i a, __m128i b)
-{
-    return (__m128i) vrhaddq_u16(vreinterpretq_u16_m128i(a),
-                                 vreinterpretq_u16_m128i(b));
-}
-
-// Computes the average of the 16 unsigned 8-bit integers in a and the 16
-// unsigned 8-bit integers in b and rounds.
-//
-//   r0 := (a0 + b0) / 2
-//   r1 := (a1 + b1) / 2
-//   ...
-//   r15 := (a15 + b15) / 2
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/8zwh554a(v%3dvs.90).aspx
-FORCE_INLINE __m128i _mm_avg_epu8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u8(
-        vrhaddq_u8(vreinterpretq_u8_m128i(a), vreinterpretq_u8_m128i(b)));
-}
-
-// Shift a left by imm8 bytes while shifting in zeros, and store the results in
-// dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_bslli_si128
-#define _mm_bslli_si128(a, imm) _mm_slli_si128(a, imm)
-
-// Shift a right by imm8 bytes while shifting in zeros, and store the results in
-// dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_bsrli_si128
-#define _mm_bsrli_si128(a, imm) _mm_srli_si128(a, imm)
-
-// Cast vector of type __m128d to type __m128. This intrinsic is only used for
-// compilation and does not generate any instructions, thus it has zero latency.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_castpd_ps
-FORCE_INLINE __m128 _mm_castpd_ps(__m128d a)
-{
-    return vreinterpretq_m128_s64(vreinterpretq_s64_m128d(a));
-}
-
-// Cast vector of type __m128d to type __m128i. This intrinsic is only used for
-// compilation and does not generate any instructions, thus it has zero latency.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_castpd_si128
-FORCE_INLINE __m128i _mm_castpd_si128(__m128d a)
-{
-    return vreinterpretq_m128i_s64(vreinterpretq_s64_m128d(a));
-}
-
-// Cast vector of type __m128 to type __m128d. This intrinsic is only used for
-// compilation and does not generate any instructions, thus it has zero latency.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_castps_pd
-FORCE_INLINE __m128d _mm_castps_pd(__m128 a)
-{
-    return vreinterpretq_m128d_s32(vreinterpretq_s32_m128(a));
-}
-
-// Applies a type cast to reinterpret four 32-bit floating point values passed
-// in as a 128-bit parameter as packed 32-bit integers.
-// https://msdn.microsoft.com/en-us/library/bb514099.aspx
-FORCE_INLINE __m128i _mm_castps_si128(__m128 a)
-{
-    return vreinterpretq_m128i_s32(vreinterpretq_s32_m128(a));
-}
-
-// Cast vector of type __m128i to type __m128d. This intrinsic is only used for
-// compilation and does not generate any instructions, thus it has zero latency.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_castsi128_pd
-FORCE_INLINE __m128d _mm_castsi128_pd(__m128i a)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(vreinterpretq_f64_m128i(a));
-#else
-    return vreinterpretq_m128d_f32(vreinterpretq_f32_m128i(a));
-#endif
-}
-
-// Applies a type cast to reinterpret four 32-bit integers passed in as a
-// 128-bit parameter as packed 32-bit floating point values.
-// https://msdn.microsoft.com/en-us/library/bb514029.aspx
-FORCE_INLINE __m128 _mm_castsi128_ps(__m128i a)
-{
-    return vreinterpretq_m128_s32(vreinterpretq_s32_m128i(a));
-}
-
-// Cache line containing p is flushed and invalidated from all caches in the
-// coherency domain. :
-// https://msdn.microsoft.com/en-us/library/ba08y07y(v=vs.100).aspx
-FORCE_INLINE void _mm_clflush(void const *p)
-{
-    (void) p;
-    // no corollary for Neon?
-}
-
-// Compares the 8 signed or unsigned 16-bit integers in a and the 8 signed or
-// unsigned 16-bit integers in b for equality.
-// https://msdn.microsoft.com/en-us/library/2ay060te(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_cmpeq_epi16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u16(
-        vceqq_s16(vreinterpretq_s16_m128i(a), vreinterpretq_s16_m128i(b)));
-}
-
-// Compare packed 32-bit integers in a and b for equality, and store the results
-// in dst
-FORCE_INLINE __m128i _mm_cmpeq_epi32(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u32(
-        vceqq_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(b)));
-}
-
-// Compares the 16 signed or unsigned 8-bit integers in a and the 16 signed or
-// unsigned 8-bit integers in b for equality.
-// https://msdn.microsoft.com/en-us/library/windows/desktop/bz5xk21a(v=vs.90).aspx
-FORCE_INLINE __m128i _mm_cmpeq_epi8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u8(
-        vceqq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b
-// for equality, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpeq_pd
-FORCE_INLINE __m128d _mm_cmpeq_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_u64(
-        vceqq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#else
-    // (a == b) -> (a_lo == b_lo) && (a_hi == b_hi)
-    uint32x4_t cmp =
-        vceqq_u32(vreinterpretq_u32_m128d(a), vreinterpretq_u32_m128d(b));
-    uint32x4_t swapped = vrev64q_u32(cmp);
-    return vreinterpretq_m128d_u32(vandq_u32(cmp, swapped));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b for equality, store the result in the lower element of dst, and copy the
-// upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpeq_sd
-FORCE_INLINE __m128d _mm_cmpeq_sd(__m128d a, __m128d b)
-{
-    return _mm_move_sd(a, _mm_cmpeq_pd(a, b));
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b
-// for greater-than-or-equal, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpge_pd
-FORCE_INLINE __m128d _mm_cmpge_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_u64(
-        vcgeq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t b1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] = (*(double *) &a0) >= (*(double *) &b0) ? ~UINT64_C(0) : UINT64_C(0);
-    d[1] = (*(double *) &a1) >= (*(double *) &b1) ? ~UINT64_C(0) : UINT64_C(0);
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b for greater-than-or-equal, store the result in the lower element of dst,
-// and copy the upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpge_sd
-FORCE_INLINE __m128d _mm_cmpge_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return _mm_move_sd(a, _mm_cmpge_pd(a, b));
-#else
-    // expand "_mm_cmpge_pd()" to reduce unnecessary operations
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] = (*(double *) &a0) >= (*(double *) &b0) ? ~UINT64_C(0) : UINT64_C(0);
-    d[1] = a1;
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compares the 8 signed 16-bit integers in a and the 8 signed 16-bit integers
-// in b for greater than.
-//
-//   r0 := (a0 > b0) ? 0xffff : 0x0
-//   r1 := (a1 > b1) ? 0xffff : 0x0
-//   ...
-//   r7 := (a7 > b7) ? 0xffff : 0x0
-//
-// https://technet.microsoft.com/en-us/library/xd43yfsa(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_cmpgt_epi16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u16(
-        vcgtq_s16(vreinterpretq_s16_m128i(a), vreinterpretq_s16_m128i(b)));
-}
-
-// Compares the 4 signed 32-bit integers in a and the 4 signed 32-bit integers
-// in b for greater than.
-// https://msdn.microsoft.com/en-us/library/vstudio/1s9f2z0y(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_cmpgt_epi32(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u32(
-        vcgtq_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(b)));
-}
-
-// Compares the 16 signed 8-bit integers in a and the 16 signed 8-bit integers
-// in b for greater than.
-//
-//   r0 := (a0 > b0) ? 0xff : 0x0
-//   r1 := (a1 > b1) ? 0xff : 0x0
-//   ...
-//   r15 := (a15 > b15) ? 0xff : 0x0
-//
-// https://msdn.microsoft.com/zh-tw/library/wf45zt2b(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_cmpgt_epi8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u8(
-        vcgtq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b
-// for greater-than, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpgt_pd
-FORCE_INLINE __m128d _mm_cmpgt_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_u64(
-        vcgtq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t b1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] = (*(double *) &a0) > (*(double *) &b0) ? ~UINT64_C(0) : UINT64_C(0);
-    d[1] = (*(double *) &a1) > (*(double *) &b1) ? ~UINT64_C(0) : UINT64_C(0);
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b for greater-than, store the result in the lower element of dst, and copy
-// the upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpgt_sd
-FORCE_INLINE __m128d _mm_cmpgt_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return _mm_move_sd(a, _mm_cmpgt_pd(a, b));
-#else
-    // expand "_mm_cmpge_pd()" to reduce unnecessary operations
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] = (*(double *) &a0) > (*(double *) &b0) ? ~UINT64_C(0) : UINT64_C(0);
-    d[1] = a1;
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b
-// for less-than-or-equal, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmple_pd
-FORCE_INLINE __m128d _mm_cmple_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_u64(
-        vcleq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t b1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] = (*(double *) &a0) <= (*(double *) &b0) ? ~UINT64_C(0) : UINT64_C(0);
-    d[1] = (*(double *) &a1) <= (*(double *) &b1) ? ~UINT64_C(0) : UINT64_C(0);
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b for less-than-or-equal, store the result in the lower element of dst, and
-// copy the upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmple_sd
-FORCE_INLINE __m128d _mm_cmple_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return _mm_move_sd(a, _mm_cmple_pd(a, b));
-#else
-    // expand "_mm_cmpge_pd()" to reduce unnecessary operations
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] = (*(double *) &a0) <= (*(double *) &b0) ? ~UINT64_C(0) : UINT64_C(0);
-    d[1] = a1;
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compares the 8 signed 16-bit integers in a and the 8 signed 16-bit integers
-// in b for less than.
-//
-//   r0 := (a0 < b0) ? 0xffff : 0x0
-//   r1 := (a1 < b1) ? 0xffff : 0x0
-//   ...
-//   r7 := (a7 < b7) ? 0xffff : 0x0
-//
-// https://technet.microsoft.com/en-us/library/t863edb2(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_cmplt_epi16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u16(
-        vcltq_s16(vreinterpretq_s16_m128i(a), vreinterpretq_s16_m128i(b)));
-}
-
-
-// Compares the 4 signed 32-bit integers in a and the 4 signed 32-bit integers
-// in b for less than.
-// https://msdn.microsoft.com/en-us/library/vstudio/4ak0bf5d(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_cmplt_epi32(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u32(
-        vcltq_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(b)));
-}
-
-// Compares the 16 signed 8-bit integers in a and the 16 signed 8-bit integers
-// in b for lesser than.
-// https://msdn.microsoft.com/en-us/library/windows/desktop/9s46csht(v=vs.90).aspx
-FORCE_INLINE __m128i _mm_cmplt_epi8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u8(
-        vcltq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b
-// for less-than, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmplt_pd
-FORCE_INLINE __m128d _mm_cmplt_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_u64(
-        vcltq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t b1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] = (*(double *) &a0) < (*(double *) &b0) ? ~UINT64_C(0) : UINT64_C(0);
-    d[1] = (*(double *) &a1) < (*(double *) &b1) ? ~UINT64_C(0) : UINT64_C(0);
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b for less-than, store the result in the lower element of dst, and copy the
-// upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmplt_sd
-FORCE_INLINE __m128d _mm_cmplt_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return _mm_move_sd(a, _mm_cmplt_pd(a, b));
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] = (*(double *) &a0) < (*(double *) &b0) ? ~UINT64_C(0) : UINT64_C(0);
-    d[1] = a1;
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b
-// for not-equal, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpneq_pd
-FORCE_INLINE __m128d _mm_cmpneq_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_s32(vmvnq_s32(vreinterpretq_s32_u64(
-        vceqq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)))));
-#else
-    // (a == b) -> (a_lo == b_lo) && (a_hi == b_hi)
-    uint32x4_t cmp =
-        vceqq_u32(vreinterpretq_u32_m128d(a), vreinterpretq_u32_m128d(b));
-    uint32x4_t swapped = vrev64q_u32(cmp);
-    return vreinterpretq_m128d_u32(vmvnq_u32(vandq_u32(cmp, swapped)));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b for not-equal, store the result in the lower element of dst, and copy the
-// upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpneq_sd
-FORCE_INLINE __m128d _mm_cmpneq_sd(__m128d a, __m128d b)
-{
-    return _mm_move_sd(a, _mm_cmpneq_pd(a, b));
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b
-// for not-greater-than-or-equal, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpnge_pd
-FORCE_INLINE __m128d _mm_cmpnge_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_u64(veorq_u64(
-        vcgeq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)),
-        vdupq_n_u64(UINT64_MAX)));
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t b1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] =
-        !((*(double *) &a0) >= (*(double *) &b0)) ? ~UINT64_C(0) : UINT64_C(0);
-    d[1] =
-        !((*(double *) &a1) >= (*(double *) &b1)) ? ~UINT64_C(0) : UINT64_C(0);
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b for not-greater-than-or-equal, store the result in the lower element of
-// dst, and copy the upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpnge_sd
-FORCE_INLINE __m128d _mm_cmpnge_sd(__m128d a, __m128d b)
-{
-    return _mm_move_sd(a, _mm_cmpnge_pd(a, b));
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b
-// for not-greater-than, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_cmpngt_pd
-FORCE_INLINE __m128d _mm_cmpngt_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_u64(veorq_u64(
-        vcgtq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)),
-        vdupq_n_u64(UINT64_MAX)));
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t b1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] =
-        !((*(double *) &a0) > (*(double *) &b0)) ? ~UINT64_C(0) : UINT64_C(0);
-    d[1] =
-        !((*(double *) &a1) > (*(double *) &b1)) ? ~UINT64_C(0) : UINT64_C(0);
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b for not-greater-than, store the result in the lower element of dst, and
-// copy the upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpngt_sd
-FORCE_INLINE __m128d _mm_cmpngt_sd(__m128d a, __m128d b)
-{
-    return _mm_move_sd(a, _mm_cmpngt_pd(a, b));
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b
-// for not-less-than-or-equal, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpnle_pd
-FORCE_INLINE __m128d _mm_cmpnle_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_u64(veorq_u64(
-        vcleq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)),
-        vdupq_n_u64(UINT64_MAX)));
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t b1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] =
-        !((*(double *) &a0) <= (*(double *) &b0)) ? ~UINT64_C(0) : UINT64_C(0);
-    d[1] =
-        !((*(double *) &a1) <= (*(double *) &b1)) ? ~UINT64_C(0) : UINT64_C(0);
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b for not-less-than-or-equal, store the result in the lower element of dst,
-// and copy the upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpnle_sd
-FORCE_INLINE __m128d _mm_cmpnle_sd(__m128d a, __m128d b)
-{
-    return _mm_move_sd(a, _mm_cmpnle_pd(a, b));
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b
-// for not-less-than, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpnlt_pd
-FORCE_INLINE __m128d _mm_cmpnlt_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_u64(veorq_u64(
-        vcltq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)),
-        vdupq_n_u64(UINT64_MAX)));
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t b1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] =
-        !((*(double *) &a0) < (*(double *) &b0)) ? ~UINT64_C(0) : UINT64_C(0);
-    d[1] =
-        !((*(double *) &a1) < (*(double *) &b1)) ? ~UINT64_C(0) : UINT64_C(0);
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b for not-less-than, store the result in the lower element of dst, and copy
-// the upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpnlt_sd
-FORCE_INLINE __m128d _mm_cmpnlt_sd(__m128d a, __m128d b)
-{
-    return _mm_move_sd(a, _mm_cmpnlt_pd(a, b));
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b
-// to see if neither is NaN, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpord_pd
-FORCE_INLINE __m128d _mm_cmpord_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    // Excluding NaNs, any two floating point numbers can be compared.
-    uint64x2_t not_nan_a =
-        vceqq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(a));
-    uint64x2_t not_nan_b =
-        vceqq_f64(vreinterpretq_f64_m128d(b), vreinterpretq_f64_m128d(b));
-    return vreinterpretq_m128d_u64(vandq_u64(not_nan_a, not_nan_b));
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t b1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] = ((*(double *) &a0) == (*(double *) &a0) &&
-            (*(double *) &b0) == (*(double *) &b0))
-               ? ~UINT64_C(0)
-               : UINT64_C(0);
-    d[1] = ((*(double *) &a1) == (*(double *) &a1) &&
-            (*(double *) &b1) == (*(double *) &b1))
-               ? ~UINT64_C(0)
-               : UINT64_C(0);
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b to see if neither is NaN, store the result in the lower element of dst, and
-// copy the upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpord_sd
-FORCE_INLINE __m128d _mm_cmpord_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return _mm_move_sd(a, _mm_cmpord_pd(a, b));
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t d[2];
-    d[0] = ((*(double *) &a0) == (*(double *) &a0) &&
-            (*(double *) &b0) == (*(double *) &b0))
-               ? ~UINT64_C(0)
-               : UINT64_C(0);
-    d[1] = a1;
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b
-// to see if either is NaN, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpunord_pd
-FORCE_INLINE __m128d _mm_cmpunord_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    // Two NaNs are not equal in comparison operation.
-    uint64x2_t not_nan_a =
-        vceqq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(a));
-    uint64x2_t not_nan_b =
-        vceqq_f64(vreinterpretq_f64_m128d(b), vreinterpretq_f64_m128d(b));
-    return vreinterpretq_m128d_s32(
-        vmvnq_s32(vreinterpretq_s32_u64(vandq_u64(not_nan_a, not_nan_b))));
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t b1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] = ((*(double *) &a0) == (*(double *) &a0) &&
-            (*(double *) &b0) == (*(double *) &b0))
-               ? UINT64_C(0)
-               : ~UINT64_C(0);
-    d[1] = ((*(double *) &a1) == (*(double *) &a1) &&
-            (*(double *) &b1) == (*(double *) &b1))
-               ? UINT64_C(0)
-               : ~UINT64_C(0);
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b to see if either is NaN, store the result in the lower element of dst, and
-// copy the upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cmpunord_sd
-FORCE_INLINE __m128d _mm_cmpunord_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return _mm_move_sd(a, _mm_cmpunord_pd(a, b));
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t d[2];
-    d[0] = ((*(double *) &a0) == (*(double *) &a0) &&
-            (*(double *) &b0) == (*(double *) &b0))
-               ? UINT64_C(0)
-               : ~UINT64_C(0);
-    d[1] = a1;
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point element in a and b
-// for greater-than-or-equal, and return the boolean result (0 or 1).
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_comige_sd
-FORCE_INLINE int _mm_comige_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vgetq_lane_u64(vcgeq_f64(a, b), 0) & 0x1;
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-
-    return (*(double *) &a0 >= *(double *) &b0);
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point element in a and b
-// for greater-than, and return the boolean result (0 or 1).
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_comigt_sd
-FORCE_INLINE int _mm_comigt_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vgetq_lane_u64(vcgtq_f64(a, b), 0) & 0x1;
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-
-    return (*(double *) &a0 > *(double *) &b0);
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point element in a and b
-// for less-than-or-equal, and return the boolean result (0 or 1).
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_comile_sd
-FORCE_INLINE int _mm_comile_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vgetq_lane_u64(vcleq_f64(a, b), 0) & 0x1;
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-
-    return (*(double *) &a0 <= *(double *) &b0);
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point element in a and b
-// for less-than, and return the boolean result (0 or 1).
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_comilt_sd
-FORCE_INLINE int _mm_comilt_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vgetq_lane_u64(vcltq_f64(a, b), 0) & 0x1;
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-
-    return (*(double *) &a0 < *(double *) &b0);
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point element in a and b
-// for equality, and return the boolean result (0 or 1).
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_comieq_sd
-FORCE_INLINE int _mm_comieq_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vgetq_lane_u64(vceqq_f64(a, b), 0) & 0x1;
-#else
-    uint32x4_t a_not_nan =
-        vceqq_u32(vreinterpretq_u32_m128d(a), vreinterpretq_u32_m128d(a));
-    uint32x4_t b_not_nan =
-        vceqq_u32(vreinterpretq_u32_m128d(b), vreinterpretq_u32_m128d(b));
-    uint32x4_t a_and_b_not_nan = vandq_u32(a_not_nan, b_not_nan);
-    uint32x4_t a_eq_b =
-        vceqq_u32(vreinterpretq_u32_m128d(a), vreinterpretq_u32_m128d(b));
-    uint64x2_t and_results = vandq_u64(vreinterpretq_u64_u32(a_and_b_not_nan),
-                                       vreinterpretq_u64_u32(a_eq_b));
-    return vgetq_lane_u64(and_results, 0) & 0x1;
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point element in a and b
-// for not-equal, and return the boolean result (0 or 1).
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_comineq_sd
-FORCE_INLINE int _mm_comineq_sd(__m128d a, __m128d b)
-{
-    return !_mm_comieq_sd(a, b);
-}
-
-// Convert packed signed 32-bit integers in a to packed double-precision
-// (64-bit) floating-point elements, and store the results in dst.
-//
-//   FOR j := 0 to 1
-//     i := j*32
-//     m := j*64
-//     dst[m+63:m] := Convert_Int32_To_FP64(a[i+31:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtepi32_pd
-FORCE_INLINE __m128d _mm_cvtepi32_pd(__m128i a)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vcvtq_f64_s64(vmovl_s32(vget_low_s32(vreinterpretq_s32_m128i(a)))));
-#else
-    double a0 = (double) vgetq_lane_s32(vreinterpretq_s32_m128i(a), 0);
-    double a1 = (double) vgetq_lane_s32(vreinterpretq_s32_m128i(a), 1);
-    return _mm_set_pd(a1, a0);
-#endif
-}
-
-// Converts the four signed 32-bit integer values of a to single-precision,
-// floating-point values
-// https://msdn.microsoft.com/en-us/library/vstudio/36bwxcx5(v=vs.100).aspx
-FORCE_INLINE __m128 _mm_cvtepi32_ps(__m128i a)
-{
-    return vreinterpretq_m128_f32(vcvtq_f32_s32(vreinterpretq_s32_m128i(a)));
-}
-
-// Convert packed double-precision (64-bit) floating-point elements in a to
-// packed 32-bit integers, and store the results in dst.
-//
-//   FOR j := 0 to 1
-//      i := 32*j
-//      k := 64*j
-//      dst[i+31:i] := Convert_FP64_To_Int32(a[k+63:k])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtpd_epi32
-FORCE_INLINE __m128i _mm_cvtpd_epi32(__m128d a)
-{
-    __m128d rnd = _mm_round_pd(a, _MM_FROUND_CUR_DIRECTION);
-    double d0 = ((double *) &rnd)[0];
-    double d1 = ((double *) &rnd)[1];
-    return _mm_set_epi32(0, 0, (int32_t) d1, (int32_t) d0);
-}
-
-// Convert packed double-precision (64-bit) floating-point elements in a to
-// packed 32-bit integers, and store the results in dst.
-//
-//   FOR j := 0 to 1
-//      i := 32*j
-//      k := 64*j
-//      dst[i+31:i] := Convert_FP64_To_Int32(a[k+63:k])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtpd_pi32
-FORCE_INLINE __m64 _mm_cvtpd_pi32(__m128d a)
-{
-    __m128d rnd = _mm_round_pd(a, _MM_FROUND_CUR_DIRECTION);
-    double d0 = ((double *) &rnd)[0];
-    double d1 = ((double *) &rnd)[1];
-    int32_t ALIGN_STRUCT(16) data[2] = {(int32_t) d0, (int32_t) d1};
-    return vreinterpret_m64_s32(vld1_s32(data));
-}
-
-// Convert packed double-precision (64-bit) floating-point elements in a to
-// packed single-precision (32-bit) floating-point elements, and store the
-// results in dst.
-//
-//   FOR j := 0 to 1
-//     i := 32*j
-//     k := 64*j
-//     dst[i+31:i] := Convert_FP64_To_FP32(a[k+64:k])
-//   ENDFOR
-//   dst[127:64] := 0
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtpd_ps
-FORCE_INLINE __m128 _mm_cvtpd_ps(__m128d a)
-{
-#if defined(__aarch64__)
-    float32x2_t tmp = vcvt_f32_f64(vreinterpretq_f64_m128d(a));
-    return vreinterpretq_m128_f32(vcombine_f32(tmp, vdup_n_f32(0)));
-#else
-    float a0 = (float) ((double *) &a)[0];
-    float a1 = (float) ((double *) &a)[1];
-    return _mm_set_ps(0, 0, a1, a0);
-#endif
-}
-
-// Convert packed signed 32-bit integers in a to packed double-precision
-// (64-bit) floating-point elements, and store the results in dst.
-//
-//   FOR j := 0 to 1
-//     i := j*32
-//     m := j*64
-//     dst[m+63:m] := Convert_Int32_To_FP64(a[i+31:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtpi32_pd
-FORCE_INLINE __m128d _mm_cvtpi32_pd(__m64 a)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vcvtq_f64_s64(vmovl_s32(vreinterpret_s32_m64(a))));
-#else
-    double a0 = (double) vget_lane_s32(vreinterpret_s32_m64(a), 0);
-    double a1 = (double) vget_lane_s32(vreinterpret_s32_m64(a), 1);
-    return _mm_set_pd(a1, a0);
-#endif
-}
-
-// Converts the four single-precision, floating-point values of a to signed
-// 32-bit integer values.
-//
-//   r0 := (int) a0
-//   r1 := (int) a1
-//   r2 := (int) a2
-//   r3 := (int) a3
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/xdc42k5e(v=vs.100).aspx
-// *NOTE*. The default rounding mode on SSE is 'round to even', which ARMv7-A
-// does not support! It is supported on ARMv8-A however.
-FORCE_INLINE __m128i _mm_cvtps_epi32(__m128 a)
-{
-#if defined(__aarch64__)
-    switch (_MM_GET_ROUNDING_MODE()) {
-    case _MM_ROUND_NEAREST:
-        return vreinterpretq_m128i_s32(vcvtnq_s32_f32(a));
-    case _MM_ROUND_DOWN:
-        return vreinterpretq_m128i_s32(vcvtmq_s32_f32(a));
-    case _MM_ROUND_UP:
-        return vreinterpretq_m128i_s32(vcvtpq_s32_f32(a));
-    default:  // _MM_ROUND_TOWARD_ZERO
-        return vreinterpretq_m128i_s32(vcvtq_s32_f32(a));
-    }
-#else
-    float *f = (float *) &a;
-    switch (_MM_GET_ROUNDING_MODE()) {
-    case _MM_ROUND_NEAREST: {
-        uint32x4_t signmask = vdupq_n_u32(0x80000000);
-        float32x4_t half = vbslq_f32(signmask, vreinterpretq_f32_m128(a),
-                                     vdupq_n_f32(0.5f)); /* +/- 0.5 */
-        int32x4_t r_normal = vcvtq_s32_f32(vaddq_f32(
-            vreinterpretq_f32_m128(a), half)); /* round to integer: [a + 0.5]*/
-        int32x4_t r_trunc = vcvtq_s32_f32(
-            vreinterpretq_f32_m128(a)); /* truncate to integer: [a] */
-        int32x4_t plusone = vreinterpretq_s32_u32(vshrq_n_u32(
-            vreinterpretq_u32_s32(vnegq_s32(r_trunc)), 31)); /* 1 or 0 */
-        int32x4_t r_even = vbicq_s32(vaddq_s32(r_trunc, plusone),
-                                     vdupq_n_s32(1)); /* ([a] + {0,1}) & ~1 */
-        float32x4_t delta = vsubq_f32(
-            vreinterpretq_f32_m128(a),
-            vcvtq_f32_s32(r_trunc)); /* compute delta: delta = (a - [a]) */
-        uint32x4_t is_delta_half =
-            vceqq_f32(delta, half); /* delta == +/- 0.5 */
-        return vreinterpretq_m128i_s32(
-            vbslq_s32(is_delta_half, r_even, r_normal));
-    }
-    case _MM_ROUND_DOWN:
-        return _mm_set_epi32(floorf(f[3]), floorf(f[2]), floorf(f[1]),
-                             floorf(f[0]));
-    case _MM_ROUND_UP:
-        return _mm_set_epi32(ceilf(f[3]), ceilf(f[2]), ceilf(f[1]),
-                             ceilf(f[0]));
-    default:  // _MM_ROUND_TOWARD_ZERO
-        return _mm_set_epi32((int32_t) f[3], (int32_t) f[2], (int32_t) f[1],
-                             (int32_t) f[0]);
-    }
-#endif
-}
-
-// Convert packed single-precision (32-bit) floating-point elements in a to
-// packed double-precision (64-bit) floating-point elements, and store the
-// results in dst.
-//
-//   FOR j := 0 to 1
-//     i := 64*j
-//     k := 32*j
-//     dst[i+63:i] := Convert_FP32_To_FP64(a[k+31:k])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtps_pd
-FORCE_INLINE __m128d _mm_cvtps_pd(__m128 a)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vcvt_f64_f32(vget_low_f32(vreinterpretq_f32_m128(a))));
-#else
-    double a0 = (double) vgetq_lane_f32(vreinterpretq_f32_m128(a), 0);
-    double a1 = (double) vgetq_lane_f32(vreinterpretq_f32_m128(a), 1);
-    return _mm_set_pd(a1, a0);
-#endif
-}
-
-// Copy the lower double-precision (64-bit) floating-point element of a to dst.
-//
-//   dst[63:0] := a[63:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsd_f64
-FORCE_INLINE double _mm_cvtsd_f64(__m128d a)
-{
-#if defined(__aarch64__)
-    return (double) vgetq_lane_f64(vreinterpretq_f64_m128d(a), 0);
-#else
-    return ((double *) &a)[0];
-#endif
-}
-
-// Convert the lower double-precision (64-bit) floating-point element in a to a
-// 32-bit integer, and store the result in dst.
-//
-//   dst[31:0] := Convert_FP64_To_Int32(a[63:0])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsd_si32
-FORCE_INLINE int32_t _mm_cvtsd_si32(__m128d a)
-{
-#if defined(__aarch64__)
-    return (int32_t) vgetq_lane_f64(vrndiq_f64(vreinterpretq_f64_m128d(a)), 0);
-#else
-    __m128d rnd = _mm_round_pd(a, _MM_FROUND_CUR_DIRECTION);
-    double ret = ((double *) &rnd)[0];
-    return (int32_t) ret;
-#endif
-}
-
-// Convert the lower double-precision (64-bit) floating-point element in a to a
-// 64-bit integer, and store the result in dst.
-//
-//   dst[63:0] := Convert_FP64_To_Int64(a[63:0])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsd_si64
-FORCE_INLINE int64_t _mm_cvtsd_si64(__m128d a)
-{
-#if defined(__aarch64__)
-    return (int64_t) vgetq_lane_f64(vrndiq_f64(vreinterpretq_f64_m128d(a)), 0);
-#else
-    __m128d rnd = _mm_round_pd(a, _MM_FROUND_CUR_DIRECTION);
-    double ret = ((double *) &rnd)[0];
-    return (int64_t) ret;
-#endif
-}
-
-// Convert the lower double-precision (64-bit) floating-point element in a to a
-// 64-bit integer, and store the result in dst.
-//
-//   dst[63:0] := Convert_FP64_To_Int64(a[63:0])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsd_si64x
-#define _mm_cvtsd_si64x _mm_cvtsd_si64
-
-// Convert the lower double-precision (64-bit) floating-point element in b to a
-// single-precision (32-bit) floating-point element, store the result in the
-// lower element of dst, and copy the upper 3 packed elements from a to the
-// upper elements of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsd_ss
-FORCE_INLINE __m128 _mm_cvtsd_ss(__m128 a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128_f32(vsetq_lane_f32(
-        vget_lane_f32(vcvt_f32_f64(vreinterpretq_f64_m128d(b)), 0),
-        vreinterpretq_f32_m128(a), 0));
-#else
-    return vreinterpretq_m128_f32(vsetq_lane_f32((float) ((double *) &b)[0],
-                                                 vreinterpretq_f32_m128(a), 0));
-#endif
-}
-
-// Copy the lower 32-bit integer in a to dst.
-//
-//   dst[31:0] := a[31:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsi128_si32
-FORCE_INLINE int _mm_cvtsi128_si32(__m128i a)
-{
-    return vgetq_lane_s32(vreinterpretq_s32_m128i(a), 0);
-}
-
-// Copy the lower 64-bit integer in a to dst.
-//
-//   dst[63:0] := a[63:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsi128_si64
-FORCE_INLINE int64_t _mm_cvtsi128_si64(__m128i a)
-{
-    return vgetq_lane_s64(vreinterpretq_s64_m128i(a), 0);
-}
-
-// Copy the lower 64-bit integer in a to dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsi128_si64x
-#define _mm_cvtsi128_si64x(a) _mm_cvtsi128_si64(a)
-
-// Convert the signed 32-bit integer b to a double-precision (64-bit)
-// floating-point element, store the result in the lower element of dst, and
-// copy the upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsi32_sd
-FORCE_INLINE __m128d _mm_cvtsi32_sd(__m128d a, int32_t b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vsetq_lane_f64((double) b, vreinterpretq_f64_m128d(a), 0));
-#else
-    double bf = (double) b;
-    return vreinterpretq_m128d_s64(
-        vsetq_lane_s64(*(int64_t *) &bf, vreinterpretq_s64_m128d(a), 0));
-#endif
-}
-
-// Copy the lower 64-bit integer in a to dst.
-//
-//   dst[63:0] := a[63:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsi128_si64x
-#define _mm_cvtsi128_si64x(a) _mm_cvtsi128_si64(a)
-
-// Moves 32-bit integer a to the least significant 32 bits of an __m128 object,
-// zero extending the upper bits.
-//
-//   r0 := a
-//   r1 := 0x0
-//   r2 := 0x0
-//   r3 := 0x0
-//
-// https://msdn.microsoft.com/en-us/library/ct3539ha%28v=vs.90%29.aspx
-FORCE_INLINE __m128i _mm_cvtsi32_si128(int a)
-{
-    return vreinterpretq_m128i_s32(vsetq_lane_s32(a, vdupq_n_s32(0), 0));
-}
-
-// Convert the signed 64-bit integer b to a double-precision (64-bit)
-// floating-point element, store the result in the lower element of dst, and
-// copy the upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsi64_sd
-FORCE_INLINE __m128d _mm_cvtsi64_sd(__m128d a, int64_t b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vsetq_lane_f64((double) b, vreinterpretq_f64_m128d(a), 0));
-#else
-    double bf = (double) b;
-    return vreinterpretq_m128d_s64(
-        vsetq_lane_s64(*(int64_t *) &bf, vreinterpretq_s64_m128d(a), 0));
-#endif
-}
-
-// Moves 64-bit integer a to the least significant 64 bits of an __m128 object,
-// zero extending the upper bits.
-//
-//   r0 := a
-//   r1 := 0x0
-FORCE_INLINE __m128i _mm_cvtsi64_si128(int64_t a)
-{
-    return vreinterpretq_m128i_s64(vsetq_lane_s64(a, vdupq_n_s64(0), 0));
-}
-
-// Copy 64-bit integer a to the lower element of dst, and zero the upper
-// element.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsi64x_si128
-#define _mm_cvtsi64x_si128(a) _mm_cvtsi64_si128(a)
-
-// Convert the signed 64-bit integer b to a double-precision (64-bit)
-// floating-point element, store the result in the lower element of dst, and
-// copy the upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtsi64x_sd
-#define _mm_cvtsi64x_sd(a, b) _mm_cvtsi64_sd(a, b)
-
-// Convert the lower single-precision (32-bit) floating-point element in b to a
-// double-precision (64-bit) floating-point element, store the result in the
-// lower element of dst, and copy the upper element from a to the upper element
-// of dst.
-//
-//   dst[63:0] := Convert_FP32_To_FP64(b[31:0])
-//   dst[127:64] := a[127:64]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtss_sd
-FORCE_INLINE __m128d _mm_cvtss_sd(__m128d a, __m128 b)
-{
-    double d = (double) vgetq_lane_f32(vreinterpretq_f32_m128(b), 0);
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vsetq_lane_f64(d, vreinterpretq_f64_m128d(a), 0));
-#else
-    return vreinterpretq_m128d_s64(
-        vsetq_lane_s64(*(int64_t *) &d, vreinterpretq_s64_m128d(a), 0));
-#endif
-}
-
-// Convert packed double-precision (64-bit) floating-point elements in a to
-// packed 32-bit integers with truncation, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvttpd_epi32
-FORCE_INLINE __m128i _mm_cvttpd_epi32(__m128d a)
-{
-    double a0 = ((double *) &a)[0];
-    double a1 = ((double *) &a)[1];
-    return _mm_set_epi32(0, 0, (int32_t) a1, (int32_t) a0);
-}
-
-// Convert packed double-precision (64-bit) floating-point elements in a to
-// packed 32-bit integers with truncation, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvttpd_pi32
-FORCE_INLINE __m64 _mm_cvttpd_pi32(__m128d a)
-{
-    double a0 = ((double *) &a)[0];
-    double a1 = ((double *) &a)[1];
-    int32_t ALIGN_STRUCT(16) data[2] = {(int32_t) a0, (int32_t) a1};
-    return vreinterpret_m64_s32(vld1_s32(data));
-}
-
-// Converts the four single-precision, floating-point values of a to signed
-// 32-bit integer values using truncate.
-// https://msdn.microsoft.com/en-us/library/vstudio/1h005y6x(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_cvttps_epi32(__m128 a)
-{
-    return vreinterpretq_m128i_s32(vcvtq_s32_f32(vreinterpretq_f32_m128(a)));
-}
-
-// Convert the lower double-precision (64-bit) floating-point element in a to a
-// 32-bit integer with truncation, and store the result in dst.
-//
-//   dst[63:0] := Convert_FP64_To_Int32_Truncate(a[63:0])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvttsd_si32
-FORCE_INLINE int32_t _mm_cvttsd_si32(__m128d a)
-{
-    double ret = *((double *) &a);
-    return (int32_t) ret;
-}
-
-// Convert the lower double-precision (64-bit) floating-point element in a to a
-// 64-bit integer with truncation, and store the result in dst.
-//
-//   dst[63:0] := Convert_FP64_To_Int64_Truncate(a[63:0])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvttsd_si64
-FORCE_INLINE int64_t _mm_cvttsd_si64(__m128d a)
-{
-#if defined(__aarch64__)
-    return vgetq_lane_s64(vcvtq_s64_f64(vreinterpretq_f64_m128d(a)), 0);
-#else
-    double ret = *((double *) &a);
-    return (int64_t) ret;
-#endif
-}
-
-// Convert the lower double-precision (64-bit) floating-point element in a to a
-// 64-bit integer with truncation, and store the result in dst.
-//
-//   dst[63:0] := Convert_FP64_To_Int64_Truncate(a[63:0])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvttsd_si64x
-#define _mm_cvttsd_si64x(a) _mm_cvttsd_si64(a)
-
-// Divide packed double-precision (64-bit) floating-point elements in a by
-// packed elements in b, and store the results in dst.
-//
-//  FOR j := 0 to 1
-//    i := 64*j
-//    dst[i+63:i] := a[i+63:i] / b[i+63:i]
-//  ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_div_pd
-FORCE_INLINE __m128d _mm_div_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vdivq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#else
-    double *da = (double *) &a;
-    double *db = (double *) &b;
-    double c[2];
-    c[0] = da[0] / db[0];
-    c[1] = da[1] / db[1];
-    return vld1q_f32((float32_t *) c);
-#endif
-}
-
-// Divide the lower double-precision (64-bit) floating-point element in a by the
-// lower double-precision (64-bit) floating-point element in b, store the result
-// in the lower element of dst, and copy the upper element from a to the upper
-// element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_div_sd
-FORCE_INLINE __m128d _mm_div_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    float64x2_t tmp =
-        vdivq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b));
-    return vreinterpretq_m128d_f64(
-        vsetq_lane_f64(vgetq_lane_f64(vreinterpretq_f64_m128d(a), 1), tmp, 1));
-#else
-    return _mm_move_sd(a, _mm_div_pd(a, b));
-#endif
-}
-
-// Extracts the selected signed or unsigned 16-bit integer from a and zero
-// extends.
-// https://msdn.microsoft.com/en-us/library/6dceta0c(v=vs.100).aspx
-// FORCE_INLINE int _mm_extract_epi16(__m128i a, __constrange(0,8) int imm)
-#define _mm_extract_epi16(a, imm) \
-    vgetq_lane_u16(vreinterpretq_u16_m128i(a), (imm))
-
-// Inserts the least significant 16 bits of b into the selected 16-bit integer
-// of a.
-// https://msdn.microsoft.com/en-us/library/kaze8hz1%28v=vs.100%29.aspx
-// FORCE_INLINE __m128i _mm_insert_epi16(__m128i a, int b,
-//                                       __constrange(0,8) int imm)
-#define _mm_insert_epi16(a, b, imm)                                  \
-    __extension__({                                                  \
-        vreinterpretq_m128i_s16(                                     \
-            vsetq_lane_s16((b), vreinterpretq_s16_m128i(a), (imm))); \
-    })
-
-// Loads two double-precision from 16-byte aligned memory, floating-point
-// values.
-//
-//   dst[127:0] := MEM[mem_addr+127:mem_addr]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_load_pd
-FORCE_INLINE __m128d _mm_load_pd(const double *p)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(vld1q_f64(p));
-#else
-    const float *fp = (const float *) p;
-    float ALIGN_STRUCT(16) data[4] = {fp[0], fp[1], fp[2], fp[3]};
-    return vreinterpretq_m128d_f32(vld1q_f32(data));
-#endif
-}
-
-// Load a double-precision (64-bit) floating-point element from memory into both
-// elements of dst.
-//
-//   dst[63:0] := MEM[mem_addr+63:mem_addr]
-//   dst[127:64] := MEM[mem_addr+63:mem_addr]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_load_pd1
-#define _mm_load_pd1 _mm_load1_pd
-
-// Load a double-precision (64-bit) floating-point element from memory into the
-// lower of dst, and zero the upper element. mem_addr does not need to be
-// aligned on any particular boundary.
-//
-//   dst[63:0] := MEM[mem_addr+63:mem_addr]
-//   dst[127:64] := 0
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_load_sd
-FORCE_INLINE __m128d _mm_load_sd(const double *p)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(vsetq_lane_f64(*p, vdupq_n_f64(0), 0));
-#else
-    const float *fp = (const float *) p;
-    float ALIGN_STRUCT(16) data[4] = {fp[0], fp[1], 0, 0};
-    return vreinterpretq_m128d_f32(vld1q_f32(data));
-#endif
-}
-
-// Loads 128-bit value. :
-// https://msdn.microsoft.com/en-us/library/atzzad1h(v=vs.80).aspx
-FORCE_INLINE __m128i _mm_load_si128(const __m128i *p)
-{
-    return vreinterpretq_m128i_s32(vld1q_s32((const int32_t *) p));
-}
-
-// Load a double-precision (64-bit) floating-point element from memory into both
-// elements of dst.
-//
-//   dst[63:0] := MEM[mem_addr+63:mem_addr]
-//   dst[127:64] := MEM[mem_addr+63:mem_addr]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_load1_pd
-FORCE_INLINE __m128d _mm_load1_pd(const double *p)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(vld1q_dup_f64(p));
-#else
-    return vreinterpretq_m128d_s64(vdupq_n_s64(*(const int64_t *) p));
-#endif
-}
-
-// Load a double-precision (64-bit) floating-point element from memory into the
-// upper element of dst, and copy the lower element from a to dst. mem_addr does
-// not need to be aligned on any particular boundary.
-//
-//   dst[63:0] := a[63:0]
-//   dst[127:64] := MEM[mem_addr+63:mem_addr]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_loadh_pd
-FORCE_INLINE __m128d _mm_loadh_pd(__m128d a, const double *p)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vcombine_f64(vget_low_f64(vreinterpretq_f64_m128d(a)), vld1_f64(p)));
-#else
-    return vreinterpretq_m128d_f32(vcombine_f32(
-        vget_low_f32(vreinterpretq_f32_m128d(a)), vld1_f32((const float *) p)));
-#endif
-}
-
-// Load 64-bit integer from memory into the first element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_loadl_epi64
-FORCE_INLINE __m128i _mm_loadl_epi64(__m128i const *p)
-{
-    /* Load the lower 64 bits of the value pointed to by p into the
-     * lower 64 bits of the result, zeroing the upper 64 bits of the result.
-     */
-    return vreinterpretq_m128i_s32(
-        vcombine_s32(vld1_s32((int32_t const *) p), vcreate_s32(0)));
-}
-
-// Load a double-precision (64-bit) floating-point element from memory into the
-// lower element of dst, and copy the upper element from a to dst. mem_addr does
-// not need to be aligned on any particular boundary.
-//
-//   dst[63:0] := MEM[mem_addr+63:mem_addr]
-//   dst[127:64] := a[127:64]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_loadl_pd
-FORCE_INLINE __m128d _mm_loadl_pd(__m128d a, const double *p)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vcombine_f64(vld1_f64(p), vget_high_f64(vreinterpretq_f64_m128d(a))));
-#else
-    return vreinterpretq_m128d_f32(
-        vcombine_f32(vld1_f32((const float *) p),
-                     vget_high_f32(vreinterpretq_f32_m128d(a))));
-#endif
-}
-
-// Load 2 double-precision (64-bit) floating-point elements from memory into dst
-// in reverse order. mem_addr must be aligned on a 16-byte boundary or a
-// general-protection exception may be generated.
-//
-//   dst[63:0] := MEM[mem_addr+127:mem_addr+64]
-//   dst[127:64] := MEM[mem_addr+63:mem_addr]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_loadr_pd
-FORCE_INLINE __m128d _mm_loadr_pd(const double *p)
-{
-#if defined(__aarch64__)
-    float64x2_t v = vld1q_f64(p);
-    return vreinterpretq_m128d_f64(vextq_f64(v, v, 1));
-#else
-    int64x2_t v = vld1q_s64((const int64_t *) p);
-    return vreinterpretq_m128d_s64(vextq_s64(v, v, 1));
-#endif
-}
-
-// Loads two double-precision from unaligned memory, floating-point values.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_loadu_pd
-FORCE_INLINE __m128d _mm_loadu_pd(const double *p)
-{
-    return _mm_load_pd(p);
-}
-
-// Loads 128-bit value. :
-// https://msdn.microsoft.com/zh-cn/library/f4k12ae8(v=vs.90).aspx
-FORCE_INLINE __m128i _mm_loadu_si128(const __m128i *p)
-{
-    return vreinterpretq_m128i_s32(vld1q_s32((const int32_t *) p));
-}
-
-// Load unaligned 32-bit integer from memory into the first element of dst.
-//
-//   dst[31:0] := MEM[mem_addr+31:mem_addr]
-//   dst[MAX:32] := 0
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_loadu_si32
-FORCE_INLINE __m128i _mm_loadu_si32(const void *p)
-{
-    return vreinterpretq_m128i_s32(
-        vsetq_lane_s32(*(const int32_t *) p, vdupq_n_s32(0), 0));
-}
-
-// Multiplies the 8 signed 16-bit integers from a by the 8 signed 16-bit
-// integers from b.
-//
-//   r0 := (a0 * b0) + (a1 * b1)
-//   r1 := (a2 * b2) + (a3 * b3)
-//   r2 := (a4 * b4) + (a5 * b5)
-//   r3 := (a6 * b6) + (a7 * b7)
-// https://msdn.microsoft.com/en-us/library/yht36sa6(v=vs.90).aspx
-FORCE_INLINE __m128i _mm_madd_epi16(__m128i a, __m128i b)
-{
-    int32x4_t low = vmull_s16(vget_low_s16(vreinterpretq_s16_m128i(a)),
-                              vget_low_s16(vreinterpretq_s16_m128i(b)));
-    int32x4_t high = vmull_s16(vget_high_s16(vreinterpretq_s16_m128i(a)),
-                               vget_high_s16(vreinterpretq_s16_m128i(b)));
-
-    int32x2_t low_sum = vpadd_s32(vget_low_s32(low), vget_high_s32(low));
-    int32x2_t high_sum = vpadd_s32(vget_low_s32(high), vget_high_s32(high));
-
-    return vreinterpretq_m128i_s32(vcombine_s32(low_sum, high_sum));
-}
-
-// Conditionally store 8-bit integer elements from a into memory using mask
-// (elements are not stored when the highest bit is not set in the corresponding
-// element) and a non-temporal memory hint. mem_addr does not need to be aligned
-// on any particular boundary.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_maskmoveu_si128
-FORCE_INLINE void _mm_maskmoveu_si128(__m128i a, __m128i mask, char *mem_addr)
-{
-    int8x16_t shr_mask = vshrq_n_s8(vreinterpretq_s8_m128i(mask), 7);
-    __m128 b = _mm_load_ps((const float *) mem_addr);
-    int8x16_t masked =
-        vbslq_s8(vreinterpretq_u8_s8(shr_mask), vreinterpretq_s8_m128i(a),
-                 vreinterpretq_s8_m128(b));
-    vst1q_s8((int8_t *) mem_addr, masked);
-}
-
-// Computes the pairwise maxima of the 8 signed 16-bit integers from a and the 8
-// signed 16-bit integers from b.
-// https://msdn.microsoft.com/en-us/LIBRary/3x060h7c(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_max_epi16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s16(
-        vmaxq_s16(vreinterpretq_s16_m128i(a), vreinterpretq_s16_m128i(b)));
-}
-
-// Computes the pairwise maxima of the 16 unsigned 8-bit integers from a and the
-// 16 unsigned 8-bit integers from b.
-// https://msdn.microsoft.com/en-us/library/st6634za(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_max_epu8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u8(
-        vmaxq_u8(vreinterpretq_u8_m128i(a), vreinterpretq_u8_m128i(b)));
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b,
-// and store packed maximum values in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_max_pd
-FORCE_INLINE __m128d _mm_max_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-#if SSE2NEON_PRECISE_MINMAX
-    float64x2_t _a = vreinterpretq_f64_m128d(a);
-    float64x2_t _b = vreinterpretq_f64_m128d(b);
-    return vreinterpretq_m128d_f64(vbslq_f64(vcgtq_f64(_a, _b), _a, _b));
-#else
-    return vreinterpretq_m128d_f64(
-        vmaxq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#endif
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t b1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] = (*(double *) &a0) > (*(double *) &b0) ? a0 : b0;
-    d[1] = (*(double *) &a1) > (*(double *) &b1) ? a1 : b1;
-
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b, store the maximum value in the lower element of dst, and copy the upper
-// element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_max_sd
-FORCE_INLINE __m128d _mm_max_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return _mm_move_sd(a, _mm_max_pd(a, b));
-#else
-    double *da = (double *) &a;
-    double *db = (double *) &b;
-    double c[2] = {da[0] > db[0] ? da[0] : db[0], da[1]};
-    return vreinterpretq_m128d_f32(vld1q_f32((float32_t *) c));
-#endif
-}
-
-// Computes the pairwise minima of the 8 signed 16-bit integers from a and the 8
-// signed 16-bit integers from b.
-// https://msdn.microsoft.com/en-us/library/vstudio/6te997ew(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_min_epi16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s16(
-        vminq_s16(vreinterpretq_s16_m128i(a), vreinterpretq_s16_m128i(b)));
-}
-
-// Computes the pairwise minima of the 16 unsigned 8-bit integers from a and the
-// 16 unsigned 8-bit integers from b.
-// https://msdn.microsoft.com/ko-kr/library/17k8cf58(v=vs.100).aspxx
-FORCE_INLINE __m128i _mm_min_epu8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u8(
-        vminq_u8(vreinterpretq_u8_m128i(a), vreinterpretq_u8_m128i(b)));
-}
-
-// Compare packed double-precision (64-bit) floating-point elements in a and b,
-// and store packed minimum values in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_min_pd
-FORCE_INLINE __m128d _mm_min_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-#if SSE2NEON_PRECISE_MINMAX
-    float64x2_t _a = vreinterpretq_f64_m128d(a);
-    float64x2_t _b = vreinterpretq_f64_m128d(b);
-    return vreinterpretq_m128d_f64(vbslq_f64(vcltq_f64(_a, _b), _a, _b));
-#else
-    return vreinterpretq_m128d_f64(
-        vminq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#endif
-#else
-    uint64_t a0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(a));
-    uint64_t a1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(a));
-    uint64_t b0 = (uint64_t) vget_low_u64(vreinterpretq_u64_m128d(b));
-    uint64_t b1 = (uint64_t) vget_high_u64(vreinterpretq_u64_m128d(b));
-    uint64_t d[2];
-    d[0] = (*(double *) &a0) < (*(double *) &b0) ? a0 : b0;
-    d[1] = (*(double *) &a1) < (*(double *) &b1) ? a1 : b1;
-    return vreinterpretq_m128d_u64(vld1q_u64(d));
-#endif
-}
-
-// Compare the lower double-precision (64-bit) floating-point elements in a and
-// b, store the minimum value in the lower element of dst, and copy the upper
-// element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_min_sd
-FORCE_INLINE __m128d _mm_min_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return _mm_move_sd(a, _mm_min_pd(a, b));
-#else
-    double *da = (double *) &a;
-    double *db = (double *) &b;
-    double c[2] = {da[0] < db[0] ? da[0] : db[0], da[1]};
-    return vreinterpretq_m128d_f32(vld1q_f32((float32_t *) c));
-#endif
-}
-
-// Copy the lower 64-bit integer in a to the lower element of dst, and zero the
-// upper element.
-//
-//   dst[63:0] := a[63:0]
-//   dst[127:64] := 0
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_move_epi64
-FORCE_INLINE __m128i _mm_move_epi64(__m128i a)
-{
-    return vreinterpretq_m128i_s64(
-        vsetq_lane_s64(0, vreinterpretq_s64_m128i(a), 1));
-}
-
-// Move the lower double-precision (64-bit) floating-point element from b to the
-// lower element of dst, and copy the upper element from a to the upper element
-// of dst.
-//
-//   dst[63:0] := b[63:0]
-//   dst[127:64] := a[127:64]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_move_sd
-FORCE_INLINE __m128d _mm_move_sd(__m128d a, __m128d b)
-{
-    return vreinterpretq_m128d_f32(
-        vcombine_f32(vget_low_f32(vreinterpretq_f32_m128d(b)),
-                     vget_high_f32(vreinterpretq_f32_m128d(a))));
-}
-
-// NEON does not provide a version of this function.
-// Creates a 16-bit mask from the most significant bits of the 16 signed or
-// unsigned 8-bit integers in a and zero extends the upper bits.
-// https://msdn.microsoft.com/en-us/library/vstudio/s090c8fk(v=vs.100).aspx
-FORCE_INLINE int _mm_movemask_epi8(__m128i a)
-{
-    // Use increasingly wide shifts+adds to collect the sign bits
-    // together.
-    // Since the widening shifts would be rather confusing to follow in little
-    // endian, everything will be illustrated in big endian order instead. This
-    // has a different result - the bits would actually be reversed on a big
-    // endian machine.
-
-    // Starting input (only half the elements are shown):
-    // 89 ff 1d c0 00 10 99 33
-    uint8x16_t input = vreinterpretq_u8_m128i(a);
-
-    // Shift out everything but the sign bits with an unsigned shift right.
-    //
-    // Bytes of the vector::
-    // 89 ff 1d c0 00 10 99 33
-    // \  \  \  \  \  \  \  \    high_bits = (uint16x4_t)(input >> 7)
-    //  |  |  |  |  |  |  |  |
-    // 01 01 00 01 00 00 01 00
-    //
-    // Bits of first important lane(s):
-    // 10001001 (89)
-    // \______
-    //        |
-    // 00000001 (01)
-    uint16x8_t high_bits = vreinterpretq_u16_u8(vshrq_n_u8(input, 7));
-
-    // Merge the even lanes together with a 16-bit unsigned shift right + add.
-    // 'xx' represents garbage data which will be ignored in the final result.
-    // In the important bytes, the add functions like a binary OR.
-    //
-    // 01 01 00 01 00 00 01 00
-    //  \_ |  \_ |  \_ |  \_ |   paired16 = (uint32x4_t)(input + (input >> 7))
-    //    \|    \|    \|    \|
-    // xx 03 xx 01 xx 00 xx 02
-    //
-    // 00000001 00000001 (01 01)
-    //        \_______ |
-    //                \|
-    // xxxxxxxx xxxxxx11 (xx 03)
-    uint32x4_t paired16 =
-        vreinterpretq_u32_u16(vsraq_n_u16(high_bits, high_bits, 7));
-
-    // Repeat with a wider 32-bit shift + add.
-    // xx 03 xx 01 xx 00 xx 02
-    //     \____ |     \____ |  paired32 = (uint64x1_t)(paired16 + (paired16 >>
-    //     14))
-    //          \|          \|
-    // xx xx xx 0d xx xx xx 02
-    //
-    // 00000011 00000001 (03 01)
-    //        \\_____ ||
-    //         '----.\||
-    // xxxxxxxx xxxx1101 (xx 0d)
-    uint64x2_t paired32 =
-        vreinterpretq_u64_u32(vsraq_n_u32(paired16, paired16, 14));
-
-    // Last, an even wider 64-bit shift + add to get our result in the low 8 bit
-    // lanes. xx xx xx 0d xx xx xx 02
-    //            \_________ |   paired64 = (uint8x8_t)(paired32 + (paired32 >>
-    //            28))
-    //                      \|
-    // xx xx xx xx xx xx xx d2
-    //
-    // 00001101 00000010 (0d 02)
-    //     \   \___ |  |
-    //      '---.  \|  |
-    // xxxxxxxx 11010010 (xx d2)
-    uint8x16_t paired64 =
-        vreinterpretq_u8_u64(vsraq_n_u64(paired32, paired32, 28));
-
-    // Extract the low 8 bits from each 64-bit lane with 2 8-bit extracts.
-    // xx xx xx xx xx xx xx d2
-    //                      ||  return paired64[0]
-    //                      d2
-    // Note: Little endian would return the correct value 4b (01001011) instead.
-    return vgetq_lane_u8(paired64, 0) | ((int) vgetq_lane_u8(paired64, 8) << 8);
-}
-
-// Set each bit of mask dst based on the most significant bit of the
-// corresponding packed double-precision (64-bit) floating-point element in a.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_movemask_pd
-FORCE_INLINE int _mm_movemask_pd(__m128d a)
-{
-    uint64x2_t input = vreinterpretq_u64_m128d(a);
-    uint64x2_t high_bits = vshrq_n_u64(input, 63);
-    return vgetq_lane_u64(high_bits, 0) | (vgetq_lane_u64(high_bits, 1) << 1);
-}
-
-// Copy the lower 64-bit integer in a to dst.
-//
-//   dst[63:0] := a[63:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_movepi64_pi64
-FORCE_INLINE __m64 _mm_movepi64_pi64(__m128i a)
-{
-    return vreinterpret_m64_s64(vget_low_s64(vreinterpretq_s64_m128i(a)));
-}
-
-// Copy the 64-bit integer a to the lower element of dst, and zero the upper
-// element.
-//
-//   dst[63:0] := a[63:0]
-//   dst[127:64] := 0
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_movpi64_epi64
-FORCE_INLINE __m128i _mm_movpi64_epi64(__m64 a)
-{
-    return vreinterpretq_m128i_s64(
-        vcombine_s64(vreinterpret_s64_m64(a), vdup_n_s64(0)));
-}
-
-// Multiply the low unsigned 32-bit integers from each packed 64-bit element in
-// a and b, and store the unsigned 64-bit results in dst.
-//
-//   r0 :=  (a0 & 0xFFFFFFFF) * (b0 & 0xFFFFFFFF)
-//   r1 :=  (a2 & 0xFFFFFFFF) * (b2 & 0xFFFFFFFF)
-FORCE_INLINE __m128i _mm_mul_epu32(__m128i a, __m128i b)
-{
-    // vmull_u32 upcasts instead of masking, so we downcast.
-    uint32x2_t a_lo = vmovn_u64(vreinterpretq_u64_m128i(a));
-    uint32x2_t b_lo = vmovn_u64(vreinterpretq_u64_m128i(b));
-    return vreinterpretq_m128i_u64(vmull_u32(a_lo, b_lo));
-}
-
-// Multiply packed double-precision (64-bit) floating-point elements in a and b,
-// and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_mul_pd
-FORCE_INLINE __m128d _mm_mul_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vmulq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#else
-    double *da = (double *) &a;
-    double *db = (double *) &b;
-    double c[2];
-    c[0] = da[0] * db[0];
-    c[1] = da[1] * db[1];
-    return vld1q_f32((float32_t *) c);
-#endif
-}
-
-// Multiply the lower double-precision (64-bit) floating-point element in a and
-// b, store the result in the lower element of dst, and copy the upper element
-// from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=mm_mul_sd
-FORCE_INLINE __m128d _mm_mul_sd(__m128d a, __m128d b)
-{
-    return _mm_move_sd(a, _mm_mul_pd(a, b));
-}
-
-// Multiply the low unsigned 32-bit integers from a and b, and store the
-// unsigned 64-bit result in dst.
-//
-//   dst[63:0] := a[31:0] * b[31:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_mul_su32
-FORCE_INLINE __m64 _mm_mul_su32(__m64 a, __m64 b)
-{
-    return vreinterpret_m64_u64(vget_low_u64(
-        vmull_u32(vreinterpret_u32_m64(a), vreinterpret_u32_m64(b))));
-}
-
-// Multiplies the 8 signed 16-bit integers from a by the 8 signed 16-bit
-// integers from b.
-//
-//   r0 := (a0 * b0)[31:16]
-//   r1 := (a1 * b1)[31:16]
-//   ...
-//   r7 := (a7 * b7)[31:16]
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/59hddw1d(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_mulhi_epi16(__m128i a, __m128i b)
-{
-    /* FIXME: issue with large values because of result saturation */
-    // int16x8_t ret = vqdmulhq_s16(vreinterpretq_s16_m128i(a),
-    // vreinterpretq_s16_m128i(b)); /* =2*a*b */ return
-    // vreinterpretq_m128i_s16(vshrq_n_s16(ret, 1));
-    int16x4_t a3210 = vget_low_s16(vreinterpretq_s16_m128i(a));
-    int16x4_t b3210 = vget_low_s16(vreinterpretq_s16_m128i(b));
-    int32x4_t ab3210 = vmull_s16(a3210, b3210); /* 3333222211110000 */
-    int16x4_t a7654 = vget_high_s16(vreinterpretq_s16_m128i(a));
-    int16x4_t b7654 = vget_high_s16(vreinterpretq_s16_m128i(b));
-    int32x4_t ab7654 = vmull_s16(a7654, b7654); /* 7777666655554444 */
-    uint16x8x2_t r =
-        vuzpq_u16(vreinterpretq_u16_s32(ab3210), vreinterpretq_u16_s32(ab7654));
-    return vreinterpretq_m128i_u16(r.val[1]);
-}
-
-// Multiply the packed unsigned 16-bit integers in a and b, producing
-// intermediate 32-bit integers, and store the high 16 bits of the intermediate
-// integers in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_mulhi_epu16
-FORCE_INLINE __m128i _mm_mulhi_epu16(__m128i a, __m128i b)
-{
-    uint16x4_t a3210 = vget_low_u16(vreinterpretq_u16_m128i(a));
-    uint16x4_t b3210 = vget_low_u16(vreinterpretq_u16_m128i(b));
-    uint32x4_t ab3210 = vmull_u16(a3210, b3210);
-#if defined(__aarch64__)
-    uint32x4_t ab7654 =
-        vmull_high_u16(vreinterpretq_u16_m128i(a), vreinterpretq_u16_m128i(b));
-    uint16x8_t r = vuzp2q_u16(vreinterpretq_u16_u32(ab3210),
-                              vreinterpretq_u16_u32(ab7654));
-    return vreinterpretq_m128i_u16(r);
-#else
-    uint16x4_t a7654 = vget_high_u16(vreinterpretq_u16_m128i(a));
-    uint16x4_t b7654 = vget_high_u16(vreinterpretq_u16_m128i(b));
-    uint32x4_t ab7654 = vmull_u16(a7654, b7654);
-    uint16x8x2_t r =
-        vuzpq_u16(vreinterpretq_u16_u32(ab3210), vreinterpretq_u16_u32(ab7654));
-    return vreinterpretq_m128i_u16(r.val[1]);
-#endif
-}
-
-// Multiplies the 8 signed or unsigned 16-bit integers from a by the 8 signed or
-// unsigned 16-bit integers from b.
-//
-//   r0 := (a0 * b0)[15:0]
-//   r1 := (a1 * b1)[15:0]
-//   ...
-//   r7 := (a7 * b7)[15:0]
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/9ks1472s(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_mullo_epi16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s16(
-        vmulq_s16(vreinterpretq_s16_m128i(a), vreinterpretq_s16_m128i(b)));
-}
-
-// Compute the bitwise OR of packed double-precision (64-bit) floating-point
-// elements in a and b, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=mm_or_pd
-FORCE_INLINE __m128d _mm_or_pd(__m128d a, __m128d b)
-{
-    return vreinterpretq_m128d_s64(
-        vorrq_s64(vreinterpretq_s64_m128d(a), vreinterpretq_s64_m128d(b)));
-}
-
-// Computes the bitwise OR of the 128-bit value in a and the 128-bit value in b.
-//
-//   r := a | b
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/ew8ty0db(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_or_si128(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s32(
-        vorrq_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(b)));
-}
-
-// Packs the 16 signed 16-bit integers from a and b into 8-bit integers and
-// saturates.
-// https://msdn.microsoft.com/en-us/library/k4y4f7w5%28v=vs.90%29.aspx
-FORCE_INLINE __m128i _mm_packs_epi16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s8(
-        vcombine_s8(vqmovn_s16(vreinterpretq_s16_m128i(a)),
-                    vqmovn_s16(vreinterpretq_s16_m128i(b))));
-}
-
-// Packs the 8 signed 32-bit integers from a and b into signed 16-bit integers
-// and saturates.
-//
-//   r0 := SignedSaturate(a0)
-//   r1 := SignedSaturate(a1)
-//   r2 := SignedSaturate(a2)
-//   r3 := SignedSaturate(a3)
-//   r4 := SignedSaturate(b0)
-//   r5 := SignedSaturate(b1)
-//   r6 := SignedSaturate(b2)
-//   r7 := SignedSaturate(b3)
-//
-// https://msdn.microsoft.com/en-us/library/393t56f9%28v=vs.90%29.aspx
-FORCE_INLINE __m128i _mm_packs_epi32(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s16(
-        vcombine_s16(vqmovn_s32(vreinterpretq_s32_m128i(a)),
-                     vqmovn_s32(vreinterpretq_s32_m128i(b))));
-}
-
-// Packs the 16 signed 16 - bit integers from a and b into 8 - bit unsigned
-// integers and saturates.
-//
-//   r0 := UnsignedSaturate(a0)
-//   r1 := UnsignedSaturate(a1)
-//   ...
-//   r7 := UnsignedSaturate(a7)
-//   r8 := UnsignedSaturate(b0)
-//   r9 := UnsignedSaturate(b1)
-//   ...
-//   r15 := UnsignedSaturate(b7)
-//
-// https://msdn.microsoft.com/en-us/library/07ad1wx4(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_packus_epi16(const __m128i a, const __m128i b)
-{
-    return vreinterpretq_m128i_u8(
-        vcombine_u8(vqmovun_s16(vreinterpretq_s16_m128i(a)),
-                    vqmovun_s16(vreinterpretq_s16_m128i(b))));
-}
-
-// Pause the processor. This is typically used in spin-wait loops and depending
-// on the x86 processor typical values are in the 40-100 cycle range. The
-// 'yield' instruction isn't a good fit beacuse it's effectively a nop on most
-// Arm cores. Experience with several databases has shown has shown an 'isb' is
-// a reasonable approximation.
-FORCE_INLINE void _mm_pause()
-{
-    __asm__ __volatile__("isb\n");
-}
-
-// Compute the absolute differences of packed unsigned 8-bit integers in a and
-// b, then horizontally sum each consecutive 8 differences to produce two
-// unsigned 16-bit integers, and pack these unsigned 16-bit integers in the low
-// 16 bits of 64-bit elements in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sad_epu8
-FORCE_INLINE __m128i _mm_sad_epu8(__m128i a, __m128i b)
-{
-    uint16x8_t t = vpaddlq_u8(vabdq_u8((uint8x16_t) a, (uint8x16_t) b));
-    return vreinterpretq_m128i_u64(vpaddlq_u32(vpaddlq_u16(t)));
-}
-
-// Sets the 8 signed 16-bit integer values.
-// https://msdn.microsoft.com/en-au/library/3e0fek84(v=vs.90).aspx
-FORCE_INLINE __m128i _mm_set_epi16(short i7,
-                                   short i6,
-                                   short i5,
-                                   short i4,
-                                   short i3,
-                                   short i2,
-                                   short i1,
-                                   short i0)
-{
-    int16_t ALIGN_STRUCT(16) data[8] = {i0, i1, i2, i3, i4, i5, i6, i7};
-    return vreinterpretq_m128i_s16(vld1q_s16(data));
-}
-
-// Sets the 4 signed 32-bit integer values.
-// https://msdn.microsoft.com/en-us/library/vstudio/019beekt(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_set_epi32(int i3, int i2, int i1, int i0)
-{
-    int32_t ALIGN_STRUCT(16) data[4] = {i0, i1, i2, i3};
-    return vreinterpretq_m128i_s32(vld1q_s32(data));
-}
-
-// Returns the __m128i structure with its two 64-bit integer values
-// initialized to the values of the two 64-bit integers passed in.
-// https://msdn.microsoft.com/en-us/library/dk2sdw0h(v=vs.120).aspx
-FORCE_INLINE __m128i _mm_set_epi64(__m64 i1, __m64 i2)
-{
-    return _mm_set_epi64x((int64_t) i1, (int64_t) i2);
-}
-
-// Returns the __m128i structure with its two 64-bit integer values
-// initialized to the values of the two 64-bit integers passed in.
-// https://msdn.microsoft.com/en-us/library/dk2sdw0h(v=vs.120).aspx
-FORCE_INLINE __m128i _mm_set_epi64x(int64_t i1, int64_t i2)
-{
-    return vreinterpretq_m128i_s64(
-        vcombine_s64(vcreate_s64(i2), vcreate_s64(i1)));
-}
-
-// Sets the 16 signed 8-bit integer values.
-// https://msdn.microsoft.com/en-us/library/x0cx8zd3(v=vs.90).aspx
-FORCE_INLINE __m128i _mm_set_epi8(signed char b15,
-                                  signed char b14,
-                                  signed char b13,
-                                  signed char b12,
-                                  signed char b11,
-                                  signed char b10,
-                                  signed char b9,
-                                  signed char b8,
-                                  signed char b7,
-                                  signed char b6,
-                                  signed char b5,
-                                  signed char b4,
-                                  signed char b3,
-                                  signed char b2,
-                                  signed char b1,
-                                  signed char b0)
-{
-    int8_t ALIGN_STRUCT(16)
-        data[16] = {(int8_t) b0,  (int8_t) b1,  (int8_t) b2,  (int8_t) b3,
-                    (int8_t) b4,  (int8_t) b5,  (int8_t) b6,  (int8_t) b7,
-                    (int8_t) b8,  (int8_t) b9,  (int8_t) b10, (int8_t) b11,
-                    (int8_t) b12, (int8_t) b13, (int8_t) b14, (int8_t) b15};
-    return (__m128i) vld1q_s8(data);
-}
-
-// Set packed double-precision (64-bit) floating-point elements in dst with the
-// supplied values.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_set_pd
-FORCE_INLINE __m128d _mm_set_pd(double e1, double e0)
-{
-    double ALIGN_STRUCT(16) data[2] = {e0, e1};
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(vld1q_f64((float64_t *) data));
-#else
-    return vreinterpretq_m128d_f32(vld1q_f32((float32_t *) data));
-#endif
-}
-
-// Broadcast double-precision (64-bit) floating-point value a to all elements of
-// dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_set_pd1
-#define _mm_set_pd1 _mm_set1_pd
-
-// Copy double-precision (64-bit) floating-point element a to the lower element
-// of dst, and zero the upper element.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_set_sd
-FORCE_INLINE __m128d _mm_set_sd(double a)
-{
-    return _mm_set_pd(0, a);
-}
-
-// Sets the 8 signed 16-bit integer values to w.
-//
-//   r0 := w
-//   r1 := w
-//   ...
-//   r7 := w
-//
-// https://msdn.microsoft.com/en-us/library/k0ya3x0e(v=vs.90).aspx
-FORCE_INLINE __m128i _mm_set1_epi16(short w)
-{
-    return vreinterpretq_m128i_s16(vdupq_n_s16(w));
-}
-
-// Sets the 4 signed 32-bit integer values to i.
-//
-//   r0 := i
-//   r1 := i
-//   r2 := i
-//   r3 := I
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/h4xscxat(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_set1_epi32(int _i)
-{
-    return vreinterpretq_m128i_s32(vdupq_n_s32(_i));
-}
-
-// Sets the 2 signed 64-bit integer values to i.
-// https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2010/whtfzhzk(v=vs.100)
-FORCE_INLINE __m128i _mm_set1_epi64(__m64 _i)
-{
-    return vreinterpretq_m128i_s64(vdupq_n_s64((int64_t) _i));
-}
-
-// Sets the 2 signed 64-bit integer values to i.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_set1_epi64x
-FORCE_INLINE __m128i _mm_set1_epi64x(int64_t _i)
-{
-    return vreinterpretq_m128i_s64(vdupq_n_s64(_i));
-}
-
-// Sets the 16 signed 8-bit integer values to b.
-//
-//   r0 := b
-//   r1 := b
-//   ...
-//   r15 := b
-//
-// https://msdn.microsoft.com/en-us/library/6e14xhyf(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_set1_epi8(signed char w)
-{
-    return vreinterpretq_m128i_s8(vdupq_n_s8(w));
-}
-
-// Broadcast double-precision (64-bit) floating-point value a to all elements of
-// dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_set1_pd
-FORCE_INLINE __m128d _mm_set1_pd(double d)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(vdupq_n_f64(d));
-#else
-    return vreinterpretq_m128d_s64(vdupq_n_s64(*(int64_t *) &d));
-#endif
-}
-
-// Sets the 8 signed 16-bit integer values in reverse order.
-//
-// Return Value
-//   r0 := w0
-//   r1 := w1
-//   ...
-//   r7 := w7
-FORCE_INLINE __m128i _mm_setr_epi16(short w0,
-                                    short w1,
-                                    short w2,
-                                    short w3,
-                                    short w4,
-                                    short w5,
-                                    short w6,
-                                    short w7)
-{
-    int16_t ALIGN_STRUCT(16) data[8] = {w0, w1, w2, w3, w4, w5, w6, w7};
-    return vreinterpretq_m128i_s16(vld1q_s16((int16_t *) data));
-}
-
-// Sets the 4 signed 32-bit integer values in reverse order
-// https://technet.microsoft.com/en-us/library/security/27yb3ee5(v=vs.90).aspx
-FORCE_INLINE __m128i _mm_setr_epi32(int i3, int i2, int i1, int i0)
-{
-    int32_t ALIGN_STRUCT(16) data[4] = {i3, i2, i1, i0};
-    return vreinterpretq_m128i_s32(vld1q_s32(data));
-}
-
-// Set packed 64-bit integers in dst with the supplied values in reverse order.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_setr_epi64
-FORCE_INLINE __m128i _mm_setr_epi64(__m64 e1, __m64 e0)
-{
-    return vreinterpretq_m128i_s64(vcombine_s64(e1, e0));
-}
-
-// Sets the 16 signed 8-bit integer values in reverse order.
-// https://msdn.microsoft.com/en-us/library/2khb9c7k(v=vs.90).aspx
-FORCE_INLINE __m128i _mm_setr_epi8(signed char b0,
-                                   signed char b1,
-                                   signed char b2,
-                                   signed char b3,
-                                   signed char b4,
-                                   signed char b5,
-                                   signed char b6,
-                                   signed char b7,
-                                   signed char b8,
-                                   signed char b9,
-                                   signed char b10,
-                                   signed char b11,
-                                   signed char b12,
-                                   signed char b13,
-                                   signed char b14,
-                                   signed char b15)
-{
-    int8_t ALIGN_STRUCT(16)
-        data[16] = {(int8_t) b0,  (int8_t) b1,  (int8_t) b2,  (int8_t) b3,
-                    (int8_t) b4,  (int8_t) b5,  (int8_t) b6,  (int8_t) b7,
-                    (int8_t) b8,  (int8_t) b9,  (int8_t) b10, (int8_t) b11,
-                    (int8_t) b12, (int8_t) b13, (int8_t) b14, (int8_t) b15};
-    return (__m128i) vld1q_s8(data);
-}
-
-// Set packed double-precision (64-bit) floating-point elements in dst with the
-// supplied values in reverse order.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_setr_pd
-FORCE_INLINE __m128d _mm_setr_pd(double e1, double e0)
-{
-    return _mm_set_pd(e0, e1);
-}
-
-// Return vector of type __m128d with all elements set to zero.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_setzero_pd
-FORCE_INLINE __m128d _mm_setzero_pd(void)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(vdupq_n_f64(0));
-#else
-    return vreinterpretq_m128d_f32(vdupq_n_f32(0));
-#endif
-}
-
-// Sets the 128-bit value to zero
-// https://msdn.microsoft.com/en-us/library/vstudio/ys7dw0kh(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_setzero_si128(void)
-{
-    return vreinterpretq_m128i_s32(vdupq_n_s32(0));
-}
-
-// Shuffles the 4 signed or unsigned 32-bit integers in a as specified by imm.
-// https://msdn.microsoft.com/en-us/library/56f67xbk%28v=vs.90%29.aspx
-// FORCE_INLINE __m128i _mm_shuffle_epi32(__m128i a,
-//                                        __constrange(0,255) int imm)
-#if __has_builtin(__builtin_shufflevector)
-#define _mm_shuffle_epi32(a, imm)                              \
-    __extension__({                                            \
-        int32x4_t _input = vreinterpretq_s32_m128i(a);         \
-        int32x4_t _shuf = __builtin_shufflevector(             \
-            _input, _input, (imm) & (0x3), ((imm) >> 2) & 0x3, \
-            ((imm) >> 4) & 0x3, ((imm) >> 6) & 0x3);           \
-        vreinterpretq_m128i_s32(_shuf);                        \
-    })
-#else  // generic
-#define _mm_shuffle_epi32(a, imm)                        \
-    __extension__({                                      \
-        __m128i ret;                                     \
-        switch (imm) {                                   \
-        case _MM_SHUFFLE(1, 0, 3, 2):                    \
-            ret = _mm_shuffle_epi_1032((a));             \
-            break;                                       \
-        case _MM_SHUFFLE(2, 3, 0, 1):                    \
-            ret = _mm_shuffle_epi_2301((a));             \
-            break;                                       \
-        case _MM_SHUFFLE(0, 3, 2, 1):                    \
-            ret = _mm_shuffle_epi_0321((a));             \
-            break;                                       \
-        case _MM_SHUFFLE(2, 1, 0, 3):                    \
-            ret = _mm_shuffle_epi_2103((a));             \
-            break;                                       \
-        case _MM_SHUFFLE(1, 0, 1, 0):                    \
-            ret = _mm_shuffle_epi_1010((a));             \
-            break;                                       \
-        case _MM_SHUFFLE(1, 0, 0, 1):                    \
-            ret = _mm_shuffle_epi_1001((a));             \
-            break;                                       \
-        case _MM_SHUFFLE(0, 1, 0, 1):                    \
-            ret = _mm_shuffle_epi_0101((a));             \
-            break;                                       \
-        case _MM_SHUFFLE(2, 2, 1, 1):                    \
-            ret = _mm_shuffle_epi_2211((a));             \
-            break;                                       \
-        case _MM_SHUFFLE(0, 1, 2, 2):                    \
-            ret = _mm_shuffle_epi_0122((a));             \
-            break;                                       \
-        case _MM_SHUFFLE(3, 3, 3, 2):                    \
-            ret = _mm_shuffle_epi_3332((a));             \
-            break;                                       \
-        case _MM_SHUFFLE(0, 0, 0, 0):                    \
-            ret = _mm_shuffle_epi32_splat((a), 0);       \
-            break;                                       \
-        case _MM_SHUFFLE(1, 1, 1, 1):                    \
-            ret = _mm_shuffle_epi32_splat((a), 1);       \
-            break;                                       \
-        case _MM_SHUFFLE(2, 2, 2, 2):                    \
-            ret = _mm_shuffle_epi32_splat((a), 2);       \
-            break;                                       \
-        case _MM_SHUFFLE(3, 3, 3, 3):                    \
-            ret = _mm_shuffle_epi32_splat((a), 3);       \
-            break;                                       \
-        default:                                         \
-            ret = _mm_shuffle_epi32_default((a), (imm)); \
-            break;                                       \
-        }                                                \
-        ret;                                             \
-    })
-#endif
-
-// Shuffle double-precision (64-bit) floating-point elements using the control
-// in imm8, and store the results in dst.
-//
-//   dst[63:0] := (imm8[0] == 0) ? a[63:0] : a[127:64]
-//   dst[127:64] := (imm8[1] == 0) ? b[63:0] : b[127:64]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_shuffle_pd
-#if __has_builtin(__builtin_shufflevector)
-#define _mm_shuffle_pd(a, b, imm8)                                          \
-    vreinterpretq_m128d_s64(__builtin_shufflevector(                        \
-        vreinterpretq_s64_m128d(a), vreinterpretq_s64_m128d(b), imm8 & 0x1, \
-        ((imm8 & 0x2) >> 1) + 2))
-#else
-#define _mm_shuffle_pd(a, b, imm8)                                     \
-    _mm_castsi128_pd(_mm_set_epi64x(                                   \
-        vgetq_lane_s64(vreinterpretq_s64_m128d(b), (imm8 & 0x2) >> 1), \
-        vgetq_lane_s64(vreinterpretq_s64_m128d(a), imm8 & 0x1)))
-#endif
-
-// FORCE_INLINE __m128i _mm_shufflehi_epi16(__m128i a,
-//                                          __constrange(0,255) int imm)
-#if __has_builtin(__builtin_shufflevector)
-#define _mm_shufflehi_epi16(a, imm)                             \
-    __extension__({                                             \
-        int16x8_t _input = vreinterpretq_s16_m128i(a);          \
-        int16x8_t _shuf = __builtin_shufflevector(              \
-            _input, _input, 0, 1, 2, 3, ((imm) & (0x3)) + 4,    \
-            (((imm) >> 2) & 0x3) + 4, (((imm) >> 4) & 0x3) + 4, \
-            (((imm) >> 6) & 0x3) + 4);                          \
-        vreinterpretq_m128i_s16(_shuf);                         \
-    })
-#else  // generic
-#define _mm_shufflehi_epi16(a, imm) _mm_shufflehi_epi16_function((a), (imm))
-#endif
-
-// FORCE_INLINE __m128i _mm_shufflelo_epi16(__m128i a,
-//                                          __constrange(0,255) int imm)
-#if __has_builtin(__builtin_shufflevector)
-#define _mm_shufflelo_epi16(a, imm)                                  \
-    __extension__({                                                  \
-        int16x8_t _input = vreinterpretq_s16_m128i(a);               \
-        int16x8_t _shuf = __builtin_shufflevector(                   \
-            _input, _input, ((imm) & (0x3)), (((imm) >> 2) & 0x3),   \
-            (((imm) >> 4) & 0x3), (((imm) >> 6) & 0x3), 4, 5, 6, 7); \
-        vreinterpretq_m128i_s16(_shuf);                              \
-    })
-#else  // generic
-#define _mm_shufflelo_epi16(a, imm) _mm_shufflelo_epi16_function((a), (imm))
-#endif
-
-// Shift packed 16-bit integers in a left by count while shifting in zeros, and
-// store the results in dst.
-//
-//   FOR j := 0 to 7
-//     i := j*16
-//     IF count[63:0] > 15
-//       dst[i+15:i] := 0
-//     ELSE
-//       dst[i+15:i] := ZeroExtend16(a[i+15:i] << count[63:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sll_epi16
-FORCE_INLINE __m128i _mm_sll_epi16(__m128i a, __m128i count)
-{
-    uint64_t c = vreinterpretq_nth_u64_m128i(count, 0);
-    if (_sse2neon_unlikely(c & ~15))
-        return _mm_setzero_si128();
-
-    int16x8_t vc = vdupq_n_s16((int16_t) c);
-    return vreinterpretq_m128i_s16(vshlq_s16(vreinterpretq_s16_m128i(a), vc));
-}
-
-// Shift packed 32-bit integers in a left by count while shifting in zeros, and
-// store the results in dst.
-//
-//   FOR j := 0 to 3
-//     i := j*32
-//     IF count[63:0] > 31
-//       dst[i+31:i] := 0
-//     ELSE
-//       dst[i+31:i] := ZeroExtend32(a[i+31:i] << count[63:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sll_epi32
-FORCE_INLINE __m128i _mm_sll_epi32(__m128i a, __m128i count)
-{
-    uint64_t c = vreinterpretq_nth_u64_m128i(count, 0);
-    if (_sse2neon_unlikely(c & ~31))
-        return _mm_setzero_si128();
-
-    int32x4_t vc = vdupq_n_s32((int32_t) c);
-    return vreinterpretq_m128i_s32(vshlq_s32(vreinterpretq_s32_m128i(a), vc));
-}
-
-// Shift packed 64-bit integers in a left by count while shifting in zeros, and
-// store the results in dst.
-//
-//   FOR j := 0 to 1
-//     i := j*64
-//     IF count[63:0] > 63
-//       dst[i+63:i] := 0
-//     ELSE
-//       dst[i+63:i] := ZeroExtend64(a[i+63:i] << count[63:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sll_epi64
-FORCE_INLINE __m128i _mm_sll_epi64(__m128i a, __m128i count)
-{
-    uint64_t c = vreinterpretq_nth_u64_m128i(count, 0);
-    if (_sse2neon_unlikely(c & ~63))
-        return _mm_setzero_si128();
-
-    int64x2_t vc = vdupq_n_s64((int64_t) c);
-    return vreinterpretq_m128i_s64(vshlq_s64(vreinterpretq_s64_m128i(a), vc));
-}
-
-// Shift packed 16-bit integers in a left by imm8 while shifting in zeros, and
-// store the results in dst.
-//
-//   FOR j := 0 to 7
-//     i := j*16
-//     IF imm8[7:0] > 15
-//       dst[i+15:i] := 0
-//     ELSE
-//       dst[i+15:i] := ZeroExtend16(a[i+15:i] << imm8[7:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_slli_epi16
-FORCE_INLINE __m128i _mm_slli_epi16(__m128i a, int imm)
-{
-    if (_sse2neon_unlikely(imm & ~15))
-        return _mm_setzero_si128();
-    return vreinterpretq_m128i_s16(
-        vshlq_s16(vreinterpretq_s16_m128i(a), vdupq_n_s16(imm)));
-}
-
-// Shift packed 32-bit integers in a left by imm8 while shifting in zeros, and
-// store the results in dst.
-//
-//   FOR j := 0 to 3
-//     i := j*32
-//     IF imm8[7:0] > 31
-//       dst[i+31:i] := 0
-//     ELSE
-//       dst[i+31:i] := ZeroExtend32(a[i+31:i] << imm8[7:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_slli_epi32
-FORCE_INLINE __m128i _mm_slli_epi32(__m128i a, int imm)
-{
-    if (_sse2neon_unlikely(imm & ~31))
-        return _mm_setzero_si128();
-    return vreinterpretq_m128i_s32(
-        vshlq_s32(vreinterpretq_s32_m128i(a), vdupq_n_s32(imm)));
-}
-
-// Shift packed 64-bit integers in a left by imm8 while shifting in zeros, and
-// store the results in dst.
-//
-//   FOR j := 0 to 1
-//     i := j*64
-//     IF imm8[7:0] > 63
-//       dst[i+63:i] := 0
-//     ELSE
-//       dst[i+63:i] := ZeroExtend64(a[i+63:i] << imm8[7:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_slli_epi64
-FORCE_INLINE __m128i _mm_slli_epi64(__m128i a, int imm)
-{
-    if (_sse2neon_unlikely(imm & ~63))
-        return _mm_setzero_si128();
-    return vreinterpretq_m128i_s64(
-        vshlq_s64(vreinterpretq_s64_m128i(a), vdupq_n_s64(imm)));
-}
-
-// Shift a left by imm8 bytes while shifting in zeros, and store the results in
-// dst.
-//
-//   tmp := imm8[7:0]
-//   IF tmp > 15
-//     tmp := 16
-//   FI
-//   dst[127:0] := a[127:0] << (tmp*8)
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_slli_si128
-FORCE_INLINE __m128i _mm_slli_si128(__m128i a, int imm)
-{
-    if (_sse2neon_unlikely(imm & ~15))
-        return _mm_setzero_si128();
-    uint8x16_t tmp[2] = {vdupq_n_u8(0), vreinterpretq_u8_m128i(a)};
-    return vreinterpretq_m128i_u8(
-        vld1q_u8(((uint8_t const *) tmp) + (16 - imm)));
-}
-
-// Compute the square root of packed double-precision (64-bit) floating-point
-// elements in a, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sqrt_pd
-FORCE_INLINE __m128d _mm_sqrt_pd(__m128d a)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(vsqrtq_f64(vreinterpretq_f64_m128d(a)));
-#else
-    double a0 = sqrt(((double *) &a)[0]);
-    double a1 = sqrt(((double *) &a)[1]);
-    return _mm_set_pd(a1, a0);
-#endif
-}
-
-// Compute the square root of the lower double-precision (64-bit) floating-point
-// element in b, store the result in the lower element of dst, and copy the
-// upper element from a to the upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sqrt_sd
-FORCE_INLINE __m128d _mm_sqrt_sd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return _mm_move_sd(a, _mm_sqrt_pd(b));
-#else
-    return _mm_set_pd(((double *) &a)[1], sqrt(((double *) &b)[0]));
-#endif
-}
-
-// Shift packed 16-bit integers in a right by count while shifting in sign bits,
-// and store the results in dst.
-//
-//   FOR j := 0 to 7
-//     i := j*16
-//     IF count[63:0] > 15
-//       dst[i+15:i] := (a[i+15] ? 0xFFFF : 0x0)
-//     ELSE
-//       dst[i+15:i] := SignExtend16(a[i+15:i] >> count[63:0])
-//     FI
-//  ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sra_epi16
-FORCE_INLINE __m128i _mm_sra_epi16(__m128i a, __m128i count)
-{
-    int64_t c = (int64_t) vget_low_s64((int64x2_t) count);
-    if (_sse2neon_unlikely(c & ~15))
-        return _mm_cmplt_epi16(a, _mm_setzero_si128());
-    return vreinterpretq_m128i_s16(vshlq_s16((int16x8_t) a, vdupq_n_s16(-c)));
-}
-
-// Shift packed 32-bit integers in a right by count while shifting in sign bits,
-// and store the results in dst.
-//
-//   FOR j := 0 to 3
-//     i := j*32
-//     IF count[63:0] > 31
-//       dst[i+31:i] := (a[i+31] ? 0xFFFFFFFF : 0x0)
-//     ELSE
-//       dst[i+31:i] := SignExtend32(a[i+31:i] >> count[63:0])
-//     FI
-//  ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sra_epi32
-FORCE_INLINE __m128i _mm_sra_epi32(__m128i a, __m128i count)
-{
-    int64_t c = (int64_t) vget_low_s64((int64x2_t) count);
-    if (_sse2neon_unlikely(c & ~31))
-        return _mm_cmplt_epi32(a, _mm_setzero_si128());
-    return vreinterpretq_m128i_s32(vshlq_s32((int32x4_t) a, vdupq_n_s32(-c)));
-}
-
-// Shift packed 16-bit integers in a right by imm8 while shifting in sign
-// bits, and store the results in dst.
-//
-//   FOR j := 0 to 7
-//     i := j*16
-//     IF imm8[7:0] > 15
-//       dst[i+15:i] := (a[i+15] ? 0xFFFF : 0x0)
-//     ELSE
-//       dst[i+15:i] := SignExtend16(a[i+15:i] >> imm8[7:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_srai_epi16
-FORCE_INLINE __m128i _mm_srai_epi16(__m128i a, int imm)
-{
-    const int count = (imm & ~15) ? 15 : imm;
-    return (__m128i) vshlq_s16((int16x8_t) a, vdupq_n_s16(-count));
-}
-
-// Shift packed 32-bit integers in a right by imm8 while shifting in sign bits,
-// and store the results in dst.
-//
-//   FOR j := 0 to 3
-//     i := j*32
-//     IF imm8[7:0] > 31
-//       dst[i+31:i] := (a[i+31] ? 0xFFFFFFFF : 0x0)
-//     ELSE
-//       dst[i+31:i] := SignExtend32(a[i+31:i] >> imm8[7:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_srai_epi32
-// FORCE_INLINE __m128i _mm_srai_epi32(__m128i a, __constrange(0,255) int imm)
-#define _mm_srai_epi32(a, imm)                                             \
-    __extension__({                                                        \
-        __m128i ret;                                                       \
-        if (_sse2neon_unlikely((imm) == 0)) {                              \
-            ret = a;                                                       \
-        } else if (_sse2neon_likely(0 < (imm) && (imm) < 32)) {            \
-            ret = vreinterpretq_m128i_s32(                                 \
-                vshlq_s32(vreinterpretq_s32_m128i(a), vdupq_n_s32(-imm))); \
-        } else {                                                           \
-            ret = vreinterpretq_m128i_s32(                                 \
-                vshrq_n_s32(vreinterpretq_s32_m128i(a), 31));              \
-        }                                                                  \
-        ret;                                                               \
-    })
-
-// Shift packed 16-bit integers in a right by count while shifting in zeros, and
-// store the results in dst.
-//
-//   FOR j := 0 to 7
-//     i := j*16
-//     IF count[63:0] > 15
-//       dst[i+15:i] := 0
-//     ELSE
-//       dst[i+15:i] := ZeroExtend16(a[i+15:i] >> count[63:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_srl_epi16
-FORCE_INLINE __m128i _mm_srl_epi16(__m128i a, __m128i count)
-{
-    uint64_t c = vreinterpretq_nth_u64_m128i(count, 0);
-    if (_sse2neon_unlikely(c & ~15))
-        return _mm_setzero_si128();
-
-    int16x8_t vc = vdupq_n_s16(-(int16_t) c);
-    return vreinterpretq_m128i_u16(vshlq_u16(vreinterpretq_u16_m128i(a), vc));
-}
-
-// Shift packed 32-bit integers in a right by count while shifting in zeros, and
-// store the results in dst.
-//
-//   FOR j := 0 to 3
-//     i := j*32
-//     IF count[63:0] > 31
-//       dst[i+31:i] := 0
-//     ELSE
-//       dst[i+31:i] := ZeroExtend32(a[i+31:i] >> count[63:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_srl_epi32
-FORCE_INLINE __m128i _mm_srl_epi32(__m128i a, __m128i count)
-{
-    uint64_t c = vreinterpretq_nth_u64_m128i(count, 0);
-    if (_sse2neon_unlikely(c & ~31))
-        return _mm_setzero_si128();
-
-    int32x4_t vc = vdupq_n_s32(-(int32_t) c);
-    return vreinterpretq_m128i_u32(vshlq_u32(vreinterpretq_u32_m128i(a), vc));
-}
-
-// Shift packed 64-bit integers in a right by count while shifting in zeros, and
-// store the results in dst.
-//
-//   FOR j := 0 to 1
-//     i := j*64
-//     IF count[63:0] > 63
-//       dst[i+63:i] := 0
-//     ELSE
-//       dst[i+63:i] := ZeroExtend64(a[i+63:i] >> count[63:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_srl_epi64
-FORCE_INLINE __m128i _mm_srl_epi64(__m128i a, __m128i count)
-{
-    uint64_t c = vreinterpretq_nth_u64_m128i(count, 0);
-    if (_sse2neon_unlikely(c & ~63))
-        return _mm_setzero_si128();
-
-    int64x2_t vc = vdupq_n_s64(-(int64_t) c);
-    return vreinterpretq_m128i_u64(vshlq_u64(vreinterpretq_u64_m128i(a), vc));
-}
-
-// Shift packed 16-bit integers in a right by imm8 while shifting in zeros, and
-// store the results in dst.
-//
-//   FOR j := 0 to 7
-//     i := j*16
-//     IF imm8[7:0] > 15
-//       dst[i+15:i] := 0
-//     ELSE
-//       dst[i+15:i] := ZeroExtend16(a[i+15:i] >> imm8[7:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_srli_epi16
-#define _mm_srli_epi16(a, imm)                                               \
-    __extension__({                                                          \
-        __m128i ret;                                                         \
-        if (_sse2neon_unlikely((imm) & ~15)) {                               \
-            ret = _mm_setzero_si128();                                       \
-        } else {                                                             \
-            ret = vreinterpretq_m128i_u16(                                   \
-                vshlq_u16(vreinterpretq_u16_m128i(a), vdupq_n_s16(-(imm)))); \
-        }                                                                    \
-        ret;                                                                 \
-    })
-
-// Shift packed 32-bit integers in a right by imm8 while shifting in zeros, and
-// store the results in dst.
-//
-//   FOR j := 0 to 3
-//     i := j*32
-//     IF imm8[7:0] > 31
-//       dst[i+31:i] := 0
-//     ELSE
-//       dst[i+31:i] := ZeroExtend32(a[i+31:i] >> imm8[7:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_srli_epi32
-// FORCE_INLINE __m128i _mm_srli_epi32(__m128i a, __constrange(0,255) int imm)
-#define _mm_srli_epi32(a, imm)                                               \
-    __extension__({                                                          \
-        __m128i ret;                                                         \
-        if (_sse2neon_unlikely((imm) & ~31)) {                               \
-            ret = _mm_setzero_si128();                                       \
-        } else {                                                             \
-            ret = vreinterpretq_m128i_u32(                                   \
-                vshlq_u32(vreinterpretq_u32_m128i(a), vdupq_n_s32(-(imm)))); \
-        }                                                                    \
-        ret;                                                                 \
-    })
-
-// Shift packed 64-bit integers in a right by imm8 while shifting in zeros, and
-// store the results in dst.
-//
-//   FOR j := 0 to 1
-//     i := j*64
-//     IF imm8[7:0] > 63
-//       dst[i+63:i] := 0
-//     ELSE
-//       dst[i+63:i] := ZeroExtend64(a[i+63:i] >> imm8[7:0])
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_srli_epi64
-#define _mm_srli_epi64(a, imm)                                               \
-    __extension__({                                                          \
-        __m128i ret;                                                         \
-        if (_sse2neon_unlikely((imm) & ~63)) {                               \
-            ret = _mm_setzero_si128();                                       \
-        } else {                                                             \
-            ret = vreinterpretq_m128i_u64(                                   \
-                vshlq_u64(vreinterpretq_u64_m128i(a), vdupq_n_s64(-(imm)))); \
-        }                                                                    \
-        ret;                                                                 \
-    })
-
-// Shift a right by imm8 bytes while shifting in zeros, and store the results in
-// dst.
-//
-//   tmp := imm8[7:0]
-//   IF tmp > 15
-//     tmp := 16
-//   FI
-//   dst[127:0] := a[127:0] >> (tmp*8)
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_srli_si128
-FORCE_INLINE __m128i _mm_srli_si128(__m128i a, int imm)
-{
-    if (_sse2neon_unlikely(imm & ~15))
-        return _mm_setzero_si128();
-    uint8x16_t tmp[2] = {vreinterpretq_u8_m128i(a), vdupq_n_u8(0)};
-    return vreinterpretq_m128i_u8(vld1q_u8(((uint8_t const *) tmp) + imm));
-}
-
-// Store 128-bits (composed of 2 packed double-precision (64-bit) floating-point
-// elements) from a into memory. mem_addr must be aligned on a 16-byte boundary
-// or a general-protection exception may be generated.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_store_pd
-FORCE_INLINE void _mm_store_pd(double *mem_addr, __m128d a)
-{
-#if defined(__aarch64__)
-    vst1q_f64((float64_t *) mem_addr, vreinterpretq_f64_m128d(a));
-#else
-    vst1q_f32((float32_t *) mem_addr, vreinterpretq_f32_m128d(a));
-#endif
-}
-
-// Store the lower double-precision (64-bit) floating-point element from a into
-// 2 contiguous elements in memory. mem_addr must be aligned on a 16-byte
-// boundary or a general-protection exception may be generated.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_store_pd1
-FORCE_INLINE void _mm_store_pd1(double *mem_addr, __m128d a)
-{
-#if defined(__aarch64__)
-    float64x1_t a_low = vget_low_f64(vreinterpretq_f64_m128d(a));
-    vst1q_f64((float64_t *) mem_addr,
-              vreinterpretq_f64_m128d(vcombine_f64(a_low, a_low)));
-#else
-    float32x2_t a_low = vget_low_f32(vreinterpretq_f32_m128d(a));
-    vst1q_f32((float32_t *) mem_addr,
-              vreinterpretq_f32_m128d(vcombine_f32(a_low, a_low)));
-#endif
-}
-
-// Store the lower double-precision (64-bit) floating-point element from a into
-// memory. mem_addr does not need to be aligned on any particular boundary.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=mm_store_sd
-FORCE_INLINE void _mm_store_sd(double *mem_addr, __m128d a)
-{
-#if defined(__aarch64__)
-    vst1_f64((float64_t *) mem_addr, vget_low_f64(vreinterpretq_f64_m128d(a)));
-#else
-    vst1_u64((uint64_t *) mem_addr, vget_low_u64(vreinterpretq_u64_m128d(a)));
-#endif
-}
-
-// Stores four 32-bit integer values as (as a __m128i value) at the address p.
-// https://msdn.microsoft.com/en-us/library/vstudio/edk11s13(v=vs.100).aspx
-FORCE_INLINE void _mm_store_si128(__m128i *p, __m128i a)
-{
-    vst1q_s32((int32_t *) p, vreinterpretq_s32_m128i(a));
-}
-
-// Store the lower double-precision (64-bit) floating-point element from a into
-// 2 contiguous elements in memory. mem_addr must be aligned on a 16-byte
-// boundary or a general-protection exception may be generated.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#expand=9,526,5601&text=_mm_store1_pd
-#define _mm_store1_pd _mm_store_pd1
-
-// Store the upper double-precision (64-bit) floating-point element from a into
-// memory.
-//
-//   MEM[mem_addr+63:mem_addr] := a[127:64]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_storeh_pd
-FORCE_INLINE void _mm_storeh_pd(double *mem_addr, __m128d a)
-{
-#if defined(__aarch64__)
-    vst1_f64((float64_t *) mem_addr, vget_high_f64(vreinterpretq_f64_m128d(a)));
-#else
-    vst1_f32((float32_t *) mem_addr, vget_high_f32(vreinterpretq_f32_m128d(a)));
-#endif
-}
-
-// Reads the lower 64 bits of b and stores them into the lower 64 bits of a.
-// https://msdn.microsoft.com/en-us/library/hhwf428f%28v=vs.90%29.aspx
-FORCE_INLINE void _mm_storel_epi64(__m128i *a, __m128i b)
-{
-    uint64x1_t hi = vget_high_u64(vreinterpretq_u64_m128i(*a));
-    uint64x1_t lo = vget_low_u64(vreinterpretq_u64_m128i(b));
-    *a = vreinterpretq_m128i_u64(vcombine_u64(lo, hi));
-}
-
-// Store the lower double-precision (64-bit) floating-point element from a into
-// memory.
-//
-//   MEM[mem_addr+63:mem_addr] := a[63:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_storel_pd
-FORCE_INLINE void _mm_storel_pd(double *mem_addr, __m128d a)
-{
-#if defined(__aarch64__)
-    vst1_f64((float64_t *) mem_addr, vget_low_f64(vreinterpretq_f64_m128d(a)));
-#else
-    vst1_f32((float32_t *) mem_addr, vget_low_f32(vreinterpretq_f32_m128d(a)));
-#endif
-}
-
-// Store 2 double-precision (64-bit) floating-point elements from a into memory
-// in reverse order. mem_addr must be aligned on a 16-byte boundary or a
-// general-protection exception may be generated.
-//
-//   MEM[mem_addr+63:mem_addr] := a[127:64]
-//   MEM[mem_addr+127:mem_addr+64] := a[63:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_storer_pd
-FORCE_INLINE void _mm_storer_pd(double *mem_addr, __m128d a)
-{
-    float32x4_t f = vreinterpretq_f32_m128d(a);
-    _mm_store_pd(mem_addr, vreinterpretq_m128d_f32(vextq_f32(f, f, 2)));
-}
-
-// Store 128-bits (composed of 2 packed double-precision (64-bit) floating-point
-// elements) from a into memory. mem_addr does not need to be aligned on any
-// particular boundary.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_storeu_pd
-FORCE_INLINE void _mm_storeu_pd(double *mem_addr, __m128d a)
-{
-    _mm_store_pd(mem_addr, a);
-}
-
-// Stores 128-bits of integer data a at the address p.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_storeu_si128
-FORCE_INLINE void _mm_storeu_si128(__m128i *p, __m128i a)
-{
-    vst1q_s32((int32_t *) p, vreinterpretq_s32_m128i(a));
-}
-
-// Stores 32-bits of integer data a at the address p.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_storeu_si32
-FORCE_INLINE void _mm_storeu_si32(void *p, __m128i a)
-{
-    vst1q_lane_s32((int32_t *) p, vreinterpretq_s32_m128i(a), 0);
-}
-
-// Store 128-bits (composed of 2 packed double-precision (64-bit) floating-point
-// elements) from a into memory using a non-temporal memory hint. mem_addr must
-// be aligned on a 16-byte boundary or a general-protection exception may be
-// generated.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_stream_pd
-FORCE_INLINE void _mm_stream_pd(double *p, __m128d a)
-{
-#if __has_builtin(__builtin_nontemporal_store)
-    __builtin_nontemporal_store(a, (float32x4_t *) p);
-#elif defined(__aarch64__)
-    vst1q_f64(p, vreinterpretq_f64_m128d(a));
-#else
-    vst1q_s64((int64_t *) p, vreinterpretq_s64_m128d(a));
-#endif
-}
-
-// Stores the data in a to the address p without polluting the caches.  If the
-// cache line containing address p is already in the cache, the cache will be
-// updated.
-// https://msdn.microsoft.com/en-us/library/ba08y07y%28v=vs.90%29.aspx
-FORCE_INLINE void _mm_stream_si128(__m128i *p, __m128i a)
-{
-#if __has_builtin(__builtin_nontemporal_store)
-    __builtin_nontemporal_store(a, p);
-#else
-    vst1q_s64((int64_t *) p, vreinterpretq_s64_m128i(a));
-#endif
-}
-
-// Store 32-bit integer a into memory using a non-temporal hint to minimize
-// cache pollution. If the cache line containing address mem_addr is already in
-// the cache, the cache will be updated.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_stream_si32
-FORCE_INLINE void _mm_stream_si32(int *p, int a)
-{
-    vst1q_lane_s32((int32_t *) p, vdupq_n_s32(a), 0);
-}
-
-// Store 64-bit integer a into memory using a non-temporal hint to minimize
-// cache pollution. If the cache line containing address mem_addr is already in
-// the cache, the cache will be updated.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_stream_si64
-FORCE_INLINE void _mm_stream_si64(__int64 *p, __int64 a)
-{
-    vst1_s64((int64_t *) p, vdup_n_s64((int64_t) a));
-}
-
-// Subtract packed 16-bit integers in b from packed 16-bit integers in a, and
-// store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sub_epi16
-FORCE_INLINE __m128i _mm_sub_epi16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s16(
-        vsubq_s16(vreinterpretq_s16_m128i(a), vreinterpretq_s16_m128i(b)));
-}
-
-// Subtracts the 4 signed or unsigned 32-bit integers of b from the 4 signed or
-// unsigned 32-bit integers of a.
-//
-//   r0 := a0 - b0
-//   r1 := a1 - b1
-//   r2 := a2 - b2
-//   r3 := a3 - b3
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/fhh866h0(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_sub_epi32(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s32(
-        vsubq_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(b)));
-}
-
-// Subtract 2 packed 64-bit integers in b from 2 packed 64-bit integers in a,
-// and store the results in dst.
-//    r0 := a0 - b0
-//    r1 := a1 - b1
-FORCE_INLINE __m128i _mm_sub_epi64(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s64(
-        vsubq_s64(vreinterpretq_s64_m128i(a), vreinterpretq_s64_m128i(b)));
-}
-
-// Subtract packed 8-bit integers in b from packed 8-bit integers in a, and
-// store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sub_epi8
-FORCE_INLINE __m128i _mm_sub_epi8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s8(
-        vsubq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
-}
-
-// Subtract packed double-precision (64-bit) floating-point elements in b from
-// packed double-precision (64-bit) floating-point elements in a, and store the
-// results in dst.
-//
-//   FOR j := 0 to 1
-//     i := j*64
-//     dst[i+63:i] := a[i+63:i] - b[i+63:i]
-//   ENDFOR
-//
-//  https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=mm_sub_pd
-FORCE_INLINE __m128d _mm_sub_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vsubq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#else
-    double *da = (double *) &a;
-    double *db = (double *) &b;
-    double c[2];
-    c[0] = da[0] - db[0];
-    c[1] = da[1] - db[1];
-    return vld1q_f32((float32_t *) c);
-#endif
-}
-
-// Subtract the lower double-precision (64-bit) floating-point element in b from
-// the lower double-precision (64-bit) floating-point element in a, store the
-// result in the lower element of dst, and copy the upper element from a to the
-// upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sub_sd
-FORCE_INLINE __m128d _mm_sub_sd(__m128d a, __m128d b)
-{
-    return _mm_move_sd(a, _mm_sub_pd(a, b));
-}
-
-// Subtract 64-bit integer b from 64-bit integer a, and store the result in dst.
-//
-//   dst[63:0] := a[63:0] - b[63:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sub_si64
-FORCE_INLINE __m64 _mm_sub_si64(__m64 a, __m64 b)
-{
-    return vreinterpret_m64_s64(
-        vsub_s64(vreinterpret_s64_m64(a), vreinterpret_s64_m64(b)));
-}
-
-// Subtracts the 8 signed 16-bit integers of b from the 8 signed 16-bit integers
-// of a and saturates.
-//
-//   r0 := SignedSaturate(a0 - b0)
-//   r1 := SignedSaturate(a1 - b1)
-//   ...
-//   r7 := SignedSaturate(a7 - b7)
-//
-// https://technet.microsoft.com/en-us/subscriptions/3247z5b8(v=vs.90)
-FORCE_INLINE __m128i _mm_subs_epi16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s16(
-        vqsubq_s16(vreinterpretq_s16_m128i(a), vreinterpretq_s16_m128i(b)));
-}
-
-// Subtracts the 16 signed 8-bit integers of b from the 16 signed 8-bit integers
-// of a and saturates.
-//
-//   r0 := SignedSaturate(a0 - b0)
-//   r1 := SignedSaturate(a1 - b1)
-//   ...
-//   r15 := SignedSaturate(a15 - b15)
-//
-// https://technet.microsoft.com/en-us/subscriptions/by7kzks1(v=vs.90)
-FORCE_INLINE __m128i _mm_subs_epi8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s8(
-        vqsubq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
-}
-
-// Subtracts the 8 unsigned 16-bit integers of bfrom the 8 unsigned 16-bit
-// integers of a and saturates..
-// https://technet.microsoft.com/en-us/subscriptions/index/f44y0s19(v=vs.90).aspx
-FORCE_INLINE __m128i _mm_subs_epu16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u16(
-        vqsubq_u16(vreinterpretq_u16_m128i(a), vreinterpretq_u16_m128i(b)));
-}
-
-// Subtracts the 16 unsigned 8-bit integers of b from the 16 unsigned 8-bit
-// integers of a and saturates.
-//
-//   r0 := UnsignedSaturate(a0 - b0)
-//   r1 := UnsignedSaturate(a1 - b1)
-//   ...
-//   r15 := UnsignedSaturate(a15 - b15)
-//
-// https://technet.microsoft.com/en-us/subscriptions/yadkxc18(v=vs.90)
-FORCE_INLINE __m128i _mm_subs_epu8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u8(
-        vqsubq_u8(vreinterpretq_u8_m128i(a), vreinterpretq_u8_m128i(b)));
-}
-
-#define _mm_ucomieq_sd _mm_comieq_sd
-#define _mm_ucomige_sd _mm_comige_sd
-#define _mm_ucomigt_sd _mm_comigt_sd
-#define _mm_ucomile_sd _mm_comile_sd
-#define _mm_ucomilt_sd _mm_comilt_sd
-#define _mm_ucomineq_sd _mm_comineq_sd
-
-// Return vector of type __m128d with undefined elements.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_undefined_pd
-FORCE_INLINE __m128d _mm_undefined_pd(void)
-{
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wuninitialized"
-#endif
-    __m128d a;
-    return a;
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-}
-
-// Interleaves the upper 4 signed or unsigned 16-bit integers in a with the
-// upper 4 signed or unsigned 16-bit integers in b.
-//
-//   r0 := a4
-//   r1 := b4
-//   r2 := a5
-//   r3 := b5
-//   r4 := a6
-//   r5 := b6
-//   r6 := a7
-//   r7 := b7
-//
-// https://msdn.microsoft.com/en-us/library/03196cz7(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_unpackhi_epi16(__m128i a, __m128i b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128i_s16(
-        vzip2q_s16(vreinterpretq_s16_m128i(a), vreinterpretq_s16_m128i(b)));
-#else
-    int16x4_t a1 = vget_high_s16(vreinterpretq_s16_m128i(a));
-    int16x4_t b1 = vget_high_s16(vreinterpretq_s16_m128i(b));
-    int16x4x2_t result = vzip_s16(a1, b1);
-    return vreinterpretq_m128i_s16(vcombine_s16(result.val[0], result.val[1]));
-#endif
-}
-
-// Interleaves the upper 2 signed or unsigned 32-bit integers in a with the
-// upper 2 signed or unsigned 32-bit integers in b.
-// https://msdn.microsoft.com/en-us/library/65sa7cbs(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_unpackhi_epi32(__m128i a, __m128i b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128i_s32(
-        vzip2q_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(b)));
-#else
-    int32x2_t a1 = vget_high_s32(vreinterpretq_s32_m128i(a));
-    int32x2_t b1 = vget_high_s32(vreinterpretq_s32_m128i(b));
-    int32x2x2_t result = vzip_s32(a1, b1);
-    return vreinterpretq_m128i_s32(vcombine_s32(result.val[0], result.val[1]));
-#endif
-}
-
-// Interleaves the upper signed or unsigned 64-bit integer in a with the
-// upper signed or unsigned 64-bit integer in b.
-//
-//   r0 := a1
-//   r1 := b1
-FORCE_INLINE __m128i _mm_unpackhi_epi64(__m128i a, __m128i b)
-{
-    int64x1_t a_h = vget_high_s64(vreinterpretq_s64_m128i(a));
-    int64x1_t b_h = vget_high_s64(vreinterpretq_s64_m128i(b));
-    return vreinterpretq_m128i_s64(vcombine_s64(a_h, b_h));
-}
-
-// Interleaves the upper 8 signed or unsigned 8-bit integers in a with the upper
-// 8 signed or unsigned 8-bit integers in b.
-//
-//   r0 := a8
-//   r1 := b8
-//   r2 := a9
-//   r3 := b9
-//   ...
-//   r14 := a15
-//   r15 := b15
-//
-// https://msdn.microsoft.com/en-us/library/t5h7783k(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_unpackhi_epi8(__m128i a, __m128i b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128i_s8(
-        vzip2q_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
-#else
-    int8x8_t a1 =
-        vreinterpret_s8_s16(vget_high_s16(vreinterpretq_s16_m128i(a)));
-    int8x8_t b1 =
-        vreinterpret_s8_s16(vget_high_s16(vreinterpretq_s16_m128i(b)));
-    int8x8x2_t result = vzip_s8(a1, b1);
-    return vreinterpretq_m128i_s8(vcombine_s8(result.val[0], result.val[1]));
-#endif
-}
-
-// Unpack and interleave double-precision (64-bit) floating-point elements from
-// the high half of a and b, and store the results in dst.
-//
-//   DEFINE INTERLEAVE_HIGH_QWORDS(src1[127:0], src2[127:0]) {
-//     dst[63:0] := src1[127:64]
-//     dst[127:64] := src2[127:64]
-//     RETURN dst[127:0]
-//   }
-//   dst[127:0] := INTERLEAVE_HIGH_QWORDS(a[127:0], b[127:0])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_unpackhi_pd
-FORCE_INLINE __m128d _mm_unpackhi_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vzip2q_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#else
-    return vreinterpretq_m128d_s64(
-        vcombine_s64(vget_high_s64(vreinterpretq_s64_m128d(a)),
-                     vget_high_s64(vreinterpretq_s64_m128d(b))));
-#endif
-}
-
-// Interleaves the lower 4 signed or unsigned 16-bit integers in a with the
-// lower 4 signed or unsigned 16-bit integers in b.
-//
-//   r0 := a0
-//   r1 := b0
-//   r2 := a1
-//   r3 := b1
-//   r4 := a2
-//   r5 := b2
-//   r6 := a3
-//   r7 := b3
-//
-// https://msdn.microsoft.com/en-us/library/btxb17bw%28v=vs.90%29.aspx
-FORCE_INLINE __m128i _mm_unpacklo_epi16(__m128i a, __m128i b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128i_s16(
-        vzip1q_s16(vreinterpretq_s16_m128i(a), vreinterpretq_s16_m128i(b)));
-#else
-    int16x4_t a1 = vget_low_s16(vreinterpretq_s16_m128i(a));
-    int16x4_t b1 = vget_low_s16(vreinterpretq_s16_m128i(b));
-    int16x4x2_t result = vzip_s16(a1, b1);
-    return vreinterpretq_m128i_s16(vcombine_s16(result.val[0], result.val[1]));
-#endif
-}
-
-// Interleaves the lower 2 signed or unsigned 32 - bit integers in a with the
-// lower 2 signed or unsigned 32 - bit integers in b.
-//
-//   r0 := a0
-//   r1 := b0
-//   r2 := a1
-//   r3 := b1
-//
-// https://msdn.microsoft.com/en-us/library/x8atst9d(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_unpacklo_epi32(__m128i a, __m128i b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128i_s32(
-        vzip1q_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(b)));
-#else
-    int32x2_t a1 = vget_low_s32(vreinterpretq_s32_m128i(a));
-    int32x2_t b1 = vget_low_s32(vreinterpretq_s32_m128i(b));
-    int32x2x2_t result = vzip_s32(a1, b1);
-    return vreinterpretq_m128i_s32(vcombine_s32(result.val[0], result.val[1]));
-#endif
-}
-
-FORCE_INLINE __m128i _mm_unpacklo_epi64(__m128i a, __m128i b)
-{
-    int64x1_t a_l = vget_low_s64(vreinterpretq_s64_m128i(a));
-    int64x1_t b_l = vget_low_s64(vreinterpretq_s64_m128i(b));
-    return vreinterpretq_m128i_s64(vcombine_s64(a_l, b_l));
-}
-
-// Interleaves the lower 8 signed or unsigned 8-bit integers in a with the lower
-// 8 signed or unsigned 8-bit integers in b.
-//
-//   r0 := a0
-//   r1 := b0
-//   r2 := a1
-//   r3 := b1
-//   ...
-//   r14 := a7
-//   r15 := b7
-//
-// https://msdn.microsoft.com/en-us/library/xf7k860c%28v=vs.90%29.aspx
-FORCE_INLINE __m128i _mm_unpacklo_epi8(__m128i a, __m128i b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128i_s8(
-        vzip1q_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
-#else
-    int8x8_t a1 = vreinterpret_s8_s16(vget_low_s16(vreinterpretq_s16_m128i(a)));
-    int8x8_t b1 = vreinterpret_s8_s16(vget_low_s16(vreinterpretq_s16_m128i(b)));
-    int8x8x2_t result = vzip_s8(a1, b1);
-    return vreinterpretq_m128i_s8(vcombine_s8(result.val[0], result.val[1]));
-#endif
-}
-
-// Unpack and interleave double-precision (64-bit) floating-point elements from
-// the low half of a and b, and store the results in dst.
-//
-//   DEFINE INTERLEAVE_QWORDS(src1[127:0], src2[127:0]) {
-//     dst[63:0] := src1[63:0]
-//     dst[127:64] := src2[63:0]
-//     RETURN dst[127:0]
-//   }
-//   dst[127:0] := INTERLEAVE_QWORDS(a[127:0], b[127:0])
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_unpacklo_pd
-FORCE_INLINE __m128d _mm_unpacklo_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vzip1q_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#else
-    return vreinterpretq_m128d_s64(
-        vcombine_s64(vget_low_s64(vreinterpretq_s64_m128d(a)),
-                     vget_low_s64(vreinterpretq_s64_m128d(b))));
-#endif
-}
-
-// Compute the bitwise XOR of packed double-precision (64-bit) floating-point
-// elements in a and b, and store the results in dst.
-//
-//   FOR j := 0 to 1
-//      i := j*64
-//      dst[i+63:i] := a[i+63:i] XOR b[i+63:i]
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_xor_pd
-FORCE_INLINE __m128d _mm_xor_pd(__m128d a, __m128d b)
-{
-    return vreinterpretq_m128d_s64(
-        veorq_s64(vreinterpretq_s64_m128d(a), vreinterpretq_s64_m128d(b)));
-}
-
-// Computes the bitwise XOR of the 128-bit value in a and the 128-bit value in
-// b.  https://msdn.microsoft.com/en-us/library/fzt08www(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_xor_si128(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s32(
-        veorq_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(b)));
-}
-
-/* SSE3 */
-
-// Alternatively add and subtract packed double-precision (64-bit)
-// floating-point elements in a to/from packed elements in b, and store the
-// results in dst.
-//
-// FOR j := 0 to 1
-//   i := j*64
-//   IF ((j & 1) == 0)
-//     dst[i+63:i] := a[i+63:i] - b[i+63:i]
-//   ELSE
-//     dst[i+63:i] := a[i+63:i] + b[i+63:i]
-//   FI
-// ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_addsub_pd
-FORCE_INLINE __m128d _mm_addsub_pd(__m128d a, __m128d b)
-{
-    static const __m128d mask = _mm_set_pd(1.0f, -1.0f);
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(vfmaq_f64(vreinterpretq_f64_m128d(a),
-                                             vreinterpretq_f64_m128d(b),
-                                             vreinterpretq_f64_m128d(mask)));
-#else
-    return _mm_add_pd(_mm_mul_pd(b, mask), a);
-#endif
-}
-
-// Alternatively add and subtract packed single-precision (32-bit)
-// floating-point elements in a to/from packed elements in b, and store the
-// results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=addsub_ps
-FORCE_INLINE __m128 _mm_addsub_ps(__m128 a, __m128 b)
-{
-    static const __m128 mask = _mm_setr_ps(-1.0f, 1.0f, -1.0f, 1.0f);
-#if defined(__aarch64__) || defined(__ARM_FEATURE_FMA) /* VFPv4+ */
-    return vreinterpretq_m128_f32(vfmaq_f32(vreinterpretq_f32_m128(a),
-                                            vreinterpretq_f32_m128(mask),
-                                            vreinterpretq_f32_m128(b)));
-#else
-    return _mm_add_ps(_mm_mul_ps(b, mask), a);
-#endif
-}
-
-// Horizontally add adjacent pairs of double-precision (64-bit) floating-point
-// elements in a and b, and pack the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_hadd_pd
-FORCE_INLINE __m128d _mm_hadd_pd(__m128d a, __m128d b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vpaddq_f64(vreinterpretq_f64_m128d(a), vreinterpretq_f64_m128d(b)));
-#else
-    double *da = (double *) &a;
-    double *db = (double *) &b;
-    double c[] = {da[0] + da[1], db[0] + db[1]};
-    return vreinterpretq_m128d_u64(vld1q_u64((uint64_t *) c));
-#endif
-}
-
-// Computes pairwise add of each argument as single-precision, floating-point
-// values a and b.
-// https://msdn.microsoft.com/en-us/library/yd9wecaa.aspx
-FORCE_INLINE __m128 _mm_hadd_ps(__m128 a, __m128 b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128_f32(
-        vpaddq_f32(vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(b)));
-#else
-    float32x2_t a10 = vget_low_f32(vreinterpretq_f32_m128(a));
-    float32x2_t a32 = vget_high_f32(vreinterpretq_f32_m128(a));
-    float32x2_t b10 = vget_low_f32(vreinterpretq_f32_m128(b));
-    float32x2_t b32 = vget_high_f32(vreinterpretq_f32_m128(b));
-    return vreinterpretq_m128_f32(
-        vcombine_f32(vpadd_f32(a10, a32), vpadd_f32(b10, b32)));
-#endif
-}
-
-// Horizontally subtract adjacent pairs of double-precision (64-bit)
-// floating-point elements in a and b, and pack the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_hsub_pd
-FORCE_INLINE __m128d _mm_hsub_pd(__m128d _a, __m128d _b)
-{
-#if defined(__aarch64__)
-    float64x2_t a = vreinterpretq_f64_m128d(_a);
-    float64x2_t b = vreinterpretq_f64_m128d(_b);
-    return vreinterpretq_m128d_f64(
-        vsubq_f64(vuzp1q_f64(a, b), vuzp2q_f64(a, b)));
-#else
-    double *da = (double *) &_a;
-    double *db = (double *) &_b;
-    double c[] = {da[0] - da[1], db[0] - db[1]};
-    return vreinterpretq_m128d_u64(vld1q_u64((uint64_t *) c));
-#endif
-}
-
-// Horizontally substract adjacent pairs of single-precision (32-bit)
-// floating-point elements in a and b, and pack the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_hsub_ps
-FORCE_INLINE __m128 _mm_hsub_ps(__m128 _a, __m128 _b)
-{
-    float32x4_t a = vreinterpretq_f32_m128(_a);
-    float32x4_t b = vreinterpretq_f32_m128(_b);
-#if defined(__aarch64__)
-    return vreinterpretq_m128_f32(
-        vsubq_f32(vuzp1q_f32(a, b), vuzp2q_f32(a, b)));
-#else
-    float32x4x2_t c = vuzpq_f32(a, b);
-    return vreinterpretq_m128_f32(vsubq_f32(c.val[0], c.val[1]));
-#endif
-}
-
-// Load 128-bits of integer data from unaligned memory into dst. This intrinsic
-// may perform better than _mm_loadu_si128 when the data crosses a cache line
-// boundary.
-//
-//   dst[127:0] := MEM[mem_addr+127:mem_addr]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_lddqu_si128
-#define _mm_lddqu_si128 _mm_loadu_si128
-
-// Load a double-precision (64-bit) floating-point element from memory into both
-// elements of dst.
-//
-//   dst[63:0] := MEM[mem_addr+63:mem_addr]
-//   dst[127:64] := MEM[mem_addr+63:mem_addr]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_loaddup_pd
-#define _mm_loaddup_pd _mm_load1_pd
-
-// Duplicate the low double-precision (64-bit) floating-point element from a,
-// and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_movedup_pd
-FORCE_INLINE __m128d _mm_movedup_pd(__m128d a)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(
-        vdupq_laneq_f64(vreinterpretq_f64_m128d(a), 0));
-#else
-    return vreinterpretq_m128d_u64(
-        vdupq_n_u64(vgetq_lane_u64(vreinterpretq_u64_m128d(a), 0)));
-#endif
-}
-
-// Duplicate odd-indexed single-precision (32-bit) floating-point elements
-// from a, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_movehdup_ps
-FORCE_INLINE __m128 _mm_movehdup_ps(__m128 a)
-{
-#if __has_builtin(__builtin_shufflevector)
-    return vreinterpretq_m128_f32(__builtin_shufflevector(
-        vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a), 1, 1, 3, 3));
-#else
-    float32_t a1 = vgetq_lane_f32(vreinterpretq_f32_m128(a), 1);
-    float32_t a3 = vgetq_lane_f32(vreinterpretq_f32_m128(a), 3);
-    float ALIGN_STRUCT(16) data[4] = {a1, a1, a3, a3};
-    return vreinterpretq_m128_f32(vld1q_f32(data));
-#endif
-}
-
-// Duplicate even-indexed single-precision (32-bit) floating-point elements
-// from a, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_moveldup_ps
-FORCE_INLINE __m128 _mm_moveldup_ps(__m128 a)
-{
-#if __has_builtin(__builtin_shufflevector)
-    return vreinterpretq_m128_f32(__builtin_shufflevector(
-        vreinterpretq_f32_m128(a), vreinterpretq_f32_m128(a), 0, 0, 2, 2));
-#else
-    float32_t a0 = vgetq_lane_f32(vreinterpretq_f32_m128(a), 0);
-    float32_t a2 = vgetq_lane_f32(vreinterpretq_f32_m128(a), 2);
-    float ALIGN_STRUCT(16) data[4] = {a0, a0, a2, a2};
-    return vreinterpretq_m128_f32(vld1q_f32(data));
-#endif
-}
-
-/* SSSE3 */
-
-// Compute the absolute value of packed signed 16-bit integers in a, and store
-// the unsigned results in dst.
-//
-//   FOR j := 0 to 7
-//     i := j*16
-//     dst[i+15:i] := ABS(a[i+15:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_abs_epi16
-FORCE_INLINE __m128i _mm_abs_epi16(__m128i a)
-{
-    return vreinterpretq_m128i_s16(vabsq_s16(vreinterpretq_s16_m128i(a)));
-}
-
-// Compute the absolute value of packed signed 32-bit integers in a, and store
-// the unsigned results in dst.
-//
-//   FOR j := 0 to 3
-//     i := j*32
-//     dst[i+31:i] := ABS(a[i+31:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_abs_epi32
-FORCE_INLINE __m128i _mm_abs_epi32(__m128i a)
-{
-    return vreinterpretq_m128i_s32(vabsq_s32(vreinterpretq_s32_m128i(a)));
-}
-
-// Compute the absolute value of packed signed 8-bit integers in a, and store
-// the unsigned results in dst.
-//
-//   FOR j := 0 to 15
-//     i := j*8
-//     dst[i+7:i] := ABS(a[i+7:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_abs_epi8
-FORCE_INLINE __m128i _mm_abs_epi8(__m128i a)
-{
-    return vreinterpretq_m128i_s8(vabsq_s8(vreinterpretq_s8_m128i(a)));
-}
-
-// Compute the absolute value of packed signed 16-bit integers in a, and store
-// the unsigned results in dst.
-//
-//   FOR j := 0 to 3
-//     i := j*16
-//     dst[i+15:i] := ABS(a[i+15:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_abs_pi16
-FORCE_INLINE __m64 _mm_abs_pi16(__m64 a)
-{
-    return vreinterpret_m64_s16(vabs_s16(vreinterpret_s16_m64(a)));
-}
-
-// Compute the absolute value of packed signed 32-bit integers in a, and store
-// the unsigned results in dst.
-//
-//   FOR j := 0 to 1
-//     i := j*32
-//     dst[i+31:i] := ABS(a[i+31:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_abs_pi32
-FORCE_INLINE __m64 _mm_abs_pi32(__m64 a)
-{
-    return vreinterpret_m64_s32(vabs_s32(vreinterpret_s32_m64(a)));
-}
-
-// Compute the absolute value of packed signed 8-bit integers in a, and store
-// the unsigned results in dst.
-//
-//   FOR j := 0 to 7
-//     i := j*8
-//     dst[i+7:i] := ABS(a[i+7:i])
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_abs_pi8
-FORCE_INLINE __m64 _mm_abs_pi8(__m64 a)
-{
-    return vreinterpret_m64_s8(vabs_s8(vreinterpret_s8_m64(a)));
-}
-
-// Concatenate 16-byte blocks in a and b into a 32-byte temporary result, shift
-// the result right by imm8 bytes, and store the low 16 bytes in dst.
-//
-//   tmp[255:0] := ((a[127:0] << 128)[255:0] OR b[127:0]) >> (imm8*8)
-//   dst[127:0] := tmp[127:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_alignr_epi8
-FORCE_INLINE __m128i _mm_alignr_epi8(__m128i a, __m128i b, int imm)
-{
-    if (_sse2neon_unlikely(imm & ~31))
-        return _mm_setzero_si128();
-    int idx;
-    uint8x16_t tmp[2];
-    if (imm >= 16) {
-        idx = imm - 16;
-        tmp[0] = vreinterpretq_u8_m128i(a);
-        tmp[1] = vdupq_n_u8(0);
-    } else {
-        idx = imm;
-        tmp[0] = vreinterpretq_u8_m128i(b);
-        tmp[1] = vreinterpretq_u8_m128i(a);
-    }
-    return vreinterpretq_m128i_u8(vld1q_u8(((uint8_t const *) tmp) + idx));
-}
-
-// Concatenate 8-byte blocks in a and b into a 16-byte temporary result, shift
-// the result right by imm8 bytes, and store the low 8 bytes in dst.
-//
-//   tmp[127:0] := ((a[63:0] << 64)[127:0] OR b[63:0]) >> (imm8*8)
-//   dst[63:0] := tmp[63:0]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_alignr_pi8
-#define _mm_alignr_pi8(a, b, imm)                                           \
-    __extension__({                                                         \
-        __m64 ret;                                                          \
-        if (_sse2neon_unlikely((imm) >= 16)) {                              \
-            ret = vreinterpret_m64_s8(vdup_n_s8(0));                        \
-        } else {                                                            \
-            uint8x8_t tmp_low, tmp_high;                                    \
-            if ((imm) >= 8) {                                               \
-                const int idx = (imm) -8;                                   \
-                tmp_low = vreinterpret_u8_m64(a);                           \
-                tmp_high = vdup_n_u8(0);                                    \
-                ret = vreinterpret_m64_u8(vext_u8(tmp_low, tmp_high, idx)); \
-            } else {                                                        \
-                const int idx = (imm);                                      \
-                tmp_low = vreinterpret_u8_m64(b);                           \
-                tmp_high = vreinterpret_u8_m64(a);                          \
-                ret = vreinterpret_m64_u8(vext_u8(tmp_low, tmp_high, idx)); \
-            }                                                               \
-        }                                                                   \
-        ret;                                                                \
-    })
-
-// Computes pairwise add of each argument as a 16-bit signed or unsigned integer
-// values a and b.
-FORCE_INLINE __m128i _mm_hadd_epi16(__m128i _a, __m128i _b)
-{
-    int16x8_t a = vreinterpretq_s16_m128i(_a);
-    int16x8_t b = vreinterpretq_s16_m128i(_b);
-#if defined(__aarch64__)
-    return vreinterpretq_m128i_s16(vpaddq_s16(a, b));
-#else
-    return vreinterpretq_m128i_s16(
-        vcombine_s16(vpadd_s16(vget_low_s16(a), vget_high_s16(a)),
-                     vpadd_s16(vget_low_s16(b), vget_high_s16(b))));
-#endif
-}
-
-// Computes pairwise add of each argument as a 32-bit signed or unsigned integer
-// values a and b.
-FORCE_INLINE __m128i _mm_hadd_epi32(__m128i _a, __m128i _b)
-{
-    int32x4_t a = vreinterpretq_s32_m128i(_a);
-    int32x4_t b = vreinterpretq_s32_m128i(_b);
-    return vreinterpretq_m128i_s32(
-        vcombine_s32(vpadd_s32(vget_low_s32(a), vget_high_s32(a)),
-                     vpadd_s32(vget_low_s32(b), vget_high_s32(b))));
-}
-
-// Horizontally add adjacent pairs of 16-bit integers in a and b, and pack the
-// signed 16-bit results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_hadd_pi16
-FORCE_INLINE __m64 _mm_hadd_pi16(__m64 a, __m64 b)
-{
-    return vreinterpret_m64_s16(
-        vpadd_s16(vreinterpret_s16_m64(a), vreinterpret_s16_m64(b)));
-}
-
-// Horizontally add adjacent pairs of 32-bit integers in a and b, and pack the
-// signed 32-bit results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_hadd_pi32
-FORCE_INLINE __m64 _mm_hadd_pi32(__m64 a, __m64 b)
-{
-    return vreinterpret_m64_s32(
-        vpadd_s32(vreinterpret_s32_m64(a), vreinterpret_s32_m64(b)));
-}
-
-// Computes saturated pairwise sub of each argument as a 16-bit signed
-// integer values a and b.
-FORCE_INLINE __m128i _mm_hadds_epi16(__m128i _a, __m128i _b)
-{
-#if defined(__aarch64__)
-    int16x8_t a = vreinterpretq_s16_m128i(_a);
-    int16x8_t b = vreinterpretq_s16_m128i(_b);
-    return vreinterpretq_s64_s16(
-        vqaddq_s16(vuzp1q_s16(a, b), vuzp2q_s16(a, b)));
-#else
-    int32x4_t a = vreinterpretq_s32_m128i(_a);
-    int32x4_t b = vreinterpretq_s32_m128i(_b);
-    // Interleave using vshrn/vmovn
-    // [a0|a2|a4|a6|b0|b2|b4|b6]
-    // [a1|a3|a5|a7|b1|b3|b5|b7]
-    int16x8_t ab0246 = vcombine_s16(vmovn_s32(a), vmovn_s32(b));
-    int16x8_t ab1357 = vcombine_s16(vshrn_n_s32(a, 16), vshrn_n_s32(b, 16));
-    // Saturated add
-    return vreinterpretq_m128i_s16(vqaddq_s16(ab0246, ab1357));
-#endif
-}
-
-// Horizontally add adjacent pairs of signed 16-bit integers in a and b using
-// saturation, and pack the signed 16-bit results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_hadds_pi16
-FORCE_INLINE __m64 _mm_hadds_pi16(__m64 _a, __m64 _b)
-{
-    int16x4_t a = vreinterpret_s16_m64(_a);
-    int16x4_t b = vreinterpret_s16_m64(_b);
-#if defined(__aarch64__)
-    return vreinterpret_s64_s16(vqadd_s16(vuzp1_s16(a, b), vuzp2_s16(a, b)));
-#else
-    int16x4x2_t res = vuzp_s16(a, b);
-    return vreinterpret_s64_s16(vqadd_s16(res.val[0], res.val[1]));
-#endif
-}
-
-// Horizontally subtract adjacent pairs of 16-bit integers in a and b, and pack
-// the signed 16-bit results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_hsub_epi16
-FORCE_INLINE __m128i _mm_hsub_epi16(__m128i _a, __m128i _b)
-{
-    int16x8_t a = vreinterpretq_s16_m128i(_a);
-    int16x8_t b = vreinterpretq_s16_m128i(_b);
-#if defined(__aarch64__)
-    return vreinterpretq_m128i_s16(
-        vsubq_s16(vuzp1q_s16(a, b), vuzp2q_s16(a, b)));
-#else
-    int16x8x2_t c = vuzpq_s16(a, b);
-    return vreinterpretq_m128i_s16(vsubq_s16(c.val[0], c.val[1]));
-#endif
-}
-
-// Horizontally subtract adjacent pairs of 32-bit integers in a and b, and pack
-// the signed 32-bit results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_hsub_epi32
-FORCE_INLINE __m128i _mm_hsub_epi32(__m128i _a, __m128i _b)
-{
-    int32x4_t a = vreinterpretq_s32_m128i(_a);
-    int32x4_t b = vreinterpretq_s32_m128i(_b);
-#if defined(__aarch64__)
-    return vreinterpretq_m128i_s32(
-        vsubq_s32(vuzp1q_s32(a, b), vuzp2q_s32(a, b)));
-#else
-    int32x4x2_t c = vuzpq_s32(a, b);
-    return vreinterpretq_m128i_s32(vsubq_s32(c.val[0], c.val[1]));
-#endif
-}
-
-// Horizontally subtract adjacent pairs of 16-bit integers in a and b, and pack
-// the signed 16-bit results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_hsub_pi16
-FORCE_INLINE __m64 _mm_hsub_pi16(__m64 _a, __m64 _b)
-{
-    int16x4_t a = vreinterpret_s16_m64(_a);
-    int16x4_t b = vreinterpret_s16_m64(_b);
-#if defined(__aarch64__)
-    return vreinterpret_m64_s16(vsub_s16(vuzp1_s16(a, b), vuzp2_s16(a, b)));
-#else
-    int16x4x2_t c = vuzp_s16(a, b);
-    return vreinterpret_m64_s16(vsub_s16(c.val[0], c.val[1]));
-#endif
-}
-
-// Horizontally subtract adjacent pairs of 32-bit integers in a and b, and pack
-// the signed 32-bit results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=mm_hsub_pi32
-FORCE_INLINE __m64 _mm_hsub_pi32(__m64 _a, __m64 _b)
-{
-    int32x2_t a = vreinterpret_s32_m64(_a);
-    int32x2_t b = vreinterpret_s32_m64(_b);
-#if defined(__aarch64__)
-    return vreinterpret_m64_s32(vsub_s32(vuzp1_s32(a, b), vuzp2_s32(a, b)));
-#else
-    int32x2x2_t c = vuzp_s32(a, b);
-    return vreinterpret_m64_s32(vsub_s32(c.val[0], c.val[1]));
-#endif
-}
-
-// Computes saturated pairwise difference of each argument as a 16-bit signed
-// integer values a and b.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_hsubs_epi16
-FORCE_INLINE __m128i _mm_hsubs_epi16(__m128i _a, __m128i _b)
-{
-    int16x8_t a = vreinterpretq_s16_m128i(_a);
-    int16x8_t b = vreinterpretq_s16_m128i(_b);
-#if defined(__aarch64__)
-    return vreinterpretq_m128i_s16(
-        vqsubq_s16(vuzp1q_s16(a, b), vuzp2q_s16(a, b)));
-#else
-    int16x8x2_t c = vuzpq_s16(a, b);
-    return vreinterpretq_m128i_s16(vqsubq_s16(c.val[0], c.val[1]));
-#endif
-}
-
-// Horizontally subtract adjacent pairs of signed 16-bit integers in a and b
-// using saturation, and pack the signed 16-bit results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_hsubs_pi16
-FORCE_INLINE __m64 _mm_hsubs_pi16(__m64 _a, __m64 _b)
-{
-    int16x4_t a = vreinterpret_s16_m64(_a);
-    int16x4_t b = vreinterpret_s16_m64(_b);
-#if defined(__aarch64__)
-    return vreinterpret_m64_s16(vqsub_s16(vuzp1_s16(a, b), vuzp2_s16(a, b)));
-#else
-    int16x4x2_t c = vuzp_s16(a, b);
-    return vreinterpret_m64_s16(vqsub_s16(c.val[0], c.val[1]));
-#endif
-}
-
-// Vertically multiply each unsigned 8-bit integer from a with the corresponding
-// signed 8-bit integer from b, producing intermediate signed 16-bit integers.
-// Horizontally add adjacent pairs of intermediate signed 16-bit integers,
-// and pack the saturated results in dst.
-//
-//   FOR j := 0 to 7
-//      i := j*16
-//      dst[i+15:i] := Saturate_To_Int16( a[i+15:i+8]*b[i+15:i+8] +
-//      a[i+7:i]*b[i+7:i] )
-//   ENDFOR
-FORCE_INLINE __m128i _mm_maddubs_epi16(__m128i _a, __m128i _b)
-{
-#if defined(__aarch64__)
-    uint8x16_t a = vreinterpretq_u8_m128i(_a);
-    int8x16_t b = vreinterpretq_s8_m128i(_b);
-    int16x8_t tl = vmulq_s16(vreinterpretq_s16_u16(vmovl_u8(vget_low_u8(a))),
-                             vmovl_s8(vget_low_s8(b)));
-    int16x8_t th = vmulq_s16(vreinterpretq_s16_u16(vmovl_u8(vget_high_u8(a))),
-                             vmovl_s8(vget_high_s8(b)));
-    return vreinterpretq_m128i_s16(
-        vqaddq_s16(vuzp1q_s16(tl, th), vuzp2q_s16(tl, th)));
-#else
-    // This would be much simpler if x86 would choose to zero extend OR sign
-    // extend, not both. This could probably be optimized better.
-    uint16x8_t a = vreinterpretq_u16_m128i(_a);
-    int16x8_t b = vreinterpretq_s16_m128i(_b);
-
-    // Zero extend a
-    int16x8_t a_odd = vreinterpretq_s16_u16(vshrq_n_u16(a, 8));
-    int16x8_t a_even = vreinterpretq_s16_u16(vbicq_u16(a, vdupq_n_u16(0xff00)));
-
-    // Sign extend by shifting left then shifting right.
-    int16x8_t b_even = vshrq_n_s16(vshlq_n_s16(b, 8), 8);
-    int16x8_t b_odd = vshrq_n_s16(b, 8);
-
-    // multiply
-    int16x8_t prod1 = vmulq_s16(a_even, b_even);
-    int16x8_t prod2 = vmulq_s16(a_odd, b_odd);
-
-    // saturated add
-    return vreinterpretq_m128i_s16(vqaddq_s16(prod1, prod2));
-#endif
-}
-
-// Vertically multiply each unsigned 8-bit integer from a with the corresponding
-// signed 8-bit integer from b, producing intermediate signed 16-bit integers.
-// Horizontally add adjacent pairs of intermediate signed 16-bit integers, and
-// pack the saturated results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_maddubs_pi16
-FORCE_INLINE __m64 _mm_maddubs_pi16(__m64 _a, __m64 _b)
-{
-    uint16x4_t a = vreinterpret_u16_m64(_a);
-    int16x4_t b = vreinterpret_s16_m64(_b);
-
-    // Zero extend a
-    int16x4_t a_odd = vreinterpret_s16_u16(vshr_n_u16(a, 8));
-    int16x4_t a_even = vreinterpret_s16_u16(vand_u16(a, vdup_n_u16(0xff)));
-
-    // Sign extend by shifting left then shifting right.
-    int16x4_t b_even = vshr_n_s16(vshl_n_s16(b, 8), 8);
-    int16x4_t b_odd = vshr_n_s16(b, 8);
-
-    // multiply
-    int16x4_t prod1 = vmul_s16(a_even, b_even);
-    int16x4_t prod2 = vmul_s16(a_odd, b_odd);
-
-    // saturated add
-    return vreinterpret_m64_s16(vqadd_s16(prod1, prod2));
-}
-
-// Multiply packed signed 16-bit integers in a and b, producing intermediate
-// signed 32-bit integers. Shift right by 15 bits while rounding up, and store
-// the packed 16-bit integers in dst.
-//
-//   r0 := Round(((int32_t)a0 * (int32_t)b0) >> 15)
-//   r1 := Round(((int32_t)a1 * (int32_t)b1) >> 15)
-//   r2 := Round(((int32_t)a2 * (int32_t)b2) >> 15)
-//   ...
-//   r7 := Round(((int32_t)a7 * (int32_t)b7) >> 15)
-FORCE_INLINE __m128i _mm_mulhrs_epi16(__m128i a, __m128i b)
-{
-    // Has issues due to saturation
-    // return vreinterpretq_m128i_s16(vqrdmulhq_s16(a, b));
-
-    // Multiply
-    int32x4_t mul_lo = vmull_s16(vget_low_s16(vreinterpretq_s16_m128i(a)),
-                                 vget_low_s16(vreinterpretq_s16_m128i(b)));
-    int32x4_t mul_hi = vmull_s16(vget_high_s16(vreinterpretq_s16_m128i(a)),
-                                 vget_high_s16(vreinterpretq_s16_m128i(b)));
-
-    // Rounding narrowing shift right
-    // narrow = (int16_t)((mul + 16384) >> 15);
-    int16x4_t narrow_lo = vrshrn_n_s32(mul_lo, 15);
-    int16x4_t narrow_hi = vrshrn_n_s32(mul_hi, 15);
-
-    // Join together
-    return vreinterpretq_m128i_s16(vcombine_s16(narrow_lo, narrow_hi));
-}
-
-// Multiply packed signed 16-bit integers in a and b, producing intermediate
-// signed 32-bit integers. Truncate each intermediate integer to the 18 most
-// significant bits, round by adding 1, and store bits [16:1] to dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_mulhrs_pi16
-FORCE_INLINE __m64 _mm_mulhrs_pi16(__m64 a, __m64 b)
-{
-    int32x4_t mul_extend =
-        vmull_s16((vreinterpret_s16_m64(a)), (vreinterpret_s16_m64(b)));
-
-    // Rounding narrowing shift right
-    return vreinterpret_m64_s16(vrshrn_n_s32(mul_extend, 15));
-}
-
-// Shuffle packed 8-bit integers in a according to shuffle control mask in the
-// corresponding 8-bit element of b, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_shuffle_epi8
-FORCE_INLINE __m128i _mm_shuffle_epi8(__m128i a, __m128i b)
-{
-    int8x16_t tbl = vreinterpretq_s8_m128i(a);   // input a
-    uint8x16_t idx = vreinterpretq_u8_m128i(b);  // input b
-    uint8x16_t idx_masked =
-        vandq_u8(idx, vdupq_n_u8(0x8F));  // avoid using meaningless bits
-#if defined(__aarch64__)
-    return vreinterpretq_m128i_s8(vqtbl1q_s8(tbl, idx_masked));
-#elif defined(__GNUC__)
-    int8x16_t ret;
-    // %e and %f represent the even and odd D registers
-    // respectively.
-    __asm__ __volatile__(
-        "vtbl.8  %e[ret], {%e[tbl], %f[tbl]}, %e[idx]\n"
-        "vtbl.8  %f[ret], {%e[tbl], %f[tbl]}, %f[idx]\n"
-        : [ret] "=&w"(ret)
-        : [tbl] "w"(tbl), [idx] "w"(idx_masked));
-    return vreinterpretq_m128i_s8(ret);
-#else
-    // use this line if testing on aarch64
-    int8x8x2_t a_split = {vget_low_s8(tbl), vget_high_s8(tbl)};
-    return vreinterpretq_m128i_s8(
-        vcombine_s8(vtbl2_s8(a_split, vget_low_u8(idx_masked)),
-                    vtbl2_s8(a_split, vget_high_u8(idx_masked))));
-#endif
-}
-
-// Shuffle packed 8-bit integers in a according to shuffle control mask in the
-// corresponding 8-bit element of b, and store the results in dst.
-//
-//   FOR j := 0 to 7
-//     i := j*8
-//     IF b[i+7] == 1
-//       dst[i+7:i] := 0
-//     ELSE
-//       index[2:0] := b[i+2:i]
-//       dst[i+7:i] := a[index*8+7:index*8]
-//     FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_shuffle_pi8
-FORCE_INLINE __m64 _mm_shuffle_pi8(__m64 a, __m64 b)
-{
-    const int8x8_t controlMask =
-        vand_s8(vreinterpret_s8_m64(b), vdup_n_s8((int8_t)(0x1 << 7 | 0x07)));
-    int8x8_t res = vtbl1_s8(vreinterpret_s8_m64(a), controlMask);
-    return vreinterpret_m64_s8(res);
-}
-
-// Negate packed 16-bit integers in a when the corresponding signed
-// 16-bit integer in b is negative, and store the results in dst.
-// Element in dst are zeroed out when the corresponding element
-// in b is zero.
-//
-//   for i in 0..7
-//     if b[i] < 0
-//       r[i] := -a[i]
-//     else if b[i] == 0
-//       r[i] := 0
-//     else
-//       r[i] := a[i]
-//     fi
-//   done
-FORCE_INLINE __m128i _mm_sign_epi16(__m128i _a, __m128i _b)
-{
-    int16x8_t a = vreinterpretq_s16_m128i(_a);
-    int16x8_t b = vreinterpretq_s16_m128i(_b);
-
-    // signed shift right: faster than vclt
-    // (b < 0) ? 0xFFFF : 0
-    uint16x8_t ltMask = vreinterpretq_u16_s16(vshrq_n_s16(b, 15));
-    // (b == 0) ? 0xFFFF : 0
-#if defined(__aarch64__)
-    int16x8_t zeroMask = vreinterpretq_s16_u16(vceqzq_s16(b));
-#else
-    int16x8_t zeroMask = vreinterpretq_s16_u16(vceqq_s16(b, vdupq_n_s16(0)));
-#endif
-
-    // bitwise select either a or negative 'a' (vnegq_s16(a) equals to negative
-    // 'a') based on ltMask
-    int16x8_t masked = vbslq_s16(ltMask, vnegq_s16(a), a);
-    // res = masked & (~zeroMask)
-    int16x8_t res = vbicq_s16(masked, zeroMask);
-    return vreinterpretq_m128i_s16(res);
-}
-
-// Negate packed 32-bit integers in a when the corresponding signed
-// 32-bit integer in b is negative, and store the results in dst.
-// Element in dst are zeroed out when the corresponding element
-// in b is zero.
-//
-//   for i in 0..3
-//     if b[i] < 0
-//       r[i] := -a[i]
-//     else if b[i] == 0
-//       r[i] := 0
-//     else
-//       r[i] := a[i]
-//     fi
-//   done
-FORCE_INLINE __m128i _mm_sign_epi32(__m128i _a, __m128i _b)
-{
-    int32x4_t a = vreinterpretq_s32_m128i(_a);
-    int32x4_t b = vreinterpretq_s32_m128i(_b);
-
-    // signed shift right: faster than vclt
-    // (b < 0) ? 0xFFFFFFFF : 0
-    uint32x4_t ltMask = vreinterpretq_u32_s32(vshrq_n_s32(b, 31));
-
-    // (b == 0) ? 0xFFFFFFFF : 0
-#if defined(__aarch64__)
-    int32x4_t zeroMask = vreinterpretq_s32_u32(vceqzq_s32(b));
-#else
-    int32x4_t zeroMask = vreinterpretq_s32_u32(vceqq_s32(b, vdupq_n_s32(0)));
-#endif
-
-    // bitwise select either a or negative 'a' (vnegq_s32(a) equals to negative
-    // 'a') based on ltMask
-    int32x4_t masked = vbslq_s32(ltMask, vnegq_s32(a), a);
-    // res = masked & (~zeroMask)
-    int32x4_t res = vbicq_s32(masked, zeroMask);
-    return vreinterpretq_m128i_s32(res);
-}
-
-// Negate packed 8-bit integers in a when the corresponding signed
-// 8-bit integer in b is negative, and store the results in dst.
-// Element in dst are zeroed out when the corresponding element
-// in b is zero.
-//
-//   for i in 0..15
-//     if b[i] < 0
-//       r[i] := -a[i]
-//     else if b[i] == 0
-//       r[i] := 0
-//     else
-//       r[i] := a[i]
-//     fi
-//   done
-FORCE_INLINE __m128i _mm_sign_epi8(__m128i _a, __m128i _b)
-{
-    int8x16_t a = vreinterpretq_s8_m128i(_a);
-    int8x16_t b = vreinterpretq_s8_m128i(_b);
-
-    // signed shift right: faster than vclt
-    // (b < 0) ? 0xFF : 0
-    uint8x16_t ltMask = vreinterpretq_u8_s8(vshrq_n_s8(b, 7));
-
-    // (b == 0) ? 0xFF : 0
-#if defined(__aarch64__)
-    int8x16_t zeroMask = vreinterpretq_s8_u8(vceqzq_s8(b));
-#else
-    int8x16_t zeroMask = vreinterpretq_s8_u8(vceqq_s8(b, vdupq_n_s8(0)));
-#endif
-
-    // bitwise select either a or nagative 'a' (vnegq_s8(a) return nagative 'a')
-    // based on ltMask
-    int8x16_t masked = vbslq_s8(ltMask, vnegq_s8(a), a);
-    // res = masked & (~zeroMask)
-    int8x16_t res = vbicq_s8(masked, zeroMask);
-
-    return vreinterpretq_m128i_s8(res);
-}
-
-// Negate packed 16-bit integers in a when the corresponding signed 16-bit
-// integer in b is negative, and store the results in dst. Element in dst are
-// zeroed out when the corresponding element in b is zero.
-//
-//   FOR j := 0 to 3
-//      i := j*16
-//      IF b[i+15:i] < 0
-//        dst[i+15:i] := -(a[i+15:i])
-//      ELSE IF b[i+15:i] == 0
-//        dst[i+15:i] := 0
-//      ELSE
-//        dst[i+15:i] := a[i+15:i]
-//      FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sign_pi16
-FORCE_INLINE __m64 _mm_sign_pi16(__m64 _a, __m64 _b)
-{
-    int16x4_t a = vreinterpret_s16_m64(_a);
-    int16x4_t b = vreinterpret_s16_m64(_b);
-
-    // signed shift right: faster than vclt
-    // (b < 0) ? 0xFFFF : 0
-    uint16x4_t ltMask = vreinterpret_u16_s16(vshr_n_s16(b, 15));
-
-    // (b == 0) ? 0xFFFF : 0
-#if defined(__aarch64__)
-    int16x4_t zeroMask = vreinterpret_s16_u16(vceqz_s16(b));
-#else
-    int16x4_t zeroMask = vreinterpret_s16_u16(vceq_s16(b, vdup_n_s16(0)));
-#endif
-
-    // bitwise select either a or nagative 'a' (vneg_s16(a) return nagative 'a')
-    // based on ltMask
-    int16x4_t masked = vbsl_s16(ltMask, vneg_s16(a), a);
-    // res = masked & (~zeroMask)
-    int16x4_t res = vbic_s16(masked, zeroMask);
-
-    return vreinterpret_m64_s16(res);
-}
-
-// Negate packed 32-bit integers in a when the corresponding signed 32-bit
-// integer in b is negative, and store the results in dst. Element in dst are
-// zeroed out when the corresponding element in b is zero.
-//
-//   FOR j := 0 to 1
-//      i := j*32
-//      IF b[i+31:i] < 0
-//        dst[i+31:i] := -(a[i+31:i])
-//      ELSE IF b[i+31:i] == 0
-//        dst[i+31:i] := 0
-//      ELSE
-//        dst[i+31:i] := a[i+31:i]
-//      FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sign_pi32
-FORCE_INLINE __m64 _mm_sign_pi32(__m64 _a, __m64 _b)
-{
-    int32x2_t a = vreinterpret_s32_m64(_a);
-    int32x2_t b = vreinterpret_s32_m64(_b);
-
-    // signed shift right: faster than vclt
-    // (b < 0) ? 0xFFFFFFFF : 0
-    uint32x2_t ltMask = vreinterpret_u32_s32(vshr_n_s32(b, 31));
-
-    // (b == 0) ? 0xFFFFFFFF : 0
-#if defined(__aarch64__)
-    int32x2_t zeroMask = vreinterpret_s32_u32(vceqz_s32(b));
-#else
-    int32x2_t zeroMask = vreinterpret_s32_u32(vceq_s32(b, vdup_n_s32(0)));
-#endif
-
-    // bitwise select either a or nagative 'a' (vneg_s32(a) return nagative 'a')
-    // based on ltMask
-    int32x2_t masked = vbsl_s32(ltMask, vneg_s32(a), a);
-    // res = masked & (~zeroMask)
-    int32x2_t res = vbic_s32(masked, zeroMask);
-
-    return vreinterpret_m64_s32(res);
-}
-
-// Negate packed 8-bit integers in a when the corresponding signed 8-bit integer
-// in b is negative, and store the results in dst. Element in dst are zeroed out
-// when the corresponding element in b is zero.
-//
-//   FOR j := 0 to 7
-//      i := j*8
-//      IF b[i+7:i] < 0
-//        dst[i+7:i] := -(a[i+7:i])
-//      ELSE IF b[i+7:i] == 0
-//        dst[i+7:i] := 0
-//      ELSE
-//        dst[i+7:i] := a[i+7:i]
-//      FI
-//   ENDFOR
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_sign_pi8
-FORCE_INLINE __m64 _mm_sign_pi8(__m64 _a, __m64 _b)
-{
-    int8x8_t a = vreinterpret_s8_m64(_a);
-    int8x8_t b = vreinterpret_s8_m64(_b);
-
-    // signed shift right: faster than vclt
-    // (b < 0) ? 0xFF : 0
-    uint8x8_t ltMask = vreinterpret_u8_s8(vshr_n_s8(b, 7));
-
-    // (b == 0) ? 0xFF : 0
-#if defined(__aarch64__)
-    int8x8_t zeroMask = vreinterpret_s8_u8(vceqz_s8(b));
-#else
-    int8x8_t zeroMask = vreinterpret_s8_u8(vceq_s8(b, vdup_n_s8(0)));
-#endif
-
-    // bitwise select either a or nagative 'a' (vneg_s8(a) return nagative 'a')
-    // based on ltMask
-    int8x8_t masked = vbsl_s8(ltMask, vneg_s8(a), a);
-    // res = masked & (~zeroMask)
-    int8x8_t res = vbic_s8(masked, zeroMask);
-
-    return vreinterpret_m64_s8(res);
-}
-
-/* SSE4.1 */
-
-// Blend packed 16-bit integers from a and b using control mask imm8, and store
-// the results in dst.
-//
-//   FOR j := 0 to 7
-//       i := j*16
-//       IF imm8[j]
-//           dst[i+15:i] := b[i+15:i]
-//       ELSE
-//           dst[i+15:i] := a[i+15:i]
-//       FI
-//   ENDFOR
-// FORCE_INLINE __m128i _mm_blend_epi16(__m128i a, __m128i b,
-//                                      __constrange(0,255) int imm)
-#define _mm_blend_epi16(a, b, imm)                                            \
-    __extension__({                                                           \
-        const uint16_t _mask[8] = {((imm) & (1 << 0)) ? (uint16_t) -1 : 0x0,  \
-                                   ((imm) & (1 << 1)) ? (uint16_t) -1 : 0x0,  \
-                                   ((imm) & (1 << 2)) ? (uint16_t) -1 : 0x0,  \
-                                   ((imm) & (1 << 3)) ? (uint16_t) -1 : 0x0,  \
-                                   ((imm) & (1 << 4)) ? (uint16_t) -1 : 0x0,  \
-                                   ((imm) & (1 << 5)) ? (uint16_t) -1 : 0x0,  \
-                                   ((imm) & (1 << 6)) ? (uint16_t) -1 : 0x0,  \
-                                   ((imm) & (1 << 7)) ? (uint16_t) -1 : 0x0}; \
-        uint16x8_t _mask_vec = vld1q_u16(_mask);                              \
-        uint16x8_t _a = vreinterpretq_u16_m128i(a);                           \
-        uint16x8_t _b = vreinterpretq_u16_m128i(b);                           \
-        vreinterpretq_m128i_u16(vbslq_u16(_mask_vec, _b, _a));                \
-    })
-
-// Blend packed double-precision (64-bit) floating-point elements from a and b
-// using control mask imm8, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_blend_pd
-#define _mm_blend_pd(a, b, imm)                                \
-    __extension__({                                            \
-        const uint64_t _mask[2] = {                            \
-            ((imm) & (1 << 0)) ? ~UINT64_C(0) : UINT64_C(0),   \
-            ((imm) & (1 << 1)) ? ~UINT64_C(0) : UINT64_C(0)};  \
-        uint64x2_t _mask_vec = vld1q_u64(_mask);               \
-        uint64x2_t _a = vreinterpretq_u64_m128d(a);            \
-        uint64x2_t _b = vreinterpretq_u64_m128d(b);            \
-        vreinterpretq_m128d_u64(vbslq_u64(_mask_vec, _b, _a)); \
-    })
-
-// Blend packed single-precision (32-bit) floating-point elements from a and b
-// using mask, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_blend_ps
-FORCE_INLINE __m128 _mm_blend_ps(__m128 _a, __m128 _b, const char imm8)
-{
-    const uint32_t ALIGN_STRUCT(16)
-        data[4] = {((imm8) & (1 << 0)) ? UINT32_MAX : 0,
-                   ((imm8) & (1 << 1)) ? UINT32_MAX : 0,
-                   ((imm8) & (1 << 2)) ? UINT32_MAX : 0,
-                   ((imm8) & (1 << 3)) ? UINT32_MAX : 0};
-    uint32x4_t mask = vld1q_u32(data);
-    float32x4_t a = vreinterpretq_f32_m128(_a);
-    float32x4_t b = vreinterpretq_f32_m128(_b);
-    return vreinterpretq_m128_f32(vbslq_f32(mask, b, a));
-}
-
-// Blend packed 8-bit integers from a and b using mask, and store the results in
-// dst.
-//
-//   FOR j := 0 to 15
-//       i := j*8
-//       IF mask[i+7]
-//           dst[i+7:i] := b[i+7:i]
-//       ELSE
-//           dst[i+7:i] := a[i+7:i]
-//       FI
-//   ENDFOR
-FORCE_INLINE __m128i _mm_blendv_epi8(__m128i _a, __m128i _b, __m128i _mask)
-{
-    // Use a signed shift right to create a mask with the sign bit
-    uint8x16_t mask =
-        vreinterpretq_u8_s8(vshrq_n_s8(vreinterpretq_s8_m128i(_mask), 7));
-    uint8x16_t a = vreinterpretq_u8_m128i(_a);
-    uint8x16_t b = vreinterpretq_u8_m128i(_b);
-    return vreinterpretq_m128i_u8(vbslq_u8(mask, b, a));
-}
-
-// Blend packed double-precision (64-bit) floating-point elements from a and b
-// using mask, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_blendv_pd
-FORCE_INLINE __m128d _mm_blendv_pd(__m128d _a, __m128d _b, __m128d _mask)
-{
-    uint64x2_t mask =
-        vreinterpretq_u64_s64(vshrq_n_s64(vreinterpretq_s64_m128d(_mask), 63));
-#if defined(__aarch64__)
-    float64x2_t a = vreinterpretq_f64_m128d(_a);
-    float64x2_t b = vreinterpretq_f64_m128d(_b);
-    return vreinterpretq_m128d_f64(vbslq_f64(mask, b, a));
-#else
-    uint64x2_t a = vreinterpretq_u64_m128d(_a);
-    uint64x2_t b = vreinterpretq_u64_m128d(_b);
-    return vreinterpretq_m128d_u64(vbslq_u64(mask, b, a));
-#endif
-}
-
-// Blend packed single-precision (32-bit) floating-point elements from a and b
-// using mask, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_blendv_ps
-FORCE_INLINE __m128 _mm_blendv_ps(__m128 _a, __m128 _b, __m128 _mask)
-{
-    // Use a signed shift right to create a mask with the sign bit
-    uint32x4_t mask =
-        vreinterpretq_u32_s32(vshrq_n_s32(vreinterpretq_s32_m128(_mask), 31));
-    float32x4_t a = vreinterpretq_f32_m128(_a);
-    float32x4_t b = vreinterpretq_f32_m128(_b);
-    return vreinterpretq_m128_f32(vbslq_f32(mask, b, a));
-}
-
-// Round the packed double-precision (64-bit) floating-point elements in a up
-// to an integer value, and store the results as packed double-precision
-// floating-point elements in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_ceil_pd
-FORCE_INLINE __m128d _mm_ceil_pd(__m128d a)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(vrndpq_f64(vreinterpretq_f64_m128d(a)));
-#else
-    double *f = (double *) &a;
-    return _mm_set_pd(ceil(f[1]), ceil(f[0]));
-#endif
-}
-
-// Round the packed single-precision (32-bit) floating-point elements in a up to
-// an integer value, and store the results as packed single-precision
-// floating-point elements in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_ceil_ps
-FORCE_INLINE __m128 _mm_ceil_ps(__m128 a)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128_f32(vrndpq_f32(vreinterpretq_f32_m128(a)));
-#else
-    float *f = (float *) &a;
-    return _mm_set_ps(ceilf(f[3]), ceilf(f[2]), ceilf(f[1]), ceilf(f[0]));
-#endif
-}
-
-// Round the lower double-precision (64-bit) floating-point element in b up to
-// an integer value, store the result as a double-precision floating-point
-// element in the lower element of dst, and copy the upper element from a to the
-// upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_ceil_sd
-FORCE_INLINE __m128d _mm_ceil_sd(__m128d a, __m128d b)
-{
-    return _mm_move_sd(a, _mm_ceil_pd(b));
-}
-
-// Round the lower single-precision (32-bit) floating-point element in b up to
-// an integer value, store the result as a single-precision floating-point
-// element in the lower element of dst, and copy the upper 3 packed elements
-// from a to the upper elements of dst.
-//
-//   dst[31:0] := CEIL(b[31:0])
-//   dst[127:32] := a[127:32]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_ceil_ss
-FORCE_INLINE __m128 _mm_ceil_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_ceil_ps(b));
-}
-
-// Compare packed 64-bit integers in a and b for equality, and store the results
-// in dst
-FORCE_INLINE __m128i _mm_cmpeq_epi64(__m128i a, __m128i b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128i_u64(
-        vceqq_u64(vreinterpretq_u64_m128i(a), vreinterpretq_u64_m128i(b)));
-#else
-    // ARMv7 lacks vceqq_u64
-    // (a == b) -> (a_lo == b_lo) && (a_hi == b_hi)
-    uint32x4_t cmp =
-        vceqq_u32(vreinterpretq_u32_m128i(a), vreinterpretq_u32_m128i(b));
-    uint32x4_t swapped = vrev64q_u32(cmp);
-    return vreinterpretq_m128i_u32(vandq_u32(cmp, swapped));
-#endif
-}
-
-// Converts the four signed 16-bit integers in the lower 64 bits to four signed
-// 32-bit integers.
-FORCE_INLINE __m128i _mm_cvtepi16_epi32(__m128i a)
-{
-    return vreinterpretq_m128i_s32(
-        vmovl_s16(vget_low_s16(vreinterpretq_s16_m128i(a))));
-}
-
-// Converts the two signed 16-bit integers in the lower 32 bits two signed
-// 32-bit integers.
-FORCE_INLINE __m128i _mm_cvtepi16_epi64(__m128i a)
-{
-    int16x8_t s16x8 = vreinterpretq_s16_m128i(a);     /* xxxx xxxx xxxx 0B0A */
-    int32x4_t s32x4 = vmovl_s16(vget_low_s16(s16x8)); /* 000x 000x 000B 000A */
-    int64x2_t s64x2 = vmovl_s32(vget_low_s32(s32x4)); /* 0000 000B 0000 000A */
-    return vreinterpretq_m128i_s64(s64x2);
-}
-
-// Converts the two signed 32-bit integers in the lower 64 bits to two signed
-// 64-bit integers.
-FORCE_INLINE __m128i _mm_cvtepi32_epi64(__m128i a)
-{
-    return vreinterpretq_m128i_s64(
-        vmovl_s32(vget_low_s32(vreinterpretq_s32_m128i(a))));
-}
-
-// Converts the four unsigned 8-bit integers in the lower 16 bits to four
-// unsigned 32-bit integers.
-FORCE_INLINE __m128i _mm_cvtepi8_epi16(__m128i a)
-{
-    int8x16_t s8x16 = vreinterpretq_s8_m128i(a);    /* xxxx xxxx xxxx DCBA */
-    int16x8_t s16x8 = vmovl_s8(vget_low_s8(s8x16)); /* 0x0x 0x0x 0D0C 0B0A */
-    return vreinterpretq_m128i_s16(s16x8);
-}
-
-// Converts the four unsigned 8-bit integers in the lower 32 bits to four
-// unsigned 32-bit integers.
-FORCE_INLINE __m128i _mm_cvtepi8_epi32(__m128i a)
-{
-    int8x16_t s8x16 = vreinterpretq_s8_m128i(a);      /* xxxx xxxx xxxx DCBA */
-    int16x8_t s16x8 = vmovl_s8(vget_low_s8(s8x16));   /* 0x0x 0x0x 0D0C 0B0A */
-    int32x4_t s32x4 = vmovl_s16(vget_low_s16(s16x8)); /* 000D 000C 000B 000A */
-    return vreinterpretq_m128i_s32(s32x4);
-}
-
-// Converts the two signed 8-bit integers in the lower 32 bits to four
-// signed 64-bit integers.
-FORCE_INLINE __m128i _mm_cvtepi8_epi64(__m128i a)
-{
-    int8x16_t s8x16 = vreinterpretq_s8_m128i(a);      /* xxxx xxxx xxxx xxBA */
-    int16x8_t s16x8 = vmovl_s8(vget_low_s8(s8x16));   /* 0x0x 0x0x 0x0x 0B0A */
-    int32x4_t s32x4 = vmovl_s16(vget_low_s16(s16x8)); /* 000x 000x 000B 000A */
-    int64x2_t s64x2 = vmovl_s32(vget_low_s32(s32x4)); /* 0000 000B 0000 000A */
-    return vreinterpretq_m128i_s64(s64x2);
-}
-
-// Converts the four unsigned 16-bit integers in the lower 64 bits to four
-// unsigned 32-bit integers.
-FORCE_INLINE __m128i _mm_cvtepu16_epi32(__m128i a)
-{
-    return vreinterpretq_m128i_u32(
-        vmovl_u16(vget_low_u16(vreinterpretq_u16_m128i(a))));
-}
-
-// Converts the two unsigned 16-bit integers in the lower 32 bits to two
-// unsigned 64-bit integers.
-FORCE_INLINE __m128i _mm_cvtepu16_epi64(__m128i a)
-{
-    uint16x8_t u16x8 = vreinterpretq_u16_m128i(a);     /* xxxx xxxx xxxx 0B0A */
-    uint32x4_t u32x4 = vmovl_u16(vget_low_u16(u16x8)); /* 000x 000x 000B 000A */
-    uint64x2_t u64x2 = vmovl_u32(vget_low_u32(u32x4)); /* 0000 000B 0000 000A */
-    return vreinterpretq_m128i_u64(u64x2);
-}
-
-// Converts the two unsigned 32-bit integers in the lower 64 bits to two
-// unsigned 64-bit integers.
-FORCE_INLINE __m128i _mm_cvtepu32_epi64(__m128i a)
-{
-    return vreinterpretq_m128i_u64(
-        vmovl_u32(vget_low_u32(vreinterpretq_u32_m128i(a))));
-}
-
-// Zero extend packed unsigned 8-bit integers in a to packed 16-bit integers,
-// and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_cvtepu8_epi16
-FORCE_INLINE __m128i _mm_cvtepu8_epi16(__m128i a)
-{
-    uint8x16_t u8x16 = vreinterpretq_u8_m128i(a);    /* xxxx xxxx HGFE DCBA */
-    uint16x8_t u16x8 = vmovl_u8(vget_low_u8(u8x16)); /* 0H0G 0F0E 0D0C 0B0A */
-    return vreinterpretq_m128i_u16(u16x8);
-}
-
-// Converts the four unsigned 8-bit integers in the lower 32 bits to four
-// unsigned 32-bit integers.
-// https://msdn.microsoft.com/en-us/library/bb531467%28v=vs.100%29.aspx
-FORCE_INLINE __m128i _mm_cvtepu8_epi32(__m128i a)
-{
-    uint8x16_t u8x16 = vreinterpretq_u8_m128i(a);      /* xxxx xxxx xxxx DCBA */
-    uint16x8_t u16x8 = vmovl_u8(vget_low_u8(u8x16));   /* 0x0x 0x0x 0D0C 0B0A */
-    uint32x4_t u32x4 = vmovl_u16(vget_low_u16(u16x8)); /* 000D 000C 000B 000A */
-    return vreinterpretq_m128i_u32(u32x4);
-}
-
-// Converts the two unsigned 8-bit integers in the lower 16 bits to two
-// unsigned 64-bit integers.
-FORCE_INLINE __m128i _mm_cvtepu8_epi64(__m128i a)
-{
-    uint8x16_t u8x16 = vreinterpretq_u8_m128i(a);      /* xxxx xxxx xxxx xxBA */
-    uint16x8_t u16x8 = vmovl_u8(vget_low_u8(u8x16));   /* 0x0x 0x0x 0x0x 0B0A */
-    uint32x4_t u32x4 = vmovl_u16(vget_low_u16(u16x8)); /* 000x 000x 000B 000A */
-    uint64x2_t u64x2 = vmovl_u32(vget_low_u32(u32x4)); /* 0000 000B 0000 000A */
-    return vreinterpretq_m128i_u64(u64x2);
-}
-
-// Conditionally multiply the packed double-precision (64-bit) floating-point
-// elements in a and b using the high 4 bits in imm8, sum the four products, and
-// conditionally store the sum in dst using the low 4 bits of imm8.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_dp_pd
-FORCE_INLINE __m128d _mm_dp_pd(__m128d a, __m128d b, const int imm)
-{
-    // Generate mask value from constant immediate bit value
-    const int64_t bit0Mask = imm & 0x01 ? UINT64_MAX : 0;
-    const int64_t bit1Mask = imm & 0x02 ? UINT64_MAX : 0;
-#if !SSE2NEON_PRECISE_DP
-    const int64_t bit4Mask = imm & 0x10 ? UINT64_MAX : 0;
-    const int64_t bit5Mask = imm & 0x20 ? UINT64_MAX : 0;
-#endif
-    // Conditional multiplication
-#if !SSE2NEON_PRECISE_DP
-    __m128d mul = _mm_mul_pd(a, b);
-    const __m128d mulMask =
-        _mm_castsi128_pd(_mm_set_epi64x(bit5Mask, bit4Mask));
-    __m128d tmp = _mm_and_pd(mul, mulMask);
-#else
-#if defined(__aarch64__)
-    double d0 = (imm & 0x10) ? vgetq_lane_f64(vreinterpretq_f64_m128d(a), 0) *
-                                   vgetq_lane_f64(vreinterpretq_f64_m128d(b), 0)
-                             : 0;
-    double d1 = (imm & 0x20) ? vgetq_lane_f64(vreinterpretq_f64_m128d(a), 1) *
-                                   vgetq_lane_f64(vreinterpretq_f64_m128d(b), 1)
-                             : 0;
-#else
-    double d0 = (imm & 0x10) ? ((double *) &a)[0] * ((double *) &b)[0] : 0;
-    double d1 = (imm & 0x20) ? ((double *) &a)[1] * ((double *) &b)[1] : 0;
-#endif
-    __m128d tmp = _mm_set_pd(d1, d0);
-#endif
-    // Sum the products
-#if defined(__aarch64__)
-    double sum = vpaddd_f64(vreinterpretq_f64_m128d(tmp));
-#else
-    double sum = *((double *) &tmp) + *(((double *) &tmp) + 1);
-#endif
-    // Conditionally store the sum
-    const __m128d sumMask =
-        _mm_castsi128_pd(_mm_set_epi64x(bit1Mask, bit0Mask));
-    __m128d res = _mm_and_pd(_mm_set_pd1(sum), sumMask);
-    return res;
-}
-
-// Conditionally multiply the packed single-precision (32-bit) floating-point
-// elements in a and b using the high 4 bits in imm8, sum the four products,
-// and conditionally store the sum in dst using the low 4 bits of imm.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_dp_ps
-FORCE_INLINE __m128 _mm_dp_ps(__m128 a, __m128 b, const int imm)
-{
-#if defined(__aarch64__)
-    /* shortcuts */
-    if (imm == 0xFF) {
-        return _mm_set1_ps(vaddvq_f32(_mm_mul_ps(a, b)));
-    }
-    if (imm == 0x7F) {
-        float32x4_t m = _mm_mul_ps(a, b);
-        m[3] = 0;
-        return _mm_set1_ps(vaddvq_f32(m));
-    }
-#endif
-
-    float s = 0, c = 0;
-    float32x4_t f32a = vreinterpretq_f32_m128(a);
-    float32x4_t f32b = vreinterpretq_f32_m128(b);
-
-    /* To improve the accuracy of floating-point summation, Kahan algorithm
-     * is used for each operation.
-     */
-    if (imm & (1 << 4))
-        _sse2neon_kadd_f32(&s, &c, f32a[0] * f32b[0]);
-    if (imm & (1 << 5))
-        _sse2neon_kadd_f32(&s, &c, f32a[1] * f32b[1]);
-    if (imm & (1 << 6))
-        _sse2neon_kadd_f32(&s, &c, f32a[2] * f32b[2]);
-    if (imm & (1 << 7))
-        _sse2neon_kadd_f32(&s, &c, f32a[3] * f32b[3]);
-    s += c;
-
-    float32x4_t res = {
-        (imm & 0x1) ? s : 0,
-        (imm & 0x2) ? s : 0,
-        (imm & 0x4) ? s : 0,
-        (imm & 0x8) ? s : 0,
-    };
-    return vreinterpretq_m128_f32(res);
-}
-
-// Extracts the selected signed or unsigned 32-bit integer from a and zero
-// extends.
-// FORCE_INLINE int _mm_extract_epi32(__m128i a, __constrange(0,4) int imm)
-#define _mm_extract_epi32(a, imm) \
-    vgetq_lane_s32(vreinterpretq_s32_m128i(a), (imm))
-
-// Extracts the selected signed or unsigned 64-bit integer from a and zero
-// extends.
-// FORCE_INLINE __int64 _mm_extract_epi64(__m128i a, __constrange(0,2) int imm)
-#define _mm_extract_epi64(a, imm) \
-    vgetq_lane_s64(vreinterpretq_s64_m128i(a), (imm))
-
-// Extracts the selected signed or unsigned 8-bit integer from a and zero
-// extends.
-// FORCE_INLINE int _mm_extract_epi8(__m128i a, __constrange(0,16) int imm)
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_extract_epi8
-#define _mm_extract_epi8(a, imm) vgetq_lane_u8(vreinterpretq_u8_m128i(a), (imm))
-
-// Extracts the selected single-precision (32-bit) floating-point from a.
-// FORCE_INLINE int _mm_extract_ps(__m128 a, __constrange(0,4) int imm)
-#define _mm_extract_ps(a, imm) vgetq_lane_s32(vreinterpretq_s32_m128(a), (imm))
-
-// Round the packed double-precision (64-bit) floating-point elements in a down
-// to an integer value, and store the results as packed double-precision
-// floating-point elements in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_floor_pd
-FORCE_INLINE __m128d _mm_floor_pd(__m128d a)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128d_f64(vrndmq_f64(vreinterpretq_f64_m128d(a)));
-#else
-    double *f = (double *) &a;
-    return _mm_set_pd(floor(f[1]), floor(f[0]));
-#endif
-}
-
-// Round the packed single-precision (32-bit) floating-point elements in a down
-// to an integer value, and store the results as packed single-precision
-// floating-point elements in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_floor_ps
-FORCE_INLINE __m128 _mm_floor_ps(__m128 a)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128_f32(vrndmq_f32(vreinterpretq_f32_m128(a)));
-#else
-    float *f = (float *) &a;
-    return _mm_set_ps(floorf(f[3]), floorf(f[2]), floorf(f[1]), floorf(f[0]));
-#endif
-}
-
-// Round the lower double-precision (64-bit) floating-point element in b down to
-// an integer value, store the result as a double-precision floating-point
-// element in the lower element of dst, and copy the upper element from a to the
-// upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_floor_sd
-FORCE_INLINE __m128d _mm_floor_sd(__m128d a, __m128d b)
-{
-    return _mm_move_sd(a, _mm_floor_pd(b));
-}
-
-// Round the lower single-precision (32-bit) floating-point element in b down to
-// an integer value, store the result as a single-precision floating-point
-// element in the lower element of dst, and copy the upper 3 packed elements
-// from a to the upper elements of dst.
-//
-//   dst[31:0] := FLOOR(b[31:0])
-//   dst[127:32] := a[127:32]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_floor_ss
-FORCE_INLINE __m128 _mm_floor_ss(__m128 a, __m128 b)
-{
-    return _mm_move_ss(a, _mm_floor_ps(b));
-}
-
-// Inserts the least significant 32 bits of b into the selected 32-bit integer
-// of a.
-// FORCE_INLINE __m128i _mm_insert_epi32(__m128i a, int b,
-//                                       __constrange(0,4) int imm)
-#define _mm_insert_epi32(a, b, imm)                                  \
-    __extension__({                                                  \
-        vreinterpretq_m128i_s32(                                     \
-            vsetq_lane_s32((b), vreinterpretq_s32_m128i(a), (imm))); \
-    })
-
-// Inserts the least significant 64 bits of b into the selected 64-bit integer
-// of a.
-// FORCE_INLINE __m128i _mm_insert_epi64(__m128i a, __int64 b,
-//                                       __constrange(0,2) int imm)
-#define _mm_insert_epi64(a, b, imm)                                  \
-    __extension__({                                                  \
-        vreinterpretq_m128i_s64(                                     \
-            vsetq_lane_s64((b), vreinterpretq_s64_m128i(a), (imm))); \
-    })
-
-// Inserts the least significant 8 bits of b into the selected 8-bit integer
-// of a.
-// FORCE_INLINE __m128i _mm_insert_epi8(__m128i a, int b,
-//                                      __constrange(0,16) int imm)
-#define _mm_insert_epi8(a, b, imm)                                 \
-    __extension__({                                                \
-        vreinterpretq_m128i_s8(                                    \
-            vsetq_lane_s8((b), vreinterpretq_s8_m128i(a), (imm))); \
-    })
-
-// Copy a to tmp, then insert a single-precision (32-bit) floating-point
-// element from b into tmp using the control in imm8. Store tmp to dst using
-// the mask in imm8 (elements are zeroed out when the corresponding bit is set).
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=insert_ps
-#define _mm_insert_ps(a, b, imm8)                                              \
-    __extension__({                                                            \
-        float32x4_t tmp1 =                                                     \
-            vsetq_lane_f32(vgetq_lane_f32(b, (imm8 >> 6) & 0x3),               \
-                           vreinterpretq_f32_m128(a), 0);                      \
-        float32x4_t tmp2 =                                                     \
-            vsetq_lane_f32(vgetq_lane_f32(tmp1, 0), vreinterpretq_f32_m128(a), \
-                           ((imm8 >> 4) & 0x3));                               \
-        const uint32_t data[4] = {((imm8) & (1 << 0)) ? UINT32_MAX : 0,        \
-                                  ((imm8) & (1 << 1)) ? UINT32_MAX : 0,        \
-                                  ((imm8) & (1 << 2)) ? UINT32_MAX : 0,        \
-                                  ((imm8) & (1 << 3)) ? UINT32_MAX : 0};       \
-        uint32x4_t mask = vld1q_u32(data);                                     \
-        float32x4_t all_zeros = vdupq_n_f32(0);                                \
-                                                                               \
-        vreinterpretq_m128_f32(                                                \
-            vbslq_f32(mask, all_zeros, vreinterpretq_f32_m128(tmp2)));         \
-    })
-
-// epi versions of min/max
-// Computes the pariwise maximums of the four signed 32-bit integer values of a
-// and b.
-//
-// A 128-bit parameter that can be defined with the following equations:
-//   r0 := (a0 > b0) ? a0 : b0
-//   r1 := (a1 > b1) ? a1 : b1
-//   r2 := (a2 > b2) ? a2 : b2
-//   r3 := (a3 > b3) ? a3 : b3
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/bb514055(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_max_epi32(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s32(
-        vmaxq_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(b)));
-}
-
-// Compare packed signed 8-bit integers in a and b, and store packed maximum
-// values in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_max_epi8
-FORCE_INLINE __m128i _mm_max_epi8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s8(
-        vmaxq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
-}
-
-// Compare packed unsigned 16-bit integers in a and b, and store packed maximum
-// values in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_max_epu16
-FORCE_INLINE __m128i _mm_max_epu16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u16(
-        vmaxq_u16(vreinterpretq_u16_m128i(a), vreinterpretq_u16_m128i(b)));
-}
-
-// Compare packed unsigned 32-bit integers in a and b, and store packed maximum
-// values in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_max_epu32
-FORCE_INLINE __m128i _mm_max_epu32(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u32(
-        vmaxq_u32(vreinterpretq_u32_m128i(a), vreinterpretq_u32_m128i(b)));
-}
-
-// Computes the pariwise minima of the four signed 32-bit integer values of a
-// and b.
-//
-// A 128-bit parameter that can be defined with the following equations:
-//   r0 := (a0 < b0) ? a0 : b0
-//   r1 := (a1 < b1) ? a1 : b1
-//   r2 := (a2 < b2) ? a2 : b2
-//   r3 := (a3 < b3) ? a3 : b3
-//
-// https://msdn.microsoft.com/en-us/library/vstudio/bb531476(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_min_epi32(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s32(
-        vminq_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(b)));
-}
-
-// Compare packed signed 8-bit integers in a and b, and store packed minimum
-// values in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_min_epi8
-FORCE_INLINE __m128i _mm_min_epi8(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s8(
-        vminq_s8(vreinterpretq_s8_m128i(a), vreinterpretq_s8_m128i(b)));
-}
-
-// Compare packed unsigned 16-bit integers in a and b, and store packed minimum
-// values in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_min_epu16
-FORCE_INLINE __m128i _mm_min_epu16(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u16(
-        vminq_u16(vreinterpretq_u16_m128i(a), vreinterpretq_u16_m128i(b)));
-}
-
-// Compare packed unsigned 32-bit integers in a and b, and store packed minimum
-// values in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_max_epu32
-FORCE_INLINE __m128i _mm_min_epu32(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u32(
-        vminq_u32(vreinterpretq_u32_m128i(a), vreinterpretq_u32_m128i(b)));
-}
-
-// Horizontally compute the minimum amongst the packed unsigned 16-bit integers
-// in a, store the minimum and index in dst, and zero the remaining bits in dst.
-//
-//   index[2:0] := 0
-//   min[15:0] := a[15:0]
-//   FOR j := 0 to 7
-//       i := j*16
-//       IF a[i+15:i] < min[15:0]
-//           index[2:0] := j
-//           min[15:0] := a[i+15:i]
-//       FI
-//   ENDFOR
-//   dst[15:0] := min[15:0]
-//   dst[18:16] := index[2:0]
-//   dst[127:19] := 0
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_minpos_epu16
-FORCE_INLINE __m128i _mm_minpos_epu16(__m128i a)
-{
-    __m128i dst;
-    uint16_t min, idx = 0;
-    // Find the minimum value
-#if defined(__aarch64__)
-    min = vminvq_u16(vreinterpretq_u16_m128i(a));
-#else
-    __m64 tmp;
-    tmp = vreinterpret_m64_u16(
-        vmin_u16(vget_low_u16(vreinterpretq_u16_m128i(a)),
-                 vget_high_u16(vreinterpretq_u16_m128i(a))));
-    tmp = vreinterpret_m64_u16(
-        vpmin_u16(vreinterpret_u16_m64(tmp), vreinterpret_u16_m64(tmp)));
-    tmp = vreinterpret_m64_u16(
-        vpmin_u16(vreinterpret_u16_m64(tmp), vreinterpret_u16_m64(tmp)));
-    min = vget_lane_u16(vreinterpret_u16_m64(tmp), 0);
-#endif
-    // Get the index of the minimum value
-    int i;
-    for (i = 0; i < 8; i++) {
-        if (min == vgetq_lane_u16(vreinterpretq_u16_m128i(a), 0)) {
-            idx = (uint16_t) i;
-            break;
-        }
-        a = _mm_srli_si128(a, 2);
-    }
-    // Generate result
-    dst = _mm_setzero_si128();
-    dst = vreinterpretq_m128i_u16(
-        vsetq_lane_u16(min, vreinterpretq_u16_m128i(dst), 0));
-    dst = vreinterpretq_m128i_u16(
-        vsetq_lane_u16(idx, vreinterpretq_u16_m128i(dst), 1));
-    return dst;
-}
-
-// Compute the sum of absolute differences (SADs) of quadruplets of unsigned
-// 8-bit integers in a compared to those in b, and store the 16-bit results in
-// dst. Eight SADs are performed using one quadruplet from b and eight
-// quadruplets from a. One quadruplet is selected from b starting at on the
-// offset specified in imm8. Eight quadruplets are formed from sequential 8-bit
-// integers selected from a starting at the offset specified in imm8.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_mpsadbw_epu8
-FORCE_INLINE __m128i _mm_mpsadbw_epu8(__m128i a, __m128i b, const int imm)
-{
-    uint8x16_t _a, _b;
-
-    switch (imm & 0x4) {
-    case 0:
-        // do nothing
-        _a = vreinterpretq_u8_m128i(a);
-        break;
-    case 4:
-        _a = vreinterpretq_u8_u32(vextq_u32(vreinterpretq_u32_m128i(a),
-                                            vreinterpretq_u32_m128i(a), 1));
-        break;
-    default:
-#if defined(__GNUC__) || defined(__clang__)
-        __builtin_unreachable();
-#endif
-        break;
-    }
-
-    switch (imm & 0x3) {
-    case 0:
-        _b = vreinterpretq_u8_u32(
-            vdupq_n_u32(vgetq_lane_u32(vreinterpretq_u32_m128i(b), 0)));
-        break;
-    case 1:
-        _b = vreinterpretq_u8_u32(
-            vdupq_n_u32(vgetq_lane_u32(vreinterpretq_u32_m128i(b), 1)));
-        break;
-    case 2:
-        _b = vreinterpretq_u8_u32(
-            vdupq_n_u32(vgetq_lane_u32(vreinterpretq_u32_m128i(b), 2)));
-        break;
-    case 3:
-        _b = vreinterpretq_u8_u32(
-            vdupq_n_u32(vgetq_lane_u32(vreinterpretq_u32_m128i(b), 3)));
-        break;
-    default:
-#if defined(__GNUC__) || defined(__clang__)
-        __builtin_unreachable();
-#endif
-        break;
-    }
-
-    int16x8_t c04, c15, c26, c37;
-    uint8x8_t low_b = vget_low_u8(_b);
-    c04 = vabsq_s16(vreinterpretq_s16_u16(vsubl_u8(vget_low_u8(_a), low_b)));
-    _a = vextq_u8(_a, _a, 1);
-    c15 = vabsq_s16(vreinterpretq_s16_u16(vsubl_u8(vget_low_u8(_a), low_b)));
-    _a = vextq_u8(_a, _a, 1);
-    c26 = vabsq_s16(vreinterpretq_s16_u16(vsubl_u8(vget_low_u8(_a), low_b)));
-    _a = vextq_u8(_a, _a, 1);
-    c37 = vabsq_s16(vreinterpretq_s16_u16(vsubl_u8(vget_low_u8(_a), low_b)));
-#if defined(__aarch64__)
-    // |0|4|2|6|
-    c04 = vpaddq_s16(c04, c26);
-    // |1|5|3|7|
-    c15 = vpaddq_s16(c15, c37);
-
-    int32x4_t trn1_c =
-        vtrn1q_s32(vreinterpretq_s32_s16(c04), vreinterpretq_s32_s16(c15));
-    int32x4_t trn2_c =
-        vtrn2q_s32(vreinterpretq_s32_s16(c04), vreinterpretq_s32_s16(c15));
-    return vreinterpretq_m128i_s16(vpaddq_s16(vreinterpretq_s16_s32(trn1_c),
-                                              vreinterpretq_s16_s32(trn2_c)));
-#else
-    int16x4_t c01, c23, c45, c67;
-    c01 = vpadd_s16(vget_low_s16(c04), vget_low_s16(c15));
-    c23 = vpadd_s16(vget_low_s16(c26), vget_low_s16(c37));
-    c45 = vpadd_s16(vget_high_s16(c04), vget_high_s16(c15));
-    c67 = vpadd_s16(vget_high_s16(c26), vget_high_s16(c37));
-
-    return vreinterpretq_m128i_s16(
-        vcombine_s16(vpadd_s16(c01, c23), vpadd_s16(c45, c67)));
-#endif
-}
-
-// Multiply the low signed 32-bit integers from each packed 64-bit element in
-// a and b, and store the signed 64-bit results in dst.
-//
-//   r0 :=  (int64_t)(int32_t)a0 * (int64_t)(int32_t)b0
-//   r1 :=  (int64_t)(int32_t)a2 * (int64_t)(int32_t)b2
-FORCE_INLINE __m128i _mm_mul_epi32(__m128i a, __m128i b)
-{
-    // vmull_s32 upcasts instead of masking, so we downcast.
-    int32x2_t a_lo = vmovn_s64(vreinterpretq_s64_m128i(a));
-    int32x2_t b_lo = vmovn_s64(vreinterpretq_s64_m128i(b));
-    return vreinterpretq_m128i_s64(vmull_s32(a_lo, b_lo));
-}
-
-// Multiplies the 4 signed or unsigned 32-bit integers from a by the 4 signed or
-// unsigned 32-bit integers from b.
-// https://msdn.microsoft.com/en-us/library/vstudio/bb531409(v=vs.100).aspx
-FORCE_INLINE __m128i _mm_mullo_epi32(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_s32(
-        vmulq_s32(vreinterpretq_s32_m128i(a), vreinterpretq_s32_m128i(b)));
-}
-
-// Packs the 8 unsigned 32-bit integers from a and b into unsigned 16-bit
-// integers and saturates.
-//
-//   r0 := UnsignedSaturate(a0)
-//   r1 := UnsignedSaturate(a1)
-//   r2 := UnsignedSaturate(a2)
-//   r3 := UnsignedSaturate(a3)
-//   r4 := UnsignedSaturate(b0)
-//   r5 := UnsignedSaturate(b1)
-//   r6 := UnsignedSaturate(b2)
-//   r7 := UnsignedSaturate(b3)
-FORCE_INLINE __m128i _mm_packus_epi32(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u16(
-        vcombine_u16(vqmovun_s32(vreinterpretq_s32_m128i(a)),
-                     vqmovun_s32(vreinterpretq_s32_m128i(b))));
-}
-
-// Round the packed double-precision (64-bit) floating-point elements in a using
-// the rounding parameter, and store the results as packed double-precision
-// floating-point elements in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_round_pd
-FORCE_INLINE __m128d _mm_round_pd(__m128d a, int rounding)
-{
-#if defined(__aarch64__)
-    switch (rounding) {
-    case (_MM_FROUND_TO_NEAREST_INT | _MM_FROUND_NO_EXC):
-        return vreinterpretq_m128d_f64(vrndnq_f64(vreinterpretq_f64_m128d(a)));
-    case (_MM_FROUND_TO_NEG_INF | _MM_FROUND_NO_EXC):
-        return _mm_floor_pd(a);
-    case (_MM_FROUND_TO_POS_INF | _MM_FROUND_NO_EXC):
-        return _mm_ceil_pd(a);
-    case (_MM_FROUND_TO_ZERO | _MM_FROUND_NO_EXC):
-        return vreinterpretq_m128d_f64(vrndq_f64(vreinterpretq_f64_m128d(a)));
-    default:  //_MM_FROUND_CUR_DIRECTION
-        return vreinterpretq_m128d_f64(vrndiq_f64(vreinterpretq_f64_m128d(a)));
-    }
-#else
-    double *v_double = (double *) &a;
-
-    if (rounding == (_MM_FROUND_TO_NEAREST_INT | _MM_FROUND_NO_EXC) ||
-        (rounding == _MM_FROUND_CUR_DIRECTION &&
-         _MM_GET_ROUNDING_MODE() == _MM_ROUND_NEAREST)) {
-        double res[2], tmp;
-        for (int i = 0; i < 2; i++) {
-            tmp = (v_double[i] < 0) ? -v_double[i] : v_double[i];
-            double roundDown = floor(tmp);  // Round down value
-            double roundUp = ceil(tmp);     // Round up value
-            double diffDown = tmp - roundDown;
-            double diffUp = roundUp - tmp;
-            if (diffDown < diffUp) {
-                /* If it's closer to the round down value, then use it */
-                res[i] = roundDown;
-            } else if (diffDown > diffUp) {
-                /* If it's closer to the round up value, then use it */
-                res[i] = roundUp;
-            } else {
-                /* If it's equidistant between round up and round down value,
-                 * pick the one which is an even number */
-                double half = roundDown / 2;
-                if (half != floor(half)) {
-                    /* If the round down value is odd, return the round up value
-                     */
-                    res[i] = roundUp;
-                } else {
-                    /* If the round up value is odd, return the round down value
-                     */
-                    res[i] = roundDown;
-                }
-            }
-            res[i] = (v_double[i] < 0) ? -res[i] : res[i];
-        }
-        return _mm_set_pd(res[1], res[0]);
-    } else if (rounding == (_MM_FROUND_TO_NEG_INF | _MM_FROUND_NO_EXC) ||
-               (rounding == _MM_FROUND_CUR_DIRECTION &&
-                _MM_GET_ROUNDING_MODE() == _MM_ROUND_DOWN)) {
-        return _mm_floor_pd(a);
-    } else if (rounding == (_MM_FROUND_TO_POS_INF | _MM_FROUND_NO_EXC) ||
-               (rounding == _MM_FROUND_CUR_DIRECTION &&
-                _MM_GET_ROUNDING_MODE() == _MM_ROUND_UP)) {
-        return _mm_ceil_pd(a);
-    }
-    return _mm_set_pd(v_double[1] > 0 ? floor(v_double[1]) : ceil(v_double[1]),
-                      v_double[0] > 0 ? floor(v_double[0]) : ceil(v_double[0]));
-#endif
-}
-
-// Round the packed single-precision (32-bit) floating-point elements in a using
-// the rounding parameter, and store the results as packed single-precision
-// floating-point elements in dst.
-// software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_round_ps
-FORCE_INLINE __m128 _mm_round_ps(__m128 a, int rounding)
-{
-#if defined(__aarch64__)
-    switch (rounding) {
-    case (_MM_FROUND_TO_NEAREST_INT | _MM_FROUND_NO_EXC):
-        return vreinterpretq_m128_f32(vrndnq_f32(vreinterpretq_f32_m128(a)));
-    case (_MM_FROUND_TO_NEG_INF | _MM_FROUND_NO_EXC):
-        return _mm_floor_ps(a);
-    case (_MM_FROUND_TO_POS_INF | _MM_FROUND_NO_EXC):
-        return _mm_ceil_ps(a);
-    case (_MM_FROUND_TO_ZERO | _MM_FROUND_NO_EXC):
-        return vreinterpretq_m128_f32(vrndq_f32(vreinterpretq_f32_m128(a)));
-    default:  //_MM_FROUND_CUR_DIRECTION
-        return vreinterpretq_m128_f32(vrndiq_f32(vreinterpretq_f32_m128(a)));
-    }
-#else
-    float *v_float = (float *) &a;
-
-    if (rounding == (_MM_FROUND_TO_NEAREST_INT | _MM_FROUND_NO_EXC) ||
-        (rounding == _MM_FROUND_CUR_DIRECTION &&
-         _MM_GET_ROUNDING_MODE() == _MM_ROUND_NEAREST)) {
-        uint32x4_t signmask = vdupq_n_u32(0x80000000);
-        float32x4_t half = vbslq_f32(signmask, vreinterpretq_f32_m128(a),
-                                     vdupq_n_f32(0.5f)); /* +/- 0.5 */
-        int32x4_t r_normal = vcvtq_s32_f32(vaddq_f32(
-            vreinterpretq_f32_m128(a), half)); /* round to integer: [a + 0.5]*/
-        int32x4_t r_trunc = vcvtq_s32_f32(
-            vreinterpretq_f32_m128(a)); /* truncate to integer: [a] */
-        int32x4_t plusone = vreinterpretq_s32_u32(vshrq_n_u32(
-            vreinterpretq_u32_s32(vnegq_s32(r_trunc)), 31)); /* 1 or 0 */
-        int32x4_t r_even = vbicq_s32(vaddq_s32(r_trunc, plusone),
-                                     vdupq_n_s32(1)); /* ([a] + {0,1}) & ~1 */
-        float32x4_t delta = vsubq_f32(
-            vreinterpretq_f32_m128(a),
-            vcvtq_f32_s32(r_trunc)); /* compute delta: delta = (a - [a]) */
-        uint32x4_t is_delta_half =
-            vceqq_f32(delta, half); /* delta == +/- 0.5 */
-        return vreinterpretq_m128_f32(
-            vcvtq_f32_s32(vbslq_s32(is_delta_half, r_even, r_normal)));
-    } else if (rounding == (_MM_FROUND_TO_NEG_INF | _MM_FROUND_NO_EXC) ||
-               (rounding == _MM_FROUND_CUR_DIRECTION &&
-                _MM_GET_ROUNDING_MODE() == _MM_ROUND_DOWN)) {
-        return _mm_floor_ps(a);
-    } else if (rounding == (_MM_FROUND_TO_POS_INF | _MM_FROUND_NO_EXC) ||
-               (rounding == _MM_FROUND_CUR_DIRECTION &&
-                _MM_GET_ROUNDING_MODE() == _MM_ROUND_UP)) {
-        return _mm_ceil_ps(a);
-    }
-    return _mm_set_ps(v_float[3] > 0 ? floorf(v_float[3]) : ceilf(v_float[3]),
-                      v_float[2] > 0 ? floorf(v_float[2]) : ceilf(v_float[2]),
-                      v_float[1] > 0 ? floorf(v_float[1]) : ceilf(v_float[1]),
-                      v_float[0] > 0 ? floorf(v_float[0]) : ceilf(v_float[0]));
-#endif
-}
-
-// Round the lower double-precision (64-bit) floating-point element in b using
-// the rounding parameter, store the result as a double-precision floating-point
-// element in the lower element of dst, and copy the upper element from a to the
-// upper element of dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_round_sd
-FORCE_INLINE __m128d _mm_round_sd(__m128d a, __m128d b, int rounding)
-{
-    return _mm_move_sd(a, _mm_round_pd(b, rounding));
-}
-
-// Round the lower single-precision (32-bit) floating-point element in b using
-// the rounding parameter, store the result as a single-precision floating-point
-// element in the lower element of dst, and copy the upper 3 packed elements
-// from a to the upper elements of dst. Rounding is done according to the
-// rounding[3:0] parameter, which can be one of:
-//     (_MM_FROUND_TO_NEAREST_INT |_MM_FROUND_NO_EXC) // round to nearest, and
-//     suppress exceptions
-//     (_MM_FROUND_TO_NEG_INF |_MM_FROUND_NO_EXC)     // round down, and
-//     suppress exceptions
-//     (_MM_FROUND_TO_POS_INF |_MM_FROUND_NO_EXC)     // round up, and suppress
-//     exceptions
-//     (_MM_FROUND_TO_ZERO |_MM_FROUND_NO_EXC)        // truncate, and suppress
-//     exceptions _MM_FROUND_CUR_DIRECTION // use MXCSR.RC; see
-//     _MM_SET_ROUNDING_MODE
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_round_ss
-FORCE_INLINE __m128 _mm_round_ss(__m128 a, __m128 b, int rounding)
-{
-    return _mm_move_ss(a, _mm_round_ps(b, rounding));
-}
-
-// Load 128-bits of integer data from memory into dst using a non-temporal
-// memory hint. mem_addr must be aligned on a 16-byte boundary or a
-// general-protection exception may be generated.
-//
-//   dst[127:0] := MEM[mem_addr+127:mem_addr]
-//
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_stream_load_si128
-FORCE_INLINE __m128i _mm_stream_load_si128(__m128i *p)
-{
-#if __has_builtin(__builtin_nontemporal_store)
-    return __builtin_nontemporal_load(p);
-#else
-    return vreinterpretq_m128i_s64(vld1q_s64((int64_t *) p));
-#endif
-}
-
-// Compute the bitwise NOT of a and then AND with a 128-bit vector containing
-// all 1's, and return 1 if the result is zero, otherwise return 0.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_test_all_ones
-FORCE_INLINE int _mm_test_all_ones(__m128i a)
-{
-    return (uint64_t)(vgetq_lane_s64(a, 0) & vgetq_lane_s64(a, 1)) ==
-           ~(uint64_t) 0;
-}
-
-// Compute the bitwise AND of 128 bits (representing integer data) in a and
-// mask, and return 1 if the result is zero, otherwise return 0.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_test_all_zeros
-FORCE_INLINE int _mm_test_all_zeros(__m128i a, __m128i mask)
-{
-    int64x2_t a_and_mask =
-        vandq_s64(vreinterpretq_s64_m128i(a), vreinterpretq_s64_m128i(mask));
-    return !(vgetq_lane_s64(a_and_mask, 0) | vgetq_lane_s64(a_and_mask, 1));
-}
-
-// Compute the bitwise AND of 128 bits (representing integer data) in a and
-// mask, and set ZF to 1 if the result is zero, otherwise set ZF to 0. Compute
-// the bitwise NOT of a and then AND with mask, and set CF to 1 if the result is
-// zero, otherwise set CF to 0. Return 1 if both the ZF and CF values are zero,
-// otherwise return 0.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=mm_test_mix_ones_zero
-FORCE_INLINE int _mm_test_mix_ones_zeros(__m128i a, __m128i mask)
-{
-    uint64x2_t zf =
-        vandq_u64(vreinterpretq_u64_m128i(mask), vreinterpretq_u64_m128i(a));
-    uint64x2_t cf =
-        vbicq_u64(vreinterpretq_u64_m128i(mask), vreinterpretq_u64_m128i(a));
-    uint64x2_t result = vandq_u64(zf, cf);
-    return !(vgetq_lane_u64(result, 0) | vgetq_lane_u64(result, 1));
-}
-
-// Compute the bitwise AND of 128 bits (representing integer data) in a and b,
-// and set ZF to 1 if the result is zero, otherwise set ZF to 0. Compute the
-// bitwise NOT of a and then AND with b, and set CF to 1 if the result is zero,
-// otherwise set CF to 0. Return the CF value.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_testc_si128
-FORCE_INLINE int _mm_testc_si128(__m128i a, __m128i b)
-{
-    int64x2_t s64 =
-        vandq_s64(vreinterpretq_s64_s32(vmvnq_s32(vreinterpretq_s32_m128i(a))),
-                  vreinterpretq_s64_m128i(b));
-    return !(vgetq_lane_s64(s64, 0) | vgetq_lane_s64(s64, 1));
-}
-
-// Compute the bitwise AND of 128 bits (representing integer data) in a and b,
-// and set ZF to 1 if the result is zero, otherwise set ZF to 0. Compute the
-// bitwise NOT of a and then AND with b, and set CF to 1 if the result is zero,
-// otherwise set CF to 0. Return 1 if both the ZF and CF values are zero,
-// otherwise return 0.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_testnzc_si128
-#define _mm_testnzc_si128(a, b) _mm_test_mix_ones_zeros(a, b)
-
-// Compute the bitwise AND of 128 bits (representing integer data) in a and b,
-// and set ZF to 1 if the result is zero, otherwise set ZF to 0. Compute the
-// bitwise NOT of a and then AND with b, and set CF to 1 if the result is zero,
-// otherwise set CF to 0. Return the ZF value.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_testz_si128
-FORCE_INLINE int _mm_testz_si128(__m128i a, __m128i b)
-{
-    int64x2_t s64 =
-        vandq_s64(vreinterpretq_s64_m128i(a), vreinterpretq_s64_m128i(b));
-    return !(vgetq_lane_s64(s64, 0) | vgetq_lane_s64(s64, 1));
-}
-
-/* SSE4.2 */
-
-// Compares the 2 signed 64-bit integers in a and the 2 signed 64-bit integers
-// in b for greater than.
-FORCE_INLINE __m128i _mm_cmpgt_epi64(__m128i a, __m128i b)
-{
-#if defined(__aarch64__)
-    return vreinterpretq_m128i_u64(
-        vcgtq_s64(vreinterpretq_s64_m128i(a), vreinterpretq_s64_m128i(b)));
-#else
-    return vreinterpretq_m128i_s64(vshrq_n_s64(
-        vqsubq_s64(vreinterpretq_s64_m128i(b), vreinterpretq_s64_m128i(a)),
-        63));
-#endif
-}
-
-// Starting with the initial value in crc, accumulates a CRC32 value for
-// unsigned 16-bit integer v.
-// https://msdn.microsoft.com/en-us/library/bb531411(v=vs.100)
-FORCE_INLINE uint32_t _mm_crc32_u16(uint32_t crc, uint16_t v)
-{
-#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32)
-    __asm__ __volatile__("crc32ch %w[c], %w[c], %w[v]\n\t"
-                         : [c] "+r"(crc)
-                         : [v] "r"(v));
-#else
-    crc = _mm_crc32_u8(crc, v & 0xff);
-    crc = _mm_crc32_u8(crc, (v >> 8) & 0xff);
-#endif
-    return crc;
-}
-
-// Starting with the initial value in crc, accumulates a CRC32 value for
-// unsigned 32-bit integer v.
-// https://msdn.microsoft.com/en-us/library/bb531394(v=vs.100)
-FORCE_INLINE uint32_t _mm_crc32_u32(uint32_t crc, uint32_t v)
-{
-#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32)
-    __asm__ __volatile__("crc32cw %w[c], %w[c], %w[v]\n\t"
-                         : [c] "+r"(crc)
-                         : [v] "r"(v));
-#else
-    crc = _mm_crc32_u16(crc, v & 0xffff);
-    crc = _mm_crc32_u16(crc, (v >> 16) & 0xffff);
-#endif
-    return crc;
-}
-
-// Starting with the initial value in crc, accumulates a CRC32 value for
-// unsigned 64-bit integer v.
-// https://msdn.microsoft.com/en-us/library/bb514033(v=vs.100)
-FORCE_INLINE uint64_t _mm_crc32_u64(uint64_t crc, uint64_t v)
-{
-#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32)
-    __asm__ __volatile__("crc32cx %w[c], %w[c], %x[v]\n\t"
-                         : [c] "+r"(crc)
-                         : [v] "r"(v));
-#else
-    crc = _mm_crc32_u32((uint32_t)(crc), v & 0xffffffff);
-    crc = _mm_crc32_u32((uint32_t)(crc), (v >> 32) & 0xffffffff);
-#endif
-    return crc;
-}
-
-// Starting with the initial value in crc, accumulates a CRC32 value for
-// unsigned 8-bit integer v.
-// https://msdn.microsoft.com/en-us/library/bb514036(v=vs.100)
-FORCE_INLINE uint32_t _mm_crc32_u8(uint32_t crc, uint8_t v)
-{
-#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32)
-    __asm__ __volatile__("crc32cb %w[c], %w[c], %w[v]\n\t"
-                         : [c] "+r"(crc)
-                         : [v] "r"(v));
-#else
-    crc ^= v;
-    for (int bit = 0; bit < 8; bit++) {
-        if (crc & 1)
-            crc = (crc >> 1) ^ UINT32_C(0x82f63b78);
-        else
-            crc = (crc >> 1);
-    }
-#endif
-    return crc;
-}
-
-/* AES */
-
-#if !defined(__ARM_FEATURE_CRYPTO)
-/* clang-format off */
-#define SSE2NEON_AES_DATA(w)                                           \
-    {                                                                  \
-        w(0x63), w(0x7c), w(0x77), w(0x7b), w(0xf2), w(0x6b), w(0x6f), \
-        w(0xc5), w(0x30), w(0x01), w(0x67), w(0x2b), w(0xfe), w(0xd7), \
-        w(0xab), w(0x76), w(0xca), w(0x82), w(0xc9), w(0x7d), w(0xfa), \
-        w(0x59), w(0x47), w(0xf0), w(0xad), w(0xd4), w(0xa2), w(0xaf), \
-        w(0x9c), w(0xa4), w(0x72), w(0xc0), w(0xb7), w(0xfd), w(0x93), \
-        w(0x26), w(0x36), w(0x3f), w(0xf7), w(0xcc), w(0x34), w(0xa5), \
-        w(0xe5), w(0xf1), w(0x71), w(0xd8), w(0x31), w(0x15), w(0x04), \
-        w(0xc7), w(0x23), w(0xc3), w(0x18), w(0x96), w(0x05), w(0x9a), \
-        w(0x07), w(0x12), w(0x80), w(0xe2), w(0xeb), w(0x27), w(0xb2), \
-        w(0x75), w(0x09), w(0x83), w(0x2c), w(0x1a), w(0x1b), w(0x6e), \
-        w(0x5a), w(0xa0), w(0x52), w(0x3b), w(0xd6), w(0xb3), w(0x29), \
-        w(0xe3), w(0x2f), w(0x84), w(0x53), w(0xd1), w(0x00), w(0xed), \
-        w(0x20), w(0xfc), w(0xb1), w(0x5b), w(0x6a), w(0xcb), w(0xbe), \
-        w(0x39), w(0x4a), w(0x4c), w(0x58), w(0xcf), w(0xd0), w(0xef), \
-        w(0xaa), w(0xfb), w(0x43), w(0x4d), w(0x33), w(0x85), w(0x45), \
-        w(0xf9), w(0x02), w(0x7f), w(0x50), w(0x3c), w(0x9f), w(0xa8), \
-        w(0x51), w(0xa3), w(0x40), w(0x8f), w(0x92), w(0x9d), w(0x38), \
-        w(0xf5), w(0xbc), w(0xb6), w(0xda), w(0x21), w(0x10), w(0xff), \
-        w(0xf3), w(0xd2), w(0xcd), w(0x0c), w(0x13), w(0xec), w(0x5f), \
-        w(0x97), w(0x44), w(0x17), w(0xc4), w(0xa7), w(0x7e), w(0x3d), \
-        w(0x64), w(0x5d), w(0x19), w(0x73), w(0x60), w(0x81), w(0x4f), \
-        w(0xdc), w(0x22), w(0x2a), w(0x90), w(0x88), w(0x46), w(0xee), \
-        w(0xb8), w(0x14), w(0xde), w(0x5e), w(0x0b), w(0xdb), w(0xe0), \
-        w(0x32), w(0x3a), w(0x0a), w(0x49), w(0x06), w(0x24), w(0x5c), \
-        w(0xc2), w(0xd3), w(0xac), w(0x62), w(0x91), w(0x95), w(0xe4), \
-        w(0x79), w(0xe7), w(0xc8), w(0x37), w(0x6d), w(0x8d), w(0xd5), \
-        w(0x4e), w(0xa9), w(0x6c), w(0x56), w(0xf4), w(0xea), w(0x65), \
-        w(0x7a), w(0xae), w(0x08), w(0xba), w(0x78), w(0x25), w(0x2e), \
-        w(0x1c), w(0xa6), w(0xb4), w(0xc6), w(0xe8), w(0xdd), w(0x74), \
-        w(0x1f), w(0x4b), w(0xbd), w(0x8b), w(0x8a), w(0x70), w(0x3e), \
-        w(0xb5), w(0x66), w(0x48), w(0x03), w(0xf6), w(0x0e), w(0x61), \
-        w(0x35), w(0x57), w(0xb9), w(0x86), w(0xc1), w(0x1d), w(0x9e), \
-        w(0xe1), w(0xf8), w(0x98), w(0x11), w(0x69), w(0xd9), w(0x8e), \
-        w(0x94), w(0x9b), w(0x1e), w(0x87), w(0xe9), w(0xce), w(0x55), \
-        w(0x28), w(0xdf), w(0x8c), w(0xa1), w(0x89), w(0x0d), w(0xbf), \
-        w(0xe6), w(0x42), w(0x68), w(0x41), w(0x99), w(0x2d), w(0x0f), \
-        w(0xb0), w(0x54), w(0xbb), w(0x16)                             \
-    }
-/* clang-format on */
-
-/* X Macro trick. See https://en.wikipedia.org/wiki/X_Macro */
-#define SSE2NEON_AES_H0(x) (x)
-static const uint8_t SSE2NEON_sbox[256] = SSE2NEON_AES_DATA(SSE2NEON_AES_H0);
-#undef SSE2NEON_AES_H0
-
-// In the absence of crypto extensions, implement aesenc using regular neon
-// intrinsics instead. See:
-// https://www.workofard.com/2017/01/accelerated-aes-for-the-arm64-linux-kernel/
-// https://www.workofard.com/2017/07/ghash-for-low-end-cores/ and
-// https://github.com/ColinIanKing/linux-next-mirror/blob/b5f466091e130caaf0735976648f72bd5e09aa84/crypto/aegis128-neon-inner.c#L52
-// for more information Reproduced with permission of the author.
-FORCE_INLINE __m128i _mm_aesenc_si128(__m128i EncBlock, __m128i RoundKey)
-{
-#if defined(__aarch64__)
-    static const uint8_t shift_rows[] = {0x0, 0x5, 0xa, 0xf, 0x4, 0x9,
-                                         0xe, 0x3, 0x8, 0xd, 0x2, 0x7,
-                                         0xc, 0x1, 0x6, 0xb};
-    static const uint8_t ror32by8[] = {0x1, 0x2, 0x3, 0x0, 0x5, 0x6, 0x7, 0x4,
-                                       0x9, 0xa, 0xb, 0x8, 0xd, 0xe, 0xf, 0xc};
-
-    uint8x16_t v;
-    uint8x16_t w = vreinterpretq_u8_m128i(EncBlock);
-
-    // shift rows
-    w = vqtbl1q_u8(w, vld1q_u8(shift_rows));
-
-    // sub bytes
-    v = vqtbl4q_u8(_sse2neon_vld1q_u8_x4(SSE2NEON_sbox), w);
-    v = vqtbx4q_u8(v, _sse2neon_vld1q_u8_x4(SSE2NEON_sbox + 0x40), w - 0x40);
-    v = vqtbx4q_u8(v, _sse2neon_vld1q_u8_x4(SSE2NEON_sbox + 0x80), w - 0x80);
-    v = vqtbx4q_u8(v, _sse2neon_vld1q_u8_x4(SSE2NEON_sbox + 0xc0), w - 0xc0);
-
-    // mix columns
-    w = (v << 1) ^ (uint8x16_t)(((int8x16_t) v >> 7) & 0x1b);
-    w ^= (uint8x16_t) vrev32q_u16((uint16x8_t) v);
-    w ^= vqtbl1q_u8(v ^ w, vld1q_u8(ror32by8));
-
-    //  add round key
-    return vreinterpretq_m128i_u8(w) ^ RoundKey;
-
-#else /* ARMv7-A NEON implementation */
-#define SSE2NEON_AES_B2W(b0, b1, b2, b3)                                       \
-    (((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | \
-     (b0))
-#define SSE2NEON_AES_F2(x) ((x << 1) ^ (((x >> 7) & 1) * 0x011b /* WPOLY */))
-#define SSE2NEON_AES_F3(x) (SSE2NEON_AES_F2(x) ^ x)
-#define SSE2NEON_AES_U0(p) \
-    SSE2NEON_AES_B2W(SSE2NEON_AES_F2(p), p, p, SSE2NEON_AES_F3(p))
-#define SSE2NEON_AES_U1(p) \
-    SSE2NEON_AES_B2W(SSE2NEON_AES_F3(p), SSE2NEON_AES_F2(p), p, p)
-#define SSE2NEON_AES_U2(p) \
-    SSE2NEON_AES_B2W(p, SSE2NEON_AES_F3(p), SSE2NEON_AES_F2(p), p)
-#define SSE2NEON_AES_U3(p) \
-    SSE2NEON_AES_B2W(p, p, SSE2NEON_AES_F3(p), SSE2NEON_AES_F2(p))
-    static const uint32_t ALIGN_STRUCT(16) aes_table[4][256] = {
-        SSE2NEON_AES_DATA(SSE2NEON_AES_U0),
-        SSE2NEON_AES_DATA(SSE2NEON_AES_U1),
-        SSE2NEON_AES_DATA(SSE2NEON_AES_U2),
-        SSE2NEON_AES_DATA(SSE2NEON_AES_U3),
-    };
-#undef SSE2NEON_AES_B2W
-#undef SSE2NEON_AES_F2
-#undef SSE2NEON_AES_F3
-#undef SSE2NEON_AES_U0
-#undef SSE2NEON_AES_U1
-#undef SSE2NEON_AES_U2
-#undef SSE2NEON_AES_U3
-
-    uint32_t x0 = _mm_cvtsi128_si32(EncBlock);
-    uint32_t x1 = _mm_cvtsi128_si32(_mm_shuffle_epi32(EncBlock, 0x55));
-    uint32_t x2 = _mm_cvtsi128_si32(_mm_shuffle_epi32(EncBlock, 0xAA));
-    uint32_t x3 = _mm_cvtsi128_si32(_mm_shuffle_epi32(EncBlock, 0xFF));
-
-    __m128i out = _mm_set_epi32(
-        (aes_table[0][x3 & 0xff] ^ aes_table[1][(x0 >> 8) & 0xff] ^
-         aes_table[2][(x1 >> 16) & 0xff] ^ aes_table[3][x2 >> 24]),
-        (aes_table[0][x2 & 0xff] ^ aes_table[1][(x3 >> 8) & 0xff] ^
-         aes_table[2][(x0 >> 16) & 0xff] ^ aes_table[3][x1 >> 24]),
-        (aes_table[0][x1 & 0xff] ^ aes_table[1][(x2 >> 8) & 0xff] ^
-         aes_table[2][(x3 >> 16) & 0xff] ^ aes_table[3][x0 >> 24]),
-        (aes_table[0][x0 & 0xff] ^ aes_table[1][(x1 >> 8) & 0xff] ^
-         aes_table[2][(x2 >> 16) & 0xff] ^ aes_table[3][x3 >> 24]));
-
-    return _mm_xor_si128(out, RoundKey);
-#endif
-}
-
-// Perform the last round of an AES encryption flow on data (state) in a using
-// the round key in RoundKey, and store the result in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_aesenclast_si128
-FORCE_INLINE __m128i _mm_aesenclast_si128(__m128i a, __m128i RoundKey)
-{
-    /* FIXME: optimized for NEON */
-    uint8_t v[4][4] = {
-        {SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 0)],
-         SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 5)],
-         SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 10)],
-         SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 15)]},
-        {SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 4)],
-         SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 9)],
-         SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 14)],
-         SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 3)]},
-        {SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 8)],
-         SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 13)],
-         SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 2)],
-         SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 7)]},
-        {SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 12)],
-         SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 1)],
-         SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 6)],
-         SSE2NEON_sbox[vreinterpretq_nth_u8_m128i(a, 11)]},
-    };
-    for (int i = 0; i < 16; i++)
-        vreinterpretq_nth_u8_m128i(a, i) =
-            v[i / 4][i % 4] ^ vreinterpretq_nth_u8_m128i(RoundKey, i);
-    return a;
-}
-
-// Emits the Advanced Encryption Standard (AES) instruction aeskeygenassist.
-// This instruction generates a round key for AES encryption. See
-// https://kazakov.life/2017/11/01/cryptocurrency-mining-on-ios-devices/
-// for details.
-//
-// https://msdn.microsoft.com/en-us/library/cc714138(v=vs.120).aspx
-FORCE_INLINE __m128i _mm_aeskeygenassist_si128(__m128i key, const int rcon)
-{
-    uint32_t X1 = _mm_cvtsi128_si32(_mm_shuffle_epi32(key, 0x55));
-    uint32_t X3 = _mm_cvtsi128_si32(_mm_shuffle_epi32(key, 0xFF));
-    for (int i = 0; i < 4; ++i) {
-        ((uint8_t *) &X1)[i] = SSE2NEON_sbox[((uint8_t *) &X1)[i]];
-        ((uint8_t *) &X3)[i] = SSE2NEON_sbox[((uint8_t *) &X3)[i]];
-    }
-    return _mm_set_epi32(((X3 >> 8) | (X3 << 24)) ^ rcon, X3,
-                         ((X1 >> 8) | (X1 << 24)) ^ rcon, X1);
-}
-#undef SSE2NEON_AES_DATA
-
-#else /* __ARM_FEATURE_CRYPTO */
-// Implements equivalent of 'aesenc' by combining AESE (with an empty key) and
-// AESMC and then manually applying the real key as an xor operation. This
-// unfortunately means an additional xor op; the compiler should be able to
-// optimize this away for repeated calls however. See
-// https://blog.michaelbrase.com/2018/05/08/emulating-x86-aes-intrinsics-on-armv8-a
-// for more details.
-FORCE_INLINE __m128i _mm_aesenc_si128(__m128i a, __m128i b)
-{
-    return vreinterpretq_m128i_u8(
-        vaesmcq_u8(vaeseq_u8(vreinterpretq_u8_m128i(a), vdupq_n_u8(0))) ^
-        vreinterpretq_u8_m128i(b));
-}
-
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_aesenclast_si128
-FORCE_INLINE __m128i _mm_aesenclast_si128(__m128i a, __m128i RoundKey)
-{
-    return _mm_xor_si128(vreinterpretq_m128i_u8(vaeseq_u8(
-                             vreinterpretq_u8_m128i(a), vdupq_n_u8(0))),
-                         RoundKey);
-}
-
-FORCE_INLINE __m128i _mm_aeskeygenassist_si128(__m128i a, const int rcon)
-{
-    // AESE does ShiftRows and SubBytes on A
-    uint8x16_t u8 = vaeseq_u8(vreinterpretq_u8_m128i(a), vdupq_n_u8(0));
-
-    uint8x16_t dest = {
-        // Undo ShiftRows step from AESE and extract X1 and X3
-        u8[0x4], u8[0x1], u8[0xE], u8[0xB],  // SubBytes(X1)
-        u8[0x1], u8[0xE], u8[0xB], u8[0x4],  // ROT(SubBytes(X1))
-        u8[0xC], u8[0x9], u8[0x6], u8[0x3],  // SubBytes(X3)
-        u8[0x9], u8[0x6], u8[0x3], u8[0xC],  // ROT(SubBytes(X3))
-    };
-    uint32x4_t r = {0, (unsigned) rcon, 0, (unsigned) rcon};
-    return vreinterpretq_m128i_u8(dest) ^ vreinterpretq_m128i_u32(r);
-}
-#endif
-
-/* Others */
-
-// Perform a carry-less multiplication of two 64-bit integers, selected from a
-// and b according to imm8, and store the results in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_clmulepi64_si128
-FORCE_INLINE __m128i _mm_clmulepi64_si128(__m128i _a, __m128i _b, const int imm)
-{
-    uint64x2_t a = vreinterpretq_u64_m128i(_a);
-    uint64x2_t b = vreinterpretq_u64_m128i(_b);
-    switch (imm & 0x11) {
-    case 0x00:
-        return vreinterpretq_m128i_u64(
-            _sse2neon_vmull_p64(vget_low_u64(a), vget_low_u64(b)));
-    case 0x01:
-        return vreinterpretq_m128i_u64(
-            _sse2neon_vmull_p64(vget_high_u64(a), vget_low_u64(b)));
-    case 0x10:
-        return vreinterpretq_m128i_u64(
-            _sse2neon_vmull_p64(vget_low_u64(a), vget_high_u64(b)));
-    case 0x11:
-        return vreinterpretq_m128i_u64(
-            _sse2neon_vmull_p64(vget_high_u64(a), vget_high_u64(b)));
-    default:
-        abort();
-    }
-}
-
-FORCE_INLINE unsigned int _sse2neon_mm_get_denormals_zero_mode()
-{
-    union {
-        fpcr_bitfield field;
-#if defined(__aarch64__)
-        uint64_t value;
-#else
-        uint32_t value;
-#endif
-    } r;
-
-#if defined(__aarch64__)
-    asm volatile("mrs %0, FPCR" : "=r"(r.value)); /* read */
-#else
-    asm volatile("vmrs %0, FPSCR" : "=r"(r.value)); /* read */
-#endif
-
-    return r.field.bit24 ? _MM_DENORMALS_ZERO_ON : _MM_DENORMALS_ZERO_OFF;
-}
-
-// Count the number of bits set to 1 in unsigned 32-bit integer a, and
-// return that count in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_popcnt_u32
-FORCE_INLINE int _mm_popcnt_u32(unsigned int a)
-{
-#if defined(__aarch64__)
-#if __has_builtin(__builtin_popcount)
-    return __builtin_popcount(a);
-#else
-    return (int) vaddlv_u8(vcnt_u8(vcreate_u8((uint64_t) a)));
-#endif
-#else
-    uint32_t count = 0;
-    uint8x8_t input_val, count8x8_val;
-    uint16x4_t count16x4_val;
-    uint32x2_t count32x2_val;
-
-    input_val = vld1_u8((uint8_t *) &a);
-    count8x8_val = vcnt_u8(input_val);
-    count16x4_val = vpaddl_u8(count8x8_val);
-    count32x2_val = vpaddl_u16(count16x4_val);
-
-    vst1_u32(&count, count32x2_val);
-    return count;
-#endif
-}
-
-// Count the number of bits set to 1 in unsigned 64-bit integer a, and
-// return that count in dst.
-// https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_popcnt_u64
-FORCE_INLINE int64_t _mm_popcnt_u64(uint64_t a)
-{
-#if defined(__aarch64__)
-#if __has_builtin(__builtin_popcountll)
-    return __builtin_popcountll(a);
-#else
-    return (int64_t) vaddlv_u8(vcnt_u8(vcreate_u8(a)));
-#endif
-#else
-    uint64_t count = 0;
-    uint8x8_t input_val, count8x8_val;
-    uint16x4_t count16x4_val;
-    uint32x2_t count32x2_val;
-    uint64x1_t count64x1_val;
-
-    input_val = vld1_u8((uint8_t *) &a);
-    count8x8_val = vcnt_u8(input_val);
-    count16x4_val = vpaddl_u8(count8x8_val);
-    count32x2_val = vpaddl_u16(count16x4_val);
-    count64x1_val = vpaddl_u32(count32x2_val);
-    vst1_u64(&count, count64x1_val);
-    return count;
-#endif
-}
-
-FORCE_INLINE void _sse2neon_mm_set_denormals_zero_mode(unsigned int flag)
-{
-    // AArch32 Advanced SIMD arithmetic always uses the Flush-to-zero setting,
-    // regardless of the value of the FZ bit.
-    union {
-        fpcr_bitfield field;
-#if defined(__aarch64__)
-        uint64_t value;
-#else
-        uint32_t value;
-#endif
-    } r;
-
-#if defined(__aarch64__)
-    asm volatile("mrs %0, FPCR" : "=r"(r.value)); /* read */
-#else
-    asm volatile("vmrs %0, FPSCR" : "=r"(r.value)); /* read */
-#endif
-
-    r.field.bit24 = (flag & _MM_DENORMALS_ZERO_MASK) == _MM_DENORMALS_ZERO_ON;
-
-#if defined(__aarch64__)
-    asm volatile("msr FPCR, %0" ::"r"(r)); /* write */
-#else
-    asm volatile("vmsr FPSCR, %0" ::"r"(r));        /* write */
-#endif
-}
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma pop_macro("ALIGN_STRUCT")
-#pragma pop_macro("FORCE_INLINE")
-#endif
-
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC pop_options
-#endif
-
-#endif
-
-#if defined(__clang__) && defined(ARCH_ARM64)
-#pragma clang diagnostic pop
-#endif
diff --git a/rpcs3/Emu/Cell/Common.h b/rpcs3/Emu/Cell/Common.h
index 19e6433fb9..37cbba3844 100644
--- a/rpcs3/Emu/Cell/Common.h
+++ b/rpcs3/Emu/Cell/Common.h
@@ -16,186 +16,3 @@ inline int fexpf(float x)
 {
 	return (std::bit_cast<u32>(x) >> 23) & 0xff;
 }
-
-constexpr u32 ppu_fres_mantissas[128] =
-{
-	0x007f0000,
-	0x007d0800,
-	0x007b1800,
-	0x00793000,
-	0x00775000,
-	0x00757000,
-	0x0073a000,
-	0x0071e000,
-	0x00700000,
-	0x006e4000,
-	0x006ca000,
-	0x006ae000,
-	0x00694000,
-	0x00678000,
-	0x00660000,
-	0x00646000,
-	0x0062c000,
-	0x00614000,
-	0x005fc000,
-	0x005e4000,
-	0x005cc000,
-	0x005b4000,
-	0x0059c000,
-	0x00584000,
-	0x00570000,
-	0x00558000,
-	0x00540000,
-	0x0052c000,
-	0x00518000,
-	0x00500000,
-	0x004ec000,
-	0x004d8000,
-	0x004c0000,
-	0x004b0000,
-	0x00498000,
-	0x00488000,
-	0x00474000,
-	0x00460000,
-	0x0044c000,
-	0x00438000,
-	0x00428000,
-	0x00418000,
-	0x00400000,
-	0x003f0000,
-	0x003e0000,
-	0x003d0000,
-	0x003bc000,
-	0x003ac000,
-	0x00398000,
-	0x00388000,
-	0x00378000,
-	0x00368000,
-	0x00358000,
-	0x00348000,
-	0x00338000,
-	0x00328000,
-	0x00318000,
-	0x00308000,
-	0x002f8000,
-	0x002ec000,
-	0x002e0000,
-	0x002d0000,
-	0x002c0000,
-	0x002b0000,
-	0x002a0000,
-	0x00298000,
-	0x00288000,
-	0x00278000,
-	0x0026c000,
-	0x00260000,
-	0x00250000,
-	0x00244000,
-	0x00238000,
-	0x00228000,
-	0x00220000,
-	0x00210000,
-	0x00200000,
-	0x001f8000,
-	0x001e8000,
-	0x001e0000,
-	0x001d0000,
-	0x001c8000,
-	0x001b8000,
-	0x001b0000,
-	0x001a0000,
-	0x00198000,
-	0x00190000,
-	0x00180000,
-	0x00178000,
-	0x00168000,
-	0x00160000,
-	0x00158000,
-	0x00148000,
-	0x00140000,
-	0x00138000,
-	0x00128000,
-	0x00120000,
-	0x00118000,
-	0x00108000,
-	0x00100000,
-	0x000f8000,
-	0x000f0000,
-	0x000e0000,
-	0x000d8000,
-	0x000d0000,
-	0x000c8000,
-	0x000b8000,
-	0x000b0000,
-	0x000a8000,
-	0x000a0000,
-	0x00098000,
-	0x00090000,
-	0x00080000,
-	0x00078000,
-	0x00070000,
-	0x00068000,
-	0x00060000,
-	0x00058000,
-	0x00050000,
-	0x00048000,
-	0x00040000,
-	0x00038000,
-	0x00030000,
-	0x00028000,
-	0x00020000,
-	0x00018000,
-	0x00010000,
-	0x00000000,
-};
-
-constexpr u32 ppu_frsqrte_mantissas[16] =
-{
-	0x000f1000u, 0x000d8000u, 0x000c0000u, 0x000a8000u,
-	0x00098000u, 0x00088000u, 0x00080000u, 0x00070000u,
-	0x00060000u, 0x0004c000u, 0x0003c000u, 0x00030000u,
-	0x00020000u, 0x00018000u, 0x00010000u, 0x00008000u,
-};
-
-// Large lookup table for FRSQRTE instruction
-inline struct ppu_frsqrte_lut_t
-{
-	// Store only high 32 bits of doubles
-	u32 data[0x8000]{};
-
-	constexpr ppu_frsqrte_lut_t() noexcept
-	{
-		for (u64 i = 0; i < 0x8000; i++)
-		{
-			// Decomposed LUT index
-			const u64 sign = i >> 14;
-			const u64 expv = (i >> 3) & 0x7ff;
-
-			// (0x3FF - (((EXP_BITS(b) - 0x3FF) >> 1) + 1)) << 52
-			const u64 exp = 0x3fe0'0000 - (((expv + 0x1c01) >> 1) << (52 - 32));
-
-			if (expv == 0) // ±INF on zero/denormal, not accurate
-			{
-				data[i] = static_cast<u32>(0x7ff0'0000 | (sign << 31));
-			}
-			else if (expv == 0x7ff)
-			{
-				if (i == (0x7ff << 3))
-					data[i] = 0; // Zero on +INF, inaccurate
-				else
-					data[i] = 0x7ff8'0000; // QNaN
-			}
-			else if (sign)
-			{
-				data[i] = 0x7ff8'0000; // QNaN
-			}
-			else
-			{
-				// ((MAN_BITS(b) >> 49) & 7ull) + (!(EXP_BITS(b) & 1) << 3)
-				const u64 idx = 8 ^ (i & 0xf);
-
-				data[i] = static_cast<u32>(ppu_frsqrte_mantissas[idx] | exp);
-			}
-		}
-	}
-} ppu_frqrte_lut;
diff --git a/rpcs3/Emu/Cell/ErrorCodes.cpp b/rpcs3/Emu/Cell/ErrorCodes.cpp
deleted file mode 100644
index f81fe16a61..0000000000
--- a/rpcs3/Emu/Cell/ErrorCodes.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include "stdafx.h"
-#include "ErrorCodes.h"
-#include "PPUThread.h"
-#include "SPUThread.h"
-
-LOG_CHANNEL(sys_log, "SYS");
-
-bool g_log_all_errors = false;
-
-s32 error_code::error_report(s32 result, const logs::message* channel, const char* fmt, const fmt_type_info* sup, const u64* args)
-{
-	static thread_local std::string g_tls_error_str;
-	static thread_local std::unordered_map<std::string, usz> g_tls_error_stats;
-
-	if (!channel)
-	{
-		channel = &sys_log.error;
-	}
-
-	if (!sup && !args)
-	{
-		if (!fmt)
-		{
-			// Report and clean error state
-			for (auto&& pair : g_tls_error_stats)
-			{
-				if (pair.second > 3)
-				{
-					channel->operator()("Stat: %s [x%u]", pair.first, pair.second);
-				}
-			}
-
-			g_tls_error_stats.clear();
-			return 0;
-		}
-	}
-
-	ensure(fmt);
-
-	const char* func = "Unknown function";
-
-	if (auto ppu = get_current_cpu_thread<ppu_thread>())
-	{
-		if (auto current = ppu->current_function)
-		{
-			func = current;
-		}
-	}
-	else if (auto spu = get_current_cpu_thread<spu_thread>())
-	{
-		if (auto current = spu->current_func; current && spu->start_time)
-		{
-			func = current;
-		}
-	}
-
-	// Format log message (use preallocated buffer)
-	g_tls_error_str.clear();
-
-	fmt::append(g_tls_error_str, "'%s' failed with 0x%08x", func, result);
-
-	// Add spacer between error and fmt if necessary
-	if (fmt[0] != ' ')
-		g_tls_error_str += " : ";
-
-	fmt::raw_append(g_tls_error_str, fmt, sup, args);
-
-	// Update stats and check log threshold
-
-	if (g_log_all_errors) [[unlikely]]
-	{
-		if (!g_tls_error_stats.empty())
-		{
-			// Report and clean error state
-			error_report(0, nullptr, nullptr, nullptr, nullptr);
-		}
-
-		channel->operator()("%s", g_tls_error_str);
-	}
-	else
-	{
-		const auto stat = ++g_tls_error_stats[g_tls_error_str];
-
-		if (stat <= 3)
-		{
-			channel->operator()("%s [%u]", g_tls_error_str, stat);
-		}
-	}
-
-	return result;
-}
diff --git a/rpcs3/Emu/Cell/ErrorCodes.h b/rpcs3/Emu/Cell/ErrorCodes.h
index 7f6a3892da..68581460c5 100644
--- a/rpcs3/Emu/Cell/ErrorCodes.h
+++ b/rpcs3/Emu/Cell/ErrorCodes.h
@@ -3,54 +3,35 @@
 #include "util/types.hpp"
 #include "Utilities/StrFmt.h"
 
-namespace logs
-{
-	struct message;
-}
-
 // Error code type (return type), implements error reporting.
 class error_code
 {
 	s32 value;
 
+public:
+	error_code() = default;
+
+	// Implementation must be provided independently
+	static s32 error_report(s32 result, const char* fmt, const fmt_type_info* sup, const u64* args);
+
 	// Common constructor
-	template <typename ET> requires requires (ET v) { static_cast<s32>(v); }
-	error_code(const logs::message* ch, const ET& value) noexcept
-		: value(error_report(static_cast<s32>(value), ch, " : %s", fmt::type_info_v<ET>, fmt_args_t<ET>{fmt_unveil<ET>::get(value)}))
+	template<typename ET>
+	error_code(const ET& value)
+		: value(error_report(static_cast<s32>(value), " : %s", fmt::type_info_v<ET>, fmt_args_t<ET>{fmt_unveil<ET>::get(value)}))
 	{
 	}
 
 	// Error constructor (2 args)
-	template <typename ET, typename T> requires requires (ET v) { static_cast<s32>(v); }
-	error_code(const logs::message* ch, const ET& value, const T& arg) noexcept
-		: value(error_report(static_cast<s32>(value), ch, " : %s, %s", fmt::type_info_v<ET, T>, fmt_args_t<ET, T>{fmt_unveil<ET>::get(value), fmt_unveil<T>::get(arg)}))
+	template<typename ET, typename T>
+	error_code(const ET& value, const T& arg)
+		: value(error_report(static_cast<s32>(value), " : %s, %s", fmt::type_info_v<ET, T>, fmt_args_t<ET, T>{fmt_unveil<ET>::get(value), fmt_unveil<T>::get(arg)}))
 	{
 	}
 
 	// Formatting constructor (error, format string, variadic list)
-	template <typename ET, typename... Args> requires requires (ET v) { static_cast<s32>(v); }
-	error_code(const logs::message* ch, const ET& value, const const_str& fmt, const Args&... args) noexcept
-		: value(error_report(static_cast<s32>(value), ch, fmt, fmt::type_info_v<Args...>, fmt_args_t<Args...>{fmt_unveil<Args>::get(args)...}))
-	{
-	}
-
-public:
-	// Implementation must be provided independently
-	static s32 error_report(s32 result, const logs::message* channel, const char* fmt, const fmt_type_info* sup, const u64* args);
-
-	error_code() = default;
-
-	// Constructor without channel
-	template <typename... Args> requires (sizeof...(Args) > 0 && !(std::is_same_v<std::decay_t<std::remove_pointer_t<Args>>, logs::message> || ...))
-	error_code(const Args&... args) noexcept
-		: error_code(std::add_pointer_t<const logs::message>{}, args...)
-	{
-	}
-
-	// Constructor with channel
-	template <typename... Args>
-	error_code(const logs::message& ch, const Args&... args) noexcept
-		: error_code(std::addressof(ch), args...)
+	template <typename ET, typename... Args> requires (sizeof...(Args) > 0)
+	error_code(const ET& value, const const_str& fmt, const Args&... args)
+		: value(error_report(static_cast<s32>(value), fmt, fmt::type_info_v<Args...>, fmt_args_t<Args...>{fmt_unveil<Args>::get(args)...}))
 	{
 	}
 
@@ -58,8 +39,6 @@ public:
 	{
 		return value;
 	}
-
-	ENABLE_BITWISE_SERIALIZATION;
 };
 
 enum CellNotAnError : s32
@@ -70,7 +49,7 @@ enum CellNotAnError : s32
 
 // Constructor specialization that doesn't trigger reporting
 template <>
-constexpr FORCE_INLINE error_code::error_code(const CellNotAnError& value) noexcept
+constexpr FORCE_INLINE error_code::error_code(const CellNotAnError& value)
 	: value(value)
 {
 }
@@ -82,11 +61,11 @@ constexpr FORCE_INLINE CellNotAnError not_an_error(const T& value)
 	return static_cast<CellNotAnError>(static_cast<s32>(value));
 }
 
-template <typename T>
+template <typename T, typename>
 struct ppu_gpr_cast_impl;
 
 template <>
-struct ppu_gpr_cast_impl<error_code>
+struct ppu_gpr_cast_impl<error_code, void>
 {
 	static inline u64 to(const error_code& code)
 	{
diff --git a/rpcs3/Emu/Cell/MFC.cpp b/rpcs3/Emu/Cell/MFC.cpp
index 1af9f4aa1a..eb195a7470 100644
--- a/rpcs3/Emu/Cell/MFC.cpp
+++ b/rpcs3/Emu/Cell/MFC.cpp
@@ -70,5 +70,5 @@ void fmt_class_string<spu_mfc_cmd>::format(std::string& out, u64 arg)
 
 	const u8 tag = cmd.tag;
 
-	fmt::append(out, "%-8s #%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)" : "");
+	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)" : "");
 }
diff --git a/rpcs3/Emu/Cell/MFC.h b/rpcs3/Emu/Cell/MFC.h
index c7fe58835e..736a53c6c6 100644
--- a/rpcs3/Emu/Cell/MFC.h
+++ b/rpcs3/Emu/Cell/MFC.h
@@ -88,8 +88,6 @@ enum : u32
 
 struct alignas(16) spu_mfc_cmd
 {
-	ENABLE_BITWISE_SERIALIZATION;
-
 	MFC cmd;
 	u8 tag;
 	u16 size;
@@ -98,11 +96,9 @@ struct alignas(16) spu_mfc_cmd
 	u32 eah;
 };
 
-enum class spu_block_hash : u64;
-
 struct mfc_cmd_dump
 {
 	spu_mfc_cmd cmd;
-	u64 block_hash;
+
 	alignas(16) u8 data[128];
 };
diff --git a/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp b/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp
deleted file mode 100644
index 8b3ad0b63e..0000000000
--- a/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "stdafx.h"
-#include "Emu/IdManager.h"
-#include "Emu/Cell/PPUModule.h"
-#include "Utilities/Thread.h"
-
-#include "Emu/Cell/lv2/sys_spu.h"
-
-#include <thread>
-
-// SONIC THE HEDGEDOG: a fix for a race condition between SPUs and PPUs causing missing graphics (SNR is overriden when non-empty)
-void WaitForSPUsToEmptySNRs(ppu_thread& ppu, u32 spu_id, u32 snr_mask)
-{
-	ppu.state += cpu_flag::wait;
-
-	auto [spu, group] = lv2_spu_group::get_thread(spu_id);
-
-	if ((!spu && spu_id != umax) || snr_mask % 4 == 0)
-	{
-		return;
-	}
-
-	// Wait until specified SNRs are reported empty at least once
-	for (bool has_busy = true; has_busy && !ppu.is_stopped(); std::this_thread::yield())
-	{
-		has_busy = false;
-
-		auto for_one = [&](u32, spu_thread& spu)
-		{
-			if ((snr_mask & 1) && spu.ch_snr1.get_count())
-			{
-				has_busy = true;
-				return;
-			}
-
-			if ((snr_mask & 2) && spu.ch_snr2.get_count())
-			{
-				has_busy = true;
-			}
-		};
-
-		if (spu)
-		{
-			// Wait for a single SPU
-			for_one(spu->id, *spu);
-		}
-		else
-		{
-			// Wait for all SPUs
-			idm::select<named_thread<spu_thread>>(for_one);
-		}
-	}
-}
-
-DECLARE(ppu_module_manager::hle_patches)("RPCS3_HLE_LIBRARY", []()
-{
-	REG_FUNC(RPCS3_HLE_LIBRARY, WaitForSPUsToEmptySNRs);
-});
diff --git a/rpcs3/Emu/Cell/Modules/StaticHLE.cpp b/rpcs3/Emu/Cell/Modules/StaticHLE.cpp
index bce536d22a..59c5f439e3 100644
--- a/rpcs3/Emu/Cell/Modules/StaticHLE.cpp
+++ b/rpcs3/Emu/Cell/Modules/StaticHLE.cpp
@@ -162,8 +162,8 @@ bool statichle_handler::check_against_patterns(vm::cptr<u8>& data, u32 size, u32
 			return false;
 		}
 
-		const auto sfunc   = &::at32(smodule->functions, pat.fnid);
-		const u32 target   = g_fxo->get<ppu_function_manager>().func_addr(sfunc->index, true);
+		const auto sfunc   = &smodule->functions.at(pat.fnid);
+		const u32 target   = g_fxo->get<ppu_function_manager>().func_addr(sfunc->index) + 4;
 
 		// write stub
 		vm::write32(addr, ppu_instructions::LIS(0, (target&0xFFFF0000)>>16));
diff --git a/rpcs3/Emu/Cell/Modules/cellAdec.cpp b/rpcs3/Emu/Cell/Modules/cellAdec.cpp
index dfc91c8d2f..7a6b047641 100644
--- a/rpcs3/Emu/Cell/Modules/cellAdec.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellAdec.cpp
@@ -1,60 +1,40 @@
 #include "stdafx.h"
-#include "Emu/perf_meter.hpp"
+#include "Emu/System.h"
+#include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_sync.h"
-#include "Emu/Cell/lv2/sys_ppu_thread.h"
-#include "Emu/savestate_utils.hpp"
-#include "sysPrxForUser.h"
 
+#ifdef _MSC_VER
+#pragma warning(push, 0)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+extern "C"
+{
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
+#ifndef AV_INPUT_BUFFER_PADDING_SIZE
+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE
+#endif
+}
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
+
+#include "cellPamf.h"
 #include "cellAdec.h"
 
-#include "util/simd.hpp"
-#include "util/asm.hpp"
+#include <mutex>
+
+extern std::mutex g_mutex_avcodec_open2;
 
 LOG_CHANNEL(cellAdec);
 
-// These need to be defined somewhere to access the LLE functions
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_ac3;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_atrac3;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_atrac3multi;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_Celp8;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_Celp;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_Ddp;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_DtsCore;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_DtsHd_Core;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_DtsHd;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_DtsLbr;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_Aac;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_mpmc;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_M4Aac;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_M4Aac2ch;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_M4Aac2chmod;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_Mp3;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_Mp3s;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_mpmcl1;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_truehd;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_wma;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_WmaLsl;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_WmaPro;
-error_code _SceAdecCorrectPtsValue_Celp8(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_Celp(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_Ddp(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_DtsCore(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_DtsHd_Core(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_DtsHd(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_DtsLbr(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_Aac(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_mpmc(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_M4Aac(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_M4Aac2ch(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_M4Aac2chmod(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_Mp3s(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_mpmcl1(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_truehd(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_wma(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_WmaLsl(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-error_code _SceAdecCorrectPtsValue_WmaPro(ppu_thread&, vm::ptr<void>, vm::ptr<CellCodecTimeStamp>){ UNIMPLEMENTED_FUNC(cellAdec); return CELL_OK; }
-
 template <>
 void fmt_class_string<CellAdecError>::format(std::string& out, u64 arg)
 {
@@ -155,6 +135,63 @@ void fmt_class_string<CellAdecError>::format(std::string& out, u64 arg)
 		STR_CASE(CELL_ADEC_ERROR_AT3_BUSY);
 		STR_CASE(CELL_ADEC_ERROR_AT3_EMPTY);
 		STR_CASE(CELL_ADEC_ERROR_AT3_ERROR);
+		STR_CASE(CELL_ADEC_ERROR_ATX_OK); // CELL_ADEC_ERROR_ATX_OFFSET, CELL_ADEC_ERROR_ATX_NONE
+		STR_CASE(CELL_ADEC_ERROR_ATX_BUSY);
+		STR_CASE(CELL_ADEC_ERROR_ATX_EMPTY);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ATSHDR);
+		STR_CASE(CELL_ADEC_ERROR_ATX_NON_FATAL);
+		STR_CASE(CELL_ADEC_ERROR_ATX_NOT_IMPLE);
+		STR_CASE(CELL_ADEC_ERROR_ATX_PACK_CE_OVERFLOW);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ILLEGAL_NPROCQUS);
+		STR_CASE(CELL_ADEC_ERROR_ATX_FATAL);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ENC_OVERFLOW);
+		STR_CASE(CELL_ADEC_ERROR_ATX_PACK_CE_UNDERFLOW);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDCT);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GAINADJ);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDSF);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_SPECTRA);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDWL);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GHWAVE);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_SHEADER);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_A);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_B);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_C);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_D);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_E);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_A);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_B);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_C);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_D);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDCT_A);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GC_NGC);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLEV_A);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLOC_A);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLEV_B);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLOC_B);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_SN_NWVS);
+		STR_CASE(CELL_ADEC_ERROR_ATX_FATAL_HANDLE);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_SAMPLING_FREQ);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_CH_CONFIG_INDEX);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_NBYTES);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_BLOCK_NUM);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_BLOCK_ID);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_CHANNELS);
+		STR_CASE(CELL_ADEC_ERROR_ATX_UNINIT_BLOCK_SPECIFIED);
+		STR_CASE(CELL_ADEC_ERROR_ATX_POSCFG_PRESENT);
+		STR_CASE(CELL_ADEC_ERROR_ATX_BUFFER_OVERFLOW);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ILL_BLK_TYPE_ID);
+		STR_CASE(CELL_ADEC_ERROR_ATX_UNPACK_CHANNEL_BLK_FAILED);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ILL_BLK_ID_USED_1);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ILL_BLK_ID_USED_2);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ILLEGAL_ENC_SETTING);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ILLEGAL_DEC_SETTING);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_NSAMPLES);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ILL_SYNCWORD);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ILL_SAMPLING_FREQ);
+		STR_CASE(CELL_ADEC_ERROR_ATX_ILL_CH_CONFIG_INDEX);
+		STR_CASE(CELL_ADEC_ERROR_ATX_RAW_DATA_FRAME_SIZE_OVER);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_ENHANCE_LENGTH_OVER);
+		STR_CASE(CELL_ADEC_ERROR_ATX_SPU_INTERNAL_FAIL);
 		STR_CASE(CELL_ADEC_ERROR_LPCM_FATAL);
 		STR_CASE(CELL_ADEC_ERROR_LPCM_SEQ);
 		STR_CASE(CELL_ADEC_ERROR_LPCM_ARG);
@@ -223,1815 +260,890 @@ void fmt_class_string<CellAdecError>::format(std::string& out, u64 arg)
 	});
 }
 
-
-// LPCM decoder (included in cellAdec/libadec.sprx)
-
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_lpcm;
-
-void LpcmDecContext::exec(ppu_thread& ppu)
+class AudioDecoder : public ppu_thread
 {
-	perf_meter<"LPCMDEC"_u64> perf0;
+public:
+	squeue_t<AdecTask> job;
+	volatile bool is_closed = false;
+	volatile bool is_finished = false;
+	bool just_started = false;
+	bool just_finished = false;
 
-	switch (savestate)
+	AVCodec* codec = nullptr;
+	AVInputFormat* input_format = nullptr;
+	AVCodecContext* ctx = nullptr;
+	AVFormatContext* fmt = nullptr;
+	u8* io_buf;
+
+	struct AudioReader
 	{
-	case lpcm_dec_state::waiting_for_cmd_mutex_lock: break;
-	case lpcm_dec_state::waiting_for_cmd_cond_wait: break;
-	case lpcm_dec_state::waiting_for_output_mutex_lock: goto output_mutex_lock;
-	case lpcm_dec_state::waiting_for_output_cond_wait: goto output_cond_wait;
-	case lpcm_dec_state::queue_mutex_lock: goto queue_mutex_lock;
-	case lpcm_dec_state::executing_cmd: goto execute_cmd;
-	}
+		u32 addr;
+		u32 size;
+		bool init;
+		bool has_ats;
 
-	for (; run_thread; cmd_counter++)
+		AudioReader()
+			: init(false)
+		{
+		}
+
+	} reader;
+
+	squeue_t<AdecFrame> frames;
+
+	const s32 type;
+	const u32 memAddr;
+	const u32 memSize;
+	const vm::ptr<CellAdecCbMsg> cbFunc;
+	const u32 cbArg;
+	u32 memBias = 0;
+
+	AdecTask task;
+	u64 last_pts, first_pts;
+
+	u32 ch_out;
+	u32 ch_cfg;
+	u32 frame_size;
+	u32 sample_rate;
+	bool use_ats_headers;
+
+	AudioDecoder(s32 type, u32 addr, u32 size, vm::ptr<CellAdecCbMsg> func, u32 arg)
+		: ppu_thread({}, "", 0)
+		, type(type)
+		, memAddr(addr)
+		, memSize(size)
+		, cbFunc(func)
+		, cbArg(arg)
 	{
-		cellAdec.trace("Command counter: %llu, waiting for next command...", cmd_counter);
-
-		// Wait for a command to become available
-		error_occurred |= static_cast<u32>(cmd_available.acquire(ppu, savestate) != CELL_OK);
-
-		if (ppu.state & cpu_flag::again)
+		switch (type)
 		{
-			return;
-		}
-
-		cellAdec.trace("Command available, waiting for output to be consumed...");
-
-		// Wait for the output to be consumed.
-		// The output has to be consumed even if the next command is not a decode command
-		savestate = lpcm_dec_state::waiting_for_output_mutex_lock;
-		output_mutex_lock:
-
-		error_occurred |= static_cast<u32>(sys_mutex_lock(ppu, output_mutex, 0) != CELL_OK);
-
-		if (ppu.state & cpu_flag::again)
+		case CELL_ADEC_TYPE_ATRACX:
+		case CELL_ADEC_TYPE_ATRACX_2CH:
+		case CELL_ADEC_TYPE_ATRACX_6CH:
+		case CELL_ADEC_TYPE_ATRACX_8CH:
 		{
-			return;
-		}
-
-		while (output_locked)
-		{
-			savestate = lpcm_dec_state::waiting_for_output_cond_wait;
-			output_cond_wait:
-
-			ensure(sys_cond_wait(ppu, output_consumed, 0) == CELL_OK); // Error code isn't checked on LLE
-
-			if (ppu.state & cpu_flag::again)
-			{
-				return;
-			}
-		}
-
-		cellAdec.trace("Output consumed");
-
-		// Pop command from queue
-		savestate = lpcm_dec_state::queue_mutex_lock;
-		queue_mutex_lock:
-
-		ensure(sys_mutex_lock(ppu, queue_mutex, 0) == CELL_OK); // Error code isn't checked on LLE
-
-		if (ppu.state & cpu_flag::again)
-		{
-			return;
-		}
-
-		cmd_queue.pop(cmd);
-
-		ensure(sys_mutex_unlock(ppu, queue_mutex) == CELL_OK); // Error code isn't checked on LLE
-
-		cellAdec.trace("Command type: %d", static_cast<u32>(cmd.type.get()));
-
-		savestate = lpcm_dec_state::executing_cmd;
-		execute_cmd:
-
-		switch (cmd.type)
-		{
-		case LpcmDecCmdType::start_seq:
-			// LLE sends a command to the SPU thread. The SPU thread consumes the command without doing anything, however
-			error_occurred |= static_cast<u32>(sys_mutex_unlock(ppu, output_mutex) != CELL_OK);
-			break;
-
-		case LpcmDecCmdType::end_seq:
-		{
-			// Block savestate creation during callbacks
-			std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-			if (!savestate_lock.owns_lock())
-			{
-				ppu.state += cpu_flag::again;
-				return;
-			}
-
-			// Doesn't do anything else
-			notify_seq_done.cbFunc(ppu, notify_seq_done.cbArg);
-
-			error_occurred |= static_cast<u32>(sys_mutex_unlock(ppu, output_mutex) != CELL_OK);
+			codec = avcodec_find_decoder(AV_CODEC_ID_ATRAC3P);
+			input_format = av_find_input_format("oma");
 			break;
 		}
-		case LpcmDecCmdType::close:
-			ensure(sys_mutex_unlock(ppu, output_mutex) == CELL_OK); // Error code isn't checked on LLE
-			return;
-
-		case LpcmDecCmdType::decode_au:
+		case CELL_ADEC_TYPE_MP3:
 		{
-			// For 20 and 24-bit samples
-			const u8* const input_u8 = static_cast<const u8*>(cmd.au_start_addr.get_ptr());
-			const s64 au_size_u8 = cmd.au_size;
-
-			// For 16-bit samples
-			const be_t<s16, 1>* const input_s16 = static_cast<const be_t<s16, 1>*>(cmd.au_start_addr.get_ptr());
-			const s64 au_size_s16 = static_cast<s64>(au_size_u8 / sizeof(s16));
-
-			be_t<f32>* const _output = std::assume_aligned<0x80>(output.get_ptr());
-			s64 output_size = cmd.au_size;
-
-			s32 sample_num = static_cast<s32>(utils::align(+lpcm_param->audioPayloadSize, 0x10));
-			s32 channel_num = 0;
-
-			if (!dvd_packing)
-			{
-				switch (lpcm_param->sizeOfWord)
-				{
-				case CELL_ADEC_BIT_LENGTH_16: output_size = output_size * 32 / 16; sample_num /= 2; break;
-				case CELL_ADEC_BIT_LENGTH_20: // Same as below
-				case CELL_ADEC_BIT_LENGTH_24: output_size = output_size * 32 / 24; sample_num /= 3; break;
-				default: ; // LLE skips decoding entirely, the output buffer isn't written to, and it outputs whatever was there before
-				}
-
-				// LPCM streams with an odd number of channels contain an empty dummy channel
-				switch (lpcm_param->channelNumber)
-				{
-				case CELL_ADEC_CH_MONO:    channel_num = 1; output_size = output_size * 1 / 2; break;
-				case CELL_ADEC_CH_STEREO:  channel_num = 2; break;
-				case CELL_ADEC_CH_3_0:     // Same as below
-				case CELL_ADEC_CH_2_1:     channel_num = 3; output_size = output_size * 3 / 4; break;
-				case CELL_ADEC_CH_3_1:     // Same as below
-				case CELL_ADEC_CH_2_2:     channel_num = 4; break;
-				case CELL_ADEC_CH_3_2:     channel_num = 5; output_size = output_size * 5 / 6; break;
-				case CELL_ADEC_CH_3_2_LFE: channel_num = 6; break;
-				case CELL_ADEC_CH_3_4:     channel_num = 7; output_size = output_size * 7 / 8; break;
-				case CELL_ADEC_CH_3_4_LFE: channel_num = 8; break;
-				default: ; // Don't do anything, LLE simply skips reordering channels
-				}
-
-				// LLE doesn't check the output size
-				ensure(output_size <= LPCM_DEC_OUTPUT_BUFFER_SIZE);
-				ensure(sample_num * sizeof(f32) <= LPCM_DEC_OUTPUT_BUFFER_SIZE);
-
-				// Convert to float
-				if (lpcm_param->sizeOfWord == CELL_ADEC_BIT_LENGTH_16)
-				{
-					s64 i = 0;
-					for (; i <= au_size_s16 - 8; i += 8)
-					{
-						const v128 s16be = v128::loadu(&input_s16[i]);
-
-						// Convert endianess if necessary and shift left by 16
-#if defined(ARCH_X64) && !defined(__SSSE3__)
-						const v128 s16le = gv_rol16<8>(s16be);
-						const v128 s32_1 = gv_unpacklo16(gv_bcst16(0), s16le);
-						const v128 s32_2 = gv_unpackhi16(gv_bcst16(0), s16le);
-#else
-						const v128 s32_1 = std::endian::native == std::endian::little
-							? gv_shuffle8(s16be, v128::normal_array_t<s8>{ -1, -1, 1, 0, -1, -1, 3, 2, -1, -1, 5, 4, -1, -1, 7, 6 })
-							: gv_unpacklo16(s16be, gv_bcst16(0));
-
-						const v128 s32_2 = std::endian::native == std::endian::little
-							? gv_shuffle8(s16be, v128::normal_array_t<s8>{ -1, -1, 9, 8, -1, -1, 11, 10, -1, -1, 13, 12, -1, -1, 15, 14 })
-							: gv_unpackhi16(s16be, gv_bcst16(0));
-#endif
-						// Convert to float and divide by INT32_MAX + 1
-						const v128 f32_1 = gv_mulfs(gv_cvts32_tofs(s32_1), 1.f / static_cast<f32>(0x80000000u));
-						const v128 f32_2 = gv_mulfs(gv_cvts32_tofs(s32_2), 1.f / static_cast<f32>(0x80000000u));
-
-						v128::storeu(gv_to_be32(f32_1), &_output[i]);
-						v128::storeu(gv_to_be32(f32_2), &_output[i + 4]);
-					}
-
-					for (; i < au_size_s16; i++)
-					{
-						_output[i] = static_cast<f32>(input_s16[i]) / 0x8000u;
-					}
-				}
-				else if (lpcm_param->sizeOfWord == CELL_ADEC_BIT_LENGTH_20 || lpcm_param->sizeOfWord == CELL_ADEC_BIT_LENGTH_24)
-				{
-					s64 i = 0;
-					for (; i * 3 <= au_size_u8 - static_cast<s64>(sizeof(v128)); i += 4)
-					{
-						// Load four samples, convert endianness if necessary and shift left by 8
-						const v128 _s32 = std::endian::native == std::endian::little
-							? gv_shuffle8(v128::loadu(&input_u8[i * 3]), v128::normal_array_t<s8>{ -1, 2, 1, 0, -1, 5, 4, 3, -1, 8, 7, 6, -1, 11, 10, 9 })
-							: gv_shuffle8(v128::loadu(&input_u8[i * 3]), v128::normal_array_t<s8>{ 0, 1, 2, -1, 3, 4, 5, -1, 6, 7, 8, -1, 9, 10, 11, -1 });
-
-						// Convert to float and divide by INT32_MAX + 1
-						const v128 _f32 = gv_mulfs(gv_cvts32_tofs(_s32), 1.f / static_cast<f32>(0x80000000u));
-
-						v128::storeu(gv_to_be32(_f32), &_output[i]);
-					}
-
-					for (; i * 3 <= au_size_u8 - 3; i++)
-					{
-						alignas(alignof(s32)) const u8 s32le[4] = { 0, input_u8[i * 3 + 2], input_u8[i * 3 + 1], input_u8[i * 3] };
-
-						_output[i] = static_cast<f32>(std::bit_cast<le_t<s32>>(s32le)) / static_cast<f32>(0x80000000u);
-					}
-				}
-
-				// Reorder channels and remove the dummy channel
-
-				// Input channel order:
-				// Front Left, Front Right, Center, Side Left, Rear Left, Rear Right, Side Right, LFE
-
-				// Output channel order:
-				// - up to 3_4: Front Left, Center, Front Right, Side Left, Side Right, Rear Left, Rear Right, LFE
-				// - 3_4_LFE: Front Left, Front Right, Center, LFE, Side Left, Side Right, Rear Left, Rear Right
-
-				// The following loops can access sample_num % channel_num * sizeof(f32) bytes more than LPCM_DEC_OUTPUT_BUFFER_SIZE (up to 28 bytes).
-				// This is intended, LLE does something similar. The buffer is much larger than LPCM_DEC_OUTPUT_BUFFER_SIZE (see _CellAdecCoreOpGetMemSize_lpcm())
-				switch (lpcm_param->channelNumber)
-				{
-				case CELL_ADEC_CH_MONO:
-					for (s32 i = 0; i < sample_num / 2; i += 4)
-					{
-						const v128 tmp1 = v128::loadu(&_output[i * 2]);
-						const v128 tmp2 = v128::loadu(&_output[i * 2 + 4]);
-						v128::storeu(gv_shufflefs<0, 2, 0, 2>(tmp1, tmp2), &_output[i]); // Remove every other sample
-					}
-					break;
-
-				case CELL_ADEC_CH_STEREO:
-				case CELL_ADEC_CH_2_2:
-					// Input order == output order, no need to do anything
-					break;
-
-				case CELL_ADEC_CH_3_0:
-					for (s32 i_in = 0, i_out = 0; i_in < sample_num; i_in += 4, i_out += 3)
-					{
-						const v128 tmp = gv_shuffle32<0, 2, 1, 3>(v128::loadu(&_output[i_in])); // Swap Front Right and Center
-						v128::storeu(tmp, &_output[i_out]);
-					}
-					break;
-
-				case CELL_ADEC_CH_2_1:
-					for (s32 i_in = 0, i_out = 0; i_in < sample_num; i_in += 4, i_out += 3)
-					{
-						v128::storeu(v128::loadu(&_output[i_in]), &_output[i_out]);
-					}
-					break;
-
-				case CELL_ADEC_CH_3_1:
-				case CELL_ADEC_CH_3_2_LFE:
-					for (s32 i = 0; i < sample_num; i += channel_num)
-					{
-						const u64 tmp = std::rotl(read_from_ptr<u64>(&_output[i + 1]), 0x20); // Swap Front Right and Center
-						std::memcpy(&_output[i + 1], &tmp, sizeof(u64));
-					}
-					break;
-
-				case CELL_ADEC_CH_3_2:
-					for (s32 i_in = 0, i_out = 0; i_in < sample_num; i_in += 6, i_out += 5)
-					{
-						const v128 tmp = gv_shuffle32<0, 2, 1, 3>(v128::loadu(&_output[i_in])); // Swap Front Right and Center
-						v128::storeu(tmp, &_output[i_out]);
-						_output[i_out + 4] = _output[i_in + 4];
-					}
-					break;
-
-				case CELL_ADEC_CH_3_4:
-					for (s32 i_in = 0, i_out = 0; i_in < sample_num; i_in += 8, i_out += 7)
-					{
-						const v128 tmp1 = gv_shuffle32<0, 2, 1, 3>(v128::loadu(&_output[i_in])); // Swap Front Right and Center
-						const v128 tmp2 = gv_shuffle32<2, 0, 1, 3>(v128::loadu(&_output[i_in + 4])); // Reorder Rear Left, Rear Right, Side Right -> Side Right, Rear Left, Rear Right
-						v128::storeu(tmp1, &_output[i_out]);
-						v128::storeu(tmp2, &_output[i_out + 4]);
-					}
-					break;
-
-				case CELL_ADEC_CH_3_4_LFE:
-					for (s32 i = 0; i < sample_num; i += 8)
-					{
-						const v128 tmp1 = gv_shuffle32<3, 2, 0, 1>(v128::loadu(&_output[i + 4])); // Reorder Rear Left, Rear Right, Side Right, LFE -> LFE, Side Right, Rear Left, Rear Right
-						v128::storeu(tmp1, &_output[i + 4]);
-						const u64 tmp2 = std::rotl(read_from_ptr<u64>(&_output[i + 3]), 0x20); // Swap Side Left and LFE
-						std::memcpy(&_output[i + 3], &tmp2, sizeof(u64));
-					}
-					break;
-
-				default:
-					; // Don't do anything
-				}
-			}
-			else
-			{
-				switch (lpcm_param->sizeOfWord)
-				{
-				case CELL_ADEC_BIT_LENGTH_16: output_size = output_size * 32 / 16; break;
-				case CELL_ADEC_BIT_LENGTH_20: output_size = output_size * 32 / 20; break;
-				case CELL_ADEC_BIT_LENGTH_24: output_size = output_size * 32 / 24; break;
-				default: fmt::throw_exception("Unreachable"); // Parameters get verified in adecSetLpcmDvdParams()
-				}
-
-				// Only the front left and right channels are decoded, all other channels are ignored
-				switch (lpcm_param->channelNumber)
-				{
-				case CELL_ADEC_LPCM_DVD_CH_MONO: // Set channel_num to two for mono as well
-				case CELL_ADEC_LPCM_DVD_CH_STEREO:  channel_num = 2; break;
-				case 4:                             channel_num = 3; output_size = output_size * 2 / 3; break;
-				case 5:                             channel_num = 4; output_size = output_size * 2 / 4; break;
-				case CELL_ADEC_LPCM_DVD_CH_3_2:     channel_num = 5; output_size = output_size * 2 / 5; break;
-				case CELL_ADEC_LPCM_DVD_CH_3_2_LFE: channel_num = 6; output_size = output_size * 2 / 6; break;
-				case CELL_ADEC_LPCM_DVD_CH_3_4:     channel_num = 7; output_size = output_size * 2 / 7; break;
-				case CELL_ADEC_LPCM_DVD_CH_3_4_LFE: channel_num = 8; output_size = output_size * 2 / 8; break;
-				default: fmt::throw_exception("Unreachable"); // Parameters get verified in adecSetLpcmDvdParams()
-				}
-
-				// LLE doesn't check the output size
-				ensure(output_size <= LPCM_DEC_OUTPUT_BUFFER_SIZE);
-
-				// Convert to float
-				switch (lpcm_param->sizeOfWord)
-				{
-				case CELL_ADEC_BIT_LENGTH_16:
-				{
-					s64 i_in = 0;
-					s64 i_out = 0;
-					for (; i_in <= au_size_s16 - channel_num - 2; i_in += channel_num * 2, i_out += 4)
-					{
-						// Load four samples
-						const v128 tmp1 = gv_loadu32(&input_s16[i_in]);
-						const v128 tmp2 = gv_loadu32(&input_s16[i_in + channel_num]);
-						const v128 s16be = gv_unpacklo32(tmp1, tmp2);
-
-						// Convert endianess if necessary and shift left by 16
-						const v128 _s32 = std::endian::native == std::endian::little
-							? gv_shuffle8(s16be, v128::normal_array_t<s8>{ -1, -1, 1, 0, -1, -1, 3, 2, -1, -1, 5, 4, -1, -1, 7, 6 })
-							: gv_unpacklo16(s16be, gv_bcst16(0));
-
-						// Convert to float and divide by INT32_MAX + 1
-						const v128 _f32 = gv_mulfs(gv_cvts32_tofs(_s32), 1.f / static_cast<f32>(0x80000000u));
-
-						v128::storeu(gv_to_be32(_f32), &_output[i_out]);
-					}
-
-					for (; i_in <= au_size_s16 - 2; i_in += channel_num, i_out += 2)
-					{
-						const v128 s16be = gv_loadu32(&input_s16[i_in]);
-
-						const v128 _s32 = std::endian::native == std::endian::little
-							? gv_shuffle8(s16be, v128::normal_array_t<s8>{ -1, -1, 1, 0, -1, -1, 3, 2, -1, -1, 5, 4, -1, -1, 7, 6 })
-							: gv_unpacklo16(s16be, gv_bcst16(0));
-
-						const v128 _f32 = gv_mulfs(gv_cvts32_tofs(_s32), 1.f / static_cast<f32>(0x80000000u));
-
-						std::memcpy(&_output[i_out], &gv_to_be32(_f32)._u64[0], sizeof(u64));
-					}
-					break;
-				}
-				case CELL_ADEC_BIT_LENGTH_20:
-				{
-					const s64 high_bytes_3_4_offset = lpcm_param->channelNumber == CELL_ADEC_LPCM_DVD_CH_MONO ? 5 : channel_num * 2;
-					const s64 low_bits_1_2_offset = lpcm_param->channelNumber == CELL_ADEC_LPCM_DVD_CH_MONO ? 4 : channel_num * 4;
-					const s64 low_bits_3_4_offset = channel_num * 4 + channel_num / 2 - !(channel_num & 1);
-					const s64 next_samples_offset = channel_num * 5;
-
-					// If channel_num is odd, the low bits of samples three and four are in different bytes
-					alignas(alignof(v128)) static constexpr auto shuffle_ctrl_same_offset = std::endian::native == std::endian::little
-						? v128::normal_array_t<s8>{ -1, 8, 1, 0, -1, 8, 3, 2, -1, 11, 5, 4, -1, 11, 7, 6 }
-						: v128::normal_array_t<s8>{ 0, 1, 8, -1, 2, 3, 8, -1, 4, 5, 11, -1, 6, 7, 11, -1 };
-
-					alignas(alignof(v128)) static constexpr auto shuffle_ctrl_different_offset = std::endian::native == std::endian::little
-						? v128::normal_array_t<s8>{ -1, 8, 1, 0, -1, 8, 3, 2, -1, 10, 5, 4, -1, 11, 7, 6 }
-						: v128::normal_array_t<s8>{ 0, 1, 8, -1, 2, 3, 8, -1, 4, 5, 10, -1, 6, 7, 11, -1 };
-
-					const v128 shuffle_ctrl = channel_num & 1 ? v128::loadu(&shuffle_ctrl_different_offset) : v128::loadu(&shuffle_ctrl_same_offset);
-
-					alignas(alignof(v128)) static constexpr auto low_bits_mask_same_offset = std::endian::native == std::endian::little
-						? v128::normal_array_t<u8>{ 0x00, 0xf0, 0xff, 0xff, 0x00, 0x0f, 0xff, 0xff, 0x00, 0xf0, 0xff, 0xff, 0x00, 0x0f, 0xff, 0xff }
-						: v128::normal_array_t<u8>{ 0xff, 0xff, 0xf0, 0x00, 0xff, 0xff, 0x0f, 0x00, 0xff, 0xff, 0xf0, 0x00, 0xff, 0xff, 0x0f, 0x00 };
-
-					alignas(alignof(v128)) static constexpr auto low_bits_mask_different_offset = std::endian::native == std::endian::little
-						? v128::normal_array_t<u8>{ 0x00, 0xf0, 0xff, 0xff, 0x00, 0x0f, 0xff, 0xff, 0x00, 0x0f, 0xff, 0xff, 0x00, 0xf0, 0xff, 0xff }
-						: v128::normal_array_t<u8>{ 0xff, 0xff, 0xf0, 0x00, 0xff, 0xff, 0x0f, 0x00, 0xff, 0xff, 0x0f, 0x00, 0xff, 0xff, 0xf0, 0x00 };
-
-					const v128 low_bits_mask = channel_num & 1 ? v128::loadu(&low_bits_mask_different_offset) : v128::loadu(&low_bits_mask_same_offset);
-
-					for (s64 i_in = 0, i_out = 0; i_in <= au_size_u8 - low_bits_3_4_offset - (channel_num & 1); i_in += next_samples_offset, i_out += 4)
-					{
-						// Load all the high and low bits of four samples
-						const v128 tmp1 = gv_loadu32(&input_u8[i_in]);
-						const v128 tmp2 = gv_loadu32(&input_u8[i_in + high_bytes_3_4_offset]);
-						v128 s20be = gv_unpacklo32(tmp1, tmp2);
-						s20be = gv_insert16<4>(s20be, read_from_ptr<u16>(&input_u8[i_in + low_bits_1_2_offset]));
-						s20be = gv_insert16<5>(s20be, read_from_ptr<u16>(&input_u8[i_in + low_bits_3_4_offset]));
-
-						// Reorder bytes to form four 32-bit integer samples
-						v128 _s32 = gv_shuffle8(s20be, shuffle_ctrl);
-
-						// Set low 12 bits to zero for each sample
-						_s32 = _s32 & low_bits_mask;
-
-						// LLE is missing a step: each byte that was ANDed with 0x0f would still need to be shifted left by 4
-
-						// Convert to float and divide by INT32_MAX + 1
-						const v128 _f32 = gv_mulfs(gv_cvts32_tofs(_s32), 1.f / static_cast<f32>(0x80000000u));
-
-						v128::storeu(gv_to_be32(_f32), &_output[i_out]);
-					}
-					break;
-				}
-				case CELL_ADEC_BIT_LENGTH_24:
-				{
-					const s64 high_bytes_3_4_offset = lpcm_param->channelNumber == CELL_ADEC_LPCM_DVD_CH_MONO ? 6 : channel_num * 2;
-					const s64 low_bytes_1_2_offset = lpcm_param->channelNumber == CELL_ADEC_LPCM_DVD_CH_MONO ? 4 : channel_num * 4;
-					const s64 low_bytes_3_4_offset = channel_num * 5;
-					const s64 next_samples_offset = channel_num * 6;
-
-					for (s64 i_in = 0, i_out = 0; i_in <= au_size_u8 - low_bytes_3_4_offset - 2; i_in += next_samples_offset, i_out += 4)
-					{
-						// Load all the high and low bytes of four samples
-						const v128 tmp1 = gv_loadu32(&input_u8[i_in]);
-						const v128 tmp2 = gv_loadu32(&input_u8[i_in + high_bytes_3_4_offset]);
-						v128 s24be = gv_unpacklo32(tmp1, tmp2);
-						s24be = gv_insert16<4>(s24be, read_from_ptr<u16>(&input_u8[i_in + low_bytes_1_2_offset]));
-						s24be = gv_insert16<5>(s24be, read_from_ptr<u16>(&input_u8[i_in + low_bytes_3_4_offset]));
-
-						// Reorder bytes to form four 32-bit integer samples
-						const v128 _s32 = std::endian::native == std::endian::little
-							? gv_shuffle8(s24be, v128::normal_array_t<s8>{ -1, 8, 1, 0, -1, 9, 3, 2, -1, 10, 5, 4, -1, 11, 7, 6 })
-							: gv_shuffle8(s24be, v128::normal_array_t<s8>{ 0, 1, 8, -1, 2, 3, 9, -1, 4, 5, 10, -1, 6, 7, 11, -1 });
-
-						// Convert to float and divide by INT32_MAX + 1
-						const v128 _f32 = gv_mulfs(gv_cvts32_tofs(_s32), 1.f / static_cast<f32>(0x80000000u));
-
-						v128::storeu(gv_to_be32(_f32), &_output[i_out]);
-					}
-				}
-				}
-			}
-
-			// Block savestate creation during callbacks
-			std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-			if (!savestate_lock.owns_lock())
-			{
-				ppu.state += cpu_flag::again;
-				return;
-			}
-
-			if (error_occurred)
-			{
-				notify_error.cbFunc(ppu, CELL_ADEC_ERROR_FATAL, notify_error.cbArg);
-			}
-
-			notify_au_done.cbFunc(ppu, cmd.pcm_handle, notify_au_done.cbArg);
-
-			output_locked = true;
-			error_occurred |= static_cast<u32>(sys_mutex_unlock(ppu, output_mutex) != CELL_OK);
-
-			const vm::var<CellAdecLpcmInfo> bsi_info{{ lpcm_param->channelNumber, lpcm_param->sampleRate, static_cast<u32>(output_size) }};
-
-			notify_pcm_out.cbFunc(ppu, cmd.pcm_handle, output, static_cast<u32>(output_size), notify_pcm_out.cbArg, vm::make_var<vm::bcptr<void>>(bsi_info), ADEC_CORRECT_PTS_VALUE_TYPE_LPCM_HDMV, error_occurred ? static_cast<s32>(CELL_ADEC_ERROR_FATAL) : CELL_OK);
+			codec = avcodec_find_decoder(AV_CODEC_ID_MP3);
+			input_format = av_find_input_format("mp3");
 			break;
 		}
 		default:
-			fmt::throw_exception("Invalid command");
-		}
-	}
-}
-
-template <LpcmDecCmdType type>
-error_code LpcmDecContext::send_command(ppu_thread& ppu, auto&&... args)
-{
-	ppu.state += cpu_flag::wait;
-
-	if (error_code ret = sys_mutex_lock(ppu, queue_size_mutex, 0); ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	if (cmd_queue.full())
-	{
-		ensure(sys_mutex_unlock(ppu, queue_size_mutex) == CELL_OK); // Error code isn't checked on LLE
-		return CELL_ADEC_ERROR_BUSY;
-	}
-
-	// LLE copies the parameters directly into the context
-	if constexpr (type == LpcmDecCmdType::start_seq)
-	{
-		*lpcm_param = { args... };
-	}
-
-	if (error_code ret = sys_mutex_lock(ppu, queue_mutex, 0); ret != CELL_OK)
-	{
-		ensure(sys_mutex_unlock(ppu, queue_size_mutex) == CELL_OK); // Error code isn't checked on LLE
-		return ret;
-	}
-
-	cmd_queue.emplace(type, std::forward<decltype(args)>(args)...);
-
-	if (error_code ret = sys_mutex_unlock(ppu, queue_mutex); ret != CELL_OK
-		|| (ret = cmd_available.release(ppu)) != CELL_OK)
-	{
-		ensure(sys_mutex_unlock(ppu, queue_size_mutex) == CELL_OK); // Error code isn't checked on LLE
-		return ret;
-	}
-
-	return sys_mutex_unlock(ppu, queue_size_mutex);
-}
-
-inline error_code LpcmDecContext::release_output(ppu_thread& ppu)
-{
-	if (error_code ret = sys_mutex_lock(ppu, output_mutex, 0); ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	output_locked = false;
-
-	if (error_code ret = sys_cond_signal(ppu, output_consumed); ret != CELL_OK)
-	{
-		return ret; // LLE doesn't unlock the mutex
-	}
-
-	return sys_mutex_unlock(ppu, output_mutex);
-}
-
-void lpcmDecEntry(ppu_thread& ppu, vm::ptr<LpcmDecContext> lpcm_dec)
-{
-	lpcm_dec->exec(ppu);
-
-	if (ppu.state & cpu_flag::again)
-	{
-		// For savestates, save argument
-		ppu.syscall_args[0] = lpcm_dec.addr();
-
-		return;
-	}
-
-	ppu_execute<&sys_ppu_thread_exit>(ppu, CELL_OK);
-}
-
-error_code _CellAdecCoreOpGetMemSize_lpcm(vm::ptr<CellAdecAttr> attr)
-{
-	cellAdec.notice("_CellAdecCoreOpGetMemSize_lpcm(attr=*0x%x)", attr);
-
-	constexpr u32 mem_size =
-		utils::align(static_cast<u32>(sizeof(LpcmDecContext)), 0x80)
-		+ utils::align(static_cast<u32>(sizeof(CellAdecParamLpcm)), 0x80)
-		+ 0x100 // Command data for Spurs task
-		+ LPCM_DEC_OUTPUT_BUFFER_SIZE
-		+ 0x2900 // sizeof(CellSpurs) + sizeof(CellSpursTaskset)
-		+ 0x3b400 // Spurs context
-		+ 0x300 // (sizeof(CellSpursQueue) + 0x80 + queue buffer) * 2
-		+ 0x855; // Unused
-
-	static_assert(mem_size == 0x7ebd5);
-
-	attr->workMemSize = mem_size;
-
-	return CELL_OK;
-}
-
-error_code _CellAdecCoreOpOpenExt_lpcm(ppu_thread& ppu, vm::ptr<LpcmDecContext> handle, vm::ptr<AdecNotifyAuDone> notifyAuDone, vm::ptr<void> notifyAuDoneArg, vm::ptr<AdecNotifyPcmOut> notifyPcmOut, vm::ptr<void> notifyPcmOutArg,
-	vm::ptr<AdecNotifyError> notifyError, vm::ptr<void> notifyErrorArg, vm::ptr<AdecNotifySeqDone> notifySeqDone, vm::ptr<void> notifySeqDoneArg, vm::cptr<CellAdecResource> res, vm::cptr<CellAdecResourceSpurs> spursRes)
-{
-	cellAdec.notice("_CellAdecCoreOpOpenExt_lpcm(handle=*0x%x, notifyAuDone=*0x%x, notifyAuDoneArg=0x%x, notifyPcmOut=*0x%x, notifyPcmOutArg=0x%x, notifyError=*0x%x, notifyErrorArg=0x%x, notifySeqDone=*0x%x, notifySeqDoneArg=0x%x, res=*0x%x, spursRes=*0x%x)",
-		handle, notifyAuDone, notifyAuDoneArg, notifyPcmOut, notifyPcmOutArg, notifyError, notifyErrorArg, notifySeqDone, notifySeqDoneArg, res, spursRes);
-
-	ensure(!!handle && !!res); // Not checked on LLE
-	ensure(handle.aligned(0x80)); // LLE doesn't check the alignment or aligns the address itself
-	ensure(!!notifyAuDone && !!notifyAuDoneArg && !!notifyPcmOut && !!notifyPcmOutArg && !!notifyError && !!notifyErrorArg && !!notifySeqDone && !!notifySeqDoneArg); // These should always be set
-
-	const u32 end_of_context_addr = handle.addr() + utils::align(static_cast<u32>(sizeof(LpcmDecContext)), 0x80);
-
-	handle->cmd_queue.front = 0;
-	handle->cmd_queue.back = 0;
-	handle->cmd_queue.size = 0;
-	handle->run_thread = true;
-	handle->notify_au_done = { notifyAuDone, notifyAuDoneArg };
-	handle->notify_pcm_out = { notifyPcmOut, notifyPcmOutArg };
-	handle->notify_error = { notifyError, notifyErrorArg };
-	handle->notify_seq_done = { notifySeqDone, notifySeqDoneArg };
-	handle->output = vm::bptr<f32>::make(end_of_context_addr + 0x180);
-	handle->lpcm_param.set(end_of_context_addr);
-	handle->error_occurred = false;
-
-	const vm::var<sys_mutex_attribute_t> mutex_attr{{ SYS_SYNC_PRIORITY, SYS_SYNC_NOT_RECURSIVE, SYS_SYNC_NOT_PROCESS_SHARED, SYS_SYNC_NOT_ADAPTIVE, 0, 0, 0, { "_adem04"_u64 } }};
-	const vm::var<sys_mutex_attribute_t> output_mutex_attr{{ SYS_SYNC_PRIORITY, SYS_SYNC_NOT_RECURSIVE, SYS_SYNC_NOT_PROCESS_SHARED, SYS_SYNC_NOT_ADAPTIVE, 0, 0, 0, { "_adem05"_u64 } }};
-	const vm::var<sys_mutex_attribute_t> queue_mutex_attr{{ SYS_SYNC_PRIORITY, SYS_SYNC_NOT_RECURSIVE, SYS_SYNC_NOT_PROCESS_SHARED, SYS_SYNC_NOT_ADAPTIVE, 0, 0, 0, { "_adem06"_u64 } }};
-	const vm::var<sys_cond_attribute_t> cond_attr{{ SYS_SYNC_NOT_PROCESS_SHARED, 0, 0, { "_adec03"_u64 } }};
-
-	error_code ret = sys_mutex_create(ppu, handle.ptr(&LpcmDecContext::queue_size_mutex), mutex_attr);
-	ret = ret ? ret : sys_cond_create(ppu, handle.ptr(&LpcmDecContext::queue_size_cond), handle->queue_size_mutex, cond_attr);
-	ret = ret ? ret : sys_mutex_create(ppu, handle.ptr(&LpcmDecContext::unk_mutex), mutex_attr);
-	ret = ret ? ret : sys_cond_create(ppu, handle.ptr(&LpcmDecContext::unk_cond), handle->unk_mutex, cond_attr);
-	ret = ret ? ret : sys_mutex_create(ppu, handle.ptr(&LpcmDecContext::output_mutex), output_mutex_attr);
-	ret = ret ? ret : sys_cond_create(ppu, handle.ptr(&LpcmDecContext::output_consumed), handle->output_mutex, cond_attr);
-	ret = ret ? ret : sys_mutex_create(ppu, handle.ptr(&LpcmDecContext::queue_mutex), queue_mutex_attr);
-	ret = ret ? ret : handle->release_output(ppu);
-	ret = ret ? ret : handle->cmd_available.init(ppu, handle.ptr(&LpcmDecContext::cmd_available), 0);
-	ret = ret ? ret : handle->reserved2.init(ppu, handle.ptr(&LpcmDecContext::reserved2), 0);
-
-	if (ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	// HLE exclusive
-	handle->savestate = lpcm_dec_state::waiting_for_cmd_mutex_lock;
-	handle->cmd_counter = 0;
-
-	const vm::var<char[]> _name = vm::make_str("HLE LPCM decoder");
-	const auto entry = g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(lpcmDecEntry));
-
-	ret = ppu_execute<&sys_ppu_thread_create>(ppu, handle.ptr(&LpcmDecContext::thread_id), entry, handle.addr(), +res->ppuThreadPriority, +res->ppuThreadStackSize, SYS_PPU_THREAD_CREATE_JOINABLE, +_name);
-	ret = ret ? ret : sys_mutex_create(ppu, handle.ptr(&LpcmDecContext::spurs_queue_pop_mutex), mutex_attr);
-	ret = ret ? ret : sys_mutex_create(ppu, handle.ptr(&LpcmDecContext::spurs_queue_push_mutex), mutex_attr);
-
-	return ret;
-}
-
-error_code _CellAdecCoreOpOpen_lpcm(ppu_thread& ppu, vm::ptr<LpcmDecContext> handle, vm::ptr<AdecNotifyAuDone> notifyAuDone, vm::ptr<void> notifyAuDoneArg, vm::ptr<AdecNotifyPcmOut> notifyPcmOut, vm::ptr<void> notifyPcmOutArg,
-	vm::ptr<AdecNotifyError> notifyError, vm::ptr<void> notifyErrorArg, vm::ptr<AdecNotifySeqDone> notifySeqDone, vm::ptr<void> notifySeqDoneArg, vm::cptr<CellAdecResource> res)
-{
-	cellAdec.notice("_CellAdecCoreOpOpen_lpcm(handle=*0x%x, notifyAuDone=*0x%x, notifyAuDoneArg=*0x%x, notifyPcmOut=*0x%x, notifyPcmOutArg=*0x%x, notifyError=*0x%x, notifyErrorArg=*0x%x, notifySeqDone=*0x%x, notifySeqDoneArg=*0x%x, res=*0x%x)",
-		handle, notifyAuDone, notifyAuDoneArg, notifyPcmOut, notifyPcmOutArg, notifyError, notifyErrorArg, notifySeqDone, notifySeqDoneArg, res);
-
-	return _CellAdecCoreOpOpenExt_lpcm(ppu, handle, notifyAuDone, notifyAuDoneArg, notifyPcmOut, notifyPcmOutArg, notifyError, notifyErrorArg, notifySeqDone, notifySeqDoneArg, res, vm::null);
-}
-
-error_code _CellAdecCoreOpClose_lpcm(ppu_thread& ppu, vm::ptr<LpcmDecContext> handle)
-{
-	ppu.state += cpu_flag::wait;
-
-	cellAdec.notice("_CellAdecCoreOpClose_lpcm(handle=*0x%x)", handle);
-
-	if (error_code ret = sys_mutex_lock(ppu, handle->queue_size_mutex, 0); ret != CELL_OK
-		|| (ret = sys_mutex_lock(ppu, handle->queue_mutex, 0)) != CELL_OK)
-	{
-		return ret;
-	}
-
-	if (handle->cmd_queue.empty())
-	{
-		handle->cmd_queue.emplace(LpcmDecCmdType::close);
-
-		if (error_code ret = sys_mutex_unlock(ppu, handle->queue_mutex); ret != CELL_OK)
 		{
-			return ret; // LLE doesn't unlock the queue size mutex
+			fmt::throw_exception("Unknown type (0x%x)", type);
+		}
 		}
 
-		if (error_code ret = handle->cmd_available.release(ppu); ret != CELL_OK)
+		if (!codec)
 		{
-			ensure(sys_mutex_unlock(ppu, handle->queue_size_mutex) == CELL_OK); // Error code isn't checked on LLE
-			return ret;
+			fmt::throw_exception("avcodec_find_decoder() failed");
 		}
-	}
-	else
-	{
-		for (auto& cmd : handle->cmd_queue.elements)
+		if (!input_format)
 		{
-			cmd.type = LpcmDecCmdType::close;
+			fmt::throw_exception("av_find_input_format() failed");
 		}
-
-		if (error_code ret = sys_mutex_unlock(ppu, handle->queue_mutex); ret != CELL_OK)
+		fmt = avformat_alloc_context();
+		if (!fmt)
 		{
-			return ret; // LLE doesn't unlock the queue size mutex
+			fmt::throw_exception("avformat_alloc_context() failed");
+		}
+		io_buf = static_cast<u8*>(av_malloc(4096));
+		fmt->pb = avio_alloc_context(io_buf, 256, 0, this, adecRead, nullptr, nullptr);
+		if (!fmt->pb)
+		{
+			fmt::throw_exception("avio_alloc_context() failed");
 		}
 	}
 
-	error_code ret = sys_mutex_unlock(ppu, handle->queue_size_mutex);
-	ret = ret ? ret : handle->release_output(ppu);
-
-	vm::var<u64> thread_ret;
-	ret = ret ? ret : sys_ppu_thread_join(ppu, static_cast<u32>(handle->thread_id), +thread_ret);
-
-	ret = ret ? ret : sys_cond_destroy(ppu, handle->queue_size_cond);
-	ret = ret ? ret : sys_cond_destroy(ppu, handle->unk_cond);
-	ret = ret ? ret : sys_cond_destroy(ppu, handle->output_consumed);
-	ret = ret ? ret : sys_mutex_destroy(ppu, handle->queue_mutex);
-	ret = ret ? ret : sys_mutex_destroy(ppu, handle->queue_size_mutex);
-	ret = ret ? ret : sys_mutex_destroy(ppu, handle->unk_mutex);
-	ret = ret ? ret : sys_mutex_destroy(ppu, handle->output_mutex);
-	ret = ret ? ret : handle->cmd_available.finalize(ppu);
-	ret = ret ? ret : handle->reserved2.finalize(ppu);
-	ret = ret ? ret : sys_mutex_destroy(ppu, handle->spurs_queue_pop_mutex);
-	ret = ret ? ret : sys_mutex_destroy(ppu, handle->spurs_queue_push_mutex);
-
-	return ret;
-}
-
-error_code _CellAdecCoreOpStartSeq_lpcm(ppu_thread& ppu, vm::ptr<LpcmDecContext> handle, vm::ptr<CellAdecParamLpcm> lpcmParam)
-{
-	cellAdec.notice("_CellAdecCoreOpStartSeq_lpcm(handle=*0x%x, lpcmParam=*0x%x)", handle, lpcmParam);
-
-	ensure(!!handle && !!lpcmParam); // Not checked on LLE
-
-	cellAdec.notice("_CellAdecCoreOpStartSeq_lpcm(): channelNumber=%d, sampleRate=%d, sizeOfWord=%d, audioPayloadSize=0x%x", lpcmParam->channelNumber, lpcmParam->sampleRate, lpcmParam->sizeOfWord, lpcmParam->audioPayloadSize);
-
-	if (lpcmParam->channelNumber >= 0x20u || lpcmParam->sampleRate >= 0x20u || lpcmParam->sizeOfWord >= 0x20u || lpcmParam->audioPayloadSize == 0u)
+	~AudioDecoder()
 	{
-		return CELL_ADEC_ERROR_LPCM_ARG;
-	}
-
-	return handle->send_command<LpcmDecCmdType::start_seq>(ppu, *lpcmParam);
-}
-
-error_code _CellAdecCoreOpEndSeq_lpcm(ppu_thread& ppu, vm::ptr<LpcmDecContext> handle)
-{
-	cellAdec.notice("_CellAdecCoreOpEndSeq_lpcm(handle=*0x%x)", handle);
-
-	ensure(!!handle); // Not checked on LLE
-
-	return handle->send_command<LpcmDecCmdType::end_seq>(ppu);
-}
-
-error_code _CellAdecCoreOpDecodeAu_lpcm(ppu_thread& ppu, vm::ptr<LpcmDecContext> handle, s32 pcmHandle, vm::ptr<CellAdecAuInfo> auInfo)
-{
-	cellAdec.trace("_CellAdecCoreOpDecodeAu_lpcm(handle=*0x%x, pcmHandle=%d, auInfo=*0x%x)", handle, pcmHandle, auInfo);
-
-	ensure(!!handle && !!auInfo); // Not checked on LLE
-
-	cellAdec.trace("_CellAdecCoreOpDecodeAu_lpcm(): startAddr=*0x%x, size=0x%x, pts=0x%x, userData=0x%016x", auInfo->startAddr, auInfo->size, std::bit_cast<be_t<u64>>(auInfo->pts), auInfo->userData);
-
-	return handle->send_command<LpcmDecCmdType::decode_au>(ppu, pcmHandle, *auInfo);
-}
-
-void _CellAdecCoreOpGetVersion_lpcm(vm::ptr<be_t<u32, 1>> version)
-{
-	cellAdec.notice("_CellAdecCoreOpGetVersion_lpcm(version=*0x%x)", version);
-
-	*version = 0x20070323;
-}
-
-error_code _CellAdecCoreOpRealign_lpcm(vm::ptr<LpcmDecContext> handle, vm::ptr<void> outBuffer, vm::cptr<void> pcmStartAddr)
-{
-	cellAdec.trace("_CellAdecCoreOpRealign_lpcm(handle=*0x%x, outBuffer=*0x%x, pcmStartAddr=*0x%x)", handle, outBuffer, pcmStartAddr);
-
-	if (!pcmStartAddr)
-	{
-		return CELL_ADEC_ERROR_LPCM_ARG;
-	}
-
-	if (outBuffer)
-	{
-		ensure(!!handle); // Not checked on LLE
-		ensure(vm::check_addr(outBuffer.addr(), vm::page_info_t::page_writable, handle->output_size));
-
-		std::memcpy(outBuffer.get_ptr(), pcmStartAddr.get_ptr(), handle->output_size);
-	}
-
-	return CELL_OK;
-}
-
-error_code _CellAdecCoreOpReleasePcm_lpcm(ppu_thread& ppu, vm::ptr<LpcmDecContext> handle, s32 pcmHandle, vm::ptr<void> outBuffer)
-{
-	ppu.state += cpu_flag::wait;
-
-	cellAdec.trace("_CellAdecCoreOpReleasePcm_lpcm(handle=*0x%x, pcmHandle=%d, outBuffer=*0x%x)", handle, pcmHandle, outBuffer);
-
-	ensure(!!handle); // Not checked on LLE
-
-	return handle->release_output(ppu);
-}
-
-s32 _CellAdecCoreOpGetPcmHandleNum_lpcm()
-{
-	cellAdec.notice("_CellAdecCoreOpGetPcmHandleNum_lpcm()");
-
-	return 8;
-}
-
-u32 _CellAdecCoreOpGetBsiInfoSize_lpcm()
-{
-	cellAdec.notice("_CellAdecCoreOpGetBsiInfoSize_lpcm()");
-
-	return sizeof(CellAdecLpcmInfo);
-}
-
-
-// cellAdec abstraction layer, operates the individual decoders
-
-error_code AdecContext::get_new_pcm_handle(vm::ptr<CellAdecAuInfo> au_info) const
-{
-	for (s32 i = 0; i < frames_num; i++)
-	{
-		if (!frames[i].in_use)
+		// TODO: check finalization
+		AdecFrame af;
+		while (frames.try_pop(af))
 		{
-			frames[i].in_use = true;
-			frames[i].au_info = *au_info;
-			return not_an_error(i);
+			av_frame_unref(af.data);
+			av_frame_free(&af.data);
 		}
-	}
-
-	return CELL_ADEC_ERROR_BUSY;
-}
-
-error_code AdecContext::verify_pcm_handle(s32 pcm_handle) const
-{
-	ensure(pcm_handle >= 0 && pcm_handle < frames_num); // Not properly checked on LLE, see below
-
-	if ((pcm_handle < 0 && /* LLE uses && instead of || */ pcm_handle >= frames_num) || !frames[pcm_handle].in_use)
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	return CELL_OK;
-}
-
-vm::ptr<CellAdecAuInfo> AdecContext::get_au_info(s32 pcm_handle) const
-{
-	if (verify_pcm_handle(pcm_handle) == static_cast<s32>(CELL_ADEC_ERROR_FATAL))
-	{
-		return vm::null;
-	}
-
-	return (frames + pcm_handle).ptr(&AdecFrame::au_info);
-}
-
-void AdecContext::set_state(s32 pcm_handle, u32 state) const
-{
-	if (state == 1u << 9)
-	{
-		frames[pcm_handle].au_done = true;
-	}
-	else if (state == 1u << 11)
-	{
-		frames[pcm_handle].pcm_out = true;
-	}
-}
-
-error_code AdecContext::get_pcm_item(s32 pcm_handle, vm::ptr<CellAdecPcmItem>& pcm_item) const
-{
-	if (verify_pcm_handle(pcm_handle) == static_cast<s32>(CELL_ADEC_ERROR_FATAL))
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	pcm_item = (frames + pcm_handle).ptr(&AdecFrame::pcm_item);
-
-	return CELL_OK;
-}
-
-error_code AdecContext::set_pcm_item(s32 pcm_handle, vm::ptr<void> pcm_addr, u32 pcm_size, vm::cpptr<void> bitstream_info) const
-{
-	if (verify_pcm_handle(pcm_handle) == static_cast<s32>(CELL_ADEC_ERROR_FATAL))
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	frames[pcm_handle].pcm_item.pcmHandle = pcm_handle;
-	frames[pcm_handle].pcm_item.status = CELL_OK;
-	frames[pcm_handle].pcm_item.startAddr = pcm_addr;
-	frames[pcm_handle].pcm_item.size = pcm_size;
-	frames[pcm_handle].pcm_item.auInfo = frames[pcm_handle].au_info;
-	std::memcpy(frames[pcm_handle].pcm_item.pcmAttr.bsiInfo.get_ptr(), bitstream_info->get_ptr(), bitstream_info_size);
-
-	return CELL_OK;
-}
-
-error_code AdecContext::link_frame(ppu_thread& ppu, s32 pcm_handle)
-{
-	ensure(sys_mutex_lock(ppu, mutex, 0) == CELL_OK); // Error code isn't checked on LLE
-
-	if (verify_pcm_handle(pcm_handle) == static_cast<s32>(CELL_ADEC_ERROR_FATAL))
-	{
-		ensure(sys_mutex_unlock(ppu, mutex) == CELL_OK); // Error code isn't checked on LLE
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	if (frames_tail == -1 && frames_head == -1)
-	{
-		frames[pcm_handle].next = pcm_handle;
-		frames[pcm_handle].prev = pcm_handle;
-		frames_head = pcm_handle;
-		frames_tail = pcm_handle;
-	}
-	else if (frames_tail != -1 && frames_head != -1)
-	{
-		frames[pcm_handle].next = pcm_handle;
-		frames[pcm_handle].prev = frames_tail;
-		frames[frames_tail].next = pcm_handle;
-		frames_tail = pcm_handle;
-	}
-	else
-	{
-		ensure(sys_mutex_unlock(ppu, mutex) == CELL_OK); // Error code isn't checked on LLE
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	ensure(sys_mutex_unlock(ppu, mutex) == CELL_OK); // Error code isn't checked on LLE
-	return CELL_OK;
-}
-
-error_code AdecContext::unlink_frame(ppu_thread& ppu, s32 pcm_handle)
-{
-	ensure(sys_mutex_lock(ppu, mutex, 0) == CELL_OK); // Error code isn't checked on LLE
-
-	if (verify_pcm_handle(pcm_handle) == static_cast<s32>(CELL_ADEC_ERROR_FATAL))
-	{
-		ensure(sys_mutex_unlock(ppu, mutex) == CELL_OK); // Error code isn't checked on LLE
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	if (frames_head == -1 || frames_tail == -1)
-	{
-		ensure(sys_mutex_unlock(ppu, mutex) == CELL_OK); // Error code isn't checked on LLE
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	const s32 next = frames[pcm_handle].next;
-	const s32 prev = frames[pcm_handle].prev;
-
-	if (frames_head == frames_tail)
-	{
-		if (pcm_handle != frames_tail)
+		if (ctx)
 		{
-			ensure(sys_mutex_unlock(ppu, mutex) == CELL_OK); // Error code isn't checked on LLE
-			return CELL_ADEC_ERROR_FATAL;
+			avcodec_close(ctx);
+			avformat_close_input(&fmt);
 		}
-
-		frames_head = -1;
-		frames_tail = -1;
-		frames[pcm_handle].next = -1;
-		frames[pcm_handle].prev = -1;
-	}
-	else if (pcm_handle == frames_head)
-	{
-		frames_head = next;
-		frames[prev].next = next;
-	}
-	else if (pcm_handle == frames_tail)
-	{
-		frames_tail = prev;
-		frames[next].prev = prev;
-	}
-	else
-	{
-		frames[next].prev = prev;
-		frames[prev].next = next;
-	}
-
-	ensure(sys_mutex_unlock(ppu, mutex) == CELL_OK); // Error code isn't checked on LLE
-	return CELL_OK;
-}
-
-void AdecContext::reset_frame(s32 pcm_handle) const
-{
-	frames[pcm_handle].in_use = false;
-	frames[pcm_handle].au_done = false;
-	frames[pcm_handle].pcm_out = false;
-	frames[pcm_handle].next = -1;
-	frames[pcm_handle].prev = -1;
-}
-
-error_code AdecContext::correct_pts_value(ppu_thread& ppu, s32 pcm_handle, s8 correct_pts_type)
-{
-	if (verify_pcm_handle(pcm_handle) == static_cast<s32>(CELL_ADEC_ERROR_FATAL))
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	const vm::ptr<CellCodecTimeStamp> au_pts = (frames + pcm_handle).ptr(&AdecFrame::au_info).ptr(&CellAdecAuInfo::pts);
-
-	switch (correct_pts_type)
-	{
-	case ADEC_CORRECT_PTS_VALUE_TYPE_EAC3:    return ppu_execute<&_SceAdecCorrectPtsValue_Ddp>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_DTSHD:   return ppu_execute<&_SceAdecCorrectPtsValue_DtsHd>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_CELP:    return ppu_execute<&_SceAdecCorrectPtsValue_Celp>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_M2AAC:   return ppu_execute<&_SceAdecCorrectPtsValue_Aac>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_MPEG_L2: return ppu_execute<&_SceAdecCorrectPtsValue_mpmc>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_TRUEHD:  return ppu_execute<&_SceAdecCorrectPtsValue_truehd>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_DTS:     return ppu_execute<&_SceAdecCorrectPtsValue_DtsCore>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_M4AAC:
-		switch (type.audioCodecType)
+		if (fmt)
 		{
-		case CELL_ADEC_TYPE_M4AAC:         return ppu_execute<&_SceAdecCorrectPtsValue_M4Aac>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-		case CELL_ADEC_TYPE_M4AAC_2CH:     return ppu_execute<&_SceAdecCorrectPtsValue_M4Aac2ch>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-		case CELL_ADEC_TYPE_M4AAC_2CH_MOD: return ppu_execute<&_SceAdecCorrectPtsValue_M4Aac2chmod>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-		default:                           return CELL_OK;
-		}
-
-	case ADEC_CORRECT_PTS_VALUE_TYPE_WMA:            return ppu_execute<&_SceAdecCorrectPtsValue_wma>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_DTSLBR:         return ppu_execute<&_SceAdecCorrectPtsValue_DtsLbr>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_MPEG_L1:        return ppu_execute<&_SceAdecCorrectPtsValue_mpmcl1>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_MP3S:           return ppu_execute<&_SceAdecCorrectPtsValue_Mp3s>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_CELP8:          return ppu_execute<&_SceAdecCorrectPtsValue_Celp8>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_WMAPRO:         return ppu_execute<&_SceAdecCorrectPtsValue_WmaPro>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_WMALSL:         return ppu_execute<&_SceAdecCorrectPtsValue_WmaLsl>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	case ADEC_CORRECT_PTS_VALUE_TYPE_DTSHDCORE_UNK1: // Same as below
-	case ADEC_CORRECT_PTS_VALUE_TYPE_DTSHDCORE_UNK2: return ppu_execute<&_SceAdecCorrectPtsValue_DtsHd_Core>(ppu, +core_handle, au_pts) != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : static_cast<error_code>(CELL_OK);
-	}
-
-	// If the user didn't set a PTS, we need to interpolate from the previous PTS
-	if (au_pts->upper == CODEC_TS_INVALID)
-	{
-		if (au_pts->lower != CODEC_TS_INVALID)
-		{
-			return CELL_ADEC_ERROR_FATAL;
-		}
-
-		if (previous_pts.upper == CODEC_TS_INVALID && previous_pts.lower == CODEC_TS_INVALID)
-		{
-			return CELL_OK;
-		}
-
-		const u32 pts_adjust = [&]
-		{
-			switch (correct_pts_type)
+			if (io_buf)
 			{
-			case ADEC_CORRECT_PTS_VALUE_TYPE_LPCM_HDMV:      return 450;
-			case ADEC_CORRECT_PTS_VALUE_TYPE_LPCM_DVD:       return 150;
-			case ADEC_CORRECT_PTS_VALUE_TYPE_ATRACX_48000Hz: return 3840;
-			case ADEC_CORRECT_PTS_VALUE_TYPE_ATRACX_44100Hz: return 4180;
-			case ADEC_CORRECT_PTS_VALUE_TYPE_ATRACX_32000Hz: return 5760;
-			case ADEC_CORRECT_PTS_VALUE_TYPE_AC3:            return 2880;
-			case ADEC_CORRECT_PTS_VALUE_TYPE_ATRAC3:         return 4180;
-			case ADEC_CORRECT_PTS_VALUE_TYPE_MP3_48000Hz:    return 2160;
-			case ADEC_CORRECT_PTS_VALUE_TYPE_MP3_44100Hz:    return 2351;
-			case ADEC_CORRECT_PTS_VALUE_TYPE_MP3_32000Hz:    return 3240;
-			case ADEC_CORRECT_PTS_VALUE_TYPE_ATRAC3MULTI:    return 3840;
-			default:                                         return 0;
+				av_free(io_buf);
 			}
-		}();
-
-		au_pts->upper = previous_pts.upper;
-		au_pts->lower = previous_pts.lower + pts_adjust;
-
-		if (au_pts->lower < previous_pts.lower) // overflow
-		{
-			au_pts->upper = (au_pts->upper + 1) & 1;
-		}
-
-		if (au_pts->upper == CODEC_TS_INVALID)
-		{
-			return CELL_ADEC_ERROR_FATAL;
+			if (fmt->pb) av_free(fmt->pb);
+			avformat_free_context(fmt);
 		}
 	}
 
-	if (au_pts->lower == CODEC_TS_INVALID)
+	void non_task()
 	{
-		return CELL_ADEC_ERROR_FATAL;
+		while (true)
+		{
+			if (Emu.IsStopped() || is_closed)
+			{
+				break;
+			}
+
+			if (!job.pop(task, &is_closed))
+			{
+				break;
+			}
+
+			switch (task.type)
+			{
+			case adecStartSeq:
+			{
+				// TODO: reset data
+				cellAdec.warning("adecStartSeq:");
+
+				reader.addr = 0;
+				reader.size = 0;
+				reader.init = false;
+				reader.has_ats = false;
+				just_started = true;
+
+				if (adecIsAtracX(type))
+				{
+					ch_cfg = task.at3p.channel_config;
+					ch_out = task.at3p.channels;
+					frame_size = task.at3p.frame_size;
+					sample_rate = task.at3p.sample_rate;
+					use_ats_headers = task.at3p.ats_header == 1;
+				}
+				break;
+			}
+
+			case adecEndSeq:
+			{
+				// TODO: finalize
+				cellAdec.warning("adecEndSeq:");
+				cbFunc(*this, id, CELL_ADEC_MSG_TYPE_SEQDONE, CELL_OK, cbArg);
+				lv2_obj::sleep(*this);
+
+				just_finished = true;
+				break;
+			}
+
+			case adecDecodeAu:
+			{
+				int err = 0;
+
+				reader.addr = task.au.addr;
+				reader.size = task.au.size;
+				reader.has_ats = use_ats_headers;
+				//cellAdec.notice("Audio AU: size = 0x%x, pts = 0x%llx", task.au.size, task.au.pts);
+
+				if (just_started)
+				{
+					first_pts = task.au.pts;
+					last_pts = task.au.pts;
+					if (adecIsAtracX(type)) last_pts -= 0x10000; // hack
+				}
+
+				struct AVPacketHolder : AVPacket
+				{
+					AVPacketHolder(u32 size)
+					{
+						av_init_packet(this);
+
+						if (size)
+						{
+							data = static_cast<u8*>(av_calloc(1, size + AV_INPUT_BUFFER_PADDING_SIZE));
+							this->size = size + AV_INPUT_BUFFER_PADDING_SIZE;
+						}
+						else
+						{
+							data = nullptr;
+							size = 0;
+						}
+					}
+
+					~AVPacketHolder()
+					{
+						av_free(data);
+					}
+
+				} au(0);
+
+				if (just_started && just_finished)
+				{
+					avcodec_flush_buffers(ctx);
+
+					reader.init = true; // wrong
+					just_finished = false;
+					just_started = false;
+				}
+				else if (just_started) // deferred initialization
+				{
+					AVDictionary* opts = nullptr;
+					av_dict_set(&opts, "probesize", "96", 0);
+					err = avformat_open_input(&fmt, nullptr, input_format, &opts);
+					if (err || opts)
+					{
+						fmt::throw_exception("avformat_open_input() failed (err=0x%x, opts=%d)", err, opts ? 1 : 0);
+					}
+					//err = avformat_find_stream_info(fmt, NULL);
+					//if (err || !fmt->nb_streams)
+					//{
+					//	ADEC_ERROR("adecDecodeAu: avformat_find_stream_info() failed (err=0x%x, nb_streams=%d)", err, fmt->nb_streams);
+					//}
+					if (!avformat_new_stream(fmt, codec))
+					{
+						fmt::throw_exception("avformat_new_stream() failed");
+					}
+					//ctx = fmt->streams[0]->codec; // TODO: check data
+
+					opts = nullptr;
+					av_dict_set(&opts, "refcounted_frames", "1", 0);
+					{
+						std::lock_guard lock(g_mutex_avcodec_open2);
+						// not multithread-safe (???)
+						err = avcodec_open2(ctx, codec, &opts);
+					}
+					if (err || opts)
+					{
+						fmt::throw_exception("avcodec_open2() failed (err=0x%x, opts=%d)", err, opts ? 1 : 0);
+					}
+					just_started = false;
+				}
+
+				bool last_frame = false;
+
+				while (true)
+				{
+					if (Emu.IsStopped() || is_closed)
+					{
+						if (Emu.IsStopped()) cellAdec.warning("adecDecodeAu: aborted");
+						break;
+					}
+
+					last_frame = av_read_frame(fmt, &au) < 0;
+					if (last_frame)
+					{
+						//break;
+						av_free(au.data);
+						au.data = NULL;
+						au.size = 0;
+					}
+
+					struct AdecFrameHolder : AdecFrame
+					{
+						AdecFrameHolder()
+						{
+							data = av_frame_alloc();
+						}
+
+						~AdecFrameHolder()
+						{
+							if (data)
+							{
+								av_frame_unref(data);
+								av_frame_free(&data);
+							}
+						}
+
+					} frame;
+
+					if (!frame.data)
+					{
+						fmt::throw_exception("av_frame_alloc() failed");
+					}
+
+					int got_frame = 0;
+
+					int decode = 0; //avcodec_decode_audio4(ctx, frame.data, &got_frame, &au);
+
+					if (decode <= 0)
+					{
+						if (decode < 0)
+						{
+							cellAdec.error("adecDecodeAu: AU decoding error(0x%x)", decode);
+						}
+						if (!got_frame && reader.size == 0) break;
+					}
+
+					if (got_frame)
+					{
+						//u64 ts = av_frame_get_best_effort_timestamp(frame.data);
+						//if (ts != AV_NOPTS_VALUE)
+						//{
+						//	frame.pts = ts/* - first_pts*/;
+						//	last_pts = frame.pts;
+						//}
+						last_pts += frame.data->nb_samples * 90000ull / frame.data->sample_rate;
+						frame.pts = last_pts;
+
+						s32 nbps = av_get_bytes_per_sample(static_cast<AVSampleFormat>(frame.data->format));
+						switch (frame.data->format)
+						{
+						case AV_SAMPLE_FMT_FLTP: break;
+						case AV_SAMPLE_FMT_S16P: break;
+						default:
+						{
+							fmt::throw_exception("Unsupported frame format(%d)", frame.data->format);
+						}
+						}
+						frame.auAddr = task.au.addr;
+						frame.auSize = task.au.size;
+						frame.userdata = task.au.userdata;
+						frame.size = frame.data->nb_samples * frame.data->channels * nbps;
+
+						//cellAdec.notice("got audio frame (pts=0x%llx, nb_samples=%d, ch=%d, sample_rate=%d, nbps=%d)",
+							//frame.pts, frame.data->nb_samples, frame.data->channels, frame.data->sample_rate, nbps);
+
+						if (frames.push(frame, &is_closed))
+						{
+							frame.data = nullptr; // to prevent destruction
+							cbFunc(*this, id, CELL_ADEC_MSG_TYPE_PCMOUT, CELL_OK, cbArg);
+							lv2_obj::sleep(*this);
+						}
+					}
+				}
+
+				cbFunc(*this, id, CELL_ADEC_MSG_TYPE_AUDONE, task.au.auInfo_addr, cbArg);
+				lv2_obj::sleep(*this);
+				break;
+			}
+
+			case adecClose:
+			{
+				break;
+			}
+
+			default:
+			{
+				fmt::throw_exception("Unknown task(%d)", +task.type);
+			}
+			}
+		}
+
+		is_finished = true;
+	}
+};
+
+int adecRead(void* opaque, u8* buf, int buf_size)
+{
+	AudioDecoder& adec = *static_cast<AudioDecoder*>(opaque);
+
+	int res = 0;
+
+next:
+	if (adecIsAtracX(adec.type) && adec.reader.has_ats)
+	{
+		u8 code1 = vm::read8(adec.reader.addr + 2);
+		u8 code2 = vm::read8(adec.reader.addr + 3);
+		adec.ch_cfg = (code1 >> 2) & 0x7;
+		adec.frame_size = (((u32{code1} & 0x3) << 8) | code2) * 8 + 8;
+		adec.sample_rate = at3freq[code1 >> 5];
+
+		adec.reader.size -= 8;
+		adec.reader.addr += 8;
+		adec.reader.has_ats = false;
 	}
 
-	previous_pts = *au_pts;
+	if (adecIsAtracX(adec.type) && !adec.reader.init)
+	{
+		OMAHeader oma(1 /* atrac3p id */, adec.sample_rate, adec.ch_cfg, adec.frame_size);
+		if (buf_size + 0u < sizeof(oma))
+		{
+			cellAdec.fatal("adecRead(): OMAHeader writing failed");
+			return 0;
+		}
 
-	return CELL_OK;
+		memcpy(buf, &oma, sizeof(oma));
+		buf += sizeof(oma);
+		buf_size -= sizeof(oma);
+		res += sizeof(oma);
+
+		adec.reader.init = true;
+	}
+
+	if (adec.reader.size < static_cast<u32>(buf_size) /*&& !adec.just_started*/)
+	{
+		AdecTask task;
+		if (!adec.job.peek(task, 0, &adec.is_closed))
+		{
+			if (Emu.IsStopped()) cellAdec.warning("adecRawRead() aborted");
+			return 0;
+		}
+
+		switch (task.type)
+		{
+		case adecEndSeq:
+		case adecClose:
+		{
+			buf_size = adec.reader.size;
+			break;
+		}
+		case adecDecodeAu:
+		{
+			std::memcpy(buf, vm::base(adec.reader.addr), adec.reader.size);
+
+			buf += adec.reader.size;
+			buf_size -= adec.reader.size;
+			res += adec.reader.size;
+
+			adec.cbFunc(adec, adec.id, CELL_ADEC_MSG_TYPE_AUDONE, adec.task.au.auInfo_addr, adec.cbArg);
+
+			adec.job.pop(adec.task);
+
+			adec.reader.addr = adec.task.au.addr;
+			adec.reader.size = adec.task.au.size;
+			adec.reader.has_ats = adec.use_ats_headers;
+			//cellAdec.notice("Audio AU: size = 0x%x, pts = 0x%llx", adec.task.au.size, adec.task.au.pts);
+			break;
+		}
+		case adecStartSeq: // TODO ?
+		default:
+		{
+			cellAdec.fatal("adecRawRead(): unknown task (%d)", +task.type);
+			return -1;
+		}
+		}
+
+		goto next;
+	}
+	else if (adec.reader.size < static_cast<u32>(buf_size) && 0)
+	{
+		buf_size = adec.reader.size;
+	}
+
+	if (!buf_size)
+	{
+		return res;
+	}
+
+	std::memcpy(buf, vm::base(adec.reader.addr), buf_size);
+
+	adec.reader.addr += buf_size;
+	adec.reader.size -= buf_size;
+	return res + buf_size;
 }
 
-static vm::cptr<CellAdecCoreOps> get_core_ops(s32 type)
+bool adecCheckType(s32 type)
 {
 	switch (type)
 	{
-	case CELL_ADEC_TYPE_INVALID1:      fmt::throw_exception("Invalid audio codec: CELL_ADEC_TYPE_INVALID1");
-	case CELL_ADEC_TYPE_LPCM_PAMF:     return g_cell_adec_core_ops_lpcm;
-	case CELL_ADEC_TYPE_AC3:           return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cell_libac3dec.variables.find(0xc58bb170)->second.export_addr);
-	case CELL_ADEC_TYPE_ATRACX:        return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellAtracXdec.variables.find(0x4944af9a)->second.export_addr);
-	case CELL_ADEC_TYPE_MP3:           return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellMP3dec.variables.find(0x84276a23)->second.export_addr);
-	case CELL_ADEC_TYPE_ATRAC3:        return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellAtrac3dec.variables.find(0x60487d65)->second.export_addr);
-	case CELL_ADEC_TYPE_MPEG_L2:       return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellM2BCdec.variables.find(0x300afe4d)->second.export_addr);
-	case CELL_ADEC_TYPE_M2AAC:         return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellM2AACdec.variables.find(0xac2f0831)->second.export_addr);
-	case CELL_ADEC_TYPE_EAC3:          return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellDDPdec.variables.find(0xf5e9c15c)->second.export_addr);
-	case CELL_ADEC_TYPE_TRUEHD:        return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellTRHDdec.variables.find(0xe88e381b)->second.export_addr);
-	case CELL_ADEC_TYPE_DTS:           return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellDTSdec.variables.find(0x15248ec5)->second.export_addr);
-	case CELL_ADEC_TYPE_CELP:          return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellCelpDec.variables.find(0xffe42c22)->second.export_addr);
-	case CELL_ADEC_TYPE_LPCM_BLURAY:   return g_cell_adec_core_ops_lpcm;
-	case CELL_ADEC_TYPE_ATRACX_2CH:    return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellAtracXdec.variables.find(0x076b33ab)->second.export_addr);
-	case CELL_ADEC_TYPE_ATRACX_6CH:    return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellAtracXdec.variables.find(0x1d210eaa)->second.export_addr);
-	case CELL_ADEC_TYPE_ATRACX_8CH:    return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellAtracXdec.variables.find(0xe9a86e54)->second.export_addr);
-	case CELL_ADEC_TYPE_M4AAC:         return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellM4AacDec.variables.find(0xab61278d)->second.export_addr);
-	case CELL_ADEC_TYPE_LPCM_DVD:      return g_cell_adec_core_ops_lpcm;
-	case CELL_ADEC_TYPE_WMA:           return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellWMAdec.variables.find(0x88320b10)->second.export_addr);
-	case CELL_ADEC_TYPE_DTSLBR:        return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellDTSLBRdec.variables.find(0x8c50af52)->second.export_addr);
-	case CELL_ADEC_TYPE_M4AAC_2CH:     return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellM4AacDec2ch.variables.find(0xe996c664)->second.export_addr);
-	case CELL_ADEC_TYPE_DTSHD:         return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellDTSHDdec.variables.find(0x51ac2b6c)->second.export_addr);
-	case CELL_ADEC_TYPE_MPEG_L1:       return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellMPL1dec.variables.find(0xbbc70551)->second.export_addr);
-	case CELL_ADEC_TYPE_MP3S:          return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellMP3Sdec.variables.find(0x292cdf0a)->second.export_addr);
-	case CELL_ADEC_TYPE_M4AAC_2CH_MOD: return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellM4AacDec2chmod.variables.find(0xdbd26836)->second.export_addr);
-	case CELL_ADEC_TYPE_CELP8:         return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellCelp8Dec.variables.find(0xf0190c6c)->second.export_addr);
-	case CELL_ADEC_TYPE_INVALID2:      fmt::throw_exception("Invalid audio codec: CELL_ADEC_TYPE_INVALID2");
-	case CELL_ADEC_TYPE_INVALID3:      fmt::throw_exception("Invalid audio codec: CELL_ADEC_TYPE_INVALID3");
-	case CELL_ADEC_TYPE_RESERVED22:    fmt::throw_exception("Invalid audio codec: CELL_ADEC_TYPE_RESERVED22");
-	case CELL_ADEC_TYPE_RESERVED23:    fmt::throw_exception("Invalid audio codec: CELL_ADEC_TYPE_RESERVED23");
-	case CELL_ADEC_TYPE_DTSHDCORE:     return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellDTSHDCOREdec.variables.find(0x6c8f4f1c)->second.export_addr);
-	case CELL_ADEC_TYPE_ATRAC3MULTI:   return vm::cptr<CellAdecCoreOps>::make(*ppu_module_manager::cellAtrac3multidec.variables.find(0xc20c6bd7)->second.export_addr);
-	default:                           fmt::throw_exception("Invalid audio codec: %d", type);
-	}
-}
+	case CELL_ADEC_TYPE_ATRACX: cellAdec.notice("adecCheckType(): ATRAC3plus"); break;
+	case CELL_ADEC_TYPE_ATRACX_2CH: cellAdec.notice("adecCheckType(): ATRAC3plus 2ch"); break;
+	case CELL_ADEC_TYPE_ATRACX_6CH: cellAdec.notice("adecCheckType(): ATRAC3plus 6ch"); break;
+	case CELL_ADEC_TYPE_ATRACX_8CH: cellAdec.notice("adecCheckType(): ATRAC3plus 8ch"); break;
+	case CELL_ADEC_TYPE_MP3: cellAdec.notice("adecCheckType(): MP3"); break;
 
-error_code adecNotifyAuDone(ppu_thread& ppu, s32 pcmHandle, vm::ptr<AdecContext> handle)
-{
-	// Block savestate creation during callbacks
-	std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!savestate_lock.owns_lock())
+	case CELL_ADEC_TYPE_LPCM_PAMF:
+	case CELL_ADEC_TYPE_AC3:
+	case CELL_ADEC_TYPE_ATRAC3:
+	case CELL_ADEC_TYPE_MPEG_L2:
+	case CELL_ADEC_TYPE_CELP:
+	case CELL_ADEC_TYPE_M4AAC:
+	case CELL_ADEC_TYPE_CELP8:
 	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	cellAdec.trace("adecNotifyAuDone(pcmHandle=%d, handle=*0x%x)", pcmHandle, handle);
-
-	ensure(!!handle); // Not checked on LLE
-
-	const auto au_info = handle->get_au_info(pcmHandle);
-
-	if (!au_info)
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	handle->set_state(pcmHandle, 1u << 9);
-
-	handle->callback.cbFunc(ppu, handle, CELL_ADEC_MSG_TYPE_AUDONE, static_cast<s32>(au_info.addr()), handle->callback.cbArg);
-
-	return CELL_OK;
-}
-
-error_code adecNotifyPcmOut(ppu_thread& ppu, s32 pcmHandle, vm::ptr<void> pcmAddr, u32 pcmSize, vm::ptr<AdecContext> handle, vm::cpptr<void> bsiInfo, s8 correctPtsValueType, s32 errorCode)
-{
-	// Block savestate creation during callbacks
-	std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!savestate_lock.owns_lock())
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	cellAdec.trace("adecNotifyPcmOut(pcmHandle=%d, pcmAddr=*0x%x, pcmSize=0x%x, handle=*0x%x, bsiInfo=**0x%x, correctPtsValueType=%d, errorCode=0x%x)", pcmHandle, pcmAddr, pcmSize, handle, bsiInfo, correctPtsValueType, errorCode);
-
-	ensure(!!handle && !!bsiInfo && !!*bsiInfo); // Not checked on LLE
-
-	if (!handle->get_au_info(pcmHandle))
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	if (error_code ret = handle->correct_pts_value(ppu, pcmHandle, correctPtsValueType); ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	if (handle->link_frame(ppu, pcmHandle) == static_cast<s32>(CELL_ADEC_ERROR_FATAL))
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	handle->set_state(pcmHandle, 1u << 11);
-
-	if (handle->set_pcm_item(pcmHandle, pcmAddr, pcmSize, bsiInfo) == static_cast<s32>(CELL_ADEC_ERROR_FATAL))
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	vm::ptr<CellAdecPcmItem> pcm_item{};
-
-	if (handle->get_pcm_item(pcmHandle, pcm_item) == static_cast<s32>(CELL_ADEC_ERROR_FATAL))
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	if (handle->pcm_queue.push(ppu, pcm_item, pcmHandle) != CELL_OK)
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	if (handle->pcm_item_queue.push(ppu, pcm_item, pcmHandle) != CELL_OK)
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	handle->callback.cbFunc(ppu, handle, CELL_ADEC_MSG_TYPE_PCMOUT, errorCode, handle->callback.cbArg);
-
-	return CELL_OK;
-}
-
-error_code adecNotifyError(ppu_thread& ppu, s32 errorCode, vm::ptr<AdecContext> handle)
-{
-	// Block savestate creation during callbacks
-	std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!savestate_lock.owns_lock())
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	cellAdec.error("adecNotifyError(errorCode=0x%x, handle=*0x%x)", errorCode, handle);
-
-	ensure(!!handle); // Not checked on LLE
-
-	handle->callback.cbFunc(ppu, handle, CELL_ADEC_MSG_TYPE_ERROR, errorCode, handle->callback.cbArg);
-
-	return CELL_OK;
-}
-
-error_code adecNotifySeqDone(ppu_thread& ppu, vm::ptr<AdecContext> handle)
-{
-	// Block savestate creation during callbacks
-	std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!savestate_lock.owns_lock())
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	cellAdec.notice("adecNotifySeqDone(handle=*0x%x)", handle);
-
-	ensure(!!handle); // Not checked on LLE
-
-	handle->callback.cbFunc(ppu, handle, CELL_ADEC_MSG_TYPE_SEQDONE, CELL_OK, handle->callback.cbArg);
-
-	return CELL_OK;
-}
-
-error_code cellAdecQueryAttr(ppu_thread& ppu, vm::ptr<CellAdecType> type, vm::ptr<CellAdecAttr> attr)
-{
-	// Block savestate creation during ppu_thread::fast_call()
-	std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!savestate_lock.owns_lock())
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	cellAdec.notice("cellAdecQueryAttr(type=*0x%x, attr=*0x%x)", type, attr);
-
-	if (!type || type->audioCodecType >= 32 || type->audioCodecType == CELL_ADEC_TYPE_INVALID1 || type->audioCodecType == CELL_ADEC_TYPE_INVALID2 || type->audioCodecType == CELL_ADEC_TYPE_INVALID3 || !attr)
-	{
-		return CELL_ADEC_ERROR_ARG;
-	}
-
-	const auto core_ops = get_core_ops(type->audioCodecType);
-
-	core_ops->getMemSize(ppu, attr);
-
-	const s32 pcm_handle_num = core_ops->getPcmHandleNum(ppu);
-	const u32 bitstream_info_size = core_ops->getBsiInfoSize(ppu);
-	attr->workMemSize += static_cast<u32>((bitstream_info_size + sizeof(AdecFrame)) * pcm_handle_num + sizeof(AdecContext) + 0x7f);
-
-	const vm::var<be_t<u32, 1>> ver_lower;
-	core_ops->getVersion(ppu, ver_lower);
-
-	attr->adecVerUpper = 0x491000;
-	attr->adecVerLower = *ver_lower;
-
-	return CELL_OK;
-}
-
-error_code adecOpen(ppu_thread& ppu, vm::ptr<CellAdecType> type, vm::cptr<CellAdecResource> res, vm::cptr<CellAdecCb> cb, vm::pptr<AdecContext> handle, vm::cptr<CellAdecResourceSpurs> spursRes)
-{
-	if (!type || type->audioCodecType >= 32 || !res || !res->startAddr || res->ppuThreadPriority >= 0xa00 || res->spuThreadPriority >= 0x100 || res->ppuThreadStackSize < 0x1000 || !cb || !cb->cbFunc || !handle)
-	{
-		return CELL_ADEC_ERROR_ARG;
-	}
-
-	if (vm::var<CellAdecAttr> attr; cellAdecQueryAttr(ppu, type, attr), res->totalMemSize < attr->workMemSize)
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	const auto core_ops = get_core_ops(type->audioCodecType);
-
-	// Block savestate creation during ppu_thread::fast_call()
-	std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!savestate_lock.owns_lock())
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	const s32 pcm_handle_num = core_ops->getPcmHandleNum(ppu);
-	const u32 bitstream_info_size = core_ops->getBsiInfoSize(ppu);
-
-	const auto _this = vm::ptr<AdecContext>::make(utils::align(+res->startAddr, 0x80));
-	const auto frames = vm::ptr<AdecFrame>::make(_this.addr() + sizeof(AdecContext));
-	const u32 bitstream_infos_addr = frames.addr() + pcm_handle_num * sizeof(AdecFrame);
-	const auto core_handle = vm::ptr<void>::make(utils::align(bitstream_infos_addr + bitstream_info_size * pcm_handle_num, 0x80));
-
-	if (type->audioCodecType == CELL_ADEC_TYPE_LPCM_DVD)
-	{
-		vm::static_ptr_cast<LpcmDecContext>(core_handle)->dvd_packing = true;
-	}
-	else if (type->audioCodecType == CELL_ADEC_TYPE_LPCM_PAMF || type->audioCodecType == CELL_ADEC_TYPE_LPCM_BLURAY)
-	{
-		vm::static_ptr_cast<LpcmDecContext>(core_handle)->dvd_packing = false;
-	}
-
-	_this->_this = _this;
-	_this->this_size = sizeof(AdecContext) + (bitstream_info_size + sizeof(AdecFrame)) * pcm_handle_num;
-	_this->unk = 0;
-	_this->sequence_state = AdecSequenceState::dormant;
-	_this->type = *type;
-	_this->res = *res;
-	_this->callback = *cb;
-	_this->core_handle = core_handle;
-	_this->core_ops = core_ops;
-	_this->previous_pts = { CODEC_TS_INVALID, CODEC_TS_INVALID };
-	_this->frames_num = pcm_handle_num;
-	_this->reserved1 = 0;
-	_this->frames_head = -1;
-	_this->frames_tail = -1;
-	_this->frames = frames;
-	_this->bitstream_info_size = bitstream_info_size;
-	_this->mutex_attribute = { SYS_SYNC_PRIORITY, SYS_SYNC_NOT_RECURSIVE, SYS_SYNC_NOT_PROCESS_SHARED, SYS_SYNC_NOT_ADAPTIVE, 0, 0, 0, { "_adem03"_u64 } };
-
-	_this->pcm_queue.init(ppu, _this.ptr(&AdecContext::pcm_queue));
-	_this->pcm_item_queue.init(ppu, _this.ptr(&AdecContext::pcm_item_queue));
-
-	for (s32 i = 0; i < pcm_handle_num; i++)
-	{
-		frames[i].in_use = false;
-		frames[i].this_index = i;
-		frames[i].au_done = false;
-		frames[i].unk1 = false;
-		frames[i].pcm_out = false;
-		frames[i].unk2 = false;
-		frames[i].pcm_item.pcmAttr.bsiInfo.set(bitstream_infos_addr + bitstream_info_size * i);
-		frames[i].reserved1 = 0;
-		frames[i].reserved2 = 0;
-		frames[i].next = 0;
-		frames[i].prev = 0;
-	}
-
-	ensure(sys_mutex_create(ppu, _this.ptr(&AdecContext::mutex), _this.ptr(&AdecContext::mutex_attribute)) == CELL_OK); // Error code isn't checked on LLE
-
-	*handle = _this;
-
-	const auto notifyAuDone = vm::ptr<AdecNotifyAuDone>::make(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(adecNotifyAuDone)));
-	const auto notifyPcmOut = vm::ptr<AdecNotifyPcmOut>::make(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(adecNotifyPcmOut)));
-	const auto notifyError = vm::ptr<AdecNotifyError>::make(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(adecNotifyError)));
-	const auto notifySeqDone = vm::ptr<AdecNotifySeqDone>::make(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(adecNotifySeqDone)));
-
-	if (spursRes)
-	{
-		return core_ops->openExt(ppu, _this->core_handle, notifyAuDone, _this, notifyPcmOut, _this, notifyError, _this, notifySeqDone, _this, res, spursRes);
-	}
-
-	return core_ops->open(ppu, _this->core_handle, notifyAuDone, _this, notifyPcmOut, _this, notifyError, _this, notifySeqDone, _this, res);
-}
-
-error_code cellAdecOpen(ppu_thread& ppu, vm::ptr<CellAdecType> type, vm::ptr<CellAdecResource> res, vm::ptr<CellAdecCb> cb, vm::pptr<AdecContext> handle)
-{
-	cellAdec.notice("cellAdecOpen(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle);
-
-	return adecOpen(ppu, type, res, cb, handle, vm::null);
-}
-
-error_code cellAdecOpenExt(ppu_thread& ppu, vm::ptr<CellAdecType> type, vm::ptr<CellAdecResourceEx> res, vm::ptr<CellAdecCb> cb, vm::pptr<AdecContext> handle)
-{
-	cellAdec.notice("cellAdecOpenExt(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle);
-
-	if (!res)
-	{
-		return CELL_ADEC_ERROR_ARG;
-	}
-
-	const vm::var<CellAdecResource> _res{{ res->totalMemSize, res->startAddr, res->ppuThreadPriority, 0, res->ppuThreadStackSize }};
-	const vm::var<CellAdecResourceSpurs> spursRes{{ res->spurs_addr, res->priority, res->maxContention }};
-
-	return adecOpen(ppu, type, _res, cb, handle, spursRes);
-}
-
-error_code cellAdecOpenEx(ppu_thread& ppu, vm::ptr<CellAdecType> type, vm::ptr<CellAdecResourceEx> res, vm::ptr<CellAdecCb> cb, vm::pptr<AdecContext> handle)
-{
-	cellAdec.notice("cellAdecOpenEx(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle);
-
-	return cellAdecOpenExt(ppu, type, res, cb, handle);
-}
-
-error_code cellAdecClose(ppu_thread& ppu, vm::ptr<AdecContext> handle)
-{
-	// Block savestate creation during ppu_thread::fast_call()
-	std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!savestate_lock.owns_lock())
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	cellAdec.notice("cellAdecClose(handle=*0x%x)", handle);
-
-	if (!handle || handle->_this != handle)
-	{
-		return CELL_ADEC_ERROR_ARG;
-	}
-
-	if (error_code ret = handle->core_ops->close(ppu, handle->core_handle); ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	if (error_code ret = sys_mutex_destroy(ppu, handle->mutex); ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	if (error_code ret = handle->pcm_queue.finalize(ppu); ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	if (error_code ret = handle->pcm_item_queue.finalize(ppu); ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	handle->_this = vm::null;
-	handle->sequence_state = AdecSequenceState::closed;
-
-	return CELL_OK;
-}
-
-error_code cellAdecStartSeq(ppu_thread& ppu, vm::ptr<AdecContext> handle, vm::ptr<void> param)
-{
-	// Block savestate creation during ppu_thread::fast_call()
-	std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!savestate_lock.owns_lock())
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	cellAdec.notice("cellAdecStartSeq(handle=*0x%x, param=*0x%x)", handle, param);
-
-	if (!handle || !param)
-	{
-		return CELL_ADEC_ERROR_ARG;
-	}
-
-	if (handle->sequence_state != AdecSequenceState::dormant && handle->sequence_state != AdecSequenceState::ready)
-	{
-		return CELL_ADEC_ERROR_SEQ;
-	}
-
-	if (error_code ret = handle->core_ops->startSeq(ppu, handle->core_handle, param); ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	handle->sequence_state = AdecSequenceState::ready;
-
-	return CELL_OK;
-}
-
-error_code cellAdecEndSeq(ppu_thread& ppu, vm::ptr<AdecContext> handle)
-{
-	// Block savestate creation during ppu_thread::fast_call()
-	std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!savestate_lock.owns_lock())
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	cellAdec.notice("cellAdecEndSeq(handle=*0x%x)", handle);
-
-	if (!handle || handle->_this != handle)
-	{
-		return CELL_ADEC_ERROR_ARG;
-	}
-
-	if (handle->sequence_state != AdecSequenceState::ready)
-	{
-		return CELL_ADEC_ERROR_SEQ;
-	}
-
-	// LLE does not set the sequence state to dormant
-
-	return handle->core_ops->endSeq(ppu, handle->core_handle);
-}
-
-error_code adecSetLpcmBlurayParams(vm::ptr<LpcmDecContext> handle, u64 userData)
-{
-	const u8 channel_number = static_cast<u8>(userData >> 32);
-	const u8 sample_rate = static_cast<u8>(userData >> 40);
-	const u8 size_of_word = static_cast<u8>(userData >> 48);
-	const u8 unk = static_cast<u8>(userData >> 56);
-
-	handle->lpcm_param->channelNumber = channel_number;
-	handle->lpcm_param->sampleRate = sample_rate;
-	handle->lpcm_param->sizeOfWord = size_of_word;
-
-	u32 allocated_channels;
-
-	switch (channel_number)
-	{
-	case CELL_ADEC_CH_MONO:
-	case CELL_ADEC_CH_STEREO:
-		allocated_channels = 2;
+		cellAdec.fatal("Unimplemented audio codec type (%d)", type);
 		break;
+	}
+	default: return false;
+	}
 
-	case CELL_ADEC_CH_3_0:
-	case CELL_ADEC_CH_2_1:
-	case CELL_ADEC_CH_3_1:
-	case CELL_ADEC_CH_2_2:
-		allocated_channels = 4;
+	return true;
+}
+
+error_code cellAdecQueryAttr(vm::ptr<CellAdecType> type, vm::ptr<CellAdecAttr> attr)
+{
+	cellAdec.warning("cellAdecQueryAttr(type=*0x%x, attr=*0x%x)", type, attr);
+
+	if (!adecCheckType(type->audioCodecType))
+	{
+		return CELL_ADEC_ERROR_ARG;
+	}
+
+	// TODO: check values
+	attr->adecVerLower = 0x280000; // from dmux
+	attr->adecVerUpper = 0x260000;
+	attr->workMemSize = 256 * 1024; // 256 KB
+
+	return CELL_OK;
+}
+
+error_code cellAdecOpen(vm::ptr<CellAdecType> type, vm::ptr<CellAdecResource> res, vm::ptr<CellAdecCb> cb, vm::ptr<u32> handle)
+{
+	cellAdec.warning("cellAdecOpen(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle);
+
+	if (!adecCheckType(type->audioCodecType))
+	{
+		return CELL_ADEC_ERROR_ARG;
+	}
+
+	fmt::throw_exception("cellAdec disabled, use LLE.");
+}
+
+error_code cellAdecOpenEx(vm::ptr<CellAdecType> type, vm::ptr<CellAdecResourceEx> res, vm::ptr<CellAdecCb> cb, vm::ptr<u32> handle)
+{
+	cellAdec.warning("cellAdecOpenEx(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle);
+
+	if (!adecCheckType(type->audioCodecType))
+	{
+		return CELL_ADEC_ERROR_ARG;
+	}
+
+	fmt::throw_exception("cellAdec disabled, use LLE.");
+}
+
+error_code cellAdecOpenExt(vm::ptr<CellAdecType> type, vm::ptr<CellAdecResourceEx> res, vm::ptr<CellAdecCb> cb, vm::ptr<u32> handle)
+{
+	cellAdec.warning("cellAdecOpenExt(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle);
+
+	return cellAdecOpenEx(type, res, cb, handle);
+}
+
+error_code cellAdecClose(u32 handle)
+{
+	cellAdec.warning("cellAdecClose(handle=0x%x)", handle);
+
+	const auto adec = idm::get<AudioDecoder>(handle);
+
+	if (!adec)
+	{
+		return CELL_ADEC_ERROR_ARG;
+	}
+
+	adec->is_closed = true;
+	adec->job.try_push(AdecTask(adecClose));
+
+	while (!adec->is_finished)
+	{
+		thread_ctrl::wait_for(1000); // hack
+	}
+
+	if (!idm::remove_verify<ppu_thread>(handle, std::move(adec)))
+	{
+		// Removed by other thread beforehead
+		return CELL_ADEC_ERROR_ARG;
+	}
+
+	return CELL_OK;
+}
+
+error_code cellAdecStartSeq(u32 handle, u32 param)
+{
+	cellAdec.warning("cellAdecStartSeq(handle=0x%x, param=*0x%x)", handle, param);
+
+	const auto adec = idm::get<AudioDecoder>(handle);
+
+	if (!adec)
+	{
+		return CELL_ADEC_ERROR_ARG;
+	}
+
+	AdecTask task(adecStartSeq);
+
+	switch (adec->type)
+	{
+	case CELL_ADEC_TYPE_ATRACX:
+	case CELL_ADEC_TYPE_ATRACX_2CH:
+	case CELL_ADEC_TYPE_ATRACX_6CH:
+	case CELL_ADEC_TYPE_ATRACX_8CH:
+	{
+		const auto atx = vm::cptr<CellAdecParamAtracX>::make(param);
+
+		task.at3p.sample_rate = atx->sampling_freq;
+		task.at3p.channel_config = atx->ch_config_idx;
+		task.at3p.channels = atx->nch_out;
+		task.at3p.frame_size = atx->nbytes;
+		task.at3p.extra_config = atx->extra_config_data;
+		task.at3p.output = atx->bw_pcm;
+		task.at3p.downmix = atx->downmix_flag;
+		task.at3p.ats_header = atx->au_includes_ats_hdr_flg;
+		cellAdec.todo("*** CellAdecParamAtracX: sr=%d, ch_cfg=%d(%d), frame_size=0x%x, extra=%u:%u:%u:%u, output=%d, downmix=%d, ats_header=%d",
+			task.at3p.sample_rate, task.at3p.channel_config, task.at3p.channels, task.at3p.frame_size,
+			task.at3p.extra_config[0], task.at3p.extra_config[1], task.at3p.extra_config[2], task.at3p.extra_config[3],
+			task.at3p.output, task.at3p.downmix, task.at3p.ats_header);
 		break;
+	}
+	case CELL_ADEC_TYPE_MP3:
+	{
+		const auto mp3 = vm::cptr<CellAdecParamMP3>::make(param);
 
-	case CELL_ADEC_CH_3_2:
-	case CELL_ADEC_CH_3_2_LFE:
-		allocated_channels = 6;
+		cellAdec.todo("*** CellAdecParamMP3: bw_pcm=%d", mp3->bw_pcm);
 		break;
-
-	case CELL_ADEC_CH_3_4:
-	case CELL_ADEC_CH_3_4_LFE:
-		allocated_channels = 8;
-		break;
-
+	}
 	default:
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	u32 samples_per_frame;
-
-	switch (sample_rate)
 	{
-	case CELL_ADEC_FS_48kHz: samples_per_frame = 48000 / 200; break;
-	case CELL_ADEC_FS_96kHz: samples_per_frame = 96000 / 200; break;
-	case CELL_ADEC_FS_192kHz: samples_per_frame = 192000 / 200; break;
-	default: return CELL_ADEC_ERROR_FATAL;
+		cellAdec.fatal("cellAdecStartSeq(): Unimplemented audio codec type(%d)", adec->type);
+		return CELL_OK;
+	}
 	}
 
-	u32 allocated_bytes_per_sample;
-
-	switch (size_of_word)
-	{
-	case CELL_ADEC_BIT_LENGTH_16: allocated_bytes_per_sample = 2; break;
-	case CELL_ADEC_BIT_LENGTH_20: // Same as below
-	case CELL_ADEC_BIT_LENGTH_24: allocated_bytes_per_sample = 3; break;
-	default: return CELL_ADEC_ERROR_FATAL;
-	}
-
-	handle->lpcm_param->audioPayloadSize = allocated_bytes_per_sample * allocated_channels * samples_per_frame * unk;
-
+	adec->job.push(task, &adec->is_closed);
 	return CELL_OK;
 }
 
-error_code adecSetLpcmDvdParams(vm::ptr<LpcmDecContext> handle, u64 userData)
+error_code cellAdecEndSeq(u32 handle)
 {
-	const u8 channel_layout = static_cast<u8>(userData >> 32);
-	const u8 sample_rate = static_cast<u8>(userData >> 40);
-	const u8 size_of_word = static_cast<u8>(userData >> 48);
-	const u8 unk = static_cast<u8>(userData >> 56);
+	cellAdec.warning("cellAdecEndSeq(handle=0x%x)", handle);
 
-	handle->lpcm_param->channelNumber = channel_layout;
-	handle->lpcm_param->sampleRate = sample_rate;
-	handle->lpcm_param->sizeOfWord = size_of_word;
+	const auto adec = idm::get<AudioDecoder>(handle);
 
-	u32 samples_per_frame;
-
-	switch (sample_rate)
-	{
-	case CELL_ADEC_FS_48kHz: samples_per_frame = 48000 / 600; break;
-	case CELL_ADEC_FS_96kHz: samples_per_frame = 96000 / 600; break;
-	default: return CELL_ADEC_ERROR_FATAL;
-	}
-
-	u32 bits_per_sample;
-
-	switch (size_of_word)
-	{
-	case CELL_ADEC_BIT_LENGTH_16: bits_per_sample = 16; break;
-	case CELL_ADEC_BIT_LENGTH_20: bits_per_sample = 20; break;
-	case CELL_ADEC_BIT_LENGTH_24: bits_per_sample = 24; break;
-	default: return CELL_ADEC_ERROR_FATAL;
-	}
-
-	u32 channel_number;
-
-	switch (channel_layout)
-	{
-	case CELL_ADEC_LPCM_DVD_CH_MONO:
-		channel_number = 1;
-		break;
-
-	case CELL_ADEC_LPCM_DVD_CH_STEREO:
-		channel_number = 2;
-		break;
-
-	case 4:
-		if (sample_rate == CELL_ADEC_FS_96kHz && size_of_word == CELL_ADEC_BIT_LENGTH_24)
-		{
-			return CELL_ADEC_ERROR_FATAL;
-		}
-
-		channel_number = 3;
-		break;
-
-	case 5:
-		if (sample_rate == CELL_ADEC_FS_96kHz && size_of_word != CELL_ADEC_BIT_LENGTH_16)
-		{
-			return CELL_ADEC_ERROR_FATAL;
-		}
-
-		channel_number = 4;
-		break;
-
-	case CELL_ADEC_LPCM_DVD_CH_3_2:
-		if (sample_rate == CELL_ADEC_FS_96kHz)
-		{
-			return CELL_ADEC_ERROR_FATAL;
-		}
-
-		channel_number = 5;
-		break;
-
-	case CELL_ADEC_LPCM_DVD_CH_3_2_LFE:
-		if (sample_rate == CELL_ADEC_FS_96kHz || size_of_word == CELL_ADEC_BIT_LENGTH_24)
-		{
-			return CELL_ADEC_ERROR_FATAL;
-		}
-
-		channel_number = 6;
-		break;
-
-	case CELL_ADEC_LPCM_DVD_CH_3_4:
-		if (sample_rate == CELL_ADEC_FS_96kHz || size_of_word != CELL_ADEC_BIT_LENGTH_16)
-		{
-			return CELL_ADEC_ERROR_FATAL;
-		}
-
-		channel_number = 7;
-		break;
-
-	case CELL_ADEC_LPCM_DVD_CH_3_4_LFE:
-		if (sample_rate == CELL_ADEC_FS_96kHz || size_of_word != CELL_ADEC_BIT_LENGTH_16)
-		{
-			return CELL_ADEC_ERROR_FATAL;
-		}
-
-		channel_number = 8;
-		break;
-
-	default:
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	handle->lpcm_param->audioPayloadSize = bits_per_sample * channel_number * samples_per_frame / 8 * unk;
-
-	return CELL_OK;
-}
-
-error_code cellAdecDecodeAu(ppu_thread& ppu, vm::ptr<AdecContext> handle, vm::ptr<CellAdecAuInfo> auInfo)
-{
-	// Block savestate creation during ppu_thread::fast_call()
-	std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!savestate_lock.owns_lock())
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	cellAdec.trace("cellAdecDecodeAu(handle=*0x%x, auInfo=*0x%x)", handle, auInfo);
-
-	if (!handle || !auInfo || !auInfo->size)
+	if (!adec)
 	{
 		return CELL_ADEC_ERROR_ARG;
 	}
 
-	cellAdec.trace("cellAdecDecodeAu(): startAddr=*0x%x, size=0x%x, pts=0x%llx, userData=0x%llx", auInfo->startAddr, auInfo->size, std::bit_cast<be_t<u64>>(auInfo->pts), auInfo->userData);
+	adec->job.push(AdecTask(adecEndSeq), &adec->is_closed);
+	return CELL_OK;
+}
 
-	if (handle->sequence_state != AdecSequenceState::ready)
-	{
-		return CELL_ADEC_ERROR_SEQ;
-	}
+error_code cellAdecDecodeAu(u32 handle, vm::ptr<CellAdecAuInfo> auInfo)
+{
+	cellAdec.trace("cellAdecDecodeAu(handle=0x%x, auInfo=*0x%x)", handle, auInfo);
 
-	if (!auInfo->startAddr)
+	const auto adec = idm::get<AudioDecoder>(handle);
+
+	if (!adec)
 	{
 		return CELL_ADEC_ERROR_ARG;
 	}
 
-	const error_code pcmHandle = handle->get_new_pcm_handle(auInfo);
+	AdecTask task(adecDecodeAu);
+	task.au.auInfo_addr = auInfo.addr();
+	task.au.addr = auInfo->startAddr;
+	task.au.size = auInfo->size;
+	task.au.pts = (u64{auInfo->pts.upper} << 32) | u64{auInfo->pts.lower};
+	task.au.userdata = auInfo->userData;
 
-	if (pcmHandle == static_cast<s32>(CELL_ADEC_ERROR_BUSY))
-	{
-		return CELL_ADEC_ERROR_BUSY;
-	}
-
-	if (handle->type.audioCodecType == CELL_ADEC_TYPE_LPCM_BLURAY)
-	{
-		if (adecSetLpcmBlurayParams(vm::static_ptr_cast<LpcmDecContext>(handle->core_handle), auInfo->userData) != CELL_OK)
-		{
-			return CELL_ADEC_ERROR_FATAL;
-		}
-	}
-	else if (handle->type.audioCodecType == CELL_ADEC_TYPE_LPCM_DVD)
-	{
-		if (adecSetLpcmDvdParams(vm::static_ptr_cast<LpcmDecContext>(handle->core_handle), auInfo->userData) != CELL_OK)
-		{
-			return CELL_ADEC_ERROR_FATAL;
-		}
-	}
-
-	return handle->core_ops->decodeAu(ppu, handle->core_handle, pcmHandle, auInfo);
+	//cellAdec.notice("cellAdecDecodeAu(): addr=0x%x, size=0x%x, pts=0x%llx", task.au.addr, task.au.size, task.au.pts);
+	adec->job.push(task, &adec->is_closed);
+	return CELL_OK;
 }
 
-error_code cellAdecGetPcm(ppu_thread& ppu, vm::ptr<AdecContext> handle, vm::ptr<float> outBuffer)
+error_code cellAdecGetPcm(u32 handle, vm::ptr<float> outBuffer)
 {
-	// Block savestate creation during ppu_thread::fast_call()
-	std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!savestate_lock.owns_lock())
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	ppu.state += cpu_flag::wait;
-
 	cellAdec.trace("cellAdecGetPcm(handle=0x%x, outBuffer=*0x%x)", handle, outBuffer);
 
-	if (!handle)
+	const auto adec = idm::get<AudioDecoder>(handle);
+
+	if (!adec)
 	{
 		return CELL_ADEC_ERROR_ARG;
 	}
 
-	// If the pcm_handles are equal, then cellAdecGetPcmItem() was not called before cellAdecGetPcm(). We need to pop pcm_item_queue as well
-	if (handle->pcm_item_queue.peek(ppu).pcm_handle == handle->pcm_queue.peek(ppu).pcm_handle)
-	{
-		handle->pcm_item_queue.pop(ppu);
-	}
-
-	const auto pcm_queue_entry = handle->pcm_queue.pop(ppu);
-
-	if (!pcm_queue_entry)
+	AdecFrame af;
+	if (!adec->frames.try_pop(af))
 	{
+		//std::this_thread::sleep_for(1ms); // hack
 		return CELL_ADEC_ERROR_EMPTY;
 	}
 
-	const auto pcm_item = pcm_queue_entry->pcm_item;
-
-	if (handle->verify_pcm_handle(pcm_item->pcmHandle) == static_cast<s32>(CELL_ADEC_ERROR_FATAL))
+	std::unique_ptr<AVFrame, void(*)(AVFrame*)> frame(af.data, [](AVFrame* frame)
 	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
+		av_frame_unref(frame);
+		av_frame_free(&frame);
+	});
 
-	if (handle->type.audioCodecType == CELL_ADEC_TYPE_LPCM_PAMF || handle->type.audioCodecType == CELL_ADEC_TYPE_LPCM_BLURAY || handle->type.audioCodecType == CELL_ADEC_TYPE_LPCM_DVD)
+	if (outBuffer)
 	{
-		vm::static_ptr_cast<LpcmDecContext>(handle->core_handle)->output_size = pcm_item->size;
+		// reverse byte order:
+		if (frame->format == AV_SAMPLE_FMT_FLTP && frame->channels == 1)
+		{
+			float* in_f = reinterpret_cast<float*>(frame->extended_data[0]);
+			for (u32 i = 0; i < af.size / 4; i++)
+			{
+				outBuffer[i] = in_f[i];
+			}
+		}
+		else if (frame->format == AV_SAMPLE_FMT_FLTP && frame->channels == 2)
+		{
+			float* in_f[2];
+			in_f[0] = reinterpret_cast<float*>(frame->extended_data[0]);
+			in_f[1] = reinterpret_cast<float*>(frame->extended_data[1]);
+			for (u32 i = 0; i < af.size / 8; i++)
+			{
+				outBuffer[i * 2 + 0] = in_f[0][i];
+				outBuffer[i * 2 + 1] = in_f[1][i];
+			}
+		}
+		else if (frame->format == AV_SAMPLE_FMT_FLTP && frame->channels == 6)
+		{
+			float* in_f[6];
+			in_f[0] = reinterpret_cast<float*>(frame->extended_data[0]);
+			in_f[1] = reinterpret_cast<float*>(frame->extended_data[1]);
+			in_f[2] = reinterpret_cast<float*>(frame->extended_data[2]);
+			in_f[3] = reinterpret_cast<float*>(frame->extended_data[3]);
+			in_f[4] = reinterpret_cast<float*>(frame->extended_data[4]);
+			in_f[5] = reinterpret_cast<float*>(frame->extended_data[5]);
+			for (u32 i = 0; i < af.size / 24; i++)
+			{
+				outBuffer[i * 6 + 0] = in_f[0][i];
+				outBuffer[i * 6 + 1] = in_f[1][i];
+				outBuffer[i * 6 + 2] = in_f[2][i];
+				outBuffer[i * 6 + 3] = in_f[3][i];
+				outBuffer[i * 6 + 4] = in_f[4][i];
+				outBuffer[i * 6 + 5] = in_f[5][i];
+			}
+		}
+		else if (frame->format == AV_SAMPLE_FMT_FLTP && frame->channels == 8)
+		{
+			float* in_f[8];
+			in_f[0] = reinterpret_cast<float*>(frame->extended_data[0]);
+			in_f[1] = reinterpret_cast<float*>(frame->extended_data[1]);
+			in_f[2] = reinterpret_cast<float*>(frame->extended_data[2]);
+			in_f[3] = reinterpret_cast<float*>(frame->extended_data[3]);
+			in_f[4] = reinterpret_cast<float*>(frame->extended_data[4]);
+			in_f[5] = reinterpret_cast<float*>(frame->extended_data[5]);
+			in_f[6] = reinterpret_cast<float*>(frame->extended_data[6]);
+			in_f[7] = reinterpret_cast<float*>(frame->extended_data[7]);
+			for (u32 i = 0; i < af.size / 24; i++)
+			{
+				outBuffer[i * 8 + 0] = in_f[0][i];
+				outBuffer[i * 8 + 1] = in_f[1][i];
+				outBuffer[i * 8 + 2] = in_f[2][i];
+				outBuffer[i * 8 + 3] = in_f[3][i];
+				outBuffer[i * 8 + 4] = in_f[4][i];
+				outBuffer[i * 8 + 5] = in_f[5][i];
+				outBuffer[i * 8 + 6] = in_f[6][i];
+				outBuffer[i * 8 + 7] = in_f[7][i];
+			}
+		}
+		else if (frame->format == AV_SAMPLE_FMT_S16P && frame->channels == 1)
+		{
+			s16* in_i = reinterpret_cast<s16*>(frame->extended_data[0]);
+			for (u32 i = 0; i < af.size / 2; i++)
+			{
+				outBuffer[i] = in_i[i] / 32768.f;
+			}
+		}
+		else if (frame->format == AV_SAMPLE_FMT_S16P && frame->channels == 2)
+		{
+			s16* in_i[2];
+			in_i[0] = reinterpret_cast<s16*>(frame->extended_data[0]);
+			in_i[1] = reinterpret_cast<s16*>(frame->extended_data[1]);
+			for (u32 i = 0; i < af.size / 4; i++)
+			{
+				outBuffer[i * 2 + 0] = in_i[0][i] / 32768.f;
+				outBuffer[i * 2 + 1] = in_i[1][i] / 32768.f;
+			}
+		}
+		else
+		{
+			fmt::throw_exception("Unsupported frame format (channels=%d, format=%d)", frame->channels, frame->format);
+		}
 	}
 
-	if (error_code ret = handle->core_ops->realign(ppu, handle->core_handle, outBuffer, pcm_queue_entry->pcm_item->startAddr); ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	if (error_code ret = handle->core_ops->releasePcm(ppu, handle->core_handle, pcm_item->pcmHandle, outBuffer); ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	if (handle->unlink_frame(ppu, pcm_item->pcmHandle) == static_cast<s32>(CELL_ADEC_ERROR_FATAL))
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	handle->reset_frame(pcm_item->pcmHandle);
-
 	return CELL_OK;
 }
 
-error_code cellAdecGetPcmItem(ppu_thread& ppu, vm::ptr<AdecContext> handle, vm::pptr<CellAdecPcmItem> pcmItem)
+error_code cellAdecGetPcmItem(u32 handle, vm::pptr<CellAdecPcmItem> pcmItem)
 {
-	cellAdec.trace("cellAdecGetPcmItem(handle=*0x%x, pcmItem=**0x%x)", handle, pcmItem);
+	cellAdec.trace("cellAdecGetPcmItem(handle=0x%x, pcmItem=**0x%x)", handle, pcmItem);
 
-	if (!handle)
+	const auto adec = idm::get<AudioDecoder>(handle);
+
+	if (!adec)
 	{
 		return CELL_ADEC_ERROR_ARG;
 	}
 
-	if (!pcmItem)
-	{
-		return CELL_ADEC_ERROR_FATAL;
-	}
-
-	const auto pcm_item_entry = handle->pcm_item_queue.pop(ppu);
-
-	if (ppu.state & cpu_flag::again) // Savestate was created while waiting on the queue mutex
-	{
-		return {};
-	}
-
-	if (!pcm_item_entry)
+	AdecFrame af;
+	if (!adec->frames.try_peek(af))
 	{
+		//std::this_thread::sleep_for(1ms); // hack
 		return CELL_ADEC_ERROR_EMPTY;
 	}
 
-	*pcmItem = pcm_item_entry->pcm_item;
+	AVFrame* frame = af.data;
 
+	const auto pcm = vm::ptr<CellAdecPcmItem>::make(adec->memAddr + adec->memBias);
+
+	adec->memBias += 512;
+	if (adec->memBias + 512 > adec->memSize)
+	{
+		adec->memBias = 0;
+	}
+
+	pcm->pcmHandle = 0; // ???
+	pcm->pcmAttr.bsiInfo_addr = pcm.addr() + u32{sizeof(CellAdecPcmItem)};
+	pcm->startAddr = 0x00000312; // invalid address (no output)
+	pcm->size = af.size;
+	pcm->status = CELL_OK;
+	pcm->auInfo.pts.lower = static_cast<u32>(af.pts);
+	pcm->auInfo.pts.upper = static_cast<u32>(af.pts >> 32);
+	pcm->auInfo.size = af.auSize;
+	pcm->auInfo.startAddr = af.auAddr;
+	pcm->auInfo.userData = af.userdata;
+
+	if (adecIsAtracX(adec->type))
+	{
+		auto atx = vm::ptr<CellAdecAtracXInfo>::make(pcm.addr() + u32{sizeof(CellAdecPcmItem)});
+
+		atx->samplingFreq = frame->sample_rate;
+		atx->nbytes = frame->nb_samples * u32{sizeof(float)};
+		if (frame->channels == 1)
+		{
+			atx->channelConfigIndex = 1;
+		}
+		else if (frame->channels == 2)
+		{
+			atx->channelConfigIndex = 2;
+		}
+		else if (frame->channels == 6)
+		{
+			atx->channelConfigIndex = 6;
+		}
+		else if (frame->channels == 8)
+		{
+			atx->channelConfigIndex = 7;
+		}
+		else
+		{
+			cellAdec.fatal("cellAdecGetPcmItem(): unsupported channel count (%d)", frame->channels);
+		}
+	}
+	else if (adec->type == CELL_ADEC_TYPE_MP3)
+	{
+		auto mp3 = vm::ptr<CellAdecMP3Info>::make(pcm.addr() + u32{sizeof(CellAdecPcmItem)});
+
+		// TODO
+		memset(mp3.get_ptr(), 0, sizeof(CellAdecMP3Info));
+	}
+
+	*pcmItem = pcm;
 	return CELL_OK;
 }
 
 DECLARE(ppu_module_manager::cellAdec)("cellAdec", []()
 {
+	static ppu_static_module cell_libac3dec("cell_libac3dec");
+	static ppu_static_module cellAtrac3dec("cellAtrac3dec");
+	static ppu_static_module cellAtracXdec("cellAtracXdec");
+	static ppu_static_module cellCelpDec("cellCelpDec");
+	static ppu_static_module cellDTSdec("cellDTSdec");
+	static ppu_static_module cellM2AACdec("cellM2AACdec");
+	static ppu_static_module cellM2BCdec("cellM2BCdec");
+	static ppu_static_module cellM4AacDec("cellM4AacDec");
+	static ppu_static_module cellMP3dec("cellMP3dec");
+	static ppu_static_module cellTRHDdec("cellTRHDdec");
+	static ppu_static_module cellWMAdec("cellWMAdec");
+	static ppu_static_module cellDTSLBRdec("cellDTSLBRdec");
+	static ppu_static_module cellDDPdec("cellDDPdec");
+	static ppu_static_module cellM4AacDec2ch("cellM4AacDec2ch");
+	static ppu_static_module cellDTSHDdec("cellDTSHDdec");
+	static ppu_static_module cellMPL1dec("cellMPL1dec");
+	static ppu_static_module cellMP3Sdec("cellMP3Sdec");
+	static ppu_static_module cellM4AacDec2chmod("cellM4AacDec2chmod");
+	static ppu_static_module cellCelp8Dec("cellCelp8Dec");
+	static ppu_static_module cellWMAPROdec("cellWMAPROdec");
+	static ppu_static_module cellWMALSLdec("cellWMALSLdec");
+	static ppu_static_module cellDTSHDCOREdec("cellDTSHDCOREdec");
+	static ppu_static_module cellAtrac3multidec("cellAtrac3multidec");
+
 	REG_FUNC(cellAdec, cellAdecQueryAttr);
 	REG_FUNC(cellAdec, cellAdecOpen);
 	REG_FUNC(cellAdec, cellAdecOpenEx);
@@ -2042,170 +1154,4 @@ DECLARE(ppu_module_manager::cellAdec)("cellAdec", []()
 	REG_FUNC(cellAdec, cellAdecDecodeAu);
 	REG_FUNC(cellAdec, cellAdecGetPcm);
 	REG_FUNC(cellAdec, cellAdecGetPcmItem);
-
-	REG_HIDDEN_FUNC(adecNotifyAuDone);
-	REG_HIDDEN_FUNC(adecNotifyPcmOut);
-	REG_HIDDEN_FUNC(adecNotifyError);
-	REG_HIDDEN_FUNC(adecNotifySeqDone);
-
-	ppu_static_variable& lpcm_gvar = REG_VAR(cellAdec, g_cell_adec_core_ops_lpcm);
-	lpcm_gvar.flags = MFF_HIDDEN;
-	lpcm_gvar.init = []
-	{
-		g_cell_adec_core_ops_lpcm->getMemSize.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpGetMemSize_lpcm)));
-		g_cell_adec_core_ops_lpcm->open.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpOpen_lpcm)));
-		g_cell_adec_core_ops_lpcm->close.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpClose_lpcm)));
-		g_cell_adec_core_ops_lpcm->startSeq.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpStartSeq_lpcm)));
-		g_cell_adec_core_ops_lpcm->endSeq.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpEndSeq_lpcm)));
-		g_cell_adec_core_ops_lpcm->decodeAu.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpDecodeAu_lpcm)));
-		g_cell_adec_core_ops_lpcm->getVersion.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpGetVersion_lpcm)));
-		g_cell_adec_core_ops_lpcm->realign.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpRealign_lpcm)));
-		g_cell_adec_core_ops_lpcm->releasePcm.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpReleasePcm_lpcm)));
-		g_cell_adec_core_ops_lpcm->getPcmHandleNum.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpGetPcmHandleNum_lpcm)));
-		g_cell_adec_core_ops_lpcm->getBsiInfoSize.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpGetBsiInfoSize_lpcm)));
-		g_cell_adec_core_ops_lpcm->openExt.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpOpenExt_lpcm)));
-	};
-
-	REG_HIDDEN_FUNC(_CellAdecCoreOpGetMemSize_lpcm);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpOpen_lpcm);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpClose_lpcm);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpStartSeq_lpcm);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpEndSeq_lpcm);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpDecodeAu_lpcm);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpGetVersion_lpcm);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpRealign_lpcm);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpReleasePcm_lpcm);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpGetPcmHandleNum_lpcm);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpGetBsiInfoSize_lpcm);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpOpenExt_lpcm);
-
-	REG_HIDDEN_FUNC(lpcmDecEntry);
-});
-
-DECLARE(ppu_module_manager::cell_libac3dec)("cell_libac3dec", []
-{
-	REG_VNID(cell_libac3dec, 0xc58bb170, g_cell_adec_core_ops_ac3);
-});
-
-DECLARE(ppu_module_manager::cellAtrac3dec)("cellAtrac3dec", []
-{
-	REG_VNID(cellAtrac3dec, 0x60487d65, g_cell_adec_core_ops_atrac3);
-});
-
-DECLARE(ppu_module_manager::cellAtrac3multidec)("cellAtrac3multidec", []
-{
-	REG_VNID(cellAtrac3multidec, 0xc20c6bd7, g_cell_adec_core_ops_atrac3multi);
-});
-
-DECLARE(ppu_module_manager::cellCelp8Dec)("cellCelp8Dec", []
-{
-	REG_VNID(cellCelp8Dec, 0xf0190c6c, g_cell_adec_core_ops_Celp8);
-	REG_FUNC(cellCelp8Dec, _SceAdecCorrectPtsValue_Celp8);
-});
-
-DECLARE(ppu_module_manager::cellCelpDec)("cellCelpDec", []
-{
-	REG_VNID(cellCelpDec, 0xffe42c22, g_cell_adec_core_ops_Celp);
-	REG_FUNC(cellCelpDec, _SceAdecCorrectPtsValue_Celp);
-});
-
-DECLARE(ppu_module_manager::cellDDPdec)("cellDDPdec", []
-{
-	REG_VNID(cellDDPdec, 0xf5e9c15c, g_cell_adec_core_ops_Ddp);
-	REG_FUNC(cellDDPdec, _SceAdecCorrectPtsValue_Ddp);
-});
-
-DECLARE(ppu_module_manager::cellDTSdec)("cellDTSdec", []
-{
-	REG_VNID(cellDTSdec, 0x15248ec5, g_cell_adec_core_ops_DtsCore);
-	REG_FUNC(cellDTSdec, _SceAdecCorrectPtsValue_DtsCore);
-});
-
-DECLARE(ppu_module_manager::cellDTSHDCOREdec)("cellDTSHDCOREdec", []
-{
-	REG_VNID(cellDTSHDCOREdec, 0x6c8f4f1c, g_cell_adec_core_ops_DtsHd_Core);
-	REG_FUNC(cellDTSHDCOREdec, _SceAdecCorrectPtsValue_DtsHd_Core);
-});
-
-DECLARE(ppu_module_manager::cellDTSHDdec)("cellDTSHDdec", []
-{
-	REG_VNID(cellDTSHDdec, 0x51ac2b6c, g_cell_adec_core_ops_DtsHd);
-	REG_FUNC(cellDTSHDdec, _SceAdecCorrectPtsValue_DtsHd);
-});
-
-DECLARE(ppu_module_manager::cellDTSLBRdec)("cellDTSLBRdec", []
-{
-	REG_VNID(cellDTSLBRdec, 0x8c50af52, g_cell_adec_core_ops_DtsLbr);
-	REG_FUNC(cellDTSLBRdec, _SceAdecCorrectPtsValue_DtsLbr);
-});
-
-DECLARE(ppu_module_manager::cellM2AACdec)("cellM2AACdec", []
-{
-	REG_VNID(cellM2AACdec, 0xac2f0831, g_cell_adec_core_ops_Aac);
-	REG_FUNC(cellM2AACdec, _SceAdecCorrectPtsValue_Aac);
-});
-
-DECLARE(ppu_module_manager::cellM2BCdec)("cellM2BCdec", []
-{
-	REG_VNID(cellM2BCdec, 0x300afe4d, g_cell_adec_core_ops_mpmc);
-	REG_FUNC(cellM2BCdec, _SceAdecCorrectPtsValue_mpmc);
-});
-
-DECLARE(ppu_module_manager::cellM4AacDec)("cellM4AacDec", []
-{
-	REG_VNID(cellM4AacDec, 0xab61278d, g_cell_adec_core_ops_M4Aac);
-	REG_FUNC(cellM4AacDec, _SceAdecCorrectPtsValue_M4Aac);
-});
-
-DECLARE(ppu_module_manager::cellM4AacDec2ch)("cellM4AacDec2ch", []
-{
-	REG_VNID(cellM4AacDec2ch, 0xe996c664, g_cell_adec_core_ops_M4Aac2ch);
-	REG_FUNC(cellM4AacDec2ch, _SceAdecCorrectPtsValue_M4Aac2ch);
-});
-
-DECLARE(ppu_module_manager::cellM4AacDec2chmod)("cellM4AacDec2chmod", []
-{
-	REG_VNID(cellM4AacDec2chmod, 0xdbd26836, g_cell_adec_core_ops_M4Aac2chmod);
-	REG_FUNC(cellM4AacDec2chmod, _SceAdecCorrectPtsValue_M4Aac2chmod);
-});
-
-DECLARE(ppu_module_manager::cellMP3dec)("cellMP3dec", []
-{
-	REG_VNID(cellMP3dec, 0x84276a23, g_cell_adec_core_ops_Mp3);
-});
-
-DECLARE(ppu_module_manager::cellMP3Sdec)("cellMP3Sdec", []
-{
-	REG_VNID(cellMP3Sdec, 0x292cdf0a, g_cell_adec_core_ops_Mp3s);
-	REG_FUNC(cellMP3Sdec, _SceAdecCorrectPtsValue_Mp3s);
-});
-
-DECLARE(ppu_module_manager::cellMPL1dec)("cellMPL1dec", []
-{
-	REG_VNID(cellMPL1dec, 0xbbc70551, g_cell_adec_core_ops_mpmcl1);
-	REG_FUNC(cellMPL1dec, _SceAdecCorrectPtsValue_mpmcl1);
-});
-
-DECLARE(ppu_module_manager::cellTRHDdec)("cellTRHDdec", []
-{
-	REG_VNID(cellTRHDdec, 0xe88e381b, g_cell_adec_core_ops_truehd);
-	REG_FUNC(cellTRHDdec, _SceAdecCorrectPtsValue_truehd);
-});
-
-DECLARE(ppu_module_manager::cellWMAdec)("cellWMAdec", []
-{
-	REG_VNID(cellWMAdec, 0x88320b10, g_cell_adec_core_ops_wma);
-	REG_FUNC(cellWMAdec, _SceAdecCorrectPtsValue_wma);
-});
-
-DECLARE(ppu_module_manager::cellWMALSLdec)("cellWMALSLdec", []
-{
-	REG_VNID(cellWMALSLdec, 0x602aab16, g_cell_adec_core_ops_WmaLsl);
-	REG_FUNC(cellWMALSLdec, _SceAdecCorrectPtsValue_WmaLsl);
-});
-
-DECLARE(ppu_module_manager::cellWMAPROdec)("cellWMAPROdec", []
-{
-	REG_VNID(cellWMAPROdec, 0xa8bac670, g_cell_adec_core_ops_WmaPro);
-	REG_FUNC(cellWMAPROdec, _SceAdecCorrectPtsValue_WmaPro);
 });
diff --git a/rpcs3/Emu/Cell/Modules/cellAdec.h b/rpcs3/Emu/Cell/Modules/cellAdec.h
index a43c3f0aef..6167635188 100644
--- a/rpcs3/Emu/Cell/Modules/cellAdec.h
+++ b/rpcs3/Emu/Cell/Modules/cellAdec.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include "cellPamf.h" // CellCodecTimeStamp
-#include "../lv2/sys_mutex.h"
-#include "../lv2/sys_cond.h"
+#include "Emu/Memory/vm_ptr.h"
 
 // Error Codes
 enum CellAdecError : u32
@@ -113,6 +111,68 @@ enum CellAdecError : u32
 	CELL_ADEC_ERROR_AT3_ERROR  = 0x80612180,
 
 
+	CELL_ADEC_ERROR_ATX_OFFSET = 0x80612200,
+	CELL_ADEC_ERROR_ATX_NONE                       = 0x80612200,
+	CELL_ADEC_ERROR_ATX_OK                         = 0x80612200,
+	CELL_ADEC_ERROR_ATX_BUSY                       = 0x80612264,
+	CELL_ADEC_ERROR_ATX_EMPTY                      = 0x80612265,
+	CELL_ADEC_ERROR_ATX_ATSHDR                     = 0x80612266,
+	CELL_ADEC_ERROR_ATX_NON_FATAL                  = 0x80612281,
+	CELL_ADEC_ERROR_ATX_NOT_IMPLE                  = 0x80612282,
+	CELL_ADEC_ERROR_ATX_PACK_CE_OVERFLOW           = 0x80612283,
+	CELL_ADEC_ERROR_ATX_ILLEGAL_NPROCQUS           = 0x80612284,
+	CELL_ADEC_ERROR_ATX_FATAL                      = 0x8061228c,
+	CELL_ADEC_ERROR_ATX_ENC_OVERFLOW               = 0x8061228d,
+	CELL_ADEC_ERROR_ATX_PACK_CE_UNDERFLOW          = 0x8061228e,
+	CELL_ADEC_ERROR_ATX_SYNTAX_IDCT                = 0x8061228f,
+	CELL_ADEC_ERROR_ATX_SYNTAX_GAINADJ             = 0x80612290,
+	CELL_ADEC_ERROR_ATX_SYNTAX_IDSF                = 0x80612291,
+	CELL_ADEC_ERROR_ATX_SYNTAX_SPECTRA             = 0x80612292,
+	CELL_ADEC_ERROR_ATX_SYNTAX_IDWL	               = 0x80612293,
+	CELL_ADEC_ERROR_ATX_SYNTAX_GHWAVE              = 0x80612294,
+	CELL_ADEC_ERROR_ATX_SYNTAX_SHEADER             = 0x80612295,
+	CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_A              = 0x80612296,
+	CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_B              = 0x80612297,
+	CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_C              = 0x80612298,
+	CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_D              = 0x80612299,
+	CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_E              = 0x8061229a,
+	CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_A              = 0x8061229b,
+	CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_B              = 0x8061229c,
+	CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_C              = 0x8061229d,
+	CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_D              = 0x8061229e,
+	CELL_ADEC_ERROR_ATX_SYNTAX_IDCT_A              = 0x8061229f,
+	CELL_ADEC_ERROR_ATX_SYNTAX_GC_NGC              = 0x806122a0,
+	CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLEV_A          = 0x806122a1,
+	CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLOC_A          = 0x806122a2,
+	CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLEV_B          = 0x806122a3,
+	CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLOC_B          = 0x806122a4,
+	CELL_ADEC_ERROR_ATX_SYNTAX_SN_NWVS             = 0x806122a5,
+	CELL_ADEC_ERROR_ATX_FATAL_HANDLE               = 0x806122aa,
+	CELL_ADEC_ERROR_ATX_ASSERT_SAMPLING_FREQ       = 0x806122ab,
+	CELL_ADEC_ERROR_ATX_ASSERT_CH_CONFIG_INDEX     = 0x806122ac,
+	CELL_ADEC_ERROR_ATX_ASSERT_NBYTES              = 0x806122ad,
+	CELL_ADEC_ERROR_ATX_ASSERT_BLOCK_NUM           = 0x806122ae,
+	CELL_ADEC_ERROR_ATX_ASSERT_BLOCK_ID            = 0x806122af,
+	CELL_ADEC_ERROR_ATX_ASSERT_CHANNELS            = 0x806122b0,
+	CELL_ADEC_ERROR_ATX_UNINIT_BLOCK_SPECIFIED     = 0x806122b1,
+	CELL_ADEC_ERROR_ATX_POSCFG_PRESENT             = 0x806122b2,
+	CELL_ADEC_ERROR_ATX_BUFFER_OVERFLOW            = 0x806122b3,
+	CELL_ADEC_ERROR_ATX_ILL_BLK_TYPE_ID            = 0x806122b4,
+	CELL_ADEC_ERROR_ATX_UNPACK_CHANNEL_BLK_FAILED  = 0x806122b5,
+	CELL_ADEC_ERROR_ATX_ILL_BLK_ID_USED_1          = 0x806122b6,
+	CELL_ADEC_ERROR_ATX_ILL_BLK_ID_USED_2          = 0x806122b7,
+	CELL_ADEC_ERROR_ATX_ILLEGAL_ENC_SETTING        = 0x806122b8,
+	CELL_ADEC_ERROR_ATX_ILLEGAL_DEC_SETTING        = 0x806122b9,
+	CELL_ADEC_ERROR_ATX_ASSERT_NSAMPLES            = 0x806122ba,
+
+	CELL_ADEC_ERROR_ATX_ILL_SYNCWORD               = 0x806122bb,
+	CELL_ADEC_ERROR_ATX_ILL_SAMPLING_FREQ          = 0x806122bc,
+	CELL_ADEC_ERROR_ATX_ILL_CH_CONFIG_INDEX        = 0x806122bd,
+	CELL_ADEC_ERROR_ATX_RAW_DATA_FRAME_SIZE_OVER   = 0x806122be,
+	CELL_ADEC_ERROR_ATX_SYNTAX_ENHANCE_LENGTH_OVER = 0x806122bf,
+	CELL_ADEC_ERROR_ATX_SPU_INTERNAL_FAIL          = 0x806122c8,
+
+
 	CELL_ADEC_ERROR_LPCM_FATAL = 0x80612001,
 	CELL_ADEC_ERROR_LPCM_SEQ   = 0x80612002,
 	CELL_ADEC_ERROR_LPCM_ARG   = 0x80612003,
@@ -190,40 +250,48 @@ enum CellAdecError : u32
 // Audio Codec Type
 enum AudioCodecType : s32
 {
-	CELL_ADEC_TYPE_INVALID1,
+	CELL_ADEC_TYPE_RESERVED1,
 	CELL_ADEC_TYPE_LPCM_PAMF,
 	CELL_ADEC_TYPE_AC3,
 	CELL_ADEC_TYPE_ATRACX,
 	CELL_ADEC_TYPE_MP3,
 	CELL_ADEC_TYPE_ATRAC3,
 	CELL_ADEC_TYPE_MPEG_L2,
-	CELL_ADEC_TYPE_M2AAC,
-	CELL_ADEC_TYPE_EAC3,
-	CELL_ADEC_TYPE_TRUEHD,
-	CELL_ADEC_TYPE_DTS, // Removed in firmware 4.00, integrated into DTSHD
+	CELL_ADEC_TYPE_RESERVED5,
+	CELL_ADEC_TYPE_RESERVED6,
+	CELL_ADEC_TYPE_RESERVED7,
+	CELL_ADEC_TYPE_RESERVED8,
 	CELL_ADEC_TYPE_CELP,
-	CELL_ADEC_TYPE_LPCM_BLURAY,
+	CELL_ADEC_TYPE_RESERVED10,
 	CELL_ADEC_TYPE_ATRACX_2CH,
 	CELL_ADEC_TYPE_ATRACX_6CH,
 	CELL_ADEC_TYPE_ATRACX_8CH,
 	CELL_ADEC_TYPE_M4AAC,
-	CELL_ADEC_TYPE_LPCM_DVD,
-	CELL_ADEC_TYPE_WMA,
-	CELL_ADEC_TYPE_DTSLBR,
-	CELL_ADEC_TYPE_M4AAC_2CH,
-	CELL_ADEC_TYPE_DTSHD,
-	CELL_ADEC_TYPE_MPEG_L1,
-	CELL_ADEC_TYPE_MP3S,
-	CELL_ADEC_TYPE_M4AAC_2CH_MOD,
+	CELL_ADEC_TYPE_RESERVED12,
+	CELL_ADEC_TYPE_RESERVED13,
+	CELL_ADEC_TYPE_RESERVED14,
+	CELL_ADEC_TYPE_RESERVED15,
+	CELL_ADEC_TYPE_RESERVED16,
+	CELL_ADEC_TYPE_RESERVED17,
+	CELL_ADEC_TYPE_RESERVED18,
+	CELL_ADEC_TYPE_RESERVED19,
 	CELL_ADEC_TYPE_CELP8,
-	CELL_ADEC_TYPE_INVALID2,
-	CELL_ADEC_TYPE_INVALID3,
-	CELL_ADEC_TYPE_RESERVED22, // Either WMA Pro or WMA Lossless, was never released
-	CELL_ADEC_TYPE_RESERVED23, // Either WMA Pro or WMA Lossless, was never released
-	CELL_ADEC_TYPE_DTSHDCORE, // Removed in firmware 4.00, integrated into DTSHD
-	CELL_ADEC_TYPE_ATRAC3MULTI,
+	CELL_ADEC_TYPE_RESERVED20,
+	CELL_ADEC_TYPE_RESERVED21,
+	CELL_ADEC_TYPE_RESERVED22,
+	CELL_ADEC_TYPE_RESERVED23,
+	CELL_ADEC_TYPE_RESERVED24,
+	CELL_ADEC_TYPE_RESERVED25,
 };
 
+inline bool adecIsAtracX(s32 type)
+{
+	return type == CELL_ADEC_TYPE_ATRACX
+		|| type == CELL_ADEC_TYPE_ATRACX_2CH
+		|| type == CELL_ADEC_TYPE_ATRACX_6CH
+		|| type == CELL_ADEC_TYPE_ATRACX_8CH;
+}
+
 // Output Channel Number
 enum CellAdecChannel : s32
 {
@@ -245,15 +313,13 @@ enum CellAdecChannel : s32
 // Sampling Rate
 enum CellAdecSampleRate : s32
 {
-	CELL_ADEC_FS_RESERVED1,
-	CELL_ADEC_FS_48kHz,
-	CELL_ADEC_FS_16kHz,
-	CELL_ADEC_FS_96kHz,
-	CELL_ADEC_FS_192kHz,
-	CELL_ADEC_FS_8kHz,
+	CELL_ADEC_FS_RESERVED1 = 0,
+	CELL_ADEC_FS_48kHz = 1,
+	CELL_ADEC_FS_16kHz = 2,
+	CELL_ADEC_FS_8kHz = 5,
 };
 
-enum CellAdecBitLength : u32
+enum CellAdecBitLength : s32
 {
 	CELL_ADEC_BIT_LENGTH_RESERVED1,
 	CELL_ADEC_BIT_LENGTH_16,
@@ -289,14 +355,7 @@ struct CellAdecResourceEx
 	be_t<u32> ppuThreadPriority;
 	be_t<u32> ppuThreadStackSize;
 	be_t<u32> spurs_addr;
-	be_t<u64, 1> priority;
-	be_t<u32> maxContention;
-};
-
-struct CellAdecResourceSpurs
-{
-	be_t<u32> spurs_addr; // CellSpurs*
-	be_t<u64, 1> priority;
+	u8 priority[8];
 	be_t<u32> maxContention;
 };
 
@@ -309,22 +368,18 @@ enum CellAdecMsgType : s32
 	CELL_ADEC_MSG_TYPE_SEQDONE,
 };
 
-using CellAdecCbMsg = s32(vm::ptr<void> handle, CellAdecMsgType msgType, s32 msgData, vm::ptr<void> cbArg);
+using CellAdecCbMsg = s32(u32 handle, CellAdecMsgType msgType, s32 msgData, u32 cbArg);
 
-// Used for internal callbacks as well
-template <typename F>
-struct AdecCb
+struct CellAdecCb
 {
-	vm::bptr<F> cbFunc;
-	vm::bptr<void> cbArg;
+	vm::bptr<CellAdecCbMsg> cbFunc;
+	be_t<u32> cbArg;
 };
 
-using CellAdecCb = AdecCb<CellAdecCbMsg>;
-
 // AU Info
 struct CellAdecAuInfo
 {
-	vm::bcptr<u8> startAddr;
+	be_t<u32> startAddr;
 	be_t<u32> size;
 	CellCodecTimeStamp pts;
 	be_t<u64> userData;
@@ -333,340 +388,19 @@ struct CellAdecAuInfo
 // BSI Info
 struct CellAdecPcmAttr
 {
-	vm::bptr<void> bsiInfo;
+	be_t<u32> bsiInfo_addr;
 };
 
 struct CellAdecPcmItem
 {
-	be_t<s32> pcmHandle;
+	be_t<u32> pcmHandle;
 	be_t<u32> status;
-	vm::bcptr<void> startAddr;
+	be_t<u32> startAddr;
 	be_t<u32> size;
 	CellAdecPcmAttr	pcmAttr;
 	CellAdecAuInfo auInfo;
 };
 
-// Controls how much is added to the presentation time stamp of the previous frame if the game didn't set a pts itself in CellAdecAuInfo when calling cellAdecDecodeAu()
-enum AdecCorrectPtsValueType : s8
-{
-	ADEC_CORRECT_PTS_VALUE_TYPE_UNSPECIFIED = -1,
-
-	// Adds a fixed amount
-	ADEC_CORRECT_PTS_VALUE_TYPE_LPCM_HDMV = 0,
-	ADEC_CORRECT_PTS_VALUE_TYPE_LPCM_DVD = 1, // Unused for some reason, the DVD player probably takes care of timestamps itself
-	ADEC_CORRECT_PTS_VALUE_TYPE_ATRACX_48000Hz = 2,
-	ADEC_CORRECT_PTS_VALUE_TYPE_ATRACX_44100Hz = 3,
-	ADEC_CORRECT_PTS_VALUE_TYPE_ATRACX_32000Hz = 4,
-	ADEC_CORRECT_PTS_VALUE_TYPE_AC3 = 5,
-	ADEC_CORRECT_PTS_VALUE_TYPE_ATRAC3 = 6,
-	ADEC_CORRECT_PTS_VALUE_TYPE_MP3_48000Hz = 7,
-	ADEC_CORRECT_PTS_VALUE_TYPE_MP3_44100Hz = 8,
-	ADEC_CORRECT_PTS_VALUE_TYPE_MP3_32000Hz = 9,
-	ADEC_CORRECT_PTS_VALUE_TYPE_ATRAC3MULTI = 39,
-
-	// Calls a decoder function (_SceAdecCorrectPtsValue_codec())
-	ADEC_CORRECT_PTS_VALUE_TYPE_EAC3 = 17,
-	ADEC_CORRECT_PTS_VALUE_TYPE_DTSHD = 21,
-	ADEC_CORRECT_PTS_VALUE_TYPE_CELP = 24,
-	ADEC_CORRECT_PTS_VALUE_TYPE_M2AAC = 25,
-	ADEC_CORRECT_PTS_VALUE_TYPE_MPEG_L2 = 26,
-	ADEC_CORRECT_PTS_VALUE_TYPE_TRUEHD = 27,
-	ADEC_CORRECT_PTS_VALUE_TYPE_DTS = 28,
-	ADEC_CORRECT_PTS_VALUE_TYPE_M4AAC = 29,
-	ADEC_CORRECT_PTS_VALUE_TYPE_WMA = 30,
-	ADEC_CORRECT_PTS_VALUE_TYPE_DTSLBR = 31,
-	ADEC_CORRECT_PTS_VALUE_TYPE_MPEG_L1 = 32,
-	ADEC_CORRECT_PTS_VALUE_TYPE_MP3S = 33,
-	ADEC_CORRECT_PTS_VALUE_TYPE_CELP8 = 34,
-	ADEC_CORRECT_PTS_VALUE_TYPE_WMAPRO = 35,
-	ADEC_CORRECT_PTS_VALUE_TYPE_WMALSL = 36,
-	ADEC_CORRECT_PTS_VALUE_TYPE_DTSHDCORE_UNK1 = 37,
-	ADEC_CORRECT_PTS_VALUE_TYPE_DTSHDCORE_UNK2 = 38,
-};
-
-// Internal callbacks
-using AdecNotifyAuDone = error_code(s32 pcmHandle, vm::ptr<void> cbArg);
-using AdecNotifyPcmOut = error_code(s32 pcmHandle, vm::ptr<void> pcmAddr, u32 pcmSize, vm::ptr<void> cbArg, vm::cpptr<void> bsiInfo, AdecCorrectPtsValueType correctPtsValueType, s32 errorCode);
-using AdecNotifyError = error_code(s32 errorCode, vm::ptr<void> cbArg);
-using AdecNotifySeqDone = error_code(vm::ptr<void> cbArg);
-
-// Decoder functions
-using CellAdecCoreOpGetMemSize = error_code(vm::ptr<CellAdecAttr> attr);
-using CellAdecCoreOpOpen = error_code(vm::ptr<void> coreHandle, vm::ptr<AdecNotifyAuDone> cbFuncAuDone, vm::ptr<void> cbArgAuDone, vm::ptr<AdecNotifyPcmOut> cbFuncPcmOut, vm::ptr<void> cbArgPcmOut,
-	vm::ptr<AdecNotifyError> cbFuncError, vm::ptr<void> cbArgError, vm::ptr<AdecNotifySeqDone> cbFuncSeqDone, vm::ptr<void> cbArgSeqDone, vm::cptr<CellAdecResource> res);
-using CellAdecCoreOpClose = error_code(vm::ptr<void> coreHandle);
-using CellAdecCoreOpStartSeq = error_code(vm::ptr<void> coreHandle, vm::cptr<void> param);
-using CellAdecCoreOpEndSeq = error_code(vm::ptr<void> coreHandle);
-using CellAdecCoreOpDecodeAu = error_code(vm::ptr<void> coreHandle, s32 pcmHandle, vm::cptr<CellAdecAuInfo> auInfo);
-using CellAdecCoreOpGetVersion = void(vm::ptr<be_t<u32, 1>> version);
-using CellAdecCoreOpRealign = error_code(vm::ptr<void> coreHandle, vm::ptr<void> outBuffer, vm::cptr<void> pcmStartAddr);
-using CellAdecCoreOpReleasePcm = error_code(vm::ptr<void> coreHandle, s32 pcmHandle, vm::cptr<void> outBuffer);
-using CellAdecCoreOpGetPcmHandleNum = s32();
-using CellAdecCoreOpGetBsiInfoSize = u32();
-using CellAdecCoreOpOpenExt = error_code(vm::ptr<void> coreHandle, vm::ptr<AdecNotifyAuDone> cbFuncAuDone, vm::ptr<void> cbArgAuDone, vm::ptr<AdecNotifyPcmOut> cbFuncPcmOut, vm::ptr<void> cbArgPcmOut,
-	vm::ptr<AdecNotifyError> cbFuncError, vm::ptr<void> cbArgError, vm::ptr<AdecNotifySeqDone> cbFuncSeqDone, vm::ptr<void> cbArgSeqDone, vm::cptr<CellAdecResource> res, vm::cptr<CellAdecResourceSpurs> spursRes);
-
-// Decoders export a pointer to this struct
-struct CellAdecCoreOps
-{
-	vm::bptr<CellAdecCoreOpGetMemSize> getMemSize;
-	vm::bptr<CellAdecCoreOpOpen> open;
-	vm::bptr<CellAdecCoreOpClose> close;
-	vm::bptr<CellAdecCoreOpStartSeq> startSeq;
-	vm::bptr<CellAdecCoreOpEndSeq> endSeq;
-	vm::bptr<CellAdecCoreOpDecodeAu> decodeAu;
-	vm::bptr<CellAdecCoreOpGetVersion> getVersion;
-	vm::bptr<CellAdecCoreOpRealign> realign;
-	vm::bptr<CellAdecCoreOpReleasePcm> releasePcm;
-	vm::bptr<CellAdecCoreOpGetPcmHandleNum> getPcmHandleNum;
-	vm::bptr<CellAdecCoreOpGetBsiInfoSize> getBsiInfoSize;
-	vm::bptr<CellAdecCoreOpOpenExt> openExt;
-};
-
-// Used by several decoders as command queue
-template <typename T>
-struct AdecCmdQueue
-{
-	T elements[4];
-
-	be_t<s32> front = 0;
-	be_t<s32> back = 0;
-	be_t<s32> size = 0;
-
-	template <bool is_peek = false>
-	void pop(T& cmd)
-	{
-		// LLE returns uninitialized stack memory if the queue is empty
-		cmd = elements[front];
-
-		if constexpr (!is_peek)
-		{
-			elements[front].pcm_handle = 0xff;
-			front = (front + 1) & 3;
-			size--;
-		}
-	}
-
-	void emplace(auto&&... args)
-	{
-		new (&elements[back]) T(std::forward<decltype(args)>(args)...);
-
-		back = (back + 1) & 3;
-		size++;
-	}
-
-	void peek(T& cmd) const { return pop<true>(cmd); }
-	bool empty() const { return size == 0; }
-	bool full() const { return size >= 4; }
-};
-
-struct AdecFrame
-{
-	b8 in_use; // True after issuing a decode command until the frame is consumed
-
-	be_t<s32> this_index; // Set when initialized in cellAdecOpen(), unused afterward
-
-	// Set when the corresponding callback is received, unused afterward
-	b8 au_done;
-	b8 unk1;
-	b8 pcm_out;
-	b8 unk2;
-
-	CellAdecAuInfo au_info;
-	CellAdecPcmItem pcm_item;
-
-	u32 reserved1;
-	u32 reserved2;
-
-	// Frames that are ready to be consumed form a linked list. However, this list is not used (AdecOutputQueue is used instead)
-	be_t<s32> next; // Index of the next frame that can be consumed
-	be_t<s32> prev; // Index of the previous frame that can be consumed
-};
-
-CHECK_SIZE(AdecFrame, 0x68);
-
-class AdecOutputQueue
-{
-	struct entry
-	{
-		be_t<s32> this_index; // Unused
-		be_t<s32> state; // 0xff = empty, 0x10 = filled
-		vm::bptr<CellAdecPcmItem> pcm_item;
-		be_t<s32> pcm_handle;
-	}
-	entries[4];
-
-	be_t<s32> front;
-	be_t<s32> back;
-	be_t<s32> size;
-
-	be_t<u32> mutex; // sys_mutex_t
-	be_t<u32> cond;  // sys_cond_t, unused
-
-public:
-	void init(ppu_thread& ppu, vm::ptr<AdecOutputQueue> _this)
-	{
-		this->front = 0;
-		this->back = 0;
-		this->size = 0;
-
-		const vm::var<sys_mutex_attribute_t> mutex_attr = {{ SYS_SYNC_PRIORITY, SYS_SYNC_NOT_RECURSIVE, SYS_SYNC_NOT_PROCESS_SHARED, SYS_SYNC_NOT_ADAPTIVE, 0, 0, 0, { "_adem07"_u64 } }};
-		ensure(sys_mutex_create(ppu, _this.ptr(&AdecOutputQueue::mutex), mutex_attr) == CELL_OK); // Error code isn't checked on LLE
-
-		const vm::var<sys_cond_attribute_t> cond_attr = {{ SYS_SYNC_NOT_PROCESS_SHARED, 0, 0, { "_adec05"_u64 } }};
-		ensure(sys_cond_create(ppu, _this.ptr(&AdecOutputQueue::cond), mutex, cond_attr) == CELL_OK); // Error code isn't checked on LLE
-
-		for (s32 i = 0; i < 4; i++)
-		{
-			entries[i] = { i, 0xff, vm::null, -1 };
-		}
-	}
-
-	error_code finalize(ppu_thread& ppu) const
-	{
-		if (error_code ret = sys_cond_destroy(ppu, cond); ret != CELL_OK)
-		{
-			return ret;
-		}
-
-		if (error_code ret = sys_mutex_destroy(ppu, mutex); ret != CELL_OK)
-		{
-			return ret;
-		}
-
-		return CELL_OK;
-	}
-
-	error_code push(ppu_thread& ppu, vm::ptr<CellAdecPcmItem> pcm_item, s32 pcm_handle)
-	{
-		ensure(sys_mutex_lock(ppu, mutex, 0) == CELL_OK); // Error code isn't checked on LLE
-
-		if (entries[back].state != 0xff)
-		{
-			ensure(sys_mutex_unlock(ppu, mutex) == CELL_OK); // Error code isn't checked on LLE
-			return true; // LLE returns the result of the comparison above
-		}
-
-		entries[back].state = 0x10;
-		entries[back].pcm_item = pcm_item;
-		entries[back].pcm_handle = pcm_handle;
-
-		back = (back + 1) & 3;
-		size++;
-
-		ensure(sys_mutex_unlock(ppu, mutex) == CELL_OK); // Error code isn't checked on LLE
-		return CELL_OK;
-	}
-
-	const entry* pop(ppu_thread& ppu)
-	{
-		ensure(sys_mutex_lock(ppu, mutex, 0) == CELL_OK); // Error code isn't checked on LLE
-
-		if (ppu.state & cpu_flag::again) // Savestate was created while waiting on the mutex
-		{
-			return {};
-		}
-
-		if (entries[front].state == 0xff)
-		{
-			ensure(sys_mutex_unlock(ppu, mutex) == CELL_OK); // Error code isn't checked on LLE
-			return nullptr;
-		}
-
-		const entry* const ret = &entries[front];
-
-		entries[front].state = 0xff;
-		entries[front].pcm_handle = -1;
-
-		front = (front + 1) & 3;
-		size--;
-
-		ensure(sys_mutex_unlock(ppu, mutex) == CELL_OK); // Error code isn't checked on LLE
-		return ret;
-	}
-
-	const entry& peek(ppu_thread& ppu) const
-	{
-		ensure(sys_mutex_lock(ppu, mutex, 0) == CELL_OK); // Error code isn't checked on LLE
-		const entry& ret = entries[front];
-		ensure(sys_mutex_unlock(ppu, mutex) == CELL_OK); // Error code isn't checked on LLE
-		return ret;
-	}
-};
-
-CHECK_SIZE(AdecOutputQueue, 0x54);
-
-enum class AdecSequenceState : u32
-{
-	dormant = 0x100,
-	ready = 0x200,
-	closed = 0xa00,
-};
-
-struct AdecContext // CellAdecHandle = AdecContext*
-{
-	vm::bptr<AdecContext> _this;
-	be_t<u32> this_size; // Size of this struct + AdecFrames + bitstream info structs
-
-	u32 unk; // Unused
-
-	be_t<AdecSequenceState> sequence_state;
-
-	CellAdecType type;
-	CellAdecResource res;
-	CellAdecCb callback;
-
-	vm::bptr<void> core_handle;
-	vm::bcptr<CellAdecCoreOps> core_ops;
-
-	CellCodecTimeStamp previous_pts;
-
-	be_t<s32> frames_num;
-	u32 reserved1;
-	be_t<s32> frames_head;      // Index of the oldest frame that can be consumed
-	be_t<s32> frames_tail;      // Index of the most recent frame that can be consumed
-	vm::bptr<AdecFrame> frames; // Array of AdecFrames, number of elements is return value of CellAdecCoreOps::getPcmHandleNum
-
-	be_t<u32> bitstream_info_size;
-
-	sys_mutex_attribute_t mutex_attribute;
-	be_t<u32> mutex; // sys_mutex_t
-
-	AdecOutputQueue pcm_queue;      // Output queue for cellAdecGetPcm()
-	AdecOutputQueue pcm_item_queue; // Output queue for cellAdecGetPcmItem()
-
-	u8 reserved2[1028];
-
-	[[nodiscard]] error_code get_new_pcm_handle(vm::ptr<CellAdecAuInfo> au_info) const;
-	error_code verify_pcm_handle(s32 pcm_handle) const;
-	vm::ptr<CellAdecAuInfo> get_au_info(s32 pcm_handle) const;
-	void set_state(s32 pcm_handle, u32 state) const;
-	error_code get_pcm_item(s32 pcm_handle, vm::ptr<CellAdecPcmItem>& pcm_item) const;
-	error_code set_pcm_item(s32 pcm_handle, vm::ptr<void> pcm_addr, u32 pcm_size, vm::cpptr<void> bitstream_info) const;
-	error_code link_frame(ppu_thread& ppu, s32 pcm_handle);
-	error_code unlink_frame(ppu_thread& ppu, s32 pcm_handle);
-	void reset_frame(s32 pcm_handle) const;
-	error_code correct_pts_value(ppu_thread& ppu, s32 pcm_handle, s8 correct_pts_type);
-};
-
-static_assert(std::is_standard_layout_v<AdecContext> && std::is_trivial_v<AdecContext>);
-CHECK_SIZE_ALIGN(AdecContext, 0x530, 8);
-
-
-enum : u32
-{
-	CELL_ADEC_LPCM_DVD_CH_RESERVED1,
-	CELL_ADEC_LPCM_DVD_CH_MONO,
-	CELL_ADEC_LPCM_DVD_CH_RESERVED2,
-	CELL_ADEC_LPCM_DVD_CH_STEREO,
-	CELL_ADEC_LPCM_DVD_CH_UNK1, // Either 3 front or 2 front + 1 surround
-	CELL_ADEC_LPCM_DVD_CH_UNK2, // Either 3 front + 1 surround or 2 front + 2 surround
-	CELL_ADEC_LPCM_DVD_CH_3_2,
-	CELL_ADEC_LPCM_DVD_CH_3_2_LFE,
-	CELL_ADEC_LPCM_DVD_CH_3_4,
-	CELL_ADEC_LPCM_DVD_CH_3_4_LFE,
-};
-
 struct CellAdecParamLpcm
 {
 	be_t<u32> channelNumber;
@@ -683,216 +417,6 @@ struct CellAdecLpcmInfo
 	be_t<u32> outputDataSize;
 };
 
-// HLE exclusive, for savestates
-enum class lpcm_dec_state : u8
-{
-	waiting_for_cmd_mutex_lock,
-	waiting_for_cmd_cond_wait,
-	waiting_for_output_mutex_lock,
-	waiting_for_output_cond_wait,
-	queue_mutex_lock,
-	executing_cmd
-};
-
-class LpcmDecSemaphore
-{
-	be_t<u32> value;
-	be_t<u32> mutex; // sys_mutex_t
-	be_t<u32> cond;  // sys_cond_t
-
-public:
-	error_code init(ppu_thread& ppu, vm::ptr<LpcmDecSemaphore> _this, u32 initial_value)
-	{
-		value = initial_value;
-
-		const vm::var<sys_mutex_attribute_t> mutex_attr{{ SYS_SYNC_PRIORITY, SYS_SYNC_NOT_RECURSIVE, SYS_SYNC_NOT_PROCESS_SHARED, SYS_SYNC_NOT_ADAPTIVE, 0, 0, 0, { "_adem01"_u64 } }};
-		const vm::var<sys_cond_attribute_t> cond_attr{{ SYS_SYNC_NOT_PROCESS_SHARED, 0, 0, { "_adec01"_u64 } }};
-
-		if (error_code ret = sys_mutex_create(ppu, _this.ptr(&LpcmDecSemaphore::mutex), mutex_attr); ret != CELL_OK)
-		{
-			return ret;
-		}
-
-		return sys_cond_create(ppu, _this.ptr(&LpcmDecSemaphore::cond), mutex, cond_attr);
-	}
-
-	error_code finalize(ppu_thread& ppu) const
-	{
-		if (error_code ret = sys_cond_destroy(ppu, cond); ret != CELL_OK)
-		{
-			return ret;
-		}
-
-		return sys_mutex_destroy(ppu, mutex);
-	}
-
-	error_code release(ppu_thread& ppu)
-	{
-		if (error_code ret = sys_mutex_lock(ppu, mutex, 0); ret != CELL_OK)
-		{
-			return ret;
-		}
-
-		value++;
-
-		if (error_code ret = sys_cond_signal(ppu, cond); ret != CELL_OK)
-		{
-			return ret; // LLE doesn't unlock the mutex
-		}
-
-		return sys_mutex_unlock(ppu, mutex);
-	}
-
-	error_code acquire(ppu_thread& ppu, lpcm_dec_state& savestate)
-	{
-		if (savestate == lpcm_dec_state::waiting_for_cmd_cond_wait)
-		{
-			goto cond_wait;
-		}
-
-		savestate = lpcm_dec_state::waiting_for_cmd_mutex_lock;
-
-		if (error_code ret = sys_mutex_lock(ppu, mutex, 0); ret != CELL_OK)
-		{
-			return ret;
-		}
-
-		if (ppu.state & cpu_flag::again)
-		{
-			return {};
-		}
-
-		if (value == 0u)
-		{
-			savestate = lpcm_dec_state::waiting_for_cmd_cond_wait;
-			cond_wait:
-
-			if (error_code ret = sys_cond_wait(ppu, cond, 0); ret != CELL_OK)
-			{
-				return ret; // LLE doesn't unlock the mutex
-			}
-
-			if (ppu.state & cpu_flag::again)
-			{
-				return {};
-			}
-		}
-
-		value--;
-
-		return sys_mutex_unlock(ppu, mutex);
-	}
-};
-
-CHECK_SIZE(LpcmDecSemaphore, 0xc);
-
-enum class LpcmDecCmdType : u32
-{
-	start_seq,
-	end_seq,
-	decode_au,
-	close
-};
-
-struct LpcmDecCmd
-{
-	be_t<s32> pcm_handle;
-	vm::bcptr<void> au_start_addr;
-	be_t<u32> au_size;
-	u32 reserved1[2];
-	CellAdecParamLpcm lpcm_param;
-	be_t<LpcmDecCmdType> type;
-	u32 reserved2;
-
-	LpcmDecCmd() = default; // cellAdecOpen()
-
-	LpcmDecCmd(LpcmDecCmdType&& type) // End sequence
-		: type(type)
-	{
-	}
-
-	LpcmDecCmd(LpcmDecCmdType&& type, const CellAdecParamLpcm& lpcm_param) // Start sequence
-		: lpcm_param(lpcm_param), type(type)
-	{
-	}
-
-	LpcmDecCmd(LpcmDecCmdType&& type, const s32& pcm_handle, const CellAdecAuInfo& au_info) // Decode au
-		: pcm_handle(pcm_handle), au_start_addr(au_info.startAddr), au_size(au_info.size), type(type)
-	{
-	}
-};
-
-CHECK_SIZE(LpcmDecCmd, 0x2c);
-
-struct LpcmDecContext
-{
-	AdecCmdQueue<LpcmDecCmd> cmd_queue;
-
-	be_t<u64> thread_id; // sys_ppu_thread_t
-
-	be_t<u32> queue_size_mutex; // sys_mutex_t
-	be_t<u32> queue_size_cond;  // sys_cond_t, unused
-	be_t<u32> unk_mutex;        // sys_mutex_t, unused
-	be_t<u32> unk_cond;         // sys_cond_t, unused
-
-	be_t<u32> run_thread;
-
-	AdecCb<AdecNotifyAuDone> notify_au_done;
-	AdecCb<AdecNotifyPcmOut> notify_pcm_out;
-	AdecCb<AdecNotifyError> notify_error;
-	AdecCb<AdecNotifySeqDone> notify_seq_done;
-
-	be_t<u32> output_locked;
-	vm::bptr<f32> output;
-
-	vm::bptr<CellAdecParamLpcm> lpcm_param;
-
-	vm::bcptr<void> spurs_cmd_data;
-
-	// HLE exclusive
-	lpcm_dec_state savestate;
-	u64 cmd_counter; // For debugging
-
-	u8 reserved1[24]; // 36 bytes on LLE
-
-	be_t<u32> output_mutex;    // sys_mutex_t
-	be_t<u32> output_consumed; // sys_cond_t
-
-	LpcmDecSemaphore cmd_available;
-	LpcmDecSemaphore reserved2; // Unused
-
-	be_t<u32> queue_mutex; // sys_mutex_t
-
-	be_t<u32> error_occurred;
-
-	u8 spurs_stuff[32];
-
-	be_t<u32> spurs_queue_pop_mutex;
-	be_t<u32> spurs_queue_push_mutex;
-
-	be_t<u32> using_existing_spurs_instance;
-
-	be_t<u32> dvd_packing;
-
-	be_t<u32> output_size;
-
-	LpcmDecCmd cmd; // HLE exclusive, name of Spurs taskset (32 bytes) + CellSpursTaskLsPattern on LLE
-
-	u8 more_spurs_stuff[10]; // 52 bytes on LLE
-
-	void exec(ppu_thread& ppu);
-
-	template <LpcmDecCmdType type>
-	error_code send_command(ppu_thread& ppu, auto&&... args);
-
-	inline error_code release_output(ppu_thread& ppu);
-};
-
-static_assert(std::is_standard_layout_v<LpcmDecContext>);
-CHECK_SIZE_ALIGN(LpcmDecContext, 0x1c8, 8);
-
-constexpr s32 LPCM_DEC_OUTPUT_BUFFER_SIZE = 0x40000;
-
 // CELP Excitation Mode
 enum CELP_ExcitationMode : s32
 {
@@ -1247,6 +771,45 @@ struct CellAdecAtrac3Info
 	be_t<s32> nbytes;
 };
 
+enum ATRACX_WordSize : s32
+{
+	CELL_ADEC_ATRACX_WORD_SZ_16BIT = 0x02,
+	CELL_ADEC_ATRACX_WORD_SZ_24BIT = 0x03,
+	CELL_ADEC_ATRACX_WORD_SZ_32BIT = 0x04,
+	CELL_ADEC_ATRACX_WORD_SZ_FLOAT = 0x84,
+};
+
+enum ATRACX_ATSHeaderInclude : u8
+{
+	CELL_ADEC_ATRACX_ATS_HDR_NOTINC = 0,
+	CELL_ADEC_ATRACX_ATS_HDR_INC = 1,
+};
+
+enum ATRACX_DownmixFlag : u8
+{
+	ATRACX_DOWNMIX_OFF = 0,
+	ATRACX_DOWNMIX_ON = 1,
+};
+
+struct CellAdecParamAtracX
+{
+	be_t<s32> sampling_freq;
+	be_t<s32> ch_config_idx;
+	be_t<s32> nch_out;
+	be_t<s32> nbytes;
+	std::array<u8, 4> extra_config_data; // downmix coefficients
+	be_t<s32> bw_pcm; // ATRACX_WordSize
+	ATRACX_DownmixFlag downmix_flag;
+	ATRACX_ATSHeaderInclude au_includes_ats_hdr_flg;
+};
+
+struct CellAdecAtracXInfo
+{
+	be_t<u32> samplingFreq; // [Hz]
+	be_t<u32> channelConfigIndex;
+	be_t<u32> nbytes;
+};
+
 enum MP3_WordSize : s32
 {
 	CELL_ADEC_MP3_WORD_SZ_16BIT = 3,
@@ -1430,3 +993,106 @@ struct CellAdecMpmcInfo
 	be_t<u32> lfePresent;
 	be_t<u32> channelCoufiguration;
 };
+
+/* Audio Decoder Thread Classes */
+
+enum AdecJobType : u32
+{
+	adecStartSeq,
+	adecEndSeq,
+	adecDecodeAu,
+	adecClose,
+};
+
+struct AdecTask
+{
+	AdecJobType type;
+	union
+	{
+		struct
+		{
+			u32 auInfo_addr;
+			u32 addr;
+			u32 size;
+			u64 pts;
+			u64 userdata;
+		} au;
+
+		struct
+		{
+			s32 sample_rate;
+			s32 channel_config;
+			s32 channels;
+			s32 frame_size;
+			std::array<u8, 4> extra_config;
+			s32 output;
+			u8 downmix;
+			u8 ats_header;
+		} at3p;
+	};
+
+	AdecTask(AdecJobType type)
+		: type(type)
+	{
+	}
+
+	AdecTask()
+	{
+	}
+};
+
+struct AdecFrame
+{
+	struct AVFrame* data;
+	u64 pts;
+	u64 userdata;
+	u32 auAddr;
+	u32 auSize;
+	u32 size;
+};
+
+int adecRead(void* opaque, u8* buf, int buf_size);
+
+static const u32 at3freq[8] = { 32000, 44100, 48000, 88200, 96000, 0, 0, 0 };
+
+struct OMAHeader // OMA Header
+{
+	u32 magic; // 0x01334145
+	u16 size; // 96 << 8
+	u16 unk0; // 0xffff
+	u64 unk1; // 0x00500f0100000000ULL
+	u64 unk2; // 0xcef5000000000400ULL
+	u64 unk3; // 0x1c458024329192d2ULL
+	u8 codecId; // 1 for ATRAC3P
+	u8 code0; // 0
+	u8 code1;
+	u8 code2;
+	u32 reserved[15]; // 0
+
+	OMAHeader(u8 codec_id, u32 freq, u8 channel_count, u32 frame_size)
+		: magic(0x01334145)
+		, size(96 << 8)
+		, unk0(0xffff)
+		, unk1(0x00500f0100000000ULL)
+		, unk2(0xcef5000000000400ULL)
+		, unk3(0x1c458024329192d2ULL)
+		, codecId(codec_id)
+		, code0(0)
+	{
+		memset(reserved, 0, sizeof(reserved));
+
+		u8 freq_code;
+		for (freq_code = 0; freq_code < 5; freq_code++)
+		{
+			if (at3freq[freq_code] == freq)
+			{
+				break;
+			}
+		}
+		u32 prepared_frame_size = (frame_size - 8) / 8;
+		code1 = ((prepared_frame_size >> 8) & 0x3) | ((channel_count & 0x7) << 2) | (freq_code << 5);
+		code2 = prepared_frame_size & 0xff;
+	}
+};
+
+CHECK_SIZE(OMAHeader, 96);
diff --git a/rpcs3/Emu/Cell/Modules/cellAtrac.cpp b/rpcs3/Emu/Cell/Modules/cellAtrac.cpp
index e094fa0421..0434016ed9 100644
--- a/rpcs3/Emu/Cell/Modules/cellAtrac.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellAtrac.cpp
@@ -51,7 +51,7 @@ error_code cellAtracCreateDecoder(vm::ptr<CellAtracHandle> pHandle, vm::ptr<u8>
 {
 	cellAtrac.warning("cellAtracCreateDecoder(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, uiSpuThreadPriority=%d)", pHandle, pucWorkMem, uiPpuThreadPriority, uiSpuThreadPriority);
 
-	std::memcpy(pHandle->ucWorkMem, pucWorkMem.get_ptr(), CELL_ATRAC_HANDLE_SIZE);
+	pHandle->pucWorkMem = pucWorkMem;
 	return CELL_OK;
 }
 
@@ -59,7 +59,7 @@ error_code cellAtracCreateDecoderExt(vm::ptr<CellAtracHandle> pHandle, vm::ptr<u
 {
 	cellAtrac.warning("cellAtracCreateDecoderExt(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, pExtRes=*0x%x)", pHandle, pucWorkMem, uiPpuThreadPriority, pExtRes);
 
-	std::memcpy(pHandle->ucWorkMem, pucWorkMem.get_ptr(), CELL_ATRAC_HANDLE_SIZE);
+	pHandle->pucWorkMem = pucWorkMem;
 	return CELL_OK;
 }
 
@@ -84,7 +84,7 @@ error_code cellAtracGetStreamDataInfo(vm::ptr<CellAtracHandle> pHandle, vm::pptr
 {
 	cellAtrac.warning("cellAtracGetStreamDataInfo(pHandle=*0x%x, ppucWritePointer=**0x%x, puiWritableByte=*0x%x, puiReadPosition=*0x%x)", pHandle, ppucWritePointer, puiWritableByte, puiReadPosition);
 
-	ppucWritePointer->set(pHandle.addr());
+	*ppucWritePointer = pHandle->pucWorkMem;
 	*puiWritableByte = 0x1000;
 	*puiReadPosition = 0;
 	return CELL_OK;
@@ -206,7 +206,7 @@ error_code cellAtracGetBufferInfoForResetting(vm::ptr<CellAtracHandle> pHandle,
 {
 	cellAtrac.warning("cellAtracGetBufferInfoForResetting(pHandle=*0x%x, uiSample=0x%x, pBufferInfo=*0x%x)", pHandle, uiSample, pBufferInfo);
 
-	pBufferInfo->pucWriteAddr.set(pHandle.addr());
+	pBufferInfo->pucWriteAddr = pHandle->pucWorkMem;
 	pBufferInfo->uiWritableByte = 0x1000;
 	pBufferInfo->uiMinWriteByte = 0;
 	pBufferInfo->uiReadPosition = 0;
diff --git a/rpcs3/Emu/Cell/Modules/cellAtrac.h b/rpcs3/Emu/Cell/Modules/cellAtrac.h
index 6c9cb68248..9159a189d3 100644
--- a/rpcs3/Emu/Cell/Modules/cellAtrac.h
+++ b/rpcs3/Emu/Cell/Modules/cellAtrac.h
@@ -43,12 +43,15 @@ enum
 
 struct alignas(8) CellAtracHandle
 {
-	u8 ucWorkMem[CELL_ATRAC_HANDLE_SIZE];
+	vm::ptr<u8> pucWorkMem;
+	// ...
 };
 
+CHECK_MAX_SIZE(CellAtracHandle, 512);
+
 struct CellAtracBufferInfo
 {
-	vm::bptr<u8> pucWriteAddr;
+	vm::ptr<u8> pucWriteAddr;
 	be_t<u32> uiWritableByte;
 	be_t<u32> uiMinWriteByte;
 	be_t<u32> uiReadPosition;
@@ -56,6 +59,6 @@ struct CellAtracBufferInfo
 
 struct CellAtracExtRes
 {
-	vm::bptr<struct CellSpurs> pSpurs;
+	vm::ptr<struct CellSpurs> pSpurs;
 	u8 priority[8];
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp b/rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp
index d003ad211e..aea5e28072 100644
--- a/rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp
@@ -53,7 +53,7 @@ error_code cellAtracMultiCreateDecoder(vm::ptr<CellAtracMultiHandle> pHandle, vm
 {
 	cellAtracMulti.warning("cellAtracMultiCreateDecoder(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, uiSpuThreadPriority=%d)", pHandle, pucWorkMem, uiPpuThreadPriority, uiSpuThreadPriority);
 
-	std::memcpy(pHandle->ucWorkMem, pucWorkMem.get_ptr(), CELL_ATRACMULTI_HANDLE_SIZE);
+	pHandle->pucWorkMem = pucWorkMem;
 	return CELL_OK;
 }
 
@@ -61,7 +61,7 @@ error_code cellAtracMultiCreateDecoderExt(vm::ptr<CellAtracMultiHandle> pHandle,
 {
 	cellAtracMulti.warning("cellAtracMultiCreateDecoderExt(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, pExtRes=*0x%x)", pHandle, pucWorkMem, uiPpuThreadPriority, pExtRes);
 
-	std::memcpy(pHandle->ucWorkMem, pucWorkMem.get_ptr(), CELL_ATRACMULTI_HANDLE_SIZE);
+	pHandle->pucWorkMem = pucWorkMem;
 	return CELL_OK;
 }
 
@@ -86,7 +86,7 @@ error_code cellAtracMultiGetStreamDataInfo(vm::ptr<CellAtracMultiHandle> pHandle
 {
 	cellAtracMulti.warning("cellAtracMultiGetStreamDataInfo(pHandle=*0x%x, ppucWritePointer=**0x%x, puiWritableByte=*0x%x, puiReadPosition=*0x%x)", pHandle, ppucWritePointer, puiWritableByte, puiReadPosition);
 
-	ppucWritePointer->set(pHandle.addr());
+	*ppucWritePointer = pHandle->pucWorkMem;
 	*puiWritableByte = 0x1000;
 	*puiReadPosition = 0;
 	return CELL_OK;
@@ -215,7 +215,7 @@ error_code cellAtracMultiGetBufferInfoForResetting(vm::ptr<CellAtracMultiHandle>
 {
 	cellAtracMulti.warning("cellAtracMultiGetBufferInfoForResetting(pHandle=*0x%x, uiSample=0x%x, pBufferInfo=*0x%x)", pHandle, uiSample, pBufferInfo);
 
-	pBufferInfo->pucWriteAddr.set(pHandle.addr());
+	pBufferInfo->pucWriteAddr = pHandle->pucWorkMem;
 	pBufferInfo->uiWritableByte = 0x1000;
 	pBufferInfo->uiMinWriteByte = 0;
 	pBufferInfo->uiReadPosition = 0;
diff --git a/rpcs3/Emu/Cell/Modules/cellAtracMulti.h b/rpcs3/Emu/Cell/Modules/cellAtracMulti.h
index bbeded81c0..39724b350c 100644
--- a/rpcs3/Emu/Cell/Modules/cellAtracMulti.h
+++ b/rpcs3/Emu/Cell/Modules/cellAtracMulti.h
@@ -44,12 +44,15 @@ enum
 
 struct alignas(8) CellAtracMultiHandle
 {
-	u8 ucWorkMem[CELL_ATRACMULTI_HANDLE_SIZE];
+	vm::ptr<u8> pucWorkMem;
+	// ...
 };
 
+CHECK_MAX_SIZE(CellAtracMultiHandle, 512);
+
 struct CellAtracMultiBufferInfo
 {
-	vm::bptr<u8> pucWriteAddr;
+	vm::ptr<u8> pucWriteAddr;
 	be_t<u32> uiWritableByte;
 	be_t<u32> uiMinWriteByte;
 	be_t<u32> uiReadPosition;
@@ -57,6 +60,6 @@ struct CellAtracMultiBufferInfo
 
 struct CellAtracMultiExtRes
 {
-	vm::bptr<struct CellSpurs> pSpurs;
+	vm::ptr<struct CellSpurs> pSpurs;
 	u8 priority[8];
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellAtracXdec.cpp b/rpcs3/Emu/Cell/Modules/cellAtracXdec.cpp
deleted file mode 100644
index 36228d8a5e..0000000000
--- a/rpcs3/Emu/Cell/Modules/cellAtracXdec.cpp
+++ /dev/null
@@ -1,1009 +0,0 @@
-#include "stdafx.h"
-#include "Emu/perf_meter.hpp"
-#include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/lv2/sys_sync.h"
-#include "Emu/Cell/lv2/sys_ppu_thread.h"
-#include "Emu/savestate_utils.hpp"
-#include "sysPrxForUser.h"
-#include "util/asm.hpp"
-#include "util/media_utils.h"
-
-#include "cellAtracXdec.h"
-
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_atracx2ch;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_atracx6ch;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_atracx8ch;
-vm::gvar<CellAdecCoreOps> g_cell_adec_core_ops_atracx;
-
-LOG_CHANNEL(cellAtracXdec);
-
-template <>
-void fmt_class_string<CellAtracXdecError>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](CellAtracXdecError value)
-	{
-		switch (value)
-		{
-		STR_CASE(CELL_ADEC_ERROR_ATX_OK); // CELL_ADEC_ERROR_ATX_OFFSET, CELL_ADEC_ERROR_ATX_NONE
-		STR_CASE(CELL_ADEC_ERROR_ATX_BUSY);
-		STR_CASE(CELL_ADEC_ERROR_ATX_EMPTY);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ATSHDR);
-		STR_CASE(CELL_ADEC_ERROR_ATX_NON_FATAL);
-		STR_CASE(CELL_ADEC_ERROR_ATX_NOT_IMPLE);
-		STR_CASE(CELL_ADEC_ERROR_ATX_PACK_CE_OVERFLOW);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ILLEGAL_NPROCQUS);
-		STR_CASE(CELL_ADEC_ERROR_ATX_FATAL);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ENC_OVERFLOW);
-		STR_CASE(CELL_ADEC_ERROR_ATX_PACK_CE_UNDERFLOW);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDCT);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GAINADJ);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDSF);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_SPECTRA);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDWL);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GHWAVE);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_SHEADER);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_A);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_B);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_C);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_D);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_E);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_A);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_B);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_C);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_D);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_IDCT_A);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GC_NGC);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLEV_A);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLOC_A);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLEV_B);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLOC_B);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_SN_NWVS);
-		STR_CASE(CELL_ADEC_ERROR_ATX_FATAL_HANDLE);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_SAMPLING_FREQ);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_CH_CONFIG_INDEX);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_NBYTES);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_BLOCK_NUM);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_BLOCK_ID);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_CHANNELS);
-		STR_CASE(CELL_ADEC_ERROR_ATX_UNINIT_BLOCK_SPECIFIED);
-		STR_CASE(CELL_ADEC_ERROR_ATX_POSCFG_PRESENT);
-		STR_CASE(CELL_ADEC_ERROR_ATX_BUFFER_OVERFLOW);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ILL_BLK_TYPE_ID);
-		STR_CASE(CELL_ADEC_ERROR_ATX_UNPACK_CHANNEL_BLK_FAILED);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ILL_BLK_ID_USED_1);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ILL_BLK_ID_USED_2);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ILLEGAL_ENC_SETTING);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ILLEGAL_DEC_SETTING);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ASSERT_NSAMPLES);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ILL_SYNCWORD);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ILL_SAMPLING_FREQ);
-		STR_CASE(CELL_ADEC_ERROR_ATX_ILL_CH_CONFIG_INDEX);
-		STR_CASE(CELL_ADEC_ERROR_ATX_RAW_DATA_FRAME_SIZE_OVER);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SYNTAX_ENHANCE_LENGTH_OVER);
-		STR_CASE(CELL_ADEC_ERROR_ATX_SPU_INTERNAL_FAIL);
-		}
-
-		return unknown;
-	});
-}
-
-constexpr u32 atracXdecGetSpursMemSize(u32 nch_in)
-{
-	switch (nch_in)
-	{
-	case 1: return 0x6000;
-	case 2: return 0x6000;
-	case 3: return 0x12880;
-	case 4: return 0x19c80;
-	case 5: return -1;
-	case 6: return 0x23080;
-	case 7: return 0x2a480;
-	case 8: return 0x2c480;
-	default: return -1;
-	}
-}
-
-void AtracXdecDecoder::alloc_avcodec()
-{
-	codec = avcodec_find_decoder(AV_CODEC_ID_ATRAC3P);
-	if (!codec)
-	{
-		fmt::throw_exception("avcodec_find_decoder() failed");
-	}
-
-	ensure(!(codec->capabilities & AV_CODEC_CAP_SUBFRAMES));
-
-	ctx = avcodec_alloc_context3(codec);
-	if (!ctx)
-	{
-		fmt::throw_exception("avcodec_alloc_context3() failed");
-	}
-
-	// Allows FFmpeg to output directly into guest memory
-	ctx->opaque = this;
-	ctx->thread_type = FF_THREAD_SLICE; // Silences a warning by FFmpeg about requesting frame threading with a custom get_buffer2(). Default is FF_THREAD_FRAME & FF_THREAD_SLICE
-	ctx->get_buffer2 = [](AVCodecContext* s, AVFrame* frame, int /*flags*/) -> int
-	{
-		for (s32 i = 0; i < frame->ch_layout.nb_channels; i++)
-		{
-			frame->data[i] = static_cast<AtracXdecDecoder*>(s->opaque)->work_mem.get_ptr() + ATXDEC_MAX_FRAME_LENGTH + ATXDEC_SAMPLES_PER_FRAME * sizeof(f32) * i;
-			frame->linesize[i] = ATXDEC_SAMPLES_PER_FRAME * sizeof(f32);
-		}
-
-		frame->buf[0] = av_buffer_create(frame->data[0], ATXDEC_SAMPLES_PER_FRAME * sizeof(f32) * frame->ch_layout.nb_channels, [](void*, uint8_t*){}, nullptr, 0);
-		return 0;
-	};
-
-	packet = av_packet_alloc();
-	if (!packet)
-	{
-		fmt::throw_exception("av_packet_alloc() failed");
-	}
-
-	frame = av_frame_alloc();
-	if (!frame)
-	{
-		fmt::throw_exception("av_frame_alloc() failed");
-	}
-}
-
-void AtracXdecDecoder::free_avcodec()
-{
-	av_packet_free(&packet);
-	av_frame_free(&frame);
-	avcodec_free_context(&ctx);
-}
-
-void AtracXdecDecoder::init_avcodec()
-{
-	if (int err = avcodec_close(ctx); err)
-	{
-		fmt::throw_exception("avcodec_close() failed (err=0x%x='%s')", err, utils::av_error_to_string(err));
-	}
-
-	ctx->block_align = nbytes;
-	ctx->ch_layout.nb_channels = nch_in;
-	ctx->sample_rate = sampling_freq;
-
-	if (int err = avcodec_open2(ctx, codec, nullptr); err)
-	{
-		fmt::throw_exception("avcodec_open2() failed (err=0x%x='%s')", err, utils::av_error_to_string(err));
-	}
-
-	packet->data = work_mem.get_ptr();
-	packet->size = nbytes;
-	packet->buf = av_buffer_create(work_mem.get_ptr(), nbytes, [](void*, uint8_t*){}, nullptr, 0);
-}
-
-error_code AtracXdecDecoder::set_config_info(u32 sampling_freq, u32 ch_config_idx, u32 nbytes)
-{
-	cellAtracXdec.notice("AtracXdecDecoder::set_config_info(sampling_freq=%d, ch_config_idx=%d, nbytes=0x%x)", sampling_freq, ch_config_idx, nbytes);
-
-	this->sampling_freq = sampling_freq;
-	this->ch_config_idx = ch_config_idx;
-	this->nbytes = nbytes;
-	this->nbytes_128_aligned = utils::align(nbytes, 0x80);
-	this->nch_in = ch_config_idx <= 4 ? ch_config_idx : ch_config_idx + 1;
-
-	if (ch_config_idx > 7u)
-	{
-		this->config_is_set = false;
-		return { 0x80004005, "AtracXdecDecoder::set_config_info() failed: Invalid channel configuration: %d", ch_config_idx };
-	}
-
-	this->nch_blocks = ATXDEC_NCH_BLOCKS_MAP[ch_config_idx];
-
-	// These checks are performed on the LLE SPU thread
-	if (ch_config_idx == 0u)
-	{
-		this->config_is_set = false;
-		return { 0x80004005, "AtracXdecDecoder::set_config_info() failed: Invalid channel configuration: %d", ch_config_idx };
-	}
-
-	if (sampling_freq != 48000u && sampling_freq != 44100u) // 32kHz is not supported, even though official docs claim it is
-	{
-		this->config_is_set = false;
-		return { 0x80004005, "AtracXdecDecoder::set_config_info() failed: Invalid sample rate: %d", sampling_freq };
-	}
-
-	if (nbytes == 0u || nbytes > ATXDEC_MAX_FRAME_LENGTH)
-	{
-		this->config_is_set = false;
-		return { 0x80004005, "AtracXdecDecoder::set_config_info() failed: Invalid frame length: 0x%x", nbytes };
-	}
-
-	this->config_is_set = true;
-	return CELL_OK;
-}
-
-error_code AtracXdecDecoder::init_decode(u32 bw_pcm, u32 nch_out)
-{
-	if (bw_pcm < CELL_ADEC_ATRACX_WORD_SZ_16BIT || (bw_pcm > CELL_ADEC_ATRACX_WORD_SZ_32BIT && bw_pcm != CELL_ADEC_ATRACX_WORD_SZ_FLOAT))
-	{
-		return { 0x80004005, "AtracXdecDecoder::init_decode() failed: Invalid PCM output format" };
-	}
-
-	this->bw_pcm = bw_pcm;
-	this->nch_out = nch_out; // Not checked for invalid values on LLE
-	this->pcm_output_size = (bw_pcm == CELL_ADEC_ATRACX_WORD_SZ_16BIT ? sizeof(s16) : sizeof(f32)) * nch_in * ATXDEC_SAMPLES_PER_FRAME;
-
-	init_avcodec();
-	return CELL_OK;
-}
-
-error_code AtracXdecDecoder::parse_ats_header(vm::cptr<u8> au_start_addr)
-{
-	const auto ats = std::bit_cast<AtracXdecAtsHeader>(vm::read64(au_start_addr.addr()));
-
-	if (ats.sync_word != 0x0fd0)
-	{
-		return { CELL_ADEC_ERROR_ATX_ATSHDR, "AtracXdecDecoder::parse_ats_header() failed: Invalid sync word: 0x%x", ats.sync_word };
-	}
-
-	const u8 sample_rate_idx = ats.params >> 13;
-	const u8 ch_config_idx = ats.params >> 10 & 7;
-	const u16 nbytes = ((ats.params & 0x3ff) + 1) * 8;
-
-	if (ch_config_idx == 0u)
-	{
-		return { CELL_ADEC_ERROR_ATX_ATSHDR, "AtracXdecDecoder::parse_ats_header() failed: Invalid channel configuration: %d", ch_config_idx };
-	}
-
-	u32 sampling_freq;
-	switch (sample_rate_idx)
-	{
-	case 1: sampling_freq = 44100; break;
-	case 2: sampling_freq = 48000; break;
-	default: return { CELL_ADEC_ERROR_ATX_ATSHDR, "AtracXdecDecoder::parse_ats_header() failed: Invalid sample rate index: %d", sample_rate_idx };
-	}
-
-	return set_config_info(sampling_freq, ch_config_idx, nbytes); // Cannot return error here, values were already checked
-}
-
-void AtracXdecContext::exec(ppu_thread& ppu)
-{
-	perf_meter<"ATXDEC"_u64> perf0;
-
-	// Savestates
-	if (decoder.config_is_set)
-	{
-		decoder.init_avcodec();
-	}
-
-	switch (savestate)
-	{
-	case atracxdec_state::initial: break;
-	case atracxdec_state::waiting_for_cmd: goto label1_wait_for_cmd_state;
-	case atracxdec_state::checking_run_thread_1: goto label2_check_run_thread_1_state;
-	case atracxdec_state::executing_cmd: goto label3_execute_cmd_state;
-	case atracxdec_state::waiting_for_output: goto label4_wait_for_output_state;
-	case atracxdec_state::checking_run_thread_2: goto label5_check_run_thread_2_state;
-	case atracxdec_state::decoding: goto label6_decode_state;
-	}
-
-	for (;;cmd_counter++)
-	{
-		cellAtracXdec.trace("Command counter: %llu, waiting for next command...", cmd_counter);
-
-		for (;;)
-		{
-			savestate = atracxdec_state::initial;
-
-			ensure(sys_mutex_lock(ppu, queue_mutex, 0) == CELL_OK);
-
-			if (ppu.state & cpu_flag::again)
-			{
-				return;
-			}
-
-			if (!cmd_queue.empty())
-			{
-				break;
-			}
-
-			savestate = atracxdec_state::waiting_for_cmd;
-			label1_wait_for_cmd_state:
-
-			ensure(sys_cond_wait(ppu, queue_not_empty, 0) == CELL_OK);
-
-			if (ppu.state & cpu_flag::again)
-			{
-				return;
-			}
-
-			ensure(sys_mutex_unlock(ppu, queue_mutex) == CELL_OK);
-		}
-
-		cmd_queue.pop(cmd);
-
-		ensure(sys_mutex_unlock(ppu, queue_mutex) == CELL_OK);
-
-		savestate = atracxdec_state::checking_run_thread_1;
-		label2_check_run_thread_1_state:
-
-		ensure(sys_mutex_lock(ppu, run_thread_mutex, 0) == CELL_OK);
-
-		if (ppu.state & cpu_flag::again)
-		{
-			return;
-		}
-
-		if (!run_thread)
-		{
-			ensure(sys_mutex_unlock(ppu, run_thread_mutex) == CELL_OK);
-			return;
-		}
-
-		ensure(sys_mutex_unlock(ppu, run_thread_mutex) == CELL_OK);
-
-		savestate = atracxdec_state::executing_cmd;
-		label3_execute_cmd_state:
-
-		cellAtracXdec.trace("Command type: %d", static_cast<u32>(cmd.type.get()));
-
-		switch (cmd.type)
-		{
-		case AtracXdecCmdType::start_seq:
-		{
-			first_decode = true;
-			skip_next_frame = true;
-
-			// Skip if access units contain an ATS header, the parameters are included in the header and we need to wait for the first decode command to parse them
-			if (cmd.atracx_param.au_includes_ats_hdr_flg == CELL_ADEC_ATRACX_ATS_HDR_NOTINC)
-			{
-				if (decoder.set_config_info(cmd.atracx_param.sampling_freq, cmd.atracx_param.ch_config_idx, cmd.atracx_param.nbytes) == static_cast<s32>(0x80004005))
-				{
-					break;
-				}
-
-				if (decoder.init_decode(cmd.atracx_param.bw_pcm, cmd.atracx_param.nch_out) == static_cast<s32>(0x80004005))
-				{
-					break;
-				}
-			}
-
-			atracx_param = cmd.atracx_param;
-			break;
-		}
-		case AtracXdecCmdType::end_seq:
-		{
-			// Block savestate creation during callbacks
-			std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-			if (!savestate_lock.owns_lock())
-			{
-				ppu.state += cpu_flag::again;
-				return;
-			}
-
-			// Doesn't do anything else
-			notify_seq_done.cbFunc(ppu, notify_seq_done.cbArg);
-			break;
-		}
-		case AtracXdecCmdType::decode_au:
-		{
-			ensure(!!cmd.au_start_addr); // Not checked on LLE
-
-			cellAtracXdec.trace("Waiting for output to be consumed...");
-
-			ensure(sys_mutex_lock(ppu, output_mutex, 0) == CELL_OK);
-
-			if (ppu.state & cpu_flag::again)
-			{
-				return;
-			}
-
-			while (output_locked)
-			{
-				savestate = atracxdec_state::waiting_for_output;
-				label4_wait_for_output_state:
-
-				ensure(sys_cond_wait(ppu, output_consumed, 0) == CELL_OK);
-
-				if (ppu.state & cpu_flag::again)
-				{
-					return;
-				}
-			}
-
-			cellAtracXdec.trace("Output consumed");
-
-			savestate = atracxdec_state::checking_run_thread_2;
-			label5_check_run_thread_2_state:
-
-			ensure(sys_mutex_lock(ppu, run_thread_mutex, 0) == CELL_OK);
-
-			if (ppu.state & cpu_flag::again)
-			{
-				return;
-			}
-
-			if (!run_thread)
-			{
-				ensure(sys_mutex_unlock(ppu, run_thread_mutex) == CELL_OK);
-				ensure(sys_mutex_unlock(ppu, output_mutex) == CELL_OK);
-				return;
-			}
-
-			ensure(sys_mutex_unlock(ppu, run_thread_mutex) == CELL_OK);
-
-			savestate = atracxdec_state::decoding;
-			label6_decode_state:
-
-			u32 error = CELL_OK;
-
-			// Only the first valid ATS header after starting a sequence is parsed. It is ignored on all subsequent access units
-			if (first_decode && atracx_param.au_includes_ats_hdr_flg == CELL_ADEC_ATRACX_ATS_HDR_INC)
-			{
-				// Block savestate creation during callbacks
-				std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-				if (!savestate_lock.owns_lock())
-				{
-					ppu.state += cpu_flag::again;
-					return;
-				}
-
-				if (error = decoder.parse_ats_header(cmd.au_start_addr); error != CELL_OK)
-				{
-					notify_error.cbFunc(ppu, error, notify_error.cbArg);
-				}
-				else if (decoder.init_decode(atracx_param.bw_pcm, atracx_param.nch_out) != CELL_OK)
-				{
-					notify_error.cbFunc(ppu, CELL_ADEC_ERROR_ATX_FATAL, notify_error.cbArg);
-				}
-			}
-
-			// LLE does not initialize the output address if parsing the ATS header fails
-			vm::ptr<void> output = vm::null;
-			u32 decoded_samples_num = 0;
-
-			if (error != CELL_ADEC_ERROR_ATX_ATSHDR)
-			{
-				// The LLE SPU thread would crash if you attempt to decode without a valid configuration
-				ensure(decoder.config_is_set, "Attempted to decode with invalid configuration");
-
-				output.set(work_mem.addr() + atracXdecGetSpursMemSize(decoder.nch_in));
-
-				const auto au_start_addr = atracx_param.au_includes_ats_hdr_flg == CELL_ADEC_ATRACX_ATS_HDR_INC ? cmd.au_start_addr.get_ptr() + sizeof(AtracXdecAtsHeader) : cmd.au_start_addr.get_ptr();
-				std::memcpy(work_mem.get_ptr(), au_start_addr, decoder.nbytes);
-
-				if (int err = avcodec_send_packet(decoder.ctx, decoder.packet); err)
-				{
-					// These errors should never occur
-					if (err == AVERROR(EAGAIN) || err == averror_eof || err == AVERROR(EINVAL) || err == AVERROR(ENOMEM))
-					{
-						fmt::throw_exception("avcodec_send_packet() failed (err=0x%x='%s')", err, utils::av_error_to_string(err));
-					}
-
-					// Game sent invalid data
-					cellAtracXdec.error("avcodec_send_packet() failed (err=0x%x='%s')", err, utils::av_error_to_string(err));
-					error = CELL_ADEC_ERROR_ATX_NON_FATAL; // Not accurate, FFmpeg doesn't provide detailed errors like LLE
-
-					av_frame_unref(decoder.frame);
-				}
-				else if ((err = avcodec_receive_frame(decoder.ctx, decoder.frame)))
-				{
-					fmt::throw_exception("avcodec_receive_frame() failed (err=0x%x='%s')", err, utils::av_error_to_string(err));
-				}
-
-				decoded_samples_num = decoder.frame->nb_samples;
-				ensure(decoded_samples_num == 0u || decoded_samples_num == ATXDEC_SAMPLES_PER_FRAME);
-
-				// The first frame after starting a new sequence or after an error is replaced with silence
-				if (skip_next_frame && error == CELL_OK)
-				{
-					skip_next_frame = false;
-					decoded_samples_num = 0;
-					std::memset(output.get_ptr(), 0, ATXDEC_SAMPLES_PER_FRAME * (decoder.bw_pcm & 0x7full) * decoder.nch_out);
-				}
-
-				// Convert FFmpeg output to LLE output
-				const auto output_f32 = vm::static_ptr_cast<f32>(output).get_ptr();
-				const auto output_s16 = vm::static_ptr_cast<s16>(output).get_ptr();
-				const auto output_s32 = vm::static_ptr_cast<s32>(output).get_ptr();
-				const u8* const ch_map = ATXDEC_AVCODEC_CH_MAP[decoder.ch_config_idx - 1];
-				const u32 nch_in = decoder.nch_in;
-
-				switch (decoder.bw_pcm)
-				{
-				case CELL_ADEC_ATRACX_WORD_SZ_FLOAT:
-					for (u32 channel_idx = 0; channel_idx < nch_in; channel_idx++)
-					{
-						const f32* samples = reinterpret_cast<f32*>(decoder.frame->data[channel_idx]);
-
-						for (u32 in_sample_idx = 0, out_sample_idx = ch_map[channel_idx]; in_sample_idx < decoded_samples_num; in_sample_idx++, out_sample_idx += nch_in)
-						{
-							const f32 sample = samples[in_sample_idx];
-
-							if (sample >= std::bit_cast<f32>(std::bit_cast<u32>(1.f) - 1))
-							{
-								output_f32[out_sample_idx] = std::bit_cast<be_t<f32>>("\x3f\x7f\xff\xff"_u32); // Prevents an unnecessary endian swap
-							}
-							else if (sample <= -1.f)
-							{
-								output_f32[out_sample_idx] = -1.f;
-							}
-							else
-							{
-								output_f32[out_sample_idx] = sample;
-							}
-						}
-					}
-					break;
-
-				case CELL_ADEC_ATRACX_WORD_SZ_16BIT:
-					for (u32 channel_idx = 0; channel_idx < nch_in; channel_idx++)
-					{
-						const f32* samples = reinterpret_cast<f32*>(decoder.frame->data[channel_idx]);
-
-						for (u32 in_sample_idx = 0, out_sample_idx = ch_map[channel_idx]; in_sample_idx < decoded_samples_num; in_sample_idx++, out_sample_idx += nch_in)
-						{
-							const f32 sample = samples[in_sample_idx];
-
-							if (sample >= 1.f)
-							{
-								output_s16[out_sample_idx] = INT16_MAX;
-							}
-							else if (sample <= -1.f)
-							{
-								output_s16[out_sample_idx] = INT16_MIN;
-							}
-							else
-							{
-								output_s16[out_sample_idx] = static_cast<s16>(std::floor(sample * 0x8000u));
-							}
-						}
-					}
-					break;
-
-				case CELL_ADEC_ATRACX_WORD_SZ_24BIT:
-					for (u32 channel_idx = 0; channel_idx < nch_in; channel_idx++)
-					{
-						const f32* samples = reinterpret_cast<f32*>(decoder.frame->data[channel_idx]);
-
-						for (u32 in_sample_idx = 0, out_sample_idx = ch_map[channel_idx]; in_sample_idx < decoded_samples_num; in_sample_idx++, out_sample_idx += nch_in)
-						{
-							const f32 sample = samples[in_sample_idx];
-
-							if (sample >= 1.f)
-							{
-								output_s32[out_sample_idx] = 0x007fffff;
-							}
-							else if (sample <= -1.f)
-							{
-								output_s32[out_sample_idx] = 0x00800000;
-							}
-							else
-							{
-								output_s32[out_sample_idx] = static_cast<s32>(std::floor(sample * 0x00800000u)) & 0x00ffffff;
-							}
-						}
-					}
-					break;
-
-				case CELL_ADEC_ATRACX_WORD_SZ_32BIT:
-					for (u32 channel_idx = 0; channel_idx < nch_in; channel_idx++)
-					{
-						const f32* samples = reinterpret_cast<f32*>(decoder.frame->data[channel_idx]);
-
-						for (u32 in_sample_idx = 0, out_sample_idx = ch_map[channel_idx]; in_sample_idx < decoded_samples_num; in_sample_idx++, out_sample_idx += nch_in)
-						{
-							const f32 sample = samples[in_sample_idx];
-
-							if (sample >= 1.f)
-							{
-								output_s32[out_sample_idx] = INT32_MAX;
-							}
-							else if (sample <= -1.f)
-							{
-								output_s32[out_sample_idx] = INT32_MIN;
-							}
-							else
-							{
-								output_s32[out_sample_idx] = static_cast<s32>(std::floor(sample * 0x80000000u));
-							}
-						}
-					}
-				}
-
-				first_decode = false;
-
-				if (error != CELL_OK)
-				{
-					// Block savestate creation during callbacks
-					std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-					if (!savestate_lock.owns_lock())
-					{
-						ppu.state += cpu_flag::again;
-						return;
-					}
-
-					skip_next_frame = true;
-					notify_error.cbFunc(ppu, error, notify_error.cbArg);
-				}
-			}
-
-			// Block savestate creation during callbacks
-			std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-			if (!savestate_lock.owns_lock())
-			{
-				ppu.state += cpu_flag::again;
-				return;
-			}
-
-			// au_done and pcm_out callbacks are always called after a decode command, even if an error occurred
-			// The output always has to be consumed as well
-			notify_au_done.cbFunc(ppu, cmd.pcm_handle, notify_au_done.cbArg);
-
-			output_locked = true;
-			ensure(sys_mutex_unlock(ppu, output_mutex) == CELL_OK);
-
-			const u32 output_size = decoded_samples_num * (decoder.bw_pcm & 0x7fu) * decoder.nch_out;
-
-			const vm::var<CellAdecAtracXInfo> bsi_info{{ decoder.sampling_freq, decoder.ch_config_idx, decoder.nbytes }};
-
-			const AdecCorrectPtsValueType correct_pts_type = [&]
-			{
-				switch (decoder.sampling_freq)
-				{
-				case 32000u: return ADEC_CORRECT_PTS_VALUE_TYPE_ATRACX_32000Hz;
-				case 44100u: return ADEC_CORRECT_PTS_VALUE_TYPE_ATRACX_44100Hz;
-				case 48000u: return ADEC_CORRECT_PTS_VALUE_TYPE_ATRACX_48000Hz;
-				default:     return ADEC_CORRECT_PTS_VALUE_TYPE_UNSPECIFIED;
-				}
-			}();
-
-			notify_pcm_out.cbFunc(ppu, cmd.pcm_handle, output, output_size, notify_pcm_out.cbArg, vm::make_var<vm::bcptr<void>>(bsi_info), correct_pts_type, error);
-			break;
-		}
-		default:
-			fmt::throw_exception("Invalid command");
-		}
-	}
-}
-
-template <AtracXdecCmdType type>
-error_code AtracXdecContext::send_command(ppu_thread& ppu, auto&&... args)
-{
-	auto& savestate = *ppu.optional_savestate_state;
-	const bool signal = savestate.try_read<bool>().second;
-	savestate.clear();
-
-	if (!signal)
-	{
-		ensure(sys_mutex_lock(ppu, queue_mutex, 0) == CELL_OK);
-
-		if (ppu.state & cpu_flag::again)
-		{
-			return {};
-		}
-
-		if constexpr (type == AtracXdecCmdType::close)
-		{
-			// Close command is only sent if the queue is empty on LLE
-			if (!cmd_queue.empty())
-			{
-				ensure(sys_mutex_unlock(ppu, queue_mutex) == CELL_OK);
-				return {};
-			}
-		}
-
-		if (cmd_queue.full())
-		{
-			ensure(sys_mutex_unlock(ppu, queue_mutex) == CELL_OK);
-			return CELL_ADEC_ERROR_ATX_BUSY;
-		}
-
-		cmd_queue.emplace(std::forward<AtracXdecCmdType>(type), std::forward<decltype(args)>(args)...);
-
-		ensure(sys_mutex_unlock(ppu, queue_mutex) == CELL_OK);
-	}
-
-	ensure(sys_cond_signal(ppu, queue_not_empty) == CELL_OK);
-
-	if (ppu.state & cpu_flag::again)
-	{
-		savestate(true);
-	}
-
-	return CELL_OK;
-}
-
-void atracXdecEntry(ppu_thread& ppu, vm::ptr<AtracXdecContext> atxdec)
-{
-	atxdec->decoder.alloc_avcodec();
-
-	atxdec->exec(ppu);
-
-	atxdec->decoder.free_avcodec();
-
-	if (ppu.state & cpu_flag::again)
-	{
-		// For savestates, save argument
-		ppu.syscall_args[0] = atxdec.addr();
-
-		return;
-	}
-
-	ppu_execute<&sys_ppu_thread_exit>(ppu, CELL_OK);
-}
-
-template <u32 nch_in>
-error_code _CellAdecCoreOpGetMemSize_atracx(vm::ptr<CellAdecAttr> attr)
-{
-	cellAtracXdec.notice("_CellAdecCoreOpGetMemSize_atracx<nch_in=%d>(attr=*0x%x)", nch_in, attr);
-
-	ensure(!!attr); // Not checked on LLE
-
-	constexpr u32 mem_size =
-		sizeof(AtracXdecContext) + 0x7f
-		+ ATXDEC_SPURS_STRUCTS_SIZE + 0x1d8
-		+ atracXdecGetSpursMemSize(nch_in)
-		+ ATXDEC_SAMPLES_PER_FRAME * sizeof(f32) * nch_in;
-
-	attr->workMemSize = utils::align(mem_size, 0x80);
-
-	return CELL_OK;
-}
-
-error_code _CellAdecCoreOpOpenExt_atracx(ppu_thread& ppu, vm::ptr<AtracXdecContext> handle, vm::ptr<AdecNotifyAuDone> notifyAuDone, vm::ptr<void> notifyAuDoneArg, vm::ptr<AdecNotifyPcmOut> notifyPcmOut, vm::ptr<void> notifyPcmOutArg,
-	vm::ptr<AdecNotifyError> notifyError, vm::ptr<void> notifyErrorArg, vm::ptr<AdecNotifySeqDone> notifySeqDone, vm::ptr<void> notifySeqDoneArg, vm::cptr<CellAdecResource> res, vm::cptr<CellAdecResourceSpurs> spursRes)
-{
-	std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!savestate_lock.owns_lock())
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	cellAtracXdec.notice("_CellAdecCoreOpOpenExt_atracx(handle=*0x%x, notifyAuDone=*0x%x, notifyAuDoneArg=*0x%x, notifyPcmOut=*0x%x, notifyPcmOutArg=*0x%x, notifyError=*0x%x, notifyErrorArg=*0x%x, notifySeqDone=*0x%x, notifySeqDoneArg=*0x%x, res=*0x%x, spursRes=*0x%x)",
-		handle, notifyAuDone, notifyAuDoneArg, notifyPcmOut, notifyPcmOutArg, notifyError, notifyErrorArg, notifySeqDone, notifySeqDoneArg, res, spursRes);
-
-	ensure(!!handle && !!res); // Not checked on LLE
-	ensure(handle.aligned(0x80)); // On LLE, this functions doesn't check the alignment or aligns the address itself. The address should already be aligned to 128 bytes by cellAdec
-	ensure(!!notifyAuDone && !!notifyAuDoneArg && !!notifyPcmOut && !!notifyPcmOutArg && !!notifyError && !!notifyErrorArg && !!notifySeqDone && !!notifySeqDoneArg); // These should always be set by cellAdec
-
-	write_to_ptr(handle.get_ptr(), AtracXdecContext(notifyAuDone, notifyAuDoneArg, notifyPcmOut, notifyPcmOutArg, notifyError, notifyErrorArg, notifySeqDone, notifySeqDoneArg,
-		vm::bptr<u8>::make(handle.addr() + utils::align(static_cast<u32>(sizeof(AtracXdecContext)), 0x80) + ATXDEC_SPURS_STRUCTS_SIZE)));
-
-	const vm::var<sys_mutex_attribute_t> mutex_attr{{ SYS_SYNC_PRIORITY, SYS_SYNC_NOT_RECURSIVE, SYS_SYNC_NOT_PROCESS_SHARED, SYS_SYNC_NOT_ADAPTIVE, 0, 0, 0, { "_atd001"_u64 } }};
-	const vm::var<sys_cond_attribute_t> cond_attr{{ SYS_SYNC_NOT_PROCESS_SHARED, 0, 0, { "_atd002"_u64 } }};
-
-	ensure(sys_mutex_create(ppu, handle.ptr(&AtracXdecContext::queue_mutex), mutex_attr) == CELL_OK);
-	ensure(sys_cond_create(ppu, handle.ptr(&AtracXdecContext::queue_not_empty), handle->queue_mutex, cond_attr) == CELL_OK);
-
-	mutex_attr->name_u64 = "_atd003"_u64;
-	cond_attr->name_u64 = "_atd004"_u64;
-
-	ensure(sys_mutex_create(ppu, handle.ptr(&AtracXdecContext::run_thread_mutex), mutex_attr) == CELL_OK);
-	ensure(sys_cond_create(ppu, handle.ptr(&AtracXdecContext::run_thread_cond), handle->run_thread_mutex, cond_attr) == CELL_OK);
-
-	mutex_attr->name_u64 = "_atd005"_u64;
-	cond_attr->name_u64 = "_atd006"_u64;
-
-	ensure(sys_mutex_create(ppu, handle.ptr(&AtracXdecContext::output_mutex), mutex_attr) == CELL_OK);
-	ensure(sys_cond_create(ppu, handle.ptr(&AtracXdecContext::output_consumed), handle->output_mutex, cond_attr) == CELL_OK);
-
-	ensure(sys_mutex_lock(ppu, handle->output_mutex, 0) == CELL_OK);
-	handle->output_locked = false;
-	ensure(sys_cond_signal(ppu, handle->output_consumed) == CELL_OK);
-	ensure(sys_mutex_unlock(ppu, handle->output_mutex) == CELL_OK);
-
-	const vm::var<char[]> _name = vm::make_str("HLE ATRAC3plus decoder");
-	const auto entry = g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(atracXdecEntry));
-	ppu_execute<&sys_ppu_thread_create>(ppu, handle.ptr(&AtracXdecContext::thread_id), entry, handle.addr(), +res->ppuThreadPriority, +res->ppuThreadStackSize, SYS_PPU_THREAD_CREATE_JOINABLE, +_name);
-
-	return CELL_OK;
-}
-
-error_code _CellAdecCoreOpOpen_atracx(ppu_thread& ppu, vm::ptr<AtracXdecContext> handle, vm::ptr<AdecNotifyAuDone> notifyAuDone, vm::ptr<void> notifyAuDoneArg, vm::ptr<AdecNotifyPcmOut> notifyPcmOut, vm::ptr<void> notifyPcmOutArg,
-	vm::ptr<AdecNotifyError> notifyError, vm::ptr<void> notifyErrorArg, vm::ptr<AdecNotifySeqDone> notifySeqDone, vm::ptr<void> notifySeqDoneArg, vm::cptr<CellAdecResource> res)
-{
-	cellAtracXdec.notice("_CellAdecCoreOpOpen_atracx(handle=*0x%x, notifyAuDone=*0x%x, notifyAuDoneArg=*0x%x, notifyPcmOut=*0x%x, notifyPcmOutArg=*0x%x, notifyError=*0x%x, notifyErrorArg=*0x%x, notifySeqDone=*0x%x, notifySeqDoneArg=*0x%x, res=*0x%x)",
-		handle, notifyAuDone, notifyAuDoneArg, notifyPcmOut, notifyPcmOutArg, notifyError, notifyErrorArg, notifySeqDone, notifySeqDoneArg, res);
-
-	return _CellAdecCoreOpOpenExt_atracx(ppu, handle, notifyAuDone, notifyAuDoneArg, notifyPcmOut, notifyPcmOutArg, notifyError, notifyErrorArg, notifySeqDone, notifySeqDoneArg, res, vm::null);
-}
-
-error_code _CellAdecCoreOpClose_atracx(ppu_thread& ppu, vm::ptr<AtracXdecContext> handle)
-{
-	std::unique_lock savestate_lock{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!savestate_lock.owns_lock())
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	cellAtracXdec.notice("_CellAdecCoreOpClose_atracx(handle=*0x%x)", handle);
-
-	ensure(!!handle); // Not checked on LLE
-
-	ensure(sys_mutex_lock(ppu, handle->run_thread_mutex, 0) == CELL_OK);
-	handle->run_thread = false;
-	ensure(sys_mutex_unlock(ppu, handle->run_thread_mutex) == CELL_OK);
-
-	handle->send_command<AtracXdecCmdType::close>(ppu);
-
-	ensure(sys_mutex_lock(ppu, handle->output_mutex, 0) == CELL_OK);
-	handle->output_locked = false;
-	ensure(sys_mutex_unlock(ppu, handle->output_mutex) == CELL_OK);
-	ensure(sys_cond_signal(ppu, handle->output_consumed) == CELL_OK);
-
-	vm::var<u64> thread_ret;
-	ensure(sys_ppu_thread_join(ppu, static_cast<u32>(handle->thread_id), +thread_ret) == CELL_OK);
-
-	error_code ret = sys_cond_destroy(ppu, handle->queue_not_empty);
-	ret = ret ? ret : sys_cond_destroy(ppu, handle->run_thread_cond);
-	ret = ret ? ret : sys_cond_destroy(ppu, handle->output_consumed);
-	ret = ret ? ret : sys_mutex_destroy(ppu, handle->queue_mutex);
-	ret = ret ? ret : sys_mutex_destroy(ppu, handle->run_thread_mutex);
-	ret = ret ? ret : sys_mutex_destroy(ppu, handle->output_mutex);
-
-	return ret != CELL_OK ? static_cast<error_code>(CELL_ADEC_ERROR_FATAL) : CELL_OK;
-}
-
-error_code _CellAdecCoreOpStartSeq_atracx(ppu_thread& ppu, vm::ptr<AtracXdecContext> handle, vm::cptr<CellAdecParamAtracX> atracxParam)
-{
-	cellAtracXdec.notice("_CellAdecCoreOpStartSeq_atracx(handle=*0x%x, atracxParam=*0x%x)", handle, atracxParam);
-
-	ensure(!!handle && !!atracxParam); // Not checked on LLE
-
-	cellAtracXdec.notice("_CellAdecCoreOpStartSeq_atracx(): sampling_freq=%d, ch_config_idx=%d, nch_out=%d, nbytes=0x%x, extra_config_data=0x%08x, bw_pcm=0x%x, downmix_flag=%d, au_includes_ats_hdr_flg=%d",
-		atracxParam->sampling_freq, atracxParam->ch_config_idx, atracxParam->nch_out, atracxParam->nbytes, std::bit_cast<u32>(atracxParam->extra_config_data), atracxParam->bw_pcm, atracxParam->downmix_flag, atracxParam->au_includes_ats_hdr_flg);
-
-	return handle->send_command<AtracXdecCmdType::start_seq>(ppu, *atracxParam);
-}
-
-error_code _CellAdecCoreOpEndSeq_atracx(ppu_thread& ppu, vm::ptr<AtracXdecContext> handle)
-{
-	cellAtracXdec.notice("_CellAdecCoreOpEndSeq_atracx(handle=*0x%x)", handle);
-
-	ensure(!!handle); // Not checked on LLE
-
-	return handle->send_command<AtracXdecCmdType::end_seq>(ppu);
-}
-
-error_code _CellAdecCoreOpDecodeAu_atracx(ppu_thread& ppu, vm::ptr<AtracXdecContext> handle, s32 pcmHandle, vm::cptr<CellAdecAuInfo> auInfo)
-{
-	cellAtracXdec.trace("_CellAdecCoreOpDecodeAu_atracx(handle=*0x%x, pcmHandle=%d, auInfo=*0x%x)", handle, pcmHandle, auInfo);
-
-	ensure(!!handle && !!auInfo); // Not checked on LLE
-
-	cellAtracXdec.trace("_CellAdecCoreOpDecodeAu_atracx(): startAddr=*0x%x, size=0x%x, pts=%lld, userData=0x%llx", auInfo->startAddr, auInfo->size, std::bit_cast<be_t<u64>>(auInfo->pts), auInfo->userData);
-
-	return handle->send_command<AtracXdecCmdType::decode_au>(ppu, pcmHandle, *auInfo);
-}
-
-void _CellAdecCoreOpGetVersion_atracx(vm::ptr<be_t<u32, 1>> version)
-{
-	cellAtracXdec.notice("_CellAdecCoreOpGetVersion_atracx(version=*0x%x)", version);
-
-	ensure(!!version); // Not checked on LLE
-
-	*version = 0x01020000;
-}
-
-error_code _CellAdecCoreOpRealign_atracx(vm::ptr<AtracXdecContext> handle, vm::ptr<void> outBuffer, vm::cptr<void> pcmStartAddr)
-{
-	cellAtracXdec.trace("_CellAdecCoreOpRealign_atracx(handle=*0x%x, outBuffer=*0x%x, pcmStartAddr=*0x%x)", handle, outBuffer, pcmStartAddr);
-
-	if (outBuffer)
-	{
-		ensure(!!handle && !!pcmStartAddr); // Not checked on LLE
-		ensure(vm::check_addr(outBuffer.addr(), vm::page_info_t::page_writable, handle->decoder.pcm_output_size));
-
-		std::memcpy(outBuffer.get_ptr(), pcmStartAddr.get_ptr(), handle->decoder.pcm_output_size);
-	}
-
-	return CELL_OK;
-}
-
-error_code _CellAdecCoreOpReleasePcm_atracx(ppu_thread& ppu, vm::ptr<AtracXdecContext> handle, s32 pcmHandle, vm::cptr<void> outBuffer)
-{
-	cellAtracXdec.trace("_CellAdecCoreOpReleasePcm_atracx(handle=*0x%x, pcmHandle=%d, outBuffer=*0x%x)", handle, pcmHandle, outBuffer);
-
-	ensure(!!handle); // Not checked on LLE
-
-	auto& savestate = *ppu.optional_savestate_state;
-	const bool signal = savestate.try_read<bool>().second;
-	savestate.clear();
-
-	if (!signal)
-	{
-		ensure(sys_mutex_lock(ppu, handle->output_mutex, 0) == CELL_OK);
-
-		if (ppu.state & cpu_flag::again)
-		{
-			return {};
-		}
-
-		handle->output_locked = false;
-	}
-
-	ensure(sys_cond_signal(ppu, handle->output_consumed) == CELL_OK);
-
-	if (ppu.state & cpu_flag::again)
-	{
-		savestate(true);
-		return {};
-	}
-
-	ensure(sys_mutex_unlock(ppu, handle->output_mutex) == CELL_OK);
-
-	return CELL_OK;
-}
-
-s32 _CellAdecCoreOpGetPcmHandleNum_atracx()
-{
-	cellAtracXdec.notice("_CellAdecCoreOpGetPcmHandleNum_atracx()");
-
-	return 3;
-}
-
-u32 _CellAdecCoreOpGetBsiInfoSize_atracx()
-{
-	cellAtracXdec.notice("_CellAdecCoreOpGetBsiInfoSize_atracx()");
-
-	return sizeof(CellAdecAtracXInfo);
-}
-
-static void init_gvar(vm::gvar<CellAdecCoreOps>& var)
-{
-	var->open.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpOpen_atracx)));
-	var->close.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpClose_atracx)));
-	var->startSeq.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpStartSeq_atracx)));
-	var->endSeq.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpEndSeq_atracx)));
-	var->decodeAu.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpDecodeAu_atracx)));
-	var->getVersion.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpGetVersion_atracx)));
-	var->realign.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpRealign_atracx)));
-	var->releasePcm.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpReleasePcm_atracx)));
-	var->getPcmHandleNum.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpGetPcmHandleNum_atracx)));
-	var->getBsiInfoSize.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpGetBsiInfoSize_atracx)));
-	var->openExt.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpOpenExt_atracx)));
-}
-
-DECLARE(ppu_module_manager::cellAtracXdec)("cellAtracXdec", []()
-{
-	REG_VNID(cellAtracXdec, 0x076b33ab, g_cell_adec_core_ops_atracx2ch).init = []()
-	{
-		g_cell_adec_core_ops_atracx2ch->getMemSize.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpGetMemSize_atracx<2>)));
-		init_gvar(g_cell_adec_core_ops_atracx2ch);
-	};
-	REG_VNID(cellAtracXdec, 0x1d210eaa, g_cell_adec_core_ops_atracx6ch).init = []()
-	{
-		g_cell_adec_core_ops_atracx6ch->getMemSize.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpGetMemSize_atracx<6>)));
-		init_gvar(g_cell_adec_core_ops_atracx6ch);
-	};
-	REG_VNID(cellAtracXdec, 0xe9a86e54, g_cell_adec_core_ops_atracx8ch).init = []()
-	{
-		g_cell_adec_core_ops_atracx8ch->getMemSize.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpGetMemSize_atracx<8>)));
-		init_gvar(g_cell_adec_core_ops_atracx8ch);
-	};
-	REG_VNID(cellAtracXdec, 0x4944af9a, g_cell_adec_core_ops_atracx).init = []()
-	{
-		g_cell_adec_core_ops_atracx->getMemSize.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellAdecCoreOpGetMemSize_atracx<8>)));
-		init_gvar(g_cell_adec_core_ops_atracx);
-	};
-
-	REG_HIDDEN_FUNC(_CellAdecCoreOpGetMemSize_atracx<2>);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpGetMemSize_atracx<6>);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpGetMemSize_atracx<8>);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpOpen_atracx);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpClose_atracx);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpStartSeq_atracx);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpEndSeq_atracx);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpDecodeAu_atracx);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpGetVersion_atracx);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpRealign_atracx);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpReleasePcm_atracx);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpGetPcmHandleNum_atracx);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpGetBsiInfoSize_atracx);
-	REG_HIDDEN_FUNC(_CellAdecCoreOpOpenExt_atracx);
-
-	REG_HIDDEN_FUNC(atracXdecEntry);
-});
diff --git a/rpcs3/Emu/Cell/Modules/cellAtracXdec.h b/rpcs3/Emu/Cell/Modules/cellAtracXdec.h
deleted file mode 100644
index a670a242c2..0000000000
--- a/rpcs3/Emu/Cell/Modules/cellAtracXdec.h
+++ /dev/null
@@ -1,313 +0,0 @@
-#pragma once
-
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-extern "C"
-{
-#include "libavcodec/avcodec.h"
-}
-
-constexpr int averror_eof = AVERROR_EOF; // Workaround for old-style-cast error
-#ifdef _MSC_VER
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
-
-#include "cellPamf.h"
-#include "cellAdec.h"
-
-enum CellAtracXdecError : u32
-{
-	CELL_ADEC_ERROR_ATX_OFFSET                     = 0x80612200,
-	CELL_ADEC_ERROR_ATX_NONE                       = 0x80612200,
-	CELL_ADEC_ERROR_ATX_OK                         = 0x80612200,
-	CELL_ADEC_ERROR_ATX_BUSY                       = 0x80612264,
-	CELL_ADEC_ERROR_ATX_EMPTY                      = 0x80612265,
-	CELL_ADEC_ERROR_ATX_ATSHDR                     = 0x80612266,
-	CELL_ADEC_ERROR_ATX_NON_FATAL                  = 0x80612281,
-	CELL_ADEC_ERROR_ATX_NOT_IMPLE                  = 0x80612282,
-	CELL_ADEC_ERROR_ATX_PACK_CE_OVERFLOW           = 0x80612283,
-	CELL_ADEC_ERROR_ATX_ILLEGAL_NPROCQUS           = 0x80612284,
-	CELL_ADEC_ERROR_ATX_FATAL                      = 0x8061228c,
-	CELL_ADEC_ERROR_ATX_ENC_OVERFLOW               = 0x8061228d,
-	CELL_ADEC_ERROR_ATX_PACK_CE_UNDERFLOW          = 0x8061228e,
-	CELL_ADEC_ERROR_ATX_SYNTAX_IDCT                = 0x8061228f,
-	CELL_ADEC_ERROR_ATX_SYNTAX_GAINADJ             = 0x80612290,
-	CELL_ADEC_ERROR_ATX_SYNTAX_IDSF                = 0x80612291,
-	CELL_ADEC_ERROR_ATX_SYNTAX_SPECTRA             = 0x80612292,
-	CELL_ADEC_ERROR_ATX_SYNTAX_IDWL	               = 0x80612293,
-	CELL_ADEC_ERROR_ATX_SYNTAX_GHWAVE              = 0x80612294,
-	CELL_ADEC_ERROR_ATX_SYNTAX_SHEADER             = 0x80612295,
-	CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_A              = 0x80612296,
-	CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_B              = 0x80612297,
-	CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_C              = 0x80612298,
-	CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_D              = 0x80612299,
-	CELL_ADEC_ERROR_ATX_SYNTAX_IDWL_E              = 0x8061229a,
-	CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_A              = 0x8061229b,
-	CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_B              = 0x8061229c,
-	CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_C              = 0x8061229d,
-	CELL_ADEC_ERROR_ATX_SYNTAX_IDSF_D              = 0x8061229e,
-	CELL_ADEC_ERROR_ATX_SYNTAX_IDCT_A              = 0x8061229f,
-	CELL_ADEC_ERROR_ATX_SYNTAX_GC_NGC              = 0x806122a0,
-	CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLEV_A          = 0x806122a1,
-	CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLOC_A          = 0x806122a2,
-	CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLEV_B          = 0x806122a3,
-	CELL_ADEC_ERROR_ATX_SYNTAX_GC_IDLOC_B          = 0x806122a4,
-	CELL_ADEC_ERROR_ATX_SYNTAX_SN_NWVS             = 0x806122a5,
-	CELL_ADEC_ERROR_ATX_FATAL_HANDLE               = 0x806122aa,
-	CELL_ADEC_ERROR_ATX_ASSERT_SAMPLING_FREQ       = 0x806122ab,
-	CELL_ADEC_ERROR_ATX_ASSERT_CH_CONFIG_INDEX     = 0x806122ac,
-	CELL_ADEC_ERROR_ATX_ASSERT_NBYTES              = 0x806122ad,
-	CELL_ADEC_ERROR_ATX_ASSERT_BLOCK_NUM           = 0x806122ae,
-	CELL_ADEC_ERROR_ATX_ASSERT_BLOCK_ID            = 0x806122af,
-	CELL_ADEC_ERROR_ATX_ASSERT_CHANNELS            = 0x806122b0,
-	CELL_ADEC_ERROR_ATX_UNINIT_BLOCK_SPECIFIED     = 0x806122b1,
-	CELL_ADEC_ERROR_ATX_POSCFG_PRESENT             = 0x806122b2,
-	CELL_ADEC_ERROR_ATX_BUFFER_OVERFLOW            = 0x806122b3,
-	CELL_ADEC_ERROR_ATX_ILL_BLK_TYPE_ID            = 0x806122b4,
-	CELL_ADEC_ERROR_ATX_UNPACK_CHANNEL_BLK_FAILED  = 0x806122b5,
-	CELL_ADEC_ERROR_ATX_ILL_BLK_ID_USED_1          = 0x806122b6,
-	CELL_ADEC_ERROR_ATX_ILL_BLK_ID_USED_2          = 0x806122b7,
-	CELL_ADEC_ERROR_ATX_ILLEGAL_ENC_SETTING        = 0x806122b8,
-	CELL_ADEC_ERROR_ATX_ILLEGAL_DEC_SETTING        = 0x806122b9,
-	CELL_ADEC_ERROR_ATX_ASSERT_NSAMPLES            = 0x806122ba,
-	CELL_ADEC_ERROR_ATX_ILL_SYNCWORD               = 0x806122bb,
-	CELL_ADEC_ERROR_ATX_ILL_SAMPLING_FREQ          = 0x806122bc,
-	CELL_ADEC_ERROR_ATX_ILL_CH_CONFIG_INDEX        = 0x806122bd,
-	CELL_ADEC_ERROR_ATX_RAW_DATA_FRAME_SIZE_OVER   = 0x806122be,
-	CELL_ADEC_ERROR_ATX_SYNTAX_ENHANCE_LENGTH_OVER = 0x806122bf,
-	CELL_ADEC_ERROR_ATX_SPU_INTERNAL_FAIL          = 0x806122c8,
-};
-
-enum : u32
-{
-	CELL_ADEC_ATRACX_WORD_SZ_16BIT = 0x02,
-	CELL_ADEC_ATRACX_WORD_SZ_24BIT = 0x03,
-	CELL_ADEC_ATRACX_WORD_SZ_32BIT = 0x04,
-	CELL_ADEC_ATRACX_WORD_SZ_FLOAT = 0x84,
-};
-
-enum : u8
-{
-	CELL_ADEC_ATRACX_ATS_HDR_NOTINC = 0,
-	CELL_ADEC_ATRACX_ATS_HDR_INC = 1,
-};
-
-enum : u8
-{
-	ATRACX_DOWNMIX_OFF = 0,
-	ATRACX_DOWNMIX_ON = 1,
-};
-
-struct CellAdecParamAtracX
-{
-	be_t<u32> sampling_freq;
-	be_t<u32> ch_config_idx;
-	be_t<u32> nch_out;
-	be_t<u32> nbytes;
-	std::array<u8, 4> extra_config_data;
-	be_t<u32> bw_pcm;
-	u8 downmix_flag;
-	u8 au_includes_ats_hdr_flg;
-};
-
-struct CellAdecAtracXInfo
-{
-	be_t<u32> samplingFreq;
-	be_t<u32> channelConfigIndex;
-	be_t<u32> nbytes;
-};
-
-CHECK_SIZE(CellAdecAtracXInfo, 12);
-
-struct AtracXdecAtsHeader
-{
-	be_t<u16> sync_word; // 0x0fd0
-	be_t<u16> params;    // 3 bits: sample rate, 3 bits: channel config, 10 bits: (nbytes / 8) - 1
-	u8 extra_config_data[4];
-};
-
-CHECK_SIZE(AtracXdecAtsHeader, 8);
-
-enum class AtracXdecCmdType : u32
-{
-	invalid,
-	start_seq,
-	decode_au,
-	end_seq,
-	close,
-};
-
-struct AtracXdecCmd
-{
-	be_t<AtracXdecCmdType> type;
-	be_t<s32> pcm_handle;
-	vm::bcptr<u8> au_start_addr;
-	be_t<u32> au_size;
-	vm::bptr<void> pcm_start_addr; // Unused
-	be_t<u32> pcm_size;            // Unused
-	CellAdecParamAtracX atracx_param;
-
-	AtracXdecCmd() = default; // cellAdecOpen()
-
-	AtracXdecCmd(AtracXdecCmdType&& type) // cellAdecEndSeq(), cellAdecClose()
-		: type(type)
-	{
-	}
-
-	AtracXdecCmd(AtracXdecCmdType&& type, const CellAdecParamAtracX& atracx_param) // cellAdecStartSeq()
-		: type(type), atracx_param(atracx_param)
-	{
-	}
-
-	AtracXdecCmd(AtracXdecCmdType&& type, const s32& pcm_handle, const CellAdecAuInfo& au_info) // cellAdecDecodeAu()
-		: type(type), pcm_handle(pcm_handle), au_start_addr(au_info.startAddr), au_size(au_info.size)
-	{
-	}
-};
-
-CHECK_SIZE(AtracXdecCmd, 0x34);
-
-struct AtracXdecDecoder
-{
-	be_t<u32> sampling_freq;
-	be_t<u32> ch_config_idx;
-	be_t<u32> nch_in;
-	be_t<u32> nch_blocks;
-	be_t<u32> nbytes;
-	be_t<u32> nch_out;
-	be_t<u32> bw_pcm;
-	be_t<u32> nbytes_128_aligned;
-	be_t<u32> status;
-	be_t<u32> pcm_output_size;
-
-	const vm::bptr<u8> work_mem;
-
-	// HLE exclusive
-	b8 config_is_set = false; // For savestates
-	const AVCodec* codec;
-	AVCodecContext* ctx;
-	AVPacket* packet;
-	AVFrame* frame;
-
-	u8 spurs_stuff[84]; // 120 bytes on LLE, pointers to CellSpurs, CellSpursTaskset, etc.
-
-	be_t<u32> spurs_task_id;  // CellSpursTaskId
-
-	AtracXdecDecoder(vm::ptr<u8> work_mem) : work_mem(work_mem) {}
-
-	void alloc_avcodec();
-	void free_avcodec();
-	void init_avcodec();
-
-	error_code set_config_info(u32 sampling_freq, u32 ch_config_idx, u32 nbytes);
-	error_code init_decode(u32 bw_pcm, u32 nch_out);
-	error_code parse_ats_header(vm::cptr<u8> au_start_addr);
-};
-
-CHECK_SIZE(AtracXdecDecoder, 0xa8);
-
-// HLE exclusive, for savestates
-enum class atracxdec_state : u8
-{
-	initial,
-	waiting_for_cmd,
-	checking_run_thread_1,
-	executing_cmd,
-	waiting_for_output,
-	checking_run_thread_2,
-	decoding
-};
-
-struct AtracXdecContext
-{
-	be_t<u64> thread_id; // sys_ppu_thread_t
-
-	be_t<u32> queue_mutex;     // sys_mutex_t
-	be_t<u32> queue_not_empty; // sys_cond_t
-	AdecCmdQueue<AtracXdecCmd> cmd_queue;
-
-	be_t<u32> output_mutex;    // sys_mutex_t
-	be_t<u32> output_consumed; // sys_cond_t
-	be_t<u32> output_locked = false;
-
-	be_t<u32> run_thread_mutex; // sys_mutex_t
-	be_t<u32> run_thread_cond;  // sys_cond_t
-	be_t<u32> run_thread = true;
-
-	const AdecCb<AdecNotifyAuDone> notify_au_done;
-	const AdecCb<AdecNotifyPcmOut> notify_pcm_out;
-	const AdecCb<AdecNotifyError> notify_error;
-	const AdecCb<AdecNotifySeqDone> notify_seq_done;
-
-	const vm::bptr<u8> work_mem;
-
-	// HLE exclusive
-	u64 cmd_counter = 0;         // For debugging
-	AtracXdecCmd cmd;            // For savestates; if savestate was created while processing a decode command, we need to save the current command
-	atracxdec_state savestate{}; // For savestates
-	b8 skip_next_frame;          // Needed to emulate behavior of LLE SPU program, it doesn't output the first frame after a sequence reset or error
-
-	u8 spurs_stuff[58]; // 120 bytes on LLE, pointers to CellSpurs, CellSpursTaskset, etc.
-
-	CellAdecParamAtracX atracx_param;
-
-	u8 reserved;
-	b8 first_decode;
-
-	AtracXdecDecoder decoder;
-
-	AtracXdecContext(vm::ptr<AdecNotifyAuDone> notifyAuDone, vm::ptr<void> notifyAuDoneArg, vm::ptr<AdecNotifyPcmOut> notifyPcmOut, vm::ptr<void> notifyPcmOutArg,
-		vm::ptr<AdecNotifyError> notifyError, vm::ptr<void> notifyErrorArg, vm::ptr<AdecNotifySeqDone> notifySeqDone, vm::ptr<void> notifySeqDoneArg, vm::bptr<u8> work_mem)
-		: notify_au_done{ notifyAuDone, notifyAuDoneArg }
-		, notify_pcm_out{ notifyPcmOut, notifyPcmOutArg }
-		, notify_error{ notifyError, notifyErrorArg }
-		, notify_seq_done{ notifySeqDone, notifySeqDoneArg }
-		, work_mem(work_mem)
-		, decoder(work_mem)
-	{
-	}
-
-	void exec(ppu_thread& ppu);
-
-	template <AtracXdecCmdType type>
-	error_code send_command(ppu_thread& ppu, auto&&... args);
-};
-
-static_assert(std::is_standard_layout_v<AtracXdecContext>);
-CHECK_SIZE_ALIGN(AtracXdecContext, 0x268, 8);
-
-constexpr u32 ATXDEC_SPURS_STRUCTS_SIZE = 0x1cf00; // CellSpurs, CellSpursTaskset, context, etc.
-constexpr u16 ATXDEC_SAMPLES_PER_FRAME = 0x800;
-constexpr u16 ATXDEC_MAX_FRAME_LENGTH = 0x2000;
-constexpr std::array<u8, 8> ATXDEC_NCH_BLOCKS_MAP = { 0, 1, 1, 2, 3, 4, 5, 5 };
-
-// Expected output channel order
-//  - for 1 to 7 channels: Front Left, Center, Front Right, Rear Left, Rear Right, Rear Center, LFE
-//  - for 8 channels:      Front Left, Front Right, Center, LFE, Rear Left, Rear Right, Side Left, Side Right
-// FFmpeg output
-//  - ver <= 5.1.2: Front Left, Front Right, Center, Rear Left, Rear Right, Rear Center, Side Left, Side Right, LFE
-//  - ver >= 5.1.3: Front Left, Front Right, Center, LFE, Rear Left, Rear Right, Rear Center, Side Left, Side Right
-constexpr u8 ATXDEC_AVCODEC_CH_MAP[7][8] =
-{
-	{ 0 },
-	{ 0, 1 },
-	{ 0, 2, 1 },
-	{ 0, 2, 1, 3 },
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 51, 101)
-	{ 0, 2, 1, 3, 4, 5 },
-	{ 0, 2, 1, 3, 4, 5, 6 },
-	{ 0, 1, 2, 4, 5, 6, 7, 3 }
-#else
-	{ 0, 2, 1, 4, 5, 3 },
-	{ 0, 2, 1, 4, 5, 6, 3 },
-	{ 0, 1, 2, 3, 4, 5, 6, 7 }
-#endif
-};
diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.cpp b/rpcs3/Emu/Cell/Modules/cellAudio.cpp
index caad402194..670d40f41c 100644
--- a/rpcs3/Emu/Cell/Modules/cellAudio.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellAudio.cpp
@@ -1,31 +1,19 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/system_config.h"
-#include "Emu/Audio/audio_utils.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/timers.hpp"
+
 #include "Emu/Cell/lv2/sys_process.h"
 #include "Emu/Cell/lv2/sys_event.h"
 #include "cellAudio.h"
-#include "util/video_provider.h"
 
+#include "emmintrin.h"
 #include <cmath>
 
 LOG_CHANNEL(cellAudio);
 
-extern atomic_t<recording_mode> g_recording_mode;
-
-extern void lv2_sleep(u64 timeout, ppu_thread* ppu = nullptr);
-
 vm::gvar<char, AUDIO_PORT_OFFSET * AUDIO_PORT_COUNT> g_audio_buffer;
 
-struct alignas(16) aligned_index_t
-{
-	be_t<u64> index;
-	u8 pad[8];
-};
-
-vm::gvar<aligned_index_t, AUDIO_PORT_COUNT> g_audio_indices;
+vm::gvar<u64, AUDIO_PORT_COUNT> g_audio_indices;
 
 template <>
 void fmt_class_string<CellAudioError>::format(std::string& out, u64 arg)
@@ -59,51 +47,24 @@ void fmt_class_string<CellAudioError>::format(std::string& out, u64 arg)
 cell_audio_config::cell_audio_config()
 {
 	raw = audio::get_raw_config();
+	reset();
 }
 
-void cell_audio_config::reset(bool backend_changed)
+void cell_audio_config::reset()
 {
-	if (!backend || backend_changed)
-	{
-		backend.reset();
-		backend = Emu.GetCallbacks().get_audio();
-	}
+	backend.reset();
+	backend = Emu.GetCallbacks().get_audio();
 
-	cellAudio.notice("cellAudio initializing. Backend: %s", backend->GetName());
-
-	const AudioFreq freq = AudioFreq::FREQ_48K;
-	const AudioSampleSize sample_size = raw.convert_to_s16 ? AudioSampleSize::S16 : AudioSampleSize::FLOAT;
-
-	const auto& [req_ch_cnt, downmix] = AudioBackend::get_channel_count_and_downmixer(0); // CELL_AUDIO_OUT_PRIMARY
-	f64 cb_frame_len = 0.0;
-	u32 ch_cnt = 2;
-	audio_channel_layout ch_layout = audio_channel_layout::stereo;
-
-	if (backend->Open(raw.audio_device, freq, sample_size, req_ch_cnt, raw.channel_layout))
-	{
-		cb_frame_len = backend->GetCallbackFrameLen();
-		ch_cnt = backend->get_channels();
-		ch_layout = backend->get_channel_layout();
-		cellAudio.notice("Opened audio backend (sampling_rate=%d, sample_size=%d, channels=%d, layout=%s)", backend->get_sampling_rate(), backend->get_sample_size(), backend->get_channels(), backend->get_channel_layout());
-	}
-	else
-	{
-		cellAudio.error("Failed to open audio backend. Make sure that no other application is running that might block audio access (e.g. Netflix).");
-	}
-
-	audio_downmix = downmix;
-	backend_ch_cnt = ch_cnt;
-	backend_channel_layout = ch_layout;
-	audio_channels = static_cast<u32>(req_ch_cnt);
-	audio_sampling_rate = static_cast<u32>(freq);
-	audio_block_period = AUDIO_BUFFER_SAMPLES * 1'000'000 / audio_sampling_rate;
-	audio_sample_size = static_cast<u32>(sample_size);
-	audio_min_buffer_duration = cb_frame_len + u32{AUDIO_BUFFER_SAMPLES} * 2.0 / audio_sampling_rate; // Add 2 blocks to allow jitter compensation
+	audio_channels = backend->get_channels();
+	audio_sampling_rate = backend->get_sampling_rate();
+	audio_block_period = AUDIO_BUFFER_SAMPLES * 1000000 / audio_sampling_rate;
 
 	audio_buffer_length = AUDIO_BUFFER_SAMPLES * audio_channels;
+	audio_buffer_size = audio_buffer_length * backend->get_sample_size();
 
-	desired_buffer_duration = std::max(static_cast<s64>(audio_min_buffer_duration * 1000), raw.desired_buffer_duration) * 1000llu;
-	buffering_enabled = raw.buffering_enabled && raw.renderer != audio_renderer::null;
+	desired_buffer_duration = raw.desired_buffer_duration * 1000llu;
+
+	buffering_enabled = raw.buffering_enabled && backend->has_capability(AudioBackend::PLAY_PAUSE_FLUSH | AudioBackend::IS_PLAYING);
 
 	minimum_block_period = audio_block_period / 2;
 	maximum_block_period = (6 * audio_block_period) / 5;
@@ -116,25 +77,27 @@ void cell_audio_config::reset(bool backend_changed)
 
 	const bool raw_time_stretching_enabled = buffering_enabled && raw.enable_time_stretching && (raw.time_stretching_threshold > 0);
 
-	time_stretching_enabled = raw_time_stretching_enabled;
+	time_stretching_enabled = raw_time_stretching_enabled && backend->has_capability(AudioBackend::SET_FREQUENCY_RATIO);
+
 	time_stretching_threshold = raw.time_stretching_threshold / 100.0f;
 
 	// Warn if audio backend does not support all requested features
 	if (raw.buffering_enabled && !buffering_enabled)
 	{
 		cellAudio.error("Audio backend %s does not support buffering, this option will be ignored.", backend->GetName());
-
-		if (raw.enable_time_stretching)
-		{
-			cellAudio.error("Audio backend %s does not support time stretching, this option will be ignored.", backend->GetName());
-		}
+	}
+	if (raw_time_stretching_enabled && !time_stretching_enabled)
+	{
+		cellAudio.error("Audio backend %s does not support time stretching, this option will be ignored.", backend->GetName());
 	}
 }
 
+
 audio_ringbuffer::audio_ringbuffer(cell_audio_config& _cfg)
 	: backend(_cfg.backend)
 	, cfg(_cfg)
 	, buf_sz(AUDIO_BUFFER_SAMPLES * _cfg.audio_channels)
+	, emu_paused(Emu.IsPaused())
 {
 	// Initialize buffers
 	if (cfg.num_allocated_buffers > MAX_AUDIO_BUFFERS)
@@ -148,35 +111,34 @@ audio_ringbuffer::audio_ringbuffer(cell_audio_config& _cfg)
 	}
 
 	// Init audio dumper if enabled
-	if (cfg.raw.dump_to_file)
+	if (g_cfg.audio.dump_to_file)
 	{
-		m_dump.Open(static_cast<AudioChannelCnt>(cfg.audio_channels), static_cast<AudioFreq>(cfg.audio_sampling_rate), AudioSampleSize::FLOAT);
+		m_dump.reset(new AudioDumper(cfg.audio_channels));
 	}
 
-	// Configure resampler
-	resampler.set_params(static_cast<AudioChannelCnt>(cfg.audio_channels), static_cast<AudioFreq>(cfg.audio_sampling_rate));
-	resampler.set_tempo(RESAMPLER_MAX_FREQ_VAL);
-
-	const f64 buffer_dur_mult = [&]()
+	// Initialize backend
 	{
-		if (cfg.buffering_enabled)
-		{
-			return cfg.desired_buffer_duration / 1'000'000.0 + 0.02; // Add 20ms to buffer to keep buffering algorithm happy
-		}
+		std::string str;
+		backend->dump_capabilities(str);
+		cellAudio.notice("cellAudio initializing. Backend: %s, Capabilities: %s", backend->GetName(), str.c_str());
+	}
 
-		return cfg.audio_min_buffer_duration;
-	}();
+	backend->Open(cfg.num_allocated_buffers);
+	backend_open = true;
 
-	cb_ringbuf.set_buf_size(static_cast<u32>(cfg.backend_ch_cnt * cfg.audio_sampling_rate * cfg.audio_sample_size * buffer_dur_mult));
-	backend->SetWriteCallback(std::bind(&audio_ringbuffer::backend_write_callback, this, std::placeholders::_1, std::placeholders::_2));
-	backend->SetStateCallback(std::bind(&audio_ringbuffer::backend_state_callback, this, std::placeholders::_1));
+	ensure(!get_backend_playing());
 }
 
 audio_ringbuffer::~audio_ringbuffer()
 {
-	if (get_backend_playing())
+	if (!backend_open)
 	{
-		flush();
+		return;
+	}
+
+	if (get_backend_playing() && has_capability(AudioBackend::PLAY_PAUSE_FLUSH))
+	{
+		backend->Pause();
 	}
 
 	backend->Close();
@@ -184,182 +146,197 @@ audio_ringbuffer::~audio_ringbuffer()
 
 f32 audio_ringbuffer::set_frequency_ratio(f32 new_ratio)
 {
-	frequency_ratio = static_cast<f32>(resampler.set_tempo(new_ratio));
-
-	return frequency_ratio;
-}
-
-float* audio_ringbuffer::get_buffer(u32 num) const
-{
-	AUDIT(num < cfg.num_allocated_buffers);
-	AUDIT(buffer[num]);
-	return buffer[num].get();
-}
-
-u32 audio_ringbuffer::backend_write_callback(u32 size, void *buf)
-{
-	if (!backend_active.observe()) backend_active = true;
-
-	return static_cast<u32>(cb_ringbuf.pop(buf, size, true));
-}
-
-void audio_ringbuffer::backend_state_callback(AudioStateEvent event)
-{
-	if (event == AudioStateEvent::DEFAULT_DEVICE_MAYBE_CHANGED)
+	if (!has_capability(AudioBackend::SET_FREQUENCY_RATIO))
 	{
-		backend_device_changed = true;
+		ensure(new_ratio == 1.0f);
+		frequency_ratio = 1.0f;
 	}
+	else
+	{
+		frequency_ratio = backend->SetFrequencyRatio(new_ratio);
+		//cellAudio.trace("set_frequency_ratio(%1.2f) -> %1.2f", new_ratio, frequency_ratio);
+	}
+	return frequency_ratio;
 }
 
 u64 audio_ringbuffer::get_timestamp()
 {
-	return get_system_time();
+	return get_system_time() - Emu.GetPauseTime();
 }
 
-float* audio_ringbuffer::get_current_buffer() const
-{
-	return get_buffer(cur_pos);
-}
-
-u64 audio_ringbuffer::get_enqueued_samples() const
-{
-	AUDIT(cfg.buffering_enabled);
-	const u64 ringbuf_samples = cb_ringbuf.get_used_size() / (cfg.audio_sample_size * cfg.backend_ch_cnt);
-
-	if (cfg.time_stretching_enabled)
-	{
-		return ringbuf_samples + resampler.samples_available();
-	}
-
-	return ringbuf_samples;
-}
-
-u64 audio_ringbuffer::get_enqueued_playtime() const
-{
-	AUDIT(cfg.buffering_enabled);
-
-	return get_enqueued_samples() * 1'000'000 / cfg.audio_sampling_rate;
-}
-
-void audio_ringbuffer::enqueue(bool enqueue_silence, bool force)
+void audio_ringbuffer::enqueue(const float* in_buffer)
 {
 	AUDIT(cur_pos < cfg.num_allocated_buffers);
 
 	// Prepare buffer
-	static float silence_buffer[u32{AUDIO_MAX_CHANNELS_COUNT} * u32{AUDIO_BUFFER_SAMPLES}]{};
-	float* buf = silence_buffer;
+	const void* buf = in_buffer;
 
-	if (!enqueue_silence)
+	if (buf == nullptr)
 	{
 		buf = buffer[cur_pos].get();
 		cur_pos = (cur_pos + 1) % cfg.num_allocated_buffers;
 	}
 
-	if (!backend_active.observe() && !force)
+	// Dump audio if enabled
+	if (m_dump)
 	{
-		// backend is not ready yet
-		return;
+		m_dump->WriteData(buf, cfg.audio_buffer_size);
 	}
 
 	// Enqueue audio
-	if (cfg.time_stretching_enabled)
+	const bool success = backend->AddData(buf, AUDIO_BUFFER_SAMPLES * cfg.audio_channels);
+	if (!success)
 	{
-		resampler.put_samples(buf, AUDIO_BUFFER_SAMPLES);
+		cellAudio.warning("Could not enqueue buffer onto audio backend. Attempting to recover...");
+		flush();
+		return;
 	}
-	else
+
+	if (has_capability(AudioBackend::PLAY_PAUSE_FLUSH))
 	{
-		// Since time stretching step is skipped, we can commit to buffer directly
-		commit_data(buf, AUDIO_BUFFER_SAMPLES);
+		enqueued_samples += AUDIO_BUFFER_SAMPLES;
+
+		// Start playing audio
+		play();
 	}
 }
 
-void audio_ringbuffer::enqueue_silence(u32 buf_count, bool force)
+void audio_ringbuffer::enqueue_silence(u32 buf_count)
 {
+	AUDIT(has_capability(AudioBackend::PLAY_PAUSE_FLUSH));
+
 	for (u32 i = 0; i < buf_count; i++)
 	{
-		enqueue(true, force);
+		enqueue(silence_buffer);
 	}
 }
 
-void audio_ringbuffer::process_resampled_data()
-{
-	if (!cfg.time_stretching_enabled) return;
-
-	const auto& [buffer, samples] = resampler.get_samples(static_cast<u32>(cb_ringbuf.get_free_size() / (cfg.audio_sample_size * cfg.backend_ch_cnt)));
-	commit_data(buffer, samples);
-}
-
-void audio_ringbuffer::commit_data(f32* buf, u32 sample_cnt)
-{
-	const u32 sample_cnt_in = sample_cnt * cfg.audio_channels;
-	const u32 sample_cnt_out = sample_cnt * cfg.backend_ch_cnt;
-
-	// Dump audio if enabled
-	m_dump.WriteData(buf, sample_cnt_in * static_cast<u32>(AudioSampleSize::FLOAT));
-
-	// Record audio if enabled
-	if (g_recording_mode != recording_mode::stopped)
-	{
-		utils::video_provider& provider = g_fxo->get<utils::video_provider>();
-		provider.present_samples(reinterpret_cast<const u8*>(buf), sample_cnt, cfg.audio_channels);
-	}
-
-	// Downmix if necessary
-	AudioBackend::downmix(sample_cnt_in, cfg.audio_channels, cfg.backend_channel_layout, buf, buf);
-
-	if (cfg.backend->get_convert_to_s16())
-	{
-		AudioBackend::convert_to_s16(sample_cnt_out, buf, buf);
-	}
-
-	cb_ringbuf.push(buf, sample_cnt_out * cfg.audio_sample_size);
-}
-
 void audio_ringbuffer::play()
 {
-	if (playing)
+	if (!has_capability(AudioBackend::PLAY_PAUSE_FLUSH))
+	{
+		playing = true;
+		return;
+	}
+
+	if (playing && has_capability(AudioBackend::IS_PLAYING))
 	{
 		return;
 	}
 
+	if (frequency_ratio != 1.0f)
+	{
+		set_frequency_ratio(1.0f);
+	}
+
 	playing = true;
+
+	ensure(enqueued_samples > 0);
+
 	play_timestamp = get_timestamp();
 	backend->Play();
 }
 
 void audio_ringbuffer::flush()
 {
+	if (!has_capability(AudioBackend::PLAY_PAUSE_FLUSH))
+	{
+		playing = false;
+		return;
+	}
+
+	//cellAudio.trace("Flushing an estimated %llu enqueued samples", enqueued_samples);
+
 	backend->Pause();
-	cb_ringbuf.writer_flush();
-	resampler.flush();
-	backend_active = false;
 	playing = false;
 
-	if (frequency_ratio != RESAMPLER_MAX_FREQ_VAL)
+	backend->Flush();
+
+	if (frequency_ratio != 1.0f)
 	{
-		frequency_ratio = set_frequency_ratio(RESAMPLER_MAX_FREQ_VAL);
+		set_frequency_ratio(1.0f);
 	}
+
+	enqueued_samples = 0;
 }
 
-u64 audio_ringbuffer::update(bool emu_is_paused)
+u64 audio_ringbuffer::update()
 {
 	// Check emulator pause state
-	if (emu_is_paused)
+	if (Emu.IsPaused())
 	{
 		// Emulator paused
-		if (playing)
+		if (playing && has_capability(AudioBackend::PLAY_PAUSE_FLUSH))
 		{
-			flush();
+			backend->Pause();
 		}
+		emu_paused = true;
 	}
-	else
+	else if (emu_paused)
 	{
 		// Emulator unpaused
-		play();
+		if (enqueued_samples > 0 && has_capability(AudioBackend::PLAY_PAUSE_FLUSH))
+		{
+			play();
+		}
+		emu_paused = false;
 	}
 
-	// Prepare timestamp
+	// Prepare timestamp and playing status
 	const u64 timestamp = get_timestamp();
+	const bool new_playing = !emu_paused && get_backend_playing();
+
+	// Calculate how many audio samples have played since last time
+	if (cfg.buffering_enabled && (playing || new_playing))
+	{
+		if (has_capability(AudioBackend::GET_NUM_ENQUEUED_SAMPLES))
+		{
+			// Backend supports querying for the remaining playtime, so just ask it
+			enqueued_samples = backend->GetNumEnqueuedSamples();
+		}
+		else
+		{
+			const u64 play_delta = timestamp - (play_timestamp > update_timestamp ? play_timestamp : update_timestamp);
+
+			const u64 delta_samples_tmp = play_delta * static_cast<u64>(cfg.audio_sampling_rate * frequency_ratio) + last_remainder;
+			last_remainder = delta_samples_tmp % 1'000'000;
+			const u64 delta_samples = delta_samples_tmp / 1'000'000;
+
+			//cellAudio.error("play_delta=%llu delta_samples=%llu", play_delta, delta_samples);
+			if (delta_samples > 0)
+			{
+				if (enqueued_samples < delta_samples)
+				{
+					enqueued_samples = 0;
+				}
+				else
+				{
+					enqueued_samples -= delta_samples;
+				}
+
+				if (enqueued_samples == 0)
+				{
+					cellAudio.trace("Audio buffer about to underrun!");
+				}
+			}
+		}
+	}
+
+	// Update playing state
+	if (playing != new_playing)
+	{
+		if (!new_playing)
+		{
+			cellAudio.warning("Audio backend stopped unexpectedly, likely due to a buffer underrun");
+
+			flush();
+			playing = false;
+		}
+		else
+		{
+			playing = true;
+		}
+	}
 
 	// Store and return timestamp
 	update_timestamp = timestamp;
@@ -374,8 +351,8 @@ void audio_port::tag(s32 offset)
 	// We use -0.0f in case games check if the buffer is empty. -0.0f == 0.0f evaluates to true, but std::signbit can be used to distinguish them
 	const f32 tag = -0.0f;
 
-	const u32 tag_first_pos = num_channels == 2 ? PORT_BUFFER_TAG_FIRST_2CH : PORT_BUFFER_TAG_FIRST_8CH;
-	const u32 tag_delta = num_channels == 2 ? PORT_BUFFER_TAG_DELTA_2CH : PORT_BUFFER_TAG_DELTA_8CH;
+	const u32 tag_first_pos = num_channels == 2 ? PORT_BUFFER_TAG_FIRST_2CH : num_channels == 6 ? PORT_BUFFER_TAG_FIRST_6CH : PORT_BUFFER_TAG_FIRST_8CH;
+	const u32 tag_delta = num_channels == 2 ? PORT_BUFFER_TAG_DELTA_2CH : num_channels == 6 ? PORT_BUFFER_TAG_DELTA_6CH : PORT_BUFFER_TAG_DELTA_8CH;
 
 	for (u32 tag_pos = tag_first_pos, tag_nr = 0; tag_nr < PORT_BUFFER_TAG_COUNT; tag_pos += tag_delta, tag_nr++)
 	{
@@ -386,52 +363,6 @@ void audio_port::tag(s32 offset)
 	prev_touched_tag_nr = -1;
 }
 
-cell_audio_thread::cell_audio_thread(utils::serial& ar)
-	: cell_audio_thread()
-{
-	ar(init);
-
-	if (!init)
-	{
-		return;
-	}
-
-	ar(key_count, event_period);
-
-	keys.resize(ar);
-
-	for (key_info& k : keys)
-	{
-		ar(k.start_period, k.flags, k.source);
-		k.port = lv2_event_queue::load_ptr(ar, k.port, "audio");
-	}
-
-	ar(ports);
-}
-
-void cell_audio_thread::save(utils::serial& ar)
-{
-	ar(init);
-
-	if (!init)
-	{
-		return;
-	}
-
-	USING_SERIALIZATION_VERSION(cellAudio);
-
-	ar(key_count, event_period);
-	ar(keys.size());
-
-	for (const key_info& k : keys)
-	{
-		ar(k.start_period, k.flags, k.source);
-		lv2_event_queue::save_ptr(ar, k.port.get());
-	}
-
-	ar(ports);
-}
-
 std::tuple<u32, u32, u32, u32> cell_audio_thread::count_port_buffer_tags()
 {
 	AUDIT(cfg.buffering_enabled);
@@ -441,7 +372,7 @@ std::tuple<u32, u32, u32, u32> cell_audio_thread::count_port_buffer_tags()
 	u32 untouched = 0;
 	u32 incomplete = 0;
 
-	for (audio_port& port : ports)
+	for (auto& port : ports)
 	{
 		if (port.state != audio_port_state::started) continue;
 		active++;
@@ -449,8 +380,8 @@ std::tuple<u32, u32, u32, u32> cell_audio_thread::count_port_buffer_tags()
 		auto port_buf = port.get_vm_ptr();
 
 		// Find the last tag that has been touched
-		const u32 tag_first_pos = port.num_channels == 2 ? PORT_BUFFER_TAG_FIRST_2CH : PORT_BUFFER_TAG_FIRST_8CH;
-		const u32 tag_delta = port.num_channels == 2 ? PORT_BUFFER_TAG_DELTA_2CH : PORT_BUFFER_TAG_DELTA_8CH;
+		const u32 tag_first_pos = port.num_channels == 2 ? PORT_BUFFER_TAG_FIRST_2CH : port.num_channels == 6 ? PORT_BUFFER_TAG_FIRST_6CH : PORT_BUFFER_TAG_FIRST_8CH;
+		const u32 tag_delta = port.num_channels == 2 ? PORT_BUFFER_TAG_DELTA_2CH : port.num_channels == 6 ? PORT_BUFFER_TAG_DELTA_6CH : PORT_BUFFER_TAG_DELTA_8CH;
 
 		u32 last_touched_tag_nr = port.prev_touched_tag_nr;
 		bool retouched = false;
@@ -512,7 +443,7 @@ std::tuple<u32, u32, u32, u32> cell_audio_thread::count_port_buffer_tags()
 void cell_audio_thread::reset_ports(s32 offset)
 {
 	// Memset buffer to 0 and tag
-	for (audio_port& port : ports)
+	for (auto& port : ports)
 	{
 		if (port.state != audio_port_state::started) continue;
 
@@ -525,16 +456,17 @@ void cell_audio_thread::reset_ports(s32 offset)
 	}
 }
 
-void cell_audio_thread::advance(u64 timestamp)
+void cell_audio_thread::advance(u64 timestamp, bool reset)
 {
-	ringbuffer->process_resampled_data();
-
 	std::unique_lock lock(mutex);
 
 	// update ports
-	reset_ports(0);
+	if (reset)
+	{
+		reset_ports(0);
+	}
 
-	for (audio_port& port : ports)
+	for (auto& port : ports)
 	{
 		if (port.state != audio_port_state::started) continue;
 
@@ -543,13 +475,15 @@ void cell_audio_thread::advance(u64 timestamp)
 		port.timestamp = timestamp;
 
 		port.cur_pos = port.position(1);
-		*port.index = port.cur_pos;
+		g_audio_indices[port.number] = port.cur_pos;
 	}
 
 	if (cfg.buffering_enabled)
 	{
 		// Calculate rolling average of enqueued playtime
-		m_average_playtime = cfg.period_average_alpha * ringbuffer->get_enqueued_playtime() + (1.0f - cfg.period_average_alpha) * m_average_playtime;
+		const u64 enqueued_playtime = ringbuffer->get_enqueued_playtime(/* raw */ true);
+		m_average_playtime = cfg.period_average_alpha * enqueued_playtime + (1.0f - cfg.period_average_alpha) * m_average_playtime;
+		//cellAudio.error("m_average_playtime=%4.2f, enqueued_playtime=%u", m_average_playtime, enqueued_playtime);
 	}
 
 	m_counter++;
@@ -557,12 +491,13 @@ void cell_audio_thread::advance(u64 timestamp)
 	m_dynamic_period = 0;
 
 	// send aftermix event (normal audio event)
-	std::array<shared_ptr<lv2_event_queue>, MAX_AUDIO_EVENT_QUEUES> queues;
+	std::array<std::shared_ptr<lv2_event_queue>, MAX_AUDIO_EVENT_QUEUES> queues;
+	std::array<u64, MAX_AUDIO_EVENT_QUEUES> event_sources;
 	u32 queue_count = 0;
 
 	event_period++;
 
-	for (const key_info& key_inf : keys)
+	for (const auto& key_inf : keys)
 	{
 		if (key_inf.flags & CELL_AUDIO_EVENTFLAG_NOMIX)
 		{
@@ -592,7 +527,6 @@ void cell_audio_thread::advance(u64 timestamp)
 			}
 
 			event_sources[queue_count] = key_inf.source;
-			event_data3[queue_count] = (key_inf.flags & CELL_AUDIO_EVENTFLAG_BEFOREMIX) ? key_inf.source : 0;
 			queue_count++;
 		}
 	}
@@ -601,8 +535,7 @@ void cell_audio_thread::advance(u64 timestamp)
 
 	for (u32 i = 0; i < queue_count; i++)
 	{
-		lv2_obj::notify_all_t notify;
-		queues[i]->send(event_sources[i], CELL_AUDIO_EVENT_MIX, 0, event_data3[i]);
+		queues[i]->send(event_sources[i], 0, 0, 0);
 	}
 }
 
@@ -612,51 +545,44 @@ namespace audio
 	{
 		return
 		{
-			.audio_device = g_cfg.audio.audio_device,
 			.buffering_enabled = static_cast<bool>(g_cfg.audio.enable_buffering),
 			.desired_buffer_duration = g_cfg.audio.desired_buffer_duration,
 			.enable_time_stretching = static_cast<bool>(g_cfg.audio.enable_time_stretching),
 			.time_stretching_threshold = g_cfg.audio.time_stretching_threshold,
-			.convert_to_s16 = static_cast<bool>(g_cfg.audio.convert_to_s16),
-			.dump_to_file = static_cast<bool>(g_cfg.audio.dump_to_file),
-			.channel_layout = g_cfg.audio.channel_layout,
-			.renderer = g_cfg.audio.renderer,
-			.provider = g_cfg.audio.provider
+			.convert_to_u16 = static_cast<bool>(g_cfg.audio.convert_to_u16),
+			.start_threshold = static_cast<u32>(g_cfg.audio.start_threshold),
+			.sampling_period_multiplier = static_cast<u32>(g_cfg.audio.sampling_period_multiplier),
+			.downmix = g_cfg.audio.audio_channel_downmix,
+			.renderer = g_cfg.audio.renderer
 		};
 	}
 
-	void configure_audio(bool force_reset)
+	void configure_audio()
 	{
-		if (g_cfg.audio.provider != audio_provider::cell_audio)
-		{
-			return;
-		}
-
 		if (auto& g_audio = g_fxo->get<cell_audio>(); g_fxo->is_init<cell_audio>())
 		{
 			// Only reboot the audio renderer if a relevant setting changed
-			const cell_audio_config::raw_config new_raw = get_raw_config();
+			const auto new_raw = get_raw_config();
 
-			if (const cell_audio_config::raw_config raw = g_audio.cfg.raw;
-				force_reset ||
-				raw.audio_device != new_raw.audio_device ||
+			if (const auto raw = g_audio.cfg.raw;
 				raw.desired_buffer_duration != new_raw.desired_buffer_duration ||
 				raw.buffering_enabled != new_raw.buffering_enabled ||
 				raw.time_stretching_threshold != new_raw.time_stretching_threshold ||
 				raw.enable_time_stretching != new_raw.enable_time_stretching ||
-				raw.convert_to_s16 != new_raw.convert_to_s16 ||
-				raw.renderer != new_raw.renderer ||
-				raw.dump_to_file != new_raw.dump_to_file)
+				raw.convert_to_u16 != new_raw.convert_to_u16 ||
+				raw.start_threshold != new_raw.start_threshold ||
+				raw.sampling_period_multiplier != new_raw.sampling_period_multiplier ||
+				raw.downmix != new_raw.downmix ||
+				raw.renderer != new_raw.renderer)
 			{
-				std::lock_guard lock{g_audio.emu_cfg_upd_m};
-				g_audio.cfg.new_raw = new_raw;
-				g_audio.m_update_configuration = raw.renderer != new_raw.renderer ? audio_backend_update::ALL : audio_backend_update::PARAM;
+				g_audio.cfg.raw = new_raw;
+				g_audio.m_update_configuration = true;
 			}
 		}
 	}
 }
 
-void cell_audio_thread::update_config(bool backend_changed)
+void cell_audio_thread::update_config()
 {
 	std::lock_guard lock(mutex);
 
@@ -664,149 +590,50 @@ void cell_audio_thread::update_config(bool backend_changed)
 	ringbuffer.reset();
 
 	// Reload config
-	cfg.reset(backend_changed);
-
-	// Allocate ringbuffer
-	ringbuffer.reset(new audio_ringbuffer(cfg));
-
-	// Reset thread state
-	reset_counters();
-}
-
-void cell_audio_thread::reset_counters()
-{
-	m_counter = 0;
-	m_start_time = ringbuffer->get_timestamp();
-	m_last_period_end = m_start_time;
-	m_dynamic_period = 0;
-	m_audio_should_restart = true;
-}
-
-cell_audio_thread::cell_audio_thread()
-{
-}
-
-void cell_audio_thread::operator()()
-{
-	// Initialize loop variables (regardless of provider in order to initialize timestamps)
-	reset_counters();
-
-	if (cfg.raw.provider != audio_provider::cell_audio)
-	{
-		return;
-	}
-
-	// Init audio config
 	cfg.reset();
 
 	// Allocate ringbuffer
 	ringbuffer.reset(new audio_ringbuffer(cfg));
+}
 
+void cell_audio_thread::operator()()
+{
 	thread_ctrl::scoped_priority high_prio(+1);
 
-	while (Emu.IsPausedOrReady())
-	{
-		thread_ctrl::wait_for(5000);
-	}
+	// Allocate ringbuffer
+	ringbuffer.reset(new audio_ringbuffer(cfg));
+
+	// Initialize loop variables
+	m_counter = 0;
+	m_start_time = ringbuffer->get_timestamp();
+	m_last_period_end = m_start_time;
+	m_dynamic_period = 0;
 
 	u32 untouched_expected = 0;
-
-	u32 loop_count = 0;
+	//u32 in_progress_expected = 0;
 
 	// Main cellAudio loop
 	while (thread_ctrl::state() != thread_state::aborting)
 	{
-		loop_count++;
-
-		const audio_backend_update update_req = m_update_configuration.observe();
-		if (update_req != audio_backend_update::NONE)
+		if (m_update_configuration)
 		{
 			cellAudio.warning("Updating cell_audio_thread configuration");
-			{
-				std::lock_guard lock{emu_cfg_upd_m};
-				cfg.raw = cfg.new_raw;
-				m_update_configuration = audio_backend_update::NONE;
-			}
-			update_config(update_req == audio_backend_update::ALL);
+			update_config();
+			m_update_configuration = false;
 		}
 
-		const bool emu_paused = Emu.IsPaused();
-		const u64 timestamp = ringbuffer->update(emu_paused || m_backend_failed);
+		const u64 timestamp = ringbuffer->update();
 
-		if (emu_paused)
+		if (Emu.IsPaused())
 		{
-			m_audio_should_restart = true;
-			ringbuffer->flush();
 			thread_ctrl::wait_for(10000);
 			continue;
 		}
 
-		// TODO: (no idea how much of this is already implemented)
-		// The hardware heartbeat interval of libaudio is ~5.3ms.
-		// As soon as one interval starts, libaudio waits for ~2.6ms (half of the interval) before it mixes the audio.
-		// There are 2 different types of games:
-		// - Normal games:
-		//     Once the audio was mixed, we send the CELL_AUDIO_EVENT_MIX event and the game can process audio.
-		// - Latency sensitive games:
-		//     If CELL_AUDIO_EVENTFLAG_BEFOREMIX is specified, we immediately send the CELL_AUDIO_EVENT_MIX event and the game can process audio.
-		//     We then have to wait for a maximum of ~2.6ms for cellAudioSendAck and then mix immediately.
+		// TODO: send beforemix event (in ~2,6 ms before mixing)
 
 		const u64 time_since_last_period = timestamp - m_last_period_end;
 
-		// Handle audio restart
-		if (m_audio_should_restart)
-		{
-			// align to 5.(3)ms on global clock - some games seem to prefer this
-			const s64 audio_period_alignment_delta = (timestamp - m_start_time) % cfg.audio_block_period;
-			if (audio_period_alignment_delta > cfg.period_comparison_margin)
-			{
-				thread_ctrl::wait_for(audio_period_alignment_delta - cfg.period_comparison_margin);
-			}
-
-			if (cfg.buffering_enabled)
-			{
-				// Restart algorithm
-				cellAudio.trace("restarting audio");
-				ringbuffer->enqueue_silence(cfg.desired_full_buffers, true);
-				finish_port_volume_stepping();
-				m_average_playtime = static_cast<f32>(ringbuffer->get_enqueued_playtime());
-				untouched_expected = 0;
-			}
-
-			m_audio_should_restart = false;
-			continue;
-		}
-
-		bool operational = ringbuffer->get_operational_status();
-
-		if (!operational && loop_count % 128 == 0)
-		{
-			update_config(true);
-			operational = ringbuffer->get_operational_status();
-		}
-
-		if (ringbuffer->device_changed())
-		{
-			cellAudio.warning("Default device changed, attempting to switch...");
-			update_config(false);
-
-			if (operational != ringbuffer->get_operational_status())
-			{
-				continue;
-			}
-		}
-
-		if (!m_backend_failed && !operational)
-		{
-			cellAudio.error("Backend stopped unexpectedly (likely device change). Attempting to recover...");
-			m_backend_failed = true;
-		}
-		else if (m_backend_failed && operational)
-		{
-			cellAudio.success("Backend recovered");
-			m_backend_failed = false;
-		}
-
 		if (!cfg.buffering_enabled)
 		{
 			const u64 period_end = (m_counter * cfg.audio_block_period) + m_start_time;
@@ -814,80 +641,105 @@ void cell_audio_thread::operator()()
 
 			if (time_left > cfg.period_comparison_margin)
 			{
-				thread_ctrl::wait_for(time_left - cfg.period_comparison_margin);
+				thread_ctrl::wait_for(get_thread_wait_delay(time_left));
 				continue;
 			}
 		}
 		else
 		{
 			const u64 enqueued_samples = ringbuffer->get_enqueued_samples();
-			const f32 frequency_ratio = ringbuffer->get_frequency_ratio();
-			const u64 enqueued_playtime = ringbuffer->get_enqueued_playtime();
+			f32 frequency_ratio = ringbuffer->get_frequency_ratio();
+			u64 enqueued_playtime = ringbuffer->get_enqueued_playtime();
 			const u64 enqueued_buffers = enqueued_samples / AUDIO_BUFFER_SAMPLES;
 
+			const bool playing = ringbuffer->is_playing();
+
 			const auto tag_info = count_port_buffer_tags();
 			const u32 active_ports = std::get<0>(tag_info);
 			const u32 in_progress  = std::get<1>(tag_info);
 			const u32 untouched    = std::get<2>(tag_info);
 			const u32 incomplete   = std::get<3>(tag_info);
 
-			// Ratio between the rolling average of the audio period, and the desired audio period
-			const f32 average_playtime_ratio = m_average_playtime / cfg.audio_buffer_length;
-
-			// Use the above average ratio to decide how much buffer we should be aiming for
-			f32 desired_duration_adjusted = cfg.desired_buffer_duration + (cfg.audio_block_period / 2.0f);
-			if (average_playtime_ratio < 1.0f)
+			// Wait for a dynamic period - try to maintain an average as close as possible to 5.(3)ms
+			if (!playing)
 			{
-				desired_duration_adjusted /= std::max(average_playtime_ratio, 0.25f);
+				// When the buffer is empty, always use the correct block period
+				m_dynamic_period = cfg.audio_block_period;
 			}
-
-			if (cfg.time_stretching_enabled)
+			else
 			{
+				// Ratio between the rolling average of the audio period, and the desired audio period
+				const f32 average_playtime_ratio = m_average_playtime / cfg.audio_buffer_length;
+
+				// Use the above average ratio to decide how much buffer we should be aiming for
+				f32 desired_duration_adjusted = cfg.desired_buffer_duration + (cfg.audio_block_period / 2.0f);
+				if (average_playtime_ratio < 1.0f)
+				{
+					desired_duration_adjusted /= std::max(average_playtime_ratio, 0.25f);
+				}
+
+				if (cfg.time_stretching_enabled)
+				{
+					// Calculate what the playtime is without a frequency ratio
+					const u64 raw_enqueued_playtime = ringbuffer->get_enqueued_playtime(/* raw= */ true);
+
+					//  1.0 means exactly as desired
+					// <1.0 means not as full as desired
+					// >1.0 means more full than desired
+					const f32 desired_duration_rate = raw_enqueued_playtime / desired_duration_adjusted;
+
+					// update frequency ratio if necessary
+					f32 new_ratio = frequency_ratio;
+					if (desired_duration_rate < cfg.time_stretching_threshold)
+					{
+						const f32 normalized_desired_duration_rate = desired_duration_rate / cfg.time_stretching_threshold;
+						const f32 request_ratio = normalized_desired_duration_rate * cfg.time_stretching_scale;
+						AUDIT(request_ratio <= 1.0f);
+
+						// change frequency ratio in steps
+						if (std::abs(frequency_ratio - request_ratio) > cfg.time_stretching_step)
+						{
+							new_ratio = ringbuffer->set_frequency_ratio(request_ratio);
+						}
+					}
+					else if (frequency_ratio != 1.0f)
+					{
+						new_ratio = ringbuffer->set_frequency_ratio(1.0f);
+					}
+
+					if (new_ratio != frequency_ratio)
+					{
+						// ratio changed, calculate new dynamic period
+						frequency_ratio = new_ratio;
+						enqueued_playtime = ringbuffer->get_enqueued_playtime();
+						m_dynamic_period = 0;
+					}
+				}
+
+
 				//  1.0 means exactly as desired
 				// <1.0 means not as full as desired
 				// >1.0 means more full than desired
 				const f32 desired_duration_rate = enqueued_playtime / desired_duration_adjusted;
 
-				// update frequency ratio if necessary
-				if (desired_duration_rate < cfg.time_stretching_threshold)
+				if (desired_duration_rate >= 1.0f)
 				{
-					const f32 normalized_desired_duration_rate = desired_duration_rate / cfg.time_stretching_threshold;
-
-					// change frequency ratio in steps
-					const f32 req_time_stretching_step = (normalized_desired_duration_rate + frequency_ratio) / 2.0f;
-					if (std::abs(req_time_stretching_step - frequency_ratio) > cfg.time_stretching_step)
-					{
-						ringbuffer->set_frequency_ratio(req_time_stretching_step);
-					}
+					// more full than desired
+					const f32 multiplier = 1.0f / desired_duration_rate;
+					m_dynamic_period = cfg.maximum_block_period - static_cast<u64>((cfg.maximum_block_period - cfg.audio_block_period) * multiplier);
 				}
-				else if (frequency_ratio != RESAMPLER_MAX_FREQ_VAL)
+				else
 				{
-					ringbuffer->set_frequency_ratio(RESAMPLER_MAX_FREQ_VAL);
+					// not as full as desired
+					const f32 multiplier = desired_duration_rate * desired_duration_rate; // quite aggressive, but helps more times than it hurts
+					m_dynamic_period = cfg.minimum_block_period + static_cast<u64>((cfg.audio_block_period - cfg.minimum_block_period) * multiplier);
 				}
 			}
 
-			//  1.0 means exactly as desired
-			// <1.0 means not as full as desired
-			// >1.0 means more full than desired
-			const f32 desired_duration_rate = enqueued_playtime / desired_duration_adjusted;
-
-			if (desired_duration_rate >= 1.0f)
-			{
-				// more full than desired
-				const f32 multiplier = 1.0f / desired_duration_rate;
-				m_dynamic_period = cfg.maximum_block_period - static_cast<u64>((cfg.maximum_block_period - cfg.audio_block_period) * multiplier);
-			}
-			else
-			{
-				// not as full as desired
-				const f32 multiplier = desired_duration_rate * desired_duration_rate; // quite aggressive, but helps more times than it hurts
-				m_dynamic_period = cfg.minimum_block_period + static_cast<u64>((cfg.audio_block_period - cfg.minimum_block_period) * multiplier);
-			}
-
-			const s64 time_left = m_dynamic_period - time_since_last_period;
+			s64 time_left = m_dynamic_period - time_since_last_period;
 			if (time_left > cfg.period_comparison_margin)
 			{
-				thread_ctrl::wait_for(time_left - cfg.period_comparison_margin);
+				thread_ctrl::wait_for(get_thread_wait_delay(time_left));
 				continue;
 			}
 
@@ -896,7 +748,10 @@ void cell_audio_thread::operator()()
 			{
 				// no need to mix, just enqueue silence and advance time
 				cellAudio.trace("enqueuing silence: no active ports, enqueued_buffers=%llu", enqueued_buffers);
-				ringbuffer->enqueue_silence();
+				if (playing)
+				{
+					ringbuffer->enqueue_silence(1);
+				}
 				untouched_expected = 0;
 				advance(timestamp);
 				continue;
@@ -906,11 +761,21 @@ void cell_audio_thread::operator()()
 			//cellAudio.error("active=%u, in_progress=%u, untouched=%u, incomplete=%u", active_ports, in_progress, untouched, incomplete);
 			if (untouched > untouched_expected)
 			{
+				if (!playing)
+				{
+					// We ran out of buffer, probably because we waited too long
+					// Don't enqueue anything, just advance time
+					cellAudio.trace("advancing time: untouched=%u/%u (expected=%u), enqueued_buffers=0", untouched, active_ports, untouched_expected);
+					untouched_expected = untouched;
+					advance(timestamp);
+					continue;
+				}
+
 				// Games may sometimes "skip" audio periods entirely if they're falling behind (a sort of "frameskip" for audio)
 				// As such, if the game doesn't touch buffers for too long we advance time hoping the game recovers
 				if (
 					(untouched == active_ports && time_since_last_period > cfg.fully_untouched_timeout) ||
-					(time_since_last_period > cfg.partially_untouched_timeout) || g_cfg.audio.disable_sampling_skip
+					(time_since_last_period > cfg.partially_untouched_timeout)
 				   )
 				{
 					// There's no audio in the buffers, simply advance time and hope the game recovers
@@ -930,7 +795,10 @@ void cell_audio_thread::operator()()
 			{
 				// There's no audio in the buffers, simply advance time
 				cellAudio.trace("enqueuing silence: untouched=%u/%u (expected=%u), enqueued_buffers=%llu", untouched, active_ports, untouched_expected, enqueued_buffers);
-				ringbuffer->enqueue_silence();
+				if (playing)
+				{
+					ringbuffer->enqueue_silence(1);
+				}
 				untouched_expected = untouched;
 				advance(timestamp);
 				continue;
@@ -954,60 +822,43 @@ void cell_audio_thread::operator()()
 			{
 				cellAudio.trace("enqueueing: untouched=%u/%u (expected=%u), incomplete=%u/%u enqueued_buffers=%llu", untouched, active_ports, untouched_expected, incomplete, active_ports, enqueued_buffers);
 			}
+
+			// Handle audio restart
+			if (!playing)
+			{
+				// We are not playing (likely buffer underrun)
+				// align to 5.(3)ms on global clock - some games seem to prefer this
+				const s64 audio_period_alignment_delta = (timestamp - m_start_time) % cfg.audio_block_period;
+				if (audio_period_alignment_delta > cfg.period_comparison_margin)
+				{
+					thread_ctrl::wait_for(audio_period_alignment_delta - cfg.period_comparison_margin);
+				}
+
+				// Flush, add silence, restart algorithm
+				cellAudio.trace("play/resume audio: received first audio buffer");
+				ringbuffer->flush();
+				ringbuffer->enqueue_silence(cfg.desired_full_buffers);
+				finish_port_volume_stepping();
+				m_average_playtime = static_cast<f32>(ringbuffer->get_enqueued_playtime());
+			}
 		}
 
 		// Mix
-		float* buf = ringbuffer->get_current_buffer();
+		float *buf = ringbuffer->get_current_buffer();
 
 		switch (cfg.audio_channels)
 		{
 		case 2:
-			switch (cfg.audio_downmix)
-			{
-			case AudioChannelCnt::SURROUND_7_1:
-				mix<AudioChannelCnt::STEREO, AudioChannelCnt::SURROUND_7_1>(buf);
-				break;
-			case AudioChannelCnt::STEREO:
-				mix<AudioChannelCnt::STEREO, AudioChannelCnt::STEREO>(buf);
-				break;
-			case AudioChannelCnt::SURROUND_5_1:
-				mix<AudioChannelCnt::STEREO, AudioChannelCnt::SURROUND_5_1>(buf);
-				break;
-			}
+			mix<audio_downmix::downmix_to_stereo>(buf);
 			break;
-
 		case 6:
-			switch (cfg.audio_downmix)
-			{
-			case AudioChannelCnt::SURROUND_7_1:
-				mix<AudioChannelCnt::SURROUND_5_1, AudioChannelCnt::SURROUND_7_1>(buf);
-				break;
-			case AudioChannelCnt::STEREO:
-				mix<AudioChannelCnt::SURROUND_5_1, AudioChannelCnt::STEREO>(buf);
-				break;
-			case AudioChannelCnt::SURROUND_5_1:
-				mix<AudioChannelCnt::SURROUND_5_1, AudioChannelCnt::SURROUND_5_1>(buf);
-				break;
-			}
+			mix<audio_downmix::downmix_to_5_1>(buf);
 			break;
-
 		case 8:
-			switch (cfg.audio_downmix)
-			{
-			case AudioChannelCnt::SURROUND_7_1:
-				mix<AudioChannelCnt::SURROUND_7_1, AudioChannelCnt::SURROUND_7_1>(buf);
-				break;
-			case AudioChannelCnt::STEREO:
-				mix<AudioChannelCnt::SURROUND_7_1, AudioChannelCnt::STEREO>(buf);
-				break;
-			case AudioChannelCnt::SURROUND_5_1:
-				mix<AudioChannelCnt::SURROUND_7_1, AudioChannelCnt::SURROUND_5_1>(buf);
-				break;
-			}
+			mix<audio_downmix::no_downmix>(buf);
 			break;
-
 		default:
-			fmt::throw_exception("Unsupported channel count in cell_audio_config: %d", cfg.audio_channels);
+			fmt::throw_exception("Unsupported number of audio channels: %u", cfg.audio_channels);
 		}
 
 		// Enqueue
@@ -1021,34 +872,20 @@ void cell_audio_thread::operator()()
 	ringbuffer.reset();
 }
 
-audio_port* cell_audio_thread::open_port()
-{
-	for (u32 i = 0; i < AUDIO_PORT_COUNT; i++)
-	{
-		if (ports[i].state.compare_and_swap_test(audio_port_state::closed, audio_port_state::opened))
-		{
-			return &ports[i];
-		}
-	}
-
-	return nullptr;
-}
-
-template <AudioChannelCnt channels, AudioChannelCnt downmix>
-void cell_audio_thread::mix(float* out_buffer, s32 offset)
+template <audio_downmix downmix>
+void cell_audio_thread::mix(float *out_buffer, s32 offset)
 {
 	AUDIT(out_buffer != nullptr);
 
-	constexpr u32 out_channels = static_cast<u32>(channels);
-	constexpr u32 out_buffer_sz = out_channels * AUDIO_BUFFER_SAMPLES;
+	constexpr u32 channels = downmix == audio_downmix::no_downmix ? 8 : downmix == audio_downmix::downmix_to_5_1 ? 6 : 2;
+	constexpr u32 out_buffer_sz = channels * AUDIO_BUFFER_SAMPLES;
 
-	const float master_volume = audio::get_volume();
+	bool first_mix = true;
 
-	// Reset out_buffer
-	std::memset(out_buffer, 0, out_buffer_sz * sizeof(float));
+	const float master_volume = g_cfg.audio.volume / 100.0f;
 
 	// mixing
-	for (audio_port& port : ports)
+	for (auto& port : ports)
 	{
 		if (port.state != audio_port_state::started) continue;
 
@@ -1061,7 +898,7 @@ void cell_audio_thread::mix(float* out_buffer, s32 offset)
 		// spread port volume changes over 13ms
 		auto step_volume = [master_volume, &m](audio_port& port)
 		{
-			const audio_port::level_set_t param = port.level_set.load();
+			const auto param = port.level_set.load();
 
 			if (param.inc != 0.0f)
 			{
@@ -1080,83 +917,137 @@ void cell_audio_thread::mix(float* out_buffer, s32 offset)
 
 		if (port.num_channels == 2)
 		{
-			for (u32 out = 0, in = 0; out < out_buffer_sz; out += out_channels, in += 2)
+			if (first_mix)
 			{
-				step_volume(port);
+				for (u32 out = 0, in = 0; out < out_buffer_sz; out += channels, in += 2)
+				{
+					step_volume(port);
 
-				const float left  = buf[in + 0] * m;
-				const float right = buf[in + 1] * m;
+					const float left  = buf[in + 0] * m;
+					const float right = buf[in + 1] * m;
 
-				out_buffer[out + 0] += left;
-				out_buffer[out + 1] += right;
+					out_buffer[out + 0] = left;
+					out_buffer[out + 1] = right;
+
+					if constexpr (downmix != audio_downmix::downmix_to_stereo)
+					{
+						out_buffer[out + 2] = 0.0f;
+						out_buffer[out + 3] = 0.0f;
+						out_buffer[out + 4] = 0.0f;
+						out_buffer[out + 5] = 0.0f;
+
+						if constexpr (downmix != audio_downmix::downmix_to_5_1)
+						{
+							out_buffer[out + 6] = 0.0f;
+							out_buffer[out + 7] = 0.0f;
+						}
+					}
+				}
+				first_mix = false;
+			}
+			else
+			{
+				for (u32 out = 0, in = 0; out < out_buffer_sz; out += channels, in += 2)
+				{
+					step_volume(port);
+
+					const float left  = buf[in + 0] * m;
+					const float right = buf[in + 1] * m;
+
+					out_buffer[out + 0] += left;
+					out_buffer[out + 1] += right;
+				}
 			}
 		}
 		else if (port.num_channels == 8)
 		{
-			for (u32 out = 0, in = 0; out < out_buffer_sz; out += out_channels, in += 8)
+			if (first_mix)
 			{
-				step_volume(port);
-
-				const float left       = buf[in + 0] * m;
-				const float right      = buf[in + 1] * m;
-				const float center     = buf[in + 2] * m;
-				const float low_freq   = buf[in + 3] * m;
-				const float side_left  = buf[in + 4] * m;
-				const float side_right = buf[in + 5] * m;
-				const float rear_left  = buf[in + 6] * m;
-				const float rear_right = buf[in + 7] * m;
-
-				if constexpr (downmix == AudioChannelCnt::STEREO)
+				for (u32 out = 0, in = 0; out < out_buffer_sz; out += channels, in += 8)
 				{
-					// Don't mix in the lfe as per dolby specification and based on documentation
-					const float mid = center * 0.5f;
-					out_buffer[out + 0] += left * minus_3db + mid + side_left * 0.5f + rear_left * 0.5f;
-					out_buffer[out + 1] += right * minus_3db + mid + side_right * 0.5f + rear_right * 0.5f;
-				}
-				else if constexpr (downmix == AudioChannelCnt::SURROUND_5_1)
-				{
-					out_buffer[out + 0] += left;
-					out_buffer[out + 1] += right;
+					step_volume(port);
 
-					if constexpr (out_channels >= 6) // Only mix the surround channels into the output if surround output is configured
+					const float left       = buf[in + 0] * m;
+					const float right      = buf[in + 1] * m;
+					const float center     = buf[in + 2] * m;
+					[[maybe_unused]]
+					const float low_freq   = buf[in + 3] * m;
+					const float rear_left  = buf[in + 4] * m;
+					const float rear_right = buf[in + 5] * m;
+					const float side_left  = buf[in + 6] * m;
+					const float side_right = buf[in + 7] * m;
+
+					if constexpr (downmix == audio_downmix::downmix_to_stereo)
 					{
-						out_buffer[out + 2] += center;
-						out_buffer[out + 3] += low_freq;
-
-						if constexpr (out_channels == 6)
-						{
-							out_buffer[out + 4] += side_left + rear_left;
-							out_buffer[out + 5] += side_right + rear_right;
-						}
-						else // When using 7.1 ouput, out_buffer[out + 4] and out_buffer[out + 5] are the rear channels, so the side channels need to be mixed into [out + 6] and [out + 7]
-						{
-							out_buffer[out + 6] += side_left + rear_left;
-							out_buffer[out + 7] += side_right + rear_right;
-						}
+						// Don't mix in the lfe as per dolby specification and based on documentation
+						const float mid = center * 0.5f;
+						out_buffer[out + 0] = left * minus_3db + mid + side_left * 0.5f + rear_left * 0.5f;
+						out_buffer[out + 1] = right * minus_3db + mid + side_right * 0.5f + rear_right * 0.5f;
+					}
+					else if constexpr (downmix == audio_downmix::downmix_to_5_1)
+					{
+						out_buffer[out + 0] = left;
+						out_buffer[out + 1] = right;
+						out_buffer[out + 2] = center;
+						out_buffer[out + 3] = low_freq;
+						out_buffer[out + 4] = side_left + rear_left;
+						out_buffer[out + 5] = side_right + rear_right;
+					}
+					else
+					{
+						out_buffer[out + 0] = left;
+						out_buffer[out + 1] = right;
+						out_buffer[out + 2] = center;
+						out_buffer[out + 3] = low_freq;
+						out_buffer[out + 4] = rear_left;
+						out_buffer[out + 5] = rear_right;
+						out_buffer[out + 6] = side_left;
+						out_buffer[out + 7] = side_right;
 					}
 				}
-				else
+				first_mix = false;
+			}
+			else
+			{
+				for (u32 out = 0, in = 0; out < out_buffer_sz; out += channels, in += 8)
 				{
-					out_buffer[out + 0] += left;
-					out_buffer[out + 1] += right;
+					step_volume(port);
 
-					if constexpr (out_channels >= 6) // Only mix the surround channels into the output if surround output is configured
+					const float left       = buf[in + 0] * m;
+					const float right      = buf[in + 1] * m;
+					const float center     = buf[in + 2] * m;
+					const float low_freq   = buf[in + 3] * m;
+					const float rear_left  = buf[in + 4] * m;
+					const float rear_right = buf[in + 5] * m;
+					const float side_left  = buf[in + 6] * m;
+					const float side_right = buf[in + 7] * m;
+
+					if constexpr (downmix == audio_downmix::downmix_to_stereo)
 					{
+						// Don't mix in the lfe as per dolby specification and based on documentation
+						const float mid = center * 0.5f;
+						out_buffer[out + 0] += left * minus_3db + mid + side_left * 0.5f + rear_left * 0.5f;
+						out_buffer[out + 1] += right * minus_3db + mid + side_right * 0.5f + rear_right * 0.5f;
+					}
+					else if constexpr (downmix == audio_downmix::downmix_to_5_1)
+					{
+						out_buffer[out + 0] += left;
+						out_buffer[out + 1] += right;
 						out_buffer[out + 2] += center;
 						out_buffer[out + 3] += low_freq;
-
-						if constexpr (out_channels == 6)
-						{
-							out_buffer[out + 4] += side_left;
-							out_buffer[out + 5] += side_right;
-						}
-						else
-						{
-							out_buffer[out + 4] += rear_left;
-							out_buffer[out + 5] += rear_right;
-							out_buffer[out + 6] += side_left;
-							out_buffer[out + 7] += side_right;
-						}
+						out_buffer[out + 4] += side_left + rear_left;
+						out_buffer[out + 5] += side_right + rear_right;
+					}
+					else
+					{
+						out_buffer[out + 0] += left;
+						out_buffer[out + 1] += right;
+						out_buffer[out + 2] += center;
+						out_buffer[out + 3] += low_freq;
+						out_buffer[out + 4] += rear_left;
+						out_buffer[out + 5] += rear_right;
+						out_buffer[out + 6] += side_left;
+						out_buffer[out + 7] += side_right;
 					}
 				}
 			}
@@ -1166,16 +1057,39 @@ void cell_audio_thread::mix(float* out_buffer, s32 offset)
 			fmt::throw_exception("Unknown channel count (port=%u, channel=%d)", port.number, port.num_channels);
 		}
 	}
+
+	// Nothing was mixed, memset out_buffer to 0
+	if (first_mix)
+	{
+		std::memset(out_buffer, 0, out_buffer_sz * sizeof(float));
+	}
+	else if (cfg.backend->get_convert_to_u16())
+	{
+		// convert the data from float to u16 with clipping:
+		// 2x MULPS
+		// 2x MAXPS (optional)
+		// 2x MINPS (optional)
+		// 2x CVTPS2DQ (converts float to s32)
+		// PACKSSDW (converts s32 to s16 with signed saturation)
+
+		for (usz i = 0; i < out_buffer_sz; i += 8)
+		{
+			const auto scale = _mm_set1_ps(0x8000);
+			_mm_store_ps(out_buffer + i / 2, _mm_castsi128_ps(_mm_packs_epi32(
+				_mm_cvtps_epi32(_mm_mul_ps(_mm_load_ps(out_buffer + i), scale)),
+				_mm_cvtps_epi32(_mm_mul_ps(_mm_load_ps(out_buffer + i + 4), scale)))));
+		}
+	}
 }
 
 void cell_audio_thread::finish_port_volume_stepping()
 {
 	// part of cellAudioSetPortLevel functionality
-	for (audio_port& port : ports)
+	for (auto& port : ports)
 	{
 		if (port.state != audio_port_state::started) continue;
 
-		const audio_port::level_set_t param = port.level_set.load();
+		const auto param = port.level_set.load();
 		port.level = param.value;
 		port.level_set.compare_and_swap(param, { param.value, 0.0f });
 	}
@@ -1201,7 +1115,7 @@ error_code cellAudioInit()
 	{
 		g_audio.ports[i].number = i;
 		g_audio.ports[i].addr   = g_audio_buffer + AUDIO_PORT_OFFSET * i;
-		g_audio.ports[i].index  = (g_audio_indices + i).ptr(&aligned_index_t::index);
+		g_audio.ports[i].index  = g_audio_indices + i;
 		g_audio.ports[i].state  = audio_port_state::closed;
 	}
 
@@ -1223,7 +1137,10 @@ error_code cellAudioQuit()
 		return CELL_AUDIO_ERROR_NOT_INIT;
 	}
 
-	// NOTE: Do not clear event queues here. They are handled independently.
+	// TODO
+	g_audio.keys.clear();
+	g_audio.key_count = 0;
+	g_audio.event_period = 0;
 	g_audio.init = 0;
 
 	return CELL_OK;
@@ -1235,6 +1152,8 @@ error_code cellAudioPortOpen(vm::ptr<CellAudioPortParam> audioParam, vm::ptr<u32
 
 	auto& g_audio = g_fxo->get<cell_audio>();
 
+	std::lock_guard lock(g_audio.mutex);
+
 	if (!g_audio.init)
 	{
 		return CELL_AUDIO_ERROR_NOT_INIT;
@@ -1300,18 +1219,8 @@ error_code cellAudioPortOpen(vm::ptr<CellAudioPortParam> audioParam, vm::ptr<u32
 		cellAudio.todo("cellAudioPortOpen(): unknown attributes (0x%llx)", attr);
 	}
 
-	// Waiting for VSH and doing some more things
-	lv2_sleep(200);
-
-	std::lock_guard lock(g_audio.mutex);
-
-	if (!g_audio.init)
-	{
-		return CELL_AUDIO_ERROR_NOT_INIT;
-	}
-
 	// Open audio port
-	audio_port* port = g_audio.open_port();
+	const auto port = g_audio.open_port();
 
 	if (!port)
 	{
@@ -1324,11 +1233,11 @@ error_code cellAudioPortOpen(vm::ptr<CellAudioPortParam> audioParam, vm::ptr<u32
 	port->num_channels   = ::narrow<u32>(num_channels);
 	port->num_blocks     = ::narrow<u32>(num_blocks);
 	port->attr           = attr;
-	port->size           = ::narrow<u32>(num_channels * num_blocks * AUDIO_BUFFER_SAMPLES * sizeof(f32));
+	port->size           = ::narrow<u32>(num_channels * num_blocks * port->block_size());
 	port->cur_pos        = 0;
 	port->global_counter = g_audio.m_counter;
 	port->active_counter = 0;
-	port->timestamp      = get_guest_system_time(g_audio.m_last_period_end);
+	port->timestamp      = g_audio.m_last_period_end;
 
 	if (attr & CELL_AUDIO_PORTATTR_INITLEVEL)
 	{
@@ -1372,7 +1281,7 @@ error_code cellAudioGetPortConfig(u32 portNum, vm::ptr<CellAudioPortConfig> port
 
 	portConfig->readIndexAddr = port.index;
 
-	switch (audio_port_state state = port.state.load())
+	switch (auto state = port.state.load())
 	{
 	case audio_port_state::closed:
 		portConfig->status = CELL_AUDIO_STATUS_CLOSE;
@@ -1401,6 +1310,8 @@ error_code cellAudioPortStart(u32 portNum)
 
 	auto& g_audio = g_fxo->get<cell_audio>();
 
+	std::lock_guard lock(g_audio.mutex);
+
 	if (!g_audio.init)
 	{
 		return CELL_AUDIO_ERROR_NOT_INIT;
@@ -1411,17 +1322,7 @@ error_code cellAudioPortStart(u32 portNum)
 		return CELL_AUDIO_ERROR_PARAM;
 	}
 
-	// Waiting for VSH
-	lv2_sleep(30);
-
-	std::lock_guard lock(g_audio.mutex);
-
-	if (!g_audio.init)
-	{
-		return CELL_AUDIO_ERROR_NOT_INIT;
-	}
-
-	switch (audio_port_state state = g_audio.ports[portNum].state.compare_and_swap(audio_port_state::opened, audio_port_state::started))
+	switch (auto state = g_audio.ports[portNum].state.compare_and_swap(audio_port_state::opened, audio_port_state::started))
 	{
 	case audio_port_state::closed: return CELL_AUDIO_ERROR_PORT_NOT_OPEN;
 	case audio_port_state::started: return CELL_AUDIO_ERROR_PORT_ALREADY_RUN;
@@ -1448,7 +1349,7 @@ error_code cellAudioPortClose(u32 portNum)
 		return CELL_AUDIO_ERROR_PARAM;
 	}
 
-	switch (audio_port_state state = g_audio.ports[portNum].state.exchange(audio_port_state::closed))
+	switch (auto state = g_audio.ports[portNum].state.exchange(audio_port_state::closed))
 	{
 	case audio_port_state::closed: return CELL_AUDIO_ERROR_PORT_NOT_OPEN;
 	case audio_port_state::started: return CELL_OK;
@@ -1475,7 +1376,7 @@ error_code cellAudioPortStop(u32 portNum)
 		return CELL_AUDIO_ERROR_PARAM;
 	}
 
-	switch (audio_port_state state = g_audio.ports[portNum].state.compare_and_swap(audio_port_state::started, audio_port_state::opened))
+	switch (auto state = g_audio.ports[portNum].state.compare_and_swap(audio_port_state::started, audio_port_state::opened))
 	{
 	case audio_port_state::closed: return CELL_AUDIO_ERROR_PORT_NOT_RUN;
 	case audio_port_state::started: return CELL_OK;
@@ -1518,7 +1419,7 @@ error_code cellAudioGetPortTimestamp(u32 portNum, u64 tag, vm::ptr<u64> stamp)
 	const u64 delta_tag_stamp = delta_tag * g_audio.cfg.audio_block_period;
 
 	// Apparently no error is returned if stamp is null
-	*stamp = get_guest_system_time(port.timestamp - delta_tag_stamp);
+	*stamp = port.timestamp - delta_tag_stamp;
 
 	return CELL_OK;
 }
@@ -1649,69 +1550,10 @@ error_code cellAudioCreateNotifyEventQueueEx(ppu_thread& ppu, vm::ptr<u32> id, v
 	return AudioCreateNotifyEventQueue(ppu, id, key, queue_type);
 }
 
-error_code AudioSetNotifyEventQueue(ppu_thread& ppu, u64 key, u32 iFlags)
+error_code AudioSetNotifyEventQueue(u64 key, u32 iFlags)
 {
 	auto& g_audio = g_fxo->get<cell_audio>();
 
-	if (!g_audio.init)
-	{
-		return CELL_AUDIO_ERROR_NOT_INIT;
-	}
-
-	// Waiting for VSH
-	lv2_sleep(20, &ppu);
-
-	// Dirty hack for sound: confirm the creation of _mxr000 event queue by _cellsurMixerMain thread
-	constexpr u64 c_mxr000 = 0x8000cafe0246030;
-
-	if (key == c_mxr000 || key == 0)
-	{
-		bool has_sur_mixer_thread = false;
-
-		for (usz count = 0; !lv2_event_queue::find(c_mxr000) && count < 100; count++)
-		{
-			if (has_sur_mixer_thread || idm::select<named_thread<ppu_thread>>([&](u32 id, named_thread<ppu_thread>& test_ppu)
-			{
-				// Confirm thread existence
-				if (id == ppu.id)
-				{
-					return false;
-				}
-
-				const auto ptr = test_ppu.ppu_tname.load();
-
-				if (!ptr)
-				{
-					return false;
-				}
-
-				return *ptr == "_cellsurMixerMain"sv;
-			}).ret)
-			{
-				has_sur_mixer_thread = true;
-			}
-			else
-			{
-				break;
-			}
-
-			if (ppu.is_stopped())
-			{
-				ppu.state += cpu_flag::again;
-				return {};
-			}
-
-			cellAudio.error("AudioSetNotifyEventQueue(): Waiting for _mxr000. x%d", count);
-
-			lv2_sleep(50'000, &ppu);
-		}
-
-		if (has_sur_mixer_thread && lv2_event_queue::find(c_mxr000))
-		{
-			key = c_mxr000;
-		}
-	}
-
 	std::lock_guard lock(g_audio.mutex);
 
 	if (!g_audio.init)
@@ -1745,33 +1587,21 @@ error_code AudioSetNotifyEventQueue(ppu_thread& ppu, u64 key, u32 iFlags)
 	}
 
 	// Set unique source associated with the key
-	g_audio.keys.push_back
-	({
-		.start_period = g_audio.event_period,
-		.flags = iFlags,
-		.source = ((process_getpid() + u64{}) << 32) + lv2_event_port::id_base + (g_audio.key_count++ * lv2_event_port::id_step),
-		.ack_timestamp = 0,
-		.port = std::move(q)
-	});
-
+	g_audio.keys.push_back({g_audio.event_period, iFlags, ((process_getpid() + u64{}) << 32) + lv2_event_port::id_base + (g_audio.key_count++ * lv2_event_port::id_step), std::move(q)});
 	g_audio.key_count %= lv2_event_port::id_count;
 
 	return CELL_OK;
 }
 
-error_code cellAudioSetNotifyEventQueue(ppu_thread& ppu, u64 key)
+error_code cellAudioSetNotifyEventQueue(u64 key)
 {
-	ppu.state += cpu_flag::wait;
-
 	cellAudio.warning("cellAudioSetNotifyEventQueue(key=0x%llx)", key);
 
-	return AudioSetNotifyEventQueue(ppu, key, 0);
+	return AudioSetNotifyEventQueue(key, 0);
 }
 
-error_code cellAudioSetNotifyEventQueueEx(ppu_thread& ppu, u64 key, u32 iFlags)
+error_code cellAudioSetNotifyEventQueueEx(u64 key, u32 iFlags)
 {
-	ppu.state += cpu_flag::wait;
-
 	cellAudio.todo("cellAudioSetNotifyEventQueueEx(key=0x%llx, iFlags=0x%x)", key, iFlags);
 
 	if (iFlags & (~0u >> 5))
@@ -1779,7 +1609,7 @@ error_code cellAudioSetNotifyEventQueueEx(ppu_thread& ppu, u64 key, u32 iFlags)
 		return CELL_AUDIO_ERROR_PARAM;
 	}
 
-	return AudioSetNotifyEventQueue(ppu, key, iFlags);
+	return AudioSetNotifyEventQueue(key, iFlags);
 }
 
 error_code AudioRemoveNotifyEventQueue(u64 key, u32 iFlags)
@@ -1898,6 +1728,18 @@ error_code cellAudioAdd2chData(u32 portNum, vm::ptr<float> src, u32 samples, flo
 			dst[i * 2 + 1] += src[i * 2 + 1] * volume; // mix R ch
 		}
 	}
+	else if (port.num_channels == 6)
+	{
+		for (u32 i = 0; i < samples; i++)
+		{
+			dst[i * 6 + 0] += src[i * 2 + 0] * volume; // mix L ch
+			dst[i * 6 + 1] += src[i * 2 + 1] * volume; // mix R ch
+			//dst[i * 6 + 2] += 0.0f; // center
+			//dst[i * 6 + 3] += 0.0f; // LFE
+			//dst[i * 6 + 4] += 0.0f; // rear L
+			//dst[i * 6 + 5] += 0.0f; // rear R
+		}
+	}
 	else if (port.num_channels == 8)
 	{
 		for (u32 i = 0; i < samples; i++)
@@ -1946,17 +1788,28 @@ error_code cellAudioAdd6chData(u32 portNum, vm::ptr<float> src, float volume)
 
 	volume = std::isfinite(volume) ? std::clamp(volume, -16.f, 16.f) : 0.f;
 
-	if (port.num_channels == 8)
+	if (port.num_channels == 6)
+	{
+		for (u32 i = 0; i < CELL_AUDIO_BLOCK_SAMPLES; i++)
+		{
+			dst[i * 6 + 0] += src[i * 6 + 0] * volume; // mix L ch
+			dst[i * 6 + 1] += src[i * 6 + 1] * volume; // mix R ch
+			dst[i * 6 + 2] += src[i * 6 + 2] * volume; // mix center
+			dst[i * 6 + 3] += src[i * 6 + 3] * volume; // mix LFE
+			dst[i * 6 + 4] += src[i * 6 + 4] * volume; // mix rear L
+			dst[i * 6 + 5] += src[i * 6 + 5] * volume; // mix rear R
+		}
+	}
+	else if (port.num_channels == 8)
 	{
 		for (u32 i = 0; i < CELL_AUDIO_BLOCK_SAMPLES; i++)
 		{
-			// Channel order in src is Front Left, Center, Front Right, Surround Left, Surround Right, LFE
 			dst[i * 8 + 0] += src[i * 6 + 0] * volume; // mix L ch
-			dst[i * 8 + 1] += src[i * 6 + 2] * volume; // mix R ch
-			dst[i * 8 + 2] += src[i * 6 + 1] * volume; // mix center
-			dst[i * 8 + 3] += src[i * 6 + 5] * volume; // mix LFE
-			dst[i * 8 + 4] += src[i * 6 + 3] * volume; // mix rear L
-			dst[i * 8 + 5] += src[i * 6 + 4] * volume; // mix rear R
+			dst[i * 8 + 1] += src[i * 6 + 1] * volume; // mix R ch
+			dst[i * 8 + 2] += src[i * 6 + 2] * volume; // mix center
+			dst[i * 8 + 3] += src[i * 6 + 3] * volume; // mix LFE
+			dst[i * 8 + 4] += src[i * 6 + 4] * volume; // mix rear L
+			dst[i * 8 + 5] += src[i * 6 + 5] * volume; // mix rear R
 			//dst[i * 8 + 6] += 0.0f; // side L
 			//dst[i * 8 + 7] += 0.0f; // side R
 		}
@@ -1989,28 +1842,7 @@ error_code cellAudioMiscSetAccessoryVolume(u32 devNum, float volume)
 
 error_code cellAudioSendAck(u64 data3)
 {
-	cellAudio.trace("cellAudioSendAck(data3=0x%llx)", data3);
-
-	auto& g_audio = g_fxo->get<cell_audio>();
-
-	std::unique_lock lock(g_audio.mutex);
-
-	if (!g_audio.init)
-	{
-		return CELL_AUDIO_ERROR_NOT_INIT;
-	}
-
-	// TODO: error checks
-
-	for (cell_audio_thread::key_info& k : g_audio.keys)
-	{
-		if (k.source == data3)
-		{
-			k.ack_timestamp = get_system_time();
-			break;
-		}
-	}
-
+	cellAudio.todo("cellAudioSendAck(data3=0x%llx)", data3);
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.h b/rpcs3/Emu/Cell/Modules/cellAudio.h
index a88ac6edad..c3636939d2 100644
--- a/rpcs3/Emu/Cell/Modules/cellAudio.h
+++ b/rpcs3/Emu/Cell/Modules/cellAudio.h
@@ -2,11 +2,10 @@
 
 #include "Emu/Memory/vm_ptr.h"
 #include "Utilities/Thread.h"
-#include "Utilities/simple_ringbuf.h"
 #include "Emu/Memory/vm.h"
+#include "Emu/Audio/audio_device_listener.h"
 #include "Emu/Audio/AudioBackend.h"
 #include "Emu/Audio/AudioDumper.h"
-#include "Emu/Audio/audio_resampler.h"
 #include "Emu/system_config_types.h"
 
 struct lv2_event_queue;
@@ -74,30 +73,23 @@ enum
 	CELL_AUDIO_STATUS_RUN              = 2,
 };
 
-enum class audio_backend_update : u32
-{
-	NONE,
-	PARAM,
-	ALL,
-};
-
 //libaudio datatypes
 struct CellAudioPortParam
 {
-	be_t<u64> nChannel{};
-	be_t<u64> nBlock{};
-	be_t<u64> attr{};
-	be_t<float> level{};
+	be_t<u64> nChannel;
+	be_t<u64> nBlock;
+	be_t<u64> attr;
+	be_t<float> level;
 };
 
 struct CellAudioPortConfig
 {
-	vm::bptr<u64> readIndexAddr{};
-	be_t<u32> status{};
-	be_t<u64> nChannel{};
-	be_t<u64> nBlock{};
-	be_t<u32> portSize{};
-	be_t<u32> portAddr{};
+	vm::bptr<u64> readIndexAddr;
+	be_t<u32> status;
+	be_t<u64> nChannel;
+	be_t<u64> nBlock;
+	be_t<u32> portSize;
+	be_t<u32> portAddr;
 };
 
 enum : u32
@@ -111,6 +103,7 @@ enum : u32
 	MAX_AUDIO_EVENT_QUEUES = 64,
 
 	AUDIO_BLOCK_SIZE_2CH = 2 * AUDIO_BUFFER_SAMPLES,
+	AUDIO_BLOCK_SIZE_6CH = 6 * AUDIO_BUFFER_SAMPLES,
 	AUDIO_BLOCK_SIZE_8CH = 8 * AUDIO_BUFFER_SAMPLES,
 
 	PORT_BUFFER_TAG_COUNT = 6,
@@ -119,6 +112,10 @@ enum : u32
 	PORT_BUFFER_TAG_DELTA_2CH = PORT_BUFFER_TAG_LAST_2CH / (PORT_BUFFER_TAG_COUNT - 1),
 	PORT_BUFFER_TAG_FIRST_2CH = PORT_BUFFER_TAG_LAST_2CH % (PORT_BUFFER_TAG_COUNT - 1),
 
+	PORT_BUFFER_TAG_LAST_6CH = AUDIO_BLOCK_SIZE_6CH - 1,
+	PORT_BUFFER_TAG_DELTA_6CH = PORT_BUFFER_TAG_LAST_6CH / (PORT_BUFFER_TAG_COUNT - 1),
+	PORT_BUFFER_TAG_FIRST_6CH = PORT_BUFFER_TAG_LAST_6CH % (PORT_BUFFER_TAG_COUNT - 1),
+
 	PORT_BUFFER_TAG_LAST_8CH = AUDIO_BLOCK_SIZE_8CH - 1,
 	PORT_BUFFER_TAG_DELTA_8CH = PORT_BUFFER_TAG_LAST_8CH / (PORT_BUFFER_TAG_COUNT - 1),
 	PORT_BUFFER_TAG_FIRST_8CH = PORT_BUFFER_TAG_LAST_8CH % (PORT_BUFFER_TAG_COUNT - 1),
@@ -135,27 +132,27 @@ struct audio_port
 {
 	atomic_t<audio_port_state> state = audio_port_state::closed;
 
-	u32 number = 0;
+	u32 number;
 	vm::ptr<char> addr{};
 	vm::ptr<u64> index{};
 
-	u32 num_channels = 0;
-	u32 num_blocks = 0;
-	u64 attr = 0;
-	u64 cur_pos = 0;
-	u64 global_counter = 0; // copy of global counter
-	u64 active_counter = 0;
-	u32 size = 0;
-	u64 timestamp = 0; // copy of global timestamp
+	u32 num_channels;
+	u32 num_blocks;
+	u64 attr;
+	u64 cur_pos;
+	u64 global_counter; // copy of global counter
+	u64 active_counter;
+	u32 size;
+	u64 timestamp; // copy of global timestamp
 
 	struct level_set_t
 	{
-		float value = 0.0f;
-		float inc = 0.0f;
+		float value;
+		float inc;
 	};
 
-	float level = 0.0f;
-	atomic_t<level_set_t> level_set{};
+	float level;
+	atomic_t<level_set_t> level_set;
 
 	u32 block_size() const
 	{
@@ -185,53 +182,35 @@ struct audio_port
 
 
 	// Tags
-	u32 prev_touched_tag_nr = 0;
+	u32 prev_touched_tag_nr;
 	f32 last_tag_value[PORT_BUFFER_TAG_COUNT] = { 0 };
 
 	void tag(s32 offset = 0);
-
-	audio_port() = default;
-
-	// Handle copy ctor of atomic var
-	audio_port(const audio_port& r)
-	{
-		std::memcpy(static_cast<void*>(this), &r, sizeof(r));
-	}
-
-	ENABLE_BITWISE_SERIALIZATION;
 };
 
 struct cell_audio_config
 {
 	struct raw_config
 	{
-		std::string audio_device{};
 		bool buffering_enabled = false;
 		s64 desired_buffer_duration = 0;
 		bool enable_time_stretching = false;
 		s64 time_stretching_threshold = 0;
-		bool convert_to_s16 = false;
-		bool dump_to_file = false;
-		audio_channel_layout channel_layout = audio_channel_layout::automatic;
+		bool convert_to_u16 = false;
+		u32 start_threshold = 0;
+		u32 sampling_period_multiplier = 0;
+		audio_downmix downmix = audio_downmix::downmix_to_stereo;
 		audio_renderer renderer = audio_renderer::null;
-		audio_provider provider = audio_provider::none;
-	};
-
-	raw_config new_raw{};
-	raw_config raw{};
+	} raw;
 
 	std::shared_ptr<AudioBackend> backend = nullptr;
 
-	AudioChannelCnt audio_downmix = AudioChannelCnt::SURROUND_7_1;
-	audio_channel_layout backend_channel_layout = audio_channel_layout::surround_7_1;
-	u32 backend_ch_cnt = 8;
-	u32 audio_channels = 2;
-	u32 audio_sampling_rate = DEFAULT_AUDIO_SAMPLING_RATE;
+	u32 audio_channels = 0;
+	u32 audio_sampling_rate = 0;
 	u32 audio_block_period = 0;
-	u32 audio_sample_size = 0;
-	f64 audio_min_buffer_duration = 0.0;
 
 	u32 audio_buffer_length = 0;
+	u32 audio_buffer_size = 0;
 
 	/*
 	 * Buffering
@@ -249,14 +228,9 @@ struct cell_audio_config
 	u32 desired_full_buffers = 0;
 	u32 num_allocated_buffers = 0; // number of ringbuffer buffers
 
-	static constexpr f32 period_average_alpha = 0.02f; // alpha factor for the m_average_period rolling average
+	const f32 period_average_alpha = 0.02f; // alpha factor for the m_average_period rolling average
 
-	// when comparing the current period time with the desired period, if it is below this number of usecs we do not wait any longer(quantum dependent)
-#ifdef _WIN32
-	static constexpr s64 period_comparison_margin = 250;
-#else
-	static constexpr s64 period_comparison_margin = 5;
-#endif
+	const s64 period_comparison_margin = 250; // when comparing the current period time with the desired period, if it is below this number of usecs we do not wait any longer
 
 	u64 fully_untouched_timeout = 0; // timeout if the game has not touched any audio buffer yet
 	u64 partially_untouched_timeout = 0; // timeout if the game has not touched all audio buffers yet
@@ -269,7 +243,8 @@ struct cell_audio_config
 	bool time_stretching_enabled = false;
 
 	f32 time_stretching_threshold = 0.0f; // we only apply time stretching below this buffer fill rate (adjusted for average period)
-	static constexpr f32 time_stretching_step = 0.1f; // will only reduce/increase the frequency ratio in steps of at least this value
+	const f32 time_stretching_step = 0.1f; // will only reduce/increase the frequency ratio in steps of at least this value
+	const f32 time_stretching_scale = 0.9f;
 
 	/*
 	 * Constructor
@@ -279,7 +254,7 @@ struct cell_audio_config
 	/*
 	 * Config changes
 	 */
-	void reset(bool backend_changed = true);
+	void reset();
 };
 
 class audio_ringbuffer
@@ -291,53 +266,67 @@ private:
 
 	const u32 buf_sz;
 
-	AudioDumper m_dump{};
+	std::unique_ptr<AudioDumper> m_dump;
 
-	std::unique_ptr<float[]> buffer[MAX_AUDIO_BUFFERS]{};
+	std::unique_ptr<float[]> buffer[MAX_AUDIO_BUFFERS];
+	const float silence_buffer[u32{AUDIO_MAX_CHANNELS_COUNT} * u32{AUDIO_BUFFER_SAMPLES}] = { 0 };
 
-	simple_ringbuf cb_ringbuf{};
-	audio_resampler resampler{};
-
-	atomic_t<bool> backend_active = false;
-	atomic_t<bool> backend_device_changed = false;
+	bool backend_open = false;
 	bool playing = false;
+	bool emu_paused = false;
 
 	u64 update_timestamp = 0;
 	u64 play_timestamp = 0;
 
 	u64 last_remainder = 0;
+	u64 enqueued_samples = 0;
 
-	f32 frequency_ratio = RESAMPLER_MAX_FREQ_VAL;
+	f32 frequency_ratio = 1.0f;
 
 	u32 cur_pos = 0;
 
 	bool get_backend_playing() const
 	{
-		return backend->IsPlaying();
+		return has_capability(AudioBackend::PLAY_PAUSE_FLUSH | AudioBackend::IS_PLAYING) ? backend->IsPlaying() : playing;
 	}
 
-	void commit_data(f32* buf, u32 sample_cnt);
-	u32 backend_write_callback(u32 size, void *buf);
-	void backend_state_callback(AudioStateEvent event);
-
 public:
 	audio_ringbuffer(cell_audio_config &cfg);
 	~audio_ringbuffer();
 
 	void play();
+	void enqueue(const float* in_buffer = nullptr);
 	void flush();
-	u64 update(bool emu_is_paused);
-	void enqueue(bool enqueue_silence = false, bool force = false);
-	void enqueue_silence(u32 buf_count = 1, bool force = false);
-	void process_resampled_data();
+	u64 update();
+	void enqueue_silence(u32 buf_count = 1);
 	f32 set_frequency_ratio(f32 new_ratio);
 
-	float* get_buffer(u32 num) const;
-	static u64 get_timestamp();
-	float* get_current_buffer() const;
+	float* get_buffer(u32 num) const
+	{
+		AUDIT(num < cfg.num_allocated_buffers);
+		AUDIT(buffer[num].get() != nullptr);
+		return buffer[num].get();
+	}
 
-	u64 get_enqueued_samples() const;
-	u64 get_enqueued_playtime() const;
+	static u64 get_timestamp();
+
+	float* get_current_buffer() const
+	{
+		return get_buffer(cur_pos);
+	}
+
+	u64 get_enqueued_samples() const
+	{
+		AUDIT(cfg.buffering_enabled);
+		return enqueued_samples;
+	}
+
+	u64 get_enqueued_playtime(bool raw = false) const
+	{
+		AUDIT(cfg.buffering_enabled);
+		u64 sampling_rate = raw ? cfg.audio_sampling_rate : static_cast<u64>(cfg.audio_sampling_rate * frequency_ratio);
+		return enqueued_samples * 1'000'000 / sampling_rate;
+	}
 
 	bool is_playing() const
 	{
@@ -349,17 +338,12 @@ public:
 		return frequency_ratio;
 	}
 
-	bool get_operational_status() const
+	u32 has_capability(u32 cap) const
 	{
-		return backend->Operational();
+		return backend->has_capability(cap);
 	}
 
-	bool device_changed()
-	{
-		return backend_device_changed.test_and_reset() && backend->DefaultDeviceChanged();
-	}
-
-	std::string_view get_backend_name() const
+	const char* get_backend_name() const
 	{
 		return backend->GetName();
 	}
@@ -369,60 +353,73 @@ public:
 class cell_audio_thread
 {
 private:
-	std::unique_ptr<audio_ringbuffer> ringbuffer{};
+	std::unique_ptr<audio_ringbuffer> ringbuffer;
+	audio_device_listener listener;
 
 	void reset_ports(s32 offset = 0);
-	void advance(u64 timestamp);
+	void advance(u64 timestamp, bool reset = true);
 	std::tuple<u32, u32, u32, u32> count_port_buffer_tags();
-	template <AudioChannelCnt channels, AudioChannelCnt downmix>
-	void mix(float* out_buffer, s32 offset = 0);
+	template <audio_downmix downmix>
+	void mix(float *out_buffer, s32 offset = 0);
 	void finish_port_volume_stepping();
 
-	void update_config(bool backend_changed);
-	void reset_counters();
+	constexpr static u64 get_thread_wait_delay(u64 time_left)
+	{
+		return (time_left > 350) ? time_left - 250 : 100;
+	}
+
+	void update_config();
 
 public:
-	shared_mutex emu_cfg_upd_m{};
-	cell_audio_config cfg{};
-	atomic_t<audio_backend_update> m_update_configuration = audio_backend_update::NONE;
+	cell_audio_config cfg;
+	atomic_t<bool> m_update_configuration = false;
 
-	shared_mutex mutex{};
-	atomic_t<u8> init = 0;
+	shared_mutex mutex;
+	atomic_t<u32> init = 0;
 
 	u32 key_count = 0;
 	u8 event_period = 0;
-	std::array<u64, MAX_AUDIO_EVENT_QUEUES> event_sources{};
-	std::array<u64, MAX_AUDIO_EVENT_QUEUES> event_data3{};
 
 	struct key_info
 	{
-		u8 start_period = 0; // Starting event_period
-		u32 flags = 0; // iFlags
-		u64 source = 0; // Event source
-		u64 ack_timestamp = 0; // timestamp of last call of cellAudioSendAck
-		shared_ptr<lv2_event_queue> port{}; // Underlying event port
+		u8 start_period; // Starting event_period
+		u32 flags; // iFlags
+		u64 source; // Event source
+		std::shared_ptr<lv2_event_queue> port; // Underlying event port
 	};
 
-	std::vector<key_info> keys{};
-	std::array<audio_port, AUDIO_PORT_COUNT> ports{};
+	std::vector<key_info> keys;
+	std::array<audio_port, AUDIO_PORT_COUNT> ports;
 
 	u64 m_last_period_end = 0;
 	u64 m_counter = 0;
 	u64 m_start_time = 0;
 	u64 m_dynamic_period = 0;
 	f32 m_average_playtime = 0.0f;
-	bool m_backend_failed = false;
-	bool m_audio_should_restart = false;
 
 	void operator()();
 
-	SAVESTATE_INIT_POS(9);
+	cell_audio_thread()
+	{
+	}
 
-	cell_audio_thread();
-	cell_audio_thread(utils::serial& ar);
-	void save(utils::serial& ar);
+	audio_port* open_port()
+	{
+		for (u32 i = 0; i < AUDIO_PORT_COUNT; i++)
+		{
+			if (ports[i].state.compare_and_swap_test(audio_port_state::closed, audio_port_state::opened))
+			{
+				return &ports[i];
+			}
+		}
 
-	audio_port* open_port();
+		return nullptr;
+	}
+
+	bool has_capability(u32 cap) const
+	{
+		return ringbuffer->has_capability(cap);
+	}
 
 	static constexpr auto thread_name = "cellAudio Thread"sv;
 };
@@ -432,5 +429,5 @@ using cell_audio = named_thread<cell_audio_thread>;
 namespace audio
 {
 	cell_audio_config::raw_config get_raw_config();
-	extern void configure_audio(bool force_reset = false);
+	void configure_audio();
 }
diff --git a/rpcs3/Emu/Cell/Modules/cellAudioIn.h b/rpcs3/Emu/Cell/Modules/cellAudioIn.h
index 7ceaa2d2bd..2dfc77bf16 100644
--- a/rpcs3/Emu/Cell/Modules/cellAudioIn.h
+++ b/rpcs3/Emu/Cell/Modules/cellAudioIn.h
@@ -1,9 +1,10 @@
 #pragma once
 
 #include "util/types.hpp"
+#include "util/endian.hpp"
 
 // Error codes
-enum CellAudioInError : u32
+enum CellAudioInError
 {
 	CELL_AUDIO_IN_ERROR_NOT_IMPLEMENTED        = 0x8002b260,
 	CELL_AUDIO_IN_ERROR_ILLEGAL_CONFIGURATION  = 0x8002b261,
@@ -75,7 +76,7 @@ struct CellAudioInDeviceInfo
 	u8 reserved[12];
 	be_t<u64> deviceId;
 	be_t<u64> type;
-	char name[64]; // Not necessarily null terminated!
+	char name[64];
 	CellAudioInSoundMode availableModes[16];
 };
 
diff --git a/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp b/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp
index 28888fcd0d..5f37624583 100644
--- a/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp
@@ -1,13 +1,7 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/lv2/sys_rsxaudio.h"
-#include "Emu/IdManager.h"
-#include "Emu/System.h"
-#include "Emu/system_config.h"
-#include "Loader/PSF.h"
 
 #include "cellAudioOut.h"
-#include "cellAudio.h"
 
 LOG_CHANNEL(cellSysutil);
 
@@ -32,251 +26,93 @@ void fmt_class_string<CellAudioOutError>::format(std::string& out, u64 arg)
 	});
 }
 
-audio_out_configuration::audio_out_configuration()
-{
-	audio_out& primary_output = ::at32(out, CELL_AUDIO_OUT_PRIMARY);
-	audio_out& secondary_output = ::at32(out, CELL_AUDIO_OUT_SECONDARY);
-
-	std::vector<CellAudioOutSoundMode>& primary_modes = primary_output.sound_modes;
-	std::vector<CellAudioOutSoundMode>& secondary_modes = secondary_output.sound_modes;
-
-	const psf::registry sfo = psf::load_object(Emu.GetSfoDir(true) + "/PARAM.SFO");
-	const s32 sound_format = psf::get_integer(sfo, "SOUND_FORMAT", psf::sound_format_flag::lpcm_2); // Default to Linear PCM 2 Ch.
-
-	const bool supports_lpcm_2   = (sound_format & psf::sound_format_flag::lpcm_2);   // Linear PCM 2 Ch.
-	const bool supports_lpcm_5_1 = (sound_format & psf::sound_format_flag::lpcm_5_1); // Linear PCM 5.1 Ch.
-	const bool supports_lpcm_7_1 = (sound_format & psf::sound_format_flag::lpcm_7_1); // Linear PCM 7.1 Ch.
-	const bool supports_ac3      = (sound_format & psf::sound_format_flag::ac3);      // Dolby Digital 5.1 Ch.
-	const bool supports_dts      = (sound_format & psf::sound_format_flag::dts);      // DTS 5.1 Ch.
-
-	if (supports_lpcm_2)   cellSysutil.notice("cellAudioOut: found support for Linear PCM 2 Ch.");
-	if (supports_lpcm_5_1) cellSysutil.notice("cellAudioOut: found support for Linear PCM 5.1 Ch.");
-	if (supports_lpcm_7_1) cellSysutil.notice("cellAudioOut: found support for Linear PCM 7.1 Ch.");
-	if (supports_ac3)      cellSysutil.notice("cellAudioOut: found support for Dolby Digital 5.1 Ch.");
-	if (supports_dts)      cellSysutil.notice("cellAudioOut: found support for DTS 5.1 Ch.");
-
-	std::array<bool, 2> initial_mode_selected = {};
-
-	const auto add_sound_mode = [&](u32 index, u8 type, u8 channel, u8 fs, u32 layout, bool supported)
-	{
-		audio_out& output = ::at32(out, index);
-		bool& selected = ::at32(initial_mode_selected, index);
-
-		CellAudioOutSoundMode mode{};
-		mode.type = type;
-		mode.channel = channel;
-		mode.fs = fs;
-		mode.layout = layout;
-		output.sound_modes.push_back(std::move(mode));
-
-		if (!selected && supported)
-		{
-			// Pre-select the first available sound mode
-			output.channels = channel;
-			output.encoder  = type;
-			output.sound_mode = output.sound_modes.back();
-
-			selected = true;
-		}
-	};
-
-	// TODO: more formats:
-	// - Each LPCM with other sample frequencies (we currently only support 48 kHz)
-	// - AAC
-	// - Dolby Digital Plus
-	// - Dolby TrueHD
-	// - DTS-HD High Resolution Audio
-	// - DTS-HD Master Audio
-	// - ...
-	switch (g_cfg.audio.format)
-	{
-	case audio_format::stereo:
-	{
-		break; // Already added by default
-	}
-	case audio_format::surround_7_1:
-	{
-		// Linear PCM 7.1 Ch. 48 kHz
-		add_sound_mode(CELL_AUDIO_OUT_PRIMARY, CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_8, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy, supports_lpcm_7_1);
-		[[fallthrough]]; // Also add all available 5.1 formats in case the game doesn't like 7.1
-	}
-	case audio_format::surround_5_1:
-	{
-		// Linear PCM 5.1 Ch. 48 kHz
-		add_sound_mode(CELL_AUDIO_OUT_PRIMARY, CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr, supports_lpcm_5_1);
-
-		// Dolby Digital 5.1 Ch.
-		add_sound_mode(CELL_AUDIO_OUT_PRIMARY, CELL_AUDIO_OUT_CODING_TYPE_AC3, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr, supports_ac3);
-
-		// DTS 5.1 Ch.
-		add_sound_mode(CELL_AUDIO_OUT_PRIMARY, CELL_AUDIO_OUT_CODING_TYPE_DTS, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr, supports_dts);
-		break;
-	}
-	case audio_format::automatic: // Automatic based on supported formats
-	{
-		if (supports_lpcm_7_1) // Linear PCM 7.1 Ch.
-		{
-			add_sound_mode(CELL_AUDIO_OUT_PRIMARY, CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_8, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy, supports_lpcm_7_1);
-		}
-
-		if (supports_lpcm_5_1) // Linear PCM 5.1 Ch.
-		{
-			add_sound_mode(CELL_AUDIO_OUT_PRIMARY, CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr, supports_lpcm_5_1);
-		}
-
-		if (supports_ac3) // Dolby Digital 5.1 Ch.
-		{
-			add_sound_mode(CELL_AUDIO_OUT_PRIMARY, CELL_AUDIO_OUT_CODING_TYPE_AC3, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr, supports_ac3);
-		}
-
-		if (supports_dts) // DTS 5.1 Ch.
-		{
-			add_sound_mode(CELL_AUDIO_OUT_PRIMARY, CELL_AUDIO_OUT_CODING_TYPE_DTS, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr, supports_dts);
-		}
-
-		break;
-	}
-	case audio_format::manual: // Manual based on selected formats
-	{
-		const u32 selected_formats = g_cfg.audio.formats;
-
-		if (selected_formats & static_cast<u32>(audio_format_flag::lpcm_7_1_48khz)) // Linear PCM 7.1 Ch. 48 kHz
-			add_sound_mode(CELL_AUDIO_OUT_PRIMARY, CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_8, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy, supports_lpcm_7_1);
-
-		if (selected_formats & static_cast<u32>(audio_format_flag::lpcm_5_1_48khz)) // Linear PCM 5.1 Ch. 48 kHz
-			add_sound_mode(CELL_AUDIO_OUT_PRIMARY, CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr, supports_lpcm_5_1);
-
-		if (selected_formats & static_cast<u32>(audio_format_flag::ac3)) // Dolby Digital 5.1 Ch.
-			add_sound_mode(CELL_AUDIO_OUT_PRIMARY, CELL_AUDIO_OUT_CODING_TYPE_AC3, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr, supports_ac3);
-
-		if (selected_formats & static_cast<u32>(audio_format_flag::dts)) // DTS 5.1 Ch.
-			add_sound_mode(CELL_AUDIO_OUT_PRIMARY, CELL_AUDIO_OUT_CODING_TYPE_DTS, CELL_AUDIO_OUT_CHNUM_6, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr, supports_dts);
-
-		break;
-	}
-	}
-
-	// Always add Linear PCM 2 Ch. to the primary output
-	add_sound_mode(CELL_AUDIO_OUT_PRIMARY, CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_2, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH, true);
-
-	// The secondary output only supports Linear PCM 2 Ch.
-	add_sound_mode(CELL_AUDIO_OUT_SECONDARY, CELL_AUDIO_OUT_CODING_TYPE_LPCM, CELL_AUDIO_OUT_CHNUM_2, CELL_AUDIO_OUT_FS_48KHZ, CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH, true);
-
-	ensure(!primary_modes.empty() && ::at32(initial_mode_selected, CELL_AUDIO_OUT_PRIMARY));
-	ensure(!secondary_modes.empty() && ::at32(initial_mode_selected, CELL_AUDIO_OUT_SECONDARY));
-
-	for (const CellAudioOutSoundMode& mode : primary_modes)
-	{
-		cellSysutil.notice("cellAudioOut: added primary mode: type=%d, channel=%d, fs=%d, layout=%d", mode.type, mode.channel, mode.fs, mode.layout);
-	}
-
-	for (const CellAudioOutSoundMode& mode : secondary_modes)
-	{
-		cellSysutil.notice("cellAudioOut: added secondary mode: type=%d, channel=%d, fs=%d, layout=%d", mode.type, mode.channel, mode.fs, mode.layout);
-	}
-
-	cellSysutil.notice("cellAudioOut: initial primary output configuration: channels=%d, encoder=%d, downmixer=%d", primary_output.channels, primary_output.encoder, primary_output.downmixer);
-	cellSysutil.notice("cellAudioOut: initial secondary output configuration: channels=%d, encoder=%d, downmixer=%d", secondary_output.channels, secondary_output.encoder, secondary_output.downmixer);
-}
-
-audio_out_configuration::audio_out_configuration(utils::serial& ar)
-	: audio_out_configuration()
-{
-	// Load configuartion (ar is reading)
-	save(ar);
-}
-
-void audio_out_configuration::save(utils::serial& ar)
-{
-	GET_OR_USE_SERIALIZATION_VERSION(ar.is_writing(), cellAudioOut);
-
-	for (auto& state : out)
-	{
-		ar(state.state, state.channels, state.encoder, state.downmixer, state.copy_control, state.sound_modes, state.sound_mode);
-	}
-}
-
-std::pair<AudioChannelCnt, AudioChannelCnt> audio_out_configuration::audio_out::get_channel_count_and_downmixer() const
-{
-	std::pair<AudioChannelCnt, AudioChannelCnt> ret;
-
-	switch (sound_mode.channel)
-	{
-	case 2: ret.first = AudioChannelCnt::STEREO; break;
-	case 6: ret.first = AudioChannelCnt::SURROUND_5_1; break;
-	case 8: ret.first = AudioChannelCnt::SURROUND_7_1; break;
-	default:
-		fmt::throw_exception("Unsupported channel count in cellAudioOut sound_mode: %d", sound_mode.channel);
-	}
-
-	switch (downmixer)
-	{
-	case CELL_AUDIO_OUT_DOWNMIXER_NONE: ret.second = AudioChannelCnt::SURROUND_7_1; break;
-	case CELL_AUDIO_OUT_DOWNMIXER_TYPE_A: ret.second = AudioChannelCnt::STEREO; break;
-	case CELL_AUDIO_OUT_DOWNMIXER_TYPE_B: ret.second = AudioChannelCnt::SURROUND_5_1; break;
-	default:
-		fmt::throw_exception("Unsupported downmixer in cellAudioOut config: %d", downmixer);
-	}
-
-	return ret;
-}
-
 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);
 
+	s32 available = 8; // should be at least 2
+
+	switch (fs)
+	{
+	case CELL_AUDIO_OUT_FS_32KHZ:
+	case CELL_AUDIO_OUT_FS_44KHZ:
+	case CELL_AUDIO_OUT_FS_48KHZ:
+	case CELL_AUDIO_OUT_FS_88KHZ:
+	case CELL_AUDIO_OUT_FS_96KHZ:
+	case CELL_AUDIO_OUT_FS_176KHZ:
+	case CELL_AUDIO_OUT_FS_192KHZ:
+		break;
+
+	default: return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_SOUND_MODE;
+	}
+
+	switch (type)
+	{
+	case CELL_AUDIO_OUT_CODING_TYPE_LPCM: break;
+	case CELL_AUDIO_OUT_CODING_TYPE_AC3: available = 0; break;
+	case CELL_AUDIO_OUT_CODING_TYPE_DTS: available = 0; break;
+
+	default: return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_SOUND_MODE;
+	}
+
 	switch (audioOut)
 	{
-	case CELL_AUDIO_OUT_PRIMARY: break;
-	// case CELL_AUDIO_OUT_SECONDARY: break; // TODO: enable if we ever actually support peripheral output
-	default: return not_an_error(0);
+	case CELL_AUDIO_OUT_PRIMARY: return not_an_error(available);
+	case CELL_AUDIO_OUT_SECONDARY: return not_an_error(0);
 	}
 
-	s32 available = 0;
-
-	// Check if the requested audio parameters are available and find the max supported channel count
-	audio_out_configuration& cfg = g_fxo->get<audio_out_configuration>();
-	std::lock_guard lock(cfg.mtx);
-	const audio_out_configuration::audio_out& out = ::at32(cfg.out, audioOut);
-
-	for (const CellAudioOutSoundMode& mode : out.sound_modes)
-	{
-		if (mode.type == type && static_cast<u32>(mode.fs) == fs)
-		{
-			available = std::max<u32>(available, mode.channel);
-		}
-	}
-
-	return not_an_error(available);
+	return CELL_AUDIO_OUT_ERROR_ILLEGAL_CONFIGURATION;
 }
 
 error_code cellAudioOutGetSoundAvailability2(u32 audioOut, u32 type, u32 fs, u32 ch, u32 option)
 {
 	cellSysutil.warning("cellAudioOutGetSoundAvailability2(audioOut=%d, type=%d, fs=0x%x, ch=%d, option=%d)", audioOut, type, fs, ch, option);
 
+	s32 available = 8; // should be at least 2
+
+	switch (fs)
+	{
+	case CELL_AUDIO_OUT_FS_32KHZ:
+	case CELL_AUDIO_OUT_FS_44KHZ:
+	case CELL_AUDIO_OUT_FS_48KHZ:
+	case CELL_AUDIO_OUT_FS_88KHZ:
+	case CELL_AUDIO_OUT_FS_96KHZ:
+	case CELL_AUDIO_OUT_FS_176KHZ:
+	case CELL_AUDIO_OUT_FS_192KHZ:
+		break;
+
+	default: return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_SOUND_MODE;
+	}
+
+	switch (ch)
+	{
+	case 2: break;
+	case 6: available = 0; break;
+	case 8: available = 0; break;
+
+	default: return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_SOUND_MODE;
+	}
+
+	switch (type)
+	{
+	case CELL_AUDIO_OUT_CODING_TYPE_LPCM: break;
+	case CELL_AUDIO_OUT_CODING_TYPE_AC3: available = 0; break;
+	case CELL_AUDIO_OUT_CODING_TYPE_DTS: available = 0; break;
+
+	default: return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_SOUND_MODE;
+	}
+
 	switch (audioOut)
 	{
-	case CELL_AUDIO_OUT_PRIMARY: break;
-	// case CELL_AUDIO_OUT_SECONDARY: break; // TODO: enable if we ever actually support peripheral output
-	default: return not_an_error(0);
+	case CELL_AUDIO_OUT_PRIMARY: return not_an_error(available);
+	case CELL_AUDIO_OUT_SECONDARY: return not_an_error(0);
+	default:
+		break;
 	}
 
-	// Check if the requested audio parameters are available
-	audio_out_configuration& cfg = g_fxo->get<audio_out_configuration>();
-	std::lock_guard lock(cfg.mtx);
-	const audio_out_configuration::audio_out& out = ::at32(cfg.out, audioOut);
-
-	for (const CellAudioOutSoundMode& mode : out.sound_modes)
-	{
-		if (mode.type == type && static_cast<u32>(mode.fs) == fs && mode.channel == ch)
-		{
-			return not_an_error(ch);
-		}
-	}
-
-	return not_an_error(0);
+	return CELL_AUDIO_OUT_ERROR_ILLEGAL_CONFIGURATION;
 }
 
 error_code cellAudioOutGetState(u32 audioOut, u32 deviceIndex, vm::ptr<CellAudioOutState> state)
@@ -288,6 +124,7 @@ error_code cellAudioOutGetState(u32 audioOut, u32 deviceIndex, vm::ptr<CellAudio
 		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
 	}
 
+
 	const auto num = cellAudioOutGetNumberOfDevice(audioOut);
 
 	if (num < 0)
@@ -295,7 +132,8 @@ error_code cellAudioOutGetState(u32 audioOut, u32 deviceIndex, vm::ptr<CellAudio
 		return num;
 	}
 
-	CellAudioOutState _state{};
+	CellAudioOutState _state;
+	std::memset(&_state, 0, sizeof(_state));
 
 	if (deviceIndex >= num + 0u)
 	{
@@ -306,7 +144,7 @@ error_code cellAudioOutGetState(u32 audioOut, u32 deviceIndex, vm::ptr<CellAudio
 			// Although it was constant on my tests so let's write that
 			_state.state = 0x10;
 			_state.soundMode.layout = 0xD00C1680;
-			*state = _state;
+			std::memcpy(state.get_ptr(), &_state, state.size());
 			return CELL_OK;
 		}
 
@@ -318,21 +156,22 @@ error_code cellAudioOutGetState(u32 audioOut, u32 deviceIndex, vm::ptr<CellAudio
 	case CELL_AUDIO_OUT_PRIMARY:
 	case CELL_AUDIO_OUT_SECONDARY:
 	{
-		audio_out_configuration& cfg = g_fxo->get<audio_out_configuration>();
-		std::lock_guard lock(cfg.mtx);
-		const audio_out_configuration::audio_out& out = ::at32(cfg.out, audioOut);
-
-		_state.state = out.state;
-		_state.encoder = out.encoder;
-		_state.downMixer = out.downmixer;
-		_state.soundMode = out.sound_mode;
+		_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;
 	}
+
 	default:
 		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
 	}
 
-	*state = _state;
+	std::memcpy(state.get_ptr(), &_state, state.size());
 	return CELL_OK;
 }
 
@@ -348,90 +187,28 @@ error_code cellAudioOutConfigure(u32 audioOut, vm::ptr<CellAudioOutConfiguration
 	switch (audioOut)
 	{
 	case CELL_AUDIO_OUT_PRIMARY:
-		break;
+	{
+		if (config->channel)
+		{
+			//Emu.GetAudioManager().GetInfo().mode.channel = config->channel;
+		}
+
+		//Emu.GetAudioManager().GetInfo().mode.encoder = config->encoder;
+
+		if (config->downMixer)
+		{
+			//Emu.GetAudioManager().GetInfo().mode.downMixer = config->downMixer;
+		}
+
+		return CELL_OK;
+	}
+
 	case CELL_AUDIO_OUT_SECONDARY:
-		return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_AUDIO_OUT; // The secondary output only supports one format and can't be reconfigured
-	default:
-		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
+		return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_AUDIO_OUT;
+	default: break;
 	}
 
-	bool needs_reset = false;
-
-	audio_out_configuration& cfg = g_fxo->get<audio_out_configuration>();
-	{
-		std::lock_guard lock(cfg.mtx);
-
-		audio_out_configuration::audio_out& out = ::at32(cfg.out, audioOut);
-
-		// Apparently the set config does not necessarily have to exist in the list of sound modes.
-
-		if (out.channels != config->channel || out.encoder != config->encoder || out.downmixer != config->downMixer)
-		{
-			out.channels = config->channel;
-			out.encoder = config->encoder;
-
-			if (config->downMixer > CELL_AUDIO_OUT_DOWNMIXER_TYPE_B) // PS3 ignores invalid downMixer values and keeps the previous valid one instead
-			{
-				cellSysutil.warning("cellAudioOutConfigure: Invalid downmixing mode configured: %d. Keeping old mode: downMixer=%d",
-					config->downMixer, out.downmixer);
-			}
-			else
-			{
-				out.downmixer = config->downMixer;
-			}
-
-			// Try to find the best sound mode for this configuration
-			const auto it = std::find_if(out.sound_modes.cbegin(), out.sound_modes.cend(), [&out](const CellAudioOutSoundMode& mode)
-				{
-					return mode.type == out.encoder && mode.channel == out.channels;
-				});
-
-			if (it != out.sound_modes.cend())
-			{
-				out.sound_mode = *it;
-			}
-			else
-			{
-				cellSysutil.warning("cellAudioOutConfigure: Could not find an ideal sound mode for %d channel output. Keeping old mode: channels=%d, encoder=%d, fs=%d",
-					config->channel, out.sound_mode.channel, out.sound_mode.type, out.sound_mode.fs);
-			}
-
-			needs_reset = true;
-		}
-	}
-
-	if (needs_reset)
-	{
-		const auto reset_audio = [audioOut]() -> void
-		{
-			audio_out_configuration& cfg = g_fxo->get<audio_out_configuration>();
-			{
-				std::lock_guard lock(cfg.mtx);
-				::at32(cfg.out, audioOut).state = CELL_AUDIO_OUT_OUTPUT_STATE_DISABLED;
-			}
-
-			audio::configure_audio(true);
-			audio::configure_rsxaudio();
-
-			{
-				std::lock_guard lock(cfg.mtx);
-				::at32(cfg.out, audioOut).state = CELL_AUDIO_OUT_OUTPUT_STATE_ENABLED;
-			}
-		};
-
-		if (waitForEvent)
-		{
-			reset_audio();
-		}
-		else
-		{
-			Emu.CallFromMainThread(reset_audio);
-		}
-	}
-
-	cellSysutil.notice("cellAudioOutConfigure: channels=%d, encoder=%d, downMixer=%d", config->channel, config->encoder, config->downMixer);
-
-	return CELL_OK;
+	return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
 }
 
 error_code cellAudioOutGetConfiguration(u32 audioOut, vm::ptr<CellAudioOutConfiguration> config, vm::ptr<CellAudioOutOption> option)
@@ -443,29 +220,26 @@ error_code cellAudioOutGetConfiguration(u32 audioOut, vm::ptr<CellAudioOutConfig
 		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
 	}
 
+	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;
 		break;
+	}
+
 	case CELL_AUDIO_OUT_SECONDARY:
-		return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_AUDIO_OUT; // The secondary output only supports one format and can't be reconfigured
+		return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_AUDIO_OUT;
 	default:
 		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
 	}
 
-	audio_out_configuration& cfg = g_fxo->get<audio_out_configuration>();
-	std::lock_guard lock(cfg.mtx);
-
-	const audio_out_configuration::audio_out& out = ::at32(cfg.out, audioOut);
-
-	// Return the active config.
-	CellAudioOutConfiguration _config{};
-	_config.channel   = out.channels;
-	_config.encoder   = out.encoder;
-	_config.downMixer = out.downmixer;
-
-	*config = _config;
-
+	std::memcpy(config.get_ptr(), &_config, config.size());
 	return CELL_OK;
 }
 
@@ -507,31 +281,30 @@ error_code cellAudioOutGetDeviceInfo(u32 audioOut, u32 deviceIndex, vm::ptr<Cell
 		if (audioOut == CELL_AUDIO_OUT_SECONDARY)
 		{
 			// Error codes are not returned here
-			*info = {};
+			std::memset(info.get_ptr(), 0, info.size());
 			return CELL_OK;
 		}
 
 		return CELL_AUDIO_OUT_ERROR_PARAMETER_OUT_OF_RANGE;
 	}
 
-	audio_out_configuration& cfg = g_fxo->get<audio_out_configuration>();
-	std::lock_guard lock(cfg.mtx);
-	const audio_out_configuration::audio_out& out = ::at32(cfg.out, audioOut);
-	ensure(out.sound_modes.size() <= 16);
-
-	CellAudioOutDeviceInfo _info{};
+	CellAudioOutDeviceInfo _info;
+	std::memset(&_info, 0, sizeof(_info));
 
 	_info.portType = CELL_AUDIO_OUT_PORT_HDMI;
-	_info.availableModeCount = ::narrow<u8>(out.sound_modes.size());
+	_info.availableModeCount = 2;
 	_info.state = CELL_AUDIO_OUT_DEVICE_STATE_AVAILABLE;
-	_info.latency = 13;
+	_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;
 
-	for (usz i = 0; i < out.sound_modes.size(); i++)
-	{
-		_info.availableModes[i] = ::at32(out.sound_modes, i);
-	}
-
-	*info = _info;
+	std::memcpy(info.get_ptr(), &_info, info.size());
 	return CELL_OK;
 }
 
@@ -549,28 +322,23 @@ error_code cellAudioOutSetCopyControl(u32 audioOut, u32 control)
 	case CELL_AUDIO_OUT_PRIMARY:
 		break;
 	case CELL_AUDIO_OUT_SECONDARY:
-		return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_AUDIO_OUT; // TODO: enable if we ever actually support peripheral output
+		return CELL_AUDIO_OUT_ERROR_UNSUPPORTED_AUDIO_OUT;
 	default:
 		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
 	}
 
-	audio_out_configuration& cfg = g_fxo->get<audio_out_configuration>();
-	std::lock_guard lock(cfg.mtx);
-
-	::at32(cfg.out, audioOut).copy_control = control;
-
 	return CELL_OK;
 }
 
-error_code cellAudioOutRegisterCallback(u32 slot, vm::ptr<CellAudioOutCallback> function, vm::ptr<void> userData)
+error_code cellAudioOutRegisterCallback()
 {
-	cellSysutil.todo("cellAudioOutRegisterCallback(slot=%d, function=*0x%x, userData=*0x%x)", slot, function, userData);
+	cellSysutil.todo("cellAudioOutRegisterCallback()");
 	return CELL_OK;
 }
 
-error_code cellAudioOutUnregisterCallback(u32 slot)
+error_code cellAudioOutUnregisterCallback()
 {
-	cellSysutil.todo("cellAudioOutUnregisterCallback(slot=%d)", slot);
+	cellSysutil.todo("cellAudioOutUnregisterCallback()");
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellAudioOut.h b/rpcs3/Emu/Cell/Modules/cellAudioOut.h
index 6e829253bc..22ef3e09e3 100644
--- a/rpcs3/Emu/Cell/Modules/cellAudioOut.h
+++ b/rpcs3/Emu/Cell/Modules/cellAudioOut.h
@@ -1,10 +1,7 @@
 #pragma once
 
-#include "Emu/Audio/AudioBackend.h"
-#include "Emu/Memory/vm_ptr.h"
-
 // Error codes
-enum CellAudioOutError : u32
+enum CellAudioOutError
 {
 	CELL_AUDIO_OUT_ERROR_NOT_IMPLEMENTED        = 0x8002b240,
 	CELL_AUDIO_OUT_ERROR_ILLEGAL_CONFIGURATION  = 0x8002b241,
@@ -16,6 +13,7 @@ enum CellAudioOutError : u32
 	CELL_AUDIO_OUT_ERROR_CONDITION_BUSY         = 0x8002b247,
 };
 
+
 enum CellAudioOut
 {
 	CELL_AUDIO_OUT_PRIMARY   = 0,
@@ -69,10 +67,8 @@ enum CellAudioOutCodingType
 	CELL_AUDIO_OUT_CODING_TYPE_AAC                = 5,
 	CELL_AUDIO_OUT_CODING_TYPE_DTS                = 6,
 	CELL_AUDIO_OUT_CODING_TYPE_ATRAC              = 7,
-	CELL_AUDIO_OUT_CODING_TYPE_DOLBY_TRUE_HD      = 8, // Speculative name
+	// ...
 	CELL_AUDIO_OUT_CODING_TYPE_DOLBY_DIGITAL_PLUS = 9,
-	CELL_AUDIO_OUT_CODING_TYPE_DTS_HD_HIGHRES     = 10, // Speculative name
-	CELL_AUDIO_OUT_CODING_TYPE_DTS_HD_MASTER      = 11, // Speculative name
 	CELL_AUDIO_OUT_CODING_TYPE_BITSTREAM          = 0xff,
 };
 
@@ -135,8 +131,6 @@ struct CellAudioOutSoundMode
 	u8 fs;
 	u8 reserved;
 	be_t<u32> layout;
-
-	ENABLE_BITWISE_SERIALIZATION;
 };
 
 struct CellAudioOutDeviceInfo
@@ -181,46 +175,15 @@ struct CellAudioOutDeviceInfo2
 
 struct CellAudioOutOption
 {
-	be_t<u32> reserved;
+	//(Omitted)
 };
 
 struct CellAudioOutRegistrationOption
 {
-	be_t<u32> reserved;
+	//(Omitted)
 };
 
 struct CellAudioOutDeviceConfiguration
 {
-	u8 volume;
-	u8 reserved[31];
-};
-
-typedef s32(CellAudioOutCallback)(u32 slot, u32 audioOut, u32 deviceIndex, u32 event, vm::ptr<CellAudioOutDeviceInfo> info, vm::ptr<void> userData);
-
-
-// FXO Object
-
-struct audio_out_configuration
-{
-	shared_mutex mtx;
-
-	struct audio_out
-	{
-		u32 state = CELL_AUDIO_OUT_OUTPUT_STATE_ENABLED;
-		u32 channels = CELL_AUDIO_OUT_CHNUM_2;
-		u32 encoder = CELL_AUDIO_OUT_CODING_TYPE_LPCM;
-		u32 downmixer = CELL_AUDIO_OUT_DOWNMIXER_NONE;
-		u32 copy_control = CELL_AUDIO_OUT_COPY_CONTROL_COPY_FREE;
-		std::vector<CellAudioOutSoundMode> sound_modes;
-		CellAudioOutSoundMode sound_mode{};
-
-		std::pair<AudioChannelCnt, AudioChannelCnt> get_channel_count_and_downmixer() const;
-	};
-
-	std::array<audio_out, 2> out;
-
-	SAVESTATE_INIT_POS(8.9); // Is a dependency of cellAudio
-	audio_out_configuration();
-	audio_out_configuration(utils::serial& ar);
-	void save(utils::serial& ar);
+	//(Omitted)
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp b/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp
index b4508ada5b..05a6b9d06f 100644
--- a/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp
@@ -5,13 +5,10 @@
 #include "Emu/RSX/rsx_utils.h"
 #include "Utilities/StrUtil.h"
 
-#include "cellMic.h"
 #include "cellAudioIn.h"
 #include "cellAudioOut.h"
 #include "cellVideoOut.h"
 
-#include <optional>
-
 LOG_CHANNEL(cellAvconfExt);
 
 template<>
@@ -37,18 +34,9 @@ void fmt_class_string<CellAudioInError>::format(std::string& out, u64 arg)
 
 struct avconf_manager
 {
-	shared_mutex mutex;
+	std::vector<CellAudioInDeviceInfo> devices;
 
-	struct device_info
-	{
-		CellAudioInDeviceInfo info {};
-		std::string full_device_name; // The device name may be too long for CellAudioInDeviceInfo, so we additionally save the full name.
-	};
-	std::vector<device_info> devices;
-	CellAudioInDeviceMode inDeviceMode = CELL_AUDIO_IN_SINGLE_DEVICE_MODE; // TODO: use somewhere
-
-	void copy_device_info(u32 num, vm::ptr<CellAudioInDeviceInfo> info) const;
-	std::optional<device_info> get_device_info(vm::cptr<char> name) const;
+	void copy_device_info(u32 num, vm::ptr<CellAudioInDeviceInfo> info);
 
 	avconf_manager();
 
@@ -61,118 +49,102 @@ avconf_manager::avconf_manager()
 {
 	u32 curindex = 0;
 
-	const std::vector<std::string> mic_list = fmt::split(g_cfg.audio.microphone_devices.to_string(), {"@@@"});
-
+	auto mic_list = fmt::split(g_cfg.audio.microphone_devices.to_string(), {"@@@"});
 	if (!mic_list.empty())
 	{
 		switch (g_cfg.audio.microphone_type)
 		{
 		case microphone_handler::standard:
-		{
 			for (u32 index = 0; index < mic_list.size(); index++)
 			{
-				device_info device {};
-				device.info.portType                  = CELL_AUDIO_IN_PORT_USB;
-				device.info.availableModeCount        = 1;
-				device.info.state                     = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE;
-				device.info.deviceId                  = 0xE11CC0DE + curindex;
-				device.info.type                      = 0xC0DEE11C;
-				device.info.availableModes[0].type    = CELL_AUDIO_IN_CODING_TYPE_LPCM;
-				device.info.availableModes[0].channel = CELL_AUDIO_IN_CHNUM_2;
-				device.info.availableModes[0].fs      = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ;
-				device.info.deviceNumber              = curindex;
-				device.full_device_name               = mic_list[index];
-				strcpy_trunc(device.info.name, device.full_device_name);
+				devices.emplace_back();
+
+				devices[curindex].portType                  = CELL_AUDIO_IN_PORT_USB;
+				devices[curindex].availableModeCount        = 1;
+				devices[curindex].state                     = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE;
+				devices[curindex].deviceId                  = 0xE11CC0DE + curindex;
+				devices[curindex].type                      = 0xC0DEE11C;
+				devices[curindex].availableModes[0].type    = CELL_AUDIO_IN_CODING_TYPE_LPCM;
+				devices[curindex].availableModes[0].channel = CELL_AUDIO_IN_CHNUM_2;
+				devices[curindex].availableModes[0].fs      = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ;
+				devices[curindex].deviceNumber              = curindex;
+				strcpy_trunc(devices[curindex].name, mic_list[index]);
 
-				devices.push_back(std::move(device));
 				curindex++;
 			}
 			break;
-		}
 		case microphone_handler::real_singstar:
 		case microphone_handler::singstar:
-		{
 			// Only one device for singstar device
-			device_info device {};
-			device.info.portType                  = CELL_AUDIO_IN_PORT_USB;
-			device.info.availableModeCount        = 1;
-			device.info.state                     = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE;
-			device.info.deviceId                  = 0x00000001;
-			device.info.type                      = 0x14150000;
-			device.info.availableModes[0].type    = CELL_AUDIO_IN_CODING_TYPE_LPCM;
-			device.info.availableModes[0].channel = CELL_AUDIO_IN_CHNUM_2;
-			device.info.availableModes[0].fs      = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ;
-			device.info.deviceNumber              = curindex;
-			device.full_device_name               = mic_list[0];
-			strcpy_trunc(device.info.name, device.full_device_name);
+			devices.emplace_back();
+
+			devices[curindex].portType                  = CELL_AUDIO_IN_PORT_USB;
+			devices[curindex].availableModeCount        = 1;
+			devices[curindex].state                     = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE;
+			devices[curindex].deviceId                  = 0x57A3C0DE;
+			devices[curindex].type                      = 0xC0DE57A3;
+			devices[curindex].availableModes[0].type    = CELL_AUDIO_IN_CODING_TYPE_LPCM;
+			devices[curindex].availableModes[0].channel = CELL_AUDIO_IN_CHNUM_2;
+			devices[curindex].availableModes[0].fs      = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ;
+			devices[curindex].deviceNumber              = curindex;
+			strcpy_trunc(devices[curindex].name, mic_list[0]);
 
-			devices.push_back(std::move(device));
 			curindex++;
 			break;
-		}
 		case microphone_handler::rocksmith:
-		{
-			device_info device {};
-			device.info.portType                  = CELL_AUDIO_IN_PORT_USB;
-			device.info.availableModeCount        = 1;
-			device.info.state                     = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE;
-			device.info.deviceId                  = 0x12BA00FF; // Specific to rocksmith usb input
-			device.info.type                      = 0xC0DE73C4;
-			device.info.availableModes[0].type    = CELL_AUDIO_IN_CODING_TYPE_LPCM;
-			device.info.availableModes[0].channel = CELL_AUDIO_IN_CHNUM_1;
-			device.info.availableModes[0].fs      = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ;
-			device.info.deviceNumber              = curindex;
-			device.full_device_name               = mic_list[0];
-			strcpy_trunc(device.info.name, device.full_device_name);
+			devices.emplace_back();
+
+			devices[curindex].portType                  = CELL_AUDIO_IN_PORT_USB;
+			devices[curindex].availableModeCount        = 1;
+			devices[curindex].state                     = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE;
+			devices[curindex].deviceId                  = 0x12BA00FF; // Specific to rocksmith usb input
+			devices[curindex].type                      = 0xC0DE73C4;
+			devices[curindex].availableModes[0].type    = CELL_AUDIO_IN_CODING_TYPE_LPCM;
+			devices[curindex].availableModes[0].channel = CELL_AUDIO_IN_CHNUM_1;
+			devices[curindex].availableModes[0].fs      = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ;
+			devices[curindex].deviceNumber              = curindex;
+			strcpy_trunc(devices[curindex].name, mic_list[0]);
 
-			devices.push_back(std::move(device));
 			curindex++;
 			break;
-		}
 		case microphone_handler::null:
-		default:
-			break;
+		default: break;
 		}
 	}
 
 	if (g_cfg.io.camera != camera_handler::null)
 	{
-		device_info device {};
-		device.info.portType                  = CELL_AUDIO_IN_PORT_USB;
-		device.info.availableModeCount        = 1;
-		device.info.state                     = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE;
-		device.info.deviceId                  = 0xDEADBEEF;
-		device.info.type                      = 0xBEEFDEAD;
-		device.info.availableModes[0].type    = CELL_AUDIO_IN_CODING_TYPE_LPCM;
-		device.info.availableModes[0].channel = CELL_AUDIO_IN_CHNUM_NONE;
-		device.info.availableModes[0].fs      = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ;
-		device.info.deviceNumber              = curindex;
-		device.full_device_name               = "USB Camera";
-		strcpy_trunc(device.info.name, device.full_device_name);
+		devices.emplace_back();
+
+		devices[curindex].portType                  = CELL_AUDIO_IN_PORT_USB;
+		devices[curindex].availableModeCount        = 1;
+		devices[curindex].state                     = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE;
+		devices[curindex].deviceId                  = 0xDEADBEEF;
+		devices[curindex].type                      = 0xBEEFDEAD;
+		devices[curindex].availableModes[0].type    = CELL_AUDIO_IN_CODING_TYPE_LPCM;
+		devices[curindex].availableModes[0].channel = CELL_AUDIO_IN_CHNUM_NONE;
+		devices[curindex].availableModes[0].fs      = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ;
+		devices[curindex].deviceNumber              = curindex;
+		strcpy_trunc(devices[curindex].name, "USB Camera");
 
-		devices.push_back(std::move(device));
 		curindex++;
 	}
 }
 
-void avconf_manager::copy_device_info(u32 num, vm::ptr<CellAudioInDeviceInfo> info) const
+void avconf_manager::copy_device_info(u32 num, vm::ptr<CellAudioInDeviceInfo> info)
 {
 	memset(info.get_ptr(), 0, sizeof(CellAudioInDeviceInfo));
-	ensure(num < devices.size());
-	*info = devices[num].info;
-}
 
-std::optional<avconf_manager::device_info> avconf_manager::get_device_info(vm::cptr<char> name) const
-{
-	for (const device_info& device : devices)
-	{
-		if (strncmp(device.info.name, name.get_ptr(), sizeof(device.info.name)) == 0)
-		{
-			return device;
-		}
-	}
-
-	return std::nullopt;
+	info->portType                  = devices[num].portType;
+	info->availableModeCount        = devices[num].availableModeCount;
+	info->state                     = devices[num].state;
+	info->deviceId                  = devices[num].deviceId;
+	info->type                      = devices[num].type;
+	info->availableModes[0].type    = devices[num].availableModes[0].type;
+	info->availableModes[0].channel = devices[num].availableModes[0].channel;
+	info->availableModes[0].fs      = devices[num].availableModes[0].fs;
+	info->deviceNumber              = devices[num].deviceNumber;
+	strcpy_trunc(info->name, devices[num].name);
 }
 
 error_code cellAudioOutUnregisterDevice(u32 deviceNumber)
@@ -184,42 +156,24 @@ error_code cellAudioOutUnregisterDevice(u32 deviceNumber)
 error_code cellAudioOutGetDeviceInfo2(u32 deviceNumber, u32 deviceIndex, vm::ptr<CellAudioOutDeviceInfo2> info)
 {
 	cellAvconfExt.todo("cellAudioOutGetDeviceInfo2(deviceNumber=0x%x, deviceIndex=0x%x, info=*0x%x)", deviceNumber, deviceIndex, info);
-
-	if (deviceIndex != 0 || !info)
-	{
-		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
-	}
-
 	return CELL_OK;
 }
 
-error_code cellVideoOutSetXVColor(u32 unk1, u32 unk2, u32 unk3)
+error_code cellVideoOutSetXVColor()
 {
-	cellAvconfExt.todo("cellVideoOutSetXVColor(unk1=0x%x, unk2=0x%x, unk3=0x%x)", unk1, unk2, unk3);
-
-	if (unk1 != 0)
-	{
-		return CELL_VIDEO_OUT_ERROR_NOT_IMPLEMENTED;
-	}
-
+	UNIMPLEMENTED_FUNC(cellAvconfExt);
 	return CELL_OK;
 }
 
-error_code cellVideoOutSetupDisplay(u32 videoOut)
+error_code cellVideoOutSetupDisplay()
 {
-	cellAvconfExt.todo("cellVideoOutSetupDisplay(videoOut=%d)", videoOut);
-
-	if (videoOut != CELL_VIDEO_OUT_SECONDARY)
-	{
-		return CELL_VIDEO_OUT_ERROR_UNSUPPORTED_VIDEO_OUT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellAvconfExt);
 	return CELL_OK;
 }
 
 error_code cellAudioInGetDeviceInfo(u32 deviceNumber, u32 deviceIndex, vm::ptr<CellAudioInDeviceInfo> info)
 {
-	cellAvconfExt.trace("cellAudioInGetDeviceInfo(deviceNumber=0x%x, deviceIndex=0x%x, info=*0x%x)", deviceNumber, deviceIndex, info);
+	cellAvconfExt.todo("cellAudioInGetDeviceInfo(deviceNumber=0x%x, deviceIndex=0x%x, info=*0x%x)", deviceNumber, deviceIndex, info);
 
 	if (deviceIndex != 0 || !info)
 	{
@@ -227,7 +181,6 @@ error_code cellAudioInGetDeviceInfo(u32 deviceNumber, u32 deviceIndex, vm::ptr<C
 	}
 
 	auto& av_manager = g_fxo->get<avconf_manager>();
-	std::lock_guard lock(av_manager.mutex);
 
 	if (deviceNumber >= av_manager.devices.size())
 		return CELL_AUDIO_OUT_ERROR_DEVICE_NOT_FOUND;
@@ -237,103 +190,10 @@ error_code cellAudioInGetDeviceInfo(u32 deviceNumber, u32 deviceIndex, vm::ptr<C
 	return CELL_OK;
 }
 
-template <bool Is_Float, bool Range_Limited>
-void convert_cursor_color(const u8* src, u8* dst, s32 num, f32 gamma)
-{
-	for (s32 i = 0; i < num; i++, src += 4, dst += 4)
-	{
-		for (s32 c = 1; c < 4; c++)
-		{
-			if constexpr (Is_Float)
-			{
-				if constexpr (Range_Limited)
-				{
-					const f32 val = (src[c] / 255.0f) * 219.0f + 16.0f;
-					dst[c] = static_cast<u8>(val + 0.5f);
-				}
-				else
-				{
-					dst[c] = src[c];
-				}
-			}
-			else
-			{
-				f32 val = std::clamp(std::pow(src[c] / 255.0f, gamma), 0.0f, 1.0f);
-
-				if constexpr (Range_Limited)
-				{
-					val = val * 219.0f + 16.0f;
-				}
-				else
-				{
-					val *= 255.0f;
-				}
-
-				dst[c] = static_cast<u8>(val + 0.5f);
-			}
-		}
-	}
-}
-
 error_code cellVideoOutConvertCursorColor(u32 videoOut, s32 displaybuffer_format, f32 gamma, s32 source_buffer_format, vm::ptr<void> src_addr, vm::ptr<u32> dest_addr, s32 num)
 {
-	cellAvconfExt.warning("cellVideoOutConvertCursorColor(videoOut=%d, displaybuffer_format=0x%x, gamma=%f, source_buffer_format=0x%x, src_addr=*0x%x, dest_addr=*0x%x, num=0x%x)", videoOut,
+	cellAvconfExt.todo("cellVideoOutConvertCursorColor(videoOut=%d, displaybuffer_format=0x%x, gamma=0x%x, source_buffer_format=0x%x, src_addr=*0x%x, dest_addr=*0x%x, num=0x%x)", videoOut,
 			displaybuffer_format, gamma, source_buffer_format, src_addr, dest_addr, num);
-
-	if (!src_addr || !dest_addr)
-	{
-		return CELL_VIDEO_OUT_ERROR_ILLEGAL_PARAMETER;
-	}
-
-	if (displaybuffer_format < 0 ||
-		displaybuffer_format > CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_R16G16B16X16_FLOAT ||
-		source_buffer_format != CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8)
-	{
-		return CELL_VIDEO_OUT_ERROR_PARAMETER_OUT_OF_RANGE;
-	}
-
-	if (displaybuffer_format < CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_R16G16B16X16_FLOAT)
-	{
-		if (gamma < 0.8f || gamma > 1.2f)
-		{
-			return CELL_VIDEO_OUT_ERROR_PARAMETER_OUT_OF_RANGE;
-		}
-	}
-
-	error_code cellVideoOutGetConvertCursorColorInfo(vm::ptr<u8> rgbOutputRange); // Forward declaration
-
-	vm::var<u8> rgbOutputRange;
-	if (error_code error = cellVideoOutGetConvertCursorColorInfo(rgbOutputRange))
-	{
-		return error;
-	}
-
-	const u8* src = reinterpret_cast<const u8*>(src_addr.get_ptr());
-	u8* dst = reinterpret_cast<u8*>(dest_addr.get_ptr());
-
-	if (displaybuffer_format == CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_R16G16B16X16_FLOAT)
-	{
-		if (*rgbOutputRange == CELL_VIDEO_OUT_RGB_OUTPUT_RANGE_LIMITED)
-		{
-			convert_cursor_color<true, true>(src, dst, num, gamma);
-		}
-		else
-		{
-			convert_cursor_color<true, false>(src, dst, num, gamma);
-		}
-	}
-	else
-	{
-		if (*rgbOutputRange == CELL_VIDEO_OUT_RGB_OUTPUT_RANGE_LIMITED)
-		{
-			convert_cursor_color<false, true>(src, dst, num, gamma);
-		}
-		else
-		{
-			convert_cursor_color<false, false>(src, dst, num, gamma);
-		}
-	}
-
 	return CELL_OK;
 }
 
@@ -341,17 +201,12 @@ error_code cellVideoOutGetGamma(u32 videoOut, vm::ptr<f32> gamma)
 {
 	cellAvconfExt.warning("cellVideoOutGetGamma(videoOut=%d, gamma=*0x%x)", videoOut, gamma);
 
-	if (!gamma)
-	{
-		return CELL_VIDEO_OUT_ERROR_ILLEGAL_PARAMETER;
-	}
-
 	if (videoOut != CELL_VIDEO_OUT_PRIMARY)
 	{
 		return CELL_VIDEO_OUT_ERROR_UNSUPPORTED_VIDEO_OUT;
 	}
 
-	const auto& conf = g_fxo->get<rsx::avconf>();
+	auto& conf = g_fxo->get<rsx::avconf>();
 
 	*gamma = conf.gamma;
 
@@ -360,7 +215,7 @@ error_code cellVideoOutGetGamma(u32 videoOut, vm::ptr<f32> gamma)
 
 error_code cellAudioInGetAvailableDeviceInfo(u32 count, vm::ptr<CellAudioInDeviceInfo> device_info)
 {
-	cellAvconfExt.trace("cellAudioInGetAvailableDeviceInfo(count=%d, info=*0x%x)", count, device_info);
+	cellAvconfExt.todo("cellAudioInGetAvailableDeviceInfo(count=0x%x, info=*0x%x)", count, device_info);
 
 	if (count > 16 || !device_info)
 	{
@@ -368,7 +223,6 @@ error_code cellAudioInGetAvailableDeviceInfo(u32 count, vm::ptr<CellAudioInDevic
 	}
 
 	auto& av_manager = g_fxo->get<avconf_manager>();
-	std::lock_guard lock(av_manager.mutex);
 
 	u32 num_devices_returned = std::min<u32>(count, ::size32(av_manager.devices));
 
@@ -377,37 +231,22 @@ error_code cellAudioInGetAvailableDeviceInfo(u32 count, vm::ptr<CellAudioInDevic
 		av_manager.copy_device_info(index, device_info + index);
 	}
 
-	CellAudioInDeviceInfo disconnected_device{};
-	disconnected_device.state = CELL_AUDIO_OUT_DEVICE_STATE_UNAVAILABLE;
-	disconnected_device.deviceNumber = 0xff;
-
-	for (u32 index = num_devices_returned; index < count; index++)
-	{
-		device_info[index] = disconnected_device;
-	}
-
 	return not_an_error(num_devices_returned);
 }
 
 error_code cellAudioOutGetAvailableDeviceInfo(u32 count, vm::ptr<CellAudioOutDeviceInfo2> info)
 {
 	cellAvconfExt.todo("cellAudioOutGetAvailableDeviceInfo(count=0x%x, info=*0x%x)", count, info);
-
-	if (count > 16 || !info)
-	{
-		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
-	}
-
 	return not_an_error(0); // number of available devices
 }
 
 error_code cellVideoOutSetGamma(u32 videoOut, f32 gamma)
 {
-	cellAvconfExt.trace("cellVideoOutSetGamma(videoOut=%d, gamma=%f)", videoOut, gamma);
+	cellAvconfExt.warning("cellVideoOutSetGamma(videoOut=%d, gamma=%f)", videoOut, gamma);
 
-	if (gamma < 0.8f || gamma > 1.2f)
+	if (!(gamma >= 0.8f && gamma <= 1.2f))
 	{
-		return CELL_VIDEO_OUT_ERROR_PARAMETER_OUT_OF_RANGE;
+		return CELL_VIDEO_OUT_ERROR_ILLEGAL_PARAMETER;
 	}
 
 	if (videoOut != CELL_VIDEO_OUT_PRIMARY)
@@ -424,47 +263,18 @@ error_code cellVideoOutSetGamma(u32 videoOut, f32 gamma)
 error_code cellAudioOutRegisterDevice(u64 deviceType, vm::cptr<char> name, vm::ptr<CellAudioOutRegistrationOption> option, vm::ptr<CellAudioOutDeviceConfiguration> config)
 {
 	cellAvconfExt.todo("cellAudioOutRegisterDevice(deviceType=0x%llx, name=%s, option=*0x%x, config=*0x%x)", deviceType, name, option, config);
-
-	if (option || !name)
-	{
-		return CELL_AUDIO_IN_ERROR_ILLEGAL_PARAMETER; // Strange choice for an error
-	}
-
 	return not_an_error(0); // device number
 }
 
 error_code cellAudioOutSetDeviceMode(u32 deviceMode)
 {
 	cellAvconfExt.todo("cellAudioOutSetDeviceMode(deviceMode=0x%x)", deviceMode);
-
-	if (deviceMode > CELL_AUDIO_OUT_MULTI_DEVICE_MODE_2)
-	{
-		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
-	}
-
 	return CELL_OK;
 }
 
 error_code cellAudioInSetDeviceMode(u32 deviceMode)
 {
 	cellAvconfExt.todo("cellAudioInSetDeviceMode(deviceMode=0x%x)", deviceMode);
-
-	switch (deviceMode)
-	{
-	case CELL_AUDIO_IN_SINGLE_DEVICE_MODE:
-	case CELL_AUDIO_IN_MULTI_DEVICE_MODE:
-	case CELL_AUDIO_IN_MULTI_DEVICE_MODE_2:
-	case CELL_AUDIO_IN_MULTI_DEVICE_MODE_10:
-		break;
-	default:
-		return CELL_AUDIO_IN_ERROR_ILLEGAL_PARAMETER;
-	}
-
-	auto& av_manager = g_fxo->get<avconf_manager>();
-	std::lock_guard lock(av_manager.mutex);
-
-	av_manager.inDeviceMode = static_cast<CellAudioInDeviceMode>(deviceMode);
-
 	return CELL_OK;
 }
 
@@ -478,31 +288,12 @@ error_code cellAudioInRegisterDevice(u64 deviceType, vm::cptr<char> name, vm::pt
 		return CELL_AUDIO_IN_ERROR_ILLEGAL_PARAMETER;
 	}
 
-	auto& av_manager = g_fxo->get<avconf_manager>();
-	const std::lock_guard lock(av_manager.mutex);
-
-	std::optional<avconf_manager::device_info> device = av_manager.get_device_info(name);
-	if (!device)
-	{
-		// TODO
-		return CELL_AUDIO_IN_ERROR_DEVICE_NOT_FOUND;
-	}
-
-	auto& mic_thr = g_fxo->get<mic_thread>();
-	const std::lock_guard mic_lock(mic_thr.mutex);
-	const u32 device_number = mic_thr.register_device(device->full_device_name);
-
-	return not_an_error(device_number);
+	return not_an_error(0); // device number
 }
 
 error_code cellAudioInUnregisterDevice(u32 deviceNumber)
 {
 	cellAvconfExt.todo("cellAudioInUnregisterDevice(deviceNumber=0x%x)", deviceNumber);
-
-	auto& mic_thr = g_fxo->get<mic_thread>();
-	const std::lock_guard lock(mic_thr.mutex);
-	mic_thr.unregister_device(deviceNumber);
-
 	return CELL_OK;
 }
 
@@ -510,17 +301,12 @@ error_code cellVideoOutGetScreenSize(u32 videoOut, vm::ptr<f32> screenSize)
 {
 	cellAvconfExt.warning("cellVideoOutGetScreenSize(videoOut=%d, screenSize=*0x%x)", videoOut, screenSize);
 
-	if (!screenSize)
-	{
-		return CELL_VIDEO_OUT_ERROR_ILLEGAL_PARAMETER;
-	}
-
 	if (videoOut != CELL_VIDEO_OUT_PRIMARY)
 	{
 		return CELL_VIDEO_OUT_ERROR_UNSUPPORTED_VIDEO_OUT;
 	}
 
-	if (g_cfg.video.stereo_render_mode != stereo_render_mode_options::disabled)
+	if (g_cfg.video.enable_3d)
 	{
 		// Return Playstation 3D display value
 		// Some games call this function when 3D is enabled
@@ -543,53 +329,24 @@ error_code cellVideoOutGetScreenSize(u32 videoOut, vm::ptr<f32> screenSize)
 error_code cellVideoOutSetCopyControl(u32 videoOut, u32 control)
 {
 	cellAvconfExt.todo("cellVideoOutSetCopyControl(videoOut=%d, control=0x%x)", videoOut, control);
-
-	if (control > CELL_VIDEO_OUT_COPY_CONTROL_COPY_NEVER)
-	{
-		return CELL_VIDEO_OUT_ERROR_ILLEGAL_PARAMETER;
-	}
-
 	return CELL_OK;
 }
 
 error_code cellVideoOutConfigure2()
 {
 	cellAvconfExt.todo("cellVideoOutConfigure2()");
-
-	if (false) // TODO
-	{
-		return CELL_VIDEO_OUT_ERROR_ILLEGAL_PARAMETER;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_VIDEO_OUT_ERROR_PARAMETER_OUT_OF_RANGE;
-	}
-
 	return CELL_OK;
 }
 
 error_code cellAudioOutGetConfiguration2()
 {
 	cellAvconfExt.todo("cellAudioOutGetConfiguration2()");
-
-	if (false) // TODO
-	{
-		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
-	}
-
 	return CELL_OK;
 }
 
 error_code cellAudioOutConfigure2()
 {
 	cellAvconfExt.todo("cellAudioOutConfigure2()");
-
-	if (false) // TODO
-	{
-		return CELL_AUDIO_OUT_ERROR_ILLEGAL_PARAMETER;
-	}
-
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.cpp b/rpcs3/Emu/Cell/Modules/cellCamera.cpp
index 6fd923ad51..41d3d01298 100644
--- a/rpcs3/Emu/Cell/Modules/cellCamera.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellCamera.cpp
@@ -2,13 +2,9 @@
 #include "cellCamera.h"
 
 #include "Emu/System.h"
-#include "Emu/system_config.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_event.h"
 #include "Emu/IdManager.h"
-#include "Emu/Cell/timers.hpp"
-
-#include <cmath>
 
 LOG_CHANNEL(cellCamera);
 
@@ -40,26 +36,10 @@ void fmt_class_string<CellCameraError>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
-void fmt_class_string<CellCameraFormat>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](CellCameraFormat value)
-	{
-		switch (value)
-		{
-		STR_CASE(CELL_CAMERA_FORMAT_UNKNOWN);
-		STR_CASE(CELL_CAMERA_JPG);
-		STR_CASE(CELL_CAMERA_RAW8);
-		STR_CASE(CELL_CAMERA_YUV422);
-		STR_CASE(CELL_CAMERA_RAW10);
-		STR_CASE(CELL_CAMERA_RGBA);
-		STR_CASE(CELL_CAMERA_YUV420);
-		STR_CASE(CELL_CAMERA_V_Y1_U_Y0);
-		}
-
-		return unknown;
-	});
-}
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
 
 // **************
 // * Prototypes *
@@ -130,67 +110,12 @@ static const char* get_camera_attr_name(s32 value)
 	return nullptr;
 }
 
-camera_context::camera_context(utils::serial& ar)
-{
-	save(ar);
-}
-
-void camera_context::save(utils::serial& ar)
-{
-	ar(init);
-
-	if (!init)
-	{
-		return;
-	}
-
-	const s32 version = GET_OR_USE_SERIALIZATION_VERSION(ar.is_writing(), cellCamera);
-
-	ar(notify_data_map, start_timestamp_us, read_mode, is_streaming, is_attached, is_open, info, attr, frame_num);
-
-	if (ar.is_writing() || version >= 2)
-	{
-		ar(is_attached_dirty);
-	}
-
-	if (!ar.is_writing())
-	{
-		if (is_open)
-		{
-			if (!open_camera())
-			{
-				cellCamera.error("Failed to open camera while loading savestate");
-			}
-			else if (is_streaming && !start_camera())
-			{
-				cellCamera.error("Failed to start camera while loading savestate");
-			}
-		}
-	}
-}
-
-gem_camera_shared::gem_camera_shared(utils::serial& ar)
-{
-	save(ar);
-}
-
-void gem_camera_shared::save(utils::serial& ar)
-{
-	const s32 version = GET_OR_USE_SERIALIZATION_VERSION(ar.is_writing(), cellCamera);
-
-	if (ar.is_writing() || version >= 2)
-	{
-		ar(frame_timestamp_us, width, height, size, format);
-	}
-}
-
 static bool check_dev_num(s32 dev_num)
 {
 	return dev_num == 0;
 }
 
-template <typename VariantOfCellCameraInfo>
-static error_code check_camera_info(const VariantOfCellCameraInfo& info)
+static error_code check_camera_info(const CellCameraInfoEx& info)
 {
 	// TODO: I managed to get 0x80990004 once. :thonkang:
 
@@ -209,7 +134,7 @@ static error_code check_camera_info(const VariantOfCellCameraInfo& info)
 		return CELL_CAMERA_ERROR_BAD_FRAMERATE;
 	}
 
-	auto check_fps = [fps = info.framerate](std::initializer_list<s32> range)
+	auto check_fps = [fps = info.framerate](const std::vector<s32>& range)
 	{
 		return std::find(range.begin(), range.end(), fps) != range.end();
 	};
@@ -333,99 +258,19 @@ std::pair<u32, u32> get_video_resolution(const CellCameraInfoEx& info)
 	}
 }
 
-u32 get_buffer_size_by_format(s32 format, s32 width, s32 height)
-{
-	double bytes_per_pixel = 0.0;
-	switch (format)
-	{
-	case CELL_CAMERA_RAW8:
-		bytes_per_pixel = 1.0;
-		break;
-	case CELL_CAMERA_YUV422:
-		bytes_per_pixel = 2.0;
-		break;
-	case CELL_CAMERA_YUV420:
-	case CELL_CAMERA_V_Y1_U_Y0:
-		bytes_per_pixel = 1.5;
-		break;
-	case CELL_CAMERA_RAW10:
-		bytes_per_pixel = 1.25;
-		break;
-	case CELL_CAMERA_JPG:
-	case CELL_CAMERA_RGBA:
-	case CELL_CAMERA_FORMAT_UNKNOWN:
-	default:
-		bytes_per_pixel = 4.0;
-		break;
-	}
-
-	return ::narrow<u32>(static_cast<u64>(std::ceil(width * height * bytes_per_pixel)));
-}
-
-
 u32 get_video_buffer_size(const CellCameraInfoEx& info)
 {
 	u32 width, height;
 	std::tie(width, height) = get_video_resolution(info);
-	return get_buffer_size_by_format(info.format, width, height);
+
+	const auto bpp = 4;
+	return width * height * bpp;
 }
 
 // ************************
 // * cellCamera functions *
 // ************************
 
-// This represents 4 almost identical subfunctions used by the Start/Stop/Reset/Close functions
-error_code check_init_and_open(s32 dev_num)
-{
-	if (!check_dev_num(dev_num))
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-	// TODO: Yet another CELL_CAMERA_ERROR_BUSY
-
-	auto& g_camera = g_fxo->get<camera_thread>();
-
-	if (!g_camera.init)
-	{
-		return CELL_CAMERA_ERROR_NOT_INIT;
-	}
-	if (!g_camera.is_open)
-	{
-		return CELL_CAMERA_ERROR_NOT_OPEN;
-	}
-	return CELL_OK;
-}
-
-// This represents a recurring subfunction throughout libCamera
-error_code check_resolution(s32 /*dev_num*/)
-{
-	// TODO: Some sort of connection check maybe?
-	//if (error == CELL_CAMERA_ERROR_RESOLUTION_UNKNOWN)
-	//{
-	//	return CELL_CAMERA_ERROR_TIMEOUT;
-	//}
-	// TODO: Yet another CELL_CAMERA_ERROR_FATAL
-	return CELL_OK;
-}
-
-// This represents an often used sequence in libCamera (usually the beginning of a subfunction).
-// There also exist common sequences for mutex lock/unlock by the way.
-error_code check_resolution_ex(s32 dev_num)
-{
-	// TODO: Yet another CELL_CAMERA_ERROR_BUSY
-
-	if (!check_dev_num(dev_num))
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-	if (error_code error = check_resolution(dev_num))
-	{
-		return error;
-	}
-	return CELL_OK;
-}
-
-
 error_code cellCameraInit()
 {
 	cellCamera.todo("cellCameraInit()");
@@ -466,6 +311,7 @@ error_code cellCameraInit()
 		g_camera.attr[CELL_CAMERA_USBLOAD] = { 4 };
 		break;
 	}
+
 	case fake_camera_type::eyetoy2:
 	{
 		g_camera.attr[CELL_CAMERA_SATURATION] = { 64 };
@@ -485,21 +331,17 @@ error_code cellCameraInit()
 		g_camera.attr[CELL_CAMERA_AGCHIGH] = { 64 };
 		break;
 	}
-	case fake_camera_type::uvc1_1:
-	{
-		g_camera.attr[CELL_CAMERA_DEVICEID] = { 0x5ca, 0x18d0 }; // KBCR-S01MU
-		g_camera.attr[CELL_CAMERA_FORMATCAP] = { CELL_CAMERA_JPG | CELL_CAMERA_YUV422 };
-		g_camera.attr[CELL_CAMERA_NUMFRAME] = { 1 }; // Amount of supported resolutions
-		break;
-	}
 	default:
 		cellCamera.todo("Trying to init cellCamera with un-researched camera type.");
-		break;
 	}
 
 	// TODO: Some other default attributes? Need to check the actual behaviour on a real PS3.
 
-	g_camera.is_attached = g_cfg.io.camera != camera_handler::null;
+	if (g_cfg.io.camera == camera_handler::fake)
+	{
+		g_camera.is_attached = true;
+	}
+
 	g_camera.init = 1;
 	return CELL_OK;
 }
@@ -517,7 +359,11 @@ error_code cellCameraEnd()
 		return CELL_CAMERA_ERROR_NOT_INIT;
 	}
 
-	// TODO: call cellCameraClose(0), ignore errors
+	// TODO: My tests hinted to this behavior, but I'm not sure, so I'll leave this commented
+	//if (auto res = cellCameraClose(0))
+	//{
+	//	return res;
+	//}
 
 	// TODO
 	g_camera.init = 0;
@@ -525,42 +371,9 @@ error_code cellCameraEnd()
 	return CELL_OK;
 }
 
-error_code cellCameraOpen(s32 dev_num, vm::ptr<CellCameraInfo> info)
+error_code cellCameraOpen() // seems unused
 {
-	cellCamera.notice("cellCameraOpen(dev_num=%d, info=*0x%x)", dev_num, info);
-
-	if (!info)
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-
-	auto& g_camera = g_fxo->get<camera_thread>();
-
-	if (!g_camera.init)
-	{
-		return CELL_CAMERA_ERROR_NOT_INIT;
-	}
-
-	if (!check_dev_num(dev_num))
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-
-	if (g_camera.is_open)
-	{
-		return CELL_CAMERA_ERROR_ALREADY_OPEN;
-	}
-
-	if (auto res = check_camera_info(*info))
-	{
-		return res;
-	}
-
-	if (!g_camera.is_attached)
-	{
-		return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND;
-	}
-
+	UNIMPLEMENTED_FUNC(cellCamera);
 	return CELL_OK;
 }
 
@@ -572,7 +385,7 @@ error_code cellCameraOpenAsync()
 
 error_code cellCameraOpenEx(s32 dev_num, vm::ptr<CellCameraInfoEx> info)
 {
-	cellCamera.todo("cellCameraOpenEx(dev_num=%d, info=*0x%x)", dev_num, info);
+	cellCamera.todo("cellCameraOpenEx(dev_num=%d, type=*0x%x)", dev_num, info);
 
 	// This function has a very weird order of checking for errors
 
@@ -606,6 +419,7 @@ error_code cellCameraOpenEx(s32 dev_num, vm::ptr<CellCameraInfoEx> info)
 	}
 
 	auto& g_camera = g_fxo->get<camera_thread>();
+	// we know g_camera is valid here (cellCameraSetAttribute above checks for it)
 
 	if (g_camera.is_open)
 	{
@@ -623,16 +437,7 @@ error_code cellCameraOpenEx(s32 dev_num, vm::ptr<CellCameraInfoEx> info)
 
 	std::lock_guard lock(g_camera.mutex);
 
-	// TODO: find out if the buffers are also checked for nullptr
-	if (info->read_mode == CELL_CAMERA_READ_DIRECT)
-	{
-		info->pbuf[0] = vm::cast(vm::alloc(vbuf_size, vm::main));
-		info->pbuf[1] = vm::cast(vm::alloc(vbuf_size, vm::main));
-
-		// TODO: verify
-		info->bytesize = vbuf_size;
-	}
-	else
+	if (info->read_mode != CELL_CAMERA_READ_DIRECT && !info->buffer)
 	{
 		info->buffer = vm::cast(vm::alloc(vbuf_size, vm::main));
 		info->bytesize = vbuf_size;
@@ -640,22 +445,12 @@ error_code cellCameraOpenEx(s32 dev_num, vm::ptr<CellCameraInfoEx> info)
 
 	std::tie(info->width, info->height) = get_video_resolution(*info);
 
-	if (!g_camera.open_camera())
-	{
-		return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND;
-	}
-
 	g_camera.is_open = true;
 	g_camera.info = *info;
 
-	cellCamera.notice("cellCameraOpen info: format=%s, resolution=%d, framerate=%d, bytesize=%d, width=%d, height=%d, dev_num=%d, guid=%d",
-		info->format, info->resolution, info->framerate, info->bytesize, info->width, info->height, info->dev_num, info->guid);
-
 	auto& shared_data = g_fxo->get<gem_camera_shared>();
 	shared_data.width = info->width > 0 ? +info->width : 640;
 	shared_data.height = info->height > 0 ? +info->height : 480;
-	shared_data.size = vbuf_size;
-	shared_data.format = info->format;
 
 	return CELL_OK;
 }
@@ -668,43 +463,33 @@ error_code cellCameraOpenPost()
 
 error_code cellCameraClose(s32 dev_num)
 {
-	cellCamera.notice("cellCameraClose(dev_num=%d)", dev_num);
+	cellCamera.todo("cellCameraClose(dev_num=%d)", dev_num);
 
-	if (error_code error = check_init_and_open(dev_num))
-	{
-		return error;
-	}
-
-	// TODO: Yet another CELL_CAMERA_ERROR_BUSY
-
-	if (dev_num != 0)
+	if (!check_dev_num(dev_num))
 	{
 		return CELL_CAMERA_ERROR_PARAM;
 	}
 
-	if (error_code error = check_resolution(dev_num))
-	{
-		return error;
-	}
-
 	auto& g_camera = g_fxo->get<camera_thread>();
+
+	if (!g_camera.init)
+	{
+		return CELL_CAMERA_ERROR_NOT_INIT;
+	}
+
+	if (g_cfg.io.camera == camera_handler::null)
+	{
+		return not_an_error(CELL_CAMERA_ERROR_NOT_OPEN);
+	}
+
 	std::lock_guard lock(g_camera.mutex);
-	g_camera.is_streaming = false;
 
-	if (g_camera.info.buffer)
+	if (!g_camera.is_open)
 	{
-		vm::dealloc(g_camera.info.buffer.addr(), vm::main);
-	}
-	if (g_camera.info.pbuf[0])
-	{
-		vm::dealloc(g_camera.info.pbuf[0].addr(), vm::main);
-	}
-	if (g_camera.info.pbuf[1])
-	{
-		vm::dealloc(g_camera.info.pbuf[1].addr(), vm::main);
+		return CELL_CAMERA_ERROR_NOT_OPEN;
 	}
 
-	g_camera.close_camera();
+	vm::dealloc(g_camera.info.buffer.addr(), vm::main);
 	g_camera.is_open = false;
 
 	return CELL_OK;
@@ -724,7 +509,7 @@ error_code cellCameraClosePost()
 
 error_code cellCameraGetDeviceGUID(s32 dev_num, vm::ptr<u32> guid)
 {
-	cellCamera.notice("cellCameraGetDeviceGUID(dev_num=%d, guid=*0x%x)", dev_num, guid);
+	cellCamera.todo("cellCameraGetDeviceGUID(dev_num=%d, guid=*0x%x)", dev_num, guid);
 
 	auto& g_camera = g_fxo->get<camera_thread>();
 
@@ -733,17 +518,16 @@ error_code cellCameraGetDeviceGUID(s32 dev_num, vm::ptr<u32> guid)
 		return CELL_CAMERA_ERROR_NOT_INIT;
 	}
 
-	if (guid)
-	{
-		*guid = 0; // apparently always 0
-	}
+	// Does not check params or is_open (maybe attached?)
+
+	*guid = 0; // apparently always 0
 
 	return CELL_OK;
 }
 
 error_code cellCameraGetType(s32 dev_num, vm::ptr<s32> type)
 {
-	cellCamera.trace("cellCameraGetType(dev_num=%d, type=*0x%x)", dev_num, type);
+	cellCamera.todo("cellCameraGetType(dev_num=%d, type=*0x%x)", dev_num, type);
 
 	auto& g_camera = g_fxo->get<camera_thread>();
 
@@ -757,16 +541,11 @@ error_code cellCameraGetType(s32 dev_num, vm::ptr<s32> type)
 		return not_an_error(CELL_CAMERA_ERROR_DEVICE_NOT_FOUND);
 	}
 
-	if (!check_dev_num(dev_num) || !type)
+	if (!check_dev_num(dev_num) || !type )
 	{
 		return CELL_CAMERA_ERROR_PARAM;
 	}
 
-	if (error_code error = check_resolution(dev_num))
-	{
-		return error;
-	}
-
 	if (!g_camera.is_attached)
 	{
 		return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND;
@@ -785,23 +564,23 @@ error_code cellCameraGetType(s32 dev_num, vm::ptr<s32> type)
 
 s32 cellCameraIsAvailable(s32 dev_num)
 {
-	cellCamera.trace("cellCameraIsAvailable(dev_num=%d)", dev_num);
+	cellCamera.warning("cellCameraIsAvailable(dev_num=%d)", dev_num);
 
 	if (g_cfg.io.camera == camera_handler::null)
 	{
 		return false;
 	}
 
-	vm::var<s32> type;
+	auto& g_camera = g_fxo->get<camera_thread>();
 
-	if (cellCameraGetType(dev_num, type) != CELL_OK || *type == CELL_CAMERA_TYPE_UNKNOWN)
+	if (!g_camera.init)
 	{
 		return false;
 	}
 
-	if (*type > CELL_CAMERA_TYPE_UNKNOWN || *type <= CELL_CAMERA_USBVIDEOCLASS)
+	if (!check_dev_num(dev_num))
 	{
-		// TODO: checks CELL_CAMERA_DEVICESPEED attribute
+		return false;
 	}
 
 	return true;
@@ -809,30 +588,23 @@ s32 cellCameraIsAvailable(s32 dev_num)
 
 s32 cellCameraIsAttached(s32 dev_num)
 {
-	cellCamera.trace("cellCameraIsAttached(dev_num=%d)", dev_num);
+	cellCamera.warning("cellCameraIsAttached(dev_num=%d)", dev_num);
 
 	if (g_cfg.io.camera == camera_handler::null)
 	{
-		return 0;
+		return false;
 	}
 
 	auto& g_camera = g_fxo->get<camera_thread>();
 
 	if (!g_camera.init)
 	{
-		return 0;
+		return false;
 	}
 
 	if (!check_dev_num(dev_num))
 	{
-		return 0;
-	}
-
-	vm::var<s32> type;
-
-	if (cellCameraGetType(dev_num, type) != CELL_OK)
-	{
-		return 0;
+		return false;
 	}
 
 	std::lock_guard lock(g_camera.mutex);
@@ -845,17 +617,17 @@ s32 cellCameraIsAttached(s32 dev_num)
 		// normally should be attached immediately after event queue is registered, but just to be sure
 		if (!is_attached)
 		{
-			g_camera.is_attached = is_attached = true;
-			g_camera.is_attached_dirty = true;
+			g_camera.send_attach_state(true);
+			is_attached = g_camera.is_attached;
 		}
 	}
 
-	return is_attached ? 1 : 0;
+	return is_attached;
 }
 
 s32 cellCameraIsOpen(s32 dev_num)
 {
-	cellCamera.trace("cellCameraIsOpen(dev_num=%d)", dev_num);
+	cellCamera.warning("cellCameraIsOpen(dev_num=%d)", dev_num);
 
 	if (g_cfg.io.camera == camera_handler::null)
 	{
@@ -881,7 +653,7 @@ s32 cellCameraIsOpen(s32 dev_num)
 
 s32 cellCameraIsStarted(s32 dev_num)
 {
-	cellCamera.trace("cellCameraIsStarted(dev_num=%d)", dev_num);
+	cellCamera.warning("cellCameraIsStarted(dev_num=%d)", dev_num);
 
 	if (g_cfg.io.camera == camera_handler::null)
 	{
@@ -908,7 +680,7 @@ s32 cellCameraIsStarted(s32 dev_num)
 error_code cellCameraGetAttribute(s32 dev_num, s32 attrib, vm::ptr<u32> arg1, vm::ptr<u32> arg2)
 {
 	const auto attr_name = get_camera_attr_name(attrib);
-	cellCamera.notice("cellCameraGetAttribute(dev_num=%d, attrib=%d=%s, arg1=*0x%x, arg2=*0x%x)", dev_num, attrib, attr_name, arg1, arg2);
+	cellCamera.todo("cellCameraGetAttribute(dev_num=%d, attrib=%d=%s, arg1=*0x%x, arg2=*0x%x)", dev_num, attrib, attr_name, arg1, arg2);
 
 	auto& g_camera = g_fxo->get<camera_thread>();
 
@@ -917,14 +689,14 @@ error_code cellCameraGetAttribute(s32 dev_num, s32 attrib, vm::ptr<u32> arg1, vm
 		return CELL_CAMERA_ERROR_NOT_INIT;
 	}
 
-	if (!check_dev_num(dev_num))
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-
 	if (g_cfg.io.camera == camera_handler::null)
 	{
-		return not_an_error(CELL_CAMERA_ERROR_NOT_OPEN);
+		return not_an_error(CELL_CAMERA_ERROR_DEVICE_NOT_FOUND);
+	}
+
+	if (!check_dev_num(dev_num) || !attr_name || !arg1) // invalid attributes don't have a name and at least arg1 should not be NULL
+	{
+		return CELL_CAMERA_ERROR_PARAM;
 	}
 
 	// actually compares <= 0x63 which is equivalent
@@ -933,16 +705,6 @@ error_code cellCameraGetAttribute(s32 dev_num, s32 attrib, vm::ptr<u32> arg1, vm
 		return CELL_CAMERA_ERROR_NOT_OPEN;
 	}
 
-	if (!arg1)
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-
-	if (error_code error = check_resolution(dev_num))
-	{
-		return error;
-	}
-
 	std::lock_guard lock(g_camera.mutex);
 
 	if (!g_camera.is_attached)
@@ -950,29 +712,22 @@ error_code cellCameraGetAttribute(s32 dev_num, s32 attrib, vm::ptr<u32> arg1, vm
 		return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND;
 	}
 
-	if (!attr_name) // invalid attributes don't have a name
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-
 	if (arg1)
 	{
 		*arg1 = g_camera.attr[attrib].v1;
 	}
-
 	if (arg2)
 	{
 		*arg2 = g_camera.attr[attrib].v2;
 	}
 
-	cellCamera.todo("cellCameraGetAttribute(attr_name=%s, v1=%d, v2=%d)", attr_name, g_camera.attr[attrib].v1, g_camera.attr[attrib].v2);
 	return CELL_OK;
 }
 
 error_code cellCameraSetAttribute(s32 dev_num, s32 attrib, u32 arg1, u32 arg2)
 {
 	const auto attr_name = get_camera_attr_name(attrib);
-	(attrib == CELL_CAMERA_LED ? cellCamera.trace : cellCamera.todo)("cellCameraSetAttribute(dev_num=%d, attrib=%d=%s, arg1=%d, arg2=%d)", dev_num, attrib, attr_name, arg1, arg2);
+	cellCamera.todo("cellCameraSetAttribute(dev_num=%d, attrib=%d=%s, arg1=%d, arg2=%d)", dev_num, attrib, attr_name, arg1, arg2);
 
 	auto& g_camera = g_fxo->get<camera_thread>();
 
@@ -981,32 +736,22 @@ error_code cellCameraSetAttribute(s32 dev_num, s32 attrib, u32 arg1, u32 arg2)
 		return CELL_CAMERA_ERROR_NOT_INIT;
 	}
 
-	if (!check_dev_num(dev_num))
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-
 	if (g_cfg.io.camera == camera_handler::null)
 	{
 		return not_an_error(CELL_CAMERA_ERROR_NOT_OPEN);
 	}
 
+	if (!check_dev_num(dev_num) || !attr_name) // invalid attributes don't have a name
+	{
+		return CELL_CAMERA_ERROR_PARAM;
+	}
+
 	// actually compares <= 0x63 which is equivalent
 	if (attrib < CELL_CAMERA_FORMATCAP && !g_camera.is_open)
 	{
 		return CELL_CAMERA_ERROR_NOT_OPEN;
 	}
 
-	if (error_code error = check_resolution(dev_num))
-	{
-		return error;
-	}
-
-	if (!attr_name) // invalid attributes don't have a name
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-
 	g_camera.set_attr(attrib, arg1, arg2);
 
 	return CELL_OK;
@@ -1020,7 +765,7 @@ error_code cellCameraResetAttribute()
 
 error_code cellCameraGetBufferSize(s32 dev_num, vm::ptr<CellCameraInfoEx> info)
 {
-	cellCamera.notice("cellCameraGetBufferSize(dev_num=%d, info=*0x%x)", dev_num, info);
+	cellCamera.todo("cellCameraGetBufferSize(dev_num=%d, info=*0x%x)", dev_num, info);
 
 	auto& g_camera = g_fxo->get<camera_thread>();
 
@@ -1034,6 +779,8 @@ error_code cellCameraGetBufferSize(s32 dev_num, vm::ptr<CellCameraInfoEx> info)
 		return not_an_error(CELL_CAMERA_ERROR_DEVICE_NOT_FOUND);
 	}
 
+	// the next few checks have a strange order, if I can trust the tests
+
 	if (!check_dev_num(dev_num))
 	{
 		return CELL_CAMERA_ERROR_PARAM;
@@ -1064,24 +811,29 @@ error_code cellCameraGetBufferSize(s32 dev_num, vm::ptr<CellCameraInfoEx> info)
 		return status;
 	}
 
-	if (error_code error = check_resolution(dev_num))
-	{
-		return error;
-	}
-
 	std::lock_guard lock(g_camera.mutex);
 
-	g_camera.info = *info;
 	info->bytesize = get_video_buffer_size(g_camera.info);
+	g_camera.info = *info;
 
-	cellCamera.notice("cellCameraGetBufferSize info: format=%d, resolution=%d, framerate=%d, bytesize=%d, width=%d, height=%d, dev_num=%d, guid=%d",
-		info->format, info->resolution, info->framerate, info->bytesize, info->width, info->height, info->dev_num, info->guid);
-
-	return not_an_error(info->bytesize);
+	return info->bytesize;
 }
 
-error_code check_get_camera_info(s32 dev_num, bool is_valid_info_struct)
+error_code cellCameraGetBufferInfo()
 {
+	UNIMPLEMENTED_FUNC(cellCamera);
+
+	// called by cellCameraGetBufferInfoEx
+
+	return CELL_OK;
+}
+
+error_code cellCameraGetBufferInfoEx(s32 dev_num, vm::ptr<CellCameraInfoEx> info)
+{
+	cellCamera.todo("cellCameraGetBufferInfoEx(dev_num=%d, read=0x%x)", dev_num, info);
+
+	// the following should be moved to cellCameraGetBufferInfo
+
 	auto& g_camera = g_fxo->get<camera_thread>();
 
 	if (!g_camera.init)
@@ -1089,70 +841,27 @@ error_code check_get_camera_info(s32 dev_num, bool is_valid_info_struct)
 		return CELL_CAMERA_ERROR_NOT_INIT;
 	}
 
-	if (!check_dev_num(dev_num))
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-
 	if (g_cfg.io.camera == camera_handler::null)
 	{
 		return not_an_error(CELL_CAMERA_ERROR_NOT_OPEN);
 	}
 
+	if (!check_dev_num(dev_num))
+	{
+		return CELL_CAMERA_ERROR_PARAM;
+	}
+
 	if (!g_camera.is_open)
 	{
 		return CELL_CAMERA_ERROR_NOT_OPEN;
 	}
 
-	if (!is_valid_info_struct)
+	if (!info)
 	{
 		return CELL_CAMERA_ERROR_PARAM;
 	}
 
-	return CELL_OK;
-}
-
-error_code cellCameraGetBufferInfo(s32 dev_num, vm::ptr<CellCameraInfo> info)
-{
-	cellCamera.notice("cellCameraGetBufferInfo(dev_num=%d, info=0x%x)", dev_num, info);
-
-	// called by cellCameraGetBufferInfoEx
-
-	if (error_code error = check_get_camera_info(dev_num, !!info))
-	{
-		return error;
-	}
-
-	auto& g_camera = g_fxo->get<camera_thread>();
 	std::lock_guard lock(g_camera.mutex);
-
-	info->format = g_camera.info.format;
-	info->resolution = g_camera.info.resolution;
-	info->framerate = g_camera.info.framerate;
-	info->buffer = g_camera.info.buffer;
-	info->bytesize = g_camera.info.bytesize;
-	info->width = g_camera.info.width;
-	info->height = g_camera.info.height;
-	info->dev_num = g_camera.info.dev_num;
-	info->guid = g_camera.info.guid;
-
-	return CELL_OK;
-}
-
-error_code cellCameraGetBufferInfoEx(s32 dev_num, vm::ptr<CellCameraInfoEx> info)
-{
-	cellCamera.notice("cellCameraGetBufferInfoEx(dev_num=%d, info=0x%x)", dev_num, info);
-
-	// calls cellCameraGetBufferInfo
-
-	if (error_code error = check_get_camera_info(dev_num, !!info))
-	{
-		return error;
-	}
-
-	auto& g_camera = g_fxo->get<camera_thread>();
-	std::lock_guard lock(g_camera.mutex);
-
 	*info = g_camera.info;
 
 	return CELL_OK;
@@ -1160,56 +869,13 @@ error_code cellCameraGetBufferInfoEx(s32 dev_num, vm::ptr<CellCameraInfoEx> info
 
 error_code cellCameraPrepExtensionUnit(s32 dev_num, vm::ptr<u8> guidExtensionCode)
 {
-	cellCamera.todo("cellCameraPrepExtensionUnit(dev_num=%d, guidExtensionCode=0x%x)", dev_num, guidExtensionCode);
-
-	if (!check_dev_num(dev_num) || !guidExtensionCode)
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-
-	if (error_code error = check_resolution(dev_num))
-	{
-		return error;
-	}
-
-	auto& g_camera = g_fxo->get<camera_thread>();
-
-	if (!g_camera.is_attached)
-	{
-		return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND;
-	}
-
+	UNIMPLEMENTED_FUNC(cellCamera);
 	return CELL_OK;
 }
 
 error_code cellCameraCtrlExtensionUnit(s32 dev_num, u8 request, u16 value, u16 length, vm::ptr<u8> data)
 {
-	cellCamera.todo("cellCameraCtrlExtensionUnit(dev_num=%d, request=%d, value=%d, length=%d, data=*0x%x)", dev_num, request, value, length, data);
-
-	if (!check_dev_num(dev_num))
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-
-	auto& g_camera = g_fxo->get<camera_thread>();
-
-	if (!g_camera.is_open)
-	{
-		return CELL_CAMERA_ERROR_NOT_OPEN;
-	}
-
-	if (!data)
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-
-	if (!g_camera.is_attached)
-	{
-		return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND;
-	}
-
-	// TODO: Yet another CELL_CAMERA_ERROR_PARAM
-
+	UNIMPLEMENTED_FUNC(cellCamera);
 	return CELL_OK;
 }
 
@@ -1237,18 +903,28 @@ error_code cellCameraReset(s32 dev_num)
 {
 	cellCamera.todo("cellCameraReset(dev_num=%d)", dev_num);
 
-	if (error_code error = check_init_and_open(dev_num))
+	if (!check_dev_num(dev_num))
 	{
-		return error;
-	}
-
-	if (error_code error = check_resolution_ex(dev_num))
-	{
-		return error;
+		return CELL_CAMERA_ERROR_PARAM;
 	}
 
 	auto& g_camera = g_fxo->get<camera_thread>();
 
+	if (!g_camera.init)
+	{
+		return CELL_CAMERA_ERROR_NOT_INIT;
+	}
+
+	if (g_cfg.io.camera == camera_handler::null)
+	{
+		return not_an_error(CELL_CAMERA_ERROR_NOT_OPEN);
+	}
+
+	if (!g_camera.is_open)
+	{
+		return CELL_CAMERA_ERROR_NOT_OPEN;
+	}
+
 	if (!g_camera.is_attached)
 	{
 		return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND;
@@ -1273,34 +949,38 @@ error_code cellCameraResetPost()
 
 error_code cellCameraStart(s32 dev_num)
 {
-	cellCamera.notice("cellCameraStart(dev_num=%d)", dev_num);
+	cellCamera.todo("cellCameraStart(dev_num=%d)", dev_num);
 
-	if (error_code error = check_init_and_open(dev_num))
+	if (!check_dev_num(dev_num))
 	{
-		return error;
-	}
-
-	if (error_code error = check_resolution_ex(dev_num))
-	{
-		return error;
+		return CELL_CAMERA_ERROR_PARAM;
 	}
 
 	auto& g_camera = g_fxo->get<camera_thread>();
+
+	if (!g_camera.init)
+	{
+		return CELL_CAMERA_ERROR_NOT_INIT;
+	}
+
+	if (g_cfg.io.camera == camera_handler::null)
+	{
+		return not_an_error(CELL_CAMERA_ERROR_NOT_OPEN);
+	}
+
 	std::lock_guard lock(g_camera.mutex);
 
+	if (!g_camera.is_open)
+	{
+		return CELL_CAMERA_ERROR_NOT_OPEN;
+	}
+
 	if (!g_camera.is_attached)
 	{
 		return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND;
 	}
 
-	if (!g_camera.start_camera())
-	{
-		return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND;
-	}
-
-	// TODO: Yet another CELL_CAMERA_ERROR_TIMEOUT
-
-	g_camera.start_timestamp_us = get_guest_system_time();
+	g_camera.start_timestamp = get_guest_system_time();
 	g_camera.is_streaming = true;
 
 	return CELL_OK;
@@ -1320,7 +1000,7 @@ error_code cellCameraStartPost()
 
 error_code cellCameraRead(s32 dev_num, vm::ptr<u32> frame_num, vm::ptr<u32> bytes_read)
 {
-	cellCamera.trace("cellCameraRead(dev_num=%d, frame_num=*0x%x, bytes_read=*0x%x)", dev_num, frame_num, bytes_read);
+	cellCamera.todo("cellCameraRead(dev_num=%d, frame_num=*0x%x, bytes_read=*0x%x)", dev_num, frame_num, bytes_read);
 
 	vm::ptr<CellCameraReadEx> read_ex = vm::make_var<CellCameraReadEx>({});
 
@@ -1350,7 +1030,7 @@ error_code cellCameraRead2()
 
 error_code cellCameraReadEx(s32 dev_num, vm::ptr<CellCameraReadEx> read)
 {
-	cellCamera.trace("cellCameraReadEx(dev_num=%d, read=0x%x)", dev_num, read);
+	cellCamera.todo("cellCameraReadEx(dev_num=%d, read=0x%x)", dev_num, read);
 
 	auto& g_camera = g_fxo->get<camera_thread>();
 
@@ -1388,47 +1068,15 @@ error_code cellCameraReadEx(s32 dev_num, vm::ptr<CellCameraReadEx> read)
 
 	// can call cellCameraReset() and cellCameraStop() in some cases
 
-	const bool has_new_frame = g_camera.has_new_frame.exchange(false);
-
-	if (g_camera.handler)
-	{
-		if (has_new_frame)
-		{
-			u32 width{};
-			u32 height{};
-			u64 frame_number{};
-			u64 bytes_read{};
-
-			if (!g_camera.get_camera_frame(g_camera.info.buffer.get_ptr(), width, height, frame_number, bytes_read))
-			{
-				return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND;
-			}
-
-			g_camera.bytes_read = ::narrow<u32>(bytes_read);
-
-			cellCamera.trace("cellCameraRead: frame_number=%d, width=%d, height=%d. bytes_read=%d (passed to game: frame=%d, bytesread=%d)",
-				frame_number, width, height, bytes_read, read ? read->frame.get() : 0, read ? read->bytesread.get() : 0);
-		}
-	}
-	else
-	{
-		g_camera.bytes_read = g_camera.is_streaming ? get_video_buffer_size(g_camera.info) : 0;
-	}
-
-	if (has_new_frame)
-	{
-		g_camera.frame_timestamp_us = get_guest_system_time() - g_camera.start_timestamp_us;
-	}
-
 	if (read) // NULL returns CELL_OK
 	{
-		read->timestamp = g_camera.frame_timestamp_us;
+		read->timestamp = (get_guest_system_time() - g_camera.start_timestamp);
 		read->frame = g_camera.frame_num;
-		read->bytesread = g_camera.bytes_read;
+		read->bytesread = g_camera.is_streaming ? get_video_buffer_size(g_camera.info) : 0;
 
 		auto& shared_data = g_fxo->get<gem_camera_shared>();
 
-		shared_data.frame_timestamp_us.store(read->timestamp);
+		shared_data.frame_timestamp.exchange(read->timestamp);
 	}
 
 	return CELL_OK;
@@ -1438,32 +1086,34 @@ error_code cellCameraReadComplete(s32 dev_num, u32 bufnum, u32 arg2)
 {
 	cellCamera.todo("cellCameraReadComplete(dev_num=%d, bufnum=%d, arg2=%d)", dev_num, bufnum, arg2);
 
-	if (bufnum < 2)
-	{
-		auto& g_camera = g_fxo->get<camera_thread>();
-		std::lock_guard lock(g_camera.mutex);
-		g_camera.pbuf_locked[bufnum] = false;
-	}
-
 	return cellCameraSetAttribute(dev_num, CELL_CAMERA_READFINISH, bufnum, arg2);
 }
 
 error_code cellCameraStop(s32 dev_num)
 {
-	cellCamera.notice("cellCameraStop(dev_num=%d)", dev_num);
+	cellCamera.todo("cellCameraStop(dev_num=%d)", dev_num);
 
-	if (error_code error = check_init_and_open(dev_num))
+	if (!check_dev_num(dev_num))
 	{
-		return error;
-	}
-
-	if (error_code error = check_resolution_ex(dev_num))
-	{
-		return error;
+		return CELL_CAMERA_ERROR_PARAM;
 	}
 
 	auto& g_camera = g_fxo->get<camera_thread>();
-	std::lock_guard lock(g_camera.mutex);
+
+	if (!g_camera.init)
+	{
+		return CELL_CAMERA_ERROR_NOT_INIT;
+	}
+
+	if (g_cfg.io.camera == camera_handler::null)
+	{
+		return not_an_error(CELL_CAMERA_ERROR_NOT_OPEN);
+	}
+
+	if (!g_camera.is_open)
+	{
+		return CELL_CAMERA_ERROR_NOT_OPEN;
+	}
 
 	if (!g_camera.is_attached)
 	{
@@ -1475,7 +1125,6 @@ error_code cellCameraStop(s32 dev_num)
 		return CELL_CAMERA_ERROR_NOT_STARTED;
 	}
 
-	g_camera.stop_camera();
 	g_camera.is_streaming = false;
 
 	return CELL_OK;
@@ -1495,7 +1144,7 @@ error_code cellCameraStopPost()
 
 error_code cellCameraSetNotifyEventQueue(u64 key)
 {
-	cellCamera.notice("cellCameraSetNotifyEventQueue(key=0x%x)", key);
+	cellCamera.todo("cellCameraSetNotifyEventQueue(key=0x%x)", key);
 
 	auto& g_camera = g_fxo->get<camera_thread>();
 
@@ -1509,11 +1158,6 @@ error_code cellCameraSetNotifyEventQueue(u64 key)
 		return CELL_OK;
 	}
 
-	if (error_code error = check_resolution(0))
-	{
-		return error;
-	}
-
 	g_camera.add_queue(key, 0, 0);
 
 	return CELL_OK;
@@ -1521,7 +1165,7 @@ error_code cellCameraSetNotifyEventQueue(u64 key)
 
 error_code cellCameraRemoveNotifyEventQueue(u64 key)
 {
-	cellCamera.notice("cellCameraRemoveNotifyEventQueue(key=0x%x)", key);
+	cellCamera.todo("cellCameraRemoveNotifyEventQueue(key=0x%x)", key);
 
 	auto& g_camera = g_fxo->get<camera_thread>();
 
@@ -1535,11 +1179,6 @@ error_code cellCameraRemoveNotifyEventQueue(u64 key)
 		return CELL_OK;
 	}
 
-	if (error_code error = check_resolution(0))
-	{
-		return error;
-	}
-
 	g_camera.remove_queue(key);
 
 	return CELL_OK;
@@ -1547,23 +1186,18 @@ error_code cellCameraRemoveNotifyEventQueue(u64 key)
 
 error_code cellCameraSetNotifyEventQueue2(u64 key, u64 source, u64 flag)
 {
-	cellCamera.notice("cellCameraSetNotifyEventQueue2(key=0x%x, source=%d, flag=%d)", key, source, flag);
-
-	auto& g_camera = g_fxo->get<camera_thread>();
-
-	if (!g_camera.init)
-	{
-		return CELL_CAMERA_ERROR_NOT_INIT;
-	}
+	cellCamera.todo("cellCameraSetNotifyEventQueue2(key=0x%x, source=%d, flag=%d)", key, source, flag);
 
 	if (g_cfg.io.camera == camera_handler::null)
 	{
 		return CELL_OK;
 	}
 
-	if (error_code error = check_resolution(0))
+	auto& g_camera = g_fxo->get<camera_thread>();
+
+	if (!g_camera.init)
 	{
-		return error;
+		return CELL_CAMERA_ERROR_NOT_INIT;
 	}
 
 	g_camera.add_queue(key, source, flag);
@@ -1573,7 +1207,7 @@ error_code cellCameraSetNotifyEventQueue2(u64 key, u64 source, u64 flag)
 
 error_code cellCameraRemoveNotifyEventQueue2(u64 key)
 {
-	cellCamera.notice("cellCameraRemoveNotifyEventQueue2(key=0x%x)", key);
+	cellCamera.todo("cellCameraRemoveNotifyEventQueue2(key=0x%x)", key);
 
 	return cellCameraRemoveNotifyEventQueue(key);
 }
@@ -1635,15 +1269,9 @@ void camera_context::operator()()
 {
 	while (thread_ctrl::state() != thread_state::aborting && !Emu.IsStopped())
 	{
-		// send ATTACH event
-		if (init && is_attached_dirty && !Emu.IsPausedOrReady())
-		{
-			send_attach_state(is_attached);
-		}
-
 		const s32 fps = info.framerate;
 
-		if (!init || !fps || Emu.IsPausedOrReady() || g_cfg.io.camera == camera_handler::null)
+		if (!fps || Emu.IsPaused() || g_cfg.io.camera == camera_handler::null)
 		{
 			thread_ctrl::wait_for(1000); // hack
 			continue;
@@ -1651,49 +1279,15 @@ void camera_context::operator()()
 
 		const u64 frame_start = get_guest_system_time();
 
-		// Get latest frame with CELL_CAMERA_READ_DIRECT.
-		// With CELL_CAMERA_READ_FUNCCALL the game fetches the buffer in cellCameraRead.
-		const u64 buffer_number = pbuf_write_index;
-		bool send_frame_update_event = false;
-		bool frame_update_event_sent = false;
-
-		if (is_streaming)
-		{
-			if (read_mode.load() == CELL_CAMERA_READ_DIRECT)
-			{
-				std::lock_guard lock(mutex);
-				{
-					send_frame_update_event = info.pbuf[pbuf_write_index] && !pbuf_locked[pbuf_write_index];
-				}
-
-				if (handler && send_frame_update_event)
-				{
-					u32 width{};
-					u32 height{};
-					u64 frame_number{};
-					u64 bytes_read{};
-
-					send_frame_update_event = get_camera_frame(info.pbuf[pbuf_write_index].get_ptr(), width, height, frame_number, bytes_read);
-
-					if (send_frame_update_event)
-					{
-						pbuf_write_index = pbuf_next_index();
-					}
-				}
-			}
-			else
-			{
-				std::lock_guard lock(mutex);
-				send_frame_update_event = !handler || on_handler_state(handler->get_state());
-			}
-		}
-
 		std::unique_lock lock(mutex_notify_data_map);
 
-		for (const auto& [key, evt_data] : notify_data_map)
+		for (auto const& notify_data_entry : notify_data_map)
 		{
+			const auto& key = notify_data_entry.first;
+			const auto& evt_data = notify_data_entry.second;
+
 			// handle FRAME_UPDATE
-			if (send_frame_update_event && evt_data.flag & CELL_CAMERA_EFLAG_FRAME_UPDATE)
+			if (is_streaming && evt_data.flag & CELL_CAMERA_EFLAG_FRAME_UPDATE)
 			{
 				if (auto queue = lv2_event_queue::find(key))
 				{
@@ -1703,39 +1297,29 @@ void camera_context::operator()()
 					if (read_mode.load() == CELL_CAMERA_READ_DIRECT)
 					{
 						const u64 image_data_size = static_cast<u64>(info.bytesize);
+						const u64 buffer_number = 0;
 						const u64 camera_id = 0;
 
 						data2 = image_data_size << 32 | buffer_number << 16 | camera_id;
-						data3 = get_guest_system_time() - start_timestamp_us; // timestamp
+						data3 = get_guest_system_time() - start_timestamp;	// timestamp
 					}
 					else // CELL_CAMERA_READ_FUNCCALL, also default
 					{
-						data2 = 0; // device id (always 0)
-						data3 = 0; // unused
+						data2 = 0;	// device id (always 0)
+						data3 = 0;	// unused
 					}
 
-					if (CellError err = queue->send(evt_data.source, CELL_CAMERA_FRAME_UPDATE, data2, data3)) [[unlikely]]
+					if (queue->send(evt_data.source, CELL_CAMERA_FRAME_UPDATE, data2, data3) == 0) [[likely]]
 					{
-						cellCamera.warning("Failed to send frame update event (error=0x%x)", err);
+						++frame_num;
 					}
-
-					frame_update_event_sent = true;
 				}
 			}
 		}
 
-		++frame_num;
-		has_new_frame = true;
-
-		if (read_mode.load() == CELL_CAMERA_READ_DIRECT && frame_update_event_sent)
-		{
-			std::lock_guard lock(mutex);
-			pbuf_locked[buffer_number] = true;
-		}
-
 		lock.unlock();
 
-		for (const u64 frame_target_time = 1000000u / fps; !Emu.IsStopped();)
+		for (const u64 frame_target_time = 1000000u / fps;;)
 		{
 			const u64 time_passed = get_guest_system_time() - frame_start;
 			if (time_passed >= frame_target_time)
@@ -1746,102 +1330,14 @@ void camera_context::operator()()
 	}
 }
 
-bool camera_context::open_camera()
-{
-	Emu.BlockingCallFromMainThread([this]()
-	{
-		handler.reset();
-		handler = Emu.GetCallbacks().get_camera_handler();
-		if (handler)
-		{
-			handler->open_camera();
-		}
-	});
-
-	return !handler || on_handler_state(handler->get_state());
-}
-
-bool camera_context::start_camera()
-{
-	if (handler)
-	{
-		handler->set_mirrored(!!attr[CELL_CAMERA_MIRRORFLAG].v1);
-		handler->set_frame_rate(info.framerate);
-		handler->set_resolution(info.width, info.height);
-		handler->set_format(info.format, info.bytesize);
-
-		Emu.BlockingCallFromMainThread([this]()
-		{
-			handler->start_camera();
-		});
-
-		return on_handler_state(handler->get_state());
-	}
-
-	return true;
-}
-
-bool camera_context::get_camera_frame(u8* dst, u32& width, u32& height, u64& frame_number, u64& bytes_read)
-{
-	if (handler)
-	{
-		return on_handler_state(handler->get_image(dst, info.bytesize, width, height, frame_number, bytes_read));
-	}
-
-	return true;
-}
-
-void camera_context::stop_camera()
-{
-	if (handler)
-	{
-		Emu.BlockingCallFromMainThread([this]()
-		{
-			handler->stop_camera();
-		});
-	}
-}
-
-void camera_context::close_camera()
-{
-	if (handler)
-	{
-		Emu.BlockingCallFromMainThread([this]()
-		{
-			handler->close_camera();
-		});
-	}
-}
-
 void camera_context::reset_state()
 {
 	read_mode = CELL_CAMERA_READ_FUNCCALL;
 	is_streaming = false;
 	is_attached = false;
-	is_attached_dirty = false;
 	is_open = false;
 	info.framerate = 0;
 	std::memset(&attr, 0, sizeof(attr));
-	handler.reset();
-	pbuf_write_index = 0;
-	pbuf_locked[0] = false;
-	pbuf_locked[1] = false;
-	has_new_frame = false;
-	frame_timestamp_us = 0;
-	bytes_read = 0;
-
-	if (info.buffer)
-	{
-		vm::dealloc(info.buffer.addr(), vm::main);
-	}
-	if (info.pbuf[0])
-	{
-		vm::dealloc(info.pbuf[0].addr(), vm::main);
-	}
-	if (info.pbuf[1])
-	{
-		vm::dealloc(info.pbuf[1].addr(), vm::main);
-	}
 
 	std::scoped_lock lock(mutex_notify_data_map);
 	notify_data_map.clear();
@@ -1851,27 +1347,32 @@ void camera_context::send_attach_state(bool attached)
 {
 	std::lock_guard lock(mutex_notify_data_map);
 
-	for (const auto& [key, evt_data] : notify_data_map)
+	if (!notify_data_map.empty())
 	{
-		if (auto queue = lv2_event_queue::find(key))
+		for (auto const& notify_data_entry : notify_data_map)
 		{
-			if (CellError err = queue->send(evt_data.source, attached ? CELL_CAMERA_ATTACH : CELL_CAMERA_DETACH, 0, 0)) [[unlikely]]
+			const auto& key = notify_data_entry.first;
+			const auto& evt_data = notify_data_entry.second;
+
+			if (auto queue = lv2_event_queue::find(key))
 			{
-				cellCamera.warning("Failed to send attach event (attached=%d, error=0x%x)", attached, err);
+				if (queue->send(evt_data.source, attached ? CELL_CAMERA_ATTACH : CELL_CAMERA_DETACH, 0, 0) == 0) [[likely]]
+				{
+					is_attached = attached;
+				}
 			}
 		}
 	}
-
-	// We're not expected to send any events for attaching/detaching
-	is_attached = attached;
-	is_attached_dirty = false;
+	else
+	{
+		// We're not expected to send any events for attaching/detaching
+		is_attached = attached;
+	}
 }
 
 void camera_context::set_attr(s32 attrib, u32 arg1, u32 arg2)
 {
-	switch (attrib)
-	{
-	case CELL_CAMERA_READMODE:
+	if (attrib == CELL_CAMERA_READMODE)
 	{
 		if (arg1 != CELL_CAMERA_READ_FUNCCALL && arg1 != CELL_CAMERA_READ_DIRECT)
 		{
@@ -1879,18 +1380,6 @@ void camera_context::set_attr(s32 attrib, u32 arg1, u32 arg2)
 			arg1 = CELL_CAMERA_READ_FUNCCALL;
 		}
 		read_mode.exchange(arg1);
-		break;
-	}
-	case CELL_CAMERA_MIRRORFLAG:
-	{
-		if (handler)
-		{
-			handler->set_mirrored(!!arg1);
-		}
-		break;
-	}
-	default:
-		break;
 	}
 
 	std::lock_guard lock(mutex);
@@ -1899,13 +1388,15 @@ void camera_context::set_attr(s32 attrib, u32 arg1, u32 arg2)
 
 void camera_context::add_queue(u64 key, u64 source, u64 flag)
 {
+	std::lock_guard lock(mutex);
 	{
 		std::lock_guard lock_data_map(mutex_notify_data_map);
 
 		notify_data_map[key] = { source, flag };
 	}
 
-	is_attached_dirty = true;
+	// send ATTACH event - HACKY
+	send_attach_state(true);
 }
 
 void camera_context::remove_queue(u64 key)
@@ -1917,69 +1408,3 @@ void camera_context::remove_queue(u64 key)
 		notify_data_map.erase(key);
 	}
 }
-
-u32 camera_context::pbuf_next_index() const
-{
-	// The read buffer index cannot be the same as the write index
-	return (pbuf_write_index + 1u) % 2;
-}
-
-bool camera_context::on_handler_state(camera_handler_base::camera_handler_state state)
-{
-	switch (state)
-	{
-	case camera_handler_base::camera_handler_state::closed:
-	{
-		if (is_attached)
-		{
-			is_attached = false;
-			is_attached_dirty = true;
-		}
-		if (handler)
-		{
-			if (is_streaming)
-			{
-				cellCamera.warning("Camera closed or disconnected (state=%d). Trying to start camera...", static_cast<int>(state));
-				Emu.BlockingCallFromMainThread([&]()
-				{
-					handler->open_camera();
-					handler->start_camera();
-				});
-			}
-			else if (is_open)
-			{
-				cellCamera.warning("Camera closed or disconnected (state=%d). Trying to open camera...", static_cast<int>(state));
-				Emu.BlockingCallFromMainThread([&]()
-				{
-					handler->open_camera();
-				});
-			}
-		}
-		return false;
-	}
-	case camera_handler_base::camera_handler_state::open:
-	{
-		if (handler && is_streaming)
-		{
-			cellCamera.warning("Camera handler not running (state=%d). Trying to start camera...", static_cast<int>(state));
-			Emu.BlockingCallFromMainThread([&]()
-			{
-				handler->start_camera();
-			});
-		}
-		break;
-	}
-	case camera_handler_base::camera_handler_state::running:
-	{
-		if (!is_attached)
-		{
-			cellCamera.warning("Camera handler not attached. Sending attach event...", static_cast<int>(state));
-			is_attached = true;
-			is_attached_dirty = true;
-		}
-		break;
-	}
-	}
-
-	return true;
-}
diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.h b/rpcs3/Emu/Cell/Modules/cellCamera.h
index 56b8334c44..c99ad956c9 100644
--- a/rpcs3/Emu/Cell/Modules/cellCamera.h
+++ b/rpcs3/Emu/Cell/Modules/cellCamera.h
@@ -1,9 +1,8 @@
 #pragma once
 
+#include "Utilities/Timer.h"
+#include "Emu/Cell/lv2/sys_memory.h"
 #include "Utilities/Thread.h"
-#include "Emu/Io/camera_handler_base.h"
-#include "Emu/Memory/vm_ptr.h"
-#include "Utilities/mutex.h"
 
 #include <map>
 
@@ -360,7 +359,7 @@ struct CellCameraInfo
 
 struct CellCameraInfoEx
 {
-	be_t<CellCameraFormat> format; // CellCameraFormat
+	be_t<s32> format;     // CellCameraFormat
 	be_t<s32> resolution; // CellCameraResolution
 	be_t<s32> framerate;
 
@@ -375,8 +374,6 @@ struct CellCameraInfoEx
 	be_t<u32> container;
 	be_t<s32> read_mode;
 	vm::bptr<u8> pbuf[2];
-
-	ENABLE_BITWISE_SERIALIZATION;
 };
 
 struct CellCameraReadEx
@@ -384,7 +381,7 @@ struct CellCameraReadEx
 	be_t<s32> version;
 	be_t<u32> frame;
 	be_t<u32> bytesread;
-	be_t<u64> timestamp; // system_time_t (microseconds)
+	be_t<s64> timestamp;
 	vm::bptr<u8> pbuf;
 };
 
@@ -394,8 +391,6 @@ class camera_context
 	{
 		u64 source;
 		u64 flag;
-
-		ENABLE_BITWISE_SERIALIZATION;
 	};
 
 public:
@@ -422,49 +417,25 @@ public:
 
 	shared_mutex mutex;
 	shared_mutex mutex_notify_data_map;
-	u64 start_timestamp_us = 0;
+	u64 start_timestamp = 0;
 
 	atomic_t<u8> read_mode{CELL_CAMERA_READ_FUNCCALL};
 	atomic_t<bool> is_streaming{false};
 	atomic_t<bool> is_attached{false};
-	atomic_t<bool> is_attached_dirty{false};
 	atomic_t<bool> is_open{false};
 
 	CellCameraInfoEx info{};
-	atomic_t<u32> pbuf_write_index = 0;
-	std::array<atomic_t<bool>, 2> pbuf_locked = { false, false };
-	u32 pbuf_next_index() const;
 
 	struct attr_t
 	{
 		u32 v1, v2;
-
-		ENABLE_BITWISE_SERIALIZATION;
 	};
-
 	attr_t attr[500]{};
-	atomic_t<bool> has_new_frame = false;
-	atomic_t<u32> frame_num = 0;
-	atomic_t<u64> frame_timestamp_us = 0;
-	atomic_t<u32> bytes_read = 0;
+	atomic_t<u32> frame_num;
 
-	atomic_t<u8> init = 0;
-
-	SAVESTATE_INIT_POS(16);
-
-	camera_context() = default;
-	camera_context(utils::serial& ar);
-	void save(utils::serial& ar);
+	atomic_t<u32> init = 0;
 
 	static constexpr auto thread_name = "Camera Thread"sv;
-
-	std::shared_ptr<camera_handler_base> handler;
-	bool open_camera();
-	bool start_camera();
-	bool get_camera_frame(u8* dst, u32& width, u32& height, u64& frame_number, u64& bytes_read);
-	void stop_camera();
-	void close_camera();
-	bool on_handler_state(camera_handler_base::camera_handler_state state);
 };
 
 using camera_thread = named_thread<camera_context>;
@@ -472,16 +443,7 @@ using camera_thread = named_thread<camera_context>;
 /// Shared data between cellGem and cellCamera
 struct gem_camera_shared
 {
-	gem_camera_shared() {}
-	gem_camera_shared(utils::serial& ar);
-
-	void save(utils::serial& ar);
-
-	SAVESTATE_INIT_POS(7);
-
-	atomic_t<u64> frame_timestamp_us{}; // latest read timestamp from cellCamera (cellCameraRead(Ex))
+	atomic_t<s64> frame_timestamp{}; // latest read timestamp from cellCamera (cellCameraRead(Ex))
 	atomic_t<s32> width{640};
 	atomic_t<s32> height{480};
-	atomic_t<s32> size{0};
-	atomic_t<CellCameraFormat> format{CELL_CAMERA_RAW8};
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellCrossController.cpp b/rpcs3/Emu/Cell/Modules/cellCrossController.cpp
index af4662efb6..273c8dec76 100644
--- a/rpcs3/Emu/Cell/Modules/cellCrossController.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellCrossController.cpp
@@ -1,11 +1,7 @@
 #include "stdafx.h"
-#include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/IdManager.h"
-#include "Emu/localized_string.h"
 #include "cellSysutil.h"
 #include "cellCrossController.h"
-#include "cellMsgDialog.h"
 
 
 LOG_CHANNEL(cellCrossController);
@@ -37,112 +33,15 @@ void fmt_class_string<CellCrossControllerError>::format(std::string& out, u64 ar
 	});
 }
 
-void finish_callback(ppu_thread& ppu, s32 button_type, vm::ptr<void> userdata); // Forward declaration
-
-struct cross_controller
-{
-	atomic_t<s32> status{0};
-	std::unique_ptr<named_thread<std::function<void()>>> connection_thread;
-	vm::ptr<CellCrossControllerCallback> callback = vm::null;
-	vm::ptr<void> userdata = vm::null;
-
-	void on_connection_established(s32 status)
-	{
-		ensure(!!callback);
-
-		close_msg_dialog();
-
-		sysutil_register_cb([this, status](ppu_thread& ppu) -> s32
-		{
-			callback(ppu, CELL_CROSS_CONTROLLER_STATUS_FINALIZED, status, vm::null, userdata);
-			return CELL_OK;
-		});
-	}
-
-	void run_thread(vm::cptr<CellCrossControllerPackageInfo> pPkgInfo)
-	{
-		ensure(!!pPkgInfo);
-		ensure(!!callback);
-
-		const std::string msg = fmt::format("%s\n\n%s",
-			get_localized_string(localized_string_id::CELL_CROSS_CONTROLLER_MSG, pPkgInfo->pTitle.get_ptr()),
-			get_localized_string(localized_string_id::CELL_CROSS_CONTROLLER_FW_MSG));
-
-		vm::bptr<CellMsgDialogCallback> msg_dialog_callback = vm::null;
-		msg_dialog_callback.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(finish_callback)));
-
-		// TODO: Show icons from comboplay_plugin.rco in dialog. Maybe use a new dialog or add an optional icon to this one.
-		error_code res = open_msg_dialog(false, CELL_MSGDIALOG_TYPE_DISABLE_CANCEL_OFF, vm::make_str(msg), msg_dialog_source::_cellCrossController, msg_dialog_callback, userdata);
-
-		sysutil_register_cb([this, res](ppu_thread& ppu) -> s32
-		{
-			callback(ppu, CELL_CROSS_CONTROLLER_STATUS_INITIALIZED, res == CELL_OK ? +CELL_OK : +CELL_CROSS_CONTROLLER_ERROR_INTERNAL, vm::null, userdata);
-			return CELL_OK;
-		});
-
-		status = CELL_CROSS_CONTROLLER_STATUS_INITIALIZED;
-
-		connection_thread = std::make_unique<named_thread<std::function<void()>>>(fmt::format("Cross-Controller Thread"), [this]()
-		{
-			while (thread_ctrl::state() != thread_state::aborting)
-			{
-				if (Emu.IsPaused())
-				{
-					thread_ctrl::wait_for(10'000);
-					continue;
-				}
-
-				// TODO: establish connection to PS Vita
-				if (false)
-				{
-					on_connection_established(CELL_OK);
-				}
-
-				thread_ctrl::wait_for(1000);
-			}
-
-			status = CELL_CROSS_CONTROLLER_STATUS_FINALIZED;
-		});
-	}
-
-	void stop_thread()
-	{
-		// Join thread
-		connection_thread.reset();
-	};
-};
-
-void finish_callback(ppu_thread& ppu, s32 button_type, vm::ptr<void> userdata)
-{
-	cross_controller& cc = g_fxo->get<cross_controller>();
-
-	// This function should only be called when the user canceled the dialog
-	ensure(cc.callback && button_type == CELL_MSGDIALOG_BUTTON_ESCAPE);
-
-	cc.callback(ppu, CELL_CROSS_CONTROLLER_STATUS_FINALIZED, CELL_CROSS_CONTROLLER_ERROR_CANCEL, vm::null, userdata);
-	cc.stop_thread();
-}
-
 error_code cellCrossControllerInitialize(vm::cptr<CellCrossControllerParam> pParam, vm::cptr<CellCrossControllerPackageInfo> pPkgInfo, vm::ptr<CellCrossControllerCallback> cb, vm::ptr<void> userdata) // LittleBigPlanet 2 and 3
 {
 	cellCrossController.todo("cellCrossControllerInitialize(pParam=*0x%x, pPkgInfo=*0x%x, cb=*0x%x, userdata=*0x%x)", pParam, pPkgInfo, cb, userdata);
 
-	if (pParam)
-	{
-		cellCrossController.notice("cellCrossControllerInitialize: pParam: pPackageFileName=%s, pSignatureFileName=%s, pIconFileName=%s", pParam->pPackageFileName, pParam->pSignatureFileName, pParam->pIconFileName);
-	}
-
-	if (pPkgInfo)
-	{
-		cellCrossController.notice("cellCrossControllerInitialize: pPkgInfo: pTitle=%s, pTitleId=%s, pAppVer=%s", pPkgInfo->pTitle, pPkgInfo->pTitleId, pPkgInfo->pAppVer);
-	}
-
-	cross_controller& cc = g_fxo->get<cross_controller>();
-
-	if (cc.status == CELL_CROSS_CONTROLLER_STATUS_INITIALIZED) // TODO: confirm this logic
-	{
-		return CELL_CROSS_CONTROLLER_ERROR_INVALID_STATE;
-	}
+	// TODO
+	//if (something)
+	//{
+	//	return CELL_CROSS_CONTROLLER_ERROR_INVALID_STATE;
+	//}
 
 	if (!pParam || !pPkgInfo)
 	{
@@ -174,9 +73,13 @@ error_code cellCrossControllerInitialize(vm::cptr<CellCrossControllerParam> pPar
 		return CELL_CROSS_CONTROLLER_ERROR_INVALID_VALUE;
 	}
 
-	cc.callback = cb;
-	cc.userdata = userdata;
-	cc.run_thread(pPkgInfo);
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		cb(ppu, CELL_CROSS_CONTROLLER_STATUS_INITIALIZED, CELL_OK, vm::null, userdata);
+		cb(ppu, CELL_CROSS_CONTROLLER_STATUS_FINALIZED, CELL_OK, vm::null, userdata);
+
+		return CELL_OK;
+	});
 
 	return CELL_OK;
 }
@@ -185,7 +88,4 @@ error_code cellCrossControllerInitialize(vm::cptr<CellCrossControllerParam> pPar
 DECLARE(ppu_module_manager::cellCrossController)("cellCrossController", []()
 {
 	REG_FUNC(cellCrossController, cellCrossControllerInitialize);
-
-	// Helper Function
-	REG_HIDDEN_FUNC(finish_callback);
 });
diff --git a/rpcs3/Emu/Cell/Modules/cellDaisy.cpp b/rpcs3/Emu/Cell/Modules/cellDaisy.cpp
index a6e35207e2..e0d2926b91 100644
--- a/rpcs3/Emu/Cell/Modules/cellDaisy.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellDaisy.cpp
@@ -26,6 +26,11 @@ void fmt_class_string<CellDaisyError>::format(std::string& out, u64 arg)
 	});
 }
 
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 using LFQueue2 = struct CellDaisyLFQueue2;
 using Lock = struct CellDaisyLock;
 using ScatterGatherInterlock = struct CellDaisyScatterGatherInterlock;
@@ -33,134 +38,134 @@ using AtomicInterlock = volatile struct CellDaisyAtomicInterlock;
 
 error_code cellDaisyLFQueue2GetPopPointer(vm::ptr<LFQueue2> queue, vm::ptr<s32> pPointer, u32 isBlocking)
 {
-	cellDaisy.todo("cellDaisyLFQueue2GetPopPointer(queue=*0x%x, pPointer=*0x%x, isBlocking=%d)", queue, pPointer, isBlocking);
+	cellDaisy.todo("cellDaisyLFQueue2GetPopPointer()");
 	return CELL_OK;
 }
 
 error_code cellDaisyLFQueue2CompletePopPointer(vm::ptr<LFQueue2> queue, s32 pointer, vm::ptr<s32(vm::ptr<void>, u32)> fpSendSignal, u32 isQueueFull)
 {
-	cellDaisy.todo("cellDaisyLFQueue2CompletePopPointer(queue=*0x%x, pointer=0x%x, fpSendSignal=*0x%x, isQueueFull=%d)", queue, pointer, fpSendSignal, isQueueFull);
+	cellDaisy.todo("cellDaisyLFQueue2CompletePopPointer()");
 	return CELL_OK;
 }
 
 void cellDaisyLFQueue2PushOpen(vm::ptr<LFQueue2> queue)
 {
-	cellDaisy.todo("cellDaisyLFQueue2PushOpen(queue=*0x%x)", queue);
+	cellDaisy.todo("cellDaisyLFQueue2PushOpen()");
 }
 
 error_code cellDaisyLFQueue2PushClose(vm::ptr<LFQueue2> queue, vm::ptr<s32(vm::ptr<void>, u32)> fpSendSignal)
 {
-	cellDaisy.todo("cellDaisyLFQueue2PushClose(queue=*0x%x, fpSendSignal=*0x%x)", queue, fpSendSignal);
+	cellDaisy.todo("cellDaisyLFQueue2PushClose()");
 	return CELL_OK;
 }
 
 void cellDaisyLFQueue2PopOpen(vm::ptr<LFQueue2> queue)
 {
-	cellDaisy.todo("cellDaisyLFQueue2PopOpen(queue=*0x%x)", queue);
+	cellDaisy.todo("cellDaisyLFQueue2PopOpen()");
 }
 
 error_code cellDaisyLFQueue2PopClose(vm::ptr<LFQueue2> queue, vm::ptr<s32(vm::ptr<void>, u32)> fpSendSignal)
 {
-	cellDaisy.todo("cellDaisyLFQueue2PopClose(queue=*0x%x, fpSendSignal=*0x%x)", queue, fpSendSignal);
+	cellDaisy.todo("cellDaisyLFQueue2PopClose()");
 	return CELL_OK;
 }
 
 error_code cellDaisyLFQueue2HasUnfinishedConsumer(vm::ptr<LFQueue2> queue, u32 isCancelled)
 {
-	cellDaisy.todo("cellDaisyLFQueue2HasUnfinishedConsumer(queue=*0x%x, isCancelled=%d)", queue, isCancelled);
+	cellDaisy.todo("cellDaisyLFQueue2HasUnfinishedConsumer()");
 	return CELL_OK;
 }
 
 error_code cellDaisy_snprintf(vm::ptr<char> buffer, u32 count, vm::cptr<char> fmt, ppu_va_args_t fmt_args)
 {
-	cellDaisy.todo("cellDaisy_snprintf(buffer=*0x%x, count=%d, fmt=*0x%x, fmt_args=%d)", buffer, count, fmt, fmt_args.count);
+	cellDaisy.todo("cellDaisy_snprintf()");
 	return CELL_OK;
 }
 
 error_code cellDaisyLock_initialize(vm::ptr<Lock> _this, u32 depth)
 {
-	cellDaisy.todo("cellDaisyLock_initialize(_this=*0x%x, depth=%d)", _this, depth);
+	cellDaisy.todo("cellDaisyLock_initialize()");
 	return CELL_OK;
 }
 
 error_code cellDaisyLock_getNextHeadPointer(vm::ptr<Lock> _this)
 {
-	cellDaisy.todo("cellDaisyLock_getNextHeadPointer(_this=*0x%x)", _this);
+	cellDaisy.todo("cellDaisyLock_getNextHeadPointer()");
 	return CELL_OK;
 }
 
 error_code cellDaisyLock_getNextTailPointer(vm::ptr<Lock> _this)
 {
-	cellDaisy.todo("cellDaisyLock_getNextTailPointer(_this=*0x%x)", _this);
+	cellDaisy.todo("cellDaisyLock_getNextTailPointer()");
 	return CELL_OK;
 }
 
 error_code cellDaisyLock_completeConsume(vm::ptr<Lock> _this, u32 pointer)
 {
-	cellDaisy.todo("cellDaisyLock_completeConsume(_this=*0x%x, pointer=0x%x)", _this, pointer);
+	cellDaisy.todo("cellDaisyLock_completeConsume()");
 	return CELL_OK;
 }
 
 error_code cellDaisyLock_completeProduce(vm::ptr<Lock> _this, u32 pointer)
 {
-	cellDaisy.todo("cellDaisyLock_completeProduce(_this=*0x%x, pointer=0x%x)", _this, pointer);
+	cellDaisy.todo("cellDaisyLock_completeProduce()");
 	return CELL_OK;
 }
 
 error_code cellDaisyLock_pushOpen(vm::ptr<Lock> _this)
 {
-	cellDaisy.todo("cellDaisyLock_pushOpen(_this=*0x%x)", _this);
+	cellDaisy.todo("cellDaisyLock_pushOpen()");
 	return CELL_OK;
 }
 
 error_code cellDaisyLock_pushClose(vm::ptr<Lock> _this)
 {
-	cellDaisy.todo("cellDaisyLock_pushClose(_this=*0x%x)", _this);
+	cellDaisy.todo("cellDaisyLock_pushClose()");
 	return CELL_OK;
 }
 
 error_code cellDaisyLock_popOpen(vm::ptr<Lock> _this)
 {
-	cellDaisy.todo("cellDaisyLock_popOpen(_this=*0x%x)", _this);
+	cellDaisy.todo("cellDaisyLock_popOpen()");
 	return CELL_OK;
 }
 
 error_code cellDaisyLock_popClose(vm::ptr<Lock> _this)
 {
-	cellDaisy.todo("cellDaisyLock_popClose(_this=*0x%x)", _this);
+	cellDaisy.todo("cellDaisyLock_popClose()");
 	return CELL_OK;
 }
 
 void cellDaisyScatterGatherInterlock_1(vm::ptr<ScatterGatherInterlock> _this, vm::ptr<AtomicInterlock> ea, u32 size, vm::ptr<void> eaSignal, vm::ptr<s32(vm::ptr<void>, u32)> fpSendSignal)
 {
-	cellDaisy.todo("cellDaisyScatterGatherInterlock_1(_this=*0x%x, ea=*0x%x, size=%d, eaSignal=*0x%x, fpSendSignal=*0x%x)", _this, ea, size, eaSignal, fpSendSignal);
+	cellDaisy.todo("cellDaisyScatterGatherInterlock_1()");
 }
 
 void cellDaisyScatterGatherInterlock_2(vm::ptr<ScatterGatherInterlock> _this, u32 size, vm::ptr<u32> ids, u32 numSpus, u8 spup)
 {
-	cellDaisy.todo("cellDaisyScatterGatherInterlock_2(_this=*0x%x, size=%d, ids=*0x%x, numSpus=%d, spup=%d)", _this, size, ids, numSpus, spup);
+	cellDaisy.todo("cellDaisyScatterGatherInterlock_2()");
 }
 
 void cellDaisyScatterGatherInterlock_9tor(vm::ptr<ScatterGatherInterlock> _this)
 {
-	cellDaisy.todo("cellDaisyScatterGatherInterlock_9tor(_this=*0x%x)", _this);
+	cellDaisy.todo("cellDaisyScatterGatherInterlock_9tor()");
 }
 
 error_code cellDaisyScatterGatherInterlock_probe(vm::ptr<ScatterGatherInterlock> _this, u32 isBlocking)
 {
-	cellDaisy.todo("cellDaisyScatterGatherInterlock_probe(_this=*0x%x, isBlocking=%d)", _this, isBlocking);
+	cellDaisy.todo("cellDaisyScatterGatherInterlock_probe()");
 	return CELL_OK;
 }
 
 error_code cellDaisyScatterGatherInterlock_release(vm::ptr<ScatterGatherInterlock> _this)
 {
-	cellDaisy.todo("cellDaisyScatterGatherInterlock_release(_this=*0x%x)", _this);
+	cellDaisy.todo("cellDaisyScatterGatherInterlock_release()");
 	return CELL_OK;
 }
 
 void cellDaisyScatterGatherInterlock_proceedSequenceNumber(vm::ptr<ScatterGatherInterlock> _this)
 {
-	cellDaisy.todo("cellDaisyScatterGatherInterlock_proceedSequenceNumber(_this=*0x%x)", _this);
+	cellDaisy.todo("cellDaisyScatterGatherInterlock_proceedSequenceNumber()");
 }
 
 
diff --git a/rpcs3/Emu/Cell/Modules/cellDmux.cpp b/rpcs3/Emu/Cell/Modules/cellDmux.cpp
index d7f6f84f3f..17c9960998 100644
--- a/rpcs3/Emu/Cell/Modules/cellDmux.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellDmux.cpp
@@ -9,8 +9,6 @@
 
 #include "util/asm.hpp"
 
-#include <thread>
-
 LOG_CHANNEL(cellDmux);
 
 template <>
@@ -167,7 +165,6 @@ public:
 	static const u32 id_base = 1;
 	static const u32 id_step = 1;
 	static const u32 id_count = 1023;
-	SAVESTATE_INIT_POS(34);
 
 	ElementaryStream(Demuxer* dmux, u32 addr, u32 size, u32 fidMajor, u32 fidMinor, u32 sup1, u32 sup2, vm::ptr<CellDmuxCbEsMsg> cbFunc, u32 cbArg, u32 spec);
 
@@ -1033,7 +1030,7 @@ error_code cellDmuxClose(u32 handle)
 {
 	cellDmux.warning("cellDmuxClose(handle=0x%x)", handle);
 
-	const auto dmux = idm::get_unlocked<Demuxer>(handle);
+	const auto dmux = idm::get<Demuxer>(handle);
 
 	if (!dmux)
 	{
@@ -1062,7 +1059,7 @@ error_code cellDmuxSetStream(u32 handle, u32 streamAddress, u32 streamSize, b8 d
 {
 	cellDmux.trace("cellDmuxSetStream(handle=0x%x, streamAddress=0x%x, streamSize=%d, discontinuity=%d, userData=0x%llx)", handle, streamAddress, streamSize, discontinuity, userData);
 
-	const auto dmux = idm::get_unlocked<Demuxer>(handle);
+	const auto dmux = idm::get<Demuxer>(handle);
 
 	if (!dmux)
 	{
@@ -1090,7 +1087,7 @@ error_code cellDmuxResetStream(u32 handle)
 {
 	cellDmux.warning("cellDmuxResetStream(handle=0x%x)", handle);
 
-	const auto dmux = idm::get_unlocked<Demuxer>(handle);
+	const auto dmux = idm::get<Demuxer>(handle);
 
 	if (!dmux)
 	{
@@ -1105,7 +1102,7 @@ error_code cellDmuxResetStreamAndWaitDone(u32 handle)
 {
 	cellDmux.warning("cellDmuxResetStreamAndWaitDone(handle=0x%x)", handle);
 
-	const auto dmux = idm::get_unlocked<Demuxer>(handle);
+	const auto dmux = idm::get<Demuxer>(handle);
 
 	if (!dmux)
 	{
@@ -1166,7 +1163,7 @@ error_code cellDmuxEnableEs(u32 handle, vm::cptr<CellCodecEsFilterId> esFilterId
 {
 	cellDmux.warning("cellDmuxEnableEs(handle=0x%x, esFilterId=*0x%x, esResourceInfo=*0x%x, esCb=*0x%x, esSpecificInfo=*0x%x, esHandle=*0x%x)", handle, esFilterId, esResourceInfo, esCb, esSpecificInfo, esHandle);
 
-	const auto dmux = idm::get_unlocked<Demuxer>(handle);
+	const auto dmux = idm::get<Demuxer>(handle);
 
 	if (!dmux)
 	{
@@ -1177,7 +1174,7 @@ error_code cellDmuxEnableEs(u32 handle, vm::cptr<CellCodecEsFilterId> esFilterId
 
 	const auto es = idm::make_ptr<ElementaryStream>(dmux.get(), esResourceInfo->memAddr, esResourceInfo->memSize,
 		esFilterId->filterIdMajor, esFilterId->filterIdMinor, esFilterId->supplementalInfo1, esFilterId->supplementalInfo2,
-		esCb->cbFunc, esCb->cbArg, esSpecificInfo);
+		esCb->cbEsMsgFunc, esCb->cbArg, esSpecificInfo);
 
 	*esHandle = es->id;
 
@@ -1196,7 +1193,7 @@ error_code cellDmuxDisableEs(u32 esHandle)
 {
 	cellDmux.warning("cellDmuxDisableEs(esHandle=0x%x)", esHandle);
 
-	const auto es = idm::get_unlocked<ElementaryStream>(esHandle);
+	const auto es = idm::get<ElementaryStream>(esHandle);
 
 	if (!es)
 	{
@@ -1215,7 +1212,7 @@ error_code cellDmuxResetEs(u32 esHandle)
 {
 	cellDmux.trace("cellDmuxResetEs(esHandle=0x%x)", esHandle);
 
-	const auto es = idm::get_unlocked<ElementaryStream>(esHandle);
+	const auto es = idm::get<ElementaryStream>(esHandle);
 
 	if (!es)
 	{
@@ -1234,7 +1231,7 @@ error_code cellDmuxGetAu(u32 esHandle, vm::ptr<u32> auInfo, vm::ptr<u32> auSpeci
 {
 	cellDmux.trace("cellDmuxGetAu(esHandle=0x%x, auInfo=**0x%x, auSpecificInfo=**0x%x)", esHandle, auInfo, auSpecificInfo);
 
-	const auto es = idm::get_unlocked<ElementaryStream>(esHandle);
+	const auto es = idm::get<ElementaryStream>(esHandle);
 
 	if (!es)
 	{
@@ -1257,7 +1254,7 @@ error_code cellDmuxPeekAu(u32 esHandle, vm::ptr<u32> auInfo, vm::ptr<u32> auSpec
 {
 	cellDmux.trace("cellDmuxPeekAu(esHandle=0x%x, auInfo=**0x%x, auSpecificInfo=**0x%x)", esHandle, auInfo, auSpecificInfo);
 
-	const auto es = idm::get_unlocked<ElementaryStream>(esHandle);
+	const auto es = idm::get<ElementaryStream>(esHandle);
 
 	if (!es)
 	{
@@ -1280,7 +1277,7 @@ error_code cellDmuxGetAuEx(u32 esHandle, vm::ptr<u32> auInfoEx, vm::ptr<u32> auS
 {
 	cellDmux.trace("cellDmuxGetAuEx(esHandle=0x%x, auInfoEx=**0x%x, auSpecificInfo=**0x%x)", esHandle, auInfoEx, auSpecificInfo);
 
-	const auto es = idm::get_unlocked<ElementaryStream>(esHandle);
+	const auto es = idm::get<ElementaryStream>(esHandle);
 
 	if (!es)
 	{
@@ -1303,7 +1300,7 @@ error_code cellDmuxPeekAuEx(u32 esHandle, vm::ptr<u32> auInfoEx, vm::ptr<u32> au
 {
 	cellDmux.trace("cellDmuxPeekAuEx(esHandle=0x%x, auInfoEx=**0x%x, auSpecificInfo=**0x%x)", esHandle, auInfoEx, auSpecificInfo);
 
-	const auto es = idm::get_unlocked<ElementaryStream>(esHandle);
+	const auto es = idm::get<ElementaryStream>(esHandle);
 
 	if (!es)
 	{
@@ -1326,7 +1323,7 @@ error_code cellDmuxReleaseAu(u32 esHandle)
 {
 	cellDmux.trace("cellDmuxReleaseAu(esHandle=0x%x)", esHandle);
 
-	const auto es = idm::get_unlocked<ElementaryStream>(esHandle);
+	const auto es = idm::get<ElementaryStream>(esHandle);
 
 	if (!es)
 	{
@@ -1344,7 +1341,7 @@ error_code cellDmuxFlushEs(u32 esHandle)
 {
 	cellDmux.warning("cellDmuxFlushEs(esHandle=0x%x)", esHandle);
 
-	const auto es = idm::get_unlocked<ElementaryStream>(esHandle);
+	const auto es = idm::get<ElementaryStream>(esHandle);
 
 	if (!es)
 	{
@@ -1361,6 +1358,8 @@ error_code cellDmuxFlushEs(u32 esHandle)
 
 DECLARE(ppu_module_manager::cellDmux)("cellDmux", []()
 {
+	static ppu_static_module cellDmuxPamf("cellDmuxPamf");
+
 	REG_FUNC(cellDmux, cellDmuxQueryAttr);
 	REG_FUNC(cellDmux, cellDmuxQueryAttr2);
 	REG_FUNC(cellDmux, cellDmuxOpen);
diff --git a/rpcs3/Emu/Cell/Modules/cellDmux.h b/rpcs3/Emu/Cell/Modules/cellDmux.h
index 1767165283..7be56a2705 100644
--- a/rpcs3/Emu/Cell/Modules/cellDmux.h
+++ b/rpcs3/Emu/Cell/Modules/cellDmux.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "Emu/Memory/vm_ptr.h"
-#include "cellPamf.h"
 
 // Error Codes
 enum CellDmuxError :u32
@@ -196,13 +195,6 @@ struct CellDmuxResourceEx
 	be_t<u32> maxContention;
 };
 
-struct CellDmuxResourceSpurs
-{
-	vm::bptr<void> spurs; // CellSpurs*
-	be_t<u64, 1> priority;
-	be_t<u32> maxContention;
-};
-
 /*
 struct CellDmuxResource2Ex
 {
@@ -229,19 +221,19 @@ struct CellDmuxResource2
 
 using CellDmuxCbMsg = u32(u32 demuxerHandle, vm::ptr<CellDmuxMsg> demuxerMsg, u32 cbArg);
 
-using CellDmuxCbEsMsg = u32(u32 demuxerHandle, u32 esHandle, vm::ptr<CellDmuxEsMsg> esMsg, u32 cbArg);
-
-// Used for internal callbacks as well
-template <typename F>
-struct DmuxCb
+struct CellDmuxCb
 {
-	vm::bptr<F> cbFunc;
+	vm::bptr<CellDmuxCbMsg> cbMsgFunc;
 	be_t<u32> cbArg;
 };
 
-using CellDmuxCb = DmuxCb<CellDmuxCbMsg>;
+using CellDmuxCbEsMsg = u32(u32 demuxerHandle, u32 esHandle, vm::ptr<CellDmuxEsMsg> esMsg, u32 cbArg);
 
-using CellDmuxEsCb = DmuxCb<CellDmuxCbEsMsg>;
+struct CellDmuxEsCb
+{
+	vm::bptr<CellDmuxCbEsMsg> cbEsMsgFunc;
+	be_t<u32> cbArg;
+};
 
 struct CellDmuxAttr
 {
@@ -283,46 +275,3 @@ struct CellDmuxAuInfoEx
 	CellCodecTimeStamp pts;
 	CellCodecTimeStamp dts;
 };
-
-struct CellDmuxPamfAttr;
-struct CellDmuxPamfEsAttr;
-
-using DmuxNotifyDemuxDone = error_code(vm::ptr<void>, u32, vm::ptr<void>);
-using DmuxNotifyFatalErr = error_code(vm::ptr<void>, u32, vm::ptr<void>);
-using DmuxNotifyProgEndCode = error_code(vm::ptr<void>, vm::ptr<void>);
-
-using DmuxEsNotifyAuFound = error_code(vm::ptr<void>, vm::cptr<void>, vm::ptr<void>);
-using DmuxEsNotifyFlushDone = error_code(vm::ptr<void>, vm::ptr<void>);
-
-using CellDmuxCoreOpQueryAttr = error_code(vm::cptr<void>, vm::ptr<CellDmuxPamfAttr>);
-using CellDmuxCoreOpOpen = error_code(vm::cptr<void>, vm::cptr<CellDmuxResource>, vm::cptr<CellDmuxResourceSpurs>, vm::cptr<DmuxCb<DmuxNotifyDemuxDone>>, vm::cptr<DmuxCb<DmuxNotifyProgEndCode>>, vm::cptr<DmuxCb<DmuxNotifyFatalErr>>, vm::pptr<void>);
-using CellDmuxCoreOpClose = error_code(vm::ptr<void>);
-using CellDmuxCoreOpResetStream = error_code(vm::ptr<void>);
-using CellDmuxCoreOpCreateThread = error_code(vm::ptr<void>);
-using CellDmuxCoreOpJoinThread = error_code(vm::ptr<void>);
-using CellDmuxCoreOpSetStream = error_code(vm::ptr<void>, vm::cptr<void>, u32, b8, u64);
-using CellDmuxCoreOpFreeMemory = error_code(vm::ptr<void>, vm::ptr<void>, u32);
-using CellDmuxCoreOpQueryEsAttr = error_code(vm::cptr<void>, vm::cptr<void>, vm::ptr<CellDmuxPamfEsAttr>);
-using CellDmuxCoreOpEnableEs = error_code(vm::ptr<void>, vm::cptr<void>, vm::cptr<CellDmuxEsResource>, vm::cptr<DmuxCb<DmuxEsNotifyAuFound>>, vm::cptr<DmuxCb<DmuxEsNotifyFlushDone>>, vm::cptr<void>, vm::pptr<void>);
-using CellDmuxCoreOpDisableEs = u32(vm::ptr<void>);
-using CellDmuxCoreOpFlushEs = u32(vm::ptr<void>);
-using CellDmuxCoreOpResetEs = u32(vm::ptr<void>);
-using CellDmuxCoreOpResetStreamAndWaitDone = u32(vm::ptr<void>);
-
-struct CellDmuxCoreOps
-{
-	vm::bptr<CellDmuxCoreOpQueryAttr> queryAttr;
-	vm::bptr<CellDmuxCoreOpOpen> open;
-	vm::bptr<CellDmuxCoreOpClose> close;
-	vm::bptr<CellDmuxCoreOpResetStream> resetStream;
-	vm::bptr<CellDmuxCoreOpCreateThread> createThread;
-	vm::bptr<CellDmuxCoreOpJoinThread> joinThread;
-	vm::bptr<CellDmuxCoreOpSetStream> setStream;
-	vm::bptr<CellDmuxCoreOpFreeMemory> freeMemory;
-	vm::bptr<CellDmuxCoreOpQueryEsAttr> queryEsAttr;
-	vm::bptr<CellDmuxCoreOpEnableEs> enableEs;
-	vm::bptr<CellDmuxCoreOpDisableEs> disableEs;
-	vm::bptr<CellDmuxCoreOpFlushEs> flushEs;
-	vm::bptr<CellDmuxCoreOpResetEs> resetEs;
-	vm::bptr<CellDmuxCoreOpResetStreamAndWaitDone> resetStreamAndWaitDone;
-};
diff --git a/rpcs3/Emu/Cell/Modules/cellDmuxPamf.cpp b/rpcs3/Emu/Cell/Modules/cellDmuxPamf.cpp
deleted file mode 100644
index 70162d4031..0000000000
--- a/rpcs3/Emu/Cell/Modules/cellDmuxPamf.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-#include "stdafx.h"
-#include "Emu/Cell/PPUModule.h"
-#include "Emu/IdManager.h"
-
-#include "cellDmux.h"
-#include "cellDmuxPamf.h"
-
-
-vm::gvar<CellDmuxCoreOps> g_cell_dmux_core_ops_pamf;
-vm::gvar<CellDmuxCoreOps> g_cell_dmux_core_ops_raw_es;
-
-LOG_CHANNEL(cellDmuxPamf)
-
-error_code _CellDmuxCoreOpQueryAttr(vm::cptr<CellDmuxPamfSpecificInfo> pamfSpecificInfo, vm::ptr<CellDmuxPamfAttr> pamfAttr)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpQueryAttr(pamfSpecificInfo=*0x%x, pamfAttr=*0x%x)", pamfSpecificInfo, pamfAttr);
-
-	return CELL_OK;
-}
-
-error_code _CellDmuxCoreOpOpen(vm::cptr<CellDmuxPamfSpecificInfo> pamfSpecificInfo, vm::cptr<CellDmuxResource> demuxerResource, vm::cptr<CellDmuxResourceSpurs> demuxerResourceSpurs, vm::cptr<DmuxCb<DmuxNotifyDemuxDone>> notifyDemuxDone,
-	vm::cptr<DmuxCb<DmuxNotifyProgEndCode>> notifyProgEndCode, vm::cptr<DmuxCb<DmuxNotifyFatalErr>> notifyFatalErr, vm::pptr<void> handle)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpOpen(pamfSpecificInfo=*0x%x, demuxerResource=*0x%x, demuxerResourceSpurs=*0x%x, notifyDemuxDone=*0x%x, notifyProgEndCode=*0x%x, notifyFatalErr=*0x%x, handle=**0x%x)",
-		pamfSpecificInfo, demuxerResource, demuxerResourceSpurs, notifyDemuxDone, notifyProgEndCode, notifyFatalErr, handle);
-
-	return CELL_OK;
-}
-
-error_code _CellDmuxCoreOpClose(vm::ptr<void> handle)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpClose(handle=*0x%x)", handle);
-
-	return CELL_OK;
-}
-
-error_code _CellDmuxCoreOpResetStream(vm::ptr<void> handle)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpResetStream(handle=*0x%x)", handle);
-
-	return CELL_OK;
-}
-
-error_code _CellDmuxCoreOpCreateThread(vm::ptr<void> handle)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpCreateThread(handle=*0x%x)", handle);
-
-	return CELL_OK;
-}
-
-error_code _CellDmuxCoreOpJoinThread(vm::ptr<void> handle)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpJoinThread(handle=*0x%x)", handle);
-
-	return CELL_OK;
-}
-
-template <bool raw_es>
-error_code _CellDmuxCoreOpSetStream(vm::ptr<void> handle, vm::cptr<void> streamAddress, u32 streamSize, b8 discontinuity, u64 userData)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpSetStream<raw_es=%d>(handle=*0x%x, streamAddress=*0x%x, streamSize=0x%x, discontinuity=%d, userData=0x%llx)", raw_es, handle, streamAddress, streamSize, +discontinuity, userData);
-
-	return CELL_OK;
-}
-
-error_code _CellDmuxCoreOpFreeMemory(vm::ptr<void> esHandle, vm::ptr<void> memAddr, u32 memSize)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpFreeMemory(esHandle=*0x%x, memAddr=*0x%x, memSize=0x%x)", esHandle, memAddr, memSize);
-
-	return CELL_OK;
-}
-
-template <bool raw_es>
-error_code _CellDmuxCoreOpQueryEsAttr(vm::cptr<void> esFilterId, vm::cptr<void> esSpecificInfo, vm::ptr<CellDmuxPamfEsAttr> attr)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpQueryEsAttr<raw_es=%d>(esFilterId=*0x%x, esSpecificInfo=*0x%x, attr=*0x%x)", raw_es, esFilterId, esSpecificInfo, attr);
-
-	return CELL_OK;
-}
-
-template <bool raw_es>
-error_code _CellDmuxCoreOpEnableEs(vm::ptr<void> handle, vm::cptr<void> esFilterId, vm::cptr<CellDmuxEsResource> esResource, vm::cptr<DmuxCb<DmuxEsNotifyAuFound>> notifyAuFound,
-	vm::cptr<DmuxCb<DmuxEsNotifyFlushDone>> notifyFlushDone, vm::cptr<void> esSpecificInfo, vm::pptr<void> esHandle)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpEnableEs<raw_es=%d>(handle=*0x%x, esFilterId=*0x%x, esResource=*0x%x, notifyAuFound=*0x%x, notifyFlushDone=*0x%x, esSpecificInfo=*0x%x, esHandle)",
-		raw_es, handle, esFilterId, esResource, notifyAuFound, notifyFlushDone, esSpecificInfo, esHandle);
-
-	return CELL_OK;
-}
-
-error_code _CellDmuxCoreOpDisableEs(vm::ptr<void> esHandle)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpDisableEs(esHandle=*0x%x)", esHandle);
-
-	return CELL_OK;
-}
-
-error_code _CellDmuxCoreOpFlushEs(vm::ptr<void> esHandle)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpFlushEs(esHandle=*0x%x)", esHandle);
-
-	return CELL_OK;
-}
-
-error_code _CellDmuxCoreOpResetEs(vm::ptr<void> esHandle)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpResetEs(esHandle=*0x%x)", esHandle);
-
-	return CELL_OK;
-}
-
-error_code _CellDmuxCoreOpResetStreamAndWaitDone(vm::ptr<void> handle)
-{
-	cellDmuxPamf.todo("_CellDmuxCoreOpResetStreamAndWaitDone(handle=*0x%x)", handle);
-
-	return CELL_OK;
-}
-
-static void init_gvar(const vm::gvar<CellDmuxCoreOps>& var)
-{
-	var->queryAttr.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpQueryAttr)));
-	var->open.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpOpen)));
-	var->close.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpClose)));
-	var->resetStream.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpResetStream)));
-	var->createThread.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpCreateThread)));
-	var->joinThread.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpJoinThread)));
-	var->freeMemory.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpFreeMemory)));
-	var->disableEs.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpDisableEs)));
-	var->flushEs.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpFlushEs)));
-	var->resetEs.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpResetEs)));
-	var->resetStreamAndWaitDone.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpResetStreamAndWaitDone)));
-}
-
-DECLARE(ppu_module_manager::cellDmuxPamf)("cellDmuxPamf", []
-{
-	REG_VNID(cellDmuxPamf, 0x28b2b7b2, g_cell_dmux_core_ops_pamf).init = []
-	{
-		g_cell_dmux_core_ops_pamf->setStream.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpSetStream<false>)));
-		g_cell_dmux_core_ops_pamf->queryEsAttr.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpQueryEsAttr<false>)));
-		g_cell_dmux_core_ops_pamf->enableEs.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpEnableEs<false>)));
-		init_gvar(g_cell_dmux_core_ops_pamf);
-	};
-
-	REG_VNID(cellDmuxPamf, 0x9728a0e9, g_cell_dmux_core_ops_raw_es).init = []
-	{
-		g_cell_dmux_core_ops_raw_es->setStream.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpSetStream<true>)));
-		g_cell_dmux_core_ops_raw_es->queryEsAttr.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpQueryEsAttr<true>)));
-		g_cell_dmux_core_ops_raw_es->enableEs.set(g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(_CellDmuxCoreOpEnableEs<true>)));
-		init_gvar(g_cell_dmux_core_ops_raw_es);
-	};
-
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpQueryAttr);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpOpen);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpClose);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpResetStream);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpCreateThread);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpJoinThread);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpSetStream<false>);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpSetStream<true>);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpFreeMemory);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpQueryEsAttr<false>);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpQueryEsAttr<true>);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpEnableEs<false>);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpEnableEs<true>);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpDisableEs);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpFlushEs);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpResetEs);
-	REG_HIDDEN_FUNC(_CellDmuxCoreOpResetStreamAndWaitDone);
-});
diff --git a/rpcs3/Emu/Cell/Modules/cellDmuxPamf.h b/rpcs3/Emu/Cell/Modules/cellDmuxPamf.h
deleted file mode 100644
index 01983b724a..0000000000
--- a/rpcs3/Emu/Cell/Modules/cellDmuxPamf.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-struct CellDmuxPamfAttr
-{
-	be_t<u32> maxEnabledEsNum;
-	be_t<u32> version;
-	be_t<u32> memSize;
-};
-
-struct CellDmuxPamfEsAttr
-{
-	be_t<u32> auQueueMaxSize;
-	be_t<u32> memSize;
-	be_t<u32> specificInfoSize;
-};
diff --git a/rpcs3/Emu/Cell/Modules/cellFiber.h b/rpcs3/Emu/Cell/Modules/cellFiber.h
index 60294f9359..425fbd39d1 100644
--- a/rpcs3/Emu/Cell/Modules/cellFiber.h
+++ b/rpcs3/Emu/Cell/Modules/cellFiber.h
@@ -59,7 +59,7 @@ struct alignas(8) CellFiberPpuAttribute
 {
 	u8 privateHeader[16];
 	char name[32];
-	vm::bptr<CellFiberPpuOnExitCallback> onExitCallback;
+	vm::ptr<CellFiberPpuOnExitCallback> onExitCallback;
 	be_t<u32> __reserved0__;
 	be_t<u64> onExitCallbackArg;
 	be_t<u64> __reserved1__;
diff --git a/rpcs3/Emu/Cell/Modules/cellFont.cpp b/rpcs3/Emu/Cell/Modules/cellFont.cpp
index c960375c0c..fc7cb37326 100644
--- a/rpcs3/Emu/Cell/Modules/cellFont.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellFont.cpp
@@ -49,7 +49,7 @@ void fmt_class_string<CellFontError>::format(std::string& out, u64 arg)
 // Functions
 error_code cellFontInitializeWithRevision(u64 revisionFlags, vm::ptr<CellFontConfig> config)
 {
-	cellFont.todo("cellFontInitializeWithRevision(revisionFlags=0x%llx, config=*0x%x)", revisionFlags, config);
+	cellFont.warning("cellFontInitializeWithRevision(revisionFlags=0x%llx, config=*0x%x)", revisionFlags, config);
 
 	if (config->fc_size < 24)
 	{
@@ -61,86 +61,37 @@ error_code cellFontInitializeWithRevision(u64 revisionFlags, vm::ptr<CellFontCon
 		cellFont.error("cellFontInitializeWithRevision: Unknown flags (0x%x)", config->flags);
 	}
 
-	// TODO
-
 	return CELL_OK;
 }
 
-void cellFontGetRevisionFlags(vm::ptr<u64> revisionFlags)
+error_code cellFontGetRevisionFlags(vm::ptr<u64> revisionFlags)
 {
-	cellFont.notice("cellFontGetRevisionFlags(*0x%x)", revisionFlags);
+	cellFont.todo("cellFontGetRevisionFlags(*0x%x)", revisionFlags);
 
-	if (revisionFlags)
-	{
-		*revisionFlags = 100;
-	}
+	return CELL_OK;
 }
 
 error_code cellFontEnd()
 {
-	cellFont.todo("cellFontEnd()");
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
+	cellFont.warning("cellFontEnd()");
 
 	return CELL_OK;
 }
 
-error_code cellFontSetFontsetOpenMode(vm::cptr<CellFontLibrary> library, u32 openMode)
+error_code cellFontSetFontsetOpenMode(u32 openMode)
 {
-	cellFont.todo("cellFontSetFontsetOpenMode(library=*0x%x, openMode=0x%x)", library, openMode);
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
-	if (!library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO: set openMode
-
+	cellFont.todo("cellFontSetFontsetOpenMode(openMode=0x%x)", openMode);
 	return CELL_OK;
 }
 
 error_code cellFontOpenFontMemory(vm::ptr<CellFontLibrary> library, u32 fontAddr, u32 fontSize, u32 subNum, u32 uniqueId, vm::ptr<CellFont> font)
 {
-	cellFont.todo("cellFontOpenFontMemory(library=*0x%x, fontAddr=0x%x, fontSize=%d, subNum=%d, uniqueId=%d, font=*0x%x)", library, fontAddr, fontSize, subNum, uniqueId, font);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO: reset some font fields here
-
-	if (!library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
-	if (!fontAddr || uniqueId < 0)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
+	cellFont.warning("cellFontOpenFontMemory(library=*0x%x, fontAddr=0x%x, fontSize=%d, subNum=%d, uniqueId=%d, font=*0x%x)", library, fontAddr, fontSize, subNum, uniqueId, font);
 
 	font->stbfont = vm::_ptr<stbtt_fontinfo>(font.addr() + font.size()); // hack: use next bytes of the struct
 
 	if (!stbtt_InitFont(font->stbfont, vm::_ptr<unsigned char>(fontAddr), 0))
-	{
 		return CELL_FONT_ERROR_FONT_OPEN_FAILED;
-	}
 
 	font->renderer_addr = 0;
 	font->fontdata_addr = fontAddr;
@@ -151,31 +102,7 @@ error_code cellFontOpenFontMemory(vm::ptr<CellFontLibrary> library, u32 fontAddr
 
 error_code cellFontOpenFontFile(vm::ptr<CellFontLibrary> library, vm::cptr<char> fontPath, u32 subNum, s32 uniqueId, vm::ptr<CellFont> font)
 {
-	cellFont.todo("cellFontOpenFontFile(library=*0x%x, fontPath=%s, subNum=%d, uniqueId=%d, font=*0x%x)", library, fontPath, subNum, uniqueId, font);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO: reset some font fields here
-
-	if (!library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
-	if (!fontPath || uniqueId < 0)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
+	cellFont.warning("cellFontOpenFontFile(library=*0x%x, fontPath=%s, subNum=%d, uniqueId=%d, font=*0x%x)", library, fontPath, subNum, uniqueId, font);
 
 	fs::file f(vfs::get(fontPath.get_ptr()));
 	if (!f)
@@ -196,25 +123,6 @@ error_code cellFontOpenFontset(vm::ptr<CellFontLibrary> library, vm::ptr<CellFon
 {
 	cellFont.warning("cellFontOpenFontset(library=*0x%x, fontType=*0x%x, font=*0x%x)", library, fontType, font);
 
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO: reset some font fields here
-
-	if (!library || !fontType)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
-	// TODO
-
 	if (fontType->map != CELL_FONT_MAP_UNICODE)
 	{
 		cellFont.warning("cellFontOpenFontset: Only Unicode is supported");
@@ -293,31 +201,7 @@ error_code cellFontOpenFontset(vm::ptr<CellFontLibrary> library, vm::ptr<CellFon
 
 error_code cellFontOpenFontInstance(vm::ptr<CellFont> openedFont, vm::ptr<CellFont> font)
 {
-	cellFont.todo("cellFontOpenFontInstance(openedFont=*0x%x, font=*0x%x)", openedFont, font);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO: reset some font fields
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
-	if (!openedFont)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO: check field 0x10
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
+	cellFont.warning("cellFontOpenFontInstance(openedFont=*0x%x, font=*0x%x)", openedFont, font);
 
 	font->renderer_addr = openedFont->renderer_addr;
 	font->scale_x = openedFont->scale_x;
@@ -329,228 +213,58 @@ error_code cellFontOpenFontInstance(vm::ptr<CellFont> openedFont, vm::ptr<CellFo
 	return CELL_OK;
 }
 
-error_code cellFontSetFontOpenMode(vm::cptr<CellFontLibrary> library, u32 openMode)
+error_code cellFontSetFontOpenMode(u32 openMode)
 {
-	cellFont.todo("cellFontSetFontOpenMode(library=*0x%x, openMode=0x%x)", library, openMode);
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
-	if (!library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO: set openMode
-
+	cellFont.todo("cellFontSetFontOpenMode(openMode=0x%x)", openMode);
 	return CELL_OK;
 }
 
-error_code cellFontCreateRenderer(vm::cptr<CellFontLibrary> library, vm::ptr<CellFontRendererConfig> config, vm::ptr<CellFontRenderer> renderer)
+error_code cellFontCreateRenderer(vm::ptr<CellFontLibrary> library, vm::ptr<CellFontRendererConfig> config, vm::ptr<CellFontRenderer> Renderer)
 {
-	cellFont.todo("cellFontCreateRenderer(library=*0x%x, config=*0x%x, Renderer=*0x%x)", library, config, renderer);
+	cellFont.todo("cellFontCreateRenderer(library=*0x%x, config=*0x%x, Renderer=*0x%x)", library, config, Renderer);
 
 	// Write data in Renderer
 
-	if (!library || !config || !renderer)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO: check lib_func
-	{
-		return CELL_FONT_ERROR_NO_SUPPORT_FUNCTION;
-	}
-
 	return CELL_OK;
 }
 
 void cellFontRenderSurfaceInit(vm::ptr<CellFontRenderSurface> surface, vm::ptr<void> buffer, s32 bufferWidthByte, s32 pixelSizeByte, s32 w, s32 h)
 {
-	cellFont.notice("cellFontRenderSurfaceInit(surface=*0x%x, buffer=*0x%x, bufferWidthByte=%d, pixelSizeByte=%d, w=%d, h=%d)", surface, buffer, bufferWidthByte, pixelSizeByte, w, h);
+	cellFont.warning("cellFontRenderSurfaceInit(surface=*0x%x, buffer=*0x%x, bufferWidthByte=%d, pixelSizeByte=%d, w=%d, h=%d)", surface, buffer, bufferWidthByte, pixelSizeByte, w, h);
 
-	if (!surface)
-	{
-		return;
-	}
-
-	const u32 width = w & ~w >> 0x1f;
-	const u32 height = h & ~h >> 0x1f;
-
-	surface->buffer        = buffer;
-	surface->widthByte     = bufferWidthByte;
-	surface->pixelSizeByte = pixelSizeByte;
-	surface->width         = width;
-	surface->height        = height;
-	surface->sc_x0         = 0;
-	surface->sc_y0         = 0;
-	surface->sc_x1         = width;
-	surface->sc_y1         = height;
+	surface->buffer         = buffer;
+	surface->widthByte      = bufferWidthByte;
+	surface->pixelSizeByte  = pixelSizeByte;
+	surface->width          = w;
+	surface->height         = h;
 }
 
-void cellFontRenderSurfaceSetScissor(vm::ptr<CellFontRenderSurface> surface, s32 x0, s32 y0, u32 w, u32 h)
+void cellFontRenderSurfaceSetScissor(vm::ptr<CellFontRenderSurface> surface, s32 x0, s32 y0, s32 w, s32 h)
 {
 	cellFont.warning("cellFontRenderSurfaceSetScissor(surface=*0x%x, x0=%d, y0=%d, w=%d, h=%d)", surface, x0, y0, w, h);
 
-	if (!surface)
-	{
-		return;
-	}
-
-	// TODO: sdk check ?
-	if (true)
-	{
-		if (surface->width != 0)
-		{
-			u32 sc_x0 = 0;
-			u32 sc_x1 = 0;
-
-			if (x0 < 0)
-			{
-				if (static_cast<u32>(-x0) < w)
-				{
-					sc_x1 = surface->width;
-
-					if (x0 + w < sc_x1)
-					{
-						sc_x1 = x0 + w;
-					}
-				}
-			}
-			else
-			{
-				const u32 width = surface->width;
-
-				sc_x0 = width;
-				sc_x1 = width;
-
-				if (static_cast<u32>(x0) <= sc_x0)
-				{
-					sc_x0 = x0;
-
-					const u32 w_min = std::min(w, width);
-
-					if (x0 + w_min <= width)
-					{
-						sc_x1 = x0 + w_min;
-					}
-				}
-			}
-
-			surface->sc_x0 = sc_x0;
-			surface->sc_x1 = sc_x1;
-		}
-
-		if (surface->height != 0)
-		{
-			u32 sc_y0 = 0;
-			u32 sc_y1 = 0;
-
-			if (y0 < 0)
-			{
-				if (static_cast<u32>(-y0) < h)
-				{
-					sc_y1 = surface->height;
-
-					if (y0 + h < sc_y1)
-					{
-						sc_y1 = y0 + h;
-					}
-				}
-			}
-			else
-			{
-				const u32 height = surface->height;
-
-				sc_y0 = height;
-				sc_y1 = height;
-
-				if (static_cast<u32>(y0) <= sc_y0)
-				{
-					sc_y0 = y0;
-
-					const u32 h_min = std::min(h, height);
-
-					if (y0 + h_min <= sc_y1)
-					{
-						sc_y1 = y0 + h_min;
-					}
-				}
-			}
-
-			surface->sc_y0 = sc_y0;
-			surface->sc_y1 = sc_y1;
-		}
-	}
-	else
-	{
-		if (surface->width != 0)
-		{
-			if (static_cast<s32>(surface->sc_x0) < x0)
-			{
-				surface->sc_x0 = x0;
-			}
-
-			if (static_cast<s32>(w + x0) < static_cast<s32>(surface->sc_x1))
-			{
-				surface->sc_x1 = w + x0;
-			}
-		}
-
-		if (surface->height != 0)
-		{
-			if (static_cast<s32>(surface->sc_y0) < y0)
-			{
-				surface->sc_y0 = y0;
-			}
-
-			if (static_cast<s32>(h + y0) < static_cast<s32>(surface->sc_y1))
-			{
-				surface->sc_y1 = h + y0;
-			}
-		}
-	}
+	surface->sc_x0 = x0;
+	surface->sc_y0 = y0;
+	surface->sc_x1 = w;
+	surface->sc_y1 = h;
 }
 
-error_code cellFontSetScalePixel(vm::ptr<CellFont> font, f32 w, f32 h)
+error_code cellFontSetScalePixel(vm::ptr<CellFont> font, float w, float h)
 {
-	cellFont.todo("cellFontSetScalePixel(font=*0x%x, w=%f, h=%f)", font, w, h);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
+	cellFont.trace("cellFontSetScalePixel(font=*0x%x, w=%f, h=%f)", font, w, h);
 
 	font->scale_x = w;
 	font->scale_y = h;
 
-	// TODO:
-	//font->scalePointH = (h * something) / font->resolutionDpiV;
-	//font->scalePointW = (w * something) / font->resolutionDpiH;
-
 	return CELL_OK;
 }
 
 error_code cellFontGetHorizontalLayout(vm::ptr<CellFont> font, vm::ptr<CellFontHorizontalLayout> layout)
 {
-	cellFont.todo("cellFontGetHorizontalLayout(font=*0x%x, layout=*0x%x)", font, layout);
-
-	if (!layout)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	*layout = {};
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
+	cellFont.trace("cellFontGetHorizontalLayout(font=*0x%x, layout=*0x%x)", font, layout);
 
 	s32 ascent, descent, lineGap;
-	const f32 scale = stbtt_ScaleForPixelHeight(font->stbfont, font->scale_y);
+	float scale = stbtt_ScaleForPixelHeight(font->stbfont, font->scale_y);
 	stbtt_GetFontVMetrics(font->stbfont, &ascent, &descent, &lineGap);
 
 	layout->baseLineY = ascent * scale;
@@ -564,26 +278,11 @@ error_code cellFontBindRenderer(vm::ptr<CellFont> font, vm::ptr<CellFontRenderer
 {
 	cellFont.warning("cellFontBindRenderer(font=*0x%x, renderer=*0x%x)", font, renderer);
 
-	if (!font || !renderer || !renderer->systemReserved[0x10])
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
 	if (font->renderer_addr)
 	{
 		return CELL_FONT_ERROR_RENDERER_ALREADY_BIND;
 	}
 
-	// TODO
-	//renderer->systemReserved[2] = (void *)font->resolutionDpiH;
-	//renderer->systemReserved[3] = (void *)font->resolutionDpiV;
-	//renderer->systemReserved[4] = (void *)font->scalePointW;
-	//renderer->systemReserved[5] = (void *)font->scalePointH;
-	//renderer->systemReserved[6] = (void *)font->scalePixelW;
-	//renderer->systemReserved[7] = (void *)font->scalePixelH;
-	//renderer->systemReserved[8] = *(void **)&font->font_weight;
-	//renderer->systemReserved[9] = *(void **)&font->field_0x5c;
-
 	font->renderer_addr = renderer.addr();
 
 	return CELL_OK;
@@ -593,11 +292,6 @@ error_code cellFontUnbindRenderer(vm::ptr<CellFont> font)
 {
 	cellFont.warning("cellFontBindRenderer(font=*0x%x)", font);
 
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
 	if (!font->renderer_addr)
 	{
 		return CELL_FONT_ERROR_RENDERER_UNBIND;
@@ -608,65 +302,22 @@ error_code cellFontUnbindRenderer(vm::ptr<CellFont> font)
 	return CELL_OK;
 }
 
-error_code cellFontDestroyRenderer(vm::ptr<CellFontRenderer> renderer)
+error_code cellFontDestroyRenderer()
 {
-	cellFont.todo("cellFontDestroyRenderer(renderer=*0x%x)", renderer);
-
-	if (!renderer || !renderer->systemReserved[0x10])
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO: check func
-	{
-		return CELL_FONT_ERROR_NO_SUPPORT_FUNCTION;
-	}
-
-	if (false) // TODO: call func
-	{
-		renderer->systemReserved[0x10] = vm::null;
-	}
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontSetupRenderScalePixel(vm::ptr<CellFont> font, f32 w, f32 h)
+error_code cellFontSetupRenderScalePixel(vm::ptr<CellFont> font, float w, float h)
 {
 	cellFont.todo("cellFontSetupRenderScalePixel(font=*0x%x, w=%f, h=%f)", font, w, h);
 
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
 	if (!font->renderer_addr)
 	{
 		return CELL_FONT_ERROR_RENDERER_UNBIND;
 	}
 
-	// TODO:
-
-	//if (w == something)
-	//{
-	//	w = font->scalePixelW;
-	//}
-
-	//if (h == something)
-	//{
-	//	h = font->scalePixelH;
-	//}
-
-	//font->field_0x14 + 0x10 = (w * something) / font->resolutionDpiH;
-	//font->field_0x14 + 0x14 = (h * something) / font->resolutionDpiV;
-	//font->field_0x14 + 0x18 = w;
-	//font->field_0x14 + 0x1c = h;
-	//font->field_0x78 = 0;
-
+	// TODO: ?
 	return CELL_OK;
 }
 
@@ -674,33 +325,18 @@ error_code cellFontGetRenderCharGlyphMetrics(vm::ptr<CellFont> font, u32 code, v
 {
 	cellFont.todo("cellFontGetRenderCharGlyphMetrics(font=*0x%x, code=0x%x, metrics=*0x%x)", font, code, metrics);
 
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
 	if (!font->renderer_addr)
 	{
 		return CELL_FONT_ERROR_RENDERER_UNBIND;
 	}
 
-	if (!metrics)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
 	// TODO: ?
 	return CELL_OK;
 }
 
-error_code cellFontRenderCharGlyphImage(vm::ptr<CellFont> font, u32 code, vm::ptr<CellFontRenderSurface> surface, f32 x, f32 y, vm::ptr<CellFontGlyphMetrics> metrics, vm::ptr<CellFontImageTransInfo> transInfo)
+error_code cellFontRenderCharGlyphImage(vm::ptr<CellFont> font, u32 code, vm::ptr<CellFontRenderSurface> surface, float x, float y, vm::ptr<CellFontGlyphMetrics> metrics, vm::ptr<CellFontImageTransInfo> transInfo)
 {
-	cellFont.notice("cellFontRenderCharGlyphImage(font=*0x%x, code=0x%x, surface=*0x%x, x=%f, y=%f, metrics=*0x%x, transInfo=*0x%x)", font, code, surface, x, y, metrics, transInfo);
+	cellFont.notice("cellFontRenderCharGlyphImage(font=*0x%x, code=0x%x, surface=*0x%x, x=%f, y=%f, metrics=*0x%x, trans=*0x%x)", font, code, surface, x, y, metrics, transInfo);
 
 	if (!font->renderer_addr)
 	{
@@ -709,7 +345,7 @@ error_code cellFontRenderCharGlyphImage(vm::ptr<CellFont> font, u32 code, vm::pt
 
 	// Render the character
 	s32 width, height, xoff, yoff;
-	const f32 scale = stbtt_ScaleForPixelHeight(font->stbfont, font->scale_y);
+	float scale = stbtt_ScaleForPixelHeight(font->stbfont, font->scale_y);
 	unsigned char* box = stbtt_GetCodepointBitmap(font->stbfont, scale, scale, code, &width, &height, &xoff, &yoff);
 
 	if (!box)
@@ -742,28 +378,16 @@ error_code cellFontRenderCharGlyphImage(vm::ptr<CellFont> font, u32 code, vm::pt
 	return CELL_OK;
 }
 
-error_code cellFontEndLibrary(vm::cptr<CellFontLibrary> library)
+error_code cellFontEndLibrary()
 {
-	cellFont.todo("cellFontEndLibrary(library=*0x%x)", library);
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontSetEffectSlant(vm::ptr<CellFont> font, f32 slantParam)
+error_code cellFontSetEffectSlant(vm::ptr<CellFont> font, float slantParam)
 {
 	cellFont.trace("cellFontSetEffectSlant(font=*0x%x, slantParam=%f)", font, slantParam);
 
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO: I think this clamps instead of returning an error
 	if (slantParam < -1.0f || slantParam > 1.0f)
 	{
 		return CELL_FONT_ERROR_INVALID_PARAMETER;
@@ -774,14 +398,9 @@ error_code cellFontSetEffectSlant(vm::ptr<CellFont> font, f32 slantParam)
 	return CELL_OK;
 }
 
-error_code cellFontGetEffectSlant(vm::ptr<CellFont> font, vm::ptr<f32> slantParam)
+error_code cellFontGetEffectSlant(vm::ptr<CellFont> font, vm::ptr<float> slantParam)
 {
-	cellFont.trace("cellFontSetEffectSlant(font=*0x%x, slantParam=*0x%x)", font, slantParam);
-
-	if (!font || !slantParam)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
+	cellFont.warning("cellFontSetEffectSlant(font=*0x%x, slantParam=*0x%x)", font, slantParam);
 
 	*slantParam = font->slant;
 
@@ -791,69 +410,14 @@ error_code cellFontGetEffectSlant(vm::ptr<CellFont> font, vm::ptr<f32> slantPara
 error_code cellFontGetFontIdCode(vm::ptr<CellFont> font, u32 code, vm::ptr<u32> fontId, vm::ptr<u32> fontCode)
 {
 	cellFont.todo("cellFontGetFontIdCode(font=*0x%x, code=%d, fontId=*0x%x, fontCode=*0x%x)", font, code, fontId, fontCode);
-	
-	if (fontId)
-	{
-		*fontId = 0;
-	}
-
-	if (fontCode)
-	{
-		*fontCode = 0;
-	}
-
-	if (!font) // TODO || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO: some other code goes here
-
-	if (false) // TODO (!font->field_0x2)
-	{
-		if (false) // TODO (font->field_0x60 != code)
-		{
-			if (false) // TODO
-			{
-				return CELL_FONT_ERROR_NO_SUPPORT_CODE;
-			}
-			// TODO: some other stuff
-
-			return CELL_OK;
-		}
-
-		if (fontId)
-		{
-			//*fontId = font->field_0x64; // TODO
-		}
-		if (fontCode)
-		{
-			//*fontCode = font->field_0x68; // TODO
-		}
-	}
-	else
-	{
-		if (fontId)
-		{
-			//*fontId = font->field_0x8 & 0x7fffffff; // TODO
-		}
-		if (fontCode)
-		{
-			*fontCode = code;
-		}
-	}
 
+	// TODO: ?
 	return CELL_OK;
 }
 
 error_code cellFontCloseFont(vm::ptr<CellFont> font)
 {
-	cellFont.todo("cellFontCloseFont(font=*0x%x)", font);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
+	cellFont.warning("cellFontCloseFont(font=*0x%x)", font);
 
 	if (font->origin == CELL_FONT_OPEN_FONTSET ||
 		font->origin == CELL_FONT_OPEN_FONT_FILE ||
@@ -867,26 +431,11 @@ error_code cellFontCloseFont(vm::ptr<CellFont> font)
 
 error_code cellFontGetCharGlyphMetrics(vm::ptr<CellFont> font, u32 code, vm::ptr<CellFontGlyphMetrics> metrics)
 {
-	cellFont.todo("cellFontGetCharGlyphMetrics(font=*0x%x, code=0x%x, metrics=*0x%x)", font, code, metrics);
-
-	if (!font || !metrics)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_NO_SUPPORT_CODE;
-	}
+	cellFont.warning("cellFontGetCharGlyphMetrics(font=*0x%x, code=0x%x, metrics=*0x%x)", font, code, metrics);
 
 	s32 x0, y0, x1, y1;
 	s32 advanceWidth, leftSideBearing;
-	const f32 scale = stbtt_ScaleForPixelHeight(font->stbfont, font->scale_y);
+	float scale = stbtt_ScaleForPixelHeight(font->stbfont, font->scale_y);
 	stbtt_GetCodepointBox(font->stbfont, code, &x0, &y0, &x1, &y1);
 	stbtt_GetCodepointHMetrics(font->stbfont, code, &advanceWidth, &leftSideBearing);
 
@@ -903,21 +452,9 @@ error_code cellFontGetCharGlyphMetrics(vm::ptr<CellFont> font, u32 code, vm::ptr
 	return CELL_OK;
 }
 
-error_code cellFontGraphicsSetFontRGBA(vm::ptr<CellFontGraphicsDrawContext> context, vm::ptr<f32> fontRGBA)
+error_code cellFontGraphicsSetFontRGBA()
 {
-	cellFont.todo("cellFontGraphicsSetFontRGBA(context=*0x%x, fontRGBA=*0x%x)", context, fontRGBA);
-
-	if (!context || !fontRGBA) // TODO || (context->magic != 0xcf50))
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-	//context->field_0x70 = fontRGBA[0];
-	//context->field_0x74 = fontRGBA[1];
-	//context->field_0x78 = fontRGBA[2];
-	//context->field_0x7c = fontRGBA[3];
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
@@ -925,23 +462,6 @@ error_code cellFontOpenFontsetOnMemory(vm::ptr<CellFontLibrary> library, vm::ptr
 {
 	cellFont.todo("cellFontOpenFontsetOnMemory(library=*0x%x, fontType=*0x%x, font=*0x%x)", library, fontType, font);
 
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO: reset some font fields here
-
-	if (!library || !fontType)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
 	if (fontType->map != CELL_FONT_MAP_UNICODE)
 	{
 		cellFont.warning("cellFontOpenFontsetOnMemory: Only Unicode is supported");
@@ -950,414 +470,105 @@ error_code cellFontOpenFontsetOnMemory(vm::ptr<CellFontLibrary> library, vm::ptr
 	return CELL_OK;
 }
 
-error_code cellFontGraphicsSetScalePixel(vm::ptr<CellFontGraphicsDrawContext> context, f32 w, f32 h)
+error_code cellFontGraphicsSetScalePixel()
 {
-	cellFont.todo("cellFontGraphicsSetScalePixel(context=*0x%x, w=%f, h=%f)", context, w, h);
-
-	if (!context) // TODO || (context->magic != 0xcf50))
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-	//context->field_0x10 = (w * something) / context->field_0x8;
-	//context->field_0x14 = (h * something) / context->field_0xc;
-	//context->field_0x18 = w;
-	//context->field_0x1c = h;
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontGraphicsGetScalePixel(vm::ptr<CellFontGraphicsDrawContext> context, vm::ptr<f32> w, vm::ptr<f32> h)
+error_code cellFontGraphicsGetScalePixel()
 {
-	cellFont.todo("cellFontGraphicsGetScalePixel(context=*0x%x, w=*0x%x, h=*0x%x)", context, w, h);
-
-	if (w)
-	{
-		*w = 0.0;
-	}
-
-	if (h)
-	{
-		*h = 0.0;
-	}
-
-	if (!context) // TODO || context->magic != 0xcf50)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (w)
-	{
-		//*w = context->field_0x18; // TODO
-	}
-	if (h)
-	{
-		//*h = context->field_0x1c; // TODO
-	}
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontSetEffectWeight(vm::ptr<CellFont> font, f32 effectWeight)
+error_code cellFontSetEffectWeight()
 {
-	cellFont.warning("cellFontSetEffectWeight(font=*0x%x, effectWeight=%f)", font, effectWeight);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO: set effect weight (probably clamped)
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontGlyphSetupVertexesGlyph(vm::ptr<CellFontGlyph> glyph, f32 controlDistance, vm::ptr<u32> mappedBuf, u32 mappedBufSize, vm::ptr<CellFontVertexesGlyph> vGlyph, vm::ptr<u32> dataSize)
+error_code cellFontGlyphSetupVertexesGlyph()
 {
-	cellFont.todo("cellFontGlyphSetupVertexesGlyph(glyph=*0x%x, controlDistance=%f, mappedBuf=*0x%x, mappedBufSize=0x%x, vGlyph=*0x%x, dataSize=*0x%x)", glyph, controlDistance, mappedBuf, mappedBufSize, vGlyph, dataSize);
-
-	//if (in_r8)
-	//{
-	//	*in_r8 = 0; // ???
-	//}
-
-	if (!dataSize)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	dataSize[0] = 0;
-	dataSize[1] = 0;
-
-	if (mappedBufSize == 0)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontGetVerticalLayout(vm::ptr<CellFont> font, vm::ptr<CellFontVerticalLayout> layout)
+error_code cellFontGetVerticalLayout()
 {
-	cellFont.todo("cellFontGetVerticalLayout(font=*0x%x, layout=*0x%x)", font, layout);
-	
-	if (!layout)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	*layout = {};
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontGetRenderCharGlyphMetricsVertical(vm::ptr<CellFont> font, u32 code, vm::ptr<CellFontGlyphMetrics> metrics)
+error_code cellFontGetRenderCharGlyphMetricsVertical()
 {
-	cellFont.todo("cellFontGetRenderCharGlyphMetricsVertical(font=*0x%x, code=0x%x, metrics=*0x%x)", font, code, metrics);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0x14)
-	{
-		return CELL_FONT_ERROR_RENDERER_UNBIND;
-	}
-
-	// TODO
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontSetScalePoint(vm::ptr<CellFont> font, f32 w, f32 h)
+error_code cellFontSetScalePoint()
 {
-	cellFont.todo("cellFontSetScalePoint(font=*0x%x, w=%f, h=%f)", font, w, h);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-	//font->scalePointW = w;
-	//font->scalePointH = h;
-	//font->scalePixelW = (w * font->resolutionDpiH) / something;
-	//font->scalePixelH = (h * font->resolutionDpiV) / something;
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontSetupRenderEffectSlant(vm::ptr<CellFont> font, f32 effectSlant)
+error_code cellFontSetupRenderEffectSlant()
 {
-	cellFont.todo("cellFontSetupRenderEffectSlant(font=*0x%x, effectSlant=%f)", font, effectSlant);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0x14)
-	{
-		return CELL_FONT_ERROR_RENDERER_UNBIND;
-	}
-
-	// TODO:
-	//font->effectSlant = effectSlant; // TODO: probably clamped
-	//font->field_0x78 = 0;
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontGraphicsSetLineRGBA(vm::ptr<CellFontGraphicsDrawContext> context, vm::ptr<f32> lineRGBA)
+error_code cellFontGraphicsSetLineRGBA()
 {
-	cellFont.todo("cellFontGraphicsSetLineRGBA(context=*0x%x, lineRGBA=*0x%x)", context, lineRGBA);
-
-	if (!context || !lineRGBA) // TODO || (context->magic != 0xcf50))
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-	//context->lineColorR = lineRGBA[0];
-	//context->lineColorG = lineRGBA[1];
-	//context->lineColorB = lineRGBA[2];
-	//context->lineColorA = lineRGBA[3];
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontGraphicsSetDrawType(vm::ptr<CellFontGraphicsDrawContext> context, u32 type)
+error_code cellFontGraphicsSetDrawType()
 {
-	cellFont.todo("cellFontGraphicsSetDrawType(context=*0x%x, type=0x%x)", context, type);
-
-	if (!context) // TODO || (context->magic != 0xcf50))
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-    //context->field_0x42 = type; // TODO
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontEndGraphics(vm::cptr<CellFontGraphics> graphics)
+error_code cellFontEndGraphics()
 {
-	cellFont.todo("cellFontEndGraphics(graphics=*0x%x)", graphics);
-
-	if (!graphics)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontGraphicsSetupDrawContext(vm::cptr<CellFontGraphics> graphics, vm::ptr<CellFontGraphicsDrawContext> context)
+error_code cellFontGraphicsSetupDrawContext()
 {
-	cellFont.todo("cellFontGraphicsSetupDrawContext(graphics=*0x%x, context=*0x%x)", graphics, context);
-
-	if (!graphics && !context)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-	//context->magic = 0xcf50;
-	//context->field_0x50 = something;
-	//context->field_0x54 = something;
-	//context->field_0x58 = something;
-	//context->field_0x5c = something;
-	//context->field_0x2 = 0;
-	//context->field_0x8 = 72;
-	//context->field_0x42 = 1;
-	//context->field_0x4c = 0;
-	//context->field_0x4 = 0;
-	//context->field_0xc = 72;
-	//context->field_0x14 = 0;
-	//context->field_0x10 = 0;
-	//context->field_0x1c = 0;
-	//context->field_0x18 = 0;
-	//context->field_0x20 = 0;
-	//context->field_0x24 = 0;
-	//context->field_0x28 = 0;
-	//context->field_0x2c = 0;
-	//context->field_0x30 = 0;
-	//context->field_0x34 = 0;
-	//context->field_0x38 = 0;
-	//context->field_0x3c = 0;
-	//context->field_0x40 = 0;
-	//context->field_0x44 = 0;
-	//context->field_0x48 = 0;
-	//context->field_0x7c = something;
-	//context->field_0x78 = something;
-	//context->field_0x74 = something;
-	//context->field_0x70 = something;
-	//context->lineColorB = 0.0;
-	//context->lineColorG = 0.0;
-	//context->lineColorR = 0.0;
-	//context->lineColorA = something;
-	//context->field_0xc0 = 0;
-	//context->field_0x80 = something;
-	//context->field_0xbc = something;
-	//context->field_0xa8 = something;
-	//context->field_0x94 = something;
-	//context->field_0xb8 = 0;
-	//context->field_0xb4 = 0;
-	//context->field_0xb0 = 0;
-	//context->field_0xac = 0;
-	//context->field_0xa4 = 0;
-	//context->field_0xa0 = 0;
-	//context->field_0x9c = 0;
-	//context->field_0x98 = 0;
-	//context->field_0x90 = 0;
-	//context->field_0x8c = 0;
-	//context->field_0x88 = 0;
-	//context->field_0x84 = 0;
-	//context->field_0xfc = 0;
-	//context->field_0xf8 = 0;
-	//context->field_0xf4 = 0;
-	//context->field_0xf0 = 0;
-	//context->field_0xec = 0;
-	//context->field_0xe8 = 0;
-	//context->field_0xe4 = 0;
-	//context->field_0xe0 = 0;
-	//context->field_0xdc = 0;
-	//context->field_0xd8 = 0;
-	//context->field_0xd4 = 0;
-	//context->field_0xd0 = 0;
-	//context->field_0xcc = 0;
-	//context->field_0xc8 = 0;
-	//context->field_0xc4 = 0;
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontSetupRenderEffectWeight(vm::ptr<CellFont> font, f32 additionalWeight)
+error_code cellFontSetupRenderEffectWeight()
 {
-	cellFont.todo("cellFontSetupRenderEffectWeight(font=*0x%x, additionalWeight=%f)", font, additionalWeight);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0x14)
-	{
-		return CELL_FONT_ERROR_RENDERER_UNBIND;
-	}
-
-	// TODO: set weight
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontGlyphGetOutlineControlDistance(vm::ptr<CellFontGlyph> glyph, f32 maxScale, f32 baseControlDistance, vm::ptr<f32> controlDistance)
+error_code cellFontGlyphGetOutlineControlDistance()
 {
-	cellFont.todo("cellFontGlyphGetOutlineControlDistance(glyph=*0x%x, maxScale=%f, baseControlDistance=%f, controlDistance=*0x%x)", glyph, maxScale, baseControlDistance, controlDistance);
-
-	if (!glyph || !controlDistance || maxScale <= 0.0f)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-	//*controlDistance = (something / maxScale) * baseControlDistance;
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontGlyphGetVertexesGlyphSize(vm::ptr<CellFontGlyph> glyph, f32 controlDistance, vm::ptr<u32> useSize)
+error_code cellFontGlyphGetVertexesGlyphSize()
 {
-	cellFont.todo("cellFontGlyphGetVertexesGlyphSize(glyph=*0x%x, controlDistance=%f, useSize=*0x%x)", glyph, controlDistance, useSize);
-
-	if (false) // TODO (!in_r5)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	//*in_r5 = 0; // TODO
-
-	if (!glyph)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontGenerateCharGlyph(vm::ptr<CellFont> font, u32 code, vm::pptr<CellFontGlyph> glyph)
+error_code cellFontGenerateCharGlyph()
 {
-	cellFont.todo("cellFontGenerateCharGlyph(font=*0x%x, code=0x%x, glyph=*0x%x)", font, code, glyph);
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_NO_SUPPORT_FUNCTION;
-	}
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontDeleteGlyph(vm::ptr<CellFont> font, vm::ptr<CellFontGlyph> glyph)
+error_code cellFontDeleteGlyph()
 {
-	cellFont.todo("cellFontDeleteGlyph(font=*0x%x, glyph=*0x%x)", font, glyph);
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_NO_SUPPORT_FUNCTION;
-	}
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false && !glyph) // TODO
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
@@ -1366,7 +577,7 @@ error_code cellFontExtend(u32 a1, u32 a2, u32 a3)
 	cellFont.todo("cellFontExtend(a1=0x%x, a2=0x%x, a3=0x%x)", a1, a2, a3);
 	//In a test I did: a1=0xcfe00000, a2=0x0, a3=(pointer to something)
 	if (a1 == 0xcfe00000)
-	{
+		{
 		if (a2 != 0 || a3 == 0)
 		{
 			//Something happens
@@ -1381,304 +592,81 @@ error_code cellFontExtend(u32 a1, u32 a2, u32 a3)
 	return CELL_OK;
 }
 
-error_code cellFontRenderCharGlyphImageVertical(vm::ptr<CellFont> font, u32 code, vm::ptr<CellFontRenderSurface> surface, f32 x, f32 y, vm::ptr<CellFontGlyphMetrics> metrics, vm::ptr<CellFontImageTransInfo> transInfo)
+error_code cellFontRenderCharGlyphImageVertical()
 {
-	cellFont.todo("cellFontRenderCharGlyphImageVertical(font=*0x%x, code=0x%x, surface=*0x%x, x=%f, y=%f, metrics=*0x%x, transInfo=*0x%x)", font, code, surface, x, y, metrics, transInfo);
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontSetResolutionDpi(vm::ptr<CellFont> font, u32 hDpi, u32 vDpi)
+error_code cellFontSetResolutionDpi()
 {
-	cellFont.todo("cellFontSetResolutionDpi(font=*0x%x, hDpi=0x%x, vDpi=0x%x)", font, hDpi, vDpi);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-	// font->resolutionDpiH = hDpi == 0 ? 72 : hDpi;
-	// font->resolutionDpiV = vDpi == 0 ? 72 : vDpi;
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontGetCharGlyphMetricsVertical(vm::ptr<CellFont> font, u32 code, vm::ptr<CellFontGlyphMetrics> metrics)
+error_code cellFontGetCharGlyphMetricsVertical()
 {
-	cellFont.todo("cellFontGetCharGlyphMetricsVertical(font=*0x%x, code=0x%x, metrics=*0x%x)", font, code, metrics);
-
-	if (!font || !metrics)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_NO_SUPPORT_CODE;
-	}
-
-	// TODO
-
+	UNIMPLEMENTED_FUNC(cellFont);
 	return CELL_OK;
 }
 
-error_code cellFontGetRenderEffectWeight(vm::ptr<CellFont> font, vm::ptr<f32> effectWeight)
+error_code cellFontGetRenderEffectWeight()
 {
-	cellFont.todo("cellFontGetRenderEffectWeight(font=*0x%x, effectWeight=*0x%x)", font, effectWeight);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0x14)
-	{
-		return CELL_FONT_ERROR_RENDERER_UNBIND;
-	}
-
-	if (effectWeight) // Technically unchecked in firmware
-	{
-		// TODO
-		//*effectWeight = font->field_0x14 + 0x20;
-	}
-
+	cellFont.todo("cellFontGetRenderEffectWeight()");
 	return CELL_OK;
 }
 
-error_code cellFontGraphicsGetDrawType(vm::ptr<CellFontGraphicsDrawContext> context, vm::ptr<u32> type)
+error_code cellFontGraphicsGetDrawType()
 {
-	cellFont.todo("cellFontGraphicsGetDrawType(context=*0x%x, type=*0x%x)", context, type);
-
-	if (!context || !type)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (context->magic != 0xcf50)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	//*type = context->field_0x42; // TODO
-
+	cellFont.todo("cellFontGraphicsGetDrawType()");
 	return CELL_OK;
 }
 
-error_code cellFontGetKerning(vm::ptr<CellFont> font, u32 preCode, u32 code, vm::ptr<CellFontKerning> kerning)
+error_code cellFontGetKerning()
 {
-	cellFont.todo("cellFontGetKerning(font=*0x%x, preCode=0x%x, code=0x%x, kerning=*0x%x)", font, preCode, code, kerning);
-
-	if (!kerning)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	*kerning = {};
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (preCode == 0 || code == 0)
-	{
-		return CELL_OK;
-	}
-
-	// TODO
-
+	cellFont.todo("cellFontGetKerning()");
 	return CELL_OK;
 }
 
-error_code cellFontGetRenderScaledKerning(vm::ptr<CellFont> font, u32 preCode, u32 code, vm::ptr<CellFontKerning> kerning)
+error_code cellFontGetRenderScaledKerning()
 {
-	cellFont.todo("cellFontGetRenderScaledKerning(font=*0x%x, preCode=0x%x, code=0x%x, kerning=*0x%x)", font, preCode, code, kerning);
-
-	if (!kerning)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	*kerning = {};
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO: !font->field_0x14
-	{
-		return CELL_FONT_ERROR_RENDERER_UNBIND;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (preCode == 0 || code == 0)
-	{
-		return CELL_OK;
-	}
-
-	// TODO
-
+	cellFont.todo("cellFontGetRenderScaledKerning()");
 	return CELL_OK;
 }
 
-error_code cellFontGetRenderScalePixel(vm::ptr<CellFont> font, vm::ptr<f32> w, vm::ptr<f32> h)
+error_code cellFontGetRenderScalePixel()
 {
-	cellFont.todo("cellFontGetRenderScalePixel(font=*0x%x, w=*0x%x, h=*0x%x)", font, w, h);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO: !font->field_0x14
-	{
-		return CELL_FONT_ERROR_RENDERER_UNBIND;
-	}
-
-	if (w)
-	{
-		//*w = font->field_0x14 + 0x18; // TODO
-	}
-
-	if (h)
-	{
-		//*h = font->field_0x14 + 0x1c; // TODO
-	}
-
+	cellFont.todo("cellFontGetRenderScalePixel()");
 	return CELL_OK;
 }
 
-error_code cellFontGlyphGetScalePixel(vm::ptr<CellFontGlyph> glyph, vm::ptr<f32> w, vm::ptr<f32> h)
+error_code cellFontGlyphGetScalePixel()
 {
-	cellFont.todo("cellFontGlyphGetScalePixel(glyph=*0x%x, w=*0x%x, h=*0x%x)", glyph, w, h);
-
-	if (!glyph)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (w)
-	{
-		*w = 0.0f;
-	}
-
-	if (h)
-	{
-		*h = 0.0f;
-	}
-
-	if (!glyph->Outline.generateEnv)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (w)
-	{
-		//*w = glyph->Outline.generateEnv[0]; // TODO
-	}
-
-	if (h)
-	{
-		//*h = glyph->Outline.generateEnv[1]; // TODO
-	}
-
+	cellFont.todo("cellFontGlyphGetScalePixel()");
 	return CELL_OK;
 }
 
-error_code cellFontGlyphGetHorizontalShift(vm::ptr<CellFontGlyph> glyph, vm::ptr<f32> shiftX, vm::ptr<f32> shiftY)
+error_code cellFontGlyphGetHorizontalShift()
 {
-	cellFont.todo("cellFontGlyphGetHorizontalShift(glyph=*0x%x, shiftX=*0x%x, shiftY=*0x%x)", glyph, shiftX, shiftY);
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_NO_SUPPORT_FUNCTION;
-	}
-
-	if (!glyph)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (glyph->Outline.generateEnv)
-	{
-		if (shiftX)
-		{
-			*shiftX = 0.0;
-		}
-
-		if (shiftY)
-		{
-			//*shiftY = glyph->Outline.generateEnv + 0x48; // TODO
-		}
-	}
-
+	cellFont.todo("cellFontGlyphGetHorizontalShift()");
 	return CELL_OK;
 }
 
-error_code cellFontRenderCharGlyphImageHorizontal(vm::ptr<CellFont> font, u32 code, vm::ptr<CellFontRenderSurface> surface, f32 x, f32 y, vm::ptr<CellFontGlyphMetrics> metrics, vm::ptr<CellFontImageTransInfo> transInfo)
+error_code cellFontRenderCharGlyphImageHorizontal()
 {
-	cellFont.todo("cellFontRenderCharGlyphImageHorizontal(font=*0x%x, code=0x%x, surface=*0x%x, x=%f, y=%f, metrics=*0x%x, transInfo=*0x%x)", font, code, surface, x, y, metrics, transInfo);
+	cellFont.todo("cellFontRenderCharGlyphImageHorizontal()");
 	return CELL_OK;
 }
 
-error_code cellFontGetEffectWeight(vm::ptr<CellFont> font, vm::ptr<f32> effectWeight)
+error_code cellFontGetEffectWeight()
 {
-	cellFont.todo("cellFontGetEffectWeight(font=*0x%x, effectWeight=*0x%x)", font, effectWeight);
-
-	if (!font || !effectWeight)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	//*effectWeight = font->weight * something; // TODO
-
+	cellFont.todo("cellFontGetEffectWeight()");
 	return CELL_OK;
 }
 
-error_code cellFontGetScalePixel(vm::ptr<CellFont> font, vm::ptr<f32> w, vm::ptr<f32> h)
+error_code cellFontGetScalePixel()
 {
-	cellFont.todo("cellFontGetScalePixel(font=*0x%x, w=*0x%x, h=*0x%x)", font, w, h);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (w)
-	{
-		//*w = font->scalePixelW; // TODO
-	}
-
-	if (h)
-	{
-		//*h = font->scalePixelH; // TODO
-	}
-
+	cellFont.todo("cellFontGetScalePixel()");
 	return CELL_OK;
 }
 
@@ -1688,531 +676,135 @@ error_code cellFontClearFileCache()
 	return CELL_OK;
 }
 
-error_code cellFontAdjustFontScaling(vm::ptr<CellFont> font, f32 fontScale)
+error_code cellFontAdjustFontScaling()
 {
-	cellFont.todo("cellFontAdjustFontScaling(font=*0x%x, fontScale=%f)", font, fontScale);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0x2)
-	{
-		return CELL_FONT_ERROR_NO_SUPPORT_FUNCTION;
-	}
-
-	// TODO: set font scale (probably clamped)
-
+	cellFont.todo("cellFontAdjustFontScaling()");
 	return CELL_OK;
 }
 
-error_code cellFontSetupRenderScalePoint(vm::ptr<CellFont> font, f32 w, f32 h)
+error_code cellFontSetupRenderScalePoint()
 {
-	cellFont.todo("cellFontSetupRenderScalePoint(font=*0x%x, w=%f, h=%f)", font, w, h);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (!font->renderer_addr)
-	{
-		return CELL_FONT_ERROR_RENDERER_UNBIND;
-	}
-
-	// TODO:
-
-	//if (w == something)
-	//{
-	//	w = font->scalePointW;
-	//}
-
-	//if (h == something)
-	//{
-	//	h = font->scalePointH;
-	//}
-
-	//font->field_0x14 + 0x10 = w;
-	//font->field_0x14 + 0x14 = h;
-	//font->field_0x14 + 0x18 = (w * font->resolutionDpiH / something;
-	//font->field_0x14 + 0x1c = (h * font->resolutionDpiV / something;
-	//font->field_0x78 = 0;
-
+	cellFont.todo("cellFontSetupRenderScalePoint()");
 	return CELL_OK;
 }
 
-error_code cellFontGlyphGetVerticalShift(vm::ptr<CellFontGlyph> glyph, vm::ptr<f32> shiftX, vm::ptr<f32> shiftY)
+error_code cellFontGlyphGetVerticalShift()
 {
-	cellFont.todo("cellFontGlyphGetVerticalShift(glyph=*0x%x, shiftX=*0x%x, shiftY=*0x%x)", glyph, shiftX, shiftY);
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_NO_SUPPORT_FUNCTION;
-	}
-
-	if (!glyph || !glyph->Outline.generateEnv)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-
-	//fVar1 = glyph->Outline.generateEnv + 0x4c;
-	//fVar2 = glyph->Outline.generateEnv + 0x48;
-
-	//if (fVar1 == something)
-	//{
-	//	fVar1 = (glyph->Outline.generateEnv + 0x4) / (glyph->Outline.generateEnv + 0x14) * (glyph->Outline.generateEnv + 0x18);
-	//}
-
-	//if (shiftX)
-	//{
-	//	*shiftX = glyph->Outline.generateEnv + 0x38;
-	//}
-
-	//if (shiftY)
-	//{
-	//	*shiftY = -fVar2 + fVar1 + (glyph->Outline.generateEnv + 0x3c);
-	//}
-
+	cellFont.todo("cellFontGlyphGetVerticalShift()");
 	return CELL_OK;
 }
 
-error_code cellFontGetGlyphExpandBufferInfo(vm::ptr<CellFont> font, vm::ptr<s32> pointN, vm::ptr<s32> contourN)
+error_code cellFontGetGlyphExpandBufferInfo()
 {
-	cellFont.todo("cellFontGetGlyphExpandBufferInfo(font=*0x%x, pointN=*0x%x, contourN=*0x%x)", font, pointN, contourN);
-
-	if (pointN)
-	{
-		*pointN = 0;
-	}
-
-	if (contourN)
-	{
-		*contourN = 0;
-	}
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!something || !font->library)
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
-	if (false) // TODO (!font->field_0xc)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-
+	cellFont.todo("cellFontGetGlyphExpandBufferInfo()");
 	return CELL_OK;
 }
 
-error_code cellFontGetLibrary(vm::ptr<CellFont> font, vm::cpptr<CellFontLibrary> library, vm::ptr<u32> type)
+error_code cellFontGetLibrary()
 {
-	cellFont.todo("cellFontGetLibrary(font=*0x%x, library=*0x%x, type=*0x%x)", font, library, type);
-
-	if (!font || !library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-	//**library = font->library;
-
-	if (!(*library))
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
-	if (type)
-	{
-		*type = (*library)->libraryType;
-	}
-
+	cellFont.todo("cellFontGetLibrary()");
 	return CELL_OK;
 }
 
-error_code cellFontVertexesGlyphRelocate(vm::ptr<CellFontVertexesGlyph> vGlyph, vm::ptr<CellFontVertexesGlyph> vGlyph2, vm::ptr<CellFontVertexesGlyphSubHeader> subHeader, vm::ptr<u32> localBuf, u32 copySize)
+error_code cellFontVertexesGlyphRelocate()
 {
-	cellFont.todo("cellFontVertexesGlyphRelocate(vGlyph=*0x%x, vGlyph2=*0x%x, subHeader=*0x%x, localBuf=*0x%x, copySize=0x%x)", vGlyph, vGlyph2, subHeader, localBuf, copySize);
-
-	if (!vGlyph2)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (vGlyph2 != vGlyph)
-	{
-		vGlyph2->subHeader = vm::null;
-		vGlyph2->data = vm::null;
-	}
-
-	if (!vGlyph || !subHeader)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
+	cellFont.todo("cellFontVertexesGlyphRelocate()");
 	return CELL_OK;
 }
 
-error_code cellFontGetInitializedRevisionFlags(vm::ptr<u64> revisionFlags)
+error_code cellFontGetInitializedRevisionFlags()
 {
-	cellFont.todo("cellFontGetInitializedRevisionFlags(revisionFlags=*0x%x)", revisionFlags);
-
-	if (revisionFlags)
-	{
-		*revisionFlags = 0;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
-	if (revisionFlags)
-	{
-		//*revisionFlags = something; // TODO
-	}
-
+	cellFont.todo("cellFontGetInitializedRevisionFlags()");
 	return CELL_OK;
 }
 
-error_code cellFontGetResolutionDpi(vm::ptr<CellFont> font, vm::ptr<u32> hDpi, vm::ptr<u32> vDpi)
+error_code cellFontGetResolutionDpi()
 {
-	cellFont.todo("cellFontGetResolutionDpi(font=*0x%x, hDpi=*0x%x, vDpi=*0x%x)", font, hDpi, vDpi);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (hDpi)
-	{
-		//*hDpi = font->resolutionDpiH; // TODO
-	}
-
-	if (vDpi)
-	{
-		//*vDpi = font->resolutionDpiV; // TODO
-	}
-
+	cellFont.todo("cellFontGetResolutionDpi()");
 	return CELL_OK;
 }
 
-error_code cellFontGlyphRenderImageVertical(vm::ptr<CellFontGlyph> font, vm::ptr<CellFontGlyphStyle> style, vm::ptr<CellFontRenderer> renderer, vm::ptr<CellFontRenderSurface> surf, f32 x, f32 y, vm::ptr<CellFontGlyphMetrics> metrics, vm::ptr<CellFontImageTransInfo> transInfo)
+error_code cellFontGlyphRenderImageVertical()
 {
-	cellFont.todo("cellFontGlyphRenderImageVertical(font=*0x%x, style=*0x%x, renderer=*0x%x, surf=*0x%x, x=%f, y=%f, metrics=*0x%x, transInfo=*0x%x)", font, style, renderer, surf, x, y, metrics, transInfo);
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_NO_SUPPORT_FUNCTION;
-	}
-
-	if (!font || !renderer || !renderer->systemReserved[0x10])
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-
+	cellFont.todo("cellFontGlyphRenderImageVertical()");
 	return CELL_OK;
 }
 
-error_code cellFontGlyphRenderImageHorizontal(vm::ptr<CellFontGlyph> font, vm::ptr<CellFontGlyphStyle> style, vm::ptr<CellFontRenderer> renderer, vm::ptr<CellFontRenderSurface> surf, f32 x, f32 y, vm::ptr<CellFontGlyphMetrics> metrics, vm::ptr<CellFontImageTransInfo> transInfo)
+error_code cellFontGlyphRenderImageHorizontal()
 {
-	cellFont.todo("cellFontGlyphRenderImageHorizontal(font=*0x%x, style=*0x%x, renderer=*0x%x, surf=*0x%x, x=%f, y=%f, metrics=*0x%x, transInfo=*0x%x)", font, style, renderer, surf, x, y, metrics, transInfo);
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_NO_SUPPORT_FUNCTION;
-	}
-
-	if (!font || !renderer || !renderer->systemReserved[0x10])
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-
+	cellFont.todo("cellFontGlyphRenderImageHorizontal()");
 	return CELL_OK;
 }
 
-error_code cellFontAdjustGlyphExpandBuffer(vm::ptr<CellFont> font, s32 pointN, s32 contourN)
+error_code cellFontAdjustGlyphExpandBuffer()
 {
-	cellFont.todo("cellFontAdjustGlyphExpandBuffer(font=*0x%x, pointN=%d, contourN=%d)", font, pointN, contourN);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!something || !font->library)
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
-	if (false) // TODO (!font->field_0xc)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
+	cellFont.todo("cellFontAdjustGlyphExpandBuffer()");
 	return CELL_OK;
 }
 
-error_code cellFontGetRenderScalePoint(vm::ptr<CellFont> font, vm::ptr<f32> w, vm::ptr<f32> h)
+error_code cellFontGetRenderScalePoint()
 {
-	cellFont.todo("cellFontGetRenderScalePoint(font=*0x%x, w=*0x%x, h=*0x%x)", font, w, h);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO: !font->field_0x14
-	{
-		return CELL_FONT_ERROR_RENDERER_UNBIND;
-	}
-
-	if (w)
-	{
-		//*w = font->field_0x14 + 0x10; // TODO
-	}
-
-	if (h)
-	{
-		//*h = font->field_0x14 + 0x14; // TODO
-	}
-
+	cellFont.todo("cellFontGetRenderScalePoint()");
 	return CELL_OK;
 }
 
-error_code cellFontGraphicsGetFontRGBA(vm::ptr<CellFontGraphicsDrawContext> context, vm::ptr<f32> fontRGBA)
+error_code cellFontGraphicsGetFontRGBA()
 {
-	cellFont.todo("cellFontGraphicsGetFontRGBA(context=*0x%x, fontRGBA=*0x%x)", context, fontRGBA);
-
-	if (!context || !fontRGBA)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO: (context->magic != 0xcf50)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-	//fontRGBA[0] = context->field_0x70;
-	//fontRGBA[1] = context->field_0x74;
-	//fontRGBA[2] = context->field_0x78;
-	//fontRGBA[3] = context->field_0x7c;
-
+	cellFont.todo("cellFontGraphicsGetFontRGBA()");
 	return CELL_OK;
 }
 
-error_code cellFontGlyphGetOutlineVertexes(vm::ptr<CellFontGlyph> glyph, f32 controlDistance, vm::ptr<CellFontGetOutlineVertexesIF> getIF, vm::ptr<CellFontGlyphBoundingBox> bbox, vm::ptr<u32> vcount)
+error_code cellFontGlyphGetOutlineVertexes()
 {
-	cellFont.todo("cellFontGlyphGetOutlineVertexes(glyph=*0x%x, controlDistance=%f, getIF=*0x%x, bbox=*0x%x, vcount=*0x%x)", glyph, controlDistance, getIF, bbox, vcount);
-
-	if (!glyph)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (!bbox)
-	{
-		//bbox = something; // TODO
-	}
-
-	if (glyph->Outline.contoursCount == 0)
-	{
-		if (vcount)
-		{
-			vcount[0] = 0;
-			vcount[1] = 0;
-			vcount[2] = 0;
-			vcount[3] = 0;
-		}
-
-		//if (in_r7)
-		//{
-		//	*in_r7 = 0; // ???
-		//}
-
-		return CELL_OK;
-	}
-
-	// TODO
-
+	cellFont.todo("cellFontGlyphGetOutlineVertexes()");
 	return CELL_OK;
 }
 
-error_code cellFontDelete(vm::cptr<CellFontLibrary> library, vm::ptr<void> p)
+error_code cellFontDelete()
 {
-	cellFont.todo("cellFontDelete(library=*0x%x, p=*0x%x)", library, p);
-
-	if (!library || !p)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-
+	cellFont.todo("cellFontDelete()");
 	return CELL_OK;
 }
 
-error_code cellFontPatchWorks(s32 param_1, u64 param_2)
+error_code cellFontPatchWorks()
 {
-	cellFont.todo("cellFontPatchWorks(param_1=0x%x, param_2=0x%x)", param_1, param_2);
+	cellFont.todo("cellFontPatchWorks()");
 	return CELL_OK;
 }
 
-error_code cellFontGlyphRenderImage(vm::ptr<CellFontGlyph> font, vm::ptr<CellFontGlyphStyle> style, vm::ptr<CellFontRenderer> renderer, vm::ptr<CellFontRenderSurface> surf, f32 x, f32 y, vm::ptr<CellFontGlyphMetrics> metrics, vm::ptr<CellFontImageTransInfo> transInfo)
+error_code cellFontGlyphRenderImage()
 {
-	cellFont.todo("cellFontGlyphRenderImage(font=*0x%x, style=*0x%x, renderer=*0x%x, surf=*0x%x, x=%f, y=%f, metrics=*0x%x, transInfo=*0x%x)", font, style, renderer, surf, x, y, metrics, transInfo);
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_NO_SUPPORT_FUNCTION;
-	}
-
-	if (!font || !renderer || !renderer->systemReserved[0x10])
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-
+	cellFont.todo("cellFontGlyphRenderImage()");
 	return CELL_OK;
 }
 
-error_code cellFontGetBindingRenderer(vm::ptr<CellFont> font, vm::pptr<CellFontRenderer> renderer)
+error_code cellFontGetBindingRenderer()
 {
-	cellFont.todo("cellFontGetBindingRenderer(font=*0x%x, renderer=*0x%x)", font, renderer);
-
-	if (!renderer)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (font)
-	{
-		// TODO: may return CELL_FONT_ERROR_RENDERER_UNBIND
-		//*renderer = font->field_0x14;
-	}
-	else
-	{
-		*renderer = vm::null;
-	}
-
+	cellFont.todo("cellFontGetBindingRenderer()");
 	return CELL_OK;
 }
 
-error_code cellFontGenerateCharGlyphVertical(vm::ptr<CellFont> font, u32 code, vm::pptr<CellFontGlyph> glyph)
+error_code cellFontGenerateCharGlyphVertical()
 {
-	cellFont.todo("cellFontGenerateCharGlyphVertical(font=*0x%x, code=0x%x, glyph=*0x%x)", font, code, glyph);
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_NO_SUPPORT_FUNCTION;
-	}
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-
+	cellFont.todo("cellFontGenerateCharGlyphVertical()");
 	return CELL_OK;
 }
 
-error_code cellFontGetRenderEffectSlant(vm::ptr<CellFont> font, vm::ptr<f32> effectSlant)
+error_code cellFontGetRenderEffectSlant()
 {
-	cellFont.todo("cellFontGetRenderEffectSlant(font=*0x%x, effectSlant=*0x%x)", font, effectSlant);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0xc || !font->library)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO (!font->field_0x14)
-	{
-		return CELL_FONT_ERROR_RENDERER_UNBIND;
-	}
-
-	if (effectSlant) // Technically unchecked in firmware
-	{
-		// TODO
-		//*effectSlant = font->field_0x14 + 0x24;
-	}
-
+	cellFont.todo("cellFontGetRenderEffectSlant()");
 	return CELL_OK;
 }
 
-
-error_code cellFontGetScalePoint(vm::ptr<CellFont> font, vm::ptr<f32> w, vm::ptr<f32> h)
+error_code cellFontGetScalePoint()
 {
-	cellFont.todo("cellFontGetScalePoint(font=*0x%x, w=*0x%x, h=*0x%x)", font, w, h);
-
-	if (!font)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (w)
-	{
-		//*w = font->scalePointW; // TODO
-	}
-
-	if (h)
-	{
-		//*h = font->scalePointH; // TODO
-	}
-
+	cellFont.todo("cellFontGetScalePoint()");
 	return CELL_OK;
 }
 
-
-error_code cellFontGraphicsGetLineRGBA(vm::ptr<CellFontGraphicsDrawContext> context, vm::ptr<f32> lineRGBA)
+error_code cellFontGraphicsGetLineRGBA()
 {
-	cellFont.todo("cellFontGraphicsGetLineRGBA(context=*0x%x, lineRGBA=*0x%x)", context, lineRGBA);
-
-	if (!context || !lineRGBA)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO: (context->magic != 0xcf50)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	// TODO
-	//lineRGBA[0] = context->lineColorR;
-	//lineRGBA[1] = context->lineColorG;
-	//lineRGBA[2] = context->lineColorB;
-	//lineRGBA[3] = context->lineColorA;
-
+	cellFont.todo("cellFontGraphicsGetLineRGBA()");
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellFont.h b/rpcs3/Emu/Cell/Modules/cellFont.h
index 7b6e2ccf57..ea6e984859 100644
--- a/rpcs3/Emu/Cell/Modules/cellFont.h
+++ b/rpcs3/Emu/Cell/Modules/cellFont.h
@@ -94,30 +94,12 @@ enum
 	CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_VAGR2_SET            = 0x00300224,
 };
 
-enum
-{
-	CELL_FONT_LIBRARY_TYPE_NONE = 0
-};
-
 enum
 {
 	CELL_FONT_MAP_FONT    = 0,
 	CELL_FONT_MAP_UNICODE = 1,
 };
 
-enum
-{
-	CELL_FONT_OPEN_MODE_DEFAULT                 = 0,
-	CELL_FONT_OPEN_MODE_IGNORE_VERTICAL_METRICS = 1,
-};
-
-enum
-{
-	CELL_FONT_GRAPHICS_DRAW_TYPE_MONO          = 0,
-	CELL_FONT_GRAPHICS_DRAW_TYPE_COLOR         = 1,
-	CELL_FONT_GRAPHICS_DRAW_TYPE_COLOR_REVERSE = 2,
-};
-
 //Custom enum to determine the origin of a CellFont object
 enum
 {
@@ -127,8 +109,6 @@ enum
 	CELL_FONT_OPEN_MEMORY,
 };
 
-constexpr f32 CELL_FONT_GLYPH_OUTLINE_CONTROL_DISTANCE_DEFAULT = 0.125f;
-
 
 using CellFontMallocCallback = vm::ptr<void>(vm::ptr<void> arg, u32 size);
 using CellFontFreeCallback = void(vm::ptr<void> arg, vm::ptr<void> ptr);
@@ -168,7 +148,7 @@ struct CellFontLibrary
 {
 	be_t<u32> libraryType;
 	be_t<u32> libraryVersion;
-	vm::bptr<u32> SystemClosed;
+	// ...
 };
 
 struct CellFontType
@@ -191,24 +171,6 @@ struct CellFontVerticalLayout
 	be_t<f32> effectWidth;
 };
 
-struct CellFontVertexesGlyphSubHeader
-{
-	be_t<u32> size;
-	be_t<f32> SystemReserved[11];
-};
-
-struct CellFontVertexesGlyphData
-{
-	const be_t<u32> size;
-	vm::bptr<f32> SystemClosed;
-};
-
-struct CellFontVertexesGlyph
-{
-	vm::bptr<CellFontVertexesGlyphData> data;
-	vm::bptr<CellFontVertexesGlyphSubHeader> subHeader;
-};
-
 struct CellFontGlyphMetrics
 {
 	be_t<f32> width;
@@ -223,64 +185,6 @@ struct CellFontGlyphMetrics
 	be_t<f32> v_advance;
 };
 
-struct CellFontGlyphOutline
-{
-	be_t<s16> contoursCount;
-	be_t<s16> pointsCount;
-
-	struct Point
-	{
-		be_t<f32> x;
-		be_t<f32> y;
-	};
-	vm::bptr<Point> points;
-	vm::bptr<u8> pointTags;
-	vm::bptr<u16> contourIndexs;
-
-	be_t<u32> flags;
-
-	vm::bptr<void> generateEnv;
-};
-
-using CellFontGetOutlineVertexCallback = vm::ptr<void>(vm::ptr<void> arg, s32 contourN, s32 vertexNumber, s32 vertexAttr, f32 x, f32 y);
-
-struct CellFontGetOutlineVertexesIF
-{
-	vm::bptr<CellFontGetOutlineVertexCallback> callback;
-	vm::bptr<void> arg;
-};
-
-struct CellFontGlyphBoundingBox
-{
-	be_t<f32> min_x;
-	be_t<f32> min_y;
-	be_t<f32> max_x;
-	be_t<f32> max_y;
-};
-
-struct CellFontKerning
-{
-	be_t<f32> offsetX;
-	be_t<f32> offsetY;
-};
-
-struct CellFontGlyphStyle
-{
-	be_t<f32> scale_widthPixel;
-	be_t<f32> scale_heightPixel;
-	be_t<f32> effect_weight;
-	be_t<f32> effect_slant;
-};
-
-struct CellFontGlyph
-{
-	be_t<u16> CF_type;
-	be_t<u16> type;
-	be_t<u32> size;
-	CellFontGlyphMetrics Metrics;
-	CellFontGlyphOutline Outline;
-};
-
 struct CellFontRenderSurface
 {
 	vm::bptr<void> buffer;
@@ -331,16 +235,11 @@ struct CellFontRendererConfig
 
 struct CellFontRenderer
 {
-	vm::bptr<void> systemReserved[64];
+	void *systemReserved[64];
 };
 
 struct CellFontGraphics
 {
 	be_t<u32> graphicsType;
-	vm::bptr<uint32_t> SystemClosed;
-};
-
-struct CellFontGraphicsDrawContext
-{
-	vm::bptr<void> SystemReserved[64];
+	// ...
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellFontFT.cpp b/rpcs3/Emu/Cell/Modules/cellFontFT.cpp
index 3d50e1073c..00241c3bf1 100644
--- a/rpcs3/Emu/Cell/Modules/cellFontFT.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellFontFT.cpp
@@ -5,67 +5,30 @@
 
 LOG_CHANNEL(cellFontFT);
 
+error_code cellFontInitLibraryFreeType()
+{
+	UNIMPLEMENTED_FUNC(cellFontFT);
+	return CELL_OK;
+}
+
 error_code cellFontInitLibraryFreeTypeWithRevision(u64 revisionFlags, vm::ptr<CellFontLibraryConfigFT> config, vm::pptr<CellFontLibrary> lib)
 {
-	cellFontFT.todo("cellFontInitLibraryFreeTypeWithRevision(revisionFlags=0x%llx, config=*0x%x, lib=**0x%x)", revisionFlags, config, lib);
-
-	if (!lib)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	*lib = {};
-
-	if (!config)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
+	cellFontFT.warning("cellFontInitLibraryFreeTypeWithRevision(revisionFlags=0x%llx, config=*0x%x, lib=**0x%x)", revisionFlags, config, lib);
 
 	lib->set(vm::alloc(sizeof(CellFontLibrary), vm::main));
 
 	return CELL_OK;
 }
 
-error_code cellFontInitLibraryFreeType(vm::ptr<CellFontLibraryConfigFT> config, vm::pptr<CellFontLibrary> lib)
+error_code cellFontFTGetRevisionFlags()
 {
-	cellFontFT.todo("cellFontInitLibraryFreeType(config=*0x%x, lib=**0x%x)", config, lib);
-
-	uint64_t revisionFlags = 0LL;
-	//cellFontFTGetStubRevisionFlags(&revisionFlags);
-	return cellFontInitLibraryFreeTypeWithRevision(revisionFlags, config, lib);
+	UNIMPLEMENTED_FUNC(cellFontFT);
+	return CELL_OK;
 }
 
-void cellFontFTGetRevisionFlags(vm::ptr<u64> revisionFlags)
+error_code cellFontFTGetInitializedRevisionFlags()
 {
-	cellFontFT.notice("cellFontFTGetRevisionFlags(revisionFlags=*0x%x)", revisionFlags);
-
-	if (revisionFlags)
-	{
-		*revisionFlags = 0x43;
-	}
-}
-
-error_code cellFontFTGetInitializedRevisionFlags(vm::ptr<u64> revisionFlags)
-{
-	cellFontFT.notice("cellFontFTGetInitializedRevisionFlags(revisionFlags=*0x%x)", revisionFlags);
-
-	if (!revisionFlags)
-	{
-		return CELL_FONT_ERROR_INVALID_PARAMETER;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_FONT_ERROR_UNINITIALIZED;
-	}
-
-	//*revisionFlags = something; // TODO
-
+	UNIMPLEMENTED_FUNC(cellFontFT);
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellFs.cpp b/rpcs3/Emu/Cell/Modules/cellFs.cpp
index bff73f530b..b94c230031 100644
--- a/rpcs3/Emu/Cell/Modules/cellFs.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellFs.cpp
@@ -385,7 +385,7 @@ error_code cellFsGetFreeSize(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<u32>
 		}
 
 		*block_count = *avail / *_block_size;
-		*block_size = ::narrow<u32>(*_block_size);
+		*block_size = *_block_size;
 	}
 
 	return CELL_OK;
@@ -598,7 +598,7 @@ error_code cellFsSetIoBufferFromDefaultContainer(u32 fd, u32 buffer_size, u32 pa
 {
 	cellFs.todo("cellFsSetIoBufferFromDefaultContainer(fd=%d, buffer_size=%d, page_type=%d)", fd, buffer_size, page_type);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -695,7 +695,7 @@ s32 cellFsStReadInit(u32 fd, vm::cptr<CellFsRingBuffer> ringbuf)
 		return CELL_EINVAL;
 	}
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -716,7 +716,7 @@ s32 cellFsStReadFinish(u32 fd)
 {
 	cellFs.todo("cellFsStReadFinish(fd=%d)", fd);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -732,7 +732,7 @@ s32 cellFsStReadGetRingBuf(u32 fd, vm::ptr<CellFsRingBuffer> ringbuf)
 {
 	cellFs.todo("cellFsStReadGetRingBuf(fd=%d, ringbuf=*0x%x)", fd, ringbuf);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -748,7 +748,7 @@ s32 cellFsStReadGetStatus(u32 fd, vm::ptr<u64> status)
 {
 	cellFs.todo("cellFsStReadGetRingBuf(fd=%d, status=*0x%x)", fd, status);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -764,7 +764,7 @@ s32 cellFsStReadGetRegid(u32 fd, vm::ptr<u64> regid)
 {
 	cellFs.todo("cellFsStReadGetRingBuf(fd=%d, regid=*0x%x)", fd, regid);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -780,7 +780,7 @@ s32 cellFsStReadStart(u32 fd, u64 offset, u64 size)
 {
 	cellFs.todo("cellFsStReadStart(fd=%d, offset=0x%llx, size=0x%llx)", fd, offset, size);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -796,7 +796,7 @@ s32 cellFsStReadStop(u32 fd)
 {
 	cellFs.todo("cellFsStReadStop(fd=%d)", fd);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -812,7 +812,7 @@ s32 cellFsStRead(u32 fd, vm::ptr<u8> buf, u64 size, vm::ptr<u64> rsize)
 {
 	cellFs.todo("cellFsStRead(fd=%d, buf=*0x%x, size=0x%llx, rsize=*0x%x)", fd, buf, size, rsize);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -828,7 +828,7 @@ s32 cellFsStReadGetCurrentAddr(u32 fd, vm::ptr<u32> addr, vm::ptr<u64> size)
 {
 	cellFs.todo("cellFsStReadGetCurrentAddr(fd=%d, addr=*0x%x, size=*0x%x)", fd, addr, size);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -844,7 +844,7 @@ s32 cellFsStReadPutCurrentAddr(u32 fd, vm::ptr<u8> addr, u64 size)
 {
 	cellFs.todo("cellFsStReadPutCurrentAddr(fd=%d, addr=*0x%x, size=0x%llx)", fd, addr, size);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -860,7 +860,7 @@ s32 cellFsStReadWait(u32 fd, u64 size)
 {
 	cellFs.todo("cellFsStReadWait(fd=%d, size=0x%llx)", fd, size);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -876,7 +876,7 @@ s32 cellFsStReadWaitCallback(u32 fd, u64 size, vm::ptr<void(s32 xfd, u64 xsize)>
 {
 	cellFs.todo("cellFsStReadWaitCallback(fd=%d, size=0x%llx, func=*0x%x)", fd, size, func);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -908,7 +908,7 @@ struct fs_aio_thread : ppu_thread
 			s32 error = CELL_EBADF;
 			u64 result = 0;
 
-			const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(aio->fd);
+			const auto file = idm::get<lv2_fs_object, lv2_file>(aio->fd);
 
 			if (!file || (type == 1 && file->flags & CELL_FS_O_WRONLY) || (type == 2 && !(file->flags & CELL_FS_O_ACCMODE)))
 			{
diff --git a/rpcs3/Emu/Cell/Modules/cellGame.cpp b/rpcs3/Emu/Cell/Modules/cellGame.cpp
index 17e190898d..ac37014161 100644
--- a/rpcs3/Emu/Cell/Modules/cellGame.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellGame.cpp
@@ -6,7 +6,6 @@
 #include "Emu/IdManager.h"
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/timers.hpp"
 #include "Emu/Cell/lv2/sys_fs.h"
 #include "Emu/Cell/lv2/sys_sync.h"
 
@@ -18,21 +17,11 @@
 #include "Utilities/StrUtil.h"
 #include "util/init_mutex.hpp"
 #include "util/asm.hpp"
-#include "Crypto/utils.h"
 
 #include <span>
 
 LOG_CHANNEL(cellGame);
 
-vm::gvar<CellHddGameStatGet> g_stat_get;
-vm::gvar<CellHddGameStatSet> g_stat_set;
-vm::gvar<CellHddGameSystemFileParam> g_file_param;
-vm::gvar<CellHddGameCBResult> g_cb_result;
-
-stx::init_lock acquire_lock(stx::init_mutex& mtx, ppu_thread* ppu = nullptr);
-stx::access_lock acquire_access_lock(stx::init_mutex& mtx, ppu_thread* ppu = nullptr);
-stx::reset_lock acquire_reset_lock(stx::init_mutex& mtx, ppu_thread* ppu = nullptr);
-
 template<>
 void fmt_class_string<CellGameError>::format(std::string& out, u64 arg)
 {
@@ -140,18 +129,9 @@ struct content_permission final
 
 	stx::init_mutex init;
 
-	enum class check_mode
-	{
-		not_set,
-		game_data,
-		patch,
-		hdd_game,
-		disc_game
-	};
-
 	atomic_t<u32> can_create = 0;
 	atomic_t<bool> exists = false;
-	atomic_t<check_mode> mode = check_mode::not_set;
+	atomic_t<bool> restrict_sfo_params = true;
 
 	content_permission() = default;
 
@@ -166,7 +146,7 @@ struct content_permission final
 		temp.clear();
 		can_create = 0;
 		exists = false;
-		mode = check_mode::not_set;
+		restrict_sfo_params = true;
 	}
 
 	~content_permission()
@@ -186,228 +166,11 @@ struct content_permission final
 	}
 };
 
-template<>
-void fmt_class_string<content_permission::check_mode>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto error)
-	{
-		switch (error)
-		{
-			STR_CASE(content_permission::check_mode::not_set);
-			STR_CASE(content_permission::check_mode::game_data);
-			STR_CASE(content_permission::check_mode::patch);
-			STR_CASE(content_permission::check_mode::hdd_game);
-			STR_CASE(content_permission::check_mode::disc_game);
-		}
-
-		return unknown;
-	});
-}
-
-template<>
-void fmt_class_string<disc_change_manager::eject_state>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto error)
-	{
-		switch (error)
-		{
-			STR_CASE(disc_change_manager::eject_state::unknown);
-			STR_CASE(disc_change_manager::eject_state::inserted);
-			STR_CASE(disc_change_manager::eject_state::ejected);
-			STR_CASE(disc_change_manager::eject_state::busy);
-		}
-
-		return unknown;
-	});
-}
-
-static bool check_system_ver(vm::cptr<char> systemVersion)
-{
-	// Only allow something like "04.8300".
-	// The disassembly shows that "04.83" would also be considered valid, but the initial strlen check makes this void.
-	return (
-		systemVersion &&
-		std::strlen(systemVersion.get_ptr()) == 7 &&
-		std::isdigit(systemVersion[0]) &&
-		std::isdigit(systemVersion[1]) &&
-		systemVersion[2] == '.' &&
-		std::isdigit(systemVersion[3]) &&
-		std::isdigit(systemVersion[4]) &&
-		std::isdigit(systemVersion[5]) &&
-		std::isdigit(systemVersion[6])
-	);
-}
-
-disc_change_manager::disc_change_manager()
-{
-	Emu.GetCallbacks().enable_disc_eject(false);
-	Emu.GetCallbacks().enable_disc_insert(false);
-}
-
-disc_change_manager::~disc_change_manager()
-{
-	Emu.GetCallbacks().enable_disc_eject(false);
-	Emu.GetCallbacks().enable_disc_insert(false);
-}
-
-error_code disc_change_manager::register_callbacks(vm::ptr<CellGameDiscEjectCallback> func_eject, vm::ptr<CellGameDiscInsertCallback> func_insert)
-{
-	std::lock_guard lock(mtx);
-
-	eject_callback = func_eject;
-	insert_callback = func_insert;
-
-	const bool is_disc_mounted = fs::is_dir(vfs::get("/dev_bdvd/PS3_GAME"));
-
-	if (state == eject_state::unknown)
-	{
-		state = is_disc_mounted ? eject_state::inserted : eject_state::ejected;
-	}
-
-	Emu.GetCallbacks().enable_disc_eject(!!func_eject && is_disc_mounted);
-	Emu.GetCallbacks().enable_disc_insert(!!func_insert && !is_disc_mounted);
-
-	return CELL_OK;
-}
-
-error_code disc_change_manager::unregister_callbacks()
-{
-	const auto unregister = [this]() -> void
-	{
-		eject_callback = vm::null;
-		insert_callback = vm::null;
-
-		Emu.GetCallbacks().enable_disc_eject(false);
-		Emu.GetCallbacks().enable_disc_insert(false);
-	};
-
-	if (is_inserting)
-	{
-		// NOTE: The insert_callback is known to call cellGameUnregisterDiscChangeCallback.
-		// So we keep it out of the mutex lock until it proves to be an issue.
-		unregister();
-	}
-	else
-	{
-		std::lock_guard lock(mtx);
-		unregister();
-	}
-
-	return CELL_OK;
-}
-
-void disc_change_manager::eject_disc()
-{
-	cellGame.notice("Ejecting disc...");
-
-	std::lock_guard lock(mtx);
-
-	if (state != eject_state::inserted)
-	{
-		cellGame.fatal("Can not eject disc in the current state. (state=%s)", state.load());
-		return;
-	}
-
-	state = eject_state::busy;
-	Emu.GetCallbacks().enable_disc_eject(false);
-
-	ensure(eject_callback);
-
-	sysutil_register_cb([](ppu_thread& cb_ppu) -> s32
-	{
-		auto& dcm = g_fxo->get<disc_change_manager>();
-		std::lock_guard lock(dcm.mtx);
-
-		cellGame.notice("Executing eject_callback...");
-		dcm.eject_callback(cb_ppu);
-
-		ensure(vfs::unmount("/dev_bdvd"));
-		ensure(vfs::unmount("/dev_ps2disc"));
-		dcm.state = eject_state::ejected;
-
-		// Re-enable disc insertion only if the callback is still registered
-		Emu.GetCallbacks().enable_disc_insert(!!dcm.insert_callback);
-
-		return CELL_OK;
-	});
-}
-
-void disc_change_manager::insert_disc(u32 disc_type, std::string title_id)
-{
-	cellGame.notice("Inserting disc...");
-
-	std::lock_guard lock(mtx);
-
-	if (state != eject_state::ejected)
-	{
-		cellGame.fatal("Can not insert disc in the current state. (state=%s)", state.load());
-		return;
-	}
-
-	state = eject_state::busy;
-	Emu.GetCallbacks().enable_disc_insert(false);
-
-	ensure(insert_callback);
-
-	is_inserting = true;
-
-	sysutil_register_cb([disc_type, title_id = std::move(title_id)](ppu_thread& cb_ppu) -> s32
-	{
-		auto& dcm = g_fxo->get<disc_change_manager>();
-		std::lock_guard lock(dcm.mtx);
-
-		if (disc_type == CELL_GAME_DISCTYPE_PS3)
-		{
-			vm::var<char[]> _title_id = vm::make_str(title_id);
-			cellGame.notice("Executing insert_callback for title '%s' with disc_type %d...", _title_id.get_ptr(), disc_type);
-			dcm.insert_callback(cb_ppu, disc_type, _title_id);
-		}
-		else
-		{
-			cellGame.notice("Executing insert_callback with disc_type %d...", disc_type);
-			dcm.insert_callback(cb_ppu, disc_type, vm::null);
-		}
-
-		dcm.state = eject_state::inserted;
-
-		// Re-enable disc ejection only if the callback is still registered
-		Emu.GetCallbacks().enable_disc_eject(!!dcm.eject_callback);
-
-		dcm.is_inserting = false;
-
-		return CELL_OK;
-	});
-}
-
-extern void lv2_sleep(u64 timeout, ppu_thread* ppu = nullptr)
-{
-	if (!ppu)
-	{
-		ppu = ensure(cpu_thread::get_current<ppu_thread>());
-	}
-
-	if (!timeout)
-	{
-		return;
-	}
-
-	const bool had_wait = ppu->state.test_and_set(cpu_flag::wait);
-
-	lv2_obj::sleep(*ppu);
-	lv2_obj::wait_timeout(timeout);
-	ppu->check_state();
-
-	if (had_wait)
-	{
-		ppu->state += cpu_flag::wait;
-	}
-}
-
 error_code cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr<char> dirName, u32 errDialog, vm::ptr<CellHddGameStatCallback> funcStat, u32 container)
 {
 	cellGame.warning("cellHddGameCheck(version=%d, dirName=%s, errDialog=%d, funcStat=*0x%x, container=%d)", version, dirName, errDialog, funcStat, container);
 
-	if (version != CELL_GAMEDATA_VERSION_CURRENT || !dirName || !funcStat || sysutil_check_name_string(dirName.get_ptr(), 1, CELL_GAME_DIRNAME_SIZE) != 0)
+	if (!dirName || !funcStat || sysutil_check_name_string(dirName.get_ptr(), 1, CELL_GAME_DIRNAME_SIZE) != 0)
 	{
 		return CELL_HDDGAME_ERROR_PARAM;
 	}
@@ -426,39 +189,35 @@ error_code cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr<char> dirName
 	if (!new_data)
 	{
 		const auto cat = psf::get_string(sfo, "CATEGORY", "");
-		if (!psf::is_cat_hdd(cat))
+		if (cat != "HG"sv && cat != "AM"sv && cat != "AP"sv && cat != "AT"sv && cat != "AV"sv && cat != "BV"sv && cat != "WT"sv)
 		{
-			return { CELL_GAMEDATA_ERROR_BROKEN, "CATEGORY='%s'", cat };
+			return { CELL_GAMEDATA_ERROR_BROKEN, fmt::format("CATEGORY='%s'", cat) };
 		}
 	}
 
 	const std::string usrdir = dir + "/USRDIR";
 
-	auto& get = g_stat_get;
-	auto& set = g_stat_set;
-	auto& result = g_cb_result;
+	vm::var<CellHddGameCBResult> result;
+	vm::var<CellHddGameStatGet> get;
+	vm::var<CellHddGameStatSet> set;
 
-	std::memset(get.get_ptr(), 0, sizeof(*get));
-	std::memset(set.get_ptr(), 0, sizeof(*set));
-	std::memset(result.get_ptr(), 0, sizeof(*result));
-
-	const std::string local_dir = vfs::get(dir);
-
-	// 40 GB - 256 kilobytes. The reasoning is that many games take this number and multiply it by 1024, to get the amount of bytes. With 40GB exactly,
-	// this will result in an overflow, and the size would be 0, preventing the game from running. By reducing 256 kilobytes, we make sure that even
+	// 40 GB - 1 kilobyte. The reasoning is that many games take this number and multiply it by 1024, to get the amount of bytes. With 40GB exactly,
+	// this will result in an overflow, and the size would be 0, preventing the game from running. By reducing 1 kilobyte, we make sure that even
 	// after said overflow, the number would still be high enough to contain the game's data.
-	get->hddFreeSizeKB = 40 * 1024 * 1024 - 256;
+	get->hddFreeSizeKB = 40 * 1024 * 1024 - 1;
 	get->isNewData = CELL_HDDGAME_ISNEWDATA_EXIST;
 	get->sysSizeKB = 0; // TODO
-	get->st_atime_ = 0; // TODO
-	get->st_ctime_ = 0; // TODO
-	get->st_mtime_ = 0; // TODO
+	get->atime = 0; // TODO
+	get->ctime = 0; // TODO
+	get->mtime = 0; // TODO
 	get->sizeKB = CELL_HDDGAME_SIZEKB_NOTCALC;
 	strcpy_trunc(get->contentInfoPath, dir);
-	strcpy_trunc(get->gameDataPath, usrdir);
+	strcpy_trunc(get->hddGamePath, usrdir);
 
-	std::memset(g_file_param.get_ptr(), 0, sizeof(*g_file_param));
-	set->setParam = g_file_param;
+	vm::var<CellHddGameSystemFileParam> setParam;
+	set->setParam = setParam;
+
+	const std::string& local_dir = vfs::get(dir);
 
 	if (!fs::is_dir(local_dir))
 	{
@@ -468,16 +227,16 @@ error_code cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr<char> dirName
 	else
 	{
 		// TODO: Is cellHddGameCheck really responsible for writing the information in get->getParam ? (If not, delete this else)
-		const psf::registry psf = psf::load_object(local_dir + "/PARAM.SFO");
+		const auto& psf = psf::load_object(fs::file(local_dir +"/PARAM.SFO"));
 
 		// Some following fields may be zero in old FW 1.00 version PARAM.SFO
-		if (psf.contains("PARENTAL_LEVEL")) get->getParam.parentalLevel = ::at32(psf, "PARENTAL_LEVEL").as_integer();
-		if (psf.contains("ATTRIBUTE")) get->getParam.attribute = ::at32(psf, "ATTRIBUTE").as_integer();
-		if (psf.contains("RESOLUTION")) get->getParam.resolution = ::at32(psf, "RESOLUTION").as_integer();
-		if (psf.contains("SOUND_FORMAT")) get->getParam.soundFormat = ::at32(psf, "SOUND_FORMAT").as_integer();
-		if (psf.contains("TITLE")) strcpy_trunc(get->getParam.title, ::at32(psf, "TITLE").as_string());
-		if (psf.contains("APP_VER")) strcpy_trunc(get->getParam.dataVersion, ::at32(psf, "APP_VER").as_string());
-		if (psf.contains("TITLE_ID")) strcpy_trunc(get->getParam.titleId, ::at32(psf, "TITLE_ID").as_string());
+		if (psf.count("PARENTAL_LEVEL") != 0) get->getParam.parentalLevel = psf.at("PARENTAL_LEVEL").as_integer();
+		if (psf.count("ATTRIBUTE") != 0) get->getParam.attribute = psf.at("ATTRIBUTE").as_integer();
+		if (psf.count("RESOLUTION") != 0) get->getParam.resolution = psf.at("RESOLUTION").as_integer();
+		if (psf.count("SOUND_FORMAT") != 0) get->getParam.soundFormat = psf.at("SOUND_FORMAT").as_integer();
+		if (psf.count("TITLE") != 0) strcpy_trunc(get->getParam.title, psf.at("TITLE").as_string());
+		if (psf.count("APP_VER") != 0) strcpy_trunc(get->getParam.dataVersion, psf.at("APP_VER").as_string());
+		if (psf.count("TITLE_ID") != 0) strcpy_trunc(get->getParam.titleId, psf.at("TITLE_ID").as_string());
 
 		for (u32 i = 0; i < CELL_HDDGAME_SYSP_LANGUAGE_NUM; i++)
 		{
@@ -487,8 +246,6 @@ error_code cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr<char> dirName
 
 	// TODO ?
 
-	lv2_sleep(5000, &ppu);
-
 	funcStat(ppu, result, get, set);
 
 	std::string error_msg;
@@ -500,8 +257,6 @@ error_code cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr<char> dirName
 		// Game confirmed that it wants to create directory
 		const auto setParam = set->setParam;
 
-		lv2_sleep(2000, &ppu);
-
 		if (new_data)
 		{
 			if (!setParam)
@@ -523,7 +278,7 @@ error_code cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr<char> dirName
 		// 		psf::assign(sfo, "CATEGORY", psf::string(3, "HG"));
 		// 	}
 
-		// 	psf::assign(sfo, "TITLE_ID", psf::string(TITLEID_SFO_ENTRY_SIZE, setParam->titleId));
+		// 	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));
 		// 	psf::assign(sfo, "PARENTAL_LEVEL", +setParam->parentalLevel);
@@ -580,7 +335,7 @@ error_code cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr<char> dirName
 		lv2_obj::sleep(ppu);
 
 		// Get user confirmation by opening a blocking dialog
-		error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_ERROR | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_OK | CELL_MSGDIALOG_TYPE_DISABLE_CANCEL_ON, vm::make_str(error_msg), msg_dialog_source::_cellGame);
+		error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_ERROR | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_OK | CELL_MSGDIALOG_TYPE_DISABLE_CANCEL_ON, vm::make_str(error_msg));
 
 		// Reschedule after a blocking dialog returns
 		if (ppu.check_state())
@@ -593,10 +348,6 @@ error_code cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr<char> dirName
 			return CELL_GAMEDATA_ERROR_INTERNAL;
 		}
 	}
-	else
-	{
-		lv2_sleep(2000, &ppu);
-	}
 
 	return CELL_HDDGAME_ERROR_CBRESULT;
 }
@@ -609,29 +360,14 @@ error_code cellHddGameCheck2(ppu_thread& ppu, u32 version, vm::cptr<char> dirNam
 	return cellHddGameCheck(ppu, version, dirName, errDialog, funcStat, container);
 }
 
-error_code cellHddGameGetSizeKB(ppu_thread& ppu, vm::ptr<u32> size)
+error_code cellHddGameGetSizeKB(vm::ptr<u32> size)
 {
-	ppu.state += cpu_flag::wait;
-
 	cellGame.warning("cellHddGameGetSizeKB(size=*0x%x)", size);
 
-	if (!size)
-	{
-		return CELL_HDDGAME_ERROR_PARAM;
-	}
-
-	lv2_obj::sleep(ppu);
-
-	const u64 start_sleep = ppu.start_time;
-
 	const std::string local_dir = vfs::get(Emu.GetDir());
 
 	const auto dirsz = fs::get_dir_size(local_dir, 1024);
 
-	// This function is very slow by nature
-	// TODO: Check if after first use the result is being cached so the sleep can be reduced in this case
-	lv2_sleep(utils::sub_saturate<u64>(dirsz == umax ? 2000 : 200000, get_guest_system_time() - start_sleep), &ppu);
-
 	if (dirsz == umax)
 	{
 		const auto error = fs::g_tls_error;
@@ -644,8 +380,7 @@ error_code cellHddGameGetSizeKB(ppu_thread& ppu, vm::ptr<u32> size)
 		return CELL_HDDGAME_ERROR_FAILURE;
 	}
 
-	ppu.check_state();
-	*size = ::narrow<s32>(dirsz / 1024);
+	*size = ::narrow<u32>(dirsz / 1024);
 
 	return CELL_OK;
 }
@@ -654,7 +389,7 @@ error_code cellHddGameSetSystemVer(vm::cptr<char> systemVersion)
 {
 	cellGame.todo("cellHddGameSetSystemVer(systemVersion=%s)", systemVersion);
 
-	if (!check_system_ver(systemVersion))
+	if (!systemVersion)
 	{
 		return CELL_HDDGAME_ERROR_PARAM;
 	}
@@ -665,13 +400,11 @@ error_code cellHddGameSetSystemVer(vm::cptr<char> systemVersion)
 error_code cellHddGameExitBroken()
 {
 	cellGame.warning("cellHddGameExitBroken()");
-	return open_exit_dialog(get_localized_string(localized_string_id::CELL_HDD_GAME_EXIT_BROKEN), true, msg_dialog_source::_cellGame);
+	return open_exit_dialog(get_localized_string(localized_string_id::CELL_HDD_GAME_EXIT_BROKEN), true);
 }
 
-error_code cellGameDataGetSizeKB(ppu_thread& ppu, vm::ptr<u32> size)
+error_code cellGameDataGetSizeKB(vm::ptr<u32> size)
 {
-	ppu.state += cpu_flag::wait;
-
 	cellGame.warning("cellGameDataGetSizeKB(size=*0x%x)", size);
 
 	if (!size)
@@ -679,18 +412,10 @@ error_code cellGameDataGetSizeKB(ppu_thread& ppu, vm::ptr<u32> size)
 		return CELL_GAMEDATA_ERROR_PARAM;
 	}
 
-	lv2_obj::sleep(ppu);
-
-	const u64 start_sleep = ppu.start_time;
-
 	const std::string local_dir = vfs::get(Emu.GetDir());
 
 	const auto dirsz = fs::get_dir_size(local_dir, 1024);
 
-	// This function is very slow by nature
-	// TODO: Check if after first use the result is being cached so the sleep can be reduced in this case
-	lv2_sleep(utils::sub_saturate<u64>(dirsz == umax ? 2000 : 200000, get_guest_system_time() - start_sleep), &ppu);
-
 	if (dirsz == umax)
 	{
 		const auto error = fs::g_tls_error;
@@ -703,8 +428,7 @@ error_code cellGameDataGetSizeKB(ppu_thread& ppu, vm::ptr<u32> size)
 		return CELL_GAMEDATA_ERROR_FAILURE;
 	}
 
-	ppu.check_state();
-	*size = ::narrow<s32>(dirsz / 1024);
+	*size = ::narrow<u32>(dirsz / 1024);
 
 	return CELL_OK;
 }
@@ -713,7 +437,7 @@ error_code cellGameDataSetSystemVer(vm::cptr<char> systemVersion)
 {
 	cellGame.todo("cellGameDataSetSystemVer(systemVersion=%s)", systemVersion);
 
-	if (!check_system_ver(systemVersion))
+	if (!systemVersion)
 	{
 		return CELL_GAMEDATA_ERROR_PARAM;
 	}
@@ -724,7 +448,7 @@ error_code cellGameDataSetSystemVer(vm::cptr<char> systemVersion)
 error_code cellGameDataExitBroken()
 {
 	cellGame.warning("cellGameDataExitBroken()");
-	return open_exit_dialog(get_localized_string(localized_string_id::CELL_GAME_DATA_EXIT_BROKEN), true, msg_dialog_source::_cellGame);
+	return open_exit_dialog(get_localized_string(localized_string_id::CELL_GAME_DATA_EXIT_BROKEN), true);
 }
 
 error_code cellGameBootCheck(vm::ptr<u32> type, vm::ptr<u32> attributes, vm::ptr<CellGameContentSize> size, vm::ptr<char[CELL_GAME_DIRNAME_SIZE]> dirName)
@@ -738,9 +462,7 @@ error_code cellGameBootCheck(vm::ptr<u32> type, vm::ptr<u32> attributes, vm::ptr
 
 	auto& perm = g_fxo->get<content_permission>();
 
-	lv2_sleep(500);
-
-	const auto init = acquire_lock(perm.init);
+	const auto init = perm.init.init();
 
 	if (!init)
 	{
@@ -750,60 +472,48 @@ error_code cellGameBootCheck(vm::ptr<u32> type, vm::ptr<u32> attributes, vm::ptr
 	std::string dir;
 	psf::registry sfo;
 
-	const std::string& cat = Emu.GetFakeCat();
-
-	u32 _type{};
-
-	if (cat == "DG")
+	if (Emu.GetCat() == "DG")
 	{
-		perm.mode = content_permission::check_mode::disc_game;
-
-		_type = CELL_GAME_GAMETYPE_DISC;
+		*type = CELL_GAME_GAMETYPE_DISC;
 		*attributes = 0; // TODO
 		// TODO: dirName might be a read only string when BootCheck is called on a disc game. (e.g. Ben 10 Ultimate Alien: Cosmic Destruction)
 
-		sfo = psf::load_object(vfs::get("/dev_bdvd/PS3_GAME/PARAM.SFO"));
+		sfo = psf::load_object(fs::file(vfs::get("/dev_bdvd/PS3_GAME/PARAM.SFO")));
 	}
-	else if (cat == "GD")
+	else if (Emu.GetCat() == "GD")
 	{
-		perm.mode = content_permission::check_mode::patch;
-
-		_type = CELL_GAME_GAMETYPE_DISC;
+		*type = CELL_GAME_GAMETYPE_DISC;
 		*attributes = CELL_GAME_ATTRIBUTE_PATCH; // TODO
 
-		sfo = psf::load_object(vfs::get(Emu.GetDir() + "PARAM.SFO"));
+		sfo = psf::load_object(fs::file(vfs::get(Emu.GetDir() + "PARAM.SFO")));
 	}
 	else
 	{
-		perm.mode = content_permission::check_mode::hdd_game;
-
-		_type = CELL_GAME_GAMETYPE_HDD;
+		*type = CELL_GAME_GAMETYPE_HDD;
 		*attributes = 0; // TODO
 
-		sfo = psf::load_object(vfs::get(Emu.GetDir() + "PARAM.SFO"));
-		dir = fmt::trim(Emu.GetDir().substr(fs::get_parent_dir_view(Emu.GetDir()).size() + 1), fs::delim);
+		sfo = psf::load_object(fs::file(vfs::get(Emu.GetDir() + "PARAM.SFO")));
+		dir = Emu.GetTitleID();
 	}
 
-	*type = _type;
-
 	if (size)
 	{
 		// TODO: Use the free space of the computer's HDD where RPCS3 is being run.
-		size->hddFreeSizeKB = 40 * 1024 * 1024 - 256; // Read explanation in cellHddGameCheck
+		size->hddFreeSizeKB = 40 * 1024 * 1024 - 1; // Read explanation in cellHddGameCheck
 
 		// TODO: Calculate data size for HG and DG games, if necessary.
 		size->sizeKB = CELL_GAME_SIZEKB_NOTCALC;
 		size->sysSizeKB = 4;
 	}
 
-	if (_type == u32{CELL_GAME_GAMETYPE_HDD} && dirName)
+	if (*type == u32{CELL_GAME_GAMETYPE_HDD} && dirName)
 	{
-		ensure(dir.size() < CELL_GAME_DIRNAME_SIZE);
-		strcpy_trunc(*dirName, dir);
+		strcpy_trunc(*dirName, Emu.GetTitleID());
 	}
 
 	perm.dir = std::move(dir);
 	perm.sfo = std::move(sfo);
+	perm.restrict_sfo_params = *type == u32{CELL_GAME_GAMETYPE_HDD}; // Ratchet & Clank: All 4 One (PSN versions) rely on this error checking (TODO: Needs proper hw tests)
 	perm.exists = true;
 
 	return CELL_OK;
@@ -813,18 +523,16 @@ error_code cellGamePatchCheck(vm::ptr<CellGameContentSize> size, vm::ptr<void> r
 {
 	cellGame.warning("cellGamePatchCheck(size=*0x%x, reserved=*0x%x)", size, reserved);
 
-	lv2_sleep(5000);
-
 	if (Emu.GetCat() != "GD")
 	{
 		return CELL_GAME_ERROR_NOTPATCH;
 	}
 
-	psf::registry sfo = psf::load_object(vfs::get(Emu.GetDir() + "PARAM.SFO"));
+	psf::registry sfo = psf::load_object(fs::file(vfs::get(Emu.GetDir() + "PARAM.SFO")));
 
 	auto& perm = g_fxo->get<content_permission>();
 
-	const auto init = acquire_lock(perm.init);
+	const auto init = perm.init.init();
 
 	if (!init)
 	{
@@ -834,14 +542,14 @@ error_code cellGamePatchCheck(vm::ptr<CellGameContentSize> size, vm::ptr<void> r
 	if (size)
 	{
 		// TODO: Use the free space of the computer's HDD where RPCS3 is being run.
-		size->hddFreeSizeKB = 40 * 1024 * 1024 - 256; // Read explanation in cellHddGameCheck
+		size->hddFreeSizeKB = 40 * 1024 * 1024 - 1; // Read explanation in cellHddGameCheck
 
 		// TODO: Calculate data size for patch data, if necessary.
 		size->sizeKB = CELL_GAME_SIZEKB_NOTCALC;
 		size->sysSizeKB = 0; // TODO
 	}
 
-	perm.mode = content_permission::check_mode::patch;
+	perm.restrict_sfo_params = false;
 	perm.dir = Emu.GetTitleID();
 	perm.sfo = std::move(sfo);
 	perm.exists = true;
@@ -871,25 +579,20 @@ error_code cellGameDataCheck(u32 type, vm::cptr<char> dirName, vm::ptr<CellGameC
 
 	auto& perm = g_fxo->get<content_permission>();
 
-	auto init = acquire_lock(perm.init);
+	auto init = perm.init.init();
 
 	if (!init)
 	{
-		lv2_sleep(300);
 		return CELL_GAME_ERROR_BUSY;
 	}
 
-	// This function is incredibly slow, slower for DISC type and even if the game/disc data does not exist
-	// Null size does not change it
-	lv2_sleep(type == CELL_GAME_GAMETYPE_DISC ? 300000 : 120000);
-
 	auto [sfo, psf_error] = psf::load(vfs::get(dir + "/PARAM.SFO"));
 
 	if (const std::string_view cat = psf::get_string(sfo, "CATEGORY"); [&]()
 	{
 		switch (type)
 		{
-		case CELL_GAME_GAMETYPE_HDD: return !psf::is_cat_hdd(cat);
+		case CELL_GAME_GAMETYPE_HDD: return cat != "HG"sv && cat != "AM"sv && cat != "AP"sv && cat != "AT"sv && cat != "AV"sv && cat != "BV"sv && cat != "WT"sv;
 		case CELL_GAME_GAMETYPE_GAMEDATA: return cat != "GD"sv;
 		case CELL_GAME_GAMETYPE_DISC: return cat != "DG"sv;
 		default: fmt::throw_exception("Unreachable");
@@ -899,23 +602,28 @@ error_code cellGameDataCheck(u32 type, vm::cptr<char> dirName, vm::ptr<CellGameC
 		if (psf_error != psf::error::stream)
 		{
 			init.cancel();
-			return {CELL_GAME_ERROR_BROKEN, "psf::error='%s', type='%d' CATEGORY='%s'", psf_error, type, cat};
+			return {CELL_GAME_ERROR_BROKEN, fmt::format("psf::error='%s', type='%d' CATEGORY='%s'", psf_error, type, cat)};
 		}
 	}
 
 	if (size)
 	{
 		// TODO: Use the free space of the computer's HDD where RPCS3 is being run.
-		size->hddFreeSizeKB = 40 * 1024 * 1024 - 256; // Read explanation in cellHddGameCheck
+		size->hddFreeSizeKB = 40 * 1024 * 1024 - 1; // Read explanation in cellHddGameCheck
 
 		// TODO: Calculate data size for game data, if necessary.
-		size->sizeKB = sfo.empty() ? 0 : CELL_GAME_SIZEKB_NOTCALC;
+		size->sizeKB = CELL_GAME_SIZEKB_NOTCALC;
 		size->sysSizeKB = 0; // TODO
 	}
 
 	perm.dir = std::move(name);
-	perm.can_create = type == CELL_GAME_GAMETYPE_GAMEDATA;
-	perm.mode = content_permission::check_mode::game_data;
+
+	if (type == CELL_GAME_GAMETYPE_GAMEDATA)
+	{
+		perm.can_create = true;
+	}
+
+	perm.restrict_sfo_params = false;
 
 	if (sfo.empty())
 	{
@@ -928,7 +636,7 @@ error_code cellGameDataCheck(u32 type, vm::cptr<char> dirName, vm::ptr<CellGameC
 	return CELL_OK;
 }
 
-error_code cellGameContentPermit(ppu_thread& ppu, vm::ptr<char[CELL_GAME_PATH_MAX]> contentInfoPath, vm::ptr<char[CELL_GAME_PATH_MAX]> usrdirPath)
+error_code cellGameContentPermit(vm::ptr<char[CELL_GAME_PATH_MAX]> contentInfoPath, vm::ptr<char[CELL_GAME_PATH_MAX]> usrdirPath)
 {
 	cellGame.warning("cellGameContentPermit(contentInfoPath=*0x%x, usrdirPath=*0x%x)", contentInfoPath, usrdirPath);
 
@@ -939,7 +647,7 @@ error_code cellGameContentPermit(ppu_thread& ppu, vm::ptr<char[CELL_GAME_PATH_MA
 
 	auto& perm = g_fxo->get<content_permission>();
 
-	const auto init = acquire_reset_lock(perm.init);
+	const auto init = perm.init.reset();
 
 	if (!init)
 	{
@@ -956,53 +664,15 @@ error_code cellGameContentPermit(ppu_thread& ppu, vm::ptr<char[CELL_GAME_PATH_MA
 		return CELL_OK;
 	}
 
-	lv2_obj::sleep(ppu);
-
-	const u64 start_sleep = ppu.start_time;
-
 	if (!perm.temp.empty())
 	{
-		std::vector<shared_ptr<lv2_file>> lv2_files;
-
-		const std::string real_dir = vfs::get(dir) + "/";
-
-		std::lock_guard lock(g_mp_sys_dev_hdd0.mutex);
-
 		// Create PARAM.SFO
 		fs::pending_file temp(perm.temp + "/PARAM.SFO");
 		temp.file.write(psf::save_object(perm.sfo));
 		ensure(temp.commit());
 
-		idm::select<lv2_fs_object, lv2_file>([&](u32 id, lv2_file& file)
-		{
-			if (file.mp != &g_mp_sys_dev_hdd0)
-			{
-				return;
-			}
-
-			if (real_dir.starts_with(file.real_path))
-			{
-				if (!file.file)
-				{
-					return;
-				}
-
-				if (file.flags & CELL_FS_O_ACCMODE)
-				{
-					// Synchronize outside IDM lock scope
-					lv2_files.emplace_back(ensure(idm::get_unlocked<lv2_fs_object, lv2_file>(id)));
-				}
-			}
-		});
-
-		for (auto& file : lv2_files)
-		{
-			// For atomicity
-			file->file.sync();
-		}
-
 		// Make temporary directory persistent (atomically)
-		if (vfs::host::rename(perm.temp, real_dir, &g_mp_sys_dev_hdd0, false, false))
+		if (vfs::host::rename(perm.temp, vfs::get(dir), &g_mp_sys_dev_hdd0, false))
 		{
 			cellGame.success("cellGameContentPermit(): directory '%s' has been created", dir);
 
@@ -1022,9 +692,6 @@ error_code cellGameContentPermit(ppu_thread& ppu, vm::ptr<char[CELL_GAME_PATH_MA
 		ensure(temp.commit());
 	}
 
-	// This function is very slow by nature
-	lv2_sleep(utils::sub_saturate<u64>(!perm.temp.empty() || perm.can_create ? 200000 : 2000, get_guest_system_time() - start_sleep), &ppu);
-
 	// Cleanup
 	perm.reset();
 
@@ -1035,11 +702,11 @@ error_code cellGameContentPermit(ppu_thread& ppu, vm::ptr<char[CELL_GAME_PATH_MA
 
 error_code cellGameDataCheckCreate2(ppu_thread& ppu, u32 version, vm::cptr<char> dirName, u32 errDialog, vm::ptr<CellGameDataStatCallback> funcStat, u32 container)
 {
-	cellGame.success("cellGameDataCheckCreate2(version=0x%x, dirName=%s, errDialog=0x%x, funcStat=*0x%x, container=%d)", version, dirName, errDialog, funcStat, container);
+	cellGame.error("cellGameDataCheckCreate2(version=0x%x, dirName=%s, errDialog=0x%x, funcStat=*0x%x, container=%d)", version, dirName, errDialog, funcStat, container);
 
 	//older sdk. it might not care about game type.
 
-	if (version != CELL_GAMEDATA_VERSION_CURRENT || !funcStat || !dirName || sysutil_check_name_string(dirName.get_ptr(), 1, CELL_GAME_DIRNAME_SIZE) != 0)
+	if (version != CELL_GAMEDATA_VERSION_CURRENT || errDialog > 1 || !funcStat || sysutil_check_name_string(dirName.get_ptr(), 1, CELL_GAME_DIRNAME_SIZE) != 0)
 	{
 		return CELL_GAMEDATA_ERROR_PARAM;
 	}
@@ -1062,18 +729,14 @@ error_code cellGameDataCheckCreate2(ppu_thread& ppu, u32 version, vm::cptr<char>
 
 	const std::string usrdir = dir + "/USRDIR";
 
-	auto& cbResult = g_cb_result;
-	auto& cbGet = g_stat_get;
-	auto& cbSet = g_stat_set;
-
-	std::memset(cbGet.get_ptr(), 0, sizeof(*cbGet));
-	std::memset(cbSet.get_ptr(), 0, sizeof(*cbSet));
-	std::memset(cbResult.get_ptr(), 0, sizeof(*cbResult));
+	vm::var<CellGameDataCBResult> cbResult;
+	vm::var<CellGameDataStatGet> cbGet;
+	vm::var<CellGameDataStatSet> cbSet;
 
 	cbGet->isNewData = new_data;
 
 	// TODO: Use the free space of the computer's HDD where RPCS3 is being run.
-	cbGet->hddFreeSizeKB = 40 * 1024 * 1024 - 256; // Read explanation in cellHddGameCheck
+	cbGet->hddFreeSizeKB = 40 * 1024 * 1024 - 1; // Read explanation in cellHddGameCheck
 
 	strcpy_trunc(cbGet->contentInfoPath, dir);
 	strcpy_trunc(cbGet->gameDataPath, usrdir);
@@ -1089,7 +752,7 @@ error_code cellGameDataCheckCreate2(ppu_thread& ppu, u32 version, vm::cptr<char>
 
 	cbGet->getParam.attribute = CELL_GAMEDATA_ATTR_NORMAL;
 	cbGet->getParam.parentalLevel = psf::get_integer(sfo, "PARENTAL_LEVEL", 0);
-	strcpy_trunc(cbGet->getParam.dataVersion, psf::get_string(sfo, "APP_VER", psf::get_string(sfo, "VERSION", ""))); // Old games do not have APP_VER key
+	strcpy_trunc(cbGet->getParam.dataVersion, psf::get_string(sfo, "APP_VER", ""));
 	strcpy_trunc(cbGet->getParam.titleId, psf::get_string(sfo, "TITLE_ID", ""));
 	strcpy_trunc(cbGet->getParam.title, psf::get_string(sfo, "TITLE", ""));
 	for (u32 i = 0; i < CELL_HDDGAME_SYSP_LANGUAGE_NUM; i++)
@@ -1097,8 +760,6 @@ error_code cellGameDataCheckCreate2(ppu_thread& ppu, u32 version, vm::cptr<char>
 		strcpy_trunc(cbGet->getParam.titleLang[i], psf::get_string(sfo, fmt::format("TITLE_%02d", i)));
 	}
 
-	lv2_sleep(5000, &ppu);
-
 	funcStat(ppu, cbResult, cbGet, cbSet);
 
 	std::string error_msg;
@@ -1115,8 +776,6 @@ error_code cellGameDataCheckCreate2(ppu_thread& ppu, u32 version, vm::cptr<char>
 		// Game confirmed that it wants to create directory
 		const auto setParam = cbSet->setParam;
 
-		lv2_sleep(2000, &ppu);
-
 		if (new_data)
 		{
 			if (!setParam)
@@ -1137,7 +796,7 @@ error_code cellGameDataCheckCreate2(ppu_thread& ppu, u32 version, vm::cptr<char>
 				psf::assign(sfo, "CATEGORY", psf::string(3, "GD"));
 			}
 
-			psf::assign(sfo, "TITLE_ID", psf::string(TITLEID_SFO_ENTRY_SIZE, setParam->titleId, true));
+			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));
 			psf::assign(sfo, "PARENTAL_LEVEL", +setParam->parentalLevel);
@@ -1152,14 +811,6 @@ error_code cellGameDataCheckCreate2(ppu_thread& ppu, u32 version, vm::cptr<char>
 				psf::assign(sfo, fmt::format("TITLE_%02d", i), psf::string(CELL_GAME_SYSP_TITLE_SIZE, setParam->titleLang[i]));
 			}
 
-			if (!psf::check_registry(sfo))
-			{
-				// This results in CELL_OK, broken SFO and CELL_GAMEDATA_ERROR_BROKEN on the next load
-				// Avoid creation for now
-				cellGame.error("Broken SFO paramters: %s", sfo);
-				return CELL_OK;
-			}
-
 			fs::pending_file temp(vfs::get(dir + "/PARAM.SFO"));
 			temp.file.write(psf::save_object(sfo));
 			ensure(temp.commit());
@@ -1193,13 +844,13 @@ error_code cellGameDataCheckCreate2(ppu_thread& ppu, u32 version, vm::cptr<char>
 		break;
 	}
 
-	if (errDialog == CELL_GAMEDATA_ERRDIALOG_ALWAYS)
+	if (errDialog == CELL_GAMEDATA_ERRDIALOG_ALWAYS) // Maybe != CELL_GAMEDATA_ERRDIALOG_NONE
 	{
 		// Yield before a blocking dialog is being spawned
 		lv2_obj::sleep(ppu);
 
 		// Get user confirmation by opening a blocking dialog
-		error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_ERROR | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_OK | CELL_MSGDIALOG_TYPE_DISABLE_CANCEL_ON, vm::make_str(error_msg), msg_dialog_source::_cellGame);
+		error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_ERROR | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_OK | CELL_MSGDIALOG_TYPE_DISABLE_CANCEL_ON, vm::make_str(error_msg));
 
 		// Reschedule after a blocking dialog returns
 		if (ppu.check_state())
@@ -1212,10 +863,6 @@ error_code cellGameDataCheckCreate2(ppu_thread& ppu, u32 version, vm::cptr<char>
 			return CELL_GAMEDATA_ERROR_INTERNAL;
 		}
 	}
-	else
-	{
-		lv2_sleep(2000, &ppu);
-	}
 
 	return CELL_GAMEDATA_ERROR_CBRESULT;
 }
@@ -1230,7 +877,7 @@ error_code cellGameDataCheckCreate(ppu_thread& ppu, u32 version, vm::cptr<char>
 
 error_code cellGameCreateGameData(vm::ptr<CellGameSetInitParams> init, vm::ptr<char[CELL_GAME_PATH_MAX]> tmp_contentInfoPath, vm::ptr<char[CELL_GAME_PATH_MAX]> tmp_usrdirPath)
 {
-	cellGame.success("cellGameCreateGameData(init=*0x%x, tmp_contentInfoPath=*0x%x, tmp_usrdirPath=*0x%x)", init, tmp_contentInfoPath, tmp_usrdirPath);
+	cellGame.error("cellGameCreateGameData(init=*0x%x, tmp_contentInfoPath=*0x%x, tmp_usrdirPath=*0x%x)", init, tmp_contentInfoPath, tmp_usrdirPath);
 
 	if (!init)
 	{
@@ -1239,9 +886,7 @@ error_code cellGameCreateGameData(vm::ptr<CellGameSetInitParams> init, vm::ptr<c
 
 	auto& perm = g_fxo->get<content_permission>();
 
-	const auto _init = acquire_access_lock(perm.init);
-
-	lv2_sleep(2000);
+	const auto _init = perm.init.access();
 
 	if (!_init || perm.dir.empty())
 	{
@@ -1258,9 +903,6 @@ error_code cellGameCreateGameData(vm::ptr<CellGameSetInitParams> init, vm::ptr<c
 		return CELL_GAME_ERROR_EXIST;
 	}
 
-	// Account for for filesystem operations
-	lv2_sleep(50'000);
-
 	std::string dirname = "_GDATA_" + std::to_string(steady_clock::now().time_since_epoch().count());
 	std::string tmp_contentInfo = "/dev_hdd0/game/" + dirname;
 	std::string tmp_usrdir = "/dev_hdd0/game/" + dirname + "/USRDIR";
@@ -1289,7 +931,7 @@ error_code cellGameCreateGameData(vm::ptr<CellGameSetInitParams> init, vm::ptr<c
 	perm.sfo =
 	{
 		{ "CATEGORY", psf::string(3, "GD") },
-		{ "TITLE_ID", psf::string(TITLEID_SFO_ENTRY_SIZE, init->titleId) },
+		{ "TITLE_ID", psf::string(CELL_GAME_SYSP_TITLEID_SIZE, init->titleId) },
 		{ "TITLE", psf::string(CELL_GAME_SYSP_TITLE_SIZE, init->title) },
 		{ "VERSION", psf::string(CELL_GAME_SYSP_VERSION_SIZE, init->version) },
 	};
@@ -1354,7 +996,7 @@ error_code cellGameDeleteGameData(vm::cptr<char> dirName)
 		if (!_init)
 		{
 			// Or access it
-			if (auto access = acquire_access_lock(perm.init); access)
+			if (auto access = perm.init.access(); access)
 			{
 				// Cannot remove it when it is accessed by cellGameDataCheck
 				// If it is HG data then resort to remove_gd for ERROR_BROKEN
@@ -1387,11 +1029,9 @@ error_code cellGameGetParamInt(s32 id, vm::ptr<s32> value)
 		return CELL_GAME_ERROR_PARAM;
 	}
 
-	lv2_sleep(2000);
-
 	auto& perm = g_fxo->get<content_permission>();
 
-	const auto init = acquire_access_lock(perm.init);
+	const auto init = perm.init.access();
 
 	if (!init)
 	{
@@ -1421,86 +1061,54 @@ error_code cellGameGetParamInt(s32 id, vm::ptr<s32> value)
 	return CELL_OK;
 }
 
-// String key flags
+// String key restriction flags
 enum class strkey_flag : u32
 {
-	get_game_data, // reading is allowed for game data PARAM.SFO
-	set_game_data, // writing is allowed for game data PARAM.SFO
-	get_other,     // reading is allowed for other types of PARAM.SFO
-	//set_other,     // writing is allowed for other types of PARAM.SFO (not possible)
+	get, // reading is restricted
+	set, // writing is restricted
+	read_only, // writing is disallowed (don't mind set flag in this case)
 
 	__bitset_enum_max
 };
 
 struct string_key_info
 {
-public:
-	string_key_info() = default;
-	string_key_info(std::string_view _name, u32 _max_size, bs_t<strkey_flag> _flags)
-		: name(_name), max_size(_max_size), flags(_flags)
-	{}
-
 	std::string_view name;
 	u32 max_size = 0;
-
-	inline bool is_supported(bool is_setter, content_permission::check_mode mode) const
-	{
-		switch (mode)
-		{
-		case content_permission::check_mode::game_data:
-		case content_permission::check_mode::patch: // TODO: it's unclear if patch mode should also support these flags
-		{
-			return !!(flags & (is_setter ? strkey_flag::set_game_data : strkey_flag::get_game_data));
-		}
-		case content_permission::check_mode::hdd_game:
-		case content_permission::check_mode::disc_game:
-		{
-			return !is_setter && (flags & (strkey_flag::get_other));
-		}
-		case content_permission::check_mode::not_set:
-		{
-			fmt::throw_exception("This should never happen!");
-		}
-		}
-
-		return false; // Fixes some VS warning
-	}
-
-private:
-	bs_t<strkey_flag> flags{}; // allowed operations
+	bs_t<strkey_flag> flags;
 };
 
 static string_key_info get_param_string_key(s32 id)
 {
 	switch (id)
 	{
-	case CELL_GAME_PARAMID_TITLE:                    return string_key_info("TITLE", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::get_other + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_DEFAULT:            return string_key_info("TITLE", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::get_other + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_JAPANESE:           return string_key_info("TITLE_00", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_ENGLISH:            return string_key_info("TITLE_01", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_FRENCH:             return string_key_info("TITLE_02", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_SPANISH:            return string_key_info("TITLE_03", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_GERMAN:             return string_key_info("TITLE_04", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_ITALIAN:            return string_key_info("TITLE_05", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_DUTCH:              return string_key_info("TITLE_06", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_PORTUGUESE:         return string_key_info("TITLE_07", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_RUSSIAN:            return string_key_info("TITLE_08", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_KOREAN:             return string_key_info("TITLE_09", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_CHINESE_T:          return string_key_info("TITLE_10", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_CHINESE_S:          return string_key_info("TITLE_11", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_FINNISH:            return string_key_info("TITLE_12", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_SWEDISH:            return string_key_info("TITLE_13", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_DANISH:             return string_key_info("TITLE_14", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_NORWEGIAN:          return string_key_info("TITLE_15", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_POLISH:             return string_key_info("TITLE_16", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_PORTUGUESE_BRAZIL:  return string_key_info("TITLE_17", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_ENGLISH_UK:         return string_key_info("TITLE_18", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
-	case CELL_GAME_PARAMID_TITLE_TURKISH:            return string_key_info("TITLE_19", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::get_game_data + strkey_flag::set_game_data);
+	case CELL_GAME_PARAMID_TITLE:                    return {"TITLE", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set}; // TODO: Is this value correct?
+	case CELL_GAME_PARAMID_TITLE_DEFAULT:            return {"TITLE", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set};
+	case CELL_GAME_PARAMID_TITLE_JAPANESE:           return {"TITLE_00", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_ENGLISH:            return {"TITLE_01", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_FRENCH:             return {"TITLE_02", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_SPANISH:            return {"TITLE_03", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_GERMAN:             return {"TITLE_04", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_ITALIAN:            return {"TITLE_05", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_DUTCH:              return {"TITLE_06", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_PORTUGUESE:         return {"TITLE_07", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_RUSSIAN:            return {"TITLE_08", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_KOREAN:             return {"TITLE_09", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_CHINESE_T:          return {"TITLE_10", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_CHINESE_S:          return {"TITLE_11", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_FINNISH:            return {"TITLE_12", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_SWEDISH:            return {"TITLE_13", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_DANISH:             return {"TITLE_14", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_NORWEGIAN:          return {"TITLE_15", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_POLISH:             return {"TITLE_16", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_PORTUGUESE_BRAZIL:  return {"TITLE_17", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_ENGLISH_UK:         return {"TITLE_18", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
+	case CELL_GAME_PARAMID_TITLE_TURKISH:            return {"TITLE_19", CELL_GAME_SYSP_TITLE_SIZE, strkey_flag::set + strkey_flag::get};
 
-	case CELL_GAME_PARAMID_TITLE_ID:                 return string_key_info("TITLE_ID", CELL_GAME_SYSP_TITLEID_SIZE, strkey_flag::get_game_data + strkey_flag::get_other);
-	case CELL_GAME_PARAMID_VERSION:                  return string_key_info("VERSION", CELL_GAME_SYSP_VERSION_SIZE, strkey_flag::get_game_data);
-	case CELL_GAME_PARAMID_PS3_SYSTEM_VER:           return string_key_info("PS3_SYSTEM_VER", CELL_GAME_SYSP_PS3_SYSTEM_VER_SIZE, {}); // TODO
-	case CELL_GAME_PARAMID_APP_VER:                  return string_key_info("APP_VER", CELL_GAME_SYSP_APP_VER_SIZE, strkey_flag::get_game_data + strkey_flag::get_other);
+	case CELL_GAME_PARAMID_TITLE_ID:                 return {"TITLE_ID", CELL_GAME_SYSP_TITLEID_SIZE, strkey_flag::read_only};
+	case CELL_GAME_PARAMID_VERSION:                  return {"VERSION", CELL_GAME_SYSP_VERSION_SIZE, strkey_flag::get + strkey_flag::read_only};
+	case CELL_GAME_PARAMID_PS3_SYSTEM_VER:           return {"PS3_SYSTEM_VER", CELL_GAME_SYSP_PS3_SYSTEM_VER_SIZE}; // TODO
+	case CELL_GAME_PARAMID_APP_VER:                  return {"APP_VER", CELL_GAME_SYSP_APP_VER_SIZE, strkey_flag::read_only};
 	}
 
 	return {};
@@ -1517,11 +1125,9 @@ error_code cellGameGetParamString(s32 id, vm::ptr<char> buf, u32 bufsize)
 
 	auto& perm = g_fxo->get<content_permission>();
 
-	lv2_sleep(2000);
+	const auto init = perm.init.access();
 
-	const auto init = acquire_access_lock(perm.init);
-
-	if (!init || perm.mode == content_permission::check_mode::not_set)
+	if (!init)
 	{
 		return CELL_GAME_ERROR_FAILURE;
 	}
@@ -1533,13 +1139,12 @@ error_code cellGameGetParamString(s32 id, vm::ptr<char> buf, u32 bufsize)
 		return CELL_GAME_ERROR_INVALID_ID;
 	}
 
-	if (!key.is_supported(false, perm.mode))
+	if (key.flags & strkey_flag::get && perm.restrict_sfo_params)
 	{
-		// TODO: this error is possibly only returned during debug mode
-		return { CELL_GAME_ERROR_NOTSUPPORTED, "id %d is not supported in the current check mode: %s", id, perm.mode.load() };
+		return CELL_GAME_ERROR_NOTSUPPORTED;
 	}
 
-	const auto value = psf::get_string(perm.sfo, key.name);
+	const auto value = psf::get_string(perm.sfo, std::string(key.name));
 
 	if (value.empty() && !perm.sfo.count(std::string(key.name)))
 	{
@@ -1561,13 +1166,11 @@ error_code cellGameSetParamString(s32 id, vm::cptr<char> buf)
 		return CELL_GAME_ERROR_PARAM;
 	}
 
-	lv2_sleep(2000);
-
 	auto& perm = g_fxo->get<content_permission>();
 
-	const auto init = acquire_access_lock(perm.init);
+	const auto init = perm.init.access();
 
-	if (!init || perm.mode == content_permission::check_mode::not_set)
+	if (!init)
 	{
 		return CELL_GAME_ERROR_FAILURE;
 	}
@@ -1579,17 +1182,17 @@ error_code cellGameSetParamString(s32 id, vm::cptr<char> buf)
 		return CELL_GAME_ERROR_INVALID_ID;
 	}
 
-	if (!perm.can_create || !key.is_supported(true, perm.mode))
+	if (!perm.can_create || key.flags & strkey_flag::read_only || (key.flags & strkey_flag::set && perm.restrict_sfo_params))
 	{
 		return CELL_GAME_ERROR_NOTSUPPORTED;
 	}
 
-	psf::assign(perm.sfo, key.name, psf::string(key.max_size, buf.get_ptr()));
+	psf::assign(perm.sfo, std::string(key.name), psf::string(key.max_size, buf.get_ptr()));
 
 	return CELL_OK;
 }
 
-error_code cellGameGetSizeKB(ppu_thread& ppu, vm::ptr<s32> size)
+error_code cellGameGetSizeKB(vm::ptr<s32> size)
 {
 	cellGame.warning("cellGameGetSizeKB(size=*0x%x)", size);
 
@@ -1600,29 +1203,20 @@ error_code cellGameGetSizeKB(ppu_thread& ppu, vm::ptr<s32> size)
 
 	// Always reset to 0 at start
 	*size = 0;
-	ppu.state += cpu_flag::wait;
 
 	auto& perm = g_fxo->get<content_permission>();
 
-	const auto init = acquire_access_lock(perm.init);
+	const auto init = perm.init.access();
 
 	if (!init)
 	{
 		return CELL_GAME_ERROR_FAILURE;
 	}
 
-	lv2_obj::sleep(ppu);
-
-	const u64 start_sleep = ppu.start_time;
-
 	const std::string local_dir = !perm.temp.empty() ? perm.temp : vfs::get("/dev_hdd0/game/" + perm.dir);
 
 	const auto dirsz = fs::get_dir_size(local_dir, 1024);
 
-	// This function is very slow by nature
-	// TODO: Check if after first use the result is being cached so the sleep can be reduced in this case
-	lv2_sleep(utils::sub_saturate<u64>(dirsz == umax ? 1000 : 200000, get_guest_system_time() - start_sleep), &ppu);
-
 	if (dirsz == umax)
 	{
 		const auto error = fs::g_tls_error;
@@ -1638,8 +1232,7 @@ error_code cellGameGetSizeKB(ppu_thread& ppu, vm::ptr<s32> size)
 		}
 	}
 
-	ppu.check_state();
-	*size = ::narrow<s32>(dirsz / 1024);
+	*size = ::narrow<u32>(dirsz / 1024);
 
 	return CELL_OK;
 }
@@ -1711,11 +1304,10 @@ error_code cellGameContentErrorDialog(s32 type, s32 errNeedSizeKB, vm::cptr<char
 			return CELL_GAME_ERROR_PARAM;
 		}
 
-		error_msg += '\n';
-		error_msg += get_localized_string(localized_string_id::CELL_GAME_ERROR_DIR_NAME, fmt::format("%s", dirName).c_str());
+		error_msg += "\n" + get_localized_string(localized_string_id::CELL_GAME_ERROR_DIR_NAME, fmt::format("%s", dirName).c_str());
 	}
 
-	return open_exit_dialog(error_msg, type > CELL_GAME_ERRDIALOG_NOSPACE, msg_dialog_source::_cellGame);
+	return open_exit_dialog(error_msg, type > CELL_GAME_ERRDIALOG_NOSPACE);
 }
 
 error_code cellGameThemeInstall(vm::cptr<char> usrdirPath, vm::cptr<char> fileName, u32 option)
@@ -1727,144 +1319,18 @@ error_code cellGameThemeInstall(vm::cptr<char> usrdirPath, vm::cptr<char> fileNa
 		return CELL_GAME_ERROR_PARAM;
 	}
 
-	const std::string src_path = vfs::get(fmt::format("%s/%s", usrdirPath, fileName));
-
-	// Use hash to get a hopefully unique filename
-	std::string hash;
-
-	if (fs::file theme = fs::file(src_path))
-	{
-		u32 magic{};
-
-		if (src_path.ends_with(".p3t") || !theme.read(magic) || magic != "P3TF"_u32)
-		{
-			return CELL_GAME_ERROR_INVALID_THEME_FILE;
-		}
-
-		hash = sha256_get_hash(theme.to_string().c_str(), theme.size(), true);
-	}
-	else
-	{
-		return CELL_GAME_ERROR_NOTFOUND;
-	}
-
-	const std::string dst_path = vfs::get(fmt::format("/dev_hdd0/theme/%s_%s.p3t", Emu.GetTitleID(), hash)); // TODO: this is renamed with some other scheme
-
-	if (fs::is_file(dst_path))
-	{
-		cellGame.notice("cellGameThemeInstall: theme already installed: '%s'", dst_path);
-	}
-	else
-	{
-		cellGame.notice("cellGameThemeInstall: copying theme from '%s' to '%s'", src_path, dst_path);
-
-		if (!fs::copy_file(src_path, dst_path, false)) // TODO: new file is write protected
-		{
-			cellGame.error("cellGameThemeInstall: failed to copy theme from '%s' to '%s' (error=%s)", src_path, dst_path, fs::g_tls_error);
-			return CELL_GAME_ERROR_ACCESS_ERROR;
-		}
-	}
-
-	if (false && !fs::remove_file(src_path)) // TODO: disabled for now
-	{
-		cellGame.error("cellGameThemeInstall: failed to remove source theme from '%s' (error=%s)", src_path, fs::g_tls_error);
-	}
-
-	if (option == CELL_GAME_THEME_OPTION_APPLY)
-	{
-		// TODO: apply new theme
-	}
-
 	return CELL_OK;
 }
 
-error_code cellGameThemeInstallFromBuffer(ppu_thread& ppu, u32 fileSize, u32 bufSize, vm::ptr<void> buf, vm::ptr<CellGameThemeInstallCallback> func, u32 option)
+error_code cellGameThemeInstallFromBuffer(u32 fileSize, u32 bufSize, vm::ptr<void> buf, vm::ptr<CellGameThemeInstallCallback> func, u32 option)
 {
 	cellGame.todo("cellGameThemeInstallFromBuffer(fileSize=%d, bufSize=%d, buf=*0x%x, func=*0x%x, option=0x%x)", fileSize, bufSize, buf, func, option);
 
-	if (!buf || !fileSize || (fileSize > bufSize && !func) || bufSize < CELL_GAME_THEMEINSTALL_BUFSIZE_MIN || option > CELL_GAME_THEME_OPTION_APPLY)
+	if (!buf || !fileSize || (fileSize > bufSize && !func) || bufSize <= 4095 || option > CELL_GAME_THEME_OPTION_APPLY)
 	{
 		return CELL_GAME_ERROR_PARAM;
 	}
 
-	const std::string hash = sha256_get_hash(reinterpret_cast<char*>(buf.get_ptr()), fileSize, true);
-	const std::string dst_path = vfs::get(fmt::format("/dev_hdd0/theme/%s_%s.p3t", Emu.GetTitleID(), hash)); // TODO: this is renamed with some scheme
-
-	if (fs::file theme = fs::file(dst_path, fs::write_new + fs::isfile)) // TODO: new file is write protected
-	{
-		const u32 magic = *reinterpret_cast<u32*>(buf.get_ptr());
-
-		if (magic != "P3TF"_u32)
-		{
-			return CELL_GAME_ERROR_INVALID_THEME_FILE;
-		}
-
-		if (func && bufSize < fileSize)
-		{
-			cellGame.notice("cellGameThemeInstallFromBuffer: writing theme with func callback to '%s'", dst_path);
-
-			for (u32 file_offset = 0; file_offset < fileSize;)
-			{
-				const u32 read_size = std::min(bufSize, fileSize - file_offset);
-				cellGame.notice("cellGameThemeInstallFromBuffer: writing %d bytes at pos %d", read_size, file_offset);
-
-				if (theme.write(reinterpret_cast<u8*>(buf.get_ptr()) + file_offset, read_size) != read_size)
-				{
-					cellGame.error("cellGameThemeInstallFromBuffer: failed to write to destination file '%s' (error=%s)", dst_path, fs::g_tls_error);
-
-					if (fs::g_tls_error == fs::error::nospace)
-					{
-						return CELL_GAME_ERROR_NOSPACE;
-					}
-
-					return CELL_GAME_ERROR_ACCESS_ERROR;
-				}
-
-				file_offset += read_size;
-
-				// Report status with callback
-				cellGame.notice("cellGameThemeInstallFromBuffer: func(fileOffset=%d, readSize=%d, buf=0x%x)", file_offset, read_size, buf);
-				const s32 result = func(ppu, file_offset, read_size, buf);
-
-				if (result == CELL_GAME_RET_CANCEL) // same as CELL_GAME_CBRESULT_CANCEL
-				{
-					cellGame.notice("cellGameThemeInstallFromBuffer: theme installation was cancelled");
-					return not_an_error(CELL_GAME_RET_CANCEL);
-				}
-			}
-		}
-		else
-		{
-			cellGame.notice("cellGameThemeInstallFromBuffer: writing theme to '%s'", dst_path);
-
-			if (theme.write(buf.get_ptr(), fileSize) != fileSize)
-			{
-				cellGame.error("cellGameThemeInstallFromBuffer: failed to write to destination file '%s' (error=%s)", dst_path, fs::g_tls_error);
-
-				if (fs::g_tls_error == fs::error::nospace)
-				{
-					return CELL_GAME_ERROR_NOSPACE;
-				}
-
-				return CELL_GAME_ERROR_ACCESS_ERROR;
-			}
-		}
-	}
-	else if (fs::g_tls_error == fs::error::exist) // Do not overwrite files, but continue.
-	{
-		cellGame.notice("cellGameThemeInstallFromBuffer: theme already installed: '%s'", dst_path);
-	}
-	else
-	{
-		cellGame.error("cellGameThemeInstallFromBuffer: failed to open destination file '%s' (error=%s)", dst_path, fs::g_tls_error);
-		return CELL_GAME_ERROR_ACCESS_ERROR;
-	}
-
-	if (option == CELL_GAME_THEME_OPTION_APPLY)
-	{
-		// TODO: apply new theme
-	}
-
 	return CELL_OK;
 }
 
@@ -1878,9 +1344,7 @@ error_code cellDiscGameGetBootDiscInfo(vm::ptr<CellDiscGameSystemFileParam> getP
 	}
 
 	// Always sets 0 at first dword
-	write_to_ptr<u32>(getParam->titleId, 0);
-
-	lv2_sleep(2000);
+	*utils::bless<nse_t<u32, 1>>(getParam->titleId + 0) = 0;
 
 	// This is also called by non-disc games, see NPUB90029
 	static const std::string dir = "/dev_bdvd/PS3_GAME"s;
@@ -1890,40 +1354,40 @@ error_code cellDiscGameGetBootDiscInfo(vm::ptr<CellDiscGameSystemFileParam> getP
 		return CELL_DISCGAME_ERROR_NOT_DISCBOOT;
 	}
 
-	const psf::registry psf = psf::load_object(vfs::get(dir + "/PARAM.SFO"));
+	const auto& psf = psf::load_object(fs::file(vfs::get(dir + "/PARAM.SFO")));
 
-	if (psf.contains("PARENTAL_LEVEL")) getParam->parentalLevel = ::at32(psf, "PARENTAL_LEVEL").as_integer();
-	if (psf.contains("TITLE_ID")) strcpy_trunc(getParam->titleId, ::at32(psf, "TITLE_ID").as_string());
+	if (psf.count("PARENTAL_LEVEL") != 0) getParam->parentalLevel = psf.at("PARENTAL_LEVEL").as_integer();
+	if (psf.count("TITLE_ID") != 0) strcpy_trunc(getParam->titleId, psf.at("TITLE_ID").as_string());
 
 	return CELL_OK;
 }
 
 error_code cellDiscGameRegisterDiscChangeCallback(vm::ptr<CellDiscGameDiscEjectCallback> funcEject, vm::ptr<CellDiscGameDiscInsertCallback> funcInsert)
 {
-	cellGame.warning("cellDiscGameRegisterDiscChangeCallback(funcEject=*0x%x, funcInsert=*0x%x)", funcEject, funcInsert);
+	cellGame.todo("cellDiscGameRegisterDiscChangeCallback(funcEject=*0x%x, funcInsert=*0x%x)", funcEject, funcInsert);
 
-	return g_fxo->get<disc_change_manager>().register_callbacks(funcEject, funcInsert);
+	return CELL_OK;
 }
 
 error_code cellDiscGameUnregisterDiscChangeCallback()
 {
-	cellGame.warning("cellDiscGameUnregisterDiscChangeCallback()");
+	cellGame.todo("cellDiscGameUnregisterDiscChangeCallback()");
 
-	return g_fxo->get<disc_change_manager>().unregister_callbacks();
+	return CELL_OK;
 }
 
 error_code cellGameRegisterDiscChangeCallback(vm::ptr<CellGameDiscEjectCallback> funcEject, vm::ptr<CellGameDiscInsertCallback> funcInsert)
 {
-	cellGame.warning("cellGameRegisterDiscChangeCallback(funcEject=*0x%x, funcInsert=*0x%x)", funcEject, funcInsert);
+	cellGame.todo("cellGameRegisterDiscChangeCallback(funcEject=*0x%x, funcInsert=*0x%x)", funcEject, funcInsert);
 
-	return g_fxo->get<disc_change_manager>().register_callbacks(funcEject, funcInsert);
+	return CELL_OK;
 }
 
 error_code cellGameUnregisterDiscChangeCallback()
 {
-	cellGame.warning("cellGameUnregisterDiscChangeCallback()");
+	cellGame.todo("cellGameUnregisterDiscChangeCallback()");
 
-	return g_fxo->get<disc_change_manager>().unregister_callbacks();
+	return CELL_OK;
 }
 
 void cellSysutil_GameData_init()
@@ -1969,9 +1433,4 @@ DECLARE(ppu_module_manager::cellGame)("cellGame", []()
 
 	REG_FUNC(cellGame, cellGameThemeInstall);
 	REG_FUNC(cellGame, cellGameThemeInstallFromBuffer);
-
-	REG_VAR(cellGame, g_stat_get).flag(MFF_HIDDEN);
-	REG_VAR(cellGame, g_stat_set).flag(MFF_HIDDEN);
-	REG_VAR(cellGame, g_file_param).flag(MFF_HIDDEN);
-	REG_VAR(cellGame, g_cb_result).flag(MFF_HIDDEN);
 });
diff --git a/rpcs3/Emu/Cell/Modules/cellGame.h b/rpcs3/Emu/Cell/Modules/cellGame.h
index a0506cef9d..ed1f64219c 100644
--- a/rpcs3/Emu/Cell/Modules/cellGame.h
+++ b/rpcs3/Emu/Cell/Modules/cellGame.h
@@ -216,11 +216,6 @@ enum // old consts
 	CELL_DISCGAME_SYSP_TITLEID_SIZE=10,
 };
 
-enum
-{
-	TITLEID_SFO_ENTRY_SIZE = 16, // This is the true length on PS3 (TODO: Fix in more places)
-};
-
 struct CellGameDataSystemFileParam
 {
 	char title[CELL_GAMEDATA_SYSP_TITLE_SIZE];
@@ -231,9 +226,7 @@ struct CellGameDataSystemFileParam
 	char reserved1[2];
 	be_t<u32> parentalLevel;
 	be_t<u32> attribute;
-	be_t<u32> resolution; // cellHddGameCheck member: GD doesn't have this value
-	be_t<u32> soundFormat; // cellHddGameCheck member: GD doesn't have this value
-	char reserved2[248];
+	char reserved2[256];
 };
 
 struct CellDiscGameSystemFileParam
@@ -314,40 +307,54 @@ enum
 	CELL_HDDGAME_SIZEKB_NOTCALC        = -1,
 };
 
-using CellHddGameStatGet = CellGameDataStatGet;
-using CellHddGameStatSet = CellGameDataStatSet;
-using CellHddGameSystemFileParam = CellGameDataSystemFileParam;
-using CellHddGameCBResult = CellGameDataCBResult;
+struct CellHddGameSystemFileParam
+{
+	char title[CELL_HDDGAME_SYSP_TITLE_SIZE];
+	char titleLang[CELL_HDDGAME_SYSP_LANGUAGE_NUM][CELL_HDDGAME_SYSP_TITLE_SIZE];
+	char titleId[CELL_HDDGAME_SYSP_TITLEID_SIZE];
+	char reserved0[2];
+	char dataVersion[CELL_HDDGAME_SYSP_VERSION_SIZE];
+	char reserved1[2];
+	be_t<u32> attribute;
+	be_t<u32> parentalLevel;
+	be_t<u32> resolution;
+	be_t<u32> soundFormat;
+	char reserved2[256];
+};
+
+struct CellHddGameCBResult
+{
+	be_t<s32> result;
+	be_t<s32> errNeedSizeKB;
+	vm::bptr<char> invalidMsg;
+	vm::bptr<void> reserved;
+};
+
+struct CellHddGameStatGet
+{
+	be_t<s32> hddFreeSizeKB;
+	be_t<u32> isNewData;
+	char contentInfoPath[CELL_HDDGAME_PATH_MAX];
+	char hddGamePath[CELL_HDDGAME_PATH_MAX];
+	char reserved0[2];
+	be_t<s64> atime;
+	be_t<s64> mtime;
+	be_t<s64> ctime;
+	CellHddGameSystemFileParam getParam;
+	be_t<s32> sizeKB;
+	be_t<s32> sysSizeKB;
+	char reserved1[68];
+};
+
+struct CellHddGameStatSet
+{
+	vm::bptr<CellHddGameSystemFileParam> setParam;
+	vm::bptr<void> reserved;
+};
 
 typedef void(CellHddGameStatCallback)(vm::ptr<CellHddGameCBResult> cbResult, vm::ptr<CellHddGameStatGet> get, vm::ptr<CellHddGameStatSet> set);
-typedef s32(CellGameThemeInstallCallback)(u32 fileOffset, u32 readSize, vm::ptr<void> buf);
+typedef void(CellGameThemeInstallCallback)(u32 fileOffset, u32 readSize, vm::ptr<void> buf);
 typedef void(CellGameDiscEjectCallback)();
 typedef void(CellGameDiscInsertCallback)(u32 discType, vm::ptr<char> titleId);
-using CellDiscGameDiscEjectCallback = CellGameDiscEjectCallback;
-using CellDiscGameDiscInsertCallback = CellGameDiscInsertCallback;
-
-struct disc_change_manager
-{
-	disc_change_manager();
-	virtual ~disc_change_manager();
-
-	std::mutex mtx;
-	atomic_t<bool> is_inserting = false;
-	vm::ptr<CellGameDiscEjectCallback> eject_callback = vm::null;
-	vm::ptr<CellGameDiscInsertCallback> insert_callback = vm::null;
-
-	enum class eject_state
-	{
-		unknown,
-		inserted,
-		ejected,
-		busy
-	};
-	atomic_t<eject_state> state = eject_state::unknown;
-
-	error_code register_callbacks(vm::ptr<CellGameDiscEjectCallback> func_eject, vm::ptr<CellGameDiscInsertCallback> func_insert);
-	error_code unregister_callbacks();
-
-	void eject_disc();
-	void insert_disc(u32 disc_type, std::string title_id);
-};
+typedef void(CellDiscGameDiscEjectCallback)();
+typedef void(CellDiscGameDiscInsertCallback)(u32 discType, vm::ptr<char> titleId);
diff --git a/rpcs3/Emu/Cell/Modules/cellGameExec.cpp b/rpcs3/Emu/Cell/Modules/cellGameExec.cpp
index b5284ce681..359f593dac 100644
--- a/rpcs3/Emu/Cell/Modules/cellGameExec.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellGameExec.cpp
@@ -1,23 +1,13 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/IdManager.h"
-#include "Emu/System.h"
 
 #include "cellGame.h"
 
 LOG_CHANNEL(cellGameExec);
 
-struct game_exec_data
-{
-	atomic_t<u32> execdata = 0; // TODO: pass this to the source application after closing the current application
-};
-
 error_code cellGameSetExitParam(u32 execdata)
 {
 	cellGameExec.todo("cellGameSetExitParam(execdata=0x%x)", execdata);
-
-	g_fxo->get<game_exec_data>().execdata = execdata;
-
 	return CELL_OK;
 }
 
@@ -35,17 +25,9 @@ error_code cellGameGetHomeDataExportPath(vm::ptr<char> exportPath)
 	return CELL_GAME_ERROR_NOAPP;
 }
 
-error_code cellGameGetHomePath(vm::ptr<char> homePath)
+error_code cellGameGetHomePath()
 {
-	cellGameExec.todo("cellGameGetHomePath(homePath=*0x%x)", homePath);
-
-	if (!homePath)
-	{
-		return CELL_GAME_ERROR_PARAM;
-	}
-
-	// TODO: PlayStation home is defunct.
-
+	UNIMPLEMENTED_FUNC(cellGameExec);
 	return CELL_OK;
 }
 
@@ -76,60 +58,24 @@ error_code cellGameGetHomeLaunchOptionPath(vm::ptr<char> commonPath, vm::ptr<cha
 	return CELL_GAME_ERROR_NOAPP;
 }
 
-error_code cellGameExecGame(u32 type, vm::ptr<char> dirName, u32 options, u32 memContainer, u32 execData, u32 userData)
+error_code cellGameExecGame()
 {
-	cellGameExec.todo("cellGameExecGame(type=0x%x, dirName=%s, options=0x%x, memContainer=0x%x, execData=0x%x, userData=0x%x)", type, dirName, options, memContainer, execData, userData);
-	return CELL_OK;
-}
-
-error_code cellGameDeleteGame(vm::ptr<char> dirName, u32 memContainer)
-{
-	cellGameExec.todo("cellGameDeleteGame(dirName=%s, memContainer=0x%x)", dirName, memContainer);
+	UNIMPLEMENTED_FUNC(cellGameExec);
 	return CELL_OK;
 }
 
 error_code cellGameGetBootGameInfo(vm::ptr<u32> type, vm::ptr<char> dirName, vm::ptr<u32> execdata)
 {
-	cellGameExec.todo("cellGameGetBootGameInfo(type=*0x%x, dirName=*0x%x, execdata=*0x%x)", type, dirName, execdata);
+	cellGameExec.todo("cellGameGetBootGameInfo(type=*0x%x, dirName=%s, execdata=*0x%x)", type, dirName, execdata);
 
 	if (!type || !dirName) // execdata can be NULL
 	{
 		return CELL_GAME_ERROR_PARAM;
 	}
 
-	const u32 source_type = Emu.GetBootSourceType();
+	// TODO: Support more boot types
+	*type = CELL_GAME_GAMETYPE_SYS;
 
-	*type = source_type;
-
-	if (execdata)
-	{
-		*execdata = g_fxo->get<game_exec_data>().execdata;
-	}
-
-	if (source_type == CELL_GAME_GAMETYPE_HDD)
-	{
-		const std::string dir_name = Emu.GetDir();
-
-		if (dir_name.size() >= CELL_GAME_DIRNAME_SIZE)
-		{
-			return CELL_HDDGAME_ERROR_INTERNAL; // Speculative
-		}
-
-		std::memcpy(dirName.get_ptr(), dir_name.c_str(), dir_name.size() + 1);
-	}
-
-	return CELL_OK;
-}
-
-error_code cellGameGetExitGameInfo(vm::ptr<u32> status, vm::ptr<u32> type, vm::ptr<char> dirName, vm::ptr<u32> execData, vm::ptr<u32> userData)
-{
-	cellGameExec.todo("cellGameGetExitGameInfo(status=*0x%x, type=*0x%x, dirName=*0x%x, execData=*0x%x, userData=0x%x)", status, type, dirName, execData, userData);
-	return CELL_OK;
-}
-
-error_code cellGameGetList(u32 listBufNum, u32 unk, vm::ptr<u32> listNum, vm::ptr<u32> getListNum, u32 memContainer)
-{
-	cellGameExec.todo("cellGameGetList(listBufNum=0x%x, unk=0x%x, listNum=*0x%x, getListNum=*0x%x, memContainer=0x%x)", listBufNum, unk, listNum, getListNum, memContainer);
 	return CELL_OK;
 }
 
@@ -141,8 +87,5 @@ DECLARE(ppu_module_manager::cellGameExec)("cellGameExec", []()
 	REG_FUNC(cellGameExec, cellGameGetHomeDataImportPath);
 	REG_FUNC(cellGameExec, cellGameGetHomeLaunchOptionPath);
 	REG_FUNC(cellGameExec, cellGameExecGame);
-	REG_FUNC(cellGameExec, cellGameDeleteGame);
 	REG_FUNC(cellGameExec, cellGameGetBootGameInfo);
-	REG_FUNC(cellGameExec, cellGameGetExitGameInfo);
-	REG_FUNC(cellGameExec, cellGameGetList);
 });
diff --git a/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp b/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp
index a96017b16b..f51a1325fb 100644
--- a/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp
@@ -129,7 +129,7 @@ void InitOffsetTable()
 u32 cellGcmGetLabelAddress(u8 index)
 {
 	cellGcmSys.trace("cellGcmGetLabelAddress(index=%d)", index);
-	return rsx::get_current_renderer()->label_addr + 0x10 * index;
+	return g_fxo->get<gcm_config>().gcm_info.label_addr + 0x10 * index;
 }
 
 vm::ptr<CellGcmReportData> cellGcmGetReportDataAddressLocation(u32 index, u32 location)
@@ -153,7 +153,7 @@ vm::ptr<CellGcmReportData> cellGcmGetReportDataAddressLocation(u32 index, u32 lo
 		cellGcmSys.error("cellGcmGetReportDataAddressLocation: Wrong local index (%d)", index);
 	}
 
-	return vm::cast(rsx::get_current_renderer()->label_addr + ::offset32(&RsxReports::report) + index * 0x10);
+	return vm::cast(g_fxo->get<gcm_config>().gcm_info.label_addr + ::offset32(&RsxReports::report) + index * 0x10);
 }
 
 u64 cellGcmGetTimeStamp(u32 index)
@@ -165,8 +165,7 @@ u64 cellGcmGetTimeStamp(u32 index)
 		cellGcmSys.error("cellGcmGetTimeStamp: Wrong local index (%d)", index);
 	}
 
-	const u32 address = rsx::get_current_renderer()->label_addr + ::offset32(&RsxReports::report) + index * 0x10;
-	return *vm::get_super_ptr<u64>(address);
+	return vm::read64(g_fxo->get<gcm_config>().gcm_info.label_addr + ::offset32(&RsxReports::report) + index * 0x10);
 }
 
 u32 cellGcmGetCurrentField()
@@ -193,7 +192,7 @@ u32 cellGcmGetNotifyDataAddress(u32 index)
  */
 vm::ptr<CellGcmReportData> _cellGcmFunc12()
 {
-	return vm::ptr<CellGcmReportData>::make(rsx::get_current_renderer()->label_addr + ::offset32(&RsxReports::report)); // TODO
+	return vm::ptr<CellGcmReportData>::make(g_fxo->get<gcm_config>().gcm_info.label_addr + ::offset32(&RsxReports::report)); // TODO
 }
 
 u32 cellGcmGetReport(u32 type, u32 index)
@@ -222,7 +221,7 @@ u32 cellGcmGetReportDataAddress(u32 index)
 		cellGcmSys.error("cellGcmGetReportDataAddress: Wrong local index (%d)", index);
 	}
 
-	return rsx::get_current_renderer()->label_addr + ::offset32(&RsxReports::report) + index * 0x10;
+	return g_fxo->get<gcm_config>().gcm_info.label_addr + ::offset32(&RsxReports::report) + index * 0x10;
 }
 
 u32 cellGcmGetReportDataLocation(u32 index, u32 location)
@@ -298,32 +297,13 @@ error_code cellGcmBindZcull(u8 index, u32 offset, u32 width, u32 height, u32 cul
 	cellGcmSys.warning("cellGcmBindZcull(index=%d, offset=0x%x, width=%d, height=%d, cullStart=0x%x, zFormat=0x%x, aaFormat=0x%x, zCullDir=0x%x, zCullFormat=0x%x, sFunc=0x%x, sRef=0x%x, sMask=0x%x)",
 		index, offset, width, height, cullStart, zFormat, aaFormat, zCullDir, zCullFormat, sFunc, sRef, sMask);
 
-	auto& gcm_cfg = g_fxo->get<gcm_config>();
-
-	GcmZcullInfo zcull{};
-	zcull.offset = offset;
-	zcull.width = width;
-	zcull.height = height;
-	zcull.cullStart = cullStart;
-	zcull.zFormat = zFormat;
-	zcull.aaFormat = aaFormat;
-	zcull.zcullDir = zCullDir;
-	zcull.zcullFormat = zCullFormat;
-	zcull.sFunc = sFunc;
-	zcull.sRef = sRef;
-	zcull.sMask = sMask;
-	zcull.bound = true;
-
-	const auto gcm_zcull = zcull.pack();
-
-	std::lock_guard lock(gcm_cfg.gcmio_mutex);
-
-	if (auto err = sys_rsx_context_attribute(0x5555'5555, 0x301, index, u64{gcm_zcull.region} << 32 | gcm_zcull.size, u64{gcm_zcull.start} << 32 | gcm_zcull.offset, u64{gcm_zcull.status0} << 32 | gcm_zcull.status1))
+	if (index >= rsx::limits::zculls_count)
 	{
-		return err;
+		return CELL_GCM_ERROR_INVALID_VALUE;
 	}
 
-	vm::_ptr<CellGcmZcullInfo>(gcm_cfg.zculls_addr)[index] = gcm_zcull;
+	rsx::get_current_renderer()->zculls[index].bound = true;
+
 	return CELL_OK;
 }
 
@@ -410,12 +390,6 @@ error_code _cellGcmInitBody(ppu_thread& ppu, vm::pptr<CellGcmContextData> contex
 		render->main_mem_size = 0x10000000;
 	}
 
-	render->isHLE = true;
-	render->local_mem_size = gcm_cfg.local_size;
-
-	ensure(sys_rsx_device_map(ppu, vm::var<u64>{}, vm::null, 0x8) == CELL_OK);
-	ensure(sys_rsx_context_allocate(ppu, vm::var<u32>{}, vm::var<u64>{}, vm::var<u64>{}, vm::var<u64>{}, 0, gcm_cfg.system_mode) == CELL_OK);
-
 	if (gcmMapEaIoAddress(ppu, ioAddress, 0, ioSize, false) != CELL_OK)
 	{
 		return CELL_GCM_ERROR_FAILURE;
@@ -428,14 +402,18 @@ error_code _cellGcmInitBody(ppu_thread& ppu, vm::pptr<CellGcmContextData> contex
 	gcm_cfg.current_config.memoryFrequency = 650000000;
 	gcm_cfg.current_config.coreFrequency = 500000000;
 
-	const u32 rsx_ctxaddr = render->device_addr;
+	// Create contexts
+	const auto area = vm::reserve_map(vm::rsx_context, 0, 0x10000000, 0x403);
+	const u32 rsx_ctxaddr = area ? area->alloc(0x400000) : 0;
 	ensure(rsx_ctxaddr);
 
 	g_defaultCommandBufferBegin = ioAddress;
 	g_defaultCommandBufferFragmentCount = cmdSize / (32 * 1024);
 
 	gcm_cfg.gcm_info.context_addr = rsx_ctxaddr;
-	gcm_cfg.gcm_info.control_addr = render->dma_address;
+	gcm_cfg.gcm_info.control_addr = rsx_ctxaddr + 0x100000;
+	gcm_cfg.gcm_info.label_addr = rsx_ctxaddr + 0x300000;
+
 	gcm_cfg.current_context.begin.set(g_defaultCommandBufferBegin + 4096); // 4 kb reserved at the beginning
 	gcm_cfg.current_context.end.set(g_defaultCommandBufferBegin + 32 * 1024 - 4); // 4b at the end for jump
 	gcm_cfg.current_context.current = gcm_cfg.current_context.begin;
@@ -446,18 +424,26 @@ error_code _cellGcmInitBody(ppu_thread& ppu, vm::pptr<CellGcmContextData> contex
 	gcm_cfg.zculls_addr = vm::alloc(sizeof(CellGcmZcullInfo) * 8, vm::main);
 	gcm_cfg.tiles_addr = vm::alloc(sizeof(CellGcmTileInfo) * 15, vm::main);
 
-	vm::write<CellGcmContextData>(gcm_cfg.gcm_info.context_addr, gcm_cfg.current_context);
+	vm::_ref<CellGcmContextData>(gcm_cfg.gcm_info.context_addr) = gcm_cfg.current_context;
 	context->set(gcm_cfg.gcm_info.context_addr);
 
 	// 0x40 is to offset CellGcmControl from RsxDmaControl
 	gcm_cfg.gcm_info.control_addr += 0x40;
+	auto& ctrl = vm::_ref<CellGcmControl>(gcm_cfg.gcm_info.control_addr);
+	ctrl.put = 0;
+	ctrl.get = 0;
+	ctrl.ref = 0; // Set later to -1 at RSX initialization
 
 	vm::var<u64> _tid;
 	vm::var<char[]> _name = vm::make_str("_gcm_intr_thread");
 	ppu_execute<&sys_ppu_thread_create>(ppu, +_tid, 0x10000, 0, 1, 0x4000, SYS_PPU_THREAD_CREATE_INTERRUPT, +_name);
-	render->intr_thread = idm::get_unlocked<named_thread<ppu_thread>>(static_cast<u32>(*_tid));
+	render->intr_thread = idm::get<named_thread<ppu_thread>>(static_cast<u32>(*_tid));
 	render->intr_thread->state -= cpu_flag::stop;
-	thread_ctrl::notify(*render->intr_thread);
+	render->isHLE = true;
+	render->label_addr = gcm_cfg.gcm_info.label_addr;
+	render->device_addr = gcm_cfg.gcm_info.context_addr;
+	render->local_mem_size = gcm_cfg.local_size;
+	render->init(gcm_cfg.gcm_info.control_addr - 0x40);
 
 	return CELL_OK;
 }
@@ -529,10 +515,7 @@ void cellGcmSetFlipHandler(vm::ptr<void(u32)> handler)
 {
 	cellGcmSys.warning("cellGcmSetFlipHandler(handler=*0x%x)", handler);
 
-	if (const auto rsx = rsx::get_current_renderer(); rsx->is_initialized)
-	{
-		rsx->flip_handler = handler;
-	}
+	rsx::get_current_renderer()->flip_handler = handler;
 }
 
 error_code cellGcmSetFlipHandler2()
@@ -590,7 +573,7 @@ ret_type gcmSetPrepareFlip(ppu_thread& ppu, vm::ptr<CellGcmContextData> ctxt, u3
 
 	if (!old_api && ctxt.addr() == gcm_cfg.gcm_info.context_addr)
 	{
-		vm::_ptr<CellGcmControl>(gcm_cfg.gcm_info.control_addr)->put += cmd_size;
+		vm::_ref<CellGcmControl>(gcm_cfg.gcm_info.control_addr).put += cmd_size;
 	}
 
 	return static_cast<ret_type>(not_an_error(id));
@@ -681,69 +664,51 @@ void cellGcmSetUserHandler(vm::ptr<void(u32)> handler)
 {
 	cellGcmSys.warning("cellGcmSetUserHandler(handler=*0x%x)", handler);
 
-	if (const auto rsx = rsx::get_current_renderer(); rsx->is_initialized)
-	{
-		rsx->user_handler = handler;
-	}
+	rsx::get_current_renderer()->user_handler = handler;
 }
 
-void cellGcmSetUserCommand(ppu_thread& ppu, vm::ptr<CellGcmContextData> ctxt, u32 cause)
+void cellGcmSetUserCommand(vm::ptr<CellGcmContextData> ctxt, u32 cause)
 {
-	cellGcmSys.trace("cellGcmSetUserCommand(ctxt=*0x%x, cause=0x%x)", ctxt, cause);
-
-	if (ctxt->current + 2 >= ctxt->end)
-	{
-		if (s32 res = ctxt->callback(ppu, ctxt, 8 /* ??? */))
-		{
-			cellGcmSys.error("cellGcmSetUserCommand(): callback failed (0x%08x)", res);
-			return;
-		}
-	}
-
-	rsx::make_command(ctxt->current, GCM_SET_USER_COMMAND, { cause });
+	cellGcmSys.todo("cellGcmSetUserCommand(ctxt=*0x%x, cause=0x%x)", ctxt, cause);
 }
 
 void cellGcmSetVBlankHandler(vm::ptr<void(u32)> handler)
 {
 	cellGcmSys.warning("cellGcmSetVBlankHandler(handler=*0x%x)", handler);
 
-	if (const auto rsx = rsx::get_current_renderer(); rsx->is_initialized)
-	{
-		rsx->vblank_handler = handler;
-	}
+	rsx::get_current_renderer()->vblank_handler = handler;
 }
 
-void cellGcmSetWaitFlip(ppu_thread& ppu, vm::ptr<CellGcmContextData> ctxt)
+void cellGcmSetWaitFlip(vm::ptr<CellGcmContextData> ctxt)
 {
-	cellGcmSys.trace("cellGcmSetWaitFlip(ctxt=*0x%x)", ctxt);
+	cellGcmSys.warning("cellGcmSetWaitFlip(ctxt=*0x%x)", ctxt);
 
-	if (ctxt->current + 2 >= ctxt->end)
-	{
-		if (s32 res = ctxt->callback(ppu, ctxt, 8 /* ??? */))
-		{
-			cellGcmSys.error("cellGcmSetWaitFlip(): callback failed (0x%08x)", res);
-			return;
-		}
-	}
-
-	rsx::make_command(ctxt->current, NV406E_SEMAPHORE_OFFSET, { 0x10u, 0 });
+	// TODO: emit RSX command for "wait flip" operation
 }
 
-void cellGcmSetWaitFlipUnsafe(vm::ptr<CellGcmContextData> ctxt)
+error_code cellGcmSetWaitFlipUnsafe()
 {
-	cellGcmSys.trace("cellGcmSetWaitFlipUnsafe(ctxt=*0x%x)", ctxt);
+	cellGcmSys.todo("cellGcmSetWaitFlipUnsafe()");
 
-	rsx::make_command(ctxt->current, NV406E_SEMAPHORE_OFFSET, { 0x10u, 0 });
+	return CELL_OK;
 }
 
 void cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart, u32 zFormat, u32 aaFormat, u32 zCullDir, u32 zCullFormat, u32 sFunc, u32 sRef, u32 sMask)
 {
-	cellGcmSys.warning("cellGcmSetZcull(index=%d, offset=0x%x, width=%d, height=%d, cullStart=0x%x, zFormat=0x%x, aaFormat=0x%x, zCullDir=0x%x, zCullFormat=0x%x, sFunc=0x%x, sRef=0x%x, sMask=0x%x)",
+	cellGcmSys.todo("cellGcmSetZcull(index=%d, offset=0x%x, width=%d, height=%d, cullStart=0x%x, zFormat=0x%x, aaFormat=0x%x, zCullDir=0x%x, zCullFormat=0x%x, sFunc=0x%x, sRef=0x%x, sMask=0x%x)",
 		index, offset, width, height, cullStart, zFormat, aaFormat, zCullDir, zCullFormat, sFunc, sRef, sMask);
 
 	auto& gcm_cfg = g_fxo->get<gcm_config>();
 
-	GcmZcullInfo zcull{};
+	if (index >= rsx::limits::zculls_count)
+	{
+		cellGcmSys.error("cellGcmSetZcull: CELL_GCM_ERROR_INVALID_VALUE");
+		return;
+	}
+
+	const auto render = rsx::get_current_renderer();
+
+	auto& zcull = render->zculls[index];
 	zcull.offset = offset;
 	zcull.width = width;
 	zcull.height = height;
@@ -755,18 +720,9 @@ void cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart,
 	zcull.sFunc = sFunc;
 	zcull.sRef = sRef;
 	zcull.sMask = sMask;
-	zcull.bound = true;
+	zcull.bound = (zCullFormat > 0);
 
-	const auto gcm_zcull = zcull.pack();
-
-	// The second difference between BindZcull and this function (second is no return value) is that this function is not thread-safe
-	// But take care anyway
-	std::lock_guard lock(gcm_cfg.gcmio_mutex);
-
-	if (!sys_rsx_context_attribute(0x5555'5555, 0x301, index, u64{gcm_zcull.region} << 32 | gcm_zcull.size, u64{gcm_zcull.start} << 32 | gcm_zcull.offset, u64{gcm_zcull.status0} << 32 | gcm_zcull.status1))
-	{
-		vm::_ptr<CellGcmZcullInfo>(gcm_cfg.zculls_addr)[index] = gcm_zcull;
-	}
+	vm::_ptr<CellGcmZcullInfo>(gcm_cfg.zculls_addr)[index] = zcull.pack();
 }
 
 error_code cellGcmUnbindTile(u8 index)
@@ -851,7 +807,7 @@ u64 cellGcmGetLastFlipTime()
 {
 	cellGcmSys.trace("cellGcmGetLastFlipTime()");
 
-	return rsx::get_current_renderer()->last_guest_flip_timestamp;
+	return rsx::get_current_renderer()->last_flip_time;
 }
 
 error_code cellGcmGetLastFlipTime2()
@@ -921,12 +877,7 @@ void cellGcmSetGraphicsHandler(vm::ptr<void(u32)> handler)
 
 void cellGcmSetQueueHandler(vm::ptr<void(u32)> handler)
 {
-	cellGcmSys.warning("cellGcmSetQueueHandler(handler=*0x%x)", handler);
-
-	if (const auto rsx = rsx::get_current_renderer(); rsx->is_initialized)
-	{
-		rsx->queue_handler = handler;
-	}
+	cellGcmSys.todo("cellGcmSetQueueHandler(handler=*0x%x)", handler);
 }
 
 error_code cellGcmSetSecondVHandler(vm::ptr<void(u32)> handler)
@@ -1056,7 +1007,7 @@ error_code cellGcmMapEaIoAddressWithFlags(ppu_thread& ppu, u32 ea, u32 io, u32 s
 {
 	cellGcmSys.warning("cellGcmMapEaIoAddressWithFlags(ea=0x%x, io=0x%x, size=0x%x, flags=0x%x)", ea, io, size, flags);
 
-	ensure(flags == CELL_GCM_IOMAP_FLAG_STRICT_ORDERING);
+	ensure(flags == 2 /*CELL_GCM_IOMAP_FLAG_STRICT_ORDERING*/);
 
 	auto& gcm_cfg = g_fxo->get<gcm_config>();
 	std::lock_guard lock(gcm_cfg.gcmio_mutex);
@@ -1312,15 +1263,18 @@ error_code _cellGcmSetFlipCommand2()
 
 void _cellGcmSetFlipCommandWithWaitLabel(ppu_thread& ppu, vm::ptr<CellGcmContextData> ctx, u32 id, u32 label_index, u32 label_value)
 {
-	cellGcmSys.warning("cellGcmSetFlipCommandWithWaitLabel(ctx=*0x%x, id=0x%x, label_index=0x%x, label_value=0x%x)", ctx, id, label_index, label_value);
+	cellGcmSys.todo("cellGcmSetFlipCommandWithWaitLabel(ctx=*0x%x, id=0x%x, label_index=0x%x, label_value=0x%x)", ctx, id, label_index, label_value);
 
-	rsx::make_command(ctx->current, NV406E_SEMAPHORE_OFFSET, { label_index * 0x10, label_value });
+	auto& gcm_cfg = g_fxo->get<gcm_config>();
 
 	if (auto error = gcmSetPrepareFlip<true>(ppu, ctx, id); error < 0)
 	{
 		// TODO: On actual fw this function doesn't have error checks at all
 		cellGcmSys.error("cellGcmSetFlipCommandWithWaitLabel(): gcmSetPrepareFlip failed with %s", CellGcmError{error + 0u});
 	}
+
+	// TODO: Fix this (must enqueue WaitLabel command instead)
+	vm::write32(gcm_cfg.gcm_info.label_addr + 0x10 * label_index, label_value);
 }
 
 error_code cellGcmSetTile(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u8 comp, u16 base, u8 bank)
@@ -1463,7 +1417,7 @@ s32 cellGcmCallback(ppu_thread& ppu, vm::ptr<CellGcmContextData> context, u32 co
 
 	auto& gcm_cfg = g_fxo->get<gcm_config>();
 
-	auto& ctrl = *vm::_ptr<CellGcmControl>(gcm_cfg.gcm_info.control_addr);
+	auto& ctrl = vm::_ref<CellGcmControl>(gcm_cfg.gcm_info.control_addr);
 
 	// Flush command buffer (ie allow RSX to read up to context->current)
 	ctrl.put.exchange(getOffsetFromAddress(context->current.addr()));
@@ -1508,7 +1462,7 @@ DECLARE(ppu_module_manager::cellGcmSys)("cellGcmSys", []()
 	REG_FUNC(cellGcmSys, cellGcmGetReportDataAddress);
 	REG_FUNC(cellGcmSys, cellGcmGetReportDataAddressLocation);
 	REG_FUNC(cellGcmSys, cellGcmGetReportDataLocation);
-	REG_FUNC(cellGcmSys, cellGcmGetTimeStamp).flag(MFF_FORCED_HLE);     // HLE-ing this allows for optimizations around reports
+	REG_FUNC(cellGcmSys, cellGcmGetTimeStamp);
 	REG_FUNC(cellGcmSys, cellGcmGetTimeStampLocation);
 
 	// Command Buffer Control
@@ -1616,5 +1570,5 @@ DECLARE(ppu_module_manager::cellGcmSys)("cellGcmSys", []()
 	REG_FUNC(cellGcmSys, cellGcmGpadCaptureSnapshot);
 
 	// Special
-	REG_HIDDEN_FUNC(cellGcmCallback);
+	REG_FUNC(cellGcmSys, cellGcmCallback).flag(MFF_HIDDEN);
 });
diff --git a/rpcs3/Emu/Cell/Modules/cellGem.cpp b/rpcs3/Emu/Cell/Modules/cellGem.cpp
index ba796be28e..1412ae5c20 100644
--- a/rpcs3/Emu/Cell/Modules/cellGem.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellGem.cpp
@@ -2,64 +2,17 @@
 #include "cellGem.h"
 #include "cellCamera.h"
 
-#include "Emu/Cell/lv2/sys_event.h"
-#include "Emu/Cell/lv2/sys_memory.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/timers.hpp"
 #include "Emu/Io/MouseHandler.h"
-#include "Emu/Io/PadHandler.h"
-#include "Emu/Io/gem_config.h"
-#include "Emu/Io/interception.h"
 #include "Emu/system_config.h"
-#include "Emu/System.h"
 #include "Emu/IdManager.h"
-#include "Emu/RSX/Overlays/overlay_cursor.h"
 #include "Input/pad_thread.h"
-#include "Input/ps_move_config.h"
-#include "Input/ps_move_tracker.h"
-
-#ifdef HAVE_LIBEVDEV
-#include "Emu/Io/evdev_gun_handler.h"
-#endif
 
 #include <cmath> // for fmod
-#include <type_traits>
 
 LOG_CHANNEL(cellGem);
 
-template <>
-void fmt_class_string<gem_btn>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](gem_btn value)
-	{
-		switch (value)
-		{
-		case gem_btn::start: return "Start";
-		case gem_btn::select: return "Select";
-		case gem_btn::triangle: return "Triangle";
-		case gem_btn::circle: return "Circle";
-		case gem_btn::cross: return "Cross";
-		case gem_btn::square: return "Square";
-		case gem_btn::move: return "Move";
-		case gem_btn::t: return "T";
-		case gem_btn::x_axis: return "X-Axis";
-		case gem_btn::y_axis: return "Y-Axis";
-		case gem_btn::combo: return "Combo";
-		case gem_btn::combo_start: return "Combo Start";
-		case gem_btn::combo_select: return "Combo Select";
-		case gem_btn::combo_triangle: return "Combo Triangle";
-		case gem_btn::combo_circle: return "Combo Circle";
-		case gem_btn::combo_cross: return "Combo Cross";
-		case gem_btn::combo_square: return "Combo Square";
-		case gem_btn::combo_move: return "Combo Move";
-		case gem_btn::combo_t: return "Combo T";
-		case gem_btn::count: return "Count";
-		}
-
-		return unknown;
-	});
-}
-
 template <>
 void fmt_class_string<CellGemError>::format(std::string& out, u64 arg)
 {
@@ -106,129 +59,25 @@ void fmt_class_string<CellGemStatus>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
-void fmt_class_string<CellGemVideoConvertFormatEnum>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto format)
-	{
-		switch (format)
-		{
-			STR_CASE(CELL_GEM_NO_VIDEO_OUTPUT);
-			STR_CASE(CELL_GEM_RGBA_640x480);
-			STR_CASE(CELL_GEM_YUV_640x480);
-			STR_CASE(CELL_GEM_YUV422_640x480);
-			STR_CASE(CELL_GEM_YUV411_640x480);
-			STR_CASE(CELL_GEM_RGBA_320x240);
-			STR_CASE(CELL_GEM_BAYER_RESTORED);
-			STR_CASE(CELL_GEM_BAYER_RESTORED_RGGB);
-			STR_CASE(CELL_GEM_BAYER_RESTORED_RASTERIZED);
-		}
-
-		return unknown;
-	});
-}
-
-// last 4 out of 7 ports (7,6,5,4). index starts at 1
-static u32 port_num(u32 gem_num)
-{
-	ensure(gem_num < CELL_GEM_MAX_NUM);
-	return CELL_PAD_MAX_PORT_NUM - gem_num;
-}
-
-// last 4 out of 7 ports (6,5,4,3). index starts at 0
-static u32 pad_num(u32 gem_num)
-{
-	ensure(gem_num < CELL_GEM_MAX_NUM);
-	return (CELL_PAD_MAX_PORT_NUM - 1) - gem_num;
-}
-
 // **********************
 // * HLE helper structs *
 // **********************
 
-#ifdef HAVE_LIBEVDEV
-struct gun_handler
+struct gem_config
 {
-public:
-	gun_handler() = default;
-
-	static constexpr auto thread_name = "Evdev Gun Thread"sv;
-
-	evdev_gun_handler handler{};
-	atomic_t<u32> num_devices{0};
-
-	void operator()()
-	{
-		if (g_cfg.io.move != move_handler::gun)
-		{
-			return;
-		}
-
-		while (thread_ctrl::state() != thread_state::aborting && !Emu.IsStopped())
-		{
-			const bool is_active = !Emu.IsPaused() && handler.is_init();
-
-			if (is_active)
-			{
-				for (u32 i = 0; i < num_devices; i++)
-				{
-					std::scoped_lock lock(handler.mutex);
-					handler.poll(i);
-				}
-			}
-
-			thread_ctrl::wait_for(is_active ? 1000 : 10000);
-		}
-	}
-};
-
-using gun_thread = named_thread<gun_handler>;
-
-#endif
-
-cfg_gems g_cfg_gem_real;
-cfg_fake_gems g_cfg_gem_fake;
-cfg_mouse_gems g_cfg_gem_mouse;
-
-struct gem_config_data
-{
-public:
-	void operator()();
-
-	static constexpr auto thread_name = "Gem Thread"sv;
-
-	atomic_t<u8> state = 0;
+	atomic_t<u32> state = 0;
 
 	struct gem_color
 	{
-		ENABLE_BITWISE_SERIALIZATION;
-
-		f32 r, g, b;
+		float r, g, b;
 
 		gem_color() : r(0.0f), g(0.0f), b(0.0f) {}
-		gem_color(f32 r_, f32 g_, f32 b_)
+		gem_color(float r_, float g_, float b_)
 		{
 			r = std::clamp(r_, 0.0f, 1.0f);
 			g = std::clamp(g_, 0.0f, 1.0f);
 			b = std::clamp(b_, 0.0f, 1.0f);
 		}
-
-		static inline const gem_color& get_default_color(u32 gem_num)
-		{
-			static const gem_color gold = gem_color(1.0f, 0.85f, 0.0f);
-			static const gem_color green = gem_color(0.0f, 1.0f, 0.0f);
-			static const gem_color red = gem_color(1.0f, 0.0f, 0.0f);
-			static const gem_color pink = gem_color(0.9f, 0.0f, 0.5f);
-
-			switch (gem_num)
-			{
-			case 0: return green;
-			case 1: return gold;
-			case 2: return red;
-			case 3: return pink;
-			default: fmt::throw_exception("unexpected gem_num %d", gem_num);
-			}
-		}
 	};
 
 	struct gem_controller
@@ -237,7 +86,7 @@ public:
 		u32 ext_status = CELL_GEM_NO_EXTERNAL_PORT_DEVICE; // External port connection status
 		u32 ext_id = 0;                                    // External device ID (type). For example SHARP_SHOOTER_DEVICE_ID
 		u32 port = 0;                                      // Assigned port
-		bool enabled_magnetometer = true;                  // Whether the magnetometer is enabled (probably used for additional rotational precision)
+		bool enabled_magnetometer = false;                 // Whether the magnetometer is enabled (probably used for additional rotational precision)
 		bool calibrated_magnetometer = false;              // Whether the magnetometer is calibrated
 		bool enabled_filtering = false;                    // Whether filtering is enabled
 		bool enabled_tracking = false;                     // Whether tracking is enabled
@@ -246,73 +95,31 @@ public:
 		u8 rumble = 0;                                     // Rumble intensity
 		gem_color sphere_rgb = {};                         // RGB color of the sphere LED
 		u32 hue = 0;                                       // Tracking hue of the motion controller
-		f32 distance_mm{3000.0f};                          // Distance from the camera in mm
-		f32 radius{5.0f};                                  // Radius of the sphere in camera pixels
-		bool radius_valid = false;                         // If the radius and distance of the sphere was computed. Also used for visibility.
+		f32 distance{1500.0f};                             // Distance from the camera in mm
+		f32 radius{10.0f};                                 // Radius of the sphere in camera pixels
 
 		bool is_calibrating{false};                        // Whether or not we are currently calibrating
 		u64 calibration_start_us{0};                       // The start timestamp of the calibration in microseconds
-		u64 calibration_status_flags = 0;                  // The calibration status flags
 
 		static constexpr u64 calibration_time_us = 500000; // The calibration supposedly takes 0.5 seconds (500000 microseconds)
 	};
 
 	CellGemAttribute attribute = {};
 	CellGemVideoConvertAttribute vc_attribute = {};
-	s32 video_data_out_size = -1;
-	std::vector<u8> video_data_in;
-	u64 runtime_status_flags = 0; // The runtime status flags
+	u64 status_flags = 0;
 	bool enable_pitch_correction = false;
 	u32 inertial_counter = 0;
 
 	std::array<gem_controller, CELL_GEM_MAX_NUM> controllers;
 	u32 connected_controllers = 0;
-	atomic_t<bool> video_conversion_in_progress{false};
-	atomic_t<bool> updating{false};
+	bool video_conversion_started{};
+	bool update_started{};
 	u32 camera_frame{};
 	u32 memory_ptr{};
 
 	shared_mutex mtx;
 
-	u64 start_timestamp_us = 0;
-
-	atomic_t<u32> m_wake_up = 0;
-	atomic_t<u32> m_done = 0;
-
-	void wake_up()
-	{
-		m_wake_up.release(1);
-		m_wake_up.notify_one();
-	}
-
-	void done()
-	{
-		m_done.release(1);
-		m_done.notify_one();
-	}
-
-	bool wait_for_result(ppu_thread& ppu)
-	{
-		// Notify gem thread that the initial state after loading a savestate can be updated.
-		if (m_done.compare_and_swap_test(2, 0))
-		{
-			m_done.notify_one();
-		}
-
-		while (!m_done && !ppu.is_stopped())
-		{
-			thread_ctrl::wait_on(m_done, 0);
-		}
-
-		if (ppu.is_stopped())
-		{
-			ppu.state += cpu_flag::again;
-			return false;
-		}
-
-		m_done = 0;
-		return true;
-	}
+	u64 start_timestamp = 0;
 
 	// helper functions
 	bool is_controller_ready(u32 gem_num) const
@@ -320,1266 +127,50 @@ public:
 		return controllers[gem_num].status == CELL_GEM_STATUS_READY;
 	}
 
-	void update_connections()
+	bool is_controller_calibrating(u32 gem_num)
 	{
-		connected_controllers = 0;
+		gem_controller& gem = controllers[gem_num];
 
-		const auto update_connection = [this](u32 i, bool connected)
+		if (gem.is_calibrating)
 		{
-			if (connected)
+			if ((get_guest_system_time() - gem.calibration_start_us) >= gem_controller::calibration_time_us)
 			{
-				connected_controllers++;
-				controllers[i].status = CELL_GEM_STATUS_READY;
-				controllers[i].port = port_num(i);
-			}
-			else
-			{
-				controllers[i].status = CELL_GEM_STATUS_DISCONNECTED;
-				controllers[i].port = 0;
-			}
-		};
+				gem.is_calibrating = false;
+				gem.calibration_start_us = 0;
+				gem.calibrated_magnetometer = true;
+				gem.enabled_tracking = true;
+				gem.hue = 1;
 
-		switch (g_cfg.io.move)
-		{
-		case move_handler::real:
-		case move_handler::fake:
-		{
-			std::lock_guard lock(pad::g_pad_mutex);
-			const auto handler = pad::get_pad_thread(true);
-			if (!handler) break;
-
-			for (u32 i = 0; i < CELL_GEM_MAX_NUM; i++)
-			{
-				const auto& pad = ::at32(handler->GetPads(), pad_num(i));
-				const bool connected = pad && pad->is_connected() && !pad->is_copilot() && i < attribute.max_connect;
-				const bool is_real_move = g_cfg.io.move != move_handler::real || pad->m_pad_handler == pad_handler::move;
-
-				update_connection(i, connected && is_real_move);
-			}
-			break;
-		}
-		case move_handler::mouse:
-		case move_handler::raw_mouse:
-		{
-			auto& handler = g_fxo->get<MouseHandlerBase>();
-			std::lock_guard mouse_lock(handler.mutex);
-			const MouseInfo& info = handler.GetInfo();
-
-			for (u32 i = 0; i < CELL_GEM_MAX_NUM; i++)
-			{
-				update_connection(i, i < attribute.max_connect && info.status[i] == CELL_MOUSE_STATUS_CONNECTED);
-			}
-			break;
-		}
-#ifdef HAVE_LIBEVDEV
-		case move_handler::gun:
-		{
-			gun_thread& gun = g_fxo->get<gun_thread>();
-			std::scoped_lock lock(gun.handler.mutex);
-			gun.num_devices = gun.handler.init() ? gun.handler.get_num_guns() : 0;
-
-			for (u32 i = 0; i < CELL_GEM_MAX_NUM; i++)
-			{
-				update_connection(i, i < attribute.max_connect && i < gun.num_devices);
-			}
-			break;
-		}
-#endif
-		case move_handler::null:
-		{
-			break;
-		}
-		}
-	}
-
-	void update_calibration_status()
-	{
-		for (u32 gem_num = 0; gem_num < CELL_GEM_MAX_NUM; gem_num++)
-		{
-			gem_controller& controller = controllers[gem_num];
-			if (!controller.is_calibrating) continue;
-
-			bool controller_calibrated = true;
-
-			// Request controller calibration
-			if (g_cfg.io.move == move_handler::real)
-			{
-				std::lock_guard pad_lock(pad::g_pad_mutex);
-				const auto handler = pad::get_pad_thread();
-				const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
-				if (pad && pad->m_pad_handler == pad_handler::move && !pad->is_copilot())
-				{
-					if (!pad->move_data.calibration_requested || !pad->move_data.calibration_succeeded)
-					{
-						pad->move_data.calibration_requested = true;
-						controller_calibrated = false;
-					}
-				}
-			}
-
-			// The calibration takes ~0.5 seconds on real hardware
-			if ((get_guest_system_time() - controller.calibration_start_us) < gem_controller::calibration_time_us) continue;
-
-			if (!controller_calibrated)
-			{
-				cellGem.warning("Reached calibration timeout but ps move controller %d is still calibrating", gem_num);
-			}
-
-			controller.is_calibrating = false;
-			controller.calibration_start_us = 0;
-			controller.calibration_status_flags = CELL_GEM_FLAG_CALIBRATION_SUCCEEDED | CELL_GEM_FLAG_CALIBRATION_OCCURRED;
-			controller.calibrated_magnetometer = true;
-			controller.enabled_tracking = true;
-
-			// Reset controller calibration request
-			if (g_cfg.io.move == move_handler::real)
-			{
-				std::lock_guard pad_lock(pad::g_pad_mutex);
-				const auto handler = pad::get_pad_thread();
-				const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
-				if (pad && pad->m_pad_handler == pad_handler::move && !pad->is_copilot())
-				{
-					pad->move_data.calibration_requested = false;
-					pad->move_data.calibration_succeeded = false;
-				}
+				status_flags = CELL_GEM_FLAG_CALIBRATION_SUCCEEDED | CELL_GEM_FLAG_CALIBRATION_OCCURRED;
 			}
 		}
+
+		return gem.is_calibrating;
 	}
 
 	void reset_controller(u32 gem_num)
 	{
-		if (gem_num >= CELL_GEM_MAX_NUM)
-		{
-			return;
-		}
-
-		gem_controller& controller = ::at32(controllers, gem_num);
-		controller = {};
-		controller.sphere_rgb = gem_color::get_default_color(gem_num);
-
-		bool is_connected = false;
-
 		switch (g_cfg.io.move)
 		{
-		case move_handler::real:
-		{
-			connected_controllers = 0;
-			std::lock_guard lock(pad::g_pad_mutex);
-			const auto handler = pad::get_pad_thread();
-			for (u32 i = 0; i < std::min<u32>(attribute.max_connect, CELL_GEM_MAX_NUM); i++)
-			{
-				const auto& pad = ::at32(handler->GetPads(), pad_num(i));
-				if (pad && pad->m_pad_handler == pad_handler::move && pad->is_connected() && !pad->is_copilot())
-				{
-					connected_controllers++;
-
-					if (gem_num == i)
-					{
-						pad->move_data.magnetometer_enabled = controller.enabled_magnetometer;
-						is_connected = true;
-					}
-				}
-			}
-			break;
-		}
 		case move_handler::fake:
-		{
-			connected_controllers = 0;
-			std::lock_guard lock(pad::g_pad_mutex);
-			const auto handler = pad::get_pad_thread();
-			for (u32 i = 0; i < std::min<u32>(attribute.max_connect, CELL_GEM_MAX_NUM); i++)
-			{
-				const auto& pad = ::at32(handler->GetPads(), pad_num(i));
-				if (pad && pad->is_connected() && !pad->is_copilot())
-				{
-					connected_controllers++;
-
-					if (gem_num == i)
-					{
-						is_connected = true;
-					}
-				}
-			}
-			break;
-		}
 		case move_handler::mouse:
-		case move_handler::raw_mouse:
 		{
-			auto& handler = g_fxo->get<MouseHandlerBase>();
-			std::lock_guard mouse_lock(handler.mutex);
-
-			// Make sure that the mouse handler is initialized
-			handler.Init(std::min<u32>(attribute.max_connect, CELL_GEM_MAX_NUM));
-
-			const MouseInfo& info = handler.GetInfo();
-			connected_controllers = std::min<u32>({ info.now_connect, attribute.max_connect, CELL_GEM_MAX_NUM });
-			if (gem_num < connected_controllers)
-			{
-				is_connected = true;
-			}
+			connected_controllers = 1;
 			break;
 		}
-#ifdef HAVE_LIBEVDEV
-		case move_handler::gun:
-		{
-			gun_thread& gun = g_fxo->get<gun_thread>();
-			std::scoped_lock lock(gun.handler.mutex);
-			gun.num_devices = gun.handler.init() ? gun.handler.get_num_guns() : 0;
-			connected_controllers = std::min<u32>(std::min<u32>(attribute.max_connect, CELL_GEM_MAX_NUM), gun.num_devices);
-
-			if (gem_num < connected_controllers)
-			{
-				is_connected = true;
-			}
-			break;
-		}
-#endif
 		case move_handler::null:
+		default:
 			break;
 		}
 
 		// Assign status and port number
-		if (is_connected)
+		if (gem_num < connected_controllers)
 		{
-			controller.status = CELL_GEM_STATUS_READY;
-			controller.port = port_num(gem_num);
+			controllers[gem_num] = {};
+			controllers[gem_num].status = CELL_GEM_STATUS_READY;
+			controllers[gem_num].port = 7u - gem_num;
 		}
 	}
-
-	void paint_spheres(CellGemVideoConvertFormatEnum output_format, u32 width, u32 height, u8* video_data_out, u32 video_data_out_size);
-
-	gem_config_data()
-	{
-		load_configs();
-	};
-
-	SAVESTATE_INIT_POS(16.1); // Depends on cellCamera
-
-	void save(utils::serial& ar)
-	{
-		ar(state);
-
-		if (!state)
-		{
-			return;
-		}
-
-		const s32 version = GET_OR_USE_SERIALIZATION_VERSION(ar.is_writing(), cellGem);
-
-		ar(attribute, vc_attribute, runtime_status_flags, enable_pitch_correction, inertial_counter);
-
-		for (gem_controller& c : controllers)
-		{
-			ar(c.status, c.ext_status, c.ext_id, c.port, c.enabled_magnetometer, c.calibrated_magnetometer, c.enabled_filtering, c.enabled_tracking, c.enabled_LED, c.hue_set, c.rumble);
-
-			// We need to add padding because we used bitwise serialization in version 1
-			if (version < 2)
-			{
-				ar.add_padding(&gem_controller::rumble, &gem_controller::sphere_rgb);
-			}
-
-			ar(c.sphere_rgb, c.hue, c.distance_mm, c.radius, c.radius_valid, c.is_calibrating);
-
-			if (version < 2)
-			{
-				ar.add_padding(&gem_controller::is_calibrating, &gem_controller::calibration_start_us);
-			}
-
-			ar(c.calibration_start_us);
-
-			if (ar.is_writing() || version >= 2)
-			{
-				ar(c.calibration_status_flags);
-			}
-		}
-
-		ar(connected_controllers, updating, camera_frame, memory_ptr, start_timestamp_us);
-
-		if (ar.is_writing() || version >= 3)
-		{
-			ar(video_conversion_in_progress, video_data_out_size);
-		}
-	}
-
-	gem_config_data(utils::serial& ar)
-	{
-		save(ar);
-		load_configs();
-	}
-
-	static void load_configs()
-	{
-		if (!g_cfg_gem_real.load())
-		{
-			cellGem.notice("Could not load real gem config. Using defaults.");
-		}
-
-		if (!g_cfg_gem_fake.load())
-		{
-			cellGem.notice("Could not load fake gem config. Using defaults.");
-		}
-
-		if (!g_cfg_gem_mouse.load())
-		{
-			cellGem.notice("Could not load mouse gem config. Using defaults.");
-		}
-
-		cellGem.notice("Real gem config=\n", g_cfg_gem_real.to_string());
-		cellGem.notice("Fake gem config=\n", g_cfg_gem_fake.to_string());
-		cellGem.notice("Mouse gem config=\n", g_cfg_gem_mouse.to_string());
-	}
-};
-
-extern std::pair<u32, u32> get_video_resolution(const CellCameraInfoEx& info);
-extern u32 get_buffer_size_by_format(s32 format, s32 width, s32 height);
-
-static inline s32 cellGemGetVideoConvertSize(s32 output_format)
-{
-	switch (output_format)
-	{
-	case CELL_GEM_RGBA_320x240: // RGBA output; 320*240*4-byte output buffer required
-		return 320 * 240 * 4;
-	case CELL_GEM_RGBA_640x480: // RGBA output; 640*480*4-byte output buffer required
-		return 640 * 480 * 4;
-	case CELL_GEM_YUV_640x480: // YUV output; 640*480+640*480+640*480-byte output buffer required (contiguous)
-		return 640 * 480 + 640 * 480 + 640 * 480;
-	case CELL_GEM_YUV422_640x480: // YUV output; 640*480+320*480+320*480-byte output buffer required (contiguous)
-		return 640 * 480 + 320 * 480 + 320 * 480;
-	case CELL_GEM_YUV411_640x480: // YUV411 output; 640*480+320*240+320*240-byte output buffer required (contiguous)
-		return 640 * 480 + 320 * 240 + 320 * 240;
-	case CELL_GEM_BAYER_RESTORED: // Bayer pattern output, 640x480, gamma and white balance applied, output buffer required
-	case CELL_GEM_BAYER_RESTORED_RGGB: // Restored Bayer output, 2x2 pixels rearranged into 320x240 RG1G2B
-	case CELL_GEM_BAYER_RESTORED_RASTERIZED: // Restored Bayer output, R,G1,G2,B rearranged into 4 contiguous 320x240 1-channel rasters
-		return 640 * 480;
-	case CELL_GEM_NO_VIDEO_OUTPUT: // Disable video output
-		return 0;
-	default:
-		return -1;
-	}
-}
-
-namespace gem
-{
-	struct gem_position
-	{
-	public:
-		void set_position(f32 x, f32 y)
-		{
-			std::lock_guard lock(m_mutex);
-			m_x = x;
-			m_y = y;
-		}
-		void get_position(f32& x, f32& y)
-		{
-			std::lock_guard lock(m_mutex);
-			x = m_x;
-			y = m_y;
-		}
-	private:
-		std::mutex m_mutex;
-		f32 m_x = 0.0f;
-		f32 m_y = 0.0f;
-	};
-
-	std::array<gem_position, CELL_GEM_MAX_NUM> positions {};
-
-	struct YUV
-	{
-		u8 y = 0;
-		u8 u = 0;
-		u8 v = 0;
-
-		YUV(u8 r, u8 g, u8 b)
-			: y(Y(r, g, b))
-			, u(U(r, g, b))
-			, v(V(r, g, b))
-		{
-		}
-
-		static inline u8 Y(u8 r, u8 g, u8 b) { return static_cast<u8>(0.299f * r + 0.587f * g + 0.114f * b); }
-		static inline u8 U(u8 r, u8 g, u8 b) { return static_cast<u8>(-0.14713f * r - 0.28886f * g + 0.436f * b); }
-		static inline u8 V(u8 r, u8 g, u8 b) { return static_cast<u8>(0.615f * r - 0.51499f * g - 0.10001f * b); }
-	};
-
-	bool convert_image_format(CellCameraFormat input_format, CellGemVideoConvertFormatEnum output_format,
-	                          const std::vector<u8>& video_data_in, u32 width, u32 height,
-	                          u8* video_data_out, u32 video_data_out_size, std::string_view caller)
-	{
-		if (output_format != CELL_GEM_NO_VIDEO_OUTPUT && !video_data_out)
-		{
-			return false;
-		}
-
-		const u32 required_in_size = get_buffer_size_by_format(static_cast<s32>(input_format), width, height);
-		const s32 required_out_size = cellGemGetVideoConvertSize(output_format);
-
-		if (video_data_in.size() != required_in_size)
-		{
-			cellGem.error("convert: in_size mismatch: required=%d, actual=%d (called from %s)", required_in_size, video_data_in.size(), caller);
-			return false;
-		}
-
-		if (required_out_size < 0 || video_data_out_size != static_cast<u32>(required_out_size))
-		{
-			cellGem.error("convert: out_size unknown: required=%d, actual=%d, format %d (called from %s)", required_out_size, video_data_out_size, output_format, caller);
-			return false;
-		}
-
-		if (required_out_size == 0)
-		{
-			return false;
-		}
-
-		switch (output_format)
-		{
-		case CELL_GEM_RGBA_640x480: // RGBA output; 640*480*4-byte output buffer required
-		{
-			switch (input_format)
-			{
-			case CELL_CAMERA_RAW8:
-			{
-				const u32 in_pitch = width;
-				const u32 out_pitch = width * 4;
-
-				for (u32 y = 0; y < height - 1; y += 2)
-				{
-					const u8* src0 = &video_data_in[y * in_pitch];
-					const u8* src1 = src0 + in_pitch;
-
-					u8* dst0 = video_data_out + y * out_pitch;
-					u8* dst1 = dst0 + out_pitch;
-
-					for (u32 x = 0; x < width - 1; x += 2, src0 += 2, src1 += 2, dst0 += 8, dst1 += 8)
-					{
-						const u8 b  = src0[0];
-						const u8 g0 = src0[1];
-						const u8 g1 = src1[0];
-						const u8 r  = src1[1];
-
-						const u8 top[4] = { r, g0, b, 255 };
-						const u8 bottom[4] = { r, g1, b, 255 };
-
-						// Top-Left
-						std::memcpy(dst0, top, 4);
-
-						// Top-Right Pixel
-						std::memcpy(dst0 + 4, top, 4);
-
-						// Bottom-Left Pixel
-						std::memcpy(dst1, bottom, 4);
-
-						// Bottom-Right Pixel
-						std::memcpy(dst1 + 4, bottom, 4);
-					}
-				}
-				break;
-			}
-			case CELL_CAMERA_RGBA:
-			{
-				std::memcpy(video_data_out, video_data_in.data(), std::min<usz>(required_in_size, required_out_size));
-				break;
-			}
-			default:
-			{
-				cellGem.error("Unimplemented: Converting %s to %s (called from %s)", input_format, output_format, caller);
-				std::memcpy(video_data_out, video_data_in.data(), std::min<usz>(required_in_size, required_out_size));
-				return false;
-			}
-			}
-			break;
-		}
-		case CELL_GEM_BAYER_RESTORED: // Bayer pattern output, 640x480, gamma and white balance applied, output buffer required
-		{
-			if (input_format == CELL_CAMERA_RAW8)
-			{
-				std::memcpy(video_data_out, video_data_in.data(), std::min<usz>(required_in_size, required_out_size));
-			}
-			else
-			{
-				cellGem.error("Unimplemented: Converting %s to %s (called from %s)", input_format, output_format, caller);
-				return false;
-			}
-			break;
-		}
-		case CELL_GEM_YUV_640x480: // YUV output; 640*480+640*480+640*480-byte output buffer required (contiguous)
-		{
-			const u32 yuv_pitch = width;
-
-			u8* dst_y = video_data_out;
-			u8* dst_u = dst_y + yuv_pitch * height;
-			u8* dst_v = dst_u + yuv_pitch * height;
-
-			switch (input_format)
-			{
-			case CELL_CAMERA_RAW8:
-			{
-				const u32 in_pitch = width;
-
-				for (u32 y = 0; y < height - 1; y += 2)
-				{
-					const u8* src0 = &video_data_in[y * in_pitch];
-					const u8* src1 = src0 + in_pitch;
-
-					u8* dst_y0 = dst_y + y * yuv_pitch;
-					u8* dst_y1 = dst_y0 + yuv_pitch;
-
-					u8* dst_u0 = dst_u + y * yuv_pitch;
-					u8* dst_u1 = dst_u0 + yuv_pitch;
-
-					u8* dst_v0 = dst_v + y * yuv_pitch;
-					u8* dst_v1 = dst_v0 + yuv_pitch;
-
-					for (u32 x = 0; x < width - 1; x += 2, src0 += 2, src1 += 2, dst_y0 += 2, dst_y1 += 2, dst_u0 += 2, dst_u1 += 2, dst_v0 += 2, dst_v1 += 2)
-					{
-						const u8 b  = src0[0];
-						const u8 g0 = src0[1];
-						const u8 g1 = src1[0];
-						const u8 r  = src1[1];
-
-						// Convert RGBA to YUV
-						const YUV yuv_top    = YUV(r, g0, b);
-						const YUV yuv_bottom = YUV(r, g1, b);
-
-						dst_y0[0] = dst_y0[1] = yuv_top.y;
-						dst_y1[0] = dst_y1[1] = yuv_bottom.y;
-
-						dst_u0[0] = dst_u0[1] = yuv_top.u;
-						dst_u1[0] = dst_u1[1] = yuv_bottom.u;
-
-						dst_v0[0] = dst_v0[1] = yuv_top.v;
-						dst_v1[0] = dst_v1[1] = yuv_bottom.v;
-					}
-				}
-				break;
-			}
-			case CELL_CAMERA_RGBA:
-			{
-				const u32 in_pitch = width / 4;
-
-				for (u32 y = 0; y < height; y++)
-				{
-					const u8* src = &video_data_in[y * in_pitch];
-
-					for (u32 x = 0; x < width; x++, src += 4)
-					{
-						const u8 r = src[0];
-						const u8 g = src[1];
-						const u8 b = src[2];
-
-						// Convert RGBA to YUV
-						const YUV yuv = YUV(r, g, b);
-
-						*dst_y++ = yuv.y;
-						*dst_u++ = yuv.u;
-						*dst_v++ = yuv.v;
-					}
-				}
-				break;
-			}
-			default:
-			{
-				cellGem.error("Unimplemented: Converting %s to %s (called from %s)", input_format, output_format, caller);
-				std::memcpy(video_data_out, video_data_in.data(), std::min<usz>(required_in_size, required_out_size));
-				return false;
-			}
-			}
-			break;
-		}
-		case CELL_GEM_YUV422_640x480: // YUV output; 640*480+320*480+320*480-byte output buffer required (contiguous)
-		{
-			const u32 y_pitch = width;
-			const u32 uv_pitch = width / 2;
-
-			u8* dst_y = video_data_out;
-			u8* dst_u = dst_y + y_pitch * height;
-			u8* dst_v = dst_u + uv_pitch * height;
-
-			switch (input_format)
-			{
-			case CELL_CAMERA_RAW8:
-			{
-				const u32 in_pitch = width;
-
-				for (u32 y = 0; y < height - 1; y += 2)
-				{
-					const u8* src0 = &video_data_in[y * in_pitch];
-					const u8* src1 = src0 + in_pitch;
-
-					u8* dst_y0 = dst_y + y * y_pitch;
-					u8* dst_y1 = dst_y0 + y_pitch;
-
-					u8* dst_u0 = dst_u + y * uv_pitch;
-					u8* dst_u1 = dst_u0 + uv_pitch;
-
-					u8* dst_v0 = dst_v + y * uv_pitch;
-					u8* dst_v1 = dst_v0 + uv_pitch;
-
-					for (u32 x = 0; x < width - 1; x += 2, src0 += 2, src1 += 2, dst_y0 += 2, dst_y1 += 2)
-					{
-						const u8 b  = src0[0];
-						const u8 g0 = src0[1];
-						const u8 g1 = src1[0];
-						const u8 r  = src1[1];
-
-						// Convert RGBA to YUV
-						const YUV yuv_top    = YUV(r, g0, b);
-						const YUV yuv_bottom = YUV(r, g1, b);
-
-						dst_y0[0] = dst_y0[1] = yuv_top.y;
-						dst_y1[0] = dst_y1[1] = yuv_bottom.y;
-
-						*dst_u0++ = yuv_top.u;
-						*dst_u1++ = yuv_bottom.u;
-
-						*dst_v0++ = yuv_top.v;
-						*dst_v1++ = yuv_bottom.v;
-					}
-				}
-				break;
-			}
-			case CELL_CAMERA_RGBA:
-			{
-				const u32 in_pitch = width * 4;
-
-				for (u32 y = 0; y < height; y++)
-				{
-					const u8* src = &video_data_in[y * in_pitch];
-
-					for (u32 x = 0; x < width - 1; x += 2, src += 8, dst_y += 2)
-					{
-						const u8 r_0 = src[0];
-						const u8 g_0 = src[1];
-						const u8 b_0 = src[2];
-						const u8 r_1 = src[4];
-						const u8 g_1 = src[5];
-						const u8 b_1 = src[6];
-
-						// Convert RGBA to YUV
-						const YUV yuv_0 = YUV(r_0, g_0, b_0);
-						const u8 y_1 = YUV::Y(r_1, g_1, b_1);
-
-						dst_y[0] = yuv_0.y;
-						dst_y[1] = y_1;
-						*dst_u++ = yuv_0.u;
-						*dst_v++ = yuv_0.v;
-					}
-				}
-				break;
-			}
-			default:
-			{
-				cellGem.error("Unimplemented: Converting %s to %s (called from %s)", input_format, output_format, caller);
-				std::memcpy(video_data_out, video_data_in.data(), std::min<usz>(required_in_size, required_out_size));
-				return false;
-			}
-			}
-			break;
-		}
-		case CELL_GEM_YUV411_640x480: // YUV411 output; 640*480+320*240+320*240-byte output buffer required (contiguous)
-		{
-			const u32 y_pitch = width;
-			const u32 uv_pitch = width / 4;
-
-			u8* dst_y = video_data_out;
-			u8* dst_u = dst_y + y_pitch * height;
-			u8* dst_v = dst_u + uv_pitch * height;
-
-			switch (input_format)
-			{
-			case CELL_CAMERA_RAW8:
-			{
-				const u32 in_pitch = width;
-
-				for (u32 y = 0; y < height - 1; y += 2)
-				{
-					const u8* src0 = &video_data_in[y * in_pitch];
-					const u8* src1 = src0 + in_pitch;
-
-					u8* dst_y0 = dst_y + y * y_pitch;
-					u8* dst_y1 = dst_y0 + y_pitch;
-
-					u8* dst_u0 = dst_u + y * uv_pitch;
-					u8* dst_u1 = dst_u0 + uv_pitch;
-
-					u8* dst_v0 = dst_v + y * uv_pitch;
-					u8* dst_v1 = dst_v0 + uv_pitch;
-
-					for (u32 x = 0; x < width - 3; x += 4, src0 += 4, src1 += 4, dst_y0 += 4, dst_y1 += 4)
-					{
-						const u8 b_left   = src0[0];
-						const u8 g0_left  = src0[1];
-						const u8 b_right  = src0[2];
-						const u8 g0_right = src0[3];
-
-						const u8 g1_left  = src1[0];
-						const u8 r_left   = src1[1];
-						const u8 g1_right = src1[2];
-						const u8 r_right  = src1[3];
-
-						// Convert RGBA to YUV
-						const YUV yuv_top_left    = YUV(r_left, g0_left, b_left); // Re-used for top-right
-						const u8 y_top_right      = YUV::Y(r_right, g0_right, b_right);
-						const YUV yuv_bottom_left = YUV(r_left, g1_left, b_left); // Re-used for bottom-right
-						const u8 y_bottom_right   = YUV::Y(r_right, g1_right, b_right);
-
-						dst_y0[0] = dst_y0[1] = yuv_top_left.y;
-						dst_y0[2] = dst_y0[3] = y_top_right;
-
-						dst_y1[0] = dst_y1[1] = yuv_bottom_left.y;
-						dst_y1[2] = dst_y1[3] = y_bottom_right;
-
-						*dst_u0++ = yuv_top_left.u;
-						*dst_u1++ = yuv_bottom_left.u;
-
-						*dst_v0++ = yuv_top_left.v;
-						*dst_v1++ = yuv_bottom_left.v;
-					}
-				}
-				break;
-			}
-			case CELL_CAMERA_RGBA:
-			{
-				const u32 in_pitch = width * 4;
-
-				for (u32 y = 0; y < height; y++)
-				{
-					const u8* src = &video_data_in[y * in_pitch];
-
-					for (u32 x = 0; x < width - 3; x += 4, src += 16, dst_y += 4)
-					{
-						const u8 r_0 = src[0];
-						const u8 g_0 = src[1];
-						const u8 b_0 = src[2];
-						const u8 r_1 = src[4];
-						const u8 g_1 = src[5];
-						const u8 b_1 = src[6];
-						const u8 r_2 = src[8];
-						const u8 g_2 = src[9];
-						const u8 b_2 = src[10];
-						const u8 r_3 = src[12];
-						const u8 g_3 = src[13];
-						const u8 b_3 = src[14];
-
-						// Convert RGBA to YUV
-						const YUV yuv_0 = YUV(r_0, g_0, b_0);
-						const u8 y_1 = YUV::Y(r_1, g_1, b_1);
-						const u8 y_2 = YUV::Y(r_2, g_2, b_2);
-						const u8 y_3 = YUV::Y(r_3, g_3, b_3);
-
-						dst_y[0] = yuv_0.y;
-						dst_y[1] = y_1;
-						dst_y[2] = y_2;
-						dst_y[3] = y_3;
-						*dst_u++ = yuv_0.u;
-						*dst_v++ = yuv_0.v;
-					}
-				}
-				break;
-			}
-			default:
-			{
-				cellGem.error("Unimplemented: Converting %s to %s (called from %s)", input_format, output_format, caller);
-				std::memcpy(video_data_out, video_data_in.data(), std::min<usz>(required_in_size, required_out_size));
-				return false;
-			}
-			}
-			break;
-		}
-		case CELL_GEM_RGBA_320x240: // RGBA output; 320*240*4-byte output buffer required
-		{
-			switch (input_format)
-			{
-			case CELL_CAMERA_RAW8:
-			{
-				const u32 in_pitch = width;
-				const u32 out_pitch = width * 4 / 2;
-
-				for (u32 y = 0; y < height - 1; y += 2)
-				{
-					const u8* src0 = &video_data_in[y * in_pitch];
-					const u8* src1 = src0 + in_pitch;
-
-					u8* dst0 = video_data_out + (y / 2) * out_pitch;
-					u8* dst1 = dst0 + out_pitch;
-
-					for (u32 x = 0; x < width - 1; x += 2, src0 += 2, src1 += 2, dst0 += 4, dst1 += 4)
-					{
-						const u8 b  = src0[0];
-						const u8 g0 = src0[1];
-						const u8 g1 = src1[0];
-						const u8 r  = src1[1];
-
-						const u8 top[4] = { r, g0, b, 255 };
-						const u8 bottom[4] = { r, g1, b, 255 };
-
-						// Top-Left
-						std::memcpy(dst0, top, 4);
-
-						// Bottom-Left Pixel
-						std::memcpy(dst1, bottom, 4);
-					}
-				}
-				break;
-			}
-			case CELL_CAMERA_RGBA:
-			{
-				const u32 in_pitch = width * 4;
-				const u32 out_pitch = width * 4 / 2;
-
-				for (u32 y = 0; y < height / 2; y++)
-				{
-					const u8* src = &video_data_in[y * 2 * in_pitch];
-					u8* dst = video_data_out + y * out_pitch;
-
-					for (u32 x = 0; x < width / 2; x++, src += 4 * 2, dst += 4)
-					{
-						std::memcpy(dst, src, 4);
-					}
-				}
-				break;
-			}
-			default:
-			{
-				cellGem.error("Unimplemented: Converting %s to %s (called from %s)", input_format, output_format, caller);
-				std::memcpy(video_data_out, video_data_in.data(), std::min<usz>(required_in_size, required_out_size));
-				return false;
-			}
-			}
-			break;
-		}
-		case CELL_GEM_BAYER_RESTORED_RGGB: // Restored Bayer output, 2x2 pixels rearranged into 320x240 RG1G2B
-		case CELL_GEM_BAYER_RESTORED_RASTERIZED: // Restored Bayer output, R,G1,G2,B rearranged into 4 contiguous 320x240 1-channel rasters
-		{
-			cellGem.error("Unimplemented: Converting %s to %s (called from %s)", input_format, output_format, caller);
-			std::memcpy(video_data_out, video_data_in.data(), std::min<usz>(required_in_size, required_out_size));
-			return false;
-		}
-		case CELL_GEM_NO_VIDEO_OUTPUT: // Disable video output
-		{
-			cellGem.trace("Ignoring frame conversion for CELL_GEM_NO_VIDEO_OUTPUT (called from %s)", caller);
-			break;
-		}
-		default:
-		{
-			cellGem.error("Trying to convert %s to %s (called from %s)", input_format, output_format, caller);
-			return false;
-		}
-		}
-
-		return true;
-	}
-}
-
-void gem_config_data::paint_spheres(CellGemVideoConvertFormatEnum output_format, u32 width, u32 height, u8* video_data_out, u32 video_data_out_size)
-{
-	if (!width || !height || !video_data_out || !video_data_out_size)
-	{
-		return;
-	}
-
-	struct sphere_information
-	{
-		f32 radius = 0.0f;
-		s16 x = 0;
-		s16 y = 0;
-		u8 r = 0;
-		u8 g = 0;
-		u8 b = 0;
-	};
-
-	std::vector<sphere_information> sphere_info;
-	{
-		reader_lock lock(mtx);
-
-		for (u32 gem_num = 0; gem_num < CELL_GEM_MAX_NUM; gem_num++)
-		{
-			const gem_config_data::gem_controller& controller = controllers[gem_num];
-			if (!controller.radius_valid || controller.radius <= 0.0f) continue;
-
-			f32 x, y;
-			::at32(gem::positions, gem_num).get_position(x, y);
-
-			const u8 r = static_cast<u8>(std::clamp(controller.sphere_rgb.r * 255.0f, 0.0f, 255.0f));
-			const u8 g = static_cast<u8>(std::clamp(controller.sphere_rgb.g * 255.0f, 0.0f, 255.0f));
-			const u8 b = static_cast<u8>(std::clamp(controller.sphere_rgb.b * 255.0f, 0.0f, 255.0f));
-
-			sphere_info.push_back({ controller.radius, static_cast<s16>(x), static_cast<s16>(y), r, g, b });
-		}
-	}
-
-	switch (output_format)
-	{
-	case CELL_GEM_RGBA_640x480: // RGBA output; 640*480*4-byte output buffer required
-	{
-		cellGem.trace("Painting spheres for CELL_GEM_RGBA_640x480");
-
-		const u32 out_pitch = width * 4;
-
-		for (const sphere_information& info : sphere_info)
-		{
-			const s32 x_begin = std::max(0, static_cast<s32>(std::floor(info.x - info.radius)));
-			const s32 x_end = std::min<s32>(width, static_cast<s32>(std::ceil(info.x + info.radius)));
-			const s32 y_begin = std::max(0, static_cast<s32>(std::floor(info.y - info.radius)));
-			const s32 y_end = std::min<s32>(height, static_cast<s32>(std::ceil(info.y + info.radius)));
-
-			for (s32 y = y_begin; y < y_end; y++)
-			{
-				u8* dst = video_data_out + y * out_pitch + x_begin * 4;
-
-				for (s32 x = x_begin; x < x_end; x++, dst += 4)
-				{
-					const f32 distance = static_cast<f32>(std::sqrt(std::pow(info.x - x, 2) + std::pow(info.y - y, 2)));
-					if (distance > info.radius) continue;
-
-					dst[0] = info.r;
-					dst[1] = info.g;
-					dst[2] = info.b;
-					dst[3] = 255;
-				}
-			}
-		}
-
-		break;
-	}
-	case CELL_GEM_BAYER_RESTORED: // Bayer pattern output, 640x480, gamma and white balance applied, output buffer required
-	case CELL_GEM_RGBA_320x240: // RGBA output; 320*240*4-byte output buffer required
-	case CELL_GEM_YUV_640x480: // YUV output; 640*480+640*480+640*480-byte output buffer required (contiguous)
-	case CELL_GEM_YUV422_640x480: // YUV output; 640*480+320*480+320*480-byte output buffer required (contiguous)
-	case CELL_GEM_YUV411_640x480: // YUV411 output; 640*480+320*240+320*240-byte output buffer required (contiguous)
-	case CELL_GEM_BAYER_RESTORED_RGGB: // Restored Bayer output, 2x2 pixels rearranged into 320x240 RG1G2B
-	case CELL_GEM_BAYER_RESTORED_RASTERIZED: // Restored Bayer output, R,G1,G2,B rearranged into 4 contiguous 320x240 1-channel rasters
-	{
-		cellGem.trace("Unimplemented: painting spheres for %s", output_format);
-		break;
-	}
-	case CELL_GEM_NO_VIDEO_OUTPUT: // Disable video output
-	{
-		cellGem.trace("Ignoring painting spheres for CELL_GEM_NO_VIDEO_OUTPUT");
-		break;
-	}
-	default:
-	{
-		cellGem.trace("Ignoring painting spheres for %d", static_cast<u32>(output_format));
-		break;
-	}
-	}
-}
-
-void gem_config_data::operator()()
-{
-	cellGem.notice("Starting thread");
-
-	u64 last_update_us = 0;
-
-	// Handle initial state after loading a savestate
-	if (state && video_conversion_in_progress)
-	{
-		// Wait for cellGemConvertVideoFinish. The initial savestate loading may take a while.
-		m_done = 2; // Use special value 2 for this case
-		thread_ctrl::wait_on(m_done, 2, 5'000'000);
-
-		// Just mark this conversion as complete (there's no real downside to this, except for a black image)
-		video_conversion_in_progress = false;
-		done();
-	}
-
-	while (thread_ctrl::state() != thread_state::aborting && !Emu.IsStopped())
-	{
-		u64 timeout = umax;
-
-		if (state && !video_conversion_in_progress)
-		{
-			constexpr u64 update_timeout_us = 100'000; // Update controllers at 10Hz
-			const u64 now_us = get_system_time();
-			const u64 elapsed_us = now_us - last_update_us;
-
-			if (elapsed_us < update_timeout_us)
-			{
-				timeout = update_timeout_us - elapsed_us;
-			}
-			else
-			{
-				timeout = update_timeout_us;
-				last_update_us = now_us;
-
-				std::scoped_lock lock(mtx);
-				update_connections();
-				update_calibration_status();
-			}
-		}
-
-		if (!m_wake_up)
-		{
-			thread_ctrl::wait_on(m_wake_up, 0, timeout);
-		}
-
-		m_wake_up = 0;
-
-		if (!video_conversion_in_progress)
-		{
-			continue;
-		}
-
-		if (thread_ctrl::state() == thread_state::aborting || Emu.IsStopped())
-		{
-			return;
-		}
-
-		CellGemVideoConvertAttribute vc;
-		{
-			std::scoped_lock lock(mtx);
-			vc = vc_attribute;
-		}
-
-		if (g_cfg.io.camera != camera_handler::qt)
-		{
-			video_conversion_in_progress = false;
-			done();
-			continue;
-		}
-
-		const auto& shared_data = g_fxo->get<gem_camera_shared>();
-
-		if (gem::convert_image_format(shared_data.format, vc.output_format, video_data_in, shared_data.width, shared_data.height, vc_attribute.video_data_out ? vc_attribute.video_data_out.get_ptr() : nullptr, video_data_out_size, "cellGem"))
-		{
-			cellGem.trace("Converted video frame of format %s to %s", shared_data.format.load(), vc.output_format.get());
-
-			if (g_cfg.io.paint_move_spheres)
-			{
-				paint_spheres(vc.output_format, shared_data.width, shared_data.height, vc_attribute.video_data_out ? vc_attribute.video_data_out.get_ptr() : nullptr, video_data_out_size);
-			}
-		}
-
-		video_conversion_in_progress = false;
-		done();
-	}
-}
-
-using gem_config = named_thread<gem_config_data>;
-
-class gem_tracker
-{
-public:
-	gem_tracker()
-	{
-	}
-
-	bool is_busy()
-	{
-		return m_busy;
-	}
-
-	void wake_up_tracker()
-	{
-		m_wake_up_tracker.release(1);
-		m_wake_up_tracker.notify_one();
-	}
-
-	void tracker_done()
-	{
-		m_tracker_done.release(1);
-		m_tracker_done.notify_one();
-	}
-
-	bool wait_for_tracker_result(ppu_thread& ppu)
-	{
-		if (g_cfg.io.move != move_handler::real)
-		{
-			m_tracker_done = 0;
-			return true;
-		}
-
-		while (!m_tracker_done && !ppu.is_stopped())
-		{
-			thread_ctrl::wait_on(m_tracker_done, 0);
-		}
-
-		if (ppu.is_stopped())
-		{
-			ppu.state += cpu_flag::again;
-			return false;
-		}
-
-		m_tracker_done = 0;
-		return true;
-	}
-
-	bool set_image(u32 addr)
-	{
-		if (!addr)
-			return false;
-
-		auto& g_camera = g_fxo->get<camera_thread>();
-		std::lock_guard lock(g_camera.mutex);
-		m_camera_info = g_camera.info;
-
-		if (m_camera_info.buffer.addr() != addr && m_camera_info.pbuf[0].addr() != addr && m_camera_info.pbuf[1].addr() != addr)
-		{
-			cellGem.error("gem_tracker: unexpected image address: addr=0x%x, expected one of: 0x%x, 0x%x, 0x%x", addr, m_camera_info.buffer.addr(), m_camera_info.pbuf[0].addr(), m_camera_info.pbuf[1].addr());
-			return false;
-		}
-
-		// Copy image data for further processing
-
-		const auto& [width, height] = get_video_resolution(m_camera_info);
-		const u32 expected_size = get_buffer_size_by_format(m_camera_info.format, width, height);
-
-		if (!m_camera_info.bytesize || static_cast<u32>(m_camera_info.bytesize) != expected_size)
-		{
-			cellGem.error("gem_tracker: unexpected image size: size=%d, expected=%d", m_camera_info.bytesize, expected_size);
-			return false;
-		}
-
-		if (!m_camera_info.bytesize)
-		{
-			cellGem.error("gem_tracker: unexpected image size: %d", m_camera_info.bytesize);
-			return false;
-		}
-
-		m_tracker.set_image_data(m_camera_info.buffer.get_ptr(), m_camera_info.bytesize, m_camera_info.width, m_camera_info.height, m_camera_info.format);
-		return true;
-	}
-
-	bool hue_is_trackable(u32 hue)
-	{
-		if (g_cfg.io.move != move_handler::real)
-		{
-			return true; // potentially true if less than 20 pixels have the hue
-		}
-
-		return hue < m_hues.size() && m_hues[hue] < 20; // potentially true if less than 20 pixels have the hue
-	}
-
-	ps_move_info get_info(u32 gem_num)
-	{
-		std::lock_guard lock(mutex);
-		return ::at32(m_info, gem_num);
-	}
-
-	void operator()()
-	{
-		if (g_cfg.io.move != move_handler::real)
-		{
-			return;
-		}
-
-		if (!g_cfg_move.load())
-		{
-			cellGem.notice("Could not load PS Move config. Using defaults.");
-		}
-
-		auto& gem = g_fxo->get<gem_config>();
-
-		while (thread_ctrl::state() != thread_state::aborting)
-		{
-			// Check if we have a new frame
-			if (!m_wake_up_tracker)
-			{
-				thread_ctrl::wait_on(m_wake_up_tracker, 0);
-				m_wake_up_tracker.release(0);
-
-				if (thread_ctrl::state() == thread_state::aborting)
-				{
-					break;
-				}
-			}
-
-			m_busy.release(true);
-
-			// Update PS Move LED colors
-			{
-				std::lock_guard lock(pad::g_pad_mutex);
-				const auto handler = pad::get_pad_thread();
-				auto& handlers = handler->get_handlers();
-				if (auto it = handlers.find(pad_handler::move); it != handlers.end() && it->second)
-				{
-					for (auto& binding : it->second->bindings())
-					{
-						if (!binding.device) continue;
-
-						// last 4 out of 7 ports (6,5,4,3). index starts at 0
-						const s32 gem_num = std::abs(binding.device->player_id - CELL_PAD_MAX_PORT_NUM) - 1;
-
-						if (gem_num < 0 || gem_num >= CELL_GEM_MAX_NUM) continue;
-
-						binding.device->color_override_active = true;
-
-						if (g_cfg.io.allow_move_hue_set_by_game)
-						{
-							const auto& controller = gem.controllers[gem_num];
-							binding.device->color_override.r = static_cast<u8>(std::clamp(controller.sphere_rgb.r * 255.0f, 0.0f, 255.0f));
-							binding.device->color_override.g = static_cast<u8>(std::clamp(controller.sphere_rgb.g * 255.0f, 0.0f, 255.0f));
-							binding.device->color_override.b = static_cast<u8>(std::clamp(controller.sphere_rgb.b * 255.0f, 0.0f, 255.0f));
-						}
-						else
-						{
-							const cfg_ps_move* config = ::at32(g_cfg_move.move, gem_num);
-							binding.device->color_override.r = config->r.get();
-							binding.device->color_override.g = config->g.get();
-							binding.device->color_override.b = config->b.get();
-						}
-					}
-				}
-			}
-
-			// Update tracker config
-			for (u32 gem_num = 0; gem_num < CELL_GEM_MAX_NUM; gem_num++)
-			{
-				const auto& controller = gem.controllers[gem_num];
-				const cfg_ps_move* config = g_cfg_move.move[gem_num];
-
-				m_tracker.set_active(gem_num, controller.enabled_tracking && controller.status == CELL_GEM_STATUS_READY);
-				m_tracker.set_hue(gem_num, g_cfg.io.allow_move_hue_set_by_game ? controller.hue : config->hue);
-				m_tracker.set_hue_threshold(gem_num, config->hue_threshold);
-				m_tracker.set_saturation_threshold(gem_num, config->saturation_threshold);
-			}
-
-			m_tracker.set_min_radius(static_cast<f32>(g_cfg_move.min_radius) / 100.0f);
-			m_tracker.set_max_radius(static_cast<f32>(g_cfg_move.max_radius) / 100.0f);
-
-			// Process camera image
-			m_tracker.process_image();
-
-			// Update cellGem with results
-			{
-				std::lock_guard lock(mutex);
-				m_hues = m_tracker.hues();
-				m_info = m_tracker.info();
-
-				for (u32 gem_num = 0; gem_num < CELL_GEM_MAX_NUM; gem_num++)
-				{
-					const ps_move_info& info = m_info[gem_num];
-					auto& controller = gem.controllers[gem_num];
-					controller.radius_valid = info.valid;
-
-					if (info.valid)
-					{
-						// Only set new radius and distance if the radius is valid
-						controller.radius = info.radius;
-						controller.distance_mm = info.distance_mm;
-					}
-				}
-			}
-
-			// Notify that we are finished with this frame
-			tracker_done();
-
-			m_busy.release(false);
-		}
-	}
-
-	static constexpr auto thread_name = "GemUpdateThread"sv;
-
-	shared_mutex mutex;
-
-private:
-	atomic_t<u32> m_wake_up_tracker = 0;
-	atomic_t<u32> m_tracker_done = 0;
-	atomic_t<bool> m_busy = false;
-	ps_move_tracker<false> m_tracker{};
-	CellCameraInfoEx m_camera_info{};
-	std::array<u32, 360> m_hues{};
-	std::array<ps_move_info, CELL_GEM_MAX_NUM> m_info{};
 };
 
 /**
@@ -1587,41 +178,213 @@ private:
  * \param gem_num Move controler ID to verify
  * \return True if the ID is valid, false otherwise
  */
-static bool check_gem_num(u32 gem_num)
+static bool check_gem_num(const u32 gem_num)
 {
 	return gem_num < CELL_GEM_MAX_NUM;
 }
 
-static inline void draw_overlay_cursor(u32 gem_num, const gem_config::gem_controller&, s32 x_pos, s32 y_pos, s32 x_max, s32 y_max)
+/**
+ * \brief Maps Move controller data (digital buttons, and analog Trigger data) to DS3 pad input.
+ *        Unavoidably buttons conflict with DS3 mappings, which is problematic for some games.
+ * \param port_no DS3 port number to use
+ * \param digital_buttons Bitmask filled with CELL_GEM_CTRL_* values
+ * \param analog_t Analog value of Move's Trigger. Currently mapped to R2.
+ * \return true on success, false if port_no controller is invalid
+ */
+static bool ds3_input_to_pad(const u32 port_no, be_t<u16>& digital_buttons, be_t<u16>& analog_t)
 {
-	const s16 x = static_cast<s16>(x_pos / (x_max / static_cast<f32>(rsx::overlays::overlay::virtual_width)));
-	const s16 y = static_cast<s16>(y_pos / (y_max / static_cast<f32>(rsx::overlays::overlay::virtual_height)));
+	std::lock_guard lock(pad::g_pad_mutex);
 
-	// Note: We shouldn't use sphere_rgb here. The game will set it to black in many cases.
-	const gem_config_data::gem_color& rgb = gem_config_data::gem_color::get_default_color(gem_num);
-	const color4f color = { rgb.r, rgb.g, rgb.b, 0.85f };
+	const auto handler = pad::get_current_handler();
+	auto& pad = handler->GetPads()[port_no];
 
-	rsx::overlays::set_cursor(rsx::overlays::cursor_offset::cell_gem + gem_num, x, y, color, 2'000'000, false);
+	if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
+		return false;
+
+	for (Button& button : pad->m_buttons)
+	{
+		// here we check btns, and set pad accordingly
+		if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2)
+		{
+			if (button.m_pressed) pad->m_digital_2 |= button.m_outKeyCode;
+			else pad->m_digital_2 &= ~button.m_outKeyCode;
+
+			switch (button.m_outKeyCode)
+			{
+			case CELL_PAD_CTRL_SQUARE:
+				pad->m_press_square = button.m_value;
+				break;
+			case CELL_PAD_CTRL_CROSS:
+				pad->m_press_cross = button.m_value;
+				break;
+			case CELL_PAD_CTRL_CIRCLE:
+				pad->m_press_circle = button.m_value;
+				break;
+			case CELL_PAD_CTRL_TRIANGLE:
+				pad->m_press_triangle = button.m_value;
+				break;
+			case CELL_PAD_CTRL_R1:
+				pad->m_press_R1 = button.m_value;
+				break;
+			case CELL_PAD_CTRL_L1:
+				pad->m_press_L1 = button.m_value;
+				break;
+			case CELL_PAD_CTRL_R2:
+				pad->m_press_R2 = button.m_value;
+				break;
+			case CELL_PAD_CTRL_L2:
+				pad->m_press_L2 = button.m_value;
+				break;
+			default: break;
+			}
+		}
+	}
+
+	digital_buttons = 0;
+
+	// map the Move key to R1 and the Trigger to R2
+
+	if (pad->m_press_R1)
+		digital_buttons |= CELL_GEM_CTRL_MOVE;
+	if (pad->m_press_R2)
+		digital_buttons |= CELL_GEM_CTRL_T;
+
+	if (pad->m_press_cross)
+		digital_buttons |= CELL_GEM_CTRL_CROSS;
+	if (pad->m_press_circle)
+		digital_buttons |= CELL_GEM_CTRL_CIRCLE;
+	if (pad->m_press_square)
+		digital_buttons |= CELL_GEM_CTRL_SQUARE;
+	if (pad->m_press_triangle)
+		digital_buttons |= CELL_GEM_CTRL_TRIANGLE;
+	if (pad->m_digital_1)
+		digital_buttons |= CELL_GEM_CTRL_SELECT;
+	if (pad->m_digital_2)
+		digital_buttons |= CELL_GEM_CTRL_START;
+
+	analog_t = pad->m_press_R2;
+
+	return true;
 }
 
-static inline void pos_to_gem_image_state(u32 gem_num, gem_config::gem_controller& controller, vm::ptr<CellGemImageState>& gem_image_state, s32 x_pos, s32 y_pos, s32 x_max, s32 y_max)
+/**
+ * \brief Maps external Move controller data to DS3 input. (This can be input from any physical pad, not just the DS3)
+ *        Implementation detail: CellGemExtPortData's digital/analog fields map the same way as
+ *        libPad, so no translation is needed.
+ * \param port_no DS3 port number to use
+ * \param ext External data to modify
+ * \return true on success, false if port_no controller is invalid
+ */
+static bool ds3_input_to_ext(const u32 port_no, const gem_config::gem_controller& controller, CellGemExtPortData& ext)
 {
+	std::lock_guard lock(pad::g_pad_mutex);
+
+	const auto handler = pad::get_current_handler();
+	auto& pad = handler->GetPads()[port_no];
+
+	if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
+		return false;
+
+	ext.status = 0; // CELL_GEM_EXT_CONNECTED | CELL_GEM_EXT_EXT0 | CELL_GEM_EXT_EXT1
+	ext.analog_left_x = pad->m_analog_left_x;
+	ext.analog_left_y = pad->m_analog_left_y;
+	ext.analog_right_x = pad->m_analog_right_x;
+	ext.analog_right_y = pad->m_analog_right_y;
+	ext.digital1 = pad->m_digital_1;
+	ext.digital2 = pad->m_digital_2;
+
+	if (controller.ext_id == SHARP_SHOOTER_DEVICE_ID)
+	{
+		// TODO set custom[0] bits as follows:
+		// 1xxxxxxx: RL reload button is pressed.
+		// x1xxxxxx: T button trigger is pressed.
+		// xxxxx001: Firing mode selector is in position 1.
+		// xxxxx010: Firing mode selector is in position 2.
+		// xxxxx100: Firing mode selector is in position 3.
+	}
+
+	return true;
+}
+
+/**
+ * \brief Maps Move controller data (digital buttons, and analog Trigger data) to mouse input.
+ *        Move Button: Mouse1
+ *        Trigger:     Mouse2
+ * \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_no is invalid
+ */
+static bool mouse_input_to_pad(const u32 mouse_no, be_t<u16>& digital_buttons, be_t<u16>& analog_t)
+{
+	auto& handler = g_fxo->get<MouseHandlerBase>();
+
+	std::scoped_lock lock(handler.mutex);
+
+	if (mouse_no >= handler.GetMice().size())
+	{
+		return false;
+	}
+
+	const auto& mouse_data = handler.GetMice().at(0);
+	const auto is_pressed = [&mouse_data](MouseButtonCodes button) -> bool { return !!(mouse_data.buttons & button); };
+
+	digital_buttons = 0;
+
+	if (is_pressed(CELL_MOUSE_BUTTON_1))
+		digital_buttons |= CELL_GEM_CTRL_T;
+
+	if (is_pressed(CELL_MOUSE_BUTTON_2))
+		digital_buttons |= CELL_GEM_CTRL_MOVE;
+
+	if (is_pressed(CELL_MOUSE_BUTTON_3))
+		digital_buttons |= CELL_GEM_CTRL_CROSS;
+
+	if (is_pressed(CELL_MOUSE_BUTTON_4))
+		digital_buttons |= CELL_GEM_CTRL_CIRCLE;
+
+	if (is_pressed(CELL_MOUSE_BUTTON_5))
+		digital_buttons |= CELL_GEM_CTRL_SQUARE;
+
+	if (is_pressed(CELL_MOUSE_BUTTON_6) || (is_pressed(CELL_MOUSE_BUTTON_1) && is_pressed(CELL_MOUSE_BUTTON_2)))
+		digital_buttons |= CELL_GEM_CTRL_SELECT;
+
+	if (is_pressed(CELL_MOUSE_BUTTON_7) || (is_pressed(CELL_MOUSE_BUTTON_1) && is_pressed(CELL_MOUSE_BUTTON_3)))
+		digital_buttons |= CELL_GEM_CTRL_START;
+
+	if (is_pressed(CELL_MOUSE_BUTTON_8) || (is_pressed(CELL_MOUSE_BUTTON_2) && is_pressed(CELL_MOUSE_BUTTON_3)))
+		digital_buttons |= CELL_GEM_CTRL_TRIANGLE;
+
+	analog_t = (mouse_data.buttons & CELL_MOUSE_BUTTON_1) ? 0xFFFF : 0;
+
+	return true;
+}
+
+static bool mouse_pos_to_gem_image_state(const u32 mouse_no, const gem_config::gem_controller& controller, vm::ptr<CellGemImageState>& gem_image_state)
+{
+	auto& handler = g_fxo->get<MouseHandlerBase>();
+
+	std::scoped_lock lock(handler.mutex);
+
+	if (!gem_image_state || mouse_no >= handler.GetMice().size())
+	{
+		return false;
+	}
+
+	const auto& mouse = handler.GetMice().at(0);
 	const auto& shared_data = g_fxo->get<gem_camera_shared>();
 
-	if (x_max <= 0) x_max = shared_data.width;
-	if (y_max <= 0) y_max = shared_data.height;
-
-	// Move the cursor out of the screen if we're at the screen border (Time Crisis 4 needs this)
-	if (x_pos <= 0) x_pos -= x_max / 10; else if (x_pos >= x_max) x_pos += x_max / 10;
-	if (y_pos <= 0) y_pos -= y_max / 10; else if (y_pos >= y_max) y_pos += y_max / 10;
-
-	const f32 scaling_width = x_max / static_cast<f32>(shared_data.width);
-	const f32 scaling_height = y_max / static_cast<f32>(shared_data.height);
+	s32 mouse_width = mouse.x_max;
+	if (mouse_width <= 0) mouse_width = shared_data.width;
+	s32 mouse_height = mouse.y_max;
+	if (mouse_height <= 0) mouse_height = shared_data.height;
+	const f32 scaling_width = mouse_width / static_cast<f32>(shared_data.width);
+	const f32 scaling_height = mouse_height / static_cast<f32>(shared_data.height);
 	const f32 mmPerPixel = CELL_GEM_SPHERE_RADIUS_MM / controller.radius;
 
 	// Image coordinates in pixels
-	const f32 image_x = static_cast<f32>(x_pos) / scaling_width;
-	const f32 image_y = static_cast<f32>(y_pos) / scaling_height;
+	const f32 image_x = static_cast<f32>(mouse.x_pos) / scaling_width;
+	const f32 image_y = static_cast<f32>(mouse.y_pos) / scaling_height;
 
 	// Centered image coordinates in pixels
 	const f32 centered_x = image_x - (shared_data.width / 2.f);
@@ -1636,53 +399,41 @@ static inline void pos_to_gem_image_state(u32 gem_num, gem_config::gem_controlle
 	gem_image_state->v = image_y;
 
 	// Projected camera coordinates in mm
-	gem_image_state->projectionx = camera_x / controller.distance_mm;
-	gem_image_state->projectiony = camera_y / controller.distance_mm;
+	gem_image_state->projectionx = camera_x / controller.distance;
+	gem_image_state->projectiony = camera_y / controller.distance;
 
-	// Update visibility for fake handlers
-	if (g_cfg.io.move != move_handler::real)
-	{
-		// Let's say the sphere is not visible if the position is at the edge of the screen
-		controller.radius_valid = x_pos > 0 && x_pos < x_max && y_pos > 0 && y_pos < y_max;
-	}
-
-	if (g_cfg.io.show_move_cursor)
-	{
-		draw_overlay_cursor(gem_num, controller, x_pos, y_pos, x_max, y_max);
-	}
-
-	if (g_cfg.io.paint_move_spheres)
-	{
-		::at32(gem::positions, gem_num).set_position(image_x, image_y);
-	}
+	return true;
 }
 
-static inline void pos_to_gem_state(u32 gem_num, gem_config::gem_controller& controller, vm::ptr<CellGemState>& gem_state, s32 x_pos, s32 y_pos, s32 x_max, s32 y_max, const ps_move_data& move_data)
+static bool mouse_pos_to_gem_state(const u32 mouse_no, const gem_config::gem_controller& controller, vm::ptr<CellGemState>& gem_state)
 {
+	auto& handler = g_fxo->get<MouseHandlerBase>();
+
+	std::scoped_lock lock(handler.mutex);
+
+	if (!gem_state || mouse_no >= handler.GetMice().size())
+	{
+		return false;
+	}
+
+	const auto& mouse = handler.GetMice().at(0);
 	const auto& shared_data = g_fxo->get<gem_camera_shared>();
-
-	if (x_max <= 0) x_max = shared_data.width;
-	if (y_max <= 0) y_max = shared_data.height;
-
-	// Move the cursor out of the screen if we're at the screen border (Time Crisis 4 needs this)
-	if (x_pos <= 0) x_pos -= x_max / 10; else if (x_pos >= x_max) x_pos += x_max / 10;
-	if (y_pos <= 0) y_pos -= y_max / 10; else if (y_pos >= y_max) y_pos += y_max / 10;
-
-	const f32 scaling_width = x_max / static_cast<f32>(shared_data.width);
-	const f32 scaling_height = y_max / static_cast<f32>(shared_data.height);
+	
+	s32 mouse_width = mouse.x_max;
+	if (mouse_width <= 0) mouse_width = shared_data.width;
+	s32 mouse_height = mouse.y_max;
+	if (mouse_height <= 0) mouse_height = shared_data.height;
+	const f32 scaling_width = mouse_width / static_cast<f32>(shared_data.width);
+	const f32 scaling_height = mouse_height / static_cast<f32>(shared_data.height);
 	const f32 mmPerPixel = CELL_GEM_SPHERE_RADIUS_MM / controller.radius;
 
 	// Image coordinates in pixels
-	const f32 image_x = static_cast<f32>(x_pos) / scaling_width;
-	const f32 image_y = static_cast<f32>(y_pos) / scaling_height;
-
-	// Half of the camera image
-	const f32 half_width = shared_data.width / 2.f;
-	const f32 half_height = shared_data.height / 2.f;
+	const f32 image_x = static_cast<f32>(mouse.x_pos) / scaling_width;
+	const f32 image_y = static_cast<f32>(mouse.y_pos) / scaling_height;
 
 	// Centered image coordinates in pixels
-	const f32 centered_x = image_x - half_width;
-	const f32 centered_y = half_height - image_y; // Image coordinates increase downwards, so we have to invert this
+	const f32 centered_x = image_x - (shared_data.width / 2.f);
+	const f32 centered_y = (shared_data.height / 2.f) - image_y; // Image coordinates increase downwards, so we have to invert this
 
 	// Camera coordinates in mm (centered, so it's the same as world coordinates)
 	const f32 camera_x = centered_x * mmPerPixel;
@@ -1691,539 +442,22 @@ static inline void pos_to_gem_state(u32 gem_num, gem_config::gem_controller& con
 	// World coordinates in mm
 	gem_state->pos[0] = camera_x;
 	gem_state->pos[1] = camera_y;
-	gem_state->pos[2] = controller.distance_mm;
+	gem_state->pos[2] = static_cast<f32>(controller.distance);
 	gem_state->pos[3] = 0.f;
 
+	gem_state->quat[0] = 320.f - image_x;
+	gem_state->quat[1] = (mouse.y_pos / scaling_width) - 180.f;
+	gem_state->quat[2] = 1200.f;
+
 	// TODO: calculate handle position based on our world coordinate and the angles
 	gem_state->handle_pos[0] = camera_x;
 	gem_state->handle_pos[1] = camera_y;
-	gem_state->handle_pos[2] = controller.distance_mm + 10.0f;
+	gem_state->handle_pos[2] = static_cast<f32>(controller.distance + 10);
 	gem_state->handle_pos[3] = 0.f;
 
-	// Calculate orientation
-	if (g_cfg.io.move == move_handler::real || (g_cfg.io.move == move_handler::fake && move_data.orientation_enabled))
-	{
-		gem_state->quat[0] = move_data.quaternion[0]; // x
-		gem_state->quat[1] = move_data.quaternion[1]; // y
-		gem_state->quat[2] = move_data.quaternion[2]; // z
-		gem_state->quat[3] = move_data.quaternion[3]; // w
-	}
-	else
-	{
-		const f32 max_angle_per_side_h = g_cfg.io.fake_move_rotation_cone_h / 2.0f;
-		const f32 max_angle_per_side_v = g_cfg.io.fake_move_rotation_cone_v / 2.0f;
-		const f32 roll = -PadHandlerBase::degree_to_rad((image_y - half_height) / half_height * max_angle_per_side_v); // This is actually the pitch
-		const f32 pitch = -PadHandlerBase::degree_to_rad((image_x - half_width) / half_width * max_angle_per_side_h); // This is actually the yaw
-		const f32 yaw = PadHandlerBase::degree_to_rad(0.0f);
-		const f32 cr = std::cos(roll * 0.5f);
-		const f32 sr = std::sin(roll * 0.5f);
-		const f32 cp = std::cos(pitch * 0.5f);
-		const f32 sp = std::sin(pitch * 0.5f);
-		const f32 cy = std::cos(yaw * 0.5f);
-		const f32 sy = std::sin(yaw * 0.5f);
-
-		const f32 q_x = sr * cp * cy - cr * sp * sy;
-		const f32 q_y = cr * sp * cy + sr * cp * sy;
-		const f32 q_z = cr * cp * sy - sr * sp * cy;
-		const f32 q_w = cr * cp * cy + sr * sp * sy;
-
-		gem_state->quat[0] = q_x;
-		gem_state->quat[1] = q_y;
-		gem_state->quat[2] = q_z;
-		gem_state->quat[3] = q_w;
-	}
-
-	// Update visibility for fake handlers
-	if (g_cfg.io.move != move_handler::real)
-	{
-		// Let's say the sphere is not visible if the position is at the edge of the screen
-		controller.radius_valid = x_pos > 0 && x_pos < x_max && y_pos > 0 && y_pos < y_max;
-	}
-
-	if (g_cfg.io.show_move_cursor)
-	{
-		draw_overlay_cursor(gem_num, controller, x_pos, y_pos, x_max, y_max);
-	}
-
-	if (g_cfg.io.paint_move_spheres)
-	{
-		::at32(gem::positions, gem_num).set_position(image_x, image_y);
-	}
-}
-
-extern bool is_input_allowed();
-
-/**
- * \brief Maps Move controller data (digital buttons, and analog Trigger data) to DS3 pad input.
- *        Unavoidably buttons conflict with DS3 mappings, which is problematic for some games.
- * \param gem_num gem index 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 controller is disconnected
- */
-static void ds3_input_to_pad(const u32 gem_num, be_t<u16>& digital_buttons, be_t<u16>& analog_t)
-{
-	digital_buttons = 0;
-	analog_t = 0;
-
-	if (!is_input_allowed() || input::g_pads_intercepted) // Let's intercept the PS Move just like a pad
-	{
-		return;
-	}
-
-	std::lock_guard lock(pad::g_pad_mutex);
-
-	const auto handler = pad::get_pad_thread();
-	const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
-
-	if (!pad->is_connected() || pad->is_copilot())
-	{
-		return;
-	}
-
-	const auto handle_input = [&](gem_btn btn, pad_button /*pad_btn*/, u16 value, bool pressed, bool& /*abort*/)
-	{
-		if (!pressed)
-			return;
-
-		switch (btn)
-		{
-		case gem_btn::start:
-			digital_buttons |= CELL_GEM_CTRL_START;
-			break;
-		case gem_btn::select:
-			digital_buttons |= CELL_GEM_CTRL_SELECT;
-			break;
-		case gem_btn::square:
-			digital_buttons |= CELL_GEM_CTRL_SQUARE;
-			break;
-		case gem_btn::cross:
-			digital_buttons |= CELL_GEM_CTRL_CROSS;
-			break;
-		case gem_btn::circle:
-			digital_buttons |= CELL_GEM_CTRL_CIRCLE;
-			break;
-		case gem_btn::triangle:
-			digital_buttons |= CELL_GEM_CTRL_TRIANGLE;
-			break;
-		case gem_btn::move:
-			digital_buttons |= CELL_GEM_CTRL_MOVE;
-			break;
-		case gem_btn::t:
-			digital_buttons |= CELL_GEM_CTRL_T;
-			analog_t = std::max<u16>(analog_t, value);
-			break;
-		default:
-			break;
-		}
-	};
-
-	if (g_cfg.io.move == move_handler::real)
-	{
-		::at32(g_cfg_gem_real.players, gem_num)->handle_input(pad, true, handle_input);
-	}
-	else
-	{
-		::at32(g_cfg_gem_fake.players, gem_num)->handle_input(pad, true, handle_input);
-	}
-}
-
-constexpr u16 ds3_max_x = 255;
-constexpr u16 ds3_max_y = 255;
-
-static inline void ds3_get_stick_values(u32 gem_num, const std::shared_ptr<Pad>& pad, s32& x_pos, s32& y_pos)
-{
-	x_pos = 0;
-	y_pos = 0;
-
-	const auto& cfg = ::at32(g_cfg_gem_fake.players, gem_num);
-	cfg->handle_input(pad, true, [&](gem_btn btn, pad_button /*pad_btn*/, u16 value, bool pressed, bool& /*abort*/)
-	{
-		if (!pressed)
-			return;
-
-		switch (btn)
-		{
-		case gem_btn::x_axis: x_pos = value; break;
-		case gem_btn::y_axis: y_pos = value; break;
-		default: break;
-		}
-	});
-}
-
-template <typename T>
-static void ds3_pos_to_gem_state(u32 gem_num, gem_config::gem_controller& controller, T& gem_state)
-{
-	if (!gem_state || !is_input_allowed() || input::g_pads_intercepted) // Let's intercept the PS Move just like a pad
-	{
-		return;
-	}
-
-	std::lock_guard lock(pad::g_pad_mutex);
-
-	const auto handler = pad::get_pad_thread();
-	const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
-
-	if (!pad->is_connected() || pad->is_copilot())
-	{
-		return;
-	}
-
-	s32 ds3_pos_x, ds3_pos_y;
-	ds3_get_stick_values(gem_num, pad, ds3_pos_x, ds3_pos_y);
-
-	if constexpr (std::is_same_v<T, vm::ptr<CellGemState>>)
-	{
-		pos_to_gem_state(gem_num, controller, gem_state, ds3_pos_x, ds3_pos_y, ds3_max_x, ds3_max_y, pad->move_data);
-	}
-	else if constexpr (std::is_same_v<T, vm::ptr<CellGemImageState>>)
-	{
-		pos_to_gem_image_state(gem_num, controller, gem_state, ds3_pos_x, ds3_pos_y, ds3_max_x, ds3_max_y);
-	}
-}
-
-template <typename T>
-static void ps_move_pos_to_gem_state(u32 gem_num, gem_config::gem_controller& controller, T& gem_state)
-{
-	if (!gem_state || !is_input_allowed() || input::g_pads_intercepted) // Let's intercept the PS Move just like a pad
-	{
-		return;
-	}
-
-	std::lock_guard lock(pad::g_pad_mutex);
-
-	const auto handler = pad::get_pad_thread();
-	const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
-
-	if (pad->m_pad_handler != pad_handler::move || !pad->is_connected() || pad->is_copilot())
-	{
-		return;
-	}
-
-	auto& tracker = g_fxo->get<named_thread<gem_tracker>>();
-	const ps_move_info info = tracker.get_info(gem_num);
-
-	if constexpr (std::is_same_v<T, vm::ptr<CellGemState>>)
-	{
-		gem_state->temperature = pad->move_data.temperature;
-		gem_state->accel[0] = pad->move_data.accelerometer_x * 1000; // linear velocity in mm/s²
-		gem_state->accel[1] = pad->move_data.accelerometer_y * 1000; // linear velocity in mm/s²
-		gem_state->accel[2] = pad->move_data.accelerometer_z * 1000; // linear velocity in mm/s²
-
-		pos_to_gem_state(gem_num, controller, gem_state, info.x_pos, info.y_pos, info.x_max, info.y_max, pad->move_data);
-	}
-	else if constexpr (std::is_same_v<T, vm::ptr<CellGemImageState>>)
-	{
-		pos_to_gem_image_state(gem_num, controller, gem_state, info.x_pos, info.y_pos, info.x_max, info.y_max);
-	}
-}
-
-/**
- * \brief Maps external Move controller data to DS3 input. (This can be input from any physical pad, not just the DS3)
- *        Implementation detail: CellGemExtPortData's digital/analog fields map the same way as
- *        libPad, so no translation is needed.
- * \param gem_num gem index to use
- * \param ext External data to modify
- * \return true on success, false if controller is disconnected
- */
-static void ds3_input_to_ext(u32 gem_num, gem_config::gem_controller& controller, CellGemExtPortData& ext)
-{
-	ext = {};
-
-	if (!is_input_allowed() || input::g_pads_intercepted) // Let's intercept the PS Move just like a pad
-	{
-		return;
-	}
-
-	std::lock_guard lock(pad::g_pad_mutex);
-
-	const auto handler = pad::get_pad_thread();
-	const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
-
-	if (!pad->is_connected() || pad->is_copilot())
-	{
-		return;
-	}
-
-	const auto& move_data = pad->move_data;
-
-	controller.ext_status = move_data.external_device_connected ? CELL_GEM_EXT_CONNECTED : 0; // TODO: | CELL_GEM_EXT_EXT0 | CELL_GEM_EXT_EXT1
-	controller.ext_id = move_data.external_device_connected ? move_data.external_device_id : 0;
-
-	ext.status = controller.ext_status;
-
-	for (const AnalogStick& stick : pad->m_sticks_external)
-	{
-		switch (stick.m_offset)
-		{
-		case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X: ext.analog_left_x = stick.m_value; break;
-		case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y: ext.analog_left_y = stick.m_value; break;
-		case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X: ext.analog_right_x = stick.m_value; break;
-		case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y: ext.analog_right_y = stick.m_value; break;
-		default: break;
-		}
-	}
-
-	for (const Button& button : pad->m_buttons_external)
-	{
-		if (!button.m_pressed)
-			continue;
-
-		switch (button.m_offset)
-		{
-		case CELL_PAD_BTN_OFFSET_DIGITAL1: ext.digital1 |= button.m_outKeyCode; break;
-		case CELL_PAD_BTN_OFFSET_DIGITAL2: ext.digital2 |= button.m_outKeyCode; break;
-		default: break;
-		}
-	}
-
-	if (!move_data.external_device_connected)
-	{
-		return;
-	}
-
-	// The sharpshooter only sets the custom bytes as follows:
-	// custom[0] (0x01): Firing mode selector is in position 1.
-	// custom[0] (0x02): Firing mode selector is in position 2.
-	// custom[0] (0x04): Firing mode selector is in position 3.
-	// custom[0] (0x40): T button trigger is pressed.
-	// custom[0] (0x80): RL reload button is pressed.
-
-	// The racing wheel sets the custom bytes as follows:
-	// custom[0] 0-255:  Throttle
-	// custom[1] 0-255:  L2
-	// custom[2] 0-255:  R2
-	// custom[3] (0x01): Left paddle
-	// custom[3] (0x02): Right paddle
-
-	std::memcpy(ext.custom, move_data.external_device_data.data(), 5);
-}
-
-/**
- * \brief Maps Move controller data (digital buttons, and analog Trigger data) to mouse input.
- * \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_no is invalid
- */
-static bool mouse_input_to_pad(u32 mouse_no, be_t<u16>& digital_buttons, be_t<u16>& analog_t)
-{
-	digital_buttons = 0;
-	analog_t = 0;
-
-	if (!is_input_allowed() || input::g_pads_intercepted) // Let's intercept the PS Move just like a pad
-	{
-		return false;
-	}
-
-	auto& handler = g_fxo->get<MouseHandlerBase>();
-
-	std::scoped_lock lock(handler.mutex);
-
-	// Make sure that the mouse handler is initialized
-	handler.Init(std::min<u32>(g_fxo->get<gem_config>().attribute.max_connect, CELL_GEM_MAX_NUM));
-
-	if (mouse_no >= handler.GetMice().size())
-	{
-		return false;
-	}
-
-	const Mouse& mouse_data = ::at32(handler.GetMice(), mouse_no);
-	auto& cfg = ::at32(g_cfg_gem_mouse.players, mouse_no);
-
-	bool combo_active = false;
-	std::set<pad_button> combos;
-
-	static const std::unordered_map<gem_btn, u16> btn_map =
-	{
-		{ gem_btn::start, CELL_GEM_CTRL_START },
-		{ gem_btn::select, CELL_GEM_CTRL_SELECT },
-		{ gem_btn::triangle, CELL_GEM_CTRL_TRIANGLE },
-		{ gem_btn::circle, CELL_GEM_CTRL_CIRCLE },
-		{ gem_btn::cross, CELL_GEM_CTRL_CROSS },
-		{ gem_btn::square, CELL_GEM_CTRL_SQUARE },
-		{ gem_btn::move, CELL_GEM_CTRL_MOVE },
-		{ gem_btn::t, CELL_GEM_CTRL_T },
-		{ gem_btn::combo_start, CELL_GEM_CTRL_START },
-		{ gem_btn::combo_select, CELL_GEM_CTRL_SELECT },
-		{ gem_btn::combo_triangle, CELL_GEM_CTRL_TRIANGLE },
-		{ gem_btn::combo_circle, CELL_GEM_CTRL_CIRCLE },
-		{ gem_btn::combo_cross, CELL_GEM_CTRL_CROSS },
-		{ gem_btn::combo_square, CELL_GEM_CTRL_SQUARE },
-		{ gem_btn::combo_move, CELL_GEM_CTRL_MOVE },
-		{ gem_btn::combo_t, CELL_GEM_CTRL_T },
-	};
-
-	// Check combo button first
-	cfg->handle_input(mouse_data, [&combo_active](gem_btn btn, pad_button /*pad_btn*/, u16 /*value*/, bool pressed, bool& abort)
-	{
-		if (pressed && btn == gem_btn::combo)
-		{
-			combo_active = true;
-			abort = true;
-		}
-	});
-
-	// Check combos
-	if (combo_active)
-	{
-		cfg->handle_input(mouse_data, [&digital_buttons, &combos](gem_btn btn, pad_button pad_btn, u16 /*value*/, bool pressed, bool& /*abort*/)
-		{
-			if (!pressed)
-				return;
-
-			switch (btn)
-			{
-			case gem_btn::combo_start:
-			case gem_btn::combo_select:
-			case gem_btn::combo_triangle:
-			case gem_btn::combo_circle:
-			case gem_btn::combo_cross:
-			case gem_btn::combo_square:
-			case gem_btn::combo_move:
-			case gem_btn::combo_t:
-				digital_buttons |= ::at32(btn_map, btn);
-				combos.insert(pad_btn);
-				break;
-			default:
-				break;
-			}
-		});
-	}
-
-	// Check normal buttons
-	cfg->handle_input(mouse_data, [&digital_buttons, &combos](gem_btn btn, pad_button pad_btn, u16 /*value*/, bool pressed, bool& /*abort*/)
-	{
-		if (!pressed)
-			return;
-
-		switch (btn)
-		{
-		case gem_btn::start:
-		case gem_btn::select:
-		case gem_btn::square:
-		case gem_btn::cross:
-		case gem_btn::circle:
-		case gem_btn::triangle:
-		case gem_btn::move:
-		case gem_btn::t:
-			// Ignore this gem_btn if the same pad_button was already used in a combo
-			if (!combos.contains(pad_btn))
-			{
-				digital_buttons |= ::at32(btn_map, btn);
-			}
-			break;
-		default:
-			break;
-		}
-	});
-
-	analog_t = (digital_buttons & CELL_GEM_CTRL_T) ? 255 : 0;
-
 	return true;
 }
 
-template <typename T>
-static void mouse_pos_to_gem_state(u32 mouse_no, gem_config::gem_controller& controller, T& gem_state)
-{
-	if (!gem_state || !is_input_allowed() || input::g_pads_intercepted) // Let's intercept the PS Move just like a pad
-	{
-		return;
-	}
-
-	auto& handler = g_fxo->get<MouseHandlerBase>();
-
-	std::scoped_lock lock(handler.mutex);
-
-	// Make sure that the mouse handler is initialized
-	handler.Init(std::min<u32>(g_fxo->get<gem_config>().attribute.max_connect, CELL_GEM_MAX_NUM));
-
-	if (mouse_no >= handler.GetMice().size())
-	{
-		return;
-	}
-
-	const auto& mouse = ::at32(handler.GetMice(), mouse_no);
-
-	if constexpr (std::is_same_v<T, vm::ptr<CellGemState>>)
-	{
-		pos_to_gem_state(mouse_no, controller, gem_state, mouse.x_pos, mouse.y_pos, mouse.x_max, mouse.y_max, {});
-	}
-	else if constexpr (std::is_same_v<T, vm::ptr<CellGemImageState>>)
-	{
-		pos_to_gem_image_state(mouse_no, controller, gem_state, mouse.x_pos, mouse.y_pos, mouse.x_max, mouse.y_max);
-	}
-}
-
-#ifdef HAVE_LIBEVDEV
-static bool gun_input_to_pad(u32 gem_no, be_t<u16>& digital_buttons, be_t<u16>& analog_t)
-{
-	digital_buttons = 0;
-	analog_t = 0;
-
-	if (!is_input_allowed())
-		return false;
-
-	gun_thread& gun = g_fxo->get<gun_thread>();
-	std::scoped_lock lock(gun.handler.mutex);
-
-	if (gun.handler.get_button(gem_no, gun_button::btn_left) == 1)
-		digital_buttons |= CELL_GEM_CTRL_T;
-
-	if (gun.handler.get_button(gem_no, gun_button::btn_right) == 1)
-		digital_buttons |= CELL_GEM_CTRL_MOVE;
-
-	if (gun.handler.get_button(gem_no, gun_button::btn_middle) == 1)
-		digital_buttons |= CELL_GEM_CTRL_START;
-
-	if (gun.handler.get_button(gem_no, gun_button::btn_1) == 1)
-		digital_buttons |= CELL_GEM_CTRL_CROSS;
-
-	if (gun.handler.get_button(gem_no, gun_button::btn_2) == 1)
-		digital_buttons |= CELL_GEM_CTRL_CIRCLE;
-
-	if (gun.handler.get_button(gem_no, gun_button::btn_3) == 1)
-		digital_buttons |= CELL_GEM_CTRL_SELECT;
-
-	if (gun.handler.get_button(gem_no, gun_button::btn_5) == 1)
-		digital_buttons |= CELL_GEM_CTRL_TRIANGLE;
-
-	if (gun.handler.get_button(gem_no, gun_button::btn_6) == 1)
-		digital_buttons |= CELL_GEM_CTRL_SQUARE;
-
-	analog_t = gun.handler.get_button(gem_no, gun_button::btn_left) ? 255 : 0;
-
-	return true;
-}
-
-template <typename T>
-static void gun_pos_to_gem_state(u32 gem_no, gem_config::gem_controller& controller, T& gem_state)
-{
-	if (!gem_state || !is_input_allowed())
-		return;
-
-	int x_pos, y_pos, x_max, y_max;
-	{
-		gun_thread& gun = g_fxo->get<gun_thread>();
-		std::scoped_lock lock(gun.handler.mutex);
-
-		x_pos = gun.handler.get_axis_x(gem_no);
-		y_pos = gun.handler.get_axis_y(gem_no);
-		x_max = gun.handler.get_axis_x_max(gem_no);
-		y_max = gun.handler.get_axis_y_max(gem_no);
-	}
-
-	if constexpr (std::is_same_v<T, vm::ptr<CellGemState>>)
-	{
-		pos_to_gem_state(gem_no, controller, gem_state, x_pos, y_pos, x_max, y_max, {});
-	}
-	else if constexpr (std::is_same_v<T, vm::ptr<CellGemImageState>>)
-	{
-		pos_to_gem_image_state(gem_no, controller, gem_state, x_pos, y_pos, x_max, y_max);
-	}
-}
-#endif
-
 // *********************
 // * cellGem functions *
 // *********************
@@ -2246,15 +480,16 @@ error_code cellGemCalibrate(u32 gem_num)
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
 
-	auto& controller = gem.controllers[gem_num];
-
-	if (controller.is_calibrating)
+	if (gem.is_controller_calibrating(gem_num))
 	{
 		return CELL_EBUSY;
 	}
 
-	controller.is_calibrating = true;
-	controller.calibration_start_us = get_guest_system_time();
+	if (g_cfg.io.move == move_handler::fake || g_cfg.io.move == move_handler::mouse)
+	{
+		gem.controllers[gem_num].is_calibrating = true;
+		gem.controllers[gem_num].calibration_start_us = get_guest_system_time();
+	}
 
 	return CELL_OK;
 }
@@ -2277,14 +512,14 @@ error_code cellGemClearStatusFlags(u32 gem_num, u64 mask)
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
 
-	gem.controllers[gem_num].calibration_status_flags &= ~mask;
+	gem.status_flags &= ~mask;
 
 	return CELL_OK;
 }
 
-error_code cellGemConvertVideoFinish(ppu_thread& ppu)
+error_code cellGemConvertVideoFinish()
 {
-	cellGem.warning("cellGemConvertVideoFinish()");
+	cellGem.todo("cellGemConvertVideoFinish()");
 
 	auto& gem = g_fxo->get<gem_config>();
 
@@ -2293,22 +528,19 @@ error_code cellGemConvertVideoFinish(ppu_thread& ppu)
 		return CELL_GEM_ERROR_UNINITIALIZED;
 	}
 
-	if (!gem.video_conversion_in_progress)
+	if (!std::exchange(gem.video_conversion_started, false))
 	{
 		return CELL_GEM_ERROR_CONVERT_NOT_STARTED;
 	}
 
-	if (!gem.wait_for_result(ppu))
-	{
-		return {};
-	}
+	// TODO: wait until image is converted
 
 	return CELL_OK;
 }
 
 error_code cellGemConvertVideoStart(vm::cptr<void> video_frame)
 {
-	cellGem.warning("cellGemConvertVideoStart(video_frame=*0x%x)", video_frame);
+	cellGem.todo("cellGemConvertVideoStart(video_frame=*0x%x)", video_frame);
 
 	auto& gem = g_fxo->get<gem_config>();
 
@@ -2322,22 +554,18 @@ error_code cellGemConvertVideoStart(vm::cptr<void> video_frame)
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
 
-	if (!video_frame.aligned(128))
-	{
-		return CELL_GEM_ERROR_INVALID_ALIGNMENT;
-	}
+	// TODO: The alignment checks seem to break Time Crisis Razing Storm [BLUS30528]
+	//if (!video_frame.aligned(128))
+	//{
+	//	return CELL_GEM_ERROR_INVALID_ALIGNMENT;
+	//}
 
-	if (gem.video_conversion_in_progress)
+	if (std::exchange(gem.video_conversion_started, true))
 	{
 		return CELL_GEM_ERROR_CONVERT_NOT_FINISHED;
 	}
 
-	const auto& shared_data = g_fxo->get<gem_camera_shared>();
-	gem.video_data_in.resize(shared_data.size);
-	std::memcpy(gem.video_data_in.data(), video_frame.get_ptr(), gem.video_data_in.size());
-
-	gem.video_conversion_in_progress = true;
-	gem.wake_up();
+	// TODO: start image conversion of video_frame async to gem.vc_attribute.video_data_out
 
 	return CELL_OK;
 }
@@ -2383,77 +611,20 @@ error_code cellGemEnableMagnetometer(u32 gem_num, u32 enable)
 		return CELL_GEM_NOT_CONNECTED;
 	}
 
-	auto& controller = gem.controllers[gem_num];
-
 	// NOTE: RE doesn't show this check but it is mentioned in the docs, so I'll leave it here for now.
-	//if (!controller.calibrated_magnetometer)
+	//if (!gem.controllers[gem_num].calibrated_magnetometer)
 	//{
 	//	return CELL_GEM_NOT_CALIBRATED;
 	//}
 
-	controller.enabled_magnetometer = !!enable;
-
-	if (g_cfg.io.move == move_handler::real)
-	{
-		std::lock_guard lock(pad::g_pad_mutex);
-
-		const auto handler = pad::get_pad_thread();
-		const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
-
-		if (pad && pad->m_pad_handler == pad_handler::move && !pad->is_copilot())
-		{
-			pad->move_data.magnetometer_enabled = controller.enabled_magnetometer;
-		}
-	}
+	gem.controllers[gem_num].enabled_magnetometer = !!enable;
 
 	return CELL_OK;
 }
 
-error_code cellGemEnableMagnetometer2(u32 gem_num, u32 enable)
+error_code cellGemEnableMagnetometer2()
 {
-	cellGem.trace("cellGemEnableMagnetometer2(gem_num=%d, enable=0x%x)", gem_num, enable);
-
-	auto& gem = g_fxo->get<gem_config>();
-
-	std::scoped_lock lock(gem.mtx);
-
-	if (!gem.state)
-	{
-		return CELL_GEM_ERROR_UNINITIALIZED;
-	}
-
-	if (!check_gem_num(gem_num))
-	{
-		return CELL_GEM_ERROR_INVALID_PARAMETER;
-	}
-
-	if (!gem.is_controller_ready(gem_num))
-	{
-		return CELL_GEM_NOT_CONNECTED;
-	}
-
-	auto& controller = gem.controllers[gem_num];
-
-	if (!controller.calibrated_magnetometer)
-	{
-		return CELL_GEM_NOT_CALIBRATED;
-	}
-
-	controller.enabled_magnetometer = !!enable;
-
-	if (g_cfg.io.move == move_handler::real)
-	{
-		std::lock_guard lock(pad::g_pad_mutex);
-
-		const auto handler = pad::get_pad_thread();
-		const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
-
-		if (pad && pad->m_pad_handler == pad_handler::move && !pad->is_copilot())
-		{
-			pad->move_data.magnetometer_enabled = controller.enabled_magnetometer;
-		}
-	}
-
+	UNIMPLEMENTED_FUNC(cellGem);
 	return CELL_OK;
 }
 
@@ -2463,11 +634,11 @@ error_code cellGemEnd(ppu_thread& ppu)
 
 	auto& gem = g_fxo->get<gem_config>();
 
-	std::unique_lock lock(gem.mtx);
+	std::scoped_lock lock(gem.mtx);
 
 	if (gem.state.compare_and_swap_test(1, 0))
 	{
-		if (u32 addr = std::exchange(gem.memory_ptr, 0))
+		if (u32 addr = gem.memory_ptr)
 		{
 			sys_memory_free(ppu, addr);
 		}
@@ -2475,16 +646,6 @@ error_code cellGemEnd(ppu_thread& ppu)
 		return CELL_OK;
 	}
 
-	lock.unlock();
-
-	auto& tracker = g_fxo->get<named_thread<gem_tracker>>();
-	if (!tracker.wait_for_tracker_result(ppu))
-	{
-		return {};
-	}
-
-	gem.updating = false;
-
 	return CELL_GEM_ERROR_UNINITIALIZED;
 }
 
@@ -2511,9 +672,9 @@ error_code cellGemFilterState(u32 gem_num, u32 enable)
 	return CELL_OK;
 }
 
-error_code cellGemForceRGB(u32 gem_num, f32 r, f32 g, f32 b)
+error_code cellGemForceRGB(u32 gem_num, float r, float g, float b)
 {
-	cellGem.warning("cellGemForceRGB(gem_num=%d, r=%f, g=%f, b=%f)", gem_num, r, g, b);
+	cellGem.todo("cellGemForceRGB(gem_num=%d, r=%f, g=%f, b=%f)", gem_num, r, g, b);
 
 	auto& gem = g_fxo->get<gem_config>();
 
@@ -2535,13 +696,8 @@ error_code cellGemForceRGB(u32 gem_num, f32 r, f32 g, f32 b)
 	//	color = color * (2.f / sum)
 	//}
 
-	auto& controller = gem.controllers[gem_num];
-
-	controller.sphere_rgb = gem_config::gem_color(r, g, b);
-	controller.enabled_tracking = false;
-
-	const auto [h, s, v] = ps_move_tracker<false>::rgb_to_hsv(r, g, b);
-	controller.hue = h;
+	gem.controllers[gem_num].sphere_rgb = gem_config::gem_color(r, g, b);
+	gem.controllers[gem_num].enabled_tracking = false;
 
 	return CELL_OK;
 }
@@ -2563,10 +719,6 @@ error_code cellGemGetAccelerometerPositionInDevice(u32 gem_num, vm::ptr<f32> pos
 	}
 
 	// TODO
-	pos[0] = 0.0f;
-	pos[1] = 0.0f;
-	pos[2] = 0.0f;
-	pos[3] = 0.0f;
 
 	return CELL_OK;
 }
@@ -2587,12 +739,9 @@ error_code cellGemGetAllTrackableHues(vm::ptr<u8> hues)
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
 
-	auto& tracker = g_fxo->get<named_thread<gem_tracker>>();
-	std::lock_guard lock(tracker.mutex);
-
-	for (u32 hue = 0; hue < 360; hue++)
+	for (u32 i = 0; i < 360; i++)
 	{
-		hues[hue] = tracker.hue_is_trackable(hue);
+		hues[i] = true;
 	}
 
 	return CELL_OK;
@@ -2602,7 +751,12 @@ error_code cellGemGetCameraState(vm::ptr<CellGemCameraState> camera_state)
 {
 	cellGem.todo("cellGemGetCameraState(camera_state=0x%x)", camera_state);
 
-	[[maybe_unused]] auto& gem = g_fxo->get<gem_config>();
+	auto& gem = g_fxo->get<gem_config>();
+
+	if (!gem.state)
+	{
+		return CELL_GEM_ERROR_UNINITIALIZED;
+	}
 
 	if (!camera_state)
 	{
@@ -2612,9 +766,9 @@ error_code cellGemGetCameraState(vm::ptr<CellGemCameraState> camera_state)
 	// TODO: use correct camera settings
 	camera_state->exposure = 0;
 	camera_state->exposure_time = 1.0f / 60.0f;
-	camera_state->gain = 1.0f;
-	camera_state->pitch_angle = 0.0f;
-	camera_state->pitch_angle_estimate = 0.0f;
+	camera_state->gain = 1.0;
+	camera_state->pitch_angle = 0.0;
+	camera_state->pitch_angle_estimate = 0.0;
 
 	return CELL_OK;
 }
@@ -2665,22 +819,16 @@ error_code cellGemGetHuePixels(vm::cptr<void> camera_frame, u32 hue, vm::ptr<u8>
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
 
-	std::memset(pixels.get_ptr(), 0, 640 * 480 * sizeof(u8));
-
-	if (g_cfg.io.move == move_handler::real)
-	{
-		// TODO: get pixels from tracker
-	}
+	// TODO
 
 	return CELL_OK;
 }
 
 error_code cellGemGetImageState(u32 gem_num, vm::ptr<CellGemImageState> gem_image_state)
 {
-	cellGem.warning("cellGemGetImageState(gem_num=%d, image_state=&0x%x)", gem_num, gem_image_state);
+	cellGem.todo("cellGemGetImageState(gem_num=%d, image_state=&0x%x)", gem_num, gem_image_state);
 
 	auto& gem = g_fxo->get<gem_config>();
-	std::scoped_lock lock(gem.mtx);
 
 	if (!gem.state)
 	{
@@ -2692,41 +840,27 @@ error_code cellGemGetImageState(u32 gem_num, vm::ptr<CellGemImageState> gem_imag
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
 
-	*gem_image_state = {};
-
-	if (g_cfg.io.move != move_handler::null)
+	if (g_cfg.io.move == move_handler::fake || g_cfg.io.move == move_handler::mouse)
 	{
-		const auto& shared_data = g_fxo->get<gem_camera_shared>();
-		auto& controller = gem.controllers[gem_num];
-
-		gem_image_state->frame_timestamp = shared_data.frame_timestamp_us.load();
+		auto& shared_data = g_fxo->get<gem_camera_shared>();
+		gem_image_state->frame_timestamp = shared_data.frame_timestamp.load();
 		gem_image_state->timestamp = gem_image_state->frame_timestamp + 10;
+		gem_image_state->r = gem.controllers[gem_num].radius; // Radius in camera pixels
+		gem_image_state->distance = gem.controllers[gem_num].distance; // 1.5 meters away from camera
+		gem_image_state->visible = gem.is_controller_ready(gem_num);
+		gem_image_state->r_valid = true;
 
-		switch (g_cfg.io.move)
+		if (g_cfg.io.move == move_handler::fake)
 		{
-		case move_handler::real:
-			ps_move_pos_to_gem_state(gem_num, controller, gem_image_state);
-			break;
-		case move_handler::fake:
-			ds3_pos_to_gem_state(gem_num, controller, gem_image_state);
-			break;
-		case move_handler::mouse:
-		case move_handler::raw_mouse:
-			mouse_pos_to_gem_state(gem_num, controller, gem_image_state);
-			break;
-#ifdef HAVE_LIBEVDEV
-		case move_handler::gun:
-			gun_pos_to_gem_state(gem_num, controller, gem_image_state);
-			break;
-#endif
-		case move_handler::null:
-			fmt::throw_exception("Unreachable");
+			gem_image_state->u = 0;
+			gem_image_state->v = 0;
+			gem_image_state->projectionx = 1;
+			gem_image_state->projectiony = 1;
+		}
+		else if (g_cfg.io.move == move_handler::mouse)
+		{
+			mouse_pos_to_gem_image_state(gem_num, gem.controllers[gem_num], gem_image_state);
 		}
-
-		gem_image_state->r = controller.radius; // Radius in camera pixels
-		gem_image_state->distance = controller.distance_mm;
-		gem_image_state->visible = controller.radius_valid && gem.is_controller_ready(gem_num);
-		gem_image_state->r_valid = controller.radius_valid;
 	}
 
 	return CELL_OK;
@@ -2745,7 +879,7 @@ error_code cellGemGetInertialState(u32 gem_num, u32 state_flag, u64 timestamp, v
 		return CELL_GEM_ERROR_UNINITIALIZED;
 	}
 
-	if (!check_gem_num(gem_num) || !inertial_state || !gem.is_controller_ready(gem_num))
+	if (!check_gem_num(gem_num) || state_flag > CELL_GEM_INERTIAL_STATE_FLAG_NEXT || !inertial_state || !gem.is_controller_ready(gem_num))
 	{
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
@@ -2755,54 +889,21 @@ error_code cellGemGetInertialState(u32 gem_num, u32 state_flag, u64 timestamp, v
 		return CELL_GEM_TIME_OUT_OF_RANGE;
 	}
 
-	*inertial_state = {};
-
-	if (g_cfg.io.move != move_handler::null)
+	if (g_cfg.io.move == move_handler::fake || g_cfg.io.move == move_handler::mouse)
 	{
 		ds3_input_to_ext(gem_num, gem.controllers[gem_num], inertial_state->ext);
 
-		inertial_state->timestamp = (get_guest_system_time() - gem.start_timestamp_us);
+		inertial_state->timestamp = (get_guest_system_time() - gem.start_timestamp);
 		inertial_state->counter = gem.inertial_counter++;
 		inertial_state->accelerometer[0] = 10; // Current gravity in m/s²
 
-		switch (g_cfg.io.move)
+		if (g_cfg.io.move == move_handler::fake)
 		{
-		case move_handler::real:
-		case move_handler::fake:
-		{
-			// Get temperature and sensor data
-			{
-				std::lock_guard lock(pad::g_pad_mutex);
-
-				const auto handler = pad::get_pad_thread();
-				const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
-
-				if (pad && pad->is_connected() && !pad->is_copilot())
-				{
-					inertial_state->temperature = pad->move_data.temperature;
-					inertial_state->accelerometer[0] = pad->move_data.accelerometer_x;
-					inertial_state->accelerometer[1] = pad->move_data.accelerometer_y;
-					inertial_state->accelerometer[2] = pad->move_data.accelerometer_z;
-					inertial_state->gyro[0] = pad->move_data.gyro_x;
-					inertial_state->gyro[1] = pad->move_data.gyro_y;
-					inertial_state->gyro[2] = pad->move_data.gyro_z;
-				}
-			}
-
 			ds3_input_to_pad(gem_num, inertial_state->pad.digitalbuttons, inertial_state->pad.analog_T);
-			break;
 		}
-		case move_handler::mouse:
-		case move_handler::raw_mouse:
+		else if (g_cfg.io.move == move_handler::mouse)
+		{
 			mouse_input_to_pad(gem_num, inertial_state->pad.digitalbuttons, inertial_state->pad.analog_T);
-			break;
-#ifdef HAVE_LIBEVDEV
-		case move_handler::gun:
-			gun_input_to_pad(gem_num, inertial_state->pad.digitalbuttons, inertial_state->pad.analog_T);
-			break;
-#endif
-		case move_handler::null:
-			fmt::throw_exception("Unreachable");
 		}
 	}
 
@@ -2811,7 +912,7 @@ error_code cellGemGetInertialState(u32 gem_num, u32 state_flag, u64 timestamp, v
 
 error_code cellGemGetInfo(vm::ptr<CellGemInfo> info)
 {
-	cellGem.trace("cellGemGetInfo(info=*0x%x)", info);
+	cellGem.warning("cellGemGetInfo(info=*0x%x)", info);
 
 	auto& gem = g_fxo->get<gem_config>();
 
@@ -2827,6 +928,7 @@ error_code cellGemGetInfo(vm::ptr<CellGemInfo> info)
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
 
+	// TODO: Support connecting PlayStation Move controllers
 	info->max_connect = gem.attribute.max_connect;
 	info->now_connect = gem.connected_controllers;
 
@@ -2856,7 +958,7 @@ error_code cellGemGetMemorySize(s32 max_connect)
 	return not_an_error(GemGetMemorySize(max_connect));
 }
 
-error_code cellGemGetRGB(u32 gem_num, vm::ptr<f32> r, vm::ptr<f32> g, vm::ptr<f32> b)
+error_code cellGemGetRGB(u32 gem_num, vm::ptr<float> r, vm::ptr<float> g, vm::ptr<float> b)
 {
 	cellGem.todo("cellGemGetRGB(gem_num=%d, r=*0x%x, g=*0x%x, b=*0x%x)", gem_num, r, g, b);
 
@@ -2874,7 +976,7 @@ error_code cellGemGetRGB(u32 gem_num, vm::ptr<f32> r, vm::ptr<f32> g, vm::ptr<f3
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
 
-	const gem_config_data::gem_color& sphere_color = gem.controllers[gem_num].sphere_rgb;
+	auto& sphere_color = gem.controllers[gem_num].sphere_rgb;
 	*r = sphere_color.r;
 	*g = sphere_color.g;
 	*b = sphere_color.b;
@@ -2925,7 +1027,7 @@ error_code cellGemGetState(u32 gem_num, u32 flag, u64 time_parameter, vm::ptr<Ce
 
 	if (!gem.is_controller_ready(gem_num))
 	{
-		return not_an_error(CELL_GEM_NOT_CONNECTED);
+		return CELL_GEM_NOT_CONNECTED;
 	}
 
 	// TODO: Get the gem state at the specified time
@@ -2947,57 +1049,29 @@ error_code cellGemGetState(u32 gem_num, u32 flag, u64 time_parameter, vm::ptr<Ce
 		return CELL_GEM_TIME_OUT_OF_RANGE;
 	}
 
-	auto& controller = gem.controllers[gem_num];
-
-	*gem_state = {};
-
-	if (g_cfg.io.move != move_handler::null)
+	if (g_cfg.io.move == move_handler::fake || g_cfg.io.move == move_handler::mouse)
 	{
-		ds3_input_to_ext(gem_num, controller, gem_state->ext);
+		ds3_input_to_ext(gem_num, gem.controllers[gem_num], gem_state->ext);
 
-		if (controller.enabled_tracking)
-		{
-			gem_state->tracking_flags |= CELL_GEM_TRACKING_FLAG_POSITION_TRACKED;
-			gem_state->tracking_flags |= CELL_GEM_TRACKING_FLAG_VISIBLE;
-		}
+		u32 tracking_flags = CELL_GEM_TRACKING_FLAG_VISIBLE;
 
-		gem_state->timestamp = (get_guest_system_time() - gem.start_timestamp_us);
+		if (gem.controllers[gem_num].enabled_tracking)
+			tracking_flags |= CELL_GEM_TRACKING_FLAG_POSITION_TRACKED;
+
+		*gem_state = {};
+		gem_state->tracking_flags = tracking_flags;
+		gem_state->timestamp = (get_guest_system_time() - gem.start_timestamp);
 		gem_state->camera_pitch_angle = 0.f;
+		gem_state->quat[3] = 1.f;
 
-		switch (g_cfg.io.move)
+		if (g_cfg.io.move == move_handler::fake)
 		{
-		case move_handler::real:
-		{
-			auto& tracker = g_fxo->get<named_thread<gem_tracker>>();
-			const ps_move_info info = tracker.get_info(gem_num);
-
 			ds3_input_to_pad(gem_num, gem_state->pad.digitalbuttons, gem_state->pad.analog_T);
-			ps_move_pos_to_gem_state(gem_num, controller, gem_state);
-
-			if (info.valid)
-				gem_state->tracking_flags |= CELL_GEM_TRACKING_FLAG_VISIBLE;
-			else
-				gem_state->tracking_flags &= ~CELL_GEM_TRACKING_FLAG_VISIBLE;
-
-			break;
 		}
-		case move_handler::fake:
-			ds3_input_to_pad(gem_num, gem_state->pad.digitalbuttons, gem_state->pad.analog_T);
-			ds3_pos_to_gem_state(gem_num, controller, gem_state);
-			break;
-		case move_handler::mouse:
-		case move_handler::raw_mouse:
+		else if (g_cfg.io.move == move_handler::mouse)
+		{
 			mouse_input_to_pad(gem_num, gem_state->pad.digitalbuttons, gem_state->pad.analog_T);
-			mouse_pos_to_gem_state(gem_num, controller, gem_state);
-			break;
-#ifdef HAVE_LIBEVDEV
-		case move_handler::gun:
-			gun_input_to_pad(gem_num, gem_state->pad.digitalbuttons, gem_state->pad.analog_T);
-			gun_pos_to_gem_state(gem_num, controller, gem_state);
-			break;
-#endif
-		case move_handler::null:
-			fmt::throw_exception("Unreachable");
+			mouse_pos_to_gem_state(gem_num, gem.controllers[gem_num], gem_state);
 		}
 	}
 
@@ -3006,17 +1080,17 @@ error_code cellGemGetState(u32 gem_num, u32 flag, u64 time_parameter, vm::ptr<Ce
 		return CELL_GEM_COMPUTING_AVAILABLE_COLORS;
 	}
 
-	if (controller.is_calibrating)
+	if (gem.is_controller_calibrating(gem_num))
 	{
 		return CELL_GEM_SPHERE_CALIBRATING;
 	}
 
-	if (!controller.calibrated_magnetometer)
+	if (!gem.controllers[gem_num].calibrated_magnetometer)
 	{
 		return CELL_GEM_SPHERE_NOT_CALIBRATED;
 	}
 
-	if (!controller.hue_set)
+	if (!gem.controllers[gem_num].hue_set)
 	{
 		return CELL_GEM_HUE_NOT_SET;
 	}
@@ -3026,7 +1100,7 @@ error_code cellGemGetState(u32 gem_num, u32 flag, u64 time_parameter, vm::ptr<Ce
 
 error_code cellGemGetStatusFlags(u32 gem_num, vm::ptr<u64> flags)
 {
-	cellGem.trace("cellGemGetStatusFlags(gem_num=%d, flags=*0x%x)", gem_num, flags);
+	cellGem.todo("cellGemGetStatusFlags(gem_num=%d, flags=*0x%x)", gem_num, flags);
 
 	auto& gem = g_fxo->get<gem_config>();
 
@@ -3042,7 +1116,7 @@ error_code cellGemGetStatusFlags(u32 gem_num, vm::ptr<u64> flags)
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
 
-	*flags = gem.runtime_status_flags | gem.controllers[gem_num].calibration_status_flags;
+	*flags = gem.status_flags;
 
 	return CELL_OK;
 }
@@ -3065,14 +1139,12 @@ error_code cellGemGetTrackerHue(u32 gem_num, vm::ptr<u32> hue)
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
 
-	const auto& controller = gem.controllers[gem_num];
-
-	if (!controller.enabled_tracking || controller.hue > 359)
+	if (!gem.controllers[gem_num].enabled_tracking || gem.controllers[gem_num].hue > 359)
 	{
-		return { CELL_GEM_ERROR_NOT_A_HUE, controller.hue };
+		return { CELL_GEM_ERROR_NOT_A_HUE, gem.controllers[gem_num].hue };
 	}
 
-	*hue = controller.hue;
+	*hue = gem.controllers[gem_num].hue;
 
 	return CELL_OK;
 }
@@ -3092,9 +1164,9 @@ error_code cellGemHSVtoRGB(f32 h, f32 s, f32 v, vm::ptr<f32> r, vm::ptr<f32> g,
 	const f32 x = c * (1.0f - fabs(fmod(h / 60.0f, 2.0f) - 1.0f));
 	const f32 m = v - c;
 
-	f32 r_tmp{};
-	f32 g_tmp{};
-	f32 b_tmp{};
+	f32 r_tmp{0.0};
+	f32 g_tmp{0.0};
+	f32 b_tmp{0.0};
 
 	if (h < 60.0f)
 	{
@@ -3169,20 +1241,26 @@ error_code cellGemInit(ppu_thread& ppu, vm::cptr<CellGemAttribute> attribute)
 		gem.memory_ptr = 0;
 	}
 
-	gem.updating = false;
+	gem.update_started = false;
 	gem.camera_frame = 0;
-	gem.runtime_status_flags = 0;
+	gem.status_flags = 0;
 	gem.attribute = *attribute;
 
+	if (g_cfg.io.move == move_handler::mouse)
+	{
+		// init mouse handler
+		auto& handler = g_fxo->get<MouseHandlerBase>();
+
+		handler.Init(std::min<u32>(attribute->max_connect, CELL_GEM_MAX_NUM));
+	}
+
 	for (int gem_num = 0; gem_num < CELL_GEM_MAX_NUM; gem_num++)
 	{
 		gem.reset_controller(gem_num);
 	}
 
 	// TODO: is this correct?
-	gem.start_timestamp_us = get_guest_system_time();
-
-	gem.wake_up();
+	gem.start_timestamp = get_guest_system_time();
 
 	return CELL_OK;
 }
@@ -3205,15 +1283,16 @@ error_code cellGemInvalidateCalibration(s32 gem_num)
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
 
-	auto& controller = gem.controllers[gem_num];
+	if (g_cfg.io.move == move_handler::fake || g_cfg.io.move == move_handler::mouse)
+	{
+		gem.controllers[gem_num].calibrated_magnetometer = false;
 
-	// TODO: does this really stop an ongoing calibration ?
-	controller.calibrated_magnetometer = false;
-	controller.is_calibrating = false;
-	controller.calibration_start_us = 0;
-	controller.calibration_status_flags = 0;
-	controller.hue_set = false;
-	controller.enabled_tracking = false;
+		// TODO: does this really stop an ongoing calibration ?
+		gem.controllers[gem_num].is_calibrating = false;
+		gem.controllers[gem_num].calibration_start_us = 0;
+
+		// TODO: gem.status_flags (probably not changed)
+	}
 
 	return CELL_OK;
 }
@@ -3224,20 +1303,12 @@ s32 cellGemIsTrackableHue(u32 hue)
 
 	auto& gem = g_fxo->get<gem_config>();
 
-	if (!gem.state)
+	if (!gem.state || hue > 359)
 	{
-		return CELL_GEM_ERROR_UNINITIALIZED;
+		return false;
 	}
 
-	if (hue > 359)
-	{
-		return CELL_GEM_ERROR_INVALID_PARAMETER;
-	}
-
-	auto& tracker = g_fxo->get<named_thread<gem_tracker>>();
-	std::lock_guard lock(tracker.mutex);
-
-	return tracker.hue_is_trackable(hue);
+	return true;
 }
 
 error_code cellGemPrepareCamera(s32 max_exposure, f32 image_quality)
@@ -3259,42 +1330,14 @@ error_code cellGemPrepareCamera(s32 max_exposure, f32 image_quality)
 	max_exposure = std::clamp(max_exposure, static_cast<s32>(CELL_GEM_MIN_CAMERA_EXPOSURE), static_cast<s32>(CELL_GEM_MAX_CAMERA_EXPOSURE));
 	image_quality = std::clamp(image_quality, 0.0f, 1.0f);
 
-	// TODO: prepare camera properly
-
-	extern error_code cellCameraGetAttribute(s32 dev_num, s32 attrib, vm::ptr<u32> arg1, vm::ptr<u32> arg2);
-	extern error_code cellCameraSetAttribute(s32 dev_num, s32 attrib, u32 arg1, u32 arg2);
-	extern error_code cellCameraGetBufferInfoEx(s32 dev_num, vm::ptr<CellCameraInfoEx> info);
-
-	vm::var<CellCameraInfoEx> info = vm::make_var<CellCameraInfoEx>({});
-	vm::var<u32> arg1 = vm::make_var<u32>({});
-	vm::var<u32> arg2 = vm::make_var<u32>({});
-
-	cellCameraGetAttribute(0, 0x3e6, arg1, arg2);
-	cellCameraSetAttribute(0, 0x3e6, 0x3e, *arg2 | 0x80);
-	cellCameraGetBufferInfoEx(0, info);
-
-	if (info->width == 640)
-	{
-		// Disable some features
-		cellCameraSetAttribute(0, CELL_CAMERA_AGC, 0, 0);
-		cellCameraSetAttribute(0, CELL_CAMERA_AWB, 0, 0);
-		cellCameraSetAttribute(0, CELL_CAMERA_AEC, 0, 0);
-		cellCameraSetAttribute(0, CELL_CAMERA_GAMMA, 0, 0);
-		cellCameraSetAttribute(0, CELL_CAMERA_PIXELOUTLIERFILTER, 0, 0);
-
-		// Set new values for others
-		cellCameraSetAttribute(0, CELL_CAMERA_GREENGAIN, 96, 0);
-		cellCameraSetAttribute(0, CELL_CAMERA_REDBLUEGAIN, 64, 96);
-		cellCameraSetAttribute(0, CELL_CAMERA_GAIN, 0, 0); // TODO
-		cellCameraSetAttribute(0, CELL_CAMERA_EXPOSURE, 0, 0); // TODO
-	}
+	// TODO: prepare camera
 
 	return CELL_OK;
 }
 
 error_code cellGemPrepareVideoConvert(vm::cptr<CellGemVideoConvertAttribute> vc_attribute)
 {
-	cellGem.warning("cellGemPrepareVideoConvert(vc_attribute=*0x%x)", vc_attribute);
+	cellGem.todo("cellGemPrepareVideoConvert(vc_attribute=*0x%x)", vc_attribute);
 
 	auto& gem = g_fxo->get<gem_config>();
 
@@ -3308,42 +1351,35 @@ error_code cellGemPrepareVideoConvert(vm::cptr<CellGemVideoConvertAttribute> vc_
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
 
-	const CellGemVideoConvertAttribute vc = *vc_attribute;
+	const auto vc = *vc_attribute;
 
-	if (vc.version != CELL_GEM_VERSION)
+	if (!vc_attribute || vc.version != CELL_GEM_VERSION)
 	{
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
 
 	if (vc.output_format != CELL_GEM_NO_VIDEO_OUTPUT)
 	{
-		if (!vc.video_data_out)
+		if (!vc.video_data_out || ((vc.conversion_flags & CELL_GEM_COMBINE_PREVIOUS_INPUT_FRAME) && !vc.buffer_memory))
 		{
 			return CELL_GEM_ERROR_INVALID_PARAMETER;
 		}
 	}
 
-	if ((vc.conversion_flags & CELL_GEM_COMBINE_PREVIOUS_INPUT_FRAME) && !vc.buffer_memory)
-	{
-		return CELL_GEM_ERROR_INVALID_PARAMETER;
-	}
-
-	if (!vc.video_data_out.aligned(128) || !vc.buffer_memory.aligned(16))
-	{
-		return CELL_GEM_ERROR_INVALID_ALIGNMENT;
-	}
+	// TODO: The alignment checks seem to break Time Crisis Razing Storm [BLUS30528]
+	//if (!vc.video_data_out.aligned(16) || !vc.buffer_memory.aligned(128))
+	//{
+	//	return CELL_GEM_ERROR_INVALID_ALIGNMENT;
+	//}
 
 	gem.vc_attribute = vc;
 
-	const s32 buffer_size = cellGemGetVideoConvertSize(vc.output_format);
-	gem.video_data_out_size = buffer_size;
-
 	return CELL_OK;
 }
 
 error_code cellGemReadExternalPortDeviceInfo(u32 gem_num, vm::ptr<u32> ext_id, vm::ptr<u8[CELL_GEM_EXTERNAL_PORT_DEVICE_INFO_SIZE]> ext_info)
 {
-	cellGem.warning("cellGemReadExternalPortDeviceInfo(gem_num=%d, ext_id=*0x%x, ext_info=%s)", gem_num, ext_id, ext_info);
+	cellGem.todo("cellGemReadExternalPortDeviceInfo(gem_num=%d, ext_id=*0x%x, ext_info=%s)", gem_num, ext_id, ext_info);
 
 	auto& gem = g_fxo->get<gem_config>();
 
@@ -3362,65 +1398,12 @@ error_code cellGemReadExternalPortDeviceInfo(u32 gem_num, vm::ptr<u32> ext_id, v
 		return CELL_GEM_NOT_CONNECTED;
 	}
 
-	const u64 start = get_system_time();
-
-	auto& controller = gem.controllers[gem_num];
-
-	if (g_cfg.io.move != move_handler::null)
-	{
-		// Get external device status
-		CellGemExtPortData ext_port_data{};
-		ds3_input_to_ext(gem_num, controller, ext_port_data);
-	}
-
-	if (!(controller.ext_status & CELL_GEM_EXT_CONNECTED))
+	if (!(gem.controllers[gem_num].ext_status & CELL_GEM_EXT_CONNECTED))
 	{
 		return CELL_GEM_NO_EXTERNAL_PORT_DEVICE;
 	}
 
-	*ext_id = controller.ext_id;
-
-	if (ext_info && g_cfg.io.move == move_handler::real)
-	{
-		bool read_requested = false;
-
-		while (true)
-		{
-			{
-				std::lock_guard lock(pad::g_pad_mutex);
-
-				const auto handler = pad::get_pad_thread();
-				const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
-
-				if (pad->m_pad_handler != pad_handler::move || !pad->is_connected() || pad->is_copilot())
-				{
-					return CELL_GEM_NOT_CONNECTED;
-				}
-
-				if (!read_requested)
-				{
-					pad->move_data.external_device_read_requested = true;
-					read_requested = true;
-				}
-
-				if (!pad->move_data.external_device_read_requested)
-				{
-					*ext_id = controller.ext_id = pad->move_data.external_device_id;
-					std::memcpy(pad->move_data.external_device_read.data(), ext_info.get_ptr(), CELL_GEM_EXTERNAL_PORT_OUTPUT_SIZE);
-					break;
-				}
-			}
-
-			// We wait for 300ms at most
-			if (const u64 elapsed_us = get_system_time() - start; elapsed_us > 300'000)
-			{
-				cellGem.warning("cellGemReadExternalPortDeviceInfo(gem_num=%d): timeout", gem_num);
-				break;
-			}
-
-			// TODO: sleep ?
-		}
-	}
+	*ext_id = gem.controllers[gem_num].ext_id;
 
 	return CELL_OK;
 }
@@ -3444,14 +1427,14 @@ error_code cellGemReset(u32 gem_num)
 	gem.reset_controller(gem_num);
 
 	// TODO: is this correct?
-	gem.start_timestamp_us = get_guest_system_time();
+	gem.start_timestamp = get_guest_system_time();
 
 	return CELL_OK;
 }
 
 error_code cellGemSetRumble(u32 gem_num, u8 rumble)
 {
-	cellGem.trace("cellGemSetRumble(gem_num=%d, rumble=0x%x)", gem_num, rumble);
+	cellGem.todo("cellGemSetRumble(gem_num=%d, rumble=0x%x)", gem_num, rumble);
 
 	auto& gem = g_fxo->get<gem_config>();
 
@@ -3469,25 +1452,6 @@ error_code cellGemSetRumble(u32 gem_num, u8 rumble)
 
 	gem.controllers[gem_num].rumble = rumble;
 
-	// Set actual device rumble
-	if (g_cfg.io.move == move_handler::real)
-	{
-		std::lock_guard pad_lock(pad::g_pad_mutex);
-		const auto handler = pad::get_pad_thread();
-		auto& handlers = handler->get_handlers();
-		if (auto it = handlers.find(pad_handler::move); it != handlers.end() && it->second)
-		{
-			const u32 pad_index = pad_num(gem_num);
-			for (const auto& binding : it->second->bindings())
-			{
-				if (!binding.device || binding.device->player_id != pad_index) continue;
-
-				handler->SetRumble(pad_index, rumble, rumble > 0);
-				break;
-			}
-		}
-	}
-
 	return CELL_OK;
 }
 
@@ -3504,7 +1468,7 @@ error_code cellGemSetYaw(u32 gem_num, vm::ptr<f32> z_direction)
 		return CELL_GEM_ERROR_UNINITIALIZED;
 	}
 
-	if (!z_direction || !check_gem_num(gem_num))
+	if (!z_direction)
 	{
 		return CELL_GEM_ERROR_INVALID_PARAMETER;
 	}
@@ -3516,7 +1480,7 @@ error_code cellGemSetYaw(u32 gem_num, vm::ptr<f32> z_direction)
 
 error_code cellGemTrackHues(vm::cptr<u32> req_hues, vm::ptr<u32> res_hues)
 {
-	cellGem.todo("cellGemTrackHues(req_hues=%s, res_hues=*0x%x)", req_hues ? fmt::format("*0x%x [%d, %d, %d, %d]", req_hues, req_hues[0], req_hues[1], req_hues[2], req_hues[3]) : "*0x0", res_hues);
+	cellGem.todo("cellGemTrackHues(req_hues=*0x%x, res_hues=*0x%x)", req_hues, res_hues);
 
 	auto& gem = g_fxo->get<gem_config>();
 
@@ -3538,7 +1502,6 @@ error_code cellGemTrackHues(vm::cptr<u32> req_hues, vm::ptr<u32> res_hues)
 		{
 			gem.controllers[i].enabled_tracking = true;
 			gem.controllers[i].enabled_LED = true;
-			gem.controllers[i].hue_set = true;
 
 			switch (i)
 			{
@@ -3557,9 +1520,6 @@ error_code cellGemTrackHues(vm::cptr<u32> req_hues, vm::ptr<u32> res_hues)
 				break;
 			}
 
-			const auto [r, g, b] = ps_move_tracker<false>::hsv_to_rgb(gem.controllers[i].hue, 1.0f, 1.0f);
-			gem.controllers[i].sphere_rgb = gem_config::gem_color(r / 255.0f, g / 255.0f, b / 255.0f);
-
 			if (res_hues)
 			{
 				res_hues[i] = gem.controllers[i].hue;
@@ -3569,7 +1529,6 @@ error_code cellGemTrackHues(vm::cptr<u32> req_hues, vm::ptr<u32> res_hues)
 		{
 			gem.controllers[i].enabled_tracking = false;
 			gem.controllers[i].enabled_LED = false;
-			gem.controllers[i].hue_set = false;
 
 			if (res_hues)
 			{
@@ -3585,23 +1544,21 @@ error_code cellGemTrackHues(vm::cptr<u32> req_hues, vm::ptr<u32> res_hues)
 
 			gem.controllers[i].enabled_tracking = true;
 			gem.controllers[i].enabled_LED = true;
-			gem.controllers[i].hue_set = true;
 			gem.controllers[i].hue = req_hues[i];
 
-			const auto [r, g, b] = ps_move_tracker<false>::hsv_to_rgb(gem.controllers[i].hue, 1.0f, 1.0f);
-			gem.controllers[i].sphere_rgb = gem_config::gem_color(r / 255.0f, g / 255.0f, b / 255.0f);
-
 			if (res_hues)
 			{
 				res_hues[i] = gem.controllers[i].hue;
 			}
 		}
+
+		gem.controllers[i].hue_set = true;
 	}
 
 	return CELL_OK;
 }
 
-error_code cellGemUpdateFinish(ppu_thread& ppu)
+error_code cellGemUpdateFinish()
 {
 	cellGem.warning("cellGemUpdateFinish()");
 
@@ -3612,21 +1569,13 @@ error_code cellGemUpdateFinish(ppu_thread& ppu)
 		return CELL_GEM_ERROR_UNINITIALIZED;
 	}
 
-	if (!gem.updating)
+	std::scoped_lock lock(gem.mtx);
+
+	if (!std::exchange(gem.update_started, false))
 	{
 		return CELL_GEM_ERROR_UPDATE_NOT_STARTED;
 	}
 
-	auto& tracker = g_fxo->get<named_thread<gem_tracker>>();
-	if (!tracker.wait_for_tracker_result(ppu))
-	{
-		return {};
-	}
-
-	std::scoped_lock lock(gem.mtx);
-
-	gem.updating = false;
-
 	if (!gem.camera_frame)
 	{
 		return not_an_error(CELL_GEM_NO_VIDEO);
@@ -3646,41 +1595,32 @@ error_code cellGemUpdateStart(vm::cptr<void> camera_frame, u64 timestamp)
 		return CELL_GEM_ERROR_UNINITIALIZED;
 	}
 
-	auto& tracker = g_fxo->get<named_thread<gem_tracker>>();
-
-	if (tracker.is_busy())
-	{
-		return CELL_GEM_ERROR_UPDATE_NOT_FINISHED;
-	}
-
 	std::scoped_lock lock(gem.mtx);
 
 	// Update is starting even when camera_frame is null
-	if (gem.updating.exchange(true))
+	if (std::exchange(gem.update_started, true))
 	{
 		return CELL_GEM_ERROR_UPDATE_NOT_FINISHED;
 	}
 
-	if (!camera_frame.aligned(128))
-	{
-		return CELL_GEM_ERROR_INVALID_ALIGNMENT;
-	}
+	// TODO: The alignment checks seem to break Time Crisis Razing Storm [BLUS30528]
+	//if (!camera_frame.aligned(128))
+	//{
+	//	return CELL_GEM_ERROR_INVALID_ALIGNMENT;
+	//}
 
 	gem.camera_frame = camera_frame.addr();
-
-	if (!tracker.set_image(gem.camera_frame))
+	if (!camera_frame)
 	{
 		return not_an_error(CELL_GEM_NO_VIDEO);
 	}
 
-	tracker.wake_up_tracker();
-
 	return CELL_OK;
 }
 
 error_code cellGemWriteExternalPort(u32 gem_num, vm::ptr<u8[CELL_GEM_EXTERNAL_PORT_OUTPUT_SIZE]> data)
 {
-	cellGem.warning("cellGemWriteExternalPort(gem_num=%d, data=%s)", gem_num, data);
+	cellGem.todo("cellGemWriteExternalPort(gem_num=%d, data=%s)", gem_num, data);
 
 	auto& gem = g_fxo->get<gem_config>();
 
@@ -3699,25 +1639,9 @@ error_code cellGemWriteExternalPort(u32 gem_num, vm::ptr<u8[CELL_GEM_EXTERNAL_PO
 		return CELL_GEM_NOT_CONNECTED;
 	}
 
-	if (data && g_cfg.io.move == move_handler::real)
+	if (false) // TODO: check if this is still writing to the external port
 	{
-		std::lock_guard lock(pad::g_pad_mutex);
-
-		const auto handler = pad::get_pad_thread();
-		const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
-
-		if (pad->m_pad_handler != pad_handler::move || !pad->is_connected() || pad->is_copilot())
-		{
-			return CELL_GEM_NOT_CONNECTED;
-		}
-
-		if (pad->move_data.external_device_write_requested)
-		{
-			return CELL_GEM_ERROR_WRITE_NOT_FINISHED;
-		}
-
-		std::memcpy(pad->move_data.external_device_write.data(), data.get_ptr(), CELL_GEM_EXTERNAL_PORT_OUTPUT_SIZE);
-		pad->move_data.external_device_write_requested = true;
+		return CELL_GEM_ERROR_WRITE_NOT_FINISHED;
 	}
 
 	return CELL_OK;
diff --git a/rpcs3/Emu/Cell/Modules/cellGem.h b/rpcs3/Emu/Cell/Modules/cellGem.h
index c70e2386ba..e0d11712e8 100644
--- a/rpcs3/Emu/Cell/Modules/cellGem.h
+++ b/rpcs3/Emu/Cell/Modules/cellGem.h
@@ -145,7 +145,7 @@ enum
 };
 
 // Video conversion output formats
-enum CellGemVideoConvertFormatEnum : s32
+enum
 {
 	CELL_GEM_NO_VIDEO_OUTPUT           = 1,
 	CELL_GEM_RGBA_640x480              = 2,
@@ -161,8 +161,7 @@ enum CellGemVideoConvertFormatEnum : s32
 // External device IDs (types)
 enum
 {
-	SHARP_SHOOTER_DEVICE_ID = 0x8081,
-	RACING_WHEEL_DEVICE_ID  = 0x8101
+	SHARP_SHOOTER_DEVICE_ID = 0x8081
 };
 
 struct CellGemAttribute
@@ -172,8 +171,6 @@ struct CellGemAttribute
 	be_t<u32> memory_ptr;
 	be_t<u32> spurs_addr;
 	u8 spu_priorities[8];
-
-	ENABLE_BITWISE_SERIALIZATION;
 };
 
 struct CellGemCameraState
@@ -183,8 +180,6 @@ struct CellGemCameraState
 	be_t<f32> gain;
 	be_t<f32> pitch_angle;
 	be_t<f32> pitch_angle_estimate;
-
-	ENABLE_BITWISE_SERIALIZATION;
 };
 
 struct CellGemExtPortData
@@ -201,8 +196,8 @@ struct CellGemExtPortData
 
 struct CellGemImageState
 {
-	be_t<u64> frame_timestamp; // time the frame was captured by libCamera. system_time_t (usecs)
-	be_t<u64> timestamp;       // time processing of the frame was finished. system_time_t (usecs)
+	be_t<u64> frame_timestamp; // time the frame was captured by libCamera (usecs)
+	be_t<u64> timestamp;       // time processing of the frame was finished (usecs)
 	be_t<f32> u;               // horizontal screen position in pixels
 	be_t<f32> v;               // vertical screen position in pixels
 	be_t<f32> r;               // size of sphere on screen in pixels
@@ -227,7 +222,7 @@ struct CellGemInertialState
 	be_t<f32> gyro_bias[4];          // gyro bias (radians/s)
 	CellGemPadData pad;
 	CellGemExtPortData ext;
-	be_t<u64> timestamp; // system_time_t (microseconds)
+	be_t<u64> timestamp;
 	be_t<s32> counter;
 	be_t<f32> temperature;
 };
@@ -257,7 +252,7 @@ struct CellGemState
 	be_t<f32> handle_accel[4]; // acceleration of controller handle (mm/s²)
 	CellGemPadData pad;
 	CellGemExtPortData ext;
-	be_t<u64> timestamp; // system_time_t (microseconds)
+	be_t<u64> timestamp;
 	be_t<f32> temperature;
 	be_t<f32> camera_pitch_angle;
 	be_t<u32> tracking_flags;
@@ -266,15 +261,13 @@ struct CellGemState
 struct CellGemVideoConvertAttribute
 {
 	be_t<s32> version;
-	be_t<CellGemVideoConvertFormatEnum> output_format;
+	be_t<s32> output_format;
 	be_t<s32> conversion_flags;
 	be_t<f32> gain;
 	be_t<f32> red_gain;
 	be_t<f32> green_gain;
 	be_t<f32> blue_gain;
-	vm::bptr<u8> buffer_memory;
-	vm::bptr<u8> video_data_out;
+	vm::ptr<void> buffer_memory;
+	vm::ptr<void> video_data_out;
 	u8 alpha;
-
-	ENABLE_BITWISE_SERIALIZATION;
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellGifDec.cpp b/rpcs3/Emu/Cell/Modules/cellGifDec.cpp
index faf8defa6d..5d00f10749 100644
--- a/rpcs3/Emu/Cell/Modules/cellGifDec.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellGifDec.cpp
@@ -9,8 +9,15 @@
 #include "Emu/Cell/lv2/sys_fs.h"
 #include "cellGifDec.h"
 
+#include "util/asm.hpp"
+
 LOG_CHANNEL(cellGifDec);
 
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 template <>
 void fmt_class_string<CellGifDecError>::format(std::string& out, u64 arg)
 {
@@ -32,134 +39,61 @@ void fmt_class_string<CellGifDecError>::format(std::string& out, u64 arg)
 	});
 }
 
-error_code cellGifDecCreate(vm::ptr<GifDecoder> mainHandle, vm::cptr<CellGifDecThreadInParam> threadInParam, vm::ptr<CellGifDecThreadOutParam> threadOutParam)
+// cellGifDec aliases (only for cellGifDec.cpp)
+using PPMainHandle = vm::pptr<GifDecoder>;
+using PMainHandle = vm::ptr<GifDecoder>;
+using PThreadInParam = vm::cptr<CellGifDecThreadInParam>;
+using PThreadOutParam = vm::ptr<CellGifDecThreadOutParam>;
+using PExtThreadInParam = vm::cptr<CellGifDecExtThreadInParam>;
+using PExtThreadOutParam = vm::ptr<CellGifDecExtThreadOutParam>;
+using PPSubHandle = vm::pptr<GifStream>;
+using PSubHandle = vm::ptr<GifStream>;
+using PSrc = vm::cptr<CellGifDecSrc>;
+using POpenInfo = vm::ptr<CellGifDecOpnInfo>;
+using PInfo = vm::ptr<CellGifDecInfo>;
+using PInParam = vm::cptr<CellGifDecInParam>;
+using POutParam = vm::ptr<CellGifDecOutParam>;
+using PDataCtrlParam = vm::cptr<CellGifDecDataCtrlParam>;
+using PDataOutInfo = vm::ptr<CellGifDecDataOutInfo>;
+
+error_code cellGifDecCreate(PPMainHandle mainHandle, PThreadInParam threadInParam, PThreadOutParam threadOutParam)
 {
-	cellGifDec.todo("cellGifDecCreate(mainHandle=*0x%x, threadInParam=*0x%x, threadOutParam=*0x%x)", mainHandle, threadInParam, threadOutParam);
-
-	if (!mainHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	*mainHandle = {};
-
-	if (!threadOutParam || !threadInParam || !threadInParam->cbCtrlMallocFunc || !threadInParam->cbCtrlFreeFunc ||
-		(threadInParam->spuThreadEnable != CELL_GIFDEC_SPU_THREAD_DISABLE &&
-			(threadInParam->spuThreadEnable != CELL_GIFDEC_SPU_THREAD_ENABLE ||
-				threadInParam->ppuThreadPriority > 3071 ||
-				threadInParam->spuThreadPriority > 255)))
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	threadOutParam->gifCodecVersion = 0x240000;
-
+	UNIMPLEMENTED_FUNC(cellGifDec);
 	return CELL_OK;
 }
 
-error_code cellGifDecExtCreate(vm::ptr<GifDecoder> mainHandle, vm::cptr<CellGifDecThreadInParam> threadInParam, vm::ptr<CellGifDecThreadOutParam> threadOutParam, vm::cptr<CellGifDecExtThreadInParam> extThreadInParam, vm::ptr<CellGifDecExtThreadOutParam> extThreadOutParam)
+error_code cellGifDecExtCreate(PPMainHandle mainHandle, PThreadInParam threadInParam, PThreadOutParam threadOutParam, PExtThreadInParam extThreadInParam, PExtThreadOutParam extThreadOutParam)
 {
-	cellGifDec.todo("cellGifDecExtCreate(mainHandle=*0x%x, threadInParam=*0x%x, threadOutParam=*0x%x, extThreadInParam=*0x%x, extThreadOutParam=*0x%x)", mainHandle, threadInParam, threadOutParam, extThreadInParam, extThreadOutParam);
-
-	if (!mainHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	*mainHandle = {};
-
-	if (!threadOutParam || !extThreadOutParam || !extThreadInParam || !threadInParam || !threadInParam->cbCtrlMallocFunc || !threadInParam->cbCtrlFreeFunc ||
-		(threadInParam->spuThreadEnable != CELL_GIFDEC_SPU_THREAD_DISABLE && threadInParam->spuThreadEnable != CELL_GIFDEC_SPU_THREAD_ENABLE))
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (threadInParam->spuThreadEnable == CELL_GIFDEC_SPU_THREAD_ENABLE && !extThreadInParam->spurs)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (extThreadInParam->maxContention == 0u || extThreadInParam->maxContention >= 8u)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	for (u32 i = 0; i < 8; i++)
-	{
-		if (extThreadInParam->priority[i] > 15)
-		{
-			return CELL_GIFDEC_ERROR_ARG;
-		}
-	}
-
-	threadOutParam->gifCodecVersion = 0x240000;
-
+	UNIMPLEMENTED_FUNC(cellGifDec);
 	return CELL_OK;
 }
 
-error_code cellGifDecOpen(vm::ptr<GifDecoder> mainHandle, vm::pptr<GifStream> subHandle, vm::cptr<CellGifDecSrc> src, vm::ptr<CellGifDecOpnInfo> openInfo)
+error_code cellGifDecOpen(PMainHandle mainHandle, PPSubHandle subHandle, PSrc src, POpenInfo openInfo)
 {
 	cellGifDec.warning("cellGifDecOpen(mainHandle=*0x%x, subHandle=**0x%x, src=*0x%x, openInfo=*0x%x)", mainHandle, subHandle, src, openInfo);
 
-	if (!mainHandle || !subHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!openInfo || !src)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	GifStream current_subHandle{};
+	GifStream current_subHandle;
 	current_subHandle.fd = 0;
 	current_subHandle.src = *src;
 
 	switch (src->srcSelect)
 	{
 	case CELL_GIFDEC_BUFFER:
-	{
-		if (!src->streamPtr || !src->streamSize)
-		{
-			return CELL_GIFDEC_ERROR_ARG;
-		}
-
 		current_subHandle.fileSize = src->streamSize;
 		break;
-	}
+
 	case CELL_GIFDEC_FILE:
 	{
-		if (!src->fileName)
-		{
-			return CELL_GIFDEC_ERROR_OPEN_FILE;
-		}
-
 		// Get file descriptor and size
-		const std::string real_path = vfs::get(src->fileName.get_ptr());
+		const auto real_path = vfs::get(src->fileName.get_ptr());
 		fs::file file_s(real_path);
-		if (!file_s)
-		{
-			return CELL_GIFDEC_ERROR_OPEN_FILE;
-		}
-
-		if (src->fileOffset < 0)
-		{
-			return CELL_GIFDEC_ERROR_ARG;
-		}
+		if (!file_s) return CELL_GIFDEC_ERROR_OPEN_FILE;
 
 		current_subHandle.fileSize = file_s.size();
 		current_subHandle.fd = idm::make<lv2_fs_object, lv2_file>(src->fileName.get_ptr(), std::move(file_s), 0, 0, real_path);
 		break;
 	}
-	default:
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
+	default: break; // TODO
 	}
 
 	subHandle->set(vm::alloc(sizeof(GifStream), vm::main));
@@ -169,104 +103,17 @@ error_code cellGifDecOpen(vm::ptr<GifDecoder> mainHandle, vm::pptr<GifStream> su
 	return CELL_OK;
 }
 
-error_code cellGifDecExtOpen(vm::ptr<GifDecoder> mainHandle, vm::pptr<GifStream> subHandle, vm::cptr<CellGifDecSrc> src, vm::ptr<CellGifDecOpnInfo> openInfo, vm::cptr<CellGifDecCbCtrlStrm> cbCtrlStrm)
+error_code cellGifDecExtOpen()
 {
-	cellGifDec.todo("cellGifDecExtOpen(mainHandle=*0x%x, subHandle=*0x%x, src=*0x%x, openInfo=*0x%x, cbCtrlStrm=*0x%x)", mainHandle, subHandle, src, openInfo, cbCtrlStrm);
-
-	if (!mainHandle || !subHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!openInfo || !src)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	GifStream current_subHandle{};
-	current_subHandle.fd = 0;
-	current_subHandle.src = *src;
-
-	switch (src->srcSelect)
-	{
-	case CELL_GIFDEC_BUFFER:
-	{
-		if (!src->streamPtr || !src->streamSize)
-		{
-			return CELL_GIFDEC_ERROR_ARG;
-		}
-
-		current_subHandle.fileSize = src->streamSize;
-		break;
-	}
-	case CELL_GIFDEC_FILE:
-	{
-		if (!src->fileName)
-		{
-			return CELL_GIFDEC_ERROR_OPEN_FILE;
-		}
-
-		// Get file descriptor and size
-		const std::string real_path = vfs::get(src->fileName.get_ptr());
-		fs::file file_s(real_path);
-		if (!file_s)
-		{
-			return CELL_GIFDEC_ERROR_OPEN_FILE;
-		}
-
-		if (src->fileOffset < 0)
-		{
-			return CELL_GIFDEC_ERROR_ARG;
-		}
-
-		current_subHandle.fileSize = file_s.size();
-		current_subHandle.fd = idm::make<lv2_fs_object, lv2_file>(src->fileName.get_ptr(), std::move(file_s), 0, 0, real_path);
-		break;
-	}
-	default:
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-	}
-
+	cellGifDec.todo("cellGifDecExtOpen()");
 	return CELL_OK;
 }
 
-error_code cellGifDecReadHeader(vm::ptr<GifDecoder> mainHandle, vm::ptr<GifStream> subHandle, vm::ptr<CellGifDecInfo> info)
+error_code cellGifDecReadHeader(PMainHandle mainHandle, PSubHandle subHandle, PInfo info)
 {
 	cellGifDec.warning("cellGifDecReadHeader(mainHandle=*0x%x, subHandle=*0x%x, info=*0x%x)", mainHandle, subHandle, info);
 
-	if (!mainHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check main handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!subHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check sub handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!info)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	const u32 fd = subHandle->fd;
+	const u32& fd = subHandle->fd;
 	CellGifDecInfo& current_info = subHandle->info;
 
 	// Write the header to buffer
@@ -275,13 +122,12 @@ error_code cellGifDecReadHeader(vm::ptr<GifDecoder> mainHandle, vm::ptr<GifStrea
 	switch (subHandle->src.srcSelect)
 	{
 	case CELL_GIFDEC_BUFFER:
-	{
 		std::memcpy(buffer, subHandle->src.streamPtr.get_ptr(), sizeof(buffer));
 		break;
-	}
+
 	case CELL_GIFDEC_FILE:
 	{
-		auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+		auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 		file->file.seek(0);
 		file->file.read(buffer, sizeof(buffer));
 		break;
@@ -289,13 +135,13 @@ error_code cellGifDecReadHeader(vm::ptr<GifDecoder> mainHandle, vm::ptr<GifStrea
 	default: break; // TODO
 	}
 
-	if (read_from_ptr<be_t<u32>>(buffer + 0) != 0x47494638u ||
-		(read_from_ptr<le_t<u16>>(buffer + 4) != 0x6139u && read_from_ptr<le_t<u16>>(buffer + 4) != 0x6137u)) // Error: The first 6 bytes are not a valid GIF signature
+	if (*utils::bless<be_t<u32>>(buffer + 0) != 0x47494638u ||
+		(*utils::bless<le_t<u16>>(buffer + 4) != 0x6139u && *utils::bless<le_t<u16>>(buffer + 4) != 0x6137u)) // Error: The first 6 bytes are not a valid GIF signature
 	{
 		return CELL_GIFDEC_ERROR_STREAM_FORMAT; // Surprisingly there is no error code related with headerss
 	}
 
-	const u8 packedField = buffer[10];
+	u8 packedField = buffer[10];
 	current_info.SWidth                  = buffer[6] + buffer[7] * 0x100;
 	current_info.SHeight                 = buffer[8] + buffer[9] * 0x100;
 	current_info.SGlobalColorTableFlag   = packedField >> 7;
@@ -310,71 +156,20 @@ error_code cellGifDecReadHeader(vm::ptr<GifDecoder> mainHandle, vm::ptr<GifStrea
 	return CELL_OK;
 }
 
-error_code cellGifDecExtReadHeader(vm::ptr<GifDecoder> mainHandle, vm::cptr<GifStream> subHandle, vm::ptr<CellGifDecInfo> info, vm::ptr<CellGifDecExtInfo> extInfo)
+error_code cellGifDecExtReadHeader()
 {
-	cellGifDec.todo("cellGifDecExtReadHeader(mainHandle=*0x%x, subHandle=*0x%x, info=*0x%x, extInfo=*0x%x)", mainHandle, subHandle, info, extInfo);
-
-	if (!mainHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check main handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!subHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check sub handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!info || !extInfo)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
+	cellGifDec.todo("cellGifDecExtReadHeader()");
 	return CELL_OK;
 }
 
-error_code cellGifDecSetParameter(vm::ptr<GifDecoder> mainHandle, vm::ptr<GifStream> subHandle, vm::cptr<CellGifDecInParam> inParam, vm::ptr<CellGifDecOutParam> outParam)
+error_code cellGifDecSetParameter(PMainHandle mainHandle, PSubHandle subHandle, PInParam inParam, POutParam outParam)
 {
 	cellGifDec.warning("cellGifDecSetParameter(mainHandle=*0x%x, subHandle=*0x%x, inParam=*0x%x, outParam=*0x%x)", mainHandle, subHandle, inParam, outParam);
 
-	if (!mainHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check main handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!subHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check sub handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!inParam || !outParam)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
 	CellGifDecInfo& current_info = subHandle->info;
 	CellGifDecOutParam& current_outParam = subHandle->outParam;
 
-	current_outParam.outputWidthByte  = (current_info.SWidth * current_info.SColorResolution * 3) / 8;
+	current_outParam.outputWidthByte  = (current_info.SWidth * current_info.SColorResolution * 3)/8;
 	current_outParam.outputWidth      = current_info.SWidth;
 	current_outParam.outputHeight     = current_info.SHeight;
 	current_outParam.outputColorSpace = inParam->colorSpace;
@@ -384,98 +179,24 @@ error_code cellGifDecSetParameter(vm::ptr<GifDecoder> mainHandle, vm::ptr<GifStr
 	case CELL_GIFDEC_ARGB: current_outParam.outputComponents = 4; break;
 	default: return CELL_GIFDEC_ERROR_ARG; // Not supported color space
 	}
-	current_outParam.outputBitDepth = 0;   // Unimplemented
-	current_outParam.useMemorySpace = 0;   // Unimplemented
+	current_outParam.outputBitDepth	= 0;   // Unimplemented
+	current_outParam.useMemorySpace	= 0;   // Unimplemented
 
 	*outParam = current_outParam;
 
 	return CELL_OK;
 }
 
-error_code cellGifDecExtSetParameter(vm::ptr<GifDecoder> mainHandle, vm::ptr<GifStream> subHandle, vm::cptr<CellGifDecInParam> inParam, vm::ptr<CellGifDecOutParam> outParam, vm::cptr<CellGifDecExtInParam> extInParam, vm::ptr<CellGifDecExtOutParam> extOutParam)
+error_code cellGifDecExtSetParameter()
 {
-	cellGifDec.todo("cellGifDecExtSetParameter(mainHandle=*0x%x, subHandle=*0x%x, inParam=*0x%x, outParam=*0x%x, extInParam=*0x%x, extOutParam=*0x%x)", mainHandle, subHandle, inParam, outParam, extInParam, extOutParam);
-
-	if (!mainHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check main handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!subHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check sub handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!inParam || !outParam)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	CellGifDecInfo& current_info = subHandle->info;
-	CellGifDecOutParam& current_outParam = subHandle->outParam;
-
-	current_outParam.outputWidthByte  = (current_info.SWidth * current_info.SColorResolution * 3) / 8;
-	current_outParam.outputWidth      = current_info.SWidth;
-	current_outParam.outputHeight     = current_info.SHeight;
-	current_outParam.outputColorSpace = inParam->colorSpace;
-	switch (current_outParam.outputColorSpace)
-	{
-	case CELL_GIFDEC_RGBA:
-	case CELL_GIFDEC_ARGB: current_outParam.outputComponents = 4; break;
-	default: return CELL_GIFDEC_ERROR_ARG; // Not supported color space
-	}
-	current_outParam.outputBitDepth = 0;   // Unimplemented
-	current_outParam.useMemorySpace = 0;   // Unimplemented
-
-	*outParam = current_outParam;
-
-	if (!extInParam || extInParam->bufferMode != CELL_GIFDEC_LINE_MODE || !extOutParam)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
+	cellGifDec.todo("cellGifDecExtSetParameter()");
 	return CELL_OK;
 }
 
-error_code cellGifDecDecodeData(vm::ptr<GifDecoder> mainHandle, vm::cptr<GifStream> subHandle, vm::ptr<u8> data, vm::cptr<CellGifDecDataCtrlParam> dataCtrlParam, vm::ptr<CellGifDecDataOutInfo> dataOutInfo)
+error_code cellGifDecDecodeData(PMainHandle mainHandle, PSubHandle subHandle, vm::ptr<u8> data, PDataCtrlParam dataCtrlParam, PDataOutInfo dataOutInfo)
 {
 	cellGifDec.warning("cellGifDecDecodeData(mainHandle=*0x%x, subHandle=*0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x)", mainHandle, subHandle, data, dataCtrlParam, dataOutInfo);
 
-	if (!mainHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check main handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!subHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check sub handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!dataOutInfo || !dataCtrlParam)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
 	dataOutInfo->status = CELL_GIFDEC_DEC_STATUS_STOP;
 
 	const u32 fd = subHandle->fd;
@@ -493,7 +214,7 @@ error_code cellGifDecDecodeData(vm::ptr<GifDecoder> mainHandle, vm::cptr<GifStre
 
 	case CELL_GIFDEC_FILE:
 	{
-		auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+		auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 		file->file.seek(0);
 		file->file.read(gif.get(), fileSize);
 		break;
@@ -513,8 +234,8 @@ error_code cellGifDecDecodeData(vm::ptr<GifDecoder> mainHandle, vm::cptr<GifStre
 		return CELL_GIFDEC_ERROR_STREAM_FORMAT;
 
 	const int bytesPerLine = static_cast<int>(dataCtrlParam->outputBytesPerLine);
-	constexpr char nComponents = 4;
-	const u32 image_size = width * height * nComponents;
+	const char nComponents = 4;
+	uint image_size = width * height * nComponents;
 
 	switch(current_outParam.outputColorSpace)
 	{
@@ -534,8 +255,9 @@ error_code cellGifDecDecodeData(vm::ptr<GifDecoder> mainHandle, vm::cptr<GifStre
 		{
 			memcpy(data.get_ptr(), image.get(), image_size);
 		}
-		break;
 	}
+	break;
+
 	case CELL_GIFDEC_ARGB:
 	{
 		if (bytesPerLine > width * nComponents) // Check if we need padding
@@ -571,8 +293,9 @@ error_code cellGifDecDecodeData(vm::ptr<GifDecoder> mainHandle, vm::cptr<GifStre
 			}
 			std::memcpy(data.get_ptr(), img.get(), image_size);
 		}
-		break;
 	}
+	break;
+
 	default:
 		return CELL_GIFDEC_ERROR_ARG;
 	}
@@ -583,57 +306,16 @@ error_code cellGifDecDecodeData(vm::ptr<GifDecoder> mainHandle, vm::cptr<GifStre
 	return CELL_OK;
 }
 
-error_code cellGifDecExtDecodeData(vm::ptr<GifDecoder> mainHandle, vm::cptr<GifStream> subHandle, vm::ptr<u8> data, vm::cptr<CellGifDecDataCtrlParam> dataCtrlParam, vm::ptr<CellGifDecDataOutInfo> dataOutInfo, vm::cptr<CellGifDecCbCtrlDisp> cbCtrlDisp, vm::ptr<CellGifDecDispParam> dispParam)
+error_code cellGifDecExtDecodeData()
 {
-	cellGifDec.todo("cellGifDecExtDecodeData(mainHandle=*0x%x, subHandle=*0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x, cbCtrlDisp=*0x%x, dispParam=*0x%x)", mainHandle, subHandle, data, dataCtrlParam, dataOutInfo, cbCtrlDisp, dispParam);
-
-	if (!mainHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check main handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!subHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check sub handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!dataOutInfo || !dataCtrlParam)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
+	cellGifDec.todo("cellGifDecExtDecodeData()");
 	return CELL_OK;
 }
 
-error_code cellGifDecClose(vm::ptr<GifDecoder> mainHandle, vm::cptr<GifStream> subHandle)
+error_code cellGifDecClose(PMainHandle mainHandle, PSubHandle subHandle)
 {
 	cellGifDec.warning("cellGifDecClose(mainHandle=*0x%x, subHandle=*0x%x)", mainHandle, subHandle);
 
-	if (!mainHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check main handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
-	if (!subHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
 	idm::remove<lv2_fs_object, lv2_file>(subHandle->fd);
 
 	vm::dealloc(subHandle.addr());
@@ -641,20 +323,9 @@ error_code cellGifDecClose(vm::ptr<GifDecoder> mainHandle, vm::cptr<GifStream> s
 	return CELL_OK;
 }
 
-error_code cellGifDecDestroy(vm::ptr<GifDecoder> mainHandle)
+error_code cellGifDecDestroy(PMainHandle mainHandle)
 {
-	cellGifDec.todo("cellGifDecDestroy(mainHandle=*0x%x)", mainHandle);
-
-	if (!mainHandle)
-	{
-		return CELL_GIFDEC_ERROR_ARG;
-	}
-
-	if (false) // TODO: check main handle
-	{
-		return CELL_GIFDEC_ERROR_SEQ;
-	}
-
+	UNIMPLEMENTED_FUNC(cellGifDec);
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellGifDec.h b/rpcs3/Emu/Cell/Modules/cellGifDec.h
index 113ebcee99..e5574dbf48 100644
--- a/rpcs3/Emu/Cell/Modules/cellGifDec.h
+++ b/rpcs3/Emu/Cell/Modules/cellGifDec.h
@@ -52,23 +52,6 @@ enum CellGifDecDecodeStatus : s32
 	CELL_GIFDEC_DEC_STATUS_STOP   = 1, // Decoding was stopped
 };
 
-enum CellGifDecBufferMode : s32
-{
-	CELL_GIFDEC_LINE_MODE = 1
-};
-
-enum CellGifDecSpuMode : s32
-{
-    CELL_GIFDEC_RECEIVE_EVENT    = 0,
-    CELL_GIFDEC_TRYRECEIVE_EVENT = 1
-};
-
-enum CellGifDecInterlaceMode : s32
-{
-    CELL_GIFDEC_NO_INTERLACE = 0,
-    CELL_GIFDEC_INTERLACE    = 1
-};
-
 // Callbacks for memory management
 using CellGifDecCbControlMalloc = vm::ptr<void>(u32 size, vm::ptr<void> cbCtrlMallocArg);
 using CellGifDecCbControlFree = s32(vm::ptr<void> ptr, vm::ptr<void> cbCtrlFreeArg);
@@ -153,7 +136,7 @@ struct CellGifDecOutParam
 struct CellGifDecExtension
 {
 	u8 label;
-	vm::bptr<u8> data;
+	vm::ptr<u8> data;
 };
 
 struct CellGifDecDataOutInfo
@@ -168,71 +151,6 @@ struct CellGifDecDataCtrlParam
 	be_t<u64> outputBytesPerLine;
 };
 
-struct CellGifDecExtInfo
-{
-	vm::bptr<u64> reserved;
-};
-
-struct CellGifDecStrmInfo
-{
-	be_t<u32> decodedStrmSize;
-};
-
-struct CellGifDecStrmParam
-{
-	vm::bptr<void> strmPtr;
-	be_t<u32> strmSize;
-};
-
-using CellGifDecCbControlStream = s32(vm::ptr<CellGifDecStrmInfo> strmInfo, vm::ptr<CellGifDecStrmParam> strmParam, vm::ptr<void> cbCtrlStrmArg);
-
-struct CellGifDecCbCtrlStrm
-{
-	vm::bptr<CellGifDecCbControlStream> cbCtrlStrmFunc;
-	vm::bptr<void> cbCtrlStrmArg;
-};
-
-struct CellGifDecExtInParam
-{
-	be_t<s32> bufferMode; // CellGifDecBufferMode
-	be_t<u32> outputCounts;
-	be_t<s32> spuMode; // CellGifDecSpuMode
-};
-
-struct CellGifDecExtOutParam
-{
-	be_t<u64> outputWidthByte;
-	be_t<u32> outputHeight;
-};
-
-struct CellGifDecDispParam
-{
-	vm::bptr<void> nextOutputImage;
-};
-
-struct CellGifDecDispInfo
-{
-    be_t<u64> outputFrameWidthByte;
-    be_t<u32> outputFrameHeight;
-    be_t<u64> outputStartXByte;
-    be_t<u32> outputStartY;
-    be_t<u64> outputWidthByte;
-    be_t<u32> outputHeight;
-    be_t<u32> outputBitDepth;
-    be_t<u32> outputComponents;
-    be_t<u32> scanPassCount;
-    vm::bptr<void> outputImage;
-    be_t<s32> interlaceFlag; // CellGifDecInterlaceMode
-};
-
-using CellGifDecCbControlDisp = s32(vm::ptr<CellGifDecDispInfo> dispInfo, vm::ptr<CellGifDecDispParam> dispParam, vm::ptr<void> cbCtrlDispArg);
-
-struct CellGifDecCbCtrlDisp
-{
-	vm::bptr<CellGifDecCbControlDisp> cbCtrlDispFunc;
-	vm::bptr<void> cbCtrlDispArg;
-};
-
 // Custom structs
 struct GifDecoder
 {
@@ -240,9 +158,9 @@ struct GifDecoder
 
 struct GifStream
 {
-	u32 fd{};
-	u64 fileSize{};
-	CellGifDecInfo info{};
-	CellGifDecOutParam outParam{};
-	CellGifDecSrc src{};
+	u32 fd;
+	u64 fileSize;
+	CellGifDecInfo info;
+	CellGifDecOutParam outParam;
+	CellGifDecSrc src;
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellHttp.cpp b/rpcs3/Emu/Cell/Modules/cellHttp.cpp
index 6254315ecc..81cee837bb 100644
--- a/rpcs3/Emu/Cell/Modules/cellHttp.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellHttp.cpp
@@ -1,3782 +1,727 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/IdManager.h"
 
-#include "cellHttpUtil.h"
 #include "cellHttp.h"
-#include "cellSsl.h"
 
 LOG_CHANNEL(cellHttp);
 
-template<>
-void fmt_class_string<CellHttpError>::format(std::string& out, u64 arg)
+error_code cellHttpAuthCacheExport()
 {
-	format_enum(out, arg, [](auto error)
-	{
-		switch (error)
-		{
-			STR_CASE(CELL_HTTP_ERROR_ALREADY_INITIALIZED);
-			STR_CASE(CELL_HTTP_ERROR_NOT_INITIALIZED);
-			STR_CASE(CELL_HTTP_ERROR_NO_MEMORY);
-			STR_CASE(CELL_HTTP_ERROR_NO_BUFFER);
-			STR_CASE(CELL_HTTP_ERROR_NO_STRING);
-			STR_CASE(CELL_HTTP_ERROR_INSUFFICIENT);
-			STR_CASE(CELL_HTTP_ERROR_INVALID_URI);
-			STR_CASE(CELL_HTTP_ERROR_INVALID_HEADER);
-			STR_CASE(CELL_HTTP_ERROR_BAD_METHOD);
-			STR_CASE(CELL_HTTP_ERROR_BAD_CLIENT);
-			STR_CASE(CELL_HTTP_ERROR_BAD_TRANS);
-			STR_CASE(CELL_HTTP_ERROR_NO_CONNECTION);
-			STR_CASE(CELL_HTTP_ERROR_NO_REQUEST_SENT);
-			STR_CASE(CELL_HTTP_ERROR_ALREADY_BUILT);
-			STR_CASE(CELL_HTTP_ERROR_ALREADY_SENT);
-			STR_CASE(CELL_HTTP_ERROR_NO_HEADER);
-			STR_CASE(CELL_HTTP_ERROR_NO_CONTENT_LENGTH);
-			STR_CASE(CELL_HTTP_ERROR_TOO_MANY_REDIRECTS);
-			STR_CASE(CELL_HTTP_ERROR_TOO_MANY_AUTHS);
-			STR_CASE(CELL_HTTP_ERROR_TRANS_NO_CONNECTION);
-			STR_CASE(CELL_HTTP_ERROR_CB_FAILED);
-			STR_CASE(CELL_HTTP_ERROR_NOT_PIPED);
-			STR_CASE(CELL_HTTP_ERROR_OUT_OF_ORDER_PIPE);
-			STR_CASE(CELL_HTTP_ERROR_TRANS_ABORTED);
-			STR_CASE(CELL_HTTP_ERROR_BROKEN_PIPELINE);
-			STR_CASE(CELL_HTTP_ERROR_UNAVAILABLE);
-			STR_CASE(CELL_HTTP_ERROR_INVALID_VALUE);
-			STR_CASE(CELL_HTTP_ERROR_CANNOT_AUTHENTICATE);
-			STR_CASE(CELL_HTTP_ERROR_COOKIE_NOT_FOUND);
-			STR_CASE(CELL_HTTP_ERROR_COOKIE_INVALID_DOMAIN);
-			STR_CASE(CELL_HTTP_ERROR_CACHE_ALREADY_INITIALIZED);
-			STR_CASE(CELL_HTTP_ERROR_CACHE_NOT_INITIALIZED);
-			STR_CASE(CELL_HTTP_ERROR_LINE_EXCEEDS_MAX);
-			STR_CASE(CELL_HTTP_ERROR_REQUIRES_BASIC_AUTH);
-			STR_CASE(CELL_HTTP_ERROR_UNKNOWN);
-			STR_CASE(CELL_HTTP_ERROR_INTERNAL);
-			STR_CASE(CELL_HTTP_ERROR_NONREMOVABLE);
-			STR_CASE(CELL_HTTP_ERROR_BAD_CONN);
-			STR_CASE(CELL_HTTP_ERROR_BAD_MAN);
-			STR_CASE(CELL_HTTP_ERROR_NO_POOL);
-			STR_CASE(CELL_HTTP_ERROR_NO_REQUEST);
-			STR_CASE(CELL_HTTP_ERROR_LOCK_FAILED);
-			STR_CASE(CELL_HTTP_ERROR_INVALID_DATA);
-			STR_CASE(CELL_HTTP_ERROR_BROKEN_CHUNK);
-			STR_CASE(CELL_HTTP_ERROR_DECODE_SETUP);
-			STR_CASE(CELL_HTTP_ERROR_DECODE_STREAM);
-			STR_CASE(CELL_HTTP_ERROR_BROKEN_DECODE_STREAM);
-			STR_CASE(CELL_HTTP_ERROR_INVALID_DCACHE_PATH);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_ALREADY_INITIALIZED);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_NOT_INITIALIZED);
-			STR_CASE(CELL_HTTP_ERROR_TOO_MANY_DCACHE_ENTRY);
-			STR_CASE(CELL_HTTP_ERROR_DUP_DCACHE_ENTRY);
-			STR_CASE(CELL_HTTP_ERROR_WRITE_DCACHE);
-			STR_CASE(CELL_HTTP_ERROR_READ_DCACHE);
-			STR_CASE(CELL_HTTP_ERROR_CACHE_TOO_LARGE);
-			STR_CASE(CELL_HTTP_ERROR_INVALID_DCACHE_VERSION);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_FILE_BROKEN);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_EXCEEDS_MAX);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_BUSY);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_INDEX_BROKEN);
-			STR_CASE(CELL_HTTP_ERROR_INVALID_DCACHE_INDEX_NODE);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_FILE_INCONSISTENCY);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_URI_TOO_LONG);
-			STR_CASE(CELL_HTTP_ERROR_READ_DCACHE_EOF);
-			STR_CASE(CELL_HTTP_ERROR_END_OF_DCACHE_INDEX_NODE);
-			STR_CASE(CELL_HTTP_ERROR_NO_CACHE_MEMORY);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_BROKEN);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_TOO_MANY_WRITE);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_TOO_MANY_READ);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_FATAL);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_UNSUPPORTED_FEATURE);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_INDEX_IS_ALREADY_OPEN);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_INDEX_IS_OPENING);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_UNKNOWN);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_INDEX_IS_CLOSED);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_ABORTED);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_INDEX_IS_CLOSING);
-			STR_CASE(CELL_HTTP_ERROR_DCACHE_UNKNOWN_INDEX_STATE);
-			STR_CASE(CELL_HTTP_ERROR_NET_FIN);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_TIMEOUT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_TIMEOUT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_TIMEOUT);
-		}
-
-		return unknown;
-	});
-}
-
-template<>
-void fmt_class_string<CellHttpsError>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto error)
-	{
-		switch (error)
-		{
-			STR_CASE(CELL_HTTPS_ERROR_CERTIFICATE_LOAD);
-			STR_CASE(CELL_HTTPS_ERROR_BAD_MEMORY);
-			STR_CASE(CELL_HTTPS_ERROR_CONTEXT_CREATION);
-			STR_CASE(CELL_HTTPS_ERROR_CONNECTION_CREATION);
-			STR_CASE(CELL_HTTPS_ERROR_SOCKET_ASSOCIATION);
-			STR_CASE(CELL_HTTPS_ERROR_HANDSHAKE);
-			STR_CASE(CELL_HTTPS_ERROR_LOOKUP_CERTIFICATE);
-			STR_CASE(CELL_HTTPS_ERROR_NO_SSL);
-			STR_CASE(CELL_HTTPS_ERROR_KEY_LOAD);
-			STR_CASE(CELL_HTTPS_ERROR_CERT_KEY_MISMATCH);
-			STR_CASE(CELL_HTTPS_ERROR_KEY_NEEDS_CERT);
-			STR_CASE(CELL_HTTPS_ERROR_CERT_NEEDS_KEY);
-			STR_CASE(CELL_HTTPS_ERROR_RETRY_CONNECTION);
-			STR_CASE(CELL_HTTPS_ERROR_NET_SSL_CONNECT);
-			STR_CASE(CELL_HTTPS_ERROR_NET_SSL_SEND);
-			STR_CASE(CELL_HTTPS_ERROR_NET_SSL_RECV);
-		}
-
-		return unknown;
-	});
-}
-
-template<>
-void fmt_class_string<CellHttpErrorNet>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto error)
-	{
-		switch (error)
-		{
-			STR_CASE(CELL_HTTP_ERROR_NET_RESOLVER_NETDB_INTERNAL);
-			STR_CASE(CELL_HTTP_ERROR_NET_RESOLVER_HOST_NOT_FOUND);
-			STR_CASE(CELL_HTTP_ERROR_NET_RESOLVER_TRY_AGAIN);
-			STR_CASE(CELL_HTTP_ERROR_NET_RESOLVER_NO_RECOVERY);
-			STR_CASE(CELL_HTTP_ERROR_NET_RESOLVER_NO_DATA);
-			//STR_CASE(CELL_HTTP_ERROR_NET_RESOLVER_NO_ADDRESS);
-
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EPERM);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOENT);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ESRCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EINTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENXIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_E2BIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOEXC);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EBADF);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ECHILD);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EDEADLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOMEM);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EACCES);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EFAULT);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOTBLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EBUSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EEXIST);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EXDEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENODEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOTDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EISDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EINVAL);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EMFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOTTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ETXTBSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EFBIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOSPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ESPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EROFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EMLINK);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EDOM);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ERANGE);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EAGAIN);
-			//STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EWOULDBLOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EINPROGRESS);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EALREADY);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOTSOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EDESTADDRREQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EMSGSIZE);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EPROTOTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOPROTOOPT);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EPROTONOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ESOCKTNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EOPNOTSUPP);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EPFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EAFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EADDRINUSE);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EADDRNOTAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENETDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENETUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENETRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ECONNABORTED);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ECONNRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOBUFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EISCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOTCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ESHUTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ETOOMANYREFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ETIMEDOUT);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ECONNREFUSED);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ELOOP);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENAMETOOLONG);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EHOSTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EHOSTUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOTEMPTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EPROCLIM);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EUSERS);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EDQUOT);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ESTALE);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EREMOTE);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EBADRPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ERPCMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EPROGUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EPROGMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EPROCUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOLCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOSYS);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EFTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENEEDAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EIDRM);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EOVERFLOW);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EILSEQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOTSUP);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ECANCELED);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_EBADMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENODATA);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOSR);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ENOSTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_ABORT_ETIME);
-
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EPERM);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOENT);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ESRCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EINTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENXIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_E2BIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOEXC);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EBADF);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ECHILD);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EDEADLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOMEM);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EACCES);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EFAULT);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOTBLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EBUSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EEXIST);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EXDEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENODEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOTDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EISDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EINVAL);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EMFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOTTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ETXTBSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EFBIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOSPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ESPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EROFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EMLINK);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EDOM);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ERANGE);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EAGAIN);
-			//STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EWOULDBLOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EINPROGRESS);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EALREADY);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOTSOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EDESTADDRREQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EMSGSIZE);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EPROTOTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOPROTOOPT);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EPROTONOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ESOCKTNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EOPNOTSUPP);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EPFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EAFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EADDRINUSE);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EADDRNOTAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENETDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENETUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENETRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ECONNABORTED);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ECONNRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOBUFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EISCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOTCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ESHUTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ETOOMANYREFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ETIMEDOUT);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ECONNREFUSED);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ELOOP);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENAMETOOLONG);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EHOSTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EHOSTUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOTEMPTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EPROCLIM);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EUSERS);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EDQUOT);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ESTALE);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EREMOTE);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EBADRPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ERPCMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EPROGUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EPROGMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EPROCUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOLCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOSYS);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EFTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENEEDAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EIDRM);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EOVERFLOW);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EILSEQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOTSUP);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ECANCELED);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_EBADMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENODATA);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOSR);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ENOSTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_OPTION_ETIME);
-
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EPERM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOENT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ESRCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EINTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENXIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_E2BIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOEXC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EBADF);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ECHILD);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EDEADLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOMEM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EACCES);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EFAULT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOTBLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EBUSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EEXIST);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EXDEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENODEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOTDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EISDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EINVAL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EMFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOTTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ETXTBSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EFBIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOSPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ESPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EROFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EMLINK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EDOM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ERANGE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EAGAIN);
-			//STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EWOULDBLOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EINPROGRESS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EALREADY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOTSOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EDESTADDRREQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EMSGSIZE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EPROTOTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOPROTOOPT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EPROTONOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ESOCKTNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EOPNOTSUPP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EPFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EAFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EADDRINUSE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EADDRNOTAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENETDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENETUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENETRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ECONNABORTED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ECONNRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOBUFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EISCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOTCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ESHUTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ETOOMANYREFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ETIMEDOUT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ECONNREFUSED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ELOOP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENAMETOOLONG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EHOSTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EHOSTUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOTEMPTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EPROCLIM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EUSERS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EDQUOT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ESTALE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EREMOTE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EBADRPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ERPCMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EPROGUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EPROGMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EPROCUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOLCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOSYS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EFTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENEEDAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EIDRM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EOVERFLOW);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EILSEQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOTSUP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ECANCELED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_EBADMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENODATA);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOSR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ENOSTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SOCKET_ETIME);
-
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EPERM);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOENT);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ESRCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EINTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENXIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_E2BIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOEXC);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EBADF);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ECHILD);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EDEADLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOMEM);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EACCES);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EFAULT);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOTBLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EBUSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EEXIST);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EXDEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENODEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOTDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EISDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EINVAL);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EMFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOTTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ETXTBSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EFBIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOSPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ESPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EROFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EMLINK);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EDOM);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ERANGE);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EAGAIN);
-			//STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EWOULDBLOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EINPROGRESS);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EALREADY);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOTSOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EDESTADDRREQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EMSGSIZE);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EPROTOTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOPROTOOPT);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EPROTONOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ESOCKTNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EOPNOTSUPP);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EPFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EAFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EADDRINUSE);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EADDRNOTAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENETDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENETUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENETRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ECONNABORTED);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ECONNRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOBUFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EISCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOTCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ESHUTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ETOOMANYREFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ETIMEDOUT);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ECONNREFUSED);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ELOOP);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENAMETOOLONG);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EHOSTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EHOSTUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOTEMPTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EPROCLIM);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EUSERS);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EDQUOT);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ESTALE);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EREMOTE);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EBADRPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ERPCMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EPROGUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EPROGMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EPROCUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOLCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOSYS);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EFTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENEEDAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EIDRM);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EOVERFLOW);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EILSEQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOTSUP);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ECANCELED);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_EBADMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENODATA);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOSR);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ENOSTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_CONNECT_ETIME);
-
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EPERM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOENT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ESRCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EINTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENXIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_E2BIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOEXC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EBADF);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ECHILD);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EDEADLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOMEM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EACCES);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EFAULT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOTBLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EBUSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EEXIST);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EXDEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENODEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOTDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EISDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EINVAL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EMFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOTTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ETXTBSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EFBIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOSPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ESPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EROFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EMLINK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EDOM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ERANGE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EAGAIN);
-			//STR_CASE(CELL_HTTP_ERROR_NET_SEND_EWOULDBLOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EINPROGRESS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EALREADY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOTSOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EDESTADDRREQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EMSGSIZE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EPROTOTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOPROTOOPT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EPROTONOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ESOCKTNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EOPNOTSUPP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EPFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EAFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EADDRINUSE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EADDRNOTAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENETDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENETUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENETRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ECONNABORTED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ECONNRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOBUFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EISCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOTCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ESHUTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ETOOMANYREFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ETIMEDOUT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ECONNREFUSED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ELOOP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENAMETOOLONG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EHOSTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EHOSTUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOTEMPTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EPROCLIM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EUSERS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EDQUOT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ESTALE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EREMOTE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EBADRPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ERPCMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EPROGUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EPROGMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EPROCUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOLCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOSYS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EFTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENEEDAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EIDRM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EOVERFLOW);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EILSEQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOTSUP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ECANCELED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_EBADMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENODATA);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOSR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ENOSTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SEND_ETIME);
-
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EPERM);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOENT);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ESRCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EINTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENXIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_E2BIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOEXC);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EBADF);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ECHILD);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EDEADLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOMEM);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EACCES);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EFAULT);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOTBLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EBUSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EEXIST);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EXDEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENODEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOTDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EISDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EINVAL);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EMFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOTTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ETXTBSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EFBIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOSPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ESPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EROFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EMLINK);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EDOM);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ERANGE);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EAGAIN);
-			//STR_CASE(CELL_HTTP_ERROR_NET_RECV_EWOULDBLOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EINPROGRESS);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EALREADY);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOTSOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EDESTADDRREQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EMSGSIZE);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EPROTOTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOPROTOOPT);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EPROTONOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ESOCKTNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EOPNOTSUPP);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EPFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EAFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EADDRINUSE);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EADDRNOTAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENETDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENETUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENETRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ECONNABORTED);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ECONNRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOBUFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EISCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOTCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ESHUTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ETOOMANYREFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ETIMEDOUT);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ECONNREFUSED);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ELOOP);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENAMETOOLONG);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EHOSTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EHOSTUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOTEMPTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EPROCLIM);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EUSERS);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EDQUOT);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ESTALE);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EREMOTE);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EBADRPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ERPCMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EPROGUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EPROGMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EPROCUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOLCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOSYS);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EFTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENEEDAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EIDRM);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EOVERFLOW);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EILSEQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOTSUP);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ECANCELED);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_EBADMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENODATA);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOSR);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ENOSTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_RECV_ETIME);
-
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EPERM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOENT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ESRCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EINTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENXIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_E2BIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOEXC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EBADF);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ECHILD);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EDEADLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOMEM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EACCES);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EFAULT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOTBLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EBUSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EEXIST);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EXDEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENODEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOTDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EISDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EINVAL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EMFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOTTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ETXTBSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EFBIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOSPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ESPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EROFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EMLINK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EDOM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ERANGE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EAGAIN);
-			//STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EWOULDBLOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EINPROGRESS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EALREADY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOTSOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EDESTADDRREQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EMSGSIZE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EPROTOTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOPROTOOPT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EPROTONOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ESOCKTNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EOPNOTSUPP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EPFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EAFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EADDRINUSE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EADDRNOTAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENETDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENETUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENETRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ECONNABORTED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ECONNRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOBUFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EISCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOTCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ESHUTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ETOOMANYREFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ETIMEDOUT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ECONNREFUSED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ELOOP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENAMETOOLONG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EHOSTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EHOSTUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOTEMPTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EPROCLIM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EUSERS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EDQUOT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ESTALE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EREMOTE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EBADRPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ERPCMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EPROGUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EPROGMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EPROCUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOLCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOSYS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EFTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENEEDAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EIDRM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EOVERFLOW);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EILSEQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOTSUP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ECANCELED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_EBADMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENODATA);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOSR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ENOSTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SELECT_ETIME);
-
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EPERM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOENT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ESRCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EINTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENXIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_E2BIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOEXC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EBADF);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ECHILD);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EDEADLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOMEM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EACCES);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EFAULT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTBLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EBUSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EEXIST);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EXDEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENODEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EISDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EINVAL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EMFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ETXTBSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EFBIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOSPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ESPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EROFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EMLINK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EDOM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ERANGE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EAGAIN);
-			//STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EWOULDBLOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EINPROGRESS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EALREADY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTSOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EDESTADDRREQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EMSGSIZE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EPROTOTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOPROTOOPT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EPROTONOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ESOCKTNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EOPNOTSUPP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EPFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EAFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EADDRINUSE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EADDRNOTAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENETDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENETUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENETRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ECONNABORTED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ECONNRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOBUFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EISCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ESHUTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ETOOMANYREFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ETIMEDOUT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ECONNREFUSED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ELOOP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENAMETOOLONG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EHOSTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EHOSTUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTEMPTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EPROCLIM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EUSERS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EDQUOT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ESTALE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EREMOTE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EBADRPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ERPCMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EPROGUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EPROGMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EPROCUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOLCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOSYS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EFTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENEEDAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EIDRM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EOVERFLOW);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EILSEQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTSUP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ECANCELED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_EBADMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENODATA);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOSR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOSTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_CONNECT_ETIME);
-
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EPERM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOENT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ESRCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EINTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENXIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_E2BIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOEXC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EBADF);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ECHILD);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EDEADLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOMEM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EACCES);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EFAULT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOTBLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EBUSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EEXIST);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EXDEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENODEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOTDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EISDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EINVAL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EMFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOTTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ETXTBSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EFBIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOSPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ESPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EROFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EMLINK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EDOM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ERANGE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EAGAIN);
-			//STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EWOULDBLOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EINPROGRESS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EALREADY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOTSOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EDESTADDRREQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EMSGSIZE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EPROTOTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOPROTOOPT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EPROTONOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ESOCKTNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EOPNOTSUPP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EPFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EAFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EADDRINUSE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EADDRNOTAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENETDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENETUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENETRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ECONNABORTED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ECONNRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOBUFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EISCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOTCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ESHUTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ETOOMANYREFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ETIMEDOUT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ECONNREFUSED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ELOOP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENAMETOOLONG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EHOSTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EHOSTUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOTEMPTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EPROCLIM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EUSERS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EDQUOT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ESTALE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EREMOTE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EBADRPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ERPCMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EPROGUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EPROGMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EPROCUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOLCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOSYS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EFTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENEEDAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EIDRM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EOVERFLOW);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EILSEQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOTSUP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ECANCELED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_EBADMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENODATA);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOSR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ENOSTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_SEND_ETIME);
-
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EPERM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOENT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ESRCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EINTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENXIO);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_E2BIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOEXC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EBADF);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ECHILD);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EDEADLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOMEM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EACCES);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EFAULT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOTBLK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EBUSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EEXIST);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EXDEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENODEV);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOTDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EISDIR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EINVAL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EMFILE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOTTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ETXTBSY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EFBIG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOSPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ESPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EROFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EMLINK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EPIPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EDOM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ERANGE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EAGAIN);
-			//STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EWOULDBLOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EINPROGRESS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EALREADY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOTSOCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EDESTADDRREQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EMSGSIZE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EPROTOTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOPROTOOPT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EPROTONOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ESOCKTNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EOPNOTSUPP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EPFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EAFNOSUPPORT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EADDRINUSE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EADDRNOTAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENETDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENETUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENETRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ECONNABORTED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ECONNRESET);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOBUFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EISCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOTCONN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ESHUTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ETOOMANYREFS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ETIMEDOUT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ECONNREFUSED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ELOOP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENAMETOOLONG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EHOSTDOWN);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EHOSTUNREACH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOTEMPTY);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EPROCLIM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EUSERS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EDQUOT);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ESTALE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EREMOTE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EBADRPC);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ERPCMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EPROGUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EPROGMISMATCH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EPROCUNAVAIL);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOLCK);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOSYS);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EFTYPE);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENEEDAUTH);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EIDRM);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EOVERFLOW);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EILSEQ);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOTSUP);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ECANCELED);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_EBADMSG);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENODATA);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOSR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ENOSTR);
-			STR_CASE(CELL_HTTP_ERROR_NET_SSL_RECV_ETIME);
-		}
-
-		return unknown;
-	});
-}
-
-error_code cellHttpAuthCacheExport(vm::ptr<u32> buf, u32 len, vm::ptr<u32> outsize)
-{
-	cellHttp.todo("cellHttpAuthCacheExport(buf=*0x%x, len=%d, outsize=*0x%x)", buf, len, outsize);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (!buf)
-	{
-		if (!outsize)
-		{
-			return CELL_HTTP_ERROR_NO_BUFFER;
-		}
-	}
-	else
-	{
-		if (len < 9)
-		{
-			return CELL_HTTP_ERROR_INSUFFICIENT;
-		}
-
-		// TODO
-	}
-
-	[[maybe_unused]] u32 size = 0;
-
-	// TODO
-
-	if (outsize)
-	{
-		*outsize = 0;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
 error_code cellHttpAuthCacheFlush()
 {
-	cellHttp.todo("cellHttpAuthCacheFlush()");
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpAuthCacheGetEntryMax(u32 unk_ptr)
+error_code cellHttpAuthCacheGetEntryMax()
 {
-	cellHttp.todo("cellHttpAuthCacheGetEntryMax(unk_ptr=*0x%x)", unk_ptr);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (!unk_ptr)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpAuthCacheImport(vm::ptr<char> unk1, u32 unk2)
+error_code cellHttpAuthCacheImport()
 {
-	cellHttp.todo("cellHttpAuthCacheImport(unk1=*0x%x, unk2=0x%x)", unk1, unk2);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (!unk1 || !unk2)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
-	if (unk2 < 9)
-	{
-		return CELL_HTTP_ERROR_INSUFFICIENT;
-	}
-
-	if (unk1[0] != '\x01')
-	{
-		return CELL_HTTP_ERROR_INVALID_DATA;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpAuthCacheSetEntryMax(u32 unk)
+error_code cellHttpAuthCacheSetEntryMax()
 {
-	cellHttp.todo("cellHttpAuthCacheSetEntryMax(unk=0x%x)", unk);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpInit(vm::ptr<void> pool, u32 poolSize)
+error_code cellHttpInit()
 {
-	cellHttp.notice("cellHttpInit(pool=*0x%x, poolSize=0x%x)", pool, poolSize);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (man.initialized)
-	{
-		return CELL_HTTP_ERROR_ALREADY_INITIALIZED;
-	}
-
-	if (!pool || !poolSize)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
-	man.initialized = true;
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
 error_code cellHttpEnd()
 {
-	cellHttp.notice("cellHttpEnd()");
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	man.initialized = false;
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpsInit(u32 caCertNum, vm::cptr<CellHttpsData> caList)
+error_code cellHttpsInit()
 {
-	cellHttp.todo("cellHttpsInit(caCertNum=0x%x, caList=*0x%x)", caCertNum, caList);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (man.https_initialized)
-	{
-		return CELL_HTTP_ERROR_ALREADY_INITIALIZED;
-	}
-
-	man.https_initialized = true;
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
 error_code cellHttpsEnd()
 {
-	cellHttp.todo("cellHttpsEnd()");
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.https_initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (!_cellSslIsInitd())
-	{
-		return CELL_SSL_ERROR_NOT_INITIALIZED;
-	}
-
-	man.https_initialized = false;
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpSetProxy(vm::cptr<CellHttpUri> proxy)
+error_code cellHttpSetProxy()
 {
-	cellHttp.todo("cellHttpSetProxy(proxy=*0x%x)", proxy);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (proxy)
-	{
-		if (!proxy->hostname || !proxy->hostname[0])
-		{
-			return CELL_HTTP_ERROR_INVALID_URI;
-		}
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpGetCookie(vm::ptr<void> buf)
+error_code cellHttpGetCookie()
 {
-	cellHttp.todo("cellHttpGetCookie(buf=*0x%x)", buf);
-
-	if (!buf)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_COOKIE_NOT_FOUND;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpGetProxy(vm::ptr<CellHttpUri> proxy, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
+error_code cellHttpGetProxy()
 {
-	cellHttp.todo("cellHttpGetProxy(proxy=*0x%x, pool=*0x%x, poolSize=0x%x, required=*0x%x)", proxy, pool, poolSize, required);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	//if (todo)
-	//{
-	//	return cellHttpUtilCopyUri(proxy, some CellHttpUri, pool, poolSize, required);
-	//}
-
-	if (required)
-	{
-		*required = 0;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpInitCookie(vm::ptr<void> pool, u32 poolSize)
+error_code cellHttpInitCookie()
 {
-	cellHttp.todo("cellHttpInitCookie(pool=*0x%x, poolSize=0x%x)", pool, poolSize);
-
-	if (!pool || !poolSize)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (man.cookie_initialized)
-	{
-		return CELL_HTTP_ERROR_ALREADY_INITIALIZED;
-	}
-
-	man.cookie_initialized = true;
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
 error_code cellHttpEndCookie()
 {
-	cellHttp.todo("cellHttpEndCookie()");
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.cookie_initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	man.cookie_initialized = false;
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpAddCookieWithClientId(vm::cptr<CellHttpUri> uri, vm::cptr<char> cookie, CellHttpClientId clientId)
+error_code cellHttpAddCookieWithClientId()
 {
-	cellHttp.todo("cellHttpAddCookieWithClientId(uri=*0x%x, cookie=%s, clientId=0x%x)", uri, cookie, clientId);
-
-	if (!uri)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
-	if (!cookie || !uri->hostname || !uri->path)
-	{
-		return CELL_HTTP_ERROR_NO_STRING;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpSessionCookieFlush(CellHttpClientId clientId)
+error_code cellHttpSessionCookieFlush()
 {
-	cellHttp.todo("cellHttpSessionCookieFlush(clientId=0x%x)", clientId);
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpCookieExport(vm::ptr<void> buffer, u32 size, vm::ptr<u32> exportSize)
+error_code cellHttpCookieExport()
 {
-	cellHttp.todo("cellHttpCookieExport(buffer=*0x%x, size=0x%x, exportSize=*0x%x)", buffer, size, exportSize);
-
-	if (buffer && size < 0x14)
-	{
-		return CELL_HTTP_ERROR_INSUFFICIENT;
-	}
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.cookie_initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpCookieExportWithClientId(vm::ptr<void> buffer, u32 size, vm::ptr<u32> exportSize, CellHttpClientId clientId)
+error_code cellHttpCookieExportWithClientId()
 {
-	cellHttp.todo("cellHttpCookieExportWithClientId(buffer=*0x%x, size=0x%x, exportSize=*0x%x, clientId=0x%x)", buffer, size, exportSize, clientId);
-
-	if (buffer && size < 0x14)
-	{
-		return CELL_HTTP_ERROR_INSUFFICIENT;
-	}
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.cookie_initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
 error_code cellHttpCookieFlush()
 {
-	cellHttp.todo("cellHttpCookieFlush()");
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.cookie_initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpCookieImport(vm::cptr<void> buffer, u32 size)
+error_code cellHttpCookieImport()
 {
-	cellHttp.todo("cellHttpCookieImport(buffer=*0x%x, size=0x%x)", buffer, size);
-
-	if (error_code error = cellHttpCookieFlush())
-	{
-		cellHttp.error("cellHttpCookieImport: cellHttpCookieFlush returned 0x%x", +error);
-		// No return
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpCookieImportWithClientId(vm::cptr<void> buffer, u32 size, CellHttpClientId clientId)
+error_code cellHttpCookieImportWithClientId()
 {
-	cellHttp.todo("cellHttpCookieImportWithClientId(buffer=*0x%x, size=0x%x, clientId=0x%x)", buffer, size, clientId);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.cookie_initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetCookieSendCallback(CellHttpClientId clientId, vm::ptr<CellHttpCookieSendCallback> cbfunc, vm::ptr<void> userArg)
+error_code cellHttpClientSetCookieSendCallback()
 {
-	cellHttp.todo("cellHttpClientSetCookieSendCallback(clientId=0x%x, cbfunc=*0x%x, userArg=*0x%x)", clientId, cbfunc, userArg);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetCookieRecvCallback(CellHttpClientId clientId, vm::ptr<CellHttpsSslCallback> cbfunc, vm::ptr<void> userArg)
+error_code cellHttpClientSetCookieRecvCallback()
 {
-	cellHttp.todo("cellHttpClientSetCookieRecvCallback(clientId=0x%x, cbfunc=*0x%x, userArg=*0x%x)", clientId, cbfunc, userArg);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpCreateClient(vm::ptr<CellHttpClientId> clientId)
+error_code cellHttpCreateClient()
 {
-	cellHttp.todo("cellHttpCreateClient(clientId=*0x%x)", clientId);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (!clientId)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpDestroyClient(CellHttpClientId clientId)
+error_code cellHttpDestroyClient()
 {
-	cellHttp.todo("cellHttpDestroyClient(clientId=0x%x)", clientId);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetAuthenticationCallback(CellHttpClientId clientId, vm::ptr<CellHttpAuthenticationCallback> cbfunc, vm::ptr<void> userArg)
+error_code cellHttpClientSetAuthenticationCallback()
 {
-	cellHttp.todo("cellHttpClientSetAuthenticationCallback(clientId=0x%x, cbfunc=*0x%x, userArg=*0x%x)", clientId, cbfunc, userArg);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetCacheStatus(CellHttpClientId clientId, b8 enable)
+error_code cellHttpClientSetTransactionStateCallback()
 {
-	cellHttp.todo("cellHttpClientSetCacheStatus(clientId=0x%x, enable=%d)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetTransactionStateCallback(CellHttpClientId clientId, vm::ptr<CellHttpTransactionStateCallback> cbfunc, vm::ptr<void> userArg)
+error_code cellHttpClientSetRedirectCallback()
 {
-	cellHttp.todo("cellHttpClientSetTransactionStateCallback(clientId=0x%x, cbfunc=*0x%x, userArg=*0x%x)", clientId, cbfunc, userArg);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetRedirectCallback(CellHttpClientId clientId, vm::ptr<CellHttpRedirectCallback> cbfunc, vm::ptr<void> userArg)
+error_code cellHttpClientSetProxy()
 {
-	cellHttp.todo("cellHttpClientSetRedirectCallback(clientId=0x%x, cbfunc=*0x%x, userArg=*0x%x)", clientId, cbfunc, userArg);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetProxy(CellHttpClientId clientId, vm::cptr<CellHttpUri> proxy)
+error_code cellHttpClientGetProxy()
 {
-	cellHttp.todo("cellHttpClientSetProxy(clientId=0x%x, proxy=*0x%x)", clientId, proxy);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (proxy)
-	{
-		if (!proxy->hostname || !proxy->hostname[0])
-		{
-			return CELL_HTTP_ERROR_INVALID_URI;
-		}
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetProxy(CellHttpClientId clientId, vm::ptr<CellHttpUri> proxy, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
+error_code cellHttpClientSetVersion()
 {
-	cellHttp.todo("cellHttpClientGetProxy(clientId=0x%x, proxy=*0x%x, pool=*0x%x, poolSize=0x%x, required=*0x%x)", clientId, proxy, pool, poolSize, required);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetVersion(CellHttpClientId clientId, u32 major, u32 minor)
+error_code cellHttpClientGetVersion()
 {
-	cellHttp.todo("cellHttpClientSetPipeline(clientId=0x%x, major=0x%x, minor=0x%x)", clientId, major, minor);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetVersion(CellHttpClientId clientId, vm::ptr<u32> major, vm::ptr<u32> minor)
+error_code cellHttpClientSetPipeline()
 {
-	cellHttp.todo("cellHttpClientGetVersion(clientId=0x%x, major=*0x%x, minor=*0x%x)", clientId, major, minor);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!major || !minor)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetPipeline(CellHttpClientId clientId, b8 enable)
+error_code cellHttpClientGetPipeline()
 {
-	cellHttp.todo("cellHttpClientSetPipeline(clientId=0x%x, enable=%d)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetPipeline(CellHttpClientId clientId, vm::ptr<b8> enable)
+error_code cellHttpClientSetKeepAlive()
 {
-	cellHttp.todo("cellHttpClientGetPipeline(clientId=0x%x, enable=*0x%x)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!enable)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetKeepAlive(CellHttpClientId clientId, b8 enable)
+error_code cellHttpClientGetKeepAlive()
 {
-	cellHttp.todo("cellHttpClientSetKeepAlive(clientId=0x%x, enable=%d)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetKeepAlive(CellHttpClientId clientId, vm::ptr<b8> enable)
+error_code cellHttpClientSetAutoRedirect()
 {
-	cellHttp.todo("cellHttpClientGetKeepAlive(clientId=0x%x, enable=*0x%x)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!enable)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetAutoRedirect(CellHttpClientId clientId, b8 enable)
+error_code cellHttpClientGetAutoRedirect()
 {
-	cellHttp.todo("cellHttpClientSetAutoRedirect(clientId=0x%x, enable=%d)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetAutoRedirect(CellHttpClientId clientId, vm::ptr<b8> enable)
+error_code cellHttpClientSetAutoAuthentication()
 {
-	cellHttp.todo("cellHttpClientGetAutoRedirect(clientId=0x%x, enable=*0x%x)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!enable)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetAutoAuthentication(CellHttpClientId clientId, b8 enable)
+error_code cellHttpClientGetAutoAuthentication()
 {
-	cellHttp.todo("cellHttpClientSetAutoAuthentication(clientId=0x%x, enable=%d)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetAutoAuthentication(CellHttpClientId clientId, vm::ptr<b8> enable)
+error_code cellHttpClientSetAuthenticationCacheStatus()
 {
-	cellHttp.todo("cellHttpClientGetAutoAuthentication(clientId=0x%x, enable=*0x%x)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!enable)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetAuthenticationCacheStatus(CellHttpClientId clientId, b8 enable)
+error_code cellHttpClientGetAuthenticationCacheStatus()
 {
-	cellHttp.todo("cellHttpClientSetAuthenticationCacheStatus(clientId=0x%x, enable=%d)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetAuthenticationCacheStatus(CellHttpClientId clientId, vm::ptr<b8> enable)
+error_code cellHttpClientSetCookieStatus()
 {
-	cellHttp.todo("cellHttpClientGetAuthenticationCacheStatus(clientId=0x%x, enable=*0x%x)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!enable)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetCookieStatus(CellHttpClientId clientId, b8 enable)
+error_code cellHttpClientGetCookieStatus()
 {
-	cellHttp.todo("cellHttpClientSetCookieStatus(clientId=0x%x, enable=%d)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetCookieStatus(CellHttpClientId clientId, vm::ptr<b8> enable)
+error_code cellHttpClientSetUserAgent()
 {
-	cellHttp.todo("cellHttpClientGetCookieStatus(clientId=0x%x, enable=*0x%x)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!enable)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetUserAgent(CellHttpClientId clientId, vm::cptr<char> userAgent)
+error_code cellHttpClientGetUserAgent()
 {
-	cellHttp.todo("cellHttpClientSetUserAgent(clientId=0x%x, userAgent=%s)", clientId, userAgent);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!userAgent)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetUserAgent(CellHttpClientId clientId, vm::ptr<char> userAgent, u32 size, vm::ptr<u32> required)
+error_code cellHttpClientSetResponseBufferMax()
 {
-	cellHttp.todo("cellHttpClientGetUserAgent(clientId=0x%x, userAgent=*0x%x, size=%d, required=*0x%x)", clientId, size, userAgent, required);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!userAgent || !size)
-	{
-		if (!required)
-		{
-			return CELL_HTTP_ERROR_NO_BUFFER;
-		}
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetResponseBufferMax(CellHttpClientId clientId, u32 max)
+error_code cellHttpClientGetResponseBufferMax()
 {
-	cellHttp.todo("cellHttpClientSetResponseBufferMax(clientId=0x%x, max=%d)", clientId, max);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (max < 1500)
-	{
-		max = 1500;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetResponseBufferMax(CellHttpClientId clientId, vm::ptr<u32> max)
+error_code cellHttpClientCloseAllConnections()
 {
-	cellHttp.todo("cellHttpClientGetResponseBufferMax(clientId=0x%x, max=*0x%x)", clientId, max);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!max)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientCloseAllConnections(CellHttpClientId clientId)
+error_code cellHttpClientCloseConnections()
 {
-	cellHttp.todo("cellHttpClientCloseAllConnections(clientId=0x%x)", clientId);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientCloseConnections(CellHttpClientId clientId, vm::cptr<CellHttpUri> uri)
+error_code cellHttpClientPollConnections()
 {
-	cellHttp.todo("cellHttpClientCloseConnections(clientId=0x%x, uri=*0x%x)", clientId, uri);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientPollConnections(CellHttpClientId clientId, vm::ptr<CellHttpTransId> transId, s64 usec)
+error_code cellHttpClientSetConnectionStateCallback()
 {
-	cellHttp.todo("cellHttpClientPollConnections(clientId=0x%x, transId=*0x%x, usec=%d)", clientId, transId, usec);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetConnectionStateCallback(CellHttpClientId clientId, vm::ptr<void> cbfunc, vm::ptr<void> userArg)
+error_code cellHttpClientSetConnectionWaitStatus()
 {
-	cellHttp.todo("cellHttpClientSetConnectionStateCallback(clientId=0x%x, cbfunc=*0x%x, userArg=*0x%x)", clientId, cbfunc, userArg);
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetConnectionWaitStatus(CellHttpClientId clientId, b8 enable)
+error_code cellHttpClientGetConnectionWaitStatus()
 {
-	cellHttp.todo("cellHttpClientSetConnectionWaitStatus(clientId=0x%x, enable=%d)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetConnectionWaitStatus(CellHttpClientId clientId, vm::ptr<b8> enable)
+error_code cellHttpClientSetConnectionWaitTimeout()
 {
-	cellHttp.todo("cellHttpClientGetConnectionWaitStatus(clientId=0x%x, enable=*0x%x)", clientId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!enable)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetConnectionWaitTimeout(CellHttpClientId clientId, s64 usec)
+error_code cellHttpClientGetConnectionWaitTimeout()
 {
-	cellHttp.todo("cellHttpClientSetConnectionWaitTimeout(clientId=0x%x, usec=%d)", clientId, usec);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetConnectionWaitTimeout(CellHttpClientId clientId, vm::ptr<s64> usec)
+error_code cellHttpClientSetRecvTimeout()
 {
-	cellHttp.todo("cellHttpClientGetConnectionWaitTimeout(clientId=0x%x, usec=*0x%x)", clientId, usec);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!usec)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetRecvTimeout(CellHttpClientId clientId, s64 usec)
+error_code cellHttpClientGetRecvTimeout()
 {
-	cellHttp.todo("cellHttpClientSetRecvTimeout(clientId=0x%x, usec=%d)", clientId, usec);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetRecvTimeout(CellHttpClientId clientId, vm::ptr<s64> usec)
+error_code cellHttpClientSetSendTimeout()
 {
-	cellHttp.todo("cellHttpClientGetRecvTimeout(clientId=0x%x, usec=*0x%x)", clientId, usec);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!usec) // TODO
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetSendTimeout(CellHttpClientId clientId, s64 usec)
+error_code cellHttpClientGetSendTimeout()
 {
-	cellHttp.todo("cellHttpClientSetSendTimeout(clientId=0x%x, usec=%d)", clientId, usec);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetSendTimeout(CellHttpClientId clientId, vm::ptr<s64> usec)
+error_code cellHttpClientSetConnTimeout()
 {
-	cellHttp.todo("cellHttpClientGetSendTimeout(clientId=0x%x, usec=*0x%x)", clientId, usec);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!usec) // TODO
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetConnTimeout(CellHttpClientId clientId, s64 usec)
+error_code cellHttpClientGetConnTimeout()
 {
-	cellHttp.todo("cellHttpClientSetConnTimeout(clientId=0x%x, usec=%d)", clientId, usec);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetConnTimeout(CellHttpClientId clientId, vm::ptr<s64> usec)
+error_code cellHttpClientSetTotalPoolSize()
 {
-	cellHttp.todo("cellHttpClientGetConnTimeout(clientId=0x%x, usec=*0x%x)", clientId, usec);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!usec)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetTotalPoolSize(CellHttpClientId clientId, u32 poolSize)
+error_code cellHttpClientGetTotalPoolSize()
 {
-	cellHttp.todo("cellHttpClientSetTotalPoolSize(clientId=0x%x, poolSize=%d)", clientId, poolSize);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetTotalPoolSize(CellHttpClientId clientId, vm::ptr<u32> poolSize)
+error_code cellHttpClientSetPerHostPoolSize()
 {
-	cellHttp.todo("cellHttpClientGetTotalPoolSize(clientId=0x%x, poolSize=*0x%x)", clientId, poolSize);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!poolSize)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetPerHostPoolSize(CellHttpClientId clientId, u32 poolSize)
+error_code cellHttpClientGetPerHostPoolSize()
 {
-	cellHttp.todo("cellHttpClientSetPerHostPoolSize(clientId=0x%x, poolSize=%d)", clientId, poolSize);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetPerHostPoolSize(CellHttpClientId clientId, vm::ptr<u32> poolSize)
+error_code cellHttpClientSetPerHostKeepAliveMax()
 {
-	cellHttp.todo("cellHttpClientGetPerHostPoolSize(clientId=0x%x, poolSize=*0x%x)", clientId, poolSize);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!poolSize)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetPerHostKeepAliveMax(CellHttpClientId clientId, u32 maxSize)
+error_code cellHttpClientGetPerHostKeepAliveMax()
 {
-	cellHttp.todo("cellHttpClientSetPerHostKeepAliveMax(clientId=0x%x, maxSize=%d)", clientId, maxSize);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetPerHostKeepAliveMax(CellHttpClientId clientId, vm::ptr<u32> maxSize)
+error_code cellHttpClientSetPerPipelineMax()
 {
-	cellHttp.todo("cellHttpClientGetPerHostKeepAliveMax(clientId=0x%x, maxSize=*0x%x)", clientId, maxSize);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!maxSize)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetPerPipelineMax(CellHttpClientId clientId, u32 pipeMax)
+error_code cellHttpClientGetPerPipelineMax()
 {
-	cellHttp.todo("cellHttpClientSetPerPipelineMax(clientId=0x%x, pipeMax=%d)", clientId, pipeMax);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetPerPipelineMax(CellHttpClientId clientId, vm::ptr<u32> pipeMax)
+error_code cellHttpClientSetRecvBufferSize()
 {
-	cellHttp.todo("cellHttpClientGetPerPipelineMax(clientId=0x%x, pipeMax=*0x%x)", clientId, pipeMax);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!pipeMax)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetRecvBufferSize(CellHttpClientId clientId, s32 size)
+error_code cellHttpClientGetRecvBufferSize()
 {
-	cellHttp.todo("cellHttpClientSetRecvBufferSize(clientId=0x%x, size=%d)", clientId, size);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetRecvBufferSize(CellHttpClientId clientId, vm::ptr<s32> size)
+error_code cellHttpClientSetSendBufferSize()
 {
-	cellHttp.todo("cellHttpClientGetRecvBufferSize(clientId=0x%x, size=*0x%x)", clientId, size);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!size)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetSendBufferSize(CellHttpClientId clientId, s32 size)
+error_code cellHttpClientGetSendBufferSize()
 {
-	cellHttp.todo("cellHttpClientSetSendBufferSize(clientId=0x%x, size=%d)", clientId, size);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetSendBufferSize(CellHttpClientId clientId, vm::ptr<s32> size)
+error_code cellHttpClientGetAllHeaders()
 {
-	cellHttp.todo("cellHttpClientGetSendBufferSize(clientId=0x%x, size=*0x%x)", clientId, size);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!size)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetAllHeaders(CellHttpClientId clientId, vm::pptr<CellHttpHeader> headers, vm::ptr<u32> items, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
+error_code cellHttpClientSetHeader()
 {
-	cellHttp.todo("cellHttpClientGetAllHeaders(clientId=0x%x, headers=*0x%x, items=*0x%x, pool=*0x%x, poolSize=0x%x, required=*0x%x)", clientId, headers, items, pool, poolSize, required);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if ((!pool || !headers) && !required)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetHeader(CellHttpClientId clientId, vm::cptr<CellHttpHeader> header)
+error_code cellHttpClientGetHeader()
 {
-	cellHttp.todo("cellHttpClientSetHeader(clientId=0x%x, header=*0x%x)", clientId, header);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!header)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetHeader(CellHttpClientId clientId, vm::ptr<CellHttpHeader> header, vm::cptr<char> name, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
+error_code cellHttpClientAddHeader()
 {
-	cellHttp.todo("cellHttpClientGetHeader(clientId=0x%x, header=*0x%x, name=%s, pool=*0x%x, poolSize=0x%x, required=*0x%x)", clientId, header, name, pool, poolSize, required);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!name)
-	{
-		return CELL_HTTP_ERROR_NO_STRING;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientAddHeader(CellHttpClientId clientId, vm::cptr<CellHttpHeader> header)
+error_code cellHttpClientDeleteHeader()
 {
-	cellHttp.todo("cellHttpClientAddHeader(clientId=0x%x, header=*0x%x)", clientId, header);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientDeleteHeader(CellHttpClientId clientId, vm::cptr<char> name)
+error_code cellHttpClientSetSslCallback()
 {
-	cellHttp.todo("cellHttpClientDeleteHeader(clientId=0x%x, name=%s)", clientId, name);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	return CELL_OK;
-}
-
-error_code cellHttpClientSetSslCallback(CellHttpClientId clientId, vm::ptr<CellHttpsSslCallback> cbfunc, vm::ptr<void> userArg)
-{
-	cellHttp.todo("cellHttpClientSetSslCallback(clientId=0x%x, cbfunc=*0x%x, userArg=*0x%x)", clientId, cbfunc, userArg);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetSslClientCertificate(CellHttpClientId clientId, vm::cptr<CellHttpsData> cert, vm::cptr<CellHttpsData> privKey)
+error_code cellHttpClientSetSslClientCertificate()
 {
-	cellHttp.todo("cellHttpClientSetSslClientCertificate(clientId=0x%x, cert=*0x%x, privKey=*0x%x)", clientId, cert, privKey);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!cert && privKey)
-	{
-		return CELL_HTTPS_ERROR_KEY_NEEDS_CERT;
-	}
-
-	if (cert && !privKey)
-	{
-		return CELL_HTTPS_ERROR_CERT_NEEDS_KEY;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpCreateTransaction(vm::ptr<CellHttpTransId> transId, CellHttpClientId clientId, vm::cptr<char> method, vm::cptr<CellHttpUri> uri)
+error_code cellHttpCreateTransaction()
 {
-	cellHttp.todo("cellHttpCreateTransaction(transId=*0x%x, clientId=0x%x, method=%s, uri=*0x%x)", transId, clientId, method, uri);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	//if (error_code error = syscall_sys_memory_get_page_attribute(clientId))
-	//{
-	//	return error;
-	//}
-
-	if (!uri || !uri->hostname || !uri->hostname[0])
-	{
-		return CELL_HTTP_ERROR_INVALID_URI;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpDestroyTransaction(CellHttpTransId transId)
+error_code cellHttpDestroyTransaction()
 {
-	cellHttp.todo("cellHttpDestroyTransaction(transId=0x%x)", transId);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpTransactionGetUri(CellHttpTransId transId, vm::ptr<CellHttpUri> uri, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
+error_code cellHttpTransactionGetUri()
 {
-	cellHttp.todo("cellHttpTransactionGetUri(transId=0x%x, uri=*0x%x, pool=*0x%x, poolSize=0x%x, required=*0x%x)", transId, uri, pool, poolSize, required);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpTransactionSetUri(CellHttpTransId transId, vm::cptr<CellHttpUri> uri) // TODO: more params?
+error_code cellHttpTransactionCloseConnection()
 {
-	cellHttp.todo("cellHttpTransactionSetUri(transId=0x%x, uri=*0x%x)", transId, uri);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
-	if (!uri || !uri->hostname || !uri->hostname[0])
-	{
-		return CELL_HTTP_ERROR_INVALID_URI;
-	}
-
-	if (uri->scheme && false) // TODO
-	{
-		return CELL_HTTP_ERROR_INVALID_URI;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpTransactionCloseConnection(CellHttpTransId transId)
+error_code cellHttpTransactionReleaseConnection()
 {
-	cellHttp.todo("cellHttpTransactionCloseConnection(transId=0x%x)", transId);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpTransactionReleaseConnection(CellHttpTransId transId, vm::ptr<s32> sid)
+error_code cellHttpTransactionAbortConnection()
 {
-	cellHttp.todo("cellHttpTransactionReleaseConnection(transId=0x%x, sid=*0x%x)", transId, sid);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
-	if (!sid)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpTransactionAbortConnection(CellHttpTransId transId)
+error_code cellHttpSendRequest()
 {
-	cellHttp.todo("cellHttpTransactionAbortConnection(transId=0x%x)", transId);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpSendRequest(CellHttpTransId transId, vm::cptr<char> buf, u32 size, vm::ptr<u32> sent)
+error_code cellHttpRequestSetContentLength()
 {
-	cellHttp.todo("cellHttpSendRequest(transId=0x%x, buf=*0x%x, size=0x%x, sent=*0x%x)", transId, buf, size, sent);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpRequestSetContentLength(CellHttpTransId transId, u64 totalSize)
+error_code cellHttpRequestGetContentLength()
 {
-	cellHttp.todo("cellHttpRequestSetContentLength(transId=0x%x, totalSize=0x%x)", transId, totalSize);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpRequestGetContentLength(CellHttpTransId transId, vm::ptr<u64> totalSize)
+error_code cellHttpRequestSetChunkedTransferStatus()
 {
-	cellHttp.todo("cellHttpRequestGetContentLength(transId=0x%x, totalSize=*0x%x)", transId, totalSize);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
-	if (!totalSize)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_NO_CONTENT_LENGTH;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpRequestSetChunkedTransferStatus(CellHttpTransId transId, b8 enable)
+error_code cellHttpRequestGetChunkedTransferStatus()
 {
-	cellHttp.todo("cellHttpRequestSetChunkedTransferStatus(transId=0x%x, enable=%d)", transId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpRequestGetChunkedTransferStatus(CellHttpTransId transId, vm::ptr<b8> enable)
+error_code cellHttpRequestGetAllHeaders()
 {
-	cellHttp.todo("cellHttpRequestGetChunkedTransferStatus(transId=0x%x, enable=*0x%x)", transId, enable);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
-	if (!enable)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpRequestGetAllHeaders(CellHttpTransId transId, vm::pptr<CellHttpHeader> headers, vm::ptr<u32> items, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
+error_code cellHttpRequestSetHeader()
 {
-	cellHttp.todo("cellHttpRequestGetAllHeaders(transId=0x%x, headers=*0x%x, items=*0x%x, pool=*0x%x, poolSize=0x%x, required=*0x%x)", transId, headers, items, pool, poolSize, required);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
-	if (!required && (!pool || !headers))
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpRequestSetHeader(CellHttpTransId transId, vm::cptr<CellHttpHeader> header)
+error_code cellHttpRequestGetHeader()
 {
-	cellHttp.todo("cellHttpRequestSetHeader(transId=0x%x, header=*0x%x)", transId, header);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
-	if (!header)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpRequestGetHeader(CellHttpTransId transId, vm::ptr<CellHttpHeader> header, vm::cptr<char> name, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
+error_code cellHttpRequestAddHeader()
 {
-	cellHttp.todo("cellHttpRequestGetHeader(transId=0x%x, header=*0x%x, name=%s, pool=*0x%x, poolSize=0x%x, required=*0x%x)", transId, header, name, pool, poolSize, required);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
-	if (!name)
-	{
-		return CELL_HTTP_ERROR_NO_STRING;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpRequestAddHeader(CellHttpTransId transId, vm::cptr<CellHttpHeader> header)
+error_code cellHttpRequestDeleteHeader()
 {
-	cellHttp.todo("cellHttpRequestAddHeader(transId=0x%x, header=*0x%x)", transId, header);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
-	if (!header)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpRequestDeleteHeader(CellHttpTransId transId, vm::cptr<char> name)
+error_code cellHttpRecvResponse()
 {
-	cellHttp.todo("cellHttpRequestDeleteHeader(transId=0x%x, name=%s)", transId, name);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
-	if (!name)
-	{
-		return CELL_HTTP_ERROR_NO_STRING;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpRecvResponse(CellHttpTransId transId, vm::ptr<char> buf, u32 size, vm::ptr<u32> recvd)
+error_code cellHttpResponseGetAllHeaders()
 {
-	cellHttp.todo("cellHttpRecvResponse(transId=0x%x, buf=*0x%x, size=0x%x, recvd=*0x%x)", transId, buf, size, recvd);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpResponseGetAllHeaders(CellHttpTransId transId, vm::pptr<CellHttpHeader> headers, vm::ptr<u32> items, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
+error_code cellHttpResponseGetHeader()
 {
-	cellHttp.todo("cellHttpResponseGetAllHeaders(transId=0x%x, headers=*0x%x, items=*0x%x, pool=*0x%x, poolSize=0x%x, required=*0x%x)", transId, headers, items, pool, poolSize, required);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
-	if (!required && (!pool || !headers))
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpResponseGetHeader(CellHttpTransId transId, vm::ptr<CellHttpHeader> header, vm::cptr<char> name, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
+error_code cellHttpResponseGetContentLength()
 {
-	cellHttp.todo("cellHttpResponseGetHeader(transId=0x%x, header=*0x%x, name=%s, pool=*0x%x, poolSize=0x%x, required=*0x%x)", transId, header, name, pool, poolSize, required);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
-	if (!name)
-	{
-		return CELL_HTTP_ERROR_NO_STRING;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpResponseGetContentLength(CellHttpTransId transId, vm::ptr<u64> length)
+error_code cellHttpResponseGetStatusCode()
 {
-	cellHttp.todo("cellHttpResponseGetContentLength(transId=0x%x, length=*0x%x)", transId, length);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
-	if (!length)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_NO_CONTENT_LENGTH;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpResponseGetStatusCode(CellHttpTransId transId, vm::ptr<s32> code)
+error_code cellHttpResponseGetStatusLine()
 {
-	cellHttp.todo("cellHttpResponseGetStatusCode(transId=0x%x, code=*0x%x)", transId, code);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
-	if (!code)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpResponseGetStatusLine(CellHttpTransId transId, vm::ptr<CellHttpStatusLine> status, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
+error_code cellHttpTransactionGetSslCipherName()
 {
-	cellHttp.todo("cellHttpResponseGetStatusLine(transId=0x%x, status=*0x%x, pool=*0x%x, poolSize=0x%x, required=*0x%x)", transId, status, pool, poolSize, required);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpTransactionGetSslCipherName(CellHttpTransId transId, vm::ptr<char> name, u32 size, vm::ptr<u32> required)
+error_code cellHttpTransactionGetSslCipherId()
 {
-	cellHttp.todo("cellHttpTransactionGetSslCipherName(transId=0x%x, name=*0x%x, size=0x%x, required=*0x%x)", transId, name, size, required);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpTransactionGetSslCipherId(CellHttpTransId transId, vm::ptr<s32> id)
+error_code cellHttpTransactionGetSslCipherVersion()
 {
-	cellHttp.todo("cellHttpTransactionGetSslCipherId(transId=0x%x, id=*0x%x)", transId, id);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpTransactionGetSslCipherVersion(CellHttpTransId transId, vm::ptr<char> version, u32 size, vm::ptr<u32> required)
+error_code cellHttpTransactionGetSslCipherBits()
 {
-	cellHttp.todo("cellHttpTransactionGetSslCipherVersion(transId=0x%x, version=*0x%x, size=0x%x, required=*0x%x)", transId, version, size, required);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpTransactionGetSslCipherBits(CellHttpTransId transId, vm::ptr<s32> effectiveBits, vm::ptr<s32> algorithmBits)
+error_code cellHttpTransactionGetSslCipherString()
 {
-	cellHttp.todo("cellHttpTransactionGetSslCipherBits(transId=0x%x, effectiveBits=*0x%x, effectiveBits=*0x%x)", transId, effectiveBits, algorithmBits);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpTransactionGetSslCipherString(CellHttpTransId transId, vm::ptr<char> buffer, u32 size)
+error_code cellHttpTransactionGetSslVersion()
 {
-	cellHttp.todo("cellHttpTransactionGetSslCipherString(transId=0x%x, buffer=*0x%x, size=0x%x)", transId, buffer, size);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpTransactionGetSslVersion(CellHttpTransId transId, vm::ptr<s32> version)
+error_code cellHttpTransactionGetSslId()
 {
-	cellHttp.todo("cellHttpTransactionGetSslVersion(transId=0x%x, version=*0x%x)", transId, version);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpTransactionGetSslId(CellHttpTransId transId, vm::pptr<void> id)
+error_code cellHttpClientSetMinSslVersion()
 {
-	cellHttp.todo("cellHttpTransactionGetSslId(transId=0x%x, id=*0x%x)", transId, id);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_TRANS;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetSslVersion(CellHttpClientId clientId, s32 version)
+error_code cellHttpClientGetMinSslVersion()
 {
-	cellHttp.todo("cellHttpClientSetSslVersion(clientId=0x%x, version=%d)", clientId, version);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientGetSslVersion(CellHttpClientId clientId, vm::ptr<s32> version)
+error_code cellHttpClientSetSslVersion()
 {
-	cellHttp.todo("cellHttpClientGetSslVersion(clientId=0x%x, version=*0x%x)", clientId, version);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
-	if (!version)
-	{
-		return CELL_HTTP_ERROR_NO_BUFFER;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetMinSslVersion(CellHttpClientId clientId, s32 version)
+error_code cellHttpClientGetSslVersion()
 {
-	cellHttp.todo("cellHttpClientSetMinSslVersion(clientId=0x%x, version=%d)", clientId, version);
-
-	if (version != CELL_SSL_VERSION_TLS1)
-	{
-		if (version != CELL_SSL_VERSION_SSL3)
-		{
-			return CELL_HTTP_ERROR_INVALID_VALUE;
-		}
-
-		version = 2; // TODO: this can't be right, can it ?
-	}
-
-	return cellHttpClientSetSslVersion(clientId, version);
-}
-
-error_code cellHttpClientGetMinSslVersion(CellHttpClientId clientId, vm::ptr<s32> version)
-{
-	cellHttp.todo("cellHttpClientGetMinSslVersion(clientId=0x%x, version=*0x%x)", clientId, version);
-
-	if (error_code error = cellHttpClientGetSslVersion(clientId, version))
-	{
-		return error;
-	}
-
-	if (*version == 2)
-	{
-		*version = CELL_SSL_VERSION_SSL3;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpClientSetSslIdDestroyCallback(CellHttpClientId clientId, vm::ptr<void> cbfunc, vm::ptr<void> userArg)
+error_code cellHttpClientSetSslIdDestroyCallback()
 {
-	cellHttp.todo("cellHttpClientSetSslIdDestroyCallback(clientId=0x%x, cbfunc=*0x%x, userArg=*0x%x)", clientId, cbfunc, userArg);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.initialized)
-	{
-		return CELL_HTTP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (false) // TODO
-	{
-		return CELL_HTTP_ERROR_BAD_CLIENT;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
 error_code cellHttpFlushCache()
 {
-	cellHttp.todo("cellHttpFlushCache()");
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.cache_initialized)
-	{
-		return CELL_HTTP_ERROR_CACHE_NOT_INITIALIZED;
-	}
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
 error_code cellHttpEndCache()
 {
-	cellHttp.todo("cellHttpEndCache()");
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.cache_initialized)
-	{
-		return CELL_HTTP_ERROR_CACHE_NOT_INITIALIZED;
-	}
-
-	man.cache_initialized = false;
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpInitCache(u32 unk)
+error_code cellHttpInitCache()
 {
-	cellHttp.todo("cellHttpInitCache(unk=0x%x)", unk);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (man.cache_initialized)
-	{
-		return CELL_HTTP_ERROR_CACHE_ALREADY_INITIALIZED;
-	}
-
-	man.cache_initialized = true;
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpEndExternalCache()
+error_code cellHttpGetCacheInfo()
 {
-	cellHttp.todo("cellHttpEndExternalCache()");
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.ext_cache_initialized)
-	{
-		return CELL_HTTP_ERROR_CACHE_NOT_INITIALIZED;
-	}
-
-	man.ext_cache_initialized = false;
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
-error_code cellHttpInitExternalCache(vm::ptr<void> buf, u32 size)
+error_code cellHttpGetMemoryInfo()
 {
-	cellHttp.todo("cellHttpInitExternalCache(buf=*0x%x, size=0x%x)", size);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (man.ext_cache_initialized)
-	{
-		return CELL_HTTP_ERROR_CACHE_ALREADY_INITIALIZED;
-	}
-
-	if (buf)
-	{
-		std::memset(buf.get_ptr(), 0, size);
-	}
-
-	if (size >= 512)
-	{
-		// TODO
-	}
-
-	man.ext_cache_initialized = true;
-	return CELL_OK;
-}
-
-error_code cellHttpFlushExternalCache()
-{
-	cellHttp.todo("cellHttpFlushExternalCache()");
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.ext_cache_initialized)
-	{
-		return CELL_HTTP_ERROR_CACHE_NOT_INITIALIZED;
-	}
-
-	return CELL_OK;
-}
-
-error_code cellHttpGetCacheInfo(vm::ptr<void> buf)
-{
-	cellHttp.todo("cellHttpGetCacheInfo(buf=*0x%x)", buf);
-
-	auto& man = g_fxo->get<http_manager>();
-	std::lock_guard lock(man.mtx);
-
-	if (!man.cache_initialized)
-	{
-		return CELL_HTTP_ERROR_CACHE_NOT_INITIALIZED;
-	}
-
-	return CELL_OK;
-}
-
-error_code cellHttpGetMemoryInfo(vm::ptr<u32> heapSize, vm::ptr<u32> param_2, vm::ptr<u32> param_3)
-{
-	cellHttp.todo("cellHttpGetMemoryInfo(heapSize=*0x%x, param_2=*0x%x, param_3=*0x%x)", heapSize, param_2, param_3);
-
-	if (heapSize)
-	{
-		//*heapSize = _sys_heap_get_total_free_size();
-	}
-
-	if (!param_2 && !param_3)
-	{
-		return CELL_OK;
-	}
-
-	if (param_2)
-	{
-		*param_2 = *param_3;
-	}
-
-	//*param_3 = _sys_heap_get_mallinfo();
-
+	UNIMPLEMENTED_FUNC(cellHttp);
 	return CELL_OK;
 }
 
@@ -3814,7 +759,6 @@ DECLARE(ppu_module_manager::cellHttp)("cellHttp", []()
 	REG_FUNC(cellHttp, cellHttpClientSetAuthenticationCallback);
 	REG_FUNC(cellHttp, cellHttpClientSetTransactionStateCallback);
 	REG_FUNC(cellHttp, cellHttpClientSetRedirectCallback);
-	REG_FUNC(cellHttp, cellHttpClientSetCacheStatus);
 
 	REG_FUNC(cellHttp, cellHttpClientSetProxy);
 	REG_FUNC(cellHttp, cellHttpClientGetProxy);
@@ -3877,7 +821,6 @@ DECLARE(ppu_module_manager::cellHttp)("cellHttp", []()
 	REG_FUNC(cellHttp, cellHttpCreateTransaction);
 	REG_FUNC(cellHttp, cellHttpDestroyTransaction);
 	REG_FUNC(cellHttp, cellHttpTransactionGetUri);
-	REG_FUNC(cellHttp, cellHttpTransactionSetUri);
 	REG_FUNC(cellHttp, cellHttpTransactionCloseConnection);
 	REG_FUNC(cellHttp, cellHttpTransactionReleaseConnection);
 	REG_FUNC(cellHttp, cellHttpTransactionAbortConnection);
@@ -3916,7 +859,6 @@ DECLARE(ppu_module_manager::cellHttp)("cellHttp", []()
 
 	REG_FUNC(cellHttp, cellHttpFlushCache);
 	REG_FUNC(cellHttp, cellHttpEndCache);
-	REG_FUNC(cellHttp, cellHttpEndExternalCache);
 	REG_FUNC(cellHttp, cellHttpInitCache);
 	REG_FUNC(cellHttp, cellHttpGetCacheInfo);
 	REG_FUNC(cellHttp, cellHttpGetMemoryInfo);
diff --git a/rpcs3/Emu/Cell/Modules/cellHttp.h b/rpcs3/Emu/Cell/Modules/cellHttp.h
index 3840498fd0..4df8e2b213 100644
--- a/rpcs3/Emu/Cell/Modules/cellHttp.h
+++ b/rpcs3/Emu/Cell/Modules/cellHttp.h
@@ -1,1214 +1,132 @@
 #pragma once
 
+
+
 // libHttp = 0x80710001 - 0x80710fff
 // libHttps = 0x80710a01 - 0x80710aff
 
-enum
-{
-	CELL_HTTP_MAX_USERNAME = 256,
-	CELL_HTTP_MAX_PASSWORD = 256,
-};
-
+// Error Codes - Http
 enum
 {
 	CELL_HTTP_NET_ERROR_TYPE_MASK = 0xffffff00,
-	CELL_HTTP_NET_ERROR_MASK      = 0xff,
-
-	CELL_HTTP_ERROR_NET_RESOLVER = 0x80710100,
-	CELL_HTTP_ERROR_NET_ABORT    = 0x80710200,
-	CELL_HTTP_ERROR_NET_OPTION   = 0x80710300,
-	CELL_HTTP_ERROR_NET_SOCKET   = 0x80710400,
-	CELL_HTTP_ERROR_NET_CONNECT  = 0x80710500,
-	CELL_HTTP_ERROR_NET_SEND     = 0x80710600,
-	CELL_HTTP_ERROR_NET_RECV     = 0x80710700,
-	CELL_HTTP_ERROR_NET_SELECT   = 0x80710800,
+	CELL_HTTP_NET_ERROR_MASK = 0xff,
 
 	// CELL_HTTP_NET_ERROR
 	// CELL_HTTP_IS_NET_RESOLVER_ERROR
-};
 
-// Error Codes - Http
-enum CellHttpError
-{
-	CELL_HTTP_ERROR_ALREADY_INITIALIZED       = 0x80710001,
-	CELL_HTTP_ERROR_NOT_INITIALIZED           = 0x80710002,
-	CELL_HTTP_ERROR_NO_MEMORY                 = 0x80710003,
-	CELL_HTTP_ERROR_NO_BUFFER                 = 0x80710004,
-	CELL_HTTP_ERROR_NO_STRING                 = 0x80710005,
-	CELL_HTTP_ERROR_INSUFFICIENT              = 0x80710006,
-	CELL_HTTP_ERROR_INVALID_URI               = 0x80710007,
-	CELL_HTTP_ERROR_INVALID_HEADER            = 0x80710008,
-	CELL_HTTP_ERROR_BAD_METHOD                = 0x80710009,
-	CELL_HTTP_ERROR_BAD_CLIENT                = 0x80710010,
-	CELL_HTTP_ERROR_BAD_TRANS                 = 0x80710011,
-	CELL_HTTP_ERROR_NO_CONNECTION             = 0x80710012,
-	CELL_HTTP_ERROR_NO_REQUEST_SENT           = 0x80710013,
-	CELL_HTTP_ERROR_ALREADY_BUILT             = 0x80710014,
-	CELL_HTTP_ERROR_ALREADY_SENT              = 0x80710015,
-	CELL_HTTP_ERROR_NO_HEADER                 = 0x80710016,
-	CELL_HTTP_ERROR_NO_CONTENT_LENGTH         = 0x80710017,
-	CELL_HTTP_ERROR_TOO_MANY_REDIRECTS        = 0x80710018,
-	CELL_HTTP_ERROR_TOO_MANY_AUTHS            = 0x80710019,
-	CELL_HTTP_ERROR_TRANS_NO_CONNECTION       = 0x80710020,
-	CELL_HTTP_ERROR_CB_FAILED                 = 0x80710021,
-	CELL_HTTP_ERROR_NOT_PIPED                 = 0x80710022,
-	CELL_HTTP_ERROR_OUT_OF_ORDER_PIPE         = 0x80710023,
-	CELL_HTTP_ERROR_TRANS_ABORTED             = 0x80710024,
-	CELL_HTTP_ERROR_BROKEN_PIPELINE           = 0x80710025,
-	CELL_HTTP_ERROR_UNAVAILABLE               = 0x80710026,
-	CELL_HTTP_ERROR_INVALID_VALUE             = 0x80710027,
-	CELL_HTTP_ERROR_CANNOT_AUTHENTICATE       = 0x80710028,
-	CELL_HTTP_ERROR_COOKIE_NOT_FOUND          = 0x80710041,
-	CELL_HTTP_ERROR_COOKIE_INVALID_DOMAIN     = 0x80710042,
+	CELL_HTTP_ERROR_ALREADY_INITIALIZED = 0x80710001,
+	CELL_HTTP_ERROR_NOT_INITIALIZED = 0x80710002,
+	CELL_HTTP_ERROR_NO_MEMORY = 0x80710003,
+	CELL_HTTP_ERROR_NO_BUFFER = 0x80710004,
+	CELL_HTTP_ERROR_NO_STRING = 0x80710005,
+	CELL_HTTP_ERROR_INSUFFICIENT = 0x80710006,
+	CELL_HTTP_ERROR_INVALID_URI = 0x80710007,
+	CELL_HTTP_ERROR_INVALID_HEADER = 0x80710008,
+	CELL_HTTP_ERROR_BAD_METHOD = 0x80710009,
+	CELL_HTTP_ERROR_BAD_CLIENT = 0x80710010,
+	CELL_HTTP_ERROR_BAD_TRANS = 0x80710011,
+	CELL_HTTP_ERROR_NO_CONNECTION = 0x80710012,
+	CELL_HTTP_ERROR_NO_REQUEST_SENT = 0x80710013,
+	CELL_HTTP_ERROR_ALREADY_BUILT = 0x80710014,
+	CELL_HTTP_ERROR_ALREADY_SENT = 0x80710015,
+	CELL_HTTP_ERROR_NO_HEADER = 0x80710016,
+	CELL_HTTP_ERROR_NO_CONTENT_LENGTH = 0x80710017,
+	CELL_HTTP_ERROR_TOO_MANY_REDIRECTS = 0x80710018,
+	CELL_HTTP_ERROR_TOO_MANY_AUTHS = 0x80710019,
+	CELL_HTTP_ERROR_TRANS_NO_CONNECTION = 0x80710020,
+	CELL_HTTP_ERROR_CB_FAILED = 0x80710021,
+	CELL_HTTP_ERROR_NOT_PIPED = 0x80710022,
+	CELL_HTTP_ERROR_OUT_OF_ORDER_PIPE = 0x80710023,
+	CELL_HTTP_ERROR_TRANS_ABORTED = 0x80710024,
+	CELL_HTTP_ERROR_BROKEN_PIPELINE = 0x80710025,
+	CELL_HTTP_ERROR_UNAVAILABLE = 0x80710026,
+	CELL_HTTP_ERROR_INVALID_VALUE = 0x80710027,
+	CELL_HTTP_ERROR_CANNOT_AUTHENTICATE = 0x80710028,
+	CELL_HTTP_ERROR_COOKIE_NOT_FOUND = 0x80710041,
+	CELL_HTTP_ERROR_COOKIE_INVALID_DOMAIN = 0x80710042,
 	CELL_HTTP_ERROR_CACHE_ALREADY_INITIALIZED = 0x80710043,
-	CELL_HTTP_ERROR_CACHE_NOT_INITIALIZED     = 0x80710044,
-	CELL_HTTP_ERROR_LINE_EXCEEDS_MAX          = 0x80710045,
-	CELL_HTTP_ERROR_REQUIRES_BASIC_AUTH       = 0x80710046,
+	CELL_HTTP_ERROR_CACHE_NOT_INITIALIZED = 0x80710044,
+	CELL_HTTP_ERROR_LINE_EXCEEDS_MAX = 0x80710045,
+	CELL_HTTP_ERROR_REQUIRES_BASIC_AUTH = 0x80710046,
 
-	CELL_HTTP_ERROR_UNKNOWN              = 0x80710051,
-	CELL_HTTP_ERROR_INTERNAL             = 0x80710052,
-	CELL_HTTP_ERROR_NONREMOVABLE         = 0x80710053,
-	CELL_HTTP_ERROR_BAD_CONN             = 0x80710054,
-	CELL_HTTP_ERROR_BAD_MAN              = 0x80710055,
-	CELL_HTTP_ERROR_NO_POOL              = 0x80710056,
-	CELL_HTTP_ERROR_NO_REQUEST           = 0x80710057,
-	CELL_HTTP_ERROR_LOCK_FAILED          = 0x80710058,
-	CELL_HTTP_ERROR_INVALID_DATA         = 0x80710059,
-	CELL_HTTP_ERROR_BROKEN_CHUNK         = 0x8071005a,
-	CELL_HTTP_ERROR_DECODE_SETUP         = 0x8071005b,
-	CELL_HTTP_ERROR_DECODE_STREAM        = 0x8071005c,
+	CELL_HTTP_ERROR_UNKNOWN = 0x80710051,
+	CELL_HTTP_ERROR_INTERNAL = 0x80710052,
+	CELL_HTTP_ERROR_NONREMOVABLE = 0x80710053,
+	CELL_HTTP_ERROR_BAD_CONN = 0x80710054,
+	CELL_HTTP_ERROR_BAD_MAN = 0x80710055,
+	CELL_HTTP_ERROR_NO_POOL = 0x80710056,
+	CELL_HTTP_ERROR_NO_REQUEST = 0x80710057,
+	CELL_HTTP_ERROR_LOCK_FAILED = 0x80710058,
+	CELL_HTTP_ERROR_INVALID_DATA = 0x80710059,
+	CELL_HTTP_ERROR_BROKEN_CHUNK = 0x8071005a,
+	CELL_HTTP_ERROR_DECODE_SETUP = 0x8071005b,
+	CELL_HTTP_ERROR_DECODE_STREAM = 0x8071005c,
 	CELL_HTTP_ERROR_BROKEN_DECODE_STREAM = 0x8071005d,
 
-	CELL_HTTP_ERROR_INVALID_DCACHE_PATH          = 0x80710060,
-	CELL_HTTP_ERROR_DCACHE_ALREADY_INITIALIZED   = 0x80710061,
-	CELL_HTTP_ERROR_DCACHE_NOT_INITIALIZED       = 0x80710062,
-	CELL_HTTP_ERROR_TOO_MANY_DCACHE_ENTRY        = 0x80710063,
-	CELL_HTTP_ERROR_DUP_DCACHE_ENTRY             = 0x80710064,
-	CELL_HTTP_ERROR_WRITE_DCACHE                 = 0x80710065,
-	CELL_HTTP_ERROR_READ_DCACHE                  = 0x80710066,
-	CELL_HTTP_ERROR_CACHE_TOO_LARGE              = 0x80710067,
-	CELL_HTTP_ERROR_INVALID_DCACHE_VERSION       = 0x80710068,
-	CELL_HTTP_ERROR_DCACHE_FILE_BROKEN           = 0x80710069,
-	CELL_HTTP_ERROR_DCACHE_EXCEEDS_MAX           = 0x8071006a,
-	CELL_HTTP_ERROR_DCACHE_BUSY                  = 0x8071006b,
-	CELL_HTTP_ERROR_DCACHE_INDEX_BROKEN          = 0x8071006c,
-	CELL_HTTP_ERROR_INVALID_DCACHE_INDEX_NODE    = 0x8071006d,
-	CELL_HTTP_ERROR_DCACHE_FILE_INCONSISTENCY    = 0x8071006e,
-	CELL_HTTP_ERROR_DCACHE_URI_TOO_LONG          = 0x8071006f,
-	CELL_HTTP_ERROR_READ_DCACHE_EOF              = 0x80710070,
-	CELL_HTTP_ERROR_END_OF_DCACHE_INDEX_NODE     = 0x80710071,
-	CELL_HTTP_ERROR_NO_CACHE_MEMORY              = 0x80710072,
-	CELL_HTTP_ERROR_DCACHE_BROKEN                = 0x80710073,
-	CELL_HTTP_ERROR_DCACHE_TOO_MANY_WRITE        = 0x80710074,
-	CELL_HTTP_ERROR_DCACHE_TOO_MANY_READ         = 0x80710075,
-	CELL_HTTP_ERROR_DCACHE_FATAL                 = 0x80710076,
-	CELL_HTTP_ERROR_DCACHE_UNSUPPORTED_FEATURE   = 0x80710077,
+	CELL_HTTP_ERROR_INVALID_DCACHE_PATH = 0x80710060,
+	CELL_HTTP_ERROR_DCACHE_ALREADY_INITIALIZED = 0x80710061,
+	CELL_HTTP_ERROR_DCACHE_NOT_INITIALIZED = 0x80710062,
+	CELL_HTTP_ERROR_TOO_MANY_DCACHE_ENTRY = 0x80710063,
+	CELL_HTTP_ERROR_DUP_DCACHE_ENTRY = 0x80710064,
+	CELL_HTTP_ERROR_WRITE_DCACHE = 0x80710065,
+	CELL_HTTP_ERROR_READ_DCACHE = 0x80710066,
+	CELL_HTTP_ERROR_CACHE_TOO_LARGE = 0x80710067,
+	CELL_HTTP_ERROR_INVALID_DCACHE_VERSION = 0x80710068,
+	CELL_HTTP_ERROR_DCACHE_FILE_BROKEN = 0x80710069,
+	CELL_HTTP_ERROR_DCACHE_EXCEEDS_MAX = 0x8071006a,
+	CELL_HTTP_ERROR_DCACHE_BUSY = 0x8071006b,
+	CELL_HTTP_ERROR_DCACHE_INDEX_BROKEN = 0x8071006c,
+	CELL_HTTP_ERROR_INVALID_DCACHE_INDEX_NODE = 0x8071006d,
+	CELL_HTTP_ERROR_DCACHE_FILE_INCONSISTENCY = 0x8071006e,
+	CELL_HTTP_ERROR_DCACHE_URI_TOO_LONG = 0x8071006f,
+	CELL_HTTP_ERROR_READ_DCACHE_EOF = 0x80710070,
+	CELL_HTTP_ERROR_END_OF_DCACHE_INDEX_NODE = 0x80710071,
+	CELL_HTTP_ERROR_NO_CACHE_MEMORY = 0x80710072,
+	CELL_HTTP_ERROR_DCACHE_BROKEN = 0x80710073,
+	CELL_HTTP_ERROR_DCACHE_TOO_MANY_WRITE = 0x80710074,
+	CELL_HTTP_ERROR_DCACHE_TOO_MANY_READ = 0x80710075,
+	CELL_HTTP_ERROR_DCACHE_FATAL = 0x80710076,
+	CELL_HTTP_ERROR_DCACHE_UNSUPPORTED_FEATURE = 0x80710077,
 	CELL_HTTP_ERROR_DCACHE_INDEX_IS_ALREADY_OPEN = 0x80710078,
-	CELL_HTTP_ERROR_DCACHE_INDEX_IS_OPENING      = 0x80710079,
-	CELL_HTTP_ERROR_DCACHE_UNKNOWN               = 0x80710080,
-	CELL_HTTP_ERROR_DCACHE_INDEX_IS_CLOSED       = 0x80710081,
-	CELL_HTTP_ERROR_DCACHE_ABORTED               = 0x80710082,
-	CELL_HTTP_ERROR_DCACHE_INDEX_IS_CLOSING      = 0x80710083,
-	CELL_HTTP_ERROR_DCACHE_UNKNOWN_INDEX_STATE   = 0x80710084,
+	CELL_HTTP_ERROR_DCACHE_INDEX_IS_OPENING = 0x80710079,
+	CELL_HTTP_ERROR_DCACHE_UNKNOWN = 0x80710080,
+	CELL_HTTP_ERROR_DCACHE_INDEX_IS_CLOSED = 0x80710081,
+	CELL_HTTP_ERROR_DCACHE_ABORTED = 0x80710082,
+	CELL_HTTP_ERROR_DCACHE_INDEX_IS_CLOSING = 0x80710083,
+	CELL_HTTP_ERROR_DCACHE_UNKNOWN_INDEX_STATE = 0x80710084,
 
-	CELL_HTTP_ERROR_NET_FIN             = 0x80710091,
+	CELL_HTTP_ERROR_NET_FIN = 0x80710091,
 	CELL_HTTP_ERROR_NET_CONNECT_TIMEOUT = 0x80710092,
-	CELL_HTTP_ERROR_NET_SELECT_TIMEOUT  = 0x80710093,
-	CELL_HTTP_ERROR_NET_SEND_TIMEOUT    = 0x80710094,
+	CELL_HTTP_ERROR_NET_SELECT_TIMEOUT = 0x80710093,
+	CELL_HTTP_ERROR_NET_SEND_TIMEOUT = 0x80710094,
+
+	CELL_HTTP_ERROR_NET_RESOLVER = 0x80710100,
+	CELL_HTTP_ERROR_NET_ABORT = 0x80710200,
+	CELL_HTTP_ERROR_NET_OPTION = 0x80710300,
+	CELL_HTTP_ERROR_NET_SOCKET = 0x80710400,
+	CELL_HTTP_ERROR_NET_CONNECT = 0x80710500,
+	CELL_HTTP_ERROR_NET_SEND = 0x80710600,
+	CELL_HTTP_ERROR_NET_RECV = 0x80710700,
+	CELL_HTTP_ERROR_NET_SELECT = 0x80710800,
 };
 
 // Error Codes - Https
-enum CellHttpsError : u32
+enum
 {
-	CELL_HTTPS_ERROR_CERTIFICATE_LOAD    = 0x80710a01,
-	CELL_HTTPS_ERROR_BAD_MEMORY          = 0x80710a02,
-	CELL_HTTPS_ERROR_CONTEXT_CREATION    = 0x80710a03,
+	CELL_HTTPS_ERROR_CERTIFICATE_LOAD = 0x80710a01,
+	CELL_HTTPS_ERROR_BAD_MEMORY = 0x80710a02,
+	CELL_HTTPS_ERROR_CONTEXT_CREATION = 0x80710a03,
 	CELL_HTTPS_ERROR_CONNECTION_CREATION = 0x80710a04,
-	CELL_HTTPS_ERROR_SOCKET_ASSOCIATION  = 0x80710a05,
-	CELL_HTTPS_ERROR_HANDSHAKE           = 0x80710a06,
-	CELL_HTTPS_ERROR_LOOKUP_CERTIFICATE  = 0x80710a07,
-	CELL_HTTPS_ERROR_NO_SSL              = 0x80710a08,
-	CELL_HTTPS_ERROR_KEY_LOAD            = 0x80710a09,
-	CELL_HTTPS_ERROR_CERT_KEY_MISMATCH   = 0x80710a0a,
-	CELL_HTTPS_ERROR_KEY_NEEDS_CERT      = 0x80710a0b,
-	CELL_HTTPS_ERROR_CERT_NEEDS_KEY      = 0x80710a0c,
-	CELL_HTTPS_ERROR_RETRY_CONNECTION    = 0x80710a0d,
-	CELL_HTTPS_ERROR_NET_SSL_CONNECT     = 0x80710b00,
-	CELL_HTTPS_ERROR_NET_SSL_SEND        = 0x80710c00,
-	CELL_HTTPS_ERROR_NET_SSL_RECV        = 0x80710d00,
-};
-
-enum CellHttpErrorNet
-{
-	CELL_HTTP_ERROR_NET_RESOLVER_NETDB_INTERNAL = 0x807101ff,
-	CELL_HTTP_ERROR_NET_RESOLVER_HOST_NOT_FOUND = 0x80710101,
-	CELL_HTTP_ERROR_NET_RESOLVER_TRY_AGAIN      = 0x80710102,
-	CELL_HTTP_ERROR_NET_RESOLVER_NO_RECOVERY    = 0x80710103,
-	CELL_HTTP_ERROR_NET_RESOLVER_NO_DATA        = 0x80710104,
-	CELL_HTTP_ERROR_NET_RESOLVER_NO_ADDRESS     = 0x80710104,
-
-	CELL_HTTP_ERROR_NET_ABORT_EPERM           = 0x80710201,
-	CELL_HTTP_ERROR_NET_ABORT_ENOENT          = 0x80710202,
-	CELL_HTTP_ERROR_NET_ABORT_ESRCH           = 0x80710203,
-	CELL_HTTP_ERROR_NET_ABORT_EINTR           = 0x80710204,
-	CELL_HTTP_ERROR_NET_ABORT_EIO             = 0x80710205,
-	CELL_HTTP_ERROR_NET_ABORT_ENXIO           = 0x80710206,
-	CELL_HTTP_ERROR_NET_ABORT_E2BIG           = 0x80710207,
-	CELL_HTTP_ERROR_NET_ABORT_ENOEXC          = 0x80710208,
-	CELL_HTTP_ERROR_NET_ABORT_EBADF           = 0x80710209,
-	CELL_HTTP_ERROR_NET_ABORT_ECHILD          = 0x8071020a,
-	CELL_HTTP_ERROR_NET_ABORT_EDEADLK         = 0x8071020b,
-	CELL_HTTP_ERROR_NET_ABORT_ENOMEM          = 0x8071020c,
-	CELL_HTTP_ERROR_NET_ABORT_EACCES          = 0x8071020d,
-	CELL_HTTP_ERROR_NET_ABORT_EFAULT          = 0x8071020e,
-	CELL_HTTP_ERROR_NET_ABORT_ENOTBLK         = 0x8071020f,
-	CELL_HTTP_ERROR_NET_ABORT_EBUSY           = 0x80710210,
-	CELL_HTTP_ERROR_NET_ABORT_EEXIST          = 0x80710211,
-	CELL_HTTP_ERROR_NET_ABORT_EXDEV           = 0x80710212,
-	CELL_HTTP_ERROR_NET_ABORT_ENODEV          = 0x80710213,
-	CELL_HTTP_ERROR_NET_ABORT_ENOTDIR         = 0x80710214,
-	CELL_HTTP_ERROR_NET_ABORT_EISDIR          = 0x80710215,
-	CELL_HTTP_ERROR_NET_ABORT_EINVAL          = 0x80710216,
-	CELL_HTTP_ERROR_NET_ABORT_ENFILE          = 0x80710217,
-	CELL_HTTP_ERROR_NET_ABORT_EMFILE          = 0x80710218,
-	CELL_HTTP_ERROR_NET_ABORT_ENOTTY          = 0x80710219,
-	CELL_HTTP_ERROR_NET_ABORT_ETXTBSY         = 0x8071021a,
-	CELL_HTTP_ERROR_NET_ABORT_EFBIG           = 0x8071021b,
-	CELL_HTTP_ERROR_NET_ABORT_ENOSPC          = 0x8071021c,
-	CELL_HTTP_ERROR_NET_ABORT_ESPIPE          = 0x8071021d,
-	CELL_HTTP_ERROR_NET_ABORT_EROFS           = 0x8071021e,
-	CELL_HTTP_ERROR_NET_ABORT_EMLINK          = 0x8071021f,
-	CELL_HTTP_ERROR_NET_ABORT_EPIPE           = 0x80710220,
-	CELL_HTTP_ERROR_NET_ABORT_EDOM            = 0x80710221,
-	CELL_HTTP_ERROR_NET_ABORT_ERANGE          = 0x80710222,
-	CELL_HTTP_ERROR_NET_ABORT_EAGAIN          = 0x80710223,
-	CELL_HTTP_ERROR_NET_ABORT_EWOULDBLOCK     = 0x80710223,
-	CELL_HTTP_ERROR_NET_ABORT_EINPROGRESS     = 0x80710224,
-	CELL_HTTP_ERROR_NET_ABORT_EALREADY        = 0x80710225,
-	CELL_HTTP_ERROR_NET_ABORT_ENOTSOCK        = 0x80710226,
-	CELL_HTTP_ERROR_NET_ABORT_EDESTADDRREQ    = 0x80710227,
-	CELL_HTTP_ERROR_NET_ABORT_EMSGSIZE        = 0x80710228,
-	CELL_HTTP_ERROR_NET_ABORT_EPROTOTYPE      = 0x80710229,
-	CELL_HTTP_ERROR_NET_ABORT_ENOPROTOOPT     = 0x8071022a,
-	CELL_HTTP_ERROR_NET_ABORT_EPROTONOSUPPORT = 0x8071022b,
-	CELL_HTTP_ERROR_NET_ABORT_ESOCKTNOSUPPORT = 0x8071022c,
-	CELL_HTTP_ERROR_NET_ABORT_EOPNOTSUPP      = 0x8071022d,
-	CELL_HTTP_ERROR_NET_ABORT_EPFNOSUPPORT    = 0x8071022e,
-	CELL_HTTP_ERROR_NET_ABORT_EAFNOSUPPORT    = 0x8071022f,
-	CELL_HTTP_ERROR_NET_ABORT_EADDRINUSE      = 0x80710230,
-	CELL_HTTP_ERROR_NET_ABORT_EADDRNOTAVAIL   = 0x80710231,
-	CELL_HTTP_ERROR_NET_ABORT_ENETDOWN        = 0x80710232,
-	CELL_HTTP_ERROR_NET_ABORT_ENETUNREACH     = 0x80710233,
-	CELL_HTTP_ERROR_NET_ABORT_ENETRESET       = 0x80710234,
-	CELL_HTTP_ERROR_NET_ABORT_ECONNABORTED    = 0x80710235,
-	CELL_HTTP_ERROR_NET_ABORT_ECONNRESET      = 0x80710236,
-	CELL_HTTP_ERROR_NET_ABORT_ENOBUFS         = 0x80710237,
-	CELL_HTTP_ERROR_NET_ABORT_EISCONN         = 0x80710238,
-	CELL_HTTP_ERROR_NET_ABORT_ENOTCONN        = 0x80710239,
-	CELL_HTTP_ERROR_NET_ABORT_ESHUTDOWN       = 0x8071023a,
-	CELL_HTTP_ERROR_NET_ABORT_ETOOMANYREFS    = 0x8071023b,
-	CELL_HTTP_ERROR_NET_ABORT_ETIMEDOUT       = 0x8071023c,
-	CELL_HTTP_ERROR_NET_ABORT_ECONNREFUSED    = 0x8071023d,
-	CELL_HTTP_ERROR_NET_ABORT_ELOOP           = 0x8071023e,
-	CELL_HTTP_ERROR_NET_ABORT_ENAMETOOLONG    = 0x8071023f,
-	CELL_HTTP_ERROR_NET_ABORT_EHOSTDOWN       = 0x80710240,
-	CELL_HTTP_ERROR_NET_ABORT_EHOSTUNREACH    = 0x80710241,
-	CELL_HTTP_ERROR_NET_ABORT_ENOTEMPTY       = 0x80710242,
-	CELL_HTTP_ERROR_NET_ABORT_EPROCLIM        = 0x80710243,
-	CELL_HTTP_ERROR_NET_ABORT_EUSERS          = 0x80710244,
-	CELL_HTTP_ERROR_NET_ABORT_EDQUOT          = 0x80710245,
-	CELL_HTTP_ERROR_NET_ABORT_ESTALE          = 0x80710246,
-	CELL_HTTP_ERROR_NET_ABORT_EREMOTE         = 0x80710247,
-	CELL_HTTP_ERROR_NET_ABORT_EBADRPC         = 0x80710248,
-	CELL_HTTP_ERROR_NET_ABORT_ERPCMISMATCH    = 0x80710249,
-	CELL_HTTP_ERROR_NET_ABORT_EPROGUNAVAIL    = 0x8071024a,
-	CELL_HTTP_ERROR_NET_ABORT_EPROGMISMATCH   = 0x8071024b,
-	CELL_HTTP_ERROR_NET_ABORT_EPROCUNAVAIL    = 0x8071024c,
-	CELL_HTTP_ERROR_NET_ABORT_ENOLCK          = 0x8071024d,
-	CELL_HTTP_ERROR_NET_ABORT_ENOSYS          = 0x8071024e,
-	CELL_HTTP_ERROR_NET_ABORT_EFTYPE          = 0x8071024f,
-	CELL_HTTP_ERROR_NET_ABORT_EAUTH           = 0x80710250,
-	CELL_HTTP_ERROR_NET_ABORT_ENEEDAUTH       = 0x80710251,
-	CELL_HTTP_ERROR_NET_ABORT_EIDRM           = 0x80710252,
-	CELL_HTTP_ERROR_NET_ABORT_ENOMSG          = 0x80710253,
-	CELL_HTTP_ERROR_NET_ABORT_EOVERFLOW       = 0x80710254,
-	CELL_HTTP_ERROR_NET_ABORT_EILSEQ          = 0x80710255,
-	CELL_HTTP_ERROR_NET_ABORT_ENOTSUP         = 0x80710256,
-	CELL_HTTP_ERROR_NET_ABORT_ECANCELED       = 0x80710257,
-	CELL_HTTP_ERROR_NET_ABORT_EBADMSG         = 0x80710258,
-	CELL_HTTP_ERROR_NET_ABORT_ENODATA         = 0x80710259,
-	CELL_HTTP_ERROR_NET_ABORT_ENOSR           = 0x8071025a,
-	CELL_HTTP_ERROR_NET_ABORT_ENOSTR          = 0x8071025b,
-	CELL_HTTP_ERROR_NET_ABORT_ETIME           = 0x8071025c,
-
-	CELL_HTTP_ERROR_NET_OPTION_EPERM           = 0x80710301,
-	CELL_HTTP_ERROR_NET_OPTION_ENOENT          = 0x80710302,
-	CELL_HTTP_ERROR_NET_OPTION_ESRCH           = 0x80710303,
-	CELL_HTTP_ERROR_NET_OPTION_EINTR           = 0x80710304,
-	CELL_HTTP_ERROR_NET_OPTION_EIO             = 0x80710305,
-	CELL_HTTP_ERROR_NET_OPTION_ENXIO           = 0x80710306,
-	CELL_HTTP_ERROR_NET_OPTION_E2BIG           = 0x80710307,
-	CELL_HTTP_ERROR_NET_OPTION_ENOEXC          = 0x80710308,
-	CELL_HTTP_ERROR_NET_OPTION_EBADF           = 0x80710309,
-	CELL_HTTP_ERROR_NET_OPTION_ECHILD          = 0x8071030a,
-	CELL_HTTP_ERROR_NET_OPTION_EDEADLK         = 0x8071030b,
-	CELL_HTTP_ERROR_NET_OPTION_ENOMEM          = 0x8071030c,
-	CELL_HTTP_ERROR_NET_OPTION_EACCES          = 0x8071030d,
-	CELL_HTTP_ERROR_NET_OPTION_EFAULT          = 0x8071030e,
-	CELL_HTTP_ERROR_NET_OPTION_ENOTBLK         = 0x8071030f,
-	CELL_HTTP_ERROR_NET_OPTION_EBUSY           = 0x80710310,
-	CELL_HTTP_ERROR_NET_OPTION_EEXIST          = 0x80710311,
-	CELL_HTTP_ERROR_NET_OPTION_EXDEV           = 0x80710312,
-	CELL_HTTP_ERROR_NET_OPTION_ENODEV          = 0x80710313,
-	CELL_HTTP_ERROR_NET_OPTION_ENOTDIR         = 0x80710314,
-	CELL_HTTP_ERROR_NET_OPTION_EISDIR          = 0x80710315,
-	CELL_HTTP_ERROR_NET_OPTION_EINVAL          = 0x80710316,
-	CELL_HTTP_ERROR_NET_OPTION_ENFILE          = 0x80710317,
-	CELL_HTTP_ERROR_NET_OPTION_EMFILE          = 0x80710318,
-	CELL_HTTP_ERROR_NET_OPTION_ENOTTY          = 0x80710319,
-	CELL_HTTP_ERROR_NET_OPTION_ETXTBSY         = 0x8071031a,
-	CELL_HTTP_ERROR_NET_OPTION_EFBIG           = 0x8071031b,
-	CELL_HTTP_ERROR_NET_OPTION_ENOSPC          = 0x8071031c,
-	CELL_HTTP_ERROR_NET_OPTION_ESPIPE          = 0x8071031d,
-	CELL_HTTP_ERROR_NET_OPTION_EROFS           = 0x8071031e,
-	CELL_HTTP_ERROR_NET_OPTION_EMLINK          = 0x8071031f,
-	CELL_HTTP_ERROR_NET_OPTION_EPIPE           = 0x80710320,
-	CELL_HTTP_ERROR_NET_OPTION_EDOM            = 0x80710321,
-	CELL_HTTP_ERROR_NET_OPTION_ERANGE          = 0x80710322,
-	CELL_HTTP_ERROR_NET_OPTION_EAGAIN          = 0x80710323,
-	CELL_HTTP_ERROR_NET_OPTION_EWOULDBLOCK     = 0x80710323,
-	CELL_HTTP_ERROR_NET_OPTION_EINPROGRESS     = 0x80710324,
-	CELL_HTTP_ERROR_NET_OPTION_EALREADY        = 0x80710325,
-	CELL_HTTP_ERROR_NET_OPTION_ENOTSOCK        = 0x80710326,
-	CELL_HTTP_ERROR_NET_OPTION_EDESTADDRREQ    = 0x80710327,
-	CELL_HTTP_ERROR_NET_OPTION_EMSGSIZE        = 0x80710328,
-	CELL_HTTP_ERROR_NET_OPTION_EPROTOTYPE      = 0x80710329,
-	CELL_HTTP_ERROR_NET_OPTION_ENOPROTOOPT     = 0x8071032a,
-	CELL_HTTP_ERROR_NET_OPTION_EPROTONOSUPPORT = 0x8071032b,
-	CELL_HTTP_ERROR_NET_OPTION_ESOCKTNOSUPPORT = 0x8071032c,
-	CELL_HTTP_ERROR_NET_OPTION_EOPNOTSUPP      = 0x8071032d,
-	CELL_HTTP_ERROR_NET_OPTION_EPFNOSUPPORT    = 0x8071032e,
-	CELL_HTTP_ERROR_NET_OPTION_EAFNOSUPPORT    = 0x8071032f,
-	CELL_HTTP_ERROR_NET_OPTION_EADDRINUSE      = 0x80710330,
-	CELL_HTTP_ERROR_NET_OPTION_EADDRNOTAVAIL   = 0x80710331,
-	CELL_HTTP_ERROR_NET_OPTION_ENETDOWN        = 0x80710332,
-	CELL_HTTP_ERROR_NET_OPTION_ENETUNREACH     = 0x80710333,
-	CELL_HTTP_ERROR_NET_OPTION_ENETRESET       = 0x80710334,
-	CELL_HTTP_ERROR_NET_OPTION_ECONNABORTED    = 0x80710335,
-	CELL_HTTP_ERROR_NET_OPTION_ECONNRESET      = 0x80710336,
-	CELL_HTTP_ERROR_NET_OPTION_ENOBUFS         = 0x80710337,
-	CELL_HTTP_ERROR_NET_OPTION_EISCONN         = 0x80710338,
-	CELL_HTTP_ERROR_NET_OPTION_ENOTCONN        = 0x80710339,
-	CELL_HTTP_ERROR_NET_OPTION_ESHUTDOWN       = 0x8071033a,
-	CELL_HTTP_ERROR_NET_OPTION_ETOOMANYREFS    = 0x8071033b,
-	CELL_HTTP_ERROR_NET_OPTION_ETIMEDOUT       = 0x8071033c,
-	CELL_HTTP_ERROR_NET_OPTION_ECONNREFUSED    = 0x8071033d,
-	CELL_HTTP_ERROR_NET_OPTION_ELOOP           = 0x8071033e,
-	CELL_HTTP_ERROR_NET_OPTION_ENAMETOOLONG    = 0x8071033f,
-	CELL_HTTP_ERROR_NET_OPTION_EHOSTDOWN       = 0x80710340,
-	CELL_HTTP_ERROR_NET_OPTION_EHOSTUNREACH    = 0x80710341,
-	CELL_HTTP_ERROR_NET_OPTION_ENOTEMPTY       = 0x80710342,
-	CELL_HTTP_ERROR_NET_OPTION_EPROCLIM        = 0x80710343,
-	CELL_HTTP_ERROR_NET_OPTION_EUSERS          = 0x80710344,
-	CELL_HTTP_ERROR_NET_OPTION_EDQUOT          = 0x80710345,
-	CELL_HTTP_ERROR_NET_OPTION_ESTALE          = 0x80710346,
-	CELL_HTTP_ERROR_NET_OPTION_EREMOTE         = 0x80710347,
-	CELL_HTTP_ERROR_NET_OPTION_EBADRPC         = 0x80710348,
-	CELL_HTTP_ERROR_NET_OPTION_ERPCMISMATCH    = 0x80710349,
-	CELL_HTTP_ERROR_NET_OPTION_EPROGUNAVAIL    = 0x8071034a,
-	CELL_HTTP_ERROR_NET_OPTION_EPROGMISMATCH   = 0x8071034b,
-	CELL_HTTP_ERROR_NET_OPTION_EPROCUNAVAIL    = 0x8071034c,
-	CELL_HTTP_ERROR_NET_OPTION_ENOLCK          = 0x8071034d,
-	CELL_HTTP_ERROR_NET_OPTION_ENOSYS          = 0x8071034e,
-	CELL_HTTP_ERROR_NET_OPTION_EFTYPE          = 0x8071034f,
-	CELL_HTTP_ERROR_NET_OPTION_EAUTH           = 0x80710350,
-	CELL_HTTP_ERROR_NET_OPTION_ENEEDAUTH       = 0x80710351,
-	CELL_HTTP_ERROR_NET_OPTION_EIDRM           = 0x80710352,
-	CELL_HTTP_ERROR_NET_OPTION_ENOMSG          = 0x80710353,
-	CELL_HTTP_ERROR_NET_OPTION_EOVERFLOW       = 0x80710354,
-	CELL_HTTP_ERROR_NET_OPTION_EILSEQ          = 0x80710355,
-	CELL_HTTP_ERROR_NET_OPTION_ENOTSUP         = 0x80710356,
-	CELL_HTTP_ERROR_NET_OPTION_ECANCELED       = 0x80710357,
-	CELL_HTTP_ERROR_NET_OPTION_EBADMSG         = 0x80710358,
-	CELL_HTTP_ERROR_NET_OPTION_ENODATA         = 0x80710359,
-	CELL_HTTP_ERROR_NET_OPTION_ENOSR           = 0x8071035a,
-	CELL_HTTP_ERROR_NET_OPTION_ENOSTR          = 0x8071035b,
-	CELL_HTTP_ERROR_NET_OPTION_ETIME           = 0x8071035c,
-
-	CELL_HTTP_ERROR_NET_SOCKET_EPERM           = 0x80710401,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOENT          = 0x80710402,
-	CELL_HTTP_ERROR_NET_SOCKET_ESRCH           = 0x80710403,
-	CELL_HTTP_ERROR_NET_SOCKET_EINTR           = 0x80710404,
-	CELL_HTTP_ERROR_NET_SOCKET_EIO             = 0x80710405,
-	CELL_HTTP_ERROR_NET_SOCKET_ENXIO           = 0x80710406,
-	CELL_HTTP_ERROR_NET_SOCKET_E2BIG           = 0x80710407,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOEXC          = 0x80710408,
-	CELL_HTTP_ERROR_NET_SOCKET_EBADF           = 0x80710409,
-	CELL_HTTP_ERROR_NET_SOCKET_ECHILD          = 0x8071040a,
-	CELL_HTTP_ERROR_NET_SOCKET_EDEADLK         = 0x8071040b,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOMEM          = 0x8071040c,
-	CELL_HTTP_ERROR_NET_SOCKET_EACCES          = 0x8071040d,
-	CELL_HTTP_ERROR_NET_SOCKET_EFAULT          = 0x8071040e,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOTBLK         = 0x8071040f,
-	CELL_HTTP_ERROR_NET_SOCKET_EBUSY           = 0x80710410,
-	CELL_HTTP_ERROR_NET_SOCKET_EEXIST          = 0x80710411,
-	CELL_HTTP_ERROR_NET_SOCKET_EXDEV           = 0x80710412,
-	CELL_HTTP_ERROR_NET_SOCKET_ENODEV          = 0x80710413,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOTDIR         = 0x80710414,
-	CELL_HTTP_ERROR_NET_SOCKET_EISDIR          = 0x80710415,
-	CELL_HTTP_ERROR_NET_SOCKET_EINVAL          = 0x80710416,
-	CELL_HTTP_ERROR_NET_SOCKET_ENFILE          = 0x80710417,
-	CELL_HTTP_ERROR_NET_SOCKET_EMFILE          = 0x80710418,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOTTY          = 0x80710419,
-	CELL_HTTP_ERROR_NET_SOCKET_ETXTBSY         = 0x8071041a,
-	CELL_HTTP_ERROR_NET_SOCKET_EFBIG           = 0x8071041b,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOSPC          = 0x8071041c,
-	CELL_HTTP_ERROR_NET_SOCKET_ESPIPE          = 0x8071041d,
-	CELL_HTTP_ERROR_NET_SOCKET_EROFS           = 0x8071041e,
-	CELL_HTTP_ERROR_NET_SOCKET_EMLINK          = 0x8071041f,
-	CELL_HTTP_ERROR_NET_SOCKET_EPIPE           = 0x80710420,
-	CELL_HTTP_ERROR_NET_SOCKET_EDOM            = 0x80710421,
-	CELL_HTTP_ERROR_NET_SOCKET_ERANGE          = 0x80710422,
-	CELL_HTTP_ERROR_NET_SOCKET_EAGAIN          = 0x80710423,
-	CELL_HTTP_ERROR_NET_SOCKET_EWOULDBLOCK     = 0x80710423,
-	CELL_HTTP_ERROR_NET_SOCKET_EINPROGRESS     = 0x80710424,
-	CELL_HTTP_ERROR_NET_SOCKET_EALREADY        = 0x80710425,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOTSOCK        = 0x80710426,
-	CELL_HTTP_ERROR_NET_SOCKET_EDESTADDRREQ    = 0x80710427,
-	CELL_HTTP_ERROR_NET_SOCKET_EMSGSIZE        = 0x80710428,
-	CELL_HTTP_ERROR_NET_SOCKET_EPROTOTYPE      = 0x80710429,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOPROTOOPT     = 0x8071042a,
-	CELL_HTTP_ERROR_NET_SOCKET_EPROTONOSUPPORT = 0x8071042b,
-	CELL_HTTP_ERROR_NET_SOCKET_ESOCKTNOSUPPORT = 0x8071042c,
-	CELL_HTTP_ERROR_NET_SOCKET_EOPNOTSUPP      = 0x8071042d,
-	CELL_HTTP_ERROR_NET_SOCKET_EPFNOSUPPORT    = 0x8071042e,
-	CELL_HTTP_ERROR_NET_SOCKET_EAFNOSUPPORT    = 0x8071042f,
-	CELL_HTTP_ERROR_NET_SOCKET_EADDRINUSE      = 0x80710430,
-	CELL_HTTP_ERROR_NET_SOCKET_EADDRNOTAVAIL   = 0x80710431,
-	CELL_HTTP_ERROR_NET_SOCKET_ENETDOWN        = 0x80710432,
-	CELL_HTTP_ERROR_NET_SOCKET_ENETUNREACH     = 0x80710433,
-	CELL_HTTP_ERROR_NET_SOCKET_ENETRESET       = 0x80710434,
-	CELL_HTTP_ERROR_NET_SOCKET_ECONNABORTED    = 0x80710435,
-	CELL_HTTP_ERROR_NET_SOCKET_ECONNRESET      = 0x80710436,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOBUFS         = 0x80710437,
-	CELL_HTTP_ERROR_NET_SOCKET_EISCONN         = 0x80710438,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOTCONN        = 0x80710439,
-	CELL_HTTP_ERROR_NET_SOCKET_ESHUTDOWN       = 0x8071043a,
-	CELL_HTTP_ERROR_NET_SOCKET_ETOOMANYREFS    = 0x8071043b,
-	CELL_HTTP_ERROR_NET_SOCKET_ETIMEDOUT       = 0x8071043c,
-	CELL_HTTP_ERROR_NET_SOCKET_ECONNREFUSED    = 0x8071043d,
-	CELL_HTTP_ERROR_NET_SOCKET_ELOOP           = 0x8071043e,
-	CELL_HTTP_ERROR_NET_SOCKET_ENAMETOOLONG    = 0x8071043f,
-	CELL_HTTP_ERROR_NET_SOCKET_EHOSTDOWN       = 0x80710440,
-	CELL_HTTP_ERROR_NET_SOCKET_EHOSTUNREACH    = 0x80710441,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOTEMPTY       = 0x80710442,
-	CELL_HTTP_ERROR_NET_SOCKET_EPROCLIM        = 0x80710443,
-	CELL_HTTP_ERROR_NET_SOCKET_EUSERS          = 0x80710444,
-	CELL_HTTP_ERROR_NET_SOCKET_EDQUOT          = 0x80710445,
-	CELL_HTTP_ERROR_NET_SOCKET_ESTALE          = 0x80710446,
-	CELL_HTTP_ERROR_NET_SOCKET_EREMOTE         = 0x80710447,
-	CELL_HTTP_ERROR_NET_SOCKET_EBADRPC         = 0x80710448,
-	CELL_HTTP_ERROR_NET_SOCKET_ERPCMISMATCH    = 0x80710449,
-	CELL_HTTP_ERROR_NET_SOCKET_EPROGUNAVAIL    = 0x8071044a,
-	CELL_HTTP_ERROR_NET_SOCKET_EPROGMISMATCH   = 0x8071044b,
-	CELL_HTTP_ERROR_NET_SOCKET_EPROCUNAVAIL    = 0x8071044c,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOLCK          = 0x8071044d,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOSYS          = 0x8071044e,
-	CELL_HTTP_ERROR_NET_SOCKET_EFTYPE          = 0x8071044f,
-	CELL_HTTP_ERROR_NET_SOCKET_EAUTH           = 0x80710450,
-	CELL_HTTP_ERROR_NET_SOCKET_ENEEDAUTH       = 0x80710451,
-	CELL_HTTP_ERROR_NET_SOCKET_EIDRM           = 0x80710452,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOMSG          = 0x80710453,
-	CELL_HTTP_ERROR_NET_SOCKET_EOVERFLOW       = 0x80710454,
-	CELL_HTTP_ERROR_NET_SOCKET_EILSEQ          = 0x80710455,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOTSUP         = 0x80710456,
-	CELL_HTTP_ERROR_NET_SOCKET_ECANCELED       = 0x80710457,
-	CELL_HTTP_ERROR_NET_SOCKET_EBADMSG         = 0x80710458,
-	CELL_HTTP_ERROR_NET_SOCKET_ENODATA         = 0x80710459,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOSR           = 0x8071045a,
-	CELL_HTTP_ERROR_NET_SOCKET_ENOSTR          = 0x8071045b,
-	CELL_HTTP_ERROR_NET_SOCKET_ETIME           = 0x8071045c,
-
-	CELL_HTTP_ERROR_NET_CONNECT_EPERM           = 0x80710501,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOENT          = 0x80710502,
-	CELL_HTTP_ERROR_NET_CONNECT_ESRCH           = 0x80710503,
-	CELL_HTTP_ERROR_NET_CONNECT_EINTR           = 0x80710504,
-	CELL_HTTP_ERROR_NET_CONNECT_EIO             = 0x80710505,
-	CELL_HTTP_ERROR_NET_CONNECT_ENXIO           = 0x80710506,
-	CELL_HTTP_ERROR_NET_CONNECT_E2BIG           = 0x80710507,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOEXC          = 0x80710508,
-	CELL_HTTP_ERROR_NET_CONNECT_EBADF           = 0x80710509,
-	CELL_HTTP_ERROR_NET_CONNECT_ECHILD          = 0x8071050a,
-	CELL_HTTP_ERROR_NET_CONNECT_EDEADLK         = 0x8071050b,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOMEM          = 0x8071050c,
-	CELL_HTTP_ERROR_NET_CONNECT_EACCES          = 0x8071050d,
-	CELL_HTTP_ERROR_NET_CONNECT_EFAULT          = 0x8071050e,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOTBLK         = 0x8071050f,
-	CELL_HTTP_ERROR_NET_CONNECT_EBUSY           = 0x80710510,
-	CELL_HTTP_ERROR_NET_CONNECT_EEXIST          = 0x80710511,
-	CELL_HTTP_ERROR_NET_CONNECT_EXDEV           = 0x80710512,
-	CELL_HTTP_ERROR_NET_CONNECT_ENODEV          = 0x80710513,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOTDIR         = 0x80710514,
-	CELL_HTTP_ERROR_NET_CONNECT_EISDIR          = 0x80710515,
-	CELL_HTTP_ERROR_NET_CONNECT_EINVAL          = 0x80710516,
-	CELL_HTTP_ERROR_NET_CONNECT_ENFILE          = 0x80710517,
-	CELL_HTTP_ERROR_NET_CONNECT_EMFILE          = 0x80710518,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOTTY          = 0x80710519,
-	CELL_HTTP_ERROR_NET_CONNECT_ETXTBSY         = 0x8071051a,
-	CELL_HTTP_ERROR_NET_CONNECT_EFBIG           = 0x8071051b,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOSPC          = 0x8071051c,
-	CELL_HTTP_ERROR_NET_CONNECT_ESPIPE          = 0x8071051d,
-	CELL_HTTP_ERROR_NET_CONNECT_EROFS           = 0x8071051e,
-	CELL_HTTP_ERROR_NET_CONNECT_EMLINK          = 0x8071051f,
-	CELL_HTTP_ERROR_NET_CONNECT_EPIPE           = 0x80710520,
-	CELL_HTTP_ERROR_NET_CONNECT_EDOM            = 0x80710521,
-	CELL_HTTP_ERROR_NET_CONNECT_ERANGE          = 0x80710522,
-	CELL_HTTP_ERROR_NET_CONNECT_EAGAIN          = 0x80710523,
-	CELL_HTTP_ERROR_NET_CONNECT_EWOULDBLOCK     = 0x80710523,
-	CELL_HTTP_ERROR_NET_CONNECT_EINPROGRESS     = 0x80710524,
-	CELL_HTTP_ERROR_NET_CONNECT_EALREADY        = 0x80710525,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOTSOCK        = 0x80710526,
-	CELL_HTTP_ERROR_NET_CONNECT_EDESTADDRREQ    = 0x80710527,
-	CELL_HTTP_ERROR_NET_CONNECT_EMSGSIZE        = 0x80710528,
-	CELL_HTTP_ERROR_NET_CONNECT_EPROTOTYPE      = 0x80710529,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOPROTOOPT     = 0x8071052a,
-	CELL_HTTP_ERROR_NET_CONNECT_EPROTONOSUPPORT = 0x8071052b,
-	CELL_HTTP_ERROR_NET_CONNECT_ESOCKTNOSUPPORT = 0x8071052c,
-	CELL_HTTP_ERROR_NET_CONNECT_EOPNOTSUPP      = 0x8071052d,
-	CELL_HTTP_ERROR_NET_CONNECT_EPFNOSUPPORT    = 0x8071052e,
-	CELL_HTTP_ERROR_NET_CONNECT_EAFNOSUPPORT    = 0x8071052f,
-	CELL_HTTP_ERROR_NET_CONNECT_EADDRINUSE      = 0x80710530,
-	CELL_HTTP_ERROR_NET_CONNECT_EADDRNOTAVAIL   = 0x80710531,
-	CELL_HTTP_ERROR_NET_CONNECT_ENETDOWN        = 0x80710532,
-	CELL_HTTP_ERROR_NET_CONNECT_ENETUNREACH     = 0x80710533,
-	CELL_HTTP_ERROR_NET_CONNECT_ENETRESET       = 0x80710534,
-	CELL_HTTP_ERROR_NET_CONNECT_ECONNABORTED    = 0x80710535,
-	CELL_HTTP_ERROR_NET_CONNECT_ECONNRESET      = 0x80710536,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOBUFS         = 0x80710537,
-	CELL_HTTP_ERROR_NET_CONNECT_EISCONN         = 0x80710538,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOTCONN        = 0x80710539,
-	CELL_HTTP_ERROR_NET_CONNECT_ESHUTDOWN       = 0x8071053a,
-	CELL_HTTP_ERROR_NET_CONNECT_ETOOMANYREFS    = 0x8071053b,
-	CELL_HTTP_ERROR_NET_CONNECT_ETIMEDOUT       = 0x8071053c,
-	CELL_HTTP_ERROR_NET_CONNECT_ECONNREFUSED    = 0x8071053d,
-	CELL_HTTP_ERROR_NET_CONNECT_ELOOP           = 0x8071053e,
-	CELL_HTTP_ERROR_NET_CONNECT_ENAMETOOLONG    = 0x8071053f,
-	CELL_HTTP_ERROR_NET_CONNECT_EHOSTDOWN       = 0x80710540,
-	CELL_HTTP_ERROR_NET_CONNECT_EHOSTUNREACH    = 0x80710541,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOTEMPTY       = 0x80710542,
-	CELL_HTTP_ERROR_NET_CONNECT_EPROCLIM        = 0x80710543,
-	CELL_HTTP_ERROR_NET_CONNECT_EUSERS          = 0x80710544,
-	CELL_HTTP_ERROR_NET_CONNECT_EDQUOT          = 0x80710545,
-	CELL_HTTP_ERROR_NET_CONNECT_ESTALE          = 0x80710546,
-	CELL_HTTP_ERROR_NET_CONNECT_EREMOTE         = 0x80710547,
-	CELL_HTTP_ERROR_NET_CONNECT_EBADRPC         = 0x80710548,
-	CELL_HTTP_ERROR_NET_CONNECT_ERPCMISMATCH    = 0x80710549,
-	CELL_HTTP_ERROR_NET_CONNECT_EPROGUNAVAIL    = 0x8071054a,
-	CELL_HTTP_ERROR_NET_CONNECT_EPROGMISMATCH   = 0x8071054b,
-	CELL_HTTP_ERROR_NET_CONNECT_EPROCUNAVAIL    = 0x8071054c,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOLCK          = 0x8071054d,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOSYS          = 0x8071054e,
-	CELL_HTTP_ERROR_NET_CONNECT_EFTYPE          = 0x8071054f,
-	CELL_HTTP_ERROR_NET_CONNECT_EAUTH           = 0x80710550,
-	CELL_HTTP_ERROR_NET_CONNECT_ENEEDAUTH       = 0x80710551,
-	CELL_HTTP_ERROR_NET_CONNECT_EIDRM           = 0x80710552,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOMSG          = 0x80710553,
-	CELL_HTTP_ERROR_NET_CONNECT_EOVERFLOW       = 0x80710554,
-	CELL_HTTP_ERROR_NET_CONNECT_EILSEQ          = 0x80710555,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOTSUP         = 0x80710556,
-	CELL_HTTP_ERROR_NET_CONNECT_ECANCELED       = 0x80710557,
-	CELL_HTTP_ERROR_NET_CONNECT_EBADMSG         = 0x80710558,
-	CELL_HTTP_ERROR_NET_CONNECT_ENODATA         = 0x80710559,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOSR           = 0x8071055a,
-	CELL_HTTP_ERROR_NET_CONNECT_ENOSTR          = 0x8071055b,
-	CELL_HTTP_ERROR_NET_CONNECT_ETIME           = 0x8071055c,
-
-	CELL_HTTP_ERROR_NET_SEND_EPERM           = 0x80710601,
-	CELL_HTTP_ERROR_NET_SEND_ENOENT          = 0x80710602,
-	CELL_HTTP_ERROR_NET_SEND_ESRCH           = 0x80710603,
-	CELL_HTTP_ERROR_NET_SEND_EINTR           = 0x80710604,
-	CELL_HTTP_ERROR_NET_SEND_EIO             = 0x80710605,
-	CELL_HTTP_ERROR_NET_SEND_ENXIO           = 0x80710606,
-	CELL_HTTP_ERROR_NET_SEND_E2BIG           = 0x80710607,
-	CELL_HTTP_ERROR_NET_SEND_ENOEXC          = 0x80710608,
-	CELL_HTTP_ERROR_NET_SEND_EBADF           = 0x80710609,
-	CELL_HTTP_ERROR_NET_SEND_ECHILD          = 0x8071060a,
-	CELL_HTTP_ERROR_NET_SEND_EDEADLK         = 0x8071060b,
-	CELL_HTTP_ERROR_NET_SEND_ENOMEM          = 0x8071060c,
-	CELL_HTTP_ERROR_NET_SEND_EACCES          = 0x8071060d,
-	CELL_HTTP_ERROR_NET_SEND_EFAULT          = 0x8071060e,
-	CELL_HTTP_ERROR_NET_SEND_ENOTBLK         = 0x8071060f,
-	CELL_HTTP_ERROR_NET_SEND_EBUSY           = 0x80710610,
-	CELL_HTTP_ERROR_NET_SEND_EEXIST          = 0x80710611,
-	CELL_HTTP_ERROR_NET_SEND_EXDEV           = 0x80710612,
-	CELL_HTTP_ERROR_NET_SEND_ENODEV          = 0x80710613,
-	CELL_HTTP_ERROR_NET_SEND_ENOTDIR         = 0x80710614,
-	CELL_HTTP_ERROR_NET_SEND_EISDIR          = 0x80710615,
-	CELL_HTTP_ERROR_NET_SEND_EINVAL          = 0x80710616,
-	CELL_HTTP_ERROR_NET_SEND_ENFILE          = 0x80710617,
-	CELL_HTTP_ERROR_NET_SEND_EMFILE          = 0x80710618,
-	CELL_HTTP_ERROR_NET_SEND_ENOTTY          = 0x80710619,
-	CELL_HTTP_ERROR_NET_SEND_ETXTBSY         = 0x8071061a,
-	CELL_HTTP_ERROR_NET_SEND_EFBIG           = 0x8071061b,
-	CELL_HTTP_ERROR_NET_SEND_ENOSPC          = 0x8071061c,
-	CELL_HTTP_ERROR_NET_SEND_ESPIPE          = 0x8071061d,
-	CELL_HTTP_ERROR_NET_SEND_EROFS           = 0x8071061e,
-	CELL_HTTP_ERROR_NET_SEND_EMLINK          = 0x8071061f,
-	CELL_HTTP_ERROR_NET_SEND_EPIPE           = 0x80710620,
-	CELL_HTTP_ERROR_NET_SEND_EDOM            = 0x80710621,
-	CELL_HTTP_ERROR_NET_SEND_ERANGE          = 0x80710622,
-	CELL_HTTP_ERROR_NET_SEND_EAGAIN          = 0x80710623,
-	CELL_HTTP_ERROR_NET_SEND_EWOULDBLOCK     = 0x80710623,
-	CELL_HTTP_ERROR_NET_SEND_EINPROGRESS     = 0x80710624,
-	CELL_HTTP_ERROR_NET_SEND_EALREADY        = 0x80710625,
-	CELL_HTTP_ERROR_NET_SEND_ENOTSOCK        = 0x80710626,
-	CELL_HTTP_ERROR_NET_SEND_EDESTADDRREQ    = 0x80710627,
-	CELL_HTTP_ERROR_NET_SEND_EMSGSIZE        = 0x80710628,
-	CELL_HTTP_ERROR_NET_SEND_EPROTOTYPE      = 0x80710629,
-	CELL_HTTP_ERROR_NET_SEND_ENOPROTOOPT     = 0x8071062a,
-	CELL_HTTP_ERROR_NET_SEND_EPROTONOSUPPORT = 0x8071062b,
-	CELL_HTTP_ERROR_NET_SEND_ESOCKTNOSUPPORT = 0x8071062c,
-	CELL_HTTP_ERROR_NET_SEND_EOPNOTSUPP      = 0x8071062d,
-	CELL_HTTP_ERROR_NET_SEND_EPFNOSUPPORT    = 0x8071062e,
-	CELL_HTTP_ERROR_NET_SEND_EAFNOSUPPORT    = 0x8071062f,
-	CELL_HTTP_ERROR_NET_SEND_EADDRINUSE      = 0x80710630,
-	CELL_HTTP_ERROR_NET_SEND_EADDRNOTAVAIL   = 0x80710631,
-	CELL_HTTP_ERROR_NET_SEND_ENETDOWN        = 0x80710632,
-	CELL_HTTP_ERROR_NET_SEND_ENETUNREACH     = 0x80710633,
-	CELL_HTTP_ERROR_NET_SEND_ENETRESET       = 0x80710634,
-	CELL_HTTP_ERROR_NET_SEND_ECONNABORTED    = 0x80710635,
-	CELL_HTTP_ERROR_NET_SEND_ECONNRESET      = 0x80710636,
-	CELL_HTTP_ERROR_NET_SEND_ENOBUFS         = 0x80710637,
-	CELL_HTTP_ERROR_NET_SEND_EISCONN         = 0x80710638,
-	CELL_HTTP_ERROR_NET_SEND_ENOTCONN        = 0x80710639,
-	CELL_HTTP_ERROR_NET_SEND_ESHUTDOWN       = 0x8071063a,
-	CELL_HTTP_ERROR_NET_SEND_ETOOMANYREFS    = 0x8071063b,
-	CELL_HTTP_ERROR_NET_SEND_ETIMEDOUT       = 0x8071063c,
-	CELL_HTTP_ERROR_NET_SEND_ECONNREFUSED    = 0x8071063d,
-	CELL_HTTP_ERROR_NET_SEND_ELOOP           = 0x8071063e,
-	CELL_HTTP_ERROR_NET_SEND_ENAMETOOLONG    = 0x8071063f,
-	CELL_HTTP_ERROR_NET_SEND_EHOSTDOWN       = 0x80710640,
-	CELL_HTTP_ERROR_NET_SEND_EHOSTUNREACH    = 0x80710641,
-	CELL_HTTP_ERROR_NET_SEND_ENOTEMPTY       = 0x80710642,
-	CELL_HTTP_ERROR_NET_SEND_EPROCLIM        = 0x80710643,
-	CELL_HTTP_ERROR_NET_SEND_EUSERS          = 0x80710644,
-	CELL_HTTP_ERROR_NET_SEND_EDQUOT          = 0x80710645,
-	CELL_HTTP_ERROR_NET_SEND_ESTALE          = 0x80710646,
-	CELL_HTTP_ERROR_NET_SEND_EREMOTE         = 0x80710647,
-	CELL_HTTP_ERROR_NET_SEND_EBADRPC         = 0x80710648,
-	CELL_HTTP_ERROR_NET_SEND_ERPCMISMATCH    = 0x80710649,
-	CELL_HTTP_ERROR_NET_SEND_EPROGUNAVAIL    = 0x8071064a,
-	CELL_HTTP_ERROR_NET_SEND_EPROGMISMATCH   = 0x8071064b,
-	CELL_HTTP_ERROR_NET_SEND_EPROCUNAVAIL    = 0x8071064c,
-	CELL_HTTP_ERROR_NET_SEND_ENOLCK          = 0x8071064d,
-	CELL_HTTP_ERROR_NET_SEND_ENOSYS          = 0x8071064e,
-	CELL_HTTP_ERROR_NET_SEND_EFTYPE          = 0x8071064f,
-	CELL_HTTP_ERROR_NET_SEND_EAUTH           = 0x80710650,
-	CELL_HTTP_ERROR_NET_SEND_ENEEDAUTH       = 0x80710651,
-	CELL_HTTP_ERROR_NET_SEND_EIDRM           = 0x80710652,
-	CELL_HTTP_ERROR_NET_SEND_ENOMSG          = 0x80710653,
-	CELL_HTTP_ERROR_NET_SEND_EOVERFLOW       = 0x80710654,
-	CELL_HTTP_ERROR_NET_SEND_EILSEQ          = 0x80710655,
-	CELL_HTTP_ERROR_NET_SEND_ENOTSUP         = 0x80710656,
-	CELL_HTTP_ERROR_NET_SEND_ECANCELED       = 0x80710657,
-	CELL_HTTP_ERROR_NET_SEND_EBADMSG         = 0x80710658,
-	CELL_HTTP_ERROR_NET_SEND_ENODATA         = 0x80710659,
-	CELL_HTTP_ERROR_NET_SEND_ENOSR           = 0x8071065a,
-	CELL_HTTP_ERROR_NET_SEND_ENOSTR          = 0x8071065b,
-	CELL_HTTP_ERROR_NET_SEND_ETIME           = 0x8071065c,
-
-	CELL_HTTP_ERROR_NET_RECV_EPERM           = 0x80710701,
-	CELL_HTTP_ERROR_NET_RECV_ENOENT          = 0x80710702,
-	CELL_HTTP_ERROR_NET_RECV_ESRCH           = 0x80710703,
-	CELL_HTTP_ERROR_NET_RECV_EINTR           = 0x80710704,
-	CELL_HTTP_ERROR_NET_RECV_EIO             = 0x80710705,
-	CELL_HTTP_ERROR_NET_RECV_ENXIO           = 0x80710706,
-	CELL_HTTP_ERROR_NET_RECV_E2BIG           = 0x80710707,
-	CELL_HTTP_ERROR_NET_RECV_ENOEXC          = 0x80710708,
-	CELL_HTTP_ERROR_NET_RECV_EBADF           = 0x80710709,
-	CELL_HTTP_ERROR_NET_RECV_ECHILD          = 0x8071070a,
-	CELL_HTTP_ERROR_NET_RECV_EDEADLK         = 0x8071070b,
-	CELL_HTTP_ERROR_NET_RECV_ENOMEM          = 0x8071070c,
-	CELL_HTTP_ERROR_NET_RECV_EACCES          = 0x8071070d,
-	CELL_HTTP_ERROR_NET_RECV_EFAULT          = 0x8071070e,
-	CELL_HTTP_ERROR_NET_RECV_ENOTBLK         = 0x8071070f,
-	CELL_HTTP_ERROR_NET_RECV_EBUSY           = 0x80710710,
-	CELL_HTTP_ERROR_NET_RECV_EEXIST          = 0x80710711,
-	CELL_HTTP_ERROR_NET_RECV_EXDEV           = 0x80710712,
-	CELL_HTTP_ERROR_NET_RECV_ENODEV          = 0x80710713,
-	CELL_HTTP_ERROR_NET_RECV_ENOTDIR         = 0x80710714,
-	CELL_HTTP_ERROR_NET_RECV_EISDIR          = 0x80710715,
-	CELL_HTTP_ERROR_NET_RECV_EINVAL          = 0x80710716,
-	CELL_HTTP_ERROR_NET_RECV_ENFILE          = 0x80710717,
-	CELL_HTTP_ERROR_NET_RECV_EMFILE          = 0x80710718,
-	CELL_HTTP_ERROR_NET_RECV_ENOTTY          = 0x80710719,
-	CELL_HTTP_ERROR_NET_RECV_ETXTBSY         = 0x8071071a,
-	CELL_HTTP_ERROR_NET_RECV_EFBIG           = 0x8071071b,
-	CELL_HTTP_ERROR_NET_RECV_ENOSPC          = 0x8071071c,
-	CELL_HTTP_ERROR_NET_RECV_ESPIPE          = 0x8071071d,
-	CELL_HTTP_ERROR_NET_RECV_EROFS           = 0x8071071e,
-	CELL_HTTP_ERROR_NET_RECV_EMLINK          = 0x8071071f,
-	CELL_HTTP_ERROR_NET_RECV_EPIPE           = 0x80710720,
-	CELL_HTTP_ERROR_NET_RECV_EDOM            = 0x80710721,
-	CELL_HTTP_ERROR_NET_RECV_ERANGE          = 0x80710722,
-	CELL_HTTP_ERROR_NET_RECV_EAGAIN          = 0x80710723,
-	CELL_HTTP_ERROR_NET_RECV_EWOULDBLOCK     = 0x80710723,
-	CELL_HTTP_ERROR_NET_RECV_EINPROGRESS     = 0x80710724,
-	CELL_HTTP_ERROR_NET_RECV_EALREADY        = 0x80710725,
-	CELL_HTTP_ERROR_NET_RECV_ENOTSOCK        = 0x80710726,
-	CELL_HTTP_ERROR_NET_RECV_EDESTADDRREQ    = 0x80710727,
-	CELL_HTTP_ERROR_NET_RECV_EMSGSIZE        = 0x80710728,
-	CELL_HTTP_ERROR_NET_RECV_EPROTOTYPE      = 0x80710729,
-	CELL_HTTP_ERROR_NET_RECV_ENOPROTOOPT     = 0x8071072a,
-	CELL_HTTP_ERROR_NET_RECV_EPROTONOSUPPORT = 0x8071072b,
-	CELL_HTTP_ERROR_NET_RECV_ESOCKTNOSUPPORT = 0x8071072c,
-	CELL_HTTP_ERROR_NET_RECV_EOPNOTSUPP      = 0x8071072d,
-	CELL_HTTP_ERROR_NET_RECV_EPFNOSUPPORT    = 0x8071072e,
-	CELL_HTTP_ERROR_NET_RECV_EAFNOSUPPORT    = 0x8071072f,
-	CELL_HTTP_ERROR_NET_RECV_EADDRINUSE      = 0x80710730,
-	CELL_HTTP_ERROR_NET_RECV_EADDRNOTAVAIL   = 0x80710731,
-	CELL_HTTP_ERROR_NET_RECV_ENETDOWN        = 0x80710732,
-	CELL_HTTP_ERROR_NET_RECV_ENETUNREACH     = 0x80710733,
-	CELL_HTTP_ERROR_NET_RECV_ENETRESET       = 0x80710734,
-	CELL_HTTP_ERROR_NET_RECV_ECONNABORTED    = 0x80710735,
-	CELL_HTTP_ERROR_NET_RECV_ECONNRESET      = 0x80710736,
-	CELL_HTTP_ERROR_NET_RECV_ENOBUFS         = 0x80710737,
-	CELL_HTTP_ERROR_NET_RECV_EISCONN         = 0x80710738,
-	CELL_HTTP_ERROR_NET_RECV_ENOTCONN        = 0x80710739,
-	CELL_HTTP_ERROR_NET_RECV_ESHUTDOWN       = 0x8071073a,
-	CELL_HTTP_ERROR_NET_RECV_ETOOMANYREFS    = 0x8071073b,
-	CELL_HTTP_ERROR_NET_RECV_ETIMEDOUT       = 0x8071073c,
-	CELL_HTTP_ERROR_NET_RECV_ECONNREFUSED    = 0x8071073d,
-	CELL_HTTP_ERROR_NET_RECV_ELOOP           = 0x8071073e,
-	CELL_HTTP_ERROR_NET_RECV_ENAMETOOLONG    = 0x8071073f,
-	CELL_HTTP_ERROR_NET_RECV_EHOSTDOWN       = 0x80710740,
-	CELL_HTTP_ERROR_NET_RECV_EHOSTUNREACH    = 0x80710741,
-	CELL_HTTP_ERROR_NET_RECV_ENOTEMPTY       = 0x80710742,
-	CELL_HTTP_ERROR_NET_RECV_EPROCLIM        = 0x80710743,
-	CELL_HTTP_ERROR_NET_RECV_EUSERS          = 0x80710744,
-	CELL_HTTP_ERROR_NET_RECV_EDQUOT          = 0x80710745,
-	CELL_HTTP_ERROR_NET_RECV_ESTALE          = 0x80710746,
-	CELL_HTTP_ERROR_NET_RECV_EREMOTE         = 0x80710747,
-	CELL_HTTP_ERROR_NET_RECV_EBADRPC         = 0x80710748,
-	CELL_HTTP_ERROR_NET_RECV_ERPCMISMATCH    = 0x80710749,
-	CELL_HTTP_ERROR_NET_RECV_EPROGUNAVAIL    = 0x8071074a,
-	CELL_HTTP_ERROR_NET_RECV_EPROGMISMATCH   = 0x8071074b,
-	CELL_HTTP_ERROR_NET_RECV_EPROCUNAVAIL    = 0x8071074c,
-	CELL_HTTP_ERROR_NET_RECV_ENOLCK          = 0x8071074d,
-	CELL_HTTP_ERROR_NET_RECV_ENOSYS          = 0x8071074e,
-	CELL_HTTP_ERROR_NET_RECV_EFTYPE          = 0x8071074f,
-	CELL_HTTP_ERROR_NET_RECV_EAUTH           = 0x80710750,
-	CELL_HTTP_ERROR_NET_RECV_ENEEDAUTH       = 0x80710751,
-	CELL_HTTP_ERROR_NET_RECV_EIDRM           = 0x80710752,
-	CELL_HTTP_ERROR_NET_RECV_ENOMSG          = 0x80710753,
-	CELL_HTTP_ERROR_NET_RECV_EOVERFLOW       = 0x80710754,
-	CELL_HTTP_ERROR_NET_RECV_EILSEQ          = 0x80710755,
-	CELL_HTTP_ERROR_NET_RECV_ENOTSUP         = 0x80710756,
-	CELL_HTTP_ERROR_NET_RECV_ECANCELED       = 0x80710757,
-	CELL_HTTP_ERROR_NET_RECV_EBADMSG         = 0x80710758,
-	CELL_HTTP_ERROR_NET_RECV_ENODATA         = 0x80710759,
-	CELL_HTTP_ERROR_NET_RECV_ENOSR           = 0x8071075a,
-	CELL_HTTP_ERROR_NET_RECV_ENOSTR          = 0x8071075b,
-	CELL_HTTP_ERROR_NET_RECV_ETIME           = 0x8071075c,
-
-	CELL_HTTP_ERROR_NET_SELECT_EPERM           = 0x80710801,
-	CELL_HTTP_ERROR_NET_SELECT_ENOENT          = 0x80710802,
-	CELL_HTTP_ERROR_NET_SELECT_ESRCH           = 0x80710803,
-	CELL_HTTP_ERROR_NET_SELECT_EINTR           = 0x80710804,
-	CELL_HTTP_ERROR_NET_SELECT_EIO             = 0x80710805,
-	CELL_HTTP_ERROR_NET_SELECT_ENXIO           = 0x80710806,
-	CELL_HTTP_ERROR_NET_SELECT_E2BIG           = 0x80710807,
-	CELL_HTTP_ERROR_NET_SELECT_ENOEXC          = 0x80710808,
-	CELL_HTTP_ERROR_NET_SELECT_EBADF           = 0x80710809,
-	CELL_HTTP_ERROR_NET_SELECT_ECHILD          = 0x8071080a,
-	CELL_HTTP_ERROR_NET_SELECT_EDEADLK         = 0x8071080b,
-	CELL_HTTP_ERROR_NET_SELECT_ENOMEM          = 0x8071080c,
-	CELL_HTTP_ERROR_NET_SELECT_EACCES          = 0x8071080d,
-	CELL_HTTP_ERROR_NET_SELECT_EFAULT          = 0x8071080e,
-	CELL_HTTP_ERROR_NET_SELECT_ENOTBLK         = 0x8071080f,
-	CELL_HTTP_ERROR_NET_SELECT_EBUSY           = 0x80710810,
-	CELL_HTTP_ERROR_NET_SELECT_EEXIST          = 0x80710811,
-	CELL_HTTP_ERROR_NET_SELECT_EXDEV           = 0x80710812,
-	CELL_HTTP_ERROR_NET_SELECT_ENODEV          = 0x80710813,
-	CELL_HTTP_ERROR_NET_SELECT_ENOTDIR         = 0x80710814,
-	CELL_HTTP_ERROR_NET_SELECT_EISDIR          = 0x80710815,
-	CELL_HTTP_ERROR_NET_SELECT_EINVAL          = 0x80710816,
-	CELL_HTTP_ERROR_NET_SELECT_ENFILE          = 0x80710817,
-	CELL_HTTP_ERROR_NET_SELECT_EMFILE          = 0x80710818,
-	CELL_HTTP_ERROR_NET_SELECT_ENOTTY          = 0x80710819,
-	CELL_HTTP_ERROR_NET_SELECT_ETXTBSY         = 0x8071081a,
-	CELL_HTTP_ERROR_NET_SELECT_EFBIG           = 0x8071081b,
-	CELL_HTTP_ERROR_NET_SELECT_ENOSPC          = 0x8071081c,
-	CELL_HTTP_ERROR_NET_SELECT_ESPIPE          = 0x8071081d,
-	CELL_HTTP_ERROR_NET_SELECT_EROFS           = 0x8071081e,
-	CELL_HTTP_ERROR_NET_SELECT_EMLINK          = 0x8071081f,
-	CELL_HTTP_ERROR_NET_SELECT_EPIPE           = 0x80710820,
-	CELL_HTTP_ERROR_NET_SELECT_EDOM            = 0x80710821,
-	CELL_HTTP_ERROR_NET_SELECT_ERANGE          = 0x80710822,
-	CELL_HTTP_ERROR_NET_SELECT_EAGAIN          = 0x80710823,
-	CELL_HTTP_ERROR_NET_SELECT_EWOULDBLOCK     = 0x80710823,
-	CELL_HTTP_ERROR_NET_SELECT_EINPROGRESS     = 0x80710824,
-	CELL_HTTP_ERROR_NET_SELECT_EALREADY        = 0x80710825,
-	CELL_HTTP_ERROR_NET_SELECT_ENOTSOCK        = 0x80710826,
-	CELL_HTTP_ERROR_NET_SELECT_EDESTADDRREQ    = 0x80710827,
-	CELL_HTTP_ERROR_NET_SELECT_EMSGSIZE        = 0x80710828,
-	CELL_HTTP_ERROR_NET_SELECT_EPROTOTYPE      = 0x80710829,
-	CELL_HTTP_ERROR_NET_SELECT_ENOPROTOOPT     = 0x8071082a,
-	CELL_HTTP_ERROR_NET_SELECT_EPROTONOSUPPORT = 0x8071082b,
-	CELL_HTTP_ERROR_NET_SELECT_ESOCKTNOSUPPORT = 0x8071082c,
-	CELL_HTTP_ERROR_NET_SELECT_EOPNOTSUPP      = 0x8071082d,
-	CELL_HTTP_ERROR_NET_SELECT_EPFNOSUPPORT    = 0x8071082e,
-	CELL_HTTP_ERROR_NET_SELECT_EAFNOSUPPORT    = 0x8071082f,
-	CELL_HTTP_ERROR_NET_SELECT_EADDRINUSE      = 0x80710830,
-	CELL_HTTP_ERROR_NET_SELECT_EADDRNOTAVAIL   = 0x80710831,
-	CELL_HTTP_ERROR_NET_SELECT_ENETDOWN        = 0x80710832,
-	CELL_HTTP_ERROR_NET_SELECT_ENETUNREACH     = 0x80710833,
-	CELL_HTTP_ERROR_NET_SELECT_ENETRESET       = 0x80710834,
-	CELL_HTTP_ERROR_NET_SELECT_ECONNABORTED    = 0x80710835,
-	CELL_HTTP_ERROR_NET_SELECT_ECONNRESET      = 0x80710836,
-	CELL_HTTP_ERROR_NET_SELECT_ENOBUFS         = 0x80710837,
-	CELL_HTTP_ERROR_NET_SELECT_EISCONN         = 0x80710838,
-	CELL_HTTP_ERROR_NET_SELECT_ENOTCONN        = 0x80710839,
-	CELL_HTTP_ERROR_NET_SELECT_ESHUTDOWN       = 0x8071083a,
-	CELL_HTTP_ERROR_NET_SELECT_ETOOMANYREFS    = 0x8071083b,
-	CELL_HTTP_ERROR_NET_SELECT_ETIMEDOUT       = 0x8071083c,
-	CELL_HTTP_ERROR_NET_SELECT_ECONNREFUSED    = 0x8071083d,
-	CELL_HTTP_ERROR_NET_SELECT_ELOOP           = 0x8071083e,
-	CELL_HTTP_ERROR_NET_SELECT_ENAMETOOLONG    = 0x8071083f,
-	CELL_HTTP_ERROR_NET_SELECT_EHOSTDOWN       = 0x80710840,
-	CELL_HTTP_ERROR_NET_SELECT_EHOSTUNREACH    = 0x80710841,
-	CELL_HTTP_ERROR_NET_SELECT_ENOTEMPTY       = 0x80710842,
-	CELL_HTTP_ERROR_NET_SELECT_EPROCLIM        = 0x80710843,
-	CELL_HTTP_ERROR_NET_SELECT_EUSERS          = 0x80710844,
-	CELL_HTTP_ERROR_NET_SELECT_EDQUOT          = 0x80710845,
-	CELL_HTTP_ERROR_NET_SELECT_ESTALE          = 0x80710846,
-	CELL_HTTP_ERROR_NET_SELECT_EREMOTE         = 0x80710847,
-	CELL_HTTP_ERROR_NET_SELECT_EBADRPC         = 0x80710848,
-	CELL_HTTP_ERROR_NET_SELECT_ERPCMISMATCH    = 0x80710849,
-	CELL_HTTP_ERROR_NET_SELECT_EPROGUNAVAIL    = 0x8071084a,
-	CELL_HTTP_ERROR_NET_SELECT_EPROGMISMATCH   = 0x8071084b,
-	CELL_HTTP_ERROR_NET_SELECT_EPROCUNAVAIL    = 0x8071084c,
-	CELL_HTTP_ERROR_NET_SELECT_ENOLCK          = 0x8071084d,
-	CELL_HTTP_ERROR_NET_SELECT_ENOSYS          = 0x8071084e,
-	CELL_HTTP_ERROR_NET_SELECT_EFTYPE          = 0x8071084f,
-	CELL_HTTP_ERROR_NET_SELECT_EAUTH           = 0x80710850,
-	CELL_HTTP_ERROR_NET_SELECT_ENEEDAUTH       = 0x80710851,
-	CELL_HTTP_ERROR_NET_SELECT_EIDRM           = 0x80710852,
-	CELL_HTTP_ERROR_NET_SELECT_ENOMSG          = 0x80710853,
-	CELL_HTTP_ERROR_NET_SELECT_EOVERFLOW       = 0x80710854,
-	CELL_HTTP_ERROR_NET_SELECT_EILSEQ          = 0x80710855,
-	CELL_HTTP_ERROR_NET_SELECT_ENOTSUP         = 0x80710856,
-	CELL_HTTP_ERROR_NET_SELECT_ECANCELED       = 0x80710857,
-	CELL_HTTP_ERROR_NET_SELECT_EBADMSG         = 0x80710858,
-	CELL_HTTP_ERROR_NET_SELECT_ENODATA         = 0x80710859,
-	CELL_HTTP_ERROR_NET_SELECT_ENOSR           = 0x8071085a,
-	CELL_HTTP_ERROR_NET_SELECT_ENOSTR          = 0x8071085b,
-	CELL_HTTP_ERROR_NET_SELECT_ETIME           = 0x8071085c,
-
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EPERM           = 0x80710b01,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOENT          = 0x80710b02,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ESRCH           = 0x80710b03,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EINTR           = 0x80710b04,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EIO             = 0x80710b05,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENXIO           = 0x80710b06,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_E2BIG           = 0x80710b07,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOEXC          = 0x80710b08,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EBADF           = 0x80710b09,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ECHILD          = 0x80710b0a,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EDEADLK         = 0x80710b0b,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOMEM          = 0x80710b0c,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EACCES          = 0x80710b0d,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EFAULT          = 0x80710b0e,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTBLK         = 0x80710b0f,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EBUSY           = 0x80710b10,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EEXIST          = 0x80710b11,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EXDEV           = 0x80710b12,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENODEV          = 0x80710b13,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTDIR         = 0x80710b14,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EISDIR          = 0x80710b15,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EINVAL          = 0x80710b16,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENFILE          = 0x80710b17,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EMFILE          = 0x80710b18,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTTY          = 0x80710b19,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ETXTBSY         = 0x80710b1a,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EFBIG           = 0x80710b1b,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOSPC          = 0x80710b1c,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ESPIPE          = 0x80710b1d,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EROFS           = 0x80710b1e,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EMLINK          = 0x80710b1f,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EPIPE           = 0x80710b20,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EDOM            = 0x80710b21,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ERANGE          = 0x80710b22,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EAGAIN          = 0x80710b23,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EWOULDBLOCK     = 0x80710b23,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EINPROGRESS     = 0x80710b24,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EALREADY        = 0x80710b25,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTSOCK        = 0x80710b26,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EDESTADDRREQ    = 0x80710b27,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EMSGSIZE        = 0x80710b28,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EPROTOTYPE      = 0x80710b29,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOPROTOOPT     = 0x80710b2a,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EPROTONOSUPPORT = 0x80710b2b,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ESOCKTNOSUPPORT = 0x80710b2c,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EOPNOTSUPP      = 0x80710b2d,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EPFNOSUPPORT    = 0x80710b2e,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EAFNOSUPPORT    = 0x80710b2f,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EADDRINUSE      = 0x80710b30,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EADDRNOTAVAIL   = 0x80710b31,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENETDOWN        = 0x80710b32,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENETUNREACH     = 0x80710b33,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENETRESET       = 0x80710b34,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ECONNABORTED    = 0x80710b35,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ECONNRESET      = 0x80710b36,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOBUFS         = 0x80710b37,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EISCONN         = 0x80710b38,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTCONN        = 0x80710b39,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ESHUTDOWN       = 0x80710b3a,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ETOOMANYREFS    = 0x80710b3b,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ETIMEDOUT       = 0x80710b3c,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ECONNREFUSED    = 0x80710b3d,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ELOOP           = 0x80710b3e,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENAMETOOLONG    = 0x80710b3f,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EHOSTDOWN       = 0x80710b40,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EHOSTUNREACH    = 0x80710b41,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTEMPTY       = 0x80710b42,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EPROCLIM        = 0x80710b43,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EUSERS          = 0x80710b44,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EDQUOT          = 0x80710b45,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ESTALE          = 0x80710b46,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EREMOTE         = 0x80710b47,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EBADRPC         = 0x80710b48,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ERPCMISMATCH    = 0x80710b49,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EPROGUNAVAIL    = 0x80710b4a,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EPROGMISMATCH   = 0x80710b4b,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EPROCUNAVAIL    = 0x80710b4c,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOLCK          = 0x80710b4d,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOSYS          = 0x80710b4e,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EFTYPE          = 0x80710b4f,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EAUTH           = 0x80710b50,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENEEDAUTH       = 0x80710b51,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EIDRM           = 0x80710b52,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOMSG          = 0x80710b53,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EOVERFLOW       = 0x80710b54,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EILSEQ          = 0x80710b55,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOTSUP         = 0x80710b56,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ECANCELED       = 0x80710b57,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_EBADMSG         = 0x80710b58,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENODATA         = 0x80710b59,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOSR           = 0x80710b5a,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ENOSTR          = 0x80710b5b,
-	CELL_HTTP_ERROR_NET_SSL_CONNECT_ETIME           = 0x80710b5c,
-
-	CELL_HTTP_ERROR_NET_SSL_SEND_EPERM           = 0x80710c01,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOENT          = 0x80710c02,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ESRCH           = 0x80710c03,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EINTR           = 0x80710c04,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EIO             = 0x80710c05,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENXIO           = 0x80710c06,
-	CELL_HTTP_ERROR_NET_SSL_SEND_E2BIG           = 0x80710c07,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOEXC          = 0x80710c08,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EBADF           = 0x80710c09,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ECHILD          = 0x80710c0a,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EDEADLK         = 0x80710c0b,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOMEM          = 0x80710c0c,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EACCES          = 0x80710c0d,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EFAULT          = 0x80710c0e,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOTBLK         = 0x80710c0f,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EBUSY           = 0x80710c10,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EEXIST          = 0x80710c11,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EXDEV           = 0x80710c12,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENODEV          = 0x80710c13,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOTDIR         = 0x80710c14,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EISDIR          = 0x80710c15,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EINVAL          = 0x80710c16,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENFILE          = 0x80710c17,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EMFILE          = 0x80710c18,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOTTY          = 0x80710c19,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ETXTBSY         = 0x80710c1a,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EFBIG           = 0x80710c1b,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOSPC          = 0x80710c1c,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ESPIPE          = 0x80710c1d,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EROFS           = 0x80710c1e,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EMLINK          = 0x80710c1f,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EPIPE           = 0x80710c20,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EDOM            = 0x80710c21,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ERANGE          = 0x80710c22,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EAGAIN          = 0x80710c23,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EWOULDBLOCK     = 0x80710c23,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EINPROGRESS     = 0x80710c24,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EALREADY        = 0x80710c25,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOTSOCK        = 0x80710c26,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EDESTADDRREQ    = 0x80710c27,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EMSGSIZE        = 0x80710c28,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EPROTOTYPE      = 0x80710c29,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOPROTOOPT     = 0x80710c2a,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EPROTONOSUPPORT = 0x80710c2b,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ESOCKTNOSUPPORT = 0x80710c2c,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EOPNOTSUPP      = 0x80710c2d,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EPFNOSUPPORT    = 0x80710c2e,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EAFNOSUPPORT    = 0x80710c2f,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EADDRINUSE      = 0x80710c30,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EADDRNOTAVAIL   = 0x80710c31,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENETDOWN        = 0x80710c32,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENETUNREACH     = 0x80710c33,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENETRESET       = 0x80710c34,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ECONNABORTED    = 0x80710c35,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ECONNRESET      = 0x80710c36,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOBUFS         = 0x80710c37,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EISCONN         = 0x80710c38,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOTCONN        = 0x80710c39,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ESHUTDOWN       = 0x80710c3a,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ETOOMANYREFS    = 0x80710c3b,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ETIMEDOUT       = 0x80710c3c,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ECONNREFUSED    = 0x80710c3d,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ELOOP           = 0x80710c3e,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENAMETOOLONG    = 0x80710c3f,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EHOSTDOWN       = 0x80710c40,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EHOSTUNREACH    = 0x80710c41,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOTEMPTY       = 0x80710c42,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EPROCLIM        = 0x80710c43,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EUSERS          = 0x80710c44,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EDQUOT          = 0x80710c45,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ESTALE          = 0x80710c46,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EREMOTE         = 0x80710c47,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EBADRPC         = 0x80710c48,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ERPCMISMATCH    = 0x80710c49,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EPROGUNAVAIL    = 0x80710c4a,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EPROGMISMATCH   = 0x80710c4b,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EPROCUNAVAIL    = 0x80710c4c,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOLCK          = 0x80710c4d,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOSYS          = 0x80710c4e,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EFTYPE          = 0x80710c4f,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EAUTH           = 0x80710c50,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENEEDAUTH       = 0x80710c51,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EIDRM           = 0x80710c52,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOMSG          = 0x80710c53,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EOVERFLOW       = 0x80710c54,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EILSEQ          = 0x80710c55,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOTSUP         = 0x80710c56,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ECANCELED       = 0x80710c57,
-	CELL_HTTP_ERROR_NET_SSL_SEND_EBADMSG         = 0x80710c58,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENODATA         = 0x80710c59,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOSR           = 0x80710c5a,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ENOSTR          = 0x80710c5b,
-	CELL_HTTP_ERROR_NET_SSL_SEND_ETIME           = 0x80710c5c,
-
-	CELL_HTTP_ERROR_NET_SSL_RECV_EPERM           = 0x80710d01,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOENT          = 0x80710d02,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ESRCH           = 0x80710d03,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EINTR           = 0x80710d04,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EIO             = 0x80710d05,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENXIO           = 0x80710d06,
-	CELL_HTTP_ERROR_NET_SSL_RECV_E2BIG           = 0x80710d07,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOEXC          = 0x80710d08,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EBADF           = 0x80710d09,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ECHILD          = 0x80710d0a,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EDEADLK         = 0x80710d0b,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOMEM          = 0x80710d0c,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EACCES          = 0x80710d0d,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EFAULT          = 0x80710d0e,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOTBLK         = 0x80710d0f,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EBUSY           = 0x80710d10,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EEXIST          = 0x80710d11,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EXDEV           = 0x80710d12,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENODEV          = 0x80710d13,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOTDIR         = 0x80710d14,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EISDIR          = 0x80710d15,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EINVAL          = 0x80710d16,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENFILE          = 0x80710d17,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EMFILE          = 0x80710d18,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOTTY          = 0x80710d19,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ETXTBSY         = 0x80710d1a,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EFBIG           = 0x80710d1b,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOSPC          = 0x80710d1c,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ESPIPE          = 0x80710d1d,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EROFS           = 0x80710d1e,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EMLINK          = 0x80710d1f,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EPIPE           = 0x80710d20,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EDOM            = 0x80710d21,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ERANGE          = 0x80710d22,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EAGAIN          = 0x80710d23,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EWOULDBLOCK     = 0x80710d23,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EINPROGRESS     = 0x80710d24,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EALREADY        = 0x80710d25,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOTSOCK        = 0x80710d26,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EDESTADDRREQ    = 0x80710d27,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EMSGSIZE        = 0x80710d28,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EPROTOTYPE      = 0x80710d29,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOPROTOOPT     = 0x80710d2a,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EPROTONOSUPPORT = 0x80710d2b,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ESOCKTNOSUPPORT = 0x80710d2c,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EOPNOTSUPP      = 0x80710d2d,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EPFNOSUPPORT    = 0x80710d2e,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EAFNOSUPPORT    = 0x80710d2f,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EADDRINUSE      = 0x80710d30,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EADDRNOTAVAIL   = 0x80710d31,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENETDOWN        = 0x80710d32,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENETUNREACH     = 0x80710d33,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENETRESET       = 0x80710d34,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ECONNABORTED    = 0x80710d35,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ECONNRESET      = 0x80710d36,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOBUFS         = 0x80710d37,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EISCONN         = 0x80710d38,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOTCONN        = 0x80710d39,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ESHUTDOWN       = 0x80710d3a,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ETOOMANYREFS    = 0x80710d3b,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ETIMEDOUT       = 0x80710d3c,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ECONNREFUSED    = 0x80710d3d,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ELOOP           = 0x80710d3e,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENAMETOOLONG    = 0x80710d3f,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EHOSTDOWN       = 0x80710d40,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EHOSTUNREACH    = 0x80710d41,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOTEMPTY       = 0x80710d42,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EPROCLIM        = 0x80710d43,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EUSERS          = 0x80710d44,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EDQUOT          = 0x80710d45,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ESTALE          = 0x80710d46,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EREMOTE         = 0x80710d47,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EBADRPC         = 0x80710d48,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ERPCMISMATCH    = 0x80710d49,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EPROGUNAVAIL    = 0x80710d4a,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EPROGMISMATCH   = 0x80710d4b,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EPROCUNAVAIL    = 0x80710d4c,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOLCK          = 0x80710d4d,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOSYS          = 0x80710d4e,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EFTYPE          = 0x80710d4f,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EAUTH           = 0x80710d50,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENEEDAUTH       = 0x80710d51,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EIDRM           = 0x80710d52,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOMSG          = 0x80710d53,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EOVERFLOW       = 0x80710d54,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EILSEQ          = 0x80710d55,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOTSUP         = 0x80710d56,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ECANCELED       = 0x80710d57,
-	CELL_HTTP_ERROR_NET_SSL_RECV_EBADMSG         = 0x80710d58,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENODATA         = 0x80710d59,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOSR           = 0x80710d5a,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ENOSTR          = 0x80710d5b,
-	CELL_HTTP_ERROR_NET_SSL_RECV_ETIME           = 0x80710d5c,
-};
-
-enum
-{
-	CELL_HTTP_TRANSACTION_STATE_GETTING_CONNECTION     = 1,
-	CELL_HTTP_TRANSACTION_STATE_PREPARING_REQUEST      = 2,
-	CELL_HTTP_TRANSACTION_STATE_SENDING_REQUEST        = 3,
-	CELL_HTTP_TRANSACTION_STATE_SENDING_BODY           = 4,
-	CELL_HTTP_TRANSACTION_STATE_WAITING_FOR_REPLY      = 5,
-	CELL_HTTP_TRANSACTION_STATE_READING_REPLY          = 6,
-	CELL_HTTP_TRANSACTION_STATE_SETTING_REDIRECTION    = 7,
-	CELL_HTTP_TRANSACTION_STATE_SETTING_AUTHENTICATION = 8,
-};
-
-enum
-{
-	CELL_HTTP_STATUS_CODE_Continue                        = 100,
-	CELL_HTTP_STATUS_CODE_Switching_Protocols             = 101,
-	CELL_HTTP_STATUS_CODE_Processing                      = 102,
-
-	// Success codes
-	CELL_HTTP_STATUS_CODE_OK                              = 200,
-	CELL_HTTP_STATUS_CODE_Created                         = 201,
-	CELL_HTTP_STATUS_CODE_Accepted                        = 202,
-	CELL_HTTP_STATUS_CODE_NonAuthoritive_Information      = 203,
-	CELL_HTTP_STATUS_CODE_No_Content                      = 204,
-	CELL_HTTP_STATUS_CODE_Reset_Content                   = 205,
-	CELL_HTTP_STATUS_CODE_Partial_Content                 = 206,
-	CELL_HTTP_STATUS_CODE_MultiStatus                     = 207,
-	/* Redirection 3xx */
-	CELL_HTTP_STATUS_CODE_Multiple_Choices                = 300,
-	CELL_HTTP_STATUS_CODE_Moved_Permanently               = 301,
-	CELL_HTTP_STATUS_CODE_Moved_Temporarily               = 302,
-	CELL_HTTP_STATUS_CODE_Found                           = CELL_HTTP_STATUS_CODE_Moved_Temporarily,
-	CELL_HTTP_STATUS_CODE_See_Other                       = 303,
-	CELL_HTTP_STATUS_CODE_Not_Modified                    = 304,
-	CELL_HTTP_STATUS_CODE_Use_Proxy                       = 305,
-	//CELL_HTTP_STATUS_CODE_UNUSED                          = 306,
-	CELL_HTTP_STATUS_CODE_Temporary_Redirect              = 307,
-
-	// Client errors
-	CELL_HTTP_STATUS_CODE_Bad_Request                     = 400,
-	CELL_HTTP_STATUS_CODE_Unauthorized                    = 401,
-	CELL_HTTP_STATUS_CODE_Payment_Required                = 402,
-	CELL_HTTP_STATUS_CODE_Forbidden                       = 403,
-	CELL_HTTP_STATUS_CODE_Not_Found                       = 404,
-	CELL_HTTP_STATUS_CODE_Method_Not_Allowed              = 405,
-	CELL_HTTP_STATUS_CODE_Not_Acceptable                  = 406,
-	CELL_HTTP_STATUS_CODE_Proxy_Authentication_Required   = 407,
-	CELL_HTTP_STATUS_CODE_Request_Timeout                 = 408,
-	CELL_HTTP_STATUS_CODE_Conflict                        = 409,
-	CELL_HTTP_STATUS_CODE_Gone                            = 410,
-	CELL_HTTP_STATUS_CODE_Length_Required                 = 411,
-	CELL_HTTP_STATUS_CODE_Precondition_Failed             = 412,
-	CELL_HTTP_STATUS_CODE_Request_Entity_Too_Large        = 413,
-	CELL_HTTP_STATUS_CODE_RequestURI_Too_Long             = 414,
-	CELL_HTTP_STATUS_CODE_Unsupported_Media_Type          = 415,
-	CELL_HTTP_STATUS_CODE_Requested_Range_Not_Satisfiable = 416,
-	CELL_HTTP_STATUS_CODE_Expectation_Failed              = 417,
-	CELL_HTTP_STATUS_CODE_Unprocessable_Entity            = 422,
-	CELL_HTTP_STATUS_CODE_Locked                          = 423,
-	CELL_HTTP_STATUS_CODE_Failed_Dependency               = 424,
-	CELL_HTTP_STATUS_CODE_Upgrade_Required                = 426,
-
-	// Server error
-	CELL_HTTP_STATUS_CODE_Internal_Server_Error           = 500,
-	CELL_HTTP_STATUS_CODE_Not_Implemented                 = 501,
-	CELL_HTTP_STATUS_CODE_Bad_Gateway                     = 502,
-	CELL_HTTP_STATUS_CODE_Service_Unavailable             = 503,
-	CELL_HTTP_STATUS_CODE_Gateway_Timeout                 = 504,
-	CELL_HTTP_STATUS_CODE_HTTP_Version_Not_Supported      = 505,
-	CELL_HTTP_STATUS_CODE_Insufficient_Storage            = 507,
-};
-
-enum
-{
-	CELL_HTTPS_VERIFY_ERROR_NONE           = 0x00000000U,
-	CELL_HTTPS_VERIFY_ERROR_NO_CERT        = 0x00000001U,
-	CELL_HTTPS_VERIFY_ERROR_BAD_SSL        = 0x00000002U,
-	CELL_HTTPS_VERIFY_ERROR_BAD_CLIENT     = 0x00000004U,
-	CELL_HTTPS_VERIFY_ERROR_UNKNOWN_CA     = 0x00000008U,
-	CELL_HTTPS_VERIFY_ERROR_BAD_CHAIN      = 0x00000010U,
-	CELL_HTTPS_VERIFY_ERROR_NO_MEMORY      = 0x00000020U,
-	CELL_HTTPS_VERIFY_ERROR_NOT_VERIFIABLE = 0x00000040U,
-	CELL_HTTPS_VERIFY_ERROR_INVALID_CERT   = 0x00000080U,
-	CELL_HTTPS_VERIFY_ERROR_BAD_CONSTRAINT = 0x00000100U,
-	CELL_HTTPS_VERIFY_ERROR_VERIFY_FAILED  = 0x00000200U,
-	CELL_HTTPS_VERIFY_ERROR_COMMON_NAME    = 0x00000400U,
-	CELL_HTTPS_VERIFY_ERROR_EXPIRED        = 0x00000800U,
-	CELL_HTTPS_VERIFY_ERROR_NOT_YET_VALID  = 0x00001000U,
-};
-
-static constexpr const char* CELL_HTTP_METHOD_OPTIONS = "OPTIONS";
-static constexpr const char* CELL_HTTP_METHOD_GET     = "GET";
-static constexpr const char* CELL_HTTP_METHOD_HEAD    = "HEAD";
-static constexpr const char* CELL_HTTP_METHOD_POST    = "POST";
-static constexpr const char* CELL_HTTP_METHOD_PUT     = "PUT";
-static constexpr const char* CELL_HTTP_METHOD_DELETE  = "DELETE";
-static constexpr const char* CELL_HTTP_METHOD_TRACE   = "TRACE";
-
-typedef u32 CellHttpClientId; //typedef struct CellHttpClient* CellHttpClientId;
-typedef u32 CellHttpTransId; //typedef struct CellHttpTransaction* CellHttpTransId;
-typedef const void* CellHttpSslId;
-
-using CellHttpAuthenticationCallback   = s32(CellHttpTransId transId, vm::cptr<char> realm, vm::cptr<CellHttpUri> uri, vm::ptr<char> username, vm::ptr<char> password, vm::ptr<bool> save, vm::ptr<void> userArg);
-using CellHttpTransactionStateCallback = s32(CellHttpTransId transId, s32 state, vm::ptr<void> userArg);
-using CellHttpRedirectCallback         = s32(CellHttpTransId transId, vm::cptr<CellHttpStatusLine> response, vm::cptr<CellHttpUri> from, vm::cptr<CellHttpUri> to, vm::ptr<void> userArg);
-using CellHttpsSslCallback             = s32(u32 verifyErr, vm::cpptr<void> sslCerts, s32 certNum, vm::cptr<char> hostname, vm::cptr<void> id, vm::ptr<void> userArg);
-using CellHttpCookieSendCallback       = s32(CellHttpTransId transId, vm::cptr<CellHttpUri> uri, vm::cptr<char> cookieValue, vm::ptr<void> userArg);
-using CellHttpCookieRecvCallback       = s32(CellHttpTransId transId, vm::cptr<CellHttpUri> uri, vm::cptr<char> cookieValue, vm::ptr<void> userArg);
-
-struct CellHttpsData
-{
-	vm::bptr<char> ptr;
-	be_t<u32> size;
-};
-
-struct http_manager
-{
-	shared_mutex mtx;
-	bool initialized = false;
-	bool cookie_initialized = false;
-	bool cache_initialized = false;
-	bool ext_cache_initialized = false;
-	bool https_initialized = false;
+	CELL_HTTPS_ERROR_SOCKET_ASSOCIATION = 0x80710a05,
+	CELL_HTTPS_ERROR_HANDSHAKE = 0x80710a06,
+	CELL_HTTPS_ERROR_LOOKUP_CERTIFICATE = 0x80710a07,
+	CELL_HTTPS_ERROR_NO_SSL = 0x80710a08,
+	CELL_HTTPS_ERROR_KEY_LOAD = 0x80710a09,
+	CELL_HTTPS_ERROR_CERT_KEY_MISMATCH = 0x80710a0a,
+	CELL_HTTPS_ERROR_KEY_NEEDS_CERT = 0x80710a0b,
+	CELL_HTTPS_ERROR_CERT_NEEDS_KEY = 0x80710a0c,
+	CELL_HTTPS_ERROR_RETRY_CONNECTION = 0x80710a0d,
+	CELL_HTTPS_ERROR_NET_SSL_CONNECT = 0x80710b00,
+	CELL_HTTPS_ERROR_NET_SSL_SEND = 0x80710c00,
+	CELL_HTTPS_ERROR_NET_SSL_RECV = 0x80710d00,
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp b/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp
index 94b73307a0..b1548ad551 100644
--- a/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp
@@ -7,10 +7,8 @@
 #ifdef _WIN32
 #include <windows.h>
 #include <codecvt>
-#ifdef _MSC_VER
 #pragma comment(lib, "Winhttp.lib")
 #endif
-#endif
 
 LOG_CHANNEL(cellHttpUtil);
 
@@ -40,20 +38,6 @@ void fmt_class_string<CellHttpUtilError>::format(std::string& out, u64 arg)
 error_code cellHttpUtilParseUri(vm::ptr<CellHttpUri> uri, vm::cptr<char> str, vm::ptr<void> pool, u32 size, vm::ptr<u32> required)
 {
 	cellHttpUtil.trace("cellHttpUtilParseUri(uri=*0x%x, str=%s, pool=*0x%x, size=%d, required=*0x%x)", uri, str, pool, size, required);
-
-	if (!str)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_STRING;
-	}
-
-	if (!pool || !uri)
-	{
-		if (!required)
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-		}
-	}
-
 	LUrlParser::clParseURL URL = LUrlParser::clParseURL::ParseURL(str.get_ptr());
 	if ( URL.IsValid() )
 	{
@@ -132,7 +116,7 @@ error_code cellHttpUtilParseUri(vm::ptr<CellHttpUri> uri, vm::cptr<char> str, vm
 				parseError = "Error, URI didn't contain a slash";
 				break;
 			default:
-				parseError = "Error, unknown error #" + std::to_string(static_cast<int>(URL.m_ErrorCode));
+				parseError = "Error, unkown error #" + std::to_string(static_cast<int>(URL.m_ErrorCode));
 				break;
 		}
 		cellHttpUtil.error("%s, while parsing URI, %s.", parseError, str.get_ptr());
@@ -143,144 +127,55 @@ error_code cellHttpUtilParseUri(vm::ptr<CellHttpUri> uri, vm::cptr<char> str, vm
 error_code cellHttpUtilParseUriPath(vm::ptr<CellHttpUriPath> path, vm::cptr<char> str, vm::ptr<void> pool, u32 size, vm::ptr<u32> required)
 {
 	cellHttpUtil.todo("cellHttpUtilParseUriPath(path=*0x%x, str=%s, pool=*0x%x, size=%d, required=*0x%x)", path, str, pool, size, required);
-
-	if (!str)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_STRING;
-	}
-
-	if (!pool || !path)
-	{
-		if (!required)
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-		}
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilParseProxy(vm::ptr<CellHttpUri> uri, vm::cptr<char> str, vm::ptr<void> pool, u32 size, vm::ptr<u32> required)
 {
 	cellHttpUtil.todo("cellHttpUtilParseProxy(uri=*0x%x, str=%s, pool=*0x%x, size=%d, required=*0x%x)", uri, str, pool, size, required);
-
-	if (!str)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_STRING;
-	}
-
-	if (!pool || !uri)
-	{
-		if (!required)
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-		}
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilParseStatusLine(vm::ptr<CellHttpStatusLine> resp, vm::cptr<char> str, u32 len, vm::ptr<void> pool, u32 size, vm::ptr<u32> required, vm::ptr<u32> parsedLength)
 {
 	cellHttpUtil.todo("cellHttpUtilParseStatusLine(resp=*0x%x, str=%s, len=%d, pool=*0x%x, size=%d, required=*0x%x, parsedLength=*0x%x)", resp, str, len, pool, size, required, parsedLength);
-
-	if (!str)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_STRING;
-	}
-
-	if (!pool || !resp)
-	{
-		if (!required)
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-		}
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilParseHeader(vm::ptr<CellHttpHeader> header, vm::cptr<char> str, u32 len, vm::ptr<void> pool, u32 size, vm::ptr<u32> required, vm::ptr<u32> parsedLength)
 {
 	cellHttpUtil.todo("cellHttpUtilParseHeader(header=*0x%x, str=%s, len=%d, pool=*0x%x, size=%d, required=*0x%x, parsedLength=*0x%x)", header, str, len, pool, size, required, parsedLength);
-
-	if (!str)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_STRING;
-	}
-
-	if (!pool || !header)
-	{
-		if (!required)
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-		}
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilBuildRequestLine(vm::cptr<CellHttpRequestLine> req, vm::ptr<char> buf, u32 len, vm::ptr<u32> required)
 {
-	cellHttpUtil.notice("cellHttpUtilBuildRequestLine(req=*0x%x, buf=*0x%x, len=%d, required=*0x%x)", req, buf, len, required);
+	cellHttpUtil.todo("cellHttpUtilBuildRequestLine(req=*0x%x, buf=*0x%x, len=%d, required=*0x%x)", req, buf, len, required);
 
-	if (!req || !req->method || !req->path || !req->protocol)
-	{
+	if (!req->method || !req->path || !req->protocol) {
 		return CELL_HTTP_UTIL_ERROR_INVALID_REQUEST;
 	}
 
-	std::string path = fmt::format("%s", req->path);
-	if (path.empty())
-	{
-		path += '/';
-	}
+	// TODO
 
-	// TODO: are the numbers properly formatted ?
-	const std::string result = fmt::format("%s %s %s/%d.%d\r\n", req->method, path, req->protocol, req->majorVersion, req->minorVersion);
-
-	if (buf)
-	{
-		if (len < result.size())
-		{
-			return CELL_HTTP_UTIL_ERROR_INSUFFICIENT;
-		}
-
-		std::memcpy(buf.get_ptr(), result.c_str(), result.size());
-	}
-
-	if (required)
-	{
-		*required = ::narrow<u32>(result.size());
-	}
+	const std::string& result = fmt::format("%s %s %s/%d.%d\r\n", req->method, req->path, req->protocol, req->majorVersion, req->minorVersion);
+	std::memcpy(buf.get_ptr(), result.c_str(), result.size() + 1);
 
 	return CELL_OK;
 }
 
 error_code cellHttpUtilBuildHeader(vm::cptr<CellHttpHeader> header, vm::ptr<char> buf, u32 len, vm::ptr<u32> required)
 {
-	cellHttpUtil.notice("cellHttpUtilBuildHeader(header=*0x%x, buf=*0x%x, len=%d, required=*0x%x)", header, buf, len, required);
+	cellHttpUtil.todo("cellHttpUtilBuildHeader(header=*0x%x, buf=*0x%x, len=%d, required=*0x%x)", header, buf, len, required);
 
-	if (!header || !header->name)
-	{
+	if (!header->name || !header->value) {
 		return CELL_HTTP_UTIL_ERROR_INVALID_HEADER;
 	}
 
-	const std::string result = fmt::format("%s: %s\r\n", header->name, header->value);
+	// TODO
 
-	if (buf)
-	{
-		if (len < result.size())
-		{
-			return CELL_HTTP_UTIL_ERROR_INSUFFICIENT;
-		}
-
-		std::memcpy(buf.get_ptr(), result.c_str(), result.size());
-	}
-
-	if (required)
-	{
-		*required = ::narrow<u32>(result.size());
-	}
+	const std::string& result = fmt::format("%s: %s\r\n", header->name, header->value);
+	std::memcpy(buf.get_ptr(), result.c_str(), result.size() + 1);
 
 	return CELL_OK;
 }
@@ -289,71 +184,10 @@ error_code cellHttpUtilBuildUri(vm::cptr<CellHttpUri> uri, vm::ptr<char> buf, u3
 {
 	cellHttpUtil.todo("cellHttpUtilBuildUri(uri=*0x%x, buf=*0x%x, len=%d, required=*0x%x, flags=%d)", uri, buf, len, required, flags);
 
-	if (!uri || !uri->hostname)
-	{
-		return CELL_HTTP_UTIL_ERROR_INVALID_URI;
-	}
+	// TODO
 
-	std::string result;
-
-	if (!(flags & CELL_HTTP_UTIL_URI_FLAG_NO_SCHEME))
-	{
-		if (uri->scheme && uri->scheme[0])
-		{
-			result = fmt::format("%s", uri->scheme);
-		}
-		else if (uri->port == 443u)
-		{
-			result = "https"; // TODO: confirm
-		}
-		else
-		{
-			result = "http"; // TODO: confirm
-		}
-
-		fmt::append(result, "://");
-	}
-
-	if (!(flags & CELL_HTTP_UTIL_URI_FLAG_NO_CREDENTIALS) && uri->username && uri->username[0])
-	{
-		fmt::append(result, "%s", uri->username);
-
-		if (!(flags & CELL_HTTP_UTIL_URI_FLAG_NO_PASSWORD) && uri->password && uri->password[0])
-		{
-			fmt::append(result, ":%s", uri->password);
-		}
-
-		fmt::append(result, "@");
-	}
-
-	fmt::append(result, "%s", uri->hostname);
-
-	if (true) // TODO: there seems to be a case where the port isn't added
-	{
-		fmt::append(result, ":%d", uri->port);
-	}
-
-	if (!(flags & CELL_HTTP_UTIL_URI_FLAG_NO_PATH) && uri->path && uri->path[0])
-	{
-		fmt::append(result, "%s", uri->path);
-	}
-
-	const u32 size_needed = ::narrow<u32>(result.size() + 1); // Including '\0'
-
-	if (buf)
-	{
-		if (len < size_needed)
-		{
-			return CELL_HTTP_UTIL_ERROR_INSUFFICIENT;
-		}
-
-		std::memcpy(buf.get_ptr(), result.c_str(), size_needed);
-	}
-
-	if (required)
-	{
-		*required = size_needed;
-	}
+	const std::string& result = fmt::format("%s://%s:%s@%s:%d/%s", uri->scheme, uri->username, uri->password, uri->hostname, uri->port, uri->path);
+	std::memcpy(buf.get_ptr(), result.c_str(), result.size() + 1);
 
 	return CELL_OK;
 }
@@ -361,469 +195,72 @@ error_code cellHttpUtilBuildUri(vm::cptr<CellHttpUri> uri, vm::ptr<char> buf, u3
 error_code cellHttpUtilCopyUri(vm::ptr<CellHttpUri> dest, vm::cptr<CellHttpUri> src, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
 {
 	cellHttpUtil.todo("cellHttpUtilCopyUri(dest=*0x%x, src=*0x%x, pool=*0x%x, poolSize=%d, required=*0x%x)", dest, src, pool, poolSize, required);
-
-	if (!src)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-	}
-
-	if (!pool || !dest)
-	{
-		if (!required)
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-		}
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilMergeUriPath(vm::ptr<CellHttpUri> uri, vm::cptr<CellHttpUri> src, vm::cptr<char> path, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
 {
 	cellHttpUtil.todo("cellHttpUtilMergeUriPath(uri=*0x%x, src=*0x%x, path=%s, pool=*0x%x, poolSize=%d, required=*0x%x)", uri, src, path, pool, poolSize, required);
-
-	if (!path)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_STRING;
-	}
-
-	if (!src)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-	}
-
-	if (!pool || !uri)
-	{
-		if (!required)
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-		}
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilSweepPath(vm::ptr<char> dst, vm::cptr<char> src, u32 srcSize)
 {
 	cellHttpUtil.todo("cellHttpUtilSweepPath(dst=*0x%x, src=%s, srcSize=%d)", dst, src, srcSize);
-
-	if (!dst || !src)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-	}
-
-	if (!srcSize)
-	{
-		return CELL_OK;
-	}
-
-	u32 pos = 0;
-
-	if (src[pos] != '/')
-	{
-		std::memcpy(dst.get_ptr(), src.get_ptr(), srcSize - 1);
-		dst[srcSize - 1] = '\0';
-		return CELL_OK;
-	}
-
-	// TODO
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilCopyStatusLine(vm::ptr<CellHttpStatusLine> dest, vm::cptr<CellHttpStatusLine> src, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
 {
 	cellHttpUtil.todo("cellHttpUtilCopyStatusLine(dest=*0x%x, src=*0x%x, pool=*0x%x, poolSize=%d, required=*0x%x)", dest, src, pool, poolSize, required);
-
-	if (!src)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-	}
-
-	if (!pool || !dest)
-	{
-		if (!required)
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-		}
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilCopyHeader(vm::ptr<CellHttpHeader> dest, vm::cptr<CellHttpHeader> src, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
 {
 	cellHttpUtil.todo("cellHttpUtilCopyHeader(dest=*0x%x, src=*0x%x, pool=*0x%x, poolSize=%d, required=*0x%x)", dest, src, pool, poolSize, required);
-
-	if (!src)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-	}
-
-	if (!pool || !dest)
-	{
-		if (!required)
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-		}
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilAppendHeaderValue(vm::ptr<CellHttpHeader> dest, vm::cptr<CellHttpHeader> src, vm::cptr<char> value, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required)
 {
 	cellHttpUtil.todo("cellHttpUtilAppendHeaderValue(dest=*0x%x, src=*0x%x, value=%s, pool=*0x%x, poolSize=%d, required=*0x%x)", dest, src, value, pool, poolSize, required);
-
-	if (!src)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-	}
-
-	if (!pool || !dest)
-	{
-		if (!required)
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-		}
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilEscapeUri(vm::ptr<char> out, u32 outSize, vm::cptr<u8> in, u32 inSize, vm::ptr<u32> required)
 {
 	cellHttpUtil.todo("cellHttpUtilEscapeUri(out=*0x%x, outSize=%d, in=*0x%x, inSize=%d, required=*0x%x)", out, outSize, in, inSize, required);
-
-	if (!in || !inSize)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_STRING;
-	}
-
-	if (!out && !required)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-	}
-
-	u32 size_needed = 0;
-	u32 out_pos = 0;
-	s32 rindex = 0;
-
-	if (const u32 end = in.addr() + inSize; end && end >= in.addr())
-	{
-		rindex = inSize;
-	}
-
-	for (u32 pos = 0; rindex >= 0; rindex--, pos++)
-	{
-		const char c1 = in[pos];
-
-		if (false) // DAT[c1] == '\x03') // TODO
-		{
-			size_needed += 3;
-
-			if (out)
-			{
-				if (outSize < size_needed)
-				{
-					return CELL_HTTP_UTIL_ERROR_NO_MEMORY;
-				}
-
-				constexpr const char* chars = "0123456789ABCDEF";
-				out[out_pos++] = '%'; // 0x25
-				out[out_pos++] = chars[c1 >> 4];
-				out[out_pos++] = chars[c1 & 0xf];
-			}
-		}
-		else
-		{
-			size_needed++;
-
-			if (out)
-			{
-				if (outSize < size_needed)
-				{
-					return CELL_HTTP_UTIL_ERROR_NO_MEMORY;
-				}
-
-				out[out_pos++] = c1;
-			}
-		}
-	}
-
-	size_needed++;
-
-	if (out)
-	{
-		if (outSize < size_needed)
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_MEMORY;
-		}
-
-		out[out_pos] = '\0';
-	}
-
-	if (required)
-	{
-		*required = size_needed;
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilUnescapeUri(vm::ptr<u8> out, u32 size, vm::cptr<char> in, vm::ptr<u32> required)
 {
 	cellHttpUtil.todo("cellHttpUtilUnescapeUri(out=*0x%x, size=%d, in=*0x%x, required=*0x%x)", out, size, in, required);
-
-	if (!in)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_STRING;
-	}
-
-	if (!out && !required)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-	}
-
-	if (required)
-	{
-		*required = 0; // TODO
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilFormUrlEncode(vm::ptr<char> out, u32 outSize, vm::cptr<u8> in, u32 inSize, vm::ptr<u32> required)
 {
 	cellHttpUtil.todo("cellHttpUtilFormUrlEncode(out=*0x%x, outSize=%d, in=*0x%x, inSize=%d, required=*0x%x)", out, outSize, in, inSize, required);
-
-	if (!in || !inSize)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_STRING;
-	}
-
-	if (!out && !required)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-	}
-
-	u32 size_needed = 0;
-	u32 out_pos = 0;
-	s32 rindex = 0;
-
-	if (const u32 end = in.addr() + inSize; end && end >= in.addr())
-	{
-		rindex = inSize;
-	}
-
-	for (u32 pos = 0; rindex >= 0; rindex--, pos++)
-	{
-		const char c1 = in[pos];
-
-		if (c1 == ' ')
-		{
-			size_needed++;
-
-			if (out)
-			{
-				if (outSize < size_needed)
-				{
-					return CELL_HTTP_UTIL_ERROR_NO_MEMORY;
-				}
-
-				out[out_pos++] = '+';
-			}
-		}
-		else if (false) // DAT[c1] == '\x03') // TODO
-		{
-			size_needed += 3;
-
-			if (out)
-			{
-				if (outSize < size_needed)
-				{
-					return CELL_HTTP_UTIL_ERROR_NO_MEMORY;
-				}
-
-				constexpr const char* chars = "0123456789ABCDEF";
-				out[out_pos++] = '%'; // 0x25
-				out[out_pos++] = chars[c1 >> 4];
-				out[out_pos++] = chars[c1 & 0xf];
-			}
-		}
-		else
-		{
-			size_needed++;
-
-			if (out)
-			{
-				if (outSize < size_needed)
-				{
-					return CELL_HTTP_UTIL_ERROR_NO_MEMORY;
-				}
-
-				out[out_pos++] = c1;
-			}
-		}
-	}
-
-	size_needed++;
-
-	if (out)
-	{
-		if (outSize < size_needed)
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_MEMORY;
-		}
-
-		out[out_pos++] = '\0';
-	}
-
-	if (required)
-	{
-		*required = size_needed;
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilFormUrlDecode(vm::ptr<u8> out, u32 size, vm::cptr<char> in, vm::ptr<u32> required)
 {
 	cellHttpUtil.todo("cellHttpUtilFormUrlDecode(out=*0x%x, size=%d, in=%s, required=*0x%x)", out, size, in, required);
-
-	if (!in)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_STRING;
-	}
-
-	if (!out && !required)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-	}
-
-	u32 size_needed = 0;
-	u32 out_pos = 0;
-
-	for (s32 index = 0, pos = 0;; index++)
-	{
-		size_needed = index + 1;
-		const char c1 = in[pos++];
-
-		if (!c1)
-		{
-			break;
-		}
-
-		if (out && (size < size_needed))
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_MEMORY;
-		}
-
-		if (c1 == '%')
-		{
-			const char c2 = in[pos++];
-			const char c3 = in[pos++];
-
-			if (!c2 || !c3)
-			{
-				return CELL_HTTP_UTIL_ERROR_INVALID_URI;
-			}
-
-			const auto check_char = [](b8 c)
-			{
-				const u32 utmp = static_cast<u32>(c);
-				s32 stmp = utmp - 48;
-				if (static_cast<u8>(c - 48) > 9)
-				{
-					stmp = utmp - 55;
-					if (static_cast<u8>(c + 191) > 5)
-					{
-						stmp = -1;
-						if (static_cast<u8>(c + 159) < 6)
-						{
-							stmp = utmp - 87;
-						}
-					}
-				}
-				return stmp;
-			};
-
-			const s32 tmp1 = check_char(c2);
-			const s32 tmp2 = check_char(c3);
-
-			if (tmp1 < 0 || tmp2 < 0)
-			{
-				return CELL_HTTP_UTIL_ERROR_INVALID_URI;
-			}
-
-			if (out)
-			{
-				out[out_pos++] = static_cast<char>((tmp1 & 0xffffffff) << 4) + static_cast<char>(tmp2);
-			}
-		}
-		else
-		{
-			if (out)
-			{
-				out[out_pos++] = (c1 == '+' ? ' ' : c1);
-			}
-		}
-	}
-
-	if (out)
-	{
-		if (size < size_needed)
-		{
-			return CELL_HTTP_UTIL_ERROR_NO_MEMORY;
-		}
-
-		out[out_pos] = '\0';
-	}
-
-	if (required)
-	{
-		*required = size_needed;
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilBase64Encoder(vm::ptr<char> out, vm::cptr<void> input, u32 len)
 {
 	cellHttpUtil.todo("cellHttpUtilBase64Encoder(out=*0x%x, input=*0x%x, len=%d)", out, input, len);
-
-	if (!input || !len)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_STRING;
-	}
-
-	if (!out)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-	}
-
 	return CELL_OK;
 }
 
 error_code cellHttpUtilBase64Decoder(vm::ptr<char> output, vm::cptr<void> in, u32 len)
 {
 	cellHttpUtil.todo("cellHttpUtilBase64Decoder(output=*0x%x, in=*0x%x, len=%d)", output, in, len);
-
-	if (!in)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_STRING;
-	}
-
-	if ((len & 3) != 0)
-	{
-		return CELL_HTTP_UTIL_ERROR_INVALID_LENGTH;
-	}
-
-	if (!output)
-	{
-		return CELL_HTTP_UTIL_ERROR_NO_BUFFER;
-	}
-
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellHttpUtil.h b/rpcs3/Emu/Cell/Modules/cellHttpUtil.h
index 93f94c0d70..9e4cc8e006 100644
--- a/rpcs3/Emu/Cell/Modules/cellHttpUtil.h
+++ b/rpcs3/Emu/Cell/Modules/cellHttpUtil.h
@@ -70,5 +70,3 @@ struct CellHttpHeader
 	vm::bcptr<char> name;
 	vm::bcptr<char> value;
 };
-
-error_code cellHttpUtilCopyUri(vm::ptr<CellHttpUri> dest, vm::cptr<CellHttpUri> src, vm::ptr<void> pool, u32 poolSize, vm::ptr<u32> required);
diff --git a/rpcs3/Emu/Cell/Modules/cellImeJp.cpp b/rpcs3/Emu/Cell/Modules/cellImeJp.cpp
index c191ebb92b..a47b721222 100644
--- a/rpcs3/Emu/Cell/Modules/cellImeJp.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellImeJp.cpp
@@ -40,38 +40,13 @@ ime_jp_manager::ime_jp_manager()
 
 bool ime_jp_manager::addChar(u16 c)
 {
-	if (!c || cursor >= (CELL_IMEJP_STRING_MAXLENGTH - 1ULL) || cursor > input_string.length())
+	if (!c || cursor >= (CELL_IMEJP_STRING_MAXLENGTH - 1) || cursor > input_string.length())
 		return false;
 
 	std::u16string tmp;
 	tmp += c;
-#if defined(__GNUG__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wrestrict"
-#endif
-	input_string.insert(cursor, tmp);
-#if defined(__GNUG__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
-	const usz cursor_old = cursor;
-	const bool cursor_was_in_focus = cursor >= focus_begin && cursor <= (focus_begin + focus_length);
-
-	move_cursor(1);
-
-	if (cursor_was_in_focus)
-	{
-		// Add this char to the focus
-		move_focus_end(1, false);
-	}
-	else
-	{
-		// Let's just move the focus to the cursor, so that it contains the new char.
-		focus_begin = cursor_old;
-		focus_length = 1;
-		move_focus(0); // Sanitize focus
-	}
-
+	input_string.insert(cursor++, tmp);
+	cursor_end = cursor;
 	input_state = CELL_IMEJP_BEFORE_CONVERT;
 	return true;
 }
@@ -92,138 +67,59 @@ bool ime_jp_manager::addString(vm::cptr<u16> str)
 
 bool ime_jp_manager::backspaceWord()
 {
-	return remove_character(false);
-}
-
-bool ime_jp_manager::deleteWord()
-{
-	return remove_character(true);
-}
-
-bool ime_jp_manager::remove_character(bool forward)
-{
-	if (!forward && !cursor)
-	{
+	if (!cursor || cursor > CELL_IMEJP_STRING_MAXLENGTH || cursor > input_string.length())
 		return false;
-	}
 
-	const usz pos = forward ? cursor : (cursor - 1);
-
-	if (pos >= (CELL_IMEJP_STRING_MAXLENGTH - 1ULL) || pos >= input_string.length())
-	{
-		return false;
-	}
-
-	// Delete the character at the position
-	input_string.erase(pos, 1);
-
-	// Move cursor and focus
-	const bool deleted_part_of_focus = pos > focus_begin && pos <= (focus_begin + focus_length);
-
-	if (!forward)
-	{
-		move_cursor(-1);
-	}
-
-	if (deleted_part_of_focus)
-	{
-		move_focus_end(-1, false);
-	}
-	else if (focus_begin > pos)
-	{
-		move_focus(-1);
-	}
+	input_string.erase(--cursor);
+	cursor_end = cursor;
 
 	if (input_string.empty())
-	{
 		input_state = CELL_IMEJP_BEFORE_INPUT;
-	}
 
 	return true;
 }
 
-void ime_jp_manager::clear_input()
+bool ime_jp_manager::deleteWord()
 {
-	cursor = 0;
-	focus_begin = 0;
-	focus_length = 0;
-	input_string.clear();
-	converted_string.clear();
+	if (cursor >= (CELL_IMEJP_STRING_MAXLENGTH - 1) || cursor > (input_string.length() - 1))
+		return false;
+
+	input_string.erase(cursor);
+	cursor_end = cursor;
+
+	if (input_string.empty())
+		input_state = CELL_IMEJP_BEFORE_INPUT;
+
+	return true;
 }
 
-void ime_jp_manager::move_cursor(s8 amount)
+void ime_jp_manager::moveCursor(s8 amount)
 {
-	cursor = std::max(0, std::min(static_cast<s32>(cursor) + amount, ::narrow<s32>(input_string.length())));
-}
-
-void ime_jp_manager::move_focus(s8 amount)
-{
-	focus_begin = std::max(0, std::min(static_cast<s32>(focus_begin) + amount, ::narrow<s32>(input_string.length())));
-	move_focus_end(amount, false);
-}
-
-void ime_jp_manager::move_focus_end(s8 amount, bool wrap_around)
-{
-	if (focus_begin >= input_string.length())
-	{
-		focus_length = 0;
-		return;
-	}
-
-	constexpr usz min_length = 1;
-	const usz max_length = input_string.length() - focus_begin;
-
 	if (amount > 0)
 	{
-		if (wrap_around && focus_length >= max_length)
-		{
-			focus_length = min_length;
-		}
-		else
-		{
-			focus_length += static_cast<usz>(amount);
-		}
+		cursor = std::min(cursor + amount, input_string.length() - 1);
+		cursor_end = std::min(cursor_end + amount, input_string.length() - 1);
 	}
 	else if (amount < 0)
 	{
-		if (wrap_around && focus_length <= min_length)
-		{
-			focus_length = max_length;
-		}
-		else
-		{
-			focus_length = std::max(0, static_cast<s32>(focus_length) + amount);
-		}
+		cursor = std::max(0, static_cast<s32>(cursor) + amount);
+		cursor_end = std::max(static_cast<s32>(cursor), static_cast<s32>(cursor_end) + amount);
 	}
-
-	focus_length = std::max(min_length, std::min(max_length, focus_length));
 }
 
-std::vector<ime_jp_manager::candidate> ime_jp_manager::get_candidate_list() const
+void ime_jp_manager::moveCursorEnd(s8 amount)
 {
-	std::vector<candidate> candidates;
-	if (input_string.empty() || focus_length == 0 || focus_begin >= input_string.length())
-		return candidates;
-
-	// TODO: we just fake this with one candidate for now
-	candidates.push_back(candidate{
-		.text = get_focus_string(),
-		.offset = 0
-	});
-
-	return candidates;
+	if (amount > 0)
+	{
+		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)
+	{
+		cursor_end = std::max(static_cast<s32>(cursor), static_cast<s32>(cursor_end) + amount);
+	}
 }
 
-std::u16string ime_jp_manager::get_focus_string() const
-{
-	if (input_string.empty() || focus_length == 0 || focus_begin >= input_string.length())
-		return {};
-
-	return input_string.substr(focus_begin, focus_length);
-}
-
-
-static error_code cellImeJpOpen(sys_memory_container_t container_id, vm::ptr<CellImeJpHandle> hImeJpHandle, vm::cptr<CellImeJpAddDic> addDicPath)
+error_code cellImeJpOpen(sys_memory_container_t container_id, vm::ptr<CellImeJpHandle> hImeJpHandle, vm::cptr<CellImeJpAddDic> addDicPath)
 {
 	cellImeJp.todo("cellImeJpOpen(container_id=*0x%x, hImeJpHandle=*0x%x, addDicPath=*0x%x)", container_id, hImeJpHandle, addDicPath);
 
@@ -253,7 +149,7 @@ static error_code cellImeJpOpen(sys_memory_container_t container_id, vm::ptr<Cel
 	return CELL_OK;
 }
 
-static error_code cellImeJpOpen2(sys_memory_container_t container_id, vm::ptr<CellImeJpHandle> hImeJpHandle, vm::cptr<CellImeJpAddDic> addDicPath)
+error_code cellImeJpOpen2(sys_memory_container_t container_id, vm::ptr<CellImeJpHandle> hImeJpHandle, vm::cptr<CellImeJpAddDic> addDicPath)
 {
 	cellImeJp.todo("cellImeJpOpen2(container_id=*0x%x, hImeJpHandle=*0x%x, addDicPath=*0x%x)", container_id, hImeJpHandle, addDicPath);
 
@@ -284,7 +180,7 @@ static error_code cellImeJpOpen2(sys_memory_container_t container_id, vm::ptr<Ce
 	return CELL_OK;
 }
 
-static error_code cellImeJpOpen3(sys_memory_container_t container_id, vm::ptr<CellImeJpHandle> hImeJpHandle, vm::cpptr<CellImeJpAddDic> addDicPath)
+error_code cellImeJpOpen3(sys_memory_container_t container_id, vm::ptr<CellImeJpHandle> hImeJpHandle, vm::cpptr<CellImeJpAddDic> addDicPath)
 {
 	cellImeJp.todo("cellImeJpOpen3(container_id=*0x%x, hImeJpHandle=*0x%x, addDicPath=*0x%x)", container_id, hImeJpHandle, addDicPath);
 
@@ -321,13 +217,13 @@ static error_code cellImeJpOpen3(sys_memory_container_t container_id, vm::ptr<Ce
 	return CELL_OK;
 }
 
-static error_code cellImeJpOpenExt()
+error_code cellImeJpOpenExt()
 {
 	cellImeJp.todo("cellImeJpOpenExt()");
 	return CELL_OK;
 }
 
-static error_code cellImeJpClose(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpClose(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpClose(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -340,14 +236,17 @@ static error_code cellImeJpClose(CellImeJpHandle hImeJpHandle)
 	}
 
 	manager.input_state = CELL_IMEJP_BEFORE_INPUT;
-	manager.clear_input();
+	manager.input_string.clear();
+	manager.converted_string.clear();
 	manager.confirmed_string.clear();
+	manager.cursor = 0;
+	manager.cursor_end = 0;
 	manager.is_initialized = false;
 
 	return CELL_OK;
 }
 
-static error_code cellImeJpSetKanaInputMode(CellImeJpHandle hImeJpHandle, s16 inputOption)
+error_code cellImeJpSetKanaInputMode(CellImeJpHandle hImeJpHandle, s16 inputOption)
 {
 	cellImeJp.todo("cellImeJpSetKanaInputMode(hImeJpHandle=*0x%x, inputOption=%d)", hImeJpHandle, inputOption);
 
@@ -369,7 +268,7 @@ static error_code cellImeJpSetKanaInputMode(CellImeJpHandle hImeJpHandle, s16 in
 	return CELL_OK;
 }
 
-static error_code cellImeJpSetInputCharType(CellImeJpHandle hImeJpHandle, s16 charTypeOption)
+error_code cellImeJpSetInputCharType(CellImeJpHandle hImeJpHandle, s16 charTypeOption)
 {
 	cellImeJp.todo("cellImeJpSetInputCharType(hImeJpHandle=*0x%x, charTypeOption=%d)", hImeJpHandle, charTypeOption);
 
@@ -386,7 +285,7 @@ static error_code cellImeJpSetInputCharType(CellImeJpHandle hImeJpHandle, s16 ch
 	return CELL_OK;
 }
 
-static error_code cellImeJpSetFixInputMode(CellImeJpHandle hImeJpHandle, s16 fixInputMode)
+error_code cellImeJpSetFixInputMode(CellImeJpHandle hImeJpHandle, s16 fixInputMode)
 {
 	cellImeJp.todo("cellImeJpSetFixInputMode(hImeJpHandle=*0x%x, fixInputMode=%d)", hImeJpHandle, fixInputMode);
 
@@ -403,7 +302,7 @@ static error_code cellImeJpSetFixInputMode(CellImeJpHandle hImeJpHandle, s16 fix
 	return CELL_OK;
 }
 
-static error_code cellImeJpAllowExtensionCharacters(CellImeJpHandle hImeJpHandle, s16 extensionCharacters)
+error_code cellImeJpAllowExtensionCharacters(CellImeJpHandle hImeJpHandle, s16 extensionCharacters)
 {
 	cellImeJp.todo("cellImeJpSetFixInputMode(hImeJpHandle=*0x%x, extensionCharacters=%d)", hImeJpHandle, extensionCharacters);
 
@@ -425,7 +324,7 @@ static error_code cellImeJpAllowExtensionCharacters(CellImeJpHandle hImeJpHandle
 	return CELL_OK;
 }
 
-static error_code cellImeJpReset(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpReset(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpReset(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -438,13 +337,16 @@ static error_code cellImeJpReset(CellImeJpHandle hImeJpHandle)
 	}
 
 	manager.input_state = CELL_IMEJP_BEFORE_INPUT;
-	manager.clear_input();
+	manager.input_string.clear();
+	manager.converted_string.clear();
 	manager.confirmed_string.clear();
+	manager.cursor = 0;
+	manager.cursor_end = 0;
 
 	return CELL_OK;
 }
 
-static error_code cellImeJpGetStatus(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pInputStatus)
+error_code cellImeJpGetStatus(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pInputStatus)
 {
 	cellImeJp.warning("cellImeJpGetStatus(hImeJpHandle=*0x%x, pInputStatus=%d)", hImeJpHandle, pInputStatus);
 
@@ -466,7 +368,7 @@ static error_code cellImeJpGetStatus(CellImeJpHandle hImeJpHandle, vm::ptr<s16>
 	return CELL_OK;
 }
 
-static error_code cellImeJpEnterChar(CellImeJpHandle hImeJpHandle, u16 inputChar, vm::ptr<s16> pOutputStatus)
+error_code cellImeJpEnterChar(CellImeJpHandle hImeJpHandle, u16 inputChar, vm::ptr<s16> pOutputStatus)
 {
 	cellImeJp.todo("cellImeJpEnterChar(hImeJpHandle=*0x%x, inputChar=%d, pOutputStatus=%d)", hImeJpHandle, inputChar, pOutputStatus);
 
@@ -495,13 +397,13 @@ static error_code cellImeJpEnterChar(CellImeJpHandle hImeJpHandle, u16 inputChar
 	return CELL_OK;
 }
 
-static error_code cellImeJpEnterCharExt(CellImeJpHandle hImeJpHandle, u16 inputChar, vm::ptr<s16> pOutputStatus)
+error_code cellImeJpEnterCharExt(CellImeJpHandle hImeJpHandle, u16 inputChar, vm::ptr<s16> pOutputStatus)
 {
 	cellImeJp.todo("cellImeJpEnterCharExt(hImeJpHandle=*0x%x, inputChar=%d, pOutputStatus=%d", hImeJpHandle, inputChar, pOutputStatus);
 	return cellImeJpEnterChar(hImeJpHandle, inputChar, pOutputStatus);
 }
 
-static error_code cellImeJpEnterString(CellImeJpHandle hImeJpHandle, vm::cptr<u16> pInputString, vm::ptr<s16> pOutputStatus)
+error_code cellImeJpEnterString(CellImeJpHandle hImeJpHandle, vm::cptr<u16> pInputString, vm::ptr<s16> pOutputStatus)
 {
 	cellImeJp.todo("cellImeJpEnterString(hImeJpHandle=*0x%x, pInputString=*0x%x, pOutputStatus=%d", hImeJpHandle, pInputString, pOutputStatus);
 
@@ -530,13 +432,13 @@ static error_code cellImeJpEnterString(CellImeJpHandle hImeJpHandle, vm::cptr<u1
 	return CELL_OK;
 }
 
-static error_code cellImeJpEnterStringExt(CellImeJpHandle hImeJpHandle, vm::cptr<u16> pInputString, vm::ptr<s16> pOutputStatus)
+error_code cellImeJpEnterStringExt(CellImeJpHandle hImeJpHandle, vm::cptr<u16> pInputString, vm::ptr<s16> pOutputStatus)
 {
 	cellImeJp.todo("cellImeJpEnterStringExt(hImeJpHandle=*0x%x, pInputString=*0x%x, pOutputStatus=%d", hImeJpHandle, pInputString, pOutputStatus);
 	return cellImeJpEnterString(hImeJpHandle, pInputString, pOutputStatus);
 }
 
-static error_code cellImeJpModeCaretRight(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpModeCaretRight(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpModeCaretRight(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -553,12 +455,12 @@ static error_code cellImeJpModeCaretRight(CellImeJpHandle hImeJpHandle)
 		return CELL_IMEJP_ERROR_ERR;
 	}
 
-	manager.move_cursor(1);
+	manager.moveCursor(1);
 
 	return CELL_OK;
 }
 
-static error_code cellImeJpModeCaretLeft(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpModeCaretLeft(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpModeCaretLeft(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -575,12 +477,12 @@ static error_code cellImeJpModeCaretLeft(CellImeJpHandle hImeJpHandle)
 		return CELL_IMEJP_ERROR_ERR;
 	}
 
-	manager.move_cursor(-1);
+	manager.moveCursor(-1);
 
 	return CELL_OK;
 }
 
-static error_code cellImeJpBackspaceWord(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpBackspaceWord(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpBackspaceWord(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -602,7 +504,7 @@ static error_code cellImeJpBackspaceWord(CellImeJpHandle hImeJpHandle)
 	return CELL_OK;
 }
 
-static error_code cellImeJpDeleteWord(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpDeleteWord(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpDeleteWord(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -624,7 +526,7 @@ static error_code cellImeJpDeleteWord(CellImeJpHandle hImeJpHandle)
 	return CELL_OK;
 }
 
-static error_code cellImeJpAllDeleteConvertString(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpAllDeleteConvertString(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpAllDeleteConvertString(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -641,13 +543,16 @@ static error_code cellImeJpAllDeleteConvertString(CellImeJpHandle hImeJpHandle)
 		return CELL_IMEJP_ERROR_ERR;
 	}
 
-	manager.clear_input();
+	manager.cursor = 0;
+	manager.cursor_end = 0;
+	manager.input_string.clear();
+	manager.converted_string.clear();
 	manager.input_state = CELL_IMEJP_BEFORE_INPUT;
 
 	return CELL_OK;
 }
 
-static error_code cellImeJpConvertForward(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpConvertForward(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpConvertForward(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -669,7 +574,7 @@ static error_code cellImeJpConvertForward(CellImeJpHandle hImeJpHandle)
 	return CELL_OK;
 }
 
-static error_code cellImeJpConvertBackward(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpConvertBackward(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpConvertBackward(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -691,7 +596,7 @@ static error_code cellImeJpConvertBackward(CellImeJpHandle hImeJpHandle)
 	return CELL_OK;
 }
 
-static error_code cellImeJpCurrentPartConfirm(CellImeJpHandle hImeJpHandle, s16 listItem)
+error_code cellImeJpCurrentPartConfirm(CellImeJpHandle hImeJpHandle, s16 listItem)
 {
 	cellImeJp.todo("cellImeJpCurrentPartConfirm(hImeJpHandle=*0x%x, listItem=%d)", hImeJpHandle, listItem);
 
@@ -711,7 +616,7 @@ static error_code cellImeJpCurrentPartConfirm(CellImeJpHandle hImeJpHandle, s16
 	return CELL_OK;
 }
 
-static error_code cellImeJpAllConfirm(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpAllConfirm(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpAllConfirm(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -730,13 +635,16 @@ static error_code cellImeJpAllConfirm(CellImeJpHandle hImeJpHandle)
 
 	// Use input_string for now
 	manager.confirmed_string = manager.input_string;
-	manager.clear_input();
+	manager.cursor = 0;
+	manager.cursor_end = 0;
+	manager.input_string.clear();
+	manager.converted_string.clear();
 	manager.input_state = CELL_IMEJP_BEFORE_INPUT;
 
 	return CELL_OK;
 }
 
-static error_code cellImeJpAllConvertCancel(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpAllConvertCancel(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpAllConvertCancel(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -759,7 +667,7 @@ static error_code cellImeJpAllConvertCancel(CellImeJpHandle hImeJpHandle)
 	return CELL_OK;
 }
 
-static error_code cellImeJpConvertCancel(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpConvertCancel(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpConvertCancel(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -776,13 +684,11 @@ static error_code cellImeJpConvertCancel(CellImeJpHandle hImeJpHandle)
 		return CELL_IMEJP_ERROR_ERR;
 	}
 
-	manager.converted_string.clear();
-	manager.input_state = CELL_IMEJP_BEFORE_CONVERT;
-
-	return CELL_OK;
+	// TODO: only cancel all if cursor is at 0
+	return cellImeJpAllConvertCancel(hImeJpHandle);
 }
 
-static error_code cellImeJpExtendConvertArea(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpExtendConvertArea(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpExtendConvertArea(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -799,13 +705,12 @@ static error_code cellImeJpExtendConvertArea(CellImeJpHandle hImeJpHandle)
 		return CELL_IMEJP_ERROR_ERR;
 	}
 
-	// Move end of the focus by one. Wrap around if the focus end is already at the end of the input string.
-	manager.move_focus_end(1, true);
+	manager.moveCursorEnd(1);
 
 	return CELL_OK;
 }
 
-static error_code cellImeJpShortenConvertArea(CellImeJpHandle hImeJpHandle)
+error_code cellImeJpShortenConvertArea(CellImeJpHandle hImeJpHandle)
 {
 	cellImeJp.todo("cellImeJpShortenConvertArea(hImeJpHandle=*0x%x)", hImeJpHandle);
 
@@ -822,13 +727,12 @@ static error_code cellImeJpShortenConvertArea(CellImeJpHandle hImeJpHandle)
 		return CELL_IMEJP_ERROR_ERR;
 	}
 
-	// Move end of focus by one. Wrap around if the focus end is already at the beginning of the input string.
-	manager.move_focus_end(-1, true);
+	manager.moveCursorEnd(-1);
 
 	return CELL_OK;
 }
 
-static error_code cellImeJpTemporalConfirm(CellImeJpHandle hImeJpHandle, s16 selectIndex)
+error_code cellImeJpTemporalConfirm(CellImeJpHandle hImeJpHandle, s16 selectIndex)
 {
 	cellImeJp.todo("cellImeJpTemporalConfirm(hImeJpHandle=*0x%x, selectIndex=%d)", hImeJpHandle, selectIndex);
 
@@ -848,7 +752,7 @@ static error_code cellImeJpTemporalConfirm(CellImeJpHandle hImeJpHandle, s16 sel
 	return CELL_OK;
 }
 
-static error_code cellImeJpPostConvert(CellImeJpHandle hImeJpHandle, s16 postType)
+error_code cellImeJpPostConvert(CellImeJpHandle hImeJpHandle, s16 postType)
 {
 	cellImeJp.todo("cellImeJpPostConvert(hImeJpHandle=*0x%x, postType=%d)", hImeJpHandle, postType);
 
@@ -868,7 +772,7 @@ static error_code cellImeJpPostConvert(CellImeJpHandle hImeJpHandle, s16 postTyp
 	return CELL_OK;
 }
 
-static error_code cellImeJpMoveFocusClause(CellImeJpHandle hImeJpHandle, s16 moveType)
+error_code cellImeJpMoveFocusClause(CellImeJpHandle hImeJpHandle, s16 moveType)
 {
 	cellImeJp.todo("cellImeJpMoveFocusClause(hImeJpHandle=*0x%x, moveType=%d)", hImeJpHandle, moveType);
 
@@ -888,17 +792,17 @@ static error_code cellImeJpMoveFocusClause(CellImeJpHandle hImeJpHandle, s16 mov
 	switch (moveType)
 	{
 	case CELL_IMEJP_FOCUS_NEXT:
-		manager.move_focus(1);
+		manager.moveCursor(1);
 		break;
 	case CELL_IMEJP_FOCUS_BEFORE:
-		manager.move_focus(-1);
+		manager.moveCursor(-1);
 		break;
 	case CELL_IMEJP_FOCUS_TOP:
-		manager.move_focus(-1 * ::narrow<s8>(manager.input_string.length()));
+		manager.moveCursor(-1 * ::narrow<s8>(manager.input_string.length()));
 		break;
 	case CELL_IMEJP_FOCUS_END:
-		manager.move_focus(::narrow<s8>(manager.input_string.length()));
-		manager.move_focus(-1);
+		manager.moveCursor(::narrow<s8>(manager.input_string.length()));
+		manager.moveCursor(-1);
 		break;
 	default:
 		break;
@@ -909,7 +813,7 @@ static error_code cellImeJpMoveFocusClause(CellImeJpHandle hImeJpHandle, s16 mov
 	return CELL_OK;
 }
 
-static error_code cellImeJpGetFocusTop(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pFocusTop)
+error_code cellImeJpGetFocusTop(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pFocusTop)
 {
 	cellImeJp.todo("cellImeJpGetFocusTop(hImeJpHandle=*0x%x, pFocusTop=*0x%x)", hImeJpHandle, pFocusTop);
 
@@ -926,12 +830,12 @@ static error_code cellImeJpGetFocusTop(CellImeJpHandle hImeJpHandle, vm::ptr<s16
 		return CELL_IMEJP_ERROR_CONTEXT;
 	}
 
-	*pFocusTop = static_cast<u16>(manager.focus_begin * 2); // offset in bytes
+	*pFocusTop = static_cast<u16>(manager.cursor * 2); // offset in bytes
 
 	return CELL_OK;
 }
 
-static error_code cellImeJpGetFocusLength(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pFocusLength)
+error_code cellImeJpGetFocusLength(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pFocusLength)
 {
 	cellImeJp.todo("cellImeJpGetFocusLength(hImeJpHandle=*0x%x, pFocusLength=*0x%x)", hImeJpHandle, pFocusLength);
 
@@ -948,12 +852,19 @@ static error_code cellImeJpGetFocusLength(CellImeJpHandle hImeJpHandle, vm::ptr<
 		return CELL_IMEJP_ERROR_CONTEXT;
 	}
 
-	*pFocusLength = ::narrow<s16>(manager.focus_length * 2); // offset in bytes
+	if (manager.cursor >= (CELL_IMEJP_STRING_MAXLENGTH - 1))
+	{
+		*pFocusLength = 0;
+	}
+	else
+	{
+		*pFocusLength = static_cast<u16>((manager.cursor_end - manager.cursor + 1) * 2); // offset in bytes
+	}
 
 	return CELL_OK;
 }
 
-static error_code cellImeJpGetConfirmYomiString(CellImeJpHandle hImeJpHandle, vm::ptr<u16> pYomiString)
+error_code cellImeJpGetConfirmYomiString(CellImeJpHandle hImeJpHandle, vm::ptr<u16> pYomiString)
 {
 	cellImeJp.todo("cellImeJpGetConfirmYomiString(hImeJpHandle=*0x%x, pYomiString=*0x%x)", hImeJpHandle, pYomiString);
 
@@ -970,22 +881,22 @@ static error_code cellImeJpGetConfirmYomiString(CellImeJpHandle hImeJpHandle, vm
 		return CELL_IMEJP_ERROR_CONTEXT;
 	}
 
-	const usz max_len = std::min<usz>(CELL_IMEJP_STRING_MAXLENGTH - 1ULL, manager.confirmed_string.length());
+	for (u32 i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
+	{
+		pYomiString[i] = 0;
+	}
+
+	const usz max_len = std::min<usz>(CELL_IMEJP_STRING_MAXLENGTH - 1, manager.confirmed_string.length());
 
 	for (u32 i = 0; i < max_len; i++)
 	{
 		pYomiString[i] = manager.confirmed_string[i];
 	}
 
-	for (u32 i = static_cast<u32>(max_len); i < CELL_IMEJP_STRING_MAXLENGTH; i++)
-	{
-		pYomiString[i] = 0;
-	}
-
 	return CELL_OK;
 }
 
-static error_code cellImeJpGetConfirmString(CellImeJpHandle hImeJpHandle, vm::ptr<u16> pConfirmString)
+error_code cellImeJpGetConfirmString(CellImeJpHandle hImeJpHandle, vm::ptr<u16> pConfirmString)
 {
 	cellImeJp.todo("cellImeJpGetConfirmString(hImeJpHandle=*0x%x, pConfirmString=*0x%x)", hImeJpHandle, pConfirmString);
 
@@ -1002,22 +913,22 @@ static error_code cellImeJpGetConfirmString(CellImeJpHandle hImeJpHandle, vm::pt
 		return CELL_IMEJP_ERROR_CONTEXT;
 	}
 
-	const usz max_len = std::min<usz>(CELL_IMEJP_STRING_MAXLENGTH - 1ULL, manager.confirmed_string.length());
+	for (u32 i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
+	{
+		pConfirmString[i] = 0;
+	}
+
+	const usz max_len = std::min<usz>(CELL_IMEJP_STRING_MAXLENGTH - 1, manager.confirmed_string.length());
 
 	for (u32 i = 0; i < max_len; i++)
 	{
 		pConfirmString[i] = manager.confirmed_string[i];
 	}
 
-	for (u32 i = static_cast<u32>(max_len); i < CELL_IMEJP_STRING_MAXLENGTH; i++)
-	{
-		pConfirmString[i] = 0;
-	}
-
 	return CELL_OK;
 }
 
-static error_code cellImeJpGetConvertYomiString(CellImeJpHandle hImeJpHandle, vm::ptr<u16> pYomiString)
+error_code cellImeJpGetConvertYomiString(CellImeJpHandle hImeJpHandle, vm::ptr<u16> pYomiString)
 {
 	cellImeJp.todo("cellImeJpGetConvertYomiString(hImeJpHandle=*0x%x, pYomiString=*0x%x)", hImeJpHandle, pYomiString);
 
@@ -1034,22 +945,22 @@ static error_code cellImeJpGetConvertYomiString(CellImeJpHandle hImeJpHandle, vm
 		return CELL_IMEJP_ERROR_CONTEXT;
 	}
 
-	const usz max_len = std::min<usz>(CELL_IMEJP_STRING_MAXLENGTH - 1ULL, manager.input_string.length());
+	for (u32 i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
+	{
+		pYomiString[i] = 0;
+	}
+
+	const usz max_len = std::min<usz>(CELL_IMEJP_STRING_MAXLENGTH - 1, manager.input_string.length());
 
 	for (u32 i = 0; i < max_len; i++)
 	{
 		pYomiString[i] = manager.input_string[i];
 	}
 
-	for (u32 i = static_cast<u32>(max_len); i < CELL_IMEJP_STRING_MAXLENGTH; i++)
-	{
-		pYomiString[i] = 0;
-	}
-
 	return CELL_OK;
 }
 
-static error_code cellImeJpGetConvertString(CellImeJpHandle hImeJpHandle, vm::ptr<u16> pConvertString)
+error_code cellImeJpGetConvertString(CellImeJpHandle hImeJpHandle, vm::ptr<u16> pConvertString)
 {
 	cellImeJp.warning("cellImeJpGetConvertString(hImeJpHandle=*0x%x, pConvertString=*0x%x)", hImeJpHandle, pConvertString);
 
@@ -1066,22 +977,22 @@ static error_code cellImeJpGetConvertString(CellImeJpHandle hImeJpHandle, vm::pt
 		return CELL_IMEJP_ERROR_CONTEXT;
 	}
 
-	const usz max_len = std::min<usz>(CELL_IMEJP_STRING_MAXLENGTH - 1ULL, manager.input_string.length());
+	for (u32 i = 0; i < CELL_IMEJP_STRING_MAXLENGTH; i++)
+	{
+		pConvertString[i] = 0;
+	}
+
+	const usz max_len = std::min<usz>(CELL_IMEJP_STRING_MAXLENGTH - 1, manager.input_string.length());
 
 	for (u32 i = 0; i < max_len; i++)
 	{
 		pConvertString[i] = manager.input_string[i];
 	}
 
-	for (u32 i = static_cast<u32>(max_len); i < CELL_IMEJP_STRING_MAXLENGTH; i++)
-	{
-		pConvertString[i] = 0;
-	}
-
 	return CELL_OK;
 }
 
-static error_code cellImeJpGetCandidateListSize(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pListSize)
+error_code cellImeJpGetCandidateListSize(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pListSize)
 {
 	cellImeJp.todo("cellImeJpGetCandidateListSize(hImeJpHandle=*0x%x, pListSize=*0x%x)", hImeJpHandle, pListSize);
 
@@ -1103,23 +1014,12 @@ static error_code cellImeJpGetCandidateListSize(CellImeJpHandle hImeJpHandle, vm
 		return CELL_IMEJP_ERROR_ERR;
 	}
 
-	// Add focus string size, including null terminator
-	const std::u16string focus_string = manager.get_focus_string();
-	usz size = sizeof(u16) * (focus_string.length() + 1);
-
-	// Add candidates, including null terminators and offsets
-	for (const ime_jp_manager::candidate& can : manager.get_candidate_list())
-	{
-		constexpr usz offset_size = sizeof(u16);
-		size += offset_size + (can.text.size() + 1) * sizeof(u16);
-	}
-
-	*pListSize = ::narrow<s16>(size);
+	*pListSize = 0;
 
 	return CELL_OK;
 }
 
-static error_code cellImeJpGetCandidateList(CellImeJpHandle hImeJpHandle, vm::ptr<s16> plistNum, vm::ptr<u16> pCandidateString)
+error_code cellImeJpGetCandidateList(CellImeJpHandle hImeJpHandle, vm::ptr<s16> plistNum, vm::ptr<u16> pCandidateString)
 {
 	cellImeJp.todo("cellImeJpGetCandidateList(hImeJpHandle=*0x%x, plistNum=*0x%x, pCandidateString=*0x%x)", hImeJpHandle, plistNum, pCandidateString);
 
@@ -1141,42 +1041,12 @@ static error_code cellImeJpGetCandidateList(CellImeJpHandle hImeJpHandle, vm::pt
 		return CELL_IMEJP_ERROR_ERR;
 	}
 
-	// First, copy the focus string
-	u32 pos = 0;
-	const std::u16string focus_string = manager.get_focus_string();
-	for (u32 i = pos; i < focus_string.length(); i++)
-	{
-		pCandidateString[i] = focus_string[i];
-	}
-	pos += ::narrow<u32>(focus_string.length());
-
-	// Add null terminator
-	pCandidateString[pos++] = 0;
-
-	// Add list of candidates
-	const std::vector<ime_jp_manager::candidate> list = manager.get_candidate_list();
-	for (const ime_jp_manager::candidate& can : list)
-	{
-		// Copy the candidate
-		for (u32 i = pos; i < can.text.length(); i++)
-		{
-			pCandidateString[i] = can.text[i];
-		}
-		pos += ::narrow<u32>(can.text.length());
-
-		// Add null terminator
-		pCandidateString[pos++] = 0;
-
-		// Add offset
-		pCandidateString[pos++] = can.offset;
-	}
-
-	*plistNum = ::narrow<s16>(list.size());
+	*plistNum = 0;
 
 	return CELL_OK;
 }
 
-static error_code cellImeJpGetCandidateSelect(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pIndex)
+error_code cellImeJpGetCandidateSelect(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pIndex)
 {
 	cellImeJp.todo("cellImeJpGetCandidateSelect(hImeJpHandle=*0x%x, pIndex=*0x%x)", hImeJpHandle, pIndex);
 
@@ -1203,7 +1073,7 @@ static error_code cellImeJpGetCandidateSelect(CellImeJpHandle hImeJpHandle, vm::
 	return CELL_OK;
 }
 
-static error_code cellImeJpGetPredictList(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pYomiString, s32 itemNum, vm::ptr<s32> plistCount, vm::ptr<CellImeJpPredictItem> pPredictItem)
+error_code cellImeJpGetPredictList(CellImeJpHandle hImeJpHandle, vm::ptr<s16> pYomiString, s32 itemNum, vm::ptr<s32> plistCount, vm::ptr<CellImeJpPredictItem> pPredictItem)
 {
 	cellImeJp.todo("cellImeJpGetPredictList(hImeJpHandle=*0x%x, pYomiString=*0x%x, itemNum=%d, plistCount=*0x%x, pPredictItem=*0x%x)", hImeJpHandle, pYomiString, itemNum, plistCount, pPredictItem);
 
@@ -1225,7 +1095,7 @@ static error_code cellImeJpGetPredictList(CellImeJpHandle hImeJpHandle, vm::ptr<
 	return CELL_OK;
 }
 
-static error_code cellImeJpConfirmPrediction(CellImeJpHandle hImeJpHandle, vm::ptr<CellImeJpPredictItem> pPredictItem)
+error_code cellImeJpConfirmPrediction(CellImeJpHandle hImeJpHandle, vm::ptr<CellImeJpPredictItem> pPredictItem)
 {
 	cellImeJp.todo("cellImeJpConfirmPrediction(hImeJpHandle=*0x%x, pPredictItem=*0x%x)", hImeJpHandle, pPredictItem);
 
diff --git a/rpcs3/Emu/Cell/Modules/cellImeJp.h b/rpcs3/Emu/Cell/Modules/cellImeJp.h
index 22e92adf29..adc9208629 100644
--- a/rpcs3/Emu/Cell/Modules/cellImeJp.h
+++ b/rpcs3/Emu/Cell/Modules/cellImeJp.h
@@ -115,12 +115,11 @@ struct ime_jp_manager
 
 	u32 input_state = CELL_IMEJP_BEFORE_INPUT;
 	std::vector<std::string> dictionary_paths;
-	std::u16string confirmed_string; // Confirmed part of the string (first part of the entire string)
-	std::u16string converted_string; // Converted part of the unconfirmed input string
-	std::u16string input_string;     // Unconfirmed part of the string (second part of the entire string)
-	usz cursor = 0;       // The cursor. Can move across the entire input string.
-	usz focus_begin = 0;  // Begin of the focus string
-	usz focus_length = 0; // Length of the focus string
+	std::u16string confirmed_string;
+	std::u16string converted_string;
+	std::u16string input_string;
+	usz cursor = 0;
+	usz cursor_end = 0;
 	s16 fix_input_mode = CELL_IMEJP_FIXINMODE_OFF;
 	s16 input_char_type = CELL_IMEJP_DSPCHAR_HIRA;
 	s16 kana_input_mode = CELL_IMEJP_ROMAN_INPUT;
@@ -132,17 +131,6 @@ struct ime_jp_manager
 	bool addString(vm::cptr<u16> str);
 	bool backspaceWord();
 	bool deleteWord();
-	bool remove_character(bool forward);
-	void clear_input();
-	void move_cursor(s8 amount);                      // s8 because CELL_IMEJP_STRING_MAXLENGTH is 128
-	void move_focus(s8 amount);                       // s8 because CELL_IMEJP_STRING_MAXLENGTH is 128
-	void move_focus_end(s8 amount, bool wrap_around); // s8 because CELL_IMEJP_STRING_MAXLENGTH is 128
-
-	struct candidate
-	{
-		std::u16string text; // Actual text of the candidate
-		u16 offset = 0;      // The offset of the next character after the candidate replaced part of the current focus.
-	};
-	std::vector<candidate> get_candidate_list() const;
-	std::u16string get_focus_string() const;
+	void moveCursor(s8 amount);
+	void moveCursorEnd(s8 amount);
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp b/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp
index 5123ec68cf..75e25a82b3 100644
--- a/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp
@@ -9,8 +9,15 @@
 #include "Emu/Cell/lv2/sys_fs.h"
 #include "cellJpgDec.h"
 
+#include "util/asm.hpp"
+
 LOG_CHANNEL(cellJpgDec);
 
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 template <>
 void fmt_class_string<CellJpgDecError>::format(std::string& out, u64 arg)
 {
@@ -35,19 +42,19 @@ void fmt_class_string<CellJpgDecError>::format(std::string& out, u64 arg)
 
 error_code cellJpgDecCreate(u32 mainHandle, u32 threadInParam, u32 threadOutParam)
 {
-	cellJpgDec.todo("cellJpgDecCreate(mainHandle=0x%x, threadInParam=0x%x, threadOutParam=0x%x)", mainHandle, threadInParam, threadOutParam);
+	UNIMPLEMENTED_FUNC(cellJpgDec);
 	return CELL_OK;
 }
 
 error_code cellJpgDecExtCreate(u32 mainHandle, u32 threadInParam, u32 threadOutParam, u32 extThreadInParam, u32 extThreadOutParam)
 {
-	cellJpgDec.todo("cellJpgDecExtCreate(mainHandle=0x%x, threadInParam=0x%x, threadOutParam=0x%x, extThreadInParam=0x%x, extThreadOutParam=0x%x)", mainHandle, threadInParam, threadOutParam, extThreadInParam, extThreadOutParam);
+	UNIMPLEMENTED_FUNC(cellJpgDec);
 	return CELL_OK;
 }
 
 error_code cellJpgDecDestroy(u32 mainHandle)
 {
-	cellJpgDec.todo("cellJpgDecDestroy(mainHandle=0x%x)", mainHandle);
+	UNIMPLEMENTED_FUNC(cellJpgDec);
 	return CELL_OK;
 }
 
@@ -69,7 +76,7 @@ error_code cellJpgDecOpen(u32 mainHandle, vm::ptr<u32> subHandle, vm::ptr<CellJp
 	case CELL_JPGDEC_FILE:
 	{
 		// Get file descriptor and size
-		const std::string real_path = vfs::get(src->fileName.get_ptr());
+		const auto real_path = vfs::get(src->fileName.get_ptr());
 		fs::file file_s(real_path);
 		if (!file_s) return CELL_JPGDEC_ERROR_OPEN_FILE;
 
@@ -96,7 +103,7 @@ error_code cellJpgDecClose(u32 mainHandle, u32 subHandle)
 {
 	cellJpgDec.warning("cellJpgDecOpen(mainHandle=0x%x, subHandle=0x%x)", mainHandle, subHandle);
 
-	const auto subHandle_data = idm::get_unlocked<CellJpgDecSubHandle>(subHandle);
+	const auto subHandle_data = idm::get<CellJpgDecSubHandle>(subHandle);
 
 	if (!subHandle_data)
 	{
@@ -113,15 +120,15 @@ error_code cellJpgDecReadHeader(u32 mainHandle, u32 subHandle, vm::ptr<CellJpgDe
 {
 	cellJpgDec.trace("cellJpgDecReadHeader(mainHandle=0x%x, subHandle=0x%x, info=*0x%x)", mainHandle, subHandle, info);
 
-	const auto subHandle_data = idm::get_unlocked<CellJpgDecSubHandle>(subHandle);
+	const auto subHandle_data = idm::get<CellJpgDecSubHandle>(subHandle);
 
 	if (!subHandle_data)
 	{
 		return CELL_JPGDEC_ERROR_FATAL;
 	}
 
-	const u32 fd = subHandle_data->fd;
-	const u64 fileSize = subHandle_data->fileSize;
+	const u32& fd = subHandle_data->fd;
+	const u64& fileSize = subHandle_data->fileSize;
 	CellJpgDecInfo& current_info = subHandle_data->info;
 
 	// Write the header to buffer
@@ -135,7 +142,7 @@ error_code cellJpgDecReadHeader(u32 mainHandle, u32 subHandle, vm::ptr<CellJpgDe
 
 	case CELL_JPGDEC_FILE:
 	{
-		auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+		auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 		file->file.seek(0);
 		file->file.read(buffer.get(), fileSize);
 		break;
@@ -143,20 +150,20 @@ error_code cellJpgDecReadHeader(u32 mainHandle, u32 subHandle, vm::ptr<CellJpgDe
 	default: break; // TODO
 	}
 
-	if (read_from_ptr<le_t<u32>>(buffer.get() + 0) != 0xE0FFD8FF || // Error: Not a valid SOI header
-		read_from_ptr<u32>(buffer.get() + 6) != "JFIF"_u32)   // Error: Not a valid JFIF string
+	if (*utils::bless<le_t<u32>>(buffer.get() + 0) != 0xE0FFD8FF || // Error: Not a valid SOI header
+		*utils::bless<u32>(buffer.get() + 6) != "JFIF"_u32)   // Error: Not a valid JFIF string
 	{
 		return CELL_JPGDEC_ERROR_HEADER;
 	}
 
 	u32 i = 4;
 
-	if (i >= fileSize)
+	if(i >= fileSize)
 		return CELL_JPGDEC_ERROR_HEADER;
 
-	u16 block_length = buffer[i] * 0xFF + buffer[i + 1];
+	u16 block_length = buffer[i] * 0xFF + buffer[i+1];
 
-	while (true)
+	while(true)
 	{
 		i += block_length;                                  // Increase the file index to get to the next block
 		if (i >= fileSize ||                                // Check to protect against segmentation faults
@@ -165,15 +172,15 @@ error_code cellJpgDecReadHeader(u32 mainHandle, u32 subHandle, vm::ptr<CellJpgDe
 			return CELL_JPGDEC_ERROR_HEADER;
 		}
 
-		if (buffer[i + 1] == 0xC0)
+		if(buffer[i+1] == 0xC0)
 			break;                                          // 0xFFC0 is the "Start of frame" marker which contains the file size
 
 		i += 2;                                             // Skip the block marker
-		block_length = buffer[i] * 0xFF + buffer[i + 1];    // Go to the next block
+		block_length = buffer[i] * 0xFF + buffer[i+1];      // Go to the next block
 	}
 
-	current_info.imageWidth    = buffer[i + 7] * 0x100 + buffer[i + 8];
-	current_info.imageHeight   = buffer[i + 5] * 0x100 + buffer[i + 6];
+	current_info.imageWidth    = buffer[i+7]*0x100 + buffer[i+8];
+	current_info.imageHeight   = buffer[i+5]*0x100 + buffer[i+6];
 	current_info.numComponents = 3; // Unimplemented
 	current_info.colorSpace    = CELL_JPG_RGB;
 
@@ -194,7 +201,7 @@ error_code cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr<u8> data,
 
 	dataOutInfo->status = CELL_JPGDEC_DEC_STATUS_STOP;
 
-	const auto subHandle_data = idm::get_unlocked<CellJpgDecSubHandle>(subHandle);
+	const auto subHandle_data = idm::get<CellJpgDecSubHandle>(subHandle);
 
 	if (!subHandle_data)
 	{
@@ -216,7 +223,7 @@ error_code cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr<u8> data,
 
 	case CELL_JPGDEC_FILE:
 	{
-		auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+		auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 		file->file.seek(0);
 		file->file.read(jpg.get(), fileSize);
 		break;
@@ -225,7 +232,7 @@ error_code cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr<u8> data,
 	}
 
 	//Decode JPG file. (TODO: Is there any faster alternative? Can we do it without external libraries?)
-	int width = 0, height = 0, actual_components = 0;
+	int width, height, actual_components;
 	auto image = std::unique_ptr<unsigned char,decltype(&::free)>
 		(
 			stbi_load_from_memory(jpg.get(), ::narrow<int>(fileSize), &width, &height, &actual_components, 4),
@@ -260,17 +267,18 @@ error_code cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr<u8> data,
 		{
 			memcpy(data.get_ptr(), image.get(), image_size);
 		}
-		break;
 	}
+	break;
+
 	case CELL_JPG_ARGB:
 	{
-		constexpr int nComponents = 4;
+		const int nComponents = 4;
 		image_size *= nComponents;
 		if (bytesPerLine > width * nComponents || flip) //check if we need padding
 		{
 			//TODO: Find out if we can't do padding without an extra copy
 			const int linesize = std::min(bytesPerLine, width * nComponents);
-			std::vector<char> output(image_size);
+			const auto output = std::make_unique<char[]>(linesize);
 			for (int i = 0; i < height; i++)
 			{
 				const int dstOffset = i * bytesPerLine;
@@ -282,32 +290,33 @@ error_code cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr<u8> data,
 					output[j + 2] = image.get()[srcOffset + j + 1];
 					output[j + 3] = image.get()[srcOffset + j + 2];
 				}
-				std::memcpy(&data[dstOffset], output.data(), linesize);
+				std::memcpy(&data[dstOffset], output.get(), linesize);
 			}
 		}
 		else
 		{
-			std::vector<u32> img(image_size);
-			const u32* source_current = reinterpret_cast<const u32*>(image.get());
-			u32* dest_current = img.data();
-			for (u32 i = 0; i < image_size / nComponents; i++)
+			const auto img = std::make_unique<uint[]>(image_size);
+			uint* source_current = reinterpret_cast<uint*>(image.get());
+			uint* dest_current = img.get();
+			for (uint i = 0; i < image_size / nComponents; i++)
 			{
-				const u32 val = *source_current;
+				uint val = *source_current;
 				*dest_current = (val >> 24) | (val << 8); // set alpha (A8) as leftmost byte
 				source_current++;
 				dest_current++;
 			}
-			std::memcpy(data.get_ptr(), img.data(), image_size);
+			std::memcpy(data.get_ptr(), img.get(), image_size);
 		}
-		break;
 	}
+	break;
+
 	case CELL_JPG_GRAYSCALE:
 	case CELL_JPG_YCbCr:
 	case CELL_JPG_UPSAMPLE_ONLY:
 	case CELL_JPG_GRAYSCALE_TO_ALPHA_RGBA:
 	case CELL_JPG_GRAYSCALE_TO_ALPHA_ARGB:
 		cellJpgDec.error("cellJpgDecDecodeData: Unsupported color space (%d)", current_outParam.outputColorSpace);
-		break;
+	break;
 
 	default:
 		return CELL_JPGDEC_ERROR_ARG;
@@ -315,7 +324,7 @@ error_code cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr<u8> data,
 
 	dataOutInfo->status = CELL_JPGDEC_DEC_STATUS_FINISH;
 
-	if (dataCtrlParam->outputBytesPerLine)
+	if(dataCtrlParam->outputBytesPerLine)
 		dataOutInfo->outputLines = static_cast<u32>(image_size / dataCtrlParam->outputBytesPerLine);
 
 	return CELL_OK;
@@ -331,7 +340,7 @@ error_code cellJpgDecSetParameter(u32 mainHandle, u32 subHandle, vm::cptr<CellJp
 {
 	cellJpgDec.trace("cellJpgDecSetParameter(mainHandle=0x%x, subHandle=0x%x, inParam=*0x%x, outParam=*0x%x)", mainHandle, subHandle, inParam, outParam);
 
-	const auto subHandle_data = idm::get_unlocked<CellJpgDecSubHandle>(subHandle);
+	const auto subHandle_data = idm::get<CellJpgDecSubHandle>(subHandle);
 
 	if (!subHandle_data)
 	{
diff --git a/rpcs3/Emu/Cell/Modules/cellJpgDec.h b/rpcs3/Emu/Cell/Modules/cellJpgDec.h
index d916a38a3b..f00b181d03 100644
--- a/rpcs3/Emu/Cell/Modules/cellJpgDec.h
+++ b/rpcs3/Emu/Cell/Modules/cellJpgDec.h
@@ -110,7 +110,6 @@ struct CellJpgDecSubHandle
 	static const u32 id_base = 1;
 	static const u32 id_step = 1;
 	static const u32 id_count = 1023;
-	SAVESTATE_INIT_POS(35);
 
 	u32 fd;
 	u64 fileSize;
diff --git a/rpcs3/Emu/Cell/Modules/cellKb.cpp b/rpcs3/Emu/Cell/Modules/cellKb.cpp
index 0682d32fc8..a8109e6fff 100644
--- a/rpcs3/Emu/Cell/Modules/cellKb.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellKb.cpp
@@ -1,17 +1,14 @@
 #include "stdafx.h"
 #include "Emu/IdManager.h"
-#include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Io/KeyboardHandler.h"
 #include "cellKb.h"
 
-error_code sys_config_start(ppu_thread& ppu);
-error_code sys_config_stop(ppu_thread& ppu);
+extern void libio_sys_config_init();
+extern void libio_sys_config_end();
 
-extern bool is_input_allowed();
-
-LOG_CHANNEL(cellKb);
+LOG_CHANNEL(sys_io);
 
 template<>
 void fmt_class_string<CellKbError>::format(std::string& out, u64 arg)
@@ -34,50 +31,9 @@ void fmt_class_string<CellKbError>::format(std::string& out, u64 arg)
 	});
 }
 
-
-KeyboardHandlerBase::KeyboardHandlerBase(utils::serial* ar)
+error_code cellKbInit(u32 max_connect)
 {
-	if (!ar)
-	{
-		return;
-	}
-
-	u32 max_connect = 0;
-
-	(*ar)(max_connect);
-
-	if (max_connect)
-	{
-		Emu.PostponeInitCode([this, max_connect]()
-		{
-			std::lock_guard<std::mutex> lock(m_mutex);
-			AddConsumer(keyboard_consumer::identifier::cellKb, max_connect);
-			auto lk = init.init();
-		});
-	}
-}
-
-void KeyboardHandlerBase::save(utils::serial& ar)
-{
-	u32 max_connect = 0;
-	const auto inited = init.access();
-
-	if (inited)
-	{
-		std::lock_guard<std::mutex> lock(m_mutex);
-
-		if (auto it = m_consumers.find(keyboard_consumer::identifier::cellKb); it != m_consumers.end())
-		{
-			max_connect = it->second.GetInfo().max_connect;
-		}
-	}
-
-	ar(max_connect);
-}
-
-error_code cellKbInit(ppu_thread& ppu, u32 max_connect)
-{
-	cellKb.warning("cellKbInit(max_connect=%d)", max_connect);
+	sys_io.warning("cellKbInit(max_connect=%d)", max_connect);
 
 	auto& handler = g_fxo->get<KeyboardHandlerBase>();
 
@@ -92,17 +48,15 @@ error_code cellKbInit(ppu_thread& ppu, u32 max_connect)
 		return CELL_KB_ERROR_INVALID_PARAMETER;
 	}
 
-	sys_config_start(ppu);
-
-	std::lock_guard<std::mutex> lock(handler.m_mutex);
-	handler.AddConsumer(keyboard_consumer::identifier::cellKb, std::min(max_connect, 7u));
+	libio_sys_config_init();
+	handler.Init(std::min(max_connect, 7u));
 
 	return CELL_OK;
 }
 
-error_code cellKbEnd(ppu_thread& ppu)
+error_code cellKbEnd()
 {
-	cellKb.notice("cellKbEnd()");
+	sys_io.notice("cellKbEnd()");
 
 	auto& handler = g_fxo->get<KeyboardHandlerBase>();
 
@@ -111,19 +65,14 @@ error_code cellKbEnd(ppu_thread& ppu)
 	if (!init)
 		return CELL_KB_ERROR_UNINITIALIZED;
 
-	{
-		std::lock_guard<std::mutex> lock(handler.m_mutex);
-		handler.RemoveConsumer(keyboard_consumer::identifier::cellKb);
-	}
-
 	// TODO
-	sys_config_stop(ppu);
+	libio_sys_config_end();
 	return CELL_OK;
 }
 
 error_code cellKbClearBuf(u32 port_no)
 {
-	cellKb.trace("cellKbClearBuf(port_no=%d)", port_no);
+	sys_io.trace("cellKbClearBuf(port_no=%d)", port_no);
 
 	auto& handler = g_fxo->get<KeyboardHandlerBase>();
 
@@ -137,20 +86,19 @@ error_code cellKbClearBuf(u32 port_no)
 
 	std::lock_guard<std::mutex> lock(handler.m_mutex);
 
-	keyboard_consumer& consumer = handler.GetConsumer(keyboard_consumer::identifier::cellKb);
-	const KbInfo& current_info = consumer.GetInfo();
+	const KbInfo& current_info = handler.GetInfo();
 
-	if (port_no >= consumer.GetKeyboards().size() || current_info.status[port_no] != CELL_KB_STATUS_CONNECTED)
-		return not_an_error(CELL_KB_ERROR_NO_DEVICE);
+	if (port_no >= handler.GetKeyboards().size() || current_info.status[port_no] != CELL_KB_STATUS_CONNECTED)
+		return CELL_KB_ERROR_NO_DEVICE;
 
-	KbData& current_data = consumer.GetData(port_no);
+	KbData& current_data = handler.GetData(port_no);
 	current_data.len = 0;
 	current_data.led = 0;
 	current_data.mkey = 0;
 
 	for (int i = 0; i < CELL_KB_MAX_KEYCODES; i++)
 	{
-		current_data.buttons[i] = KbButton(CELL_KEYC_NO_EVENT, 0, false);
+		current_data.keycode[i] = { 0, 0 };
 	}
 
 	return CELL_OK;
@@ -158,51 +106,42 @@ error_code cellKbClearBuf(u32 port_no)
 
 u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode)
 {
-	cellKb.trace("cellKbCnvRawCode(arrange=%d, mkey=%d, led=%d, rawcode=0x%x)", arrange, mkey, led, rawcode);
+	sys_io.trace("cellKbCnvRawCode(arrange=%d, mkey=%d, led=%d, rawcode=0x%x)", arrange, mkey, led, rawcode);
 
 	// CELL_KB_RAWDAT
-	if (rawcode <= CELL_KEYC_E_UNDEF ||
-		rawcode == CELL_KEYC_ESCAPE ||
-		rawcode == CELL_KEYC_106_KANJI ||
-		(rawcode >= CELL_KEYC_CAPS_LOCK && rawcode <= CELL_KEYC_NUM_LOCK) ||
-		rawcode == CELL_KEYC_APPLICATION ||
-		rawcode == CELL_KEYC_KANA ||
-		rawcode == CELL_KEYC_HENKAN ||
-		rawcode == CELL_KEYC_MUHENKAN)
+	if (rawcode <= 0x03 || rawcode == 0x29 || rawcode == 0x35 || (rawcode >= 0x39 && rawcode <= 0x53) || rawcode == 0x65 || rawcode == 0x88 || rawcode == 0x8A || rawcode == 0x8B)
 	{
-		return rawcode | CELL_KB_RAWDAT;
+		return rawcode | 0x8000;
 	}
 
 	const bool is_alt = mkey & (CELL_KB_MKEY_L_ALT | CELL_KB_MKEY_R_ALT);
 	const bool is_shift = mkey & (CELL_KB_MKEY_L_SHIFT | CELL_KB_MKEY_R_SHIFT);
 	const bool is_caps_lock = led & (CELL_KB_LED_CAPS_LOCK);
 	const bool is_num_lock = led & (CELL_KB_LED_NUM_LOCK);
-	const bool is_shift_lock = is_caps_lock && (arrange == CELL_KB_MAPPING_GERMAN_GERMANY || arrange == CELL_KB_MAPPING_FRENCH_FRANCE);
 
 	// CELL_KB_NUMPAD
 
 	if (is_num_lock)
 	{
-		//if (rawcode == CELL_KEYC_KPAD_NUMLOCK)  return 0x00 | CELL_KB_KEYPAD;                                     // 'Num Lock' (unreachable)
-		if (rawcode == CELL_KEYC_KPAD_SLASH)    return 0x2F | CELL_KB_KEYPAD;                                     // '/'
-		if (rawcode == CELL_KEYC_KPAD_ASTERISK) return 0x2A | CELL_KB_KEYPAD;                                     // '*'
-		if (rawcode == CELL_KEYC_KPAD_MINUS)    return 0x2D | CELL_KB_KEYPAD;                                     // '-'
-		if (rawcode == CELL_KEYC_KPAD_PLUS)     return 0x2B | CELL_KB_KEYPAD;                                     // '+'
-		if (rawcode == CELL_KEYC_KPAD_ENTER)    return 0x0A | CELL_KB_KEYPAD;                                     // '\n'
-		if (rawcode == CELL_KEYC_KPAD_0)        return 0x30 | CELL_KB_KEYPAD;                                     // '0'
-		if (rawcode >= CELL_KEYC_KPAD_1 && rawcode <= CELL_KEYC_KPAD_9) return (rawcode - 0x28) | CELL_KB_KEYPAD; // '1' - '9'
+		if (rawcode == CELL_KEYC_KPAD_NUMLOCK)  return 0x00 | 0x4000;                                     // 'Num Lock'
+		if (rawcode == CELL_KEYC_KPAD_SLASH)    return 0x2F | 0x4000;                                     // '/'
+		if (rawcode == CELL_KEYC_KPAD_ASTERISK) return 0x2A | 0x4000;                                     // '*'
+		if (rawcode == CELL_KEYC_KPAD_MINUS)    return 0x2D | 0x4000;                                     // '-'
+		if (rawcode == CELL_KEYC_KPAD_PLUS)     return 0x2B | 0x4000;                                     // '+'
+		if (rawcode == CELL_KEYC_KPAD_ENTER)    return 0x0A | 0x4000;                                     // '\n'
+		if (rawcode == CELL_KEYC_KPAD_0)        return 0x30 | 0x4000;                                     // '0'
+		if (rawcode >= CELL_KEYC_KPAD_1 && rawcode <= CELL_KEYC_KPAD_9) return (rawcode - 0x28) | 0x4000; // '1' - '9'
 	}
 
 	// ASCII
 
-	const auto get_ascii = [&](u16 raw, u16 shifted = 0, u16 altered = 0)
+	const auto get_ascii = [is_alt, is_shift, is_caps_lock](u16 raw, u16 shifted = 0, u16 altered = 0)
 	{
-		// Usually caps lock only applies uppercase to letters, but some layouts treat it as shift lock for all keys.
-		if ((is_shift || (is_caps_lock && (is_shift_lock || std::isalpha(raw)))) && shifted)
+		if ((is_shift || is_caps_lock) && shifted)
 		{
 			return shifted;
 		}
-		if (is_alt && altered)
+		else if (is_alt && altered)
 		{
 			return altered;
 		}
@@ -284,22 +223,21 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode)
 		if (rawcode == CELL_KEYC_Q)                     return get_ascii('q', 'Q', '@');
 	}
 
-	if (rawcode >= CELL_KEYC_A && rawcode <= CELL_KEYC_Z) // 'A' - 'Z'
+	if (rawcode >= 0x04 && rawcode <= 0x1D)                                   // 'A' - 'Z'
 	{
-		if (is_shift != is_caps_lock)
-		{
-			return rawcode + 0x3D; // Return uppercase if exactly one is active.
-		}
-
-		return rawcode + 0x5D; // Return lowercase if none or both are active.
+		rawcode -=
+			(is_shift)
+				? ((led & (CELL_KB_LED_CAPS_LOCK)) ? 0 : 0x20)
+				: ((led & (CELL_KB_LED_CAPS_LOCK)) ? 0x20 : 0);
+		return rawcode + 0x5D;
 	}
-	if (rawcode >= CELL_KEYC_1 && rawcode <= CELL_KEYC_9) return rawcode + 0x13; // '1' - '9'
-	if (rawcode == CELL_KEYC_0) return 0x30;                                     // '0'
-	if (rawcode == CELL_KEYC_ENTER) return 0x0A;                                 // '\n'
-	//if (rawcode == CELL_KEYC_ESC) return 0x1B;                                   // 'ESC' (unreachable)
-	if (rawcode == CELL_KEYC_BS) return 0x08;                                    // '\b'
-	if (rawcode == CELL_KEYC_TAB) return 0x09;                                   // '\t'
-	if (rawcode == CELL_KEYC_SPACE) return 0x20;                                 // 'space'
+	if (rawcode >= 0x1E && rawcode <= 0x26) return rawcode + 0x13;            // '1' - '9'
+	if (rawcode == 0x27) return 0x30;                                         // '0'
+	if (rawcode == 0x28) return 0x0A;                                         // '\n'
+	if (rawcode == 0x29) return 0x1B;                                         // 'ESC'
+	if (rawcode == 0x2A) return 0x08;                                         // '\b'
+	if (rawcode == 0x2B) return 0x09;                                         // '\t'
+	if (rawcode == 0x2C) return 0x20;                                         // 'space'
 
 	// TODO: Add more keys and layouts
 
@@ -308,7 +246,7 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode)
 
 error_code cellKbGetInfo(vm::ptr<CellKbInfo> info)
 {
-	cellKb.trace("cellKbGetInfo(info=*0x%x)", info);
+	sys_io.trace("cellKbGetInfo(info=*0x%x)", info);
 
 	auto& handler = g_fxo->get<KeyboardHandlerBase>();
 
@@ -323,9 +261,8 @@ error_code cellKbGetInfo(vm::ptr<CellKbInfo> info)
 	std::memset(info.get_ptr(), 0, info.size());
 
 	std::lock_guard<std::mutex> lock(handler.m_mutex);
-	keyboard_consumer& consumer = handler.GetConsumer(keyboard_consumer::identifier::cellKb);
 
-	const KbInfo& current_info = consumer.GetInfo();
+	const KbInfo& current_info = handler.GetInfo();
 	info->max_connect = current_info.max_connect;
 	info->now_connect = current_info.now_connect;
 	info->info = current_info.info;
@@ -340,7 +277,7 @@ error_code cellKbGetInfo(vm::ptr<CellKbInfo> info)
 
 error_code cellKbRead(u32 port_no, vm::ptr<CellKbData> data)
 {
-	cellKb.trace("cellKbRead(port_no=%d, data=*0x%x)", port_no, data);
+	sys_io.trace("cellKbRead(port_no=%d, data=*0x%x)", port_no, data);
 
 	auto& handler = g_fxo->get<KeyboardHandlerBase>();
 
@@ -353,43 +290,20 @@ error_code cellKbRead(u32 port_no, vm::ptr<CellKbData> data)
 		return CELL_KB_ERROR_INVALID_PARAMETER;
 
 	std::lock_guard<std::mutex> lock(handler.m_mutex);
-	keyboard_consumer& consumer = handler.GetConsumer(keyboard_consumer::identifier::cellKb);
-	const KbInfo& current_info = consumer.GetInfo();
 
-	if (port_no >= consumer.GetKeyboards().size() || current_info.status[port_no] != CELL_KB_STATUS_CONNECTED)
-		return not_an_error(CELL_KB_ERROR_NO_DEVICE);
+	const KbInfo& current_info = handler.GetInfo();
 
-	KbData& current_data = consumer.GetData(port_no);
+	if (port_no >= handler.GetKeyboards().size() || current_info.status[port_no] != CELL_KB_STATUS_CONNECTED)
+		return CELL_KB_ERROR_NO_DEVICE;
 
-	if (current_info.is_null_handler || (current_info.info & CELL_KB_INFO_INTERCEPTED) || !is_input_allowed())
+	KbData& current_data = handler.GetData(port_no);
+	data->led = current_data.led;
+	data->mkey = current_data.mkey;
+	data->len = std::min<s32>(CELL_KB_MAX_KEYCODES, current_data.len);
+
+	for (s32 i = 0; i < current_data.len; i++)
 	{
-		data->led = 0;
-		data->mkey = 0;
-		data->len = 0;
-	}
-	else
-	{
-		data->led = current_data.led;
-		data->mkey = current_data.mkey;
-		data->len = std::min<s32>(CELL_KB_MAX_KEYCODES, current_data.len);
-	}
-
-	if (current_data.len > 0)
-	{
-		for (s32 i = 0; i < current_data.len; i++)
-		{
-			data->keycode[i] = current_data.buttons[i].m_keyCode;
-		}
-
-		KbConfig& current_config = consumer.GetConfig(port_no);
-
-		// For single character mode to work properly we need to "flush" the buffer after reading or else we'll constantly get the same key presses with each call.
-		// Actual key repeats are handled by adding a new key code to the buffer periodically. Key releases are handled in a similar fashion.
-		// Warning: Don't do this in packet mode, which is basically the mouse and keyboard gaming mode. Otherwise games like Unreal Tournament will be unplayable.
-		if (current_config.read_mode == CELL_KB_RMODE_INPUTCHAR)
-		{
-			current_data.len = 0;
-		}
+		data->keycode[i] = current_data.keycode[i].first;
 	}
 
 	return CELL_OK;
@@ -397,7 +311,7 @@ error_code cellKbRead(u32 port_no, vm::ptr<CellKbData> data)
 
 error_code cellKbSetCodeType(u32 port_no, u32 type)
 {
-	cellKb.trace("cellKbSetCodeType(port_no=%d, type=%d)", port_no, type);
+	sys_io.trace("cellKbSetCodeType(port_no=%d, type=%d)", port_no, type);
 
 	auto& handler = g_fxo->get<KeyboardHandlerBase>();
 
@@ -409,13 +323,12 @@ error_code cellKbSetCodeType(u32 port_no, u32 type)
 	if (port_no >= CELL_KB_MAX_KEYBOARDS || type > CELL_KB_CODETYPE_ASCII)
 		return CELL_KB_ERROR_INVALID_PARAMETER;
 
-	std::lock_guard<std::mutex> lock(handler.m_mutex);
-	keyboard_consumer& consumer = handler.GetConsumer(keyboard_consumer::identifier::cellKb);
-
-	if (port_no >= consumer.GetKeyboards().size())
+	if (port_no >= handler.GetKeyboards().size())
 		return CELL_OK;
 
-	KbConfig& current_config = consumer.GetConfig(port_no);
+	std::lock_guard<std::mutex> lock(handler.m_mutex);
+
+	KbConfig& current_config = handler.GetConfig(port_no);
 	current_config.code_type = type;
 
 	// can also return CELL_KB_ERROR_SYS_SETTING_FAILED
@@ -425,7 +338,7 @@ error_code cellKbSetCodeType(u32 port_no, u32 type)
 
 error_code cellKbSetLEDStatus(u32 port_no, u8 led)
 {
-	cellKb.trace("cellKbSetLEDStatus(port_no=%d, led=%d)", port_no, led);
+	sys_io.trace("cellKbSetLEDStatus(port_no=%d, led=%d)", port_no, led);
 
 	auto& handler = g_fxo->get<KeyboardHandlerBase>();
 
@@ -440,13 +353,12 @@ error_code cellKbSetLEDStatus(u32 port_no, u8 led)
 	if (led > 7)
 		return CELL_KB_ERROR_SYS_SETTING_FAILED;
 
-	std::lock_guard<std::mutex> lock(handler.m_mutex);
-	keyboard_consumer& consumer = handler.GetConsumer(keyboard_consumer::identifier::cellKb);
-
-	if (port_no >= consumer.GetKeyboards().size() || consumer.GetInfo().status[port_no] != CELL_KB_STATUS_CONNECTED)
+	if (port_no >= handler.GetKeyboards().size() || handler.GetInfo().status[port_no] != CELL_KB_STATUS_CONNECTED)
 		return CELL_KB_ERROR_FATAL;
 
-	KbData& current_data = consumer.GetData(port_no);
+	std::lock_guard<std::mutex> lock(handler.m_mutex);
+
+	KbData& current_data = handler.GetData(port_no);
 	current_data.led = static_cast<u32>(led);
 
 	return CELL_OK;
@@ -454,7 +366,7 @@ error_code cellKbSetLEDStatus(u32 port_no, u8 led)
 
 error_code cellKbSetReadMode(u32 port_no, u32 rmode)
 {
-	cellKb.trace("cellKbSetReadMode(port_no=%d, rmode=%d)", port_no, rmode);
+	sys_io.trace("cellKbSetReadMode(port_no=%d, rmode=%d)", port_no, rmode);
 
 	auto& handler = g_fxo->get<KeyboardHandlerBase>();
 
@@ -466,18 +378,13 @@ error_code cellKbSetReadMode(u32 port_no, u32 rmode)
 	if (port_no >= CELL_KB_MAX_KEYBOARDS || rmode > CELL_KB_RMODE_PACKET)
 		return CELL_KB_ERROR_INVALID_PARAMETER;
 
-	std::lock_guard<std::mutex> lock(handler.m_mutex);
-	keyboard_consumer& consumer = handler.GetConsumer(keyboard_consumer::identifier::cellKb);
-
-	if (port_no >= consumer.GetKeyboards().size())
+	if (port_no >= handler.GetKeyboards().size())
 		return CELL_OK;
 
-	KbConfig& current_config = consumer.GetConfig(port_no);
-	current_config.read_mode = rmode;
+	std::lock_guard<std::mutex> lock(handler.m_mutex);
 
-	// Key repeat must be disabled in packet mode. But let's just always enable it otherwise.
-	Keyboard& keyboard = consumer.GetKeyboards()[port_no];
-	keyboard.m_key_repeat = rmode != CELL_KB_RMODE_PACKET;
+	KbConfig& current_config = handler.GetConfig(port_no);
+	current_config.read_mode = rmode;
 
 	// can also return CELL_KB_ERROR_SYS_SETTING_FAILED
 
@@ -486,7 +393,7 @@ error_code cellKbSetReadMode(u32 port_no, u32 rmode)
 
 error_code cellKbGetConfiguration(u32 port_no, vm::ptr<CellKbConfig> config)
 {
-	cellKb.trace("cellKbGetConfiguration(port_no=%d, config=*0x%x)", port_no, config);
+	sys_io.trace("cellKbGetConfiguration(port_no=%d, config=*0x%x)", port_no, config);
 
 	auto& handler = g_fxo->get<KeyboardHandlerBase>();
 
@@ -500,18 +407,16 @@ error_code cellKbGetConfiguration(u32 port_no, vm::ptr<CellKbConfig> config)
 
 	std::lock_guard<std::mutex> lock(handler.m_mutex);
 
-	keyboard_consumer& consumer = handler.GetConsumer(keyboard_consumer::identifier::cellKb);
+	const KbInfo& current_info = handler.GetInfo();
 
-	const KbInfo& current_info = consumer.GetInfo();
-
-	if (port_no >= consumer.GetKeyboards().size() || current_info.status[port_no] != CELL_KB_STATUS_CONNECTED)
-		return not_an_error(CELL_KB_ERROR_NO_DEVICE);
+	if (port_no >= handler.GetKeyboards().size() || current_info.status[port_no] != CELL_KB_STATUS_CONNECTED)
+		return CELL_KB_ERROR_NO_DEVICE;
 
 	// tests show that config is checked only after the device's status
 	if (!config)
 		return CELL_KB_ERROR_INVALID_PARAMETER;
 
-	const KbConfig& current_config = consumer.GetConfig(port_no);
+	const KbConfig& current_config = handler.GetConfig(port_no);
 	config->arrange = current_config.arrange;
 	config->read_mode = current_config.read_mode;
 	config->code_type = current_config.code_type;
diff --git a/rpcs3/Emu/Cell/Modules/cellKey2char.cpp b/rpcs3/Emu/Cell/Modules/cellKey2char.cpp
index ba09a702ba..bbe7e186fe 100644
--- a/rpcs3/Emu/Cell/Modules/cellKey2char.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellKey2char.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/Io/Keyboard.h"
+#include "cellKb.h"
 
 LOG_CHANNEL(cellKey2char);
 
diff --git a/rpcs3/Emu/Cell/Modules/cellL10n.cpp b/rpcs3/Emu/Cell/Modules/cellL10n.cpp
index 6b3ffc4448..5de490b1a1 100644
--- a/rpcs3/Emu/Cell/Modules/cellL10n.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellL10n.cpp
@@ -6,7 +6,7 @@
 #include <Windows.h>
 #endif
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 typedef int HostCode;
 #else
 #include <iconv.h>
@@ -16,13 +16,15 @@ typedef const char *HostCode;
 
 #include "cellL10n.h"
 
+#include "util/asm.hpp"
+
 LOG_CHANNEL(cellL10n);
 
 // Translate code id to code name. some codepage may has another name.
 // If this makes your compilation fail, try replace the string code with one in "iconv -l"
 bool _L10nCodeParse(s32 code, HostCode& retCode)
 {
-#ifdef _WIN32
+#ifdef _MSC_VER
 	retCode = 0;
 	if ((code >= _L10N_CODE_) || (code < 0)) return false;
 	switch (code)
@@ -54,7 +56,9 @@ bool _L10nCodeParse(s32 code, HostCode& retCode)
 	case L10N_CODEPAGE_866:     retCode = 866;          return true;
 	case L10N_CODEPAGE_932:     retCode = 932;          return true;
 	case L10N_CODEPAGE_936:     retCode = 936;          return true; // GBK
+	case L10N_GBK:              retCode = 936;          return true;
 	case L10N_CODEPAGE_949:     retCode = 949;          return true; // UHC
+	case L10N_UHC:              retCode = 949;          return true; // UHC
 	case L10N_CODEPAGE_950:     retCode = 950;          return true;
 	case L10N_CODEPAGE_1251:    retCode = 1251;         return true; // CYRL
 	case L10N_CODEPAGE_1252:    retCode = 1252;         return true; // ANSI
@@ -62,11 +66,14 @@ bool _L10nCodeParse(s32 code, HostCode& retCode)
 	case L10N_EUC_JP:           retCode = 51932;        return true;
 	case L10N_EUC_KR:           retCode = 51949;        return true;
 	case L10N_ISO_2022_JP:      retCode = 50222;        return true;
+	case L10N_JIS:              retCode = 50222;        return true;
 	// Maybe 708/720/864/1256/10004/20420/28596/
 	case L10N_ARIB:             retCode = 20420;        return true; // TODO: think that should be ARABIC.
 	case L10N_HZ:               retCode = 52936;        return true;
 	case L10N_GB18030:          retCode = 54936;        return true;
 	case L10N_RIS_506:          retCode = 932;          return true; // MS_KANJI, TODO: Code page
+	case L10N_SHIFT_JIS:        retCode = 932;          return true; // SJIS
+	case L10N_MUSIC_SHIFT_JIS:  retCode = 932;          return true; // MSJIS
 	// These are only supported with FW 3.10 and above
 	case L10N_CODEPAGE_852:     retCode = 852;          return true;
 	case L10N_CODEPAGE_1250:    retCode = 1250;         return true; // EE
@@ -82,6 +89,7 @@ bool _L10nCodeParse(s32 code, HostCode& retCode)
 	case L10N_CODEPAGE_861:     retCode = 861;          return true;
 	case L10N_CODEPAGE_865:     retCode = 865;          return true;
 	case L10N_CODEPAGE_869:     retCode = 869;          return true;
+	case L10N_BIG5:             retCode = 950;          return true; // Codepage 950
 	default:                                            return false;
 	}
 #else
@@ -115,18 +123,24 @@ bool _L10nCodeParse(s32 code, HostCode& retCode)
 	case L10N_CODEPAGE_866:     retCode = "CP866";          return true;
 	case L10N_CODEPAGE_932:     retCode = "CP932";          return true;
 	case L10N_CODEPAGE_936:     retCode = "CP936";          return true;
+	case L10N_GBK:              retCode = "CP936";          return true;
 	case L10N_CODEPAGE_949:     retCode = "CP949";          return true;
+	case L10N_UHC:              retCode = "CP949";          return true;
 	case L10N_CODEPAGE_950:     retCode = "CP950";          return true;
+	case L10N_BIG5:             retCode = "CP950";          return true; // BIG5 = CodePage 950
 	case L10N_CODEPAGE_1251:    retCode = "CP1251";         return true; // CYRL
 	case L10N_CODEPAGE_1252:    retCode = "CP1252";         return true; // ANSI
 	case L10N_EUC_CN:           retCode = "EUC-CN";         return true; // GB2312
 	case L10N_EUC_JP:           retCode = "EUC-JP";         return true;
 	case L10N_EUC_KR:           retCode = "EUC-KR";         return true;
 	case L10N_ISO_2022_JP:      retCode = "ISO-2022-JP";    return true;
+	case L10N_JIS:              retCode = "ISO-2022-JP";    return true;
 	case L10N_ARIB:             retCode = "ARABIC";         return true; // TODO: think that should be ARABIC.
 	case L10N_HZ:               retCode = "HZ";             return true;
 	case L10N_GB18030:          retCode = "GB18030";        return true;
 	case L10N_RIS_506:          retCode = "Shift_JIS";      return true; // MS_KANJI
+	case L10N_SHIFT_JIS:        retCode = "Shift_JIS";      return true; // CP932 for Microsoft
+	case L10N_MUSIC_SHIFT_JIS:  retCode = "Shift_JIS";      return true; // MusicShiftJIS
 	// These are only supported with FW 3.10 and below
 	case L10N_CODEPAGE_852:     retCode = "CP852";          return true;
 	case L10N_CODEPAGE_1250:    retCode = "CP1250";         return true; // EE
@@ -147,39 +161,44 @@ bool _L10nCodeParse(s32 code, HostCode& retCode)
 #endif
 }
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 
 // Use code page to transform std::string to std::wstring.
-s32 _OEM2Wide(HostCode oem_code, std::string_view src, std::wstring& dst)
+s32 _OEM2Wide(HostCode oem_code, const std::string& src, std::wstring& dst)
 {
-	// Such length returned should include the '\0' character.
-	const s32 length = MultiByteToWideChar(oem_code, 0, src.data(), -1, nullptr, 0);
-	std::vector<wchar_t> store(length);
+	//Such length returned should include the '\0' character.
+	const s32 length = MultiByteToWideChar(oem_code, 0, src.c_str(), -1, nullptr, 0);
+	wchar_t *store = new wchar_t[length]();
 
-	MultiByteToWideChar(oem_code, 0, src.data(), -1, static_cast<LPWSTR>(store.data()), length);
-	dst = std::wstring(store.data());
+	MultiByteToWideChar(oem_code, 0, src.c_str(), -1, static_cast<LPWSTR>(store), length);
+	dst = std::wstring(store);
+
+	delete[] store;
+	store = nullptr;
 
 	return length - 1;
 }
 
 // Use Code page to transform std::wstring to std::string.
-s32 _Wide2OEM(HostCode oem_code, std::wstring_view src, std::string& dst)
+s32 _Wide2OEM(HostCode oem_code, const std::wstring& src, std::string& dst)
 {
 	//Such length returned should include the '\0' character.
-	const s32 length = WideCharToMultiByte(oem_code, 0, src.data(), -1, nullptr, 0, nullptr, nullptr);
-	std::vector<char> store(length);
+	const s32 length = WideCharToMultiByte(oem_code, 0, src.c_str(), -1, nullptr, 0, nullptr, nullptr);
+	char *store = new char[length]();
 
-	WideCharToMultiByte(oem_code, 0, src.data(), -1, store.data(), length, nullptr, nullptr);
-	dst = std::string(store.data());
+	WideCharToMultiByte(oem_code, 0, src.c_str(), -1, store, length, nullptr, nullptr);
+	dst = std::string(store);
+
+	delete[] store;
+	store = nullptr;
 
 	return length - 1;
 }
 
 // Convert Codepage to Codepage (all char*)
-std::string _OemToOem(HostCode src_code, HostCode dst_code, std::string_view str)
+std::string _OemToOem(HostCode src_code, HostCode dst_code, const std::string& str)
 {
-	std::wstring wide;
-	std::string result;
+	std::wstring wide; std::string result;
 	_OEM2Wide(src_code, str, wide);
 	_Wide2OEM(dst_code, wide, result);
 	return result;
@@ -187,26 +206,24 @@ std::string _OemToOem(HostCode src_code, HostCode dst_code, std::string_view str
 
 #endif
 
-s32 _ConvertStr(s32 src_code, const void *src, s32 src_len, s32 dst_code, void *dst, s32 *dst_len, [[maybe_unused]] bool allowIncomplete)
+s32 _ConvertStr(s32 src_code, const void *src, s32 src_len, s32 dst_code, void *dst, s32 *dst_len, bool allowIncomplete)
 {
 	HostCode srcCode = 0, dstCode = 0;	//OEM code pages
-	const bool src_page_converted = _L10nCodeParse(src_code, srcCode);	//Check if code is in list.
-	const bool dst_page_converted = _L10nCodeParse(dst_code, dstCode);
+	bool src_page_converted = _L10nCodeParse(src_code, srcCode);	//Check if code is in list.
+	bool dst_page_converted = _L10nCodeParse(dst_code, dstCode);
 
-	if (((!src_page_converted) && (srcCode == 0)) ||
-		((!dst_page_converted) && (dstCode == 0)))
-	{
+	if (((!src_page_converted) && (srcCode == 0))
+		|| ((!dst_page_converted) && (dstCode == 0)))
 		return ConverterUnknown;
-	}
 
-#ifdef _WIN32
-	const std::string_view wrapped_source = std::string_view(static_cast<const char *>(src), src_len);
+#ifdef _MSC_VER
+	const std::string wrapped_source = std::string(static_cast<const char *>(src), src_len);
 	const std::string target = _OemToOem(srcCode, dstCode, wrapped_source);
 
-	if (dst)
+	if (dst != nullptr)
 	{
-		if (target.length() > static_cast<usz>(*dst_len)) return DSTExhausted;
-		std::memcpy(dst, target.c_str(), target.length());
+		if (target.length() > *dst_len) return DSTExhausted;
+		memcpy(dst, target.c_str(), target.length());
 	}
 	*dst_len = ::narrow<s32>(target.size());
 
@@ -215,7 +232,7 @@ s32 _ConvertStr(s32 src_code, const void *src, s32 src_len, s32 dst_code, void *
 	s32 retValue = ConversionOK;
 	iconv_t ict = iconv_open(dstCode, srcCode);
 	usz srcLen = src_len;
-	if (dst)
+	if (dst != NULL)
 	{
 		usz dstLen = *dst_len;
 		usz ictd = iconv(ict, utils::bless<char*>(&src), &srcLen, utils::bless<char*>(&dst), &dstLen);
@@ -265,7 +282,7 @@ s32 _ConvertStr(s32 src_code, const void *src, s32 src_len, s32 dst_code, void *
 #endif
 }
 
-s32 _L10nConvertStr(s32 src_code, vm::cptr<void> src, vm::cptr<u32> src_len, s32 dst_code, vm::ptr<void> dst, vm::ptr<u32> dst_len)
+s32 _L10nConvertStr(s32 src_code, vm::cptr<void> src, vm::cptr<s32> src_len, s32 dst_code, vm::ptr<void> dst, vm::ptr<s32> dst_len)
 {
 	s32 dstLen = *dst_len;
 	s32 result = _ConvertStr(src_code, src.get_ptr(), *src_len, dst_code, dst ? dst.get_ptr() : nullptr, &dstLen, false);
@@ -273,7 +290,7 @@ s32 _L10nConvertStr(s32 src_code, vm::cptr<void> src, vm::cptr<u32> src_len, s32
 	return result;
 }
 
-s32 _L10nConvertChar(s32 src_code, const void *src, u32 src_len, s32 dst_code, vm::ptr<void> dst, vm::ptr<u32> dst_len)
+s32 _L10nConvertChar(s32 src_code, const void *src, s32 src_len, s32 dst_code, vm::ptr<void> dst, vm::ptr<s32> dst_len)
 {
 	s32 dstLen = 0x7FFFFFFF;
 	s32 result = _ConvertStr(src_code, src, src_len, dst_code, dst.get_ptr(), &dstLen, true);
@@ -281,32 +298,28 @@ s32 _L10nConvertChar(s32 src_code, const void *src, u32 src_len, s32 dst_code, v
 	return result;
 }
 
+s32 _L10nConvertCharNoResult(s32 src_code, const void *src, s32 src_len, s32 dst_code, vm::ptr<void> dst)
+{
+	s32 dstLen = 0x7FFFFFFF;
+	[[maybe_unused]] s32 result = _ConvertStr(src_code, src, src_len, dst_code, dst.get_ptr(), &dstLen, true);
+	return dstLen;
+}
+
 s32 UCS2toEUCJP()
 {
 	cellL10n.todo("UCS2toEUCJP()");
 	return 0;
 }
 
-s32 l10n_convert(s32 cd, vm::cptr<void> src, vm::ptr<void> dst, vm::ptr<u32> dst_len)
+s32 l10n_convert()
 {
-	cellL10n.todo("l10n_convert(cd=0x%x, src=*0x%x, dst=*0x%x, dst_len=*0x%x)", cd, src, dst, dst_len);
+	cellL10n.todo("l10n_convert()");
 	return 0;
 }
 
-s32 UCS2toUTF32(u16 ucs2, vm::ptr<u32> utf32)
+s32 UCS2toUTF32()
 {
-	cellL10n.notice("UCS2toUTF32(ucs2=0x%x, utf32=*0x%x)", ucs2, utf32);
-
-	const s32 sucs2 = static_cast<s32>(ucs2);
-
-	if ((sucs2 & UTF16_SURROGATES_MASK1) != UTF16_HIGH_SURROGATES)
-	{
-		ensure(!!utf32); // Not actually checked
-
-		*utf32 = sucs2;
-		return 1;
-	}
-
+	cellL10n.todo("UCS2toUTF32()");
 	return 0;
 }
 
@@ -370,43 +383,9 @@ s32 kuten2eucjp()
 	return 0;
 }
 
-u16 sjis2jis(u16 c)
+s32 sjis2jis()
 {
-	cellL10n.notice("sjis2jis(c=0x%x)", c);
-
-	u64 v0 = static_cast<u64>(static_cast<s64>(static_cast<s16>(c))) >> 8 & 0xff;
-	u64 v1 = v0 - 0x81;
-
-	if (((v1 & 0xffff) >= 0x7c) || (0x3f >= ((v0 - 0xa0) & 0xffff)))
-	{
-		return 0;
-	}
-
-	const u64 v2 = static_cast<s64>(static_cast<s16>(c)) & 0xff;
-
-	if (0x3f < v2 && (v2 < 0xfd && (static_cast<s16>(v2) != 0x7f)))
-	{
-		if (0x9f < v0)
-		{
-			v1 = v0 - 0xc1;
-		}
-
-		u16 v3 = static_cast<s16>(v2) - 0x7e;
-		v0 = (v1 & 0x7fffffff) * 2 + 0x22;
-
-		if (v2 < 0x9f)
-		{
-			const s16 v4 = v2 < 0x7f ? 0x1f : 0x20;
-			v3 = static_cast<s16>(v2) - v4;
-			v0 = (v1 & 0x7fffffff) * 2 + 0x21;
-		}
-
-		if ((v0 & 0xffff) < 0x7f)
-		{
-			return static_cast<u16>((v0 & 0xffff) << 8) | v3;
-		}
-	}
-
+	cellL10n.todo("sjis2jis()");
 	return 0;
 }
 
@@ -511,58 +490,9 @@ s32 eucjp2jis()
 	return CELL_OK;
 }
 
-s32 UTF32toUTF8(u32 src, vm::ptr<u8> dst);
-
-s32 UTF32stoUTF8s(vm::cptr<u32> src, vm::ptr<u32> src_len, vm::ptr<u8> dst, vm::ptr<u32> dst_len)
+s32 UTF32stoUTF8s(vm::cptr<u32> src, vm::cptr<s32> src_len, vm::ptr<u8> dst, vm::ptr<s32> dst_len)
 {
-	cellL10n.notice("UTF32stoUTF8s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	auto tmp = vm::make_var<be_t<u8>[4]>({0, 0, 0, 0});
-	const vm::ptr<u8> utf8_tmp = vm::cast(tmp.addr());
-
-	for (u32 src_pos = 0; src_pos < *src_len; src_pos++)
-	{
-		const s32 utf8_len = UTF32toUTF8(src[src_pos], utf8_tmp);
-
-		if (utf8_len == 0)
-		{
-			*src_len -= src_pos;
-			*dst_len = len;
-			return SRCIllegal;
-		}
-
-		len += utf8_len;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = len - utf8_len;
-				return DSTExhausted;
-			}
-
-			for (s32 i = 0; i < utf8_len; i++)
-			{
-				dst[dst_pos++] = utf8_tmp[i];
-			}
-		}
-	}
-
-	*dst_len = len;
+	cellL10n.todo("UTF32stoUTF8s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
 	return ConversionOK;
 }
 
@@ -572,140 +502,27 @@ s32 sjishan2zen()
 	return 0;
 }
 
-s32 UCS2toSBCS(u16 src, vm::ptr<u8> dst, u32 code_page)
+s32 UCS2toSBCS()
 {
-	cellL10n.notice("UCS2toSBCS(src=0x%x, dst=*0x%x, code_page=0x%x)", src, dst, code_page);
-
-	HostCode code = 0;
-	if ((code_page >= _L10N_CODE_) || !_L10nCodeParse(code_page, code))
-	{
-		return -1;
-	}
-
-	if (src < 0xfffe)
-	{
-		ensure(!!dst); // Not really checked
-
-		if (src < 0x80)
-		{
-			*dst = static_cast<u8>(src);
-			return 1;
-		}
-
-		vm::var<u32> dst_len = vm::make_var<u32>(0);
-		const s32 res = _L10nConvertChar(L10N_UCS2, &src, sizeof(src), code_page, dst, dst_len);
-
-		if (res == ConversionOK)
-		{
-			return 1;
-		}
-
-		if (res == ConverterUnknown)
-		{
-			return -1;
-		}
-	}
-
+	cellL10n.todo("UCS2toSBCS()");
 	return 0;
 }
 
 s32 UTF8stoGBKs()
 {
-	cellL10n.todo("UTF8stoGBKs()");
+	cellL10n.todo("UCS2toSBCS()");
 	return ConversionOK;
 }
 
-s32 UTF8toUCS2(vm::cptr<u8> src, vm::ptr<u16> dst)
+s32 UTF8toUCS2()
 {
-	cellL10n.notice("UTF8toUCS2(src=*0x%x, dst=*0x%x)", src, dst);
-
-	ensure(src && dst); // Not really checked
-
-	if ((((src[0] & 0xf0) == 0xe0) && ((src[1] & 0xc0) == 0x80)) && ((src[2] & 0xc0) == 0x80))
-	{
-		const u64 ucs2 = (static_cast<u64>(src[1]) & 0x3f) << 6 | (static_cast<u64>(src[0]) & 0xf) << 0xc | (static_cast<u64>(src[2]) & 0x3f);
-
-		if (ucs2 < 0x800)
-		{
-			return 0;
-		}
-
-		if ((static_cast<u32>(ucs2) & UTF16_SURROGATES_MASK1) == UTF16_HIGH_SURROGATES)
-		{
-			return 0;
-		}
-
-		*dst = static_cast<u16>(ucs2);
-		return 3;
-	}
-
-	if ((((src[0] & 0xe0) == 0xc0) && (0xc1 < static_cast<u64>(src[0]))) && ((src[1] & 0xc0) == 0x80))
-	{
-		*dst = (src[0] & 0x1f) << 6 | (src[1] & 0x3f);
-		return 2;
-	}
-
-	if (static_cast<s8>(src[0]) < '\0')
-	{
-		return 0;
-	}
-
-	*dst = static_cast<u16>(src[0]);
-	return 1;
+	cellL10n.todo("UTF8toUCS2()");
+	return 0;
 }
 
-s32 UCS2toUTF8(u16 ucs2, vm::ptr<u8> utf8);
-
-s32 UCS2stoUTF8s(vm::cptr<u16> src, vm::ptr<u32> src_len, vm::ptr<u8> dst, vm::ptr<u32> dst_len)
+s32 UCS2stoUTF8s(vm::cptr<u16> src, vm::cptr<s32> src_len, vm::ptr<u8> dst, vm::ptr<s32> dst_len)
 {
-	cellL10n.notice("UCS2stoUTF8s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	auto tmp = vm::make_var<be_t<u8>[4]>({0, 0, 0, 0});
-	const vm::ptr<u8> utf8_tmp = vm::cast(tmp.addr());
-
-	for (u32 src_pos = 0; src_pos < *src_len; src_pos++)
-	{
-		const s32 utf8_size = UCS2toUTF8(src[src_pos], utf8_tmp);
-
-		if (utf8_size == 0)
-		{
-			*src_len -= src_pos;
-			*dst_len = len;
-			return SRCIllegal;
-		}
-
-		len += utf8_size;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = len - utf8_size;
-				return DSTExhausted;
-			}
-
-			for (s32 i = 0; i < utf8_size; i++)
-			{
-				dst[dst_pos++] = utf8_tmp[i];
-			}
-		}
-	}
-
-	*dst_len = len;
+	cellL10n.todo("UCS2stoUTF8s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
 	return ConversionOK;
 }
 
@@ -715,57 +532,10 @@ s32 EUCKRstoUTF8s()
 	return ConversionOK;
 }
 
-s32 UTF16toUTF32(vm::cptr<u16> src, vm::ptr<u32> dst);
-
-s32 UTF16stoUTF32s(vm::cptr<u16> src, vm::ptr<u32> src_len, vm::ptr<u32> dst, vm::ptr<u32> dst_len)
+s32 UTF16stoUTF32s(vm::cptr<u16> src, vm::cptr<s32> src_len, vm::ptr<u32> dst, vm::ptr<s32> dst_len)
 {
-	cellL10n.notice("UTF16stoUTF32s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	vm::var<u32> utf32_tmp = vm::make_var<u32>(0);
-
-	for (u32 src_pos = 0; src_pos < *src_len;)
-	{
-		const s32 utf16_len = UTF16toUTF32(src + src_pos, utf32_tmp);
-
-		if (utf16_len == 0)
-		{
-			*src_len -= src_pos;
-			*dst_len = len;
-			return SRCIllegal;
-		}
-
-		len++;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = dst_pos;
-				return DSTExhausted;
-			}
-
-			dst[dst_pos++] = *utf32_tmp;
-		}
-
-		src_pos += utf16_len;
-	}
-
-	*dst_len = len;
-	return ConversionOK;
+	cellL10n.warning("UTF16stoUTF32s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
+	return _L10nConvertStr(L10N_UTF16, src, src_len, L10N_UTF32, dst, dst_len);
 }
 
 s32 UTF8toEUCKR()
@@ -774,51 +544,10 @@ s32 UTF8toEUCKR()
 	return 0;
 }
 
-s32 UTF16toUTF8(vm::cptr<u16> src, vm::ptr<u8> dst, vm::ptr<u32> dst_len)
+s32 UTF16toUTF8()
 {
-	cellL10n.notice("UTF16toUTF8(src=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, dst, dst_len);
-
-	ensure(src && dst && dst_len); // Not really checked
-
-	const u64 utf16_long = src[0];
-	vm::cptr<u8> src_raw = vm::cast(src.addr());
-
-	if ((src[0] & UTF16_SURROGATES_MASK1) == UTF16_HIGH_SURROGATES)
-	{
-		if (((src[0] & UTF16_SURROGATES_MASK2) == UTF16_HIGH_SURROGATES) && ((src[1] & UTF16_SURROGATES_MASK2) == UTF16_LOW_SURROGATES))
-		{
-			const s64 lVar2 = (static_cast<u64>(src[0] >> 6) & 0xf) + 1;
-			dst[0] = static_cast<u8>(static_cast<u64>(lVar2 << 0x20) >> 0x22) | 0xf0;
-			dst[1] = (static_cast<s8>(lVar2) * '\x10' & 0x30U) | (static_cast<u8>(src[0] >> 2) & 0xf) | 0x80;
-			dst[2] = (static_cast<u8>(src[1] >> 6) & 0xf) | (static_cast<u8>(src[0]) & 3) << 4 | 0x80;
-			dst[3] = (static_cast<u8>(src_raw[3]) & 0x3f) | 0x80;
-			*dst_len = 4;
-			return 2;
-		}
-
-		return 0;
-	}
-
-	if (0x7ff < utf16_long)
-	{
-		dst[0] = static_cast<u8>((utf16_long << 0x20) >> 0x2c) | 0xe0;
-		dst[1] = (static_cast<u8>(src[0] >> 6) & 0x3f) | 0x80;
-		dst[2] = (static_cast<u8>(src_raw[1]) & 0x3f) | 0x80;
-		*dst_len = 3;
-		return 1;
-	}
-
-	if (utf16_long < 0x80)
-	{
-		dst[0] = static_cast<u8>(src[0]);
-		*dst_len = 1;
-		return 1;
-	}
-
-	dst[0] = static_cast<u8>((utf16_long << 0x20) >> 0x26) | 0xc0;
-	dst[1] = (static_cast<u8>(src_raw[1]) & 0x3f) | 0x80;
-	*dst_len = 2;
-	return 1;
+	cellL10n.todo("UTF16toUTF8()");
+	return 0;
 }
 
 s32 ARIBstoUTF8s()
@@ -827,7 +556,7 @@ s32 ARIBstoUTF8s()
 	return ConversionOK;
 }
 
-s32 SJISstoUTF8s(vm::cptr<void> src, vm::cptr<u32> src_len, vm::ptr<void> dst, vm::ptr<u32> dst_len)
+s32 SJISstoUTF8s(vm::cptr<void> src, vm::cptr<s32> src_len, vm::ptr<void> dst, vm::ptr<s32> dst_len)
 {
 	cellL10n.warning("SJISstoUTF8s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
 	return _L10nConvertStr(L10N_CODEPAGE_932, src, src_len, L10N_UTF8, dst, dst_len);
@@ -917,51 +646,10 @@ s32 UTF8stoBIG5s()
 	return ConversionOK;
 }
 
-s32 UTF16stoUCS2s(vm::cptr<u16> src, vm::ptr<u32> src_len, vm::ptr<u16> dst, vm::ptr<u32> dst_len)
+s32 UTF16stoUCS2s(vm::cptr<u16> src, vm::cptr<s32> src_len, vm::ptr<u16> dst, vm::ptr<s32> dst_len)
 {
-	cellL10n.notice("UTF16stoUCS2s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	for (u32 src_pos = 0; src_pos < *src_len; src_pos++)
-	{
-		const u16 utf16 = src[src_pos];
-
-		if ((utf16 & UTF16_SURROGATES_MASK1) == UTF16_HIGH_SURROGATES)
-		{
-			*src_len -= src_pos;
-			*dst_len = src_pos;
-			return SRCIllegal;
-		}
-
-		len++;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = src_pos;
-				return DSTExhausted;
-			}
-
-			dst[dst_pos++] = utf16;
-		}
-	}
-
-	*dst_len = len;
-	return ConversionOK;
+	cellL10n.warning("UTF16stoUCS2s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
+	return _L10nConvertStr(L10N_UTF16, src, src_len, L10N_UCS2, dst, dst_len);
 }
 
 s32 UCS2stoGB18030s()
@@ -1050,71 +738,9 @@ s32 JISstoSJISs(vm::cptr<u8> src, vm::cptr<s32> src_len, vm::ptr<u8> dst, vm::pt
 	return 0;
 }
 
-s32 UTF8toUTF16(vm::cptr<u8> src, vm::ptr<u16> dst, vm::ptr<u32> dst_len)
+s32 UTF8toUTF16()
 {
-	cellL10n.notice("UTF8toUTF16(src=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, dst, dst_len);
-
-	ensure(src && dst && dst_len); // Not really checked
-
-	u64 longval = src[0];
-
-	if ((src[0] & 0xf8) == 0xf0)
-	{
-		if ((src[1] & 0xc0) == 0x80)
-		{
-			if ((src[2] & 0xc0) == 0x80 && (src[3] & 0xc0) == 0x80)
-			{
-				longval = (longval & 7) << 2 | (static_cast<u64>(src[1] >> 4) & 3);
-
-				if (((longval - 1) & 0xffff) < 0x10)
-				{
-					dst[0] = (src[1] & 0xf) << 2 | (src[2] >> 4 & 3) | static_cast<u16>(((longval - 1) & 0xffffffff) << 6) | UTF16_HIGH_SURROGATES;
-					dst[1] = (src[2] & 0xf) << 6 | (src[3] & 0x3f) | UTF16_LOW_SURROGATES;
-					*dst_len = 2;
-					return 4;
-				}
-			}
-		}
-	}
-	else
-	{
-		if ((src[0] & 0xf0) != 0xe0)
-		{
-			if (((src[0] & 0xe0) == 0xc0) && (0xc1 < longval))
-			{
-				if ((src[1] & 0xc0) != 0x80)
-				{
-					return 0;
-				}
-
-				dst[0] = (src[0] & 0x1f) << 6 | (src[1] & 0x3f);
-				*dst_len = 1;
-				return 2;
-			}
-
-			if (static_cast<s8>(src[0]) < '\0')
-			{
-				return 0;
-			}
-
-			dst[0] = static_cast<u16>(src[0]);
-			*dst_len = 1;
-			return 1;
-		}
-
-		if ((src[1] & 0xc0) == 0x80 && (src[2] & 0xc0) == 0x80)
-		{
-			longval = (static_cast<u64>(src[1]) & 0x3f) << 6 | (longval & 0xf) << 0xc | (static_cast<u64>(src[2]) & 0x3f);
-
-			if ((0x7ff < longval && ((static_cast<u32>(longval) & UTF16_SURROGATES_MASK1) != UTF16_HIGH_SURROGATES)))
-			{
-				dst[0] = static_cast<u16>(longval);
-				*dst_len = 1;
-				return 3;
-			}
-		}
-	}
-
+	cellL10n.todo("UTF8toUTF16()");
 	return 0;
 }
 
@@ -1136,20 +762,9 @@ s32 SjisHan2Zen()
 	return ConversionOK;
 }
 
-s32 UCS2toUTF16(u16 ucs2, vm::ptr<u16> utf16)
+s32 UCS2toUTF16()
 {
-	cellL10n.notice("UCS2toUTF16(ucs2=0x%x, utf16=*0x%x)", ucs2, utf16);
-
-	const s32 sucs2 = static_cast<s32>(ucs2);
-
-	if ((sucs2 & UTF16_SURROGATES_MASK1) != UTF16_HIGH_SURROGATES)
-	{
-		ensure(!!utf16); // Not actually checked
-
-		*utf16 = ucs2;
-		return 1;
-	}
-
+	cellL10n.todo("UCS2toUTF16()");
 	return 0;
 }
 
@@ -1159,40 +774,9 @@ s32 UCS2toMSJIS()
 	return 0;
 }
 
-u16 sjis2kuten(u16 c)
+s32 sjis2kuten()
 {
-	cellL10n.notice("sjis2kuten(c=0x%x)", c);
-
-	u64 v0 = static_cast<u64>(static_cast<s64>(static_cast<s16>(c))) >> 8 & 0xff;
-	u64 v1 = v0 - 0x81;
-
-	if (((v1 & 0xffff) >= 0x7c) || (0x3f >= ((v0 - 0xa0) & 0xffff)))
-	{
-		return 0;
-	}
-
-	const u64 v2 = static_cast<s64>(static_cast<s16>(c)) & 0xff;
-
-	if (0x3f < v2 && (v2 < 0xfd && (static_cast<s32>(v2) != 0x7f)))
-	{
-		if (0x9f < v0)
-		{
-			v1 = v0 - 0xc1;
-		}
-
-		u16 v3 = static_cast<s16>(v2) - 0x9e;
-		v0 = (v1 & 0x7fffffff) * 2 + 2;
-
-		if (v2 < 0x9f)
-		{
-			const s16 v4 = v2 < 0x7f ? 0x1f : 0x20;
-			v3 = (static_cast<s16>(v2) - v4) - 0x20;
-			v0 = (v1 & 0x7fffffff) * 2 + 1;
-		}
-
-		return static_cast<u16>((v0 & 0xffffffff) << 8) | v3;
-	}
-
+	cellL10n.todo("sjis2kuten()");
 	return 0;
 }
 
@@ -1202,18 +786,9 @@ s32 UCS2toUHC()
 	return 0;
 }
 
-s32 UTF32toUCS2(u32 src, vm::ptr<u16> dst)
+s32 UTF32toUCS2()
 {
-	cellL10n.notice("UTF32toUCS2(src=0x%x, dst=*0x%x)", src, dst);
-
-	if ((src < 0x10000) && (0x7ff < src - UTF16_HIGH_SURROGATES))
-	{
-		ensure(!!dst); // Not really checked
-
-		*dst = static_cast<u16>(src);
-		return 1;
-	}
-
+	cellL10n.todo("UTF32toUCS2()");
 	return 0;
 }
 
@@ -1235,66 +810,15 @@ s32 UCS2stoEUCJPs()
 	return ConversionOK;
 }
 
-s32 UTF16toUCS2(vm::cptr<u16> src, vm::ptr<u16> dst)
+s32 UTF16toUCS2()
 {
-	cellL10n.notice("UTF16toUCS2(src=*0x%x, dst=*0x%x)", src, dst);
-
-	ensure(!!src); // Not really checked
-
-	if ((*src & UTF16_SURROGATES_MASK1) != UTF16_HIGH_SURROGATES)
-	{
-		ensure(!!dst); // Not really checked
-		*dst = *src;
-		return 1;
-	}
-
+	cellL10n.todo("UTF16toUCS2()");
 	return 0;
 }
 
-s32 UCS2stoUTF16s(vm::cptr<u16> src, vm::ptr<u32> src_len, vm::ptr<u16> dst, vm::ptr<u32> dst_len)
+s32 UCS2stoUTF16s(vm::cptr<u16> src, vm::cptr<s32> src_len, vm::ptr<u16> dst, vm::ptr<s32> dst_len)
 {
-	cellL10n.notice("UCS2stoUTF16s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	for (u32 src_pos = 0; src_pos < *src_len; src_pos++)
-	{
-		const u16 ucs2 = src[src_pos];
-
-		if ((ucs2 & UTF16_SURROGATES_MASK1) == UTF16_HIGH_SURROGATES)
-		{
-			*src_len -= src_pos;
-			*dst_len = src_pos;
-			return SRCIllegal;
-		}
-
-		len++;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = src_pos;
-				return DSTExhausted;
-			}
-
-			dst[dst_pos++] = ucs2;
-		}
-	}
-
-	*dst_len = len;
+	cellL10n.todo("UCS2stoUTF16s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
 	return ConversionOK;
 }
 
@@ -1304,86 +828,10 @@ s32 UCS2stoEUCCNs()
 	return ConversionOK;
 }
 
-s32 SBCSstoUTF8s(vm::cptr<u8> src, vm::ptr<u32> src_len, vm::ptr<u8> dst, vm::ptr<u32> dst_len, u32 code_page)
+s32 SBCSstoUTF8s(vm::cptr<u8> src, vm::cptr<s32> src_len, vm::ptr<u8> dst, vm::ptr<s32> dst_len, s32 enc)
 {
-	cellL10n.notice("SBCSstoUTF8s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x, code_page=0x%x)", src, src_len, dst, dst_len, code_page);
-
-	HostCode code = 0;
-	if ((code_page >= _L10N_CODE_) || !_L10nCodeParse(code_page, code))
-	{
-		return ConverterUnknown;
-	}
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	for (u32 src_pos = 0; src_pos < *src_len; src_pos++)
-	{
-		u8 src_val = src[src_pos];
-		u64 longval = static_cast<u64>(src_val);
-		s32 utf8_len = 1;
-
-		if (static_cast<s8>(src_val) < '\0')
-		{
-			u8 dst_tmp[4] = {};
-			s32 dst_len_tmp = 4;
-
-			const s32 res = _ConvertStr(code_page, &src_val, 1, L10N_UTF8, &dst_tmp, &dst_len_tmp, false);
-
-			if (res != ConversionOK)
-			{
-				*src_len -= src_pos;
-				*dst_len = len;
-				return SRCIllegal;
-			}
-
-			longval = *reinterpret_cast<u64*>(dst_tmp);
-			utf8_len = dst_len_tmp;
-		}
-
-		len += utf8_len;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = len - utf8_len;
-				return DSTExhausted;
-			}
-
-			src_val = static_cast<u8>(longval);
-
-			if (utf8_len == 3)
-			{
-				dst[dst_pos++] = static_cast<u8>((longval << 0x20) >> 0x2c) | 0xe0;
-				dst[dst_pos++] = (static_cast<u8>(longval >> 6) & 0x3f) | 0x80;
-				dst[dst_pos++] = (src_val & 0x3f) | 0x80;
-			}
-			else if (utf8_len == 1)
-			{
-				dst[dst_pos++] = src_val;
-			}
-			else
-			{
-				dst[dst_pos++] = static_cast<u8>(longval >> 6) | 0xc0;
-				dst[dst_pos++] = (src_val & 0x3f) | 0x80;
-			}
-		}
-	}
-
-	*dst_len = len;
-	return ConversionOK;
+	cellL10n.warning("SBCSstoUTF8s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x, enc=*0x%x)", src, src_len, dst, dst_len, enc);
+	return _L10nConvertStr(enc, src, src_len, L10N_UTF8, dst, dst_len); // Might not work in some scenarios
 }
 
 s32 SJISstoJISs(vm::cptr<u8> src, vm::cptr<s32> src_len, vm::ptr<u8> dst, vm::ptr<s32> dst_len)
@@ -1392,112 +840,16 @@ s32 SJISstoJISs(vm::cptr<u8> src, vm::cptr<s32> src_len, vm::ptr<u8> dst, vm::pt
 	return 0;
 }
 
-s32 SBCStoUTF8(u8 src, vm::ptr<u8> dst, u32 code_page)
+s32 SBCStoUTF8()
 {
-	cellL10n.notice("SBCStoUTF8(src=0x%x, dst=*0x%x, code_page=0x%x)", src, *dst, code_page);
-
-	HostCode code = 0;
-	if ((code_page >= _L10N_CODE_) || !_L10nCodeParse(code_page, code))
-	{
-		return -1;
-	}
-
-	ensure(!!dst); // Not really checked
-
-	if (static_cast<s8>(src) >= 0)
-	{
-		*dst = src;
-		return 1;
-	}
-
-	u8 dst_tmp = 0;
-	s32 dst_len_tmp = 1;
-
-	const s32 res = _ConvertStr(L10N_UTF8, &src, 1, code_page, &dst_tmp, &dst_len_tmp, false);
-	if (res != ConversionOK)
-	{
-		return 0;
-	}
-
-	const u64 longval = static_cast<u64>(dst_tmp);
-	const u8 val = static_cast<u8>(dst_tmp) & 0x3f;
-
-	if (longval < 0x800)
-	{
-		dst[0] = static_cast<u8>((longval << 0x20) >> 0x26) | 0xc0;
-		dst[1] = val | 0x80;
-		return 2;
-	}
-
-	dst[0] = static_cast<u8>((longval << 0x20) >> 0x2c) | 0xe0;
-	dst[1] = (static_cast<u8>(static_cast<u16>(dst_tmp) >> 6) & 0x3f) | 0x80;
-	dst[2] = val | 0x80;
-	return 3;
+	cellL10n.todo("SBCStoUTF8()");
+	return 0;
 }
 
-s32 UTF8toUTF32(vm::cptr<u8> src, vm::ptr<u32> dst)
+s32 UTF8toUTF32()
 {
-	cellL10n.notice("UTF8toUTF32(src=*0x%x, dst=*0x%x)", src, dst);
-
-	ensure(src && dst); // Not really checked
-
-	u64 longval = src[0];
-
-	if ((src[0] & 0xf8) == 0xf0)
-	{
-		if ((src[1] & 0xc0) != 0x80 ||
-			(src[2] & 0xc0) != 0x80 ||
-			(src[3] & 0xc0) != 0x80)
-		{
-			return 0;
-		}
-
-		longval = (static_cast<u64>(src[2]) & 0x3f) << 6 | (longval & 7) << 0x12 | (static_cast<u64>(src[1]) & 0x3f) << 0xc | (static_cast<u64>(src[3]) & 0x3f);
-		if (0xfffff < ((longval - 0x10000) & 0xffffffff))
-		{
-			return 0;
-		}
-
-		*dst = static_cast<u32>(longval);
-		return 4;
-	}
-
-	if ((src[0] & 0xf0) == 0xe0)
-	{
-		if ((src[1] & 0xc0) != 0x80 ||
-			(src[2] & 0xc0) != 0x80)
-		{
-			return 0;
-		}
-
-		longval = (static_cast<u64>(src[1]) & 0x3f) << 6 | (longval & 0xf) << 0xc | (static_cast<u64>(src[2]) & 0x3f);
-		if (longval < 0x800 || ((longval - UTF16_HIGH_SURROGATES) & 0xffffffff) < 0x800)
-		{
-			return 0;
-		}
-
-		*dst = static_cast<u32>(longval);
-		return 3;
-	}
-
-	if (((src[0] & 0xe0) == 0xc0) && (0xc1 < longval))
-	{
-		if ((src[1] & 0xc0) != 0x80)
-		{
-			return 0;
-		}
-
-		*dst = (src[0] & 0x1f) << 6 | (src[1] & 0x3f);
-		return 2;
-	}
-
-	if (static_cast<s8>(src[0]) < '\0')
-	{
-		return 0;
-	}
-
-	*dst = static_cast<u32>(src[0]);
-	return 1;
+	cellL10n.todo("UTF8toUTF32()");
+	return 0;
 }
 
 s32 jstrchk(vm::cptr<u8> jstr)
@@ -1538,57 +890,9 @@ s32 EucJpZen2Han()
 	return ConversionOK;
 }
 
-s32 UTF32toUTF16(u32 src, vm::ptr<u16> dst);
-
-s32 UTF32stoUTF16s(vm::cptr<u32> src, vm::ptr<u32> src_len, vm::ptr<u16> dst, vm::ptr<u32> dst_len)
+s32 UTF32stoUTF16s(vm::cptr<u32> src, vm::cptr<s32> src_len, vm::ptr<u16> dst, vm::ptr<s32> dst_len)
 {
-	cellL10n.notice("UTF32stoUTF16s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	auto tmp = vm::make_var<be_t<u16>[2]>({0, 0});
-	const vm::ptr<u16> utf16_tmp = vm::cast(tmp.addr());
-
-	for (u32 src_pos = 0; src_pos < *src_len; src_pos++)
-	{
-		const s32 utf16_len = UTF32toUTF16(src[src_pos], utf16_tmp);
-		if (utf16_len == 0)
-		{
-			*src_len -= src_pos;
-			*dst_len = len;
-			return SRCIllegal;
-		}
-
-		len += utf16_len;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = len - utf16_len;
-				return DSTExhausted;
-			}
-
-			for (s32 i = 0; i < utf16_len; i++)
-			{
-				dst[dst_pos++] = utf16_tmp[i];
-			}
-		}
-	}
-
-	*dst_len = len;
+	cellL10n.todo("UTF32stoUTF16s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
 	return ConversionOK;
 }
 
@@ -1622,54 +926,9 @@ s32 EUCKRstoUHCs(vm::cptr<u8> src, vm::cptr<s32> src_len, vm::ptr<u8> dst, vm::p
 	return 0;
 }
 
-s32 UTF8stoUTF32s(vm::cptr<u8> src, vm::ptr<u32> src_len, vm::ptr<u32> dst, vm::ptr<u32> dst_len)
+s32 UTF8stoUTF32s(vm::cptr<u8> src, vm::cptr<s32> src_len, vm::ptr<u32> dst, vm::ptr<s32> dst_len)
 {
-	cellL10n.notice("UTF8stoUTF32s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	vm::var<u32> utf32_tmp = vm::make_var<u32>(0);
-
-	for (u32 src_pos = 0; src_pos < *src_len;)
-	{
-		const s32 utf8_len = UTF8toUTF32(src + src_pos, utf32_tmp);
-
-		if (utf8_len == 0)
-		{
-			*src_len -= src_pos;
-			*dst_len = len;
-			return SRCIllegal;
-		}
-
-		len++;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = dst_pos;
-				return DSTExhausted;
-			}
-
-			dst[dst_pos++] = *utf32_tmp;
-		}
-
-		src_pos += utf8_len;
-	}
-
-	*dst_len = len;
+	cellL10n.todo("UTF8stoUTF32s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
 	return ConversionOK;
 }
 
@@ -1691,7 +950,7 @@ s32 UHCtoUCS2()
 	return 0;
 }
 
-s32 L10nConvertStr(s32 src_code, vm::cptr<void> src, vm::ptr<u32> src_len, s32 dst_code, vm::ptr<void> dst, vm::ptr<u32> dst_len)
+s32 L10nConvertStr(s32 src_code, vm::cptr<void> src, vm::ptr<s32> src_len, s32 dst_code, vm::ptr<void> dst, vm::ptr<s32> dst_len)
 {
 	cellL10n.error("L10nConvertStr(src_code=%d, src=*0x%x, src_len=*0x%x, dst_code=%d, dst=*0x%x, dst_len=*0x%x)", src_code, src, src_len, dst_code, dst, dst_len);
 	return _L10nConvertStr(src_code, src, src_len, dst_code, dst, dst_len);
@@ -1709,83 +968,15 @@ s32 UTF8toUHC()
 	return 0;
 }
 
-s32 UTF32toUTF8(u32 src, vm::ptr<u8> dst)
+s32 UTF32toUTF8()
 {
-	cellL10n.notice("UTF32toUTF8(src=0x%x, dst=*0x%x)", src, dst);
-
-	const u64 utf32 = static_cast<u64>(static_cast<s32>(src));
-	if (((utf32 & 0xffffffff) >= 0x110000) || (0x7ff >= ((utf32 - UTF16_HIGH_SURROGATES) & 0xffffffff)))
-	{
-		return 0;
-	}
-
-	ensure(!!dst); // Not really checked
-
-	if (0xffff < (utf32 & 0xffffffff))
-	{
-		dst[0] = static_cast<u8>((utf32 << 0x20) >> 0x32) | 0xf0;
-		dst[1] = (static_cast<u8>(utf32 >> 0xc) & 0x3f) | 0x80;
-		dst[2] = (static_cast<u8>(utf32 >> 6) & 0x3f) | 0x80;
-		dst[3] = (static_cast<u8>(src) & 0x3f) | 0x80;
-		return 4;
-	}
-
-	if ((utf32 & 0xffffffff) < 0x80)
-	{
-		dst[0] = static_cast<u8>(src);
-		return 1;
-	}
-
-	if ((utf32 & 0xffffffff) < 0x800)
-	{
-		dst[0] = static_cast<u8>((utf32 << 0x20) >> 0x26) | 0xc0;
-		dst[1] = (static_cast<u8>(src) & 0x3f) | 0x80;
-		return 2;
-	}
-
-	dst[0] = static_cast<u8>((utf32 << 0x20) >> 0x2c) | 0xe0;
-	dst[1] = (static_cast<u8>(utf32 >> 6) & 0x3f) | 0x80;
-	dst[2] = (static_cast<u8>(src) & 0x3f) | 0x80;
-	return 3;
+	cellL10n.todo("UTF32toUTF8()");
+	return 0;
 }
 
-u16 sjis2eucjp(u16 c)
+s32 sjis2eucjp()
 {
-	cellL10n.notice("sjis2eucjp(c=0x%x)", c);
-
-	u64 v0 = static_cast<u64>(static_cast<s64>(static_cast<s16>(c))) >> 8 & 0xff;
-	u64 v1 = v0 - 0x81;
-
-	if (((v1 & 0xffff) >= 0x7c) || (0x3f >= ((v0 - 0xa0) & 0xffff)))
-	{
-		return 0;
-	}
-
-	const u64 v2 = static_cast<s64>(static_cast<s16>(c)) & 0xff;
-
-	if (0x3f < v2 && (v2 < 0xfd && (static_cast<s32>(v2) != 0x7f)))
-	{
-		if (0x9f < v0)
-		{
-			v1 = v0 - 0xc1;
-		}
-
-		u16 v3 = static_cast<s16>(v2) - 0x7e;
-		v0 = (v1 & 0x7fffffff) * 2 + 0x22;
-
-		if (v2 < 0x9f)
-		{
-			const s16 v4 = v2 < 0x7f ? 0x1f : 0x20;
-			v3 = static_cast<s16>(v2) - v4;
-			v0 = (v1 & 0x7fffffff) * 2 + 0x21;
-		}
-
-		if ((v0 & 0xffff) < 0x7f)
-		{
-			return static_cast<u16>((v0 & 0xffff) << 8) | v3 | 0x8080;
-		}
-	}
-
+	cellL10n.todo("sjis2eucjp()");
 	return 0;
 }
 
@@ -1807,27 +998,10 @@ s32 EUCKRtoUCS2()
 	return 0;
 }
 
-s32 UTF32toUTF16(u32 src, vm::ptr<u16> dst)
+s32 UTF32toUTF16()
 {
-	cellL10n.notice("UTF32toUTF16(src=0x%x, dst=*0x%x)", src, dst);
-
-	const u64 utf32 = static_cast<s64>(static_cast<s32>(src));
-	if (((utf32 & 0xffffffff) >= 0x110000) || (0x7ff >= ((utf32 - UTF16_HIGH_SURROGATES) & 0xffffffff)))
-	{
-		return 0;
-	}
-
-	ensure(!!dst); // Not really checked
-
-	if (0xffff < (utf32 & 0xffffffff))
-	{
-		dst[0] = static_cast<u16>(((utf32 - 0x10000) << 0x20) >> 0x2a) | UTF16_HIGH_SURROGATES;
-		dst[1] = (static_cast<u16>(src) & 0x3ff) | UTF16_LOW_SURROGATES;
-		return 2;
-	}
-
-	dst[0] = static_cast<u16>(src);
-	return 1;
+	cellL10n.todo("UTF32toUTF16()");
+	return 0;
 }
 
 s32 EUCCNstoUCS2s()
@@ -1836,67 +1010,9 @@ s32 EUCCNstoUCS2s()
 	return ConversionOK;
 }
 
-s32 SBCSstoUCS2s(vm::cptr<u8> src, vm::ptr<u32> src_len, vm::ptr<u16> dst, vm::ptr<u32> dst_len, u32 code_page)
+s32 SBCSstoUCS2s()
 {
-	cellL10n.notice("SBCSstoUCS2s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x, code_page=0x%x)", src, src_len, dst, dst_len, code_page);
-
-	HostCode code = 0;
-	if ((code_page >= _L10N_CODE_) || !_L10nCodeParse(code_page, code))
-	{
-		return ConverterUnknown;
-	}
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	for (u32 src_pos = 0; src_pos < *src_len; src_pos++)
-	{
-		const u8 src_val = src[src_pos];
-		u16 val = static_cast<u16>(src_val);
-
-		if (static_cast<s8>(src_val) < '\0')
-		{
-			u16 dst_tmp = 0;
-			s32 dst_len_tmp = 2;
-
-			const s32 res = _ConvertStr(code_page, &src_val, 1, L10N_UCS2, &dst_tmp, &dst_len_tmp, false);
-
-			if (res != ConversionOK)
-			{
-				*src_len -= src_pos;
-				*dst_len = dst_pos;
-				return SRCIllegal;
-			}
-
-			val = dst_tmp;
-		}
-
-		len++;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = dst_pos;
-				return DSTExhausted;
-			}
-
-			dst[dst_pos++] = val;
-		}
-	}
-
-	*dst_len = len;
+	cellL10n.todo("SBCSstoUCS2s()");
 	return ConversionOK;
 }
 
@@ -1930,38 +1046,23 @@ s32 UCS2toGBK()
 	return 0;
 }
 
-s32 UTF16toUTF32(vm::cptr<u16> src, vm::ptr<u32> dst)
+s32 UTF16toUTF32()
 {
-	cellL10n.notice("UTF16toUTF32(src=*0x%x, dst=*0x%x)", src, dst);
-
-	ensure(src && dst); // Not really checked
-
-	if ((src[0] & UTF16_SURROGATES_MASK1) != UTF16_HIGH_SURROGATES)
-	{
-		*dst = static_cast<u32>(src[0]);
-		return 1;
-	}
-
-	if (((src[0] & UTF16_SURROGATES_MASK2) == (src[0] & UTF16_SURROGATES_MASK1)) && ((src[1] & UTF16_SURROGATES_MASK2) == UTF16_LOW_SURROGATES))
-	{
-		*dst = ((src[0] & 0x3ff) * 0x400 + 0x10000) | (src[1] & 0x3ff);
-		return 2;
-	}
-
+	cellL10n.todo("UTF16toUTF32()");
 	return 0;
 }
 
-s32 l10n_convert_str(s32 cd, vm::cptr<void> src, vm::cptr<u32> src_len, vm::ptr<void> dst, vm::ptr<u32> dst_len)
+s32 l10n_convert_str(s32 cd, vm::cptr<void> src, vm::ptr<s32> src_len, vm::ptr<void> dst, vm::ptr<s32> dst_len)
 {
 	cellL10n.warning("l10n_convert_str(cd=%d, src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", cd, src, src_len, dst, dst_len);
 
-	const s32 src_code = cd >> 16;
-	const s32 dst_code = cd & 0xffff;
+	s32 src_code = cd >> 16;
+	s32 dst_code = cd & 0xffff;
 
 	return _L10nConvertStr(src_code, src, src_len, dst_code, dst, dst_len);
 }
 
-s32 EUCJPstoJISs(vm::cptr<u8> src, vm::cptr<u32> src_len, vm::ptr<u8> dst, vm::ptr<u32> dst_len)
+s32 EUCJPstoJISs(vm::cptr<u8> src, vm::cptr<s32> src_len, vm::ptr<u8> dst, vm::ptr<s32> dst_len)
 {
 	cellL10n.warning("EUCJPstoJISs(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
 	return _L10nConvertStr(L10N_EUC_JP, src, src_len, L10N_ISO_2022_JP, dst, dst_len);
@@ -1991,35 +1092,9 @@ s32 isEucJpKigou()
 	return 0;
 }
 
-s32 UCS2toUTF8(u16 ucs2, vm::ptr<u8> utf8)
+s32 UCS2toUTF8()
 {
-	cellL10n.notice("UCS2toUTF8(ucs2=0x%x, utf8=*0x%x)", ucs2, utf8);
-
-	const u64 val = static_cast<s64>(ucs2) & 0xffff;
-
-	if ((static_cast<u32>(val) & UTF16_SURROGATES_MASK1) != UTF16_HIGH_SURROGATES)
-	{
-		ensure(!!utf8); // Not really checked
-
-		if (val < 0x80)
-		{
-			utf8[0] = static_cast<u8>(ucs2);
-			return 1;
-		}
-
-		if (val < 0x800)
-		{
-			utf8[0] = static_cast<u8>((val << 0x20) >> 0x26) | 0xc0;
-			utf8[1] = (static_cast<u8>(ucs2) & 0x3f) | 0x80;
-			return 2;
-		}
-
-		utf8[0] = static_cast<u8>((val << 0x20) >> 0x2c) | 0xe0;
-		utf8[1] = (static_cast<u8>(val >> 6) & 0x3f) | 0x80;
-		utf8[2] = (static_cast<u8>(ucs2) & 0x3f) | 0x80;
-		return 3;
-	}
-
+	cellL10n.todo("UCS2toUTF8()");
 	return 0;
 }
 
@@ -2053,24 +1128,9 @@ s32 kuten2sjis()
 	return 0;
 }
 
-s32 UTF8toSBCS(vm::cptr<u8> src, vm::ptr<u8> dst, u32 code_page)
+s32 UTF8toSBCS()
 {
-	cellL10n.notice("UTF8toSBCS(src=*0x%x, dst=*0x%x, code_page=0x%x)", src, dst, code_page);
-
-	vm::var<u16> ucs2_tmp = vm::make_var<u16>(0);
-
-	const s32 utf8_len = UTF8toUCS2(src, ucs2_tmp);
-	if (utf8_len != 0)
-	{
-		const s32 len = UCS2toSBCS(*ucs2_tmp, dst, code_page);
-		if (1 < len + 1U)
-		{
-			return utf8_len;
-		}
-
-		return len;
-	}
-
+	cellL10n.todo("UTF8toSBCS()");
 	return 0;
 }
 
@@ -2110,35 +1170,10 @@ s32 UCS2toEUCKR()
 	return 0;
 }
 
-s32 SBCStoUCS2(u8 src, vm::ptr<u16> dst, u32 code_page)
+s32 SBCStoUCS2()
 {
-	cellL10n.notice("SBCStoUCS2(src=0x%x, dst=*0x%x, code_page=0x%x)", src, dst, code_page);
-
-	HostCode code = 0;
-	if ((code_page >= _L10N_CODE_) || !_L10nCodeParse(code_page, code))
-	{
-		return -1;
-	}
-
-	ensure(!!dst); // Not really checked
-
-	if (static_cast<s8>(src) >= 0)
-	{
-		*dst = static_cast<s16>(static_cast<s8>(src)) & 0xff;
-		return 1;
-	}
-
-	u16 dst_tmp = 0;
-	s32 dst_len_tmp = sizeof(u16);
-
-	const s32 res = _ConvertStr(code_page, &src, 1, L10N_UCS2, &dst_tmp, &dst_len_tmp, false);
-	if (res != ConversionOK)
-	{
-		return 0;
-	}
-
-	*dst = dst_tmp;
-	return 1;
+	cellL10n.todo("SBCStoUCS2()");
+	return 0;
 }
 
 s32 MSJISstoUCS2s()
@@ -2151,13 +1186,6 @@ s32 l10n_get_converter(u32 src_code, u32 dst_code)
 {
 	cellL10n.warning("l10n_get_converter(src_code=%d, dst_code=%d)", src_code, dst_code);
 	return (src_code << 16) | dst_code;
-
-	if (_L10N_CODE_ <= src_code || _L10N_CODE_ <= dst_code)
-	{
-		return 0xffffffff;
-	}
-
-	return (src_code << 16) | dst_code;
 }
 
 s32 GB18030stoUTF8s()
@@ -2172,50 +1200,9 @@ s32 SJISstoEUCJPs(vm::cptr<u8> src, vm::cptr<s32> src_len, vm::ptr<u8> dst, vm::
 	return 0;
 }
 
-s32 UTF32stoUCS2s(vm::cptr<u32> src, vm::ptr<u32> src_len, vm::ptr<u16> dst, vm::ptr<u32> dst_len)
+s32 UTF32stoUCS2s(vm::cptr<u32> src, vm::cptr<s32> src_len, vm::ptr<u16> dst, vm::ptr<s32> dst_len)
 {
-	cellL10n.notice("UTF32stoUCS2s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	for (u32 src_pos = 0; src_pos < *src_len; src_pos++)
-	{
-		const u32 utf32 = src[src_pos];
-
-		if (utf32 >= 0x10000 || (0x7ff >= utf32 - UTF16_HIGH_SURROGATES))
-		{
-			*src_len -= src_pos;
-			*dst_len = src_pos;
-			return SRCIllegal;
-		}
-
-		len++;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = src_pos;
-				return DSTExhausted;
-			}
-
-			dst[dst_pos++] = static_cast<u16>(utf32);
-		}
-	}
-
-	*dst_len = len;
+	cellL10n.todo("UTF32stoUCS2s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
 	return ConversionOK;
 }
 
@@ -2231,86 +1218,9 @@ s32 EUCCNtoUCS2()
 	return CELL_OK;
 }
 
-s32 UTF8stoSBCSs(vm::cptr<u8> src, vm::ptr<u32> src_len, vm::ptr<u8> dst, vm::ptr<u32> dst_len, u32 code_page)
+s32 UTF8stoSBCSs()
 {
-	cellL10n.notice("UTF8stoSBCSs(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x, code_page=0x%x)", src, src_len, dst, dst_len, code_page);
-
-	HostCode code = 0;
-	if ((code_page >= _L10N_CODE_) || !_L10nCodeParse(code_page, code))
-	{
-		return ConverterUnknown;
-	}
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	vm::var<u16> ucs2_tmp = vm::make_var<u16>(0);
-
-	for (u32 src_pos = 0; src_pos < *src_len;)
-	{
-		const s32 utf8_len = UTF8toUCS2(src + src_pos, ucs2_tmp);
-		if (utf8_len == 0)
-		{
-			*src_len -= src_pos;
-			*dst_len = len;
-			return SRCIllegal;
-		}
-
-		u16 ucs2 = *ucs2_tmp;
-
-		if ((*src_len < (utf8_len + src_pos)) || (0xfffd < ucs2))
-		{
-			*src_len -= src_pos;
-			*dst_len = len;
-			return SRCIllegal;
-		}
-
-		if (0x7f < ucs2)
-		{
-			const u8 src_tmp = src[src_pos];
-			u8 dst_tmp = 0;
-			s32 dst_len_tmp = 1;
-
-			const s32 res = _ConvertStr(L10N_UTF8, &src_tmp, 1, code_page, &dst_tmp, &dst_len_tmp, false);
-
-			if (res != ConversionOK)
-			{
-				*src_len -= src_pos;
-				*dst_len = dst_pos;
-				return SRCIllegal;
-			}
-
-			ucs2 = dst_tmp;
-		}
-
-		len++;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = dst_pos;
-				return DSTExhausted;
-			}
-
-			dst[dst_pos++] = static_cast<u8>(ucs2);
-		}
-
-		src_pos += utf8_len;
-	}
-
-	*dst_len = len;
+	cellL10n.todo("UTF8stoSBCSs()");
 	return ConversionOK;
 }
 
@@ -2344,61 +1254,45 @@ s32 UTF8toBIG5()
 	return 0;
 }
 
-s32 UTF16stoUTF8s(vm::cptr<u16> src, vm::ptr<u32> src_len, vm::ptr<u8> dst, vm::ptr<u32> dst_len)
+s32 UTF16stoUTF8s(vm::cptr<u16> utf16, vm::ref<s32> utf16_len, vm::ptr<u8> utf8, vm::ref<s32> utf8_len)
 {
-	cellL10n.notice("UTF16stoUTF8s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
+	cellL10n.error("UTF16stoUTF8s(utf16=*0x%x, utf16_len=*0x%x, utf8=*0x%x, utf8_len=*0x%x)", utf16, utf16_len.addr(), utf8, utf8_len.addr());
 
-	ensure(src_len && dst_len); // Not really checked
+	const u32 max_len = utf8_len; utf8_len = 0;
 
-	if (*src_len == 0u)
+	for (u32 i = 0, len = 0; i < static_cast<u32>(utf16_len); i++, utf8_len = len)
 	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
+		const u16 ch = utf16[i];
 
-	ensure(src); // Not really checked
+		// increase required length (TODO)
+		len = len + 1;
 
-	u32 len = 0;
-	u32 dst_pos = 0;
+		// validate character (TODO)
+		//if ()
+		//{
+		//	utf16_len -= i;
+		//	return SRCIllegal;
+		//}
 
-	auto tmp = vm::make_var<be_t<u8>[4]>({0, 0, 0, 0});
-	const vm::ptr<u8> utf8_tmp = vm::cast(tmp.addr());
-	vm::var<u32> utf8_len_tmp = vm::make_var<u32>(0);
-
-	for (u32 src_pos = 0; src_pos < *src_len;)
-	{
-		*utf8_len_tmp = 4;
-		const s32 utf16_len = UTF16toUTF8(src + src_pos, utf8_tmp, utf8_len_tmp);
-
-		if (utf16_len == 0)
+		if (utf8)
 		{
-			*src_len -= src_pos;
-			*dst_len = len;
-			return SRCIllegal;
-		}
-
-		const u32 utf8_len = *utf8_len_tmp;
-		len += utf8_len;
-
-		if (dst)
-		{
-			if (*dst_len < len)
+			if (len > max_len)
 			{
-				*src_len -= src_pos;
-				*dst_len = len - utf8_len;
+				utf16_len -= i;
 				return DSTExhausted;
 			}
 
-			for (u32 i = 0; i < utf8_len; i++)
+			if (ch <= 0x7f)
 			{
-				dst[dst_pos++] = utf8_tmp[i];
+				*utf8++ = static_cast<u8>(ch);
+			}
+			else
+			{
+				*utf8++ = '?'; // TODO
 			}
 		}
-
-		src_pos += utf16_len;
 	}
 
-	*dst_len = len;
 	return ConversionOK;
 }
 
@@ -2414,7 +1308,7 @@ s32 GB18030toUTF8()
 	return 0;
 }
 
-s32 UTF8toSJIS(u8 ch, vm::ptr<u8> dst, vm::ptr<u32> dst_len) // Doesn't work backwards
+s32 UTF8toSJIS(u8 ch, vm::ptr<u8> dst, vm::ptr<s32> dst_len) // Doesn't work backwards
 {
 	cellL10n.warning("UTF8toSJIS(ch=%d, dst=*0x%x, dst_len=*0x%x)", ch, dst, dst_len);
 	return _L10nConvertChar(L10N_UTF8, &ch, sizeof(ch), L10N_CODEPAGE_932, dst, dst_len);
@@ -2426,122 +1320,15 @@ s32 ARIBstoUCS2s()
 	return ConversionOK;
 }
 
-s32 UCS2stoUTF32s(vm::cptr<u16> src, vm::ptr<u32> src_len, vm::ptr<u32> dst, vm::ptr<u32> dst_len)
+s32 UCS2stoUTF32s(vm::cptr<u16> src, vm::cptr<s32> src_len, vm::ptr<u32> dst, vm::ptr<s32> dst_len)
 {
-	cellL10n.notice("UCS2stoUTF32s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	for (u32 src_pos = 0; src_pos < *src_len; src_pos++)
-	{
-		const u16 ucs2 = src[src_pos];
-
-		if ((ucs2 & UTF16_SURROGATES_MASK1) == UTF16_HIGH_SURROGATES)
-		{
-			*src_len -= src_pos;
-			*dst_len = src_pos;
-			return SRCIllegal;
-		}
-
-		len++;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = src_pos;
-				return DSTExhausted;
-			}
-
-			dst[dst_pos++] = static_cast<u32>(ucs2);
-		}
-	}
-
-	*dst_len = len;
+	cellL10n.todo("UCS2stoUTF32s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
 	return ConversionOK;
 }
 
-s32 UCS2stoSBCSs(vm::cptr<u16> src, vm::ptr<u32> src_len, vm::ptr<u8> dst, vm::ptr<u32> dst_len, u32 code_page)
+s32 UCS2stoSBCSs()
 {
-	cellL10n.notice("UCS2stoSBCSs(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x, code_page=*0x%x)", src, src_len, dst, dst_len, code_page);
-
-	HostCode code = 0;
-	if ((code_page >= _L10N_CODE_) || !_L10nCodeParse(code_page, code))
-	{
-		return ConverterUnknown;
-	}
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	for (u32 src_pos = 0; src_pos < *src_len; src_pos++)
-	{
-		const s16 ucs2 = src[src_pos];
-
-		if (ucs2 >= 0xfffe)
-		{
-			*src_len -= src_pos;
-			*dst_len = src_pos;
-			return SRCIllegal;
-		}
-
-		u8 val = static_cast<u8>(ucs2);
-
-		if (0x7f < ucs2)
-		{
-			const u16 src_tmp = src[src_pos];
-			u8 dst_tmp = 0;
-			s32 dst_len_tmp = 1;
-
-			const s32 res = _ConvertStr(L10N_UCS2, &src_tmp, sizeof(u16), code_page, &dst_tmp, &dst_len_tmp, false);
-
-			if (res != ConversionOK)
-			{
-				*src_len -= src_pos;
-				*dst_len = dst_pos;
-				return SRCIllegal;
-			}
-
-			val = dst_tmp;
-		}
-
-		len++;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = src_pos;
-				return DSTExhausted;
-			}
-
-			dst[dst_pos++] = val;
-		}
-	}
-
+	cellL10n.todo("UCS2stoSBCSs()");
 	return ConversionOK;
 }
 
@@ -2563,64 +1350,13 @@ s32 SJIStoEUCJP()
 	return 0;
 }
 
-s32 UTF8stoUTF16s(vm::cptr<u8> src, vm::ptr<u32> src_len, vm::ptr<u16> dst, vm::ptr<u32> dst_len)
+s32 UTF8stoUTF16s(vm::cptr<u8> src, vm::cptr<s32> src_len, vm::ptr<u16> dst, vm::ptr<s32> dst_len)
 {
-	cellL10n.notice("UTF8stoUTF16s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	auto tmp = vm::make_var<be_t<u16>[2]>({0, 0});
-	const vm::ptr<u16> utf16_tmp = vm::cast(tmp.addr());
-	vm::var<u32> utf16_len_tmp = vm::make_var<u32>(0);
-
-	for (u32 src_pos = 0; src_pos < *src_len;)
-	{
-		const s32 utf8_len = UTF8toUTF16(src + src_pos, utf16_tmp, utf16_len_tmp);
-
-		if (utf8_len == 0)
-		{
-			*src_len -= src_pos;
-			*dst_len = len;
-			return SRCIllegal;
-		}
-
-		const u32 utf16_len = *utf16_len_tmp;
-		len += utf16_len;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = dst_pos;
-				return DSTExhausted;
-			}
-
-			for (u32 i = 0; i < utf16_len; i++)
-			{
-				dst[dst_pos++] = utf16_tmp[i];
-			}
-		}
-
-		src_pos += utf8_len;
-	}
-
-	*dst_len = len;
-	return ConversionOK;
+	cellL10n.warning("UTF8stoUTF16s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
+	return _L10nConvertStr(L10N_UTF8, src, src_len, L10N_UTF16, dst, dst_len);
 }
 
-s32 SJISstoUCS2s(vm::cptr<u8> src, vm::cptr<u32> src_len, vm::ptr<u16> dst, vm::ptr<u32> dst_len)
+s32 SJISstoUCS2s(vm::cptr<u8> src, vm::cptr<s32> src_len, vm::ptr<u16> dst, vm::ptr<s32> dst_len)
 {
 	cellL10n.warning("SJISstoUCS2s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
 	return _L10nConvertStr(L10N_CODEPAGE_932, src, src_len, L10N_UCS2, dst, dst_len);
@@ -2632,54 +1368,9 @@ s32 BIG5stoUCS2s()
 	return ConversionOK;
 }
 
-s32 UTF8stoUCS2s(vm::cptr<u8> src, vm::ptr<u32> src_len, vm::ptr<u16> dst, vm::ptr<u32> dst_len)
+s32 UTF8stoUCS2s(vm::cptr<u8> src, vm::cptr<s32> src_len, vm::ptr<u16> dst, vm::ptr<s32> dst_len)
 {
-	cellL10n.notice("UTF8stoUCS2s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
-
-	ensure(src_len && dst_len); // Not really checked
-
-	if (*src_len == 0u)
-	{
-		*dst_len = 0;
-		return ConversionOK;
-	}
-
-	ensure(src); // Not really checked
-
-	u32 len = 0;
-	u32 dst_pos = 0;
-
-	vm::var<u16> ucs2_tmp = vm::make_var<u16>(5);
-
-	for (u32 src_pos = 0; src_pos < *src_len;)
-	{
-		const s32 utf8_len = UTF8toUCS2(src + src_pos, ucs2_tmp);
-
-		if (utf8_len == 0 || *src_len < len)
-		{
-			*src_len -= src_pos;
-			*dst_len = len;
-			return SRCIllegal;
-		}
-
-		len++;
-
-		if (dst)
-		{
-			if (*dst_len < len)
-			{
-				*src_len -= src_pos;
-				*dst_len = dst_pos;
-				return DSTExhausted;
-			}
-
-			dst[dst_pos++] = ucs2_tmp[0];
-		}
-
-		src_pos += utf8_len;
-	}
-
-	*dst_len = len;
+	cellL10n.todo("UTF8stoUCS2s(src=*0x%x, src_len=*0x%x, dst=*0x%x, dst_len=*0x%x)", src, src_len, dst, dst_len);
 	return ConversionOK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellL10n.h b/rpcs3/Emu/Cell/Modules/cellL10n.h
index f255f006ef..2a70dfb58f 100644
--- a/rpcs3/Emu/Cell/Modules/cellL10n.h
+++ b/rpcs3/Emu/Cell/Modules/cellL10n.h
@@ -52,25 +52,25 @@ enum
 	L10N_CODEPAGE_863,
 	L10N_CODEPAGE_866,
 	L10N_CODEPAGE_932,
-	L10N_SHIFT_JIS = L10N_CODEPAGE_932,
+	L10N_SHIFT_JIS,
 	L10N_CODEPAGE_936,
-	L10N_GBK = L10N_CODEPAGE_936,
+	L10N_GBK,
 	L10N_CODEPAGE_949,
-	L10N_UHC = L10N_CODEPAGE_949,
+	L10N_UHC,
 	L10N_CODEPAGE_950,
-	L10N_BIG5 = L10N_CODEPAGE_950,
+	L10N_BIG5,
 	L10N_CODEPAGE_1251,
 	L10N_CODEPAGE_1252,
 	L10N_EUC_CN,
 	L10N_EUC_JP,
 	L10N_EUC_KR,
 	L10N_ISO_2022_JP,
-	L10N_JIS = L10N_ISO_2022_JP,
+	L10N_JIS,
 	L10N_ARIB,
 	L10N_HZ,
 	L10N_GB18030,
 	L10N_RIS_506,
-	L10N_MUSIC_SHIFT_JIS = L10N_RIS_506,
+	L10N_MUSIC_SHIFT_JIS,
 	//FW 3.10 and below
 	L10N_CODEPAGE_852,
 	L10N_CODEPAGE_1250,
@@ -88,12 +88,3 @@ enum
 	L10N_CODEPAGE_869,
 	_L10N_CODE_
 };
-
-enum
-{
-	UTF16_SURROGATES_MASK1 = 0xf800,
-	UTF16_SURROGATES_MASK2 = 0xfc00,
-	UTF16_SURROGATES       = 0xd800,
-	UTF16_HIGH_SURROGATES  = 0xd800,
-	UTF16_LOW_SURROGATES   = 0xdc00,
-};
diff --git a/rpcs3/Emu/Cell/Modules/cellMic.cpp b/rpcs3/Emu/Cell/Modules/cellMic.cpp
index a5ece1be59..51c14e83b4 100644
--- a/rpcs3/Emu/Cell/Modules/cellMic.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellMic.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include "Emu/System.h"
 #include "Emu/system_config.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Utilities/StrUtil.h"
@@ -7,16 +8,9 @@
 #include <Emu/IdManager.h>
 #include <Emu/Cell/lv2/sys_event.h>
 
-#include <numeric>
-#include <cmath>
-
-#ifndef WITHOUT_OPENAL
-#include "3rdparty/OpenAL/openal-soft/include/AL/alext.h"
-#endif
-
 LOG_CHANNEL(cellMic);
 
-template <>
+template<>
 void fmt_class_string<CellMicInError>::format(std::string& out, u64 arg)
 {
 	format_enum(out, arg, [](auto error)
@@ -45,7 +39,7 @@ void fmt_class_string<CellMicInError>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
+template<>
 void fmt_class_string<CellMicInErrorDsp>::format(std::string& out, u64 arg)
 {
 	format_enum(out, arg, [](auto error)
@@ -74,230 +68,108 @@ void fmt_class_string<CellMicInErrorDsp>::format(std::string& out, u64 arg)
 	});
 }
 
-namespace fmt
-{
-	struct alc_error
-	{
-		ALCdevice* device{};
-		ALCenum error{};
-	};
-}
-
-template <>
-void fmt_class_string<fmt::alc_error>::format(std::string& out, u64 arg)
-{
-	const fmt::alc_error& obj = get_object(arg);
-	fmt::append(out, "0x%x='%s'", obj.error, alcGetString(obj.device, obj.error));
-}
-
 void mic_context::operator()()
 {
-	// Timestep in microseconds
-	constexpr u64 TIMESTEP = 256ull * 1'000'000ull / 48000ull;
-	u64 timeout = 0;
-
 	while (thread_ctrl::state() != thread_state::aborting)
 	{
-		if (timeout != 0)
+		// The time between processing is copied from audio thread
+		// Might be inaccurate for mic thread
+		if (Emu.IsPaused())
 		{
-			thread_ctrl::wait_on(wakey, 0, timeout);
-			wakey.store(0);
-		}
-
-		std::lock_guard lock(mutex);
-
-		if (std::none_of(mic_list.begin(), mic_list.end(), [](const microphone_device& dev) { return dev.is_registered(); }))
-		{
-			timeout = umax;
+			thread_ctrl::wait_for(1000); // hack
 			continue;
 		}
-		else
-		{
-			timeout = TIMESTEP - (std::chrono::duration_cast<std::chrono::microseconds>(steady_clock::now().time_since_epoch()).count() % TIMESTEP);
-		}
 
-		for (auto& mic_entry : mic_list)
-		{
-			mic_entry.update_audio();
-		}
+		const u64 stamp0   = get_guest_system_time();
+		const u64 time_pos = stamp0 - start_time - Emu.GetPauseTime();
 
-		auto mic_queue = lv2_event_queue::find(event_queue_key);
-		if (!mic_queue)
+		const u64 expected_time = m_counter * 256 * 1000000 / 48000;
+		if (expected_time >= time_pos)
+		{
+			thread_ctrl::wait_for(1000); // hack
 			continue;
+		}
+		m_counter++;
 
-		for (usz dev_num = 0; dev_num < mic_list.size(); dev_num++)
+		// Process signals
 		{
-			microphone_device& device = ::at32(mic_list, dev_num);
-			if (device.has_data())
+			std::lock_guard lock(mutex);
+
+			for (auto& mic_entry : mic_list)
 			{
-				mic_queue->send(event_queue_source, CELLMIC_DATA, dev_num, 0);
+				auto& mic = mic_entry.second;
+				mic.update_audio();
+			}
+
+			auto mic_queue = lv2_event_queue::find(event_queue_key);
+			if (!mic_queue)
+				continue;
+
+			for (auto& mic_entry : mic_list)
+			{
+				auto& mic = mic_entry.second;
+				if (mic.has_data())
+				{
+					mic_queue->send(0, CELLMIC_DATA, mic_entry.first, 0);
+				}
 			}
 		}
 	}
 
 	// Cleanup
-	std::lock_guard lock(mutex);
 	for (auto& mic_entry : mic_list)
 	{
-		mic_entry.close_microphone();
+		mic_entry.second.close_microphone();
 	}
 }
 
-void mic_context::wake_up()
-{
-	wakey.store(1);
-	wakey.notify_one();
-}
-
 void mic_context::load_config_and_init()
 {
-	mic_list = {};
+	auto device_list = fmt::split(g_cfg.audio.microphone_devices.to_string(), {"@@@"});
 
-	const std::vector<std::string> device_list = fmt::split(g_cfg.audio.microphone_devices.to_string(), {"@@@"});
-
-	if (!device_list.empty())
+	if (!device_list.empty() && mic_list.empty())
 	{
-		// We only register the first device. The rest is registered with cellAudioInRegisterDevice.
-		if (g_cfg.audio.microphone_type == microphone_handler::singstar)
+		switch (g_cfg.audio.microphone_type)
 		{
-			microphone_device& device = ::at32(mic_list, 0);
-			device = microphone_device(microphone_handler::singstar);
-			device.set_registered(true);
-			device.add_device(device_list[0]);
-
-			// Singstar uses the same device for 2 players
+		case microphone_handler::standard:
+		{
+			for (s32 index = 0; index < static_cast<s32>(device_list.size()); index++)
+			{
+				mic_list.emplace(std::piecewise_construct, std::forward_as_tuple(index), std::forward_as_tuple(microphone_handler::standard));
+				mic_list.at(index).add_device(device_list[index]);
+			}
+			break;
+		}
+		case microphone_handler::singstar:
+		{
+			mic_list.emplace(std::piecewise_construct, std::forward_as_tuple(0), std::forward_as_tuple(microphone_handler::singstar));
+			mic_list.at(0).add_device(device_list[0]);
 			if (device_list.size() >= 2)
-			{
-				device.add_device(device_list[1]);
-			}
-
-			wake_up();
+				mic_list.at(0).add_device(device_list[1]);
+			break;
 		}
-		else
+		case microphone_handler::real_singstar:
+		case microphone_handler::rocksmith:
 		{
-			[[maybe_unused]] const u32 index = register_device(device_list[0]);
+			mic_list.emplace(std::piecewise_construct, std::forward_as_tuple(0), std::forward_as_tuple(g_cfg.audio.microphone_type));
+			mic_list.at(0).add_device(device_list[0]);
+			break;
+		}
+		case microphone_handler::null:
+		default: break;
 		}
 	}
 }
 
-u32 mic_context::register_device(const std::string& device_name)
-{
-	usz index = mic_list.size();
-	for (usz i = 0; i < mic_list.size(); i++)
-	{
-		microphone_device& device = ::at32(mic_list, i);
-		if (!device.is_registered())
-		{
-			if (index == mic_list.size())
-			{
-				index = i;
-			}
-		}
-		else if (device_name == device.get_device_name())
-		{
-			// TODO: what happens if the device is registered twice?
-			return ::narrow<u32>(i);
-		}
-	}
-
-	// TODO: Check max mics properly
-	ensure(index < mic_list.size(), "cellMic max mics exceeded during registration");
-
-	switch (g_cfg.audio.microphone_type)
-	{
-	case microphone_handler::standard:
-	case microphone_handler::real_singstar:
-	case microphone_handler::rocksmith:
-	{
-		microphone_device& device = ::at32(mic_list, index);
-		device = microphone_device(g_cfg.audio.microphone_type.get());
-		device.set_registered(true);
-		device.add_device(device_name);
-
-		if (auto mic_queue = lv2_event_queue::find(event_queue_key))
-		{
-			mic_queue->send(event_queue_source, CELLMIC_ATTACH, index, 0);
-		}
-
-		break;
-	}
-	case microphone_handler::singstar:
-	case microphone_handler::null:
-	default:
-		break;
-	}
-
-	wake_up();
-
-	return ::narrow<u32>(index);
-}
-
-void mic_context::unregister_device(u32 dev_num)
-{
-	// Don't allow to unregister the first device for now.
-	if (dev_num == 0 || dev_num >= mic_list.size())
-	{
-		return;
-	}
-
-	microphone_device& device = ::at32(mic_list, dev_num);
-	device = microphone_device();
-
-	if (auto mic_queue = lv2_event_queue::find(event_queue_key))
-	{
-		mic_queue->send(event_queue_source, CELLMIC_DETACH, dev_num, 0);
-	}
-}
-
-bool mic_context::check_device(u32 dev_num)
-{
-	if (dev_num >= mic_list.size())
-		return false;
-
-	microphone_device& device = ::at32(mic_list, dev_num);
-	return device.is_registered();
-}
-
 // Static functions
 
-template <u32 bytesize>
-inline void microphone_device::variable_byteswap(const void* src, void* dst)
+void microphone_device::variable_byteswap(const void* src, void* dst, const u32 bytesize)
 {
-	if constexpr (bytesize == 4)
+	switch (bytesize)
 	{
-		*static_cast<u32*>(dst) = *static_cast<const be_t<u32>*>(src);
+	case 4: *static_cast<u32*>(dst) = *static_cast<const be_t<u32>*>(src); break;
+	case 2: *static_cast<u16*>(dst) = *static_cast<const be_t<u16>*>(src); break;
 	}
-	else if constexpr (bytesize == 2)
-	{
-		*static_cast<u16*>(dst) = *static_cast<const be_t<u16>*>(src);
-	}
-	else
-	{
-		fmt::throw_exception("variable_byteswap with bytesize %d unimplemented", bytesize);
-	}
-}
-
-inline u32 microphone_device::convert_16_bit_pcm_to_float(const std::vector<u8>& buffer, u32 num_bytes)
-{
-	static_assert((float_buf_size % sizeof(f32)) == 0);
-
-	float_buf.resize(float_buf_size, 0);
-	const u32 bytes_to_write = static_cast<u32>(num_bytes * (sizeof(f32) / sizeof(s16)));
-	ensure(bytes_to_write <= float_buf.size());
-
-	const be_t<s16>* src = utils::bless<const be_t<s16>>(buffer.data());
-	be_t<f32>* dst = reinterpret_cast<be_t<f32>*>(float_buf.data());
-
-	for (usz i = 0; i < num_bytes / sizeof(s16); i++)
-	{
-		const be_t<s16> sample = *src++;
-
-		const be_t<f32> normalized_sample_be = std::clamp(static_cast<f32>(sample) / std::numeric_limits<s16>::max(), -1.0f, 1.0f);
-
-		*dst++ = normalized_sample_be;
-	}
-
-	return bytes_to_write;
 }
 
 // Public functions
@@ -309,9 +181,7 @@ microphone_device::microphone_device(microphone_handler type)
 
 void microphone_device::add_device(const std::string& name)
 {
-	devices.push_back(mic_device{
-		.name = name
-	});
+	device_name.push_back(name);
 }
 
 error_code microphone_device::open_microphone(const u8 type, const u32 dsp_r, const u32 raw_r, const u8 channels)
@@ -321,13 +191,15 @@ error_code microphone_device::open_microphone(const u8 type, const u32 dsp_r, co
 	raw_samplingrate = raw_r;
 	num_channels     = channels;
 
-#ifndef WITHOUT_OPENAL
-	enumerate_devices();
-
 	// Adjust number of channels depending on microphone type
 	switch (device_type)
 	{
 	case microphone_handler::standard:
+		if (num_channels > 2)
+		{
+			cellMic.warning("Reducing number of mic channels from %d to 2 for %s", num_channels, device_name[0]);
+			num_channels = 2;
+		}
 		break;
 	case microphone_handler::singstar:
 	case microphone_handler::real_singstar:
@@ -339,21 +211,15 @@ error_code microphone_device::open_microphone(const u8 type, const u32 dsp_r, co
 			num_channels = 2;
 		}
 		break;
-	case microphone_handler::rocksmith:
-		num_channels = 1;
-		break;
+	case microphone_handler::rocksmith: num_channels = 1; break;
 	case microphone_handler::null:
-	default:
-		ensure(false);
-		break;
+	default: ensure(false); break;
 	}
 
 	ALCenum num_al_channels;
 	switch (num_channels)
 	{
-	case 1:
-		num_al_channels = AL_FORMAT_MONO16;
-		break;
+	case 1: num_al_channels = AL_FORMAT_MONO16; break;
 	case 2:
 		// If we're using SingStar each device needs to be mono
 		if (device_type == microphone_handler::singstar)
@@ -362,474 +228,278 @@ error_code microphone_device::open_microphone(const u8 type, const u32 dsp_r, co
 			num_al_channels = AL_FORMAT_STEREO16;
 		break;
 	case 4:
-		num_al_channels = AL_FORMAT_QUAD16;
-		break;
-	default:
-		cellMic.warning("Requested an invalid number of %d channels. Defaulting to 4 channels instead.", num_channels);
-		num_al_channels = AL_FORMAT_QUAD16;
-		num_channels = 4;
-		break;
-	}
-
-	// Real firmware tries 4, 2 and then 1 channels if the channel count is not supported
-	// TODO: The used channel count may vary for Sony's camera devices
-	for (bool found_valid_channels = false; !found_valid_channels;)
-	{
-		switch (num_al_channels)
+		if (alcIsExtensionPresent(nullptr, "AL_EXT_MCFORMATS") == AL_TRUE)
 		{
-		case AL_FORMAT_QUAD16:
-			if (alcIsExtensionPresent(nullptr, "AL_EXT_MCFORMATS") == AL_TRUE)
-			{
-				found_valid_channels = true;
-				break;
-			}
-
-			cellMic.warning("Requested 4 channels but AL_EXT_MCFORMATS not available, trying 2 channels next");
+			num_al_channels = AL_FORMAT_QUAD16;
+		}
+		else
+		{
+			cellMic.error("Requested 4 channels but AL_EXT_MCFORMATS not available, settling down to 2");
+			num_channels    = 2;
 			num_al_channels = AL_FORMAT_STEREO16;
-			num_channels = 2;
-			break;
-		case AL_FORMAT_STEREO16:
-			if (true) // TODO: check stereo capability
-			{
-				found_valid_channels = true;
-				break;
-			}
-
-			cellMic.warning("Requested 2 channels but extension is not available, trying 1 channel next");
-			num_al_channels = AL_FORMAT_MONO16;
-			num_channels = 1;
-			break;
-		case AL_FORMAT_MONO16:
-			found_valid_channels = true;
-			break;
-		default:
-			ensure(false);
-			break;
 		}
-	}
-
-	// Ensure that the code above delivers what it should
-	switch (num_al_channels)
-	{
-	case AL_FORMAT_QUAD16:
-		ensure(num_channels == 4 && device_type != microphone_handler::singstar && device_type != microphone_handler::real_singstar);
-		break;
-	case AL_FORMAT_STEREO16:
-		ensure(num_channels == 2 && device_type != microphone_handler::singstar);
-		break;
-	case AL_FORMAT_MONO16:
-		ensure(num_channels == 1 || (num_channels == 2 && device_type == microphone_handler::singstar));
 		break;
 	default:
-		ensure(false);
+		cellMic.fatal("Requested an invalid number of channels: %d", num_channels);
+		num_al_channels = AL_FORMAT_STEREO16;
 		break;
 	}
 
-	ALCdevice* device = nullptr;
+	ALCdevice* device = alcCaptureOpenDevice(device_name[0].c_str(), raw_samplingrate, num_al_channels, inbuf_size);
 
-	// Make sure we use a proper sampling rate
-	// TODO: The used sample rate may vary for Sony's camera devices
-	const std::array<u32, 7> samplingrates = { raw_samplingrate, 48000u, 32000u, 24000u, 16000u, 12000u, 8000u };
-
-	for (u32 samplingrate : samplingrates)
+	if (alcGetError(device) != ALC_NO_ERROR)
 	{
-		if (!std::any_of(samplingrates.cbegin() + 1, samplingrates.cend(), [samplingrate](u32 r){ return r == samplingrate; }))
-		{
-			cellMic.warning("Requested sampling rate %d, but we do not support it. Trying next sampling rate...", samplingrate);
-			continue;
-		}
-
-		cellMic.notice("Trying sampling rate %d with %d channel(s)", samplingrate, num_channels);
-
-		device = open_device(devices[0].name, samplingrate, num_al_channels, inbuf_size);
-		if (!device)
-		{
-			continue;
-		}
-
-		// Use this sampling rate
-		raw_samplingrate = samplingrate;
-		cellMic.notice("Using sampling rate %d and %d channel(s)", raw_samplingrate, num_channels);
-		break;
-	}
-
-	if (!device)
-	{
-		cellMic.error("Failed to open capture device '%s' (raw_samplingrate=%d, num_al_channels=0x%x, inbuf_size=%d)", devices[0].name, raw_samplingrate, num_al_channels, inbuf_size);
+		cellMic.error("Error opening capture device %s", device_name[0]);
 #ifdef _WIN32
 		cellMic.error("Make sure microphone use is authorized under \"Microphone privacy settings\" in windows configuration");
 #endif
 		return CELL_MICIN_ERROR_DEVICE_NOT_SUPPORT;
 	}
 
-	aux_samplingrate = dsp_samplingrate = raw_samplingrate; // Same rate for now
+	input_devices.push_back(device);
+	internal_bufs.emplace_back();
+	internal_bufs[0].resize(inbuf_size, 0);
+	temp_buf.resize(inbuf_size, 0);
 
-	ensure(!devices.empty());
-
-	devices[0].device = device;
-	devices[0].buf.resize(inbuf_size, 0);
-
-	if (device_type == microphone_handler::singstar && devices.size() >= 2)
+	if (device_type == microphone_handler::singstar && device_name.size() >= 2)
 	{
 		// Open a 2nd microphone into the same device
-		num_al_channels = AL_FORMAT_MONO16;
-		device = open_device(devices[1].name, raw_samplingrate, num_al_channels, inbuf_size);
-
-		if (!device)
+		device = alcCaptureOpenDevice(device_name[1].c_str(), raw_samplingrate, AL_FORMAT_MONO16, inbuf_size);
+		if (alcGetError(device) != ALC_NO_ERROR)
 		{
 			// Ignore it and move on
-			cellMic.error("Failed to open 2nd SingStar capture device '%s' (raw_samplingrate=%d, num_al_channels=0x%x, inbuf_size=%d)", devices[1].name, raw_samplingrate, num_al_channels, inbuf_size);
+			cellMic.error("Error opening 2nd SingStar capture device %s", device_name[1]);
 		}
 		else
 		{
-			devices[1].device = device;
-			devices[1].buf.resize(inbuf_size, 0);
+			input_devices.push_back(device);
+			internal_bufs.emplace_back();
+			internal_bufs[1].resize(inbuf_size, 0);
 		}
 	}
 
-	if (device_type != microphone_handler::real_singstar)
-	{
-		temp_buf.resize(inbuf_size, 0);
-	}
-
 	sample_size = (bit_resolution / 8) * num_channels;
 
 	mic_opened = true;
 	return CELL_OK;
-#else
-	return CELL_MICIN_ERROR_DEVICE_NOT_SUPPORT;
-#endif
 }
 
 error_code microphone_device::close_microphone()
 {
-#ifndef WITHOUT_OPENAL
 	if (mic_started)
 	{
 		stop_microphone();
 	}
 
-	for (mic_device& micdevice : devices)
+	for (const auto& micdevice : input_devices)
 	{
-		if (alcCaptureCloseDevice(micdevice.device) != ALC_TRUE)
+		if (alcCaptureCloseDevice(micdevice) != ALC_TRUE)
 		{
-			cellMic.error("Error closing capture device '%s'", micdevice.name);
+			cellMic.error("Error closing capture device");
 		}
-
-		micdevice.device = nullptr;
-		micdevice.buf.clear();
 	}
 
-	temp_buf.clear();
+	input_devices.clear();
+	internal_bufs.clear();
+
 	mic_opened = false;
-#endif
 
 	return CELL_OK;
 }
 
 error_code microphone_device::start_microphone()
 {
-#ifndef WITHOUT_OPENAL
-	for (const mic_device& micdevice : devices)
+	for (const auto& micdevice : input_devices)
 	{
-		alcCaptureStart(micdevice.device);
-		if (ALCenum err = alcGetError(micdevice.device); err != ALC_NO_ERROR)
+		alcCaptureStart(micdevice);
+		if (alcGetError(micdevice) != ALC_NO_ERROR)
 		{
-			cellMic.error("Error starting capture of device '%s' (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err});
+			cellMic.error("Error starting capture");
 			stop_microphone();
 			return CELL_MICIN_ERROR_FATAL;
 		}
 	}
-#endif
 
 	mic_started = true;
+
 	return CELL_OK;
 }
 
 error_code microphone_device::stop_microphone()
 {
-#ifndef WITHOUT_OPENAL
-	for (const mic_device& micdevice : devices)
+	for (const auto& micdevice : input_devices)
 	{
-		alcCaptureStop(micdevice.device);
-		if (ALCenum err = alcGetError(micdevice.device); err != ALC_NO_ERROR)
+		alcCaptureStop(micdevice);
+		if (alcGetError(micdevice) != ALC_NO_ERROR)
 		{
-			cellMic.error("Error stopping capture of device '%s' (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err});
+			cellMic.error("Error stopping capture");
 		}
 	}
-#endif
 
 	mic_started = false;
+
 	return CELL_OK;
 }
 
 void microphone_device::update_audio()
 {
-	if (mic_registered && mic_opened && mic_started)
+	if (mic_opened && mic_started)
 	{
 		if (signal_types == CELLMIC_SIGTYPE_NULL)
 			return;
 
 		const u32 num_samples = capture_audio();
 
-		if ((signal_types & CELLMIC_SIGTYPE_RAW) ||
-			(signal_types & CELLMIC_SIGTYPE_DSP))
-		{
-			get_data(num_samples);
-		}
-
 		if (signal_types & CELLMIC_SIGTYPE_RAW)
-		{
 			get_raw(num_samples);
-		}
-
 		if (signal_types & CELLMIC_SIGTYPE_DSP)
-		{
 			get_dsp(num_samples);
-		}
-
 		// TODO: aux?
 	}
 }
 
 bool microphone_device::has_data() const
 {
-	return mic_registered && mic_opened && mic_started && (rbuf_raw.has_data() || rbuf_dsp.has_data());
-}
-
-f32 microphone_device::calculate_energy_level()
-{
-	const auto& buffer = device_type == microphone_handler::real_singstar ? ::at32(devices, 0).buf : temp_buf;
-	const size_t num_samples = buffer.size() / sizeof(s16);
-
-	f64 sum_squares = 0.0;
-
-	for (usz i = 0; i < num_samples; i++)
-	{
-		const be_t<s16> sample = read_from_ptr<be_t<s16>>(buffer, i * sizeof(s16));
-		const f64 normalized_sample = static_cast<f64>(sample) / -std::numeric_limits<s16>::min();
-		sum_squares += normalized_sample * normalized_sample;
-	}
-
-	const f32 rms = num_samples > 0 ? static_cast<f32>(std::sqrt(sum_squares / num_samples)) : 0.0f;
-	constexpr f32 decibels_max = 90.0f;
-	const f32 decibels_relative = 20.0f * std::log10(std::max(rms, 0.00001f));
-	const f32 decibels = decibels_max + (decibels_relative * 0.5f);
-
-	return std::clamp(decibels, 40.0f, decibels_max);
+	return mic_opened && mic_started && (rbuf_raw.has_data() || rbuf_dsp.has_data());
 }
 
 u32 microphone_device::capture_audio()
 {
-#ifndef WITHOUT_OPENAL
 	ensure(sample_size > 0);
 
 	u32 num_samples = inbuf_size / sample_size;
 
-	for (const mic_device& micdevice : devices)
+	for (const auto micdevice : input_devices)
 	{
 		ALCint samples_in = 0;
-		alcGetIntegerv(micdevice.device, ALC_CAPTURE_SAMPLES, 1, &samples_in);
-
-		if (ALCenum err = alcGetError(micdevice.device); err != ALC_NO_ERROR)
+		alcGetIntegerv(micdevice, ALC_CAPTURE_SAMPLES, 1, &samples_in);
+		if (alcGetError(micdevice) != ALC_NO_ERROR)
 		{
-			cellMic.error("Error getting number of captured samples of device '%s' (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err});
+			cellMic.error("Error getting number of captured samples");
 			return CELL_MICIN_ERROR_FATAL;
 		}
-
 		num_samples = std::min<u32>(num_samples, samples_in);
 	}
 
-	if (num_samples == 0)
+	for (u32 index = 0; index < input_devices.size(); index++)
 	{
-		return 0;
-	}
-
-	for (mic_device& micdevice : devices)
-	{
-		alcCaptureSamples(micdevice.device, micdevice.buf.data(), num_samples);
-
-		if (ALCenum err = alcGetError(micdevice.device); err != ALC_NO_ERROR)
-		{
-			cellMic.error("Error capturing samples of device '%s' (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err});
-		}
+		alcCaptureSamples(input_devices[index], internal_bufs[index].data(), num_samples);
 	}
 
 	return num_samples;
-#else
-	return 0;
-#endif
 }
 
 // Private functions
 
-#ifndef WITHOUT_OPENAL
-void microphone_device::enumerate_devices()
+void microphone_device::get_raw(const u32 num_samples)
 {
-	cellMic.notice("Enumerating capture devices...");
-	enumerated_devices.clear();
-
-	if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATION_EXT") == AL_TRUE)
-	{
-		if (const char* alc_devices = alcGetString(nullptr, ALC_CAPTURE_DEVICE_SPECIFIER))
-		{
-			while (alc_devices && *alc_devices != 0)
-			{
-				cellMic.notice("Found capture device: '%s'", alc_devices);
-				enumerated_devices.push_back(alc_devices);
-				alc_devices += strlen(alc_devices) + 1;
-			}
-		}
-	}
-	else
-	{
-		// Without enumeration we can only use one device
-		cellMic.error("OpenAl extension ALC_ENUMERATION_EXT not supported. The enumerated capture devices will only contain the default capture device.");
-
-		if (const char* alc_device = alcGetString(nullptr, ALC_DEFAULT_DEVICE_SPECIFIER))
-		{
-			cellMic.notice("Found default capture device: '%s'", alc_device);
-			enumerated_devices.push_back(alc_device);
-		}
-	}
-}
-
-ALCdevice* microphone_device::open_device(const std::string& name, u32 samplingrate, ALCenum num_al_channels, u32 buf_size)
-{
-	if (std::none_of(enumerated_devices.cbegin(), enumerated_devices.cend(), [&name](const std::string& dev){ return dev == name; }))
-	{
-		cellMic.error("Capture device '%s' not in enumerated devices", name);
-	}
-
-	ALCdevice* device = alcCaptureOpenDevice(name.c_str(), samplingrate, num_al_channels, buf_size);
-
-	if (ALCenum err = alcGetError(device); err != ALC_NO_ERROR || !device)
-	{
-		cellMic.warning("Failed to open capture device '%s' (error=%s, device=*0x%x, samplingrate=%d, num_al_channels=0x%x, buf_size=%d)", name, fmt::alc_error{device, err}, device, samplingrate, num_al_channels, buf_size);
-		device = nullptr;
-	}
-
-	return device;
-}
-#endif
-
-void microphone_device::get_data(const u32 num_samples)
-{
-	if (num_samples == 0)
-	{
-		return;
-	}
+	u8* tmp_ptr = temp_buf.data();
 
 	switch (device_type)
 	{
 	case microphone_handler::real_singstar:
-	{
-		// Straight copy from device. No need for intermediate buffer.
+		// Straight copy from device
+		memcpy(tmp_ptr, internal_bufs[0].data(), num_samples * (bit_resolution / 8) * num_channels);
 		break;
-	}
 	case microphone_handler::standard:
 	case microphone_handler::rocksmith:
-	{
-		constexpr u8 channel_size = bit_resolution / 8;
-		const usz bufsize = num_samples * sample_size;
-		const std::vector<u8>& buf = ::at32(devices, 0).buf;
-		ensure(bufsize <= buf.size());
-		ensure(bufsize <= temp_buf.size());
-
-		u8* tmp_ptr = temp_buf.data();
-
 		// BE Translation
-		for (u32 index = 0; index < bufsize; index += channel_size)
+		for (u32 index = 0; index < num_samples; index++)
 		{
-			microphone_device::variable_byteswap<channel_size>(buf.data() + index, tmp_ptr + index);
+			for (u32 indchan = 0; indchan < num_channels; indchan++)
+			{
+				const u32 curindex = (index * sample_size) + indchan * (bit_resolution / 8);
+				microphone_device::variable_byteswap(internal_bufs[0].data() + curindex, tmp_ptr + curindex, bit_resolution / 8);
+			}
 		}
 		break;
-	}
 	case microphone_handler::singstar:
-	{
 		ensure(sample_size == 4);
 
-		// Each device buffer contains 16 bit mono samples
-		const usz bufsize = num_samples * sizeof(u16);
-		const std::vector<u8>& buf_0 = ::at32(devices, 0).buf;
-		ensure(bufsize <= buf_0.size());
-
-		u8* tmp_ptr = temp_buf.data();
-
-		// Mixing the 2 mics into the 2 destination channels
-		if (devices.size() == 2)
+		// Mixing the 2 mics as if channels
+		if (input_devices.size() == 2)
 		{
-			const std::vector<u8>& buf_1 = ::at32(devices, 1).buf;
-			ensure(bufsize <= buf_1.size());
-
 			for (u32 index = 0; index < (num_samples * 4); index += 4)
 			{
-				const u32 src_index = index / 2;
-
-				tmp_ptr[index]     = buf_0[src_index];
-				tmp_ptr[index + 1] = buf_0[src_index + 1];
-				tmp_ptr[index + 2] = buf_1[src_index];
-				tmp_ptr[index + 3] = buf_1[src_index + 1];
+				tmp_ptr[index]     = internal_bufs[0][(index / 2)];
+				tmp_ptr[index + 1] = internal_bufs[0][(index / 2) + 1];
+				tmp_ptr[index + 2] = internal_bufs[1][(index / 2)];
+				tmp_ptr[index + 3] = internal_bufs[1][(index / 2) + 1];
 			}
 		}
 		else
 		{
 			for (u32 index = 0; index < (num_samples * 4); index += 4)
 			{
-				const u32 src_index = index / 2;
-
-				tmp_ptr[index]     = buf_0[src_index];
-				tmp_ptr[index + 1] = buf_0[src_index + 1];
+				tmp_ptr[index]     = internal_bufs[0][(index / 2)];
+				tmp_ptr[index + 1] = internal_bufs[0][(index / 2) + 1];
 				tmp_ptr[index + 2] = 0;
 				tmp_ptr[index + 3] = 0;
 			}
 		}
 
 		break;
-	}
 	case microphone_handler::null:
-		ensure(false);
-		break;
-	}
-}
-
-void microphone_device::get_raw(const u32 num_samples)
-{
-	if (num_samples == 0)
-	{
-		return;
+	default: ensure(false); break;
 	}
 
-	const std::vector<u8>& buf = device_type == microphone_handler::real_singstar ? ::at32(devices, 0).buf : temp_buf;
-	const u32 bufsize = num_samples * sample_size;
-	ensure(bufsize <= buf.size());
-
-	rbuf_raw.write_bytes(buf.data(), bufsize);
-}
+	rbuf_raw.write_bytes(tmp_ptr, num_samples * sample_size);
+};
 
 void microphone_device::get_dsp(const u32 num_samples)
 {
-	if (num_samples == 0)
+	u8* tmp_ptr = temp_buf.data();
+
+	switch (device_type)
 	{
-		return;
+	case microphone_handler::real_singstar:
+		// Straight copy from device
+		memcpy(tmp_ptr, internal_bufs[0].data(), num_samples * (bit_resolution / 8) * num_channels);
+		break;
+	case microphone_handler::standard:
+	case microphone_handler::rocksmith:
+		// BE Translation
+		for (u32 index = 0; index < num_samples; index++)
+		{
+			for (u32 indchan = 0; indchan < num_channels; indchan++)
+			{
+				const u32 curindex = (index * sample_size) + indchan * (bit_resolution / 8);
+				microphone_device::variable_byteswap(internal_bufs[0].data() + curindex, tmp_ptr + curindex, bit_resolution / 8);
+			}
+		}
+		break;
+	case microphone_handler::singstar:
+		ensure(sample_size == 4);
+
+		// Mixing the 2 mics as if channels
+		if (input_devices.size() == 2)
+		{
+			for (u32 index = 0; index < (num_samples * 4); index += 4)
+			{
+				tmp_ptr[index]     = internal_bufs[0][(index / 2)];
+				tmp_ptr[index + 1] = internal_bufs[0][(index / 2) + 1];
+				tmp_ptr[index + 2] = internal_bufs[1][(index / 2)];
+				tmp_ptr[index + 3] = internal_bufs[1][(index / 2) + 1];
+			}
+		}
+		else
+		{
+			for (u32 index = 0; index < (num_samples * 4); index += 4)
+			{
+				tmp_ptr[index]     = internal_bufs[0][(index / 2)];
+				tmp_ptr[index + 1] = internal_bufs[0][(index / 2) + 1];
+				tmp_ptr[index + 2] = 0;
+				tmp_ptr[index + 3] = 0;
+			}
+		}
+
+		break;
+	case microphone_handler::null:
+	default: ensure(false); break;
 	}
 
-	const std::vector<u8>& buf = device_type == microphone_handler::real_singstar ? ::at32(devices, 0).buf : temp_buf;
-	const u32 bufsize = num_samples * sample_size;
-	ensure(bufsize <= buf.size());
-
-	if (attr_dsptype != 0x01)
-	{
-		// Convert 16-bit PCM audio data to 32-bit float (DSP format)
-		const u32 bufsize_float = convert_16_bit_pcm_to_float(buf, bufsize);
-		rbuf_dsp.write_bytes(float_buf.data(), bufsize_float);
-	}
-	else
-	{
-		// The same as device RAW stream format, except that the data byte is always big-endian
-		rbuf_dsp.write_bytes(buf.data(), bufsize);
-	}
-}
+	rbuf_dsp.write_bytes(tmp_ptr, num_samples * sample_size);
+};
 
 /// Initialization/Shutdown Functions
 
@@ -860,16 +530,55 @@ error_code cellMicEnd()
 	// TODO
 	mic_thr.init = 0;
 	mic_thr.event_queue_key = 0;
-	mic_thr.event_queue_source = 0;
 
 	return CELL_OK;
 }
 
 /// Open/Close Microphone Functions
 
+error_code cellMicOpen(s32 dev_num, s32 sampleRate)
+{
+	cellMic.trace("cellMicOpen(dev_num=%d sampleRate=%d)", dev_num, sampleRate);
+
+	auto& mic_thr = g_fxo->get<mic_thread>();
+	const std::lock_guard lock(mic_thr.mutex);
+	if (!mic_thr.init)
+		return CELL_MICIN_ERROR_NOT_INIT;
+
+	if (!mic_thr.mic_list.count(dev_num))
+		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
+
+	auto& device = mic_thr.mic_list.at(dev_num);
+
+	if (device.is_opened())
+		return CELL_MICIN_ERROR_ALREADY_OPEN;
+
+	return device.open_microphone(CELLMIC_SIGTYPE_DSP, sampleRate, sampleRate);
+}
+
+error_code cellMicOpenRaw(s32 dev_num, s32 sampleRate, s32 maxChannels)
+{
+	cellMic.trace("cellMicOpenRaw(dev_num=%d, sampleRate=%d, maxChannels=%d)", dev_num, sampleRate, maxChannels);
+
+	auto& mic_thr = g_fxo->get<mic_thread>();
+	const std::lock_guard lock(mic_thr.mutex);
+	if (!mic_thr.init)
+		return CELL_MICIN_ERROR_NOT_INIT;
+
+	if (!mic_thr.mic_list.count(dev_num))
+		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
+
+	auto& device = mic_thr.mic_list.at(dev_num);
+
+	if (device.is_opened())
+		return CELL_MICIN_ERROR_ALREADY_OPEN;
+
+	return device.open_microphone(CELLMIC_SIGTYPE_DSP | CELLMIC_SIGTYPE_RAW, sampleRate, sampleRate, maxChannels);
+}
+
 error_code cellMicOpenEx(s32 dev_num, s32 rawSampleRate, s32 rawChannel, s32 DSPSampleRate, s32 bufferSizeMS, u8 signalType)
 {
-	cellMic.notice("cellMicOpenEx(dev_num=%d, rawSampleRate=%d, rawChannel=%d, DSPSampleRate=%d, bufferSizeMS=%d, signalType=0x%x)",
+	cellMic.trace("cellMicOpenEx(dev_num=%d, rawSampleRate=%d, rawChannel=%d, DSPSampleRate=%d, bufferSizeMS=%d, signalType=0x%x)",
 		dev_num, rawSampleRate, rawChannel, DSPSampleRate, bufferSizeMS, signalType);
 
 	auto& mic_thr = g_fxo->get<mic_thread>();
@@ -877,10 +586,10 @@ error_code cellMicOpenEx(s32 dev_num, s32 rawSampleRate, s32 rawChannel, s32 DSP
 	if (!mic_thr.init)
 		return CELL_MICIN_ERROR_NOT_INIT;
 
-	if (!mic_thr.check_device(dev_num))
+	if (!mic_thr.mic_list.count(dev_num))
 		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
 
-	microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
+	auto& device = mic_thr.mic_list.at(dev_num);
 
 	if (device.is_opened())
 		return CELL_MICIN_ERROR_ALREADY_OPEN;
@@ -890,21 +599,7 @@ error_code cellMicOpenEx(s32 dev_num, s32 rawSampleRate, s32 rawChannel, s32 DSP
 	return device.open_microphone(signalType, DSPSampleRate, rawSampleRate, rawChannel);
 }
 
-error_code cellMicOpen(s32 dev_num, s32 sampleRate)
-{
-	cellMic.trace("cellMicOpen(dev_num=%d sampleRate=%d)", dev_num, sampleRate);
-
-	return cellMicOpenEx(dev_num, sampleRate, 1, sampleRate, 0x80, CELLMIC_SIGTYPE_DSP);
-}
-
-error_code cellMicOpenRaw(s32 dev_num, s32 sampleRate, s32 maxChannels)
-{
-	cellMic.trace("cellMicOpenRaw(dev_num=%d, sampleRate=%d, maxChannels=%d)", dev_num, sampleRate, maxChannels);
-
-	return cellMicOpenEx(dev_num, sampleRate, maxChannels, sampleRate, 0x80, CELLMIC_SIGTYPE_RAW);
-}
-
-s32 cellMicIsOpen(s32 dev_num)
+u8 cellMicIsOpen(s32 dev_num)
 {
 	cellMic.trace("cellMicIsOpen(dev_num=%d)", dev_num);
 
@@ -913,18 +608,15 @@ s32 cellMicIsOpen(s32 dev_num)
 	if (!mic_thr.init)
 		return false;
 
-	if (!mic_thr.check_device(dev_num))
+	if (!mic_thr.mic_list.count(dev_num))
 		return false;
 
-	microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
-	return device.is_opened();
+	return mic_thr.mic_list.at(dev_num).is_opened();
 }
 
 s32 cellMicIsAttached(s32 dev_num)
 {
-	cellMic.trace("cellMicIsAttached(dev_num=%d)", dev_num);
-
-	// TODO
+	cellMic.notice("cellMicIsAttached(dev_num=%d)", dev_num);
 	return 1;
 }
 
@@ -937,10 +629,10 @@ error_code cellMicClose(s32 dev_num)
 	if (!mic_thr.init)
 		return CELL_MICIN_ERROR_NOT_INIT;
 
-	if (!mic_thr.check_device(dev_num))
+	if (!mic_thr.mic_list.count(dev_num))
 		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
 
-	microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
+	auto& device = mic_thr.mic_list.at(dev_num);
 
 	if (!device.is_opened())
 		return CELL_MICIN_ERROR_NOT_OPEN;
@@ -950,39 +642,50 @@ error_code cellMicClose(s32 dev_num)
 
 /// Starting/Stopping Microphone Functions
 
-error_code cellMicStartEx(s32 dev_num, u32 iflags)
+error_code cellMicStart(s32 dev_num)
 {
-	cellMic.todo("cellMicStartEx(dev_num=%d, iflags=%d)", dev_num, iflags);
-
-	if ((iflags & 0xfffffffc) != 0) // iflags > 3
-		return CELL_MICIN_ERROR_PARAM;
+	cellMic.trace("cellMicStart(dev_num=%d)", dev_num);
 
 	auto& mic_thr = g_fxo->get<mic_thread>();
 	const std::lock_guard lock(mic_thr.mutex);
 	if (!mic_thr.init)
 		return CELL_MICIN_ERROR_NOT_INIT;
 
-	if (!mic_thr.check_device(dev_num))
+	if (!mic_thr.mic_list.count(dev_num))
 		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
 
-	microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
+	auto& device = mic_thr.mic_list.at(dev_num);
 
 	if (!device.is_opened())
 		return CELL_MICIN_ERROR_NOT_OPEN;
 
+	return device.start_microphone();
+}
+
+error_code cellMicStartEx(s32 dev_num, u32 iflags)
+{
+	cellMic.todo("cellMicStartEx(dev_num=%d, iflags=%d)", dev_num, iflags);
+
 	// TODO: flags
 
+	auto& mic_thr = g_fxo->get<mic_thread>();
+	const std::lock_guard lock(mic_thr.mutex);
+	if (!mic_thr.init)
+		return CELL_MICIN_ERROR_NOT_INIT;
+
+	if (!mic_thr.mic_list.count(dev_num))
+		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
+
+	auto& device = mic_thr.mic_list.at(dev_num);
+
+	if (!device.is_opened())
+		return CELL_MICIN_ERROR_NOT_OPEN;
+
 	cellMic.success("We're getting started mate!");
 
 	return device.start_microphone();
 }
 
-error_code cellMicStart(s32 dev_num)
-{
-	cellMic.trace("cellMicStart(dev_num=%d)", dev_num);
-	return cellMicStartEx(dev_num, 0);
-}
-
 error_code cellMicStop(s32 dev_num)
 {
 	cellMic.trace("cellMicStop(dev_num=%d)", dev_num);
@@ -992,10 +695,10 @@ error_code cellMicStop(s32 dev_num)
 	if (!mic_thr.init)
 		return CELL_MICIN_ERROR_NOT_INIT;
 
-	if (!mic_thr.check_device(dev_num))
+	if (!mic_thr.mic_list.count(dev_num))
 		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
 
-	microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
+	auto& device = mic_thr.mic_list.at(dev_num);
 
 	if (!device.is_opened())
 		return CELL_MICIN_ERROR_NOT_OPEN;
@@ -1014,45 +717,28 @@ error_code cellMicGetDeviceAttr(s32 dev_num, CellMicDeviceAttr deviceAttributes,
 {
 	cellMic.trace("cellMicGetDeviceAttr(dev_num=%d, deviceAttribute=%d, arg1=*0x%x, arg2=*0x%x)", dev_num, +deviceAttributes, arg1, arg2);
 
+	if (!arg1 || (!arg2 && deviceAttributes == CELLMIC_DEVATTR_CHANVOL))
+		return CELL_MICIN_ERROR_PARAM;
+
 	auto& mic_thr = g_fxo->get<mic_thread>();
 	const std::lock_guard lock(mic_thr.mutex);
 	if (!mic_thr.init)
 		return CELL_MICIN_ERROR_NOT_INIT;
 
-	if (dev_num < 0)
-		return CELL_MICIN_ERROR_PARAM;
-
-	if (!mic_thr.check_device(dev_num))
+	if (!mic_thr.mic_list.count(dev_num))
 		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
 
-	microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
+	auto& device = mic_thr.mic_list.at(dev_num);
 
-	if (arg1)
+	switch (deviceAttributes)
 	{
-		switch (deviceAttributes)
-		{
-		case CELLMIC_DEVATTR_CHANVOL:
-			if (*arg1 > 2 || !arg2)
-				return CELL_MICIN_ERROR_PARAM;
-
-			if (*arg1 == 0)
-			{
-				// Calculate average volume of the channels
-				*arg2 = std::accumulate(device.attr_chanvol.begin(), device.attr_chanvol.end(), 0u) / ::size32(device.attr_chanvol);
-			}
-			else
-			{
-				*arg2 = ::at32(device.attr_chanvol, *arg1 - 1);
-			}
-
-			break;
-		case CELLMIC_DEVATTR_LED: *arg1 = device.attr_led; break;
-		case CELLMIC_DEVATTR_GAIN: *arg1 = device.attr_gain; break;
-		case CELLMIC_DEVATTR_VOLUME: *arg1 = device.attr_volume; break;
-		case CELLMIC_DEVATTR_AGC: *arg1 = device.attr_agc; break;
-		case CELLMIC_DEVATTR_DSPTYPE: *arg1 = device.attr_dsptype; break;
-		default: return CELL_MICIN_ERROR_PARAM;
-		}
+	case CELLMIC_DEVATTR_LED: *arg1 = device.attr_led; break;
+	case CELLMIC_DEVATTR_GAIN: *arg1 = device.attr_gain; break;
+	case CELLMIC_DEVATTR_VOLUME: *arg1 = device.attr_volume; break;
+	case CELLMIC_DEVATTR_AGC: *arg1 = device.attr_agc; break;
+	case CELLMIC_DEVATTR_CHANVOL: *arg1 = device.attr_volume; break;
+	case CELLMIC_DEVATTR_DSPTYPE: *arg1 = device.attr_dsptype; break;
+	default: return CELL_MICIN_ERROR_PARAM;
 	}
 
 	return CELL_OK;
@@ -1067,10 +753,10 @@ error_code cellMicSetDeviceAttr(s32 dev_num, CellMicDeviceAttr deviceAttributes,
 	if (!mic_thr.init)
 		return CELL_MICIN_ERROR_NOT_INIT;
 
-	if (!mic_thr.check_device(dev_num))
+	if (!mic_thr.mic_list.count(dev_num))
 		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
 
-	microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
+	auto& device = mic_thr.mic_list.at(dev_num);
 
 	switch (deviceAttributes)
 	{
@@ -1078,16 +764,7 @@ error_code cellMicSetDeviceAttr(s32 dev_num, CellMicDeviceAttr deviceAttributes,
 		// Used by SingStar to set the volume of each mic
 		if (arg1 > 2)
 			return CELL_MICIN_ERROR_PARAM;
-
-		if (arg1 == 0)
-		{
-			device.attr_chanvol.fill(arg2);
-		}
-		else
-		{
-			::at32(device.attr_chanvol, arg1 - 1) = arg2;
-		}
-
+		device.attr_chanvol[arg1] = arg2;
 		break;
 	case CELLMIC_DEVATTR_LED: device.attr_led = arg1; break;
 	case CELLMIC_DEVATTR_GAIN: device.attr_gain = arg1; break;
@@ -1103,122 +780,66 @@ error_code cellMicSetDeviceAttr(s32 dev_num, CellMicDeviceAttr deviceAttributes,
 error_code cellMicGetSignalAttr(s32 dev_num, CellMicSignalAttr sig_attrib, vm::ptr<void> value)
 {
 	cellMic.todo("cellMicGetSignalAttr(dev_num=%d, sig_attrib=%d, value=*0x%x)", dev_num, +sig_attrib, value);
-
-	if (!value)
-		return CELL_MICIN_ERROR_PARAM;
-
-	auto& mic_thr = g_fxo->get<mic_thread>();
-	const std::lock_guard lock(mic_thr.mutex);
-	if (!mic_thr.init)
-		return CELL_MICIN_ERROR_NOT_INIT;
-
-	if (!mic_thr.check_device(dev_num))
-		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
-
-	microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
-	if (!device.is_opened())
-		return CELL_MICIN_ERROR_NOT_OPEN;
-
-	// TODO
-
 	return CELL_OK;
 }
 
 error_code cellMicSetSignalAttr(s32 dev_num, CellMicSignalAttr sig_attrib, vm::ptr<void> value)
 {
 	cellMic.todo("cellMicSetSignalAttr(dev_num=%d, sig_attrib=%d, value=*0x%x)", dev_num, +sig_attrib, value);
-
-	if (!value)
-		return CELL_MICIN_ERROR_PARAM;
-
-	auto& mic_thr = g_fxo->get<mic_thread>();
-	const std::lock_guard lock(mic_thr.mutex);
-	if (!mic_thr.init)
-		return CELL_MICIN_ERROR_NOT_INIT;
-
-	if (!mic_thr.check_device(dev_num))
-		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
-
-	microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
-	if (!device.is_opened())
-		return CELL_MICIN_ERROR_NOT_OPEN;
-
-	// TODO
-
 	return CELL_OK;
 }
 
 error_code cellMicGetSignalState(s32 dev_num, CellMicSignalState sig_state, vm::ptr<void> value)
 {
-	cellMic.trace("cellMicGetSignalState(dev_num=%d, sig_state=%d, value=*0x%x)", dev_num, +sig_state, value);
-
-	if (!value)
-		return CELL_MICIN_ERROR_PARAM;
+	cellMic.todo("cellMicGetSignalState(dev_num=%d, sig_state=%d, value=*0x%x)", dev_num, +sig_state, value);
 
 	auto& mic_thr = g_fxo->get<mic_thread>();
 	const std::lock_guard lock(mic_thr.mutex);
 	if (!mic_thr.init)
 		return CELL_MICIN_ERROR_NOT_INIT;
 
-	if (!mic_thr.check_device(dev_num))
-		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
-
-	microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
-	if (!device.is_opened())
-		return CELL_MICIN_ERROR_NOT_OPEN;
-
 	be_t<u32>* ival = vm::_ptr<u32>(value.addr());
 	be_t<f32>* fval = vm::_ptr<f32>(value.addr());
 
-	// TODO
-
 	switch (sig_state)
 	{
 	case CELLMIC_SIGSTATE_LOCTALK:
-		*ival = 9; // Someone is probably talking (0 to 10)
+		*ival = 9; // Someone is probably talking
 		break;
 	case CELLMIC_SIGSTATE_FARTALK:
-		*ival = 1; // The speakers are probably off (0 to 10)
+		// TODO
 		break;
 	case CELLMIC_SIGSTATE_NSR:
-		*fval = 0.0f; // No noise reduction
+		// TODO
 		break;
 	case CELLMIC_SIGSTATE_AGC:
-		*fval = 1.0f; // No gain applied
+		// TODO
 		break;
 	case CELLMIC_SIGSTATE_MICENG:
-		*fval = device.calculate_energy_level();
+		*fval = 40.0f; // 40 decibels
 		break;
 	case CELLMIC_SIGSTATE_SPKENG:
-		*fval = 10.0f; // 10 decibels
+		// TODO
 		break;
-	default:
-		return CELL_MICIN_ERROR_PARAM;
+	default: return CELL_MICIN_ERROR_PARAM;
 	}
 
 	return CELL_OK;
 }
 
-error_code cellMicGetFormatEx(s32 dev_num, vm::ptr<CellMicInputFormatI> format, /*CellMicSignalType*/u32 type)
+error_code cellMicGetFormatRaw(s32 dev_num, vm::ptr<CellMicInputFormatI> format)
 {
-	cellMic.trace("cellMicGetFormatEx(dev_num=%d, format=*0x%x, type=0x%x)", dev_num, format, type);
-
-	if (!format)
-		return CELL_MICIN_ERROR_PARAM;
+	cellMic.trace("cellMicGetFormatRaw(dev_num=%d, format=0x%x)", dev_num, format);
 
 	auto& mic_thr = g_fxo->get<mic_thread>();
 	const std::lock_guard lock(mic_thr.mutex);
 	if (!mic_thr.init)
 		return CELL_MICIN_ERROR_NOT_INIT;
 
-	if (!mic_thr.check_device(dev_num))
+	if (!mic_thr.mic_list.count(dev_num))
 		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
 
-	microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
-	if (!device.is_opened())
-		return CELL_MICIN_ERROR_NOT_OPEN;
-
-	// TODO: type
+	auto& device = mic_thr.mic_list.at(dev_num);
 
 	format->subframeSize  = device.get_bit_resolution() / 8; // Probably?
 	format->bitResolution = device.get_bit_resolution();
@@ -1229,28 +850,18 @@ error_code cellMicGetFormatEx(s32 dev_num, vm::ptr<CellMicInputFormatI> format,
 	return CELL_OK;
 }
 
-error_code cellMicGetFormat(s32 dev_num, vm::ptr<CellMicInputFormatI> format)
-{
-	cellMic.todo("cellMicGetFormat(dev_num=%d, format=*0x%x)", dev_num, format);
-	return cellMicGetFormatEx(dev_num, format, CELLMIC_SIGTYPE_DSP);
-}
-
-error_code cellMicGetFormatRaw(s32 dev_num, vm::ptr<CellMicInputFormatI> format)
-{
-	cellMic.trace("cellMicGetFormatRaw(dev_num=%d, format=0x%x)", dev_num, format);
-	return cellMicGetFormatEx(dev_num, format, CELLMIC_SIGTYPE_RAW);
-}
-
 error_code cellMicGetFormatAux(s32 dev_num, vm::ptr<CellMicInputFormatI> format)
 {
 	cellMic.todo("cellMicGetFormatAux(dev_num=%d, format=0x%x)", dev_num, format);
-	return cellMicGetFormatEx(dev_num, format, CELLMIC_SIGTYPE_AUX);
+
+	return cellMicGetFormatRaw(dev_num, format);
 }
 
 error_code cellMicGetFormatDsp(s32 dev_num, vm::ptr<CellMicInputFormatI> format)
 {
 	cellMic.todo("cellMicGetFormatDsp(dev_num=%d, format=0x%x)", dev_num, format);
-	return cellMicGetFormatEx(dev_num, format, CELLMIC_SIGTYPE_DSP);
+
+	return cellMicGetFormatRaw(dev_num, format);
 }
 
 /// Event Queue Functions
@@ -1271,14 +882,9 @@ error_code cellMicSetNotifyEventQueue(u64 key)
 
 	mic_thr.event_queue_key = key;
 
-	// TODO: Properly generate/handle mic events
-	for (usz i = 0; i < mic_thr.mic_list.size(); i++)
+	for (auto& mic_entry : mic_thr.mic_list)
 	{
-		microphone_device& device = ::at32(mic_thr.mic_list, i);
-		if (device.is_registered())
-		{
-			mic_queue->send(0, CELLMIC_ATTACH, i, 0);
-		}
+		mic_queue->send(0, CELLMIC_ATTACH, mic_entry.first, 0);
 	}
 
 	return CELL_OK;
@@ -1286,6 +892,7 @@ error_code cellMicSetNotifyEventQueue(u64 key)
 
 error_code cellMicSetNotifyEventQueue2(u64 key, u64 source, u64 flag)
 {
+	// TODO: Actually do things with the source variable
 	cellMic.todo("cellMicSetNotifyEventQueue2(key=0x%llx, source=0x%llx, flag=0x%llx", key, source, flag);
 
 	auto& mic_thr = g_fxo->get<mic_thread>();
@@ -1298,18 +905,8 @@ error_code cellMicSetNotifyEventQueue2(u64 key, u64 source, u64 flag)
 	if (!mic_queue)
 		return CELL_MICIN_ERROR_EVENT_QUEUE;
 
+	mic_queue->send(0, CELLMIC_ATTACH, 0, 0);
 	mic_thr.event_queue_key = key;
-	mic_thr.event_queue_source = source;
-
-	// TODO: Properly generate/handle mic events
-	for (usz i = 0; i < mic_thr.mic_list.size(); i++)
-	{
-		microphone_device& device = ::at32(mic_thr.mic_list, i);
-		if (device.is_registered())
-		{
-			mic_queue->send(source, CELLMIC_ATTACH, i, 0);
-		}
-	}
 
 	return CELL_OK;
 }
@@ -1324,65 +921,62 @@ error_code cellMicRemoveNotifyEventQueue(u64 key)
 		return CELL_MICIN_ERROR_NOT_INIT;
 
 	mic_thr.event_queue_key = 0;
-	mic_thr.event_queue_source = 0;
 
 	return CELL_OK;
 }
 
 /// Reading Functions
 
-error_code cell_mic_read(s32 dev_num, vm::ptr<void> data, s32 max_bytes, /*CellMicSignalType*/u32 type)
+error_code cellMicReadRaw(s32 dev_num, vm::ptr<void> data, s32 max_bytes)
 {
+	cellMic.trace("cellMicReadRaw(dev_num=%d, data=0x%x, maxBytes=%d)", dev_num, data, max_bytes);
+
 	auto& mic_thr = g_fxo->get<mic_thread>();
 	const std::lock_guard lock(mic_thr.mutex);
 	if (!mic_thr.init)
 		return CELL_MICIN_ERROR_NOT_INIT;
 
-	if (!mic_thr.check_device(dev_num))
+	if (!mic_thr.mic_list.count(dev_num))
 		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
 
-	microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
+	auto& mic = mic_thr.mic_list.at(dev_num);
 
-	if (!device.is_opened() || !(device.get_signal_types() & type))
+	if (!mic.is_opened() || !(mic.get_signal_types() & CELLMIC_SIGTYPE_RAW))
 		return CELL_MICIN_ERROR_NOT_OPEN;
 
-	if (!data)
-		return not_an_error(0);
-
-	switch (type)
-	{
-	case CELLMIC_SIGTYPE_DSP: return not_an_error(device.read_dsp(vm::_ptr<u8>(data.addr()), max_bytes));
-	case CELLMIC_SIGTYPE_AUX: return not_an_error(0); // TODO
-	case CELLMIC_SIGTYPE_RAW: return not_an_error(device.read_raw(vm::_ptr<u8>(data.addr()), max_bytes));
-	default:
-		fmt::throw_exception("Invalid CELLMIC_SIGTYPE %d", type);
-	}
-
-	return not_an_error(0);
-}
-
-error_code cellMicReadRaw(s32 dev_num, vm::ptr<void> data, s32 max_bytes)
-{
-	cellMic.trace("cellMicReadRaw(dev_num=%d, data=0x%x, maxBytes=%d)", dev_num, data, max_bytes);
-	return cell_mic_read(dev_num, data, max_bytes, CELLMIC_SIGTYPE_RAW);
+	return mic.read_raw(vm::_ptr<u8>(data.addr()), max_bytes);
 }
 
 error_code cellMicRead(s32 dev_num, vm::ptr<void> data, u32 max_bytes)
 {
-	cellMic.warning("cellMicRead(dev_num=%d, data=0x%x, maxBytes=0x%x)", dev_num, data, max_bytes);
-	return cell_mic_read(dev_num, data, max_bytes, CELLMIC_SIGTYPE_DSP);
+	cellMic.todo("cellMicRead(dev_num=%d, data=0x%x, maxBytes=0x%x)", dev_num, data, max_bytes);
+
+	auto& mic_thr = g_fxo->get<mic_thread>();
+	const std::lock_guard lock(mic_thr.mutex);
+	if (!mic_thr.init)
+		return CELL_MICIN_ERROR_NOT_INIT;
+
+	if (!mic_thr.mic_list.count(dev_num))
+		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
+
+	auto& mic = mic_thr.mic_list.at(dev_num);
+
+	if (!mic.is_opened() || !(mic.get_signal_types() & CELLMIC_SIGTYPE_DSP))
+		return CELL_MICIN_ERROR_NOT_OPEN;
+
+	return mic.read_dsp(vm::_ptr<u8>(data.addr()), max_bytes);
 }
 
 error_code cellMicReadAux(s32 dev_num, vm::ptr<void> data, s32 max_bytes)
 {
 	cellMic.todo("cellMicReadAux(dev_num=%d, data=0x%x, max_bytes=0x%x)", dev_num, data, max_bytes);
-	return cell_mic_read(dev_num, data, max_bytes, CELLMIC_SIGTYPE_AUX);
+	return CELL_OK;
 }
 
 error_code cellMicReadDsp(s32 dev_num, vm::ptr<void> data, s32 max_bytes)
 {
-	cellMic.warning("cellMicReadDsp(dev_num=%d, data=0x%x, max_bytes=0x%x)", dev_num, data, max_bytes);
-	return cell_mic_read(dev_num, data, max_bytes, CELLMIC_SIGTYPE_DSP);
+	cellMic.todo("cellMicReadDsp(dev_num=%d, data=0x%x, max_bytes=0x%x)", dev_num, data, max_bytes);
+	return CELL_OK;
 }
 
 /// Unimplemented Functions
@@ -1390,75 +984,23 @@ error_code cellMicReadDsp(s32 dev_num, vm::ptr<void> data, s32 max_bytes)
 error_code cellMicReset(s32 dev_num)
 {
 	cellMic.todo("cellMicReset(dev_num=%d)", dev_num);
-
-	auto& mic_thr = g_fxo->get<mic_thread>();
-	const std::lock_guard lock(mic_thr.mutex);
-	if (!mic_thr.init)
-		return CELL_MICIN_ERROR_NOT_INIT;
-
-	if (!mic_thr.check_device(dev_num))
-		return CELL_MICIN_ERROR_DEVICE_NOT_FOUND;
-
-	microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
-
-	if (!device.is_opened())
-		return CELL_MICIN_ERROR_NOT_OPEN;
-
-	// TODO
-
 	return CELL_OK;
 }
 
 error_code cellMicGetDeviceGUID(s32 dev_num, vm::ptr<u32> ptr_guid)
 {
 	cellMic.todo("cellMicGetDeviceGUID(dev_num=%d ptr_guid=*0x%x)", dev_num, ptr_guid);
-
-	if (!ptr_guid)
-		return CELL_MICIN_ERROR_PARAM;
-
-	*ptr_guid = 0xffffffff;
-
-	auto& mic_thr = g_fxo->get<mic_thread>();
-	const std::lock_guard lock(mic_thr.mutex);
-	if (!mic_thr.init)
-		return CELL_MICIN_ERROR_NOT_INIT;
-
-	// TODO
-
-	return CELL_OK;
-}
-
-error_code cellMicGetDeviceIdentifier(s32 dev_num, vm::ptr<u32> ptr_id)
-{
-	cellMic.todo("cellMicGetDeviceIdentifier(dev_num=%d, ptr_id=*0x%x)", dev_num, ptr_id);
-
-	if (ptr_id)
-		*ptr_id = 0x0;
-
-	auto& mic_thr = g_fxo->get<mic_thread>();
-	const std::lock_guard lock(mic_thr.mutex);
-	if (!mic_thr.init)
-		return CELL_MICIN_ERROR_NOT_INIT;
-
-	// TODO
-
 	return CELL_OK;
 }
 
 error_code cellMicGetType(s32 dev_num, vm::ptr<s32> ptr_type)
 {
-	cellMic.trace("cellMicGetType(dev_num=%d, ptr_type=*0x%x)", dev_num, ptr_type);
+	cellMic.todo("cellMicGetType(dev_num=%d, ptr_type=*0x%x)", dev_num, ptr_type);
 
 	if (!ptr_type)
 		return CELL_MICIN_ERROR_PARAM;
 
-	auto& mic_thr = g_fxo->get<mic_thread>();
-	const std::lock_guard lock(mic_thr.mutex);
-	if (!mic_thr.init)
-		return CELL_MICIN_ERROR_NOT_INIT;
-
-	// TODO: get proper type (log message is trace because of massive spam)
-	*ptr_type = CELLMIC_TYPE_USBAUDIO; // Needed for Guitar Hero: Warriors of Rock (BLUS30487)
+	*ptr_type = CELLMIC_TYPE_USBAUDIO;
 
 	return CELL_OK;
 }
@@ -1466,31 +1008,6 @@ error_code cellMicGetType(s32 dev_num, vm::ptr<s32> ptr_type)
 error_code cellMicGetStatus(s32 dev_num, vm::ptr<CellMicStatus> status)
 {
 	cellMic.todo("cellMicGetStatus(dev_num=%d, status=*0x%x)", dev_num, status);
-
-	auto& mic_thr = g_fxo->get<mic_thread>();
-	const std::lock_guard lock(mic_thr.mutex);
-	if (!mic_thr.init)
-		return CELL_MICIN_ERROR_NOT_INIT;
-
-	if (dev_num < 0 || !status)
-		return CELL_MICIN_ERROR_PARAM;
-
-	// TODO
-
-	if (dev_num < static_cast<s32>(mic_thr.mic_list.size()))
-	{
-		const microphone_device& device = ::at32(mic_thr.mic_list, dev_num);
-		status->raw_samprate = device.get_raw_samplingrate();
-		status->dsp_samprate = device.get_raw_samplingrate();
-		status->isStart = device.is_started();
-		status->isOpen = device.is_opened();
-		status->dsp_volume = 5; // TODO: 0 - 5 volume
-		status->local_voice = 10; // TODO: 0 - 10 confidence
-		status->remote_voice = 0; // TODO: 0 - 10 confidence
-		status->mic_energy = 60; // TODO: Db
-		status->spk_energy = 60; // TODO: Db
-	}
-
 	return CELL_OK;
 }
 
@@ -1506,12 +1023,24 @@ error_code cellMicSysShareClose()
 	return CELL_OK;
 }
 
+error_code cellMicGetFormat(s32 dev_num, vm::ptr<CellMicInputFormatI> format)
+{
+	cellMic.todo("cellMicGetFormat(dev_num=%d, format=*0x%x)", dev_num, format);
+	return CELL_OK;
+}
+
 error_code cellMicSetMultiMicNotifyEventQueue()
 {
 	UNIMPLEMENTED_FUNC(cellMic);
 	return CELL_OK;
 }
 
+error_code cellMicGetFormatEx()
+{
+	UNIMPLEMENTED_FUNC(cellMic);
+	return CELL_OK;
+}
+
 error_code cellMicSysShareStop()
 {
 	UNIMPLEMENTED_FUNC(cellMic);
@@ -1548,6 +1077,12 @@ error_code cellMicSysShareEnd()
 	return CELL_OK;
 }
 
+error_code cellMicGetDeviceIdentifier()
+{
+	UNIMPLEMENTED_FUNC(cellMic);
+	return CELL_OK;
+}
+
 DECLARE(ppu_module_manager::cellMic)("cellMic", []()
 {
 	REG_FUNC(cellMic, cellMicInit);
diff --git a/rpcs3/Emu/Cell/Modules/cellMic.h b/rpcs3/Emu/Cell/Modules/cellMic.h
index e4b416fa6a..10adb2df1d 100644
--- a/rpcs3/Emu/Cell/Modules/cellMic.h
+++ b/rpcs3/Emu/Cell/Modules/cellMic.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Utilities/Thread.h"
-#include "3rdparty/OpenAL/openal-soft/include/AL/alc.h"
-#include "Utilities/mutex.h"
+
+#include "3rdparty/OpenAL/include/alext.h"
 
 // Error Codes
 enum CellMicInError : u32
@@ -121,7 +121,8 @@ enum CellMicType : s32
 
 enum
 {
-	CELL_MAX_MICS = 8,
+	MaxNumMicInputs = 8,
+	CELL_MAX_MICS = MaxNumMicInputs,
 	MAX_MICS_PERMISSABLE = 4,
 
 	NullDeviceID = -1,
@@ -156,8 +157,9 @@ struct CellMicInputStream
 
 struct CellMicInputDefinition
 {
-	be_t<u32> uiDevId;
-	CellMicInputStream data;
+	// TODO: Data types
+	volatile u32   uiDevId;
+	CellMicInputStream  data;
 	CellMicInputFormatI aux_format;
 	CellMicInputFormatI raw_format;
 	CellMicInputFormatI sig_format;
@@ -180,13 +182,13 @@ struct CellMicStatus
 // --- End of cell definitions ---
 
 
-template <usz Size>
+template <usz S>
 class simple_ringbuf
 {
 public:
 	simple_ringbuf()
 	{
-		m_container.resize(Size);
+		m_container.resize(S);
 	}
 
 	bool has_data() const
@@ -196,21 +198,19 @@ public:
 
 	u32 read_bytes(u8* buf, const u32 size)
 	{
-		const u32 to_read = size > m_used ? m_used : size;
+		u32 to_read = size > m_used ? m_used : size;
 		if (!to_read)
 			return 0;
 
-		ensure(buf);
+		u8* data     = m_container.data();
+		u32 new_tail = m_tail + to_read;
 
-		u8* data = m_container.data();
-		const u32 new_tail = m_tail + to_read;
-
-		if (new_tail >= Size)
+		if (new_tail >= S)
 		{
-			const u32 first_chunk_size = Size - m_tail;
+			u32 first_chunk_size = S - m_tail;
 			std::memcpy(buf, data + m_tail, first_chunk_size);
 			std::memcpy(buf + first_chunk_size, data, to_read - first_chunk_size);
-			m_tail = (new_tail - Size);
+			m_tail = (new_tail - S);
 		}
 		else
 		{
@@ -225,37 +225,30 @@ public:
 
 	void write_bytes(const u8* buf, const u32 size)
 	{
-		if (size == 0)
+		ensure(size <= S);
+
+		if (u32 over_size = m_used + size; over_size > S)
 		{
-			return;
-		}
+			m_tail += (over_size - S);
+			if (m_tail > S)
+				m_tail -= S;
 
-		ensure(size <= Size);
-
-		const u32 over_size = m_used + size;
-
-		if (over_size > Size)
-		{
-			m_tail += (over_size - Size);
-			if (m_tail > Size)
-				m_tail -= Size;
-
-			m_used = Size;
+			m_used = S;
 		}
 		else
 		{
 			m_used = over_size;
 		}
 
-		u8* data = m_container.data();
-		const u32 new_head = m_head + size;
+		u8* data     = m_container.data();
+		u32 new_head = m_head + size;
 
-		if (new_head >= Size)
+		if (new_head >= S)
 		{
-			const u32 first_chunk_size = Size - m_head;
+			u32 first_chunk_size = S - m_head;
 			std::memcpy(data + m_head, buf, first_chunk_size);
 			std::memcpy(data, buf + first_chunk_size, size - first_chunk_size);
-			m_head = (new_head - Size);
+			m_head = (new_head - S);
 		}
 		else
 		{
@@ -272,30 +265,23 @@ protected:
 class microphone_device
 {
 public:
-	microphone_device(microphone_handler type = microphone_handler::null);
+	microphone_device(microphone_handler type);
 
 	void add_device(const std::string& name);
 
-	void set_registered(bool registered) { mic_registered = registered; };
-
 	error_code open_microphone(const u8 type, const u32 dsp_r, const u32 raw_r, const u8 channels = 2);
 	error_code close_microphone();
 
 	error_code start_microphone();
 	error_code stop_microphone();
 
-	std::string get_device_name() const { return devices.empty() ? "" : devices.front().name; }
-
 	void update_audio();
 	bool has_data() const;
 
-	f32 calculate_energy_level();
-
-	bool is_registered() const { return mic_registered; }
-	bool is_opened() const { return mic_opened; }
+	bool is_opened() const { return mic_opened;	}
 	bool is_started() const { return mic_started; }
 	u8 get_signal_types() const { return signal_types; }
-	constexpr u8 get_bit_resolution() const { return bit_resolution; }
+	u8 get_bit_resolution() const {	return bit_resolution; }
 	u32 get_raw_samplingrate() const { return raw_samplingrate; }
 	u8 get_num_channels() const { return num_channels; }
 	u8 get_datatype() const
@@ -314,63 +300,47 @@ public:
 	u32 read_dsp(u8* buf, u32 size) { return rbuf_dsp.read_bytes(buf, size); }
 
 	// Microphone attributes
-	u32 attr_gain       = 3;                      // 0 to 5.   Default is 3.
-	u32 attr_volume     = 145;                    // 0 to 241. Default is 145.
-	u32 attr_agc        = 0;                      // 0 to 241. Default is 0.
-	std::array<u32, 2> attr_chanvol = {100, 100}; // 0 to 100. Default is ?.
+	u32 attr_gain       = 3;
+	u32 attr_volume     = 145;
+	u32 attr_agc        = 0;
+	u32 attr_chanvol[2] = {145, 145};
 	u32 attr_led        = 0;
 	u32 attr_dsptype    = 0;
 
 private:
-	template <u32 bytesize>
-	static inline void variable_byteswap(const void* src, void* dst);
-	inline u32 convert_16_bit_pcm_to_float(const std::vector<u8>& buffer, u32 num_bytes);
-
-#ifndef WITHOUT_OPENAL
-	void enumerate_devices();
-	ALCdevice* open_device(const std::string& name, u32 samplingrate, ALCenum num_al_channels, u32 buf_size);
-#endif
+	static void variable_byteswap(const void* src, void* dst, const u32 bytesize);
 
 	u32 capture_audio();
 
-	void get_data(const u32 num_samples);
 	void get_raw(const u32 num_samples);
 	void get_dsp(const u32 num_samples);
 
-	microphone_handler device_type = microphone_handler::null;
+private:
+	microphone_handler device_type;
+	std::vector<std::string> device_name;
 
-	bool mic_registered = false;
 	bool mic_opened  = false;
 	bool mic_started = false;
 
-	struct mic_device
-	{
-		std::string name;
-		ALCdevice* device = nullptr;
-		std::vector<u8> buf;
-	};
-
-	std::vector<std::string> enumerated_devices;
-	std::vector<mic_device> devices;
+	std::vector<ALCdevice*> input_devices;
+	std::vector<std::vector<u8>> internal_bufs;
 	std::vector<u8> temp_buf;
-	std::vector<u8> float_buf;
 
 	// Sampling information provided at opening of mic
 	u32 raw_samplingrate = 48000;
 	u32 dsp_samplingrate = 48000;
 	u32 aux_samplingrate = 48000;
+	u8 bit_resolution    = 16;
 	u8 num_channels      = 2;
 
 	u8 signal_types = CELLMIC_SIGTYPE_NULL;
 
 	u32 sample_size = 0; // Determined at opening for internal use
 
-	static constexpr u8 bit_resolution = 16;
 	static constexpr usz inbuf_size = 400000; // Default value unknown
-	static constexpr usz float_buf_size = inbuf_size * (sizeof(f32) / sizeof(s16));
 
 	simple_ringbuf<inbuf_size> rbuf_raw;
-	simple_ringbuf<float_buf_size> rbuf_dsp;
+	simple_ringbuf<inbuf_size> rbuf_dsp;
 	simple_ringbuf<inbuf_size> rbuf_aux;
 };
 
@@ -379,25 +349,19 @@ class mic_context
 public:
 	void operator()();
 	void load_config_and_init();
-	void wake_up();
-
-	// Returns index of registered device
-	u32 register_device(const std::string& device_name);
-	void unregister_device(u32 dev_num);
-	bool check_device(u32 dev_num);
 
 	u64 event_queue_key = 0;
-	u64 event_queue_source = 0;
 
-	std::array<microphone_device, CELL_MAX_MICS> mic_list{};
+	std::unordered_map<s32, microphone_device> mic_list;
 
 	shared_mutex mutex;
-	atomic_t<u8> init = 0;
+	atomic_t<u32> init = 0;
 
 	static constexpr auto thread_name = "Microphone Thread"sv;
 
 protected:
-	atomic_t<u32> wakey = 0;
+	const u64 start_time = get_guest_system_time();
+	u64 m_counter        = 0;
 
 	//	u32 signalStateLocalTalk = 9; // value is in range 0-10. 10 indicates talking, 0 indicating none.
 	//	u32 signalStateFarTalk = 0; // value is in range 0-10. 10 indicates talking from far away, 0 indicating none.
diff --git a/rpcs3/Emu/Cell/Modules/cellMouse.cpp b/rpcs3/Emu/Cell/Modules/cellMouse.cpp
index 8bf550a633..7a1f19204a 100644
--- a/rpcs3/Emu/Cell/Modules/cellMouse.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellMouse.cpp
@@ -6,12 +6,10 @@
 
 #include "cellMouse.h"
 
-error_code sys_config_start(ppu_thread& ppu);
-error_code sys_config_stop(ppu_thread& ppu);
+extern void libio_sys_config_init();
+extern void libio_sys_config_end();
 
-extern bool is_input_allowed();
-
-LOG_CHANNEL(cellMouse);
+LOG_CHANNEL(sys_io);
 
 template<>
 void fmt_class_string<CellMouseError>::format(std::string& out, u64 arg)
@@ -34,9 +32,9 @@ void fmt_class_string<CellMouseError>::format(std::string& out, u64 arg)
 	});
 }
 
-error_code cellMouseInit(ppu_thread& ppu, u32 max_connect)
+error_code cellMouseInit(u32 max_connect)
 {
-	cellMouse.notice("cellMouseInit(max_connect=%d)", max_connect);
+	sys_io.warning("cellMouseInit(max_connect=%d)", max_connect);
 
 	auto& handler = g_fxo->get<MouseHandlerBase>();
 
@@ -51,7 +49,7 @@ error_code cellMouseInit(ppu_thread& ppu, u32 max_connect)
 		return CELL_MOUSE_ERROR_INVALID_PARAMETER;
 	}
 
-	sys_config_start(ppu);
+	libio_sys_config_init();
 	handler.Init(std::min(max_connect, 7u));
 
 	return CELL_OK;
@@ -59,7 +57,7 @@ error_code cellMouseInit(ppu_thread& ppu, u32 max_connect)
 
 error_code cellMouseClearBuf(u32 port_no)
 {
-	cellMouse.trace("cellMouseClearBuf(port_no=%d)", port_no);
+	sys_io.trace("cellMouseClearBuf(port_no=%d)", port_no);
 
 	auto& handler = g_fxo->get<MouseHandlerBase>();
 
@@ -77,7 +75,7 @@ error_code cellMouseClearBuf(u32 port_no)
 
 	if (port_no >= handler.GetMice().size() || current_info.status[port_no] != CELL_MOUSE_STATUS_CONNECTED)
 	{
-		return not_an_error(CELL_MOUSE_ERROR_NO_DEVICE);
+		return CELL_MOUSE_ERROR_NO_DEVICE;
 	}
 
 	handler.GetDataList(port_no).clear();
@@ -94,9 +92,9 @@ error_code cellMouseClearBuf(u32 port_no)
 	return CELL_OK;
 }
 
-error_code cellMouseEnd(ppu_thread& ppu)
+error_code cellMouseEnd()
 {
-	cellMouse.notice("cellMouseEnd()");
+	sys_io.notice("cellMouseEnd()");
 
 	auto& handler = g_fxo->get<MouseHandlerBase>();
 
@@ -106,13 +104,13 @@ error_code cellMouseEnd(ppu_thread& ppu)
 		return CELL_MOUSE_ERROR_UNINITIALIZED;
 
 	// TODO
-	sys_config_stop(ppu);
+	libio_sys_config_end();
 	return CELL_OK;
 }
 
 error_code cellMouseGetInfo(vm::ptr<CellMouseInfo> info)
 {
-	cellMouse.trace("cellMouseGetInfo(info=*0x%x)", info);
+	sys_io.trace("cellMouseGetInfo(info=*0x%x)", info);
 
 	auto& handler = g_fxo->get<MouseHandlerBase>();
 
@@ -145,7 +143,7 @@ error_code cellMouseGetInfo(vm::ptr<CellMouseInfo> info)
 
 error_code cellMouseInfoTabletMode(u32 port_no, vm::ptr<CellMouseInfoTablet> info)
 {
-	cellMouse.trace("cellMouseInfoTabletMode(port_no=%d, info=*0x%x)", port_no, info);
+	sys_io.trace("cellMouseInfoTabletMode(port_no=%d, info=*0x%x)", port_no, info);
 
 	auto& handler = g_fxo->get<MouseHandlerBase>();
 
@@ -182,7 +180,7 @@ error_code cellMouseInfoTabletMode(u32 port_no, vm::ptr<CellMouseInfoTablet> inf
 
 error_code cellMouseGetData(u32 port_no, vm::ptr<CellMouseData> data)
 {
-	cellMouse.trace("cellMouseGetData(port_no=%d, data=*0x%x)", port_no, data);
+	sys_io.trace("cellMouseGetData(port_no=%d, data=*0x%x)", port_no, data);
 
 	auto& handler = g_fxo->get<MouseHandlerBase>();
 
@@ -202,7 +200,7 @@ error_code cellMouseGetData(u32 port_no, vm::ptr<CellMouseData> data)
 
 	if (port_no >= handler.GetMice().size() || current_info.status[port_no] != CELL_MOUSE_STATUS_CONNECTED)
 	{
-		return not_an_error(CELL_MOUSE_ERROR_NO_DEVICE);
+		return CELL_MOUSE_ERROR_NO_DEVICE;
 	}
 
 	std::memset(data.get_ptr(), 0, data.size());
@@ -211,9 +209,8 @@ error_code cellMouseGetData(u32 port_no, vm::ptr<CellMouseData> data)
 
 	MouseDataList& data_list = handler.GetDataList(port_no);
 
-	if (data_list.empty() || current_info.is_null_handler || (current_info.info & CELL_MOUSE_INFO_INTERCEPTED) || !is_input_allowed())
+	if (data_list.empty())
 	{
-		data_list.clear();
 		return CELL_OK;
 	}
 
@@ -232,7 +229,7 @@ error_code cellMouseGetData(u32 port_no, vm::ptr<CellMouseData> data)
 
 error_code cellMouseGetDataList(u32 port_no, vm::ptr<CellMouseDataList> data)
 {
-	cellMouse.trace("cellMouseGetDataList(port_no=%d, data=0x%x)", port_no, data);
+	sys_io.warning("cellMouseGetDataList(port_no=%d, data=0x%x)", port_no, data);
 
 	auto& handler = g_fxo->get<MouseHandlerBase>();
 
@@ -252,21 +249,12 @@ error_code cellMouseGetDataList(u32 port_no, vm::ptr<CellMouseDataList> data)
 
 	if (port_no >= handler.GetMice().size() || current_info.status[port_no] != CELL_MOUSE_STATUS_CONNECTED)
 	{
-		return not_an_error(CELL_MOUSE_ERROR_NO_DEVICE);
+		return CELL_MOUSE_ERROR_NO_DEVICE;
 	}
 
-	std::memset(data.get_ptr(), 0, data.size());
-
 	// TODO: check if (current_info.mode[port_no] != CELL_MOUSE_INFO_TABLET_MOUSE_MODE) has any impact
 
-	MouseDataList& list = handler.GetDataList(port_no);
-
-	if (list.empty() || current_info.is_null_handler || (current_info.info & CELL_MOUSE_INFO_INTERCEPTED) || !is_input_allowed())
-	{
-		list.clear();
-		return CELL_OK;
-	}
-
+	auto& list = handler.GetDataList(port_no);
 	data->list_num = std::min<u32>(CELL_MOUSE_MAX_DATA_LIST_NUM, static_cast<u32>(list.size()));
 
 	int i = 0;
@@ -287,7 +275,7 @@ error_code cellMouseGetDataList(u32 port_no, vm::ptr<CellMouseDataList> data)
 
 error_code cellMouseSetTabletMode(u32 port_no, u32 mode)
 {
-	cellMouse.warning("cellMouseSetTabletMode(port_no=%d, mode=%d)", port_no, mode);
+	sys_io.warning("cellMouseSetTabletMode(port_no=%d, mode=%d)", port_no, mode);
 
 	auto& handler = g_fxo->get<MouseHandlerBase>();
 
@@ -323,7 +311,7 @@ error_code cellMouseSetTabletMode(u32 port_no, u32 mode)
 
 error_code cellMouseGetTabletDataList(u32 port_no, vm::ptr<CellMouseTabletDataList> data)
 {
-	cellMouse.warning("cellMouseGetTabletDataList(port_no=%d, data=0x%x)", port_no, data);
+	sys_io.warning("cellMouseGetTabletDataList(port_no=%d, data=0x%x)", port_no, data);
 
 	auto& handler = g_fxo->get<MouseHandlerBase>();
 
@@ -341,22 +329,13 @@ error_code cellMouseGetTabletDataList(u32 port_no, vm::ptr<CellMouseTabletDataLi
 
 	if (port_no >= handler.GetMice().size() || current_info.status[port_no] != CELL_MOUSE_STATUS_CONNECTED)
 	{
-		return not_an_error(CELL_MOUSE_ERROR_NO_DEVICE);
+		return CELL_MOUSE_ERROR_NO_DEVICE;
 	}
 
-	std::memset(data.get_ptr(), 0, data.size());
-
 	// TODO: decr tests show that CELL_MOUSE_ERROR_DATA_READ_FAILED is returned when a mouse is connected
 	// TODO: check if (current_info.mode[port_no] != CELL_MOUSE_INFO_TABLET_TABLET_MODE) has any impact
 
-	MouseTabletDataList& list = handler.GetTabletDataList(port_no);
-
-	if (list.empty() || current_info.is_null_handler || (current_info.info & CELL_MOUSE_INFO_INTERCEPTED) || !is_input_allowed())
-	{
-		list.clear();
-		return CELL_OK;
-	}
-
+	auto& list = handler.GetTabletDataList(port_no);
 	data->list_num = std::min<u32>(CELL_MOUSE_MAX_DATA_LIST_NUM, static_cast<u32>(list.size()));
 
 	int i = 0;
@@ -372,14 +351,12 @@ error_code cellMouseGetTabletDataList(u32 port_no, vm::ptr<CellMouseTabletDataLi
 		}
 	}
 
-	list.clear();
-
 	return CELL_OK;
 }
 
 error_code cellMouseGetRawData(u32 port_no, vm::ptr<CellMouseRawData> data)
 {
-	cellMouse.trace("cellMouseGetRawData(port_no=%d, data=*0x%x)", port_no, data);
+	sys_io.warning("cellMouseGetRawData(port_no=%d, data=*0x%x)", port_no, data);
 
 	auto& handler = g_fxo->get<MouseHandlerBase>();
 
@@ -397,22 +374,13 @@ error_code cellMouseGetRawData(u32 port_no, vm::ptr<CellMouseRawData> data)
 
 	if (port_no >= handler.GetMice().size() || current_info.status[port_no] != CELL_MOUSE_STATUS_CONNECTED)
 	{
-		return not_an_error(CELL_MOUSE_ERROR_NO_DEVICE);
+		return CELL_MOUSE_ERROR_NO_DEVICE;
 	}
 
-	std::memset(data.get_ptr(), 0, data.size());
-
 	// TODO: decr tests show that CELL_MOUSE_ERROR_DATA_READ_FAILED is returned when a mouse is connected
 	// TODO: check if (current_info.mode[port_no] != CELL_MOUSE_INFO_TABLET_MOUSE_MODE) has any impact
 
 	MouseRawData& current_data = handler.GetRawData(port_no);
-
-	if (current_info.is_null_handler || (current_info.info & CELL_MOUSE_INFO_INTERCEPTED) || !is_input_allowed())
-	{
-		current_data = {};
-		return CELL_OK;
-	}
-
 	data->len = current_data.len;
 	current_data.len = 0;
 
diff --git a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
index 2b433e999c..e1e6e8cc06 100644
--- a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
@@ -5,8 +5,6 @@
 #include "Emu/Cell/lv2/sys_sync.h"
 #include "Emu/Cell/timers.hpp"
 #include "Emu/Io/interception.h"
-
-#include "Emu/RSX/Overlays/overlay_manager.h"
 #include "Emu/RSX/Overlays/overlay_message_dialog.h"
 
 #include "cellSysutil.h"
@@ -33,27 +31,6 @@ void fmt_class_string<CellMsgDialogError>::format(std::string& out, u64 arg)
 	});
 }
 
-template<>
-void fmt_class_string<msg_dialog_source>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto src)
-	{
-		switch (src)
-		{
-			case msg_dialog_source::_cellMsgDialog: return "cellMsgDialog";
-			case msg_dialog_source::_cellSaveData: return "cellSaveData";
-			case msg_dialog_source::_cellGame: return "cellGame";
-			case msg_dialog_source::_cellCrossController: return "cellCrossController";
-			case msg_dialog_source::_sceNp: return "sceNp";
-			case msg_dialog_source::_sceNpTrophy: return "sceNpTrophy";
-			case msg_dialog_source::sys_progress: return "sys_progress";
-			case msg_dialog_source::shader_loading: return "shader_loading";
-		}
-
-		return unknown;
-	});
-}
-
 MsgDialogBase::~MsgDialogBase()
 {
 }
@@ -158,21 +135,19 @@ struct msg_dlg_thread_info
 
 using msg_dlg_thread = named_thread<msg_dlg_thread_info>;
 
+// variable used to immediately get the response from auxiliary message dialogs (callbacks would be async)
+atomic_t<s32> g_last_user_response = CELL_MSGDIALOG_BUTTON_NONE;
+
 // forward declaration for open_msg_dialog
 error_code cellMsgDialogOpen2(u32 type, vm::cptr<char> msgString, vm::ptr<CellMsgDialogCallback> callback, vm::ptr<void> userData, vm::ptr<void> extParam);
 
 // wrapper to call for other hle dialogs
-error_code open_msg_dialog(bool is_blocking, u32 type, vm::cptr<char> msgString, msg_dialog_source source, vm::ptr<CellMsgDialogCallback> callback, vm::ptr<void> userData, vm::ptr<void> extParam, s32* return_code)
+error_code open_msg_dialog(bool is_blocking, u32 type, vm::cptr<char> msgString, vm::ptr<CellMsgDialogCallback> callback, vm::ptr<void> userData, vm::ptr<void> extParam)
 {
-	cellSysutil.notice("open_msg_dialog(is_blocking=%d, type=0x%x, msgString=%s, source=%s, callback=*0x%x, userData=*0x%x, extParam=*0x%x, return_code=*0x%x)", is_blocking, type, msgString, source, callback, userData, extParam, return_code);
+	cellSysutil.warning("open_msg_dialog(is_blocking=%d, type=0x%x, msgString=%s, callback=*0x%x, userData=*0x%x, extParam=*0x%x)", is_blocking, type, msgString, callback, userData, extParam);
 
 	const MsgDialogType _type{ type };
 
-	if (return_code)
-	{
-		*return_code = CELL_MSGDIALOG_BUTTON_NONE;
-	}
-
 	if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
 	{
 		if (manager->get<rsx::overlays::message_dialog>())
@@ -180,22 +155,10 @@ error_code open_msg_dialog(bool is_blocking, u32 type, vm::cptr<char> msgString,
 			return CELL_SYSUTIL_ERROR_BUSY;
 		}
 
-		if (s32 ret = sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_BEGIN, 0); ret < 0)
+		g_last_user_response = CELL_MSGDIALOG_BUTTON_NONE;
+
+		const auto res = manager->create<rsx::overlays::message_dialog>()->show(is_blocking, msgString.get_ptr(), _type, [callback, userData](s32 status)
 		{
-			return CellSysutilError{ret + 0u};
-		}
-
-		const auto notify = std::make_shared<atomic_t<u32>>(0);
-
-		const auto res = manager->create<rsx::overlays::message_dialog>()->show(is_blocking, msgString.get_ptr(), _type, source, [callback, userData, &return_code, is_blocking, notify](s32 status)
-		{
-			if (is_blocking && return_code)
-			{
-				*return_code = status;
-			}
-
-			sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_END, 0);
-
 			if (callback)
 			{
 				sysutil_register_cb([=](ppu_thread& ppu) -> s32
@@ -204,20 +167,8 @@ error_code open_msg_dialog(bool is_blocking, u32 type, vm::cptr<char> msgString,
 					return CELL_OK;
 				});
 			}
-
-			if (is_blocking && notify)
-			{
-				*notify = 1;
-				notify->notify_one();
-			}
 		});
 
-		// Wait for on_close
-		while (is_blocking && !Emu.IsStopped() && !*notify)
-		{
-			notify->wait(false, atomic_wait_timeout{1'000'000});
-		}
-
 		return res;
 	}
 
@@ -228,27 +179,14 @@ error_code open_msg_dialog(bool is_blocking, u32 type, vm::cptr<char> msgString,
 		return CELL_SYSUTIL_ERROR_BUSY;
 	}
 
-	if (s32 ret = sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_BEGIN, 0); ret < 0)
-	{
-		return CellSysutilError{ret + 0u};
-	}
-
 	dlg->type = _type;
-	dlg->source = source;
 
-	dlg->on_close = [callback, userData, is_blocking, &return_code, wptr = std::weak_ptr<MsgDialogBase>(dlg)](s32 status)
+	dlg->on_close = [callback, userData, wptr = std::weak_ptr<MsgDialogBase>(dlg)](s32 status)
 	{
-		if (is_blocking && return_code)
-		{
-			*return_code = status;
-		}
-
 		const auto dlg = wptr.lock();
 
 		if (dlg && dlg->state.compare_and_swap_test(MsgDialogState::Open, MsgDialogState::Close))
 		{
-			sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_END, 0);
-
 			if (callback)
 			{
 				sysutil_register_cb([=](ppu_thread& ppu) -> s32
@@ -270,13 +208,11 @@ error_code open_msg_dialog(bool is_blocking, u32 type, vm::cptr<char> msgString,
 	auto& ppu = *get_current_cpu_thread();
 	lv2_obj::sleep(ppu);
 
-	// PS3 memory must not be accessed by Main thread
-	std::string msg_string = msgString.get_ptr();
-
 	// Run asynchronously in GUI thread
-	Emu.CallFromMainThread([&, msg_string = std::move(msg_string)]()
+	Emu.CallAfter([&]()
 	{
-		dlg->Create(msg_string);
+		g_last_user_response = CELL_MSGDIALOG_BUTTON_NONE;
+		dlg->Create(msgString.get_ptr());
 		lv2_obj::awake(&ppu);
 	});
 
@@ -292,7 +228,7 @@ error_code open_msg_dialog(bool is_blocking, u32 type, vm::cptr<char> msgString,
 			break;
 		}
 
-		ppu.state.wait(state);
+		thread_ctrl::wait_on(ppu.state, state);
 	}
 
 	if (is_blocking)
@@ -310,39 +246,14 @@ error_code open_msg_dialog(bool is_blocking, u32 type, vm::cptr<char> msgString,
 	return CELL_OK;
 }
 
-void close_msg_dialog()
-{
-	cellSysutil.notice("close_msg_dialog()");
-
-	if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
-	{
-		if (auto dlg = manager->get<rsx::overlays::message_dialog>())
-		{
-			g_fxo->get<msg_dlg_thread>().wait_until = 0;
-			dlg->close(false, true); // this doesn't call on_close
-			sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_END, 0);
-			return;
-		}
-	}
-
-	if (const auto dlg = g_fxo->get<msg_info>().get())
-	{
-		dlg->state = MsgDialogState::Close;
-		g_fxo->get<msg_dlg_thread>().wait_until = 0;
-		g_fxo->get<msg_info>().remove(); // this shouldn't call on_close
-		input::SetIntercepted(false);    // so we need to reenable the pads here
-		sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_END, 0);
-	}
-}
-
 void exit_game(s32/* buttonType*/, vm::ptr<void>/* userData*/)
 {
 	sysutil_send_system_cmd(CELL_SYSUTIL_REQUEST_EXITGAME, 0);
 }
 
-error_code open_exit_dialog(const std::string& message, bool is_exit_requested, msg_dialog_source source)
+error_code open_exit_dialog(const std::string& message, bool is_exit_requested)
 {
-	cellSysutil.notice("open_exit_dialog(message=%s, is_exit_requested=%d, source=%s)", message, is_exit_requested, source);
+	cellSysutil.warning("open_exit_dialog(message=%s, is_exit_requested=%d)", message, is_exit_requested);
 
 	vm::bptr<CellMsgDialogCallback> callback = vm::null;
 
@@ -356,7 +267,6 @@ error_code open_exit_dialog(const std::string& message, bool is_exit_requested,
 		true,
 		CELL_MSGDIALOG_TYPE_SE_TYPE_ERROR | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_OK | CELL_MSGDIALOG_TYPE_DISABLE_CANCEL_ON,
 		vm::make_str(message),
-		source,
 		callback
 	);
 
@@ -415,16 +325,21 @@ error_code cellMsgDialogOpen2(u32 type, vm::cptr<char> msgString, vm::ptr<CellMs
 	default: return CELL_MSGDIALOG_ERROR_PARAM;
 	}
 
+	if (_type.se_mute_on)
+	{
+		// TODO
+	}
+
 	if (_type.se_normal)
 	{
-		cellSysutil.warning("Opening message dialog with message: %s", msgString);
+		cellSysutil.warning("%s", msgString);
 	}
 	else
 	{
-		cellSysutil.error("Opening error message dialog with message: %s", msgString);
+		cellSysutil.error("%s", msgString);
 	}
 
-	return open_msg_dialog(false, type, msgString, msg_dialog_source::_cellMsgDialog, callback, userData, extParam);
+	return open_msg_dialog(false, type, msgString, callback, userData, extParam);
 }
 
 error_code cellMsgDialogOpen(u32 type, vm::cptr<char> msgString, vm::ptr<CellMsgDialogCallback> callback, vm::ptr<void> userData, vm::ptr<void> extParam)
@@ -519,8 +434,7 @@ error_code cellMsgDialogClose(f32 delay)
 
 	if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
 	{
-		if (auto dlg = manager->get<rsx::overlays::message_dialog>();
-			dlg && dlg->source() == msg_dialog_source::_cellMsgDialog)
+		if (auto dlg = manager->get<rsx::overlays::message_dialog>())
 		{
 			auto& thr = g_fxo->get<msg_dlg_thread>();
 			thr.wait_until = wait_until;
@@ -533,7 +447,7 @@ error_code cellMsgDialogClose(f32 delay)
 
 	const auto dlg = g_fxo->get<msg_info>().get();
 
-	if (!dlg || dlg->source != msg_dialog_source::_cellMsgDialog)
+	if (!dlg)
 	{
 		return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED;
 	}
@@ -550,23 +464,19 @@ error_code cellMsgDialogAbort()
 
 	if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
 	{
-		if (auto dlg = manager->get<rsx::overlays::message_dialog>();
-			dlg && dlg->source() == msg_dialog_source::_cellMsgDialog)
+		if (auto dlg = manager->get<rsx::overlays::message_dialog>())
 		{
 			g_fxo->get<msg_dlg_thread>().wait_until = 0;
-			dlg->close(false, true); // this doesn't call on_close
-			sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_END, 0);
+			dlg->close(false, true);
 			return CELL_OK;
 		}
-
-		return CELL_OK; // Not CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED, tested on HW.
 	}
 
 	const auto dlg = g_fxo->get<msg_info>().get();
 
-	if (!dlg || dlg->source != msg_dialog_source::_cellMsgDialog)
+	if (!dlg)
 	{
-		return CELL_OK; // Not CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED, tested on HW.
+		return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED;
 	}
 
 	if (!dlg->state.compare_and_swap_test(MsgDialogState::Open, MsgDialogState::Abort))
@@ -577,7 +487,6 @@ error_code cellMsgDialogAbort()
 	g_fxo->get<msg_dlg_thread>().wait_until = 0;
 	g_fxo->get<msg_info>().remove(); // this shouldn't call on_close
 	input::SetIntercepted(false);     // so we need to reenable the pads here
-	sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_END, 0);
 
 	return CELL_OK;
 }
@@ -624,7 +533,7 @@ error_code cellMsgDialogProgressBarSetMsg(u32 progressBarIndex, vm::cptr<char> m
 		return CELL_MSGDIALOG_ERROR_PARAM;
 	}
 
-	Emu.CallFromMainThread([=, msg = std::string{ msgString.get_ptr() }]
+	Emu.CallAfter([=, msg = std::string{ msgString.get_ptr() }]
 	{
 		dlg->ProgressBarSetMsg(progressBarIndex, msg);
 	});
@@ -656,7 +565,7 @@ error_code cellMsgDialogProgressBarReset(u32 progressBarIndex)
 		return CELL_MSGDIALOG_ERROR_PARAM;
 	}
 
-	Emu.CallFromMainThread([=]
+	Emu.CallAfter([=]
 	{
 		dlg->ProgressBarReset(progressBarIndex);
 	});
@@ -688,7 +597,7 @@ error_code cellMsgDialogProgressBarInc(u32 progressBarIndex, u32 delta)
 		return CELL_MSGDIALOG_ERROR_PARAM;
 	}
 
-	Emu.CallFromMainThread([=]
+	Emu.CallAfter([=]
 	{
 		dlg->ProgressBarInc(progressBarIndex, delta);
 	});
@@ -709,5 +618,5 @@ void cellSysutil_MsgDialog_init()
 	REG_FUNC(cellSysutil, cellMsgDialogAbort);
 
 	// Helper Function
-	REG_HIDDEN_FUNC(exit_game);
+	REG_FUNC(cellSysutil, exit_game).flag(MFF_HIDDEN);
 }
diff --git a/rpcs3/Emu/Cell/Modules/cellMsgDialog.h b/rpcs3/Emu/Cell/Modules/cellMsgDialog.h
index 0292c1c620..9c9e5dad87 100644
--- a/rpcs3/Emu/Cell/Modules/cellMsgDialog.h
+++ b/rpcs3/Emu/Cell/Modules/cellMsgDialog.h
@@ -89,21 +89,10 @@ enum class MsgDialogState
 	Close,
 };
 
-enum class msg_dialog_source
-{
-	_cellMsgDialog,
-	_cellSaveData,
-	_cellGame,
-	_cellCrossController,
-	_sceNp,
-	_sceNpTrophy,
-	sys_progress,
-	shader_loading,
-};
+extern atomic_t<s32> g_last_user_response;
 
-void close_msg_dialog();
-error_code open_msg_dialog(bool is_blocking, u32 type, vm::cptr<char> msgString, msg_dialog_source source, vm::ptr<CellMsgDialogCallback> callback = vm::null, vm::ptr<void> userData = vm::null, vm::ptr<void> extParam = vm::null, s32* return_code = nullptr);
-error_code open_exit_dialog(const std::string& message, bool is_exit_requested, msg_dialog_source source);
+error_code open_msg_dialog(bool is_blocking, u32 type, vm::cptr<char> msgString, vm::ptr<CellMsgDialogCallback> callback = vm::null, vm::ptr<void> userData = vm::null, vm::ptr<void> extParam = vm::null);
+error_code open_exit_dialog(const std::string& message, bool is_exit_requested);
 
 class MsgDialogBase
 {
@@ -115,9 +104,8 @@ public:
 	atomic_t<MsgDialogState> state{ MsgDialogState::Close };
 
 	MsgDialogType type{};
-	msg_dialog_source source = msg_dialog_source::_cellMsgDialog;
 
-	std::function<void(s32 status)> on_close = nullptr;
+	std::function<void(s32 status)> on_close;
 
 	virtual ~MsgDialogBase();
 	virtual void Create(const std::string& msg, const std::string& title = "") = 0;
diff --git a/rpcs3/Emu/Cell/Modules/cellMusic.cpp b/rpcs3/Emu/Cell/Modules/cellMusic.cpp
index 83937f7d16..a2e2393e1d 100644
--- a/rpcs3/Emu/Cell/Modules/cellMusic.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellMusic.cpp
@@ -3,13 +3,10 @@
 #include "Emu/Cell/lv2/sys_lwmutex.h"
 #include "Emu/Cell/lv2/sys_lwcond.h"
 #include "Emu/Cell/lv2/sys_spu.h"
-#include "Emu/Io/music_handler_base.h"
-#include "Emu/System.h"
-#include "Emu/VFS.h"
-#include "Emu/RSX/Overlays/overlay_media_list_dialog.h"
 #include "cellSearch.h"
 #include "cellSpurs.h"
 #include "cellSysutil.h"
+
 #include "cellMusic.h"
 
 LOG_CHANNEL(cellMusic);
@@ -70,189 +67,8 @@ struct music_state
 
 	vm::ptr<void(u32 event, vm::ptr<void> param, vm::ptr<void> userData)> func{};
 	vm::ptr<void> userData{};
-	shared_mutex mtx;
-	std::shared_ptr<music_handler_base> handler;
-	music_selection_context current_selection_context{};
-
-	SAVESTATE_INIT_POS(16);
-
-	music_state()
-	{
-		handler = Emu.GetCallbacks().get_music_handler();
-		handler->set_status_callback([this](music_handler_base::player_status status)
-		{
-			// TODO: disabled until I find a game that uses CELL_MUSIC_EVENT_STATUS_NOTIFICATION
-			return;
-
-			if (!func)
-			{
-				return;
-			}
-
-			s32 result = CELL_OK;
-
-			switch (status)
-			{
-			case music_handler_base::player_status::end_of_media:
-				result = CELL_MUSIC_PLAYBACK_FINISHED;
-				break;
-			default:
-				return;
-			}
-
-			sysutil_register_cb([this, &result](ppu_thread& ppu) -> s32
-			{
-				cellMusic.notice("Sending status notification %d", result);
-				func(ppu, CELL_MUSIC_EVENT_STATUS_NOTIFICATION, vm::addr_t(result), userData);
-				return CELL_OK;
-			});
-		});
-	}
-
-	music_state(utils::serial& ar)
-		: music_state()
-	{
-		save(ar);
-	}
-
-	void save(utils::serial& ar)
-	{
-		ar(func);
-
-		if (!func)
-		{
-			return;
-		}
-
-		GET_OR_USE_SERIALIZATION_VERSION(ar.is_writing(), cellMusic);
-
-		ar(userData);
-	}
-
-	// NOTE: This function only uses CELL_MUSIC enums. CELL_MUSIC2 enums are identical.
-	error_code set_playback_command(s32 command)
-	{
-		switch (command)
-		{
-		case CELL_MUSIC_PB_CMD_STOP:
-			handler->stop();
-			break;
-		case CELL_MUSIC_PB_CMD_PAUSE:
-			handler->pause();
-			break;
-		case CELL_MUSIC_PB_CMD_PLAY:
-		case CELL_MUSIC_PB_CMD_FASTFORWARD:
-		case CELL_MUSIC_PB_CMD_FASTREVERSE:
-		case CELL_MUSIC_PB_CMD_NEXT:
-		case CELL_MUSIC_PB_CMD_PREV:
-		{
-			std::string path;
-			bool no_more_tracks = false;
-			{
-				std::lock_guard lock(mtx);
-				const std::vector<std::string>& playlist = current_selection_context.playlist;
-				const u32 current_track = current_selection_context.current_track;
-				u32 next_track = current_track;
-
-				if (command == CELL_MUSIC_PB_CMD_NEXT || command == CELL_MUSIC_PB_CMD_PREV)
-				{
-					next_track = current_selection_context.step_track(command == CELL_MUSIC_PB_CMD_NEXT);
-				}
-
-				if (next_track < playlist.size())
-				{
-					path = vfs::get(::at32(playlist, next_track));
-					cellMusic.notice("set_playback_command: current vfs path: '%s' (unresolved='%s')", path, ::at32(playlist, next_track));
-				}
-				else
-				{
-					current_selection_context.current_track = current_track;
-					no_more_tracks = true;
-				}
-			}
-
-			if (no_more_tracks)
-			{
-				cellMusic.notice("set_playback_command: no more tracks to play");
-				return CELL_MUSIC_ERROR_NO_MORE_CONTENT;
-			}
-
-			if (!fs::is_file(path))
-			{
-				cellMusic.error("set_playback_command: File does not exist: '%s'", path);
-			}
-
-			switch (command)
-			{
-			case CELL_MUSIC_PB_CMD_FASTFORWARD:
-				handler->fast_forward(path);
-				break;
-			case CELL_MUSIC_PB_CMD_FASTREVERSE:
-				handler->fast_reverse(path);
-				break;
-			default:
-				handler->play(path);
-				break;
-			}
-
-			break;
-		}
-		default:
-			break;
-		}
-
-		return CELL_OK;
-	}
 };
 
-error_code cell_music_select_contents()
-{
-	auto& music = g_fxo->get<music_state>();
-
-	if (!music.func)
-		return CELL_MUSIC_ERROR_GENERIC;
-
-	const std::string vfs_dir_path = vfs::get("/dev_hdd0/music");
-	const std::string title = get_localized_string(localized_string_id::RSX_OVERLAYS_MEDIA_DIALOG_TITLE);
-
-	error_code error = rsx::overlays::show_media_list_dialog(rsx::overlays::media_list_dialog::media_type::audio, vfs_dir_path, title,
-		[&music](s32 status, utils::media_info info)
-		{
-			sysutil_register_cb([&music, info = std::move(info), status](ppu_thread& ppu) -> s32
-			{
-				std::lock_guard lock(music.mtx);
-				const u32 result = status >= 0 ? u32{CELL_OK} : u32{CELL_MUSIC_CANCELED};
-				if (result == CELL_OK)
-				{
-					// Let's always choose the whole directory for now
-					std::string track;
-					std::string dir = info.path;
-					if (fs::is_file(info.path))
-					{
-						track = std::move(dir);
-						dir = fs::get_parent_dir(track);
-					}
-
-					music_selection_context context{};
-					context.set_playlist(dir);
-					context.set_track(track);
-					// TODO: context.repeat_mode = CELL_SEARCH_REPEATMODE_NONE;
-					// TODO: context.context_option = CELL_SEARCH_CONTEXTOPTION_NONE;
-					music.current_selection_context = std::move(context);
-					music.current_selection_context.create_playlist(music_selection_context::get_next_hash());
-					cellMusic.success("Media list dialog: selected entry '%s'", music.current_selection_context.playlist.front());
-				}
-				else
-				{
-					cellMusic.warning("Media list dialog was canceled");
-				}
-				music.func(ppu, CELL_MUSIC_EVENT_SELECT_CONTENTS_RESULT, vm::addr_t(result), music.userData);
-				return CELL_OK;
-			});
-		});
-	return error;
-}
-
 error_code cellMusicGetSelectionContext(vm::ptr<CellMusicSelectionContext> context)
 {
 	cellMusic.todo("cellMusicGetSelectionContext(context=*0x%x)", context);
@@ -260,17 +76,6 @@ error_code cellMusicGetSelectionContext(vm::ptr<CellMusicSelectionContext> conte
 	if (!context)
 		return CELL_MUSIC_ERROR_PARAM;
 
-	auto& music = g_fxo->get<music_state>();
-	std::lock_guard lock(music.mtx);
-
-	if (!music.current_selection_context)
-	{
-		return CELL_MUSIC_ERROR_NO_ACTIVE_CONTENT;
-	}
-
-	*context = music.current_selection_context.get();
-	cellMusic.success("cellMusicGetSelectionContext: selection context = %s", music.current_selection_context.to_string());
-
 	return CELL_OK;
 }
 
@@ -286,19 +91,9 @@ error_code cellMusicSetSelectionContext2(vm::ptr<CellMusicSelectionContext> cont
 	if (!music.func)
 		return CELL_MUSIC2_ERROR_GENERIC;
 
-	sysutil_register_cb([context = *context, &music](ppu_thread& ppu) -> s32
+	sysutil_register_cb([=, &music](ppu_thread& ppu) -> s32
 	{
-		bool result = false;
-		{
-			std::lock_guard lock(music.mtx);
-			result = music.current_selection_context.set(context);
-		}
-		const u32 status = result ? u32{CELL_OK} : u32{CELL_MUSIC2_ERROR_INVALID_CONTEXT};
-
-		if (result) cellMusic.success("cellMusicSetSelectionContext2: new selection context = %s", music.current_selection_context.to_string());
-		else cellMusic.todo("cellMusicSetSelectionContext2: failed. context = %s", music_selection_context::context_to_hex(context));
-
-		music.func(ppu, CELL_MUSIC2_EVENT_SET_SELECTION_CONTEXT_RESULT, vm::addr_t(status), music.userData);
+		music.func(ppu, CELL_MUSIC2_EVENT_SET_SELECTION_CONTEXT_RESULT, vm::addr_t(CELL_OK), music.userData);
 		return CELL_OK;
 	});
 
@@ -307,7 +102,7 @@ error_code cellMusicSetSelectionContext2(vm::ptr<CellMusicSelectionContext> cont
 
 error_code cellMusicSetVolume2(f32 level)
 {
-	cellMusic.warning("cellMusicSetVolume2(level=%f)", level);
+	cellMusic.todo("cellMusicSetVolume2(level=0x%x)", level);
 
 	level = std::clamp(level, 0.0f, 1.0f);
 
@@ -316,8 +111,6 @@ error_code cellMusicSetVolume2(f32 level)
 	if (!music.func)
 		return CELL_MUSIC2_ERROR_GENERIC;
 
-	music.handler->set_volume(level);
-
 	sysutil_register_cb([=, &music](ppu_thread& ppu) -> s32
 	{
 		music.func(ppu, CELL_MUSIC2_EVENT_SET_VOLUME_RESULT, vm::addr_t(CELL_OK), music.userData);
@@ -334,16 +127,7 @@ error_code cellMusicGetContentsId(vm::ptr<CellSearchContentId> contents_id)
 	if (!contents_id)
 		return CELL_MUSIC_ERROR_PARAM;
 
-	// HACKY
-	auto& music = g_fxo->get<music_state>();
-	std::lock_guard lock(music.mtx);
-
-	if (!music.current_selection_context)
-	{
-		return CELL_MUSIC_ERROR_NO_ACTIVE_CONTENT;
-	}
-
-	return music.current_selection_context.find_content_id(contents_id);
+	return CELL_OK;
 }
 
 error_code cellMusicSetSelectionContext(vm::ptr<CellMusicSelectionContext> context)
@@ -358,19 +142,9 @@ error_code cellMusicSetSelectionContext(vm::ptr<CellMusicSelectionContext> conte
 	if (!music.func)
 		return CELL_MUSIC_ERROR_GENERIC;
 
-	sysutil_register_cb([context = *context, &music](ppu_thread& ppu) -> s32
+	sysutil_register_cb([=, &music](ppu_thread& ppu) -> s32
 	{
-		bool result = false;
-		{
-			std::lock_guard lock(music.mtx);
-			result = music.current_selection_context.set(context);
-		}
-		const u32 status = result ? u32{CELL_OK} : u32{CELL_MUSIC_ERROR_INVALID_CONTEXT};
-
-		if (result) cellMusic.success("cellMusicSetSelectionContext: new selection context = %s)", music.current_selection_context.to_string());
-		else cellMusic.todo("cellMusicSetSelectionContext: failed. context = %s)", music_selection_context::context_to_hex(context));
-
-		music.func(ppu, CELL_MUSIC_EVENT_SET_SELECTION_CONTEXT_RESULT, vm::addr_t(status), music.userData);
+		music.func(ppu, CELL_MUSIC_EVENT_SET_SELECTION_CONTEXT_RESULT, vm::addr_t(CELL_OK), music.userData);
 		return CELL_OK;
 	});
 
@@ -381,15 +155,18 @@ error_code cellMusicInitialize2SystemWorkload(s32 mode, vm::ptr<CellMusic2Callba
 {
 	cellMusic.todo("cellMusicInitialize2SystemWorkload(mode=0x%x, func=*0x%x, userData=*0x%x, spurs=*0x%x, priority=*0x%x, attr=*0x%x)", mode, func, userData, spurs, priority, attr);
 
-	if (mode != CELL_MUSIC2_PLAYER_MODE_NORMAL || !func || !spurs || !priority)
+	if (!func)
+		return CELL_MUSIC2_ERROR_PARAM;
+
+	if (mode != CELL_MUSIC2_PLAYER_MODE_NORMAL)
 	{
+		cellMusic.todo("Unknown player mode: 0x%x", mode);
 		return CELL_MUSIC2_ERROR_PARAM;
 	}
 
 	auto& music = g_fxo->get<music_state>();
 	music.func = func;
 	music.userData = userData;
-	music.current_selection_context = {};
 
 	sysutil_register_cb([=, &music](ppu_thread& ppu) -> s32
 	{
@@ -402,14 +179,11 @@ error_code cellMusicInitialize2SystemWorkload(s32 mode, vm::ptr<CellMusic2Callba
 
 error_code cellMusicGetPlaybackStatus2(vm::ptr<s32> status)
 {
-	cellMusic.warning("cellMusicGetPlaybackStatus2(status=*0x%x)", status);
+	cellMusic.todo("cellMusicGetPlaybackStatus2(status=*0x%x)", status);
 
 	if (!status)
 		return CELL_MUSIC2_ERROR_PARAM;
 
-	const auto& music = g_fxo->get<music_state>();
-	*status = music.handler->get_state();
-
 	return CELL_OK;
 }
 
@@ -420,16 +194,7 @@ error_code cellMusicGetContentsId2(vm::ptr<CellSearchContentId> contents_id)
 	if (!contents_id)
 		return CELL_MUSIC2_ERROR_PARAM;
 
-	// HACKY
-	auto& music = g_fxo->get<music_state>();
-	std::lock_guard lock(music.mtx);
-
-	if (!music.current_selection_context)
-	{
-		return CELL_MUSIC2_ERROR_NO_ACTIVE_CONTENT;
-	}
-
-	return music.current_selection_context.find_content_id(contents_id);
+	return CELL_OK;
 }
 
 error_code cellMusicFinalize()
@@ -454,15 +219,18 @@ error_code cellMusicInitializeSystemWorkload(s32 mode, u32 container, vm::ptr<Ce
 {
 	cellMusic.todo("cellMusicInitializeSystemWorkload(mode=0x%x, container=0x%x, func=*0x%x, userData=*0x%x, spurs=*0x%x, priority=*0x%x, attr=*0x%x)", mode, container, func, userData, spurs, priority, attr);
 
-	if (mode != CELL_MUSIC2_PLAYER_MODE_NORMAL || !func || !spurs || !priority)
+	if (!func)
+		return CELL_MUSIC_ERROR_PARAM;
+
+	if (mode != CELL_MUSIC_PLAYER_MODE_NORMAL)
 	{
-		return CELL_MUSIC2_ERROR_PARAM;
+		cellMusic.todo("Unknown player mode: 0x%x", mode);
+		return CELL_MUSIC_ERROR_PARAM;
 	}
 
 	auto& music = g_fxo->get<music_state>();
 	music.func = func;
 	music.userData = userData;
-	music.current_selection_context = {};
 
 	sysutil_register_cb([=, &music](ppu_thread& ppu) -> s32
 	{
@@ -477,15 +245,18 @@ error_code cellMusicInitialize(s32 mode, u32 container, s32 spuPriority, vm::ptr
 {
 	cellMusic.todo("cellMusicInitialize(mode=0x%x, container=0x%x, spuPriority=0x%x, func=*0x%x, userData=*0x%x)", mode, container, spuPriority, func, userData);
 
-	if (mode != CELL_MUSIC_PLAYER_MODE_NORMAL || !func || spuPriority < 16 || spuPriority > 255)
+	if (!func)
+		return CELL_MUSIC_ERROR_PARAM;
+
+	if (mode != CELL_MUSIC_PLAYER_MODE_NORMAL)
 	{
+		cellMusic.todo("Unknown player mode: 0x%x", mode);
 		return CELL_MUSIC_ERROR_PARAM;
 	}
 
 	auto& music = g_fxo->get<music_state>();
 	music.func = func;
 	music.userData = userData;
-	music.current_selection_context = {};
 
 	sysutil_register_cb([=, &music](ppu_thread& ppu) -> s32
 	{
@@ -521,43 +292,26 @@ error_code cellMusicGetSelectionContext2(vm::ptr<CellMusicSelectionContext> cont
 	if (!context)
 		return CELL_MUSIC2_ERROR_PARAM;
 
-	auto& music = g_fxo->get<music_state>();
-	std::lock_guard lock(music.mtx);
-
-	if (!music.current_selection_context)
-	{
-		return CELL_MUSIC2_ERROR_NO_ACTIVE_CONTENT;
-	}
-
-	*context = music.current_selection_context.get();
-	cellMusic.success("cellMusicGetSelectionContext2: selection context = %s", music.current_selection_context.to_string());
-
 	return CELL_OK;
 }
 
 error_code cellMusicGetVolume(vm::ptr<f32> level)
 {
-	cellMusic.warning("cellMusicGetVolume(level=*0x%x)", level);
+	cellMusic.todo("cellMusicGetVolume(level=*0x%x)", level);
 
 	if (!level)
 		return CELL_MUSIC_ERROR_PARAM;
 
-	const auto& music = g_fxo->get<music_state>();
-	*level = music.handler->get_volume();
-
 	return CELL_OK;
 }
 
 error_code cellMusicGetPlaybackStatus(vm::ptr<s32> status)
 {
-	cellMusic.warning("cellMusicGetPlaybackStatus(status=*0x%x)", status);
+	cellMusic.todo("cellMusicGetPlaybackStatus(status=*0x%x)", status);
 
 	if (!status)
 		return CELL_MUSIC_ERROR_PARAM;
 
-	const auto& music = g_fxo->get<music_state>();
-	*status = music.handler->get_state();
-
 	return CELL_OK;
 }
 
@@ -565,29 +319,21 @@ error_code cellMusicSetPlaybackCommand2(s32 command, vm::ptr<void> param)
 {
 	cellMusic.todo("cellMusicSetPlaybackCommand2(command=0x%x, param=*0x%x)", command, param);
 
-	if (command < CELL_MUSIC2_PB_CMD_STOP || command > CELL_MUSIC2_PB_CMD_FASTREVERSE)
+	if (command < CELL_MUSIC_PB_CMD_STOP || command > CELL_MUSIC_PB_CMD_FASTREVERSE)
 		return CELL_MUSIC2_ERROR_PARAM;
 
 	auto& music = g_fxo->get<music_state>();
 
 	if (!music.func)
-		return { CELL_MUSIC2_ERROR_GENERIC, "Not initialized" };
+		return CELL_MUSIC2_ERROR_GENERIC;
 
-	error_code result = CELL_OK;
-
-	if (!music.current_selection_context)
+	sysutil_register_cb([=, &music](ppu_thread& ppu) -> s32
 	{
-		result = CELL_MUSIC_ERROR_GENERIC;
-	}
-
-	sysutil_register_cb([=, &music, prev_res = result](ppu_thread& ppu) -> s32
-	{
-		const error_code result = prev_res ? prev_res : music.set_playback_command(command);
-		music.func(ppu, CELL_MUSIC2_EVENT_SET_PLAYBACK_COMMAND_RESULT, vm::addr_t(+result), music.userData);
+		music.func(ppu, CELL_MUSIC2_EVENT_SET_PLAYBACK_COMMAND_RESULT, vm::addr_t(CELL_OK), music.userData);
 		return CELL_OK;
 	});
 
-	return result;
+	return CELL_OK;
 }
 
 error_code cellMusicSetPlaybackCommand(s32 command, vm::ptr<void> param)
@@ -600,52 +346,69 @@ error_code cellMusicSetPlaybackCommand(s32 command, vm::ptr<void> param)
 	auto& music = g_fxo->get<music_state>();
 
 	if (!music.func)
-		return { CELL_MUSIC_ERROR_GENERIC, "Not initialized" };
+		return CELL_MUSIC_ERROR_GENERIC;
 
-	error_code result = CELL_OK;
-
-	if (!music.current_selection_context)
+	sysutil_register_cb([=, &music](ppu_thread& ppu) -> s32
 	{
-		result = CELL_MUSIC2_ERROR_GENERIC;
-	}
-
-	sysutil_register_cb([=, &music, prev_res = result](ppu_thread& ppu) -> s32
-	{
-		const error_code result = prev_res ? prev_res : music.set_playback_command(command);
-		music.func(ppu, CELL_MUSIC_EVENT_SET_PLAYBACK_COMMAND_RESULT, vm::addr_t(+result), music.userData);
+		music.func(ppu, CELL_MUSIC_EVENT_SET_PLAYBACK_COMMAND_RESULT, vm::addr_t(CELL_OK), music.userData);
 		return CELL_OK;
 	});
 
-	return result;
+	return CELL_OK;
 }
 
 error_code cellMusicSelectContents2()
 {
 	cellMusic.todo("cellMusicSelectContents2()");
 
-	return cell_music_select_contents();
+	auto& music = g_fxo->get<music_state>();
+
+	if (!music.func)
+		return CELL_MUSIC2_ERROR_GENERIC;
+
+	sysutil_register_cb([=, &music](ppu_thread& ppu) -> s32
+	{
+		music.func(ppu, CELL_MUSIC2_EVENT_SELECT_CONTENTS_RESULT, vm::addr_t(CELL_OK), music.userData);
+		return CELL_OK;
+	});
+
+	return CELL_OK;
 }
 
 error_code cellMusicSelectContents(u32 container)
 {
 	cellMusic.todo("cellMusicSelectContents(container=0x%x)", container);
 
-	return cell_music_select_contents();
+	auto& music = g_fxo->get<music_state>();
+
+	if (!music.func)
+		return CELL_MUSIC_ERROR_GENERIC;
+
+	sysutil_register_cb([=, &music](ppu_thread& ppu) -> s32
+	{
+		music.func(ppu, CELL_MUSIC_EVENT_SELECT_CONTENTS_RESULT, vm::addr_t(CELL_OK), music.userData);
+		return CELL_OK;
+	});
+
+	return CELL_OK;
 }
 
 error_code cellMusicInitialize2(s32 mode, s32 spuPriority, vm::ptr<CellMusic2Callback> func, vm::ptr<void> userData)
 {
 	cellMusic.todo("cellMusicInitialize2(mode=%d, spuPriority=%d, func=*0x%x, userData=*0x%x)", mode, spuPriority, func, userData);
 
-	if (mode != CELL_MUSIC_PLAYER_MODE_NORMAL || !func || spuPriority < 16 || spuPriority > 255)
+	if (!func)
+		return CELL_MUSIC2_ERROR_PARAM;
+
+	if (mode != CELL_MUSIC2_PLAYER_MODE_NORMAL)
 	{
+		cellMusic.todo("Unknown player mode: 0x%x", mode);
 		return CELL_MUSIC2_ERROR_PARAM;
 	}
 
 	auto& music = g_fxo->get<music_state>();
 	music.func = func;
 	music.userData = userData;
-	music.current_selection_context = {};
 
 	sysutil_register_cb([=, &music](ppu_thread& ppu) -> s32
 	{
@@ -658,7 +421,7 @@ error_code cellMusicInitialize2(s32 mode, s32 spuPriority, vm::ptr<CellMusic2Cal
 
 error_code cellMusicSetVolume(f32 level)
 {
-	cellMusic.warning("cellMusicSetVolume(level=%f)", level);
+	cellMusic.todo("cellMusicSetVolume(level=0x%x)", level);
 
 	level = std::clamp(level, 0.0f, 1.0f);
 
@@ -667,8 +430,6 @@ error_code cellMusicSetVolume(f32 level)
 	if (!music.func)
 		return CELL_MUSIC_ERROR_GENERIC;
 
-	music.handler->set_volume(level);
-
 	sysutil_register_cb([=, &music](ppu_thread& ppu) -> s32
 	{
 		music.func(ppu, CELL_MUSIC_EVENT_SET_VOLUME_RESULT, vm::addr_t(CELL_OK), music.userData);
@@ -680,14 +441,11 @@ error_code cellMusicSetVolume(f32 level)
 
 error_code cellMusicGetVolume2(vm::ptr<f32> level)
 {
-	cellMusic.warning("cellMusicGetVolume2(level=*0x%x)", level);
+	cellMusic.todo("cellMusicGetVolume2(level=*0x%x)", level);
 
 	if (!level)
 		return CELL_MUSIC2_ERROR_PARAM;
 
-	const auto& music = g_fxo->get<music_state>();
-	*level = music.handler->get_volume();
-
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellMusic.h b/rpcs3/Emu/Cell/Modules/cellMusic.h
index a98b305011..828b4be4e1 100644
--- a/rpcs3/Emu/Cell/Modules/cellMusic.h
+++ b/rpcs3/Emu/Cell/Modules/cellMusic.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include "Emu/Memory/vm_ptr.h"
-#include "Emu/Cell/ErrorCodes.h"
-#include "cellSearch.h"
 
 // Error Codes
 enum CellMusicError : u32
@@ -134,46 +132,5 @@ using CellMusic2Callback = void(u32 event, vm::ptr<void> param, vm::ptr<void> us
 
 struct CellMusicSelectionContext
 {
-	// TODO: find out what fw does with it
-	// Let's just hijack it with our own data.
 	char data[CELL_MUSIC_SELECTION_CONTEXT_SIZE];
 };
-
-struct music_selection_context
-{
-	bool valid = false;
-	char magic[4] = "SUS";
-	std::string hash;
-	CellSearchContentType content_type = CELL_SEARCH_CONTENTTYPE_MUSIC;
-	CellSearchRepeatMode repeat_mode = CELL_SEARCH_REPEATMODE_NONE;
-	CellSearchContextOption context_option = CELL_SEARCH_CONTEXTOPTION_NONE;
-	u32 first_track{0};
-	u32 current_track{0};
-	std::vector<std::string> playlist;
-
-	static constexpr u32 max_depth = 2; // root + 1 folder + file
-	static constexpr const char* target_file_type = "Music Playlist";
-	static constexpr const char* target_version = "1.0";
-	static std::string get_next_hash();
-	static std::string context_to_hex(const CellMusicSelectionContext& context);
-
-	bool set(const CellMusicSelectionContext& in);
-	CellMusicSelectionContext get() const;
-
-	std::string to_string() const;
-	std::string get_yaml_path() const;
-
-	void set_playlist(const std::string& path);
-	void create_playlist(const std::string& new_hash);
-	bool load_playlist();
-	void set_track(std::string_view track);
-	u32 step_track(bool next);
-
-	operator bool() const
-	{
-		return atomic_storage<bool>::load(valid);
-	}
-
-	// Helper
-	error_code find_content_id(vm::ptr<CellSearchContentId> contents_id);
-};
diff --git a/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp b/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp
index c938f723b1..dcf9ed58c9 100644
--- a/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp
@@ -3,17 +3,33 @@
 #include "Emu/Cell/lv2/sys_lwmutex.h"
 #include "Emu/Cell/lv2/sys_lwcond.h"
 #include "Emu/Cell/lv2/sys_spu.h"
-#include "Emu/RSX/Overlays/overlay_media_list_dialog.h"
-#include "Emu/VFS.h"
-#include "cellMusicDecode.h"
 #include "cellMusic.h"
 #include "cellSearch.h"
 #include "cellSpurs.h"
 #include "cellSysutil.h"
-#include "util/media_utils.h"
+
+
 
 LOG_CHANNEL(cellMusicDecode);
 
+// Return Codes
+enum CellMusicDecodeError : u32
+{
+	CELL_MUSIC_DECODE_DECODE_FINISHED         = 0x8002C101,
+	CELL_MUSIC_DECODE_ERROR_PARAM             = 0x8002C102,
+	CELL_MUSIC_DECODE_ERROR_BUSY              = 0x8002C103,
+	CELL_MUSIC_DECODE_ERROR_NO_ACTIVE_CONTENT = 0x8002C104,
+	CELL_MUSIC_DECODE_ERROR_NO_MATCH_FOUND    = 0x8002C105,
+	CELL_MUSIC_DECODE_ERROR_INVALID_CONTEXT   = 0x8002C106,
+	CELL_MUSIC_DECODE_ERROR_DECODE_FAILURE    = 0x8002C107,
+	CELL_MUSIC_DECODE_ERROR_NO_MORE_CONTENT   = 0x8002C108,
+	CELL_MUSIC_DECODE_DIALOG_OPEN             = 0x8002C109,
+	CELL_MUSIC_DECODE_DIALOG_CLOSE            = 0x8002C10A,
+	CELL_MUSIC_DECODE_ERROR_NO_LPCM_DATA      = 0x8002C10B,
+	CELL_MUSIC_DECODE_NEXT_CONTENTS_READY     = 0x8002C10C,
+	CELL_MUSIC_DECODE_ERROR_GENERIC           = 0x8002C1FF,
+};
+
 template<>
 void fmt_class_string<CellMusicDecodeError>::format(std::string& out, u64 arg)
 {
@@ -21,7 +37,6 @@ void fmt_class_string<CellMusicDecodeError>::format(std::string& out, u64 arg)
 	{
 		switch (error)
 		{
-			STR_CASE(CELL_MUSIC_DECODE_CANCELED);
 			STR_CASE(CELL_MUSIC_DECODE_DECODE_FINISHED);
 			STR_CASE(CELL_MUSIC_DECODE_ERROR_PARAM);
 			STR_CASE(CELL_MUSIC_DECODE_ERROR_BUSY);
@@ -41,266 +56,60 @@ void fmt_class_string<CellMusicDecodeError>::format(std::string& out, u64 arg)
 	});
 }
 
+enum
+{
+	CELL_MUSIC_DECODE_EVENT_STATUS_NOTIFICATION = 0,
+	CELL_MUSIC_DECODE_EVENT_INITIALIZE_RESULT = 1,
+	CELL_MUSIC_DECODE_EVENT_FINALIZE_RESULT = 2,
+	CELL_MUSIC_DECODE_EVENT_SELECT_CONTENTS_RESULT = 3,
+	CELL_MUSIC_DECODE_EVENT_SET_DECODE_COMMAND_RESULT = 4,
+	CELL_MUSIC_DECODE_EVENT_SET_SELECTION_CONTEXT_RESULT = 5,
+	CELL_MUSIC_DECODE_EVENT_UI_NOTIFICATION = 6,
+	CELL_MUSIC_DECODE_EVENT_NEXT_CONTENTS_READY_RESULT = 7,
+};
+
+enum
+{
+	CELL_MUSIC_DECODE2_EVENT_STATUS_NOTIFICATION = 0,
+	CELL_MUSIC_DECODE2_EVENT_INITIALIZE_RESULT = 1,
+	CELL_MUSIC_DECODE2_EVENT_FINALIZE_RESULT = 2,
+	CELL_MUSIC_DECODE2_EVENT_SELECT_CONTENTS_RESULT = 3,
+	CELL_MUSIC_DECODE2_EVENT_SET_DECODE_COMMAND_RESULT = 4,
+	CELL_MUSIC_DECODE2_EVENT_SET_SELECTION_CONTEXT_RESULT = 5,
+	CELL_MUSIC_DECODE2_EVENT_UI_NOTIFICATION = 6,
+	CELL_MUSIC_DECODE2_EVENT_NEXT_CONTENTS_READY_RESULT = 7,
+};
+
+using CellMusicDecodeCallback = void(u32, vm::ptr<void> param, vm::ptr<void> userData);
+using CellMusicDecode2Callback = void(u32, vm::ptr<void> param, vm::ptr<void> userData);
+
 struct music_decode
 {
 	vm::ptr<CellMusicDecodeCallback> func{};
 	vm::ptr<void> userData{};
-	music_selection_context current_selection_context{};
-	s32 decode_status = CELL_MUSIC_DECODE_STATUS_DORMANT;
-	s32 decode_command = CELL_MUSIC_DECODE_CMD_STOP;
-	u64 read_pos = 0;
-	utils::audio_decoder decoder{};
 
 	shared_mutex mutex;
-
-	error_code set_decode_command(s32 command)
-	{
-		decode_command = command;
-
-		switch (command)
-		{
-		case CELL_MUSIC_DECODE_CMD_STOP:
-		{
-			decoder.stop();
-			decode_status = CELL_MUSIC_DECODE_STATUS_DORMANT;
-			break;
-		}
-		case CELL_MUSIC_DECODE_CMD_START:
-		{
-			decode_status = CELL_MUSIC_DECODE_STATUS_DECODING;
-			read_pos = 0;
-
-			// Decode data. The format of the decoded data is 48kHz, float 32bit, 2ch LPCM data interleaved in order from left to right.
-			cellMusicDecode.notice("set_decode_command(START): context: %s", current_selection_context.to_string());
-
-			music_selection_context context = current_selection_context;
-
-			for (usz i = 0; i < context.playlist.size(); i++)
-			{
-				context.playlist[i] = vfs::get(context.playlist[i]);
-			}
-
-			// TODO: set speed if small-memory decoding is used (music_decode2)
-			decoder.set_context(std::move(context));
-			decoder.set_swap_endianness(true);
-			decoder.decode();
-			break;
-		}
-		case CELL_MUSIC_DECODE_CMD_NEXT:
-		case CELL_MUSIC_DECODE_CMD_PREV:
-		{
-			decoder.stop();
-
-			if (decoder.set_next_index(command == CELL_MUSIC_DECODE_CMD_NEXT) == umax)
-			{
-				decode_status = CELL_MUSIC_DECODE_STATUS_DORMANT;
-				return CELL_MUSIC_DECODE_ERROR_NO_MORE_CONTENT;
-			}
-
-			decoder.decode();
-			break;
-		}
-		default:
-		{
-			fmt::throw_exception("Unknown decode command %d", command);
-		}
-		}
-		return CELL_OK;
-	}
-
-	error_code finalize()
-	{
-		decoder.stop();
-		decode_status = CELL_MUSIC_DECODE_STATUS_DORMANT;
-		decode_command = CELL_MUSIC_DECODE_CMD_STOP;
-		read_pos = 0;
-		return CELL_OK;
-	}
 };
 
-struct music_decode2 : music_decode
+struct music_decode2
 {
-	s32 speed = CELL_MUSIC_DECODE2_SPEED_MAX;
+	vm::ptr<CellMusicDecode2Callback> func{};
+	vm::ptr<void> userData{};
+
+	shared_mutex mutex;
 };
 
-template <typename Music_Decode>
-error_code cell_music_decode_select_contents()
-{
-	auto& dec = g_fxo->get<Music_Decode>();
-
-	if (!dec.func)
-		return CELL_MUSIC_DECODE_ERROR_GENERIC;
-
-	const std::string vfs_dir_path = vfs::get("/dev_hdd0/music");
-	const std::string title = get_localized_string(localized_string_id::RSX_OVERLAYS_MEDIA_DIALOG_TITLE);
-
-	error_code error = rsx::overlays::show_media_list_dialog(rsx::overlays::media_list_dialog::media_type::audio, vfs_dir_path, title,
-		[&dec](s32 status, utils::media_info info)
-		{
-			sysutil_register_cb([&dec, info = std::move(info), status](ppu_thread& ppu) -> s32
-			{
-				std::lock_guard lock(dec.mutex);
-				const u32 result = status >= 0 ? u32{CELL_OK} : u32{CELL_MUSIC_DECODE_CANCELED};
-				if (result == CELL_OK)
-				{
-					// Let's always choose the whole directory for now
-					std::string track;
-					std::string dir = info.path;
-					if (fs::is_file(info.path))
-					{
-						track = std::move(dir);
-						dir = fs::get_parent_dir(track);
-					}
-
-					music_selection_context context{};
-					context.set_playlist(dir);
-					context.set_track(track);
-					// TODO: context.repeat_mode = CELL_SEARCH_REPEATMODE_NONE;
-					// TODO: context.context_option = CELL_SEARCH_CONTEXTOPTION_NONE;
-					dec.current_selection_context = std::move(context);
-					dec.current_selection_context.create_playlist(music_selection_context::get_next_hash());
-					cellMusicDecode.success("Media list dialog: selected entry '%s'", dec.current_selection_context.playlist.front());
-				}
-				else
-				{
-					cellMusicDecode.warning("Media list dialog was canceled");
-				}
-				dec.func(ppu, CELL_MUSIC_DECODE_EVENT_SELECT_CONTENTS_RESULT, vm::addr_t(result), dec.userData);
-				return CELL_OK;
-			});
-		});
-	return error;
-}
-
-template <typename Music_Decode>
-error_code cell_music_decode_read(vm::ptr<void> buf, vm::ptr<u32> startTime, u64 reqSize, vm::ptr<u64> readSize, vm::ptr<s32> position)
-{
-	if (!buf || !startTime || !position || !reqSize || !readSize)
-	{
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-	}
-
-	*position = CELL_MUSIC_DECODE_POSITION_NONE;
-	*readSize = 0;
-	*startTime = 0;
-
-	auto& dec = g_fxo->get<Music_Decode>();
-	std::lock_guard lock(dec.mutex);
-	std::scoped_lock slock(dec.decoder.m_mtx);
-
-	if (dec.decoder.has_error)
-	{
-		return CELL_MUSIC_DECODE_ERROR_DECODE_FAILURE;
-	}
-
-	if (dec.decoder.m_size == 0)
-	{
-		return CELL_MUSIC_DECODE_ERROR_NO_LPCM_DATA;
-	}
-
-	const u64 size_left = dec.decoder.m_size - dec.read_pos;
-
-	if (dec.read_pos == 0)
-	{
-		cellMusicDecode.trace("cell_music_decode_read: position=CELL_MUSIC_DECODE_POSITION_START, read_pos=%d, reqSize=%d, m_size=%d", dec.read_pos, reqSize, dec.decoder.m_size.load());
-		*position = CELL_MUSIC_DECODE_POSITION_START;
-	}
-	else if (!dec.decoder.track_fully_decoded || size_left > reqSize) // track_fully_decoded is not guarded by a mutex, but since it is set to true after the decode, it should be fine.
-	{
-		cellMusicDecode.trace("cell_music_decode_read: position=CELL_MUSIC_DECODE_POSITION_MID, read_pos=%d, reqSize=%d, m_size=%d", dec.read_pos, reqSize, dec.decoder.m_size.load());
-		*position = CELL_MUSIC_DECODE_POSITION_MID;
-	}
-	else
-	{
-		if (dec.decoder.set_next_index(true) == umax)
-		{
-			cellMusicDecode.trace("cell_music_decode_read: position=CELL_MUSIC_DECODE_POSITION_END_LIST_END, read_pos=%d, reqSize=%d, m_size=%d", dec.read_pos, reqSize, dec.decoder.m_size.load());
-			*position = CELL_MUSIC_DECODE_POSITION_END_LIST_END;
-		}
-		else
-		{
-			cellMusicDecode.trace("cell_music_decode_read: position=CELL_MUSIC_DECODE_POSITION_END, read_pos=%d, reqSize=%d, m_size=%d", dec.read_pos, reqSize, dec.decoder.m_size.load());
-			*position = CELL_MUSIC_DECODE_POSITION_END;
-		}
-	}
-
-	const u64 size_to_read = std::min(reqSize, size_left);
-	*readSize = size_to_read;
-
-	if (size_to_read == 0)
-	{
-		return CELL_MUSIC_DECODE_ERROR_NO_LPCM_DATA; // TODO: speculative
-	}
-
-	std::memcpy(buf.get_ptr(), &dec.decoder.data[dec.read_pos], size_to_read);
-
-	if (size_to_read < reqSize)
-	{
-		// Set the rest of the buffer to zero to prevent loud pops at the end of the stream if the game ignores the readSize.
-		std::memset(vm::static_ptr_cast<u8>(buf).get_ptr() + size_to_read, 0, reqSize - size_to_read);
-	}
-
-	dec.read_pos += size_to_read;
-
-	s64 start_time_ms = 0;
-
-	if (!dec.decoder.timestamps_ms.empty())
-	{
-		start_time_ms = dec.decoder.timestamps_ms.front().second;
-
-		while (dec.decoder.timestamps_ms.size() > 1 && dec.read_pos >= ::at32(dec.decoder.timestamps_ms, 1).first)
-		{
-			dec.decoder.timestamps_ms.pop_front();
-		}
-	}
-
-	*startTime = static_cast<u32>(start_time_ms); // startTime is milliseconds
-
-	switch (*position)
-	{
-	case CELL_MUSIC_DECODE_POSITION_END_LIST_END:
-	{
-		// Reset the decoder and the decode status
-		ensure(dec.set_decode_command(CELL_MUSIC_DECODE_CMD_STOP) == CELL_OK);
-		dec.read_pos = 0;
-		break;
-	}
-	case CELL_MUSIC_DECODE_POSITION_END:
-	{
-		dec.read_pos = 0;
-		dec.decoder.clear();
-		dec.decoder.track_fully_consumed = 1;
-		dec.decoder.track_fully_consumed.notify_one();
-		break;
-	}
-	default:
-	{
-		break;
-	}
-	}
-
-	cellMusicDecode.trace("cell_music_decode_read(size_to_read=%d, samples=%d, start_time_ms=%d)", size_to_read, size_to_read / sizeof(u64), start_time_ms);
-
-	return CELL_OK;
-}
-
 error_code cellMusicDecodeInitialize(s32 mode, u32 container, s32 spuPriority, vm::ptr<CellMusicDecodeCallback> func, vm::ptr<void> userData)
 {
-	cellMusicDecode.warning("cellMusicDecodeInitialize(mode=0x%x, container=0x%x, spuPriority=0x%x, func=*0x%x, userData=*0x%x)", mode, container, spuPriority, func, userData);
-
-	if (mode != CELL_MUSIC_DECODE2_MODE_NORMAL || (spuPriority - 0x10U > 0xef) || !func)
-	{
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-	}
+	cellMusicDecode.todo("cellMusicDecodeInitialize(mode=0x%x, container=0x%x, spuPriority=0x%x, func=*0x%x, userData=*0x%x)", mode, container, spuPriority, func, userData);
 
 	auto& dec = g_fxo->get<music_decode>();
-	std::lock_guard lock(dec.mutex);
 	dec.func = func;
 	dec.userData = userData;
 
-	sysutil_register_cb([&dec](ppu_thread& ppu) -> s32
+	sysutil_register_cb([=, &dec](ppu_thread& ppu) -> s32
 	{
-		dec.func(ppu, CELL_MUSIC_DECODE_EVENT_INITIALIZE_RESULT, vm::addr_t(CELL_OK), dec.userData);
+		dec.func(ppu, CELL_MUSIC_DECODE_EVENT_INITIALIZE_RESULT, vm::addr_t(CELL_OK), userData);
 		return CELL_OK;
 	});
 
@@ -309,21 +118,15 @@ error_code cellMusicDecodeInitialize(s32 mode, u32 container, s32 spuPriority, v
 
 error_code cellMusicDecodeInitializeSystemWorkload(s32 mode, u32 container, vm::ptr<CellMusicDecodeCallback> func, vm::ptr<void> userData, s32 spuUsageRate, vm::ptr<CellSpurs> spurs, vm::cptr<u8> priority, vm::cptr<struct CellSpursSystemWorkloadAttribute> attr)
 {
-	cellMusicDecode.warning("cellMusicDecodeInitializeSystemWorkload(mode=0x%x, container=0x%x, func=*0x%x, userData=*0x%x, spuUsageRate=0x%x, spurs=*0x%x, priority=*0x%x, attr=*0x%x)", mode, container, func, userData, spuUsageRate, spurs, priority, attr);
-
-	if (mode != CELL_MUSIC_DECODE2_MODE_NORMAL || !func || (spuUsageRate - 1U > 99) || !spurs || !priority)
-	{
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-	}
+	cellMusicDecode.todo("cellMusicDecodeInitializeSystemWorkload(mode=0x%x, container=0x%x, func=*0x%x, userData=*0x%x, spuUsageRate=0x%x, spurs=*0x%x, priority=*0x%x, attr=*0x%x)", mode, container, func, userData, spuUsageRate, spurs, priority, attr);
 
 	auto& dec = g_fxo->get<music_decode>();
-	std::lock_guard lock(dec.mutex);
 	dec.func = func;
 	dec.userData = userData;
 
-	sysutil_register_cb([&dec](ppu_thread& ppu) -> s32
+	sysutil_register_cb([=, &dec](ppu_thread& ppu) -> s32
 	{
-		dec.func(ppu, CELL_MUSIC_DECODE_EVENT_INITIALIZE_RESULT, vm::addr_t(CELL_OK), dec.userData);
+		dec.func(ppu, CELL_MUSIC_DECODE_EVENT_INITIALIZE_RESULT, vm::addr_t(CELL_OK), userData);
 		return CELL_OK;
 	});
 
@@ -335,12 +138,10 @@ error_code cellMusicDecodeFinalize()
 	cellMusicDecode.todo("cellMusicDecodeFinalize()");
 
 	auto& dec = g_fxo->get<music_decode>();
-	std::lock_guard lock(dec.mutex);
-	dec.finalize();
 
 	if (dec.func)
 	{
-		sysutil_register_cb([&dec](ppu_thread& ppu) -> s32
+		sysutil_register_cb([=, &dec](ppu_thread& ppu) -> s32
 		{
 			dec.func(ppu, CELL_MUSIC_DECODE_EVENT_FINALIZE_RESULT, vm::addr_t(CELL_OK), dec.userData);
 			return CELL_OK;
@@ -354,33 +155,32 @@ error_code cellMusicDecodeSelectContents()
 {
 	cellMusicDecode.todo("cellMusicDecodeSelectContents()");
 
-	return cell_music_decode_select_contents<music_decode>();
-}
-
-error_code cellMusicDecodeSetDecodeCommand(s32 command)
-{
-	cellMusicDecode.warning("cellMusicDecodeSetDecodeCommand(command=0x%x)", command);
-
-	if (command < CELL_MUSIC_DECODE_CMD_STOP || command > CELL_MUSIC_DECODE_CMD_PREV)
-	{
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-	}
-
 	auto& dec = g_fxo->get<music_decode>();
-	std::lock_guard lock(dec.mutex);
 
 	if (!dec.func)
 		return CELL_MUSIC_DECODE_ERROR_GENERIC;
 
-	error_code result = CELL_OK;
+	sysutil_register_cb([=, &dec](ppu_thread& ppu) -> s32
 	{
-		std::scoped_lock slock(dec.decoder.m_mtx);
-		result = dec.set_decode_command(command);
-	}
+		dec.func(ppu, CELL_MUSIC_DECODE_EVENT_SELECT_CONTENTS_RESULT, vm::addr_t(CELL_OK), dec.userData);
+		return CELL_OK;
+	});
 
-	sysutil_register_cb([&dec, result](ppu_thread& ppu) -> s32
+	return CELL_OK;
+}
+
+error_code cellMusicDecodeSetDecodeCommand(s32 command)
+{
+	cellMusicDecode.todo("cellMusicDecodeSetDecodeCommand(command=0x%x)", command);
+
+	auto& dec = g_fxo->get<music_decode>();
+
+	if (!dec.func)
+		return CELL_MUSIC_DECODE_ERROR_GENERIC;
+
+	sysutil_register_cb([=, &dec](ppu_thread& ppu) -> s32
 	{
-		dec.func(ppu, CELL_MUSIC_DECODE_EVENT_SET_DECODE_COMMAND_RESULT, vm::addr_t(s32{result}), dec.userData);
+		dec.func(ppu, CELL_MUSIC_DECODE_EVENT_SET_DECODE_COMMAND_RESULT, vm::addr_t(CELL_OK), dec.userData);
 		return CELL_OK;
 	});
 
@@ -390,38 +190,18 @@ error_code cellMusicDecodeSetDecodeCommand(s32 command)
 error_code cellMusicDecodeGetDecodeStatus(vm::ptr<s32> status)
 {
 	cellMusicDecode.todo("cellMusicDecodeGetDecodeStatus(status=*0x%x)", status);
-
-	if (!status)
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-
-	auto& dec = g_fxo->get<music_decode>();
-	std::lock_guard lock(dec.mutex);
-	*status = dec.decode_status;
-
-	cellMusicDecode.notice("cellMusicDecodeGetDecodeStatus: status=%d", *status);
 	return CELL_OK;
 }
 
 error_code cellMusicDecodeRead(vm::ptr<void> buf, vm::ptr<u32> startTime, u64 reqSize, vm::ptr<u64> readSize, vm::ptr<s32> position)
 {
-	cellMusicDecode.trace("cellMusicDecodeRead(buf=*0x%x, startTime=*0x%x, reqSize=0x%llx, readSize=*0x%x, position=*0x%x)", buf, startTime, reqSize, readSize, position);
-
-	return cell_music_decode_read<music_decode>(buf, startTime, reqSize, readSize, position);
+	cellMusicDecode.todo("cellMusicDecodeRead(buf=*0x%x, startTime=*0x%x, reqSize=0x%llx, readSize=*0x%x, position=*0x%x)", buf, startTime, reqSize, readSize, position);
+	return CELL_OK;
 }
 
 error_code cellMusicDecodeGetSelectionContext(vm::ptr<CellMusicSelectionContext> context)
 {
 	cellMusicDecode.todo("cellMusicDecodeGetSelectionContext(context=*0x%x)", context);
-
-	if (!context)
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-
-	auto& dec = g_fxo->get<music_decode>();
-	std::lock_guard lock(dec.mutex);
-
-	*context = dec.current_selection_context.get();
-	cellMusicDecode.warning("cellMusicDecodeGetSelectionContext: selection_context = %s", dec.current_selection_context.to_string());
-
 	return CELL_OK;
 }
 
@@ -429,23 +209,14 @@ error_code cellMusicDecodeSetSelectionContext(vm::ptr<CellMusicSelectionContext>
 {
 	cellMusicDecode.todo("cellMusicDecodeSetSelectionContext(context=*0x%x)", context);
 
-	if (!context)
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-
 	auto& dec = g_fxo->get<music_decode>();
-	std::lock_guard lock(dec.mutex);
 
 	if (!dec.func)
 		return CELL_MUSIC_DECODE_ERROR_GENERIC;
 
-	const bool result = dec.current_selection_context.set(*context);
-	if (result) cellMusicDecode.warning("cellMusicDecodeSetSelectionContext: new selection_context = %s", dec.current_selection_context.to_string());
-	else cellMusicDecode.error("cellMusicDecodeSetSelectionContext: failed. context = '%s'", music_selection_context::context_to_hex(*context));
-
-	sysutil_register_cb([&dec, result](ppu_thread& ppu) -> s32
+	sysutil_register_cb([=, &dec](ppu_thread& ppu) -> s32
 	{
-		const u32 status = result ? u32{CELL_OK} : u32{CELL_MUSIC_DECODE_ERROR_INVALID_CONTEXT};
-		dec.func(ppu, CELL_MUSIC_DECODE_EVENT_SET_SELECTION_CONTEXT_RESULT, vm::addr_t(status), dec.userData);
+		dec.func(ppu, CELL_MUSIC_DECODE_EVENT_SET_SELECTION_CONTEXT_RESULT, vm::addr_t(CELL_OK), dec.userData);
 		return CELL_OK;
 	});
 
@@ -455,60 +226,37 @@ error_code cellMusicDecodeSetSelectionContext(vm::ptr<CellMusicSelectionContext>
 error_code cellMusicDecodeGetContentsId(vm::ptr<CellSearchContentId> contents_id)
 {
 	cellMusicDecode.todo("cellMusicDecodeGetContentsId(contents_id=*0x%x)", contents_id);
-
-	if (!contents_id)
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-
-	// HACKY
-	auto& dec = g_fxo->get<music_decode>();
-	std::lock_guard lock(dec.mutex);
-	return dec.current_selection_context.find_content_id(contents_id);
+	return CELL_OK;
 }
 
-error_code cellMusicDecodeInitialize2(s32 mode, u32 container, s32 spuPriority, vm::ptr<CellMusicDecode2Callback> func, vm::ptr<void> userData, s32 speed, s32 bufSize)
+error_code cellMusicDecodeInitialize2(s32 mode, u32 container, s32 spuPriority, vm::ptr<CellMusicDecode2Callback> func, vm::ptr<void> userData, s32 speed, s32 bufsize)
 {
-	cellMusicDecode.warning("cellMusicDecodeInitialize2(mode=0x%x, container=0x%x, spuPriority=0x%x, func=*0x%x, userData=*0x%x, speed=0x%x, bufSize=0x%x)", mode, container, spuPriority, func, userData, speed, bufSize);
-
-	if (mode != CELL_MUSIC_DECODE2_MODE_NORMAL || (spuPriority - 0x10U > 0xef) ||
-		bufSize < CELL_MUSIC_DECODE2_MIN_BUFFER_SIZE || !func ||
-		(speed != CELL_MUSIC_DECODE2_SPEED_MAX && speed != CELL_MUSIC_DECODE2_SPEED_2))
-	{
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-	}
+	cellMusicDecode.todo("cellMusicDecodeInitialize2(mode=0x%x, container=0x%x, spuPriority=0x%x, func=*0x%x, userData=*0x%x, speed=0x%x, bufsize=0x%x)", mode, container, spuPriority, func, userData, speed, bufsize);
 
 	auto& dec = g_fxo->get<music_decode2>();
-	std::lock_guard lock(dec.mutex);
 	dec.func = func;
 	dec.userData = userData;
-	dec.speed = speed;
 
-	sysutil_register_cb([userData, &dec](ppu_thread& ppu) -> s32
+	sysutil_register_cb([=, &dec](ppu_thread& ppu) -> s32
 	{
-		dec.func(ppu, CELL_MUSIC_DECODE_EVENT_INITIALIZE_RESULT, vm::addr_t(CELL_OK), userData);
+		dec.func(ppu, CELL_MUSIC_DECODE2_EVENT_INITIALIZE_RESULT, vm::addr_t(CELL_OK), userData);
 		return CELL_OK;
 	});
 
 	return CELL_OK;
 }
 
-error_code cellMusicDecodeInitialize2SystemWorkload(s32 mode, u32 container, vm::ptr<CellMusicDecode2Callback> func, vm::ptr<void> userData, s32 spuUsageRate, s32 bufSize, vm::ptr<CellSpurs> spurs, vm::cptr<u8> priority, vm::cptr<CellSpursSystemWorkloadAttribute> attr)
+error_code cellMusicDecodeInitialize2SystemWorkload(s32 mode, u32 container, vm::ptr<CellMusicDecode2Callback> func, vm::ptr<void> userData, s32 spuUsageRate, s32 bufsize, vm::ptr<CellSpurs> spurs, vm::cptr<u8> priority, vm::cptr<CellSpursSystemWorkloadAttribute> attr)
 {
-	cellMusicDecode.warning("cellMusicDecodeInitialize2SystemWorkload(mode=0x%x, container=0x%x, func=*0x%x, userData=*0x%x, spuUsageRate=0x%x, bufSize=0x%x, spurs=*0x%x, priority=*0x%x, attr=*0x%x)", mode, container, func, userData, spuUsageRate, bufSize, spurs, priority, attr);
-
-	if (mode != CELL_MUSIC_DECODE2_MODE_NORMAL || !func || (spuUsageRate - 1U > 99) ||
-		bufSize < CELL_MUSIC_DECODE2_MIN_BUFFER_SIZE || !spurs || !priority)
-	{
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-	}
+	cellMusicDecode.todo("cellMusicDecodeInitialize2SystemWorkload(mode=0x%x, container=0x%x, func=*0x%x, userData=*0x%x, spuUsageRate=0x%x, bufsize=0x%x, spurs=*0x%x, priority=*0x%x, attr=*0x%x)", mode, container, func, userData, spuUsageRate, bufsize, spurs, priority, attr);
 
 	auto& dec = g_fxo->get<music_decode2>();
-	std::lock_guard lock(dec.mutex);
 	dec.func = func;
 	dec.userData = userData;
 
-	sysutil_register_cb([&dec](ppu_thread& ppu) -> s32
+	sysutil_register_cb([=, &dec](ppu_thread& ppu) -> s32
 	{
-		dec.func(ppu, CELL_MUSIC_DECODE_EVENT_INITIALIZE_RESULT, vm::addr_t(CELL_OK), dec.userData);
+		dec.func(ppu, CELL_MUSIC_DECODE2_EVENT_INITIALIZE_RESULT, vm::addr_t(CELL_OK), userData);
 		return CELL_OK;
 	});
 
@@ -520,14 +268,12 @@ error_code cellMusicDecodeFinalize2()
 	cellMusicDecode.todo("cellMusicDecodeFinalize2()");
 
 	auto& dec = g_fxo->get<music_decode2>();
-	std::lock_guard lock(dec.mutex);
-	dec.finalize();
 
 	if (dec.func)
 	{
-		sysutil_register_cb([&dec](ppu_thread& ppu) -> s32
+		sysutil_register_cb([=, &dec](ppu_thread& ppu) -> s32
 		{
-			dec.func(ppu, CELL_MUSIC_DECODE_EVENT_FINALIZE_RESULT, vm::addr_t(CELL_OK), dec.userData);
+			dec.func(ppu, CELL_MUSIC_DECODE2_EVENT_FINALIZE_RESULT, vm::addr_t(CELL_OK), dec.userData);
 			return CELL_OK;
 		});
 	}
@@ -539,33 +285,32 @@ error_code cellMusicDecodeSelectContents2()
 {
 	cellMusicDecode.todo("cellMusicDecodeSelectContents2()");
 
-	return cell_music_decode_select_contents<music_decode2>();
-}
-
-error_code cellMusicDecodeSetDecodeCommand2(s32 command)
-{
-	cellMusicDecode.warning("cellMusicDecodeSetDecodeCommand2(command=0x%x)", command);
-
-	if (command < CELL_MUSIC_DECODE_CMD_STOP || command > CELL_MUSIC_DECODE_CMD_PREV)
-	{
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-	}
-
 	auto& dec = g_fxo->get<music_decode2>();
-	std::lock_guard lock(dec.mutex);
 
 	if (!dec.func)
 		return CELL_MUSIC_DECODE_ERROR_GENERIC;
 
-	error_code result = CELL_OK;
+	sysutil_register_cb([=, &dec](ppu_thread& ppu) -> s32
 	{
-		std::scoped_lock slock(dec.decoder.m_mtx);
-		result = dec.set_decode_command(command);
-	}
+		dec.func(ppu, CELL_MUSIC_DECODE2_EVENT_SELECT_CONTENTS_RESULT, vm::addr_t(CELL_OK), dec.userData);
+		return CELL_OK;
+	});
 
-	sysutil_register_cb([&dec, result](ppu_thread& ppu) -> s32
+	return CELL_OK;
+}
+
+error_code cellMusicDecodeSetDecodeCommand2(s32 command)
+{
+	cellMusicDecode.todo("cellMusicDecodeSetDecodeCommand2(command=0x%x)", command);
+
+	auto& dec = g_fxo->get<music_decode2>();
+
+	if (!dec.func)
+		return CELL_MUSIC_DECODE_ERROR_GENERIC;
+
+	sysutil_register_cb([=, &dec](ppu_thread& ppu) -> s32
 	{
-		dec.func(ppu, CELL_MUSIC_DECODE_EVENT_SET_DECODE_COMMAND_RESULT, vm::addr_t(s32{result}), dec.userData);
+		dec.func(ppu, CELL_MUSIC_DECODE2_EVENT_SET_DECODE_COMMAND_RESULT, vm::addr_t(CELL_OK), dec.userData);
 		return CELL_OK;
 	});
 
@@ -575,38 +320,18 @@ error_code cellMusicDecodeSetDecodeCommand2(s32 command)
 error_code cellMusicDecodeGetDecodeStatus2(vm::ptr<s32> status)
 {
 	cellMusicDecode.todo("cellMusicDecodeGetDecodeStatus2(status=*0x%x)", status);
-
-	if (!status)
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-
-	auto& dec = g_fxo->get<music_decode2>();
-	std::lock_guard lock(dec.mutex);
-	*status = dec.decode_status;
-
-	cellMusicDecode.notice("cellMusicDecodeGetDecodeStatus2: status=%d", *status);
 	return CELL_OK;
 }
 
 error_code cellMusicDecodeRead2(vm::ptr<void> buf, vm::ptr<u32> startTime, u64 reqSize, vm::ptr<u64> readSize, vm::ptr<s32> position)
 {
-	cellMusicDecode.trace("cellMusicDecodeRead2(buf=*0x%x, startTime=*0x%x, reqSize=0x%llx, readSize=*0x%x, position=*0x%x)", buf, startTime, reqSize, readSize, position);
-
-	return cell_music_decode_read<music_decode2>(buf, startTime, reqSize, readSize, position);
+	cellMusicDecode.todo("cellMusicDecodeRead2(buf=*0x%x, startTime=*0x%x, reqSize=0x%llx, readSize=*0x%x, position=*0x%x)", buf, startTime, reqSize, readSize, position);
+	return CELL_OK;
 }
 
 error_code cellMusicDecodeGetSelectionContext2(vm::ptr<CellMusicSelectionContext> context)
 {
 	cellMusicDecode.todo("cellMusicDecodeGetSelectionContext2(context=*0x%x)", context);
-
-	if (!context)
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-
-	auto& dec = g_fxo->get<music_decode2>();
-	std::lock_guard lock(dec.mutex);
-
-	*context = dec.current_selection_context.get();
-	cellMusicDecode.warning("cellMusicDecodeGetSelectionContext2: selection context = %s)", dec.current_selection_context.to_string());
-
 	return CELL_OK;
 }
 
@@ -614,40 +339,24 @@ error_code cellMusicDecodeSetSelectionContext2(vm::ptr<CellMusicSelectionContext
 {
 	cellMusicDecode.todo("cellMusicDecodeSetSelectionContext2(context=*0x%x)", context);
 
-	if (!context)
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-
 	auto& dec = g_fxo->get<music_decode2>();
-	std::lock_guard lock(dec.mutex);
 
 	if (!dec.func)
 		return CELL_MUSIC_DECODE_ERROR_GENERIC;
 
-	const bool result = dec.current_selection_context.set(*context);
-	if (result) cellMusicDecode.warning("cellMusicDecodeSetSelectionContext2: new selection_context = %s", dec.current_selection_context.to_string());
-	else cellMusicDecode.error("cellMusicDecodeSetSelectionContext2: failed. context = '%s'", music_selection_context::context_to_hex(*context));
-
-	sysutil_register_cb([&dec, result](ppu_thread& ppu) -> s32
+	sysutil_register_cb([=, &dec](ppu_thread& ppu) -> s32
 	{
-		const u32 status = result ? u32{CELL_OK} : u32{CELL_MUSIC_DECODE_ERROR_INVALID_CONTEXT};
-		dec.func(ppu, CELL_MUSIC_DECODE_EVENT_SET_SELECTION_CONTEXT_RESULT, vm::addr_t(status), dec.userData);
+		dec.func(ppu, CELL_MUSIC_DECODE2_EVENT_SET_SELECTION_CONTEXT_RESULT, vm::addr_t(CELL_OK), dec.userData);
 		return CELL_OK;
 	});
 
 	return CELL_OK;
 }
 
-error_code cellMusicDecodeGetContentsId2(vm::ptr<CellSearchContentId> contents_id)
+error_code cellMusicDecodeGetContentsId2(vm::ptr<CellSearchContentId> contents_id )
 {
 	cellMusicDecode.todo("cellMusicDecodeGetContentsId2(contents_id=*0x%x)", contents_id);
-
-	if (!contents_id)
-		return CELL_MUSIC_DECODE_ERROR_PARAM;
-
-	// HACKY
-	auto& dec = g_fxo->get<music_decode2>();
-	std::lock_guard lock(dec.mutex);
-	return dec.current_selection_context.find_content_id(contents_id);
+	return CELL_OK;
 }
 
 
diff --git a/rpcs3/Emu/Cell/Modules/cellMusicDecode.h b/rpcs3/Emu/Cell/Modules/cellMusicDecode.h
deleted file mode 100644
index dace5ddf1a..0000000000
--- a/rpcs3/Emu/Cell/Modules/cellMusicDecode.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#pragma once
-
-// Return Codes (CELL_MUSIC_DECODE2 codes are omitted if they are identical)
-enum CellMusicDecodeError : u32
-{
-	CELL_MUSIC_DECODE_CANCELED                = 1,
-	CELL_MUSIC_DECODE_DECODE_FINISHED         = 0x8002C101,
-	CELL_MUSIC_DECODE_ERROR_PARAM             = 0x8002C102,
-	CELL_MUSIC_DECODE_ERROR_BUSY              = 0x8002C103,
-	CELL_MUSIC_DECODE_ERROR_NO_ACTIVE_CONTENT = 0x8002C104,
-	CELL_MUSIC_DECODE_ERROR_NO_MATCH_FOUND    = 0x8002C105,
-	CELL_MUSIC_DECODE_ERROR_INVALID_CONTEXT   = 0x8002C106,
-	CELL_MUSIC_DECODE_ERROR_DECODE_FAILURE    = 0x8002C107,
-	CELL_MUSIC_DECODE_ERROR_NO_MORE_CONTENT   = 0x8002C108,
-	CELL_MUSIC_DECODE_DIALOG_OPEN             = 0x8002C109,
-	CELL_MUSIC_DECODE_DIALOG_CLOSE            = 0x8002C10A,
-	CELL_MUSIC_DECODE_ERROR_NO_LPCM_DATA      = 0x8002C10B,
-	CELL_MUSIC_DECODE_NEXT_CONTENTS_READY     = 0x8002C10C,
-	CELL_MUSIC_DECODE_ERROR_GENERIC           = 0x8002C1FF,
-};
-
-// Constants (CELL_MUSIC_DECODE2 codes are omitted if they are identical)
-enum
-{
-	CELL_MUSIC_DECODE_EVENT_STATUS_NOTIFICATION = 0,
-	CELL_MUSIC_DECODE_EVENT_INITIALIZE_RESULT = 1,
-	CELL_MUSIC_DECODE_EVENT_FINALIZE_RESULT = 2,
-	CELL_MUSIC_DECODE_EVENT_SELECT_CONTENTS_RESULT = 3,
-	CELL_MUSIC_DECODE_EVENT_SET_DECODE_COMMAND_RESULT = 4,
-	CELL_MUSIC_DECODE_EVENT_SET_SELECTION_CONTEXT_RESULT = 5,
-	CELL_MUSIC_DECODE_EVENT_UI_NOTIFICATION = 6,
-	CELL_MUSIC_DECODE_EVENT_NEXT_CONTENTS_READY_RESULT = 7,
-
-	CELL_MUSIC_DECODE_MODE_NORMAL = 0,
-
-	CELL_MUSIC_DECODE_CMD_STOP  = 0,
-	CELL_MUSIC_DECODE_CMD_START = 1,
-	CELL_MUSIC_DECODE_CMD_NEXT  = 2,
-	CELL_MUSIC_DECODE_CMD_PREV  = 3,
-
-	CELL_MUSIC_DECODE_STATUS_DORMANT  = 0,
-	CELL_MUSIC_DECODE_STATUS_DECODING = 1,
-
-	CELL_MUSIC_DECODE_POSITION_NONE         = 0,
-	CELL_MUSIC_DECODE_POSITION_START        = 1,
-	CELL_MUSIC_DECODE_POSITION_MID          = 2,
-	CELL_MUSIC_DECODE_POSITION_END          = 3,
-	CELL_MUSIC_DECODE_POSITION_END_LIST_END = 4,
-
-	CELL_MUSIC_DECODE2_MODE_NORMAL = 0,
-
-	CELL_MUSIC_DECODE2_SPEED_MAX = 0,
-	CELL_MUSIC_DECODE2_SPEED_2   = 2,
-
-	CELL_SYSUTIL_MUSIC_DECODE2_INITIALIZING_FINISHED = 1,
-	CELL_SYSUTIL_MUSIC_DECODE2_SHUTDOWN_FINISHED     = 4, // 3(SDK103) -> 4(SDK110)
-	CELL_SYSUTIL_MUSIC_DECODE2_LOADING_FINISHED      = 5,
-	CELL_SYSUTIL_MUSIC_DECODE2_UNLOADING_FINISHED    = 7,
-	CELL_SYSUTIL_MUSIC_DECODE2_RELEASED              = 9,
-	CELL_SYSUTIL_MUSIC_DECODE2_GRABBED               = 11,
-
-	CELL_MUSIC_DECODE2_MIN_BUFFER_SIZE = 448 * 1024,
-	CELL_MUSIC_DECODE2_MANAGEMENT_SIZE = 64 * 1024,
-	CELL_MUSIC_DECODE2_PAGESIZE_64K    = 64 * 1024,
-	CELL_MUSIC_DECODE2_PAGESIZE_1M     = 1 * 1024 * 1024,
-};
-
-using CellMusicDecodeCallback = void(u32, vm::ptr<void> param, vm::ptr<void> userData);
-using CellMusicDecode2Callback = void(u32, vm::ptr<void> param, vm::ptr<void> userData);
diff --git a/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp b/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp
index c01d4b7a51..3bbc40b4bc 100644
--- a/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/IdManager.h"
-#include "Emu/VFS.h"
 #include "cellSysutil.h"
 
+
+
 LOG_CHANNEL(cellMusicExport);
 
 // Return Codes
@@ -44,15 +44,6 @@ void fmt_class_string<CellMusicExportError>::format(std::string& out, u64 arg)
 	});
 }
 
-enum
-{
-	CELL_MUSIC_EXPORT_UTIL_VERSION_CURRENT        = 0,
-	CELL_MUSIC_EXPORT_UTIL_HDD_PATH_MAX           = 1055,
-	CELL_MUSIC_EXPORT_UTIL_MUSIC_TITLE_MAX_LENGTH = 64,
-	CELL_MUSIC_EXPORT_UTIL_GAME_TITLE_MAX_LENGTH  = 64,
-	CELL_MUSIC_EXPORT_UTIL_GAME_COMMENT_MAX_SIZE  = 1024,
-};
-
 struct CellMusicExportSetParam
 {
 	vm::bptr<char> title;
@@ -60,100 +51,15 @@ struct CellMusicExportSetParam
 	vm::bptr<char> artist;
 	vm::bptr<char> genre;
 	vm::bptr<char> game_comment;
-	vm::bptr<char> reserved1;
+	vm::bptr<void> reserved1;
 	vm::bptr<void> reserved2;
 };
 
 using CellMusicExportUtilFinishCallback = void(s32 result, vm::ptr<void> userdata);
 
-struct music_export
-{
-	atomic_t<s32> progress = 0; // 0x0-0xFFFF for 0-100%
-};
-
-
-bool check_music_path(const std::string& file_path)
-{
-	if (file_path.size() >= CELL_MUSIC_EXPORT_UTIL_HDD_PATH_MAX)
-	{
-		return false;
-	}
-
-	for (char c : file_path)
-	{
-		if (!((c >= 'a' && c <= 'z') ||
-			  (c >= 'A' && c <= 'Z') ||
-			  (c >= '0' && c <= '9') ||
-			   c == '-' || c == '_' ||
-			   c == '/' || c == '.'))
-		{
-			return false;
-		}
-	}
-
-	if (!file_path.starts_with("/dev_hdd0"sv) &&
-		!file_path.starts_with("/dev_bdvd"sv) &&
-		!file_path.starts_with("/dev_hdd1"sv))
-	{
-		return false;
-	}
-
-	if (file_path.find(".."sv) != umax)
-	{
-		return false;
-	}
-
-	return true;
-}
-
-std::string get_available_music_path(const std::string& filename)
-{
-	const std::string music_dir = "/dev_hdd0/music/";
-	std::string dst_path = vfs::get(music_dir + filename);
-
-	// Do not overwrite existing files. Add a suffix instead.
-	for (u32 i = 0; fs::exists(dst_path); i++)
-	{
-		const std::string suffix = fmt::format("_%d", i);
-		std::string new_filename = filename;
-
-		if (const usz pos = new_filename.find_last_of('.'); pos != std::string::npos)
-		{
-			new_filename.insert(pos, suffix);
-		}
-		else
-		{
-			new_filename.append(suffix);
-		}
-
-		dst_path = vfs::get(music_dir + new_filename);
-	}
-
-	return dst_path;
-}
-
-
 error_code cellMusicExportInitialize(u32 version, u32 container, vm::ptr<CellMusicExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	cellMusicExport.warning("cellMusicExportInitialize(version=0x%x, container=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, container, funcFinish, userdata);
-
-	if (version != CELL_MUSIC_EXPORT_UTIL_VERSION_CURRENT)
-	{
-		return CELL_MUSIC_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	if (container != 0xfffffffe)
-	{
-		if (false) // TODO: Check if memory container size >= 0x300000
-		{
-			return CELL_MUSIC_EXPORT_UTIL_ERROR_PARAM;
-		}
-	}
-
-	if (!funcFinish)
-	{
-		return CELL_MUSIC_EXPORT_UTIL_ERROR_PARAM;
-	}
+	cellMusicExport.todo("cellMusicExportInitialize(version=0x%x, container=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, container, funcFinish, userdata);
 
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
@@ -166,17 +72,7 @@ error_code cellMusicExportInitialize(u32 version, u32 container, vm::ptr<CellMus
 
 error_code cellMusicExportInitialize2(u32 version, vm::ptr<CellMusicExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	cellMusicExport.notice("cellMusicExportInitialize2(version=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, funcFinish, userdata);
-
-	if (version != CELL_MUSIC_EXPORT_UTIL_VERSION_CURRENT)
-	{
-		return CELL_MUSIC_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	if (!funcFinish)
-	{
-		return CELL_MUSIC_EXPORT_UTIL_ERROR_PARAM;
-	}
+	cellMusicExport.todo("cellMusicExportInitialize2(version=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, funcFinish, userdata);
 
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
@@ -189,12 +85,7 @@ error_code cellMusicExportInitialize2(u32 version, vm::ptr<CellMusicExportUtilFi
 
 error_code cellMusicExportFinalize(vm::ptr<CellMusicExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	cellMusicExport.notice("cellMusicExportFinalize(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
-
-	if (!funcFinish)
-	{
-		return CELL_MUSIC_EXPORT_UTIL_ERROR_PARAM;
-	}
+	cellMusicExport.todo("cellMusicExportFinalize(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
 
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
@@ -209,69 +100,8 @@ error_code cellMusicExportFromFile(vm::cptr<char> srcHddDir, vm::cptr<char> srcH
 {
 	cellMusicExport.todo("cellMusicExportFromFile(srcHddDir=%s, srcHddFile=%s, param=*0x%x, funcFinish=*0x%x, userdata=*0x%x)", srcHddDir, srcHddFile, param, funcFinish, userdata);
 
-	if (!param || !funcFinish)
-	{
-		return CELL_MUSIC_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	// TODO: check param members ?
-
-	cellMusicExport.notice("cellMusicExportFromFile: param: title=%s, game_title=%s, artist=%s, genre=%s, game_comment=%s", param->title, param->game_title, param->artist, param->genre, param->game_comment);
-
-	const std::string file_path = fmt::format("%s/%s", srcHddDir.get_ptr(), srcHddFile.get_ptr());
-
-	if (!check_music_path(file_path))
-	{
-		return { CELL_MUSIC_EXPORT_UTIL_ERROR_PARAM, file_path };
-	}
-
-	std::string filename;
-
-	if (srcHddFile)
-	{
-		fmt::append(filename, "%s", srcHddFile.get_ptr());
-	}
-
-	if (filename.empty())
-	{
-		return { CELL_MUSIC_EXPORT_UTIL_ERROR_PARAM, "filename empty" };
-	}
-
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
-		auto& mexp = g_fxo->get<music_export>();
-		mexp.progress = 0; // 0%
-
-		const std::string src_path = vfs::get(file_path);
-		const std::string dst_path = get_available_music_path(filename);
-
-		cellMusicExport.notice("Copying file from '%s' to '%s'", file_path, dst_path);
-
-		// TODO: We ignore metadata for now
-
-		if (!fs::create_path(fs::get_parent_dir(dst_path)) || !fs::copy_file(src_path, dst_path, false))
-		{
-			// TODO: find out which error is used
-			cellMusicExport.error("Failed to copy file from '%s' to '%s' (%s)", src_path, dst_path, fs::g_tls_error);
-			funcFinish(ppu, CELL_MUSIC_EXPORT_UTIL_ERROR_MOVE, userdata);
-			return CELL_OK;
-		}
-
-		if (!file_path.starts_with("/dev_bdvd"sv))
-		{
-			cellMusicExport.notice("Removing file '%s'", src_path);
-
-			if (!fs::remove_file(src_path))
-			{
-				// TODO: find out if an error is used here
-				cellMusicExport.error("Failed to remove file '%s' (%s)", src_path, fs::g_tls_error);
-			}
-		}
-
-		// TODO: track progress during file copy
-
-		mexp.progress = 0xFFFF; // 100%
-
 		funcFinish(ppu, CELL_OK, userdata);
 		return CELL_OK;
 	});
@@ -283,18 +113,9 @@ error_code cellMusicExportProgress(vm::ptr<CellMusicExportUtilFinishCallback> fu
 {
 	cellMusicExport.todo("cellMusicExportProgress(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
 
-	if (!funcFinish)
-	{
-		return CELL_MUSIC_EXPORT_UTIL_ERROR_PARAM;
-	}
-
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
-		// Set the status as 0x0-0xFFFF (0-100%) depending on the copy status.
-		// Only the copy or move of the movie and metadata files is considered for the progress.
-		const auto& mexp = g_fxo->get<music_export>();
-
-		funcFinish(ppu, mexp.progress, userdata);
+		funcFinish(ppu, 0xFFFF, userdata);
 		return CELL_OK;
 	});
 
diff --git a/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp b/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp
deleted file mode 100644
index ae578d2329..0000000000
--- a/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-#include "stdafx.h"
-#include "cellMusic.h"
-#include "util/yaml.hpp"
-#include "Emu/VFS.h"
-
-#include <random>
-
-// This is just a helper and not a real cell entity
-
-LOG_CHANNEL(cellMusicSelectionContext);
-
-bool music_selection_context::set(const CellMusicSelectionContext& in)
-{
-	if (memcmp(in.data, magic, sizeof(magic)) != 0)
-	{
-		return false;
-	}
-
-	constexpr u32 pos = sizeof(magic);
-	hash = &in.data[pos];
-
-	return load_playlist();
-}
-
-CellMusicSelectionContext music_selection_context::get() const
-{
-	if (hash.size() + sizeof(magic) > CELL_MUSIC_SELECTION_CONTEXT_SIZE)
-	{
-		fmt::throw_exception("Contents of music_selection_context are too large");
-	}
-
-	CellMusicSelectionContext out{};
-	u32 pos = 0;
-
-	std::memset(out.data, 0, CELL_MUSIC_SELECTION_CONTEXT_SIZE);
-	std::memcpy(out.data, magic, sizeof(magic));
-	pos += sizeof(magic);
-	std::memcpy(&out.data[pos], hash.c_str(), hash.size());
-
-	return out;
-}
-
-std::string music_selection_context::to_string() const
-{
-	std::string str = fmt::format(".magic='%s', .content_type=%d, .repeat_mode=%d, .context_option=%d, .first_track=%d, .tracks=%d, .hash='%s', .playlist:",
-		magic, static_cast<u32>(content_type), static_cast<u32>(repeat_mode), static_cast<u32>(context_option), first_track, playlist.size(), hash);
-
-	for (usz i = 0; i < playlist.size(); i++)
-	{
-		fmt::append(str, "\n - Track %d: %s", i, ::at32(playlist, i));
-	}
-
-	return str;
-}
-
-std::string music_selection_context::get_next_hash()
-{
-	static u64 hash_counter = 0;
-	return fmt::format("music_selection_context_%d", hash_counter++);
-}
-
-std::string music_selection_context::context_to_hex(const CellMusicSelectionContext& context)
-{
-	std::string dahex;
-
-	for (usz i = 0; i < CELL_MUSIC_SELECTION_CONTEXT_SIZE; i++)
-	{
-		fmt::append(dahex, " %.2x", context.data[i]);
-	}
-
-	return dahex;
-}
-
-std::string music_selection_context::get_yaml_path() const
-{
-	std::string path = fs::get_cache_dir() + "cache/playlists/";
-
-	if (!fs::create_path(path))
-	{
-		cellMusicSelectionContext.fatal("get_yaml_path: Failed to create path: %s (%s)", path, fs::g_tls_error);
-	}
-
-	return path + hash + ".yml";
-}
-
-void music_selection_context::set_playlist(const std::string& path)
-{
-	playlist.clear();
-
-	const std::string dir_path = "/dev_hdd0/music";
-	const std::string vfs_dir_path = vfs::get("/dev_hdd0/music");
-
-	if (fs::is_dir(path))
-	{
-		content_type = CELL_SEARCH_CONTENTTYPE_MUSICLIST;
-
-		for (auto&& dir_entry : fs::dir{path})
-		{
-			if (dir_entry.name == "." || dir_entry.name == "..")
-			{
-				continue;
-			}
-
-			std::string track = dir_path + std::string(path + "/" + dir_entry.name).substr(vfs_dir_path.length());
-			cellMusicSelectionContext.notice("set_playlist: Adding track to playlist: '%s'. (path: '%s', name: '%s')", track, path, dir_entry.name);
-			playlist.push_back(std::move(track));
-		}
-	}
-	else
-	{
-		content_type = CELL_SEARCH_CONTENTTYPE_MUSIC;
-
-		std::string track = dir_path + path.substr(vfs_dir_path.length());
-		cellMusicSelectionContext.notice("set_playlist: Adding track to playlist: '%s'. (path: '%s')", track, path);
-		playlist.push_back(std::move(track));
-	}
-
-	valid = true;
-}
-
-void music_selection_context::create_playlist(const std::string& new_hash)
-{
-	hash = new_hash;
-
-	const std::string yaml_path = get_yaml_path();
-	cellMusicSelectionContext.notice("create_playlist: Saving music playlist file %s", yaml_path);
-
-	YAML::Emitter out;
-	out << YAML::BeginMap;
-	out << "Version" << target_version;
-	out << "FileType" << target_file_type;
-	out << "ContentType" << content_type;
-	out << "ContextOption" << context_option;
-	out << "RepeatMode" << repeat_mode;
-	out << "FirstTrack" << first_track;
-	out << "Tracks" << YAML::BeginSeq;
-
-	for (const std::string& track : playlist)
-	{
-		out << track;
-	}
-
-	out << YAML::EndSeq;
-	out << YAML::EndMap;
-
-	fs::pending_file file(yaml_path);
-
-	if (!file.file || file.file.write(out.c_str(), out.size()) < out.size() || !file.commit())
-	{
-		cellMusicSelectionContext.error("create_playlist: Failed to create music playlist file '%s' (error=%s)", yaml_path, fs::g_tls_error);
-	}
-}
-
-bool music_selection_context::load_playlist()
-{
-	playlist.clear();
-
-	const std::string path = get_yaml_path();
-	cellMusicSelectionContext.notice("load_playlist: Loading music playlist file '%s'", path);
-
-	std::string content;
-	{
-		// Load patch file
-		fs::file file{path};
-
-		if (!file)
-		{
-			cellMusicSelectionContext.error("load_playlist: Failed to load music playlist file '%s': %s", path, fs::g_tls_error);
-			return false;
-		}
-
-		content = file.to_string();
-	}
-
-	auto [root, error] = yaml_load(content);
-
-	if (!error.empty() || !root)
-	{
-		cellMusicSelectionContext.error("load_playlist: Failed to load music playlist file '%s':\n%s", path, error);
-		return false;
-	}
-
-	std::string err;
-
-	const std::string version = get_yaml_node_value<std::string>(root["Version"], err);
-	if (!err.empty())
-	{
-		cellMusicSelectionContext.error("load_playlist: No Version entry found. Error: '%s' (file: '%s')", err, path);
-		return false;
-	}
-
-	if (version != target_version)
-	{
-		cellMusicSelectionContext.error("load_playlist: Version '%s' does not match music playlist target '%s' (file: '%s')", version, target_version, path);
-		return false;
-	}
-
-	const std::string file_type = get_yaml_node_value<std::string>(root["FileType"], err);
-	if (!err.empty())
-	{
-		cellMusicSelectionContext.error("load_playlist: No FileType entry found. Error: '%s' (file: '%s')", err, path);
-		return false;
-	}
-
-	if (file_type != target_file_type)
-	{
-		cellMusicSelectionContext.error("load_playlist: FileType '%s' does not match music playlist target '%s' (file: '%s')", file_type, target_file_type, path);
-		return false;
-	}
-
-	content_type = static_cast<CellSearchContentType>(get_yaml_node_value<u32>(root["ContentType"], err));
-	if (!err.empty())
-	{
-		cellMusicSelectionContext.error("load_playlist: No ContentType entry found. Error: '%s' (file: '%s')", err, path);
-		return false;
-	}
-
-	context_option = static_cast<CellSearchContextOption>(get_yaml_node_value<u32>(root["ContextOption"], err));
-	if (!err.empty())
-	{
-		cellMusicSelectionContext.error("load_playlist: No ContextOption entry found. Error: '%s' (file: '%s')", err, path);
-		return false;
-	}
-
-	repeat_mode = static_cast<CellSearchRepeatMode>(get_yaml_node_value<u32>(root["RepeatMode"], err));
-	if (!err.empty())
-	{
-		cellMusicSelectionContext.error("load_playlist: No RepeatMode entry found. Error: '%s' (file: '%s')", err, path);
-		return false;
-	}
-
-	first_track = get_yaml_node_value<u32>(root["FirstTrack"], err);
-	if (!err.empty())
-	{
-		cellMusicSelectionContext.error("load_playlist: No FirstTrack entry found. Error: '%s' (file: '%s')", err, path);
-		return false;
-	}
-
-	const YAML::Node& track_node = root["Tracks"];
-
-	if (!track_node || track_node.Type() != YAML::NodeType::Sequence)
-	{
-		cellMusicSelectionContext.error("load_playlist: No Tracks entry found or Tracks is not a Sequence. (file: '%s')", path);
-		return false;
-	}
-
-	for (usz i = 0; i < track_node.size(); i++)
-	{
-		cellMusicSelectionContext.notice("load_playlist: Adding track to playlist: '%s'. (file: '%s')", track_node[i].Scalar(), path);
-		playlist.push_back(track_node[i].Scalar());
-	}
-
-	cellMusicSelectionContext.notice("load_playlist: Loaded music playlist file '%s' (context: %s)", path, to_string());
-	valid = true;
-	return true;
-}
-
-void music_selection_context::set_track(std::string_view track)
-{
-	if (track.empty()) return;
-
-	if (playlist.empty())
-	{
-		cellMusicSelectionContext.error("set_track: No tracks to play... (requested path='%s')", track);
-		return;
-	}
-
-	for (usz i = 0; i < playlist.size(); i++)
-	{
-		cellMusicSelectionContext.error("set_track: Comparing track '%s' vs '%s'", track, playlist[i]);
-		if (track.ends_with(playlist[i]))
-		{
-			first_track = current_track = static_cast<u32>(i);
-			return;
-		}
-	}
-
-	cellMusicSelectionContext.error("set_track: Track '%s' not found...", track);
-}
-
-u32 music_selection_context::step_track(bool next)
-{
-	if (playlist.empty())
-	{
-		cellMusicSelectionContext.error("step_track: No tracks to play...");
-		current_track = umax;
-		return umax;
-	}
-
-	switch (repeat_mode)
-	{
-	case CELL_SEARCH_REPEATMODE_NONE:
-	{
-		if (next)
-		{
-			// Try to play the next track.
-			if (++current_track >= playlist.size())
-			{
-				// We are at the end of the playlist.
-				cellMusicSelectionContext.notice("step_track: No more tracks to play in playlist...");
-				current_track = umax;
-				return umax;
-			}
-		}
-		else
-		{
-			// Try to play the previous track.
-			if (current_track == 0)
-			{
-				// We are at the start of the playlist.
-				cellMusicSelectionContext.notice("step_track: No more tracks to play in playlist...");
-				current_track = umax;
-				return umax;
-			}
-
-			current_track--;
-		}
-		break;
-	}
-	case CELL_SEARCH_REPEATMODE_REPEAT1:
-	{
-		// Keep decoding the same track.
-		break;
-	}
-	case CELL_SEARCH_REPEATMODE_ALL:
-	{
-		if (next)
-		{
-			// Play the next track. Start with the first track if we reached the end of the playlist.
-			current_track = (current_track + 1) % playlist.size();
-		}
-		else
-		{
-			// Play the previous track. Start with the last track if we reached the start of the playlist.
-			if (current_track == 0)
-			{
-				current_track = ::narrow<u32>(playlist.size() - 1);
-			}
-			else
-			{
-				current_track--;
-			}
-		}
-		break;
-	}
-	case CELL_SEARCH_REPEATMODE_NOREPEAT1:
-	{
-		// We are done. We only wanted to decode a single track.
-		cellMusicSelectionContext.notice("step_track: No more tracks to play...");
-		current_track = umax;
-		return umax;
-	}
-	default:
-	{
-		fmt::throw_exception("step_track: Unknown repeat mode %d", static_cast<u32>(repeat_mode));
-	}
-	}
-
-	if (context_option == CELL_SEARCH_CONTEXTOPTION_SHUFFLE && repeat_mode == CELL_SEARCH_REPEATMODE_ALL && playlist.size() > 1)
-	{
-		if (next ? current_track == 0 : current_track == (playlist.size() - 1))
-		{
-			// We reached the first or last track again. Let's shuffle!
-			cellMusicSelectionContext.notice("step_track: Shuffling playlist...");
-			auto engine = std::default_random_engine{};
-			std::shuffle(std::begin(playlist), std::end(playlist), engine);
-		}
-	}
-
-	return current_track;
-}
diff --git a/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp b/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp
index 97375c4e6d..fc6caa681b 100644
--- a/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp
@@ -2,6 +2,7 @@
 #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"
@@ -10,7 +11,6 @@
 #include "Utilities/StrUtil.h"
 
 #include "Emu/NP/np_handler.h"
-#include "Emu/NP/np_helpers.h"
 
 LOG_CHANNEL(cellNetCtl);
 
@@ -89,28 +89,11 @@ void fmt_class_string<CellNetCtlState>::format(std::string& out, u64 arg)
 	});
 }
 
-struct CellGameUpdateResult
-{
-	be_t<s32> status; // CellGameUpdateResultStatus
-	be_t<s32> error_code;
-	char app_ver[CELL_GAME_SYSP_APP_VER_SIZE];
-	char padding[2];
-};
-
-struct CellGameUpdateParam
-{
-	be_t<u32> size;
-	be_t<u32> cid;
-};
-
-using CellGameUpdateCallback = void(s32 status, s32 error_code, vm::ptr<void> userdata);
-using CellGameUpdateCallbackEx = void(vm::ptr<CellGameUpdateResult> result, vm::ptr<void> userdata);
-
 error_code cellNetCtlInit()
 {
 	cellNetCtl.warning("cellNetCtlInit()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (nph.is_netctl_init)
 	{
@@ -126,7 +109,7 @@ void cellNetCtlTerm()
 {
 	cellNetCtl.warning("cellNetCtlTerm()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	nph.is_netctl_init = false;
 }
@@ -135,7 +118,7 @@ error_code cellNetCtlGetState(vm::ptr<s32> state)
 {
 	cellNetCtl.trace("cellNetCtlGetState(state=*0x%x)", state);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_netctl_init)
 	{
@@ -156,7 +139,7 @@ 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);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_netctl_init)
 	{
@@ -175,7 +158,7 @@ error_code cellNetCtlDelHandler(s32 hid)
 {
 	cellNetCtl.todo("cellNetCtlDelHandler(hid=0x%x)", hid);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_netctl_init)
 	{
@@ -194,7 +177,7 @@ error_code cellNetCtlGetInfo(s32 code, vm::ptr<CellNetCtlInfo> info)
 {
 	cellNetCtl.warning("cellNetCtlGetInfo(code=0x%x (%s), info=*0x%x)", code, InfoCodeToName(code), info);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_netctl_init)
 	{
@@ -220,30 +203,18 @@ error_code cellNetCtlGetInfo(s32 code, vm::ptr<CellNetCtlInfo> info)
 	switch (code)
 	{
 	case CELL_NET_CTL_INFO_DEVICE: info->device = CELL_NET_CTL_DEVICE_WIRED; break;
+	// case CELL_NET_CTL_INFO_ETHER_ADDR: std::memset(info->ether_addr.data, 0xFF, sizeof(info->ether_addr.data)); break;
 	case CELL_NET_CTL_INFO_MTU: info->mtu = 1500; break;
 	case CELL_NET_CTL_INFO_LINK: info->link = CELL_NET_CTL_LINK_CONNECTED; break;
-	case CELL_NET_CTL_INFO_LINK_TYPE: info->link_type = CELL_NET_CTL_LINK_TYPE_100BASE_FULL; break;
-	// case CELL_NET_CTL_INFO_BSSID: break;
-	// case CELL_NET_CTL_INFO_SSID: break;
-	// case CELL_NET_CTL_INFO_WLAN_SECURITY: break;
-	// case CELL_NET_CTL_INFO_8021X_TYPE: break;
-	// case CELL_NET_CTL_INFO_8021X_AUTH_NAME: break;
-	case CELL_NET_CTL_INFO_RSSI: info->rssi = 100; break; // wireless: value ranges from 0-100 indicating wireless connection strength
-	case CELL_NET_CTL_INFO_CHANNEL: info->channel = 1; break; // wireless: channel used to connect to the AP?
+	case CELL_NET_CTL_INFO_LINK_TYPE: info->link_type = CELL_NET_CTL_LINK_TYPE_10BASE_FULL; break;
 	case CELL_NET_CTL_INFO_IP_CONFIG: info->ip_config = CELL_NET_CTL_IP_STATIC; break;
-	case CELL_NET_CTL_INFO_DHCP_HOSTNAME: strcpy_trunc(info->dhcp_hostname, nph.get_hostname()); break;
-	// case CELL_NET_CTL_INFO_PPPOE_AUTH_NAME: break;
-	case CELL_NET_CTL_INFO_IP_ADDRESS: strcpy_trunc(info->ip_address, np::ip_to_string(nph.get_local_ip_addr())); break; // verified on HW
-	case CELL_NET_CTL_INFO_NETMASK: strcpy_trunc(info->netmask, "255.255.255.0"); break;
 	case CELL_NET_CTL_INFO_DEFAULT_ROUTE: strcpy_trunc(info->default_route, "192.168.1.1"); break;
-	case CELL_NET_CTL_INFO_PRIMARY_DNS: strcpy_trunc(info->primary_dns, np::ip_to_string(nph.get_dns_ip())); break;
-	case CELL_NET_CTL_INFO_SECONDARY_DNS: strcpy_trunc(info->secondary_dns, np::ip_to_string(nph.get_dns_ip())); break;
+	case CELL_NET_CTL_INFO_PRIMARY_DNS: strcpy_trunc(info->primary_dns, np_handler::ip_to_string(nph.get_dns_ip())); break;
+	case CELL_NET_CTL_INFO_SECONDARY_DNS: strcpy_trunc(info->secondary_dns, np_handler::ip_to_string(nph.get_dns_ip())); break;
+	case CELL_NET_CTL_INFO_IP_ADDRESS: strcpy_trunc(info->ip_address, np_handler::ip_to_string(nph.get_local_ip_addr())); break;
+	case CELL_NET_CTL_INFO_NETMASK: strcpy_trunc(info->netmask, "255.255.255.255"); break;
 	case CELL_NET_CTL_INFO_HTTP_PROXY_CONFIG: info->http_proxy_config = 0; break;
-	// case CELL_NET_CTL_INFO_HTTP_PROXY_SERVER: break;
-	// case CELL_NET_CTL_INFO_HTTP_PROXY_PORT: break;
-	case CELL_NET_CTL_INFO_UPNP_CONFIG: info->upnp_config = (nph.get_upnp_status() == SCE_NP_SIGNALING_NETINFO_UPNP_STATUS_VALID) ? CELL_NET_CTL_UPNP_ON : CELL_NET_CTL_UPNP_OFF; break;
-	// case CELL_NET_CTL_INFO_RESERVED1: break;
-	// case CELL_NET_CTL_INFO_RESERVED2: break;
+	case CELL_NET_CTL_INFO_DHCP_HOSTNAME: strcpy_trunc(info->dhcp_hostname, nph.get_hostname()); break;
 	default: cellNetCtl.error("Unsupported request: %s", InfoCodeToName(code)); break;
 	}
 
@@ -265,9 +236,9 @@ struct netstart_hack
 
 error_code cellNetCtlNetStartDialogLoadAsync(vm::cptr<CellNetCtlNetStartDialogParam> param)
 {
-	cellNetCtl.warning("cellNetCtlNetStartDialogLoadAsync(param=*0x%x)", param);
+	cellNetCtl.error("cellNetCtlNetStartDialogLoadAsync(param=*0x%x)", param);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_netctl_init)
 	{
@@ -299,7 +270,7 @@ error_code cellNetCtlNetStartDialogAbortAsync()
 {
 	cellNetCtl.error("cellNetCtlNetStartDialogAbortAsync()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_netctl_init)
 	{
@@ -313,7 +284,7 @@ error_code cellNetCtlNetStartDialogUnloadAsync(vm::ptr<CellNetCtlNetStartDialogR
 {
 	cellNetCtl.warning("cellNetCtlNetStartDialogUnloadAsync(result=*0x%x)", result);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_netctl_init)
 	{
@@ -340,7 +311,7 @@ error_code cellNetCtlGetNatInfo(vm::ptr<CellNetCtlNatInfo> natInfo)
 {
 	cellNetCtl.warning("cellNetCtlGetNatInfo(natInfo=*0x%x)", natInfo);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_netctl_init)
 	{
@@ -359,7 +330,7 @@ error_code cellNetCtlGetNatInfo(vm::ptr<CellNetCtlNatInfo> natInfo)
 
 	natInfo->nat_type = CELL_NET_CTL_NATINFO_NAT_TYPE_2;
 	natInfo->stun_status = CELL_NET_CTL_NATINFO_STUN_OK;
-	natInfo->upnp_status = nph.get_upnp_status();
+	natInfo->upnp_status = CELL_NET_CTL_NATINFO_UPNP_NO;
 
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/Cell/Modules/cellNetCtl.h b/rpcs3/Emu/Cell/Modules/cellNetCtl.h
index b5f031a088..7b4cf807e0 100644
--- a/rpcs3/Emu/Cell/Modules/cellNetCtl.h
+++ b/rpcs3/Emu/Cell/Modules/cellNetCtl.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "cellGame.h"
+
 #include "Emu/Memory/vm_ptr.h"
 
 // Error Codes
@@ -333,3 +335,20 @@ enum
 	CELL_GAMEUPDATE_RESULT_STATUS_ABORTED              = 6,
 	CELL_GAMEUPDATE_RESULT_STATUS_SYSTEM_UPDATE_NEEDED = 7
 };
+
+struct CellGameUpdateResult
+{
+	be_t<s32> status; // CellGameUpdateResultStatus
+	be_t<s32> error_code;
+	char app_ver[CELL_GAME_SYSP_APP_VER_SIZE];
+	char padding[2];
+};
+
+struct CellGameUpdateParam
+{
+	be_t<u32> size;
+	be_t<u32> cid;
+};
+
+using CellGameUpdateCallback = void(s32 status, s32 error_code, vm::ptr<void> userdata);
+using CellGameUpdateCallbackEx = void(vm::ptr<CellGameUpdateResult> result, vm::ptr<void> userdata);
diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
index 5b2c45e99c..2a8c46c40d 100644
--- a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
@@ -1,17 +1,16 @@
 #include "stdafx.h"
 #include "Emu/System.h"
+#include "Emu/system_config.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Io/interception.h"
-#include "Emu/Io/Keyboard.h"
-#include "Emu/IdManager.h"
-
-#include "Emu/RSX/Overlays/overlay_manager.h"
 #include "Emu/RSX/Overlays/overlay_osk.h"
+#include "Emu/IdManager.h"
 
 #include "cellSysutil.h"
 #include "cellOskDialog.h"
 #include "cellMsgDialog.h"
-#include "cellImeJp.h"
+
+#include "util/init_mutex.hpp"
 
 #include <thread>
 
@@ -34,93 +33,25 @@ void fmt_class_string<CellOskDialogError>::format(std::string& out, u64 arg)
 	});
 }
 
-template<>
-void fmt_class_string<CellOskDialogContinuousMode>::format(std::string& out, u64 arg)
+OskDialogBase::~OskDialogBase()
 {
-	format_enum(out, arg, [](auto mode)
-	{
-		switch (mode)
-		{
-			STR_CASE(CELL_OSKDIALOG_CONTINUOUS_MODE_NONE);
-			STR_CASE(CELL_OSKDIALOG_CONTINUOUS_MODE_REMAIN_OPEN);
-			STR_CASE(CELL_OSKDIALOG_CONTINUOUS_MODE_HIDE);
-			STR_CASE(CELL_OSKDIALOG_CONTINUOUS_MODE_SHOW);
-		}
-
-		return unknown;
-	});
 }
 
-void osk_info::reset()
+struct osk_info
 {
-	std::lock_guard lock(text_mtx);
+	std::shared_ptr<OskDialogBase> dlg;
 
-	dlg.reset();
-	valid_text = {};
-	use_separate_windows = false;
-	lock_ext_input_device = false;
-	device_mask = 0;
-	input_field_window_width = 0;
-	input_field_background_transparency = 1.0f;
-	input_field_layout_info = {};
-	input_panel_layout_info = {};
-	key_layout_options = CELL_OSKDIALOG_10KEY_PANEL;
-	initial_key_layout = CELL_OSKDIALOG_INITIAL_PANEL_LAYOUT_SYSTEM;
-	initial_input_device = CELL_OSKDIALOG_INPUT_DEVICE_PAD;
-	clipboard_enabled = false;
-	half_byte_kana_enabled = false;
-	supported_languages = 0;
-	dimmer_enabled = true;
-	base_color = OskDialogBase::color{ 0.2f, 0.2f, 0.2f, 1.0f };
-	pointer_enabled = false;
-	pointer_x = 0.0f;
-	pointer_y = 0.0f;
-	initial_scale = 1.0f;
-	layout = {};
-	osk_continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_NONE;
-	last_dialog_state = CELL_SYSUTIL_OSKDIALOG_UNLOADED;
-	osk_confirm_callback.store({});
-	osk_force_finish_callback.store({});
-	osk_hardware_keyboard_event_hook_callback.store({});
-	hook_event_mode.store(0);
-}
+	atomic_t<bool> use_separate_windows = false;
 
-// Align horizontally
-u32 osk_info::get_aligned_x(u32 layout_mode)
-{
-	// Let's prefer a centered alignment.
-	if (layout_mode & CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_CENTER)
-	{
-		return CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_CENTER;
-	}
+	atomic_t<CellOskDialogContinuousMode> osk_continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_NONE;
 
-	if (layout_mode & CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT)
-	{
-		return CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT;
-	}
+	atomic_t<vm::ptr<cellOskDialogConfirmWordFilterCallback>> osk_confirm_callback{};
 
-	return CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_RIGHT;
-}
-
-// Align vertically
-u32 osk_info::get_aligned_y(u32 layout_mode)
-{
-	// Let's prefer a centered alignment.
-	if (layout_mode & CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_CENTER)
-	{
-		return CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_CENTER;
-	}
-
-	if (layout_mode & CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP)
-	{
-		return CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
-	}
-
-	return CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_BOTTOM;
-}
+	stx::init_mutex init;
+};
 
 // TODO: don't use this function
-std::shared_ptr<OskDialogBase> _get_osk_dialog(bool create)
+std::shared_ptr<OskDialogBase> _get_osk_dialog(bool create = false)
 {
 	auto& osk = g_fxo->get<osk_info>();
 
@@ -145,78 +76,19 @@ std::shared_ptr<OskDialogBase> _get_osk_dialog(bool create)
 
 		return osk.dlg;
 	}
-
-	const auto init = osk.init.access();
-
-	if (!init)
+	else
 	{
-		return nullptr;
-	}
+		const auto init = osk.init.access();
 
-	return osk.dlg;
-}
-
-extern bool close_osk_from_ps_button()
-{
-	const auto osk = _get_osk_dialog(false);
-	if (!osk)
-	{
-		// The OSK is not open
-		return true;
-	}
-
-	osk_info& info = g_fxo->get<osk_info>();
-
-	// We can only close the osk in separate window mode when it is hidden (continuous_mode is set to CELL_OSKDIALOG_CONTINUOUS_MODE_HIDE)
-	if (!info.use_separate_windows || osk->continuous_mode != CELL_OSKDIALOG_CONTINUOUS_MODE_HIDE)
-	{
-		cellOskDialog.warning("close_osk_from_ps_button: can't close OSK (use_separate_windows=%d, continuous_mode=%s)", info.use_separate_windows.load(), osk->continuous_mode.load());
-		return false;
-	}
-
-	std::lock_guard lock(info.text_mtx);
-
-	if (auto cb = info.osk_force_finish_callback.load())
-	{
-		bool done = false;
-		bool close_osk = false;
-
-		sysutil_register_cb([&](ppu_thread& cb_ppu) -> s32
+		if (!init)
 		{
-			cellOskDialog.notice("osk_force_finish_callback()");
-			close_osk = cb(cb_ppu);
-			cellOskDialog.notice("osk_force_finish_callback returned %d", close_osk);
-			done = true;
-			return 0;
-		});
-
-		// wait for check callback
-		while (!done && !Emu.IsStopped())
-		{
-			std::this_thread::yield();
+			return nullptr;
 		}
 
-		if (!close_osk)
-		{
-			// We are not allowed to close the OSK
-			cellOskDialog.warning("close_osk_from_ps_button: can't close OSK (osk_force_finish_callback returned false)");
-			return false;
-		}
+		return osk.dlg;
 	}
-
-	// Forcefully terminate the OSK
-	cellOskDialog.warning("close_osk_from_ps_button: Terminating the OSK ...");
-
-	osk->Close(FAKE_CELL_OSKDIALOG_CLOSE_TERMINATE);
-	osk->state = OskDialogState::Closed;
-
-	cellOskDialog.notice("close_osk_from_ps_button: sending CELL_SYSUTIL_OSKDIALOG_FINISHED");
-	sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_FINISHED, 0);
-
-	return true;
 }
 
-
 error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dialogParam, vm::ptr<CellOskDialogInputFieldInfo> inputFieldInfo)
 {
 	cellOskDialog.warning("cellOskDialogLoadAsync(container=0x%x, dialogParam=*0x%x, inputFieldInfo=*0x%x)", container, dialogParam, inputFieldInfo);
@@ -226,41 +98,31 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
 		return CELL_OSKDIALOG_ERROR_PARAM;
 	}
 
-	cellOskDialog.notice("cellOskDialogLoadAsync: dialogParam={ allowOskPanelFlg=0x%x, prohibitFlgs=0x%x, firstViewPanel=%d, controlPoint=(%.2f,%.2f) }",
-		dialogParam->allowOskPanelFlg, dialogParam->prohibitFlgs, dialogParam->firstViewPanel, dialogParam->controlPoint.x, dialogParam->controlPoint.y);
-
 	auto osk = _get_osk_dialog(true);
 
 	// Can't open another dialog if this one is already open.
-	if (!osk || osk->state.load() != OskDialogState::Unloaded)
+	if (!osk || osk->state.load() == OskDialogState::Open)
 	{
 		return CELL_SYSUTIL_ERROR_BUSY;
 	}
 
 	// Get the OSK options
-	auto& info = g_fxo->get<osk_info>();
 	u32 maxLength = (inputFieldInfo->limit_length >= CELL_OSKDIALOG_STRING_SIZE) ? 511 : u32{inputFieldInfo->limit_length};
 	const u32 prohibitFlgs = dialogParam->prohibitFlgs;
 	const u32 allowOskPanelFlg = dialogParam->allowOskPanelFlg;
 	const u32 firstViewPanel = dialogParam->firstViewPanel;
-	info.layout.x_offset = dialogParam->controlPoint.x;
-	info.layout.y_offset = dialogParam->controlPoint.y;
 
 	// Get init text and prepare return value
 	osk->osk_input_result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_OK;
-	osk->osk_text = {};
-
-	// Also clear the info text just to be sure (it should be zeroed at this point anyway)
-	{
-		std::lock_guard lock(info.text_mtx);
-		info.valid_text = {};
-	}
+	std::memset(osk->osk_text, 0, sizeof(osk->osk_text));
+	std::memset(osk->osk_text_old, 0, sizeof(osk->osk_text_old));
 
 	if (inputFieldInfo->init_text)
 	{
 		for (u32 i = 0; (i < maxLength) && (inputFieldInfo->init_text[i] != 0); i++)
 		{
 			osk->osk_text[i] = inputFieldInfo->init_text[i];
+			osk->osk_text_old[i] = inputFieldInfo->init_text[i];
 		}
 	}
 
@@ -276,30 +138,37 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
 		}
 	}
 
-	osk->on_osk_close = [](s32 status)
-	{
-		cellOskDialog.notice("on_osk_close(status=%d)", status);
+	atomic_t<bool> result = false;
 
-		const auto osk = _get_osk_dialog(false);
-		if (!osk)
+	osk->on_osk_close = [wptr = std::weak_ptr<OskDialogBase>(osk)](s32 status)
+	{
+		const auto osk = wptr.lock();
+
+		if (osk->state.atomic_op([&](OskDialogState& state)
 		{
+			if (state == OskDialogState::Abort)
+			{
+				return true;
+			}
+
+			state = OskDialogState::Close;
+			return false;
+		}))
+		{
+			input::SetIntercepted(false);
+			sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_FINISHED, 0);
 			return;
 		}
 
-		osk->state = OskDialogState::Closed;
+		const bool accepted = status == CELL_MSGDIALOG_BUTTON_OK;
 
-		auto& info = g_fxo->get<osk_info>();
-
-		const bool keep_seperate_window_open = info.use_separate_windows.load() && (info.osk_continuous_mode.load() != CELL_OSKDIALOG_CONTINUOUS_MODE_NONE);
-
-		switch (status)
+		if (accepted)
 		{
-		case CELL_OSKDIALOG_CLOSE_CONFIRM:
-		{
-			if (auto ccb = info.osk_confirm_callback.load())
+			if (auto ccb = g_fxo->get<osk_info>().osk_confirm_callback.exchange({}))
 			{
-				std::vector<u16> string_to_send(CELL_OSKDIALOG_STRING_SIZE);
+				vm::ptr<u16> string_to_send = vm::cast(vm::alloc(CELL_OSKDIALOG_STRING_SIZE * 2, vm::main));
 				atomic_t<bool> done = false;
+				u32 return_value;
 				u32 i;
 
 				for (i = 0; i < CELL_OSKDIALOG_STRING_SIZE - 1; i++)
@@ -308,16 +177,14 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
 					if (osk->osk_text[i] == 0) break;
 				}
 
-				sysutil_register_cb([&, length = i, string_to_send = std::move(string_to_send)](ppu_thread& cb_ppu) -> s32
+				sysutil_register_cb([&, length = i](ppu_thread& cb_ppu) -> s32
 				{
-					vm::var<u16[], vm::page_allocator<>> string_var(CELL_OSKDIALOG_STRING_SIZE, string_to_send.data());
-
-					const u32 return_value = ccb(cb_ppu, string_var.begin(), static_cast<s32>(length));
+					return_value = ccb(cb_ppu, string_to_send, static_cast<s32>(length));
 					cellOskDialog.warning("osk_confirm_callback return_value=%d", return_value);
 
 					for (u32 i = 0; i < CELL_OSKDIALOG_STRING_SIZE - 1; i++)
 					{
-						osk->osk_text[i] = string_var.begin()[i];
+						osk->osk_text[i] = string_to_send[i];
 					}
 
 					done = true;
@@ -331,319 +198,73 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
 				}
 			}
 
-			if (info.use_separate_windows.load() && osk->osk_text[0] == 0)
+			if (g_fxo->get<osk_info>().use_separate_windows.load() && osk->osk_text[0] == 0)
 			{
-				cellOskDialog.warning("on_osk_close: input result is CELL_OSKDIALOG_INPUT_FIELD_RESULT_NO_INPUT_TEXT");
+				cellOskDialog.warning("cellOskDialogLoadAsync: input result is CELL_OSKDIALOG_INPUT_FIELD_RESULT_NO_INPUT_TEXT");
 				osk->osk_input_result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_NO_INPUT_TEXT;
 			}
 			else
 			{
 				osk->osk_input_result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_OK;
 			}
-			break;
 		}
-		case CELL_OSKDIALOG_CLOSE_CANCEL:
+		else
 		{
 			osk->osk_input_result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_CANCELED;
-			break;
-		}
-		case FAKE_CELL_OSKDIALOG_CLOSE_ABORT:
-		{
-			osk->osk_input_result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_ABORT;
-			break;
-		}
-		default:
-		{
-			cellOskDialog.fatal("on_osk_close: Unknown status (%d)", status);
-			break;
-		}
 		}
 
 		// Send OSK status
-		if (keep_seperate_window_open)
+		if (g_fxo->get<osk_info>().use_separate_windows.load() && (g_fxo->get<osk_info>().osk_continuous_mode.load() != CELL_OSKDIALOG_CONTINUOUS_MODE_NONE))
 		{
-			switch (status)
+			if (accepted)
 			{
-			case CELL_OSKDIALOG_CLOSE_CONFIRM:
-			{
-				info.last_dialog_state = CELL_SYSUTIL_OSKDIALOG_INPUT_ENTERED;
-
-				cellOskDialog.notice("on_osk_close: sending CELL_SYSUTIL_OSKDIALOG_INPUT_ENTERED");
 				sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_INPUT_ENTERED, 0);
-				break;
 			}
-			case CELL_OSKDIALOG_CLOSE_CANCEL:
+			else
 			{
-				info.last_dialog_state = CELL_SYSUTIL_OSKDIALOG_INPUT_CANCELED;
-
-				cellOskDialog.notice("on_osk_close: sending CELL_SYSUTIL_OSKDIALOG_INPUT_CANCELED");
 				sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_INPUT_CANCELED, 0);
-				break;
-			}
-			case FAKE_CELL_OSKDIALOG_CLOSE_ABORT:
-			{
-				// Handled in cellOskDialogAbort
-				break;
-			}
-			default:
-			{
-				cellOskDialog.fatal("on_osk_close: Unknown status (%d)", status);
-				break;
-			}
 			}
 		}
-		else if (status != FAKE_CELL_OSKDIALOG_CLOSE_ABORT) // Handled in cellOskDialogAbort
+		else
 		{
-			info.last_dialog_state = CELL_SYSUTIL_OSKDIALOG_FINISHED;
-
-			cellOskDialog.notice("on_osk_close: sending CELL_SYSUTIL_OSKDIALOG_FINISHED");
 			sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_FINISHED, 0);
 		}
 
-		// The interception status of the continuous separate window is handled differently
-		if (!keep_seperate_window_open)
+		input::SetIntercepted(false);
+	};
+
+	osk->on_osk_input_entered = [wptr = std::weak_ptr<OskDialogBase>(osk)]()
+	{
+		const auto osk = wptr.lock();
+
+		if (g_fxo->get<osk_info>().use_separate_windows.load())
 		{
-			input::SetIntercepted(false);
+			sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_INPUT_ENTERED, 0);
 		}
 	};
 
-	// Set key callback
-	osk->on_osk_key_input_entered = [](CellOskDialogKeyMessage key_message)
+	input::SetIntercepted(true);
+
+	Emu.CallAfter([=, &result]()
 	{
-		auto& info = g_fxo->get<osk_info>();
-		std::lock_guard lock(info.text_mtx);
-		auto event_hook_callback = info.osk_hardware_keyboard_event_hook_callback.load();
-
-		cellOskDialog.notice("on_osk_key_input_entered: led=%d, mkey=%d, keycode=%d, hook_event_mode=%d, event_hook_callback=*0x%x", key_message.led, key_message.mkey, key_message.keycode, info.hook_event_mode.load(), event_hook_callback);
-
-		const auto osk = _get_osk_dialog(false);
-
-		if (!osk || !event_hook_callback)
-		{
-			// Nothing to do here
-			return;
-		}
-
-		bool is_hook_key = false;
-
-		switch (key_message.keycode)
-		{
-		case CELL_KEYC_NO_EVENT:
-		{
-			// Any shift/alt/ctrl key
-			is_hook_key = key_message.mkey > 0 && (info.hook_event_mode & CELL_OSKDIALOG_EVENT_HOOK_TYPE_ONLY_MODIFIER);
-			break;
-		}
-		case CELL_KEYC_E_ROLLOVER:
-		case CELL_KEYC_E_POSTFAIL:
-		case CELL_KEYC_E_UNDEF:
-		case CELL_KEYC_ESCAPE:
-		case CELL_KEYC_106_KANJI:
-		case CELL_KEYC_CAPS_LOCK:
-		case CELL_KEYC_F1:
-		case CELL_KEYC_F2:
-		case CELL_KEYC_F3:
-		case CELL_KEYC_F4:
-		case CELL_KEYC_F5:
-		case CELL_KEYC_F6:
-		case CELL_KEYC_F7:
-		case CELL_KEYC_F8:
-		case CELL_KEYC_F9:
-		case CELL_KEYC_F10:
-		case CELL_KEYC_F11:
-		case CELL_KEYC_F12:
-		case CELL_KEYC_PRINTSCREEN:
-		case CELL_KEYC_SCROLL_LOCK:
-		case CELL_KEYC_PAUSE:
-		case CELL_KEYC_INSERT:
-		case CELL_KEYC_HOME:
-		case CELL_KEYC_PAGE_UP:
-		case CELL_KEYC_DELETE:
-		case CELL_KEYC_END:
-		case CELL_KEYC_PAGE_DOWN:
-		case CELL_KEYC_RIGHT_ARROW:
-		case CELL_KEYC_LEFT_ARROW:
-		case CELL_KEYC_DOWN_ARROW:
-		case CELL_KEYC_UP_ARROW:
-		case CELL_KEYC_NUM_LOCK:
-		case CELL_KEYC_APPLICATION:
-		case CELL_KEYC_KANA:
-		case CELL_KEYC_HENKAN:
-		case CELL_KEYC_MUHENKAN:
-		{
-			// Any function key or other special key like Delete
-			is_hook_key = (info.hook_event_mode & CELL_OSKDIALOG_EVENT_HOOK_TYPE_FUNCTION_KEY);
-			break;
-		}
-		default:
-		{
-			// Any regular ascii key
-			is_hook_key = (info.hook_event_mode & CELL_OSKDIALOG_EVENT_HOOK_TYPE_ASCII_KEY);
-			break;
-		}
-		}
-
-		if (!is_hook_key)
-		{
-			cellOskDialog.notice("on_osk_key_input_entered: not a hook key: led=%d, mkey=%d, keycode=%d, hook_event_mode=%d", key_message.led, key_message.mkey, key_message.keycode, info.hook_event_mode.load());
-			return;
-		}
-
-		// The max size is 100 characters plus '\0'. Apparently this used to be 30 plus '\0' in older firmware.
-		constexpr u32 max_size = 101;
-
-		// TODO: Send unconfirmed string if there is one.
-		// As far as I understand, this is for example supposed to be the IME preview.
-		// So when you type in japanese, you get some word propositions which you can select and confirm.
-		// The "confirmed" string is basically everything you already wrote, while the "unconfirmed"
-		// string is the auto-completion part that you haven't accepted as proper word yet.
-		// The game expects you to send this "preview", or an empty string if there is none.
-		std::array<u16, max_size> string_to_send{};
-
-		sysutil_register_cb([key_message, string_to_send, event_hook_callback](ppu_thread& cb_ppu) -> s32
-		{
-			// Prepare callback variables
-			vm::var<CellOskDialogKeyMessage> keyMessage(key_message);
-			vm::var<u32> action(CELL_OSKDIALOG_CHANGE_NO_EVENT);
-			vm::var<u16[], vm::page_allocator<>> pActionInfo(::narrow<u32>(string_to_send.size()), string_to_send.data());
-
-			// Create helpers for logging
-			std::u16string utf16_string(reinterpret_cast<const char16_t*>(string_to_send.data()), string_to_send.size());
-			std::string utf8_string = utf16_to_ascii8(utf16_string);
-
-			cellOskDialog.notice("osk_hardware_keyboard_event_hook_callback(led=%d, mkey=%d, keycode=%d, action=%d, pActionInfo='%s')", keyMessage->led, keyMessage->mkey, keyMessage->keycode, *action, utf8_string);
-
-			// Call the hook function. The game reads and writes pActionInfo. We need to react based on the returned action.
-			const bool return_value = event_hook_callback(cb_ppu, keyMessage, action, pActionInfo);
-			ensure(action);
-			ensure(pActionInfo);
-
-			// Parse returned text for logging
-			utf16_string.clear();
-			for (u32 i = 0; i < max_size; i++)
-			{
-				const u16 code = pActionInfo[i];
-				if (!code) break;
-				utf16_string.push_back(code);
-			}
-			utf8_string = utf16_to_ascii8(utf16_string);
-
-			cellOskDialog.notice("osk_hardware_keyboard_event_hook_callback: return_value=%d, action=%d, pActionInfo='%s'", return_value, *action, utf8_string);
-
-			// Check if the hook function was successful
-			if (return_value)
-			{
-				const auto osk = _get_osk_dialog(false);
-				if (!osk)
-				{
-					cellOskDialog.error("osk_hardware_keyboard_event_hook_callback: osk is null");
-					return 0;
-				}
-
-				auto& info = g_fxo->get<osk_info>();
-				std::lock_guard lock(info.text_mtx);
-
-				switch (*action)
-				{
-				case CELL_OSKDIALOG_CHANGE_NO_EVENT:
-				case CELL_OSKDIALOG_CHANGE_EVENT_CANCEL:
-				{
-					// Do nothing
-					break;
-				}
-				case CELL_OSKDIALOG_CHANGE_WORDS_INPUT:
-				{
-					// TODO: Replace unconfirmed string.
-					cellOskDialog.todo("osk_hardware_keyboard_event_hook_callback: replace unconfirmed string with '%s'", utf8_string);
-					break;
-				}
-				case CELL_OSKDIALOG_CHANGE_WORDS_INSERT:
-				{
-					// TODO: Remove unconfirmed string
-					cellOskDialog.todo("osk_hardware_keyboard_event_hook_callback: remove unconfirmed string");
-
-					// Set confirmed string and reset unconfirmed string
-					cellOskDialog.notice("osk_hardware_keyboard_event_hook_callback: inserting string '%s'", utf8_string);
-					osk->Insert(utf16_string);
-					break;
-				}
-				case CELL_OSKDIALOG_CHANGE_WORDS_REPLACE_ALL:
-				{
-					// Replace confirmed string and remove unconfirmed string.
-					cellOskDialog.notice("osk_hardware_keyboard_event_hook_callback: replacing all strings with '%s'", utf8_string);
-					osk->SetText(utf16_string);
-					break;
-				}
-				default:
-				{
-					cellOskDialog.error("osk_hardware_keyboard_event_hook_callback returned invalid action (%d)", *action);
-					break;
-				}
-				}
-			}
-
-			return 0;
-		});
-	};
-
-	// Set device mask and event lock
-	osk->ignore_device_events = info.lock_ext_input_device.load();
-	osk->input_device = info.initial_input_device.load();
-	osk->continuous_mode = info.osk_continuous_mode.load();
-
-	if (info.use_separate_windows)
-	{
-		osk->pad_input_enabled = (info.device_mask != CELL_OSKDIALOG_DEVICE_MASK_PAD);
-		osk->mouse_input_enabled = (info.device_mask != CELL_OSKDIALOG_DEVICE_MASK_PAD);
-	}
-
-	input::SetIntercepted(osk->pad_input_enabled, osk->keyboard_input_enabled, osk->mouse_input_enabled);
-
-	cellOskDialog.notice("cellOskDialogLoadAsync: creating OSK dialog ...");
-
-	Emu.BlockingCallFromMainThread([=, &info]()
-	{
-		osk->Create({
-			.title = get_localized_string(localized_string_id::CELL_OSK_DIALOG_TITLE),
-			.message = message,
-			.init_text = osk->osk_text.data(),
-			.charlimit = maxLength,
-			.prohibit_flags = prohibitFlgs,
-			.panel_flag = allowOskPanelFlg,
-			.support_language = info.supported_languages,
-			.first_view_panel = firstViewPanel,
-			.layout = info.layout,
-			.input_layout = info.input_field_layout_info,
-			.panel_layout = info.input_panel_layout_info,
-			.input_field_window_width = info.input_field_window_width,
-			.input_field_background_transparency = info.input_field_background_transparency,
-			.initial_scale = info.initial_scale,
-			.base_color = info.base_color,
-			.dimmer_enabled = info.dimmer_enabled,
-			.use_separate_windows = info.use_separate_windows,
-			.intercept_input = false // We handle the interception manually based on the device mask
-		});
+		osk->Create(get_localized_string(localized_string_id::CELL_OSK_DIALOG_TITLE), message, osk->osk_text, maxLength, prohibitFlgs, allowOskPanelFlg, firstViewPanel);
+		result = true;
+		result.notify_one();
 	});
 
-	g_fxo->get<osk_info>().last_dialog_state = CELL_SYSUTIL_OSKDIALOG_LOADED;
-
-	if (info.use_separate_windows)
-	{
-		const bool visible = osk->continuous_mode != CELL_OSKDIALOG_CONTINUOUS_MODE_HIDE;
-		cellOskDialog.notice("cellOskDialogLoadAsync: sending CELL_SYSUTIL_OSKDIALOG_DISPLAY_CHANGED with %s", visible ? "CELL_OSKDIALOG_DISPLAY_STATUS_SHOW" : "CELL_OSKDIALOG_DISPLAY_STATUS_HIDE");
-		sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_DISPLAY_CHANGED, visible ? CELL_OSKDIALOG_DISPLAY_STATUS_SHOW : CELL_OSKDIALOG_DISPLAY_STATUS_HIDE);
-	}
-
-	cellOskDialog.notice("cellOskDialogLoadAsync: sending CELL_SYSUTIL_OSKDIALOG_LOADED");
 	sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_LOADED, 0);
 
-	cellOskDialog.notice("cellOskDialogLoadAsync: created OSK dialog");
+	while (!result && !Emu.IsStopped())
+	{
+		thread_ctrl::wait_on(result, false);
+	}
+
 	return CELL_OK;
 }
 
 error_code cellOskDialogLoadAsyncExt()
 {
-	cellOskDialog.todo("cellOskDialogLoadAsyncExt()");
+	UNIMPLEMENTED_FUNC(cellOskDialog);
 	return CELL_OK;
 }
 
@@ -654,35 +275,20 @@ error_code getText(vm::ptr<CellOskDialogCallbackReturnParam> OutputInfo, bool is
 		return CELL_OSKDIALOG_ERROR_PARAM;
 	}
 
-	const auto osk = _get_osk_dialog(false);
+	const auto osk = _get_osk_dialog();
 
 	if (!osk)
 	{
 		return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED;
 	}
 
-	auto& info = g_fxo->get<osk_info>();
-
-	const bool keep_seperate_window_open = info.use_separate_windows.load() && (info.osk_continuous_mode.load() != CELL_OSKDIALOG_CONTINUOUS_MODE_NONE);
-
-	info.text_mtx.lock();
-
-	// Update text buffer if called from cellOskDialogUnloadAsync or if the user accepted the dialog during continuous seperate window mode.
-	if (is_unload || (keep_seperate_window_open && info.last_dialog_state == CELL_SYSUTIL_OSKDIALOG_INPUT_ENTERED))
-	{
-		for (s32 i = 0; i < CELL_OSKDIALOG_STRING_SIZE - 1; i++)
-		{
-			info.valid_text[i] = osk->osk_text[i];
-		}
-	}
-
 	if (is_unload)
 	{
 		OutputInfo->result = osk->osk_input_result.load();
 	}
 	else
 	{
-		if (info.valid_text[0] == 0)
+		if (memcmp(osk->osk_text_old, osk->osk_text, sizeof(osk->osk_text)) == 0)
 		{
 			OutputInfo->result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_NO_INPUT_TEXT;
 		}
@@ -692,68 +298,41 @@ error_code getText(vm::ptr<CellOskDialogCallbackReturnParam> OutputInfo, bool is
 		}
 	}
 
-	const bool do_copy = OutputInfo->pResultString && (OutputInfo->result == CELL_OSKDIALOG_INPUT_FIELD_RESULT_OK || (is_unload && OutputInfo->result == CELL_OSKDIALOG_INPUT_FIELD_RESULT_NO_INPUT_TEXT));
+	bool do_copy = OutputInfo->pResultString && (OutputInfo->result == CELL_OSKDIALOG_INPUT_FIELD_RESULT_OK || (is_unload && OutputInfo->result == CELL_OSKDIALOG_INPUT_FIELD_RESULT_NO_INPUT_TEXT));
 
-	for (s32 i = 0; do_copy && i < CELL_OSKDIALOG_STRING_SIZE - 1; i++)
+	for (s32 i = 0; i < CELL_OSKDIALOG_STRING_SIZE - 1; i++)
 	{
-		if (i < OutputInfo->numCharsResultString)
-		{
-			OutputInfo->pResultString[i] = info.valid_text[i];
+		osk->osk_text_old[i] = osk->osk_text[i];
 
-			if (info.valid_text[i] == 0)
+		if (do_copy)
+		{
+			if (i < OutputInfo->numCharsResultString)
 			{
-				break;
+				if (osk->osk_text[i] == 0)
+				{
+					do_copy = false;
+				}
+				OutputInfo->pResultString[i] = osk->osk_text[i];
+			}
+			else
+			{
+				OutputInfo->pResultString[i] = 0;
+				do_copy = false;
 			}
 		}
-		else
-		{
-			OutputInfo->pResultString[i] = 0;
-			break;
-		}
 	}
 
-	info.text_mtx.unlock();
-
 	if (is_unload)
 	{
 		// Unload should be called last, so remove the dialog here
-		if (const auto reset_lock = info.init.reset())
+		if (const auto reset_lock = g_fxo->get<osk_info>().init.reset())
 		{
-			info.reset();
+			// TODO
+			g_fxo->get<osk_info>().dlg.reset();
 		}
 
-		if (keep_seperate_window_open)
-		{
-			cellOskDialog.notice("cellOskDialogUnloadAsync: terminating continuous overlay");
-			osk->Close(FAKE_CELL_OSKDIALOG_CLOSE_TERMINATE);
-		}
-
-		osk->state = OskDialogState::Unloaded;
-
-		cellOskDialog.notice("cellOskDialogUnloadAsync: sending CELL_SYSUTIL_OSKDIALOG_UNLOADED");
 		sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_UNLOADED, 0);
 	}
-	else if (keep_seperate_window_open)
-	{
-		// Clear text buffer unless the dialog is still open during continuous seperate window mode.
-		switch (info.last_dialog_state)
-		{
-		case CELL_SYSUTIL_OSKDIALOG_FINISHED:
-		case CELL_SYSUTIL_OSKDIALOG_UNLOADED:
-		case CELL_SYSUTIL_OSKDIALOG_INPUT_CANCELED:
-		case CELL_SYSUTIL_OSKDIALOG_INPUT_ENTERED:
-		{
-			auto& info = g_fxo->get<osk_info>();
-			std::lock_guard lock(info.text_mtx);
-
-			info.valid_text = {};
-			osk->Clear(true);
-			break;
-		}
-		default:
-			break;
-		}
-	}
 
 	return CELL_OK;
 }
@@ -791,194 +370,106 @@ error_code cellOskDialogAbort()
 {
 	cellOskDialog.warning("cellOskDialogAbort()");
 
-	const auto osk = _get_osk_dialog(false);
+	const auto osk = _get_osk_dialog();
 
 	if (!osk)
 	{
 		return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED;
 	}
 
-	const error_code result = osk->state.atomic_op([](OskDialogState& state) -> error_code
+	const s32 result = osk->state.atomic_op([](OskDialogState& state)
 	{
-		// Check for open dialog. In this case the dialog is "Open" if it was not unloaded before.
-		if (state == OskDialogState::Unloaded)
+		// Check for open dialog. In this case the dialog is only "Open" if it was not aborted before.
+		if (state == OskDialogState::Abort)
 		{
-			return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED;
+			return static_cast<s32>(CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED);
+		}
+
+		// If the dialog has the Open state then it is in use. Only dialogs with the Close state can be aborted.
+		if (state == OskDialogState::Open)
+		{
+			return static_cast<s32>(CELL_SYSUTIL_ERROR_BUSY);
 		}
 
 		state = OskDialogState::Abort;
 
-		return CELL_OK;
+		return static_cast<s32>(CELL_OK);
 	});
 
-	if (result == CELL_OK)
+	if (result != CELL_OK)
 	{
-		osk->osk_input_result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_ABORT;
-		osk->Close(FAKE_CELL_OSKDIALOG_CLOSE_ABORT);
+		return result;
 	}
 
-	g_fxo->get<osk_info>().last_dialog_state = CELL_SYSUTIL_OSKDIALOG_FINISHED;
-
-	cellOskDialog.notice("cellOskDialogAbort: sending CELL_SYSUTIL_OSKDIALOG_FINISHED");
-	sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_FINISHED, 0);
+	osk->osk_input_result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_ABORT;
+	osk->Close(false);
 
 	return CELL_OK;
 }
 
 error_code cellOskDialogSetDeviceMask(u32 deviceMask)
 {
-	cellOskDialog.warning("cellOskDialogSetDeviceMask(deviceMask=0x%x)", deviceMask);
-
-	// TODO: It might also return an error if use_separate_windows is not enabled
-	if (deviceMask > CELL_OSKDIALOG_DEVICE_MASK_PAD)
-	{
-		return CELL_OSKDIALOG_ERROR_PARAM;
-	}
-
-	auto& info = g_fxo->get<osk_info>();
-	info.device_mask = deviceMask;
-
-	if (info.use_separate_windows)
-	{
-		if (const auto osk = _get_osk_dialog(false))
-		{
-			osk->pad_input_enabled = (deviceMask != CELL_OSKDIALOG_DEVICE_MASK_PAD);
-			osk->mouse_input_enabled = (deviceMask != CELL_OSKDIALOG_DEVICE_MASK_PAD);
-
-			input::SetIntercepted(osk->pad_input_enabled, osk->keyboard_input_enabled, osk->mouse_input_enabled);
-		}
-	}
-
+	cellOskDialog.todo("cellOskDialogSetDeviceMask(deviceMask=0x%x)", deviceMask);
 	return CELL_OK;
 }
 
 error_code cellOskDialogSetSeparateWindowOption(vm::ptr<CellOskDialogSeparateWindowOption> windowOption)
 {
-	cellOskDialog.warning("cellOskDialogSetSeparateWindowOption(windowOption=*0x%x)", windowOption);
+	cellOskDialog.todo("cellOskDialogSetSeparateWindowOption(windowOption=*0x%x)", windowOption);
 
-	if (!windowOption ||
-		!windowOption->inputFieldLayoutInfo ||
-		!!windowOption->reserved ||
-		windowOption->continuousMode > CELL_OSKDIALOG_CONTINUOUS_MODE_SHOW ||
-		windowOption->deviceMask > CELL_OSKDIALOG_DEVICE_MASK_PAD)
+	if (!windowOption)
 	{
 		return CELL_OSKDIALOG_ERROR_PARAM;
 	}
 
-	auto& osk = g_fxo->get<osk_info>();
-	osk.use_separate_windows = true;
-	osk.osk_continuous_mode  = static_cast<CellOskDialogContinuousMode>(+windowOption->continuousMode);
-	osk.device_mask = windowOption->deviceMask;
-	osk.input_field_window_width = windowOption->inputFieldWindowWidth;
-	osk.input_field_background_transparency = std::clamp<f32>(windowOption->inputFieldBackgroundTrans, 0.0f, 1.0f);
-
-	// Choose proper alignments, since the devs didn't make them exclusive for some reason.
-	const auto aligned_layout = [](const CellOskDialogLayoutInfo& info) -> osk_window_layout
+	if (auto& osk = g_fxo->get<osk_info>(); true)
 	{
-		osk_window_layout res{};
-		res.layout_mode = info.layoutMode;
-		res.x_align = osk_info::get_aligned_x(res.layout_mode);
-		res.y_align = osk_info::get_aligned_y(res.layout_mode);
-		res.x_offset = info.position.x;
-		res.y_offset = info.position.y;
-		return res;
-	};
-
-	osk.input_field_layout_info = aligned_layout(*windowOption->inputFieldLayoutInfo);
-
-	// Panel layout is optional
-	if (windowOption->inputPanelLayoutInfo)
-	{
-		osk.input_panel_layout_info = aligned_layout(*windowOption->inputPanelLayoutInfo);
+		osk.use_separate_windows = true;
+		osk.osk_continuous_mode  = static_cast<CellOskDialogContinuousMode>(+windowOption->continuousMode);
 	}
-	else
-	{
-		// Align to input field
-		osk.input_panel_layout_info = osk.input_field_layout_info;
-	}
-
-	cellOskDialog.warning("cellOskDialogSetSeparateWindowOption: use_separate_windows=true, continuous_mode=%s, device_mask=0x%x, input_field_window_width=%d, input_field_background_transparency=%.2f, input_field_layout_info=%s, input_panel_layout_info=%s)",
-		osk.osk_continuous_mode.load(), osk.device_mask.load(), osk.input_field_window_width.load(), osk.input_field_background_transparency.load(), osk.input_field_layout_info, osk.input_panel_layout_info);
 
 	return CELL_OK;
 }
 
-error_code cellOskDialogSetInitialInputDevice(u32 inputDevice)
+error_code cellOskDialogSetInitialInputDevice(vm::ptr<CellOskDialogInputDevice> inputDevice)
 {
-	cellOskDialog.warning("cellOskDialogSetInitialInputDevice(inputDevice=%d)", inputDevice);
-
-	if (inputDevice > CELL_OSKDIALOG_INPUT_DEVICE_KEYBOARD)
-	{
-		return CELL_OSKDIALOG_ERROR_PARAM;
-	}
-
-	g_fxo->get<osk_info>().initial_input_device = static_cast<CellOskDialogInputDevice>(inputDevice);
-
+	cellOskDialog.todo("cellOskDialogSetInitialInputDevice(inputDevice=*0x%x)", inputDevice);
 	return CELL_OK;
 }
 
-error_code cellOskDialogSetInitialKeyLayout(u32 initialKeyLayout)
+error_code cellOskDialogSetInitialKeyLayout(vm::ptr<CellOskDialogInitialKeyLayout> initialKeyLayout)
 {
-	cellOskDialog.warning("cellOskDialogSetInitialKeyLayout(initialKeyLayout=%d)", initialKeyLayout);
-
-	if (initialKeyLayout > CELL_OSKDIALOG_INITIAL_PANEL_LAYOUT_FULLKEY)
-	{
-		return CELL_OSKDIALOG_ERROR_PARAM;
-	}
-
-	auto& osk = g_fxo->get<osk_info>();
-
-	if (osk.key_layout_options & initialKeyLayout)
-	{
-		osk.initial_key_layout = static_cast<CellOskDialogInitialKeyLayout>(initialKeyLayout);
-	}
-
+	cellOskDialog.todo("cellOskDialogSetInitialKeyLayout(initialKeyLayout=*0x%x)", initialKeyLayout);
 	return CELL_OK;
 }
 
 error_code cellOskDialogDisableDimmer()
 {
-	cellOskDialog.warning("cellOskDialogDisableDimmer()");
-
-	g_fxo->get<osk_info>().dimmer_enabled = false;
-
+	cellOskDialog.todo("cellOskDialogDisableDimmer()");
 	return CELL_OK;
 }
 
 error_code cellOskDialogSetKeyLayoutOption(u32 option)
 {
-	cellOskDialog.warning("cellOskDialogSetKeyLayoutOption(option=0x%x)", option);
+	cellOskDialog.todo("cellOskDialogSetKeyLayoutOption(option=0x%x)", option);
 
 	if (option == 0 || option > 3) // CELL_OSKDIALOG_10KEY_PANEL OR CELL_OSKDIALOG_FULLKEY_PANEL
 	{
 		return CELL_OSKDIALOG_ERROR_PARAM;
 	}
 
-	g_fxo->get<osk_info>().key_layout_options = option;
-
 	return CELL_OK;
 }
 
 error_code cellOskDialogAddSupportLanguage(u32 supportLanguage)
 {
-	cellOskDialog.warning("cellOskDialogAddSupportLanguage(supportLanguage=0x%x)", supportLanguage);
-
-	g_fxo->get<osk_info>().supported_languages = supportLanguage;
-
+	cellOskDialog.todo("cellOskDialogAddSupportLanguage(supportLanguage=0x%x)", supportLanguage);
 	return CELL_OK;
 }
 
 error_code cellOskDialogSetLayoutMode(s32 layoutMode)
 {
-	cellOskDialog.warning("cellOskDialogSetLayoutMode(layoutMode=0x%x)", layoutMode);
-
-	auto& osk = g_fxo->get<osk_info>();
-	osk.layout.layout_mode = layoutMode;
-
-	// Choose proper alignments, since the devs didn't make them exclusive for some reason.
-	osk.layout.x_align = osk_info::get_aligned_x(layoutMode);
-	osk.layout.y_align = osk_info::get_aligned_y(layoutMode);
-
+	cellOskDialog.todo("cellOskDialogSetLayoutMode(layoutMode=%d)", layoutMode);
 	return CELL_OK;
 }
 
@@ -988,26 +479,29 @@ error_code cellOskDialogGetInputText(vm::ptr<CellOskDialogCallbackReturnParam> O
 	return getText(OutputInfo, false);
 }
 
+error_code cellOskDialogExtInputDeviceUnlock()
+{
+	cellOskDialog.todo("cellOskDialogExtInputDeviceUnlock()");
+	return CELL_OK;
+}
+
 error_code register_keyboard_event_hook_callback(u16 hookEventMode, vm::ptr<cellOskDialogHardwareKeyboardEventHookCallback> pCallback)
 {
-	cellOskDialog.warning("register_keyboard_event_hook_callback(hookEventMode=%u, pCallback=*0x%x)", hookEventMode, pCallback);
+	cellOskDialog.todo("register_keyboard_event_hook_callback(hookEventMode=%u, pCallback=*0x%x)", hookEventMode, pCallback);
 
 	if (!pCallback)
 	{
 		return CELL_OSKDIALOG_ERROR_PARAM;
 	}
 
-	g_fxo->get<osk_info>().osk_hardware_keyboard_event_hook_callback = pCallback;
-	g_fxo->get<osk_info>().hook_event_mode = hookEventMode;
-
 	return CELL_OK;
 }
 
 error_code cellOskDialogExtRegisterKeyboardEventHookCallback(u16 hookEventMode, vm::ptr<cellOskDialogHardwareKeyboardEventHookCallback> pCallback)
 {
-	cellOskDialog.warning("cellOskDialogExtRegisterKeyboardEventHookCallback(hookEventMode=%u, pCallback=*0x%x)", hookEventMode, pCallback);
+	cellOskDialog.todo("cellOskDialogExtRegisterKeyboardEventHookCallback(hookEventMode=%u, pCallback=*0x%x)", hookEventMode, pCallback);
 
-	if (hookEventMode == 0 || hookEventMode > (CELL_OSKDIALOG_EVENT_HOOK_TYPE_FUNCTION_KEY | CELL_OSKDIALOG_EVENT_HOOK_TYPE_ASCII_KEY))
+	if (hookEventMode == 0 || hookEventMode > 3) // CELL_OSKDIALOG_EVENT_HOOK_TYPE_FUNCTION_KEY OR CELL_OSKDIALOG_EVENT_HOOK_TYPE_ASCII_KEY
 	{
 		return CELL_OSKDIALOG_ERROR_PARAM;
 	}
@@ -1017,9 +511,9 @@ error_code cellOskDialogExtRegisterKeyboardEventHookCallback(u16 hookEventMode,
 
 error_code cellOskDialogExtRegisterKeyboardEventHookCallbackEx(u16 hookEventMode, vm::ptr<cellOskDialogHardwareKeyboardEventHookCallback> pCallback)
 {
-	cellOskDialog.warning("cellOskDialogExtRegisterKeyboardEventHookCallbackEx(hookEventMode=%u, pCallback=*0x%x)", hookEventMode, pCallback);
+	cellOskDialog.todo("cellOskDialogExtRegisterKeyboardEventHookCallbackEx(hookEventMode=%u, pCallback=*0x%x)", hookEventMode, pCallback);
 
-	if (hookEventMode == 0 || hookEventMode > (CELL_OSKDIALOG_EVENT_HOOK_TYPE_FUNCTION_KEY | CELL_OSKDIALOG_EVENT_HOOK_TYPE_ASCII_KEY | CELL_OSKDIALOG_EVENT_HOOK_TYPE_ONLY_MODIFIER))
+	if (hookEventMode == 0 || hookEventMode > 7) // CELL_OSKDIALOG_EVENT_HOOK_TYPE_FUNCTION_KEY OR CELL_OSKDIALOG_EVENT_HOOK_TYPE_ASCII_KEY OR CELL_OSKDIALOG_EVENT_HOOK_TYPE_ONLY_MODIFIER
 	{
 		return CELL_OSKDIALOG_ERROR_PARAM;
 	}
@@ -1030,37 +524,12 @@ error_code cellOskDialogExtRegisterKeyboardEventHookCallbackEx(u16 hookEventMode
 error_code cellOskDialogExtAddJapaneseOptionDictionary(vm::cpptr<char> filePath)
 {
 	cellOskDialog.todo("cellOskDialogExtAddJapaneseOptionDictionary(filePath=**0x%0x)", filePath);
-
-	std::vector<std::string> paths;
-
-	if (filePath)
-	{
-		for (u32 i = 0; i < 4; i++)
-		{
-			if (!filePath[i])
-			{
-				break;
-			}
-
-			std::array<char, CELL_IMEJP_DIC_PATH_MAXLENGTH + 1> path{};
-			std::memcpy(path.data(), filePath[i].get_ptr(), CELL_IMEJP_DIC_PATH_MAXLENGTH);
-			paths.push_back(path.data());
-		}
-	}
-
-	cellOskDialog.todo("cellOskDialogExtAddJapaneseOptionDictionary: got %d dictionaries:\n%s", paths.size(), fmt::merge(paths, "\n"));
-
 	return CELL_OK;
 }
 
 error_code cellOskDialogExtEnableClipboard()
 {
 	cellOskDialog.todo("cellOskDialogExtEnableClipboard()");
-
-	g_fxo->get<osk_info>().clipboard_enabled = true;
-
-	// TODO: implement copy paste
-
 	return CELL_OK;
 }
 
@@ -1068,107 +537,40 @@ error_code cellOskDialogExtSendFinishMessage(u32 /*CellOskDialogFinishReason*/ f
 {
 	cellOskDialog.warning("cellOskDialogExtSendFinishMessage(finishReason=%d)", finishReason);
 
-	const auto osk = _get_osk_dialog(false);
+	const auto osk = _get_osk_dialog();
 
-	// Check for "Open" dialog.
-	if (!osk || osk->state.load() == OskDialogState::Unloaded)
+	// Check for open dialog.
+	if (!osk || osk->state.load() != OskDialogState::Open)
 	{
 		return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED;
 	}
 
-	osk->Close(finishReason);
+	osk->Close(finishReason == CELL_OSKDIALOG_CLOSE_CONFIRM);
 
 	return CELL_OK;
 }
 
-error_code cellOskDialogExtAddOptionDictionary(vm::cpptr<CellOskDialogImeDictionaryInfo> dictionaryInfo)
+error_code cellOskDialogExtAddOptionDictionary(vm::cptr<CellOskDialogImeDictionaryInfo> dictionaryInfo)
 {
 	cellOskDialog.todo("cellOskDialogExtAddOptionDictionary(dictionaryInfo=*0x%x)", dictionaryInfo);
-
-	if (!dictionaryInfo)
-	{
-		return CELL_OSKDIALOG_ERROR_PARAM;
-	}
-
-	std::vector<std::pair<u32, std::string>> paths; // language and path
-
-	for (u32 i = 0; i < 10; i++)
-	{
-		if (!dictionaryInfo[i] || !dictionaryInfo[i]->dictionaryPath)
-		{
-			break;
-		}
-
-		std::array<char, CELL_IMEJP_DIC_PATH_MAXLENGTH + 1> path{};
-		std::memcpy(path.data(), dictionaryInfo[i]->dictionaryPath.get_ptr(), CELL_IMEJP_DIC_PATH_MAXLENGTH);
-		paths.push_back({ dictionaryInfo[i]->targetLanguage, path.data() });
-	}
-
-	std::vector<std::string> msgs;
-	for (const auto& entry : paths)
-	{
-		msgs.push_back(fmt::format("languages=0x%x, path='%s'", entry.first, entry.second));
-	}
-
-	cellOskDialog.todo("cellOskDialogExtAddOptionDictionary: got %d dictionaries:\n%s", msgs.size(), fmt::merge(msgs, "\n"));
-
 	return CELL_OK;
 }
 
 error_code cellOskDialogExtSetInitialScale(f32 initialScale)
 {
-	cellOskDialog.warning("cellOskDialogExtSetInitialScale(initialScale=%f)", initialScale);
-
-	if (initialScale < CELL_OSKDIALOG_SCALE_MIN || initialScale > CELL_OSKDIALOG_SCALE_MAX)
-	{
-		return CELL_OSKDIALOG_ERROR_PARAM;
-	}
-
-	g_fxo->get<osk_info>().initial_scale = initialScale;
-
+	cellOskDialog.todo("cellOskDialogExtSetInitialScale(initialScale=%f)", initialScale);
 	return CELL_OK;
 }
 
 error_code cellOskDialogExtInputDeviceLock()
 {
-	cellOskDialog.warning("cellOskDialogExtInputDeviceLock()");
-
-	g_fxo->get<osk_info>().lock_ext_input_device = true;
-
-	if (const auto osk = _get_osk_dialog(false))
-	{
-		osk->ignore_device_events = true;
-	}
-
+	cellOskDialog.todo("cellOskDialogExtInputDeviceLock()");
 	return CELL_OK;
 }
 
-error_code cellOskDialogExtInputDeviceUnlock()
+error_code cellOskDialogExtSetBaseColor(f32 red, f32 blue, f32 green, f32 alpha)
 {
-	cellOskDialog.warning("cellOskDialogExtInputDeviceUnlock()");
-
-	g_fxo->get<osk_info>().lock_ext_input_device = false;
-
-	if (const auto osk = _get_osk_dialog(false))
-	{
-		osk->ignore_device_events = false;
-	}
-
-	return CELL_OK;
-}
-
-error_code cellOskDialogExtSetBaseColor(f32 red, f32 green, f32 blue, f32 alpha)
-{
-	cellOskDialog.warning("cellOskDialogExtSetBaseColor(red=%f, blue=%f, green=%f, alpha=%f)", red, blue, green, alpha);
-
-	if (red < 0.0f || red > 1.0f || green < 0.0f || green > 1.0f || blue < 0.0f || blue > 1.0f || alpha < 0.0f || alpha > 1.0f)
-	{
-		return CELL_OSKDIALOG_ERROR_PARAM;
-	}
-
-	auto& osk = g_fxo->get<osk_info>();
-	osk.base_color = OskDialogBase::color{ red, green, blue, alpha };
-
+	cellOskDialog.todo("cellOskDialogExtSetBaseColor(red=%f, blue=%f, green=%f, alpha=%f)", red, blue, green, alpha);
 	return CELL_OK;
 }
 
@@ -1181,7 +583,10 @@ error_code cellOskDialogExtRegisterConfirmWordFilterCallback(vm::ptr<cellOskDial
 		return CELL_OSKDIALOG_ERROR_PARAM;
 	}
 
-	g_fxo->get<osk_info>().osk_confirm_callback = pCallback;
+	if (auto& osk = g_fxo->get<osk_info>(); true)
+	{
+		osk.osk_confirm_callback = pCallback;
+	}
 
 	return CELL_OK;
 }
@@ -1189,98 +594,42 @@ error_code cellOskDialogExtRegisterConfirmWordFilterCallback(vm::ptr<cellOskDial
 error_code cellOskDialogExtUpdateInputText()
 {
 	cellOskDialog.todo("cellOskDialogExtUpdateInputText()");
-
-	// Usually, user input is only available when the dialog was accepted.
-	// This function seems to be called in order to copy the current text to an internal buffer.
-	// Afterwards, cellOskDialogGetInputText can be called to fetch the current text regardless of
-	// user confirmation, even if the dialog is still in use.
-
-	// TODO: error checks
-
-	const auto osk = _get_osk_dialog(false);
-
-	if (osk)
-	{
-		auto& info = g_fxo->get<osk_info>();
-		std::lock_guard lock(info.text_mtx);
-
-		for (s32 i = 0; i < CELL_OSKDIALOG_STRING_SIZE - 1; i++)
-		{
-			info.valid_text[i] = osk->osk_text[i];
-		}
-	}
-
-	return CELL_OK;
-}
-
-error_code cellOskDialogExtSetPointerEnable(b8 enable)
-{
-	cellOskDialog.warning("cellOskDialogExtSetPointerEnable(enable=%d)", enable);
-
-	// TODO: While the pointer is already displayed in the osk overlay, it is not really useful right now.
-	//       On real hardware, this may be used for actual PS Move or mouse input.
-
-	g_fxo->get<osk_info>().pointer_enabled = enable;
-
-	return CELL_OK;
-}
-
-error_code cellOskDialogExtUpdatePointerDisplayPos(vm::cptr<CellOskDialogPoint> pos)
-{
-	cellOskDialog.warning("cellOskDialogExtUpdatePointerDisplayPos(pos=0x%x, posX=%f, posY=%f)", pos, pos->x, pos->y);
-
-	if (pos)
-	{
-		osk_info& osk = g_fxo->get<osk_info>();
-		osk.pointer_x = pos->x;
-		osk.pointer_y = pos->y;
-	}
-
-	return CELL_OK;
-}
-
-error_code cellOskDialogExtEnableHalfByteKana()
-{
-	cellOskDialog.todo("cellOskDialogExtEnableHalfByteKana()");
-
-	g_fxo->get<osk_info>().half_byte_kana_enabled = true;
-
-	// TODO: use new value in osk
-
 	return CELL_OK;
 }
 
 error_code cellOskDialogExtDisableHalfByteKana()
 {
 	cellOskDialog.todo("cellOskDialogExtDisableHalfByteKana()");
+	return CELL_OK;
+}
 
-	g_fxo->get<osk_info>().half_byte_kana_enabled = false;
+error_code cellOskDialogExtSetPointerEnable(b8 enable)
+{
+	cellOskDialog.todo("cellOskDialogExtSetPointerEnable(enable=%d)", enable);
+	return CELL_OK;
+}
 
-	// TODO: use new value in osk
+error_code cellOskDialogExtUpdatePointerDisplayPos(/*const CellOskDialogPoint pos*/)
+{
+	cellOskDialog.todo("cellOskDialogExtUpdatePointerDisplayPos(posX=%f, posY=%f)"/*, pos.x, pos.y*/);
+	return CELL_OK;
+}
 
+error_code cellOskDialogExtEnableHalfByteKana()
+{
+	cellOskDialog.todo("cellOskDialogExtEnableHalfByteKana()");
 	return CELL_OK;
 }
 
 error_code cellOskDialogExtRegisterForceFinishCallback(vm::ptr<cellOskDialogForceFinishCallback> pCallback)
 {
-	cellOskDialog.warning("cellOskDialogExtRegisterForceFinishCallback(pCallback=*0x%x)", pCallback);
+	cellOskDialog.todo("cellOskDialogExtRegisterForceFinishCallback(pCallback=*0x%x)", pCallback);
 
 	if (!pCallback)
 	{
 		return CELL_OSKDIALOG_ERROR_PARAM;
 	}
 
-	osk_info& info = g_fxo->get<osk_info>();
-	std::lock_guard lock(info.text_mtx);
-	info.osk_force_finish_callback = pCallback;
-
-	// We use the force finish callback when the PS-Button is pressed and a System dialog shall be spawned while the OSK is loaded
-	// 1. Check if we are in any continuous mode and the dialog is hidden
-	// 2. If the above is true, call osk_force_finish_callback, deny the PS-Button press otherwise
-	// 3. Check the return value of osk_force_finish_callback.
-	//    if false, ignore the PS-Button press,
-	//    else close the dialog etc., send CELL_SYSUTIL_OSKDIALOG_FINISHED
-
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.h b/rpcs3/Emu/Cell/Modules/cellOskDialog.h
index 4a18adc765..7c1acad8dd 100644
--- a/rpcs3/Emu/Cell/Modules/cellOskDialog.h
+++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.h
@@ -2,8 +2,6 @@
 
 #include "util/types.hpp"
 #include "util/atomic.hpp"
-#include "util/init_mutex.hpp"
-#include "Utilities/mutex.h"
 #include "Emu/Memory/vm_ptr.h"
 #include <string>
 #include <functional>
@@ -85,12 +83,6 @@ enum CellOskDialogFinishReason
 	CELL_OSKDIALOG_CLOSE_CANCEL = 1,
 };
 
-enum CellOskDialogFinishReasonFake // Helper. Must be negative values.
-{
-	FAKE_CELL_OSKDIALOG_CLOSE_ABORT = -1,
-	FAKE_CELL_OSKDIALOG_CLOSE_TERMINATE = -2,
-};
-
 enum CellOskDialogType
 {
 	CELL_OSKDIALOG_TYPE_SINGLELINE_OSK = 0,
@@ -245,136 +237,26 @@ using cellOskDialogConfirmWordFilterCallback = int(vm::ptr<u16> pConfirmString,
 using cellOskDialogHardwareKeyboardEventHookCallback = class b8(vm::ptr<CellOskDialogKeyMessage> keyMessage, vm::ptr<u32> action, vm::ptr<void> pActionInfo);
 using cellOskDialogForceFinishCallback = class b8();
 
-struct osk_window_layout
-{
-	u32 layout_mode = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT | CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
-	u32 x_align = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT;
-	u32 y_align = CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
-	f32 x_offset = 0.0f;
-	f32 y_offset = 0.0f;
-
-	std::string to_string() const
-	{
-		return fmt::format("{ layout_mode=0x%x, x_align=0x%x, y_align=0x%x, x_offset=%.2f, y_offset=%.2f }", layout_mode, x_align, y_align, x_offset, y_offset);
-	}
-};
-
 enum class OskDialogState
 {
-	Unloaded,
 	Open,
 	Abort,
-	Closed
+	Close,
 };
 
 class OskDialogBase
 {
 public:
-	struct color
-	{
-		f32 r = 1.0f;
-		f32 g = 1.0f;
-		f32 b = 1.0f;
-		f32 a = 1.0f;
-	};
-
-	struct osk_params
-	{
-		std::string title;
-		std::u16string message;
-		char16_t* init_text = nullptr;
-		u32 charlimit = 0;
-		u32 prohibit_flags = 0;
-		u32 panel_flag = 0;
-		u32 support_language = 0;
-		u32 first_view_panel = 0;
-		osk_window_layout layout{};
-		osk_window_layout input_layout{}; // Only used with separate windows
-		osk_window_layout panel_layout{}; // Only used with separate windows
-		u32 input_field_window_width = 0; // Only used with separate windows
-		f32 input_field_background_transparency = 1.0f; // Only used with separate windows
-		f32 initial_scale = 1.0f;
-		color base_color{};
-		bool dimmer_enabled = false;
-		bool use_separate_windows = false;
-		bool intercept_input = false;
-	};
-
-	virtual void Create(const osk_params& params) = 0;
-	virtual void Clear(bool clear_all_data) = 0;
-	virtual void Insert(const std::u16string& text) = 0;
-	virtual void SetText(const std::u16string& text) = 0;
-
-	// Closes the dialog.
-	// Set status to CELL_OSKDIALOG_CLOSE_CONFIRM or CELL_OSKDIALOG_CLOSE_CANCEL for user input.
-	// Set status to -1 if closed by the game or system.
-	// Set status to -2 if terminated by the system.
-	virtual void Close(s32 status) = 0;
-	virtual ~OskDialogBase() {};
+	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();
 
 	std::function<void(s32 status)> on_osk_close;
-	std::function<void(CellOskDialogKeyMessage key_message)> on_osk_key_input_entered;
+	std::function<void()> on_osk_input_entered;
 
-	atomic_t<OskDialogState> state{ OskDialogState::Unloaded };
-	atomic_t<CellOskDialogContinuousMode> continuous_mode{ CELL_OSKDIALOG_CONTINUOUS_MODE_NONE };
-	atomic_t<CellOskDialogInputDevice> input_device{ CELL_OSKDIALOG_INPUT_DEVICE_PAD }; // The current input device.
-	atomic_t<bool> pad_input_enabled{ true };      // Determines if the OSK consumes the device's input.
-	atomic_t<bool> mouse_input_enabled{ true };    // Determines if the OSK consumes the device's input.
-	atomic_t<bool> keyboard_input_enabled{ true }; // Determines if the OSK consumes the device's input.
-	atomic_t<bool> ignore_device_events{ false };  // Determines if the OSK ignores device events.
+	atomic_t<OskDialogState> state{ OskDialogState::Close };
 
 	atomic_t<CellOskDialogInputFieldResult> osk_input_result{ CellOskDialogInputFieldResult::CELL_OSKDIALOG_INPUT_FIELD_RESULT_OK };
-	std::array<char16_t, CELL_OSKDIALOG_STRING_SIZE> osk_text{};
-};
-
-struct osk_info
-{
-	std::shared_ptr<OskDialogBase> dlg;
-
-	std::array<char16_t, CELL_OSKDIALOG_STRING_SIZE> valid_text{}; // The string that's going to be served to the game.
-	shared_mutex text_mtx;
-
-	atomic_t<bool> use_separate_windows = false;
-
-	atomic_t<bool> lock_ext_input_device = false;
-	atomic_t<u32> device_mask = 0; // OSK ignores input from the specified devices. 0 means all devices can influence the OSK
-	atomic_t<u32> input_field_window_width = 0;
-	atomic_t<f32> input_field_background_transparency = 1.0f;
-	osk_window_layout input_field_layout_info{};
-	osk_window_layout input_panel_layout_info{};
-	atomic_t<u32> key_layout_options = CELL_OSKDIALOG_10KEY_PANEL;
-	atomic_t<CellOskDialogInitialKeyLayout> initial_key_layout = CELL_OSKDIALOG_INITIAL_PANEL_LAYOUT_SYSTEM; // TODO: use
-	atomic_t<CellOskDialogInputDevice> initial_input_device = CELL_OSKDIALOG_INPUT_DEVICE_PAD; // OSK at first only receives input from the initial device
-
-	atomic_t<bool> clipboard_enabled = false; // For copy and paste
-	atomic_t<bool> half_byte_kana_enabled = false;
-	atomic_t<u32> supported_languages = 0; // Used to enable non-default languages in the OSK
-
-	atomic_t<bool> dimmer_enabled = true;
-	atomic_t<OskDialogBase::color> base_color = OskDialogBase::color{ 0.2f, 0.2f, 0.2f, 1.0f };
-
-	atomic_t<bool> pointer_enabled = false;
-	atomic_t<f32> pointer_x = 0.0f;
-	atomic_t<f32> pointer_y = 0.0f;
-	atomic_t<f32> initial_scale = 1.0f;
-
-	osk_window_layout layout = {};
-
-	atomic_t<CellOskDialogContinuousMode> osk_continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_NONE;
-	atomic_t<u32> last_dialog_state = CELL_SYSUTIL_OSKDIALOG_UNLOADED; // Used for continuous seperate window dialog
-
-	atomic_t<vm::ptr<cellOskDialogConfirmWordFilterCallback>> osk_confirm_callback{};
-	atomic_t<vm::ptr<cellOskDialogForceFinishCallback>> osk_force_finish_callback{};
-	atomic_t<vm::ptr<cellOskDialogHardwareKeyboardEventHookCallback>> osk_hardware_keyboard_event_hook_callback{};
-	atomic_t<u16> hook_event_mode{0};
-
-	stx::init_mutex init;
-
-	void reset();
-
-	// Align horizontally
-	static u32 get_aligned_x(u32 layout_mode);
-
-	// Align vertically
-	static u32 get_aligned_y(u32 layout_mode);
+	char16_t osk_text[CELL_OSKDIALOG_STRING_SIZE]{};
+	char16_t osk_text_old[CELL_OSKDIALOG_STRING_SIZE]{};
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellPad.cpp b/rpcs3/Emu/Cell/Modules/cellPad.cpp
index 086a341854..ced267288a 100644
--- a/rpcs3/Emu/Cell/Modules/cellPad.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellPad.cpp
@@ -1,20 +1,17 @@
 #include "stdafx.h"
 #include "Emu/IdManager.h"
-#include "Emu/system_config.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_process.h"
+
 #include "Emu/Io/pad_types.h"
-#include "Emu/RSX/Overlays/overlay_debug_overlay.h"
 #include "Input/pad_thread.h"
 #include "Input/product_info.h"
 #include "cellPad.h"
 
-error_code sys_config_start(ppu_thread& ppu);
-error_code sys_config_stop(ppu_thread& ppu);
+extern void libio_sys_config_init();
+extern void libio_sys_config_end();
 
-extern bool is_input_allowed();
-
-LOG_CHANNEL(cellPad);
+LOG_CHANNEL(sys_io);
 
 template<>
 void fmt_class_string<CellPadError>::format(std::string& out, u64 arg)
@@ -53,203 +50,9 @@ void fmt_class_string<CellPadFilterError>::format(std::string& out, u64 arg)
 	});
 }
 
-extern void sys_io_serialize(utils::serial& ar);
-
-pad_info::pad_info(utils::serial& ar)
-	: max_connect(ar)
-	, port_setting(ar)
-	, reported_info(ar)
+error_code cellPadInit(u32 max_connect)
 {
-	//reported_info = {};
-	sys_io_serialize(ar);
-}
-
-void pad_info::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(sys_io);
-
-	ar(max_connect, port_setting, reported_info);
-
-	sys_io_serialize(ar);
-}
-
-void show_debug_overlay(const CellPadData& data, const Pad& pad, const pad_info& config)
-{
-	const u32 setting = config.port_setting[pad.m_player_id];
-	const u16 d1 = data.button[CELL_PAD_BTN_OFFSET_DIGITAL1];
-	const u16 d2 = data.button[CELL_PAD_BTN_OFFSET_DIGITAL2];
-
-	std::string text = fmt::format(
-		">        Name:     Raw   Value   Pressure\n"
-		">\n"
-		">         Len:   %13d\n"
-		">     Digital:   %5s   %5s\n"
-		">       Press:   %5s   %5s\n"
-		">      Sensor:   %5s   %5s\n"
-		">\n"
-		">   Digital 1:  0x%04x  0x%04x\n"
-		">   Digital 2:  0x%04x  0x%04x\n"
-		">\n"
-		">    D-Pad Up:   %5d   %5d   %5d\n"
-		">  D-Pad Down:   %5d   %5d   %5d\n"
-		">  D-Pad Left:   %5d   %5d   %5d\n"
-		"> D-Pad Right:   %5d   %5d   %5d\n"
-		">       Cross:   %5d   %5d   %5d\n"
-		">      Square:   %5d   %5d   %5d\n"
-		">      Circle:   %5d   %5d   %5d\n"
-		">    Triangle:   %5d   %5d   %5d\n"
-		">       Start:   %5d   %5d\n"
-		">      Select:   %5d   %5d\n"
-		">          PS:   %5d   %5d\n"
-		">          L1:   %5d   %5d   %5d\n"
-		">          L2:   %5d   %5d   %5d\n"
-		">          L3:   %5d   %5d\n"
-		">          R1:   %5d   %5d   %5d\n"
-		">          R2:   %5d   %5d   %5d\n"
-		">          R3:   %5d   %5d\n"
-		">        LS X:   %5d   %5d\n"
-		">        LS Y:   %5d   %5d\n"
-		">        RS X:   %5d   %5d\n"
-		">        RS Y:   %5d   %5d\n"
-		">\n"
-		">    Sensor X:   %5d   %5d\n"
-		">    Sensor Y:   %5d   %5d\n"
-		">    Sensor Z:   %5d   %5d\n"
-		">    Sensor G:   %5d   %5d\n"
-		">\n"
-		">         PID:  0x%04x\n"
-		">         VID:  0x%04x\n"
-		"> Device Type:  0x%08x\n"
-		">  Class Type:  0x%08x\n"
-		,
-		data.len,
-		"on", data.len >= CELL_PAD_LEN_CHANGE_DEFAULT ? "on" : "off",
-		(setting & CELL_PAD_SETTING_PRESS_ON) ? "on" : "off", data.len >= CELL_PAD_LEN_CHANGE_PRESS_ON ? "on" : "off",
-		(setting & CELL_PAD_SETTING_SENSOR_ON) ? "on" : "off", data.len >= CELL_PAD_LEN_CHANGE_SENSOR_ON ? "on" : "off",
-		pad.m_digital_1, d1,
-		pad.m_digital_2, d2,
-		pad.m_press_up, !!(d1 & CELL_PAD_CTRL_UP), data.button[CELL_PAD_BTN_OFFSET_PRESS_UP],
-		pad.m_press_down, !!(d1 & CELL_PAD_CTRL_DOWN), data.button[CELL_PAD_BTN_OFFSET_PRESS_DOWN],
-		pad.m_press_left, !!(d1 & CELL_PAD_CTRL_LEFT), data.button[CELL_PAD_BTN_OFFSET_PRESS_LEFT],
-		pad.m_press_right, !!(d1 & CELL_PAD_CTRL_RIGHT), data.button[CELL_PAD_BTN_OFFSET_PRESS_RIGHT],
-		pad.m_press_cross, !!(d2 & CELL_PAD_CTRL_CROSS), data.button[CELL_PAD_BTN_OFFSET_PRESS_CROSS],
-		pad.m_press_square, !!(d2 & CELL_PAD_CTRL_SQUARE), data.button[CELL_PAD_BTN_OFFSET_PRESS_SQUARE],
-		pad.m_press_circle, !!(d2 & CELL_PAD_CTRL_CIRCLE), data.button[CELL_PAD_BTN_OFFSET_PRESS_CIRCLE],
-		pad.m_press_triangle, !!(d2 & CELL_PAD_CTRL_TRIANGLE), data.button[CELL_PAD_BTN_OFFSET_PRESS_TRIANGLE],
-		!!(pad.m_digital_1 & CELL_PAD_CTRL_START), !!(d1 & CELL_PAD_CTRL_START),
-		!!(pad.m_digital_1 & CELL_PAD_CTRL_SELECT), !!(d1 & CELL_PAD_CTRL_SELECT),
-		!!(pad.m_digital_1 & CELL_PAD_CTRL_PS), !!(d1 & CELL_PAD_CTRL_PS),
-		pad.m_press_L1, !!(d2 & CELL_PAD_CTRL_L1), data.button[CELL_PAD_BTN_OFFSET_PRESS_L1],
-		pad.m_press_L2, !!(d2 & CELL_PAD_CTRL_L2), data.button[CELL_PAD_BTN_OFFSET_PRESS_L2],
-		!!(pad.m_digital_1 & CELL_PAD_CTRL_L3), !!(d1 & CELL_PAD_CTRL_L3),
-		pad.m_press_R1, !!(d2 & CELL_PAD_CTRL_R1), data.button[CELL_PAD_BTN_OFFSET_PRESS_R1],
-		pad.m_press_R2, !!(d2 & CELL_PAD_CTRL_R2), data.button[CELL_PAD_BTN_OFFSET_PRESS_R2],
-		!!(pad.m_digital_1 & CELL_PAD_CTRL_R3), !!(d1 & CELL_PAD_CTRL_R3),
-		pad.m_analog_left_x, data.button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X],
-		pad.m_analog_left_y, data.button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y],
-		pad.m_analog_right_x, data.button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X],
-		pad.m_analog_right_y, data.button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y],
-		pad.m_sensor_x, data.button[CELL_PAD_BTN_OFFSET_SENSOR_X],
-		pad.m_sensor_y, data.button[CELL_PAD_BTN_OFFSET_SENSOR_Y],
-		pad.m_sensor_z, data.button[CELL_PAD_BTN_OFFSET_SENSOR_Z],
-		pad.m_sensor_g, data.button[CELL_PAD_BTN_OFFSET_SENSOR_G],
-		pad.m_product_id,
-		pad.m_vendor_id,
-		pad.m_device_type,
-		pad.m_class_type
-	);
-
-	rsx::overlays::set_debug_overlay_text(std::move(text));
-}
-
-extern void send_sys_io_connect_event(usz index, u32 state);
-
-bool cellPad_NotifyStateChange(usz index, u64 /*state*/, bool locked, bool is_blocking = true)
-{
-	auto info = g_fxo->try_get<pad_info>();
-
-	if (!info)
-	{
-		return true;
-	}
-
-	std::unique_lock lock(pad::g_pad_mutex, std::defer_lock);
-
-	if (locked)
-	{
-		if (is_blocking)
-		{
-			lock.lock();
-		}
-		else
-		{
-			if (!lock.try_lock())
-			{
-				return false;
-			}
-		}
-	}
-
-	if (index >= info->get_max_connect())
-	{
-		return true;
-	}
-
-	const auto handler = pad::get_pad_thread();
-	const auto& pads = handler->GetPads();
-	const auto& pad = pads[index];
-
-	if (pad->is_fake_pad)
-	{
-		return true;
-	}
-
-	pad_data_internal& reported_info = info->reported_info[index];
-	const u32 old_status = reported_info.port_status;
-
-	// Ignore sent status for now, use the latest instead
-	// NOTE 1: The state's CONNECTED bit should currently be identical to the current
-	//         m_port_status CONNECTED bit when called from our pad handlers.
-	// NOTE 2: Make sure to propagate all other status bits to the reported status.
-	const u32 new_status = pad->m_port_status;
-
-	if (~(old_status ^ new_status) & CELL_PAD_STATUS_CONNECTED)
-	{
-		// old and new have the same connection status
-		return true;
-	}
-
-	reported_info.port_status = new_status | CELL_PAD_STATUS_ASSIGN_CHANGES;
-	reported_info.device_capability = pad->m_device_capability;
-	reported_info.device_type = pad->m_device_type;
-	reported_info.pclass_type = pad->m_class_type;
-	reported_info.pclass_profile = pad->m_class_profile;
-
-	if (pad->m_vendor_id == 0 || pad->m_product_id == 0)
-	{
-		// Fallback to defaults
-		const std::vector<input::product_info> input_products = input::get_products_by_class(pad->m_class_type);
-		const input::product_info& product = ::at32(input_products, 0);
-		reported_info.vendor_id = product.vendor_id;
-		reported_info.product_id = product.product_id;
-	}
-	else
-	{
-		reported_info.vendor_id = pad->m_vendor_id;
-		reported_info.product_id = pad->m_product_id;
-	}
-
-	return true;
-}
-
-extern void pad_state_notify_state_change(usz index, u32 state)
-{
-	send_sys_io_connect_event(index, state);
-}
-
-error_code cellPadInit(ppu_thread& ppu, u32 max_connect)
-{
-	cellPad.warning("cellPadInit(max_connect=%d)", max_connect);
+	sys_io.warning("cellPadInit(max_connect=%d)", max_connect);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -261,29 +64,15 @@ error_code cellPadInit(ppu_thread& ppu, u32 max_connect)
 	if (max_connect == 0 || max_connect > CELL_MAX_PADS)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
-	sys_config_start(ppu);
-
-	config.max_connect = max_connect;
+	libio_sys_config_init();
+	config.max_connect = std::min<u32>(max_connect, CELL_PAD_MAX_PORT_NUM);
 	config.port_setting.fill(CELL_PAD_SETTING_PRESS_OFF | CELL_PAD_SETTING_SENSOR_OFF);
-	config.reported_info = {};
-
-	const auto handler = pad::get_pad_thread();
-	const auto& pads = handler->GetPads();
-
-	for (usz i = 0; i < config.get_max_connect(); ++i)
-	{
-		if (!pads[i]->is_fake_pad && pads[i]->is_connected())
-		{
-			send_sys_io_connect_event(i, CELL_PAD_STATUS_CONNECTED);
-		}
-	}
-
 	return CELL_OK;
 }
 
-error_code cellPadEnd(ppu_thread& ppu)
+error_code cellPadEnd()
 {
-	cellPad.notice("cellPadEnd()");
+	sys_io.notice("cellPadEnd()");
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -292,7 +81,7 @@ error_code cellPadEnd(ppu_thread& ppu)
 	if (!config.max_connect.exchange(0))
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
-	sys_config_stop(ppu);
+	libio_sys_config_end();
 	return CELL_OK;
 }
 
@@ -312,15 +101,14 @@ void clear_pad_buffer(const std::shared_ptr<Pad>& pad)
 	pad->m_press_triangle = pad->m_press_circle = pad->m_press_cross = pad->m_press_square = 0;
 	pad->m_press_L1 = pad->m_press_L2 = pad->m_press_R1 = pad->m_press_R2 = 0;
 
-	pad->m_sensor_x = DEFAULT_MOTION_X;
-	pad->m_sensor_y = DEFAULT_MOTION_Y;
-	pad->m_sensor_z = DEFAULT_MOTION_Z;
-	pad->m_sensor_g = DEFAULT_MOTION_G;
+	// ~399 on sensor y is a level non moving controller
+	pad->m_sensor_y = 399;
+	pad->m_sensor_x = pad->m_sensor_z = pad->m_sensor_g = 512;
 }
 
 error_code cellPadClearBuf(u32 port_no)
 {
-	cellPad.trace("cellPadClearBuf(port_no=%d)", port_no);
+	sys_io.trace("cellPadClearBuf(port_no=%d)", port_no);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -329,28 +117,62 @@ error_code cellPadClearBuf(u32 port_no)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
+	const auto handler = pad::get_current_handler();
+
 	if (port_no >= CELL_MAX_PADS)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
-	if (port_no >= config.get_max_connect())
+	const auto& pads = handler->GetPads();
+
+	if (port_no >= config.max_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;
 
-	const auto handler = pad::get_pad_thread();
-	const auto& pads = handler->GetPads();
-	const auto& pad = pads[port_no];
+	const auto pad = pads[port_no];
 
-	if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
-		return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
+	if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
+		return CELL_PAD_ERROR_NO_DEVICE;
 
 	clear_pad_buffer(pad);
 
 	return CELL_OK;
 }
 
-void pad_get_data(u32 port_no, CellPadData* data, bool get_periph_data = false)
+void pad_get_data(u32 port_no, CellPadData* data);
+
+error_code cellPadGetData(u32 port_no, vm::ptr<CellPadData> data)
+{
+	sys_io.trace("cellPadGetData(port_no=%d, data=*0x%x)", port_no, data);
+
+	std::lock_guard lock(pad::g_pad_mutex);
+
+	auto& config = g_fxo->get<pad_info>();
+
+	if (!config.max_connect)
+		return CELL_PAD_ERROR_UNINITIALIZED;
+
+	const auto handler = pad::get_current_handler();
+
+	if (port_no >= CELL_MAX_PADS || !data)
+		return CELL_PAD_ERROR_INVALID_PARAMETER;
+
+	const auto& pads = handler->GetPads();
+
+	if (port_no >= config.max_connect)
+		return CELL_PAD_ERROR_NO_DEVICE;
+
+	const auto pad = pads[port_no];
+
+	if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
+		return CELL_PAD_ERROR_NO_DEVICE;
+
+	pad_get_data(port_no, data.get_ptr());
+	return CELL_OK;
+}
+
+void pad_get_data(u32 port_no, CellPadData* data)
 {
 	auto& config = g_fxo->get<pad_info>();
-	const auto handler = pad::get_pad_thread();
+	const auto handler = pad::get_current_handler();
 	const auto& pad = handler->GetPads()[port_no];
 	const PadInfo& rinfo = handler->GetInfo();
 
@@ -360,10 +182,10 @@ void pad_get_data(u32 port_no, CellPadData* data, bool get_periph_data = false)
 		return;
 	}
 
-	const u32 setting = config.port_setting[port_no];
+	const auto setting = config.port_setting[port_no];
 	bool btnChanged = false;
 
-	if (rinfo.ignore_input || !is_input_allowed())
+	if (rinfo.ignore_input)
 	{
 		// Needed for Hotline Miami and Ninja Gaiden Sigma after dialogs were closed and buttons are still pressed.
 		// Gran Turismo 6 would keep registering the Start button during OSK Dialogs if this wasn't cleared and if we'd return with len as CELL_PAD_LEN_NO_CHANGE.
@@ -371,11 +193,11 @@ void pad_get_data(u32 port_no, CellPadData* data, bool get_periph_data = false)
 	}
 	else if (pad->ldd)
 	{
+		std::memcpy(data, pad->ldd_data, sizeof(CellPadData));
 		if (setting & CELL_PAD_SETTING_SENSOR_ON)
 			data->len = CELL_PAD_LEN_CHANGE_SENSOR_ON;
 		else
 			data->len = (setting & CELL_PAD_SETTING_PRESS_ON) ? CELL_PAD_LEN_CHANGE_PRESS_ON : CELL_PAD_LEN_CHANGE_DEFAULT;
-		std::memcpy(data->button, pad->ldd_data.button, data->len * sizeof(u16));
 		return;
 	}
 	else
@@ -383,42 +205,12 @@ void pad_get_data(u32 port_no, CellPadData* data, bool get_periph_data = false)
 		const u16 d1Initial = pad->m_digital_1;
 		const u16 d2Initial = pad->m_digital_2;
 
-		// Check if this pad is configured as a skateboard which ignores sticks and pressure button values.
-		// Curiously it maps infrared on the press value of the face buttons for some reason.
-		const bool use_piggyback = pad->m_class_type == CELL_PAD_PCLASS_TYPE_SKATEBOARD;
-
-		const auto set_value = [&btnChanged, use_piggyback, &pad](u16& value, u16 new_value, bool force_processing = false, u16 old_max_value = 255, u16 new_max_value = 255)
-		{
-			if (use_piggyback)
-			{
-				if (!force_processing)
-					return;
-
-				// Some piggyback values need to be scaled down on emulated devices
-				if (old_max_value != new_max_value)
-				{
-					if (pad->m_class_type == CELL_PAD_PCLASS_TYPE_SKATEBOARD && pad->m_pad_handler != pad_handler::skateboard)
-					{
-						new_value = static_cast<u16>(new_max_value * std::clamp(new_value / static_cast<f32>(old_max_value), 0.0f, 1.0f));
-					}
-				}
-			}
-
-			if (value != new_value)
-			{
-				btnChanged = true;
-				value = new_value;
-			}
-		};
-
-		for (const Button& button : pad->m_buttons_external)
+		for (Button& button : pad->m_buttons)
 		{
 			// here we check btns, and set pad accordingly,
 			// if something changed, set btnChanged
 
-			switch (button.m_offset)
-			{
-			case CELL_PAD_BTN_OFFSET_DIGITAL1:
+			if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
 			{
 				if (button.m_pressed)
 					pad->m_digital_1 |= button.m_outKeyCode;
@@ -427,20 +219,31 @@ void pad_get_data(u32 port_no, CellPadData* data, bool get_periph_data = false)
 
 				switch (button.m_outKeyCode)
 				{
-				case CELL_PAD_CTRL_LEFT:  set_value(pad->m_press_left,  button.m_value); break;
-				case CELL_PAD_CTRL_DOWN:  set_value(pad->m_press_down,  button.m_value); break;
-				case CELL_PAD_CTRL_RIGHT: set_value(pad->m_press_right, button.m_value); break;
-				case CELL_PAD_CTRL_UP:    set_value(pad->m_press_up,    button.m_value); break;
-				// These aren't pressure btns
+				case CELL_PAD_CTRL_LEFT:
+					if (pad->m_press_left != button.m_value) btnChanged = true;
+					pad->m_press_left = button.m_value;
+					break;
+				case CELL_PAD_CTRL_DOWN:
+					if (pad->m_press_down != button.m_value) btnChanged = true;
+					pad->m_press_down = button.m_value;
+					break;
+				case CELL_PAD_CTRL_RIGHT:
+					if (pad->m_press_right != button.m_value) btnChanged = true;
+					pad->m_press_right = button.m_value;
+					break;
+				case CELL_PAD_CTRL_UP:
+					if (pad->m_press_up != button.m_value) btnChanged = true;
+					pad->m_press_up = button.m_value;
+					break;
+				// These arent pressure btns
 				case CELL_PAD_CTRL_R3:
 				case CELL_PAD_CTRL_L3:
 				case CELL_PAD_CTRL_START:
 				case CELL_PAD_CTRL_SELECT:
 				default: break;
 				}
-				break;
 			}
-			case CELL_PAD_BTN_OFFSET_DIGITAL2:
+			else if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2)
 			{
 				if (button.m_pressed)
 					pad->m_digital_2 |= button.m_outKeyCode;
@@ -449,51 +252,63 @@ void pad_get_data(u32 port_no, CellPadData* data, bool get_periph_data = false)
 
 				switch (button.m_outKeyCode)
 				{
-				case CELL_PAD_CTRL_SQUARE:   set_value(pad->m_press_square,   button.m_value); break;
-				case CELL_PAD_CTRL_CROSS:    set_value(pad->m_press_cross,    button.m_value); break;
-				case CELL_PAD_CTRL_CIRCLE:   set_value(pad->m_press_circle,   button.m_value); break;
-				case CELL_PAD_CTRL_TRIANGLE: set_value(pad->m_press_triangle, button.m_value); break;
-				case CELL_PAD_CTRL_R1:       set_value(pad->m_press_R1,       button.m_value); break;
-				case CELL_PAD_CTRL_L1:       set_value(pad->m_press_L1,       button.m_value); break;
-				case CELL_PAD_CTRL_R2:       set_value(pad->m_press_R2,       button.m_value); break;
-				case CELL_PAD_CTRL_L2:       set_value(pad->m_press_L2,       button.m_value); break;
+				case CELL_PAD_CTRL_SQUARE:
+					if (pad->m_press_square != button.m_value) btnChanged = true;
+					pad->m_press_square = button.m_value;
+					break;
+				case CELL_PAD_CTRL_CROSS:
+					if (pad->m_press_cross != button.m_value) btnChanged = true;
+					pad->m_press_cross = button.m_value;
+					break;
+				case CELL_PAD_CTRL_CIRCLE:
+					if (pad->m_press_circle != button.m_value) btnChanged = true;
+					pad->m_press_circle = button.m_value;
+					break;
+				case CELL_PAD_CTRL_TRIANGLE:
+					if (pad->m_press_triangle != button.m_value) btnChanged = true;
+					pad->m_press_triangle = button.m_value;
+					break;
+				case CELL_PAD_CTRL_R1:
+					if (pad->m_press_R1 != button.m_value) btnChanged = true;
+					pad->m_press_R1 = button.m_value;
+					break;
+				case CELL_PAD_CTRL_L1:
+					if (pad->m_press_L1 != button.m_value) btnChanged = true;
+					pad->m_press_L1 = button.m_value;
+					break;
+				case CELL_PAD_CTRL_R2:
+					if (pad->m_press_R2 != button.m_value) btnChanged = true;
+					pad->m_press_R2 = button.m_value;
+					break;
+				case CELL_PAD_CTRL_L2:
+					if (pad->m_press_L2 != button.m_value) btnChanged = true;
+					pad->m_press_L2 = button.m_value;
+					break;
 				default: break;
 				}
-				break;
-			}
-			case CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK:
-			{
-				switch (button.m_outKeyCode)
-				{
-				case CELL_PAD_CTRL_PRESS_RIGHT:    set_value(pad->m_press_right,    button.m_value, true); break;
-				case CELL_PAD_CTRL_PRESS_LEFT:     set_value(pad->m_press_left,     button.m_value, true); break;
-				case CELL_PAD_CTRL_PRESS_UP:       set_value(pad->m_press_up,       button.m_value, true); break;
-				case CELL_PAD_CTRL_PRESS_DOWN:     set_value(pad->m_press_down,     button.m_value, true); break;
-				case CELL_PAD_CTRL_PRESS_TRIANGLE: set_value(pad->m_press_triangle, button.m_value, true, 255, 63); break; // Infrared on RIDE Skateboard
-				case CELL_PAD_CTRL_PRESS_CIRCLE:   set_value(pad->m_press_circle,   button.m_value, true, 255, 63); break; // Infrared on RIDE Skateboard
-				case CELL_PAD_CTRL_PRESS_CROSS:    set_value(pad->m_press_cross,    button.m_value, true, 255, 63); break; // Infrared on RIDE Skateboard
-				case CELL_PAD_CTRL_PRESS_SQUARE:   set_value(pad->m_press_square,   button.m_value, true, 255, 63); break; // Infrared on RIDE Skateboard
-				case CELL_PAD_CTRL_PRESS_L1:       set_value(pad->m_press_L1,       button.m_value, true); break;
-				case CELL_PAD_CTRL_PRESS_R1:       set_value(pad->m_press_R1,       button.m_value, true); break;
-				case CELL_PAD_CTRL_PRESS_L2:       set_value(pad->m_press_L2,       button.m_value, true); break;
-				case CELL_PAD_CTRL_PRESS_R2:       set_value(pad->m_press_R2,       button.m_value, true); break;
-				default: break;
-				}
-				break;
-			}
-			default:
-				break;
 			}
 		}
 
-		for (const AnalogStick& stick : pad->m_sticks_external)
+		for (const AnalogStick& stick : pad->m_sticks)
 		{
 			switch (stick.m_offset)
 			{
-			case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X:  set_value(pad->m_analog_left_x,  stick.m_value); break;
-			case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y:  set_value(pad->m_analog_left_y,  stick.m_value); break;
-			case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X: set_value(pad->m_analog_right_x, stick.m_value); break;
-			case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y: set_value(pad->m_analog_right_y, stick.m_value); break;
+			case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X:
+				if (pad->m_analog_left_x != stick.m_value) btnChanged = true;
+				pad->m_analog_left_x = stick.m_value;
+				break;
+			case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y:
+				if (pad->m_analog_left_y != stick.m_value) btnChanged = true;
+				pad->m_analog_left_y = stick.m_value;
+				break;
+			case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X:
+				if (pad->m_analog_right_x != stick.m_value) btnChanged = true;
+				pad->m_analog_right_x = stick.m_value;
+				break;
+			case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y:
+				if (pad->m_analog_right_y != stick.m_value) btnChanged = true;
+				pad->m_analog_right_y = stick.m_value;
+				break;
 			default: break;
 			}
 		}
@@ -504,10 +319,22 @@ void pad_get_data(u32 port_no, CellPadData* data, bool get_periph_data = false)
 			{
 				switch (sensor.m_offset)
 				{
-				case CELL_PAD_BTN_OFFSET_SENSOR_X: set_value(pad->m_sensor_x, sensor.m_value, true); break;
-				case CELL_PAD_BTN_OFFSET_SENSOR_Y: set_value(pad->m_sensor_y, sensor.m_value, true); break;
-				case CELL_PAD_BTN_OFFSET_SENSOR_Z: set_value(pad->m_sensor_z, sensor.m_value, true); break;
-				case CELL_PAD_BTN_OFFSET_SENSOR_G: set_value(pad->m_sensor_g, sensor.m_value, true); break;
+				case CELL_PAD_BTN_OFFSET_SENSOR_X:
+					if (pad->m_sensor_x != sensor.m_value) btnChanged = true;
+					pad->m_sensor_x = sensor.m_value;
+					break;
+				case CELL_PAD_BTN_OFFSET_SENSOR_Y:
+					if (pad->m_sensor_y != sensor.m_value) btnChanged = true;
+					pad->m_sensor_y = sensor.m_value;
+					break;
+				case CELL_PAD_BTN_OFFSET_SENSOR_Z:
+					if (pad->m_sensor_z != sensor.m_value) btnChanged = true;
+					pad->m_sensor_z = sensor.m_value;
+					break;
+				case CELL_PAD_BTN_OFFSET_SENSOR_G:
+					if (pad->m_sensor_g != sensor.m_value) btnChanged = true;
+					pad->m_sensor_g = sensor.m_value;
+					break;
 				default: break;
 				}
 			}
@@ -574,8 +401,8 @@ void pad_get_data(u32 port_no, CellPadData* data, bool get_periph_data = false)
 			data->button[CELL_PAD_BTN_OFFSET_PRESS_CROSS] = pad->m_press_cross;
 			data->button[CELL_PAD_BTN_OFFSET_PRESS_SQUARE] = pad->m_press_square;
 			data->button[CELL_PAD_BTN_OFFSET_PRESS_L1] = pad->m_press_L1;
-			data->button[CELL_PAD_BTN_OFFSET_PRESS_R1] = pad->m_press_R1;
 			data->button[CELL_PAD_BTN_OFFSET_PRESS_L2] = pad->m_press_L2;
+			data->button[CELL_PAD_BTN_OFFSET_PRESS_R1] = pad->m_press_R1;
 			data->button[CELL_PAD_BTN_OFFSET_PRESS_R2] = pad->m_press_R2;
 		}
 		else
@@ -593,141 +420,11 @@ void pad_get_data(u32 port_no, CellPadData* data, bool get_periph_data = false)
 			data->button[CELL_PAD_BTN_OFFSET_SENSOR_G] = pad->m_sensor_g;
 		}
 	}
-
-	if (!get_periph_data || data->len <= CELL_PAD_LEN_CHANGE_SENSOR_ON)
-	{
-		return;
-	}
-
-	const auto get_pressure_value = [setting](u16 val, u16 min, u16 max) -> u16
-	{
-		if (setting & CELL_PAD_SETTING_PRESS_ON)
-		{
-			return std::clamp(val, min, max);
-		}
-
-		if (val > 0)
-		{
-			return max;
-		}
-
-		return 0;
-	};
-
-	// TODO: support for 'unique' controllers, which goes in offsets 24+ in padData (CELL_PAD_PCLASS_BTN_OFFSET)
-	// TODO: update data->len accordingly
-
-	switch (pad->m_class_profile)
-	{
-	default:
-	case CELL_PAD_PCLASS_TYPE_STANDARD:
-	case CELL_PAD_PCLASS_TYPE_NAVIGATION:
-	case CELL_PAD_PCLASS_TYPE_SKATEBOARD:
-	{
-		break;
-	}
-	case CELL_PAD_PCLASS_TYPE_GUITAR:
-	{
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_FRET_1]      = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_FRET_2]      = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_FRET_3]      = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_FRET_4]      = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_FRET_5]      = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_STRUM_UP]    = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_STRUM_DOWN]  = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_WHAMMYBAR]   = 0x80; // 0x80 – 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_FRET_H1]     = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_FRET_H2]     = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_FRET_H3]     = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_FRET_H4]     = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_FRET_H5]     = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_5WAY_EFFECT] = 0x0019; // One of 5 values: 0x0019, 0x004C, 0x007F (or 0x0096), 0x00B2, 0x00E5 (or 0x00E2)
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_GUITAR_TILT_SENS]   = get_pressure_value(0, 0x0, 0xFF);
-		break;
-	}
-	case CELL_PAD_PCLASS_TYPE_DRUM:
-	{
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DRUM_SNARE]     = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DRUM_TOM]       = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DRUM_TOM2]      = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DRUM_TOM_FLOOR] = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DRUM_KICK]      = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DRUM_CYM_HiHAT] = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DRUM_CYM_CRASH] = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DRUM_CYM_RIDE]  = get_pressure_value(0, 0x0, 0xFF);
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DRUM_KICK2]     = get_pressure_value(0, 0x0, 0xFF);
-		break;
-	}
-	case CELL_PAD_PCLASS_TYPE_DJ:
-	{
-		// First deck
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DJ_MIXER_ATTACK]     = 0;    // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DJ_MIXER_CROSSFADER] = 0;    // 0x0 - 0x3FF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DJ_MIXER_DSP_DIAL]   = 0;    // 0x0 - 0x3FF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DJ_DECK1_STREAM1]    = 0;    // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DJ_DECK1_STREAM2]    = 0;    // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DJ_DECK1_STREAM3]    = 0;    // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DJ_DECK1_PLATTER]    = 0x80; // 0x0 - 0xFF (neutral: 0x80)
-
-		// Second deck
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DJ_DECK2_STREAM1]    = 0;    // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DJ_DECK2_STREAM2]    = 0;    // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DJ_DECK2_STREAM3]    = 0;    // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DJ_DECK2_PLATTER]    = 0x80; // 0x0 - 0xFF (neutral: 0x80)
-		break;
-	}
-	case CELL_PAD_PCLASS_TYPE_DANCEMAT:
-	{
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DANCEMAT_CIRCLE]   = 0; // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DANCEMAT_CROSS]    = 0; // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DANCEMAT_TRIANGLE] = 0; // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DANCEMAT_SQUARE]   = 0; // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DANCEMAT_RIGHT]    = 0; // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DANCEMAT_LEFT]     = 0; // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DANCEMAT_UP]       = 0; // 0x0 or 0xFF
-		data->button[CELL_PAD_PCLASS_BTN_OFFSET_DANCEMAT_DOWN]     = 0; // 0x0 or 0xFF
-		break;
-	}
-	}
-}
-
-error_code cellPadGetData(u32 port_no, vm::ptr<CellPadData> data)
-{
-	cellPad.trace("cellPadGetData(port_no=%d, data=*0x%x)", port_no, data);
-
-	std::lock_guard lock(pad::g_pad_mutex);
-
-	auto& config = g_fxo->get<pad_info>();
-
-	if (!config.max_connect)
-		return CELL_PAD_ERROR_UNINITIALIZED;
-
-	if (port_no >= CELL_MAX_PADS || !data)
-		return CELL_PAD_ERROR_INVALID_PARAMETER;
-
-	if (port_no >= config.get_max_connect())
-		return CELL_PAD_ERROR_NO_DEVICE;
-
-	const auto handler = pad::get_pad_thread();
-	const auto& pads = handler->GetPads();
-	const auto& pad = pads[port_no];
-
-	if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
-		return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
-
-	pad_get_data(port_no, data.get_ptr());
-
-	if (g_cfg.io.debug_overlay && !g_cfg.video.debug_overlay && port_no == 0)
-	{
-		show_debug_overlay(*data, *pad, config);
-	}
-
-	return CELL_OK;
 }
 
 error_code cellPadPeriphGetInfo(vm::ptr<CellPadPeriphInfo> info)
 {
-	cellPad.trace("cellPadPeriphGetInfo(info=*0x%x)", info);
+	sys_io.trace("cellPadPeriphGetInfo(info=*0x%x)", info);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -736,49 +433,41 @@ error_code cellPadPeriphGetInfo(vm::ptr<CellPadPeriphInfo> info)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
+	const auto handler = pad::get_current_handler();
+
 	if (!info)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
-	const auto handler = pad::get_pad_thread();
 	const PadInfo& rinfo = handler->GetInfo();
 
 	std::memset(info.get_ptr(), 0, sizeof(CellPadPeriphInfo));
 
 	info->max_connect = config.max_connect;
+	info->now_connect = rinfo.now_connect;
 	info->system_info = rinfo.system_info;
 
-	u32 now_connect = 0;
+	const auto& pads = handler->GetPads();
 
-	for (u32 i = 0; i < config.get_max_connect(); ++i)
+	for (u32 i = 0; i < CELL_PAD_MAX_PORT_NUM; ++i)
 	{
-		pad_data_internal& reported_info = config.reported_info[i];
+		if (i >= config.max_connect)
+			break;
 
-		info->port_status[i] = reported_info.port_status;
+		info->port_status[i] = pads[i]->m_port_status;
+		pads[i]->m_port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
 		info->port_setting[i] = config.port_setting[i];
-
-		reported_info.port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
-
-		if (~reported_info.port_status & CELL_PAD_STATUS_CONNECTED)
-		{
-			continue;
-		}
-
-		info->device_capability[i] = reported_info.device_capability;
-		info->device_type[i] = reported_info.device_type;
-		info->pclass_type[i] = reported_info.pclass_type;
-		info->pclass_profile[i] = reported_info.pclass_profile;
-
-		now_connect++;
+		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] = pads[i]->m_class_profile;
 	}
 
-	info->now_connect = now_connect;
-
 	return CELL_OK;
 }
 
 error_code cellPadPeriphGetData(u32 port_no, vm::ptr<CellPadPeriphData> data)
 {
-	cellPad.trace("cellPadPeriphGetData(port_no=%d, data=*0x%x)", port_no, data);
+	sys_io.trace("cellPadPeriphGetData(port_no=%d, data=*0x%x)", port_no, data);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -787,31 +476,34 @@ error_code cellPadPeriphGetData(u32 port_no, vm::ptr<CellPadPeriphData> data)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
+	const auto handler = pad::get_current_handler();
+
 	// port_no can only be 0-6 in this function
 	if (port_no >= CELL_PAD_MAX_PORT_NUM || !data)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
-	if (port_no >= config.get_max_connect())
+	const auto& pads = handler->GetPads();
+
+	if (port_no >= config.max_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;
 
-	const auto handler = pad::get_pad_thread();
-	const auto& pads = handler->GetPads();
 	const auto& pad = pads[port_no];
 
-	if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
-		return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
+	if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
+		return CELL_PAD_ERROR_NO_DEVICE;
 
-	pad_get_data(port_no, &data->cellpad_data, true);
+	pad_get_data(port_no, &data->cellpad_data);
 
 	data->pclass_type = pad->m_class_type;
 	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 CELL_OK;
 }
 
 error_code cellPadGetRawData(u32 port_no, vm::ptr<CellPadData> data)
 {
-	cellPad.todo("cellPadGetRawData(port_no=%d, data=*0x%x)", port_no, data);
+	sys_io.todo("cellPadGetRawData(port_no=%d, data=*0x%x)", port_no, data);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -820,18 +512,20 @@ error_code cellPadGetRawData(u32 port_no, vm::ptr<CellPadData> data)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
+	const auto handler = pad::get_current_handler();
+
 	if (port_no >= CELL_MAX_PADS || !data)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
-	if (port_no >= config.get_max_connect())
+	const auto& pads = handler->GetPads();
+
+	if (port_no >= config.max_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;
 
-	const auto handler = pad::get_pad_thread();
-	const auto& pads = handler->GetPads();
-	const auto& pad = pads[port_no];
+	const auto pad = pads[port_no];
 
-	if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
-		return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
+	if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
+		return CELL_PAD_ERROR_NO_DEVICE;
 
 	// ?
 
@@ -840,10 +534,10 @@ error_code cellPadGetRawData(u32 port_no, vm::ptr<CellPadData> data)
 
 error_code cellPadGetDataExtra(u32 port_no, vm::ptr<u32> device_type, vm::ptr<CellPadData> data)
 {
-	cellPad.trace("cellPadGetDataExtra(port_no=%d, device_type=*0x%x, data=*0x%x)", port_no, device_type, data);
+	sys_io.trace("cellPadGetDataExtra(port_no=%d, device_type=*0x%x, data=*0x%x)", port_no, device_type, data);
 
 	// TODO: This is used just to get data from a BD/CEC remote,
-	// but if the port isn't a remote, device type is set to CELL_PAD_DEV_TYPE_STANDARD and just regular cellPadGetData is returned
+	// but if the port isnt a remote, device type is set to 0 and just regular cellPadGetData is returned
 
 	if (auto err = cellPadGetData(port_no, data))
 	{
@@ -852,7 +546,7 @@ error_code cellPadGetDataExtra(u32 port_no, vm::ptr<u32> device_type, vm::ptr<Ce
 
 	if (device_type) // no error is returned on NULL
 	{
-		*device_type = CELL_PAD_DEV_TYPE_STANDARD;
+		*device_type = 0;
 	}
 
 	// Set BD data
@@ -864,7 +558,7 @@ error_code cellPadGetDataExtra(u32 port_no, vm::ptr<u32> device_type, vm::ptr<Ce
 
 error_code cellPadSetActDirect(u32 port_no, vm::ptr<CellPadActParam> param)
 {
-	cellPad.trace("cellPadSetActDirect(port_no=%d, param=*0x%x)", port_no, param);
+	sys_io.trace("cellPadSetActDirect(port_no=%d, param=*0x%x)", port_no, param);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -873,6 +567,8 @@ error_code cellPadSetActDirect(u32 port_no, vm::ptr<CellPadActParam> param)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
+	const auto handler = pad::get_current_handler();
+
 	if (port_no >= CELL_MAX_PADS || !param)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
@@ -887,15 +583,15 @@ error_code cellPadSetActDirect(u32 port_no, vm::ptr<CellPadActParam> param)
 		}
 	}
 
-	if (port_no >= config.get_max_connect())
+	const auto& pads = handler->GetPads();
+
+	if (port_no >= config.max_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;
 
-	const auto handler = pad::get_pad_thread();
-	const auto& pads = handler->GetPads();
-	const auto& pad = pads[port_no];
+	const auto pad = pads[port_no];
 
-	if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
-		return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
+	if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
+		return CELL_PAD_ERROR_NO_DEVICE;
 
 	// TODO: find out if this is checked here or later or at all
 	if (!(pad->m_device_capability & CELL_PAD_CAPABILITY_ACTUATOR))
@@ -908,7 +604,7 @@ error_code cellPadSetActDirect(u32 port_no, vm::ptr<CellPadActParam> param)
 
 error_code cellPadGetInfo(vm::ptr<CellPadInfo> info)
 {
-	cellPad.trace("cellPadGetInfo(info=*0x%x)", info);
+	sys_io.trace("cellPadGetInfo(info=*0x%x)", info);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -917,43 +613,71 @@ error_code cellPadGetInfo(vm::ptr<CellPadInfo> info)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
+	const auto handler = pad::get_current_handler();
+
 	if (!info)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
 	std::memset(info.get_ptr(), 0, sizeof(CellPadInfo));
 
-	const auto handler = pad::get_pad_thread();
 	const PadInfo& rinfo = handler->GetInfo();
 	info->max_connect = config.max_connect;
+	info->now_connect = rinfo.now_connect;
 	info->system_info = rinfo.system_info;
 
-	u32 now_connect = 0;
+	const auto& pads = handler->GetPads();
 
-	for (u32 i = 0; i < config.get_max_connect(); ++i)
+	for (u32 i = 0; i < CELL_MAX_PADS; ++i)
 	{
-		pad_data_internal& reported_info = config.reported_info[i];
-		reported_info.port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES; // TODO: should ASSIGN flags be cleared here?
+		if (i >= config.max_connect)
+			break;
 
-		info->status[i] = reported_info.port_status;
+		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;
 
-		if (~reported_info.port_status & CELL_PAD_STATUS_CONNECTED)
+		if (pads[i]->m_vendor_id == 0 || pads[i]->m_product_id == 0)
 		{
-			continue;
+			// 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;
 		}
-
-		info->vendor_id[i] = reported_info.vendor_id;
-		info->product_id[i] = reported_info.product_id;
-
-		now_connect++;
 	}
 
-	info->now_connect = now_connect;
 	return CELL_OK;
 }
 
 error_code cellPadGetInfo2(vm::ptr<CellPadInfo2> info)
 {
-	cellPad.trace("cellPadGetInfo2(info=*0x%x)", info);
+	sys_io.trace("cellPadGetInfo2(info=*0x%x)", info);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -962,47 +686,38 @@ error_code cellPadGetInfo2(vm::ptr<CellPadInfo2> info)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
+	const auto handler = pad::get_current_handler();
+
 	if (!info)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
 	std::memset(info.get_ptr(), 0, sizeof(CellPadInfo2));
 
-	const auto handler = pad::get_pad_thread();
 	const PadInfo& rinfo = handler->GetInfo();
-	info->max_connect = config.get_max_connect(); // Here it is forcibly clamped
+	info->max_connect = config.max_connect;
+	info->now_connect = rinfo.now_connect;
 	info->system_info = rinfo.system_info;
 
-	u32 now_connect = 0;
-
 	const auto& pads = handler->GetPads();
 
-	for (u32 i = 0; i < config.get_max_connect(); ++i)
+	for (u32 i = 0; i < CELL_PAD_MAX_PORT_NUM; ++i)
 	{
-		pad_data_internal& reported_info = config.reported_info[i];
+		if (i >= config.max_connect)
+			break;
 
-		info->port_status[i] = reported_info.port_status;
+		info->port_status[i] = pads[i]->m_port_status;
+		pads[i]->m_port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
 		info->port_setting[i] = config.port_setting[i];
-
-		reported_info.port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
-
-		if (~reported_info.port_status & CELL_PAD_STATUS_CONNECTED)
-		{
-			continue;
-		}
-
 		info->device_capability[i] = pads[i]->m_device_capability;
 		info->device_type[i] = pads[i]->m_device_type;
-
-		now_connect++;
 	}
 
-	info->now_connect = now_connect;
 	return CELL_OK;
 }
 
 error_code cellPadGetCapabilityInfo(u32 port_no, vm::ptr<CellPadCapabilityInfo> info)
 {
-	cellPad.trace("cellPadGetCapabilityInfo(port_no=%d, data_addr:=0x%x)", port_no, info.addr());
+	sys_io.trace("cellPadGetCapabilityInfo(port_no=%d, data_addr:=0x%x)", port_no, info.addr());
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -1011,18 +726,20 @@ error_code cellPadGetCapabilityInfo(u32 port_no, vm::ptr<CellPadCapabilityInfo>
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
+	const auto handler = pad::get_current_handler();
+
 	if (port_no >= CELL_MAX_PADS || !info)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
-	if (port_no >= config.get_max_connect())
+	const auto& pads = handler->GetPads();
+
+	if (port_no >= config.max_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;
 
-	const auto handler = pad::get_pad_thread();
-	const auto& pads = handler->GetPads();
-	const auto& pad = pads[port_no];
+	const auto pad = pads[port_no];
 
-	if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
-		return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
+	if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
+		return CELL_PAD_ERROR_NO_DEVICE;
 
 	// Should return the same as device capability mask, psl1ght has it backwards in pad->h
 	memset(info->info, 0, CELL_PAD_MAX_CAPABILITY_INFO * sizeof(u32));
@@ -1033,7 +750,7 @@ error_code cellPadGetCapabilityInfo(u32 port_no, vm::ptr<CellPadCapabilityInfo>
 
 error_code cellPadSetPortSetting(u32 port_no, u32 port_setting)
 {
-	cellPad.trace("cellPadSetPortSetting(port_no=%d, port_setting=0x%x)", port_no, port_setting);
+	sys_io.trace("cellPadSetPortSetting(port_no=%d, port_setting=0x%x)", port_no, port_setting);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -1051,14 +768,14 @@ error_code cellPadSetPortSetting(u32 port_no, u32 port_setting)
 
 	config.port_setting[port_no] = port_setting;
 
-	// can also return CELL_PAD_ERROR_UNSUPPORTED_GAMEPAD <- Update: seems to be just internal and ignored
+	// can also return CELL_PAD_ERROR_UNSUPPORTED_GAMEPAD
 
 	return CELL_OK;
 }
 
 error_code cellPadInfoPressMode(u32 port_no)
 {
-	cellPad.trace("cellPadInfoPressMode(port_no=%d)", port_no);
+	sys_io.trace("cellPadInfoPressMode(port_no=%d)", port_no);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -1067,25 +784,27 @@ error_code cellPadInfoPressMode(u32 port_no)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
+	const auto handler = pad::get_current_handler();
+
 	if (port_no >= CELL_MAX_PADS)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
-	if (port_no >= config.get_max_connect())
+	const auto& pads = handler->GetPads();
+
+	if (port_no >= config.max_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;
 
-	const auto handler = pad::get_pad_thread();
-	const auto& pads = handler->GetPads();
-	const auto& pad = pads[port_no];
+	const auto pad = pads[port_no];
 
-	if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
-		return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
+	if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
+		return CELL_PAD_ERROR_NO_DEVICE;
 
 	return not_an_error((pad->m_device_capability & CELL_PAD_CAPABILITY_PRESS_MODE) ? 1 : 0);
 }
 
 error_code cellPadInfoSensorMode(u32 port_no)
 {
-	cellPad.trace("cellPadInfoSensorMode(port_no=%d)", port_no);
+	sys_io.trace("cellPadInfoSensorMode(port_no=%d)", port_no);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -1094,25 +813,27 @@ error_code cellPadInfoSensorMode(u32 port_no)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
+	const auto handler = pad::get_current_handler();
+
 	if (port_no >= CELL_MAX_PADS)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
-	if (port_no >= config.get_max_connect())
+	const auto& pads = handler->GetPads();
+
+	if (port_no >= config.max_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;
 
-	const auto handler = pad::get_pad_thread();
-	const auto& pads = handler->GetPads();
-	const auto& pad = pads[port_no];
+	const auto pad = pads[port_no];
 
-	if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
-		return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
+	if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
+		return CELL_PAD_ERROR_NO_DEVICE;
 
 	return not_an_error((pad->m_device_capability & CELL_PAD_CAPABILITY_SENSOR_MODE) ? 1 : 0);
 }
 
 error_code cellPadSetPressMode(u32 port_no, u32 mode)
 {
-	cellPad.trace("cellPadSetPressMode(port_no=%d, mode=%d)", port_no, mode);
+	sys_io.trace("cellPadSetPressMode(port_no=%d, mode=%d)", port_no, mode);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -1121,16 +842,18 @@ error_code cellPadSetPressMode(u32 port_no, u32 mode)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
+	const auto handler = pad::get_current_handler();
+
 	if (port_no >= CELL_PAD_MAX_PORT_NUM)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
+	const auto& pads = handler->GetPads();
+
 	// CELL_PAD_ERROR_NO_DEVICE is not returned in this case.
 	if (port_no >= CELL_PAD_MAX_PORT_NUM)
 		return CELL_OK;
 
-	const auto handler = pad::get_pad_thread();
-	const auto& pads = handler->GetPads();
-	const auto& pad = pads[port_no];
+	const auto pad = pads[port_no];
 
 	// TODO: find out if this is checked here or later or at all
 	if (!(pad->m_device_capability & CELL_PAD_CAPABILITY_PRESS_MODE))
@@ -1146,7 +869,7 @@ error_code cellPadSetPressMode(u32 port_no, u32 mode)
 
 error_code cellPadSetSensorMode(u32 port_no, u32 mode)
 {
-	cellPad.trace("cellPadSetSensorMode(port_no=%d, mode=%d)", port_no, mode);
+	sys_io.trace("cellPadSetSensorMode(port_no=%d, mode=%d)", port_no, mode);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -1155,15 +878,17 @@ error_code cellPadSetSensorMode(u32 port_no, u32 mode)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
+	const auto handler = pad::get_current_handler();
+
 	if (port_no >= CELL_MAX_PADS)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
+	const auto& pads = handler->GetPads();
+
 	// CELL_PAD_ERROR_NO_DEVICE is not returned in this case.
 	if (port_no >= CELL_PAD_MAX_PORT_NUM)
 		return CELL_OK;
 
-	const auto handler = pad::get_pad_thread();
-	const auto& pads = handler->GetPads();
 	const auto& pad = pads[port_no];
 
 	// TODO: find out if this is checked here or later or at all
@@ -1180,7 +905,7 @@ error_code cellPadSetSensorMode(u32 port_no, u32 mode)
 
 error_code cellPadLddRegisterController()
 {
-	cellPad.warning("cellPadLddRegisterController()");
+	sys_io.warning("cellPadLddRegisterController()");
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -1189,7 +914,7 @@ error_code cellPadLddRegisterController()
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
-	const auto handler = pad::get_pad_thread();
+	const auto handler = pad::get_current_handler();
 
 	const s32 handle = handler->AddLddPad();
 
@@ -1198,14 +923,12 @@ error_code cellPadLddRegisterController()
 
 	config.port_setting[handle] = 0;
 
-	cellPad_NotifyStateChange(handle, CELL_PAD_STATUS_CONNECTED, false);
-
 	return not_an_error(handle);
 }
 
 error_code cellPadLddDataInsert(s32 handle, vm::ptr<CellPadData> data)
 {
-	cellPad.trace("cellPadLddDataInsert(handle=%d, data=*0x%x)", handle, data);
+	sys_io.trace("cellPadLddDataInsert(handle=%d, data=*0x%x)", handle, data);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -1214,23 +937,23 @@ error_code cellPadLddDataInsert(s32 handle, vm::ptr<CellPadData> data)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
-	const auto handler = pad::get_pad_thread();
-	auto& pads = handler->GetPads();
+	const auto handler = pad::get_current_handler();
 
-	if (handle < 0 || static_cast<u32>(handle) >= pads.size() || !data) // data == NULL stalls on decr
+	if (handle < 0 || !data) // data == NULL stalls on decr
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
+	auto& pads = handler->GetPads();
 	if (!pads[handle]->ldd)
 		return CELL_PAD_ERROR_NO_DEVICE;
 
-	pads[handle]->ldd_data = *data;
+	memcpy(pads[handle]->ldd_data, data.get_ptr(), sizeof(CellPadData));
 
 	return CELL_OK;
 }
 
 error_code cellPadLddGetPortNo(s32 handle)
 {
-	cellPad.trace("cellPadLddGetPortNo(handle=%d)", handle);
+	sys_io.trace("cellPadLddGetPortNo(handle=%d)", handle);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -1239,12 +962,12 @@ error_code cellPadLddGetPortNo(s32 handle)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
-	const auto handler = pad::get_pad_thread();
-	const auto& pads = handler->GetPads();
+	const auto handler = pad::get_current_handler();
 
-	if (handle < 0 || static_cast<u32>(handle) >= pads.size())
+	if (handle < 0)
 		return CELL_PAD_ERROR_INVALID_PARAMETER;
 
+	auto& pads = handler->GetPads();
 	if (!pads[handle]->ldd)
 		return CELL_PAD_ERROR_FATAL; // might be incorrect
 
@@ -1254,7 +977,7 @@ error_code cellPadLddGetPortNo(s32 handle)
 
 error_code cellPadLddUnregisterController(s32 handle)
 {
-	cellPad.warning("cellPadLddUnregisterController(handle=%d)", handle);
+	sys_io.warning("cellPadLddUnregisterController(handle=%d)", handle);
 
 	std::lock_guard lock(pad::g_pad_mutex);
 
@@ -1263,24 +986,26 @@ error_code cellPadLddUnregisterController(s32 handle)
 	if (!config.max_connect)
 		return CELL_PAD_ERROR_UNINITIALIZED;
 
-	const auto handler = pad::get_pad_thread();
+	const auto handler = pad::get_current_handler();
+
+	if (handle < 0)
+		return CELL_PAD_ERROR_INVALID_PARAMETER;
+
 	const auto& pads = handler->GetPads();
 
-	if (handle < 0 || static_cast<u32>(handle) >= pads.size())
-		return CELL_PAD_ERROR_INVALID_PARAMETER;
+	// TODO: check if handle >= pads.size()
 
 	if (!pads[handle]->ldd)
 		return CELL_PAD_ERROR_NO_DEVICE;
 
 	handler->UnregisterLddPad(handle);
-	cellPad_NotifyStateChange(handle, CELL_PAD_STATUS_DISCONNECTED, false);
 
 	return CELL_OK;
 }
 
 error_code cellPadFilterIIRInit(vm::ptr<CellPadFilterIIRSos> pSos, s32 cutoff)
 {
-	cellPad.todo("cellPadFilterIIRInit(pSos=*0x%x, cutoff=%d)", pSos, cutoff);
+	sys_io.todo("cellPadFilterIIRInit(pSos=*0x%x, cutoff=%d)", pSos, cutoff);
 
 	if (!pSos) // TODO: does this check for cutoff > 2 ?
 	{
@@ -1292,7 +1017,7 @@ error_code cellPadFilterIIRInit(vm::ptr<CellPadFilterIIRSos> pSos, s32 cutoff)
 
 u32 cellPadFilterIIRFilter(vm::ptr<CellPadFilterIIRSos> pSos, u32 filterIn)
 {
-	cellPad.todo("cellPadFilterIIRFilter(pSos=*0x%x, filterIn=%d)", pSos, filterIn);
+	sys_io.todo("cellPadFilterIIRFilter(pSos=*0x%x, filterIn=%d)", pSos, filterIn);
 
 	// TODO: apply filter
 
@@ -1303,7 +1028,7 @@ s32 sys_io_3733EA3C(u32 port_no, vm::ptr<u32> device_type, vm::ptr<CellPadData>
 {
 	// Used by the ps1 emulator built into the firmware
 	// Seems to call the same function that getdataextra does
-	cellPad.trace("sys_io_3733EA3C(port_no=%d, device_type=*0x%x, data=*0x%x)", port_no, device_type, data);
+	sys_io.trace("sys_io_3733EA3C(port_no=%d, device_type=*0x%x, data=*0x%x)", port_no, device_type, data);
 	return cellPadGetDataExtra(port_no, device_type, data);
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellPad.h b/rpcs3/Emu/Cell/Modules/cellPad.h
index 0d199e488c..404caadc08 100644
--- a/rpcs3/Emu/Cell/Modules/cellPad.h
+++ b/rpcs3/Emu/Cell/Modules/cellPad.h
@@ -23,6 +23,92 @@ enum CellPadFilterError : u32
 	CELL_PADFILTER_ERROR_INVALID_PARAMETER = 0x80121401,
 };
 
+// Controller types
+enum
+{
+	CELL_PAD_PCLASS_TYPE_STANDARD   = 0x00,
+	CELL_PAD_PCLASS_TYPE_GUITAR     = 0x01,
+	CELL_PAD_PCLASS_TYPE_DRUM       = 0x02,
+	CELL_PAD_PCLASS_TYPE_DJ         = 0x03,
+	CELL_PAD_PCLASS_TYPE_DANCEMAT   = 0x04,
+	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
 {
@@ -39,17 +125,10 @@ enum
 	CELL_PADFILTER_IIR_CUTOFF_2ND_LPF_BT_010 = 2, // 10% Nyquist frequency
 };
 
-struct pad_data_internal
+struct CellPadData
 {
-	u16 vendor_id = 0;
-	u16 product_id = 0;
-	u32 port_status = 0;
-	u32 device_capability = 0;
-	u32 device_type = 0;
-	u32 pclass_type = 0;
-	u32 pclass_profile = 0;
-
-	ENABLE_BITWISE_SERIALIZATION;
+	be_t<s32> len;
+	be_t<u16> button[CELL_PAD_MAX_CODES];
 };
 
 struct CellPadInfo
@@ -118,27 +197,8 @@ struct pad_info
 {
 	atomic_t<u32> max_connect = 0;
 	std::array<u32, CELL_PAD_MAX_PORT_NUM> port_setting{ 0 };
-	std::array<pad_data_internal, CELL_PAD_MAX_PORT_NUM> reported_info{};
-
-	SAVESTATE_INIT_POS(11);
-
-	pad_info() = default;
-	pad_info(utils::serial& ar);
-	void save(utils::serial& ar);
-
-	u32 get_max_connect() const
-	{
-		return std::min<u32>(max_connect, CELL_PAD_MAX_PORT_NUM);
-	}
-
-	// Unreliable way the firmware uses to optimize away pad calls for disconnected pads
-	// This result relies on data updates from config events on a dedicated thread to receive them
-	bool is_reportedly_connected(u32 port_no) const
-	{
-		return port_no < get_max_connect() && !!(reported_info[port_no].port_status & CELL_PAD_STATUS_CONNECTED);
-	}
 };
 
 error_code cellPadGetData(u32 port_no, vm::ptr<CellPadData> data);
-error_code cellPadInit(ppu_thread& ppu, u32 max_connect);
+error_code cellPadInit(u32 max_connect);
 error_code cellPadSetPortSetting(u32 port_no, u32 port_setting);
diff --git a/rpcs3/Emu/Cell/Modules/cellPamf.cpp b/rpcs3/Emu/Cell/Modules/cellPamf.cpp
index d63e7bb3e2..32705c1f64 100644
--- a/rpcs3/Emu/Cell/Modules/cellPamf.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellPamf.cpp
@@ -2,7 +2,6 @@
 #include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 
-#include <bitset>
 #include "cellPamf.h"
 
 const std::function<bool()> SQUEUE_ALWAYS_EXIT = []() { return true; };
@@ -29,1005 +28,410 @@ void fmt_class_string<CellPamfError>::format(std::string& out, u64 arg)
 			STR_CASE(CELL_PAMF_ERROR_UNSUPPORTED_VERSION);
 			STR_CASE(CELL_PAMF_ERROR_UNKNOWN_STREAM);
 			STR_CASE(CELL_PAMF_ERROR_EP_NOT_FOUND);
-			STR_CASE(CELL_PAMF_ERROR_NOT_AVAILABLE);
 		}
 
 		return unknown;
 	});
 }
 
-error_code pamfVerifyMagicAndVersion(vm::cptr<PamfHeader> pAddr, vm::ptr<CellPamfReader> pSelf)
+error_code pamfStreamTypeToEsFilterId(u8 type, u8 ch, CellCodecEsFilterId& pEsFilterId)
 {
-	ensure(!!pAddr); // Not checked on LLE
-
-	if (pAddr->magic != std::bit_cast<be_t<u32>>("PAMF"_u32))
-	{
-		return CELL_PAMF_ERROR_UNKNOWN_TYPE;
-	}
-
-	if (pSelf)
-	{
-		pSelf->isPsmf = false;
-	}
-
-	be_t<u16> version;
-
-	if (pAddr->version == std::bit_cast<be_t<u32>>("0040"_u32))
-	{
-		version = 40;
-	}
-	else if (pAddr->version == std::bit_cast<be_t<u32>>("0041"_u32))
-	{
-		version = 41;
-	}
-	else
-	{
-		return CELL_PAMF_ERROR_UNSUPPORTED_VERSION;
-	}
-
-	if (pSelf)
-	{
-		pSelf->version = version;
-	}
-
-	return CELL_OK;
-}
-
-error_code pamfGetHeaderAndDataSize(vm::cptr<PamfHeader> pAddr, u64 fileSize, vm::ptr<u64> headerSize, vm::ptr<u64> dataSize)
-{
-	ensure(!!pAddr); // Not checked on LLE
-
-	if (error_code ret = pamfVerifyMagicAndVersion(pAddr, vm::null); ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	const u64 header_size = pAddr->header_size * 0x800ull;
-	const u64 data_size = pAddr->data_size * 0x800ull;
-
-	if (header_size == 0 || (fileSize != 0 && header_size + data_size != fileSize))
-	{
-		return CELL_PAMF_ERROR_INVALID_PAMF;
-	}
-
-	if (headerSize)
-	{
-		*headerSize = header_size;
-	}
-
-	if (dataSize)
-	{
-		*dataSize = data_size;
-	}
-
-	return CELL_OK;
-}
-
-error_code pamfTypeChannelToStream(u8 type, u8 ch, u8* stream_coding_type, u8* stream_id, u8* private_stream_id)
-{
-	// This function breaks if ch is greater than 15, LLE doesn't check for this
+	// convert type and ch to EsFilterId
 	ensure(ch < 16);
-
-	u8 _stream_coding_type;
-	u8 _stream_id;
-	u8 _private_stream_id;
+	pEsFilterId.supplementalInfo1 = type == CELL_PAMF_STREAM_TYPE_AVC;
+	pEsFilterId.supplementalInfo2 = 0;
 
 	switch (type)
 	{
 	case CELL_PAMF_STREAM_TYPE_AVC:
 	{
-		_stream_coding_type = PAMF_STREAM_CODING_TYPE_AVC;
-		_stream_id = 0xe0 | ch;
-		_private_stream_id = 0;
+		// code = 0x1b
+		pEsFilterId.filterIdMajor = 0xe0 | ch;
+		pEsFilterId.filterIdMinor = 0;
 		break;
 	}
 
 	case CELL_PAMF_STREAM_TYPE_M2V:
 	{
-		_stream_coding_type = PAMF_STREAM_CODING_TYPE_M2V;
-		_stream_id = 0xe0 | ch;
-		_private_stream_id = 0;
+		// code = 0x02
+		pEsFilterId.filterIdMajor = 0xe0 | ch;
+		pEsFilterId.filterIdMinor = 0;
 		break;
 	}
 
 	case CELL_PAMF_STREAM_TYPE_ATRAC3PLUS:
 	{
-		_stream_coding_type = PAMF_STREAM_CODING_TYPE_ATRAC3PLUS;
-		_stream_id = 0xbd;
-		_private_stream_id = ch;
+		// code = 0xdc
+		pEsFilterId.filterIdMajor = 0xbd;
+		pEsFilterId.filterIdMinor = ch;
 		break;
 	}
 
 	case CELL_PAMF_STREAM_TYPE_PAMF_LPCM:
 	{
-		_stream_coding_type = PAMF_STREAM_CODING_TYPE_PAMF_LPCM;
-		_stream_id = 0xbd;
-		_private_stream_id = 0x40 | ch;
+		// code = 0x80
+		pEsFilterId.filterIdMajor = 0xbd;
+		pEsFilterId.filterIdMinor = 0x40 | ch;
 		break;
 	}
 
 	case CELL_PAMF_STREAM_TYPE_AC3:
 	{
-		_stream_coding_type = PAMF_STREAM_CODING_TYPE_AC3;
-		_stream_id = 0xbd;
-		_private_stream_id = 0x30 | ch;
+		// code = 0x81
+		pEsFilterId.filterIdMajor = 0xbd;
+		pEsFilterId.filterIdMinor = 0x30 | ch;
 		break;
 	}
 
 	case CELL_PAMF_STREAM_TYPE_USER_DATA:
 	{
-		_stream_coding_type = PAMF_STREAM_CODING_TYPE_USER_DATA;
-		_stream_id = 0xbd;
-		_private_stream_id = 0x20 | ch;
+		// code = 0xdd
+		pEsFilterId.filterIdMajor = 0xbd;
+		pEsFilterId.filterIdMinor = 0x20 | ch;
 		break;
 	}
 
-	case CELL_PAMF_STREAM_TYPE_PSMF_AVC:
+	case 6:
 	{
-		_stream_coding_type = PAMF_STREAM_CODING_TYPE_PSMF;
-		_stream_id = 0xe0 | ch;
-		_private_stream_id = 0;
+		// code = 0xff
+		pEsFilterId.filterIdMajor = 0xe0 | ch;
+		pEsFilterId.filterIdMinor = 0;
 		break;
 	}
 
-	case CELL_PAMF_STREAM_TYPE_PSMF_ATRAC3PLUS:
+	case 7:
 	{
-		_stream_coding_type = PAMF_STREAM_CODING_TYPE_PSMF;
-		_stream_id = 0xbd;
-		_private_stream_id = ch;
+		// code = 0xff
+		pEsFilterId.filterIdMajor = 0xbd;
+		pEsFilterId.filterIdMinor = ch;
 		break;
 	}
 
-	case CELL_PAMF_STREAM_TYPE_PSMF_LPCM:
+	case 8:
 	{
-		_stream_coding_type = PAMF_STREAM_CODING_TYPE_PSMF;
-		_stream_id = 0xbd;
-		_private_stream_id = 0x10 | ch;
+		// code = 0xff
+		pEsFilterId.filterIdMajor = 0xbd;
+		pEsFilterId.filterIdMinor = 0x10 | ch;
 		break;
 	}
 
-	case CELL_PAMF_STREAM_TYPE_PSMF_USER_DATA:
+	case 9:
 	{
-		_stream_coding_type = PAMF_STREAM_CODING_TYPE_PSMF;
-		_stream_id = 0xbd;
-		_private_stream_id = 0x20 | ch;
+		// code = 0xff
+		pEsFilterId.filterIdMajor = 0xbd;
+		pEsFilterId.filterIdMinor = 0x20 | ch;
 		break;
 	}
 
 	default:
 	{
-		cellPamf.error("pamfTypeChannelToStream(): unknown type %d", type);
+		cellPamf.fatal("pamfStreamTypeToEsFilterId(): unknown type (%d, ch=%d)", type, ch);
 		return CELL_PAMF_ERROR_INVALID_ARG;
 	}
 	}
 
-	if (stream_coding_type)
-	{
-		*stream_coding_type = _stream_coding_type;
-	}
-
-	if (stream_id)
-	{
-		*stream_id = _stream_id;
-	}
-
-	if (private_stream_id)
-	{
-		*private_stream_id = _private_stream_id;
-	}
-
 	return CELL_OK;
 }
 
-error_code pamfStreamToTypeChannel(u8 stream_coding_type, u8 stream_id, u8 private_stream_id, vm::ptr<u8> type, vm::ptr<u8> ch)
+u8 pamfGetStreamType(vm::ptr<CellPamfReader> pSelf, u32 stream)
 {
-	u8 _type;
-	u8 _ch;
+	// TODO: get stream type correctly
+	ensure(stream < pSelf->pAddr->stream_count);
+	auto& header = pSelf->pAddr->stream_headers[stream];
 
-	switch (stream_coding_type)
+	switch (header.type)
 	{
-	case PAMF_STREAM_CODING_TYPE_AVC:
-		_type = CELL_PAMF_STREAM_TYPE_AVC;
-		_ch = stream_id & 0x0f;
-		break;
-
-	case PAMF_STREAM_CODING_TYPE_M2V:
-		_type = CELL_PAMF_STREAM_TYPE_M2V;
-		_ch = stream_id & 0x0f;
-		break;
-
-	case PAMF_STREAM_CODING_TYPE_ATRAC3PLUS:
-		_type = CELL_PAMF_STREAM_TYPE_ATRAC3PLUS;
-		_ch = private_stream_id & 0x0f;
-		break;
-
-	case PAMF_STREAM_CODING_TYPE_PAMF_LPCM:
-		_type = CELL_PAMF_STREAM_TYPE_PAMF_LPCM;
-		_ch = private_stream_id & 0x0f;
-		break;
-
-	case PAMF_STREAM_CODING_TYPE_AC3:
-		_type = CELL_PAMF_STREAM_TYPE_AC3;
-		_ch = private_stream_id & 0x0f;
-		break;
-
-	case PAMF_STREAM_CODING_TYPE_USER_DATA:
-		_type = CELL_PAMF_STREAM_TYPE_USER_DATA;
-		_ch = private_stream_id & 0x0f;
-		break;
-
-	case PAMF_STREAM_CODING_TYPE_PSMF:
-		if ((stream_id & 0xf0) == 0xe0)
-		{
-			_type = CELL_PAMF_STREAM_TYPE_PSMF_AVC;
-			_ch = stream_id & 0x0f;
-
-			if (private_stream_id != 0)
-			{
-				return CELL_PAMF_ERROR_STREAM_NOT_FOUND;
-			}
-		}
-		else if (stream_id == 0xbd)
-		{
-			_ch = private_stream_id & 0x0f;
-
-			switch (private_stream_id & 0xf0)
-			{
-			case 0x00: _type = CELL_PAMF_STREAM_TYPE_PSMF_ATRAC3PLUS; break;
-			case 0x10: _type = CELL_PAMF_STREAM_TYPE_PSMF_LPCM; break;
-			case 0x20: _type = CELL_PAMF_STREAM_TYPE_PSMF_LPCM; break; // LLE doesn't use CELL_PAMF_STREAM_TYPE_PSMF_USER_DATA for some reason
-			default: return CELL_PAMF_ERROR_STREAM_NOT_FOUND;
-			}
-		}
-		else
-		{
-			return CELL_PAMF_ERROR_STREAM_NOT_FOUND;
-		}
-		break;
-
-	default:
-		cellPamf.error("pamfStreamToTypeChannel(): unknown stream_coding_type 0x%02x", stream_coding_type);
-		return CELL_PAMF_ERROR_STREAM_NOT_FOUND;
+	case 0x1b: return CELL_PAMF_STREAM_TYPE_AVC;
+	case 0x02: return CELL_PAMF_STREAM_TYPE_M2V;
+	case 0xdc: return CELL_PAMF_STREAM_TYPE_ATRAC3PLUS;
+	case 0x80: return CELL_PAMF_STREAM_TYPE_PAMF_LPCM;
+	case 0x81: return CELL_PAMF_STREAM_TYPE_AC3;
+	case 0xdd: return CELL_PAMF_STREAM_TYPE_USER_DATA;
+	default: break;
 	}
 
-	if (type)
-	{
-		*type = _type;
-	}
-
-	if (ch)
-	{
-		*ch = _ch;
-	}
-
-	return CELL_OK;
+	cellPamf.fatal("pamfGetStreamType(): unsupported stream type found(0x%x)", header.type);
+	return 0xff;
 }
 
-void pamfEpUnpack(vm::cptr<PamfEpHeader> ep_packed, vm::ptr<CellPamfEp> ep)
+u8 pamfGetStreamChannel(vm::ptr<CellPamfReader> pSelf, u32 stream)
 {
-	ensure(!!ep_packed && !!ep); // Not checked on LLE
+	// TODO: get stream channel correctly
+	ensure(stream < pSelf->pAddr->stream_count);
+	auto& header = pSelf->pAddr->stream_headers[stream];
 
-	ep->indexN = (ep_packed->value0 >> 14) + 1;
-	ep->nThRefPictureOffset = ((ep_packed->value0 & 0x1fff) * 0x800) + 0x800;
-	ep->pts.upper = ep_packed->pts_high;
-	ep->pts.lower = ep_packed->pts_low;
-	ep->rpnOffset = ep_packed->rpnOffset * 0x800ull;
+	switch (header.type)
+	{
+	case 0x1b: // AVC
+	case 0x02: // M2V
+	{
+		ensure((header.fid_major & 0xf0) == 0xe0);
+		ensure(!header.fid_minor);
+		return header.fid_major % 16;
+	}
+
+	case 0xdc: // ATRAC3PLUS
+	{
+		ensure((header.fid_major == 0xbd));
+		ensure((header.fid_minor & 0xf0) == 0);
+		return header.fid_minor % 16;
+	}
+
+	case 0x80: // LPCM
+	{
+		ensure((header.fid_major == 0xbd));
+		ensure((header.fid_minor & 0xf0) == 0x40);
+		return header.fid_minor % 16;
+	}
+	case 0x81: // AC3
+	{
+		ensure((header.fid_major == 0xbd));
+		ensure((header.fid_minor & 0xf0) == 0x30);
+		return header.fid_minor % 16;
+	}
+	case 0xdd:
+	{
+		ensure((header.fid_major == 0xbd));
+		ensure((header.fid_minor & 0xf0) == 0x20);
+		return header.fid_minor % 16;
+	}
+	default: break;
+	}
+
+	cellPamf.fatal("pamfGetStreamChannel(): unsupported stream type found(0x%x)", header.type);
+	return 0xff;
 }
 
-void psmfEpUnpack(vm::cptr<PsmfEpHeader> ep_packed, vm::ptr<CellPamfEp> ep)
-{
-	ensure(!!ep_packed && !!ep); // Not checked on LLE
-
-	ep->indexN = (ep_packed->value0 >> 14) + 1;
-	ep->nThRefPictureOffset = ((ep_packed->value0 & 0xffe) * 0x400) + 0x800;
-	ep->pts.upper = ep_packed->value0 & 1;
-	ep->pts.lower = ep_packed->pts_low;
-	ep->rpnOffset = ep_packed->rpnOffset * 0x800ull;
-}
-
-bool pamfIsSameStreamType(u8 type, u8 requested_type)
-{
-	switch (requested_type)
-	{
-	case CELL_PAMF_STREAM_TYPE_VIDEO: return type == CELL_PAMF_STREAM_TYPE_AVC || type == CELL_PAMF_STREAM_TYPE_M2V;
-	case CELL_PAMF_STREAM_TYPE_AUDIO: return type == CELL_PAMF_STREAM_TYPE_ATRAC3PLUS || type == CELL_PAMF_STREAM_TYPE_AC3 || type == CELL_PAMF_STREAM_TYPE_PAMF_LPCM;
-	case CELL_PAMF_STREAM_TYPE_UNK:   return type == CELL_PAMF_STREAM_TYPE_PAMF_LPCM || type == CELL_PAMF_STREAM_TYPE_PSMF_ATRAC3PLUS; // ??? no idea what this is for
-	default:                          return requested_type == type;
-	}
-}
-
-error_code pamfVerify(vm::cptr<PamfHeader> pAddr, u64 fileSize, vm::ptr<CellPamfReader> pSelf, u32 attribute)
-{
-	ensure(!!pAddr); // Not checked on LLE
-
-	if (error_code ret = pamfVerifyMagicAndVersion(pAddr, pSelf); ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	const u64 header_size = pAddr->header_size * 0x800ull;
-	const u64 data_size = pAddr->data_size * 0x800ull;
-
-	// Header size
-	if (header_size == 0)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid header_size" };
-	}
-
-	if (pSelf)
-	{
-		pSelf->headerSize = header_size;
-		pSelf->dataSize = data_size;
-	}
-
-	// Data size
-	if (fileSize != 0 && header_size + data_size != fileSize)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: fileSize isn't equal header_size + data_size" };
-	}
-
-	const u32 psmf_marks_offset = pAddr->psmf_marks_offset;
-	const u32 psmf_marks_size = pAddr->psmf_marks_size;
-	const u32 unk_offset = pAddr->unk_offset;
-	const u32 unk_size = pAddr->unk_size;
-
-	// PsmfMarks
-	if (psmf_marks_offset == 0)
-	{
-		if (psmf_marks_size != 0)
-		{
-			return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: psmf_marks_offset is zero but psmf_marks_size is not zero" };
-		}
-	}
-	else
-	{
-		if (psmf_marks_size == 0)
-		{
-			return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: psmf_marks_offset is set but psmf_marks_size is zero" };
-		}
-
-		if (header_size < static_cast<u64>(psmf_marks_offset) + psmf_marks_size)
-		{
-			return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: header_size is less than psmf_marks_offset + psmf_marks_size" };
-		}
-	}
-
-	if (unk_offset == 0)
-	{
-		if (unk_size != 0)
-		{
-			return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: unk_offset is zero but unk_size is not zero" };
-		}
-	}
-	else
-	{
-		if (unk_size == 0)
-		{
-			return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: unk_offset is set but unk_size is zero" };
-		}
-
-		if (header_size < static_cast<u64>(unk_offset) + unk_size)
-		{
-			return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: header_size is less than unk_offset + unk_size" };
-		}
-	}
-
-	if (unk_offset < static_cast<u64>(psmf_marks_offset) + psmf_marks_size)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: unk_offset is less than psmf_marks_offset + psmf_marks_size" };
-	}
-
-
-	// Sequence Info
-
-	const u32 seq_info_size = pAddr->seq_info.size;
-
-	// Sequence info size
-	if (offsetof(PamfHeader, seq_info) + sizeof(u32) + seq_info_size > header_size)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid seq_info_size" };
-	}
-
-	const u64 start_pts = static_cast<u64>(pAddr->seq_info.start_pts_high) << 32 | pAddr->seq_info.start_pts_low;
-	const u64 end_pts = static_cast<u64>(pAddr->seq_info.end_pts_high) << 32 | pAddr->seq_info.end_pts_low;
-
-	// Start and end presentation time stamps
-	if (end_pts > CODEC_TS_INVALID)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid end_pts" };
-	}
-
-	if (start_pts >= end_pts)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid start_pts" };
-	}
-
-	// Grouping period count
-	if (pAddr->seq_info.grouping_period_num != 1)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid grouping_period_num" };
-	}
-
-
-	// Grouping Period
-
-	const u32 grouping_period_size = pAddr->seq_info.grouping_periods.size;
-
-	// Grouping period size
-	if (offsetof(PamfHeader, seq_info.grouping_periods) + sizeof(u32) + grouping_period_size > header_size)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid grouping_period_size" };
-	}
-
-	const u64 grp_period_start_pts = static_cast<u64>(pAddr->seq_info.grouping_periods.start_pts_high) << 32 | pAddr->seq_info.grouping_periods.start_pts_low;
-	const u64 grp_period_end_pts = static_cast<u64>(pAddr->seq_info.grouping_periods.start_pts_high) << 32 | pAddr->seq_info.grouping_periods.end_pts_low; // LLE uses start_pts_high due to a bug
-
-	// Start and end presentation time stamps
-	if (grp_period_end_pts > CODEC_TS_INVALID)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid grp_period_end_pts" };
-	}
-
-	if (grp_period_start_pts >= grp_period_end_pts)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid grp_period_start_pts" };
-	}
-
-	if (grp_period_start_pts != start_pts)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: grp_period_start_pts not equal start_pts" };
-	}
-
-	// Group count
-	if (pAddr->seq_info.grouping_periods.group_num != 1)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid group_num" };
-	}
-
-
-	// Group
-
-	const u32 group_size = pAddr->seq_info.grouping_periods.groups.size;
-
-	// StreamGroup size
-	if (offsetof(PamfHeader, seq_info.grouping_periods.groups) + sizeof(u32) + group_size > header_size)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid group_size" };
-	}
-
-	const u8 stream_num = pAddr->seq_info.grouping_periods.groups.stream_num;
-
-	// Stream count
-	if (stream_num == 0)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid stream_num" };
-	}
-
-
-	// Streams
-
-	const auto streams = &pAddr->seq_info.grouping_periods.groups.streams;
-
-	std::bitset<16> channels_used[6]{};
-
-	u32 end_of_streams_addr = 0;
-	u32 next_ep_table_addr = 0;
-
-	for (u8 stream_idx = 0; stream_idx < stream_num; stream_idx++)
-	{
-		vm::var<u8> type;
-		vm::var<u8> ch;
-
-		// Stream coding type and IDs
-		if (pamfStreamToTypeChannel(streams[stream_idx].stream_coding_type, streams[stream_idx].stream_id, streams[stream_idx].private_stream_id, type, ch) != CELL_OK)
-		{
-			return CELL_PAMF_ERROR_UNKNOWN_STREAM;
-		}
-
-		// Every channel may only be used once per type
-		if (channels_used[*type].test(*ch))
-		{
-			return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid channel" };
-		}
-
-		// Mark channel as used
-		channels_used[*type].set(*ch);
-
-		const u32 ep_offset = streams[stream_idx].ep_offset;
-		const u32 ep_num = streams[stream_idx].ep_num;
-
-		// Entry point offset and number
-		if (ep_num == 0)
-		{
-			if (ep_offset != 0)
-			{
-				return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: ep_num is zero but ep_offset is not zero" };
-			}
-		}
-		else
-		{
-			if (ep_offset == 0)
-			{
-				return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid ep_offset" };
-			}
-
-			if (ep_offset + ep_num * sizeof(PamfEpHeader) > header_size)
-			{
-				return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid ep_num" };
-			}
-		}
-
-
-		// Entry points
-
-		// Skip if there are no entry points or if the minimum header attribute is set
-		if (ep_offset == 0 || attribute & CELL_PAMF_ATTRIBUTE_MINIMUM_HEADER)
-		{
-			continue;
-		}
-
-		const auto eps = vm::cptr<PamfEpHeader>::make(pAddr.addr() + ep_offset);
-
-		// Entry point tables must be sorted by the stream index to which they belong
-		// and there mustn't be any gaps between them
-		if (end_of_streams_addr == 0)
-		{
-			end_of_streams_addr = eps.addr();
-			next_ep_table_addr = end_of_streams_addr;
-		}
-		else if (next_ep_table_addr != eps.addr())
-		{
-			return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid ep table address" };
-		}
-
-		u64 previous_rpn_offset = 0;
-		for (u32 ep_idx = 0; ep_idx < ep_num; ep_idx++)
-		{
-			const u64 pts = static_cast<u64>(eps[ep_idx].pts_high) << 32 | eps[ep_idx].pts_low;
-
-			// Entry point time stamp
-			if (pts > CODEC_TS_INVALID)
-			{
-				return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid ep pts" };
-			}
-
-			const u64 rpn_offset = eps[ep_idx].rpnOffset * 0x800ull;
-
-			// Entry point rpnOffset
-			if (rpn_offset > data_size || rpn_offset < previous_rpn_offset)
-			{
-				return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid rpn_offset" };
-			}
-
-			previous_rpn_offset = rpn_offset;
-		}
-
-		next_ep_table_addr += ep_num * sizeof(PamfEpHeader);
-	}
-
-	// This can overflow on LLE, the +4 is necessary on both sides and the left operand needs to be u32
-	if (group_size + 4 > grouping_period_size - offsetof(PamfGroupingPeriod, groups) + sizeof(u32)
-		|| grouping_period_size + 4 > seq_info_size - offsetof(PamfSequenceInfo, grouping_periods) + sizeof(u32))
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: size mismatch" };
-	}
-
-	// Since multiple grouping periods/groups was never implemented, number of streams in SequenceInfo must be equal stream_num in Group
-	if (pAddr->seq_info.total_stream_num != stream_num)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: number of streams mismatch" };
-	}
-
-
-	// PsmfMarks
-	// This is probably useless since the official PAMF tools don't support PsmfMarks
-
-	if (end_of_streams_addr == 0)
-	{
-		if (psmf_marks_offset != 0)
-		{
-			end_of_streams_addr = pAddr.addr() + psmf_marks_offset;
-		}
-		else if (unk_offset != 0)
-		{
-			end_of_streams_addr = pAddr.addr() + unk_offset;
-		}
-	}
-
-	if (end_of_streams_addr != 0 && pAddr.addr() + offsetof(PamfHeader, seq_info.grouping_periods) + sizeof(u32) + grouping_period_size != end_of_streams_addr)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid offset of ep tables or psmf marks" };
-	}
-
-	if (next_ep_table_addr != 0 && psmf_marks_offset == 0)
-	{
-		if (unk_offset != 0 && pAddr.addr() + unk_offset != next_ep_table_addr)
-		{
-			return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid unk_offset" };
-		}
-	}
-	else if (next_ep_table_addr != 0 && pAddr.addr() + psmf_marks_offset != next_ep_table_addr)
-	{
-		return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid psmf_marks_offset" };
-	}
-	else if (psmf_marks_offset != 0 && !(attribute & CELL_PAMF_ATTRIBUTE_MINIMUM_HEADER))
-	{
-		const u32 size = vm::read32(pAddr.addr() + psmf_marks_offset);
-
-		if (size + sizeof(u32) != psmf_marks_size)
-		{
-			return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid psmf_marks_size" };
-		}
-
-		const u16 marks_num = vm::read16(pAddr.addr() + psmf_marks_offset + 6); // LLE uses the wrong offset (6 instead of 4)
-
-		if (sizeof(u16) + marks_num * 0x28 /*sizeof PsmfMark*/ != size)
-		{
-			return { CELL_PAMF_ERROR_INVALID_PAMF, "pamfVerify() failed: invalid marks_num" };
-		}
-
-		// There are more checks in LLE but due to the bug above these would never be executed
-	}
-
-	return CELL_OK;
-}
-
-error_code cellPamfGetStreamOffsetAndSize(vm::ptr<PamfHeader> pAddr, u64 fileSize, vm::ptr<u64> pOffset, vm::ptr<u64> pSize);
-
 error_code cellPamfGetHeaderSize(vm::ptr<PamfHeader> pAddr, u64 fileSize, vm::ptr<u64> pSize)
 {
-	cellPamf.notice("cellPamfGetHeaderSize(pAddr=*0x%x, fileSize=0x%llx, pSize=*0x%x)", pAddr, fileSize, pSize);
+	cellPamf.warning("cellPamfGetHeaderSize(pAddr=*0x%x, fileSize=0x%llx, pSize=*0x%x)", pAddr, fileSize, pSize);
 
-	return cellPamfGetStreamOffsetAndSize(pAddr, fileSize, pSize, vm::null);
+	//if ((u32)pAddr->magic != 0x464d4150) return CELL_PAMF_ERROR_UNKNOWN_TYPE;
+
+	const u64 offset = u64{pAddr->data_offset} << 11;
+	*pSize = offset;
+	return CELL_OK;
 }
 
 error_code cellPamfGetHeaderSize2(vm::ptr<PamfHeader> pAddr, u64 fileSize, u32 attribute, vm::ptr<u64> pSize)
 {
-	cellPamf.notice("cellPamfGetHeaderSize2(pAddr=*0x%x, fileSize=0x%llx, attribute=0x%x, pSize=*0x%x)", pAddr, fileSize, attribute, pSize);
+	cellPamf.warning("cellPamfGetHeaderSize2(pAddr=*0x%x, fileSize=0x%llx, attribute=0x%x, pSize=*0x%x)", pAddr, fileSize, attribute, pSize);
 
-	const vm::var<u64> header_size;
-
-	if (error_code ret = cellPamfGetStreamOffsetAndSize(pAddr, fileSize, header_size, vm::null); ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	if (attribute & CELL_PAMF_ATTRIBUTE_MINIMUM_HEADER)
-	{
-		if (pAddr->magic != std::bit_cast<be_t<u32>>("PAMF"_u32)) // Already checked in cellPamfGetStreamOffsetAndSize(), should always evaluate to false at this point
-		{
-			return CELL_PAMF_ERROR_UNKNOWN_TYPE;
-		}
-
-		const u64 min_header_size = offsetof(PamfHeader, seq_info) + sizeof(u32) + pAddr->seq_info.size; // Size without EP tables
-
-		if (min_header_size > *header_size)
-		{
-			return CELL_PAMF_ERROR_INVALID_PAMF;
-		}
-
-		*header_size = min_header_size;
-	}
-
-	if (pSize)
-	{
-		*pSize = *header_size;
-	}
+	//if ((u32)pAddr->magic != 0x464d4150) return CELL_PAMF_ERROR_UNKNOWN_TYPE;
 
+	const u64 offset = u64{pAddr->data_offset} << 11;
+	*pSize = offset;
 	return CELL_OK;
 }
 
 error_code cellPamfGetStreamOffsetAndSize(vm::ptr<PamfHeader> pAddr, u64 fileSize, vm::ptr<u64> pOffset, vm::ptr<u64> pSize)
 {
-	cellPamf.notice("cellPamfGetStreamOffsetAndSize(pAddr=*0x%x, fileSize=0x%llx, pOffset=*0x%x, pSize=*0x%x)", pAddr, fileSize, pOffset, pSize);
+	cellPamf.warning("cellPamfGetStreamOffsetAndSize(pAddr=*0x%x, fileSize=0x%llx, pOffset=*0x%x, pSize=*0x%x)", pAddr, fileSize, pOffset, pSize);
 
-	return pamfGetHeaderAndDataSize(pAddr, fileSize, pOffset, pSize);
+	//if ((u32)pAddr->magic != 0x464d4150) return CELL_PAMF_ERROR_UNKNOWN_TYPE;
+
+	const u64 offset = u64{pAddr->data_offset} << 11;
+	*pOffset = offset;
+	const u64 size = u64{pAddr->data_size} << 11;
+	*pSize = size;
+	return CELL_OK;
 }
 
-error_code cellPamfVerify(vm::cptr<PamfHeader> pAddr, u64 fileSize)
+error_code cellPamfVerify(vm::ptr<PamfHeader> pAddr, u64 fileSize)
 {
-	cellPamf.notice("cellPamfVerify(pAddr=*0x%x, fileSize=0x%llx)", pAddr, fileSize);
+	cellPamf.todo("cellPamfVerify(pAddr=*0x%x, fileSize=0x%llx)", pAddr, fileSize);
 
-	return pamfVerify(pAddr, fileSize, vm::null, CELL_PAMF_ATTRIBUTE_VERIFY_ON);
+	// TODO
+	return CELL_OK;
 }
 
-error_code cellPamfReaderSetStreamWithIndex(vm::ptr<CellPamfReader> pSelf, u8 streamIndex);
-
 error_code cellPamfReaderInitialize(vm::ptr<CellPamfReader> pSelf, vm::cptr<PamfHeader> pAddr, u64 fileSize, u32 attribute)
 {
-	cellPamf.notice("cellPamfReaderInitialize(pSelf=*0x%x, pAddr=*0x%x, fileSize=0x%llx, attribute=0x%x)", pSelf, pAddr, fileSize, attribute);
+	cellPamf.warning("cellPamfReaderInitialize(pSelf=*0x%x, pAddr=*0x%x, fileSize=0x%llx, attribute=0x%x)", pSelf, pAddr, fileSize, attribute);
 
-	ensure(!!pSelf); // Not checked on LLE
-
-	std::memset(pSelf.get_ptr(), 0, sizeof(CellPamfReader));
-
-	pSelf->attribute = attribute;
+	if (fileSize)
+	{
+		pSelf->fileSize = fileSize;
+	}
+	else // if fileSize is unknown
+	{
+		pSelf->fileSize = (u64{pAddr->data_offset} << 11) + (u64{pAddr->data_size} << 11);
+	}
+	pSelf->pAddr = pAddr;
 
 	if (attribute & CELL_PAMF_ATTRIBUTE_VERIFY_ON)
 	{
-		if (error_code ret = pamfVerify(pAddr, fileSize, pSelf, attribute); ret != CELL_OK)
-		{
-			return ret;
-		}
-	}
-
-	pSelf->pamf.header = pAddr;
-	pSelf->pamf.sequenceInfo = pAddr.ptr(&PamfHeader::seq_info);
-
-	pSelf->currentGroupingPeriodIndex = -1;
-	pSelf->currentGroupIndex = -1;
-	pSelf->currentStreamIndex = -1;
-
-	if (pAddr->seq_info.grouping_period_num == 0)
-	{
-		return CELL_PAMF_ERROR_INVALID_PAMF;
-	}
-
-	pSelf->currentGroupingPeriodIndex = 0;
-	pSelf->pamf.currentGroupingPeriod = pSelf->pamf.sequenceInfo.ptr(&PamfSequenceInfo::grouping_periods);
-
-	if (pAddr->seq_info.grouping_periods.group_num != 0)
-	{
-		pSelf->currentGroupIndex = 0;
-		pSelf->pamf.currentGroup = pSelf->pamf.currentGroupingPeriod.ptr(&PamfGroupingPeriod::groups);
-
-		cellPamfReaderSetStreamWithIndex(pSelf, 0);
+		// TODO
+		cellPamf.todo("cellPamfReaderInitialize(): verification");
 	}
 
+	pSelf->stream = 0; // currently set stream
 	return CELL_OK;
 }
 
 error_code cellPamfReaderGetPresentationStartTime(vm::ptr<CellPamfReader> pSelf, vm::ptr<CellCodecTimeStamp> pTimeStamp)
 {
-	cellPamf.notice("cellPamfReaderGetPresentationStartTime(pSelf=*0x%x, pTimeStamp=*0x%x)", pSelf, pTimeStamp);
+	cellPamf.warning("cellPamfReaderGetPresentationStartTime(pSelf=*0x%x, pTimeStamp=*0x%x)", pSelf, pTimeStamp);
 
 	// always returns CELL_OK
 
-	ensure(!!pSelf && !!pTimeStamp); // Not checked on LLE
-
-	if (pSelf->isPsmf)
-	{
-		pTimeStamp->upper = pSelf->psmf.sequenceInfo->start_pts_high;
-		pTimeStamp->lower = pSelf->psmf.sequenceInfo->start_pts_low;
-	}
-	else
-	{
-		pTimeStamp->upper = pSelf->pamf.sequenceInfo->start_pts_high;
-		pTimeStamp->lower = pSelf->pamf.sequenceInfo->start_pts_low;
-	}
-
+	pTimeStamp->upper = pSelf->pAddr->start_pts_high;
+	pTimeStamp->lower = pSelf->pAddr->start_pts_low;
 	return CELL_OK;
 }
 
 error_code cellPamfReaderGetPresentationEndTime(vm::ptr<CellPamfReader> pSelf, vm::ptr<CellCodecTimeStamp> pTimeStamp)
 {
-	cellPamf.notice("cellPamfReaderGetPresentationEndTime(pSelf=*0x%x, pTimeStamp=*0x%x)", pSelf, pTimeStamp);
+	cellPamf.warning("cellPamfReaderGetPresentationEndTime(pSelf=*0x%x, pTimeStamp=*0x%x)", pSelf, pTimeStamp);
 
 	// always returns CELL_OK
 
-	ensure(!!pSelf && !!pTimeStamp); // Not checked on LLE
-
-	if (pSelf->isPsmf)
-	{
-		pTimeStamp->upper = pSelf->psmf.sequenceInfo->end_pts_high;
-		pTimeStamp->lower = pSelf->psmf.sequenceInfo->end_pts_low;
-	}
-	else
-	{
-		pTimeStamp->upper = pSelf->pamf.sequenceInfo->end_pts_high;
-		pTimeStamp->lower = pSelf->pamf.sequenceInfo->end_pts_low;
-	}
-
+	pTimeStamp->upper = pSelf->pAddr->end_pts_high;
+	pTimeStamp->lower = pSelf->pAddr->end_pts_low;
 	return CELL_OK;
 }
 
 u32 cellPamfReaderGetMuxRateBound(vm::ptr<CellPamfReader> pSelf)
 {
-	cellPamf.notice("cellPamfReaderGetMuxRateBound(pSelf=*0x%x)", pSelf);
+	cellPamf.warning("cellPamfReaderGetMuxRateBound(pSelf=*0x%x)", pSelf);
 
-	ensure(!!pSelf); // Not checked on LLE
-
-	if (pSelf->isPsmf)
-	{
-		return pSelf->psmf.sequenceInfo->mux_rate_bound & 0x003fffff;
-	}
-
-	return pSelf->pamf.sequenceInfo->mux_rate_bound & 0x003fffff;
+	// cannot return error code
+	return pSelf->pAddr->mux_rate_max;
 }
 
 u8 cellPamfReaderGetNumberOfStreams(vm::ptr<CellPamfReader> pSelf)
 {
-	cellPamf.notice("cellPamfReaderGetNumberOfStreams(pSelf=*0x%x)", pSelf);
+	cellPamf.warning("cellPamfReaderGetNumberOfStreams(pSelf=*0x%x)", pSelf);
 
-	ensure(!!pSelf); // Not checked on LLE
-
-	return pSelf->pamf.currentGroup->stream_num;
+	// cannot return error code
+	return pSelf->pAddr->stream_count;
 }
 
 u8 cellPamfReaderGetNumberOfSpecificStreams(vm::ptr<CellPamfReader> pSelf, u8 streamType)
 {
-	cellPamf.notice("cellPamfReaderGetNumberOfSpecificStreams(pSelf=*0x%x, streamType=%d)", pSelf, streamType);
+	cellPamf.warning("cellPamfReaderGetNumberOfSpecificStreams(pSelf=*0x%x, streamType=%d)", pSelf, streamType);
 
-	ensure(!!pSelf); // Not checked on LLE
+	// cannot return error code
 
-	const vm::var<u8> type;
-	u8 found = 0;
+	u8 counts[256] = {};
 
-	if (pSelf->isPsmf)
+	for (u8 i = 0; i < pSelf->pAddr->stream_count; i++)
 	{
-		const auto streams = pSelf->psmf.currentGroup.ptr(&PsmfGroup::streams);
-
-		for (u8 i = 0; i < pSelf->psmf.currentGroup->stream_num; i++)
-		{
-			if (pamfStreamToTypeChannel(PAMF_STREAM_CODING_TYPE_PSMF, streams[i].stream_id, streams[i].private_stream_id, type, vm::null) == CELL_OK)
-			{
-				found += pamfIsSameStreamType(*type, streamType);
-			}
-		}
-	}
-	else
-	{
-		const auto streams = pSelf->pamf.currentGroup.ptr(&PamfGroup::streams);
-
-		for (u8 i = 0; i < pSelf->pamf.currentGroup->stream_num; i++)
-		{
-			if (pamfStreamToTypeChannel(streams[i].stream_coding_type, streams[i].stream_id, streams[i].private_stream_id, type, vm::null) == CELL_OK)
-			{
-				found += pamfIsSameStreamType(*type, streamType);
-			}
-		}
+		counts[pamfGetStreamType(pSelf, i)]++;
 	}
 
-	return found;
+	switch (streamType)
+	{
+	case CELL_PAMF_STREAM_TYPE_AVC:
+	case CELL_PAMF_STREAM_TYPE_M2V:
+	case CELL_PAMF_STREAM_TYPE_ATRAC3PLUS:
+	case CELL_PAMF_STREAM_TYPE_PAMF_LPCM:
+	case CELL_PAMF_STREAM_TYPE_AC3:
+	case CELL_PAMF_STREAM_TYPE_USER_DATA:
+	{
+		return counts[streamType];
+	}
+
+	case CELL_PAMF_STREAM_TYPE_VIDEO:
+	{
+		return counts[CELL_PAMF_STREAM_TYPE_AVC] + counts[CELL_PAMF_STREAM_TYPE_M2V];
+	}
+
+	case CELL_PAMF_STREAM_TYPE_AUDIO:
+	{
+		return counts[CELL_PAMF_STREAM_TYPE_ATRAC3PLUS] + counts[CELL_PAMF_STREAM_TYPE_PAMF_LPCM] + counts[CELL_PAMF_STREAM_TYPE_AC3];
+	}
+	}
+
+	cellPamf.fatal("cellPamfReaderGetNumberOfSpecificStreams(): unsupported stream type (0x%x)", streamType);
+	return 0;
 }
 
 error_code cellPamfReaderSetStreamWithIndex(vm::ptr<CellPamfReader> pSelf, u8 streamIndex)
 {
-	cellPamf.notice("cellPamfReaderSetStreamWithIndex(pSelf=*0x%x, streamIndex=%d)", pSelf, streamIndex);
+	cellPamf.warning("cellPamfReaderSetStreamWithIndex(pSelf=*0x%x, streamIndex=%d)", pSelf, streamIndex);
 
-	ensure(!!pSelf); // Not checked on LLE
-
-	if (streamIndex >= pSelf->pamf.currentGroup->stream_num)
+	if (streamIndex >= pSelf->pAddr->stream_count)
 	{
 		return CELL_PAMF_ERROR_INVALID_ARG;
 	}
 
-	pSelf->currentStreamIndex = streamIndex;
-
-	if (pSelf->isPsmf)
-	{
-		pSelf->psmf.currentStream = pSelf->psmf.currentGroup.ptr(&PsmfGroup::streams) + streamIndex;
-	}
-	else
-	{
-		pSelf->pamf.currentStream = pSelf->pamf.currentGroup.ptr(&PamfGroup::streams) + streamIndex;
-	}
-
+	pSelf->stream = streamIndex;
 	return CELL_OK;
 }
 
 error_code cellPamfReaderSetStreamWithTypeAndChannel(vm::ptr<CellPamfReader> pSelf, u8 streamType, u8 ch)
 {
-	cellPamf.notice("cellPamfReaderSetStreamWithTypeAndChannel(pSelf=*0x%x, streamType=%d, ch=%d)", pSelf, streamType, ch);
+	cellPamf.warning("cellPamfReaderSetStreamWithTypeAndChannel(pSelf=*0x%x, streamType=%d, ch=%d)", pSelf, streamType, ch);
 
-	// This function is broken on LLE
-
-	ensure(!!pSelf); // Not checked on LLE
-
-	u8 stream_coding_type;
-	u8 stream_id;
-	u8 private_stream_id;
-
-	if (pamfTypeChannelToStream(streamType, ch, &stream_coding_type, &stream_id, &private_stream_id) != CELL_OK)
+	// TODO: it probably doesn't support "any audio" or "any video" argument
+	if (streamType > 5 || ch >= 16)
 	{
 		return CELL_PAMF_ERROR_INVALID_ARG;
 	}
 
-	const u8 stream_num = pSelf->pamf.currentGroup->stream_num;
-	u32 i = 0;
-
-	if (pSelf->isPsmf)
+	for (u8 i = 0; i < pSelf->pAddr->stream_count; i++)
 	{
-		const auto streams = pSelf->psmf.currentGroup.ptr(&PsmfGroup::streams);
-
-		for (; i < stream_num; i++)
+		if (pamfGetStreamType(pSelf, i) == streamType)
 		{
-			// LLE increments the index by 12 instead of 1
-			if (stream_coding_type == PAMF_STREAM_CODING_TYPE_PSMF && streams[i * 12].stream_id == stream_id && streams[i * 12].private_stream_id == private_stream_id)
+			if (pamfGetStreamChannel(pSelf, i) == ch)
 			{
-				break;
-			}
-		}
-	}
-	else
-	{
-		const auto streams = pSelf->pamf.currentGroup.ptr(&PamfGroup::streams);
-
-		for (; i < stream_num; i++)
-		{
-			// LLE increments the index by 0x10 instead of 1
-			if (streams[i * 0x10].stream_coding_type == stream_coding_type && streams[i * 0x10].stream_id == stream_id && streams[i * 0x10].private_stream_id == private_stream_id)
-			{
-				break;
+				pSelf->stream = i;
+				return i;
 			}
 		}
 	}
 
-	if (i == stream_num)
-	{
-		i = CELL_PAMF_ERROR_STREAM_NOT_FOUND; // LLE writes the error code to the index
-	}
-
-	if (pSelf->currentStreamIndex != i)
-	{
-		pSelf->pamf.currentStream = pSelf->pamf.currentGroup.ptr(&PamfGroup::streams); // LLE always sets this to the first stream
-		pSelf->currentStreamIndex = i;
-	}
-
-	if (i == CELL_PAMF_ERROR_STREAM_NOT_FOUND)
-	{
-		return CELL_PAMF_ERROR_STREAM_NOT_FOUND;
-	}
-
-	return not_an_error(i);
+	return CELL_PAMF_ERROR_STREAM_NOT_FOUND;
 }
 
 error_code cellPamfReaderSetStreamWithTypeAndIndex(vm::ptr<CellPamfReader> pSelf, u8 streamType, u8 streamIndex)
 {
-	cellPamf.notice("cellPamfReaderSetStreamWithTypeAndIndex(pSelf=*0x%x, streamType=%d, streamIndex=%d)", pSelf, streamType, streamIndex);
+	cellPamf.warning("cellPamfReaderSetStreamWithTypeAndIndex(pSelf=*0x%x, streamType=%d, streamIndex=%d)", pSelf, streamType, streamIndex);
 
-	ensure(!!pSelf); // Not checked on LLE
-
-	const u8 stream_num = pSelf->pamf.currentGroup->stream_num;
-
-	if (streamIndex >= stream_num)
-	{
-		return CELL_PAMF_ERROR_INVALID_ARG;
-	}
-
-	const vm::var<u8> type;
 	u32 found = 0;
 
-	if (pSelf->isPsmf)
+	for (u8 i = 0; i < pSelf->pAddr->stream_count; i++)
 	{
-		const auto streams = pSelf->psmf.currentGroup.ptr(&PsmfGroup::streams);
+		const u8 type = pamfGetStreamType(pSelf, i);
 
-		for (u8 i = 0; i < stream_num; i++)
+		if (type == streamType)
 		{
-			if (pamfStreamToTypeChannel(PAMF_STREAM_CODING_TYPE_PSMF, streams[i].stream_id, streams[i].private_stream_id, type, vm::null) != CELL_OK)
+			found++;
+		}
+		else switch(streamType)
+		{
+		case CELL_PAMF_STREAM_TYPE_VIDEO:
+		{
+			if (type == CELL_PAMF_STREAM_TYPE_AVC || type == CELL_PAMF_STREAM_TYPE_M2V)
 			{
-				continue;
+				found++;
 			}
+			break;
+		}
 
-			found += *type == streamType;
-
-			if (found > streamIndex)
+		case CELL_PAMF_STREAM_TYPE_AUDIO:
+		{
+			if (type == CELL_PAMF_STREAM_TYPE_ATRAC3PLUS || type == CELL_PAMF_STREAM_TYPE_AC3 || type == CELL_PAMF_STREAM_TYPE_PAMF_LPCM)
 			{
-				pSelf->currentStreamIndex = streamIndex; // LLE sets this to the index counting only streams of the requested type instead of the overall index
-				pSelf->psmf.currentStream = streams; // LLE always sets this to the first stream
-				return not_an_error(i);
+				found++;
+			}
+			break;
+		}
+
+		default:
+		{
+			if (streamType > 5)
+			{
+				return CELL_PAMF_ERROR_INVALID_ARG;
 			}
 		}
-	}
-	else
-	{
-		const auto streams = pSelf->pamf.currentGroup.ptr(&PamfGroup::streams);
+		}
 
-		for (u8 i = 0; i < stream_num; i++)
+		if (found > streamIndex)
 		{
-			if (pamfStreamToTypeChannel(streams[i].stream_coding_type, streams[i].stream_id, streams[i].private_stream_id, type, vm::null) != CELL_OK)
-			{
-				continue;
-			}
-
-			found += pamfIsSameStreamType(*type, streamType);
-
-			if (found > streamIndex)
-			{
-				pSelf->currentStreamIndex = i;
-				pSelf->pamf.currentStream = streams + i;
-				return not_an_error(i);
-			}
+			pSelf->stream = i;
+			return i;
 		}
 	}
 
@@ -1036,107 +440,60 @@ error_code cellPamfReaderSetStreamWithTypeAndIndex(vm::ptr<CellPamfReader> pSelf
 
 error_code cellPamfStreamTypeToEsFilterId(u8 type, u8 ch, vm::ptr<CellCodecEsFilterId> pEsFilterId)
 {
-	cellPamf.notice("cellPamfStreamTypeToEsFilterId(type=%d, ch=%d, pEsFilterId=*0x%x)", type, ch, pEsFilterId);
+	cellPamf.warning("cellPamfStreamTypeToEsFilterId(type=%d, ch=%d, pEsFilterId=*0x%x)", type, ch, pEsFilterId);
 
 	if (!pEsFilterId)
 	{
 		return CELL_PAMF_ERROR_INVALID_ARG;
 	}
 
-	u8 stream_id = 0;
-	u8 private_stream_id = 0;
-
-	if (pamfTypeChannelToStream(type, ch, nullptr, &stream_id, &private_stream_id) != CELL_OK)
-	{
-		return CELL_PAMF_ERROR_INVALID_ARG;
-	}
-
-	pEsFilterId->filterIdMajor = stream_id;
-	pEsFilterId->filterIdMinor = private_stream_id;
-	pEsFilterId->supplementalInfo1 = type == CELL_PAMF_STREAM_TYPE_AVC;
-	pEsFilterId->supplementalInfo2 = 0;
-
-	return CELL_OK;
+	return pamfStreamTypeToEsFilterId(type, ch, *pEsFilterId);
 }
 
 s32 cellPamfReaderGetStreamIndex(vm::ptr<CellPamfReader> pSelf)
 {
-	cellPamf.notice("cellPamfReaderGetStreamIndex(pSelf=*0x%x)", pSelf);
+	cellPamf.trace("cellPamfReaderGetStreamIndex(pSelf=*0x%x)", pSelf);
 
-	ensure(!!pSelf); // Not checked on LLE
-
-	return pSelf->currentStreamIndex;
+	// seems that CELL_PAMF_ERROR_INVALID_PAMF must be already written in pSelf->stream if it's the case
+	return pSelf->stream;
 }
 
 error_code cellPamfReaderGetStreamTypeAndChannel(vm::ptr<CellPamfReader> pSelf, vm::ptr<u8> pType, vm::ptr<u8> pCh)
 {
-	cellPamf.notice("cellPamfReaderGetStreamTypeAndChannel(pSelf=*0x%x, pType=*0x%x, pCh=*0x%x", pSelf, pType, pCh);
+	cellPamf.warning("cellPamfReaderGetStreamTypeAndChannel(pSelf=*0x%x, pType=*0x%x, pCh=*0x%x", pSelf, pType, pCh);
 
-	ensure(!!pSelf); // Not checked on LLE
+	// unclear
 
-	if (pSelf->isPsmf)
-	{
-		const auto stream = pSelf->psmf.currentStream;
-		return pamfStreamToTypeChannel(PAMF_STREAM_CODING_TYPE_PSMF, stream->stream_id, stream->private_stream_id, pType, pCh);
-	}
-	else
-	{
-		const auto stream = pSelf->pamf.currentStream;
-		return pamfStreamToTypeChannel(stream->stream_coding_type, stream->stream_id, stream->private_stream_id, pType, pCh);
-	}
+	*pType = pamfGetStreamType(pSelf, pSelf->stream);
+	*pCh = pamfGetStreamChannel(pSelf, pSelf->stream);
+	return CELL_OK;
 }
 
 error_code cellPamfReaderGetEsFilterId(vm::ptr<CellPamfReader> pSelf, vm::ptr<CellCodecEsFilterId> pEsFilterId)
 {
-	cellPamf.notice("cellPamfReaderGetEsFilterId(pSelf=*0x%x, pEsFilterId=*0x%x)", pSelf, pEsFilterId);
+	cellPamf.warning("cellPamfReaderGetEsFilterId(pSelf=*0x%x, pEsFilterId=*0x%x)", pSelf, pEsFilterId);
 
 	// always returns CELL_OK
 
-	ensure(!!pSelf && !!pEsFilterId); // Not checked on LLE
-
-	if (pSelf->isPsmf)
-	{
-		pEsFilterId->filterIdMajor = pSelf->psmf.currentStream->stream_id;
-		pEsFilterId->filterIdMinor = pSelf->psmf.currentStream->private_stream_id;
-		pEsFilterId->supplementalInfo1 = 0;
-	}
-	else
-	{
-		pEsFilterId->filterIdMajor = pSelf->pamf.currentStream->stream_id;
-		pEsFilterId->filterIdMinor = pSelf->pamf.currentStream->private_stream_id;
-		pEsFilterId->supplementalInfo1 = pSelf->pamf.currentStream->stream_coding_type == PAMF_STREAM_CODING_TYPE_AVC;
-	}
-
+	ensure(static_cast<u32>(pSelf->stream) < pSelf->pAddr->stream_count);
+	auto& header = pSelf->pAddr->stream_headers[pSelf->stream];
+	pEsFilterId->filterIdMajor = header.fid_major;
+	pEsFilterId->filterIdMinor = header.fid_minor;
+	pEsFilterId->supplementalInfo1 = header.type == 0x1b ? 1 : 0;
 	pEsFilterId->supplementalInfo2 = 0;
 	return CELL_OK;
 }
 
 error_code cellPamfReaderGetStreamInfo(vm::ptr<CellPamfReader> pSelf, vm::ptr<void> pInfo, u32 size)
 {
-	cellPamf.notice("cellPamfReaderGetStreamInfo(pSelf=*0x%x, pInfo=*0x%x, size=%d)", pSelf, pInfo, size);
+	cellPamf.warning("cellPamfReaderGetStreamInfo(pSelf=*0x%x, pInfo=*0x%x, size=%d)", pSelf, pInfo, size);
 
-	ensure(!!pSelf); // Not checked on LLE
+	ensure(static_cast<u32>(pSelf->stream) < pSelf->pAddr->stream_count);
+	auto& header = pSelf->pAddr->stream_headers[pSelf->stream];
+	const u8 type = pamfGetStreamType(pSelf, pSelf->stream);
+	const u8 ch = pamfGetStreamChannel(pSelf, pSelf->stream);
 
-	const auto& header = *pSelf->pamf.currentStream;
-	const auto& psmf_header = *pSelf->psmf.currentStream;
-	const vm::var<u8> type;
-	error_code ret;
-
-	if (pSelf->isPsmf)
-	{
-		ret = pamfStreamToTypeChannel(PAMF_STREAM_CODING_TYPE_PSMF, psmf_header.stream_id, psmf_header.private_stream_id, type, vm::null);
-	}
-	else
-	{
-		ret = pamfStreamToTypeChannel(header.stream_coding_type, header.stream_id, header.private_stream_id, type, vm::null);
-	}
-
-	if (ret != CELL_OK)
-	{
-		return CELL_PAMF_ERROR_INVALID_PAMF;
-	}
-
-	switch (*type)
+	switch (type)
 	{
 	case CELL_PAMF_STREAM_TYPE_AVC:
 	{
@@ -1156,8 +513,8 @@ error_code cellPamfReaderGetStreamInfo(vm::ptr<CellPamfReader> pSelf, vm::ptr<vo
 
 		if (header.AVC.aspectRatioIdc == 0xff)
 		{
-			info->sarWidth = header.AVC.sarWidth;
-			info->sarHeight = header.AVC.sarHeight;
+			info->sarWidth = header.AVC.sarInfo.width;
+			info->sarHeight = header.AVC.sarInfo.height;
 		}
 		else
 		{
@@ -1307,45 +664,54 @@ error_code cellPamfReaderGetStreamInfo(vm::ptr<CellPamfReader> pSelf, vm::ptr<vo
 	}
 
 	case CELL_PAMF_STREAM_TYPE_USER_DATA:
-	case CELL_PAMF_STREAM_TYPE_PSMF_USER_DATA:
 	{
 		cellPamf.error("cellPamfReaderGetStreamInfo(): invalid type CELL_PAMF_STREAM_TYPE_USER_DATA");
 		return CELL_PAMF_ERROR_INVALID_ARG;
 	}
 
-	case CELL_PAMF_STREAM_TYPE_PSMF_AVC:
+	case 6:
 	{
 		if (size < 4)
 		{
 			return CELL_PAMF_ERROR_INVALID_ARG;
 		}
 
-		vm::static_ptr_cast<u16>(pInfo)[0] = psmf_header.video.horizontalSize * 0x10;
-		vm::static_ptr_cast<u16>(pInfo)[1] = psmf_header.video.verticalSize * 0x10;
-
-		cellPamf.notice("cellPamfReaderGetStreamInfo(): CELL_PAMF_STREAM_TYPE_PSMF_AVC");
+		cellPamf.todo("cellPamfReaderGetStreamInfo(): type 6");
 		break;
 	}
 
-	case CELL_PAMF_STREAM_TYPE_PSMF_ATRAC3PLUS:
-	case CELL_PAMF_STREAM_TYPE_PSMF_LPCM:
+	case 7:
 	{
 		if (size < 2)
 		{
 			return CELL_PAMF_ERROR_INVALID_ARG;
 		}
 
-		vm::static_ptr_cast<u8>(pInfo)[0] = psmf_header.audio.channelConfiguration;
-		vm::static_ptr_cast<u8>(pInfo)[1] = psmf_header.audio.samplingFrequency & 0x0f;
-
-		cellPamf.notice("cellPamfReaderGetStreamInfo(): PSMF audio");
+		cellPamf.todo("cellPamfReaderGetStreamInfo(): type 7");
 		break;
 	}
 
+	case 8:
+	{
+		if (size < 2)
+		{
+			return CELL_PAMF_ERROR_INVALID_ARG;
+		}
+
+		cellPamf.todo("cellPamfReaderGetStreamInfo(): type 8");
+		break;
+	}
+
+	case 9:
+	{
+		cellPamf.error("cellPamfReaderGetStreamInfo(): invalid type 9");
+		return CELL_PAMF_ERROR_INVALID_ARG;
+	}
+
 	default:
 	{
 		// invalid type or getting type/ch failed
-		cellPamf.error("cellPamfReaderGetStreamInfo(): invalid type %d", *type);
+		cellPamf.error("cellPamfReaderGetStreamInfo(): invalid type %d (ch=%d)", type, ch);
 		return CELL_PAMF_ERROR_INVALID_PAMF;
 	}
 	}
@@ -1355,288 +721,44 @@ error_code cellPamfReaderGetStreamInfo(vm::ptr<CellPamfReader> pSelf, vm::ptr<vo
 
 u32 cellPamfReaderGetNumberOfEp(vm::ptr<CellPamfReader> pSelf)
 {
-	cellPamf.notice("cellPamfReaderGetNumberOfEp(pSelf=*0x%x)", pSelf);
+	cellPamf.todo("cellPamfReaderGetNumberOfEp(pSelf=*0x%x)", pSelf);
 
-	ensure(!!pSelf); // Not checked on LLE
-
-	return pSelf->isPsmf ? pSelf->psmf.currentStream->ep_num : pSelf->pamf.currentStream->ep_num;
+	// cannot return error code
+	return 0; //pSelf->pAddr->stream_headers[pSelf->stream].ep_num;
 }
 
 error_code cellPamfReaderGetEpIteratorWithIndex(vm::ptr<CellPamfReader> pSelf, u32 epIndex, vm::ptr<CellPamfEpIterator> pIt)
 {
-	cellPamf.notice("cellPamfReaderGetEpIteratorWithIndex(pSelf=*0x%x, epIndex=%d, pIt=*0x%x)", pSelf, epIndex, pIt);
-
-	ensure(!!pSelf && !!pIt); // Not checked on LLE
-
-	const u32 ep_num = cellPamfReaderGetNumberOfEp(pSelf);
-
-	if (epIndex >= ep_num)
-	{
-		return CELL_PAMF_ERROR_INVALID_ARG;
-	}
-
-	if (pSelf->attribute & CELL_PAMF_ATTRIBUTE_MINIMUM_HEADER)
-	{
-		return CELL_PAMF_ERROR_NOT_AVAILABLE;
-	}
-
-	pIt->isPamf = !pSelf->isPsmf;
-	pIt->index = epIndex;
-	pIt->num = ep_num;
-	pIt->pCur.set(pSelf->isPsmf ? pSelf->psmf.header.addr() + pSelf->psmf.currentStream->ep_offset + epIndex * sizeof(PsmfEpHeader)
-		: pSelf->pamf.header.addr() + pSelf->pamf.currentStream->ep_offset + epIndex * sizeof(PamfEpHeader));
+	cellPamf.todo("cellPamfReaderGetEpIteratorWithIndex(pSelf=*0x%x, epIndex=%d, pIt=*0x%x)", pSelf, epIndex, pIt);
 
+	// TODO
 	return CELL_OK;
 }
 
 error_code cellPamfReaderGetEpIteratorWithTimeStamp(vm::ptr<CellPamfReader> pSelf, vm::ptr<CellCodecTimeStamp> pTimeStamp, vm::ptr<CellPamfEpIterator> pIt)
 {
-	cellPamf.notice("cellPamfReaderGetEpIteratorWithTimeStamp(pSelf=*0x%x, pTimeStamp=*0x%x, pIt=*0x%x)", pSelf, pTimeStamp, pIt);
-
-	ensure(!!pSelf && !!pTimeStamp && !!pIt); // Not checked on LLE
-
-	if (pSelf->attribute & CELL_PAMF_ATTRIBUTE_MINIMUM_HEADER)
-	{
-		return CELL_PAMF_ERROR_NOT_AVAILABLE;
-	}
-
-	const u32 ep_num = cellPamfReaderGetNumberOfEp(pSelf);
-
-	pIt->num = ep_num;
-	pIt->isPamf = !pSelf->isPsmf;
-
-	if (ep_num == 0)
-	{
-		return CELL_PAMF_ERROR_EP_NOT_FOUND;
-	}
-
-	u32 i = ep_num - 1;
-	const u64 requested_time_stamp = std::bit_cast<be_t<u64>>(*pTimeStamp);
-
-	if (pSelf->isPsmf)
-	{
-		const auto eps = vm::cptr<PsmfEpHeader>::make(pSelf->psmf.header.addr() + pSelf->psmf.currentStream->ep_offset);
-
-		for (; i >= 1; i--) // always output eps[0] if no other suitable ep is found
-		{
-			const u64 time_stamp = (static_cast<u64>(eps[i].value0 & 1) << 32) | eps[i].pts_low;
-
-			if (time_stamp <= requested_time_stamp)
-			{
-				break;
-			}
-		}
-
-		pIt->pCur = eps + i;
-	}
-	else
-	{
-		const auto eps = vm::cptr<PamfEpHeader>::make(pSelf->pamf.header.addr() + pSelf->pamf.currentStream->ep_offset);
-
-		for (; i >= 1; i--) // always output eps[0] if no other suitable ep is found
-		{
-			const u64 time_stamp = (static_cast<u64>(eps[i].pts_high) << 32) | eps[i].pts_low;
-
-			if (time_stamp <= requested_time_stamp)
-			{
-				break;
-			}
-		}
-
-		pIt->pCur = eps + i;
-	}
-
-	pIt->index = i;
+	cellPamf.todo("cellPamfReaderGetEpIteratorWithTimeStamp(pSelf=*0x%x, pTimeStamp=*0x%x, pIt=*0x%x)", pSelf, pTimeStamp, pIt);
 
+	// TODO
 	return CELL_OK;
 }
 
 error_code cellPamfEpIteratorGetEp(vm::ptr<CellPamfEpIterator> pIt, vm::ptr<CellPamfEp> pEp)
 {
-	cellPamf.notice("cellPamfEpIteratorGetEp(pIt=*0x%x, pEp=*0x%x)", pIt, pEp);
+	cellPamf.todo("cellPamfEpIteratorGetEp(pIt=*0x%x, pEp=*0x%x)", pIt, pEp);
 
 	// always returns CELL_OK
-
-	ensure(!!pIt); // Not checked on LLE
-
-	if (pIt->isPamf)
-	{
-		pamfEpUnpack(vm::static_ptr_cast<const PamfEpHeader>(pIt->pCur), pEp);
-	}
-	else
-	{
-		psmfEpUnpack(vm::static_ptr_cast<const PsmfEpHeader>(pIt->pCur), pEp);
-	}
-
+	// TODO
 	return CELL_OK;
 }
 
 s32 cellPamfEpIteratorMove(vm::ptr<CellPamfEpIterator> pIt, s32 steps, vm::ptr<CellPamfEp> pEp)
 {
-	cellPamf.notice("cellPamfEpIteratorMove(pIt=*0x%x, steps=%d, pEp=*0x%x)", pIt, steps, pEp);
+	cellPamf.todo("cellPamfEpIteratorMove(pIt=*0x%x, steps=%d, pEp=*0x%x)", pIt, steps, pEp);
 
-	ensure(!!pIt); // Not checked on LLE
-
-	u32 new_index = pIt->index + steps;
-
-	if (static_cast<s32>(new_index) < 0)
-	{
-		steps = -static_cast<s32>(pIt->index);
-		new_index = 0;
-	}
-	else if (new_index >= pIt->num)
-	{
-		steps = (pIt->num - pIt->index) - 1;
-		new_index = pIt->index + steps;
-	}
-
-	pIt->index = new_index;
-
-	if (pIt->isPamf)
-	{
-		pIt->pCur = vm::static_ptr_cast<const PamfEpHeader>(pIt->pCur) + steps;
-
-		if (pEp)
-		{
-			pamfEpUnpack(vm::static_ptr_cast<const PamfEpHeader>(pIt->pCur), pEp);
-		}
-	}
-	else
-	{
-		pIt->pCur = vm::static_ptr_cast<const PsmfEpHeader>(pIt->pCur) + steps;
-
-		if (pEp)
-		{
-			psmfEpUnpack(vm::static_ptr_cast<const PsmfEpHeader>(pIt->pCur), pEp);
-		}
-	}
-
-	return steps;
-}
-
-error_code cellPamfReaderGetEpWithTimeStamp(vm::ptr<CellPamfReader> pSelf, vm::ptr<CellCodecTimeStamp> pTimeStamp, vm::ptr<CellPamfEpUnk> pEp, u32 unk)
-{
-	cellPamf.notice("cellPamfReaderGetEpWithTimeStamp(pSelf=*0x%x, pTimeStamp=*0x%x, pEp=*0x%x, unk=0x%x)", pSelf, pTimeStamp, pEp, unk);
-
-	// This function is broken on LLE
-
-	ensure(!!pSelf && !!pTimeStamp && !!pEp); // Not checked on LLE
-
-	if (pSelf->attribute & CELL_PAMF_ATTRIBUTE_MINIMUM_HEADER)
-	{
-		return CELL_PAMF_ERROR_NOT_AVAILABLE;
-	}
-
-	const u32 ep_num = cellPamfReaderGetNumberOfEp(pSelf);
-	u64 next_rpn_offset = pSelf->dataSize;
-
-	if (ep_num == 0)
-	{
-		return CELL_PAMF_ERROR_EP_NOT_FOUND;
-	}
-
-	u32 i = ep_num - 1;
-	const u64 requested_time_stamp = std::bit_cast<be_t<u64>>(*pTimeStamp);
-
-	if (pSelf->isPsmf)
-	{
-		const auto eps = vm::cptr<PsmfEpHeader>::make(pSelf->psmf.header.addr() + pSelf->psmf.currentStream->ep_offset);
-
-		for (; i >= 1; i--) // always output eps[0] if no other suitable ep is found
-		{
-			const u64 time_stamp = (static_cast<u64>(eps[i].value0 & 1) << 32) | eps[i].pts_low;
-
-			if (time_stamp <= requested_time_stamp)
-			{
-				break;
-			}
-		}
-
-		// LLE doesn't write the result to pEp
-
-		if (i < ep_num - 1)
-		{
-			next_rpn_offset = eps[i + 1].rpnOffset;
-		}
-	}
-	else
-	{
-		const auto eps = vm::cptr<PamfEpHeader>::make(pSelf->pamf.header.addr() + pSelf->pamf.currentStream->ep_offset);
-
-		for (; i >= 1; i--) // always output eps[0] if no other suitable ep is found
-		{
-			const u64 time_stamp = (static_cast<u64>(eps[i].pts_high) << 32) | eps[i].pts_low;
-
-			if (time_stamp <= requested_time_stamp)
-			{
-				break;
-			}
-		}
-
-		// LLE doesn't write the result to pEp
-
-		if (i < ep_num - 1)
-		{
-			next_rpn_offset = eps[i + 1].rpnOffset;
-		}
-	}
-
-	if (unk == sizeof(CellPamfEpUnk))
-	{
-		pEp->nextRpnOffset = next_rpn_offset;
-	}
-
-	return CELL_OK;
-}
-
-error_code cellPamfReaderGetEpWithIndex(vm::ptr<CellPamfReader> pSelf, u32 epIndex, vm::ptr<CellPamfEpUnk> pEp, u32 unk)
-{
-	cellPamf.notice("cellPamfReaderGetEpWithIndex(pSelf=*0x%x, epIndex=%d, pEp=*0x%x, unk=0x%x)", pSelf, epIndex, pEp, unk);
-
-	ensure(!!pSelf && !!pEp); // Not checked on LLE
-
-	const u32 ep_num = cellPamfReaderGetNumberOfEp(pSelf);
-	u64 next_rpn_offset = pSelf->dataSize;
-
-	if (epIndex >= ep_num)
-	{
-		return CELL_PAMF_ERROR_INVALID_ARG;
-	}
-
-	if (pSelf->attribute & CELL_PAMF_ATTRIBUTE_MINIMUM_HEADER)
-	{
-		return CELL_PAMF_ERROR_NOT_AVAILABLE;
-	}
-
-	if (pSelf->isPsmf)
-	{
-		const auto ep = vm::cptr<PsmfEpHeader>::make(pSelf->psmf.header.addr() + pSelf->psmf.currentStream->ep_offset + epIndex * sizeof(PsmfEpHeader));
-
-		psmfEpUnpack(ep, pEp.ptr(&CellPamfEpUnk::ep));
-
-		if (epIndex < ep_num - 1)
-		{
-			next_rpn_offset = ep[1].rpnOffset * 0x800ull;
-		}
-	}
-	else
-	{
-		const auto ep = vm::cptr<PamfEpHeader>::make(pSelf->pamf.header.addr() + pSelf->pamf.currentStream->ep_offset + epIndex * sizeof(PamfEpHeader));
-
-		pamfEpUnpack(ep, pEp.ptr(&CellPamfEpUnk::ep));
-
-		if (epIndex < ep_num - 1)
-		{
-			next_rpn_offset = ep[1].rpnOffset * 0x800ull;
-		}
-	}
-
-	if (unk == sizeof(CellPamfEpUnk))
-	{
-		pEp->nextRpnOffset = next_rpn_offset;
-	}
-
-	return CELL_OK;
+	// cannot return error code
+	// TODO
+	return 0;
 }
 
 DECLARE(ppu_module_manager::cellPamf)("cellPamf", []()
@@ -1664,6 +786,4 @@ DECLARE(ppu_module_manager::cellPamf)("cellPamf", []()
 	REG_FUNC(cellPamf, cellPamfReaderGetEpIteratorWithTimeStamp);
 	REG_FUNC(cellPamf, cellPamfEpIteratorGetEp);
 	REG_FUNC(cellPamf, cellPamfEpIteratorMove);
-	REG_FUNC(cellPamf, cellPamfReaderGetEpWithTimeStamp);
-	REG_FUNC(cellPamf, cellPamfReaderGetEpWithIndex);
 });
diff --git a/rpcs3/Emu/Cell/Modules/cellPamf.h b/rpcs3/Emu/Cell/Modules/cellPamf.h
index e42acf60f4..abf457e331 100644
--- a/rpcs3/Emu/Cell/Modules/cellPamf.h
+++ b/rpcs3/Emu/Cell/Modules/cellPamf.h
@@ -12,7 +12,6 @@ enum CellPamfError : u32
 	CELL_PAMF_ERROR_UNSUPPORTED_VERSION = 0x80610505,
 	CELL_PAMF_ERROR_UNKNOWN_STREAM      = 0x80610506,
 	CELL_PAMF_ERROR_EP_NOT_FOUND        = 0x80610507,
-	CELL_PAMF_ERROR_NOT_AVAILABLE       = 0x80610508,
 };
 
 // PamfReaderInitialize Attribute Flags
@@ -24,30 +23,14 @@ enum
 
 enum CellPamfStreamType
 {
-	CELL_PAMF_STREAM_TYPE_AVC             = 0,
-	CELL_PAMF_STREAM_TYPE_M2V             = 1,
-	CELL_PAMF_STREAM_TYPE_ATRAC3PLUS      = 2,
-	CELL_PAMF_STREAM_TYPE_PAMF_LPCM       = 3,
-	CELL_PAMF_STREAM_TYPE_AC3             = 4,
-	CELL_PAMF_STREAM_TYPE_USER_DATA       = 5,
-	CELL_PAMF_STREAM_TYPE_PSMF_AVC        = 6,
-	CELL_PAMF_STREAM_TYPE_PSMF_ATRAC3PLUS = 7,
-	CELL_PAMF_STREAM_TYPE_PSMF_LPCM       = 8,
-	CELL_PAMF_STREAM_TYPE_PSMF_USER_DATA  = 9,
-	CELL_PAMF_STREAM_TYPE_VIDEO           = 20,
-	CELL_PAMF_STREAM_TYPE_AUDIO           = 21,
-	CELL_PAMF_STREAM_TYPE_UNK             = 22,
-};
-
-enum PamfStreamCodingType : u8
-{
-	PAMF_STREAM_CODING_TYPE_M2V        = 0x02,
-	PAMF_STREAM_CODING_TYPE_AVC        = 0x1b,
-	PAMF_STREAM_CODING_TYPE_PAMF_LPCM  = 0x80,
-	PAMF_STREAM_CODING_TYPE_AC3        = 0x81,
-	PAMF_STREAM_CODING_TYPE_ATRAC3PLUS = 0xdc,
-	PAMF_STREAM_CODING_TYPE_USER_DATA  = 0xdd,
-	PAMF_STREAM_CODING_TYPE_PSMF       = 0xff,
+	CELL_PAMF_STREAM_TYPE_AVC        = 0,
+	CELL_PAMF_STREAM_TYPE_M2V        = 1,
+	CELL_PAMF_STREAM_TYPE_ATRAC3PLUS = 2,
+	CELL_PAMF_STREAM_TYPE_PAMF_LPCM  = 3,
+	CELL_PAMF_STREAM_TYPE_AC3        = 4,
+	CELL_PAMF_STREAM_TYPE_USER_DATA  = 5,
+	CELL_PAMF_STREAM_TYPE_VIDEO      = 20,
+	CELL_PAMF_STREAM_TYPE_AUDIO      = 21,
 };
 
 enum
@@ -160,7 +143,7 @@ struct CellCodecTimeStamp
 	be_t<u32> lower;
 };
 
-constexpr u32 CODEC_TS_INVALID = umax;
+static const u64 CODEC_TS_INVALID = 0xffffffffffffffffull;
 
 // Entry point information
 struct CellPamfEp
@@ -171,21 +154,13 @@ struct CellPamfEp
 	be_t<u64> rpnOffset;
 };
 
-struct CellPamfEpUnk // Speculative name, only used in two undocumented functions
-{
-	CellPamfEp ep;
-	be_t<u64> nextRpnOffset;
-};
-
-CHECK_SIZE(CellPamfEpUnk, 0x20);
-
 // Entry point iterator
 struct CellPamfEpIterator
 {
 	b8 isPamf;
 	be_t<u32> index;
 	be_t<u32> num;
-	vm::bcptr<void> pCur;
+	be_t<u32> pCur_addr;
 };
 
 struct CellCodecEsFilterId
@@ -276,23 +251,18 @@ struct CellPamfLpcmInfo
 	be_t<u16> bitsPerSample;
 };
 
-CHECK_SIZE(CellPamfLpcmInfo, 8);
 
-// PAMF file structs, everything here is not aligned (LLE uses exclusively u8 pointers)
 
 struct PamfStreamHeader
 {
-	u8 stream_coding_type;
-
-	u8 reserved[3];
-
-	u8 stream_id;
-	u8 private_stream_id; // for streams multiplexed as private data streams (stream_id == 0xbd)
-
-	be_t<u16, 1> p_std_buffer; // 2 bits: unused ??? "00", 1 bit: P_STD_buffer_scale, 13 bits: P_STD_buffer_size
-
-	be_t<u32, 1> ep_offset; // offset of EP section in header
-	be_t<u32, 1> ep_num; // count of EPs
+	u8 type;
+	u8 unknown[3];
+	u8 fid_major;
+	u8 fid_minor;
+	u8 unknown1;
+	u8 unknown2;
+	be_t<u32> ep_offset; // offset of EP section in header
+	be_t<u32> ep_num; // count of EPs
 
 	union
 	{
@@ -305,20 +275,32 @@ struct PamfStreamHeader
 			u8 levelIdc;
 			u8 x2; // contains frameMbsOnlyFlag, videoSignalInfoFlag, frameRateInfo
 			u8 aspectRatioIdc;
-			be_t<u16, 1> sarWidth;
-			be_t<u16, 1> sarHeight;
-			u8 reserved1;
-			u8 horizontalSize; // divided by 16
-			u8 reserved2;
-			u8 verticalSize; // divided by 16
-			be_t<u16, 1> frameCropLeftOffset;
-			be_t<u16, 1> frameCropRightOffset;
-			be_t<u16, 1> frameCropTopOffset;
-			be_t<u16, 1> frameCropBottomOffset;
-			u8 x14; // contains videoFormat and videoFullRangeFlag
-			u8 colourPrimaries;
-			u8 transferCharacteristics;
-			u8 matrixCoefficients;
+			u32 x4; // 0 (not used)
+			be_t<u16> horizontalSize; // divided by 16
+			be_t<u16> verticalSize; // divided by 16
+			be_t<u16> frameCropLeftOffset;
+			be_t<u16> frameCropRightOffset;
+			be_t<u16> frameCropTopOffset;
+			be_t<u16> frameCropBottomOffset;
+
+			union
+			{
+				struct
+				{
+					be_t<u16> width;
+					be_t<u16> height;
+				}
+				sarInfo;
+
+				struct
+				{
+					u8 x14; // contains videoFormat and videoFullRangeFlag
+					u8 colourPrimaries;
+					u8 transferCharacteristics;
+					u8 matrixCoefficients;
+				};
+			};
+
 			u8 x18; // contains entropyCodingModeFlag, deblockingFilterFlag, minNumSlicePerPictureIdc, nfwIdc
 			u8 maxMeanBitrate;
 		}
@@ -331,15 +313,13 @@ struct PamfStreamHeader
 			u8 x1; // not used
 			u8 x2; // contains progressiveSequence, videoSignalInfoFlag, frameRateInfo
 			u8 aspectRatioIdc;
-			be_t<u16, 1> sarWidth;
-			be_t<u16, 1> sarHeight;
-			u8 reserved1;
-			u8 horizontalSize; // in units of 16 pixels
-			u8 reserved2;
-			u8 verticalSize; // in units of 16 pixels
-			be_t<u16, 1> horizontalSizeValue;
-			be_t<u16, 1> verticalSizeValue;
-			be_t<u32, 1> x10; // not used
+			be_t<u16> sarWidth;
+			be_t<u16> sarHeight;
+			be_t<u16> horizontalSize;
+			be_t<u16> verticalSize;
+			be_t<u16> horizontalSizeValue;
+			be_t<u16> verticalSizeValue;
+			u32 x10; // not used
 			u8 x14; // contains videoFormat and videoFullRangeFlag
 			u8 colourPrimaries;
 			u8 transferCharacteristics;
@@ -350,7 +330,7 @@ struct PamfStreamHeader
 		// Audio specific information
 		struct
 		{
-			be_t<u16, 1> unknown; // 0
+			u16 unknown; // 0
 			u8 channels; // number of channels (1, 2, 6, 8)
 			u8 freq; // 1 (always 48000)
 			u8 bps; // LPCM only
@@ -359,236 +339,59 @@ struct PamfStreamHeader
 	};
 };
 
-CHECK_SIZE_ALIGN(PamfStreamHeader, 48, 1);
-
-struct PamfGroup
-{
-	be_t<u32, 1> size; // doesn't include this field
-
-	u8 reserved;
-
-	u8 stream_num; // same value as in PamfSequenceInfo
-	PamfStreamHeader streams;
-};
-
-CHECK_SIZE_ALIGN(PamfGroup, 6 + sizeof(PamfStreamHeader), 1);
-
-struct PamfGroupingPeriod
-{
-	be_t<u32, 1> size; // doesn't include this field
-
-	be_t<u16, 1> start_pts_high; // always 0, greatest valid pts is UINT32_MAX
-	be_t<u32, 1> start_pts_low;  // same value as in PamfSequenceInfo, since there is only one PamfGroupingPeriod
-	be_t<u16, 1> end_pts_high;   // unused due to bug
-	be_t<u32, 1> end_pts_low;    // same value as in PamfSequenceInfo, since there is only one PamfGroupingPeriod
-
-	u8 reserved;
-
-	u8 group_num; // always 1
-	PamfGroup groups;
-};
-
-CHECK_SIZE_ALIGN(PamfGroupingPeriod, 0x12 + sizeof(PamfGroup), 1);
-
-struct PamfSequenceInfo
-{
-	be_t<u32, 1> size; // doesn't include this field
-
-	be_t<u16, 1> reserved1;
-
-	be_t<u16, 1> start_pts_high; // always 0, greatest valid pts is UINT32_MAX
-	be_t<u32, 1> start_pts_low;  // Presentation Time Stamp (start)
-	be_t<u16, 1> end_pts_high;   // always 0, greatest valid pts is UINT32_MAX
-	be_t<u32, 1> end_pts_low;    // Presentation Time Stamp (end)
-
-	be_t<u32, 1> mux_rate_bound;  // multiplex bitrate in units of 50 bytes per second
-	be_t<u32, 1> std_delay_bound; // buffer delay in units of 1/90000 seconds
-
-	be_t<u32, 1> total_stream_num; // across all groups; since there is always only one group, this is equal stream_count in PamfGroup
-
-	u8 reserved2;
-
-	u8 grouping_period_num; // always 1
-	PamfGroupingPeriod grouping_periods;
-};
-
-CHECK_SIZE_ALIGN(PamfSequenceInfo, 0x20 + sizeof(PamfGroupingPeriod), 1);
+CHECK_SIZE_ALIGN(PamfStreamHeader, 48, 4);
 
 struct PamfHeader
 {
-	be_t<u32, 1> magic;       // "PAMF"
-	be_t<u32, 1> version;     // "0040" or "0041"
-	be_t<u32, 1> header_size; // in units of 2048 bytes
-	be_t<u32, 1> data_size;   // in units of 2048 bytes
-
-	be_t<u32, 1> psmf_marks_offset; // always 0
-	be_t<u32, 1> psmf_marks_size;   // always 0
-	be_t<u32, 1> unk_offset;        // always 0
-	be_t<u32, 1> unk_size;          // always 0
-
-	u8 reserved[0x30];
-
-	PamfSequenceInfo seq_info;
+	u32 magic; //"PAMF"
+	u32 version; //"0041" (is it const?)
+	be_t<u32> data_offset; //== 2048 >> 11, PAMF headers seem to be always 2048 bytes in size
+	be_t<u32> data_size; //== ((fileSize - 2048) >> 11)
+	u32 reserved[16];
+	be_t<u32> table_size; //== size of mapping-table
+	u16 reserved1;
+	be_t<u16> start_pts_high;
+	be_t<u32, 2> start_pts_low; //Presentation Time Stamp (start)
+	be_t<u16> end_pts_high;
+	be_t<u32, 2> end_pts_low; //Presentation Time Stamp (end)
+	be_t<u32, 2> mux_rate_max; //== 0x01D470 (400 bps per unit, == 48000000 bps)
+	be_t<u32, 2> mux_rate_min; //== 0x0107AC (?????)
+	u16 reserved2; // ?????
+	u8 reserved3;
+	u8 stream_count; //total stream count (reduced to 1 byte)
+	be_t<u16> unk1; //== 1 (?????)
+	be_t<u32, 2> table_data_size; //== table_size - 0x20 == 0x14 + (0x30 * total_stream_num) (?????)
+	//TODO: check relative offset of stream structs (could be from 0x0c to 0x14, currently 0x14)
+	be_t<u16> start_pts_high2; //????? (probably same values)
+	be_t<u32, 2> start_pts_low2; //?????
+	be_t<u16> end_pts_high2; //?????
+	be_t<u32, 2> end_pts_low2; //?????
+	be_t<u32> unk2; //== 0x10000 (?????)
+	be_t<u16> unk3; // ?????
+	be_t<u16> unk4; // == stream_count
+	//==========================
+	PamfStreamHeader stream_headers[256];
 };
 
-CHECK_SIZE_ALIGN(PamfHeader, 0x50 + sizeof(PamfSequenceInfo), 1);
+CHECK_SIZE_ALIGN(PamfHeader, 136 + sizeof(PamfHeader::stream_headers), 4);
 
 struct PamfEpHeader
 {
-	be_t<u16, 1> value0;    // 2 bits: indexN, 1 bit: unused, 13 bits: nThRefPictureOffset in units of 2048 bytes
-	be_t<u16, 1> pts_high;  // always 0, greatest valid pts is UINT32_MAX
-	be_t<u32, 1> pts_low;
-	be_t<u32, 1> rpnOffset; // in units of 2048 bytes
+	be_t<u16> value0; //mixed indexN (probably left 2 bits) and nThRefPictureOffset
+	be_t<u16> pts_high;
+	be_t<u32> pts_low;
+	be_t<u32> rpnOffset;
 };
 
-CHECK_SIZE_ALIGN(PamfEpHeader, 12, 1);
-
-// PSMF specific
-
-struct PsmfStreamHeader
-{
-	u8 stream_id;
-	u8 private_stream_id; // for streams multiplexed as private data streams (stream_id == 0xbd)
-
-	be_t<u16, 1> p_std_buffer; // 2 bits: unused ??? "00", 1 bit: P_STD_buffer_scale, 13 bits: P_STD_buffer_size
-
-	be_t<u32, 1> ep_offset; // offset of EP section in header
-	be_t<u32, 1> ep_num; // count of EPs
-
-	union
-	{
-		// Video specific information
-		struct
-		{
-			u8 horizontalSize; // in units of 16 pixels
-			u8 verticalSize;   // in units of 16 pixels
-		}
-		video;
-
-		// Audio specific information
-		struct
-		{
-			be_t<u16, 1> unknown;    // 0
-			u8 channelConfiguration; // 1 = mono, 2 = stereo
-			u8 samplingFrequency;    // 2 = 44.1kHz
-		}
-		audio;
-	};
-};
-
-CHECK_SIZE_ALIGN(PsmfStreamHeader, 0x10, 1);
-
-struct PsmfGroup
-{
-	be_t<u32, 1> size; // doesn't include this field
-
-	u8 reserved;
-
-	u8 stream_num; // same value as in PsmfSequenceInfo
-	PsmfStreamHeader streams;
-};
-
-CHECK_SIZE_ALIGN(PsmfGroup, 6 + sizeof(PsmfStreamHeader), 1);
-
-struct PsmfGroupingPeriod
-{
-	be_t<u32, 1> size; // doesn't include this field
-
-	be_t<u16, 1> start_pts_high; // always 0, greatest valid pts is UINT32_MAX
-	be_t<u32, 1> start_pts_low;  // same value as in PsmfSequenceInfo, since there is only one PsmfGroupingPeriod
-	be_t<u16, 1> end_pts_high;   // unused due to bug
-	be_t<u32, 1> end_pts_low;    // same value as in PsmfSequenceInfo, since there is only one PsmfGroupingPeriod
-
-	u8 reserved;
-
-	u8 group_num; // always 1
-	PsmfGroup groups;
-};
-
-CHECK_SIZE_ALIGN(PsmfGroupingPeriod, 0x12 + sizeof(PsmfGroup), 1);
-
-struct PsmfSequenceInfo
-{
-	be_t<u32, 1> size; // doesn't include this field
-
-	be_t<u16, 1> start_pts_high; // always 0, greatest valid pts is UINT32_MAX
-	be_t<u32, 1> start_pts_low;  // Presentation Time Stamp (start)
-	be_t<u16, 1> end_pts_high;   // always 0, greatest valid pts is UINT32_MAX
-	be_t<u32, 1> end_pts_low;    // Presentation Time Stamp (end)
-
-	be_t<u32, 1> mux_rate_bound;  // multiplex bitrate in units of 50 bytes per second
-	be_t<u32, 1> std_delay_bound; // buffer delay in units of 1/90000 seconds
-
-	u8 total_stream_num; // across all groups; since there is always only one group, this is equal stream_count in PsmfGroup
-
-	u8 grouping_period_num; // always 1
-	PsmfGroupingPeriod grouping_periods;
-};
-
-CHECK_SIZE_ALIGN(PsmfSequenceInfo, 0x1a + sizeof(PsmfGroupingPeriod), 1);
-
-struct PsmfHeader
-{
-	be_t<u32, 1> magic;       // "PSMF"
-	be_t<u32, 1> version;     // "0012", "0013", "0014" or "0015"
-	be_t<u32, 1> header_size; // not scaled, unlike PAMF
-	be_t<u32, 1> data_size;   // not scaled, unlike PAMF
-
-	be_t<u32, 1> psmf_marks_offset;
-	be_t<u32, 1> psmf_marks_size;
-	be_t<u32, 1> unk[2];
-
-	u8 reserved[0x30];
-
-	PsmfSequenceInfo seq_info;
-};
-
-CHECK_SIZE_ALIGN(PsmfHeader, 0x50 + sizeof(PsmfSequenceInfo), 1);
-
-struct PsmfEpHeader
-{
-	be_t<u16, 1> value0;    // 2 bits: indexN, 2 bits: unused, 11 bits: nThRefPictureOffset in units of 1024 bytes, 1 bit: pts_high
-	be_t<u32, 1> pts_low;
-	be_t<u32, 1> rpnOffset; // in units of 2048 bytes
-};
-
-CHECK_SIZE_ALIGN(PsmfEpHeader, 10, 1);
+CHECK_SIZE_ALIGN(PamfEpHeader, 12, 4);
 
+// not directly accessed by virtual CPU, fields are unknown
 struct CellPamfReader
 {
-	be_t<u64> headerSize;
-	be_t<u64> dataSize;
-	be_t<u32> attribute;
-	be_t<u16> isPsmf;
-	be_t<u16> version;
-	be_t<u32> currentGroupingPeriodIndex;
-	be_t<u32> currentGroupIndex;
-	be_t<u32> currentStreamIndex;
-
-	union
-	{
-		struct
-		{
-			vm::bcptr<PamfHeader> header;
-			vm::bcptr<PamfSequenceInfo> sequenceInfo;
-			vm::bcptr<PamfGroupingPeriod> currentGroupingPeriod;
-			vm::bcptr<PamfGroup> currentGroup;
-			vm::bcptr<PamfStreamHeader> currentStream;
-		}
-		pamf;
-
-		struct
-		{
-			vm::bcptr<PsmfHeader> header;
-			vm::bcptr<PsmfSequenceInfo> sequenceInfo;
-			vm::bcptr<PsmfGroupingPeriod> currentGroupingPeriod;
-			vm::bcptr<PsmfGroup> currentGroup;
-			vm::bcptr<PsmfStreamHeader> currentStream;
-		}
-		psmf;
-	};
-
-	u32 reserved[18];
+	vm::cptr<PamfHeader> pAddr;
+	s32 stream;
+	u64 fileSize;
+	u32 internalData[28];
 };
 
 CHECK_SIZE(CellPamfReader, 128);
diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp b/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp
index 5cef4ba877..dc2cef51f8 100644
--- a/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/VFS.h"
-#include "Emu/System.h"
 #include "cellSysutil.h"
 
+
+
 LOG_CHANNEL(cellPhotoDecode);
 
 // Return Codes
@@ -36,11 +36,6 @@ void fmt_class_string<CellPhotoDecodeError>::format(std::string& out, u64 arg)
 	});
 }
 
-enum
-{
-	CELL_PHOTO_DECODE_VERSION_CURRENT = 0
-};
-
 struct CellPhotoDecodeSetParam
 {
 	vm::bptr<void> dstBuffer;
@@ -62,22 +57,7 @@ using CellPhotoDecodeFinishCallback = void(s32 result, vm::ptr<void> userdata);
 
 error_code cellPhotoDecodeInitialize(u32 version, u32 container1, u32 container2, vm::ptr<CellPhotoDecodeFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	cellPhotoDecode.warning("cellPhotoDecodeInitialize(version=0x%x, container1=0x%x, container2=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, container1, container2, funcFinish, userdata);
-
-	if (version != CELL_PHOTO_DECODE_VERSION_CURRENT || !funcFinish)
-	{
-		return CELL_PHOTO_DECODE_ERROR_PARAM;
-	}
-
-	if (container1 != 0xffffffff && false) // TODO: size < 0x300000
-	{
-		return CELL_PHOTO_DECODE_ERROR_PARAM;
-	}
-
-	if (container2 != 0xffffffff && false) // TODO: size depends on image type, width and height
-	{
-		return CELL_PHOTO_DECODE_ERROR_PARAM;
-	}
+	cellPhotoDecode.todo("cellPhotoDecodeInitialize(version=0x%x, container1=0x%x, container2=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, container1, container2, funcFinish, userdata);
 
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
@@ -90,17 +70,7 @@ error_code cellPhotoDecodeInitialize(u32 version, u32 container1, u32 container2
 
 error_code cellPhotoDecodeInitialize2(u32 version, u32 container2, vm::ptr<CellPhotoDecodeFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	cellPhotoDecode.warning("cellPhotoDecodeInitialize2(version=0x%x, container2=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, container2, funcFinish, userdata);
-
-	if (version != CELL_PHOTO_DECODE_VERSION_CURRENT || !funcFinish)
-	{
-		return CELL_PHOTO_DECODE_ERROR_PARAM;
-	}
-
-	if (container2 != 0xffffffff && false) // TODO: size depends on image type, width and height
-	{
-		return CELL_PHOTO_DECODE_ERROR_PARAM;
-	}
+	cellPhotoDecode.todo("cellPhotoDecodeInitialize2(version=0x%x, container2=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, container2, funcFinish, userdata);
 
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
@@ -113,12 +83,7 @@ error_code cellPhotoDecodeInitialize2(u32 version, u32 container2, vm::ptr<CellP
 
 error_code cellPhotoDecodeFinalize(vm::ptr<CellPhotoDecodeFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	cellPhotoDecode.warning("cellPhotoDecodeFinalize(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
-
-	if (!funcFinish)
-	{
-		return CELL_PHOTO_DECODE_ERROR_PARAM;
-	}
+	cellPhotoDecode.todo("cellPhotoDecodeFinalize(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
 
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
@@ -131,44 +96,7 @@ error_code cellPhotoDecodeFinalize(vm::ptr<CellPhotoDecodeFinishCallback> funcFi
 
 error_code cellPhotoDecodeFromFile(vm::cptr<char> srcHddDir, vm::cptr<char> srcHddFile, vm::ptr<CellPhotoDecodeSetParam> set_param, vm::ptr<CellPhotoDecodeReturnParam> return_param)
 {
-	cellPhotoDecode.warning("cellPhotoDecodeFromFile(srcHddDir=%s, srcHddFile=%s, set_param=*0x%x, return_param=*0x%x)", srcHddDir, srcHddFile, set_param, return_param);
-
-	if (!srcHddDir || !srcHddFile || !set_param || !return_param)
-	{
-		return CELL_PHOTO_DECODE_ERROR_PARAM;
-	}
-
-	*return_param = {};
-
-	const std::string vpath = fmt::format("%s/%s", srcHddDir.get_ptr(), srcHddFile.get_ptr());
-	const std::string path = vfs::get(vpath);
-
-	if (!vpath.starts_with("/dev_hdd0") && !vpath.starts_with("/dev_hdd1") && !vpath.starts_with("/dev_bdvd"))
-	{
-		cellPhotoDecode.error("Source '%s' is not inside dev_hdd0 or dev_hdd1 or dev_bdvd", vpath);
-		return CELL_PHOTO_DECODE_ERROR_ACCESS_ERROR; // TODO: is this correct?
-	}
-
-	if (!fs::is_file(path))
-	{
-		cellPhotoDecode.error("Source '%s' is not a file (vfs='%s')", path, vpath);
-		return CELL_PHOTO_DECODE_ERROR_ACCESS_ERROR; // TODO: is this correct?
-	}
-
-	cellPhotoDecode.notice("About to decode '%s' (set_param: width=%d, height=%d, dstBuffer=*0x%x)", path, set_param->width, set_param->height, set_param->dstBuffer);
-
-	s32 width{};
-	s32 height{};
-
-	if (!Emu.GetCallbacks().get_scaled_image(path, set_param->width, set_param->height, width, height, static_cast<u8*>(set_param->dstBuffer.get_ptr()), false))
-	{
-		cellPhotoDecode.error("Failed to decode '%s'", path);
-		return CELL_PHOTO_DECODE_ERROR_DECODE;
-	}
-
-	return_param->width = width;
-	return_param->height = height;
-
+	cellPhotoDecode.todo("cellPhotoDecodeFromFile(srcHddDir=%s, srcHddFile=%s, set_param=*0x%x, return_param=*0x%x)", srcHddDir, srcHddFile, set_param, return_param);
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp b/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp
index 8a264bc721..45481684cf 100644
--- a/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/IdManager.h"
-#include "Emu/VFS.h"
 #include "cellSysutil.h"
 
+
+
 LOG_CHANNEL(cellPhotoExport);
 
 // Return Codes
@@ -44,19 +44,6 @@ void fmt_class_string<CellPhotoExportError>::format(std::string& out, u64 arg)
 	});
 }
 
-enum
-{
-	CELL_PHOTO_EXPORT_UTIL_VERSION_CURRENT = 0
-};
-
-enum
-{
-	CELL_PHOTO_EXPORT_UTIL_HDD_PATH_MAX           = 1055,
-	CELL_PHOTO_EXPORT_UTIL_PHOTO_TITLE_MAX_LENGTH = 64,
-	CELL_PHOTO_EXPORT_UTIL_GAME_TITLE_MAX_LENGTH  = 64,
-	CELL_PHOTO_EXPORT_UTIL_GAME_COMMENT_MAX_SIZE  = 1024,
-};
-
 struct CellPhotoExportSetParam
 {
 	vm::bptr<char> photo_title;
@@ -67,202 +54,27 @@ struct CellPhotoExportSetParam
 
 using CellPhotoExportUtilFinishCallback = void(s32 result, vm::ptr<void> userdata);
 
-struct photo_export
+error_code cellPhotoInitialize()
 {
-	atomic_t<s32> progress = 0; // 0x0-0xFFFF for 0-100%
-};
-
-
-bool check_photo_path(const std::string& file_path)
-{
-	if (file_path.size() >= CELL_PHOTO_EXPORT_UTIL_HDD_PATH_MAX)
-	{
-		return false;
-	}
-
-	for (char c : file_path)
-	{
-		if (!((c >= 'a' && c <= 'z') ||
-			  (c >= 'A' && c <= 'Z') ||
-			  (c >= '0' && c <= '9') ||
-			   c == '-' || c == '_' ||
-			   c == '/' || c == '.'))
-		{
-			return false;
-		}
-	}
-
-	if (!file_path.starts_with("/dev_hdd0"sv) &&
-		!file_path.starts_with("/dev_bdvd"sv) &&
-		!file_path.starts_with("/dev_hdd1"sv))
-	{
-		return false;
-	}
-
-	if (file_path.find(".."sv) != umax)
-	{
-		return false;
-	}
-
-	return true;
-}
-
-std::string get_available_photo_path(const std::string& filename)
-{
-	const std::string photo_dir = "/dev_hdd0/photo/";
-	std::string dst_path = vfs::get(photo_dir + filename);
-
-	// Do not overwrite existing files. Add a suffix instead.
-	for (u32 i = 0; fs::exists(dst_path); i++)
-	{
-		const std::string suffix = fmt::format("_%d", i);
-		std::string new_filename = filename;
-
-		if (const usz pos = new_filename.find_last_of('.'); pos != std::string::npos)
-		{
-			new_filename.insert(pos, suffix);
-		}
-		else
-		{
-			new_filename.append(suffix);
-		}
-
-		dst_path = vfs::get(photo_dir + new_filename);
-	}
-
-	return dst_path;
-}
-
-
-error_code cellPhotoInitialize(s32 version, u32 container, vm::ptr<CellPhotoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
-{
-	cellPhotoExport.notice("cellPhotoInitialize(version=%d, container=%d, funcFinish=*0x%x, userdata=*0x%x)", version, container, funcFinish, userdata);
-
-	if (version != CELL_PHOTO_EXPORT_UTIL_VERSION_CURRENT)
-	{
-		return CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	if (container != 0xfffffffe)
-	{
-		// TODO
-	}
-
-	if (!funcFinish)
-	{
-		return CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	sysutil_register_cb([=](ppu_thread& ppu) -> s32
-	{
-		funcFinish(ppu, CELL_OK, userdata);
-		return CELL_OK;
-	});
-
+	UNIMPLEMENTED_FUNC(cellPhotoExport);
 	return CELL_OK;
 }
 
-error_code cellPhotoFinalize(vm::ptr<CellPhotoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
+error_code cellPhotoFinalize()
 {
-	cellPhotoExport.notice("cellPhotoFinalize(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
-
-	if (!funcFinish)
-	{
-		return CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	sysutil_register_cb([=](ppu_thread& ppu) -> s32
-	{
-		funcFinish(ppu, CELL_OK, userdata);
-		return CELL_OK;
-	});
-
+	UNIMPLEMENTED_FUNC(cellPhotoExport);
 	return CELL_OK;
 }
 
-error_code cellPhotoRegistFromFile(vm::cptr<char> path, vm::cptr<char> photo_title, vm::cptr<char> game_title, vm::cptr<char> game_comment, vm::ptr<CellPhotoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
+error_code cellPhotoRegistFromFile()
 {
-	cellPhotoExport.todo("cellPhotoRegistFromFile(path=%s, photo_title=%s, game_title=%s, game_comment=%s, funcFinish=*0x%x, userdata=*0x%x)", path, photo_title, game_title, game_comment, funcFinish, userdata);
-
-	if (!path || !funcFinish)
-	{
-		return CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	const std::string file_path = path.get_ptr();
-
-	if (!check_photo_path(file_path))
-	{
-		return { CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM, file_path };
-	}
-
-	const std::string filename = file_path.substr(file_path.find_last_of('/') + 1);
-
-	if (filename.empty())
-	{
-		return { CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM, "filename empty" };
-	}
-
-	sysutil_register_cb([=](ppu_thread& ppu) -> s32
-	{
-		auto& pexp = g_fxo->get<photo_export>();
-		pexp.progress = 0; // 0%
-
-		const std::string src_path = vfs::get(file_path);
-		const std::string dst_path = get_available_photo_path(filename);
-
-		cellPhotoExport.notice("Copying file from '%s' to '%s'", file_path, dst_path);
-
-		// TODO: We ignore metadata for now
-
-		if (!fs::create_path(fs::get_parent_dir(dst_path)) || !fs::copy_file(src_path, dst_path, false))
-		{
-			// TODO: find out which error is used
-			cellPhotoExport.error("Failed to copy file from '%s' to '%s' (%s)", src_path, dst_path, fs::g_tls_error);
-			funcFinish(ppu, CELL_PHOTO_EXPORT_UTIL_ERROR_MOVE, userdata);
-			return CELL_OK;
-		}
-
-		if (file_path.starts_with("/dev_hdd0"sv))
-		{
-			cellPhotoExport.notice("Removing file '%s'", src_path);
-
-			if (!fs::remove_file(src_path))
-			{
-				// TODO: find out if an error is used here
-				cellPhotoExport.error("Failed to remove file '%s' (%s)", src_path, fs::g_tls_error);
-			}
-		}
-
-		// TODO: track progress during file copy
-
-		pexp.progress = 0xFFFF; // 100%
-
-		funcFinish(ppu, CELL_OK, userdata);
-		return CELL_OK;
-	});
-
+	UNIMPLEMENTED_FUNC(cellPhotoExport);
 	return CELL_OK;
 }
 
 error_code cellPhotoExportInitialize(u32 version, u32 container, vm::ptr<CellPhotoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	cellPhotoExport.notice("cellPhotoExportInitialize(version=0x%x, container=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, container, funcFinish, userdata);
-
-	if (version != CELL_PHOTO_EXPORT_UTIL_VERSION_CURRENT)
-	{
-		return CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	if (container != 0xfffffffe)
-	{
-		// TODO
-	}
-
-	if (!funcFinish)
-	{
-		return CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM;
-	}
+	cellPhotoExport.todo("cellPhotoExportInitialize(version=0x%x, container=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, container, funcFinish, userdata);
 
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
@@ -275,17 +87,7 @@ error_code cellPhotoExportInitialize(u32 version, u32 container, vm::ptr<CellPho
 
 error_code cellPhotoExportInitialize2(u32 version, vm::ptr<CellPhotoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	cellPhotoExport.notice("cellPhotoExportInitialize2(version=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, funcFinish, userdata);
-
-	if (version != CELL_PHOTO_EXPORT_UTIL_VERSION_CURRENT)
-	{
-		return CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	if (!funcFinish)
-	{
-		return CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM;
-	}
+	cellPhotoExport.todo("cellPhotoExportInitialize2(version=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, funcFinish, userdata);
 
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
@@ -298,12 +100,7 @@ error_code cellPhotoExportInitialize2(u32 version, vm::ptr<CellPhotoExportUtilFi
 
 error_code cellPhotoExportFinalize(vm::ptr<CellPhotoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	cellPhotoExport.notice("cellPhotoExportFinalize(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
-
-	if (!funcFinish)
-	{
-		return CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM;
-	}
+	cellPhotoExport.todo("cellPhotoExportFinalize(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
 
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
@@ -318,69 +115,8 @@ error_code cellPhotoExportFromFile(vm::cptr<char> srcHddDir, vm::cptr<char> srcH
 {
 	cellPhotoExport.todo("cellPhotoExportFromFile(srcHddDir=%s, srcHddFile=%s, param=*0x%x, funcFinish=*0x%x, userdata=*0x%x)", srcHddDir, srcHddFile, param, funcFinish, userdata);
 
-	if (!param || !funcFinish)
-	{
-		return CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	// TODO: check param members ?
-
-	cellPhotoExport.notice("cellPhotoExportFromFile: param: photo_title=%s, game_title=%s, game_comment=%s", param->photo_title, param->game_title, param->game_comment);
-
-	const std::string file_path = fmt::format("%s/%s", srcHddDir.get_ptr(), srcHddFile.get_ptr());
-
-	if (!check_photo_path(file_path))
-	{
-		return { CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM, file_path };
-	}
-
-	std::string filename;
-
-	if (srcHddFile)
-	{
-		fmt::append(filename, "%s", srcHddFile.get_ptr());
-	}
-
-	if (filename.empty())
-	{
-		return { CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM, "filename empty" };
-	}
-
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
-		auto& pexp = g_fxo->get<photo_export>();
-		pexp.progress = 0; // 0%
-
-		const std::string src_path = vfs::get(file_path);
-		const std::string dst_path = get_available_photo_path(filename);
-
-		cellPhotoExport.notice("Copying file from '%s' to '%s'", file_path, dst_path);
-
-		// TODO: We ignore metadata for now
-
-		if (!fs::create_path(fs::get_parent_dir(dst_path)) || !fs::copy_file(src_path, dst_path, false))
-		{
-			// TODO: find out which error is used
-			cellPhotoExport.error("Failed to copy file from '%s' to '%s' (%s)", src_path, dst_path, fs::g_tls_error);
-			funcFinish(ppu, CELL_PHOTO_EXPORT_UTIL_ERROR_MOVE, userdata);
-			return CELL_OK;
-		}
-
-		if (file_path.starts_with("/dev_hdd0"sv))
-		{
-			cellPhotoExport.notice("Removing file '%s'", src_path);
-
-			if (!fs::remove_file(src_path))
-			{
-				// TODO: find out if an error is used here
-				cellPhotoExport.error("Failed to remove file '%s' (%s)", src_path, fs::g_tls_error);
-			}
-		}
-
-		// TODO: track progress during file copy
-
-		pexp.progress = 0xFFFF; // 100%
-
 		funcFinish(ppu, CELL_OK, userdata);
 		return CELL_OK;
 	});
@@ -392,58 +128,8 @@ error_code cellPhotoExportFromFileWithCopy(vm::cptr<char> srcHddDir, vm::cptr<ch
 {
 	cellPhotoExport.todo("cellPhotoExportFromFileWithCopy(srcHddDir=%s, srcHddFile=%s, param=*0x%x, funcFinish=*0x%x, userdata=*0x%x)", srcHddDir, srcHddFile, param, funcFinish, userdata);
 
-	if (!param || !funcFinish)
-	{
-		return CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	// TODO: check param members ?
-
-	cellPhotoExport.notice("cellPhotoExportFromFileWithCopy: param: photo_title=%s, game_title=%s, game_comment=%s", param->photo_title, param->game_title, param->game_comment);
-
-	const std::string file_path = fmt::format("%s/%s", srcHddDir.get_ptr(), srcHddFile.get_ptr());
-
-	if (!check_photo_path(file_path))
-	{
-		return { CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM, file_path };
-	}
-
-	std::string filename;
-
-	if (srcHddFile)
-	{
-		fmt::append(filename, "%s", srcHddFile.get_ptr());
-	}
-
-	if (filename.empty())
-	{
-		return { CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM, "filename empty" };
-	}
-
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
-		auto& pexp = g_fxo->get<photo_export>();
-		pexp.progress = 0; // 0%
-
-		const std::string src_path = vfs::get(file_path);
-		const std::string dst_path = get_available_photo_path(filename);
-
-		cellPhotoExport.notice("Copying file from '%s' to '%s'", file_path, dst_path);
-
-		// TODO: We ignore metadata for now
-
-		if (!fs::create_path(fs::get_parent_dir(dst_path)) || !fs::copy_file(src_path, dst_path, false))
-		{
-			// TODO: find out which error is used
-			cellPhotoExport.error("Failed to copy file from '%s' to '%s' (%s)", src_path, dst_path, fs::g_tls_error);
-			funcFinish(ppu, CELL_PHOTO_EXPORT_UTIL_ERROR_MOVE, userdata);
-			return CELL_OK;
-		}
-
-		// TODO: track progress during file copy
-
-		pexp.progress = 0xFFFF; // 100%
-
 		funcFinish(ppu, CELL_OK, userdata);
 		return CELL_OK;
 	});
@@ -453,20 +139,11 @@ error_code cellPhotoExportFromFileWithCopy(vm::cptr<char> srcHddDir, vm::cptr<ch
 
 error_code cellPhotoExportProgress(vm::ptr<CellPhotoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	cellPhotoExport.notice("cellPhotoExportProgress(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
-
-	if (!funcFinish)
-	{
-		return CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM;
-	}
+	cellPhotoExport.todo("cellPhotoExportProgress(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
 
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
-		// Set the status as 0x0-0xFFFF (0-100%) depending on the copy status.
-		// Only the copy or move of the movie and metadata files is considered for the progress.
-		const auto& pexp = g_fxo->get<photo_export>();
-
-		funcFinish(ppu, pexp.progress, userdata);
+		funcFinish(ppu, 0xFFFF, userdata); // 0-0xFFFF where 0xFFFF = 100%
 		return CELL_OK;
 	});
 
diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp b/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp
index d56db1f060..7be26e6bc4 100644
--- a/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp
@@ -1,14 +1,11 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/IdManager.h"
 #include "Emu/Cell/lv2/sys_fs.h"
-#include "Emu/RSX/Overlays/overlay_media_list_dialog.h"
-#include "Emu/VFS.h"
-#include "Emu/System.h"
-#include "Utilities/StrUtil.h"
 #include "cellSysutil.h"
 
-LOG_CHANNEL(cellPhotoImportUtil, "cellPhotoImport");
+
+
+LOG_CHANNEL(cellPhotoImportUtil);
 
 // Return Codes
 enum CellPhotoImportError : u32
@@ -40,11 +37,6 @@ void fmt_class_string<CellPhotoImportError>::format(std::string& out, u64 arg)
 	});
 }
 
-enum CellPhotoImportVersion : u32
-{
-	CELL_PHOTO_IMPORT_VERSION_CURRENT = 0,
-};
-
 enum
 {
 	CELL_PHOTO_IMPORT_HDD_PATH_MAX           = 1055,
@@ -100,243 +92,40 @@ struct CellPhotoImportSetParam
 
 using CellPhotoImportFinishCallback = void(s32 result, vm::ptr<CellPhotoImportFileData> filedata, vm::ptr<void> userdata);
 
-struct photo_import
-{
-	shared_mutex mutex;
-	bool is_busy = false;
-	CellPhotoImportSetParam param{};
-	vm::ptr<CellPhotoImportFinishCallback> func_finish{};
-	vm::ptr<void> userdata{};
-};
-
-vm::gvar<CellPhotoImportFileDataSub> g_filedata_sub;
-vm::gvar<CellPhotoImportFileData> g_filedata;
-
-error_code select_photo(std::string dst_dir)
-{
-	auto& pi_manager = g_fxo->get<photo_import>();
-
-	if (!pi_manager.func_finish)
-	{
-		cellPhotoImportUtil.error("func_finish is null");
-		return CELL_PHOTO_IMPORT_ERROR_PARAM;
-	}
-
-	if (!dst_dir.starts_with("/dev_hdd0"sv) && !dst_dir.starts_with("/dev_hdd1"sv))
-	{
-		cellPhotoImportUtil.error("Destination '%s' is not inside dev_hdd0 or dev_hdd1", dst_dir);
-		return CELL_PHOTO_IMPORT_ERROR_ACCESS_ERROR; // TODO: is this correct?
-	}
-
-	dst_dir = vfs::get(dst_dir);
-
-	if (!fs::is_dir(dst_dir))
-	{
-		// TODO: check if the dir is user accessible and can be written to
-		cellPhotoImportUtil.error("Destination '%s' is not a directory", dst_dir);
-		return CELL_PHOTO_IMPORT_ERROR_ACCESS_ERROR; // TODO: is this correct?
-	}
-
-	pi_manager.is_busy = true;
-
-	const std::string vfs_dir_path = vfs::get("/dev_hdd0/photo");
-	const std::string title = get_localized_string(localized_string_id::RSX_OVERLAYS_MEDIA_DIALOG_TITLE_PHOTO_IMPORT);
-
-	error_code error = rsx::overlays::show_media_list_dialog(rsx::overlays::media_list_dialog::media_type::photo, vfs_dir_path, title,
-		[&pi_manager, dst_dir](s32 status, utils::media_info info)
-		{
-			sysutil_register_cb([&pi_manager, dst_dir, info, status](ppu_thread& ppu) -> s32
-			{
-				*g_filedata_sub = {};
-				*g_filedata = {};
-
-				u32 result = status >= 0 ? u32{CELL_OK} : u32{CELL_CANCEL};
-
-				if (result == CELL_OK)
-				{
-					fs::stat_t f_info{};
-
-					if (!fs::get_stat(info.path, f_info) || f_info.is_directory)
-					{
-						cellPhotoImportUtil.error("Path does not belong to a valid file: '%s'", info.path);
-						result = CELL_PHOTO_IMPORT_ERROR_ACCESS_ERROR; // TODO: is this correct ?
-						pi_manager.is_busy = false;
-						pi_manager.func_finish(ppu, result, g_filedata, pi_manager.userdata);
-						return CELL_OK;
-					}
-
-					if (f_info.size > pi_manager.param.fileSizeMax)
-					{
-						cellPhotoImportUtil.error("File size is too large: %d (fileSizeMax=%d)", f_info.size, pi_manager.param.fileSizeMax);
-						result = CELL_PHOTO_IMPORT_ERROR_COPY; // TODO: is this correct ?
-						pi_manager.is_busy = false;
-						pi_manager.func_finish(ppu, result, g_filedata, pi_manager.userdata);
-						return CELL_OK;
-					}
-
-					const std::string filename = info.path.substr(info.path.find_last_of(fs::delim) + 1);
-					const std::string title = info.get_metadata("title", filename);
-					const std::string dst_path = dst_dir + "/" + filename;
-					std::string sub_type = info.sub_type;
-
-					strcpy_trunc(g_filedata->dstFileName, filename);
-					strcpy_trunc(g_filedata->photo_title, title);
-					strcpy_trunc(g_filedata->game_title, Emu.GetTitle());
-					strcpy_trunc(g_filedata->game_comment, ""); // TODO
-
-					g_filedata->data_sub = g_filedata_sub;
-					g_filedata->data_sub->width = info.width;
-					g_filedata->data_sub->height = info.height;
-
-					cellPhotoImportUtil.notice("Raw image data: filename='%s', title='%s', game='%s', sub_type='%s', width=%d, height=%d, orientation=%d ",
-						filename, title, Emu.GetTitle(), sub_type, info.width, info.height, info.orientation);
-
-					// Fallback to extension if necessary
-					if (sub_type.empty())
-					{
-						sub_type = get_file_extension(filename);
-					}
-
-					if (!sub_type.empty())
-					{
-						sub_type = fmt::to_lower(sub_type);
-					}
-
-					if (sub_type == "jpg" || sub_type == "jpeg")
-					{
-						g_filedata->data_sub->format = CELL_PHOTO_IMPORT_FT_JPEG;
-					}
-					else if (sub_type == "png")
-					{
-						g_filedata->data_sub->format = CELL_PHOTO_IMPORT_FT_PNG;
-					}
-					else if (sub_type == "tif" || sub_type == "tiff")
-					{
-						g_filedata->data_sub->format = CELL_PHOTO_IMPORT_FT_TIFF;
-					}
-					else if (sub_type == "bmp")
-					{
-						g_filedata->data_sub->format = CELL_PHOTO_IMPORT_FT_BMP;
-					}
-					else if (sub_type == "gif")
-					{
-						g_filedata->data_sub->format = CELL_PHOTO_IMPORT_FT_GIF;
-					}
-					else if (sub_type == "mpo")
-					{
-						g_filedata->data_sub->format = CELL_PHOTO_IMPORT_FT_MPO;
-					}
-					else
-					{
-						g_filedata->data_sub->format = CELL_PHOTO_IMPORT_FT_UNKNOWN;
-					}
-
-					switch (info.orientation)
-					{
-					default:
-					case CELL_SEARCH_ORIENTATION_UNKNOWN:
-					case CELL_SEARCH_ORIENTATION_TOP_LEFT:
-						g_filedata->data_sub->rotate = CELL_PHOTO_IMPORT_TEX_ROT_0;
-						break;
-					case CELL_SEARCH_ORIENTATION_TOP_RIGHT:
-						g_filedata->data_sub->rotate = CELL_PHOTO_IMPORT_TEX_ROT_90;
-						break;
-					case CELL_SEARCH_ORIENTATION_BOTTOM_RIGHT:
-						g_filedata->data_sub->rotate = CELL_PHOTO_IMPORT_TEX_ROT_180;
-						break;
-					case CELL_SEARCH_ORIENTATION_BOTTOM_LEFT:
-						g_filedata->data_sub->rotate = CELL_PHOTO_IMPORT_TEX_ROT_270;
-						break;
-					}
-
-					cellPhotoImportUtil.notice("Media list dialog: Copying '%s' to '%s'...", info.path, dst_path);
-
-					if (!fs::copy_file(info.path, dst_path, false))
-					{
-						cellPhotoImportUtil.error("Failed to copy '%s' to '%s'. Error = '%s'", info.path, dst_path, fs::g_tls_error);
-						result = CELL_PHOTO_IMPORT_ERROR_COPY;
-					}
-
-					cellPhotoImportUtil.notice("Cell image data: dstFileName='%s', photo_title='%s', game_title='%s', format=%d, width=%d, height=%d, rotate=%d ",
-						g_filedata->dstFileName, g_filedata->photo_title, g_filedata->game_title, static_cast<s32>(g_filedata->data_sub->format), g_filedata->data_sub->width, g_filedata->data_sub->height, static_cast<s32>(g_filedata->data_sub->rotate));
-				}
-				else
-				{
-					cellPhotoImportUtil.notice("Media list dialog was canceled");
-				}
-
-				pi_manager.is_busy = false;
-				pi_manager.func_finish(ppu, result, g_filedata, pi_manager.userdata);
-				return CELL_OK;
-			});
-		});
-
-	if (error != CELL_OK)
-	{
-		pi_manager.is_busy = false;
-	}
-
-	return error;
-}
-
 error_code cellPhotoImport(u32 version, vm::cptr<char> dstHddPath, vm::ptr<CellPhotoImportSetParam> param, u32 container, vm::ptr<CellPhotoImportFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
 	cellPhotoImportUtil.todo("cellPhotoImport(version=0x%x, dstHddPath=%s, param=*0x%x, container=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, dstHddPath, param, container, funcFinish, userdata);
 
-	if (version != CELL_PHOTO_IMPORT_VERSION_CURRENT || !funcFinish || !param || !dstHddPath)
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
-		return CELL_PHOTO_IMPORT_ERROR_PARAM;
-	}
+		vm::var<CellPhotoImportFileData> filedata;
+		vm::var<CellPhotoImportFileDataSub> sub;
+		filedata->data_sub = sub;
+		funcFinish(ppu, CELL_OK, filedata, userdata);
+		return CELL_OK;
+	});
 
-	if (container != 0xffffffff && false) // TODO
-	{
-		return CELL_PHOTO_IMPORT_ERROR_PARAM;
-	}
-
-	auto& pi_manager = g_fxo->get<photo_import>();
-	std::lock_guard lock(pi_manager.mutex);
-
-	if (pi_manager.is_busy)
-	{
-		return CELL_PHOTO_IMPORT_ERROR_BUSY;
-	}
-
-	pi_manager.param = *param;
-	pi_manager.func_finish = funcFinish;
-	pi_manager.userdata = userdata;
-
-	return select_photo(dstHddPath.get_ptr());
+	return CELL_OK;
 }
 
 error_code cellPhotoImport2(u32 version, vm::cptr<char> dstHddPath, vm::ptr<CellPhotoImportSetParam> param, vm::ptr<CellPhotoImportFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
 	cellPhotoImportUtil.todo("cellPhotoImport2(version=0x%x, dstHddPath=%s, param=*0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, dstHddPath, param, funcFinish, userdata);
 
-	if (version != CELL_PHOTO_IMPORT_VERSION_CURRENT || !funcFinish || !param || !dstHddPath)
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
-		return CELL_PHOTO_IMPORT_ERROR_PARAM;
-	}
+		vm::var<CellPhotoImportFileData> filedata;
+		vm::var<CellPhotoImportFileDataSub> sub;
+		filedata->data_sub = sub;
+		funcFinish(ppu, CELL_OK, filedata, userdata);
+		return CELL_OK;
+	});
 
-	auto& pi_manager = g_fxo->get<photo_import>();
-	std::lock_guard lock(pi_manager.mutex);
-
-	if (pi_manager.is_busy)
-	{
-		return CELL_PHOTO_IMPORT_ERROR_BUSY;
-	}
-
-	pi_manager.param = *param;
-	pi_manager.func_finish = funcFinish;
-	pi_manager.userdata = userdata;
-
-	return select_photo(dstHddPath.get_ptr());
+	return CELL_OK;
 }
 
 DECLARE(ppu_module_manager::cellPhotoImportUtil)("cellPhotoImportUtil", []()
 {
 	REG_FUNC(cellPhotoImportUtil, cellPhotoImport);
 	REG_FUNC(cellPhotoImportUtil, cellPhotoImport2);
-
-	REG_VAR(cellPhotoImportUtil, g_filedata_sub).flag(MFF_HIDDEN);
-	REG_VAR(cellPhotoImportUtil, g_filedata).flag(MFF_HIDDEN);
 });
diff --git a/rpcs3/Emu/Cell/Modules/cellPngDec.cpp b/rpcs3/Emu/Cell/Modules/cellPngDec.cpp
index 74c4cc6fa3..d792987251 100644
--- a/rpcs3/Emu/Cell/Modules/cellPngDec.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellPngDec.cpp
@@ -19,6 +19,11 @@ typedef png_bytep iCCP_profile_type;
 typedef png_charp iCCP_profile_type;
 #endif
 
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 LOG_CHANNEL(cellPngDec);
 
 template <>
@@ -88,7 +93,7 @@ void pngDecReadBuffer(png_structp png_ptr, png_bytep out, png_size_t length)
 	if (buffer.file)
 	{
 		// Get the file
-		auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(buffer.fd);
+		auto file = idm::get<lv2_fs_object, lv2_file>(buffer.fd);
 
 		// Read the data
 		file->file.read(out, length);
@@ -144,7 +149,7 @@ void pngDecRowCallback(png_structp png_ptr, png_bytep new_row, png_uint_32 row_n
 	png_progressive_combine_row(png_ptr, data, new_row);
 }
 
-void pngDecInfoCallback(png_structp png_ptr, png_infop /*info*/)
+void pngDecInfoCallback(png_structp png_ptr, png_infop info)
 {
 	PngStream* stream = static_cast<PngStream*>(png_get_progressive_ptr(png_ptr));
 	if (!stream)
@@ -157,7 +162,7 @@ void pngDecInfoCallback(png_structp png_ptr, png_infop /*info*/)
 	stream->buffer->cursor += (stream->buffer->length - remaining);
 }
 
-void pngDecEndCallback(png_structp png_ptr, png_infop /*info*/)
+void pngDecEndCallback(png_structp png_ptr, png_infop info)
 {
 	PngStream* stream = static_cast<PngStream*>(png_get_progressive_ptr(png_ptr));
 	if (!stream)
@@ -170,17 +175,17 @@ void pngDecEndCallback(png_structp png_ptr, png_infop /*info*/)
 }
 
 // Custom error handler for libpng
-[[noreturn]] void pngDecError(png_structp /*png_ptr*/, png_const_charp error_message)
+[[noreturn]] void pngDecError(png_structp png_ptr, png_const_charp error_message)
 {
-	cellPngDec.error("pngDecError: %s", error_message);
+	cellPngDec.error("%s", error_message);
 	// we can't return here or libpng blows up
 	fmt::throw_exception("Fatal Error in libpng: %s", error_message);
 }
 
 // Custom warning handler for libpng
-void pngDecWarning(png_structp /*png_ptr*/, png_const_charp error_message)
+void pngDecWarning(png_structp png_ptr, png_const_charp error_message)
 {
-	cellPngDec.warning("pngDecWarning: %s", error_message);
+	cellPngDec.warning("%s", error_message);
 }
 
 // Get the chunk information of the PNG file. IDAT is marked as existing, only after decoding or reading the header.
@@ -332,7 +337,7 @@ be_t<u32> pngDecGetChunkInformation(PngStream* stream, bool IDAT = false)
 	return chunk_information;
 }
 
-error_code pngDecCreate(ppu_thread& ppu, PPHandle png_handle, PThreadInParam thread_in_param, PThreadOutParam thread_out_param, PExtThreadInParam /*extra_thread_in_param*/ = vm::null, PExtThreadOutParam extra_thread_out_param = vm::null)
+error_code pngDecCreate(ppu_thread& ppu, PPHandle png_handle, PThreadInParam thread_in_param, PThreadOutParam thread_out_param, PExtThreadInParam extra_thread_in_param = vm::null, PExtThreadOutParam extra_thread_out_param = vm::null)
 {
 	// Check if partial image decoding is used
 	if (extra_thread_out_param)
@@ -903,103 +908,103 @@ error_code cellPngDecExtDecodeData(ppu_thread& ppu, PHandle handle, PStream stre
 
 error_code cellPngDecGetUnknownChunks(PHandle handle, PStream stream, vm::pptr<CellPngUnknownChunk> unknownChunk, vm::ptr<u32> unknownChunkNumber)
 {
-	cellPngDec.todo("cellPngDecGetUnknownChunks(handle=*0x%x, stream=*0x%x, unknownChunk=*0x%x, unknownChunkNumber=*0x%x)", handle, stream, unknownChunk, unknownChunkNumber);
+	cellPngDec.todo("cellPngDecGetUnknownChunks()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGetpCAL(PHandle handle, PStream stream, vm::ptr<CellPngPCAL> pcal)
 {
-	cellPngDec.todo("cellPngDecGetpCAL(handle=*0x%x, stream=*0x%x, pcal=*0x%x)", handle, stream, pcal);
+	cellPngDec.todo("cellPngDecGetpCAL()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGetcHRM(PHandle handle, PStream stream, vm::ptr<CellPngCHRM> chrm)
 {
-	cellPngDec.todo("cellPngDecGetcHRM(handle=*0x%x, stream=*0x%x, chrm=*0x%x)", handle, stream, chrm);
+	cellPngDec.todo("cellPngDecGetcHRM()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGetsCAL(PHandle handle, PStream stream, vm::ptr<CellPngSCAL> scal)
 {
-	cellPngDec.todo("cellPngDecGetsCAL(handle=*0x%x, stream=*0x%x, scal=*0x%x)", handle, stream, scal);
+	cellPngDec.todo("cellPngDecGetsCAL()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGetpHYs(PHandle handle, PStream stream, vm::ptr<CellPngPHYS> phys)
 {
-	cellPngDec.todo("cellPngDecGetpHYs(handle=*0x%x, stream=*0x%x, phys=*0x%x)", handle, stream, phys);
+	cellPngDec.todo("cellPngDecGetpHYs()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGetoFFs(PHandle handle, PStream stream, vm::ptr<CellPngOFFS> offs)
 {
-	cellPngDec.todo("cellPngDecGetoFFs(handle=*0x%x, stream=*0x%x, offs=*0x%x)", handle, stream, offs);
+	cellPngDec.todo("cellPngDecGetoFFs()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGetsPLT(PHandle handle, PStream stream, vm::ptr<CellPngSPLT> splt)
 {
-	cellPngDec.todo("cellPngDecGetsPLT(handle=*0x%x, stream=*0x%x, splt=*0x%x)", handle, stream, splt);
+	cellPngDec.todo("cellPngDecGetsPLT()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGetbKGD(PHandle handle, PStream stream, vm::ptr<CellPngBKGD> bkgd)
 {
-	cellPngDec.todo("cellPngDecGetbKGD(handle=*0x%x, stream=*0x%x, bkgd=*0x%x)", handle, stream, bkgd);
+	cellPngDec.todo("cellPngDecGetbKGD()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGettIME(PHandle handle, PStream stream, vm::ptr<CellPngTIME> time)
 {
-	cellPngDec.todo("cellPngDecGettIME(handle=*0x%x, stream=*0x%x, time=*0x%x)", handle, stream, time);
+	cellPngDec.todo("cellPngDecGettIME()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGethIST(PHandle handle, PStream stream, vm::ptr<CellPngHIST> hist)
 {
-	cellPngDec.todo("cellPngDecGethIST(handle=*0x%x, stream=*0x%x, hist=*0x%x)", handle, stream, hist);
+	cellPngDec.todo("cellPngDecGethIST()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGettRNS(PHandle handle, PStream stream, vm::ptr<CellPngTRNS> trns)
 {
-	cellPngDec.todo("cellPngDecGettRNS(handle=*0x%x, stream=*0x%x, trns=*0x%x)", handle, stream, trns);
+	cellPngDec.todo("cellPngDecGettRNS()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGetsBIT(PHandle handle, PStream stream, vm::ptr<CellPngSBIT> sbit)
 {
-	cellPngDec.todo("cellPngDecGetsBIT(handle=*0x%x, stream=*0x%x, sbit=*0x%x)", handle, stream, sbit);
+	cellPngDec.todo("cellPngDecGetsBIT()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGetiCCP(PHandle handle, PStream stream, vm::ptr<CellPngICCP> iccp)
 {
-	cellPngDec.todo("cellPngDecGetiCCP(handle=*0x%x, stream=*0x%x, iccp=*0x%x)", handle, stream, iccp);
+	cellPngDec.todo("cellPngDecGetiCCP()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGetsRGB(PHandle handle, PStream stream, vm::ptr<CellPngSRGB> srgb)
 {
-	cellPngDec.todo("cellPngDecGetsRGB(handle=*0x%x, stream=*0x%x, srgb=*0x%x)", handle, stream, srgb);
+	cellPngDec.todo("cellPngDecGetsRGB()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGetgAMA(PHandle handle, PStream stream, vm::ptr<CellPngGAMA> gama)
 {
-	cellPngDec.todo("cellPngDecGetgAMA(handle=*0x%x, stream=*0x%x, gama=*0x%x)", handle, stream, gama);
+	cellPngDec.todo("cellPngDecGetgAMA()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGetPLTE(PHandle handle, PStream stream, vm::ptr<CellPngPLTE> plte)
 {
-	cellPngDec.todo("cellPngDecGetPLTE(handle=*0x%x, stream=*0x%x, plte=*0x%x)", handle, stream, plte);
+	cellPngDec.todo("cellPngDecGetPLTE()");
 	return CELL_OK;
 }
 
 error_code cellPngDecGetTextChunk(PHandle handle, PStream stream, vm::ptr<u32> textInfoNum, vm::pptr<CellPngTextInfo> textInfo)
 {
-	cellPngDec.todo("cellPngDecGetTextChunk(handle=*0x%x, stream=*0x%x, textInfoNum=*0x%x, textInfo=*0x%x)", handle, stream, textInfoNum, textInfo);
+	cellPngDec.todo("cellPngDecGetTextChunk()");
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp b/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp
index c6da0c4e95..40628668d1 100644
--- a/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/IdManager.h"
 #include "cellPngEnc.h"
 
 LOG_CHANNEL(cellPngEnc);
@@ -28,199 +27,57 @@ void fmt_class_string<CellPngEncError>::format(std::string& out, u64 arg)
 	});
 }
 
-struct png_encoder
-{
-	shared_mutex mutex;
-	CellPngEncConfig config{};
-	CellPngEncResource resource{};
-	CellPngEncResourceEx resourceEx{};
-};
-
-bool check_config(vm::cptr<CellPngEncConfig> config)
-{
-	if (!config ||
-		config->maxWidth == 0u || config->maxWidth > 1000000u ||
-		config->maxHeight == 0u || config->maxHeight > 1000000u ||
-		(config->maxBitDepth != 8u && config->maxBitDepth != 16u) ||
-		static_cast<s32>(config->addMemSize) < 0 ||
-		config->exParamNum != 0u)
-	{
-		return false;
-	}
-
-	return true;
-}
-
-u32 get_mem_size(vm::cptr<CellPngEncConfig> config)
-{
-	return config->addMemSize
-		+ (config->enableSpu ? 0x78200 : 0x47a00)
-		+ (config->maxBitDepth >> 1) * config->maxWidth * 7;
-}
-
-
 error_code cellPngEncQueryAttr(vm::cptr<CellPngEncConfig> config, vm::ptr<CellPngEncAttr> attr)
 {
 	cellPngEnc.todo("cellPngEncQueryAttr(config=*0x%x, attr=*0x%x)", config, attr);
-
-	if (!attr || !check_config(config))
-	{
-		return CELL_PNGENC_ERROR_ARG;
-	}
-
-	const u32 memsize = get_mem_size(config);
-	attr->memSize = memsize + 0x1780;
-	attr->cmdQueueDepth = 4;
-	attr->versionLower = 0;
-	attr->versionUpper = 0x270000;
-
 	return CELL_OK;
 }
 
-error_code cellPngEncOpen(vm::cptr<CellPngEncConfig> config, vm::cptr<CellPngEncResource> resource, vm::ptr<u32> handle)
+error_code cellPngEncOpen(vm::cptr<CellPngEncConfig> config, vm::cptr<CellPngEncResource> resource, vm::pptr<void> handle)
 {
-	cellPngEnc.todo("cellPngEncOpen(config=*0x%x, resource=*0x%x, handle=0x%x)", config, resource, handle);
-
-	if (!handle || !check_config(config) ||
-		!resource || !resource->memAddr || !resource->memSize ||
-		resource->ppuThreadPriority < 0 || resource->ppuThreadPriority > 0xbff ||
-		resource->spuThreadPriority < 0 || resource->ppuThreadPriority > 0xff)
-	{
-		return CELL_PNGENC_ERROR_ARG;
-	}
-
-	const u32 required_memsize = get_mem_size(config);
-
-	if (resource->memSize < required_memsize + 0x1780U)
-	{
-		return CELL_PNGENC_ERROR_ARG;
-	}
-
-	auto& encoder = g_fxo->get<png_encoder>();
-	{
-		std::lock_guard lock(encoder.mutex);
-		encoder.config = *config;
-		encoder.resource = *resource;
-	}
-
+	cellPngEnc.todo("cellPngEncOpen(config=*0x%x, resource=*0x%x, handle=*0x%x)", config, resource, handle);
 	return CELL_OK;
 }
 
-error_code cellPngEncOpenEx(vm::cptr<CellPngEncConfig> config, vm::cptr<CellPngEncResourceEx> resource, vm::ptr<u32> handle)
+error_code cellPngEncOpenEx(vm::cptr<CellPngEncConfig> config, vm::cptr<CellPngEncResourceEx> resourceEx, vm::pptr<void> handle)
 {
-	cellPngEnc.todo("cellPngEncOpenEx(config=*0x%x, resourceEx=*0x%x, handle=0x%x)", config, resource, handle);
-
-	if (!handle || !check_config(config) ||
-		!resource || !resource->memAddr || !resource->memSize ||
-		resource->ppuThreadPriority < 0 || resource->ppuThreadPriority > 0xbff ||
-		resource->priority[0] > 15 || resource->priority[1] > 15 ||
-		resource->priority[2] > 15 || resource->priority[3] > 15 ||
-		resource->priority[4] > 15 || resource->priority[5] > 15 ||
-		resource->priority[6] > 15 || resource->priority[7] > 15)
-	{
-		return CELL_PNGENC_ERROR_ARG;
-	}
-
-	const u32 required_memsize = get_mem_size(config);
-
-	if (resource->memSize < required_memsize + 0x1780U)
-	{
-		return CELL_PNGENC_ERROR_ARG;
-	}
-
-	auto& encoder = g_fxo->get<png_encoder>();
-	{
-		std::lock_guard lock(encoder.mutex);
-		encoder.config = *config;
-		encoder.resourceEx = *resource;
-	}
-
+	cellPngEnc.todo("cellPngEncOpenEx(config=*0x%x, resourceEx=*0x%x, handle=*0x%x)", config, resourceEx, handle);
 	return CELL_OK;
 }
 
-error_code cellPngEncClose(u32 handle)
+error_code cellPngEncClose(vm::ptr<void> handle)
 {
-	cellPngEnc.todo("cellPngEncClose(handle=0x%x)", handle);
-
-	if (!handle)
-	{
-		return CELL_PNGENC_ERROR_ARG;
-	}
-
+	cellPngEnc.todo("cellPngEncClose(handle=*0x%x)", handle);
 	return CELL_OK;
 }
 
-error_code cellPngEncWaitForInput(u32 handle, b8 block)
+error_code cellPngEncWaitForInput(vm::ptr<void> handle, b8 block)
 {
-	cellPngEnc.todo("cellPngEncWaitForInput(handle=0x%x, block=%d)", handle, block);
-
-	if (!handle)
-	{
-		return CELL_PNGENC_ERROR_ARG;
-	}
-
+	cellPngEnc.todo("cellPngEncWaitForInput(handle=*0x%x, block=%d)", handle, block);
 	return CELL_OK;
 }
 
-error_code cellPngEncEncodePicture(u32 handle, vm::cptr<CellPngEncPicture> picture, vm::cptr<CellPngEncEncodeParam> encodeParam, vm::cptr<CellPngEncOutputParam> outputParam)
+error_code cellPngEncEncodePicture(vm::ptr<void> handle, vm::cptr<CellPngEncPicture> picture, vm::cptr<CellPngEncEncodeParam> encodeParam, vm::cptr<CellPngEncOutputParam> outputParam)
 {
-	cellPngEnc.todo("cellPngEncEncodePicture(handle=0x%x, picture=*0x%x, encodeParam=*0x%x, outputParam=*0x%x)", handle, picture, encodeParam, outputParam);
-
-	if (!handle || !picture || !picture->width || !picture->height ||
-		(picture->packedPixel && picture->bitDepth >= 8) ||
-		!picture->pictureAddr || picture->colorSpace > CELL_PNGENC_COLOR_SPACE_ARGB)
-	{
-		return CELL_PNGENC_ERROR_ARG;
-	}
-
-	auto& encoder = g_fxo->get<png_encoder>();
-	{
-		std::lock_guard lock(encoder.mutex);
-
-		if (picture->width > encoder.config.maxWidth ||
-			picture->height > encoder.config.maxHeight ||
-			picture->bitDepth > encoder.config.maxBitDepth)
-		{
-			return CELL_PNGENC_ERROR_ARG;
-		}
-	}
-
+	cellPngEnc.todo("cellPngEncEncodePicture(handle=*0x%x, picture=*0x%x, encodeParam=*0x%x, outputParam=*0x%x)", handle, picture, encodeParam, outputParam);
 	return CELL_OK;
 }
 
-error_code cellPngEncWaitForOutput(u32 handle, vm::ptr<u32> streamInfoNum, b8 block)
+error_code cellPngEncWaitForOutput(vm::ptr<void> handle, vm::ptr<u32> streamInfoNum, b8 block)
 {
-	cellPngEnc.todo("cellPngEncWaitForOutput(handle=0x%x, streamInfoNum=*0x%x, block=%d)", handle, streamInfoNum, block);
-
-	if (!handle || !streamInfoNum)
-	{
-		return CELL_PNGENC_ERROR_ARG;
-	}
-
+	cellPngEnc.todo("cellPngEncWaitForOutput(handle=*0x%x, streamInfoNum=*0x%x, block=%d)", handle, streamInfoNum, block);
 	return CELL_OK;
 }
 
-error_code cellPngEncGetStreamInfo(u32 handle, vm::ptr<CellPngEncStreamInfo> streamInfo)
+error_code cellPngEncGetStreamInfo(vm::ptr<void> handle, vm::ptr<CellPngEncStreamInfo> streamInfo)
 {
-	cellPngEnc.todo("cellPngEncGetStreamInfo(handle=0x%x, streamInfo=*0x%x)", handle, streamInfo);
-
-	if (!handle || !streamInfo)
-	{
-		return CELL_PNGENC_ERROR_ARG;
-	}
-
+	cellPngEnc.todo("cellPngEncGetStreamInfo(handle=*0x%x, streamInfo=*0x%x)", handle, streamInfo);
 	return CELL_OK;
 }
 
-error_code cellPngEncReset(u32 handle)
+error_code cellPngEncReset(vm::ptr<void> handle)
 {
-	cellPngEnc.todo("cellPngEncReset(handle=0x%x)", handle);
-
-	if (!handle)
-	{
-		return CELL_PNGENC_ERROR_ARG;
-	}
-
+	cellPngEnc.todo("cellPngEncReset(handle=*0x%x)", handle);
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellPngEnc.h b/rpcs3/Emu/Cell/Modules/cellPngEnc.h
index 1ab0e87c86..81ab2885fe 100644
--- a/rpcs3/Emu/Cell/Modules/cellPngEnc.h
+++ b/rpcs3/Emu/Cell/Modules/cellPngEnc.h
@@ -78,34 +78,32 @@ enum CellPngEncLocation
 
 //typedef void *CellPngEncHandle;
 
-struct CellPngEncExParam // Size 8
+struct CellPngEncExParam
 {
 	be_t<s32> index;
 	vm::bptr<s32> value;
 };
 
-struct CellPngEncConfig // Size 28
+struct CellPngEncConfig
 {
 	be_t<u32> maxWidth;
 	be_t<u32> maxHeight;
 	be_t<u32> maxBitDepth;
 	b8 enableSpu;
-	u8 padding[3];
 	be_t<u32> addMemSize;
 	vm::bptr<CellPngEncExParam> exParamList;
 	be_t<u32> exParamNum;
 };
 
-struct CellPngEncAttr // Size 16
+struct CellPngEncAttr
 {
 	be_t<u32> memSize; // usz
 	u8 cmdQueueDepth;
-	u8 padding[3];
 	be_t<u32> versionUpper;
 	be_t<u32> versionLower;
 };
 
-struct CellPngEncResource // Size 16
+struct CellPngEncResource
 {
 	vm::bptr<void> memAddr;
 	be_t<u32> memSize; // usz
@@ -113,7 +111,7 @@ struct CellPngEncResource // Size 16
 	be_t<s32> spuThreadPriority;
 };
 
-struct CellPngEncResourceEx // Size 24
+struct CellPngEncResourceEx
 {
 	vm::bptr<void> memAddr;
 	be_t<u32> memSize; // usz
@@ -122,7 +120,7 @@ struct CellPngEncResourceEx // Size 24
 	u8 priority[8];
 };
 
-struct CellPngEncPicture // Size 40
+struct CellPngEncPicture
 {
 	be_t<u32> width;
 	be_t<u32> height;
@@ -130,21 +128,19 @@ struct CellPngEncPicture // Size 40
 	be_t<u32> colorSpace; // CellPngEncColorSpace
 	be_t<u32> bitDepth;
 	b8 packedPixel;
-	u8 padding[3]; // TODO: is this correct?
 	vm::bptr<void> pictureAddr;
 	be_t<u64> userData;
 };
 
-struct CellPngEncAncillaryChunk // Size 8
+struct CellPngEncAncillaryChunk
 {
 	be_t<u32> chunkType; // CellPngEncChunkType
 	vm::bptr<void> chunkData;
 };
 
-struct CellPngEncEncodeParam // Size 24
+struct CellPngEncEncodeParam
 {
 	b8 enableSpu;
-	u8 padding[3];
 	be_t<u32> encodeColorSpace; // CellPngEncColorSpace
 	be_t<u32> compressionLevel; // CellPngEncCompressionLevel
 	be_t<u32> filterType;
@@ -152,7 +148,7 @@ struct CellPngEncEncodeParam // Size 24
 	be_t<u32> ancillaryChunkNum;
 };
 
-struct CellPngEncOutputParam // Size 16
+struct CellPngEncOutputParam
 {
 	be_t<u32> location; // CellPngEncLocation
 	vm::bcptr<char> streamFileName;
@@ -160,7 +156,7 @@ struct CellPngEncOutputParam // Size 16
 	be_t<u32> limitSize; // usz
 };
 
-struct CellPngEncStreamInfo // Size 40
+struct CellPngEncStreamInfo
 {
 	be_t<s32> state;
 	be_t<u32> location; // CellPngEncLocation
@@ -170,5 +166,4 @@ struct CellPngEncStreamInfo // Size 40
 	be_t<u32> streamSize; // usz
 	be_t<u32> processedLine;
 	be_t<u64> userData;
-	// TODO: where are the missing 4 bytes?
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellRec.cpp b/rpcs3/Emu/Cell/Modules/cellRec.cpp
index 5d19388f2b..4701f621c3 100644
--- a/rpcs3/Emu/Cell/Modules/cellRec.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellRec.cpp
@@ -1,1306 +1,80 @@
 #include "stdafx.h"
-#include "Emu/Cell/lv2/sys_memory.h"
-#include "Emu/Cell/timers.hpp"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/IdManager.h"
-#include "Emu/system_config.h"
-#include "Emu/VFS.h"
-#include "Emu/Audio/AudioBackend.h"
-#include "cellRec.h"
 #include "cellSysutil.h"
-#include "util/media_utils.h"
-#include "util/video_provider.h"
-
-extern "C"
-{
-#include <libavutil/pixfmt.h>
-}
 
 LOG_CHANNEL(cellRec);
 
-extern atomic_t<recording_mode> g_recording_mode;
-
-template<>
-void fmt_class_string<CellRecError>::format(std::string& out, u64 arg)
+enum
 {
-	format_enum(out, arg, [](auto error)
-	{
-		switch (error)
-		{
-			STR_CASE(CELL_REC_ERROR_OUT_OF_MEMORY);
-			STR_CASE(CELL_REC_ERROR_FATAL);
-			STR_CASE(CELL_REC_ERROR_INVALID_VALUE);
-			STR_CASE(CELL_REC_ERROR_FILE_OPEN);
-			STR_CASE(CELL_REC_ERROR_FILE_WRITE);
-			STR_CASE(CELL_REC_ERROR_INVALID_STATE);
-			STR_CASE(CELL_REC_ERROR_FILE_NO_DATA);
-		}
-
-		return unknown;
-	});
-}
-
-// Helper to distinguish video type
-enum : s32
-{
-	VIDEO_TYPE_MPEG4  = 0x0000,
-	VIDEO_TYPE_AVC_MP = 0x1000,
-	VIDEO_TYPE_AVC_BL = 0x2000,
-	VIDEO_TYPE_MJPEG  = 0x3000,
-	VIDEO_TYPE_M4HD   = 0x4000,
+	CELL_REC_STATUS_UNLOAD = 0,
+	CELL_REC_STATUS_OPEN = 1,
+	CELL_REC_STATUS_START = 2,
+	CELL_REC_STATUS_STOP = 3,
+	CELL_REC_STATUS_CLOSE = 4,
+	CELL_REC_STATUS_ERR = 10
 };
 
-// Helper to distinguish video quality
-enum : s32
+struct CellRecSpursParam
 {
-	VIDEO_QUALITY_0 = 0x000, // small
-	VIDEO_QUALITY_1 = 0x100, // middle
-	VIDEO_QUALITY_2 = 0x200, // large
-	VIDEO_QUALITY_3 = 0x300, // youtube
-	VIDEO_QUALITY_4 = 0x400,
-	VIDEO_QUALITY_5 = 0x500,
-	VIDEO_QUALITY_6 = 0x600, // HD720
-	VIDEO_QUALITY_7 = 0x700,
+	vm::bptr<struct CellSpurs> pSpurs;
+	be_t<s32> spu_usage_rate;
+	u8 priority[8];
 };
 
-enum class rec_state : u32
+struct CellRecOption
 {
-	closed  = 0x2710,
-	stopped = 0x2711,
-	started = 0xBEEF, // I don't know the value of this
+	be_t<s32> option;
+	union
+	{
+		be_t<s32> ppu_thread_priority;
+		be_t<s32> spu_thread_priority;
+		be_t<s32> capture_priority;
+		be_t<s32> use_system_spu;
+		be_t<s32> fit_to_youtube;
+		be_t<s32> xmb_bgm;
+		be_t<s32> mpeg4_fast_encode;
+		be_t<u32> ring_sec;
+		be_t<s32> video_input;
+		be_t<s32> audio_input;
+		be_t<s32> audio_input_mix_vol;
+		be_t<s32> reduce_memsize;
+		be_t<s32> show_xmb;
+		vm::bptr<char> metadata_filename;
+		vm::bptr<CellRecSpursParam> pSpursParam;
+		be_t<u64> dummy;
+	} value;
 };
 
-struct rec_param
+struct CellRecParam
 {
-	s32 ppu_thread_priority = CELL_REC_PARAM_PPU_THREAD_PRIORITY_DEFAULT;
-	s32 spu_thread_priority = CELL_REC_PARAM_SPU_THREAD_PRIORITY_DEFAULT;
-	s32 capture_priority = CELL_REC_PARAM_CAPTURE_PRIORITY_HIGHEST;
-	s32 use_system_spu = CELL_REC_PARAM_USE_SYSTEM_SPU_DISABLE;
-	s32 fit_to_youtube = 0;
-	s32 xmb_bgm = CELL_REC_PARAM_XMB_BGM_DISABLE;
-	s32 mpeg4_fast_encode = CELL_REC_PARAM_MPEG4_FAST_ENCODE_DISABLE;
-	u32 ring_sec = 0;
-	s32 video_input = CELL_REC_PARAM_VIDEO_INPUT_DISABLE;
-	s32 audio_input = CELL_REC_PARAM_AUDIO_INPUT_DISABLE;
-	s32 audio_input_mix_vol = CELL_REC_PARAM_AUDIO_INPUT_MIX_VOL_MIN;
-	s32 reduce_memsize = CELL_REC_PARAM_REDUCE_MEMSIZE_DISABLE;
-	s32 show_xmb = 0;
-	std::string filename;
-	std::string metadata_filename;
-	CellRecSpursParam spurs_param{};
-	struct
-	{
-		std::string game_title;
-		std::string movie_title;
-		std::string description;
-		std::string userdata;
-
-		std::string to_string() const
-		{
-			return fmt::format("{ game_title='%s', movie_title='%s', description='%s', userdata='%s' }", game_title, movie_title, description, userdata);
-		}
-	} movie_metadata{};
-	struct
-	{
-		bool is_set = false;
-		u32 type = 0;
-		u64 start_time = 0;
-		u64 end_time = 0;
-		std::string title;
-		std::vector<std::string> tags;
-
-		std::string to_string() const
-		{
-			std::string scene_metadata_tags;
-			for (usz i = 0; i < tags.size(); i++)
-			{
-				if (i > 0) scene_metadata_tags += ", ";
-				fmt::append(scene_metadata_tags, "'%s'", tags[i]);
-			}
-			return fmt::format("{ is_set=%d, type=%d, start_time=%d, end_time=%d, title='%s', tags=[ %s ] }", is_set, type, start_time, end_time, title, scene_metadata_tags);
-		}
-	} scene_metadata{};
-
-	std::string to_string() const
-	{
-		std::string priority;
-		for (usz i = 0; i < 8; i++)
-		{
-			if (i > 0) priority += ", ";
-			fmt::append(priority, "%d", spurs_param.priority[i]);
-		}
-		return fmt::format("ppu_thread_priority=%d, spu_thread_priority=%d, capture_priority=%d, use_system_spu=%d, fit_to_youtube=%d, "
-			"xmb_bgm=%d, mpeg4_fast_encode=%d, ring_sec=%d, video_input=%d, audio_input=%d, audio_input_mix_vol=%d, reduce_memsize=%d, "
-			"show_xmb=%d, filename='%s', metadata_filename='%s', spurs_param={ pSpurs=*0x%x, spu_usage_rate=%d, priority=[ %s ], "
-			"movie_metadata=%s, scene_metadata=%s",
-			ppu_thread_priority, spu_thread_priority, capture_priority, use_system_spu, fit_to_youtube, xmb_bgm, mpeg4_fast_encode, ring_sec,
-			video_input, audio_input, audio_input_mix_vol, reduce_memsize, show_xmb, filename, metadata_filename, spurs_param.pSpurs, spurs_param.spu_usage_rate,
-			priority, movie_metadata.to_string(), scene_metadata.to_string());
-	}
-
-	bool use_external_audio() const
-	{
-		return audio_input != CELL_REC_PARAM_AUDIO_INPUT_DISABLE             // != DISABLE means that cellRec will add samples on its own
-			&& audio_input_mix_vol > CELL_REC_PARAM_AUDIO_INPUT_MIX_VOL_MIN; // We need to mix cellRec audio with internal audio
-	}
-
-	bool use_internal_audio() const
-	{
-		return audio_input == CELL_REC_PARAM_AUDIO_INPUT_DISABLE             // DISABLE means that cellRec won't add samples on its own
-		    || audio_input_mix_vol < CELL_REC_PARAM_AUDIO_INPUT_MIX_VOL_MAX; // We need to mix cellRec audio with internal audio
-	}
-
-	bool use_internal_video() const
-	{
-		return video_input == CELL_REC_PARAM_VIDEO_INPUT_DISABLE; // DISABLE means that cellRec won't add frames on its own
-	}
+	be_t<s32> videoFmt;
+	be_t<s32> audioFmt;
+	be_t<s32> numOfOpt;
+	vm::bptr<CellRecOption> pOpt;
 };
 
-static constexpr u32 rec_framerate = 30; // Always 30 fps
-static constexpr u32 rec_channels = 2; // Always 2 channels
-
-class rec_video_sink final : public utils::video_sink
-{
-public:
-	rec_video_sink() : utils::video_sink()
-	{
-		m_framerate = rec_framerate;
-	}
-
-	void set_sample_rate(u32 sample_rate)
-	{
-		m_sample_rate = sample_rate;
-	}
-
-	void stop(bool flush = true) override
-	{
-		cellRec.notice("Stopping video sink. flush=%d", flush);
-
-		std::scoped_lock lock(m_video_mtx, m_audio_mtx);
-		m_flush = flush;
-		m_paused = false;
-		m_frames_to_encode.clear();
-		m_samples_to_encode.clear();
-		has_error = false;
-	}
-
-	void pause(bool flush = true) override
-	{
-		cellRec.notice("Pausing video sink. flush=%d", flush);
-
-		std::scoped_lock lock(m_video_mtx, m_audio_mtx);
-		m_flush = flush;
-		m_paused = true;
-	}
-
-	void resume() override
-	{
-		cellRec.notice("Resuming video sink");
-
-		std::scoped_lock lock(m_video_mtx, m_audio_mtx);
-		m_flush = false;
-		m_paused = false;
-	}
-
-	encoder_frame get_frame()
-	{
-		std::lock_guard lock_video(m_video_mtx);
-
-		if (!m_frames_to_encode.empty())
-		{
-			encoder_frame frame = std::move(m_frames_to_encode.front());
-			m_frames_to_encode.pop_front();
-			return frame;
-		}
-
-		return {};
-	}
-
-	encoder_sample get_sample()
-	{
-		std::lock_guard lock(m_audio_mtx);
-
-		if (!m_samples_to_encode.empty())
-		{
-			encoder_sample block = std::move(m_samples_to_encode.front());
-			m_samples_to_encode.pop_front();
-			return block;
-		}
-
-		return {};
-	}
-};
+using CellRecCallback = void(s32 recStatus, s32 recError, vm::ptr<void> userdata);
 
 struct rec_info
 {
 	vm::ptr<CellRecCallback> cb{};
 	vm::ptr<void> cbUserData{};
-	atomic_t<rec_state> state = rec_state::closed;
-	rec_param param{};
-
-	// These buffers are used by the game to inject one frame into the recording.
-	// This apparently happens right before a frame is rendered to the screen.
-	// It is only possible to inject a frame if the game has the external input mode enabled.
-	vm::bptr<u8> video_input_buffer{}; // Used by the game to inject a frame right before it would render a frame to the screen.
-	vm::bptr<u8> audio_input_buffer{}; // Used by the game to inject audio: 2-channel interleaved (left-right) * 256 samples * sizeof(f32) at 48000 kHz
-
-	// Wrapper for our audio data
-	struct audio_block
-	{
-		// 2-channel interleaved (left-right), 256 samples, float
-		static constexpr usz block_size = rec_channels * CELL_REC_AUDIO_BLOCK_SAMPLES * sizeof(f32);
-		std::array<u8, block_size> block{};
-		s64 pts{};
-	};
-
-	std::vector<utils::video_sink::encoder_frame> video_ringbuffer;
-	std::vector<audio_block> audio_ringbuffer;
-	usz video_ring_pos = 0;
-	usz audio_ring_pos = 0;
-	usz video_ring_frame_count = 0;
-	usz audio_ring_block_count = 0;
-
-	usz next_video_ring_pos()
-	{
-		const usz pos = video_ring_pos;
-		video_ring_pos = (video_ring_pos + 1) % video_ringbuffer.size();
-		return pos;
-	}
-
-	usz next_audio_ring_pos()
-	{
-		const usz pos = audio_ring_pos;
-		audio_ring_pos = (audio_ring_pos + 1) % audio_ringbuffer.size();
-		return pos;
-	}
-
-	std::shared_ptr<rec_video_sink> sink;
-	std::shared_ptr<utils::video_encoder> encoder;
-	std::unique_ptr<named_thread<std::function<void()>>> video_provider_thread;
-	atomic_t<bool> paused = false;
-
-	// Video parameters
-	utils::video_encoder::frame_format output_format{};
-	utils::video_encoder::frame_format input_format{};
-	u32 video_bps = 512000;
-	s32 video_codec_id = 12; // AV_CODEC_ID_MPEG4
-	s32 max_b_frames = 2;
-	static constexpr u32 fps = rec_framerate; // Always 30 fps
-
-	// Audio parameters
-	u32 sample_rate = 48000;
-	u32 audio_bps = 64000;
-	s32 audio_codec_id = 86018; // AV_CODEC_ID_AAC
-	static constexpr u32 channels = rec_channels; // Always 2 channels
-
-	// Recording duration
-	atomic_t<u64> recording_time_start = 0;
-	atomic_t<u64> pause_time_start = 0;
-	atomic_t<u64> pause_time_total = 0;
-	atomic_t<u64> recording_time_total = 0;
 
 	shared_mutex mutex;
-
-	void set_video_params(s32 video_format);
-	void set_audio_params(s32 audio_format);
-
-	void start_video_provider();
-	void pause_video_provider();
-	void stop_video_provider(bool flush);
 };
 
-void rec_info::set_video_params(s32 video_format)
-{
-	const s32 video_type = video_format & 0xf000;
-	const s32 video_quality = video_format & 0xf00;
-
-	switch (video_format)
-	{
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_SMALL_512K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_MIDDLE_512K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_512K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_MP_SMALL_512K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_MP_MIDDLE_512K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_BL_SMALL_512K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_BL_MIDDLE_512K_30FPS:
-		video_bps = 512000;
-		break;
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_SMALL_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_MIDDLE_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_MP_SMALL_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_MP_MIDDLE_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_BL_SMALL_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_BL_MIDDLE_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_SMALL_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_MIDDLE_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_YOUTUBE:
-		video_bps = 768000;
-		break;
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_1024K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_MP_MIDDLE_1024K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_BL_MIDDLE_1024K_30FPS:
-		video_bps = 1024000;
-		break;
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_1536K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_MP_MIDDLE_1536K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_BL_MIDDLE_1536K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_LARGE_1536K_30FPS:
-		video_bps = 1536000;
-		break;
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_2048K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_LARGE_2048K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_HD720_2048K_30FPS:
-		video_bps = 2048000;
-		break;
-	case CELL_REC_PARAM_VIDEO_FMT_MJPEG_SMALL_5000K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MJPEG_MIDDLE_5000K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_HD720_5000K_30FPS:
-		video_bps = 5000000;
-		break;
-	case CELL_REC_PARAM_VIDEO_FMT_MJPEG_LARGE_11000K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MJPEG_HD720_11000K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_HD720_11000K_30FPS:
-		video_bps = 11000000;
-		break;
-	case CELL_REC_PARAM_VIDEO_FMT_MJPEG_HD720_20000K_30FPS:
-		video_bps = 20000000;
-		break;
-	case CELL_REC_PARAM_VIDEO_FMT_MJPEG_HD720_25000K_30FPS:
-		video_bps = 25000000;
-		break;
-	case 0x3791:
-	case 0x37a1:
-	case 0x3790:
-	case 0x37a0:
-	default:
-		// TODO: confirm bitrate
-		video_bps = 512000;
-		break;
-	}
-
-	max_b_frames = 2;
-
-	switch (video_type)
-	{
-	default:
-	case VIDEO_TYPE_MPEG4:
-		video_codec_id = 12; // AV_CODEC_ID_MPEG4
-		break;
-	case VIDEO_TYPE_AVC_MP:
-		video_codec_id = 27; // AV_CODEC_ID_H264
-		break;
-	case VIDEO_TYPE_AVC_BL:
-		video_codec_id = 27; // AV_CODEC_ID_H264
-		max_b_frames = 0; // Apparently baseline H264 does not support B-Frames
-		break;
-	case VIDEO_TYPE_MJPEG:
-		video_codec_id = 7; // AV_CODEC_ID_MJPEG
-		break;
-	case VIDEO_TYPE_M4HD:
-		// TODO: no idea if these are H264 or MPEG4
-		video_codec_id = 12; // AV_CODEC_ID_MPEG4
-		break;
-	}
-
-	const bool wide = g_cfg.video.aspect_ratio == video_aspect::_16_9;
-	bool hd = true;
-
-	switch(g_cfg.video.resolution)
-	{
-	case video_resolution::_1080p:
-	case video_resolution::_1080i:
-	case video_resolution::_720p:
-	case video_resolution::_1600x1080p:
-	case video_resolution::_1440x1080p:
-	case video_resolution::_1280x1080p:
-	case video_resolution::_960x1080p:
-		hd = true;
-		break;
-	case video_resolution::_480p:
-	case video_resolution::_480i:
-	case video_resolution::_576p:
-	case video_resolution::_576i:
-		hd = false;
-		break;
-	}
-
-	switch (video_quality)
-	{
-	case VIDEO_QUALITY_0: // small
-		input_format.width = wide ? 368 : 320;
-		input_format.height = wide ? 208 : 240;
-		break;
-	case VIDEO_QUALITY_1: // middle
-		input_format.width = wide ? 480 : 368;
-		input_format.height = 272;
-		break;
-	case VIDEO_QUALITY_2: // large
-		input_format.width = wide ? 640 : 480;
-		input_format.height = 368;
-		break;
-	case VIDEO_QUALITY_3: // youtube
-		input_format.width = 320;
-		input_format.height = 240;
-		break;
-	case VIDEO_QUALITY_4:
-	case VIDEO_QUALITY_5:
-		// TODO:
-		break;
-	case VIDEO_QUALITY_6: // HD720
-		input_format.width = hd ? 1280 : (wide ? 864 : 640);
-		input_format.height = hd ? 720 : 480;
-		break;
-	case VIDEO_QUALITY_7:
-	default:
-		// TODO:
-		input_format.width = 1280;
-		input_format.height = 720;
-		break;
-	}
-
-	output_format.av_pixel_format = AVPixelFormat::AV_PIX_FMT_YUV420P;
-	output_format.width = input_format.width;
-	output_format.height = input_format.height;
-	output_format.pitch = input_format.width * 4; // unused
-
-	switch (param.video_input)
-	{
-	case CELL_REC_PARAM_VIDEO_INPUT_ARGB_4_3:
-	case CELL_REC_PARAM_VIDEO_INPUT_ARGB_16_9:
-		input_format.av_pixel_format = AVPixelFormat::AV_PIX_FMT_ARGB;
-		input_format.pitch = input_format.width * 4;
-		break;
-	case CELL_REC_PARAM_VIDEO_INPUT_RGBA_4_3:
-	case CELL_REC_PARAM_VIDEO_INPUT_RGBA_16_9:
-		input_format.av_pixel_format = AVPixelFormat::AV_PIX_FMT_RGBA;
-		input_format.pitch = input_format.width * 4;
-		break;
-	case CELL_REC_PARAM_VIDEO_INPUT_YUV420PLANAR_16_9:
-		input_format.av_pixel_format = AVPixelFormat::AV_PIX_FMT_YUV420P;
-		input_format.pitch = input_format.width * 4; // TODO
-		break;
-	case CELL_REC_PARAM_VIDEO_INPUT_DISABLE:
-	default:
-		input_format.av_pixel_format = AVPixelFormat::AV_PIX_FMT_RGBA;
-		input_format.width = 1280;
-		input_format.height = 720;
-		input_format.pitch = input_format.width * 4; // unused
-		break;
-	}
-
-	cellRec.notice("set_video_params: video_format=0x%x, video_type=0x%x, video_quality=0x%x, video_bps=%d, video_codec_id=%d, wide=%d, hd=%d, input_format=%s, output_format=%s", video_format, video_type, video_quality, video_bps, video_codec_id, wide, hd, input_format.to_string(), output_format.to_string());
-}
-
-void rec_info::set_audio_params(s32 audio_format)
-{
-	// Get the codec
-	switch (audio_format)
-	{
-	case CELL_REC_PARAM_AUDIO_FMT_AAC_96K:
-	case CELL_REC_PARAM_AUDIO_FMT_AAC_128K:
-	case CELL_REC_PARAM_AUDIO_FMT_AAC_64K:
-		audio_codec_id = 86018; // AV_CODEC_ID_AAC
-		break;
-	case CELL_REC_PARAM_AUDIO_FMT_ULAW_384K:
-	case CELL_REC_PARAM_AUDIO_FMT_ULAW_768K:
-		// TODO: no idea what this is
-		audio_codec_id = 65542; // AV_CODEC_ID_PCM_MULAW
-		break;
-	case CELL_REC_PARAM_AUDIO_FMT_PCM_384K:
-	case CELL_REC_PARAM_AUDIO_FMT_PCM_768K:
-	case CELL_REC_PARAM_AUDIO_FMT_PCM_1536K:
-		audio_codec_id = 65556; // AV_CODEC_ID_PCM_F32BE
-		//audio_codec_id = 65557; // AV_CODEC_ID_PCM_F32LE // TODO: maybe this one?
-		break;
-	default:
-		audio_codec_id = 86018; // AV_CODEC_ID_AAC
-		break;
-	}
-
-	// Get the sampling rate
-	switch (audio_format)
-	{
-	case CELL_REC_PARAM_AUDIO_FMT_AAC_96K:
-	case CELL_REC_PARAM_AUDIO_FMT_AAC_128K:
-	case CELL_REC_PARAM_AUDIO_FMT_AAC_64K:
-	case CELL_REC_PARAM_AUDIO_FMT_PCM_1536K:
-		sample_rate = 48000;
-		break;
-	case CELL_REC_PARAM_AUDIO_FMT_ULAW_384K:
-	case CELL_REC_PARAM_AUDIO_FMT_ULAW_768K:
-		// TODO: no idea what this is
-		sample_rate = 48000;
-		break;
-	case CELL_REC_PARAM_AUDIO_FMT_PCM_384K:
-		sample_rate = 12000;
-		break;
-	case CELL_REC_PARAM_AUDIO_FMT_PCM_768K:
-		sample_rate = 24000;
-		break;
-	default:
-		sample_rate = 48000;
-		break;
-	}
-
-	// Get the bitrate
-	switch (audio_format)
-	{
-	case CELL_REC_PARAM_AUDIO_FMT_AAC_64K:
-		audio_bps = 64000;
-		break;
-	case CELL_REC_PARAM_AUDIO_FMT_AAC_96K:
-		audio_bps = 96000;
-		break;
-	case CELL_REC_PARAM_AUDIO_FMT_AAC_128K:
-		audio_bps = 128000;
-		break;
-	case CELL_REC_PARAM_AUDIO_FMT_PCM_1536K:
-		audio_bps = 1536000;
-		break;
-	case CELL_REC_PARAM_AUDIO_FMT_ULAW_384K:
-	case CELL_REC_PARAM_AUDIO_FMT_PCM_384K:
-		audio_bps = 384000;
-		break;
-	case CELL_REC_PARAM_AUDIO_FMT_ULAW_768K:
-	case CELL_REC_PARAM_AUDIO_FMT_PCM_768K:
-		audio_bps = 768000;
-		break;
-	default:
-		audio_bps = 96000;
-		break;
-	}
-
-	cellRec.notice("set_audio_params: audio_format=0x%x, audio_codec_id=%d, sample_rate=%d, audio_bps=%d", audio_format, audio_codec_id, sample_rate, audio_bps);
-}
-
-void rec_info::start_video_provider()
-{
-	const bool was_paused = paused.exchange(false);
-
-	if (video_provider_thread && was_paused)
-	{
-		// Resume
-		const u64 pause_time_end = get_system_time();
-		ensure(pause_time_end > pause_time_start);
-		pause_time_total += (pause_time_end - pause_time_start);
-
-		if (param.use_internal_video() || param.use_internal_audio())
-		{
-			utils::video_provider& video_provider = g_fxo->get<utils::video_provider>();
-			video_provider.set_pause_time_us(pause_time_total);
-		}
-
-		cellRec.notice("Resuming video provider.");
-		return;
-	}
-
-	cellRec.notice("Starting video provider.");
-
-	recording_time_start = get_system_time();
-	pause_time_start = 0;
-	pause_time_total = 0;
-
-	if (param.use_internal_video() || param.use_internal_audio())
-	{
-		utils::video_provider& video_provider = g_fxo->get<utils::video_provider>();
-		video_provider.set_pause_time_us(0);
-	}
-
-	video_provider_thread = std::make_unique<named_thread<std::function<void()>>>("cellRec video provider", [this]()
-	{
-		const bool use_internal_audio = param.use_internal_audio();
-		const bool use_external_audio = param.use_external_audio();
-		const bool use_external_video = !param.use_internal_video();
-		const bool use_ring_buffer = param.ring_sec > 0;
-		const usz frame_size = input_format.pitch * input_format.height;
-		audio_block buffer_external{}; // for cellRec input
-		audio_block buffer_internal{}; // for cellAudio input
-		s64 last_video_pts = -1;
-		s64 last_audio_pts = -1;
-
-		cellRec.notice("video_provider_thread: use_ring_buffer=%d, video_ringbuffer_size=%d, audio_ringbuffer_size=%d, ring_sec=%d, frame_size=%d, use_internal_video=%d, use_external_audio=%d, use_internal_audio=%d", use_ring_buffer, video_ringbuffer.size(), audio_ringbuffer.size(), param.ring_sec, frame_size, encoder->use_internal_video, use_external_audio, encoder->use_internal_audio);
-
-		while (thread_ctrl::state() != thread_state::aborting && encoder)
-		{
-			if (encoder->has_error)
-			{
-				cellRec.error("Encoder error. Sending error status.");
-
-				sysutil_register_cb([this](ppu_thread& ppu) -> s32
-				{
-					if (cb)
-					{
-						cb(ppu, CELL_REC_STATUS_ERR, CELL_REC_ERROR_FILE_WRITE, cbUserData);
-					}
-					return CELL_OK;
-				});
-
-				return;
-			}
-
-			if (paused)
-			{
-				thread_ctrl::wait_for(10000);
-				continue;
-			}
-
-			// We only care for new video frames or audio samples that can be properly encoded, so we check the timestamps and pts.
-			const usz timestamp_ms = (get_system_time() - recording_time_start - pause_time_total) / 1000;
-
-			/////////////////
-			//    VIDEO    //
-			/////////////////
-
-			// TODO: wait for flip before adding a frame
-			if (use_external_video)
-			{
-				// The video frames originate from cellRec instead of our render pipeline.
-				if (const s64 pts = encoder->get_pts(timestamp_ms); pts > last_video_pts)
-				{
-					if (video_input_buffer)
-					{
-						if (use_ring_buffer)
-						{
-							// The video frames originate from cellRec and are stored in a ringbuffer.
-							utils::video_sink::encoder_frame& frame_data = video_ringbuffer[next_video_ring_pos()];
-							frame_data.pts = pts;
-							frame_data.width = input_format.width;
-							frame_data.height = input_format.height;
-							frame_data.av_pixel_format = input_format.av_pixel_format;
-							frame_data.data.resize(frame_size);
-							std::memcpy(frame_data.data.data(), video_input_buffer.get_ptr(), frame_data.data.size());
-							video_ring_frame_count++;
-						}
-						else
-						{
-							// The video frames originate from cellRec and are pushed to the encoder immediately.
-							std::vector<u8> frame(frame_size);
-							std::memcpy(frame.data(), video_input_buffer.get_ptr(), frame.size());
-							encoder->add_frame(frame, input_format.pitch, input_format.width, input_format.height, input_format.av_pixel_format, timestamp_ms);
-						}
-					}
-
-					last_video_pts = pts;
-				}
-			}
-			else if (sink)
-			{
-				// The video frames originate from our render pipeline.
-				utils::video_sink::encoder_frame frame = sink->get_frame();
-
-				if (const s64 pts = encoder->get_pts(frame.timestamp_ms); pts > last_video_pts && !frame.data.empty())
-				{
-					if (use_ring_buffer)
-					{
-						// The video frames originate from our render pipeline and are stored in a ringbuffer.
-						frame.pts = pts;
-						video_ringbuffer[next_video_ring_pos()] = std::move(frame);
-						video_ring_frame_count++;
-					}
-					else
-					{
-						// The video frames originate from our render pipeline and are directly encoded by the encoder.
-						encoder->add_frame(frame.data, frame.pitch, frame.width, frame.height, frame.av_pixel_format, frame.timestamp_ms);
-					}
-
-					last_video_pts = pts;
-				}
-			}
-
-			/////////////////
-			//    AUDIO    //
-			/////////////////
-
-			const usz timestamp_us = get_system_time() - recording_time_start - pause_time_total;
-			bool got_new_samples = false;
-
-			if (use_external_audio)
-			{
-				if (const s64 pts = encoder->get_audio_pts(timestamp_us); pts > last_audio_pts)
-				{
-					if (audio_input_buffer)
-					{
-						// The audio samples originate from cellRec instead of our render pipeline.
-						// TODO: This needs to be synchronized with the game somehow if possible.
-						std::memcpy(buffer_external.block.data(), audio_input_buffer.get_ptr(), buffer_external.block.size());
-						buffer_external.pts = pts;
-						got_new_samples = true;
-					}
-
-					last_audio_pts = pts;
-				}
-			}
-
-			if (sink && use_internal_audio)
-			{
-				// The audio samples originate from cellAudio and are stored in a ringbuffer.
-				utils::video_sink::encoder_sample sample = sink->get_sample();
-
-				if (!sample.data.empty() && sample.channels >= channels && sample.sample_count >= CELL_REC_AUDIO_BLOCK_SAMPLES)
-				{
-					s64 pts = encoder->get_audio_pts(sample.timestamp_us);
-
-					// Each encoder_sample can have more than one block
-					for (u32 i = 0; i < sample.sample_count; i += CELL_REC_AUDIO_BLOCK_SAMPLES)
-					{
-						if (pts > last_audio_pts)
-						{
-							const f32* src = reinterpret_cast<const f32*>(&sample.data[i * sample.channels * sizeof(f32)]);
-
-							// Copy the new samples to the internal buffer if we need them for volume mixing below.
-							// Otherwise copy them directly to the external buffer which is used for output later.
-							audio_block& dst_buffer = got_new_samples ? buffer_internal : buffer_external;
-
-							if (sample.channels > channels)
-							{
-								// Downmix channels
-								AudioBackend::downmix(CELL_REC_AUDIO_BLOCK_SAMPLES * sample.channels, sample.channels, audio_channel_layout::stereo, src, reinterpret_cast<f32*>(dst_buffer.block.data()));
-							}
-							else
-							{
-								std::memcpy(dst_buffer.block.data(), src, audio_block::block_size);
-							}
-
-							// Mix external and internal audio with param.audio_input_mix_vol if we already got samples from cellRec.
-							if (got_new_samples)
-							{
-								const float volume = std::clamp(param.audio_input_mix_vol / 100.0f, 0.0f, 1.0f);
-								const f32* src = reinterpret_cast<const f32*>(buffer_internal.block.data());
-								f32* dst = reinterpret_cast<f32*>(buffer_external.block.data());
-
-								for (u32 sample = 0; sample < (CELL_REC_AUDIO_BLOCK_SAMPLES * channels); sample++)
-								{
-									*dst = std::clamp(*dst + (*src++ * volume), -1.0f, 1.0f);
-									++dst;
-								}
-							}
-
-							last_audio_pts = std::max(pts, last_audio_pts); // The cellAudio pts may be older than the pts from cellRec
-							buffer_external.pts = last_audio_pts;
-							got_new_samples = true;
-						}
-
-						// We only take the first sample for simplicity for now
-						break;
-
-						// Increase pts for each sample block
-						//pts++;
-					}
-				}
-			}
-
-			if (got_new_samples)
-			{
-				if (use_ring_buffer)
-				{
-					// Copy new sample to ringbuffer
-					audio_ringbuffer[next_audio_ring_pos()] = buffer_external;
-					audio_ring_block_count++;
-				}
-				else
-				{
-					// Push new sample to encoder
-					encoder->add_audio_samples(buffer_external.block.data(), CELL_REC_AUDIO_BLOCK_SAMPLES, channels, timestamp_us);
-				}
-			}
-
-			// Update recording time
-			recording_time_total = encoder->get_timestamp_ms(encoder->last_video_pts());
-
-			thread_ctrl::wait_for(1);
-		}
-	});
-}
-
-void rec_info::pause_video_provider()
-{
-	cellRec.notice("Pausing video provider.");
-
-	if (video_provider_thread)
-	{
-		paused = true;
-		pause_time_start = get_system_time();
-	}
-}
-
-void rec_info::stop_video_provider(bool flush)
-{
-	cellRec.notice("Stopping video provider.");
-
-	// Join thread
-	video_provider_thread.reset();
-
-	// Flush the ringbuffer if necessary.
-	// This should only happen if the video sink is not the encoder itself.
-	// In this case the encoder should have been idle until now.
-	if (flush && param.ring_sec > 0 && (!video_ringbuffer.empty() || !audio_ringbuffer.empty()))
-	{
-		cellRec.notice("Flushing video ringbuffer.");
-
-		// Fill encoder with data from ringbuffer
-		// TODO: ideally the encoder should do this on the fly and overwrite old frames in the file.
-		ensure(encoder);
-		encoder->encode();
-
-		const usz frame_count = std::min(video_ringbuffer.size(), video_ring_frame_count);
-		const usz video_start_offset = video_ring_frame_count < video_ringbuffer.size() ? 0 : video_ring_frame_count;
-		const s64 video_start_pts = video_ringbuffer.empty() ? 0 : video_ringbuffer[video_start_offset % video_ringbuffer.size()].pts;
-
-		const usz block_count = std::min(audio_ringbuffer.size(), audio_ring_block_count);
-		const usz audio_start_offset = audio_ring_block_count < audio_ringbuffer.size() ? 0 : audio_ring_block_count;
-		const s64 audio_start_pts = audio_ringbuffer.empty() ? 0 : audio_ringbuffer[audio_start_offset % audio_ringbuffer.size()].pts;
-
-		// Try to add the frames and samples in proper order
-		for (usz sync_timestamp_us = 0, frame = 0, block = 0; frame < frame_count || block < block_count; frame++)
-		{
-			// Add one frame
-			if (frame < frame_count)
-			{
-				const usz pos = (video_start_offset + frame) % video_ringbuffer.size();
-				utils::video_sink::encoder_frame& frame_data = video_ringbuffer[pos];
-				const usz timestamp_ms = encoder->get_timestamp_ms(frame_data.pts - video_start_pts);
-				encoder->add_frame(frame_data.data, frame_data.pitch, frame_data.width, frame_data.height, frame_data.av_pixel_format, timestamp_ms);
-
-				// Increase sync timestamp
-				sync_timestamp_us = timestamp_ms * 1000;
-			}
-
-			// Add all the samples that fit into the last frame
-			for (usz i = block; i < block_count; i++)
-			{
-				const usz pos = (audio_start_offset + i) % audio_ringbuffer.size();
-				const audio_block& sample_block = audio_ringbuffer[pos];
-				const usz timestamp_us = encoder->get_audio_timestamp_us(sample_block.pts - audio_start_pts);
-
-				// Stop adding new samples if the sync timestamp is exceeded, unless we already added all the frames.
-				if (timestamp_us > sync_timestamp_us && frame < frame_count)
-				{
-					break;
-				}
-
-				encoder->add_audio_samples(sample_block.block.data(), CELL_REC_AUDIO_BLOCK_SAMPLES, channels, timestamp_us);
-				block++;
-			}
-		}
-
-		video_ringbuffer.clear();
-		audio_ringbuffer.clear();
-	}
-}
-
-bool create_path(std::string& out, std::string dir_name, const std::string& file_name)
-{
-	out.clear();
-
-	if (dir_name.size() + file_name.size() > CELL_REC_MAX_PATH_LEN)
-	{
-		return false;
-	}
-
-	out = std::move(dir_name);
-
-	if (!out.empty() && out.back() != '/')
-	{
-		out += '/';
-	}
-
-	out += file_name;
-
-	return true;
-}
-
-u32 cellRecQueryMemSize(vm::cptr<CellRecParam> pParam); // Forward declaration
-
 error_code cellRecOpen(vm::cptr<char> pDirName, vm::cptr<char> pFileName, vm::cptr<CellRecParam> pParam, u32 container, vm::ptr<CellRecCallback> cb, vm::ptr<void> cbUserData)
 {
 	cellRec.todo("cellRecOpen(pDirName=%s, pFileName=%s, pParam=*0x%x, container=0x%x, cb=*0x%x, cbUserData=*0x%x)", pDirName, pFileName, pParam, container, cb, cbUserData);
 
 	auto& rec = g_fxo->get<rec_info>();
-
-	if (rec.state != rec_state::closed)
-	{
-		return CELL_REC_ERROR_INVALID_STATE;
-	}
-
-	if (!pParam || !pDirName || !pFileName)
-	{
-		return CELL_REC_ERROR_INVALID_VALUE;
-	}
-
-	std::string options;
-
-	for (s32 i = 0; i < pParam->numOfOpt; i++)
-	{
-		if (i > 0) options += ", ";
-		fmt::append(options, "%d", pParam->pOpt[i].option);
-	}
-
-	cellRec.notice("cellRecOpen: pParam={ videoFmt=0x%x, audioFmt=0x%x, numOfOpt=0x%x, options=[ %s ] }", pParam->videoFmt, pParam->audioFmt, pParam->numOfOpt, options);
-
-	const u32 mem_size = cellRecQueryMemSize(pParam);
-
-	if (container == SYS_MEMORY_CONTAINER_ID_INVALID)
-	{
-		if (mem_size != 0)
-		{
-			return CELL_REC_ERROR_INVALID_VALUE;
-		}
-	}
-	else
-	{
-		// NOTE: Most likely tries to allocate a complete container. But we use g_fxo instead.
-		// TODO: how much data do we actually need ?
-		rec.video_input_buffer = vm::cast(vm::alloc(mem_size, vm::main));
-		rec.audio_input_buffer = vm::cast(vm::alloc(mem_size, vm::main));
-
-		if (!rec.video_input_buffer || !rec.audio_input_buffer)
-		{
-			return CELL_REC_ERROR_OUT_OF_MEMORY;
-		}
-	}
-
-	switch (pParam->videoFmt)
-	{
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_SMALL_512K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_SMALL_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_MIDDLE_512K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_MIDDLE_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_512K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_1024K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_1536K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_2048K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_MP_SMALL_512K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_MP_SMALL_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_MP_MIDDLE_512K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_MP_MIDDLE_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_MP_MIDDLE_1024K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_MP_MIDDLE_1536K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_BL_SMALL_512K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_BL_SMALL_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_BL_MIDDLE_512K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_BL_MIDDLE_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_BL_MIDDLE_1024K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_AVC_BL_MIDDLE_1536K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MJPEG_SMALL_5000K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MJPEG_MIDDLE_5000K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MJPEG_LARGE_11000K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MJPEG_HD720_11000K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MJPEG_HD720_20000K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_MJPEG_HD720_25000K_30FPS:
-	case 0x3791:
-	case 0x37a1:
-	case 0x3790:
-	case 0x37a0:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_SMALL_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_MIDDLE_768K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_LARGE_1536K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_LARGE_2048K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_HD720_2048K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_HD720_5000K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_M4HD_HD720_11000K_30FPS:
-	case CELL_REC_PARAM_VIDEO_FMT_YOUTUBE:
-		break;
-	default:
-		return CELL_REC_ERROR_INVALID_VALUE;
-	}
-
-	const s32 video_type = pParam->videoFmt & 0xf000;
-	const s32 video_quality = pParam->videoFmt & 0xf00;
-
-	switch (pParam->audioFmt)
-	{
-	case CELL_REC_PARAM_AUDIO_FMT_AAC_96K:
-	case CELL_REC_PARAM_AUDIO_FMT_AAC_128K:
-	case CELL_REC_PARAM_AUDIO_FMT_AAC_64K:
-	{
-		// Do not allow MJPEG or AVC_MP video format
-		if (video_type == VIDEO_TYPE_AVC_MP || video_type == VIDEO_TYPE_MJPEG)
-		{
-			return CELL_REC_ERROR_INVALID_VALUE;
-		}
-		[[fallthrough]];
-	}
-	case CELL_REC_PARAM_AUDIO_FMT_ULAW_384K:
-	case CELL_REC_PARAM_AUDIO_FMT_ULAW_768K:
-	{
-		// Do not allow AVC_MP video format
-		if (video_type == VIDEO_TYPE_AVC_MP)
-		{
-			return CELL_REC_ERROR_INVALID_VALUE;
-		}
-		break;
-	}
-	case CELL_REC_PARAM_AUDIO_FMT_PCM_384K:
-	case CELL_REC_PARAM_AUDIO_FMT_PCM_768K:
-	case CELL_REC_PARAM_AUDIO_FMT_PCM_1536K:
-	{
-		// Only allow MJPEG video format
-		if (video_type != VIDEO_TYPE_MJPEG)
-		{
-			return CELL_REC_ERROR_INVALID_VALUE;
-		}
-		break;
-	}
-	default:
-		return CELL_REC_ERROR_INVALID_VALUE;
-	}
-
-	rec.param = {};
-
-	u32 spurs_param = 0;
-	bool abort_loop = false;
-
-	for (s32 i = 0; i < pParam->numOfOpt; i++)
-	{
-		const CellRecOption& opt = pParam->pOpt[i];
-
-		switch (opt.option)
-		{
-		case CELL_REC_OPTION_PPU_THREAD_PRIORITY:
-		{
-			if (opt.value.ppu_thread_priority > 0xbff)
-			{
-				return CELL_REC_ERROR_INVALID_VALUE;
-			}
-			rec.param.ppu_thread_priority = opt.value.ppu_thread_priority;
-			break;
-		}
-		case CELL_REC_OPTION_SPU_THREAD_PRIORITY:
-		{
-			if (opt.value.spu_thread_priority - 0x10U > 0xef)
-			{
-				return CELL_REC_ERROR_INVALID_VALUE;
-			}
-			rec.param.spu_thread_priority = opt.value.spu_thread_priority;
-			break;
-		}
-		case CELL_REC_OPTION_CAPTURE_PRIORITY:
-		{
-			rec.param.capture_priority = opt.value.capture_priority;
-			break;
-		}
-		case CELL_REC_OPTION_USE_SYSTEM_SPU:
-		{
-			if (video_quality == VIDEO_QUALITY_6 || video_quality == VIDEO_QUALITY_7)
-			{
-				// TODO: Seems differ if video_quality is VIDEO_QUALITY_6 or VIDEO_QUALITY_7
-			}
-			rec.param.use_system_spu = opt.value.use_system_spu;
-			break;
-		}
-		case CELL_REC_OPTION_FIT_TO_YOUTUBE:
-		{
-			rec.param.fit_to_youtube = opt.value.fit_to_youtube;
-			break;
-		}
-		case CELL_REC_OPTION_XMB_BGM:
-		{
-			rec.param.xmb_bgm = opt.value.xmb_bgm;
-			break;
-		}
-		case CELL_REC_OPTION_RING_SEC:
-		{
-			rec.param.ring_sec = opt.value.ring_sec;
-			break;
-		}
-		case CELL_REC_OPTION_MPEG4_FAST_ENCODE:
-		{
-			rec.param.mpeg4_fast_encode = opt.value.mpeg4_fast_encode;
-			break;
-		}
-		case CELL_REC_OPTION_VIDEO_INPUT:
-		{
-			const u32 v_input = (opt.value.video_input & 0xffU);
-			if (v_input > CELL_REC_PARAM_VIDEO_INPUT_YUV420PLANAR_16_9)
-			{
-				return CELL_REC_ERROR_INVALID_VALUE;
-			}
-			rec.param.video_input = v_input;
-			break;
-		}
-		case CELL_REC_OPTION_AUDIO_INPUT:
-		{
-			rec.param.audio_input = opt.value.audio_input;
-
-			if (opt.value.audio_input == CELL_REC_PARAM_AUDIO_INPUT_DISABLE)
-			{
-				rec.param.audio_input_mix_vol = CELL_REC_PARAM_AUDIO_INPUT_MIX_VOL_MIN;
-			}
-			else
-			{
-				rec.param.audio_input_mix_vol = CELL_REC_PARAM_AUDIO_INPUT_MIX_VOL_MAX;
-			}
-			break;
-		}
-		case CELL_REC_OPTION_AUDIO_INPUT_MIX_VOL:
-		{
-			rec.param.audio_input_mix_vol = opt.value.audio_input_mix_vol;
-			break;
-		}
-		case CELL_REC_OPTION_REDUCE_MEMSIZE:
-		{
-			rec.param.reduce_memsize = opt.value.reduce_memsize != CELL_REC_PARAM_REDUCE_MEMSIZE_DISABLE;
-			break;
-		}
-		case CELL_REC_OPTION_SHOW_XMB:
-		{
-			rec.param.show_xmb = (opt.value.show_xmb != 0);
-			break;
-		}
-		case CELL_REC_OPTION_METADATA_FILENAME:
-		{
-			if (opt.value.metadata_filename)
-			{
-				std::string path;
-				if (!create_path(path, pDirName.get_ptr(), opt.value.metadata_filename.get_ptr()))
-				{
-					return CELL_REC_ERROR_INVALID_VALUE;
-				}
-				rec.param.metadata_filename = path;
-			}
-			else
-			{
-				abort_loop = true; // TODO: Apparently this doesn't return an error but goes to the callback section instead...
-			}
-			break;
-		}
-		case CELL_REC_OPTION_SPURS:
-		{
-			spurs_param = opt.value.pSpursParam.addr();
-
-			if (!opt.value.pSpursParam || !opt.value.pSpursParam->pSpurs) // TODO: check both or only pSpursParam ?
-			{
-				return CELL_REC_ERROR_INVALID_VALUE;
-			}
-
-			if (opt.value.pSpursParam->spu_usage_rate < 1 || opt.value.pSpursParam->spu_usage_rate > 100)
-			{
-				return CELL_REC_ERROR_INVALID_VALUE;
-			}
-
-			rec.param.spurs_param.spu_usage_rate = opt.value.pSpursParam->spu_usage_rate;
-			[[fallthrough]];
-		}
-		case 100:
-		{
-			if (spurs_param)
-			{
-				// TODO:
-			}
-			break;
-		}
-		default:
-		{
-			cellRec.warning("cellRecOpen: unknown option %d", opt.option);
-			break;
-		}
-		}
-
-		if (abort_loop)
-		{
-			break;
-		}
-	}
-
-	// NOTE: The abort_loop variable I chose is actually a goto to the callback section at the end of the function.
-	if (!abort_loop)
-	{
-		if (rec.param.video_input != CELL_REC_PARAM_VIDEO_INPUT_DISABLE)
-		{
-			if (video_type == VIDEO_TYPE_MJPEG || video_type == VIDEO_TYPE_M4HD)
-			{
-				if (rec.param.video_input != CELL_REC_PARAM_VIDEO_INPUT_YUV420PLANAR_16_9)
-				{
-					return CELL_REC_ERROR_INVALID_VALUE;
-				}
-			}
-			else if (rec.param.video_input == CELL_REC_PARAM_VIDEO_INPUT_YUV420PLANAR_16_9)
-			{
-				return CELL_REC_ERROR_INVALID_VALUE;
-			}
-		}
-
-		if (!create_path(rec.param.filename, pDirName.get_ptr(), pFileName.get_ptr()))
-		{
-			return CELL_REC_ERROR_INVALID_VALUE;
-		}
-
-		if (!rec.param.filename.starts_with("/dev_hdd0") && !rec.param.filename.starts_with("/dev_hdd1"))
-		{
-			return CELL_REC_ERROR_INVALID_VALUE;
-		}
-
-		//if (spurs_param)
-		//{
-		//	if (error_code error = cellSpurs_0xD9A9C592();
-		//	{
-		//		return error;
-		//	}
-		//}
-	}
-
-	if (!cb)
-	{
-		return CELL_REC_ERROR_INVALID_VALUE;
-	}
-
-	cellRec.notice("cellRecOpen: Using parameters: %s", rec.param.to_string());
-
 	rec.cb = cb;
 	rec.cbUserData = cbUserData;
-	rec.video_ringbuffer.clear();
-	rec.audio_ringbuffer.clear();
-	rec.video_ring_pos = 0;
-	rec.audio_ring_pos = 0;
-	rec.video_ring_frame_count = 0;
-	rec.audio_ring_block_count = 0;
-	rec.recording_time_start = 0;
-	rec.recording_time_total = 0;
-	rec.pause_time_start = 0;
-	rec.pause_time_total = 0;
-	rec.paused = false;
 
-	rec.set_video_params(pParam->videoFmt);
-	rec.set_audio_params(pParam->audioFmt);
-
-	if (rec.param.ring_sec > 0)
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
-		const usz audio_ring_buffer_size = static_cast<usz>(std::ceil((rec.param.ring_sec * rec.sample_rate) / static_cast<f32>(CELL_REC_AUDIO_BLOCK_SAMPLES)));
-		const usz video_ring_buffer_size = rec.param.ring_sec * rec.fps;
-
-		cellRec.notice("Preparing ringbuffer for %d seconds. video_ring_buffer_size=%d, audio_ring_buffer_size=%d, pitch=%d, width=%d, height=%d", rec.param.ring_sec, video_ring_buffer_size, audio_ring_buffer_size, rec.input_format.pitch, rec.input_format.width, rec.input_format.height);
-
-		rec.audio_ringbuffer.resize(audio_ring_buffer_size);
-		rec.video_ringbuffer.resize(video_ring_buffer_size);
-	}
-
-	if (rec.param.use_internal_audio() || rec.param.use_internal_video())
-	{
-		rec.sink = std::make_shared<rec_video_sink>();
-		rec.sink->use_internal_audio = rec.param.use_internal_audio();
-		rec.sink->use_internal_video = rec.param.use_internal_video();
-		rec.sink->set_sample_rate(rec.sample_rate);
-	}
-
-	rec.encoder = std::make_shared<utils::video_encoder>();
-	rec.encoder->use_internal_audio = false; // We use the other sink
-	rec.encoder->use_internal_video = false; // We use the other sink
-	rec.encoder->set_path(vfs::get(rec.param.filename));
-	rec.encoder->set_framerate(rec.fps);
-	rec.encoder->set_video_bitrate(rec.video_bps);
-	rec.encoder->set_video_codec(rec.video_codec_id);
-	rec.encoder->set_sample_rate(rec.sample_rate);
-	rec.encoder->set_audio_channels(rec.channels);
-	rec.encoder->set_audio_bitrate(rec.audio_bps);
-	rec.encoder->set_audio_codec(rec.audio_codec_id);
-	rec.encoder->set_output_format(rec.output_format);
-
-	sysutil_register_cb([&rec](ppu_thread& ppu) -> s32
-	{
-		rec.state = rec_state::stopped;
-		rec.cb(ppu, CELL_REC_STATUS_OPEN, CELL_OK, rec.cbUserData);
+		cb(ppu, CELL_REC_STATUS_OPEN, CELL_OK, cbUserData);
 		return CELL_OK;
 	});
 
@@ -1313,124 +87,28 @@ error_code cellRecClose(s32 isDiscard)
 
 	auto& rec = g_fxo->get<rec_info>();
 
-	if (rec.state == rec_state::closed)
-	{
-		return CELL_REC_ERROR_INVALID_STATE;
-	}
-
 	sysutil_register_cb([=, &rec](ppu_thread& ppu) -> s32
 	{
-		bool is_valid_range = true;
-
-		if (isDiscard)
-		{
-			// No need to flush the encoder
-			rec.stop_video_provider(false);
-			rec.encoder->stop(false);
-
-			if (rec.sink)
-			{
-				rec.sink->stop(true);
-			}
-
-			if (fs::is_file(rec.param.filename))
-			{
-				cellRec.warning("cellRecClose: removing discarded recording '%s'", rec.param.filename);
-
-				if (!fs::remove_file(rec.param.filename))
-				{
-					cellRec.error("cellRecClose: failed to remove recording '%s'", rec.param.filename);
-				}
-			}
-		}
-		else
-		{
-			// Flush to make sure we encode all remaining frames
-			rec.stop_video_provider(true);
-			rec.encoder->stop(true);
-			rec.recording_time_total = rec.encoder->get_timestamp_ms(rec.encoder->last_video_pts());
-
-			if (rec.sink)
-			{
-				rec.sink->stop(true);
-			}
-
-			const s64 start_pts = rec.encoder->get_pts(rec.param.scene_metadata.start_time);
-			const s64 end_pts = rec.encoder->get_pts(rec.param.scene_metadata.end_time);
-			const s64 last_pts = rec.encoder->last_video_pts();
-
-			is_valid_range = start_pts >= 0 && end_pts <= last_pts;
-		}
-
-		vm::dealloc(rec.video_input_buffer.addr(), vm::main);
-		vm::dealloc(rec.audio_input_buffer.addr(), vm::main);
-
-		// Release the video sink if it was used
-		if (rec.param.use_internal_video() || rec.param.use_internal_audio())
-		{
-			const recording_mode old_mode = g_recording_mode.exchange(recording_mode::stopped);
-
-			if (old_mode == recording_mode::rpcs3)
-			{
-				cellRec.error("cellRecClose: Unexpected recording mode %s found while stopping video capture.", old_mode);
-			}
-
-			utils::video_provider& video_provider = g_fxo->get<utils::video_provider>();
-
-			if (!video_provider.set_video_sink(nullptr, recording_mode::cell))
-			{
-				cellRec.error("cellRecClose failed to release video sink");
-			}
-		}
-
-		rec.param = {};
-		rec.encoder.reset();
-		rec.sink.reset();
-		rec.audio_ringbuffer.clear();
-		rec.video_ringbuffer.clear();
-		rec.state = rec_state::closed;
-
-		if (is_valid_range)
-		{
-			rec.cb(ppu, CELL_REC_STATUS_CLOSE, CELL_OK, rec.cbUserData);
-		}
-		else
-		{
-			rec.cb(ppu, CELL_REC_STATUS_ERR, CELL_REC_ERROR_FILE_NO_DATA, rec.cbUserData);
-		}
+		rec.cb(ppu, CELL_REC_STATUS_CLOSE, CELL_OK, rec.cbUserData);
 		return CELL_OK;
 	});
 
 	return CELL_OK;
 }
 
+void cellRecGetInfo(s32 info, vm::ptr<u64> pValue)
+{
+	cellRec.todo("cellRecGetInfo(info=0x%x, pValue=*0x%x)", info, pValue);
+}
+
 error_code cellRecStop()
 {
 	cellRec.todo("cellRecStop()");
 
 	auto& rec = g_fxo->get<rec_info>();
 
-	if (rec.state != rec_state::started)
+	sysutil_register_cb([=, &rec](ppu_thread& ppu) -> s32
 	{
-		return CELL_REC_ERROR_INVALID_STATE;
-	}
-
-	sysutil_register_cb([&rec](ppu_thread& ppu) -> s32
-	{
-		// cellRecStop actually just pauses the recording
-		rec.pause_video_provider();
-
-		if (rec.sink)
-		{
-			rec.sink->pause(true);
-		}
-
-		ensure(!!rec.encoder);
-		rec.encoder->pause(true);
-
-		rec.recording_time_total = rec.encoder->get_timestamp_ms(rec.encoder->last_video_pts());
-		rec.state = rec_state::stopped;
-
 		rec.cb(ppu, CELL_REC_STATUS_STOP, CELL_OK, rec.cbUserData);
 		return CELL_OK;
 	});
@@ -1444,58 +122,9 @@ error_code cellRecStart()
 
 	auto& rec = g_fxo->get<rec_info>();
 
-	if (rec.state != rec_state::stopped)
+	sysutil_register_cb([=, &rec](ppu_thread& ppu) -> s32
 	{
-		return CELL_REC_ERROR_INVALID_STATE;
-	}
-
-	sysutil_register_cb([&rec](ppu_thread& ppu) -> s32
-	{
-		// Start/resume the recording
-		ensure(!!rec.encoder);
-
-		if (rec.param.ring_sec == 0)
-		{
-			rec.encoder->encode();
-		}
-
-		// Setup a video sink if it is needed
-		if (rec.param.use_internal_video() || rec.param.use_internal_audio())
-		{
-			utils::video_provider& video_provider = g_fxo->get<utils::video_provider>();
-
-			if (rec.sink && !video_provider.set_video_sink(rec.sink, recording_mode::cell))
-			{
-				cellRec.error("Failed to set video sink");
-				rec.cb(ppu, CELL_REC_STATUS_ERR, CELL_REC_ERROR_FATAL, rec.cbUserData);
-				return CELL_OK;
-			}
-
-			// Force rsx recording
-			g_recording_mode = recording_mode::cell;
-		}
-		else
-		{
-			// Force stop rsx recording
-			g_recording_mode = recording_mode::stopped;
-		}
-
-		rec.start_video_provider();
-
-		if (rec.sink)
-		{
-			rec.sink->resume();
-		}
-
-		if (rec.encoder->has_error)
-		{
-			rec.cb(ppu, CELL_REC_STATUS_ERR, CELL_REC_ERROR_FILE_OPEN, rec.cbUserData);
-		}
-		else
-		{
-			rec.state = rec_state::started;
-			rec.cb(ppu, CELL_REC_STATUS_START, CELL_OK, rec.cbUserData);
-		}
+		rec.cb(ppu, CELL_REC_STATUS_START, CELL_OK, rec.cbUserData);
 		return CELL_OK;
 	});
 
@@ -1504,352 +133,13 @@ error_code cellRecStart()
 
 u32 cellRecQueryMemSize(vm::cptr<CellRecParam> pParam)
 {
-	cellRec.notice("cellRecQueryMemSize(pParam=*0x%x)", pParam);
-
-	if (!pParam)
-	{
-		return 0x900000;
-	}
-
-	u32 video_size = 0x600000; // 6 MB
-	u32 audio_size = 0x100000; // 1 MB
-	u32 external_input_size = 0;
-	u32 reduce_memsize = 0;
-
-	s32 video_type = pParam->videoFmt & 0xf000;
-	s32 video_quality = pParam->videoFmt & 0xf00;
-
-	switch (video_type)
-	{
-	case VIDEO_TYPE_MPEG4:
-	{
-		switch (video_quality)
-		{
-		case VIDEO_QUALITY_0:
-		case VIDEO_QUALITY_3:
-			video_size = 0x600000; // 6 MB
-			break;
-		case VIDEO_QUALITY_1:
-			video_size = 0x700000; // 7 MB
-			break;
-		case VIDEO_QUALITY_2:
-			video_size = 0x800000; // 8 MB
-			break;
-		default:
-			video_size = 0x900000; // 9 MB
-			break;
-		}
-
-		audio_size = 0x100000; // 1 MB
-		break;
-	}
-	case VIDEO_TYPE_AVC_BL:
-	case VIDEO_TYPE_AVC_MP:
-	{
-		switch (video_quality)
-		{
-		case VIDEO_QUALITY_0:
-		case VIDEO_QUALITY_3:
-			video_size = 0x800000; // 8 MB
-			break;
-		default:
-			video_size = 0x900000; // 9 MB
-			break;
-		}
-
-		audio_size = 0x100000; // 1 MB
-		break;
-	}
-	case VIDEO_TYPE_M4HD:
-	{
-		switch (video_quality)
-		{
-		case VIDEO_QUALITY_0:
-		case VIDEO_QUALITY_1:
-			video_size = 0x600000; // 6 MB
-			break;
-		case VIDEO_QUALITY_2:
-			video_size = 0x700000; // 7 MB
-			break;
-		default:
-			video_size = 0x1000000; // 16 MB
-			break;
-		}
-
-		audio_size = 0x100000; // 1 MB
-		break;
-	}
-	default:
-	{
-		switch (video_quality)
-		{
-		case VIDEO_QUALITY_0:
-			video_size = 0x300000; // 3 MB
-			break;
-		case VIDEO_QUALITY_1:
-		case VIDEO_QUALITY_2:
-			video_size = 0x400000; // 4 MB
-			break;
-		case VIDEO_QUALITY_6:
-			video_size = 0x700000; // 7 MB
-			break;
-		default:
-			video_size = 0xd00000; // 14 MB
-			break;
-		}
-
-		audio_size = 0; // 0 MB
-		break;
-	}
-	}
-
-	for (s32 i = 0; i < pParam->numOfOpt; i++)
-	{
-		const CellRecOption& opt = pParam->pOpt[i];
-
-		switch (opt.option)
-		{
-		case CELL_REC_OPTION_REDUCE_MEMSIZE:
-		{
-			if (opt.value.reduce_memsize == CELL_REC_PARAM_REDUCE_MEMSIZE_DISABLE)
-			{
-				reduce_memsize = 0; // 0 MB
-			}
-			else
-			{
-				if (video_type == VIDEO_TYPE_M4HD && (video_quality == VIDEO_QUALITY_1 || video_quality == VIDEO_QUALITY_2))
-				{
-					reduce_memsize = 0x200000; // 2 MB
-				}
-				else
-				{
-					reduce_memsize = 0x300000; // 3 MB
-				}
-			}
-			break;
-		}
-		case CELL_REC_OPTION_VIDEO_INPUT:
-		case CELL_REC_OPTION_AUDIO_INPUT:
-		{
-			if (opt.value.audio_input != CELL_REC_PARAM_AUDIO_INPUT_DISABLE)
-			{
-				if (video_type == VIDEO_TYPE_MJPEG || (video_type == VIDEO_TYPE_M4HD && video_quality != VIDEO_QUALITY_6))
-				{
-					external_input_size = 0x100000; // 1MB
-				}
-			}
-			break;
-		}
-		case CELL_REC_OPTION_AUDIO_INPUT_MIX_VOL:
-		{
-			// NOTE: Doesn't seem to check opt.value.audio_input
-			if (video_type == VIDEO_TYPE_MJPEG || (video_type == VIDEO_TYPE_M4HD && video_quality != VIDEO_QUALITY_6))
-			{
-				external_input_size = 0x100000; // 1MB
-			}
-			break;
-		}
-		default:
-			break;
-		}
-	}
-
-	u32 size = video_size + audio_size + external_input_size;
-
-	if (size > reduce_memsize)
-	{
-		size -= reduce_memsize;
-	}
-	else
-	{
-		size = 0;
-	}
-
-	return size;
-}
-
-void cellRecGetInfo(s32 info, vm::ptr<u64> pValue)
-{
-	cellRec.todo("cellRecGetInfo(info=0x%x, pValue=*0x%x)", info, pValue);
-
-	if (!pValue)
-	{
-		return;
-	}
-
-	*pValue = 0;
-
-	auto& rec = g_fxo->get<rec_info>();
-
-	switch (info)
-	{
-	case CELL_REC_INFO_VIDEO_INPUT_ADDR:
-	{
-		*pValue = rec.video_input_buffer.addr();
-		break;
-	}
-	case CELL_REC_INFO_VIDEO_INPUT_WIDTH:
-	{
-		*pValue = rec.input_format.width;
-		break;
-	}
-	case CELL_REC_INFO_VIDEO_INPUT_PITCH:
-	{
-		*pValue = rec.input_format.pitch;
-		break;
-	}
-	case CELL_REC_INFO_VIDEO_INPUT_HEIGHT:
-	{
-		*pValue = rec.input_format.height;
-		break;
-	}
-	case CELL_REC_INFO_AUDIO_INPUT_ADDR:
-	{
-		*pValue = rec.audio_input_buffer.addr();
-		break;
-	}
-	case CELL_REC_INFO_MOVIE_TIME_MSEC:
-	{
-		if (rec.state == rec_state::stopped)
-		{
-			*pValue = rec.recording_time_total;
-		}
-		break;
-	}
-	case CELL_REC_INFO_SPURS_SYSTEMWORKLOAD_ID:
-	{
-		if (rec.param.spurs_param.pSpurs)
-		{
-			// TODO
-			//cellSpurs_0xE279681F();
-		}
-		*pValue = 0xffffffff;
-		break;
-	}
-	default:
-	{
-		break;
-	}
-	}
+	cellRec.todo("cellRecQueryMemSize(pParam=*0x%x)", pParam);
+	return 1 * 1024 * 1024; // dummy memory size
 }
 
 error_code cellRecSetInfo(s32 setInfo, u64 value)
 {
 	cellRec.todo("cellRecSetInfo(setInfo=0x%x, value=0x%x)", setInfo, value);
-
-	auto& rec = g_fxo->get<rec_info>();
-
-	if (rec.state != rec_state::stopped)
-	{
-		return CELL_REC_ERROR_INVALID_STATE;
-	}
-
-	switch (setInfo)
-	{
-	case CELL_REC_SETINFO_MOVIE_START_TIME_MSEC:
-	{
-		// TODO: check if this is actually identical to scene metadata
-		rec.param.scene_metadata.start_time = value;
-		cellRec.notice("cellRecSetInfo: changed movie start time to %d", value);
-		break;
-	}
-	case CELL_REC_SETINFO_MOVIE_END_TIME_MSEC:
-	{
-		// TODO: check if this is actually identical to scene metadata
-		rec.param.scene_metadata.end_time = value;
-		cellRec.notice("cellRecSetInfo: changed movie end time to %d", value);
-		break;
-	}
-	case CELL_REC_SETINFO_MOVIE_META:
-	{
-		if (!value)
-		{
-			return CELL_REC_ERROR_INVALID_VALUE;
-		}
-
-		vm::ptr<CellRecMovieMetadata> movie_metadata = vm::cast(value);
-
-		if (!movie_metadata || !movie_metadata->gameTitle || !movie_metadata->movieTitle ||
-			strnlen(movie_metadata->gameTitle.get_ptr(), CELL_REC_MOVIE_META_GAME_TITLE_LEN) >= CELL_REC_MOVIE_META_GAME_TITLE_LEN ||
-			strnlen(movie_metadata->movieTitle.get_ptr(), CELL_REC_MOVIE_META_MOVIE_TITLE_LEN) >= CELL_REC_MOVIE_META_MOVIE_TITLE_LEN)
-		{
-			return CELL_REC_ERROR_INVALID_VALUE;
-		}
-
-		if ((movie_metadata->description && strnlen(movie_metadata->description.get_ptr(), CELL_REC_MOVIE_META_DESCRIPTION_LEN) >= CELL_REC_MOVIE_META_DESCRIPTION_LEN) ||
-			(movie_metadata->userdata && strnlen(movie_metadata->userdata.get_ptr(), CELL_REC_MOVIE_META_USERDATA_LEN) >= CELL_REC_MOVIE_META_USERDATA_LEN))
-		{
-			return CELL_REC_ERROR_INVALID_VALUE;
-		}
-
-		rec.param.movie_metadata = {};
-		rec.param.movie_metadata.game_title  = std::string{movie_metadata->gameTitle.get_ptr()};
-		rec.param.movie_metadata.movie_title = std::string{movie_metadata->movieTitle.get_ptr()};
-
-		if (movie_metadata->description)
-		{
-			rec.param.movie_metadata.description = std::string{movie_metadata->description.get_ptr()};
-		}
-
-		if (movie_metadata->userdata)
-		{
-			rec.param.movie_metadata.userdata = std::string{movie_metadata->userdata.get_ptr()};
-		}
-
-		cellRec.notice("cellRecSetInfo: changed movie metadata to %s", rec.param.movie_metadata.to_string());
-		break;
-	}
-	case CELL_REC_SETINFO_SCENE_META:
-	{
-		if (!value)
-		{
-			return CELL_REC_ERROR_INVALID_VALUE;
-		}
-
-		vm::ptr<CellRecSceneMetadata> scene_metadata = vm::cast(value);
-
-		if (!scene_metadata || !scene_metadata->title ||
-			scene_metadata->type > CELL_REC_SCENE_META_TYPE_CLIP_USER ||
-			scene_metadata->tagNum > CELL_REC_SCENE_META_TAG_NUM ||
-			strnlen(scene_metadata->title.get_ptr(), CELL_REC_SCENE_META_TITLE_LEN) >= CELL_REC_SCENE_META_TITLE_LEN)
-		{
-			return CELL_REC_ERROR_INVALID_VALUE;
-		}
-
-		for (u32 i = 0; i < scene_metadata->tagNum; i++)
-		{
-			if (!scene_metadata->tag[i] ||
-				strnlen(scene_metadata->tag[i].get_ptr(), CELL_REC_SCENE_META_TAG_LEN) >= CELL_REC_SCENE_META_TAG_LEN)
-			{
-				return CELL_REC_ERROR_INVALID_VALUE;
-			}
-		}
-
-		rec.param.scene_metadata = {};
-		rec.param.scene_metadata.is_set = true;
-		rec.param.scene_metadata.type = scene_metadata->type;
-		rec.param.scene_metadata.start_time = scene_metadata->startTime;
-		rec.param.scene_metadata.end_time = scene_metadata->endTime;
-		rec.param.scene_metadata.title = std::string{scene_metadata->title.get_ptr()};
-		rec.param.scene_metadata.tags.resize(scene_metadata->tagNum);
-
-		for (u32 i = 0; i < scene_metadata->tagNum; i++)
-		{
-			if (scene_metadata->tag[i])
-			{
-				rec.param.scene_metadata.tags[i] = std::string{scene_metadata->tag[i].get_ptr()};
-			}
-		}
-
-		cellRec.notice("cellRecSetInfo: changed scene metadata to %s", rec.param.scene_metadata.to_string());
-		break;
-	}
-	default:
-	{
-		return CELL_REC_ERROR_INVALID_VALUE;
-	}
-	}
-
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellRec.h b/rpcs3/Emu/Cell/Modules/cellRec.h
deleted file mode 100644
index 9e8820120b..0000000000
--- a/rpcs3/Emu/Cell/Modules/cellRec.h
+++ /dev/null
@@ -1,244 +0,0 @@
-#pragma once
-
-enum CellRecError : u32
-{
-	CELL_REC_ERROR_OUT_OF_MEMORY = 0x8002c501,
-	CELL_REC_ERROR_FATAL         = 0x8002c502,
-	CELL_REC_ERROR_INVALID_VALUE = 0x8002c503,
-	CELL_REC_ERROR_FILE_OPEN     = 0x8002c504,
-	CELL_REC_ERROR_FILE_WRITE    = 0x8002c505,
-	CELL_REC_ERROR_INVALID_STATE = 0x8002c506,
-	CELL_REC_ERROR_FILE_NO_DATA  = 0x8002c507
-};
-
-enum
-{
-	CELL_REC_STATUS_UNLOAD = 0,
-	CELL_REC_STATUS_OPEN   = 1,
-	CELL_REC_STATUS_START  = 2,
-	CELL_REC_STATUS_STOP   = 3,
-	CELL_REC_STATUS_CLOSE  = 4,
-	CELL_REC_STATUS_ERR    = 10
-};
-
-enum
-{
-	CELL_REC_MIN_MEMORY_CONTAINER_SIZE = 0,
-	CELL_REC_MAX_MEMORY_CONTAINER_SIZE = 16 * 1024 * 1024, // 9 * 1024 * 1024 if SDK < 0x300000
-
-	CELL_REC_MAX_PATH_LEN = 1023,
-};
-
-enum
-{
-	CELL_REC_PARAM_PPU_THREAD_PRIORITY_DEFAULT = 400,
-	CELL_REC_PARAM_SPU_THREAD_PRIORITY_DEFAULT = 60,
-
-	CELL_REC_PARAM_CAPTURE_PRIORITY_HIGHEST             = 0,
-	CELL_REC_PARAM_CAPTURE_PRIORITY_EXCEPT_NOTIFICATION = 1,
-	CELL_REC_PARAM_CAPTURE_PRIORITY_GAME_SCREEN         = 2,
-
-	CELL_REC_PARAM_USE_SYSTEM_SPU_DISABLE = 0,
-	CELL_REC_PARAM_USE_SYSTEM_SPU_ENABLE  = 1,
-
-	CELL_REC_PARAM_XMB_BGM_DISABLE = 0,
-	CELL_REC_PARAM_XMB_BGM_ENABLE  = 1,
-
-	CELL_REC_PARAM_MPEG4_FAST_ENCODE_DISABLE = 0,
-	CELL_REC_PARAM_MPEG4_FAST_ENCODE_ENABLE  = 1,
-
-	CELL_REC_PARAM_VIDEO_INPUT_DISABLE           = 0,
-	CELL_REC_PARAM_VIDEO_INPUT_ARGB_4_3          = 1,
-	CELL_REC_PARAM_VIDEO_INPUT_ARGB_16_9         = 2,
-	CELL_REC_PARAM_VIDEO_INPUT_RGBA_4_3          = 3,
-	CELL_REC_PARAM_VIDEO_INPUT_RGBA_16_9         = 4,
-	CELL_REC_PARAM_VIDEO_INPUT_YUV420PLANAR_16_9 = 5,
-
-	CELL_REC_PARAM_AUDIO_INPUT_DISABLE = 0,
-	CELL_REC_PARAM_AUDIO_INPUT_ENABLE  = 1,
-
-	CELL_REC_PARAM_AUDIO_INPUT_MIX_VOL_MIN = 0,
-	CELL_REC_PARAM_AUDIO_INPUT_MIX_VOL_MAX = 100,
-
-	CELL_REC_PARAM_REDUCE_MEMSIZE_DISABLE = 0,
-	CELL_REC_PARAM_REDUCE_MEMSIZE_ENABLE  = 1,
-
-	// SMALL  = 320x240 (4:3) or 368x208 (16:9)
-	// MIDDLE = 368x272 (4:3) or 480x272 (16:9)
-	// LARGE  = 480x368 (4:3) or 640x368 (16:9)
-	// HD720  = 1280x720 (16:9)
-
-	// PS3 playable format; all
-	// PSP playable format: MPEG4 + SMALL, AVC + SMALL, AVC + MIDDLE
-
-	CELL_REC_PARAM_VIDEO_FMT_MPEG4_SMALL_512K_30FPS  = 0x0000,
-	CELL_REC_PARAM_VIDEO_FMT_MPEG4_SMALL_768K_30FPS  = 0x0010,
-	CELL_REC_PARAM_VIDEO_FMT_MPEG4_MIDDLE_512K_30FPS = 0x0100,
-	CELL_REC_PARAM_VIDEO_FMT_MPEG4_MIDDLE_768K_30FPS = 0x0110,
-	CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_512K_30FPS  = 0x0200,
-	CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_768K_30FPS  = 0x0210,
-	CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_1024K_30FPS = 0x0220,
-	CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_1536K_30FPS = 0x0230,
-	CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_2048K_30FPS = 0x0240,
-
-	CELL_REC_PARAM_VIDEO_FMT_AVC_MP_SMALL_512K_30FPS   = 0x1000,
-	CELL_REC_PARAM_VIDEO_FMT_AVC_MP_SMALL_768K_30FPS   = 0x1010,
-	CELL_REC_PARAM_VIDEO_FMT_AVC_MP_MIDDLE_512K_30FPS  = 0x1100,
-	CELL_REC_PARAM_VIDEO_FMT_AVC_MP_MIDDLE_768K_30FPS  = 0x1110,
-	CELL_REC_PARAM_VIDEO_FMT_AVC_MP_MIDDLE_1024K_30FPS = 0x1120,
-	CELL_REC_PARAM_VIDEO_FMT_AVC_MP_MIDDLE_1536K_30FPS = 0x1130,
-
-	CELL_REC_PARAM_VIDEO_FMT_AVC_BL_SMALL_512K_30FPS   = 0x2000,
-	CELL_REC_PARAM_VIDEO_FMT_AVC_BL_SMALL_768K_30FPS   = 0x2010,
-	CELL_REC_PARAM_VIDEO_FMT_AVC_BL_MIDDLE_512K_30FPS  = 0x2100,
-	CELL_REC_PARAM_VIDEO_FMT_AVC_BL_MIDDLE_768K_30FPS  = 0x2110,
-	CELL_REC_PARAM_VIDEO_FMT_AVC_BL_MIDDLE_1024K_30FPS = 0x2120,
-	CELL_REC_PARAM_VIDEO_FMT_AVC_BL_MIDDLE_1536K_30FPS = 0x2130,
-
-	CELL_REC_PARAM_VIDEO_FMT_MJPEG_SMALL_5000K_30FPS  = 0x3060,
-	CELL_REC_PARAM_VIDEO_FMT_MJPEG_MIDDLE_5000K_30FPS = 0x3160,
-	CELL_REC_PARAM_VIDEO_FMT_MJPEG_LARGE_11000K_30FPS = 0x3270,
-	CELL_REC_PARAM_VIDEO_FMT_MJPEG_HD720_11000K_30FPS = 0x3670,
-	CELL_REC_PARAM_VIDEO_FMT_MJPEG_HD720_20000K_30FPS = 0x3680,
-	CELL_REC_PARAM_VIDEO_FMT_MJPEG_HD720_25000K_30FPS = 0x3690,
-
-	CELL_REC_PARAM_VIDEO_FMT_M4HD_SMALL_768K_30FPS   = 0x4010,
-	CELL_REC_PARAM_VIDEO_FMT_M4HD_MIDDLE_768K_30FPS  = 0x4110,
-	CELL_REC_PARAM_VIDEO_FMT_M4HD_LARGE_1536K_30FPS  = 0x4230,
-	CELL_REC_PARAM_VIDEO_FMT_M4HD_LARGE_2048K_30FPS  = 0x4240,
-	CELL_REC_PARAM_VIDEO_FMT_M4HD_HD720_2048K_30FPS  = 0x4640,
-	CELL_REC_PARAM_VIDEO_FMT_M4HD_HD720_5000K_30FPS  = 0x4660,
-	CELL_REC_PARAM_VIDEO_FMT_M4HD_HD720_11000K_30FPS = 0x4670,
-
-	CELL_REC_PARAM_AUDIO_FMT_AAC_96K   = 0x0000,
-	CELL_REC_PARAM_AUDIO_FMT_AAC_128K  = 0x0001,
-	CELL_REC_PARAM_AUDIO_FMT_AAC_64K   = 0x0002,
-
-	CELL_REC_PARAM_AUDIO_FMT_ULAW_384K = 0x1007,
-	CELL_REC_PARAM_AUDIO_FMT_ULAW_768K = 0x1008,
-
-	CELL_REC_PARAM_AUDIO_FMT_PCM_384K  = 0x2007,
-	CELL_REC_PARAM_AUDIO_FMT_PCM_768K  = 0x2008,
-	CELL_REC_PARAM_AUDIO_FMT_PCM_1536K = 0x2009,
-
-	CELL_REC_PARAM_VIDEO_FMT_YOUTUBE       = 0x0310,
-	CELL_REC_PARAM_VIDEO_FMT_YOUTUBE_LARGE = CELL_REC_PARAM_VIDEO_FMT_MPEG4_LARGE_2048K_30FPS,
-	CELL_REC_PARAM_VIDEO_FMT_YOUTUBE_HD720 = CELL_REC_PARAM_VIDEO_FMT_M4HD_HD720_5000K_30FPS,
-	CELL_REC_PARAM_AUDIO_FMT_YOUTUBE       = CELL_REC_PARAM_AUDIO_FMT_AAC_64K,
-
-	CELL_REC_PARAM_VIDEO_FMT_YOUTUBE_MJPEG = CELL_REC_PARAM_VIDEO_FMT_MJPEG_HD720_11000K_30FPS,
-	CELL_REC_PARAM_AUDIO_FMT_YOUTUBE_MJPEG = CELL_REC_PARAM_AUDIO_FMT_PCM_768K,
-
-	CELL_REC_AUDIO_BLOCK_SAMPLES = 256,
-};
-
-enum
-{
-	CELL_REC_INFO_VIDEO_INPUT_ADDR        = 0,
-	CELL_REC_INFO_VIDEO_INPUT_WIDTH       = 1,
-	CELL_REC_INFO_VIDEO_INPUT_PITCH       = 2,
-	CELL_REC_INFO_VIDEO_INPUT_HEIGHT      = 3,
-	CELL_REC_INFO_AUDIO_INPUT_ADDR        = 4,
-	CELL_REC_INFO_MOVIE_TIME_MSEC         = 5,
-	CELL_REC_INFO_SPURS_SYSTEMWORKLOAD_ID = 6,
-};
-
-enum
-{
-	CELL_REC_SETINFO_MOVIE_START_TIME_MSEC = 100,
-	CELL_REC_SETINFO_MOVIE_END_TIME_MSEC   = 101,
-	CELL_REC_SETINFO_MOVIE_META            = 200,
-	CELL_REC_SETINFO_SCENE_META            = 201,
-
-	CELL_REC_MOVIE_META_GAME_TITLE_LEN  = 128,
-	CELL_REC_MOVIE_META_MOVIE_TITLE_LEN = 128,
-	CELL_REC_MOVIE_META_DESCRIPTION_LEN = 384,
-	CELL_REC_MOVIE_META_USERDATA_LEN    = 64,
-
-	CELL_REC_SCENE_META_TYPE_CHAPTER        = 0,
-	CELL_REC_SCENE_META_TYPE_CLIP_HIGHLIGHT = 1,
-	CELL_REC_SCENE_META_TYPE_CLIP_USER      = 2,
-
-	CELL_REC_SCENE_META_TITLE_LEN = 128,
-	CELL_REC_SCENE_META_TAG_NUM   = 6,
-	CELL_REC_SCENE_META_TAG_LEN   = 64,
-};
-
-enum
-{
-	CELL_REC_OPTION_PPU_THREAD_PRIORITY = 1,
-	CELL_REC_OPTION_SPU_THREAD_PRIORITY = 2,
-	CELL_REC_OPTION_CAPTURE_PRIORITY    = 3,
-	CELL_REC_OPTION_USE_SYSTEM_SPU      = 4,
-	CELL_REC_OPTION_FIT_TO_YOUTUBE      = 5,
-	CELL_REC_OPTION_XMB_BGM             = 6,
-	CELL_REC_OPTION_RING_SEC            = 7,
-	CELL_REC_OPTION_MPEG4_FAST_ENCODE   = 8,
-	CELL_REC_OPTION_VIDEO_INPUT         = 9,
-	CELL_REC_OPTION_AUDIO_INPUT         = 10,
-	CELL_REC_OPTION_AUDIO_INPUT_MIX_VOL = 11,
-	CELL_REC_OPTION_REDUCE_MEMSIZE      = 12,
-	CELL_REC_OPTION_SHOW_XMB            = 13,
-	CELL_REC_OPTION_METADATA_FILENAME   = 14,
-	CELL_REC_OPTION_SPURS               = 15,
-};
-
-struct CellRecSpursParam
-{
-	vm::bptr<struct CellSpurs> pSpurs;
-	be_t<s32> spu_usage_rate;
-	u8 priority[8];
-};
-
-struct CellRecOption
-{
-	be_t<s32> option;
-	union
-	{
-		be_t<s32> ppu_thread_priority;           // CELL_REC_OPTION_PPU_THREAD_PRIORITY
-		be_t<s32> spu_thread_priority;           // CELL_REC_OPTION_SPU_THREAD_PRIORITY
-		be_t<s32> capture_priority;              // CELL_REC_OPTION_CAPTURE_PRIORITY
-		be_t<s32> use_system_spu;                // CELL_REC_OPTION_USE_SYSTEM_SPU
-		be_t<s32> fit_to_youtube;                // CELL_REC_OPTION_FIT_TO_YOUTUBE
-		be_t<s32> xmb_bgm;                       // CELL_REC_OPTION_XMB_BGM
-		be_t<s32> mpeg4_fast_encode;             // CELL_REC_OPTION_MPEG4_FAST_ENCODE
-		be_t<u32> ring_sec;                      // CELL_REC_OPTION_RING_SEC
-		be_t<s32> video_input;                   // CELL_REC_OPTION_VIDEO_INPUT
-		be_t<s32> audio_input;                   // CELL_REC_OPTION_AUDIO_INPUT
-		be_t<s32> audio_input_mix_vol;           // CELL_REC_OPTION_AUDIO_INPUT_MIX_VOL
-		be_t<s32> reduce_memsize;                // CELL_REC_OPTION_REDUCE_MEMSIZE
-		be_t<s32> show_xmb;                      // CELL_REC_OPTION_SHOW_XMB
-		vm::bptr<char> metadata_filename;        // CELL_REC_OPTION_METADATA_FILENAME
-		vm::bptr<CellRecSpursParam> pSpursParam; // CELL_REC_OPTION_SPURS
-		be_t<u64> dummy;                         // -
-	} value;
-};
-
-struct CellRecParam
-{
-	be_t<s32> videoFmt;
-	be_t<s32> audioFmt;
-	be_t<s32> numOfOpt;
-	vm::bptr<CellRecOption> pOpt;
-};
-
-struct CellRecMovieMetadata
-{
-	vm::bptr<char> gameTitle;
-	vm::bptr<char> movieTitle;
-	vm::bptr<char> description;
-	vm::bptr<char> userdata;
-};
-
-struct CellRecSceneMetadata
-{
-	be_t<u32> type;
-	be_t<u64> startTime;
-	be_t<u64> endTime;
-	u8 unk[4];             // NOTE: there seems to be undocumented padding
-	vm::bptr<char> title;
-	be_t<u32> tagNum;
-	vm::bpptr<char> tag;
-};
-
-using CellRecCallback = void(s32 recStatus, s32 recError, vm::ptr<void> userdata);
diff --git a/rpcs3/Emu/Cell/Modules/cellResc.cpp b/rpcs3/Emu/Cell/Modules/cellResc.cpp
index 065039b7ff..a3cc052d6f 100644
--- a/rpcs3/Emu/Cell/Modules/cellResc.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellResc.cpp
@@ -3,7 +3,6 @@
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/RSX/GCM.h"
-#include "Emu/RSX/gcm_enums.h"
 #include "cellResc.h"
 #include "cellVideoOut.h"
 
diff --git a/rpcs3/Emu/Cell/Modules/cellRtc.cpp b/rpcs3/Emu/Cell/Modules/cellRtc.cpp
index fb92dd6f2c..81a7c2c78a 100644
--- a/rpcs3/Emu/Cell/Modules/cellRtc.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellRtc.cpp
@@ -7,8 +7,12 @@
 #include "Emu/Cell/lv2/sys_memory.h"
 #include "Emu/Cell/lv2/sys_ss.h"
 
+//#include <iomanip>
+//#include <sstream>
+
 LOG_CHANNEL(cellRtc);
 
+// clang-format off
 template <>
 void fmt_class_string<CellRtcError>::format(std::string& out, u64 arg)
 {
@@ -35,29 +39,69 @@ void fmt_class_string<CellRtcError>::format(std::string& out, u64 arg)
 		return unknown;
 	});
 }
+// clang-format on
 
-static inline char ascii(u8 num)
+// Grabbed from JPCSP
+// This is the # of microseconds between January 1, 0001 and January 1, 1970.
+const u64 RTC_MAGIC_OFFSET = 62135596800000000ULL;
+// This is the # of microseconds between January 1, 0001 and January 1, 1601 (for Win32 FILETIME.)
+const u64 RTC_FILETIME_OFFSET = 50491123200000000ULL;
+
+const u64 EPOCH_AS_FILETIME = 116444736000000000ULL;
+
+// Also stores leap year
+const u8 DAYS_IN_MONTH[24] = {0x1F, 0x1C, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F, 0x1F, 0x1D, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F};
+const char WEEKDAY_NAMES[7][4]  = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};                                    // 4 as terminator
+const char MONTH_NAMES[12][4]   = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // 4 as terminator
+
+s64 convertToUNIXTime(u16 seconds, u16 minutes, u16 hours, u16 days, s32 years)
 {
-	return num + '0';
+	return s64{seconds} + s64{minutes} * 60 + s64{hours} * 3600 + s64{days} * 86400 + s64{s64{years} - 70} * 31536000 + s64{(years - 69) / 4} * 86400 - s64{(years - 1) / 100} * 86400 +
+		   s64{(years + 299) / 400} * 86400;
 }
 
-static inline s8 digit(char c)
+u64 convertToWin32FILETIME(u16 seconds, u16 minutes, u16 hours, u16 days, s32 years)
 {
-	return c - '0';
+	s64 unixtime      = convertToUNIXTime(seconds, minutes, hours, days, years);
+	u64 win32time     = static_cast<u64>(unixtime) * 10000000 + EPOCH_AS_FILETIME;
+	u64 win32filetime = win32time | win32time >> 32;
+	return win32filetime;
 }
 
+// TODO make all this use tick resolution and figure out the magic numbers
+// TODO MULHDU instruction returns high 64 bit of the 128 bit result of two 64-bit regs multiplication
+// need to be replaced with utils::mulh64, utils::umulh64, utils::div128, utils::udiv128 in needed places
+// cellRtcSetTick / cellRtcSetWin32FileTime /  cellRtcSetCurrentTick / cellRtcSetCurrentSecureTick
+// TODO undo optimized division
+
+// Internal helper functions in cellRtc
+
+error_code set_secure_rtc_time(u64 time)
+{
+	return sys_ss_secure_rtc(0x3003 /* SET_TIME */, time, 0, 0); // TODO
+}
+
+error_code get_secure_rtc_time(u64 unk1, u64 unk2, u64 unk3)
+{
+	return sys_ss_secure_rtc(0x3002 /* GET_TIME */, unk1, unk2, unk3); // TODO
+}
+
+// End of internal helper functions
+
+// Helper methods
+
 static bool is_leap_year(u32 year)
 {
 	return year % 4 == 0 && (year % 100 != 0 || year % 400 == 0);
 }
 
-error_code cellRtcGetCurrentTick(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick)
+// End of helper methods
+
+error_code cellRtcGetCurrentTick(vm::ptr<CellRtcTick> pTick)
 {
-	cellRtc.trace("cellRtcGetCurrentTick(pTick=*0x%x)", pTick);
+	cellRtc.todo("cellRtcGetCurrentTick(pTick=*0x%x)", pTick);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pTick.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -66,7 +110,7 @@ error_code cellRtcGetCurrentTick(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick)
 	vm::var<s64> nsec;
 
 	error_code ret = sys_time_get_current_time(sec, nsec);
-	if (ret < CELL_OK)
+	if (ret != CELL_OK)
 	{
 		return ret;
 	}
@@ -76,19 +120,17 @@ error_code cellRtcGetCurrentTick(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick)
 	return CELL_OK;
 }
 
-error_code cellRtcGetCurrentClock(ppu_thread& ppu, vm::ptr<CellRtcDateTime> pClock, s32 iTimeZone)
+error_code cellRtcGetCurrentClock(vm::ptr<CellRtcDateTime> pClock, s32 iTimeZone)
 {
-	cellRtc.trace("cellRtcGetCurrentClock(pClock=*0x%x, iTimeZone=%d)", pClock, iTimeZone);
+	cellRtc.todo("cellRtcGetCurrentClock(pClock=*0x%x, time_zone=%d)", pClock, iTimeZone);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pClock.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pClock.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
 	vm::var<CellRtcTick> tick;
-	if (sys_memory_get_page_attribute(ppu, tick.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(tick.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -97,26 +139,24 @@ error_code cellRtcGetCurrentClock(ppu_thread& ppu, vm::ptr<CellRtcDateTime> pClo
 	vm::var<s64> nsec;
 
 	error_code ret = sys_time_get_current_time(sec, nsec);
-	if (ret < CELL_OK)
+	if (ret != CELL_OK)
 	{
 		return ret;
 	}
 
 	tick->tick = *nsec / 1000 + *sec * cellRtcGetTickResolution() + RTC_MAGIC_OFFSET;
 
-	cellRtcTickAddMinutes(ppu, tick, tick, iTimeZone);
-	cellRtcSetTick(ppu, pClock, tick);
+	cellRtcTickAddMinutes(tick, tick, iTimeZone);
+	cellRtcSetTick(pClock, tick);
 
 	return CELL_OK;
 }
 
-error_code cellRtcGetCurrentClockLocalTime(ppu_thread& ppu, vm::ptr<CellRtcDateTime> pClock)
+error_code cellRtcGetCurrentClockLocalTime(vm::ptr<CellRtcDateTime> pClock)
 {
-	cellRtc.trace("cellRtcGetCurrentClockLocalTime(pClock=*0x%x)", pClock);
+	cellRtc.todo("cellRtcGetCurrentClockLocalTime(pClock=*0x%x)", pClock);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pClock.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pClock.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -125,18 +165,18 @@ error_code cellRtcGetCurrentClockLocalTime(ppu_thread& ppu, vm::ptr<CellRtcDateT
 	vm::var<s32> summertime;
 
 	error_code ret = sys_time_get_timezone(timezone, summertime);
-	if (ret < CELL_OK)
+	if (ret != CELL_OK)
 	{
 		return ret;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pClock.addr(), page_attr) != CELL_OK) // Should always evaluate to false, already checked above
+	if (!vm::check_addr(pClock.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
 	vm::var<CellRtcTick> tick;
-	if (sys_memory_get_page_attribute(ppu, tick.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(tick.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -145,39 +185,37 @@ error_code cellRtcGetCurrentClockLocalTime(ppu_thread& ppu, vm::ptr<CellRtcDateT
 	vm::var<s64> nsec;
 
 	ret = sys_time_get_current_time(sec, nsec);
-	if (ret < CELL_OK)
+	if (ret != CELL_OK)
 	{
 		return ret;
 	}
 
 	tick->tick = *nsec / 1000 + *sec * cellRtcGetTickResolution() + RTC_MAGIC_OFFSET;
 
-	cellRtcTickAddMinutes(ppu, tick, tick, *timezone + *summertime);
-	cellRtcSetTick(ppu, pClock, tick);
+	cellRtcTickAddMinutes(tick, tick, s64{*timezone} + s64{*summertime});
+	cellRtcSetTick(pClock, tick);
 
 	return CELL_OK;
 }
 
-error_code cellRtcFormatRfc2822(ppu_thread& ppu, vm::ptr<char> pszDateTime, vm::cptr<CellRtcTick> pUtc, s32 iTimeZone)
+error_code cellRtcFormatRfc2822(vm::ptr<char> pszDateTime, vm::cptr<CellRtcTick> pUtc, s32 iTimeZone)
 {
-	cellRtc.notice("cellRtcFormatRfc2822(pszDateTime=*0x%x, pUtc=*0x%x, iTimeZone=%d)", pszDateTime, pUtc, iTimeZone);
+	cellRtc.todo("cellRtcFormatRfc2822(pszDateTime=*0x%x, pUtc=*0x%x, time_zone=%d)", pszDateTime, pUtc, iTimeZone);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pszDateTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pszDateTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pUtc.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pUtc.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
 	vm::var<CellRtcTick> rtc_tick;
-	if (!pUtc) // Should always evaluate to false, nullptr was already checked above
+	if (pUtc->tick == 0ULL)
 	{
-		cellRtcGetCurrentTick(ppu, rtc_tick);
+		cellRtcGetCurrentTick(rtc_tick);
 	}
 	else
 	{
@@ -186,8 +224,8 @@ error_code cellRtcFormatRfc2822(ppu_thread& ppu, vm::ptr<char> pszDateTime, vm::
 
 	vm::var<CellRtcDateTime> date_time;
 
-	cellRtcTickAddMinutes(ppu, rtc_tick, rtc_tick, iTimeZone);
-	cellRtcSetTick(ppu, date_time, rtc_tick);
+	cellRtcTickAddMinutes(rtc_tick, rtc_tick, iTimeZone);
+	cellRtcSetTick(date_time, rtc_tick);
 
 	error_code ret = cellRtcCheckValid(date_time);
 	if (ret != CELL_OK)
@@ -195,50 +233,68 @@ error_code cellRtcFormatRfc2822(ppu_thread& ppu, vm::ptr<char> pszDateTime, vm::
 		return ret;
 	}
 
+	s32 tzone = iTimeZone;
+
 	s32 weekdayIdx = cellRtcGetDayOfWeek(date_time->year, date_time->month, date_time->day);
 	// Day name
-	pszDateTime[0] = std::toupper(WEEKDAY_NAMES[weekdayIdx][0]);
+	*pszDateTime   = WEEKDAY_NAMES[weekdayIdx][0];
 	pszDateTime[1] = WEEKDAY_NAMES[weekdayIdx][1];
 	pszDateTime[2] = WEEKDAY_NAMES[weekdayIdx][2];
 	pszDateTime[3] = ',';
 	pszDateTime[4] = ' ';
 	// Day number
-	pszDateTime[5] = ascii(date_time->day / 10);
-	pszDateTime[6] = ascii(date_time->day % 10);
+	if (date_time->day < 10)
+	{
+		pszDateTime[5] = '0';
+		pszDateTime[6] = date_time->day + '0';
+	}
+	else
+	{
+		pszDateTime[5] = (date_time->day / 10) + '0';
+		pszDateTime[6] = (date_time->day - ((date_time->day / 10 << 1) + (date_time->day / 10 << 3))) + '0';
+	}
 	pszDateTime[7] = ' ';
 
 	// month name
-	pszDateTime[8]   = std::toupper(MONTH_NAMES[date_time->month - 1][0]);
+	pszDateTime[8]   = MONTH_NAMES[date_time->month - 1][0];
 	pszDateTime[9]   = MONTH_NAMES[date_time->month - 1][1];
 	pszDateTime[10]  = MONTH_NAMES[date_time->month - 1][2];
 	pszDateTime[0xb] = ' ';
 
 	// year
-	pszDateTime[0xc]  = ascii(date_time->year / 1000);
-	pszDateTime[0xd]  = ascii(date_time->year / 100 % 10);
-	pszDateTime[0xe]  = ascii(date_time->year / 10 % 10);
-	pszDateTime[0xf]  = ascii(date_time->year % 10);
+	char yearDigits[5];
+	sprintf(yearDigits, "%04hi", u16{date_time->year});
+	pszDateTime[0xc]  = yearDigits[0];
+	pszDateTime[0xd]  = yearDigits[1];
+	pszDateTime[0xe]  = yearDigits[2];
+	pszDateTime[0xf]  = yearDigits[3];
 	pszDateTime[0x10] = ' ';
 
 	// Hours
-	pszDateTime[0x11] = ascii(date_time->hour / 10);
-	pszDateTime[0x12] = ascii(date_time->hour % 10);
+	char hourDigits[3];
+	sprintf(hourDigits, "%02hi", u16{date_time->hour});
+	pszDateTime[0x11] = hourDigits[0];
+	pszDateTime[0x12] = hourDigits[1];
 	pszDateTime[0x13] = ':';
 
 	// Minutes
-	pszDateTime[0x14] = ascii(date_time->minute / 10);
-	pszDateTime[0x15] = ascii(date_time->minute % 10);
+	char minDigits[3];
+	sprintf(minDigits, "%02hi", u16{date_time->minute});
+	pszDateTime[0x14] = minDigits[0];
+	pszDateTime[0x15] = minDigits[1];
 	pszDateTime[0x16] = ':';
 
 	// Seconds
-	pszDateTime[0x17] = ascii(date_time->second / 10);
-	pszDateTime[0x18] = ascii(date_time->second % 10);
+	char secDigits[3];
+	sprintf(secDigits, "%02hi", u16{date_time->second});
+	pszDateTime[0x17] = secDigits[0];
+	pszDateTime[0x18] = secDigits[1];
 	pszDateTime[0x19] = ' ';
 
 	// Timezone -/+
 	if (iTimeZone < 0)
 	{
-		iTimeZone = -iTimeZone;
+		tzone             = -tzone;
 		pszDateTime[0x1a] = '-';
 	}
 	else
@@ -246,30 +302,32 @@ error_code cellRtcFormatRfc2822(ppu_thread& ppu, vm::ptr<char> pszDateTime, vm::
 		pszDateTime[0x1a] = '+';
 	}
 
-	const u32 time_zone_hours = iTimeZone / 60 % 100;
-	const u32 time_zone_minutes = iTimeZone % 60;
+	// Timezone - matches lle result.
+	u32 unk_1 = tzone >> 31;
+	u32 unk_2 = (tzone / 0x3c + unk_1) - unk_1;
+	tzone -= (unk_2 << 6) - (unk_2 << 2);
+	u32 unk_3 = (unk_2 / 10 + (unk_2 >> 0x1f)) - (unk_2 >> 31);
+	u32 unk_4 = (tzone / 10 + unk_1) - unk_1;
 
-	pszDateTime[0x1b] = ascii(time_zone_hours / 10);
-	pszDateTime[0x1c] = ascii(time_zone_hours % 10);
-	pszDateTime[0x1d] = ascii(time_zone_minutes / 10);
-	pszDateTime[0x1e] = ascii(time_zone_minutes % 10);
+	pszDateTime[0x1b] = unk_3 + (unk_3 / 10) * -10 + '0';
+	pszDateTime[0x1c] = (unk_2 - ((unk_3 << 1) + (unk_3 << 3))) + '0';
+	pszDateTime[0x1d] = unk_4 + (unk_4 / 10) * -10 + '0';
+	pszDateTime[0x1e] = (tzone - ((unk_4 << 1) + (unk_4 << 3))) + '0';
 	pszDateTime[0x1f] = '\0';
 
 	return CELL_OK;
 }
 
-error_code cellRtcFormatRfc2822LocalTime(ppu_thread& ppu, vm::ptr<char> pszDateTime, vm::cptr<CellRtcTick> pUtc)
+error_code cellRtcFormatRfc2822LocalTime(vm::ptr<char> pszDateTime, vm::cptr<CellRtcTick> pUtc)
 {
-	cellRtc.notice("cellRtcFormatRfc2822LocalTime(pszDateTime=*0x%x, pUtc=*0x%x)", pszDateTime, pUtc);
+	cellRtc.todo("cellRtcFormatRfc2822LocalTime(pszDateTime=*0x%x, pUtc=*0x%x)", pszDateTime, pUtc);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pszDateTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pszDateTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pUtc.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pUtc.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -278,34 +336,32 @@ error_code cellRtcFormatRfc2822LocalTime(ppu_thread& ppu, vm::ptr<char> pszDateT
 	vm::var<s32> summertime;
 
 	error_code ret = sys_time_get_timezone(timezone, summertime);
-	if (ret < CELL_OK)
+	if (ret != CELL_OK)
 	{
 		return ret;
 	}
 
-	return cellRtcFormatRfc2822(ppu, pszDateTime, pUtc, *timezone + *summertime);
+	return cellRtcFormatRfc2822(pszDateTime, pUtc, *timezone + *summertime);
 }
 
-error_code cellRtcFormatRfc3339(ppu_thread& ppu, vm::ptr<char> pszDateTime, vm::cptr<CellRtcTick> pUtc, s32 iTimeZone)
+error_code cellRtcFormatRfc3339(vm::ptr<char> pszDateTime, vm::cptr<CellRtcTick> pUtc, s32 iTimeZone)
 {
-	cellRtc.notice("cellRtcFormatRfc3339(pszDateTime=*0x%x, pUtc=*0x%x, iTimeZone=%d)", pszDateTime, pUtc, iTimeZone);
+	cellRtc.todo("cellRtcFormatRfc3339(pszDateTime=*0x%x, pUtc=*0x%x, iTimeZone=%d)", pszDateTime, pUtc, iTimeZone);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pszDateTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pszDateTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pUtc.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pUtc.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
 	vm::var<CellRtcTick> rtc_tick;
-	if (!pUtc) // Should always evaluate to false, nullptr was already checked above
+	if (pUtc->tick == 0ULL)
 	{
-		cellRtcGetCurrentTick(ppu, rtc_tick);
+		cellRtcGetCurrentTick(rtc_tick);
 	}
 	else
 	{
@@ -314,8 +370,8 @@ error_code cellRtcFormatRfc3339(ppu_thread& ppu, vm::ptr<char> pszDateTime, vm::
 
 	vm::var<CellRtcDateTime> date_time;
 
-	cellRtcTickAddMinutes(ppu, rtc_tick, rtc_tick, iTimeZone);
-	cellRtcSetTick(ppu, date_time, rtc_tick);
+	cellRtcTickAddMinutes(rtc_tick, rtc_tick, iTimeZone);
+	cellRtcSetTick(date_time, rtc_tick);
 
 	error_code ret = cellRtcCheckValid(date_time);
 	if (ret != CELL_OK)
@@ -323,87 +379,102 @@ error_code cellRtcFormatRfc3339(ppu_thread& ppu, vm::ptr<char> pszDateTime, vm::
 		return ret;
 	}
 
+	s32 tzone = iTimeZone;
+
 	// Year - XXXX-04-13T10:56:31.35+66:40
-	pszDateTime[0x0] = ascii(date_time->year / 1000);
-	pszDateTime[0x1] = ascii(date_time->year / 100 % 10);
-	pszDateTime[0x2] = ascii(date_time->year / 10 % 10);
-	pszDateTime[0x3] = ascii(date_time->year % 10);
+	char yearDigits[5];
+	sprintf(yearDigits, "%04hi", u16{date_time->year});
+	pszDateTime[0x0] = yearDigits[0];
+	pszDateTime[0x1] = yearDigits[1];
+	pszDateTime[0x2] = yearDigits[2];
+	pszDateTime[0x3] = yearDigits[3];
 	pszDateTime[0x4] = '-';
 
 	// Month - 2020-XX-13T10:56:31.35+66:40
-	pszDateTime[0x5] = ascii(date_time->month / 10);
-	pszDateTime[0x6] = ascii(date_time->month % 10);
+	char monthDigits[3];
+	sprintf(monthDigits, "%02hi", u16{date_time->month});
+	pszDateTime[0x5] = monthDigits[0];
+	pszDateTime[0x6] = monthDigits[1];
 	pszDateTime[0x7] = '-';
 
 	// Day - 2020-04-XXT10:56:31.35+66:40
-	pszDateTime[0x8] = ascii(date_time->day / 10);
-	pszDateTime[0x9] = ascii(date_time->day % 10);
+	char dayDigits[3];
+	sprintf(dayDigits, "%02hi", u16{date_time->day});
+	pszDateTime[0x8] = dayDigits[0];
+	pszDateTime[0x9] = dayDigits[1];
 	pszDateTime[0xa] = 'T';
 
 	// Hours - 2020-04-13TXX:56:31.35+66:40
-	pszDateTime[0xb] = ascii(date_time->hour / 10);
-	pszDateTime[0xc] = ascii(date_time->hour % 10);
+	char hourDigits[3];
+	sprintf(hourDigits, "%02hi", u16{date_time->hour});
+	pszDateTime[0xb] = hourDigits[0];
+	pszDateTime[0xc] = hourDigits[1];
 	pszDateTime[0xd] = ':';
 
 	// Minutes - 2020-04-13T10:XX:31.35+66:40
-	pszDateTime[0xe]  = ascii(date_time->minute / 10);
-	pszDateTime[0xf]  = ascii(date_time->minute % 10);
+	char minDigits[3];
+	sprintf(minDigits, "%02hi", u16{date_time->minute});
+	pszDateTime[0xe]  = minDigits[0];
+	pszDateTime[0xf]  = minDigits[1];
 	pszDateTime[0x10] = ':';
 
 	// Seconds - 2020-04-13T10:56:XX.35+66:40
-	pszDateTime[0x11] = ascii(date_time->second / 10);
-	pszDateTime[0x12] = ascii(date_time->second % 10);
+	char secDigits[3];
+	sprintf(secDigits, "%02hi", u16{date_time->second});
+	pszDateTime[0x11] = secDigits[0];
+	pszDateTime[0x12] = secDigits[1];
 	pszDateTime[0x13] = '.';
 
-	// Hundredths of a second - 2020-04-13T10:56:31.XX+66:40
-	pszDateTime[0x14] = ascii(date_time->microsecond / 100'000);
-	pszDateTime[0x15] = ascii(date_time->microsecond / 10'000 % 10);
+	// Microseconds - 2020-04-13T10:56:31.XX+66:40
+	char microDigits[3];
+	sprintf(microDigits, "%02u", u32{date_time->microsecond});
+	pszDateTime[0x14] = microDigits[0];
+	pszDateTime[0x15] = microDigits[1];
 
-	// Time zone - 'Z' for UTC
 	if (iTimeZone == 0)
 	{
 		pszDateTime[0x16] = 'Z';
 		pszDateTime[0x17] = '\0';
 	}
-	// Time zone - ±hh:mm
 	else
 	{
 		if (iTimeZone < 0)
 		{
-			iTimeZone = -iTimeZone;
+			tzone             = -tzone;
 			pszDateTime[0x16] = '-';
 		}
 		else
 		{
 			pszDateTime[0x16] = '+';
 		}
+		u32 uVar1 = tzone >> 0x1f;
 
-		const u32 time_zone_hours = iTimeZone / 60 % 100;
-		const u32 time_zone_minutes = iTimeZone % 60;
-
-		pszDateTime[0x17] = ascii(time_zone_hours / 10);
-		pszDateTime[0x18] = ascii(time_zone_hours % 10);
+		u32 lVar9 = (tzone / 0x3c + uVar1) - uVar1;
+		tzone -= (lVar9 << 6) - (lVar9 << 2);
+		uVar1             = tzone >> 0x1f;
+		u32 lVar11        = (lVar9 / 10 + (lVar9 >> 0x1f)) - (lVar9 >> 0x1f);
+		u32 lVar8         = (tzone / 10 + uVar1) - uVar1;
+		pszDateTime[0x17] = lVar11 + (lVar11 / 10) * -10 + '0';
+		pszDateTime[0x18] = (lVar9 - ((lVar11 << 1) + (lVar11 << 3))) + '0';
 		pszDateTime[0x19] = ':';
-		pszDateTime[0x1a] = ascii(time_zone_minutes / 10);
-		pszDateTime[0x1b] = ascii(time_zone_minutes % 10);
+		pszDateTime[0x1a] = lVar8 + (lVar8 / 10) * -10 + '0';
+		pszDateTime[0x1b] = (tzone - ((lVar8 << 1) + (lVar8 << 3))) + '0';
 		pszDateTime[0x1c] = '\0';
 	}
 
 	return CELL_OK;
 }
 
-error_code cellRtcFormatRfc3339LocalTime(ppu_thread& ppu, vm::ptr<char> pszDateTime, vm::cptr<CellRtcTick> pUtc)
+error_code cellRtcFormatRfc3339LocalTime(vm::ptr<char> pszDateTime, vm::cptr<CellRtcTick> pUtc)
 {
-	cellRtc.notice("cellRtcFormatRfc3339LocalTime(pszDateTime=*0x%x, pUtc=*0x%x)", pszDateTime, pUtc);
+	cellRtc.todo("cellRtcFormatRfc3339LocalTime(pszDateTime=*0x%x, pUtc=*0x%x)", pszDateTime, pUtc);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pszDateTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pszDateTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pUtc.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pUtc.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -412,428 +483,111 @@ error_code cellRtcFormatRfc3339LocalTime(ppu_thread& ppu, vm::ptr<char> pszDateT
 	vm::var<s32> summertime;
 
 	error_code ret = sys_time_get_timezone(timezone, summertime);
-	if (ret < CELL_OK)
+	if (ret != CELL_OK)
 	{
 		return ret;
 	}
 
-	return cellRtcFormatRfc3339(ppu, pszDateTime, pUtc, *timezone + *summertime);
+	return cellRtcFormatRfc3339(pszDateTime, pUtc, *timezone + *summertime);
 }
 
-u16 rtcParseComponent(vm::cptr<char> pszDateTime, u32& pos, char delimiter, const char* component_name)
-{
-	if (delimiter != 0)
-	{
-		if (pszDateTime[pos] != delimiter)
-		{
-			cellRtc.error("rtcParseComponent(): failed to parse %s: invalid or missing delimiter", component_name);
-			return umax;
-		}
-
-		pos++;
-	}
-
-	if (!std::isdigit(pszDateTime[pos]))
-	{
-		cellRtc.error("rtcParseComponent(): failed to parse %s: ASCII value 0x%x at position %d is not a digit", component_name, pszDateTime[pos + 1], pos);
-		return umax;
-	}
-
-	u16 ret = digit(pszDateTime[pos]);
-
-	pos++;
-
-	if (std::isdigit(pszDateTime[pos]))
-	{
-		ret = ret * 10 + digit(pszDateTime[pos]);
-
-		pos++;
-	}
-
-	return ret;
-}
-
-template<usz size>
-u8 rtcParseName(vm::cptr<char> pszDateTime, u32& pos, const std::array<std::string_view, size>& names, bool allow_short_name = true)
-{
-	for (u8 name_idx = 0; name_idx < names.size(); name_idx++)
-	{
-		const u32 name_length = static_cast<u32>(names[name_idx].length());
-
-		u32 ch_idx = 0;
-
-		while (ch_idx < name_length && std::tolower(pszDateTime[pos + ch_idx]) == names[name_idx][ch_idx]) // Not case sensitive
-		{
-			ch_idx++;
-		}
-
-		if (ch_idx == name_length) // Full name matched
-		{
-			pos += name_length;
-			return name_idx;
-		}
-
-		if (allow_short_name && ch_idx >= 3) // Short name matched
-		{
-			pos += 3; // Only increment by 3, even if more letters were matched
-			return name_idx;
-		}
-	}
-
-	return size;
-}
-
-error_code rtcParseRfc2822(ppu_thread& ppu, vm::ptr<CellRtcTick> pUtc, vm::cptr<char> pszDateTime, u32 pos)
-{
-	// Day: "X" or "XX"
-	const u16 day = rtcParseComponent(pszDateTime, pos, 0, "day");
-
-	if (day == umax)
-	{
-		return CELL_RTC_ERROR_BAD_PARSE;
-	}
-
-	// Mandatory space or hyphen
-	if (pszDateTime[pos] != ' ' && pszDateTime[pos] != '-')
-	{
-		return { CELL_RTC_ERROR_BAD_PARSE, "rtcParseRfc2822(): invalid or missing delimiter after day" };
-	}
-
-	pos++;
-
-	// Month: at least the first three letters
-	const u16 month = rtcParseName(pszDateTime, pos, MONTH_NAMES) + 1;
-
-	if (month > MONTH_NAMES.size()) // No match
-	{
-		return { CELL_RTC_ERROR_BAD_PARSE, "rtcParseRfc2822(): failed to parse month: string at position %d doesn't match any name", pos };
-	}
-
-	// Mandatory space or hyphen
-	if (pszDateTime[pos] != ' ' && pszDateTime[pos] != '-')
-	{
-		return { CELL_RTC_ERROR_BAD_PARSE, "rtcParseRfc2822(): invalid or missing delimiter after month" };
-	}
-
-	pos++;
-
-	// Year: "XX" or "XXXX"
-	u16 year = 0;
-
-	if (!std::isdigit(pszDateTime[pos]) ||
-		!std::isdigit(pszDateTime[pos + 1]))
-	{
-		return { CELL_RTC_ERROR_BAD_PARSE, "rtcParseRfc2822(): failed to parse year: one of the first two ASCII values 0x%x, 0x%x at position %d is not a digit",
-			pszDateTime[pos], pszDateTime[pos + 1], pos };
-	}
-
-	if (!std::isdigit(pszDateTime[pos + 2]) ||
-		!std::isdigit(pszDateTime[pos + 3]))
-	{
-		year = digit(pszDateTime[pos]) * 10 + digit(pszDateTime[pos + 1]);
-		year += (year < 50) ? 2000 : 1900;
-		pos += 2;
-	}
-	else
-	{
-		year = digit(pszDateTime[pos]) * 1000 + digit(pszDateTime[pos + 1]) * 100 + digit(pszDateTime[pos + 2]) * 10 + digit(pszDateTime[pos + 3]);
-		pos += 4;
-	}
-
-	// Hour: " X" or " XX"
-	const u16 hour = rtcParseComponent(pszDateTime, pos, ' ', "hour");
-
-	if (hour == umax)
-	{
-		return CELL_RTC_ERROR_BAD_PARSE;
-	}
-
-	if (hour > 25) // LLE uses 25
-	{
-		return { CELL_RTC_ERROR_BAD_PARSE, "rtcParseRfc2822(): failed to parse hour: hour greater than 25" };
-	}
-
-	// Minute: ":X" or ":XX"
-	const u16 minute = rtcParseComponent(pszDateTime, pos, ':', "minute");
-
-	if (minute == umax)
-	{
-		return CELL_RTC_ERROR_BAD_PARSE;
-	}
-
-	// Second, optional: ":X" or ":XX"
-	// The string can't end with '\0' here, there must a space before it
-	u16 second = 0;
-
-	if (pszDateTime[pos] != ' ')
-	{
-		second = rtcParseComponent(pszDateTime, pos, ':', "second");
-
-		if (second == umax)
-		{
-			return CELL_RTC_ERROR_BAD_PARSE;
-		}
-	}
-	else
-	{
-		// If there are no seconds in the string, time zone requires two preceding spaces to be properly parsed
-		pos++;
-	}
-
-	// Time zone, optional, error if there is no valid time zone after the space
-	s32 time_zone = 0;
-
-	if (pszDateTime[pos] == ' ')
-	{
-		pos++;
-
-		if (pszDateTime[pos] == '+' || pszDateTime[pos] == '-')
-		{
-			// "±hhmm"
-
-			if (std::isdigit(pszDateTime[pos + 1]) &&
-				std::isdigit(pszDateTime[pos + 2]) &&
-				std::isdigit(pszDateTime[pos + 3]) &&
-				std::isdigit(pszDateTime[pos + 4]))
-			{
-				const s32 time_zone_hhmm = digit(pszDateTime[pos + 1]) * 1000 + digit(pszDateTime[pos + 2]) * 100 + digit(pszDateTime[pos + 3]) * 10 + digit(pszDateTime[pos + 4]);
-
-				time_zone = time_zone_hhmm / 100 * 60 + time_zone_hhmm % 60; // LLE uses % 60 instead of % 100
-			}
-			else
-			{
-				// No error, LLE does this for some reason
-				time_zone = -1;
-			}
-
-			if (pszDateTime[pos] == '-')
-			{
-				time_zone = -time_zone;
-			}
-		}
-		else if (pszDateTime[pos] != 'U' && pszDateTime[pos + 1] != 'T') // Case sensitive, should be || but LLE uses &&
-		{
-			// "GMT", "EST", "EDT", etc.
-
-			const u32 time_zone_idx = rtcParseName(pszDateTime, pos, TIME_ZONE_NAMES, false);
-
-			if (time_zone_idx < TIME_ZONE_NAMES.size())
-			{
-				time_zone = TIME_ZONE_VALUES[time_zone_idx] * 30;
-			}
-			else
-			{
-				// Military time zones
-				// "A", "B", "C", ..., not case sensitive
-				// These are all off by one ("A" should be UTC+01:00, "B" should be UTC+02:00, etc.)
-
-				const char letter = std::toupper(pszDateTime[pos]);
-
-				if (letter >= 'A' && letter <= 'M' && letter != 'J')
-				{
-					time_zone = (letter - 'A') * 60;
-				}
-				else if (letter >= 'N' && letter <= 'Y')
-				{
-					time_zone = ('N' - letter) * 60;
-				}
-				else if (letter != 'Z')
-				{
-					return { CELL_RTC_ERROR_BAD_PARSE, "rtcParseRfc2822(): failed to parse time zone" };
-				}
-			}
-		}
-	}
-
-	const vm::var<CellRtcDateTime> date_time{{ year, month, day, hour, minute, second, 0 }};
-
-	cellRtcGetTick(ppu, date_time, pUtc);
-	cellRtcTickAddMinutes(ppu, pUtc, pUtc, -time_zone); // The time zone value needs to be subtracted
-
-	return CELL_OK;
-}
-
-error_code cellRtcParseRfc3339(ppu_thread& ppu, vm::ptr<CellRtcTick> pUtc, vm::cptr<char> pszDateTime);
-
 /*
  Takes a RFC2822 / RFC3339 / asctime String, and converts it to a CellRtcTick
 */
-error_code cellRtcParseDateTime(ppu_thread& ppu, vm::ptr<CellRtcTick> pUtc, vm::cptr<char> pszDateTime)
+error_code cellRtcParseDateTime(vm::ptr<CellRtcTick> pUtc, vm::cptr<char> pszDateTime)
 {
-	cellRtc.notice("cellRtcParseDateTime(pUtc=*0x%x, pszDateTime=%s)", pUtc, pszDateTime);
+	cellRtc.error("cellRtcParseDateTime(pUtc=*0x%x, pszDateTime=%s) -- Implement me", pUtc, pszDateTime);
 
-	const vm::var<sys_page_attr_t> page_attr;
+	// Below code kinda works
+	/*
 
-	if (sys_memory_get_page_attribute(ppu, pUtc.addr(), page_attr) != CELL_OK || sys_memory_get_page_attribute(ppu, pszDateTime.addr(), page_attr) != CELL_OK)
+	std::tm t = {};
+	std::string tz;
+	vm::var<CellRtcDateTime> date_time;
+
+	// Not done like the library does it in the least..
+
+	s32 timezoneMins;
+	std::istringstream iss(std::string(pszDateTime.get_ptr(), strlen(pszDateTime.get_ptr())));
+	iss >> std::get_time(&t, "%a, %d %b %Y %H:%M:%S") >> tz; // rfc2822
+	if (!iss.fail())
 	{
-		return CELL_RTC_ERROR_INVALID_POINTER;
-	}
-
-	u32 pos = 0;
-
-	while (std::isblank(pszDateTime[pos]))
-	{
-		pos++;
-	}
-
-	if (std::isdigit(pszDateTime[pos]) &&
-		std::isdigit(pszDateTime[pos + 1]) &&
-		std::isdigit(pszDateTime[pos + 2]) &&
-		std::isdigit(pszDateTime[pos + 3]))
-	{
-		return cellRtcParseRfc3339(ppu, pUtc, pszDateTime + pos);
-	}
-
-	// Day of the week: at least the first three letters
-	if (rtcParseName(pszDateTime, pos, WEEKDAY_NAMES) == WEEKDAY_NAMES.size()) // No match
-	{
-		return { CELL_RTC_ERROR_BAD_PARSE, "cellRtcParseDateTime(): failed to parse day of the week: string at position %d doesn't match any name", pos };
-	}
-
-	// Optional comma
-	if (pszDateTime[pos] == ',')
-	{
-		pos++;
-	}
-
-	// Skip spaces and tabs
-	while (std::isblank(pszDateTime[pos]))
-	{
-		pos++;
-	}
-
-	// Month: at least the first three letters
-	const u16 month = rtcParseName(pszDateTime, pos, MONTH_NAMES) + 1;
-
-	if (month > MONTH_NAMES.size()) // No match
-	{
-		cellRtc.notice("cellRtcParseDateTime(): string uses RFC 2822 format");
-		return rtcParseRfc2822(ppu, pUtc, pszDateTime, pos);
-	}
-
-	// Mandatory space
-	if (pszDateTime[pos] != ' ')
-	{
-		return { CELL_RTC_ERROR_BAD_PARSE, "cellRtcParseDateTime(): no space after month" };
-	}
-
-	pos++;
-
-	// Day: " X", "XX" or "X"
-	// There may be a second space before day
-	u16 day = 0;
-
-	if (pszDateTime[pos] == ' ')
-	{
-		pos++;
-
-		// Due to using a signed type instead of unsigned, LLE doesn't check if the char is less than '0'
-		if (pszDateTime[pos] > '9')
+		// Looks wrong, works
+		if (tz[0] == '+')
 		{
-			return { CELL_RTC_ERROR_BAD_PARSE, "cellRtcParseDateTime(): failed to parse day: ASCII value 0x%x at position %d is not a digit", pszDateTime[pos], pos };
+			timezoneMins = -std::stoi(tz.substr(1));
 		}
-
-		if (pszDateTime[pos] < '0')
+		else
 		{
-			cellRtc.warning("cellRtcParseDateTime(): ASCII value 0x%x at position %d is not a digit", pszDateTime[pos], pos);
-		}
-
-		day = static_cast<u16>(pszDateTime[pos]) - '0'; // Needs to be sign extended first to match LLE for values from 0x80 to 0xb0
-
-		pos++;
-	}
-	else if (std::isdigit(pszDateTime[pos]))
-	{
-		day = digit(pszDateTime[pos]);
-
-		pos++;
-
-		if (std::isdigit(pszDateTime[pos]))
-		{
-			day = day * 10 + digit(pszDateTime[pos]);
-
-			pos++;
+			timezoneMins = +std::stoi(tz.substr(1));
 		}
 	}
 	else
 	{
-		return { CELL_RTC_ERROR_BAD_PARSE, "cellRtcParseDateTime(): failed to parse day: ASCII value 0x%x at position %d is not a digit or space", pszDateTime[pos], pos };
+		iss >> std::get_time(&t, "%Y-%m-%dT%H:%M:%S") >> tz; // rfc3339 2020-04-03T13:23:30.30Z
+		if (!iss.fail())
+		{
+			// TODO timezone
+		}
+		else
+		{
+			// TODO asctime
+			iss >> std::get_time(&t, "%a %b  %d %H:%M:%S %Y");//Mon Apr  6 21:58:35 2020
+			if (!iss.fail())
+			{
+				// TODO timezone
+			}
+			else
+			{
+				return CELL_RTC_ERROR_BAD_PARSE;
+			}
+		}
 	}
 
-	// Hour: " X" or " XX"
-	const u16 hour = rtcParseComponent(pszDateTime, pos, ' ', "hour");
-
-	if (hour == umax)
-	{
-		return CELL_RTC_ERROR_BAD_PARSE;
-	}
-
-	// Minute: ":X" or ":XX"
-	const u16 minute = rtcParseComponent(pszDateTime, pos, ':', "minute");
-
-	if (minute == umax)
-	{
-		return CELL_RTC_ERROR_BAD_PARSE;
-	}
-
-	// Second: ":X" or ":XX"
-	const u16 second = rtcParseComponent(pszDateTime, pos, ':', "second");
-
-	if (second == umax)
-	{
-		return CELL_RTC_ERROR_BAD_PARSE;
-	}
-
-	// Mandatory space
-	if (pszDateTime[pos] != ' ')
-	{
-		return { CELL_RTC_ERROR_BAD_PARSE, "cellRtcParseDateTime(): no space after second" };
-	}
-
-	pos++;
-
-	// Year: XXXX
-	if (!std::isdigit(pszDateTime[pos]) ||
-		!std::isdigit(pszDateTime[pos + 1]) ||
-		!std::isdigit(pszDateTime[pos + 2]) ||
-		!std::isdigit(pszDateTime[pos + 3]))
-	{
-		return { CELL_RTC_ERROR_BAD_PARSE, "cellRtcParseDateTime(): failed to parse year: one of the ASCII values 0x%x, 0x%x, 0x%x, or 0x%x is not a digit",
-			pszDateTime[pos], pszDateTime[pos + 1], pszDateTime[pos + 2], pszDateTime[pos + 3] };
-	}
-
-	const u16 year = digit(pszDateTime[pos]) * 1000 + digit(pszDateTime[pos + 1]) * 100 + digit(pszDateTime[pos + 2]) * 10 + digit(pszDateTime[pos + 3]);
-
-	const vm::var<CellRtcDateTime> date_time{{ year, month, day, hour, minute, second, 0 }};
-
-	cellRtcGetTick(ppu, date_time, pUtc);
+	cellRtc.todo("heh year: %d, month: %d, day: %d, hour: %d, minute: %d, second: %d, tz: %s, tz_d: %d", t.tm_year + 1900, t.tm_mon + 1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, tz, timezoneMins);
+	date_time->year        = t.tm_year + 1900;
+	date_time->month       = t.tm_mon + 1;
+	date_time->day         = t.tm_mday;
+	date_time->hour        = t.tm_hour;
+	date_time->minute      = t.tm_min;
+	date_time->second      = t.tm_sec;
+	date_time->microsecond = 0;
+	cellRtcGetTick(date_time, pUtc);
+	cellRtcTickAddMinutes(pUtc, pUtc, timezoneMins);*/
 
 	return CELL_OK;
 }
 
-// Rfc3339: 1995-12-03T13:23:00.00Z
-error_code cellRtcParseRfc3339(ppu_thread& ppu, vm::ptr<CellRtcTick> pUtc, vm::cptr<char> pszDateTime)
+error_code cellRtcParseRfc3339(vm::ptr<CellRtcTick> pUtc, vm::cptr<char> pszDateTime)
 {
-	cellRtc.notice("cellRtcParseRfc3339(pUtc=*0x%x, pszDateTime=%s)", pUtc, pszDateTime);
+	cellRtc.todo("cellRtcParseRfc3339(pUtc=*0x%x, pszDateTime=%s)", pUtc, pszDateTime);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pUtc.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pUtc.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pszDateTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pszDateTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
 	vm::var<CellRtcDateTime> date_time;
 
-	// Year: XXXX-12-03T13:23:00.00Z
-	if (std::isdigit(pszDateTime[0]) && std::isdigit(pszDateTime[1]) && std::isdigit(pszDateTime[2]) && std::isdigit(pszDateTime[3]))
+	// TODO fix unholyness
+
+	s64 l_add;
+	u32 pc_var_5;
+	u32 u_var_7;
+	s32 i_var_6;
+	s32 i_var_8;
+
+	char char_1 = pszDateTime[1];
+	char char_2 = pszDateTime[2];
+	const char char_3 = pszDateTime[3];
+	if (((*pszDateTime - 0x30U) < 10) && ('/' < char_1) && (char_1 < ':') && ('/' < char_2) && (char_2 < ':') && ('/' < char_3) && (char_3 < ':'))
 	{
-		date_time->year = digit(pszDateTime[0]) * 1000 + digit(pszDateTime[1]) * 100 + digit(pszDateTime[2]) * 10 + digit(pszDateTime[3]);
+		date_time->year = (char_2 << 1) + (char_2 << 3) + *pszDateTime * 1000 + char_1 * 100 + char_3 + 0x2fb0;
 	}
 	else
 	{
@@ -845,12 +599,9 @@ error_code cellRtcParseRfc3339(ppu_thread& ppu, vm::ptr<CellRtcTick> pUtc, vm::c
 		return CELL_RTC_ERROR_INVALID_YEAR;
 	}
 
-	// Month: 1995-XX-03T13:23:00.00Z
-	if (std::isdigit(pszDateTime[5]) && std::isdigit(pszDateTime[6]))
-	{
-		date_time->month = digit(pszDateTime[5]) * 10 + digit(pszDateTime[6]);
-	}
-	else
+	char_2 = pszDateTime[5];
+	char_1 = pszDateTime[6];
+	if (((9 < (char_2 - 0x30U)) || (char_1 < '0')) || (date_time->month = ((char_2 << 1) + (char_2 << 3) + char_1) - 0x210, '9' < char_1))
 	{
 		date_time->month = 0xffff;
 	}
@@ -860,12 +611,9 @@ error_code cellRtcParseRfc3339(ppu_thread& ppu, vm::ptr<CellRtcTick> pUtc, vm::c
 		return CELL_RTC_ERROR_INVALID_MONTH;
 	}
 
-	// Day: 1995-12-XXT13:23:00.00Z
-	if (std::isdigit(pszDateTime[8]) && std::isdigit(pszDateTime[9]))
-	{
-		date_time->day = digit(pszDateTime[8]) * 10 + digit(pszDateTime[9]);
-	}
-	else
+	char_2 = pszDateTime[8];
+	char_1 = pszDateTime[9];
+	if (((9 < (char_2 - 0x30U)) || (char_1 < '0')) || (date_time->day = ((char_2 << 1) + (char_2 << 3) + char_1) - 0x210, '9' < char_1))
 	{
 		date_time->day = 0xffff;
 	}
@@ -875,114 +623,138 @@ error_code cellRtcParseRfc3339(ppu_thread& ppu, vm::ptr<CellRtcTick> pUtc, vm::c
 		return CELL_RTC_ERROR_INVALID_DAY;
 	}
 
-	// Hour: 1995-12-03TXX:23:00.00Z
-	if (std::isdigit(pszDateTime[11]) && std::isdigit(pszDateTime[12]))
-	{
-		date_time->hour = digit(pszDateTime[11]) * 10 + digit(pszDateTime[12]);
-	}
-	else
+	char_2 = pszDateTime[0xb];
+	char_1 = pszDateTime[0xc];
+	if ((9 < (char_2 - 0x30U)) || ((char_1 < '0' || (date_time->hour = ((char_2 << 1) + (char_2 << 3) + char_1) - 0x210, '9' < char_1))))
 	{
 		date_time->hour = 0xffff;
 	}
 
-	if (pszDateTime[13] != ':')
+	if (pszDateTime[0xd] != ':')
 	{
 		return CELL_RTC_ERROR_INVALID_HOUR;
 	}
 
-	// Minute: 1995-12-03T13:XX:00.00Z
-	if (std::isdigit(pszDateTime[14]) && std::isdigit(pszDateTime[15]))
-	{
-		date_time->minute = digit(pszDateTime[14]) * 10 + digit(pszDateTime[15]);
-	}
-	else
+	char_2 = pszDateTime[0xe];
+	char_1 = pszDateTime[0xf];
+	if (((9 < (char_2 - 0x30U)) || (char_1 < '0')) || (date_time->minute = ((char_2 << 1) + (char_2 << 3) + char_1) - 0x210, '9' < char_1))
 	{
 		date_time->minute = 0xffff;
 	}
 
-	if (pszDateTime[16] != ':')
+	if (pszDateTime[0x10] != ':')
 	{
 		return CELL_RTC_ERROR_INVALID_MINUTE;
 	}
 
-	// Second: 1995-12-03T13:23:XX.00Z
-	if (std::isdigit(pszDateTime[17]) && std::isdigit(pszDateTime[18]))
-	{
-		date_time->second = digit(pszDateTime[17]) * 10 + digit(pszDateTime[18]);
-	}
-	else
+	char_2 = pszDateTime[0x11];
+	char_1 = pszDateTime[0x12];
+	if (((9 < (char_2 - 0x30U)) || (char_1 < '0')) || (date_time->second = ((char_2 << 1) + (char_2 << 3) + char_1) - 0x210, '9' < char_1))
 	{
 		date_time->second = 0xffff;
 	}
 
-	// Microsecond: 1995-12-03T13:23:00.XXZ
-	date_time->microsecond = 0;
-
-	u32 pos = 19;
-	if (pszDateTime[pos] == '.')
+	pc_var_5 = 0x13;
+	if (pszDateTime[0x13] == '.')
 	{
-		u32 mul = 100000;
-
-		for (char c = pszDateTime[++pos]; std::isdigit(c); c = pszDateTime[++pos])
+		date_time->microsecond = 0;
+		pc_var_5                 = 0x14;
+		if ((pszDateTime[0x14] - 0x30U) < 10)
 		{
-			date_time->microsecond += digit(c) * mul;
-			mul /= 10;
+			u_var_7                  = 10000;
+			date_time->microsecond = (pszDateTime[pc_var_5] + -0x30) * 100000;
+			while (true)
+			{
+				pc_var_5 = pc_var_5 + 1;
+				if (9 < (pszDateTime[pc_var_5] - 0x30U))
+					break;
+				date_time->microsecond += u_var_7 * (pszDateTime[pc_var_5] + -0x30);
+				if (u_var_7 == 100000)
+				{
+					u_var_7 = 10000;
+				}
+				else
+				{
+					if (u_var_7 == 10000)
+					{
+						u_var_7 = 1000;
+					}
+					else
+					{
+						if (u_var_7 == 1000)
+						{
+							u_var_7 = 100;
+						}
+						else
+						{
+							if (u_var_7 == 100)
+							{
+								u_var_7 = 10;
+							}
+							else
+							{
+								u_var_7 = ((u_var_7 ^ 10) - 1) >> 0x1f;
+							}
+						}
+					}
+				}
+			}
 		}
 	}
-
-	const char sign = pszDateTime[pos];
-
-	if (sign != 'Z' && sign != 'z' && sign != '+' && sign != '-')
+	else
 	{
-		return CELL_RTC_ERROR_BAD_PARSE;
+		date_time->microsecond = 0;
 	}
 
-	s64 minutes_to_add = 0;
-
-	// Time offset: 1995-12-03T13:23:00.00+02:30
-	if (sign == '+' || sign == '-')
+	char_1 = pszDateTime[pc_var_5];
+	if ((char_1 == 'Z') || (char_1 == 'z'))
 	{
-		if (!std::isdigit(pszDateTime[pos + 1]) ||
-			!std::isdigit(pszDateTime[pos + 2]) ||
-			pszDateTime[pos + 3] != ':' ||
-			!std::isdigit(pszDateTime[pos + 4]) ||
-			!std::isdigit(pszDateTime[pos + 5]))
+		l_add = 0;
+	}
+	else
+	{
+		if ((char_1 != '+') && (char_1 != '-'))
 		{
 			return CELL_RTC_ERROR_BAD_PARSE;
 		}
-
-		// Time offset (hours): 1995-12-03T13:23:00.00+XX:30
-		const s32 hours = digit(pszDateTime[pos + 1]) * 10 + digit(pszDateTime[pos + 2]);
-
-		// Time offset (minutes): 1995-12-03T13:23:00.00+02:XX
-		const s32 minutes = digit(pszDateTime[pos + 4]) * 10 + digit(pszDateTime[pos + 5]);
-
-		minutes_to_add = hours * 60 + minutes;
-
-		if (sign == '+')
+		char_2 = pszDateTime[pc_var_5 + 2];
+		if (((9 < (pszDateTime[pc_var_5 + 1] - 0x30U)) || (char_2 < '0')) || (i_var_6 = pszDateTime[pc_var_5 + 1] * 10 + char_2 + -0x210, '9' < char_2))
 		{
-			minutes_to_add = -minutes_to_add;
+			i_var_6 = -1;
+		}
+		char_2 = pszDateTime[pc_var_5 + 5];
+		if (((9 < (pszDateTime[pc_var_5 + 4] - 0x30U)) || (char_2 < '0')) || (i_var_8 = pszDateTime[pc_var_5 + 4] * 10 + char_2 + -0x210, '9' < char_2))
+		{
+			i_var_8 = -1;
+		}
+		if (((i_var_6 < 0) || (pszDateTime[pc_var_5 + 3] != ':')) || (i_var_8 < 0))
+		{
+			return CELL_RTC_ERROR_BAD_PARSE;
+		}
+		i_var_8 += i_var_6 * 0x3c;
+		l_add = -i_var_8;
+		if (char_1 == '-')
+		{
+			l_add = i_var_8;
 		}
 	}
 
-	cellRtcGetTick(ppu, date_time, pUtc);
-	cellRtcTickAddMinutes(ppu, pUtc, pUtc, minutes_to_add);
+	cellRtcGetTick(date_time, pUtc);
+	cellRtcTickAddMinutes(pUtc, pUtc, l_add);
 
 	return CELL_OK;
 }
 
-error_code cellRtcGetTick(ppu_thread& ppu, vm::cptr<CellRtcDateTime> pTime, vm::ptr<CellRtcTick> pTick)
+error_code cellRtcGetTick(vm::cptr<CellRtcDateTime> pTime, vm::ptr<CellRtcTick> pTick)
 {
-	cellRtc.trace("cellRtcGetTick(pTime=*0x%x, pTick=*0x%x)", pTime, pTick);
+	cellRtc.todo("cellRtcGetTick(pTime=*0x%x, pTick=*0x%x)", pTime, pTick);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pTick.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -992,124 +764,108 @@ error_code cellRtcGetTick(ppu_thread& ppu, vm::cptr<CellRtcDateTime> pTime, vm::
 		return CELL_RTC_ERROR_INVALID_VALUE;
 	}
 
-	pTick->tick = date_time_to_tick(*pTime);
-
-	return CELL_OK;
-}
-
-CellRtcDateTime tick_to_date_time(u64 tick)
-{
-	const u32 microseconds = (tick % 1000000ULL);
-	const u16 seconds      = (tick / (1000000ULL)) % 60;
-	const u16 minutes      = (tick / (60ULL * 1000000ULL)) % 60;
-	const u16 hours        = (tick / (60ULL * 60ULL * 1000000ULL)) % 24;
-	u32 days_tmp           = static_cast<u32>(tick / (24ULL * 60ULL * 60ULL * 1000000ULL));
-
-	const u32 year_400 = days_tmp / DAYS_IN_400_YEARS;
-	days_tmp -= year_400 * DAYS_IN_400_YEARS;
-
-	const u32 year_within_400_interval = (
-		days_tmp
-		- days_tmp / (DAYS_IN_4_YEARS - 1)
-		+ days_tmp / DAYS_IN_100_YEARS
-		- days_tmp / (DAYS_IN_400_YEARS - 1)
-		) / 365;
-
-	days_tmp -= year_within_400_interval * 365 + year_within_400_interval / 4 - year_within_400_interval / 100 + year_within_400_interval / 400;
-
-	const u16 years = year_400 * 400 + year_within_400_interval + 1;
-
-	const auto& month_offset = is_leap_year(years) ? MONTH_OFFSET_LEAP : MONTH_OFFSET;
-
-	u32 month_approx = days_tmp / 29;
-
-	if (month_offset[month_approx] > days_tmp)
-	{
-		month_approx--;
-	}
-
-	const u16 months = month_approx + 1;
-	days_tmp = days_tmp - month_offset[month_approx];
-
-	CellRtcDateTime date_time{
-		.year        = years,
-		.month       = months,
-		.day         = ::narrow<u16>(days_tmp + 1),
-		.hour        = hours,
-		.minute      = minutes,
-		.second      = seconds,
-		.microsecond = microseconds
-	};
-	return date_time;
-}
-
-u64 date_time_to_tick(CellRtcDateTime date_time)
-{
-	const u32 days_in_previous_years =
-		date_time.year * 365
-		+ (date_time.year + 3) / 4
-		- (date_time.year + 99) / 100
-		+ (date_time.year + 399) / 400
-		- 366;
-
-	// Not checked on LLE
-	if (date_time.month == 0u)
-	{
-		cellRtc.warning("date_time_to_tick(): month invalid, clamping to 1");
-		date_time.month = 1;
-	}
-	else if (date_time.month > 12u)
-	{
-		cellRtc.warning("date_time_to_tick(): month invalid, clamping to 12");
-		date_time.month = 12;
-	}
-
-	const u16 days_in_previous_months = is_leap_year(date_time.year) ? MONTH_OFFSET_LEAP[date_time.month - 1] : MONTH_OFFSET[date_time.month - 1];
-
-	const u32 days = days_in_previous_years + days_in_previous_months + date_time.day - 1;
-
-	u64 tick = date_time.microsecond
-	         + u64{date_time.second} * 1000000ULL
-	         + u64{date_time.minute} * 60ULL * 1000000ULL
-	         + u64{date_time.hour}   * 60ULL * 60ULL * 1000000ULL
-	         + days                  * 24ULL * 60ULL * 60ULL * 1000000ULL;
-
-	return tick;
-}
-
-error_code cellRtcSetTick(ppu_thread& ppu, vm::ptr<CellRtcDateTime> pTime, vm::cptr<CellRtcTick> pTick)
-{
-	cellRtc.trace("cellRtcSetTick(pTime=*0x%x, pTick=*0x%x)", pTime, pTick);
-
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pTime.addr(), page_attr) != CELL_OK)
+	if (!pTick)
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pTick.addr(), page_attr) != CELL_OK)
+	s64 days_in_years = ((((pTime->year * 365ULL) + ((pTime->year + 3) / 4)) - ((pTime->year + 99) / 100)) + ((pTime->year + 399) / 400) + -366);
+
+	// 1-12
+	if (1 < pTime->month)
 	{
-		return CELL_RTC_ERROR_INVALID_POINTER;
+		u32 month_idx         = pTime->month - 1;
+		u32 monthIdx_adjusted = is_leap_year(pTime->year) * 12;
+		do
+		{
+			days_in_years += DAYS_IN_MONTH[monthIdx_adjusted];
+			month_idx -= 1;
+			monthIdx_adjusted += 1;
+		} while (month_idx != 0);
 	}
 
-	*pTime = tick_to_date_time(pTick->tick);
+	pTick->tick = ((((days_in_years + (pTime->day - 1)) * 0x18 + pTime->hour) * 0x3c + pTime->minute) * 0x3c + pTime->second) * cellRtcGetTickResolution() + pTime->microsecond;
 
 	return CELL_OK;
 }
 
-error_code cellRtcTickAddTicks(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s64 lAdd)
+error_code cellRtcSetTick(vm::ptr<CellRtcDateTime> pTime, vm::cptr<CellRtcTick> pTick)
+{
+	cellRtc.todo("cellRtcSetTick(pTime=*0x%x, pTick=*0x%x)", pTime, pTick);
+
+	if (!vm::check_addr(pTime.addr()))
+	{
+		return CELL_RTC_ERROR_INVALID_POINTER;
+	}
+
+	if (!vm::check_addr(pTick.addr()))
+	{
+		return CELL_RTC_ERROR_INVALID_POINTER;
+	}
+
+	/*
+	u32 microseconds = round((pTick->tick % 1000000ULL));
+	u16 seconds      = round((pTick->tick / (1000000ULL)) % 60);
+	u16 minutes      = round((pTick->tick / (60ULL * 1000000ULL)) % 60);
+	u16 hours        = round((pTick->tick / (60ULL * 60ULL * 1000000ULL)) % 24);
+	u64 days_tmp     = round((pTick->tick / (24ULL * 60ULL * 60ULL * 1000000ULL)));*/
+
+	u32 microseconds = (pTick->tick % 1000000ULL);
+	u16 seconds      = (pTick->tick / (1000000ULL)) % 60;
+	u16 minutes      = (pTick->tick / (60ULL * 1000000ULL)) % 60;
+	u16 hours        = (pTick->tick / (60ULL * 60ULL * 1000000ULL)) % 24;
+	u64 days_tmp     = (pTick->tick / (24ULL * 60ULL * 60ULL * 1000000ULL));
+
+	u16 months = 1;
+	u16 years  = 1;
+
+	bool exit_while = false;
+	do
+	{
+		bool leap = is_leap_year(years);
+		for (u32 m = 0; m <= 11; m++)
+		{
+			u8 daysinmonth = DAYS_IN_MONTH[m + (leap * 12)];
+			if (days_tmp >= daysinmonth)
+			{
+				months++;
+				days_tmp -= daysinmonth;
+			}
+			else
+			{
+				exit_while = true;
+				break;
+			}
+			if (m == 11)
+			{
+				months = 1;
+				years++;
+			}
+		}
+
+	} while (!exit_while);
+
+	pTime->microsecond = microseconds;
+	pTime->second      = seconds;
+	pTime->minute      = minutes;
+	pTime->hour        = hours;
+	pTime->day         = days_tmp + 1;
+	pTime->month       = months;
+	pTime->year        = years;
+
+	return CELL_OK;
+}
+
+error_code cellRtcTickAddTicks(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s64 lAdd)
 {
 	cellRtc.trace("cellRtcTickAddTicks(pTick0=*0x%x, pTick1=*0x%x, lAdd=%lld)", pTick0, pTick1, lAdd);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pTick0.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick0.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pTick1.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick1.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -1119,18 +875,16 @@ error_code cellRtcTickAddTicks(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm:
 	return CELL_OK;
 }
 
-error_code cellRtcTickAddMicroseconds(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s64 lAdd)
+error_code cellRtcTickAddMicroseconds(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s64 lAdd)
 {
 	cellRtc.trace("cellRtcTickAddMicroseconds(pTick0=*0x%x, pTick1=*0x%x, lAdd=%lld)", pTick0, pTick1, lAdd);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pTick0.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick0.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pTick1.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick1.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -1140,18 +894,16 @@ error_code cellRtcTickAddMicroseconds(ppu_thread& ppu, vm::ptr<CellRtcTick> pTic
 	return CELL_OK;
 }
 
-error_code cellRtcTickAddSeconds(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s64 lAdd)
+error_code cellRtcTickAddSeconds(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s64 lAdd)
 {
 	cellRtc.trace("cellRtcTickAddSeconds(pTick0=*0x%x, pTick1=*0x%x, lAdd=%lld)", pTick0, pTick1, lAdd);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pTick0.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick0.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pTick1.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick1.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -1161,18 +913,16 @@ error_code cellRtcTickAddSeconds(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, v
 	return CELL_OK;
 }
 
-error_code cellRtcTickAddMinutes(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s64 lAdd)
+error_code cellRtcTickAddMinutes(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s64 lAdd)
 {
 	cellRtc.trace("cellRtcTickAddMinutes(pTick0=*0x%x, pTick1=*0x%x, lAdd=%lld)", pTick0, pTick1, lAdd);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pTick0.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick0.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pTick1.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick1.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -1182,18 +932,16 @@ error_code cellRtcTickAddMinutes(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, v
 	return CELL_OK;
 }
 
-error_code cellRtcTickAddHours(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 iAdd)
+error_code cellRtcTickAddHours(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 iAdd)
 {
 	cellRtc.trace("cellRtcTickAddHours(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pTick0.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick0.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pTick1.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick1.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -1203,18 +951,16 @@ error_code cellRtcTickAddHours(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm:
 	return CELL_OK;
 }
 
-error_code cellRtcTickAddDays(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 iAdd)
+error_code cellRtcTickAddDays(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 iAdd)
 {
 	cellRtc.trace("cellRtcTickAddDays(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pTick0.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick0.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pTick1.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick1.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -1224,18 +970,16 @@ error_code cellRtcTickAddDays(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm::
 	return CELL_OK;
 }
 
-error_code cellRtcTickAddWeeks(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 iAdd)
+error_code cellRtcTickAddWeeks(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 iAdd)
 {
 	cellRtc.trace("cellRtcTickAddWeeks(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pTick0.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick1.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pTick1.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick1.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -1245,99 +989,115 @@ error_code cellRtcTickAddWeeks(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm:
 	return CELL_OK;
 }
 
-error_code cellRtcTickAddMonths(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 iAdd)
+error_code cellRtcTickAddMonths(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 iAdd)
 {
-	cellRtc.notice("cellRtcTickAddMonths(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd);
+	cellRtc.trace("cellRtcTickAddMonths(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pTick0.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick0.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pTick1.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick1.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
 	vm::var<CellRtcDateTime> date_time;
-	cellRtcSetTick(ppu, date_time, pTick1);
+	cellRtcSetTick(date_time, pTick1);
 
-	const s32 total_months = date_time->year * 12 + date_time->month + iAdd - 1;
-	const u16 new_year = total_months / 12;
-	const u16 new_month = total_months - new_year * 12 + 1;
+	// Not pretty, but works
 
-	s32 month_days;
-
-	if (new_year == 0u || new_month < 1u || new_month > 12u)
+	s64 total_months     = (date_time->year * 12ULL) + date_time->month + iAdd + -1;
+	s32 total_months_s32 = total_months;
+	u32 unk_1            = total_months_s32 >> 0x1f;
+	u64 unk_2            = ((total_months_s32 / 6 + unk_1) >> 1) - unk_1;
+	u32 unk_3            = unk_2;
+	unk_1                = unk_3 & 0xffff;
+	u64 unk_4            = (total_months - ((u64{unk_3} << 4) - (unk_3 << 2))) + 1;
+	if (((unk_2 & 0xffff) == 0) || ((unk_3 = unk_4 & 0xffff, (unk_4 & 0xffff) == 0 || (0xc < unk_3))))
 	{
-		month_days = CELL_RTC_ERROR_INVALID_ARG; // LLE writes the error to this variable
+		return CELL_RTC_ERROR_INVALID_ARG;
+	}
+
+	u32 uVar1 = ((s64{unk_1} * 0x51eb851f) >> 0x20);
+
+	// Leap year check
+	u32 month_idx;
+	if ((unk_1 == (uVar1 >> 7) * 400) || ((unk_1 != (uVar1 >> 5) * 100 && ((unk_2 & 3) == 0))))
+	{
+		month_idx = unk_3 + 0xb;
 	}
 	else
 	{
-		month_days = is_leap_year(new_year) ? DAYS_IN_MONTH_LEAP[new_month - 1] : DAYS_IN_MONTH[new_month - 1];
+		month_idx = unk_3 - 1;
 	}
+	u32 month_days = DAYS_IN_MONTH[month_idx];
 
-	if (month_days < static_cast<s32>(date_time->day))
+	if (month_days < date_time->day)
 	{
-		date_time->day = static_cast<u16>(month_days);
+		date_time->day = month_days;
 	}
 
-	date_time->month = new_month;
-	date_time->year = new_year;
-	cellRtcGetTick(ppu, date_time, pTick0);
+	date_time->month = unk_4;
+	date_time->year  = unk_2;
+	cellRtcGetTick(date_time, pTick0);
 
 	return CELL_OK;
 }
 
-error_code cellRtcTickAddYears(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 iAdd)
+error_code cellRtcTickAddYears(vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s32 iAdd)
 {
-	cellRtc.notice("cellRtcTickAddYears(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd);
+	cellRtc.trace("cellRtcTickAddYears(pTick0=*0x%x, pTick1=*0x%x, iAdd=%d)", pTick0, pTick1, iAdd);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pTick0.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick0.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pTick1.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick1.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
 	vm::var<CellRtcDateTime> date_time;
-	cellRtcSetTick(ppu, date_time, pTick1);
+	cellRtcSetTick(date_time, pTick1);
 
-	const u16 month = date_time->month;
-	const u16 new_year = date_time->year + iAdd;
-
-	s32 month_days;
-
-	if (new_year == 0u || month < 1u || month > 12u)
+	u64 total_years = iAdd + date_time->year;
+	u32 unk_1       = total_years & 0xffff;
+	if (((total_years & 0xffff) == 0) || ((date_time->month == 0 || (0xc < date_time->month))))
 	{
-		month_days = CELL_RTC_ERROR_INVALID_ARG; // LLE writes the error to this variable
+		return CELL_RTC_ERROR_INVALID_ARG;
+	}
+
+	u32 uVar1 = ((s64{unk_1} * 0x51eb851f) >> 0x20);
+
+	// Leap year check
+	u32 month_idx;
+	if ((unk_1 == (uVar1 >> 7) * 400) || ((unk_1 != (uVar1 >> 5) * 100 && ((total_years & 3) == 0))))
+	{
+		month_idx = date_time->month + 0xb;
 	}
 	else
 	{
-		month_days = is_leap_year(new_year) ? DAYS_IN_MONTH_LEAP[month - 1] : DAYS_IN_MONTH[month - 1];
+		month_idx = date_time->month - 1;
 	}
+	u32 month_days = DAYS_IN_MONTH[month_idx];
 
-	if (month_days < static_cast<s32>(date_time->day))
+	if (month_days < date_time->day)
 	{
-		date_time->day = static_cast<u16>(month_days);
+		date_time->day = month_days;
 	}
 
-	date_time->year = new_year;
-	cellRtcGetTick(ppu, date_time, pTick0);
+	date_time->year = total_years;
+	cellRtcGetTick(date_time, pTick0);
 
 	return CELL_OK;
 }
 
-error_code cellRtcConvertUtcToLocalTime(ppu_thread& ppu, vm::cptr<CellRtcTick> pUtc, vm::ptr<CellRtcTick> pLocalTime)
+error_code cellRtcConvertUtcToLocalTime(vm::cptr<CellRtcTick> pUtc, vm::ptr<CellRtcTick> pLocalTime)
 {
-	cellRtc.trace("cellRtcConvertUtcToLocalTime(pUtc=*0x%x, pLocalTime=*0x%x)", pUtc, pLocalTime);
+	cellRtc.todo("cellRtcConvertUtcToLocalTime(pUtc=*0x%x, pLocalTime=*0x%x)", pUtc, pLocalTime);
 
 	vm::var<s32> timezone;
 	vm::var<s32> summertime;
@@ -1345,15 +1105,15 @@ error_code cellRtcConvertUtcToLocalTime(ppu_thread& ppu, vm::cptr<CellRtcTick> p
 	error_code ret = sys_time_get_timezone(timezone, summertime);
 	if (-1 < ret)
 	{
-		ret = cellRtcTickAddMinutes(ppu, pLocalTime, pUtc, *timezone + *summertime);
+		ret = cellRtcTickAddMinutes(pLocalTime, pUtc, s64{*timezone} + s64{*summertime});
 	}
 
 	return ret;
 }
 
-error_code cellRtcConvertLocalTimeToUtc(ppu_thread& ppu, vm::cptr<CellRtcTick> pLocalTime, vm::ptr<CellRtcTick> pUtc)
+error_code cellRtcConvertLocalTimeToUtc(vm::cptr<CellRtcTick> pLocalTime, vm::ptr<CellRtcTick> pUtc)
 {
-	cellRtc.notice("cellRtcConvertLocalTimeToUtc(pLocalTime=*0x%x, pUtc=*0x%x)", pLocalTime, pUtc);
+	cellRtc.todo("cellRtcConvertLocalTimeToUtc(pLocalTime=*0x%x, pUtc=*0x%x)", pLocalTime, pUtc);
 
 	vm::var<s32> timezone;
 	vm::var<s32> summertime;
@@ -1361,87 +1121,56 @@ error_code cellRtcConvertLocalTimeToUtc(ppu_thread& ppu, vm::cptr<CellRtcTick> p
 	error_code ret = sys_time_get_timezone(timezone, summertime);
 	if (-1 < ret)
 	{
-		ret = cellRtcTickAddMinutes(ppu, pUtc, pLocalTime, -(*timezone + *summertime));
+		ret = cellRtcTickAddMinutes(pUtc, pLocalTime, -(s64{*timezone} + s64{*summertime}));
 	}
 
 	return ret;
 }
 
-error_code cellRtcGetCurrentSecureTick(ppu_thread& ppu, vm::ptr<CellRtcTick> tick)
+error_code cellRtcGetCurrentSecureTick(vm::ptr<CellRtcTick> tick)
 {
-	cellRtc.notice("cellRtcGetCurrentSecureTick(tick=*0x%x)", tick);
+	cellRtc.todo("cellRtcGetCurrentSecureTick(*0x%x)", tick);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, tick.addr(), page_attr) != CELL_OK)
-	{
-		return CELL_RTC_ERROR_INVALID_POINTER;
-	}
-
-	tick->tick = RTC_SYSTEM_TIME_MIN;
-
-	const vm::var<u64> time{0};
-	const vm::var<u64> status{0};
-
-	error_code ret = sys_ss_secure_rtc(0x3002, 0, time.addr(), status.addr());
-
-	if (ret >= CELL_OK)
-	{
-		tick->tick += *time * cellRtcGetTickResolution();
-	}
-	else if (ret == static_cast<s32>(SYS_SS_RTC_ERROR_UNK))
-	{
-		switch (*status)
-		{
-		case 1: ret = CELL_RTC_ERROR_NO_CLOCK; break;
-		case 2: ret = CELL_RTC_ERROR_NOT_INITIALIZED; break;
-		case 4: ret = CELL_RTC_ERROR_INVALID_VALUE; break;
-		case 8: ret = CELL_RTC_ERROR_NO_CLOCK; break;
-		default: return ret;
-		}
-	}
-
-	return ret;
+	return CELL_OK;
 }
 
-error_code cellRtcGetDosTime(ppu_thread& ppu, vm::cptr<CellRtcDateTime> pDateTime, vm::ptr<u32> puiDosTime)
+error_code cellRtcGetDosTime(vm::cptr<CellRtcDateTime> pDateTime, vm::ptr<u32> puiDosTime)
 {
-	cellRtc.notice("cellRtcGetDosTime(pDateTime=*0x%x, puiDosTime=*0x%x)", pDateTime, puiDosTime);
+	cellRtc.todo("cellRtcGetDosTime(pDateTime=*0x%x, puiDosTime=*0x%x)", pDateTime, puiDosTime);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pDateTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pDateTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, puiDosTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(puiDosTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
 	if (pDateTime->year < 1980)
 	{
-		if (puiDosTime) // Should always evaluate to true, nullptr was already checked above
+		if (puiDosTime)
 		{
 			*puiDosTime = 0;
+			return -1;
 		}
-
-		return -1;
 	}
-
-	if (pDateTime->year >= 2108)
+	else if (pDateTime->year >= 2108)
 	{
-		if (puiDosTime) // Should always evaluate to true, nullptr was already checked above
+		if (puiDosTime)
 		{
 			*puiDosTime = 0xff9fbf7d; // kHighDosTime
+			return -1;
+		}
+	}
+	else
+	{
+		if (!puiDosTime)
+		{
+			return CELL_OK;
 		}
 
-		return -1;
-	}
-
-	if (puiDosTime) // Should always evaluate to true, nullptr was already checked above
-	{
 		s32 year    = ((pDateTime->year - 1980) & 0x7F) << 9;
 		s32 month   = ((pDateTime->month) & 0xF) << 5;
 		s32 hour    = ((pDateTime->hour) & 0x1F) << 11;
@@ -1451,185 +1180,196 @@ error_code cellRtcGetDosTime(ppu_thread& ppu, vm::cptr<CellRtcDateTime> pDateTim
 		s32 ymd     = year | month | day;
 		s32 hms     = hour | minute | second;
 		*puiDosTime = (ymd << 16) | hms;
+
+		return CELL_OK;
 	}
 
-	return CELL_OK;
+	return -1;
 }
 
-error_code cellRtcGetSystemTime(ppu_thread& ppu, vm::cptr<CellRtcDateTime> pDateTime, vm::ptr<s64> pTimeStamp)
+error_code cellRtcGetSystemTime(vm::cptr<CellRtcDateTime> pDateTime, vm::ptr<CellRtcTick> pTick)
 {
-	cellRtc.notice("cellRtcGetSystemTime(pDateTime=*0x%x, pTimeStamp=*0x%x)", pDateTime, pTimeStamp);
+	cellRtc.todo("cellRtcGetSystemTime(pDateTime=*0x%x, pTick=*0x%x)", pDateTime, pTick);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pDateTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pDateTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pTimeStamp.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pTick.addr()))
+	{
+		return CELL_RTC_ERROR_INVALID_POINTER;
+	}
+
+	error_code ret;
+	vm::var<CellRtcTick> tick;
+	cellRtcGetTick(pDateTime, tick);
+
+	if (tick->tick < 63082281600000000) // Max time
+	{
+		ret = CELL_RTC_ERROR_INVALID_VALUE;
+		if (pTick)
+		{
+			pTick->tick = 0;
+		}
+	}
+	else
+	{
+		if (tick->tick < 0xeb5325dc3ec23f) // 66238041600999999
+		{
+			ret = CELL_OK;
+			if (pTick)
+			{
+				pTick->tick = (tick->tick + 0xff1fe2ffc59c6000) / cellRtcGetTickResolution();
+			}
+		}
+		else
+		{
+			ret = CELL_RTC_ERROR_INVALID_VALUE;
+			if (pTick)
+			{
+				pTick->tick = 0xbc19137f; // 1 day?
+			}
+		}
+	}
+
+	return ret;
+}
+
+error_code cellRtcGetTime_t(vm::cptr<CellRtcDateTime> pDateTime, vm::ptr<s64> piTime)
+{
+	cellRtc.todo("cellRtcGetTime_t(pDateTime=*0x%x, piTime=*0x%x)", pDateTime, piTime);
+
+	if (!vm::check_addr(pDateTime.addr()))
+	{
+		return CELL_RTC_ERROR_INVALID_POINTER;
+	}
+
+	if (!vm::check_addr(piTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
 	vm::var<CellRtcTick> tick;
-	cellRtcGetTick(ppu, pDateTime, tick);
-
-	if (tick->tick < RTC_SYSTEM_TIME_MIN)
-	{
-		if (pTimeStamp) // Should always evaluate to true, nullptr was already checked above
-		{
-			*pTimeStamp = 0;
-		}
-
-		return CELL_RTC_ERROR_INVALID_VALUE;
-	}
-
-	if (tick->tick >= RTC_SYSTEM_TIME_MAX + cellRtcGetTickResolution())
-	{
-		if (pTimeStamp) // Should always evaluate to true, nullptr was already checked above
-		{
-			*pTimeStamp = (RTC_SYSTEM_TIME_MAX - RTC_SYSTEM_TIME_MIN) / cellRtcGetTickResolution();
-		}
-
-		return CELL_RTC_ERROR_INVALID_VALUE;
-	}
-
-	if (pTimeStamp) // Should always evaluate to true, nullptr was already checked above
-	{
-		*pTimeStamp = (tick->tick - RTC_SYSTEM_TIME_MIN) / cellRtcGetTickResolution();
-	}
-
-	return CELL_OK;
-}
-
-error_code cellRtcGetTime_t(ppu_thread& ppu, vm::cptr<CellRtcDateTime> pDateTime, vm::ptr<s64> piTime)
-{
-	cellRtc.trace("cellRtcGetTime_t(pDateTime=*0x%x, piTime=*0x%x)", pDateTime, piTime);
-
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pDateTime.addr(), page_attr) != CELL_OK)
-	{
-		return CELL_RTC_ERROR_INVALID_POINTER;
-	}
-
-	if (sys_memory_get_page_attribute(ppu, piTime.addr(), page_attr) != CELL_OK)
-	{
-		return CELL_RTC_ERROR_INVALID_POINTER;
-	}
-
-	vm::var<CellRtcTick> tick;
-	cellRtcGetTick(ppu, pDateTime, tick);
+	cellRtcGetTick(pDateTime, tick);
 
+	error_code ret;
 	if (tick->tick < RTC_MAGIC_OFFSET)
 	{
-		if (piTime) // Should always evaluate to true, nullptr was already checked above
+		ret = CELL_RTC_ERROR_INVALID_VALUE;
+		if (piTime)
 		{
 			*piTime = 0;
 		}
-
-		return CELL_RTC_ERROR_INVALID_VALUE;
 	}
-
-	if (piTime) // Should always evaluate to true, nullptr was already checked above
+	else
 	{
-		*piTime = (tick->tick - RTC_MAGIC_OFFSET) / cellRtcGetTickResolution();
+		ret = CELL_OK;
+		if (piTime)
+		{
+			*piTime = (tick->tick + 0xff23400100d44000) / cellRtcGetTickResolution();
+		}
 	}
 
-	return CELL_OK;
+	return ret;
 }
 
-error_code cellRtcGetWin32FileTime(ppu_thread& ppu, vm::cptr<CellRtcDateTime> pDateTime, vm::ptr<u64> pulWin32FileTime)
+error_code cellRtcGetWin32FileTime(vm::cptr<CellRtcDateTime> pDateTime, vm::ptr<u64> pulWin32FileTime)
 {
-	cellRtc.notice("cellRtcGetWin32FileTime(pDateTime=*0x%x, pulWin32FileTime=*0x%x)", pDateTime, pulWin32FileTime);
+	cellRtc.todo("cellRtcGetWin32FileTime(pDateTime=*0x%x, pulWin32FileTime=*0x%x)", pDateTime, pulWin32FileTime);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pDateTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pDateTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (sys_memory_get_page_attribute(ppu, pulWin32FileTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pulWin32FileTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
 	vm::var<CellRtcTick> tick;
-	cellRtcGetTick(ppu, pDateTime, tick);
+	cellRtcGetTick(pDateTime, tick);
 
+	error_code ret;
 	if (tick->tick < RTC_FILETIME_OFFSET)
 	{
-		if (pulWin32FileTime) // Should always evaluate to true, nullptr was already checked above
+		ret = CELL_RTC_ERROR_INVALID_VALUE;
+		if (pulWin32FileTime)
 		{
 			*pulWin32FileTime = 0;
 		}
-
-		return CELL_RTC_ERROR_INVALID_VALUE;
 	}
-
-	if (pulWin32FileTime) // Should always evaluate to true, nullptr was already checked above
+	else
 	{
-		*pulWin32FileTime = (tick->tick - RTC_FILETIME_OFFSET) * 10;
+		ret = CELL_OK;
+		if (pulWin32FileTime)
+		{
+			*pulWin32FileTime = tick->tick * 10 + 0xf8fe31e8dd890000;
+		}
 	}
 
-	return CELL_OK;
+	return ret;
 }
 
 error_code cellRtcSetCurrentSecureTick(vm::ptr<CellRtcTick> pTick)
 {
-	cellRtc.notice("cellRtcSetCurrentSecureTick(pTick=*0x%x)", pTick);
+	cellRtc.todo("cellRtcSetCurrentSecureTick(pTick=*0x%x)", pTick);
 
 	if (!pTick)
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (pTick->tick > RTC_SYSTEM_TIME_MAX)
+	u64 uVar1 = pTick->tick + 0xff1fe2ffc59c6000;
+	if (uVar1 >= 0xb3625a1cbe000) // 3155760000000000
 	{
 		return CELL_RTC_ERROR_INVALID_VALUE;
 	}
 
-	return sys_ss_secure_rtc(0x3003, (pTick->tick - RTC_SYSTEM_TIME_MIN) / cellRtcGetTickResolution(), 0, 0);
+	return set_secure_rtc_time(uVar1 / cellRtcGetTickResolution());
 }
 
 error_code cellRtcSetCurrentTick(vm::cptr<CellRtcTick> pTick)
 {
-	cellRtc.notice("cellRtcSetCurrentTick(pTick=*0x%x)", pTick);
+	cellRtc.todo("cellRtcSetCurrentTick(pTick=*0x%x)", pTick);
 
 	if (!pTick)
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
-	if (pTick->tick < RTC_MAGIC_OFFSET)
+	//u64 tmp = pTick->tick + 0xff23400100d44000;
+	if (!(0xdcbffeff2bbfff < pTick->tick))
 	{
-		return CELL_RTC_ERROR_INVALID_VALUE;
+		return CELL_RTC_ERROR_INVALID_ARG;
 	}
 
-	const u64 unix_time = pTick->tick - RTC_MAGIC_OFFSET;
+	// TODO syscall not implemented
+	/*
+	u32 tmp2 = sys_time_get_system_time(tmp / cellRtcGetTickResolution(), (tmp % cellRtcGetTickResolution()) * 1000);
 
-	const error_code ret = sys_time_set_current_time(unix_time / cellRtcGetTickResolution(), unix_time % cellRtcGetTickResolution() * 1000);
-
-	return ret >= CELL_OK ? CELL_OK : ret;
+	return (tmp2 & (tmp2 | tmp2 - 1) >> 0x1f);
+	*/
+	return CELL_OK;
 }
 
 error_code cellRtcSetConf(s64 unk1, s64 unk2, u32 timezone, u32 summertime)
 {
-	cellRtc.notice("cellRtcSetConf(unk1=0x%x, unk2=0x%x, timezone=%d, summertime=%d)", unk1, unk2, timezone, summertime);
+	cellRtc.todo("cellRtcSetConf(unk1=0x%x, unk2=0x%x, timezone=%d, summertime=%d)", unk1, unk2, timezone, summertime);
 	// Seems the first 2 args are ignored :|
 
-	return sys_time_set_timezone(timezone, summertime);
+	// TODO Syscall not implemented
+	// return sys_time_set_timezone(timezone, summertime);
+
+	return CELL_OK;
 }
 
-error_code cellRtcSetDosTime(ppu_thread& ppu, vm::ptr<CellRtcDateTime> pDateTime, u32 uiDosTime)
+error_code cellRtcSetDosTime(vm::ptr<CellRtcDateTime> pDateTime, u32 uiDosTime)
 {
-	cellRtc.notice("cellRtcSetDosTime(pDateTime=*0x%x, uiDosTime=0x%x)", pDateTime, uiDosTime);
+	cellRtc.todo("cellRtcSetDosTime(pDateTime=*0x%x, uiDosTime=0x%x)", pDateTime, uiDosTime);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pDateTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pDateTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -1648,19 +1388,17 @@ error_code cellRtcSetDosTime(ppu_thread& ppu, vm::ptr<CellRtcDateTime> pDateTime
 	return CELL_OK;
 }
 
-constexpr u32 cellRtcGetTickResolution()
+u32 cellRtcGetTickResolution()
 {
 	// Amount of ticks in a second
 	return 1000000;
 }
 
-error_code cellRtcSetTime_t(ppu_thread& ppu, vm::ptr<CellRtcDateTime> pDateTime, u64 iTime)
+error_code cellRtcSetTime_t(vm::ptr<CellRtcDateTime> pDateTime, u64 iTime)
 {
-	cellRtc.notice("cellRtcSetTime_t(pDateTime=*0x%x, iTime=0x%llx)", pDateTime, iTime);
+	cellRtc.todo("cellRtcSetTime_t(pDateTime=*0x%x, iTime=0x%llx)", pDateTime, iTime);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pDateTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pDateTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -1668,37 +1406,31 @@ error_code cellRtcSetTime_t(ppu_thread& ppu, vm::ptr<CellRtcDateTime> pDateTime,
 	vm::var<CellRtcTick> tick;
 	tick->tick = iTime * cellRtcGetTickResolution() + RTC_MAGIC_OFFSET;
 
-	cellRtcSetTick(ppu, pDateTime, tick);
+	cellRtcSetTick(pDateTime, tick);
 
 	return CELL_OK;
 }
 
-error_code cellRtcSetSystemTime(ppu_thread& ppu, vm::ptr<CellRtcDateTime> pDateTime, u64 iTime)
+error_code cellRtcSetSystemTime(vm::ptr<CellRtcDateTime> pDateTime, u64 iTime)
 {
-	cellRtc.notice("cellRtcSetSystemTime(pDateTime=*0x%x, iTime=0x%llx)", pDateTime, iTime);
+	cellRtc.todo("cellRtcSetSystemTime(pDateTime=*0x%x, iTime=0x%llx)", pDateTime, iTime);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pDateTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pDateTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
 
 	vm::var<CellRtcTick> tick;
-	tick->tick = iTime * cellRtcGetTickResolution() + RTC_SYSTEM_TIME_MIN;
+	tick->tick = iTime * cellRtcGetTickResolution() + 0xe01d003a63a000;
 
-	cellRtcSetTick(ppu, pDateTime, tick);
-
-	return CELL_OK;
+	return cellRtcSetTick(pDateTime, tick);
 }
 
-error_code cellRtcSetWin32FileTime(ppu_thread& ppu, vm::ptr<CellRtcDateTime> pDateTime, u64 ulWin32FileTime)
+error_code cellRtcSetWin32FileTime(vm::ptr<CellRtcDateTime> pDateTime, u64 ulWin32FileTime)
 {
-	cellRtc.notice("cellRtcSetWin32FileTime(pDateTime=*0x%x, ulWin32FileTime=0x%llx)", pDateTime, ulWin32FileTime);
+	cellRtc.todo("cellRtcSetWin32FileTime(pDateTime=*0x%x, ulWin32FileTime=0x%llx)", pDateTime, ulWin32FileTime);
 
-	const vm::var<sys_page_attr_t> page_attr;
-
-	if (sys_memory_get_page_attribute(ppu, pDateTime.addr(), page_attr) != CELL_OK)
+	if (!vm::check_addr(pDateTime.addr()))
 	{
 		return CELL_RTC_ERROR_INVALID_POINTER;
 	}
@@ -1706,14 +1438,14 @@ error_code cellRtcSetWin32FileTime(ppu_thread& ppu, vm::ptr<CellRtcDateTime> pDa
 	vm::var<CellRtcTick> tick;
 	tick->tick = ulWin32FileTime / 10 + RTC_FILETIME_OFFSET;
 
-	return cellRtcSetTick(ppu, pDateTime, tick);
+	return cellRtcSetTick(pDateTime, tick);
 }
 
 error_code cellRtcIsLeapYear(s32 year)
 {
-	cellRtc.notice("cellRtcIsLeapYear(year=%d)", year);
+	cellRtc.todo("cellRtcIsLeapYear(year=%d)", year);
 
-	if (year < 1)
+	if (year < 0)
 	{
 		return CELL_RTC_ERROR_INVALID_ARG;
 	}
@@ -1723,36 +1455,38 @@ error_code cellRtcIsLeapYear(s32 year)
 
 error_code cellRtcGetDaysInMonth(s32 year, s32 month)
 {
-	cellRtc.notice("cellRtcGetDaysInMonth(year=%d, month=%d)", year, month);
+	cellRtc.todo("cellRtcGetDaysInMonth(year=%d, month=%d)", year, month);
 
-	if ((year <= 0) || (month <= 0) || (month > 12))
+	if ((year < 0) || (month < 0) || (month > 12))
 	{
 		return CELL_RTC_ERROR_INVALID_ARG;
 	}
 
-	return not_an_error(is_leap_year(year) ? DAYS_IN_MONTH_LEAP[month - 1] : DAYS_IN_MONTH[month - 1]);
+	if (is_leap_year(year))
+	{
+		return not_an_error(DAYS_IN_MONTH[month + 11]);
+	}
+
+	return not_an_error(DAYS_IN_MONTH[month + -1]);
 }
 
-s32 cellRtcGetDayOfWeek(s32 year, s32 month, s32 day)
+error_code cellRtcGetDayOfWeek(s32 year, s32 month, s32 day)
 {
 	cellRtc.trace("cellRtcGetDayOfWeek(year=%d, month=%d, day=%d)", year, month, day);
 
-	if (month == 1 || month == 2)
+	if (month - 1 < 2)
 	{
-		year--;
-		month += 12;
+		year -= 1;
+		month += 0xc;
 	}
 
-	return ((month * 13 + 8) / 5 + year + year / 4 - year / 100 + year / 400 + day) % 7;
+	return not_an_error(((month * 0xd + 8) / 5 + ((year + (year >> 2) + (year < 0 && (year & 3U) != 0)) - year / 100) + year / 400 + day) % 7);
 }
 
 error_code cellRtcCheckValid(vm::cptr<CellRtcDateTime> pTime)
 {
-	cellRtc.notice("cellRtcCheckValid(pTime=*0x%x)", pTime);
-
-	ensure(!!pTime); // Not checked on LLE
-
-	cellRtc.notice("cellRtcCheckValid year: %d, month: %d, day: %d, hour: %d, minute: %d, second: %d, microsecond: %d", pTime->year, pTime->month, pTime->day, pTime->hour, pTime->minute, pTime->second, pTime->microsecond);
+	cellRtc.todo("cellRtcCheckValid(pTime=*0x%x)", pTime);
+	cellRtc.todo("cellRtcCheckValid year: %d, month: %d, day: %d, hour: %d, minute: %d, second: %d, microsecond: %d\n", pTime->year, pTime->month, pTime->day, pTime->hour, pTime->minute, pTime->second, pTime->microsecond);
 
 	if (pTime->year == 0 || pTime->year >= 10000)
 	{
@@ -1764,9 +1498,19 @@ error_code cellRtcCheckValid(vm::cptr<CellRtcDateTime> pTime)
 		return CELL_RTC_ERROR_INVALID_MONTH;
 	}
 
-	const auto& days_in_month = is_leap_year(pTime->year) ? DAYS_IN_MONTH_LEAP : DAYS_IN_MONTH;
+	s32 month_idx;
 
-	if (pTime->day == 0 || pTime->day > days_in_month[pTime->month - 1])
+	if (is_leap_year(pTime->year))
+	{
+		// Leap year check
+		month_idx = pTime->month + 11;
+	}
+	else
+	{
+		month_idx = pTime->month - 1;
+	}
+
+	if (pTime->day == 0 || pTime->day > DAYS_IN_MONTH[month_idx])
 	{
 		return CELL_RTC_ERROR_INVALID_DAY;
 	}
@@ -1794,11 +1538,9 @@ error_code cellRtcCheckValid(vm::cptr<CellRtcDateTime> pTime)
 	return CELL_OK;
 }
 
-s32 cellRtcCompareTick(vm::cptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1)
+error_code cellRtcCompareTick(vm::cptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1)
 {
-	cellRtc.notice("cellRtcCompareTick(pTick0=*0x%x, pTick1=*0x%x)", pTick0, pTick1);
-
-	ensure(!!pTick0 && !!pTick1); // Not checked on LLE
+	cellRtc.todo("cellRtcCompareTick(pTick0=*0x%x, pTick1=*0x%x)", pTick0, pTick1);
 
 	s32 ret = -1;
 	if (pTick1->tick <= pTick0->tick)
@@ -1806,7 +1548,7 @@ s32 cellRtcCompareTick(vm::cptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick
 		ret = pTick1->tick < pTick0->tick;
 	}
 
-	return ret;
+	return not_an_error(ret);
 }
 
 DECLARE(ppu_module_manager::cellRtc)
diff --git a/rpcs3/Emu/Cell/Modules/cellRtc.h b/rpcs3/Emu/Cell/Modules/cellRtc.h
index 52c89bab1e..39539e643c 100644
--- a/rpcs3/Emu/Cell/Modules/cellRtc.h
+++ b/rpcs3/Emu/Cell/Modules/cellRtc.h
@@ -29,43 +29,24 @@ struct CellRtcTick
 
 struct CellRtcDateTime
 {
-	be_t<u16> year;        // 1 to 9999
-	be_t<u16> month;       // 1 to 12
-	be_t<u16> day;         // 1 to 31
-	be_t<u16> hour;        // 0 to 23
-	be_t<u16> minute;      // 0 to 59
-	be_t<u16> second;      // 0 to 59
-	be_t<u32> microsecond; // 0 to 999999
+	be_t<u16> year;
+	be_t<u16> month;
+	be_t<u16> day;
+	be_t<u16> hour;
+	be_t<u16> minute;
+	be_t<u16> second;
+	be_t<u32> microsecond;
 };
 
-constexpr u64 RTC_MAGIC_OFFSET    = 62135596800000000ull; // 1970-01-01 00:00:00.000000
-constexpr u64 RTC_FILETIME_OFFSET = 50491123200000000ull; // 1601-01-01 00:00:00.000000
-constexpr u64 RTC_SYSTEM_TIME_MIN = 63082281600000000ull; // 2000-01-01 00:00:00.000000
-constexpr u64 RTC_SYSTEM_TIME_MAX = 66238041599999999ull; // 2099-12-31 23:59:59.999999
+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);
 
-constexpr u32 DAYS_IN_400_YEARS = 365 * 400 + 97;
-constexpr u16 DAYS_IN_100_YEARS = 365 * 100 + 24;
-constexpr u16 DAYS_IN_4_YEARS   = 365 *   4 +  1;
-
-constexpr std::array<u8, 12> DAYS_IN_MONTH      = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-constexpr std::array<u8, 12> DAYS_IN_MONTH_LEAP = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-
-constexpr std::array<u16, 13> MONTH_OFFSET      = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, umax };
-constexpr std::array<u16, 13> MONTH_OFFSET_LEAP = { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, umax };
-
-constexpr std::array<std::string_view, 7>  WEEKDAY_NAMES   = { "sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday" };
-constexpr std::array<std::string_view, 12> MONTH_NAMES     = { "january", "february", "march", "april", "may", "june", "july", "august", "september", "october", "november", "december" };
-constexpr std::array<std::string_view, 70> TIME_ZONE_NAMES = { "gmt", "est", "edt", "cst", "cdt", "mst", "mdt", "pst", "pdt", "nzdt", "nzst", "idle", "nzt", "aesst", "acsst", "cadt", "sadt", "aest", "east", "gst", "ligt", "acst", "sast", "cast", "awsst", "jst", "kst", "wdt", "mt", "awst", "cct", "wadt", "wst", "jt", "wast", "it", "bt", "eetdst", "eet", "cetdst", "fwt", "ist", "mest", "metdst", "sst", "bst", "cet", "dnt", "fst", "met", "mewt", "mez", "nor", "set", "swt", "wetdst", "wet", "wat", "ndt", "adt", "nft", "nst", "ast", "ydt", "hdt", "yst", "ahst", "cat", "nt", "idlw" };
-constexpr std::array<s8, 70> TIME_ZONE_VALUES              = {     0,   -10,    -8,   -12,   -10,   -14,   -12,   -16,   -14,     26,     24,     24,    24,      22,      21,     21,     21,     20,     20,    20,     20,     19,     19,     19,      18,    18,    18,    18,   17,     16,    16,     16,    16,   15,     14,    7,    6,        6,     4,        4,     4,     4,      4,        4,     4,     2,     2,     2,     2,     2,      2,     2,     2,     2,     2,        2,     0,    -2,    -3,    -6,    -5,    -5,    -8,   -16,   -18,   -18,    -20,   -20,  -22,    -24 }; // In units of 30 minutes
-
-error_code cellRtcTickAddMinutes(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick0, vm::cptr<CellRtcTick> pTick1, s64 lAdd);
-
-error_code cellRtcSetTick(ppu_thread& ppu, vm::ptr<CellRtcDateTime> pTime, vm::cptr<CellRtcTick> pTick);
-constexpr u32 cellRtcGetTickResolution();
+error_code cellRtcSetTick(vm::ptr<CellRtcDateTime> pTime, vm::cptr<CellRtcTick> pTick);
+u32 cellRtcGetTickResolution();
 error_code cellRtcCheckValid(vm::cptr<CellRtcDateTime> pTime);
-s32 cellRtcGetDayOfWeek(s32 year, s32 month, s32 day);
-error_code cellRtcGetTick(ppu_thread& ppu, vm::cptr<CellRtcDateTime> pTime, vm::ptr<CellRtcTick> pTick);
-error_code cellRtcGetCurrentTick(ppu_thread& ppu, vm::ptr<CellRtcTick> pTick);
-
-CellRtcDateTime tick_to_date_time(u64 tick);
-u64 date_time_to_tick(CellRtcDateTime date_time);
+error_code cellRtcGetDayOfWeek(s32 year, s32 month, s32 day);
+error_code cellRtcGetTick(vm::cptr<CellRtcDateTime> pTime, vm::ptr<CellRtcTick> pTick);
diff --git a/rpcs3/Emu/Cell/Modules/cellSail.cpp b/rpcs3/Emu/Cell/Modules/cellSail.cpp
index 76a6d3c6fd..3fd558beb6 100644
--- a/rpcs3/Emu/Cell/Modules/cellSail.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSail.cpp
@@ -639,7 +639,7 @@ error_code cellSailPlayerInitialize2(ppu_thread& ppu,
 	pSelf->paused = true;
 
 	{
-		CellSailEvent event{};
+		CellSailEvent event;
 		event.u32x2.major = CELL_SAIL_EVENT_PLAYER_STATE_CHANGED;
 		event.u32x2.minor = 0;
 		pSelf->callback(ppu, pSelf->callbackArg, event, CELL_SAIL_PLAYER_STATE_INITIALIZED, 0);
@@ -778,7 +778,7 @@ error_code cellSailPlayerBoot(ppu_thread& ppu, vm::ptr<CellSailPlayer> pSelf, u6
 	cellSail.warning("cellSailPlayerBoot(pSelf=*0x%x, userParam=%d)", pSelf, userParam);
 
 	{
-		CellSailEvent event{};
+		CellSailEvent event;
 		event.u32x2.major = CELL_SAIL_EVENT_PLAYER_STATE_CHANGED;
 		event.u32x2.minor = 0;
 		pSelf->callback(ppu, pSelf->callbackArg, event, CELL_SAIL_PLAYER_STATE_BOOT_TRANSITION, 0);
@@ -788,7 +788,7 @@ error_code cellSailPlayerBoot(ppu_thread& ppu, vm::ptr<CellSailPlayer> pSelf, u6
 	pSelf->booted = true;
 
 	{
-		CellSailEvent event{};
+		CellSailEvent event;
 		event.u32x2.major = CELL_SAIL_EVENT_PLAYER_CALL_COMPLETED;
 		event.u32x2.minor = CELL_SAIL_PLAYER_CALL_BOOT;
 		pSelf->callback(ppu, pSelf->callbackArg, event, 0, 0);
diff --git a/rpcs3/Emu/Cell/Modules/cellSail.h b/rpcs3/Emu/Cell/Modules/cellSail.h
index 91e66dc5f0..7cad924f6a 100644
--- a/rpcs3/Emu/Cell/Modules/cellSail.h
+++ b/rpcs3/Emu/Cell/Modules/cellSail.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include "Emu/Memory/vm_ptr.h"
 #include "cellVpost.h"
 
+#include "Emu/Memory/vm_ptr.h"
+
 // Error Codes
 enum CellSailError : u32
 {
@@ -673,11 +674,11 @@ union CellSailEvent
 	be_t<u64> value;
 };
 
-template <typename T>
+template<typename T, typename>
 struct ppu_gpr_cast_impl;
 
-template <>
-struct ppu_gpr_cast_impl<CellSailEvent>
+template<>
+struct ppu_gpr_cast_impl<CellSailEvent, void>
 {
 	static inline u64 to(const CellSailEvent& event)
 	{
diff --git a/rpcs3/Emu/Cell/Modules/cellSailRec.cpp b/rpcs3/Emu/Cell/Modules/cellSailRec.cpp
index c7a3cba549..e6d7d58e5d 100644
--- a/rpcs3/Emu/Cell/Modules/cellSailRec.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSailRec.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
+#include "cellSail.h"
 
 LOG_CHANNEL(cellSailRec);
 
diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp
index 7ae96fa64d..beaa72d199 100644
--- a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp
@@ -3,16 +3,12 @@
 #include "Emu/VFS.h"
 #include "Emu/IdManager.h"
 #include "Emu/localized_string.h"
-#include "Emu/savestate_utils.hpp"
 #include "Emu/Cell/lv2/sys_fs.h"
 #include "Emu/Cell/lv2/sys_sync.h"
 #include "Emu/Cell/lv2/sys_process.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/timers.hpp"
 #include "Emu/Cell/Modules/cellSysutil.h"
 #include "Emu/Cell/Modules/cellUserInfo.h"
-#include "Emu/RSX/Overlays/overlay_message.h"
-#include "Emu/system_config.h"
 
 #include "cellSaveData.h"
 #include "cellMsgDialog.h"
@@ -20,7 +16,6 @@
 #include "Loader/PSF.h"
 #include "Utilities/StrUtil.h"
 #include "Utilities/date_time.h"
-#include "Utilities/sema.h"
 
 #include <mutex>
 #include <algorithm>
@@ -96,10 +91,6 @@ enum : u32
 	SAVEDATA_OP_FIXED_SAVE     = 6,
 	SAVEDATA_OP_FIXED_LOAD     = 7,
 
-	SAVEDATA_OP_LIST_IMPORT    = 9,
-	SAVEDATA_OP_LIST_EXPORT    = 10,
-	SAVEDATA_OP_FIXED_IMPORT   = 11,
-	SAVEDATA_OP_FIXED_EXPORT   = 12,
 	SAVEDATA_OP_LIST_DELETE    = 13,
 	SAVEDATA_OP_FIXED_DELETE   = 14,
 };
@@ -126,94 +117,8 @@ struct savedata_manager
 {
 	semaphore<> mutex;
 	atomic_t<bool> enable_overlay{false};
-	atomic_t<s32> last_cbresult_error_dialog{0}; // CBRESULT errors are negative
 };
 
-int check_filename(std::string_view file_path, bool disallow_system_files, bool account_sfo_pfd)
-{
-	if (file_path.size() >= CELL_SAVEDATA_FILENAME_SIZE)
-	{
-		// ****** sysutil savedata parameter error : 71 ******
-		return 71;
-	}
-
-	auto dotpos = file_path.find_last_of('.');
-
-	if (dotpos == umax)
-	{
-		// Point to end of string instead
-		dotpos = file_path.size();
-	}
-
-	if (file_path.empty() || dotpos > 8u || file_path.size() - dotpos > 4u)
-	{
-		// ****** sysutil savedata parameter error : 70 ******
-		return 70;
-	}
-
-	if (file_path == "."sv || (!account_sfo_pfd && (file_path == "PARAM.SFO"sv || file_path == "PARAM.PFD"sv)))
-	{
-		// ****** sysutil savedata parameter error : 70 ******
-		return 70;
-	}
-
-	char name[CELL_SAVEDATA_FILENAME_SIZE + 3];
-
-	if (dotpos)
-	{
-		// Copy file name
-		std::span dst(name, dotpos + 1);
-		strcpy_trunc(dst, file_path);
-
-		// Allow multiple '.' even though sysutil_check_name_string does not
-		std::replace(name, name + dotpos, '.', '-');
-
-		// Allow '_' at start even though sysutil_check_name_string does not
-		if (name[0] == '_')
-		{
-			name[0] = '-';
-		}
-
-		if (disallow_system_files && ((dotpos >= 5u && std::memcmp(name, "PARAM", 5) == 0) ||
-			(dotpos >= 4u && std::memcmp(name, "ICON", 4) == 0) ||
-			(dotpos >= 3u && std::memcmp(name, "PIC", 3) == 0) ||
-			(dotpos >= 3u && std::memcmp(name, "SND", 3) == 0)))
-		{
-			// ****** sysutil savedata parameter error : 70 ******
-			return 70;
-		}
-
-		// Check filename
-		if (sysutil_check_name_string(name, 1, 9) == -1)
-		{
-			// ****** sysutil savedata parameter error : 70 ******
-			return 70;
-		}
-	}
-
-	if (file_path.size() > dotpos + 1)
-	{
-		// Copy file extension
-		std::span dst(name, file_path.size() - dotpos);
-		strcpy_trunc(dst, file_path.substr(dotpos + 1));
-
-		// Allow '_' at start even though sysutil_check_name_string does not
-		if (name[0] == '_')
-		{
-			name[0] = '-';
-		}
-
-		// Check file extension
-		if (sysutil_check_name_string(name, 1, 4) == -1)
-		{
-			// ****** sysutil savedata parameter error : 70 ******
-			return 70;
-		}
-	}
-
-	return 0;
-}
-
 static std::vector<SaveDataEntry> get_save_entries(const std::string& base_dir, const std::string& prefix)
 {
 	std::vector<SaveDataEntry> save_entries;
@@ -237,23 +142,23 @@ static std::vector<SaveDataEntry> get_save_entries(const std::string& base_dir,
 		}
 
 		// PSF parameters
-		const psf::registry psf = psf::load_object(base_dir + entry.name + "/PARAM.SFO");
+		const psf::registry psf = psf::load_object(fs::file(base_dir + entry.name + "/PARAM.SFO"));
 
 		if (psf.empty())
 		{
 			continue;
 		}
 
-		SaveDataEntry save_entry {};
-		save_entry.dirName   = psf::get_string(psf, "SAVEDATA_DIRECTORY");
-		save_entry.listParam = psf::get_string(psf, "SAVEDATA_LIST_PARAM");
-		save_entry.title     = psf::get_string(psf, "TITLE");
-		save_entry.subtitle  = psf::get_string(psf, "SUB_TITLE");
-		save_entry.details   = psf::get_string(psf, "DETAIL");
+		SaveDataEntry save_entry;
+		save_entry.dirName   = psf.at("SAVEDATA_DIRECTORY").as_string();
+		save_entry.listParam = psf.at("SAVEDATA_LIST_PARAM").as_string();
+		save_entry.title     = psf.at("TITLE").as_string();
+		save_entry.subtitle  = psf.at("SUB_TITLE").as_string();
+		save_entry.details   = psf.at("DETAIL").as_string();
 
 		for (const auto& entry2 : fs::dir(base_dir + entry.name))
 		{
-			if (entry2.is_directory || check_filename(vfs::unescape(entry2.name), false, true))
+			if (entry2.is_directory)
 			{
 				continue;
 			}
@@ -277,14 +182,6 @@ static std::vector<SaveDataEntry> get_save_entries(const std::string& base_dir,
 
 static error_code select_and_delete(ppu_thread& ppu)
 {
-	std::unique_lock hle_lock(g_fxo->get<hle_locks_t>(), std::try_to_lock);
-
-	if (!hle_lock)
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
 	std::unique_lock lock(g_fxo->get<savedata_manager>().mutex, std::try_to_lock);
 
 	if (!lock)
@@ -307,7 +204,7 @@ static error_code select_and_delete(ppu_thread& ppu)
 		// Display a blocking Save Data List asynchronously in the GUI thread.
 		if (auto save_dialog = Emu.GetCallbacks().get_save_dialog())
 		{
-			selected = save_dialog->ShowSaveDataList(base_dir, save_entries, focused, SAVEDATA_OP_LIST_DELETE, vm::null, g_fxo->get<savedata_manager>().enable_overlay);
+			selected = save_dialog->ShowSaveDataList(save_entries, focused, SAVEDATA_OP_LIST_DELETE, vm::null, g_fxo->get<savedata_manager>().enable_overlay);
 		}
 
 		// Reschedule after a blocking dialog returns
@@ -326,7 +223,7 @@ static error_code select_and_delete(ppu_thread& ppu)
 		focused = save_entries.empty() ? -1 : selected;
 
 		// Get information from the selected entry
-		const SaveDataEntry& entry = ::at32(save_entries, selected);
+		SaveDataEntry entry    = save_entries[selected];
 		const std::string info = entry.title + "\n" + entry.subtitle + "\n" + entry.details;
 
 		// Reusable display message string
@@ -336,8 +233,7 @@ static error_code select_and_delete(ppu_thread& ppu)
 		lv2_obj::sleep(ppu);
 
 		// Get user confirmation by opening a blocking dialog
-		s32 return_code = CELL_MSGDIALOG_BUTTON_NONE;
-		error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_YESNO, vm::make_str(msg), msg_dialog_source::_cellSaveData, vm::null, vm::null, vm::null, &return_code);
+		error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_YESNO, vm::make_str(msg));
 
 		// Reschedule after a blocking dialog returns
 		if (ppu.check_state())
@@ -350,7 +246,7 @@ static error_code select_and_delete(ppu_thread& ppu)
 			return CELL_SAVEDATA_ERROR_INTERNAL;
 		}
 
-		if (return_code == CELL_MSGDIALOG_BUTTON_YES)
+		if (g_last_user_response.load() == CELL_MSGDIALOG_BUTTON_YES)
 		{
 			// Remove directory
 			const std::string path = base_dir + save_entries[selected].escaped;
@@ -374,7 +270,7 @@ static error_code select_and_delete(ppu_thread& ppu)
 			lv2_obj::sleep(ppu);
 
 			// Display success message by opening a blocking dialog (return value should be irrelevant here)
-			res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_OK, vm::make_str(msg), msg_dialog_source::_cellSaveData);
+			res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_OK, vm::make_str(msg));
 
 			// Reschedule after blocking dialog returns
 			if (ppu.check_state())
@@ -416,18 +312,15 @@ static error_code display_callback_result_error_message(ppu_thread& ppu, const C
 		return {CELL_SAVEDATA_ERROR_PARAM, "22"};
 	}
 
-	if (errDialog == CELL_SAVEDATA_ERRDIALOG_NONE ||
-		(errDialog == CELL_SAVEDATA_ERRDIALOG_NOREPEAT && result.result == g_fxo->get<savedata_manager>().last_cbresult_error_dialog.exchange(result.result)))
-	{
-		// TODO: Find out if the "last error" is always tracked or only when NOREPEAT is set
+	// TODO: errDialog == CELL_SAVEDATA_ERRDIALOG_NOREPEAT
+	if (errDialog != CELL_SAVEDATA_ERRDIALOG_ALWAYS)
 		return CELL_SAVEDATA_ERROR_CBRESULT;
-	}
 
 	// Yield before a blocking dialog is being spawned
 	lv2_obj::sleep(ppu);
 
 	// Get user confirmation by opening a blocking dialog (return value should be irrelevant here)
-	[[maybe_unused]] error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_OK, use_invalid_message ? result.invalidMsg : vm::make_str(msg), msg_dialog_source::_cellSaveData);
+	[[maybe_unused]] error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_OK, use_invalid_message ? result.invalidMsg : vm::make_str(msg));
 
 	// Reschedule after a blocking dialog returns
 	if (ppu.check_state())
@@ -460,7 +353,7 @@ static std::string get_confirmation_message(u32 operation, const SaveDataEntry&
 
 static s32 savedata_check_args(u32 operation, u32 version, vm::cptr<char> dirName,
 	u32 errDialog, PSetList setList, PSetBuf setBuf, PFuncList funcList, PFuncFixed funcFixed, PFuncStat funcStat,
-	PFuncFile funcFile, u32 /*container*/, u32 unk_op_flags, vm::ptr<void> /*userdata*/, u32 userId, PFuncDone funcDone)
+	PFuncFile funcFile, u32 /*container*/, u32 unk_op_flags, vm::ptr<void> /*userdata*/, u32 userId, PFuncDone /*funcDone*/)
 {
 	if (version > CELL_SAVEDATA_VERSION_420)
 	{
@@ -474,7 +367,7 @@ static s32 savedata_check_args(u32 operation, u32 version, vm::cptr<char> dirNam
 		return 5;
 	}
 
-	if (operation <= SAVEDATA_OP_AUTO_LOAD || operation == SAVEDATA_OP_FIXED_IMPORT || operation == SAVEDATA_OP_FIXED_EXPORT)
+	if (operation <= SAVEDATA_OP_AUTO_LOAD)
 	{
 		if (!dirName)
 		{
@@ -499,9 +392,7 @@ static s32 savedata_check_args(u32 operation, u32 version, vm::cptr<char> dirNam
 		}
 	}
 
-	if ((operation >= SAVEDATA_OP_LIST_AUTO_SAVE && operation <= SAVEDATA_OP_FIXED_LOAD) ||
-		operation == SAVEDATA_OP_LIST_IMPORT || operation == SAVEDATA_OP_LIST_EXPORT ||
-		operation == SAVEDATA_OP_LIST_DELETE || operation == SAVEDATA_OP_FIXED_DELETE)
+	if ((operation >= SAVEDATA_OP_LIST_AUTO_SAVE && operation <= SAVEDATA_OP_FIXED_LOAD) || operation == SAVEDATA_OP_FIXED_DELETE)
 	{
 		if (!setList)
 		{
@@ -534,54 +425,49 @@ static s32 savedata_check_args(u32 operation, u32 version, vm::cptr<char> dirNam
 			return 17;
 		}
 
-		const bool allow_asterisk = (operation == SAVEDATA_OP_LIST_DELETE); // TODO: SAVEDATA_OP_FIXED_DELETE ?
+		char cur, buf[CELL_SAVEDATA_DIRNAME_SIZE + 1]{};
 
-		if (!allow_asterisk || !(setList->dirNamePrefix[0] == '*' && setList->dirNamePrefix[1] == '\0'))
+		for (s32 pos = 0, posprefix = 0; cur = setList->dirNamePrefix[pos++], true;)
 		{
-			char cur, buf[CELL_SAVEDATA_DIRNAME_SIZE + 1]{};
-
-			for (s32 pos = 0, posprefix = 0; cur = setList->dirNamePrefix[pos++], true;)
+			if (cur == '\0' || cur == '|')
 			{
-				if (cur == '\0' || cur == '|')
+				// Check prefix if not empty
+				if (posprefix)
 				{
-					// Check prefix if not empty
-					if (posprefix)
+					switch (sysutil_check_name_string(buf, 1, CELL_SAVEDATA_DIRNAME_SIZE))
 					{
-						switch (sysutil_check_name_string(buf, 1, CELL_SAVEDATA_DIRNAME_SIZE))
-						{
-						case -1:
-						{
-							// ****** sysutil savedata parameter error : 16 ******
-							return 16;
-						}
-						case -2:
-						{
-							// ****** sysutil savedata parameter error : 17 ******
-							return 17;
-						}
-						case 0: break;
-						default: fmt::throw_exception("Unreachable");
-						}
-					}
-
-					if (cur == '\0')
+					case -1:
 					{
-						break;
+						// ****** sysutil savedata parameter error : 16 ******
+						return 16;
+					}
+					case -2:
+					{
+						// ****** sysutil savedata parameter error : 17 ******
+						return 17;
+					}
+					case 0: break;
+					default: fmt::throw_exception("Unreachable");
 					}
-
-					// Note: no need to reset buffer, only position
-					posprefix = 0;
-					continue;
 				}
 
-				if (posprefix == CELL_SAVEDATA_DIRNAME_SIZE)
+				if (cur == '\0')
 				{
-					// ****** sysutil savedata parameter error : 17 ******
-					return 17;
+					break;
 				}
 
-				buf[posprefix++] = cur;
+				// Note: no need to reset buffer, only position
+				posprefix = 0;
+				continue;
 			}
+
+			if (posprefix == CELL_SAVEDATA_DIRNAME_SIZE)
+			{
+				// ****** sysutil savedata parameter error : 17 ******
+				return 17;
+			}
+
+			buf[posprefix++] = cur;
 		}
 
 		if (setList->reserved)
@@ -591,25 +477,13 @@ static s32 savedata_check_args(u32 operation, u32 version, vm::cptr<char> dirNam
 		}
 	}
 
-	if (operation >= SAVEDATA_OP_LIST_IMPORT && operation <= SAVEDATA_OP_FIXED_EXPORT)
-	{
-		if (!funcDone || userId > CELL_SYSUTIL_USERID_MAX)
-		{
-			// ****** sysutil savedata parameter error : 137 ******
-			return 137;
-		}
-
-		// There are no more parameters to check for the import and export functions.
-		return CELL_OK;
-	}
-
 	if (!setBuf)
 	{
 		// ****** sysutil savedata parameter error : 74 ******
 		return 74;
 	}
 
-	if ((operation >= SAVEDATA_OP_LIST_AUTO_SAVE && operation <= SAVEDATA_OP_FIXED_LOAD) || operation == SAVEDATA_OP_LIST_DELETE || operation == SAVEDATA_OP_FIXED_DELETE)
+	if ((operation >= SAVEDATA_OP_LIST_AUTO_SAVE && operation <= SAVEDATA_OP_FIXED_LOAD) || operation == SAVEDATA_OP_FIXED_DELETE)
 	{
 		if (setBuf->dirListMax > CELL_SAVEDATA_DIRLIST_MAX)
 		{
@@ -628,7 +502,7 @@ static s32 savedata_check_args(u32 operation, u32 version, vm::cptr<char> dirNam
 
 	CHECK_SIZE(CellSaveDataFileStat, 56);
 
-	if (operation == SAVEDATA_OP_LIST_DELETE || operation == SAVEDATA_OP_FIXED_DELETE)
+	if (operation == SAVEDATA_OP_FIXED_DELETE)
 	{
 		if (setBuf->fileListMax != 0u)
 		{
@@ -657,22 +531,19 @@ static s32 savedata_check_args(u32 operation, u32 version, vm::cptr<char> dirNam
 		}
 	}
 
-	if ((operation == SAVEDATA_OP_LIST_SAVE || operation == SAVEDATA_OP_LIST_LOAD || operation == SAVEDATA_OP_LIST_DELETE) && !funcList)
+	if ((operation == SAVEDATA_OP_LIST_SAVE || operation == SAVEDATA_OP_LIST_LOAD) && !funcList)
 	{
 		// ****** sysutil savedata parameter error : 18 ******
 		return 18;
 	}
-
-	if ((operation == SAVEDATA_OP_FIXED_SAVE || operation == SAVEDATA_OP_FIXED_LOAD ||
+	else if ((operation == SAVEDATA_OP_FIXED_SAVE || operation == SAVEDATA_OP_FIXED_LOAD ||
 		operation == SAVEDATA_OP_LIST_AUTO_LOAD || operation == SAVEDATA_OP_LIST_AUTO_SAVE || operation == SAVEDATA_OP_FIXED_DELETE) && !funcFixed)
 	{
 		// ****** sysutil savedata parameter error : 19 ******
 		return 19;
 	}
 
-	// NOTE: funcStat and funcFile are not present in the delete functions. unk_op_flags is 0x2 for SAVEDATA_OP_FIXED_DELETE, but I added the redundant check anyway for clarity.
-	if (operation != SAVEDATA_OP_LIST_DELETE && operation != SAVEDATA_OP_FIXED_DELETE &&
-		(!(unk_op_flags & 0x2) || operation == SAVEDATA_OP_AUTO_SAVE || operation == SAVEDATA_OP_AUTO_LOAD))
+	if (!(unk_op_flags & 0x2) || operation == SAVEDATA_OP_AUTO_SAVE || operation == SAVEDATA_OP_AUTO_LOAD)
 	{
 		if (!funcStat)
 		{
@@ -700,47 +571,12 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 	u32 errDialog, PSetList setList, PSetBuf setBuf, PFuncList funcList, PFuncFixed funcFixed, PFuncStat funcStat,
 	PFuncFile funcFile, u32 container, u32 unk_op_flags /*TODO*/, vm::ptr<void> userdata, u32 userId, PFuncDone funcDone)
 {
-	if (setList)
-	{
-		if (const auto& [ok, list] = setList.try_read(); ok)
-		{
-			cellSaveData.notice("savedata_op(): setList = { .sortType=%d, .sortOrder=%d, .dirNamePrefix='%s' }", list.sortType, list.sortOrder, list.dirNamePrefix);
-		}
-		else
-		{
-			cellSaveData.error("savedata_op(): Failed to read setList!");
-		}
-	}
-
-	if (setBuf)
-	{
-		if (const auto& [ok, buf] = setBuf.try_read(); ok)
-		{
-			cellSaveData.notice("savedata_op(): setBuf = { .dirListMax=%d, .fileListMax=%d, .bufSize=%d }", buf.dirListMax, buf.fileListMax, buf.bufSize);
-		}
-		else
-		{
-			cellSaveData.error("savedata_op(): Failed to read setBuf!");
-		}
-	}
-
-	// There is a lot going on in this function, ensure function log and past log commands have completed for ease of debugging
-	logs::listener::sync_all();
-
 	if (const auto ecode = savedata_check_args(operation, version, dirName, errDialog, setList, setBuf, funcList, funcFixed, funcStat,
 		funcFile, container, unk_op_flags, userdata, userId, funcDone))
 	{
 		return {CELL_SAVEDATA_ERROR_PARAM, " (error %d)", ecode};
 	}
 
-	std::unique_lock hle_lock(g_fxo->get<hle_locks_t>(), std::try_to_lock);
-
-	if (!hle_lock)
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
 	std::unique_lock lock(g_fxo->get<savedata_manager>().mutex, std::try_to_lock);
 
 	if (!lock)
@@ -781,7 +617,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 
 	result->userdata = userdata; // probably should be assigned only once (allows the callback to change it)
 
-	SaveDataEntry save_entry {};
+	SaveDataEntry save_entry;
 
 	if (setList)
 	{
@@ -792,24 +628,14 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 		listGet->dirList.set(setBuf->buf.addr());
 		std::memset(listGet->reserved, 0, sizeof(listGet->reserved));
 
-		std::vector<std::string> prefix_list = fmt::split(setList->dirNamePrefix.get_ptr(), {"|"});
+		auto prefix_list = fmt::split(setList->dirNamePrefix.get_ptr(), {"|"});
 
 		// if prefix_list is empty game wants to check all savedata
 		if (prefix_list.empty() && (operation == SAVEDATA_OP_LIST_LOAD || operation == SAVEDATA_OP_FIXED_LOAD))
 		{
-			cellSaveData.notice("savedata_op(): dirNamePrefix is empty. Listing all entries. operation=%d", operation);
 			prefix_list = {""};
 		}
 
-		// if prefix_list only contains an asterisk the game wants to check all savedata
-		const bool allow_asterisk = (operation == SAVEDATA_OP_LIST_DELETE); // TODO: SAVEDATA_OP_FIXED_DELETE ?
-		if (allow_asterisk && prefix_list.size() == 1 && prefix_list.front() == "*")
-		{
-			cellSaveData.notice("savedata_op(): dirNamePrefix is '*'. Listing all entries starting with '%s'. operation=%d", Emu.GetTitleID(), operation);
-			prefix_list.front() = Emu.GetTitleID(); // TODO: Let's be cautious for now and only list savedata starting with this game's ID
-			//prefix_list.front().clear(); // List savedata of all the games of this user
-		}
-
 		// get the saves matching the supplied prefix
 		for (auto&& entry : fs::dir(base_dir))
 		{
@@ -818,7 +644,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 				continue;
 			}
 
-			for (const std::string& prefix : prefix_list)
+			for (const auto& prefix : prefix_list)
 			{
 				if (entry.name.starts_with(prefix))
 				{
@@ -834,23 +660,23 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 						listGet->dirListNum++; // number of directories in list
 
 						// PSF parameters
-						const psf::registry psf = psf::load_object(base_dir + entry.name + "/PARAM.SFO");
+						const psf::registry psf = psf::load_object(fs::file(base_dir + entry.name + "/PARAM.SFO"));
 
 						if (psf.empty())
 						{
 							break;
 						}
 
-						SaveDataEntry save_entry2 {};
-						save_entry2.dirName   = psf::get_string(psf, "SAVEDATA_DIRECTORY");
-						save_entry2.listParam = psf::get_string(psf, "SAVEDATA_LIST_PARAM");
-						save_entry2.title     = psf::get_string(psf, "TITLE");
-						save_entry2.subtitle  = psf::get_string(psf, "SUB_TITLE");
-						save_entry2.details   = psf::get_string(psf, "DETAIL");
+						SaveDataEntry save_entry2;
+						save_entry2.dirName = psf.at("SAVEDATA_DIRECTORY").as_string();
+						save_entry2.listParam = psf.at("SAVEDATA_LIST_PARAM").as_string();
+						save_entry2.title = psf.at("TITLE").as_string();
+						save_entry2.subtitle = psf.at("SUB_TITLE").as_string();
+						save_entry2.details = psf.at("DETAIL").as_string();
 
 						for (const auto& entry2 : fs::dir(base_dir + entry.name))
 						{
-							if (entry2.is_directory || check_filename(vfs::unescape(entry2.name), false, true))
+							if (entry2.is_directory)
 							{
 								continue;
 							}
@@ -879,34 +705,25 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 			const u32 order = setList->sortOrder;
 			const u32 type = setList->sortType;
 
-			std::sort(save_entries.begin(), save_entries.end(), [order, type](const SaveDataEntry& entry1, const SaveDataEntry& entry2) -> bool
+			std::sort(save_entries.begin(), save_entries.end(), [=](const SaveDataEntry& entry1, const SaveDataEntry& entry2)
 			{
-				const bool mtime_lower = entry1.mtime < entry2.mtime;
-				const bool mtime_equal = entry1.mtime == entry2.mtime;
-				const bool subtitle_lower = entry1.subtitle < entry2.subtitle;
-				const bool subtitle_equal = entry1.subtitle == entry2.subtitle;
-				const bool revert_order = order == CELL_SAVEDATA_SORTORDER_DESCENT;
-
-				if (type == CELL_SAVEDATA_SORTTYPE_MODIFIEDTIME)
+				if (order == CELL_SAVEDATA_SORTORDER_DESCENT && type == CELL_SAVEDATA_SORTTYPE_MODIFIEDTIME)
 				{
-					if (mtime_equal)
-					{
-						return subtitle_lower != revert_order;
-					}
-
-					return mtime_lower != revert_order;
+					return entry1.mtime >= entry2.mtime;
 				}
-				else if (type == CELL_SAVEDATA_SORTTYPE_SUBTITLE)
+				if (order == CELL_SAVEDATA_SORTORDER_DESCENT && type == CELL_SAVEDATA_SORTTYPE_SUBTITLE)
 				{
-					if (subtitle_equal)
-					{
-						return mtime_lower != revert_order;
-					}
-
-					return subtitle_lower != revert_order;
+					return entry1.subtitle >= entry2.subtitle;
+				}
+				if (order == CELL_SAVEDATA_SORTORDER_ASCENT && type == CELL_SAVEDATA_SORTTYPE_MODIFIEDTIME)
+				{
+					return entry1.mtime < entry2.mtime;
+				}
+				if (order == CELL_SAVEDATA_SORTORDER_ASCENT && type == CELL_SAVEDATA_SORTTYPE_SUBTITLE)
+				{
+					return entry1.subtitle < entry2.subtitle;
 				}
 
-				ensure(false);
 				return true;
 			});
 		}
@@ -951,7 +768,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 			if (listSet->fixedListNum > CELL_SAVEDATA_LISTITEM_MAX)
 			{
 				// ****** sysutil savedata parameter error : 38 ******
-				return {CELL_SAVEDATA_ERROR_PARAM, "38 (fixedListNum=%d)", listSet->fixedListNum};
+				return {CELL_SAVEDATA_ERROR_PARAM, "38"};
 			}
 
 			if (listSet->fixedListNum && !listSet->fixedList)
@@ -1008,7 +825,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 				default:
 				{
 					// ****** sysutil savedata parameter error : 43 ******
-					return {CELL_SAVEDATA_ERROR_PARAM, "43 (iconPosition=0x%x)", listSet->newData->iconPosition};
+					return {CELL_SAVEDATA_ERROR_PARAM, "43"};
 				}
 				}
 
@@ -1133,14 +950,8 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 					return {CELL_SAVEDATA_ERROR_PARAM, "34"};
 				}
 
-				if (listSet->newData->iconPosition == CELL_SAVEDATA_ICONPOS_TAIL)
-				{
-					focused = ::size32(save_entries);
-				}
-				else
-				{
-					focused = 0;
-				}
+				// TODO: If adding the new data to the save_entries vector
+				// to be displayed in the save mangaer UI, it should be focused here
 				break;
 			}
 			default:
@@ -1155,7 +966,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 		auto delete_save = [&]()
 		{
 			strcpy_trunc(doneGet->dirName, save_entries[selected].dirName);
-			doneGet->hddFreeSizeKB = 40 * 1024 * 1024 - 256; // Read explanation in cellHddGameCheck
+			doneGet->hddFreeSizeKB = 40 * 1024 * 1024 - 1; // Read explanation in cellHddGameCheck
 			doneGet->excResult     = CELL_OK;
 			std::memset(doneGet->reserved, 0, sizeof(doneGet->reserved));
 
@@ -1195,13 +1006,6 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 			}
 
 			std::memset(result.get_ptr(), 0, ::offset32(&CellSaveDataCBResult::userdata));
-
-			if (!funcDone)
-			{
-				// TODO: return CELL_SAVEDATA_ERROR_PARAM at the correct location
-				fmt::throw_exception("cellSaveData: funcDone is nullptr. operation=%d", operation);
-			}
-
 			funcDone(ppu, result, doneGet);
 		};
 
@@ -1213,7 +1017,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 			// Display a blocking Save Data List asynchronously in the GUI thread.
 			if (auto save_dialog = Emu.GetCallbacks().get_save_dialog())
 			{
-				selected = save_dialog->ShowSaveDataList(base_dir, save_entries, focused, operation, listSet, g_fxo->get<savedata_manager>().enable_overlay);
+				selected = save_dialog->ShowSaveDataList(save_entries, focused, operation, listSet, g_fxo->get<savedata_manager>().enable_overlay);
 			}
 			else
 			{
@@ -1244,15 +1048,15 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 			else
 			{
 				// Get information from the selected entry
-				message = get_confirmation_message(operation, ::at32(save_entries, selected));
+				SaveDataEntry entry = save_entries[selected];
+				message = get_confirmation_message(operation, entry);
 			}
 
 			// Yield before a blocking dialog is being spawned
 			lv2_obj::sleep(ppu);
 
 			// Get user confirmation by opening a blocking dialog
-			s32 return_code = CELL_MSGDIALOG_BUTTON_NONE;
-			error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_YESNO, vm::make_str(message), msg_dialog_source::_cellSaveData, vm::null, vm::null, vm::null, &return_code);
+			error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_YESNO, vm::make_str(message));
 
 			// Reschedule after a blocking dialog returns
 			if (ppu.check_state())
@@ -1265,7 +1069,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 				return CELL_SAVEDATA_ERROR_INTERNAL;
 			}
 
-			if (return_code != CELL_MSGDIALOG_BUTTON_YES)
+			if (g_last_user_response != CELL_MSGDIALOG_BUTTON_YES)
 			{
 				if (selected >= 0)
 				{
@@ -1374,16 +1178,15 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 				else
 				{
 					// Get information from the selected entry
-					message = get_confirmation_message(operation, ::at32(save_entries, selected));
+					SaveDataEntry entry = save_entries[selected];
+					message = get_confirmation_message(operation, entry);
 				}
 
 				// Yield before a blocking dialog is being spawned
 				lv2_obj::sleep(ppu);
 
 				// Get user confirmation by opening a blocking dialog
-				// TODO: show fixedSet->newIcon
-				s32 return_code = CELL_MSGDIALOG_BUTTON_NONE;
-				error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_YESNO, vm::make_str(message), msg_dialog_source::_cellSaveData, vm::null, vm::null, vm::null, &return_code);
+				error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_YESNO, vm::make_str(message));
 
 				// Reschedule after a blocking dialog returns
 				if (ppu.check_state())
@@ -1396,7 +1199,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 					return CELL_SAVEDATA_ERROR_INTERNAL;
 				}
 
-				if (return_code != CELL_MSGDIALOG_BUTTON_YES)
+				if (g_last_user_response != CELL_MSGDIALOG_BUTTON_YES)
 				{
 					return CELL_CANCEL;
 				}
@@ -1409,7 +1212,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 
 			default :
 				// ****** sysutil savedata parameter error : 81 ******
-				return {CELL_SAVEDATA_ERROR_PARAM, "81 (option=0x%x)", fixedSet->option};
+				return {CELL_SAVEDATA_ERROR_PARAM, "81"};
 			}
 
 			if (selected == -1)
@@ -1446,7 +1249,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 
 		if (selected >= 0)
 		{
-			if (static_cast<u32>(selected) < save_entries.size())
+			if (selected + 0u < save_entries.size())
 			{
 				save_entry.dirName = std::move(save_entries[selected].dirName);
 				save_entry.escaped = vfs::escape(save_entry.dirName);
@@ -1468,19 +1271,18 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 	const std::string old_path = base_dir + ".backup_" + save_entry.escaped + "/";
 	const std::string new_path = base_dir + ".working_" + save_entry.escaped + "/";
 
-	psf::registry psf = psf::load_object(dir_path + "PARAM.SFO");
+	psf::registry psf = psf::load_object(fs::file(dir_path + "PARAM.SFO"));
 	bool has_modified = false;
 	bool recreated = false;
 
 	lv2_sleep(ppu, 250);
-	ppu.state += cpu_flag::wait;
 
 	// Check if RPCS3_BLIST section exist in PARAM.SFO
 	// This section contains the list of files in the save ordered as they would be in BSD filesystem
 	std::vector<std::string> blist;
 
-	if (const auto it = psf.find("RPCS3_BLIST"); it != psf.cend())
-		blist = fmt::split(it->second.as_string(), {"/"}, false);
+	if (psf.count("RPCS3_BLIST"))
+		blist = fmt::split(psf.at("RPCS3_BLIST").as_string(), {"/"}, false);
 
 	// Get save stats
 	{
@@ -1491,12 +1293,12 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 		}
 
 		fs::stat_t dir_info{};
-		if (!fs::get_stat(dir_path, dir_info))
+		if (!fs::stat(dir_path, dir_info))
 		{
 			// funcStat is called even if the directory doesn't exist.
 		}
 
-		statGet->hddFreeSizeKB = 40 * 1024 * 1024 - 256; // Read explanation in cellHddGameCheck
+		statGet->hddFreeSizeKB = 40 * 1024 * 1024 - 1; // Read explanation in cellHddGameCheck
 		statGet->isNewData = save_entry.isNew = psf.empty();
 
 		statGet->dir.atime = save_entry.atime = dir_info.atime;
@@ -1506,12 +1308,12 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 
 		if (!psf.empty())
 		{
-			statGet->getParam.parental_level = psf::get_integer(psf, "PARENTAL_LEVEL");
-			statGet->getParam.attribute = psf::get_integer(psf, "ATTRIBUTE"); // ???
-			strcpy_trunc(statGet->getParam.title, save_entry.title = psf::get_string(psf, "TITLE"));
-			strcpy_trunc(statGet->getParam.subTitle, save_entry.subtitle = psf::get_string(psf, "SUB_TITLE"));
-			strcpy_trunc(statGet->getParam.detail, save_entry.details = psf::get_string(psf, "DETAIL"));
-			strcpy_trunc(statGet->getParam.listParam, save_entry.listParam = psf::get_string(psf, "SAVEDATA_LIST_PARAM"));
+			statGet->getParam.parental_level = psf.at("PARENTAL_LEVEL").as_integer();
+			statGet->getParam.attribute = psf.at("ATTRIBUTE").as_integer(); // ???
+			strcpy_trunc(statGet->getParam.title, save_entry.title = psf.at("TITLE").as_string());
+			strcpy_trunc(statGet->getParam.subTitle, save_entry.subtitle = psf.at("SUB_TITLE").as_string());
+			strcpy_trunc(statGet->getParam.detail, save_entry.details = psf.at("DETAIL").as_string());
+			strcpy_trunc(statGet->getParam.listParam, save_entry.listParam = psf.at("SAVEDATA_LIST_PARAM").as_string());
 		}
 
 		statGet->bind = 0;
@@ -1538,7 +1340,12 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 
 			if (!entry.is_directory)
 			{
-				if (check_filename(entry.name, false, false))
+				if (entry.name == "."sv)
+				{
+					continue;
+				}
+
+				if (entry.name == "PARAM.SFO"sv || entry.name == "PARAM.PFD"sv)
 				{
 					continue; // system files are not included in the file list
 				}
@@ -1617,7 +1424,6 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 
 		// Stat Callback
 		funcStat(ppu, result, statGet, statSet);
-		ppu.state += cpu_flag::wait;
 
 		if (const s32 res = result->result; res != CELL_SAVEDATA_CBRESULT_OK_NEXT)
 		{
@@ -1637,37 +1443,24 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 			if (statSet->setParam->attribute > CELL_SAVEDATA_ATTR_NODUPLICATE)
 			{
 				// ****** sysutil savedata parameter error : 57 ******
-				return {CELL_SAVEDATA_ERROR_PARAM, "57 (attribute=0x%x)", statSet->setParam->attribute};
+				return {CELL_SAVEDATA_ERROR_PARAM, "57"};
 			}
 
-			if (statSet->setParam->parental_level > 11)
+			if (g_ps3_process_info.sdk_ver > 0x36FFFF)
 			{
-				// ****** sysutil savedata parameter error : 58 ******
-				return {CELL_SAVEDATA_ERROR_PARAM, "58 (sdk_ver=0x%x, parental_level=%d)", g_ps3_process_info.sdk_ver, statSet->setParam->parental_level};
-			}
-
-			// Note: in firmware 3.70 or higher parental_level was changed to reserved2
-
-			for (usz index = 0;; index++)
-			{
-				// Convert to pointer to avoid UB when accessing out of range
-				const u8 c = (+statSet->setParam->listParam)[index];
-
-				if (c == 0 || index >= (g_ps3_process_info.sdk_ver > 0x36FFFF ? std::size(statSet->setParam->listParam) - 1 : std::size(statSet->setParam->listParam)))
+				// In firmware 3.70 or higher parental_level was changed to reserved2 and has to zeroes
+				if (statSet->setParam->parental_level)
 				{
-					if (c)
-					{
-						// ****** sysutil savedata parameter error : 76 ******
-						return {CELL_SAVEDATA_ERROR_PARAM, "76 (listParam=0x%016x)", std::bit_cast<be_t<u64>>(statSet->setParam->listParam)};
-					}
-
-					break;
+					// ****** sysutil savedata parameter error : 58 ******
+					return {CELL_SAVEDATA_ERROR_PARAM, "58"};
 				}
-
-				if ((c < 'A' || c > 'Z') && (c < '0' || c > '9') && c != '-' && c != '_')
+			}
+			else
+			{
+				if (statSet->setParam->parental_level > 11)
 				{
-					// ****** sysutil savedata parameter error : 77 ******
-					return {CELL_SAVEDATA_ERROR_PARAM, "77 (listParam=0x%016x)", std::bit_cast<be_t<u64>>(statSet->setParam->listParam)};
+					// ****** sysutil savedata parameter error : 58 ******
+					return {CELL_SAVEDATA_ERROR_PARAM, "58"};
 				}
 			}
 
@@ -1707,8 +1500,9 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 			//CELL_SAVEDATA_RECREATE_NO = overwrite and let the user know, not data is corrupt.
 			//cellSaveData.error("Savedata %s considered broken", save_entry.dirName);
 			//TODO: if this is a save, and it's not auto, then show a dialog
-			[[fallthrough]];
+			// fallthrough
 		}
+
 		case CELL_SAVEDATA_RECREATE_NO_NOBROKEN:
 		{
 			break;
@@ -1771,7 +1565,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 			// Read file into a vector and make a memory file
 			entry.name = vfs::unescape(entry.name);
 
-			if (check_filename(entry.name, false, true))
+			if (entry.name == ".")
 			{
 				continue;
 			}
@@ -1783,74 +1577,21 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 
 	fileGet->excSize = 0;
 
-	// show indicator for automatic save or auto load interactions if the game requests it (statSet->indicator)
-	const bool show_auto_indicator = operation <= SAVEDATA_OP_LIST_AUTO_LOAD && statSet && statSet->indicator && g_cfg.misc.show_autosave_autoload_hint;
-
-	if (show_auto_indicator)
-	{
-		auto msg_text = localized_string_id::INVALID;
-
-		if (operation == SAVEDATA_OP_AUTO_SAVE || operation == SAVEDATA_OP_LIST_AUTO_SAVE)
-		{
-			msg_text = localized_string_id::CELL_SAVEDATA_AUTOSAVE;
-		}
-		else if (operation == SAVEDATA_OP_AUTO_LOAD || operation == SAVEDATA_OP_LIST_AUTO_LOAD)
-		{
-			msg_text = localized_string_id::CELL_SAVEDATA_AUTOLOAD;
-		}
-
-		auto msg_location = rsx::overlays::message_pin_location::top_left;
-
-		switch (statSet->indicator->dispPosition & 0x0F)
-		{
-		case CELL_SAVEDATA_INDICATORPOS_LOWER_RIGHT:
-			msg_location = rsx::overlays::message_pin_location::bottom_right;
-			break;
-		case CELL_SAVEDATA_INDICATORPOS_LOWER_LEFT:
-			msg_location = rsx::overlays::message_pin_location::bottom_left;
-			break;
-		case CELL_SAVEDATA_INDICATORPOS_UPPER_RIGHT:
-			msg_location = rsx::overlays::message_pin_location::top_right;
-			break;
-		case CELL_SAVEDATA_INDICATORPOS_UPPER_LEFT:
-		case CELL_SAVEDATA_INDICATORPOS_CENTER:
-		default:
-			msg_location = rsx::overlays::message_pin_location::top_left;
-			break;
-		}
-
-		// TODO: Blinking variants
-
-		// RPCS3 saves basically instantaneously so there's not much point in showing auto indicator
-		// WHILE saving is in progress. Instead we show the indicator for 3 seconds to let the user
-		// know when the game autosaves.
-		rsx::overlays::queue_message(msg_text, 3'000'000, {}, msg_location);
-	}
-
 	error_code savedata_result = CELL_OK;
 
-	u64 delay_save_until = 0;
-
 	while (funcFile)
 	{
-		lv2_sleep(ppu, 2000);
-
 		std::memset(fileSet.get_ptr(), 0, fileSet.size());
 		std::memset(fileGet->reserved, 0, sizeof(fileGet->reserved));
 		std::memset(result.get_ptr(), 0, ::offset32(&CellSaveDataCBResult::userdata));
 
 		funcFile(ppu, result, fileGet, fileSet);
-		ppu.state += cpu_flag::wait;
 
 		if (const s32 res = result->result; res != CELL_SAVEDATA_CBRESULT_OK_NEXT)
 		{
 			if (res == CELL_SAVEDATA_CBRESULT_OK_LAST || res == CELL_SAVEDATA_CBRESULT_OK_LAST_NOCONFIRM)
 			{
 				// TODO: display user prompt
-
-				// Some games (Jak II [NPUA80707]) rely on this delay
-				lv2_obj::sleep(ppu);
-				delay_save_until = get_guest_system_time() + (has_modified ? 500'000 : 100'000);
 				break;
 			}
 
@@ -1896,12 +1637,85 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 				break;
 			}
 
-			if (int error = check_filename(file_path, true, false))
+			auto dotpos = file_path.find_last_of('.');
+
+			if (dotpos == umax)
 			{
-				savedata_result = {CELL_SAVEDATA_ERROR_PARAM, "%d", error};
+				// Point to end of string instead
+				dotpos = file_path.size();
+			}
+
+			if (file_path.empty() || dotpos > 8u || file_path.size() - dotpos > 4u)
+			{
+				cellSaveData.error("savedata_op(): fileSet->fileName is illegal ('%s')", file_path);
+
+				// ****** sysutil savedata parameter error : 70 ******
+				savedata_result = {CELL_SAVEDATA_ERROR_PARAM, "70"};
 				break;
 			}
 
+			char name[10];
+
+			if (dotpos)
+			{
+				// Copy file name
+				std::span dst(name, dotpos + 1);
+				strcpy_trunc(dst, file_path);
+
+				// Allow multiple '.' even though sysutil_check_name_string does not
+				std::replace(name, name + dotpos, '.', '-');
+
+				// Allow '_' at start even though sysutil_check_name_string does not
+				if (name[0] == '_')
+				{
+					name[0] = '-';
+				}
+
+				if ((dotpos >= 5u && std::memcmp(name, "PARAM", 5) == 0) ||
+					(dotpos >= 4u && std::memcmp(name, "ICON", 4) == 0) ||
+					(dotpos >= 3u && std::memcmp(name, "PIC", 3) == 0) ||
+					(dotpos >= 3u && std::memcmp(name, "SND", 3) == 0))
+				{
+					// ****** sysutil savedata parameter error : 70 ******
+					cellSaveData.error("savedata_op(): fileSet->fileName is set to a system file name (%s)", file_path);
+					savedata_result = {CELL_SAVEDATA_ERROR_PARAM, "70"};
+					break;
+				}
+
+				// Check filename
+				if (sysutil_check_name_string(name, 1, 9) == -1)
+				{
+					cellSaveData.error("savedata_op(): fileSet->fileName is illegal due to file name ('%s')", file_path);
+
+					// ****** sysutil savedata parameter error : 70 ******
+					savedata_result = {CELL_SAVEDATA_ERROR_PARAM, "70"};
+					break;
+				}
+			}
+
+			if (file_path.size() > dotpos + 1)
+			{
+				// Copy file extension
+				std::span dst(name, file_path.size() - dotpos);
+				strcpy_trunc(dst, file_path.operator std::string_view().substr(dotpos + 1));
+
+				// Allow '_' at start even though sysutil_check_name_string does not
+				if (name[0] == '_')
+				{
+					name[0] = '-';
+				}
+
+				// Check file extension
+				if (sysutil_check_name_string(name, 1, 4) == -1)
+				{
+					cellSaveData.error("savedata_op(): fileSet->fileName is illegal due to file extension ('%s')", file_path);
+
+					// ****** sysutil savedata parameter error : 70 ******
+					savedata_result = {CELL_SAVEDATA_ERROR_PARAM, "70"};
+					break;
+				}
+			}
+
 			if (type == CELL_SAVEDATA_FILETYPE_SECUREFILE)
 			{
 				cellSaveData.notice("SECUREFILE: %s -> %s", file_path, fileSet->secureFileId);
@@ -1962,8 +1776,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 		};
 		// clang-format on
 
-		cellSaveData.warning("savedata_op(): Fileop: file='%s', type=%d, op=%d, bufSize=%d, fileSize=%d, offset=%d",
-			file_path, fileSet->fileType, fileSet->fileOperation, fileSet->fileBufSize, fileSet->fileSize, fileSet->fileOffset);
+		cellSaveData.warning("savedata_op(): Fileop: file=\"%s\", type=%d, op=%d", file_path, fileSet->fileType, fileSet->fileOperation);
 
 		if ((file_path == "." || file_path == "..") && fileSet->fileOperation <= CELL_SAVEDATA_FILEOP_WRITE_NOTRUNC)
 		{
@@ -1990,17 +1803,17 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 			}
 
 			const auto file = std::as_const(all_files).find(file_path);
-			const u64 pos = fileSet->fileOffset;
 
-			if (file == all_files.cend() || file->second.size() <= pos)
+			if (file == all_files.cend() || file->second.size() <= fileSet->fileOffset)
 			{
-				cellSaveData.error("Failed to open file %s%s (size=%d, fileOffset=%d)", dir_path, file_path, file == all_files.cend() ? -1 : file->second.size(), fileSet->fileOffset);
+				cellSaveData.error("Failed to open file %s%s", dir_path, file_path);
 				savedata_result = CELL_SAVEDATA_ERROR_FAILURE;
 				break;
 			}
 
 			// Read from memory file to vm
-			const u64 rr = lv2_file::op_read(file->second, fileSet->fileBuf, fileSet->fileSize, pos);
+			file->second.seek(fileSet->fileOffset);
+			const u64 rr = lv2_file::op_read(file->second, fileSet->fileBuf, fileSet->fileSize);
 			fileGet->excSize = ::narrow<u32>(rr);
 			break;
 		}
@@ -2175,21 +1988,11 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
 		fs::remove_all(old_path);
 	}
 
-	if (show_auto_indicator)
-	{
-		// auto indicator should be hidden here if save/load throttling is added
-	}
-
 	if (savedata_result + 0u == CELL_SAVEDATA_ERROR_CBRESULT)
 	{
 		return display_callback_result_error_message(ppu, *result, errDialog);
 	}
 
-	if (u64 current_time = get_guest_system_time(); current_time < delay_save_until)
-	{
-		lv2_sleep(ppu, delay_save_until - current_time);
-	}
-
 	return savedata_result;
 }
 
@@ -2202,7 +2005,7 @@ static NEVER_INLINE error_code savedata_get_list_item(vm::cptr<char> dirName, vm
 	else if (userId > CELL_USERINFO_USER_MAX)
 	{
 		// ****** sysutil savedata parameter error : 137 ******
-		return {CELL_SAVEDATA_ERROR_PARAM, "137 (userId=0x%x)", userId};
+		return {CELL_SAVEDATA_ERROR_PARAM, "137"};
 	}
 
 	if (!dirName)
@@ -2243,20 +2046,20 @@ static NEVER_INLINE error_code savedata_get_list_item(vm::cptr<char> dirName, vm
 		return CELL_SAVEDATA_ERROR_NODATA;
 	}
 
-	const psf::registry psf = psf::load_object(sfo);
+	auto psf = psf::load_object(fs::file(sfo));
 
 	if (sysFileParam)
 	{
-		strcpy_trunc(sysFileParam->listParam, psf::get_string(psf, "SAVEDATA_LIST_PARAM"));
-		strcpy_trunc(sysFileParam->title, psf::get_string(psf, "TITLE"));
-		strcpy_trunc(sysFileParam->subTitle, psf::get_string(psf, "SUB_TITLE"));
-		strcpy_trunc(sysFileParam->detail, psf::get_string(psf, "DETAIL"));
+		strcpy_trunc(sysFileParam->listParam, psf.at("SAVEDATA_LIST_PARAM").as_string());
+		strcpy_trunc(sysFileParam->title, psf.at("TITLE").as_string());
+		strcpy_trunc(sysFileParam->subTitle, psf.at("SUB_TITLE").as_string());
+		strcpy_trunc(sysFileParam->detail, psf.at("DETAIL").as_string());
 	}
 
 	if (dir)
 	{
 		fs::stat_t dir_info{};
-		if (!fs::get_stat(save_path, dir_info))
+		if (!fs::stat(save_path, dir_info))
 		{
 			return CELL_SAVEDATA_ERROR_INTERNAL;
 		}
@@ -2274,7 +2077,7 @@ static NEVER_INLINE error_code savedata_get_list_item(vm::cptr<char> dirName, vm
 
 		for (const auto& entry : fs::dir(save_path))
 		{
-			if (entry.is_directory || check_filename(vfs::unescape(entry.name), false, false))
+			if (entry.is_directory)
 			{
 				continue;
 			}
@@ -2282,8 +2085,7 @@ static NEVER_INLINE error_code savedata_get_list_item(vm::cptr<char> dirName, vm
 			size_kbytes += ::narrow<u32>((entry.size + 1023) / 1024); // firmware rounds this value up
 		}
 
-		// Add a seemingly constant allocation disk space of PARAM.SFO + PARAM.PFD
-		*sizeKB = size_kbytes + 35;
+		*sizeKB = size_kbytes;
 	}
 
 	if (bind)
@@ -2530,70 +2332,41 @@ error_code cellSaveDataListDelete(ppu_thread& ppu, PSetList setList, PSetBuf set
 	return savedata_op(ppu, SAVEDATA_OP_LIST_DELETE, 0, vm::null, 0, setList, setBuf, funcList, vm::null, vm::null, vm::null, container, 0x40, userdata, 0, funcDone);
 }
 
-error_code cellSaveDataListImport(ppu_thread& /*ppu*/, PSetList setList, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
+error_code cellSaveDataListImport(ppu_thread& ppu, PSetList setList, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
 {
-	cellSaveData.todo("cellSaveDataListImport(setList=*0x%x, maxSizeKB=%d, funcDone=*0x%x, container=0x%x, userdata=*0x%x)", setList, maxSizeKB, funcDone, container, userdata);
-
-	if (const auto ecode = savedata_check_args(SAVEDATA_OP_LIST_IMPORT, CELL_SAVEDATA_VERSION_OLD, vm::null, CELL_SAVEDATA_ERRDIALOG_NONE,
-		setList, vm::null, vm::null, vm::null, vm::null, vm::null, container, 0x40, userdata, 0, funcDone))
-	{
-		return {CELL_SAVEDATA_ERROR_PARAM, " (error %d)", ecode};
-	}
-
-	// TODO
+	UNIMPLEMENTED_FUNC(cellSaveData);
 
 	return CELL_OK;
 }
 
-error_code cellSaveDataListExport(ppu_thread& /*ppu*/, PSetList setList, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
+error_code cellSaveDataListExport(ppu_thread& ppu, PSetList setList, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
 {
-	cellSaveData.todo("cellSaveDataListExport(setList=*0x%x, maxSizeKB=%d, funcDone=*0x%x, container=0x%x, userdata=*0x%x)", setList, maxSizeKB, funcDone, container, userdata);
-	
-	if (const auto ecode = savedata_check_args(SAVEDATA_OP_LIST_EXPORT, CELL_SAVEDATA_VERSION_OLD, vm::null, CELL_SAVEDATA_ERRDIALOG_NONE,
-		setList, vm::null, vm::null, vm::null, vm::null, vm::null, container, 0x40, userdata, 0, funcDone))
-	{
-		return {CELL_SAVEDATA_ERROR_PARAM, " (error %d)", ecode};
-	}
-
-	// TODO
+	UNIMPLEMENTED_FUNC(cellSaveData);
 
 	return CELL_OK;
 }
 
-error_code cellSaveDataFixedImport(ppu_thread& /*ppu*/, vm::cptr<char> dirName, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
+error_code cellSaveDataFixedImport(ppu_thread& ppu, vm::cptr<char> dirName, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
 {
-	cellSaveData.todo("cellSaveDataFixedImport(dirName=%s, maxSizeKB=%d, funcDone=*0x%x, container=0x%x, userdata=*0x%x)", dirName, maxSizeKB, funcDone, container, userdata);
-
-	if (const auto ecode = savedata_check_args(SAVEDATA_OP_FIXED_IMPORT, CELL_SAVEDATA_VERSION_OLD, dirName, CELL_SAVEDATA_ERRDIALOG_NONE,
-		vm::null, vm::null, vm::null, vm::null, vm::null, vm::null, container, 0x44, userdata, 0, funcDone))
-	{
-		return {CELL_SAVEDATA_ERROR_PARAM, " (error %d)", ecode};
-	}
-
-	// TODO
+	UNIMPLEMENTED_FUNC(cellSaveData);
 
 	return CELL_OK;
 }
 
-error_code cellSaveDataFixedExport(ppu_thread& /*ppu*/, vm::cptr<char> dirName, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
+error_code cellSaveDataFixedExport(ppu_thread& ppu, vm::cptr<char> dirName, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
 {
-	cellSaveData.todo("cellSaveDataFixedExport(dirName=%s, maxSizeKB=%d, funcDone=*0x%x, container=0x%x, userdata=*0x%x)", dirName, maxSizeKB, funcDone, container, userdata);
-
-	if (const auto ecode = savedata_check_args(SAVEDATA_OP_FIXED_EXPORT, CELL_SAVEDATA_VERSION_OLD, dirName, CELL_SAVEDATA_ERRDIALOG_NONE,
-		vm::null, vm::null, vm::null, vm::null, vm::null, vm::null, container, 0x44, userdata, 0, funcDone))
-	{
-		return {CELL_SAVEDATA_ERROR_PARAM, " (error %d)", ecode};
-	}
-
-	// TODO
+	UNIMPLEMENTED_FUNC(cellSaveData);
 
 	return CELL_OK;
 }
 
-error_code cellSaveDataGetListItem(ppu_thread& ppu, vm::cptr<char> dirName, vm::ptr<CellSaveDataDirStat> dir, vm::ptr<CellSaveDataSystemFileParam> sysFileParam, vm::ptr<u32> bind, vm::ptr<u32> sizeKB)
+error_code cellSaveDataGetListItem(vm::cptr<char> dirName, vm::ptr<CellSaveDataDirStat> dir, vm::ptr<CellSaveDataSystemFileParam> sysFileParam, vm::ptr<u32> bind, vm::ptr<u32> sizeKB)
 {
-	ppu.state += cpu_flag::wait;
-
 	cellSaveData.warning("cellSaveDataGetListItem(dirName=%s, dir=*0x%x, sysFileParam=*0x%x, bind=*0x%x, sizeKB=*0x%x)", dirName, dir, sysFileParam, bind, sizeKB);
 
 	return savedata_get_list_item(dirName, dir, sysFileParam, bind, sizeKB, 0);
@@ -2606,62 +2379,30 @@ error_code cellSaveDataUserListDelete(ppu_thread& ppu, u32 userId, PSetList setL
 	return savedata_op(ppu, SAVEDATA_OP_LIST_DELETE, 0, vm::null, 0, setList, setBuf, funcList, vm::null, vm::null, vm::null, container, 0x40, userdata, userId, funcDone);
 }
 
-error_code cellSaveDataUserListImport(ppu_thread& /*ppu*/, u32 userId, PSetList setList, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
+error_code cellSaveDataUserListImport(ppu_thread& ppu, u32 userId, PSetList setList, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
 {
-	cellSaveData.todo("cellSaveDataUserListImport(userId=%d, setList=*0x%x, maxSizeKB=%d, funcDone=*0x%x, container=0x%x, userdata=*0x%x)", userId, setList, maxSizeKB, funcDone, container, userdata);
-
-	if (const auto ecode = savedata_check_args(SAVEDATA_OP_LIST_IMPORT, CELL_SAVEDATA_VERSION_OLD, vm::null, CELL_SAVEDATA_ERRDIALOG_NONE,
-		setList, vm::null, vm::null, vm::null, vm::null, vm::null, container, 0x44, userdata, userId, funcDone))
-	{
-		return {CELL_SAVEDATA_ERROR_PARAM, " (error %d)", ecode};
-	}
-
-	// TODO
+	UNIMPLEMENTED_FUNC(cellSaveData);
 
 	return CELL_OK;
 }
 
-error_code cellSaveDataUserListExport(ppu_thread& /*ppu*/, u32 userId, PSetList setList, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
+error_code cellSaveDataUserListExport(ppu_thread& ppu, u32 userId, PSetList setList, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
 {
-	cellSaveData.todo("cellSaveDataUserListExport(userId=%d, setList=*0x%x, maxSizeKB=%d, funcDone=*0x%x, container=0x%x, userdata=*0x%x)", userId, setList, maxSizeKB, funcDone, container, userdata);
-
-	if (const auto ecode = savedata_check_args(SAVEDATA_OP_LIST_EXPORT, CELL_SAVEDATA_VERSION_OLD, vm::null, CELL_SAVEDATA_ERRDIALOG_NONE,
-		setList, vm::null, vm::null, vm::null, vm::null, vm::null, container, 0x44, userdata, userId, funcDone))
-	{
-		return {CELL_SAVEDATA_ERROR_PARAM, " (error %d)", ecode};
-	}
-
-	// TODO
+	UNIMPLEMENTED_FUNC(cellSaveData);
 
 	return CELL_OK;
 }
 
-error_code cellSaveDataUserFixedImport(ppu_thread& /*ppu*/, u32 userId, vm::cptr<char> dirName, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
+error_code cellSaveDataUserFixedImport(ppu_thread& ppu, u32 userId, vm::cptr<char> dirName, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
 {
-	cellSaveData.todo("cellSaveDataUserFixedImport(userId=%d, dirName=%s, maxSizeKB=%d, funcDone=*0x%x, container=0x%x, userdata=*0x%x)", userId, dirName, maxSizeKB, funcDone, container, userdata);
-
-	if (const auto ecode = savedata_check_args(SAVEDATA_OP_FIXED_IMPORT, CELL_SAVEDATA_VERSION_OLD, dirName, CELL_SAVEDATA_ERRDIALOG_NONE,
-		vm::null, vm::null, vm::null, vm::null, vm::null, vm::null, container, 0x44, userdata, userId, funcDone))
-	{
-		return {CELL_SAVEDATA_ERROR_PARAM, " (error %d)", ecode};
-	}
-
-	// TODO
+	UNIMPLEMENTED_FUNC(cellSaveData);
 
 	return CELL_OK;
 }
 
-error_code cellSaveDataUserFixedExport(ppu_thread& /*ppu*/, u32 userId, vm::cptr<char> dirName, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
+error_code cellSaveDataUserFixedExport(ppu_thread& ppu, u32 userId, vm::cptr<char> dirName, u32 maxSizeKB, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
 {
-	cellSaveData.todo("cellSaveDataUserFixedExport(userId=%d, dirName=%s, maxSizeKB=%d, funcDone=*0x%x, container=0x%x, userdata=*0x%x)", userId, dirName, maxSizeKB, funcDone, container, userdata);
-
-	if (const auto ecode = savedata_check_args(SAVEDATA_OP_FIXED_EXPORT, CELL_SAVEDATA_VERSION_OLD, dirName, CELL_SAVEDATA_ERRDIALOG_NONE,
-		vm::null, vm::null, vm::null, vm::null, vm::null, vm::null, container, 0x44, userdata, userId, funcDone))
-	{
-		return {CELL_SAVEDATA_ERROR_PARAM, " (error %d)", ecode};
-	}
-
-	// TODO
+	UNIMPLEMENTED_FUNC(cellSaveData);
 
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.h b/rpcs3/Emu/Cell/Modules/cellSaveData.h
index 0632c2500b..c88a4a3f9a 100644
--- a/rpcs3/Emu/Cell/Modules/cellSaveData.h
+++ b/rpcs3/Emu/Cell/Modules/cellSaveData.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "util/types.hpp"
+#include "util/endian.hpp"
 #include "Emu/Memory/vm_ptr.h"
 #include <string>
 #include <vector>
@@ -361,5 +362,5 @@ class SaveDialogBase
 public:
 	virtual ~SaveDialogBase();
 
-	virtual s32 ShowSaveDataList(const std::string& base_dir, std::vector<SaveDataEntry>& save_entries, s32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet, bool enable_overlay) = 0;
+	virtual s32 ShowSaveDataList(std::vector<SaveDataEntry>& save_entries, s32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet, bool enable_overlay) = 0;
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp b/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp
index b899155dde..6c35d0df6a 100644
--- a/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp
@@ -134,31 +134,24 @@ error_code cellScreenShotSetOverlayImage(vm::cptr<char> srcDir, vm::cptr<char> s
 
 error_code cellScreenShotEnable()
 {
-	cellScreenshot.trace("cellScreenShotEnable()");
+	cellScreenshot.warning("cellScreenShotEnable()");
 
 	auto& manager = g_fxo->get<screenshot_manager>();
 	std::lock_guard lock(manager.mutex);
 
-	if (!std::exchange(manager.is_enabled, true))
-	{
-		cellScreenshot.warning("cellScreenShotEnable(): Enabled");
-	}
+	manager.is_enabled = true;
 
 	return CELL_OK;
 }
 
 error_code cellScreenShotDisable()
 {
-	cellScreenshot.trace("cellScreenShotDisable()");
+	cellScreenshot.warning("cellScreenShotDisable()");
 
 	auto& manager = g_fxo->get<screenshot_manager>();
 	std::lock_guard lock(manager.mutex);
 
-	if (std::exchange(manager.is_enabled, false))
-	{
-		cellScreenshot.warning("cellScreenShotDisable(): Disabled");
-	}
-
+	manager.is_enabled = false;
 
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/Cell/Modules/cellSearch.cpp b/rpcs3/Emu/Cell/Modules/cellSearch.cpp
index bcc0151764..173ad4a46b 100644
--- a/rpcs3/Emu/Cell/Modules/cellSearch.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSearch.cpp
@@ -10,8 +10,6 @@
 #include "Utilities/StrUtil.h"
 #include "util/media_utils.h"
 
-#include <random>
-
 LOG_CHANNEL(cellSearch);
 
 template<>
@@ -65,20 +63,13 @@ struct search_info
 	atomic_t<search_state> state = search_state::not_initialized;
 
 	shared_mutex links_mutex;
-	struct link_data
-	{
-		std::string path;
-		bool is_dir = false;
-	};
-	std::unordered_map<std::string, link_data> content_links;
+	std::unordered_map<std::string, std::string> content_links;
 };
 
 struct search_content_t
 {
 	CellSearchContentType type = CELL_SEARCH_CONTENTTYPE_NONE;
-	CellSearchRepeatMode repeat_mode = CELL_SEARCH_REPEATMODE_NONE;
-	CellSearchContextOption context_option = CELL_SEARCH_CONTEXTOPTION_NONE;
-	CellSearchTimeInfo time_info;
+	CellSearchTimeInfo timeInfo;
 	CellSearchContentInfoPath infoPath;
 	union
 	{
@@ -90,19 +81,15 @@ struct search_content_t
 		CellSearchVideoListInfo video_list;
 		CellSearchVideoSceneInfo scene;
 	} data;
-
-	ENABLE_BITWISE_SERIALIZATION;
 };
 
-using content_id_type = std::pair<u64, shared_ptr<search_content_t>>;
+using content_id_type = std::pair<u64, std::shared_ptr<search_content_t>>;
 
 struct content_id_map
 {
-	std::unordered_map<u64, shared_ptr<search_content_t>> map;
+	std::unordered_map<u64, std::shared_ptr<search_content_t>> map;
 
 	shared_mutex mutex;
-
-	SAVESTATE_INIT_POS(36);
 };
 
 struct search_object_t
@@ -111,87 +98,20 @@ struct search_object_t
 	static const u32 id_base  = 1;
 	static const u32 id_step  = 1;
 	static const u32 id_count = 1024; // TODO
-	SAVESTATE_INIT_POS(36.1);
 
 	std::vector<content_id_type> content_ids;
 };
 
-static const std::string link_base = "/dev_hdd0/.tmp/"; // WipEout HD does not like it if we return a path starting with "/.tmp", so let's use "/dev_hdd0"
-
-error_code check_search_state(search_state state, search_state action)
+template <typename D>
+void parse_metadata(D& dst, const utils::media_info& mi, const std::string& key, const std::string& def, usz max_length)
 {
-	switch (action)
+	std::string value = mi.get_metadata<std::string>(key, def);
+	if (value.size() > max_length)
 	{
-	case search_state::initializing:
-		switch (state)
-		{
-		case search_state::not_initialized:
-			break;
-		case search_state::initializing:
-			return CELL_SEARCH_ERROR_BUSY;
-		case search_state::finalizing:
-			return CELL_SEARCH_ERROR_FINALIZING;
-		default:
-			return CELL_SEARCH_ERROR_ALREADY_INITIALIZED;
-		}
-		break;
-	case search_state::finalizing:
-		switch (state)
-		{
-		case search_state::idle:
-			break;
-		case search_state::not_initialized:
-			return CELL_SEARCH_ERROR_NOT_INITIALIZED;
-		case search_state::finalizing:
-			return CELL_SEARCH_ERROR_FINALIZING;
-		case search_state::in_progress:
-		case search_state::initializing:
-		case search_state::canceling:
-			return CELL_SEARCH_ERROR_BUSY;
-		default:
-			return CELL_SEARCH_ERROR_GENERIC;
-		}
-		break;
-	case search_state::canceling:
-		switch (state)
-		{
-		case search_state::in_progress:
-			break;
-		case search_state::not_initialized:
-		case search_state::initializing:
-			return CELL_SEARCH_ERROR_NOT_INITIALIZED;
-		case search_state::finalizing:
-			return CELL_SEARCH_ERROR_FINALIZING;
-		case search_state::canceling:
-			return CELL_SEARCH_ERROR_BUSY;
-		case search_state::idle:
-			return CELL_SEARCH_ERROR_ALREADY_GOT_RESULT;
-		default:
-			return CELL_SEARCH_ERROR_GENERIC;
-		}
-		break;
-	case search_state::in_progress:
-	default:
-		switch (state)
-		{
-		case search_state::idle:
-			break;
-		case search_state::not_initialized:
-		case search_state::initializing:
-			return CELL_SEARCH_ERROR_NOT_INITIALIZED;
-		case search_state::finalizing:
-			return CELL_SEARCH_ERROR_FINALIZING;
-		case search_state::in_progress:
-		case search_state::canceling:
-			return CELL_SEARCH_ERROR_BUSY;
-		default:
-			return CELL_SEARCH_ERROR_GENERIC;
-		}
-		break;
+		value.resize(max_length);
 	}
-
-	return CELL_OK;
-}
+	strcpy_trunc(dst, value);
+};
 
 void populate_music_info(CellSearchMusicInfo& info, const utils::media_info& mi, const fs::dir_entry& item)
 {
@@ -204,12 +124,9 @@ void populate_music_info(CellSearchMusicInfo& info, const utils::media_info& mi,
 	// Special case: track is usually stored as e.g. 2/11
 	const std::string tmp = mi.get_metadata<std::string>("track", ""s);
 	s64 value{};
-	if (tmp.empty() || !try_to_int64(&value, tmp.substr(0, tmp.find('/')).c_str(), s32{smin}, s32{smax}))
-	{
-		value = -1;
-	}
+	const bool success = try_to_int64(&value, tmp.substr(0, tmp.find('/')).c_str(), s32{smin}, s32{smax});
+	info.trackNumber = success ? static_cast<s32>(value) : -1;
 
-	info.trackNumber = static_cast<s32>(value);
 	info.size = item.size;
 	info.releasedYear = static_cast<s32>(mi.get_metadata<s64>("date", -1));
 	info.duration = mi.duration_us / 1000; // we need microseconds
@@ -263,13 +180,6 @@ void populate_music_info(CellSearchMusicInfo& info, const utils::media_info& mi,
 		info.status = CELL_SEARCH_CONTENTSTATUS_NOT_SUPPORTED;
 		break;
 	}
-
-	cellSearch.notice("CellSearchMusicInfo:, title=%s, albumTitle=%s, artistName=%s, genreName=%s, diskNumber=%s, "
-		"trackNumber=%d, duration=%d, size=%d, importedDate=%d, lastPlayedDate=%d, releasedYear=%d, bitrate=%d, "
-		"samplingRate=%d, quantizationBitrate=%d, playCount=%d, drmEncrypted=%d, codec=%d, status=%d",
-		info.title, info.albumTitle, info.artistName, info.genreName, info.diskNumber,
-		info.trackNumber, info.duration, info.size, info.importedDate, info.lastPlayedDate, info.releasedYear, info.bitrate,
-		info.samplingRate, info.quantizationBitrate, info.playCount, info.drmEncrypted, info.codec, info.status);
 }
 
 void populate_video_info(CellSearchVideoInfo& info, const utils::media_info& mi, const fs::dir_entry& item)
@@ -368,80 +278,34 @@ void populate_video_info(CellSearchVideoInfo& info, const utils::media_info& mi,
 		info.status = CELL_SEARCH_CONTENTSTATUS_NOT_SUPPORTED;
 		break;
 	}
-
-	cellSearch.notice("CellSearchVideoInfo: title='%s', albumTitle='%s', duration=%d, size=%d, importedDate=%d, takenDate=%d, "
-		"videoBitrate=%d, audioBitrate=%d, playCount=%d, drmEncrypted=%d, videoCodec=%d, audioCodec=%d, status=%d",
-		info.title, info.albumTitle, info.duration, info.size, info.importedDate, info.takenDate,
-		info.videoBitrate, info.audioBitrate, info.playCount, info.drmEncrypted, info.videoCodec, info.audioCodec, info.status);
-}
-
-void populate_photo_info(CellSearchPhotoInfo& info, const utils::media_info& mi, const fs::dir_entry& item)
-{
-	// TODO - Some kinda file photo analysis and assign the values as such
-	info.size = item.size;
-	info.importedDate = -1;
-	info.takenDate = -1;
-	info.width = mi.width;
-	info.height = mi.height;
-	info.orientation = mi.orientation;
-	info.status = CELL_SEARCH_CONTENTSTATUS_AVAILABLE;
-	strcpy_trunc(info.title, item.name.substr(0, item.name.find_last_of('.')));
-	strcpy_trunc(info.albumTitle, "ALBUM TITLE");
-
-	const std::string sub_type = fmt::to_lower(mi.sub_type);
-
-	if (sub_type == "jpg" || sub_type == "jpeg")
-	{
-		info.codec = CELL_SEARCH_CODEC_JPEG;
-	}
-	else if (sub_type == "png")
-	{
-		info.codec = CELL_SEARCH_CODEC_PNG;
-	}
-	else if (sub_type == "tif" || sub_type == "tiff")
-	{
-		info.codec = CELL_SEARCH_CODEC_TIFF;
-	}
-	else if (sub_type == "bmp")
-	{
-		info.codec = CELL_SEARCH_CODEC_BMP;
-	}
-	else if (sub_type == "gif")
-	{
-		info.codec = CELL_SEARCH_CODEC_GIF;
-	}
-	else if (sub_type == "mpo")
-	{
-		info.codec = CELL_SEARCH_CODEC_MPO;
-	}
-	else
-	{
-		info.codec = CELL_SEARCH_CODEC_UNKNOWN;
-	}
-
-	cellSearch.notice("CellSearchPhotoInfo: title='%s', albumTitle='%s', size=%d, width=%d, height=%d, orientation=%d, codec=%d, status=%d, importedDate=%d, takenDate=%d",
-		info.title, info.albumTitle, info.size, info.width, info.height, info.orientation, info.codec, info.status, info.importedDate, info.takenDate);
 }
 
 error_code cellSearchInitialize(CellSearchMode mode, u32 container, vm::ptr<CellSearchSystemCallback> func, vm::ptr<void> userData)
 {
 	cellSearch.warning("cellSearchInitialize(mode=0x%x, container=0x%x, func=*0x%x, userData=*0x%x)", +mode, container, func, userData);
 
-	if (mode != CELL_SEARCH_MODE_NORMAL)
-	{
-		return CELL_SEARCH_ERROR_UNKNOWN_MODE;
-	}
-
 	if (!func)
 	{
 		return CELL_SEARCH_ERROR_PARAM;
 	}
 
+	if (mode != CELL_SEARCH_MODE_NORMAL)
+	{
+		return CELL_SEARCH_ERROR_UNKNOWN_MODE;
+	}
+
 	auto& search = g_fxo->get<search_info>();
 
-	if (error_code error = check_search_state(search.state.compare_and_swap(search_state::not_initialized, search_state::initializing), search_state::initializing))
+	switch (search.state.compare_and_swap(search_state::not_initialized, search_state::initializing))
 	{
-		return error;
+	case search_state::not_initialized:
+		break;
+	case search_state::initializing:
+		return CELL_SEARCH_ERROR_BUSY;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	default:
+		return CELL_SEARCH_ERROR_ALREADY_INITIALIZED;
 	}
 
 	search.func = func;
@@ -463,9 +327,20 @@ error_code cellSearchFinalize()
 
 	auto& search = g_fxo->get<search_info>();
 
-	if (error_code error = check_search_state(search.state.compare_and_swap(search_state::idle, search_state::finalizing), search_state::finalizing))
+	switch (search.state.compare_and_swap(search_state::idle, search_state::finalizing))
 	{
-		return error;
+	case search_state::idle:
+		break;
+	case search_state::not_initialized:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::in_progress:
+	case search_state::initializing:
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
 	sysutil_register_cb([&search](ppu_thread& ppu) -> s32
@@ -491,9 +366,6 @@ error_code cellSearchStartListSearch(CellSearchListSearchType type, CellSearchSo
 		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	// Reset values first
-	*outSearchId = 0;
-
 	const char* media_dir;
 
 	switch (type)
@@ -513,7 +385,6 @@ error_code cellSearchStartListSearch(CellSearchListSearchType type, CellSearchSo
 	case CELL_SEARCH_LISTSEARCHTYPE_VIDEO_ALBUM:
 		media_dir = "video";
 		break;
-	case CELL_SEARCH_LISTSEARCHTYPE_NONE:
 	default:
 		return CELL_SEARCH_ERROR_PARAM;
 	}
@@ -523,23 +394,29 @@ error_code cellSearchStartListSearch(CellSearchListSearchType type, CellSearchSo
 		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	if (sortOrder != CELL_SEARCH_SORTORDER_ASCENDING)
-	{
-		return CELL_SEARCH_ERROR_NOT_SUPPORTED_SEARCH;
-	}
-
 	auto& search = g_fxo->get<search_info>();
 
-	if (error_code error = check_search_state(search.state.compare_and_swap(search_state::idle, search_state::in_progress), search_state::in_progress))
+	switch (search.state.compare_and_swap(search_state::idle, search_state::in_progress))
 	{
-		return error;
+	case search_state::idle:
+		break;
+	case search_state::not_initialized:
+	case search_state::initializing:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::in_progress:
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
 	const u32 id = *outSearchId = idm::make<search_object_t>();
 
 	sysutil_register_cb([=, &content_map = g_fxo->get<content_id_map>(), &search](ppu_thread& ppu) -> s32
 	{
-		auto curr_search = idm::get_unlocked<search_object_t>(id);
+		auto curr_search = idm::get<search_object_t>(id);
 		vm::var<CellSearchResultParam> resultParam;
 		resultParam->searchId = id;
 		resultParam->resultNum = 0; // Set again later
@@ -588,7 +465,12 @@ error_code cellSearchStartListSearch(CellSearchListSearchType type, CellSearchSo
 			{
 				item.name = vfs::unescape(item.name);
 
-				if (item.name == "." || item.name == ".." || !item.is_directory)
+				if (item.name == "." || item.name == "..")
+				{
+					continue;
+				}
+
+				if (!item.is_directory)
 				{
 					continue;
 				}
@@ -613,18 +495,19 @@ error_code cellSearchStartListSearch(CellSearchListSearchType type, CellSearchSo
 				auto found = content_map.map.find(hash);
 				if (found == content_map.map.end()) // content isn't yet being tracked
 				{
-					shared_ptr<search_content_t> curr_find = make_shared<search_content_t>();
+					//auto ext_offset = item.name.find_last_of('.'); // used later if no "Title" found
+
+					std::shared_ptr<search_content_t> curr_find = std::make_shared<search_content_t>();
 					if (item_path.length() > CELL_SEARCH_PATH_LEN_MAX)
 					{
 						// TODO: Create mapping which will be resolved to an actual hard link in VFS by cellSearchPrepareFile
 						cellSearch.warning("cellSearchStartListSearch(): Directory-Path \"%s\" is too long and will be omitted: %i", item_path, item_path.length());
 						continue;
-						// const size_t ext_offset = item.name.find_last_of('.');
-						// std::string link = link_base + std::to_string(hash) + item.name.substr(ext_offset);
+						// std::string link = "/.tmp/" + std::to_string(hash) + item.name.substr(ext_offset);
 						// strcpy_trunc(curr_find->infoPath.contentPath, link);
 
 						// std::lock_guard lock(search.links_mutex);
-						// search.content_links.emplace(std::move(link), search_info::link_data{ .path = item_path, .is_dir = true });
+						// search.content_links.emplace(std::move(link), item_path);
 					}
 					else
 					{
@@ -650,9 +533,6 @@ error_code cellSearchStartListSearch(CellSearchListSearchType type, CellSearchSo
 						info.duration = 0;
 						strcpy_trunc(info.title, item.name);
 						strcpy_trunc(info.artistName, "ARTIST NAME");
-
-						cellSearch.notice("CellSearchMusicListInfo: title='%s', artistName='%s', listType=%d, numOfItems=%d, duration=%d",
-							info.title, info.artistName, info.listType, info.numOfItems, info.duration);
 						break;
 					}
 					case CELL_SEARCH_LISTSEARCHTYPE_PHOTO_YEAR:
@@ -665,9 +545,6 @@ error_code cellSearchStartListSearch(CellSearchListSearchType type, CellSearchSo
 						info.listType = type; // CellSearchListType matches CellSearchListSearchType
 						info.numOfItems = numOfItems;
 						strcpy_trunc(info.title, item.name);
-
-						cellSearch.notice("CellSearchPhotoListInfo: title='%s', listType=%d, numOfItems=%d",
-							info.title, info.listType, info.numOfItems);
 						break;
 					}
 					case CELL_SEARCH_LISTSEARCHTYPE_VIDEO_ALBUM:
@@ -678,15 +555,10 @@ error_code cellSearchStartListSearch(CellSearchListSearchType type, CellSearchSo
 						info.numOfItems = numOfItems;
 						info.duration = 0;
 						strcpy_trunc(info.title, item.name);
-
-						cellSearch.notice("CellSearchVideoListInfo: title='%s', listType=%d, numOfItems=%d, duration=%d",
-							info.title, info.listType, info.numOfItems, info.duration);
 						break;
 					}
-					case CELL_SEARCH_LISTSEARCHTYPE_NONE:
 					default:
 					{
-						// Should be unreachable, because it is already handled in the main function
 						break;
 					}
 					}
@@ -694,7 +566,7 @@ error_code cellSearchStartListSearch(CellSearchListSearchType type, CellSearchSo
 					content_map.map.emplace(hash, curr_find);
 					curr_search->content_ids.emplace_back(hash, curr_find); // place this file's "ID" into the list of found types
 
-					cellSearch.notice("cellSearchStartListSearch(): CellSearchId: 0x%x, Content ID: %08X, Path: \"%s\"", id, hash, item_path);
+					cellSearch.notice("cellSearchStartListSearch(): Content ID: %08X   Path: \"%s\"", hash, item_path);
 				}
 				else // list is already stored and tracked
 				{
@@ -702,9 +574,7 @@ error_code cellSearchStartListSearch(CellSearchListSearchType type, CellSearchSo
 					// Perform checks to see if the identified list has been modified since last checked
 					// In which case, update the stored content's properties
 					// auto content_found = &content_map->at(content_id);
-					curr_search->content_ids.emplace_back(found->first, found->second);
-
-					cellSearch.notice("cellSearchStartListSearch(): Already tracked: CellSearchId: 0x%x, Content ID: %08X, Path: \"%s\"", id, hash, item_path);
+					// curr_search->content_ids.emplace_back(found->first, found->second);
 				}
 			}
 		};
@@ -724,12 +594,6 @@ error_code cellSearchStartContentSearchInList(vm::cptr<CellSearchContentId> list
 {
 	cellSearch.todo("cellSearchStartContentSearchInList(listId=*0x%x, sortKey=0x%x, sortOrder=0x%x, outSearchId=*0x%x)", listId, +sortKey, +sortOrder, outSearchId);
 
-	// Reset values first
-	if (outSearchId)
-	{
-		*outSearchId = 0;
-	}
-
 	if (!listId || !outSearchId)
 	{
 		return CELL_SEARCH_ERROR_PARAM;
@@ -748,7 +612,6 @@ error_code cellSearchStartContentSearchInList(vm::cptr<CellSearchContentId> list
 	case CELL_SEARCH_SORTKEY_USERDEFINED:
 	case CELL_SEARCH_SORTKEY_MODIFIEDDATE:
 		break;
-	case CELL_SEARCH_SORTKEY_NONE:
 	default:
 		return CELL_SEARCH_ERROR_PARAM;
 	}
@@ -760,9 +623,20 @@ error_code cellSearchStartContentSearchInList(vm::cptr<CellSearchContentId> list
 
 	auto& search = g_fxo->get<search_info>();
 
-	if (error_code error = check_search_state(search.state.compare_and_swap(search_state::idle, search_state::in_progress), search_state::in_progress))
+	switch (search.state.compare_and_swap(search_state::idle, search_state::in_progress))
 	{
-		return error;
+	case search_state::idle:
+		break;
+	case search_state::not_initialized:
+	case search_state::initializing:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::in_progress:
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
 	auto& content_map = g_fxo->get<content_id_map>();
@@ -791,7 +665,6 @@ error_code cellSearchStartContentSearchInList(vm::cptr<CellSearchContentId> list
 	case CELL_SEARCH_CONTENTTYPE_PHOTO:
 	case CELL_SEARCH_CONTENTTYPE_VIDEO:
 	case CELL_SEARCH_CONTENTTYPE_SCENE:
-	case CELL_SEARCH_CONTENTTYPE_NONE:
 	default:
 		return CELL_SEARCH_ERROR_NOT_LIST;
 	}
@@ -800,7 +673,7 @@ error_code cellSearchStartContentSearchInList(vm::cptr<CellSearchContentId> list
 
 	sysutil_register_cb([=, list_path = std::string(content_info->infoPath.contentPath), &search, &content_map](ppu_thread& ppu) -> s32
 	{
-		auto curr_search = idm::get_unlocked<search_object_t>(id);
+		auto curr_search = idm::get<search_object_t>(id);
 		vm::var<CellSearchResultParam> resultParam;
 		resultParam->searchId = id;
 		resultParam->resultNum = 0; // Set again later
@@ -855,16 +728,17 @@ error_code cellSearchStartContentSearchInList(vm::cptr<CellSearchContentId> list
 				auto found = content_map.map.find(hash);
 				if (found == content_map.map.end()) // content isn't yet being tracked
 				{
-					shared_ptr<search_content_t> curr_find = make_shared<search_content_t>();
+					auto ext_offset = item.name.find_last_of('.'); // used later if no "Title" found
+
+					std::shared_ptr<search_content_t> curr_find = std::make_shared<search_content_t>();
 					if (item_path.length() > CELL_SEARCH_PATH_LEN_MAX)
 					{
 						// Create mapping which will be resolved to an actual hard link in VFS by cellSearchPrepareFile
-						const size_t ext_offset = item.name.find_last_of('.');
-						std::string link = link_base + std::to_string(hash) + item.name.substr(ext_offset);
+						std::string link = "/.tmp/" + std::to_string(hash) + item.name.substr(ext_offset);
 						strcpy_trunc(curr_find->infoPath.contentPath, link);
 
 						std::lock_guard lock(search.links_mutex);
-						search.content_links.emplace(std::move(link), search_info::link_data{ .path = item_path, .is_dir = false });
+						search.content_links.emplace(std::move(link), item_path);
 					}
 					else
 					{
@@ -873,13 +747,11 @@ error_code cellSearchStartContentSearchInList(vm::cptr<CellSearchContentId> list
 
 					// TODO - curr_find.infoPath.thumbnailPath
 
-					switch (type)
-					{
-					case CELL_SEARCH_CONTENTSEARCHTYPE_MUSIC_ALL:
+					if (type == CELL_SEARCH_CONTENTSEARCHTYPE_MUSIC_ALL)
 					{
 						curr_find->type = CELL_SEARCH_CONTENTTYPE_MUSIC;
 
-						const std::string path = vfs::get(item_path);
+						const std::string path = vfs::get(vpath) + "/" + item.name;
 						const auto [success, mi] = utils::get_media_info(path, 1); // AVMEDIA_TYPE_AUDIO
 						if (!success)
 						{
@@ -887,20 +759,28 @@ error_code cellSearchStartContentSearchInList(vm::cptr<CellSearchContentId> list
 						}
 
 						populate_music_info(curr_find->data.music, mi, item);
-						break;
 					}
-					case CELL_SEARCH_CONTENTSEARCHTYPE_PHOTO_ALL:
+					else if (type == CELL_SEARCH_CONTENTSEARCHTYPE_PHOTO_ALL)
 					{
 						curr_find->type = CELL_SEARCH_CONTENTTYPE_PHOTO;
-
-						populate_photo_info(curr_find->data.photo, {}, item);
-						break;
+						CellSearchPhotoInfo& info = curr_find->data.photo;
+						// TODO - Some kinda file photo analysis and assign the values as such
+						info.size = item.size;
+						info.importedDate = 0;
+						info.takenDate = 0;
+						info.width = 0;
+						info.height = 0;
+						info.orientation = 0;  // CellSearchOrientation
+						info.codec = 0;        // CellSearchCodec
+						info.status = 0;       // CellSearchContentStatus
+						strcpy_trunc(info.title, item.name.substr(0, ext_offset));
+						strcpy_trunc(info.albumTitle, "ALBUM TITLE");
 					}
-					case CELL_SEARCH_CONTENTSEARCHTYPE_VIDEO_ALL:
+					else if (type == CELL_SEARCH_CONTENTSEARCHTYPE_VIDEO_ALL)
 					{
 						curr_find->type = CELL_SEARCH_CONTENTTYPE_VIDEO;
 
-						const std::string path = vfs::get(item_path);
+						const std::string path = vfs::get(vpath) + "/" + item.name;
 						const auto [success, mi] = utils::get_media_info(path, 0); // AVMEDIA_TYPE_VIDEO
 						if (!success)
 						{
@@ -908,20 +788,12 @@ error_code cellSearchStartContentSearchInList(vm::cptr<CellSearchContentId> list
 						}
 
 						populate_video_info(curr_find->data.video, mi, item);
-						break;
-					}
-					case CELL_SEARCH_CONTENTSEARCHTYPE_NONE:
-					default:
-					{
-						// Should be unreachable, because it is already handled in the main function
-						break;
-					}
 					}
 
 					content_map.map.emplace(hash, curr_find);
 					curr_search->content_ids.emplace_back(hash, curr_find); // place this file's "ID" into the list of found types
 
-					cellSearch.notice("cellSearchStartContentSearchInList(): CellSearchId: 0x%x, Content ID: %08X, Path: \"%s\"", id, hash, item_path);
+					cellSearch.notice("cellSearchStartContentSearchInList(): Content ID: %08X   Path: \"%s\"", hash, item_path);
 				}
 				else // file is already stored and tracked
 				{
@@ -930,8 +802,6 @@ error_code cellSearchStartContentSearchInList(vm::cptr<CellSearchContentId> list
 					// In which case, update the stored content's properties
 					// auto content_found = &content_map->at(content_id);
 					curr_search->content_ids.emplace_back(found->first, found->second);
-
-					cellSearch.notice("cellSearchStartContentSearchInList(): Already Tracked: CellSearchId: 0x%x, Content ID: %08X, Path: \"%s\"", id, hash, item_path);
 				}
 			}
 		};
@@ -951,12 +821,6 @@ error_code cellSearchStartContentSearch(CellSearchContentSearchType type, CellSe
 {
 	cellSearch.todo("cellSearchStartContentSearch(type=0x%x, sortKey=0x%x, sortOrder=0x%x, outSearchId=*0x%x)", +type, +sortKey, +sortOrder, outSearchId);
 
-	// Reset values first
-	if (outSearchId)
-	{
-		*outSearchId = 0;
-	}
-
 	if (!outSearchId)
 	{
 		return CELL_SEARCH_ERROR_PARAM;
@@ -975,7 +839,6 @@ error_code cellSearchStartContentSearch(CellSearchContentSearchType type, CellSe
 	case CELL_SEARCH_SORTKEY_USERDEFINED:
 	case CELL_SEARCH_SORTKEY_MODIFIEDDATE:
 		break;
-	case CELL_SEARCH_SORTKEY_NONE:
 	default:
 		return CELL_SEARCH_ERROR_PARAM;
 	}
@@ -991,76 +854,33 @@ error_code cellSearchStartContentSearch(CellSearchContentSearchType type, CellSe
 	case CELL_SEARCH_CONTENTSEARCHTYPE_MUSIC_ALL: media_dir = "music"; break;
 	case CELL_SEARCH_CONTENTSEARCHTYPE_PHOTO_ALL: media_dir = "photo"; break;
 	case CELL_SEARCH_CONTENTSEARCHTYPE_VIDEO_ALL: media_dir = "video"; break;
-	case CELL_SEARCH_CONTENTSEARCHTYPE_NONE:
 	default:
 		return CELL_SEARCH_ERROR_PARAM;
 	}
 
 	auto& search = g_fxo->get<search_info>();
 
-	if (error_code error = check_search_state(search.state.compare_and_swap(search_state::idle, search_state::in_progress), search_state::in_progress))
+	switch (search.state.compare_and_swap(search_state::idle, search_state::in_progress))
 	{
-		return error;
-	}
-
-	if (sortKey == CELL_SEARCH_SORTKEY_DEFAULT)
-	{
-		switch (type)
-		{
-		case CELL_SEARCH_CONTENTSEARCHTYPE_MUSIC_ALL: sortKey = CELL_SEARCH_SORTKEY_ARTISTNAME; break;
-		case CELL_SEARCH_CONTENTSEARCHTYPE_PHOTO_ALL: sortKey = CELL_SEARCH_SORTKEY_TAKENDATE; break;
-		case CELL_SEARCH_CONTENTSEARCHTYPE_VIDEO_ALL: sortKey = CELL_SEARCH_SORTKEY_TITLE; break;
-		default: break;
-		}
-	}
-
-	if (sortKey != CELL_SEARCH_SORTKEY_IMPORTEDDATE && sortKey != CELL_SEARCH_SORTKEY_MODIFIEDDATE)
-	{
-		switch (type)
-		{
-		case CELL_SEARCH_CONTENTSEARCHTYPE_MUSIC_ALL:
-		{
-			if (sortOrder != CELL_SEARCH_SORTORDER_ASCENDING)
-			{
-				return CELL_SEARCH_ERROR_NOT_SUPPORTED_SEARCH;
-			}
-			if (sortKey != CELL_SEARCH_SORTKEY_ARTISTNAME &&
-				sortKey != CELL_SEARCH_SORTKEY_ALBUMTITLE &&
-				sortKey != CELL_SEARCH_SORTKEY_GENRENAME &&
-				sortKey != CELL_SEARCH_SORTKEY_TITLE)
-			{
-				return CELL_SEARCH_ERROR_NOT_SUPPORTED_SEARCH;
-			}
-			break;
-		}
-		case CELL_SEARCH_CONTENTSEARCHTYPE_PHOTO_ALL:
-		{
-			if (sortKey != CELL_SEARCH_SORTKEY_TAKENDATE)
-			{
-				if (sortOrder != CELL_SEARCH_SORTORDER_ASCENDING || sortKey != CELL_SEARCH_SORTKEY_TITLE)
-				{
-					return CELL_SEARCH_ERROR_NOT_SUPPORTED_SEARCH;
-				}
-			}
-			break;
-		}
-		case CELL_SEARCH_CONTENTSEARCHTYPE_VIDEO_ALL:
-		{
-			if (sortOrder != CELL_SEARCH_SORTORDER_ASCENDING || sortKey != CELL_SEARCH_SORTKEY_TITLE)
-			{
-				return CELL_SEARCH_ERROR_NOT_SUPPORTED_SEARCH;
-			}
-			break;
-		}
-		default: break;
-		}
+	case search_state::idle:
+		break;
+	case search_state::not_initialized:
+	case search_state::initializing:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::in_progress:
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
 	const u32 id = *outSearchId = idm::make<search_object_t>();
 
 	sysutil_register_cb([=, &content_map = g_fxo->get<content_id_map>(), &search](ppu_thread& ppu) -> s32
 	{
-		auto curr_search = idm::get_unlocked<search_object_t>(id);
+		auto curr_search = idm::get<search_object_t>(id);
 		vm::var<CellSearchResultParam> resultParam;
 		resultParam->searchId = id;
 		resultParam->resultNum = 0; // Set again later
@@ -1096,16 +916,17 @@ error_code cellSearchStartContentSearch(CellSearchContentSearchType type, CellSe
 				auto found = content_map.map.find(hash);
 				if (found == content_map.map.end()) // content isn't yet being tracked
 				{
-					shared_ptr<search_content_t> curr_find = make_shared<search_content_t>();
+					auto ext_offset = item.name.find_last_of('.'); // used later if no "Title" found
+
+					std::shared_ptr<search_content_t> curr_find = std::make_shared<search_content_t>();
 					if (item_path.length() > CELL_SEARCH_PATH_LEN_MAX)
 					{
 						// Create mapping which will be resolved to an actual hard link in VFS by cellSearchPrepareFile
-						const size_t ext_offset = item.name.find_last_of('.');
-						std::string link = link_base + std::to_string(hash) + item.name.substr(ext_offset);
+						std::string link = "/.tmp/" + std::to_string(hash) + item.name.substr(ext_offset);
 						strcpy_trunc(curr_find->infoPath.contentPath, link);
 
 						std::lock_guard lock(search.links_mutex);
-						search.content_links.emplace(std::move(link), search_info::link_data{ .path = item_path, .is_dir = false });
+						search.content_links.emplace(std::move(link), item_path);
 					}
 					else
 					{
@@ -1114,13 +935,11 @@ error_code cellSearchStartContentSearch(CellSearchContentSearchType type, CellSe
 
 					// TODO - curr_find.infoPath.thumbnailPath
 
-					switch (type)
-					{
-					case CELL_SEARCH_CONTENTSEARCHTYPE_MUSIC_ALL:
+					if (type == CELL_SEARCH_CONTENTSEARCHTYPE_MUSIC_ALL)
 					{
 						curr_find->type = CELL_SEARCH_CONTENTTYPE_MUSIC;
 
-						const std::string path = vfs::get(item_path);
+						const std::string path = vfs::get(vpath) + "/" + item.name;
 						const auto [success, mi] = utils::get_media_info(path, 1); // AVMEDIA_TYPE_AUDIO
 						if (!success)
 						{
@@ -1128,20 +947,28 @@ error_code cellSearchStartContentSearch(CellSearchContentSearchType type, CellSe
 						}
 
 						populate_music_info(curr_find->data.music, mi, item);
-						break;
 					}
-					case CELL_SEARCH_CONTENTSEARCHTYPE_PHOTO_ALL:
+					else if (type == CELL_SEARCH_CONTENTSEARCHTYPE_PHOTO_ALL)
 					{
 						curr_find->type = CELL_SEARCH_CONTENTTYPE_PHOTO;
-
-						populate_photo_info(curr_find->data.photo, {}, item);
-						break;
+						CellSearchPhotoInfo& info = curr_find->data.photo;
+						// TODO - Some kinda file photo analysis and assign the values as such
+						info.size = item.size;
+						info.importedDate = -1;
+						info.takenDate = -1;
+						info.width = 0;
+						info.height = 0;
+						info.orientation = CELL_SEARCH_ORIENTATION_UNKNOWN;
+						info.codec = CELL_SEARCH_CODEC_UNKNOWN;
+						info.status = CELL_SEARCH_CONTENTSTATUS_AVAILABLE;
+						strcpy_trunc(info.title, item.name.substr(0, ext_offset));
+						strcpy_trunc(info.albumTitle, "ALBUM TITLE");
 					}
-					case CELL_SEARCH_CONTENTSEARCHTYPE_VIDEO_ALL:
+					else if (type == CELL_SEARCH_CONTENTSEARCHTYPE_VIDEO_ALL)
 					{
 						curr_find->type = CELL_SEARCH_CONTENTTYPE_VIDEO;
 
-						const std::string path = vfs::get(item_path);
+						const std::string path = vfs::get(vpath) + "/" + item.name;
 						const auto [success, mi] = utils::get_media_info(path, 0); // AVMEDIA_TYPE_VIDEO
 						if (!success)
 						{
@@ -1149,30 +976,19 @@ error_code cellSearchStartContentSearch(CellSearchContentSearchType type, CellSe
 						}
 
 						populate_video_info(curr_find->data.video, mi, item);
-						break;
-					}
-					case CELL_SEARCH_CONTENTSEARCHTYPE_NONE:
-					default:
-					{
-						// Should be unreachable, because it is already handled in the main function
-						break;
-					}
 					}
 
 					content_map.map.emplace(hash, curr_find);
 					curr_search->content_ids.emplace_back(hash, curr_find); // place this file's "ID" into the list of found types
 
-					cellSearch.notice("cellSearchStartContentSearch(): CellSearchId: 0x%x, Content ID: %08X, Path: \"%s\"", id, hash, item_path);
+					cellSearch.notice("cellSearchStartContentSearch(): Content ID: %08X   Path: \"%s\"", hash, item_path);
 				}
 				else // file is already stored and tracked
-				{
-					// TODO
+				{ // TODO
 					// Perform checks to see if the identified file has been modified since last checked
 					// In which case, update the stored content's properties
 					// auto content_found = &content_map->at(content_id);
 					curr_search->content_ids.emplace_back(found->first, found->second);
-
-					cellSearch.notice("cellSearchStartContentSearch(): Already Tracked: CellSearchId: 0x%x, Content ID: %08X, Path: \"%s\"", id, hash, item_path);
 				}
 			}
 		};
@@ -1192,12 +1008,6 @@ error_code cellSearchStartSceneSearchInVideo(vm::cptr<CellSearchContentId> video
 {
 	cellSearch.todo("cellSearchStartSceneSearchInVideo(videoId=*0x%x, searchType=0x%x, sortOrder=0x%x, outSearchId=*0x%x)", videoId, +searchType, +sortOrder, outSearchId);
 
-	// Reset values first
-	if (outSearchId)
-	{
-		*outSearchId = 0;
-	}
-
 	if (!videoId || !outSearchId)
 	{
 		return CELL_SEARCH_ERROR_PARAM;
@@ -1205,13 +1015,13 @@ error_code cellSearchStartSceneSearchInVideo(vm::cptr<CellSearchContentId> video
 
 	switch (searchType)
 	{
+	case CELL_SEARCH_SCENESEARCHTYPE_NONE:
 	case CELL_SEARCH_SCENESEARCHTYPE_CHAPTER:
 	case CELL_SEARCH_SCENESEARCHTYPE_CLIP_HIGHLIGHT:
 	case CELL_SEARCH_SCENESEARCHTYPE_CLIP_USER:
 	case CELL_SEARCH_SCENESEARCHTYPE_CLIP:
 	case CELL_SEARCH_SCENESEARCHTYPE_ALL:
 		break;
-	case CELL_SEARCH_SCENESEARCHTYPE_NONE:
 	default:
 		return CELL_SEARCH_ERROR_PARAM;
 	}
@@ -1223,23 +1033,20 @@ error_code cellSearchStartSceneSearchInVideo(vm::cptr<CellSearchContentId> video
 
 	auto& search = g_fxo->get<search_info>();
 
-	if (error_code error = check_search_state(search.state.compare_and_swap(search_state::idle, search_state::in_progress), search_state::in_progress))
+	switch (search.state.compare_and_swap(search_state::idle, search_state::in_progress))
 	{
-		return error;
-	}
-
-	auto& content_map = g_fxo->get<content_id_map>();
-	auto found = content_map.map.find(*reinterpret_cast<const u64*>(videoId->data));
-	if (found == content_map.map.end())
-	{
-		// content ID not found, perform a search first
-		return CELL_SEARCH_ERROR_CONTENT_NOT_FOUND;
-	}
-
-	const auto& content_info = found->second;
-	if (content_info->type != CELL_SEARCH_CONTENTTYPE_VIDEO)
-	{
-		return CELL_SEARCH_ERROR_INVALID_CONTENTTYPE;
+	case search_state::idle:
+		break;
+	case search_state::not_initialized:
+	case search_state::initializing:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::in_progress:
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
 	const u32 id = *outSearchId = idm::make<search_object_t>();
@@ -1262,12 +1069,6 @@ error_code cellSearchStartSceneSearch(CellSearchSceneSearchType searchType, vm::
 {
 	cellSearch.todo("cellSearchStartSceneSearch(searchType=0x%x, gameTitle=%s, tags=**0x%x, tagNum=0x%x, sortKey=0x%x, sortOrder=0x%x, outSearchId=*0x%x)", +searchType, gameTitle, tags, tagNum, +sortKey, +sortOrder, outSearchId);
 
-	// Reset values first
-	if (outSearchId)
-	{
-		*outSearchId = 0;
-	}
-
 	if (!gameTitle || !outSearchId)
 	{
 		return CELL_SEARCH_ERROR_PARAM;
@@ -1275,64 +1076,33 @@ error_code cellSearchStartSceneSearch(CellSearchSceneSearchType searchType, vm::
 
 	switch (searchType)
 	{
+	case CELL_SEARCH_SCENESEARCHTYPE_NONE:
 	case CELL_SEARCH_SCENESEARCHTYPE_CHAPTER:
 	case CELL_SEARCH_SCENESEARCHTYPE_CLIP_HIGHLIGHT:
 	case CELL_SEARCH_SCENESEARCHTYPE_CLIP_USER:
 	case CELL_SEARCH_SCENESEARCHTYPE_CLIP:
 	case CELL_SEARCH_SCENESEARCHTYPE_ALL:
 		break;
-	case CELL_SEARCH_SCENESEARCHTYPE_NONE:
 	default:
 		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	switch (sortKey)
-	{
-	case CELL_SEARCH_SORTKEY_DEFAULT:
-	case CELL_SEARCH_SORTKEY_TITLE:
-	case CELL_SEARCH_SORTKEY_ALBUMTITLE:
-	case CELL_SEARCH_SORTKEY_GENRENAME:
-	case CELL_SEARCH_SORTKEY_ARTISTNAME:
-	case CELL_SEARCH_SORTKEY_IMPORTEDDATE:
-	case CELL_SEARCH_SORTKEY_TRACKNUMBER:
-	case CELL_SEARCH_SORTKEY_TAKENDATE:
-	case CELL_SEARCH_SORTKEY_USERDEFINED:
-	case CELL_SEARCH_SORTKEY_MODIFIEDDATE:
-		break;
-	case CELL_SEARCH_SORTKEY_NONE:
-	default:
-		return CELL_SEARCH_ERROR_PARAM;
-	}
-
-	if (tagNum) // TODO: find out if this is the correct location for these checks
-	{
-		if (tagNum > CELL_SEARCH_TAG_NUM_MAX || !tags)
-		{
-			return CELL_SEARCH_ERROR_TAG;
-		}
-
-		for (u32 n = 0; n < tagNum; n++)
-		{
-			if (!tags[tagNum] || !memchr(&tags[tagNum], '\0', CELL_SEARCH_TAG_LEN_MAX))
-			{
-				return CELL_SEARCH_ERROR_TAG;
-			}
-		}
-	}
-
-	if (sortKey != CELL_SEARCH_SORTKEY_DEFAULT &&
-		sortKey != CELL_SEARCH_SORTKEY_IMPORTEDDATE &&
-		sortKey != CELL_SEARCH_SORTKEY_MODIFIEDDATE &&
-		(sortKey != CELL_SEARCH_SORTKEY_TITLE || sortOrder != CELL_SEARCH_SORTORDER_ASCENDING))
-	{
-		return CELL_SEARCH_ERROR_NOT_SUPPORTED_SEARCH;
-	}
-
 	auto& search = g_fxo->get<search_info>();
 
-	if (error_code error = check_search_state(search.state.compare_and_swap(search_state::idle, search_state::in_progress), search_state::in_progress))
+	switch (search.state.compare_and_swap(search_state::idle, search_state::in_progress))
 	{
-		return error;
+	case search_state::idle:
+		break;
+	case search_state::not_initialized:
+	case search_state::initializing:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::in_progress:
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
 	const u32 id = *outSearchId = idm::make<search_object_t>();
@@ -1355,67 +1125,60 @@ error_code cellSearchGetContentInfoByOffset(CellSearchId searchId, s32 offset, v
 {
 	cellSearch.warning("cellSearchGetContentInfoByOffset(searchId=0x%x, offset=0x%x, infoBuffer=*0x%x, outContentType=*0x%x, outContentId=*0x%x)", searchId, offset, infoBuffer, outContentType, outContentId);
 
-	// Reset values first
-	if (outContentType)
+	if (!outContentType)
 	{
-		*outContentType = CELL_SEARCH_CONTENTTYPE_NONE;
+		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	if (infoBuffer)
-	{
-		std::memset(infoBuffer.get_ptr(), 0, CELL_SEARCH_CONTENT_BUFFER_SIZE_MAX);
-	}
-
-	if (outContentId)
-	{
-		std::memset(outContentId->data, 0, 4);
-		std::memset(outContentId->data + 4, -1, CELL_SEARCH_CONTENT_ID_SIZE - 4);
-	}
-
-	const auto searchObject = idm::get_unlocked<search_object_t>(searchId);
+	const auto searchObject = idm::get<search_object_t>(searchId);
 
 	if (!searchObject)
 	{
 		return CELL_SEARCH_ERROR_INVALID_SEARCHID;
 	}
 
-	if (!outContentType || (!outContentId && !infoBuffer))
+	switch (g_fxo->get<search_info>().state.load())
 	{
-		return CELL_SEARCH_ERROR_PARAM;
-	}
-
-	if (error_code error = check_search_state(g_fxo->get<search_info>().state.load(), search_state::in_progress))
-	{
-		return error;
+	case search_state::idle:
+		break;
+	case search_state::not_initialized:
+	case search_state::initializing:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::in_progress:
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
 	if (offset >= 0 && offset + 0u < searchObject->content_ids.size())
 	{
 		const auto& content_id = searchObject->content_ids[offset];
 		const auto& content_info = content_id.second;
-
 		switch (content_info->type)
 		{
 		case CELL_SEARCH_CONTENTTYPE_MUSIC:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.music, sizeof(content_info->data.music));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.music, sizeof(content_info->data.music));
 			break;
 		case CELL_SEARCH_CONTENTTYPE_PHOTO:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.photo, sizeof(content_info->data.photo));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.photo, sizeof(content_info->data.photo));
 			break;
 		case CELL_SEARCH_CONTENTTYPE_VIDEO:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.video, sizeof(content_info->data.photo));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.video, sizeof(content_info->data.photo));
 			break;
 		case CELL_SEARCH_CONTENTTYPE_MUSICLIST:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.music_list, sizeof(content_info->data.music_list));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.music_list, sizeof(content_info->data.music_list));
 			break;
 		case CELL_SEARCH_CONTENTTYPE_PHOTOLIST:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.photo_list, sizeof(content_info->data.photo_list));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.photo_list, sizeof(content_info->data.photo_list));
 			break;
 		case CELL_SEARCH_CONTENTTYPE_VIDEOLIST:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.video_list, sizeof(content_info->data.video_list));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.video_list, sizeof(content_info->data.video_list));
 			break;
 		case CELL_SEARCH_CONTENTTYPE_SCENE:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.scene, sizeof(content_info->data.scene));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.scene, sizeof(content_info->data.scene));
 			break;
 		default:
 			return CELL_SEARCH_ERROR_GENERIC;
@@ -1423,11 +1186,7 @@ error_code cellSearchGetContentInfoByOffset(CellSearchId searchId, s32 offset, v
 
 		const u128 content_id_128 = content_id.first;
 		*outContentType = content_info->type;
-
-		if (outContentId)
-		{
-			std::memcpy(outContentId->data, &content_id_128, CELL_SEARCH_CONTENT_ID_SIZE);
-		}
+		std::memcpy(outContentId->data, &content_id_128, CELL_SEARCH_CONTENT_ID_SIZE);
 	}
 	else // content ID not found, perform a search first
 	{
@@ -1441,25 +1200,25 @@ error_code cellSearchGetContentInfoByContentId(vm::cptr<CellSearchContentId> con
 {
 	cellSearch.warning("cellSearchGetContentInfoByContentId(contentId=*0x%x, infoBuffer=*0x%x, outContentType=*0x%x)", contentId, infoBuffer, outContentType);
 
-	// Reset values first
-	if (outContentType)
-	{
-		*outContentType = CELL_SEARCH_CONTENTTYPE_NONE;
-	}
-
-	if (infoBuffer)
-	{
-		std::memset(infoBuffer.get_ptr(), 0, CELL_SEARCH_CONTENT_BUFFER_SIZE_MAX);
-	}
-
-	if (!outContentType || !contentId)
+	if (!outContentType)
 	{
 		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	if (error_code error = check_search_state(g_fxo->get<search_info>().state.load(), search_state::in_progress))
+	switch (g_fxo->get<search_info>().state.load())
 	{
-		return error;
+	case search_state::idle:
+		break;
+	case search_state::not_initialized:
+	case search_state::initializing:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::in_progress:
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
 	auto& content_map = g_fxo->get<content_id_map>();
@@ -1470,25 +1229,25 @@ error_code cellSearchGetContentInfoByContentId(vm::cptr<CellSearchContentId> con
 		switch (content_info->type)
 		{
 		case CELL_SEARCH_CONTENTTYPE_MUSIC:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.music, sizeof(content_info->data.music));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.music, sizeof(content_info->data.music));
 			break;
 		case CELL_SEARCH_CONTENTTYPE_PHOTO:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.photo, sizeof(content_info->data.photo));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.photo, sizeof(content_info->data.photo));
 			break;
 		case CELL_SEARCH_CONTENTTYPE_VIDEO:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.video, sizeof(content_info->data.photo));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.video, sizeof(content_info->data.photo));
 			break;
 		case CELL_SEARCH_CONTENTTYPE_MUSICLIST:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.music_list, sizeof(content_info->data.music_list));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.music_list, sizeof(content_info->data.music_list));
 			break;
 		case CELL_SEARCH_CONTENTTYPE_PHOTOLIST:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.photo_list, sizeof(content_info->data.photo_list));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.photo_list, sizeof(content_info->data.photo_list));
 			break;
 		case CELL_SEARCH_CONTENTTYPE_VIDEOLIST:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.video_list, sizeof(content_info->data.video_list));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.video_list, sizeof(content_info->data.video_list));
 			break;
 		case CELL_SEARCH_CONTENTTYPE_SCENE:
-			if (infoBuffer) std::memcpy(infoBuffer.get_ptr(), &content_info->data.scene, sizeof(content_info->data.scene));
+			std::memcpy(infoBuffer.get_ptr(), &content_info->data.scene, sizeof(content_info->data.scene));
 			break;
 		default:
 			return CELL_SEARCH_ERROR_GENERIC;
@@ -1508,28 +1267,34 @@ error_code cellSearchGetOffsetByContentId(CellSearchId searchId, vm::cptr<CellSe
 {
 	cellSearch.warning("cellSearchGetOffsetByContentId(searchId=0x%x, contentId=*0x%x, outOffset=*0x%x)", searchId, contentId, outOffset);
 
-	if (outOffset)
+	if (!outOffset)
 	{
-		*outOffset = -1;
+		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	if (error_code error = check_search_state(g_fxo->get<search_info>().state.load(), search_state::in_progress))
+	switch (g_fxo->get<search_info>().state.load())
 	{
-		return error;
+	case search_state::idle:
+		break;
+	case search_state::not_initialized:
+	case search_state::initializing:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::in_progress:
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
-	const auto searchObject = idm::get_unlocked<search_object_t>(searchId);
+	const auto searchObject = idm::get<search_object_t>(searchId);
 
 	if (!searchObject)
 	{
 		return CELL_SEARCH_ERROR_INVALID_SEARCHID;
 	}
 
-	if (!outOffset || !contentId)
-	{
-		return CELL_SEARCH_ERROR_PARAM;
-	}
-
 	s32 i = 0;
 	const u64 content_hash = *reinterpret_cast<const u64*>(contentId->data);
 	for (auto& content_id : searchObject->content_ids)
@@ -1549,52 +1314,44 @@ error_code cellSearchGetContentIdByOffset(CellSearchId searchId, s32 offset, vm:
 {
 	cellSearch.todo("cellSearchGetContentIdByOffset(searchId=0x%x, offset=0x%x, outContentType=*0x%x, outContentId=*0x%x, outTimeInfo=*0x%x)", searchId, offset, outContentType, outContentId, outTimeInfo);
 
-	// Reset values first
-	if (outTimeInfo)
+	if (!outContentType || !outContentId)
 	{
-		outTimeInfo->modifiedDate = -1;
-		outTimeInfo->takenDate = -1;
-		outTimeInfo->importedDate = -1;
+		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	if (outContentType)
-	{
-		*outContentType = CELL_SEARCH_CONTENTTYPE_NONE;
-	}
-
-	if (outContentId)
-	{
-		std::memset(outContentId->data, 0, 4);
-		std::memset(outContentId->data + 4, -1, CELL_SEARCH_CONTENT_ID_SIZE - 4);
-	}
-
-	const auto searchObject = idm::get_unlocked<search_object_t>(searchId);
+	const auto searchObject = idm::get<search_object_t>(searchId);
 
 	if (!searchObject)
 	{
 		return CELL_SEARCH_ERROR_INVALID_SEARCHID;
 	}
 
-	if (!outContentType || !outContentId)
+	switch (g_fxo->get<search_info>().state.load())
 	{
-		return CELL_SEARCH_ERROR_PARAM;
-	}
-
-	if (error_code error = check_search_state(g_fxo->get<search_info>().state.load(), search_state::in_progress))
-	{
-		return error;
+	case search_state::idle:
+		break;
+	case search_state::not_initialized:
+	case search_state::initializing:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::in_progress:
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
 	if (offset >= 0 && offset + 0u < searchObject->content_ids.size())
 	{
-		auto& content_id = ::at32(searchObject->content_ids, offset);
+		auto& content_id = searchObject->content_ids.at(offset);
 		const u128 content_id_128 = content_id.first;
 		*outContentType = content_id.second->type;
 		std::memcpy(outContentId->data, &content_id_128, CELL_SEARCH_CONTENT_ID_SIZE);
 
 		if (outTimeInfo)
 		{
-			std::memcpy(outTimeInfo.get_ptr(), &content_id.second->time_info, sizeof(content_id.second->time_info));
+			std::memcpy(outTimeInfo.get_ptr(), &content_id.second->timeInfo, sizeof(content_id.second->timeInfo));
 		}
 
 	}
@@ -1610,44 +1367,11 @@ error_code cellSearchGetContentInfoGameComment(vm::cptr<CellSearchContentId> con
 {
 	cellSearch.todo("cellSearchGetContentInfoGameComment(contentId=*0x%x, gameComment=*0x%x)", contentId, gameComment);
 
-	// Reset values first
-	if (gameComment)
-	{
-		gameComment[0] = 0;
-	}
-
-	if (!contentId || !gameComment)
+	if (!gameComment)
 	{
 		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	// TODO: find out if this check is correct
-	if (error_code error = check_search_state(g_fxo->get<search_info>().state.load(), search_state::in_progress))
-	{
-		return error;
-	}
-
-	auto& content_map = g_fxo->get<content_id_map>();
-	auto found = content_map.map.find(*reinterpret_cast<const u64*>(contentId->data));
-	if (found == content_map.map.end())
-	{
-		// content ID not found, perform a search first
-		return CELL_SEARCH_ERROR_CONTENT_NOT_FOUND;
-	}
-
-	const auto& content_info = found->second;
-	switch (content_info->type)
-	{
-	case CELL_SEARCH_CONTENTTYPE_MUSIC:
-	case CELL_SEARCH_CONTENTTYPE_PHOTO:
-	case CELL_SEARCH_CONTENTTYPE_VIDEO:
-		break;
-	default:
-		return CELL_SEARCH_ERROR_INVALID_CONTENTTYPE;
-	}
-
-	// TODO: retrieve gameComment
-
 	return CELL_OK;
 }
 
@@ -1660,134 +1384,13 @@ error_code cellSearchGetMusicSelectionContext(CellSearchId searchId, vm::cptr<Ce
 		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	// Reset values first
-	std::memset(outContext->data, 0, 4);
-
-	const auto searchObject = idm::get_unlocked<search_object_t>(searchId);
+	const auto searchObject = idm::get<search_object_t>(searchId);
 
 	if (!searchObject)
 	{
 		return CELL_SEARCH_ERROR_INVALID_SEARCHID;
 	}
 
-	auto& search = g_fxo->get<search_info>();
-
-	// TODO: find out if this check is correct
-	if (error_code error = check_search_state(search.state.load(), search_state::in_progress))
-	{
-		return error;
-	}
-
-	if (searchObject->content_ids.empty())
-	{
-		return CELL_SEARCH_ERROR_CONTENT_NOT_FOUND;
-	}
-
-	music_selection_context context{};
-
-	// Use the first track in order to get info about this search
-	const auto& first_content_id = searchObject->content_ids[0];
-	const auto& first_content = first_content_id.second;
-	ensure(first_content);
-
-	const auto get_random_content = [&searchObject, &first_content]() -> shared_ptr<search_content_t>
-	{
-		if (searchObject->content_ids.size() == 1)
-		{
-			return first_content;
-		}
-
-		std::vector<content_id_type> result;
-		std::sample(searchObject->content_ids.begin(), searchObject->content_ids.end(), std::back_inserter(result), 1, std::mt19937{std::random_device{}()});
-		ensure(result.size() == 1);
-		shared_ptr<search_content_t> content = ensure(result[0].second);
-		return content;
-	};
-
-	if (contentId)
-	{
-		// Try to find the specified content
-		const u64 content_hash = *reinterpret_cast<const u64*>(contentId->data);
-		auto content = std::find_if(searchObject->content_ids.begin(), searchObject->content_ids.end(), [&content_hash](const content_id_type& cid){ return cid.first == content_hash; });
-		if (content != searchObject->content_ids.cend() && content->second)
-		{
-			// Check if the type of the found content is correct
-			if (content->second->type != CELL_SEARCH_CONTENTTYPE_MUSIC)
-			{
-				return { CELL_SEARCH_ERROR_INVALID_CONTENTTYPE, "Type: %d, Expected: CELL_SEARCH_CONTENTTYPE_MUSIC"};
-			}
-
-			// Check if the type of the found content matches our search content type
-			if (content->second->type != first_content->type)
-			{
-				return { CELL_SEARCH_ERROR_NOT_SUPPORTED_CONTEXT, "Type: %d, Expected: %d", +content->second->type, +first_content->type };
-			}
-
-			// Use the found content
-			context.playlist.push_back(content->second->infoPath.contentPath);
-			cellSearch.notice("cellSearchGetMusicSelectionContext(): Hash=%08X, Assigning found track: Type=0x%x, Path=%s", content_hash, +content->second->type, context.playlist.back());
-		}
-		else if (first_content->type == CELL_SEARCH_CONTENTTYPE_MUSICLIST)
-		{
-			// Abort if we can't find the playlist.
-			return { CELL_SEARCH_ERROR_CONTENT_NOT_FOUND, "Type: CELL_SEARCH_CONTENTTYPE_MUSICLIST" };
-		}
-		else if (option == CELL_SEARCH_CONTEXTOPTION_SHUFFLE)
-		{
-			// Select random track
-			// TODO: whole playlist
-			shared_ptr<search_content_t> content = get_random_content();
-			context.playlist.push_back(content->infoPath.contentPath);
-			cellSearch.notice("cellSearchGetMusicSelectionContext(): Hash=%08X, Assigning random track: Type=0x%x, Path=%s", content_hash, +content->type, context.playlist.back());
-		}
-		else
-		{
-			// Select the first track by default
-			// TODO: whole playlist
-			context.playlist.push_back(first_content->infoPath.contentPath);
-			cellSearch.notice("cellSearchGetMusicSelectionContext(): Hash=%08X, Assigning first track: Type=0x%x, Path=%s", content_hash, +first_content->type, context.playlist.back());
-		}
-	}
-	else if (first_content->type == CELL_SEARCH_CONTENTTYPE_MUSICLIST)
-	{
-		// Abort if we don't have the necessary info to select a playlist.
-		return { CELL_SEARCH_ERROR_NOT_SUPPORTED_CONTEXT, "Type: CELL_SEARCH_CONTENTTYPE_MUSICLIST" };
-	}
-	else if (option == CELL_SEARCH_CONTEXTOPTION_SHUFFLE)
-	{
-		// Select random track
-		// TODO: whole playlist
-		shared_ptr<search_content_t> content = get_random_content();
-		context.playlist.push_back(content->infoPath.contentPath);
-		cellSearch.notice("cellSearchGetMusicSelectionContext(): Assigning random track: Type=0x%x, Path=%s", +content->type, context.playlist.back());
-	}
-	else
-	{
-		// Select the first track by default
-		// TODO: whole playlist
-		context.playlist.push_back(first_content->infoPath.contentPath);
-		cellSearch.notice("cellSearchGetMusicSelectionContext(): Assigning first track: Type=0x%x, Path=%s", +first_content->type, context.playlist.back());
-	}
-
-	context.content_type = first_content->type;
-	context.repeat_mode = repeatMode;
-	context.context_option = option;
-	// TODO: context.first_track = ?;
-
-	// Resolve hashed paths
-	for (std::string& track : context.playlist)
-	{
-		if (auto found = search.content_links.find(track); found != search.content_links.end())
-		{
-			track = found->second.path;
-		}
-	}
-
-	context.create_playlist(music_selection_context::get_next_hash());
-	*outContext = context.get();
-
-	cellSearch.success("cellSearchGetMusicSelectionContext: found selection context: %d", context.to_string());
-
 	return CELL_OK;
 }
 
@@ -1795,58 +1398,11 @@ error_code cellSearchGetMusicSelectionContextOfSingleTrack(vm::cptr<CellSearchCo
 {
 	cellSearch.todo("cellSearchGetMusicSelectionContextOfSingleTrack(contentId=*0x%x, outContext=*0x%x)", contentId, outContext);
 
-	// Reset values first
-	if (outContext)
-	{
-		std::memset(outContext->data, 0, 4);
-	}
-
 	if (!contentId || !outContext)
 	{
 		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	auto& search = g_fxo->get<search_info>();
-
-	// TODO: find out if this check is correct
-	if (error_code error = check_search_state(search.state.load(), search_state::in_progress))
-	{
-		return error;
-	}
-
-	auto& content_map = g_fxo->get<content_id_map>();
-	auto found = content_map.map.find(*reinterpret_cast<const u64*>(contentId->data));
-	if (found == content_map.map.end())
-	{
-		// content ID not found, perform a search first
-		return CELL_SEARCH_ERROR_CONTENT_NOT_FOUND;
-	}
-
-	const auto& content_info = found->second;
-	if (content_info->type != CELL_SEARCH_CONTENTTYPE_MUSIC)
-	{
-		return CELL_SEARCH_ERROR_INVALID_CONTENTTYPE;
-	}
-
-	music_selection_context context{};
-	context.playlist.push_back(content_info->infoPath.contentPath);
-	context.repeat_mode = content_info->repeat_mode;
-	context.context_option = content_info->context_option;
-
-	// Resolve hashed paths
-	for (std::string& track : context.playlist)
-	{
-		if (auto found = search.content_links.find(track); found != search.content_links.end())
-		{
-			track = found->second.path;
-		}
-	}
-
-	context.create_playlist(music_selection_context::get_next_hash());
-	*outContext = context.get();
-
-	cellSearch.success("cellSearchGetMusicSelectionContextOfSingleTrack: found selection context: %s", context.to_string());
-
 	return CELL_OK;
 }
 
@@ -1854,26 +1410,31 @@ error_code cellSearchGetContentInfoPath(vm::cptr<CellSearchContentId> contentId,
 {
 	cellSearch.todo("cellSearchGetContentInfoPath(contentId=*0x%x, infoPath=*0x%x)", contentId, infoPath);
 
-	// Reset values first
-	if (infoPath)
-	{
-		*infoPath = {};
-	}
-
-	if (!contentId || !infoPath)
+	if (!infoPath)
 	{
 		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	if (error_code error = check_search_state(g_fxo->get<search_info>().state.load(), search_state::in_progress))
+	switch (g_fxo->get<search_info>().state.load())
 	{
-		return error;
+	case search_state::idle:
+		break;
+	case search_state::not_initialized:
+	case search_state::initializing:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::in_progress:
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
 	const u64 id = *reinterpret_cast<const u64*>(contentId->data);
 	auto& content_map = g_fxo->get<content_id_map>();
 	auto found = content_map.map.find(id);
-	if (found != content_map.map.end())
+	if(found != content_map.map.end())
 	{
 		std::memcpy(infoPath.get_ptr(), &found->second->infoPath, sizeof(found->second->infoPath));
 	}
@@ -1883,7 +1444,7 @@ error_code cellSearchGetContentInfoPath(vm::cptr<CellSearchContentId> contentId,
 		return CELL_SEARCH_ERROR_CONTENT_NOT_FOUND;
 	}
 
-	cellSearch.success("contentId=%08X, contentPath=\"%s\"", id, infoPath->contentPath);
+	cellSearch.success("contentId = %08X  contentPath = \"%s\"", id, infoPath->contentPath);
 
 	return CELL_OK;
 }
@@ -1892,40 +1453,11 @@ error_code cellSearchGetContentInfoPathMovieThumb(vm::cptr<CellSearchContentId>
 {
 	cellSearch.todo("cellSearchGetContentInfoPathMovieThumb(contentId=*0x%x, infoMt=*0x%x)", contentId, infoMt);
 
-	// Reset values first
-	if (infoMt)
-	{
-		*infoMt = {};
-	}
-
-	if (!contentId || !infoMt)
+	if (!infoMt)
 	{
 		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	// TODO: find out if this check is correct
-	if (error_code error = check_search_state(g_fxo->get<search_info>().state.load(), search_state::in_progress))
-	{
-		return error;
-	}
-
-	auto& content_map = g_fxo->get<content_id_map>();
-	auto found = content_map.map.find(*reinterpret_cast<const u64*>(contentId->data));
-	if (found == content_map.map.end())
-	{
-		// content ID not found, perform a search first
-		return CELL_SEARCH_ERROR_CONTENT_NOT_FOUND;
-	}
-
-	const auto& content_info = found->second;
-	if (content_info->type != CELL_SEARCH_CONTENTTYPE_VIDEO)
-	{
-		return CELL_SEARCH_ERROR_INVALID_CONTENTTYPE;
-	}
-
-	strcpy_trunc(infoMt->movieThumbnailPath, content_info->infoPath.thumbnailPath);
-	// TODO: set infoMt->movieThumbnailOption
-
 	return CELL_OK;
 }
 
@@ -1939,17 +1471,27 @@ error_code cellSearchPrepareFile(vm::cptr<char> path)
 	}
 
 	auto& search = g_fxo->get<search_info>();
-
-	if (error_code error = check_search_state(search.state.load(), search_state::in_progress))
+	switch (search.state.load())
 	{
-		return error;
+	case search_state::idle:
+		break;
+	case search_state::not_initialized:
+	case search_state::initializing:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::in_progress:
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
 	reader_lock lock(search.links_mutex);
 	auto found = search.content_links.find(path.get_ptr());
 	if (found != search.content_links.end())
 	{
-		vfs::mount(found->first, vfs::get(found->second.path), found->second.is_dir);
+		vfs::mount(found->first, vfs::get(found->second));
 	}
 
 	return CELL_OK;
@@ -1959,43 +1501,11 @@ error_code cellSearchGetContentInfoDeveloperData(vm::cptr<CellSearchContentId> c
 {
 	cellSearch.todo("cellSearchGetContentInfoDeveloperData(contentId=*0x%x, developerData=*0x%x)", contentId, developerData);
 
-	// Reset values first
-	if (developerData)
-	{
-		developerData[0] = 0;
-	}
-
 	if (!contentId || !developerData)
 	{
 		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	// TODO: find out if this check is correct
-	if (error_code error = check_search_state(g_fxo->get<search_info>().state.load(), search_state::in_progress))
-	{
-		return error;
-	}
-
-	auto& content_map = g_fxo->get<content_id_map>();
-	auto found = content_map.map.find(*reinterpret_cast<const u64*>(contentId->data));
-	if (found == content_map.map.end())
-	{
-		// content ID not found, perform a search first
-		return CELL_SEARCH_ERROR_CONTENT_NOT_FOUND;
-	}
-
-	const auto& content_info = found->second;
-	switch (content_info->type)
-	{
-	case CELL_SEARCH_CONTENTTYPE_VIDEO:
-	case CELL_SEARCH_CONTENTTYPE_SCENE:
-		break;
-	default:
-		return CELL_SEARCH_ERROR_INVALID_CONTENTTYPE;
-	}
-
-	// TODO: retrieve developerData
-
 	return CELL_OK;
 }
 
@@ -2003,40 +1513,11 @@ error_code cellSearchGetContentInfoSharable(vm::cptr<CellSearchContentId> conten
 {
 	cellSearch.todo("cellSearchGetContentInfoSharable(contentId=*0x%x, sharable=*0x%x)", contentId, sharable);
 
-	// Reset values first
-	if (sharable)
-	{
-		*sharable = CELL_SEARCH_SHARABLETYPE_PROHIBITED;
-	}
-
 	if (!contentId || !sharable)
 	{
 		return CELL_SEARCH_ERROR_PARAM;
 	}
 
-	// TODO: find out if this check is correct
-	if (error_code error = check_search_state(g_fxo->get<search_info>().state.load(), search_state::in_progress))
-	{
-		return error;
-	}
-
-	auto& content_map = g_fxo->get<content_id_map>();
-	auto found = content_map.map.find(*reinterpret_cast<const u64*>(contentId->data));
-	if (found == content_map.map.end())
-	{
-		// content ID not found, perform a search first
-		return CELL_SEARCH_ERROR_CONTENT_NOT_FOUND;
-	}
-
-	const auto& content_info = found->second;
-	if (content_info->type != CELL_SEARCH_CONTENTTYPE_VIDEO)
-	{
-		return CELL_SEARCH_ERROR_INVALID_CONTENTTYPE;
-	}
-
-	// TODO: retrieve sharable
-	*sharable = CELL_SEARCH_SHARABLETYPE_PROHIBITED;
-
 	return CELL_OK;
 }
 
@@ -2044,16 +1525,28 @@ error_code cellSearchCancel(CellSearchId searchId)
 {
 	cellSearch.todo("cellSearchCancel(searchId=0x%x)", searchId);
 
-	const auto searchObject = idm::get_unlocked<search_object_t>(searchId);
+	const auto searchObject = idm::get<search_object_t>(searchId);
 
 	if (!searchObject)
 	{
 		return CELL_SEARCH_ERROR_INVALID_SEARCHID;
 	}
 
-	if (error_code error = check_search_state(g_fxo->get<search_info>().state.load(), search_state::canceling))
+	switch (g_fxo->get<search_info>().state.load())
 	{
-		return error;
+	case search_state::in_progress:
+		break;
+	case search_state::not_initialized:
+	case search_state::initializing:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	case search_state::idle:
+		return CELL_SEARCH_ERROR_ALREADY_GOT_RESULT;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
 	// TODO
@@ -2065,17 +1558,23 @@ error_code cellSearchEnd(CellSearchId searchId)
 {
 	cellSearch.todo("cellSearchEnd(searchId=0x%x)", searchId);
 
-	if (!searchId) // This check has to come first
+	switch (g_fxo->get<search_info>().state.load())
 	{
-		return CELL_SEARCH_ERROR_INVALID_SEARCHID;
+	case search_state::idle:
+		break;
+	case search_state::not_initialized:
+		return CELL_SEARCH_ERROR_NOT_INITIALIZED;
+	case search_state::finalizing:
+		return CELL_SEARCH_ERROR_FINALIZING;
+	case search_state::in_progress:
+	case search_state::initializing:
+	case search_state::canceling:
+		return CELL_SEARCH_ERROR_BUSY;
+	default:
+		return CELL_SEARCH_ERROR_GENERIC;
 	}
 
-	if (error_code error = check_search_state(g_fxo->get<search_info>().state.load(), search_state::finalizing))
-	{
-		return error;
-	}
-
-	const auto searchObject = idm::get_unlocked<search_object_t>(searchId);
+	const auto searchObject = idm::get<search_object_t>(searchId);
 
 	if (!searchObject)
 	{
@@ -2111,170 +1610,3 @@ DECLARE(ppu_module_manager::cellSearch)("cellSearchUtility", []()
 	REG_FUNC(cellSearchUtility, cellSearchCancel);
 	REG_FUNC(cellSearchUtility, cellSearchEnd);
 });
-
-// Helper
-error_code music_selection_context::find_content_id(vm::ptr<CellSearchContentId> contents_id)
-{
-	if (!contents_id)
-		return CELL_MUSIC_ERROR_PARAM;
-
-	// Search for the content that matches our current selection
-	auto& content_map = g_fxo->get<content_id_map>();
-	shared_ptr<search_content_t> found_content;
-	u64 hash = 0;
-
-	for (const std::string& track : playlist)
-	{
-		if (content_type == CELL_SEARCH_CONTENTTYPE_MUSICLIST)
-		{
-			hash = std::hash<std::string>()(fs::get_parent_dir(track));
-		}
-		else
-		{
-			hash = std::hash<std::string>()(track);
-		}
-
-		if (auto found = content_map.map.find(hash); found != content_map.map.end())
-		{
-			found_content = found->second;
-			break;
-		}
-	}
-
-	if (found_content)
-	{
-		// TODO: check if the content type is correct
-		const u128 content_id_128 = hash;
-		std::memcpy(contents_id->data, &content_id_128, CELL_SEARCH_CONTENT_ID_SIZE);
-		cellSearch.warning("find_content_id: found existing content for %s (path control: '%s')", to_string(), found_content->infoPath.contentPath);
-		return CELL_OK;
-	}
-
-	// Try to find the content manually
-	auto& search = g_fxo->get<search_info>();
-	const std::string music_dir = "/dev_hdd0/music/";
-	const std::string vfs_music_dir = vfs::get(music_dir);
-
-	for (auto&& entry : fs::dir(vfs_music_dir))
-	{
-		entry.name = vfs::unescape(entry.name);
-
-		if (!entry.is_directory || entry.name == "." || entry.name == "..")
-		{
-			continue;
-		}
-
-		const std::string dir_path = music_dir + entry.name;
-		const std::string vfs_dir_path = vfs_music_dir + entry.name;
-
-		if (content_type == CELL_SEARCH_CONTENTTYPE_MUSICLIST)
-		{
-			const u64 dir_hash = std::hash<std::string>()(dir_path);
-
-			if (hash == dir_hash)
-			{
-				u32 num_of_items = 0;
-				for (auto&& file : fs::dir(vfs_dir_path))
-				{
-					file.name = vfs::unescape(file.name);
-
-					if (file.is_directory || file.name == "." || file.name == "..")
-					{
-						continue;
-					}
-
-					num_of_items++;
-				}
-
-				// TODO: check for actual content inside the directory
-				shared_ptr<search_content_t> curr_find = make_shared<search_content_t>();
-				curr_find->type = CELL_SEARCH_CONTENTTYPE_MUSICLIST;
-				curr_find->repeat_mode = repeat_mode;
-				curr_find->context_option = context_option;
-
-				if (dir_path.length() > CELL_SEARCH_PATH_LEN_MAX)
-				{
-					// Create mapping which will be resolved to an actual hard link in VFS by cellSearchPrepareFile
-					std::string link = link_base + std::to_string(hash) + entry.name;
-					strcpy_trunc(curr_find->infoPath.contentPath, link);
-
-					std::lock_guard lock(search.links_mutex);
-					search.content_links.emplace(std::move(link), search_info::link_data{ .path = dir_path, .is_dir = true });
-				}
-				else
-				{
-					strcpy_trunc(curr_find->infoPath.contentPath, dir_path);
-				}
-
-				CellSearchMusicListInfo& info = curr_find->data.music_list;
-				info.listType = CELL_SEARCH_LISTSEARCHTYPE_MUSIC_ALBUM;
-				info.numOfItems = num_of_items;
-				info.duration = 0;
-				strcpy_trunc(info.title, entry.name);
-				strcpy_trunc(info.artistName, "ARTIST NAME");
-
-				content_map.map.emplace(dir_hash, curr_find);
-				const u128 content_id_128 = dir_hash;
-				std::memcpy(contents_id->data, &content_id_128, CELL_SEARCH_CONTENT_ID_SIZE);
-
-				cellSearch.warning("find_content_id: found music list %s (path control: '%s')", to_string(), dir_path);
-				return CELL_OK;
-			}
-
-			continue;
-		}
-
-		// Search the subfolders. We assume all music is located in a depth of 2 (max_depth, root + 1 folder + file).
-		for (auto&& item : fs::dir(vfs_dir_path))
-		{
-			if (item.is_directory || item.name == "." || item.name == "..")
-			{
-				continue;
-			}
-
-			const std::string file_path = dir_path + "/" + item.name;
-			const u64 file_hash = std::hash<std::string>()(file_path);
-
-			if (hash == file_hash)
-			{
-				const auto [success, mi] = utils::get_media_info(vfs_dir_path + "/" + item.name, 1); // AVMEDIA_TYPE_AUDIO
-				if (!success)
-				{
-					continue;
-				}
-
-				shared_ptr<search_content_t> curr_find = make_shared<search_content_t>();
-				curr_find->type = CELL_SEARCH_CONTENTTYPE_MUSIC;
-				curr_find->repeat_mode = repeat_mode;
-				curr_find->context_option = context_option;
-
-				if (file_path.length() > CELL_SEARCH_PATH_LEN_MAX)
-				{
-					// Create mapping which will be resolved to an actual hard link in VFS by cellSearchPrepareFile
-					const size_t ext_offset = item.name.find_last_of('.');
-					std::string link = link_base + std::to_string(hash) + item.name.substr(ext_offset);
-					strcpy_trunc(curr_find->infoPath.contentPath, link);
-
-					std::lock_guard lock(search.links_mutex);
-					search.content_links.emplace(std::move(link), search_info::link_data{ .path = file_path, .is_dir = false });
-				}
-				else
-				{
-					strcpy_trunc(curr_find->infoPath.contentPath, file_path);
-				}
-
-				populate_music_info(curr_find->data.music, mi, item);
-
-				content_map.map.emplace(file_hash, curr_find);
-				const u128 content_id_128 = file_hash;
-				std::memcpy(contents_id->data, &content_id_128, CELL_SEARCH_CONTENT_ID_SIZE);
-
-				cellSearch.warning("find_content_id: found music track %s (path control: '%s')", to_string(), file_path);
-				return CELL_OK;
-			}
-		}
-	}
-
-	// content ID not found
-	return CELL_SEARCH_ERROR_CONTENT_NOT_FOUND;
-}
diff --git a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp
index c09c808e92..14d2ea2f91 100644
--- a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/system_config.h"
+#include "Emu/IdManager.h"
 #include "Emu/Memory/vm_reservation.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/SPUThread.h"
@@ -17,7 +17,7 @@
 
 #include "util/asm.hpp"
 #include "util/v128.hpp"
-#include "util/simd.hpp"
+#include "util/v128sse.hpp"
 
 LOG_CHANNEL(cellSpurs);
 
@@ -160,6 +160,11 @@ void fmt_class_string<SpursWorkloadState>::format(std::string& out, u64 arg)
 
 error_code sys_spu_image_close(ppu_thread&, vm::ptr<sys_spu_image> img);
 
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 //----------------------------------------------------------------------------
 // Function prototypes
 //----------------------------------------------------------------------------
@@ -321,7 +326,7 @@ s32 cellSpursReadyCountAdd(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 wid, v
 //s32 cellSpursUnsetExceptionEventHandler();
 s32 _cellSpursWorkloadFlagReceiver(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 wid, u32 is_set);
 //s32 _cellSpursWorkloadFlagReceiver2();
-//error_code cellSpursRequestIdleSpu();
+//s32 cellSpursRequestIdleSpu();
 
 //
 // SPURS taskset functions
@@ -514,14 +519,12 @@ s32 _spurs::create_lv2_eq(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, vm::ptr<u32
 {
 	if (s32 rc = sys_event_queue_create(ppu, queueId, vm::make_var(attr), SYS_EVENT_QUEUE_LOCAL, size))
 	{
-		static_cast<void>(ppu.test_stopped());
 		return rc;
 	}
 
 	if (_spurs::attach_lv2_eq(ppu, spurs, *queueId, port, 1, true))
 	{
 		sys_event_queue_destroy(ppu, *queueId, SYS_EVENT_QUEUE_DESTROY_FORCE);
-		static_cast<void>(ppu.test_stopped());
 	}
 
 	return CELL_OK;
@@ -620,7 +623,6 @@ s32 _spurs::detach_lv2_eq(vm::ptr<CellSpurs> spurs, u8 spuPort, bool spursCreate
 void _spurs::handler_wait_ready(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 {
 	ensure(ppu_execute<&sys_lwmutex_lock>(ppu, spurs.ptr(&CellSpurs::mutex), 0) == 0);
-	static_cast<void>(ppu.test_stopped());
 
 	while (true)
 	{
@@ -684,7 +686,6 @@ void _spurs::handler_wait_ready(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 		if (spurs->handlerDirty == 0)
 		{
 			ensure(ppu_execute<&sys_lwcond_wait>(ppu, spurs.ptr(&CellSpurs::cond), 0) == 0);
-			static_cast<void>(ppu.test_stopped());
 		}
 
 		spurs->handlerWaiting = 0;
@@ -692,7 +693,6 @@ void _spurs::handler_wait_ready(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 
 	// If we reach here then a runnable workload was found
 	ensure(ppu_execute<&sys_lwmutex_unlock>(ppu, spurs.ptr(&CellSpurs::mutex)) == 0);
-	static_cast<void>(ppu.test_stopped());
 }
 
 void _spurs::handler_entry(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
@@ -711,10 +711,7 @@ void _spurs::handler_entry(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 
 		ensure(sys_spu_thread_group_start(ppu, spurs->spuTG) == 0);
 
-		const s32 rc = sys_spu_thread_group_join(ppu, spurs->spuTG, vm::null, vm::null);
-		static_cast<void>(ppu.test_stopped());
-
-		if (rc + 0u != CELL_EFAULT)
+		if (s32 rc = sys_spu_thread_group_join(ppu, spurs->spuTG, vm::null, vm::null); rc + 0u != CELL_EFAULT)
 		{
 			if (rc + 0u == CELL_ESTAT)
 			{
@@ -733,7 +730,7 @@ void _spurs::handler_entry(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 	}
 }
 
-s32 _spurs::create_handler(vm::ptr<CellSpurs> /*spurs*/, u32 /*ppuPriority*/)
+s32 _spurs::create_handler(vm::ptr<CellSpurs> spurs, u32 ppuPriority)
 {
 	struct handler_thread : ppu_thread
 	{
@@ -741,7 +738,7 @@ s32 _spurs::create_handler(vm::ptr<CellSpurs> /*spurs*/, u32 /*ppuPriority*/)
 
 		void non_task()
 		{
-			//BIND_FUNC(_spurs::handler_entry)(*this);
+			BIND_FUNC(_spurs::handler_entry)(*this);
 		}
 	};
 
@@ -813,7 +810,6 @@ s32 _spurs::wakeup_shutdown_completion_waiter(ppu_thread& ppu, vm::ptr<CellSpurs
 	{
 		ensure((wklF->x28 == 2u));
 		rc = sys_semaphore_post(ppu, static_cast<u32>(wklF->sem), 1);
-		static_cast<void>(ppu.test_stopped());
 	}
 
 	return rc;
@@ -827,7 +823,6 @@ void _spurs::event_helper_entry(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 	while (true)
 	{
 		ensure(sys_event_queue_receive(ppu, spurs->eventQueue, vm::null, 0) == 0);
-		static_cast<void>(ppu.test_stopped());
 
 		const u64 event_src   = ppu.gpr[4];
 		const u64 event_data1 = ppu.gpr[5];
@@ -859,8 +854,6 @@ void _spurs::event_helper_entry(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 					sys_semaphore_post(ppu, static_cast<u32>(spurs->wklF2[i].sem), 1);
 				}
 			}
-
-			static_cast<void>(ppu.test_stopped());
 		}
 		else
 		{
@@ -890,7 +883,6 @@ void _spurs::event_helper_entry(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 			else if (data0 == 2)
 			{
 				ensure(sys_semaphore_post(ppu, static_cast<u32>(spurs->semPrv), 1) == 0);
-				static_cast<void>(ppu.test_stopped());
 			}
 			else if (data0 == 3)
 			{
@@ -904,7 +896,7 @@ void _spurs::event_helper_entry(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 	}
 }
 
-s32 _spurs::create_event_helper(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 /*ppuPriority*/)
+s32 _spurs::create_event_helper(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 ppuPriority)
 {
 	if (s32 rc = _spurs::create_lv2_eq(ppu, spurs, spurs.ptr(&CellSpurs::eventQueue), spurs.ptr(&CellSpurs::spuPort), 0x2A, sys_event_queue_attribute_t{SYS_SYNC_PRIORITY, SYS_PPU_QUEUE, {"_spuPrv\0"_u64}}))
 	{
@@ -941,7 +933,7 @@ s32 _spurs::create_event_helper(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 /
 
 		void non_task()
 		{
-			//BIND_FUNC(_spurs::event_helper_entry)(*this);
+			BIND_FUNC(_spurs::event_helper_entry)(*this);
 		}
 	};
 
@@ -976,7 +968,7 @@ void _spurs::init_event_port_mux(vm::ptr<CellSpurs::EventPortMux> eventPortMux,
 	eventPortMux->x08       = unknown;
 }
 
-s32 _spurs::add_default_syswkl(vm::ptr<CellSpurs> /*spurs*/, vm::cptr<u8> /*swlPriority*/, u32 /*swlMaxSpu*/, u32 /*swlIsPreem*/)
+s32 _spurs::add_default_syswkl(vm::ptr<CellSpurs> spurs, vm::cptr<u8> swlPriority, u32 swlMaxSpu, u32 swlIsPreem)
 {
 	// TODO: Implement this
 	return CELL_OK;
@@ -1259,7 +1251,7 @@ s32 _spurs::initialize(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 revision,
 		}
 
 		// entry point cannot be initialized immediately because SPU LS will be rewritten by sys_spu_thread_group_start()
-		//idm::get_unlocked<named_thread<spu_thread>>(spurs->spus[num])->custom_task = [entry = spurs->spuImg.entry_point](spu_thread& spu)
+		//idm::get<named_thread<spu_thread>>(spurs->spus[num])->custom_task = [entry = spurs->spuImg.entry_point](spu_thread& spu)
 		{
 			// Disabled
 			//spu.RegisterHleFunction(entry, spursKernelEntry);
@@ -1650,7 +1642,7 @@ s32 cellSpursFinalize(vm::ptr<CellSpurs> spurs)
 		return CELL_SPURS_CORE_ERROR_STAT;
 	}
 
-	[[maybe_unused]] u32 wklEnabled = spurs->wklEnabled.load();
+	u32 wklEnabled = spurs->wklEnabled.load();
 
 	if (spurs->flags1 & SF1_32_WORKLOADS)
 	{
@@ -1776,7 +1768,7 @@ s32 cellSpursSetMaxContention(vm::ptr<CellSpurs> spurs, u32 wid, u32 maxContenti
 /// Set the priority of a workload on each SPU
 s32 cellSpursSetPriorities(vm::ptr<CellSpurs> spurs, u32 wid, vm::cptr<u8[8]> priorities)
 {
-	cellSpurs.trace("cellSpursSetPriorities(spurs=*0x%x, wid=%d, priorities=*0x%x)", spurs, wid, priorities);
+	cellSpurs.warning("cellSpursSetPriorities(spurs=*0x%x, wid=%d, priorities=*0x%x)", spurs, wid, priorities);
 
 	if (!spurs)
 	{
@@ -1845,16 +1837,16 @@ s32 cellSpursSetPriority(vm::ptr<CellSpurs> spurs, u32 wid, u32 spuId, u32 prior
 	if (spurs->exception)
 		return CELL_SPURS_CORE_ERROR_STAT;
 
-	vm::light_op<true>(spurs->wklInfo(wid).priority[spuId], [&](u8& v){ atomic_storage<u8>::release(v, priority); });
-	vm::light_op<true>(spurs->sysSrvMsgUpdateWorkload, [&](atomic_t<u8>& v){ v.bit_test_set(spuId); });
-	vm::light_op<true>(spurs->sysSrvMessage, [&](atomic_t<u8>& v){ v.bit_test_set(spuId); });
+	vm::light_op(spurs->wklInfo(wid).priority[spuId], [&](u8& v){ atomic_storage<u8>::release(v, priority); });
+	vm::light_op(spurs->sysSrvMsgUpdateWorkload, [&](atomic_t<u8>& v){ v.bit_test_set(spuId); });
+	vm::light_op(spurs->sysSrvMessage, [&](atomic_t<u8>& v){ v.bit_test_set(spuId); });
 	return CELL_OK;
 }
 
 /// Set preemption victim SPU
 s32 cellSpursSetPreemptionVictimHints(vm::ptr<CellSpurs> spurs, vm::cptr<b8> isPreemptible)
 {
-	cellSpurs.todo("cellSpursSetPreemptionVictimHints(spurs=*0x%x, isPreemptible=*0x%x)", spurs, isPreemptible);
+	UNIMPLEMENTED_FUNC(cellSpurs);
 	return CELL_OK;
 }
 
@@ -2023,7 +2015,7 @@ void _spurs::trace_status_update(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 {
 	u8 init;
 
-	vm::atomic_op(spurs->sysSrvTrace, [spurs, &init](CellSpurs::SrvTraceSyncVar& data)
+	spurs->sysSrvTrace.atomic_op([spurs, &init](CellSpurs::SrvTraceSyncVar& data)
 	{
 		if ((init = data.sysSrvTraceInitialised))
 		{
@@ -2034,9 +2026,8 @@ void _spurs::trace_status_update(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 
 	if (init)
 	{
-		vm::light_op<true>(spurs->sysSrvMessage, [&](atomic_t<u8>& v){ v.release(0xff); });
+		spurs->sysSrvMessage = 0xff;
 		ensure(sys_semaphore_wait(ppu, static_cast<u32>(spurs->semPrv), 0) == 0);
-		static_cast<void>(ppu.test_stopped());
 	}
 }
 
@@ -2225,7 +2216,7 @@ s32 cellSpursTraceStop(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 //----------------------------------------------------------------------------
 
 /// Initialize attributes of a workload
-s32 _cellSpursWorkloadAttributeInitialize(ppu_thread& /*ppu*/, vm::ptr<CellSpursWorkloadAttribute> attr, u32 revision, u32 sdkVersion, vm::cptr<void> pm, u32 size, u64 data, vm::cptr<u8[8]> priority, u32 minCnt, u32 maxCnt)
+s32 _cellSpursWorkloadAttributeInitialize(ppu_thread& ppu, vm::ptr<CellSpursWorkloadAttribute> attr, u32 revision, u32 sdkVersion, vm::cptr<void> pm, u32 size, u64 data, vm::cptr<u8[8]> priority, u32 minCnt, u32 maxCnt)
 {
 	cellSpurs.warning("_cellSpursWorkloadAttributeInitialize(attr=*0x%x, revision=%d, sdkVersion=0x%x, pm=*0x%x, size=0x%x, data=0x%llx, priority=*0x%x, minCnt=0x%x, maxCnt=0x%x)",
 		attr, revision, sdkVersion, pm, size, data, priority, minCnt, maxCnt);
@@ -2272,7 +2263,7 @@ s32 _cellSpursWorkloadAttributeInitialize(ppu_thread& /*ppu*/, vm::ptr<CellSpurs
 }
 
 /// Set the name of a workload
-s32 cellSpursWorkloadAttributeSetName(ppu_thread& /*ppu*/, vm::ptr<CellSpursWorkloadAttribute> attr, vm::cptr<char> nameClass, vm::cptr<char> nameInstance)
+s32 cellSpursWorkloadAttributeSetName(ppu_thread& ppu, vm::ptr<CellSpursWorkloadAttribute> attr, vm::cptr<char> nameClass, vm::cptr<char> nameInstance)
 {
 	cellSpurs.warning("cellSpursWorkloadAttributeSetName(attr=*0x%x, nameClass=%s, nameInstance=%s)", attr, nameClass, nameInstance);
 
@@ -2352,45 +2343,14 @@ s32 _spurs::add_workload(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, vm::ptr<u32>
 		return CELL_SPURS_POLICY_MODULE_ERROR_AGAIN;
 	}
 
-	auto& spurs_res = vm::reservation_acquire(spurs.addr());
-	auto& spurs_res2 = vm::reservation_acquire(spurs.addr() + 0x80);
-
-	if (!spurs_res2.fetch_op([&](u64& r)
-	{
-		if (r & vm::rsrv_unique_lock)
-		{
-			return false;
-		}
-
-		r += 1;
-		return true;
-	}).second)
-	{
-		vm::reservation_shared_lock_internal(spurs_res2);
-	}
-
-	if (!spurs_res.fetch_op([&](u64& r)
-	{
-		if (r & vm::rsrv_unique_lock)
-		{
-			return false;
-		}
-
-		r += 1;
-		return true;
-	}).second)
-	{
-		vm::reservation_shared_lock_internal(spurs_res);
-	}
-
 	u32 index = wnum & 0xf;
 	if (wnum <= 15)
 	{
 		ensure((spurs->wklCurrentContention[wnum] & 0xf) == 0);
 		ensure((spurs->wklPendingContention[wnum] & 0xf) == 0);
-		spurs->wklState1[wnum].release(SPURS_WKL_STATE_PREPARING);
+		spurs->wklState1[wnum] = SPURS_WKL_STATE_PREPARING;
 		spurs->wklStatus1[wnum] = 0;
-		spurs->wklEvent1[wnum].release(0);
+		spurs->wklEvent1[wnum] = 0;
 		spurs->wklInfo1[wnum].addr = pm;
 		spurs->wklInfo1[wnum].arg = data;
 		spurs->wklInfo1[wnum].size = size;
@@ -2418,15 +2378,15 @@ s32 _spurs::add_workload(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, vm::ptr<u32>
 			spurs->wklMinContention[wnum] = minContention > 8 ? 8 : minContention;
 		}
 
-		spurs->wklReadyCount1[wnum].release(0);
+		spurs->wklReadyCount1[wnum] = 0;
 	}
 	else
 	{
 		ensure((spurs->wklCurrentContention[index] & 0xf0) == 0);
 		ensure((spurs->wklPendingContention[index] & 0xf0) == 0);
-		spurs->wklState2[index].release(SPURS_WKL_STATE_PREPARING);
+		spurs->wklState2[index] = SPURS_WKL_STATE_PREPARING;
 		spurs->wklStatus2[index] = 0;
-		spurs->wklEvent2[index].release(0);
+		spurs->wklEvent2[index] = 0;
 		spurs->wklInfo2[index].addr = pm;
 		spurs->wklInfo2[index].arg = data;
 		spurs->wklInfo2[index].size = size;
@@ -2448,31 +2408,21 @@ s32 _spurs::add_workload(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, vm::ptr<u32>
 			spurs->wklEvent2[index] |= 2;
 		}
 
-		spurs->wklIdleSpuCountOrReadyCount2[wnum].release(0);
+		spurs->wklIdleSpuCountOrReadyCount2[wnum] = 0;
 	}
 
-	spurs->wklMaxContention[index].atomic_op([&](u8& v)
+	vm::atomic_op(spurs->wklMaxContention[index], [&](u8& v)
 	{
-		v &= (wnum <= 15 ? 0xf0 : 0x0f);
-		v |= (maxContention > 8 ? 8 : maxContention) << (wnum < CELL_SPURS_MAX_WORKLOAD ? 0 : 4);
+		v &= (wnum <= 15 ? ~0xf : ~0xf0);
+		v |= (maxContention > 8 ? 8 : maxContention) << 4;
 	});
 
-	(wnum <= 15 ? spurs->wklSignal1 : spurs->wklSignal2).atomic_op([&](be_t<u16>& data)
+	vm::atomic_op<true>((wnum <= 15 ? spurs->wklSignal1 : spurs->wklSignal2), [&](be_t<u16>& data)
 	{
 		data &= ~(0x8000 >> index);
 	});
 
-	// Attempt to avoid CAS
-	if (spurs->wklFlagReceiver == wnum && spurs->wklFlagReceiver.compare_and_swap(wnum, 0xff))
-	{
-		//
-	}
-
-	spurs_res += 127;
-	spurs_res2 += 127;
-
-	spurs_res.notify_all();
-	spurs_res2.notify_all();
+	spurs->wklFlagReceiver.compare_and_swap(wnum, 0xff);
 
 	u32 res_wkl;
 	const auto wkl = &spurs->wklInfo(wnum);
@@ -2506,15 +2456,15 @@ s32 _spurs::add_workload(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, vm::ptr<u32>
 	});
 
 	ensure((res_wkl <= 31));
-	vm::light_op<true>(spurs->sysSrvMsgUpdateWorkload, [](atomic_t<u8>& v){ v.release(0xff); });
-	vm::light_op<true>(spurs->sysSrvMessage, [](atomic_t<u8>& v){ v.release(0xff); });
+	vm::light_op(spurs->sysSrvMsgUpdateWorkload, [](atomic_t<u8>& v){ v.release(0xff); });
+	vm::light_op(spurs->sysSrvMessage, [](atomic_t<u8>& v){ v.release(0xff); });
 	return CELL_OK;
 }
 
 /// Add workload
 s32 cellSpursAddWorkload(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, vm::ptr<u32> wid, vm::cptr<void> pm, u32 size, u64 data, vm::cptr<u8[8]> priority, u32 minCnt, u32 maxCnt)
 {
-	cellSpurs.trace("cellSpursAddWorkload(spurs=*0x%x, wid=*0x%x, pm=*0x%x, size=0x%x, data=0x%llx, priority=*0x%x, minCnt=0x%x, maxCnt=0x%x)",
+	cellSpurs.warning("cellSpursAddWorkload(spurs=*0x%x, wid=*0x%x, pm=*0x%x, size=0x%x, data=0x%llx, priority=*0x%x, minCnt=0x%x, maxCnt=0x%x)",
 		spurs, wid, pm, size, data, priority, minCnt, maxCnt);
 
 	return _spurs::add_workload(ppu, spurs, wid, pm, size, data, *priority, minCnt, maxCnt, vm::null, vm::null, vm::null, vm::null);
@@ -2523,7 +2473,7 @@ s32 cellSpursAddWorkload(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, vm::ptr<u32>
 /// Add workload
 s32 cellSpursAddWorkloadWithAttribute(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, vm::ptr<u32> wid, vm::cptr<CellSpursWorkloadAttribute> attr)
 {
-	cellSpurs.trace("cellSpursAddWorkloadWithAttribute(spurs=*0x%x, wid=*0x%x, attr=*0x%x)", spurs, wid, attr);
+	cellSpurs.warning("cellSpursAddWorkloadWithAttribute(spurs=*0x%x, wid=*0x%x, attr=*0x%x)", spurs, wid, attr);
 
 	if (!attr)
 	{
@@ -2601,7 +2551,7 @@ s32 cellSpursShutdownWorkload(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 wid
 
 	if (old_state == SPURS_WKL_STATE_SHUTTING_DOWN)
 	{
-		vm::light_op<true>(spurs->sysSrvMessage, [&](atomic_t<u8>& v){ v.release(0xff); });
+		vm::light_op(spurs->sysSrvMessage, [&](atomic_t<u8>& v){ v.release(0xff); });
 		return CELL_OK;
 	}
 
@@ -2683,7 +2633,7 @@ s32 cellSpursRemoveSystemWorkloadForUtility()
 /// Remove workload
 s32 cellSpursRemoveWorkload(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 wid)
 {
-	cellSpurs.trace("cellSpursRemoveWorkload(spurs=*0x%x, wid=%u)", spurs, wid);
+	cellSpurs.warning("cellSpursRemoveWorkload(spurs=*0x%x, wid=%u)", spurs, wid);
 
 	if (!spurs)
 		return CELL_SPURS_POLICY_MODULE_ERROR_NULL_POINTER;
@@ -2766,7 +2716,7 @@ s32 cellSpursWakeUp(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 }
 
 /// Send a workload signal
-s32 cellSpursSendWorkloadSignal(ppu_thread& /*ppu*/, vm::ptr<CellSpurs> spurs, u32 wid)
+s32 cellSpursSendWorkloadSignal(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 wid)
 {
 	cellSpurs.warning("cellSpursSendWorkloadSignal(spurs=*0x%x, wid=%d)", spurs, wid);
 
@@ -2828,7 +2778,7 @@ s32 cellSpursGetWorkloadFlag(vm::ptr<CellSpurs> spurs, vm::pptr<CellSpursWorkloa
 }
 
 /// Set ready count
-s32 cellSpursReadyCountStore(ppu_thread& /*ppu*/, vm::ptr<CellSpurs> spurs, u32 wid, u32 value)
+s32 cellSpursReadyCountStore(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 wid, u32 value)
 {
 	cellSpurs.trace("cellSpursReadyCountStore(spurs=*0x%x, wid=%d, value=0x%x)", spurs, wid, value);
 
@@ -2857,7 +2807,7 @@ s32 cellSpursReadyCountStore(ppu_thread& /*ppu*/, vm::ptr<CellSpurs> spurs, u32
 		return CELL_SPURS_POLICY_MODULE_ERROR_STAT;
 	}
 
-	vm::light_op<true>(spurs->readyCount(wid), [&](atomic_t<u8>& v)
+	vm::light_op(spurs->readyCount(wid), [&](atomic_t<u8>& v)
 	{
 		v.release(static_cast<u8>(value));
 	});
@@ -2866,7 +2816,7 @@ s32 cellSpursReadyCountStore(ppu_thread& /*ppu*/, vm::ptr<CellSpurs> spurs, u32
 }
 
 /// Swap ready count
-s32 cellSpursReadyCountSwap(ppu_thread& /*ppu*/, vm::ptr<CellSpurs> spurs, u32 wid, vm::ptr<u32> old, u32 swap)
+s32 cellSpursReadyCountSwap(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 wid, vm::ptr<u32> old, u32 swap)
 {
 	cellSpurs.trace("cellSpursReadyCountSwap(spurs=*0x%x, wid=%d, old=*0x%x, swap=0x%x)", spurs, wid, old, swap);
 
@@ -2904,7 +2854,7 @@ s32 cellSpursReadyCountSwap(ppu_thread& /*ppu*/, vm::ptr<CellSpurs> spurs, u32 w
 }
 
 /// Compare and swap ready count
-s32 cellSpursReadyCountCompareAndSwap(ppu_thread& /*ppu*/, vm::ptr<CellSpurs> spurs, u32 wid, vm::ptr<u32> old, u32 compare, u32 swap)
+s32 cellSpursReadyCountCompareAndSwap(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 wid, vm::ptr<u32> old, u32 compare, u32 swap)
 {
 	cellSpurs.trace("cellSpursReadyCountCompareAndSwap(spurs=*0x%x, wid=%d, old=*0x%x, compare=0x%x, swap=0x%x)", spurs, wid, old, compare, swap);
 
@@ -2945,7 +2895,7 @@ s32 cellSpursReadyCountCompareAndSwap(ppu_thread& /*ppu*/, vm::ptr<CellSpurs> sp
 }
 
 /// Increase or decrease ready count
-s32 cellSpursReadyCountAdd(ppu_thread& /*ppu*/, vm::ptr<CellSpurs> spurs, u32 wid, vm::ptr<u32> old, s32 value)
+s32 cellSpursReadyCountAdd(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 wid, vm::ptr<u32> old, s32 value)
 {
 	cellSpurs.trace("cellSpursReadyCountAdd(spurs=*0x%x, wid=%d, old=*0x%x, value=0x%x)", spurs, wid, old, value);
 
@@ -3025,7 +2975,7 @@ s32 cellSpursGetWorkloadData(vm::ptr<CellSpurs> spurs, vm::ptr<u64> data, u32 wi
 }
 
 /// Get workload information
-s32 cellSpursGetWorkloadInfo(ppu_thread& /*ppu*/, vm::ptr<CellSpurs> spurs, u32 wid, vm::ptr<CellSpursWorkloadInfo> info)
+s32 cellSpursGetWorkloadInfo(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 wid, vm::ptr<CellSpursWorkloadInfo> info)
 {
 	cellSpurs.todo("cellSpursGetWorkloadInfo(spurs=*0x%x, wid=0x%x, info=*0x%x)", spurs, wid, info);
 	return CELL_OK;
@@ -3085,8 +3035,7 @@ s32 _cellSpursWorkloadFlagReceiver(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u3
 		u8 FlagReceiver; // 0x77
 	};
 
-	s32 res = CELL_OK;
-
+	s32 res;
 	vm::reservation_op(ppu, vm::unsafe_ptr_cast<wklFlagOp>(spurs), [&](wklFlagOp& val)
 	{
 		if (is_set)
@@ -3124,122 +3073,23 @@ s32 _cellSpursWorkloadFlagReceiver(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u3
 		}
 
 		res = CELL_OK;
+		return;
 	});
 
 	return res;
 }
 
 /// Set/unset the recipient of the workload flag
-s32 _cellSpursWorkloadFlagReceiver2(ppu_thread& /*ppu*/, vm::ptr<CellSpurs> spurs, u32 wid, u32 is_set, u32 print_debug_output)
+s32 _cellSpursWorkloadFlagReceiver2()
 {
-	cellSpurs.warning("_cellSpursWorkloadFlagReceiver2(spurs=*0x%x, wid=%d, is_set=%d, print_debug_output=%d)", spurs, wid, is_set, print_debug_output);
-
-	if (!spurs)
-	{
-		return CELL_SPURS_POLICY_MODULE_ERROR_NULL_POINTER;
-	}
-
-	if (!spurs.aligned())
-	{
-		return CELL_SPURS_POLICY_MODULE_ERROR_ALIGN;
-	}
-
-	if (wid >= spurs->max_workloads())
-	{
-		return CELL_SPURS_POLICY_MODULE_ERROR_INVAL;
-	}
-
-	if ((spurs->wklEnabled.load() & (0x80000000u >> wid)) == 0u)
-	{
-		return CELL_SPURS_POLICY_MODULE_ERROR_SRCH;
-	}
-
-	if (spurs->exception)
-	{
-		return CELL_SPURS_POLICY_MODULE_ERROR_STAT;
-	}
-
-	atomic_fence_acq_rel();
-
-	s32 res = CELL_OK;
-
-	vm::atomic_op<true>(spurs->wklFlagReceiver, [&](u8& FlagReceiver)
-	{
-		if (is_set)
-		{
-			if (FlagReceiver != 0xff)
-			{
-				res = CELL_SPURS_POLICY_MODULE_ERROR_BUSY;
-				return;
-			}
-		}
-		else
-		{
-			if (FlagReceiver != wid)
-			{
-				res = CELL_SPURS_POLICY_MODULE_ERROR_PERM;
-				return;
-			}
-		}
-
-		if (is_set)
-		{
-			if (FlagReceiver == 0xff)
-			{
-				FlagReceiver = static_cast<u8>(wid);
-			}
-		}
-		else
-		{
-			if (FlagReceiver == wid)
-			{
-				FlagReceiver = 0xff;
-			}
-		}
-
-		res = CELL_OK;
-	});
-
-	return res;
+	UNIMPLEMENTED_FUNC(cellSpurs);
+	return CELL_OK;
 }
 
 /// Request assignment of idle SPUs
-s32 cellSpursRequestIdleSpu(vm::ptr<CellSpurs> spurs, u32 wid, u32 count)
+s32 cellSpursRequestIdleSpu()
 {
-	cellSpurs.trace("cellSpursRequestIdleSpu(spurs=*0x%x, wid=%d, count=%d)", spurs, wid, count);
-
-	if (!spurs)
-	{
-		return CELL_SPURS_CORE_ERROR_NULL_POINTER;
-	}
-
-	if (!spurs.aligned())
-	{
-		return CELL_SPURS_CORE_ERROR_ALIGN;
-	}
-
-	// Old API: This function doesn't support 32 workloads
-	if (spurs->flags1 & SF1_32_WORKLOADS)
-	{
-		return CELL_SPURS_CORE_ERROR_STAT;
-	}
-
-	if (wid >= CELL_SPURS_MAX_WORKLOAD || count >= CELL_SPURS_MAX_SPU)
-	{
-		return CELL_SPURS_CORE_ERROR_INVAL;
-	}
-
-	if ((spurs->wklEnabled.load() & (0x80000000u >> wid)) == 0u)
-	{
-		return CELL_SPURS_CORE_ERROR_SRCH;
-	}
-
-	if (spurs->exception)
-	{
-		return CELL_SPURS_CORE_ERROR_STAT;
-	}
-
-	vm::light_op<true>(spurs->wklIdleSpuCountOrReadyCount2[wid], FN(x.release(static_cast<u8>(count))));
+	UNIMPLEMENTED_FUNC(cellSpurs);
 	return CELL_OK;
 }
 
@@ -3406,7 +3256,6 @@ s32 cellSpursEventFlagSet(ppu_thread& ppu, vm::ptr<CellSpursEventFlag> eventFlag
 		eventFlag->pendingRecvTaskEvents[ppuWaitSlot] = ppuEvents;
 
 		ensure(sys_event_port_send(eventFlag->eventPortId, 0, 0, 0) == 0);
-		static_cast<void>(ppu.test_stopped());
 	}
 
 	if (pendingRecv)
@@ -3476,7 +3325,7 @@ s32 _spurs::event_flag_wait(ppu_thread& ppu, vm::ptr<CellSpursEventFlag> eventFl
 	bool recv;
 	s32  rc;
 	u16  receivedEvents;
-	vm::atomic_op(eventFlag->ctrl, [eventFlag, mask, mode, block, &recv, &rc, &receivedEvents](CellSpursEventFlag::ControlSyncVar& ctrl)
+	eventFlag->ctrl.atomic_op([eventFlag, mask, mode, block, &recv, &rc, &receivedEvents](CellSpursEventFlag::ControlSyncVar& ctrl)
 	{
 		u16 relevantEvents = ctrl.events & *mask;
 		if (eventFlag->direction == CELL_SPURS_EVENT_FLAG_ANY2ANY)
@@ -3580,7 +3429,6 @@ s32 _spurs::event_flag_wait(ppu_thread& ppu, vm::ptr<CellSpursEventFlag> eventFl
 	{
 		// Block till something happens
 		ensure(sys_event_queue_receive(ppu, eventFlag->eventQueueId, vm::null, 0) == 0);
-		static_cast<void>(ppu.test_stopped());
 
 		s32 i = 0;
 		if (eventFlag->direction == CELL_SPURS_EVENT_FLAG_ANY2ANY)
@@ -3589,7 +3437,7 @@ s32 _spurs::event_flag_wait(ppu_thread& ppu, vm::ptr<CellSpursEventFlag> eventFl
 		}
 
 		*mask = eventFlag->pendingRecvTaskEvents[i];
-		vm::atomic_op(eventFlag->ctrl, [](CellSpursEventFlag::ControlSyncVar& ctrl) { ctrl.ppuPendingRecv = 0; });
+		eventFlag->ctrl.atomic_op([](auto& ctrl) { ctrl.ppuPendingRecv = 0; });
 	}
 
 	*mask = receivedEvents;
@@ -3828,19 +3676,19 @@ s32 _cellSpursLFQueueInitialize(vm::ptr<void> pTasksetOrSpurs, vm::ptr<CellSpurs
 
 s32 _cellSpursLFQueuePushBody()
 {
-	cellSpurs.todo("_cellSpursLFQueuePushBody()");
+	UNIMPLEMENTED_FUNC(cellSpurs);
 	return CELL_OK;
 }
 
 s32 cellSpursLFQueueAttachLv2EventQueue(vm::ptr<CellSyncLFQueue> queue)
 {
-	cellSpurs.todo("cellSpursLFQueueAttachLv2EventQueue(queue=*0x%x)", queue);
+	UNIMPLEMENTED_FUNC(cellSpurs);
 	return CELL_OK;
 }
 
 s32 cellSpursLFQueueDetachLv2EventQueue(vm::ptr<CellSyncLFQueue> queue)
 {
-	cellSpurs.todo("cellSpursLFQueueDetachLv2EventQueue(queue=*0x%x)", queue);
+	UNIMPLEMENTED_FUNC(cellSpurs);
 	return CELL_OK;
 }
 
@@ -4022,46 +3870,19 @@ s32 cellSpursGetTasksetId(vm::ptr<CellSpursTaskset> taskset, vm::ptr<u32> wid)
 		return CELL_SPURS_TASK_ERROR_ALIGN;
 	}
 
-	// Does not check its validity
-	*wid = taskset->wid;
-	return CELL_OK;
-}
-
-s32 cellSpursShutdownTaskset(ppu_thread& ppu, vm::ptr<CellSpursTaskset> taskset)
-{
-	cellSpurs.warning("cellSpursShutdownTaskset(taskset=*0x%x)", taskset);
-
-	if (!taskset)
-	{
-		return CELL_SPURS_TASK_ERROR_NULL_POINTER;
-	}
-
-	if (!taskset.aligned())
-	{
-		return CELL_SPURS_TASK_ERROR_ALIGN;
-	}
-
-	const u32 wid = taskset->wid;
-
-	if (wid >= CELL_SPURS_MAX_WORKLOAD)
+	if (taskset->wid >= CELL_SPURS_MAX_WORKLOAD)
 	{
 		return CELL_SPURS_TASK_ERROR_INVAL;
 	}
 
-	const auto spurs = +taskset->spurs;
-	u32 shutdown_error = ppu_execute<&cellSpursShutdownWorkload>(ppu, spurs, wid);
+	*wid = taskset->wid;
+	return CELL_OK;
+}
 
-	if (shutdown_error == CELL_SPURS_POLICY_MODULE_ERROR_STAT)
-	{
-		shutdown_error = CELL_SPURS_TASK_ERROR_STAT;
-	}
-	else if (shutdown_error == CELL_SPURS_POLICY_MODULE_ERROR_ALIGN || shutdown_error == CELL_SPURS_POLICY_MODULE_ERROR_SRCH)
-	{
-		// printf is used on fw in this case
-		cellSpurs.error("cellSpursShutdownTaskset(taskset=*0x%x): Failed with %s (spurs=0x%x, wid=%d)", CellError{ shutdown_error }, spurs, wid);
-	}
-
-	return shutdown_error;
+s32 cellSpursShutdownTaskset(vm::ptr<CellSpursTaskset> taskset)
+{
+	UNIMPLEMENTED_FUNC(cellSpurs);
+	return CELL_OK;
 }
 
 s32 _spurs::create_task(vm::ptr<CellSpursTaskset> taskset, vm::ptr<u32> task_id, vm::cptr<void> elf, vm::cptr<void> context, u32 size, vm::ptr<CellSpursTaskLsPattern> ls_pattern, vm::ptr<CellSpursTaskArgument> arg)
@@ -4129,7 +3950,7 @@ s32 _spurs::create_task(vm::ptr<CellSpursTaskset> taskset, vm::ptr<u32> task_id,
 
 	u32 tmp_task_id;
 
-	vm::light_op(*vm::_ptr<atomic_be_t<v128>>(taskset.ptr(&CellSpursTaskset::enabled).addr()), [&](atomic_be_t<v128>& ptr)
+	vm::light_op(vm::_ref<atomic_be_t<v128>>(taskset.ptr(&CellSpursTaskset::enabled).addr()), [&](atomic_be_t<v128>& ptr)
 	{
 		// NOTE: Realfw processes this using 4 32-bits atomic loops
 		// But here its processed within a single 128-bit atomic op
@@ -4566,7 +4387,7 @@ s32 cellSpursTasksetUnsetExceptionEventHandler(vm::ptr<CellSpursTaskset> taskset
 	return CELL_OK;
 }
 
-s32 cellSpursLookUpTasksetAddress(ppu_thread& /*ppu*/, vm::ptr<CellSpurs> spurs, vm::pptr<CellSpursTaskset> taskset, u32 id)
+s32 cellSpursLookUpTasksetAddress(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, vm::pptr<CellSpursTaskset> taskset, u32 id)
 {
 	cellSpurs.warning("cellSpursLookUpTasksetAddress(spurs=*0x%x, taskset=**0x%x, id=0x%x)", spurs, taskset, id);
 
@@ -4648,9 +4469,9 @@ s32 _cellSpursTasksetAttributeInitialize(vm::ptr<CellSpursTasksetAttribute> attr
 	return CELL_OK;
 }
 
-s32 _spurs::check_job_chain_attribute(u32 sdkVer, vm::cptr<u64> jcEntry, u16 sizeJobDescr, u16 maxGrabbedJob,
-	u64 priorities, u32 /*maxContention*/, u8 autoSpuCount, u32 tag1, u32 tag2,
-	u8 /*isFixedMemAlloc*/, u32 maxSizeJob, u32 initSpuCount)
+s32 _spurs::check_job_chain_attribute(u32 sdkVer, vm::cptr<u64> jcEntry, u16 sizeJobDescr, u16 maxGrabbedJob
+    , u64 priorities, u32 maxContention, u8 autoSpuCount, u32 tag1, u32 tag2
+    , u8 isFixedMemAlloc, u32 maxSizeJob, u32 initSpuCount)
 {
 	if (!jcEntry)
 		return CELL_SPURS_JOB_ERROR_NULL_POINTER;
@@ -4681,9 +4502,9 @@ s32 _spurs::check_job_chain_attribute(u32 sdkVer, vm::cptr<u64> jcEntry, u16 siz
 	return CELL_OK;
 }
 
-s32 _spurs::create_job_chain(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, vm::ptr<CellSpursJobChain> jobChain, vm::cptr<u64> jobChainEntry, u16 /*sizeJob*/,
-	u16 maxGrabbedJob, vm::cptr<u8[8]> prio, u32 maxContention, b8 /*autoReadyCount*/,
-	u32 tag1, u32 tag2, u32 /*HaltOnError*/, vm::cptr<char> name, u32 /*param_13*/, u32 /*param_14*/)
+s32 _spurs::create_job_chain(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, vm::ptr<CellSpursJobChain> jobChain, vm::cptr<u64> jobChainEntry, u16 sizeJob
+		, u16 maxGrabbedJob, vm::cptr<u8[8]> prio, u32 maxContention, b8 autoReadyCount
+		, u32 tag1, u32 tag2, u32 HaltOnError, vm::cptr<char> name, u32 param_13, u32 param_14)
 {
 	const s32 sdkVer = _spurs::get_sdk_version();
 	jobChain->spurs = spurs;
@@ -5384,7 +5205,7 @@ s32 cellSpursSemaphoreGetTasksetAddress()
 	return CELL_OK;
 }
 
-DECLARE(ppu_module_manager::cellSpurs)("cellSpurs", [](ppu_static_module* _this)
+DECLARE(ppu_module_manager::cellSpurs)("cellSpurs", []()
 {
 	// Core
 	REG_FUNC(cellSpurs, cellSpursInitialize);
@@ -5546,20 +5367,4 @@ DECLARE(ppu_module_manager::cellSpurs)("cellSpurs", [](ppu_static_module* _this)
 	REG_FUNC(cellSpurs, cellSpursTraceStart);
 	REG_FUNC(cellSpurs, cellSpursTraceStop);
 	REG_FUNC(cellSpurs, cellSpursTraceFinalize);
-
-	_this->add_init_func([](ppu_static_module*)
-	{
-		const auto val = g_cfg.core.spu_accurate_reservations ? MFF_PERFECT : MFF_FORCED_HLE;
-
-		REINIT_FUNC(cellSpursSetPriorities).flag(val);
-		REINIT_FUNC(cellSpursAddWorkload).flag(val);
-		REINIT_FUNC(cellSpursAddWorkloadWithAttribute).flag(val);
-		REINIT_FUNC(cellSpursShutdownWorkload).flag(val);
-		REINIT_FUNC(cellSpursReadyCountStore).flag(val);
-		REINIT_FUNC(cellSpursSetPriority).flag(val);
-		REINIT_FUNC(cellSpursTraceInitialize).flag(val);
-		REINIT_FUNC(cellSpursWaitForWorkloadShutdown).flag(val);
-		REINIT_FUNC(cellSpursRequestIdleSpu).flag(val);
-		REINIT_FUNC(cellSpursRemoveWorkload).flag(val);
-	});
 });
diff --git a/rpcs3/Emu/Cell/Modules/cellSpurs.h b/rpcs3/Emu/Cell/Modules/cellSpurs.h
index f4be6d84d6..51f059d973 100644
--- a/rpcs3/Emu/Cell/Modules/cellSpurs.h
+++ b/rpcs3/Emu/Cell/Modules/cellSpurs.h
@@ -4,10 +4,6 @@
 
 #include "util/v128.hpp"
 
-#include "Emu/Cell/lv2/sys_lwmutex.h"
-#include "Emu/Cell/lv2/sys_lwcond.h"
-#include "Emu/Cell/lv2/sys_spu.h"
-
 struct CellSpurs;
 struct CellSpursTaskset;
 
@@ -802,7 +798,7 @@ struct alignas(128) CellSpurs
 
 	atomic_t<u8>& readyCount(u32 wid)
 	{
-		if (wid < 0x10)
+		if (wid & 0x10)
 		{
 			return wklReadyCount1[wid & 0xf];
 		}
diff --git a/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp b/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp
index b2cb3e4869..dfbc3e0966 100644
--- a/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp
@@ -1,6 +1,9 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
+#include "Emu/Cell/lv2/sys_spu.h"
+#include "cellSpursJq.h"
+
 LOG_CHANNEL(cellSpursJq);
 
 error_code cellSpursJobQueueAttributeInitialize()
diff --git a/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp b/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp
index 4be245810f..aaec2a7464 100644
--- a/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp
@@ -4,17 +4,21 @@
 #include "Emu/Memory/vm_reservation.h"
 #include "Emu/Cell/SPUThread.h"
 #include "Emu/Cell/SPURecompiler.h"
+#include "Emu/Cell/lv2/sys_lwmutex.h"
+#include "Emu/Cell/lv2/sys_lwcond.h"
+#include "Emu/Cell/lv2/sys_spu.h"
 #include "cellSpurs.h"
 
 #include "util/asm.hpp"
 #include "util/v128.hpp"
-#include "util/simd.hpp"
+#include "util/v128sse.hpp"
 
 LOG_CHANNEL(cellSpurs);
 
 // Temporarily
 #ifndef _MSC_VER
 #pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif
 
 //----------------------------------------------------------------------------
@@ -88,7 +92,7 @@ void spursJobchainPopUrgentCommand(spu_thread& spu);
 //----------------------------------------------------------------------------
 
 // Output trace information
-void cellSpursModulePutTrace(CellSpursTracePacket* /*packet*/, u32 /*dmaTagId*/)
+void cellSpursModulePutTrace(CellSpursTracePacket* packet, u32 dmaTagId)
 {
 	// TODO: Implement this
 }
@@ -618,7 +622,7 @@ bool spursKernel2SelectWorkload(spu_thread& spu)
 void spursKernelDispatchWorkload(spu_thread& spu, u64 widAndPollStatus)
 {
 	const auto ctxt = spu._ptr<SpursKernelContext>(0x100);
-	const bool isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false;
+	auto isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false;
 
 	auto pollStatus = static_cast<u32>(widAndPollStatus);
 	auto wid = static_cast<u32>(widAndPollStatus >> 32);
@@ -670,7 +674,7 @@ void spursKernelDispatchWorkload(spu_thread& spu, u64 widAndPollStatus)
 bool spursKernelWorkloadExit(spu_thread& spu)
 {
 	const auto ctxt = spu._ptr<SpursKernelContext>(0x100);
-	const bool isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false;
+	auto isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false;
 
 	// Select next workload to run
 	spu.gpr[3].clear();
@@ -697,7 +701,7 @@ bool spursKernelEntry(spu_thread& spu)
 	ctxt->spuNum = spu.gpr[3]._u32[3];
 	ctxt->spurs.set(spu.gpr[4]._u64[1]);
 
-	const bool isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false;
+	auto isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false;
 
 	// Initialise the SPURS context to its initial values
 	ctxt->dmaTagId = CELL_SPURS_KERNEL_DMA_TAG_ID;
@@ -781,8 +785,8 @@ void spursSysServiceIdleHandler(spu_thread& spu, SpursKernelContext* ctxt)
 			}
 		}
 
-		const bool allSpusIdle = nIdlingSpus == spurs->nSpus;
-		const bool exitIfNoWork = spurs->flags1 & SF1_EXIT_IF_NO_WORK ? true : false;
+		bool allSpusIdle = nIdlingSpus == spurs->nSpus ? true : false;
+		bool exitIfNoWork = spurs->flags1 & SF1_EXIT_IF_NO_WORK ? true : false;
 		shouldExit = allSpusIdle && exitIfNoWork;
 
 		// Check if any workloads can be scheduled
@@ -839,7 +843,7 @@ void spursSysServiceIdleHandler(spu_thread& spu, SpursKernelContext* ctxt)
 			}
 		}
 
-		const bool spuIdling = spurs->spuIdling & (1 << ctxt->spuNum) ? true : false;
+		bool spuIdling = spurs->spuIdling & (1 << ctxt->spuNum) ? true : false;
 		if (foundReadyWorkload && shouldExit == false)
 		{
 			spurs->spuIdling &= ~(1 << ctxt->spuNum);
@@ -870,7 +874,7 @@ void spursSysServiceIdleHandler(spu_thread& spu, SpursKernelContext* ctxt)
 }
 
 // Main function for the system service
-void spursSysServiceMain(spu_thread& spu, u32 /*pollStatus*/)
+void spursSysServiceMain(spu_thread& spu, u32 pollStatus)
 {
 	const auto ctxt = spu._ptr<SpursKernelContext>(0x100);
 
@@ -1165,7 +1169,7 @@ void spursSysServiceUpdateShutdownCompletionEvents(spu_thread& spu, SpursKernelC
 }
 
 // Update the trace count for this SPU
-void spursSysServiceTraceSaveCount(spu_thread& /*spu*/, SpursKernelContext* ctxt)
+void spursSysServiceTraceSaveCount(spu_thread& spu, SpursKernelContext* ctxt)
 {
 	if (ctxt->traceBuffer)
 	{
@@ -1430,7 +1434,7 @@ s32 spursTasksetProcessRequest(spu_thread& spu, s32 request, u32* taskId, u32* i
 
 		// Verify taskset state is valid
 		if ((waiting & running) != v128{} || (ready & pready) != v128{} ||
-			(gv_andn(enabled, running | ready | pready | signalled | waiting) != v128{}))
+			(v128::andnot(enabled, running | ready | pready | signalled | waiting) != v128{}))
 		{
 			spu_log.error("Invalid taskset state");
 			spursHalt(spu);
@@ -1438,7 +1442,7 @@ s32 spursTasksetProcessRequest(spu_thread& spu, s32 request, u32* taskId, u32* i
 
 		// Find the number of tasks that have become ready since the last iteration
 		{
-			v128 newlyReadyTasks = gv_andn(ready, signalled | pready);
+			v128 newlyReadyTasks = v128::andnot(ready, signalled | pready);
 
 			numNewlyReadyTasks = utils::popcnt128(newlyReadyTasks._u);
 		}
@@ -1487,7 +1491,7 @@ s32 spursTasksetProcessRequest(spu_thread& spu, s32 request, u32* taskId, u32* i
 		}
 		case SPURS_TASKSET_REQUEST_POLL:
 		{
-			readyButNotRunning = gv_andn(running, ready0);
+			readyButNotRunning = v128::andnot(running, ready0);
 			if (taskset->wkl_flag_wait_task < CELL_SPURS_MAX_TASK)
 			{
 				readyButNotRunning._u &= ~(u128{1} << (~taskset->wkl_flag_wait_task & 127));
@@ -1522,7 +1526,7 @@ s32 spursTasksetProcessRequest(spu_thread& spu, s32 request, u32* taskId, u32* i
 		}
 		case SPURS_TASKSET_REQUEST_SELECT_TASK:
 		{
-			readyButNotRunning = gv_andn(running, ready0);
+			readyButNotRunning = v128::andnot(running, ready0);
 			if (taskset->wkl_flag_wait_task < CELL_SPURS_MAX_TASK)
 			{
 				readyButNotRunning._u &= ~(u128{1} << (~taskset->wkl_flag_wait_task & 127));
@@ -1593,12 +1597,12 @@ s32 spursTasksetProcessRequest(spu_thread& spu, s32 request, u32* taskId, u32* i
 			spursHalt(spu);
 		}
 
-		// vm::_ref<v128>(ctxt->taskset.addr() + ::offset32(&CellSpursTaskset::waiting)) = waiting;
-		// vm::_ref<v128>(ctxt->taskset.addr() + ::offset32(&CellSpursTaskset::running)) = running;
-		// vm::_ref<v128>(ctxt->taskset.addr() + ::offset32(&CellSpursTaskset::ready)) = ready;
-		// vm::_ref<v128>(ctxt->taskset.addr() + ::offset32(&CellSpursTaskset::pending_ready)) = v128{};
-		// vm::_ref<v128>(ctxt->taskset.addr() + ::offset32(&CellSpursTaskset::enabled)) = enabled;
-		// vm::_ref<v128>(ctxt->taskset.addr() + ::offset32(&CellSpursTaskset::signalled)) = signalled;
+		vm::_ref<v128>(ctxt->taskset.addr() + ::offset32(&CellSpursTaskset::waiting)) = waiting;
+		vm::_ref<v128>(ctxt->taskset.addr() + ::offset32(&CellSpursTaskset::running)) = running;
+		vm::_ref<v128>(ctxt->taskset.addr() + ::offset32(&CellSpursTaskset::ready)) = ready;
+		vm::_ref<v128>(ctxt->taskset.addr() + ::offset32(&CellSpursTaskset::pending_ready)) = v128{};
+		vm::_ref<v128>(ctxt->taskset.addr() + ::offset32(&CellSpursTaskset::enabled)) = enabled;
+		vm::_ref<v128>(ctxt->taskset.addr() + ::offset32(&CellSpursTaskset::signalled)) = signalled;
 
 		std::memcpy(spu._ptr<void>(0x2700), spu._ptr<void>(0x100), 128); // Copy data
 	}//);
@@ -2055,7 +2059,7 @@ s32 spursTasksetLoadElf(spu_thread& spu, u32* entryPoint, u32* lowestLoadAddr, u
 //----------------------------------------------------------------------------
 // SPURS taskset policy module functions
 //----------------------------------------------------------------------------
-bool spursJobChainEntry(spu_thread& /*spu*/)
+bool spursJobChainEntry(spu_thread& spu)
 {
 	//const auto ctxt = spu._ptr<SpursJobChainContext>(0x4a00);
 	//auto kernelCtxt = spu._ptr<SpursKernelContext>(spu.gpr[3]._u32[3]);
diff --git a/rpcs3/Emu/Cell/Modules/cellSsl.cpp b/rpcs3/Emu/Cell/Modules/cellSsl.cpp
index d7f32a5636..0f36371a96 100644
--- a/rpcs3/Emu/Cell/Modules/cellSsl.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSsl.cpp
@@ -326,10 +326,10 @@ error_code _cellSslConvertSslVersion()
 	return CELL_OK;
 }
 
-b8 _cellSslIsInitd()
+error_code _cellSslIsInitd()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
-	return false;
+	return CELL_OK;
 }
 
 error_code _cellSslPemReadPrivateKey()
diff --git a/rpcs3/Emu/Cell/Modules/cellSsl.h b/rpcs3/Emu/Cell/Modules/cellSsl.h
index a1f96aec7d..1df827d585 100644
--- a/rpcs3/Emu/Cell/Modules/cellSsl.h
+++ b/rpcs3/Emu/Cell/Modules/cellSsl.h
@@ -203,5 +203,3 @@ struct ssl_manager
 {
 	atomic_t<bool> is_init{ false };
 };
-
-b8 _cellSslIsInitd();
diff --git a/rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp b/rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp
index 2a19d2e661..b57155053a 100644
--- a/rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/IdManager.h"
 
 #include "cellSubDisplay.h"
 
@@ -28,147 +27,15 @@ void fmt_class_string<CellSubDisplayError>::format(std::string& out, u64 arg)
 	});
 }
 
-enum class sub_display_status : u32
-{
-	uninitialized = 0,
-	stopped = 1,
-	started = 2
-};
-
-struct sub_display_manager
-{
-	shared_mutex mutex;
-	sub_display_status status = sub_display_status::uninitialized;
-	CellSubDisplayParam param{};
-	vm::ptr<CellSubDisplayHandler> func = vm::null;
-	vm::ptr<void> userdata = vm::null;
-
-	// Video data
-	vm::ptr<void> video_buffer = vm::null;
-	u32 buf_size = 0;
-
-	// Audio data
-	bool audio_is_busy = false;
-
-	// Touch data
-	std::array<CellSubDisplayTouchInfo, CELL_SUBDISPLAY_TOUCH_MAX_TOUCH_INFO> touch_info{};
-};
-
-
-error_code check_param(CellSubDisplayParam* param)
-{
-	if (!param ||
-		param->version < CELL_SUBDISPLAY_VERSION_0001 ||
-		param->version > CELL_SUBDISPLAY_VERSION_0003 ||
-		param->mode != CELL_SUBDISPLAY_MODE_REMOTEPLAY ||
-		param->nGroup != 1 ||
-		param->nPeer != 1 ||
-		param->audioParam.ch != 2 ||
-		param->audioParam.audioMode < CELL_SUBDISPLAY_AUDIO_MODE_SETDATA ||
-		param->audioParam.audioMode > CELL_SUBDISPLAY_AUDIO_MODE_CAPTURE)
-	{
-		return CELL_SUBDISPLAY_ERROR_INVALID_VALUE;
-	}
-
-	switch (param->videoParam.format)
-	{
-	case CELL_SUBDISPLAY_VIDEO_FORMAT_A8R8G8B8:
-	case CELL_SUBDISPLAY_VIDEO_FORMAT_R8G8B8A8:
-	{
-		if (param->version == CELL_SUBDISPLAY_VERSION_0003 ||
-			param->videoParam.width != 480 ||
-			param->videoParam.height != 272 ||
-			(param->videoParam.pitch != 1920 && param->videoParam.pitch != 2048) ||
-			param->videoParam.aspectRatio < CELL_SUBDISPLAY_VIDEO_ASPECT_RATIO_16_9 ||
-			param->videoParam.aspectRatio > CELL_SUBDISPLAY_VIDEO_ASPECT_RATIO_4_3 ||
-			param->videoParam.videoMode < CELL_SUBDISPLAY_VIDEO_MODE_SETDATA ||
-			param->videoParam.videoMode > CELL_SUBDISPLAY_VIDEO_MODE_CAPTURE)
-		{
-			return CELL_SUBDISPLAY_ERROR_INVALID_VALUE;
-		}
-
-		break;
-	}
-	case CELL_SUBDISPLAY_VIDEO_FORMAT_YUV420:
-	{
-		if (param->version != CELL_SUBDISPLAY_VERSION_0003 ||
-			param->videoParam.width != CELL_SUBDISPLAY_0003_WIDTH ||
-			param->videoParam.height != CELL_SUBDISPLAY_0003_HEIGHT ||
-			param->videoParam.pitch != CELL_SUBDISPLAY_0003_PITCH ||
-			param->videoParam.aspectRatio != CELL_SUBDISPLAY_VIDEO_ASPECT_RATIO_16_9 ||
-			param->videoParam.videoMode != CELL_SUBDISPLAY_VIDEO_MODE_SETDATA)
-		{
-			return CELL_SUBDISPLAY_ERROR_INVALID_VALUE;
-		}
-
-		break;
-	}
-	default:
-	{
-		return CELL_SUBDISPLAY_ERROR_INVALID_VALUE;
-	}
-	}
-
-	return CELL_OK;
-}
-
 error_code cellSubDisplayInit(vm::ptr<CellSubDisplayParam> pParam, vm::ptr<CellSubDisplayHandler> func, vm::ptr<void> userdata, u32 container)
 {
 	cellSubDisplay.todo("cellSubDisplayInit(pParam=*0x%x, func=*0x%x, userdata=*0x%x, container=0x%x)", pParam, func, userdata, container);
-
-	auto& manager = g_fxo->get<sub_display_manager>();
-	std::lock_guard lock(manager.mutex);
-
-	if (manager.func)
-	{
-		return CELL_SUBDISPLAY_ERROR_NOT_INITIALIZED;
-	}
-
-	if (error_code error = check_param(pParam.get_ptr()))
-	{
-		return error;
-	}
-
-	if (!func)
-	{
-		return CELL_SUBDISPLAY_ERROR_INVALID_VALUE;
-	}
-
-	manager.param = *pParam;
-	manager.func = func;
-	manager.userdata = userdata;
-
-	if (true) // TODO
-	{
-		return CELL_SUBDISPLAY_ERROR_ZERO_REGISTERED;
-	}
-
-	return CELL_OK;
+	return CELL_SUBDISPLAY_ERROR_ZERO_REGISTERED;
 }
 
 error_code cellSubDisplayEnd()
 {
 	cellSubDisplay.todo("cellSubDisplayEnd()");
-
-	auto& manager = g_fxo->get<sub_display_manager>();
-	std::lock_guard lock(manager.mutex);
-
-	if (!manager.func)
-	{
-		return CELL_SUBDISPLAY_ERROR_NOT_INITIALIZED;
-	}
-
-	if (manager.status == sub_display_status::started)
-	{
-		// TODO:
-		// cellSubDisplayStop();
-	}
-
-	manager.param = {};
-	manager.func = vm::null;
-	manager.userdata = vm::null;
-	manager.status = sub_display_status::uninitialized;
-
 	return CELL_OK;
 }
 
@@ -176,11 +43,6 @@ error_code cellSubDisplayGetRequiredMemory(vm::ptr<CellSubDisplayParam> pParam)
 {
 	cellSubDisplay.warning("cellSubDisplayGetRequiredMemory(pParam=*0x%x)", pParam);
 
-	if (error_code error = check_param(pParam.get_ptr()))
-	{
-		return error;
-	}
-
 	switch (pParam->version)
 	{
 		case CELL_SUBDISPLAY_VERSION_0001: return not_an_error(CELL_SUBDISPLAY_0001_MEMORY_CONTAINER_SIZE);
@@ -195,61 +57,18 @@ error_code cellSubDisplayGetRequiredMemory(vm::ptr<CellSubDisplayParam> pParam)
 error_code cellSubDisplayStart()
 {
 	cellSubDisplay.todo("cellSubDisplayStart()");
-
-	auto& manager = g_fxo->get<sub_display_manager>();
-	std::lock_guard lock(manager.mutex);
-
-	if (manager.status == sub_display_status::uninitialized)
-	{
-		return CELL_SUBDISPLAY_ERROR_NOT_INITIALIZED;
-	}
-
-	manager.status = sub_display_status::started;
-
-	// TODO
-
 	return CELL_OK;
 }
 
 error_code cellSubDisplayStop()
 {
 	cellSubDisplay.todo("cellSubDisplayStop()");
-
-	auto& manager = g_fxo->get<sub_display_manager>();
-	std::lock_guard lock(manager.mutex);
-
-	if (manager.status == sub_display_status::uninitialized)
-	{
-		return CELL_SUBDISPLAY_ERROR_NOT_INITIALIZED;
-	}
-
-	manager.status = sub_display_status::stopped;
-
-	// TODO
-
 	return CELL_OK;
 }
 
 error_code cellSubDisplayGetVideoBuffer(s32 groupId, vm::pptr<void> ppVideoBuf, vm::ptr<u32> pSize)
 {
 	cellSubDisplay.todo("cellSubDisplayGetVideoBuffer(groupId=%d, ppVideoBuf=**0x%x, pSize=*0x%x)", groupId, ppVideoBuf, pSize);
-
-	auto& manager = g_fxo->get<sub_display_manager>();
-	std::lock_guard lock(manager.mutex);
-
-	if (manager.status == sub_display_status::uninitialized)
-	{
-		return CELL_SUBDISPLAY_ERROR_NOT_INITIALIZED;
-	}
-
-	if (groupId != 0 || !ppVideoBuf || !pSize)
-	{
-		return CELL_SUBDISPLAY_ERROR_INVALID_VALUE;
-	}
-
-	*pSize = manager.buf_size;
-	*ppVideoBuf = manager.video_buffer;
-
 	return CELL_OK;
 }
 
@@ -257,26 +76,11 @@ error_code cellSubDisplayAudioOutBlocking(s32 groupId, vm::ptr<void> pvData, s32
 {
 	cellSubDisplay.todo("cellSubDisplayAudioOutBlocking(groupId=%d, pvData=*0x%x, samples=%d)", groupId, pvData, samples);
 
-	auto& manager = g_fxo->get<sub_display_manager>();
-	std::lock_guard lock(manager.mutex);
-
-	if (manager.status == sub_display_status::uninitialized)
-	{
-		return CELL_SUBDISPLAY_ERROR_NOT_INITIALIZED;
-	}
-
-	if (groupId != 0 || samples < 0)
-	{
-		return CELL_SUBDISPLAY_ERROR_INVALID_VALUE;
-	}
-
 	if (samples % 1024)
 	{
 		return CELL_SUBDISPLAY_ERROR_SET_SAMPLE;
 	}
 
-	// TODO
-
 	return CELL_OK;
 }
 
@@ -284,110 +88,32 @@ error_code cellSubDisplayAudioOutNonBlocking(s32 groupId, vm::ptr<void> pvData,
 {
 	cellSubDisplay.todo("cellSubDisplayAudioOutNonBlocking(groupId=%d, pvData=*0x%x, samples=%d)", groupId, pvData, samples);
 
-	auto& manager = g_fxo->get<sub_display_manager>();
-	std::lock_guard lock(manager.mutex);
-
-	if (manager.status == sub_display_status::uninitialized)
-	{
-		return CELL_SUBDISPLAY_ERROR_NOT_INITIALIZED;
-	}
-
-	if (groupId != 0 || samples < 0)
-	{
-		return CELL_SUBDISPLAY_ERROR_INVALID_VALUE;
-	}
-
 	if (samples % 1024)
 	{
 		return CELL_SUBDISPLAY_ERROR_SET_SAMPLE;
 	}
 
-	if (manager.audio_is_busy)
-	{
-		return CELL_SUBDISPLAY_ERROR_AUDIOOUT_IS_BUSY;
-	}
-
-	// TODO: fetch audio async
-	// manager.audio_is_busy = true;
-
 	return CELL_OK;
 }
 
 error_code cellSubDisplayGetPeerNum(s32 groupId)
 {
 	cellSubDisplay.todo("cellSubDisplayGetPeerNum(groupId=%d)", groupId);
-
-	auto& manager = g_fxo->get<sub_display_manager>();
-	std::lock_guard lock(manager.mutex);
-
-	if (manager.status == sub_display_status::uninitialized)
-	{
-		return CELL_SUBDISPLAY_ERROR_NOT_INITIALIZED;
-	}
-
-	if (groupId != 0)
-	{
-		return CELL_SUBDISPLAY_ERROR_INVALID_VALUE;
-	}
-
-	s32 peer_num = 0; // TODO
-
-	return not_an_error(peer_num);
+	return CELL_OK;
 }
 
 error_code cellSubDisplayGetPeerList(s32 groupId, vm::ptr<CellSubDisplayPeerInfo> pInfo, vm::ptr<s32> pNum)
 {
 	cellSubDisplay.todo("cellSubDisplayGetPeerList(groupId=%d, pInfo=*0x%x, pNum=*0x%x)", groupId, pInfo, pNum);
 
-	auto& manager = g_fxo->get<sub_display_manager>();
-	std::lock_guard lock(manager.mutex);
-
-	if (manager.status == sub_display_status::uninitialized)
-	{
-		return CELL_SUBDISPLAY_ERROR_NOT_INITIALIZED;
-	}
-
-	if (groupId != 0)
-	{
-		return CELL_OK;
-	}
-
-	if (!pInfo || !pNum || *pNum < 1)
-	{
-		return CELL_SUBDISPLAY_ERROR_INVALID_VALUE;
-	}
-
 	*pNum = 0;
 
-	// TODO
-
 	return CELL_OK;
 }
 
 error_code cellSubDisplayGetTouchInfo(s32 groupId, vm::ptr<CellSubDisplayTouchInfo> pTouchInfo, vm::ptr<s32> pNumTouchInfo)
 {
 	cellSubDisplay.todo("cellSubDisplayGetTouchInfo(groupId=%d, pTouchInfo=*0x%x, pNumTouchInfo=*0x%x)", groupId, pTouchInfo, pNumTouchInfo);
-
-	if (groupId != 0 || !pNumTouchInfo || !pTouchInfo)
-	{
-		return CELL_SUBDISPLAY_ERROR_INVALID_VALUE;
-	}
-
-	auto& manager = g_fxo->get<sub_display_manager>();
-	std::lock_guard lock(manager.mutex);
-
-	if (manager.param.version != CELL_SUBDISPLAY_VERSION_0003)
-	{
-		return CELL_SUBDISPLAY_ERROR_NOT_SUPPORTED;
-	}
-
-	if (*pNumTouchInfo > CELL_SUBDISPLAY_TOUCH_MAX_TOUCH_INFO)
-	{
-		*pNumTouchInfo = CELL_SUBDISPLAY_TOUCH_MAX_TOUCH_INFO;
-	}
-
-	std::memcpy(pTouchInfo.get_ptr(), manager.touch_info.data(), *pNumTouchInfo * sizeof(CellSubDisplayTouchInfo));
-
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellSubDisplay.h b/rpcs3/Emu/Cell/Modules/cellSubDisplay.h
index 3319b772ab..feff510f77 100644
--- a/rpcs3/Emu/Cell/Modules/cellSubDisplay.h
+++ b/rpcs3/Emu/Cell/Modules/cellSubDisplay.h
@@ -20,34 +20,25 @@ enum
 	CELL_SUBDISPLAY_STATUS_JOIN                = 1,
 	CELL_SUBDISPLAY_STATUS_LEAVE               = 2,
 	CELL_SUBDISPLAY_STATUS_FATALERROR          = 3,
-
 	CELL_SUBDISPLAY_VERSION_0001               = 1,
 	CELL_SUBDISPLAY_VERSION_0002               = 2,
 	CELL_SUBDISPLAY_VERSION_0003               = 3,
-
 	CELL_SUBDISPLAY_MODE_REMOTEPLAY            = 1,
-
 	CELL_SUBDISPLAY_VIDEO_FORMAT_A8R8G8B8      = 1,
 	CELL_SUBDISPLAY_VIDEO_FORMAT_R8G8B8A8      = 2,
 	CELL_SUBDISPLAY_VIDEO_FORMAT_YUV420        = 3,
-
 	CELL_SUBDISPLAY_VIDEO_ASPECT_RATIO_16_9    = 0,
 	CELL_SUBDISPLAY_VIDEO_ASPECT_RATIO_4_3     = 1,
-
 	CELL_SUBDISPLAY_VIDEO_MODE_SETDATA         = 0,
 	CELL_SUBDISPLAY_VIDEO_MODE_CAPTURE         = 1,
-
 	CELL_SUBDISPLAY_AUDIO_MODE_SETDATA         = 0,
 	CELL_SUBDISPLAY_AUDIO_MODE_CAPTURE         = 1,
-
 	CELL_SUBDISPLAY_0001_MEMORY_CONTAINER_SIZE = 8 * 1024 * 1024,
 	CELL_SUBDISPLAY_0002_MEMORY_CONTAINER_SIZE = 10 * 1024 * 1024,
 	CELL_SUBDISPLAY_0003_MEMORY_CONTAINER_SIZE = 10 * 1024 * 1024,
-
 	CELL_SUBDISPLAY_0003_WIDTH                 = 864,
 	CELL_SUBDISPLAY_0003_PITCH                 = 864,
 	CELL_SUBDISPLAY_0003_HEIGHT                = 480,
-
 	CELL_SUBDISPLAY_NICKNAME_LEN               = 256,
 	CELL_SUBDISPLAY_PSPID_LEN                  = 16,
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellSync.cpp b/rpcs3/Emu/Cell/Modules/cellSync.cpp
index 99adf97c02..5f281e3fed 100644
--- a/rpcs3/Emu/Cell/Modules/cellSync.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSync.cpp
@@ -472,7 +472,7 @@ error_code cellSyncQueuePush(ppu_thread& ppu, vm::ptr<CellSyncQueue> queue, vm::
 
 	u32 position;
 
-	while (!queue->ctrl.atomic_op([&](CellSyncQueue::ctrl_t& ctrl)
+	while (!queue->ctrl.atomic_op([&](auto& ctrl)
 	{
 		return CellSyncQueue::try_push_begin(ctrl, depth, &position);
 	}))
@@ -509,7 +509,7 @@ error_code cellSyncQueueTryPush(vm::ptr<CellSyncQueue> queue, vm::cptr<void> buf
 
 	u32 position;
 
-	while (!queue->ctrl.atomic_op([&](CellSyncQueue::ctrl_t& ctrl)
+	while (!queue->ctrl.atomic_op([&](auto& ctrl)
 	{
 		return CellSyncQueue::try_push_begin(ctrl, depth, &position);
 	}))
@@ -543,7 +543,7 @@ error_code cellSyncQueuePop(ppu_thread& ppu, vm::ptr<CellSyncQueue> queue, vm::p
 
 	u32 position;
 
-	while (!queue->ctrl.atomic_op([&](CellSyncQueue::ctrl_t& ctrl)
+	while (!queue->ctrl.atomic_op([&](auto& ctrl)
 	{
 		return CellSyncQueue::try_pop_begin(ctrl, depth, &position);
 	}))
@@ -580,7 +580,7 @@ error_code cellSyncQueueTryPop(vm::ptr<CellSyncQueue> queue, vm::ptr<void> buffe
 
 	u32 position;
 
-	while (!queue->ctrl.atomic_op([&](CellSyncQueue::ctrl_t& ctrl)
+	while (!queue->ctrl.atomic_op([&](auto& ctrl)
 	{
 		return CellSyncQueue::try_pop_begin(ctrl, depth, &position);
 	}))
@@ -614,7 +614,7 @@ error_code cellSyncQueuePeek(ppu_thread& ppu, vm::ptr<CellSyncQueue> queue, vm::
 
 	u32 position;
 
-	while (!queue->ctrl.atomic_op([&](CellSyncQueue::ctrl_t& ctrl)
+	while (!queue->ctrl.atomic_op([&](auto& ctrl)
 	{
 		return CellSyncQueue::try_peek_begin(ctrl, depth, &position);
 	}))
@@ -651,7 +651,7 @@ error_code cellSyncQueueTryPeek(vm::ptr<CellSyncQueue> queue, vm::ptr<void> buff
 
 	u32 position;
 
-	while (!queue->ctrl.atomic_op([&](CellSyncQueue::ctrl_t& ctrl)
+	while (!queue->ctrl.atomic_op([&](auto& ctrl)
 	{
 		return CellSyncQueue::try_peek_begin(ctrl, depth, &position);
 	}))
diff --git a/rpcs3/Emu/Cell/Modules/cellSync.h b/rpcs3/Emu/Cell/Modules/cellSync.h
index 920d82d64d..b329d958c1 100644
--- a/rpcs3/Emu/Cell/Modules/cellSync.h
+++ b/rpcs3/Emu/Cell/Modules/cellSync.h
@@ -4,8 +4,6 @@
 
 #include "Utilities/BitField.h"
 
-#include "Emu/Cell/ErrorCodes.h"
-
 // Return Codes
 enum CellSyncError : u32
 {
diff --git a/rpcs3/Emu/Cell/Modules/cellSysCache.cpp b/rpcs3/Emu/Cell/Modules/cellSysCache.cpp
index 6f0a309220..28dd3a1911 100644
--- a/rpcs3/Emu/Cell/Modules/cellSysCache.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSysCache.cpp
@@ -31,8 +31,6 @@ void fmt_class_string<CellSysCacheError>::format(std::string& out, u64 arg)
 
 extern lv2_fs_mount_point g_mp_sys_dev_hdd1;
 
-extern std::string get_syscache_state_corruption_indicator_file_path(std::string_view dir_path);
-
 struct syscache_info
 {
 	const std::string cache_root = rpcs3::utils::get_hdd1_dir() + "/caches/";
@@ -41,8 +39,6 @@ struct syscache_info
 
 	std::string cache_id;
 
-	bool retain_caches = false;
-
 	syscache_info() noexcept
 	{
 		// Check if dev_hdd1 is mounted by parent process
@@ -51,15 +47,10 @@ struct syscache_info
 			const auto lock = init.init();
 
 			// Extract cache id from path
-			std::string_view id = Emu.hdd1;
-			id = id.substr(0, id.find_last_not_of(fs::delim) + 1);
-			id = id.substr(id.find_last_of(fs::delim) + 1);
-			cache_id = std::string{id};
-
-			if (!Emu.DeserialManager() && !fs::write_file<true>(get_syscache_state_corruption_indicator_file_path(Emu.hdd1), fs::write_new))
-			{
-				fmt::throw_exception("Failed to create HDD1 corruption indicator file! (path='%s', reason='%s')", Emu.hdd1, fs::g_tls_error);
-			}
+			cache_id = Emu.hdd1;
+			if (cache_id.back() == '/')
+				cache_id.resize(cache_id.size() - 1);
+			cache_id = cache_id.substr(cache_id.find_last_of('/') + 1);
 
 			cellSysutil.success("Retained cache from parent process: %s", Emu.hdd1);
 			return;
@@ -72,26 +63,16 @@ struct syscache_info
 		{
 			if (entry.is_directory && entry.name.starts_with(prefix))
 			{
-				cache_id = vfs::unescape(entry.name);
-
-				if (fs::is_file(get_syscache_state_corruption_indicator_file_path(cache_root + '/' + cache_id)))
-				{
-					// State is not complete
-					clear(true);
-					cache_id.clear();
-					continue;
-				}
-
-				cellSysutil.notice("Retained cache from past data: %s", cache_root + '/' + cache_id);
+				cache_id = std::move(entry.name);
 				break;
 			}
 		}
 	}
 
-	void clear(bool remove_root, bool lock = false) const noexcept
+	void clear(bool remove_root) const noexcept
 	{
 		// Clear cache
-		if (!vfs::host::remove_all(cache_root + cache_id, cache_root, &g_mp_sys_dev_hdd1, remove_root, lock))
+		if (!vfs::host::remove_all(cache_root + cache_id, cache_root, &g_mp_sys_dev_hdd1, remove_root))
 		{
 			cellSysutil.fatal("cellSysCache: failed to clear cache directory '%s%s' (%s)", cache_root, cache_id, fs::g_tls_error);
 		}
@@ -108,50 +89,8 @@ struct syscache_info
 			});
 		}
 	}
-
-	~syscache_info() noexcept
-	{
-		if (cache_id.empty())
-		{
-			return;
-		}
-
-		if (!retain_caches)
-		{
-			vfs::host::remove_all(cache_root + cache_id, cache_root, &g_mp_sys_dev_hdd1, true, false, true);
-			return;
-		}
-
-		idm::select<lv2_fs_object, lv2_file>([](u32 /*id*/, lv2_file& file)
-		{
-			if (file.file && file.mp->flags & lv2_mp_flag::cache && file.flags & CELL_FS_O_ACCMODE)
-			{
-				file.file.sync();
-			}
-		});
-
-		fs::remove_file(get_syscache_state_corruption_indicator_file_path(cache_root + cache_id));
-	}
 };
 
-extern std::string get_syscache_state_corruption_indicator_file_path(std::string_view dir_path)
-{
-	constexpr std::u8string_view append_path = u8"/＄hdd0_temp_state_indicator";
-	const std::string_view filename = reinterpret_cast<const char*>(append_path.data());
-
-	if (dir_path.empty())
-	{
-		return rpcs3::utils::get_hdd1_dir() + "/caches/" + ensure(g_fxo->try_get<syscache_info>())->cache_id + "/" + filename.data();
-	}
-
-	return std::string{dir_path} + filename.data();
-}
-
-extern void signal_system_cache_can_stay()
-{
-	ensure(g_fxo->try_get<syscache_info>())->retain_caches = true;
-}
-
 error_code cellSysCacheClear()
 {
 	cellSysutil.notice("cellSysCacheClear()");
@@ -177,26 +116,17 @@ error_code cellSysCacheClear()
 
 error_code cellSysCacheMount(vm::ptr<CellSysCacheParam> param)
 {
-	cellSysutil.notice("cellSysCacheMount(param=*0x%x ('%s'))", param, param.ptr(&CellSysCacheParam::cacheId));
+	cellSysutil.notice("cellSysCacheMount(param=*0x%x)", param);
 
 	auto& cache = g_fxo->get<syscache_info>();
 
-	if (!param)
-	{
-		return CELL_SYSCACHE_ERROR_PARAM;
-	}
-
-	std::string cache_name;
-
-	ensure(vm::read_string(param.ptr(&CellSysCacheParam::cacheId).addr(), sizeof(param->cacheId), cache_name), "Access violation");
-
-	if (!cache_name.empty() && sysutil_check_name_string(cache_name.data(), 1, CELL_SYSCACHE_ID_SIZE) != 0)
+	if (!param || (param->cacheId[0] && sysutil_check_name_string(param->cacheId, 1, CELL_SYSCACHE_ID_SIZE) != 0))
 	{
 		return CELL_SYSCACHE_ERROR_PARAM;
 	}
 
 	// Full virtualized cache id (with title id included)
-	std::string cache_id = vfs::escape(Emu.GetTitleID() + '_' + cache_name);
+	std::string cache_id = vfs::escape(Emu.GetTitleID() + '_' + param->cacheId);
 
 	// Full path to virtual cache root (/dev_hdd1)
 	std::string new_path = cache.cache_root + cache_id + '/';
@@ -209,53 +139,28 @@ error_code cellSysCacheMount(vm::ptr<CellSysCacheParam> param)
 	{
 	});
 
-	std::lock_guard lock0(g_mp_sys_dev_hdd1.mutex);
-
-	// Check if can reuse existing cache (won't if cache id is an empty string or cache is damaged/incomplete)
-	if (!cache_name.empty() && cache_id == cache.cache_id)
+	// Check if can reuse existing cache (won't if cache id is an empty string)
+	if (param->cacheId[0] && cache_id == cache.cache_id)
 	{
 		// Isn't mounted yet on first call to cellSysCacheMount
-		if (vfs::mount("/dev_hdd1", new_path))
-			g_fxo->get<lv2_fs_mount_info_map>().add("/dev_hdd1", &g_mp_sys_dev_hdd1);
+		vfs::mount("/dev_hdd1", new_path);
 
 		cellSysutil.success("Mounted existing cache at %s", new_path);
 		return not_an_error(CELL_SYSCACHE_RET_OK_RELAYED);
 	}
 
-	const bool can_create = cache.cache_id != cache_id || !cache.cache_id.empty();
+	std::lock_guard lock0(g_mp_sys_dev_hdd1.mutex);
 
+	// Clear existing cache
 	if (!cache.cache_id.empty())
 	{
-		// Clear previous cache
 		cache.clear(true);
 	}
 
 	// Set new cache id
 	cache.cache_id = std::move(cache_id);
-
-	if (can_create)
-	{
-		const bool created = fs::create_dir(new_path);
-
-		if (!created)
-		{
-			if (fs::g_tls_error != fs::error::exist)
-			{
-				fmt::throw_exception("Failed to create HDD1 cache! (path='%s', reason='%s')", new_path, fs::g_tls_error);
-			}
-
-			// Clear new cache
-			cache.clear(false);
-		}
-	}
-
-	if (!fs::write_file<true>(get_syscache_state_corruption_indicator_file_path(new_path), fs::write_new))
-	{
-		fmt::throw_exception("Failed to create HDD1 corruption indicator file! (path='%s', reason='%s')", new_path, fs::g_tls_error);
-	}
-
-	if (vfs::mount("/dev_hdd1", new_path))
-		g_fxo->get<lv2_fs_mount_info_map>().add("/dev_hdd1", &g_mp_sys_dev_hdd1);
+	fs::create_dir(new_path);
+	vfs::mount("/dev_hdd1", new_path);
 
 	return not_an_error(CELL_SYSCACHE_RET_OK_CLEARED);
 }
diff --git a/rpcs3/Emu/Cell/Modules/cellSysconf.cpp b/rpcs3/Emu/Cell/Modules/cellSysconf.cpp
index c36027a2ac..a8ecce04a7 100644
--- a/rpcs3/Emu/Cell/Modules/cellSysconf.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSysconf.cpp
@@ -42,12 +42,6 @@ error_code cellSysconfOpen(u32 type, vm::ptr<CellSysconfCallback> func, vm::ptr<
 error_code cellSysconfBtGetDeviceList(vm::ptr<CellSysconfBtDeviceList> deviceList)
 {
 	cellSysconf.todo("cellSysconfBtGetDeviceList(deviceList=*0x%x)", deviceList);
-
-	if (!deviceList)
-	{
-		return CELL_SYSCONF_ERROR_PARAM;
-	}
-
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellSysutil.cpp b/rpcs3/Emu/Cell/Modules/cellSysutil.cpp
index a7d15af2d5..5a9054ea5a 100644
--- a/rpcs3/Emu/Cell/Modules/cellSysutil.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSysutil.cpp
@@ -4,9 +4,7 @@
 #include "Emu/IdManager.h"
 #include "Emu/VFS.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/Modules/cellGame.h"
 
-#include "Emu/Cell/lv2/sys_game.h"
 #include "Emu/Cell/lv2/sys_process.h"
 #include "cellSysutil.h"
 
@@ -14,7 +12,6 @@
 #include "Utilities/lockless.h"
 
 #include <span>
-#include <deque>
 
 LOG_CHANNEL(cellSysutil);
 
@@ -39,216 +36,43 @@ void fmt_class_string<CellSysutilError>::format(std::string& out, u64 arg)
 	});
 }
 
-template<>
-void fmt_class_string<CellBgmplaybackError>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto error)
-	{
-		switch (error)
-		{
-			STR_CASE(CELL_SYSUTIL_BGMPLAYBACK_ERROR_PARAM);
-			STR_CASE(CELL_SYSUTIL_BGMPLAYBACK_ERROR_BUSY);
-			STR_CASE(CELL_SYSUTIL_BGMPLAYBACK_ERROR_GENERIC);
-			STR_CASE(CELL_SYSUTIL_BGMPLAYBACK_EX_ERROR_PARAM);
-			STR_CASE(CELL_SYSUTIL_BGMPLAYBACK_EX_ERROR_ALREADY_SETPARAM);
-			STR_CASE(CELL_SYSUTIL_BGMPLAYBACK_EX_ERROR_DISABLE_SETPARAM);
-			STR_CASE(CELL_SYSUTIL_BGMPLAYBACK_EX_ERROR_GENERIC);
-		}
-
-		return unknown;
-	});
-}
-
-atomic_t<usz> g_sysutil_callback_id_assigner = 0;
-
 struct sysutil_cb_manager
 {
-	struct alignas(8) registered_dispatcher
-	{
-		u32 event_code = 0;
-		u32 func_addr = 0;
-	};
-
-	std::array<atomic_t<registered_dispatcher>, 32> dispatchers{};
-
 	struct alignas(8) registered_cb
 	{
-		ENABLE_BITWISE_SERIALIZATION;
-
-		vm::ptr<CellSysutilCallback> callback;
-		vm::ptr<void> user_data;
+		vm::ptr<CellSysutilCallback> first;
+		vm::ptr<void> second;
 	};
 
 	atomic_t<registered_cb> callbacks[4]{};
 
-	struct dispatcher_cb
-	{
-		std::function<s32(ppu_thread&)> func;
-		std::shared_ptr<atomic_t<bool>> call_active;
-	};
-
-	std::deque<lf_queue<std::shared_ptr<atomic_t<bool>>>> registered_callbacks_abort_handles = []()
-	{
-		// Do resize for deque (cheap container which can store all non-movable value types)
-		std::deque<lf_queue<std::shared_ptr<atomic_t<bool>>>> result;
-
-		for (usz i = 0 ; i < g_sysutil_callback_id_assigner; i++)
-		{
-			result.emplace_back();
-		}
-
-		return result;
-	}();
-
-	lf_queue<dispatcher_cb> registered;
-
-	atomic_t<bool> draw_cb_started{};
-	atomic_t<u64> read_counter{0};
-
-	SAVESTATE_INIT_POS(13);
-
-	sysutil_cb_manager() = default;
-
-	sysutil_cb_manager(utils::serial& ar)
-	{
-		ar(callbacks);
-	}
-
-	void save(utils::serial& ar)
-	{
-		ensure(!registered);
-		ar(callbacks);
-	}
+	lf_queue<std::function<s32(ppu_thread&)>> registered;
 };
 
-void sysutil_register_cb_with_id_internal(std::function<s32(ppu_thread&)>&& cb, usz call_id)
-{
-	auto& cbm = *ensure(g_fxo->try_get<sysutil_cb_manager>());
-
-	sysutil_cb_manager::dispatcher_cb info{std::move(cb)};
-
-	if (call_id != umax)
-	{
-		info.call_active = std::make_shared<atomic_t<bool>>(true);
-		::at32(cbm.registered_callbacks_abort_handles, call_id).push(info.call_active);
-	}
-
-	cbm.registered.push(std::move(info));
-}
-
-extern void sysutil_unregister_cb_with_id_internal(usz call_id)
-{
-	const auto cbm = g_fxo->try_get<sysutil_cb_manager>();
-
-	if (!cbm)
-	{
-		return;
-	}
-
-	for (auto&& abort_handle : ::at32(cbm->registered_callbacks_abort_handles, call_id).pop_all())
-	{
-		// Deactivate the existing event once
-		abort_handle->store(false);
-	}
-}
-
 extern void sysutil_register_cb(std::function<s32(ppu_thread&)>&& cb)
 {
-	sysutil_register_cb_with_id_internal(std::move(cb), umax);
+	auto& cbm = g_fxo->get<sysutil_cb_manager>();
+
+	cbm.registered.push(std::move(cb));
 }
 
-extern s32 sysutil_send_system_cmd(u64 status, u64 param)
+extern void sysutil_send_system_cmd(u64 status, u64 param)
 {
-	s32 count = 0;
-
 	if (auto cbm = g_fxo->try_get<sysutil_cb_manager>())
 	{
-		if (status == CELL_SYSUTIL_DRAWING_BEGIN)
-		{
-			if (cbm->draw_cb_started.exchange(true))
-			{
-				cellSysutil.error("Tried to enqueue a second or more DRAWING_BEGIN callback!");
-				return CELL_SYSUTIL_ERROR_BUSY;
-			}
-		}
-		else if (status == CELL_SYSUTIL_DRAWING_END)
-		{
-			if (!cbm->draw_cb_started.exchange(false))
-			{
-				cellSysutil.error("Tried to enqueue a DRAWING_END callback without a BEGIN callback!");
-				return -1;
-			}
-		}
-		else if (status == CELL_SYSUTIL_REQUEST_EXITGAME)
-		{
-			abort_lv2_watchdog();
-		}
-
 		for (sysutil_cb_manager::registered_cb cb : cbm->callbacks)
 		{
-			if (cb.callback)
+			if (cb.first)
 			{
-				cbm->registered.push(sysutil_cb_manager::dispatcher_cb{[=](ppu_thread& ppu) -> s32
+				cbm->registered.push([=](ppu_thread& ppu) -> s32
 				{
 					// TODO: check it and find the source of the return value (void isn't equal to CELL_OK)
-					cb.callback(ppu, status, param, cb.user_data);
+					cb.first(ppu, status, param, cb.second);
 					return CELL_OK;
-				}});
-
-				count++;
+				});
 			}
 		}
 	}
-
-	return count;
-}
-
-extern u64 get_sysutil_cb_manager_read_count()
-{
-	if (auto cbm = g_fxo->try_get<sysutil_cb_manager>())
-	{
-		return cbm->read_counter;
-	}
-
-	return 0;
-}
-
-extern bool send_open_home_menu_cmds()
-{
-	auto status = g_fxo->try_get<SysutilMenuOpenStatus>();
-
-	if (!status || status->active)
-	{
-		return false;
-	}
-
-	// TODO: handle CELL_SYSUTIL_BGMPLAYBACK_STATUS_DISABLE
-	if (sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_BEGIN, 0) < 0 ||
-		sysutil_send_system_cmd(CELL_SYSUTIL_SYSTEM_MENU_OPEN, 0) < 0 ||
-		sysutil_send_system_cmd(CELL_SYSUTIL_BGMPLAYBACK_PLAY, 0) < 0)
-	{
-		return false;
-	}
-
-	status->active = true;
-	return true;
-}
-
-extern void send_close_home_menu_cmds()
-{
-	auto status = g_fxo->try_get<SysutilMenuOpenStatus>();
-
-	if (!status || !status->active)
-	{
-		return;
-	}
-
-	// TODO: handle CELL_SYSUTIL_BGMPLAYBACK_STATUS_DISABLE
-	sysutil_send_system_cmd(CELL_SYSUTIL_BGMPLAYBACK_STOP, 0);
-	sysutil_send_system_cmd(CELL_SYSUTIL_SYSTEM_MENU_CLOSE, 0);
-	sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_END, 0);
-
-	status->active = false;
 }
 
 template <>
@@ -521,7 +345,6 @@ error_code cellSysutilGetSystemParamString(CellSysutilParamId id, vm::ptr<char>
 	case CELL_SYSUTIL_SYSTEMPARAM_ID_NICKNAME:
 	{
 		copy_size = CELL_SYSUTIL_SYSTEMPARAM_NICKNAME_SIZE;
-		param_str = g_cfg.sys.system_name.to_string();
 		break;
 	}
 
@@ -582,18 +405,7 @@ error_code cellSysutilCheckCallback(ppu_thread& ppu)
 
 	for (auto&& func : cbm.registered.pop_all())
 	{
-		if (func.call_active && !*func.call_active)
-		{
-			continue;
-		}
-
-		// Increase read counter before we call the callback.
-		// We use this counter to check if the game reacts to a command during game termination and calls sys_process_exit.
-		// We would not realize that the game reacted in time and terminate it prematurely if we increased
-		// the counter after we called the callback and the callback did some time-consuming work.
-		cbm.read_counter++;
-
-		if (s32 res = func.func(ppu))
+		if (s32 res = func(ppu))
 		{
 			// Currently impossible
 			return not_an_error(res);
@@ -608,7 +420,7 @@ error_code cellSysutilCheckCallback(ppu_thread& ppu)
 	return CELL_OK;
 }
 
-error_code cellSysutilRegisterCallback(u32 slot, vm::ptr<CellSysutilCallback> func, vm::ptr<void> userdata)
+error_code cellSysutilRegisterCallback(s32 slot, vm::ptr<CellSysutilCallback> func, vm::ptr<void> userdata)
 {
 	cellSysutil.warning("cellSysutilRegisterCallback(slot=%d, func=*0x%x, userdata=*0x%x)", slot, func, userdata);
 
@@ -640,26 +452,14 @@ error_code cellSysutilUnregisterCallback(u32 slot)
 	return CELL_OK;
 }
 
-struct bgm_manager
-{
-	shared_mutex mtx;
-	CellSysutilBgmPlaybackExtraParam param{};
-	CellSysutilBgmPlaybackStatus status{};
-
-	bgm_manager()
-	{
-		status.enableState = CELL_SYSUTIL_BGMPLAYBACK_STATUS_DISABLE;
-		status.playerState = CELL_SYSUTIL_BGMPLAYBACK_STATUS_STOP;
-	}
-};
+bool g_bgm_playback_enabled = true;
 
 error_code cellSysutilEnableBgmPlayback()
 {
 	cellSysutil.warning("cellSysutilEnableBgmPlayback()");
 
-	auto& bgm = g_fxo->get<bgm_manager>();
-	std::lock_guard lock(bgm.mtx);
-	bgm.status.enableState = CELL_SYSUTIL_BGMPLAYBACK_STATUS_ENABLE;
+	// TODO
+	g_bgm_playback_enabled = true;
 
 	return CELL_OK;
 }
@@ -668,22 +468,8 @@ error_code cellSysutilEnableBgmPlaybackEx(vm::ptr<CellSysutilBgmPlaybackExtraPar
 {
 	cellSysutil.warning("cellSysutilEnableBgmPlaybackEx(param=*0x%x)", param);
 
-	if (!param ||
-		param->systemBgmFadeInTime < CELL_SYSUTIL_BGMPLAYBACK_FADE_INVALID || param->systemBgmFadeInTime > 60000 ||
-		param->systemBgmFadeOutTime < CELL_SYSUTIL_BGMPLAYBACK_FADE_INVALID || param->systemBgmFadeOutTime > 60000 ||
-		param->gameBgmFadeInTime < CELL_SYSUTIL_BGMPLAYBACK_FADE_INVALID || param->gameBgmFadeInTime > 60000 ||
-		param->gameBgmFadeOutTime < CELL_SYSUTIL_BGMPLAYBACK_FADE_INVALID || param->gameBgmFadeOutTime > 60000)
-	{
-		return CELL_SYSUTIL_BGMPLAYBACK_EX_ERROR_PARAM;
-	}
-
-	auto& bgm = g_fxo->get<bgm_manager>();
-	std::lock_guard lock(bgm.mtx);
-	bgm.param.systemBgmFadeInTime = param->systemBgmFadeInTime;
-	bgm.param.systemBgmFadeOutTime = param->systemBgmFadeOutTime;
-	bgm.param.gameBgmFadeInTime = param->gameBgmFadeInTime;
-	bgm.param.gameBgmFadeOutTime = param->gameBgmFadeOutTime;
-	bgm.status.enableState = CELL_SYSUTIL_BGMPLAYBACK_STATUS_ENABLE;
+	// TODO
+	g_bgm_playback_enabled = true;
 
 	return CELL_OK;
 }
@@ -692,11 +478,8 @@ error_code cellSysutilDisableBgmPlayback()
 {
 	cellSysutil.warning("cellSysutilDisableBgmPlayback()");
 
-	auto& bgm = g_fxo->get<bgm_manager>();
-	std::lock_guard lock(bgm.mtx);
-	bgm.status.enableState = CELL_SYSUTIL_BGMPLAYBACK_STATUS_DISABLE;
-
-	// TODO: fade from system bgm to game bgm if necessary
+	// TODO
+	g_bgm_playback_enabled = false;
 
 	return CELL_OK;
 }
@@ -705,24 +488,8 @@ error_code cellSysutilDisableBgmPlaybackEx(vm::ptr<CellSysutilBgmPlaybackExtraPa
 {
 	cellSysutil.warning("cellSysutilDisableBgmPlaybackEx(param=*0x%x)", param);
 
-	if (!param ||
-		param->systemBgmFadeInTime < CELL_SYSUTIL_BGMPLAYBACK_FADE_INVALID || param->systemBgmFadeInTime > 60000 ||
-		param->systemBgmFadeOutTime < CELL_SYSUTIL_BGMPLAYBACK_FADE_INVALID || param->systemBgmFadeOutTime > 60000 ||
-		param->gameBgmFadeInTime < CELL_SYSUTIL_BGMPLAYBACK_FADE_INVALID || param->gameBgmFadeInTime > 60000 ||
-		param->gameBgmFadeOutTime < CELL_SYSUTIL_BGMPLAYBACK_FADE_INVALID || param->gameBgmFadeOutTime > 60000)
-	{
-		return CELL_SYSUTIL_BGMPLAYBACK_EX_ERROR_PARAM;
-	}
-
-	auto& bgm = g_fxo->get<bgm_manager>();
-	std::lock_guard lock(bgm.mtx);
-	bgm.param.systemBgmFadeInTime = param->systemBgmFadeInTime;
-	bgm.param.systemBgmFadeOutTime = param->systemBgmFadeOutTime;
-	bgm.param.gameBgmFadeInTime = param->gameBgmFadeInTime;
-	bgm.param.gameBgmFadeOutTime = param->gameBgmFadeOutTime;
-	bgm.status.enableState = CELL_SYSUTIL_BGMPLAYBACK_STATUS_DISABLE;
-
-	// TODO: fade from system bgm to game bgm if necessary
+	// TODO
+	g_bgm_playback_enabled = false;
 
 	return CELL_OK;
 }
@@ -731,14 +498,12 @@ error_code cellSysutilGetBgmPlaybackStatus(vm::ptr<CellSysutilBgmPlaybackStatus>
 {
 	cellSysutil.trace("cellSysutilGetBgmPlaybackStatus(status=*0x%x)", status);
 
-	if (!status)
-	{
-		return CELL_SYSUTIL_BGMPLAYBACK_ERROR_PARAM;
-	}
-
-	auto& bgm = g_fxo->get<bgm_manager>();
-	std::lock_guard lock(bgm.mtx);
-	*status = bgm.status;
+	// TODO
+	status->playerState = CELL_SYSUTIL_BGMPLAYBACK_STATUS_STOP;
+	status->enableState = g_bgm_playback_enabled ? CELL_SYSUTIL_BGMPLAYBACK_STATUS_ENABLE : CELL_SYSUTIL_BGMPLAYBACK_STATUS_DISABLE;
+	status->currentFadeRatio = 0; // current volume ratio (0%)
+	memset(status->contentId, 0, sizeof(status->contentId));
+	memset(status->reserved, 0, sizeof(status->reserved));
 
 	return CELL_OK;
 }
@@ -747,94 +512,29 @@ error_code cellSysutilGetBgmPlaybackStatus2(vm::ptr<CellSysutilBgmPlaybackStatus
 {
 	cellSysutil.trace("cellSysutilGetBgmPlaybackStatus2(status2=*0x%x)", status2);
 
-	if (!status2)
-	{
-		return CELL_SYSUTIL_BGMPLAYBACK_EX_ERROR_PARAM;
-	}
-
-	auto& bgm = g_fxo->get<bgm_manager>();
-	std::lock_guard lock(bgm.mtx);
-	status2->playerState = bgm.status.playerState;
+	// TODO
+	status2->playerState = CELL_SYSUTIL_BGMPLAYBACK_STATUS_STOP;
 	memset(status2->reserved, 0, sizeof(status2->reserved));
 
 	return CELL_OK;
 }
 
-error_code cellSysutilSetBgmPlaybackExtraParam(vm::ptr<CellSysutilBgmPlaybackExtraParam> param)
+error_code cellSysutilSetBgmPlaybackExtraParam()
 {
-	cellSysutil.warning("cellSysutilSetBgmPlaybackExtraParam(param=*0x%x)", param);
-
-	if (!param ||
-		param->systemBgmFadeInTime < CELL_SYSUTIL_BGMPLAYBACK_FADE_INVALID || param->systemBgmFadeInTime > 60000 ||
-		param->systemBgmFadeOutTime < CELL_SYSUTIL_BGMPLAYBACK_FADE_INVALID || param->systemBgmFadeOutTime > 60000 ||
-		param->gameBgmFadeInTime < CELL_SYSUTIL_BGMPLAYBACK_FADE_INVALID || param->gameBgmFadeInTime > 60000 ||
-		param->gameBgmFadeOutTime < CELL_SYSUTIL_BGMPLAYBACK_FADE_INVALID || param->gameBgmFadeOutTime > 60000)
-	{
-		return CELL_SYSUTIL_BGMPLAYBACK_EX_ERROR_PARAM;
-	}
-
-	auto& bgm = g_fxo->get<bgm_manager>();
-	std::lock_guard lock(bgm.mtx);
-	bgm.param.systemBgmFadeInTime = param->systemBgmFadeInTime;
-	bgm.param.systemBgmFadeOutTime = param->systemBgmFadeOutTime;
-	bgm.param.gameBgmFadeInTime = param->gameBgmFadeInTime;
-	bgm.param.gameBgmFadeOutTime = param->gameBgmFadeOutTime;
-
-	// TODO: apparently you are only able to set this only once and while bgm is enabled
-
+	cellSysutil.todo("cellSysutilSetBgmPlaybackExtraParam()");
 	return CELL_OK;
 }
 
-error_code cellSysutilRegisterCallbackDispatcher(u32 event_code, u32 func_addr)
+error_code cellSysutilRegisterCallbackDispatcher()
 {
-	cellSysutil.warning("cellSysutilRegisterCallbackDispatcher(event_code=0x%x, func_addr=0x%x)", event_code, func_addr);
-
-	auto& cbm = g_fxo->get<sysutil_cb_manager>();
-
-	for (u32 i = 0; i < cbm.dispatchers.size(); i++)
-	{
-		if (cbm.dispatchers[i].atomic_op([&](sysutil_cb_manager::registered_dispatcher& dispatcher)
-		{
-			if (dispatcher.event_code == 0)
-			{
-				dispatcher.event_code = event_code;
-				dispatcher.func_addr = func_addr;
-				return true;
-			}
-			return false;
-		}))
-		{
-			return CELL_OK;
-		}
-	}
-
-	return 0x8002b004;
+	cellSysutil.todo("cellSysutilRegisterCallbackDispatcher()");
+	return CELL_OK;
 }
 
-error_code cellSysutilUnregisterCallbackDispatcher(u32 event_code)
+error_code cellSysutilUnregisterCallbackDispatcher()
 {
-	cellSysutil.warning("cellSysutilUnregisterCallbackDispatcher(event_code=0x%x)", event_code);
-
-	auto& cbm = g_fxo->get<sysutil_cb_manager>();
-
-	for (u32 i = 0; i < cbm.dispatchers.size(); i++)
-	{
-		if (cbm.dispatchers[i].atomic_op([&](sysutil_cb_manager::registered_dispatcher& dispatcher)
-		{
-			if (dispatcher.event_code == event_code)
-			{
-				dispatcher.event_code = 0;
-				dispatcher.func_addr = 0;
-				return true;
-			}
-			return false;
-		}))
-		{
-			return CELL_OK;
-		}
-	}
-
-	return 0x8002b005;
+	cellSysutil.todo("cellSysutilUnregisterCallbackDispatcher()");
+	return CELL_OK;
 }
 
 error_code cellSysutilPacketRead()
@@ -867,34 +567,28 @@ error_code cellSysutilGameDataAssignVmc()
 	return CELL_OK;
 }
 
-error_code cellSysutilGameDataExit(u32 unk)
+error_code cellSysutilGameDataExit()
 {
-	cellSysutil.todo("cellSysutilGameDataExit(unk=%d)", unk);
-
-	if (unk > 4)
-	{
-		return CELL_GAMEDATA_ERROR_PARAM;
-	}
-
+	cellSysutil.todo("cellSysutilGameDataExit()");
 	return CELL_OK;
 }
 
 error_code cellSysutilGameExit_I()
 {
-	cellSysutil.warning("cellSysutilGameExit_I()");
-	return cellSysutilGameDataExit(0);
+	cellSysutil.todo("cellSysutilGameExit_I()");
+	return CELL_OK;
 }
 
 error_code cellSysutilGamePowerOff_I()
 {
-	cellSysutil.warning("cellSysutilGamePowerOff_I()");
-	return cellSysutilGameDataExit(1);
+	cellSysutil.todo("cellSysutilGamePowerOff_I()");
+	return CELL_OK;
 }
 
 error_code cellSysutilGameReboot_I()
 {
-	cellSysutil.warning("cellSysutilGameReboot_I()");
-	return cellSysutilGameDataExit(4);
+	cellSysutil.todo("cellSysutilGameReboot_I()");
+	return CELL_OK;
 }
 
 error_code cellSysutilSharedMemoryAlloc()
diff --git a/rpcs3/Emu/Cell/Modules/cellSysutil.h b/rpcs3/Emu/Cell/Modules/cellSysutil.h
index 6ab8fadb5d..0df8ec876f 100644
--- a/rpcs3/Emu/Cell/Modules/cellSysutil.h
+++ b/rpcs3/Emu/Cell/Modules/cellSysutil.h
@@ -257,18 +257,6 @@ enum CellSysCacheError : u32
 	CELL_SYSCACHE_ERROR_NOTMOUNTED    = 0x8002bc04, // We don't really need to simulate the mounting, so this is probably useless
 };
 
-enum CellBgmplaybackError : u32
-{
-	CELL_SYSUTIL_BGMPLAYBACK_ERROR_PARAM               = 0x8002b101,
-	CELL_SYSUTIL_BGMPLAYBACK_ERROR_BUSY                = 0x8002b102,
-	CELL_SYSUTIL_BGMPLAYBACK_ERROR_GENERIC             = 0x8002b1FF,
-
-	CELL_SYSUTIL_BGMPLAYBACK_EX_ERROR_PARAM            = 0x8002d301,
-	CELL_SYSUTIL_BGMPLAYBACK_EX_ERROR_ALREADY_SETPARAM = 0x8002d302,
-	CELL_SYSUTIL_BGMPLAYBACK_EX_ERROR_DISABLE_SETPARAM = 0x8002d303,
-	CELL_SYSUTIL_BGMPLAYBACK_EX_ERROR_GENERIC          = 0x8002d3FF,
-};
-
 enum CellSysutilBgmPlaybackStatusState
 {
 	CELL_SYSUTIL_BGMPLAYBACK_STATUS_PLAY = 0,
@@ -281,17 +269,12 @@ enum CellSysutilBgmPlaybackStatusEnabled
 	CELL_SYSUTIL_BGMPLAYBACK_STATUS_DISABLE = 1
 };
 
-enum
-{
-	CELL_SYSUTIL_BGMPLAYBACK_FADE_INVALID = -1
-};
-
 struct CellSysutilBgmPlaybackStatus
 {
 	u8 playerState;
 	u8 enableState;
-	char contentId[16]; // CellSearchContentId
-	u8 currentFadeRatio; // current volume ratio (0=0%, 255=100%)
+	char contentId[16];
+	u8 currentFadeRatio;
 	char reserved[13];
 };
 
@@ -317,34 +300,6 @@ struct CellSysCacheParam
 	vm::bptr<void> reserved;
 };
 
-template <u32 BaseEvent>
-struct SysutilEventStatus
-{
-	atomic_t<bool> active = false;
-};
-
-extern atomic_t<usz> g_sysutil_callback_id_assigner;
-
-extern void sysutil_register_cb_with_id_internal(std::function<s32(ppu_thread&)>&& cb, usz call_id);
-extern void sysutil_unregister_cb_with_id_internal(usz call_id);
-
-template <typename T>
-const usz g_sysutil_dispatcher_id = g_sysutil_callback_id_assigner++;
-
-template <typename T>
-void sysutil_register_cb_with_id(std::function<s32(ppu_thread&)>&& cb)
-{
-	sysutil_register_cb_with_id_internal(std::move(cb), g_sysutil_dispatcher_id<T>);
-}
-
-template <typename T>
-void sysutil_unregister_cb_with_id()
-{
-	sysutil_unregister_cb_with_id_internal(g_sysutil_dispatcher_id<T>);
-}
-
-using SysutilMenuOpenStatus = SysutilEventStatus<CELL_SYSUTIL_SYSTEM_MENU_OPEN>;
-
 extern void sysutil_register_cb(std::function<s32(ppu_thread&)>&&);
-extern s32 sysutil_send_system_cmd(u64 status, u64 param);
+extern void sysutil_send_system_cmd(u64 status, u64 param);
 s32 sysutil_check_name_string(const char* src, s32 minlen, s32 maxlen);
diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp b/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp
index c336f0804e..13a57057ce 100644
--- a/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp
@@ -1,221 +1,65 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/Modules/cellSysutilAvc.h"
-#include "Emu/Cell/Modules/cellSysutil.h"
-#include "Emu/IdManager.h"
 
 LOG_CHANNEL(cellSysutil);
 
-template<>
-void fmt_class_string<CellAvcError>::format(std::string& out, u64 arg)
+error_code cellSysutilAvcByeRequest()
 {
-	format_enum(out, arg, [](auto error)
-	{
-		switch (error)
-		{
-			STR_CASE(CELL_AVC_ERROR_UNKNOWN);
-			STR_CASE(CELL_AVC_ERROR_NOT_SUPPORTED);
-			STR_CASE(CELL_AVC_ERROR_NOT_INITIALIZED);
-			STR_CASE(CELL_AVC_ERROR_ALREADY_INITIALIZED);
-			STR_CASE(CELL_AVC_ERROR_INVALID_ARGUMENT);
-			STR_CASE(CELL_AVC_ERROR_OUT_OF_MEMORY);
-			STR_CASE(CELL_AVC_ERROR_BAD_ID);
-			STR_CASE(CELL_AVC_ERROR_INVALID_STATUS);
-			STR_CASE(CELL_AVC_ERROR_TIMEOUT);
-			STR_CASE(CELL_AVC_ERROR_NO_SESSION);
-			STR_CASE(CELL_AVC_ERROR_INCOMPATIBLE_PROTOCOL);
-			STR_CASE(CELL_AVC_ERROR_PEER_UNREACHABLE);
-		}
-
-		return unknown;
-	});
-}
-
-// Callback handle tag type
-struct avc_cb_handle_t{};
-
-struct avc_settings
-{
-	avc_settings() = default;
-
-	avc_settings(const avc_settings&) = delete;
-	avc_settings& operator=(const avc_settings&) = delete;
-
-	SAVESTATE_INIT_POS(53);
-
-	shared_mutex mutex_cb;
-	vm::ptr<CellSysutilAvcCallback> avc_cb{};
-	vm::ptr<void> avc_cb_arg{};
-
-	atomic_t<u32> req_id_cnt = 0;
-
-	static bool saveable(bool /*is_writing*/) noexcept
-	{
-		return GET_SERIALIZATION_VERSION(cellSysutil) != 0;
-	}
-
-	avc_settings(utils::serial& ar) noexcept
-	{
-		[[maybe_unused]] const s32 version = GET_SERIALIZATION_VERSION(cellSysutil);
-
-		if (version == 0)
-		{
-			return;
-		}
-
-		save(ar);
-	}
-
-	void save(utils::serial& ar)
-	{
-		[[maybe_unused]] const s32 version = GET_OR_USE_SERIALIZATION_VERSION(ar.is_writing(), cellSysutil);
-		ar(avc_cb, avc_cb_arg);
-	}
-
-	void register_cb_call(CellSysutilAvcRequestId req_id, CellSysutilAvcEvent event_id, CellSysUtilAvcEventParam param)
-	{
-		// This is equivalent to the dispatcher code
-		sysutil_register_cb_with_id<avc_cb_handle_t>([=, this](ppu_thread& cb_ppu) -> s32
-			{
-				vm::ptr<CellSysutilAvcCallback> avc_cb{};
-				vm::ptr<void> avc_cb_arg{};
-
-				{
-					std::lock_guard lock(this->mutex_cb);
-					avc_cb = this->avc_cb;
-					avc_cb_arg = this->avc_cb_arg;
-				}
-
-				if (avc_cb)
-				{
-					// TODO: lots of checks before calling the cb
-					if (event_id == CELL_AVC_EVENT_UNLOAD_SUCCEEDED)
-					{
-						std::lock_guard lock(this->mutex_cb);
-						this->avc_cb = {};
-						this->avc_cb_arg = {};
-					}
-
-					avc_cb(cb_ppu, req_id, event_id, param, avc_cb_arg);
-				}
-
-				return 0;
-			});
-	}
-};
-
-error_code cellSysutilAvcByeRequest(vm::ptr<CellSysutilAvcRequestId> request_id)
-{
-	cellSysutil.todo("cellSysutilAvcByeRequest(request_id=*0x%x)", request_id);
-
-	if (!request_id)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
-	auto& settings = g_fxo->get<avc_settings>();
-	const CellSysutilAvcRequestId req_id = settings.req_id_cnt.fetch_add(1);
-	*request_id = req_id;
-	settings.register_cb_call(req_id, CELL_AVC_EVENT_BYE_SUCCEEDED, static_cast<CellSysUtilAvcEventParam>(0));
-
+	cellSysutil.todo("cellSysutilAvcByeRequest()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcCancelByeRequest(vm::ptr<CellSysutilAvcRequestId> request_id)
+error_code cellSysutilAvcCancelByeRequest()
 {
-	cellSysutil.todo("cellSysutilAvcCancelByeRequest(request_id=*0x%x)", request_id);
-
-	if (!request_id)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	cellSysutil.todo("cellSysutilAvcCancelByeRequest()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcCancelJoinRequest(vm::ptr<CellSysutilAvcRequestId> request_id)
+error_code cellSysutilAvcCancelJoinRequest()
 {
-	cellSysutil.todo("cellSysutilAvcCancelJoinRequest(request_id=*0x%x)", request_id);
-
-	if (!request_id)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	cellSysutil.todo("cellSysutilAvcCancelJoinRequest()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcEnumPlayers(vm::ptr<SceNpId> players_id, vm::ptr<s32> players_num)
+error_code cellSysutilAvcEnumPlayers()
 {
-	cellSysutil.todo("cellSysutilAvcEnumPlayers(players_id=*0x%x, players_num=*0x%x)", players_id, players_num);
-
-	if (!players_num)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
-	if (players_id)
-	{
-		// Fill players_id with players_num participants
-	}
-	else
-	{
-		// Return number of participants
-		*players_num = 0;
-	}
-
+	cellSysutil.todo("cellSysutilAvcEnumPlayers()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcGetAttribute(CellSysUtilAvcAttribute attr_id, vm::pptr<void> param)
+error_code cellSysutilAvcGetAttribute()
 {
-	cellSysutil.todo("cellSysutilAvcGetAttribute(attr_id=0x%x, param=*0x%x)", +attr_id, param);
-
-	if (!param)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	cellSysutil.todo("cellSysutilAvcGetAttribute()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcGetLayoutMode(vm::ptr<CellSysutilAvcLayoutMode> layout)
+error_code cellSysutilAvcGetLayoutMode()
 {
-	cellSysutil.todo("cellSysutilAvcGetLayoutMode(layout=*0x%x)", layout);
-
-	if (!layout)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	cellSysutil.todo("cellSysutilAvcGetLayoutMode()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcGetShowStatus(vm::ptr<b8> is_visible)
+error_code cellSysutilAvcGetShowStatus()
 {
-	cellSysutil.todo("cellSysutilAvcGetShowStatus(is_visible=*0x%x)", is_visible);
-
-	if (!is_visible)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	cellSysutil.todo("cellSysutilAvcGetShowStatus()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcGetSpeakerVolumeLevel(vm::ptr<s32> volumeLevel)
+error_code cellSysutilAvcGetSpeakerVolumeLevel()
 {
-	cellSysutil.todo("cellSysutilAvcGetSpeakerVolumeLevel(volumeLevel=*0x%x)", volumeLevel);
-
-	if (!volumeLevel)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	cellSysutil.todo("cellSysutilAvcGetSpeakerVolumeLevel()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcGetVideoMuting(vm::ptr<b8> is_muting)
+error_code cellSysutilAvcGetVideoMuting()
 {
-	cellSysutil.todo("cellSysutilAvcGetVideoMuting(is_muting=*0x%x)", is_muting);
-
-	if (!is_muting)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	cellSysutil.todo("cellSysutilAvcGetVideoMuting()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcGetVoiceMuting(vm::ptr<b8> is_muting)
+error_code cellSysutilAvcGetVoiceMuting()
 {
-	cellSysutil.todo("cellSysutilAvcGetVoiceMuting(is_muting=*0x%x)", is_muting);
-
-	if (!is_muting)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	cellSysutil.todo("cellSysutilAvcGetVoiceMuting()");
 	return CELL_OK;
 }
 
@@ -225,105 +69,45 @@ error_code cellSysutilAvcHidePanel()
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcJoinRequest(u32 ctx_id, vm::cptr<SceNpRoomId> room_id, vm::ptr<CellSysutilAvcRequestId> request_id)
+error_code cellSysutilAvcJoinRequest()
 {
-	cellSysutil.todo("cellSysutilAvcJoinRequest(ctx_id=*0x%x, room_id=*0x%x, request_id=*0x%x)", ctx_id, room_id, request_id);
-
-	if (!room_id || !request_id)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
-	auto& settings = g_fxo->get<avc_settings>();
-	const CellSysutilAvcRequestId req_id = settings.req_id_cnt.fetch_add(1);
-	*request_id = req_id;
-	settings.register_cb_call(req_id, CELL_AVC_EVENT_JOIN_SUCCEEDED, static_cast<CellSysUtilAvcEventParam>(0));
-
+	cellSysutil.todo("cellSysutilAvcJoinRequest()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcLoadAsync(vm::ptr<CellSysutilAvcCallback> func, vm::ptr<void> userdata, sys_memory_container_t container,
-	CellSysUtilAvcMediaType media, CellSysUtilAvcVideoQuality videoQuality, CellSysUtilAvcVoiceQuality voiceQuality, vm::ptr<CellSysutilAvcRequestId> request_id)
+error_code cellSysutilAvcLoadAsync()
 {
-	cellSysutil.todo("cellSysutilAvcLoadAsync(func=*0x%x, userdata=*0x%x, container=0x%x, media=0x%x, videoQuality=0x%x, voiceQuality=0x%x, request_id=*0x%x)",
-		func, userdata, container, +media, +videoQuality, +voiceQuality, request_id);
-
-	//if (sys_memory_container_get_size(.., container) != CELL_OK)
-	//	return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
-	switch (media)
-	{
-	case CELL_SYSUTIL_AVC_VOICE_CHAT:
-	case CELL_SYSUTIL_AVC_VIDEO_CHAT:
-		// TODO: return CELL_AVC_ERROR_OUT_OF_MEMORY
-		// TODO: return CELL_AVC_ERROR_INVALID_ARGUMENT
-		break;
-	default:
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-	}
-
-	if (!func || !request_id)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
-	if (videoQuality != CELL_SYSUTIL_AVC_VIDEO_QUALITY_DEFAULT || voiceQuality != CELL_SYSUTIL_AVC_VOICE_QUALITY_DEFAULT)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
-	auto& settings = g_fxo->get<avc_settings>();
-
-	{
-		std::lock_guard lock(settings.mutex_cb);
-
-		if (settings.avc_cb)
-			return CELL_AVC_ERROR_ALREADY_INITIALIZED;
-
-		settings.avc_cb = func;
-		settings.avc_cb_arg = userdata;
-	}
-
-	const CellSysutilAvcRequestId req_id = settings.req_id_cnt.fetch_add(1);
-	*request_id = req_id;
-	settings.register_cb_call(req_id, CELL_AVC_EVENT_LOAD_SUCCEEDED, static_cast<CellSysUtilAvcEventParam>(0));
-
+	cellSysutil.todo("cellSysutilAvcLoadAsync()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcSetAttribute(CellSysUtilAvcAttribute attr_id, vm::ptr<void> param)
+error_code cellSysutilAvcSetAttribute()
 {
-	cellSysutil.todo("cellSysutilAvcSetAttribute(attr_id=0x%x, param=*0x%x)", +attr_id, param);
-
-	if (!param)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	cellSysutil.todo("cellSysutilAvcSetAttribute()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcSetLayoutMode(CellSysutilAvcLayoutMode layout)
+error_code cellSysutilAvcSetLayoutMode()
 {
-	cellSysutil.todo("cellSysutilAvcSetLayoutMode(layout=0x%x)", +layout);
-
-	if (layout > CELL_SYSUTIL_AVC_LAYOUT_BOTTOM)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	cellSysutil.todo("cellSysutilAvcSetLayoutMode()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcSetSpeakerVolumeLevel(s32 volumeLevel)
+error_code cellSysutilAvcSetSpeakerVolumeLevel()
 {
-	cellSysutil.todo("cellSysutilAvcSetSpeakerVolumeLevel(volumeLevel=%d)", volumeLevel);
-
-	if (volumeLevel < 0 || volumeLevel > 10)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	cellSysutil.todo("cellSysutilAvcSetSpeakerVolumeLevel()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcSetVideoMuting(b8 is_muting)
+error_code cellSysutilAvcSetVideoMuting()
 {
-	cellSysutil.todo("cellSysutilAvcSetVideoMuting(is_muting=%d)", is_muting);
+	cellSysutil.todo("cellSysutilAvcSetVideoMuting()");
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcSetVoiceMuting(b8 is_muting)
+error_code cellSysutilAvcSetVoiceMuting()
 {
-	cellSysutil.todo("cellSysutilAvcSetVoiceMuting(is_muting=%d)", is_muting);
+	cellSysutil.todo("cellSysutilAvcSetVoiceMuting()");
 	return CELL_OK;
 }
 
@@ -333,18 +117,9 @@ error_code cellSysutilAvcShowPanel()
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcUnloadAsync(vm::ptr<CellSysutilAvcRequestId> request_id)
+error_code cellSysutilAvcUnloadAsync()
 {
-	cellSysutil.todo("cellSysutilAvcUnloadAsync(request_id=*0x%x)", request_id);
-
-	if (!request_id)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
-	auto& settings = g_fxo->get<avc_settings>();
-	const CellSysutilAvcRequestId req_id = settings.req_id_cnt.fetch_add(1);
-	*request_id = req_id;
-	settings.register_cb_call(req_id, CELL_AVC_EVENT_UNLOAD_SUCCEEDED, static_cast<CellSysUtilAvcEventParam>(0));
-
+	cellSysutil.todo("cellSysutilAvcUnloadAsync()");
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvc.h b/rpcs3/Emu/Cell/Modules/cellSysutilAvc.h
deleted file mode 100644
index e5b2005f09..0000000000
--- a/rpcs3/Emu/Cell/Modules/cellSysutilAvc.h
+++ /dev/null
@@ -1,155 +0,0 @@
-#pragma once
-
-#include "Emu/Cell/Modules/sceNp.h"
-
-enum CellAvcError : u32
-{
-	CELL_AVC_ERROR_UNKNOWN               = 0x8002b701,
-	CELL_AVC_ERROR_NOT_SUPPORTED         = 0x8002b702,
-	CELL_AVC_ERROR_NOT_INITIALIZED       = 0x8002b703,
-	CELL_AVC_ERROR_ALREADY_INITIALIZED   = 0x8002b704,
-	CELL_AVC_ERROR_INVALID_ARGUMENT      = 0x8002b705,
-	CELL_AVC_ERROR_OUT_OF_MEMORY         = 0x8002b706,
-	CELL_AVC_ERROR_BAD_ID                = 0x8002b707,
-	CELL_AVC_ERROR_INVALID_STATUS        = 0x8002b70a,
-	CELL_AVC_ERROR_TIMEOUT               = 0x8002b70b,
-	CELL_AVC_ERROR_NO_SESSION            = 0x8002b70d,
-	CELL_AVC_ERROR_INCOMPATIBLE_PROTOCOL = 0x8002b70e,
-	CELL_AVC_ERROR_PEER_UNREACHABLE      = 0x8002b710,
-};
-
-enum CellSysutilAvcTransitionType : u32
-{
-	CELL_SYSUTIL_AVC_TRANSITION_LINEAR   = 0x00000000,
-	CELL_SYSUTIL_AVC_TRANSITION_SLOWDOWN = 0x00000001,
-	CELL_SYSUTIL_AVC_TRANSITION_FASTUP   = 0x00000002,
-	CELL_SYSUTIL_AVC_TRANSITION_ANGULAR  = 0x00000003,
-	CELL_SYSUTIL_AVC_TRANSITION_EXPONENT = 0x00000004,
-	CELL_SYSUTIL_AVC_TRANSITION_NONE     = 0xffffffff
-};
-
-enum CellSysutilAvcWindowZorderMode : u32
-{
-	CELL_SYSUTIL_AVC_ZORDER_FORWARD_MOST = 0x00000002,
-	CELL_SYSUTIL_AVC_ZORDER_BEHIND_MOST  = 0x00000003,
-};
-
-enum : u32
-{
-	CELL_AVC_REQUEST_ID_SYSTEM_EVENT = 0x00000000,
-
-	CELL_SYSUTIL_AVC_VIDEO_MEMORY_SIZE                          = 26 * 1024 * 1024,
-	CELL_SYSUTIL_AVC_VOICE_MEMORY_SIZE                          =  8 * 1024 * 1024,
-	CELL_SYSUTIL_AVC_EXTRA_MEMORY_SIZE_FOR_SHARING_VIDEO_BUFFER =  2 * 1024 * 1024,
-
-	CELL_SYSUTIL_AVC_OPTION_PARAM_VERSION = 100,
-};
-
-enum CellSysutilAvcEvent : u32
-{
-	CELL_AVC_EVENT_LOAD_SUCCEEDED   = 0x00000001,
-	CELL_AVC_EVENT_LOAD_FAILED      = 0x00000002,
-	CELL_AVC_EVENT_UNLOAD_SUCCEEDED = 0x00000003,
-	CELL_AVC_EVENT_UNLOAD_FAILED    = 0x00000004,
-	CELL_AVC_EVENT_JOIN_SUCCEEDED   = 0x00000005,
-	CELL_AVC_EVENT_JOIN_FAILED      = 0x00000006,
-	CELL_AVC_EVENT_BYE_SUCCEEDED    = 0x00000007,
-	CELL_AVC_EVENT_BYE_FAILED       = 0x00000008,
-
-	CELL_AVC_EVENT_SYSTEM_NEW_MEMBER_JOINED          = 0x10000001,
-	CELL_AVC_EVENT_SYSTEM_MEMBER_LEFT                = 0x10000002,
-	CELL_AVC_EVENT_SYSTEM_SESSION_ESTABLISHED        = 0x10000003,
-	CELL_AVC_EVENT_SYSTEM_SESSION_CANNOT_ESTABLISHED = 0x10000004,
-	CELL_AVC_EVENT_SYSTEM_SESSION_DISCONNECTED       = 0x10000005,
-	CELL_AVC_EVENT_SYSTEM_VOICE_DETECTED             = 0x10000006,
-	CELL_AVC_EVENT_SYSTEM_MIC_DETECTED               = 0x10000007,
-	CELL_AVC_EVENT_SYSTEM_CAMERA_DETECTED            = 0x10000008,
-};
-
-enum CellSysUtilAvcEventParam : u64
-{
-	CELL_AVC_EVENT_PARAM_ERROR_UNKNOWN                = 0x00000001,
-	CELL_AVC_EVENT_PARAM_ERROR_NOT_SUPPORTED          = 0x00000002,
-	CELL_AVC_EVENT_PARAM_ERROR_INVALID_ARGUMENT       = 0x00000003,
-	CELL_AVC_EVENT_PARAM_ERROR_OUT_OF_MEMORY          = 0x00000004,
-	CELL_AVC_EVENT_PARAM_ERROR_INVALID_STATUS         = 0x00000005,
-	CELL_AVC_EVENT_PARAM_ERROR_TIMEOUT                = 0x00000006,
-	CELL_AVC_EVENT_PARAM_ERROR_CONTEXT_DOES_NOT_EXIST = 0x00000007,
-	CELL_AVC_EVENT_PARAM_ERROR_ROOM_DOES_NOT_EXIST    = 0x00000008,
-	CELL_AVC_EVENT_PARAM_ERROR_MEDIA_MISMATCHED       = 0x00000009,
-	CELL_AVC_EVENT_PARAM_ERROR_MEMBER_EXCEEDED        = 0x0000000A,
-	CELL_AVC_EVENT_PARAM_ERROR_MASTER_LEFT            = 0x0000000B,
-	CELL_AVC_EVENT_PARAM_ERROR_NETWORK_ERROR          = 0x0000000C,
-	CELL_AVC_EVENT_PARAM_ERROR_INCOMPATIBLE_PROTOCOL  = 0x0000000D,
-};
-
-enum CellSysUtilAvcAttribute : u32
-{
-	CELL_SYSUTIL_AVC_ATTRIBUTE_DEFAULT_TRANSITION_TYPE     = 0x00000001,
-	CELL_SYSUTIL_AVC_ATTRIBUTE_DEFAULT_TRANSITION_DURATION = 0x00000002,
-	CELL_SYSUTIL_AVC_ATTRIBUTE_DEFAULT_INITIAL_SHOW_STATUS = 0x00000003,
-	CELL_SYSUTIL_AVC_ATTRIBUTE_VOICE_DETECT_EVENT_TYPE     = 0x00000004,
-	CELL_SYSUTIL_AVC_ATTRIBUTE_VOICE_DETECT_INTERVAL_TIME  = 0x00000005,
-	CELL_SYSUTIL_AVC_ATTRIBUTE_VOICE_DETECT_SIGNAL_LEVEL   = 0x00000006,
-	CELL_SYSUTIL_AVC_ATTRIBUTE_ROOM_PRIVILEGE_TYPE         = 0x00000007,
-	CELL_SYSUTIL_AVC_ATTRIBUTE_VIDEO_MAX_BITRATE           = 0x00000008,
-};
-
-enum CellSysutilAvcLayoutMode : u32
-{
-	CELL_SYSUTIL_AVC_LAYOUT_LEFT   = 0x00000000,
-	CELL_SYSUTIL_AVC_LAYOUT_RIGHT  = 0x00000001,
-	CELL_SYSUTIL_AVC_LAYOUT_TOP    = 0x00000002,
-	CELL_SYSUTIL_AVC_LAYOUT_BOTTOM = 0x00000003,
-};
-
-enum CellSysUtilAvcMediaType : u32
-{
-	CELL_SYSUTIL_AVC_VOICE_CHAT = 0x00000001,
-	CELL_SYSUTIL_AVC_VIDEO_CHAT = 0x00000002,
-};
-
-enum CellSysutilAvcRoomPrivilegeType : u32
-{
-	CELL_SYSUTIL_AVC_ROOM_PRIVILEGE_TYPE_NO_AUTO_GRANT = 0x00000000,
-	CELL_SYSUTIL_AVC_ROOM_PRIVILEGE_TYPE_AUTO_GRANT    = 0x00000001
-};
-
-enum CellSysUtilAvcVideoQuality : u32
-{
-	CELL_SYSUTIL_AVC_VIDEO_QUALITY_DEFAULT = 0x00000001
-};
-
-enum CellSysutilAvcVoiceDetectEventType : u32
-{
-	CELL_SYSUTIL_AVC_VOICE_DETECT_EVENT_TYPE_SIGNAL = 0x00000001,
-	CELL_SYSUTIL_AVC_VOICE_DETECT_EVENT_TYPE_SPEAK  = 0x00000002
-};
-
-enum CellSysutilAvcVoiceDetectSpeakData : u32
-{
-	CELL_SYSUTIL_AVC_VOICE_DETECT_DATA_SPEAK_STOP  = 0x00000000,
-	CELL_SYSUTIL_AVC_VOICE_DETECT_DATA_SPEAK_START = 0x00000001
-};
-
-enum CellSysUtilAvcVoiceQuality : u32
-{
-	CELL_SYSUTIL_AVC_VOICE_QUALITY_DEFAULT = 0x00000001
-};
-
-struct CellSysutilAvcOptionParam
-{
-	be_t<s32> avcOptionParamVersion;
-	b8 sharingVideoBuffer;
-	be_t<s32> maxPlayers; // Not in FW 1.70
-};
-
-struct CellSysutilAvcVoiceDetectData
-{
-	SceNpId npid;
-	be_t<s32> data;
-};
-
-typedef u32 CellSysutilAvcRequestId;
-
-using CellSysutilAvcCallback = void(CellSysutilAvcRequestId request_id, CellSysutilAvcEvent event_id, CellSysUtilAvcEventParam event_param, vm::ptr<void> userdata);
diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp b/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp
index 57be7f545f..728b3acbdd 100644
--- a/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp
@@ -1,7 +1,5 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/IdManager.h"
-#include "util/asm.hpp"
 
 #include "sceNp.h"
 #include "sceNp2.h"
@@ -37,157 +35,24 @@ void fmt_class_string<CellSysutilAvc2Error>::format(std::string& out, u64 arg)
 	});
 }
 
-template<>
-void fmt_class_string<CellSysutilAvc2AttributeId>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](CellSysutilAvc2AttributeId value)
-	{
-		switch (value)
-		{
-			STR_CASE(CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_EVENT_TYPE);
-			STR_CASE(CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_INTERVAL_TIME);
-			STR_CASE(CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_SIGNAL_LEVEL);
-			STR_CASE(CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_MAX_BITRATE);
-			STR_CASE(CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DATA_FEC);
-			STR_CASE(CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_PACKET_CONTENTION);
-			STR_CASE(CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DTX_MODE);
-			STR_CASE(CELL_SYSUTIL_AVC2_ATTRIBUTE_MIC_STATUS_DETECTION);
-			STR_CASE(CELL_SYSUTIL_AVC2_ATTRIBUTE_MIC_SETTING_NOTIFICATION);
-			STR_CASE(CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_MUTING_NOTIFICATION);
-			STR_CASE(CELL_SYSUTIL_AVC2_ATTRIBUTE_CAMERA_STATUS_DETECTION);
-		}
-
-		return unknown;
-	});
-}
-
-// Callback handle tag type
-struct avc2_cb_handle_t{};
-
-struct avc2_settings
-{
-	avc2_settings() = default;
-
-	avc2_settings(const avc2_settings&) = delete;
-	avc2_settings& operator=(const avc2_settings&) = delete;
-
-	SAVESTATE_INIT_POS(52);
-
-	shared_mutex mutex_cb;
-	vm::ptr<CellSysutilAvc2Callback> avc2_cb{};
-	vm::ptr<void> avc2_cb_arg{};
-
-	u32 streaming_mode = CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL;
-	u8 mic_out_stream_sharing = 0;
-	u8 video_stream_sharing = 0;
-	u32 total_video_bitrate = 0;
-	std::set<u16> voice_muting_players;
-	bool voice_muting = 1;
-	bool video_muting = 1;
-	bool speaker_muting = 1;
-	f32 speaker_volume_level = 40.0f;
-
-	static bool saveable(bool /*is_writing*/) noexcept
-	{
-		return GET_SERIALIZATION_VERSION(cellSysutil) != 0;
-	}
-
-	avc2_settings(utils::serial& ar) noexcept
-	{
-		[[maybe_unused]] const s32 version = GET_SERIALIZATION_VERSION(cellSysutil);
-
-		if (version == 0)
-		{
-			return;
-		}
-
-		save(ar);
-	}
-
-	void save(utils::serial& ar)
-	{
-		[[maybe_unused]] const s32 version = GET_OR_USE_SERIALIZATION_VERSION(ar.is_writing(), cellSysutil);
-
-		ar(avc2_cb, avc2_cb_arg, streaming_mode, mic_out_stream_sharing, video_stream_sharing, total_video_bitrate);
-
-		if (ar.is_writing() || version >= 2)
-		{
-			ar(voice_muting_players, voice_muting, video_muting, speaker_muting, speaker_volume_level);
-		}
-	}
-
-	void register_cb_call(u32 event, u32 error_code)
-	{
-		// This is equivalent to the dispatcher code
-		sysutil_register_cb_with_id<avc2_cb_handle_t>([=, this](ppu_thread& cb_ppu) -> s32
-			{
-				vm::ptr<CellSysutilAvc2Callback> avc2_cb{};
-				vm::ptr<void> avc2_cb_arg{};
-
-				{
-					std::lock_guard lock(this->mutex_cb);
-					avc2_cb = this->avc2_cb;
-					avc2_cb_arg = this->avc2_cb_arg;
-				}
-
-				if (avc2_cb)
-				{
-					avc2_cb(cb_ppu, event, error_code, avc2_cb_arg);
-
-					if ((event == CELL_AVC2_EVENT_LOAD_FAILED ||
-							event == CELL_AVC2_EVENT_UNLOAD_SUCCEEDED ||
-							event == CELL_AVC2_EVENT_UNLOAD_FAILED) &&
-						error_code < 2)
-					{
-						sysutil_unregister_cb_with_id<avc2_cb_handle_t>();
-
-						std::lock_guard lock(this->mutex_cb);
-						this->avc2_cb = vm::null;
-						this->avc2_cb_arg = vm::null;
-					}
-				}
-
-				return 0;
-			});
-	}
-};
+vm::ptr<CellSysutilAvc2Callback> avc2_cb{};
+vm::ptr<void> avc2_cb_arg{};
 
 error_code cellSysutilAvc2GetPlayerInfo(vm::cptr<SceNpMatching2RoomMemberId> player_id, vm::ptr<CellSysutilAvc2PlayerInfo> player_info)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2GetPlayerInfo(player_id=*0x%x, player_info=*0x%x)", player_id, player_info);
 
-	if (!player_id || !player_info)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
 	player_info->connected = 1;
 	player_info->joined = 1;
-	player_info->mic_attached = CELL_AVC2_MIC_STATUS_DETACHED;
+	player_info->mic_attached = 0;
 	player_info->member_id = *player_id;
 
 	return CELL_OK;
 }
 
-error_code cellSysutilAvc2JoinChat(vm::cptr<SceNpMatching2RoomId> room_id, vm::ptr<CellSysutilAvc2EventId> eventId, vm::ptr<CellSysutilAvc2EventParam> eventParam)
+error_code cellSysutilAvc2JoinChat(vm::cptr<SceNpMatching2RoomId> room_id)
 {
-	cellSysutilAvc2.todo("cellSysutilAvc2JoinChat(room_id=*0x%x, eventId=*0x%x, eventParam=*0x%x)", room_id, eventId, eventParam);
-
-	// NOTE: room_id should be null if the current mode is Direct WAN/LAN
-
-	auto& settings = g_fxo->get<avc2_settings>();
-
-	[[maybe_unused]] u64 id = 0UL;
-
-	if (room_id)
-	{
-		id = *room_id;
-	}
-	else if (settings.streaming_mode != CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL)
-	{
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-	}
-
-	// TODO: join chat
-
+	cellSysutilAvc2.todo("cellSysutilAvc2JoinChat(room_id=*0x%x)", room_id);
 	return CELL_OK;
 }
 
@@ -197,7 +62,7 @@ error_code cellSysutilAvc2StopStreaming()
 	return CELL_OK;
 }
 
-error_code cellSysutilAvc2ChangeVideoResolution(u32 resolution)
+error_code cellSysutilAvc2ChangeVideoResolution(CellSysutilAvc2VideoResolution resolution)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2ChangeVideoResolution(resolution=0x%x)", resolution);
 	return CELL_OK;
@@ -213,11 +78,7 @@ error_code cellSysutilAvc2GetVideoMuting(vm::ptr<u8> muting)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2GetVideoMuting(muting=*0x%x)", muting);
 
-	if (!muting)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	const auto& settings = g_fxo->get<avc2_settings>();
-	*muting = settings.video_muting;
+	*muting = 1;
 
 	return CELL_OK;
 }
@@ -225,50 +86,18 @@ error_code cellSysutilAvc2GetVideoMuting(vm::ptr<u8> muting)
 error_code cellSysutilAvc2GetWindowAttribute(SceNpMatching2RoomMemberId member_id, vm::ptr<CellSysutilAvc2WindowAttribute> attr)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2GetWindowAttribute(member_id=0x%x, attr=*0x%x)", member_id, attr);
-
-	if (!attr)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	switch (attr->attr_id)
-	{
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_ALPHA:
-		break;
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_TRANSITION_TYPE:
-		break;
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_TRANSITION_DURATION:
-		break;
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_STRING_VISIBLE:
-		break;
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_ROTATION:
-		break;
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_ZORDER:
-		break;
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_SURFACE:
-		break;
-	default:
-		break;
-	}
-
 	return CELL_OK;
 }
 
-error_code cellSysutilAvc2StopStreaming2(u32 mediaType)
+error_code cellSysutilAvc2StopStreaming2(CellSysutilAvc2MediaType mediaType)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2StopStreaming2(mediaType=0x%x)", mediaType);
-
-	if (mediaType != CELL_SYSUTIL_AVC2_VOICE_CHAT && mediaType != CELL_SYSUTIL_AVC2_VIDEO_CHAT)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
 error_code cellSysutilAvc2SetVoiceMuting(u8 muting)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2SetVoiceMuting(muting=0x%x)", muting);
-
-	auto& settings = g_fxo->get<avc2_settings>();
-	settings.voice_muting = muting;
-
 	return CELL_OK;
 }
 
@@ -278,6 +107,12 @@ error_code cellSysutilAvc2StartVoiceDetection()
 	return CELL_OK;
 }
 
+error_code cellSysutilAvc2UnloadAsync()
+{
+	cellSysutilAvc2.todo("cellSysutilAvc2UnloadAsync()");
+	return CELL_OK;
+}
+
 error_code cellSysutilAvc2StopVoiceDetection()
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2StopVoiceDetection()");
@@ -287,36 +122,23 @@ error_code cellSysutilAvc2StopVoiceDetection()
 error_code cellSysutilAvc2GetAttribute(vm::ptr<CellSysutilAvc2Attribute> attr)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2GetAttribute(attr=*0x%x)", attr);
+	return CELL_OK;
+}
 
-	if (!attr)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
+error_code cellSysutilAvc2LoadAsync(SceNpMatching2ContextId ctx_id, u32 container, vm::ptr<CellSysutilAvc2Callback> callback_func, vm::ptr<void> user_data, vm::cptr<CellSysutilAvc2InitParam> init_param)
+{
+	cellSysutilAvc2.warning("cellSysutilAvc2LoadAsync(ctx_id=0x%x, container=0x%x, callback_func=*0x%x, user_data=*0x%x, init_param=*0x%x)", ctx_id, container, callback_func, user_data, init_param);
 
-	switch (attr->attr_id)
+	avc2_cb = callback_func;
+	avc2_cb_arg = user_data;
+
+	if (avc2_cb)
 	{
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_EVENT_TYPE:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_INTERVAL_TIME:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_SIGNAL_LEVEL:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_MAX_BITRATE:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DATA_FEC:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_PACKET_CONTENTION:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DTX_MODE:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_MIC_STATUS_DETECTION:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_MIC_SETTING_NOTIFICATION:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_MUTING_NOTIFICATION:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_CAMERA_STATUS_DETECTION:
-		break;
-	default:
-		break;
+		sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+		{
+			avc2_cb(cb_ppu, CELL_AVC2_EVENT_LOAD_SUCCEEDED, 0, avc2_cb_arg);
+			return 0;
+		});
 	}
 
 	return CELL_OK;
@@ -325,171 +147,42 @@ error_code cellSysutilAvc2GetAttribute(vm::ptr<CellSysutilAvc2Attribute> attr)
 error_code cellSysutilAvc2SetSpeakerVolumeLevel(f32 level)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2SetSpeakerVolumeLevel(level=0x%x)", level);
-
-	auto& settings = g_fxo->get<avc2_settings>();
-	settings.speaker_volume_level = level;
-
 	return CELL_OK;
 }
 
 error_code cellSysutilAvc2SetWindowString(SceNpMatching2RoomMemberId member_id, vm::cptr<char> string)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2SetWindowString(member_id=0x%x, string=%s)", member_id, string);
-
-	if (!string || std::strlen(string.get_ptr()) >= 64)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
 error_code cellSysutilAvc2EstimateMemoryContainerSize(vm::cptr<CellSysutilAvc2InitParam> initparam, vm::ptr<u32> size)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2EstimateMemoryContainerSize(initparam=*0x%x, size=*0x%x)", initparam, size);
-
-	if (!initparam || !size)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	switch (initparam->avc_init_param_version)
-	{
-	case 100:
-	{
-		*size = 0x400000;
-		break;
-	}
-	case 110:
-	case 120:
-	case 130:
-	case 140:
-	{
-		if (initparam->media_type == CELL_SYSUTIL_AVC2_VOICE_CHAT)
-		{
-			*size = 0x300000;
-		}
-		else if (initparam->media_type == CELL_SYSUTIL_AVC2_VIDEO_CHAT)
-		{
-			u32 estimated_size = 0x40e666;
-			u32 max_windows    = initparam->video_param.max_video_windows;
-			s32 window_count   = max_windows;
-
-			if (initparam->video_param.video_stream_sharing == CELL_SYSUTIL_AVC2_VIDEO_SHARING_MODE_2)
-			{
-				window_count++;
-			}
-
-			if (initparam->video_param.max_video_resolution == CELL_SYSUTIL_AVC2_VIDEO_RESOLUTION_QQVGA)
-			{
-				estimated_size = (static_cast<u32>(window_count) * 0x12c00 & 0xfff00000) + 0x50e666;
-			}
-			else if (initparam->video_param.max_video_resolution == CELL_SYSUTIL_AVC2_VIDEO_RESOLUTION_QVGA)
-			{
-				estimated_size += (static_cast<u32>(window_count) * 0x4b000 & 0xfff00000) + 0x100000;
-			}
-
-			if (initparam->video_param.frame_mode == CELL_SYSUTIL_AVC2_FRAME_MODE_NORMAL)
-			{
-				window_count = max_windows - 1;
-			}
-			else
-			{
-				window_count = 1;
-			}
-
-			u32 val = max_windows * 10000;
-
-			if (initparam->video_param.max_video_resolution == CELL_SYSUTIL_AVC2_VIDEO_RESOLUTION_QQVGA)
-			{
-				val += window_count * 0x96000 + 0x10c9e0; // 0x96000 = 160x120x32
-			}
-			else
-			{
-				val += static_cast<s32>(static_cast<f64>(window_count) * 1258291.2) + 0x1ed846;
-			}
-
-			estimated_size = ((estimated_size + ((static_cast<int>(val) >> 7) + static_cast<u32>(static_cast<int>(val) < 0 && (val & 0x7f) != 0)) * 0x80 + 0x80080) & 0xfff00000) + 0x100000;
-
-			*size = estimated_size;
-		}
-		else
-		{
-			*size = 0;
-			return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-		}
-		break;
-	}
-	default:
-	{
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-	}
-	}
-
 	return CELL_OK;
 }
 
 error_code cellSysutilAvc2SetVideoMuting(u8 muting)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2SetVideoMuting(muting=0x%x)", muting);
-
-	if (muting > 1) // Weird check, lol
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	auto& settings = g_fxo->get<avc2_settings>();
-	settings.video_muting = muting;
-
 	return CELL_OK;
 }
 
 error_code cellSysutilAvc2SetPlayerVoiceMuting(SceNpMatching2RoomMemberId member_id, u8 muting)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2SetPlayerVoiceMuting(member_id=0x%x, muting=0x%x)", member_id, muting);
-
-	auto& settings = g_fxo->get<avc2_settings>();
-
-	if (muting)
-	{
-		settings.voice_muting_players.insert(member_id);
-	}
-	else
-	{
-		settings.voice_muting_players.erase(member_id);
-	}
-
 	return CELL_OK;
 }
 
-error_code cellSysutilAvc2SetStreamingTarget(vm::cptr<CellSysutilAvc2StreamingTarget> target)
+error_code cellSysutilAvc2SetStreamingTarget()
 {
-	cellSysutilAvc2.todo("cellSysutilAvc2SetStreamingTarget(target=*0x%x)", target);
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvc2);
 	return CELL_OK;
 }
 
 error_code cellSysutilAvc2Unload()
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2Unload()");
-
-	auto& settings = g_fxo->get<avc2_settings>();
-
-	std::lock_guard lock(settings.mutex_cb);
-
-	if (!settings.avc2_cb)
-	{
-		return CELL_AVC2_ERROR_NOT_INITIALIZED;
-	}
-
-	sysutil_unregister_cb_with_id<avc2_cb_handle_t>();
-	settings.avc2_cb = vm::null;
-	settings.avc2_cb_arg = vm::null;
-
-	return CELL_OK;
-}
-
-error_code cellSysutilAvc2UnloadAsync()
-{
-	cellSysutilAvc2.todo("cellSysutilAvc2UnloadAsync()");
-
-	auto& settings = g_fxo->get<avc2_settings>();
-	settings.register_cb_call(CELL_AVC2_EVENT_UNLOAD_SUCCEEDED, 0);
-
 	return CELL_OK;
 }
 
@@ -508,13 +201,6 @@ error_code cellSysutilAvc2SetWindowPosition(SceNpMatching2RoomMemberId member_id
 error_code cellSysutilAvc2GetSpeakerVolumeLevel(vm::ptr<f32> level)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2GetSpeakerVolumeLevel(level=*0x%x)", level);
-
-	if (!level)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	const auto& settings = g_fxo->get<avc2_settings>();
-	*level = settings.speaker_volume_level;
-
 	return CELL_OK;
 }
 
@@ -522,9 +208,6 @@ error_code cellSysutilAvc2IsCameraAttached(vm::ptr<u8> status)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2IsCameraAttached(status=*0x%x)", status);
 
-	if (!status)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
 	*status = CELL_AVC2_CAMERA_STATUS_DETACHED;
 
 	return CELL_OK;
@@ -533,51 +216,12 @@ error_code cellSysutilAvc2IsCameraAttached(vm::ptr<u8> status)
 error_code cellSysutilAvc2MicRead(vm::ptr<void> ptr, vm::ptr<u32> pSize)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2MicRead(ptr=*0x%x, pSize=*0x%x)", ptr, pSize);
-
-	const auto& settings = g_fxo->get<avc2_settings>();
-
-	if (!settings.mic_out_stream_sharing)
-		return CELL_OK;
-
-	if (!ptr || !pSize)
-	{
-		// Not checked on real hardware
-		cellSysutilAvc2.warning("cellSysutilAvc2MicRead: ptr or pSize is null");
-
-		if (pSize)
-		{
-			*pSize = 0;
-		}
-
-		return CELL_OK;
-	}
-
-	// TODO: ringbuffer (holds 100ms of 16kHz single channel f32 samples)
-	std::vector<u8> buf{};
-
-	u32 size_read = 0;
-
-	if (u32 size_to_read = *pSize; size_to_read > 0 && !buf.empty())
-	{
-		size_read = std::min(size_to_read, ::size32(buf));
-		std::memcpy(ptr.get_ptr(), buf.data(), size_read);
-	}
-
-	*pSize = size_read;
-
 	return CELL_OK;
 }
 
 error_code cellSysutilAvc2GetPlayerVoiceMuting(SceNpMatching2RoomMemberId member_id, vm::ptr<u8> muting)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2GetPlayerVoiceMuting(member_id=0x%x, muting=*0x%x)", member_id, muting);
-
-	if (!muting)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	const auto& settings = g_fxo->get<avc2_settings>();
-	*muting = settings.voice_muting_players.contains(member_id);
-
 	return CELL_OK;
 }
 
@@ -585,23 +229,14 @@ error_code cellSysutilAvc2JoinChatRequest(vm::cptr<SceNpMatching2RoomId> room_id
 {
 	cellSysutilAvc2.warning("cellSysutilAvc2JoinChatRequest(room_id=*0x%x)", room_id);
 
-	// NOTE: room_id should be null if the current mode is Direct WAN/LAN
-
-	auto& settings = g_fxo->get<avc2_settings>();
-
-	[[maybe_unused]] u64 id = 0UL;
-
-	if (room_id)
+	if (avc2_cb)
 	{
-		id = *room_id;
+		sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+		{
+			avc2_cb(cb_ppu, CELL_AVC2_EVENT_JOIN_SUCCEEDED, 0, avc2_cb_arg);
+			return 0;
+		});
 	}
-	else if (settings.streaming_mode != CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL)
-	{
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-	}
-
-	// TODO: join chat
-	settings.register_cb_call(CELL_AVC2_EVENT_JOIN_SUCCEEDED, 0);
 
 	return CELL_OK;
 }
@@ -615,65 +250,57 @@ error_code cellSysutilAvc2StartStreaming()
 error_code cellSysutilAvc2SetWindowAttribute(SceNpMatching2RoomMemberId member_id, vm::cptr<CellSysutilAvc2WindowAttribute> attr)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2SetWindowAttribute(member_id=0x%x, attr=*0x%x)", member_id, attr);
-
-	if (!attr)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	switch (attr->attr_id)
-	{
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_ALPHA:
-		break;
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_TRANSITION_TYPE:
-		break;
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_TRANSITION_DURATION:
-		break;
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_STRING_VISIBLE:
-		break;
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_ROTATION:
-		break;
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_ZORDER:
-		break;
-	case CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_SURFACE:
-		break;
-	default:
-		break;
-	}
-
 	return CELL_OK;
 }
 
 error_code cellSysutilAvc2GetWindowShowStatus(SceNpMatching2RoomMemberId member_id, vm::ptr<u8> visible)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2GetWindowShowStatus(member_id=0x%x, visible=*0x%x)", member_id, visible);
-
-	if (!visible)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	*visible = 0;
-
 	return CELL_OK;
 }
 
 error_code cellSysutilAvc2InitParam(u16 version, vm::ptr<CellSysutilAvc2InitParam> option)
 {
-	cellSysutilAvc2.todo("cellSysutilAvc2InitParam(version=%d, option=*0x%x)", version, option);
+	cellSysutilAvc2.warning("cellSysutilAvc2InitParam(version=%d, option=*0x%x)", version, option);
 
-	if (!option)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	*option = {};
-	option->avc_init_param_version = version;
-
-	switch (version)
+	if (version >= 110)
 	{
-	case 100:
-	case 110:
-	case 120:
-	case 130:
-	case 140:
-		break;
-	default:
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
+		// Notify the user that, a version different from the one, that we know the constants for, is used.
+		// Other versions shouldn't differ by too much, if at all - they most likely differ in other functions.
+		if (version != 140)
+		{
+			cellSysutilAvc2.todo("cellSysutilAvc2InitParam(): Older/newer version %d used, might cause problems.", version);
+		}
+
+		option->avc_init_param_version = version;
+
+		if (option->media_type == CELL_SYSUTIL_AVC2_VOICE_CHAT)
+		{
+			option->max_players = 16;
+		}
+		else if (option->media_type == CELL_SYSUTIL_AVC2_VIDEO_CHAT)
+		{
+			if (option->video_param.frame_mode == CELL_SYSUTIL_AVC2_FRAME_MODE_NORMAL)
+			{
+				option->max_players = 6;
+			}
+			else if (option->video_param.frame_mode == CELL_SYSUTIL_AVC2_FRAME_MODE_INTRA_ONLY)
+			{
+				option->max_players = 16;
+			}
+			else
+			{
+				cellSysutilAvc2.error("Unknown frame mode 0x%x", option->video_param.frame_mode);
+			}
+		}
+		else
+		{
+			cellSysutilAvc2.error("Unknown media type 0x%x", option->media_type);
+		}
+	}
+	else
+	{
+		cellSysutilAvc2.error("cellSysutilAvc2InitParam(): Unknown version %d used, please report this to a developer.", version);
 	}
 
 	return CELL_OK;
@@ -682,10 +309,6 @@ error_code cellSysutilAvc2InitParam(u16 version, vm::ptr<CellSysutilAvc2InitPara
 error_code cellSysutilAvc2GetWindowSize(SceNpMatching2RoomMemberId member_id, vm::ptr<f32> width, vm::ptr<f32> height)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2GetWindowSize(member_id=0x%x, width=*0x%x, height=*0x%x)", member_id, width, height);
-
-	if (!width || !height)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
@@ -699,8 +322,14 @@ error_code cellSysutilAvc2LeaveChatRequest()
 {
 	cellSysutilAvc2.notice("cellSysutilAvc2LeaveChatRequest()");
 
-	auto& settings = g_fxo->get<avc2_settings>();
-	settings.register_cb_call(CELL_AVC2_EVENT_LEAVE_SUCCEEDED, 0);
+	if (avc2_cb)
+	{
+		sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+		{
+			avc2_cb(cb_ppu, CELL_AVC2_EVENT_LEAVE_SUCCEEDED, 0, avc2_cb_arg);
+			return 0;
+		});
+	}
 
 	return CELL_OK;
 }
@@ -709,8 +338,6 @@ error_code cellSysutilAvc2IsMicAttached(vm::ptr<u8> status)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2IsMicAttached(status=*0x%x)", status);
 
-	ensure(!!status); // I couldn't find any error value for this (should be CELL_AVC2_ERROR_INVALID_ARGUMENT if anything)
-
 	*status = CELL_AVC2_MIC_STATUS_DETACHED;
 
 	return CELL_OK;
@@ -725,13 +352,7 @@ error_code cellSysutilAvc2CreateWindow(SceNpMatching2RoomMemberId member_id)
 error_code cellSysutilAvc2GetSpeakerMuting(vm::ptr<u8> muting)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2GetSpeakerMuting(muting=*0x%x)", muting);
-
-	if (!muting)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	const auto& settings = g_fxo->get<avc2_settings>();
-	*muting = settings.speaker_muting;
-
+	*muting = 1;
 	return CELL_OK;
 }
 
@@ -751,22 +372,11 @@ error_code cellSysutilAvc2EnumPlayers(vm::ptr<s32> players_num, vm::ptr<SceNpMat
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2EnumPlayers(players_num=*0x%x, players_id=*0x%x)", players_num, players_id);
 
-	if (!players_num)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	// Apparently this function is supposed to be called twice.
-	// Once with null to get the player count and then again to fill the ID list.
-	if (players_id)
-	{
-		for (int i = 0; i < *players_num; i++)
-		{
-			players_id[i] = i + 1;
-		}
-	}
-	else
-	{
+	if (players_num)
 		*players_num = 1;
-	}
+
+	if (players_id)
+		*players_id = 1;
 
 	return CELL_OK;
 }
@@ -774,10 +384,6 @@ error_code cellSysutilAvc2EnumPlayers(vm::ptr<s32> players_num, vm::ptr<SceNpMat
 error_code cellSysutilAvc2GetWindowString(SceNpMatching2RoomMemberId member_id, vm::ptr<char> string, vm::ptr<u8> len)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2GetWindowString(member_id=0x%x, string=*0x%x, len=*0x%x)", member_id, string, len);
-
-	if (!string || !len)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
@@ -790,301 +396,30 @@ error_code cellSysutilAvc2LeaveChat()
 error_code cellSysutilAvc2SetSpeakerMuting(u8 muting)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2SetSpeakerMuting(muting=0x%x)", muting);
-
-	auto& settings = g_fxo->get<avc2_settings>();
-	settings.speaker_muting = muting;
-
-	return CELL_OK;
-}
-
-error_code cellSysutilAvc2Load_shared(SceNpMatching2ContextId /*ctx_id*/, u32 /*container*/, vm::ptr<CellSysutilAvc2Callback> callback_func, vm::ptr<void> user_data, vm::cptr<CellSysutilAvc2InitParam> init_param)
-{
-	if (!init_param || !init_param->avc_init_param_version ||
-	    !(init_param->avc_init_param_version == 100 ||
-	     init_param->avc_init_param_version == 110 ||
-	     init_param->avc_init_param_version == 120 ||
-	     init_param->avc_init_param_version == 130 ||
-	     init_param->avc_init_param_version == 140)
-	)
-	{
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& settings = g_fxo->get<avc2_settings>();
-
-	switch (init_param->media_type)
-	{
-	case CELL_SYSUTIL_AVC2_VOICE_CHAT:
-	{
-		if (init_param->max_players < 2 ||
-		    init_param->max_players > 64 ||
-		    init_param->spu_load_average > 100 ||
-		    init_param->voice_param.voice_quality != CELL_SYSUTIL_AVC2_VOICE_QUALITY_NORMAL ||
-		    init_param->voice_param.max_speakers == 0 ||
-		    init_param->voice_param.max_speakers > 16
-		)
-		{
-			return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-		}
-
-		u32 streaming_mode = init_param->direct_streaming_mode;
-
-		if (init_param->avc_init_param_version >= 120)
-		{
-			switch (init_param->direct_streaming_mode)
-			{
-			case CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL:
-				streaming_mode = CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL;
-				break;
-			case CELL_SYSUTIL_AVC2_STREAMING_MODE_DIRECT_WAN:
-				break;
-			case CELL_SYSUTIL_AVC2_STREAMING_MODE_DIRECT_LAN:
-				if (init_param->streaming_mode.mode == CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL)
-				{
-					settings.streaming_mode = streaming_mode;
-					return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-				}
-				break;
-			default:
-				return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-			}
-		}
-		else if (init_param->avc_init_param_version >= 110)
-		{
-			switch (init_param->direct_streaming_mode)
-			{
-			case CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL:
-			case CELL_SYSUTIL_AVC2_STREAMING_MODE_DIRECT_WAN:
-				break;
-			case CELL_SYSUTIL_AVC2_STREAMING_MODE_DIRECT_LAN:
-			default:
-				return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-			}
-		}
-		else
-		{
-			streaming_mode = settings.streaming_mode;
-		}
-
-		settings.streaming_mode = streaming_mode;
-		settings.mic_out_stream_sharing = init_param->voice_param.mic_out_stream_sharing;
-
-		if (!callback_func)
-		{
-			return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-		}
-
-		std::lock_guard lock(settings.mutex_cb);
-
-		if (settings.avc2_cb)
-		{
-			return CELL_AVC2_ERROR_ALREADY_INITIALIZED;
-		}
-
-		settings.avc2_cb = callback_func;
-		settings.avc2_cb_arg = user_data;
-		break;
-	}
-	case CELL_SYSUTIL_AVC2_VIDEO_CHAT:
-	{
-		if (false) // TODO: syscall to check container
-		{
-			return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-		}
-
-		if (init_param->avc_init_param_version <= 140)
-		{
-			if (false) // TODO
-			{
-				return CELL_AVC2_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (callback_func)
-		{
-			return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-		}
-
-		if (init_param->video_param.max_video_windows == 0 ||
-			init_param->video_param.max_video_windows > (init_param->video_param.frame_mode == CELL_SYSUTIL_AVC2_FRAME_MODE_NORMAL ? 6 : 16))
-		{
-			return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-		}
-
-		if (init_param->video_param.max_video_bitrate < 1000 || init_param->video_param.max_video_bitrate > 512000)
-		{
-			return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-		}
-
-		if (init_param->video_param.max_video_framerate == 0 || init_param->video_param.max_video_framerate > 30)
-		{
-			return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-		}
-
-		s32 bitrate = 0;
-
-		switch (init_param->video_param.max_video_resolution)
-		{
-		case CELL_SYSUTIL_AVC2_VIDEO_RESOLUTION_QQVGA:
-			bitrate = 76800;
-			break;
-		case CELL_SYSUTIL_AVC2_VIDEO_RESOLUTION_QVGA:
-			bitrate = 307200;
-			break;
-		default:
-			break;
-		}
-
-		u32 total_bitrate = 0;
-
-		if (bitrate != 0)
-		{
-			u32 window_count = init_param->video_param.max_video_windows;
-
-			if (init_param->video_param.video_stream_sharing == CELL_SYSUTIL_AVC2_VIDEO_SHARING_MODE_2)
-			{
-				window_count++;
-			}
-
-			total_bitrate = utils::align<u32>(window_count * bitrate, 0x100000) + 0x100000;
-		}
-
-		settings.video_stream_sharing = init_param->video_param.video_stream_sharing;
-		settings.total_video_bitrate = total_bitrate;
-		break;
-	}
-	default:
-		return CELL_AVC2_ERROR_NOT_SUPPORTED;
-	}
-
 	return CELL_OK;
 }
 
 error_code cellSysutilAvc2Load(SceNpMatching2ContextId ctx_id, u32 container, vm::ptr<CellSysutilAvc2Callback> callback_func, vm::ptr<void> user_data, vm::cptr<CellSysutilAvc2InitParam> init_param)
 {
-	cellSysutilAvc2.warning("cellSysutilAvc2Load(ctx_id=0x%x, container=0x%x, callback_func=*0x%x, user_data=*0x%x, init_param=*0x%x)", ctx_id, container, callback_func, user_data, init_param);
-
-	error_code error = cellSysutilAvc2Load_shared(ctx_id, container, callback_func, user_data, init_param);
-	if (error != CELL_OK)
-		return error;
-
-	return CELL_OK;
-}
-
-error_code cellSysutilAvc2LoadAsync(SceNpMatching2ContextId ctx_id, u32 container, vm::ptr<CellSysutilAvc2Callback> callback_func, vm::ptr<void> user_data, vm::cptr<CellSysutilAvc2InitParam> init_param)
-{
-	cellSysutilAvc2.warning("cellSysutilAvc2LoadAsync(ctx_id=0x%x, container=0x%x, callback_func=*0x%x, user_data=*0x%x, init_param=*0x%x)", ctx_id, container, callback_func, user_data, init_param);
-
-	error_code error = cellSysutilAvc2Load_shared(ctx_id, container, callback_func, user_data, init_param);
-	if (error != CELL_OK)
-		return error;
-
-	auto& settings = g_fxo->get<avc2_settings>();
-	settings.register_cb_call(CELL_AVC2_EVENT_LOAD_SUCCEEDED, 0);
-
+	cellSysutilAvc2.todo("cellSysutilAvc2Load(ctx_id=0x%x, container=0x%x, callback_func=*0x%x, user_data=*0x%x, init_param=*0x%x)", ctx_id, container, callback_func, user_data, init_param);
 	return CELL_OK;
 }
 
 error_code cellSysutilAvc2SetAttribute(vm::cptr<CellSysutilAvc2Attribute> attr)
 {
-	if (!attr)
-	{
-		cellSysutilAvc2.todo("cellSysutilAvc2SetAttribute(attr=*0x%x)", attr);
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-	}
-
-	cellSysutilAvc2.todo("cellSysutilAvc2SetAttribute(%s=%d)", attr->attr_id, attr->attr_param.int_param);
-
-	switch (attr->attr_id)
-	{
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_EVENT_TYPE:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_INTERVAL_TIME:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_SIGNAL_LEVEL:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_MAX_BITRATE:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DATA_FEC:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_PACKET_CONTENTION:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DTX_MODE:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_MIC_STATUS_DETECTION:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_MIC_SETTING_NOTIFICATION:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_MUTING_NOTIFICATION:
-		break;
-	case CELL_SYSUTIL_AVC2_ATTRIBUTE_CAMERA_STATUS_DETECTION:
-		break;
-	default:
-		break;
-	}
-
+	cellSysutilAvc2.todo("cellSysutilAvc2SetAttribute(attr=*0x%x)", attr);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvc2Unload2(u32 mediaType)
-{
-	cellSysutilAvc2.todo("cellSysutilAvc2Unload2(mediaType=0x%x)", mediaType);
-
-	auto& settings = g_fxo->get<avc2_settings>();
-
-	switch (mediaType)
-	{
-	case CELL_SYSUTIL_AVC2_VOICE_CHAT:
-	{
-		std::lock_guard lock(settings.mutex_cb);
-
-		if (!settings.avc2_cb)
-		{
-			return CELL_AVC2_ERROR_NOT_INITIALIZED;
-		}
-
-		// TODO: return error if the video chat is still loaded (probably CELL_AVC2_ERROR_INVALID_STATUS)
-		sysutil_unregister_cb_with_id<avc2_cb_handle_t>();
-		settings.avc2_cb = vm::null;
-		settings.avc2_cb_arg = vm::null;
-		break;
-	}
-	case CELL_SYSUTIL_AVC2_VIDEO_CHAT:
-	{
-		// TODO
-		break;
-	}
-	default:
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-	}
-
-	return CELL_OK;
-}
-
-error_code cellSysutilAvc2UnloadAsync2(u32 mediaType)
+error_code cellSysutilAvc2UnloadAsync2(CellSysutilAvc2MediaType mediaType)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2UnloadAsync2(mediaType=0x%x)", mediaType);
-
-	if (mediaType != CELL_SYSUTIL_AVC2_VOICE_CHAT && mediaType != CELL_SYSUTIL_AVC2_VIDEO_CHAT)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	auto& settings = g_fxo->get<avc2_settings>();
-
-	if (mediaType == CELL_SYSUTIL_AVC2_VOICE_CHAT)
-		settings.register_cb_call(CELL_AVC2_EVENT_UNLOAD_SUCCEEDED, 0);
-	else
-		settings.register_cb_call(CELL_AVC2_EVENT_UNLOAD_SUCCEEDED, 2);
-
 	return CELL_OK;
 }
 
-error_code cellSysutilAvc2StartStreaming2(u32 mediaType)
+error_code cellSysutilAvc2StartStreaming2(CellSysutilAvc2MediaType mediaType)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2StartStreaming2(mediaType=0x%x)", mediaType);
-
-	if (mediaType != CELL_SYSUTIL_AVC2_VOICE_CHAT && mediaType != CELL_SYSUTIL_AVC2_VIDEO_CHAT)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
@@ -1104,11 +439,7 @@ error_code cellSysutilAvc2GetVoiceMuting(vm::ptr<u8> muting)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2GetVoiceMuting(muting=*0x%x)", muting);
 
-	if (!muting)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	const auto& settings = g_fxo->get<avc2_settings>();
-	*muting = settings.voice_muting;
+	*muting = 1;
 
 	return CELL_OK;
 }
@@ -1116,22 +447,18 @@ error_code cellSysutilAvc2GetVoiceMuting(vm::ptr<u8> muting)
 error_code cellSysutilAvc2GetScreenShowStatus(vm::ptr<u8> visible)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2GetScreenShowStatus(visible=*0x%x)", visible);
+	return CELL_OK;
+}
 
-	if (!visible)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
-	*visible = 0;
-
+error_code cellSysutilAvc2Unload2(CellSysutilAvc2MediaType mediaType)
+{
+	cellSysutilAvc2.todo("cellSysutilAvc2Unload2(mediaType=0x%x)", mediaType);
 	return CELL_OK;
 }
 
 error_code cellSysutilAvc2GetWindowPosition(SceNpMatching2RoomMemberId member_id, vm::ptr<f32> x, vm::ptr<f32> y, vm::ptr<f32> z)
 {
 	cellSysutilAvc2.todo("cellSysutilAvc2GetWindowPosition(member_id=0x%x, x=*0x%x, y=*0x%x, z=*0x%x)", member_id, x, y, z);
-
-	if (!x || !y || !z)
-		return CELL_AVC2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.h b/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.h
index c82232302f..911b45f19d 100644
--- a/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.h
+++ b/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.h
@@ -7,220 +7,172 @@
 // Error codes
 enum CellSysutilAvc2Error : u32
 {
-	CELL_AVC2_ERROR_UNKNOWN               = 0x8002b701,
-	CELL_AVC2_ERROR_NOT_SUPPORTED         = 0x8002b702,
-	CELL_AVC2_ERROR_NOT_INITIALIZED       = 0x8002b703,
-	CELL_AVC2_ERROR_ALREADY_INITIALIZED   = 0x8002b704,
-	CELL_AVC2_ERROR_INVALID_ARGUMENT      = 0x8002b705,
-	CELL_AVC2_ERROR_OUT_OF_MEMORY         = 0x8002b706,
-	CELL_AVC2_ERROR_ERROR_BAD_ID          = 0x8002b707,
-	CELL_AVC2_ERROR_INVALID_STATUS        = 0x8002b70a,
-	CELL_AVC2_ERROR_TIMEOUT               = 0x8002b70b,
-	CELL_AVC2_ERROR_NO_SESSION            = 0x8002b70d,
+	CELL_AVC2_ERROR_UNKNOWN = 0x8002b701,
+	CELL_AVC2_ERROR_NOT_SUPPORTED = 0x8002b702,
+	CELL_AVC2_ERROR_NOT_INITIALIZED = 0x8002b703,
+	CELL_AVC2_ERROR_ALREADY_INITIALIZED = 0x8002b704,
+	CELL_AVC2_ERROR_INVALID_ARGUMENT = 0x8002b705,
+	CELL_AVC2_ERROR_OUT_OF_MEMORY = 0x8002b706,
+	CELL_AVC2_ERROR_ERROR_BAD_ID = 0x8002b707,
+	CELL_AVC2_ERROR_INVALID_STATUS = 0x8002b70a,
+	CELL_AVC2_ERROR_TIMEOUT = 0x8002b70b,
+	CELL_AVC2_ERROR_NO_SESSION = 0x8002b70d,
 	CELL_AVC2_ERROR_WINDOW_ALREADY_EXISTS = 0x8002b70f,
-	CELL_AVC2_ERROR_TOO_MANY_WINDOWS      = 0x8002b710,
+	CELL_AVC2_ERROR_TOO_MANY_WINDOWS = 0x8002b710,
 	CELL_AVC2_ERROR_TOO_MANY_PEER_WINDOWS = 0x8002b711,
-	CELL_AVC2_ERROR_WINDOW_NOT_FOUND      = 0x8002b712,
+	CELL_AVC2_ERROR_WINDOW_NOT_FOUND = 0x8002b712,
 };
 
-enum CellSysutilAvc2MediaType : u32
+enum
 {
 	CELL_SYSUTIL_AVC2_VOICE_CHAT = 0x00000001,
 	CELL_SYSUTIL_AVC2_VIDEO_CHAT = 0x00000010,
 };
 
-enum CellSysutilAvc2VoiceQuality : u32
+enum
 {
 	CELL_SYSUTIL_AVC2_VOICE_QUALITY_NORMAL = 0x00000001,
 };
 
-enum CellSysutilAvc2VideoQuality : u32
+enum
 {
 	CELL_SYSUTIL_AVC2_VIDEO_QUALITY_NORMAL = 0x00000001,
 };
 
-enum CellSysutilAvc2FrameMode : u32
+enum
 {
-	CELL_SYSUTIL_AVC2_FRAME_MODE_NORMAL     = 0x00000001,
+	CELL_SYSUTIL_AVC2_FRAME_MODE_NORMAL = 0x00000001,
 	CELL_SYSUTIL_AVC2_FRAME_MODE_INTRA_ONLY = 0x00000002,
 };
 
-enum CellSysutilAvc2CoordinatesForm : u32
+enum
 {
-	CELL_SYSUTIL_AVC2_VIRTUAL_COORDINATES  = 0x00000001,
+	CELL_SYSUTIL_AVC2_VIRTUAL_COORDINATES = 0x00000001,
 	CELL_SYSUTIL_AVC2_ABSOLUTE_COORDINATES = 0x00000002,
 };
 
-enum CellSysutilAvc2VideoResolution : u32
+enum
 {
 	CELL_SYSUTIL_AVC2_VIDEO_RESOLUTION_QQVGA = 0x00000001,
-	CELL_SYSUTIL_AVC2_VIDEO_RESOLUTION_QVGA  = 0x00000002,
+	CELL_SYSUTIL_AVC2_VIDEO_RESOLUTION_QVGA = 0x00000002,
 };
 
-enum CellSysutilAvc2ChatTargetMode : u32
+enum
 {
-	CELL_SYSUTIL_AVC2_CHAT_TARGET_MODE_ROOM    = 0x00000100,
-	CELL_SYSUTIL_AVC2_CHAT_TARGET_MODE_TEAM    = 0x00000200,
+	CELL_SYSUTIL_AVC2_CHAT_TARGET_MODE_ROOM = 0x00000100,
+	CELL_SYSUTIL_AVC2_CHAT_TARGET_MODE_TEAM = 0x00000200,
 	CELL_SYSUTIL_AVC2_CHAT_TARGET_MODE_PRIVATE = 0x00000300,
-	CELL_SYSUTIL_AVC2_CHAT_TARGET_MODE_DIRECT  = 0x00001000,
+	CELL_SYSUTIL_AVC2_CHAT_TARGET_MODE_DIRECT = 0x00001000,
 };
 
-enum CellSysutilAvc2AttributeId : u32
+enum
 {
-	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_EVENT_TYPE    = 0x00001001,
+	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_EVENT_TYPE = 0x00001001,
 	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_INTERVAL_TIME = 0x00001002,
-	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_SIGNAL_LEVEL  = 0x00001003,
-	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_MAX_BITRATE          = 0x00001004,
-	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DATA_FEC             = 0x00001005,
-	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_PACKET_CONTENTION    = 0x00001006,
-	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DTX_MODE             = 0x00001007,
-	CELL_SYSUTIL_AVC2_ATTRIBUTE_MIC_STATUS_DETECTION       = 0x00001008,
-	CELL_SYSUTIL_AVC2_ATTRIBUTE_MIC_SETTING_NOTIFICATION   = 0x00001009,
-	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_MUTING_NOTIFICATION  = 0x0000100A,
-	CELL_SYSUTIL_AVC2_ATTRIBUTE_CAMERA_STATUS_DETECTION    = 0x0000100B,
+	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DETECT_SIGNAL_LEVEL = 0x00001003,
+	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_MAX_BITRATE = 0x00001004,
+	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DATA_FEC = 0x00001005,
+	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_PACKET_CONTENTION = 0x00001006,
+	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_DTX_MODE = 0x00001007,
+	CELL_SYSUTIL_AVC2_ATTRIBUTE_MIC_STATUS_DETECTION = 0x00001008,
+	CELL_SYSUTIL_AVC2_ATTRIBUTE_MIC_SETTING_NOTIFICATION = 0x00001009,
+	CELL_SYSUTIL_AVC2_ATTRIBUTE_VOICE_MUTING_NOTIFICATION = 0x0000100A,
+	CELL_SYSUTIL_AVC2_ATTRIBUTE_CAMERA_STATUS_DETECTION = 0x0000100B,
 };
 
-enum CellSysutilAvc2WindowAttributeId : u32
+enum
 {
-	CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_ALPHA               = 0x00002001,
-	CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_TRANSITION_TYPE     = 0x00002002,
+	CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_ALPHA = 0x00002001,
+	CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_TRANSITION_TYPE = 0x00002002,
 	CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_TRANSITION_DURATION = 0x00002003,
-	CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_STRING_VISIBLE      = 0x00002004,
-	CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_ROTATION            = 0x00002005,
-	CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_ZORDER              = 0x00002006,
-	CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_SURFACE             = 0x00002007,
+	CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_STRING_VISIBLE = 0x00002004,
+	CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_ROTATION = 0x00002005,
+	CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_ZORDER = 0x00002006,
+	CELL_SYSUTIL_AVC2_WINDOW_ATTRIBUTE_SURFACE = 0x00002007,
 };
 
-enum CellSysutilAvc2TransitionType : u32
+enum
 {
-	CELL_SYSUTIL_AVC2_TRANSITION_NONE     = 0xffffffff,
-	CELL_SYSUTIL_AVC2_TRANSITION_LINEAR   = 0x00000000,
+	CELL_SYSUTIL_AVC2_TRANSITION_NONE = 0xffffffff,
+	CELL_SYSUTIL_AVC2_TRANSITION_LINEAR = 0x00000000,
 	CELL_SYSUTIL_AVC2_TRANSITION_SLOWDOWN = 0x00000001,
-	CELL_SYSUTIL_AVC2_TRANSITION_FASTUP   = 0x00000002,
-	CELL_SYSUTIL_AVC2_TRANSITION_ANGULAR  = 0x00000003,
+	CELL_SYSUTIL_AVC2_TRANSITION_FASTUP = 0x00000002,
+	CELL_SYSUTIL_AVC2_TRANSITION_ANGULAR = 0x00000003,
 	CELL_SYSUTIL_AVC2_TRANSITION_EXPONENT = 0x00000004,
 };
 
-enum CellSysutilAvc2WindowZorderMode : u32
+enum
 {
 	CELL_SYSUTIL_AVC2_ZORDER_FORWARD_MOST = 0x00000001,
-	CELL_SYSUTIL_AVC2_ZORDER_BEHIND_MOST  = 0x00000002,
+	CELL_SYSUTIL_AVC2_ZORDER_BEHIND_MOST = 0x00000002,
 };
 
 enum
 {
-	CELL_AVC2_CAMERA_STATUS_DETACHED     = 0,
+	CELL_AVC2_CAMERA_STATUS_DETACHED = 0,
 	CELL_AVC2_CAMERA_STATUS_ATTACHED_OFF = 1,
-	CELL_AVC2_CAMERA_STATUS_ATTACHED_ON  = 2,
-	CELL_AVC2_CAMERA_STATUS_UNKNOWN      = 3,
+	CELL_AVC2_CAMERA_STATUS_ATTACHED_ON = 2,
+	CELL_AVC2_CAMERA_STATUS_UNKNOWN = 3,
 };
 
 enum
 {
-	CELL_AVC2_MIC_STATUS_DETACHED     = 0,
+	CELL_AVC2_MIC_STATUS_DETACHED = 0,
 	CELL_AVC2_MIC_STATUS_ATTACHED_OFF = 1,
-	CELL_AVC2_MIC_STATUS_ATTACHED_ON  = 2,
-	CELL_AVC2_MIC_STATUS_UNKNOWN      = 3,
+	CELL_AVC2_MIC_STATUS_ATTACHED_ON = 2,
+	CELL_AVC2_MIC_STATUS_UNKNOWN = 3,
 };
 
 enum
 {
-	CELL_SYSUTIL_AVC2_STREAMING_MODE_NORMAL     = 0,
-	CELL_SYSUTIL_AVC2_STREAMING_MODE_DIRECT_WAN = 1,
-	CELL_SYSUTIL_AVC2_STREAMING_MODE_DIRECT_LAN = 2,
-};
-
-enum
-{
-	CELL_SYSUTIL_AVC2_VIDEO_SHARING_MODE_DISABLE = 0,
-	CELL_SYSUTIL_AVC2_VIDEO_SHARING_MODE_1       = 1,
-	CELL_SYSUTIL_AVC2_VIDEO_SHARING_MODE_2       = 2,
-	CELL_SYSUTIL_AVC2_VIDEO_SHARING_MODE_3       = 3,
-};
-
-enum
-{
-	CELL_AVC2_EVENT_LOAD_SUCCEEDED   = 0x00000001,
-	CELL_AVC2_EVENT_LOAD_FAILED      = 0x00000002,
+	CELL_AVC2_EVENT_LOAD_SUCCEEDED = 0x00000001,
+	CELL_AVC2_EVENT_LOAD_FAILED = 0x00000002,
 	CELL_AVC2_EVENT_UNLOAD_SUCCEEDED = 0x00000003,
-	CELL_AVC2_EVENT_UNLOAD_FAILED    = 0x00000004,
-	CELL_AVC2_EVENT_JOIN_SUCCEEDED   = 0x00000005,
-	CELL_AVC2_EVENT_JOIN_FAILED      = 0x00000006,
-	CELL_AVC2_EVENT_LEAVE_SUCCEEDED  = 0x00000007,
-	CELL_AVC2_EVENT_LEAVE_FAILED     = 0x00000008,
+	CELL_AVC2_EVENT_UNLOAD_FAILED = 0x00000004,
+	CELL_AVC2_EVENT_JOIN_SUCCEEDED = 0x00000005,
+	CELL_AVC2_EVENT_JOIN_FAILED = 0x00000006,
+	CELL_AVC2_EVENT_LEAVE_SUCCEEDED = 0x00000007,
+	CELL_AVC2_EVENT_LEAVE_FAILED = 0x00000008,
 };
 
-enum
-{
-	CELL_AVC2_EVENT_SYSTEM_NEW_MEMBER_JOINED          = 0x10000001,
-	CELL_AVC2_EVENT_SYSTEM_MEMBER_LEFT                = 0x10000002,
-	CELL_AVC2_EVENT_SYSTEM_SESSION_ESTABLISHED        = 0x10000003,
-	CELL_AVC2_EVENT_SYSTEM_SESSION_CANNOT_ESTABLISHED = 0x10000004,
-	CELL_AVC2_EVENT_SYSTEM_SESSION_DISCONNECTED       = 0x10000005,
-	CELL_AVC2_EVENT_SYSTEM_VOICE_DETECTED             = 0x10000006,
-	CELL_AVC2_EVENT_SYSTEM_MIC_DETECTED               = 0x10000007,
-	CELL_AVC2_EVENT_SYSTEM_CAMERA_DETECTED            = 0x10000008,
-};
-
-enum
-{
-	CELL_AVC2_EVENT_PARAM_ERROR_UNKNOWN                = 0x0000000000000001,
-	CELL_AVC2_EVENT_PARAM_ERROR_NOT_SUPPORTED          = 0x0000000000000002,
-	CELL_AVC2_EVENT_PARAM_ERROR_INVALID_ARGUMENT       = 0x0000000000000003,
-	CELL_AVC2_EVENT_PARAM_ERROR_OUT_OF_MEMORY          = 0x0000000000000004,
-	CELL_AVC2_EVENT_PARAM_ERROR_INVALID_STATUS         = 0x0000000000000005,
-	CELL_AVC2_EVENT_PARAM_ERROR_CONTEXT_DOES_NOT_EXIST = 0x0000000000000006,
-	CELL_AVC2_EVENT_PARAM_ERROR_ROOM_DOES_NOT_EXIST    = 0x0000000000000007,
-	CELL_AVC2_EVENT_PARAM_ERROR_NETWORK_ERROR          = 0x0000000000000008,
-};
-
-enum
-{
-	CELL_AVC2_REQUEST_ID_SYSTEM_EVENT = 0x00000000
-};
-
-enum
-{
-	CELL_SYSUTIL_AVC2_INIT_PARAM_VERSION = 140 // Older versions may be 100, 110, 120, 130
-};
-
-enum
-{
-	AVC2_SPECIAL_ROOM_MEMBER_ID_CUSTOM_VIDEO_WINDOW = 0xfff0
-};
+typedef u32 CellSysutilAvc2AttributeId;
+typedef u32 CellSysutilAvc2WindowAttributeId;
 
 typedef u32 CellSysutilAvc2EventId;
 typedef u64 CellSysutilAvc2EventParam;
 
 using CellSysutilAvc2Callback = void(CellSysutilAvc2EventId event_id, CellSysutilAvc2EventParam event_param, vm::ptr<void> userdata);
 
+typedef u32 CellSysutilAvc2MediaType;
+typedef u32 CellSysutilAvc2VoiceQuality;
+typedef u32 CellSysutilAvc2VideoQuality;
+typedef u32 CellSysutilAvc2FrameMode;
+typedef u32 CellSysutilAvc2VideoResolution;
+typedef u32 CellSysutilAvc2CoordinatesForm;
+
 struct CellSysutilAvc2VoiceInitParam
 {
 	be_t<CellSysutilAvc2VoiceQuality> voice_quality;
 	be_t<u16> max_speakers;
 	u8 mic_out_stream_sharing;
-	u8 reserved[25];
 };
 
 struct CellSysutilAvc2VideoInitParam
 {
-	be_t<u32> video_quality;
-	be_t<u32> frame_mode;
-	be_t<u32> max_video_resolution;
+	be_t<CellSysutilAvc2VideoQuality> video_quality;
+	be_t<CellSysutilAvc2FrameMode> frame_mode;
+	be_t<CellSysutilAvc2VideoResolution> max_video_resolution;
 	be_t<u16> max_video_windows;
 	be_t<u16> max_video_framerate;
 	be_t<u32> max_video_bitrate;
-	be_t<u32> coordinates_form;
+	be_t<CellSysutilAvc2CoordinatesForm> coordinates_form;
 	u8 video_stream_sharing;
-	u8 no_use_camera_device;
-	u8 reserved[6];
 };
 
 struct CellSysutilAvc2StreamingModeParam
 {
 	be_t<u16> mode;
 	be_t<u16> port;
-	u8 reserved[10];
 };
 
 struct CellSysutilAvc2InitParam
@@ -228,16 +180,10 @@ struct CellSysutilAvc2InitParam
 	be_t<u16> avc_init_param_version;
 	be_t<u16> max_players;
 	be_t<u16> spu_load_average;
-	union
-	{
-		be_t<u16> direct_streaming_mode;
-		CellSysutilAvc2StreamingModeParam streaming_mode;
-	};
-	u8 reserved[18];
-	be_t<u32> media_type;
+	CellSysutilAvc2StreamingModeParam streaming_mode;
+	be_t<CellSysutilAvc2MediaType> media_type;
 	CellSysutilAvc2VoiceInitParam voice_param;
 	CellSysutilAvc2VideoInitParam video_param;
-	u8 reserved2[22];
 };
 
 struct CellSysutilAvc2RoomMemberList
@@ -289,14 +235,3 @@ struct CellSysutilAvc2PlayerInfo
 	u8 mic_attached;
 	u8 reserved[11];
 };
-
-struct CellSysutilAvc2StreamingTarget
-{
-	be_t<CellSysutilAvc2ChatTargetMode> target_mode;
-	union
-	{
-		CellSysutilAvc2RoomMemberList room_member_list;
-		SceNpMatching2TeamId team_id;
-		CellSysutilAvc2MemberIpAndPortList ip_and_port_list;
-	};
-};
diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvcExt.cpp b/rpcs3/Emu/Cell/Modules/cellSysutilAvcExt.cpp
index 0e88c96478..8d872a067c 100644
--- a/rpcs3/Emu/Cell/Modules/cellSysutilAvcExt.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSysutilAvcExt.cpp
@@ -1,287 +1,185 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/Modules/cellSysutilAvc.h"
 
 LOG_CHANNEL(cellSysutilAvcExt);
 
-error_code cellSysutilAvcSetAttribute(CellSysUtilAvcAttribute attr_id, vm::ptr<void> param);
-error_code cellSysutilAvcLoadAsync(vm::ptr<CellSysutilAvcCallback> func, vm::ptr<void> userdata, sys_memory_container_t container, CellSysUtilAvcMediaType media, CellSysUtilAvcVideoQuality videoQuality, CellSysUtilAvcVoiceQuality voiceQuality, vm::ptr<CellSysutilAvcRequestId> request_id);
-
-error_code cellSysutilAvcExtIsMicAttached(vm::ptr<s32> status)
+error_code cellSysutilAvcExtIsMicAttached()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtIsMicAttached(status=*0x%x)", status);
-
-	ensure(!!status); // Not actually checked
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
 error_code cellSysutilAvcExtStopCameraDetection()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtStopCameraDetection()");
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtSetWindowRotation(vm::ptr<SceNpId> player_id, f32 rotation_x, f32 rotation_y, f32 rotation_z, CellSysutilAvcTransitionType transition_type)
+error_code cellSysutilAvcExtSetWindowRotation()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtSetWindowRotation(player_id=*0x%x, rotation_x=%f, rotation_y=%f, rotation_z=%f, transition_type=0x%x)", player_id, rotation_x, rotation_y, rotation_z, +transition_type);
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtGetWindowPosition(vm::ptr<SceNpId> player_id, vm::ptr<f32> position_x, vm::ptr<f32> position_y, vm::ptr<f32> position_z)
+error_code cellSysutilAvcExtGetWindowPosition()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtGetWindowPosition(player_id=*0x%x, position_x=*0x%x, position_y=*0x%x, position_z=*0x%x)", player_id, position_x, position_y, position_z);
-
-	if (!player_id || !position_x || !position_y || !position_z)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
 error_code cellSysutilAvcExtSetHideNamePlate()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtSetHideNamePlate()");
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtSetWindowPosition(vm::ptr<SceNpId> player_id, f32 position_x, f32 position_y, f32 position_z, CellSysutilAvcTransitionType transition_type)
+error_code cellSysutilAvcExtSetWindowPosition()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtSetWindowPosition(player_id=*0x%x, position_x=%f, position_y=%f, position_z=%f, transition_type=0x%x)", player_id, position_x, position_y, position_z, +transition_type);
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtGetWindowSize(vm::ptr<SceNpId> player_id, vm::ptr<f32> size_x, vm::ptr<f32> size_y)
+error_code cellSysutilAvcExtGetWindowSize()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtGetWindowSize(player_id=*0x%x, size_x=*0x%x, size_y=*0x%x)", player_id, size_x, size_y);
-
-	if (!player_id || !size_x || !size_y)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
 error_code cellSysutilAvcExtStartCameraDetection()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtStartCameraDetection()");
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtGetWindowShowStatus(vm::ptr<SceNpId> player_id, vm::ptr<b8> is_visible)
+error_code cellSysutilAvcExtGetWindowShowStatus()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtGetWindowShowStatus(player_id=*0x%x, is_visible=*0x%x)", player_id, is_visible);
-
-	if (!player_id || !is_visible)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtSetChatMode(u32 mode)
+error_code cellSysutilAvcExtSetChatMode()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtSetChatMode(mode=0x%x)", mode);
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtGetNamePlateShowStatus(vm::ptr<b8> is_visible)
+error_code cellSysutilAvcExtGetNamePlateShowStatus()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtGetNamePlateShowStatus(is_visible=*0x%x)", is_visible);
-
-	if (!is_visible)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtSetWindowAlpha(vm::ptr<SceNpId> player_id, f32 alpha, CellSysutilAvcTransitionType transition_type)
+error_code cellSysutilAvcExtSetWindowAlpha()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtSetWindowAlpha(player_id=*0x%x, alpha=%f, transition_type=0x%x)", player_id, alpha, +transition_type);
-
-	if (!player_id || transition_type > CELL_SYSUTIL_AVC_TRANSITION_EXPONENT)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtSetWindowSize(vm::ptr<SceNpId> player_id, f32 size_x, f32 size_y, CellSysutilAvcTransitionType transition_type)
+error_code cellSysutilAvcExtSetWindowSize()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtSetWindowSize(player_id=*0x%x, size_x=%f, size_y=%f, transition_type=0x%x)", player_id, size_x, size_y, +transition_type);
-
-	if (!player_id || transition_type > CELL_SYSUTIL_AVC_TRANSITION_EXPONENT)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtShowPanelEx(CellSysutilAvcTransitionType transition_type)
+error_code cellSysutilAvcExtShowPanelEx()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtShowPanelEx(transition_type=0x%x)", +transition_type);
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtLoadAsyncEx(vm::ptr<CellSysutilAvcCallback> func, vm::ptr<void> userdata, sys_memory_container_t container,
-	CellSysUtilAvcMediaType media, CellSysUtilAvcVideoQuality videoQuality, CellSysUtilAvcVoiceQuality voiceQuality, vm::ptr<CellSysutilAvcOptionParam> option, vm::ptr<CellSysutilAvcRequestId> request_id)
+error_code cellSysutilAvcExtLoadAsyncEx()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtLoadAsyncEx(func=*0x%x, userdata=*0x%x, container=0x%x, media=0x%x, videoQuality=0x%x, voiceQuality=0x%x, option=*0x%x, request_id=*0x%x)",
-		func, userdata, container, +media, +videoQuality, +voiceQuality, option, request_id);
-
-	if (!option)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
-	switch (option->avcOptionParamVersion)
-	{
-	case CELL_SYSUTIL_AVC_OPTION_PARAM_VERSION:
-		if (option->sharingVideoBuffer && media == CELL_SYSUTIL_AVC_VOICE_CHAT)
-			return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
-		//cellSysutilAvcSetAttribute(0x10000100, &option->sharingVideoBuffer);
-		break;
-	case 180:
-		if (option->sharingVideoBuffer && media == CELL_SYSUTIL_AVC_VOICE_CHAT)
-			return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
-		//cellSysutilAvcSetAttribute(0x10000100, &option->sharingVideoBuffer);
-		//cellSysutilAvcSetAttribute(0x10000102, &option->maxPlayers);
-		break;
-	default:
-		return CELL_AVC_ERROR_UNKNOWN;
-	}
-
-	return cellSysutilAvcLoadAsync(func, userdata, container, media, videoQuality, voiceQuality, request_id);
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
+	return CELL_OK;
 }
 
 error_code cellSysutilAvcExtSetShowNamePlate()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtSetShowNamePlate()");
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
 error_code cellSysutilAvcExtStopVoiceDetection()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtStopVoiceDetection()");
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtShowWindow(vm::ptr<SceNpId> player_id, CellSysutilAvcTransitionType transition_type)
+error_code cellSysutilAvcExtShowWindow()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtStopVoiceDetection(player_id=*0x%x, transition_type=0x%x)", player_id, +transition_type);
-
-	if (!player_id || transition_type > CELL_SYSUTIL_AVC_TRANSITION_EXPONENT)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtIsCameraAttached(vm::ptr<s32> status)
+error_code cellSysutilAvcExtIsCameraAttached()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtIsCameraAttached(status=*0x%x)", status);
-
-	ensure(!!status); // Not actually checked
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtHidePanelEx(CellSysutilAvcTransitionType transition_type)
+error_code cellSysutilAvcExtHidePanelEx()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtHidePanelEx(transition_type=0x%x)", +transition_type);
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtHideWindow(vm::ptr<SceNpId> player_id, CellSysutilAvcTransitionType transition_type)
+error_code cellSysutilAvcExtHideWindow()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtHideWindow(player_id=*0x%x, transition_type=0x%x)", player_id, +transition_type);
-
-	if (!player_id || transition_type > CELL_SYSUTIL_AVC_TRANSITION_EXPONENT)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
 error_code cellSysutilAvcExtSetChatGroup()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtSetChatGroup()");
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtGetWindowRotation(vm::ptr<SceNpId> player_id, vm::ptr<f32> rotation_x, vm::ptr<f32> rotation_y, vm::ptr<f32> rotation_z)
+error_code cellSysutilAvcExtGetWindowRotation()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtGetWindowRotation(player_id=*0x%x, rotation_x=*0x%x, rotation_y=*0x%x, rotation_z=*0x%x)", player_id, rotation_x, rotation_y, rotation_z);
-
-	if (!player_id || !rotation_x || !rotation_y || !rotation_z)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
 error_code cellSysutilAvcExtStartMicDetection()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtStartMicDetection()");
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtGetWindowAlpha(vm::ptr<SceNpId> player_id, vm::ptr<f32> alpha)
+error_code cellSysutilAvcExtGetWindowAlpha()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtGetWindowAlpha(player_id=*0x%x, alpha=*0x%x)", player_id, alpha);
-
-	if (!player_id || !alpha)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
 error_code cellSysutilAvcExtStartVoiceDetection()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtStartVoiceDetection()");
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtGetSurfacePointer(vm::ptr<SceNpId> player_id, vm::pptr<void> surface_ptr, vm::ptr<s32> surface_size, vm::ptr<s32> surface_size_x, vm::ptr<s32> surface_size_y)
+error_code cellSysutilAvcExtGetSurfacePointer()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtGetSurfacePointer(player_id=*0x%x, surface_ptr=*0x%x, surface_size=*0x%x, surface_size_x=*0x%x, surface_size_y=*0x%x)", player_id, surface_ptr, surface_size, surface_size_x, surface_size_y);
-
-	if (!player_id || !surface_ptr || !surface_size || !surface_size_x || !surface_size_y)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
 error_code cellSysutilAvcExtStopMicDetection()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtStopMicDetection()");
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtInitOptionParam(s32 avcOptionParamVersion, vm::ptr<CellSysutilAvcOptionParam> option)
+error_code cellSysutilAvcExtInitOptionParam()
 {
-	cellSysutilAvcExt.notice("cellSysutilAvcExtInitOptionParam(avcOptionParamVersion=0x%x, option=*0x%x)", avcOptionParamVersion, option);
-
-	if (!option)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
-	option->avcOptionParamVersion = avcOptionParamVersion;
-
-	switch (option->avcOptionParamVersion)
-	{
-	case CELL_SYSUTIL_AVC_OPTION_PARAM_VERSION:
-		break;
-	case 180:
-		option->maxPlayers = 16;
-		break;
-	default:
-		return CELL_AVC_ERROR_UNKNOWN;
-	}
-
-	option->sharingVideoBuffer = false;
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
-error_code cellSysutilAvcExtSetWindowZorder(vm::ptr<SceNpId> player_id,	u32 zorder)
+error_code cellSysutilAvcExtSetWindowZorder()
 {
-	cellSysutilAvcExt.todo("cellSysutilAvcExtSetWindowZorder(player_id=*0x%x, zorder=0x%x)", player_id, zorder);
-
-	if (!player_id || zorder < CELL_SYSUTIL_AVC_ZORDER_FORWARD_MOST || zorder > CELL_SYSUTIL_AVC_ZORDER_BEHIND_MOST)
-		return CELL_AVC_ERROR_INVALID_ARGUMENT;
-
+	UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp b/rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp
index 1676ef7cfc..d2210dc11d 100644
--- a/rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp
@@ -1,96 +1,74 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 #include "cellSysutil.h"
-#include "sceNp.h"
-#include "Emu/IdManager.h"
 
 LOG_CHANNEL(cellSysutilNpEula);
 
-enum SceNpEulaStatus
+struct sceNpEulaStructUnk0
 {
-	SCE_NP_EULA_UNKNOWN          = 0,
-	SCE_NP_EULA_ACCEPTED         = 1,
-	SCE_NP_EULA_ALREADY_ACCEPTED = 2,
-	SCE_NP_EULA_REJECTED         = 3,
-	SCE_NP_EULA_ABORTED          = 4,
-	SCE_NP_EULA_ERROR            = 5,
+	char buf[0xc];
 };
 
-using SceNpEulaVersion = u32;
-using SceNpEulaCheckEulaStatusCallback = void(SceNpEulaStatus status, u32 errorCode, SceNpEulaVersion version, vm::ptr<void> arg);
-
-struct sceNpEulaCallbacksRegistered
+// All error codes are unknown at this point in implementation and just guesses
+enum cellSysutilNpEulaError : u32
 {
-	atomic_t<SceNpEulaStatus> status = SCE_NP_EULA_UNKNOWN;
-	atomic_t<bool> sceNpEulaCheckEulaStatus_callback_registered = false;
-	atomic_t<bool> sceNpEulaShowCurrentEula_callback_registered = false;
+	CELL_SYSUTIL_NP_EULA_NOT_INIT      = 0x8002E500,
+	CELL_SYSUTIL_NP_EULA_INVALID_PARAM = 0x8002E501,
+	CELL_SYSUTIL_NP_EULA_UNKNOWN_502   = 0x8002E502,
+	CELL_SYSUTIL_NP_EULA_UNKNOWN_503   = 0x8002E503,
 };
 
-error_code sceNpEulaCheckEulaStatus(vm::cptr<SceNpCommunicationId> communicationId, u32 arg2, u64 arg3, vm::ptr<SceNpEulaCheckEulaStatusCallback> cbFunc, vm::ptr<void> cbFuncArg)
+template<>
+void fmt_class_string<cellSysutilNpEulaError>::format(std::string& out, u64 arg)
 {
-	cellSysutilNpEula.warning("sceNpEulaCheckEulaStatus(communicationId=*0x%x, arg2=0x%x, arg3=0x%x, cbFunc=*0x%x, cbFuncArg=*0x%x)", communicationId, arg2, arg3, cbFunc, cbFuncArg);
-
-	if (!communicationId || !cbFunc)
+	format_enum(out, arg, [](auto error)
 	{
-		return SCE_NP_EULA_ERROR_INVALID_ARGUMENT;
-	}
+		switch (error)
+		{
+			STR_CASE(CELL_SYSUTIL_NP_EULA_NOT_INIT);
+			STR_CASE(CELL_SYSUTIL_NP_EULA_INVALID_PARAM);
+			STR_CASE(CELL_SYSUTIL_NP_EULA_UNKNOWN_502);
+			STR_CASE(CELL_SYSUTIL_NP_EULA_UNKNOWN_503);
+		}
 
-	auto& cb_infos = g_fxo->get<sceNpEulaCallbacksRegistered>();
-
-	if (cb_infos.sceNpEulaCheckEulaStatus_callback_registered || cb_infos.sceNpEulaShowCurrentEula_callback_registered)
-	{
-		return SCE_NP_EULA_ERROR_ALREADY_INITIALIZED;
-	}
-
-	cb_infos.sceNpEulaCheckEulaStatus_callback_registered = true;
-	cb_infos.status = SCE_NP_EULA_ALREADY_ACCEPTED;
-
-	sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
-	{
-		auto& cb_infos = g_fxo->get<sceNpEulaCallbacksRegistered>();
-		cbFunc(cb_ppu, cb_infos.status, CELL_OK, 1, cbFuncArg);
-		cb_infos.sceNpEulaCheckEulaStatus_callback_registered = false;
-		return 0;
+		return unknown;
 	});
+}
+
+// Seen on: Resistance 3, Uncharted 2
+error_code sceNpEulaCheckEulaStatus(vm::ptr<sceNpEulaStructUnk0> arg1, u32 arg2, u64 arg3, u32 arg4, vm::ptr<CellSysutilCallback> callback1)
+{
+	cellSysutilNpEula.todo("sceNpEulaCheckEulaStatus(arg1=*0x%x, arg2=0x%x, arg3=0x%x, arg4=0x%x, callback1=*0x%x)", arg1, arg2, arg3, arg4, callback1);
+
+	if (!arg1)
+		return CELL_SYSUTIL_NP_EULA_INVALID_PARAM;
+
+	if (arg4 == 0)
+		return CELL_SYSUTIL_NP_EULA_INVALID_PARAM;
 
 	return CELL_OK;
 }
 
+// Seen on: Resistance 3
 error_code sceNpEulaAbort()
 {
-	cellSysutilNpEula.warning("sceNpEulaAbort()");
+	cellSysutilNpEula.todo("sceNpEulaAbort()");
 
-	auto& cb_infos = g_fxo->get<sceNpEulaCallbacksRegistered>();
-
-	if (!cb_infos.sceNpEulaCheckEulaStatus_callback_registered && !cb_infos.sceNpEulaShowCurrentEula_callback_registered)
-	{
-		return SCE_NP_EULA_ERROR_NOT_INITIALIZED;
-	}
-
-	// It would forcefully abort the dialog/process of getting the eula but since we don't show the dialog, just alter the status returned
-	cb_infos.status = SCE_NP_EULA_ABORTED;
+	// Can return CELL_SYSUTIL_NP_EULA_NOT_INIT
 
 	return CELL_OK;
 }
 
 // Seen on: Resistance 3, Uncharted 2
-error_code sceNpEulaShowCurrentEula(vm::cptr<SceNpCommunicationId> communicationId, u64 arg2, vm::ptr<CellSysutilCallback> cbFunc, vm::ptr<void> cbFuncArg)
+error_code sceNpEulaShowCurrentEula(vm::ptr<sceNpEulaStructUnk0> arg1, u64 arg2, vm::ptr<CellSysutilCallback> callback1, vm::ptr<CellSysutilCallback> callback2)
 {
-	cellSysutilNpEula.todo("sceNpEulaShowCurrentEula(communicationId=*0x%x, arg2=0x%x, cbFunc=*0x%x, cbFuncArg=*0x%x)", communicationId, arg2, cbFunc, cbFuncArg);
+	cellSysutilNpEula.todo("sceNpEulaShowCurrentEula(arg1=*0x%x, arg2=0x%x, callback1=*0x%x, callback2=*0x%x)", arg1, arg2, callback1, callback2);
 
-	if (!communicationId || !cbFunc)
-	{
-		return SCE_NP_EULA_ERROR_INVALID_ARGUMENT;
-	}
+	if (!arg1)
+		return CELL_SYSUTIL_NP_EULA_INVALID_PARAM;
 
-	auto& cb_infos = g_fxo->get<sceNpEulaCallbacksRegistered>();
-
-	if (cb_infos.sceNpEulaCheckEulaStatus_callback_registered || cb_infos.sceNpEulaShowCurrentEula_callback_registered)
-	{
-		return SCE_NP_EULA_ERROR_ALREADY_INITIALIZED;
-	}
-
-	// Call callback (Unknown parameters)
+	if (!callback1)
+		return CELL_SYSUTIL_NP_EULA_INVALID_PARAM;
 
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp b/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp
index 1f5e9ad530..960db3b912 100644
--- a/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp
@@ -4,8 +4,6 @@
 #include "Emu/VFS.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
-
-#include "Emu/RSX/Overlays/overlay_manager.h"
 #include "Emu/RSX/Overlays/overlay_user_list_dialog.h"
 
 #include "cellUserInfo.h"
@@ -159,12 +157,6 @@ error_code cellUserInfoSelectUser_ListType(vm::ptr<CellUserInfoTypeSet> listType
 			return CELL_USERINFO_ERROR_BUSY;
 		}
 
-		if (s32 ret = sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_BEGIN, 0); ret < 0)
-		{
-			g_fxo->get<user_info_manager>().dialog_opened = false;
-			return CELL_USERINFO_ERROR_BUSY;
-		}
-
 		const std::string title = listType->title.get_ptr();
 		const u32 focused = listType->focus;
 
@@ -186,10 +178,6 @@ error_code cellUserInfoSelectUser_ListType(vm::ptr<CellUserInfoTypeSet> listType
 
 			cellUserInfo.warning("cellUserInfoSelectUser_ListType: callback_result=%s, selected_user_id=%d, selected_username='%s'", callback_result, selected_user_id, selected_username);
 
-			g_fxo->get<user_info_manager>().dialog_opened = false;
-
-			sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_END, 0);
-
 			sysutil_register_cb([=](ppu_thread& ppu) -> s32
 			{
 				vm::var<CellUserInfoUserStat> selectUser;
@@ -201,6 +189,8 @@ error_code cellUserInfoSelectUser_ListType(vm::ptr<CellUserInfoTypeSet> listType
 				funcSelect(ppu, callback_result, selectUser, userdata);
 				return CELL_OK;
 			});
+
+			g_fxo->get<user_info_manager>().dialog_opened = false;
 		});
 
 		return result;
@@ -255,7 +245,7 @@ error_code cellUserInfoSelectUser_SetList(vm::ptr<CellUserInfoListSet> setList,
 			funcSelect(ppu, CELL_USERINFO_ERROR_NOUSER, selectUser, userdata);
 			return CELL_OK;
 		});
-
+		
 		return CELL_OK;
 	}
 
@@ -268,12 +258,6 @@ error_code cellUserInfoSelectUser_SetList(vm::ptr<CellUserInfoListSet> setList,
 			return CELL_USERINFO_ERROR_BUSY;
 		}
 
-		if (s32 ret = sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_BEGIN, 0); ret < 0)
-		{
-			g_fxo->get<user_info_manager>().dialog_opened = false;
-			return CELL_USERINFO_ERROR_BUSY;
-		}
-
 		const std::string title = setList->title.get_ptr();
 		const u32 focused = setList->focus;
 
@@ -295,10 +279,6 @@ error_code cellUserInfoSelectUser_SetList(vm::ptr<CellUserInfoListSet> setList,
 
 			cellUserInfo.warning("cellUserInfoSelectUser_SetList: callback_result=%s, selected_user_id=%d, selected_username='%s'", callback_result, selected_user_id, selected_username);
 
-			g_fxo->get<user_info_manager>().dialog_opened = false;
-
-			sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_END, 0);
-
 			sysutil_register_cb([=](ppu_thread& ppu) -> s32
 			{
 				vm::var<CellUserInfoUserStat> selectUser;
@@ -310,6 +290,8 @@ error_code cellUserInfoSelectUser_SetList(vm::ptr<CellUserInfoListSet> setList,
 				funcSelect(ppu, callback_result, selectUser, userdata);
 				return CELL_OK;
 			});
+
+			g_fxo->get<user_info_manager>().dialog_opened = false;
 		});
 
 		return result;
diff --git a/rpcs3/Emu/Cell/Modules/cellVdec.cpp b/rpcs3/Emu/Cell/Modules/cellVdec.cpp
index 84bb74ad28..7c3c171b58 100644
--- a/rpcs3/Emu/Cell/Modules/cellVdec.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellVdec.cpp
@@ -5,9 +5,7 @@
 #include "Emu/Cell/lv2/sys_sync.h"
 #include "Emu/Cell/lv2/sys_ppu_thread.h"
 #include "Emu/Cell/lv2/sys_process.h"
-#include "Emu/savestate_utils.hpp"
 #include "sysPrxForUser.h"
-#include "util/media_utils.h"
 
 #ifdef _MSC_VER
 #pragma warning(push, 0)
@@ -63,82 +61,15 @@ void fmt_class_string<CellVdecError>::format(std::string& out, u64 arg)
 	});
 }
 
-// The general sequence control flow has these possible transitions:
-// closed -> dormant
-// dormant -> ready
-// dormant -> closed
-// ready -> ending
-// ready -> resetting
-// ready -> closed
-// ending -> dormant
-// resetting -> ready
-enum class sequence_state : u32
-{
-	closed    = 0, // Also called non-existent. Needs to be opened before anything can be done with it.
-	dormant   = 1, // Waiting for the next sequence. The last picture and pic-item can be aqcuired in this state.
-	ready     = 2, // Ready for decoding. Can also restart sequences in this state.
-	ending    = 3, // Ending a sequence. Goes to dormant afterwards.
-	resetting = 4, // Stops the current sequence and starts a new one. The pictures of the old sequence are flushed
-	invalid   = 5, // Any other value is invalid
-};
+vm::gvar<s32> _cell_vdec_prx_ver; // ???
 
-template<>
-void fmt_class_string<sequence_state>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto error)
-	{
-		switch (error)
-		{
-			STR_CASE(sequence_state::closed);
-			STR_CASE(sequence_state::dormant);
-			STR_CASE(sequence_state::ready);
-			STR_CASE(sequence_state::ending);
-			STR_CASE(sequence_state::resetting);
-			STR_CASE(sequence_state::invalid);
-		}
-
-		return unknown;
-	});
-}
-
-vm::gvar<s32> _cell_vdec_prx_ver; // TODO: this should probably specify the VDEC module that was loaded. E.g. CELL_SYSMODULE_VDEC_MPEG2
-
-enum class vdec_cmd_type : u32
-{
-	start_sequence,
-	end_sequence,
-	close,
-	au_decode,
-	framerate,
-};
+constexpr struct vdec_start_seq_t{} vdec_start_seq{};
+constexpr struct vdec_close_t{} vdec_close{};
 
 struct vdec_cmd
 {
-	explicit vdec_cmd(vdec_cmd_type _type, u64 _seq_id, u64 _id)
-		: type(_type), seq_id(_seq_id), id(_id)
-	{
-		ensure(_type != vdec_cmd_type::au_decode);
-		ensure(_type != vdec_cmd_type::framerate);
-	}
-
-	explicit vdec_cmd(vdec_cmd_type _type, u64 _seq_id, u64 _id, s32 _mode, CellVdecAuInfo _au)
-		: type(_type), seq_id(_seq_id), id(_id), mode(_mode), au(std::move(_au))
-	{
-		ensure(_type == vdec_cmd_type::au_decode);
-	}
-
-	explicit vdec_cmd(vdec_cmd_type _type, u64 _seq_id, u64 _id, s32 _framerate)
-		: type(_type), seq_id(_seq_id), id(_id), framerate(_framerate)
-	{
-		ensure(_type == vdec_cmd_type::framerate);
-	}
-
-	vdec_cmd_type type{};
-	u64 seq_id{};
-	u64 id{};
-	s32 mode{};
-	s32 framerate{};
-	CellVdecAuInfo au{};
+	s32 mode;
+	CellVdecAuInfo au;
 };
 
 struct vdec_frame
@@ -152,16 +83,12 @@ struct vdec_frame
 		}
 	};
 
-	u64 seq_id{};
-	u64 cmd_id{};
-
 	std::unique_ptr<AVFrame, frame_dtor> avf;
 	u64 dts{};
 	u64 pts{};
 	u64 userdata{};
 	u32 frc{};
-	bool pic_item_received = false;
-	CellVdecPicAttr attr = CELL_VDEC_PICITEM_ATTR_NORMAL;
+	bool PicItemRecieved = false;
 
 	AVFrame* operator ->() const
 	{
@@ -174,18 +101,8 @@ struct vdec_context final
 	static const u32 id_base = 0xf0000000;
 	static const u32 id_step = 0x00000100;
 	static const u32 id_count = 1024;
-	SAVESTATE_INIT_POS(24);
 
-	u32 handle = 0;
-
-	atomic_t<u64> seq_id = 0; // The first sequence will have the ID 1
-	atomic_t<u64> next_cmd_id = 0;
-	atomic_t<bool> abort_decode = false; // Used for thread interaction
-	atomic_t<bool> is_running = false;   // Used for thread interaction
-	atomic_t<sequence_state> seq_state = sequence_state::closed;
-
-	const AVCodec* codec{};
-	const AVCodecDescriptor* codec_desc{};
+	AVCodec* codec{};
 	AVCodecContext* ctx{};
 	SwsContext* sws{};
 
@@ -203,12 +120,12 @@ struct vdec_context final
 	u64 next_dts{};
 	atomic_t<u32> ppu_tid{};
 
-	std::deque<vdec_frame> out_queue;
-	const u32 out_max = 60;
+	std::deque<vdec_frame> out;
+	atomic_t<u32> out_max = 60;
 
-	atomic_t<s32> au_count{0};
+	atomic_t<u32> au_count{0};
 
-	lf_queue<vdec_cmd> in_cmd;
+	lf_queue<std::variant<vdec_start_seq_t, vdec_close_t, vdec_cmd, CellVdecFrameRate>> in_cmd;
 
 	AVRational log_time_base{}; // Used to reduce log spam
 
@@ -219,6 +136,21 @@ struct vdec_context final
 		, cb_func(func)
 		, cb_arg(arg)
 	{
+#ifdef _MSC_VER
+#pragma warning(push, 0)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+		// TODO: This function should be removed at some point, since ffmpeg does it automatically now.
+		//       We'll keep it for compatibility for now until more system ffmpeg libs are up to date.
+		avcodec_register_all();
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
+
 		switch (type)
 		{
 		case CELL_VDEC_CODEC_TYPE_MPEG2:
@@ -247,13 +179,6 @@ struct vdec_context final
 			fmt::throw_exception("avcodec_find_decoder() failed (type=0x%x)", type);
 		}
 
-		codec_desc = avcodec_descriptor_get(codec->id);
-
-		if (!codec_desc)
-		{
-			fmt::throw_exception("avcodec_descriptor_get() failed (type=0x%x)", type);
-		}
-
 		ctx = avcodec_alloc_context3(codec);
 
 		if (!ctx)
@@ -261,7 +186,8 @@ struct vdec_context final
 			fmt::throw_exception("avcodec_alloc_context3() failed (type=0x%x)", type);
 		}
 
-		AVDictionary* opts = nullptr;
+		AVDictionary* opts{};
+		av_dict_set(&opts, "refcounted_frames", "1", 0);
 
 		std::lock_guard lock(g_mutex_avcodec_open2);
 
@@ -269,25 +195,13 @@ struct vdec_context final
 		if (err || opts)
 		{
 			avcodec_free_context(&ctx);
-			std::string dict_content;
-			if (opts)
-			{
-				AVDictionaryEntry* tag = nullptr;
-				while ((tag = av_dict_get(opts, "", tag, AV_DICT_IGNORE_SUFFIX)))
-				{
-					fmt::append(dict_content, "['%s': '%s']", tag->key, tag->value);
-				}
-			}
-			fmt::throw_exception("avcodec_open2() failed (err=0x%x='%s', opts=%s)", err, utils::av_error_to_string(err), dict_content);
+			fmt::throw_exception("avcodec_open2() failed (err=0x%x, opts=%d)", err, opts ? 1 : 0);
 		}
-
-		av_dict_free(&opts);
-
-		seq_state = sequence_state::dormant;
 	}
 
 	~vdec_context()
 	{
+		avcodec_close(ctx);
 		avcodec_free_context(&ctx);
 		sws_freeContext(sws);
 	}
@@ -298,7 +212,7 @@ struct vdec_context final
 
 		ppu_tid.release(ppu.id);
 
-		for (auto slice = in_cmd.pop_all(); thread_ctrl::state() != thread_state::aborting; [&]
+		for (auto slice = in_cmd.pop_all();; [&]
 		{
 			if (slice)
 			{
@@ -310,150 +224,120 @@ struct vdec_context final
 				return;
 			}
 
-			thread_ctrl::wait_on(in_cmd);
+			thread_ctrl::wait_on(in_cmd, nullptr);
 			slice = in_cmd.pop_all(); // Pop new command list
 		}())
 		{
 			// pcmd can be nullptr
-			auto* cmd = slice.get();
+			auto* pcmd = slice.get();
 
-			if (!cmd)
+			if (thread_ctrl::state() == thread_state::aborting)
 			{
-				continue;
+				break;
 			}
-
-			switch (cmd->type)
+			else if (std::get_if<vdec_start_seq_t>(pcmd))
 			{
-			case vdec_cmd_type::start_sequence:
-			{
-				std::lock_guard lock{mutex};
-
-				if (seq_state == sequence_state::resetting)
-				{
-					cellVdec.trace("Reset sequence... (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, cmd->seq_id, cmd->id);
-				}
-				else
-				{
-					cellVdec.trace("Start sequence... (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, cmd->seq_id, cmd->id);
-				}
-
 				avcodec_flush_buffers(ctx);
 
-				out_queue.clear(); // Flush image queue
 				log_time_base = {};
 
 				frc_set = 0; // TODO: ???
 				next_pts = 0;
 				next_dts = 0;
-
-				abort_decode = false;
-				is_running = true;
-				break;
+				cellVdec.trace("Start sequence...");
 			}
-			case vdec_cmd_type::end_sequence:
-			{
-				cellVdec.trace("End sequence... (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, cmd->seq_id, cmd->id);
-
-				{
-					std::lock_guard lock{mutex};
-					seq_state = sequence_state::dormant;
-				}
-
-				cellVdec.trace("Sending CELL_VDEC_MSG_TYPE_SEQDONE (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, cmd->seq_id, cmd->id);
-				cb_func(ppu, vid, CELL_VDEC_MSG_TYPE_SEQDONE, CELL_OK, cb_arg);
-				lv2_obj::sleep(ppu);
-				break;
-			}
-			case vdec_cmd_type::au_decode:
+			else if (auto* cmd = std::get_if<vdec_cmd>(pcmd))
 			{
 				AVPacket packet{};
 				packet.pos = -1;
 
 				u64 au_usrd{};
 
-				const u32 au_mode = cmd->mode;
-				const u32 au_addr = cmd->au.startAddr;
-				const u32 au_size = cmd->au.size;
-				const u64 au_pts = u64{cmd->au.pts.upper} << 32 | cmd->au.pts.lower;
-				const u64 au_dts = u64{cmd->au.dts.upper} << 32 | cmd->au.dts.lower;
-				au_usrd = cmd->au.userData;
-
-				packet.data = vm::_ptr<u8>(au_addr);
-				packet.size = au_size;
-				packet.pts = au_pts != umax ? au_pts : s64{smin};
-				packet.dts = au_dts != umax ? au_dts : s64{smin};
-
-				if (next_pts == 0 && au_pts != umax)
+				if (cmd->mode != -1)
 				{
-					next_pts = au_pts;
+					const u32 au_mode = cmd->mode;
+					const u32 au_addr = cmd->au.startAddr;
+					const u32 au_size = cmd->au.size;
+					const u64 au_pts = u64{cmd->au.pts.upper} << 32 | cmd->au.pts.lower;
+					const u64 au_dts = u64{cmd->au.dts.upper} << 32 | cmd->au.dts.lower;
+					au_usrd = cmd->au.userData;
+
+					packet.data = vm::_ptr<u8>(au_addr);
+					packet.size = au_size;
+					packet.pts = au_pts != umax ? au_pts : s64{smin};
+					packet.dts = au_dts != umax ? au_dts : s64{smin};
+
+					if (next_pts == 0 && au_pts != umax)
+					{
+						next_pts = au_pts;
+					}
+
+					if (next_dts == 0 && au_dts != umax)
+					{
+						next_dts = au_dts;
+					}
+
+					ctx->skip_frame =
+						au_mode == CELL_VDEC_DEC_MODE_NORMAL ? AVDISCARD_DEFAULT :
+						au_mode == CELL_VDEC_DEC_MODE_B_SKIP ? AVDISCARD_NONREF : AVDISCARD_NONINTRA;
+
+					cellVdec.trace("AU decoding: size=0x%x, pts=0x%llx, dts=0x%llx, userdata=0x%llx", au_size, au_pts, au_dts, au_usrd);
+				}
+				else
+				{
+					packet.pts = smin;
+					packet.dts = smin;
+					cellVdec.trace("End sequence...");
 				}
 
-				if (next_dts == 0 && au_dts != umax)
+				while (out_max)
 				{
-					next_dts = au_dts;
-				}
-
-				const CellVdecPicAttr attr = au_mode == CELL_VDEC_DEC_MODE_NORMAL ? CELL_VDEC_PICITEM_ATTR_NORMAL : CELL_VDEC_PICITEM_ATTR_SKIPPED;
-
-				ctx->skip_frame =
-					au_mode == CELL_VDEC_DEC_MODE_NORMAL ? AVDISCARD_DEFAULT :
-					au_mode == CELL_VDEC_DEC_MODE_B_SKIP ? AVDISCARD_NONREF : AVDISCARD_NONINTRA;
-
-				std::deque<vdec_frame> decoded_frames;
-
-				if (!abort_decode && seq_id == cmd->seq_id)
-				{
-					cellVdec.trace("AU decoding: handle=0x%x, seq_id=%d, cmd_id=%d, size=0x%x, pts=0x%llx, dts=0x%llx, userdata=0x%llx", handle, cmd->seq_id, cmd->id, au_size, au_pts, au_dts, au_usrd);
+					if (cmd->mode == -1)
+					{
+						break;
+					}
 
 					if (int ret = avcodec_send_packet(ctx, &packet); ret < 0)
 					{
-						fmt::throw_exception("AU queuing error (handle=0x%x, seq_id=%d, cmd_id=%d, error=0x%x): %s", handle, cmd->seq_id, cmd->id, ret, utils::av_error_to_string(ret));
+						char av_error[AV_ERROR_MAX_STRING_SIZE];
+						av_make_error_string(av_error, AV_ERROR_MAX_STRING_SIZE, ret);
+						fmt::throw_exception("AU queuing error(0x%x): %s", ret, av_error);
 					}
 
-					while (!abort_decode && seq_id == cmd->seq_id)
+					while (true)
 					{
 						// Keep receiving frames
 						vdec_frame frame;
-						frame.seq_id = cmd->seq_id;
-						frame.cmd_id = cmd->id;
 						frame.avf.reset(av_frame_alloc());
 
 						if (!frame.avf)
 						{
-							fmt::throw_exception("av_frame_alloc() failed (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, cmd->seq_id, cmd->id);
+							fmt::throw_exception("av_frame_alloc() failed");
 						}
 
 						if (int ret = avcodec_receive_frame(ctx, frame.avf.get()); ret < 0)
 						{
-							if (ret == AVERROR(EAGAIN) || ret == AVERROR(EOF))
+							if (ret == AVERROR(EAGAIN))
 							{
 								break;
 							}
-
-							fmt::throw_exception("AU decoding error (handle=0x%x, seq_id=%d, cmd_id=%d, error=0x%x): %s", handle, cmd->seq_id, cmd->id, ret, utils::av_error_to_string(ret));
+							else
+							{
+								char av_error[AV_ERROR_MAX_STRING_SIZE];
+								av_make_error_string(av_error, AV_ERROR_MAX_STRING_SIZE, ret);
+								fmt::throw_exception("AU decoding error(0x%x): %s", ret, av_error);
+							}
 						}
 
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
-						const int ticks_per_frame = ctx->ticks_per_frame;
-#else
-						const int ticks_per_frame = (codec_desc->props & AV_CODEC_PROP_FIELDS) ? 2 : 1;
-#endif
-
-#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(58, 29, 100)
-						const bool is_interlaced = frame->interlaced_frame != 0;
-#else
-						const bool is_interlaced = !!(frame->flags & AV_FRAME_FLAG_INTERLACED);
-#endif
-
-						if (is_interlaced)
+						if (frame->interlaced_frame)
 						{
 							// NPEB01838, NPUB31260
-							cellVdec.todo("Interlaced frames not supported (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, cmd->seq_id, cmd->id);
+							cellVdec.todo("Interlaced frames not supported (0x%x)", frame->interlaced_frame);
 						}
 
 						if (frame->repeat_pict)
 						{
-							fmt::throw_exception("Repeated frames not supported (handle=0x%x, seq_id=%d, cmd_id=%d, repear_pict=0x%x)", handle, cmd->seq_id, cmd->id, frame->repeat_pict);
+							fmt::throw_exception("Repeated frames not supported (0x%x)", frame->repeat_pict);
 						}
 
 						if (frame->pts != smin)
@@ -469,7 +353,6 @@ struct vdec_context final
 						frame.pts = next_pts;
 						frame.dts = next_dts;
 						frame.userdata = au_usrd;
-						frame.attr = attr;
 
 						if (frc_set)
 						{
@@ -487,7 +370,7 @@ struct vdec_context final
 							case CELL_VDEC_FRC_60: amend = 90000 / 60; break;
 							default:
 							{
-								fmt::throw_exception("Invalid frame rate code set (handle=0x%x, seq_id=%d, cmd_id=%d, frc=0x%x)", handle, cmd->seq_id, cmd->id, frc_set);
+								fmt::throw_exception("Invalid frame rate code set (0x%x)", frc_set);
 							}
 							}
 
@@ -499,7 +382,7 @@ struct vdec_context final
 						{
 							if (log_time_base.den != ctx->time_base.den || log_time_base.num != ctx->time_base.num)
 							{
-								cellVdec.error("time_base.num is 0 (handle=0x%x, seq_id=%d, cmd_id=%d, %d/%d, tpf=%d framerate=%d/%d)", handle, cmd->seq_id, cmd->id, ctx->time_base.num, ctx->time_base.den, ticks_per_frame, ctx->framerate.num, ctx->framerate.den);
+								cellVdec.error("time_base.num is 0 (%d/%d, tpf=%d framerate=%d/%d)", ctx->time_base.num, ctx->time_base.den, ctx->ticks_per_frame, ctx->framerate.num, ctx->framerate.den);
 								log_time_base = ctx->time_base;
 							}
 
@@ -511,8 +394,8 @@ struct vdec_context final
 						}
 						else
 						{
-							u64 amend = u64{90000} * ctx->time_base.num * ticks_per_frame / ctx->time_base.den;
-							const auto freq = 1. * ctx->time_base.den / ctx->time_base.num / ticks_per_frame;
+							u64 amend = u64{90000} * ctx->time_base.num * ctx->ticks_per_frame / ctx->time_base.den;
+							const auto freq = 1. * ctx->time_base.den / ctx->time_base.num / ctx->ticks_per_frame;
 
 							if (std::abs(freq - 23.976) < 0.002)
 								frame.frc = CELL_VDEC_FRC_24000DIV1001;
@@ -535,7 +418,7 @@ struct vdec_context final
 								if (log_time_base.den != ctx->time_base.den || log_time_base.num != ctx->time_base.num)
 								{
 									// 1/1000 usually means that the time stamps are written in 1ms units and that the frame rate may vary.
-									cellVdec.error("Unsupported time_base (handle=0x%x, seq_id=%d, cmd_id=%d, %d/%d, tpf=%d framerate=%d/%d)", handle, cmd->seq_id, cmd->id, ctx->time_base.num, ctx->time_base.den, ticks_per_frame, ctx->framerate.num, ctx->framerate.den);
+									cellVdec.error("Unsupported time_base (%d/%d, tpf=%d framerate=%d/%d)", ctx->time_base.num, ctx->time_base.den, ctx->ticks_per_frame, ctx->framerate.num, ctx->framerate.den);
 									log_time_base = ctx->time_base;
 								}
 
@@ -548,118 +431,51 @@ struct vdec_context final
 							next_dts += amend;
 						}
 
-						cellVdec.trace("Got picture (handle=0x%x, seq_id=%d, cmd_id=%d, pts=0x%llx[0x%llx], dts=0x%llx[0x%llx])", handle, cmd->seq_id, cmd->id, frame.pts, frame->pts, frame.dts, frame->pkt_dts);
+						cellVdec.trace("Got picture (pts=0x%llx[0x%llx], dts=0x%llx[0x%llx])", frame.pts, frame->pts, frame.dts, frame->pkt_dts);
 
-						decoded_frames.push_back(std::move(frame));
-					}
-				}
+						std::lock_guard{mutex}, out.push_back(std::move(frame));
 
-				if (thread_ctrl::state() != thread_state::aborting)
-				{
-					// Send AUDONE even if the current sequence was reset and a new sequence was started.
-					cellVdec.trace("Sending CELL_VDEC_MSG_TYPE_AUDONE (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, cmd->seq_id, cmd->id);
-					ensure(au_count.try_dec(0));
-
-					cb_func(ppu, vid, CELL_VDEC_MSG_TYPE_AUDONE, CELL_OK, cb_arg);
-					lv2_obj::sleep(ppu);
-
-					while (!decoded_frames.empty() && seq_id == cmd->seq_id)
-					{
-						// Wait until there is free space in the image queue.
-						// Do this after pushing the frame to the queue. That way the game can consume the frame and we can move on.
-						u32 elapsed = 0;
-						while (thread_ctrl::state() != thread_state::aborting && !abort_decode && seq_id == cmd->seq_id)
-						{
-							{
-								std::lock_guard lock{mutex};
-
-								if (out_queue.size() <= out_max)
-								{
-									break;
-								}
-							}
-
-							thread_ctrl::wait_for(10000);
-
-							if (elapsed++ >= 500) // 5 seconds
-							{
-								cellVdec.error("Video au decode has been waiting for a consumer for 5 seconds. (handle=0x%x, seq_id=%d, cmd_id=%d, queue_size=%d)", handle, cmd->seq_id, cmd->id, out_queue.size());
-								elapsed = 0;
-							}
-						}
-
-						if (thread_ctrl::state() == thread_state::aborting || abort_decode || seq_id != cmd->seq_id)
-						{
-							break;
-						}
-
-						{
-							std::lock_guard lock{mutex};
-							out_queue.push_back(std::move(decoded_frames.front()));
-							decoded_frames.pop_front();
-						}
-
-						cellVdec.trace("Sending CELL_VDEC_MSG_TYPE_PICOUT (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, cmd->seq_id, cmd->id);
 						cb_func(ppu, vid, CELL_VDEC_MSG_TYPE_PICOUT, CELL_OK, cb_arg);
 						lv2_obj::sleep(ppu);
 					}
+
+					if (cmd->mode != -1)
+					{
+						break;
+					}
 				}
 
-				if (abort_decode || seq_id != cmd->seq_id)
+				if (out_max)
 				{
-					cellVdec.warning("AU decoding: aborted (handle=0x%x, seq_id=%d, cmd_id=%d, abort_decode=%d)", handle, cmd->seq_id, cmd->id, abort_decode.load());
+					cb_func(ppu, vid, cmd->mode != -1 ? CELL_VDEC_MSG_TYPE_AUDONE : CELL_VDEC_MSG_TYPE_SEQDONE, CELL_OK, cb_arg);
+					lv2_obj::sleep(ppu);
 				}
-				else
+
+				if (cmd->mode != -1)
 				{
-					cellVdec.trace("AU decoding: done (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, cmd->seq_id, cmd->id);
+					au_count--;
 				}
 
-				break;
+				while (thread_ctrl::state() != thread_state::aborting && out_max && (std::lock_guard{mutex}, out.size() > out_max))
+				{
+					thread_ctrl::wait_for(1000);
+				}
 			}
-			case vdec_cmd_type::framerate:
+			else if (auto* frc = std::get_if<CellVdecFrameRate>(pcmd))
 			{
-				frc_set = cmd->framerate;
-				break;
+				frc_set = *frc;
 			}
-			case vdec_cmd_type::close:
-			{
-				std::lock_guard lock{mutex};
-				out_queue.clear();
-				break;
-			}
-			default:
-				fmt::throw_exception("Unknown vdec_cmd_type (handle=0x%x, seq_id=%d, cmd_id=%d, type=%d)", handle, cmd->seq_id, cmd->id, static_cast<u32>(cmd->type));
-				break;
-			}
-
-			std::lock_guard lock{mutex};
-			if (seq_state == sequence_state::closed)
+			else if (std::get_if<vdec_close_t>(pcmd))
 			{
 				break;
 			}
 		}
-
-		// Make sure the state is closed at the end
-		std::lock_guard lock{mutex};
-		seq_state = sequence_state::closed;
 	}
 };
 
-extern bool check_if_vdec_contexts_exist()
+static void vdecEntry(ppu_thread& ppu, u32 vid)
 {
-	bool context_exists = false;
-
-	idm::select<vdec_context>([&](u32, vdec_context&)
-	{
-		context_exists = true;
-	});
-
-	return context_exists;
-}
-
-extern void vdecEntry(ppu_thread& ppu, u32 vid)
-{
-	idm::get_unlocked<vdec_context>(vid)->exec(ppu, vid);
+	idm::get<vdec_context>(vid)->exec(ppu, vid);
 
 	ppu.state += cpu_flag::exit;
 }
@@ -776,40 +592,10 @@ static error_code vdecQueryAttr(s32 type, u32 profile, u32 spec_addr /* may be 0
 	{
 		cellVdec.warning("cellVdecQueryAttr: DivX (profile=%d)", profile);
 
-		const vm::ptr<CellVdecDivxSpecificInfo2> sinfo = vm::cast(spec_addr);
-
-		if (sinfo)
-		{
-			if (sinfo->thisSize != sizeof(CellVdecDivxSpecificInfo2))
-			{
-				return CELL_VDEC_ERROR_ARG;
-			}
-		}
+		//const vm::ptr<CellVdecDivxSpecificInfo2> sinfo = vm::cast(spec_addr);
 
 		// TODO: sinfo
 
-		//const u32 maxDecH = sinfo ? +sinfo->maxDecodedFrameHeight : 0;
-		//const u32 maxDecW = sinfo ? +sinfo->maxDecodedFrameWidth : 0;
-		u32 nrOfBuf       = sinfo ? +sinfo->numberOfDecodedFrameBuffer : 0;
-
-		if (nrOfBuf == 0)
-		{
-			nrOfBuf = 4;
-		}
-		else if (nrOfBuf == 2)
-		{
-			if (profile != CELL_VDEC_DIVX_QMOBILE && profile != CELL_VDEC_DIVX_MOBILE)
-			{
-				return CELL_VDEC_ERROR_ARG;
-			}
-		}
-		else if (nrOfBuf != 4 && nrOfBuf != 3)
-		{
-			return CELL_VDEC_ERROR_ARG;
-		}
-
-		// TODO: change memSize based on buffercount.
-
 		switch (profile)
 		{
 		case CELL_VDEC_DIVX_QMOBILE     : memSize = new_sdk ? 0x11B720 : 0x1DEF30; break;
@@ -860,13 +646,13 @@ error_code cellVdecQueryAttrEx(vm::cptr<CellVdecTypeEx> type, vm::ptr<CellVdecAt
 template <typename T, typename U>
 static error_code vdecOpen(ppu_thread& ppu, T type, U res, vm::cptr<CellVdecCb> cb, vm::ptr<u32> handle)
 {
-	if (!type || !res || !cb || !handle || !cb->cbFunc)
+	if (!type || !res || !cb || !handle)
 	{
 		return CELL_VDEC_ERROR_ARG;
 	}
 
-	if (!res->memAddr || res->ppuThreadPriority + 0u >= 3072 || res->spuThreadPriority + 0u >= 256 || res->ppuThreadStackSize < 4096
-		|| type->codecType + 0u >= 0xe)
+	if (res->ppuThreadPriority + 0u > 3071 || res->spuThreadPriority + 0u > 255 || res->ppuThreadStackSize < 4096
+		|| type->codecType + 0u > 0xd)
 	{
 		return CELL_VDEC_ERROR_ARG;
 	}
@@ -886,22 +672,7 @@ static error_code vdecOpen(ppu_thread& ppu, T type, U res, vm::cptr<CellVdecCb>
 	}
 
 	// Create decoder context
-	shared_ptr<vdec_context> vdec;
-
-	if (std::unique_lock lock{g_fxo->get<hle_locks_t>(), std::try_to_lock})
-	{
-		vdec = idm::make_ptr<vdec_context>(type->codecType, type->profileLevel, res->memAddr, res->memSize, cb->cbFunc, cb->cbArg);
-	}
-	else
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	const u32 vid = idm::last_id();
-
-	ensure(vdec);
-	vdec->handle = vid;
+	const u32 vid = idm::make<vdec_context>(type->codecType, type->profileLevel, res->memAddr, res->memSize, cb->cbFunc, cb->cbArg);
 
 	// Run thread
 	vm::var<u64> _tid;
@@ -909,7 +680,7 @@ static error_code vdecOpen(ppu_thread& ppu, T type, U res, vm::cptr<CellVdecCb>
 	ppu_execute<&sys_ppu_thread_create>(ppu, +_tid, 0x10000, vid, +res->ppuThreadPriority, +res->ppuThreadStackSize, SYS_PPU_THREAD_CREATE_INTERRUPT, +_name);
 	*handle = vid;
 
-	const auto thrd = idm::get_unlocked<named_thread<ppu_thread>>(static_cast<u32>(*_tid));
+	const auto thrd = idm::get<named_thread<ppu_thread>>(static_cast<u32>(*_tid));
 
 	thrd->cmd_list
 	({
@@ -918,7 +689,7 @@ static error_code vdecOpen(ppu_thread& ppu, T type, U res, vm::cptr<CellVdecCb>
 	});
 
 	thrd->state -= cpu_flag::stop;
-	thrd->state.notify_one();
+	thrd->state.notify_one(cpu_flag::stop);
 
 	return CELL_OK;
 }
@@ -941,37 +712,18 @@ error_code cellVdecClose(ppu_thread& ppu, u32 handle)
 {
 	cellVdec.warning("cellVdecClose(handle=0x%x)", handle);
 
-	std::unique_lock lock_hle{g_fxo->get<hle_locks_t>(), std::try_to_lock};
-
-	if (!lock_hle)
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	auto vdec = idm::get_unlocked<vdec_context>(handle);
+	const auto vdec = idm::get<vdec_context>(handle);
 
 	if (!vdec)
 	{
 		return CELL_VDEC_ERROR_ARG;
 	}
 
-	{
-		std::lock_guard lock{vdec->mutex};
-
-		if (vdec->seq_state == sequence_state::closed)
-		{
-			return { CELL_VDEC_ERROR_SEQ, vdec->seq_state.load() };
-		}
-	}
-
-	const u64 seq_id = vdec->seq_id;
-	const u64 cmd_id = vdec->next_cmd_id++;
-	cellVdec.trace("Adding close cmd (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, seq_id, cmd_id);
+	// TODO: return CELL_VDEC_ERROR_SEQ
 
 	lv2_obj::sleep(ppu);
-	vdec->abort_decode = true;
-	vdec->in_cmd.push(vdec_cmd(vdec_cmd_type::close, seq_id, cmd_id));
+	vdec->out_max = 0;
+	vdec->in_cmd.push(vdec_close);
 
 	while (!vdec->ppu_tid)
 	{
@@ -985,9 +737,6 @@ error_code cellVdecClose(ppu_thread& ppu, u32 handle)
 		ppu_execute<&sys_interrupt_thread_disestablish>(ppu, tid);
 	}
 
-	vdec->seq_state = sequence_state::closed;
-	vdec->mutex.lock_unlock();
-
 	if (!idm::remove_verify<vdec_context>(handle, std::move(vdec)))
 	{
 		// Other thread removed it beforehead
@@ -997,123 +746,49 @@ error_code cellVdecClose(ppu_thread& ppu, u32 handle)
 	return CELL_OK;
 }
 
-error_code cellVdecStartSeq(ppu_thread& ppu, u32 handle)
+error_code cellVdecStartSeq(u32 handle)
 {
-	ppu.state += cpu_flag::wait;
+	cellVdec.trace("cellVdecStartSeq(handle=0x%x)", handle);
 
-	cellVdec.warning("cellVdecStartSeq(handle=0x%x)", handle);
-
-	const auto vdec = idm::get_unlocked<vdec_context>(handle);
+	const auto vdec = idm::get<vdec_context>(handle);
 
 	if (!vdec)
 	{
 		return CELL_VDEC_ERROR_ARG;
 	}
 
-	sequence_state old_state{};
-
-	{
-		std::lock_guard lock{vdec->mutex};
-		old_state = vdec->seq_state;
-
-		if (old_state != sequence_state::dormant && old_state != sequence_state::ready)
-		{
-			return { CELL_VDEC_ERROR_SEQ, old_state };
-		}
-
-		if (old_state == sequence_state::ready)
-		{
-			vdec->seq_state = sequence_state::resetting;
-		}
-	}
-
-	const u64 seq_id = ++vdec->seq_id;
-	const u64 cmd_id = vdec->next_cmd_id++;
-	cellVdec.trace("Adding start cmd (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, seq_id, cmd_id);
-
-	vdec->abort_decode = false;
-	vdec->is_running = false;
-	vdec->in_cmd.push(vdec_cmd(vdec_cmd_type::start_sequence, seq_id, cmd_id));
-
-	std::lock_guard lock{vdec->mutex};
-
-	if (false) // TODO: set to old state in case of error
-	{
-		vdec->seq_state = old_state;
-	}
-	else
-	{
-		vdec->seq_state = sequence_state::ready;
-	}
+	// TODO: return CELL_VDEC_ERROR_SEQ
 
+	vdec->in_cmd.push(vdec_start_seq);
 	return CELL_OK;
 }
 
-error_code cellVdecEndSeq(ppu_thread& ppu, u32 handle)
+error_code cellVdecEndSeq(u32 handle)
 {
-	ppu.state += cpu_flag::wait;
-
 	cellVdec.warning("cellVdecEndSeq(handle=0x%x)", handle);
 
-	const auto vdec = idm::get_unlocked<vdec_context>(handle);
+	const auto vdec = idm::get<vdec_context>(handle);
 
 	if (!vdec)
 	{
 		return CELL_VDEC_ERROR_ARG;
 	}
 
-	{
-		std::lock_guard lock{vdec->mutex};
-
-		if (vdec->seq_state != sequence_state::ready)
-		{
-			return { CELL_VDEC_ERROR_SEQ, vdec->seq_state.load() };
-		}
-
-		vdec->seq_state = sequence_state::ending;
-	}
-
-	const u64 seq_id = vdec->seq_id;
-	const u64 cmd_id = vdec->next_cmd_id++;
-	cellVdec.trace("Adding end cmd (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, seq_id, cmd_id);
-
-	vdec->in_cmd.push(vdec_cmd(vdec_cmd_type::end_sequence, seq_id, cmd_id));
+	// TODO: return CELL_VDEC_ERROR_SEQ
 
+	vdec->in_cmd.push(vdec_cmd{-1});
 	return CELL_OK;
 }
 
-error_code cellVdecDecodeAu(ppu_thread& ppu, u32 handle, CellVdecDecodeMode mode, vm::cptr<CellVdecAuInfo> auInfo)
+error_code cellVdecDecodeAu(u32 handle, CellVdecDecodeMode mode, vm::cptr<CellVdecAuInfo> auInfo)
 {
-	ppu.state += cpu_flag::wait;
-
 	cellVdec.trace("cellVdecDecodeAu(handle=0x%x, mode=%d, auInfo=*0x%x)", handle, +mode, auInfo);
 
-	const auto vdec = idm::get_unlocked<vdec_context>(handle);
+	const auto vdec = idm::get<vdec_context>(handle);
 
-	if (!vdec || !auInfo || !auInfo->size || !auInfo->startAddr)
+	if (!auInfo || !vdec || mode < 0 || mode > CELL_VDEC_DEC_MODE_PB_SKIP)
 	{
-		return { CELL_VDEC_ERROR_ARG, "vdec=%d, auInfo=%d, size=%d, startAddr=0x%x", !!vdec, !!auInfo, auInfo ? auInfo->size.value() : 0, auInfo ? auInfo->startAddr.value() : 0 };
-	}
-
-	{
-		std::lock_guard lock{vdec->mutex};
-
-		if (vdec->seq_state != sequence_state::ready)
-		{
-			return { CELL_VDEC_ERROR_SEQ, vdec->seq_state.load() };
-		}
-	}
-
-	if (mode < 0 || mode > (CELL_VDEC_DEC_MODE_B_SKIP | CELL_VDEC_DEC_MODE_PB_SKIP))
-	{
-		return { CELL_VDEC_ERROR_ARG, "mode=%d", +mode };
-	}
-
-	// TODO: what does the 3 stand for ?
-	if ((mode == (CELL_VDEC_DEC_MODE_B_SKIP | CELL_VDEC_DEC_MODE_PB_SKIP) && vdec->type != 3) ||
-		(mode == CELL_VDEC_DEC_MODE_PB_SKIP && vdec->type != CELL_VDEC_CODEC_TYPE_AVC))
-	{
-		return { CELL_VDEC_ERROR_ARG, "mode=%d, type=%d", +mode, vdec->type };
+		return CELL_VDEC_ERROR_ARG;
 	}
 
 	if (!vdec->au_count.try_inc(4))
@@ -1121,139 +796,64 @@ error_code cellVdecDecodeAu(ppu_thread& ppu, u32 handle, CellVdecDecodeMode mode
 		return CELL_VDEC_ERROR_BUSY;
 	}
 
-	const u64 seq_id = vdec->seq_id;
-	const u64 cmd_id = vdec->next_cmd_id++;
-	cellVdec.trace("Adding decode cmd (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, seq_id, cmd_id);
-
 	// TODO: check info
-	vdec->in_cmd.push(vdec_cmd(vdec_cmd_type::au_decode, seq_id, cmd_id, mode, *auInfo));
+	vdec->in_cmd.push(vdec_cmd{mode, *auInfo});
 	return CELL_OK;
 }
 
-error_code cellVdecDecodeAuEx2(ppu_thread& ppu, u32 handle, CellVdecDecodeMode mode, vm::cptr<CellVdecAuInfoEx2> auInfo)
+error_code cellVdecDecodeAuEx2()
 {
-	ppu.state += cpu_flag::wait;
-
-	cellVdec.todo("cellVdecDecodeAuEx2(handle=0x%x, mode=%d, auInfo=*0x%x)", handle, +mode, auInfo);
-
-	const auto vdec = idm::get_unlocked<vdec_context>(handle);
-
-	if (!vdec || !auInfo || !auInfo->size || !auInfo->startAddr)
-	{
-		return { CELL_VDEC_ERROR_ARG, "vdec=%d, auInfo=%d, size=%d, startAddr=0x%x", !!vdec, !!auInfo, auInfo ? auInfo->size.value() : 0, auInfo ? auInfo->startAddr.value() : 0 };
-	}
-
-	{
-		std::lock_guard lock{vdec->mutex};
-
-		if (vdec->seq_state != sequence_state::ready)
-		{
-			return { CELL_VDEC_ERROR_SEQ, vdec->seq_state.load() };
-		}
-	}
-
-	if (mode < 0 || mode > (CELL_VDEC_DEC_MODE_B_SKIP | CELL_VDEC_DEC_MODE_PB_SKIP))
-	{
-		return { CELL_VDEC_ERROR_ARG, "mode=%d", +mode };
-	}
-
-	// TODO: what does the 3 stand for ?
-	if ((mode == (CELL_VDEC_DEC_MODE_B_SKIP | CELL_VDEC_DEC_MODE_PB_SKIP) && vdec->type != 3) ||
-		(mode == CELL_VDEC_DEC_MODE_PB_SKIP && vdec->type != CELL_VDEC_CODEC_TYPE_AVC))
-	{
-		return { CELL_VDEC_ERROR_ARG, "mode=%d, type=%d", +mode, vdec->type };
-	}
-
-	if (!vdec->au_count.try_inc(4))
-	{
-		return CELL_VDEC_ERROR_BUSY;
-	}
-
-	CellVdecAuInfo au_info{};
-	au_info.startAddr = auInfo->startAddr;
-	au_info.size = auInfo->size;
-	au_info.pts = auInfo->pts;
-	au_info.dts = auInfo->dts;
-	au_info.userData = auInfo->userData;
-	au_info.codecSpecificData = auInfo->codecSpecificData;
-
-	const u64 seq_id = vdec->seq_id;
-	const u64 cmd_id = vdec->next_cmd_id++;
-	cellVdec.trace("Adding decode cmd (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, seq_id, cmd_id);
-
-	// TODO: check info
-	vdec->in_cmd.push(vdec_cmd(vdec_cmd_type::au_decode, seq_id, cmd_id, mode, au_info));
+	UNIMPLEMENTED_FUNC(cellVdec);
 	return CELL_OK;
 }
 
-error_code cellVdecGetPictureExt(ppu_thread& ppu, u32 handle, vm::cptr<CellVdecPicFormat2> format, vm::ptr<u8> outBuff, u32 arg4)
+error_code cellVdecGetPicture(u32 handle, vm::cptr<CellVdecPicFormat> format, vm::ptr<u8> outBuff)
 {
-	ppu.state += cpu_flag::wait;
+	cellVdec.trace("cellVdecGetPicture(handle=0x%x, format=*0x%x, outBuff=*0x%x)", handle, format, outBuff);
 
-	cellVdec.trace("cellVdecGetPictureExt(handle=0x%x, format=*0x%x, outBuff=*0x%x, arg4=*0x%x)", handle, format, outBuff, arg4);
-
-	const auto vdec = idm::get_unlocked<vdec_context>(handle);
+	const auto vdec = idm::get<vdec_context>(handle);
 
 	if (!vdec || !format)
 	{
 		return CELL_VDEC_ERROR_ARG;
 	}
 
-	{
-		std::lock_guard lock{vdec->mutex};
-
-		if (vdec->seq_state == sequence_state::closed || vdec->seq_state > sequence_state::ending)
-		{
-			return { CELL_VDEC_ERROR_SEQ, vdec->seq_state.load() };
-		}
-	}
+	// TODO: return CELL_VDEC_ERROR_SEQ
 
 	if (format->formatType > 4 || (format->formatType <= CELL_VDEC_PICFMT_RGBA32_ILV && format->colorMatrixType > CELL_VDEC_COLOR_MATRIX_TYPE_BT709))
 	{
 		return CELL_VDEC_ERROR_ARG;
 	}
 
-	if (arg4 && arg4 != 8 && arg4 != 0xc)
-	{
-		return CELL_VDEC_ERROR_ARG;
-	}
-
-	if (arg4 || format->unk0 || format->unk1)
-	{
-		cellVdec.todo("cellVdecGetPictureExt: Unknown arguments (arg4=*0x%x, unk0=0x%x, unk1=0x%x)", arg4, format->unk0, format->unk1);
-	}
+	// TODO: something like this is checked here, maybe only if outBuff[0] != 0
+	//if (outBuff && outBuff[0] != 8 && outBuff[0] != 12)
+	//{
+	//	return CELL_VDEC_ERROR_ARG;
+	//}
 
 	vdec_frame frame;
 	bool notify = false;
-	u64 sequence_id{};
-
 	{
 		std::lock_guard lock(vdec->mutex);
 
-		if (vdec->out_queue.empty())
+		if (vdec->out.empty())
 		{
 			return CELL_VDEC_ERROR_EMPTY;
 		}
 
-		frame = std::move(vdec->out_queue.front());
-		sequence_id = vdec->seq_id;
+		frame = std::move(vdec->out.front());
 
-		vdec->out_queue.pop_front();
-		if (vdec->out_queue.size() + 1 == vdec->out_max)
+		vdec->out.pop_front();
+		if (vdec->out.size() + 1 == vdec->out_max)
 			notify = true;
 	}
 
 	if (notify)
 	{
-		auto vdec_ppu = idm::get_unlocked<named_thread<ppu_thread>>(vdec->ppu_tid);
+		auto vdec_ppu = idm::get<named_thread<ppu_thread>>(vdec->ppu_tid);
 		if (vdec_ppu) thread_ctrl::notify(*vdec_ppu);
 	}
 
-	if (sequence_id != frame.seq_id)
-	{
-		return { CELL_VDEC_ERROR_EMPTY, "sequence_id=%d, seq_id=%d", sequence_id, frame.seq_id };
-	}
-
 	if (outBuff)
 	{
 		const int w = frame->width;
@@ -1269,9 +869,10 @@ error_code cellVdecGetPictureExt(ppu_thread& ppu, u32 handle, vm::cptr<CellVdecP
 		case CELL_VDEC_PICFMT_RGBA32_ILV: out_f = AV_PIX_FMT_RGBA; alpha_plane.reset(new u8[w * h]); break;
 		case CELL_VDEC_PICFMT_UYVY422_ILV: out_f = AV_PIX_FMT_UYVY422; break;
 		case CELL_VDEC_PICFMT_YUV420_PLANAR: out_f = AV_PIX_FMT_YUV420P; break;
+
 		default:
 		{
-			fmt::throw_exception("cellVdecGetPictureExt: Unknown formatType (handle=0x%x, seq_id=%d, cmd_id=%d, type=%d)", handle, frame.seq_id, frame.cmd_id, type);
+			fmt::throw_exception("Unknown formatType (%d)", type);
 		}
 		}
 
@@ -1287,92 +888,78 @@ error_code cellVdecGetPictureExt(ppu_thread& ppu, u32 handle, vm::cptr<CellVdecP
 		switch (frame->format)
 		{
 		case AV_PIX_FMT_YUVJ420P:
-			cellVdec.error("cellVdecGetPictureExt: experimental AVPixelFormat (handle=0x%x, seq_id=%d, cmd_id=%d, format=%d). This may cause suboptimal video quality.", handle, frame.seq_id, frame.cmd_id, frame->format);
+			cellVdec.error("cellVdecGetPicture(): experimental AVPixelFormat (%d). This may cause suboptimal video quality.", frame->format);
 			[[fallthrough]];
 		case AV_PIX_FMT_YUV420P:
 			in_f = alpha_plane ? AV_PIX_FMT_YUVA420P : static_cast<AVPixelFormat>(frame->format);
 			break;
 		default:
-			fmt::throw_exception("cellVdecGetPictureExt: Unknown frame format (%d)", frame->format);
+		{
+			fmt::throw_exception("Unknown format (%d)", frame->format);
+		}
 		}
-
-		cellVdec.trace("cellVdecGetPictureExt: handle=0x%x, seq_id=%d, cmd_id=%d, w=%d, h=%d, frameFormat=%d, formatType=%d, in_f=%d, out_f=%d, alpha_plane=%d, alpha=%d, colorMatrixType=%d", handle, frame.seq_id, frame.cmd_id, w, h, frame->format, format->formatType, +in_f, +out_f, !!alpha_plane, format->alpha, format->colorMatrixType);
 
 		vdec->sws = sws_getCachedContext(vdec->sws, w, h, in_f, w, h, out_f, SWS_POINT, nullptr, nullptr, nullptr);
 
 		u8* in_data[4] = { frame->data[0], frame->data[1], frame->data[2], alpha_plane.get() };
 		int in_line[4] = { frame->linesize[0], frame->linesize[1], frame->linesize[2], w * 1 };
 		u8* out_data[4] = { outBuff.get_ptr() };
-		int out_line[4] = { w * 4 }; // RGBA32 or ARGB32
-
-		// TODO:
-		// It's possible that we need to align the pitch to 128 here.
-		// PS HOME seems to rely on this somehow in certain cases.
+		int out_line[4] = { w * 4 };
 
 		if (!alpha_plane)
 		{
-			// YUV420P or UYVY422
 			out_data[1] = out_data[0] + w * h;
 			out_data[2] = out_data[0] + w * h * 5 / 4;
-
-			if (const int ret = av_image_fill_linesizes(out_line, out_f, w); ret < 0)
-			{
-				fmt::throw_exception("cellVdecGetPictureExt: av_image_fill_linesizes failed (handle=0x%x, seq_id=%d, cmd_id=%d, ret=0x%x): %s", handle, frame.seq_id, frame.cmd_id, ret, utils::av_error_to_string(ret));
-			}
+			out_line[0] = w;
+			out_line[1] = w / 2;
+			out_line[2] = w / 2;
 		}
 
 		sws_scale(vdec->sws, in_data, in_line, 0, h, out_data, out_line);
+
+		//const u32 buf_size = utils::align(av_image_get_buffer_size(vdec->ctx->pix_fmt, vdec->ctx->width, vdec->ctx->height, 1), 128);
+
+		//// TODO: zero padding bytes
+
+		//int err = av_image_copy_to_buffer(outBuff.get_ptr(), buf_size, frame->data, frame->linesize, vdec->ctx->pix_fmt, frame->width, frame->height, 1);
+		//if (err < 0)
+		//{
+		//	cellVdec.Fatal("cellVdecGetPicture: av_image_copy_to_buffer failed (err=0x%x)", err);
+		//}
 	}
 
 	return CELL_OK;
 }
 
-error_code cellVdecGetPicture(ppu_thread& ppu, u32 handle, vm::cptr<CellVdecPicFormat> format, vm::ptr<u8> outBuff)
+error_code cellVdecGetPictureExt(u32 handle, vm::cptr<CellVdecPicFormat2> format2, vm::ptr<u8> outBuff, u32 arg4)
 {
-	ppu.state += cpu_flag::wait;
+	cellVdec.warning("cellVdecGetPictureExt(handle=0x%x, format2=*0x%x, outBuff=*0x%x, arg4=*0x%x)", handle, format2, outBuff, arg4);
 
-	cellVdec.trace("cellVdecGetPicture(handle=0x%x, format=*0x%x, outBuff=*0x%x)", handle, format, outBuff);
-
-	if (!format)
+	if (arg4 || format2->unk0 || format2->unk1)
 	{
-		return CELL_VDEC_ERROR_ARG;
+		fmt::throw_exception("Unknown arguments (arg4=*0x%x, unk0=0x%x, unk1=0x%x)", arg4, format2->unk0, format2->unk1);
 	}
 
-	vm::var<CellVdecPicFormat2> format2;
-	format2->formatType = format->formatType;
-	format2->colorMatrixType = format->colorMatrixType;
-	format2->alpha = format->alpha;
-	format2->unk0 = 0;
-	format2->unk1 = 0;
+	vm::var<CellVdecPicFormat> format;
+	format->formatType = format2->formatType;
+	format->colorMatrixType = format2->colorMatrixType;
+	format->alpha = format2->alpha;
 
-	return cellVdecGetPictureExt(ppu, handle, format2, outBuff, 0);
+	return cellVdecGetPicture(handle, format, outBuff);
 }
 
-error_code cellVdecGetPicItem(ppu_thread& ppu, u32 handle, vm::pptr<CellVdecPicItem> picItem)
+error_code cellVdecGetPicItem(u32 handle, vm::pptr<CellVdecPicItem> picItem)
 {
-	ppu.state += cpu_flag::wait;
-
 	cellVdec.trace("cellVdecGetPicItem(handle=0x%x, picItem=**0x%x)", handle, picItem);
 
-	const auto vdec = idm::get_unlocked<vdec_context>(handle);
+	const auto vdec = idm::get<vdec_context>(handle);
 
 	if (!vdec || !picItem)
 	{
 		return CELL_VDEC_ERROR_ARG;
 	}
 
-	u64 sequence_id{};
-
-	{
-		std::lock_guard lock{vdec->mutex};
-
-		if (vdec->seq_state == sequence_state::closed || vdec->seq_state > sequence_state::ending)
-		{
-			return { CELL_VDEC_ERROR_SEQ, vdec->seq_state.load() };
-		}
-
-		sequence_id = vdec->seq_id;
-	}
+	// TODO: return CELL_VDEC_ERROR_SEQ
 
 	struct all_info_t
 	{
@@ -1381,30 +968,24 @@ error_code cellVdecGetPicItem(ppu_thread& ppu, u32 handle, vm::pptr<CellVdecPicI
 	};
 
 	AVFrame* frame{};
-	u64 seq_id{};
-	u64 cmd_id{};
 	u64 pts;
 	u64 dts;
 	u64 usrd;
 	u32 frc = 0;
-	CellVdecPicAttr attr = CELL_VDEC_PICITEM_ATTR_NORMAL;
 	vm::ptr<CellVdecPicItem> info;
 	{
 		std::lock_guard lock(vdec->mutex);
 
-		for (auto& picture : vdec->out_queue)
+		for (auto& picture : vdec->out)
 		{
-			if (!picture.pic_item_received)
+			if (!picture.PicItemRecieved)
 			{
-				picture.pic_item_received = true;
+				picture.PicItemRecieved = true;
 				frame = picture.avf.get();
-				seq_id = picture.seq_id;
-				cmd_id = picture.cmd_id;
 				pts = picture.pts;
 				dts = picture.dts;
 				usrd = picture.userdata;
 				frc = picture.frc;
-				attr = picture.attr;
 				info.set(vdec->mem_addr + vdec->mem_bias);
 
 				constexpr u64 size_needed = sizeof(all_info_t);
@@ -1421,10 +1002,10 @@ error_code cellVdecGetPicItem(ppu_thread& ppu, u32 handle, vm::pptr<CellVdecPicI
 		}
 	}
 
-	if (!frame || seq_id != sequence_id)
+	if (!frame)
 	{
 		// If frame is empty info was not found
-		return { CELL_VDEC_ERROR_EMPTY, " frame=%d, sequence_id=%d, seq_id=%d", !!frame, sequence_id, seq_id };
+		return CELL_VDEC_ERROR_EMPTY;
 	}
 
 	info->codecType = vdec->type;
@@ -1435,16 +1016,16 @@ error_code cellVdecGetPicItem(ppu_thread& ppu, u32 handle, vm::pptr<CellVdecPicI
 	info->auNum = 1;
 	info->auPts[0].lower = static_cast<u32>(pts);
 	info->auPts[0].upper = static_cast<u32>(pts >> 32);
-	info->auPts[1].lower = CELL_CODEC_PTS_INVALID;
-	info->auPts[1].upper = CELL_CODEC_PTS_INVALID;
+	info->auPts[1].lower = -1;
+	info->auPts[1].upper = -1;
 	info->auDts[0].lower = static_cast<u32>(dts);
 	info->auDts[0].upper = static_cast<u32>(dts >> 32);
-	info->auDts[1].lower = CELL_CODEC_DTS_INVALID;
-	info->auDts[1].upper = CELL_CODEC_DTS_INVALID;
+	info->auDts[1].lower = -1;
+	info->auDts[1].upper = -1;
 	info->auUserData[0] = usrd;
 	info->auUserData[1] = 0;
 	info->status = CELL_OK;
-	info->attr = attr;
+	info->attr = CELL_VDEC_PICITEM_ATTR_NORMAL;
 
 	const vm::addr_t picinfo_addr{info.addr() + ::offset32(&all_info_t::picInfo)};
 	info->picInfo_addr = picinfo_addr;
@@ -1461,12 +1042,7 @@ error_code cellVdecGetPicItem(ppu_thread& ppu, u32 handle, vm::pptr<CellVdecPicI
 		case AV_PICTURE_TYPE_I: avc->pictureType[0] = CELL_VDEC_AVC_PCT_I; break;
 		case AV_PICTURE_TYPE_P: avc->pictureType[0] = CELL_VDEC_AVC_PCT_P; break;
 		case AV_PICTURE_TYPE_B: avc->pictureType[0] = CELL_VDEC_AVC_PCT_B; break;
-		default:
-		{
-			avc->pictureType[0] = CELL_VDEC_AVC_PCT_UNKNOWN;
-			cellVdec.error("cellVdecGetPicItem(AVC): unknown pict_type value (handle=0x%x, seq_id=%d, cmd_id=%d, pct=0x%x)", handle, seq_id, cmd_id, pct);
-			break;
-		}
+		default: cellVdec.error("cellVdecGetPicItem(AVC): unknown pict_type value (0x%x)", pct);
 		}
 
 		avc->pictureType[1] = CELL_VDEC_AVC_PCT_UNKNOWN; // ???
@@ -1498,7 +1074,7 @@ error_code cellVdecGetPicItem(ppu_thread& ppu, u32 handle, vm::pptr<CellVdecPicI
 		case CELL_VDEC_FRC_50: avc->frameRateCode = CELL_VDEC_AVC_FRC_50; break;
 		case CELL_VDEC_FRC_60000DIV1001: avc->frameRateCode = CELL_VDEC_AVC_FRC_60000DIV1001; break;
 		case CELL_VDEC_FRC_60: avc->frameRateCode = CELL_VDEC_AVC_FRC_60; break;
-		default: cellVdec.error("cellVdecGetPicItem(AVC): unknown frc value (handle=0x%x, seq_id=%d, cmd_id=%d, frc=0x%x)", handle, seq_id, cmd_id, frc);
+		default: cellVdec.error("cellVdecGetPicItem(AVC): unknown frc value (0x%x)", frc);
 		}
 
 		avc->fixed_frame_rate_flag = true;
@@ -1519,7 +1095,7 @@ error_code cellVdecGetPicItem(ppu_thread& ppu, u32 handle, vm::pptr<CellVdecPicI
 		case AV_PICTURE_TYPE_I: dvx->pictureType = CELL_VDEC_DIVX_VCT_I; break;
 		case AV_PICTURE_TYPE_P: dvx->pictureType = CELL_VDEC_DIVX_VCT_P; break;
 		case AV_PICTURE_TYPE_B: dvx->pictureType = CELL_VDEC_DIVX_VCT_B; break;
-		default: cellVdec.error("cellVdecGetPicItem(DivX): unknown pict_type value (handle=0x%x, seq_id=%d, cmd_id=%d, pct=0x%x)", handle, seq_id, cmd_id, pct);
+		default: cellVdec.error("cellVdecGetPicItem(DivX): unknown pict_type value (0x%x)", pct);
 		}
 
 		dvx->horizontalSize = frame->width;
@@ -1543,7 +1119,7 @@ error_code cellVdecGetPicItem(ppu_thread& ppu, u32 handle, vm::pptr<CellVdecPicI
 		case CELL_VDEC_FRC_50: dvx->frameRateCode = CELL_VDEC_DIVX_FRC_50; break;
 		case CELL_VDEC_FRC_60000DIV1001: dvx->frameRateCode = CELL_VDEC_DIVX_FRC_60000DIV1001; break;
 		case CELL_VDEC_FRC_60: dvx->frameRateCode = CELL_VDEC_DIVX_FRC_60; break;
-		default: cellVdec.error("cellVdecGetPicItem(DivX): unknown frc value (handle=0x%x, seq_id=%d, cmd_id=%d, frc=0x%x)", handle, seq_id, cmd_id, frc);
+		default: cellVdec.error("cellVdecGetPicItem(DivX): unknown frc value (0x%x)", frc);
 		}
 	}
 	else if (vdec->type == CELL_VDEC_CODEC_TYPE_MPEG2)
@@ -1565,7 +1141,7 @@ error_code cellVdecGetPicItem(ppu_thread& ppu, u32 handle, vm::pptr<CellVdecPicI
 		case CELL_VDEC_FRC_50: mp2->frame_rate_code = CELL_VDEC_MPEG2_FRC_50; break;
 		case CELL_VDEC_FRC_60000DIV1001: mp2->frame_rate_code = CELL_VDEC_MPEG2_FRC_60000DIV1001; break;
 		case CELL_VDEC_FRC_60: mp2->frame_rate_code = CELL_VDEC_MPEG2_FRC_60; break;
-		default: cellVdec.error("cellVdecGetPicItem(MPEG2): unknown frc value (handle=0x%x, seq_id=%d, cmd_id=%d, frc=0x%x)", handle, seq_id, cmd_id, frc);
+		default: cellVdec.error("cellVdecGetPicItem(MPEG2): unknown frc value (0x%x)", frc);
 		}
 
 		mp2->progressive_sequence = true; // ???
@@ -1578,7 +1154,7 @@ error_code cellVdecGetPicItem(ppu_thread& ppu, u32 handle, vm::pptr<CellVdecPicI
 		case AV_PICTURE_TYPE_I: mp2->picture_coding_type[0] = CELL_VDEC_MPEG2_PCT_I; break;
 		case AV_PICTURE_TYPE_P: mp2->picture_coding_type[0] = CELL_VDEC_MPEG2_PCT_P; break;
 		case AV_PICTURE_TYPE_B: mp2->picture_coding_type[0] = CELL_VDEC_MPEG2_PCT_B; break;
-		default: cellVdec.error("cellVdecGetPicItem(MPEG2): unknown pict_type value (handle=0x%x, seq_id=%d, cmd_id=%d, pct=0x%x)", handle, seq_id, cmd_id, pct);
+		default: cellVdec.error("cellVdecGetPicItem(MPEG2): unknown pict_type value (0x%x)", pct);
 		}
 
 		mp2->picture_coding_type[1] = CELL_VDEC_MPEG2_PCT_FORBIDDEN; // ???
@@ -1596,7 +1172,7 @@ error_code cellVdecSetFrameRate(u32 handle, CellVdecFrameRate frameRateCode)
 {
 	cellVdec.trace("cellVdecSetFrameRate(handle=0x%x, frameRateCode=0x%x)", handle, +frameRateCode);
 
-	const auto vdec = idm::get_unlocked<vdec_context>(handle);
+	const auto vdec = idm::get<vdec_context>(handle);
 
 	// 0x80 seems like a common prefix
 	if (!vdec || (frameRateCode & 0xf8) != 0x80)
@@ -1604,49 +1180,19 @@ error_code cellVdecSetFrameRate(u32 handle, CellVdecFrameRate frameRateCode)
 		return CELL_VDEC_ERROR_ARG;
 	}
 
-	std::lock_guard lock{vdec->mutex};
+	// TODO: return CELL_VDEC_ERROR_SEQ
 
-	if (vdec->seq_state == sequence_state::closed || vdec->seq_state >= sequence_state::invalid)
-	{
-		return { CELL_VDEC_ERROR_SEQ, vdec->seq_state.load() };
-	}
-
-	const u64 seq_id = vdec->seq_id;
-	const u64 cmd_id = vdec->next_cmd_id++;
-	cellVdec.trace("Adding framerate cmd (handle=0x%x, seq_id=%d, cmd_id=%d)", handle, seq_id, cmd_id);
-
-	vdec->in_cmd.push(vdec_cmd(vdec_cmd_type::framerate, seq_id, cmd_id, frameRateCode & 0x87));
+	vdec->in_cmd.push(CellVdecFrameRate{ frameRateCode & 0x87 });
 	return CELL_OK;
 }
 
-error_code cellVdecOpenExt(ppu_thread& ppu, vm::cptr<CellVdecType> type, vm::cptr<CellVdecResourceExt> res, vm::cptr<CellVdecCb> cb, vm::ptr<u32> handle)
-{
-	cellVdec.warning("cellVdecOpenExt(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle);
-
-	if (!res)
-	{
-		return CELL_VDEC_ERROR_ARG;
-	}
-
-	vm::var<CellVdecResource> tmp = vm::make_var<CellVdecResource>({});
-	tmp->memAddr = res->memAddr;
-	tmp->memSize = res->memSize;
-	tmp->ppuThreadPriority = res->ppuThreadPriority;
-	tmp->ppuThreadStackSize = res->ppuThreadStackSize;
-	tmp->spuThreadPriority = 0;
-	tmp->numOfSpus = res->numOfSpus;
-
-	const vm::ptr<CellVdecResource> ptr = vm::cast(tmp.addr());
-	return vdecOpen(ppu, type, ptr, cb, handle);
-}
-
-error_code cellVdecStartSeqExt()
+error_code cellVdecOpenExt()
 {
 	UNIMPLEMENTED_FUNC(cellVdec);
 	return CELL_OK;
 }
 
-error_code cellVdecGetInputStatus()
+error_code cellVdecStartSeqExt()
 {
 	UNIMPLEMENTED_FUNC(cellVdec);
 	return CELL_OK;
@@ -1674,29 +1220,20 @@ error_code cellVdecSetPts(u32 handle, vm::ptr<void> unk)
 {
 	cellVdec.error("cellVdecSetPts(handle=0x%x, unk=*0x%x)", handle, unk);
 
-	const auto vdec = idm::get_unlocked<vdec_context>(handle);
+	const auto vdec = idm::get<vdec_context>(handle);
 
 	if (!vdec || !unk)
 	{
 		return CELL_VDEC_ERROR_ARG;
 	}
 
-	std::lock_guard lock{vdec->mutex};
-
-	if (vdec->seq_state == sequence_state::closed || vdec->seq_state >= sequence_state::invalid)
-	{
-		return { CELL_VDEC_ERROR_SEQ, vdec->seq_state.load() };
-	}
+	// TODO: return CELL_VDEC_ERROR_SEQ
 
 	return CELL_OK;
 }
 
 DECLARE(ppu_module_manager::cellVdec)("libvdec", []()
 {
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100)
-	avcodec_register_all();
-#endif
-
 	static ppu_static_module libavcdec("libavcdec");
 	static ppu_static_module libdivx311dec("libdivx311dec");
 	static ppu_static_module libdivxdec("libdivxdec");
@@ -1719,7 +1256,6 @@ DECLARE(ppu_module_manager::cellVdec)("libvdec", []()
 	REG_FUNC(libvdec, cellVdecEndSeq);
 	REG_FUNC(libvdec, cellVdecDecodeAu);
 	REG_FUNC(libvdec, cellVdecDecodeAuEx2);
-	REG_FUNC(libvdec, cellVdecGetInputStatus);
 	REG_FUNC(libvdec, cellVdecGetPicture);
 	REG_FUNC(libvdec, cellVdecGetPictureExt); // 0xa21aa896
 	REG_FUNC(libvdec, cellVdecGetPicItem);
@@ -1729,5 +1265,5 @@ DECLARE(ppu_module_manager::cellVdec)("libvdec", []()
 	REG_FUNC(libvdec, cellVdecSetFrameRateExt); // 0xcffc42a5
 	REG_FUNC(libvdec, cellVdecSetPts); // 0x3ce2e4f8
 
-	REG_HIDDEN_FUNC(vdecEntry);
+	REG_FUNC(libvdec, vdecEntry).flag(MFF_HIDDEN);
 });
diff --git a/rpcs3/Emu/Cell/Modules/cellVdec.h b/rpcs3/Emu/Cell/Modules/cellVdec.h
index 9f30b7d1b0..5f00f83ead 100644
--- a/rpcs3/Emu/Cell/Modules/cellVdec.h
+++ b/rpcs3/Emu/Cell/Modules/cellVdec.h
@@ -17,7 +17,6 @@ enum CellVdecCodecType : s32
 	CELL_VDEC_CODEC_TYPE_MPEG2 = 0,
 	CELL_VDEC_CODEC_TYPE_AVC   = 1,
 	CELL_VDEC_CODEC_TYPE_DIVX  = 5,
-	CELL_VDEC_CODEC_TYPE_MAX
 };
 
 // Callback Messages
@@ -72,12 +71,6 @@ enum CellVdecFrameRate : s32
 	CELL_VDEC_FRC_60           = 0x87,
 };
 
-enum
-{
-	CELL_CODEC_PTS_INVALID = 0xffffffff,
-	CELL_CODEC_DTS_INVALID = 0xffffffff,
-};
-
 // Codec Type Information
 struct CellVdecType
 {
@@ -133,16 +126,6 @@ struct CellVdecResourceEx
 	be_t<u32> spursResource_addr;
 };
 
-struct CellVdecResourceExt // speculative
-{
-	be_t<u32> memAddr;
-	be_t<u32> memSize;
-	be_t<s32> ppuThreadPriority;
-	be_t<u32> ppuThreadStackSize;
-	u8 unk[12];
-	be_t<u32> numOfSpus;
-};
-
 // Access Unit Information
 struct CellVdecAuInfo
 {
@@ -154,19 +137,6 @@ struct CellVdecAuInfo
 	be_t<u64> codecSpecificData;
 };
 
-// Access Unit Information
-struct CellVdecAuInfoEx2 // Speculative name
-{
-	be_t<u32> startAddr;
-	be_t<u32> unk1; // Speculative
-	be_t<u32> size;
-	be_t<u32> unk2; // Speculative
-	CellCodecTimeStamp pts;
-	CellCodecTimeStamp dts;
-	be_t<u64> userData;
-	be_t<u64> codecSpecificData;
-};
-
 // Output Picture Information
 struct CellVdecPicItem
 {
diff --git a/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp b/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp
index 8c0ed93771..d3a8cdd83b 100644
--- a/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp
@@ -1,63 +1,12 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/IdManager.h"
-#include "Emu/VFS.h"
+
 #include "cellSysutil.h"
 
+
+
 LOG_CHANNEL(cellVideoExport);
 
-enum CellVideoExportUtilError : u32
-{
-	CELL_VIDEO_EXPORT_UTIL_ERROR_BUSY         = 0x8002ca01,
-	CELL_VIDEO_EXPORT_UTIL_ERROR_INTERNAL     = 0x8002ca02,
-	CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM        = 0x8002ca03,
-	CELL_VIDEO_EXPORT_UTIL_ERROR_ACCESS_ERROR = 0x8002ca04,
-	CELL_VIDEO_EXPORT_UTIL_ERROR_DB_INTERNAL  = 0x8002ca05,
-	CELL_VIDEO_EXPORT_UTIL_ERROR_DB_REGIST    = 0x8002ca06,
-	CELL_VIDEO_EXPORT_UTIL_ERROR_SET_META     = 0x8002ca07,
-	CELL_VIDEO_EXPORT_UTIL_ERROR_FLUSH_META   = 0x8002ca08,
-	CELL_VIDEO_EXPORT_UTIL_ERROR_MOVE         = 0x8002ca09,
-	CELL_VIDEO_EXPORT_UTIL_ERROR_INITIALIZE   = 0x8002ca0a,
-};
-
-enum
-{
-	CELL_VIDEO_EXPORT_UTIL_RET_OK     = 0,
-	CELL_VIDEO_EXPORT_UTIL_RET_CANCEL = 1,
-};
-
-enum
-{
-	CELL_VIDEO_EXPORT_UTIL_VERSION_CURRENT        = 0,
-	CELL_VIDEO_EXPORT_UTIL_HDD_PATH_MAX           = 1055,
-	CELL_VIDEO_EXPORT_UTIL_VIDEO_TITLE_MAX_LENGTH = 64,
-	CELL_VIDEO_EXPORT_UTIL_GAME_TITLE_MAX_LENGTH  = 64,
-	CELL_VIDEO_EXPORT_UTIL_GAME_COMMENT_MAX_SIZE  = 1024,
-};
-
-template<>
-void fmt_class_string<CellVideoExportUtilError>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto error)
-	{
-		switch (error)
-		{
-			STR_CASE(CELL_VIDEO_EXPORT_UTIL_ERROR_BUSY);
-			STR_CASE(CELL_VIDEO_EXPORT_UTIL_ERROR_INTERNAL);
-			STR_CASE(CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM);
-			STR_CASE(CELL_VIDEO_EXPORT_UTIL_ERROR_ACCESS_ERROR);
-			STR_CASE(CELL_VIDEO_EXPORT_UTIL_ERROR_DB_INTERNAL);
-			STR_CASE(CELL_VIDEO_EXPORT_UTIL_ERROR_DB_REGIST);
-			STR_CASE(CELL_VIDEO_EXPORT_UTIL_ERROR_SET_META);
-			STR_CASE(CELL_VIDEO_EXPORT_UTIL_ERROR_FLUSH_META);
-			STR_CASE(CELL_VIDEO_EXPORT_UTIL_ERROR_MOVE);
-			STR_CASE(CELL_VIDEO_EXPORT_UTIL_ERROR_INITIALIZE);
-		}
-
-		return unknown;
-	});
-}
-
 struct CellVideoExportSetParam
 {
 	vm::bptr<char> title;
@@ -69,89 +18,22 @@ struct CellVideoExportSetParam
 
 using CellVideoExportUtilFinishCallback = void(s32 result, vm::ptr<void> userdata);
 
-
-struct video_export
+error_code cellVideoExportProgress(vm::ptr<CellVideoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	atomic_t<s32> progress = 0; // 0x0-0xFFFF for 0-100%
-};
+	cellVideoExport.todo("cellVideoExportProgress(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
 
-
-bool check_movie_path(const std::string& file_path)
-{
-	if (file_path.size() >= CELL_VIDEO_EXPORT_UTIL_HDD_PATH_MAX)
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
-		return false;
-	}
+		funcFinish(ppu, 0xFFFF, userdata); // 0-0xFFFF where 0xFFFF = 100%
+		return CELL_OK;
+	});
 
-	for (char c : file_path)
-	{
-		if (!((c >= 'a' && c <= 'z') ||
-			  (c >= 'A' && c <= 'Z') ||
-			  (c >= '0' && c <= '9') ||
-			   c == '-' || c == '_' ||
-			   c == '/' || c == '.'))
-		{
-			return false;
-		}
-	}
-
-	if (!file_path.starts_with("/dev_hdd0"sv) &&
-		!file_path.starts_with("/dev_bdvd"sv) &&
-		!file_path.starts_with("/dev_hdd1"sv))
-	{
-		return false;
-	}
-
-	if (file_path.find(".."sv) != umax)
-	{
-		return false;
-	}
-
-	return true;
+	return CELL_OK;
 }
 
-std::string get_available_movie_path(const std::string& filename)
-{
-	// TODO: Find out how to build this path properly. Apparently real hardware doesn't add a suffix,
-	//       but just randomly puts each video into a separate 2-Letter subdirectory like /video/hd/ or /video/ee/
-	const std::string movie_dir = "/dev_hdd0/video/";
-	std::string dst_path = vfs::get(movie_dir + filename);
-
-	// Do not overwrite existing files. Add a suffix instead.
-	for (u32 i = 0; fs::exists(dst_path); i++)
-	{
-		const std::string suffix = fmt::format("_%d", i);
-		std::string new_filename = filename;
-
-		if (const usz pos = new_filename.find_last_of('.'); pos != std::string::npos)
-		{
-			new_filename.insert(pos, suffix);
-		}
-		else
-		{
-			new_filename.append(suffix);
-		}
-
-		dst_path = vfs::get(movie_dir + new_filename);
-	}
-
-	return dst_path;
-}
-
-
 error_code cellVideoExportInitialize2(u32 version, vm::ptr<CellVideoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	cellVideoExport.notice("cellVideoExportInitialize2(version=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, funcFinish, userdata);
-
-	if (version != CELL_VIDEO_EXPORT_UTIL_VERSION_CURRENT)
-	{
-		return CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	if (!funcFinish)
-	{
-		return CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM;
-	}
+	cellVideoExport.todo("cellVideoExportInitialize2(version=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, funcFinish, userdata);
 
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
@@ -164,26 +46,7 @@ error_code cellVideoExportInitialize2(u32 version, vm::ptr<CellVideoExportUtilFi
 
 error_code cellVideoExportInitialize(u32 version, u32 container, vm::ptr<CellVideoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	cellVideoExport.notice("cellVideoExportInitialize(version=0x%x, container=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, container, funcFinish, userdata);
-
-	if (version != CELL_VIDEO_EXPORT_UTIL_VERSION_CURRENT)
-	{
-		return CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	// Check container (same sub-function as cellVideoExportInitialize2, so we have to check this parameter anyway)
-	if (container != 0xfffffffe)
-	{
-		if (false) // invalid container or container size < 0x500000
-		{
-			return CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM;
-		}
-	}
-
-	if (!funcFinish)
-	{
-		return CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM;
-	}
+	cellVideoExport.todo("cellVideoExportInitialize(version=0x%x, container=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, container, funcFinish, userdata);
 
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
@@ -194,85 +57,12 @@ error_code cellVideoExportInitialize(u32 version, u32 container, vm::ptr<CellVid
 	return CELL_OK;
 }
 
-error_code cellVideoExportProgress(vm::ptr<CellVideoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
-{
-	cellVideoExport.todo("cellVideoExportProgress(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
-
-	if (!funcFinish)
-	{
-		return CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	sysutil_register_cb([=](ppu_thread& ppu) -> s32
-	{
-		// Set the status as 0x0-0xFFFF (0-100%) depending on the copy status.
-		// Only the copy or move of the movie and metadata files is considered for the progress.
-		const auto& vexp = g_fxo->get<video_export>();
-
-		funcFinish(ppu, vexp.progress, userdata);
-		return CELL_OK;
-	});
-
-	return CELL_OK;
-}
-
 error_code cellVideoExportFromFileWithCopy(vm::cptr<char> srcHddDir, vm::cptr<char> srcHddFile, vm::ptr<CellVideoExportSetParam> param, vm::ptr<CellVideoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
 	cellVideoExport.todo("cellVideoExportFromFileWithCopy(srcHddDir=%s, srcHddFile=%s, param=*0x%x, funcFinish=*0x%x, userdata=*0x%x)", srcHddDir, srcHddFile, param, funcFinish, userdata);
 
-	if (!param || !funcFinish || !srcHddDir || !srcHddDir[0] || !srcHddFile || !srcHddFile[0])
-	{
-		return CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	// TODO: check param members ?
-
-	cellVideoExport.notice("cellVideoExportFromFileWithCopy: param: title=%s, game_title=%s, game_comment=%s, editable=%d", param->title, param->game_title, param->game_comment, param->editable);
-
-	const std::string file_path = fmt::format("%s/%s", srcHddDir.get_ptr(), srcHddFile.get_ptr());
-
-	if (!check_movie_path(file_path))
-	{
-		return { CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM, file_path };
-	}
-
-	std::string filename;
-
-	if (srcHddFile)
-	{
-		fmt::append(filename, "%s", srcHddFile.get_ptr());
-	}
-
-	if (filename.empty())
-	{
-		return { CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM, "filename empty" };
-	}
-
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
-		auto& vexp = g_fxo->get<video_export>();
-		vexp.progress = 0; // 0%
-
-		const std::string src_path = vfs::get(file_path);
-		const std::string dst_path = get_available_movie_path(filename);
-
-		cellVideoExport.notice("Copying file from '%s' to '%s'", file_path, dst_path);
-
-		if (!fs::create_path(fs::get_parent_dir(dst_path)) || !fs::copy_file(src_path, dst_path, false))
-		{
-			// TODO: find out which error is used
-			cellVideoExport.error("Failed to copy file from '%s' to '%s' (%s)", src_path, dst_path, fs::g_tls_error);
-			funcFinish(ppu, CELL_VIDEO_EXPORT_UTIL_ERROR_MOVE, userdata);
-			return CELL_OK;
-		}
-
-		// TODO: write metadata file sometime in the far future
-		// const std::string metadata_file = dst_path + ".vmd";
-
-		// TODO: track progress during file copy
-
-		vexp.progress = 0xFFFF; // 100%
-
 		funcFinish(ppu, CELL_OK, userdata);
 		return CELL_OK;
 	});
@@ -284,70 +74,8 @@ error_code cellVideoExportFromFile(vm::cptr<char> srcHddDir, vm::cptr<char> srcH
 {
 	cellVideoExport.todo("cellVideoExportFromFile(srcHddDir=%s, srcHddFile=%s, param=*0x%x, funcFinish=*0x%x, userdata=*0x%x)", srcHddDir, srcHddFile, param, funcFinish, userdata);
 
-	if (!param || !funcFinish || !srcHddDir || !srcHddDir[0] || !srcHddFile || !srcHddFile[0])
-	{
-		return CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM;
-	}
-
-	// TODO: check param members ?
-
-	cellVideoExport.notice("cellVideoExportFromFile: param: title=%s, game_title=%s, game_comment=%s, editable=%d", param->title, param->game_title, param->game_comment, param->editable);
-
-	const std::string file_path = fmt::format("%s/%s", srcHddDir.get_ptr(), srcHddFile.get_ptr());
-
-	if (!check_movie_path(file_path))
-	{
-		return { CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM, file_path };
-	}
-
-	std::string filename;
-
-	if (srcHddFile)
-	{
-		fmt::append(filename, "%s", srcHddFile.get_ptr());
-	}
-
-	if (filename.empty())
-	{
-		return { CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM, "filename empty" };
-	}
-
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
-		auto& vexp = g_fxo->get<video_export>();
-		vexp.progress = 0; // 0%
-
-		const std::string src_path = vfs::get(file_path);
-		const std::string dst_path = get_available_movie_path(filename);
-
-		cellVideoExport.notice("Copying file from '%s' to '%s'", file_path, dst_path);
-
-		if (!fs::create_path(fs::get_parent_dir(dst_path)) || !fs::copy_file(src_path, dst_path, false))
-		{
-			// TODO: find out which error is used
-			cellVideoExport.error("Failed to copy file from '%s' to '%s' (%s)", src_path, dst_path, fs::g_tls_error);
-			funcFinish(ppu, CELL_VIDEO_EXPORT_UTIL_ERROR_MOVE, userdata);
-			return CELL_OK;
-		}
-
-		if (!file_path.starts_with("/dev_bdvd"sv))
-		{
-			cellVideoExport.notice("Removing file '%s'", src_path);
-
-			if (!fs::remove_file(src_path))
-			{
-				// TODO: find out if an error is used here
-				cellVideoExport.error("Failed to remove file '%s' (%s)", src_path, fs::g_tls_error);
-			}
-		}
-
-		// TODO: write metadata file sometime in the far future
-		// const std::string metadata_file = dst_path + ".vmd";
-
-		// TODO: track progress during file copy
-
-		vexp.progress = 0xFFFF; // 100%
-
 		funcFinish(ppu, CELL_OK, userdata);
 		return CELL_OK;
 	});
@@ -357,12 +85,7 @@ error_code cellVideoExportFromFile(vm::cptr<char> srcHddDir, vm::cptr<char> srcH
 
 error_code cellVideoExportFinalize(vm::ptr<CellVideoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	cellVideoExport.notice("cellVideoExportFinalize(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
-
-	if (!funcFinish)
-	{
-		return CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM;
-	}
+	cellVideoExport.todo("cellVideoExportFinalize(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
 
 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
diff --git a/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp b/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp
index e0db365933..3ee43b7aa5 100644
--- a/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp
@@ -4,7 +4,6 @@
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/IdManager.h"
 #include "Emu/RSX/rsx_utils.h"
-#include "Emu/RSX/RSXThread.h"
 
 #include "cellVideoOut.h"
 
@@ -13,47 +12,26 @@ LOG_CHANNEL(cellSysutil);
 // NOTE: Unused in this module, but used by gs_frame to determine window size
 const extern std::unordered_map<video_resolution, std::pair<int, int>, value_hash<video_resolution>> g_video_out_resolution_map
 {
-	{ video_resolution::_1080p,      { 1920, 1080 } },
-	{ video_resolution::_1080i,      { 1920, 1080 } },
-	{ video_resolution::_720p,       { 1280, 720 } },
-	{ video_resolution::_480p,       { 720, 480 } },
-	{ video_resolution::_480i,       { 720, 480 } },
-	{ video_resolution::_576p,       { 720, 576 } },
-	{ video_resolution::_576i,       { 720, 576 } },
-	{ video_resolution::_1600x1080p, { 1600, 1080 } },
-	{ video_resolution::_1440x1080p, { 1440, 1080 } },
-	{ video_resolution::_1280x1080p, { 1280, 1080 } },
-	{ video_resolution::_960x1080p,  { 960, 1080 } },
+	{ video_resolution::_1080,      { 1920, 1080 } },
+	{ video_resolution::_720,       { 1280, 720 } },
+	{ video_resolution::_480,       { 720, 480 } },
+	{ video_resolution::_576,       { 720, 576 } },
+	{ video_resolution::_1600x1080, { 1600, 1080 } },
+	{ video_resolution::_1440x1080, { 1440, 1080 } },
+	{ video_resolution::_1280x1080, { 1280, 1080 } },
+	{ video_resolution::_960x1080,  { 960, 1080 } },
 };
 
 const extern std::unordered_map<video_resolution, CellVideoOutResolutionId, value_hash<video_resolution>> g_video_out_resolution_id
 {
-	{ video_resolution::_1080p,      CELL_VIDEO_OUT_RESOLUTION_1080 },
-	{ video_resolution::_1080i,      CELL_VIDEO_OUT_RESOLUTION_1080 },
-	{ video_resolution::_720p,       CELL_VIDEO_OUT_RESOLUTION_720 },
-	{ video_resolution::_480p,       CELL_VIDEO_OUT_RESOLUTION_480 },
-	{ video_resolution::_480i,       CELL_VIDEO_OUT_RESOLUTION_480 },
-	{ video_resolution::_576p,       CELL_VIDEO_OUT_RESOLUTION_576 },
-	{ video_resolution::_576i,       CELL_VIDEO_OUT_RESOLUTION_576 },
-	{ video_resolution::_1600x1080p, CELL_VIDEO_OUT_RESOLUTION_1600x1080 },
-	{ video_resolution::_1440x1080p, CELL_VIDEO_OUT_RESOLUTION_1440x1080 },
-	{ video_resolution::_1280x1080p, CELL_VIDEO_OUT_RESOLUTION_1280x1080 },
-	{ video_resolution::_960x1080p,  CELL_VIDEO_OUT_RESOLUTION_960x1080 },
-};
-
-const extern std::unordered_map<video_resolution, CellVideoOutScanMode, value_hash<video_resolution>> g_video_out_scan_mode
-{
-	{ video_resolution::_1080p,      CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE },
-	{ video_resolution::_1080i,      CELL_VIDEO_OUT_SCAN_MODE_INTERLACE },
-	{ video_resolution::_720p,       CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE },
-	{ video_resolution::_480p,       CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE },
-	{ video_resolution::_480i,       CELL_VIDEO_OUT_SCAN_MODE_INTERLACE },
-	{ video_resolution::_576p,       CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE },
-	{ video_resolution::_576i,       CELL_VIDEO_OUT_SCAN_MODE_INTERLACE },
-	{ video_resolution::_1600x1080p, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE },
-	{ video_resolution::_1440x1080p, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE },
-	{ video_resolution::_1280x1080p, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE },
-	{ video_resolution::_960x1080p,  CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE },
+	{ video_resolution::_1080,      CELL_VIDEO_OUT_RESOLUTION_1080 },
+	{ video_resolution::_720,       CELL_VIDEO_OUT_RESOLUTION_720 },
+	{ video_resolution::_480,       CELL_VIDEO_OUT_RESOLUTION_480 },
+	{ video_resolution::_576,       CELL_VIDEO_OUT_RESOLUTION_576 },
+	{ video_resolution::_1600x1080, CELL_VIDEO_OUT_RESOLUTION_1600x1080 },
+	{ video_resolution::_1440x1080, CELL_VIDEO_OUT_RESOLUTION_1440x1080 },
+	{ video_resolution::_1280x1080, CELL_VIDEO_OUT_RESOLUTION_1280x1080 },
+	{ video_resolution::_960x1080,  CELL_VIDEO_OUT_RESOLUTION_960x1080 },
 };
 
 const extern std::unordered_map<video_aspect, CellVideoOutDisplayAspect, value_hash<video_aspect>> g_video_out_aspect_id
@@ -141,13 +119,13 @@ error_code cellVideoOutGetState(u32 videoOut, u32 deviceIndex, vm::ptr<CellVideo
 	{
 	case CELL_VIDEO_OUT_PRIMARY:
 	{
-		const auto& conf = g_fxo->get<rsx::avconf>();
+		auto& conf = g_fxo->get<rsx::avconf>();
 		state->state = CELL_VIDEO_OUT_OUTPUT_STATE_ENABLED;
 		state->colorSpace = CELL_VIDEO_OUT_COLOR_SPACE_RGB;
-		state->displayMode.resolutionId = conf.state ? conf.resolution_id : ::at32(g_video_out_resolution_id, g_cfg.video.resolution);
-		state->displayMode.scanMode = conf.state ? conf.scan_mode : ::at32(g_video_out_scan_mode, g_cfg.video.resolution);
+		state->displayMode.resolutionId = conf.state ? conf.resolution_id : g_video_out_resolution_id.at(g_cfg.video.resolution);
+		state->displayMode.scanMode = CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE;
 		state->displayMode.conversion = CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE;
-		state->displayMode.aspect = conf.state ? conf.aspect : ::at32(g_video_out_aspect_id, g_cfg.video.aspect_ratio);
+		state->displayMode.aspect = conf.state ? conf.aspect : g_video_out_aspect_id.at(g_cfg.video.aspect_ratio);
 		state->displayMode.refreshRates = CELL_VIDEO_OUT_REFRESH_RATE_59_94HZ;
 
 		return CELL_OK;
@@ -202,7 +180,7 @@ error_code cellVideoOutConfigure(u32 videoOut, vm::ptr<CellVideoOutConfiguration
 
 	CellVideoOutResolution res;
 	if (_IntGetResolutionInfo(config->resolutionId, &res) != CELL_OK ||
-		(config->resolutionId >= CELL_VIDEO_OUT_RESOLUTION_720_3D_FRAME_PACKING && g_cfg.video.stereo_render_mode == stereo_render_mode_options::disabled))
+		(config->resolutionId >= CELL_VIDEO_OUT_RESOLUTION_720_3D_FRAME_PACKING && !g_cfg.video.enable_3d))
 	{
 		// Resolution not supported
 		cellSysutil.error("Unusual resolution requested: 0x%x", config->resolutionId);
@@ -211,7 +189,7 @@ error_code cellVideoOutConfigure(u32 videoOut, vm::ptr<CellVideoOutConfiguration
 
 	auto& conf = g_fxo->get<rsx::avconf>();
 	conf.resolution_id = config->resolutionId;
-	conf.stereo_mode = (config->resolutionId >= CELL_VIDEO_OUT_RESOLUTION_720_3D_FRAME_PACKING) ? g_cfg.video.stereo_render_mode.get() : stereo_render_mode_options::disabled;
+	conf._3d = config->resolutionId >= CELL_VIDEO_OUT_RESOLUTION_720_3D_FRAME_PACKING;
 	conf.aspect = config->aspect;
 	conf.format = config->format;
 	conf.scanline_pitch = config->pitch;
@@ -219,22 +197,14 @@ error_code cellVideoOutConfigure(u32 videoOut, vm::ptr<CellVideoOutConfiguration
 	conf.resolution_y = res.height;
 	conf.state = 1;
 
-	// TODO: What happens if the aspect is unknown? Let's treat it as auto for now.
-	if (conf.aspect != CELL_VIDEO_OUT_ASPECT_4_3 && conf.aspect != CELL_VIDEO_OUT_ASPECT_16_9)
+	if (conf.aspect == CELL_VIDEO_OUT_ASPECT_AUTO)
 	{
-		if (conf.aspect != CELL_VIDEO_OUT_ASPECT_AUTO)
-		{
-			cellSysutil.error("Selected unknown aspect 0x%x. Falling back to aspect %s.", conf.aspect, g_cfg.video.aspect_ratio.get());
-		}
-
-		// Resolve 'auto' or unknown options to actual aspect ratio
-		conf.aspect = ::at32(g_video_out_aspect_id, g_cfg.video.aspect_ratio);
+		// Resolve 'auto' option to actual aspect ratio
+		conf.aspect = g_video_out_aspect_id.at(g_cfg.video.aspect_ratio);
 	}
 
-	cellSysutil.notice("Selected video configuration: resolutionId=0x%x, aspect=0x%x=>0x%x, format=0x%x", config->resolutionId, config->aspect, conf.aspect, config->format);
+	cellSysutil.notice("Selected video resolution 0x%x", config->resolutionId);
 
-	// This function resets VSYNC to be enabled
-	rsx::get_current_renderer()->requested_vsync = true;
 	return CELL_OK;
 }
 
@@ -254,7 +224,7 @@ error_code cellVideoOutGetConfiguration(u32 videoOut, vm::ptr<CellVideoOutConfig
 	{
 	case CELL_VIDEO_OUT_PRIMARY:
 	{
-		if (const auto& conf = g_fxo->get<rsx::avconf>(); conf.state)
+		if (auto& conf = g_fxo->get<rsx::avconf>(); conf.state)
 		{
 			config->resolutionId = conf.resolution_id;
 			config->format = conf.format;
@@ -263,9 +233,9 @@ error_code cellVideoOutGetConfiguration(u32 videoOut, vm::ptr<CellVideoOutConfig
 		}
 		else
 		{
-			config->resolutionId = ::at32(g_video_out_resolution_id, g_cfg.video.resolution);
+			config->resolutionId = g_video_out_resolution_id.at(g_cfg.video.resolution);
 			config->format = CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8;
-			config->aspect = ::at32(g_video_out_aspect_id, g_cfg.video.aspect_ratio);
+			config->aspect = g_video_out_aspect_id.at(g_cfg.video.aspect_ratio);
 
 			CellVideoOutResolution res;
 			ensure(_IntGetResolutionInfo(config->resolutionId, &res) == CELL_OK); // "Invalid video configuration"
@@ -304,6 +274,7 @@ error_code cellVideoOutGetDeviceInfo(u32 videoOut, u32 deviceIndex, vm::ptr<Cell
 	info->portType = CELL_VIDEO_OUT_PORT_HDMI;
 	info->colorSpace = CELL_VIDEO_OUT_COLOR_SPACE_RGB;
 	info->latency = 100;
+	info->availableModeCount = 1;
 	info->state = CELL_VIDEO_OUT_DEVICE_STATE_AVAILABLE;
 	info->rgbOutputRange = 1;
 	info->colorInfo.blueX = 0xFFFF;
@@ -315,115 +286,27 @@ error_code cellVideoOutGetDeviceInfo(u32 videoOut, u32 deviceIndex, vm::ptr<Cell
 	info->colorInfo.whiteX = 0xFFFF;
 	info->colorInfo.whiteY = 0xFFFF;
 	info->colorInfo.gamma = 100;
+	info->availableModes[0].aspect = g_video_out_aspect_id.at(g_cfg.video.aspect_ratio);
+	info->availableModes[0].conversion = CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE;
+	info->availableModes[0].refreshRates =  CELL_VIDEO_OUT_REFRESH_RATE_60HZ | CELL_VIDEO_OUT_REFRESH_RATE_59_94HZ;
+	info->availableModes[0].resolutionId = g_video_out_resolution_id.at(g_cfg.video.resolution);
+	info->availableModes[0].scanMode = CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE;
 
-	u32 mode_count = 0;
-
-	const auto add_mode = [&](u8 resolutionId, u8 scanMode, u8 conversion, u8 aspect)
-	{
-		info->availableModes[mode_count].resolutionId = resolutionId;
-		info->availableModes[mode_count].scanMode = scanMode;
-		info->availableModes[mode_count].conversion = conversion;
-		info->availableModes[mode_count].aspect = aspect;
-		info->availableModes[mode_count].refreshRates = CELL_VIDEO_OUT_REFRESH_RATE_60HZ | CELL_VIDEO_OUT_REFRESH_RATE_59_94HZ;
-		mode_count++;
-	};
-
-	switch (g_cfg.video.resolution.get())
-	{
-	case video_resolution::_1080p:
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_1080, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_16_9);
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_1600x1080, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080, CELL_VIDEO_OUT_ASPECT_16_9);
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_1440x1080, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080, CELL_VIDEO_OUT_ASPECT_16_9);
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_1280x1080, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080, CELL_VIDEO_OUT_ASPECT_16_9);
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_960x1080, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080, CELL_VIDEO_OUT_ASPECT_16_9);
-		break;
-	case video_resolution::_1080i:
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_1080, CELL_VIDEO_OUT_SCAN_MODE_INTERLACE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_16_9);
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_1600x1080, CELL_VIDEO_OUT_SCAN_MODE_INTERLACE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080, CELL_VIDEO_OUT_ASPECT_16_9);
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_1440x1080, CELL_VIDEO_OUT_SCAN_MODE_INTERLACE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080, CELL_VIDEO_OUT_ASPECT_16_9);
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_1280x1080, CELL_VIDEO_OUT_SCAN_MODE_INTERLACE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080, CELL_VIDEO_OUT_ASPECT_16_9);
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_960x1080, CELL_VIDEO_OUT_SCAN_MODE_INTERLACE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080, CELL_VIDEO_OUT_ASPECT_16_9);
-		break;
-	case video_resolution::_720p:
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_720, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_16_9);
-		break;
-	case video_resolution::_480p:
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_480, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_4_3);
-		if (g_cfg.video.aspect_ratio == video_aspect::_16_9)
-		{
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_480, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_16_9);
-		}
-		break;
-	case video_resolution::_480i:
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_480, CELL_VIDEO_OUT_SCAN_MODE_INTERLACE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_4_3);
-		if (g_cfg.video.aspect_ratio == video_aspect::_16_9)
-		{
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_480, CELL_VIDEO_OUT_SCAN_MODE_INTERLACE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_16_9);
-		}
-		break;
-	case video_resolution::_576p:
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_576, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_4_3);
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_480, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_4_3);
-		if (g_cfg.video.aspect_ratio == video_aspect::_16_9)
-		{
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_576, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_16_9);
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_480, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_16_9);
-		}
-		break;
-	case video_resolution::_576i:
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_576, CELL_VIDEO_OUT_SCAN_MODE_INTERLACE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_4_3);
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_480, CELL_VIDEO_OUT_SCAN_MODE_INTERLACE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_4_3);
-		if (g_cfg.video.aspect_ratio == video_aspect::_16_9)
-		{
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_576, CELL_VIDEO_OUT_SCAN_MODE_INTERLACE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_16_9);
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_480, CELL_VIDEO_OUT_SCAN_MODE_INTERLACE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_16_9);
-		}
-		break;
-	case video_resolution::_1600x1080p:
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_1600x1080, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080, CELL_VIDEO_OUT_ASPECT_16_9);
-		break;
-	case video_resolution::_1440x1080p:
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_1440x1080, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080, CELL_VIDEO_OUT_ASPECT_16_9);
-		break;
-	case video_resolution::_1280x1080p:
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_1280x1080, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080, CELL_VIDEO_OUT_ASPECT_16_9);
-		break;
-	case video_resolution::_960x1080p:
-		add_mode(CELL_VIDEO_OUT_RESOLUTION_960x1080, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080, CELL_VIDEO_OUT_ASPECT_16_9);
-		break;
-	}
-
-	if (g_cfg.video.stereo_render_mode != stereo_render_mode_options::disabled && g_cfg.video.resolution == video_resolution::_720p)
+	if (g_cfg.video.enable_3d && g_cfg.video.resolution == video_resolution::_720)
 	{
 		// Register 3D-capable display mode
-		if (true) // TODO
-		{
-			// 3D stereo
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_720_3D_FRAME_PACKING, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE, CELL_VIDEO_OUT_ASPECT_16_9);
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_1024x720_3D_FRAME_PACKING, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_720_3D_FRAME_PACKING, CELL_VIDEO_OUT_ASPECT_16_9);
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_960x720_3D_FRAME_PACKING, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_720_3D_FRAME_PACKING, CELL_VIDEO_OUT_ASPECT_16_9);
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_800x720_3D_FRAME_PACKING, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_720_3D_FRAME_PACKING, CELL_VIDEO_OUT_ASPECT_16_9);
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_640x720_3D_FRAME_PACKING, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_720_3D_FRAME_PACKING, CELL_VIDEO_OUT_ASPECT_16_9);
-		}
-		else
-		{
-			// SimulView
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_720_SIMULVIEW_FRAME_PACKING, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_720_3D_FRAME_PACKING, CELL_VIDEO_OUT_ASPECT_16_9);
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_1024x720_SIMULVIEW_FRAME_PACKING, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_720_3D_FRAME_PACKING, CELL_VIDEO_OUT_ASPECT_16_9);
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_960x720_SIMULVIEW_FRAME_PACKING, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_720_3D_FRAME_PACKING, CELL_VIDEO_OUT_ASPECT_16_9);
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_800x720_SIMULVIEW_FRAME_PACKING, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_720_3D_FRAME_PACKING, CELL_VIDEO_OUT_ASPECT_16_9);
-			add_mode(CELL_VIDEO_OUT_RESOLUTION_640x720_SIMULVIEW_FRAME_PACKING, CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_720_3D_FRAME_PACKING, CELL_VIDEO_OUT_ASPECT_16_9);
-		}
+		info->availableModes[1] = info->availableModes[0];
+		info->availableModes[1].conversion = CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_720_3D_FRAME_PACKING;
+		info->availableModes[1].resolutionId = CELL_VIDEO_OUT_RESOLUTION_720_3D_FRAME_PACKING;
+		info->availableModeCount++;
 	}
 
-	info->availableModeCount = mode_count;
-
 	return CELL_OK;
 }
 
 error_code cellVideoOutGetNumberOfDevice(u32 videoOut)
 {
-	cellSysutil.trace("cellVideoOutGetNumberOfDevice(videoOut=%d)", videoOut);
+	cellSysutil.warning("cellVideoOutGetNumberOfDevice(videoOut=%d)", videoOut);
 
 	switch (videoOut)
 	{
@@ -443,18 +326,18 @@ error_code cellVideoOutGetResolutionAvailability(u32 videoOut, u32 resolutionId,
 	case CELL_VIDEO_OUT_PRIMARY:
 	{
 		// NOTE: Result is boolean
-		if (aspect != CELL_VIDEO_OUT_ASPECT_AUTO && aspect != static_cast<u32>(::at32(g_video_out_aspect_id, g_cfg.video.aspect_ratio)))
+		if (aspect != CELL_VIDEO_OUT_ASPECT_AUTO && aspect != static_cast<u32>(g_video_out_aspect_id.at(g_cfg.video.aspect_ratio)))
 		{
 			return not_an_error(0);
 		}
 
-		if (resolutionId == static_cast<u32>(::at32(g_video_out_resolution_id, g_cfg.video.resolution)))
+		if (resolutionId == static_cast<u32>(g_video_out_resolution_id.at(g_cfg.video.resolution)))
 		{
 			// Perfect match
 			return not_an_error(1);
 		}
 
-		if ((g_cfg.video.stereo_render_mode != stereo_render_mode_options::disabled) && g_cfg.video.resolution == video_resolution::_720p)
+		if (g_cfg.video.enable_3d && g_cfg.video.resolution == video_resolution::_720)
 		{
 			switch (resolutionId)
 			{
@@ -478,35 +361,32 @@ error_code cellVideoOutGetResolutionAvailability(u32 videoOut, u32 resolutionId,
 	return CELL_VIDEO_OUT_ERROR_UNSUPPORTED_VIDEO_OUT;
 }
 
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 error_code cellVideoOutGetConvertCursorColorInfo(vm::ptr<u8> rgbOutputRange)
 {
-	cellSysutil.todo("cellVideoOutGetConvertCursorColorInfo(rgbOutputRange=*0x%x)", rgbOutputRange);
-
-	if (!rgbOutputRange)
-	{
-		return CELL_VIDEO_OUT_ERROR_ILLEGAL_PARAMETER; // TODO: Speculative
-	}
-
-	*rgbOutputRange = CELL_VIDEO_OUT_RGB_OUTPUT_RANGE_FULL; // Or CELL_VIDEO_OUT_RGB_OUTPUT_RANGE_LIMITED
-
+	cellSysutil.todo("cellVideoOutGetConvertCursorColorInfo()");
 	return CELL_OK;
 }
 
 error_code cellVideoOutDebugSetMonitorType(u32 videoOut, u32 monitorType)
 {
-	cellSysutil.todo("cellVideoOutDebugSetMonitorType(videoOut=%d, monitorType=%d)", videoOut, monitorType);
+	cellSysutil.todo("cellVideoOutDebugSetMonitorType()");
 	return CELL_OK;
 }
 
 error_code cellVideoOutRegisterCallback(u32 slot, vm::ptr<CellVideoOutCallback> function, vm::ptr<void> userData)
 {
-	cellSysutil.todo("cellVideoOutRegisterCallback(slot=%d, function=*0x%x, userData=*0x%x)", slot, function, userData);
+	cellSysutil.todo("cellVideoOutRegisterCallback()");
 	return CELL_OK;
 }
 
 error_code cellVideoOutUnregisterCallback(u32 slot)
 {
-	cellSysutil.todo("cellVideoOutUnregisterCallback(slot=%d)", slot);
+	cellSysutil.todo("cellVideoOutUnregisterCallback()");
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/cellVideoOut.h b/rpcs3/Emu/Cell/Modules/cellVideoOut.h
index c3529d195b..cf7c3c2082 100644
--- a/rpcs3/Emu/Cell/Modules/cellVideoOut.h
+++ b/rpcs3/Emu/Cell/Modules/cellVideoOut.h
@@ -34,7 +34,7 @@ enum CellVideoOutResolutionId : s32
 	CELL_VIDEO_OUT_RESOLUTION_1280x1080                         = 0xc,
 	CELL_VIDEO_OUT_RESOLUTION_960x1080                          = 0xd,
 	CELL_VIDEO_OUT_RESOLUTION_720_3D_FRAME_PACKING              = 0x81,
-	CELL_VIDEO_OUT_RESOLUTION_1024x720_3D_FRAME_PACKING         = 0x88,
+	CELL_VIDEO_OUT_RESOLUTION_1024x720_3D_FRAME_PACKING	        = 0x88,
 	CELL_VIDEO_OUT_RESOLUTION_960x720_3D_FRAME_PACKING          = 0x89,
 	CELL_VIDEO_OUT_RESOLUTION_800x720_3D_FRAME_PACKING          = 0x8a,
 	CELL_VIDEO_OUT_RESOLUTION_640x720_3D_FRAME_PACKING          = 0x8b,
@@ -94,9 +94,9 @@ enum CellVideoOutDisplayAspect : s32
 
 enum CellVideoOutBufferColorFormat : s32
 {
-	CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8           = 0,
-	CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8B8G8R8           = 1,
-	CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_R16G16B16X16_FLOAT = 2,
+	CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8,
+	CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8B8G8R8,
+	CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_R16G16B16X16_FLOAT,
 };
 
 enum CellVideoOutOutputState : s32
@@ -219,23 +219,23 @@ struct CellVideoOutOption
 
 enum CellVideoOutEvent : s32
 {
-	CELL_VIDEO_OUT_EVENT_DEVICE_CHANGED       = 0,
-	CELL_VIDEO_OUT_EVENT_OUTPUT_DISABLED      = 1,
-	CELL_VIDEO_OUT_EVENT_DEVICE_AUTHENTICATED = 2,
-	CELL_VIDEO_OUT_EVENT_OUTPUT_ENABLED       = 3,
+	CELL_VIDEO_OUT_EVENT_DEVICE_CHANGED,
+	CELL_VIDEO_OUT_EVENT_OUTPUT_DISABLED,
+	CELL_VIDEO_OUT_EVENT_DEVICE_AUTHENTICATED,
+	CELL_VIDEO_OUT_EVENT_OUTPUT_ENABLED,
 };
 
 enum CellVideoOutCopyControl : s32
 {
-	CELL_VIDEO_OUT_COPY_CONTROL_COPY_FREE  = 0,
-	CELL_VIDEO_OUT_COPY_CONTROL_COPY_ONCE  = 1,
-	CELL_VIDEO_OUT_COPY_CONTROL_COPY_NEVER = 2,
+	CELL_VIDEO_OUT_COPY_CONTROL_COPY_FREE,
+	CELL_VIDEO_OUT_COPY_CONTROL_COPY_ONCE,
+	CELL_VIDEO_OUT_COPY_CONTROL_COPY_NEVER,
 };
 
 enum CellVideoOutRGBOutputRange : s32
 {
-	CELL_VIDEO_OUT_RGB_OUTPUT_RANGE_LIMITED = 0,
-	CELL_VIDEO_OUT_RGB_OUTPUT_RANGE_FULL    = 1,
+	CELL_VIDEO_OUT_RGB_OUTPUT_RANGE_LIMITED,
+	CELL_VIDEO_OUT_RGB_OUTPUT_RANGE_FULL,
 };
 
 using CellVideoOutCallback = s32(u32 slot, u32 videoOut, u32 deviceIndex, u32 event, vm::ptr<CellVideoOutDeviceInfo> info, vm::ptr<void> userData);
diff --git a/rpcs3/Emu/Cell/Modules/cellVoice.cpp b/rpcs3/Emu/Cell/Modules/cellVoice.cpp
index 7c507a26a3..3d74687565 100644
--- a/rpcs3/Emu/Cell/Modules/cellVoice.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellVoice.cpp
@@ -46,12 +46,6 @@ void voice_manager::reset()
 	queue_keys.clear();
 }
 
-void voice_manager::save(utils::serial& ar)
-{
-	GET_OR_USE_SERIALIZATION_VERSION(ar.is_writing(), cellVoice);
-	ar(id_ctr, port_source, ports, queue_keys, voice_service_started);
-}
-
 error_code cellVoiceConnectIPortToOPort(u32 ips, u32 ops)
 {
 	cellVoice.todo("cellVoiceConnectIPortToOPort(ips=%d, ops=%d)", ips, ops);
@@ -156,7 +150,6 @@ error_code cellVoiceCreatePort(vm::ptr<u32> portId, vm::cptr<CellVoicePortParam>
 			return CELL_VOICE_ERROR_ARGUMENT_INVALID;
 		}
 		}
-		break;
 	}
 	case CELLVOICE_PORTTYPE_IN_MIC:
 	case CELLVOICE_PORTTYPE_OUT_SECONDARY:
@@ -852,8 +845,7 @@ error_code cellVoiceWriteToIPortEx2(u32 ips, vm::cptr<void> data, vm::ptr<u32> s
 
 error_code cellVoiceReadFromOPort(u32 ops, vm::ptr<void> data, vm::ptr<u32> size)
 {
-	// Spammy TODO
-	cellVoice.trace("cellVoiceReadFromOPort(ops=%d, data=*0x%x, size=*0x%x)", ops, data, size);
+	cellVoice.todo("cellVoiceReadFromOPort(ops=%d, data=*0x%x, size=*0x%x)", ops, data, size);
 
 	auto& manager = g_fxo->get<voice_manager>();
 
diff --git a/rpcs3/Emu/Cell/Modules/cellVoice.h b/rpcs3/Emu/Cell/Modules/cellVoice.h
index 2b269f50c6..6fc6037096 100644
--- a/rpcs3/Emu/Cell/Modules/cellVoice.h
+++ b/rpcs3/Emu/Cell/Modules/cellVoice.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <unordered_map>
+#include <deque>
+
 // libvoice = 0x80310801 - 0x803108ff
 // libvoice version 100
 
@@ -179,8 +182,6 @@ struct voice_manager
 	{
 		s32 state = CELLVOICE_PORTSTATE_NULL;
 		CellVoicePortParam info;
-
-		ENABLE_BITWISE_SERIALIZATION;
 	};
 
 	// See cellVoiceCreatePort
@@ -209,10 +210,4 @@ struct voice_manager
 	void reset();
 	shared_mutex mtx;
 	atomic_t<bool> is_init{ false };
-
-	SAVESTATE_INIT_POS(17);
-
-	voice_manager() = default;
-	voice_manager(utils::serial& ar) { save(ar); }
-	void save(utils::serial& ar);
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellVpost.cpp b/rpcs3/Emu/Cell/Modules/cellVpost.cpp
index 773bb96783..514aad9f7b 100644
--- a/rpcs3/Emu/Cell/Modules/cellVpost.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellVpost.cpp
@@ -205,7 +205,7 @@ error_code cellVpostClose(u32 handle)
 {
 	cellVpost.warning("cellVpostClose(handle=0x%x)", handle);
 
-	const auto vpost = idm::get_unlocked<VpostInstance>(handle);
+	const auto vpost = idm::get<VpostInstance>(handle);
 
 	if (!vpost)
 	{
@@ -220,7 +220,7 @@ error_code cellVpostExec(u32 handle, vm::cptr<u8> inPicBuff, vm::cptr<CellVpostC
 {
 	cellVpost.trace("cellVpostExec(handle=0x%x, inPicBuff=*0x%x, ctrlParam=*0x%x, outPicBuff=*0x%x, picInfo=*0x%x)", handle, inPicBuff, ctrlParam, outPicBuff, picInfo);
 
-	const auto vpost = idm::get_unlocked<VpostInstance>(handle);
+	const auto vpost = idm::get<VpostInstance>(handle);
 
 	if (!vpost)
 	{
diff --git a/rpcs3/Emu/Cell/Modules/cellVpost.h b/rpcs3/Emu/Cell/Modules/cellVpost.h
index 6e7919158e..00b14adeb8 100644
--- a/rpcs3/Emu/Cell/Modules/cellVpost.h
+++ b/rpcs3/Emu/Cell/Modules/cellVpost.h
@@ -340,7 +340,6 @@ public:
 	static const u32 id_base = 1;
 	static const u32 id_step = 1;
 	static const u32 id_count = 1023;
-	SAVESTATE_INIT_POS(23);
 
 	const bool to_rgba;
 
diff --git a/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp b/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp
index 7f560c9ca3..8a9991b089 100644
--- a/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp
@@ -4,8 +4,6 @@
 #include "cellWebBrowser.h"
 #include "Emu/IdManager.h"
 
-#include "cellSysutil.h"
-
 LOG_CHANNEL(cellSysutil);
 
 struct browser_info
diff --git a/rpcs3/Emu/Cell/Modules/cellWebBrowser.h b/rpcs3/Emu/Cell/Modules/cellWebBrowser.h
index 6c46c581b1..7a66f5b421 100644
--- a/rpcs3/Emu/Cell/Modules/cellWebBrowser.h
+++ b/rpcs3/Emu/Cell/Modules/cellWebBrowser.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "cellSysutil.h"
+
 #include "Emu/Memory/vm_ptr.h"
 
 //events
diff --git a/rpcs3/Emu/Cell/Modules/libmixer.cpp b/rpcs3/Emu/Cell/Modules/libmixer.cpp
index e92b5c6cf4..c9a6f6dca9 100644
--- a/rpcs3/Emu/Cell/Modules/libmixer.cpp
+++ b/rpcs3/Emu/Cell/Modules/libmixer.cpp
@@ -510,7 +510,7 @@ s32 cellSurMixerCreate(vm::cptr<CellSurMixerConfig> config)
 
 	libmixer.warning("*** surMixer created (ch1=%d, ch2=%d, ch6=%d, ch8=%d)", config->chStrips1, config->chStrips2, config->chStrips6, config->chStrips8);
 
-	//auto thread = idm::make_ptr<named_thread<ppu_thread>>("Surmixer Thread");
+	//auto thread = idm::make_ptr<ppu_thread>("Surmixer Thread");
 
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/Cell/Modules/libsnd3.cpp b/rpcs3/Emu/Cell/Modules/libsnd3.cpp
index 146d9ad6a5..0263f92ff6 100644
--- a/rpcs3/Emu/Cell/Modules/libsnd3.cpp
+++ b/rpcs3/Emu/Cell/Modules/libsnd3.cpp
@@ -34,303 +34,308 @@ void fmt_class_string<CellSnd3Error>::format(std::string& out, u64 arg)
 	});
 }
 
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 error_code cellSnd3Init(u32 maxVoice, u32 samples, vm::ptr<CellSnd3RequestQueueCtx> queue)
 {
-	libsnd3.todo("cellSnd3Init(maxVoice=%d, samples=%d, queue=*0x%x)", maxVoice, samples, queue);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3Exit()
 {
-	libsnd3.todo("cellSnd3Exit()");
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 u16 cellSnd3Note2Pitch(u16 center_note, u16 center_fine, u16 note, s16 fine)
 {
-	libsnd3.todo("cellSnd3Note2Pitch(center_note=%d, center_fine=%d, note=%d, fine=%d)", center_note, center_fine, note, fine);
+	libsnd3.todo("cellSnd3Note2Pitch()");
 	return 0;
 }
 
 u16 cellSnd3Pitch2Note(u16 center_note, u16 center_fine, u16 pitch)
 {
-	libsnd3.todo("cellSnd3Pitch2Note(center_note=%d, center_fine=%d, pitch=%d)", center_note, center_fine, pitch);
+	libsnd3.todo("cellSnd3Pitch2Note()");
 	return 0;
 }
 
 error_code cellSnd3SetOutputMode(u32 mode)
 {
-	libsnd3.todo("cellSnd3SetOutputMode(mode=%d)", mode);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3Synthesis(vm::ptr<f32> pOutL, vm::ptr<f32> pOutR)
 {
-	libsnd3.todo("cellSnd3Synthesis(pOutL=*0x%x, pOutR=*0x%x)", pOutL, pOutR);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SynthesisEx(vm::ptr<f32> pOutL, vm::ptr<f32> pOutR, vm::ptr<f32> pOutRL, vm::ptr<f32> pOutRR)
 {
-	libsnd3.todo("cellSnd3SynthesisEx(pOutL=*0x%x, pOutR=*0x%x, pOutRL=*0x%x, pOutRR=*0x%x)", pOutL, pOutR, pOutRL, pOutRR);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3BindSoundData(vm::ptr<CellSnd3DataCtx> snd3Ctx, vm::ptr<void> hd3, u32 synthMemOffset)
 {
-	libsnd3.todo("cellSnd3BindSoundData(snd3Ctx=*0x%x, hd3=*0x%x, synthMemOffset=0x%x)", snd3Ctx, hd3, synthMemOffset);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3UnbindSoundData(u32 hd3ID)
 {
-	libsnd3.todo("cellSnd3UnbindSoundData(hd3ID=0x%x)", hd3ID);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3NoteOnByTone(u32 hd3ID, u32 toneIndex, u32 note, u32 keyOnID, vm::ptr<CellSnd3KeyOnParam> keyOnParam)
 {
-	libsnd3.todo("cellSnd3NoteOnByTone(hd3ID=0x%x, toneIndex=%d, note=%d, keyOnID=0x%x, keyOnParam=*0x%x)", hd3ID, toneIndex, note, keyOnID, keyOnParam);
+	libsnd3.todo("cellSnd3NoteOnByTone()");
 	return CELL_OK;
 }
 
 error_code cellSnd3KeyOnByTone(u32 hd3ID, u32 toneIndex, u32 pitch, u32 keyOnID, vm::ptr<CellSnd3KeyOnParam> keyOnParam)
 {
-	libsnd3.todo("cellSnd3KeyOnByTone(hd3ID=0x%x, toneIndex=%d, pitch=%d, keyOnID=0x%x, keyOnParam=*0x%x)", hd3ID, toneIndex, pitch, keyOnID, keyOnParam);
+	libsnd3.todo("cellSnd3KeyOnByTone()");
 	return CELL_OK;
 }
 
 error_code cellSnd3VoiceNoteOnByTone(u32 hd3ID, u32 voiceNum, u32 toneIndex, u32 note, u32 keyOnID, vm::ptr<CellSnd3KeyOnParam> keyOnParam)
 {
-	libsnd3.todo("cellSnd3VoiceNoteOnByTone(hd3ID=0x%x, voiceNum=%d, toneIndex=%d, note=%d, keyOnID=0x%x, keyOnParam=*0x%x)", hd3ID, voiceNum, toneIndex, note, keyOnID, keyOnParam);
+	libsnd3.todo("cellSnd3VoiceNoteOnByTone()");
 	return CELL_OK;
 }
 
 error_code cellSnd3VoiceKeyOnByTone(u32 hd3ID, u32 voiceNum, u32 toneIndex, u32 pitch, u32 keyOnID, vm::ptr<CellSnd3KeyOnParam> keyOnParam)
 {
-	libsnd3.todo("cellSnd3VoiceKeyOnByTone(hd3ID=0x%x, voiceNum=%d, toneIndex=%d, pitch=%d, keyOnID=0x%x, keyOnParam=*0x%x)", hd3ID, voiceNum, toneIndex, pitch, keyOnID, keyOnParam);
+	libsnd3.todo("cellSnd3VoiceKeyOnByTone()");
 	return CELL_OK;
 }
 
 error_code cellSnd3VoiceSetReserveMode(u32 voiceNum, u32 reserveMode)
 {
-	libsnd3.todo("cellSnd3VoiceSetReserveMode(voiceNum=%d, reserveMode=%d)", voiceNum, reserveMode);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3VoiceSetSustainHold(u32 voiceNum, u32 sustainHold)
 {
-	libsnd3.todo("cellSnd3VoiceSetSustainHold(voiceNum=%d, sustainHold=%d)", voiceNum, sustainHold);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3VoiceKeyOff(u32 voiceNum)
 {
-	libsnd3.todo("cellSnd3VoiceKeyOff(voiceNum=%d)", voiceNum);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3VoiceSetPitch(u32 voiceNum, s32 addPitch)
 {
-	libsnd3.todo("cellSnd3VoiceSetPitch(voiceNum=%d, addPitch=%d)", voiceNum, addPitch);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3VoiceSetVelocity(u32 voiceNum, u32 velocity)
 {
-	libsnd3.todo("cellSnd3VoiceSetVelocity(voiceNum=%d, velocity=%d)", voiceNum, velocity);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3VoiceSetPanpot(u32 voiceNum, u32 panpot)
 {
-	libsnd3.todo("cellSnd3VoiceSetPanpot(voiceNum=%d, panpot=%d)", voiceNum, panpot);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3VoiceSetPanpotEx(u32 voiceNum, u32 panpotEx)
 {
-	libsnd3.todo("cellSnd3VoiceSetPanpotEx(voiceNum=%d, panpotEx=%d)", voiceNum, panpotEx);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3VoiceSetPitchBend(u32 voiceNum, u32 bendValue)
 {
-	libsnd3.todo("cellSnd3VoiceSetPitchBend(voiceNum=%d, bendValue=%d)", voiceNum, bendValue);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3VoiceAllKeyOff()
 {
-	libsnd3.todo("cellSnd3VoiceAllKeyOff()");
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3VoiceGetEnvelope(u32 voiceNum)
 {
-	libsnd3.todo("cellSnd3VoiceGetEnvelope(voiceNum=%d)", voiceNum);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3VoiceGetStatus(u32 voiceNum)
 {
-	libsnd3.todo("cellSnd3VoiceGetStatus(voiceNum=%d)", voiceNum);
+	libsnd3.todo("cellSnd3VoiceGetStatus()");
 	return CELL_OK;
 }
 
 u32 cellSnd3KeyOffByID(u32 keyOnID)
 {
-	libsnd3.todo("cellSnd3KeyOffByID(keyOnID=%d)", keyOnID);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3GetVoice(u32 midiChannel, u32 keyOnID, vm::ptr<CellSnd3VoiceBitCtx> voiceBit)
 {
-	libsnd3.todo("cellSnd3GetVoice(midiChannel=%d, keyOnID=%d, voiceBit=*0x%x)", midiChannel, keyOnID, voiceBit);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3GetVoiceByID(u32 ID, vm::ptr<CellSnd3VoiceBitCtx> voiceBit)
 {
-	libsnd3.todo("cellSnd3GetVoiceByID(ID=%d, voiceBit=*0x%x)", ID, voiceBit);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3NoteOn(u32 hd3ID, u32 midiChannel, u32 midiProgram, u32 midiNote, u32 sustain, vm::ptr<CellSnd3KeyOnParam> keyOnParam, u32 keyOnID)
 {
-	libsnd3.todo("cellSnd3NoteOn(hd3ID=%d, midiChannel=%d, midiProgram=%d, midiNote=%d, sustain=%d, keyOnParam=*0x%x, keyOnID=%d)", hd3ID, midiChannel, midiProgram, midiNote, sustain, keyOnParam, keyOnID);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3NoteOff(u32 midiChannel, u32 midiNote, u32 keyOnID)
 {
-	libsnd3.todo("cellSnd3NoteOff(midiChannel=%d, midiNote=%d, keyOnID=%d)", midiChannel, midiNote, keyOnID);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SetSustainHold(u32 midiChannel, u32 sustainHold, u32 keyOnID)
 {
-	libsnd3.todo("cellSnd3SetSustainHold(midiChannel=%d, sustainHold=%d, keyOnID=%d)", midiChannel, sustainHold, keyOnID);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SetEffectType(u16 effectType, s16 returnVol, u16 delay, u16 feedback)
 {
-	libsnd3.todo("cellSnd3SetEffectType(effectType=%d, returnVol=%d, delay=%d, feedback=%d)", effectType, returnVol, delay, feedback);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFBind(vm::ptr<CellSnd3SmfCtx> smfCtx, vm::ptr<void> smf, u32 hd3ID)
 {
-	libsnd3.todo("cellSnd3SMFBind(smfCtx=*0x%x, delay=*0x%x, hd3ID=%d)", smfCtx, smf, hd3ID);
+	libsnd3.todo("cellSnd3SMFBind()");
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFUnbind(u32 smfID)
 {
-	libsnd3.todo("cellSnd3SMFUnbind(smfID=%d)", smfID);
+	libsnd3.todo("cellSnd3SMFUnbind()");
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFPlay(u32 smfID, u32 playVelocity, u32 playPan, u32 playCount)
 {
-	libsnd3.todo("cellSnd3SMFPlay(smfID=%d, playVelocity=%d, playPan=%d, playCount=%d)", smfID, playVelocity, playPan, playCount);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFPlayEx(u32 smfID, u32 playVelocity, u32 playPan, u32 playPanEx, u32 playCount)
 {
-	libsnd3.todo("cellSnd3SMFPlayEx(smfID=%d, playVelocity=%d, playPan=%d, playPanEx=%d, playCount=%d)", smfID, playVelocity, playPan, playPanEx, playCount);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFPause(u32 smfID)
 {
-	libsnd3.todo("cellSnd3SMFPause(smfID=%d)", smfID);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFResume(u32 smfID)
 {
-	libsnd3.todo("cellSnd3SMFResume(smfID=%d)", smfID);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFStop(u32 smfID)
 {
-	libsnd3.todo("cellSnd3SMFStop(smfID=%d)", smfID);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFAddTempo(u32 smfID, s32 addTempo)
 {
-	libsnd3.todo("cellSnd3SMFAddTempo(smfID=%d, addTempo=%d)", smfID, addTempo);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFGetTempo(u32 smfID)
 {
-	libsnd3.todo("cellSnd3SMFGetTempo(smfID=%d)", smfID);
+	libsnd3.todo("cellSnd3SMFGetTempo()");
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFSetPlayVelocity(u32 smfID, u32 playVelocity)
 {
-	libsnd3.todo("cellSnd3SMFSetPlayVelocity(smfID=%d, playVelocity=%d)", smfID, playVelocity);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFGetPlayVelocity(u32 smfID)
 {
-	libsnd3.todo("cellSnd3SMFGetPlayVelocity(smfID=%d)", smfID);
+	libsnd3.todo("cellSnd3SMFGetPlayVelocity()");
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFSetPlayPanpot(u32 smfID, u32 playPanpot)
 {
-	libsnd3.todo("cellSnd3SMFSetPlayPanpot(smfID=%d, playPanpot=%d)", smfID, playPanpot);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFSetPlayPanpotEx(u32 smfID, u32 playPanpotEx)
 {
-	libsnd3.todo("cellSnd3SMFSetPlayPanpotEx(smfID=%d, playPanpotEx=%d)", smfID, playPanpotEx);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFGetPlayPanpot(u32 smfID)
 {
-	libsnd3.todo("cellSnd3SMFGetPlayPanpot(smfID=%d)", smfID);
+	libsnd3.todo("cellSnd3SMFGetPlayPanpot()");
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFGetPlayPanpotEx(u32 smfID)
 {
-	libsnd3.todo("cellSnd3SMFGetPlayPanpotEx(smfID=%d)", smfID);
+	libsnd3.todo("cellSnd3SMFGetPlayPanpotEx()");
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFGetPlayStatus(u32 smfID)
 {
-	libsnd3.todo("cellSnd3SMFGetPlayStatus(smfID=%d)", smfID);
+	libsnd3.todo("cellSnd3SMFGetPlayStatus()");
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFSetPlayChannel(u32 smfID, u32 playChannelBit)
 {
-	libsnd3.todo("cellSnd3SMFSetPlayChannel(smfID=%d, playChannelBit=%d)", smfID, playChannelBit);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFGetPlayChannel(u32 smfID, vm::ptr<u32> playChannelBit)
 {
-	libsnd3.todo("cellSnd3SMFGetPlayChannel(smfID=%d, playChannelBit=*0x%x)", smfID, playChannelBit);
+	libsnd3.todo("cellSnd3SMFGetPlayChannel()");
 	return CELL_OK;
 }
 
 error_code cellSnd3SMFGetKeyOnID(u32 smfID, u32 midiChannel, vm::ptr<u32> keyOnID)
 {
-	libsnd3.todo("cellSnd3SMFAddTempo(smfID=%d, midiChannel=%d, keyOnID=*0x%x)", smfID, midiChannel, keyOnID);
+	UNIMPLEMENTED_FUNC(libsnd3);
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp
index 5b5b32cefe..708e7e59d8 100644
--- a/rpcs3/Emu/Cell/Modules/sceNp.cpp
+++ b/rpcs3/Emu/Cell/Modules/sceNp.cpp
@@ -1,10 +1,8 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/system_utils.hpp"
+#include "Emu/VFS.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/Modules/cellUserInfo.h"
-#include "Emu/Io/interception.h"
-#include "Utilities/StrUtil.h"
 
 #include "sysPrxForUser.h"
 #include "Emu/IdManager.h"
@@ -14,28 +12,12 @@
 #include "sceNp.h"
 #include "cellSysutil.h"
 
-#include "Emu/Cell/timers.hpp"
 #include "Emu/Cell/lv2/sys_time.h"
-#include "Emu/Cell/lv2/sys_fs.h"
-#include "Emu/Cell/lv2/sys_sync.h"
 #include "Emu/NP/np_handler.h"
 #include "Emu/NP/np_contexts.h"
-#include "Emu/NP/np_helpers.h"
-#include "Emu/NP/np_structs_extra.h"
-#include "Emu/NP/signaling_handler.h"
-#include "Emu/system_config.h"
-
-#include "Emu/RSX/Overlays/overlay_manager.h"
-#include "Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.h"
-#include "Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.h"
 
 LOG_CHANNEL(sceNp);
 
-error_code sceNpManagerGetNpId(vm::ptr<SceNpId> npId);
-error_code sceNpCommerceGetCurrencyInfo(vm::ptr<SceNpCommerceProductCategory> pc, vm::ptr<SceNpCommerceCurrencyInfo> info);
-
-error_code check_text(vm::cptr<char> text);
-
 template <>
 void fmt_class_string<SceNpError>::format(std::string& out, u64 arg)
 {
@@ -222,78 +204,6 @@ void fmt_class_string<SceNpError>::format(std::string& out, u64 arg)
 			STR_CASE(SCE_NP_COMMUNITY_SERVER_ERROR_TITLE_USER_STORAGE_END_OF_SERVICE);
 			STR_CASE(SCE_NP_COMMUNITY_SERVER_ERROR_TITLE_USER_STORAGE_MAINTENANCE);
 			STR_CASE(SCE_NP_COMMUNITY_SERVER_ERROR_UNSPECIFIED);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_ALREADY_INITIALIZED);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_OUT_OF_MEMORY);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_UNSUPPORTED_VERSION);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CTX_MAX);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CTX_NOT_FOUND);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CTXID_NOT_AVAILABLE);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_REQ_MAX);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_REQ_NOT_FOUND);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_REQID_NOT_AVAILABLE);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_CATEGORY_ID);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_LANG_CODE);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_REQ_BUSY);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INSUFFICIENT_BUFFER);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_REQ_STATE);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_CTX_STATE);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_UNKNOWN);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_REQ_TYPE);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_MEMORY_CONTAINER);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INSUFFICIENT_MEMORY_CONTAINER);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_DATA_FLAG_TYPE);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_DATA_FLAG_STATE);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_DATA_FLAG_NUM_NOT_FOUND);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_DATA_FLAG_INFO_NOT_FOUND);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_PROVIDER_ID);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_DATA_FLAG_NUM);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_SKU_ID);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_DATA_FLAG_ID);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_GPC_SEND_REQUEST);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_GDF_SEND_REQUEST);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_SDF_SEND_REQUEST);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_PARSE_PRODUCT_CATEGORY);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CURRENCY_INFO_NOT_FOUND);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CATEGORY_INFO_NOT_FOUND);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CHILD_CATEGORY_COUNT_NOT_FOUND);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CHILD_CATEGORY_INFO_NOT_FOUND);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_SKU_COUNT_NOT_FOUND);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_SKU_INFO_NOT_FOUND);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_PLUGIN_LOAD_FAILURE);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_SKU_NUM);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_INVALID_GPC_PROTOCOL_VERSION);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CHECKOUT_UNEXPECTED);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CHECKOUT_OUT_OF_SERVICE);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CHECKOUT_INVALID_SKU);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CHECKOUT_SERVER_BUSY);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CHECKOUT_MAINTENANCE);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CHECKOUT_ACCOUNT_SUSPENDED);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CHECKOUT_OVER_SPENDING_LIMIT);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CHECKOUT_NOT_ENOUGH_MONEY);
-			STR_CASE(SCE_NP_COMMERCE_ERROR_CHECKOUT_UNKNOWN);
-			STR_CASE(SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_UNKNOWN);
-			STR_CASE(SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_INVALID_CREDENTIALS);
-			STR_CASE(SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_INVALID_CATEGORY_ID);
-			STR_CASE(SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_SERVICE_END);
-			STR_CASE(SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_SERVICE_STOP);
-			STR_CASE(SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_SERVICE_BUSY);
-			STR_CASE(SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_UNSUPPORTED_VERSION);
-			STR_CASE(SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_INTERNAL_SERVER);
-			STR_CASE(SCE_NP_COMMERCE_GDF_SERVER_ERROR_UNKNOWN);
-			STR_CASE(SCE_NP_COMMERCE_GDF_SERVER_ERROR_INVALID_CREDENTIALS);
-			STR_CASE(SCE_NP_COMMERCE_GDF_SERVER_ERROR_INVALID_FLAGLIST);
-			STR_CASE(SCE_NP_COMMERCE_GDF_SERVER_ERROR_SERVICE_END);
-			STR_CASE(SCE_NP_COMMERCE_GDF_SERVER_ERROR_SERVICE_STOP);
-			STR_CASE(SCE_NP_COMMERCE_GDF_SERVER_ERROR_SERVICE_BUSY);
-			STR_CASE(SCE_NP_COMMERCE_GDF_SERVER_ERROR_UNSUPPORTED_VERSION);
-			STR_CASE(SCE_NP_COMMERCE_SDF_SERVER_ERROR_UNKNOWN);
-			STR_CASE(SCE_NP_COMMERCE_SDF_SERVER_ERROR_INVALID_CREDENTIALS);
-			STR_CASE(SCE_NP_COMMERCE_SDF_SERVER_ERROR_INVALID_FLAGLIST);
-			STR_CASE(SCE_NP_COMMERCE_SDF_SERVER_ERROR_SERVICE_END);
-			STR_CASE(SCE_NP_COMMERCE_SDF_SERVER_ERROR_SERVICE_STOP);
-			STR_CASE(SCE_NP_COMMERCE_SDF_SERVER_ERROR_SERVICE_BUSY);
-			STR_CASE(SCE_NP_COMMERCE_SDF_SERVER_ERROR_UNSUPPORTED_VERSION);
 			STR_CASE(SCE_NP_DRM_ERROR_LICENSE_NOT_FOUND);
 			STR_CASE(SCE_NP_DRM_ERROR_OUT_OF_MEMORY);
 			STR_CASE(SCE_NP_DRM_ERROR_INVALID_PARAM);
@@ -480,105 +390,17 @@ void fmt_class_string<SceNpError>::format(std::string& out, u64 arg)
 			STR_CASE(SCE_NP_CUSTOM_MENU_ERROR_NOT_REGISTERED);
 			STR_CASE(SCE_NP_CUSTOM_MENU_ERROR_EXCEEDS_MAX);
 			STR_CASE(SCE_NP_CUSTOM_MENU_ERROR_INVALID_CHARACTER);
-			STR_CASE(SCE_NP_EULA_ERROR_UNKNOWN);
-			STR_CASE(SCE_NP_EULA_ERROR_INVALID_ARGUMENT);
-			STR_CASE(SCE_NP_EULA_ERROR_NOT_INITIALIZED);
-			STR_CASE(SCE_NP_EULA_ERROR_ALREADY_INITIALIZED);
-			STR_CASE(SCE_NP_EULA_ERROR_OUT_OF_MEMORY);
-			STR_CASE(SCE_NP_EULA_ERROR_BUSY);
-			STR_CASE(SCE_NP_EULA_ERROR_EULA_NOT_FOUND);
-			STR_CASE(SCE_NP_EULA_ERROR_NET_OUT_OF_MEMORY);
-			STR_CASE(SCE_NP_EULA_ERROR_CONF_FORMAT);
-			STR_CASE(SCE_NP_EULA_ERROR_CONF_INVALID_FILENAME);
-			STR_CASE(SCE_NP_EULA_ERROR_CONF_TOO_MANY_EULA_FILES);
-			STR_CASE(SCE_NP_EULA_ERROR_CONF_INVALID_LANGUAGE);
-			STR_CASE(SCE_NP_EULA_ERROR_CONF_INVALID_COUNTRY);
-			STR_CASE(SCE_NP_EULA_ERROR_CONF_INVALID_NPCOMMID);
-			STR_CASE(SCE_NP_EULA_ERROR_CONF_INVALID_EULA_VERSION);
-			STR_CASE(SCE_NP_MATCHING_ERROR_NOT_INITIALIZED);
-			STR_CASE(SCE_NP_MATCHING_ERROR_ALREADY_INITIALIZED);
-			STR_CASE(SCE_NP_MATCHING_ERROR_INVALID_ARG);
-			STR_CASE(SCE_NP_MATCHING_ERROR_TERMINATED);
-			STR_CASE(SCE_NP_MATCHING_ERROR_TIMEOUT);
-			STR_CASE(SCE_NP_MATCHING_ERROR_OUT_OF_MEMORY);
-			STR_CASE(SCE_NP_MATCHING_ERROR_CTXID_NOT_AVAIL);
-			STR_CASE(SCE_NP_MATCHING_ERROR_CTX_ALREADY_EXIST);
-			STR_CASE(SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND);
-			STR_CASE(SCE_NP_MATCHING_ERROR_LOBBY_NOT_FOUND);
-			STR_CASE(SCE_NP_MATCHING_ERROR_ROOM_NOT_FOUND);
-			STR_CASE(SCE_NP_MATCHING_ERROR_MEMBER_NOT_FOUND);
-			STR_CASE(SCE_NP_MATCHING_ERROR_TOO_BIG_VALUE);
-			STR_CASE(SCE_NP_MATCHING_ERROR_IVALID_ATTR_TYPE);
-			STR_CASE(SCE_NP_MATCHING_ERROR_INVALID_ATTR_ID);
-			STR_CASE(SCE_NP_MATCHING_ERROR_ALREADY_REQUESTED);
-			STR_CASE(SCE_NP_MATCHING_ERROR_LIMITTED_SEATING);
-			STR_CASE(SCE_NP_MATCHING_ERROR_LOCKED);
-			STR_CASE(SCE_NP_MATCHING_ERROR_CTX_STILL_RUNNING);
-			STR_CASE(SCE_NP_MATCHING_ERROR_INSUFFICIENT_BUFFER);
-			STR_CASE(SCE_NP_MATCHING_ERROR_REQUEST_NOT_ALLOWED);
-			STR_CASE(SCE_NP_MATCHING_ERROR_CTX_MAX);
-			STR_CASE(SCE_NP_MATCHING_ERROR_INVALID_REQ_ID);
-			STR_CASE(SCE_NP_MATCHING_ERROR_RESULT_NOT_FOUND);
-			STR_CASE(SCE_NP_MATCHING_ERROR_BUSY);
-			STR_CASE(SCE_NP_MATCHING_ERROR_ALREADY_JOINED_ROOM);
-			STR_CASE(SCE_NP_MATCHING_ERROR_ROOM_MAX);
-			STR_CASE(SCE_NP_MATCHING_ERROR_QUICK_MATCH_PLAYER_NOT_FOUND);
-			STR_CASE(SCE_NP_MATCHING_ERROR_COND_MAX);
-			STR_CASE(SCE_NP_MATCHING_ERROR_INVALID_COND);
-			STR_CASE(SCE_NP_MATCHING_ERROR_INVALID_ATTR);
-			STR_CASE(SCE_NP_MATCHING_ERROR_COMP_OP_INEQUALITY_MAX);
-			STR_CASE(SCE_NP_MATCHING_ERROR_RESULT_OVERFLOWED);
-			STR_CASE(SCE_NP_MATCHING_ERROR_HTTPXML_TIMEOUT);
-			STR_CASE(SCE_NP_MATCHING_ERROR_CANCELED);
-			STR_CASE(SCE_NP_MATCHING_ERROR_SEARCH_JOIN_ROOM_NOT_FOUND);
-			STR_CASE(SCE_NP_MATCHING_ERROR_INVALID_COMP_OP);
-			STR_CASE(SCE_NP_MATCHING_ERROR_INVALID_COMP_TYPE);
-			STR_CASE(SCE_NP_MATCHING_ERROR_REQUEST_NOT_FOUND);
-			STR_CASE(SCE_NP_MATCHING_ERROR_INTERNAL_ERROR);
-			STR_CASE(SCE_NP_MATCHING_ERROR_INVALID_PROTOCOL_ID);
-			STR_CASE(SCE_NP_MATCHING_ERROR_ATTR_NOT_SPECIFIED);
-			STR_CASE(SCE_NP_MATCHING_ERROR_SYSUTIL_INVALID_RESULT);
-			STR_CASE(SCE_NP_MATCHING_ERROR_PLUGIN_LOAD_FAILURE);
-			STR_CASE(SCE_NP_MATCHING_ERROR_INVALID_ATTR_VALUE);
-			STR_CASE(SCE_NP_MATCHING_ERROR_DUPLICATE);
-			STR_CASE(SCE_NP_MATCHING_ERROR_INVALID_MEMORY_CONTAINER);
-			STR_CASE(SCE_NP_MATCHING_ERROR_SHUTDOWN);
-			STR_CASE(SCE_NP_MATCHING_ERROR_SYSUTIL_SERVER_BUSY);
-			STR_CASE(SCE_NP_MATCHING_ERROR_SEND_INVITATION_PARTIALLY_FAILED);
-			STR_CASE(SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_OUT_OF_SERVICE);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_MAINTENANCE);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_SERVER_BUSY);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_ACCESS_FORBIDDEN);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_SERVER);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_LOBBY);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_ROOM);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_USER);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_NOT_ALLOWED);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_UNKNOWN);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_BAD_REQUEST_STANZA);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_REQUEST_FORBIDDEN);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_INTERNAL_ERROR);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_ROOM_OVER);
-			STR_CASE(SCE_NP_MATCHING_SERVER_ERROR_ROOM_CLOSED);
 		}
 
 		return unknown;
 	});
 }
 
-void message_data::print() const
-{
-	sceNp.notice("commId: %s, msgId: %d, mainType: %d, subType: %d, subject: %s, body: %s, data_size: %d", static_cast<const char *>(commId.data), msgId, mainType, subType, subject, body, data.size());
-}
-
-extern void lv2_sleep(u64 timeout, ppu_thread* ppu = nullptr);
-
 error_code sceNpInit(u32 poolsize, vm::ptr<void> poolptr)
 {
 	sceNp.warning("sceNpInit(poolsize=0x%x, poolptr=*0x%x)", poolsize, poolptr);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	std::lock_guard lock(nph.mutex_status);
 
@@ -587,16 +409,20 @@ error_code sceNpInit(u32 poolsize, vm::ptr<void> poolptr)
 		return SCE_NP_ERROR_ALREADY_INITIALIZED;
 	}
 
-	if (poolsize == 0 || !poolptr)
+	if (poolsize == 0)
 	{
 		return SCE_NP_ERROR_INVALID_ARGUMENT;
 	}
-
-	if (poolsize < SCE_NP_MIN_POOL_SIZE)
+	else if (poolsize < SCE_NP_MIN_POOLSIZE)
 	{
 		return SCE_NP_ERROR_INSUFFICIENT_BUFFER;
 	}
 
+	if (!poolptr)
+	{
+		return SCE_NP_ERROR_INVALID_ARGUMENT;
+	}
+
 	nph.init_NP(poolsize, poolptr);
 	nph.is_NP_init = true;
 
@@ -607,7 +433,7 @@ error_code sceNpTerm()
 {
 	sceNp.warning("sceNpTerm()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	std::lock_guard lock(nph.mutex_status);
 
@@ -619,50 +445,39 @@ error_code sceNpTerm()
 	nph.terminate_NP();
 	nph.is_NP_init = false;
 
-	idm::clear<signaling_ctx>();
-
-	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-	sigh.clear_sig_ctx();
-
-	// TODO: Other contexts(special handling for transaction contexts?)
-
 	return CELL_OK;
 }
 
 error_code npDrmIsAvailable(vm::cptr<u8> k_licensee_addr, vm::cptr<char> drm_path)
 {
-	if (!drm_path)
-	{
-		return SCE_NP_DRM_ERROR_INVALID_PARAM;
-	}
-
 	u128 k_licensee{};
 
 	if (k_licensee_addr)
 	{
 		std::memcpy(&k_licensee, k_licensee_addr.get_ptr(), sizeof(k_licensee));
-		sceNp.notice("npDrmIsAvailable(): KLicense key or KLIC=%s", std::bit_cast<be_t<u128>>(k_licensee));
+		sceNp.notice("npDrmIsAvailable(): KLicense key %s", std::bit_cast<be_t<u128>>(k_licensee));
 	}
 
-	if (Emu.GetFakeCat() == "PE")
+	if (Emu.GetCat() == "PE")
 	{
 		std::memcpy(&k_licensee, NP_PSP_KEY_2, sizeof(k_licensee));
 		sceNp.success("npDrmIsAvailable(): PSP remaster KLicense key applied.");
 	}
 
-	std::string enc_drm_path;
-	ensure(vm::read_string(drm_path.addr(), 0x100, enc_drm_path, true), "Secret access violation");
+	const std::string enc_drm_path(drm_path.get_ptr(), std::find(drm_path.get_ptr(), drm_path.get_ptr() + 0x100, '\0'));
 
-	sceNp.warning("npDrmIsAvailable(): drm_path=\"%s\"", enc_drm_path);
+	sceNp.warning(u8"npDrmIsAvailable(): drm_path=“%s”", enc_drm_path);
+
+	if (!fs::is_file(vfs::get(enc_drm_path)))
+	{
+		sceNp.warning(u8"npDrmIsAvailable(): “%s” not found", enc_drm_path);
+		return CELL_ENOENT;
+	}
 
 	auto& npdrmkeys = g_fxo->get<loaded_npdrm_keys>();
 
-	const auto [fs_error, ppath, real_path, enc_file, type] = lv2_file::open(enc_drm_path, 0, 0);
-
-	if (fs_error)
-	{
-		return {fs_error, enc_drm_path};
-	}
+	const std::string& enc_drm_path_local = vfs::get(enc_drm_path);
+	const fs::file enc_file(enc_drm_path_local);
 
 	u32 magic;
 
@@ -676,52 +491,34 @@ error_code npDrmIsAvailable(vm::cptr<u8> k_licensee_addr, vm::cptr<char> drm_pat
 
 		if (verify_npdrm_self_headers(enc_file, reinterpret_cast<u8*>(&k_licensee)))
 		{
-			npdrmkeys.install_decryption_key(k_licensee);
+			npdrmkeys.devKlic = k_licensee;
 		}
 		else
 		{
 			sceNp.error(u8"npDrmIsAvailable(): Failed to verify sce file “%s”", enc_drm_path);
-			return {SCE_NP_DRM_ERROR_NO_ENTITLEMENT, enc_drm_path};
+			return SCE_NP_DRM_ERROR_NO_ENTITLEMENT;
 		}
 	}
 	else if (magic == "NPD\0"_u32)
 	{
 		// edata / sdata files
 
-		NPD_HEADER npd;
+		std::string contentID;
 
-		if (VerifyEDATHeaderWithKLicense(enc_file, enc_drm_path, reinterpret_cast<u8*>(&k_licensee), &npd))
+		if (VerifyEDATHeaderWithKLicense(enc_file, enc_drm_path_local, reinterpret_cast<u8*>(&k_licensee), &contentID))
 		{
-			// Check if RAP-free
-			if (npd.license == 3)
-			{
-				npdrmkeys.install_decryption_key(k_licensee);
-			}
+			const std::string rap_file = rpcs3::utils::get_rap_file_path(contentID);
+			npdrmkeys.devKlic = k_licensee;
+
+			if (fs::is_file(rap_file))
+				npdrmkeys.rifKey = GetEdatRifKeyFromRapFile(fs::file{rap_file});
 			else
-			{
-				const std::string rap_file = rpcs3::utils::get_rap_file_path(npd.content_id);
-
-				if (fs::file rap_fd{rap_file})
-				{
-					if (rap_fd.size() < sizeof(u128))
-					{
-						sceNp.error("npDrmIsAvailable(): Rap file too small: '%s' (%d bytes)", rap_file, rap_fd.size());
-						return {SCE_NP_DRM_ERROR_BAD_FORMAT, enc_drm_path};
-					}
-
-					npdrmkeys.install_decryption_key(GetEdatRifKeyFromRapFile(rap_fd));
-				}
-				else
-				{
-					sceNp.error("npDrmIsAvailable(): Rap file not found: '%s' (%s)", rap_file, fs::g_tls_error);
-					return {SCE_NP_DRM_ERROR_LICENSE_NOT_FOUND, enc_drm_path};
-				}
-			}
+				sceNp.warning(u8"npDrmIsAvailable(): Rap file not found: “%s”", rap_file.c_str());
 		}
 		else
 		{
 			sceNp.error(u8"npDrmIsAvailable(): Failed to verify npd file “%s”", enc_drm_path);
-			return {SCE_NP_DRM_ERROR_NO_ENTITLEMENT, enc_drm_path};
+			return SCE_NP_DRM_ERROR_NO_ENTITLEMENT;
 		}
 	}
 	else
@@ -729,76 +526,69 @@ error_code npDrmIsAvailable(vm::cptr<u8> k_licensee_addr, vm::cptr<char> drm_pat
 		// for now assume its just unencrypted
 		sceNp.notice(u8"npDrmIsAvailable(): Assuming npdrm file is unencrypted at “%s”", enc_drm_path);
 	}
-
 	return CELL_OK;
 }
 
-error_code sceNpDrmIsAvailable(ppu_thread& ppu, vm::cptr<u8> k_licensee_addr, vm::cptr<char> drm_path)
+error_code sceNpDrmIsAvailable(vm::cptr<u8> k_licensee_addr, vm::cptr<char> drm_path)
 {
 	sceNp.warning("sceNpDrmIsAvailable(k_licensee=*0x%x, drm_path=*0x%x)", k_licensee_addr, drm_path);
 
-	if (!drm_path)
-	{
-		return SCE_NP_DRM_ERROR_INVALID_PARAM;
-	}
-
-	lv2_obj::sleep(ppu);
-
-	const auto ret = npDrmIsAvailable(k_licensee_addr, drm_path);
-	lv2_sleep(25'000, &ppu);
-
-	return ret;
+	return npDrmIsAvailable(k_licensee_addr, drm_path);
 }
 
-error_code sceNpDrmIsAvailable2(ppu_thread& ppu, vm::cptr<u8> k_licensee_addr, vm::cptr<char> drm_path)
+error_code sceNpDrmIsAvailable2(vm::cptr<u8> k_licensee_addr, vm::cptr<char> drm_path)
 {
 	sceNp.warning("sceNpDrmIsAvailable2(k_licensee=*0x%x, drm_path=*0x%x)", k_licensee_addr, drm_path);
 
-	if (!drm_path)
-	{
-		return SCE_NP_DRM_ERROR_INVALID_PARAM;
-	}
-
-	lv2_obj::sleep(ppu);
-
-	const auto ret = npDrmIsAvailable(k_licensee_addr, drm_path);
-
-	// TODO: Accurate sleep time
-	//lv2_sleep(20000, &ppu);
-
-	return ret;
-}
-
-error_code npDrmVerifyUpgradeLicense(vm::cptr<char> content_id)
-{
-	if (!content_id)
-	{
-		return SCE_NP_DRM_ERROR_INVALID_PARAM;
-	}
-
-	std::string content_str;
-	ensure(vm::read_string(content_id.addr(), 0x2f, content_str, true), "Secret access violation");
-
-	sceNp.warning("npDrmVerifyUpgradeLicense(): content_id=%s", content_str);
-
-	if (!rpcs3::utils::verify_c00_unlock_edat(content_str))
-		return SCE_NP_DRM_ERROR_LICENSE_NOT_FOUND;
-
-	return CELL_OK;
+	return npDrmIsAvailable(k_licensee_addr, drm_path);
 }
 
 error_code sceNpDrmVerifyUpgradeLicense(vm::cptr<char> content_id)
 {
 	sceNp.warning("sceNpDrmVerifyUpgradeLicense(content_id=*0x%x)", content_id);
 
-	return npDrmVerifyUpgradeLicense(content_id);
+	if (!content_id)
+	{
+		return SCE_NP_DRM_ERROR_INVALID_PARAM;
+	}
+
+	const std::string content_str(content_id.get_ptr(), std::find(content_id.get_ptr(), content_id.get_ptr() + 0x2f, '\0'));
+	const std::string rap_file = rpcs3::utils::get_rap_file_path(content_str);
+
+	sceNp.warning(u8"sceNpDrmVerifyUpgradeLicense(): content_id=“%s”", content_id);
+
+	if (fs::stat_t s{}; !fs::stat(rap_file, s) || s.is_directory || s.size < 0x10)
+	{
+		// Game hasn't been purchased therefore no RAP file present
+		return SCE_NP_DRM_ERROR_LICENSE_NOT_FOUND;
+	}
+
+	// Game has been purchased and there's a RAP file present
+	return CELL_OK;
 }
 
 error_code sceNpDrmVerifyUpgradeLicense2(vm::cptr<char> content_id)
 {
 	sceNp.warning("sceNpDrmVerifyUpgradeLicense2(content_id=*0x%x)", content_id);
 
-	return npDrmVerifyUpgradeLicense(content_id);
+	if (!content_id)
+	{
+		return SCE_NP_DRM_ERROR_INVALID_PARAM;
+	}
+
+	const std::string content_str(content_id.get_ptr(), std::find(content_id.get_ptr(), content_id.get_ptr() + 0x2f, '\0'));
+	const std::string rap_file = rpcs3::utils::get_rap_file_path(content_str);
+
+	sceNp.warning(u8"sceNpDrmVerifyUpgradeLicense2(): content_id=“%s”", content_id);
+
+	if (fs::stat_t s{}; !fs::stat(rap_file, s) || s.is_directory || s.size < 0x10)
+	{
+		// Game hasn't been purchased therefore no RAP file present
+		return SCE_NP_DRM_ERROR_LICENSE_NOT_FOUND;
+	}
+
+	// Game has been purchased and there's a RAP file present
+	return CELL_OK;
 }
 
 error_code sceNpDrmExecuteGamePurchase()
@@ -816,81 +606,15 @@ error_code sceNpDrmExecuteGamePurchase()
 
 error_code sceNpDrmGetTimelimit(vm::cptr<char> path, vm::ptr<u64> time_remain)
 {
-	sceNp.warning("sceNpDrmGetTimelimit(path=%s, time_remain=*0x%x)", path, time_remain);
+	sceNp.todo("sceNpDrmGetTimelimit(path=%s, time_remain=*0x%x)", path, time_remain);
 
 	if (!path || !time_remain)
 	{
 		return SCE_NP_DRM_ERROR_INVALID_PARAM;
 	}
 
-	vm::var<s64> sec;
-	vm::var<s64> nsec;
+	*time_remain = SCE_NP_DRM_TIME_INFO_ENDLESS;
 
-	// Get system time (real or fake) to compare to
-	error_code ret = sys_time_get_current_time(sec, nsec);
-	if (ret != CELL_OK)
-	{
-		return ret;
-	}
-
-	std::string enc_drm_path;
-	ensure(vm::read_string(path.addr(), 0x100, enc_drm_path, true), "Secret access violation");
-
-	const auto [fs_error, ppath, real_path, enc_file, type] = lv2_file::open(enc_drm_path, 0, 0);
-
-	if (fs_error)
-	{
-		return {fs_error, enc_drm_path};
-	}
-
-	u32 magic;
-	NPD_HEADER npd;
-
-	enc_file.read<u32>(magic);
-	enc_file.seek(0);
-
-	// Read expiration time from NPD header which is Unix timestamp in milliseconds
-	if (magic == "SCE\0"_u32)
-	{
-		if (!get_npdrm_self_header(enc_file, npd))
-		{
-			sceNp.error("sceNpDrmGetTimelimit(): Failed to read NPD header from sce file '%s'", enc_drm_path);
-			return {SCE_NP_DRM_ERROR_BAD_FORMAT, enc_drm_path};
-		}
-	}
-	else if (magic == "NPD\0"_u32)
-	{
-		// edata / sdata files
-		EDAT_HEADER edat;
-		read_npd_edat_header(&enc_file, npd, edat);
-	}
-	else
-	{
-		// Unknown file type
-		return {SCE_NP_DRM_ERROR_BAD_FORMAT, enc_drm_path};
-	}
-
-	// Convert time to milliseconds
-	s64 msec = *sec * 1000ll + *nsec / 1000ll;
-
-	// Return the remaining time in microseconds
-	if (npd.activate_time != 0 && msec < npd.activate_time)
-	{
-		return SCE_NP_DRM_ERROR_SERVICE_NOT_STARTED;
-	}
-
-	if (npd.expire_time == 0)
-	{
-		*time_remain = SCE_NP_DRM_TIME_INFO_ENDLESS;
-		return CELL_OK;
-	}
-
-	if (msec >= npd.expire_time)
-	{
-		return SCE_NP_DRM_ERROR_TIME_LIMIT;
-	}
-
-	*time_remain = (npd.expire_time - msec) * 1000ll;
 	return CELL_OK;
 }
 
@@ -923,217 +647,137 @@ error_code sceNpDrmProcessExitSpawn2(ppu_thread& ppu, vm::cptr<u8> klicensee, vm
 
 error_code sceNpBasicRegisterHandler(vm::cptr<SceNpCommunicationId> context, vm::ptr<SceNpBasicEventHandler> handler, vm::ptr<void> arg)
 {
-	sceNp.warning("sceNpBasicRegisterHandler(context=*0x%x(%s), handler=*0x%x, arg=*0x%x)", context, context ? context->data : "", handler, arg);
+	sceNp.warning("sceNpBasicRegisterHandler(context=*0x%x, handler=*0x%x, arg=*0x%x)", context, handler, arg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
-	}
-
 	if (!context || !handler)
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
-	nph.register_basic_handler(context, handler, arg, false);
+	nph.basic_handler = handler;
+	nph.basic_handler_arg = arg;
 
 	return CELL_OK;
 }
 
 error_code sceNpBasicRegisterContextSensitiveHandler(vm::cptr<SceNpCommunicationId> context, vm::ptr<SceNpBasicEventHandler> handler, vm::ptr<void> arg)
 {
-	sceNp.notice("sceNpBasicRegisterContextSensitiveHandler(context=*0x%x(%s), handler=*0x%x, arg=*0x%x)", context, context ? context->data : "", handler, arg);
+	sceNp.todo("sceNpBasicRegisterContextSensitiveHandler(context=*0x%x, handler=*0x%x, arg=*0x%x)", context, handler, arg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
-	}
-
 	if (!context || !handler)
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
-	nph.register_basic_handler(context, handler, arg, true);
-
 	return CELL_OK;
 }
 
 error_code sceNpBasicUnregisterHandler()
 {
-	sceNp.notice("sceNpBasicUnregisterHandler()");
+	sceNp.todo("sceNpBasicUnregisterHandler()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
-	nph.basic_handler_registered = false;
-
 	return CELL_OK;
 }
 
-error_code sceNpBasicSetPresence(vm::cptr<u8> data, u32 size)
+error_code sceNpBasicSetPresence(vm::cptr<void> data, u64 size)
 {
-	sceNp.warning("sceNpBasicSetPresence(data=*0x%x, size=%d)", data, size);
+	sceNp.todo("sceNpBasicSetPresence(data=*0x%x, size=%d)", data, size);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (size > SCE_NP_BASIC_MAX_PRESENCE_SIZE)
 	{
 		return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
 	}
 
-	// Not checked by API
-	ensure(data || !size, "Access violation");
-
-	std::vector pr_data(data.get_ptr(), data.get_ptr() + size);
-	nph.set_presence(std::nullopt, pr_data);
-
 	return CELL_OK;
 }
 
 error_code sceNpBasicSetPresenceDetails(vm::cptr<SceNpBasicPresenceDetails> pres, u32 options)
 {
-	sceNp.warning("sceNpBasicSetPresenceDetails(pres=*0x%x, options=0x%x)", pres, options);
+	sceNp.todo("sceNpBasicSetPresenceDetails(pres=*0x%x, options=0x%x)", pres, options);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
-	if (options < SCE_NP_BASIC_PRESENCE_OPTIONS_SET_DATA || options > SCE_NP_BASIC_PRESENCE_OPTIONS_ALL_OPTIONS)
+	if (!pres || options > SCE_NP_BASIC_PRESENCE_OPTIONS_ALL_OPTIONS)
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
-	// Not checked by API
-	ensure(pres, "Access violation");
-
 	if (pres->size > SCE_NP_BASIC_MAX_PRESENCE_SIZE)
 	{
 		return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
 	}
 
-	std::optional<std::string> pr_status;
-	if (options & SCE_NP_BASIC_PRESENCE_OPTIONS_SET_STATUS)
-	{
-		pr_status = std::optional(std::string(reinterpret_cast<const char*>(&pres->status[0])));
-	}
-
-	std::optional<std::vector<u8>> pr_data;
-	if (options & SCE_NP_BASIC_PRESENCE_OPTIONS_SET_DATA)
-	{
-		const u8* ptr = &pres->data[0];
-		pr_data = std::vector(ptr, ptr + pres->size);
-	}
-
-	nph.set_presence(pr_status, pr_data);
-
 	return CELL_OK;
 }
 
 error_code sceNpBasicSetPresenceDetails2(vm::cptr<SceNpBasicPresenceDetails2> pres, u32 options)
 {
-	sceNp.warning("sceNpBasicSetPresenceDetails2(pres=*0x%x, options=0x%x)", pres, options);
+	sceNp.todo("sceNpBasicSetPresenceDetails2(pres=*0x%x, options=0x%x)", pres, options);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
-	if (options < SCE_NP_BASIC_PRESENCE_OPTIONS_SET_DATA || options > SCE_NP_BASIC_PRESENCE_OPTIONS_ALL_OPTIONS || pres->struct_size != sizeof(SceNpBasicPresenceDetails2))
+	if (!pres || options > SCE_NP_BASIC_PRESENCE_OPTIONS_ALL_OPTIONS)
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
-	// Not checked by API
-	ensure(pres, "Access violation");
-
 	if (pres->size > SCE_NP_BASIC_MAX_PRESENCE_SIZE)
 	{
 		return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
 	}
 
-	std::optional<std::string> pr_status;
-	if (options & SCE_NP_BASIC_PRESENCE_OPTIONS_SET_STATUS)
-	{
-		pr_status = std::optional(std::string(reinterpret_cast<const char*>(&pres->status[0])));
-	}
-
-	std::optional<std::vector<u8>> pr_data;
-	if (options & SCE_NP_BASIC_PRESENCE_OPTIONS_SET_DATA)
-	{
-		const u8* ptr = &pres->data[0];
-		pr_data = std::vector(ptr, ptr + pres->size);
-	}
-
-	nph.set_presence(pr_status, pr_data);
-
 	return CELL_OK;
 }
 
-error_code sceNpBasicSendMessage(vm::cptr<SceNpId> to, vm::cptr<void> data, u32 size)
+error_code sceNpBasicSendMessage(vm::cptr<SceNpId> to, vm::cptr<void> data, u64 size)
 {
-	sceNp.warning("sceNpBasicSendMessage(to=*0x%x, data=*0x%x, size=%d)", to, data, size);
+	sceNp.todo("sceNpBasicSendMessage(to=*0x%x, data=*0x%x, size=%d)", to, data, size);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!to || to->handle.data[0] == '\0' || !data || !size)
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
@@ -1144,185 +788,28 @@ error_code sceNpBasicSendMessage(vm::cptr<SceNpId> to, vm::cptr<void> data, u32
 		return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
 	}
 
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return not_an_error(SCE_NP_BASIC_ERROR_NOT_CONNECTED);
-	}
-
-	message_data msg_data = {
-		.commId = nph.get_basic_handler_context(),
-		.msgId = 0,
-		.mainType = SCE_NP_BASIC_MESSAGE_MAIN_TYPE_GENERAL,
-		.subType = SCE_NP_BASIC_MESSAGE_GENERAL_SUBTYPE_NONE,
-		.msgFeatures = {},
-		.data = std::vector<u8>(static_cast<const u8*>(data.get_ptr()), static_cast<const u8*>(data.get_ptr()) + size)};
-	std::set<std::string> npids;
-	npids.insert(std::string(to->handle.data));
-
-	nph.send_message(msg_data, npids);
-
 	return CELL_OK;
 }
 
-error_code sceNpBasicSendMessageGui(ppu_thread& ppu, vm::cptr<SceNpBasicMessageDetails> msg, sys_memory_container_t containerId)
+error_code sceNpBasicSendMessageGui(vm::cptr<SceNpBasicMessageDetails> msg, sys_memory_container_t containerId)
 {
-	sceNp.warning("sceNpBasicSendMessageGui(msg=*0x%x, containerId=%d)", msg, containerId);
+	sceNp.todo("sceNpBasicSendMessageGui(msg=*0x%x, containerId=%d)", msg, containerId);
 
-	if (msg)
-	{
-		sceNp.notice("sceNpBasicSendMessageGui: msgId: %d, mainType: %d, subType: %d, msgFeatures: %d, count: %d, npids: *0x%x", msg->msgId, msg->mainType, msg->subType, msg->msgFeatures, msg->count, msg->npids);
-		for (u32 i = 0; i < msg->count && msg->npids; i++)
-		{
-			sceNp.trace("sceNpBasicSendMessageGui: NpId[%d] = %s", i, static_cast<char*>(&msg->npids[i].handle.data[0]));
-		}
-		sceNp.notice("sceNpBasicSendMessageGui: subject: %s", msg->subject);
-		sceNp.notice("sceNpBasicSendMessageGui: body: %s", msg->body);
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
-	if (!msg || msg->count > SCE_NP_BASIC_SEND_MESSAGE_MAX_RECIPIENTS || (msg->msgFeatures & ~SCE_NP_BASIC_MESSAGE_FEATURES_ALL_FEATURES) ||
-		msg->mainType > SCE_NP_BASIC_MESSAGE_MAIN_TYPE_URL_ATTACHMENT || msg->msgId != 0ull)
+	if (!msg || msg->count > SCE_NP_BASIC_SEND_MESSAGE_MAX_RECIPIENTS || msg->npids.handle.data[0] == '\0' || !(msg->msgFeatures & SCE_NP_BASIC_MESSAGE_FEATURES_ALL_FEATURES))
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (!(msg->msgFeatures & SCE_NP_BASIC_MESSAGE_FEATURES_BOOTABLE))
+	if (msg->size > SCE_NP_BASIC_MAX_MESSAGE_SIZE)
 	{
-		switch (msg->mainType)
-		{
-		case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT:
-			if (msg->subType != SCE_NP_BASIC_MESSAGE_DATA_ATTACHMENT_SUBTYPE_ACTION_USE)
-				return SCE_NP_BASIC_ERROR_NOT_SUPPORTED;
-			break;
-		case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_CUSTOM_DATA:
-			if (msg->subType != SCE_NP_BASIC_MESSAGE_CUSTOM_DATA_SUBTYPE_ACTION_USE)
-				return SCE_NP_BASIC_ERROR_NOT_SUPPORTED;
-			break;
-		case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_URL_ATTACHMENT:
-			if (msg->subType != SCE_NP_BASIC_MESSAGE_URL_ATTACHMENT_SUBTYPE_ACTION_USE)
-				return SCE_NP_BASIC_ERROR_NOT_SUPPORTED;
-			break;
-		case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_GENERAL:
-		case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_ADD_FRIEND:
-			if (msg->subType != 0) // SCE_NP_BASIC_MESSAGE_GENERAL_SUBTYPE_NONE, SCE_NP_BASIC_MESSAGE_ADD_FRIEND_SUBTYPE_NONE
-				return SCE_NP_BASIC_ERROR_NOT_SUPPORTED;
-			if (msg->data)
-				return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-			break;
-		case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE:
-			if (msg->subType > SCE_NP_BASIC_MESSAGE_INVITE_SUBTYPE_ACTION_ACCEPT)
-				return SCE_NP_BASIC_ERROR_NOT_SUPPORTED;
-			break;
-		default:
-			return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-		}
-	}
-	else if (msg->mainType == SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE)
-	{
-		if (msg->subType != SCE_NP_BASIC_MESSAGE_INVITE_SUBTYPE_ACTION_ACCEPT)
-			return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-	}
-	else if (msg->mainType == SCE_NP_BASIC_MESSAGE_MAIN_TYPE_CUSTOM_DATA)
-	{
-		if (msg->subType != SCE_NP_BASIC_MESSAGE_CUSTOM_DATA_SUBTYPE_ACTION_USE)
-			return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-	}
-	else
-	{
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-	}
-
-	if (!msg->data && msg->mainType != SCE_NP_BASIC_MESSAGE_MAIN_TYPE_ADD_FRIEND)
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-
-	if (!msg->size)
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-
-	if (msg->count > SCE_NP_BASIC_SEND_MESSAGE_MAX_RECIPIENTS)
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-
-	if (msg->mainType == SCE_NP_BASIC_MESSAGE_MAIN_TYPE_ADD_FRIEND && msg->count != 1u)
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-
-	if (msg->npids)
-	{
-		for (u32 i = 0; i < msg->count; i++)
-		{
-			if (!msg->npids[i].handle.data[0])
-				return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-		}
-	}
-
-	u32 length_subject = 0;
-	u32 length_body = 0;
-
-	if (msg->subject)
-	{
-		if (msg->mainType == SCE_NP_BASIC_MESSAGE_MAIN_TYPE_ADD_FRIEND)
-			return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-
-		error_code err = check_text(msg->subject);
-		if (err < 0)
-			return err;
-
-		length_subject = static_cast<u32>(err);
-
-		if (length_subject > SCE_NP_BASIC_SUBJECT_CHARACTER_MAX)
-			return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
-	}
-
-	if (msg->body)
-	{
-		error_code err = check_text(msg->body);
-		if (err < 0)
-			return err;
-
-		length_body = static_cast<u32>(err);
-
-		if (length_body > SCE_NP_BASIC_BODY_CHARACTER_MAX)
-			return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
-	}
-
-	switch (msg->mainType)
-	{
-	case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT:
-	case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_CUSTOM_DATA:
-		if (msg->size > SCE_NP_BASIC_MAX_MESSAGE_ATTACHMENT_SIZE)
-			return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
-		break;
-	case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE:
-		if (msg->size > SCE_NP_BASIC_MAX_INVITATION_DATA_SIZE)
-			return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
-		break;
-	case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_URL_ATTACHMENT:
-		if (msg->size > SCE_NP_BASIC_MAX_URL_ATTACHMENT_SIZE)
-			return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
-		break;
-	default:
-		break;
-	}
-
-	if (msg->msgFeatures & SCE_NP_BASIC_MESSAGE_FEATURES_ASSUME_SEND)
-	{
-		if (msg->mainType > SCE_NP_BASIC_MESSAGE_MAIN_TYPE_CUSTOM_DATA)
-			return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-
-		if (!msg->count || !length_body)
-			return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-
-		if (msg->mainType != SCE_NP_BASIC_MESSAGE_MAIN_TYPE_ADD_FRIEND && !length_subject)
-			return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
+		return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
 	}
 
 	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
@@ -1330,318 +817,92 @@ error_code sceNpBasicSendMessageGui(ppu_thread& ppu, vm::cptr<SceNpBasicMessageD
 		return not_an_error(SCE_NP_BASIC_ERROR_NOT_CONNECTED);
 	}
 
-	// Prepare message data
-	message_data msg_data = {
-		.commId = nph.get_basic_handler_context(),
-		.msgId = msg->msgId,
-		.mainType = msg->mainType,
-		.subType = msg->subType,
-		.msgFeatures = msg->msgFeatures};
-	std::set<std::string> npids;
+	return CELL_OK;
+}
 
-	if (msg->npids)
+error_code sceNpBasicSendMessageAttachment(vm::cptr<SceNpId> to, vm::cptr<char> subject, vm::cptr<char> body, vm::cptr<char> data, u64 size, sys_memory_container_t containerId)
+{
+	sceNp.todo("sceNpBasicSendMessageAttachment(to=*0x%x, subject=%s, body=%s, data=%s, size=%d, containerId=%d)", to, subject, body, data, size, containerId);
+
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph.is_NP_init)
 	{
-		for (u32 i = 0; i < msg->count; i++)
-		{
-			npids.insert(std::string(msg->npids[i].handle.data));
-		}
+		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (msg->subject)
+	if (!to || to->handle.data[0] == '\0' || !data || !size)
 	{
-		msg_data.subject = std::string(msg->subject.get_ptr());
+		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (msg->body)
+	if (strlen(subject.get_ptr()) > SCE_NP_BASIC_BODY_CHARACTER_MAX || strlen(body.get_ptr()) > SCE_NP_BASIC_BODY_CHARACTER_MAX)
 	{
-		msg_data.body = std::string(msg->body.get_ptr());
+		return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
 	}
 
-	if (msg->size)
+	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
 	{
-		msg_data.data.assign(msg->data.get_ptr(), msg->data.get_ptr() + msg->size);
+		return not_an_error(SCE_NP_BASIC_ERROR_NOT_CONNECTED);
 	}
 
-	sceNp.trace("Message Data:\n%s", fmt::buf_to_hexstring(msg->data.get_ptr(), msg->size));
-
-	error_code result = CELL_CANCEL;
-
-	ppu.state += cpu_flag::wait;
-
-	if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
-	{
-		auto recv_dlg = manager->create<rsx::overlays::sendmessage_dialog>();
-		result = recv_dlg->Exec(msg_data, npids);
-	}
-	else
-	{
-		input::SetIntercepted(true);
-
-		Emu.BlockingCallFromMainThread([=, &result, msg_data = std::move(msg_data), npids = std::move(npids)]() mutable
-		{
-			auto send_dlg = Emu.GetCallbacks().get_sendmessage_dialog();
-			result = send_dlg->Exec(msg_data, npids);
-		});
-
-		input::SetIntercepted(false);
-	}
-
-	s32 callback_result = result == CELL_OK ? 0 : -1;
-	s32 event           = 0;
-
-	switch (msg->mainType)
-	{
-	case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT:
-		event = SCE_NP_BASIC_EVENT_SEND_ATTACHMENT_RESULT;
-		break;
-	case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_GENERAL:
-		event = SCE_NP_BASIC_EVENT_SEND_MESSAGE_RESULT;
-		break;
-	case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_ADD_FRIEND:
-		event = SCE_NP_BASIC_EVENT_ADD_FRIEND_RESULT;
-		break;
-	case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE:
-		event = SCE_NP_BASIC_EVENT_SEND_INVITATION_RESULT;
-		break;
-	case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_CUSTOM_DATA:
-		event = SCE_NP_BASIC_EVENT_SEND_CUSTOM_DATA_RESULT;
-		break;
-	case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_URL_ATTACHMENT:
-		event = SCE_NP_BASIC_EVENT_SEND_URL_ATTACHMENT_RESULT;
-		break;
-	}
-
-	nph.send_basic_event(event, callback_result, 0);
-
 	return CELL_OK;
 }
 
-error_code sceNpBasicSendMessageAttachment(ppu_thread& ppu, vm::cptr<SceNpId> to, vm::cptr<char> subject, vm::cptr<char> body, vm::cptr<void> data, u32 size, sys_memory_container_t containerId)
+error_code sceNpBasicRecvMessageAttachment(sys_memory_container_t containerId)
 {
-	sceNp.warning("sceNpBasicSendMessageAttachment(to=*0x%x, subject=%s, body=%s, data=%s, size=%d, containerId=%d)", to, subject, body, data, size, containerId);
+	sceNp.todo("sceNpBasicRecvMessageAttachment(containerId=%d)", containerId);
 
-	vm::var<SceNpBasicMessageDetails> msg;
-	msg->msgId = 0;
-	msg->mainType = SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT;
-	msg->subType = SCE_NP_BASIC_MESSAGE_DATA_ATTACHMENT_SUBTYPE_ACTION_USE;
-	msg->msgFeatures = 0;
-	msg->npids = vm::const_ptr_cast<SceNpId>(to);
-	msg->count = 1;
-	msg->subject = vm::const_ptr_cast<char>(subject);
-	msg->body = vm::const_ptr_cast<char>(body);
-	msg->data = vm::static_ptr_cast<u8>(vm::const_ptr_cast<void>(data));
-	msg->size = size;
-
-	return sceNpBasicSendMessageGui(ppu, msg, containerId);
-}
-
-error_code recv_message_gui(ppu_thread& ppu, u16 mainType, u32 recvOptions);
-
-error_code sceNpBasicRecvMessageAttachment(ppu_thread& ppu, sys_memory_container_t containerId)
-{
-	sceNp.warning("sceNpBasicRecvMessageAttachment(containerId=%d)", containerId);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
-	const u16 main_type = SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT;
-	const u32 options = 0;
-
-	return recv_message_gui(ppu, main_type, options);
+	return CELL_OK;
 }
 
-error_code sceNpBasicRecvMessageAttachmentLoad(SceNpBasicAttachmentDataId id, vm::ptr<void> buffer, vm::ptr<u32> size)
+error_code sceNpBasicRecvMessageAttachmentLoad(u32 id, vm::ptr<void> buffer, vm::ptr<u64> size)
 {
-	sceNp.warning("sceNpBasicRecvMessageAttachmentLoad(id=%d, buffer=*0x%x, size=*0x%x)", id, buffer, size);
+	sceNp.todo("sceNpBasicRecvMessageAttachmentLoad(id=%d, buffer=*0x%x, size=*0x%x)", id, buffer, size);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!buffer || !size)
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (id != SCE_NP_BASIC_SELECTED_INVITATION_DATA && id != SCE_NP_BASIC_SELECTED_MESSAGE_DATA)
+	if (id > SCE_NP_BASIC_SELECTED_MESSAGE_DATA)
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_DATA_ID;
 	}
 
-	const auto opt_msg = nph.get_message_selected(id);
-	if (!opt_msg)
-	{
-		return SCE_NP_BASIC_ERROR_INVALID_DATA_ID;
-	}
-
-	// Not sure about this
-	// nph.clear_message_selected(id);
-
-	const auto msg_pair = opt_msg.value();
-	const auto msg = msg_pair->second;
-
-	const u32 orig_size = *size;
-	const u32 size_to_copy = std::min(static_cast<u32>(msg.data.size()), orig_size);
-	memcpy(buffer.get_ptr(), msg.data.data(), size_to_copy);
-
-	sceNp.trace("Message Data received:\n%s", fmt::buf_to_hexstring(static_cast<u8*>(buffer.get_ptr()), size_to_copy));
-
-	*size = size_to_copy;
-	if (size_to_copy < msg.data.size())
-	{
-		return SCE_NP_BASIC_ERROR_DATA_LOST;
-	}
-
 	return CELL_OK;
 }
 
-error_code sceNpBasicRecvMessageCustom(ppu_thread& ppu, u16 mainType, u32 recvOptions, sys_memory_container_t containerId)
+error_code sceNpBasicRecvMessageCustom(u16 mainType, u32 recvOptions, sys_memory_container_t containerId)
 {
-	sceNp.warning("sceNpBasicRecvMessageCustom(mainType=%d, recvOptions=%d, containerId=%d)", mainType, recvOptions, containerId);
+	sceNp.todo("sceNpBasicRecvMessageCustom(mainType=%d, recvOptions=%d, containerId=%d)", mainType, recvOptions, containerId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
-	if (mainType != SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE && mainType != SCE_NP_BASIC_MESSAGE_MAIN_TYPE_CUSTOM_DATA)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_SUPPORTED;
-	}
-
-	if ((recvOptions & ~SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_ALL_OPTIONS))
+	if (!(recvOptions & SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_ALL_OPTIONS))
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
-	return recv_message_gui(ppu, mainType, recvOptions);
-}
-
-error_code recv_message_gui(ppu_thread& ppu, u16 mainType, u32 recvOptions)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	error_code result = CELL_CANCEL;
-
-	SceNpBasicMessageRecvAction recv_result{};
-	u64 chosen_msg_id{};
-
-	ppu.state += cpu_flag::wait;
-
-	if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
-	{
-		auto recv_dlg = manager->create<rsx::overlays::recvmessage_dialog>();
-		result = recv_dlg->Exec(static_cast<SceNpBasicMessageMainType>(mainType), static_cast<SceNpBasicMessageRecvOptions>(recvOptions), recv_result, chosen_msg_id);
-	}
-	else
-	{
-		input::SetIntercepted(true);
-
-		Emu.BlockingCallFromMainThread([=, &result, &recv_result, &chosen_msg_id]()
-		{
-			auto recv_dlg = Emu.GetCallbacks().get_recvmessage_dialog();
-			result = recv_dlg->Exec(static_cast<SceNpBasicMessageMainType>(mainType), static_cast<SceNpBasicMessageRecvOptions>(recvOptions), recv_result, chosen_msg_id);
-		});
-
-		input::SetIntercepted(false);
-	}
-
-	if (result != CELL_OK)
-	{
-		return not_an_error(SCE_NP_BASIC_ERROR_CANCEL);
-	}
-
-	const auto opt_msg = nph.get_message(chosen_msg_id);
-
-	if (!opt_msg)
-	{
-		sceNp.fatal("sceNpBasicRecvMessageCustom: message is invalid: chosen_msg_id=%d", chosen_msg_id);
-		return SCE_NP_BASIC_ERROR_CANCEL;
-	}
-
-	const auto msg_pair = opt_msg.value();
-	const auto& msg     = msg_pair->second;
-
-	u32 event_to_send;
-	SceNpBasicAttachmentData data{};
-	data.size = static_cast<u32>(msg.data.size());
-
-	switch (mainType)
-	{
-	case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT:
-		event_to_send = SCE_NP_BASIC_EVENT_RECV_ATTACHMENT_RESULT;
-		data.id = SCE_NP_BASIC_SELECTED_MESSAGE_DATA;
-		break;
-	case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE:
-		event_to_send = SCE_NP_BASIC_EVENT_RECV_INVITATION_RESULT;
-		data.id = SCE_NP_BASIC_SELECTED_INVITATION_DATA;
-		break;
-	case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_CUSTOM_DATA:
-		event_to_send = SCE_NP_BASIC_EVENT_RECV_CUSTOM_DATA_RESULT;
-		data.id = SCE_NP_BASIC_SELECTED_MESSAGE_DATA;
-		break;
-	default:
-		fmt::throw_exception("recv_message_gui: Unexpected main type %d", mainType);
-	}
-
-	np::basic_event to_add{};
-	to_add.event = event_to_send;
-	strcpy_trunc(to_add.from.userId.handle.data, msg_pair->first);
-	strcpy_trunc(to_add.from.name.data, msg_pair->first);
-
-	if (mainType == SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT)
-	{
-		to_add.data.resize(sizeof(SceNpBasicAttachmentData));
-		SceNpBasicAttachmentData* att_data = reinterpret_cast<SceNpBasicAttachmentData*>(to_add.data.data());
-		*att_data = data;
-
-		extra_nps::print_SceNpBasicAttachmentData(att_data);
-	}
-	else
-	{
-		to_add.data.resize(sizeof(SceNpBasicExtendedAttachmentData));
-		SceNpBasicExtendedAttachmentData* att_data = reinterpret_cast<SceNpBasicExtendedAttachmentData*>(to_add.data.data());
-		att_data->flags                            = 0; // ?
-		att_data->msgId                            = chosen_msg_id;
-		att_data->data                             = data;
-		att_data->userAction                       = recv_result;
-		att_data->markedAsUsed                     = (recvOptions & SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_PRESERVE) ? 0 : 1;
-
-		extra_nps::print_SceNpBasicExtendedAttachmentData(att_data);
-	}
-
-	nph.set_message_selected(data.id, chosen_msg_id);
-
-	// Is this sent if used from home menu but not from sceNpBasicRecvMessageCustom, not sure
-	// sysutil_send_system_cmd(CELL_SYSUTIL_NP_INVITATION_SELECTED, 0);
-
-	nph.queue_basic_event(to_add);
-	nph.send_basic_event(event_to_send, 0, 0);
-
 	return CELL_OK;
 }
 
@@ -1649,18 +910,13 @@ error_code sceNpBasicMarkMessageAsUsed(SceNpBasicMessageId msgId)
 {
 	sceNp.todo("sceNpBasicMarkMessageAsUsed(msgId=%d)", msgId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	//if (!msgId > ?)
 	//{
 	//	return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
@@ -1671,49 +927,52 @@ error_code sceNpBasicMarkMessageAsUsed(SceNpBasicMessageId msgId)
 
 error_code sceNpBasicAbortGui()
 {
-	sceNp.warning("sceNpBasicAbortGui()");
+	sceNp.todo("sceNpBasicAbortGui()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
+	return CELL_OK;
+}
+
+error_code sceNpBasicAddFriend(vm::cptr<SceNpId> contact, vm::cptr<char> body, sys_memory_container_t containerId)
+{
+	sceNp.todo("sceNpBasicAddFriend(contact=*0x%x, body=%s, containerId=%d)", contact, body, containerId);
+
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph.is_NP_init)
 	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
+		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	g_fxo->get<np_state>().abort_gui_flag = true;
+	if (!contact || contact->handle.data[0] == '\0')
+	{
+		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (strlen(body.get_ptr()) > SCE_NP_BASIC_BODY_CHARACTER_MAX)
+	{
+		return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
+	}
+
+	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
+	{
+		return not_an_error(SCE_NP_BASIC_ERROR_NOT_CONNECTED);
+	}
 
 	return CELL_OK;
 }
 
-error_code sceNpBasicAddFriend(ppu_thread& ppu, vm::cptr<SceNpId> contact, vm::cptr<char> body, sys_memory_container_t containerId)
-{
-	sceNp.warning("sceNpBasicAddFriend(contact=*0x%x, body=%s, containerId=%d)", contact, body, containerId);
-
-	vm::var<SceNpBasicMessageDetails> msg;
-	msg->msgId = 0;
-	msg->mainType = SCE_NP_BASIC_MESSAGE_MAIN_TYPE_ADD_FRIEND;
-	msg->subType = SCE_NP_BASIC_MESSAGE_ADD_FRIEND_SUBTYPE_NONE;
-	msg->msgFeatures = 0;
-	msg->npids = vm::const_ptr_cast<SceNpId>(contact);
-	msg->count = 1;
-	msg->subject = vm::null;
-	msg->body = vm::const_ptr_cast<char>(body);
-	msg->data = vm::null;
-	msg->size = 0;
-
-	return sceNpBasicSendMessageGui(ppu, msg, containerId);
-}
-
 error_code sceNpBasicGetFriendListEntryCount(vm::ptr<u32> count)
 {
-	sceNp.trace("sceNpBasicGetFriendListEntryCount(count=*0x%x)", count);
+	sceNp.todo("sceNpBasicGetFriendListEntryCount(count=*0x%x)", count);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -1731,16 +990,17 @@ error_code sceNpBasicGetFriendListEntryCount(vm::ptr<u32> count)
 		return SCE_NP_ERROR_ID_NOT_FOUND;
 	}
 
-	*count = nph.get_num_friends();
+	// TODO: Check if there are any friends
+	*count = 0;
 
 	return CELL_OK;
 }
 
 error_code sceNpBasicGetFriendListEntry(u32 index, vm::ptr<SceNpId> npid)
 {
-	sceNp.trace("sceNpBasicGetFriendListEntry(index=%d, npid=*0x%x)", index, npid);
+	sceNp.todo("sceNpBasicGetFriendListEntry(index=%d, npid=*0x%x)", index, npid);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -1753,128 +1013,100 @@ error_code sceNpBasicGetFriendListEntry(u32 index, vm::ptr<SceNpId> npid)
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
+	// TODO: Find the correct test which returns SCE_NP_ERROR_ID_NOT_FOUND
 	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
 	{
-		return SCE_NP_BASIC_ERROR_BUSY;
+		return SCE_NP_ERROR_ID_NOT_FOUND;
 	}
 
-	const auto [error, res_npid] = nph.get_friend_by_index(index);
-
-	if (error)
-	{
-		return error;
-	}
-
-	memcpy(npid.get_ptr(), &res_npid.value(), sizeof(SceNpId));
-
 	return CELL_OK;
 }
 
 error_code sceNpBasicGetFriendPresenceByIndex(u32 index, vm::ptr<SceNpUserInfo> user, vm::ptr<SceNpBasicPresenceDetails> pres, u32 options)
 {
-	sceNp.warning("sceNpBasicGetFriendPresenceByIndex(index=%d, user=*0x%x, pres=*0x%x, options=%d)", index, user, pres, options);
+	sceNp.todo("sceNpBasicGetFriendPresenceByIndex(index=%d, user=*0x%x, pres=*0x%x, options=%d)", index, user, pres, options);
 
-	if (!pres)
-	{
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!user)
+	if (!user || !pres)
 	{
 		// TODO: check index and (options & SCE_NP_BASIC_PRESENCE_OPTIONS_ALL_OPTIONS) depending on fw
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
-	return nph.get_friend_presence_by_index(index, user.get_ptr(), pres.get_ptr());
+	return CELL_OK;
 }
 
 error_code sceNpBasicGetFriendPresenceByIndex2(u32 index, vm::ptr<SceNpUserInfo> user, vm::ptr<SceNpBasicPresenceDetails2> pres, u32 options)
 {
-	sceNp.warning("sceNpBasicGetFriendPresenceByIndex2(index=%d, user=*0x%x, pres=*0x%x, options=%d)", index, user, pres, options);
+	sceNp.todo("sceNpBasicGetFriendPresenceByIndex2(index=%d, user=*0x%x, pres=*0x%x, options=%d)", index, user, pres, options);
 
-	if (!pres)
-	{
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!user)
+	if (!user || !pres)
 	{
 		// TODO: check index and (options & SCE_NP_BASIC_PRESENCE_OPTIONS_ALL_OPTIONS) depending on fw
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
-	return nph.get_friend_presence_by_index(index, user.get_ptr(), pres.get_ptr());
+	return CELL_OK;
 }
 
 error_code sceNpBasicGetFriendPresenceByNpId(vm::cptr<SceNpId> npid, vm::ptr<SceNpBasicPresenceDetails> pres, u32 options)
 {
-	sceNp.warning("sceNpBasicGetFriendPresenceByNpId(npid=*0x%x, pres=*0x%x, options=%d)", npid, pres, options);
+	sceNp.todo("sceNpBasicGetFriendPresenceByNpId(npid=*0x%x, pres=*0x%x, options=%d)", npid, pres, options);
 
-	if (!pres)
-	{
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!npid)
+	if (!npid || !pres)
 	{
 		// TODO: check (options & SCE_NP_BASIC_PRESENCE_OPTIONS_ALL_OPTIONS) depending on fw
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
-	return nph.get_friend_presence_by_npid(*npid, pres.get_ptr());
+	return CELL_OK;
 }
 
 error_code sceNpBasicGetFriendPresenceByNpId2(vm::cptr<SceNpId> npid, vm::ptr<SceNpBasicPresenceDetails2> pres, u32 options)
 {
-	sceNp.warning("sceNpBasicGetFriendPresenceByNpId2(npid=*0x%x, pres=*0x%x, options=%d)", npid, pres, options);
+	sceNp.todo("sceNpBasicGetFriendPresenceByNpId2(npid=*0x%x, pres=*0x%x, options=%d)", npid, pres, options);
 
-	if (!pres)
-	{
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!npid)
+	if (!npid || !pres)
 	{
 		// TODO: check (options & SCE_NP_BASIC_PRESENCE_OPTIONS_ALL_OPTIONS) depending on fw
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
-	return nph.get_friend_presence_by_npid(*npid, pres.get_ptr());
+	return CELL_OK;
 }
 
-error_code sceNpBasicAddPlayersHistory(vm::cptr<SceNpId> npid, vm::cptr<char> description)
+error_code sceNpBasicAddPlayersHistory(vm::cptr<SceNpId> npid, vm::ptr<char> description)
 {
-	sceNp.warning("sceNpBasicAddPlayersHistory(npid=*0x%x, description=*0x%x)", npid, description);
+	sceNp.todo("sceNpBasicAddPlayersHistory(npid=*0x%x, description=*0x%x)", npid, description);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -1891,16 +1123,14 @@ error_code sceNpBasicAddPlayersHistory(vm::cptr<SceNpId> npid, vm::cptr<char> de
 		return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
 	}
 
-	nph.add_player_to_history(npid.get_ptr(), description ? description.get_ptr() : nullptr);
-
 	return CELL_OK;
 }
 
-error_code sceNpBasicAddPlayersHistoryAsync(vm::cptr<SceNpId> npids, u32 count, vm::cptr<char> description, vm::ptr<u32> reqId)
+error_code sceNpBasicAddPlayersHistoryAsync(vm::cptr<SceNpId> npids, u32 count, vm::ptr<char> description, vm::ptr<u32> reqId)
 {
-	sceNp.warning("sceNpBasicAddPlayersHistoryAsync(npids=*0x%x, count=%d, description=*0x%x, reqId=*0x%x)", npids, count, description, reqId);
+	sceNp.todo("sceNpBasicAddPlayersHistoryAsync(npids=*0x%x, count=%d, description=*0x%x, reqId=*0x%x)", npids, count, description, reqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -1935,7 +1165,7 @@ error_code sceNpBasicAddPlayersHistoryAsync(vm::cptr<SceNpId> npids, u32 count,
 		return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
 	}
 
-	auto req_id = nph.add_players_to_history(npids.get_ptr(), description ? description.get_ptr() : nullptr, count);
+	auto req_id = nph.add_players_to_history(npids, count);
 
 	if (reqId)
 	{
@@ -1947,25 +1177,15 @@ error_code sceNpBasicAddPlayersHistoryAsync(vm::cptr<SceNpId> npids, u32 count,
 
 error_code sceNpBasicGetPlayersHistoryEntryCount(u32 options, vm::ptr<u32> count)
 {
-	sceNp.warning("sceNpBasicGetPlayersHistoryEntryCount(options=%d, count=*0x%x)", options, count);
+	sceNp.todo("sceNpBasicGetPlayersHistoryEntryCount(options=%d, count=*0x%x)", options, count);
 
-	if (options > SCE_NP_BASIC_PLAYERS_HISTORY_OPTIONS_ALL)
-	{
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!count)
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
@@ -1977,7 +1197,8 @@ error_code sceNpBasicGetPlayersHistoryEntryCount(u32 options, vm::ptr<u32> count
 		return SCE_NP_ERROR_ID_NOT_FOUND;
 	}
 
-	*count = nph.get_players_history_count(options);
+	// TODO: Check if there are players histories
+	*count = 0;
 
 	return CELL_OK;
 }
@@ -1986,23 +1207,13 @@ error_code sceNpBasicGetPlayersHistoryEntry(u32 options, u32 index, vm::ptr<SceN
 {
 	sceNp.warning("sceNpBasicGetPlayersHistoryEntry(options=%d, index=%d, npid=*0x%x)", options, index, npid);
 
-	if (options > SCE_NP_BASIC_PLAYERS_HISTORY_OPTIONS_ALL)
-	{
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!npid)
 	{
 		// TODO: Check index
@@ -2015,11 +1226,6 @@ error_code sceNpBasicGetPlayersHistoryEntry(u32 options, u32 index, vm::ptr<SceN
 		return SCE_NP_ERROR_ID_NOT_FOUND;
 	}
 
-	if (!nph.get_player_history_entry(options, index, npid.get_ptr()))
-	{
-		return SCE_NP_ERROR_ID_NOT_FOUND;
-	}
-
 	return CELL_OK;
 }
 
@@ -2027,18 +1233,13 @@ error_code sceNpBasicAddBlockListEntry(vm::cptr<SceNpId> npid)
 {
 	sceNp.warning("sceNpBasicAddBlockListEntry(npid=*0x%x)", npid);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!npid || npid->handle.data[0] == '\0')
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
@@ -2056,7 +1257,7 @@ error_code sceNpBasicGetBlockListEntryCount(vm::ptr<u32> count)
 {
 	sceNp.warning("sceNpBasicGetBlockListEntryCount(count=*0x%x)", count);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -2075,7 +1276,7 @@ error_code sceNpBasicGetBlockListEntryCount(vm::ptr<u32> count)
 	}
 
 	// TODO: Check if there are block lists
-	*count = nph.get_num_blocks();
+	*count = 0;
 
 	return CELL_OK;
 }
@@ -2084,7 +1285,7 @@ error_code sceNpBasicGetBlockListEntry(u32 index, vm::ptr<SceNpId> npid)
 {
 	sceNp.todo("sceNpBasicGetBlockListEntry(index=%d, npid=*0x%x)", index, npid);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -2110,18 +1311,13 @@ error_code sceNpBasicGetMessageAttachmentEntryCount(vm::ptr<u32> count)
 {
 	sceNp.todo("sceNpBasicGetMessageAttachmentEntryCount(count=*0x%x)", count);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!count)
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
@@ -2143,18 +1339,13 @@ error_code sceNpBasicGetMessageAttachmentEntry(u32 index, vm::ptr<SceNpUserInfo>
 {
 	sceNp.todo("sceNpBasicGetMessageAttachmentEntry(index=%d, from=*0x%x)", index, from);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!from)
 	{
 		// TODO: check index
@@ -2174,27 +1365,17 @@ error_code sceNpBasicGetCustomInvitationEntryCount(vm::ptr<u32> count)
 {
 	sceNp.todo("sceNpBasicGetCustomInvitationEntryCount(count=*0x%x)", count);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_init)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
-	}
-
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!count)
 	{
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
+		return SCE_NP_AUTH_EINVAL;
 	}
 
-	// TODO: Find the correct test which returns SCE_NP_ERROR_ID_NOT_FOUND
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	// TODO: Find the correct test which returns SCE_NP_AUTH_ESRCH
 	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
 	{
-		return SCE_NP_ERROR_ID_NOT_FOUND;
+		return SCE_NP_AUTH_ESRCH;
 	}
 
 	// TODO: Check if there are custom invitations
@@ -2207,28 +1388,18 @@ error_code sceNpBasicGetCustomInvitationEntry(u32 index, vm::ptr<SceNpUserInfo>
 {
 	sceNp.todo("sceNpBasicGetCustomInvitationEntry(index=%d, from=*0x%x)", index, from);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_init)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
-	}
-
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!from)
 	{
 		// TODO: check index
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
+		return SCE_NP_AUTH_EINVAL;
 	}
 
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
 	// TODO: Find the correct test which returns SCE_NP_ERROR_ID_NOT_FOUND
 	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
 	{
-		return SCE_NP_ERROR_ID_NOT_FOUND;
+		return SCE_NP_AUTH_ESRCH;
 	}
 
 	return CELL_OK;
@@ -2238,18 +1409,13 @@ error_code sceNpBasicGetMatchingInvitationEntryCount(vm::ptr<u32> count)
 {
 	sceNp.todo("sceNpBasicGetMatchingInvitationEntryCount(count=*0x%x)", count);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!count)
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
@@ -2271,18 +1437,13 @@ error_code sceNpBasicGetMatchingInvitationEntry(u32 index, vm::ptr<SceNpUserInfo
 {
 	sceNp.todo("sceNpBasicGetMatchingInvitationEntry(index=%d, from=*0x%x)", index, from);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!from)
 	{
 		// TODO: check index
@@ -2302,18 +1463,13 @@ error_code sceNpBasicGetClanMessageEntryCount(vm::ptr<u32> count)
 {
 	sceNp.todo("sceNpBasicGetClanMessageEntryCount(count=*0x%x)", count);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!count)
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
@@ -2335,18 +1491,13 @@ error_code sceNpBasicGetClanMessageEntry(u32 index, vm::ptr<SceNpUserInfo> from)
 {
 	sceNp.todo("sceNpBasicGetClanMessageEntry(index=%d, from=*0x%x)", index, from);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!from)
 	{
 		// TODO: check index
@@ -2366,13 +1517,7 @@ error_code sceNpBasicGetMessageEntryCount(u32 type, vm::ptr<u32> count)
 {
 	sceNp.todo("sceNpBasicGetMessageEntryCount(type=%d, count=*0x%x)", type, count);
 
-	// TODO: verify this check and its location
-	if (type > SCE_NP_BASIC_MESSAGE_INFO_TYPE_BOOTABLE_CUSTOM_DATA_MESSAGE)
-	{
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -2400,13 +1545,7 @@ error_code sceNpBasicGetMessageEntry(u32 type, u32 index, vm::ptr<SceNpUserInfo>
 {
 	sceNp.todo("sceNpBasicGetMessageEntry(type=%d, index=%d, from=*0x%x)", type, index, from);
 
-	// TODO: verify this check and its location
-	if (type > SCE_NP_BASIC_MESSAGE_INFO_TYPE_BOOTABLE_CUSTOM_DATA_MESSAGE)
-	{
-		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -2428,519 +1567,239 @@ error_code sceNpBasicGetMessageEntry(u32 type, u32 index, vm::ptr<SceNpUserInfo>
 	return CELL_OK;
 }
 
-error_code sceNpBasicGetEvent(vm::ptr<s32> event, vm::ptr<SceNpUserInfo> from, vm::ptr<u8> data, vm::ptr<u32> size)
+error_code sceNpBasicGetEvent(vm::ptr<s32> event, vm::ptr<SceNpUserInfo> from, vm::ptr<s32> data, vm::ptr<u32> size)
 {
-	sceNp.trace("sceNpBasicGetEvent(event=*0x%x, from=*0x%x, data=*0x%x, size=*0x%x)", event, from, data, size);
+	sceNp.warning("sceNpBasicGetEvent(event=*0x%x, from=*0x%x, data=*0x%x, size=*0x%x)", event, from, data, size);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.basic_handler_registered)
-	{
-		return SCE_NP_BASIC_ERROR_NOT_REGISTERED;
-	}
-
 	if (!event || !from || !data || !size)
 	{
 		return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
 	}
 
-	return nph.get_basic_event(event, from, data, size);
+	// TODO: Check for other error and pass other events
+	//*event = SCE_NP_BASIC_EVENT_OFFLINE; // This event only indicates a contact is offline, not the current status of the connection
+
+	return not_an_error(SCE_NP_BASIC_ERROR_NO_EVENT);
 }
 
 error_code sceNpCommerceCreateCtx(u32 version, vm::ptr<SceNpId> npId, vm::ptr<SceNpCommerceHandler> handler, vm::ptr<void> arg, vm::ptr<u32> ctx_id)
 {
 	sceNp.todo("sceNpCommerceCreateCtx(version=%d, event=*0x%x, from=*0x%x, arg=*0x%x, ctx_id=*0x%x)", version, npId, handler, arg, ctx_id);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
-	if (version != SCE_NP_COMMERCE_VERSION)
-		return SCE_NP_COMMERCE_ERROR_UNSUPPORTED_VERSION;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_CTX_MAX;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerceDestroyCtx(u32 ctx_id)
 {
 	sceNp.todo("sceNpCommerceDestroyCtx(ctx_id=%d)", ctx_id);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
-error_code sceNpCommerceInitProductCategory(vm::ptr<SceNpCommerceProductCategory> pc, vm::cptr<void> data, u32 data_size)
+error_code sceNpCommerceInitProductCategory(vm::ptr<SceNpCommerceProductCategory> pc, vm::cptr<void> data, u64 data_size)
 {
 	sceNp.todo("sceNpCommerceInitProductCategory(pc=*0x%x, data=*0x%x, data_size=%d)", pc, data, data_size);
-
-	if (!pc) // Not really checked
-		return SCE_NP_COMMERCE_ERROR_PARSE_PRODUCT_CATEGORY;
-
-	pc->data = data;
-	pc->dataSize = data_size;
-
-	if (data_size < 4)
-		return SCE_NP_COMMERCE_ERROR_PARSE_PRODUCT_CATEGORY;
-
-	const u32 version = SCE_NP_COMMERCE_VERSION; // TODO: *data
-	pc->version = version;
-
-	if (pc->version != SCE_NP_COMMERCE_VERSION)
-		return SCE_NP_COMMERCE_ERROR_INVALID_GPC_PROTOCOL_VERSION;
-
-	if (data_size < 8)
-		return SCE_NP_COMMERCE_ERROR_PARSE_PRODUCT_CATEGORY;
-
-	//const u32 unk = data + 4;
-	//if (unk != 0)
-	//{
-	//	if (unk < 256)
-	//		return unk | SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_UNKNOWN;
-
-	//	return SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_UNKNOWN;
-	//}
-
-	vm::var<SceNpCommerceCurrencyInfo> info;
-	error_code err = sceNpCommerceGetCurrencyInfo(pc, info);
-	if (err != CELL_OK)
-		return SCE_NP_COMMERCE_ERROR_PARSE_PRODUCT_CATEGORY;
-
-	if (false) // TODO
-	{
-		pc->dval = 10;
-
-		while (false) // TODO
-		{
-			pc->dval *= 10;
-		}
-	}
-	else
-	{
-		pc->dval = 0;
-	}
-
 	return CELL_OK;
 }
 
 void sceNpCommerceDestroyProductCategory(vm::ptr<SceNpCommerceProductCategory> pc)
 {
 	sceNp.todo("sceNpCommerceDestroyProductCategory(pc=*0x%x)", pc);
-
-	if (pc)
-	{
-		pc->dataSize = 0;
-		pc->data = vm::null;
-	}
 }
 
 error_code sceNpCommerceGetProductCategoryStart(u32 ctx_id, vm::cptr<char> category_id, s32 lang_code, vm::ptr<u32> req_id)
 {
 	sceNp.todo("sceNpCommerceGetProductCategoryStart(ctx_id=%d, category_id=%s, lang_code=%d, req_id=*0x%x)", ctx_id, category_id, lang_code, req_id);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerceGetProductCategoryFinish(u32 req_id)
 {
 	sceNp.todo("sceNpCommerceGetProductCategoryFinish(req_id=%d)", req_id);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
 	return CELL_OK;
 }
 
-error_code sceNpCommerceGetProductCategoryResult(u32 req_id, vm::ptr<void> buf, u32 buf_size, vm::ptr<u32> fill_size)
+error_code sceNpCommerceGetProductCategoryResult(u32 req_id, vm::ptr<void> buf, u64 buf_size, vm::ptr<u64> fill_size)
 {
 	sceNp.todo("sceNpCommerceGetProductCategoryResult(req_id=%d, buf=*0x%x, buf_size=%d, fill_size=*0x%x)", req_id, buf, buf_size, fill_size);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
-	if (buf_size == 0)
-		return SCE_NP_COMMERCE_ERROR_INSUFFICIENT_BUFFER;
-
-	if (!fill_size) // Not really checked afaict
-		return SCE_NP_COMMERCE_ERROR_INSUFFICIENT_BUFFER;
-
-	*fill_size = 0;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerceGetProductCategoryAbort(u32 req_id)
 {
 	sceNp.todo("sceNpCommerceGetProductCategoryAbort(req_id=%d)", req_id);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
 	return CELL_OK;
 }
 
 vm::cptr<char> sceNpCommerceGetProductId(vm::ptr<SceNpCommerceProductSkuInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetProductId(info=*0x%x)", info);
-	// if (info) return info->data + 0x38;
 	return vm::null;
 }
 
 vm::cptr<char> sceNpCommerceGetProductName(vm::ptr<SceNpCommerceProductSkuInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetProductName(info=*0x%x)", info);
-	// if (info) return info->data + 0x68;
 	return vm::null;
 }
 
 vm::cptr<char> sceNpCommerceGetCategoryDescription(vm::ptr<SceNpCommerceCategoryInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetCategoryDescription(info=*0x%x)", info);
-	// if (info) return info->data + 0xf8;
 	return vm::null;
 }
 
 vm::cptr<char> sceNpCommerceGetCategoryId(vm::ptr<SceNpCommerceCategoryInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetCategoryId(info=*0x%x)", info);
-	// if (info) return info->data;
 	return vm::null;
 }
 
 vm::cptr<char> sceNpCommerceGetCategoryImageURL(vm::ptr<SceNpCommerceCategoryInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetCategoryImageURL(info=*0x%x)", info);
-	// if (info) return info->data + 0x278;
 	return vm::null;
 }
 
 error_code sceNpCommerceGetCategoryInfo(vm::ptr<SceNpCommerceProductCategory> pc, vm::ptr<SceNpCommerceCategoryInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetCategoryInfo(pc=*0x%x, info=*0x%x)", pc, info);
-
-	if (!pc || pc->dataSize < 776)
-		return SCE_NP_COMMERCE_ERROR_CATEGORY_INFO_NOT_FOUND;
-
-	if (info)
-	{
-		info->pc = pc;
-
-		// TODO
-		//info->data = pc->data + 16;
-		//pc->data + 0x307 = 0;
-		//pc->data + 0x47 = 0;
-		//pc->data + 0x107 = 0;
-		//pc->data + 0x287 = 0;
-	}
-
 	return CELL_OK;
 }
 
 vm::cptr<char> sceNpCommerceGetCategoryName(vm::ptr<SceNpCommerceCategoryInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetCategoryName(info=*0x%x)", info);
-	// if (info) return info->data + 0x38;
 	return vm::null;
 }
 
 vm::cptr<char> sceNpCommerceGetCurrencyCode(vm::ptr<SceNpCommerceCurrencyInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetCurrencyCode(info=*0x%x)", info);
-	//if (info) return info->data;
 	return vm::null;
 }
 
 u32 sceNpCommerceGetCurrencyDecimals(vm::ptr<SceNpCommerceCurrencyInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetCurrencyDecimals(info=*0x%x)", info);
-
-	if (info)
-	{
-		//return (info->data + 7) |
-		//       (info->data + 6) << 8 |
-		//       (info->data + 5) << 0x10 |
-		//       (info->data + 4) << 0x18;
-	}
-
 	return 0;
 }
 
 error_code sceNpCommerceGetCurrencyInfo(vm::ptr<SceNpCommerceProductCategory> pc, vm::ptr<SceNpCommerceCurrencyInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetCurrencyInfo(pc=*0x%x, info=*0x%x)", pc, info);
-
-	if (!pc || pc->dataSize < 16)
-		return SCE_NP_COMMERCE_ERROR_CURRENCY_INFO_NOT_FOUND;
-
-	if (info)
-	{
-		info->pc = pc;
-
-		// TODO
-		//info->data = pc->data + 8;
-		//pc->data + 0xb = 0;
-	}
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerceGetNumOfChildCategory(vm::ptr<SceNpCommerceProductCategory> pc, vm::ptr<u32> num)
 {
 	sceNp.todo("sceNpCommerceGetNumOfChildCategory(pc=*0x%x, num=*0x%x)", pc, num);
-
-	if (!pc || pc->dataSize < 780)
-		return SCE_NP_COMMERCE_ERROR_CHILD_CATEGORY_COUNT_NOT_FOUND;
-
-	//if (num) *num = pc->data + 0x308;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerceGetNumOfChildProductSku(vm::ptr<SceNpCommerceProductCategory> pc, vm::ptr<u32> num)
 {
 	sceNp.todo("sceNpCommerceGetNumOfChildProductSku(pc=*0x%x, num=*0x%x)", pc, num);
-
-	if (!pc || pc->dataSize < 780) // TODO: some other check
-		return SCE_NP_COMMERCE_ERROR_SKU_COUNT_NOT_FOUND;
-
-	//if (num) *num = something;
-
 	return CELL_OK;
 }
 
 vm::cptr<char> sceNpCommerceGetSkuDescription(vm::ptr<SceNpCommerceProductSkuInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetSkuDescription(info=*0x%x)", info);
-	//if (info) return info->data + 0x168;
 	return vm::null;
 }
 
 vm::cptr<char> sceNpCommerceGetSkuId(vm::ptr<SceNpCommerceProductSkuInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetSkuId(info=*0x%x)", info);
-	//if (info) return info->data;
 	return vm::null;
 }
 
 vm::cptr<char> sceNpCommerceGetSkuImageURL(vm::ptr<SceNpCommerceProductSkuInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetSkuImageURL(info=*0x%x)", info);
-	//if (info) return info->data + 0x2e8;
 	return vm::null;
 }
 
 vm::cptr<char> sceNpCommerceGetSkuName(vm::ptr<SceNpCommerceProductSkuInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetSkuName(info=*0x%x)", info);
-	//if (info) return info->data + 0x128;
 	return vm::null;
 }
 
 void sceNpCommerceGetSkuPrice(vm::ptr<SceNpCommerceProductSkuInfo> info, vm::ptr<SceNpCommercePrice> price)
 {
 	sceNp.todo("sceNpCommerceGetSkuPrice(info=*0x%x, price=*0x%x)", info, price);
-
-	if (!price)
-		return;
-
-	if (info && info->pc && info->pc->dval)
-	{
-		// TODO
-		//price->integer = something / info->pc->dval;
-		//price->fractional = something - static_cast<int>(price->integer) * info->pc->dval;
-		return;
-	}
-
-	// TODO
-	//price->integer = something;
-	price->fractional = 0;
 }
 
 vm::cptr<char> sceNpCommerceGetSkuUserData(vm::ptr<SceNpCommerceProductSkuInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetSkuUserData(info=*0x%x)", info);
-	//if (info) return info->data + 0x368;
 	return vm::null;
 }
 
-error_code sceNpCommerceSetDataFlagStart(u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5)
+error_code sceNpCommerceSetDataFlagStart()
 {
-	sceNp.todo("sceNpCommerceSetDataFlagStart(arg1=0x%x, arg2=0x%x, arg3=0x%x, arg4=0x%x, arg5=0x%x)", arg1, arg2, arg3, arg4, arg5);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
-	if (arg4 == 0 || arg4 > 16)
-		return SCE_NP_COMMERCE_ERROR_INVALID_DATA_FLAG_NUM;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_CTX_NOT_FOUND;
-
+	UNIMPLEMENTED_FUNC(sceNp);
 	return CELL_OK;
 }
 
-error_code sceNpCommerceGetDataFlagStart(u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5)
+error_code sceNpCommerceGetDataFlagStart()
 {
-	sceNp.todo("sceNpCommerceGetDataFlagStart(arg1=0x%x, arg2=0x%x, arg3=0x%x, arg4=0x%x, arg5=0x%x)", arg1, arg2, arg3, arg4, arg5);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
-	if (arg4 == 0 || arg4 > 16)
-		return SCE_NP_COMMERCE_ERROR_INVALID_DATA_FLAG_NUM;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_CTX_NOT_FOUND;
-
+	UNIMPLEMENTED_FUNC(sceNp);
 	return CELL_OK;
 }
 
 error_code sceNpCommerceSetDataFlagFinish()
 {
 	UNIMPLEMENTED_FUNC(sceNp);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerceGetDataFlagFinish()
 {
 	UNIMPLEMENTED_FUNC(sceNp);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
 	return CELL_OK;
 }
 
-error_code sceNpCommerceGetDataFlagState(u32 arg1, u32 arg2, u32 arg3)
+error_code sceNpCommerceGetDataFlagState()
 {
-	sceNp.todo("sceNpCommerceGetDataFlagState(arg1=0x%x, arg2=0x%x, arg3=0x%x)", arg1, arg2, arg3);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
-	if (arg3 == 0 || arg3 > 16)
-		return SCE_NP_COMMERCE_ERROR_INVALID_DATA_FLAG_NUM;
-
+	UNIMPLEMENTED_FUNC(sceNp);
 	return CELL_OK;
 }
 
 error_code sceNpCommerceGetDataFlagAbort()
 {
 	UNIMPLEMENTED_FUNC(sceNp);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerceGetChildCategoryInfo(vm::ptr<SceNpCommerceProductCategory> pc, u32 child_index, vm::ptr<SceNpCommerceCategoryInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetChildCategoryInfo(pc=*0x%x, child_index=%d, info=*0x%x)", pc, child_index, info);
-	
-	if (!pc || !info) // Not really checked I think
-		return SCE_NP_COMMERCE_ERROR_CHILD_CATEGORY_INFO_NOT_FOUND;
-
-	const u32 offset = child_index * 760;
-
-	if (offset + 1540 > pc->dataSize)
-		return SCE_NP_COMMERCE_ERROR_CHILD_CATEGORY_INFO_NOT_FOUND;
-
-	// TODO
-	//auto child = pc->data + offset + 780;
-	//info->pc = pc;
-	//info->data = child + 780;
-	//child + 0x603 = 0;
-	//child + 0x343 = 0;
-	//child + 0x403 = 0;
-	//child + 0x583 = 0;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerceGetChildProductSkuInfo(vm::ptr<SceNpCommerceProductCategory> pc, u32 child_index, vm::ptr<SceNpCommerceProductSkuInfo> info)
 {
 	sceNp.todo("sceNpCommerceGetChildProductSkuInfo(pc=*0x%x, child_index=%d, info=*0x%x)", pc, child_index, info);
-	
-	if (!pc || !info) // Not really checked I think
-		return SCE_NP_COMMERCE_ERROR_SKU_INFO_NOT_FOUND;
-
-	if (pc->dataSize > 780)
-		return SCE_NP_COMMERCE_ERROR_SKU_INFO_NOT_FOUND;
-
-	// TODO
-	//const u32 child_offset = child_index * 1004;
-	//const u32 offset = (pc->data + 776) * 760 + offset;
-
-	//if (offset + 788 > pc->dataSize)
-	//	return SCE_NP_COMMERCE_ERROR_SKU_INFO_NOT_FOUND;
-
-	//auto child = pc->data + offset;
-	//info->pc = pc;
-	//info->data = child + 784;
-	//child + 0x6f7 = 0;
-	//child + 0x347 = 0;
-	//child + 0x377 = 0;
-	//child + 0x437 = 0;
-	//child + 0x477 = 0;
-	//child + 0x5f7 = 0;
-	//child + 0x677 = 0;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerceDoCheckoutStartAsync(u32 ctx_id, vm::cpptr<char> sku_ids, u32 sku_num, sys_memory_container_t container, vm::ptr<u32> req_id)
 {
 	sceNp.todo("sceNpCommerceDoCheckoutStartAsync(ctx_id=%d, sku_ids=*0x%x, sku_num=%d, container=%d, req_id=*0x%x)", ctx_id, sku_ids, sku_num, container, req_id);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
-	if (!sku_num || sku_num > 16)
-		return SCE_NP_COMMERCE_ERROR_INVALID_SKU_NUM;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_CTX_NOT_FOUND;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_INVALID_MEMORY_CONTAINER;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_INSUFFICIENT_MEMORY_CONTAINER;
-
-	// TODO: get sku_ids
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerceDoCheckoutFinishAsync(u32 req_id)
 {
 	sceNp.todo("sceNpCommerceDoCheckoutFinishAsync(req_id=%d)", req_id);
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED;
-
 	return CELL_OK;
 }
 
@@ -2948,66 +1807,18 @@ error_code sceNpCustomMenuRegisterActions(vm::cptr<SceNpCustomMenu> menu, vm::pt
 {
 	sceNp.todo("sceNpCustomMenuRegisterActions(menu=*0x%x, handler=*0x%x, userArg=*0x%x, options=0x%x)", menu, handler, userArg, options);
 
-	// TODO: Is there any error if options is not 0 ?
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_CUSTOM_MENU_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!menu || !handler) // TODO: handler check might come later
+	if (!menu || !handler)
 	{
 		return SCE_NP_CUSTOM_MENU_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (menu->numActions > SCE_NP_CUSTOM_MENU_ACTION_ITEMS_TOTAL_MAX)
-	{
-		return SCE_NP_CUSTOM_MENU_ERROR_EXCEEDS_MAX;
-	}
-
-	std::vector<np::np_handler::custom_menu_action> actions;
-
-	for (u32 i = 0; i < menu->numActions; i++)
-	{
-		if (!menu->actions || !menu->actions[i].name)
-		{
-			return SCE_NP_CUSTOM_MENU_ERROR_INVALID_ARGUMENT;
-		}
-
-		// TODO: Is there any error if menu->actions[i].options is not 0 ?
-
-		// TODO: check name
-		if (false)
-		{
-			return SCE_NP_UTIL_ERROR_INVALID_CHARACTER;
-		}
-
-		if (!memchr(menu->actions[i].name.get_ptr(), '\0', SCE_NP_CUSTOM_MENU_ACTION_CHARACTER_MAX))
-		{
-			return SCE_NP_CUSTOM_MENU_ERROR_EXCEEDS_MAX;
-		}
-
-		np::np_handler::custom_menu_action action{};
-		action.id   = static_cast<s32>(actions.size());
-		action.mask = menu->actions[i].mask;
-		action.name = menu->actions[i].name.get_ptr();
-
-		sceNp.notice("Registering menu action: id=%d, mask=0x%x, name=%s", action.id, action.mask, action.name);
-
-		actions.push_back(std::move(action));
-	}
-
-	// TODO: add the custom menu to the friendlist and profile dialogs
-	std::lock_guard lock(nph.mutex_custom_menu);
-	nph.custom_menu_handler = handler;
-	nph.custom_menu_user_arg = userArg;
-	nph.custom_menu_actions = std::move(actions);
-	nph.custom_menu_registered = true;
-	nph.custom_menu_activation = {};
-	nph.custom_menu_exception_list = {};
-
 	return CELL_OK;
 }
 
@@ -3015,29 +1826,18 @@ error_code sceNpCustomMenuActionSetActivation(vm::cptr<SceNpCustomMenuIndexArray
 {
 	sceNp.todo("sceNpCustomMenuActionSetActivation(array=*0x%x, options=0x%x)", array, options);
 
-	// TODO: Is there any error if options is not 0 ?
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_CUSTOM_MENU_ERROR_NOT_INITIALIZED;
 	}
 
-	std::lock_guard lock(nph.mutex_custom_menu);
-
-	if (!nph.custom_menu_registered)
-	{
-		return SCE_NP_CUSTOM_MENU_ERROR_NOT_REGISTERED;
-	}
-
 	if (!array)
 	{
 		return SCE_NP_CUSTOM_MENU_ERROR_INVALID_ARGUMENT;
 	}
 
-	nph.custom_menu_activation = *array;
-
 	return CELL_OK;
 }
 
@@ -3045,38 +1845,22 @@ error_code sceNpCustomMenuRegisterExceptionList(vm::cptr<SceNpCustomMenuActionEx
 {
 	sceNp.todo("sceNpCustomMenuRegisterExceptionList(items=*0x%x, numItems=%d, options=0x%x)", items, numItems, options);
 
-	// TODO: Is there any error if options is not 0 ?
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_CUSTOM_MENU_ERROR_NOT_INITIALIZED;
 	}
 
-	std::lock_guard lock(nph.mutex_custom_menu);
-
-	if (!nph.custom_menu_registered)
-	{
-		return SCE_NP_CUSTOM_MENU_ERROR_NOT_REGISTERED;
-	}
-
-	if (numItems > SCE_NP_CUSTOM_MENU_EXCEPTION_ITEMS_MAX)
-	{
-		return SCE_NP_CUSTOM_MENU_ERROR_EXCEEDS_MAX;
-	}
-
 	if (!items)
 	{
 		return SCE_NP_CUSTOM_MENU_ERROR_INVALID_ARGUMENT;
 	}
 
-	nph.custom_menu_exception_list.clear();
-
-	for (u32 i = 0; i < numItems; i++)
+	if (numItems > SCE_NP_CUSTOM_MENU_ACTION_ITEMS_MAX)
 	{
-		// TODO: Are the exceptions checked ?
-		nph.custom_menu_exception_list.push_back(items[i]);
+		// TODO: what about SCE_NP_CUSTOM_MENU_ACTION_ITEMS_TOTAL_MAX
+		return SCE_NP_CUSTOM_MENU_ERROR_EXCEEDS_MAX;
 	}
 
 	return CELL_OK;
@@ -3086,27 +1870,18 @@ error_code sceNpFriendlist(vm::ptr<SceNpFriendlistResultHandler> resultHandler,
 {
 	sceNp.warning("sceNpFriendlist(resultHandler=*0x%x, userArg=*0x%x, containerId=%d)", resultHandler, userArg, containerId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
-		return SCE_NP_FRIENDLIST_ERROR_NOT_INITIALIZED;
+		return SCE_NP_CUSTOM_MENU_ERROR_NOT_INITIALIZED;
 	}
 
-	// TODO: SCE_NP_FRIENDLIST_ERROR_BUSY
-
 	if (!resultHandler)
 	{
 		return SCE_NP_FRIENDLIST_ERROR_INVALID_ARGUMENT;
 	}
 
-	vm::var<SceNpId> id;
-	error_code err = sceNpManagerGetNpId(id);
-	if (err != CELL_OK)
-		return err;
-
-	// TODO: handler
-
 	return CELL_OK;
 }
 
@@ -3114,27 +1889,18 @@ error_code sceNpFriendlistCustom(SceNpFriendlistCustomOptions options, vm::ptr<S
 {
 	sceNp.warning("sceNpFriendlistCustom(options=0x%x, resultHandler=*0x%x, userArg=*0x%x, containerId=%d)", options, resultHandler, userArg, containerId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
-		return SCE_NP_FRIENDLIST_ERROR_NOT_INITIALIZED;
+		return SCE_NP_CUSTOM_MENU_ERROR_NOT_INITIALIZED;
 	}
 
-	// TODO: SCE_NP_FRIENDLIST_ERROR_BUSY
-
 	if (!resultHandler)
 	{
 		return SCE_NP_FRIENDLIST_ERROR_INVALID_ARGUMENT;
 	}
 
-	vm::var<SceNpId> id;
-	error_code err = sceNpManagerGetNpId(id);
-	if (err != CELL_OK)
-		return err;
-
-	// TODO: handler
-
 	return CELL_OK;
 }
 
@@ -3142,15 +1908,13 @@ error_code sceNpFriendlistAbortGui()
 {
 	sceNp.todo("sceNpFriendlistAbortGui()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
-		return SCE_NP_FRIENDLIST_ERROR_NOT_INITIALIZED;
+		return SCE_NP_CUSTOM_MENU_ERROR_NOT_INITIALIZED;
 	}
 
-	// TODO: abort friendlist GUI interaction
-
 	return CELL_OK;
 }
 
@@ -3158,7 +1922,7 @@ error_code sceNpLookupInit()
 {
 	sceNp.warning("sceNpLookupInit()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (nph.is_NP_Lookup_init)
 	{
@@ -3177,9 +1941,9 @@ error_code sceNpLookupInit()
 
 error_code sceNpLookupTerm()
 {
-	sceNp.warning("sceNpLookupTerm()");
+	sceNp.todo("sceNpLookupTerm()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3198,9 +1962,9 @@ error_code sceNpLookupTerm()
 
 error_code sceNpLookupCreateTitleCtx(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpId> selfNpId)
 {
-	sceNp.warning("sceNpLookupCreateTitleCtx(communicationId=*0x%x(%s), selfNpId=0x%x)", communicationId, communicationId ? communicationId->data : "", selfNpId);
+	sceNp.warning("sceNpLookupCreateTitleCtx(communicationId=*0x%x(%s), selfNpId=0x%x)", communicationId, communicationId->data, selfNpId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3219,7 +1983,7 @@ error_code sceNpLookupDestroyTitleCtx(s32 titleCtxId)
 {
 	sceNp.warning("sceNpLookupDestroyTitleCtx(titleCtxId=%d)", titleCtxId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3236,7 +2000,7 @@ error_code sceNpLookupCreateTransactionCtx(s32 titleCtxId)
 {
 	sceNp.warning("sceNpLookupCreateTransactionCtx(titleCtxId=%d)", titleCtxId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3255,7 +2019,7 @@ error_code sceNpLookupDestroyTransactionCtx(s32 transId)
 {
 	sceNp.warning("sceNpLookupDestroyTransactionCtx(transId=%d)", transId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3274,7 +2038,7 @@ error_code sceNpLookupSetTimeout(s32 ctxId, usecond_t timeout)
 {
 	sceNp.todo("sceNpLookupSetTimeout(ctxId=%d, timeout=%d)", ctxId, timeout);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3293,7 +2057,7 @@ error_code sceNpLookupAbortTransaction(s32 transId)
 {
 	sceNp.todo("sceNpLookupAbortTransaction(transId=%d)", transId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3307,7 +2071,7 @@ error_code sceNpLookupWaitAsync(s32 transId, vm::ptr<s32> result)
 {
 	sceNp.todo("sceNpLookupWaitAsync(transId=%d, result=%d)", transId, result);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3321,7 +2085,7 @@ error_code sceNpLookupPollAsync(s32 transId, vm::ptr<s32> result)
 {
 	sceNp.todo("sceNpLookupPollAsync(transId=%d, result=*0x%x)", transId, result);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3337,7 +2101,7 @@ error_code sceNpLookupNpId(s32 transId, vm::cptr<SceNpOnlineId> onlineId, vm::pt
 {
 	sceNp.todo("sceNpLookupNpId(transId=%d, onlineId=*0x%x, npId=*0x%x, option=*0x%x)", transId, onlineId, npId, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3359,18 +2123,14 @@ error_code sceNpLookupNpId(s32 transId, vm::cptr<SceNpOnlineId> onlineId, vm::pt
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
 	}
 
-	// Hack - better than nothing for now
-	memset(npId.get_ptr(), 0, sizeof(SceNpId));
-	memcpy(npId->handle.data, onlineId->data, sizeof(npId->handle.data) - 1);
-
 	return CELL_OK;
 }
 
-error_code sceNpLookupNpIdAsync(s32 transId, vm::cptr<SceNpOnlineId> onlineId, vm::ptr<SceNpId> npId, s32 prio, vm::ptr<void> option)
+error_code sceNpLookupNpIdAsync(s32 transId, vm::ptr<SceNpOnlineId> onlineId, vm::ptr<SceNpId> npId, s32 prio, vm::ptr<void> option)
 {
 	sceNp.todo("sceNpLookupNpIdAsync(transId=%d, onlineId=*0x%x, npId=*0x%x, prio=%d, option=*0x%x)", transId, onlineId, npId, prio, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3392,10 +2152,6 @@ error_code sceNpLookupNpIdAsync(s32 transId, vm::cptr<SceNpOnlineId> onlineId, v
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
 	}
 
-	// Hack - better than nothing for now
-	memset(npId.get_ptr(), 0, sizeof(SceNpId));
-	memcpy(npId->handle.data, onlineId->data, sizeof(npId->handle.data) - 1);
-
 	return CELL_OK;
 }
 
@@ -3405,7 +2161,7 @@ error_code sceNpLookupUserProfile(s32 transId, vm::cptr<SceNpId> npId, vm::ptr<S
 	sceNp.todo("sceNpLookupUserProfile(transId=%d, npId=*0x%x, userInfo=*0x%x, aboutMe=*0x%x, languages=*0x%x, countryCode=*0x%x, avatarImage=*0x%x, option=*0x%x)", transId, npId, userInfo, aboutMe,
 	    languages, countryCode, avatarImage, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3436,7 +2192,7 @@ error_code sceNpLookupUserProfileAsync(s32 transId, vm::cptr<SceNpId> npId, vm::
 	sceNp.todo("sceNpLookupUserProfile(transId=%d, npId=*0x%x, userInfo=*0x%x, aboutMe=*0x%x, languages=*0x%x, countryCode=*0x%x, avatarImage=*0x%x, prio=%d, option=*0x%x)", transId, npId, userInfo,
 	    aboutMe, languages, countryCode, avatarImage, prio, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3462,13 +2218,13 @@ error_code sceNpLookupUserProfileAsync(s32 transId, vm::cptr<SceNpId> npId, vm::
 }
 
 error_code sceNpLookupUserProfileWithAvatarSize(s32 transId, s32 avatarSizeType, vm::cptr<SceNpId> npId, vm::ptr<SceNpUserInfo> userInfo, vm::ptr<SceNpAboutMe> aboutMe,
-    vm::ptr<SceNpMyLanguages> languages, vm::ptr<SceNpCountryCode> countryCode, vm::ptr<void> avatarImageData, u32 avatarImageDataMaxSize, vm::ptr<u32> avatarImageDataSize, vm::ptr<void> option)
+    vm::ptr<SceNpMyLanguages> languages, vm::ptr<SceNpCountryCode> countryCode, vm::ptr<void> avatarImageData, u64 avatarImageDataMaxSize, vm::ptr<u64> avatarImageDataSize, vm::ptr<void> option)
 {
 	sceNp.todo("sceNpLookupUserProfileWithAvatarSize(transId=%d, avatarSizeType=%d, npId=*0x%x, userInfo=*0x%x, aboutMe=*0x%x, languages=*0x%x, countryCode=*0x%x, avatarImageData=*0x%x, "
 	           "avatarImageDataMaxSize=%d, avatarImageDataSize=*0x%x, option=*0x%x)",
 	    transId, avatarSizeType, npId, userInfo, aboutMe, languages, countryCode, avatarImageData, avatarImageDataMaxSize, avatarImageDataSize, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3494,14 +2250,14 @@ error_code sceNpLookupUserProfileWithAvatarSize(s32 transId, s32 avatarSizeType,
 }
 
 error_code sceNpLookupUserProfileWithAvatarSizeAsync(s32 transId, s32 avatarSizeType, vm::cptr<SceNpId> npId, vm::ptr<SceNpUserInfo> userInfo, vm::ptr<SceNpAboutMe> aboutMe,
-    vm::ptr<SceNpMyLanguages> languages, vm::ptr<SceNpCountryCode> countryCode, vm::ptr<void> avatarImageData, u32 avatarImageDataMaxSize, vm::ptr<u32> avatarImageDataSize, s32 prio,
+    vm::ptr<SceNpMyLanguages> languages, vm::ptr<SceNpCountryCode> countryCode, vm::ptr<void> avatarImageData, u64 avatarImageDataMaxSize, vm::ptr<u64> avatarImageDataSize, s32 prio,
     vm::ptr<void> option)
 {
 	sceNp.todo("sceNpLookupUserProfileWithAvatarSizeAsync(transId=%d, avatarSizeType=%d, npId=*0x%x, userInfo=*0x%x, aboutMe=*0x%x, languages=*0x%x, countryCode=*0x%x, avatarImageData=*0x%x, "
 	           "avatarImageDataMaxSize=%d, avatarImageDataSize=*0x%x, prio=%d, option=*0x%x)",
 	    transId, avatarSizeType, npId, userInfo, aboutMe, languages, countryCode, avatarImageData, avatarImageDataMaxSize, avatarImageDataSize, prio, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3530,7 +2286,7 @@ error_code sceNpLookupAvatarImage(s32 transId, vm::ptr<SceNpAvatarUrl> avatarUrl
 {
 	sceNp.todo("sceNpLookupAvatarImage(transId=%d, avatarUrl=*0x%x, avatarImage=*0x%x, option=*0x%x)", transId, avatarUrl, avatarImage, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3559,7 +2315,7 @@ error_code sceNpLookupAvatarImageAsync(s32 transId, vm::ptr<SceNpAvatarUrl> avat
 {
 	sceNp.todo("sceNpLookupAvatarImageAsync(transId=%d, avatarUrl=*0x%x, avatarImage=*0x%x, prio=%d, option=*0x%x)", transId, avatarUrl, avatarImage, prio, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3588,7 +2344,7 @@ error_code sceNpLookupTitleStorage()
 {
 	UNIMPLEMENTED_FUNC(sceNp);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3602,7 +2358,7 @@ error_code sceNpLookupTitleStorageAsync()
 {
 	UNIMPLEMENTED_FUNC(sceNp);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3612,11 +2368,11 @@ error_code sceNpLookupTitleStorageAsync()
 	return CELL_OK;
 }
 
-error_code sceNpLookupTitleSmallStorage(s32 transId, vm::ptr<void> data, u32 maxSize, vm::ptr<u32> contentLength, vm::ptr<void> option)
+error_code sceNpLookupTitleSmallStorage(s32 transId, vm::ptr<void> data, u64 maxSize, vm::ptr<u64> contentLength, vm::ptr<void> option)
 {
 	sceNp.todo("sceNpLookupTitleSmallStorage(transId=%d, data=*0x%x, maxSize=%d, contentLength=*0x%x, option=*0x%x)", transId, data, maxSize, contentLength, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3646,11 +2402,11 @@ error_code sceNpLookupTitleSmallStorage(s32 transId, vm::ptr<void> data, u32 max
 	return CELL_OK;
 }
 
-error_code sceNpLookupTitleSmallStorageAsync(s32 transId, vm::ptr<void> data, u32 maxSize, vm::ptr<u32> contentLength, s32 prio, vm::ptr<void> option)
+error_code sceNpLookupTitleSmallStorageAsync(s32 transId, vm::ptr<void> data, u64 maxSize, vm::ptr<u64> contentLength, s32 prio, vm::ptr<void> option)
 {
 	sceNp.todo("sceNpLookupTitleSmallStorageAsync(transId=%d, data=*0x%x, maxSize=%d, contentLength=*0x%x, prio=%d, option=*0x%x)", transId, data, maxSize, contentLength, prio, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Lookup_init)
 	{
@@ -3667,7 +2423,7 @@ error_code sceNpLookupTitleSmallStorageAsync(s32 transId, vm::ptr<void> data, u3
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
-	//if (something > maxSize)
+	//	if (something > maxSize)
 	//{
 	//	return SCE_NP_COMMUNITY_ERROR_BODY_TOO_LARGE;
 	//}
@@ -3688,7 +2444,7 @@ error_code sceNpManagerRegisterCallback(vm::ptr<SceNpManagerCallback> callback,
 {
 	sceNp.warning("sceNpManagerRegisterCallback(callback=*0x%x, arg=*0x%x)", callback, arg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -3710,7 +2466,7 @@ error_code sceNpManagerUnregisterCallback()
 {
 	sceNp.warning("sceNpManagerUnregisterCallback()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -3726,11 +2482,11 @@ error_code sceNpManagerGetStatus(vm::ptr<s32> status)
 {
 	sceNp.trace("sceNpManagerGetStatus(status=*0x%x)", status);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
-		return SCE_NP_ERROR_NOT_INITIALIZED;
+		//return SCE_NP_ERROR_NOT_INITIALIZED;
 	}
 
 	if (!status)
@@ -3747,11 +2503,11 @@ error_code sceNpManagerGetNetworkTime(vm::ptr<CellRtcTick> pTick)
 {
 	sceNp.warning("sceNpManagerGetNetworkTime(pTick=*0x%x)", pTick);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
-		return not_an_error(SCE_NP_ERROR_NOT_INITIALIZED);
+		//return SCE_NP_ERROR_NOT_INITIALIZED;
 	}
 
 	if (!pTick)
@@ -3769,7 +2525,18 @@ error_code sceNpManagerGetNetworkTime(vm::ptr<CellRtcTick> pTick)
 		return SCE_NP_ERROR_INVALID_STATE;
 	}
 
-	pTick->tick = nph.get_network_time();
+	vm::var<s64> sec;
+	vm::var<s64> nsec;
+
+	error_code ret = sys_time_get_current_time(sec, nsec);
+
+	if (ret != CELL_OK)
+	{
+		return ret;
+	}
+
+	// Taken from cellRtc
+	pTick->tick = *nsec / 1000 + *sec * cellRtcGetTickResolution() + 62135596800000000ULL;
 
 	return CELL_OK;
 }
@@ -3778,11 +2545,11 @@ error_code sceNpManagerGetOnlineId(vm::ptr<SceNpOnlineId> onlineId)
 {
 	sceNp.warning("sceNpManagerGetOnlineId(onlineId=*0x%x)", onlineId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
-		return SCE_NP_ERROR_NOT_INITIALIZED;
+		//return SCE_NP_ERROR_NOT_INITIALIZED;
 	}
 
 	if (!onlineId)
@@ -3805,16 +2572,16 @@ error_code sceNpManagerGetOnlineId(vm::ptr<SceNpOnlineId> onlineId)
 	return CELL_OK;
 }
 
-error_code sceNpManagerGetNpId(vm::ptr<SceNpId> npId)
+error_code sceNpManagerGetNpId(ppu_thread&, vm::ptr<SceNpId> npId)
 {
-	sceNp.trace("sceNpManagerGetNpId(npId=*0x%x)", npId);
+	sceNp.warning("sceNpManagerGetNpId(npId=*0x%x)", npId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
-	if (!nph.is_NP_init)
-	{
-		return SCE_NP_ERROR_NOT_INITIALIZED;
-	}
+	// if (!nph.is_NP_init)
+	// {
+	// 	return SCE_NP_ERROR_NOT_INITIALIZED;
+	// }
 
 	if (!npId)
 	{
@@ -3836,13 +2603,11 @@ error_code sceNpManagerGetNpId(vm::ptr<SceNpId> npId)
 	return CELL_OK;
 }
 
-error_code sceNpManagerGetOnlineName(ppu_thread& ppu, vm::ptr<SceNpOnlineName> onlineName)
+error_code sceNpManagerGetOnlineName(vm::ptr<SceNpOnlineName> onlineName)
 {
-	ppu.state += cpu_flag::wait;
+	sceNp.warning("sceNpManagerGetOnlineName(onlineName=*0x%x)", onlineName);
 
-	sceNp.trace("sceNpManagerGetOnlineName(onlineName=*0x%x)", onlineName);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -3864,19 +2629,16 @@ error_code sceNpManagerGetOnlineName(ppu_thread& ppu, vm::ptr<SceNpOnlineName> o
 		return SCE_NP_ERROR_INVALID_STATE;
 	}
 
-	ppu.check_state();
-	std::memcpy(onlineName.get_ptr(), &nph.get_online_name(), onlineName.size());
+	memcpy(onlineName.get_ptr(), &nph.get_online_name(), onlineName.size());
 
 	return CELL_OK;
 }
 
-error_code sceNpManagerGetAvatarUrl(ppu_thread& ppu, vm::ptr<SceNpAvatarUrl> avatarUrl)
+error_code sceNpManagerGetAvatarUrl(vm::ptr<SceNpAvatarUrl> avatarUrl)
 {
-	ppu.state += cpu_flag::wait;
+	sceNp.warning("sceNpManagerGetAvatarUrl(avatarUrl=*0x%x)", avatarUrl);
 
-	sceNp.trace("sceNpManagerGetAvatarUrl(avatarUrl=*0x%x)", avatarUrl);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -3898,17 +2660,16 @@ error_code sceNpManagerGetAvatarUrl(ppu_thread& ppu, vm::ptr<SceNpAvatarUrl> ava
 		return SCE_NP_ERROR_INVALID_STATE;
 	}
 
-	ppu.check_state();
-	std::memcpy(avatarUrl.get_ptr(), &nph.get_avatar_url(), avatarUrl.size());
+	memcpy(avatarUrl.get_ptr(), &nph.get_avatar_url(), avatarUrl.size());
 
 	return CELL_OK;
 }
 
 error_code sceNpManagerGetMyLanguages(vm::ptr<SceNpMyLanguages> myLanguages)
 {
-	sceNp.trace("sceNpManagerGetMyLanguages(myLanguages=*0x%x)", myLanguages);
+	sceNp.warning("sceNpManagerGetMyLanguages(myLanguages=*0x%x)", myLanguages);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -3930,10 +2691,6 @@ error_code sceNpManagerGetMyLanguages(vm::ptr<SceNpMyLanguages> myLanguages)
 		return SCE_NP_ERROR_INVALID_STATE;
 	}
 
-	myLanguages->language1 = SCE_NP_LANG_ENGLISH_US;
-	myLanguages->language2 = g_cfg.sys.language != CELL_SYSUTIL_LANG_ENGLISH_US ? g_cfg.sys.language : -1;
-	myLanguages->language3 = -1;
-
 	return CELL_OK;
 }
 
@@ -3941,7 +2698,7 @@ error_code sceNpManagerGetAccountRegion(vm::ptr<SceNpCountryCode> countryCode, v
 {
 	sceNp.warning("sceNpManagerGetAccountRegion(countryCode=*0x%x, language=*0x%x)", countryCode, language);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -3963,10 +2720,9 @@ error_code sceNpManagerGetAccountRegion(vm::ptr<SceNpCountryCode> countryCode, v
 		return SCE_NP_ERROR_INVALID_STATE;
 	}
 
-	const std::string ccode = g_cfg.net.country.to_string();
-	std::memset(countryCode.get_ptr(), 0, sizeof(countryCode));
-	ensure(ccode.size() == sizeof(SceNpCountryCode::data));
-	std::memcpy(countryCode->data, ccode.data(), sizeof(SceNpCountryCode::data));
+	memset(countryCode.get_ptr(), 0, sizeof(countryCode));
+	countryCode->data[0] = 'u';
+	countryCode->data[1] = 's';
 
 	*language = CELL_SYSUTIL_LANG_ENGLISH_US;
 
@@ -3977,7 +2733,7 @@ error_code sceNpManagerGetAccountAge(vm::ptr<s32> age)
 {
 	sceNp.warning("sceNpManagerGetAccountAge(age=*0x%x)", age);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -4006,9 +2762,9 @@ error_code sceNpManagerGetAccountAge(vm::ptr<s32> age)
 
 error_code sceNpManagerGetContentRatingFlag(vm::ptr<s32> isRestricted, vm::ptr<s32> age)
 {
-	sceNp.trace("sceNpManagerGetContentRatingFlag(isRestricted=*0x%x, age=*0x%x)", isRestricted, age);
+	sceNp.warning("sceNpManagerGetContentRatingFlag(isRestricted=*0x%x, age=*0x%x)", isRestricted, age);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -4041,7 +2797,7 @@ error_code sceNpManagerGetChatRestrictionFlag(vm::ptr<s32> isRestricted)
 {
 	sceNp.trace("sceNpManagerGetChatRestrictionFlag(isRestricted=*0x%x)", isRestricted);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -4071,9 +2827,9 @@ error_code sceNpManagerGetChatRestrictionFlag(vm::ptr<s32> isRestricted)
 
 error_code sceNpManagerGetCachedInfo(CellSysutilUserId userId, vm::ptr<SceNpManagerCacheParam> param)
 {
-	sceNp.warning("sceNpManagerGetCachedInfo(userId=%d, param=*0x%x)", userId, param);
+	sceNp.todo("sceNpManagerGetCachedInfo(userId=%d, param=*0x%x)", userId, param);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -4085,32 +2841,20 @@ error_code sceNpManagerGetCachedInfo(CellSysutilUserId userId, vm::ptr<SceNpMana
 		return SCE_NP_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (userId != CELL_SYSUTIL_USERID_CURRENT && userId != Emu.GetUsrId())
-	{
-		return CELL_ENOENT;
-	}
-
-	param->size = sizeof(SceNpManagerCacheParam);
-	param->onlineId = nph.get_online_id();
-	param->npId = nph.get_npid();
-	param->onlineName = nph.get_online_name();
-	param->avatarUrl = nph.get_avatar_url();
-
 	return CELL_OK;
 }
 
-error_code sceNpManagerGetPsHandle(vm::ptr<SceNpOnlineId> onlineId)
+error_code sceNpManagerGetPsHandle()
 {
-	sceNp.warning("sceNpManagerGetPsHandle(onlineId=*0x%x)", onlineId);
-
-	return sceNpManagerGetOnlineId(onlineId);
+	UNIMPLEMENTED_FUNC(sceNp);
+	return CELL_OK;
 }
 
 error_code sceNpManagerRequestTicket(vm::cptr<SceNpId> npId, vm::cptr<char> serviceId, vm::cptr<void> cookie, u32 cookieSize, vm::cptr<char> entitlementId, u32 consumedCount)
 {
-	sceNp.warning("sceNpManagerRequestTicket(npId=*0x%x, serviceId=%s, cookie=*0x%x, cookieSize=%d, entitlementId=%s, consumedCount=%d)", npId, serviceId, cookie, cookieSize, entitlementId, consumedCount);
+	sceNp.error("sceNpManagerRequestTicket(npId=*0x%x, serviceId=%s, cookie=*0x%x, cookieSize=%d, entitlementId=%s, consumedCount=%d)", npId, serviceId, cookie, cookieSize, entitlementId, consumedCount);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -4140,10 +2884,10 @@ error_code sceNpManagerRequestTicket(vm::cptr<SceNpId> npId, vm::cptr<char> serv
 error_code sceNpManagerRequestTicket2(vm::cptr<SceNpId> npId, vm::cptr<SceNpTicketVersion> version, vm::cptr<char> serviceId,
 	vm::cptr<void> cookie, u32 cookieSize, vm::cptr<char> entitlementId, u32 consumedCount)
 {
-	sceNp.warning("sceNpManagerRequestTicket2(npId=*0x%x, version=*0x%x, serviceId=%s, cookie=*0x%x, cookieSize=%d, entitlementId=%s, consumedCount=%d)", npId, version, serviceId, cookie, cookieSize,
+	sceNp.todo("sceNpManagerRequestTicket2(npId=*0x%x, version=*0x%x, serviceId=%s, cookie=*0x%x, cookieSize=%d, entitlementId=%s, consumedCount=%d)", npId, version, serviceId, cookie, cookieSize,
 	    entitlementId, consumedCount);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -4172,9 +2916,9 @@ error_code sceNpManagerRequestTicket2(vm::cptr<SceNpId> npId, vm::cptr<SceNpTick
 
 error_code sceNpManagerGetTicket(vm::ptr<void> buffer, vm::ptr<u32> bufferSize)
 {
-	sceNp.warning("sceNpManagerGetTicket(buffer=*0x%x, bufferSize=*0x%x)", buffer, bufferSize);
+	sceNp.error("sceNpManagerGetTicket(buffer=*0x%x, bufferSize=*0x%x)", buffer, bufferSize);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -4187,10 +2931,10 @@ error_code sceNpManagerGetTicket(vm::ptr<void> buffer, vm::ptr<u32> bufferSize)
 	}
 
 	const auto& ticket = nph.get_ticket();
-	*bufferSize = static_cast<u32>(ticket.size());
 
 	if (!buffer)
 	{
+		*bufferSize = static_cast<u32>(ticket.size());
 		return CELL_OK;
 	}
 
@@ -4206,32 +2950,21 @@ error_code sceNpManagerGetTicket(vm::ptr<void> buffer, vm::ptr<u32> bufferSize)
 
 error_code sceNpManagerGetTicketParam(s32 paramId, vm::ptr<SceNpTicketParam> param)
 {
-	sceNp.notice("sceNpManagerGetTicketParam(paramId=%d, param=*0x%x)", paramId, param);
+	sceNp.todo("sceNpManagerGetTicketParam(paramId=%d, param=*0x%x)", paramId, param);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!param || paramId < SCE_NP_TICKET_PARAM_SERIAL_ID || paramId > SCE_NP_TICKET_PARAM_SUBJECT_DOB)
+	if (!param)
 	{
+		// TODO: check paramId
 		return SCE_NP_ERROR_INVALID_ARGUMENT;
 	}
 
-	const auto& ticket = nph.get_ticket();
-
-	if (ticket.empty())
-	{
-		return SCE_NP_ERROR_INVALID_STATE;
-	}
-
-	if (!ticket.get_value(paramId, param))
-	{
-		return SCE_NP_ERROR_INVALID_STATE;
-	}
-
 	return CELL_OK;
 }
 
@@ -4239,21 +2972,21 @@ error_code sceNpManagerGetEntitlementIdList(vm::ptr<SceNpEntitlementId> entIdLis
 {
 	sceNp.todo("sceNpManagerGetEntitlementIdList(entIdList=*0x%x, entIdListNum=%d)", entIdList, entIdListNum);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_ERROR_NOT_INITIALIZED;
 	}
 
-	return not_an_error(0);
+	return CELL_OK;
 }
 
 error_code sceNpManagerGetEntitlementById(vm::cptr<char> entId, vm::ptr<SceNpEntitlement> ent)
 {
 	sceNp.todo("sceNpManagerGetEntitlementById(entId=%s, ent=*0x%x)", entId, ent);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -4265,27 +2998,12 @@ error_code sceNpManagerGetEntitlementById(vm::cptr<char> entId, vm::ptr<SceNpEnt
 		return SCE_NP_ERROR_INVALID_ARGUMENT;
 	}
 
-	return SCE_NP_ERROR_ID_NOT_FOUND;
+	return CELL_OK;
 }
 
-error_code sceNpManagerGetSigninId(vm::ptr<void> signInId)
+error_code sceNpManagerGetSigninId()
 {
-	sceNp.todo("sceNpManagerGetSigninId(signInId==*0x%x)", signInId);
-	
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_init)
-	{
-		return SCE_NP_ERROR_NOT_INITIALIZED;
-	}
-
-	if (!signInId)
-	{
-		return SCE_NP_ERROR_INVALID_ARGUMENT;
-	}
-
-	std::memset(signInId.get_ptr(), 0, 64); // signInId seems to be a 64 byte thing
-
+	UNIMPLEMENTED_FUNC(sceNp);
 	return CELL_OK;
 }
 
@@ -4293,7 +3011,7 @@ error_code sceNpManagerSubSignin(CellSysutilUserId userId, vm::ptr<SceNpManagerS
 {
 	sceNp.todo("sceNpManagerSubSignin(userId=%d, cb_func=*0x%x, cb_arg=*0x%x, flag=%d)", userId, cb_func, cb_arg, flag);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -4305,15 +3023,7 @@ error_code sceNpManagerSubSignin(CellSysutilUserId userId, vm::ptr<SceNpManagerS
 
 error_code sceNpManagerSubSigninAbortGui()
 {
-	sceNp.todo("sceNpManagerSubSigninAbortGui()");
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_init)
-	{
-		return SCE_NP_ERROR_NOT_INITIALIZED;
-	}
-
+	UNIMPLEMENTED_FUNC(sceNp);
 	return CELL_OK;
 }
 
@@ -4321,7 +3031,7 @@ error_code sceNpManagerSubSignout(vm::ptr<SceNpId> npId)
 {
 	sceNp.todo("sceNpManagerSubSignout(npId=*0x%x)", npId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -4331,503 +3041,96 @@ error_code sceNpManagerSubSignout(vm::ptr<SceNpId> npId)
 	return CELL_OK;
 }
 
-// FUN_000146fc
-error_code check_attr_id(vm::cptr<SceNpMatchingAttr> attr)
-{
-	ensure(!!attr);
-	if (!attr) return SCE_NP_MATCHING_ERROR_INVALID_ATTR_ID; // Satisfy compiler
-
-	switch (attr->type)
-	{
-	case SCE_NP_MATCHING_ATTR_TYPE_BASIC_BIN:
-	{
-		return SCE_NP_MATCHING_ERROR_INVALID_ATTR_ID;
-	}
-	case SCE_NP_MATCHING_ATTR_TYPE_BASIC_NUM:
-	{
-		if (attr->id < SCE_NP_MATCHING_ROOM_ATTR_ID_TOTAL_SLOT ||
-			attr->id > SCE_NP_MATCHING_ROOM_ATTR_ID_ROOM_SEARCH_FLAG)
-			return SCE_NP_MATCHING_ERROR_INVALID_ATTR_ID;
-		break;
-	}
-	case SCE_NP_MATCHING_ATTR_TYPE_GAME_BIN:
-	case SCE_NP_MATCHING_ATTR_TYPE_GAME_NUM:
-	{
-		if (attr->id < 1 || attr->id > 16)
-			return SCE_NP_MATCHING_ERROR_INVALID_ATTR_ID;
-		break;
-	}
-	default:
-		break;
-	}
-
-	return CELL_OK;
-}
-
-// FUN_0001476c
-error_code check_duplicate_attr(vm::cptr<SceNpMatchingAttr> attribute)
-{
-	std::set<s32> attr_type_id;
-
-	for (auto attr = attribute; !!attr; attr = attr->next)
-	{
-		// There are 4 types times 16 ids
-		const s32 type_id = (attr->type - 1) * 16 + attr->id - 1;
-
-		if (!attr_type_id.insert(type_id).second)
-			return SCE_NP_MATCHING_ERROR_DUPLICATE;
-	}
-
-	return CELL_OK;
-}
-
-// FUN_00011718
-error_code check_attr_id_and_duplicate(vm::cptr<SceNpMatchingAttr> attribute)
-{
-	for (auto attr = attribute; !!attr; attr = attr->next)
-	{
-		error_code err = check_attr_id(attr);
-		if (err != CELL_OK)
-			return err;
-	}
-
-	return check_duplicate_attr(attribute);
-}
-
-// FUN_000245e0
-error_code check_text(vm::cptr<char> text)
-{
-	if (!text)
-		return SCE_NP_UTIL_ERROR_INVALID_ARGUMENT;
-
-	u32 count = 0;
-
-	while (true)
-	{
-		const char c = *text;
-		if (c == '\0')
-			break;
-
-		const u32 val = static_cast<u32>(static_cast<u8>(c));
-
-		if (c < '\0')
-		{
-			if ((val & 0xe0) == 0xc0 && val > 0xc1 &&
-				(text[1] & 0xc0U) == 0x80)
-			{
-				text += 2;
-			}
-			else if ((val & 0xf0) == 0xe0 &&
-					 (text[1] & 0xc0U) == 0x80 &&
-					 (text[2] & 0xc0U) == 0x80)
-			{
-				text += 3;
-			}
-			else
-			{
-				if ((val & 0xf8) != 0xf0 ||
-					(text[1] & 0xc0U) != 0x80 ||
-					(text[2] & 0xc0U) != 0x80 ||
-					(text[3] & 0xc0U) != 0x80)
-				{
-					return SCE_NP_UTIL_ERROR_INVALID_CHARACTER;
-				}
-				text += 4;
-			}
-		}
-		else
-		{
-			if (false) // TODO: check current char
-				return SCE_NP_UTIL_ERROR_INVALID_CHARACTER;
-
-			text++;
-		}
-
-		count++;
-	}
-
-	return not_an_error(count);
-}
-
 error_code sceNpMatchingCreateCtx(vm::ptr<SceNpId> npId, vm::ptr<SceNpMatchingHandler> handler, vm::ptr<void> arg, vm::ptr<u32> ctx_id)
 {
-	sceNp.warning("sceNpMatchingCreateCtx(npId=*0x%x, handler=*0x%x, arg=*0x%x, ctx_id=*0x%x)", npId, handler, arg, ctx_id);
+	sceNp.todo("sceNpMatchingCreateCtx(npId=*0x%x, handler=*0x%x, arg=*0x%x, ctx_id=*0x%x)", npId, handler, arg, ctx_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-	{
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-	}
-
-	if (!nph.is_NP_init)
-	{
-		return SCE_NP_MATCHING_ERROR_NOT_INITIALIZED;
-	}
-
-	// assumed checks done on vsh
-	if (!npId || !handler || !ctx_id)
-	{
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-	}
-
-	const s32 id = create_matching_context(npId, handler, arg);
-
-	if (!id)
-	{
-		return SCE_NP_MATCHING_ERROR_CTX_MAX;
-	}
-
-	nph.set_current_gui_ctx_id(id);
-
-	*ctx_id = static_cast<u32>(id);
 	return CELL_OK;
 }
 
 error_code sceNpMatchingDestroyCtx(u32 ctx_id)
 {
-	sceNp.warning("sceNpMatchingDestroyCtx(ctx_id=%d)", ctx_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!nph.is_NP_init)
-		return SCE_NP_MATCHING_ERROR_NOT_INITIALIZED;
-
-	if (!destroy_matching_context(ctx_id))
-		return SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND;
-
-	nph.set_current_gui_ctx_id(0);
+	sceNp.todo("sceNpMatchingDestroyCtx(ctx_id=%d)", ctx_id);
 
 	return CELL_OK;
 }
 
-error_code sceNpMatchingGetResult(u32 ctx_id, u32 req_id, vm::ptr<void> buf, vm::ptr<u32> size, vm::ptr<s32> event)
+error_code sceNpMatchingGetResult(u32 ctx_id, u32 req_id, vm::ptr<void> buf, vm::ptr<u64> size, vm::ptr<s32> event)
 {
-	sceNp.warning("sceNpMatchingGetResult(ctx_id=%d, req_id=%d, buf=*0x%x, size=*0x%x, event=*0x%x)", ctx_id, req_id, buf, size, event);
+	sceNp.todo("sceNpMatchingGetResult(ctx_id=%d, req_id=%d, buf=*0x%x, size=*0x%x, event=*0x%x)", ctx_id, req_id, buf, size, event);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!nph.is_NP_init)
-		return SCE_NP_MATCHING_ERROR_NOT_INITIALIZED;
-
-	if (!size)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	return nph.get_matching_result(ctx_id, req_id, buf, size, event);
-
-	// const u64 id_check = static_cast<s64>(static_cast<s32>(req_id)) >> 0x17 & 0x3f;
-	// if (id_check > 32 || (1ULL << id_check & 0x1f89ad040U) == 0)
-	// 	return SCE_NP_MATCHING_ERROR_INVALID_REQ_ID;
+	return CELL_OK;
 }
 
-error_code sceNpMatchingGetResultGUI(vm::ptr<void> buf, vm::ptr<u32> size, vm::ptr<s32> event)
+error_code sceNpMatchingGetResultGUI(vm::ptr<void> buf, vm::ptr<u64> size, vm::ptr<s32> event)
 {
-	sceNp.warning("sceNpMatchingGetResultGUI(buf=*0x%x, size=*0x%x, event=*0x%x)", buf, size, event);
+	sceNp.todo("sceNpMatchingGetResultGUI(buf=*0x%x, size=*0x%x, event=*0x%x)", buf, size, event);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!size)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	return nph.get_result_gui(buf, size, event);
-}
-
-error_code matching_set_room_info(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr, vm::ptr<u32> req_id, bool limit)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!nph.is_NP_init)
-		return SCE_NP_MATCHING_ERROR_NOT_INITIALIZED;
-
-	if (limit)
-	{
-		static u64 last_call = 0;
-
-		if (last_call != 0 && (get_system_time() - last_call) < 30'000'000)
-			return SCE_NP_MATCHING_ERROR_BUSY;
-
-		last_call = get_system_time();
-	}
-
-	if (!lobby_id || !room_id || !req_id || !attr)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	error_code err = check_attr_id_and_duplicate(attr);
-	if (err != CELL_OK)
-		return err;
-
-	auto res = nph.set_room_info_gui(ctx_id, lobby_id, room_id, attr);
-
-	if (res < 0)
-		return res;
-
-	*req_id = res;
 	return CELL_OK;
 }
 
 error_code sceNpMatchingSetRoomInfo(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr, vm::ptr<u32> req_id)
 {
-	sceNp.warning("sceNpMatchingSetRoomInfo(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, attr=*0x%x, req_id=*0x%x)", ctx_id, lobby_id, room_id, attr, req_id);
+	sceNp.todo("sceNpMatchingSetRoomInfo(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, attr=*0x%x, req_id=*0x%x)", ctx_id, lobby_id, room_id, attr, req_id);
 
-	return matching_set_room_info(ctx_id, lobby_id, room_id, attr, req_id, true);
+	return CELL_OK;
 }
 
 error_code sceNpMatchingSetRoomInfoNoLimit(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr, vm::ptr<u32> req_id)
 {
-	sceNp.warning("sceNpMatchingSetRoomInfoNoLimit(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, attr=*0x%x, req_id=*0x%x)", ctx_id, lobby_id, room_id, attr, req_id);
+	sceNp.todo("sceNpMatchingSetRoomInfoNoLimit(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, attr=*0x%x, req_id=*0x%x)", ctx_id, lobby_id, room_id, attr, req_id);
 
-	return matching_set_room_info(ctx_id, lobby_id, room_id, attr, req_id, false);
-}
-
-error_code matching_get_room_info(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr, vm::ptr<u32> req_id, bool limit)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!nph.is_NP_init)
-		return SCE_NP_MATCHING_ERROR_NOT_INITIALIZED;
-
-	if (limit)
-	{
-		static u64 last_call = 0;
-
-		if (last_call != 0 && (get_system_time() - last_call) < 30'000'000)
-			return SCE_NP_MATCHING_ERROR_BUSY;
-
-		last_call = get_system_time();
-	}
-
-	if (!lobby_id || !room_id || !req_id || !attr)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	error_code err = check_attr_id_and_duplicate(attr);
-	if (err != CELL_OK)
-		return err;
-
-	auto res = nph.get_room_info_gui(ctx_id, lobby_id, room_id, attr);
-
-	if (res < 0)
-		return res;
-
-	*req_id = res;
 	return CELL_OK;
 }
 
 error_code sceNpMatchingGetRoomInfo(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr, vm::ptr<u32> req_id)
 {
-	sceNp.warning("sceNpMatchingGetRoomInfo(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, attr=*0x%x, req_id=*0x%x)", ctx_id, lobby_id, room_id, attr, req_id);
+	sceNp.todo("sceNpMatchingGetRoomInfo(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, attr=*0x%x, req_id=*0x%x)", ctx_id, lobby_id, room_id, attr, req_id);
 
-	return matching_get_room_info(ctx_id, lobby_id, room_id, attr, req_id, true);
+	return CELL_OK;
 }
 
 error_code sceNpMatchingGetRoomInfoNoLimit(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr, vm::ptr<u32> req_id)
 {
-	sceNp.warning("sceNpMatchingGetRoomInfoNoLimit(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, attr=*0x%x, req_id=*0x%x)", ctx_id, lobby_id, room_id, attr, req_id);
+	sceNp.todo("sceNpMatchingGetRoomInfoNoLimit(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, attr=*0x%x, req_id=*0x%x)", ctx_id, lobby_id, room_id, attr, req_id);
 
-	return matching_get_room_info(ctx_id, lobby_id, room_id, attr, req_id, false);
+	return CELL_OK;
 }
 
 error_code sceNpMatchingSetRoomSearchFlag(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, s32 flag, vm::ptr<u32> req_id)
 {
-	sceNp.warning("sceNpMatchingSetRoomSearchFlag(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, flag=%d, req_id=*0x%x)", ctx_id, lobby_id, room_id, flag, req_id);
+	sceNp.todo("sceNpMatchingSetRoomSearchFlag(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, flag=%d, req_id=*0x%x)", ctx_id, lobby_id, room_id, flag, req_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!nph.is_NP_init)
-		return SCE_NP_MATCHING_ERROR_NOT_INITIALIZED;
-
-	if (!lobby_id || !room_id || !req_id || (flag < SCE_NP_MATCHING_ROOM_SEARCH_FLAG_OPEN || flag >	SCE_NP_MATCHING_ROOM_SEARCH_FLAG_STEALTH))
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	auto res = nph.set_room_search_flag_gui(ctx_id, lobby_id, room_id, flag);
-
-	if (res < 0)
-		return res;
-
-	*req_id = res;
 	return CELL_OK;
 }
 
 error_code sceNpMatchingGetRoomSearchFlag(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<u32> req_id)
 {
-	sceNp.warning("sceNpMatchingGetRoomSearchFlag(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, req_id=*0x%x)", ctx_id, lobby_id, room_id, req_id);
+	sceNp.todo("sceNpMatchingGetRoomSearchFlag(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, req_id=*0x%x)", ctx_id, lobby_id, room_id, req_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!nph.is_NP_init)
-		return SCE_NP_MATCHING_ERROR_NOT_INITIALIZED;
-
-	if (!lobby_id || !room_id || !req_id)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	auto res = nph.get_room_search_flag_gui(ctx_id, lobby_id, room_id);
-
-	if (res < 0)
-		return res;
-
-	*req_id = res;
 	return CELL_OK;
 }
 
-error_code matching_get_room_member_list(u32 ctx_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<u32> buflen, vm::ptr<void> buf)
+error_code sceNpMatchingGetRoomMemberListLocal(u32 ctx_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<u64> buflen, vm::ptr<void> buf)
 {
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	sceNp.todo("sceNpMatchingGetRoomMemberListLocal(ctx_id=%d, room_id=*0x%x, buflen=*0x%x, buf=*0x%x)", ctx_id, room_id, buflen, buf);
 
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!nph.is_NP_init)
-		return SCE_NP_MATCHING_ERROR_NOT_INITIALIZED;
-
-	if (!buflen)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	return nph.get_room_member_list_local_gui(ctx_id, room_id, buflen, buf);
-}
-
-error_code sceNpMatchingGetRoomMemberListLocal(u32 ctx_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<u32> buflen, vm::ptr<void> buf)
-{
-	sceNp.warning("sceNpMatchingGetRoomMemberListLocal(ctx_id=%d, room_id=*0x%x, buflen=*0x%x, buf=*0x%x)", ctx_id, room_id, buflen, buf);
-
-	return matching_get_room_member_list(ctx_id, room_id, buflen, buf);
-}
-
-// FUN_00014bdc
-error_code check_room_list_params([[maybe_unused]] u32 ctx_id, vm::ptr<SceNpCommunicationId> communicationId, vm::ptr<SceNpMatchingReqRange> range, vm::ptr<SceNpMatchingSearchCondition> cond,
-    vm::ptr<SceNpMatchingAttr> attribute, vm::ptr<SceNpMatchingGUIHandler> handler, int param_7, int param_8)
-{
-	if (!communicationId || !range || !handler)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	if ((!param_8 && !range->start) || range->max > 20)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	u32 total_count = 0;
-	u32 inequality_count = 0;
-	u32 max_count = 10;
-	if (param_7 != 0)
-	{
-		max_count = 9;
-	}
-
-	for (auto con = cond; !!con; con = con->next)
-	{
-		if (++total_count > max_count)
-			return SCE_NP_MATCHING_ERROR_COND_MAX;
-
-		if (con->comp_type != SCE_NP_MATCHING_CONDITION_TYPE_VALUE ||
-			con->comp_op < SCE_NP_MATCHING_CONDITION_SEARCH_EQ ||
-			con->comp_op > SCE_NP_MATCHING_CONDITION_SEARCH_GE)
-			return SCE_NP_MATCHING_ERROR_INVALID_COND;
-
-		if (con->comp_op > SCE_NP_MATCHING_CONDITION_SEARCH_NE &&
-			++inequality_count > max_count)
-			return SCE_NP_MATCHING_ERROR_COMP_OP_INEQUALITY_MAX;
-
-		switch (con->target_attr_type)
-		{
-		case SCE_NP_MATCHING_ATTR_TYPE_BASIC_BIN:
-		case SCE_NP_MATCHING_ATTR_TYPE_GAME_BIN:
-		{
-			return SCE_NP_MATCHING_ERROR_INVALID_COND;
-		}
-		case SCE_NP_MATCHING_ATTR_TYPE_BASIC_NUM:
-		{
-			if (param_7 == 0)
-			{
-				if (con->target_attr_id < SCE_NP_MATCHING_ROOM_ATTR_ID_TOTAL_SLOT ||
-					con->target_attr_id > SCE_NP_MATCHING_ROOM_ATTR_ID_ROOM_SEARCH_FLAG)
-					return SCE_NP_MATCHING_ERROR_INVALID_COND;
-			}
-			else
-			{
-				if (con->target_attr_id == SCE_NP_MATCHING_ROOM_ATTR_ID_TOTAL_SLOT)
-					return SCE_NP_MATCHING_ERROR_INVALID_COND;
-			}
-			break;
-		}
-		case SCE_NP_MATCHING_ATTR_TYPE_GAME_NUM:
-		{
-			const u32 max_id = (param_7 == 0) ? 16 : 8;
-			if (con->target_attr_id < 1 || con->target_attr_id > max_id)
-				return SCE_NP_MATCHING_ERROR_INVALID_COND;
-			break;
-		}
-		default:
-			break;
-		}
-	}
-
-	return check_attr_id_and_duplicate(attribute);
-}
-
-error_code matching_get_room_list(u32 ctx_id, vm::ptr<SceNpCommunicationId> communicationId, vm::ptr<SceNpMatchingReqRange> range, vm::ptr<SceNpMatchingSearchCondition> cond,
-	vm::ptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg, bool limit)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	// TODO: add limiter
-
-	// This check is used in all sceNpMatchingGetRoomList functions
-	error_code err = check_room_list_params(ctx_id, communicationId, range, cond, attr, handler, 1, 0);
-	if (err != CELL_OK)
-		return err;
-
-	return nph.get_room_list_gui(ctx_id, communicationId, range, cond, attr, handler, arg, limit);
+	return CELL_OK;
 }
 
 error_code sceNpMatchingGetRoomListLimitGUI(u32 ctx_id, vm::ptr<SceNpCommunicationId> communicationId, vm::ptr<SceNpMatchingReqRange> range, vm::ptr<SceNpMatchingSearchCondition> cond,
     vm::ptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
 {
-	sceNp.warning("sceNpMatchingGetRoomListLimitGUI(ctx_id=%d, communicationId=*0x%x, range=*0x%x, cond=*0x%x, attr=*0x%x, handler=*0x%x, arg=*0x%x)", ctx_id, communicationId, range, cond, attr, handler, arg);
+	sceNp.todo(
+	    "sceNpMatchingGetRoomListLimitGUI(ctx_id=%d, communicationId=*0x%x, range=*0x%x, cond=*0x%x, attr=*0x%x, handler=*0x%x, arg=*0x%x)", ctx_id, communicationId, range, cond, attr, handler, arg);
 
-	return matching_get_room_list(ctx_id, communicationId, range, cond, attr, handler, arg, true);
+	return CELL_OK;
 }
 
 error_code sceNpMatchingKickRoomMember(u32 ctx_id, vm::cptr<SceNpRoomId> room_id, vm::cptr<SceNpId> user_id, vm::ptr<u32> req_id)
 {
 	sceNp.todo("sceNpMatchingKickRoomMember(ctx_id=%d, room_id=*0x%x, user_id=*0x%x, req_id=*0x%x)", ctx_id, room_id, user_id, req_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!nph.is_NP_init)
-		return SCE_NP_MATCHING_ERROR_NOT_INITIALIZED;
-
-	if (!room_id || !user_id || !req_id)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	if (false) // TODO
-		return SCE_NP_MATCHING_ERROR_BUSY;
-
-	if (false) // TODO
-		return SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
@@ -4835,78 +3138,16 @@ error_code sceNpMatchingKickRoomMemberWithOpt(u32 ctx_id, vm::cptr<SceNpRoomId>
 {
 	sceNp.todo("sceNpMatchingKickRoomMemberWithOpt(ctx_id=%d, room_id=*0x%x, user_id=*0x%x, opt=*0x%x, opt_len=%d, req_id=*0x%x)", ctx_id, room_id, user_id, opt, opt_len, req_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!nph.is_NP_init)
-		return SCE_NP_MATCHING_ERROR_NOT_INITIALIZED;
-
-	if (!room_id || !user_id || !req_id)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	if (opt && (opt_len < 0 || opt_len > 16))
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	if (false) // TODO
-		return SCE_NP_MATCHING_ERROR_BUSY;
-
-	if (false) // TODO
-		return SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
 error_code sceNpMatchingQuickMatchGUI(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpMatchingSearchCondition> cond, s32 available_num, s32 timeout,
     vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
 {
-	sceNp.warning("sceNpMatchingQuickMatchGUI(ctx_id=%d, communicationId=*0x%x, cond=*0x%x, available_num=%d, timeout=%d, handler=*0x%x, arg=*0x%x)", ctx_id, communicationId, cond, available_num, timeout,
+	sceNp.todo("sceNpMatchingQuickMatchGUI(ctx_id=%d, communicationId=*0x%x, cond=*0x%x, available_num=%d, timeout=%d, handler=*0x%x, arg=*0x%x)", ctx_id, communicationId, cond, available_num, timeout,
 	    handler, arg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!communicationId || !handler || available_num < 2 || timeout < 1)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	u32 total_count = 0;
-	constexpr u32 max_count = 9;
-
-	for (auto con = cond; !!con; con = con->next)
-	{
-		if (++total_count > max_count)
-			return SCE_NP_MATCHING_ERROR_COND_MAX;
-
-		if (con->comp_op < SCE_NP_MATCHING_CONDITION_SEARCH_EQ ||
-			con->comp_op > SCE_NP_MATCHING_CONDITION_SEARCH_NE)
-			return SCE_NP_MATCHING_ERROR_INVALID_COMP_OP;
-
-		if (con->comp_type == 1) // weird, should be != SCE_NP_MATCHING_CONDITION_TYPE_VALUE
-			return SCE_NP_MATCHING_ERROR_INVALID_COMP_TYPE;
-
-		switch (con->target_attr_type)
-		{
-		case SCE_NP_MATCHING_ATTR_TYPE_BASIC_BIN:
-		case SCE_NP_MATCHING_ATTR_TYPE_BASIC_NUM:
-		case SCE_NP_MATCHING_ATTR_TYPE_GAME_BIN:
-		{
-			return SCE_NP_MATCHING_ERROR_INVALID_COND;
-		}
-		case SCE_NP_MATCHING_ATTR_TYPE_GAME_NUM:
-		{
-			if (con->target_attr_id < 1 || con->target_attr_id > 8)
-				return SCE_NP_MATCHING_ERROR_INVALID_COND;
-			break;
-		}
-		default:
-			break;
-		}
-	}
-
-	return nph.quickmatch_gui(ctx_id, communicationId, cond, available_num, timeout, handler, arg);
+	return CELL_OK;
 }
 
 error_code sceNpMatchingSendInvitationGUI(u32 ctx_id, vm::cptr<SceNpRoomId> room_id, vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpId> dsts, s32 num, s32 slot_type,
@@ -4915,295 +3156,48 @@ error_code sceNpMatchingSendInvitationGUI(u32 ctx_id, vm::cptr<SceNpRoomId> room
 	sceNp.todo("sceNpMatchingSendInvitationGUI(ctx_id=%d, room_id=*0x%x, communicationId=*0x%x, dsts=*0x%x, num=%d, slot_type=%d, subject=%s, body=%s, container=%d, handler=*0x%x, arg=*0x%x)", ctx_id,
 	    room_id, communicationId, dsts, num, slot_type, subject, body, container, handler, arg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!room_id || !communicationId || !subject || !body) // TODO: || (in_stack_0000007c != 0)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	if (dsts && (num <= 0 || num > SCE_NP_MATCHING_INVITATION_DESTINATION_MAX))
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	error_code err = check_text(subject);
-	if (err < 0)
-		return err;
-
-	if (err > 16)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	err = check_text(body);
-	if (err < 0)
-		return err;
-
-	if (err > 128)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	if (slot_type < SCE_NP_MATCHING_ROOM_SLOT_TYPE_PUBLIC || slot_type > SCE_NP_MATCHING_ROOM_SLOT_TYPE_PRIVATE)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	if (false) // TODO
-		return SCE_NP_MATCHING_ERROR_BUSY;
-
-	// TODO: set callback: handler + arg
-
-	err = CELL_OK; // SendInvitation
-	if (err != CELL_OK && static_cast<u32>(err) != SCE_NP_MATCHING_ERROR_BUSY)
-	{
-		// TODO ?
-	}
-
-	return err;
+	return CELL_OK;
 }
 
 error_code sceNpMatchingAcceptInvitationGUI(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, sys_memory_container_t container, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
 {
 	sceNp.todo("sceNpMatchingAcceptInvitationGUI(ctx_id=%d, communicationId=*0x%x, container=%d, handler=*0x%x, arg=*0x%x)", ctx_id, communicationId, container, handler, arg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!communicationId || !handler)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	if (false) // TODO
-		return SCE_NP_MATCHING_ERROR_BUSY;
-
-	// TODO: set callback: handler + arg
-
-	error_code err = CELL_OK; // AcceptInvitation
-	if (err != CELL_OK && static_cast<u32>(err) != SCE_NP_MATCHING_ERROR_BUSY)
-	{
-		// TODO ?
-	}
-
-	return err;
-}
-
-// FUN_00014d90
-error_code check_attr_create_room(vm::cptr<SceNpMatchingAttr> attribute)
-{
-	for (auto attr = attribute; !!attr; attr = attr->next)
-	{
-		error_code err = check_attr_id(attr);
-		if (err != CELL_OK)
-			return err;
-
-		if (attr->type == SCE_NP_MATCHING_ATTR_TYPE_BASIC_NUM)
-		{
-			if (attr->id >= SCE_NP_MATCHING_ROOM_ATTR_ID_CUR_TOTAL_NUM &&
-				attr->id <= SCE_NP_MATCHING_ROOM_ATTR_ID_CUR_PRIVATE_NUM)
-				return SCE_NP_MATCHING_ERROR_INVALID_ATTR_ID;
-
-			if (attr->value.num > 1 &&
-				(attr->id == SCE_NP_MATCHING_ROOM_ATTR_ID_PRIVILEGE_TYPE ||
-				 attr->id == SCE_NP_MATCHING_ROOM_ATTR_ID_ROOM_SEARCH_FLAG))
-				return SCE_NP_MATCHING_ERROR_INVALID_ATTR_VALUE;
-		}
-		else if (attr->type == SCE_NP_MATCHING_ATTR_TYPE_GAME_BIN)
-		{
-			const u32 max_size = attr->id < 3 ? 256 : 64;
-			if (attr->value.data.size > max_size)
-				return SCE_NP_MATCHING_ERROR_INVALID_ATTR;
-		}
-	}
-
-	error_code err = check_duplicate_attr(attribute);
-	if (err != CELL_OK)
-		return err;
-
-	bool found_total_slots = false;
-	bool found_private_slots = false;
-	u32 total_slots = 0;
-	u32 private_slots = 0;
-
-	for (auto attr = attribute; !!attr; attr = attr->next)
-	{
-		if (attr->type == SCE_NP_MATCHING_ATTR_TYPE_BASIC_NUM)
-		{
-			if (attr->id == SCE_NP_MATCHING_ROOM_ATTR_ID_TOTAL_SLOT)
-			{
-				total_slots = attr->value.num;
-				found_total_slots = true;
-			}
-			else if (attr->id == SCE_NP_MATCHING_ROOM_ATTR_ID_PRIVATE_SLOT)
-			{
-				private_slots = attr->value.num;
-				found_private_slots = true;
-			}
-
-			if (found_total_slots && found_private_slots)
-			{
-				if ((total_slots > 0 && total_slots <= 16) &&
-					static_cast<s32>(private_slots) >= 0 &&
-					static_cast<s32>(total_slots - private_slots) > 0)
-				{
-					return CELL_OK;
-				}
-
-				return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-			}
-		}
-	}
-
-	return SCE_NP_MATCHING_ERROR_ATTR_NOT_SPECIFIED;
-}
-
-error_code matching_create_room(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-	{
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-	}
-
-	if (!communicationId || !handler)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	// This check is used in all sceNpMatchingCreateRoom functions
-	error_code err = check_attr_create_room(attr);
-	if (err != CELL_OK)
-		return err;
-
-	return nph.create_room_gui(ctx_id, communicationId, attr, handler, arg);
+	return CELL_OK;
 }
 
 error_code sceNpMatchingCreateRoomGUI(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
 {
-	sceNp.warning("sceNpMatchingCreateRoomGUI(ctx_id=%d, communicationId=*0x%x, attr=*0x%x, handler=*0x%x, arg=*0x%x)", ctx_id, communicationId, attr, handler, arg);
+	sceNp.todo("sceNpMatchingCreateRoomGUI(ctx_id=%d, communicationId=*0x%x, attr=*0x%x, handler=*0x%x, arg=*0x%x)", ctx_id, communicationId, attr, handler, arg);
 
-	return matching_create_room(ctx_id, communicationId, attr, handler, arg);
-}
-
-error_code matching_join_room(u32 ctx_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!room_id || !handler)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	return nph.join_room_gui(ctx_id, room_id, handler, arg);
+	return CELL_OK;
 }
 
 error_code sceNpMatchingJoinRoomGUI(u32 ctx_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
 {
-	sceNp.warning("sceNpMatchingJoinRoomGUI(ctx_id=%d, room_id=*0x%x, handler=*0x%x, arg=*0x%x)", ctx_id, room_id, handler, arg);
+	sceNp.todo("sceNpMatchingJoinRoomGUI(ctx_id=%d, room_id=*0x%x, handler=*0x%x, arg=*0x%x)", ctx_id, room_id, handler, arg);
 
-	return matching_join_room(ctx_id, room_id, handler, arg);
+	return CELL_OK;
 }
 
 error_code sceNpMatchingLeaveRoom(u32 ctx_id, vm::cptr<SceNpRoomId> room_id, vm::ptr<u32> req_id)
 {
-	sceNp.warning("sceNpMatchingLeaveRoom(ctx_id=%d, room_id=*0x%x, req_id=*0x%x)", ctx_id, room_id, req_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!nph.is_NP_init)
-		return SCE_NP_MATCHING_ERROR_NOT_INITIALIZED;
-
-	auto res = nph.leave_room_gui(ctx_id, room_id);
-
-	if (res < 0)
-		return res;
-
-	*req_id = res;
-
+	sceNp.todo("sceNpMatchingLeaveRoom(ctx_id=%d, room_id=*0x%x, req_id=*0x%x)", ctx_id, room_id, req_id);
 	return CELL_OK;
 }
 
 error_code sceNpMatchingSearchJoinRoomGUI(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpMatchingSearchCondition> cond, vm::cptr<SceNpMatchingAttr> attr,
     vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
 {
-	sceNp.warning("sceNpMatchingSearchJoinRoomGUI(ctx_id=%d, communicationId=*0x%x, cond=*0x%x, attr=*0x%x, handler=*0x%x, arg=*0x%x)", ctx_id, communicationId, cond, attr, handler, arg);
+	sceNp.todo("sceNpMatchingSearchJoinRoomGUI(ctx_id=%d, communicationId=*0x%x, cond=*0x%x, attr=*0x%x, handler=*0x%x, arg=*0x%x)", ctx_id, communicationId, cond, attr, handler, arg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!communicationId || !handler)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	u32 total_count = 0;
-	u32 inequality_count = 0;
-	constexpr u32 max_count = 9;
-
-	for (auto con = cond; !!con; con = con->next)
-	{
-		if (++total_count > max_count)
-			return SCE_NP_MATCHING_ERROR_COND_MAX;
-
-		if (con->comp_type != SCE_NP_MATCHING_CONDITION_TYPE_VALUE ||
-			con->comp_op < SCE_NP_MATCHING_CONDITION_SEARCH_EQ ||
-			con->comp_op > SCE_NP_MATCHING_CONDITION_SEARCH_GE)
-			return SCE_NP_MATCHING_ERROR_INVALID_COND;
-
-		if (con->comp_op > SCE_NP_MATCHING_CONDITION_SEARCH_NE &&
-			++inequality_count > max_count)
-			return SCE_NP_MATCHING_ERROR_COMP_OP_INEQUALITY_MAX;
-
-		switch (con->target_attr_type)
-		{
-		case SCE_NP_MATCHING_ATTR_TYPE_BASIC_BIN:
-		case SCE_NP_MATCHING_ATTR_TYPE_GAME_BIN:
-		{
-			return SCE_NP_MATCHING_ERROR_INVALID_COND;
-		}
-		case SCE_NP_MATCHING_ATTR_TYPE_BASIC_NUM:
-		{
-			if (con->target_attr_id != SCE_NP_MATCHING_ROOM_ATTR_ID_TOTAL_SLOT)
-				return SCE_NP_MATCHING_ERROR_INVALID_COND;
-			break;
-		}
-		case SCE_NP_MATCHING_ATTR_TYPE_GAME_NUM:
-		{
-			if (con->target_attr_id < 1 || con->target_attr_id > 8)
-				return SCE_NP_MATCHING_ERROR_INVALID_COND;
-			break;
-		}
-		default:
-			break;
-		}
-	}
-
-	error_code err = check_attr_id_and_duplicate(attr);
-	if (err != CELL_OK)
-		return err;
-
-	return nph.searchjoin_gui(ctx_id, communicationId, cond, attr, handler, arg);
+	return CELL_OK;
 }
 
 error_code sceNpMatchingGrantOwnership(u32 ctx_id, vm::cptr<SceNpRoomId> room_id, vm::cptr<SceNpId> user_id, vm::ptr<u32> req_id)
 {
 	sceNp.todo("sceNpMatchingGrantOwnership(ctx_id=%d, room_id=*0x%x, user_id=*0x%x, req_id=*0x%x)", ctx_id, room_id, user_id, req_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP2_Match2_init)
-		return SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE;
-
-	if (!nph.is_NP_init)
-		return SCE_NP_MATCHING_ERROR_NOT_INITIALIZED;
-
-	if (!room_id || !user_id || !req_id)
-		return SCE_NP_MATCHING_ERROR_INVALID_ARG;
-
-	if (false) // TODO
-		return SCE_NP_MATCHING_ERROR_BUSY;
-
-	if (false) // TODO
-		return SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
@@ -5211,25 +3205,18 @@ error_code sceNpProfileCallGui(vm::cptr<SceNpId> npid, vm::ptr<SceNpProfileResul
 {
 	sceNp.todo("sceNpProfileCallGui(npid=*0x%x, handler=*0x%x, userArg=*0x%x, options=0x%x)", npid, handler, userArg, options);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
-		return SCE_NP_PROFILE_ERROR_NOT_INITIALIZED;
+		return SCE_NP_ERROR_NOT_INITIALIZED;
 	}
 
-	// TODO: SCE_NP_PROFILE_ERROR_BUSY
-
 	if (!handler)
 	{
 		return SCE_NP_PROFILE_ERROR_INVALID_ARGUMENT;
 	}
 
-	vm::var<SceNpId> id;
-	error_code err = sceNpManagerGetNpId(id);
-	if (err != CELL_OK)
-		return err;
-
 	return CELL_OK;
 }
 
@@ -5237,11 +3224,11 @@ error_code sceNpProfileAbortGui()
 {
 	sceNp.todo("sceNpProfileAbortGui()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
-		return SCE_NP_FRIENDLIST_ERROR_NOT_INITIALIZED; // Not SCE_NP_PROFILE_ERROR_NOT_INITIALIZED !
+		return SCE_NP_ERROR_NOT_INITIALIZED;
 	}
 
 	return CELL_OK;
@@ -5251,7 +3238,7 @@ error_code sceNpScoreInit()
 {
 	sceNp.warning("sceNpScoreInit()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (nph.is_NP_Score_init)
 	{
@@ -5272,7 +3259,7 @@ error_code sceNpScoreTerm()
 {
 	sceNp.warning("sceNpScoreTerm()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -5291,9 +3278,9 @@ error_code sceNpScoreTerm()
 
 error_code sceNpScoreCreateTitleCtx(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase, vm::cptr<SceNpId> selfNpId)
 {
-	sceNp.warning("sceNpScoreCreateTitleCtx(communicationId=*0x%x(%s), passphrase=*0x%x, selfNpId=*0x%x)", communicationId, communicationId ? np::communication_id_to_string(*communicationId).c_str() : "", passphrase, selfNpId);
+	sceNp.todo("sceNpScoreCreateTitleCtx(communicationId=*0x%x, passphrase=*0x%x, selfNpId=*0x%x)", communicationId, passphrase, selfNpId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -5305,21 +3292,14 @@ error_code sceNpScoreCreateTitleCtx(vm::cptr<SceNpCommunicationId> communication
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	s32 id = create_score_context(communicationId, passphrase);
-
-	if (id > 0)
-	{
-		return not_an_error(id);
-	}
-
-	return id;
+	return not_an_error(create_score_context(communicationId, passphrase));
 }
 
 error_code sceNpScoreDestroyTitleCtx(s32 titleCtxId)
 {
-	sceNp.warning("sceNpScoreDestroyTitleCtx(titleCtxId=%d)", titleCtxId);
+	sceNp.todo("sceNpScoreDestroyTitleCtx(titleCtxId=%d)", titleCtxId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -5334,9 +3314,9 @@ error_code sceNpScoreDestroyTitleCtx(s32 titleCtxId)
 
 error_code sceNpScoreCreateTransactionCtx(s32 titleCtxId)
 {
-	sceNp.warning("sceNpScoreCreateTransactionCtx(titleCtxId=%d)", titleCtxId);
+	sceNp.todo("sceNpScoreCreateTransactionCtx(titleCtxId=%d)", titleCtxId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -5348,101 +3328,56 @@ error_code sceNpScoreCreateTransactionCtx(s32 titleCtxId)
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
 	}
 
-	auto score = idm::get_unlocked<score_ctx>(titleCtxId);
-
-	if (!score)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
-	}
-
-	s32 id = create_score_transaction_context(score);
-
-	if (id > 0)
-	{
-		return not_an_error(id);
-	}
-
-	return id;
+	return not_an_error(create_score_transaction_context(titleCtxId));
 }
 
 error_code sceNpScoreDestroyTransactionCtx(s32 transId)
 {
-	sceNp.warning("sceNpScoreDestroyTransactionCtx(transId=%d)", transId);
+	sceNp.todo("sceNpScoreDestroyTransactionCtx(transId=%d)", transId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!destroy_score_transaction_context(transId))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
-	}
-
 	return CELL_OK;
 }
 
 error_code sceNpScoreSetTimeout(s32 ctxId, usecond_t timeout)
 {
-	sceNp.warning("sceNpScoreSetTimeout(ctxId=%d, timeout=%d)", ctxId, timeout);
+	sceNp.todo("sceNpScoreSetTimeout(ctxId=%d, timeout=%d)", ctxId, timeout);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (timeout < 10'000'000) // 10 seconds
+	if (timeout > 10000000) // 10 seconds
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (auto trans = idm::get_unlocked<score_transaction_ctx>(ctxId))
-	{
-		trans->timeout = timeout;
-	}
-	else if (auto score = idm::get_unlocked<score_ctx>(ctxId))
-	{
-		score->timeout = timeout;
-	}
-	else
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
-	}
-
 	return CELL_OK;
 }
 
 error_code sceNpScoreSetPlayerCharacterId(s32 ctxId, SceNpScorePcId pcId)
 {
-	sceNp.warning("sceNpScoreSetPlayerCharacterId(ctxId=%d, pcId=%d)", ctxId, pcId);
+	sceNp.todo("sceNpScoreSetPlayerCharacterId(ctxId=%d, pcId=%d)", ctxId, pcId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (pcId < 0)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (auto trans = idm::get_unlocked<score_transaction_ctx>(ctxId))
+	if (pcId < 0)
 	{
-		trans->pcId = pcId;
-	}
-	else if (auto score = idm::get_unlocked<score_ctx>(ctxId))
-	{
-		score->pcId = pcId;
-	}
-	else
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
 	return CELL_OK;
@@ -5450,85 +3385,47 @@ error_code sceNpScoreSetPlayerCharacterId(s32 ctxId, SceNpScorePcId pcId)
 
 error_code sceNpScoreWaitAsync(s32 transId, vm::ptr<s32> result)
 {
-	sceNp.warning("sceNpScoreWaitAsync(transId=%d, result=*0x%x)", transId, result);
+	sceNp.todo("sceNpScoreWaitAsync(transId=%d, result=*0x%x)", transId, result);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	auto trans = idm::get_unlocked<score_transaction_ctx>(transId);
-	if (!trans)
+	if (transId <= 0)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
 
-	*result = trans->wait_for_completion();
-
 	return CELL_OK;
 }
 
 error_code sceNpScorePollAsync(s32 transId, vm::ptr<s32> result)
 {
-	sceNp.warning("sceNpScorePollAsync(transId=%d, result=*0x%x)", transId, result);
+	sceNp.todo("sceNpScorePollAsync(transId=%d, result=*0x%x)", transId, result);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	auto trans = idm::get_unlocked<score_transaction_ctx>(transId);
-	if (!trans)
+	if (transId <= 0)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
 
-	auto res = trans->get_transaction_status();
-
-	if (!res)
-	{
-		return not_an_error(1);
-	}
-
-	*result = *res;
 	return CELL_OK;
 }
 
-std::pair<std::optional<error_code>, shared_ptr<score_transaction_ctx>> get_score_transaction_context(s32 transId, bool reset_transaction = true)
+error_code sceNpScoreGetBoardInfo(s32 transId, SceNpScoreBoardId boardId, vm::ptr<SceNpScoreBoardInfo> boardInfo, vm::ptr<void> option)
 {
-	auto trans_ctx = idm::get_unlocked<score_transaction_ctx>(transId);
+	sceNp.todo("sceNpScoreGetBoardInfo(transId=%d, boardId=%d, boardInfo=*0x%x, option=*0x%x)", transId, boardId, boardInfo, option);
 
-	if (!trans_ctx)
-	{
-		return {SCE_NP_COMMUNITY_ERROR_INVALID_ID, {}};
-	}
-
-	if (reset_transaction)
-	{
-		// Check for games reusing score transaction context
-		// Unsure about the actual behaviour, only one game does this afaik(Marvel vs Capcom Origins)
-		// For now we just clean the context and pretend it's a new one
-		std::lock_guard lock(trans_ctx->mutex);
-		if (trans_ctx->result)
-		{
-			if (trans_ctx->thread.joinable())
-				trans_ctx->thread.join();
-			
-			trans_ctx->result = {};
-			trans_ctx->tdata = {};
-		}
-	}
-
-	return {{}, trans_ctx};
-}
-
-error_code scenp_score_get_board_info(s32 transId, SceNpScoreBoardId boardId, vm::ptr<SceNpScoreBoardInfo> boardInfo, vm::ptr<void> option, bool async)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -5550,110 +3447,80 @@ error_code scenp_score_get_board_info(s32 transId, SceNpScoreBoardId boardId, vm
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
 	}
 
-	auto [res, trans_ctx] = get_score_transaction_context(transId);
-	if (res)
-		return *res;
-
-	nph.get_board_infos(trans_ctx, boardId, boardInfo, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
-}
-
-error_code sceNpScoreGetBoardInfo(s32 transId, SceNpScoreBoardId boardId, vm::ptr<SceNpScoreBoardInfo> boardInfo, vm::ptr<void> option)
-{
-	sceNp.warning("sceNpScoreGetBoardInfo(transId=%d, boardId=%d, boardInfo=*0x%x, option=*0x%x)", transId, boardId, boardInfo, option);
-
-	return scenp_score_get_board_info(transId, boardId, boardInfo, option, false);
+	return CELL_OK;
 }
 
 error_code sceNpScoreGetBoardInfoAsync(s32 transId, SceNpScoreBoardId boardId, vm::ptr<SceNpScoreBoardInfo> boardInfo, s32 prio, vm::ptr<void> option)
 {
-	sceNp.warning("sceNpScoreGetBoardInfo(transId=%d, boardId=%d, boardInfo=*0x%x, prio=%d, option=*0x%x)", transId, boardId, boardInfo, prio, option);
+	sceNp.todo("sceNpScoreGetBoardInfo(transId=%d, boardId=%d, boardInfo=*0x%x, prio=%d, option=*0x%x)", transId, boardId, boardInfo, prio, option);
 
-	return scenp_score_get_board_info(transId, boardId, boardInfo, option, true);
-}
-
-error_code scenp_score_record_score(s32 transId, SceNpScoreBoardId boardId, SceNpScoreValue score, vm::cptr<SceNpScoreComment> scoreComment, vm::cptr<SceNpScoreGameInfo> gameInfo,
-    vm::ptr<SceNpScoreRankNumber> tmpRank, vm::ptr<SceNpScoreRecordOptParam> option, bool async)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
+	if (option) // option check at least until fw 4.71
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpScoreRecordScore(s32 transId, SceNpScoreBoardId boardId, SceNpScoreValue score, vm::cptr<SceNpScoreComment> scoreComment, vm::cptr<SceNpScoreGameInfo> gameInfo,
+    vm::ptr<SceNpScoreRankNumber> tmpRank, vm::ptr<SceNpScoreRecordOptParam> option)
+{
+	sceNp.todo(
+	    "sceNpScoreRecordScore(transId=%d, boardId=%d, score=%d, scoreComment=*0x%x, gameInfo=*0x%x, tmpRank=*0x%x, option=*0x%x)", transId, boardId, score, scoreComment, gameInfo, tmpRank, option);
+
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph.is_NP_Score_init)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (option) // option check at least until fw 4.71
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
 	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
 	}
 
-	auto [res, trans_ctx] = get_score_transaction_context(transId);
-	if (res)
-		return *res;
-
-	const u8* data = nullptr;
-	u32 data_size = 0;
-
-	if (!gameInfo)
-	{
-		if (option && option->vsInfo)
-		{
-			if (option->size != 0xCu)
-			{
-				return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-			}
-
-			if (option->reserved)
-			{
-				return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-			}
-
-			data = &option->vsInfo->data[0];
-			data_size = option->vsInfo->infoSize;
-		}
-	}
-	else
-	{
-		data = &gameInfo->nativeData[0];
-		data_size = 64;
-	}
-
-	nph.record_score(trans_ctx, boardId, score, scoreComment, data, data_size, tmpRank, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
-}
-
-error_code sceNpScoreRecordScore(s32 transId, SceNpScoreBoardId boardId, SceNpScoreValue score, vm::cptr<SceNpScoreComment> scoreComment, vm::cptr<SceNpScoreGameInfo> gameInfo,
-    vm::ptr<SceNpScoreRankNumber> tmpRank, vm::ptr<SceNpScoreRecordOptParam> option)
-{
-	sceNp.warning("sceNpScoreRecordScore(transId=%d, boardId=%d, score=%d, scoreComment=*0x%x, gameInfo=*0x%x, tmpRank=*0x%x, option=*0x%x)", transId, boardId, score, scoreComment, gameInfo, tmpRank, option);
-
-	return scenp_score_record_score(transId, boardId, score, scoreComment, gameInfo, tmpRank, option, false);
+	return CELL_OK;
 }
 
 error_code sceNpScoreRecordScoreAsync(s32 transId, SceNpScoreBoardId boardId, SceNpScoreValue score, vm::cptr<SceNpScoreComment> scoreComment, vm::cptr<SceNpScoreGameInfo> gameInfo,
     vm::ptr<SceNpScoreRankNumber> tmpRank, s32 prio, vm::ptr<SceNpScoreRecordOptParam> option)
 {
-	sceNp.warning("sceNpScoreRecordScoreAsync(transId=%d, boardId=%d, score=%d, scoreComment=*0x%x, gameInfo=*0x%x, tmpRank=*0x%x, prio=%d, option=*0x%x)", transId, boardId, score, scoreComment, gameInfo,
+	sceNp.todo("sceNpScoreRecordScoreAsync(transId=%d, boardId=%d, score=%d, scoreComment=*0x%x, gameInfo=*0x%x, tmpRank=*0x%x, prio=%d, option=*0x%x)", transId, boardId, score, scoreComment, gameInfo,
 	    tmpRank, prio, option);
 
-	return scenp_score_record_score(transId, boardId, score, scoreComment, gameInfo, tmpRank, option, true);
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph.is_NP_Score_init)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (option) // option check at least until fw 4.71
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
 }
 
-error_code scenp_score_record_game_data(s32 transId, SceNpScoreBoardId boardId, SceNpScoreValue score, u32 totalSize, u32 sendSize, vm::cptr<void> data, vm::ptr<void> /* option */, bool async)
+error_code sceNpScoreRecordGameData(s32 transId, SceNpScoreBoardId boardId, SceNpScoreValue score, u64 totalSize, u64 sendSize, vm::cptr<void> data, vm::ptr<void> option)
 {
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	sceNp.todo("sceNpScoreRecordGameData(transId=%d, boardId=%d, score=%d, totalSize=%d, sendSize=%d, data=*0x%x, option=*0x%x)", transId, boardId, score, totalSize, sendSize, data, option);
+
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -5665,13 +3532,9 @@ error_code scenp_score_record_game_data(s32 transId, SceNpScoreBoardId boardId,
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	auto [res, trans_ctx] = get_score_transaction_context(transId, false);
-	if (res)
-		return *res;
-
-	if (!nph.is_NP_init)
+	if (option) // option check at least until fw 4.71
 	{
-		return SCE_NP_ERROR_NOT_INITIALIZED;
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
 	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
@@ -5679,96 +3542,99 @@ error_code scenp_score_record_game_data(s32 transId, SceNpScoreBoardId boardId,
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
 	}
 
-	nph.record_score_data(trans_ctx, boardId, score, totalSize, sendSize, static_cast<const u8*>(data.get_ptr()), async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
+	return CELL_OK;
 }
 
-error_code sceNpScoreRecordGameData(s32 transId, SceNpScoreBoardId boardId, SceNpScoreValue score, u32 totalSize, u32 sendSize, vm::cptr<void> data, vm::ptr<void> option)
+error_code sceNpScoreRecordGameDataAsync(s32 transId, SceNpScoreBoardId boardId, SceNpScoreValue score, u64 totalSize, u64 sendSize, vm::cptr<void> data, s32 prio, vm::ptr<void> option)
 {
-	sceNp.warning("sceNpScoreRecordGameData(transId=%d, boardId=%d, score=%d, totalSize=%d, sendSize=%d, data=*0x%x, option=*0x%x)", transId, boardId, score, totalSize, sendSize, data, option);
+	sceNp.todo(
+	    "sceNpScoreRecordGameDataAsync(transId=%d, boardId=%d, score=%d, totalSize=%d, sendSize=%d, data=*0x%x, prio=%d, option=*0x%x)", transId, boardId, score, totalSize, sendSize, data, prio, option);
 
-	return scenp_score_record_game_data(transId, boardId, score, totalSize, sendSize, data, option, false);
-}
-
-error_code sceNpScoreRecordGameDataAsync(s32 transId, SceNpScoreBoardId boardId, SceNpScoreValue score, u32 totalSize, u32 sendSize, vm::cptr<void> data, s32 prio, vm::ptr<void> option)
-{
-	sceNp.warning("sceNpScoreRecordGameDataAsync(transId=%d, boardId=%d, score=%d, totalSize=%d, sendSize=%d, data=*0x%x, prio=%d, option=*0x%x)", transId, boardId, score, totalSize, sendSize, data, prio, option);
-
-	return scenp_score_record_game_data(transId, boardId, score, totalSize, sendSize, data, option, true);
-}
-
-error_code scenp_score_get_game_data(s32 transId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> npId, vm::ptr<u32> totalSize, u32 recvSize, vm::ptr<void> data, vm::ptr<void> /* option */, bool async)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!npId || !data)
+	if (option) // option check at least until fw 4.71
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpScoreGetGameData(s32 transId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> npId, vm::ptr<u64> totalSize, u64 recvSize, vm::ptr<void> data, vm::ptr<void> option)
+{
+	sceNp.todo("sceNpScoreGetGameDataAsync(transId=%d, boardId=%d, npId=*0x%x, totalSize=*0x%x, recvSize=%d, data=*0x%x, option=*0x%x)", transId, boardId, npId, totalSize, recvSize, data, option);
+
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph.is_NP_Score_init)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!npId || !totalSize || !data)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	auto [res, trans_ctx] = get_score_transaction_context(transId, false);
-	if (res)
-		return *res;
+	if (option) // option check at least until fw 4.71
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
 
 	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
 	}
 
-	nph.get_score_data(trans_ctx, boardId, *npId, totalSize, recvSize, data, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
+	return CELL_OK;
 }
 
-error_code sceNpScoreGetGameData(s32 transId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> npId, vm::ptr<u32> totalSize, u32 recvSize, vm::ptr<void> data, vm::ptr<void> option)
+error_code sceNpScoreGetGameDataAsync(s32 transId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> npId, vm::ptr<u64> totalSize, u64 recvSize, vm::ptr<void> data, s32 prio, vm::ptr<void> option)
 {
-	sceNp.warning("sceNpScoreGetGameData(transId=%d, boardId=%d, npId=*0x%x, totalSize=*0x%x, recvSize=%d, data=*0x%x, option=*0x%x)", transId, boardId, npId, totalSize, recvSize, data, option);
+	sceNp.todo("sceNpScoreGetGameDataAsync(transId=%d, boardId=%d, npId=*0x%x, totalSize=*0x%x, recvSize=%d, data=*0x%x, prio=%d, option=*0x%x)", transId, boardId, npId, totalSize, recvSize, data, prio,
+	    option);
 
-	return scenp_score_get_game_data(transId, boardId, npId, totalSize, recvSize, data, option, false);
-}
-
-error_code sceNpScoreGetGameDataAsync(s32 transId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> npId, vm::ptr<u32> totalSize, u32 recvSize, vm::ptr<void> data, s32 prio, vm::ptr<void> option)
-{
-	sceNp.warning("sceNpScoreGetGameDataAsync(transId=%d, boardId=%d, npId=*0x%x, totalSize=*0x%x, recvSize=%d, data=*0x%x, prio=%d, option=*0x%x)", transId, boardId, npId, totalSize, recvSize, data, prio,
-		option);
-
-	return scenp_score_get_game_data(transId, boardId, npId, totalSize, recvSize, data, option, true);
-}
-
-template <typename T>
-error_code scenp_score_get_ranking_by_npid(s32 transId, SceNpScoreBoardId boardId, T npIdArray, u32 npIdArraySize, vm::ptr<SceNpScorePlayerRankData> rankArray, u32 rankArraySize,
-	vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
-	vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> /* option */, bool async)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!npIdArray)
+	if (option) // option check at least until fw 4.71
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpScoreGetRankingByNpId(s32 transId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> npIdArray, u64 npIdArraySize, vm::ptr<SceNpScorePlayerRankData> rankArray, u64 rankArraySize,
+    vm::ptr<SceNpScoreComment> commentArray, u64 commentArraySize, vm::ptr<void> infoArray, u64 infoArraySize, u64 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
+    vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
+{
+	sceNp.todo("sceNpScoreGetRankingByNpId(transId=%d, boardId=%d, npIdArray=*0x%x, npIdArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, "
+	           "infoArraySize=%d, arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
+	    transId, boardId, npIdArray, npIdArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, option);
+
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph.is_NP_Score_init)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!npIdArray || !rankArray || !totalRecord || !lastSortDate || !arrayNum)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	if (!arrayNum)
+	if (option) // option check at least until fw 4.71
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
@@ -5778,218 +3644,123 @@ error_code scenp_score_get_ranking_by_npid(s32 transId, SceNpScoreBoardId boardI
 		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
 	}
 
-	auto [res, trans_ctx] = get_score_transaction_context(transId);
-	if (res)
-		return *res;
-
 	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
 	}
 
-	if (commentArray && commentArraySize != (arrayNum * sizeof(SceNpScoreComment)))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	if (infoArray && infoArraySize != (arrayNum * sizeof(SceNpScoreGameInfo)) && infoArraySize != (arrayNum * sizeof(SceNpScoreVariableSizeGameInfo)))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	// SceNpScorePlayerRankData changed with 180.002
-	const bool deprecated = (rankArraySize == (arrayNum * sizeof(SceNpScorePlayerRankData_deprecated)));
-
-	if (rankArraySize != (arrayNum * sizeof(SceNpScorePlayerRankData)) && !deprecated)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	std::vector<std::pair<SceNpId, s32>> npid_vec;
-
-	static constexpr bool is_npid     = std::is_same_v<T, vm::cptr<SceNpId>>;
-	static constexpr bool is_npidpcid = std::is_same_v<T, vm::cptr<SceNpScoreNpIdPcId>>;
-	static_assert(is_npid || is_npidpcid, "T should be vm::cptr<SceNpId> or vm::cptr<SceNpScoreNpIdPcId>");
-
-	if constexpr (is_npid)
-	{
-		if (npIdArraySize != (arrayNum * sizeof(SceNpId)))
-		{
-			return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-		}
-
-		for (u32 index = 0; index < arrayNum; index++)
-		{
-			npid_vec.push_back(std::make_pair(npIdArray[index], 0));
-		}
-	}
-	else if constexpr (is_npidpcid)
-	{
-		if (npIdArraySize != (arrayNum * sizeof(SceNpScoreNpIdPcId)))
-		{
-			return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-		}
-
-		for (u32 index = 0; index < arrayNum; index++)
-		{
-			npid_vec.push_back(std::make_pair(npIdArray[index].npId, npIdArray[index].pcId));
-		}
-	}
-
-	nph.get_score_npid(trans_ctx, boardId, npid_vec, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, async, deprecated);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
+	return CELL_OK;
 }
 
-error_code sceNpScoreGetRankingByNpId(s32 transId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> npIdArray, u32 npIdArraySize, vm::ptr<SceNpScorePlayerRankData> rankArray, u32 rankArraySize,
-    vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
-    vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
-{
-	sceNp.warning("sceNpScoreGetRankingByNpId(transId=%d, boardId=%d, npIdArray=*0x%x, npIdArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, "
-	           "infoArraySize=%d, arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
-	    transId, boardId, npIdArray, npIdArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, option);
-
-	return scenp_score_get_ranking_by_npid(transId, boardId, npIdArray, npIdArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray,
-		infoArraySize, arrayNum, lastSortDate, totalRecord, option, false);
-}
-
-error_code sceNpScoreGetRankingByNpIdAsync(s32 transId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> npIdArray, u32 npIdArraySize, vm::ptr<SceNpScorePlayerRankData> rankArray, u32 rankArraySize,
-    vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
+error_code sceNpScoreGetRankingByNpIdAsync(s32 transId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> npIdArray, u64 npIdArraySize, vm::ptr<SceNpScorePlayerRankData> rankArray, u64 rankArraySize,
+    vm::ptr<SceNpScoreComment> commentArray, u64 commentArraySize, vm::ptr<void> infoArray, u64 infoArraySize, u64 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
     vm::ptr<SceNpScoreRankNumber> totalRecord, s32 prio, vm::ptr<void> option)
 {
-	sceNp.warning("sceNpScoreGetRankingByNpIdAsync(transId=%d, boardId=%d, npIdArray=*0x%x, npIdArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, "
+	sceNp.todo("sceNpScoreGetRankingByNpIdAsync(transId=%d, boardId=%d, npIdArray=*0x%x, npIdArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, "
 	           "infoArraySize=%d, arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, prio=%d, option=*0x%x)",
 	    transId, boardId, npIdArray, npIdArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, prio, option);
 
-	return scenp_score_get_ranking_by_npid(transId, boardId, npIdArray, npIdArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray,
-		infoArraySize, arrayNum, lastSortDate, totalRecord, option, true);
-}
-
-error_code scenp_score_get_ranking_by_range(s32 transId, SceNpScoreBoardId boardId, SceNpScoreRankNumber startSerialRank, vm::ptr<SceNpScoreRankData> rankArray, u32 rankArraySize,
-    vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
-    vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option, bool async)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	auto [res, trans_ctx] = get_score_transaction_context(transId);
-	if (res)
-		return *res;
-
-	if (option)
+	if (!npIdArray || !arrayNum)
 	{
-		vm::ptr<u32> opt_ptr = vm::static_ptr_cast<u32>(option);
-		if (opt_ptr[0] != 0xCu)
-		{
-			return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-		}
-
-		if (opt_ptr[1])
-		{
-			vm::ptr<u32> ssr_ptr = vm::cast(opt_ptr[1]);
-			startSerialRank = *ssr_ptr;
-		}
-
-		// It also uses opt_ptr[2] for unknown purposes
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	if (!startSerialRank)
+	if (option) // option check at least until fw 4.71
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (!rankArray || !totalRecord || !lastSortDate)
+	return CELL_OK;
+}
+
+error_code sceNpScoreGetRankingByRange(s32 transId, SceNpScoreBoardId boardId, SceNpScoreRankNumber startSerialRank, vm::ptr<SceNpScoreRankData> rankArray, u64 rankArraySize,
+    vm::ptr<SceNpScoreComment> commentArray, u64 commentArraySize, vm::ptr<void> infoArray, u64 infoArraySize, u64 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
+    vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
+{
+	sceNp.todo("sceNpScoreGetRankingByRange(transId=%d, boardId=%d, startSerialRank=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, infoArraySize=%d, "
+	           "arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
+	    transId, boardId, startSerialRank, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, option);
+
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph.is_NP_Score_init)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!rankArray || !totalRecord || !lastSortDate || !arrayNum)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
+	if (!startSerialRank || option) // option check at least until fw 4.71
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
 	if (arrayNum > SCE_NP_SCORE_MAX_RANGE_NUM_PER_TRANS)
 	{
 		return SCE_NP_COMMUNITY_ERROR_TOO_LARGE_RANGE;
 	}
 
-	if (commentArray && commentArraySize != (arrayNum * sizeof(SceNpScoreComment)))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	if (infoArray && infoArraySize != (arrayNum * sizeof(SceNpScoreGameInfo)) && infoArraySize != (arrayNum * sizeof(SceNpScoreVariableSizeGameInfo)))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	// SceNpScoreRankData changed with 180.002
-	const bool deprecated = (rankArraySize == (arrayNum * sizeof(SceNpScoreRankData_deprecated)));
-
-	if (rankArraySize != (arrayNum * sizeof(SceNpScoreRankData)) && !deprecated)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
 	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
 	}
 
-	nph.get_score_range(trans_ctx, boardId, startSerialRank, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, async, deprecated);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
+	return CELL_OK;
 }
 
-error_code sceNpScoreGetRankingByRange(s32 transId, SceNpScoreBoardId boardId, SceNpScoreRankNumber startSerialRank, vm::ptr<SceNpScoreRankData> rankArray, u32 rankArraySize,
-    vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
-    vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
-{
-	sceNp.warning("sceNpScoreGetRankingByRange(transId=%d, boardId=%d, startSerialRank=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, infoArraySize=%d, "
-	           "arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
-	    transId, boardId, startSerialRank, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, option);
-
-	return scenp_score_get_ranking_by_range(transId, boardId, startSerialRank, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize,
-		arrayNum, lastSortDate, totalRecord, option, false);
-}
-
-error_code sceNpScoreGetRankingByRangeAsync(s32 transId, SceNpScoreBoardId boardId, SceNpScoreRankNumber startSerialRank, vm::ptr<SceNpScoreRankData> rankArray, u32 rankArraySize,
-    vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
+error_code sceNpScoreGetRankingByRangeAsync(s32 transId, SceNpScoreBoardId boardId, SceNpScoreRankNumber startSerialRank, vm::ptr<SceNpScoreRankData> rankArray, u64 rankArraySize,
+    vm::ptr<SceNpScoreComment> commentArray, u64 commentArraySize, vm::ptr<void> infoArray, u64 infoArraySize, u64 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
     vm::ptr<SceNpScoreRankNumber> totalRecord, s32 prio, vm::ptr<void> option)
 {
-	sceNp.warning("sceNpScoreGetRankingByRangeAsync(transId=%d, boardId=%d, startSerialRank=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, "
+	sceNp.todo("sceNpScoreGetRankingByRangeAsync(transId=%d, boardId=%d, startSerialRank=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, "
 	           "infoArraySize=%d, arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, prio=%d, option=*0x%x)",
 	    transId, boardId, startSerialRank, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, prio, option);
 
-	return scenp_score_get_ranking_by_range(transId, boardId, startSerialRank, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize,
-		arrayNum, lastSortDate, totalRecord, option, true);
-}
-
-error_code scenp_score_get_friends_ranking(s32 transId, SceNpScoreBoardId boardId, s32 includeSelf, vm::ptr<SceNpScoreRankData> rankArray, u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray,
-    u32 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option,
-	bool async)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	auto [res, trans_ctx] = get_score_transaction_context(transId);
-	if (res)
-		return *res;
+	if (!arrayNum)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
 
-	if (!rankArray || !totalRecord || !lastSortDate)
+	if (!startSerialRank || option) // option check at least until fw 4.71
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpScoreGetFriendsRanking(s32 transId, SceNpScoreBoardId boardId, s32 includeSelf, vm::ptr<SceNpScoreRankData> rankArray, u64 rankArraySize, vm::ptr<SceNpScoreComment> commentArray,
+    u64 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u64 infoArraySize, u64 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
+{
+	sceNp.todo("sceNpScoreGetFriendsRanking(transId=%d, boardId=%d, includeSelf=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, infoArraySize=%d, "
+	           "arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
+	    transId, boardId, includeSelf, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, option);
+
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph.is_NP_Score_init)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!rankArray || !arrayNum)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
@@ -5999,65 +3770,42 @@ error_code scenp_score_get_friends_ranking(s32 transId, SceNpScoreBoardId boardI
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (commentArray && commentArraySize != (arrayNum * sizeof(SceNpScoreComment)))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	if (infoArray && infoArraySize != (arrayNum * sizeof(SceNpScoreGameInfo)) && infoArraySize != (arrayNum * sizeof(SceNpScoreVariableSizeGameInfo)))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	// The SceNpScoreRankData changed with 180.002
-	const bool deprecated = (rankArraySize == (arrayNum * sizeof(SceNpScoreRankData_deprecated)));
-
-	if (rankArraySize != (arrayNum * sizeof(SceNpScoreRankData)) && !deprecated)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	nph.get_score_friend(trans_ctx, boardId, includeSelf, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, async, deprecated);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
+	return CELL_OK;
 }
 
-error_code sceNpScoreGetFriendsRanking(s32 transId, SceNpScoreBoardId boardId, s32 includeSelf, vm::ptr<SceNpScoreRankData> rankArray, u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray,
-    u32 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
-{
-	sceNp.warning("sceNpScoreGetFriendsRanking(transId=%d, boardId=%d, includeSelf=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, infoArraySize=%d, "
-	           "arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
-	    transId, boardId, includeSelf, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, option);
-
-	return scenp_score_get_friends_ranking(transId, boardId, includeSelf, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize,
-		arrayNum, lastSortDate, totalRecord, option, false);
-}
-
-error_code sceNpScoreGetFriendsRankingAsync(s32 transId, SceNpScoreBoardId boardId, s32 includeSelf, vm::ptr<SceNpScoreRankData> rankArray, u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray,
-    u32 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, s32 prio,
+error_code sceNpScoreGetFriendsRankingAsync(s32 transId, SceNpScoreBoardId boardId, s32 includeSelf, vm::ptr<SceNpScoreRankData> rankArray, u64 rankArraySize, vm::ptr<SceNpScoreComment> commentArray,
+    u64 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u64 infoArraySize, u64 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, s32 prio,
     vm::ptr<void> option)
 {
-	sceNp.warning("sceNpScoreGetFriendsRankingAsync(transId=%d, boardId=%d, includeSelf=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, infoArraySize=%d, "
+	sceNp.todo("sceNpScoreGetFriendsRankingAsync(transId=%d, boardId=%d, includeSelf=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, infoArraySize=%d, "
 	           "arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, prio=%d, option=*0x%x)",
 	    transId, boardId, includeSelf, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, prio, option);
 
-	return scenp_score_get_friends_ranking(transId, boardId, includeSelf, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize,
-		arrayNum, lastSortDate, totalRecord, option, true);
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph.is_NP_Score_init)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!rankArray || !arrayNum)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_SCORE_MAX_SELECTED_FRIENDS_NUM || option) // option check at least until fw 4.71
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
 }
 
-error_code scenp_score_censor_comment(s32 transId, vm::cptr<char> comment, vm::ptr<void> option, bool async)
+error_code sceNpScoreCensorComment(s32 transId, vm::cptr<char> comment, vm::ptr<void> option)
 {
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	sceNp.todo("sceNpScoreCensorComment(transId=%d, comment=%s, option=*0x%x)", transId, comment, option);
+
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6080,43 +3828,14 @@ error_code scenp_score_censor_comment(s32 transId, vm::cptr<char> comment, vm::p
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
 	}
 
-	auto [res, trans_ctx] = get_score_transaction_context(transId);
-	if (res)
-		return *res;
-
-	// TODO: actual implementation of this
-	trans_ctx->result = CELL_OK;
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
-}
-
-error_code sceNpScoreCensorComment(s32 transId, vm::cptr<char> comment, vm::ptr<void> option)
-{
-	sceNp.todo("sceNpScoreCensorComment(transId=%d, comment=%s, option=*0x%x)", transId, comment, option);
-
-	return scenp_score_censor_comment(transId, comment, option, false);
+	return CELL_OK;
 }
 
 error_code sceNpScoreCensorCommentAsync(s32 transId, vm::cptr<char> comment, s32 prio, vm::ptr<void> option)
 {
 	sceNp.todo("sceNpScoreCensorCommentAsync(transId=%d, comment=%s, prio=%d, option=*0x%x)", transId, comment, prio, option);
 
-	return scenp_score_censor_comment(transId, comment, option, true);
-}
-
-error_code scenp_score_sanitize_comment(s32 transId, vm::cptr<char> comment, vm::ptr<char> sanitizedComment, vm::ptr<void> /* option */, bool async)
-{
-	if (!sanitizedComment)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6128,99 +3847,79 @@ error_code scenp_score_sanitize_comment(s32 transId, vm::cptr<char> comment, vm:
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	const auto comment_len = strlen(comment.get_ptr());
-
-	if (comment_len > SCE_NP_SCORE_CENSOR_COMMENT_MAXLEN)
+	if (strlen(comment.get_ptr()) > SCE_NP_SCORE_CENSOR_COMMENT_MAXLEN || option) // option check at least until fw 4.71
 	{
+		// TODO: is SCE_NP_SCORE_CENSOR_COMMENT_MAXLEN + 1 allowed ?
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
-	auto [res, trans_ctx] = get_score_transaction_context(transId);
-	if (res)
-		return *res;
-
-	// TODO: actual implementation of this
-	memcpy(sanitizedComment.get_ptr(), comment.get_ptr(), comment_len + 1);
-	trans_ctx->result = CELL_OK;
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
+	return CELL_OK;
 }
 
 error_code sceNpScoreSanitizeComment(s32 transId, vm::cptr<char> comment, vm::ptr<char> sanitizedComment, vm::ptr<void> option)
 {
-	sceNp.warning("sceNpScoreSanitizeComment(transId=%d, comment=%s, sanitizedComment=*0x%x, option=*0x%x)", transId, comment, sanitizedComment, option);
+	sceNp.todo("sceNpScoreSanitizeComment(transId=%d, comment=%s, sanitizedComment=*0x%x, option=*0x%x)", transId, comment, sanitizedComment, option);
 
-	return scenp_score_sanitize_comment(transId, comment, sanitizedComment, option, false);
-}
-
-error_code sceNpScoreSanitizeCommentAsync(s32 transId, vm::cptr<char> comment, vm::ptr<char> sanitizedComment, s32 prio, vm::ptr<void> option)
-{
-	sceNp.warning("sceNpScoreSanitizeCommentAsync(transId=%d, comment=%s, sanitizedComment=*0x%x, prio=%d, option=*0x%x)", transId, comment, sanitizedComment, prio, option);
-
-	return scenp_score_sanitize_comment(transId, comment, sanitizedComment, option, true);
-}
-
-error_code sceNpScoreGetRankingByNpIdPcId(s32 transId, SceNpScoreBoardId boardId, vm::cptr<SceNpScoreNpIdPcId> idArray, u32 idArraySize, vm::ptr<SceNpScorePlayerRankData> rankArray, u32 rankArraySize,
-    vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
-    vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
-{
-	sceNp.warning("sceNpScoreGetRankingByNpIdPcId(transId=%d, boardId=%d, idArray=*0x%x, idArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, "
-	           "infoArraySize=%d, arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
-	    transId, boardId, idArray, idArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, option);
-
-	return scenp_score_get_ranking_by_npid(transId, boardId, idArray, idArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray,
-		infoArraySize, arrayNum, lastSortDate, totalRecord, option, false);
-}
-
-error_code sceNpScoreGetRankingByNpIdPcIdAsync(s32 transId, SceNpScoreBoardId boardId, vm::cptr<SceNpScoreNpIdPcId> idArray, u32 idArraySize, vm::ptr<SceNpScorePlayerRankData> rankArray,
-    u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
-    vm::ptr<SceNpScoreRankNumber> totalRecord, s32 prio, vm::ptr<void> option)
-{
-	sceNp.warning("sceNpScoreGetRankingByNpIdPcIdAsync(transId=%d, boardId=%d, idArray=*0x%x, idArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, "
-	           "infoArraySize=%d, arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, prio=%d, option=*0x%x)",
-	    transId, boardId, idArray, idArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, prio, option);
-
-	return scenp_score_get_ranking_by_npid(transId, boardId, idArray, idArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray,
-		infoArraySize, arrayNum, lastSortDate, totalRecord, option, true);
-}
-
-error_code sceNpScoreAbortTransaction(s32 transId)
-{
-	sceNp.warning("sceNpScoreAbortTransaction(transId=%d)", transId);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	auto trans = idm::get_unlocked<score_transaction_ctx>(transId);
-	if (!trans)
+	if (!comment)
 	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	trans->abort_transaction();
+	if (strlen(comment.get_ptr()) > SCE_NP_SCORE_CENSOR_COMMENT_MAXLEN || option) // option check at least until fw 4.71
+	{
+		// TODO: is SCE_NP_SCORE_CENSOR_COMMENT_MAXLEN + 1 allowed ?
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
+	}
 
 	return CELL_OK;
 }
 
-error_code sceNpScoreGetClansMembersRankingByNpId(s32 transId, SceNpClanId clanId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> idArray, u32 idArraySize, vm::ptr<SceNpScorePlayerRankData> rankArray,
-    u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u32 infoArraySize, vm::ptr<SceNpScoreClansMemberDescription> descriptArray,
-    u32 descriptArraySize, u32 arrayNum, vm::ptr<SceNpScoreClanBasicInfo> clanInfo, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
+error_code sceNpScoreSanitizeCommentAsync(s32 transId, vm::cptr<char> comment, vm::ptr<char> sanitizedComment, s32 prio, vm::ptr<void> option)
 {
-	sceNp.todo("sceNpScoreGetClansMembersRankingByNpId(transId=%d, clanId=%d, boardId=%d, idArray=*0x%x, idArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, "
-	           "infoArray=*0x%x, infoArraySize=%d, descriptArray=*0x%x, descriptArraySize=%d, arrayNum=%d, clanInfo=*0x%x, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
-	    transId, clanId, boardId, idArray, idArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, descriptArray, descriptArraySize, arrayNum, clanInfo,
-	    lastSortDate, totalRecord, option);
+	sceNp.todo("sceNpScoreSanitizeCommentAsync(transId=%d, comment=%s, sanitizedComment=*0x%x, prio=%d, option=*0x%x)", transId, comment, sanitizedComment, prio, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph.is_NP_Score_init)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!comment)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (strlen(comment.get_ptr()) > SCE_NP_SCORE_CENSOR_COMMENT_MAXLEN || option) // option check at least until fw 4.71
+	{
+		// TODO: is SCE_NP_SCORE_CENSOR_COMMENT_MAXLEN + 1 allowed ?
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpScoreGetRankingByNpIdPcId(s32 transId, SceNpScoreBoardId boardId, vm::cptr<SceNpScoreNpIdPcId> idArray, u64 idArraySize, vm::ptr<SceNpScorePlayerRankData> rankArray, u64 rankArraySize,
+    vm::ptr<SceNpScoreComment> commentArray, u64 commentArraySize, vm::ptr<void> infoArray, u64 infoArraySize, u64 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
+    vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
+{
+	sceNp.todo("sceNpScoreGetRankingByNpIdPcId(transId=%d, boardId=%d, idArray=*0x%x, idArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, "
+	           "infoArraySize=%d, arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
+	    transId, boardId, idArray, idArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, option);
+
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6250,17 +3949,15 @@ error_code sceNpScoreGetClansMembersRankingByNpId(s32 transId, SceNpClanId clanI
 	return CELL_OK;
 }
 
-error_code sceNpScoreGetClansMembersRankingByNpIdAsync(s32 transId, SceNpClanId clanId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> idArray, u32 idArraySize,
-    vm::ptr<SceNpScorePlayerRankData> rankArray, u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u32 infoArraySize,
-    vm::ptr<SceNpScoreClansMemberDescription> descriptArray, u32 descriptArraySize, u32 arrayNum, vm::ptr<SceNpScoreClanBasicInfo> clanInfo, vm::ptr<CellRtcTick> lastSortDate,
+error_code sceNpScoreGetRankingByNpIdPcIdAsync(s32 transId, SceNpScoreBoardId boardId, vm::cptr<SceNpScoreNpIdPcId> idArray, u64 idArraySize, vm::ptr<SceNpScorePlayerRankData> rankArray,
+    u64 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u64 commentArraySize, vm::ptr<void> infoArray, u64 infoArraySize, u64 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
     vm::ptr<SceNpScoreRankNumber> totalRecord, s32 prio, vm::ptr<void> option)
 {
-	sceNp.todo("sceNpScoreGetClansMembersRankingByNpIdAsync(transId=%d, clanId=%d, boardId=%d, idArray=*0x%x, idArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, "
-	           "infoArray=*0x%x, infoArraySize=%d, descriptArray=*0x%x, descriptArraySize=%d, arrayNum=%d, clanInfo=*0x%x, lastSortDate=*0x%x, totalRecord=*0x%x, prio=%d, option=*0x%x)",
-	    transId, clanId, boardId, idArray, idArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, descriptArray, descriptArraySize, arrayNum, clanInfo,
-	    lastSortDate, totalRecord, prio, option);
+	sceNp.todo("sceNpScoreGetRankingByNpIdPcIdAsync(transId=%d, boardId=%d, idArray=*0x%x, idArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, infoArray=*0x%x, "
+	           "infoArraySize=%d, arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, prio=%d, option=*0x%x)",
+	    transId, boardId, idArray, idArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, arrayNum, lastSortDate, totalRecord, prio, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6280,17 +3977,30 @@ error_code sceNpScoreGetClansMembersRankingByNpIdAsync(s32 transId, SceNpClanId
 	return CELL_OK;
 }
 
-error_code sceNpScoreGetClansMembersRankingByNpIdPcId(s32 transId, SceNpClanId clanId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> idArray, u32 idArraySize,
-    vm::ptr<SceNpScorePlayerRankData> rankArray, u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u32 infoArraySize,
-    vm::ptr<SceNpScoreClansMemberDescription> descriptArray, u32 descriptArraySize, u32 arrayNum, vm::ptr<SceNpScoreClanBasicInfo> clanInfo, vm::ptr<CellRtcTick> lastSortDate,
-    vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
+error_code sceNpScoreAbortTransaction(s32 transId)
 {
-	sceNp.todo("sceNpScoreGetClansMembersRankingByNpIdPcId(transId=%d, clanId=%d, boardId=%d, idArray=*0x%x, idArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, "
+	sceNp.todo("sceNpScoreAbortTransaction(transId=%d)", transId);
+
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph.is_NP_Score_init)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpScoreGetClansMembersRankingByNpId(s32 transId, SceNpClanId clanId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> idArray, u64 idArraySize, vm::ptr<SceNpScorePlayerRankData> rankArray,
+    u64 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u64 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u64 infoArraySize, vm::ptr<SceNpScoreClansMemberDescription> descriptArray,
+    u64 descriptArraySize, u64 arrayNum, vm::ptr<SceNpScoreClanBasicInfo> clanInfo, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
+{
+	sceNp.todo("sceNpScoreGetClansMembersRankingByNpId(transId=%d, clanId=%d, boardId=%d, idArray=*0x%x, idArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, "
 	           "infoArray=*0x%x, infoArraySize=%d, descriptArray=*0x%x, descriptArraySize=%d, arrayNum=%d, clanInfo=*0x%x, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
 	    transId, clanId, boardId, idArray, idArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, descriptArray, descriptArraySize, arrayNum, clanInfo,
 	    lastSortDate, totalRecord, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6320,9 +4030,79 @@ error_code sceNpScoreGetClansMembersRankingByNpIdPcId(s32 transId, SceNpClanId c
 	return CELL_OK;
 }
 
-error_code sceNpScoreGetClansMembersRankingByNpIdPcIdAsync(s32 transId, SceNpClanId clanId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> idArray, u32 idArraySize,
-    vm::ptr<SceNpScorePlayerRankData> rankArray, u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u32 infoArraySize,
-    vm::ptr<SceNpScoreClansMemberDescription> descriptArray, u32 descriptArraySize, u32 arrayNum, vm::ptr<SceNpScoreClanBasicInfo> clanInfo, vm::ptr<CellRtcTick> lastSortDate,
+error_code sceNpScoreGetClansMembersRankingByNpIdAsync(s32 transId, SceNpClanId clanId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> idArray, u64 idArraySize,
+    vm::ptr<SceNpScorePlayerRankData> rankArray, u64 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u64 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u64 infoArraySize,
+    vm::ptr<SceNpScoreClansMemberDescription> descriptArray, u64 descriptArraySize, u64 arrayNum, vm::ptr<SceNpScoreClanBasicInfo> clanInfo, vm::ptr<CellRtcTick> lastSortDate,
+    vm::ptr<SceNpScoreRankNumber> totalRecord, s32 prio, vm::ptr<void> option)
+{
+	sceNp.todo("sceNpScoreGetClansMembersRankingByNpIdAsync(transId=%d, clanId=%d, boardId=%d, idArray=*0x%x, idArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, "
+	           "infoArray=*0x%x, infoArraySize=%d, descriptArray=*0x%x, descriptArraySize=%d, arrayNum=%d, clanInfo=*0x%x, lastSortDate=*0x%x, totalRecord=*0x%x, prio=%d, option=*0x%x)",
+	    transId, clanId, boardId, idArray, idArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, descriptArray, descriptArraySize, arrayNum, clanInfo,
+	    lastSortDate, totalRecord, prio, option);
+
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph.is_NP_Score_init)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!idArray || !arrayNum)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option) // option check at least until fw 4.71
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpScoreGetClansMembersRankingByNpIdPcId(s32 transId, SceNpClanId clanId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> idArray, u64 idArraySize,
+    vm::ptr<SceNpScorePlayerRankData> rankArray, u64 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u64 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u64 infoArraySize,
+    vm::ptr<SceNpScoreClansMemberDescription> descriptArray, u64 descriptArraySize, u64 arrayNum, vm::ptr<SceNpScoreClanBasicInfo> clanInfo, vm::ptr<CellRtcTick> lastSortDate,
+    vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
+{
+	sceNp.todo("sceNpScoreGetClansMembersRankingByNpIdPcId(transId=%d, clanId=%d, boardId=%d, idArray=*0x%x, idArraySize=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, "
+	           "infoArray=*0x%x, infoArraySize=%d, descriptArray=*0x%x, descriptArraySize=%d, arrayNum=%d, clanInfo=*0x%x, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
+	    transId, clanId, boardId, idArray, idArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, descriptArray, descriptArraySize, arrayNum, clanInfo,
+	    lastSortDate, totalRecord, option);
+
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+	if (!nph.is_NP_Score_init)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!idArray || !rankArray || !totalRecord || !lastSortDate || !arrayNum)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option) // option check at least until fw 4.71
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_SCORE_MAX_NPID_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
+	}
+
+	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpScoreGetClansMembersRankingByNpIdPcIdAsync(s32 transId, SceNpClanId clanId, SceNpScoreBoardId boardId, vm::cptr<SceNpId> idArray, u64 idArraySize,
+    vm::ptr<SceNpScorePlayerRankData> rankArray, u64 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u64 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u64 infoArraySize,
+    vm::ptr<SceNpScoreClansMemberDescription> descriptArray, u64 descriptArraySize, u64 arrayNum, vm::ptr<SceNpScoreClanBasicInfo> clanInfo, vm::ptr<CellRtcTick> lastSortDate,
     vm::ptr<SceNpScoreRankNumber> totalRecord, s32 prio, vm::ptr<void> option)
 {
 	sceNp.todo(
@@ -6331,7 +4111,7 @@ error_code sceNpScoreGetClansMembersRankingByNpIdPcIdAsync(s32 transId, SceNpCla
 	    transId, clanId, boardId, idArray, idArraySize, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, descriptArray, descriptArraySize, arrayNum, clanInfo,
 	    lastSortDate, totalRecord, prio, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6351,15 +4131,15 @@ error_code sceNpScoreGetClansMembersRankingByNpIdPcIdAsync(s32 transId, SceNpCla
 	return CELL_OK;
 }
 
-error_code sceNpScoreGetClansRankingByRange(s32 transId, SceNpScoreClansBoardId clanBoardId, SceNpScoreRankNumber startSerialRank, vm::ptr<SceNpScoreClanIdRankData> rankArray, u32 rankArraySize,
-    vm::ptr<void> reserved1, u32 reservedSize1, vm::ptr<void> reserved2, u32 reservedSize2, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord,
+error_code sceNpScoreGetClansRankingByRange(s32 transId, SceNpScoreClansBoardId clanBoardId, SceNpScoreRankNumber startSerialRank, vm::ptr<SceNpScoreClanIdRankData> rankArray, u64 rankArraySize,
+    vm::ptr<void> reserved1, u64 reservedSize1, vm::ptr<void> reserved2, u64 reservedSize2, u64 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord,
     vm::ptr<void> option)
 {
 	sceNp.todo("sceNpScoreGetClansRankingByRange(transId=%d, clanBoardId=%d, startSerialRank=%d, rankArray=*0x%x, rankArraySize=%d, reserved1=*0x%x, reservedSize1=%d, reserved2=*0x%x, reservedSize2=%d, "
 	           "arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
 	    transId, clanBoardId, startSerialRank, rankArray, rankArraySize, reserved1, reservedSize1, reserved2, reservedSize2, arrayNum, lastSortDate, totalRecord, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6389,15 +4169,15 @@ error_code sceNpScoreGetClansRankingByRange(s32 transId, SceNpScoreClansBoardId
 	return CELL_OK;
 }
 
-error_code sceNpScoreGetClansRankingByRangeAsync(s32 transId, SceNpScoreClansBoardId clanBoardId, SceNpScoreRankNumber startSerialRank, vm::ptr<SceNpScoreClanIdRankData> rankArray, u32 rankArraySize,
-    vm::ptr<void> reserved1, u32 reservedSize1, vm::ptr<void> reserved2, u32 reservedSize2, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, s32 prio,
+error_code sceNpScoreGetClansRankingByRangeAsync(s32 transId, SceNpScoreClansBoardId clanBoardId, SceNpScoreRankNumber startSerialRank, vm::ptr<SceNpScoreClanIdRankData> rankArray, u64 rankArraySize,
+    vm::ptr<void> reserved1, u64 reservedSize1, vm::ptr<void> reserved2, u64 reservedSize2, u64 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, s32 prio,
     vm::ptr<void> option)
 {
 	sceNp.todo("sceNpScoreGetClansRankingByRangeAsync(transId=%d, clanBoardId=%d, startSerialRank=%d, rankArray=*0x%x, rankArraySize=%d, reserved1=*0x%x, reservedSize1=%d, reserved2=*0x%x, "
 	           "reservedSize2=%d, arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, prio=%d, option=*0x%x)",
 	    transId, clanBoardId, startSerialRank, rankArray, rankArraySize, reserved1, reservedSize1, reserved2, reservedSize2, arrayNum, lastSortDate, totalRecord, prio, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6418,12 +4198,12 @@ error_code sceNpScoreGetClansRankingByRangeAsync(s32 transId, SceNpScoreClansBoa
 }
 
 error_code sceNpScoreGetClanMemberGameData(
-    s32 transId, SceNpScoreBoardId boardId, SceNpClanId clanId, vm::cptr<SceNpId> npId, vm::ptr<u32> totalSize, u32 recvSize, vm::ptr<void> data, vm::ptr<void> option)
+    s32 transId, SceNpScoreBoardId boardId, SceNpClanId clanId, vm::cptr<SceNpId> npId, vm::ptr<u64> totalSize, u64 recvSize, vm::ptr<void> data, vm::ptr<void> option)
 {
 	sceNp.todo("sceNpScoreGetClanMemberGameData(transId=%d, boardId=%d, clanId=%d, npId=*0x%x, totalSize=*0x%x, recvSize=%d, data=*0x%x, option=*0x%x)", transId, boardId, clanId, npId, totalSize,
 	    recvSize, data, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6449,12 +4229,12 @@ error_code sceNpScoreGetClanMemberGameData(
 }
 
 error_code sceNpScoreGetClanMemberGameDataAsync(
-    s32 transId, SceNpScoreBoardId boardId, SceNpClanId clanId, vm::cptr<SceNpId> npId, vm::ptr<u32> totalSize, u32 recvSize, vm::ptr<void> data, s32 prio, vm::ptr<void> option)
+    s32 transId, SceNpScoreBoardId boardId, SceNpClanId clanId, vm::cptr<SceNpId> npId, vm::ptr<u64> totalSize, u64 recvSize, vm::ptr<void> data, s32 prio, vm::ptr<void> option)
 {
 	sceNp.todo("sceNpScoreGetClanMemberGameDataAsync(transId=%d, boardId=%d, clanId=%d, npId=*0x%x, totalSize=*0x%x, recvSize=%d, data=*0x%x, prio=%d, option=*0x%x)", transId, boardId, clanId, npId,
 	    totalSize, recvSize, data, prio, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6469,15 +4249,15 @@ error_code sceNpScoreGetClanMemberGameDataAsync(
 	return CELL_OK;
 }
 
-error_code sceNpScoreGetClansRankingByClanId(s32 transId, SceNpScoreClansBoardId clanBoardId, vm::cptr<SceNpClanId> clanIdArray, u32 clanIdArraySize, vm::ptr<SceNpScoreClanIdRankData> rankArray,
-    u32 rankArraySize, vm::ptr<void> reserved1, u32 reservedSize1, vm::ptr<void> reserved2, u32 reservedSize2, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
+error_code sceNpScoreGetClansRankingByClanId(s32 transId, SceNpScoreClansBoardId clanBoardId, vm::cptr<SceNpClanId> clanIdArray, u64 clanIdArraySize, vm::ptr<SceNpScoreClanIdRankData> rankArray,
+    u64 rankArraySize, vm::ptr<void> reserved1, u64 reservedSize1, vm::ptr<void> reserved2, u64 reservedSize2, u64 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
     vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
 {
 	sceNp.todo("sceNpScoreGetClansRankingByClanId(transId=%d, clanBoardId=%d, clanIdArray=*0x%x, clanIdArraySize=%d, rankArray=*0x%x, rankArraySize=%d, reserved1=*0x%x, reservedSize1=%d, "
 	           "reserved2=*0x%x, reservedSize2=%d, arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
 	    transId, clanBoardId, clanIdArray, clanIdArraySize, rankArray, rankArraySize, reserved1, reservedSize1, reserved2, reservedSize2, arrayNum, lastSortDate, totalRecord, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6507,15 +4287,15 @@ error_code sceNpScoreGetClansRankingByClanId(s32 transId, SceNpScoreClansBoardId
 	return CELL_OK;
 }
 
-error_code sceNpScoreGetClansRankingByClanIdAsync(s32 transId, SceNpScoreClansBoardId clanBoardId, vm::cptr<SceNpClanId> clanIdArray, u32 clanIdArraySize, vm::ptr<SceNpScoreClanIdRankData> rankArray,
-    u32 rankArraySize, vm::ptr<void> reserved1, u32 reservedSize1, vm::ptr<void> reserved2, u32 reservedSize2, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
+error_code sceNpScoreGetClansRankingByClanIdAsync(s32 transId, SceNpScoreClansBoardId clanBoardId, vm::cptr<SceNpClanId> clanIdArray, u64 clanIdArraySize, vm::ptr<SceNpScoreClanIdRankData> rankArray,
+    u64 rankArraySize, vm::ptr<void> reserved1, u64 reservedSize1, vm::ptr<void> reserved2, u64 reservedSize2, u64 arrayNum, vm::ptr<CellRtcTick> lastSortDate,
     vm::ptr<SceNpScoreRankNumber> totalRecord, s32 prio, vm::ptr<void> option)
 {
 	sceNp.todo("sceNpScoreGetClansRankingByRangeAsync(transId=%d, clanBoardId=%d, clanIdArray=*0x%x, clanIdArraySize=%d, rankArray=*0x%x, rankArraySize=%d, reserved1=*0x%x, reservedSize1=%d, "
 	           "reserved2=*0x%x, reservedSize2=%d, arrayNum=%d, lastSortDate=*0x%x, totalRecord=*0x%x, prio=%d, option=*0x%x)",
 	    transId, clanBoardId, clanIdArray, clanIdArraySize, rankArray, rankArraySize, reserved1, reservedSize1, reserved2, reservedSize2, arrayNum, lastSortDate, totalRecord, prio, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6536,15 +4316,15 @@ error_code sceNpScoreGetClansRankingByClanIdAsync(s32 transId, SceNpScoreClansBo
 }
 
 error_code sceNpScoreGetClansMembersRankingByRange(s32 transId, SceNpClanId clanId, SceNpScoreBoardId boardId, SceNpScoreRankNumber startSerialRank, vm::ptr<SceNpScoreClanIdRankData> rankArray,
-    u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u32 infoArraySize, vm::ptr<SceNpScoreClansMemberDescription> descriptArray,
-    u32 descriptArraySize, u32 arrayNum, vm::ptr<SceNpScoreClanBasicInfo> clanInfo, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
+    u64 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u64 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u64 infoArraySize, vm::ptr<SceNpScoreClansMemberDescription> descriptArray,
+    u64 descriptArraySize, u64 arrayNum, vm::ptr<SceNpScoreClanBasicInfo> clanInfo, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, vm::ptr<void> option)
 {
 	sceNp.todo("sceNpScoreGetClansMembersRankingByRange(transId=%d, clanId=%d, boardId=%d, startSerialRank=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, "
 	           "infoArray=*0x%x, infoArraySize=%d, descriptArray=*0x%x, descriptArraySize=%d, arrayNum=%d, clanInfo=*0x%x, lastSortDate=*0x%x, totalRecord=*0x%x, option=*0x%x)",
 	    transId, clanId, boardId, startSerialRank, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, descriptArray, descriptArraySize, arrayNum, clanInfo, lastSortDate,
 	    totalRecord, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6575,15 +4355,15 @@ error_code sceNpScoreGetClansMembersRankingByRange(s32 transId, SceNpClanId clan
 }
 
 error_code sceNpScoreGetClansMembersRankingByRangeAsync(s32 transId, SceNpClanId clanId, SceNpScoreBoardId boardId, SceNpScoreRankNumber startSerialRank, vm::ptr<SceNpScoreClanIdRankData> rankArray,
-    u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u32 infoArraySize, vm::ptr<SceNpScoreClansMemberDescription> descriptArray,
-    u32 descriptArraySize, u32 arrayNum, vm::ptr<SceNpScoreClanBasicInfo> clanInfo, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, s32 prio, vm::ptr<void> option)
+    u64 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u64 commentArraySize, vm::ptr<SceNpScoreGameInfo> infoArray, u64 infoArraySize, vm::ptr<SceNpScoreClansMemberDescription> descriptArray,
+    u64 descriptArraySize, u64 arrayNum, vm::ptr<SceNpScoreClanBasicInfo> clanInfo, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, s32 prio, vm::ptr<void> option)
 {
 	sceNp.todo("sceNpScoreGetClansMembersRankingByRangeAsync(transId=%d, clanId=%d, boardId=%d, startSerialRank=%d, rankArray=*0x%x, rankArraySize=%d, commentArray=*0x%x, commentArraySize=%d, "
 	           "infoArray=*0x%x, infoArraySize=%d, descriptArray=*0x%x, descriptArraySize=%d, arrayNum=%d, clanInfo=*0x%x, lastSortDate=*0x%x, totalRecord=*0x%x, prio=%d, option=*0x%x)",
 	    transId, clanId, boardId, startSerialRank, rankArray, rankArraySize, commentArray, commentArraySize, infoArray, infoArraySize, descriptArray, descriptArraySize, arrayNum, clanInfo, lastSortDate,
 	    totalRecord, prio, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Score_init)
 	{
@@ -6605,9 +4385,9 @@ error_code sceNpScoreGetClansMembersRankingByRangeAsync(s32 transId, SceNpClanId
 
 error_code sceNpSignalingCreateCtx(vm::ptr<SceNpId> npId, vm::ptr<SceNpSignalingHandler> handler, vm::ptr<void> arg, vm::ptr<u32> ctx_id)
 {
-	sceNp.warning("sceNpSignalingCreateCtx(npId=*0x%x, handler=*0x%x, arg=*0x%x, ctx_id=*0x%x)", npId, handler, arg, ctx_id);
+	sceNp.todo("sceNpSignalingCreateCtx(npId=*0x%x, handler=*0x%x, arg=*0x%x, ctx_id=*0x%x)", npId, handler, arg, ctx_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -6619,26 +4399,24 @@ error_code sceNpSignalingCreateCtx(vm::ptr<SceNpId> npId, vm::ptr<SceNpSignaling
 		return SCE_NP_SIGNALING_ERROR_INVALID_ARGUMENT;
 	}
 
-	u32 id = create_signaling_context(npId, handler, arg);
+	//	if (current_contexts > SCE_NP_SIGNALING_CTX_MAX)
+	//{
+	//	return SCE_NP_SIGNALING_ERROR_CTX_MAX;
+	//}
 
-	if (!id)
-	{
-		return SCE_NP_SIGNALING_ERROR_CTX_MAX;
-	}
-
-	*ctx_id = id;
+	*ctx_id = create_signaling_context(npId, handler, arg);
 
 	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-	sigh.add_sig_ctx(id);
+	sigh.set_sig_cb(*ctx_id, handler, arg);
 
 	return CELL_OK;
 }
 
 error_code sceNpSignalingDestroyCtx(u32 ctx_id)
 {
-	sceNp.warning("sceNpSignalingDestroyCtx(ctx_id=%d)", ctx_id);
+	sceNp.todo("sceNpSignalingDestroyCtx(ctx_id=%d)", ctx_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -6650,9 +4428,6 @@ error_code sceNpSignalingDestroyCtx(u32 ctx_id)
 		return SCE_NP_SIGNALING_ERROR_CTX_NOT_FOUND;
 	}
 
-	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-	sigh.remove_sig_ctx(ctx_id);
-
 	return CELL_OK;
 }
 
@@ -6660,23 +4435,15 @@ error_code sceNpSignalingAddExtendedHandler(u32 ctx_id, vm::ptr<SceNpSignalingHa
 {
 	sceNp.warning("sceNpSignalingAddExtendedHandler(ctx_id=%d, handler=*0x%x, arg=*0x%x)", ctx_id, handler, arg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_SIGNALING_ERROR_NOT_INITIALIZED;
 	}
 
-	auto ctx = get_signaling_context(ctx_id);
-
-	if (!ctx)
-	{
-		return SCE_NP_SIGNALING_ERROR_CTX_NOT_FOUND;
-	}
-
-	std::lock_guard lock(ctx->mutex);
-	ctx->ext_handler = handler;
-	ctx->ext_arg = arg;
+	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
+	sigh.set_ext_sig_cb(ctx_id, handler, arg);
 
 	return CELL_OK;
 }
@@ -6685,7 +4452,7 @@ error_code sceNpSignalingSetCtxOpt(u32 ctx_id, s32 optname, s32 optval)
 {
 	sceNp.todo("sceNpSignalingSetCtxOpt(ctx_id=%d, optname=%d, optval=%d)", ctx_id, optname, optval);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -6697,15 +4464,6 @@ error_code sceNpSignalingSetCtxOpt(u32 ctx_id, s32 optname, s32 optval)
 		return SCE_NP_SIGNALING_ERROR_INVALID_ARGUMENT;
 	}
 
-	auto ctx = get_signaling_context(ctx_id);
-
-	if (!ctx)
-	{
-		return SCE_NP_SIGNALING_ERROR_CTX_NOT_FOUND;
-	}
-
-	// TODO
-
 	return CELL_OK;
 }
 
@@ -6713,7 +4471,7 @@ error_code sceNpSignalingGetCtxOpt(u32 ctx_id, s32 optname, vm::ptr<s32> optval)
 {
 	sceNp.todo("sceNpSignalingGetCtxOpt(ctx_id=%d, optname=%d, optval=*0x%x)", ctx_id, optname, optval);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -6725,15 +4483,6 @@ error_code sceNpSignalingGetCtxOpt(u32 ctx_id, s32 optname, vm::ptr<s32> optval)
 		return SCE_NP_SIGNALING_ERROR_INVALID_ARGUMENT;
 	}
 
-	auto ctx = get_signaling_context(ctx_id);
-
-	if (!ctx)
-	{
-		return SCE_NP_SIGNALING_ERROR_CTX_NOT_FOUND;
-	}
-
-	// TODO
-
 	return CELL_OK;
 }
 
@@ -6741,7 +4490,7 @@ error_code sceNpSignalingActivateConnection(u32 ctx_id, vm::ptr<SceNpId> npId, v
 {
 	sceNp.warning("sceNpSignalingActivateConnection(ctx_id=%d, npId=*0x%x, conn_id=*0x%x)", ctx_id, npId, conn_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -6753,48 +4502,40 @@ error_code sceNpSignalingActivateConnection(u32 ctx_id, vm::ptr<SceNpId> npId, v
 		return SCE_NP_SIGNALING_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (np::is_same_npid(nph.get_npid(), *npId))
+	if (strncmp(nph.get_npid().handle.data, npId->handle.data, 16) == 0)
 		return SCE_NP_SIGNALING_ERROR_OWN_NP_ID;
 
 	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-	*conn_id = sigh.init_sig1(*npId);
+	*conn_id = sigh.init_sig_infos(npId.get_ptr());
 
 	return CELL_OK;
 }
 
 error_code sceNpSignalingDeactivateConnection(u32 ctx_id, u32 conn_id)
 {
-	sceNp.warning("sceNpSignalingDeactivateConnection(ctx_id=%d, conn_id=%d)", ctx_id, conn_id);
+	sceNp.todo("sceNpSignalingDeactivateConnection(ctx_id=%d, conn_id=%d)", ctx_id, conn_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_SIGNALING_ERROR_NOT_INITIALIZED;
 	}
 
-	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-
-	sigh.stop_sig(conn_id, true);
-
 	return CELL_OK;
 }
 
 error_code sceNpSignalingTerminateConnection(u32 ctx_id, u32 conn_id)
 {
-	sceNp.warning("sceNpSignalingTerminateConnection(ctx_id=%d, conn_id=%d)", ctx_id, conn_id);
+	sceNp.todo("sceNpSignalingTerminateConnection(ctx_id=%d, conn_id=%d)", ctx_id, conn_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
 		return SCE_NP_SIGNALING_ERROR_NOT_INITIALIZED;
 	}
 
-	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-
-	sigh.stop_sig(conn_id, false);
-
 	return CELL_OK;
 }
 
@@ -6802,7 +4543,7 @@ error_code sceNpSignalingGetConnectionStatus(u32 ctx_id, u32 conn_id, vm::ptr<s3
 {
 	sceNp.warning("sceNpSignalingGetConnectionStatus(ctx_id=%d, conn_id=%d, conn_status=*0x%x, peer_addr=*0x%x, peer_port=*0x%x)", ctx_id, conn_id, conn_status, peer_addr, peer_port);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -6818,27 +4559,20 @@ error_code sceNpSignalingGetConnectionStatus(u32 ctx_id, u32 conn_id, vm::ptr<s3
 
 	const auto si = sigh.get_sig_infos(conn_id);
 
-	if (!si)
-	{
-		*conn_status = SCE_NP_SIGNALING_CONN_STATUS_INACTIVE;
-		return SCE_NP_SIGNALING_ERROR_CONN_NOT_FOUND;
-	}
-
-	*conn_status = si->conn_status;
-
+	*conn_status = si.connStatus;
 	if (peer_addr)
-		(*peer_addr).np_s_addr = si->addr; // infos.addr is already BE
+		(*peer_addr).np_s_addr = si.addr; // infos.addr is already BE
 	if (peer_port)
-		*peer_port = si->port;
+		*peer_port = si.port;
 
 	return CELL_OK;
 }
 
 error_code sceNpSignalingGetConnectionInfo(u32 ctx_id, u32 conn_id, s32 code, vm::ptr<SceNpSignalingConnectionInfo> info)
 {
-	sceNp.warning("sceNpSignalingGetConnectionInfo(ctx_id=%d, conn_id=%d, code=%d, info=*0x%x)", ctx_id, conn_id, code, info);
+	sceNp.todo("sceNpSignalingGetConnectionInfo(ctx_id=%d, conn_id=%d, code=%d, info=*0x%x)", ctx_id, conn_id, code, info);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -6850,60 +4584,14 @@ error_code sceNpSignalingGetConnectionInfo(u32 ctx_id, u32 conn_id, s32 code, vm
 		return SCE_NP_SIGNALING_ERROR_INVALID_ARGUMENT;
 	}
 
-	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-	const auto si = sigh.get_sig_infos(conn_id);
-
-	if (!si)
-		return SCE_NP_SIGNALING_ERROR_CONN_NOT_FOUND;
-
-	switch (code)
-	{
-		case SCE_NP_SIGNALING_CONN_INFO_RTT:
-		{
-			info->rtt = si->rtt;
-			break;
-		}
-		case SCE_NP_SIGNALING_CONN_INFO_BANDWIDTH:
-		{
-			info->bandwidth = 100'000'000; // 100 MBPS HACK
-			break;
-		}
-		case SCE_NP_SIGNALING_CONN_INFO_PEER_NPID:
-		{
-			info->npId = si->npid;
-			break;
-		}
-		case SCE_NP_SIGNALING_CONN_INFO_PEER_ADDRESS:
-		{
-			info->address.port = std::bit_cast<u16, be_t<u16>>(si->port);
-			info->address.addr.np_s_addr = si->addr;
-			break;
-		}
-		case SCE_NP_SIGNALING_CONN_INFO_MAPPED_ADDRESS:
-		{
-			info->address.port = std::bit_cast<u16, be_t<u16>>(si->mapped_port);
-			info->address.addr.np_s_addr = si->mapped_addr;
-			break;
-		}
-		case SCE_NP_SIGNALING_CONN_INFO_PACKET_LOSS:
-		{
-			info->packet_loss = 0; // HACK
-			break;
-		}
-		default:
-		{
-			return SCE_NP_SIGNALING_ERROR_INVALID_ARGUMENT;
-		}
-	}
-
 	return CELL_OK;
 }
 
 error_code sceNpSignalingGetConnectionFromNpId(u32 ctx_id, vm::ptr<SceNpId> npId, vm::ptr<u32> conn_id)
 {
-	sceNp.notice("sceNpSignalingGetConnectionFromNpId(ctx_id=%d, npId=*0x%x, conn_id=*0x%x)", ctx_id, npId, conn_id);
+	sceNp.todo("sceNpSignalingGetConnectionFromNpId(ctx_id=%d, npId=*0x%x, conn_id=*0x%x)", ctx_id, npId, conn_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -6915,29 +4603,14 @@ error_code sceNpSignalingGetConnectionFromNpId(u32 ctx_id, vm::ptr<SceNpId> npId
 		return SCE_NP_SIGNALING_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (np::is_same_npid(*npId, nph.get_npid()))
-	{
-		return SCE_NP_SIGNALING_ERROR_OWN_NP_ID;
-	}
-
-	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-	const auto found_conn_id = sigh.get_conn_id_from_npid(*npId);
-
-	if (!found_conn_id)
-	{
-		return SCE_NP_SIGNALING_ERROR_CONN_NOT_FOUND;
-	}
-
-	*conn_id = *found_conn_id;
-
 	return CELL_OK;
 }
 
-error_code sceNpSignalingGetConnectionFromPeerAddress(u32 ctx_id, np_in_addr_t peer_addr, np_in_port_t peer_port, vm::ptr<u32> conn_id)
+error_code sceNpSignalingGetConnectionFromPeerAddress(u32 ctx_id, vm::ptr<np_in_addr> peer_addr, np_in_port_t peer_port, vm::ptr<u32> conn_id)
 {
-	sceNp.warning("sceNpSignalingGetConnectionFromPeerAddress(ctx_id=%d, peer_addr=0x%x, peer_port=%d, conn_id=*0x%x)", ctx_id, peer_addr, peer_port, conn_id);
+	sceNp.todo("sceNpSignalingGetConnectionFromPeerAddress(ctx_id=%d, peer_addr=*0x%x, peer_port=%d, conn_id=*0x%x)", ctx_id, peer_addr, peer_port, conn_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -6949,16 +4622,6 @@ error_code sceNpSignalingGetConnectionFromPeerAddress(u32 ctx_id, np_in_addr_t p
 		return SCE_NP_SIGNALING_ERROR_INVALID_ARGUMENT;
 	}
 
-	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-	const auto found_conn_id = sigh.get_conn_id_from_addr(peer_addr, peer_port);
-
-	if (!found_conn_id)
-	{
-		return SCE_NP_SIGNALING_ERROR_CONN_NOT_FOUND;
-	}
-
-	*conn_id = *found_conn_id;
-
 	return CELL_OK;
 }
 
@@ -6966,7 +4629,7 @@ error_code sceNpSignalingGetLocalNetInfo(u32 ctx_id, vm::ptr<SceNpSignalingNetIn
 {
 	sceNp.warning("sceNpSignalingGetLocalNetInfo(ctx_id=%d, info=*0x%x)", ctx_id, info);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -6982,10 +4645,10 @@ error_code sceNpSignalingGetLocalNetInfo(u32 ctx_id, vm::ptr<SceNpSignalingNetIn
 	info->mapped_addr = nph.get_public_ip_addr();
 
 	// Pure speculation below
-	info->nat_status    = SCE_NP_SIGNALING_NETINFO_NAT_STATUS_TYPE2;
-	info->upnp_status   = nph.get_upnp_status();
-	info->npport_status = SCE_NP_SIGNALING_NETINFO_NPPORT_STATUS_OPEN;
-	info->npport        = SCE_NP_PORT;
+	info->nat_status    = 0;
+	info->upnp_status   = 0;
+	info->npport_status = 0;
+	info->npport        = 3658;
 
 	return CELL_OK;
 }
@@ -6994,7 +4657,7 @@ error_code sceNpSignalingGetPeerNetInfo(u32 ctx_id, vm::ptr<SceNpId> npId, vm::p
 {
 	sceNp.todo("sceNpSignalingGetPeerNetInfo(ctx_id=%d, npId=*0x%x, req_id=*0x%x)", ctx_id, npId, req_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -7013,7 +4676,7 @@ error_code sceNpSignalingCancelPeerNetInfo(u32 ctx_id, u32 req_id)
 {
 	sceNp.todo("sceNpSignalingCancelPeerNetInfo(ctx_id=%d, req_id=%d)", ctx_id, req_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -7027,7 +4690,7 @@ error_code sceNpSignalingGetPeerNetInfoResult(u32 ctx_id, u32 req_id, vm::ptr<Sc
 {
 	sceNp.todo("sceNpSignalingGetPeerNetInfoResult(ctx_id=%d, req_id=%d, info=*0x%x)", ctx_id, req_id, info);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_init)
 	{
@@ -7043,62 +4706,53 @@ error_code sceNpSignalingGetPeerNetInfoResult(u32 ctx_id, u32 req_id, vm::ptr<Sc
 	return CELL_OK;
 }
 
-error_code sceNpUtilCanonicalizeNpIdForPs3(vm::ptr<SceNpId> npId)
+error_code sceNpUtilCanonicalizeNpIdForPs3()
 {
-	sceNp.warning("sceNpUtilCanonicalizeNpIdForPs3(npId=*0x%x)", npId);
-
-	if (!npId)
-		return SCE_NP_UTIL_ERROR_INVALID_ARGUMENT;
-
-	// TODO: These checks are commented out for compatibility with RPCN for now
-	//if (npId->reserved[0] != 1)
-	//	return SCE_NP_UTIL_ERROR_INVALID_NP_ID;
-
-	//if (!npId->unk1[1])
-	//{
-	//	npId->unk1[1] = "ps3\0"_u32;
-	//}
-
+	UNIMPLEMENTED_FUNC(sceNp);
 	return CELL_OK;
 }
 
-error_code sceNpUtilCanonicalizeNpIdForPsp(vm::ptr<SceNpId> npId)
+error_code sceNpUtilCanonicalizeNpIdForPsp()
 {
-	sceNp.warning("sceNpUtilCanonicalizeNpIdForPsp(npId=*0x%x)", npId);
-
-	if (!npId)
-		return SCE_NP_UTIL_ERROR_INVALID_ARGUMENT;
-
-	// TODO: These checks are commented out for compatibility with RPCN for now
-	//if (npId->reserved[0] != 1)
-	//	return SCE_NP_UTIL_ERROR_INVALID_NP_ID;
-
-	//if (!npId->unk1[1])
-	//{
-	//	npId->unk1[1] = "psp\0"_u32; // TODO: confirm
-	//}
-
+	UNIMPLEMENTED_FUNC(sceNp);
 	return CELL_OK;
 }
 
 error_code sceNpUtilCmpNpId(vm::ptr<SceNpId> id1, vm::ptr<SceNpId> id2)
 {
-	sceNp.trace("sceNpUtilCmpNpId(id1=*0x%x(%s), id2=*0x%x(%s))", id1, id1 ? id1->handle.data : "", id2, id2 ? id2->handle.data : "");
+	sceNp.warning("sceNpUtilCmpNpId(id1=*0x%x(%s), id2=*0x%x(%s))", id1, id1->handle.data, id2, id2->handle.data);
 
 	if (!id1 || !id2)
 	{
 		return SCE_NP_UTIL_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (!np::is_same_npid(*id1, *id2))
-		return not_an_error(SCE_NP_UTIL_ERROR_NOT_MATCH);
+	// Unknown what this constant means
+	// if (id1->reserved[0] != 1 || id2->reserved[0] != 1)
+	// {
+	// 	return SCE_NP_UTIL_ERROR_INVALID_NP_ID;
+	// }
+
+	if (strncmp(id1->handle.data, id2->handle.data, 16))// || id1->unk1[0] != id2->unk1[0])
+	{
+		return SCE_NP_UTIL_ERROR_NOT_MATCH;
+	}
+
+	// if (id1->unk1[1] != id2->unk1[1])
+	// {
+	// 	// If either is zero they match
+	// 	if (id1->opt[4] && id2->opt[4])
+	// 	{
+	// 		return SCE_NP_UTIL_ERROR_NOT_MATCH;
+	// 	}
+	// }
 
 	return CELL_OK;
 }
 
 error_code sceNpUtilCmpNpIdInOrder(vm::cptr<SceNpId> id1, vm::cptr<SceNpId> id2, vm::ptr<s32> order)
 {
-	sceNp.trace("sceNpUtilCmpNpIdInOrder(id1=*0x%x, id2=*0x%x, order=*0x%x)", id1, id2, order);
+	sceNp.warning("sceNpUtilCmpNpIdInOrder(id1=*0x%x, id2=*0x%x, order=*0x%x)", id1, id2, order);
 
 	if (!id1 || !id2)
 	{
@@ -7116,7 +4770,7 @@ error_code sceNpUtilCmpNpIdInOrder(vm::cptr<SceNpId> id1, vm::cptr<SceNpId> id2,
 		return CELL_OK;
 	}
 
-	if (s32 res = std::memcmp(id1->unk1, id2->unk1, 4))
+	if (s32 res = memcmp(id1->unk1, id2->unk1, 4))
 	{
 		*order = std::clamp<s32>(res, -1, 1);
 		return CELL_OK;
@@ -7133,12 +4787,12 @@ error_code sceNpUtilCmpNpIdInOrder(vm::cptr<SceNpId> id1, vm::cptr<SceNpId> id2,
 
 	if (opt14 != 0 && opt24 != 0)
 	{
-		s32 res = std::memcmp(id1->unk1 + 1, id2->unk1 + 1, 4);
+		s32 res = memcmp(id1->unk1 + 1, id2->unk1 + 1, 4);
 		*order = std::clamp<s32>(res, -1, 1);
 		return CELL_OK;
 	}
 
-	s32 res = std::memcmp((opt14 != 0 ? id1 : id2)->unk1 + 1, "ps3", 4);
+	s32 res = memcmp((opt14 != 0 ? id1 : id2)->unk1 + 1, "ps3", 4);
 	*order = std::clamp<s32>(res, -1, 1);
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/Cell/Modules/sceNp.h b/rpcs3/Emu/Cell/Modules/sceNp.h
index bc2ab7c6e2..3e6282284d 100644
--- a/rpcs3/Emu/Cell/Modules/sceNp.h
+++ b/rpcs3/Emu/Cell/Modules/sceNp.h
@@ -1,11 +1,7 @@
 #pragma once
 
-#include "Emu/NP/rpcn_types.h"
 #include "cellRtc.h"
 #include "Emu/Cell/ErrorCodes.h"
-#include "util/shared_ptr.hpp"
-
-#include <set>
 
 error_code sceNpInit(u32 poolsize, vm::ptr<void> poolptr);
 error_code sceNpTerm();
@@ -22,7 +18,7 @@ struct np_in_addr
 
 using sys_memory_container_t = u32;
 
-using system_time_t = u64; // s64 in documentation. But since this is in microseconds, it doesn't seem to make much sense.
+using system_time_t = s64;
 using second_t = u32;
 using usecond_t = u64;
 
@@ -244,106 +240,27 @@ enum SceNpError : u32
 	SCE_NP_COMMUNITY_SERVER_ERROR_TITLE_USER_STORAGE_MAINTENANCE      = 0x8002a4ac,
 	SCE_NP_COMMUNITY_SERVER_ERROR_UNSPECIFIED                         = 0x8002a4ff,
 
-	// COMMERCE
-	SCE_NP_COMMERCE_ERROR_NOT_INITIALIZED                   = 0x80029401,
-	SCE_NP_COMMERCE_ERROR_ALREADY_INITIALIZED               = 0x80029402,
-	SCE_NP_COMMERCE_ERROR_OUT_OF_MEMORY                     = 0x80029403,
-	SCE_NP_COMMERCE_ERROR_UNSUPPORTED_VERSION               = 0x80029404,
-	SCE_NP_COMMERCE_ERROR_CTX_MAX                           = 0x80029405,
-	SCE_NP_COMMERCE_ERROR_CTX_NOT_FOUND                     = 0x80029406,
-	SCE_NP_COMMERCE_ERROR_CTXID_NOT_AVAILABLE               = 0x80029407,
-	SCE_NP_COMMERCE_ERROR_REQ_MAX                           = 0x80029408,
-	SCE_NP_COMMERCE_ERROR_REQ_NOT_FOUND                     = 0x80029409,
-	SCE_NP_COMMERCE_ERROR_REQID_NOT_AVAILABLE               = 0x8002940a,
-	SCE_NP_COMMERCE_ERROR_INVALID_CATEGORY_ID               = 0x8002940b,
-	SCE_NP_COMMERCE_ERROR_INVALID_LANG_CODE                 = 0x8002940c,
-	SCE_NP_COMMERCE_ERROR_REQ_BUSY                          = 0x8002940d,
-	SCE_NP_COMMERCE_ERROR_INSUFFICIENT_BUFFER               = 0x8002940e,
-	SCE_NP_COMMERCE_ERROR_INVALID_REQ_STATE                 = 0x8002940f,
-	SCE_NP_COMMERCE_ERROR_INVALID_CTX_STATE                 = 0x80029410,
-	SCE_NP_COMMERCE_ERROR_UNKNOWN                           = 0x80029411,
-	SCE_NP_COMMERCE_ERROR_INVALID_REQ_TYPE                  = 0x80029412,
-	SCE_NP_COMMERCE_ERROR_INVALID_MEMORY_CONTAINER          = 0x80029413,
-	SCE_NP_COMMERCE_ERROR_INSUFFICIENT_MEMORY_CONTAINER     = 0x80029414,
-	SCE_NP_COMMERCE_ERROR_INVALID_DATA_FLAG_TYPE            = 0x80029415,
-	SCE_NP_COMMERCE_ERROR_INVALID_DATA_FLAG_STATE           = 0x80029416,
-	SCE_NP_COMMERCE_ERROR_DATA_FLAG_NUM_NOT_FOUND           = 0x80029417,
-	SCE_NP_COMMERCE_ERROR_DATA_FLAG_INFO_NOT_FOUND          = 0x80029418,
-	SCE_NP_COMMERCE_ERROR_INVALID_PROVIDER_ID               = 0x80029419,
-	SCE_NP_COMMERCE_ERROR_INVALID_DATA_FLAG_NUM             = 0x8002941a,
-	SCE_NP_COMMERCE_ERROR_INVALID_SKU_ID                    = 0x8002941b,
-	SCE_NP_COMMERCE_ERROR_INVALID_DATA_FLAG_ID              = 0x8002941c,
-	SCE_NP_COMMERCE_ERROR_GPC_SEND_REQUEST                  = 0x8002941d,
-	SCE_NP_COMMERCE_ERROR_GDF_SEND_REQUEST                  = 0x8002941e,
-	SCE_NP_COMMERCE_ERROR_SDF_SEND_REQUEST                  = 0x8002941f,
-
-	SCE_NP_COMMERCE_ERROR_PARSE_PRODUCT_CATEGORY            = 0x80029421,
-	SCE_NP_COMMERCE_ERROR_CURRENCY_INFO_NOT_FOUND           = 0x80029422,
-	SCE_NP_COMMERCE_ERROR_CATEGORY_INFO_NOT_FOUND           = 0x80029423,
-	SCE_NP_COMMERCE_ERROR_CHILD_CATEGORY_COUNT_NOT_FOUND    = 0x80029424,
-	SCE_NP_COMMERCE_ERROR_CHILD_CATEGORY_INFO_NOT_FOUND     = 0x80029425,
-	SCE_NP_COMMERCE_ERROR_SKU_COUNT_NOT_FOUND               = 0x80029426,
-	SCE_NP_COMMERCE_ERROR_SKU_INFO_NOT_FOUND                = 0x80029427,
-	SCE_NP_COMMERCE_ERROR_PLUGIN_LOAD_FAILURE               = 0x80029428,
-	SCE_NP_COMMERCE_ERROR_INVALID_SKU_NUM                   = 0x80029429,
-	SCE_NP_COMMERCE_ERROR_INVALID_GPC_PROTOCOL_VERSION      = 0x8002942a,
-
-	SCE_NP_COMMERCE_ERROR_CHECKOUT_UNEXPECTED               = 0x80029430,
-	SCE_NP_COMMERCE_ERROR_CHECKOUT_OUT_OF_SERVICE           = 0x80029431,
-	SCE_NP_COMMERCE_ERROR_CHECKOUT_INVALID_SKU              = 0x80029432,
-	SCE_NP_COMMERCE_ERROR_CHECKOUT_SERVER_BUSY              = 0x80029433,
-	SCE_NP_COMMERCE_ERROR_CHECKOUT_MAINTENANCE              = 0x80029434,
-	SCE_NP_COMMERCE_ERROR_CHECKOUT_ACCOUNT_SUSPENDED        = 0x80029435,
-	SCE_NP_COMMERCE_ERROR_CHECKOUT_OVER_SPENDING_LIMIT      = 0x80029436,
-	SCE_NP_COMMERCE_ERROR_CHECKOUT_NOT_ENOUGH_MONEY         = 0x80029437,
-	SCE_NP_COMMERCE_ERROR_CHECKOUT_UNKNOWN                  = 0x80029438,
-
-	SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_UNKNOWN             = 0x80029600,
-	SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_INVALID_CREDENTIALS = 0x80029601,
-	SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_INVALID_CATEGORY_ID = 0x80029602,
-	SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_SERVICE_END         = 0x80029603,
-	SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_SERVICE_STOP        = 0x80029604,
-	SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_SERVICE_BUSY        = 0x80029605,
-	SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_UNSUPPORTED_VERSION = 0x80029606,
-	SCE_NP_COMMERCE_BROWSE_SERVER_ERROR_INTERNAL_SERVER     = 0x80029680,
-
-	SCE_NP_COMMERCE_GDF_SERVER_ERROR_UNKNOWN                = 0x80029d00,
-	SCE_NP_COMMERCE_GDF_SERVER_ERROR_INVALID_CREDENTIALS    = 0x80029d01,
-	SCE_NP_COMMERCE_GDF_SERVER_ERROR_INVALID_FLAGLIST       = 0x80029d02,
-	SCE_NP_COMMERCE_GDF_SERVER_ERROR_SERVICE_END            = 0x80029d03,
-	SCE_NP_COMMERCE_GDF_SERVER_ERROR_SERVICE_STOP           = 0x80029d04,
-	SCE_NP_COMMERCE_GDF_SERVER_ERROR_SERVICE_BUSY           = 0x80029d05,
-	SCE_NP_COMMERCE_GDF_SERVER_ERROR_UNSUPPORTED_VERSION    = 0x80029d06,
-
-	SCE_NP_COMMERCE_SDF_SERVER_ERROR_UNKNOWN                = 0x80029e00,
-	SCE_NP_COMMERCE_SDF_SERVER_ERROR_INVALID_CREDENTIALS    = 0x80029e01,
-	SCE_NP_COMMERCE_SDF_SERVER_ERROR_INVALID_FLAGLIST       = 0x80029e02,
-	SCE_NP_COMMERCE_SDF_SERVER_ERROR_SERVICE_END            = 0x80029e03,
-	SCE_NP_COMMERCE_SDF_SERVER_ERROR_SERVICE_STOP           = 0x80029e04,
-	SCE_NP_COMMERCE_SDF_SERVER_ERROR_SERVICE_BUSY           = 0x80029e05,
-	SCE_NP_COMMERCE_SDF_SERVER_ERROR_UNSUPPORTED_VERSION    = 0x80029e06,
-
 	// DRM
-	SCE_NP_DRM_ERROR_OUT_OF_MEMORY        = 0x80029501,
-	SCE_NP_DRM_ERROR_INVALID_PARAM        = 0x80029502,
-	SCE_NP_DRM_ERROR_SERVER_RESPONSE      = 0x80029509,
-	SCE_NP_DRM_ERROR_NO_ENTITLEMENT       = 0x80029513,
-	SCE_NP_DRM_ERROR_BAD_ACT              = 0x80029514,
-	SCE_NP_DRM_ERROR_BAD_FORMAT           = 0x80029515,
-	SCE_NP_DRM_ERROR_NO_LOGIN             = 0x80029516,
-	SCE_NP_DRM_ERROR_INTERNAL             = 0x80029517,
-	SCE_NP_DRM_ERROR_BAD_PERM             = 0x80029519,
-	SCE_NP_DRM_ERROR_UNKNOWN_VERSION      = 0x8002951a,
-	SCE_NP_DRM_ERROR_TIME_LIMIT           = 0x8002951b,
-	SCE_NP_DRM_ERROR_DIFFERENT_ACCOUNT_ID = 0x8002951c,
-	SCE_NP_DRM_ERROR_DIFFERENT_DRM_TYPE   = 0x8002951d,
-	SCE_NP_DRM_ERROR_SERVICE_NOT_STARTED  = 0x8002951e,
-	SCE_NP_DRM_ERROR_BUSY                 = 0x80029520,
-	SCE_NP_DRM_ERROR_LICENSE_NOT_FOUND    = 0x80029521,
-	SCE_NP_DRM_ERROR_IO                   = 0x80029525,
-	SCE_NP_DRM_ERROR_FORMAT               = 0x80029530,
-	SCE_NP_DRM_ERROR_FILENAME             = 0x80029533,
-	SCE_NP_DRM_ERROR_K_LICENSEE           = 0x80029534,
+	SCE_NP_DRM_ERROR_OUT_OF_MEMORY                      = 0x80029501,
+	SCE_NP_DRM_ERROR_INVALID_PARAM                      = 0x80029502,
+	SCE_NP_DRM_ERROR_SERVER_RESPONSE                    = 0x80029509,
+	SCE_NP_DRM_ERROR_NO_ENTITLEMENT                     = 0x80029513,
+	SCE_NP_DRM_ERROR_BAD_ACT                            = 0x80029514,
+	SCE_NP_DRM_ERROR_BAD_FORMAT                         = 0x80029515,
+	SCE_NP_DRM_ERROR_NO_LOGIN                           = 0x80029516,
+	SCE_NP_DRM_ERROR_INTERNAL                           = 0x80029517,
+	SCE_NP_DRM_ERROR_BAD_PERM                           = 0x80029519,
+	SCE_NP_DRM_ERROR_UNKNOWN_VERSION                    = 0x8002951a,
+	SCE_NP_DRM_ERROR_TIME_LIMIT                         = 0x8002951b,
+	SCE_NP_DRM_ERROR_DIFFERENT_ACCOUNT_ID               = 0x8002951c,
+	SCE_NP_DRM_ERROR_DIFFERENT_DRM_TYPE                 = 0x8002951d,
+	SCE_NP_DRM_ERROR_SERVICE_NOT_STARTED                = 0x8002951e,
+	SCE_NP_DRM_ERROR_BUSY                               = 0x80029520,
+	SCE_NP_DRM_ERROR_LICENSE_NOT_FOUND                  = 0x80029521,
+	SCE_NP_DRM_ERROR_IO                                 = 0x80029525,
+	SCE_NP_DRM_ERROR_FORMAT                             = 0x80029530,
+	SCE_NP_DRM_ERROR_FILENAME                           = 0x80029533,
+	SCE_NP_DRM_ERROR_K_LICENSEE                         = 0x80029534,
 
 	// DRM Server
 	SCE_NP_DRM_SERVER_ERROR_SERVICE_IS_END                 = 0x80029700,
@@ -373,7 +290,7 @@ enum SceNpError : u32
 	SCE_NP_AUTH_EBUSY             = 0x8002a00a,
 	SCE_NP_AUTH_EABORT            = 0x8002a00c,
 	SCE_NP_AUTH_EEXIST            = 0x8002a014,
-	SCE_NP_AUTH_EINVALID_ARGUMENT = 0x8002a015,
+	SCE_NP_AUTH_EINVALID_ARGUMENT =	0x8002a015,
 
 	// Auth extended
 	SCE_NP_AUTH_ERROR_SERVICE_END             = 0x8002a200,
@@ -535,230 +452,6 @@ enum SceNpError : u32
 	SCE_NP_CUSTOM_MENU_ERROR_NOT_REGISTERED      = 0x80023b0b,
 	SCE_NP_CUSTOM_MENU_ERROR_EXCEEDS_MAX         = 0x80023b0c,
 	SCE_NP_CUSTOM_MENU_ERROR_INVALID_CHARACTER   = 0x80023b0d,
-
-	// EULA
-	SCE_NP_EULA_ERROR_UNKNOWN                   = 0x8002e500,
-	SCE_NP_EULA_ERROR_INVALID_ARGUMENT          = 0x8002e501,
-	SCE_NP_EULA_ERROR_NOT_INITIALIZED           = 0x8002e502,
-	SCE_NP_EULA_ERROR_ALREADY_INITIALIZED       = 0x8002e503,
-	SCE_NP_EULA_ERROR_OUT_OF_MEMORY             = 0x8002e504,
-	SCE_NP_EULA_ERROR_BUSY                      = 0x8002e505,
-	SCE_NP_EULA_ERROR_EULA_NOT_FOUND            = 0x8002e5a0,
-	SCE_NP_EULA_ERROR_NET_OUT_OF_MEMORY         = 0x8002e5a1,
-	SCE_NP_EULA_ERROR_CONF_FORMAT               = 0x8002e5b0,
-	SCE_NP_EULA_ERROR_CONF_INVALID_FILENAME     = 0x8002e5b1,
-	SCE_NP_EULA_ERROR_CONF_TOO_MANY_EULA_FILES  = 0x8002e5b2,
-	SCE_NP_EULA_ERROR_CONF_INVALID_LANGUAGE     = 0x8002e5b3,
-	SCE_NP_EULA_ERROR_CONF_INVALID_COUNTRY      = 0x8002e5b4,
-	SCE_NP_EULA_ERROR_CONF_INVALID_NPCOMMID     = 0x8002e5b5,
-	SCE_NP_EULA_ERROR_CONF_INVALID_EULA_VERSION = 0x8002e5b6,
-
-	// Matching
-	SCE_NP_MATCHING_ERROR_NOT_INITIALIZED                  = 0x8002a701,
-	SCE_NP_MATCHING_ERROR_ALREADY_INITIALIZED              = 0x8002a702,
-	SCE_NP_MATCHING_ERROR_INVALID_ARG                      = 0x8002a703,
-	SCE_NP_MATCHING_ERROR_TERMINATED                       = 0x8002a704,
-	SCE_NP_MATCHING_ERROR_TIMEOUT                          = 0x8002a705,
-	SCE_NP_MATCHING_ERROR_OUT_OF_MEMORY                    = 0x8002a706,
-	SCE_NP_MATCHING_ERROR_CTXID_NOT_AVAIL                  = 0x8002a707,
-	SCE_NP_MATCHING_ERROR_CTX_ALREADY_EXIST                = 0x8002a708,
-	SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND                    = 0x8002a709,
-	SCE_NP_MATCHING_ERROR_LOBBY_NOT_FOUND                  = 0x8002a70a,
-	SCE_NP_MATCHING_ERROR_ROOM_NOT_FOUND                   = 0x8002a70b,
-	SCE_NP_MATCHING_ERROR_MEMBER_NOT_FOUND                 = 0x8002a70c,
-	SCE_NP_MATCHING_ERROR_TOO_BIG_VALUE                    = 0x8002a70d,
-	SCE_NP_MATCHING_ERROR_IVALID_ATTR_TYPE                 = 0x8002a70e,
-	SCE_NP_MATCHING_ERROR_INVALID_ATTR_ID                  = 0x8002a70f,
-	SCE_NP_MATCHING_ERROR_ALREADY_REQUESTED                = 0x8002a710,
-	SCE_NP_MATCHING_ERROR_LIMITTED_SEATING                 = 0x8002a711,
-	SCE_NP_MATCHING_ERROR_LOCKED                           = 0x8002a712,
-	SCE_NP_MATCHING_ERROR_CTX_STILL_RUNNING                = 0x8002a713,
-	SCE_NP_MATCHING_ERROR_INSUFFICIENT_BUFFER              = 0x8002a714,
-	SCE_NP_MATCHING_ERROR_REQUEST_NOT_ALLOWED              = 0x8002a715,
-	SCE_NP_MATCHING_ERROR_CTX_MAX                          = 0x8002a716,
-	SCE_NP_MATCHING_ERROR_INVALID_REQ_ID                   = 0x8002a717,
-	SCE_NP_MATCHING_ERROR_RESULT_NOT_FOUND                 = 0x8002a718,
-	SCE_NP_MATCHING_ERROR_BUSY                             = 0x8002a719,
-	SCE_NP_MATCHING_ERROR_ALREADY_JOINED_ROOM              = 0x8002a71a,
-	SCE_NP_MATCHING_ERROR_ROOM_MAX                         = 0x8002a71b,
-	SCE_NP_MATCHING_ERROR_QUICK_MATCH_PLAYER_NOT_FOUND     = 0x8002a71c,
-	SCE_NP_MATCHING_ERROR_COND_MAX                         = 0x8002a71d,
-	SCE_NP_MATCHING_ERROR_INVALID_COND                     = 0x8002a71e,
-	SCE_NP_MATCHING_ERROR_INVALID_ATTR                     = 0x8002a71f,
-	SCE_NP_MATCHING_ERROR_COMP_OP_INEQUALITY_MAX           = 0x8002a720,
-	SCE_NP_MATCHING_ERROR_RESULT_OVERFLOWED                = 0x8002a721,
-	SCE_NP_MATCHING_ERROR_HTTPXML_TIMEOUT                  = 0x8002a722,
-	SCE_NP_MATCHING_ERROR_CANCELED                         = 0x8002a723,
-	SCE_NP_MATCHING_ERROR_SEARCH_JOIN_ROOM_NOT_FOUND       = 0x8002a724,
-	SCE_NP_MATCHING_ERROR_INVALID_COMP_OP                  = 0x8002a725,
-	SCE_NP_MATCHING_ERROR_INVALID_COMP_TYPE                = 0x8002a726,
-	SCE_NP_MATCHING_ERROR_REQUEST_NOT_FOUND                = 0x8002a727,
-	SCE_NP_MATCHING_ERROR_INTERNAL_ERROR                   = 0x8002a728,
-	SCE_NP_MATCHING_ERROR_INVALID_PROTOCOL_ID              = 0x8002a729,
-	SCE_NP_MATCHING_ERROR_ATTR_NOT_SPECIFIED               = 0x8002a72a,
-	SCE_NP_MATCHING_ERROR_SYSUTIL_INVALID_RESULT           = 0x8002a72b,
-	SCE_NP_MATCHING_ERROR_PLUGIN_LOAD_FAILURE              = 0x8002a72c,
-	SCE_NP_MATCHING_ERROR_INVALID_ATTR_VALUE               = 0x8002a72d,
-	SCE_NP_MATCHING_ERROR_DUPLICATE                        = 0x8002a72e,
-	SCE_NP_MATCHING_ERROR_INVALID_MEMORY_CONTAINER         = 0x8002a72f,
-	SCE_NP_MATCHING_ERROR_SHUTDOWN                         = 0x8002a730,
-	SCE_NP_MATCHING_ERROR_SYSUTIL_SERVER_BUSY              = 0x8002a731,
-	SCE_NP_MATCHING_ERROR_SEND_INVITATION_PARTIALLY_FAILED = 0x8002a732,
-	SCE_NP_MATCHING_ERROR_UTILITY_UNAVAILABLE              = 0x8002a733,
-
-	SCE_NP_MATCHING_SERVER_ERROR_OUT_OF_SERVICE            = 0x8002a740,
-	SCE_NP_MATCHING_SERVER_ERROR_MAINTENANCE               = 0x8002a741,
-	SCE_NP_MATCHING_SERVER_ERROR_SERVER_BUSY               = 0x8002a742,
-	SCE_NP_MATCHING_SERVER_ERROR_ACCESS_FORBIDDEN          = 0x8002a743,
-	SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_SERVER            = 0x8002a744,
-	SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_LOBBY             = 0x8002a745,
-	SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_ROOM              = 0x8002a746,
-	SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_USER              = 0x8002a747,
-	SCE_NP_MATCHING_SERVER_ERROR_NOT_ALLOWED               = 0x8002a748,
-	SCE_NP_MATCHING_SERVER_ERROR_UNKNOWN                   = 0x8002a749,
-	SCE_NP_MATCHING_SERVER_ERROR_BAD_REQUEST_STANZA        = 0x8002a74a,
-	SCE_NP_MATCHING_SERVER_ERROR_REQUEST_FORBIDDEN         = 0x8002a74b,
-	SCE_NP_MATCHING_SERVER_ERROR_INTERNAL_ERROR            = 0x8002a74c,
-	SCE_NP_MATCHING_SERVER_ERROR_ROOM_OVER                 = 0x8002a74d,
-	SCE_NP_MATCHING_SERVER_ERROR_ROOM_CLOSED               = 0x8002a74e,
-};
-
-enum
-{
-	SCE_NP_COMMERCE_CURRENCY_CODE_LEN = 4,
-	SCE_NP_COMMERCE_CATEGORY_ID_LEN = 56,
-	SCE_NP_COMMERCE_CATEGORY_NAME_LEN = 192,
-	SCE_NP_COMMERCE_CATEGORY_DESCRIPTION_LEN = 384,
-	SCE_NP_COMMERCE_CATEGORY_IMAGEURL_LEN = 128,
-	SCE_NP_COMMERCE_PRODUCT_ID_LEN = 48,
-	SCE_NP_COMMERCE_PRODUCT_NAME_LEN = 192,
-	SCE_NP_COMMERCE_SKU_ID_LEN = 56,
-	SCE_NP_COMMERCE_SKU_NAME_LEN = 64,
-	SCE_NP_COMMERCE_SKU_DESCRIPTION_LEN = 384,
-	SCE_NP_COMMERCE_SKU_IMAGEURL_LEN = 128,
-	SCE_NP_COMMERCE_SKU_USER_DATA_LEN = 128,
-};
-
-enum
-{
-	SCE_NP_COMMERCE_EVENT_REQUEST_ERROR = 0x0001,
-	SCE_NP_COMMERCE_EVENT_PRODUCT_CATEGORY_READY = 0x0011,
-	SCE_NP_COMMERCE_EVENT_PRODUCT_CATEGORY_DONE = 0x0012,
-	SCE_NP_COMMERCE_EVENT_PRODUCT_CATEGORY_ABORT = 0x0013,
-	SCE_NP_COMMERCE_EVENT_DO_CHECKOUT_STARTED = 0x0021,
-	SCE_NP_COMMERCE_EVENT_DO_CHECKOUT_SUCCESS = 0x0022,
-	SCE_NP_COMMERCE_EVENT_DO_CHECKOUT_BACK = 0x0023,
-	SCE_NP_COMMERCE_EVENT_DO_CHECKOUT_FINISHED = 0x0025,
-};
-
-enum
-{
-	SCE_NP_MATCHING_EVENT_ERROR = 0x0001,
-	SCE_NP_MATCHING_EVENT_LEAVE_ROOM_DONE = 0x0002,
-	SCE_NP_MATCHING_EVENT_RESERVED1 = 0x0003,
-	SCE_NP_MATCHING_EVENT_RESERVED2 = 0x0004,
-	SCE_NP_MATCHING_EVENT_ROOM_UPDATE_NEW_MEMBER = 0x0005,
-	SCE_NP_MATCHING_EVENT_ROOM_UPDATE_MEMBER_LEAVE = 0x0006,
-	SCE_NP_MATCHING_EVENT_ROOM_DISAPPEARED = 0x0007,
-	SCE_NP_MATCHING_EVENT_RESERVED3 = 0x0008,
-	SCE_NP_MATCHING_EVENT_GET_ROOM_INFO_DONE = 0x0009,
-	SCE_NP_MATCHING_EVENT_SET_ROOM_INFO_DONE = 0x000a,
-	SCE_NP_MATCHING_EVENT_GRANT_OWNER_DONE = 0x000b,
-	SCE_NP_MATCHING_EVENT_ROOM_UPDATE_OWNER_CHANGE = 0x000c,
-	SCE_NP_MATCHING_EVENT_KICK_MEMBER_DONE = 0x000d,
-	SCE_NP_MATCHING_EVENT_ROOM_KICKED = 0x000e,
-	SCE_NP_MATCHING_EVENT_GET_ROOM_SEARCH_FLAG_DONE = 0x000f,
-	SCE_NP_MATCHING_EVENT_SET_ROOM_SEARCH_FLAG_DONE = 0x0010,
-};
-
-enum
-{
-	SCE_NP_MATCHING_ATTR_TYPE_BASIC_BIN = 1,
-	SCE_NP_MATCHING_ATTR_TYPE_BASIC_NUM = 2,
-	SCE_NP_MATCHING_ATTR_TYPE_GAME_BIN = 3,
-	SCE_NP_MATCHING_ATTR_TYPE_GAME_NUM = 4,
-};
-
-enum
-{
-	SCE_NP_MATCHING_ATTR_ID_MIN                         = 1,
-	SCE_NP_MATCHING_ATTR_ID_MAX                         = 16,
-	SCE_NP_MATCHING_ATTR_ID_FOR_SEARCH_CONDITION_MAX    = 8,
-	SCE_NP_MATCHING_ATTR_ID_FOR_GRLGLIMIT_SRCH_COND_MAX = 8,
-	SCE_NP_MATCHING_ATTR_BIN_BIG_SIZE_ID_MAX            = 2,
-	SCE_NP_MATCHING_ATTR_BIN_MAX_SIZE_SMALL             = 64,
-	SCE_NP_MATCHING_ATTR_BIN_MAX_SIZE_BIG               = 256,
-};
-
-enum
-{
-	SCE_NP_MATCHING_ROOM_ATTR_ID_TOTAL_SLOT = 1,
-	SCE_NP_MATCHING_ROOM_ATTR_ID_PRIVATE_SLOT = 2,
-	SCE_NP_MATCHING_ROOM_ATTR_ID_CUR_TOTAL_NUM = 3,
-	SCE_NP_MATCHING_ROOM_ATTR_ID_CUR_PUBLIC_NUM = 4,
-	SCE_NP_MATCHING_ROOM_ATTR_ID_CUR_PRIVATE_NUM = 5,
-	SCE_NP_MATCHING_ROOM_ATTR_ID_PRIVILEGE_TYPE = 6,
-	SCE_NP_MATCHING_ROOM_ATTR_ID_ROOM_SEARCH_FLAG = 7,
-	SCE_NP_MATCHING_ROOM_ATTR_ID_MAX = 8,
-};
-
-enum
-{
-	SCE_NP_MATCHING_ROOM_SLOT_TYPE_PUBLIC = 0,
-	SCE_NP_MATCHING_ROOM_SLOT_TYPE_PRIVATE = 1,
-};
-
-enum
-{
-	SCE_NP_MATCHING_ROOM_PRIVILEGE_TYPE_NO_AUTO_GRANT = 0,
-	SCE_NP_MATCHING_ROOM_PRIVILEGE_TYPE_AUTO_GRANT = 1,
-};
-
-enum
-{
-	SCE_NP_MATCHING_ROOM_SEARCH_FLAG_OPEN = 0,
-	SCE_NP_MATCHING_ROOM_SEARCH_FLAG_STEALTH = 1,
-};
-
-enum
-{
-	SCE_NP_MATCHING_COND_MAX               = 9,
-	SCE_NP_MATCHING_GRLG_LIMIT_COND_MAX    = 9,
-	SCE_NP_MATCHING_COMP_OP_INEQUALITY_MAX = 9,
-};
-
-enum
-{
-	SCE_NP_MATCHING_CONDITION_SEARCH_EQ = 0,
-	SCE_NP_MATCHING_CONDITION_SEARCH_NE = 1,
-	SCE_NP_MATCHING_CONDITION_SEARCH_LT = 2,
-	SCE_NP_MATCHING_CONDITION_SEARCH_LE = 3,
-	SCE_NP_MATCHING_CONDITION_SEARCH_GT = 4,
-	SCE_NP_MATCHING_CONDITION_SEARCH_GE = 5,
-	SCE_NP_MATCHING_CONDITION_SEARCH_MAX = 6,
-};
-
-enum
-{
-	SCE_NP_MATCHING_CONDITION_TYPE_VALUE = 0,
-};
-
-enum
-{
-	SCE_NP_MATCHING_INVITATION_DESTINATION_MAX = 12,
-	SCE_NP_MATCHING_INVITATION_SUBJECT_MAX_CHARS = 16,
-	SCE_NP_MATCHING_INVITATION_BODY_MAX_CHARS = 128,
-
-	SCE_NP_MATCHING_KICK_OPT_MAX_LENGTH = 16,
-
-	SCE_NP_MATCHING_ROOM_MAX_SLOT = 16,
-	SCE_NP_MATCHING_CTX_MAX = 8,
-};
-
-enum
-{
-	SCE_NP_MATCHING_SEND_INVITATION_MEMSIZE   = 16 * 1024 * 1024,
-	SCE_NP_MATCHING_ACCEPT_INVITATION_MEMSIZE = 16 * 1024 * 1024,
 };
 
 // Basic presence options
@@ -820,8 +513,7 @@ enum
 
 enum
 {
-	SCE_NP_PORT          = 3658,
-	SCE_NP_MIN_POOL_SIZE = 128 * 1024
+	SCE_NP_MIN_POOLSIZE = 128 * 1024
 };
 
 enum
@@ -835,17 +527,6 @@ enum : u64
 	SCE_NP_DRM_TIME_INFO_ENDLESS       = 0x7FFFFFFFFFFFFFFFULL
 };
 
-enum
-{
-	SCE_NP_MANAGER_SUB_SIGNIN_MAX = 3,
-};
-
-enum
-{
-	SCE_NP_MANAGER_SUB_SIGNIN_RESULT_OK     = 0,
-	SCE_NP_MANAGER_SUB_SIGNIN_RESULT_CANCEL = 1,
-};
-
 // NP Manager Utility statuses
 enum
 {
@@ -856,10 +537,7 @@ enum
 	SCE_NP_MANAGER_STATUS_ONLINE          = 3,
 };
 
-enum
-{
-	SCE_NP_MANAGER_EVENT_GOT_TICKET = 255
-};
+#define SCE_NP_MANAGER_EVENT_GOT_TICKET 255
 
 // Event types
 enum
@@ -897,7 +575,7 @@ enum
 enum : SceNpBasicAttachmentDataId
 {
 	SCE_NP_BASIC_INVALID_ATTACHMENT_DATA_ID = 0,
-	SCE_NP_BASIC_INVALID_MESSAGE_ID         = 0,
+	SCE_NP_BASIC_INVALID_MESSAGE_ID			= 0,
 	SCE_NP_BASIC_SELECTED_INVITATION_DATA   = 1,
 	SCE_NP_BASIC_SELECTED_MESSAGE_DATA      = 2,
 };
@@ -1058,7 +736,6 @@ enum
 	SCE_NP_UTIL_NPID_VERSION                 = 1,
 	SCE_NP_UTIL_NPLOBBYID_VERSION            = 1,
 	SCE_NP_UTIL_NPROOMID_VERSION             = 1,
-	SCE_NP_COMMERCE_VERSION                  = 1,
 };
 
 // Languages
@@ -1145,12 +822,6 @@ enum
 	SCE_NP_ENTITLEMENT_ID_SIZE   = 32,
 };
 
-enum
-{
-    SCE_NP_ENTITLEMENT_TYPE_NON_CONSUMABLE = 0,
-    SCE_NP_ENTITLEMENT_TYPE_CONSUMABLE     = 1
-};
-
 // Constants for ranking (score) functions and structures
 enum
 {
@@ -1205,44 +876,10 @@ enum
 	SCE_NP_MATCHING_GUI_EVENT_ACCEPT_INVITATION   = 0x0007,
 	SCE_NP_MATCHING_GUI_EVENT_COMMON_LOAD         = 0x0008,
 	SCE_NP_MATCHING_GUI_EVENT_COMMON_UNLOAD       = 0x0009,
-	SCE_NP_MATCHING_GUI_EVENT_GET_ROOM_LIST       = 0x000a,
+	SCE_NP_MATCHING_GUI_EVENT_RESERVED3           = 0x000a,
 	SCE_NP_MATCHING_GUI_EVENT_GET_ROOM_LIST_LIMIT = 0x000b
 };
 
-enum
-{
-	SCE_NP_TICKET_PARAM_SERIAL_ID          = 0,
-	SCE_NP_TICKET_PARAM_ISSUER_ID          = 1,
-	SCE_NP_TICKET_PARAM_ISSUED_DATE        = 2,
-	SCE_NP_TICKET_PARAM_EXPIRE_DATE        = 3,
-	SCE_NP_TICKET_PARAM_SUBJECT_ACCOUNT_ID = 4,
-	SCE_NP_TICKET_PARAM_SUBJECT_ONLINE_ID  = 5,
-	SCE_NP_TICKET_PARAM_SUBJECT_REGION     = 6,
-	SCE_NP_TICKET_PARAM_SUBJECT_DOMAIN     = 7,
-	SCE_NP_TICKET_PARAM_SERVICE_ID         = 8,
-	SCE_NP_TICKET_PARAM_SUBJECT_STATUS     = 9,
-	SCE_NP_TICKET_PARAM_STATUS_DURATION    = 10,
-	SCE_NP_TICKET_PARAM_SUBJECT_DOB        = 11,
-};
-
-enum
-{
-	SCE_NP_TICKET_SERIAL_ID_SIZE = 20,
-	SCE_NP_SUBJECT_REGION_SIZE   = 4,
-	SCE_NP_SUBJECT_DOMAIN_SIZE   = 4,
-	SCE_NP_SERVICE_ID_SIZE       = 24,
-};
-
-enum
-{
-	SCE_NP_LOOKUP_MAX_CTX_NUM = 32
-};
-
-enum
-{
-	SCE_NP_AUTH_OAUTH_REQUEST_ID_MAX = 4
-};
-
 struct SceNpDrmKey
 {
 	u8 keydata[16];
@@ -1363,7 +1000,7 @@ struct SceNpManagerCacheParam
 // Message attachment data
 struct SceNpBasicAttachmentData
 {
-	be_t<SceNpBasicAttachmentDataId> id;
+	be_t<u32> id; // SceNpBasicAttachmentDataId
 	be_t<u32> size;
 };
 
@@ -1374,7 +1011,7 @@ struct SceNpBasicExtendedAttachmentData
 	be_t<u64> msgId;
 	SceNpBasicAttachmentData data;
 	be_t<u32> userAction;
-	u8 markedAsUsed;
+	b8 markedAsUsed;
 	u8 reserved[3];
 };
 
@@ -1385,11 +1022,11 @@ struct SceNpBasicMessageDetails
 	be_t<u16> mainType;
 	be_t<u16> subType;
 	be_t<u32> msgFeatures;
-	vm::bptr<SceNpId> npids;
+	const SceNpId npids;
 	be_t<u32> count;
-	vm::bptr<char> subject;
-	vm::bptr<char> body;
-	vm::bptr<u8> data;
+	const s8 subject;
+	const s8 body;
+	const be_t<u32> data;
 	be_t<u32> size;
 };
 
@@ -1463,22 +1100,9 @@ struct SceNpScoreRankData
 	be_t<u32> serialRank;
 	be_t<u32> rank;
 	be_t<u32> highestRank;
+	be_t<s64> scoreValue;
 	be_t<s32> hasGameData;
 	u8 pad0[4];
-	be_t<s64> scoreValue;
-	CellRtcTick recordDate;
-};
-
-// Version of SceNpScoreRankData that was deprecated in 180.002
-struct SceNpScoreRankData_deprecated
-{
-	SceNpId npId;
-	SceNpOnlineName onlineName;
-	be_t<u32> serialRank;
-	be_t<u32> rank;
-	be_t<u32> highestRank;
-	be_t<s32> hasGameData;
-	be_t<s64> scoreValue;
 	CellRtcTick recordDate;
 };
 
@@ -1490,14 +1114,6 @@ struct SceNpScorePlayerRankData
 	SceNpScoreRankData rankData;
 };
 
-// Version of SceNpScorePlayerRankData that was deprecated in 180.002
-struct SceNpScorePlayerRankData_deprecated
-{
-	be_t<s32> hasData;
-	u8 pad0[4];
-	SceNpScoreRankData_deprecated rankData;
-};
-
 // Scoreboard information
 struct SceNpScoreBoardInfo
 {
@@ -1587,7 +1203,7 @@ struct SceNpSignalingNetInfo
 struct SceNpCustomMenuAction
 {
 	be_t<u32> options;
-	vm::bcptr<char> name;
+	char name[SCE_NP_CUSTOM_MENU_ACTION_CHARACTER_MAX];
 	be_t<SceNpCustomMenuActionMask> mask;
 };
 
@@ -1615,7 +1231,7 @@ struct SceNpCommerceProductCategory
 {
 	be_t<u32> version;
 	vm::bcptr<void> data;
-	be_t<u32> dataSize;
+	be_t<u64> dataSize;
 	be_t<u32> dval;
 	u8 reserved[16];
 };
@@ -1697,7 +1313,7 @@ struct SceNpMatchingAttr
 		struct
 		{
 			vm::bptr<void> ptr;
-			be_t<u32> size;
+			be_t<u64> size;
 		} data;
 	} value;
 };
@@ -1720,71 +1336,18 @@ struct SceNpMatchingReqRange
 
 struct SceNpScoreVariableSizeGameInfo
 {
-	be_t<u32> infoSize;
+	be_t<u64> infoSize;
 	u8 data[SCE_NP_SCORE_VARIABLE_SIZE_GAMEINFO_MAXSIZE];
 	u8 pad[3];
 };
 
 struct SceNpScoreRecordOptParam
 {
-	be_t<u32> size;
+	be_t<u64> size;
 	vm::bptr<SceNpScoreVariableSizeGameInfo> vsInfo;
 	vm::bptr<CellRtcTick> reserved;
 };
 
-// Old GUI API structures
-
-struct SceNpMatchingRoomMember
-{
-	vm::bptr<SceNpMatchingRoomMember> next;
-	SceNpUserInfo user_info;
-	be_t<s32> owner;
-};
-
-struct SceNpMatchingRoomStatus
-{
-	SceNpRoomId id;
-	vm::bptr<SceNpMatchingRoomMember> members;
-	be_t<s32> num;
-	vm::bptr<SceNpId> kick_actor;
-	vm::bptr<void> opt;
-	be_t<s32> opt_len;
-};
-
-struct SceNpMatchingJoinedRoomInfo
-{
-	SceNpLobbyId lobbyid;
-	SceNpMatchingRoomStatus room_status;
-};
-
-struct SceNpMatchingRange
-{
-	be_t<u32> start;
-	be_t<u32> results;
-	be_t<u32> total;
-};
-
-struct SceNpMatchingRoom
-{
-	vm::bptr<SceNpMatchingRoom> next;
-	SceNpRoomId id;
-	vm::bptr<SceNpMatchingAttr> attr;
-};
-
-struct SceNpMatchingRoomList
-{
-	SceNpLobbyId lobbyid;
-	SceNpMatchingRange range;
-	vm::bptr<SceNpMatchingRoom> head;
-};
-
-struct SceNpMatchingSearchJoinRoomInfo
-{
-	SceNpLobbyId lobbyid;
-	SceNpMatchingRoomStatus room_status;
-	vm::bptr<SceNpMatchingAttr> attr;
-};
-
 // NP callback functions
 using SceNpCustomMenuEventHandler = s32(s32 retCode, u32 index, vm::cptr<SceNpId> npid, SceNpCustomMenuSelectedType type, vm::ptr<void> arg);
 using SceNpBasicEventHandler = s32(s32 event, s32 retCode, u32 reqId, vm::ptr<void> arg);
@@ -1796,60 +1359,3 @@ using SceNpMatchingGUIHandler = void(u32 ctx_id, s32 event, s32 error_code, vm::
 using SceNpProfileResultHandler = s32(s32 result, vm::ptr<void> arg);
 
 using SceNpManagerSubSigninCallback = void(s32 result, vm::ptr<SceNpId> npId, vm::ptr<void> cb_arg);
-
-// Used to pass data to UI/RPCN
-struct message_data
-{
-	SceNpCommunicationId commId{};
-	u64 msgId = 0;
-	u16 mainType = 0;
-	u16 subType = 0;
-	u32 msgFeatures = 0;
-	std::string subject;
-	std::string body;
-	std::vector<u8> data;
-	void print() const;
-};
-
-struct np_state
-{
-	atomic_t<bool> abort_gui_flag = false;
-};
-
-namespace rpcn
-{
-	class rpcn_client;
-}
-
-class SendMessageDialogBase
-{
-public:
-	virtual ~SendMessageDialogBase() = default;
-
-	virtual error_code Exec(message_data& msg_data, std::set<std::string>& npids) = 0;
-	virtual void callback_handler(rpcn::NotificationType ntype, const std::string& username, bool status) = 0;
-
-protected:
-	std::shared_ptr<rpcn::rpcn_client> m_rpcn;
-};
-
-class RecvMessageDialogBase
-{
-public:
-	virtual ~RecvMessageDialogBase() = default;
-
-	virtual error_code Exec(SceNpBasicMessageMainType type, SceNpBasicMessageRecvOptions options, SceNpBasicMessageRecvAction& recv_result, u64& chosen_msg_id) = 0;
-	virtual void callback_handler(const shared_ptr<std::pair<std::string, message_data>> new_msg, u64 msg_id) = 0;
-
-protected:
-	std::shared_ptr<rpcn::rpcn_client> m_rpcn;
-};
-
-// Generic functions, also used in SceNpMatchingInt.cpp
-error_code matching_create_room(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg);
-error_code matching_join_room(u32 ctx_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg);
-error_code matching_get_room_list(u32 ctx_id, vm::ptr<SceNpCommunicationId> communicationId, vm::ptr<SceNpMatchingReqRange> range, vm::ptr<SceNpMatchingSearchCondition> cond,
-	vm::ptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg, bool limit);
-error_code matching_set_room_info(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr, vm::ptr<u32> req_id, bool limit);
-error_code matching_get_room_info(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr, vm::ptr<u32> req_id, bool limit);
-error_code matching_get_room_member_list(u32 ctx_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<u32> buflen, vm::ptr<void> buf);
diff --git a/rpcs3/Emu/Cell/Modules/sceNp2.cpp b/rpcs3/Emu/Cell/Modules/sceNp2.cpp
index ed4655ccd4..8cb1023be9 100644
--- a/rpcs3/Emu/Cell/Modules/sceNp2.cpp
+++ b/rpcs3/Emu/Cell/Modules/sceNp2.cpp
@@ -6,8 +6,6 @@
 #include "sceNp2.h"
 #include "Emu/NP/np_handler.h"
 #include "Emu/NP/np_contexts.h"
-#include "Emu/NP/np_helpers.h"
-#include "Emu/NP/signaling_handler.h"
 #include "cellSysutil.h"
 
 LOG_CHANNEL(sceNp2);
@@ -176,18 +174,18 @@ void fmt_class_string<SceNpOauthError>::format(std::string& out, u64 arg)
 	});
 }
 
-error_code sceNpMatching2Init2(u32 stackSize, s32 priority, vm::ptr<SceNpMatching2UtilityInitParam> param);
+error_code sceNpMatching2Init2(u64 stackSize, s32 priority, vm::ptr<SceNpMatching2UtilityInitParam> param);
 error_code sceNpMatching2Term(ppu_thread& ppu);
 error_code sceNpMatching2Term2();
 
-error_code generic_match2_error_check(const named_thread<np::np_handler>& nph, SceNpMatching2ContextId ctxId, vm::cptr<void> reqParam)
+error_code generic_match2_error_check(const named_thread<np_handler>& nph, SceNpMatching2ContextId ctxId, vm::cptr<void> reqParam, vm::ptr<SceNpMatching2RequestId> assignedReqId)
 {
 	if (!nph.is_NP2_Match2_init)
 	{
 		return SCE_NP_MATCHING2_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!reqParam)
+	if (!reqParam || !assignedReqId)
 	{
 		return SCE_NP_MATCHING2_ERROR_INVALID_ARGUMENT;
 	}
@@ -209,7 +207,7 @@ error_code sceNp2Init(u32 poolsize, vm::ptr<void> poolptr)
 {
 	sceNp2.warning("sceNp2Init(poolsize=0x%x, poolptr=*0x%x)", poolsize, poolptr);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	{
 		std::lock_guard lock(nph.mutex_status);
@@ -237,11 +235,11 @@ error_code sceNpMatching2Init(u32 stackSize, s32 priority)
 	return sceNpMatching2Init2(stackSize, priority, vm::null); // > SDK 2.4.0
 }
 
-error_code sceNpMatching2Init2(u32 stackSize, s32 priority, vm::ptr<SceNpMatching2UtilityInitParam> param)
+error_code sceNpMatching2Init2(u64 stackSize, s32 priority, vm::ptr<SceNpMatching2UtilityInitParam> param)
 {
-	sceNp2.warning("sceNpMatching2Init2(stackSize=0x%x, priority=%d, param=*0x%x)", stackSize, priority, param);
+	sceNp2.todo("sceNpMatching2Init2(stackSize=0x%x, priority=%d, param=*0x%x)", stackSize, priority, param);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_init)
 	{
@@ -267,7 +265,7 @@ error_code sceNp2Term(ppu_thread& ppu)
 {
 	sceNp2.warning("sceNp2Term()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	{
 		std::lock_guard lock(nph.mutex_status);
@@ -297,7 +295,7 @@ error_code sceNpMatching2Term2()
 {
 	sceNp2.warning("sceNpMatching2Term2()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	{
 		std::lock_guard lock(nph.mutex_status);
@@ -314,19 +312,16 @@ error_code sceNpMatching2Term2()
 		nph.is_NP2_Match2_init = false;
 	}
 
-	idm::clear<match2_ctx>();
-
-	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-	sigh.clear_match2_ctx();
+	// TODO: for all contexts: sceNpMatching2DestroyContext
 
 	return CELL_OK;
 }
 
 error_code sceNpMatching2DestroyContext(SceNpMatching2ContextId ctxId)
 {
-	sceNp2.warning("sceNpMatching2DestroyContext(ctxId=%d)", ctxId);
+	sceNp2.todo("sceNpMatching2DestroyContext(ctxId=%d)", ctxId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -336,9 +331,6 @@ error_code sceNpMatching2DestroyContext(SceNpMatching2ContextId ctxId)
 	if (!destroy_match2_context(ctxId))
 		return SCE_NP_MATCHING2_ERROR_CONTEXT_NOT_FOUND;
 
-	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-	sigh.remove_match2_ctx(ctxId);
-
 	return CELL_OK;
 }
 
@@ -347,8 +339,8 @@ error_code sceNpMatching2LeaveLobby(
 {
 	sceNp2.todo("sceNpMatching2LeaveLobby(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -360,7 +352,7 @@ error_code sceNpMatching2RegisterLobbyMessageCallback(SceNpMatching2ContextId ct
 {
 	sceNp2.todo("sceNpMatching2RegisterLobbyMessageCallback(ctxId=%d, cbFunc=*0x%x, cbFuncArg=*0x%x)", ctxId, cbFunc, cbFuncArg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -375,8 +367,8 @@ error_code sceNpMatching2GetWorldInfoList(
 {
 	sceNp2.warning("sceNpMatching2GetWorldInfoList(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -386,12 +378,7 @@ error_code sceNpMatching2GetWorldInfoList(
 		return SCE_NP_MATCHING2_ERROR_INVALID_SERVER_ID;
 	}
 
-	const u32 request_id = nph.get_world_list(ctxId, optParam, reqParam->serverId);
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
+	*assignedReqId = nph.get_world_list(ctxId, optParam, reqParam->serverId);
 
 	return CELL_OK;
 }
@@ -400,7 +387,7 @@ error_code sceNpMatching2RegisterLobbyEventCallback(SceNpMatching2ContextId ctxI
 {
 	sceNp2.todo("sceNpMatching2RegisterLobbyEventCallback(ctxId=%d, cbFunc=*0x%x, cbFuncArg=*0x%x)", ctxId, cbFunc, cbFuncArg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -415,8 +402,8 @@ error_code sceNpMatching2GetLobbyMemberDataInternalList(SceNpMatching2ContextId
 {
 	sceNp2.todo("sceNpMatching2GetLobbyMemberDataInternalList(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -429,28 +416,23 @@ error_code sceNpMatching2SearchRoom(
 {
 	sceNp2.warning("sceNpMatching2SearchRoom(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.search_room(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
+	*assignedReqId = nph.search_room(ctxId, optParam, reqParam.get_ptr());
 
 	return CELL_OK;
 }
 
 error_code sceNpMatching2SignalingGetConnectionStatus(
-    SceNpMatching2ContextId ctxId, SceNpMatching2RoomId roomId, SceNpMatching2RoomMemberId memberId, vm::ptr<s32> connStatus, vm::ptr<np_in_addr> peerAddr, vm::ptr<np_in_port_t> peerPort)
+    SceNpMatching2ContextId ctxId, SceNpMatching2RoomId roomId, SceNpMatching2RoomMemberId memberId, vm::ptr<int> connStatus, vm::ptr<np_in_addr> peerAddr, vm::ptr<np_in_port_t> peerPort)
 {
 	sceNp2.warning("sceNpMatching2SignalingGetConnectionStatus(ctxId=%d, roomId=%d, memberId=%d, connStatus=*0x%x, peerAddr=*0x%x, peerPort=*0x%x)", ctxId, roomId, memberId, connStatus, peerAddr, peerPort);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -462,47 +444,20 @@ error_code sceNpMatching2SignalingGetConnectionStatus(
 		return SCE_NP_MATCHING2_ERROR_INVALID_ARGUMENT;
 	}
 
-	auto [res, npid] = nph.local_get_npid(roomId, memberId);
-
-	if (res)
-	{
-		*connStatus = SCE_NP_SIGNALING_CONN_STATUS_INACTIVE;
-		return res;
-	}
-
-	if (np::is_same_npid(nph.get_npid(), *npid))
-	{
-		*connStatus = SCE_NP_SIGNALING_CONN_STATUS_INACTIVE;
-		return SCE_NP_SIGNALING_ERROR_OWN_NP_ID;
-	}
-
 	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
 
-	auto conn_id = sigh.get_conn_id_from_npid(*npid);
-	if (!conn_id)
-	{
-		*connStatus = SCE_NP_SIGNALING_CONN_STATUS_INACTIVE;
-		return SCE_NP_SIGNALING_ERROR_CONN_NOT_FOUND;
-	}
+	const auto si = sigh.get_sig2_infos(roomId, memberId);
 
-	const auto si = sigh.get_sig_infos(*conn_id);
-
-	if (!si)
-	{
-		*connStatus = SCE_NP_SIGNALING_CONN_STATUS_INACTIVE;
-		return SCE_NP_SIGNALING_ERROR_CONN_NOT_FOUND;
-	}
-
-	*connStatus = si->conn_status;
+	*connStatus = si.connStatus;
 
 	if (peerAddr)
 	{
-		(*peerAddr).np_s_addr = si->addr; // infos.addr is already BE
+		(*peerAddr).np_s_addr = si.addr; // infos.addr is already BE
 	}
 
 	if (peerPort)
 	{
-		*peerPort = si->port;
+		*peerPort = si.port;
 	}
 
 	return CELL_OK;
@@ -511,21 +466,14 @@ error_code sceNpMatching2SignalingGetConnectionStatus(
 error_code sceNpMatching2SetUserInfo(
     SceNpMatching2ContextId ctxId, vm::cptr<SceNpMatching2SetUserInfoRequest> reqParam, vm::cptr<SceNpMatching2RequestOptParam> optParam, vm::ptr<SceNpMatching2RequestId> assignedReqId)
 {
-	sceNp2.warning("sceNpMatching2SetUserInfo(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
+	sceNp2.todo("sceNpMatching2SetUserInfo(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.set_userinfo(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
-
 	return CELL_OK;
 }
 
@@ -533,7 +481,7 @@ error_code sceNpMatching2GetClanLobbyId(SceNpMatching2ContextId ctxId, SceNpClan
 {
 	sceNp2.todo("sceNpMatching2GetClanLobbyId(ctxId=%d, clanId=%d, lobbyId=*0x%x)", ctxId, clanId, lobbyId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -548,8 +496,8 @@ error_code sceNpMatching2GetLobbyMemberDataInternal(
 {
 	sceNp2.todo("sceNpMatching2GetLobbyMemberDataInternal(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -561,7 +509,7 @@ error_code sceNpMatching2ContextStart(SceNpMatching2ContextId ctxId)
 {
 	sceNp2.warning("sceNpMatching2ContextStart(ctxId=%d)", ctxId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -572,14 +520,11 @@ error_code sceNpMatching2ContextStart(SceNpMatching2ContextId ctxId)
 	if (!ctx)
 		return SCE_NP_MATCHING2_ERROR_CONTEXT_NOT_FOUND;
 
-	if (!ctx->started.compare_and_swap_test(0, 1))
-		return SCE_NP_MATCHING2_ERROR_CONTEXT_ALREADY_STARTED;
-
 	if (ctx->context_callback)
 	{
-		sysutil_register_cb([=, context_callback = ctx->context_callback, context_callback_param = ctx->context_callback_param](ppu_thread& cb_ppu) -> s32
+		sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
 		{
-			context_callback(cb_ppu, ctxId, SCE_NP_MATCHING2_CONTEXT_EVENT_Start, SCE_NP_MATCHING2_EVENT_CAUSE_CONTEXT_ACTION, 0, context_callback_param);
+			ctx->context_callback(cb_ppu, ctxId, SCE_NP_MATCHING2_CONTEXT_EVENT_Start, SCE_NP_MATCHING2_EVENT_CAUSE_CONTEXT_ACTION, 0, ctx->context_callback_param);
 			return 0;
 		});
 	}
@@ -592,8 +537,8 @@ error_code sceNpMatching2CreateServerContext(
 {
 	sceNp2.warning("sceNpMatching2CreateServerContext(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -603,12 +548,7 @@ error_code sceNpMatching2CreateServerContext(
 		return SCE_NP_MATCHING2_ERROR_INVALID_SERVER_ID;
 	}
 
-	const u32 request_id = nph.create_server_context(ctxId, optParam, reqParam->serverId);
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
+	*assignedReqId = nph.create_server_context(ctxId, optParam, reqParam->serverId);
 
 	return CELL_OK;
 }
@@ -617,7 +557,7 @@ error_code sceNpMatching2GetMemoryInfo(vm::ptr<SceNpMatching2MemoryInfo> memInfo
 {
 	sceNp2.todo("sceNpMatching2GetMemoryInfo(memInfo=*0x%x)", memInfo);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -632,18 +572,13 @@ error_code sceNpMatching2LeaveRoom(
 {
 	sceNp2.warning("sceNpMatching2LeaveRoom(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.leave_room(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
+	*assignedReqId = nph.leave_room(ctxId, optParam, reqParam.get_ptr());
 
 	return CELL_OK;
 }
@@ -653,18 +588,13 @@ error_code sceNpMatching2SetRoomDataExternal(
 {
 	sceNp2.warning("sceNpMatching2SetRoomDataExternal(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.set_roomdata_external(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
+	*assignedReqId = nph.set_roomdata_external(ctxId, optParam, reqParam.get_ptr());
 
 	return CELL_OK;
 }
@@ -672,77 +602,44 @@ error_code sceNpMatching2SetRoomDataExternal(
 error_code sceNpMatching2SignalingGetConnectionInfo(
     SceNpMatching2ContextId ctxId, SceNpMatching2RoomId roomId, SceNpMatching2RoomMemberId memberId, s32 code, vm::ptr<SceNpSignalingConnectionInfo> connInfo)
 {
-	sceNp2.warning("sceNpMatching2SignalingGetConnectionInfo(ctxId=%d, roomId=%d, memberId=%d, code=%d, connInfo=*0x%x)", ctxId, roomId, memberId, code, connInfo);
+	sceNp2.todo("sceNpMatching2SignalingGetConnectionInfo(ctxId=%d, roomId=%d, memberId=%d, code=%d, connInfo=*0x%x)", ctxId, roomId, memberId, code, connInfo);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
 		return SCE_NP_MATCHING2_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!connInfo)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto [res, npid] = nph.local_get_npid(roomId, memberId);
-
-	if (res)
-		return res;
-
-	if (np::is_same_npid(nph.get_npid(), *npid))
-		return SCE_NP_SIGNALING_ERROR_OWN_NP_ID;
-
-	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-
-	auto conn_id = sigh.get_conn_id_from_npid(*npid);
-	if (!conn_id)
-		return SCE_NP_SIGNALING_ERROR_CONN_NOT_FOUND;
-
-	const auto si = sigh.get_sig_infos(*conn_id);
-
-	if (!si)
-		return SCE_NP_SIGNALING_ERROR_CONN_NOT_FOUND;
-
 	switch (code)
 	{
-		case SCE_NP_SIGNALING_CONN_INFO_RTT:
+		case 1:
 		{
-			connInfo->rtt = si->rtt;
-			sceNp2.warning("Returning a RTT of %d microseconds", connInfo->rtt);
+			connInfo->rtt = 20000; // HACK
 			break;
 		}
-		case SCE_NP_SIGNALING_CONN_INFO_BANDWIDTH:
+		case 2:
 		{
-			connInfo->bandwidth = 100'000'000; // 100 MBPS HACK
+			connInfo->bandwidth = 10'000'000; // 10 MBPS HACK
 			break;
 		}
-		case SCE_NP_SIGNALING_CONN_INFO_PEER_NPID:
+		case 5:
 		{
-			connInfo->npId = si->npid;
+			auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
+			const auto si = sigh.get_sig2_infos(roomId, memberId);
+			connInfo->address.port = std::bit_cast<u16, be_t<u16>>(si.port);
+			connInfo->address.addr.np_s_addr = si.addr;
 			break;
 		}
-		case SCE_NP_SIGNALING_CONN_INFO_PEER_ADDRESS:
+		case 6:
 		{
-			connInfo->address.port = std::bit_cast<u16, be_t<u16>>(si->port);
-			connInfo->address.addr.np_s_addr = si->addr;
-			break;
-		}
-		case SCE_NP_SIGNALING_CONN_INFO_MAPPED_ADDRESS:
-		{
-			connInfo->address.port = std::bit_cast<u16, be_t<u16>>(si->mapped_port);
-			connInfo->address.addr.np_s_addr = si->mapped_addr;
-			break;
-		}
-		case SCE_NP_SIGNALING_CONN_INFO_PACKET_LOSS:
-		{
-			connInfo->packet_loss = 0; // HACK
+			connInfo->packet_loss = 1; // HACK
 			break;
 		}
 		default:
 		{
-			return SCE_NP_MATCHING2_ERROR_INVALID_ARGUMENT;
+			sceNp2.fatal("sceNpMatching2SignalingGetConnectionInfo Unimplemented code: %d", code);
+			return CELL_OK;
 		}
 	}
 
@@ -752,20 +649,15 @@ error_code sceNpMatching2SignalingGetConnectionInfo(
 error_code sceNpMatching2SendRoomMessage(
     SceNpMatching2ContextId ctxId, vm::cptr<SceNpMatching2SendRoomMessageRequest> reqParam, vm::cptr<SceNpMatching2RequestOptParam> optParam, vm::ptr<SceNpMatching2RequestId> assignedReqId)
 {
-	sceNp2.warning("sceNpMatching2SendRoomMessage(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
+	sceNp2.todo("sceNpMatching2SendRoomMessage(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.send_room_message(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
+	*assignedReqId = nph.send_room_message(ctxId, optParam, reqParam.get_ptr());
 
 	return CELL_OK;
 }
@@ -775,8 +667,8 @@ error_code sceNpMatching2JoinLobby(
 {
 	sceNp2.todo("sceNpMatching2JoinLobby(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -789,8 +681,8 @@ error_code sceNpMatching2GetRoomMemberDataExternalList(SceNpMatching2ContextId c
 {
 	sceNp2.todo("sceNpMatching2GetRoomMemberDataExternalList(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -800,28 +692,15 @@ error_code sceNpMatching2GetRoomMemberDataExternalList(SceNpMatching2ContextId c
 
 error_code sceNpMatching2AbortRequest(SceNpMatching2ContextId ctxId, SceNpMatching2RequestId reqId)
 {
-	sceNp2.warning("sceNpMatching2AbortRequest(ctxId=%d, reqId=%d)", ctxId, reqId);
+	sceNp2.todo("sceNpMatching2AbortRequest(ctxId=%d, reqId=%d)", ctxId, reqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
 		return SCE_NP_MATCHING2_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!ctxId)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_CONTEXT_ID;
-	}
-
-	if (!check_match2_context(ctxId))
-	{
-		return SCE_NP_MATCHING2_ERROR_CONTEXT_NOT_FOUND;
-	}
-
-	if (!nph.abort_request(reqId))
-		return SCE_NP_MATCHING2_ERROR_REQUEST_NOT_FOUND;
-
 	return CELL_OK;
 }
 
@@ -830,27 +709,22 @@ error_code sceNpMatching2GetServerInfo(
 {
 	sceNp2.warning("sceNpMatching2GetServerInfo(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.get_server_status(ctxId, optParam, reqParam->serverId);
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
+	*assignedReqId = nph.get_server_status(ctxId, optParam, reqParam->serverId);
 
 	return CELL_OK;
 }
 
-error_code sceNpMatching2GetEventData(SceNpMatching2ContextId ctxId, SceNpMatching2EventKey eventKey, vm::ptr<void> buf, u32 bufLen)
+error_code sceNpMatching2GetEventData(SceNpMatching2ContextId ctxId, SceNpMatching2EventKey eventKey, vm::ptr<void> buf, u64 bufLen)
 {
 	sceNp2.notice("sceNpMatching2GetEventData(ctxId=%d, eventKey=%d, buf=*0x%x, bufLen=%d)", ctxId, eventKey, buf, bufLen);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -862,49 +736,20 @@ error_code sceNpMatching2GetEventData(SceNpMatching2ContextId ctxId, SceNpMatchi
 		return SCE_NP_MATCHING2_ERROR_INVALID_ARGUMENT;
 	}
 
-	return not_an_error(nph.get_match2_event(eventKey, buf.addr(), bufLen));
+	return not_an_error(nph.get_match2_event(eventKey, static_cast<u8 *>(buf.get_ptr()), bufLen));
 }
 
 error_code sceNpMatching2GetRoomSlotInfoLocal(SceNpMatching2ContextId ctxId, const SceNpMatching2RoomId roomId, vm::ptr<SceNpMatching2RoomSlotInfo> roomSlotInfo)
 {
-	sceNp2.notice("sceNpMatching2GetRoomSlotInfoLocal(ctxId=%d, roomId=%d, roomSlotInfo=*0x%x)", ctxId, roomId, roomSlotInfo);
+	sceNp2.todo("sceNpMatching2GetRoomSlotInfoLocal(ctxId=%d, roomId=%d, roomSlotInfo=*0x%x)", ctxId, roomId, roomSlotInfo);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
 		return SCE_NP_MATCHING2_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!roomSlotInfo)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_ARGUMENT;
-	}
-
-	if (!ctxId)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_CONTEXT_ID;
-	}
-
-	if (!roomId)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_ROOM_ID;
-	}
-
-	if (!check_match2_context(ctxId))
-	{
-		return SCE_NP_MATCHING2_ERROR_CONTEXT_NOT_FOUND;
-	}
-
-	const auto [error, slots] = nph.local_get_room_slots(roomId);
-
-	if (error)
-	{
-		return error;
-	}
-
-	memcpy(roomSlotInfo.get_ptr(), &slots.value(), sizeof(SceNpMatching2RoomSlotInfo));
-
 	return CELL_OK;
 }
 
@@ -913,8 +758,8 @@ error_code sceNpMatching2SendLobbyChatMessage(
 {
 	sceNp2.todo("sceNpMatching2SendLobbyChatMessage(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -926,7 +771,7 @@ error_code sceNpMatching2AbortContextStart(SceNpMatching2ContextId ctxId)
 {
 	sceNp2.todo("sceNpMatching2AbortContextStart(ctxId=%d)", ctxId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -938,53 +783,16 @@ error_code sceNpMatching2AbortContextStart(SceNpMatching2ContextId ctxId)
 
 error_code sceNpMatching2GetRoomMemberIdListLocal(SceNpMatching2ContextId ctxId, SceNpMatching2RoomId roomId, s32 sortMethod, vm::ptr<SceNpMatching2RoomMemberId> memberId, u32 memberIdNum)
 {
-	sceNp2.notice("sceNpMatching2GetRoomMemberIdListLocal(ctxId=%d, roomId=%d, sortMethod=%d, memberId=*0x%x, memberIdNum=%d)", ctxId, roomId, sortMethod, memberId, memberIdNum);
+	sceNp2.todo("sceNpMatching2GetRoomMemberIdListLocal(ctxId=%d, roomId=%d, sortMethod=%d, memberId=*0x%x, memberIdNum=%d)", ctxId, roomId, sortMethod, memberId, memberIdNum);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
 		return SCE_NP_MATCHING2_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!ctxId)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_CONTEXT_ID;
-	}
-
-	if (!roomId)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_ROOM_ID;
-	}
-
-	if (sortMethod != SCE_NP_MATCHING2_SORT_METHOD_JOIN_DATE && sortMethod != SCE_NP_MATCHING2_SORT_METHOD_SLOT_NUMBER)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_SORT_METHOD;
-	}
-
-	if (!check_match2_context(ctxId))
-	{
-		return SCE_NP_MATCHING2_ERROR_CONTEXT_NOT_FOUND;
-	}
-
-	const auto [error, vec_memberids] = nph.local_get_room_memberids(roomId, sortMethod);
-
-	if (error)
-	{
-		return error;
-	}
-
-	u32 num_members = std::min(memberIdNum, static_cast<u32>(vec_memberids.size()));
-
-	if (memberId)
-	{
-		for (u32 i = 0; i < num_members; i++)
-		{
-			memberId[i] = vec_memberids[i];
-		}
-	}
-
-	return not_an_error(num_members);
+	return CELL_OK;
 }
 
 error_code sceNpMatching2JoinRoom(
@@ -992,73 +800,38 @@ error_code sceNpMatching2JoinRoom(
 {
 	sceNp2.warning("sceNpMatching2JoinRoom(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.join_room(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
+	*assignedReqId = nph.join_room(ctxId, optParam, reqParam.get_ptr());
 
 	return CELL_OK;
 }
 
 error_code sceNpMatching2GetRoomMemberDataInternalLocal(SceNpMatching2ContextId ctxId, SceNpMatching2RoomId roomId, SceNpMatching2RoomMemberId memberId, vm::cptr<SceNpMatching2AttributeId> attrId,
-	u32 attrIdNum, vm::ptr<SceNpMatching2RoomMemberDataInternal> member, vm::ptr<char> buf, u32 bufLen)
+    u32 attrIdNum, vm::ptr<SceNpMatching2RoomMemberDataInternal> member, vm::ptr<char> buf, u64 bufLen)
 {
-	sceNp2.warning("sceNpMatching2GetRoomMemberDataInternalLocal(ctxId=%d, roomId=%d, memberId=%d, attrId=*0x%x, attrIdNum=%d, member=*0x%x, buf=*0x%x, bufLen=%d)", ctxId, roomId, memberId, attrId,
-		attrIdNum, member, buf, bufLen);
+	sceNp2.todo("sceNpMatching2GetRoomMemberDataInternalLocal(ctxId=%d, roomId=%d, memberId=%d, attrId=*0x%x, attrIdNum=%d, member=*0x%x, buf=*0x%x, bufLen=%d)", ctxId, roomId, memberId, attrId,
+	    attrIdNum, member, buf, bufLen);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
 		return SCE_NP_MATCHING2_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!ctxId)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_CONTEXT_ID;
-	}
-
-	if (!roomId)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_ROOM_ID;
-	}
-
-	if (!memberId)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_MEMBER_ID;
-	}
-
-	std::vector<SceNpMatching2AttributeId> binattrs_list;
-	for (u32 i = 0; i < attrIdNum; i++)
-	{
-		if (!attrId || attrId[i] < SCE_NP_MATCHING2_ROOMMEMBER_BIN_ATTR_INTERNAL_1_ID || attrId[i] >= SCE_NP_MATCHING2_USER_BIN_ATTR_1_ID)
-		{
-			return SCE_NP_MATCHING2_ERROR_INVALID_ATTRIBUTE_ID;
-		}
-		binattrs_list.push_back(attrId[i]);
-	}
-
-	if (!check_match2_context(ctxId))
-	{
-		return SCE_NP_MATCHING2_ERROR_CONTEXT_NOT_FOUND;
-	}
-
-	return nph.local_get_room_member_data(roomId, memberId, binattrs_list, member ? member.get_ptr() : nullptr, buf.addr(), bufLen, ctxId);
+	return CELL_OK;
 }
 
 error_code sceNpMatching2GetCbQueueInfo(SceNpMatching2ContextId ctxId, vm::ptr<SceNpMatching2CbQueueInfo> queueInfo)
 {
 	sceNp2.todo("sceNpMatching2GetCbQueueInfo(ctxId=%d, queueInfo=*0x%x)", ctxId, queueInfo);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1073,8 +846,8 @@ error_code sceNpMatching2KickoutRoomMember(
 {
 	sceNp2.todo("sceNpMatching2KickoutRoomMember(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -1086,7 +859,7 @@ error_code sceNpMatching2ContextStartAsync(SceNpMatching2ContextId ctxId, u32 ti
 {
 	sceNp2.warning("sceNpMatching2ContextStartAsync(ctxId=%d, timeout=%d)", ctxId, timeout);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1102,14 +875,11 @@ error_code sceNpMatching2ContextStartAsync(SceNpMatching2ContextId ctxId, u32 ti
 	if (!ctx)
 		return SCE_NP_MATCHING2_ERROR_CONTEXT_NOT_FOUND;
 
-	if (!ctx->started.compare_and_swap_test(0, 1))
-		return SCE_NP_MATCHING2_ERROR_CONTEXT_ALREADY_STARTED;
-
 	if (ctx->context_callback)
 	{
-		sysutil_register_cb([=, context_callback = ctx->context_callback, context_callback_param = ctx->context_callback_param](ppu_thread& cb_ppu) -> s32
+		sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
 		{
-			context_callback(cb_ppu, ctxId, SCE_NP_MATCHING2_CONTEXT_EVENT_Start, SCE_NP_MATCHING2_EVENT_CAUSE_CONTEXT_ACTION, 0, ctx->context_callback_param);
+			ctx->context_callback(cb_ppu, ctxId, SCE_NP_MATCHING2_CONTEXT_EVENT_Start, SCE_NP_MATCHING2_EVENT_CAUSE_CONTEXT_ACTION, 0, ctx->context_callback_param);
 			return 0;
 		});
 	}
@@ -1122,8 +892,8 @@ error_code sceNpMatching2SetSignalingOptParam(
 {
 	sceNp2.todo("sceNpMatching2SetSignalingOptParam(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -1135,7 +905,7 @@ error_code sceNpMatching2RegisterContextCallback(SceNpMatching2ContextId ctxId,
 {
 	sceNp2.warning("sceNpMatching2RegisterContextCallback(ctxId=%d, cbFunc=*0x%x, cbFuncArg=*0x%x)", ctxId, cbFunc, cbFuncArg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1162,8 +932,8 @@ error_code sceNpMatching2SendRoomChatMessage(
 {
 	sceNp2.todo("sceNpMatching2SendRoomChatMessage(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -1174,20 +944,15 @@ error_code sceNpMatching2SendRoomChatMessage(
 error_code sceNpMatching2SetRoomDataInternal(
     SceNpMatching2ContextId ctxId, vm::cptr<SceNpMatching2SetRoomDataInternalRequest> reqParam, vm::cptr<SceNpMatching2RequestOptParam> optParam, vm::ptr<SceNpMatching2RequestId> assignedReqId)
 {
-	sceNp2.warning("sceNpMatching2SetRoomDataInternal(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
+	sceNp2.todo("sceNpMatching2SetRoomDataInternal(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.set_roomdata_internal(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
+	*assignedReqId = nph.set_roomdata_internal(ctxId, optParam, reqParam.get_ptr());
 
 	return CELL_OK;
 }
@@ -1195,20 +960,15 @@ error_code sceNpMatching2SetRoomDataInternal(
 error_code sceNpMatching2GetRoomDataInternal(
     SceNpMatching2ContextId ctxId, vm::cptr<SceNpMatching2GetRoomDataInternalRequest> reqParam, vm::cptr<SceNpMatching2RequestOptParam> optParam, vm::ptr<SceNpMatching2RequestId> assignedReqId)
 {
-	sceNp2.warning("sceNpMatching2GetRoomDataInternal(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
+	sceNp2.todo("sceNpMatching2GetRoomDataInternal(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.get_roomdata_internal(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
+	*assignedReqId = nph.get_roomdata_internal(ctxId, optParam, reqParam.get_ptr());
 
 	return CELL_OK;
 }
@@ -1218,27 +978,22 @@ error_code sceNpMatching2SignalingGetPingInfo(
 {
 	sceNp2.warning("sceNpMatching2SignalingGetPingInfo(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.get_ping_info(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
+	*assignedReqId = nph.get_ping_info(ctxId, optParam, reqParam.get_ptr());
 
 	return CELL_OK;
 }
 
 error_code sceNpMatching2GetServerIdListLocal(SceNpMatching2ContextId ctxId, vm::ptr<SceNpMatching2ServerId> serverId, u32 serverIdNum)
 {
-	sceNp2.notice("sceNpMatching2GetServerIdListLocal(ctxId=%d, serverId=*0x%x, serverIdNum=%d)", ctxId, serverId, serverIdNum);
+	sceNp2.todo("sceNpMatching2GetServerIdListLocal(ctxId=%d, serverId=*0x%x, serverIdNum=%d)", ctxId, serverId, serverIdNum);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1265,7 +1020,7 @@ error_code sceNpMatching2GetServerIdListLocal(SceNpMatching2ContextId ctxId, vm:
 	return not_an_error(static_cast<s32>(slist.size()));
 }
 
-error_code sceNpUtilBuildCdnUrl(vm::cptr<char> url, vm::ptr<char> buf, u32 bufSize, vm::ptr<u32> required, vm::ptr<void> option)
+error_code sceNpUtilBuildCdnUrl(vm::cptr<char> url, vm::ptr<char> buf, u64 bufSize, vm::ptr<u64> required, vm::ptr<void> option)
 {
 	sceNp2.todo("sceNpUtilBuildCdnUrl(url=%s, buf=*0x%x, bufSize=%d, required=*0x%x, option=*0x%x)", url, buf, bufSize, required, option);
 
@@ -1275,7 +1030,7 @@ error_code sceNpUtilBuildCdnUrl(vm::cptr<char> url, vm::ptr<char> buf, u32 bufSi
 		return SCE_NP_UTIL_ERROR_INVALID_ARGUMENT;
 	}
 
-	//if (offline)
+	//	if (offline)
 	//{
 	//	return SCE_NP_ERROR_OFFLINE;
 	//}
@@ -1288,8 +1043,8 @@ error_code sceNpMatching2GrantRoomOwner(
 {
 	sceNp2.todo("sceNpMatching2GrantRoomOwner(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -1300,9 +1055,9 @@ error_code sceNpMatching2GrantRoomOwner(
 error_code sceNpMatching2CreateContext(
     vm::cptr<SceNpId> npId, vm::cptr<SceNpCommunicationId> commId, vm::cptr<SceNpCommunicationPassphrase> passPhrase, vm::ptr<SceNpMatching2ContextId> ctxId, s32 option)
 {
-	sceNp2.warning("sceNpMatching2CreateContext(npId=*0x%x, commId=*0x%x(%s), passPhrase=*0x%x, ctxId=*0x%x, option=%d)", npId, commId, commId ? commId->data : "", passPhrase, ctxId, option);
+	sceNp2.warning("sceNpMatching2CreateContext(npId=*0x%x, commId=*0x%x(%s), passPhrase=*0x%x, ctxId=*0x%x, option=%d)", npId, commId, commId ? commId->data : "", ctxId, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1314,12 +1069,7 @@ error_code sceNpMatching2CreateContext(
 		return SCE_NP_MATCHING2_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_MATCHING2_ERROR_NOT_NP_SIGN_IN;
-	}
-
-	*ctxId = create_match2_context(commId, passPhrase, option);
+	*ctxId = create_match2_context(commId, passPhrase);
 
 	return CELL_OK;
 }
@@ -1328,7 +1078,7 @@ error_code sceNpMatching2GetSignalingOptParamLocal(SceNpMatching2ContextId ctxId
 {
 	sceNp2.todo("sceNpMatching2GetSignalingOptParamLocal(ctxId=%d, roomId=%d, signalingOptParam=*0x%x)", ctxId, roomId, signalingOptParam);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1342,26 +1092,15 @@ error_code sceNpMatching2RegisterSignalingCallback(SceNpMatching2ContextId ctxId
 {
 	sceNp2.notice("sceNpMatching2RegisterSignalingCallback(ctxId=%d, cbFunc=*0x%x, cbFuncArg=*0x%x)", ctxId, cbFunc, cbFuncArg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
 		return SCE_NP_MATCHING2_ERROR_NOT_INITIALIZED;
 	}
 
-	auto ctx = get_match2_context(ctxId);
-
-	if (!ctx)
-	{
-		return SCE_NP_MATCHING2_ERROR_CONTEXT_NOT_FOUND;
-	}
-
-	std::lock_guard lock(ctx->mutex);
-	ctx->signaling_cb = cbFunc;
-	ctx->signaling_cb_arg = cbFuncArg;
-
 	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-	sigh.add_match2_ctx(ctxId);
+	sigh.set_sig2_cb(ctxId, cbFunc, cbFuncArg);
 
 	return CELL_OK;
 }
@@ -1370,7 +1109,7 @@ error_code sceNpMatching2ClearEventData(SceNpMatching2ContextId ctxId, SceNpMatc
 {
 	sceNp2.todo("sceNpMatching2ClearEventData(ctxId=%d, eventKey=%d)", ctxId, eventKey);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1385,8 +1124,8 @@ error_code sceNpMatching2GetUserInfoList(
 {
 	sceNp2.todo("sceNpMatching2GetUserInfoList(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -1397,42 +1136,28 @@ error_code sceNpMatching2GetUserInfoList(
 error_code sceNpMatching2GetRoomMemberDataInternal(
     SceNpMatching2ContextId ctxId, vm::cptr<SceNpMatching2GetRoomMemberDataInternalRequest> reqParam, vm::cptr<SceNpMatching2RequestOptParam> optParam, vm::ptr<SceNpMatching2RequestId> assignedReqId)
 {
-	sceNp2.warning("sceNpMatching2GetRoomMemberDataInternal(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
+	sceNp2.todo("sceNpMatching2GetRoomMemberDataInternal(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.get_roommemberdata_internal(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
-
 	return CELL_OK;
 }
 
 error_code sceNpMatching2SetRoomMemberDataInternal(
     SceNpMatching2ContextId ctxId, vm::cptr<SceNpMatching2SetRoomMemberDataInternalRequest> reqParam, vm::cptr<SceNpMatching2RequestOptParam> optParam, vm::ptr<SceNpMatching2RequestId> assignedReqId)
 {
-	sceNp2.warning("sceNpMatching2SetRoomMemberDataInternal(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
+	sceNp2.todo("sceNpMatching2SetRoomMemberDataInternal(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.set_roommemberdata_internal(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
-
 	return CELL_OK;
 }
 
@@ -1441,19 +1166,14 @@ error_code sceNpMatching2JoinProhibitiveRoom(
 {
 	sceNp2.warning("sceNpMatching2JoinProhibitiveRoom(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
 	// TODO: add blocked users
-	const u32 request_id = nph.join_room(ctxId, optParam, &reqParam->joinParam);
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
+	*assignedReqId = nph.join_room(ctxId, optParam, &reqParam->joinParam);
 
 	return CELL_OK;
 }
@@ -1462,7 +1182,7 @@ error_code sceNpMatching2SignalingSetCtxOpt(SceNpMatching2ContextId ctxId, s32 o
 {
 	sceNp2.todo("sceNpMatching2SignalingSetCtxOpt(ctxId=%d, optname=%d, optval=%d)", ctxId, optname, optval);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1475,26 +1195,14 @@ error_code sceNpMatching2SignalingSetCtxOpt(SceNpMatching2ContextId ctxId, s32 o
 error_code sceNpMatching2DeleteServerContext(
     SceNpMatching2ContextId ctxId, vm::cptr<SceNpMatching2DeleteServerContextRequest> reqParam, vm::cptr<SceNpMatching2RequestOptParam> optParam, vm::ptr<SceNpMatching2RequestId> assignedReqId)
 {
-	sceNp2.warning("sceNpMatching2DeleteServerContext(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
+	sceNp2.todo("sceNpMatching2DeleteServerContext(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	if (reqParam->serverId == 0)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_SERVER_ID;
-	}
-
-	const u32 request_id = nph.delete_server_context(ctxId, optParam, reqParam->serverId);
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
-
 	return CELL_OK;
 }
 
@@ -1502,7 +1210,7 @@ error_code sceNpMatching2SetDefaultRequestOptParam(SceNpMatching2ContextId ctxId
 {
 	sceNp2.warning("sceNpMatching2SetDefaultRequestOptParam(ctxId=%d, optParam=*0x%x)", ctxId, optParam);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1525,9 +1233,9 @@ error_code sceNpMatching2SetDefaultRequestOptParam(SceNpMatching2ContextId ctxId
 
 error_code sceNpMatching2RegisterRoomEventCallback(SceNpMatching2ContextId ctxId, vm::ptr<SceNpMatching2RoomEventCallback> cbFunc, vm::ptr<void> cbFuncArg)
 {
-	sceNp2.warning("sceNpMatching2RegisterRoomEventCallback(ctxId=%d, cbFunc=*0x%x, cbFuncArg=*0x%x)", ctxId, cbFunc, cbFuncArg);
+	sceNp2.todo("sceNpMatching2RegisterRoomEventCallback(ctxId=%d, cbFunc=*0x%x, cbFuncArg=*0x%x)", ctxId, cbFunc, cbFuncArg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1543,71 +1251,29 @@ error_code sceNpMatching2RegisterRoomEventCallback(SceNpMatching2ContextId ctxId
 
 error_code sceNpMatching2GetRoomPasswordLocal(SceNpMatching2ContextId ctxId, SceNpMatching2RoomId roomId, vm::ptr<b8> withPassword, vm::ptr<SceNpMatching2SessionPassword> roomPassword)
 {
-	sceNp2.notice("sceNpMatching2GetRoomPasswordLocal(ctxId=%d, roomId=%d, withPassword=*0x%x, roomPassword=*0x%x)", ctxId, roomId, withPassword, roomPassword);
+	sceNp2.todo("sceNpMatching2GetRoomPasswordLocal(ctxId=%d, roomId=%d, withPassword=*0x%x, roomPassword=*0x%x)", ctxId, roomId, withPassword, roomPassword);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
 		return SCE_NP_MATCHING2_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!ctxId)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_CONTEXT_ID;
-	}
-
-	if (!roomId)
-	{
-		return SCE_NP_MATCHING2_ERROR_INVALID_ROOM_ID;
-	}
-
-	if (!check_match2_context(ctxId))
-	{
-		return SCE_NP_MATCHING2_ERROR_CONTEXT_NOT_FOUND;
-	}
-
-	const auto [error, password] = nph.local_get_room_password(roomId);
-
-	if (error)
-	{
-		return error;
-	}
-
-	if (password)
-	{
-		if (withPassword) *withPassword = true;
-		if (roomPassword)
-		{
-			std::memcpy(roomPassword.get_ptr(), &*password, sizeof(SceNpMatching2SessionPassword));
-		}
-	}
-	else
-	{
-		if (withPassword) *withPassword = false;
-	}
-
 	return CELL_OK;
 }
 
 error_code sceNpMatching2GetRoomDataExternalList(
     SceNpMatching2ContextId ctxId, vm::cptr<SceNpMatching2GetRoomDataExternalListRequest> reqParam, vm::cptr<SceNpMatching2RequestOptParam> optParam, vm::ptr<SceNpMatching2RequestId> assignedReqId)
 {
-	sceNp2.warning("sceNpMatching2GetRoomDataExternalList(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
+	sceNp2.todo("sceNpMatching2GetRoomDataExternalList(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.get_roomdata_external_list(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
-
 	return CELL_OK;
 }
 
@@ -1616,18 +1282,13 @@ error_code sceNpMatching2CreateJoinRoom(
 {
 	sceNp2.warning("sceNpMatching2CreateJoinRoom(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.create_join_room(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
+	*assignedReqId = nph.create_join_room(ctxId, optParam, reqParam.get_ptr());
 
 	return CELL_OK;
 }
@@ -1636,7 +1297,7 @@ error_code sceNpMatching2SignalingGetCtxOpt(SceNpMatching2ContextId ctxId, s32 o
 {
 	sceNp2.todo("sceNpMatching2SignalingGetCtxOpt(ctxId=%d, optname=%d, optval=*0x%x)", ctxId, optname, optval);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1651,19 +1312,12 @@ error_code sceNpMatching2GetLobbyInfoList(
 {
 	sceNp2.todo("sceNpMatching2GetLobbyInfoList(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
 
-	const u32 request_id = nph.get_lobby_info_list(ctxId, optParam, reqParam.get_ptr());
-
-	if (assignedReqId)
-	{
-		*assignedReqId = request_id;
-	}
-
 	return CELL_OK;
 }
 
@@ -1672,7 +1326,7 @@ error_code sceNpMatching2GetLobbyMemberIdListLocal(
 {
 	sceNp2.todo("sceNpMatching2GetLobbyMemberIdListLocal(ctxId=%d, lobbyId=%d, memberId=*0x%x, memberIdNum=%d, me=*0x%x)", ctxId, lobbyId, memberId, memberIdNum, me);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1687,8 +1341,8 @@ error_code sceNpMatching2SendLobbyInvitation(
 {
 	sceNp2.todo("sceNpMatching2SendLobbyInvitation(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -1698,9 +1352,9 @@ error_code sceNpMatching2SendLobbyInvitation(
 
 error_code sceNpMatching2ContextStop(SceNpMatching2ContextId ctxId)
 {
-	sceNp2.warning("sceNpMatching2ContextStop(ctxId=%d)", ctxId);
+	sceNp2.todo("sceNpMatching2ContextStop(ctxId=%d)", ctxId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1710,16 +1364,15 @@ error_code sceNpMatching2ContextStop(SceNpMatching2ContextId ctxId)
 	const auto ctx = get_match2_context(ctxId);
 
 	if (!ctx)
+	{
 		return SCE_NP_MATCHING2_ERROR_INVALID_CONTEXT_ID;
+	}
 
-	if (!ctx->started.compare_and_swap_test(1, 0))
-		return SCE_NP_MATCHING2_ERROR_CONTEXT_NOT_STARTED;
-	
 	if (ctx->context_callback)
 	{
-		sysutil_register_cb([=, context_callback = ctx->context_callback, context_callback_param = ctx->context_callback_param](ppu_thread& cb_ppu) -> s32
+		sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
 		{
-			context_callback(cb_ppu, ctxId, SCE_NP_MATCHING2_CONTEXT_EVENT_Stop, SCE_NP_MATCHING2_EVENT_CAUSE_CONTEXT_ACTION, 0, context_callback_param);
+			ctx->context_callback(cb_ppu, ctxId, SCE_NP_MATCHING2_CONTEXT_EVENT_Stop, SCE_NP_MATCHING2_EVENT_CAUSE_CONTEXT_ACTION, 0, ctx->context_callback_param);
 			return 0;
 		});
 	}
@@ -1732,8 +1385,8 @@ error_code sceNpMatching2SetLobbyMemberDataInternal(
 {
 	sceNp2.todo("sceNpMatching2SetLobbyMemberDataInternal(ctxId=%d, reqParam=*0x%x, optParam=*0x%x, assignedReqId=*0x%x)", ctxId, reqParam, optParam, assignedReqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (auto res = generic_match2_error_check(nph, ctxId, reqParam); res != CELL_OK)
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	if (auto res = generic_match2_error_check(nph, ctxId, reqParam, assignedReqId); res != CELL_OK)
 	{
 		return res;
 	}
@@ -1743,9 +1396,9 @@ error_code sceNpMatching2SetLobbyMemberDataInternal(
 
 error_code sceNpMatching2RegisterRoomMessageCallback(SceNpMatching2ContextId ctxId, vm::ptr<SceNpMatching2RoomMessageCallback> cbFunc, vm::ptr<void> cbFuncArg)
 {
-	sceNp2.warning("sceNpMatching2RegisterRoomMessageCallback(ctxId=%d, cbFunc=*0x%x, cbFuncArg=*0x%x)", ctxId, cbFunc, cbFuncArg);
+	sceNp2.todo("sceNpMatching2RegisterRoomMessageCallback(ctxId=%d, cbFunc=*0x%x, cbFuncArg=*0x%x)", ctxId, cbFunc, cbFuncArg);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1763,7 +1416,7 @@ error_code sceNpMatching2SignalingCancelPeerNetInfo(SceNpMatching2ContextId ctxI
 {
 	sceNp2.todo("sceNpMatching2SignalingCancelPeerNetInfo(ctxId=%d, reqId=%d)", ctxId, reqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1775,26 +1428,21 @@ error_code sceNpMatching2SignalingCancelPeerNetInfo(SceNpMatching2ContextId ctxI
 
 error_code sceNpMatching2SignalingGetLocalNetInfo(vm::ptr<SceNpMatching2SignalingNetInfo> netinfo)
 {
-	sceNp2.warning("sceNpMatching2SignalingGetLocalNetInfo(netinfo=*0x%x)", netinfo);
+	sceNp2.todo("sceNpMatching2SignalingGetLocalNetInfo(netinfo=*0x%x)", netinfo);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
 		return SCE_NP_MATCHING2_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!netinfo || netinfo->size != sizeof(SceNpMatching2SignalingNetInfo))
+	if (!netinfo)
 	{
+		// TODO: check netinfo->size
 		return SCE_NP_MATCHING2_ERROR_INVALID_ARGUMENT;
 	}
 
-	netinfo->localAddr  = nph.get_local_ip_addr();
-	netinfo->mappedAddr = nph.get_public_ip_addr();
-
-	// Pure speculation below
-	netinfo->natStatus = SCE_NP_SIGNALING_NETINFO_NAT_STATUS_TYPE2;
-
 	return CELL_OK;
 }
 
@@ -1802,7 +1450,7 @@ error_code sceNpMatching2SignalingGetPeerNetInfo(SceNpMatching2ContextId ctxId,
 {
 	sceNp2.todo("sceNpMatching2SignalingGetPeerNetInfo(ctxId=%d, roomId=%d, roomMemberId=%d, reqId=*0x%x)", ctxId, roomId, roomMemberId, reqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
@@ -1821,15 +1469,16 @@ error_code sceNpMatching2SignalingGetPeerNetInfoResult(SceNpMatching2ContextId c
 {
 	sceNp2.todo("sceNpMatching2SignalingGetPeerNetInfoResult(ctxId=%d, reqId=%d, netinfo=*0x%x)", ctxId, reqId, netinfo);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP2_Match2_init)
 	{
 		return SCE_NP_MATCHING2_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!netinfo || netinfo->size != sizeof(SceNpMatching2SignalingNetInfo))
+	if (!netinfo)
 	{
+		// TODO: check netinfo->size
 		return SCE_NP_MATCHING2_ERROR_INVALID_ARGUMENT;
 	}
 
@@ -1840,7 +1489,7 @@ error_code sceNpAuthOAuthInit()
 {
 	sceNp2.todo("sceNpAuthOAuthInit()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (nph.is_NP_Auth_init)
 	{
@@ -1856,7 +1505,7 @@ error_code sceNpAuthOAuthTerm()
 {
 	sceNp2.todo("sceNpAuthOAuthTerm()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	// TODO: check if this might throw SCE_NP_OAUTH_ERROR_NOT_INITIALIZED
 	nph.is_NP_Auth_init = false;
@@ -1868,7 +1517,7 @@ error_code sceNpAuthCreateOAuthRequest()
 {
 	sceNp2.todo("sceNpAuthCreateOAuthRequest()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Auth_init)
 	{
@@ -1882,7 +1531,7 @@ error_code sceNpAuthDeleteOAuthRequest(SceNpAuthOAuthRequestId reqId)
 {
 	sceNp2.todo("sceNpAuthDeleteOAuthRequest(reqId=%d)", reqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Auth_init)
 	{
@@ -1896,7 +1545,7 @@ error_code sceNpAuthAbortOAuthRequest(SceNpAuthOAuthRequestId reqId)
 {
 	sceNp2.todo("sceNpAuthAbortOAuthRequest(reqId=%d)", reqId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Auth_init)
 	{
@@ -1910,7 +1559,7 @@ error_code sceNpAuthGetAuthorizationCode(SceNpAuthOAuthRequestId reqId, vm::cptr
 {
 	sceNp2.todo("sceNpAuthGetAuthorizationCode(reqId=%d, param=*0x%x, authCode=*0x%x, issuerId=%d)", reqId, param, authCode, issuerId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (!nph.is_NP_Auth_init)
 	{
diff --git a/rpcs3/Emu/Cell/Modules/sceNp2.h b/rpcs3/Emu/Cell/Modules/sceNp2.h
index 9c83eab607..c016213ab1 100644
--- a/rpcs3/Emu/Cell/Modules/sceNp2.h
+++ b/rpcs3/Emu/Cell/Modules/sceNp2.h
@@ -136,7 +136,6 @@ enum
 	SCE_NP_MATCHING2_INVITATION_TARGET_SESSION_MAX                         = 2,
 	SCE_NP_MATCHING2_LOBBY_MEMBER_DATA_INTERNAL_LIST_MAX                   = 256,
 	SCE_NP_MATCHING2_LOBBY_MEMBER_DATA_INTERNAL_EXTENDED_DATA_LIST_MAX     = 64,
-	SCE_NP_MATCHING2_LOBBY_BIN_ATTR_INTERNAL_NUM                           = 2,
 	SCE_NP_MATCHING2_LOBBYMEMBER_BIN_ATTR_INTERNAL_NUM                     = 1,
 	SCE_NP_MATCHING2_LOBBYMEMBER_BIN_ATTR_INTERNAL_MAX_SIZE                = 64,
 	SCE_NP_MATCHING2_LOBBY_MAX_SLOT                                        = 256,
@@ -150,7 +149,6 @@ enum
 	SCE_NP_MATCHING2_ROOM_BIN_ATTR_INTERNAL_NUM                            = 2,
 	SCE_NP_MATCHING2_ROOM_BIN_ATTR_INTERNAL_MAX_SIZE                       = 256,
 	SCE_NP_MATCHING2_ROOM_SEARCHABLE_INT_ATTR_EXTERNAL_NUM                 = 8,
-	SCE_NP_MATCHING2_ROOM_SEARCHABLE_BIN_ATTR_EXTERNAL_NUM                 = 1,
 	SCE_NP_MATCHING2_ROOM_SEARCHABLE_BIN_ATTR_EXTERNAL_MAX_SIZE            = 64,
 	SCE_NP_MATCHING2_ROOMMEMBER_BIN_ATTR_INTERNAL_NUM                      = 1,
 	SCE_NP_MATCHING2_ROOMMEMBER_BIN_ATTR_INTERNAL_MAX_SIZE                 = 64,
@@ -158,7 +156,6 @@ enum
 	SCE_NP_MATCHING2_USER_BIN_ATTR_NUM                                     = 1,
 	SCE_NP_MATCHING2_USER_BIN_ATTR_MAX_SIZE                                = 128,
 	SCE_NP_MATCHING2_GET_USER_INFO_LIST_NPID_NUM_MAX                       = 25,
-	SCE_NP_MATCHING2_GET_ROOM_DATA_EXTERNAL_LIST_ROOM_NUM_MAX              = 20,
 	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetServerInfo                     = 4,
 	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetWorldInfoList                  = 3848,
 	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetRoomMemberDataExternalList     = 15624,
@@ -190,20 +187,6 @@ enum
 	SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_LobbyInvitationInfo               = 870,
 };
 
-enum
-{
-	SCE_NP_MATCHING2_MAX_SIZE_RoomDataExternal                       = 1288,
-	SCE_NP_MATCHING2_MAX_SIZE_RoomMemberDataInternal                 = 368,
-	SCE_NP_MATCHING2_MAX_SIZE_LobbyMemberDataInternal                = 668,
-	SCE_NP_MATCHING2_MAX_SIZE_LobbyMemberDataInternal_NoExtendedData = 80,
-	SCE_NP_MATCHING2_MAX_SIZE_UserInfo                               = 704,
-};
-
-enum
-{
-	SCE_NP_MATCHING2_TITLE_PASSPHRASE_SIZE = 128
-};
-
 // Comparison operator specified as the search condition
 enum
 {
@@ -239,11 +222,6 @@ enum
 	SCE_NP_MATCHING2_SIGNALING_TYPE_STAR = 2,
 };
 
-enum
-{
-	SCE_NP_MATCHING2_SIGNALING_FLAG_MANUAL_MODE = 0x01
-};
-
 // Event cause
 enum
 {
@@ -322,12 +300,6 @@ enum
 	SCE_NP_MATCHING2_SEND_MSG_OPTION_WITH_AVATARURL  = 0x04,
 };
 
-enum
-{
-	SCE_NP_MATCHING2_ROOM_ALLOWED_USER_MAX = 100,
-	SCE_NP_MATCHING2_ROOM_BLOCKED_USER_MAX = 100,
-};
-
 // Flag-type lobby attribute
 enum
 {
@@ -356,8 +328,7 @@ enum
 // Flah-type room member attribute
 enum
 {
-	SCE_NP_MATCHING2_LOBBYMEMBER_FLAG_ATTR_OWNER = 0x80000000,
-	SCE_NP_MATCHING2_ROOMMEMBER_FLAG_ATTR_OWNER  = 0x80000000,
+	SCE_NP_MATCHING2_ROOMMEMBER_FLAG_ATTR_OWNER = 0x80000000,
 };
 
 // ID of external room search integer attribute
@@ -386,13 +357,6 @@ enum
 	SCE_NP_MATCHING2_ROOM_BIN_ATTR_EXTERNAL_2_ID = 0x0056,
 };
 
-// ID of internal lobby binary attribute
-enum
-{
-	SCE_NP_MATCHING2_LOBBY_BIN_ATTR_INTERNAL_1_ID = 0x0037,
-	SCE_NP_MATCHING2_LOBBY_BIN_ATTR_INTERNAL_2_ID = 0x0038,
-};
-
 // ID of internal room binary attribute
 enum
 {
@@ -487,9 +451,8 @@ enum
 // Signaling event
 enum
 {
-	SCE_NP_MATCHING2_SIGNALING_EVENT_Dead          = 0x5101,
-	SCE_NP_MATCHING2_SIGNALING_EVENT_Established   = 0x5102,
-	SCE_NP_MATCHING2_SIGNALING_EVENT_NetInfoResult = 0x5103,
+	SCE_NP_MATCHING2_SIGNALING_EVENT_Dead        = 0x5101,
+	SCE_NP_MATCHING2_SIGNALING_EVENT_Established = 0x5102,
 };
 
 // Context event
@@ -500,14 +463,6 @@ enum
 	SCE_NP_MATCHING2_CONTEXT_EVENT_Stop      = 0x6f03,
 };
 
-enum
-{
-	SCE_NP_MATCHING2_SIGNALING_NETINFO_NAT_STATUS_UNKNOWN = 0,
-	SCE_NP_MATCHING2_SIGNALING_NETINFO_NAT_STATUS_TYPE    = 1,
-	SCE_NP_MATCHING2_SIGNALING_NETINFO_NAT_STATUS_TYPE2   = 2,
-	SCE_NP_MATCHING2_SIGNALING_NETINFO_NAT_STATUS_TYPE3   = 3,
-};
-
 typedef u16 SceNpMatching2ServerId;
 typedef u32 SceNpMatching2WorldId;
 typedef u16 SceNpMatching2WorldNumber;
@@ -1433,9 +1388,9 @@ struct SceNpMatching2RoomDataInternalUpdateInfo
 	vm::bptr<SceNpMatching2FlagAttr> prevFlagAttr;
 	vm::bptr<SceNpMatching2RoomPasswordSlotMask> newRoomPasswordSlotMask;
 	vm::bptr<SceNpMatching2RoomPasswordSlotMask> prevRoomPasswordSlotMask;
-	vm::bpptr<SceNpMatching2RoomGroup> newRoomGroup;
+	vm::pptr<SceNpMatching2RoomGroup> newRoomGroup;
 	be_t<u32> newRoomGroupNum;
-	vm::bpptr<SceNpMatching2RoomBinAttrInternal> newRoomBinAttrInternal;
+	vm::pptr<SceNpMatching2RoomBinAttrInternal> newRoomBinAttrInternal;
 	be_t<u32> newRoomBinAttrInternalNum;
 };
 
@@ -1446,7 +1401,7 @@ struct SceNpMatching2RoomMemberDataInternalUpdateInfo
 	vm::bptr<SceNpMatching2FlagAttr> newFlagAttr;
 	vm::bptr<SceNpMatching2FlagAttr> prevFlagAttr;
 	vm::bptr<SceNpMatching2TeamId> newTeamId;
-	vm::bpptr<SceNpMatching2RoomMemberBinAttrInternal> newRoomMemberBinAttrInternal;
+	vm::pptr<SceNpMatching2RoomMemberBinAttrInternal> newRoomMemberBinAttrInternal;
 	be_t<u32> newRoomMemberBinAttrInternalNum;
 };
 
@@ -1458,7 +1413,7 @@ struct SceNpMatching2RoomMessageInfo
 	u8 padding[2];
 	vm::bptr<SceNpMatching2RoomMessageDestination> dst;
 	vm::bptr<SceNpUserInfo2> srcMember;
-	vm::bptr<void> msg;
+	vm::bcptr<void> msg;
 	be_t<u32> msgLen;
 };
 
@@ -1555,9 +1510,9 @@ struct SceNpMatching2CbQueueInfo
 	u8 reserved[12];
 };
 
-struct SceNpMatching2SignalingNetInfo
+union SceNpMatching2SignalingNetInfo // TODO check values
 {
-	be_t<u32> size;
+	be_t<u64> size;
 	be_t<u32> localAddr;
 	be_t<u32> mappedAddr;
 	be_t<u32> natStatus;
@@ -1619,7 +1574,7 @@ struct SceNpAuthorizationCode
 
 struct SceNpAuthGetAuthorizationCodeParameter
 {
-	be_t<u32> size;
+	be_t<u64> size;
 	vm::bcptr<SceNpClientId> pClientId;
 	vm::bcptr<char> pScope;
 };
diff --git a/rpcs3/Emu/Cell/Modules/sceNpClans.cpp b/rpcs3/Emu/Cell/Modules/sceNpClans.cpp
index 91d22079fe..7b7c5a894d 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpClans.cpp
+++ b/rpcs3/Emu/Cell/Modules/sceNpClans.cpp
@@ -73,7 +73,7 @@ void fmt_class_string<SceNpClansError>::format(std::string& out, u64 arg)
 	});
 }
 
-error_code sceNpClansInit(vm::cptr<SceNpCommunicationId> commId, vm::cptr<SceNpCommunicationPassphrase> passphrase, vm::ptr<void> pool, vm::ptr<u32> poolSize, u32 flags)
+error_code sceNpClansInit(vm::cptr<SceNpCommunicationId> commId, vm::cptr<SceNpCommunicationPassphrase> passphrase, vm::ptr<void> pool, vm::ptr<u64> poolSize, u32 flags)
 {
 	sceNpClans.warning("sceNpClansInit(commId=*0x%x, passphrase=*0x%x, pool=*0x%x, poolSize=*0x%x, flags=0x%x)", commId, passphrase, pool, poolSize, flags);
 
diff --git a/rpcs3/Emu/Cell/Modules/sceNpClans.h b/rpcs3/Emu/Cell/Modules/sceNpClans.h
index f0d1d54630..9e5c56c054 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpClans.h
+++ b/rpcs3/Emu/Cell/Modules/sceNpClans.h
@@ -109,34 +109,6 @@ enum
 	SCE_NP_CLANS_PAGING_REQUEST_PAGE_MAX              = 100,
 };
 
-enum
-{
-	SCE_NP_CLANS_FIELDS_SEARCHABLE_ATTR_INT_ATTR1       = 0x00000001,
-	SCE_NP_CLANS_FIELDS_SEARCHABLE_ATTR_INT_ATTR2       = 0x00000002,
-	SCE_NP_CLANS_FIELDS_SEARCHABLE_ATTR_INT_ATTR3       = 0x00000004,
-	SCE_NP_CLANS_FIELDS_SEARCHABLE_ATTR_BIN_ATTR1       = 0x00000008,
-	SCE_NP_CLANS_FIELDS_SEARCHABLE_PROFILE_TAG          = 0x00000010,
-	SCE_NP_CLANS_FIELDS_SEARCHABLE_PROFILE_NUM_MEMBERS  = 0x00000020,
-	SCE_NP_CLANS_FIELDS_UPDATABLE_CLAN_INFO_DESCR       = 0x00000040,
-	SCE_NP_CLANS_FIELDS_UPDATABLE_CLAN_INFO_BIN_DATA1   = 0x00000080,
-	SCE_NP_CLANS_FIELDS_UPDATABLE_MEMBER_INFO_DESCR     = 0x00000100,
-	SCE_NP_CLANS_FIELDS_UPDATABLE_MEMBER_INFO_BIN_ATTR1 = 0x00000200,
-	SCE_NP_CLANS_FIELDS_UPDATABLE_MEMBER_INFO_BIN_DATA1 = 0x00000400,
-	SCE_NP_CLANS_FIELDS_UPDATABLE_MEMBER_INFO_ALLOW_MSG = 0x00000800,
-};
-
-enum
-{
-	SCE_NP_CLANS_MESSAGE_OPTIONS_NONE   = 0x00000000,
-	SCE_NP_CLANS_MESSAGE_OPTIONS_CENSOR = 0x00000001,
-};
-
-enum
-{
-	SCE_NP_CLANS_INVALID_ID             = 0,
-	SCE_NP_CLANS_INVALID_REQUEST_HANDLE = 0,
-};
-
 // Request handle for clan API
 using SceNpClansRequestHandle = vm::ptr<struct SceNpClansRequest>;
 
diff --git a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp b/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp
index d5f3f94f45..0581a70513 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp
+++ b/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp
@@ -6,8 +6,6 @@
 #include "sceNp.h"
 #include "cellSysutil.h"
 
-#include "Emu/Cell/lv2/sys_process.h"
-
 #include "Emu/NP/np_handler.h"
 #include "Emu/NP/np_contexts.h"
 
@@ -63,65 +61,22 @@ void fmt_class_string<SceNpCommerce2Error>::format(std::string& out, u64 arg)
 		STR_CASE(SCE_NP_COMMERCE2_SERVER_ERROR_VOUCHER_ALREADY_CONSUMED);
 		STR_CASE(SCE_NP_COMMERCE2_SERVER_ERROR_EXCEEDS_AGE_LIMIT_IN_BROWSING);
 		STR_CASE(SCE_NP_COMMERCE2_SYSTEM_UTIL_ERROR_INVALID_VOUCHER);
+		STR_CASE(SCE_NP_COMMERCE_ERROR_REQ_BUSY);
 		}
 
 		return unknown;
 	});
 }
 
-void initialize_common_data(SceNpCommerce2CommonData* common_data, vm::ptr<void> data, u32 internal_data_addr, u32 internal_data_size)
-{
-	std::memset(common_data, 0, sizeof(SceNpCommerce2CommonData));
-	common_data->version = SCE_NP_COMMERCE2_VERSION;
-	common_data->buf_head = data.addr();
-	common_data->data = internal_data_addr;
-	common_data->data_size = internal_data_size;
-}
-
-error_code check_and_get_data(vm::ptr<void> /*data*/, u32 data_size, u32& /*internal_data_addr*/, u32& /*internal_data_size*/)
-{
-	if (data_size < 60)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_RESULT_DATA;
-
-	// TODO: check and extract data
-	if (true)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_RESULT_DATA;
-
-	return not_an_error(60);
-}
-
 error_code sceNpCommerce2ExecuteStoreBrowse(s32 targetType, vm::cptr<char> targetId, s32 userdata)
 {
 	sceNpCommerce2.todo("sceNpCommerce2ExecuteStoreBrowse(targetType=%d, targetId=%s, userdata=%d)", targetType, targetId, userdata);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (targetType < SCE_NP_COMMERCE2_STORE_BROWSE_TYPE_CATEGORY || targetType > SCE_NP_COMMERCE2_STORE_BROWSE_TYPE_PRODUCT_CODE)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_TARGET_TYPE;
-
-	if (targetType < SCE_NP_COMMERCE2_STORE_BROWSE_TYPE_PRODUCT_CODE && (!targetId || !targetId[0]))
-		return SCE_NP_COMMERCE2_ERROR_INVALID_TARGET_ID;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetStoreBrowseUserdata(vm::ptr<s32> userdata)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetStoreBrowseUserdata(userdata=*0x%x)", userdata);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!userdata)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
-	*userdata = 0; // TODO
-
 	return CELL_OK;
 }
 
@@ -129,16 +84,6 @@ error_code sceNpCommerce2Init()
 {
 	sceNpCommerce2.warning("sceNpCommerce2Init()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_ALREADY_INITIALIZED;
-
-	if (!nph.is_NP_init)
-		return SCE_NP_ERROR_NOT_INITIALIZED;
-
-	nph.is_NP_Com2_init = true;
-
 	return CELL_OK;
 }
 
@@ -146,10 +91,6 @@ error_code sceNpCommerce2Term()
 {
 	sceNpCommerce2.warning("sceNpCommerce2Term()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	nph.is_NP_Com2_init = false;
-
 	return CELL_OK;
 }
 
@@ -157,24 +98,7 @@ error_code sceNpCommerce2CreateCtx(u32 version, vm::cptr<SceNpId> npId, vm::ptr<
 {
 	sceNpCommerce2.warning("sceNpCommerce2CreateCtx(version=%d, npId=*0x%x, handler=*0x%x, arg=*0x%x, ctx_id=*0x%x)", version, npId, handler, arg, ctx_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (version > SCE_NP_COMMERCE2_VERSION)
-		return SCE_NP_COMMERCE2_ERROR_UNSUPPORTED_VERSION;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE2_ERROR_CTX_MAX;
-
-	if (!npId)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
-	if (ctx_id)
-		*ctx_id = create_commerce2_context(version, npId, handler, arg);
-	else
-		sceNpCommerce2.warning("sceNpCommerce2CreateCtx: ctx_id is null");
+	*ctx_id = create_commerce2_context(version, npId, handler, arg);
 
 	return CELL_OK;
 }
@@ -183,34 +107,18 @@ s32 sceNpCommerce2DestroyCtx(u32 ctx_id)
 {
 	sceNpCommerce2.warning("sceNpCommerce2DestroyCtx(ctx_id=%d)", ctx_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
 	if (!destroy_commerce2_context(ctx_id))
 	{
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
+		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND; // TODO: verify
 	}
 
 	return CELL_OK;
 }
 
-error_code sceNpCommerce2EmptyStoreCheckStart(u32 ctx_id, s32 store_check_type, vm::cptr<char> target_id)
+s32 sceNpCommerce2EmptyStoreCheckStart(u32 ctx_id, s32 store_check_type, vm::cptr<char> target_id)
 {
 	sceNpCommerce2.warning("sceNpCommerce2EmptyStoreCheckStart(ctx_id=%d, store_check_type=%d, target_id=*0x%x(%s))", ctx_id, store_check_type, target_id, target_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!target_id || !target_id[0])
-		return SCE_NP_COMMERCE2_ERROR_INVALID_TARGET_ID;
-
-	if (store_check_type != SCE_NP_COMMERCE2_STORE_CHECK_TYPE_CATEGORY)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	const auto ctx = get_commerce2_context(ctx_id);
 
 	if (!ctx)
@@ -220,9 +128,9 @@ error_code sceNpCommerce2EmptyStoreCheckStart(u32 ctx_id, s32 store_check_type,
 
 	if (ctx->context_callback)
 	{
-		sysutil_register_cb([=, context_callback = ctx->context_callback, context_callback_param = ctx->context_callback_param](ppu_thread& cb_ppu) -> s32
+		sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
 		{
-			context_callback(cb_ppu, ctx_id, 0, SCE_NP_COMMERCE2_EVENT_EMPTY_STORE_CHECK_DONE, 0, context_callback_param);
+			ctx->context_callback(cb_ppu, ctx_id, 0, SCE_NP_COMMERCE2_EVENT_EMPTY_STORE_CHECK_DONE, 0, ctx->context_callback_param);
 			return 0;
 		});
 	}
@@ -233,52 +141,32 @@ error_code sceNpCommerce2EmptyStoreCheckStart(u32 ctx_id, s32 store_check_type,
 error_code sceNpCommerce2EmptyStoreCheckAbort(u32 ctx_id)
 {
 	sceNpCommerce2.todo("sceNpCommerce2EmptyStoreCheckAbort(ctx_id=%d)", ctx_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
 	return CELL_OK;
 }
 
-error_code sceNpCommerce2EmptyStoreCheckFinish(u32 ctx_id, vm::ptr<s32> is_empty)
+s32 sceNpCommerce2EmptyStoreCheckFinish(u32 ctx_id, vm::ptr<s32> is_empty)
 {
 	sceNpCommerce2.warning("sceNpCommerce2EmptyStoreCheckFinish(ctx_id=%d, is_empty=*0x%x)", ctx_id, is_empty);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!is_empty)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	*is_empty = SCE_NP_COMMERCE2_STORE_IS_NOT_EMPTY;
 	return CELL_OK;
 }
 
-error_code sceNpCommerce2CreateSessionStart(u32 ctx_id)
+s32 sceNpCommerce2CreateSessionStart(u32 ctx_id)
 {
 	sceNpCommerce2.warning("sceNpCommerce2CreateSessionStart(ctx_id=%d)", ctx_id);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
 	const auto ctx = get_commerce2_context(ctx_id);
 
 	if (!ctx)
 	{
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
+		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND; // TODO: verify
 	}
 
 	if (ctx->context_callback)
 	{
-		sysutil_register_cb([=, context_callback = ctx->context_callback, context_callback_param = ctx->context_callback_param](ppu_thread& cb_ppu) -> s32
+		sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
 		{
-			context_callback(cb_ppu, ctx_id, 0, SCE_NP_COMMERCE2_EVENT_CREATE_SESSION_DONE, 0, context_callback_param);
+			ctx->context_callback(cb_ppu, ctx_id, 0, SCE_NP_COMMERCE2_EVENT_CREATE_SESSION_DONE, 0, ctx->context_callback_param);
 			return 0;
 		});
 	}
@@ -289,208 +177,61 @@ error_code sceNpCommerce2CreateSessionStart(u32 ctx_id)
 error_code sceNpCommerce2CreateSessionAbort(u32 ctx_id)
 {
 	sceNpCommerce2.todo("sceNpCommerce2CreateSessionAbort(ctx_id=%d)", ctx_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-	
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
 s32 sceNpCommerce2CreateSessionFinish(u32 ctx_id, vm::ptr<SceNpCommerce2SessionInfo> sessionInfo)
 {
 	sceNpCommerce2.warning("sceNpCommerce2CreateSessionFinish(ctx_id=%d, sessionInfo=*0x%x)", ctx_id, sessionInfo);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
-	s32 sdk_ver{};
-	[[maybe_unused]] s32 ret = process_get_sdk_version(process_getpid(), sdk_ver);
-
-	if (sdk_ver < 0x300000)
-	{
-		std::memset(sessionInfo.get_ptr(), 0, 8); // currencyCode, decimals
-	}
-	else
-	{
-		std::memset(sessionInfo.get_ptr(), 0, 44); // sizeof(SceNpCommerce2SessionInfo) - reserved
-	}
-
-	// TODO
-	if (false)
-	{
-		sessionInfo->currencyCode[0] = 'U';
-		sessionInfo->currencyCode[1] = 'S';
-		sessionInfo->currencyCode[2] = 'D';
-		sessionInfo->currencyCode[3] = '\0';
-		sessionInfo->decimals = 2;
-		sessionInfo->currencySymbol[0] = '$';
-		sessionInfo->currencySymbol[1] = '\0';
-		sessionInfo->currencySymbol[2] = '\0';
-		sessionInfo->currencySymbol[3] = '\0';
-		sessionInfo->symbolPosition = SCE_NP_COMMERCE2_SYM_POS_PRE;
-		sessionInfo->symbolWithSpace = false;
-		sessionInfo->padding1[3];
-		sessionInfo->thousandSeparator[0] = ',';
-		sessionInfo->thousandSeparator[1] = '\0';
-		sessionInfo->thousandSeparator[2] = '\0';
-		sessionInfo->thousandSeparator[3] = '\0';
-		sessionInfo->decimalLetter[0] = '.';
-		sessionInfo->decimalLetter[1] = '\0';
-		sessionInfo->decimalLetter[2] = '\0';
-		sessionInfo->decimalLetter[3] = '\0';
-	}
-
+	memset(sessionInfo.get_ptr(), 0, sizeof(sessionInfo));
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetCategoryContentsCreateReq(u32 ctx_id, vm::ptr<u32> req_id)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetCategoryContentsCreateReq(ctx_id=%d, req_id=*0x%x)", ctx_id, req_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!req_id)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetCategoryContentsStart(u32 req_id, vm::cptr<char> categoryId, u32 startPosition, u32 maxCountOfResults)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetCategoryContentsStart(req_id=%d, categoryId=%s, startPosition=%d, maxCountOfResults=%d)", req_id, categoryId, startPosition, maxCountOfResults);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!categoryId || maxCountOfResults > SCE_NP_COMMERCE2_GETCAT_MAX_COUNT)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
-error_code get_result(u32 /* req_id */, vm::ptr<void> buf, u32 buf_size, vm::ptr<u32> fill_size)
-{
-	if (!buf || !buf_size || ! fill_size)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
-	// TODO
-
-	return CELL_OK;
-}
-
-error_code sceNpCommerce2GetCategoryContentsGetResult(u32 req_id, vm::ptr<void> buf, u32 buf_size, vm::ptr<u32> fill_size)
+error_code sceNpCommerce2GetCategoryContentsGetResult(u32 req_id, vm::ptr<void> buf, u64 buf_size, vm::ptr<u64> fill_size) // TODO: correct size types?
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetCategoryContentsGetResult(req_id=%d, buf=*0x%x, buf_size=%d, fill_size=*0x%x)", req_id, buf, buf_size, fill_size);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (buf_size < SCE_NP_COMMERCE2_RECV_BUF_SIZE)
-		return SCE_NP_COMMERCE2_ERROR_INSUFFICIENT_BUF_SIZE;
-
-	return get_result(req_id, buf, buf_size, fill_size);
+	return CELL_OK;
 }
 
-error_code sceNpCommerce2InitGetCategoryContentsResult(vm::ptr<SceNpCommerce2GetCategoryContentsResult> result, vm::ptr<void> data, u32 data_size)
+error_code sceNpCommerce2InitGetCategoryContentsResult(vm::ptr<SceNpCommerce2GetCategoryContentsResult> result, vm::ptr<void> data, u64 data_size) // TODO: correct size types?
 {
 	sceNpCommerce2.todo("sceNpCommerce2InitGetCategoryContentsResult(result=*0x%x, data=*0x%x, data_size=%d)", result, data, data_size);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!result || !data || !data_size)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
-	u32 internal_data_addr = 0, internal_data_size = 0;
-	error_code error = check_and_get_data(data, data_size, internal_data_addr, internal_data_size);
-	if (error < 0)
-		return error;
-
-	std::memset(result.get_ptr(), 0, sizeof(SceNpCommerce2GetCategoryContentsResult));
-	initialize_common_data(&result->commonData, data, internal_data_addr, internal_data_size);
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetCategoryInfo(vm::cptr<SceNpCommerce2GetCategoryContentsResult> result, vm::ptr<SceNpCommerce2CategoryInfo> categoryInfo)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetCategoryInfo(result=*0x%x, categoryInfo=*0x%x)", result, categoryInfo);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!result || !categoryInfo)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
-	// Hack to stop crashes in some games
-	return SCE_NP_COMMERCE2_ERROR_SERVER_MAINTENANCE;
+	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetContentInfo(vm::cptr<SceNpCommerce2GetCategoryContentsResult> result, u32 index, vm::ptr<SceNpCommerce2ContentInfo> contentInfo)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetContentInfo(result=*0x%x, index=%d, contentInfo=*0x%x)", result, index, contentInfo);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!result || !contentInfo)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetCategoryInfoFromContentInfo(vm::cptr<SceNpCommerce2ContentInfo> contentInfo, vm::ptr<SceNpCommerce2CategoryInfo> categoryInfo)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetCategoryInfoFromContentInfo(contentInfo=*0x%x, categoryInfo=*0x%x)", contentInfo, categoryInfo);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!contentInfo || !categoryInfo)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetGameProductInfoFromContentInfo(vm::cptr<SceNpCommerce2ContentInfo> contentInfo, vm::ptr<SceNpCommerce2GameProductInfo> gameProductInfo)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetGameProductInfoFromContentInfo(contentInfo=*0x%x, gameProductInfo=*0x%x)", contentInfo, gameProductInfo);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!contentInfo || !gameProductInfo)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
@@ -503,87 +244,30 @@ error_code sceNpCommerce2DestroyGetCategoryContentsResult(vm::ptr<SceNpCommerce2
 error_code sceNpCommerce2GetProductInfoCreateReq(u32 ctx_id, vm::ptr<u32> req_id)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetProductInfoCreateReq(ctx_id=%d, req_id=*0x%x)", ctx_id, req_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!req_id)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetProductInfoStart(u32 req_id, vm::cptr<char> categoryId, vm::cptr<char> productId)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetProductInfoStart(req_id=%d, categoryId=%s, productId=%s)", req_id, categoryId, productId);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!productId)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
-error_code sceNpCommerce2GetProductInfoGetResult(u32 req_id, vm::ptr<void> buf, u32 buf_size, vm::ptr<u32> fill_size)
+error_code sceNpCommerce2GetProductInfoGetResult(u32 req_id, vm::ptr<void> buf, u64 buf_size, vm::ptr<u64> fill_size) // TODO: correct size types?
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetProductInfoGetResult(req_id=%d, buf=*0x%x, buf_size=%d, fill_size=*0x%x)", req_id, buf, buf_size, fill_size);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (buf_size < SCE_NP_COMMERCE2_RECV_BUF_SIZE)
-		return SCE_NP_COMMERCE2_ERROR_INSUFFICIENT_BUF_SIZE;
-
-	return get_result(req_id, buf, buf_size, fill_size);
+	return CELL_OK;
 }
 
-error_code sceNpCommerce2InitGetProductInfoResult(vm::ptr<SceNpCommerce2GetProductInfoResult> result, vm::ptr<void> data, u32 data_size)
+error_code sceNpCommerce2InitGetProductInfoResult(vm::ptr<SceNpCommerce2GetProductInfoResult> result, vm::ptr<void> data, u64 data_size) // TODO: correct size types?
 {
 	sceNpCommerce2.todo("sceNpCommerce2InitGetProductInfoResult(result=*0x%x, data=*0x%x, data_size=%d)", result, data, data_size);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!result || !data || !data_size)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
-	u32 internal_data_addr = 0, internal_data_size = 0;
-	error_code error = check_and_get_data(data, data_size, internal_data_addr, internal_data_size);
-	if (error < 0)
-		return error;
-
-	std::memset(result.get_ptr(), 0, sizeof(SceNpCommerce2GetProductInfoResult));
-	initialize_common_data(&result->commonData, data, internal_data_addr, internal_data_size);
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetGameProductInfo(vm::cptr<SceNpCommerce2GetProductInfoResult> result, vm::ptr<SceNpCommerce2GameProductInfo> gameProductInfo)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetGameProductInfo(result=*0x%x, gameProductInfo=*0x%x)", result, gameProductInfo);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!result || !gameProductInfo)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
@@ -596,87 +280,30 @@ error_code sceNpCommerce2DestroyGetProductInfoResult(vm::ptr<SceNpCommerce2GetPr
 error_code sceNpCommerce2GetProductInfoListCreateReq(u32 ctx_id, vm::ptr<u32> req_id)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetProductInfoListCreateReq(ctx_id=%d, req_id=*0x%x)", ctx_id, req_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!req_id)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
-error_code sceNpCommerce2GetProductInfoListStart(u32 req_id, vm::cpptr<char> productIds, u32 productNum)
+error_code sceNpCommerce2GetProductInfoListStart(u32 req_id, vm::cptr<char[]> productIds, u32 productNum)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetProductInfoListStart(req_id=%d, productIds=*0x%x, productNum=%d)", req_id, productIds, productNum);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!productIds || !productNum || productNum > SCE_NP_COMMERCE2_GETPRODLIST_MAX_COUNT)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
-error_code sceNpCommerce2GetProductInfoListGetResult(u32 req_id, vm::ptr<void> buf, u32 buf_size, vm::ptr<u32> fill_size)
+error_code sceNpCommerce2GetProductInfoListGetResult(u32 req_id, vm::ptr<void> buf, u64 buf_size, vm::ptr<u64> fill_size) // TODO: correct size types?
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetProductInfoListGetResult(req_id=%d, buf=*0x%x, buf_size=%d, fill_size=*0x%x)", req_id, buf, buf_size, fill_size);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (buf_size < SCE_NP_COMMERCE2_RECV_BUF_SIZE)
-		return SCE_NP_COMMERCE2_ERROR_INSUFFICIENT_BUF_SIZE;
-
-	return get_result(req_id, buf, buf_size, fill_size);
+	return CELL_OK;
 }
 
-error_code sceNpCommerce2InitGetProductInfoListResult(vm::ptr<SceNpCommerce2GetProductInfoListResult> result, vm::ptr<void> data, u32 data_size)
+error_code sceNpCommerce2InitGetProductInfoListResult(vm::ptr<SceNpCommerce2GetProductInfoListResult> result, vm::ptr<void> data, u64 data_size) // TODO: correct size types?
 {
 	sceNpCommerce2.todo("sceNpCommerce2InitGetProductInfoListResult(result=*0x%x, data=*0x%x, data_size=%d)", result, data, data_size);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!result || !data || !data_size)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
-	u32 internal_data_addr = 0, internal_data_size = 0;
-	error_code error = check_and_get_data(data, data_size, internal_data_addr, internal_data_size);
-	if (error < 0)
-		return error;
-
-	std::memset(result.get_ptr(), 0, sizeof(SceNpCommerce2GetProductInfoListResult));
-	initialize_common_data(&result->commonData, data, internal_data_addr, internal_data_size);
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetGameProductInfoFromGetProductInfoListResult(vm::cptr<SceNpCommerce2GetProductInfoListResult> result, u32 index, vm::ptr<SceNpCommerce2GameProductInfo> gameProductInfo)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetGameProductInfoFromGetProductInfoListResult(result=*0x%x, index=%d, data=*0x%x)", result, index, gameProductInfo);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!result || !gameProductInfo)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
@@ -689,381 +316,114 @@ error_code sceNpCommerce2DestroyGetProductInfoListResult(vm::ptr<SceNpCommerce2G
 error_code sceNpCommerce2GetContentRatingInfoFromGameProductInfo(vm::cptr<SceNpCommerce2GameProductInfo> gameProductInfo, vm::ptr<SceNpCommerce2ContentRatingInfo> contentRatingInfo)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetContentRatingInfoFromGameProductInfo(gameProductInfo=*0x%x, contentRatingInfo=*0x%x)", gameProductInfo, contentRatingInfo);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!gameProductInfo || !contentRatingInfo)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetContentRatingInfoFromCategoryInfo(vm::cptr<SceNpCommerce2CategoryInfo> categoryInfo, vm::ptr<SceNpCommerce2ContentRatingInfo> contentRatingInfo)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetContentRatingInfoFromCategoryInfo(categoryInfo=*0x%x, contentRatingInfo=*0x%x)", categoryInfo, contentRatingInfo);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!categoryInfo || !contentRatingInfo)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetContentRatingDescriptor(vm::cptr<SceNpCommerce2ContentRatingInfo> contentRatingInfo, u32 index, vm::ptr<SceNpCommerce2ContentRatingDescriptor> contentRatingDescriptor)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetContentRatingDescriptor(contentRatingInfo=*0x%x, index=%d, contentRatingDescriptor=*0x%x)", contentRatingInfo, index, contentRatingDescriptor);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!contentRatingInfo || !contentRatingDescriptor)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetGameSkuInfoFromGameProductInfo(vm::cptr<SceNpCommerce2GameProductInfo> gameProductInfo, u32 index, vm::ptr<SceNpCommerce2GameSkuInfo> gameSkuInfo)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetGameSkuInfoFromGameProductInfo(gameProductInfo=*0x%x, index=%d, gameSkuInfo=*0x%x)", gameProductInfo, index, gameSkuInfo);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!gameProductInfo || !gameSkuInfo)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
 	return CELL_OK;
 }
 
-error_code sceNpCommerce2GetPrice(u32 ctx_id, vm::ptr<char> buf, u32 buflen, u32 price)
+error_code sceNpCommerce2GetPrice(u32 ctx_id, vm::ptr<char> buf, u64 buflen, u32 price) // TODO: correct size types?
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetPrice(ctx_id=%d, buf=*0x%x, buflen=%d, price=%d)", ctx_id, buf, buflen, price);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
-error_code sceNpCommerce2DoCheckoutStartAsync(u32 ctx_id, vm::cpptr<char> sku_ids, u32 sku_num, u32 container)
+error_code sceNpCommerce2DoCheckoutStartAsync(u32 ctx_id, vm::cptr<char[]> sku_ids, u32 sku_num, u32 container)
 {
 	sceNpCommerce2.todo("sceNpCommerce2DoCheckoutStartAsync(ctx_id=%d, sku_ids=*0x%x, sku_num=%d, container=%d)", ctx_id, sku_ids, sku_num, container);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (sku_num > SCE_NP_COMMERCE2_SKU_CHECKOUT_MAX)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_SKU_NUM;
-
-	for (u32 i = 0; i < sku_num; i++)
-	{
-		if (!sku_ids || !sku_ids[i] || !sku_ids[i][0])
-			return SCE_NP_COMMERCE2_ERROR_INVALID_SKUID;
-	}
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE2_ERROR_INVALID_MEMORY_CONTAINER;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE2_ERROR_INSUFFICIENT_MEMORY_CONTAINER;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2DoCheckoutFinishAsync(u32 ctx_id)
 {
 	sceNpCommerce2.todo("sceNpCommerce2DoCheckoutFinishAsync(ctx_id=%d)", ctx_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2DoProductBrowseStartAsync(u32 ctx_id, vm::cptr<char> product_id, u32 container, vm::cptr<SceNpCommerce2ProductBrowseParam> param)
 {
 	sceNpCommerce2.todo("sceNpCommerce2DoProductBrowseStartAsync(ctx_id=%d, product_id=%s, container=%d, param=*0x%x)", ctx_id, product_id, container, param);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!product_id || !product_id[0])
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
-	if (param && param->size != sizeof(SceNpCommerce2ProductBrowseParam))
-		return SCE_NP_COMMERCE2_ERROR_INVALID_SIZE;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE2_ERROR_INVALID_MEMORY_CONTAINER;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE2_ERROR_INSUFFICIENT_MEMORY_CONTAINER;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2DoProductBrowseFinishAsync(u32 ctx_id)
 {
 	sceNpCommerce2.todo("sceNpCommerce2DoProductBrowseFinishAsync(ctx_id=%d)", ctx_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
-error_code sceNpCommerce2DoDlListStartAsync(u32 ctx_id, vm::cptr<char> service_id, vm::cpptr<char> sku_ids, u32 sku_num, u32 container)
+error_code sceNpCommerce2DoDlListStartAsync(u32 ctx_id, vm::cptr<char> service_id, vm::cptr<char[]> sku_ids, u32 sku_num, u32 container)
 {
 	sceNpCommerce2.todo("sceNpCommerce2DoDlListStartAsync(ctx_id=%d, service_id=%s, sku_ids=*0x%x, sku_num=%d, container=%d)", ctx_id, service_id, sku_ids, sku_num, container);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (sku_num > SCE_NP_COMMERCE2_SKU_CHECKOUT_MAX)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_SKU_NUM;
-
-	if (sku_num == 0)
-	{
-		if (!service_id)
-			return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-	}
-	else
-	{
-		for (u32 i = 0; i < sku_num; i++)
-		{
-			if (!sku_ids || !sku_ids[i] || !sku_ids[i][0])
-				return SCE_NP_COMMERCE2_ERROR_INVALID_SKUID;
-		}
-	}
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE2_ERROR_INVALID_MEMORY_CONTAINER;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE2_ERROR_INSUFFICIENT_MEMORY_CONTAINER;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2DoDlListFinishAsync(u32 ctx_id)
 {
 	sceNpCommerce2.todo("sceNpCommerce2DoDlListFinishAsync(ctx_id=%d)", ctx_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2DoProductCodeStartAsync(u32 ctx_id, u32 container, vm::cptr<SceNpCommerce2ProductCodeParam> param)
 {
 	sceNpCommerce2.todo("sceNpCommerce2DoProductCodeStartAsync(ctx_id=%d, container=%d, param=*0x%x)", ctx_id, container, param);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!param)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
-	if (param->size != sizeof(SceNpCommerce2ProductCodeParam))
-		return SCE_NP_COMMERCE2_ERROR_INVALID_SIZE;
-
-	if (param->inputMode != SCE_NP_COMMERCE2_PRODUCT_CODE_INPUT_MODE_USER_INPUT)
-	{
-		if (param->inputMode != SCE_NP_COMMERCE2_PRODUCT_CODE_INPUT_MODE_CODE_SPECIFIED)
-			return SCE_NP_COMMERCE2_ERROR_INVALID_TARGET_TYPE;
-
-		if (!param->code1[0] || !param->code2[0] || !param->code3[0])
-			return SCE_NP_COMMERCE2_ERROR_INVALID_TARGET_ID;
-
-		for (u32 i = 0; i < SCE_NP_COMMERCE2_PRODUCT_CODE_BLOCK_LEN; i++)
-		{
-			if (!isalnum(param->code1[i]) || !isalnum(param->code2[i]) || !isalnum(param->code3[i]))
-				return SCE_NP_COMMERCE2_ERROR_INVALID_TARGET_ID;
-		}
-	}
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE2_ERROR_INVALID_MEMORY_CONTAINER;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE2_ERROR_INSUFFICIENT_MEMORY_CONTAINER;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2DoProductCodeFinishAsync(u32 ctx_id)
 {
 	sceNpCommerce2.todo("sceNpCommerce2DoProductCodeFinishAsync(ctx_id=%d)", ctx_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2GetBGDLAvailability(vm::ptr<b8> bgdlAvailability)
 {
 	sceNpCommerce2.todo("sceNpCommerce2GetBGDLAvailability(bgdlAvailability=*0x%x)", bgdlAvailability);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!bgdlAvailability)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
-	*bgdlAvailability = false; // TODO
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2SetBGDLAvailability(b8 bgdlAvailability)
 {
 	sceNpCommerce2.todo("sceNpCommerce2SetBGDLAvailability(bgdlAvailability=%d)", bgdlAvailability);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2AbortReq(u32 req_id)
 {
 	sceNpCommerce2.todo("sceNpCommerce2AbortReq(req_id=%d)", req_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
 	return CELL_OK;
 }
 
 error_code sceNpCommerce2DestroyReq(u32 req_id)
 {
 	sceNpCommerce2.todo("sceNpCommerce2DestroyReq(req_id=%d)", req_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
 	return CELL_OK;
 }
 
-error_code sceNpCommerce2DoServiceListStartAsync(u32 ctx_id, vm::ptr<char> serviceId, u32 container, vm::ptr<SceNpCommerce2ProductBrowseParam> param)
+error_code sceNpCommerce2DoServiceListStartAsync()
 {
-	sceNpCommerce2.todo("sceNpCommerce2DoServiceListStartAsync(ctx_id=%d, serviceId=*0x%x, container=%d, param=*0x%x)", ctx_id, serviceId, container, param);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	if (!param || !serviceId)
-		return SCE_NP_COMMERCE2_ERROR_INVALID_ARGUMENT;
-
-	if (param->size != sizeof(SceNpCommerce2ProductBrowseParam))
-		return SCE_NP_COMMERCE2_ERROR_INVALID_SIZE;
-
-	if (!serviceId[0])
-		return SCE_NP_COMMERCE2_ERROR_INVALID_TARGET_ID;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE2_ERROR_INVALID_MEMORY_CONTAINER;
-
-	if (false) // TODO
-		return SCE_NP_COMMERCE2_ERROR_INSUFFICIENT_MEMORY_CONTAINER;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
+	sceNpCommerce2.todo("sceNpCommerce2DoServiceListStartAsync()");
 	return CELL_OK;
 }
 
-error_code sceNpCommerce2DoServiceListFinishAsync(u32 ctx_id)
+error_code sceNpCommerce2DoServiceListFinishAsync()
 {
-	sceNpCommerce2.todo("sceNpCommerce2DoServiceListFinishAsync(ctx_id=%d)", ctx_id);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_Com2_init)
-		return SCE_NP_COMMERCE2_ERROR_NOT_INITIALIZED;
-
-	const auto ctx = get_commerce2_context(ctx_id);
-	if (!ctx)
-		return SCE_NP_COMMERCE2_ERROR_CTX_NOT_FOUND;
-
+	sceNpCommerce2.todo("sceNpCommerce2DoServiceListFinishAsync()");
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.h b/rpcs3/Emu/Cell/Modules/sceNpCommerce2.h
index c6600e9cce..5975667748 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.h
+++ b/rpcs3/Emu/Cell/Modules/sceNpCommerce2.h
@@ -48,6 +48,7 @@ enum SceNpCommerce2Error
 	SCE_NP_COMMERCE2_SERVER_ERROR_VOUCHER_ALREADY_CONSUMED      = 0x80023130,
 	SCE_NP_COMMERCE2_SERVER_ERROR_EXCEEDS_AGE_LIMIT_IN_BROWSING = 0x80023139,
 	SCE_NP_COMMERCE2_SYSTEM_UTIL_ERROR_INVALID_VOUCHER          = 0x80024002,
+	SCE_NP_COMMERCE_ERROR_REQ_BUSY                              = 0x8002940d,
 };
 
 // Event types
@@ -265,7 +266,6 @@ struct SceNpCommerce2GameProductInfo
 struct SceNpCommerce2GetProductInfoListResult
 {
 	SceNpCommerce2CommonData commonData;
-	be_t<u32> countOfProductInfo;
 };
 
 // Structure for rating information
@@ -317,7 +317,7 @@ struct SceNpCommerce2ProductBrowseParam
 struct SceNpCommerce2ProductCodeParam
 {
 	be_t<u32> size;
-	be_t<u32> inputMode;
+	be_t<u32> inputMode; // Unsigned ints go into be_t<u32>, right?
 	s8 code1[SCE_NP_COMMERCE2_PRODUCT_CODE_BLOCK_LEN + 1];
 	s8 padding1[3];
 	s8 code2[SCE_NP_COMMERCE2_PRODUCT_CODE_BLOCK_LEN + 1];
diff --git a/rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp b/rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp
index d21f6f7fc0..099f7997d6 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp
+++ b/rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp
@@ -1,6 +1,10 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "sceNp.h"
+
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
 
 LOG_CHANNEL(sceNpMatchingInt);
 
@@ -10,55 +14,48 @@ error_code sceNpMatchingCancelRequest()
 	return CELL_OK;
 }
 
-error_code sceNpMatchingGetRoomMemberList(u32 ctx_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<u32> buflen, vm::ptr<void> buf)
+error_code sceNpMatchingGetRoomMemberList()
 {
-	sceNpMatchingInt.warning("sceNpMatchingGetRoomMemberList(ctx_id=%d, room_id=*0x%x, buflen=*0x%x, buf=*0x%x)", ctx_id, room_id, buflen, buf);
-
-	return matching_get_room_member_list(ctx_id, room_id, buflen, buf);
+	UNIMPLEMENTED_FUNC(sceNpMatchingInt);
+	return CELL_OK;
 }
 
-error_code sceNpMatchingJoinRoomWithoutGUI(u32 ctx_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
+error_code sceNpMatchingJoinRoomWithoutGUI()
 {
-	sceNpMatchingInt.warning("sceNpMatchingJoinRoomWithoutGUI(ctx_id=%d, room_id=*0x%x, handler=*0x%x, arg=*0x%x)", ctx_id, room_id, handler, arg);
-
-	return matching_join_room(ctx_id, room_id, handler, arg);
+	UNIMPLEMENTED_FUNC(sceNpMatchingInt);
+	return CELL_OK;
 }
 
-error_code OLD_sceNpMatchingJoinRoomGUI(u32 ctx_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
+// Parameter "unknown" added to distinguish this function
+// from the one in sceNp.cpp which has the same name
+error_code sceNpMatchingJoinRoomGUI(vm::ptr<void> unknown)
 {
-	sceNpMatchingInt.warning("OLD_sceNpMatchingJoinRoomGUI(ctx_id=%d, room_id=*0x%x, handler=*0x%x, arg=*0x%x)", ctx_id, room_id, handler, arg);
-
-	return matching_join_room(ctx_id, room_id, handler, arg);
+	UNIMPLEMENTED_FUNC(sceNpMatchingInt);
+	return CELL_OK;
 }
 
-error_code OLD_sceNpMatchingSetRoomInfoNoLimit(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr, vm::ptr<u32> req_id)
+error_code sceNpMatchingSetRoomInfoNoLimit(vm::ptr<void> unknown)
 {
-	sceNpMatchingInt.warning("OLD_sceNpMatchingSetRoomInfoNoLimit(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, attr=*0x%x, req_id=*0x%x)", ctx_id, lobby_id, room_id, attr, req_id);
-
-	return matching_set_room_info(ctx_id, lobby_id, room_id, attr, req_id, false);
+	UNIMPLEMENTED_FUNC(sceNpMatchingInt);
+	return CELL_OK;
 }
 
-error_code sceNpMatchingGetRoomListWithoutGUI(u32 ctx_id, vm::ptr<SceNpCommunicationId> communicationId, vm::ptr<SceNpMatchingReqRange> range, vm::ptr<SceNpMatchingSearchCondition> cond,
-	vm::ptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
+error_code sceNpMatchingGetRoomListWithoutGUI()
 {
-	sceNpMatchingInt.warning("sceNpMatchingGetRoomListWithoutGUI(ctx_id=%d, communicationId=*0x%x, range=*0x%x, cond=*0x%x, attr=*0x%x, handler=*0x%x, arg=*0x%x)", ctx_id, communicationId, range, cond, attr, handler, arg);
-
-	return matching_get_room_list(ctx_id, communicationId, range, cond, attr, handler, arg, false);
+	UNIMPLEMENTED_FUNC(sceNpMatchingInt);
+	return CELL_OK;
 }
 
-error_code sceNpMatchingGetRoomListGUI(u32 ctx_id, vm::ptr<SceNpCommunicationId> communicationId, vm::ptr<SceNpMatchingReqRange> range, vm::ptr<SceNpMatchingSearchCondition> cond,
-	vm::ptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
+error_code sceNpMatchingGetRoomListGUI()
 {
-	sceNpMatchingInt.warning("sceNpMatchingGetRoomListGUI(ctx_id=%d, communicationId=*0x%x, range=*0x%x, cond=*0x%x, attr=*0x%x, handler=*0x%x, arg=*0x%x)", ctx_id, communicationId, range, cond, attr, handler, arg);
-
-	return matching_get_room_list(ctx_id, communicationId, range, cond, attr, handler, arg, false);
+	UNIMPLEMENTED_FUNC(sceNpMatchingInt);
+	return CELL_OK;
 }
 
-error_code OLD_sceNpMatchingGetRoomInfoNoLimit(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr, vm::ptr<u32> req_id)
+error_code sceNpMatchingGetRoomInfoNoLimit(vm::ptr<void> unknown)
 {
-	sceNpMatchingInt.warning("OLD_sceNpMatchingGetRoomInfoNoLimit(ctx_id=%d, lobby_id=*0x%x, room_id=*0x%x, attr=*0x%x, req_id=*0x%x)", ctx_id, lobby_id, room_id, attr, req_id);
-
-	return matching_get_room_info(ctx_id, lobby_id, room_id, attr, req_id, false);
+	UNIMPLEMENTED_FUNC(sceNpMatchingInt);
+	return CELL_OK;
 }
 
 error_code sceNpMatchingCancelRequestGUI()
@@ -73,27 +70,22 @@ error_code sceNpMatchingSendRoomMessage()
 	return CELL_OK;
 }
 
-error_code sceNpMatchingCreateRoomWithoutGUI(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
+error_code sceNpMatchingCreateRoomWithoutGUI()
 {
-	sceNpMatchingInt.warning("sceNpMatchingCreateRoomWithoutGUI(ctx_id=%d, communicationId=*0x%x, attr=*0x%x, handler=*0x%x, arg=*0x%x)", ctx_id, communicationId, attr, handler, arg);
-
-	return matching_create_room(ctx_id, communicationId, attr, handler, arg);
+	UNIMPLEMENTED_FUNC(sceNpMatchingInt);
+	return CELL_OK;
 }
 
-// This module has some conflicting function names with sceNp module, hence the REG_FNID
 DECLARE(ppu_module_manager::sceNpMatchingInt)("sceNpMatchingInt", []()
 {
 	REG_FUNC(sceNpMatchingInt, sceNpMatchingCancelRequest);
 	REG_FUNC(sceNpMatchingInt, sceNpMatchingGetRoomMemberList);
 	REG_FUNC(sceNpMatchingInt, sceNpMatchingJoinRoomWithoutGUI);
-	// REG_FUNC(sceNpMatchingInt, sceNpMatchingJoinRoomGUI);
-	REG_FNID(sceNpMatchingInt, "sceNpMatchingJoinRoomGUI", OLD_sceNpMatchingJoinRoomGUI);
-	// REG_FUNC(sceNpMatchingInt, sceNpMatchingSetRoomInfoNoLimit);
-	REG_FNID(sceNpMatchingInt, "sceNpMatchingSetRoomInfoNoLimit", OLD_sceNpMatchingSetRoomInfoNoLimit);
+	REG_FUNC(sceNpMatchingInt, sceNpMatchingJoinRoomGUI);
+	REG_FUNC(sceNpMatchingInt, sceNpMatchingSetRoomInfoNoLimit);
 	REG_FUNC(sceNpMatchingInt, sceNpMatchingGetRoomListWithoutGUI);
 	REG_FUNC(sceNpMatchingInt, sceNpMatchingGetRoomListGUI);
-	// REG_FUNC(sceNpMatchingInt, sceNpMatchingGetRoomInfoNoLimit);
-	REG_FNID(sceNpMatchingInt, "sceNpMatchingGetRoomInfoNoLimit", OLD_sceNpMatchingGetRoomInfoNoLimit);
+	REG_FUNC(sceNpMatchingInt, sceNpMatchingGetRoomInfoNoLimit);
 	REG_FUNC(sceNpMatchingInt, sceNpMatchingCancelRequestGUI);
 	REG_FUNC(sceNpMatchingInt, sceNpMatchingSendRoomMessage);
 	REG_FUNC(sceNpMatchingInt, sceNpMatchingCreateRoomWithoutGUI);
diff --git a/rpcs3/Emu/Cell/Modules/sceNpPlus.cpp b/rpcs3/Emu/Cell/Modules/sceNpPlus.cpp
deleted file mode 100644
index 70b3f5181b..0000000000
--- a/rpcs3/Emu/Cell/Modules/sceNpPlus.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "stdafx.h"
-
-#include "Emu/Cell/PPUModule.h"
-
-LOG_CHANNEL(sceNpPlus);
-
-error_code sceNpManagerIsSP()
-{
-	sceNpPlus.warning("sceNpManagerIsSP()");
-	// TODO seems to be cut to 1 byte by pshome likely a bool but may be more.
-	return not_an_error(1);
-}
-
-DECLARE(ppu_module_manager::sceNpPlus)("sceNpPlus", []()
-{
-	REG_FUNC(sceNpPlus, sceNpManagerIsSP);
-});
diff --git a/rpcs3/Emu/Cell/Modules/sceNpPlus.h b/rpcs3/Emu/Cell/Modules/sceNpPlus.h
deleted file mode 100644
index b7ebf4284e..0000000000
--- a/rpcs3/Emu/Cell/Modules/sceNpPlus.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-error_code sceNpManagerIsSP();
diff --git a/rpcs3/Emu/Cell/Modules/sceNpSns.cpp b/rpcs3/Emu/Cell/Modules/sceNpSns.cpp
index 7a77d6c281..8bae005a9d 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpSns.cpp
+++ b/rpcs3/Emu/Cell/Modules/sceNpSns.cpp
@@ -139,7 +139,7 @@ error_code sceNpSnsFbAbortHandle(u32 handle)
 		return SCE_NP_SNS_ERROR_INVALID_ARGUMENT;
 	}
 
-	const auto sfh = idm::get_unlocked<sns_fb_handle_t>(handle);
+	const auto sfh = idm::get<sns_fb_handle_t>(handle);
 
 	if (!sfh)
 	{
@@ -172,14 +172,14 @@ error_code sceNpSnsFbGetAccessToken(u32 handle, vm::cptr<SceNpSnsFbAccessTokenPa
 		return SCE_NP_SNS_ERROR_INVALID_ARGUMENT;
 	}
 
-	const auto sfh = idm::get_unlocked<sns_fb_handle_t>(handle);
+	const auto sfh = idm::get<sns_fb_handle_t>(handle);
 
 	if (!sfh)
 	{
 		return SCE_NP_SNS_FB_ERROR_UNKNOWN_HANDLE;
 	}
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (nph.get_psn_status() == SCE_NP_MANAGER_STATUS_OFFLINE)
 	{
@@ -200,7 +200,7 @@ s32 sceNpSnsFbStreamPublish(u32 handle) // add more arguments
 		return SCE_NP_SNS_ERROR_INVALID_ARGUMENT;
 	}
 
-	const auto sfh = idm::get_unlocked<sns_fb_handle_t>(handle);
+	const auto sfh = idm::get<sns_fb_handle_t>(handle);
 
 	if (!sfh)
 	{
@@ -258,7 +258,7 @@ s32 sceNpSnsFbLoadThrottle(u32 handle)
 		return SCE_NP_SNS_ERROR_INVALID_ARGUMENT;
 	}
 
-	const auto sfh = idm::get_unlocked<sns_fb_handle_t>(handle);
+	const auto sfh = idm::get<sns_fb_handle_t>(handle);
 
 	if (!sfh)
 	{
@@ -299,14 +299,14 @@ error_code sceNpSnsFbGetLongAccessToken(u32 handle, vm::cptr<SceNpSnsFbAccessTok
 		return SCE_NP_SNS_ERROR_INVALID_ARGUMENT;
 	}
 
-	const auto sfh = idm::get_unlocked<sns_fb_handle_t>(handle);
+	const auto sfh = idm::get<sns_fb_handle_t>(handle);
 
 	if (!sfh)
 	{
 		return SCE_NP_SNS_FB_ERROR_UNKNOWN_HANDLE;
 	}
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
 
 	if (nph.get_psn_status() == SCE_NP_MANAGER_STATUS_OFFLINE)
 	{
diff --git a/rpcs3/Emu/Cell/Modules/sceNpSns.h b/rpcs3/Emu/Cell/Modules/sceNpSns.h
index dc0106c763..cba77db26a 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpSns.h
+++ b/rpcs3/Emu/Cell/Modules/sceNpSns.h
@@ -47,11 +47,6 @@ struct sns_fb_handle_t
 	static const u32 id_step  = 1;
 	static const u32 id_count = SCE_NP_SNS_FB_HANDLE_SLOT_MAX + 1;
 	static const u32 invalid  = SCE_NP_SNS_FB_INVALID_HANDLE;
-
-	SAVESTATE_INIT_POS(20);
-	sns_fb_handle_t() = default;
-	sns_fb_handle_t(utils::serial&){}
-	void save(utils::serial&){}
 };
 
 // Initialization parameters for functionalities coordinated with Facebook
diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp
index 3407778d64..9c3e1b15d6 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp
+++ b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp
@@ -1,11 +1,8 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/system_config.h"
 #include "Emu/VFS.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/timers.hpp"
-#include "Emu/Cell/Modules/cellMsgDialog.h"
 
 #include "Utilities/rXml.h"
 #include "Loader/TRP.h"
@@ -18,10 +15,9 @@
 #include "Utilities/StrUtil.h"
 
 #include "Emu/Cell/lv2/sys_event.h"
+#include "Emu/Cell/lv2/sys_process.h"
 #include "Emu/Cell/lv2/sys_fs.h"
 
-#include <algorithm>
-#include <functional>
 #include <shared_mutex>
 #include "util/asm.hpp"
 
@@ -36,51 +32,10 @@ struct trophy_context_t
 	static const u32 id_base = 1;
 	static const u32 id_step = 1;
 	static const u32 id_count = 4;
-	SAVESTATE_INIT_POS(42);
 
 	std::string trp_name;
+	fs::file trp_stream;
 	std::unique_ptr<TROPUSRLoader> tropusr;
-	bool read_only = false;
-
-	trophy_context_t() = default;
-
-	trophy_context_t(utils::serial& ar)
-		: trp_name(ar.pop<std::string>())
-	{
-		std::string trophy_path = vfs::get(Emu.GetDir() + "TROPDIR/" + trp_name + "/TROPHY.TRP");
-		fs::file trp_stream(trophy_path);
-
-		if (!trp_stream)
-		{
-			// Fallback
-			trophy_path = vfs::get("/dev_bdvd/PS3_GAME/TROPDIR/" + trp_name + "/TROPHY.TRP");
-			trp_stream.open(trophy_path);
-		}
-
-		if (!ar.pop<bool>())
-		{
-			ar(read_only);
-			return;
-		}
-
-		ar(read_only);
-
-		if (!trp_stream && g_cfg.savestate.state_inspection_mode)
-		{
-			return;
-		}
-
-		const std::string trophyPath = "/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + trp_name;
-		tropusr = std::make_unique<TROPUSRLoader>();
-		const std::string trophyUsrPath = trophyPath + "/TROPUSR.DAT";
-		const std::string trophyConfPath = trophyPath + "/TROPCONF.SFM";
-		ensure(tropusr->Load(trophyUsrPath, trophyConfPath).success);
-	}
-
-	void save(utils::serial& ar)
-	{
-		ar(trp_name, tropusr.operator bool(), read_only);
-	}
 };
 
 struct trophy_handle_t
@@ -88,21 +43,8 @@ struct trophy_handle_t
 	static const u32 id_base = 1;
 	static const u32 id_step = 1;
 	static const u32 id_count = 4;
-	SAVESTATE_INIT_POS(43);
 
 	bool is_aborted = false;
-
-	trophy_handle_t() = default;
-
-	trophy_handle_t(utils::serial& ar)
-		: is_aborted(ar)
-	{
-	}
-
-	void save(utils::serial& ar)
-	{
-		ar(is_aborted);
-	}
 };
 
 struct sce_np_trophy_manager
@@ -111,7 +53,7 @@ struct sce_np_trophy_manager
 	atomic_t<bool> is_initialized = false;
 
 	// Get context + check handle given
-	static std::pair<trophy_context_t*, SceNpTrophyError> get_context_ex(u32 context, u32 handle, bool test_writeable = false)
+	static std::pair<trophy_context_t*, SceNpTrophyError> get_context_ex(u32 context, u32 handle)
 	{
 		decltype(get_context_ex(0, 0)) res{};
 		auto& [ctxt, error] = res;
@@ -124,7 +66,7 @@ struct sce_np_trophy_manager
 			return res;
 		}
 
-		ctxt = idm::check_unlocked<trophy_context_t>(context);
+		ctxt = idm::check<trophy_context_t>(context);
 
 		if (!ctxt)
 		{
@@ -132,12 +74,6 @@ struct sce_np_trophy_manager
 			return res;
 		}
 
-		if (test_writeable && ctxt->read_only)
-		{
-			error = SCE_NP_TROPHY_ERROR_INVALID_CONTEXT;
-			return res;
-		}
-
 		if (handle < trophy_handle_t::id_base ||
 			handle >= trophy_handle_t::id_base + trophy_handle_t::id_count)
 		{
@@ -145,7 +81,7 @@ struct sce_np_trophy_manager
 			return res;
 		}
 
-		const auto hndl = idm::check_unlocked<trophy_handle_t>(handle);
+		const auto hndl = idm::check<trophy_handle_t>(handle);
 
 		if (!hndl)
 		{
@@ -160,25 +96,6 @@ struct sce_np_trophy_manager
 
 		return res;
 	}
-
-	SAVESTATE_INIT_POS(12);
-
-	sce_np_trophy_manager() = default;
-
-	sce_np_trophy_manager(utils::serial& ar)
-		: is_initialized(ar)
-	{
-	}
-
-	void save(utils::serial& ar)
-	{
-		ar(is_initialized);
-
-		if (is_initialized)
-		{
-			USING_SERIALIZATION_VERSION(sceNpTrophy);
-		}
-	}
 };
 
 template<>
@@ -246,15 +163,6 @@ void fmt_class_string<SceNpCommunicationSignature>::format(std::string& out, u64
 	fmt::append(out, "%s", sign.data);
 }
 
-template <>
-void fmt_class_string<SceNpCommunicationId>::format(std::string& out, u64 arg)
-{
-	const auto& id = get_object(arg);
-
-	const u8 term = id.data[9];
-	fmt::append(out, "{ data='%s', term='%s' (0x%x), num=%d, dummy=%d }", id.data, std::isprint(term) ? fmt::format("%c", term) : "", term, id.num, id.dummy);
-}
-
 // Helpers
 
 static error_code NpTrophyGetTrophyInfo(const trophy_context_t* ctxt, s32 trophyId, SceNpTrophyDetails* details, SceNpTrophyData* data);
@@ -410,7 +318,7 @@ error_code sceNpTrophyAbortHandle(u32 handle)
 		return SCE_NP_TROPHY_ERROR_INVALID_ARGUMENT;
 	}
 
-	const auto hndl = idm::check_unlocked<trophy_handle_t>(handle);
+	const auto hndl = idm::check<trophy_handle_t>(handle);
 
 	if (!hndl)
 	{
@@ -443,7 +351,7 @@ error_code sceNpTrophyCreateContext(vm::ptr<u32> context, vm::cptr<SceNpCommunic
 		return SCE_NP_TROPHY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!context || !commId)
+	if (!context || !commId || !commSign)
 	{
 		return SCE_NP_TROPHY_ERROR_INVALID_ARGUMENT;
 	}
@@ -453,48 +361,44 @@ error_code sceNpTrophyCreateContext(vm::ptr<u32> context, vm::cptr<SceNpCommunic
 		return SCE_NP_TROPHY_ERROR_NOT_SUPPORTED;
 	}
 
-	sceNpTrophy.warning("sceNpTrophyCreateContext(): commId = %s", *commId);
-
 	// rough checks for further fmt::format call
-	const s32 comm_num = commId->num;
-	if (comm_num > 99)
+	if (commId->num > 99)
 	{
 		return SCE_NP_TROPHY_ERROR_INVALID_NP_COMM_ID;
 	}
 
 	// NOTE: commId->term is unused in our code (at least until someone finds out if we need to account for it)
 
-	// Generate trophy context name, limited to 9 characters
-	// Read once for thread-safety reasons
-	std::string name_str(commId->data, 9);
+	// generate trophy context name, limited to 9 characters
+	std::string_view name_sv(commId->data, 9);
 
 	// resize the name if it was shorter than expected
-	if (const auto pos = name_str.find_first_of('\0'); pos != std::string_view::npos)
+	if (const auto pos = name_sv.find_first_of('\0'); pos != std::string_view::npos)
 	{
-		name_str = name_str.substr(0, pos);
+		name_sv = name_sv.substr(0, pos);
 	}
 
-	const SceNpCommunicationSignature commSign_data = *commSign;
-
-	if (read_from_ptr<be_t<u32>>(commSign_data.data, 0) != NP_TROPHY_COMM_SIGN_MAGIC)
-	{
-		return SCE_NP_TROPHY_ERROR_INVALID_NP_COMM_ID;
-	}
-
-	if (std::any_of(&commSign_data.data[6], &commSign_data.data[6] + 6, FN(x != '\0')))
-	{
-		// 6 padding bytes - must be 0
-		return SCE_NP_TROPHY_ERROR_INVALID_NP_COMM_ID;
-	}
-
-	if (read_from_ptr<be_t<u16>>(commSign_data.data, 4) != 0x100)
-	{
-		// Signifies version (1.00), although only one constant is allowed
-		return SCE_NP_TROPHY_ERROR_INVALID_NP_COMM_ID;
-	}
+	sceNpTrophy.warning("sceNpTrophyCreateContext(): data='%s' term='%c' (0x%x) num=%d", name_sv, commId->data[9], commId->data[9], commId->num);
 
 	// append the commId number as "_xx"
-	std::string name = fmt::format("%s_%02d", name_str, comm_num);
+	const std::string name = fmt::format("%s_%02d", name_sv, commId->num);
+
+	// open trophy pack file
+	std::string trophy_path = vfs::get(Emu.GetDir() + "TROPDIR/" + name + "/TROPHY.TRP");
+	fs::file stream(trophy_path);
+
+	if (!stream && Emu.GetCat() == "GD")
+	{
+		sceNpTrophy.warning("sceNpTrophyCreateContext failed to open trophy file from boot path: '%s'", trophy_path);
+		trophy_path = vfs::get("/dev_bdvd/PS3_GAME/TROPDIR/" + name + "/TROPHY.TRP");
+		stream.open(trophy_path);
+	}
+
+	// check if exists and opened
+	if (!stream)
+	{
+		return {SCE_NP_TROPHY_ERROR_CONF_DOES_NOT_EXIST, trophy_path};
+	}
 
 	// create trophy context
 	const auto ctxt = idm::make_ptr<trophy_context_t>();
@@ -505,17 +409,10 @@ error_code sceNpTrophyCreateContext(vm::ptr<u32> context, vm::cptr<SceNpCommunic
 	}
 
 	// set trophy context parameters (could be passed to constructor through make_ptr call)
-	ctxt->trp_name = name;
-	ctxt->read_only = !!(options & SCE_NP_TROPHY_OPTIONS_CREATE_CONTEXT_READ_ONLY);
+	ctxt->trp_name = std::move(name);
+	ctxt->trp_stream = std::move(stream);
 	*context = idm::last_id();
 
-	// set current trophy name for trophy list overlay
-	{
-		current_trophy_name& current_id = g_fxo->get<current_trophy_name>();
-		std::lock_guard lock(current_id.mtx);
-		current_id.name = std::move(name);
-	}
-
 	return CELL_OK;
 }
 
@@ -546,11 +443,6 @@ error_code sceNpTrophyDestroyContext(u32 context)
 	return CELL_OK;
 }
 
-struct register_context_thread_name
-{
-	static constexpr std::string_view thread_name = "Trophy Register Thread";
-};
-
 error_code sceNpTrophyRegisterContext(ppu_thread& ppu, u32 context, u32 handle, vm::ptr<SceNpTrophyStatusCallback> statusCb, vm::ptr<void> arg, u64 options)
 {
 	sceNpTrophy.warning("sceNpTrophyRegisterContext(context=0x%x, handle=0x%x, statusCb=*0x%x, arg=*0x%x, options=0x%llx)", context, handle, statusCb, arg, options);
@@ -564,8 +456,8 @@ error_code sceNpTrophyRegisterContext(ppu_thread& ppu, u32 context, u32 handle,
 		return SCE_NP_TROPHY_ERROR_NOT_INITIALIZED;
 	}
 
-	const auto [ctxt, error] = trophy_manager.get_context_ex(context, handle, true);
-	const auto handle_ptr = idm::get_unlocked<trophy_handle_t>(handle);
+	const auto [ctxt, error] = trophy_manager.get_context_ex(context, handle);
+	const auto handle_ptr = idm::get<trophy_handle_t>(handle);
 
 	if (error)
 	{
@@ -577,100 +469,17 @@ error_code sceNpTrophyRegisterContext(ppu_thread& ppu, u32 context, u32 handle,
 		return SCE_NP_TROPHY_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (options > SCE_NP_TROPHY_OPTIONS_REGISTER_CONTEXT_SHOW_ERROR_EXIT)
-	{
-		return SCE_NP_TROPHY_ERROR_NOT_SUPPORTED;
-	}
-
-	const auto on_error = [options]()
-	{
-		if (!!(options & SCE_NP_TROPHY_OPTIONS_REGISTER_CONTEXT_SHOW_ERROR_EXIT))
-		{
-			static_cast<void>(open_exit_dialog("Error during trophy registration! The game will now be terminated.", true, msg_dialog_source::_sceNpTrophy));
-		}
-	};
-
-	// open trophy pack file
-	std::string trp_path = vfs::get(Emu.GetDir() + "TROPDIR/" + ctxt->trp_name + "/TROPHY.TRP");
-	fs::file stream(trp_path);
-
-	if (!stream && Emu.GetCat() == "GD")
-	{
-		sceNpTrophy.warning("sceNpTrophyRegisterContext failed to open trophy file from boot path: '%s' (%s)", trp_path, fs::g_tls_error);
-		trp_path = vfs::get("/dev_bdvd/PS3_GAME/TROPDIR/" + ctxt->trp_name + "/TROPHY.TRP");
-		stream.open(trp_path);
-	}
-
-	// check if exists and opened
-	if (!stream)
-	{
-		const std::string msg = fmt::format("Failed to open trophy file: '%s' (%s)", trp_path, fs::g_tls_error);
-		return {SCE_NP_TROPHY_ERROR_CONF_DOES_NOT_EXIST, msg};
-	}
-
-	// TODO:
-	// SCE_NP_TROPHY_STATUS_DATA_CORRUPT     -> reinstall
-	// SCE_NP_TROPHY_STATUS_REQUIRES_UPDATE  -> reinstall (for example if a patch has updates for the trophy data)
-	// SCE_NP_TROPHY_STATUS_CHANGES_DETECTED -> reinstall (only possible in dev mode)
-
-	const std::string trophyPath = "/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name;
-	const s32 trp_status = fs::is_dir(vfs::get(trophyPath)) ? SCE_NP_TROPHY_STATUS_INSTALLED : SCE_NP_TROPHY_STATUS_NOT_INSTALLED;
-
-	lock.unlock();
-
-	sceNpTrophy.notice("sceNpTrophyRegisterContext(): Callback is being called (trp_status=%u)", trp_status);
-
-	// "Ask permission" to install the trophy data.
-	// The callback is called once and then if it returns >= 0 the cb is called through events(coming from vsh) that are passed to the CB through cellSysutilCheckCallback
-	if (statusCb(ppu, context, trp_status, 0, 0, arg) < 0)
-	{
-		on_error();
-		return SCE_NP_TROPHY_ERROR_PROCESSING_ABORTED;
-	}
-
-	std::unique_lock lock2(trophy_manager.mtx);
-
-	// Rerun error checks, the callback could have changed stuff by calling sceNpTrophy functions internally
-
-	if (!trophy_manager.is_initialized)
-	{
-		on_error();
-		return SCE_NP_TROPHY_ERROR_NOT_INITIALIZED;
-	}
-
-	const auto [ctxt2, error2] = trophy_manager.get_context_ex(context, handle);
-
-	if (error2)
-	{
-		// Recheck for any errors, such as if AbortHandle was called
-		return error2;
-	}
-
-	// Paranoid checks: context/handler could have been destroyed and replaced with new ones with the same IDs
-	// Return an error for such cases
-	if (ctxt2 != ctxt)
-	{
-		on_error();
-		return SCE_NP_TROPHY_ERROR_UNKNOWN_CONTEXT;
-	}
-
-	if (handle_ptr.get() != idm::check_unlocked<trophy_handle_t>(handle))
-	{
-		on_error();
-		return SCE_NP_TROPHY_ERROR_UNKNOWN_HANDLE;
-	}
-
-	TRPLoader trp(stream);
+	TRPLoader trp(ctxt->trp_stream);
 	if (!trp.LoadHeader())
 	{
 		sceNpTrophy.error("sceNpTrophyRegisterContext(): Failed to load trophy config header");
-		on_error();
 		return SCE_NP_TROPHY_ERROR_ILLEGAL_UPDATE;
 	}
 
 	// Rename or discard certain entries based on the files found
 	const usz kTargetBufferLength = 31;
-	char target[kTargetBufferLength + 1]{};
+	char target[kTargetBufferLength + 1];
+	target[kTargetBufferLength] = 0;
 	strcpy_trunc(target, fmt::format("TROP_%02d.SFM", static_cast<s32>(g_cfg.sys.language)));
 
 	if (trp.ContainsEntry(target))
@@ -687,7 +496,6 @@ error_code sceNpTrophyRegisterContext(ppu_thread& ppu, u32 context, u32 handle,
 	else if (!trp.ContainsEntry("TROPCONF.SFM"))
 	{
 		sceNpTrophy.error("sceNpTrophyRegisterContext(): Invalid/Incomplete trophy config");
-		on_error();
 		return SCE_NP_TROPHY_ERROR_ILLEGAL_UPDATE;
 	}
 
@@ -701,10 +509,58 @@ error_code sceNpTrophyRegisterContext(ppu_thread& ppu, u32 context, u32 handle,
 		}
 	}
 
+	// TODO: Callbacks
+	// From RE-ing a game's state machine, it seems the possible order is one of the following:
+	// * Install (Not installed)  - Setup - Progress * ? - Finalize - Complete - Installed
+	// * Reinstall (Corrupted)    - Setup - Progress * ? - Finalize - Complete - Installed
+	// * Update (Required update) - Setup - Progress * ? - Finalize - Complete - Installed
+	// * Installed
+
+	const std::string trophyPath = "/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name;
+	const s32 trp_status = fs::is_dir(vfs::get(trophyPath)) ? SCE_NP_TROPHY_STATUS_INSTALLED : SCE_NP_TROPHY_STATUS_NOT_INSTALLED;
+
+	lock.unlock();
+
+	sceNpTrophy.notice("sceNpTrophyRegisterContext(): Callback is being called (trp_status=%u)", trp_status);
+
+	// The callback is called once and then if it returns >= 0 the cb is called through events(coming from vsh) that are passed to the CB through cellSysutilCheckCallback
+	if (statusCb(ppu, context, trp_status, 0, 0, arg) < 0)
+	{
+		return SCE_NP_TROPHY_ERROR_PROCESSING_ABORTED;
+	}
+
+	std::unique_lock lock2(trophy_manager.mtx);
+
+	// Rerun error checks, the callback could have changed stuff by calling sceNpTrophy functions internally
+
+	if (!trophy_manager.is_initialized)
+	{
+		return SCE_NP_TROPHY_ERROR_NOT_INITIALIZED;
+	}
+
+	const auto [ctxt2, error2] = trophy_manager.get_context_ex(context, handle);
+
+	if (error2)
+	{
+		// Recheck for any errors, such as if AbortHandle was called
+		return error2;
+	}
+
+	// Paranoid checks: context/handler could have been destroyed and replaced with new ones with the same IDs
+	// Return an error for such cases
+	if (ctxt2 != ctxt)
+	{
+		return SCE_NP_TROPHY_ERROR_UNKNOWN_CONTEXT;
+	}
+
+	if (handle_ptr.get() != idm::check<trophy_handle_t>(handle))
+	{
+		return SCE_NP_TROPHY_ERROR_UNKNOWN_HANDLE;
+	}
+
 	if (!trp.Install(trophyPath))
 	{
 		sceNpTrophy.error("sceNpTrophyRegisterContext(): Failed to install trophy context '%s' (%s)", trophyPath, fs::g_tls_error);
-		on_error();
 		return SCE_NP_TROPHY_ERROR_ILLEGAL_UPDATE;
 	}
 
@@ -714,76 +570,55 @@ error_code sceNpTrophyRegisterContext(ppu_thread& ppu, u32 context, u32 handle,
 
 	ensure(tropusr->Load(trophyUsrPath, trophyConfPath).success);
 
+	// This emulates vsh sending the events and ensures that not 2 events are processed at once
+	const std::pair<u32, s32> statuses[] =
+	{
+		{ SCE_NP_TROPHY_STATUS_PROCESSING_SETUP, 3 },
+		{ SCE_NP_TROPHY_STATUS_PROCESSING_PROGRESS, ::narrow<s32>(tropusr->GetTrophiesCount()) - 1 },
+		{ SCE_NP_TROPHY_STATUS_PROCESSING_FINALIZE, 4 },
+		{ SCE_NP_TROPHY_STATUS_PROCESSING_COMPLETE, 0 }
+	};
+
 	lock2.unlock();
 
 	lv2_obj::sleep(ppu);
+
+	// Create a counter which is destroyed after the function ends
+	const auto queued = std::make_shared<atomic_t<u32>>(0);
+	std::weak_ptr<atomic_t<u32>> wkptr = queued;
+
+	for (auto status : statuses)
 	{
-		const s32 progress_cb_count = ::narrow<s32>(tropusr->GetTrophiesCount()) - 1;
+		// One status max per cellSysutilCheckCallback call
+		*queued += status.second;
+		for (s32 completed = 0; completed <= status.second; completed++)
 		{
-			// This emulates vsh sending the events and ensures that not 2 events are processed at once
-			const std::pair<SceNpTrophyStatus, s32> statuses[] =
+			sysutil_register_cb([statusCb, status, context, completed, arg, wkptr](ppu_thread& cb_ppu) -> s32
 			{
-				{ SCE_NP_TROPHY_STATUS_PROCESSING_SETUP, 3 },
-				{ SCE_NP_TROPHY_STATUS_PROCESSING_PROGRESS, progress_cb_count },
-				{ SCE_NP_TROPHY_STATUS_PROCESSING_FINALIZE, std::max<s32>(progress_cb_count, 9) - 5 }, // Seems varying, little bit less than progress_cb_count
-				{ SCE_NP_TROPHY_STATUS_PROCESSING_COMPLETE, 0 }
-			};
+				statusCb(cb_ppu, context, status.first, completed, status.second, arg);
 
-			// Create a counter which is destroyed after the function ends
-			const auto queued = std::make_shared<atomic_t<u32>>(0);
-
-			u32 total_events = 0;
-
-			for (auto status : statuses)
-			{
-				total_events += status.second + 1;
-			}
-
-			for (auto status : statuses)
-			{
-				for (s32 completed = 0; completed <= status.second; completed++)
+				const auto queued = wkptr.lock();
+				if (queued && (*queued)-- == 1)
 				{
-					// One status max per cellSysutilCheckCallback call
-					*queued += 1;
-
-					sysutil_register_cb([statusCb, status, context, completed, arg, queued](ppu_thread& cb_ppu) -> s32
-					{
-						// TODO: it is possible that we need to check the return value here as well.
-						statusCb(cb_ppu, context, status.first, completed, status.second, arg);
-
-						if (queued && (*queued)-- == 1)
-						{
-							queued->notify_one();
-						}
-
-						return 0;
-					});
-
-					u64 current = get_system_time();
-
-					// Minimum register trophy time 2 seconds globally.
-					const u64 until_min = current + (2'000'000 / total_events);
-					const u64 until_max = until_min + 50'000;
-
-					// If too much time passes just send the rest of the events anyway
-					for (u32 old_value = *queued; current < (old_value ? until_max : until_min);
-						current = get_system_time(), old_value = *queued)
-					{
-						if (!old_value)
-						{
-							thread_ctrl::wait_for(until_min - current);
-						}
-						else
-						{
-							thread_ctrl::wait_on(*queued, old_value, until_max - current);
-						}
-
-						if (thread_ctrl::state() == thread_state::aborting)
-						{
-							return {};
-						}
-					}
+					queued->notify_one();
 				}
+
+				return 0;
+			});
+		}
+
+		u64 current = get_system_time();
+		const u64 until = current + 300'000;
+
+		// If too much time passes just send the rest of the events anyway
+		for (u32 old_value; current < until && (old_value = *queued);
+			current = get_system_time())
+		{
+			thread_ctrl::wait_on(*queued, old_value, until - current);
+
+			if (ppu.is_stopped())
+			{
+				return {};
 			}
 		}
 	}
@@ -825,24 +660,7 @@ error_code sceNpTrophyGetRequiredDiskSpace(u32 context, u32 handle, vm::ptr<u64>
 
 	if (!fs::is_dir(vfs::get("/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name)))
 	{
-		// open trophy pack file
-		std::string trophy_path = vfs::get(Emu.GetDir() + "TROPDIR/" + ctxt->trp_name + "/TROPHY.TRP");
-		fs::file stream(trophy_path);
-
-		if (!stream && Emu.GetCat() == "GD")
-		{
-			sceNpTrophy.warning("sceNpTrophyGetRequiredDiskSpace failed to open trophy file from boot path: '%s'", trophy_path);
-			trophy_path = vfs::get("/dev_bdvd/PS3_GAME/TROPDIR/" + ctxt->trp_name + "/TROPHY.TRP");
-			stream.open(trophy_path);
-		}
-
-		// check if exists and opened
-		if (!stream)
-		{
-			return {SCE_NP_TROPHY_ERROR_CONF_DOES_NOT_EXIST, trophy_path};
-		}
-
-		TRPLoader trp(stream);
+		TRPLoader trp(ctxt->trp_stream);
 
 		if (trp.LoadHeader())
 		{
@@ -928,13 +746,20 @@ error_code sceNpTrophyGetGameInfo(u32 context, u32 handle, vm::ptr<SceNpTrophyGa
 		return SCE_NP_TROPHY_ERROR_INVALID_ARGUMENT;
 	}
 
-	const std::string config_path = vfs::get("/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name + "/TROPCONF.SFM");
-
-	fs::file config(config_path);
+	fs::file config(vfs::get("/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name + "/TROPCONF.SFM"));
 
 	if (!config)
 	{
-		return { SCE_NP_TROPHY_ERROR_CONF_DOES_NOT_EXIST, config_path };
+		return SCE_NP_TROPHY_ERROR_CONF_DOES_NOT_EXIST;
+	}
+
+	rXmlDocument doc;
+	doc.Read(config.to_string());
+
+	auto trophy_base = doc.GetRoot();
+	if (trophy_base->GetChildren()->GetName() == "trophyconf")
+	{
+		trophy_base = trophy_base->GetChildren();
 	}
 
 	if (details)
@@ -942,23 +767,6 @@ error_code sceNpTrophyGetGameInfo(u32 context, u32 handle, vm::ptr<SceNpTrophyGa
 	if (data)
 		*data = {};
 
-	trophy_xml_document doc{};
-	pugi::xml_parse_result res = doc.Read(config.to_string());
-	if (!res)
-	{
-		sceNpTrophy.error("sceNpTrophyGetGameInfo: Failed to read TROPCONF.SFM: %s", config_path);
-		// TODO: return some error
-		return CELL_OK;
-	}
-
-	std::shared_ptr<rXmlNode> trophy_base = doc.GetRoot();
-	if (!trophy_base)
-	{
-		sceNpTrophy.error("sceNpTrophyGetGameInfo: Failed to read TROPCONF.SFM (root is null): %s", config_path);
-		// TODO: return some error
-		return CELL_OK;
-	}
-
 	for (std::shared_ptr<rXmlNode> n = trophy_base->GetChildren(); n; n = n->GetNext())
 	{
 		const std::string n_name = n->GetName();
@@ -1020,7 +828,7 @@ error_code sceNpTrophyGetLatestTrophies()
 	return CELL_OK;
 }
 
-error_code sceNpTrophyUnlockTrophy(ppu_thread& ppu, u32 context, u32 handle, s32 trophyId, vm::ptr<u32> platinumId)
+error_code sceNpTrophyUnlockTrophy(u32 context, u32 handle, s32 trophyId, vm::ptr<u32> platinumId)
 {
 	sceNpTrophy.warning("sceNpTrophyUnlockTrophy(context=0x%x, handle=0x%x, trophyId=%d, platinumId=*0x%x)", context, handle, trophyId, platinumId);
 
@@ -1061,16 +869,7 @@ error_code sceNpTrophyUnlockTrophy(ppu_thread& ppu, u32 context, u32 handle, s32
 		return SCE_NP_TROPHY_ERROR_ALREADY_UNLOCKED;
 	}
 
-	vm::var<CellRtcTick> tick;
-	if (error_code error = cellRtcGetCurrentTick(ppu, tick))
-	{
-		sceNpTrophy.error("sceNpTrophyUnlockTrophy: Failed to get timestamp: 0x%x", +error);
-	}
-
-	if (ctxt->tropusr->UnlockTrophy(trophyId, tick->tick, tick->tick))
-	{
-		sceNpTrophy.notice("Trophy %d unlocked", trophyId);
-	}
+	ctxt->tropusr->UnlockTrophy(trophyId, 0, 0); // TODO: add timestamps
 
 	// TODO: Make sure that unlocking platinum trophies is properly implemented and improve upon it
 	const std::string& config_path = vfs::get("/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name + "/TROPCONF.SFM");
@@ -1080,7 +879,7 @@ error_code sceNpTrophyUnlockTrophy(ppu_thread& ppu, u32 context, u32 handle, s32
 	{
 		sceNpTrophy.warning("sceNpTrophyUnlockTrophy: All requirements for unlocking the platinum trophy (ID = %d) were met.)", unlocked_platinum_id);
 
-		if (ctxt->tropusr->UnlockTrophy(unlocked_platinum_id, tick->tick, tick->tick))
+		if (ctxt->tropusr->UnlockTrophy(unlocked_platinum_id, 0, 0)) // TODO: add timestamps
 		{
 			sceNpTrophy.success("You unlocked a platinum trophy! Hooray!!!");
 		}
@@ -1093,10 +892,7 @@ error_code sceNpTrophyUnlockTrophy(ppu_thread& ppu, u32 context, u32 handle, s32
 	}
 
 	const std::string trophyPath = "/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name + "/TROPUSR.DAT";
-	if (!ctxt->tropusr->Save(trophyPath))
-	{
-		sceNpTrophy.error("sceNpTrophyUnlockTrophy: failed to save '%s'", trophyPath);
-	}
+	ctxt->tropusr->Save(trophyPath);
 
 	if (g_cfg.misc.show_trophy_popups)
 	{
@@ -1117,7 +913,7 @@ error_code sceNpTrophyGetTrophyUnlockState(u32 context, u32 handle, vm::ptr<SceN
 {
 	sceNpTrophy.warning("sceNpTrophyGetTrophyUnlockState(context=0x%x, handle=0x%x, flags=*0x%x, count=*0x%x)", context, handle, flags, count);
 
-	if (!flags || !count)
+	if (!flags || !count) // is count really checked here?
 	{
 		return SCE_NP_TROPHY_ERROR_INVALID_ARGUMENT;
 	}
@@ -1138,41 +934,13 @@ error_code sceNpTrophyGetTrophyUnlockState(u32 context, u32 handle, vm::ptr<SceN
 		return error;
 	}
 
-	TROPUSRLoader* tropusr = nullptr;
-	TROPUSRLoader local_tropusr{};
-
-	if (ctxt->read_only)
+	if (!ctxt->tropusr)
 	{
-		const std::string trophyPath = "/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name;
-		const std::string trophyUsrPath = trophyPath + "/TROPUSR.DAT";
-		const std::string trophyConfPath = trophyPath + "/TROPCONF.SFM";
-
-		if (local_tropusr.Load(trophyUsrPath, trophyConfPath).success)
-		{
-			tropusr = &local_tropusr;
-		}
-		else
-		{
-			// TODO: confirm
-			*count = 0;
-			*flags = {};
-			return CELL_OK;
-		}
-	}
-	else
-	{
-		if (!ctxt->tropusr)
-		{
-			// TODO: May return SCE_NP_TROPHY_ERROR_UNKNOWN_TITLE for older sdk version
-			return SCE_NP_TROPHY_ERROR_CONTEXT_NOT_REGISTERED;
-		}
-
-		tropusr = ctxt->tropusr.get();
+		// TODO: May return SCE_NP_TROPHY_ERROR_UNKNOWN_TITLE for older sdk version
+		return SCE_NP_TROPHY_ERROR_CONTEXT_NOT_REGISTERED;
 	}
 
-	ensure(tropusr);
-
-	const u32 count_ = tropusr->GetTrophiesCount();
+	const u32 count_ = ctxt->tropusr->GetTrophiesCount();
 	*count = count_;
 	if (count_ > 128)
 		sceNpTrophy.error("sceNpTrophyGetTrophyUnlockState: More than 128 trophies detected!");
@@ -1183,7 +951,7 @@ error_code sceNpTrophyGetTrophyUnlockState(u32 context, u32 handle, vm::ptr<SceN
 	// Pack up to 128 bools in u32 flag_bits[4]
 	for (u32 id = 0; id < count_; id++)
 	{
-		if (tropusr->GetTrophyUnlockState(id))
+		if (ctxt->tropusr->GetTrophyUnlockState(id))
 			flags->flag_bits[id / 32] |= 1 << (id % 32);
 		else
 			flags->flag_bits[id / 32] &= ~(1 << (id % 32));
@@ -1211,35 +979,27 @@ static error_code NpTrophyGetTrophyInfo(const trophy_context_t* ctxt, s32 trophy
 		return SCE_NP_TROPHY_ERROR_CONTEXT_NOT_REGISTERED;
 	}
 
-	const std::string config_path = vfs::get("/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name + "/TROPCONF.SFM");
-
-	fs::file config(config_path);
+	fs::file config(vfs::get("/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name + "/TROPCONF.SFM"));
 
 	if (!config)
 	{
-		return { SCE_NP_TROPHY_ERROR_CONF_DOES_NOT_EXIST, config_path };
+		return SCE_NP_TROPHY_ERROR_CONF_DOES_NOT_EXIST;
 	}
 
 	SceNpTrophyDetails tmp_details{};
 	SceNpTrophyData tmp_data{};
 
-	trophy_xml_document doc{};
-	pugi::xml_parse_result res = doc.Read(config.to_string());
-	if (!res)
-	{
-		sceNpTrophy.error("sceNpTrophyGetGameInfo: Failed to read TROPCONF.SFM: %s", config_path);
-		// TODO: return some error
-	}
+	rXmlDocument doc;
+	doc.Read(config.to_string());
 
 	auto trophy_base = doc.GetRoot();
-	if (!trophy_base)
+	if (trophy_base->GetChildren()->GetName() == "trophyconf")
 	{
-		sceNpTrophy.error("sceNpTrophyGetGameInfo: Failed to read TROPCONF.SFM (root is null): %s", config_path);
-		// TODO: return some error
+		trophy_base = trophy_base->GetChildren();
 	}
 
 	bool found = false;
-	for (std::shared_ptr<rXmlNode> n = trophy_base ? trophy_base->GetChildren() : nullptr; n; n = n->GetNext())
+	for (std::shared_ptr<rXmlNode> n = trophy_base->GetChildren(); n; n = n->GetNext())
 	{
 		if (n->GetName() == "trophy" && (trophyId == atoi(n->GetAttribute("id").c_str())))
 		{
@@ -1409,11 +1169,9 @@ error_code sceNpTrophyGetGameIcon(u32 context, u32 handle, vm::ptr<void> buffer,
 		return SCE_NP_TROPHY_ERROR_INVALID_ARGUMENT;
 	}
 
-	// Try to get icon in current language first
-	const std::string trophy_path = fmt::format("/dev_hdd0/home/%s/trophy/%s/", Emu.GetUsr(), ctxt->trp_name);
-	fs::file icon_file(vfs::get(fmt::format("%s/ICON0_%02d.PNG", trophy_path, static_cast<s32>(g_cfg.sys.language))));
+	fs::file icon_file(vfs::get("/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name + "/ICON0.PNG"));
 
-	if (!icon_file && !icon_file.open(vfs::get(fmt::format("%s/ICON0.PNG", trophy_path))))
+	if (!icon_file)
 	{
 		return SCE_NP_TROPHY_ERROR_UNKNOWN_FILE;
 	}
@@ -1474,40 +1232,8 @@ error_code sceNpTrophyGetTrophyIcon(u32 context, u32 handle, s32 trophyId, vm::p
 
 	if (!ctxt->tropusr->GetTrophyUnlockState(trophyId))
 	{
-		const std::string config_path = vfs::get("/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name + "/TROPCONF.SFM");
-
-		fs::file config(config_path);
-		if (config)
-		{
-			trophy_xml_document doc{};
-			pugi::xml_parse_result res = doc.Read(config.to_string());
-			if (!res)
-			{
-				sceNpTrophy.error("sceNpTrophyGetTrophyIcon: Failed to read TROPCONF.SFM: %s", config_path);
-				// TODO: return some error
-			}
-
-			auto trophy_base = doc.GetRoot();
-			if (!trophy_base)
-			{
-				sceNpTrophy.error("sceNpTrophyGetTrophyIcon: Failed to read TROPCONF.SFM (root is null): %s", config_path);
-				// TODO: return some error
-			}
-
-			for (std::shared_ptr<rXmlNode> n = trophy_base ? trophy_base->GetChildren() : nullptr; n; n = n->GetNext())
-			{
-				if (n->GetName() == "trophy" && trophyId == atoi(n->GetAttribute("id").c_str()) && n->GetAttribute("hidden")[0] == 'y')
-				{
-					return SCE_NP_TROPHY_ERROR_HIDDEN;
-				}
-			}
-		}
-		else
-		{
-			// TODO: Maybe return SCE_NP_TROPHY_ERROR_CONF_DOES_NOT_EXIST
-		}
-
-		return SCE_NP_TROPHY_ERROR_LOCKED;
+		bool hidden = false; // TODO obtain this value
+		return hidden ? SCE_NP_TROPHY_ERROR_HIDDEN : SCE_NP_TROPHY_ERROR_LOCKED;
 	}
 
 	fs::file icon_file(vfs::get("/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name + fmt::format("/TROP%03d.PNG", trophyId)));
diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.h b/rpcs3/Emu/Cell/Modules/sceNpTrophy.h
index 0c48623fda..96b814036f 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpTrophy.h
+++ b/rpcs3/Emu/Cell/Modules/sceNpTrophy.h
@@ -1,11 +1,10 @@
 #pragma once
 
 #include "util/types.hpp"
+#include "util/endian.hpp"
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/ErrorCodes.h"
-#include <mutex>
 #include <vector>
-#include <mutex>
 
 // Error codes
 enum SceNpTrophyError : u32
@@ -87,8 +86,6 @@ enum SceNpTrophyGrade
 enum
 {
 	SCE_NP_TROPHY_OPTIONS_CREATE_CONTEXT_READ_ONLY = 1,
-
-	SCE_NP_TROPHY_OPTIONS_REGISTER_CONTEXT_SHOW_ERROR_EXIT = 1
 };
 
 struct SceNpTrophyGameDetails
@@ -135,7 +132,7 @@ struct SceNpTrophyFlagArray
 	be_t<u32> flag_bits[SCE_NP_TROPHY_FLAG_SETSIZE >> SCE_NP_TROPHY_FLAG_BITS_SHIFT];
 };
 
-enum SceNpTrophyStatus : u32
+enum
 {
 	SCE_NP_TROPHY_STATUS_UNKNOWN             = 0,
 	SCE_NP_TROPHY_STATUS_NOT_INSTALLED       = 1,
@@ -152,11 +149,6 @@ enum SceNpTrophyStatus : u32
 	SCE_NP_TROPHY_STATUS_CHANGES_DETECTED    = 9,
 };
 
-enum : u32
-{
-	NP_TROPHY_COMM_SIGN_MAGIC = 0xB9DDE13B,
-};
-
 using SceNpTrophyStatusCallback = s32(u32 context, u32 status, s32 completed, s32 total, vm::ptr<void> arg);
 
 // Forward declare this function since trophyunlock needs it
@@ -169,9 +161,3 @@ public:
 
 	virtual s32 ShowTrophyNotification(const SceNpTrophyDetails& trophy, const std::vector<uchar>& trophyIconBfr) = 0;
 };
-
-struct current_trophy_name
-{
-	std::mutex mtx;
-	std::string name;
-};
diff --git a/rpcs3/Emu/Cell/Modules/sceNpTus.cpp b/rpcs3/Emu/Cell/Modules/sceNpTus.cpp
index ee82e1093e..457bdc1119 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpTus.cpp
+++ b/rpcs3/Emu/Cell/Modules/sceNpTus.cpp
@@ -5,50 +5,151 @@
 #include "sceNp.h"
 #include "sceNpTus.h"
 
-#include "Emu/NP/np_handler.h"
-
 LOG_CHANNEL(sceNpTus);
 
-bool is_slot_array_valid(vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum)
+// Helper functions
+
+static bool validateSlotIds(vm::cptr<SceNpTusSlotId> slotIdArray)
 {
-	for (s32 i = 0; i < arrayNum; i++)
+	if (!slotIdArray)
 	{
-		if (slotIdArray[i] < 0)
-		{
-			return false;
-		}
+		return false;
 	}
 
+	// TODO: how to properly iterate?
+	//for (usz i = 0; i < slotIdArray.size(); ++i)
+	//{
+	//	if (slotIdArray[i] < 0)
+	//	{
+	//		return false;
+	//	}
+	//}
+
 	return true;
 }
 
-const SceNpOnlineId& get_scenp_online_id(const SceNpId& target_npid)
+s32 sce_np_tus_manager::add_title_context()
 {
-	return target_npid.handle;
+	if (title_contexts.size() < SCE_NP_TUS_MAX_CTX_NUM)
+	{
+		sce_np_tus_title_context new_title_context;
+		const auto pair = std::make_pair(next_title_context_id, new_title_context);
+
+		if (title_contexts.emplace(pair).second)
+		{
+			return next_title_context_id++;
+		}
+	}
+
+	return 0;
 }
 
-const SceNpOnlineId& get_scenp_online_id(const SceNpTusVirtualUserId& target_npid)
+bool sce_np_tus_manager::check_title_context_id(s32 titleCtxId)
 {
-	return target_npid;
+	return title_contexts.find(titleCtxId) != title_contexts.end();
 }
 
+bool sce_np_tus_manager::remove_title_context_id(s32 titleCtxId)
+{
+	return title_contexts.erase(titleCtxId) > 0;
+}
+
+sce_np_tus_title_context* sce_np_tus_manager::get_title_context(s32 titleCtxId)
+{
+	if (title_contexts.find(titleCtxId) != title_contexts.end())
+	{
+		return &title_contexts.at(titleCtxId);
+	}
+
+	return nullptr;
+}
+
+s32 sce_np_tus_manager::add_transaction_context(s32 titleCtxId)
+{
+	usz transaction_count = 0;
+
+	for (const auto& title_context : title_contexts)
+	{
+		const auto& transactions = title_context.second.transaction_contexts;
+		transaction_count += transactions.size();
+	}
+
+	if (transaction_count < SCE_NP_TUS_MAX_CTX_NUM)
+	{
+		if (title_contexts.find(titleCtxId) != title_contexts.end())
+		{
+			sce_np_tus_transaction_context new_transaction;
+			new_transaction.id = next_transaction_context_id;
+
+			if (title_contexts.at(titleCtxId).transaction_contexts.emplace(next_transaction_context_id, new_transaction).second)
+			{
+				return next_transaction_context_id++;
+			}
+		}
+	}
+
+	return 0;
+}
+
+bool sce_np_tus_manager::check_transaction_context_id(s32 transId)
+{
+	return std::any_of(title_contexts.cbegin(), title_contexts.cend(), [&transId](const auto& c)
+	{
+		return c.second.transaction_contexts.contains(transId);
+	});
+}
+
+bool sce_np_tus_manager::remove_transaction_context_id(s32 transId)
+{
+	for (auto& title_context : title_contexts)
+	{
+		auto& transactions = title_context.second.transaction_contexts;
+
+		if (transactions.find(transId) != transactions.end())
+		{
+			return transactions.erase(transId) > 0;
+		}
+	}
+
+	return false;
+}
+
+sce_np_tus_transaction_context* sce_np_tus_manager::get_transaction_context(s32 transId)
+{
+	for (auto& title_context : title_contexts)
+	{
+		auto& transactions = title_context.second.transaction_contexts;
+
+		if (transactions.find(transId) != transactions.end())
+		{
+			return &transactions.at(transId);
+		}
+	}
+
+	return nullptr;
+}
+
+void sce_np_tus_manager::terminate()
+{
+	title_contexts.clear();
+	is_initialized = false;
+}
+
+// Module Functions
+
 error_code sceNpTusInit(s32 prio)
 {
 	sceNpTus.warning("sceNpTusInit(prio=%d)", prio);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-	if (nph.is_NP_TUS_init)
+	if (tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_ALREADY_INITIALIZED;
 	}
 
-	if (!nph.is_NP_init)
-	{
-		return SCE_NP_ERROR_NOT_INITIALIZED;
-	}
-
-	nph.is_NP_TUS_init = true;
+	tus_manager.is_initialized = true;
 
 	return CELL_OK;
 }
@@ -57,30 +158,27 @@ error_code sceNpTusTerm()
 {
 	sceNpTus.warning("sceNpTusTerm()");
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-	if (!nph.is_NP_TUS_init)
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!nph.is_NP_init)
-	{
-		return SCE_NP_ERROR_NOT_INITIALIZED;
-	}
-
-	nph.is_NP_TUS_init = false;
+	tus_manager.terminate();
 
 	return CELL_OK;
 }
 
 error_code sceNpTusCreateTitleCtx(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase, vm::cptr<SceNpId> selfNpId)
 {
-	sceNpTus.warning("sceNpTusCreateTitleCtx(communicationId=*0x%x, passphrase=*0x%x, selfNpId=*0x%x)", communicationId, passphrase, selfNpId);
+	sceNpTus.todo("sceNpTusCreateTitleCtx(communicationId=*0x%x, passphrase=*0x%x, selfNpId=*0x%x)", communicationId, passphrase, selfNpId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-	if (!nph.is_NP_TUS_init)
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
@@ -90,78 +188,76 @@ error_code sceNpTusCreateTitleCtx(vm::cptr<SceNpCommunicationId> communicationId
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	s32 id = create_tus_context(communicationId, passphrase);
+	const auto id = tus_manager.add_title_context();
 
-	if (id > 0)
+	if (id <= 0)
 	{
-		return not_an_error(id);
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_OBJECTS;
 	}
 
-	return id;
+	return not_an_error(id);
 }
 
 error_code sceNpTusDestroyTitleCtx(s32 titleCtxId)
 {
-	sceNpTus.warning("sceNpTusDestroyTitleCtx(titleCtxId=%d)", titleCtxId);
+	sceNpTus.todo("sceNpTusDestroyTitleCtx(titleCtxId=%d)", titleCtxId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-	if (!nph.is_NP_TUS_init)
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!destroy_tus_context(titleCtxId))
+	if (!tus_manager.check_title_context_id(titleCtxId))
+	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
 
 	return CELL_OK;
 }
 
 error_code sceNpTusCreateTransactionCtx(s32 titleCtxId)
 {
-	sceNpTus.warning("sceNpTusCreateTransactionCtx(titleCtxId=%d)", titleCtxId);
+	sceNpTus.todo("sceNpTusCreateTransactionCtx(titleCtxId=%d)", titleCtxId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-	if (!nph.is_NP_TUS_init)
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (nph.get_psn_status() == SCE_NP_MANAGER_STATUS_OFFLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto tus = idm::get_unlocked<tus_ctx>(titleCtxId);
-
-	if (!tus)
+	if (!tus_manager.check_title_context_id(titleCtxId))
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
 
-	s32 id = create_tus_transaction_context(tus);
+	const auto id = tus_manager.add_transaction_context(titleCtxId);
 
-	if (id > 0)
+	if (id <= 0)
 	{
-		return not_an_error(id);
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_OBJECTS;
 	}
 
-	return id;
+	return not_an_error(id);
 }
 
 error_code sceNpTusDestroyTransactionCtx(s32 transId)
 {
-	sceNpTus.warning("sceNpTusDestroyTransactionCtx(transId=%d)", transId);
+	sceNpTus.todo("sceNpTusDestroyTransactionCtx(transId=%d)", transId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-	if (!nph.is_NP_TUS_init)
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!destroy_tus_transaction_context(transId))
+	if (!tus_manager.remove_transaction_context_id(transId))
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
@@ -171,31 +267,39 @@ error_code sceNpTusDestroyTransactionCtx(s32 transId)
 
 error_code sceNpTusSetTimeout(s32 ctxId, u32 timeout)
 {
-	sceNpTus.warning("sceNpTusSetTimeout(ctxId=%d, timeout=%d)", ctxId, timeout);
+	sceNpTus.todo("sceNpTusSetTimeout(ctxId=%d, timeout=%d)", ctxId, timeout);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-	if (!nph.is_NP_TUS_init)
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (timeout < 10'000'000) // 10 seconds
+	auto title_context       = tus_manager.get_title_context(ctxId);
+	auto transaction_context = title_context ? tus_manager.get_transaction_context(ctxId) : nullptr;
+
+	if (!title_context && !transaction_context)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (timeout < 10000000) // 10 seconds
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (auto trans = idm::get_unlocked<tus_transaction_ctx>(ctxId))
+	if (title_context)
 	{
-		trans->timeout = timeout;
+		for (auto& [key, val] : title_context->transaction_contexts)
+		{
+			val.timeout = timeout;
+		}
 	}
-	else if (auto tus = idm::get_unlocked<tus_ctx>(ctxId))
+	else if (transaction_context)
 	{
-		tus->timeout = timeout;
-	}
-	else
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+		transaction_context->timeout = timeout;
 	}
 
 	return CELL_OK;
@@ -203,577 +307,176 @@ error_code sceNpTusSetTimeout(s32 ctxId, u32 timeout)
 
 error_code sceNpTusAbortTransaction(s32 transId)
 {
-	sceNpTus.warning("sceNpTusAbortTransaction(transId=%d)", transId);
+	sceNpTus.todo("sceNpTusAbortTransaction(transId=%d)", transId);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-	if (!nph.is_NP_TUS_init)
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	auto trans = idm::get_unlocked<tus_transaction_ctx>(transId);
-	if (!trans)
+	auto transaction_context = tus_manager.get_transaction_context(transId);
+
+	if (!transaction_context)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
 
-	trans->abort_transaction();
+	transaction_context->abort = true;
 
 	return CELL_OK;
 }
 
 error_code sceNpTusWaitAsync(s32 transId, vm::ptr<s32> result)
 {
-	sceNpTus.warning("sceNpTusWaitAsync(transId=%d, result=*0x%x)", transId, result);
+	sceNpTus.todo("sceNpTusWaitAsync(transId=%d, result=*0x%x)", transId, result);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	*result = 0;
 
-	if (!nph.is_NP_TUS_init)
-	{
-		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
-	}
-
-	auto trans = idm::get_unlocked<tus_transaction_ctx>(transId);
-	if (!trans)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
-	}
-
-	*result = trans->wait_for_completion();
-
-	return CELL_OK;
+	const bool processing_completed = true;
+	return not_an_error(processing_completed ? 0 : 1);
 }
 
 error_code sceNpTusPollAsync(s32 transId, vm::ptr<s32> result)
 {
-	sceNpTus.warning("sceNpTusPollAsync(transId=%d, result=*0x%x)", transId, result);
+	sceNpTus.todo("sceNpTusPollAsync(transId=%d, result=*0x%x)", transId, result);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	*result = 0;
 
-	if (!nph.is_NP_TUS_init)
-	{
-		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
-	}
-
-	auto trans = idm::get_unlocked<tus_transaction_ctx>(transId);
-	if (!trans)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
-	}
-
-	auto res = trans->get_transaction_status();
-
-	if (!res)
-	{
-		return not_an_error(1);
-	}
-
-	*result = *res;
-	return CELL_OK;
-}
-
-template<typename T>
-error_code scenp_tus_set_multislot_variable(s32 transId, T targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::cptr<s64> variableArray, s32 arrayNum, vm::ptr<void> option, bool vuser, bool async)
-{
-	if (!slotIdArray || !variableArray)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	if (arrayNum == 0 || option)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
-
-	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
-	{
-		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
-	}
-
-	if (!is_slot_array_valid(slotIdArray, arrayNum))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_TUS_init)
-	{
-		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
-	}
-
-	if (!targetNpId)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	// Probable vsh behaviour
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
-	}
-
-	nph.tus_set_multislot_variable(trans_ctx, get_scenp_online_id(*targetNpId.get_ptr()), slotIdArray, variableArray, arrayNum, vuser, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
+	const bool processing_completed = true;
+	return not_an_error(processing_completed ? 0 : 1);
 }
 
 error_code sceNpTusSetMultiSlotVariable(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::cptr<s64> variableArray, s32 arrayNum, vm::ptr<void> option)
 {
-	sceNpTus.warning("sceNpTusSetMultiSlotVariable(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, variableArray, arrayNum, option);
-	return scenp_tus_set_multislot_variable(transId, targetNpId, slotIdArray, variableArray, arrayNum, option, false, false);
+	sceNpTus.todo("sceNpTusSetMultiSlotVariable(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, variableArray, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpId || !slotIdArray || !variableArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
 }
 
 error_code sceNpTusSetMultiSlotVariableVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::cptr<s64> variableArray, s32 arrayNum, vm::ptr<void> option)
 {
-	sceNpTus.warning("sceNpTusSetMultiSlotVariableVUser(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, variableArray, arrayNum, option);
-	return scenp_tus_set_multislot_variable(transId, targetVirtualUserId, slotIdArray, variableArray, arrayNum, option, true, false);
+	sceNpTus.todo("sceNpTusSetMultiSlotVariableVUser(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, variableArray, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId || !slotIdArray || !variableArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
 }
 
 error_code sceNpTusSetMultiSlotVariableAsync(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::cptr<s64> variableArray, s32 arrayNum, vm::ptr<void> option)
 {
-	sceNpTus.warning("sceNpTusSetMultiSlotVariableAsync(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, variableArray, arrayNum, option);
-	return scenp_tus_set_multislot_variable(transId, targetNpId, slotIdArray, variableArray, arrayNum, option, false, true);
+	sceNpTus.todo("sceNpTusSetMultiSlotVariableAsync(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, variableArray, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpId || !slotIdArray || !variableArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
 }
 
 error_code sceNpTusSetMultiSlotVariableVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::cptr<s64> variableArray, s32 arrayNum, vm::ptr<void> option)
 {
-	sceNpTus.warning("sceNpTusSetMultiSlotVariableVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, variableArray, arrayNum, option);
-	return scenp_tus_set_multislot_variable(transId, targetVirtualUserId, slotIdArray, variableArray, arrayNum, option, true, true);
-}
+	sceNpTus.todo("sceNpTusSetMultiSlotVariableVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, variableArray, arrayNum, option);
 
-template<typename T>
-error_code scenp_tus_get_multislot_variable(s32 transId, T targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusVariable> variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr<void> option, bool vuser, bool async)
-{
-	if (!slotIdArray || !variableArray)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-	if (arrayNum == 0 || option)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
-
-	if (variableArraySize != arrayNum * sizeof(SceNpTusVariable))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
-	{
-		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
-	}
-
-	if (!is_slot_array_valid(slotIdArray, arrayNum))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_TUS_init)
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!targetNpId)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	// Probable vsh behaviour
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
+	if (!tus_manager.check_transaction_context_id(transId))
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
 
-	nph.tus_get_multislot_variable(trans_ctx, get_scenp_online_id(*targetNpId.get_ptr()), slotIdArray, variableArray, arrayNum, vuser, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
-}
-
-error_code sceNpTusGetMultiSlotVariable(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusVariable> variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiSlotVariable(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, variableArray, variableArraySize, arrayNum, option);
-	return scenp_tus_get_multislot_variable(transId, targetNpId, slotIdArray, variableArray, variableArraySize, arrayNum, option, false, false);
-}
-
-error_code sceNpTusGetMultiSlotVariableVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusVariable> variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiSlotVariableVUser(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, variableArray, variableArraySize, arrayNum, option);
-	return scenp_tus_get_multislot_variable(transId, targetVirtualUserId, slotIdArray, variableArray, variableArraySize, arrayNum, option, true, false);
-}
-
-error_code sceNpTusGetMultiSlotVariableAsync(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusVariable> variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiSlotVariableAsync(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, variableArray, variableArraySize, arrayNum, option);
-	return scenp_tus_get_multislot_variable(transId, targetNpId, slotIdArray, variableArray, variableArraySize, arrayNum, option, false, true);
-}
-
-error_code sceNpTusGetMultiSlotVariableVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusVariable> variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiSlotVariableVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, variableArray, variableArraySize, arrayNum, option);
-	return scenp_tus_get_multislot_variable(transId, targetVirtualUserId, slotIdArray, variableArray, variableArraySize, arrayNum, option, true, true);
-}
-
-template<typename T>
-error_code scenp_tus_get_multiuser_variable(s32 transId, T targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusVariable> variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr<void> option, bool vuser, bool async)
-{
-	if (!variableArray)
+	if (!targetVirtualUserId || !slotIdArray || !variableArray || arrayNum <= 0)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	if (arrayNum == 0 || option)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
-
-	if (arrayNum > SCE_NP_SCORE_MAX_NPID_NUM_PER_TRANS)
-	{
-		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
-	}
-
-	if (variableArraySize != arrayNum * sizeof(SceNpTusVariable))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	if (slotId < 0)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_TUS_init)
-	{
-		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
-	}
-
-	if (!targetNpIdArray)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	// Probable vsh behaviour
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
-	}
-
-	std::vector<SceNpOnlineId> online_ids;
-	for (s32 i = 0; i < arrayNum; i++)
-	{
-		online_ids.push_back(get_scenp_online_id(targetNpIdArray[i]));
-	}
-
-	nph.tus_get_multiuser_variable(trans_ctx, std::move(online_ids), slotId, variableArray, arrayNum, vuser, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
-}
-
-error_code sceNpTusGetMultiUserVariable(s32 transId, vm::cptr<SceNpId> targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusVariable> variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiUserVariable(transId=%d, targetNpIdArray=*0x%x, slotId=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpIdArray, slotId, variableArray, variableArraySize, arrayNum, option);
-	return scenp_tus_get_multiuser_variable(transId, targetNpIdArray, slotId, variableArray, variableArraySize, arrayNum, option, false, false);
-}
-
-error_code sceNpTusGetMultiUserVariableVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusVariable> variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiUserVariableVUser(transId=%d, targetVirtualUserIdArray=*0x%x, slotId=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserIdArray, slotId, variableArray, variableArraySize, arrayNum, option);
-	return scenp_tus_get_multiuser_variable(transId, targetVirtualUserIdArray, slotId, variableArray, variableArraySize, arrayNum, option, true, false);
-}
-
-error_code sceNpTusGetMultiUserVariableAsync(s32 transId, vm::cptr<SceNpId> targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusVariable> variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiUserVariableAsync(transId=%d, targetNpIdArray=*0x%x, slotId=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpIdArray, slotId, variableArray, variableArraySize, arrayNum, option);
-	return scenp_tus_get_multiuser_variable(transId, targetNpIdArray, slotId, variableArray, variableArraySize, arrayNum, option, false, true);
-}
-
-error_code sceNpTusGetMultiUserVariableVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusVariable> variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiUserVariableVUserAsync(transId=%d, targetVirtualUserIdArray=*0x%x, slotId=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserIdArray, slotId, variableArray, variableArraySize, arrayNum, option);
-	return scenp_tus_get_multiuser_variable(transId, targetVirtualUserIdArray, slotId, variableArray, variableArraySize, arrayNum, option, true, true);
-}
-
-error_code scenp_tus_get_friends_variable(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusVariable> variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr<void> option, bool async)
-{
-	if (!variableArray)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	if (arrayNum == 0)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
-
-	// Undocumented behaviour and structure unknown
-	// Also checks a u32* at offset 4 of the struct for nullptr in which case it behaves like option == nullptr
-	if (option && *static_cast<u32*>(option.get_ptr()) != 0xC)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
-
-	if (sortType < SCE_NP_TUS_VARIABLE_SORTTYPE_DESCENDING_DATE || sortType > SCE_NP_TUS_VARIABLE_SORTTYPE_ASCENDING_VALUE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
-
-	if (arrayNum > SCE_NP_SCORE_MAX_SELECTED_FRIENDS_NUM)
-	{
-		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
-	}
-
-	if (variableArraySize != arrayNum * sizeof(SceNpTusVariable))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	if (slotId < 0)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_TUS_init)
-	{
-		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
-	}
-
-	// Probable vsh behaviour
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
-	}
-
-	nph.tus_get_friends_variable(trans_ctx, slotId, includeSelf, sortType, variableArray, arrayNum, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
-}
-
-error_code sceNpTusGetFriendsVariable(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusVariable> variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetFriendsVariable(transId=%d, slotId=%d, includeSelf=%d, sortType=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, slotId, includeSelf, sortType, variableArray, variableArraySize, arrayNum, option);
-	return scenp_tus_get_friends_variable(transId, slotId, includeSelf, sortType, variableArray, variableArraySize, arrayNum, option, false);
-}
-
-error_code sceNpTusGetFriendsVariableAsync(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusVariable> variableArray, u32 variableArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetFriendsVariableAsync(transId=%d, slotId=%d, includeSelf=%d, sortType=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, slotId, includeSelf, sortType, variableArray, variableArraySize, arrayNum, option);
-	return scenp_tus_get_friends_variable(transId, slotId, includeSelf, sortType, variableArray, variableArraySize, arrayNum, option, true);
-}
-
-template<typename T>
-error_code scenp_tus_add_and_get_variable(s32 transId, T targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr<SceNpTusVariable> outVariable, u32 outVariableSize, vm::ptr<SceNpTusAddAndGetVariableOptParam> option, bool vuser, bool async)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_TUS_init)
-	{
-		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
-	}
-
-	if (slotId < 0)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
-
-	if ((option && option->size != sizeof(SceNpTusAddAndGetVariableOptParam)) || outVariableSize != sizeof(SceNpTusVariable))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	if (!targetNpId)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	// Probable vsh behaviour
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
-	}
-
-	nph.tus_add_and_get_variable(trans_ctx, get_scenp_online_id(*targetNpId.get_ptr()), slotId, inVariable, outVariable, option, vuser, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
-}
-
-error_code sceNpTusAddAndGetVariable(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr<SceNpTusVariable> outVariable, u32 outVariableSize, vm::ptr<SceNpTusAddAndGetVariableOptParam> option)
-{
-	sceNpTus.warning("sceNpTusAddAndGetVariable(transId=%d, targetNpId=*0x%x, slotId=%d, inVariable=%d, outVariable=*0x%x, outVariableSize=%d, option=*0x%x)", transId, targetNpId, slotId, inVariable, outVariable, outVariableSize, option);
-	return scenp_tus_add_and_get_variable(transId, targetNpId, slotId, inVariable, outVariable, outVariableSize, option, false, false);
-}
-
-error_code sceNpTusAddAndGetVariableVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr<SceNpTusVariable> outVariable, u32 outVariableSize, vm::ptr<SceNpTusAddAndGetVariableOptParam> option)
-{
-	sceNpTus.warning("sceNpTusAddAndGetVariableVUser(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, inVariable=%d, outVariable=*0x%x, outVariableSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, inVariable, outVariable, outVariableSize, option);
-	return scenp_tus_add_and_get_variable(transId, targetVirtualUserId, slotId, inVariable, outVariable, outVariableSize, option, true, false);
-}
-
-error_code sceNpTusAddAndGetVariableAsync(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr<SceNpTusVariable> outVariable, u32 outVariableSize, vm::ptr<SceNpTusAddAndGetVariableOptParam> option)
-{
-	sceNpTus.warning("sceNpTusAddAndGetVariableAsync(transId=%d, targetNpId=*0x%x, slotId=%d, inVariable=%d, outVariable=*0x%x, outVariableSize=%d, option=*0x%x)", transId, targetNpId, slotId, inVariable, outVariable, outVariableSize, option);
-	return scenp_tus_add_and_get_variable(transId, targetNpId, slotId, inVariable, outVariable, outVariableSize, option, false, true);
-}
-
-error_code sceNpTusAddAndGetVariableVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr<SceNpTusVariable> outVariable, u32 outVariableSize, vm::ptr<SceNpTusAddAndGetVariableOptParam> option)
-{
-	sceNpTus.warning("sceNpTusAddAndGetVariableVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, inVariable=%d, outVariable=*0x%x, outVariableSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, inVariable, outVariable, outVariableSize, option);
-	return scenp_tus_add_and_get_variable(transId, targetVirtualUserId, slotId, inVariable, outVariable, outVariableSize, option, true, true);
-}
-
-template<typename T>
-error_code scenp_tus_try_and_set_variable(s32 transId, T targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr<SceNpTusVariable> resultVariable, u32 resultVariableSize, vm::ptr<SceNpTusTryAndSetVariableOptParam> option, bool vuser, bool async)
-{
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_TUS_init)
-	{
-		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
-	}
-
-	if (!resultVariable)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	if (slotId < 0)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
-
-	if ((option && option->size != sizeof(SceNpTusTryAndSetVariableOptParam)) || resultVariableSize != sizeof(SceNpTusVariable))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	if (!targetNpId)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	// Probable vsh behaviour
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
-	}
-
-	nph.tus_try_and_set_variable(trans_ctx, get_scenp_online_id(*targetNpId.get_ptr()), slotId, opeType, variable, resultVariable, option, vuser, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
-}
-
-error_code sceNpTusTryAndSetVariable(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr<SceNpTusVariable> resultVariable, u32 resultVariableSize, vm::ptr<SceNpTusTryAndSetVariableOptParam> option)
-{
-	sceNpTus.warning("sceNpTusTryAndSetVariable(transId=%d, targetNpId=*0x%x, slotId=%d, opeType=%d, variable=%d, resultVariable=*0x%x, resultVariableSize=%d, option=*0x%x)", transId, targetNpId, slotId, opeType, variable, resultVariable, resultVariableSize, option);
-	return scenp_tus_try_and_set_variable(transId, targetNpId, slotId, opeType, variable, resultVariable, resultVariableSize, option, false, false);
-}
-
-error_code sceNpTusTryAndSetVariableVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr<SceNpTusVariable> resultVariable, u32 resultVariableSize, vm::ptr<SceNpTusTryAndSetVariableOptParam> option)
-{
-	sceNpTus.warning("sceNpTusTryAndSetVariableVUser(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, opeType=%d, variable=%d, resultVariable=*0x%x, resultVariableSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, opeType, variable, resultVariable, resultVariableSize, option);
-	return scenp_tus_try_and_set_variable(transId, targetVirtualUserId, slotId, opeType, variable, resultVariable, resultVariableSize, option, true, false);
-}
-
-error_code sceNpTusTryAndSetVariableAsync(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr<SceNpTusVariable> resultVariable, u32 resultVariableSize, vm::ptr<SceNpTusTryAndSetVariableOptParam> option)
-{
-	sceNpTus.warning("sceNpTusTryAndSetVariableAsync(transId=%d, targetNpId=*0x%x, slotId=%d, opeType=%d, variable=%d, resultVariable=*0x%x, resultVariableSize=%d, option=*0x%x)", transId, targetNpId, slotId, opeType, variable, resultVariable, resultVariableSize, option);
-	return scenp_tus_try_and_set_variable(transId, targetNpId, slotId, opeType, variable, resultVariable, resultVariableSize, option, false, true);
-}
-
-error_code sceNpTusTryAndSetVariableVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr<SceNpTusVariable> resultVariable, u32 resultVariableSize, vm::ptr<SceNpTusTryAndSetVariableOptParam> option)
-{
-	sceNpTus.warning("sceNpTusTryAndSetVariableVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, opeType=%d, variable=%d, resultVariable=*0x%x, resultVariableSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, opeType, variable, resultVariable, resultVariableSize, option);
-	return scenp_tus_try_and_set_variable(transId, targetVirtualUserId, slotId, opeType, variable, resultVariable, resultVariableSize, option, true, true);
-}
-
-template<typename T>
-error_code scenp_tus_delete_multislot_variable(s32 transId, T targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option, bool vuser, bool async)
-{
-	if (!slotIdArray)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	if (arrayNum == 0 || option)
+	if (option || !validateSlotIds(slotIdArray))
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
@@ -783,140 +486,883 @@ error_code scenp_tus_delete_multislot_variable(s32 transId, T targetNpId, vm::cp
 		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
 	}
 
-	if (!is_slot_array_valid(slotIdArray, arrayNum))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
+	return CELL_OK;
+}
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+error_code sceNpTusGetMultiSlotVariable(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::cptr<s64> variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiSlotVariable(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, variableArray, variableArraySize, arrayNum, option);
 
-	if (!nph.is_NP_TUS_init)
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	// Probable vsh behaviour
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
+	if (!tus_manager.check_transaction_context_id(transId))
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
 
-	nph.tus_delete_multislot_variable(trans_ctx, get_scenp_online_id(*targetNpId.get_ptr()), slotIdArray, arrayNum, vuser, async);
-
-	if (async)
+	if (!targetNpId || !slotIdArray || !variableArray || arrayNum <= 0)
 	{
-		return CELL_OK;
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	return *trans_ctx->result;
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	const s32 variables_read = 0;
+	return not_an_error(variables_read);
+}
+
+error_code sceNpTusGetMultiSlotVariableVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::cptr<s64> variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiSlotVariableVUser(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, variableArray, variableArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	const s32 variables_read = 0;
+	return not_an_error(variables_read);
+}
+
+error_code sceNpTusGetMultiSlotVariableAsync(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::cptr<s64> variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiSlotVariableAsync(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, variableArray, variableArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpId || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusGetMultiSlotVariableVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::cptr<s64> variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiSlotVariableVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, variableArray, variableArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusGetMultiUserVariable(s32 transId, vm::cptr<SceNpId> targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusVariable> variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiUserVariable(transId=%d, targetNpIdArray=*0x%x, slotId=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpIdArray, slotId, variableArray, variableArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpIdArray || !variableArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_USER_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
+	}
+
+	const s32 variables_read = 0;
+	return not_an_error(variables_read);
+}
+
+error_code sceNpTusGetMultiUserVariableVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusVariable> variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiUserVariableVUser(transId=%d, targetVirtualUserIdArray=*0x%x, slotId=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserIdArray, slotId, variableArray, variableArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserIdArray || !variableArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_USER_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
+	}
+
+	const s32 variables_read = 0;
+	return not_an_error(variables_read);
+}
+
+error_code sceNpTusGetMultiUserVariableAsync(s32 transId, vm::cptr<SceNpId> targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusVariable> variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiUserVariableAsync(transId=%d, targetNpIdArray=*0x%x, slotId=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpIdArray, slotId, variableArray, variableArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpIdArray || !variableArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_USER_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusGetMultiUserVariableVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusVariable> variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiUserVariableVUserAsync(transId=%d, targetVirtualUserIdArray=*0x%x, slotId=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserIdArray, slotId, variableArray, variableArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserIdArray || !variableArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_USER_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusGetFriendsVariable(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusVariable> variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetFriendsVariable(transId=%d, slotId=%d, includeSelf=%d, sortType=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, slotId, includeSelf, sortType, variableArray, variableArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!variableArray)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || arrayNum <= 0 || slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SELECTED_FRIENDS_NUM)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
+	}
+
+	const s32 variables_read = 0;
+	return not_an_error(variables_read);
+}
+
+error_code sceNpTusGetFriendsVariableAsync(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusVariable> variableArray, u64 variableArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetFriendsVariableAsync(transId=%d, slotId=%d, includeSelf=%d, sortType=%d, variableArray=*0x%x, variableArraySize=%d, arrayNum=%d, option=*0x%x)", transId, slotId, includeSelf, sortType, variableArray, variableArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!variableArray)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || arrayNum <= 0 || slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SELECTED_FRIENDS_NUM)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusAddAndGetVariable(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr<SceNpTusVariable> outVariable, u64 outVariableSize, vm::ptr<SceNpTusAddAndGetVariableOptParam> option)
+{
+	sceNpTus.todo("sceNpTusAddAndGetVariable(transId=%d, targetNpId=*0x%x, slotId=%d, inVariable=%d, outVariable=*0x%x, outVariableSize=%d, option=*0x%x)", transId, targetNpId, slotId, inVariable, outVariable, outVariableSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpId)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusAddAndGetVariableVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr<SceNpTusVariable> outVariable, u64 outVariableSize, vm::ptr<SceNpTusAddAndGetVariableOptParam> option)
+{
+	sceNpTus.todo("sceNpTusAddAndGetVariableVUser(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, inVariable=%d, outVariable=*0x%x, outVariableSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, inVariable, outVariable, outVariableSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusAddAndGetVariableAsync(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr<SceNpTusVariable> outVariable, u64 outVariableSize, vm::ptr<SceNpTusAddAndGetVariableOptParam> option)
+{
+	sceNpTus.todo("sceNpTusAddAndGetVariableAsync(transId=%d, targetNpId=*0x%x, slotId=%d, inVariable=%d, outVariable=*0x%x, outVariableSize=%d, option=*0x%x)", transId, targetNpId, slotId, inVariable, outVariable, outVariableSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpId)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusAddAndGetVariableVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr<SceNpTusVariable> outVariable, u64 outVariableSize, vm::ptr<SceNpTusAddAndGetVariableOptParam> option)
+{
+	sceNpTus.todo("sceNpTusAddAndGetVariableVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, inVariable=%d, outVariable=*0x%x, outVariableSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, inVariable, outVariable, outVariableSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusTryAndSetVariable(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr<SceNpTusVariable> resultVariable, u64 resultVariableSize, vm::ptr<SceNpTusTryAndSetVariableOptParam> option)
+{
+	sceNpTus.todo("sceNpTusTryAndSetVariable(transId=%d, targetNpId=*0x%x, slotId=%d, opeType=%d, variable=%d, resultVariable=*0x%x, resultVariableSize=%d, option=*0x%x)", transId, targetNpId, slotId, opeType, variable, resultVariable, resultVariableSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpId || !resultVariable)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusTryAndSetVariableVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr<SceNpTusVariable> resultVariable, u64 resultVariableSize, vm::ptr<SceNpTusTryAndSetVariableOptParam> option)
+{
+	sceNpTus.todo("sceNpTusTryAndSetVariableVUser(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, opeType=%d, variable=%d, resultVariable=*0x%x, resultVariableSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, opeType, variable, resultVariable, resultVariableSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId || !resultVariable)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusTryAndSetVariableAsync(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr<SceNpTusVariable> resultVariable, u64 resultVariableSize, vm::ptr<SceNpTusTryAndSetVariableOptParam> option)
+{
+	sceNpTus.todo("sceNpTusTryAndSetVariableAsync(transId=%d, targetNpId=*0x%x, slotId=%d, opeType=%d, variable=%d, resultVariable=*0x%x, resultVariableSize=%d, option=*0x%x)", transId, targetNpId, slotId, opeType, variable, resultVariable, resultVariableSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpId || !resultVariable)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusTryAndSetVariableVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr<SceNpTusVariable> resultVariable, u64 resultVariableSize, vm::ptr<SceNpTusTryAndSetVariableOptParam> option)
+{
+	sceNpTus.todo("sceNpTusTryAndSetVariableVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, opeType=%d, variable=%d, resultVariable=*0x%x, resultVariableSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, opeType, variable, resultVariable, resultVariableSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId || !resultVariable)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
 }
 
 error_code sceNpTusDeleteMultiSlotVariable(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
 {
-	sceNpTus.warning("sceNpTusDeleteMultiSlotVariable(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, arrayNum, option);
-	return scenp_tus_delete_multislot_variable(transId, targetNpId, slotIdArray, arrayNum, option, false, false);
-}
+	sceNpTus.todo("sceNpTusDeleteMultiSlotVariable(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, arrayNum, option);
 
-error_code sceNpTusDeleteMultiSlotVariableVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusDeleteMultiSlotVariableVUser(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, arrayNum, option);
-	return scenp_tus_delete_multislot_variable(transId, targetVirtualUserId, slotIdArray, arrayNum, option, true, false);
-}
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-error_code sceNpTusDeleteMultiSlotVariableAsync(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusDeleteMultiSlotVariableAsync(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, arrayNum, option);
-	return scenp_tus_delete_multislot_variable(transId, targetNpId, slotIdArray, arrayNum, option, false, true);
-}
-
-error_code sceNpTusDeleteMultiSlotVariableVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusDeleteMultiSlotVariableVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, arrayNum, option);
-	return scenp_tus_delete_multislot_variable(transId, targetVirtualUserId, slotIdArray, arrayNum, option, true, true);
-}
-
-template<typename T>
-error_code scenp_tus_set_data(s32 transId, T targetNpId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr<void> data, vm::cptr<SceNpTusDataInfo> info, u32 infoStructSize, vm::ptr<SceNpTusSetDataOptParam> option, bool vuser, bool async)
-{
-	if (slotId < 0 || !data || !totalSize)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	if ((option && option->size != sizeof(SceNpTusSetDataOptParam)) || (info && infoStructSize != sizeof(SceNpTusDataInfo)))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_TUS_init)
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!targetNpId)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	// Probable vsh behaviour
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
+	if (!tus_manager.check_transaction_context_id(transId))
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
 
-	nph.tus_set_data(trans_ctx, get_scenp_online_id(*targetNpId.get_ptr()), slotId, totalSize, sendSize, data, info, option, vuser, async);
-
-	if (async)
+	if (!targetNpId || !slotIdArray || arrayNum <= 0)
 	{
-		return CELL_OK;
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	return *trans_ctx->result;
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
 }
 
-error_code sceNpTusSetData(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr<void> data, vm::cptr<SceNpTusDataInfo> info, u32 infoStructSize, vm::ptr<SceNpTusSetDataOptParam> option)
+error_code sceNpTusDeleteMultiSlotVariableVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
 {
-	sceNpTus.warning("sceNpTusSetData(transId=%d, targetNpId=*0x%x, slotId=%d, totalSize=%d, sendSize=%d, data=*0x%x, info=*0x%x, infoStructSize=%d, option=*0x%x)", transId, targetNpId, slotId, totalSize, sendSize, data, info, infoStructSize, option);
-	return scenp_tus_set_data(transId, targetNpId, slotId, totalSize, sendSize, data, info, infoStructSize, option, false, false);
+	sceNpTus.todo("sceNpTusDeleteMultiSlotVariableVUser(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId || !slotIdArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
 }
 
-error_code sceNpTusSetDataVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr<void> data, vm::cptr<SceNpTusDataInfo> info, u32 infoStructSize, vm::ptr<SceNpTusSetDataOptParam> option)
+error_code sceNpTusDeleteMultiSlotVariableAsync(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
 {
-	sceNpTus.warning("sceNpTusSetDataVUser(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, totalSize=%d, sendSize=%d, data=*0x%x, info=*0x%x, infoStructSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, totalSize, sendSize, data, info, infoStructSize, option);
-	return scenp_tus_set_data(transId, targetVirtualUserId, slotId, totalSize, sendSize, data, info, infoStructSize, option, true, false);
+	sceNpTus.todo("sceNpTusDeleteMultiSlotVariableAsync(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpId || !slotIdArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
 }
 
-error_code sceNpTusSetDataAsync(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr<void> data, vm::cptr<SceNpTusDataInfo> info, u32 infoStructSize, vm::ptr<SceNpTusSetDataOptParam> option)
+error_code sceNpTusDeleteMultiSlotVariableVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
 {
-	sceNpTus.warning("sceNpTusSetDataAsync(transId=%d, targetNpId=*0x%x, slotId=%d, totalSize=%d, sendSize=%d, data=*0x%x, info=*0x%x, infoStructSize=%d, option=*0x%x)", transId, targetNpId, slotId, totalSize, sendSize, data, info, infoStructSize, option);
-	return scenp_tus_set_data(transId, targetNpId, slotId, totalSize, sendSize, data, info, infoStructSize, option, false, true);
+	sceNpTus.todo("sceNpTusDeleteMultiSlotVariableVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId || !slotIdArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
 }
 
-error_code sceNpTusSetDataVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr<void> data, vm::cptr<SceNpTusDataInfo> info, u32 infoStructSize, vm::ptr<SceNpTusSetDataOptParam> option)
+error_code sceNpTusSetData(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, u64 totalSize, u64 sendSize, vm::cptr<void> data, vm::cptr<SceNpTusDataInfo> info, u64 infoStructSize, vm::ptr<SceNpTusSetDataOptParam> option)
 {
-	sceNpTus.warning("sceNpTusSetDataVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, totalSize=%d, sendSize=%d, data=*0x%x, info=*0x%x, infoStructSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, totalSize, sendSize, data, info, infoStructSize, option);
-	return scenp_tus_set_data(transId, targetVirtualUserId, slotId, totalSize, sendSize, data, info, infoStructSize, option, true, true);
+	sceNpTus.todo("sceNpTusSetData(transId=%d, targetNpId=*0x%x, slotId=%d, totalSize=%d, sendSize=%d, data=*0x%x, info=*0x%x, infoStructSize=%d, option=*0x%x)", transId, targetNpId, slotId, totalSize, sendSize, data, info, infoStructSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpId || !data || totalSize == 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	const s32 data_size = 0;
+	return not_an_error(data_size);
 }
 
-template<typename T>
-error_code scenp_tus_get_data(s32 transId, T targetNpId, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> dataStatus, u32 dataStatusSize, vm::ptr<void> data, u32 recvSize, vm::ptr<void> option, bool vuser, bool async)
+error_code sceNpTusSetDataVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, u64 totalSize, u64 sendSize, vm::cptr<void> data, vm::cptr<SceNpTusDataInfo> info, u64 infoStructSize, vm::ptr<SceNpTusSetDataOptParam> option)
 {
+	sceNpTus.todo("sceNpTusSetDataAsync(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, totalSize=%d, sendSize=%d, data=*0x%x, info=*0x%x, infoStructSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, totalSize, sendSize, data, info, infoStructSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId || !data || totalSize == 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	const s32 data_size = 0;
+	return not_an_error(data_size);
+}
+
+error_code sceNpTusSetDataAsync(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, u64 totalSize, u64 sendSize, vm::cptr<void> data, vm::cptr<SceNpTusDataInfo> info, u64 infoStructSize, vm::ptr<SceNpTusSetDataOptParam> option)
+{
+	sceNpTus.todo("sceNpTusSetDataAsync(transId=%d, targetNpId=*0x%x, slotId=%d, totalSize=%d, sendSize=%d, data=*0x%x, info=*0x%x, infoStructSize=%d, option=*0x%x)", transId, targetNpId, slotId, totalSize, sendSize, data, info, infoStructSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpId || !data || totalSize == 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusSetDataVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, u64 totalSize, u64 sendSize, vm::cptr<void> data, vm::cptr<SceNpTusDataInfo> info, u64 infoStructSize, vm::ptr<SceNpTusSetDataOptParam> option)
+{
+	sceNpTus.todo("sceNpTusSetDataAsync(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, totalSize=%d, sendSize=%d, data=*0x%x, info=*0x%x, infoStructSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, totalSize, sendSize, data, info, infoStructSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId || !data || totalSize == 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusGetData(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> dataStatus, u64 dataStatusSize, vm::ptr<void> data, u64 recvSize, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetData(transId=%d, targetNpId=*0x%x, slotId=%d, dataStatus=*0x%x, dataStatusSize=%d, data=*0x%x, recvSize=%d, option=*0x%x)", transId, targetNpId, slotId, dataStatus, dataStatusSize, data, recvSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
 	if (!targetNpId)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
@@ -927,335 +1373,129 @@ error_code scenp_tus_get_data(s32 transId, T targetNpId, SceNpTusSlotId slotId,
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (dataStatusSize != sizeof(SceNpTusDataStatus))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
+	const s32 data_size = 0;
+	return not_an_error(data_size);
+}
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+error_code sceNpTusGetDataVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> dataStatus, u64 dataStatusSize, vm::ptr<void> data, u64 recvSize, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetDataVUser(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, dataStatus=*0x%x, dataStatusSize=%d, data=*0x%x, recvSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, dataStatus, dataStatusSize, data, recvSize, option);
 
-	if (!nph.is_NP_TUS_init)
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	// Probable vsh behaviour
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
+	if (!tus_manager.check_transaction_context_id(transId))
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
 
-	nph.tus_get_data(trans_ctx, get_scenp_online_id(*targetNpId.get_ptr()), slotId, dataStatus, data, recvSize, vuser, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
-}
-
-error_code sceNpTusGetData(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> dataStatus, u32 dataStatusSize, vm::ptr<void> data, u32 recvSize, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetData(transId=%d, targetNpId=*0x%x, slotId=%d, dataStatus=*0x%x, dataStatusSize=%d, data=*0x%x, recvSize=%d, option=*0x%x)", transId, targetNpId, slotId, dataStatus, dataStatusSize, data, recvSize, option);
-	return scenp_tus_get_data(transId, targetNpId, slotId, dataStatus, dataStatusSize, data, recvSize, option, false, false);
-}
-
-error_code sceNpTusGetDataVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> dataStatus, u32 dataStatusSize, vm::ptr<void> data, u32 recvSize, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetDataVUser(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, dataStatus=*0x%x, dataStatusSize=%d, data=*0x%x, recvSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, dataStatus, dataStatusSize, data, recvSize, option);
-	return scenp_tus_get_data(transId, targetVirtualUserId, slotId, dataStatus, dataStatusSize, data, recvSize, option, true, false);
-}
-
-error_code sceNpTusGetDataAsync(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> dataStatus, u32 dataStatusSize, vm::ptr<void> data, u32 recvSize, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetDataAsync(transId=%d, targetNpId=*0x%x, slotId=%d, dataStatus=*0x%x, dataStatusSize=%d, data=*0x%x, recvSize=%d, option=*0x%x)", transId, targetNpId, slotId, dataStatus, dataStatusSize, data, recvSize, option);
-	return scenp_tus_get_data(transId, targetNpId, slotId, dataStatus, dataStatusSize, data, recvSize, option, false, true);
-}
-
-error_code sceNpTusGetDataVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> dataStatus, u32 dataStatusSize, vm::ptr<void> data, u32 recvSize, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetDataVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, dataStatus=*0x%x, dataStatusSize=%d, data=*0x%x, recvSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, dataStatus, dataStatusSize, data, recvSize, option);
-	return scenp_tus_get_data(transId, targetVirtualUserId, slotId, dataStatus, dataStatusSize, data, recvSize, option, true, true);
-}
-
-template<typename T>
-error_code scenp_tus_get_multislot_data_status(s32 transId, T targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusDataStatus> statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr<void> option, bool vuser, bool async)
-{
-	if (!slotIdArray || !statusArray)
+	if (!targetVirtualUserId)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	if (arrayNum == 0 || option)
+	if (option || slotId < 0)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (statusArraySize != arrayNum * sizeof(SceNpTusDataStatus))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
+	const s32 data_size = 0;
+	return not_an_error(data_size);
+}
 
-	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
-	{
-		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
-	}
+error_code sceNpTusGetDataAsync(s32 transId, vm::cptr<SceNpId> targetNpId, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> dataStatus, u64 dataStatusSize, vm::ptr<void> data, u64 recvSize, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetDataAsync(transId=%d, targetNpId=*0x%x, slotId=%d, dataStatus=*0x%x, dataStatusSize=%d, data=*0x%x, recvSize=%d, option=*0x%x)", transId, targetNpId, slotId, dataStatus, dataStatusSize, data, recvSize, option);
 
-	if (!is_slot_array_valid(slotIdArray, arrayNum))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_TUS_init)
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
 	if (!targetNpId)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	// Probable vsh behaviour
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
-	}
-
-	nph.tus_get_multislot_data_status(trans_ctx, get_scenp_online_id(*targetNpId.get_ptr()), slotIdArray, statusArray, arrayNum, vuser, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
-}
-
-error_code sceNpTusGetMultiSlotDataStatus(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusDataStatus> statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiSlotDataStatus(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, statusArray, statusArraySize, arrayNum, option);
-	return scenp_tus_get_multislot_data_status(transId, targetNpId, slotIdArray, statusArray, statusArraySize, arrayNum, option, false, false);
-}
-
-error_code sceNpTusGetMultiSlotDataStatusVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusDataStatus> statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiSlotDataStatusVUser(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, statusArray, statusArraySize, arrayNum, option);
-	return scenp_tus_get_multislot_data_status(transId, targetVirtualUserId, slotIdArray, statusArray, statusArraySize, arrayNum, option, true, false);
-}
-
-error_code sceNpTusGetMultiSlotDataStatusAsync(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusDataStatus> statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiSlotDataStatusAsync(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, statusArray, statusArraySize, arrayNum, option);
-	return scenp_tus_get_multislot_data_status(transId, targetNpId, slotIdArray, statusArray, statusArraySize, arrayNum, option, false, true);
-}
-
-error_code sceNpTusGetMultiSlotDataStatusVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusDataStatus> statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiSlotDataStatusVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, statusArray, statusArraySize, arrayNum, option);
-	return scenp_tus_get_multislot_data_status(transId, targetVirtualUserId, slotIdArray, statusArray, statusArraySize, arrayNum, option, true, true);
-}
-
-template<typename T>
-error_code scenp_tus_get_multiuser_data_status(s32 transId, T targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr<void> option, bool vuser, bool async)
-{
-	if (!statusArray)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	if (arrayNum == 0 || option)
+	if (option || slotId < 0)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
-	if (arrayNum > SCE_NP_SCORE_MAX_NPID_NUM_PER_TRANS)
-	{
-		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
-	}
+	memcpy(&dataStatus->ownerId, targetNpId.get_ptr(), sizeof(SceNpId));
+	memcpy(&dataStatus->lastChangedAuthorId, targetNpId.get_ptr(), sizeof(SceNpId));
+	dataStatus->hasData = 0;
+	dataStatus->dataSize = 0;
 
-	if (statusArraySize != arrayNum * sizeof(SceNpTusDataStatus))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
+	return CELL_OK;
+}
 
-	if (slotId < 0)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
+error_code sceNpTusGetDataVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> dataStatus, u64 dataStatusSize, vm::ptr<void> data, u64 recvSize, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetDataVUser(transId=%d, targetVirtualUserId=*0x%x, slotId=%d, dataStatus=*0x%x, dataStatusSize=%d, data=*0x%x, recvSize=%d, option=*0x%x)", transId, targetVirtualUserId, slotId, dataStatus, dataStatusSize, data, recvSize, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-	if (!nph.is_NP_TUS_init)
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (!targetNpIdArray)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
-	}
-
-	// Probable vsh behaviour
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
+	if (!tus_manager.check_transaction_context_id(transId))
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
 
-	std::vector<SceNpOnlineId> online_ids;
-	for (s32 i = 0; i < arrayNum; i++)
-	{
-		online_ids.push_back(get_scenp_online_id(targetNpIdArray[i]));
-	}
-
-	nph.tus_get_multiuser_data_status(trans_ctx, std::move(online_ids), slotId, statusArray, arrayNum, vuser, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
-}
-
-error_code sceNpTusGetMultiUserDataStatus(s32 transId, vm::cptr<SceNpId> targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiUserDataStatus(transId=%d, targetNpIdArray=*0x%x, slotId=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpIdArray, slotId, statusArray, statusArraySize, arrayNum, option);
-	return scenp_tus_get_multiuser_data_status(transId, targetNpIdArray, slotId, statusArray, statusArraySize, arrayNum, option, false, false);
-}
-
-error_code sceNpTusGetMultiUserDataStatusVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiUserDataStatusVUser(transId=%d, targetVirtualUserIdArray=*0x%x, slotId=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserIdArray, slotId, statusArray, statusArraySize, arrayNum, option);
-	return scenp_tus_get_multiuser_data_status(transId, targetVirtualUserIdArray, slotId, statusArray, statusArraySize, arrayNum, option, true, false);
-}
-
-error_code sceNpTusGetMultiUserDataStatusAsync(s32 transId, vm::cptr<SceNpId> targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiUserDataStatusAsync(transId=%d, targetNpIdArray=*0x%x, slotId=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpIdArray, slotId, statusArray, statusArraySize, arrayNum, option);
-	return scenp_tus_get_multiuser_data_status(transId, targetNpIdArray, slotId, statusArray, statusArraySize, arrayNum, option, false, true);
-}
-
-error_code sceNpTusGetMultiUserDataStatusVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetMultiUserDataStatusVUserAsync(transId=%d, targetVirtualUserIdArray=*0x%x, slotId=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserIdArray, slotId, statusArray, statusArraySize, arrayNum, option);
-	return scenp_tus_get_multiuser_data_status(transId, targetVirtualUserIdArray, slotId, statusArray, statusArraySize, arrayNum, option, true, true);
-}
-
-error_code scenp_tus_get_friends_data_status(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusDataStatus> statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr<void> option, bool async)
-{
-	if (!statusArray)
+	if (!targetVirtualUserId)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	if (arrayNum == 0)
+	if (option || slotId < 0)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
-	// Undocumented behaviour and structure unknown
-	// Also checks a u32* at offset 4 of the struct for nullptr in which case it behaves like option == nullptr
-	if (option && *static_cast<u32*>(option.get_ptr()) != 0xC)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
+	return CELL_OK;
+}
 
-	if (sortType != SCE_NP_TUS_DATASTATUS_SORTTYPE_DESCENDING_DATE && sortType != SCE_NP_TUS_DATASTATUS_SORTTYPE_ASCENDING_DATE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
+error_code sceNpTusGetMultiSlotDataStatus(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusDataStatus> statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiSlotDataStatus(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, statusArray, statusArraySize, arrayNum, option);
 
-	if (arrayNum > SCE_NP_SCORE_MAX_SELECTED_FRIENDS_NUM)
-	{
-		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
-	}
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-	if (statusArraySize != arrayNum * sizeof(SceNpTusDataStatus))
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ALIGNMENT;
-	}
-
-	if (slotId < 0)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
-	}
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_TUS_init)
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	// Probable vsh behaviour
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
+	if (!tus_manager.check_transaction_context_id(transId))
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
 
-	nph.tus_get_friends_data_status(trans_ctx, slotId, includeSelf, sortType, statusArray, arrayNum, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
-}
-
-error_code sceNpTusGetFriendsDataStatus(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusDataStatus> statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetFriendsDataStatus(transId=%d, slotId=%d, includeSelf=%d, sortType=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, slotId, includeSelf, sortType, statusArray, statusArraySize, arrayNum, option);
-	return scenp_tus_get_friends_data_status(transId, slotId, includeSelf, sortType, statusArray, statusArraySize, arrayNum, option, false);
-}
-
-error_code sceNpTusGetFriendsDataStatusAsync(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusDataStatus> statusArray, u32 statusArraySize, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusGetFriendsDataStatusAsync(transId=%d, slotId=%d, includeSelf=%d, sortType=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, slotId, includeSelf, sortType, statusArray, statusArraySize, arrayNum, option);
-	return scenp_tus_get_friends_data_status(transId, slotId, includeSelf, sortType, statusArray, statusArraySize, arrayNum, option, true);
-}
-
-template<typename T>
-error_code scenp_tus_delete_multislot_data(s32 transId, T targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option, bool vuser, bool async)
-{
-	if (!slotIdArray)
+	if (!targetNpId || !statusArray || arrayNum <= 0)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	if (arrayNum == 0 || option)
+	if (option || !validateSlotIds(slotIdArray))
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
@@ -1265,120 +1505,484 @@ error_code scenp_tus_delete_multislot_data(s32 transId, T targetNpId, vm::cptr<S
 		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
 	}
 
-	if (!is_slot_array_valid(slotIdArray, arrayNum))
+	const s32 status_count = 0;
+	return not_an_error(status_count);
+}
+
+error_code sceNpTusGetMultiSlotDataStatusVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusDataStatus> statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiSlotDataStatusVUser(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, statusArray, statusArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId || !statusArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
 
-	if (!nph.is_NP_TUS_init)
+	const s32 status_count = 0;
+	return not_an_error(status_count);
+}
+
+error_code sceNpTusGetMultiSlotDataStatusAsync(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusDataStatus> statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiSlotDataStatusAsync(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, statusArray, statusArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	// Probable vsh behaviour
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
+	if (!tus_manager.check_transaction_context_id(transId))
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
 
-	nph.tus_delete_multislot_data(trans_ctx, get_scenp_online_id(*targetNpId.get_ptr()), slotIdArray, arrayNum, vuser, async);
-
-	if (async)
-	{
-		return CELL_OK;
-	}
-
-	return *trans_ctx->result;
-}
-
-
-error_code sceNpTusDeleteMultiSlotData(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusDeleteMultiSlotData(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, arrayNum, option);
-	return scenp_tus_delete_multislot_data(transId, targetNpId, slotIdArray, arrayNum, option, false, false);
-}
-
-error_code sceNpTusDeleteMultiSlotDataVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusDeleteMultiSlotDataVUser(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, arrayNum, option);
-	return scenp_tus_delete_multislot_data(transId, targetVirtualUserId, slotIdArray, arrayNum, option, true, false);
-}
-
-error_code sceNpTusDeleteMultiSlotDataAsync(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusDeleteMultiSlotDataAsync(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, arrayNum, option);
-	return scenp_tus_delete_multislot_data(transId, targetNpId, slotIdArray, arrayNum, option, false, true);
-}
-
-error_code sceNpTusDeleteMultiSlotDataVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
-{
-	sceNpTus.warning("sceNpTusDeleteMultiSlotDataVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, arrayNum, option);
-	return scenp_tus_delete_multislot_data(transId, targetVirtualUserId, slotIdArray, arrayNum, option, true, true);
-}
-
-void scenp_tss_no_file(const shared_ptr<tus_transaction_ctx>& trans, vm::ptr<SceNpTssDataStatus> dataStatus)
-{
-	// TSS are files stored on PSN by developers, no dumps available atm
-	std::memset(dataStatus.get_ptr(), 0, sizeof(SceNpTssDataStatus));
-	trans->result = not_an_error(0);
-}
-
-error_code sceNpTssGetData(s32 transId, SceNpTssSlotId slotId, vm::ptr<SceNpTssDataStatus> dataStatus, u32 dataStatusSize, vm::ptr<void> data, u32 recvSize, vm::ptr<SceNpTssGetDataOptParam> option)
-{
-	sceNpTus.warning("sceNpTssGetData(transId=%d, slotId=%d, dataStatus=*0x%x, dataStatusSize=%d, data=*0x%x, recvSize=%d, option=*0x%x)", transId, slotId, dataStatus, dataStatusSize, data, recvSize, option);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (!nph.is_NP_TUS_init)
-	{
-		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
-	}
-
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
-	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
-	}
-
-	if (!dataStatus)
+	if (!targetNpId || !statusArray || arrayNum <= 0)
 	{
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
-
-	if (!trans_ctx)
+	if (option || !validateSlotIds(slotIdArray))
 	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
 	}
 
-	scenp_tss_no_file(trans_ctx, dataStatus);
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
 
 	return CELL_OK;
 }
 
-error_code sceNpTssGetDataAsync(s32 transId, SceNpTssSlotId slotId, vm::ptr<SceNpTssDataStatus> dataStatus, u32 dataStatusSize, vm::ptr<void> data, u32 recvSize, vm::ptr<SceNpTssGetDataOptParam> option)
+error_code sceNpTusGetMultiSlotDataStatusVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusDataStatus> statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr<void> option)
 {
-	sceNpTus.warning("sceNpTssGetDataAsync(transId=%d, slotId=%d, dataStatus=*0x%x, dataStatusSize=%d, data=*0x%x, recvSize=%d, option=*0x%x)", transId, slotId, dataStatus, dataStatusSize, data, recvSize, option);
+	sceNpTus.todo("sceNpTusGetMultiSlotDataStatusVUser(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, statusArray, statusArraySize, arrayNum, option);
 
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
 
-	if (!nph.is_NP_TUS_init)
+	if (!tus_manager.is_initialized)
 	{
 		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
 	}
 
-	if (nph.get_psn_status() != SCE_NP_MANAGER_STATUS_ONLINE)
+	if (!tus_manager.check_transaction_context_id(transId))
 	{
-		return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId || !statusArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusGetMultiUserDataStatus(s32 transId, vm::cptr<SceNpId> targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiUserDataStatus(transId=%d, targetNpIdArray=*0x%x, slotId=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpIdArray, slotId, statusArray, statusArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpIdArray || !statusArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_USER_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
+	}
+
+	const s32 status_count = 0;
+	return not_an_error(status_count);
+}
+
+error_code sceNpTusGetMultiUserDataStatusVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiUserDataStatusVUser(transId=%d, targetVirtualUserIdArray=*0x%x, slotId=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserIdArray, slotId, statusArray, statusArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserIdArray || !statusArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_USER_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
+	}
+
+	const s32 status_count = 0;
+	return not_an_error(status_count);
+}
+
+error_code sceNpTusGetMultiUserDataStatusAsync(s32 transId, vm::cptr<SceNpId> targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiUserDataStatusAsync(transId=%d, targetNpIdArray=*0x%x, slotId=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetNpIdArray, slotId, statusArray, statusArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpIdArray || !statusArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_USER_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusGetMultiUserDataStatusVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetMultiUserDataStatusVUserAsync(transId=%d, targetVirtualUserIdArray=*0x%x, slotId=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserIdArray, slotId, statusArray, statusArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserIdArray || !statusArray || arrayNum <= 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_USER_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusGetFriendsDataStatus(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusDataStatus> statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetFriendsDataStatus(transId=%d, slotId=%d, includeSelf=%d, sortType=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, slotId, includeSelf, sortType, statusArray, statusArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!statusArray)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || arrayNum < 0 || slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SELECTED_FRIENDS_NUM)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
+	}
+
+	const s32 status_count = 0;
+	return not_an_error(status_count);
+}
+
+error_code sceNpTusGetFriendsDataStatusAsync(s32 transId, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusDataStatus> statusArray, u64 statusArraySize, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusGetFriendsDataStatusAsync(transId=%d, slotId=%d, includeSelf=%d, sortType=%d, statusArray=*0x%x, statusArraySize=%d, arrayNum=%d, option=*0x%x)", transId, slotId, includeSelf, sortType, statusArray, statusArraySize, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!statusArray)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || arrayNum < 0 || slotId < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SELECTED_FRIENDS_NUM)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_NPID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusDeleteMultiSlotData(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusDeleteMultiSlotData(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpId || !slotIdArray || arrayNum < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusDeleteMultiSlotDataVUser(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusDeleteMultiSlotDataVUser(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId || !slotIdArray || arrayNum < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusDeleteMultiSlotDataAsync(s32 transId, vm::cptr<SceNpId> targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusDeleteMultiSlotDataAsync(transId=%d, targetNpId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetNpId, slotIdArray, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetNpId || !slotIdArray || arrayNum < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTusDeleteMultiSlotDataVUserAsync(s32 transId, vm::cptr<SceNpTusVirtualUserId> targetVirtualUserId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, vm::ptr<void> option)
+{
+	sceNpTus.todo("sceNpTusDeleteMultiSlotDataVUserAsync(transId=%d, targetVirtualUserId=*0x%x, slotIdArray=*0x%x, arrayNum=%d, option=*0x%x)", transId, targetVirtualUserId, slotIdArray, arrayNum, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
+	}
+
+	if (!targetVirtualUserId || !slotIdArray || arrayNum < 0)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
+
+	if (option || !validateSlotIds(slotIdArray))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
+	}
+
+	if (arrayNum > SCE_NP_TUS_MAX_SLOT_NUM_PER_TRANS)
+	{
+		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_SLOTID;
+	}
+
+	return CELL_OK;
+}
+
+error_code sceNpTssGetData(s32 transId, SceNpTssSlotId slotId, vm::ptr<SceNpTssDataStatus> dataStatus, u64 dataStatusSize, vm::ptr<void> data, u64 recvSize, vm::ptr<SceNpTssGetDataOptParam> option)
+{
+	sceNpTus.todo("sceNpTssGetData(transId=%d, slotId=%d, dataStatus=*0x%x, dataStatusSize=%d, data=*0x%x, recvSize=%d, option=*0x%x)", transId, slotId, dataStatus, dataStatusSize, data, recvSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
+	{
+		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
 
 	if (!dataStatus)
@@ -1386,14 +1990,30 @@ error_code sceNpTssGetDataAsync(s32 transId, SceNpTssSlotId slotId, vm::ptr<SceN
 		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
 	}
 
-	auto trans_ctx = idm::get_unlocked<tus_transaction_ctx>(transId);
+	return CELL_OK;
+}
 
-	if (!trans_ctx)
+error_code sceNpTssGetDataAsync(s32 transId, SceNpTssSlotId slotId, vm::ptr<SceNpTssDataStatus> dataStatus, u64 dataStatusSize, vm::ptr<void> data, u64 recvSize, vm::ptr<SceNpTssGetDataOptParam> option)
+{
+	sceNpTus.todo("sceNpTssGetDataAsync(transId=%d, slotId=%d, dataStatus=*0x%x, dataStatusSize=%d, data=*0x%x, recvSize=%d, option=*0x%x)", transId, slotId, dataStatus, dataStatusSize, data, recvSize, option);
+
+	auto& tus_manager = g_fxo->get<sce_np_tus_manager>();
+	std::scoped_lock lock(tus_manager.mtx);
+
+	if (!tus_manager.is_initialized)
+	{
+		return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
+	}
+
+	if (!tus_manager.check_transaction_context_id(transId))
 	{
 		return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
 	}
 
-	scenp_tss_no_file(trans_ctx, dataStatus);
+	if (!dataStatus)
+	{
+		return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
+	}
 
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/Cell/Modules/sceNpTus.h b/rpcs3/Emu/Cell/Modules/sceNpTus.h
index c9cc4841c2..d31964b5e3 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpTus.h
+++ b/rpcs3/Emu/Cell/Modules/sceNpTus.h
@@ -15,30 +15,6 @@ enum
 	SCE_NP_TUS_MAX_SELECTED_FRIENDS_NUM = 100,
 };
 
-enum
-{
-	SCE_NP_TUS_OPETYPE_EQUAL = 1,
-	SCE_NP_TUS_OPETYPE_NOT_EQUAL,
-	SCE_NP_TUS_OPETYPE_GREATER_THAN,
-	SCE_NP_TUS_OPETYPE_GREATER_OR_EQUAL,
-	SCE_NP_TUS_OPETYPE_LESS_THAN,
-	SCE_NP_TUS_OPETYPE_LESS_OR_EQUAL
-};
-
-enum
-{
-	SCE_NP_TUS_VARIABLE_SORTTYPE_DESCENDING_DATE = 1,
-	SCE_NP_TUS_VARIABLE_SORTTYPE_ASCENDING_DATE,
-	SCE_NP_TUS_VARIABLE_SORTTYPE_DESCENDING_VALUE,
-	SCE_NP_TUS_VARIABLE_SORTTYPE_ASCENDING_VALUE
-};
-
-enum
-{
-	SCE_NP_TUS_DATASTATUS_SORTTYPE_DESCENDING_DATE = 1,
-	SCE_NP_TUS_DATASTATUS_SORTTYPE_ASCENDING_DATE
-};
-
 enum SceNpTssStatusCodeType
 {
 	SCE_NP_TSS_STATUS_TYPE_OK,
@@ -61,8 +37,8 @@ struct SceNpTusVariable
 {
 	SceNpId ownerId;
 	be_t<s32> hasData;
-	CellRtcTick lastChangedDate;
 	u8 pad[4];
+	CellRtcTick lastChangedDate;
 	SceNpId lastChangedAuthorId;
 	be_t<s64> variable;
 	be_t<s64> oldVariable;
@@ -84,7 +60,7 @@ struct SceNpTusDataStatus
 	be_t<s32> hasData;
 	CellRtcTick lastChangedDate;
 	SceNpId lastChangedAuthorId;
-	vm::bptr<void> data;
+	be_t<u32> data;
 	be_t<u32> dataSize;
 	u8 pad[4];
 	SceNpTusDataInfo info;
@@ -92,46 +68,46 @@ struct SceNpTusDataStatus
 
 struct SceNpTusAddAndGetVariableOptParam
 {
-	be_t<u32> size;
-	vm::bptr<CellRtcTick> isLastChangedDate;
-	vm::bptr<SceNpId> isLastChangedAuthorId;
+	u64 size; // TODO: correct type?
+	vm::ptr<CellRtcTick> isLastChangedDate;
+	vm::ptr<SceNpId> isLastChangedAuthorId;
 };
 
 struct SceNpTusTryAndSetVariableOptParam
 {
-	be_t<u32> size;
-	vm::bptr<CellRtcTick> isLastChangedDate;
-	vm::bptr<SceNpId> isLastChangedAuthorId;
-	vm::bptr<s64> compareValue;
+	u64 size; // TODO: correct type?
+	vm::ptr<CellRtcTick> isLastChangedDate;
+	vm::ptr<SceNpId> isLastChangedAuthorId;
+	vm::ptr<s64> compareValue;
 };
 
 struct SceNpTusSetDataOptParam
 {
-	be_t<u32> size;
-	vm::bptr<CellRtcTick> isLastChangedDate;
-	vm::bptr<SceNpId> isLastChangedAuthorId;
+	u64 size; // TODO: correct type?
+	vm::ptr<CellRtcTick> isLastChangedDate;
+	vm::ptr<SceNpId> isLastChangedAuthorId;
 };
 
 struct SceNpTssDataStatus
 {
 	CellRtcTick lastModified;
-	be_t<s32> statusCodeType;
-	be_t<u32> contentLength;
+	s32 statusCodeType;
+	u64 contentLength;
 };
 
 struct SceNpTssIfModifiedSinceParam
 {
-	be_t<s32> ifType;
+	s32 ifType;
 	u8 padding[4];
 	CellRtcTick lastModified;
 };
 
 struct SceNpTssGetDataOptParam
 {
-	be_t<u32> size;
-	vm::bptr<u64> offset;
-	vm::bptr<u64> lastByte;
-	vm::bptr<SceNpTssIfModifiedSinceParam> ifParam;
+	u64 size; // TODO: correct type?
+	vm::ptr<u64> offset;
+	vm::ptr<u64> lastByte;
+	vm::ptr<SceNpTssIfModifiedSinceParam> ifParam;
 };
 
 // fxm objects
diff --git a/rpcs3/Emu/Cell/Modules/sceNpUtil.cpp b/rpcs3/Emu/Cell/Modules/sceNpUtil.cpp
index b8f1341d85..2370a63cfe 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpUtil.cpp
+++ b/rpcs3/Emu/Cell/Modules/sceNpUtil.cpp
@@ -7,119 +7,46 @@
 
 LOG_CHANNEL(sceNpUtil);
 
-struct bandwidth_test
-{
-	atomic_t<u32> status = SCE_NP_UTIL_BANDWIDTH_TEST_STATUS_NONE;
-	atomic_t<bool> abort = false;
-	atomic_t<bool> shutdown = false;
-	atomic_t<bool> finished = false;
-	SceNpUtilBandwidthTestResult test_result{};
-
-	static constexpr auto thread_name = "HLE SceNpBandwidthTest"sv;
-
-	void operator()()
-	{
-		status = SCE_NP_UTIL_BANDWIDTH_TEST_STATUS_RUNNING;
-		u32 fake_sleep_count = 0;
-
-		while (thread_ctrl::state() != thread_state::aborting)
-		{
-			if (abort || shutdown)
-			{
-				break;
-			}
-
-			// TODO: run proper bandwidth test, probably with cellHttp
-
-			thread_ctrl::wait_for(1000); // wait 1ms
-
-			if (fake_sleep_count++ > 100) // end fake bandwidth test after 100 ms
-			{
-				break;
-			}
-		}
-
-		test_result.upload_bps = 100'000'000.0;
-		test_result.download_bps = 100'000'000.0;
-		test_result.result = CELL_OK;
-		status = SCE_NP_UTIL_BANDWIDTH_TEST_STATUS_FINISHED;
-		finished = true;
-	}
-};
-
-struct sce_np_util_manager
-{
-	shared_mutex mtx{};
-	std::unique_ptr<named_thread<bandwidth_test>> bandwidth_test_thread;
-
-	~sce_np_util_manager()
-	{
-		join_thread();
-	}
-
-	void join_thread()
-	{
-		bandwidth_test_thread.reset();
-	}
-};
-
-error_code sceNpUtilBandwidthTestInitStart([[maybe_unused]] ppu_thread& ppu, u32 prio, u32 stack)
+error_code sceNpUtilBandwidthTestInitStart(u32 prio, u64 stack)
 {
 	sceNpUtil.todo("sceNpUtilBandwidthTestInitStart(prio=%d, stack=%d)", prio, stack);
 
 	auto& util_manager = g_fxo->get<sce_np_util_manager>();
-	std::lock_guard lock(util_manager.mtx);
 
-	if (util_manager.bandwidth_test_thread)
+	if (util_manager.is_initialized)
 	{
 		return SCE_NP_ERROR_ALREADY_INITIALIZED;
 	}
 
-	util_manager.bandwidth_test_thread = std::make_unique<named_thread<bandwidth_test>>();
+	util_manager.is_initialized = true;
 
 	return CELL_OK;
 }
 
 error_code sceNpUtilBandwidthTestGetStatus()
 {
-	sceNpUtil.notice("sceNpUtilBandwidthTestGetStatus()");
+	sceNpUtil.todo("sceNpUtilBandwidthTestGetStatus()");
 
-	auto& util_manager = g_fxo->get<sce_np_util_manager>();
-	std::lock_guard lock(util_manager.mtx);
-
-	if (!util_manager.bandwidth_test_thread)
+	if (!g_fxo->get<sce_np_util_manager>().is_initialized)
 	{
 		return SCE_NP_ERROR_NOT_INITIALIZED;
 	}
 
-	return not_an_error(util_manager.bandwidth_test_thread->status);
+	return not_an_error(SCE_NP_UTIL_BANDWIDTH_TEST_STATUS_FINISHED);
 }
 
-error_code sceNpUtilBandwidthTestShutdown([[maybe_unused]] ppu_thread& ppu, vm::ptr<SceNpUtilBandwidthTestResult> result)
+error_code sceNpUtilBandwidthTestShutdown(vm::ptr<SceNpUtilBandwidthTestResult> result)
 {
-	sceNpUtil.warning("sceNpUtilBandwidthTestShutdown(result=*0x%x)", result);
+	sceNpUtil.todo("sceNpUtilBandwidthTestShutdown(result=*0x%x)", result);
 
 	auto& util_manager = g_fxo->get<sce_np_util_manager>();
-	std::lock_guard lock(util_manager.mtx);
 
-	if (!util_manager.bandwidth_test_thread)
+	if (!util_manager.is_initialized)
 	{
 		return SCE_NP_ERROR_NOT_INITIALIZED;
 	}
 
-	util_manager.bandwidth_test_thread->shutdown = true;
-
-	while (!util_manager.bandwidth_test_thread->finished)
-	{
-		thread_ctrl::wait_for(1000);
-	}
-
-	if (result) // TODO: what happens when this is null ?
-	{
-		*result = util_manager.bandwidth_test_thread->test_result;
-	}
-
-	util_manager.join_thread();
+	util_manager.is_initialized = false;
 
 	return CELL_OK;
 }
@@ -128,18 +55,11 @@ error_code sceNpUtilBandwidthTestAbort()
 {
 	sceNpUtil.todo("sceNpUtilBandwidthTestAbort()");
 
-	auto& util_manager = g_fxo->get<sce_np_util_manager>();
-	std::lock_guard lock(util_manager.mtx);
-
-	if (!util_manager.bandwidth_test_thread)
+	if (!g_fxo->get<sce_np_util_manager>().is_initialized)
 	{
 		return SCE_NP_ERROR_NOT_INITIALIZED;
 	}
 
-	// TODO: cellHttpTransactionAbortConnection();
-
-	util_manager.bandwidth_test_thread->abort = true;
-
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/sceNpUtil.h b/rpcs3/Emu/Cell/Modules/sceNpUtil.h
index 290b9d1a3d..b81ab5d7ac 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpUtil.h
+++ b/rpcs3/Emu/Cell/Modules/sceNpUtil.h
@@ -12,5 +12,11 @@ struct SceNpUtilBandwidthTestResult
 	be_t<f64> upload_bps;
 	be_t<f64> download_bps;
 	be_t<s32> result;
-	s8 padding[4];
+};
+
+// fxm objects
+
+struct sce_np_util_manager
+{
+	atomic_t<bool> is_initialized = false;
 };
diff --git a/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp b/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp
index 483fcfe1e9..fee6d38fea 100644
--- a/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp
+++ b/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp
@@ -16,7 +16,7 @@ vm::gvar<vm::ptr<void()>> g_ppu_atexitspawn;
 vm::gvar<vm::ptr<void()>> g_ppu_at_Exitspawn;
 extern vm::gvar<u32> g_ppu_exit_mutex;
 
-u64 sys_time_get_system_time()
+s64 sys_time_get_system_time()
 {
 	sysPrxForUser.trace("sys_time_get_system_time()");
 
@@ -95,16 +95,16 @@ error_code console_getc()
 	return CELL_OK;
 }
 
-void console_putc(ppu_thread& ppu, char ch)
+void console_putc(char ch)
 {
 	sysPrxForUser.trace("console_putc(ch=0x%x)", ch);
-	sys_tty_write(ppu, 0, vm::var<char>(ch), 1, vm::var<u32>{});
+	sys_tty_write(0, vm::var<char>(ch), 1, vm::var<u32>{});
 }
 
-error_code console_write(ppu_thread& ppu, vm::ptr<char> data, u32 len)
+error_code console_write(vm::ptr<char> data, u32 len)
 {
 	sysPrxForUser.trace("console_write(data=*0x%x, len=%d)", data, len);
-	sys_tty_write(ppu, 0, data, len, vm::var<u32>{});
+	sys_tty_write(0, data, len, vm::var<u32>{});
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/sys_crashdump.h b/rpcs3/Emu/Cell/Modules/sys_crashdump.h
index c15ed38141..02c37ac600 100644
--- a/rpcs3/Emu/Cell/Modules/sys_crashdump.h
+++ b/rpcs3/Emu/Cell/Modules/sys_crashdump.h
@@ -10,6 +10,6 @@ enum
 struct sys_crash_dump_log_area_info_t
 {
 	char label[SYS_CRASH_DUMP_MAX_LABEL_SIZE]; // 15 + 1 (0 terminated)
-	vm::bptr<void> addr;
-	be_t<u32> size;
+	vm::ptr<void> addr;
+	be_t<u64> size;
 };
diff --git a/rpcs3/Emu/Cell/Modules/sys_game_.cpp b/rpcs3/Emu/Cell/Modules/sys_game.cpp
similarity index 100%
rename from rpcs3/Emu/Cell/Modules/sys_game_.cpp
rename to rpcs3/Emu/Cell/Modules/sys_game.cpp
diff --git a/rpcs3/Emu/Cell/Modules/sys_heap.cpp b/rpcs3/Emu/Cell/Modules/sys_heap.cpp
index c0ba4fb2da..69f04ea42a 100644
--- a/rpcs3/Emu/Cell/Modules/sys_heap.cpp
+++ b/rpcs3/Emu/Cell/Modules/sys_heap.cpp
@@ -2,6 +2,8 @@
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 
+#include "sysPrxForUser.h"
+
 LOG_CHANNEL(sysPrxForUser);
 
 struct HeapInfo
@@ -9,7 +11,6 @@ struct HeapInfo
 	static const u32 id_base = 1;
 	static const u32 id_step = 1;
 	static const u32 id_count = 1023;
-	SAVESTATE_INIT_POS(22);
 
 	const std::string name;
 
diff --git a/rpcs3/Emu/Cell/Modules/sys_io_.cpp b/rpcs3/Emu/Cell/Modules/sys_io_.cpp
index 5f767ebae4..abbdb53cd5 100644
--- a/rpcs3/Emu/Cell/Modules/sys_io_.cpp
+++ b/rpcs3/Emu/Cell/Modules/sys_io_.cpp
@@ -3,10 +3,6 @@
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 
-#include "Emu/Cell/lv2/sys_event.h"
-#include "Emu/Cell/lv2/sys_ppu_thread.h"
-#include "Emu/Cell/Modules/sysPrxForUser.h"
-
 LOG_CHANNEL(sys_io);
 
 extern void cellPad_init();
@@ -17,182 +13,53 @@ struct libio_sys_config
 {
 	shared_mutex mtx;
 	s32 init_ctr = 0;
-	u32 ppu_id = 0;
-	u32 queue_id = 0;
+	u32 stack_addr = 0;
 
 	~libio_sys_config() noexcept
 	{
-	}
-
-	void save_or_load(utils::serial& ar)
-	{
-		ar(init_ctr, ppu_id, queue_id);
+		if (stack_addr)
+		{
+			ensure(vm::dealloc(stack_addr, vm::stack));
+		}
 	}
 };
 
-extern void sys_io_serialize(utils::serial& ar)
+// Only exists internally (has no name)
+extern void libio_sys_config_init()
 {
-	// Do not assign a serialization tag for now, call it from cellPad serialization
-	ensure(g_fxo->try_get<libio_sys_config>())->save_or_load(ar);
-}
-
-extern bool cellPad_NotifyStateChange(usz index, u64 state, bool lock = true, bool is_blocking = true);
-
-void config_event_entry(ppu_thread& ppu)
-{
-	ppu.state += cpu_flag::wait;
-
-	auto& cfg = *ensure(g_fxo->try_get<libio_sys_config>());
-
-	if (!ppu.loaded_from_savestate)
-	{
-		// Ensure awake
-		ppu.check_state();
-	}
-
-	const u32 queue_id = cfg.queue_id;
-	auto queue = idm::get_unlocked<lv2_obj, lv2_event_queue>(queue_id);
-
-	while (queue && sys_event_queue_receive(ppu, queue_id, vm::null, 0) == CELL_OK)
-	{
-		if (ppu.is_stopped())
-		{
-			ppu.state += cpu_flag::again;
-			return;
-		}
-
-		// Some delay
-		thread_ctrl::wait_for(10000);
-
-		// Wakeup
-		ppu.check_state();
-		ppu.state += cpu_flag::wait;
-
-		const u64 arg1 = ppu.gpr[5];
-		const u64 arg2 = ppu.gpr[6];
-		const u64 arg3 = ppu.gpr[7];
-
-		// TODO: Reverse-engineer proper event system
-
-		if (arg1 == 1)
-		{
-			while (!cellPad_NotifyStateChange(arg2, arg3, false))
-			{
-				if (!queue->exists)
-				{
-					// Exit condition
-					queue = null_ptr;
-					break;
-				}
-
-				thread_ctrl::wait_for(100);
-			}
-		}
-	}
-
-	sys_io.notice("config_event_entry(): Exited with the following error code: %s", CellError{static_cast<u32>(ppu.gpr[3])});
-
-	ppu_execute<&sys_ppu_thread_exit>(ppu, 0);
-}
-
-std::unique_lock<shared_mutex> lock_lv2_mutex_alike(shared_mutex& mtx, ppu_thread* ppu)
-{
-	std::unique_lock<shared_mutex> lock(mtx, std::defer_lock);
-
-	while (!lock.try_lock())
-	{
-		if (ppu)
-		{
-			// Could not be acquired, put PPU to sleep
-			lv2_obj::sleep(*ppu);
-		}
-
-		// Wait for unlock without owning the lock
-		mtx.lock_unlock();
-
-		if (ppu)
-		{
-			// Awake, still not owning
-			ppu->check_state();
-		}
-	}
-
-	return lock;
-}
-
-extern void send_sys_io_connect_event(usz index, u32 state)
-{
-	if (Emu.IsStarting() || Emu.IsReady())
-	{
-		cellPad_NotifyStateChange(index, state);
-		return;
-	}
-
 	auto& cfg = g_fxo->get<libio_sys_config>();
 
-	auto lock = lock_lv2_mutex_alike(cfg.mtx, cpu_thread::get_current<ppu_thread>());
-
-	if (cfg.init_ctr)
-	{
-		if (auto port = idm::get_unlocked<lv2_obj, lv2_event_queue>(cfg.queue_id))
-		{
-			port->send(0, 1, index, state);
-		}
-	}
-}
-
-error_code sys_config_start(ppu_thread& ppu)
-{
-	sys_io.warning("sys_config_start()");
-
-	auto& cfg = g_fxo->get<libio_sys_config>();
-
-	auto lock = lock_lv2_mutex_alike(cfg.mtx, &ppu);
+	std::lock_guard lock(cfg.mtx);
 
 	if (cfg.init_ctr++ == 0)
 	{
-		// Run thread
-		vm::var<u64> _tid;
-		vm::var<u32> queue_id;
-		vm::var<char[]> _name = vm::make_str("_cfg_evt_hndlr");
-
-		vm::var<sys_event_queue_attribute_t> attr;
-		attr->protocol = SYS_SYNC_PRIORITY;
-		attr->type = SYS_PPU_QUEUE;
-		attr->name_u64 = 0;
-
-		ensure(CELL_OK == sys_event_queue_create(ppu, queue_id, attr, 0, 0x20));
-		ppu.check_state();
-		cfg.queue_id = *queue_id;
-
-		ensure(CELL_OK == ppu_execute<&sys_ppu_thread_create>(ppu, +_tid, g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(config_event_entry)), 0, 512, 0x2000, SYS_PPU_THREAD_CREATE_JOINABLE, +_name));
-		ppu.check_state();
-
-		cfg.ppu_id = static_cast<u32>(*_tid);
+		// Belongs to "_cfg_evt_hndlr" thread (8k stack)
+		cfg.stack_addr = ensure(vm::alloc(0x2000, vm::stack, 4096));
 	}
+}
+
+extern void libio_sys_config_end()
+{
+	auto& cfg = g_fxo->get<libio_sys_config>();
+
+	std::lock_guard lock(cfg.mtx);
+
+	if (cfg.init_ctr-- == 1)
+	{
+		ensure(vm::dealloc(std::exchange(cfg.stack_addr, 0), vm::stack));
+	}
+}
+
+error_code sys_config_start()
+{
+	sys_io.todo("sys_config_start()");
 
 	return CELL_OK;
 }
 
-error_code sys_config_stop(ppu_thread& ppu)
+error_code sys_config_stop()
 {
-	sys_io.warning("sys_config_stop()");
-
-	auto& cfg = g_fxo->get<libio_sys_config>();
-
-	auto lock = lock_lv2_mutex_alike(cfg.mtx, &ppu);
-
-	if (cfg.init_ctr && cfg.init_ctr-- == 1)
-	{
-		ensure(CELL_OK == sys_event_queue_destroy(ppu, cfg.queue_id, SYS_EVENT_QUEUE_DESTROY_FORCE));
-		ppu.check_state();
-		ensure(CELL_OK == sys_ppu_thread_join(ppu, cfg.ppu_id, +vm::var<u64>{}));
-	}
-	else
-	{
-		// TODO: Unknown error
-	}
-
+	sys_io.todo("sys_config_stop()");
 	return CELL_OK;
 }
 
@@ -247,6 +114,4 @@ DECLARE(ppu_module_manager::sys_io)("sys_io", []()
 	REG_FUNC(sys_io, sys_config_register_service);
 	REG_FUNC(sys_io, sys_config_unregister_io_error_handler);
 	REG_FUNC(sys_io, sys_config_unregister_service);
-
-	REG_HIDDEN_FUNC(config_event_entry);
 });
diff --git a/rpcs3/Emu/Cell/Modules/sys_libc_.cpp b/rpcs3/Emu/Cell/Modules/sys_libc_.cpp
index c5647dc0b2..d9bd57a3c9 100644
--- a/rpcs3/Emu/Cell/Modules/sys_libc_.cpp
+++ b/rpcs3/Emu/Cell/Modules/sys_libc_.cpp
@@ -416,7 +416,7 @@ error_code _sys_printf(ppu_thread& ppu, vm::cptr<char> fmt, ppu_va_args_t va_arg
 
 	const auto buf = vm::make_str(ps3_fmt(ppu, fmt, va_args.count));
 
-	sys_tty_write(ppu, 0, buf, buf.get_count() - 1, vm::var<u32>{});
+	sys_tty_write(0, buf, buf.get_count() - 1, vm::var<u32>{});
 
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp b/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp
index c9bb020e26..2e13cf798b 100644
--- a/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp
+++ b/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp
@@ -65,33 +65,38 @@ void fmt_class_string<CellLv2DbgError>::format(std::string& out, u64 arg)
 	});
 }
 
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 error_code sys_dbg_read_ppu_thread_context(u64 id, vm::ptr<sys_dbg_ppu_thread_context_t> ppu_context)
 {
-	sys_lv2dbg.todo("sys_dbg_read_ppu_thread_context(id=0x%x, ppu_context=*0x%x)", id, ppu_context);
+	sys_lv2dbg.todo("sys_dbg_read_ppu_thread_context()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_read_spu_thread_context(u32 id, vm::ptr<sys_dbg_spu_thread_context_t> spu_context)
 {
-	sys_lv2dbg.todo("sys_dbg_read_spu_thread_context(id=0x%x, spu_context=*0x%x)", id, spu_context);
+	sys_lv2dbg.todo("sys_dbg_read_spu_thread_context()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_read_spu_thread_context2(u32 id, vm::ptr<sys_dbg_spu_thread_context2_t> spu_context)
 {
-	sys_lv2dbg.todo("sys_dbg_read_spu_thread_context2(id=0x%x, spu_context=*0x%x)", id, spu_context);
+	sys_lv2dbg.todo("sys_dbg_read_spu_thread_context2()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_set_stacksize_ppu_exception_handler(u32 stacksize)
 {
-	sys_lv2dbg.todo("sys_dbg_set_stacksize_ppu_exception_handler(stacksize=0x%x)", stacksize);
+	sys_lv2dbg.todo("sys_dbg_set_stacksize_ppu_exception_handler()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_initialize_ppu_exception_handler(s32 prio)
 {
-	sys_lv2dbg.todo("sys_dbg_initialize_ppu_exception_handler(prio=0x%x)", prio);
+	sys_lv2dbg.todo("sys_dbg_initialize_ppu_exception_handler()");
 	return CELL_OK;
 }
 
@@ -103,7 +108,7 @@ error_code sys_dbg_finalize_ppu_exception_handler()
 
 error_code sys_dbg_register_ppu_exception_handler(vm::ptr<dbg_exception_handler_t> callback, u64 ctrl_flags)
 {
-	sys_lv2dbg.todo("sys_dbg_register_ppu_exception_handler(callback=*0x%x, ctrl_flags=0x%x)", callback, ctrl_flags);
+	sys_lv2dbg.todo("sys_dbg_register_ppu_exception_handler()");
 	return CELL_OK;
 }
 
@@ -115,163 +120,170 @@ error_code sys_dbg_unregister_ppu_exception_handler()
 
 error_code sys_dbg_signal_to_ppu_exception_handler(u64 flags)
 {
-	sys_lv2dbg.todo("sys_dbg_signal_to_ppu_exception_handler(flags=0x%x)", flags);
+	sys_lv2dbg.todo("sys_dbg_signal_to_ppu_exception_handler()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_mutex_information(u32 id, vm::ptr<sys_dbg_mutex_information_t> info)
 {
-	sys_lv2dbg.todo("sys_dbg_get_mutex_information(id=0x%x, info=*0x%x)", id, info);
+	sys_lv2dbg.todo("sys_dbg_get_mutex_information()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_cond_information(u32 id, vm::ptr<sys_dbg_cond_information_t> info)
 {
-	sys_lv2dbg.todo("sys_dbg_get_cond_information(id=0x%x, info=*0x%x)", id, info);
+	sys_lv2dbg.todo("sys_dbg_get_cond_information()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_rwlock_information(u32 id, vm::ptr<sys_dbg_rwlock_information_t> info)
 {
-	sys_lv2dbg.todo("sys_dbg_get_rwlock_information(id=0x%x, info=*0x%x)", id, info);
+	sys_lv2dbg.todo("sys_dbg_get_rwlock_information()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_event_queue_information(u32 id, vm::ptr<sys_dbg_event_queue_information_t> info)
 {
-	sys_lv2dbg.todo("sys_dbg_get_event_queue_information(id=0x%x, info=*0x%x)", id, info);
+	sys_lv2dbg.todo("sys_dbg_get_event_queue_information()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_semaphore_information(u32 id, vm::ptr<sys_dbg_semaphore_information_t> info)
 {
-	sys_lv2dbg.todo("sys_dbg_get_semaphore_information(id=0x%x, info=*0x%x)", id, info);
+	sys_lv2dbg.todo("sys_dbg_get_semaphore_information()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_lwmutex_information(u32 id, vm::ptr<sys_dbg_lwmutex_information_t> info)
 {
-	sys_lv2dbg.todo("sys_dbg_get_lwmutex_information(id=0x%x, info=*0x%x)", id, info);
+	sys_lv2dbg.todo("sys_dbg_get_lwmutex_information()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_lwcond_information(u32 id, vm::ptr<sys_dbg_lwcond_information_t> info)
 {
-	sys_lv2dbg.todo("sys_dbg_get_lwcond_information(id=0x%x, info=*0x%x)", id, info);
+	sys_lv2dbg.todo("sys_dbg_get_lwcond_information()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_event_flag_information(u32 id, vm::ptr<sys_dbg_event_flag_information_t> info)
 {
-	sys_lv2dbg.todo("sys_dbg_get_event_flag_information(id=0x%x, info=*0x%x)", id, info);
+	sys_lv2dbg.todo("sys_dbg_get_event_flag_information()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_ppu_thread_ids(vm::ptr<u64> ids, vm::ptr<u64> ids_num, vm::ptr<u64> all_ids_num)
 {
-	sys_lv2dbg.todo("sys_dbg_get_ppu_thread_ids(ids=*0x%x, ids_num=*0x%x, all_ids_num=*0x%x)", ids, ids_num, all_ids_num);
+	sys_lv2dbg.todo("sys_dbg_get_ppu_thread_ids()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_spu_thread_group_ids(vm::ptr<u32> ids, vm::ptr<u64> ids_num, vm::ptr<u64> all_ids_num)
 {
-	sys_lv2dbg.todo("sys_dbg_get_spu_thread_group_ids(ids=*0x%x, ids_num=*0x%x, all_ids_num=*0x%x)", ids, ids_num, all_ids_num);
+	sys_lv2dbg.todo("sys_dbg_get_spu_thread_group_ids()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_spu_thread_ids(u32 group_id, vm::ptr<u32> ids, vm::ptr<u64> ids_num, vm::ptr<u64> all_ids_num)
 {
-	sys_lv2dbg.todo("sys_dbg_get_spu_thread_ids(group_id=0x%x, ids=*0x%x, ids_num=*0x%x, all_ids_num=*0x%x)", group_id, ids, ids_num, all_ids_num);
+	sys_lv2dbg.todo("sys_dbg_get_spu_thread_ids()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_ppu_thread_name(u64 id, vm::ptr<char> name)
 {
-	sys_lv2dbg.todo("sys_dbg_get_ppu_thread_name(id=0x%x, name=*0x%x)", id, name);
+	sys_lv2dbg.todo("sys_dbg_get_ppu_thread_name()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_spu_thread_name(u32 id, vm::ptr<char> name)
 {
-	sys_lv2dbg.todo("sys_dbg_get_spu_thread_name(id=0x%x, name=*0x%x)", id, name);
+	sys_lv2dbg.todo("sys_dbg_get_spu_thread_name()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_spu_thread_group_name(u32 id, vm::ptr<char> name)
 {
-	sys_lv2dbg.todo("sys_dbg_get_spu_thread_group_name(id=0x%x, name=*0x%x)", id, name);
+	sys_lv2dbg.todo("sys_dbg_get_spu_thread_group_name()");
 	return CELL_OK;
 }
 
+
 error_code sys_dbg_get_ppu_thread_status(u64 id, vm::ptr<u32> status)
 {
-	sys_lv2dbg.todo("sys_dbg_get_ppu_thread_status(id=0x%x, status=*0x%x)", id, status);
+	sys_lv2dbg.todo("sys_dbg_get_ppu_thread_status()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_spu_thread_group_status(u32 id, vm::ptr<u32> status)
 {
-	sys_lv2dbg.todo("sys_dbg_get_spu_thread_group_status(id=0x%x, status=*0x%x)", id, status);
+	sys_lv2dbg.todo("sys_dbg_get_spu_thread_group_status()");
 	return CELL_OK;
 }
 
+
 error_code sys_dbg_enable_floating_point_enabled_exception(u64 id, u64 flags, u64 opt1, u64 opt2)
 {
-	sys_lv2dbg.todo("sys_dbg_enable_floating_point_enabled_exception(id=0x%x, flags=0x%x, opt1=0x%x, opt2=0x%x)", id, flags, opt1, opt2);
+	sys_lv2dbg.todo("sys_dbg_enable_floating_point_enabled_exception()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_disable_floating_point_enabled_exception(u64 id, u64 flags, u64 opt1, u64 opt2)
 {
-	sys_lv2dbg.todo("sys_dbg_disable_floating_point_enabled_exception(id=0x%x, flags=0x%x, opt1=0x%x, opt2=0x%x)", id, flags, opt1, opt2);
+	sys_lv2dbg.todo("sys_dbg_disable_floating_point_enabled_exception()");
 	return CELL_OK;
 }
 
+
 error_code sys_dbg_vm_get_page_information(u32 addr, u32 num, vm::ptr<sys_vm_page_information_t> pageinfo)
 {
-	sys_lv2dbg.todo("sys_dbg_vm_get_page_information(addr=0x%x, num=0x%x, pageinfo=*0x%x)", addr, num, pageinfo);
+	sys_lv2dbg.todo("sys_dbg_vm_get_page_information()");
 	return CELL_OK;
 }
 
+
 error_code sys_dbg_set_address_to_dabr(u64 addr, u64 ctrl_flag)
 {
-	sys_lv2dbg.todo("sys_dbg_set_address_to_dabr(addr=0x%x, spu_context=0x%x)", addr, ctrl_flag);
+	sys_lv2dbg.todo("sys_dbg_set_address_to_dabr()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_get_address_from_dabr(vm::ptr<u64> addr, vm::ptr<u64> ctrl_flag)
 {
-	sys_lv2dbg.todo("sys_dbg_get_address_from_dabr(addr=*0x%x, spu_context=*0x%x)", addr, ctrl_flag);
+	sys_lv2dbg.todo("sys_dbg_get_address_from_dabr()");
 	return CELL_OK;
 }
 
+
 error_code sys_dbg_signal_to_coredump_handler(u64 data1, u64 data2, u64 data3)
 {
-	sys_lv2dbg.todo("sys_dbg_signal_to_coredump_handler(data1=0x%x, data2=0x%x, data3=0x%x)", data1, data2, data3);
+	sys_lv2dbg.todo("sys_dbg_signal_to_coredump_handler()");
 	return CELL_OK;
 }
 
+
 error_code sys_dbg_mat_set_condition(u32 addr, u64 cond)
 {
-	sys_lv2dbg.todo("sys_dbg_mat_set_condition(addr=0x%x, cond=0x%x)", addr, cond);
+	sys_lv2dbg.todo("sys_dbg_mat_set_condition()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_mat_get_condition(u32 addr, vm::ptr<u64> condp)
 {
-	sys_lv2dbg.todo("sys_dbg_mat_get_condition(addr=0x%x, condp=*0x%x)", addr, condp);
+	sys_lv2dbg.todo("sys_dbg_mat_get_condition()");
 	return CELL_OK;
 }
 
+
 error_code sys_dbg_get_coredump_params(vm::ptr<s32> param)
 {
-	sys_lv2dbg.todo("sys_dbg_get_coredump_params(param=*0x%x)", param);
+	sys_lv2dbg.todo("sys_dbg_get_coredump_params()");
 	return CELL_OK;
 }
 
 error_code sys_dbg_set_mask_to_ppu_exception_handler(u64 mask, u64 flags)
 {
-	sys_lv2dbg.todo("sys_dbg_set_mask_to_ppu_exception_handler(mask=0x%x, flags=0x%x)", mask, flags);
+	sys_lv2dbg.todo("sys_dbg_set_mask_to_ppu_exception_handler()");
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp b/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp
index 0745216bf6..9a7f930ce3 100644
--- a/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp
+++ b/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "Emu/system_config.h"
 #include "Emu/Cell/PPUModule.h"
+
 #include "Emu/Cell/lv2/sys_lwmutex.h"
 #include "Emu/Cell/lv2/sys_lwcond.h"
 #include "Emu/Cell/lv2/sys_cond.h"
@@ -69,7 +69,10 @@ error_code sys_lwcond_signal(ppu_thread& ppu, vm::ptr<sys_lwcond_t> lwcond)
 		// call the syscall
 		if (error_code res = _sys_lwcond_signal(ppu, lwcond->lwcond_queue, lwmutex->sleep_queue, u32{umax}, 1))
 		{
-			static_cast<void>(ppu.test_stopped());
+			if (ppu.test_stopped())
+			{
+				return 0;
+			}
 
 			lwmutex->all_info--;
 
@@ -105,7 +108,10 @@ error_code sys_lwcond_signal(ppu_thread& ppu, vm::ptr<sys_lwcond_t> lwcond)
 	// call the syscall
 	if (error_code res = _sys_lwcond_signal(ppu, lwcond->lwcond_queue, lwmutex->sleep_queue, u32{umax}, 3))
 	{
-		static_cast<void>(ppu.test_stopped());
+		if (ppu.test_stopped())
+		{
+			return 0;
+		}
 
 		lwmutex->lock_var.atomic_op([&](sys_lwmutex_t::sync_var_t& var)
 		{
@@ -152,7 +158,10 @@ error_code sys_lwcond_signal_all(ppu_thread& ppu, vm::ptr<sys_lwcond_t> lwcond)
 			return res;
 		}
 
-		static_cast<void>(ppu.test_stopped());
+		if (ppu.test_stopped())
+		{
+			return 0;
+		}
 
 		lwmutex->all_info += +res;
 		return CELL_OK;
@@ -174,7 +183,10 @@ error_code sys_lwcond_signal_all(ppu_thread& ppu, vm::ptr<sys_lwcond_t> lwcond)
 	// if locking succeeded, call the syscall
 	error_code res = _sys_lwcond_signal_all(ppu, lwcond->lwcond_queue, lwmutex->sleep_queue, 1);
 
-	static_cast<void>(ppu.test_stopped());
+	if (ppu.test_stopped())
+	{
+		return 0;
+	}
 
 	if (res > 0)
 	{
@@ -195,12 +207,7 @@ error_code sys_lwcond_signal_to(ppu_thread& ppu, vm::ptr<sys_lwcond_t> lwcond, u
 
 	if (g_cfg.core.hle_lwmutex)
 	{
-		if (ppu_thread_id == u32{umax})
-		{
-			return sys_cond_signal(ppu, lwcond->lwcond_queue);
-		}
-
-		return sys_cond_signal_to(ppu, lwcond->lwcond_queue, static_cast<u32>(ppu_thread_id));
+		return sys_cond_signal_to(ppu, lwcond->lwcond_queue, ppu_thread_id);
 	}
 
 	const vm::ptr<sys_lwmutex_t> lwmutex = lwcond->lwmutex;
@@ -218,7 +225,10 @@ error_code sys_lwcond_signal_to(ppu_thread& ppu, vm::ptr<sys_lwcond_t> lwcond, u
 		// call the syscall
 		if (error_code res = _sys_lwcond_signal(ppu, lwcond->lwcond_queue, lwmutex->sleep_queue, ppu_thread_id, 1))
 		{
-			static_cast<void>(ppu.test_stopped());
+			if (ppu.test_stopped())
+			{
+				return 0;
+			}
 
 			lwmutex->all_info--;
 
@@ -251,7 +261,10 @@ error_code sys_lwcond_signal_to(ppu_thread& ppu, vm::ptr<sys_lwcond_t> lwcond, u
 	// call the syscall
 	if (error_code res = _sys_lwcond_signal(ppu, lwcond->lwcond_queue, lwmutex->sleep_queue, ppu_thread_id, 3))
 	{
-		static_cast<void>(ppu.test_stopped());
+		if (ppu.test_stopped())
+		{
+			return 0;
+		}
 
 		lwmutex->lock_var.atomic_op([&](sys_lwmutex_t::sync_var_t& var)
 		{
@@ -277,9 +290,6 @@ error_code sys_lwcond_wait(ppu_thread& ppu, vm::ptr<sys_lwcond_t> lwcond, u64 ti
 		return sys_cond_wait(ppu, lwcond->lwcond_queue, timeout);
 	}
 
-	auto& sstate = *ppu.optional_savestate_state;
-	const auto lwcond_ec = sstate.try_read<error_code>().second;
-
 	const be_t<u32> tid(ppu.id);
 
 	const vm::ptr<sys_lwmutex_t> lwmutex = lwcond->lwmutex;
@@ -291,22 +301,18 @@ error_code sys_lwcond_wait(ppu_thread& ppu, vm::ptr<sys_lwcond_t> lwcond, u64 ti
 	}
 
 	// save old recursive value
-	const be_t<u32> recursive_value = !lwcond_ec ? lwmutex->recursive_count : sstate.operator be_t<u32>();
+	const be_t<u32> recursive_value = lwmutex->recursive_count;
 
 	// set special value
 	lwmutex->vars.owner = lwmutex_reserved;
 	lwmutex->recursive_count = 0;
 
 	// call the syscall
-	const error_code res = !lwcond_ec ? _sys_lwcond_queue_wait(ppu, lwcond->lwcond_queue, lwmutex->sleep_queue, timeout) : lwcond_ec;
+	const error_code res = _sys_lwcond_queue_wait(ppu, lwcond->lwcond_queue, lwmutex->sleep_queue, timeout);
 
-	static_cast<void>(ppu.test_stopped());
-
-	if (ppu.state & cpu_flag::again)
+	if (ppu.test_stopped())
 	{
-		sstate.pos = 0;
-		sstate(error_code{}, recursive_value); // Not aborted on mutex sleep
-		return {};
+		return 0;
 	}
 
 	if (res == CELL_OK || res + 0u == CELL_ESRCH)
@@ -335,13 +341,6 @@ error_code sys_lwcond_wait(ppu_thread& ppu, vm::ptr<sys_lwcond_t> lwcond, u64 ti
 			return res2;
 		}
 
-		if (ppu.state & cpu_flag::again)
-		{
-			sstate.pos = 0;
-			sstate(res, recursive_value);
-			return {};
-		}
-
 		// if successfully locked, restore recursive value
 		lwmutex->recursive_count = recursive_value;
 
diff --git a/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp b/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp
index 098761b259..7fb6cea6d3 100644
--- a/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp
+++ b/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp
@@ -1,8 +1,7 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/system_config.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/timers.hpp"
+
 #include "Emu/Cell/lv2/sys_lwmutex.h"
 #include "Emu/Cell/lv2/sys_mutex.h"
 #include "sysPrxForUser.h"
@@ -100,15 +99,6 @@ error_code sys_lwmutex_lock(ppu_thread& ppu, vm::ptr<sys_lwmutex_t> lwmutex, u64
 		return sys_mutex_lock(ppu, lwmutex->sleep_queue, timeout);
 	}
 
-	auto& sstate = *ppu.optional_savestate_state;
-	const bool aborted = sstate.try_read<bool>().second;
-
-	if (aborted)
-	{
-		// Restore timeout (SYS_SYNC_RETRY mode)
-		sstate(timeout);
-	}
-
 	const be_t<u32> tid(ppu.id);
 
 	// try to lock lightweight mutex
@@ -164,10 +154,7 @@ error_code sys_lwmutex_lock(ppu_thread& ppu, vm::ptr<sys_lwmutex_t> lwmutex, u64
 	}
 
 	// atomically increment waiter value using 64 bit op
-	if (!aborted)
-	{
-		lwmutex->all_info++;
-	}
+	lwmutex->all_info++;
 
 	if (lwmutex->vars.owner.compare_and_swap_test(lwmutex_free, tid))
 	{
@@ -180,13 +167,9 @@ error_code sys_lwmutex_lock(ppu_thread& ppu, vm::ptr<sys_lwmutex_t> lwmutex, u64
 	// lock using the syscall
 	const error_code res = _sys_lwmutex_lock(ppu, lwmutex->sleep_queue, timeout);
 
-	static_cast<void>(ppu.test_stopped());
-
-	if (ppu.state & cpu_flag::again)
+	if (ppu.test_stopped())
 	{
-		sstate.pos = 0;
-		sstate(true, timeout); // Aborted
-		return {};
+		return 0;
 	}
 
 	lwmutex->all_info--;
@@ -233,13 +216,9 @@ error_code sys_lwmutex_lock(ppu_thread& ppu, vm::ptr<sys_lwmutex_t> lwmutex, u64
 
 			const error_code res_ = _sys_lwmutex_lock(ppu, lwmutex->sleep_queue, timeout);
 
-			static_cast<void>(ppu.test_stopped());
-
-			if (ppu.state & cpu_flag::again)
+			if (ppu.test_stopped())
 			{
-				sstate.pos = 0;
-				sstate(true, timeout); // Aborted
-				return {};
+				return 0;
 			}
 
 			if (res_ == CELL_OK)
diff --git a/rpcs3/Emu/Cell/Modules/sys_mempool.cpp b/rpcs3/Emu/Cell/Modules/sys_mempool.cpp
index 2446619d3a..d4aecc94e1 100644
--- a/rpcs3/Emu/Cell/Modules/sys_mempool.cpp
+++ b/rpcs3/Emu/Cell/Modules/sys_mempool.cpp
@@ -7,6 +7,8 @@
 #include "Emu/Cell/lv2/sys_mutex.h"
 #include "Emu/Cell/lv2/sys_cond.h"
 
+#include "sysPrxForUser.h"
+
 LOG_CHANNEL(sysPrxForUser);
 
 using sys_mempool_t = u32;
@@ -16,7 +18,6 @@ struct memory_pool_t
 	static const u32 id_base = 1;
 	static const u32 id_step = 1;
 	static const u32 id_count = 1023;
-	SAVESTATE_INIT_POS(21);
 
 	u32 mutexid;
 	u32 condid;
@@ -58,7 +59,7 @@ error_code sys_mempool_create(ppu_thread& ppu, vm::ptr<sys_mempool_t> mempool, v
 	auto id = idm::make<memory_pool_t>();
 	*mempool = id;
 
-	auto memory_pool = idm::get_unlocked<memory_pool_t>(id);
+	auto memory_pool = idm::get<memory_pool_t>(id);
 
 	memory_pool->chunk = chunk;
 	memory_pool->chunk_size = chunk_size;
@@ -112,7 +113,7 @@ void sys_mempool_destroy(ppu_thread& ppu, sys_mempool_t mempool)
 {
 	sysPrxForUser.warning("sys_mempool_destroy(mempool=%d)", mempool);
 
-	auto memory_pool = idm::get_unlocked<memory_pool_t>(mempool);
+	auto memory_pool = idm::get<memory_pool_t>(mempool);
 	if (memory_pool)
 	{
 		u32 condid = memory_pool->condid;
@@ -134,7 +135,7 @@ error_code sys_mempool_free_block(ppu_thread& ppu, sys_mempool_t mempool, vm::pt
 {
 	sysPrxForUser.warning("sys_mempool_free_block(mempool=%d, block=*0x%x)", mempool, block);
 
-	auto memory_pool = idm::get_unlocked<memory_pool_t>(mempool);
+	auto memory_pool = idm::get<memory_pool_t>(mempool);
 	if (!memory_pool)
 	{
 		return CELL_EINVAL;
@@ -158,7 +159,7 @@ u64 sys_mempool_get_count(ppu_thread& ppu, sys_mempool_t mempool)
 {
 	sysPrxForUser.warning("sys_mempool_get_count(mempool=%d)", mempool);
 
-	auto memory_pool = idm::get_unlocked<memory_pool_t>(mempool);
+	auto memory_pool = idm::get<memory_pool_t>(mempool);
 	if (!memory_pool)
 	{
 		return CELL_EINVAL;
@@ -173,7 +174,7 @@ vm::ptr<void> sys_mempool_allocate_block(ppu_thread& ppu, sys_mempool_t mempool)
 {
 	sysPrxForUser.warning("sys_mempool_allocate_block(mempool=%d)", mempool);
 
-	auto memory_pool = idm::get_unlocked<memory_pool_t>(mempool);
+	auto memory_pool = idm::get<memory_pool_t>(mempool);
 	if (!memory_pool)
 	{	// if the memory pool gets deleted-- is null, clearly it's impossible to allocate memory.
 		return vm::null;
@@ -183,7 +184,7 @@ vm::ptr<void> sys_mempool_allocate_block(ppu_thread& ppu, sys_mempool_t mempool)
 	while (memory_pool->free_blocks.empty()) // while is to guard against spurious wakeups
 	{
 		sys_cond_wait(ppu, memory_pool->condid, 0);
-		memory_pool = idm::get_unlocked<memory_pool_t>(mempool);
+		memory_pool = idm::get<memory_pool_t>(mempool);
 		if (!memory_pool)  // in case spurious wake up was from delete, don't die by accessing a freed pool.
 		{ // No need to unlock as if the pool is freed, the lock was freed as well.
 			return vm::null;
@@ -200,7 +201,7 @@ vm::ptr<void> sys_mempool_try_allocate_block(ppu_thread& ppu, sys_mempool_t memp
 {
 	sysPrxForUser.warning("sys_mempool_try_allocate_block(mempool=%d)", mempool);
 
-	auto memory_pool = idm::get_unlocked<memory_pool_t>(mempool);
+	auto memory_pool = idm::get<memory_pool_t>(mempool);
 
 	if (!memory_pool || memory_pool->free_blocks.empty())
 	{
diff --git a/rpcs3/Emu/Cell/Modules/sys_net_.cpp b/rpcs3/Emu/Cell/Modules/sys_net_.cpp
index affca674c7..f566bd2070 100644
--- a/rpcs3/Emu/Cell/Modules/sys_net_.cpp
+++ b/rpcs3/Emu/Cell/Modules/sys_net_.cpp
@@ -1,9 +1,16 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
+#include "Emu/IdManager.h"
+
 #include "sys_net_.h"
 
 LOG_CHANNEL(libnet);
 
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 s32 sys_net_accept(s32 s, vm::ptr<sys_net_sockaddr> addr, vm::ptr<u32> paddrlen)
 {
 	libnet.todo("accept(s=%d, addr=*0x%x, paddrlen=*0x%x)", s, addr, paddrlen);
@@ -39,22 +46,19 @@ s32 sys_net_gethostbyname()
 
 s32 sys_net_getpeername(s32 s, vm::ptr<sys_net_sockaddr> addr, vm::ptr<u32> paddrlen)
 {
-	libnet.todo("getpeername(s=%d, addr=*0x%x, paddrlen=*0x%x)", s, addr, paddrlen);
-
+	UNIMPLEMENTED_FUNC(libnet);
 	return CELL_OK;
 }
 
 s32 sys_net_getsockname(s32 s, vm::ptr<sys_net_sockaddr> addr, vm::ptr<u32> paddrlen)
 {
-	libnet.todo("getsockname(s=%d, addr=*0x%x, paddrlen=*0x%x)", s, addr, paddrlen);
-
+	UNIMPLEMENTED_FUNC(libnet);
 	return CELL_OK;
 }
 
 s32 sys_net_getsockopt(s32 s, s32 level, s32 optname, vm::ptr<void> optval, vm::ptr<u32> optlen)
 {
-	libnet.todo("getsockopt(s=%d, level=%d, optname=%d, optval=*0x%x, optlen=*0x%x)", s, level, optname, optval, optlen);
-
+	UNIMPLEMENTED_FUNC(libnet);
 	return CELL_OK;
 }
 
@@ -139,8 +143,7 @@ s32 sys_net_recvfrom(s32 s, vm::ptr<void> buf, u32 len, s32 flags, vm::ptr<sys_n
 
 s32 sys_net_recvmsg(s32 s, vm::ptr<sys_net_msghdr> msg, s32 flags)
 {
-	libnet.todo("recvmsg(s=%d, msg=*0x%x, flags=0x%x)", s, msg, flags);
-
+	UNIMPLEMENTED_FUNC(libnet);
 	return CELL_OK;
 }
 
@@ -153,8 +156,7 @@ s32 sys_net_send(s32 s, vm::cptr<void> buf, u32 len, s32 flags)
 
 s32 sys_net_sendmsg(s32 s, vm::cptr<sys_net_msghdr> msg, s32 flags)
 {
-	libnet.todo("sendmsg(s=%d, msg=*0x%x, flags=0x%x)", s, msg, flags);
-
+	UNIMPLEMENTED_FUNC(libnet);
 	return CELL_OK;
 }
 
@@ -195,8 +197,7 @@ s32 sys_net_socketclose(s32 s)
 
 s32 sys_net_socketpoll(vm::ptr<sys_net_pollfd> fds, s32 nfds, s32 ms)
 {
-	libnet.todo("socketpoll(fds=*0x%x, nfds=%d, ms=%d)", fds, nfds, ms);
-
+	UNIMPLEMENTED_FUNC(libnet);
 	return CELL_OK;
 }
 
@@ -271,8 +272,7 @@ s32 sys_net_get_sockinfo(s32 s, vm::ptr<sys_net_sockinfo_t> p, s32 n)
 
 s32 sys_net_close_dump(s32 id, vm::ptr<s32> pflags)
 {
-	libnet.todo("sys_net_close_dump(id=%d, pflags=*0x%x)", id, pflags);
-
+	UNIMPLEMENTED_FUNC(libnet);
 	return CELL_OK;
 }
 
@@ -310,8 +310,7 @@ s32 sys_net_show_route()
 
 s32 sys_net_read_dump(s32 id, vm::ptr<void> buf, s32 len, vm::ptr<s32> pflags)
 {
-	libnet.todo("sys_net_read_dump(id=%d, buf=*0x%x, len=%d, pflags=*0x%x)", id, buf, len, pflags);
-
+	UNIMPLEMENTED_FUNC(libnet);
 	return CELL_OK;
 }
 
@@ -347,8 +346,7 @@ s32 sys_net_get_sockinfo_ex()
 
 s32 sys_net_open_dump(s32 len, s32 flags)
 {
-	libnet.todo("sys_net_open_dump(len=%d, flags=0x%x)", len, flags);
-
+	UNIMPLEMENTED_FUNC(libnet);
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/sys_net_.h b/rpcs3/Emu/Cell/Modules/sys_net_.h
index 9ee344b977..c49a65e26d 100644
--- a/rpcs3/Emu/Cell/Modules/sys_net_.h
+++ b/rpcs3/Emu/Cell/Modules/sys_net_.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Emu/Cell/lv2/sys_net.h"
+#include "Emu/Memory/vm.h"
 
 struct sys_net_sockinfo_t
 {
diff --git a/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp b/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp
index 033242e87c..cb3f5f62d1 100644
--- a/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp
+++ b/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp
@@ -1,5 +1,7 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
+#include "Emu/IdManager.h"
+
 #include "Emu/Cell/lv2/sys_ppu_thread.h"
 #include "Emu/Cell/lv2/sys_interrupt.h"
 #include "Emu/Cell/lv2/sys_lwmutex.h"
diff --git a/rpcs3/Emu/Cell/Modules/sys_prx_.cpp b/rpcs3/Emu/Cell/Modules/sys_prx_.cpp
index 8529f408b0..c3cb6e8df2 100644
--- a/rpcs3/Emu/Cell/Modules/sys_prx_.cpp
+++ b/rpcs3/Emu/Cell/Modules/sys_prx_.cpp
@@ -221,7 +221,7 @@ error_code sys_prx_get_module_info(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<s
 	opt->info = info;
 
 	// Call the syscall
-	return _sys_prx_get_module_info(ppu, id, flags, opt);
+	return _sys_prx_get_module_info(ppu, id, 0, opt);
 }
 
 error_code sys_prx_get_module_id_by_name(ppu_thread& ppu, vm::cptr<char> name, u64 flags, vm::ptr<sys_prx_get_module_id_by_name_option_t> pOpt)
diff --git a/rpcs3/Emu/Cell/Modules/sys_rsxaudio_.cpp b/rpcs3/Emu/Cell/Modules/sys_rsxaudio_.cpp
index 071a9debb6..d686345738 100644
--- a/rpcs3/Emu/Cell/Modules/sys_rsxaudio_.cpp
+++ b/rpcs3/Emu/Cell/Modules/sys_rsxaudio_.cpp
@@ -1,6 +1,8 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
+#include "sysPrxForUser.h"
+
 LOG_CHANNEL(sysPrxForUser);
 
 error_code sys_rsxaudio_close_connection()
diff --git a/rpcs3/Emu/Cell/Modules/sys_spinlock.cpp b/rpcs3/Emu/Cell/Modules/sys_spinlock.cpp
index 00a71de061..97014ad442 100644
--- a/rpcs3/Emu/Cell/Modules/sys_spinlock.cpp
+++ b/rpcs3/Emu/Cell/Modules/sys_spinlock.cpp
@@ -1,6 +1,8 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
 
+#include "sysPrxForUser.h"
+
 LOG_CHANNEL(sysPrxForUser);
 
 void sys_spinlock_initialize(vm::ptr<atomic_be_t<u32>> lock)
@@ -22,8 +24,7 @@ error_code sys_spinlock_lock(ppu_thread& ppu, vm::ptr<atomic_be_t<u32>> lock)
 	{
 		if (ppu.test_stopped())
 		{
-			ppu.state += cpu_flag::again;
-			return {};
+			return 0;
 		}
 	}
 
diff --git a/rpcs3/Emu/Cell/Modules/sys_spu_.cpp b/rpcs3/Emu/Cell/Modules/sys_spu_.cpp
index 2bbbaee4ae..2c584a7fed 100644
--- a/rpcs3/Emu/Cell/Modules/sys_spu_.cpp
+++ b/rpcs3/Emu/Cell/Modules/sys_spu_.cpp
@@ -3,6 +3,7 @@
 #include "Emu/Cell/PPUModule.h"
 
 #include "Emu/Cell/lv2/sys_spu.h"
+#include "Crypto/unself.h"
 #include "Loader/ELF.h"
 #include "sysPrxForUser.h"
 
diff --git a/rpcs3/Emu/Cell/PPCDisAsm.h b/rpcs3/Emu/Cell/PPCDisAsm.h
index 4a5c747ba3..52a45a7ae5 100644
--- a/rpcs3/Emu/Cell/PPCDisAsm.h
+++ b/rpcs3/Emu/Cell/PPCDisAsm.h
@@ -5,268 +5,232 @@
 class PPCDisAsm : public CPUDisAsm
 {
 protected:
-	PPCDisAsm(cpu_disasm_mode mode, const u8* offset, u32 start_pc = 0) : CPUDisAsm(mode, offset, start_pc)
+	PPCDisAsm(cpu_disasm_mode mode, const u8* offset) : CPUDisAsm(mode, offset)
 	{
 	}
 
 	virtual u32 DisAsmBranchTarget(const s32 imm) override = 0;
 
-	usz insert_char_if(usz pos, bool insert, char c)
+	void DisAsm_V4(const std::string& op, u32 v0, u32 v1, u32 v2, u32 v3)
 	{
-		if (!insert)
-		{
-			return pos;
-		}
-
-		ensure(std::exchange(last_opcode[pos], c) == ' ' && last_opcode[pos + 1] == ' ');
-		return pos + 1;
+		Write(fmt::format("%s v%d,v%d,v%d,v%d", FixOp(op), v0, v1, v2, v3));
 	}
-
-	usz insert_char_if(std::string_view op, bool insert, char c = '.')
+	void DisAsm_V3_UIMM(const std::string& op, u32 v0, u32 v1, u32 v2, u32 uimm)
 	{
-		return insert_char_if(op.size(), insert, c);
+		Write(fmt::format("%s v%d,v%d,v%d,%s", FixOp(op), v0, v1, v2, uimm));
 	}
-
-	void DisAsm_V4(std::string_view op, u32 v0, u32 v1, u32 v2, u32 v3)
+	void DisAsm_V3(const std::string& op, u32 v0, u32 v1, u32 v2)
 	{
-		fmt::append(last_opcode, "%-*s v%d,v%d,v%d,v%d", PadOp(), op, v0, v1, v2, v3);
+		Write(fmt::format("%s v%d,v%d,v%d", FixOp(op), v0, v1, v2));
 	}
-	void DisAsm_V3_UIMM(std::string_view op, u32 v0, u32 v1, u32 v2, u32 uimm)
+	void DisAsm_V2_UIMM(const std::string& op, u32 v0, u32 v1, u32 uimm)
 	{
-		fmt::append(last_opcode, "%-*s v%d,v%d,v%d,%s", PadOp(), op, v0, v1, v2, uimm);
+		Write(fmt::format("%s v%d,v%d,%s", FixOp(op), v0, v1, uimm));
 	}
-	void DisAsm_V3(std::string_view op, u32 v0, u32 v1, u32 v2)
+	void DisAsm_V2(const std::string& op, u32 v0, u32 v1)
 	{
-		fmt::append(last_opcode, "%-*s v%d,v%d,v%d", PadOp(), op, v0, v1, v2);
+		Write(fmt::format("%s v%d,v%d", FixOp(op), v0, v1));
 	}
-	void DisAsm_V2_UIMM(std::string_view op, u32 v0, u32 v1, u32 uimm)
+	void DisAsm_V1_SIMM(const std::string& op, u32 v0, s32 simm)
 	{
-		fmt::append(last_opcode, "%-*s v%d,v%d,%s", PadOp(), op, v0, v1, uimm);
+		Write(fmt::format("%s v%d,%s", FixOp(op), v0, SignedHex(simm)));
 	}
-	void DisAsm_V2(std::string_view op, u32 v0, u32 v1)
+	void DisAsm_V1(const std::string& op, u32 v0)
 	{
-		fmt::append(last_opcode, "%-*s v%d,v%d", PadOp(), op, v0, v1);
+		Write(fmt::format("%s v%d", FixOp(op), v0));
 	}
-	void DisAsm_V1_SIMM(std::string_view op, u32 v0, s32 simm)
+	void DisAsm_V1_R2(const std::string& op, u32 v0, u32 r1, u32 r2)
 	{
-		fmt::append(last_opcode, "%-*s v%d,%s", PadOp(), op, v0, SignedHex(simm));
+		Write(fmt::format("%s v%d,r%d,r%d", FixOp(op), v0, r1, r2));
 	}
-	void DisAsm_V1(std::string_view op, u32 v0)
+	void DisAsm_CR1_F2_RC(const std::string& op, u32 cr0, u32 f0, u32 f1, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s v%d", PadOp(), op, v0);
+		Write(fmt::format("%s%s cr%d,f%d,f%d", FixOp(op), (rc ? "." : ""), cr0, f0, f1));
 	}
-	void DisAsm_V1_R2(std::string_view op, u32 v0, u32 r1, u32 r2)
-	{
-		fmt::append(last_opcode, "%-*s v%d,r%d,r%d", PadOp(), op, v0, r1, r2);
-	}
-	void DisAsm_CR1_F2_RC(std::string_view op, u32 cr0, u32 f0, u32 f1, u32 rc)
-	{
-		fmt::append(last_opcode, "%-*s cr%d,f%d,f%d", PadOp(op, rc ? 1 : 0), op, cr0, f0, f1);
-		insert_char_if(op, !!rc);
-	}
-	void DisAsm_CR1_F2(std::string_view op, u32 cr0, u32 f0, u32 f1)
+	void DisAsm_CR1_F2(const std::string& op, u32 cr0, u32 f0, u32 f1)
 	{
 		DisAsm_CR1_F2_RC(op, cr0, f0, f1, false);
 	}
-	void DisAsm_INT1_R2(std::string_view op, u32 i0, u32 r0, u32 r1)
+	void DisAsm_INT1_R2(const std::string& op, u32 i0, u32 r0, u32 r1)
 	{
-		fmt::append(last_opcode, "%-*s %d,r%d,r%d", PadOp(), op, i0, r0, r1);
+		Write(fmt::format("%s %d,r%d,r%d", FixOp(op), i0, r0, r1));
 	}
-	void DisAsm_INT1_R1_IMM(std::string_view op, u32 i0, u32 r0, s32 imm0)
+	void DisAsm_INT1_R1_IMM(const std::string& op, u32 i0, u32 r0, s32 imm0)
 	{
-		fmt::append(last_opcode, "%-*s %d,r%d,%s", PadOp(), op, i0, r0, SignedHex(imm0));
+		Write(fmt::format("%s %d,r%d,%s", FixOp(op), i0, r0, SignedHex(imm0)));
 	}
-	void DisAsm_INT1_R1_RC(std::string_view op, u32 i0, u32 r0, u32 rc)
+	void DisAsm_INT1_R1_RC(const std::string& op, u32 i0, u32 r0, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s %d,r%d", PadOp(op, rc ? 1 : 0), op, i0, r0);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s%s %d,r%d", FixOp(op), (rc ? "." : ""), i0, r0));
 	}
-	void DisAsm_INT1_R1(std::string_view op, u32 i0, u32 r0)
+	void DisAsm_INT1_R1(const std::string& op, u32 i0, u32 r0)
 	{
 		DisAsm_INT1_R1_RC(op, i0, r0, false);
 	}
-	void DisAsm_F4_RC(std::string_view op, u32 f0, u32 f1, u32 f2, u32 f3, u32 rc)
+	void DisAsm_F4_RC(const std::string& op, u32 f0, u32 f1, u32 f2, u32 f3, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s f%d,f%d,f%d,f%d", PadOp(op, rc ? 1 : 0), op, f0, f1, f2, f3);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s%s f%d,f%d,f%d,f%d", FixOp(op), (rc ? "." : ""), f0, f1, f2, f3));
 	}
-	void DisAsm_F3_RC(std::string_view op, u32 f0, u32 f1, u32 f2, u32 rc)
+	void DisAsm_F3_RC(const std::string& op, u32 f0, u32 f1, u32 f2, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s f%d,f%d,f%d", PadOp(op, rc ? 1 : 0), op, f0, f1, f2);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s%s f%d,f%d,f%d", FixOp(op), (rc ? "." : ""), f0, f1, f2));
 	}
-	void DisAsm_F3(std::string_view op, u32 f0, u32 f1, u32 f2)
+	void DisAsm_F3(const std::string& op, u32 f0, u32 f1, u32 f2)
 	{
 		DisAsm_F3_RC(op, f0, f1, f2, false);
 	}
-	void DisAsm_F2_RC(std::string_view op, u32 f0, u32 f1, u32 rc)
+	void DisAsm_F2_RC(const std::string& op, u32 f0, u32 f1, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s f%d,f%d", PadOp(op, rc ? 1 : 0), op, f0, f1);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s%s f%d,f%d", FixOp(op), (rc ? "." : ""), f0, f1));
 	}
-	void DisAsm_F2(std::string_view op, u32 f0, u32 f1)
+	void DisAsm_F2(const std::string& op, u32 f0, u32 f1)
 	{
 		DisAsm_F2_RC(op, f0, f1, false);
 	}
-	void DisAsm_F1_R2(std::string_view op, u32 f0, u32 r0, u32 r1)
+	void DisAsm_F1_R2(const std::string& op, u32 f0, u32 r0, u32 r1)
 	{
 		if(m_mode == cpu_disasm_mode::compiler_elf)
 		{
-			fmt::append(last_opcode, "%-*s f%d,r%d,r%d", PadOp(), op, f0, r0, r1);
+			Write(fmt::format("%s f%d,r%d,r%d", FixOp(op), f0, r0, r1));
 			return;
 		}
 
-		fmt::append(last_opcode, "%-*s f%d,r%d(r%d)", PadOp(), op, f0, r0, r1);
+		Write(fmt::format("%s f%d,r%d(r%d)", FixOp(op), f0, r0, r1));
 	}
-	void DisAsm_F1_IMM_R1_RC(std::string_view op, u32 f0, s32 imm0, u32 r0, u32 rc)
+	void DisAsm_F1_IMM_R1_RC(const std::string& op, u32 f0, s32 imm0, u32 r0, u32 rc)
 	{
 		if(m_mode == cpu_disasm_mode::compiler_elf)
 		{
-			fmt::append(last_opcode, "%-*s f%d,r%d,%s", PadOp(op, rc ? 1 : 0), op, f0, r0, SignedHex(imm0));
-			insert_char_if(op, !!rc);
+			Write(fmt::format("%s%s f%d,r%d,%s", FixOp(op), (rc ? "." : ""), f0, r0, SignedHex(imm0)));
 			return;
 		}
 
-		fmt::append(last_opcode, "%-*s f%d,%s(r%d)", PadOp(op, rc ? 1 : 0), op, f0, SignedHex(imm0), r0);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s%s f%d,%s(r%d)", FixOp(op), (rc ? "." : ""), f0, SignedHex(imm0), r0));
 	}
-	void DisAsm_F1_IMM_R1(std::string_view op, u32 f0, s32 imm0, u32 r0)
+	void DisAsm_F1_IMM_R1(const std::string& op, u32 f0, s32 imm0, u32 r0)
 	{
 		DisAsm_F1_IMM_R1_RC(op, f0, imm0, r0, false);
 	}
-	void DisAsm_F1_RC(std::string_view op, u32 f0, u32 rc)
+	void DisAsm_F1_RC(const std::string& op, u32 f0, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s f%d", PadOp(op, rc ? 1 : 0), op, f0);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s%s f%d", FixOp(op), (rc ? "." : ""), f0));
 	}
-	void DisAsm_R1_RC(std::string_view op, u32 r0, u32 rc)
+	void DisAsm_R1_RC(const std::string& op, u32 r0, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d", PadOp(op, rc ? 1 : 0), op, r0);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s%s r%d", FixOp(op), (rc ? "." : ""), r0));
 	}
-	void DisAsm_R1(std::string_view op, u32 r0)
+	void DisAsm_R1(const std::string& op, u32 r0)
 	{
 		DisAsm_R1_RC(op, r0, false);
 	}
-	void DisAsm_R2_OE_RC(std::string_view op, u32 r0, u32 r1, u32 oe, u32 rc)
+	void DisAsm_R2_OE_RC(const std::string& op, u32 r0, u32 r1, u32 oe, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d,r%d", PadOp(op, (rc ? 1 : 0) + (oe ? 1 : 0)), op, r0, r1);
-		insert_char_if(insert_char_if(op, !!oe, 'o'), !!rc, '.');
+		Write(fmt::format("%s%s%s r%d,r%d", FixOp(op), (oe ? "o" : ""), (rc ? "." : ""), r0, r1));
 	}
-	void DisAsm_R2_RC(std::string_view op, u32 r0, u32 r1, u32 rc)
+	void DisAsm_R2_RC(const std::string& op, u32 r0, u32 r1, u32 rc)
 	{
 		DisAsm_R2_OE_RC(op, r0, r1, false, rc);
 	}
-	void DisAsm_R2(std::string_view op, u32 r0, u32 r1)
+	void DisAsm_R2(const std::string& op, u32 r0, u32 r1)
 	{
 		DisAsm_R2_RC(op, r0, r1, false);
 	}
-	void DisAsm_R3_OE_RC(std::string_view op, u32 r0, u32 r1, u32 r2, u32 oe, u32 rc)
+	void DisAsm_R3_OE_RC(const std::string& op, u32 r0, u32 r1, u32 r2, u32 oe, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d,r%d,r%d", PadOp(op, (rc ? 1 : 0) + (oe ? 1 : 0)), op, r0, r1, r2);
-		insert_char_if(insert_char_if(op, !!oe, 'o'), !!rc, '.');
+		Write(fmt::format("%s%s%s r%d,r%d,r%d", FixOp(op), (oe ? "o" : ""), (rc ? "." : ""), r0, r1, r2));
 	}
-	void DisAsm_R3_INT2_RC(std::string_view op, u32 r0, u32 r1, u32 r2, s32 i0, s32 i1, u32 rc)
+	void DisAsm_R3_INT2_RC(const std::string& op, u32 r0, u32 r1, u32 r2, s32 i0, s32 i1, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d,r%d,r%d,%d,%d", PadOp(op, rc ? 1 : 0), op, r0, r1, r2, i0, i1);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s%s r%d,r%d,r%d,%d,%d", FixOp(op), (rc ? "." : ""), r0, r1, r2, i0, i1));
 	}
-	void DisAsm_R3_RC(std::string_view op, u32 r0, u32 r1, u32 r2, u32 rc)
+	void DisAsm_R3_RC(const std::string& op, u32 r0, u32 r1, u32 r2, u32 rc)
 	{
 		DisAsm_R3_OE_RC(op, r0, r1, r2, false, rc);
 	}
-	void DisAsm_R3(std::string_view op, u32 r0, u32 r1, u32 r2)
+	void DisAsm_R3(const std::string& op, u32 r0, u32 r1, u32 r2)
 	{
 		DisAsm_R3_RC(op, r0, r1, r2, false);
 	}
-	void DisAsm_R2_INT3_RC(std::string_view op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2, u32 rc)
+	void DisAsm_R2_INT3_RC(const std::string& op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d,r%d,%d,%d,%d", PadOp(op, rc ? 1 : 0), op, r0, r1, i0, i1, i2);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s%s r%d,r%d,%d,%d,%d", FixOp(op), (rc ? "." : ""), r0, r1, i0, i1, i2));
 	}
-	void DisAsm_R2_INT3(std::string_view op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2)
+	void DisAsm_R2_INT3(const std::string& op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2)
 	{
 		DisAsm_R2_INT3_RC(op, r0, r1, i0, i1, i2, false);
 	}
-	void DisAsm_R2_INT2_RC(std::string_view op, u32 r0, u32 r1, s32 i0, s32 i1, u32 rc)
+	void DisAsm_R2_INT2_RC(const std::string& op, u32 r0, u32 r1, s32 i0, s32 i1, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d,r%d,%d,%d", PadOp(op, rc ? 1 : 0), op, r0, r1, i0, i1);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s%s r%d,r%d,%d,%d", FixOp(op), (rc ? "." : ""), r0, r1, i0, i1));
 	}
-	void DisAsm_R2_INT2(std::string_view op, u32 r0, u32 r1, s32 i0, s32 i1)
+	void DisAsm_R2_INT2(const std::string& op, u32 r0, u32 r1, s32 i0, s32 i1)
 	{
 		DisAsm_R2_INT2_RC(op, r0, r1, i0, i1, false);
 	}
-	void DisAsm_R2_INT1_RC(std::string_view op, u32 r0, u32 r1, s32 i0, u32 rc)
+	void DisAsm_R2_INT1_RC(const std::string& op, u32 r0, u32 r1, s32 i0, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d,r%d,%d", PadOp(op, rc ? 1 : 0), op, r0, r1, i0);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s%s r%d,r%d,%d", FixOp(op), (rc ? "." : ""), r0, r1, i0));
 	}
-	void DisAsm_R2_INT1(std::string_view op, u32 r0, u32 r1, s32 i0)
+	void DisAsm_R2_INT1(const std::string& op, u32 r0, u32 r1, s32 i0)
 	{
 		DisAsm_R2_INT1_RC(op, r0, r1, i0, false);
 	}
-	void DisAsm_R2_IMM(std::string_view op, u32 r0, u32 r1, s32 imm0)
+	void DisAsm_R2_IMM(const std::string& op, u32 r0, u32 r1, s32 imm0)
 	{
 		if(m_mode == cpu_disasm_mode::compiler_elf)
 		{
-			fmt::append(last_opcode, "%-*s r%d,r%d,%s", PadOp(), op, r0, r1, SignedHex(imm0));
+			Write(fmt::format("%s r%d,r%d,%s", FixOp(op), r0, r1, SignedHex(imm0)));
 			return;
 		}
 
-		fmt::append(last_opcode, "%-*s r%d,%s(r%d)", PadOp(), op, r0, SignedHex(imm0), r1);
+		Write(fmt::format("%s r%d,%s(r%d)", FixOp(op), r0, SignedHex(imm0), r1));
 	}
-	void DisAsm_R1_IMM(std::string_view op, u32 r0, s32 imm0)
+	void DisAsm_R1_IMM(const std::string& op, u32 r0, s32 imm0)
 	{
-		fmt::append(last_opcode, "%-*s r%d,%s", PadOp(), op, r0, SignedHex(imm0));
+		Write(fmt::format("%s r%d,%s", FixOp(op), r0, SignedHex(imm0)));
 	}
-	void DisAsm_IMM_R1(std::string_view op, s32 imm0, u32 r0)
+	void DisAsm_IMM_R1(const std::string& op, s32 imm0, u32 r0)
 	{
-		fmt::append(last_opcode, "%-*s %d,r%d  #%x", PadOp(), op, imm0, r0, imm0);
+		Write(fmt::format("%s %d,r%d  #%x", FixOp(op), imm0, r0, imm0));
 	}
-	void DisAsm_CR1_R1_IMM(std::string_view op, u32 cr0, u32 r0, s32 imm0)
+	void DisAsm_CR1_R1_IMM(const std::string& op, u32 cr0, u32 r0, s32 imm0)
 	{
-		fmt::append(last_opcode, "%-*s cr%d,r%d,%s", PadOp(), op, cr0, r0, SignedHex(imm0));
+		Write(fmt::format("%s cr%d,r%d,%s", FixOp(op), cr0, r0, SignedHex(imm0)));
 	}
-	void DisAsm_CR1_R2_RC(std::string_view op, u32 cr0, u32 r0, u32 r1, u32 rc)
+	void DisAsm_CR1_R2_RC(const std::string& op, u32 cr0, u32 r0, u32 r1, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s cr%d,r%d,r%d", PadOp(op, rc ? 1 : 0), op, cr0, r0, r1);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s%s cr%d,r%d,r%d", FixOp(op), (rc ? "." : ""), cr0, r0, r1));
 	}
-	void DisAsm_CR1_R2(std::string_view op, u32 cr0, u32 r0, u32 r1)
+	void DisAsm_CR1_R2(const std::string& op, u32 cr0, u32 r0, u32 r1)
 	{
 		DisAsm_CR1_R2_RC(op, cr0, r0, r1, false);
 	}
-	void DisAsm_CR2(std::string_view op, u32 cr0, u32 cr1)
+	void DisAsm_CR2(const std::string& op, u32 cr0, u32 cr1)
 	{
-		fmt::append(last_opcode, "%-*s cr%d,cr%d", PadOp(), op, cr0, cr1);
+		Write(fmt::format("%s cr%d,cr%d", FixOp(op), cr0, cr1));
 	}
-	void DisAsm_INT3(std::string_view op, s32 i0, s32 i1, s32 i2)
+	void DisAsm_INT3(const std::string& op, const int i0, const int i1, const int i2)
 	{
-		fmt::append(last_opcode, "%-*s %d,%d,%d", PadOp(), op, i0, i1, i2);
+		Write(fmt::format("%s %d,%d,%d", FixOp(op), i0, i1, i2));
 	}
-	void DisAsm_INT1(std::string_view op, s32 i0)
+	void DisAsm_INT1(const std::string& op, const int i0)
 	{
-		fmt::append(last_opcode, "%-*s %d", PadOp(), op, i0);
+		Write(fmt::format("%s %d", FixOp(op), i0));
 	}
-	void DisAsm_BRANCH(std::string_view op, s32 pc)
+	void DisAsm_BRANCH(const std::string& op, const int pc)
 	{
-		fmt::append(last_opcode, "%-*s 0x%x", PadOp(), op, DisAsmBranchTarget(pc));
+		Write(fmt::format("%s 0x%x", FixOp(op), DisAsmBranchTarget(pc)));
 	}
-	void DisAsm_BRANCH_A(std::string_view op, s32 pc)
+	void DisAsm_BRANCH_A(const std::string& op, const int pc)
 	{
-		fmt::append(last_opcode, "%-*s 0x%x", PadOp(), op, pc);
+		Write(fmt::format("%s 0x%x", FixOp(op), pc));
 	}
-	void DisAsm_B2_BRANCH(std::string_view op, u32 b0, u32 b1, s32 pc)
+	void DisAsm_B2_BRANCH(const std::string& op, u32 b0, u32 b1, const int pc)
 	{
-		fmt::append(last_opcode, "%-*s %d,%d,0x%x ", PadOp(), op, b0, b1, DisAsmBranchTarget(pc));
+		Write(fmt::format("%s %d,%d,0x%x ", FixOp(op), b0, b1, DisAsmBranchTarget(pc)));
 	}
-	void DisAsm_CR_BRANCH(std::string_view op, u32 cr, s32 pc)
+	void DisAsm_CR_BRANCH(const std::string& op, u32 cr, const int pc)
 	{
-		fmt::append(last_opcode, "%-*s cr%d,0x%x ", PadOp(), op, cr, DisAsmBranchTarget(pc));
-	}
-	void DisAsm_CR_BRANCH_HINT(std::string_view op, u32 cr, u32 bh)
-	{
-		fmt::append(last_opcode, "%-*s cr%d,0x%x ", PadOp(), op, cr, bh);
+		Write(fmt::format("%s cr%d,0x%x ", FixOp(op), cr, DisAsmBranchTarget(pc)));
 	}
 };
diff --git a/rpcs3/Emu/Cell/PPUAnalyser.cpp b/rpcs3/Emu/Cell/PPUAnalyser.cpp
index 56d4398d09..a2c3d54250 100644
--- a/rpcs3/Emu/Cell/PPUAnalyser.cpp
+++ b/rpcs3/Emu/Cell/PPUAnalyser.cpp
@@ -1,10 +1,9 @@
 #include "stdafx.h"
 #include "PPUAnalyser.h"
 
-#include "lv2/sys_sync.h"
-
 #include "PPUOpcodes.h"
-#include "PPUThread.h"
+#include "PPUModule.h"
+#include "Emu/system_config.h"
 
 #include <unordered_set>
 #include "util/yaml.hpp"
@@ -12,7 +11,7 @@
 
 LOG_CHANNEL(ppu_validator);
 
-extern const ppu_decoder<ppu_itype> g_ppu_itype;
+const ppu_decoder<ppu_itype> s_ppu_itype;
 
 template<>
 void fmt_class_string<ppu_attr>::format(std::string& out, u64 arg)
@@ -21,10 +20,10 @@ void fmt_class_string<ppu_attr>::format(std::string& out, u64 arg)
 	{
 		switch (value)
 		{
+		case ppu_attr::known_addr: return "known_addr";
 		case ppu_attr::known_size: return "known_size";
 		case ppu_attr::no_return: return "no_return";
 		case ppu_attr::no_size: return "no_size";
-		case ppu_attr::has_mfvscr: return "has_mfvscr";
 		case ppu_attr::__bitset_enum_max: break;
 		}
 
@@ -38,8 +37,7 @@ void fmt_class_string<bs_t<ppu_attr>>::format(std::string& out, u64 arg)
 	format_bitset(out, arg, "[", ",", "]", &fmt_class_string<ppu_attr>::format);
 }
 
-template <>
-void ppu_module<lv2_obj>::validate(u32 reloc)
+void ppu_module::validate(u32 reloc)
 {
 	// Load custom PRX configuration if available
 	if (fs::file yml{path + ".yml"})
@@ -79,7 +77,7 @@ void ppu_module<lv2_obj>::validate(u32 reloc)
 
 				if (size && size != funcs[index].size)
 				{
-					if (size + 4 != funcs[index].size || get_ref<u32>(addr + size) != ppu_instructions::NOP())
+					if (size + 4 != funcs[index].size || vm::read32(addr + size) != ppu_instructions::NOP())
 					{
 						ppu_validator.error("%s.yml : function size mismatch at 0x%x(size=0x%x) (0x%x, 0x%x)", path, found, funcs[index].size, addr, size);
 					}
@@ -113,9 +111,9 @@ void ppu_module<lv2_obj>::validate(u32 reloc)
 	}
 }
 
-static u32 ppu_test(const be_t<u32>* ptr, const void* fend, ppu_pattern_array pat)
+static u32 ppu_test(const vm::cptr<u32> ptr, vm::cptr<void> fend, ppu_pattern_array pat)
 {
-	const be_t<u32>* cur = ptr;
+	vm::cptr<u32> cur = ptr;
 
 	for (auto& p : pat)
 	{
@@ -142,10 +140,10 @@ static u32 ppu_test(const be_t<u32>* ptr, const void* fend, ppu_pattern_array pa
 		cur++;
 	}
 
-	return ::narrow<u32>((cur - ptr) * sizeof(*ptr));
+	return cur.addr() - ptr.addr();
 }
 
-static u32 ppu_test(const be_t<u32>* ptr, const void* fend, ppu_pattern_matrix pats)
+static u32 ppu_test(vm::cptr<u32> ptr, vm::cptr<void> fend, ppu_pattern_matrix pats)
 {
 	for (auto pat : pats)
 	{
@@ -531,452 +529,31 @@ namespace ppu_patterns
 	};
 }
 
-static constexpr struct const_tag{} is_const;
-/*static constexpr*/ struct range_tag{} /*is_range*/;
-static constexpr struct min_value_tag{} minv;
-static constexpr struct max_value_tag{} maxv;
-static constexpr struct sign_bit_tag{} sign_bitv;
-static constexpr struct load_addr_tag{} load_addrv;
-
-struct reg_state_t
+void ppu_module::analyse(u32 lib_toc, u32 entry, const u32 sec_end, const std::basic_string<u32>& applied)
 {
-	u64 ge_than;
-	u64 value_range;
-	u64 bit_range;
-	bool is_loaded; // Is loaded from memory(?) (this includes offsetting from that address)
-	u32 tag;
-
-	// Check if state is a constant value
-	bool operator()(const_tag) const
-	{
-		return !is_loaded && value_range == 1 && bit_range == 0;
-	}
-
-	// Check if state is a ranged value
-	bool operator()(range_tag) const
-	{
-		return !is_loaded && bit_range == 0;
-	}
-
-	// Get minimum bound
-	u64 operator()(min_value_tag) const
-	{
-		return value_range ? ge_than : 0;
-	}
-
-	// Get maximum bound
-	u64 operator()(max_value_tag) const
-	{
-		return value_range ? (ge_than | bit_range) + value_range : 0;
-	}
-
-	u64 operator()(sign_bit_tag) const
-	{
-		return value_range == 0 || (bit_range >> 63) || (ge_than + value_range - 1) >> 63 != (ge_than >> 63) ? u64{umax} : (ge_than >> 63);
-	}
-
-	u64 operator()(load_addr_tag) const
-	{
-		return is_loaded ? ge_than : 0;
-	}
-
-	// Check if value is of the same origin
-	bool is_equals(const reg_state_t& rhs) const
-	{
-		return (rhs.tag && rhs.tag == this->tag) || (rhs(is_const) && (*this)(is_const) && rhs.ge_than == ge_than);
-	}
-
-	void set_lower_bound(u64 value)
-	{
-		const u64 prev_max = ge_than + value_range;
-		ge_than = value;
-		value_range = prev_max - ge_than;
-	}
-
-	// lower_bound = Max(bounds)
-	void lift_lower_bound(u64 value)
-	{
-		const u64 prev_max = ge_than + value_range;
-
-		// Get the value closer to upper bound (may be lower in value)
-		// Make 0 underflow (it is actually not 0 but UINT64_MAX + 1 in this context)
-		ge_than = value_range - 1 > prev_max - value - 1 ? value : ge_than;
-
-		value_range = prev_max - ge_than;
-	}
-
-	// Upper bound is not inclusive
-	void set_upper_bound(u64 value)
-	{
-		value_range = value - ge_than;
-	}
-
-	// upper_bound = Min(bounds)
-	void limit_upper_bound(u64 value)
-	{
-		// Make 0 underflow (it is actually not 0 but UINT64_MAX + 1 in this context)
-		value_range = std::min(value - ge_than - 1, value_range - 1) + 1;
-	}
-
-	// Clear bits using mask
-	// May fail if ge_than(+)value_range is modified by the operation 
-	bool clear_mask(u64 bit_mask, u32& reg_tag_allocator)
-	{
-		if (bit_mask == umax)
-		{
-			return true;
-		}
-
-		if ((ge_than & bit_mask) > ~value_range)
-		{
-			// Discard data: mask clears the carry bit
-			value_range = 0;
-			tag = reg_tag_allocator++;
-			return false;
-		}
-
-		if (((ge_than & bit_mask) + value_range) & ~bit_mask)
-		{
-			// Discard data: mask clears range bits
-			value_range = 0;
-			tag = reg_tag_allocator++;
-			return false;
-		}
-
-		ge_than &= bit_mask;
-		bit_range &= bit_mask;
-		return true;
-	}
-
-	bool clear_lower_bits(u64 bits, u32& reg_tag_allocator)
-	{
-		const u64 bit_mask = ~((u64{1} << bits) - 1);
-		return clear_mask(bit_mask, reg_tag_allocator);
-	}
-
-	bool clear_higher_bits(u64 bits, u32& reg_tag_allocator)
-	{
-		const u64 bit_mask = (u64{1} << ((64 - bits) % 64)) - 1;
-		return clear_mask(bit_mask, reg_tag_allocator);
-	}
-
-	// Undefine bits using mask
-	void undef_mask(u64 bit_mask)
-	{
-		ge_than &= bit_mask;
-		bit_range |= ~bit_mask;
-	}
-
-	void undef_lower_bits(u64 bits)
-	{
-		const u64 bit_mask = ~((u64{1} << bits) - 1);
-		undef_mask(bit_mask);
-	}
-
-	void undef_higher_bits(u64 bits)
-	{
-		const u64 bit_mask = (u64{1} << ((64 - bits) % 64)) - 1;
-		undef_mask(bit_mask);
-	}
-
-	// Add value to state, respecting of bit_range
-	void add(u64 value)
-	{
-		const u64 old_ge = ge_than;
-		ge_than += value;
-
-		// Adjust bit_range to undefine bits that their state may not be defined anymore
-		// No need to adjust value_range at the moment (wrapping around is implied)
-		bit_range |= ((old_ge | bit_range) + value) ^ ((old_ge) + value);
-
-		ge_than &= ~bit_range;
-	}
-
-	void sub(u64 value)
-	{
-		// This function should be perfect, so it handles subtraction as well
-		add(~value + 1);
-	}
-
-	// TODO: For CMP/CMPD value fixup
-	bool can_subtract_from_both_without_loss_of_meaning(const reg_state_t& rhs, u64 value)
-	{
-		const reg_state_t& lhs = *this;
-
-		return lhs.ge_than >= value && rhs.ge_than >= value && !!((lhs.ge_than - value) & lhs.bit_range) && !!((rhs.ge_than - value) & rhs.bit_range);
-	}
-
-	// Bitwise shift left
-	bool shift_left(u64 value, u32& reg_tag_allocator)
-	{
-		if (!value || !value_range)
-		{
-			return true;
-		}
-
-		const u64 mask_out = u64{umax} >> value;
-
-		if ((ge_than & mask_out) > ~value_range)
-		{
-			// Discard data: shift clears the carry bit
-			value_range = 0;
-			tag = reg_tag_allocator++;
-			return false;
-		}
-
-		if (((ge_than & mask_out) + value_range) & ~mask_out)
-		{
-			// Discard data: shift clears range bits
-			value_range = 0;
-			tag = reg_tag_allocator++;
-			return false;
-		}
-
-		ge_than <<= value;
-		bit_range <<= value;
-		value_range = ((value_range - 1) << value) + 1;
-		return true;
-	}
-
-	void load_const(u64 value)
-	{
-		ge_than = value;
-		value_range = 1;
-		is_loaded = false;
-		tag = 0;
-		bit_range = 0;
-	}
-
-	u64 upper_bound() const
-	{
-		return ge_than + value_range;
-	}
-
-	// Using comparison evaluation data to bound data to our needs
-	void declare_ordering(reg_state_t& right_register, bool lt, bool eq, bool gt, bool so, bool nso)
-	{
-		if (lt && gt)
-		{
-			// We don't care about inequality at the moment
-
-			// Except for 0
-			if (right_register.value_range == 1 && right_register.ge_than == 0)
-			{
-				lift_lower_bound(1);
-			}
-			else if (value_range == 1 && ge_than == 0)
-			{
-				right_register.lift_lower_bound(1);
-			}
-
-			return;
-		}
-
-		if (lt || gt)
-		{
-			reg_state_t* rhs = &right_register;
-			reg_state_t* lhs = this;
-
-			// This is written as if for operator<
-			if (gt)
-			{
-				std::swap(rhs, lhs);
-			}
-
-			if (lhs->value_range == 1)
-			{
-				rhs->lift_lower_bound(lhs->upper_bound() - (eq ? 1 : 0));
-			}
-			else if (rhs->value_range == 1)
-			{
-				lhs->limit_upper_bound(rhs->ge_than + (eq ? 1 : 0));
-			}
-		}
-		else if (eq)
-		{
-			if (value_range == 1)
-			{
-				right_register = *this;
-			}
-			else if (right_register.value_range == 1)
-			{
-				*this = right_register;
-			}
-			else if (0)
-			{
-				// set_lower_bound(std::max(ge_than, right_register.ge_than));
-				// set_upper_bound(std::min(value_range + ge_than, right_register.ge_than + right_register.value_range));
-				// right_register.ge_than = ge_than;
-				// right_register.value_range = value_range;
-			}
-		}
-		else if (so || nso)
-		{
-			// TODO: Implement(?)
-		}
-	}
-};
-
-static constexpr reg_state_t s_reg_const_0{ 0, 1 };
-
-template <>
-bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, const std::vector<u32>& applied, const std::vector<u32>& exported_funcs, std::function<bool()> check_aborted)
-{
-	if (segs.empty() || !segs[0].addr)
-	{
-		return false;
-	}
-
 	// Assume first segment is executable
 	const u32 start = segs[0].addr;
 
 	// End of executable segment (may change)
 	u32 end = sec_end ? sec_end : segs[0].addr + segs[0].size;
 
-	// End of all segments
-	u32 segs_end = end;
-
-	for (const auto& s : segs)
-	{
-		if (s.size && s.addr != start)
-		{
-			segs_end = std::max(segs_end, s.addr + s.size);
-		}
-	}
-
 	// Known TOCs (usually only 1)
 	std::unordered_set<u32> TOCs;
 
-	struct ppu_function_ext : ppu_function
-	{
-		//u32 stack_frame = 0;
-		u32 single_target = 0;
-		u32 trampoline = 0;
-		bs_t<ppu_attr> attr{};
-
-		std::set<u32> callers{};
-	};
-
 	// Known functions
-	std::map<u32, ppu_function_ext> fmap;
+	std::map<u32, ppu_function> fmap;
 	std::set<u32> known_functions;
 
 	// Function analysis workload
-	std::vector<std::reference_wrapper<ppu_function_ext>> func_queue;
+	std::vector<std::reference_wrapper<ppu_function>> func_queue;
 
 	// Known references (within segs, addr and value alignment = 4)
-	// For seg0, must be valid code
-	// Value is a sample of an address that refernces it
-	std::map<u32, u32> addr_heap;
-
-	if (entry)
-	{
-		addr_heap.emplace(entry, 0);
-	}
-
-	auto verify_ref = [&](u32 addr)
-	{
-		if (!is_relocatable)
-		{
-			// Fixed addresses
-			return true;
-		}
-
-		// Check if the storage address exists within relocations
-		constexpr auto compare = [](const ppu_reloc& a, u32 addr) { return a.addr < addr; };
-		auto it = std::lower_bound(this->relocs.begin(), this->relocs.end(), (addr & -8), compare);
-		auto end = std::lower_bound(it, this->relocs.end(), (addr & -8) + 8, compare);
-
-		for (; it != end; it++)
-		{
-			const ppu_reloc& rel = *it;
-
-			if ((rel.addr & -8) == (addr & -8))
-			{
-				if (rel.type != 38 && rel.type != 44 && (rel.addr & -4) != (addr & -4))
-				{
-					continue;
-				}
-
-				return true;
-			}
-		}
-
-		return false;
-	};
-
-	auto can_trap_continue = [](ppu_opcode_t op, ppu_itype::type type)
-	{
-		if ((op.bo & 0x1c) == 0x1c || (op.bo & 0x7) == 0x7)
-		{
-			// All signed or unsigned <=>, must be true
-			return false;
-		}
-
-		if (op.simm16 == 0 && (type == ppu_itype::TWI || type == ppu_itype::TDI) && (op.bo & 0x5) == 0x5)
-		{
-			// Logically greater or equal to 0
-			return false;
-		}
-
-		return true;
-	};
-
-	auto is_valid_code = [](std::span<const be_t<u32>> range, bool is_fixed_addr, u32 /*cia*/)
-	{
-		for (usz index = 0; index < std::min<usz>(range.size(), 10); index++)
-		{
-			const ppu_opcode_t op{+range[index]};
-
-			switch (g_ppu_itype.decode(op.opcode))
-			{
-			case ppu_itype::UNK:
-			{
-				return false;
-			}
-			case ppu_itype::BC:
-			case ppu_itype::B:
-			{
-				if (!is_fixed_addr && op.aa)
-				{
-					return false;
-				}
-
-				return true;
-			}
-			case ppu_itype::BCCTR:
-			case ppu_itype::BCLR:
-			{
-				if (op.opcode & 0xe000)
-				{
-					// Garbage filter
-					return false;
-				}
-
-				return true;
-			}
-			default:
-			{
-				continue;
-			}
-			}
-		}
-
-		return true;
-	};
+	std::set<u32> addr_heap{entry};
 
 	// Register new function
-	auto add_func = [&](u32 addr, u32 toc, u32 caller) -> ppu_function_ext&
+	auto add_func = [&](u32 addr, u32 toc, u32 caller) -> ppu_function&
 	{
-		if (addr < start || addr >= end || g_ppu_itype.decode(*get_ptr<u32>(addr)) == ppu_itype::UNK)
-		{
-			if (!fmap.contains(addr))
-			{
-				ppu_log.error("Potentially invalid function has been added: 0x%x", addr);
-			}
-		}
-
-		ppu_function_ext& func = fmap[addr];
+		ppu_function& func = fmap[addr];
 
 		if (caller)
 		{
@@ -1007,14 +584,6 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 		return func;
 	};
 
-	static const auto advance = [](auto& _ptr, auto& ptr, u32 count)
-	{
-		const auto old_ptr = ptr;
-		_ptr += count;
-		ptr += count;
-		return old_ptr;
-	};
-
 	// Register new TOC and find basic set of functions
 	auto add_toc = [&](u32 toc)
 	{
@@ -1026,24 +595,16 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 		// Grope for OPD section (TODO: optimization, better constraints)
 		for (const auto& seg : segs)
 		{
-			if (seg.size < 8) continue;
+			if (!seg.addr) continue;
 
-			const vm::cptr<void> seg_end = vm::cast(seg.addr + seg.size - 8);
-			vm::cptr<u32> _ptr = vm::cast(seg.addr);
-			auto ptr = get_ptr<u32>(_ptr);
-
-			for (; _ptr <= seg_end;)
+			for (vm::cptr<u32> ptr = vm::cast(seg.addr); ptr.addr() < seg.addr + seg.size; ptr++)
 			{
-				if (ptr[1] == toc && FN(x >= start && x < end && x % 4 == 0)(ptr[0]) && verify_ref(_ptr.addr()))
+				if (ptr[0] >= start && ptr[0] < end && ptr[0] % 4 == 0 && ptr[1] == toc)
 				{
 					// New function
-					ppu_log.trace("OPD*: [0x%x] 0x%x (TOC=0x%x)", _ptr, ptr[0], ptr[1]);
-					add_func(*ptr, addr_heap.count(_ptr.addr()) ? toc : 0, 0);
-					advance(_ptr, ptr, 2);
-				}
-				else
-				{
-					advance(_ptr, ptr, 1);
+					ppu_log.trace("OPD*: [0x%x] 0x%x (TOC=0x%x)", ptr, ptr[0], ptr[1]);
+					add_func(*ptr, addr_heap.count(ptr.addr()) ? toc : 0, 0);
+					ptr++;
 				}
 			}
 		}
@@ -1057,36 +618,26 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 	};
 
 	// Find references indiscriminately
-	// For seg0, must be valid code
 	for (const auto& seg : segs)
 	{
-		if (seg.size < 4) continue;
+		if (!seg.addr) continue;
 
-		vm::cptr<u32> _ptr = vm::cast(seg.addr);
-		const vm::cptr<void> seg_end = vm::cast(seg.addr + seg.size - 4);
-		auto ptr = get_ptr<u32>(_ptr);
-
-		for (; _ptr <= seg_end; advance(_ptr, ptr, 1))
+		for (vm::cptr<u32> ptr = vm::cast(seg.addr); ptr.addr() < seg.addr + seg.size; ptr++)
 		{
 			const u32 value = *ptr;
 
-			if (value % 4 || !verify_ref(_ptr.addr()))
+			if (value % 4)
 			{
 				continue;
 			}
 
 			for (const auto& _seg : segs)
 			{
-				if (!_seg.size) continue;
+				if (!_seg.addr) continue;
 
 				if (value >= start && value < end)
 				{
-					if (is_valid_code({ ptr, ptr + (end - value) }, !is_relocatable, _ptr.addr()))
-					{
-						continue;
-					}
-
-					addr_heap.emplace(value, _ptr.addr());
+					addr_heap.emplace(value);
 					break;
 				}
 			}
@@ -1096,25 +647,18 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 	// Find OPD section
 	for (const auto& sec : secs)
 	{
-		if (sec.size % 8)
-		{
-			continue;
-		}
-
 		vm::cptr<void> sec_end = vm::cast(sec.addr + sec.size);
 
 		// Probe
-		for (vm::cptr<u32> _ptr = vm::cast(sec.addr); _ptr < sec_end; _ptr += 2)
+		for (vm::cptr<u32> ptr = vm::cast(sec.addr); ptr < sec_end; ptr += 2)
 		{
-			auto ptr = get_ptr<u32>(_ptr);
-
-			if (_ptr + 6 <= sec_end && !ptr[0] && !ptr[2] && ptr[1] == ptr[4] && ptr[3] == ptr[5])
+			if (ptr + 6 <= sec_end && !ptr[0] && !ptr[2] && ptr[1] == ptr[4] && ptr[3] == ptr[5])
 			{
 				// Special OPD format case (some homebrews)
-				advance(_ptr, ptr, 4);
+				ptr += 4;
 			}
 
-			if (_ptr + 2 > sec_end)
+			if (ptr + 2 > sec_end)
 			{
 				sec_end.set(0);
 				break;
@@ -1124,17 +668,17 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 			const u32 _toc = ptr[1];
 
 			// Rough Table of Contents borders
-			const u32 toc_begin = _toc - 0x8000;
-			//const u32 toc_end = _toc + 0x7ffc;
+			//const u32 _toc_begin = _toc - 0x8000;
+			//const u32 _toc_end = _toc + 0x8000;
 
 			// TODO: improve TOC constraints
-			if (toc_begin % 4 || !get_ptr<u8>(toc_begin) || toc_begin >= 0x40000000 || (toc_begin >= start && toc_begin < end))
+			if (_toc % 4 || !vm::check_addr(_toc) || _toc >= 0x40000000 || (_toc >= start && _toc < end))
 			{
 				sec_end.set(0);
 				break;
 			}
 
-			if (addr % 4 || addr < start || addr >= end || !verify_ref(_ptr.addr()))
+			if (addr % 4 || addr < start || addr >= end || addr == _toc)
 			{
 				sec_end.set(0);
 				break;
@@ -1144,20 +688,19 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 		if (sec_end) ppu_log.notice("Reading OPD section at 0x%x...", sec.addr);
 
 		// Mine
-		for (vm::cptr<u32> _ptr = vm::cast(sec.addr); _ptr < sec_end; _ptr += 2)
+		for (vm::cptr<u32> ptr = vm::cast(sec.addr); ptr < sec_end; ptr += 2)
 		{
-			auto ptr = get_ptr<u32>(_ptr);
-
 			// Special case: see "Probe"
-			if (!ptr[0]) advance(_ptr, ptr, 4);
+			if (!ptr[0]) ptr += 4;
 
 			// Add function and TOC
 			const u32 addr = ptr[0];
 			const u32 toc = ptr[1];
-			ppu_log.trace("OPD: [0x%x] 0x%x (TOC=0x%x)", _ptr, addr, toc);
+			ppu_log.trace("OPD: [0x%x] 0x%x (TOC=0x%x)", ptr, addr, toc);
 
 			TOCs.emplace(toc);
-			add_func(addr, addr_heap.count(_ptr.addr()) ? toc : 0, 0);
+			auto& func = add_func(addr, addr_heap.count(ptr.addr()) ? toc : 0, 0);
+			func.attr += ppu_attr::known_addr;
 			known_functions.emplace(addr);
 		}
 	}
@@ -1165,7 +708,7 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 	// Register TOC from entry point
 	if (entry && !lib_toc)
 	{
-		lib_toc = get_ref<u32>(entry) ? get_ref<u32>(entry + 4) : get_ref<u32>(entry + 20);
+		lib_toc = vm::read32(entry) ? vm::read32(entry + 4) : vm::read32(entry + 20);
 	}
 
 	// Secondary attempt
@@ -1186,33 +729,26 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 	// Find .eh_frame section
 	for (const auto& sec : secs)
 	{
-		if (sec.size % 4)
-		{
-			continue;
-		}
-
 		vm::cptr<void> sec_end = vm::cast(sec.addr + sec.size);
 
 		// Probe
-		for (vm::cptr<u32> _ptr = vm::cast(sec.addr); _ptr < sec_end;)
+		for (vm::cptr<u32> ptr = vm::cast(sec.addr); ptr < sec_end;)
 		{
-			if (!_ptr.aligned() || _ptr.addr() < sec.addr || _ptr >= sec_end)
+			if (!ptr.aligned() || ptr.addr() < sec.addr || ptr >= sec_end)
 			{
 				sec_end.set(0);
 				break;
 			}
 
-			const auto ptr = get_ptr<u32>(_ptr);
-
 			const u32 size = ptr[0] + 4;
 
-			if (size == 4 && _ptr + 1 == sec_end)
+			if (size == 4 && ptr + 1 == sec_end)
 			{
 				// Null terminator
 				break;
 			}
 
-			if (size % 4 || size < 0x10 || _ptr + size / 4 > sec_end)
+			if (size % 4 || size < 0x10 || ptr + size / 4 > sec_end)
 			{
 				sec_end.set(0);
 				break;
@@ -1220,7 +756,7 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 
 			if (ptr[1])
 			{
-				const u32 cie_off = _ptr.addr() - ptr[1] + 4;
+				const u32 cie_off = ptr.addr() - ptr[1] + 4;
 
 				if (cie_off % 4 || cie_off < sec.addr || cie_off >= sec_end.addr())
 				{
@@ -1229,16 +765,14 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				}
 			}
 
-			_ptr = vm::cast(_ptr.addr() + size);
+			ptr = vm::cast(ptr.addr() + size);
 		}
 
 		if (sec_end && sec.size > 4) ppu_log.notice("Reading .eh_frame section at 0x%x...", sec.addr);
 
 		// Mine
-		for (vm::cptr<u32> _ptr = vm::cast(sec.addr); _ptr < sec_end; _ptr = vm::cast(_ptr.addr() + *get_ptr<u32>(_ptr) + 4))
+		for (vm::cptr<u32> ptr = vm::cast(sec.addr); ptr < sec_end; ptr = vm::cast(ptr.addr() + ptr[0] + 4))
 		{
-			const auto ptr = get_ptr<u32>(_ptr);
-
 			if (ptr[0] == 0u)
 			{
 				// Null terminator
@@ -1253,7 +787,7 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 			else
 			{
 				// Get associated CIE (currently unused)
-				const vm::cptr<u32> cie = vm::cast(_ptr.addr() - ptr[1] + 4);
+				const vm::cptr<u32> cie = vm::cast(ptr.addr() - ptr[1] + 4);
 
 				u32 addr = 0;
 				u32 size = 0;
@@ -1282,7 +816,7 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				// TODO: absolute/relative offset (approximation)
 				if (addr > 0xc0000000)
 				{
-					addr += _ptr.addr() + 8;
+					addr += ptr.addr() + 8;
 				}
 
 				ppu_log.trace(".eh_frame: [0x%x] FDE 0x%x (cie=*0x%x, addr=0x%x, size=0x%x)", ptr, ptr[0], cie, addr, size);
@@ -1295,6 +829,7 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				}
 
 				//auto& func = add_func(addr, 0, 0);
+				//func.attr += ppu_attr::known_addr;
 				//func.attr += ppu_attr::known_size;
 				//func.size = size;
 				//known_functions.emplace(func);
@@ -1302,142 +837,17 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 		}
 	}
 
-	bool used_fallback = false;
-
-	if (func_queue.empty())
-	{
-		for (u32 addr : exported_funcs)
-		{
-			const u32 faddr = get_ref<u32>(addr);
-
-			if (addr < start || addr >= start + segs[0].size)
-			{
-				// TODO: Reverse engineer how it works (maybe some flag in exports)
-
-				if (faddr < start || faddr >= start + segs[0].size)
-				{
-					ppu_log.notice("Export not usable at 0x%x / 0x%x (0x%x...0x%x)", addr, faddr, start, start + segs[0].size);
-					continue;
-				}
-
-				addr = faddr;
-			}
-
-			ppu_log.trace("Enqueued exported PPU function 0x%x for analysis", addr);
-
-			add_func(addr, 0, 0);
-			used_fallback = true;
-		}
-	}
-
-	if (func_queue.empty() && segs[0].size >= 4u)
-	{
-		// Fallback, identify functions using callers (no jumptable detection, tail calls etc)
-		ppu_log.warning("Looking for PPU functions using callers. ('%s')", name);
-
-		vm::cptr<u32> _ptr = vm::cast(start);
-		const vm::cptr<void> seg_end = vm::cast(end - 4);
-
-		for (auto ptr = get_ptr<u32>(_ptr); _ptr <= seg_end; advance(_ptr, ptr, 1))
-		{
-			const u32 iaddr = _ptr.addr();
-
-			const ppu_opcode_t op{*ptr};
-			const ppu_itype::type type = g_ppu_itype.decode(op.opcode);
-
-			if ((type == ppu_itype::B || type == ppu_itype::BC) && op.lk && (!op.aa || verify_ref(iaddr)))
-			{
-				const u32 target = (op.aa ? 0 : iaddr) + (type == ppu_itype::B ? +op.bt24 : +op.bt14);
-
-				if (target >= start && target < end && target != iaddr && target != iaddr + 4)
-				{
-					if (is_valid_code({ get_ptr<u32>(target), get_ptr<u32>(end - 4) }, !is_relocatable, target))
-					{
-						ppu_log.trace("Enqueued PPU function 0x%x using a caller at 0x%x", target, iaddr);
-						add_func(target, 0, 0);
-						used_fallback = true;
-					}
-				}
-			}
-		}
-	}
-
-	// Register state (preallocated)
-	// Make sure to re-initialize this for every function!
-	std::vector<reg_state_t> reg_state_storage(64 * (is_relocatable ? 256 : 1024));
-
-	struct block_local_info_t
-	{
-		u32 addr = 0;
-		u32 size = 0;
-		u32 parent_block_idx = umax;
-		ppua_reg_mask_t mapped_registers_mask{0};
-		ppua_reg_mask_t moved_registers_mask{0};
-	};
-
-	// Block analysis workload
-	std::vector<block_local_info_t> block_queue_storage;
-
-	bool is_function_caller_analysis = false;
-
 	// Main loop (func_queue may grow)
-	for (usz i = 0; i <= func_queue.size(); i++)
+	for (usz i = 0; i < func_queue.size(); i++)
 	{
-		if (i == func_queue.size())
-		{
-			if (is_function_caller_analysis)
-			{
-				break;
-			}
-
-			// Add callers of imported functions to be analyzed
-			std::set<u32> added;
-
-			for (const auto& [stub_addr, _] : stub_addr_to_constant_state_of_registers)
-			{
-				auto it = fmap.upper_bound(stub_addr);
-
-				if (it == fmap.begin())
-				{
-					continue;
-				}
-
-				auto stub_func = std::prev(it);
-
-				for (u32 caller : stub_func->second.callers)
-				{
-					ppu_function_ext& func = ::at32(fmap, caller);
-
-					if (func.attr.none_of(ppu_attr::no_size) && !func.blocks.empty() && !added.contains(caller))
-					{
-						added.emplace(caller);
-						func_queue.emplace_back(::at32(fmap, caller));
-					}
-				}
-			}
-
-			if (added.empty())
-			{
-				break;
-			}
-
-			is_function_caller_analysis = true;
-		}
-
-		if (check_aborted && check_aborted())
-		{
-			return false;
-		}
-
-		ppu_function_ext& func = func_queue[i];
+		ppu_function& func = func_queue[i];
 
 		// Fixup TOCs
-		if (!is_function_caller_analysis && func.toc && func.toc != umax)
+		if (func.toc && func.toc != umax)
 		{
-			// Fixup callers
 			for (u32 addr : func.callers)
 			{
-				ppu_function_ext& caller = fmap[addr];
+				ppu_function& caller = fmap[addr];
 
 				if (!caller.toc)
 				{
@@ -1445,76 +855,29 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				}
 			}
 
-			// Fixup callees
-			auto for_callee = [&](u32 addr)
+			for (u32 addr : func.calls)
 			{
-				if (addr < func.addr || addr >= func.addr + func.size)
-				{
-					return;
-				}
-
-				const u32 iaddr = addr;
-
-				const ppu_opcode_t op{get_ref<u32>(iaddr)};
-				const ppu_itype::type type = g_ppu_itype.decode(op.opcode);
-
-				if (type == ppu_itype::B || type == ppu_itype::BC)
-				{
-					const u32 target = (op.aa ? 0 : iaddr) + (type == ppu_itype::B ? +op.bt24 : +op.bt14);
-
-					if (target >= start && target < end && (!op.aa || verify_ref(iaddr)))
-					{
-						if (target < func.addr || target >= func.addr + func.size)
-						{
-							ppu_function_ext& callee = fmap[target];
-
-							if (!callee.toc)
-							{
-								add_func(target, func.toc + func.trampoline, 0);
-							}
-						}
-					}
-				}
-			};
-
-			for (const auto& [addr, size] : func.blocks)
-			{
-				if (size)
-				{
-					for_callee(addr + size - 4);
-				}
-			}
-
-			if (func.size)
-			{
-				for_callee(func.addr + func.size - 4);
-			}
-
-			// For trampoline functions
-			if (func.single_target)
-			{
-				ppu_function_ext& callee = fmap[func.single_target];
+				ppu_function& callee = fmap[addr];
 
 				if (!callee.toc)
 				{
-					add_func(func.single_target, func.toc + func.trampoline, 0);
+					add_func(addr, func.toc + func.trampoline, 0);
 				}
 			}
 		}
 
-		if (!is_function_caller_analysis && func.blocks.empty())
+		if (func.blocks.empty())
 		{
 			// Special function analysis
-			const vm::cptr<u32> _ptr = vm::cast(func.addr);
+			const vm::cptr<u32> ptr = vm::cast(func.addr);
 			const vm::cptr<void> fend = vm::cast(end);
-			const auto ptr = get_ptr<u32>(_ptr);
 
 			using namespace ppu_instructions;
 
-			if (_ptr + 1 <= fend && (ptr[0] & 0xfc000001) == B({}, {}))
+			if (ptr + 1 <= fend && (ptr[0] & 0xfc000001) == B({}, {}))
 			{
 				// Simple trampoline
-				const u32 target = (ptr[0] & 0x2 ? 0 : _ptr.addr()) + ppu_opcode_t{ptr[0]}.bt24;
+				const u32 target = (ptr[0] & 0x2 ? 0 : ptr.addr()) + ppu_opcode_t{ptr[0]}.bt24;
 
 				if (target == func.addr)
 				{
@@ -1525,7 +888,7 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 					continue;
 				}
 
-				if (target >= start && target < end && (~ptr[0] & 0x2 || verify_ref(_ptr.addr())))
+				if (target >= start && target < end)
 				{
 					auto& new_func = add_func(target, func.toc, func.addr);
 
@@ -1538,13 +901,13 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 					func.size = 0x4;
 					func.blocks.emplace(func.addr, func.size);
 					func.attr += new_func.attr & ppu_attr::no_return;
-					func.single_target = target;
+					func.calls.emplace(target);
 					func.trampoline = 0;
 					continue;
 				}
 			}
 
-			if (_ptr + 0x4 <= fend &&
+			if (ptr + 0x4 <= fend &&
 				(ptr[0] & 0xffff0000) == LIS(r11, 0) &&
 				(ptr[1] & 0xffff0000) == ADDI(r11, r11, 0) &&
 				ptr[2] == MTCTR(r11) &&
@@ -1553,7 +916,7 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				// Simple trampoline
 				const u32 target = (ptr[0] << 16) + ppu_opcode_t{ptr[1]}.simm16;
 
-				if (target >= start && target < end && verify_ref(_ptr.addr()))
+				if (target >= start && target < end)
 				{
 					auto& new_func = add_func(target, func.toc, func.addr);
 
@@ -1566,13 +929,13 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 					func.size = 0x10;
 					func.blocks.emplace(func.addr, func.size);
 					func.attr += new_func.attr & ppu_attr::no_return;
-					func.single_target = target;
+					func.calls.emplace(target);
 					func.trampoline = 0;
 					continue;
 				}
 			}
 
-			if (_ptr + 0x7 <= fend &&
+			if (ptr + 0x7 <= fend &&
 				ptr[0] == STD(r2, r1, 0x28) &&
 				(ptr[1] & 0xffff0000) == ADDIS(r12, r2, {}) &&
 				(ptr[2] & 0xffff0000) == LWZ(r11, r12, {}) &&
@@ -1584,14 +947,13 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				func.toc = -1;
 				func.size = 0x1C;
 				func.blocks.emplace(func.addr, func.size);
+				func.attr += ppu_attr::known_addr;
 				func.attr += ppu_attr::known_size;
-				known_functions.emplace(func.addr);
 
 				// Look for another imports to fill gaps (hack)
-				auto _p2 = _ptr + 7;
-				auto p2 = get_ptr<u32>(_p2);
+				auto p2 = ptr + 7;
 
-				while (_p2 + 0x7 <= fend &&
+				while (p2 + 0x7 <= fend &&
 					p2[0] == STD(r2, r1, 0x28) &&
 					(p2[1] & 0xffff0000) == ADDIS(r12, r2, {}) &&
 					(p2[2] & 0xffff0000) == LWZ(r11, r12, {}) &&
@@ -1600,18 +962,18 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 					p2[5] == MTCTR(r11) &&
 					p2[6] == BCTR())
 				{
-					auto& next = add_func(_p2.addr(), -1, func.addr);
+					auto& next = add_func(p2.addr(), -1, func.addr);
 					next.size = 0x1C;
 					next.blocks.emplace(next.addr, next.size);
+					next.attr += ppu_attr::known_addr;
 					next.attr += ppu_attr::known_size;
-					known_functions.emplace(_p2.addr());
-					advance(_p2, p2, 7);
+					p2 += 7;
 				}
 
 				continue;
 			}
 
-			if (_ptr + 0x7 <= fend &&
+			if (ptr + 0x7 <= fend &&
 				ptr[0] == STD(r2, r1, 0x28) &&
 				(ptr[1] & 0xffff0000) == ADDIS(r2, r2, {}) &&
 				(ptr[2] & 0xffff0000) == ADDI(r2, r2, {}) &&
@@ -1624,7 +986,7 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				const u32 target = (ptr[3] << 16) + s16(ptr[4]);
 				const u32 toc_add = (ptr[1] << 16) + s16(ptr[2]);
 
-				if (target >= start && target < end && verify_ref((_ptr + 3).addr()))
+				if (target >= start && target < end)
 				{
 					auto& new_func = add_func(target, 0, func.addr);
 
@@ -1640,11 +1002,11 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 						add_toc(toc);
 						add_func(func.addr, toc, 0);
 					}
-					//else if (new_func.toc - func.toc != toc_add)
-					//{
-					//	func.toc = -1;
-					//	new_func.toc = -1;
-					//}
+					else if (new_func.toc - func.toc != toc_add)
+					{
+						//func.toc = -1;
+						//new_func.toc = -1;
+					}
 
 					if (new_func.blocks.empty())
 					{
@@ -1655,13 +1017,13 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 					func.size = 0x1C;
 					func.blocks.emplace(func.addr, func.size);
 					func.attr += new_func.attr & ppu_attr::no_return;
-					func.single_target = target;
+					func.calls.emplace(target);
 					func.trampoline = toc_add;
 					continue;
 				}
 			}
 
-			if (_ptr + 4 <= fend &&
+			if (ptr + 4 <= fend &&
 				ptr[0] == STD(r2, r1, 0x28) &&
 				(ptr[1] & 0xffff0000) == ADDIS(r2, r2, {}) &&
 				(ptr[2] & 0xffff0000) == ADDI(r2, r2, {}) &&
@@ -1669,9 +1031,9 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 			{
 				// Trampoline with TOC
 				const u32 toc_add = (ptr[1] << 16) + s16(ptr[2]);
-				const u32 target = (ptr[3] & 0x2 ? 0 : (_ptr + 3).addr()) + ppu_opcode_t{ptr[3]}.bt24;
+				const u32 target = (ptr[3] & 0x2 ? 0 : (ptr + 3).addr()) + ppu_opcode_t{ptr[3]}.bt24;
 
-				if (target >= start && target < end && (~ptr[3] & 0x2 || verify_ref((_ptr + 3).addr())))
+				if (target >= start && target < end)
 				{
 					auto& new_func = add_func(target, 0, func.addr);
 
@@ -1687,11 +1049,11 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 						add_toc(toc);
 						add_func(func.addr, toc, 0);
 					}
-					//else if (new_func.toc - func.toc != toc_add)
-					//{
-					//	func.toc = -1;
-					//	new_func.toc = -1;
-					//}
+					else if (new_func.toc - func.toc != toc_add)
+					{
+						//func.toc = -1;
+						//new_func.toc = -1;
+					}
 
 					if (new_func.blocks.empty())
 					{
@@ -1702,13 +1064,13 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 					func.size = 0x10;
 					func.blocks.emplace(func.addr, func.size);
 					func.attr += new_func.attr & ppu_attr::no_return;
-					func.single_target = target;
+					func.calls.emplace(target);
 					func.trampoline = toc_add;
 					continue;
 				}
 			}
 
-			if (_ptr + 8 <= fend &&
+			if (ptr + 8 <= fend &&
 				(ptr[0] & 0xffff0000) == LI(r12, 0) &&
 				(ptr[1] & 0xffff0000) == ORIS(r12, r12, 0) &&
 				(ptr[2] & 0xffff0000) == LWZ(r12, r12, 0) &&
@@ -1722,14 +1084,14 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				func.toc = -1;
 				func.size = 0x20;
 				func.blocks.emplace(func.addr, func.size);
+				func.attr += ppu_attr::known_addr;
 				known_functions.emplace(func.addr);
 				func.attr += ppu_attr::known_size;
 
 				// Look for another imports to fill gaps (hack)
-				auto _p2 = _ptr + 8;
-				auto p2 = get_ptr<u32>(_p2);
+				auto p2 = ptr + 8;
 
-				while (_p2 + 8 <= fend &&
+				while (p2 + 8 <= fend &&
 					(p2[0] & 0xffff0000) == LI(r12, 0) &&
 					(p2[1] & 0xffff0000) == ORIS(r12, r12, 0) &&
 					(p2[2] & 0xffff0000) == LWZ(r12, r12, 0) &&
@@ -1739,18 +1101,19 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 					p2[6] == MTCTR(r0) &&
 					p2[7] == BCTR())
 				{
-					auto& next = add_func(_p2.addr(), -1, func.addr);
+					auto& next = add_func(p2.addr(), -1, func.addr);
 					next.size = 0x20;
 					next.blocks.emplace(next.addr, next.size);
+					next.attr += ppu_attr::known_addr;
 					next.attr += ppu_attr::known_size;
-					advance(_p2, p2, 8);
+					p2 += 8;
 					known_functions.emplace(next.addr);
 				}
 
 				continue;
 			}
 
-			if (_ptr + 3 <= fend &&
+			if (ptr + 3 <= fend &&
 				ptr[0] == 0x7c0004acu &&
 				ptr[1] == 0x00000000u &&
 				ptr[2] == BLR())
@@ -1762,7 +1125,7 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				continue;
 			}
 
-			if (const u32 len = ppu_test(ptr, get_ptr<void>(fend), ppu_patterns::abort))
+			if (const u32 len = ppu_test(ptr, fend, ppu_patterns::abort))
 			{
 				// Function "abort"
 				ppu_log.notice("Function [0x%x]: 'abort'", func.addr);
@@ -1780,58 +1143,33 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 		// Get function limit
 		const u32 func_end = std::min<u32>(get_limit(func.addr + 1), func.attr & ppu_attr::known_size ? func.addr + func.size : end);
 
-		auto& block_queue = block_queue_storage;
-		block_queue.clear();
-		u32 reg_tag_allocator = 1;
-
-		auto make_unknown_reg_state = [&]()
-		{
-			reg_state_t s{};
-			s.tag = reg_tag_allocator++;
-			return s;
-		};
+		// Block analysis workload
+		std::vector<std::reference_wrapper<std::pair<const u32, u32>>> block_queue;
 
 		// Add new block for analysis
-		auto add_block = [&](u32 addr, u32 parent_block) -> u32
+		auto add_block = [&](u32 addr) -> bool
 		{
 			if (addr < func.addr || addr >= func_end)
 			{
-				return umax;
+				return false;
 			}
 
 			const auto _pair = func.blocks.emplace(addr, 0);
 
 			if (_pair.second)
 			{
-				auto& block = block_queue.emplace_back(block_local_info_t{addr});
-				block.parent_block_idx = parent_block;
-	
-				if (parent_block != umax)
-				{
-					// Inherit loaded registers mask (lazily)
-					block.mapped_registers_mask.mask = ::at32(block_queue, parent_block).mapped_registers_mask.mask;
-				}
-
-				return static_cast<u32>(block_queue.size() - 1);
+				block_queue.emplace_back(*_pair.first);
+				return true;
 			}
 
-			return umax;
+			return false;
 		};
 
-		std::map<u32, u32> preserve_blocks;
-
-		if (is_function_caller_analysis)
-		{
-			preserve_blocks = std::move(func.blocks);
-			func.blocks.clear();
-			func.blocks.emplace(preserve_blocks.begin()->first, 0);
-		}
-
 		for (auto& block : func.blocks)
 		{
 			if (!block.second && block.first < func_end)
 			{
-				block_queue.emplace_back(block_local_info_t{block.first});
+				block_queue.emplace_back(block);
 			}
 		}
 
@@ -1845,137 +1183,28 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 			const u32 func_end2 = _next == fmap.end() ? func_end : std::min<u32>(_next->first, func_end);
 
 			// Set more block entries
-			std::for_each(addr_heap.lower_bound(func.addr), addr_heap.lower_bound(func_end2), [&](auto a) { add_block(a.first, umax); });
+			std::for_each(addr_heap.lower_bound(func.addr), addr_heap.lower_bound(func_end2), add_block);
 		}
 
-		bool postpone_analysis = false;
+		const bool was_empty = block_queue.empty();
 
 		// Block loop (block_queue may grow, may be aborted via clearing)
-		for (u32 j = 0; !postpone_analysis && j < block_queue.size(); [&]()
+		for (usz j = 0; j < block_queue.size(); j++)
 		{
-			if (u32 size = block_queue[j].size)
-			{
-				// Update size
-				func.blocks[block_queue[j].addr] = size;
-			}
+			auto& block = block_queue[j].get();
 
-			j++;
-		}())
-		{
-			block_local_info_t* block = &block_queue[j];
-
-			const u32 block_addr = block->addr;
-
-			vm::cptr<u32> _ptr = vm::cast(block_addr);
-			auto ptr = ensure(get_ptr<u32>(_ptr));
-
-			auto is_reg_mapped = [&](u32 index)
-			{
-				return !!(block_queue[j].mapped_registers_mask.mask & (u64{1} << index));
-			};
-
-			reg_state_t dummy_state{};
-
-			const auto get_reg = [&](usz index) -> reg_state_t&
-			{
-				block_local_info_t* block = &block_queue[j];
-
-				const usz reg_mask = u64{1} << index;
-
-				if (~block->moved_registers_mask.mask & reg_mask)
-				{
-					if ((j + 1) * 64 >= reg_state_storage.size())
-					{
-						dummy_state.value_range = 0;
-						dummy_state.tag = reg_tag_allocator++;
-						return dummy_state;
-					}
-
-					usz begin_block = umax;
-
-					// Try searching for register origin
-					if (block->mapped_registers_mask.mask & reg_mask)
-				 	{
-				 		for (u32 i = block->parent_block_idx; i != umax; i = block_queue[i].parent_block_idx)
-						{
-							if (~block_queue[i].moved_registers_mask.mask & reg_mask)
-							{
-								continue;
-							}
-
-							begin_block = i;
-							break;
-						}
-					}
-
-					// Initialize register or copy from origin
-					if (begin_block != umax)
-					{
-						reg_state_storage[64 * j + index] = reg_state_storage[64 * begin_block + index];
-					}
-					else
-					{
-						reg_state_storage[64 * j + index] = make_unknown_reg_state();
-					}
-
-					block->mapped_registers_mask.mask |= reg_mask;
-					block->moved_registers_mask.mask |= reg_mask;
-				}
-
-				return reg_state_storage[64 * j + index];
-			};
-
-			const auto store_block_reg = [&](u32 block_index, u32 index, const reg_state_t& rhs)
-			{
-				if ((block_index + 1) * 64 >= reg_state_storage.size())
-				{
-					return;
-				}
-
-				reg_state_storage[64 * block_index + index] = rhs;
-
-				const usz reg_mask = u64{1} << index;
-				block_queue[block_index].mapped_registers_mask.mask |= reg_mask;
-				block_queue[block_index].moved_registers_mask.mask |= reg_mask;
-			};
-
-			const auto unmap_reg = [&](u32 index)
-			{
-				block_local_info_t* block = &block_queue[j];
-
-				const usz reg_mask = u64{1} << index;
-
-				block->mapped_registers_mask.mask &= ~reg_mask;
-				block->moved_registers_mask.mask &= ~reg_mask;
-			};
-
-			enum : u32
-			{
-				c_reg_lr = 32,
-				c_reg_ctr = 33,
-				c_reg_vrsave = 34,
-				c_reg_xer = 35,
-				c_reg_cr0_arg_rhs = 36,
-				c_reg_cr7_arg_rhs = c_reg_cr0_arg_rhs + 7,
-				c_reg_cr0_arg_lhs = 44,
-				c_reg_cr7_arg_lhs = c_reg_cr0_arg_lhs + 7,
-			};
-
-			for (; _ptr.addr() < func_end;)
+			for (vm::cptr<u32> _ptr = vm::cast(block.first); _ptr.addr() < func_end;)
 			{
 				const u32 iaddr = _ptr.addr();
-				const ppu_opcode_t op{*advance(_ptr, ptr, 1)};
-				const ppu_itype::type type = g_ppu_itype.decode(op.opcode);
+				const ppu_opcode_t op{*_ptr++};
+				const ppu_itype::type type = s_ppu_itype.decode(op.opcode);
 
-				switch (type)
-				{
-				case ppu_itype::UNK:
+				if (type == ppu_itype::UNK)
 				{
 					// Invalid blocks will remain empty
 					break;
 				}
-				case ppu_itype::B:
-				case ppu_itype::BC:
+				else if (type == ppu_itype::B || type == ppu_itype::BC)
 				{
 					const u32 target = (op.aa ? 0 : iaddr) + (type == ppu_itype::B ? +op.bt24 : +op.bt14);
 
@@ -1985,136 +1214,20 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 						continue;
 					}
 
-					if (!op.aa && target == _ptr.addr() && _ptr.addr() < func_end)
-					{
-						(!!op.lk ? ppu_log.notice : ppu_log.trace)("[0x%x] Branch to next at 0x%x -> 0x%x", func.addr, iaddr, target);
-					}
-
-					const bool is_call = op.lk && target != iaddr && target != _ptr.addr() && _ptr.addr() < func_end;
+					const bool is_call = op.lk && target != iaddr;
 					const auto pfunc = is_call ? &add_func(target, 0, 0) : nullptr;
 
-					if (pfunc && pfunc->blocks.empty() && !is_function_caller_analysis)
+					if (pfunc && pfunc->blocks.empty())
 					{
 						// Postpone analysis (no info)
-						postpone_analysis = true;
+						block_queue.clear();
 						break;
 					}
 
-					if (is_function_caller_analysis && is_call && !(pfunc->attr & ppu_attr::no_return))
-					{
-						while (is_function_caller_analysis)
-						{
-							// Verify that it is the call to the imported function (may be more than one)
-							const auto it = stub_addr_to_constant_state_of_registers.lower_bound(target);
-
-							if (it == stub_addr_to_constant_state_of_registers.end())
-							{
-								break;
-							}
-
-							const auto next_func = fmap.upper_bound(it->first);
-
-							if (next_func == fmap.begin())
-							{
-								break;
-							}
-
-							const auto stub_func = std::prev(next_func);
-
-							if (stub_func->first == target)
-							{
-								// It is
-								// Now, mine register state
-								// Currently only of R3
-
-								if (is_reg_mapped(3))
-								{
-									const reg_state_t& value = get_reg(3);
-
-									if (value(is_const))
-									{
-										it->second.emplace_back(ppua_reg_mask_t{ 1u << 3 }, value(minv) );
-									}
-								}
-							}
-
-							break;
-						}
-					}
-
 					// Add next block if necessary
 					if ((is_call && !(pfunc->attr & ppu_attr::no_return)) || (type == ppu_itype::BC && (op.bo & 0x14) != 0x14))
 					{
-						const u32 next_idx = add_block(_ptr.addr(), j);
-
-						if (next_idx != umax && target != iaddr + 4 && type == ppu_itype::BC && (op.bo & 0b10100) == 0b00100)
-						{
-							bool lt{};
-							bool gt{};
-							bool eq{};
-							bool so{};
-							bool nso{};
-
-							// Because this is the following instruction, reverse the flags
-							if ((op.bo & 0b01000) != 0)
-							{
-								switch (op.bi % 4)
-								{
-								case 0x0: gt = true; eq = true; break;
-								case 0x1: lt = true; eq = true; break;
-								case 0x2: gt = true; lt = true; break;
-								case 0x3: nso = true; break;
-								default: fmt::throw_exception("Unreachable");
-								}
-							}
-							else
-							{
-								switch (op.bi % 4)
-								{
-								case 0x0: lt = true; break;
-								case 0x1: gt = true; break;
-								case 0x2: eq = true; break;
-								case 0x3: so = true; break;
-								default: fmt::throw_exception("Unreachable");
-								}
-							}
-
-							const u32 rhs_cr_state = c_reg_cr0_arg_rhs + op.bi / 4;
-							const u32 lhs_cr_state = c_reg_cr0_arg_lhs + op.bi / 4;
-
-							// Complete the block information based on the data that the jump is NOT taken
-							// This information would be inherited to next block
-
-							auto lhs_state = get_reg(lhs_cr_state);
-							auto rhs_state = get_reg(rhs_cr_state);
-
-							lhs_state.declare_ordering(rhs_state, lt, eq, gt, so, nso);
-
-							store_block_reg(next_idx, lhs_cr_state, lhs_state);
-							store_block_reg(next_idx, rhs_cr_state, rhs_state);
-
-							const u64 reg_mask = block_queue[j].mapped_registers_mask.mask;
-
-							for (u32 bit = std::countr_zero(reg_mask); bit < 64 && reg_mask & (u64{1} << bit);
-								bit += 1, bit = std::countr_zero(reg_mask >> (bit % 64)) + bit)
-							{
-								if (bit == lhs_cr_state || bit == rhs_cr_state)
-								{
-									continue;
-								}
-
-								auto& reg_state = get_reg(bit);
-
-								if (reg_state.is_equals(lhs_state))
-								{
-									store_block_reg(next_idx, bit, lhs_state);
-								}
-								else if (reg_state.is_equals(rhs_state))
-								{
-									store_block_reg(next_idx, bit, rhs_state);
-								}
-							}
-						}
+						add_block(_ptr.addr());
 					}
 
 					if (is_call && pfunc->attr & ppu_attr::no_return)
@@ -2124,139 +1237,58 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 					else if (is_call || target < func.addr || target >= func_end)
 					{
 						// Add function call (including obvious tail call)
-						add_func(target, 0, func.addr);
+						add_func(target, 0, 0);
 					}
 					else
 					{
 						// Add block
-						add_block(target, umax);
+						add_block(target);
 					}
 
-					block_queue[j].size = _ptr.addr() - block_addr;
+					block.second = _ptr.addr() - block.first;
 					break;
 				}
-				case ppu_itype::BCLR:
+				else if (type == ppu_itype::BCLR)
 				{
 					if (op.lk || (op.bo & 0x14) != 0x14)
 					{
-						add_block(_ptr.addr(), j);
+						add_block(_ptr.addr());
 					}
 
-					block_queue[j].size = _ptr.addr() - block_addr;
+					block.second = _ptr.addr() - block.first;
 					break;
 				}
-				case ppu_itype::BCCTR:
+				else if (type == ppu_itype::BCCTR)
 				{
 					if (op.lk || (op.bo & 0x10) != 0x10)
 					{
-						add_block(_ptr.addr(), j);
-					}
-					else if (get_reg(c_reg_ctr)(is_const))
-					{
-						ppu_log.todo("[0x%x] BCTR to constant destination at 0x%x: 0x%x", func.addr, iaddr, get_reg(c_reg_ctr)(minv));
+						add_block(_ptr.addr());
 					}
 					else
 					{
 						// Analyse jumptable (TODO)
-						u32 jt_addr = _ptr.addr();
-						u32 jt_end = func_end;
-						const auto code_end = get_ptr<u32>(func_end);
+						const u32 jt_addr = _ptr.addr();
+						const u32 jt_end = func_end;
 
-						auto get_jumptable_end = [&](vm::cptr<u32>& _ptr, be_t<u32>*& ptr, bool is_relative)
+						for (; _ptr.addr() < jt_end; _ptr++)
 						{
-							for (; _ptr.addr() < jt_end; advance(_ptr, ptr, 1))
+							const u32 addr = jt_addr + *_ptr;
+
+							if (addr == jt_addr)
 							{
-								const u32 addr = (is_relative ? jt_addr : 0) + *ptr;
-
-								if (addr == jt_addr)
-								{
-									// TODO (cannot branch to jumptable itself)
-									return;
-								}
-
-								if (addr % 4 || addr < func.addr || addr >= func_end || !is_valid_code({ get_ptr<u32>(addr), code_end }, !is_relocatable, addr))
-								{
-									return;
-								}
-
-								add_block(addr, j);
+								// TODO (cannot branch to jumptable itself)
+								break;
 							}
-						};
 
-						get_jumptable_end(_ptr, ptr, true);
-
-						bool found_jt = jt_addr == jt_end || _ptr.addr() != jt_addr;
-
-						if (!found_jt && is_reg_mapped(c_reg_ctr))
-						{
-							// Fallback: try to extract jumptable address from registers
-							const reg_state_t ctr = get_reg(c_reg_ctr);
-
-							if (ctr.is_loaded)
+							if (addr % 4 || addr < func.addr || addr >= jt_end)
 							{
-								vm::cptr<u32> jumpatble_off = vm::cast(static_cast<u32>(ctr(load_addrv)));
-
-								if (be_t<u32>* jumpatble_ptr_begin = get_ptr<u32>(jumpatble_off))
-								{
-									be_t<u32>* jumpatble_ptr = jumpatble_ptr_begin;
-
-									jt_addr = jumpatble_off.addr();
-
-									jt_end = segs_end;
-
-									for (const auto& seg : segs)
-									{
-										if (seg.size)
-										{
-											if (jt_addr < seg.addr + seg.size && jt_addr >= seg.addr)
-											{
-												jt_end = seg.addr + seg.size;
-												break;
-											}
-										}
-									}
-
-									jt_end = utils::align<u32>(static_cast<u32>(std::min<u64>(jt_end - 1, ctr(maxv) - 1) + 1), 4);
-
-									get_jumptable_end(jumpatble_off, jumpatble_ptr, false);
-
-									// If we do not have jump-table bounds, try manually extract reference address (last resort: may be inaccurate in theory)
-									if (jumpatble_ptr == jumpatble_ptr_begin && addr_heap.contains(_ptr.addr()))
-									{
-										// See who is referencing it
-										const u32 ref_addr = addr_heap.at(_ptr.addr());
-
-										if (ref_addr > jt_addr && ref_addr < jt_end)
-										{
-											ppu_log.todo("[0x%x] Jump table not found through GPR search, retrying using addr_heap. (iaddr=0x%x, ref_addr=0x%x)", func.addr, iaddr, ref_addr);
-
-											jumpatble_off = vm::cast(ref_addr);
-											jumpatble_ptr_begin = get_ptr<u32>(jumpatble_off);
-											jumpatble_ptr = jumpatble_ptr_begin;
-											jt_addr = ref_addr;
-
-											get_jumptable_end(jumpatble_off, jumpatble_ptr, false);
-										}
-									}
-
-									if (jumpatble_ptr != jumpatble_ptr_begin)
-									{
-										found_jt = true;
-
-										for (be_t<u32> addr : std::span<const be_t<u32>>{ jumpatble_ptr_begin , jumpatble_ptr })
-										{
-											if (addr == _ptr.addr())
-											{
-												ppu_log.success("[0x%x] Found address of next code in jump table at 0x%x! 0x%x-0x%x", func.addr, iaddr, jt_addr, jt_addr + 4 * (jumpatble_ptr - jumpatble_ptr_begin));
-												break;
-											}
-										}
-									}
-								}
+								break;
 							}
+
+							add_block(addr);
 						}
 
-						if (!found_jt)
+						if (jt_addr != jt_end && _ptr.addr() == jt_addr)
 						{
 							// Acknowledge jumptable detection failure
 							if (!(func.attr & ppu_attr::no_size))
@@ -2265,8 +1297,8 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 							}
 
 							func.attr += ppu_attr::no_size;
-							add_block(jt_addr, j);
-							postpone_analysis = true;
+							add_block(jt_addr);
+							block_queue.clear();
 						}
 						else
 						{
@@ -2274,358 +1306,37 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 						}
 					}
 
-					block_queue[j].size = _ptr.addr() - block_addr;
+					block.second = _ptr.addr() - block.first;
 					break;
 				}
-				case ppu_itype::TD:
-				case ppu_itype::TW:
-				case ppu_itype::TDI:
-				case ppu_itype::TWI:
+				else if (type == ppu_itype::TW || type == ppu_itype::TWI || type == ppu_itype::TD || type == ppu_itype::TDI)
 				{
-					if (!op.bo)
+					if (op.opcode != ppu_instructions::TRAP())
 					{
-						// No-op
-						continue;
+						add_block(_ptr.addr());
 					}
 
-					if (can_trap_continue(op, type))
-					{
-						add_block(_ptr.addr(), j);
-					}
-
-					block_queue[j].size = _ptr.addr() - block_addr;
+					block.second = _ptr.addr() - block.first;
 					break;
 				}
-				case ppu_itype::SC:
+				else if (type == ppu_itype::SC)
 				{
-					add_block(_ptr.addr(), j);
-					block_queue[j].size = _ptr.addr() - block_addr;
+					add_block(_ptr.addr());
+					block.second = _ptr.addr() - block.first;
 					break;
 				}
-				case ppu_itype::STDU:
+				else if (type == ppu_itype::STDU && func.attr & ppu_attr::no_size && (op.opcode == *_ptr || *_ptr == ppu_instructions::BLR()))
 				{
-					if (func.attr & ppu_attr::no_size && (op.opcode == *ptr || *ptr == ppu_instructions::BLR()))
-					{
-						// Hack
-						ppu_log.success("[0x%x] Instruction repetition: 0x%08x", iaddr, op.opcode);
-						add_block(_ptr.addr(), j);
-						block_queue[j].size = _ptr.addr() - block_addr;
-					}
-
-					continue;
+					// Hack
+					ppu_log.success("[0x%x] Instruction repetition: 0x%08x", iaddr, op.opcode);
+					add_block(_ptr.addr());
+					block.second = _ptr.addr() - block.first;
+					break;
 				}
-				case ppu_itype::ADDI:
-				case ppu_itype::ADDIC:
-				case ppu_itype::ADDIS:
-				{
-					const s64 to_add = type == ppu_itype::ADDIS ? op.simm16 * 65536 : op.simm16;
-
-					const reg_state_t ra = type == ppu_itype::ADDIC || op.ra ? get_reg(op.ra) : s_reg_const_0;
-
-					if (ra(is_const))
-					{
-						reg_state_t rd{};
-						rd.load_const(ra(minv) + to_add);
-						store_block_reg(j, op.rd, rd);
-					}
-					else
-					{
-						unmap_reg(op.rd);
-					}
-
-					continue;
-				}
-				case ppu_itype::ORI:
-				case ppu_itype::ORIS:
-				{
-					const u64 to_or = type == ppu_itype::ORIS ? op.uimm16 * 65536 : op.uimm16;
-
-					const reg_state_t rs = get_reg(op.rs);
-
-					if (!to_or && is_reg_mapped(op.rs))
-					{
-						store_block_reg(j, op.ra, get_reg(op.rs));
-					}
-					else if (rs(is_const))
-					{
-						reg_state_t ra{};
-						ra.load_const(rs(minv) | to_or);
-						store_block_reg(j, op.ra, ra);
-					}
-					else
-					{
-						unmap_reg(op.ra);
-					}
-
-					continue;
-				}
-				case ppu_itype::MTSPR:
-				{
-					const u32 spr_idx = (op.spr >> 5) | ((op.spr & 0x1f) << 5);
-
-					switch (spr_idx)
-					{
-					case 0x001: // MTXER
-					{
-						break;
-					}
-					case 0x008: // MTLR
-					{
-						//store_block_reg(j, c_reg_lr, get_reg(op.rs));
-						break;
-					}
-					case 0x009: // MTCTR
-					{
-						store_block_reg(j, c_reg_ctr, get_reg(op.rs));
-						break;
-					}
-					case 0x100:
-					{
-						// get_reg(c_reg_vrsave) = get_reg(op.rs);
-						// get_reg(c_reg_vrsave).value &= u32{umax};
-						break;
-					}
-					default:
-					{
-						break;
-					}
-					}
-
-					continue;
-				}
-				case ppu_itype::LWZ:
-				{
-					const bool is_load_from_toc = (is_function_caller_analysis && op.ra == 2u && func.toc && func.toc != umax);
-
-					if (is_load_from_toc || is_reg_mapped(op.rd) || is_reg_mapped(op.ra))
-					{
-						const reg_state_t ra = get_reg(op.ra);
-						auto& rd = get_reg(op.rd);
-
-						rd = {};
-						rd.tag = reg_tag_allocator++;
-						rd.is_loaded = true;
-
-						reg_state_t const_offs{};
-						const_offs.load_const(op.simm16);
-
-						reg_state_t toc_offset{};
-						toc_offset.load_const(func.toc);
-
-						const reg_state_t& off_ra = is_load_from_toc ? toc_offset : ra;
-
-						rd.ge_than = const_offs(minv);
-
-						const bool is_negative = const_offs(sign_bitv) == 1u;
-
-						const bool is_offset_test_ok = is_negative
-							? (0 - const_offs(minv) <= off_ra(minv) && off_ra(minv) + const_offs(minv) < segs_end)
-							: (off_ra(minv) < segs_end && const_offs(minv) < segs_end - off_ra(minv));
-
-						if (off_ra(minv) < off_ra(maxv) && is_offset_test_ok)
-						{
-							rd.ge_than += off_ra(minv);
-
-							const bool is_range_end_test_ok = is_negative
-								? (off_ra(maxv) + const_offs(minv) <= segs_end)
-								: (off_ra(maxv) - 1 < segs_end - 1 && const_offs(minv) <= segs_end - off_ra(maxv));
-
-							if (is_range_end_test_ok)
-							{
-								rd.value_range = off_ra.value_range;
-							}
-						}
-
-						if (is_load_from_toc)
-						{
-							if (rd.value_range == 1)
-							{
-								// Try to load a constant value from data segment
-								if (auto val_ptr = get_ptr<u32>(static_cast<u32>(rd.ge_than)))
-								{
-									rd = {};
-									rd.load_const(*val_ptr);
-								}
-							}
-						}
-					}
-
-					continue;
-				}
-				case ppu_itype::LWZX:
-				case ppu_itype::LDX: // TODO: Confirm if LDX can appear in jumptable branching (probably in LV1 applications such as ps2_emu)
-				{
-					if (is_reg_mapped(op.ra) || is_reg_mapped(op.rb))
-					{
-						const reg_state_t ra = get_reg(op.ra);
-						const reg_state_t rb = get_reg(op.rb);
-
-						const bool is_ra = ra(is_const) && (ra(minv) >= start && ra(minv) < segs_end);
-
-						if (ra(is_const) == rb(is_const))
-						{
-							unmap_reg(op.rd);
-						}
-						else
-						{
-							// Register possible jumptable offset
-							auto& rd = get_reg(op.rd);
-							rd = {};
-							rd.tag = reg_tag_allocator++;
-							rd.is_loaded = true;
-
-							const reg_state_t& const_reg = is_ra ? ra : rb;
-							const reg_state_t& off_reg = is_ra ? rb : ra;
-
-							rd.ge_than = const_reg(minv);
-
-							if (off_reg.value_range != 0 && off_reg(minv) < segs_end && const_reg(minv) < segs_end - off_reg(minv))
-							{
-								rd.ge_than += off_reg(minv);
-
-								if (off_reg(maxv) - 1 < segs_end - 1 && const_reg(minv) <= segs_end - off_reg(maxv))
-								{
-									rd.value_range = off_reg.value_range;
-								}
-							}
-						}
-					}
-
-					continue;
-				}
-				case ppu_itype::RLWINM:
-				{
-					//const u64 mask = ppu_rotate_mask(32 + op.mb32, 32 + op.me32);
-
-					if (!is_reg_mapped(op.rs) && !is_reg_mapped(op.ra))
-					{
-						continue;
-					}
-
-					if (op.mb32 <= op.me32 && op.sh32 == 31 - op.me32)
-					{
-						// SLWI mnemonic (mb32 == 0) or generic form
-
-						reg_state_t rs = get_reg(op.rs);
-
-						if (!rs.shift_left(op.sh32, reg_tag_allocator) || !rs.clear_higher_bits(32 + op.mb32, reg_tag_allocator))
-						{
-							unmap_reg(op.ra);
-						}
-						else
-						{
-							store_block_reg(j, op.ra, rs);
-						}
-					}
-					else
-					{
-						unmap_reg(op.ra);
-					}
-
-					continue;
-				}
-				case ppu_itype::RLDICR:
-				{
-					const u32 sh = op.sh64;
-					const u32 me = op.mbe64;
-					//const u64 mask = ~0ull << (63 - me);
-
-					if (sh == 63 - me)
-					{
-						// SLDI mnemonic
-						reg_state_t rs = get_reg(op.rs);
-
-						if (!rs.shift_left(op.sh32, reg_tag_allocator))
-						{
-							unmap_reg(op.ra);
-						}
-						else
-						{
-							store_block_reg(j, op.ra, rs);
-						}
-					}
-					else
-					{
-						unmap_reg(op.ra);
-					}
-
-					continue;
-				}
-				case ppu_itype::CMPLI:
-				case ppu_itype::CMPI:
-				case ppu_itype::CMP:
-				case ppu_itype::CMPL:
-				{
-					const bool is_wbits = op.l10 == 0;
-					const bool is_signed = type == ppu_itype::CMPI || type == ppu_itype::CMP;
-					const bool is_rhs_register = type == ppu_itype::CMP || type == ppu_itype::CMPL;
-
-					reg_state_t rhs{};
-					reg_state_t lhs{};
-
-					lhs = get_reg(op.ra);
-
-					if (is_rhs_register)
-					{
-						rhs = get_reg(op.rb);
-					}
-					else
-					{
-						const u64 compared = is_signed ? op.simm16 : op.uimm16;
-						rhs.load_const(is_wbits ? (compared & u32{umax}) : compared);
-					}
-
-					if (is_wbits)
-					{
-						lhs.undef_higher_bits(32);
-						rhs.undef_higher_bits(32);
-					}
-
-					if (is_signed)
-					{
-						// Force the comparison to become unsigned
-						// const u64 sign_bit = u64{1} << (is_wbits ? 31 : 63);
-						// lhs.add(sign_bit);
-						// rhs.add(sign_bit);
-					}
-
-					const u32 cr_idx = op.crfd;
-					store_block_reg(j, c_reg_cr0_arg_rhs + cr_idx, rhs);
-					store_block_reg(j, c_reg_cr0_arg_lhs + cr_idx, lhs);
-					continue;
-				}
-				default:
-				{
-					if (type & ppu_itype::store)
-					{
-						continue;
-					}
-
-					// TODO: Tell if instruction modified RD or RA
-					unmap_reg(op.rd);
-					unmap_reg(op.ra);
-					continue;
-				}
-				}
-
-				break;
 			}
 		}
 
-		if (!preserve_blocks.empty())
-		{
-			ensure(func.blocks.size() == preserve_blocks.size());
-
-			for (auto fit = func.blocks.begin(), pit = preserve_blocks.begin(); fit != func.blocks.end(); fit++, pit++)
-			{
-				// Ensure block addresses match
-				ensure(fit->first == pit->first);
-			}
-
-			func.blocks = std::move(preserve_blocks);
-		}
-
-		if (postpone_analysis)
+		if (block_queue.empty() && !was_empty)
 		{
 			// Block aborted: abort function, postpone
 			func_queue.emplace_back(func);
@@ -2674,17 +1385,18 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 			for (vm::cptr<u32> _ptr = vm::cast(block.first); _ptr.addr() < block.first + block.second;)
 			{
 				const u32 iaddr = _ptr.addr();
-				const ppu_opcode_t op{get_ref<u32>(_ptr++)};
-				const ppu_itype::type type = g_ppu_itype.decode(op.opcode);
+				const ppu_opcode_t op{*_ptr++};
+				const ppu_itype::type type = s_ppu_itype.decode(op.opcode);
 
 				if (type == ppu_itype::B || type == ppu_itype::BC)
 				{
 					const u32 target = (op.aa ? 0 : iaddr) + (type == ppu_itype::B ? +op.bt24 : +op.bt14);
 
-					if (target >= start && target < end && (!op.aa || verify_ref(iaddr)))
+					if (target >= start && target < end)
 					{
 						if (target < func.addr || target >= func.addr + func.size)
 						{
+							func.calls.emplace(target);
 							add_func(target, func.toc ? func.toc + func.trampoline : 0, func.addr);
 						}
 					}
@@ -2747,15 +1459,14 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 		for (vm::cptr<u32> _ptr = vm::cast(start); _ptr.addr() < next;)
 		{
 			const u32 addr = _ptr.addr();
-			const ppu_opcode_t op{get_ref<u32>(_ptr++)};
-			const ppu_itype::type type = g_ppu_itype.decode(op.opcode);
+			const ppu_opcode_t op{*_ptr++};
+			const ppu_itype::type type = s_ppu_itype.decode(op.opcode);
 
 			if (type == ppu_itype::UNK)
 			{
 				break;
 			}
-
-			if (addr == start && op.opcode == ppu_instructions::NOP())
+			else if (addr == start && op.opcode == ppu_instructions::NOP())
 			{
 				if (start == func.addr + func.size)
 				{
@@ -2766,19 +1477,16 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				start += 4;
 				continue;
 			}
-
-			if (type == ppu_itype::SC && op.opcode != ppu_instructions::SC(0))
+			else if (type == ppu_itype::SC && op.opcode != ppu_instructions::SC(0))
 			{
 				break;
 			}
-
-			if (addr == start && op.opcode == ppu_instructions::BLR())
+			else if (addr == start && op.opcode == ppu_instructions::BLR())
 			{
 				start += 4;
 				continue;
 			}
-
-			if (type == ppu_itype::B || type == ppu_itype::BC)
+			else if (type == ppu_itype::B || type == ppu_itype::BC)
 			{
 				const u32 target = (op.aa ? 0 : addr) + (type == ppu_itype::B ? +op.bt24 : +op.bt14);
 
@@ -2816,7 +1524,7 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 		}
 	}
 
-	(fmap.empty() ? ppu_log.error : ppu_log.notice)("Function analysis: %zu functions (%zu enqueued)", fmap.size(), func_queue.size());
+	ppu_log.notice("Function analysis: %zu functions (%zu enqueued)", fmap.size(), func_queue.size());
 
 	// Decompose functions to basic blocks
 	if (!entry && !sec_end)
@@ -2825,26 +1533,9 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 		end = 0;
 	}
 
-	u32 per_instruction_bytes = 0;
-
-	// Iterate by address (fmap may grow)
-	for (u32 addr_next = start; addr_next != umax;)
+	for (auto&& [_, func] : as_rvalue(std::move(fmap)))
 	{
-		// Get next iterator
-		const auto it = fmap.lower_bound(addr_next);
-
-		if (it == fmap.end())
-		{
-			break;
-		}
-
-		// Save next function address as is as of this moment (ignoring added functions)
-		const auto it_next = std::next(it);
-		addr_next = it_next == fmap.end() ? u32{umax} : it_next->first;
-
-		const ppu_function_ext& func = it->second;
-
-		if (func.attr & ppu_attr::no_size && !is_relocatable)
+		if (func.attr & ppu_attr::no_size && entry)
 		{
 			// Disabled for PRX for now
 			const u32 lim = get_limit(func.addr);
@@ -2860,12 +1551,10 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				block.attr = ppu_attr::no_size;
 			}
 
-			per_instruction_bytes += utils::sub_saturate<u32>(lim, func.addr);
-			addr_next = std::max<u32>(addr_next, lim);
 			continue;
 		}
 
-		for (const auto& [addr, size] : func.blocks)
+		for (auto [addr, size] : func.blocks)
 		{
 			if (!size)
 			{
@@ -2883,7 +1572,7 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 			block.addr = addr;
 			block.size = size;
 			block.toc  = func.toc;
-			ppu_log.trace("Block __0x%x added (func=0x%x, size=0x%x, toc=0x%x)", block.addr, it->first, block.size, block.toc);
+			ppu_log.trace("Block __0x%x added (func=0x%x, size=0x%x, toc=0x%x)", block.addr, _, block.size, block.toc);
 
 			if (!entry && !sec_end)
 			{
@@ -2903,12 +1592,12 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 	for (auto& rel : this->relocs)
 	{
 		// Disabled (TODO)
-		//if (!vm::check_addr<4>(rel.addr))
+		if (1 || !vm::check_addr<4>(rel.addr))
 		{
 			continue;
 		}
 
-		const u32 target = get_ref<u32>(rel.addr);
+		const u32 target = vm::_ref<u32>(rel.addr);
 
 		if (target % 4 || target < start || target >= end)
 		{
@@ -2942,8 +1631,11 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 	u32 exp = start;
 	u32 lim = end;
 
-	// Start with full scan
-	block_queue.emplace_back(exp, lim);
+	// Start with full scan (disabled for PRX for now)
+	if (entry)
+	{
+		block_queue.emplace_back(exp, lim);
+	}
 
 	// Add entries from patches (on per-instruction basis)
 	for (u32 addr : applied)
@@ -2977,17 +1669,14 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 		{
 			u32 i_pos = exp;
 
-			u32 block_edges[16];
-			u32 edge_count = 0;
-
 			bool is_good = true;
 			bool is_fallback = true;
 
 			for (; i_pos < lim; i_pos += 4)
 			{
-				const ppu_opcode_t op{get_ref<u32>(i_pos)};
+				const u32 opc = vm::_ref<u32>(i_pos);
 
-				switch (auto type = g_ppu_itype.decode(op.opcode))
+				switch (auto type = s_ppu_itype.decode(opc))
 				{
 				case ppu_itype::UNK:
 				case ppu_itype::ECIWX:
@@ -2997,58 +1686,28 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 					is_good = false;
 					break;
 				}
-				case ppu_itype::TDI:
-				case ppu_itype::TWI:
-				{
-					if (op.bo && (op.ra == 1u || op.ra == 13u || op.ra == 2u))
-					{
-						// Non-user registers, checking them against a constant value makes no sense
-						is_good = false;
-						break;
-					}
-
-					[[fallthrough]];
-				}
 				case ppu_itype::TD:
+				case ppu_itype::TDI:
 				case ppu_itype::TW:
-				{
-					if (!op.bo)
-					{
-						continue;
-					}
-
-					if (!can_trap_continue(op, type))
-					{
-						is_fallback = false;
-					}
-
-					[[fallthrough]];
-				}
+				case ppu_itype::TWI:
 				case ppu_itype::B:
 				case ppu_itype::BC:
 				{
-					if (type == ppu_itype::B || (type == ppu_itype::BC && (op.bo & 0x14) == 0x14))
+					if (type == ppu_itype::B)
 					{
 						is_fallback = false;
 					}
 
 					if (type == ppu_itype::B || type == ppu_itype::BC)
 					{
-						if (type == ppu_itype::BC && (op.bo & 0x14) == 0x14 && op.bo & 0xB)
-						{
-							// Invalid form
-							is_good = false;
-							break;
-						}
-
-						if (entry == 0 && op.aa)
+						if (entry == 0 && ppu_opcode_t{opc}.aa)
 						{
 							// Ignore absolute branches in PIC (PRX)
 							is_good = false;
 							break;
 						}
 
-						const u32 target = (op.aa ? 0 : i_pos) + (type == ppu_itype::B ? +op.bt24 : +op.bt14);
+						const u32 target = (opc & 2 ? 0 : i_pos) + (type == ppu_itype::B ? +ppu_opcode_t{opc}.bt24 : +ppu_opcode_t{opc}.bt14);
 
 						if (target < segs[0].addr || target >= segs[0].addr + segs[0].size)
 						{
@@ -3057,46 +1716,9 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 							break;
 						}
 
-						const ppu_opcode_t test_op{get_ref<u32>(target)};
-						const auto type0 = g_ppu_itype.decode(test_op.opcode);
+						const auto found = fmap.find(target);
 
-						if (type0 == ppu_itype::UNK)
-						{
-							is_good = false;
-							break;
-						}
-
-						// Test another instruction just in case (testing more is unlikely to improve results by much)
-
-						if (type0 == ppu_itype::SC || (type0 & ppu_itype::trap && !can_trap_continue(test_op, type0)))
-						{
-							// May not be followed by a valid instruction
-						}
-						else if (!(type0 & ppu_itype::branch))
-						{
-							if (target + 4 >= segs[0].addr + segs[0].size)
-							{
-								is_good = false;
-								break;
-							}
-
-							const auto type1 = g_ppu_itype.decode(get_ref<u32>(target + 4));
-
-							if (type1 == ppu_itype::UNK)
-							{
-								is_good = false;
-								break;
-							}
-						}
-						else if (u32 target0 = (test_op.aa ? 0 : target) + (type0 == ppu_itype::B ? +test_op.bt24 : +test_op.bt14);
-							(type0 == ppu_itype::B || type0 == ppu_itype::BC) && (target0 < segs[0].addr || target0 >= segs[0].addr + segs[0].size))
-						{
-							// Sanity check
-							is_good = false;
-							break;
-						}
-
-						if (target != i_pos && !fmap.contains(target))
+						if (target != i_pos && found == fmap.cend())
 						{
 							if (block_set.count(target) == 0)
 							{
@@ -3113,44 +1735,27 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				case ppu_itype::BCLR:
 				case ppu_itype::SC:
 				{
-					if (type == ppu_itype::SC && op.opcode != ppu_instructions::SC(0) && op.opcode != ppu_instructions::SC(1))
+					if (type == ppu_itype::SC && opc != ppu_instructions::SC(0))
 					{
 						// Strict garbage filter
 						is_good = false;
 						break;
 					}
 
-					if (type == ppu_itype::BCCTR && op.opcode & 0xe000)
+					if (type == ppu_itype::BCCTR && opc & 0xe000)
 					{
 						// Garbage filter
 						is_good = false;
 						break;
 					}
 
-					if (type == ppu_itype::BCLR && op.opcode & 0xe000)
+					if (type == ppu_itype::BCLR && opc & 0xe000)
 					{
 						// Garbage filter
 						is_good = false;
 						break;
 					}
 
-					if (type == ppu_itype::BCCTR || type == ppu_itype::BCLR)
-					{
-						is_fallback = false;
-					}
-
-					if ((type & ppu_itype::branch && op.lk) || is_fallback)
-					{
-						// if farther instructions are valid: register all blocks
-						// Otherwise, register none (all or nothing)
-						if (edge_count < std::size(block_edges) && i_pos + 4 < lim)
-						{
-							block_edges[edge_count++] = i_pos + 4;
-							is_fallback = true; // Reset value
-							continue;
-						}
-					}
-
 					// Good block terminator found, add single block
 					break;
 				}
@@ -3164,32 +1769,6 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				break;
 			}
 
-			if (is_good)
-			{
-				// Special opting-out: range of "instructions" is likely to be embedded floats
-				// Test this by testing if the lower 23 bits are 0
-				vm::cptr<u32> _ptr = vm::cast(exp);
-				auto ptr = get_ptr<const u32>(_ptr);
-
-				bool ok = false;
-
-				for (u32 it = exp; it < std::min(i_pos + 4, lim); it += 4, advance(_ptr, ptr, 1))
-				{
-					const u32 value_of_supposed_opcode = *ptr;
-
-					if (value_of_supposed_opcode == ppu_instructions::NOP() || (value_of_supposed_opcode << (32 - 23)))
-					{
-						ok = true;
-						break;
-					}
-				}
-
-				if (!ok)
-				{
-					is_good = false;
-				}
-			}
-
 			if (i_pos < lim)
 			{
 				i_pos += 4;
@@ -3197,7 +1776,9 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 			else if (is_good && is_fallback && lim < end)
 			{
 				// Register fallback target
-				if (!fmap.contains(lim) && !block_set.contains(lim))
+				const auto found = fmap.find(lim);
+
+				if (found == fmap.cend() && block_set.count(lim) == 0)
 				{
 					ppu_log.trace("Block target found: 0x%x (i_pos=0x%x)", lim, i_pos);
 					block_queue.emplace_back(lim, 0);
@@ -3207,23 +1788,17 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 
 			if (is_good)
 			{
-				for (u32 it = 0, prev_addr = exp; it <= edge_count; it++)
+				auto& block = fmap[exp];
+
+				if (!block.addr)
 				{
-					const u32 block_end = it < edge_count ? block_edges[it] : i_pos;
-					const u32 block_begin = std::exchange(prev_addr, block_end);
+					block.addr = exp;
+					block.size = i_pos - exp;
+					ppu_log.trace("Block __0x%x added (size=0x%x)", block.addr, block.size);
 
-					auto& block = fmap[block_begin];
-
-					if (!block.addr)
+					if (get_limit(exp) == end)
 					{
-						block.addr = block_begin;
-						block.size = block_end - block_begin;
-						ppu_log.trace("Block __0x%x added (size=0x%x)", block.addr, block.size);
-
-						if (get_limit(block_begin) == end)
-						{
-							block.attr += ppu_attr::no_size;
-						}
+						block.attr += ppu_attr::no_size;
 					}
 				}
 			}
@@ -3244,12 +1819,11 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 	}
 
 	// Convert map to vector (destructive)
-	for (auto it = fmap.begin(); it != fmap.end(); it = fmap.begin())
+	for (auto&& [_, block] : as_rvalue(std::move(fmap)))
 	{
-		ppu_function_ext block = std::move(fmap.extract(it).mapped());
-
-		if (block.attr & ppu_attr::no_size && block.size > 4 && !used_fallback)
+		if (block.attr & ppu_attr::no_size && block.size > 4 && entry)
 		{
+			// Disabled for PRX for now
 			ppu_log.warning("Block 0x%x will be compiled on per-instruction basis (size=0x%x)", block.addr, block.size);
 
 			for (u32 addr = block.addr; addr < block.addr + block.size; addr += 4)
@@ -3258,21 +1832,1973 @@ bool ppu_module<lv2_obj>::analyse(u32 lib_toc, u32 entry, const u32 sec_end, con
 				i.addr = addr;
 				i.size = 4;
 				i.toc  = block.toc;
+				i.attr = ppu_attr::no_size;
 			}
 
-			per_instruction_bytes += block.size;
 			continue;
 		}
 
 		funcs.emplace_back(std::move(block));
 	}
 
-	if (per_instruction_bytes)
+	ppu_log.notice("Block analysis: %zu blocks (%zu enqueued)", funcs.size(), block_queue.size());
+}
+
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
+void ppu_acontext::UNK(ppu_opcode_t op)
+{
+	std::fill_n(gpr, 32, spec_gpr{});
+	ppu_log.error("Unknown/Illegal opcode: 0x%08x at 0x%x", op.opcode, cia);
+}
+
+void ppu_acontext::MFVSCR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::MTVSCR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VADDCUW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VADDFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VADDSBS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VADDSHS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VADDSWS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VADDUBM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VADDUBS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VADDUHM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VADDUHS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VADDUWM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VADDUWS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VAND(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VANDC(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VAVGSB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VAVGSH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VAVGSW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VAVGUB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VAVGUH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VAVGUW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCFSX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCFUX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCMPBFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCMPEQFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCMPEQUB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCMPEQUH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCMPEQUW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCMPGEFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCMPGTFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCMPGTSB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCMPGTSH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCMPGTSW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCMPGTUB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCMPGTUH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCMPGTUW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCTSXS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VCTUXS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VEXPTEFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VLOGEFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMADDFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMAXFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMAXSB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMAXSH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMAXSW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMAXUB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMAXUH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMAXUW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMHADDSHS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMHRADDSHS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMINFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMINSB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMINSH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMINSW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMINUB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMINUH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMINUW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMLADDUHM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMRGHB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMRGHH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMRGHW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMRGLB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMRGLH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMRGLW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMSUMMBM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMSUMSHM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMSUMSHS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMSUMUBM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMSUMUHM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMSUMUHS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMULESB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMULESH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMULEUB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMULEUH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMULOSB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMULOSH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMULOUB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VMULOUH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VNMSUBFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VNOR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VOR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VPERM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VPKPX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VPKSHSS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VPKSHUS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VPKSWSS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VPKSWUS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VPKUHUM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VPKUHUS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VPKUWUM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VPKUWUS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VREFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VRFIM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VRFIN(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VRFIP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VRFIZ(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VRLB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VRLH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VRLW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VRSQRTEFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSEL(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSL(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSLB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSLDOI(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSLH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSLO(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSLW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSPLTB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSPLTH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSPLTISB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSPLTISH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSPLTISW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSPLTW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSRAB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSRAH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSRAW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSRB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSRH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSRO(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSRW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUBCUW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUBFP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUBSBS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUBSHS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUBSWS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUBUBM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUBUBS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUBUHM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUBUHS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUBUWM(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUBUWS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUMSWS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUM2SWS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUM4SBS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUM4SHS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VSUM4UBS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VUPKHPX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VUPKHSB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VUPKHSH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VUPKLPX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VUPKLSB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VUPKLSH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::VXOR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::TDI(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::TWI(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::MULLI(ppu_opcode_t op)
+{
+	const s64 amin = gpr[op.ra].imin;
+	const s64 amax = gpr[op.ra].imax;
+
+	// Undef or mixed range (default)
+	s64 min = 0;
+	s64 max = -1;
+
+	// Special cases like powers of 2 and their negations are not handled
+	if (amin <= amax)
 	{
-		const bool error = per_instruction_bytes >= 200 && per_instruction_bytes / 4 >= utils::aligned_div<u32>(::size32(funcs), 128);
-		(error ? ppu_log.error : ppu_log.notice)("%d instructions will be compiled on per-instruction basis in total", per_instruction_bytes / 4);
+		min = amin * op.simm16;
+		max = amax * op.simm16;
+
+		// Check overflow
+		if (min >> 63 != utils::mulh64(amin, op.simm16) || max >> 63 != utils::mulh64(amax, op.simm16))
+		{
+			min = 0;
+			max = -1;
+		}
+		else if (min > max)
+		{
+			std::swap(min, max);
+		}
 	}
 
-	ppu_log.notice("Block analysis: %zu blocks (%zu enqueued)", funcs.size(), block_queue.size());
-	return true;
+	gpr[op.rd] = spec_gpr::range(min, max, gpr[op.ra].tz() + std::countr_zero<u64>(op.simm16));
 }
+
+void ppu_acontext::SUBFIC(ppu_opcode_t op)
+{
+	gpr[op.rd] = ~gpr[op.ra] + spec_gpr::fixed(op.simm16) + spec_gpr::fixed(1);
+}
+
+void ppu_acontext::CMPLI(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::CMPI(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::ADDIC(ppu_opcode_t op)
+{
+	gpr[op.rd] = gpr[op.ra] + spec_gpr::fixed(op.simm16);
+}
+
+void ppu_acontext::ADDI(ppu_opcode_t op)
+{
+	gpr[op.rd] = op.ra ? gpr[op.ra] + spec_gpr::fixed(op.simm16) : spec_gpr::fixed(op.simm16);
+}
+
+void ppu_acontext::ADDIS(ppu_opcode_t op)
+{
+	gpr[op.rd] = op.ra ? gpr[op.ra] + spec_gpr::fixed(op.simm16 * 65536) : spec_gpr::fixed(op.simm16 * 65536);
+}
+
+void ppu_acontext::BC(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::SC(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::B(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::MCRF(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::BCLR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::CRNOR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::CRANDC(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::ISYNC(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::CRXOR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::CRNAND(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::CRAND(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::CREQV(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::CRORC(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::CROR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::BCCTR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::RLWIMI(ppu_opcode_t op)
+{
+	const u64 mask = ppu_rotate_mask(32 + op.mb32, 32 + op.me32);
+
+	u64 min = gpr[op.rs].bmin;
+	u64 max = gpr[op.rs].bmax;
+
+	if (op.mb32 <= op.me32)
+	{
+		// 32-bit op, including mnemonics: INSLWI, INSRWI (TODO)
+		min = utils::rol32(static_cast<u32>(min), op.sh32) & mask;
+		max = utils::rol32(static_cast<u32>(max), op.sh32) & mask;
+	}
+	else
+	{
+		// Full 64-bit op with duplication
+		min = utils::rol64(static_cast<u32>(min) | min << 32, op.sh32) & mask;
+		max = utils::rol64(static_cast<u32>(max) | max << 32, op.sh32) & mask;
+	}
+
+	if (mask != umax)
+	{
+		// Insertion
+		min |= gpr[op.ra].bmin & ~mask;
+		max |= gpr[op.ra].bmax & ~mask;
+	}
+
+	gpr[op.rs] = spec_gpr::approx(min, max);
+}
+
+void ppu_acontext::RLWINM(ppu_opcode_t op)
+{
+	const u64 mask = ppu_rotate_mask(32 + op.mb32, 32 + op.me32);
+
+	u64 min = gpr[op.rs].bmin;
+	u64 max = gpr[op.rs].bmax;
+
+	if (op.mb32 <= op.me32)
+	{
+		if (op.sh32 == 0)
+		{
+			// CLRLWI, CLRRWI mnemonics
+			gpr[op.ra] = gpr[op.ra] & spec_gpr::fixed(mask);
+			return;
+		}
+		else if (op.mb32 == 0 && op.me32 == 31)
+		{
+			// ROTLWI, ROTRWI mnemonics
+		}
+		else if (op.mb32 == 0 && op.sh32 == 31 - op.me32)
+		{
+			// SLWI mnemonic
+		}
+		else if (op.me32 == 31 && op.sh32 == 32 - op.mb32)
+		{
+			// SRWI mnemonic
+		}
+		else if (op.mb32 == 0 && op.sh32 < 31 - op.me32)
+		{
+			// EXTLWI and other possible mnemonics
+		}
+		else if (op.me32 == 31 && 32 - op.sh32 < op.mb32)
+		{
+			// EXTRWI and other possible mnemonics
+		}
+
+		min = utils::rol32(static_cast<u32>(min), op.sh32) & mask;
+		max = utils::rol32(static_cast<u32>(max), op.sh32) & mask;
+	}
+	else
+	{
+		// Full 64-bit op with duplication
+		min = utils::rol64(static_cast<u32>(min) | min << 32, op.sh32) & mask;
+		max = utils::rol64(static_cast<u32>(max) | max << 32, op.sh32) & mask;
+	}
+
+	gpr[op.ra] = spec_gpr::approx(min, max);
+}
+
+void ppu_acontext::RLWNM(ppu_opcode_t op)
+{
+	const u64 mask = ppu_rotate_mask(32 + op.mb32, 32 + op.me32);
+
+	u64 min = gpr[op.rs].bmin;
+	u64 max = gpr[op.rs].bmax;
+
+	if (op.mb32 <= op.me32)
+	{
+		if (op.mb32 == 0 && op.me32 == 31)
+		{
+			// ROTLW mnemonic
+		}
+
+		// TODO
+		min = 0;
+		max = mask;
+	}
+	else
+	{
+		// Full 64-bit op with duplication
+		min = 0;
+		max = mask;
+	}
+
+	gpr[op.ra] = spec_gpr::approx(min, max);
+}
+
+void ppu_acontext::ORI(ppu_opcode_t op)
+{
+	gpr[op.ra] = gpr[op.rs] | spec_gpr::fixed(op.uimm16);
+}
+
+void ppu_acontext::ORIS(ppu_opcode_t op)
+{
+	gpr[op.ra] = gpr[op.rs] | spec_gpr::fixed(op.uimm16 << 16);
+}
+
+void ppu_acontext::XORI(ppu_opcode_t op)
+{
+	gpr[op.ra] = gpr[op.rs] ^ spec_gpr::fixed(op.uimm16);
+}
+
+void ppu_acontext::XORIS(ppu_opcode_t op)
+{
+	gpr[op.ra] = gpr[op.rs] ^ spec_gpr::fixed(op.uimm16 << 16);
+}
+
+void ppu_acontext::ANDI(ppu_opcode_t op)
+{
+	gpr[op.ra] = gpr[op.rs] & spec_gpr::fixed(op.uimm16);
+}
+
+void ppu_acontext::ANDIS(ppu_opcode_t op)
+{
+	gpr[op.ra] = gpr[op.rs] & spec_gpr::fixed(op.uimm16 << 16);
+}
+
+void ppu_acontext::RLDICL(ppu_opcode_t op)
+{
+	const u32 sh = op.sh64;
+	const u32 mb = op.mbe64;
+	const u64 mask = ~0ull >> mb;
+
+	u64 min = gpr[op.rs].bmin;
+	u64 max = gpr[op.rs].bmax;
+
+	if (64 - sh < mb)
+	{
+		// EXTRDI mnemonic
+	}
+	else if (64 - sh == mb)
+	{
+		// SRDI mnemonic
+	}
+	else if (sh == 0)
+	{
+		// CLRLDI mnemonic
+		gpr[op.ra] = gpr[op.rs] & spec_gpr::fixed(mask);
+		return;
+	}
+
+	min = utils::rol64(min, sh) & mask;
+	max = utils::rol64(max, sh) & mask;
+	gpr[op.ra] = spec_gpr::approx(min, max);
+}
+
+void ppu_acontext::RLDICR(ppu_opcode_t op)
+{
+	const u32 sh = op.sh64;
+	const u32 me = op.mbe64;
+	const u64 mask = ~0ull << (63 - me);
+
+	u64 min = gpr[op.rs].bmin;
+	u64 max = gpr[op.rs].bmax;
+
+	if (sh < 63 - me)
+	{
+		// EXTLDI mnemonic
+	}
+	else if (sh == 63 - me)
+	{
+		// SLDI mnemonic
+	}
+	else if (sh == 0)
+	{
+		// CLRRDI mnemonic
+		gpr[op.ra] = gpr[op.rs] & spec_gpr::fixed(mask);
+		return;
+	}
+
+	min = utils::rol64(min, sh) & mask;
+	max = utils::rol64(max, sh) & mask;
+	gpr[op.ra] = spec_gpr::approx(min, max);
+}
+
+void ppu_acontext::RLDIC(ppu_opcode_t op)
+{
+	const u32 sh = op.sh64;
+	const u32 mb = op.mbe64;
+	const u64 mask = ppu_rotate_mask(mb, 63 - sh);
+
+	u64 min = gpr[op.rs].bmin;
+	u64 max = gpr[op.rs].bmax;
+
+	if (mb == 0 && sh == 0)
+	{
+		gpr[op.ra] = gpr[op.rs];
+		return;
+	}
+	else if (mb <= 63 - sh)
+	{
+		// CLRLSLDI
+		//gpr[op.ra] = (gpr[op.rs] & spec_gpr::fixed(ppu_rotate_mask(0, sh + mb))) << spec_gpr::fixed(sh);
+		return;
+	}
+
+	min = utils::rol64(min, sh) & mask;
+	max = utils::rol64(max, sh) & mask;
+	gpr[op.ra] = spec_gpr::approx(min, max);
+}
+
+void ppu_acontext::RLDIMI(ppu_opcode_t op)
+{
+	const u32 sh = op.sh64;
+	const u32 mb = op.mbe64;
+	const u64 mask = ppu_rotate_mask(mb, 63 - sh);
+
+	u64 min = gpr[op.rs].bmin;
+	u64 max = gpr[op.rs].bmax;
+
+	if (mb == 0 && sh == 0)
+	{
+		// Copy
+	}
+	else if (mb <= 63 - sh)
+	{
+		// INSRDI mnemonic
+	}
+
+	min = utils::rol64(min, sh) & mask;
+	max = utils::rol64(max, sh) & mask;
+
+	if (mask != umax)
+	{
+		// Insertion
+		min |= gpr[op.ra].bmin & ~mask;
+		max |= gpr[op.ra].bmax & ~mask;
+	}
+
+	gpr[op.ra] = spec_gpr::approx(min, max);
+}
+
+void ppu_acontext::RLDCL(ppu_opcode_t op)
+{
+	const u32 mb = op.mbe64;
+	const u64 mask = ~0ull >> mb;
+
+	u64 min = gpr[op.rs].bmin;
+	u64 max = gpr[op.rs].bmax;
+
+	// TODO
+	min = 0;
+	max = mask;
+	gpr[op.ra] = spec_gpr::approx(min, max);
+}
+
+void ppu_acontext::RLDCR(ppu_opcode_t op)
+{
+	const u32 me = op.mbe64;
+	const u64 mask = ~0ull << (63 - me);
+
+	u64 min = gpr[op.rs].bmin;
+	u64 max = gpr[op.rs].bmax;
+
+	// TODO
+	min = 0;
+	max = mask;
+	gpr[op.ra] = spec_gpr::approx(min, max);
+}
+
+void ppu_acontext::CMP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::TW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LVSL(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LVEBX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::SUBFC(ppu_opcode_t op)
+{
+	gpr[op.rd] = ~gpr[op.ra] + gpr[op.rb] + spec_gpr::fixed(1);
+}
+
+void ppu_acontext::ADDC(ppu_opcode_t op)
+{
+	gpr[op.rd] = gpr[op.ra] + gpr[op.rb];
+}
+
+void ppu_acontext::MULHDU(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::MULHWU(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::MFOCRF(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LWARX(ppu_opcode_t op)
+{
+	gpr[op.rd] = spec_gpr::range(0, u32{umax});
+}
+
+void ppu_acontext::LDX(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LWZX(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::SLW(ppu_opcode_t op)
+{
+	gpr[op.ra].set_undef();
+}
+
+void ppu_acontext::CNTLZW(ppu_opcode_t op)
+{
+	gpr[op.ra].set_undef();
+}
+
+void ppu_acontext::SLD(ppu_opcode_t op)
+{
+	gpr[op.ra].set_undef();
+}
+
+void ppu_acontext::AND(ppu_opcode_t op)
+{
+	gpr[op.ra] = gpr[op.rs] & gpr[op.rb];
+}
+
+void ppu_acontext::CMPL(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LVSR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LVEHX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::SUBF(ppu_opcode_t op)
+{
+	gpr[op.rd] = ~gpr[op.ra] + gpr[op.rb] + spec_gpr::fixed(1);
+}
+
+void ppu_acontext::LDUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.rd].set_undef();
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::DCBST(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LWZUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.rd].set_undef();
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::CNTLZD(ppu_opcode_t op)
+{
+	gpr[op.ra].set_undef();
+}
+
+void ppu_acontext::ANDC(ppu_opcode_t op)
+{
+	gpr[op.ra] = gpr[op.rs] & ~gpr[op.rb];
+}
+
+void ppu_acontext::TD(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LVEWX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::MULHD(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::MULHW(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LDARX(ppu_opcode_t op)
+{
+	gpr[op.rd] = {};
+}
+
+void ppu_acontext::DCBF(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LBZX(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LVX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::NEG(ppu_opcode_t op)
+{
+	gpr[op.rd] = ~gpr[op.ra] + spec_gpr::fixed(1);
+}
+
+void ppu_acontext::LBZUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.rd].set_undef();
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::NOR(ppu_opcode_t op)
+{
+	gpr[op.ra] = ~(gpr[op.rs] | gpr[op.rb]);
+}
+
+void ppu_acontext::STVEBX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::SUBFE(ppu_opcode_t op)
+{
+	gpr[op.rd] = ~gpr[op.ra] + gpr[op.rb] + spec_gpr::range(0, 1);
+}
+
+void ppu_acontext::ADDE(ppu_opcode_t op)
+{
+	gpr[op.rd] = gpr[op.ra] + gpr[op.rb] + spec_gpr::range(0, 1);
+}
+
+void ppu_acontext::MTOCRF(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STDX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STWCX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STWX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STVEHX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STDUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::STWUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::STVEWX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::SUBFZE(ppu_opcode_t op)
+{
+	gpr[op.rd] = ~gpr[op.ra] + spec_gpr::range(0, 1);
+}
+
+void ppu_acontext::ADDZE(ppu_opcode_t op)
+{
+	gpr[op.rd] = gpr[op.ra] + spec_gpr::range(0, 1);
+}
+
+void ppu_acontext::STDCX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STBX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STVX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::SUBFME(ppu_opcode_t op)
+{
+	gpr[op.rd] = ~gpr[op.ra] + spec_gpr::fixed(-1) + spec_gpr::range(0, 1);
+}
+
+void ppu_acontext::MULLD(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::ADDME(ppu_opcode_t op)
+{
+	gpr[op.rd] = gpr[op.ra] + spec_gpr::fixed(-1) + spec_gpr::range(0, 1);
+}
+
+void ppu_acontext::MULLW(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::DCBTST(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STBUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::ADD(ppu_opcode_t op)
+{
+	gpr[op.rd] = gpr[op.ra] + gpr[op.rd];
+}
+
+void ppu_acontext::DCBT(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LHZX(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::EQV(ppu_opcode_t op)
+{
+	gpr[op.ra] = ~(gpr[op.rs] ^ gpr[op.rb]);
+}
+
+void ppu_acontext::ECIWX(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LHZUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.rd].set_undef();
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::XOR(ppu_opcode_t op)
+{
+	gpr[op.ra] = gpr[op.rs] ^ gpr[op.rb];
+}
+
+void ppu_acontext::MFSPR(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LWAX(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::DST(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LHAX(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LVXL(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::MFTB(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LWAUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.rd].set_undef();
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::DSTST(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LHAUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.rd].set_undef();
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::STHX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::ORC(ppu_opcode_t op)
+{
+	gpr[op.ra] = gpr[op.rs] | ~gpr[op.rb];
+}
+
+void ppu_acontext::ECOWX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STHUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::OR(ppu_opcode_t op)
+{
+	gpr[op.ra] = gpr[op.rs] | gpr[op.rb];
+}
+
+void ppu_acontext::DIVDU(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::DIVWU(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::MTSPR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::DCBI(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::NAND(ppu_opcode_t op)
+{
+	gpr[op.ra] = ~(gpr[op.rs] & gpr[op.rb]);
+}
+
+void ppu_acontext::STVXL(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::DIVD(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::DIVW(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LVLX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LDBRX(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LSWX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LWBRX(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LFSX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::SRW(ppu_opcode_t op)
+{
+	gpr[op.ra].set_undef();
+}
+
+void ppu_acontext::SRD(ppu_opcode_t op)
+{
+	gpr[op.ra].set_undef();
+}
+
+void ppu_acontext::LVRX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LSWI(ppu_opcode_t op)
+{
+	std::fill_n(gpr, 32, spec_gpr{});
+}
+
+void ppu_acontext::LFSUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::SYNC(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LFDX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LFDUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::STVLX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STDBRX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STSWX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STWBRX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STFSX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STVRX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STFSUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::STSWI(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STFDX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STFDUX(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::LVLXL(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LHBRX(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::SRAW(ppu_opcode_t op)
+{
+	gpr[op.ra].set_undef();
+}
+
+void ppu_acontext::SRAD(ppu_opcode_t op)
+{
+	gpr[op.ra].set_undef();
+}
+
+void ppu_acontext::LVRXL(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::DSS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::SRAWI(ppu_opcode_t op)
+{
+	gpr[op.ra].set_undef();
+}
+
+void ppu_acontext::SRADI(ppu_opcode_t op)
+{
+	gpr[op.ra].set_undef();
+}
+
+void ppu_acontext::EIEIO(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STVLXL(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STHBRX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::EXTSH(ppu_opcode_t op)
+{
+	gpr[op.ra].set_undef();
+}
+
+void ppu_acontext::STVRXL(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::EXTSB(ppu_opcode_t op)
+{
+	gpr[op.ra].set_undef();
+}
+
+void ppu_acontext::STFIWX(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::EXTSW(ppu_opcode_t op)
+{
+	gpr[op.ra].set_undef();
+}
+
+void ppu_acontext::ICBI(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::DCBZ(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LWZ(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LWZU(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.rd].set_undef();
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::LBZ(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LBZU(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.rd].set_undef();
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::STW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STWU(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::STB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STBU(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::LHZ(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LHZU(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.rd].set_undef();
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::LHA(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LHAU(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.rd].set_undef();
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::STH(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STHU(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::LMW(ppu_opcode_t op)
+{
+	std::fill_n(gpr, 32, spec_gpr{});
+}
+
+void ppu_acontext::STMW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LFS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LFSU(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::LFD(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::LFDU(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::STFS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STFSU(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::STFD(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STFDU(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::LD(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::LDU(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.rd].set_undef();
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::LWA(ppu_opcode_t op)
+{
+	gpr[op.rd].set_undef();
+}
+
+void ppu_acontext::STD(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::STDU(ppu_opcode_t op)
+{
+	const auto addr = gpr[op.ra] + gpr[op.rb];
+	gpr[op.ra] = addr;
+}
+
+void ppu_acontext::FDIVS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FSUBS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FADDS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FSQRTS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FRES(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FMULS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FMADDS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FMSUBS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FNMSUBS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FNMADDS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::MTFSB1(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::MCRFS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::MTFSB0(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::MTFSFI(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::MFFS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::MTFSF(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FCMPU(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FRSP(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FCTIW(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FCTIWZ(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FDIV(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FSUB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FADD(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FSQRT(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FSEL(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FMUL(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FRSQRTE(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FMSUB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FMADD(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FNMSUB(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FNMADD(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FCMPO(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FNEG(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FMR(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FNABS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FABS(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FCTID(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FCTIDZ(ppu_opcode_t op)
+{
+}
+
+void ppu_acontext::FCFID(ppu_opcode_t op)
+{
+}
+
+#include <random>
+
+const bool s_tes = []()
+{
+	return true;
+
+	std::mt19937_64 rnd{123};
+
+	for (u32 i = 0; i < 10000; i++)
+	{
+		ppu_acontext::spec_gpr r1, r2, r3;
+		r1 = ppu_acontext::spec_gpr::approx(rnd(), rnd());
+		r2 = ppu_acontext::spec_gpr::range(rnd(), rnd());
+		r3 = r1 | r2;
+
+		for (u32 j = 0; j < 10000; j++)
+		{
+			u64 v1 = rnd(), v2 = rnd();
+			v1 &= r1.mask();
+			v1 |= r1.ones();
+			if (!r2.test(v2))
+			{
+				v2 = r2.imin;
+			}
+
+			if (r1.test(v1) && r2.test(v2))
+			{
+				if (!r3.test(v1 | v2))
+				{
+					auto exp = ppu_acontext::spec_gpr::approx(r1.ones() & r2.ones(), r1.mask() & r2.mask());
+
+					ppu_log.error("ppu_acontext failure:"
+						"\n\tr1 = 0x%016x..0x%016x, 0x%016x:0x%016x"
+						"\n\tr2 = 0x%016x..0x%016x, 0x%016x:0x%016x"
+						"\n\tr3 = 0x%016x..0x%016x, 0x%016x:0x%016x"
+						"\n\tex = 0x%016x..0x%016x"
+						"\n\tv1 = 0x%016x, v2 = 0x%016x, v3 = 0x%016x",
+						r1.imin, r1.imax, r1.bmin, r1.bmax, r2.imin, r2.imax, r2.bmin, r2.bmax, r3.imin, r3.imax, r3.bmin, r3.bmax, exp.imin, exp.imax, v1, v2, v1 | v2);
+					break;
+				}
+			}
+		}
+	}
+
+	ppu_acontext::spec_gpr r1;
+	r1 = ppu_acontext::spec_gpr::range(0x13311, 0x1fe22);
+	r1 = r1 ^ ppu_acontext::spec_gpr::approx(0x000, 0xf00);
+	ppu_log.success("0x%x..0x%x", r1.imin, r1.imax);
+
+	return true;
+}();
diff --git a/rpcs3/Emu/Cell/PPUAnalyser.h b/rpcs3/Emu/Cell/PPUAnalyser.h
index 693ad8c7ea..4387eceae8 100644
--- a/rpcs3/Emu/Cell/PPUAnalyser.h
+++ b/rpcs3/Emu/Cell/PPUAnalyser.h
@@ -2,22 +2,20 @@
 
 #include <string>
 #include <map>
-#include <deque>
-#include <span>
+#include <set>
 #include "util/types.hpp"
-#include "util/asm.hpp"
-#include "util/to_endian.hpp"
+#include "util/endian.hpp"
 
 #include "Utilities/bit_set.h"
 #include "PPUOpcodes.h"
 
 // PPU Function Attributes
-enum class ppu_attr : u8
+enum class ppu_attr : u32
 {
+	known_addr,
 	known_size,
 	no_return,
 	no_size,
-	has_mfvscr,
 
 	__bitset_enum_max
 };
@@ -28,52 +26,15 @@ struct ppu_function
 	u32 addr = 0;
 	u32 toc = 0;
 	u32 size = 0;
+	bs_t<ppu_attr> attr{};
+
+	u32 stack_frame = 0;
+	u32 trampoline = 0;
 
 	std::map<u32, u32> blocks{}; // Basic blocks: addr -> size
-
-	struct iterator
-	{
-		const ppu_function* _this;
-		typename std::map<u32, u32>::const_iterator it;
-		usz index = 0;
-
-		std::pair<const u32, u32> operator*() const
-		{
-			return _this->blocks.empty() ? std::pair<const u32, u32>(_this->addr, _this->size) : *it;
-		}
-
-		iterator& operator++()
-		{
-			index++;
-
-			if (it != _this->blocks.end())
-			{
-				it++;
-			}
-
-			return *this;
-		}
-
-		bool operator==(const iterator& rhs) const noexcept
-		{
-			return it == rhs.it || (rhs.index == index && _this->blocks.empty());
-		}
-
-		bool operator!=(const iterator& rhs) const noexcept
-		{
-			return !operator==(rhs);
-		}
-	};
-
-	iterator begin() const
-	{
-		return iterator{this, blocks.begin()};
-	}
-
-	iterator end() const
-	{
-		return iterator{this, blocks.end(), 1};
-	}
+	std::set<u32> calls{}; // Set of called functions
+	std::set<u32> callers{};
+	std::string name{}; // Function name
 };
 
 // PPU Relocation Information
@@ -103,83 +64,30 @@ struct ppu_segment
 	u32 type;
 	u32 flags;
 	u32 filesz;
-	void* ptr{};
-};
-
-struct ppua_reg_mask_t
-{
-	u64 mask;
 };
 
 // PPU Module Information
-template <typename Type>
-struct ppu_module : public Type
+struct ppu_module
 {
-	using Type::Type;
-
-	ppu_module() noexcept = default;
+	ppu_module() = default;
 
 	ppu_module(const ppu_module&) = delete;
 
-	ppu_module(ppu_module&&) noexcept = default;
+	ppu_module(ppu_module&&) = default;
 
 	ppu_module& operator=(const ppu_module&) = delete;
 
-	ppu_module& operator=(ppu_module&&) noexcept = default;
+	ppu_module& operator=(ppu_module&&) = default;
 
-	uchar sha1[20]{}; // Hash
-	std::string name{}; // Filename
-	std::string path{}; // Filepath
+	uchar sha1[20]{};
+	std::string name{};
+	std::string path{};
 	s64 offset = 0; // Offset of file
-	mutable bs_t<ppu_attr> attr{}; // Shared module attributes
-	std::string cache{}; // Cache file path
-	std::vector<ppu_reloc> relocs{}; // Relocations
-	std::vector<ppu_segment> segs{}; // Segments
-	std::vector<ppu_segment> secs{}; // Segment sections
-	std::vector<ppu_function> funcs{}; // Function list
-	std::vector<u32> applied_patches; // Patch addresses
-	std::deque<std::shared_ptr<void>> allocations; // Segment memory allocations
-	std::map<u32, u32> addr_to_seg_index; // address->segment ordered translator map
-	ppu_module* parent = nullptr; // For compilation: refers to original structure (is whole, not partitioned) 
-	std::pair<u32, u32> local_bounds{0, u32{umax}}; // Module addresses range
-	std::shared_ptr<std::pair<u32, u32>> jit_bounds; // JIT instance modules addresses range
-	std::unordered_map<u32, void*> imports; // Imports information for release upon unload (TODO: OVL implementation!) 
-	std::map<u32, std::vector<std::pair<ppua_reg_mask_t, u64>>> stub_addr_to_constant_state_of_registers; // Tells possible constant states of registers of functions
-	bool is_relocatable = false; // Is code relocatable(?)
-
-	template <typename T>
-	auto as_span(T&& arg, bool bound_local, bool bound_jit) const
-	{
-		using unref = std::remove_reference_t<T>;
-		using type = std::conditional_t<std::is_const_v<unref>, std::add_const_t<typename unref::value_type>, typename unref::value_type>;
-
-		if (bound_local || bound_jit)
-		{
-			// Return span bound to specified bounds
-			const auto [min_addr, max_addr] = bound_jit ? *jit_bounds : local_bounds;
-			constexpr auto compare = [](const type& a, u32 addr) { return a.addr < addr; };
-			const auto end = arg.data() + arg.size();
-			const auto start = std::lower_bound(arg.data(), end, min_addr, compare);
-			return std::span<type>{ start, std::lower_bound(start, end, max_addr, compare) };
-		}
-
-		return std::span<type>(arg.data(), arg.size());
-	}
-
-	auto get_funcs(bool bound_local = true, bool bound_jit = false)
-	{
-		return as_span(parent ? parent->funcs : funcs, bound_local, bound_jit);
-	}
-
-	auto get_funcs(bool bound_local = true, bool bound_jit = false) const
-	{
-		return as_span(parent ? parent->funcs : funcs, bound_local, bound_jit);
-	}
-
-	auto get_relocs(bool bound_local = false) const
-	{
-		return as_span(parent ? parent->relocs : relocs, bound_local, false);
-	}
+	std::string cache{};
+	std::vector<ppu_reloc> relocs{};
+	std::vector<ppu_segment> segs{};
+	std::vector<ppu_segment> secs{};
+	std::vector<ppu_function> funcs{};
 
 	// Copy info without functions
 	void copy_part(const ppu_module& info)
@@ -187,92 +95,13 @@ struct ppu_module : public Type
 		std::memcpy(sha1, info.sha1, sizeof(sha1));
 		name = info.name;
 		path = info.path;
+		relocs = info.relocs;
 		segs = info.segs;
-		allocations = info.allocations;
-		addr_to_seg_index = info.addr_to_seg_index;
-		parent = const_cast<ppu_module*>(&info);
-		attr = info.attr;
-		is_relocatable = info.is_relocatable;
-		local_bounds = {u32{umax}, 0}; // Initially empty range
+		secs = info.secs;
 	}
 
-	bool analyse(u32 lib_toc, u32 entry, u32 end, const std::vector<u32>& applied, const std::vector<u32>& exported_funcs = std::vector<u32>{}, std::function<bool()> check_aborted = {});
+	void analyse(u32 lib_toc, u32 entry, u32 end, const std::basic_string<u32>& applied);
 	void validate(u32 reloc);
-
-	template <typename T>
-	to_be_t<T>* get_ptr(u32 addr, u32 size_bytes) const
-	{
-		auto it = addr_to_seg_index.upper_bound(addr);
-
-		if (it == addr_to_seg_index.begin())
-		{
-			return nullptr;
-		}
-
-		it--;
-
-		const auto& seg = segs[it->second];
-		const u32 seg_size = seg.size;
-		const u32 seg_addr = seg.addr;
-
-		if (seg_size >= std::max<usz>(size_bytes, 1) && addr <= utils::align<u32>(seg_addr + seg_size, 0x10000) - size_bytes)
-		{
-			return reinterpret_cast<to_be_t<T>*>(static_cast<u8*>(seg.ptr) + (addr - seg_addr));
-		}
-
-		return nullptr;
-	}
-
-	template <typename T>
-	to_be_t<T>* get_ptr(u32 addr) const
-	{
-		constexpr usz size_element = std::is_void_v<T> ? 0 : sizeof(std::conditional_t<std::is_void_v<T>, char, T>);
-		return get_ptr<T>(addr, u32{size_element});
-	}
-
-	template <typename T, typename U> requires requires (const U& obj) { obj.get_ptr(); }
-	to_be_t<T>* get_ptr(U&& addr) const
-	{
-		constexpr usz size_element = std::is_void_v<T> ? 0 : sizeof(std::conditional_t<std::is_void_v<T>, char, T>);
-		return get_ptr<T>(addr.addr(), u32{size_element});
-	}
-
-	template <typename T>
-	to_be_t<T>& get_ref(u32 addr, std::source_location src_loc = std::source_location::current()) const
-	{
-		constexpr usz size_element = std::is_void_v<T> ? 0 : sizeof(std::conditional_t<std::is_void_v<T>, char, T>);
-		if (auto ptr = get_ptr<T>(addr, u32{size_element}))
-		{
-			return *ptr;
-		}
-
-		fmt::throw_exception("get_ref(): Failure! (addr=0x%x)%s", addr, src_loc);
-		return *std::add_pointer_t<to_be_t<T>>{};
-	}
-
-	template <typename T, typename U> requires requires (const U& obj) { obj.get_ptr(); }
-	to_be_t<T>& get_ref(U&& addr, u32 index = 0, std::source_location src_loc = std::source_location::current()) const
-	{
-		constexpr usz size_element = std::is_void_v<T> ? 0 : sizeof(std::conditional_t<std::is_void_v<T>, char, T>);
-		if (auto ptr = get_ptr<T>((addr + index).addr(), u32{size_element}))
-		{
-			return *ptr;
-		}
-
-		fmt::throw_exception("get_ref(): Failure! (addr=0x%x)%s", (addr + index).addr(), src_loc);
-		return *std::add_pointer_t<to_be_t<T>>{};
-	}
-};
-
-template <typename T>
-struct main_ppu_module : public ppu_module<T>
-{
-	u32 elf_entry{};
-	u32 seg0_code_end{};
-
-	// Disable inherited savestate ordering
-	void save(utils::serial&) = delete;
-	static constexpr double savestate_init_pos = double{};
 };
 
 // Aux
@@ -345,13 +174,7 @@ struct ppu_pattern_matrix
 // PPU Instruction Type
 struct ppu_itype
 {
-	static constexpr struct branch_tag{} branch{}; // Branch Instructions
-	static constexpr struct trap_tag{} trap{}; // Trap Instructions
-	static constexpr struct store_tag{} store{}; // Memory store Instructions
-	static constexpr struct load_tag{} load{}; // Memory load Instructions (TODO: Fill it)
-	static constexpr struct memory_tag{} memory{}; // Memory Instructions
-
-	enum class type
+	enum type
 	{
 		UNK = 0,
 
@@ -379,31 +202,18 @@ struct ppu_itype
 		VCFSX,
 		VCFUX,
 		VCMPBFP,
-		VCMPBFP_,
 		VCMPEQFP,
-		VCMPEQFP_,
 		VCMPEQUB,
-		VCMPEQUB_,
 		VCMPEQUH,
-		VCMPEQUH_,
 		VCMPEQUW,
-		VCMPEQUW_,
 		VCMPGEFP,
-		VCMPGEFP_,
 		VCMPGTFP,
-		VCMPGTFP_,
 		VCMPGTSB,
-		VCMPGTSB_,
 		VCMPGTSH,
-		VCMPGTSH_,
 		VCMPGTSW,
-		VCMPGTSW_,
 		VCMPGTUB,
-		VCMPGTUB_,
 		VCMPGTUH,
-		VCMPGTUH_,
 		VCMPGTUW,
-		VCMPGTUW_,
 		VCTSXS,
 		VCTUXS,
 		VEXPTEFP,
@@ -512,13 +322,20 @@ struct ppu_itype
 		VUPKLSB,
 		VUPKLSH,
 		VXOR,
+		TDI,
+		TWI,
 		MULLI,
 		SUBFIC,
+		CMPLI,
+		CMPI,
 		ADDIC,
 		ADDI,
 		ADDIS,
+		BC,
 		SC,
+		B,
 		MCRF,
+		BCLR,
 		CRNOR,
 		CRANDC,
 		ISYNC,
@@ -528,6 +345,7 @@ struct ppu_itype
 		CREQV,
 		CRORC,
 		CROR,
+		BCCTR,
 		RLWIMI,
 		RLWINM,
 		RLWNM,
@@ -543,12 +361,12 @@ struct ppu_itype
 		RLDIMI,
 		RLDCL,
 		RLDCR,
+		CMP,
+		TW,
 		LVSL,
 		LVEBX,
 		SUBFC,
-		SUBFCO,
 		ADDC,
-		ADDCO,
 		MULHDU,
 		MULHWU,
 		MFOCRF,
@@ -559,14 +377,16 @@ struct ppu_itype
 		CNTLZW,
 		SLD,
 		AND,
+		CMPL,
 		LVSR,
 		LVEHX,
 		SUBF,
-		SUBFO,
 		LDUX,
+		DCBST,
 		LWZUX,
 		CNTLZD,
 		ANDC,
+		TD,
 		LVEWX,
 		MULHD,
 		MULHW,
@@ -575,28 +395,32 @@ struct ppu_itype
 		LBZX,
 		LVX,
 		NEG,
-		NEGO,
 		LBZUX,
 		NOR,
+		STVEBX,
 		SUBFE,
-		SUBFEO,
 		ADDE,
-		ADDEO,
 		MTOCRF,
+		STDX,
+		STWCX,
+		STWX,
+		STVEHX,
+		STDUX,
+		STWUX,
+		STVEWX,
 		SUBFZE,
-		SUBFZEO,
 		ADDZE,
-		ADDZEO,
+		STDCX,
+		STBX,
+		STVX,
 		SUBFME,
-		SUBFMEO,
 		MULLD,
-		MULLDO,
 		ADDME,
-		ADDMEO,
 		MULLW,
-		MULLWO,
+		DCBTST,
+		STBUX,
 		ADD,
-		ADDO,
+		DCBT,
 		LHZX,
 		EQV,
 		ECIWX,
@@ -604,24 +428,26 @@ struct ppu_itype
 		XOR,
 		MFSPR,
 		LWAX,
+		DST,
 		LHAX,
 		LVXL,
 		MFTB,
 		LWAUX,
+		DSTST,
 		LHAUX,
+		STHX,
 		ORC,
 		ECOWX,
+		STHUX,
 		OR,
 		DIVDU,
-		DIVDUO,
 		DIVWU,
-		DIVWUO,
 		MTSPR,
+		DCBI,
 		NAND,
+		STVXL,
 		DIVD,
-		DIVDO,
 		DIVW,
-		DIVWO,
 		LVLX,
 		LDBRX,
 		LSWX,
@@ -632,34 +458,66 @@ struct ppu_itype
 		LVRX,
 		LSWI,
 		LFSUX,
+		SYNC,
 		LFDX,
 		LFDUX,
+		STVLX,
+		STDBRX,
+		STSWX,
+		STWBRX,
+		STFSX,
+		STVRX,
+		STFSUX,
+		STSWI,
+		STFDX,
+		STFDUX,
 		LVLXL,
 		LHBRX,
 		SRAW,
 		SRAD,
 		LVRXL,
+		DSS,
 		SRAWI,
 		SRADI,
+		EIEIO,
+		STVLXL,
+		STHBRX,
 		EXTSH,
+		STVRXL,
 		EXTSB,
+		STFIWX,
 		EXTSW,
+		ICBI,
+		DCBZ,
 		LWZ,
 		LWZU,
 		LBZ,
 		LBZU,
+		STW,
+		STWU,
+		STB,
+		STBU,
 		LHZ,
 		LHZU,
 		LHA,
 		LHAU,
+		STH,
+		STHU,
 		LMW,
+		STMW,
 		LFS,
 		LFSU,
 		LFD,
 		LFDU,
+		STFS,
+		STFSU,
+		STFD,
+		STFDU,
 		LD,
 		LDU,
 		LWA,
+		STD,
+		STDU,
 		FDIVS,
 		FSUBS,
 		FADDS,
@@ -699,211 +557,18 @@ struct ppu_itype
 		FCTID,
 		FCTIDZ,
 		FCFID,
-
-		SUBFCO_,
-		ADDCO_,
-		SUBFO_,
-		NEGO_,
-		SUBFEO_,
-		ADDEO_,
-		SUBFZEO_,
-		ADDZEO_,
-		SUBFMEO_,
-		MULLDO_,
-		ADDMEO_,
-		MULLWO_,
-		ADDO_,
-		DIVDUO_,
-		DIVWUO_,
-		DIVDO_,
-		DIVWO_,
-
-		RLWIMI_,
-		RLWINM_,
-		RLWNM_,
-		RLDICL_,
-		RLDICR_,
-		RLDIC_,
-		RLDIMI_,
-		RLDCL_,
-		RLDCR_,
-		SUBFC_,
-		MULHDU_,
-		ADDC_,
-		MULHWU_,
-		SLW_,
-		CNTLZW_,
-		SLD_,
-		AND_,
-		SUBF_,
-		CNTLZD_,
-		ANDC_,
-		MULHD_,
-		MULHW_,
-		NEG_,
-		NOR_,
-		SUBFE_,
-		ADDE_,
-		SUBFZE_,
-		ADDZE_,
-		MULLD_,
-		SUBFME_,
-		ADDME_,
-		MULLW_,
-		ADD_,
-		EQV_,
-		XOR_,
-		ORC_,
-		OR_,
-		DIVDU_,
-		DIVWU_,
-		NAND_,
-		DIVD_,
-		DIVW_,
-		SRW_,
-		SRD_,
-		SRAW_,
-		SRAD_,
-		SRAWI_,
-		SRADI_,
-		EXTSH_,
-		EXTSB_,
-		EXTSW_,
-		FDIVS_,
-		FSUBS_,
-		FADDS_,
-		FSQRTS_,
-		FRES_,
-		FMULS_,
-		FMADDS_,
-		FMSUBS_,
-		FNMSUBS_,
-		FNMADDS_,
-		MTFSB1_,
-		MTFSB0_,
-		MTFSFI_,
-		MFFS_,
-		MTFSF_,
-		FRSP_,
-		FCTIW_,
-		FCTIWZ_,
-		FDIV_,
-		FSUB_,
-		FADD_,
-		FSQRT_,
-		FSEL_,
-		FMUL_,
-		FRSQRTE_,
-		FMSUB_,
-		FMADD_,
-		FNMSUB_,
-		FNMADD_,
-		FNEG_,
-		FMR_,
-		FNABS_,
-		FABS_,
-		FCTID_,
-		FCTIDZ_,
-		FCFID_,
-
-		CMPLI,
-		CMPI,
-		CMP,
-		CMPL,
-
-		STMW, // store_tag first
-		STSWX,
-		STSWI,
-		STVXL,
-		STVLX,
-		STVRX,
-		STVEBX,
-		STVEHX,
-		STVEWX,
-		STVX,
-		STVLXL,
-		STVRXL,
-		STDX,
-		STDUX,
-		STDCX,
-		STDBRX,
-		STD,
-		STDU,
-		STFDUX,
-		STFDX,
-		STFDU,
-		STFD,
-		STFS,
-		STFSU,
-		STFSX,
-		STFSUX,
-		STFIWX,
-		STWCX,
-		STWX,
-		STWUX,
-		STWBRX,
-		STWU,
-		STW,
-		STHBRX,
-		STHX,
-		STHUX,
-		STH,
-		STBX,
-		STBU,
-		STB,
-		STHU,
-		STBUX,
-		DCBZ,
-		DCBI, // Perceive memory barrier or flag instructions as stores
-		DCBTST,
-		DCBT,
-		DCBST,
-		DST,
-		DSS,
-		ICBI,
-		SYNC,
-		EIEIO,
-		DSTST, // store_tag last
-
-		B, // branch_tag first
-		BC,
-		BCLR,
-		BCCTR, // branch_tag last
-
-		TD, // trap_tag first
-		TW,
-		TDI,
-		TWI, // trap_tag last
 	};
 
-	using enum type;
-
 	// Enable address-of operator for ppu_decoder<>
 	friend constexpr type operator &(type value)
 	{
 		return value;
 	}
-
-	friend constexpr bool operator &(type value, branch_tag)
-	{
-		return value >= B && value <= BCCTR;
-	}
-
-	friend constexpr bool operator &(type value, trap_tag)
-	{
-		return value >= TD && value <= TWI;
-	}
-
-	friend constexpr bool operator &(type value, store_tag)
-	{
-		return value >= STMW && value <= DSTST;
-	}
 };
 
 struct ppu_iname
 {
 #define NAME(x) static constexpr const char& x = *#x;
-#define NAME_(x) static constexpr const char& x##_ = *#x ".";
 	NAME(UNK)
 	NAME(MFVSCR)
 	NAME(MTVSCR)
@@ -929,31 +594,18 @@ struct ppu_iname
 	NAME(VCFSX)
 	NAME(VCFUX)
 	NAME(VCMPBFP)
-	NAME_(VCMPBFP)
 	NAME(VCMPEQFP)
-	NAME_(VCMPEQFP)
 	NAME(VCMPEQUB)
-	NAME_(VCMPEQUB)
 	NAME(VCMPEQUH)
-	NAME_(VCMPEQUH)
 	NAME(VCMPEQUW)
-	NAME_(VCMPEQUW)
 	NAME(VCMPGEFP)
-	NAME_(VCMPGEFP)
 	NAME(VCMPGTFP)
-	NAME_(VCMPGTFP)
 	NAME(VCMPGTSB)
-	NAME_(VCMPGTSB)
 	NAME(VCMPGTSH)
-	NAME_(VCMPGTSH)
 	NAME(VCMPGTSW)
-	NAME_(VCMPGTSW)
 	NAME(VCMPGTUB)
-	NAME_(VCMPGTUB)
 	NAME(VCMPGTUH)
-	NAME_(VCMPGTUH)
 	NAME(VCMPGTUW)
-	NAME_(VCMPGTUW)
 	NAME(VCTSXS)
 	NAME(VCTUXS)
 	NAME(VEXPTEFP)
@@ -1297,130 +949,740 @@ struct ppu_iname
 	NAME(FCTID)
 	NAME(FCTIDZ)
 	NAME(FCFID)
-
-	NAME(SUBFCO)
-	NAME(ADDCO)
-	NAME(SUBFO)
-	NAME(NEGO)
-	NAME(SUBFEO)
-	NAME(ADDEO)
-	NAME(SUBFZEO)
-	NAME(ADDZEO)
-	NAME(SUBFMEO)
-	NAME(MULLDO)
-	NAME(ADDMEO)
-	NAME(MULLWO)
-	NAME(ADDO)
-	NAME(DIVDUO)
-	NAME(DIVWUO)
-	NAME(DIVDO)
-	NAME(DIVWO)
-
-	NAME_(SUBFCO)
-	NAME_(ADDCO)
-	NAME_(SUBFO)
-	NAME_(NEGO)
-	NAME_(SUBFEO)
-	NAME_(ADDEO)
-	NAME_(SUBFZEO)
-	NAME_(ADDZEO)
-	NAME_(SUBFMEO)
-	NAME_(MULLDO)
-	NAME_(ADDMEO)
-	NAME_(MULLWO)
-	NAME_(ADDO)
-	NAME_(DIVDUO)
-	NAME_(DIVWUO)
-	NAME_(DIVDO)
-	NAME_(DIVWO)
-
-	NAME_(RLWIMI)
-	NAME_(RLWINM)
-	NAME_(RLWNM)
-	NAME_(RLDICL)
-	NAME_(RLDICR)
-	NAME_(RLDIC)
-	NAME_(RLDIMI)
-	NAME_(RLDCL)
-	NAME_(RLDCR)
-	NAME_(SUBFC)
-	NAME_(MULHDU)
-	NAME_(ADDC)
-	NAME_(MULHWU)
-	NAME_(SLW)
-	NAME_(CNTLZW)
-	NAME_(SLD)
-	NAME_(AND)
-	NAME_(SUBF)
-	NAME_(CNTLZD)
-	NAME_(ANDC)
-	NAME_(MULHD)
-	NAME_(MULHW)
-	NAME_(NEG)
-	NAME_(NOR)
-	NAME_(SUBFE)
-	NAME_(ADDE)
-	NAME_(SUBFZE)
-	NAME_(ADDZE)
-	NAME_(MULLD)
-	NAME_(SUBFME)
-	NAME_(ADDME)
-	NAME_(MULLW)
-	NAME_(ADD)
-	NAME_(EQV)
-	NAME_(XOR)
-	NAME_(ORC)
-	NAME_(OR)
-	NAME_(DIVDU)
-	NAME_(DIVWU)
-	NAME_(NAND)
-	NAME_(DIVD)
-	NAME_(DIVW)
-	NAME_(SRW)
-	NAME_(SRD)
-	NAME_(SRAW)
-	NAME_(SRAD)
-	NAME_(SRAWI)
-	NAME_(SRADI)
-	NAME_(EXTSH)
-	NAME_(EXTSB)
-	NAME_(EXTSW)
-	NAME_(FDIVS)
-	NAME_(FSUBS)
-	NAME_(FADDS)
-	NAME_(FSQRTS)
-	NAME_(FRES)
-	NAME_(FMULS)
-	NAME_(FMADDS)
-	NAME_(FMSUBS)
-	NAME_(FNMSUBS)
-	NAME_(FNMADDS)
-	NAME_(MTFSB1)
-	NAME_(MTFSB0)
-	NAME_(MTFSFI)
-	NAME_(MFFS)
-	NAME_(MTFSF)
-	NAME_(FRSP)
-	NAME_(FCTIW)
-	NAME_(FCTIWZ)
-	NAME_(FDIV)
-	NAME_(FSUB)
-	NAME_(FADD)
-	NAME_(FSQRT)
-	NAME_(FSEL)
-	NAME_(FMUL)
-	NAME_(FRSQRTE)
-	NAME_(FMSUB)
-	NAME_(FMADD)
-	NAME_(FNMSUB)
-	NAME_(FNMADD)
-	NAME_(FNEG)
-	NAME_(FMR)
-	NAME_(FNABS)
-	NAME_(FABS)
-	NAME_(FCTID)
-	NAME_(FCTIDZ)
-	NAME_(FCFID)
 #undef NAME
-#undef NAME_
+};
+
+// PPU Analyser Context
+struct ppu_acontext
+{
+	// General-purpose register range
+	struct spec_gpr
+	{
+		// Integral range: normalized undef = (0;UINT64_MAX), unnormalized undefs are possible (when max = min - 1)
+		// Bit range: constant 0 = (0;0), constant 1 = (1;1), normalized undef = (0;1), unnormalized undef = (1;0)
+
+		u64 imin = 0ull; // Integral range begin
+		u64 imax = ~0ull; // Integral range end
+		u64 bmin = 0ull; // Bit range begin
+		u64 bmax = ~0ull; // Bit range end
+
+		void set_undef()
+		{
+			imin = 0;
+			imax = -1;
+			bmin = 0;
+			bmax = -1;
+		}
+
+		// (Number of possible values - 1), 0 = const
+		u64 div() const
+		{
+			return imax - imin;
+		}
+
+		// Return zero bits for zeros, ones for ones or undefs
+		u64 mask() const
+		{
+			return bmin | bmax;
+		}
+
+		// Return one bits for ones, zeros for zeros or undefs
+		u64 ones() const
+		{
+			return bmin & bmax;
+		}
+
+		// Return one bits for undefs
+		u64 undefs() const
+		{
+			return bmin ^ bmax;
+		}
+
+		// Return number of trailing zero bits
+		u64 tz() const
+		{
+			return std::countr_zero(mask());
+		}
+
+		// Range NOT
+		spec_gpr operator ~() const
+		{
+			spec_gpr r;
+			r.imin = ~imax;
+			r.imax = ~imin;
+			r.bmin = ~bmax;
+			r.bmax = ~bmin;
+			return r;
+		}
+
+		// Range ADD
+		spec_gpr operator +(const spec_gpr& rhs) const
+		{
+			spec_gpr r{};
+
+			const u64 adiv = div();
+			const u64 bdiv = rhs.div();
+
+			// Check overflow, generate normalized range
+			if (adiv != umax && bdiv != umax && adiv <= adiv + bdiv)
+			{
+				r = range(imin + rhs.imin, imax + rhs.imax);
+			}
+
+			// Carry for bitrange computation
+			u64 cmin = 0;
+			u64 cmax = 0;
+
+			const u64 amask = mask();
+			const u64 bmask = rhs.mask();
+			const u64 aones = ones();
+			const u64 bones = rhs.ones();
+
+			for (u32 i = 0; i < 64; i++)
+			{
+				cmin += ((amask >> i) & 1) + ((bmask >> i) & 1);
+				cmax += ((aones >> i) & 1) + ((bones >> i) & 1);
+
+				// Discover some constant bits
+				if (cmin == cmax)
+				{
+					r.bmin |= (cmin & 1) << i;
+					r.bmax &= ~((~cmin & 1) << i);
+				}
+
+				cmin >>= 1;
+				cmax >>= 1;
+			}
+
+			return r;
+		}
+
+		// Range AND
+		spec_gpr operator &(const spec_gpr& rhs) const
+		{
+			// Ignore inverted ranges (TODO)
+			if (imin > imax || rhs.imin > rhs.imax)
+			{
+				return approx(ones() & rhs.ones(), mask() & rhs.mask());
+			}
+
+			// Const (TODO: remove when unnecessary)
+			if (imin == imax && rhs.imin == rhs.imax)
+			{
+				return fixed(imin & rhs.imin);
+			}
+
+			// Swap (TODO: remove when unnecessary)
+			if (imin == imax || rhs.undefs() > undefs())
+			{
+				return rhs & *this;
+			}
+
+			// Copy and attempt to partially preserve integral range
+			spec_gpr r = *this;
+
+			for (u32 i = 63; ~i; i--)
+			{
+				const u64 m = 1ull << i;
+
+				if (!(rhs.mask() & m))
+				{
+					if (r.undefs() & m)
+					{
+						// undef -> 0
+						r.imin &= ~(m - 1);
+						r.imax |= (m - 1);
+						r.imin &= ~m;
+						r.imax &= ~m;
+					}
+					else if (r.ones() & m)
+					{
+						// 1 -> 0
+						if ((r.imin ^ r.imax) > (m - 1))
+						{
+							r.imin &= ~(m - 1);
+							r.imax |= (m - 1);
+						}
+
+						r.imin &= ~m;
+						r.imax &= ~m;
+					}
+				}
+				else if (rhs.undefs() & m)
+				{
+					// -> undef
+					r.imin &= ~(m - 1);
+					r.imax |= (m - 1);
+					r.imin &= ~m;
+					r.imax |= m;
+				}
+			}
+
+			r.bmin = ones() & rhs.ones();
+			r.bmax = mask() & rhs.mask();
+			return r;
+		}
+
+		// Range OR
+		spec_gpr operator |(const spec_gpr& rhs) const
+		{
+			// Ignore inverted ranges (TODO)
+			if (imin > imax || rhs.imin > rhs.imax)
+			{
+				return approx(ones() | rhs.ones(), mask() | rhs.mask());
+			}
+
+			// Const (TODO: remove when unnecessary)
+			if (imin == imax && rhs.imin == rhs.imax)
+			{
+				return fixed(imin | rhs.imin);
+			}
+
+			// Swap (TODO: remove when unnecessary)
+			if (imin == imax || rhs.undefs() > undefs())
+			{
+				return rhs | *this;
+			}
+
+			// Copy and attempt to partially preserve integral range
+			spec_gpr r = *this;
+
+			for (u32 i = 63; ~i; i--)
+			{
+				const u64 m = 1ull << i;
+
+				if (rhs.ones() & m)
+				{
+					if (r.undefs() & m)
+					{
+						// undef -> 1
+						r.imin &= ~(m - 1);
+						r.imax |= (m - 1);
+						r.imin |= m;
+						r.imax |= m;
+					}
+					else if (!(r.mask() & m))
+					{
+						// 0 -> 1
+						if ((r.imin ^ r.imax) > (m - 1))
+						{
+							r.imin &= ~(m - 1);
+							r.imax |= (m - 1);
+						}
+
+						r.imin |= m;
+						r.imax |= m;
+					}
+				}
+				else if (rhs.undefs() & m)
+				{
+					// -> undef
+					r.imin &= ~(m - 1);
+					r.imax |= (m - 1);
+					r.imin &= ~m;
+					r.imax |= m;
+				}
+			}
+
+			r.bmin = ones() | rhs.ones();
+			r.bmax = mask() | rhs.mask();
+			return r;
+		}
+
+		// Range XOR
+		spec_gpr operator ^(const spec_gpr& rhs) const
+		{
+			return (~*this & rhs) | (*this & ~rhs);
+		}
+
+		// Check whether the value is in range
+		bool test(u64 value) const
+		{
+			if (imin <= imax)
+			{
+				if (value < imin || value > imax)
+				{
+					return false;
+				}
+			}
+			else
+			{
+				if (value < imin && value > imax)
+				{
+					return false;
+				}
+			}
+
+			if ((value & mask()) != value)
+			{
+				return false;
+			}
+
+			if ((value | ones()) != value)
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		// Constant value
+		static spec_gpr fixed(u64 value)
+		{
+			spec_gpr r;
+			r.imin = value;
+			r.imax = value;
+			r.bmin = value;
+			r.bmax = value;
+			return r;
+		}
+
+		// Range (tz = number of constant trailing zeros)
+		static spec_gpr range(u64 min, u64 max, u64 tz = 0)
+		{
+			const u64 mask = tz < 64 ? ~0ull << tz : 0ull;
+
+			spec_gpr r;
+			r.bmin = 0;
+			r.bmax = mask;
+
+			// Normalize min/max for tz (TODO)
+			if (min < max)
+			{
+				// Inverted constant MSB mask
+				const u64 mix = ~0ull >> std::countl_zero(min ^ max);
+				r.bmin |= min & ~mix;
+				r.bmax &= max | mix;
+
+				r.imin = (min + ~mask) & mask;
+				r.imax = max & mask;
+				ensure(r.imin <= r.imax); // "Impossible range"
+			}
+			else
+			{
+				r.imin = min & mask;
+				r.imax = (max + ~mask) & mask;
+				ensure(r.imin >= r.imax); // "Impossible range"
+			}
+
+			// Fix const values
+			if (r.imin == r.imax)
+			{
+				r.bmin = r.imin;
+				r.bmax = r.imax;
+			}
+
+			return r;
+		}
+
+		// Make from bitrange (normalize, approximate range values)
+		static spec_gpr approx(u64 bmin, u64 bmax)
+		{
+			spec_gpr r;
+			r.imin = bmin & ~(bmin ^ bmax);
+			r.imax = bmax | (bmin ^ bmax);
+			r.bmin = bmin & ~(bmin ^ bmax);
+			r.bmax = bmax | (bmin ^ bmax);
+			return r;
+		}
+	} gpr[32]{};
+
+	// Vector registers (draft)
+	struct spec_vec
+	{
+		u8 imin8[16]{};
+		u8 imax8[16]{255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255};
+		u16 imin16[8]{};
+		u16 imax16[8]{0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff};
+		u32 imin32[4]{};
+		u32 imax32[4]{0xffffffffu, 0xffffffffu, 0xffffffffu, 0xffffffffu};
+		u64 bmin64[2]{};
+		u64 bmax64[2]{0xffffffffffffffffull, 0xffffffffffffffffull};
+	};
+
+	// Info
+	u32 cia;
+
+	// Analyser step
+	void UNK(ppu_opcode_t);
+
+	void MFVSCR(ppu_opcode_t);
+	void MTVSCR(ppu_opcode_t);
+	void VADDCUW(ppu_opcode_t);
+	void VADDFP(ppu_opcode_t);
+	void VADDSBS(ppu_opcode_t);
+	void VADDSHS(ppu_opcode_t);
+	void VADDSWS(ppu_opcode_t);
+	void VADDUBM(ppu_opcode_t);
+	void VADDUBS(ppu_opcode_t);
+	void VADDUHM(ppu_opcode_t);
+	void VADDUHS(ppu_opcode_t);
+	void VADDUWM(ppu_opcode_t);
+	void VADDUWS(ppu_opcode_t);
+	void VAND(ppu_opcode_t);
+	void VANDC(ppu_opcode_t);
+	void VAVGSB(ppu_opcode_t);
+	void VAVGSH(ppu_opcode_t);
+	void VAVGSW(ppu_opcode_t);
+	void VAVGUB(ppu_opcode_t);
+	void VAVGUH(ppu_opcode_t);
+	void VAVGUW(ppu_opcode_t);
+	void VCFSX(ppu_opcode_t);
+	void VCFUX(ppu_opcode_t);
+	void VCMPBFP(ppu_opcode_t);
+	void VCMPEQFP(ppu_opcode_t);
+	void VCMPEQUB(ppu_opcode_t);
+	void VCMPEQUH(ppu_opcode_t);
+	void VCMPEQUW(ppu_opcode_t);
+	void VCMPGEFP(ppu_opcode_t);
+	void VCMPGTFP(ppu_opcode_t);
+	void VCMPGTSB(ppu_opcode_t);
+	void VCMPGTSH(ppu_opcode_t);
+	void VCMPGTSW(ppu_opcode_t);
+	void VCMPGTUB(ppu_opcode_t);
+	void VCMPGTUH(ppu_opcode_t);
+	void VCMPGTUW(ppu_opcode_t);
+	void VCTSXS(ppu_opcode_t);
+	void VCTUXS(ppu_opcode_t);
+	void VEXPTEFP(ppu_opcode_t);
+	void VLOGEFP(ppu_opcode_t);
+	void VMADDFP(ppu_opcode_t);
+	void VMAXFP(ppu_opcode_t);
+	void VMAXSB(ppu_opcode_t);
+	void VMAXSH(ppu_opcode_t);
+	void VMAXSW(ppu_opcode_t);
+	void VMAXUB(ppu_opcode_t);
+	void VMAXUH(ppu_opcode_t);
+	void VMAXUW(ppu_opcode_t);
+	void VMHADDSHS(ppu_opcode_t);
+	void VMHRADDSHS(ppu_opcode_t);
+	void VMINFP(ppu_opcode_t);
+	void VMINSB(ppu_opcode_t);
+	void VMINSH(ppu_opcode_t);
+	void VMINSW(ppu_opcode_t);
+	void VMINUB(ppu_opcode_t);
+	void VMINUH(ppu_opcode_t);
+	void VMINUW(ppu_opcode_t);
+	void VMLADDUHM(ppu_opcode_t);
+	void VMRGHB(ppu_opcode_t);
+	void VMRGHH(ppu_opcode_t);
+	void VMRGHW(ppu_opcode_t);
+	void VMRGLB(ppu_opcode_t);
+	void VMRGLH(ppu_opcode_t);
+	void VMRGLW(ppu_opcode_t);
+	void VMSUMMBM(ppu_opcode_t);
+	void VMSUMSHM(ppu_opcode_t);
+	void VMSUMSHS(ppu_opcode_t);
+	void VMSUMUBM(ppu_opcode_t);
+	void VMSUMUHM(ppu_opcode_t);
+	void VMSUMUHS(ppu_opcode_t);
+	void VMULESB(ppu_opcode_t);
+	void VMULESH(ppu_opcode_t);
+	void VMULEUB(ppu_opcode_t);
+	void VMULEUH(ppu_opcode_t);
+	void VMULOSB(ppu_opcode_t);
+	void VMULOSH(ppu_opcode_t);
+	void VMULOUB(ppu_opcode_t);
+	void VMULOUH(ppu_opcode_t);
+	void VNMSUBFP(ppu_opcode_t);
+	void VNOR(ppu_opcode_t);
+	void VOR(ppu_opcode_t);
+	void VPERM(ppu_opcode_t);
+	void VPKPX(ppu_opcode_t);
+	void VPKSHSS(ppu_opcode_t);
+	void VPKSHUS(ppu_opcode_t);
+	void VPKSWSS(ppu_opcode_t);
+	void VPKSWUS(ppu_opcode_t);
+	void VPKUHUM(ppu_opcode_t);
+	void VPKUHUS(ppu_opcode_t);
+	void VPKUWUM(ppu_opcode_t);
+	void VPKUWUS(ppu_opcode_t);
+	void VREFP(ppu_opcode_t);
+	void VRFIM(ppu_opcode_t);
+	void VRFIN(ppu_opcode_t);
+	void VRFIP(ppu_opcode_t);
+	void VRFIZ(ppu_opcode_t);
+	void VRLB(ppu_opcode_t);
+	void VRLH(ppu_opcode_t);
+	void VRLW(ppu_opcode_t);
+	void VRSQRTEFP(ppu_opcode_t);
+	void VSEL(ppu_opcode_t);
+	void VSL(ppu_opcode_t);
+	void VSLB(ppu_opcode_t);
+	void VSLDOI(ppu_opcode_t);
+	void VSLH(ppu_opcode_t);
+	void VSLO(ppu_opcode_t);
+	void VSLW(ppu_opcode_t);
+	void VSPLTB(ppu_opcode_t);
+	void VSPLTH(ppu_opcode_t);
+	void VSPLTISB(ppu_opcode_t);
+	void VSPLTISH(ppu_opcode_t);
+	void VSPLTISW(ppu_opcode_t);
+	void VSPLTW(ppu_opcode_t);
+	void VSR(ppu_opcode_t);
+	void VSRAB(ppu_opcode_t);
+	void VSRAH(ppu_opcode_t);
+	void VSRAW(ppu_opcode_t);
+	void VSRB(ppu_opcode_t);
+	void VSRH(ppu_opcode_t);
+	void VSRO(ppu_opcode_t);
+	void VSRW(ppu_opcode_t);
+	void VSUBCUW(ppu_opcode_t);
+	void VSUBFP(ppu_opcode_t);
+	void VSUBSBS(ppu_opcode_t);
+	void VSUBSHS(ppu_opcode_t);
+	void VSUBSWS(ppu_opcode_t);
+	void VSUBUBM(ppu_opcode_t);
+	void VSUBUBS(ppu_opcode_t);
+	void VSUBUHM(ppu_opcode_t);
+	void VSUBUHS(ppu_opcode_t);
+	void VSUBUWM(ppu_opcode_t);
+	void VSUBUWS(ppu_opcode_t);
+	void VSUMSWS(ppu_opcode_t);
+	void VSUM2SWS(ppu_opcode_t);
+	void VSUM4SBS(ppu_opcode_t);
+	void VSUM4SHS(ppu_opcode_t);
+	void VSUM4UBS(ppu_opcode_t);
+	void VUPKHPX(ppu_opcode_t);
+	void VUPKHSB(ppu_opcode_t);
+	void VUPKHSH(ppu_opcode_t);
+	void VUPKLPX(ppu_opcode_t);
+	void VUPKLSB(ppu_opcode_t);
+	void VUPKLSH(ppu_opcode_t);
+	void VXOR(ppu_opcode_t);
+	void TDI(ppu_opcode_t);
+	void TWI(ppu_opcode_t);
+	void MULLI(ppu_opcode_t);
+	void SUBFIC(ppu_opcode_t);
+	void CMPLI(ppu_opcode_t);
+	void CMPI(ppu_opcode_t);
+	void ADDIC(ppu_opcode_t);
+	void ADDI(ppu_opcode_t);
+	void ADDIS(ppu_opcode_t);
+	void BC(ppu_opcode_t);
+	void SC(ppu_opcode_t);
+	void B(ppu_opcode_t);
+	void MCRF(ppu_opcode_t);
+	void BCLR(ppu_opcode_t);
+	void CRNOR(ppu_opcode_t);
+	void CRANDC(ppu_opcode_t);
+	void ISYNC(ppu_opcode_t);
+	void CRXOR(ppu_opcode_t);
+	void CRNAND(ppu_opcode_t);
+	void CRAND(ppu_opcode_t);
+	void CREQV(ppu_opcode_t);
+	void CRORC(ppu_opcode_t);
+	void CROR(ppu_opcode_t);
+	void BCCTR(ppu_opcode_t);
+	void RLWIMI(ppu_opcode_t);
+	void RLWINM(ppu_opcode_t);
+	void RLWNM(ppu_opcode_t);
+	void ORI(ppu_opcode_t);
+	void ORIS(ppu_opcode_t);
+	void XORI(ppu_opcode_t);
+	void XORIS(ppu_opcode_t);
+	void ANDI(ppu_opcode_t);
+	void ANDIS(ppu_opcode_t);
+	void RLDICL(ppu_opcode_t);
+	void RLDICR(ppu_opcode_t);
+	void RLDIC(ppu_opcode_t);
+	void RLDIMI(ppu_opcode_t);
+	void RLDCL(ppu_opcode_t);
+	void RLDCR(ppu_opcode_t);
+	void CMP(ppu_opcode_t);
+	void TW(ppu_opcode_t);
+	void LVSL(ppu_opcode_t);
+	void LVEBX(ppu_opcode_t);
+	void SUBFC(ppu_opcode_t);
+	void ADDC(ppu_opcode_t);
+	void MULHDU(ppu_opcode_t);
+	void MULHWU(ppu_opcode_t);
+	void MFOCRF(ppu_opcode_t);
+	void LWARX(ppu_opcode_t);
+	void LDX(ppu_opcode_t);
+	void LWZX(ppu_opcode_t);
+	void SLW(ppu_opcode_t);
+	void CNTLZW(ppu_opcode_t);
+	void SLD(ppu_opcode_t);
+	void AND(ppu_opcode_t);
+	void CMPL(ppu_opcode_t);
+	void LVSR(ppu_opcode_t);
+	void LVEHX(ppu_opcode_t);
+	void SUBF(ppu_opcode_t);
+	void LDUX(ppu_opcode_t);
+	void DCBST(ppu_opcode_t);
+	void LWZUX(ppu_opcode_t);
+	void CNTLZD(ppu_opcode_t);
+	void ANDC(ppu_opcode_t);
+	void TD(ppu_opcode_t);
+	void LVEWX(ppu_opcode_t);
+	void MULHD(ppu_opcode_t);
+	void MULHW(ppu_opcode_t);
+	void LDARX(ppu_opcode_t);
+	void DCBF(ppu_opcode_t);
+	void LBZX(ppu_opcode_t);
+	void LVX(ppu_opcode_t);
+	void NEG(ppu_opcode_t);
+	void LBZUX(ppu_opcode_t);
+	void NOR(ppu_opcode_t);
+	void STVEBX(ppu_opcode_t);
+	void SUBFE(ppu_opcode_t);
+	void ADDE(ppu_opcode_t);
+	void MTOCRF(ppu_opcode_t);
+	void STDX(ppu_opcode_t);
+	void STWCX(ppu_opcode_t);
+	void STWX(ppu_opcode_t);
+	void STVEHX(ppu_opcode_t);
+	void STDUX(ppu_opcode_t);
+	void STWUX(ppu_opcode_t);
+	void STVEWX(ppu_opcode_t);
+	void SUBFZE(ppu_opcode_t);
+	void ADDZE(ppu_opcode_t);
+	void STDCX(ppu_opcode_t);
+	void STBX(ppu_opcode_t);
+	void STVX(ppu_opcode_t);
+	void SUBFME(ppu_opcode_t);
+	void MULLD(ppu_opcode_t);
+	void ADDME(ppu_opcode_t);
+	void MULLW(ppu_opcode_t);
+	void DCBTST(ppu_opcode_t);
+	void STBUX(ppu_opcode_t);
+	void ADD(ppu_opcode_t);
+	void DCBT(ppu_opcode_t);
+	void LHZX(ppu_opcode_t);
+	void EQV(ppu_opcode_t);
+	void ECIWX(ppu_opcode_t);
+	void LHZUX(ppu_opcode_t);
+	void XOR(ppu_opcode_t);
+	void MFSPR(ppu_opcode_t);
+	void LWAX(ppu_opcode_t);
+	void DST(ppu_opcode_t);
+	void LHAX(ppu_opcode_t);
+	void LVXL(ppu_opcode_t);
+	void MFTB(ppu_opcode_t);
+	void LWAUX(ppu_opcode_t);
+	void DSTST(ppu_opcode_t);
+	void LHAUX(ppu_opcode_t);
+	void STHX(ppu_opcode_t);
+	void ORC(ppu_opcode_t);
+	void ECOWX(ppu_opcode_t);
+	void STHUX(ppu_opcode_t);
+	void OR(ppu_opcode_t);
+	void DIVDU(ppu_opcode_t);
+	void DIVWU(ppu_opcode_t);
+	void MTSPR(ppu_opcode_t);
+	void DCBI(ppu_opcode_t);
+	void NAND(ppu_opcode_t);
+	void STVXL(ppu_opcode_t);
+	void DIVD(ppu_opcode_t);
+	void DIVW(ppu_opcode_t);
+	void LVLX(ppu_opcode_t);
+	void LDBRX(ppu_opcode_t);
+	void LSWX(ppu_opcode_t);
+	void LWBRX(ppu_opcode_t);
+	void LFSX(ppu_opcode_t);
+	void SRW(ppu_opcode_t);
+	void SRD(ppu_opcode_t);
+	void LVRX(ppu_opcode_t);
+	void LSWI(ppu_opcode_t);
+	void LFSUX(ppu_opcode_t);
+	void SYNC(ppu_opcode_t);
+	void LFDX(ppu_opcode_t);
+	void LFDUX(ppu_opcode_t);
+	void STVLX(ppu_opcode_t);
+	void STDBRX(ppu_opcode_t);
+	void STSWX(ppu_opcode_t);
+	void STWBRX(ppu_opcode_t);
+	void STFSX(ppu_opcode_t);
+	void STVRX(ppu_opcode_t);
+	void STFSUX(ppu_opcode_t);
+	void STSWI(ppu_opcode_t);
+	void STFDX(ppu_opcode_t);
+	void STFDUX(ppu_opcode_t);
+	void LVLXL(ppu_opcode_t);
+	void LHBRX(ppu_opcode_t);
+	void SRAW(ppu_opcode_t);
+	void SRAD(ppu_opcode_t);
+	void LVRXL(ppu_opcode_t);
+	void DSS(ppu_opcode_t);
+	void SRAWI(ppu_opcode_t);
+	void SRADI(ppu_opcode_t);
+	void EIEIO(ppu_opcode_t);
+	void STVLXL(ppu_opcode_t);
+	void STHBRX(ppu_opcode_t);
+	void EXTSH(ppu_opcode_t);
+	void STVRXL(ppu_opcode_t);
+	void EXTSB(ppu_opcode_t);
+	void STFIWX(ppu_opcode_t);
+	void EXTSW(ppu_opcode_t);
+	void ICBI(ppu_opcode_t);
+	void DCBZ(ppu_opcode_t);
+	void LWZ(ppu_opcode_t);
+	void LWZU(ppu_opcode_t);
+	void LBZ(ppu_opcode_t);
+	void LBZU(ppu_opcode_t);
+	void STW(ppu_opcode_t);
+	void STWU(ppu_opcode_t);
+	void STB(ppu_opcode_t);
+	void STBU(ppu_opcode_t);
+	void LHZ(ppu_opcode_t);
+	void LHZU(ppu_opcode_t);
+	void LHA(ppu_opcode_t);
+	void LHAU(ppu_opcode_t);
+	void STH(ppu_opcode_t);
+	void STHU(ppu_opcode_t);
+	void LMW(ppu_opcode_t);
+	void STMW(ppu_opcode_t);
+	void LFS(ppu_opcode_t);
+	void LFSU(ppu_opcode_t);
+	void LFD(ppu_opcode_t);
+	void LFDU(ppu_opcode_t);
+	void STFS(ppu_opcode_t);
+	void STFSU(ppu_opcode_t);
+	void STFD(ppu_opcode_t);
+	void STFDU(ppu_opcode_t);
+	void LD(ppu_opcode_t);
+	void LDU(ppu_opcode_t);
+	void LWA(ppu_opcode_t);
+	void STD(ppu_opcode_t);
+	void STDU(ppu_opcode_t);
+	void FDIVS(ppu_opcode_t);
+	void FSUBS(ppu_opcode_t);
+	void FADDS(ppu_opcode_t);
+	void FSQRTS(ppu_opcode_t);
+	void FRES(ppu_opcode_t);
+	void FMULS(ppu_opcode_t);
+	void FMADDS(ppu_opcode_t);
+	void FMSUBS(ppu_opcode_t);
+	void FNMSUBS(ppu_opcode_t);
+	void FNMADDS(ppu_opcode_t);
+	void MTFSB1(ppu_opcode_t);
+	void MCRFS(ppu_opcode_t);
+	void MTFSB0(ppu_opcode_t);
+	void MTFSFI(ppu_opcode_t);
+	void MFFS(ppu_opcode_t);
+	void MTFSF(ppu_opcode_t);
+	void FCMPU(ppu_opcode_t);
+	void FRSP(ppu_opcode_t);
+	void FCTIW(ppu_opcode_t);
+	void FCTIWZ(ppu_opcode_t);
+	void FDIV(ppu_opcode_t);
+	void FSUB(ppu_opcode_t);
+	void FADD(ppu_opcode_t);
+	void FSQRT(ppu_opcode_t);
+	void FSEL(ppu_opcode_t);
+	void FMUL(ppu_opcode_t);
+	void FRSQRTE(ppu_opcode_t);
+	void FMSUB(ppu_opcode_t);
+	void FMADD(ppu_opcode_t);
+	void FNMSUB(ppu_opcode_t);
+	void FNMADD(ppu_opcode_t);
+	void FCMPO(ppu_opcode_t);
+	void FNEG(ppu_opcode_t);
+	void FMR(ppu_opcode_t);
+	void FNABS(ppu_opcode_t);
+	void FABS(ppu_opcode_t);
+	void FCTID(ppu_opcode_t);
+	void FCTIDZ(ppu_opcode_t);
+	void FCFID(ppu_opcode_t);
 };
diff --git a/rpcs3/Emu/Cell/PPUCallback.h b/rpcs3/Emu/Cell/PPUCallback.h
index f9254e29e9..e971436a1e 100644
--- a/rpcs3/Emu/Cell/PPUCallback.h
+++ b/rpcs3/Emu/Cell/PPUCallback.h
@@ -27,8 +27,8 @@ namespace ppu_cb_detail
 	struct _func_arg
 	{
 		static_assert(type == ARG_GENERAL, "Unknown callback argument type");
-		static_assert(!std::is_pointer_v<T>, "Invalid callback argument type (pointer)");
-		static_assert(!std::is_reference_v<T>, "Invalid callback argument type (reference)");
+		static_assert(!std::is_pointer<T>::value, "Invalid callback argument type (pointer)");
+		static_assert(!std::is_reference<T>::value, "Invalid callback argument type (reference)");
 		static_assert(sizeof(T) <= 8, "Invalid callback argument type for ARG_GENERAL");
 
 		static inline void set_value(ppu_thread& CPU, const T& arg)
@@ -51,7 +51,7 @@ namespace ppu_cb_detail
 	template<typename T, u32 g_count, u32 f_count, u32 v_count>
 	struct _func_arg<T, ARG_VECTOR, g_count, f_count, v_count>
 	{
-		static_assert(std::is_same_v<std::decay_t<T>, v128>, "Invalid callback argument type for ARG_VECTOR");
+		static_assert(std::is_same<std::decay_t<T>, v128>::value, "Invalid callback argument type for ARG_VECTOR");
 
 		static inline void set_value(ppu_thread& CPU, const T& arg)
 		{
@@ -66,16 +66,16 @@ namespace ppu_cb_detail
 
 		static inline void set_value(ppu_thread& CPU, const T& arg)
 		{
-			const s64 stack_pos = (static_cast<s64>(g_count) - 1) * 0x8 + 0x30 - FIXED_STACK_FRAME_SIZE;
+			const s64 stack_pos = (g_count - 1) * 0x8 + 0x30 - FIXED_STACK_FRAME_SIZE;
 			static_assert(stack_pos < 0, "TODO: Increase FIXED_STACK_FRAME_SIZE (arg count limit broken)");
-			vm::write64(static_cast<u32>(CPU.gpr[1] + stack_pos), ppu_gpr_cast(arg)); // TODO
+			vm::write64(CPU.gpr[1] + stack_pos, ppu_gpr_cast(arg)); // TODO
 		}
 	};
 
 	template<typename T, u32 g_count, u32 f_count, u32 v_count>
 	struct _func_arg<T, ARG_CONTEXT, g_count, f_count, v_count>
 	{
-		static_assert(std::is_same_v<std::decay_t<T>, ppu_thread>, "Invalid callback argument type for ARG_CONTEXT");
+		static_assert(std::is_same<std::decay_t<T>, ppu_thread>::value, "Invalid callback argument type for ARG_CONTEXT");
 
 		FORCE_INLINE static void set_value(ppu_thread&, const T&)
 		{
@@ -92,21 +92,21 @@ namespace ppu_cb_detail
 	template<u32 g_count, u32 f_count, u32 v_count, typename T1, typename... T>
 	FORCE_INLINE static bool _bind_func_args(ppu_thread& CPU, T1 arg1, T... args)
 	{
-		constexpr bool is_float = std::is_floating_point_v<T1>;
-		constexpr bool is_vector = std::is_same_v<std::decay_t<T1>, v128>;
-		constexpr bool is_context = std::is_same_v<std::decay_t<T1>, ppu_thread>;
-		constexpr bool is_general = !is_float && !is_vector && !is_context;
+		const bool is_float = std::is_floating_point<T1>::value;
+		const bool is_vector = std::is_same<std::decay_t<T1>, v128>::value;
+		const bool is_context = std::is_same<std::decay_t<T1>, ppu_thread>::value;
+		const bool is_general = !is_float && !is_vector && !is_context;
 
-		constexpr _func_arg_type t =
+		const _func_arg_type t =
 			is_general ? (g_count >= 8 ? ARG_STACK : ARG_GENERAL) :
 			is_float ? (f_count >= 13 ? ARG_STACK : ARG_FLOAT) :
 			is_vector ? (v_count >= 12 ? ARG_STACK : ARG_VECTOR) :
 			is_context ? ARG_CONTEXT :
 			ARG_UNKNOWN;
 
-		constexpr u32 g = g_count + (is_general || is_float ? 1 : is_vector ? (g_count & 1) + 2 : 0);
-		constexpr u32 f = f_count + is_float;
-		constexpr u32 v = v_count + is_vector;
+		const u32 g = g_count + (is_general || is_float ? 1 : is_vector ? (g_count & 1) + 2 : 0);
+		const u32 f = f_count + is_float;
+		const u32 v = v_count + is_vector;
 
 		_func_arg<T1, t, g, f, v>::set_value(CPU, arg1);
 
@@ -140,7 +140,7 @@ namespace ppu_cb_detail
 	template<typename T>
 	struct _func_res<T, ARG_VECTOR>
 	{
-		static_assert(std::is_same_v<std::decay_t<T>, v128>, "Invalid callback result type for ARG_VECTOR");
+		static_assert(std::is_same<std::decay_t<T>, v128>::value, "Invalid callback result type for ARG_VECTOR");
 
 		FORCE_INLINE static T get_value(const ppu_thread& CPU)
 		{
@@ -155,11 +155,11 @@ namespace ppu_cb_detail
 		{
 			_func_caller<void, T...>::call(CPU, pc, rtoc, args...);
 
-			static_assert(!std::is_pointer_v<RT>, "Invalid callback result type (pointer)");
-			static_assert(!std::is_reference_v<RT>, "Invalid callback result type (reference)");
-			constexpr bool is_float = std::is_floating_point_v<RT>;
-			constexpr bool is_vector = std::is_same_v<std::decay_t<RT>, v128>;
-			constexpr _func_arg_type t = is_float ? ARG_FLOAT : (is_vector ? ARG_VECTOR : ARG_GENERAL);
+			static_assert(!std::is_pointer<RT>::value, "Invalid callback result type (pointer)");
+			static_assert(!std::is_reference<RT>::value, "Invalid callback result type (reference)");
+			const bool is_float = std::is_floating_point<RT>::value;
+			const bool is_vector = std::is_same<std::decay_t<RT>, v128>::value;
+			const _func_arg_type t = is_float ? ARG_FLOAT : (is_vector ? ARG_VECTOR : ARG_GENERAL);
 
 			return _func_res<RT, t>::get_value(CPU);
 		}
diff --git a/rpcs3/Emu/Cell/PPUDisAsm.cpp b/rpcs3/Emu/Cell/PPUDisAsm.cpp
index 569b60b612..7ff38b88c2 100644
--- a/rpcs3/Emu/Cell/PPUDisAsm.cpp
+++ b/rpcs3/Emu/Cell/PPUDisAsm.cpp
@@ -1,53 +1,19 @@
 #include "stdafx.h"
 #include "PPUDisAsm.h"
 #include "PPUFunction.h"
-#include "PPUAnalyser.h"
 #include "Emu/IdManager.h"
 
-#include "util/asm.hpp"
-
-#include <cmath>
-
 const ppu_decoder<PPUDisAsm> s_ppu_disasm;
-const ppu_decoder<ppu_itype> s_ppu_itype;
-
 extern const std::unordered_map<u32, std::string_view>& get_exported_function_names_as_addr_indexed_map();
 
-enum class ppu_syscall_code : u64;
-
-extern std::shared_ptr<CPUDisAsm> make_basic_ppu_disasm()
-{
-	return std::make_shared<PPUDisAsm>(cpu_disasm_mode::normal, vm::g_sudo_addr);
-}
-
 u32 PPUDisAsm::disasm(u32 pc)
 {
-	last_opcode.clear();
-
-	if (pc < m_start_pc)
-	{
-		return 0;
-	}
-
-	if (m_offset == vm::g_sudo_addr && !vm::check_addr(pc, vm::page_executable))
-	{
-		return 0;
-	}
-
 	dump_pc = pc;
 	be_t<u32> op{};
 	std::memcpy(&op, m_offset + pc, 4);
 	m_op = op;
-
 	(this->*(s_ppu_disasm.decode(m_op)))({ m_op });
 
-	if (m_offset != vm::g_sudo_addr)
-	{
-		// Exported functions lookup is not allowed in this case
-		format_by_mode();
-		return 4;
-	}
-
 	const auto& map = get_exported_function_names_as_addr_indexed_map();
 
 	if (auto it = map.find(pc); it != map.end())
@@ -56,303 +22,9 @@ u32 PPUDisAsm::disasm(u32 pc)
 		last_opcode += it->second;
 	}
 
-	format_by_mode();
 	return 4;
 }
 
-std::pair<const void*, usz> PPUDisAsm::get_memory_span() const
-{
-	return {m_offset + m_start_pc, (1ull << 32) - m_start_pc};
-}
-
-std::unique_ptr<CPUDisAsm> PPUDisAsm::copy_type_erased() const
-{
-	return std::make_unique<PPUDisAsm>(*this);
-}
-
-std::pair<PPUDisAsm::const_op, u64> PPUDisAsm::try_get_const_op_gpr_value(u32 reg, u32 pc, u32 TTL) const
-{
-	if (!TTL)
-	{
-		// Recursion limit (Time To Live)
-		return {};
-	}
-
-	if (pc == umax)
-	{
-		// Default arg: choose pc of previous instruction
-
-		if (dump_pc == 0)
-		{
-			// Do not underflow
-			return {};
-		}
-
-		pc = dump_pc - 4;
-	}
-
-#if __cpp_using_enum >= 201907
-	using enum const_op;
-#else
-	constexpr const_op none = const_op::none, form = const_op::form, xor_mask = const_op::xor_mask;
-#endif
-
-	// Scan PPU executable memory backwards until unmapped or non-executable memory block is encountered
-
-	for (u32 i = pc; i >= m_start_pc && (m_offset != vm::g_sudo_addr || vm::check_addr(i, vm::page_executable));)
-	{
-		const u32 opcode = *reinterpret_cast<const be_t<u32>*>(m_offset + i);
-		const ppu_opcode_t op{ opcode };
-
-		const auto type = s_ppu_itype.decode(opcode);
-
-		if (type & ppu_itype::branch || type == ppu_itype::UNK)
-		{
-			// TODO: Detect calls, ignore them if reg is a non-volatile register
-			return {};
-		}
-
-		// Get constant register value
-		#define GET_CONST_OP_REG(var, reg, op) \
-		{\
-			/* Search for the constant value of the register*/\
-			const auto [const_op, value] = try_get_const_op_gpr_value(reg, i - 4, TTL - 1);\
-		\
-			if (const_op != const_op::op)\
-			{\
-				/* Cannot compute constant value if register/operation is not constant*/\
-				return {};\
-			}\
-		\
-			var = value;\
-		} void() /*<- Require a semicolon*/
-
-		#define GET_CONST_REG(var, reg) GET_CONST_OP_REG(var, reg, form)
-
-		switch (type)
-		{
-		case ppu_itype::ADDI:
-		case ppu_itype::ADDIC:
-		case ppu_itype::ADDIS:
-		{
-			if (op.rd != reg)
-			{
-				break;
-			}
-
-			u64 reg_ra = 0;
-
-			if (op.ra || type == ppu_itype::ADDIC)
-			{
-				GET_CONST_REG(reg_ra, op.ra);
-			}
-
-			return { form, reg_ra + (type == ppu_itype::ADDIS ? op.simm16 * 65536 : op.simm16) };
-		}
-		case ppu_itype::ORI:
-		{
-			if (op.rs == op.ra && !op.uimm16)
-			{
-				// NO-OP
-				break;
-			}
-
-			if (op.ra != reg)
-			{
-				// Destination register is not relevant to us
-				break;
-			}
-
-			u64 reg_rs = 0;
-
-			GET_CONST_REG(reg_rs, op.rs);
-
-			return { form, reg_rs | op.uimm16 };
-		}
-		case ppu_itype::ORIS:
-		{
-			if (op.rs == op.ra && !op.uimm16)
-			{
-				// NO-OP
-				break;
-			}
-
-			if (op.ra != reg)
-			{
-				break;
-			}
-
-			u64 reg_rs = 0;
-
-			GET_CONST_REG(reg_rs, op.rs);
-
-			return { form, reg_rs | (u64{op.uimm16} << 16)};
-		}
-		case ppu_itype::XORIS:
-		{
-			if (op.ra != reg)
-			{
-				break;
-			}
-
-			const auto [const_op, reg_rs] = try_get_const_op_gpr_value(op.rs, i - 4, TTL - 1);
-
-			if (const_op == none)
-			{
-				return { xor_mask, (u64{op.uimm16} << 16) };
-			}
-
-			if (const_op != form)
-			{
-				// Unexpected
-				return {};
-			}
-
-			return { form, reg_rs ^ (u64{op.uimm16} << 16)};
-		}
-		case ppu_itype::RLDICR:
-		{
-			if (op.ra != reg)
-			{
-				break;
-			}
-
-			u64 reg_rs = 0;
-
-			GET_CONST_REG(reg_rs, op.rs);
-
-			return { form, utils::rol64(reg_rs, op.sh64) & (~0ull << (op.mbe64 ^ 63)) };
-		}
-		case ppu_itype::OR:
-		{
-			if (op.rs == op.rb && op.rs == op.ra)
-			{
-				// NO-OP
-				break;
-			}
-
-			if (op.ra != reg)
-			{
-				break;
-			}
-
-			u64 reg_rs = 0, reg_rb = 0;
-
-			GET_CONST_REG(reg_rs, op.rs);
-
-			// Try to optimize if it's a register move operation
-			if (op.rs != op.rb)
-			{
-				GET_CONST_REG(reg_rb, op.rb);
-			}
-
-			return { form, reg_rs | reg_rb };
-		}
-		case ppu_itype::XOR:
-		{
-			if (op.ra != reg)
-			{
-				break;
-			}
-
-			if (op.rs == op.rb)
-			{
-				return { form, 0 };
-			}
-
-			const auto [const_op_rs, reg_rs] = try_get_const_op_gpr_value(op.rs, i - 4, TTL - 1);
-			const auto [const_op_rb, reg_rb] = try_get_const_op_gpr_value(op.rb, i - 4, TTL - 1);
-
-			if (const_op_rs == form && const_op_rb == form)
-			{
-				// Normally it is not the case
-				return { form, reg_rs ^ reg_rb };
-			}
-
-			if (const_op_rs == form && const_op_rb == none)
-			{
-				return { xor_mask, reg_rs };
-			}
-			else if (const_op_rb == form && const_op_rs == none)
-			{
-				return { xor_mask, reg_rb };
-			}
-
-			return {};
-		}
-		default:
-		{
-			// Ordinary test
-			// TODO: Proper detection of destination register(s) modification (if there are any)
-			if (op.ra == reg || op.rd == reg)
-			{
-				return {};
-			}
-
-			break;
-		}
-		}
-
-		if (i == 0)
-		{
-			return {};
-		}
-
-		i -= 4;
-	}
-
-	return {};
-}
-
-enum CellError : u32;
-
-void comment_constant(std::string& last_opcode, u64 value, bool print_float = false)
-{
-	// Test if potentially a CELL error
-	if ((value >> 28) == 0xf'ffff'fff8u || (value >> 28) == 0x8u)
-	{
-		const usz old_size = last_opcode.size();
-
-		// Comment as CELL error
-		fmt::append(last_opcode, " #%s (0x%xh)", CellError{static_cast<u32>(value)}, value);
-
-		// Test if failed to format (appended " #0x8".. in such case)
-		if (last_opcode[old_size + 2] != '0')
-		{
-			// Success
-			return;
-		}
-
-		// Revert and fallback
-		last_opcode.resize(old_size);
-	}
-
-	// Comment constant formation
-	fmt::append(last_opcode, " #0x%xh", value);
-
-	if (print_float && ((value >> 31) <= 1u || (value >> 31) == 0x1'ffff'ffffu))
-	{
-		const f32 float_val = std::bit_cast<f32>(static_cast<u32>(value));
-
-		if (std::isfinite(float_val))
-		{
-			const usz old_size = last_opcode.size();
-
-			fmt::append(last_opcode, " (%.6gf)", float_val);
-
-			if (usz pos = last_opcode.find_first_of('.', old_size); pos == umax)
-			{
-				// No decimal point has been inserted, force insertion
-				last_opcode.insert(last_opcode.size() - 2, ".0"sv);
-			}
-		}
-		else
-		{
-			fmt::append(last_opcode, " (%g)", float_val);
-		}
-	}
-}
-
 constexpr std::pair<const char*, char> get_BC_info(u32 bo, u32 bi)
 {
 	std::pair<const char*, char> info{};
@@ -1231,52 +903,17 @@ void PPUDisAsm::SUBFIC(ppu_opcode_t op)
 
 void PPUDisAsm::CMPLI(ppu_opcode_t op)
 {
-	DisAsm_CR1_R1_IMM(op.l10 ? "cmpldi" : "cmplwi", op.crfd, op.ra, op.uimm16);
-
-	// Try to obtain the true constant value we are comparing against, comment on success
-	// Upper 16/48 bits of it
-	if (auto [is_xor, value] = try_get_const_xor_gpr_value(op.ra); is_xor && !(value & 0xFFFF))
-	{
-		// Fixup value (merge the lower 16-bits of that value)
-		value |= op.uimm16;
-
-		if (!op.l10)
-		{
-			value = static_cast<u32>(value);
-		}
-
-		comment_constant(last_opcode, value);
-	}
+	DisAsm_CR1_R1_IMM(op.l10 ? "cmpdi" : "cmpwi", op.crfd, op.ra, op.uimm16);
 }
 
 void PPUDisAsm::CMPI(ppu_opcode_t op)
 {
 	DisAsm_CR1_R1_IMM(op.l10 ? "cmpdi" : "cmpwi", op.crfd, op.ra, op.simm16);
-
-	// See CMPLI
-	if (auto [is_xor, value] = try_get_const_xor_gpr_value(op.ra); is_xor && !(value & 0xFFFF))
-	{
-		// Signed fixup
-		value ^= s64{op.simm16};
-
-		if (!op.l10)
-		{
-			value = static_cast<u32>(value);
-		}
-
-		comment_constant(last_opcode, value);
-	}
 }
 
 void PPUDisAsm::ADDIC(ppu_opcode_t op)
 {
 	DisAsm_R2_IMM(op.main & 1 ? "addic." : "addic", op.rd, op.ra, op.simm16);
-
-	if (auto [is_const, value] = try_get_const_gpr_value(op.ra); is_const)
-	{
-		// Comment constant formation
-		comment_constant(last_opcode, value + op.simm16);
-	}
 }
 
 void PPUDisAsm::ADDI(ppu_opcode_t op)
@@ -1288,12 +925,6 @@ void PPUDisAsm::ADDI(ppu_opcode_t op)
 	else
 	{
 		DisAsm_R2_IMM("addi", op.rd, op.ra, op.simm16);
-
-		if (auto [is_const, value] = try_get_const_gpr_value(op.ra); is_const)
-		{
-			// Comment constant formation
-			comment_constant(last_opcode, value + op.simm16);
-		}
 	}
 }
 
@@ -1306,12 +937,6 @@ void PPUDisAsm::ADDIS(ppu_opcode_t op)
 	else
 	{
 		DisAsm_R2_IMM("addis", op.rd, op.ra, op.simm16);
-
-		if (auto [is_const, value] = try_get_const_gpr_value(op.ra); is_const)
-		{
-			// Comment constant formation
-			comment_constant(last_opcode, value + op.simm16 * 65536);
-		}
 	}
 }
 
@@ -1325,7 +950,7 @@ void PPUDisAsm::BC(ppu_opcode_t op)
 
 	if (m_mode == cpu_disasm_mode::compiler_elf)
 	{
-		fmt::append(last_opcode, "bc 0x%x, 0x%x, 0x%x, %d, %d", bo, bi, bd, aa, lk);
+		Write(fmt::format("bc 0x%x, 0x%x, 0x%x, %d, %d", bo, bi, bd, aa, lk));
 		return;
 	}
 
@@ -1333,7 +958,7 @@ void PPUDisAsm::BC(ppu_opcode_t op)
 
 	if (!inst)
 	{
-		fmt::append(last_opcode, "%-*s 0x%x, 0x%x, 0x%x, %d, %d", PadOp(), "bc", bo, bi, bd, aa, lk);
+		Write(fmt::format("bc 0x%x, 0x%x, 0x%x, %d, %d", bo, bi, bd, aa, lk));
 		return;
 	}
 
@@ -1369,46 +994,12 @@ void PPUDisAsm::BC(ppu_opcode_t op)
 
 void PPUDisAsm::SC(ppu_opcode_t op)
 {
-	if (op.opcode != ppu_instructions::SC(0) && op.opcode != ppu_instructions::SC(1))
+	if (op.opcode != ppu_instructions::SC(0))
 	{
 		return UNK(op);
 	}
 
-	fmt::append(last_opcode, "%-*s ", PadOp(), "sc");
-
-	if (op.lev)
-	{
-		fmt::append(last_opcode, "%u ", op.lev);
-	}
-
-	// Try to get constant syscall index
-	auto [is_const, index] = try_get_const_gpr_value(11);
-
-	if (!is_const)
-	{
-		return;
-	}
-
-	switch (op.lev)
-	{
-	case 0:
-	{
-		// Lv2 syscall
-		if (index < 1024u)
-		{
-			fmt::append(last_opcode, "#%s", ppu_syscall_code{index});
-		}
-
-		return;
-	}
-	case 1:
-	{
-		// Lv1 syscall
-		fmt::append(last_opcode, "#lv1_syscall_%u", index);
-		return;
-	}
-	default: return;
-	}
+	Write("sc");
 }
 
 void PPUDisAsm::B(ppu_opcode_t op)
@@ -1419,7 +1010,7 @@ void PPUDisAsm::B(ppu_opcode_t op)
 
 	if (m_mode == cpu_disasm_mode::compiler_elf)
 	{
-		fmt::append(last_opcode, "b 0x%x, %d, %d", li, aa, lk);
+		Write(fmt::format("b 0x%x, %d, %d", li, aa, lk));
 		return;
 	}
 
@@ -1457,7 +1048,7 @@ void PPUDisAsm::BCLR(ppu_opcode_t op)
 
 	if (bo == 0b10100)
 	{
-		last_opcode += (lk ? "blrl" : "blr");
+		Write(lk ? "blrl" : "blr");
 		return;
 	}
 
@@ -1465,7 +1056,7 @@ void PPUDisAsm::BCLR(ppu_opcode_t op)
 
 	if (!inst)
 	{
-		fmt::append(last_opcode, "bclr %d, cr%d[%s], %d, %d", bo, bi / 4, get_partial_BI_field(bi), bh, lk);
+		Write(fmt::format("bclr %d, cr%d[%s], %d, %d", bo, bi / 4, get_partial_BI_field(bi), bh, lk));
 		return;
 	}
 
@@ -1479,7 +1070,7 @@ void PPUDisAsm::BCLR(ppu_opcode_t op)
 		return;
 	}
 
-	DisAsm_CR_BRANCH_HINT(final, bi / 4, bh);
+	DisAsm_CR_BRANCH(final, bi / 4, bh);
 }
 
 void PPUDisAsm::CRNOR(ppu_opcode_t op)
@@ -1500,7 +1091,7 @@ void PPUDisAsm::CRANDC(ppu_opcode_t op)
 
 void PPUDisAsm::ISYNC(ppu_opcode_t)
 {
-	last_opcode += "isync";
+	Write("isync");
 }
 
 void PPUDisAsm::CRXOR(ppu_opcode_t op)
@@ -1560,7 +1151,7 @@ void PPUDisAsm::BCCTR(ppu_opcode_t op)
 
 	if (bo == 0b10100)
 	{
-		last_opcode += (lk ? "bctrl" : "bctr");
+		Write(lk ? "bctrl" : "bctr");
 		return;
 	}
 
@@ -1569,7 +1160,7 @@ void PPUDisAsm::BCCTR(ppu_opcode_t op)
 	if (!inst || inst[1] == 'd')
 	{
 		// Invalid or unknown bcctr form
-		fmt::append(last_opcode, "bcctr %d, cr%d[%s], %d, %d", bo, bi / 4, get_partial_BI_field(bi), bh, lk);
+		Write(fmt::format("bcctr %d, cr%d[%s], %d, %d", bo, bi / 4, get_partial_BI_field(bi), bh, lk));
 		return;
 	}
 
@@ -1577,7 +1168,7 @@ void PPUDisAsm::BCCTR(ppu_opcode_t op)
 	final += lk ? "ctrl"sv : "ctr"sv;
 	if (sign) final += sign;
 
-	DisAsm_CR_BRANCH_HINT(final, bi / 4, bh);
+	DisAsm_CR_BRANCH(final, bi / 4, bh);
 }
 
 void PPUDisAsm::RLWIMI(ppu_opcode_t op)
@@ -1608,49 +1199,25 @@ void PPUDisAsm::RLWNM(ppu_opcode_t op)
 
 void PPUDisAsm::ORI(ppu_opcode_t op)
 {
-	if (op.rs == 0 && op.ra == 0 && op.uimm16 == 0) { last_opcode += "nop"; return; }
+	if (op.rs == 0 && op.ra == 0 && op.uimm16 == 0) return Write("nop");
 	if (op.uimm16 == 0) return DisAsm_R2("mr", op.ra, op.rs);
 	DisAsm_R2_IMM("ori", op.ra, op.rs, op.uimm16);
-
-	if (auto [is_const, value] = try_get_const_gpr_value(op.rs); is_const)
-	{
-		// Comment constant formation
-		comment_constant(last_opcode, value | op.uimm16);
-	}
 }
 
 void PPUDisAsm::ORIS(ppu_opcode_t op)
 {
-	if (op.rs == 0 && op.ra == 0 && op.uimm16 == 0) { last_opcode += "nop"; return; }
+	if (op.rs == 0 && op.ra == 0 && op.uimm16 == 0) return Write("nop");
 	DisAsm_R2_IMM("oris", op.ra, op.rs, op.uimm16);
-
-	if (auto [is_const, value] = try_get_const_gpr_value(op.rs); is_const)
-	{
-		// Comment constant formation
-		comment_constant(last_opcode, value | (op.uimm16 << 16));
-	}
 }
 
 void PPUDisAsm::XORI(ppu_opcode_t op)
 {
 	DisAsm_R2_IMM("xori", op.ra, op.rs, op.uimm16);
-
-	if (auto [is_const, value] = try_get_const_gpr_value(op.rs); is_const)
-	{
-		// Comment constant formation
-		comment_constant(last_opcode, value ^ op.uimm16);
-	}
 }
 
 void PPUDisAsm::XORIS(ppu_opcode_t op)
 {
 	DisAsm_R2_IMM("xoris", op.ra, op.rs, op.uimm16);
-
-	if (auto [is_const, value] = try_get_const_gpr_value(op.rs); is_const)
-	{
-		// Comment constant formation
-		comment_constant(last_opcode, value ^ (op.uimm16 << 16));
-	}
 }
 
 void PPUDisAsm::ANDI(ppu_opcode_t op)
@@ -2107,7 +1674,7 @@ void PPUDisAsm::MFSPR(ppu_opcode_t op)
 	case 0x001: DisAsm_R1("mfxer", op.rd); break;
 	case 0x008: DisAsm_R1("mflr", op.rd); break;
 	case 0x009: DisAsm_R1("mfctr", op.rd); break;
-	default: DisAsm_R1_IMM("mfspr", op.rd, n); break;
+	default: DisAsm_R1_IMM("mfspr", op.rd, op.spr); break;
 	}
 }
 
@@ -2183,10 +1750,10 @@ void PPUDisAsm::OR(ppu_opcode_t op)
 	{
 		switch (op.opcode)
 		{
-		case 0x7f9ce378: last_opcode += "db8cyc"; return;
-		case 0x7fbdeb78: last_opcode += "db10cyc"; return;
-		case 0x7fdef378: last_opcode += "db12cyc"; return;
-		case 0x7ffffb78: last_opcode += "db16cyc"; return;
+		case 0x7f9ce378: return Write("db8cyc");
+		case 0x7fbdeb78: return Write("db10cyc");
+		case 0x7fdef378: return Write("db12cyc");
+		case 0x7ffffb78: return Write("db16cyc");
 		default: DisAsm_R2_RC("mr", op.ra, op.rb, op.rc);
 		}
 	}
@@ -2215,7 +1782,7 @@ void PPUDisAsm::MTSPR(ppu_opcode_t op)
 	case 0x001: DisAsm_R1("mtxer", op.rs); break;
 	case 0x008: DisAsm_R1("mtlr", op.rs); break;
 	case 0x009: DisAsm_R1("mtctr", op.rs); break;
-	default: DisAsm_R1_IMM("mtspr", n, op.rs); break;
+	default: DisAsm_IMM_R1("mtspr", op.spr, op.rs); break;
 	}
 }
 
@@ -2296,7 +1863,7 @@ void PPUDisAsm::LFSUX(ppu_opcode_t op)
 
 void PPUDisAsm::SYNC(ppu_opcode_t op)
 {
-	last_opcode += (op.l10 ? "lwsync" : "sync");
+	Write(op.l10 ? "lwsync" : "sync");
 }
 
 void PPUDisAsm::LFDX(ppu_opcode_t op)
@@ -2386,7 +1953,7 @@ void PPUDisAsm::LVRXL(ppu_opcode_t op)
 
 void PPUDisAsm::DSS(ppu_opcode_t)
 {
-	last_opcode += "dss";
+	Write("dss()");
 }
 
 void PPUDisAsm::SRAWI(ppu_opcode_t op)
@@ -2401,7 +1968,7 @@ void PPUDisAsm::SRADI(ppu_opcode_t op)
 
 void PPUDisAsm::EIEIO(ppu_opcode_t)
 {
-	last_opcode += "eieio";
+	Write("eieio");
 }
 
 void PPUDisAsm::STVLXL(ppu_opcode_t op)
@@ -2646,7 +2213,7 @@ void PPUDisAsm::FNMADDS(ppu_opcode_t op)
 
 void PPUDisAsm::MTFSB1(ppu_opcode_t op)
 {
-	fmt::append(last_opcode, "%-*s %d", PadOp(), op.rc ? "mtfsb1." : "mtfsb1", op.crbd);
+	Write(fmt::format("mtfsb1%s %d", op.rc ? "." : "", op.crbd));
 }
 
 void PPUDisAsm::MCRFS(ppu_opcode_t op)
@@ -2656,12 +2223,12 @@ void PPUDisAsm::MCRFS(ppu_opcode_t op)
 
 void PPUDisAsm::MTFSB0(ppu_opcode_t op)
 {
-	fmt::append(last_opcode, "%-*s %d", PadOp(), op.rc ? "mtfsb0." : "mtfsb0", op.crbd);
+	Write(fmt::format("mtfsb0%s %d", op.rc ? "." : "", op.crbd));
 }
 
 void PPUDisAsm::MTFSFI(ppu_opcode_t op)
 {
-	fmt::append(last_opcode, "%-*s cr%d,%d,%d", PadOp(), op.rc ? "mtfsfi." : "mtfsfi", op.crfd, op.i, op.l15);
+	Write(fmt::format("mtfsfi%s cr%d,%d,%d", op.rc ? "." : "", op.crfd, op.i, op.l15));
 }
 
 void PPUDisAsm::MFFS(ppu_opcode_t op)
@@ -2671,7 +2238,7 @@ void PPUDisAsm::MFFS(ppu_opcode_t op)
 
 void PPUDisAsm::MTFSF(ppu_opcode_t op)
 {
-	fmt::append(last_opcode, "%-*s %d,f%d,%d,%d", PadOp(), op.rc ? "mtfsf." : "mtfsf", op.rc, op.flm, op.frb, op.l6, op.l15);
+	Write(fmt::format("mtfsf%s %d,f%d,%d,%d", op.rc ? "." : "", op.rc, op.flm, op.frb, op.l6, op.l15));
 }
 
 void PPUDisAsm::FCMPU(ppu_opcode_t op)
@@ -2800,10 +2367,10 @@ void PPUDisAsm::UNK(ppu_opcode_t)
 
 		if (dump_pc % 8 == 4 && index < ppu_function_manager::get().size())
 		{
-			fmt::append(last_opcode, "Function : %s (index %u)", index < g_ppu_function_names.size() ? g_ppu_function_names[index].c_str() : "?", index);
+			Write(fmt::format("Function : %s (index %u)", index < g_ppu_function_names.size() ? g_ppu_function_names[index].c_str() : "?", index));
 			return;
 		}
 	}
 
-	last_opcode += "?? ??";
+	Write("?? ??");
 }
diff --git a/rpcs3/Emu/Cell/PPUDisAsm.h b/rpcs3/Emu/Cell/PPUDisAsm.h
index fd04737b1e..725fb9876b 100644
--- a/rpcs3/Emu/Cell/PPUDisAsm.h
+++ b/rpcs3/Emu/Cell/PPUDisAsm.h
@@ -29,303 +29,264 @@ private:
 	}
 
 private:
-	void DisAsm_V4(std::string_view op, u32 v0, u32 v1, u32 v2, u32 v3)
+	void DisAsm_V4(const std::string& op, u32 v0, u32 v1, u32 v2, u32 v3)
 	{
-		fmt::append(last_opcode, "%-*s v%d,v%d,v%d,v%d", PadOp(), op, v0, v1, v2, v3);
+		Write(fmt::format("%s v%d,v%d,v%d,v%d", FixOp(op), v0, v1, v2, v3));
 	}
-	void DisAsm_V3_UIMM(std::string_view op, u32 v0, u32 v1, u32 v2, u32 uimm)
+	void DisAsm_V3_UIMM(const std::string& op, u32 v0, u32 v1, u32 v2, u32 uimm)
 	{
-		fmt::append(last_opcode, "%-*s v%d,v%d,v%d,%s", PadOp(), op, v0, v1, v2, uimm);
+		Write(fmt::format("%s v%d,v%d,v%d,%s", FixOp(op), v0, v1, v2, uimm));
 	}
-	void DisAsm_V3(std::string_view op, u32 v0, u32 v1, u32 v2)
+	void DisAsm_V3(const std::string& op, u32 v0, u32 v1, u32 v2)
 	{
-		fmt::append(last_opcode, "%-*s v%d,v%d,v%d", PadOp(), op, v0, v1, v2);
+		Write(fmt::format("%s v%d,v%d,v%d", FixOp(op), v0, v1, v2));
 	}
-	void DisAsm_V2_UIMM(std::string_view op, u32 v0, u32 v1, u32 uimm)
+	void DisAsm_V2_UIMM(const std::string& op, u32 v0, u32 v1, u32 uimm)
 	{
-		fmt::append(last_opcode, "%-*s v%d,v%d,%s", PadOp(), op, v0, v1, uimm);
+		Write(fmt::format("%s v%d,v%d,%s", FixOp(op), v0, v1, uimm));
 	}
-	void DisAsm_V2(std::string_view op, u32 v0, u32 v1)
+	void DisAsm_V2(const std::string& op, u32 v0, u32 v1)
 	{
-		fmt::append(last_opcode, "%-*s v%d,v%d", PadOp(), op, v0, v1);
+		Write(fmt::format("%s v%d,v%d", FixOp(op), v0, v1));
 	}
-	void DisAsm_V1_SIMM(std::string_view op, u32 v0, s32 simm)
+	void DisAsm_V1_SIMM(const std::string& op, u32 v0, s32 simm)
 	{
-		fmt::append(last_opcode, "%-*s v%d,%s", PadOp(), op, v0, SignedHex(simm));
+		Write(fmt::format("%s v%d,%s", FixOp(op), v0, SignedHex(simm)));
 	}
-	void DisAsm_V1(std::string_view op, u32 v0)
+	void DisAsm_V1(const std::string& op, u32 v0)
 	{
-		fmt::append(last_opcode, "%-*s v%d", PadOp(), op, v0);
+		Write(fmt::format("%s v%d", FixOp(op), v0));
 	}
-	void DisAsm_V1_R2(std::string_view op, u32 v0, u32 r1, u32 r2)
+	void DisAsm_V1_R2(const std::string& op, u32 v0, u32 r1, u32 r2)
 	{
-		fmt::append(last_opcode, "%-*s v%d,r%d,r%d", PadOp(), op, v0, r1, r2);
+		Write(fmt::format("%s v%d,r%d,r%d", FixOp(op), v0, r1, r2));
 	}
-	void DisAsm_CR1_F2_RC(std::string_view op, u32 cr0, u32 f0, u32 f1, u32 rc)
+	void DisAsm_CR1_F2_RC(const std::string& op, u32 cr0, u32 f0, u32 f1, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s cr%d,f%d,f%d", PadOp(op, rc ? 1 : 0), op, cr0, f0, f1);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s cr%d,f%d,f%d", FixOp(op + (rc ? "." : "")), cr0, f0, f1));
 	}
-	void DisAsm_CR1_F2(std::string_view op, u32 cr0, u32 f0, u32 f1)
+	void DisAsm_CR1_F2(const std::string& op, u32 cr0, u32 f0, u32 f1)
 	{
 		DisAsm_CR1_F2_RC(op, cr0, f0, f1, false);
 	}
-	void DisAsm_INT1_R2(std::string_view op, u32 i0, u32 r0, u32 r1)
+	void DisAsm_INT1_R2(const std::string& op, u32 i0, u32 r0, u32 r1)
 	{
-		fmt::append(last_opcode, "%-*s %d,r%d,r%d", PadOp(), op, i0, r0, r1);
+		Write(fmt::format("%s %d,r%d,r%d", FixOp(op), i0, r0, r1));
 	}
-	void DisAsm_INT1_R1_IMM(std::string_view op, u32 i0, u32 r0, s32 imm0)
+	void DisAsm_INT1_R1_IMM(const std::string& op, u32 i0, u32 r0, s32 imm0)
 	{
-		fmt::append(last_opcode, "%-*s %d,r%d,%s", PadOp(), op, i0, r0, SignedHex(imm0));
+		Write(fmt::format("%s %d,r%d,%s", FixOp(op), i0, r0, SignedHex(imm0)));
 	}
-	void DisAsm_INT1_R1_RC(std::string_view op, u32 i0, u32 r0, u32 rc)
+	void DisAsm_INT1_R1_RC(const std::string& op, u32 i0, u32 r0, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s %d,r%d", PadOp(op, rc ? 1 : 0), op, i0, r0);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s %d,r%d", FixOp(op + (rc ? "." : "")), i0, r0));
 	}
-	void DisAsm_INT1_R1(std::string_view op, u32 i0, u32 r0)
+	void DisAsm_INT1_R1(const std::string& op, u32 i0, u32 r0)
 	{
 		DisAsm_INT1_R1_RC(op, i0, r0, false);
 	}
-	void DisAsm_F4_RC(std::string_view op, u32 f0, u32 f1, u32 f2, u32 f3, u32 rc)
+	void DisAsm_F4_RC(const std::string& op, u32 f0, u32 f1, u32 f2, u32 f3, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s f%d,f%d,f%d,f%d", PadOp(op, rc ? 1 : 0), op, f0, f1, f2, f3);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s f%d,f%d,f%d,f%d", FixOp(op + (rc ? "." : "")), f0, f1, f2, f3));
 	}
-	void DisAsm_F3_RC(std::string_view op, u32 f0, u32 f1, u32 f2, u32 rc)
+	void DisAsm_F3_RC(const std::string& op, u32 f0, u32 f1, u32 f2, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s f%d,f%d,f%d", PadOp(op, rc ? 1 : 0), op, f0, f1, f2);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s f%d,f%d,f%d", FixOp(op + (rc ? "." : "")), f0, f1, f2));
 	}
-	void DisAsm_F3(std::string_view op, u32 f0, u32 f1, u32 f2)
+	void DisAsm_F3(const std::string& op, u32 f0, u32 f1, u32 f2)
 	{
 		DisAsm_F3_RC(op, f0, f1, f2, false);
 	}
-	void DisAsm_F2_RC(std::string_view op, u32 f0, u32 f1, u32 rc)
+	void DisAsm_F2_RC(const std::string& op, u32 f0, u32 f1, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s f%d,f%d", PadOp(op, rc ? 1 : 0), op, f0, f1);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s f%d,f%d", FixOp(op + (rc ? "." : "")), f0, f1));
 	}
-	void DisAsm_F2(std::string_view op, u32 f0, u32 f1)
+	void DisAsm_F2(const std::string& op, u32 f0, u32 f1)
 	{
 		DisAsm_F2_RC(op, f0, f1, false);
 	}
-	void DisAsm_F1_R2(std::string_view op, u32 f0, u32 r0, u32 r1)
+	void DisAsm_F1_R2(const std::string& op, u32 f0, u32 r0, u32 r1)
 	{
 		if (m_mode == cpu_disasm_mode::compiler_elf)
 		{
-			fmt::append(last_opcode, "%-*s f%d,r%d,r%d", PadOp(), op, f0, r0, r1);
+			Write(fmt::format("%s f%d,r%d,r%d", FixOp(op), f0, r0, r1));
 			return;
 		}
 
-		fmt::append(last_opcode, "%-*s f%d,r%d(r%d)", PadOp(), op, f0, r0, r1);
+		Write(fmt::format("%s f%d,r%d(r%d)", FixOp(op), f0, r0, r1));
 	}
-	void DisAsm_F1_IMM_R1_RC(std::string_view op, u32 f0, s32 imm0, u32 r0, u32 rc)
+	void DisAsm_F1_IMM_R1_RC(const std::string& op, u32 f0, s32 imm0, u32 r0, u32 rc)
 	{
 		if (m_mode == cpu_disasm_mode::compiler_elf)
 		{
-			fmt::append(last_opcode, "%-*s f%d,r%d,%s", PadOp(op, rc ? 1 : 0), op, f0, r0, SignedHex(imm0));
-			insert_char_if(op, !!rc);
+			Write(fmt::format("%s f%d,r%d,%s", FixOp(op + (rc ? "." : "")), f0, r0, SignedHex(imm0)));
 			return;
 		}
 
-		fmt::append(last_opcode, "%-*s f%d,%s(r%d)", PadOp(op, rc ? 1 : 0), op, f0, SignedHex(imm0), r0);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s f%d,%s(r%d)", FixOp(op + (rc ? "." : "")), f0, SignedHex(imm0), r0));
 	}
-	void DisAsm_F1_IMM_R1(std::string_view op, u32 f0, s32 imm0, u32 r0)
+	void DisAsm_F1_IMM_R1(const std::string& op, u32 f0, s32 imm0, u32 r0)
 	{
 		DisAsm_F1_IMM_R1_RC(op, f0, imm0, r0, false);
 	}
-	void DisAsm_F1_RC(std::string_view op, u32 f0, u32 rc)
+	void DisAsm_F1_RC(const std::string& op, u32 f0, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s f%d", PadOp(op, rc ? 1 : 0), op, f0);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s f%d", FixOp(op + (rc ? "." : "")), f0));
 	}
-	void DisAsm_R1_RC(std::string_view op, u32 r0, u32 rc)
+	void DisAsm_R1_RC(const std::string& op, u32 r0, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d", PadOp(op, rc ? 1 : 0), op, r0);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s r%d", FixOp(op + (rc ? "." : "")), r0));
 	}
-	void DisAsm_R1(std::string_view op, u32 r0)
+	void DisAsm_R1(const std::string& op, u32 r0)
 	{
 		DisAsm_R1_RC(op, r0, false);
 	}
-	void DisAsm_R2_OE_RC(std::string_view op, u32 r0, u32 r1, u32 _oe, u32 rc)
+	void DisAsm_R2_OE_RC(const std::string& op, u32 r0, u32 r1, u32 _oe, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d,r%d", PadOp(op, (rc ? 1 : 0) + (_oe ? 1 : 0)), op, r0, r1);
-		insert_char_if(insert_char_if(op, !!_oe, 'o'), !!rc, '.');
+		Write(fmt::format("%s r%d,r%d", FixOp(op + (_oe ? "o" : "") + (rc ? "." : "")), r0, r1));
 	}
-	void DisAsm_R2_RC(std::string_view op, u32 r0, u32 r1, u32 rc)
+	void DisAsm_R2_RC(const std::string& op, u32 r0, u32 r1, u32 rc)
 	{
 		DisAsm_R2_OE_RC(op, r0, r1, false, rc);
 	}
-	void DisAsm_R2(std::string_view op, u32 r0, u32 r1)
+	void DisAsm_R2(const std::string& op, u32 r0, u32 r1)
 	{
 		DisAsm_R2_RC(op, r0, r1, false);
 	}
-	void DisAsm_R3_OE_RC(std::string_view op, u32 r0, u32 r1, u32 r2, u32 _oe, u32 rc)
+	void DisAsm_R3_OE_RC(const std::string& op, u32 r0, u32 r1, u32 r2, u32 _oe, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d,r%d,r%d", PadOp(op, (rc ? 1 : 0) + (_oe ? 1 : 0)), op, r0, r1, r2);
-		insert_char_if(insert_char_if(op, !!_oe, 'o'), !!rc, '.');
+		Write(fmt::format("%s r%d,r%d,r%d", FixOp(op + (rc ? "." : "") + (_oe ? "o" : "")), r0, r1, r2));
 	}
-	void DisAsm_R3_INT2_RC(std::string_view op, u32 r0, u32 r1, u32 r2, s32 i0, s32 i1, u32 rc)
+	void DisAsm_R3_INT2_RC(const std::string& op, u32 r0, u32 r1, u32 r2, s32 i0, s32 i1, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d,r%d,r%d,%d,%d", PadOp(op, rc ? 1 : 0), op, r0, r1, r2, i0, i1);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s r%d,r%d,r%d,%d,%d", FixOp(op + (rc ? "." : "")), r0, r1, r2, i0, i1));
 	}
-	void DisAsm_R3_RC(std::string_view op, u32 r0, u32 r1, u32 r2, u32 rc)
+	void DisAsm_R3_RC(const std::string& op, u32 r0, u32 r1, u32 r2, u32 rc)
 	{
 		DisAsm_R3_OE_RC(op, r0, r1, r2, false, rc);
 	}
-	void DisAsm_R3(std::string_view op, u32 r0, u32 r1, u32 r2)
+	void DisAsm_R3(const std::string& op, u32 r0, u32 r1, u32 r2)
 	{
 		DisAsm_R3_RC(op, r0, r1, r2, false);
 	}
-	void DisAsm_R2_INT3_RC(std::string_view op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2, u32 rc)
+	void DisAsm_R2_INT3_RC(const std::string& op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d,r%d,%d,%d,%d", PadOp(op, rc ? 1 : 0), op, r0, r1, i0, i1, i2);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s r%d,r%d,%d,%d,%d", FixOp(op + (rc ? "." : "")), r0, r1, i0, i1, i2));
 	}
-	void DisAsm_R2_INT3(std::string_view op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2)
+	void DisAsm_R2_INT3(const std::string& op, u32 r0, u32 r1, s32 i0, s32 i1, s32 i2)
 	{
 		DisAsm_R2_INT3_RC(op, r0, r1, i0, i1, i2, false);
 	}
-	void DisAsm_R2_INT2_RC(std::string_view op, u32 r0, u32 r1, s32 i0, s32 i1, u32 rc)
+	void DisAsm_R2_INT2_RC(const std::string& op, u32 r0, u32 r1, s32 i0, s32 i1, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d,r%d,%d,%d", PadOp(op, rc ? 1 : 0), op, r0, r1, i0, i1);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s r%d,r%d,%d,%d", FixOp(op + (rc ? "." : "")), r0, r1, i0, i1));
 	}
-	void DisAsm_R2_INT2(std::string_view op, u32 r0, u32 r1, s32 i0, s32 i1)
+	void DisAsm_R2_INT2(const std::string& op, u32 r0, u32 r1, s32 i0, s32 i1)
 	{
 		DisAsm_R2_INT2_RC(op, r0, r1, i0, i1, false);
 	}
-	void DisAsm_R2_INT1_RC(std::string_view op, u32 r0, u32 r1, s32 i0, u32 rc)
+	void DisAsm_R2_INT1_RC(const std::string& op, u32 r0, u32 r1, s32 i0, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s r%d,r%d,%d", PadOp(op, rc ? 1 : 0), op, r0, r1, i0);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s r%d,r%d,%d", FixOp(op + (rc ? "." : "")), r0, r1, i0));
 	}
-	void DisAsm_R2_INT1(std::string_view op, u32 r0, u32 r1, s32 i0)
+	void DisAsm_R2_INT1(const std::string& op, u32 r0, u32 r1, s32 i0)
 	{
 		DisAsm_R2_INT1_RC(op, r0, r1, i0, false);
 	}
-	void DisAsm_R2_IMM(std::string_view op, u32 r0, u32 r1, s32 imm0)
+	void DisAsm_R2_IMM(const std::string& op, u32 r0, u32 r1, s32 imm0)
 	{
 		if (m_mode == cpu_disasm_mode::compiler_elf)
 		{
-			fmt::append(last_opcode, "%-*s r%d,r%d,%s", PadOp(), op, r0, r1, SignedHex(imm0));
+			Write(fmt::format("%s r%d,r%d,%s", FixOp(op), r0, r1, SignedHex(imm0)));
 			return;
 		}
 
-		fmt::append(last_opcode, "%-*s r%d,%s(r%d)", PadOp(), op, r0, SignedHex(imm0), r1);
+		Write(fmt::format("%s r%d,%s(r%d)", FixOp(op), r0, SignedHex(imm0), r1));
 	}
-	void DisAsm_R1_IMM(std::string_view op, u32 r0, s32 imm0)
+	void DisAsm_R1_IMM(const std::string& op, u32 r0, s32 imm0)
 	{
-		fmt::append(last_opcode, "%-*s r%d,%s", PadOp(), op, r0, SignedHex(imm0));
+		Write(fmt::format("%s r%d,%s", FixOp(op), r0, SignedHex(imm0)));
 	}
-	void DisAsm_IMM_R1(std::string_view op, s32 imm0, u32 r0)
+	void DisAsm_IMM_R1(const std::string& op, s32 imm0, u32 r0)
 	{
-		fmt::append(last_opcode, "%-*s %d,r%d  #%x", PadOp(), op, imm0, r0, imm0);
+		Write(fmt::format("%s %d,r%d  #%x", FixOp(op), imm0, r0, imm0));
 	}
-	void DisAsm_CR1_R1_IMM(std::string_view op, u32 cr0, u32 r0, s32 imm0)
+	void DisAsm_CR1_R1_IMM(const std::string& op, u32 cr0, u32 r0, s32 imm0)
 	{
-		fmt::append(last_opcode, "%-*s cr%d,r%d,%s", PadOp(), op, cr0, r0, SignedHex(imm0));
+		Write(fmt::format("%s cr%d,r%d,%s", FixOp(op), cr0, r0, SignedHex(imm0)));
 	}
-	void DisAsm_CR1_R2_RC(std::string_view op, u32 cr0, u32 r0, u32 r1, u32 rc)
+	void DisAsm_CR1_R2_RC(const std::string& op, u32 cr0, u32 r0, u32 r1, u32 rc)
 	{
-		fmt::append(last_opcode, "%-*s cr%d,r%d,r%d", PadOp(op, rc ? 1 : 0), op, cr0, r0, r1);
-		insert_char_if(op, !!rc);
+		Write(fmt::format("%s%s cr%d,r%d,r%d", FixOp(op), (rc ? "." : ""), cr0, r0, r1));
 	}
-	void DisAsm_CR1_R1(std::string_view op, u32 cr0, u32 r0)
+	void DisAsm_CR1_R1(const std::string& op, u32 cr0, u32 r0)
 	{
-		fmt::append(last_opcode, "%-*s cr%d,r%d", PadOp(), op, cr0, r0);
+		Write(fmt::format("%s cr%d,r%d", FixOp(op), cr0, r0));
 	}
-	void DisAsm_R1_CR1(std::string_view op, u32 r0, u32 cr0)
+	void DisAsm_R1_CR1(const std::string& op, u32 r0, u32 cr0)
 	{
-		fmt::append(last_opcode, "%-*s r%d,cr%d", PadOp(), op, r0, cr0);
+		Write(fmt::format("%s r%d,cr%d", FixOp(op), r0, cr0));
 	}
-	void DisAsm_CR1_R2(std::string_view op, u32 cr0, u32 r0, u32 r1)
+	void DisAsm_CR1_R2(const std::string& op, u32 cr0, u32 r0, u32 r1)
 	{
 		DisAsm_CR1_R2_RC(op, cr0, r0, r1, false);
 	}
-	void DisAsm_CR2(std::string_view op, u32 cr0, u32 cr1)
+	void DisAsm_CR2(const std::string& op, u32 cr0, u32 cr1)
 	{
-		fmt::append(last_opcode, "%-*s cr%d,cr%d", PadOp(), op, cr0, cr1);
+		Write(fmt::format("%s cr%d,cr%d", FixOp(op), cr0, cr1));
 	}
-	void DisAsm_BI1(std::string_view op, const int i0)
+	void DisAsm_BI1(const std::string& op, const int i0)
 	{
-		fmt::append(last_opcode, "%-*s cr%d[%s]", PadOp(), op, i0 / 4, get_partial_BI_field(i0));
+		Write(fmt::format("%s cr%d[%s]", FixOp(op), i0 / 4, get_partial_BI_field(i0)));
 	}
-	void DisAsm_BI2(std::string_view op, const int i0, const int i1)
+	void DisAsm_BI2(const std::string& op, const int i0, const int i1)
 	{
-		fmt::append(last_opcode, "%-*s cr%d[%s],cr%d[%s]", PadOp(), op, i0 / 4, get_partial_BI_field(i0), i1 / 4, get_partial_BI_field(i1));
+		Write(fmt::format("%s cr%d[%s],cr%d[%s]", FixOp(op), i0 / 4, get_partial_BI_field(i0), i1 / 4, get_partial_BI_field(i1)));
 	}
-	void DisAsm_BI3(std::string_view op, const int i0, const int i1, const int i2)
+	void DisAsm_BI3(const std::string& op, const int i0, const int i1, const int i2)
 	{
-		fmt::append(last_opcode, "%-*s cr%d[%s],cr%d[%s],cr%d[%s]", PadOp(), op,
-		i0 / 4, get_partial_BI_field(i0), i1 / 4, get_partial_BI_field(i1), i2 / 4, get_partial_BI_field(i2));
+		Write(fmt::format("%s cr%d[%s],cr%d[%s],cr%d[%s]", FixOp(op),
+		i0 / 4, get_partial_BI_field(i0), i1 / 4, get_partial_BI_field(i1), i2 / 4, get_partial_BI_field(i2)));
 	}
-	void DisAsm_INT3(std::string_view op, const int i0, const int i1, const int i2)
+	void DisAsm_INT3(const std::string& op, const int i0, const int i1, const int i2)
 	{
-		fmt::append(last_opcode, "%-*s %d,%d,%d", PadOp(), op, i0, i1, i2);
+		Write(fmt::format("%s %d,%d,%d", FixOp(op), i0, i1, i2));
 	}
-	void DisAsm_INT1(std::string_view op, const int i0)
+	void DisAsm_INT1(const std::string& op, const int i0)
 	{
-		fmt::append(last_opcode, "%-*s %d", PadOp(), op, i0);
+		Write(fmt::format("%s %d", FixOp(op), i0));
 	}
-	void DisAsm_BRANCH(std::string_view op, const int pc)
+	void DisAsm_BRANCH(const std::string& op, const int pc)
 	{
-		fmt::append(last_opcode, "%-*s 0x%x", PadOp(), op, DisAsmBranchTarget(pc));
+		Write(fmt::format("%s 0x%x", FixOp(op), DisAsmBranchTarget(pc)));
 	}
-	void DisAsm_BRANCH_A(std::string_view op, const int pc)
+	void DisAsm_BRANCH_A(const std::string& op, const int pc)
 	{
-		fmt::append(last_opcode, "%-*s 0x%x", PadOp(), op, pc);
+		Write(fmt::format("%s 0x%x", FixOp(op), pc));
 	}
-	void DisAsm_B2_BRANCH(std::string_view op, u32 b0, u32 b1, const int pc)
+	void DisAsm_B2_BRANCH(const std::string& op, u32 b0, u32 b1, const int pc)
 	{
-		fmt::append(last_opcode, "%-*s %d,%d,0x%x ", PadOp(), op, b0, b1, DisAsmBranchTarget(pc));
+		Write(fmt::format("%s %d,%d,0x%x ", FixOp(op), b0, b1, DisAsmBranchTarget(pc)));
 	}
-	void DisAsm_CR_BRANCH(std::string_view op, u32 cr, const int pc)
+	void DisAsm_CR_BRANCH(const std::string& op, u32 cr, const int pc)
 	{
-		fmt::append(last_opcode, "%-*s cr%d,0x%x ", PadOp(), op, cr, DisAsmBranchTarget(pc));
+		Write(fmt::format("%s cr%d,0x%x ", FixOp(op), cr, DisAsmBranchTarget(pc)));
 	}
-	void DisAsm_CR_BRANCH_A(std::string_view op, u32 cr, const int pc)
+	void DisAsm_CR_BRANCH_A(const std::string& op, u32 cr, const int pc)
 	{
-		fmt::append(last_opcode, "%-*s cr%d,0x%x ", PadOp(), op, cr, pc);
+		Write(fmt::format("%s cr%d,0x%x ", FixOp(op), cr, pc));
 	}
-	void DisAsm_BI_BRANCH(std::string_view op, u32 bi, const int pc)
+	void DisAsm_BI_BRANCH(const std::string& op, u32 bi, const int pc)
 	{
-		fmt::append(last_opcode, "%-*s cr%d[%s],0x%x ", PadOp(), op, bi / 4, get_partial_BI_field(bi), DisAsmBranchTarget(pc));
+		Write(fmt::format("%s cr%d[%s],0x%x ", FixOp(op), bi / 4, get_partial_BI_field(bi), DisAsmBranchTarget(pc)));
 	}
-	void DisAsm_BI_BRANCH_A(std::string_view op, u32 bi, const int pc)
+	void DisAsm_BI_BRANCH_A(const std::string& op, u32 bi, const int pc)
 	{
-		fmt::append(last_opcode, "%-*s cr%d[%s],0x%x ", PadOp(), op, bi / 4, get_partial_BI_field(bi), pc);
+		Write(fmt::format("%s cr%d[%s],0x%x ", FixOp(op), bi / 4, get_partial_BI_field(bi), pc));
 	}
 
 public:
 	u32 disasm(u32 pc) override;
-	std::pair<const void*, usz> get_memory_span() const override;
-	std::unique_ptr<CPUDisAsm> copy_type_erased() const override;
-
-	enum class const_op
-	{
-		none,
-		form, // Cosntant formation
-		xor_mask, // Constant XOR mask applied (used with CMPI/CMPLI instructions, covers their limit of 16-bit immediates)
-	};
-
-	std::pair<const_op, u64> try_get_const_op_gpr_value(u32 reg, u32 pc = -1, u32 TTL = 10) const;
-
-	std::pair<bool, u64> try_get_const_gpr_value(u32 reg, u32 pc = -1) const
-	{
-		auto [op, res] = try_get_const_op_gpr_value(reg, pc);
-		return {op == const_op::form, res};
-	}
-
-	std::pair<bool, u64> try_get_const_xor_gpr_value(u32 reg, u32 pc = -1) const
-	{
-		auto [op, res] = try_get_const_op_gpr_value(reg, pc);
-		return {op == const_op::xor_mask, res};
-	}
 
 	void MFVSCR(ppu_opcode_t op);
 	void MTVSCR(ppu_opcode_t op);
@@ -351,31 +312,18 @@ public:
 	void VCFSX(ppu_opcode_t op);
 	void VCFUX(ppu_opcode_t op);
 	void VCMPBFP(ppu_opcode_t op);
-	void VCMPBFP_(ppu_opcode_t op) { return VCMPBFP(op); }
 	void VCMPEQFP(ppu_opcode_t op);
-	void VCMPEQFP_(ppu_opcode_t op) { return VCMPEQFP(op); }
 	void VCMPEQUB(ppu_opcode_t op);
-	void VCMPEQUB_(ppu_opcode_t op) { return VCMPEQUB(op); }
 	void VCMPEQUH(ppu_opcode_t op);
-	void VCMPEQUH_(ppu_opcode_t op) { return VCMPEQUH(op); }
 	void VCMPEQUW(ppu_opcode_t op);
-	void VCMPEQUW_(ppu_opcode_t op) { return VCMPEQUW(op); }
 	void VCMPGEFP(ppu_opcode_t op);
-	void VCMPGEFP_(ppu_opcode_t op) { return VCMPGEFP(op); }
 	void VCMPGTFP(ppu_opcode_t op);
-	void VCMPGTFP_(ppu_opcode_t op) { return VCMPGTFP(op); }
 	void VCMPGTSB(ppu_opcode_t op);
-	void VCMPGTSB_(ppu_opcode_t op) { return VCMPGTSB(op); }
 	void VCMPGTSH(ppu_opcode_t op);
-	void VCMPGTSH_(ppu_opcode_t op) { return VCMPGTSH(op); }
 	void VCMPGTSW(ppu_opcode_t op);
-	void VCMPGTSW_(ppu_opcode_t op) { return VCMPGTSW(op); }
 	void VCMPGTUB(ppu_opcode_t op);
-	void VCMPGTUB_(ppu_opcode_t op) { return VCMPGTUB(op); }
 	void VCMPGTUH(ppu_opcode_t op);
-	void VCMPGTUH_(ppu_opcode_t op) { return VCMPGTUH(op); }
 	void VCMPGTUW(ppu_opcode_t op);
-	void VCMPGTUW_(ppu_opcode_t op) { return VCMPGTUW(op); }
 	void VCTSXS(ppu_opcode_t op);
 	void VCTUXS(ppu_opcode_t op);
 	void VEXPTEFP(ppu_opcode_t op);
@@ -721,128 +669,4 @@ public:
 	void FCFID(ppu_opcode_t op);
 
 	void UNK(ppu_opcode_t op);
-
-	void SUBFCO(ppu_opcode_t op) { return SUBFC(op); }
-	void ADDCO(ppu_opcode_t op) { return ADDC(op); }
-	void SUBFO(ppu_opcode_t op) { return SUBF(op); }
-	void NEGO(ppu_opcode_t op) { return NEG(op); }
-	void SUBFEO(ppu_opcode_t op) { return SUBFE(op); }
-	void ADDEO(ppu_opcode_t op) { return ADDE(op); }
-	void SUBFZEO(ppu_opcode_t op) { return SUBFZE(op); }
-	void ADDZEO(ppu_opcode_t op) { return ADDZE(op); }
-	void SUBFMEO(ppu_opcode_t op) { return SUBFME(op); }
-	void MULLDO(ppu_opcode_t op) { return MULLD(op); }
-	void ADDMEO(ppu_opcode_t op) { return ADDME(op); }
-	void MULLWO(ppu_opcode_t op) { return MULLW(op); }
-	void ADDO(ppu_opcode_t op) { return ADD(op); }
-	void DIVDUO(ppu_opcode_t op) { return DIVDU(op); }
-	void DIVWUO(ppu_opcode_t op) { return DIVWU(op); }
-	void DIVDO(ppu_opcode_t op) { return DIVD(op); }
-	void DIVWO(ppu_opcode_t op) { return DIVW(op); }
-
-	void SUBFCO_(ppu_opcode_t op) { return SUBFC(op); }
-	void ADDCO_(ppu_opcode_t op) { return ADDC(op); }
-	void SUBFO_(ppu_opcode_t op) { return SUBF(op); }
-	void NEGO_(ppu_opcode_t op) { return NEG(op); }
-	void SUBFEO_(ppu_opcode_t op) { return SUBFE(op); }
-	void ADDEO_(ppu_opcode_t op) { return ADDE(op); }
-	void SUBFZEO_(ppu_opcode_t op) { return SUBFZE(op); }
-	void ADDZEO_(ppu_opcode_t op) { return ADDZE(op); }
-	void SUBFMEO_(ppu_opcode_t op) { return SUBFME(op); }
-	void MULLDO_(ppu_opcode_t op) { return MULLD(op); }
-	void ADDMEO_(ppu_opcode_t op) { return ADDME(op); }
-	void MULLWO_(ppu_opcode_t op) { return MULLW(op); }
-	void ADDO_(ppu_opcode_t op) { return ADD(op); }
-	void DIVDUO_(ppu_opcode_t op) { return DIVDU(op); }
-	void DIVWUO_(ppu_opcode_t op) { return DIVWU(op); }
-	void DIVDO_(ppu_opcode_t op) { return DIVD(op); }
-	void DIVWO_(ppu_opcode_t op) { return DIVW(op); }
-
-	void RLWIMI_(ppu_opcode_t op) { return RLWIMI(op); }
-	void RLWINM_(ppu_opcode_t op) { return RLWINM(op); }
-	void RLWNM_(ppu_opcode_t op) { return RLWNM(op); }
-	void RLDICL_(ppu_opcode_t op) { return RLDICL(op); }
-	void RLDICR_(ppu_opcode_t op) { return RLDICR(op); }
-	void RLDIC_(ppu_opcode_t op) { return RLDIC(op); }
-	void RLDIMI_(ppu_opcode_t op) { return RLDIMI(op); }
-	void RLDCL_(ppu_opcode_t op) { return RLDCL(op); }
-	void RLDCR_(ppu_opcode_t op) { return RLDCR(op); }
-	void SUBFC_(ppu_opcode_t op) { return SUBFC(op); }
-	void MULHDU_(ppu_opcode_t op) { return MULHDU(op); }
-	void ADDC_(ppu_opcode_t op) { return ADDC(op); }
-	void MULHWU_(ppu_opcode_t op) { return MULHWU(op); }
-	void SLW_(ppu_opcode_t op) { return SLW(op); }
-	void CNTLZW_(ppu_opcode_t op) { return CNTLZW(op); }
-	void SLD_(ppu_opcode_t op) { return SLD(op); }
-	void AND_(ppu_opcode_t op) { return AND(op); }
-	void SUBF_(ppu_opcode_t op) { return SUBF(op); }
-	void CNTLZD_(ppu_opcode_t op) { return CNTLZD(op); }
-	void ANDC_(ppu_opcode_t op) { return ANDC(op); }
-	void MULHD_(ppu_opcode_t op) { return MULHD(op); }
-	void MULHW_(ppu_opcode_t op) { return MULHW(op); }
-	void NEG_(ppu_opcode_t op) { return NEG(op); }
-	void NOR_(ppu_opcode_t op) { return NOR(op); }
-	void SUBFE_(ppu_opcode_t op) { return SUBFE(op); }
-	void ADDE_(ppu_opcode_t op) { return ADDE(op); }
-	void SUBFZE_(ppu_opcode_t op) { return SUBFZE(op); }
-	void ADDZE_(ppu_opcode_t op) { return ADDZE(op); }
-	void MULLD_(ppu_opcode_t op) { return MULLD(op); }
-	void SUBFME_(ppu_opcode_t op) { return SUBFME(op); }
-	void ADDME_(ppu_opcode_t op) { return ADDME(op); }
-	void MULLW_(ppu_opcode_t op) { return MULLW(op); }
-	void ADD_(ppu_opcode_t op) { return ADD(op); }
-	void EQV_(ppu_opcode_t op) { return EQV(op); }
-	void XOR_(ppu_opcode_t op) { return XOR(op); }
-	void ORC_(ppu_opcode_t op) { return ORC(op); }
-	void OR_(ppu_opcode_t op) { return OR(op); }
-	void DIVDU_(ppu_opcode_t op) { return DIVDU(op); }
-	void DIVWU_(ppu_opcode_t op) { return DIVWU(op); }
-	void NAND_(ppu_opcode_t op) { return NAND(op); }
-	void DIVD_(ppu_opcode_t op) { return DIVD(op); }
-	void DIVW_(ppu_opcode_t op) { return DIVW(op); }
-	void SRW_(ppu_opcode_t op) { return SRW(op); }
-	void SRD_(ppu_opcode_t op) { return SRD(op); }
-	void SRAW_(ppu_opcode_t op) { return SRAW(op); }
-	void SRAD_(ppu_opcode_t op) { return SRAD(op); }
-	void SRAWI_(ppu_opcode_t op) { return SRAWI(op); }
-	void SRADI_(ppu_opcode_t op) { return SRADI(op); }
-	void EXTSH_(ppu_opcode_t op) { return EXTSH(op); }
-	void EXTSB_(ppu_opcode_t op) { return EXTSB(op); }
-	void EXTSW_(ppu_opcode_t op) { return EXTSW(op); }
-	void FDIVS_(ppu_opcode_t op) { return FDIVS(op); }
-	void FSUBS_(ppu_opcode_t op) { return FSUBS(op); }
-	void FADDS_(ppu_opcode_t op) { return FADDS(op); }
-	void FSQRTS_(ppu_opcode_t op) { return FSQRTS(op); }
-	void FRES_(ppu_opcode_t op) { return FRES(op); }
-	void FMULS_(ppu_opcode_t op) { return FMULS(op); }
-	void FMADDS_(ppu_opcode_t op) { return FMADDS(op); }
-	void FMSUBS_(ppu_opcode_t op) { return FMSUBS(op); }
-	void FNMSUBS_(ppu_opcode_t op) { return FNMSUBS(op); }
-	void FNMADDS_(ppu_opcode_t op) { return FNMADDS(op); }
-	void MTFSB1_(ppu_opcode_t op) { return MTFSB1(op); }
-	void MTFSB0_(ppu_opcode_t op) { return MTFSB0(op); }
-	void MTFSFI_(ppu_opcode_t op) { return MTFSFI(op); }
-	void MFFS_(ppu_opcode_t op) { return MFFS(op); }
-	void MTFSF_(ppu_opcode_t op) { return MTFSF(op); }
-	void FRSP_(ppu_opcode_t op) { return FRSP(op); }
-	void FCTIW_(ppu_opcode_t op) { return FCTIW(op); }
-	void FCTIWZ_(ppu_opcode_t op) { return FCTIWZ(op); }
-	void FDIV_(ppu_opcode_t op) { return FDIV(op); }
-	void FSUB_(ppu_opcode_t op) { return FSUB(op); }
-	void FADD_(ppu_opcode_t op) { return FADD(op); }
-	void FSQRT_(ppu_opcode_t op) { return FSQRT(op); }
-	void FSEL_(ppu_opcode_t op) { return FSEL(op); }
-	void FMUL_(ppu_opcode_t op) { return FMUL(op); }
-	void FRSQRTE_(ppu_opcode_t op) { return FRSQRTE(op); }
-	void FMSUB_(ppu_opcode_t op) { return FMSUB(op); }
-	void FMADD_(ppu_opcode_t op) { return FMADD(op); }
-	void FNMSUB_(ppu_opcode_t op) { return FNMSUB(op); }
-	void FNMADD_(ppu_opcode_t op) { return FNMADD(op); }
-	void FNEG_(ppu_opcode_t op) { return FNEG(op); }
-	void FMR_(ppu_opcode_t op) { return FMR(op); }
-	void FNABS_(ppu_opcode_t op) { return FNABS(op); }
-	void FABS_(ppu_opcode_t op) { return FABS(op); }
-	void FCTID_(ppu_opcode_t op) { return FCTID(op); }
-	void FCTIDZ_(ppu_opcode_t op) { return FCTIDZ(op); }
-	void FCFID_(ppu_opcode_t op) { return FCFID(op); }
 };
diff --git a/rpcs3/Emu/Cell/PPUFunction.cpp b/rpcs3/Emu/Cell/PPUFunction.cpp
index 1cc15440c7..3999b10b0c 100644
--- a/rpcs3/Emu/Cell/PPUFunction.cpp
+++ b/rpcs3/Emu/Cell/PPUFunction.cpp
@@ -1,10 +1,8 @@
 #include "stdafx.h"
 #include "PPUFunction.h"
 #include "Utilities/JIT.h"
-#include "util/serialization.hpp"
 
 #include "PPUModule.h"
-#include "PPUInterpreter.h"
 
 // Get function name by FNID
 extern std::string ppu_get_function_name(const std::string& _module, u32 fnid)
@@ -1891,106 +1889,61 @@ extern std::string ppu_get_variable_name(const std::string& _module, u32 vnid)
 	return fmt::format("0x%08X", vnid);
 }
 
-#if defined(ARCH_X64)
-
-auto gen_ghc_cpp_trampoline(ppu_intrp_func_t fn_target)
+std::vector<ppu_function_t>& ppu_function_manager::access(bool ghc)
 {
-	return [fn_target] (native_asm& c, auto& args)
+	static std::vector<ppu_function_t> list
 	{
-		using namespace asmjit;
-
-		// Take second ghc arg
-		c.mov(args[0], x86::rbp);
-		c.mov(args[2].r32(), x86::dword_ptr(args[0], ::offset32(&ppu_thread::cia)));
-		c.movabs(args[1], reinterpret_cast<u64>(&vm::g_base_addr));
-		c.add(args[2], x86::qword_ptr(args[1]));
-		c.jmp(Imm(fn_target));
-	};
-}
-
-#elif defined(ARCH_ARM64)
-
-auto gen_ghc_cpp_trampoline(ppu_intrp_func_t fn_target)
-{
-	return [fn_target] (native_asm& c, auto& args)
-	{
-		using namespace asmjit;
-
-		// Take second ghc arg
-		c.mov(args[0], a64::x20);
-
-		Label cia_offset = c.newLabel();
-		c.ldr(a64::x11, arm::Mem(cia_offset));
-		c.ldr(a64::x26, arm::Mem(args[0], a64::x11));
-
-		Label base_addr = c.newLabel();
-		c.ldr(a64::x22, arm::Mem(base_addr));
-		c.ldr(a64::x22, arm::Mem(a64::x22));
-
-		c.add(args[2], a64::x22, a64::x26);
-
-		Label jmp_target = c.newLabel();
-		c.ldr(a64::x22, arm::Mem(jmp_target));
-		c.br(a64::x22);
-
-		c.bind(base_addr);
-		c.embedUInt64(reinterpret_cast<u64>(&vm::g_base_addr));
-		c.bind(cia_offset);
-		c.embedUInt64(static_cast<u64>(::offset32(&ppu_thread::cia)));
-		c.bind(jmp_target);
-		c.embedUInt64(reinterpret_cast<u64>(fn_target));
-	};
-}
-
-#else
-#error "Not implemented!"
-#endif
-
-ppu_function_manager::ppu_function_manager(utils::serial& ar)
-	: addr(ar)
-{
-}
-
-void ppu_function_manager::save(utils::serial& ar)
-{
-	ar(addr);
-}
-
-std::vector<ppu_intrp_func_t>& ppu_function_manager::access(bool ghc)
-{
-	static std::vector<ppu_intrp_func_t> list
-	{
-		[](ppu_thread& ppu, ppu_opcode_t, be_t<u32>* this_op, ppu_intrp_func*)
+		[](ppu_thread& ppu) -> bool
 		{
-			ppu.cia = vm::get_addr(this_op);
 			ppu_log.error("Unregistered function called (LR=0x%x)", ppu.lr);
 			ppu.gpr[3] = 0;
 			ppu.cia = static_cast<u32>(ppu.lr) & ~3;
+			return false;
 		},
-		[](ppu_thread& ppu, ppu_opcode_t, be_t<u32>* this_op, ppu_intrp_func*)
+		[](ppu_thread& ppu) -> bool
 		{
 			ppu.state += cpu_flag::ret;
-			ppu.cia = vm::get_addr(this_op) + 4;
+			ppu.cia += 4;
+			return false;
 		},
 	};
 
-	static std::vector<ppu_intrp_func_t> list_ghc
+	static std::vector<ppu_function_t> list_ghc
 	{
-		build_function_asm<ppu_intrp_func_t>("ppu_unregistered", gen_ghc_cpp_trampoline(list[0])),
-		build_function_asm<ppu_intrp_func_t>("ppu_return", gen_ghc_cpp_trampoline(list[1])),
+		build_function_asm<ppu_function_t>([](asmjit::X86Assembler& c, auto& args)
+		{
+			using namespace asmjit;
+
+			c.mov(args[0], x86::rbp);
+			c.jmp(imm_ptr(list[0]));
+		}),
+		build_function_asm<ppu_function_t>([](asmjit::X86Assembler& c, auto& args)
+		{
+			using namespace asmjit;
+
+			c.mov(args[0], x86::rbp);
+			c.jmp(imm_ptr(list[1]));
+		}),
 	};
 
 	return ghc ? list_ghc : list;
 }
 
-u32 ppu_function_manager::add_function(ppu_intrp_func_t function)
+u32 ppu_function_manager::add_function(ppu_function_t function)
 {
 	auto& list = access();
 	auto& list2 = access(true);
 
 	list.push_back(function);
 
-	list2.push_back(build_function_asm<ppu_intrp_func_t>("", gen_ghc_cpp_trampoline(function)));
+	// Generate trampoline
+	list2.push_back(build_function_asm<ppu_function_t>([&](asmjit::X86Assembler& c, auto& args)
+	{
+		using namespace asmjit;
+
+		c.mov(args[0], x86::rbp);
+		c.jmp(imm_ptr(function));
+	}));
 
 	return ::size32(list) - 1;
 }
diff --git a/rpcs3/Emu/Cell/PPUFunction.h b/rpcs3/Emu/Cell/PPUFunction.h
index a42ae12d65..286e45535a 100644
--- a/rpcs3/Emu/Cell/PPUFunction.h
+++ b/rpcs3/Emu/Cell/PPUFunction.h
@@ -1,27 +1,23 @@
 #pragma once
 
 #include "PPUThread.h"
-#include "PPUInterpreter.h"
 
 #include "util/v128.hpp"
 
-// BIND_FUNC macro "converts" any appropriate HLE function to ppu_intrp_func_t, binding it to PPU thread context.
-#define BIND_FUNC(func, ...) (static_cast<ppu_intrp_func_t>([](ppu_thread& ppu, ppu_opcode_t, be_t<u32>* this_op, ppu_intrp_func*) {\
+using ppu_function_t = bool(*)(ppu_thread&);
+
+// BIND_FUNC macro "converts" any appropriate HLE function to ppu_function_t, binding it to PPU thread context.
+#define BIND_FUNC(func, ...) (static_cast<ppu_function_t>([](ppu_thread& ppu) -> bool {\
 	const auto old_f = ppu.current_function;\
 	if (!old_f) ppu.last_function = #func;\
 	ppu.current_function = #func;\
-	ppu.cia = vm::get_addr(this_op); \
 	std::memcpy(ppu.syscall_args, ppu.gpr + 3, sizeof(ppu.syscall_args)); \
 	ppu_func_detail::do_call(ppu, func);\
 	static_cast<void>(ppu.test_stopped());\
-	auto& history = ppu.syscall_history.data[ppu.syscall_history.index++ % ppu.syscall_history.data.size()];\
-	history.cia = ppu.cia;\
-	history.func_name = ppu.current_function;\
-	history.error = ppu.gpr[3];\
-	if (ppu.syscall_history.count_debug_arguments) std::copy_n(ppu.syscall_args, std::size(history.args), history.args.data());\
 	ppu.current_function = old_f;\
 	ppu.cia += 4;\
 	__VA_ARGS__;\
+	return false;\
 }))
 
 struct ppu_va_args_t
@@ -47,8 +43,8 @@ namespace ppu_func_detail
 	struct bind_arg
 	{
 		static_assert(type == ARG_GENERAL, "Unknown function argument type");
-		static_assert(!std::is_pointer_v<T>, "Invalid function argument type (pointer)");
-		static_assert(!std::is_reference_v<T>, "Invalid function argument type (reference)");
+		static_assert(!std::is_pointer<T>::value, "Invalid function argument type (pointer)");
+		static_assert(!std::is_reference<T>::value, "Invalid function argument type (reference)");
 		static_assert(sizeof(T) <= 8, "Invalid function argument type for ARG_GENERAL");
 
 		static inline T get_arg(ppu_thread& ppu)
@@ -71,7 +67,7 @@ namespace ppu_func_detail
 	template<typename T, u32 g_count, u32 f_count, u32 v_count>
 	struct bind_arg<T, ARG_VECTOR, g_count, f_count, v_count>
 	{
-		static_assert(std::is_same_v<std::decay_t<T>, v128>, "Invalid function argument type for ARG_VECTOR");
+		static_assert(std::is_same<std::decay_t<T>, v128>::value, "Invalid function argument type for ARG_VECTOR");
 
 		static FORCE_INLINE T get_arg(ppu_thread& ppu)
 		{
@@ -93,7 +89,7 @@ namespace ppu_func_detail
 	template<typename T, u32 g_count, u32 f_count, u32 v_count>
 	struct bind_arg<T, ARG_CONTEXT, g_count, f_count, v_count>
 	{
-		static_assert(std::is_base_of_v<std::decay_t<T>, ppu_thread>, "Invalid function argument type for ARG_CONTEXT");
+		static_assert(std::is_base_of<std::decay_t<T>, ppu_thread>::value, "Invalid function argument type for ARG_CONTEXT");
 
 		static FORCE_INLINE T& get_arg(ppu_thread& ppu)
 		{
@@ -104,7 +100,7 @@ namespace ppu_func_detail
 	template<typename T, u32 g_count, u32 f_count, u32 v_count>
 	struct bind_arg<T, ARG_VARIADIC, g_count, f_count, v_count>
 	{
-		static_assert(std::is_same_v<std::decay_t<T>, ppu_va_args_t>, "Invalid function argument type for ARG_VARIADIC");
+		static_assert(std::is_same<std::decay_t<T>, ppu_va_args_t>::value, "Invalid function argument type for ARG_VARIADIC");
 
 		static FORCE_INLINE ppu_va_args_t get_arg(ppu_thread&)
 		{
@@ -120,7 +116,6 @@ namespace ppu_func_detail
 
 		static FORCE_INLINE void put_result(ppu_thread& ppu, const T& result)
 		{
-			if (ppu.state & cpu_flag::again) return;
 			ppu.gpr[3] = ppu_gpr_cast(result);
 		}
 	};
@@ -132,7 +127,6 @@ namespace ppu_func_detail
 
 		static FORCE_INLINE void put_result(ppu_thread& ppu, const T& result)
 		{
-			if (ppu.state & cpu_flag::again) return;
 			ppu.fpr[1] = static_cast<T>(result);
 		}
 	};
@@ -140,11 +134,10 @@ namespace ppu_func_detail
 	template<typename T>
 	struct bind_result<T, ARG_VECTOR>
 	{
-		static_assert(std::is_same_v<std::decay_t<T>, v128>, "Invalid function result type for ARG_VECTOR");
+		static_assert(std::is_same<std::decay_t<T>, v128>::value, "Invalid function result type for ARG_VECTOR");
 
 		static FORCE_INLINE void put_result(ppu_thread& ppu, const T& result)
 		{
-			if (ppu.state & cpu_flag::again) return;
 			ppu.vr[2] = result;
 		}
 	};
@@ -192,13 +185,13 @@ namespace ppu_func_detail
 		const u32 v_count = (info.last_value >> 24);
 
 		// TODO: check calculations
-		constexpr bool is_float = std::is_floating_point_v<T>;
-		constexpr bool is_vector = std::is_same_v<std::decay_t<T>, v128>;
-		constexpr bool is_context = std::is_base_of_v<std::decay_t<T>, ppu_thread>;
-		constexpr bool is_variadic = std::is_same_v<std::decay_t<T>, ppu_va_args_t>;
-		constexpr bool is_general = !is_float && !is_vector && !is_context && !is_variadic;
+		const bool is_float = std::is_floating_point<T>::value;
+		const bool is_vector = std::is_same<std::decay_t<T>, v128>::value;
+		const bool is_context = std::is_base_of<std::decay_t<T>, ppu_thread>::value;
+		const bool is_variadic = std::is_same<std::decay_t<T>, ppu_va_args_t>::value;
+		const bool is_general = !is_float && !is_vector && !is_context && !is_variadic;
 
-		constexpr arg_class t =
+		const arg_class t =
 			is_general ? (g_count >= 8 ? ARG_STACK : ARG_GENERAL) :
 			is_float ? (f_count >= 13 ? ARG_STACK : ARG_FLOAT) :
 			is_vector ? (v_count >= 12 ? ARG_STACK : ARG_VECTOR) :
@@ -206,9 +199,9 @@ namespace ppu_func_detail
 			is_variadic ? ARG_VARIADIC :
 			ARG_UNKNOWN;
 
-		constexpr u32 g = g_count + (is_general || is_float ? 1 : is_vector ? (g_count & 1) + 2 : 0);
-		constexpr u32 f = f_count + is_float;
-		constexpr u32 v = v_count + is_vector;
+		const u32 g = g_count + (is_general || is_float ? 1 : is_vector ? (g_count & 1) + 2 : 0);
+		const u32 f = f_count + is_float;
+		const u32 v = v_count + is_vector;
 
 		return call<Types...>(ppu, func, arg_info_pack_t<Info..., t | (g << 8) | (f << 16) | (v << 24)>{});
 	}
@@ -216,11 +209,11 @@ namespace ppu_func_detail
 	template<typename RT>
 	struct result_type
 	{
-		static_assert(!std::is_pointer_v<RT>, "Invalid function result type (pointer)");
-		static_assert(!std::is_reference_v<RT>, "Invalid function result type (reference)");
-		static constexpr bool is_float = std::is_floating_point_v<RT>;
-		static constexpr bool is_vector = std::is_same_v<std::decay_t<RT>, v128>;
-		static constexpr arg_class value = is_float ? ARG_FLOAT : (is_vector ? ARG_VECTOR : ARG_GENERAL);
+		static_assert(!std::is_pointer<RT>::value, "Invalid function result type (pointer)");
+		static_assert(!std::is_reference<RT>::value, "Invalid function result type (reference)");
+		static const bool is_float = std::is_floating_point<RT>::value;
+		static const bool is_vector = std::is_same<std::decay_t<RT>, v128>::value;
+		static const arg_class value = is_float ? ARG_FLOAT : (is_vector ? ARG_VECTOR : ARG_GENERAL);
 	};
 
 	template<typename RT, typename... T> struct func_binder;
@@ -264,9 +257,9 @@ class ppu_function_manager
 	};
 
 	// Access global function list
-	static std::vector<ppu_intrp_func_t>& access(bool ghc = false);
+	static std::vector<ppu_function_t>& access(bool ghc = false);
 
-	static u32 add_function(ppu_intrp_func_t function);
+	static u32 add_function(ppu_function_t function);
 
 public:
 	ppu_function_manager() = default;
@@ -277,7 +270,7 @@ public:
 
 	// Register function (shall only be called during global initialization)
 	template<typename T, T Func>
-	static inline u32 register_function(ppu_intrp_func_t func)
+	static inline u32 register_function(ppu_function_t func)
 	{
 		return registered<T, Func>::index = add_function(func);
 	}
@@ -295,31 +288,18 @@ public:
 		return access(llvm);
 	}
 
-	u32 func_addr(u32 index, bool is_code_addr = false) const
+	u32 func_addr(u32 index) const
 	{
 		if (index >= access().size() || !addr)
 		{
 			return 0;
 		}
 
-		return addr + index * 8 + (is_code_addr ? 4 : 0);
-	}
-
-	bool is_func(u32 cia) const
-	{
-		if (cia % 4 || !addr || cia < addr)
-		{
-			return false;
-		}
-
-		return (cia - addr) / 8 < access().size();
+		return addr + index * 8;
 	}
 
 	// Allocation address
 	u32 addr = 0;
-
-	void save(utils::serial& ar);
-	ppu_function_manager(utils::serial& ar);
 };
 
 template<typename T, T Func>
diff --git a/rpcs3/Emu/Cell/PPUInterpreter.cpp b/rpcs3/Emu/Cell/PPUInterpreter.cpp
index 69d11864d1..1c86f5288d 100644
--- a/rpcs3/Emu/Cell/PPUInterpreter.cpp
+++ b/rpcs3/Emu/Cell/PPUInterpreter.cpp
@@ -6,7 +6,6 @@
 #include "PPUThread.h"
 #include "Emu/Cell/Common.h"
 #include "Emu/Cell/PPUFunction.h"
-#include "Emu/Cell/PPUAnalyser.h"
 #include "Emu/Cell/timers.hpp"
 #include "Emu/IdManager.h"
 
@@ -16,339 +15,21 @@
 
 #include "util/asm.hpp"
 #include "util/v128.hpp"
-#include "util/simd.hpp"
+#include "util/v128sse.hpp"
 #include "util/sysinfo.hpp"
-#include "Utilities/JIT.h"
 
-#if !defined(_MSC_VER)
+#if !defined(_MSC_VER) && defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
-#pragma GCC diagnostic ignored "-Wuninitialized"
 #endif
 
-#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS
-void ppubreak(ppu_thread& ppu)
-{
-	if (!g_breakpoint_handler.IsBreakOnBPM())
-		return;
-
-	if (!ppu.state.test_and_set(cpu_flag::dbg_pause))
-	{
-		ppu.check_state();
-	}
-}
-
-#define PPU_WRITE(type, addr, value) vm::write<type>(addr, value, &ppu);
-#define PPU_WRITE_8(addr, value) vm::write8(addr, value, &ppu);
-#define PPU_WRITE_16(addr, value) vm::write16(addr, value, &ppu);
-#define PPU_WRITE_32(addr, value) vm::write32(addr, value, &ppu);
-#define PPU_WRITE_64(addr, value) vm::write64(addr, value, &ppu);
+#if defined(_MSC_VER)
+#define SSSE3_FUNC
 #else
-#define PPU_WRITE(type, addr, value) vm::write<type>(addr, value);
-#define PPU_WRITE_8(addr, value) vm::write8(addr, value);
-#define PPU_WRITE_16(addr, value) vm::write16(addr, value);
-#define PPU_WRITE_32(addr, value) vm::write32(addr, value);
-#define PPU_WRITE_64(addr, value) vm::write64(addr, value);
+#define SSSE3_FUNC __attribute__((__target__("ssse3")))
 #endif
 
-extern bool is_debugger_present();
-
-extern const ppu_decoder<ppu_itype> g_ppu_itype;
-extern const ppu_decoder<ppu_iname> g_ppu_iname;
-
-enum class ppu_exec_bit : u64
-{
-	has_oe,
-	has_rc,
-	set_sat,
-	use_nj,
-	fix_nj,
-	set_vnan,
-	fix_vnan,
-	set_fpcc,
-	use_dfma,
-	set_cr_stats,
-	set_call_history,
-	use_feed_data,
-
-	__bitset_enum_max
-};
-
-using enum ppu_exec_bit;
-
-// Helper for combining only used subset of exec flags at compile time
-template <ppu_exec_bit... Flags0>
-struct ppu_exec_select
-{
-	template <ppu_exec_bit Flag, ppu_exec_bit... Flags, typename F>
-	static ppu_intrp_func_t select(bs_t<ppu_exec_bit> selected, F func)
-	{
-		// Make sure there is no flag duplication, otherwise skip flag
-		if constexpr (((Flags0 != Flag) && ...))
-		{
-			// Test only relevant flags at runtime initialization (compile both variants)
-			if (selected & Flag)
-			{
-				// In this branch, selected flag is added to Flags0
-				return ppu_exec_select<Flags0..., Flag>::template select<Flags...>(selected, func);
-			}
-		}
-
-		return ppu_exec_select<Flags0...>::template select<Flags...>(selected, func);
-	}
-
-	template <typename F>
-	static ppu_intrp_func_t select(bs_t<ppu_exec_bit>, F func)
-	{
-		// Instantiate interpreter function with required set of flags
-		return func.template operator()<Flags0...>();
-	}
-
-	template <ppu_exec_bit... Flags1>
-	static auto select()
-	{
-#ifndef __INTELLISENSE__
-		return [](bs_t<ppu_exec_bit> selected, auto func)
-		{
-			return ppu_exec_select::select<Flags1...>(selected, func);
-		};
-#endif
-	}
-};
-
-// Switch between inlined interpreter invocation (exec) and builder function
-#if defined(ARCH_X64)
-#define RETURN(...) \
-	if constexpr (Build == 0) { \
-		static_cast<void>(exec); \
-		static const ppu_intrp_func_t f = build_function_asm<ppu_intrp_func_t, asmjit::ppu_builder>("ppu_"s + __func__, [&](asmjit::ppu_builder& c, native_args&) { \
-			static ppu_opcode_t op{}; \
-			static ppu_abstract_t ppu; \
-			exec(__VA_ARGS__); \
-			c.ppu_ret(); \
-			return !c.fail_flag; \
-		}); \
-		if (f) return f; \
-		ppu_log.error("Can't build instruction %s", __func__); \
-		RETURN_(__VA_ARGS__); \
-	}
-#else
-#define RETURN RETURN_
-#endif
-
-#define RETURN_(...) \
-	if constexpr (Build == 0) { \
-		static_cast<void>(exec); \
-		if (is_debugger_present() || g_cfg.core.ppu_debug) return +[](ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func* next_fn) { \
-			exec(__VA_ARGS__); \
-			const auto next_op = this_op + 1; \
-			const auto fn = atomic_storage<ppu_intrp_func_t>::load(next_fn->fn); \
-			ppu.cia = vm::get_addr(next_op); \
-			return fn(ppu, {*next_op}, next_op, next_fn + 1); \
-		}; \
-		return +[](ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func* next_fn) { \
-			exec(__VA_ARGS__); \
-			const auto next_op = this_op + 1; \
-			const auto fn = atomic_storage<ppu_intrp_func_t>::observe(next_fn->fn); \
-			return fn(ppu, {*next_op}, next_op, next_fn + 1); \
-		}; \
-	}
-
-#ifdef ARCH_X64
-static constexpr ppu_opcode_t s_op{};
-#endif
-
-namespace asmjit
-{
-#if defined(ARCH_X64)
-	struct ppu_builder : vec_builder
-	{
-		using base = vec_builder;
-
-#ifdef _WIN32
-		static constexpr x86::Gp arg_ppu = x86::rcx;
-		static constexpr x86::Gp arg_op = x86::edx;
-		static constexpr x86::Gp arg_this_op = x86::r8;
-		static constexpr x86::Gp arg_next_fn = x86::r9;
-#else
-		static constexpr x86::Gp arg_ppu = x86::rdi;
-		static constexpr x86::Gp arg_op = x86::esi;
-		static constexpr x86::Gp arg_this_op = x86::rdx;
-		static constexpr x86::Gp arg_next_fn = x86::rcx;
-#endif
-
-		u32 xmm_count = 0;
-		u32 ppu_base = 0;
-		x86::Xmm tmp;
-
-		ppu_builder(CodeHolder* ch)
-			: base(ch)
-		{
-		}
-
-		// Indexed offset to ppu.member
-		template <auto MPtr, u32 Size = sizeof((std::declval<ppu_thread&>().*MPtr)[0]), uint I, uint N>
-		x86::Mem ppu_mem(const bf_t<u32, I, N>&, bool last = false)
-		{
-			// Required index shift for array indexing
-			constexpr u32 Shift = std::countr_zero(sizeof((std::declval<ppu_thread&>().*MPtr)[0]));
-
-			const u32 offset = ::offset32(MPtr);
-
-			auto tmp_r32 = x86::eax;
-			auto reg_ppu = arg_ppu;
-
-			if (last)
-			{
-				tmp_r32 = arg_op.r32();
-			}
-			else
-			{
-				base::mov(tmp_r32, arg_op);
-
-				if (offset % 16 == 0 && ppu_base != offset)
-				{
-					// Optimistically precompute offset to avoid [ppu + tmp*x + offset] addressing
-					base::lea(x86::r10, x86::qword_ptr(arg_ppu, static_cast<s32>(offset)));
-					ppu_base = offset;
-				}
-			}
-
-			if (ppu_base == offset)
-			{
-				reg_ppu = x86::r10;
-			}
-
-			// Use max possible index shift
-			constexpr u32 X86Shift = Shift > 3 ? 3 : Shift;
-			constexpr u32 AddShift = Shift - X86Shift;
-			constexpr u32 AndMask = (1u << N) - 1;
-
-			if constexpr (I >= AddShift)
-			{
-				if constexpr (I != AddShift)
-					base::shr(tmp_r32, I - AddShift);
-				base::and_(tmp_r32, AndMask << AddShift);
-			}
-			else
-			{
-				base::and_(tmp_r32, AndMask << I);
-				base::shl(tmp_r32, I + AddShift);
-			}
-
-			return x86::ptr(reg_ppu, tmp_r32.r64(), X86Shift, static_cast<s32>(offset - ppu_base), Size);
-		}
-
-		// Generic offset to ppu.member
-		template <auto MPtr, u32 Size = sizeof(std::declval<ppu_thread&>().*MPtr)>
-		x86::Mem ppu_mem()
-		{
-			return x86::ptr(arg_ppu, static_cast<s32>(::offset32(MPtr)), Size);
-		}
-
-		template <u32 Size = 16, uint I, uint N>
-		x86::Mem ppu_vr(const bf_t<u32, I, N>& bf, bool last = false)
-		{
-			return ppu_mem<&ppu_thread::vr, Size>(bf, last);
-		}
-
-		x86::Mem ppu_sat()
-		{
-			return ppu_mem<&ppu_thread::sat>();
-		}
-
-		void ppu_ret(bool last = true)
-		{
-			// Initialize pointer to next function
-			base::mov(x86::rax, x86::qword_ptr(arg_next_fn));
-			base::add(arg_this_op, 4);
-			if (is_debugger_present())
-				base::mov(ppu_mem<&ppu_thread::cia>(), arg_this_op.r32());
-			base::mov(arg_op, x86::dword_ptr(arg_this_op));
-			base::bswap(arg_op);
-			base::add(arg_next_fn, 8);
-			base::jmp(x86::rax);
-
-			// Embed constants (TODO: after last return)
-			if (last)
-				base::emit_consts();
-		}
-	};
-#elif defined(ARCH_ARM64)
-	struct ppu_builder : a64::Assembler
-	{
-	};
-#else
-	struct ppu_builder
-	{
-	};
-#endif
-}
-
-struct ppu_abstract_t
-{
-	struct abstract_vr
-	{
-		template <uint I, uint N>
-		struct lazy_vr : asmjit::mem_lazy
-		{
-			const asmjit::Operand& eval(bool is_lv)
-			{
-				if (is_lv && !this->isReg())
-				{
-					Operand::operator=(g_vc->vec_alloc());
-				#if defined(ARCH_X64)
-					g_vc->emit(asmjit::x86::Inst::kIdMovaps, *this, static_cast<asmjit::ppu_builder*>(g_vc)->ppu_vr(bf_t<u32, I, N>{}, false));
-				#endif
-				}
-
-				if (!is_lv)
-				{
-					if (this->isReg())
-					{
-						g_vc->vec_dealloc(asmjit::vec_type{this->id()});
-					}
-					else
-					{
-					#if defined(ARCH_X64)
-						Operand::operator=(static_cast<asmjit::ppu_builder*>(g_vc)->ppu_vr(bf_t<u32, I, N>{}, false));
-					#endif
-					}
-				}
-
-				return *this;
-			}
-
-			template <typename T>
-			void operator=([[maybe_unused]] T&& _val) const
-			{
-				FOR_X64(store_op, kIdMovaps, kIdVmovaps, static_cast<asmjit::ppu_builder*>(g_vc)->ppu_vr(bf_t<u32, I, N>{}, true), std::forward<T>(_val));
-			}
-		};
-
-		template <uint I, uint N>
-		lazy_vr<I, N> operator[](const bf_t<u32, I, N>&) const
-		{
-			return {};
-		}
-	} vr;
-
-	struct abstract_sat : asmjit::mem_type
-	{
-		abstract_sat()
-		#if defined(ARCH_X64)
-			: asmjit::mem_type(static_cast<asmjit::ppu_builder*>(g_vc)->ppu_sat())
-		#endif
-		{
-		}
-
-		template <typename T>
-		void operator=([[maybe_unused]] T&& _val) const
-		{
-			FOR_X64(store_op, kIdMovaps, kIdVmovaps, *this, std::forward<T>(_val));
-		}
-	} sat{};
-};
+const bool s_use_ssse3 = utils::has_ssse3();
 
 extern void do_cell_atomic_128_store(u32 addr, const void* to_write);
 
@@ -375,21 +56,6 @@ inline void ppu_cr_set(ppu_thread& ppu, u32 field, const T& a, const T& b)
 	ppu_cr_set(ppu, field, a < b, a > b, a == b, ppu.xer.so);
 }
 
-// TODO
-template <ppu_exec_bit... Flags>
-void ppu_set_cr(ppu_thread& ppu, u32 field, bool le, bool gt, bool eq, bool so)
-{
-	ppu.cr[field * 4 + 0] = le;
-	ppu.cr[field * 4 + 1] = gt;
-	ppu.cr[field * 4 + 2] = eq;
-	ppu.cr[field * 4 + 3] = so;
-
-	if constexpr (((Flags == set_cr_stats) || ...))
-	{
-		*reinterpret_cast<u32*>(vm::g_stat_addr + ppu.cia) |= *reinterpret_cast<u32*>(ppu.cr.bits + field * 4);
-	}
-}
-
 // Set XER.OV bit (overflow)
 inline void ppu_ov_set(ppu_thread& ppu, bool bit)
 {
@@ -398,74 +64,37 @@ inline void ppu_ov_set(ppu_thread& ppu, bool bit)
 }
 
 // Write comparison results to FPCC field with optional CR field update
-template <ppu_exec_bit... Flags>
-void ppu_set_fpcc(ppu_thread& ppu, f64 a, f64 b, u64 cr_field = 1)
+template<typename T>
+inline void ppu_fpcc_set(ppu_thread& ppu, const T& a, const T& b, const bool rc, const u64 cr_field = 1)
 {
-	if constexpr (((Flags == set_fpcc || Flags == has_rc) || ...))
+	// TODO: Do not hardcode to be endian dependant
+	u32 fpcc = u32{a < b} << (8 * 0) | u32{a > b} << (8 * 1) | u32{a == b} << (8 * 2);
+
+	// Test FU
+	if (fpcc == 0) [[unlikely]] fpcc = 1 << (8 * 3);
+
+	// Write FPCC
+	ppu.fpscr.fields[4] = fpcc;
+
+	if (rc) [[unlikely]]
 	{
-		static_assert(std::endian::native == std::endian::little, "Not implemented");
+		ppu.cr.fields[cr_field] = fpcc;
 
-		bool fpcc[4];
-#if defined(ARCH_X64) && !defined(_M_X64)
-		__asm__("comisd %[b], %[a]\n"
-			: "=@ccb" (fpcc[0])
-			, "=@cca" (fpcc[1])
-			, "=@ccz" (fpcc[2])
-			, "=@ccp" (fpcc[3])
-			: [a] "x" (a)
-			, [b] "x" (b)
-			: "cc");
-		if (fpcc[3]) [[unlikely]]
+		if (g_cfg.core.ppu_debug) [[unlikely]]
 		{
-			fpcc[0] = fpcc[1] = fpcc[2] = false;
-		}
-#else
-		const auto cmp = a <=> b;
-		fpcc[0] = cmp == std::partial_ordering::less;
-		fpcc[1] = cmp == std::partial_ordering::greater;
-		fpcc[2] = cmp == std::partial_ordering::equivalent;
-		fpcc[3] = cmp == std::partial_ordering::unordered;
-#endif
-
-		const u32 data = std::bit_cast<u32>(fpcc);
-
-		// Write FPCC
-		ppu.fpscr.fields[4] = data;
-
-		if constexpr (((Flags == has_rc) || ...))
-		{
-			// Previous behaviour was throwing an exception; TODO
-			ppu.cr.fields[cr_field] = data;
-
-			if (g_cfg.core.ppu_debug) [[unlikely]]
-			{
-				*reinterpret_cast<u32*>(vm::g_stat_addr + ppu.cia) |= data;
-			}
+			*reinterpret_cast<u32*>(vm::g_stat_addr + ppu.cia) |= ppu.cr.fields[cr_field];
 		}
 	}
 }
 
 // Validate read data in case does not match reservation
-template <typename T, ppu_exec_bit... Flags>
-auto ppu_feed_data(ppu_thread& ppu, u64 addr)
+template <typename T>
+FORCE_INLINE auto ppu_feed_data(ppu_thread& ppu, u64 addr)
 {
 	static_assert(sizeof(T) <= 128, "Incompatible type-size, break down into smaller loads");
 
 	auto value = vm::_ref<T>(vm::cast(addr));
 
-#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS
-	if (g_breakpoint_handler.HasBreakpoint(addr, breakpoint_types::bp_read))
-	{
-		debugbp_log.success("BPMR: breakpoint reading 0x%x at 0x%x", value, addr);
-		ppubreak(ppu);
-	}
-#endif
-
-	if constexpr (!((Flags == use_feed_data) || ...))
-	{
-		return value;
-	}
-
 	if (!ppu.use_full_rdata)
 	{
 		return value;
@@ -486,7 +115,6 @@ auto ppu_feed_data(ppu_thread& ppu, u64 addr)
 		{
 			// Reservation was lost
 			ppu.raddr = 0;
-			ppu.res_cached = 0;
 		}
 	}
 	else
@@ -506,7 +134,6 @@ auto ppu_feed_data(ppu_thread& ppu, u64 addr)
 		if (std::memcmp(buffer + offs, src, size))
 		{
 			ppu.raddr = 0;
-			ppu.res_cached = 0;
 		}
 	}
 
@@ -514,14 +141,8 @@ auto ppu_feed_data(ppu_thread& ppu, u64 addr)
 }
 
 // Push called address to custom call history for debugging
-template <ppu_exec_bit... Flags>
-u32 ppu_record_call(ppu_thread& ppu, u32 new_cia, ppu_opcode_t op, bool indirect = false)
+inline u32 ppu_record_call(ppu_thread& ppu, u32 new_cia, ppu_opcode_t op, bool indirect = false)
 {
-	if constexpr (!((Flags == set_call_history) || ...))
-	{
-		return new_cia;
-	}
-
 	if (auto& history = ppu.call_history; !history.data.empty())
 	{
 		if (!op.lk)
@@ -552,6 +173,241 @@ u32 ppu_record_call(ppu_thread& ppu, u32 new_cia, ppu_opcode_t op, bool indirect
 	return new_cia;
 }
 
+// Compare 16 packed unsigned bytes (greater than)
+inline __m128i sse_cmpgt_epu8(__m128i A, __m128i B)
+{
+	// (A xor 0x80) > (B xor 0x80)
+	const auto sign = _mm_set1_epi32(0x80808080);
+	return _mm_cmpgt_epi8(_mm_xor_si128(A, sign), _mm_xor_si128(B, sign));
+}
+
+inline __m128i sse_cmpgt_epu16(__m128i A, __m128i B)
+{
+	const auto sign = _mm_set1_epi32(0x80008000);
+	return _mm_cmpgt_epi16(_mm_xor_si128(A, sign), _mm_xor_si128(B, sign));
+}
+
+inline __m128i sse_cmpgt_epu32(__m128i A, __m128i B)
+{
+	const auto sign = _mm_set1_epi32(0x80000000);
+	return _mm_cmpgt_epi32(_mm_xor_si128(A, sign), _mm_xor_si128(B, sign));
+}
+
+extern __m128 sse_exp2_ps(__m128 A)
+{
+	const auto x0 = _mm_max_ps(_mm_min_ps(A, _mm_set1_ps(127.4999961f)), _mm_set1_ps(-127.4999961f));
+	const auto x1 = _mm_add_ps(x0, _mm_set1_ps(0.5f));
+	const auto x2 = _mm_sub_epi32(_mm_cvtps_epi32(x1), _mm_and_si128(_mm_castps_si128(_mm_cmpnlt_ps(_mm_setzero_ps(), x1)), _mm_set1_epi32(1)));
+	const auto x3 = _mm_sub_ps(x0, _mm_cvtepi32_ps(x2));
+	const auto x4 = _mm_mul_ps(x3, x3);
+	const auto x5 = _mm_mul_ps(x3, _mm_add_ps(_mm_mul_ps(_mm_add_ps(_mm_mul_ps(x4, _mm_set1_ps(0.023093347705f)), _mm_set1_ps(20.20206567f)), x4), _mm_set1_ps(1513.906801f)));
+	const auto x6 = _mm_mul_ps(x5, _mm_rcp_ps(_mm_sub_ps(_mm_add_ps(_mm_mul_ps(_mm_set1_ps(233.1842117f), x4), _mm_set1_ps(4368.211667f)), x5)));
+	return _mm_mul_ps(_mm_add_ps(_mm_add_ps(x6, x6), _mm_set1_ps(1.0f)), _mm_castsi128_ps(_mm_slli_epi32(_mm_add_epi32(x2, _mm_set1_epi32(127)), 23)));
+}
+
+extern __m128 sse_log2_ps(__m128 A)
+{
+	const auto _1 = _mm_set1_ps(1.0f);
+	const auto _c = _mm_set1_ps(1.442695040f);
+	const auto x0 = _mm_max_ps(A, _mm_castsi128_ps(_mm_set1_epi32(0x00800000)));
+	const auto x1 = _mm_or_ps(_mm_and_ps(x0, _mm_castsi128_ps(_mm_set1_epi32(0x807fffff))), _1);
+	const auto x2 = _mm_rcp_ps(_mm_add_ps(x1, _1));
+	const auto x3 = _mm_mul_ps(_mm_sub_ps(x1, _1), x2);
+	const auto x4 = _mm_add_ps(x3, x3);
+	const auto x5 = _mm_mul_ps(x4, x4);
+	const auto x6 = _mm_add_ps(_mm_mul_ps(_mm_add_ps(_mm_mul_ps(_mm_set1_ps(-0.7895802789f), x5), _mm_set1_ps(16.38666457f)), x5), _mm_set1_ps(-64.1409953f));
+	const auto x7 = _mm_rcp_ps(_mm_add_ps(_mm_mul_ps(_mm_add_ps(_mm_mul_ps(_mm_set1_ps(-35.67227983f), x5), _mm_set1_ps(312.0937664f)), x5), _mm_set1_ps(-769.6919436f)));
+	const auto x8 = _mm_cvtepi32_ps(_mm_sub_epi32(_mm_srli_epi32(_mm_castps_si128(x0), 23), _mm_set1_epi32(127)));
+	return _mm_add_ps(_mm_mul_ps(_mm_mul_ps(_mm_mul_ps(_mm_mul_ps(x5, x6), x7), x4), _c), _mm_add_ps(_mm_mul_ps(x4, _c), x8));
+}
+
+extern SAFE_BUFFERS(__m128i) sse_pshufb(__m128i data, __m128i index)
+{
+	v128 m = v128::fromV(_mm_and_si128(index, _mm_set1_epi8(0xf)));
+	v128 a = v128::fromV(data);
+	v128 r;
+
+	for (int i = 0; i < 16; i++)
+	{
+		r._u8[i] = a._u8[m._u8[i]];
+	}
+
+	return _mm_and_si128(r.vi, _mm_cmpgt_epi8(index, _mm_set1_epi8(-1)));
+}
+
+extern SSSE3_FUNC __m128i sse_altivec_vperm(__m128i A, __m128i B, __m128i C)
+{
+	const auto index = _mm_andnot_si128(C, _mm_set1_epi8(0x1f));
+	const auto mask = _mm_cmpgt_epi8(index, _mm_set1_epi8(0xf));
+	const auto sa = _mm_shuffle_epi8(A, index);
+	const auto sb = _mm_shuffle_epi8(B, index);
+	return _mm_or_si128(_mm_and_si128(mask, sa), _mm_andnot_si128(mask, sb));
+}
+
+extern SAFE_BUFFERS(__m128i) sse_altivec_vperm_v0(__m128i A, __m128i B, __m128i C)
+{
+	__m128i ab[2]{B, A};
+	v128 index = v128::fromV(_mm_andnot_si128(C, _mm_set1_epi8(0x1f)));
+	v128 res;
+
+	for (int i = 0; i < 16; i++)
+	{
+		res._u8[i] = reinterpret_cast<u8*>(+ab)[index._u8[i]];
+	}
+
+	return res.vi;
+}
+
+extern __m128i sse_altivec_lvsl(u64 addr)
+{
+	alignas(16) static const u8 lvsl_values[0x10][0x10] =
+	{
+		{ 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 },
+		{ 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 },
+		{ 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02 },
+		{ 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03 },
+		{ 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04 },
+		{ 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05 },
+		{ 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06 },
+		{ 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07 },
+		{ 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08 },
+		{ 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09 },
+		{ 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a },
+		{ 0x1a, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b },
+		{ 0x1b, 0x1a, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c },
+		{ 0x1c, 0x1b, 0x1a, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d },
+		{ 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e },
+		{ 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f },
+	};
+
+	return _mm_load_si128(reinterpret_cast<const __m128i*>(+lvsl_values[addr & 0xf]));
+}
+
+extern __m128i sse_altivec_lvsr(u64 addr)
+{
+	alignas(16) static const u8 lvsr_values[0x10][0x10] =
+	{
+		{ 0x1f, 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10 },
+		{ 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f },
+		{ 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e },
+		{ 0x1c, 0x1b, 0x1a, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d },
+		{ 0x1b, 0x1a, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c },
+		{ 0x1a, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b },
+		{ 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a },
+		{ 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09 },
+		{ 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08 },
+		{ 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07 },
+		{ 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06 },
+		{ 0x14, 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05 },
+		{ 0x13, 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04 },
+		{ 0x12, 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03 },
+		{ 0x11, 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02 },
+		{ 0x10, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 },
+	};
+
+	return _mm_load_si128(reinterpret_cast<const __m128i*>(+lvsr_values[addr & 0xf]));
+}
+
+static const __m128i lvlx_masks[0x10] =
+{
+	_mm_set_epi8(0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf),
+	_mm_set_epi8(0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, -1),
+	_mm_set_epi8(0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, -1, -1),
+	_mm_set_epi8(0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, -1, -1, -1),
+	_mm_set_epi8(0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, -1, -1, -1, -1),
+	_mm_set_epi8(0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, -1, -1, -1, -1, -1),
+	_mm_set_epi8(0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, -1, -1, -1, -1, -1, -1),
+	_mm_set_epi8(0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, -1, -1, -1, -1, -1, -1, -1),
+	_mm_set_epi8(0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, -1, -1, -1, -1, -1, -1, -1, -1),
+	_mm_set_epi8(0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, -1, -1, -1, -1, -1, -1, -1, -1, -1),
+	_mm_set_epi8(0xa, 0xb, 0xc, 0xd, 0xe, 0xf, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1),
+	_mm_set_epi8(0xb, 0xc, 0xd, 0xe, 0xf, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1),
+	_mm_set_epi8(0xc, 0xd, 0xe, 0xf, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1),
+	_mm_set_epi8(0xd, 0xe, 0xf, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1),
+	_mm_set_epi8(0xe, 0xf, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1),
+	_mm_set_epi8(0xf, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1),
+};
+
+static const __m128i lvrx_masks[0x10] =
+{
+	_mm_set_epi8(-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1),
+	_mm_set_epi8(-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0x0),
+	_mm_set_epi8(-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0x0, 0x1),
+	_mm_set_epi8(-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0x0, 0x1, 0x2),
+	_mm_set_epi8(-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0x0, 0x1, 0x2, 0x3),
+	_mm_set_epi8(-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0x0, 0x1, 0x2, 0x3, 0x4),
+	_mm_set_epi8(-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5),
+	_mm_set_epi8(-1, -1, -1, -1, -1, -1, -1, -1, -1, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6),
+	_mm_set_epi8(-1, -1, -1, -1, -1, -1, -1, -1, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7),
+	_mm_set_epi8(-1, -1, -1, -1, -1, -1, -1, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8),
+	_mm_set_epi8(-1, -1, -1, -1, -1, -1, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9),
+	_mm_set_epi8(-1, -1, -1, -1, -1, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa),
+	_mm_set_epi8(-1, -1, -1, -1, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb),
+	_mm_set_epi8(-1, -1, -1, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc),
+	_mm_set_epi8(-1, -1, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd),
+	_mm_set_epi8(-1, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe),
+};
+
+static SSSE3_FUNC __m128i sse_cellbe_lvlx(ppu_thread& ppu, u64 addr)
+{
+	return _mm_shuffle_epi8(ppu_feed_data<__m128i>(ppu, addr & -16), lvlx_masks[addr & 0xf]);
+}
+
+extern SSSE3_FUNC __m128i sse_cellbe_lvlx(u64 addr)
+{
+	return _mm_shuffle_epi8(_mm_load_si128(vm::_ptr<const __m128i>(addr & ~0xf)), lvlx_masks[addr & 0xf]);
+}
+
+extern SSSE3_FUNC void sse_cellbe_stvlx(u64 addr, __m128i a)
+{
+	_mm_maskmoveu_si128(_mm_shuffle_epi8(a, lvlx_masks[addr & 0xf]), lvrx_masks[addr & 0xf], vm::_ptr<char>(addr & ~0xf));
+}
+
+static SSSE3_FUNC __m128i sse_cellbe_lvrx(ppu_thread& ppu, u64 addr)
+{
+	return _mm_shuffle_epi8(ppu_feed_data<__m128i>(ppu, addr & -16), lvrx_masks[addr & 0xf]);
+}
+
+extern SSSE3_FUNC __m128i sse_cellbe_lvrx(u64 addr)
+{
+	return _mm_shuffle_epi8(_mm_load_si128(vm::_ptr<const __m128i>(addr & ~0xf)), lvrx_masks[addr & 0xf]);
+}
+
+extern SSSE3_FUNC void sse_cellbe_stvrx(u64 addr, __m128i a)
+{
+	_mm_maskmoveu_si128(_mm_shuffle_epi8(a, lvrx_masks[addr & 0xf]), lvlx_masks[addr & 0xf], vm::_ptr<char>(addr & ~0xf));
+}
+
+static __m128i sse_cellbe_lvlx_v0(ppu_thread& ppu, u64 addr)
+{
+	return sse_pshufb(ppu_feed_data<__m128i>(ppu, addr & -16), lvlx_masks[addr & 0xf]);
+}
+
+extern __m128i sse_cellbe_lvlx_v0(u64 addr)
+{
+	return sse_pshufb(_mm_load_si128(vm::_ptr<const __m128i>(addr & ~0xf)), lvlx_masks[addr & 0xf]);
+}
+
+extern void sse_cellbe_stvlx_v0(u64 addr, __m128i a)
+{
+	_mm_maskmoveu_si128(sse_pshufb(a, lvlx_masks[addr & 0xf]), lvrx_masks[addr & 0xf], vm::_ptr<char>(addr & ~0xf));
+}
+
+static __m128i sse_cellbe_lvrx_v0(ppu_thread& ppu, u64 addr)
+{
+	return sse_pshufb(ppu_feed_data<__m128i>(ppu, addr & -16), lvrx_masks[addr & 0xf]);
+}
+
+extern __m128i sse_cellbe_lvrx_v0(u64 addr)
+{
+	return sse_pshufb(_mm_load_si128(vm::_ptr<const __m128i>(addr & ~0xf)), lvrx_masks[addr & 0xf]);
+}
+
+extern void sse_cellbe_stvrx_v0(u64 addr, __m128i a)
+{
+	_mm_maskmoveu_si128(sse_pshufb(a, lvrx_masks[addr & 0xf]), lvlx_masks[addr & 0xf], vm::_ptr<char>(addr & ~0xf));
+}
+
 template<typename T>
 struct add_flags_result_t
 {
@@ -595,2456 +451,2579 @@ extern bool ppu_stwcx(ppu_thread& ppu, u32 addr, u32 reg_value);
 extern bool ppu_stdcx(ppu_thread& ppu, u32 addr, u64 reg_value);
 extern void ppu_trap(ppu_thread& ppu, u64 addr);
 
+
+class ppu_scale_table_t
+{
+	std::array<v128, 32 + 31> m_data{};
+
+public:
+	ppu_scale_table_t()
+	{
+		for (s32 i = -31; i < 32; i++)
+		{
+			m_data[i + 31].vf = _mm_set1_ps(static_cast<float>(std::exp2(i)));
+		}
+	}
+
+	FORCE_INLINE __m128 operator [] (s32 scale) const
+	{
+		return m_data[scale + 31].vf;
+	}
+}
+const g_ppu_scale_table;
+
+constexpr u32 ppu_inf_u32 = 0x7F800000u;
+static const f32 ppu_inf_f32 = std::bit_cast<f32>(ppu_inf_u32);
+constexpr u32 ppu_nan_u32 = 0x7FC00000u;
+static const f32 ppu_nan_f32 = std::bit_cast<f32>(ppu_nan_u32);
+static const v128 ppu_vec_nans = v128::from32p(ppu_nan_u32);
+
 // NaNs production precedence: NaN from Va, Vb, Vc
 // and lastly the result of the operation in case none of the operands is a NaN
 // Signaling NaNs are 'quieted' (MSB of fraction is set) with other bits of data remain the same
-inline v128 ppu_select_vnan(v128 a)
+inline v128 vec_select_nan(v128 a)
 {
 	return a;
 }
 
-inline v128 ppu_select_vnan(v128 a, v128 b)
+inline v128 vec_select_nan(v128 a, v128 b)
 {
-	return gv_selectfs(gv_eqfs(a, a), b, a | gv_bcst32(0x7fc00000u));
+	const auto not_nan = v128::eq32f(a, a);
+	return (b & not_nan) | v128::andnot(not_nan, a | ppu_vec_nans);
 }
 
-inline v128 ppu_select_vnan(v128 a, v128 b, Vector128 auto... args)
+template <typename... Args>
+inline v128 vec_select_nan(v128 a, v128 b, Args... args)
 {
-	return ppu_select_vnan(a, ppu_select_vnan(b, args...));
+	return vec_select_nan(a, vec_select_nan(b, args...));
+}
+
+v128 vec_handle_nan(v128 result)
+{
+	const auto not_nan = v128::eq32f(result, result);
+	result = (result & not_nan) | v128::andnot(not_nan, ppu_vec_nans);
+
+	return result;
+}
+
+template<typename... Args>
+v128 vec_handle_nan(v128 result, Args... args)
+{
+	return vec_select_nan(args..., vec_handle_nan(result));
+}
+
+template<typename... Args>
+v128 vec_handle_nan(__m128 result, Args... args)
+{
+	return vec_handle_nan(v128::fromF(result), v128::fromF(args)...);
 }
 
 // Flush denormals to zero if NJ is 1
-template <bool Result = false, ppu_exec_bit... Flags>
-inline v128 ppu_flush_denormal(const v128& mask, const v128& a)
+inline v128 vec_handle_denormal(ppu_thread& ppu, v128 a)
 {
-	if constexpr (((Flags == use_nj) || ...) || (Result && ((Flags == fix_nj) || ...)))
+	const auto mask = v128::from32p(ppu.jm_mask);
+	const auto nz = v128::fromV(_mm_srli_epi32(v128::eq32(mask & a, v128{}).vi, 1));
+	return v128::andnot(nz, a);
+}
+
+bool ppu_interpreter::MFVSCR(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd] = v128::from32(0, 0, 0, u32{ppu.sat} | (u32{ppu.nj} << 16));
+	return true;
+}
+
+bool ppu_interpreter::MTVSCR(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const u32 vscr = ppu.vr[op.vb]._u32[3];
+	ppu.sat = (vscr & 1) != 0;
+	ppu.nj  = (vscr & 0x10000) != 0;
+	ppu.jm_mask = ppu.nj ? ppu_inf_u32 : 0x7fff'ffff;
+	return true;
+}
+
+bool ppu_interpreter::VADDCUW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	ppu.vr[op.vd].vi = _mm_srli_epi32(_mm_cmpgt_epi32(_mm_xor_si128(b, _mm_set1_epi32(0x80000000)), _mm_xor_si128(a, _mm_set1_epi32(0x7fffffff))), 31);
+	return true;
+}
+
+bool ppu_interpreter::VADDFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = vec_handle_denormal(ppu, ppu.vr[op.va]);
+	const auto b = vec_handle_denormal(ppu, ppu.vr[op.vb]);
+	const auto result = v128::addfs(a, b);
+	ppu.vr[op.vd] = vec_handle_denormal(ppu, vec_handle_nan(result, a, b));
+	return true;
+}
+
+bool ppu_interpreter_fast::VADDSBS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_adds_epi8(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter_precise::VADDSBS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 16; i++)
 	{
-		return gv_andn(gv_shr32(gv_eq32(mask & a, gv_bcst32(0)), 1), a);
+		const s16 sum = a._s8[i] + b._s8[i];
+
+		if (sum < INT8_MIN)
+		{
+			d._s8[i] = INT8_MIN;
+			ppu.sat = true;
+		}
+		else if (sum > INT8_MAX)
+		{
+			d._s8[i] = INT8_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._s8[i] = static_cast<s8>(sum);
+		}
+	}
+
+	return true;
+}
+
+bool ppu_interpreter_fast::VADDSHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_adds_epi16(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter_precise::VADDSHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 8; i++)
+	{
+		const s32 sum = a._s16[i] + b._s16[i];
+
+		if (sum < INT16_MIN)
+		{
+			d._s16[i] = INT16_MIN;
+			ppu.sat = true;
+		}
+		else if (sum > INT16_MAX)
+		{
+			d._s16[i] = INT16_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._s16[i] = static_cast<s16>(sum);
+		}
+	}
+
+	return true;
+}
+
+// TODO: fix
+bool ppu_interpreter_fast::VADDSWS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va];
+	const auto b = ppu.vr[op.vb];
+	const auto s = v128::add32(a, b); // a + b
+	const auto m = (a ^ s) & (b ^ s); // overflow bit
+	const auto x = _mm_srai_epi32(m.vi, 31); // saturation mask
+	const auto y = _mm_srai_epi32(_mm_and_si128(s.vi, m.vi), 31); // positive saturation mask
+	ppu.vr[op.vd].vi = _mm_xor_si128(_mm_xor_si128(_mm_srli_epi32(x, 1), y), _mm_or_si128(s.vi, x));
+	return true;
+}
+
+bool ppu_interpreter_precise::VADDSWS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 4; i++)
+	{
+		const s64 sum = s64{a._s32[i]} + b._s32[i];
+
+		if (sum < INT32_MIN)
+		{
+			d._s32[i] = INT32_MIN;
+			ppu.sat = true;
+		}
+		else if (sum > INT32_MAX)
+		{
+			d._s32[i] = INT32_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._s32[i] = static_cast<s32>(sum);
+		}
+	}
+
+	return true;
+}
+
+bool ppu_interpreter::VADDUBM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd] = v128::add8(ppu.vr[op.va], ppu.vr[op.vb]);
+	return true;
+}
+
+bool ppu_interpreter_fast::VADDUBS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_adds_epu8(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter_precise::VADDUBS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 16; i++)
+	{
+		const u16 sum = a._u8[i] + b._u8[i];
+
+		if (sum > UINT8_MAX)
+		{
+			d._u8[i] = UINT8_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._u8[i] = static_cast<u8>(sum);
+		}
+	}
+
+	return true;
+}
+
+bool ppu_interpreter::VADDUHM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd] = v128::add16(ppu.vr[op.va], ppu.vr[op.vb]);
+	return true;
+}
+
+bool ppu_interpreter_fast::VADDUHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_adds_epu16(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter_precise::VADDUHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 8; i++)
+	{
+		const u32 sum = a._u16[i] + b._u16[i];
+
+		if (sum > UINT16_MAX)
+		{
+			d._u16[i] = UINT16_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._u16[i] = static_cast<u16>(sum);
+		}
+	}
+
+	return true;
+}
+
+bool ppu_interpreter::VADDUWM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd] = v128::add32(ppu.vr[op.va], ppu.vr[op.vb]);
+	return true;
+}
+
+// TODO: fix
+bool ppu_interpreter_fast::VADDUWS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	ppu.vr[op.vd].vi = _mm_or_si128(_mm_add_epi32(a, b), _mm_cmpgt_epi32(_mm_xor_si128(b, _mm_set1_epi32(0x80000000)), _mm_xor_si128(a, _mm_set1_epi32(0x7fffffff))));
+	return true;
+}
+
+bool ppu_interpreter_precise::VADDUWS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 4; i++)
+	{
+		const u64 sum = u64{a._u32[i]} + b._u32[i];
+
+		if (sum > UINT32_MAX)
+		{
+			d._u32[i] = UINT32_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._u32[i] = static_cast<u32>(sum);
+		}
+	}
+
+	return true;
+}
+
+bool ppu_interpreter::VAND(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd] = ppu.vr[op.va] & ppu.vr[op.vb];
+	return true;
+}
+
+bool ppu_interpreter::VANDC(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd] = v128::andnot(ppu.vr[op.vb], ppu.vr[op.va]);
+	return true;
+}
+
+bool ppu_interpreter::VAVGSB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va];
+	const auto b = v128::add8(ppu.vr[op.vb], v128::from8p(1)); // add 1
+	const auto summ = v128::add8(a, b) & v128::from8p(0xfe);
+	const auto sign = v128::from8p(0x80);
+	const auto overflow = (((a ^ summ) & (b ^ summ)) ^ summ ^ v128::eq8(b, sign)) & sign; // calculate msb
+	ppu.vr[op.vd].vi = _mm_or_si128(overflow.vi, _mm_srli_epi64(summ.vi, 1));
+	return true;
+}
+
+bool ppu_interpreter::VAVGSH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va];
+	const auto b = v128::add16(ppu.vr[op.vb], v128::from16p(1)); // add 1
+	const auto summ = v128::add16(a, b);
+	const auto sign = v128::from16p(0x8000);
+	const auto overflow = (((a ^ summ) & (b ^ summ)) ^ summ ^ v128::eq16(b, sign)) & sign; // calculate msb
+	ppu.vr[op.vd].vi = _mm_or_si128(overflow.vi, _mm_srli_epi16(summ.vi, 1));
+	return true;
+}
+
+bool ppu_interpreter::VAVGSW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va];
+	const auto b = v128::add32(ppu.vr[op.vb], v128::from32p(1)); // add 1
+	const auto summ = v128::add32(a, b);
+	const auto sign = v128::from32p(0x80000000);
+	const auto overflow = (((a ^ summ) & (b ^ summ)) ^ summ ^ v128::eq32(b, sign)) & sign; // calculate msb
+	ppu.vr[op.vd].vi = _mm_or_si128(overflow.vi, _mm_srli_epi32(summ.vi, 1));
+	return true;
+}
+
+bool ppu_interpreter::VAVGUB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_avg_epu8(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter::VAVGUH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_avg_epu16(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter::VAVGUW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va];
+	const auto b = ppu.vr[op.vb];
+	const auto summ = v128::add32(v128::add32(a, b), v128::from32p(1));
+	const auto carry = _mm_xor_si128(_mm_slli_epi32(sse_cmpgt_epu32(summ.vi, a.vi), 31), _mm_set1_epi32(0x80000000));
+	ppu.vr[op.vd].vi = _mm_or_si128(carry, _mm_srli_epi32(summ.vi, 1));
+	return true;
+}
+
+bool ppu_interpreter::VCFSX(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vf = _mm_mul_ps(_mm_cvtepi32_ps(ppu.vr[op.vb].vi), g_ppu_scale_table[0 - op.vuimm]);
+	return true;
+}
+
+bool ppu_interpreter::VCFUX(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto b = ppu.vr[op.vb].vi;
+	const auto fix = _mm_and_ps(_mm_castsi128_ps(_mm_srai_epi32(b, 31)), _mm_set1_ps(0x80000000));
+	ppu.vr[op.vd].vf = _mm_mul_ps(_mm_add_ps(_mm_cvtepi32_ps(_mm_and_si128(b, _mm_set1_epi32(0x7fffffff))), fix), g_ppu_scale_table[0 - op.vuimm]);
+	return true;
+}
+
+bool ppu_interpreter::VCMPBFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vf;
+	const auto b = ppu.vr[op.vb].vf;
+	const auto sign = _mm_castsi128_ps(_mm_set1_epi32(0x80000000));
+	const auto cmp1 = _mm_cmpnle_ps(a, b);
+	const auto cmp2 = _mm_cmpnge_ps(a, _mm_xor_ps(b, sign));
+	ppu.vr[op.vd].vf = _mm_or_ps(_mm_and_ps(cmp1, sign), _mm_and_ps(cmp2, _mm_castsi128_ps(_mm_set1_epi32(0x40000000))));
+	if (op.oe) [[unlikely]] ppu_cr_set(ppu, 6, false, false, _mm_movemask_ps(_mm_or_ps(cmp1, cmp2)) == 0, false);
+	return true;
+}
+
+bool ppu_interpreter::VCMPEQFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto rmask = _mm_movemask_ps(ppu.vr[op.vd].vf = _mm_cmpeq_ps(ppu.vr[op.va].vf, ppu.vr[op.vb].vf));
+	if (op.oe) [[unlikely]] ppu_cr_set(ppu, 6, rmask == 0xf, false, rmask == 0, false);
+	return true;
+}
+
+bool ppu_interpreter::VCMPEQUB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto rmask = _mm_movemask_epi8((ppu.vr[op.vd] = v128::eq8(ppu.vr[op.va], ppu.vr[op.vb])).vi);
+	if (op.oe) [[unlikely]] ppu_cr_set(ppu, 6, rmask == 0xffff, false, rmask == 0, false);
+	return true;
+}
+
+bool ppu_interpreter::VCMPEQUH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto rmask = _mm_movemask_epi8((ppu.vr[op.vd] = v128::eq16(ppu.vr[op.va], ppu.vr[op.vb])).vi);
+	if (op.oe) [[unlikely]] ppu_cr_set(ppu, 6, rmask == 0xffff, false, rmask == 0, false);
+	return true;
+}
+
+bool ppu_interpreter::VCMPEQUW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto rmask = _mm_movemask_epi8((ppu.vr[op.vd] = v128::eq32(ppu.vr[op.va], ppu.vr[op.vb])).vi);
+	if (op.oe) [[unlikely]] ppu_cr_set(ppu, 6, rmask == 0xffff, false, rmask == 0, false);
+	return true;
+}
+
+bool ppu_interpreter::VCMPGEFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto rmask = _mm_movemask_ps(ppu.vr[op.vd].vf = _mm_cmpge_ps(ppu.vr[op.va].vf, ppu.vr[op.vb].vf));
+	if (op.oe) [[unlikely]] ppu_cr_set(ppu, 6, rmask == 0xf, false, rmask == 0, false);
+	return true;
+}
+
+bool ppu_interpreter::VCMPGTFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto rmask = _mm_movemask_ps(ppu.vr[op.vd].vf = _mm_cmpgt_ps(ppu.vr[op.va].vf, ppu.vr[op.vb].vf));
+	if (op.oe) [[unlikely]] ppu_cr_set(ppu, 6, rmask == 0xf, false, rmask == 0, false);
+	return true;
+}
+
+bool ppu_interpreter::VCMPGTSB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto rmask = _mm_movemask_epi8(ppu.vr[op.vd].vi = _mm_cmpgt_epi8(ppu.vr[op.va].vi, ppu.vr[op.vb].vi));
+	if (op.oe) [[unlikely]] ppu_cr_set(ppu, 6, rmask == 0xffff, false, rmask == 0, false);
+	return true;
+}
+
+bool ppu_interpreter::VCMPGTSH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto rmask = _mm_movemask_epi8(ppu.vr[op.vd].vi = _mm_cmpgt_epi16(ppu.vr[op.va].vi, ppu.vr[op.vb].vi));
+	if (op.oe) [[unlikely]] ppu_cr_set(ppu, 6, rmask == 0xffff, false, rmask == 0, false);
+	return true;
+}
+
+bool ppu_interpreter::VCMPGTSW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto rmask = _mm_movemask_epi8(ppu.vr[op.vd].vi = _mm_cmpgt_epi32(ppu.vr[op.va].vi, ppu.vr[op.vb].vi));
+	if (op.oe) [[unlikely]] ppu_cr_set(ppu, 6, rmask == 0xffff, false, rmask == 0, false);
+	return true;
+}
+
+bool ppu_interpreter::VCMPGTUB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto rmask = _mm_movemask_epi8(ppu.vr[op.vd].vi = sse_cmpgt_epu8(ppu.vr[op.va].vi, ppu.vr[op.vb].vi));
+	if (op.oe) [[unlikely]] ppu_cr_set(ppu, 6, rmask == 0xffff, false, rmask == 0, false);
+	return true;
+}
+
+bool ppu_interpreter::VCMPGTUH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto rmask = _mm_movemask_epi8(ppu.vr[op.vd].vi = sse_cmpgt_epu16(ppu.vr[op.va].vi, ppu.vr[op.vb].vi));
+	if (op.oe) [[unlikely]] ppu_cr_set(ppu, 6, rmask == 0xffff, false, rmask == 0, false);
+	return true;
+}
+
+bool ppu_interpreter::VCMPGTUW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto rmask = _mm_movemask_epi8(ppu.vr[op.vd].vi = sse_cmpgt_epu32(ppu.vr[op.va].vi, ppu.vr[op.vb].vi));
+	if (op.oe) [[unlikely]] ppu_cr_set(ppu, 6, rmask == 0xffff, false, rmask == 0, false);
+	return true;
+}
+
+// TODO: fix
+bool ppu_interpreter_fast::VCTSXS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto scaled = _mm_mul_ps(ppu.vr[op.vb].vf, g_ppu_scale_table[op.vuimm]);
+	ppu.vr[op.vd].vi = _mm_xor_si128(_mm_cvttps_epi32(scaled), _mm_castps_si128(_mm_cmpge_ps(scaled, _mm_set1_ps(0x80000000))));
+	return true;
+}
+
+bool ppu_interpreter_precise::VCTSXS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto uim = op.vuimm;
+	const auto& b = ppu.vr[op.vb];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 4; i++)
+	{
+		const f32 X = b._f[i];
+		const bool sign = std::signbit(X);
+		const s32 exp = fexpf(X);
+		const u32 frac = std::bit_cast<u32>(X) << 9;
+		const s32 exp2 = exp + uim - 127;
+
+		if (exp == 255)
+		{
+			if (frac != 0)
+			{
+				d._s32[i] = 0;
+			}
+			else
+			{
+				ppu.sat = true;
+				d._s32[i] = sign ? 0x80000000 : 0x7FFFFFFF;
+			}
+		}
+		else if (exp2 > 30)
+		{
+			ppu.sat = true;
+			d._s32[i] = sign ? 0x80000000 : 0x7FFFFFFF;
+		}
+		else if (exp2 < 0)
+		{
+			d._s32[i] = 0;
+		}
+		else
+		{
+			s32 significand = (0x80000000 | (frac >> 1)) >> (31 - exp2);
+			d._s32[i] = sign ? -significand : significand;
+		}
+	}
+
+	return true;
+}
+
+bool ppu_interpreter_fast::VCTUXS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto scaled1 = _mm_max_ps(_mm_mul_ps(ppu.vr[op.vb].vf, g_ppu_scale_table[op.vuimm]), _mm_set1_ps(0.0f));
+	const auto scaled2 = _mm_and_ps(_mm_sub_ps(scaled1, _mm_set1_ps(0x80000000)), _mm_cmpge_ps(scaled1, _mm_set1_ps(0x80000000)));
+	ppu.vr[op.vd].vi = _mm_or_si128(_mm_or_si128(_mm_cvttps_epi32(scaled1), _mm_cvttps_epi32(scaled2)), _mm_castps_si128(_mm_cmpge_ps(scaled1, _mm_set1_ps(0x100000000))));
+	return true;
+}
+
+bool ppu_interpreter_precise::VCTUXS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto uim = op.vuimm;
+	const auto& b = ppu.vr[op.vb];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 4; i++)
+	{
+		const f32 X = b._f[i];
+		const bool sign = std::signbit(X);
+		const s32 exp = fexpf(X);
+		const u32 frac = std::bit_cast<u32>(X) << 9;
+		const s32 exp2 = exp + uim - 127;
+
+		if (exp == 255)
+		{
+			if (frac != 0)
+			{
+				d._u32[i] = 0;
+			}
+			else
+			{
+				ppu.sat = true;
+				d._u32[i] = sign ? 0 : 0xFFFFFFFF;
+			}
+		}
+		else if (exp2 > 31)
+		{
+			ppu.sat = true;
+			d._u32[i] = sign ? 0 : 0xFFFFFFFF;
+		}
+		else if (exp2 < 0)
+		{
+			d._u32[i] = 0;
+		}
+		else if (sign)
+		{
+			ppu.sat = true;
+			d._u32[i] = 0;
+		}
+		else
+		{
+			d._u32[i] = (0x80000000 | (frac >> 1)) >> (31 - exp2);
+		}
+	}
+
+	return true;
+}
+
+bool ppu_interpreter::VEXPTEFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vf = sse_exp2_ps(ppu.vr[op.vb].vf);
+	return true;
+}
+
+bool ppu_interpreter::VLOGEFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vf = sse_log2_ps(ppu.vr[op.vb].vf);
+	return true;
+}
+
+bool ppu_interpreter_fast::VMADDFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = vec_handle_denormal(ppu, ppu.vr[op.va]).vf;
+	const auto b = vec_handle_denormal(ppu, ppu.vr[op.vb]).vf;
+	const auto c = vec_handle_denormal(ppu, ppu.vr[op.vc]).vf;
+	const auto result = _mm_add_ps(_mm_mul_ps(a, c), b);
+	ppu.vr[op.vd] = vec_handle_denormal(ppu, vec_handle_nan(result));
+	return true;
+}
+
+bool ppu_interpreter_precise::VMADDFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = vec_handle_denormal(ppu, ppu.vr[op.va]);
+	const auto b = vec_handle_denormal(ppu, ppu.vr[op.vb]);
+	const auto c = vec_handle_denormal(ppu, ppu.vr[op.vc]);
+	ppu.vr[op.rd] = vec_handle_denormal(ppu, vec_handle_nan(v128::fma32f(a, c, b), a, b, c));
+	return true;
+}
+
+bool ppu_interpreter::VMAXFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va];
+	const auto b = ppu.vr[op.vb];
+	const auto result = _mm_and_ps(_mm_max_ps(a.vf, b.vf), _mm_max_ps(b.vf, a.vf));
+	ppu.vr[op.vd] = vec_handle_denormal(ppu, vec_handle_nan(v128::fromF(result), a, b));
+	return true;
+}
+
+bool ppu_interpreter::VMAXSB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	const auto m = _mm_cmpgt_epi8(a, b);
+	ppu.vr[op.vd].vi = _mm_or_si128(_mm_and_si128(m, a), _mm_andnot_si128(m, b));
+	return true;
+}
+
+bool ppu_interpreter::VMAXSH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_max_epi16(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter::VMAXSW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	const auto m = _mm_cmpgt_epi32(a, b);
+	ppu.vr[op.vd].vi = _mm_or_si128(_mm_and_si128(m, a), _mm_andnot_si128(m, b));
+	return true;
+}
+
+bool ppu_interpreter::VMAXUB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_max_epu8(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter::VMAXUH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto mask = _mm_set1_epi32(0x80008000);
+	ppu.vr[op.vd].vi = _mm_xor_si128(_mm_max_epi16(_mm_xor_si128(ppu.vr[op.va].vi, mask), _mm_xor_si128(ppu.vr[op.vb].vi, mask)), mask);
+	return true;
+}
+
+bool ppu_interpreter::VMAXUW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	const auto m = sse_cmpgt_epu32(a, b);
+	ppu.vr[op.vd].vi = _mm_or_si128(_mm_and_si128(m, a), _mm_andnot_si128(m, b));
+	return true;
+}
+
+bool ppu_interpreter_fast::VMHADDSHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	const auto c = ppu.vr[op.vc].vi;
+	const auto m = _mm_or_si128(_mm_srli_epi16(_mm_mullo_epi16(a, b), 15), _mm_slli_epi16(_mm_mulhi_epi16(a, b), 1));
+	const auto s = _mm_cmpeq_epi16(m, _mm_set1_epi16(-0x8000)); // detect special case (positive 0x8000)
+	ppu.vr[op.vd].vi = _mm_adds_epi16(_mm_adds_epi16(_mm_xor_si128(m, s), c), _mm_srli_epi16(s, 15));
+	return true;
+}
+
+bool ppu_interpreter_precise::VMHADDSHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	const auto& c = ppu.vr[op.vc];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 8; i++)
+	{
+		const s32 prod = a._s16[i] * b._s16[i];
+		const s32 sum = (prod >> 15) + c._s16[i];
+
+		if (sum < INT16_MIN)
+		{
+			d._s16[i] = INT16_MIN;
+			ppu.sat = true;
+		}
+		else if (sum > INT16_MAX)
+		{
+			d._s16[i] = INT16_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._s16[i] = static_cast<s16>(sum);
+		}
+	}
+
+	return true;
+}
+
+bool ppu_interpreter_fast::VMHRADDSHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	const auto c = ppu.vr[op.vc].vi;
+	const auto x80 = _mm_set1_epi16(0x80); // 0x80 * 0x80 = 0x4000, add this to the product
+	const auto al = _mm_unpacklo_epi16(a, x80);
+	const auto ah = _mm_unpackhi_epi16(a, x80);
+	const auto bl = _mm_unpacklo_epi16(b, x80);
+	const auto bh = _mm_unpackhi_epi16(b, x80);
+	const auto ml = _mm_srai_epi32(_mm_madd_epi16(al, bl), 15);
+	const auto mh = _mm_srai_epi32(_mm_madd_epi16(ah, bh), 15);
+	const auto cl = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), c), 16);
+	const auto ch = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), c), 16);
+	ppu.vr[op.vd].vi = _mm_packs_epi32(_mm_add_epi32(ml, cl), _mm_add_epi32(mh, ch));
+	return true;
+}
+
+bool ppu_interpreter_precise::VMHRADDSHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	const auto& c = ppu.vr[op.vc];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 8; i++)
+	{
+		const s32 prod = a._s16[i] * b._s16[i];
+		const s32 sum = ((prod + 0x00004000) >> 15) + c._s16[i];
+
+		if (sum < INT16_MIN)
+		{
+			d._s16[i] = INT16_MIN;
+			ppu.sat = true;
+		}
+		else if (sum > INT16_MAX)
+		{
+			d._s16[i] = INT16_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._s16[i] = static_cast<s16>(sum);
+		}
+	}
+
+	return true;
+}
+
+bool ppu_interpreter::VMINFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vf;
+	const auto b = ppu.vr[op.vb].vf;
+	const auto result = _mm_or_ps(_mm_min_ps(a, b), _mm_min_ps(b, a));
+	ppu.vr[op.vd] = vec_handle_denormal(ppu, vec_handle_nan(result, a, b));
+	return true;
+}
+
+bool ppu_interpreter::VMINSB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	const auto m = _mm_cmpgt_epi8(a, b);
+	ppu.vr[op.vd].vi = _mm_or_si128(_mm_andnot_si128(m, a), _mm_and_si128(m, b));
+	return true;
+}
+
+bool ppu_interpreter::VMINSH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_min_epi16(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter::VMINSW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	const auto m = _mm_cmpgt_epi32(a, b);
+	ppu.vr[op.vd].vi = _mm_or_si128(_mm_andnot_si128(m, a), _mm_and_si128(m, b));
+	return true;
+}
+
+bool ppu_interpreter::VMINUB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_min_epu8(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter::VMINUH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto mask = _mm_set1_epi32(0x80008000);
+	ppu.vr[op.vd].vi = _mm_xor_si128(_mm_min_epi16(_mm_xor_si128(ppu.vr[op.va].vi, mask), _mm_xor_si128(ppu.vr[op.vb].vi, mask)), mask);
+	return true;
+}
+
+bool ppu_interpreter::VMINUW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	const auto m = sse_cmpgt_epu32(a, b);
+	ppu.vr[op.vd].vi = _mm_or_si128(_mm_andnot_si128(m, a), _mm_and_si128(m, b));
+	return true;
+}
+
+bool ppu_interpreter::VMLADDUHM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_add_epi16(_mm_mullo_epi16(ppu.vr[op.va].vi, ppu.vr[op.vb].vi), ppu.vr[op.vc].vi);
+	return true;
+}
+
+bool ppu_interpreter::VMRGHB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_unpackhi_epi8(ppu.vr[op.vb].vi, ppu.vr[op.va].vi);
+	return true;
+}
+
+bool ppu_interpreter::VMRGHH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_unpackhi_epi16(ppu.vr[op.vb].vi, ppu.vr[op.va].vi);
+	return true;
+}
+
+bool ppu_interpreter::VMRGHW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_unpackhi_epi32(ppu.vr[op.vb].vi, ppu.vr[op.va].vi);
+	return true;
+}
+
+bool ppu_interpreter::VMRGLB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_unpacklo_epi8(ppu.vr[op.vb].vi, ppu.vr[op.va].vi);
+	return true;
+}
+
+bool ppu_interpreter::VMRGLH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_unpacklo_epi16(ppu.vr[op.vb].vi, ppu.vr[op.va].vi);
+	return true;
+}
+
+bool ppu_interpreter::VMRGLW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_unpacklo_epi32(ppu.vr[op.vb].vi, ppu.vr[op.va].vi);
+	return true;
+}
+
+bool ppu_interpreter::VMSUMMBM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi; // signed bytes
+	const auto b = ppu.vr[op.vb].vi; // unsigned bytes
+	const auto c = ppu.vr[op.vc].vi;
+	const auto ah = _mm_srai_epi16(a, 8);
+	const auto bh = _mm_srli_epi16(b, 8);
+	const auto al = _mm_srai_epi16(_mm_slli_epi16(a, 8), 8);
+	const auto bl = _mm_and_si128(b, _mm_set1_epi16(0x00ff));
+	const auto sh = _mm_madd_epi16(ah, bh);
+	const auto sl = _mm_madd_epi16(al, bl);
+	ppu.vr[op.vd].vi = _mm_add_epi32(_mm_add_epi32(c, sh), sl);
+	return true;
+}
+
+bool ppu_interpreter::VMSUMSHM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_add_epi32(_mm_madd_epi16(ppu.vr[op.va].vi, ppu.vr[op.vb].vi), ppu.vr[op.vc].vi);
+	return true;
+}
+
+bool ppu_interpreter_fast::VMSUMSHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	const auto& c = ppu.vr[op.vc];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		s64 result = 0;
+		s32 saturated = 0;
+
+		for (uint h = 0; h < 2; h++)
+		{
+			result += a._s16[w * 2 + h] * b._s16[w * 2 + h];
+		}
+
+		result += c._s32[w];
+
+		if (result > 0x7fffffff)
+		{
+			saturated = 0x7fffffff;
+		}
+		else if (result < INT32_MIN)
+		{
+			saturated = 0x80000000;
+		}
+		else
+			saturated = static_cast<s32>(result);
+
+		d._s32[w] = saturated;
+	}
+	return true;
+}
+
+bool ppu_interpreter_precise::VMSUMSHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	const auto& c = ppu.vr[op.vc];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		s64 result = 0;
+		s32 saturated = 0;
+
+		for (uint h = 0; h < 2; h++)
+		{
+			result += a._s16[w * 2 + h] * b._s16[w * 2 + h];
+		}
+
+		result += c._s32[w];
+
+		if (result > 0x7fffffff)
+		{
+			saturated = 0x7fffffff;
+			ppu.sat = true;
+		}
+		else if (result < INT32_MIN)
+		{
+			saturated = 0x80000000;
+			ppu.sat = true;
+		}
+		else
+			saturated = static_cast<s32>(result);
+
+		d._s32[w] = saturated;
+	}
+	return true;
+}
+
+bool ppu_interpreter::VMSUMUBM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	const auto c = ppu.vr[op.vc].vi;
+	const auto mask = _mm_set1_epi16(0x00ff);
+	const auto ah = _mm_srli_epi16(a, 8);
+	const auto al = _mm_and_si128(a, mask);
+	const auto bh = _mm_srli_epi16(b, 8);
+	const auto bl = _mm_and_si128(b, mask);
+	const auto sh = _mm_madd_epi16(ah, bh);
+	const auto sl = _mm_madd_epi16(al, bl);
+	ppu.vr[op.vd].vi = _mm_add_epi32(_mm_add_epi32(c, sh), sl);
+	return true;
+}
+
+bool ppu_interpreter::VMSUMUHM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	const auto c = ppu.vr[op.vc].vi;
+	const auto ml = _mm_mullo_epi16(a, b); // low results
+	const auto mh = _mm_mulhi_epu16(a, b); // high results
+	const auto ls = _mm_add_epi32(_mm_srli_epi32(ml, 16), _mm_and_si128(ml, _mm_set1_epi32(0x0000ffff)));
+	const auto hs = _mm_add_epi32(_mm_slli_epi32(mh, 16), _mm_and_si128(mh, _mm_set1_epi32(0xffff0000)));
+	ppu.vr[op.vd].vi = _mm_add_epi32(_mm_add_epi32(c, ls), hs);
+	return true;
+}
+
+bool ppu_interpreter_fast::VMSUMUHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	const auto& c = ppu.vr[op.vc];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		u64 result = 0;
+		u32 saturated = 0;
+
+		for (uint h = 0; h < 2; h++)
+		{
+			result += u64{a._u16[w * 2 + h]} * b._u16[w * 2 + h];
+		}
+
+		result += c._u32[w];
+
+		if (result > 0xffffffffu)
+		{
+			saturated = 0xffffffff;
+		}
+		else
+			saturated = static_cast<u32>(result);
+
+		d._u32[w] = saturated;
+	}
+	return true;
+}
+
+bool ppu_interpreter_precise::VMSUMUHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	const auto& c = ppu.vr[op.vc];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		u64 result = 0;
+		u32 saturated = 0;
+
+		for (uint h = 0; h < 2; h++)
+		{
+			result += u64{a._u16[w * 2 + h]} * b._u16[w * 2 + h];
+		}
+
+		result += c._u32[w];
+
+		if (result > 0xffffffffu)
+		{
+			saturated = 0xffffffff;
+			ppu.sat = true;
+		}
+		else
+			saturated = static_cast<u32>(result);
+
+		d._u32[w] = saturated;
+	}
+	return true;
+}
+
+bool ppu_interpreter::VMULESB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_mullo_epi16(_mm_srai_epi16(ppu.vr[op.va].vi, 8), _mm_srai_epi16(ppu.vr[op.vb].vi, 8));
+	return true;
+}
+
+bool ppu_interpreter::VMULESH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_madd_epi16(_mm_srli_epi32(ppu.vr[op.va].vi, 16), _mm_srli_epi32(ppu.vr[op.vb].vi, 16));
+	return true;
+}
+
+bool ppu_interpreter::VMULEUB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_mullo_epi16(_mm_srli_epi16(ppu.vr[op.va].vi, 8), _mm_srli_epi16(ppu.vr[op.vb].vi, 8));
+	return true;
+}
+
+bool ppu_interpreter::VMULEUH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	const auto ml = _mm_mullo_epi16(a, b);
+	const auto mh = _mm_mulhi_epu16(a, b);
+	ppu.vr[op.vd].vi = _mm_or_si128(_mm_srli_epi32(ml, 16), _mm_and_si128(mh, _mm_set1_epi32(0xffff0000)));
+	return true;
+}
+
+bool ppu_interpreter::VMULOSB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_mullo_epi16(_mm_srai_epi16(_mm_slli_epi16(ppu.vr[op.va].vi, 8), 8), _mm_srai_epi16(_mm_slli_epi16(ppu.vr[op.vb].vi, 8), 8));
+	return true;
+}
+
+bool ppu_interpreter::VMULOSH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto mask = _mm_set1_epi32(0x0000ffff);
+	ppu.vr[op.vd].vi = _mm_madd_epi16(_mm_and_si128(ppu.vr[op.va].vi, mask), _mm_and_si128(ppu.vr[op.vb].vi, mask));
+	return true;
+}
+
+bool ppu_interpreter::VMULOUB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto mask = _mm_set1_epi16(0x00ff);
+	ppu.vr[op.vd].vi = _mm_mullo_epi16(_mm_and_si128(ppu.vr[op.va].vi, mask), _mm_and_si128(ppu.vr[op.vb].vi, mask));
+	return true;
+}
+
+bool ppu_interpreter::VMULOUH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va].vi;
+	const auto b = ppu.vr[op.vb].vi;
+	const auto ml = _mm_mullo_epi16(a, b);
+	const auto mh = _mm_mulhi_epu16(a, b);
+	ppu.vr[op.vd].vi = _mm_or_si128(_mm_slli_epi32(mh, 16), _mm_and_si128(ml, _mm_set1_epi32(0x0000ffff)));
+	return true;
+}
+
+bool ppu_interpreter_fast::VNMSUBFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = _mm_sub_ps(_mm_mul_ps(ppu.vr[op.va].vf, ppu.vr[op.vc].vf), ppu.vr[op.vb].vf);
+	const auto b = _mm_set1_ps(-0.0f);
+	const auto result = _mm_xor_ps(a, b);
+	ppu.vr[op.vd] = vec_handle_nan(result);
+	return true;
+}
+
+bool ppu_interpreter_precise::VNMSUBFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto m = _mm_set1_ps(-0.0f);
+	const auto a = vec_handle_denormal(ppu, ppu.vr[op.va]);
+	const auto c = vec_handle_denormal(ppu, ppu.vr[op.vc]);
+	const auto b = v128::fromF(_mm_xor_ps(ppu.vr[op.vb].vf, m));
+	const auto r = v128::fromF(_mm_xor_ps(v128::fma32f(a, c, b).vf, m));
+	ppu.vr[op.rd] = vec_handle_denormal(ppu, vec_handle_nan(r, a, b, c));
+	return true;
+}
+
+bool ppu_interpreter::VNOR(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd] = ~(ppu.vr[op.va] | ppu.vr[op.vb]);
+	return true;
+}
+
+bool ppu_interpreter::VOR(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd] = ppu.vr[op.va] | ppu.vr[op.vb];
+	return true;
+}
+
+bool ppu_interpreter::VPERM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = s_use_ssse3
+		? sse_altivec_vperm(ppu.vr[op.va].vi, ppu.vr[op.vb].vi, ppu.vr[op.vc].vi)
+		: sse_altivec_vperm_v0(ppu.vr[op.va].vi, ppu.vr[op.vb].vi, ppu.vr[op.vc].vi);
+	return true;
+}
+
+bool ppu_interpreter::VPKPX(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	v128 VA = ppu.vr[op.va];
+	v128 VB = ppu.vr[op.vb];
+	for (uint h = 0; h < 4; h++)
+	{
+		u16 bb7 = VB._u8[15 - (h * 4 + 0)] & 0x1;
+		u16 bb8 = VB._u8[15 - (h * 4 + 1)] >> 3;
+		u16 bb16 = VB._u8[15 - (h * 4 + 2)] >> 3;
+		u16 bb24 = VB._u8[15 - (h * 4 + 3)] >> 3;
+		u16 ab7 = VA._u8[15 - (h * 4 + 0)] & 0x1;
+		u16 ab8 = VA._u8[15 - (h * 4 + 1)] >> 3;
+		u16 ab16 = VA._u8[15 - (h * 4 + 2)] >> 3;
+		u16 ab24 = VA._u8[15 - (h * 4 + 3)] >> 3;
+
+		d._u16[3 - h] = (bb7 << 15) | (bb8 << 10) | (bb16 << 5) | bb24;
+		d._u16[4 + (3 - h)] = (ab7 << 15) | (ab8 << 10) | (ab16 << 5) | ab24;
+	}
+	return true;
+}
+
+bool ppu_interpreter_fast::VPKSHSS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_packs_epi16(ppu.vr[op.vb].vi, ppu.vr[op.va].vi);
+	return true;
+}
+
+bool ppu_interpreter_precise::VPKSHSS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	v128 d;
+
+	for (u8 i = 0; i < 8; i++)
+	{
+		s16 result = a._s16[i];
+
+		if (result < INT8_MIN)
+		{
+			d._s8[i + 8] = INT8_MIN;
+			ppu.sat = true;
+		}
+		else if (result > INT8_MAX)
+		{
+			d._s8[i + 8] = INT8_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._s8[i + 8] = static_cast<s8>(result);
+		}
+
+		result = b._s16[i];
+
+		if (result < INT8_MIN)
+		{
+			d._s8[i] = INT8_MIN;
+			ppu.sat = true;
+		}
+		else if (result > INT8_MAX)
+		{
+			d._s8[i] = INT8_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._s8[i] = static_cast<s8>(result);
+		}
+	}
+
+	ppu.vr[op.vd] = d;
+	return true;
+}
+
+bool ppu_interpreter_fast::VPKSHUS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_packus_epi16(ppu.vr[op.vb].vi, ppu.vr[op.va].vi);
+	return true;
+}
+
+bool ppu_interpreter_precise::VPKSHUS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = ppu.vr[op.va];
+	const auto b = ppu.vr[op.vb];
+
+	// Detect saturation
+	{
+		const u64 mask = 0xFF00FF00FF00FF00ULL;
+		const auto all_bits = a | b;
+		if ((all_bits._u64[0] | all_bits._u64[1]) & mask)
+		{
+			ppu.sat = true;
+		}
+	}
+
+	ppu.vr[op.vd].vi = _mm_packus_epi16(b.vi, a.vi);
+	return true;
+}
+
+bool ppu_interpreter_fast::VPKSWSS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_packs_epi32(ppu.vr[op.vb].vi, ppu.vr[op.va].vi);
+	return true;
+}
+
+bool ppu_interpreter_precise::VPKSWSS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	v128 d;
+
+	for (u8 i = 0; i < 4; i++)
+	{
+		s32 result = a._s32[i];
+
+		if (result < INT16_MIN)
+		{
+			d._s16[i + 4] = INT16_MIN;
+			ppu.sat = true;
+		}
+		else if (result > INT16_MAX)
+		{
+			d._s16[i + 4] = INT16_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._s16[i + 4] = static_cast<s16>(result);
+		}
+
+		result = b._s32[i];
+
+		if (result < INT16_MIN)
+		{
+			d._s16[i] = INT16_MIN;
+			ppu.sat = true;
+		}
+		else if (result > INT16_MAX)
+		{
+			d._s16[i] = INT16_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._s16[i] = static_cast<s16>(result);
+		}
+	}
+
+	ppu.vr[op.vd] = d;
+	return true;
+}
+
+bool ppu_interpreter_fast::VPKSWUS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	//ppu.vr[op.vd].vi = _mm_packus_epi32(ppu.vr[op.vb].vi, ppu.vr[op.va].vi);
+	auto& d = ppu.vr[op.vd];
+	v128 VA = ppu.vr[op.va];
+	v128 VB = ppu.vr[op.vb];
+	for (uint h = 0; h < 4; h++)
+	{
+		s32 result = VA._s32[h];
+
+		if (result > UINT16_MAX)
+		{
+			result = UINT16_MAX;
+		}
+		else if (result < 0)
+		{
+			result = 0;
+		}
+
+		d._u16[h + 4] = result;
+
+		result = VB._s32[h];
+
+		if (result > UINT16_MAX)
+		{
+			result = UINT16_MAX;
+		}
+		else if (result < 0)
+		{
+			result = 0;
+		}
+
+		d._u16[h] = result;
+	}
+	return true;
+}
+
+bool ppu_interpreter_precise::VPKSWUS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	//ppu.vr[op.vd].vi = _mm_packus_epi32(ppu.vr[op.vb].vi, ppu.vr[op.va].vi);
+	auto& d = ppu.vr[op.vd];
+	v128 VA = ppu.vr[op.va];
+	v128 VB = ppu.vr[op.vb];
+	for (uint h = 0; h < 4; h++)
+	{
+		s32 result = VA._s32[h];
+
+		if (result > UINT16_MAX)
+		{
+			result = UINT16_MAX;
+			ppu.sat = true;
+		}
+		else if (result < 0)
+		{
+			result = 0;
+			ppu.sat = true;
+		}
+
+		d._u16[h + 4] = result;
+
+		result = VB._s32[h];
+
+		if (result > UINT16_MAX)
+		{
+			result = UINT16_MAX;
+			ppu.sat = true;
+		}
+		else if (result < 0)
+		{
+			result = 0;
+			ppu.sat = true;
+		}
+
+		d._u16[h] = result;
+	}
+	return true;
+}
+
+bool ppu_interpreter::VPKUHUM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	v128 VA = ppu.vr[op.va];
+	v128 VB = ppu.vr[op.vb];
+	for (uint b = 0; b < 8; b++)
+	{
+		d._u8[b + 8] = VA._u8[b * 2];
+		d._u8[b] = VB._u8[b * 2];
+	}
+	return true;
+}
+
+bool ppu_interpreter_fast::VPKUHUS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	v128 VA = ppu.vr[op.va];
+	v128 VB = ppu.vr[op.vb];
+	for (uint b = 0; b < 8; b++)
+	{
+		u16 result = VA._u16[b];
+
+		if (result > UINT8_MAX)
+		{
+			result = UINT8_MAX;
+		}
+
+		d._u8[b + 8] = static_cast<u8>(result);
+
+		result = VB._u16[b];
+
+		if (result > UINT8_MAX)
+		{
+			result = UINT8_MAX;
+		}
+
+		d._u8[b] = static_cast<u8>(result);
+	}
+	return true;
+}
+
+bool ppu_interpreter_precise::VPKUHUS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	v128 VA = ppu.vr[op.va];
+	v128 VB = ppu.vr[op.vb];
+	for (uint b = 0; b < 8; b++)
+	{
+		u16 result = VA._u16[b];
+
+		if (result > UINT8_MAX)
+		{
+			result = UINT8_MAX;
+			ppu.sat = true;
+		}
+
+		d._u8[b + 8] = static_cast<u8>(result);
+
+		result = VB._u16[b];
+
+		if (result > UINT8_MAX)
+		{
+			result = UINT8_MAX;
+			ppu.sat = true;
+		}
+
+		d._u8[b] = static_cast<u8>(result);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VPKUWUM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	v128 VA = ppu.vr[op.va];
+	v128 VB = ppu.vr[op.vb];
+	for (uint h = 0; h < 4; h++)
+	{
+		d._u16[h + 4] = VA._u16[h * 2];
+		d._u16[h] = VB._u16[h * 2];
+	}
+	return true;
+}
+
+bool ppu_interpreter_fast::VPKUWUS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	v128 VA = ppu.vr[op.va];
+	v128 VB = ppu.vr[op.vb];
+	for (uint h = 0; h < 4; h++)
+	{
+		u32 result = VA._u32[h];
+
+		if (result > UINT16_MAX)
+		{
+			result = UINT16_MAX;
+		}
+
+		d._u16[h + 4] = result;
+
+		result = VB._u32[h];
+
+		if (result > UINT16_MAX)
+		{
+			result = UINT16_MAX;
+		}
+
+		d._u16[h] = result;
+	}
+	return true;
+}
+
+bool ppu_interpreter_precise::VPKUWUS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	v128 VA = ppu.vr[op.va];
+	v128 VB = ppu.vr[op.vb];
+	for (uint h = 0; h < 4; h++)
+	{
+		u32 result = VA._u32[h];
+
+		if (result > UINT16_MAX)
+		{
+			result = UINT16_MAX;
+			ppu.sat = true;
+		}
+
+		d._u16[h + 4] = result;
+
+		result = VB._u32[h];
+
+		if (result > UINT16_MAX)
+		{
+			result = UINT16_MAX;
+			ppu.sat = true;
+		}
+
+		d._u16[h] = result;
+	}
+	return true;
+}
+
+bool ppu_interpreter::VREFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = _mm_set_ps(1.0f, 1.0f, 1.0f, 1.0f);
+	const auto b = vec_handle_denormal(ppu, ppu.vr[op.vb]).vf;
+	const auto result = _mm_div_ps(a, b);
+	ppu.vr[op.vd] = vec_handle_denormal(ppu, vec_handle_nan(result, a, b));
+	return true;
+}
+
+bool ppu_interpreter::VRFIM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto b = vec_handle_denormal(ppu, ppu.vr[op.vb]);
+	v128 d;
+
+	for (uint w = 0; w < 4; w++)
+	{
+		d._f[w] = std::floor(b._f[w]);
+	}
+
+	ppu.vr[op.vd] = vec_handle_denormal(ppu, vec_handle_nan(d, b));
+	return true;
+}
+
+bool ppu_interpreter::VRFIN(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto b = ppu.vr[op.vb];
+	v128 d;
+
+	for (uint w = 0; w < 4; w++)
+	{
+		d._f[w] = std::nearbyint(b._f[w]);
+	}
+
+	ppu.vr[op.vd] = vec_handle_denormal(ppu, vec_handle_nan(d, b));
+	return true;
+}
+
+bool ppu_interpreter::VRFIP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto b = vec_handle_denormal(ppu, ppu.vr[op.vb]);
+	v128 d;
+
+	for (uint w = 0; w < 4; w++)
+	{
+		d._f[w] = std::ceil(b._f[w]);
+	}
+
+	ppu.vr[op.vd] = vec_handle_denormal(ppu, vec_handle_nan(d, b));
+	return true;
+}
+
+bool ppu_interpreter::VRFIZ(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto b = ppu.vr[op.vb];
+	v128 d;
+
+	for (uint w = 0; w < 4; w++)
+	{
+		d._f[w] = std::truncf(b._f[w]);
+	}
+
+	ppu.vr[op.vd] = vec_handle_denormal(ppu, vec_handle_nan(d, b));
+	return true;
+}
+
+bool ppu_interpreter::VRLB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint i = 0; i < 16; i++)
+	{
+		d._u8[i] = utils::rol8(a._u8[i], b._u8[i]);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VRLH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint i = 0; i < 8; i++)
+	{
+		d._u16[i] = utils::rol16(a._u16[i], b._u8[i * 2] & 0xf);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VRLW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		d._u32[w] = utils::rol32(a._u32[w], b._u8[w * 4] & 0x1f);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VRSQRTEFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = _mm_set_ps(1.0f, 1.0f, 1.0f, 1.0f);
+	const auto b = vec_handle_denormal(ppu, ppu.vr[op.vb]).vf;
+	const auto result = _mm_div_ps(a, _mm_sqrt_ps(b));
+	ppu.vr[op.vd] = vec_handle_denormal(ppu, vec_handle_nan(result, a, b));
+	return true;
+}
+
+bool ppu_interpreter::VSEL(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	const auto& c = ppu.vr[op.vc];
+
+	d = (b & c) | v128::andnot(c, a);
+	return true;
+}
+
+bool ppu_interpreter::VSL(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	v128 VA = ppu.vr[op.va];
+	u8 sh = ppu.vr[op.vb]._u8[0] & 0x7;
+
+	d._u8[0] = VA._u8[0] << sh;
+	for (uint b = 1; b < 16; b++)
+	{
+		sh = ppu.vr[op.vb]._u8[b] & 0x7;
+		d._u8[b] = (VA._u8[b] << sh) | (VA._u8[b - 1] >> (8 - sh));
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSLB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint i = 0; i < 16; i++)
+	{
+		d._u8[i] = a._u8[i] << (b._u8[i] & 0x7);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSLDOI(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	u8 tmpSRC[32];
+	std::memcpy(tmpSRC, &ppu.vr[op.vb], 16);
+	std::memcpy(tmpSRC + 16, &ppu.vr[op.va], 16);
+
+	for (uint b = 0; b<16; b++)
+	{
+		d._u8[15 - b] = tmpSRC[31 - (b + op.vsh)];
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSLH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint h = 0; h < 8; h++)
+	{
+		d._u16[h] = a._u16[h] << (b._u16[h] & 0xf);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSLO(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	v128 VA = ppu.vr[op.va];
+	u8 nShift = (ppu.vr[op.vb]._u8[0] >> 3) & 0xf;
+
+	d.clear();
+
+	for (u8 b = 0; b < 16 - nShift; b++)
+	{
+		d._u8[15 - b] = VA._u8[15 - (b + nShift)];
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSLW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		d._u32[w] = a._u32[w] << (b._u32[w] & 0x1f);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSPLTB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	u8 byte = ppu.vr[op.vb]._u8[15 - op.vuimm];
+
+	for (uint b = 0; b < 16; b++)
+	{
+		d._u8[b] = byte;
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSPLTH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	ensure((op.vuimm < 8));
+
+	u16 hword = ppu.vr[op.vb]._u16[7 - op.vuimm];
+
+	for (uint h = 0; h < 8; h++)
+	{
+		d._u16[h] = hword;
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSPLTISB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const s8 imm = op.vsimm;
+
+	for (uint b = 0; b < 16; b++)
+	{
+		d._u8[b] = imm;
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSPLTISH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const s16 imm = op.vsimm;
+
+	for (uint h = 0; h < 8; h++)
+	{
+		d._u16[h] = imm;
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSPLTISW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const s32 imm = op.vsimm;
+
+	for (uint w = 0; w < 4; w++)
+	{
+		d._u32[w] = imm;
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSPLTW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	ensure((op.vuimm < 4));
+
+	u32 word = ppu.vr[op.vb]._u32[3 - op.vuimm];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		d._u32[w] = word;
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSR(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	v128 VA = ppu.vr[op.va];
+	u8 sh = ppu.vr[op.vb]._u8[15] & 0x7;
+
+	d._u8[15] = VA._u8[15] >> sh;
+	for (uint b = 14; ~b; b--)
+	{
+		sh = ppu.vr[op.vb]._u8[b] & 0x7;
+		d._u8[b] = (VA._u8[b] >> sh) | (VA._u8[b + 1] << (8 - sh));
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSRAB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint i = 0; i < 16; i++)
+	{
+		d._s8[i] = a._s8[i] >> (b._u8[i] & 0x7);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSRAH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint h = 0; h < 8; h++)
+	{
+		d._s16[h] = a._s16[h] >> (b._u16[h] & 0xf);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSRAW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		d._s32[w] = a._s32[w] >> (b._u32[w] & 0x1f);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSRB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint i = 0; i < 16; i++)
+	{
+		d._u8[i] = a._u8[i] >> (b._u8[i] & 0x7);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSRH(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint h = 0; h < 8; h++)
+	{
+		d._u16[h] = a._u16[h] >> (b._u16[h] & 0xf);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSRO(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	v128 VA = ppu.vr[op.va];
+	u8 nShift = (ppu.vr[op.vb]._u8[0] >> 3) & 0xf;
+
+	d.clear();
+
+	for (u8 b = 0; b < 16 - nShift; b++)
+	{
+		d._u8[b] = VA._u8[b + nShift];
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSRW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		d._u32[w] = a._u32[w] >> (b._u32[w] & 0x1f);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSUBCUW(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		d._u32[w] = a._u32[w] < b._u32[w] ? 0 : 1;
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSUBFP(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto a = vec_handle_denormal(ppu, ppu.vr[op.va]);
+	const auto b = vec_handle_denormal(ppu, ppu.vr[op.vb]);
+	const auto result = v128::subfs(a, b);
+	ppu.vr[op.vd] = vec_handle_denormal(ppu, vec_handle_nan(result, a, b));
+	return true;
+}
+
+bool ppu_interpreter_fast::VSUBSBS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_subs_epi8(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter_precise::VSUBSBS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 16; i++)
+	{
+		const s16 diff = a._s8[i] - b._s8[i];
+
+		if (diff < INT8_MIN)
+		{
+			d._s8[i] = INT8_MIN;
+			ppu.sat = true;
+		}
+		else if (diff > INT8_MAX)
+		{
+			d._s8[i] = INT8_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._s8[i] = static_cast<s8>(diff);
+		}
+	}
+
+	return true;
+}
+
+bool ppu_interpreter_fast::VSUBSHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_subs_epi16(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter_precise::VSUBSHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 8; i++)
+	{
+		const s32 diff = a._s16[i] - b._s16[i];
+
+		if (diff < INT16_MIN)
+		{
+			d._s16[i] = INT16_MIN;
+			ppu.sat = true;
+		}
+		else if (diff > INT16_MAX)
+		{
+			d._s16[i] = INT16_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._s16[i] = static_cast<s16>(diff);
+		}
+	}
+
+	return true;
+}
+
+bool ppu_interpreter_fast::VSUBSWS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		const s64 result = s64{a._s32[w]} - b._s32[w];
+
+		if (result < INT32_MIN)
+		{
+			d._s32[w] = INT32_MIN;
+		}
+		else if (result > INT32_MAX)
+		{
+			d._s32[w] = INT32_MAX;
+		}
+		else
+			d._s32[w] = static_cast<s32>(result);
+	}
+	return true;
+}
+
+bool ppu_interpreter_precise::VSUBSWS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		const s64 result = s64{a._s32[w]} - b._s32[w];
+
+		if (result < INT32_MIN)
+		{
+			d._s32[w] = INT32_MIN;
+			ppu.sat = true;
+		}
+		else if (result > INT32_MAX)
+		{
+			d._s32[w] = INT32_MAX;
+			ppu.sat = true;
+		}
+		else
+			d._s32[w] = static_cast<s32>(result);
+	}
+	return true;
+}
+
+bool ppu_interpreter::VSUBUBM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd] = v128::sub8(ppu.vr[op.va], ppu.vr[op.vb]);
+	return true;
+}
+
+bool ppu_interpreter_fast::VSUBUBS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_subs_epu8(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter_precise::VSUBUBS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 16; i++)
+	{
+		const s16 diff = a._u8[i] - b._u8[i];
+
+		if (diff < 0)
+		{
+			d._u8[i] = 0;
+			ppu.sat = true;
+		}
+		else if (diff > UINT8_MAX)
+		{
+			d._u8[i] = UINT8_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._u8[i] = static_cast<u8>(diff);
+		}
+	}
+
+	return true;
+}
+
+bool ppu_interpreter::VSUBUHM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd] = v128::sub16(ppu.vr[op.va], ppu.vr[op.vb]);
+	return true;
+}
+
+bool ppu_interpreter_fast::VSUBUHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd].vi = _mm_subs_epu16(ppu.vr[op.va].vi, ppu.vr[op.vb].vi);
+	return true;
+}
+
+bool ppu_interpreter_precise::VSUBUHS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+	auto& d = ppu.vr[op.vd];
+
+	for (u8 i = 0; i < 8; i++)
+	{
+		const s32 diff = a._u16[i] - b._u16[i];
+
+		if (diff < 0)
+		{
+			d._u16[i] = 0;
+			ppu.sat = true;
+		}
+		else if (diff > UINT16_MAX)
+		{
+			d._u16[i] = UINT16_MAX;
+			ppu.sat = true;
+		}
+		else
+		{
+			d._u16[i] = static_cast<u16>(diff);
+		}
+	}
+
+	return true;
+}
+
+bool ppu_interpreter::VSUBUWM(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.vr[op.vd] = v128::sub32(ppu.vr[op.va], ppu.vr[op.vb]);
+	return true;
+}
+
+bool ppu_interpreter_fast::VSUBUWS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		const s64 result = s64{a._u32[w]} - b._u32[w];
+
+		if (result < 0)
+		{
+			d._u32[w] = 0;
+		}
+		else
+			d._u32[w] = static_cast<u32>(result);
+	}
+	return true;
+}
+
+bool ppu_interpreter_precise::VSUBUWS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		const s64 result = s64{a._u32[w]} - b._u32[w];
+
+		if (result < 0)
+		{
+			d._u32[w] = 0;
+			ppu.sat = true;
+		}
+		else
+			d._u32[w] = static_cast<u32>(result);
+	}
+	return true;
+}
+
+bool ppu_interpreter_fast::VSUMSWS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	s64 sum = b._s32[0];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		sum += a._s32[w];
+	}
+
+	d.clear();
+	if (sum > INT32_MAX)
+	{
+		d._s32[0] = INT32_MAX;
+	}
+	else if (sum < INT32_MIN)
+	{
+		d._s32[0] = INT32_MIN;
 	}
 	else
-	{
-		return a;
-	}
+		d._s32[0] = static_cast<s32>(sum);
+	return true;
 }
 
-inline v128 ppu_fix_vnan(v128 r)
+bool ppu_interpreter_precise::VSUMSWS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	return gv_selectfs(gv_eqfs(r, r), r, gv_bcst32(0x7fc00000u));
-}
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
 
-template <ppu_exec_bit... Flags>
-inline v128 ppu_set_vnan(v128 r, Vector128 auto... args)
-{
-	if constexpr (((Flags == set_vnan) || ...) && sizeof...(args) > 0)
+	s64 sum = b._s32[0];
+
+	for (uint w = 0; w < 4; w++)
 	{
-		// Full propagation
-		return ppu_select_vnan(args..., ppu_fix_vnan(r));
+		sum += a._s32[w];
 	}
-	else if constexpr (((Flags == fix_vnan) || ...))
+
+	d.clear();
+	if (sum > INT32_MAX)
 	{
-		// Only fix the result
-		return ppu_fix_vnan(r);
+		d._s32[0] = INT32_MAX;
+		ppu.sat = true;
+	}
+	else if (sum < INT32_MIN)
+	{
+		d._s32[0] = INT32_MIN;
+		ppu.sat = true;
 	}
 	else
-	{
-		// Return as is
-		return r;
-	}
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto MFVSCR()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& sat, auto&& nj)
-	{
-		u32 sat_bit = 0;
-		if constexpr (((Flags == set_sat) || ...))
-			sat_bit = !gv_testz(sat); //!!sat._u;
-		d._u64[0] = 0;
-		d._u64[1] = u64(sat_bit | (u32{nj} << 16)) << 32;
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.sat, ppu.nj);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto MTVSCR()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat, use_nj, fix_nj>();
-
-	static const auto exec = [](auto&& sat, auto&& nj, auto&& jm_mask, auto&& b)
-	{
-		const u32 vscr = b._u32[3];
-		if constexpr (((Flags == set_sat) || ...))
-			sat._u = vscr & 1;
-		if constexpr (((Flags == use_nj || Flags == fix_nj) || ...))
-			jm_mask = (vscr & 0x10000) ? 0x7f80'0000 : 0x7fff'ffff;
-		nj = (vscr & 0x10000) != 0;
-	};
-
-	RETURN_(ppu.sat, ppu.nj, ppu.jm_mask, ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VADDCUW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		// ~a is how much can be added to a without carry
-		d = gv_sub32(gv_geu32(gv_not32(std::move(a)), std::move(b)), gv_bcst32(-1));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VADDFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_nj, fix_nj, set_vnan, fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& a_, auto&& b_, auto&& jm_mask)
-	{
-		auto m = gv_bcst32(jm_mask, &ppu_thread::jm_mask);
-		auto a = ppu_flush_denormal<false, Flags...>(m, std::move(a_));
-		auto b = ppu_flush_denormal<false, Flags...>(m, std::move(b_));
-		d = ppu_flush_denormal<true, Flags...>(std::move(m), ppu_set_vnan<Flags...>(gv_addfs(a, b), a, b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.jm_mask);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VADDSBS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-		{
-			auto r = gv_adds_s8(a, b);
-			sat = gv_or32(gv_xor32(gv_add8(std::move(a), std::move(b)), r), std::move(sat));
-			d = std::move(r);
-		}
-		else
-		{
-			d = gv_adds_s8(std::move(a), std::move(b));
-		}
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VADDSHS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-		{
-			auto r = gv_adds_s16(a, b);
-			sat = gv_or32(gv_xor32(gv_add16(std::move(a), std::move(b)), r), std::move(sat));
-			d = std::move(r);
-		}
-		else
-		{
-			d = gv_adds_s16(std::move(a), std::move(b));
-		}
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VADDSWS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-		{
-			auto r = gv_adds_s32(a, b);
-			sat = gv_or32(gv_xor32(gv_add32(std::move(a), std::move(b)), r), std::move(sat));
-			d = std::move(r);
-		}
-		else
-		{
-			d = gv_adds_s32(std::move(a), std::move(b));
-		}
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VADDUBM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_add8(std::move(a), std::move(b));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VADDUBS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-		{
-			auto r = gv_addus_u8(a, b);
-			sat = gv_or32(gv_xor32(gv_add8(std::move(a), std::move(b)), r), std::move(sat));
-			d = std::move(r);
-		}
-		else
-		{
-			d = gv_addus_u8(std::move(a), std::move(b));
-		}
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VADDUHM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_add16(std::move(a), std::move(b));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VADDUHS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-		{
-			auto r = gv_addus_u16(a, b);
-			sat = gv_or32(gv_xor32(gv_add16(std::move(a), std::move(b)), r), std::move(sat));
-			d = std::move(r);
-		}
-		else
-		{
-			d = gv_addus_u16(std::move(a), std::move(b));
-		}
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VADDUWM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_add32(std::move(a), std::move(b));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VADDUWS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-		{
-			auto r = gv_addus_u32(a, b);
-			sat = gv_or32(gv_xor32(gv_add32(std::move(a), std::move(b)), r), std::move(sat));
-			d = std::move(r);
-		}
-		else
-		{
-			d = gv_addus_u32(std::move(a), std::move(b));
-		}
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VAND()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_andfs(std::move(a), std::move(b));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VANDC()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_andnfs(std::move(b), std::move(a));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VAVGSB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_avgs8(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VAVGSH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_avgs16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VAVGSW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_avgs32(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VAVGUB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_avgu8(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VAVGUH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_avgu16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VAVGUW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_avgu32(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCFSX()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& b, u32 i)
-	{
-		d = gv_subus_u16(gv_cvts32_tofs(std::move(b)), gv_bcst32(i));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb], op.vuimm << 23);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCFUX()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& b, u32 i)
-	{
-		d = gv_subus_u16(gv_cvtu32_tofs(std::move(b)), gv_bcst32(i));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb], op.vuimm << 23);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCMPBFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& a, auto&& b)
-	{
-		auto sign = gv_bcstfs(-0.);
-		auto cmp1 = gv_nlefs(a, b);
-		auto cmp2 = gv_ngefs(a, b ^ sign);
-		auto r = (std::move(cmp1) & sign) | gv_shr32(std::move(cmp2) & sign, 1);
-		if constexpr (((Flags == has_oe) || ...))
-			ppu_cr_set(ppu, 6, false, false, gv_testz(r), false);
-		d = std::move(r);
-	};
-
-	RETURN_(ppu, ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCMPEQFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& a, auto&& b)
-	{
-		auto r = gv_eqfs(std::move(a), std::move(b));
-		if constexpr (((Flags == has_oe) || ...))
-			ppu_cr_set(ppu, 6, gv_testall1(r), false, gv_testall0(r), false);
-		d = r;
-	};
-
-	RETURN_(ppu, ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCMPEQUB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& a, auto&& b)
-	{
-		auto r = gv_eq8(std::move(a), std::move(b));
-		if constexpr (((Flags == has_oe) || ...))
-			ppu_cr_set(ppu, 6, gv_testall1(r), false, gv_testall0(r), false);
-		d = r;
-	};
-
-	RETURN_(ppu, ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCMPEQUH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& a, auto&& b)
-	{
-		auto r = gv_eq16(std::move(a), std::move(b));
-		if constexpr (((Flags == has_oe) || ...))
-			ppu_cr_set(ppu, 6, gv_testall1(r), false, gv_testall0(r), false);
-		d = r;
-	};
-
-	RETURN_(ppu, ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCMPEQUW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& a, auto&& b)
-	{
-		auto r = gv_eq32(std::move(a), std::move(b));
-		if constexpr (((Flags == has_oe) || ...))
-			ppu_cr_set(ppu, 6, gv_testall1(r), false, gv_testall0(r), false);
-		d = r;
-	};
-
-	RETURN_(ppu, ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCMPGEFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& a, auto&& b)
-	{
-		auto r = gv_gefs(std::move(a), std::move(b));
-		if constexpr (((Flags == has_oe) || ...))
-			ppu_cr_set(ppu, 6, gv_testall1(r), false, gv_testall0(r), false);
-		d = r;
-	};
-
-	RETURN_(ppu, ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCMPGTFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& a, auto&& b)
-	{
-		auto r = gv_gtfs(std::move(a), std::move(b));
-		if constexpr (((Flags == has_oe) || ...))
-			ppu_cr_set(ppu, 6, gv_testall1(r), false, gv_testall0(r), false);
-		d = r;
-	};
-
-	RETURN_(ppu, ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCMPGTSB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& a, auto&& b)
-	{
-		auto r = gv_gts8(std::move(a), std::move(b));
-		if constexpr (((Flags == has_oe) || ...))
-			ppu_cr_set(ppu, 6, gv_testall1(r), false, gv_testall0(r), false);
-		d = r;
-	};
-
-	RETURN_(ppu, ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCMPGTSH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& a, auto&& b)
-	{
-		auto r = gv_gts16(std::move(a), std::move(b));
-		if constexpr (((Flags == has_oe) || ...))
-			ppu_cr_set(ppu, 6, gv_testall1(r), false, gv_testall0(r), false);
-		d = r;
-	};
-
-	RETURN_(ppu, ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCMPGTSW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& a, auto&& b)
-	{
-		auto r = gv_gts32(std::move(a), std::move(b));
-		if constexpr (((Flags == has_oe) || ...))
-			ppu_cr_set(ppu, 6, gv_testall1(r), false, gv_testall0(r), false);
-		d = r;
-	};
-
-	RETURN_(ppu, ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCMPGTUB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& a, auto&& b)
-	{
-		auto r = gv_gtu8(std::move(a), std::move(b));
-		if constexpr (((Flags == has_oe) || ...))
-			ppu_cr_set(ppu, 6, gv_testall1(r), false, gv_testall0(r), false);
-		d = r;
-	};
-
-	RETURN_(ppu, ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCMPGTUH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& a, auto&& b)
-	{
-		auto r = gv_gtu16(std::move(a), std::move(b));
-		if constexpr (((Flags == has_oe) || ...))
-			ppu_cr_set(ppu, 6, gv_testall1(r), false, gv_testall0(r), false);
-		d = r;
-	};
-
-	RETURN_(ppu, ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCMPGTUW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& a, auto&& b)
-	{
-		auto r = gv_gtu32(std::move(a), std::move(b));
-		if constexpr (((Flags == has_oe) || ...))
-			ppu_cr_set(ppu, 6, gv_testall1(r), false, gv_testall0(r), false);
-		d = r;
-	};
-
-	RETURN_(ppu, ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCTSXS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<fix_vnan, set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& b, auto&& sat, u32 i)
-	{
-		auto r = gv_mulfs(b, gv_bcst32(i));
-		auto l = gv_ltfs(r, gv_bcstfs(-2147483648.));
-		auto h = gv_gefs(r, gv_bcstfs(2147483648.));
-#if !defined(ARCH_X64) && !defined(ARCH_ARM64)
-		r = gv_selectfs(l, gv_bcstfs(-2147483648.), std::move(r));
-#endif
-		r = gv_cvtfs_tos32(std::move(r));
-#if !defined(ARCH_ARM64)
-		r = gv_select32(h, gv_bcst32(0x7fffffff), std::move(r));
-#endif
-		if constexpr (((Flags == fix_vnan) || ...))
-			r = gv_and32(std::move(r), gv_eqfs(b, b));
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_or32(std::move(l), std::move(h)), std::move(sat));
-		d = std::move(r);
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb], ppu.sat, (op.vuimm + 127) << 23);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VCTUXS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<fix_vnan, set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& b, auto&& sat, u32 i)
-	{
-		auto r = gv_mulfs(b, gv_bcst32(i));
-		auto l = gv_ltfs(r, gv_bcstfs(0.));
-		auto h = gv_gefs(r, gv_bcstfs(4294967296.));
-		r = gv_cvtfs_tou32(std::move(r));
-#if !defined(ARCH_ARM64)
-		r = gv_andn32(l, std::move(r)); // saturate to zero
-#endif
-#if !defined(__AVX512VL__) && !defined(ARCH_ARM64)
-		r = gv_or32(std::move(r), h); // saturate to 0xffffffff
-#endif
-		if constexpr (((Flags == fix_vnan) || ...))
-			r = gv_and32(std::move(r), gv_eqfs(b, b));
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_or32(std::move(l), std::move(h)), std::move(sat));
-		d = std::move(r);
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb], ppu.sat, (op.vuimm + 127) << 23);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VEXPTEFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& b)
-	{
-		// for (u32 i = 0; i < 4; i++) d._f[i] = std::exp2f(b._f[i]);
-		d = ppu_set_vnan<Flags...>(gv_exp2_approxfs(std::move(b)));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VLOGEFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& b)
-	{
-		// for (u32 i = 0; i < 4; i++) d._f[i] = std::log2f(b._f[i]);
-		d = ppu_set_vnan<Flags...>(gv_log2_approxfs(std::move(b)));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMADDFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_nj, fix_nj, set_vnan, fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& a_, auto&& b_, auto&& c_, auto&& jm_mask)
-	{
-		auto m = gv_bcst32(jm_mask, &ppu_thread::jm_mask);
-		auto a = ppu_flush_denormal<false, Flags...>(m, std::move(a_));
-		auto b = ppu_flush_denormal<false, Flags...>(m, std::move(b_));
-		auto c = ppu_flush_denormal<false, Flags...>(m, std::move(c_));
-		d = ppu_flush_denormal<true, Flags...>(std::move(m), ppu_set_vnan<Flags...>(gv_fmafs(a, c, b)));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.vr[op.vc], ppu.jm_mask);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMAXFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_nj, fix_nj, set_vnan, fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& jm_mask)
-	{
-		d = ppu_flush_denormal<true, Flags...>(gv_bcst32(jm_mask, &ppu_thread::jm_mask), ppu_set_vnan<Flags...>(gv_maxfs(a, b), a, b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.jm_mask);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMAXSB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_maxs8(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMAXSH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_maxs16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMAXSW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_maxs32(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMAXUB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_maxu8(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMAXUH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_maxu16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMAXUW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_maxu32(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMHADDSHS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& c, auto&& sat)
-	{
-		auto m = gv_muls_hds16(a, b);
-		auto f = gv_gts16(gv_bcst16(0), c);
-		auto x = gv_eq16(gv_maxs16(std::move(a), std::move(b)), gv_bcst16(0x8000));
-		auto r = gv_sub16(gv_adds_s16(m, c), gv_and32(x, f));
-		auto s = gv_add16(std::move(m), std::move(c));
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_or32(gv_andn32(std::move(f), x), gv_andn32(x, gv_xor32(std::move(s), r))), sat);
-		d = std::move(r);
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.vr[op.vc], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMHRADDSHS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& c, auto&& sat)
-	{
-		if constexpr (((Flags != set_sat) && ...))
-		{
-			d = gv_rmuladds_hds16(std::move(a), std::move(b), std::move(c));
-		}
-		else
-		{
-			auto m = gv_rmuls_hds16(a, b);
-			auto f = gv_gts16(gv_bcst16(0), c);
-			auto x = gv_eq16(gv_maxs16(std::move(a), std::move(b)), gv_bcst16(0x8000));
-			auto r = gv_sub16(gv_adds_s16(m, c), gv_and32(x, f));
-			auto s = gv_add16(std::move(m), std::move(c));
-			if constexpr (((Flags == set_sat) || ...))
-				sat = gv_or32(gv_or32(gv_andn32(std::move(f), x), gv_andn32(x, gv_xor32(std::move(s), r))), sat);
-			d = std::move(r);
-		}
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.vr[op.vc], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMINFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<fix_nj, set_vnan, fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& jm_mask)
-	{
-		d = ppu_flush_denormal<true, Flags...>(gv_bcst32(jm_mask, &ppu_thread::jm_mask), ppu_set_vnan<Flags...>(gv_minfs(a, b), a, b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.jm_mask);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMINSB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_mins8(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMINSH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_mins16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMINSW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_mins32(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMINUB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_minu8(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMINUH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_minu16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMINUW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_minu32(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMLADDUHM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& c)
-	{
-		d = gv_muladd16(std::move(a), std::move(b), std::move(c));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.vr[op.vc]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMRGHB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_unpackhi8(std::move(b), std::move(a));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMRGHH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_unpackhi16(std::move(b), std::move(a));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMRGHW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_unpackhi32(std::move(b), std::move(a));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMRGLB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_unpacklo8(std::move(b), std::move(a));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMRGLH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_unpacklo16(std::move(b), std::move(a));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMRGLW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_unpacklo32(std::move(b), std::move(a));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMSUMMBM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& c)
-	{
-		d = gv_dotu8s8x4(std::move(b), std::move(a), std::move(c));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.vr[op.vc]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMSUMSHM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& c)
-	{
-		d = gv_dots16x2(std::move(a), std::move(b), std::move(c));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.vr[op.vc]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMSUMSHS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& c, auto&& sat)
-	{
-		auto r = gv_dots_s16x2(a, b, c);
-		auto s = gv_dots16x2(std::move(a), std::move(b), std::move(c));
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_xor32(std::move(s), r), std::move(sat));
-		d = std::move(r);
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.vr[op.vc], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMSUMUBM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& c)
-	{
-		d = gv_dotu8x4(std::move(a), std::move(b), std::move(c));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.vr[op.vc]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMSUMUHM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& c)
-	{
-		d = gv_add32(std::move(c), gv_dotu16x2(std::move(a), std::move(b)));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.vr[op.vc]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMSUMUHS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& c, auto&& sat)
-	{
-		auto m1 = gv_mul_even_u16(a, b);
-		auto m2 = gv_mul_odds_u16(std::move(a), std::move(b));
-		auto s1 = gv_add32(m1, m2);
-		auto x1 = gv_gtu32(m1, s1);
-		auto s2 = gv_or32(gv_add32(s1, std::move(c)), x1);
-		auto x2 = gv_gtu32(std::move(s1), s2);
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_or32(std::move(x1), x2), std::move(sat));
-		d = gv_or32(std::move(s2), std::move(x2));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.vr[op.vc], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMULESB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_mul16(gv_sar16(std::move(a), 8), gv_sar16(std::move(b), 8));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMULESH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_mul_odds_s16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMULEUB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_mul16(gv_shr16(std::move(a), 8), gv_shr16(std::move(b), 8));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMULEUH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_mul_odds_u16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMULOSB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_mul16(gv_sar16(gv_shl16(std::move(a), 8), 8), gv_sar16(gv_shl16(std::move(b), 8), 8));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMULOSH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_mul_even_s16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMULOUB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		auto mask = gv_bcst16(0x00ff);
-		d = gv_mul16(gv_and32(std::move(a), mask), gv_and32(std::move(b), mask));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VMULOUH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_mul_even_u16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VNMSUBFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_nj, fix_nj, set_vnan, fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& a_, auto&& b_, auto&& c_, auto&& jm_mask)
-	{
-		// An odd case with (FLT_MIN, FLT_MIN, FLT_MIN) produces FLT_MIN instead of 0
-		auto s = gv_bcstfs(-0.0f);
-		auto m = gv_bcst32(jm_mask, &ppu_thread::jm_mask);
-		auto a = ppu_flush_denormal<false, Flags...>(m, std::move(a_));
-		auto b = ppu_flush_denormal<false, Flags...>(m, std::move(b_));
-		auto c = ppu_flush_denormal<false, Flags...>(m, std::move(c_));
-		auto r = gv_xorfs(std::move(s), gv_fmafs(std::move(a), std::move(c), gv_xorfs(std::move(b), s)));
-		d = ppu_flush_denormal<true, Flags...>(std::move(m), ppu_set_vnan<Flags...>(std::move(r)));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.vr[op.vc], ppu.jm_mask);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VNOR()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_notfs(gv_orfs(std::move(a), std::move(b)));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VOR()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_orfs(std::move(a), std::move(b));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VPERM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-#if defined (ARCH_X64)
-	if constexpr (Build == 0)
-	{
-		static const ppu_intrp_func_t f = build_function_asm<ppu_intrp_func_t, asmjit::ppu_builder>("ppu_VPERM", [&](asmjit::ppu_builder& c, native_args&)
-		{
-			const auto [v0, v1, v2, v3] = c.vec_alloc<4>();
-			c.movdqa(v0, c.ppu_vr(s_op.vc));
-			c.pandn(v0, c.get_const(v128::from8p(0x1f)));
-			c.movdqa(v1, v0);
-			c.pcmpgtb(v1, c.get_const(v128::from8p(0xf)));
-			c.movdqa(v2, c.ppu_vr(s_op.va));
-			c.movdqa(v3, c.ppu_vr(s_op.vb));
-			c.pshufb(v2, v0);
-			c.pshufb(v3, v0);
-			c.pand(v2, v1);
-			c.pandn(v1, v3);
-			c.por(v1, v2);
-			c.movdqa(c.ppu_vr(s_op.vd), v1);
-			c.ppu_ret();
-		});
-
-		if (utils::has_ssse3())
-		{
-			return f;
-		}
-	}
-#endif
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& c)
-	{
-	#if defined(ARCH_ARM64)
-		uint8x16x2_t ab;
-		ab.val[0] = b;
-		ab.val[1] = a;
-		d = vqtbl2q_u8(ab, vbicq_u8(vdupq_n_u8(0x1f), c));
-	#else
-		u8 ab[32];
-		std::memcpy(ab + 0, &b, 16);
-		std::memcpy(ab + 16, &a, 16);
-
-		for (u32 i = 0; i < 16; i++)
-		{
-			d._u8[i] = ab[~c._u8[i] & 0x1f];
-		}
-	#endif
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.vr[op.vc]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VPKPX()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		auto a1 = gv_sar32(gv_shl32(a, 7), 7 + 9);
-		auto b1 = gv_sar32(gv_shl32(b, 7), 7 + 9);
-		auto a2 = gv_sar32(gv_shl32(a, 16), 16 + 3);
-		auto b2 = gv_sar32(gv_shl32(b, 16), 16 + 3);
-		auto p1 = gv_packss_s32(b1, a1);
-		auto p2 = gv_packss_s32(b2, a2);
-		d = gv_or32(gv_or32(gv_and32(p1, gv_bcst16(0xfc00)), gv_shl16(gv_and32(p1, gv_bcst16(0x7c)), 3)), gv_and32(p2, gv_bcst16(0x1f)));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VPKSHSS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_shr16(gv_add16(a, gv_bcst16(0x80)) | gv_add16(b, gv_bcst16(0x80)), 8), std::move(sat));
-		d = gv_packss_s16(std::move(b), std::move(a));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VPKSHUS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_shr16(a | b, 8), std::move(sat));
-		d = gv_packus_s16(std::move(b), std::move(a));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VPKSWSS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_shr32(gv_add32(a, gv_bcst32(0x8000)) | gv_add32(b, gv_bcst32(0x8000)), 16), std::move(sat));
-		d = gv_packss_s32(std::move(b), std::move(a));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VPKSWUS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_shr32(a | b, 16), std::move(sat));
-		d = gv_packus_s32(std::move(b), std::move(a));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VPKUHUM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_packtu16(std::move(b), std::move(a));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VPKUHUS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_shr16(a | b, 8), std::move(sat));
-		d = gv_packus_u16(std::move(b), std::move(a));
-	};
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VPKUWUM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_packtu32(std::move(b), std::move(a));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VPKUWUS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_shr32(a | b, 16), std::move(sat));
-		d = gv_packus_u32(std::move(b), std::move(a));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VREFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_nj, fix_nj, set_vnan, fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& b_, auto&& jm_mask)
-	{
-		auto m = gv_bcst32(jm_mask, &ppu_thread::jm_mask);
-		auto b = ppu_flush_denormal<false, Flags...>(m, std::move(b_));
-		d = ppu_flush_denormal<true, Flags...>(std::move(m), ppu_set_vnan<Flags...>(gv_divfs(gv_bcstfs(1.0f), b), b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb], ppu.jm_mask);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VRFIM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_nj, fix_nj, set_vnan, fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& b_, auto&& jm_mask)
-	{
-		auto m = gv_bcst32(jm_mask, &ppu_thread::jm_mask);
-		auto b = ppu_flush_denormal<false, Flags...>(m, std::move(b_));
-		d = ppu_flush_denormal<true, Flags...>(std::move(m), ppu_set_vnan<Flags...>(gv_roundfs_floor(b), b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb], ppu.jm_mask);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VRFIN()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<fix_nj, set_vnan, fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& b, auto&& jm_mask)
-	{
-		auto m = gv_bcst32(jm_mask, &ppu_thread::jm_mask);
-		d = ppu_flush_denormal<true, Flags...>(std::move(m), ppu_set_vnan<Flags...>(gv_roundfs_even(b), b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb], ppu.jm_mask);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VRFIP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_nj, fix_nj, set_vnan, fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& b_, auto&& jm_mask)
-	{
-		auto m = gv_bcst32(jm_mask, &ppu_thread::jm_mask);
-		auto b = ppu_flush_denormal<false, Flags...>(m, std::move(b_));
-		d = ppu_flush_denormal<true, Flags...>(std::move(m), ppu_set_vnan<Flags...>(gv_roundfs_ceil(b), b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb], ppu.jm_mask);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VRFIZ()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<fix_nj, set_vnan, fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& b, auto&& jm_mask)
-	{
-		auto m = gv_bcst32(jm_mask, &ppu_thread::jm_mask);
-		d = ppu_flush_denormal<true, Flags...>(std::move(m), ppu_set_vnan<Flags...>(gv_roundfs_trunc(b), b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb], ppu.jm_mask);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VRLB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_rol8(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VRLH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_rol16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VRLW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_rol32(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VRSQRTEFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_nj, fix_nj, set_vnan, fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& b_, auto&& jm_mask)
-	{
-		auto m = gv_bcst32(jm_mask, &ppu_thread::jm_mask);
-		auto b = ppu_flush_denormal<false, Flags...>(m, std::move(b_));
-		d = ppu_flush_denormal<true, Flags...>(std::move(m), ppu_set_vnan<Flags...>(gv_divfs(gv_bcstfs(1.0f), gv_sqrtfs(b)), b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb], ppu.jm_mask);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSEL()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& c)
-	{
-		auto x = gv_andfs(std::move(b), c);
-		d = gv_orfs(std::move(x), gv_andnfs(std::move(c), std::move(a)));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.vr[op.vc]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSL()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_fshl8(std::move(a), gv_shuffle_left<1>(a), std::move(b));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSLB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_shl8(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Count>
-struct VSLDOI
-{
-	template <ppu_exec_bit... Flags>
-	static auto select(bs_t<ppu_exec_bit> selected, auto func)
-	{
-		return ppu_exec_select<>::select<Flags...>(selected, func);
-	}
-
-	template <u32 Build, ppu_exec_bit... Flags>
-	static auto impl()
-	{
-		static const auto exec = [](auto&& d, auto&& a, auto&& b)
-		{
-			d = gv_or32(gv_shuffle_left<Count>(std::move(a)), gv_shuffle_right<16 - Count>(std::move(b)));
-		};
-
-		RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-	}
-};
-
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSLH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_shl16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSLO()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d._u = a._u << (b._u8[0] & 0x78);
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSLW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_shl32(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSPLTB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& b, auto&& imm)
-	{
-		d = gv_bcst8(b.u8r[imm & 15]);
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb], op.vuimm);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSPLTH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& b, auto&& imm)
-	{
-		d = gv_bcst16(b.u16r[imm & 7]);
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb], op.vuimm);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSPLTISB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& imm)
-	{
-		d = gv_bcst8(imm);
-	};
-
-	RETURN_(ppu.vr[op.vd], op.vsimm);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSPLTISH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& imm)
-	{
-		d = gv_bcst16(imm);
-	};
-
-	RETURN_(ppu.vr[op.vd], op.vsimm);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSPLTISW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& imm)
-	{
-		d = gv_bcst32(imm);
-	};
-
-	RETURN_(ppu.vr[op.vd], op.vsimm);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSPLTW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& b, auto&& imm)
-	{
-		d = gv_bcst32(b.u32r[imm & 3]);
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.vb], op.vuimm);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSR()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_fshr8(gv_shuffle_right<1>(a), std::move(a), std::move(b));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSRAB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_sar8(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSRAH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_sar16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSRAW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_sar32(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSRB()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_shr8(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSRH()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_shr16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSRO()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d._u = a._u >> (b._u8[0] & 0x78);
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSRW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_shr32(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUBCUW()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_shr32(gv_geu32(std::move(a), std::move(b)), 31);
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUBFP()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_nj, fix_nj, set_vnan, fix_vnan>();
-
-	static const auto exec = [](auto&& d, auto&& a_, auto&& b_, auto&& jm_mask)
-	{
-		auto m = gv_bcst32(jm_mask, &ppu_thread::jm_mask);
-		auto a = ppu_flush_denormal<false, Flags...>(m, std::move(a_));
-		auto b = ppu_flush_denormal<false, Flags...>(m, std::move(b_));
-		d = ppu_flush_denormal<true, Flags...>(std::move(m), ppu_set_vnan<Flags...>(gv_subfs(a, b), a, b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.jm_mask);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUBSBS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-		{
-			auto r = gv_subs_s8(a, b);
-			sat = gv_or32(gv_xor32(gv_sub8(std::move(a), std::move(b)), r), std::move(sat));
-			d = std::move(r);
-		}
-		else
-		{
-			d = gv_subs_s8(std::move(a), std::move(b));
-		}
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUBSHS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-		{
-			auto r = gv_subs_s16(a, b);
-			sat = gv_or32(gv_xor32(gv_sub16(std::move(a), std::move(b)), r), std::move(sat));
-			d = std::move(r);
-		}
-		else
-		{
-			d = gv_subs_s16(std::move(a), std::move(b));
-		}
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUBSWS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-		{
-			auto r = gv_subs_s32(a, b);
-			sat = gv_or32(gv_xor32(gv_sub32(std::move(a), std::move(b)), r), std::move(sat));
-			d = std::move(r);
-		}
-		else
-		{
-			d = gv_subs_s32(std::move(a), std::move(b));
-		}
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUBUBM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_sub8(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUBUBS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-		{
-			auto r = gv_subus_u8(a, b);
-			sat = gv_or32(gv_xor32(gv_sub8(std::move(a), std::move(b)), r), std::move(sat));
-			d = std::move(r);
-		}
-		else
-		{
-			d = gv_subus_u8(std::move(a), std::move(b));
-		}
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUBUHM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_sub16(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUBUHS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		if constexpr (((Flags == set_sat) || ...))
-		{
-			auto r = gv_subus_u16(a, b);
-			sat = gv_or32(gv_xor32(gv_sub16(std::move(a), std::move(b)), r), std::move(sat));
-			d = std::move(r);
-		}
-		else
-		{
-			d = gv_subus_u16(std::move(a), std::move(b));
-		}
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUBUWM()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
-	{
-		d = gv_sub32(std::move(a), std::move(b));
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
+		d._s32[0] = static_cast<s32>(sum);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUBUWS()
+bool ppu_interpreter_fast::VSUM2SWS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
+	v128 d;
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
 
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
+	for (uint n = 0; n < 2; n++)
 	{
-		if constexpr (((Flags == set_sat) || ...))
-		{
-			auto r = gv_subus_u32(a, b);
-			sat = gv_or32(gv_xor32(gv_sub32(std::move(a), std::move(b)), r), std::move(sat));
-			d = std::move(r);
-		}
-		else
-		{
-			d = gv_subus_u32(std::move(a), std::move(b));
-		}
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUMSWS()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
+		const s64 sum = s64{a._s32[n * 2]} + a._s32[n * 2 + 1] + b._s32[n * 2];
 
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
-	{
-		s64 sum = s64{b._s32[0]} + a._s32[0] + a._s32[1] + a._s32[2] + a._s32[3];
 		if (sum > INT32_MAX)
 		{
-			sum = u32(INT32_MAX);
-			if constexpr (((Flags == set_sat) || ...))
-				sat._bytes[0] = 1;
+			d._s32[n * 2] = INT32_MAX;
 		}
 		else if (sum < INT32_MIN)
 		{
-			sum = u32(INT32_MIN);
-			if constexpr (((Flags == set_sat) || ...))
-				sat._bytes[0] = 1;
+			d._s32[n * 2] = INT32_MIN;
 		}
 		else
+			d._s32[n * 2] = static_cast<s32>(sum);
+	}
+	d._s32[1] = 0;
+	d._s32[3] = 0;
+	ppu.vr[op.vd] = d;
+	return true;
+}
+
+bool ppu_interpreter_precise::VSUM2SWS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	v128 d;
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint n = 0; n < 2; n++)
+	{
+		const s64 sum = s64{a._s32[n * 2]} + a._s32[n * 2 + 1] + b._s32[n * 2];
+
+		if (sum > INT32_MAX)
 		{
-			sum = static_cast<u32>(sum);
+			d._s32[n * 2] = INT32_MAX;
+			ppu.sat = true;
+		}
+		else if (sum < INT32_MIN)
+		{
+			d._s32[n * 2] = INT32_MIN;
+			ppu.sat = true;
+		}
+		else
+			d._s32[n * 2] = static_cast<s32>(sum);
+	}
+
+	d._s32[1] = 0;
+	d._s32[3] = 0;
+	ppu.vr[op.vd] = d;
+	return true;
+}
+
+bool ppu_interpreter_fast::VSUM4SBS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
+
+	for (uint w = 0; w < 4; w++)
+	{
+		s64 sum = b._s32[w];
+
+		for (uint b = 0; b < 4; b++)
+		{
+			sum += a._s8[w * 4 + b];
 		}
 
-		d._u = sum;
-	};
-
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
+		if (sum > INT32_MAX)
+		{
+			d._s32[w] = INT32_MAX;
+		}
+		else if (sum < INT32_MIN)
+		{
+			d._s32[w] = INT32_MIN;
+		}
+		else
+			d._s32[w] = static_cast<s32>(sum);
+	}
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUM2SWS()
+bool ppu_interpreter_precise::VSUM4SBS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
 
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
+	for (uint w = 0; w < 4; w++)
 	{
-#if defined(__AVX512VL__)
-		const auto x = gv_add64(gv_sar64(gv_shl64(a, 32), 32), gv_sar64(a, 32));
-		const auto y = gv_add64(x, gv_sar64(gv_shl64(b, 32), 32));
-		const auto r = _mm_unpacklo_epi32(_mm_cvtsepi64_epi32(y), _mm_setzero_si128());
-#elif defined(ARCH_ARM64)
-		const auto x = vaddl_s32(vget_low_s32(vuzp1q_s32(a, a)), vget_low_s32(vuzp2q_s32(a, a)));
-		const auto y = vaddw_s32(x, vget_low_s32(vuzp1q_s32(b, b)));
-		const auto r = vmovl_u32(uint32x2_t(vqmovn_s64(y)));
-#else
-		v128 y{};
-		y._s64[0] = s64{a._s32[0]} + a._s32[1] + b._s32[0];
-		y._s64[1] = s64{a._s32[2]} + a._s32[3] + b._s32[2];
-		v128 r{};
-		r._u64[0] = y._s64[0] > INT32_MAX ? INT32_MAX : y._s64[0] < INT32_MIN ? u32(INT32_MIN) : static_cast<u32>(y._s64[0]);
-		r._u64[1] = y._s64[1] > INT32_MAX ? INT32_MAX : y._s64[1] < INT32_MIN ? u32(INT32_MIN) : static_cast<u32>(y._s64[1]);
-#endif
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_shr64(gv_add64(y, gv_bcst64(0x80000000u)), 32), std::move(sat));
-		d = r;
-	};
+		s64 sum = b._s32[w];
 
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
+		for (uint b = 0; b < 4; b++)
+		{
+			sum += a._s8[w * 4 + b];
+		}
+
+		if (sum > INT32_MAX)
+		{
+			d._s32[w] = INT32_MAX;
+			ppu.sat = true;
+		}
+		else if (sum < INT32_MIN)
+		{
+			d._s32[w] = INT32_MIN;
+			ppu.sat = true;
+		}
+		else
+			d._s32[w] = static_cast<s32>(sum);
+	}
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUM4SBS()
+bool ppu_interpreter_fast::VSUM4SHS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
 
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
+	for (uint w = 0; w < 4; w++)
 	{
-		auto r = gv_dots_u8s8x4(gv_bcst8(1), a, b);
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_xor32(gv_hadds8x4(std::move(a), std::move(b)), r), std::move(sat));
-		d = std::move(r);
-	};
+		s64 sum = b._s32[w];
 
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
+		for (uint h = 0; h < 2; h++)
+		{
+			sum += a._s16[w * 2 + h];
+		}
+
+		if (sum > INT32_MAX)
+		{
+			d._s32[w] = INT32_MAX;
+		}
+		else if (sum < INT32_MIN)
+		{
+			d._s32[w] = INT32_MIN;
+		}
+		else
+			d._s32[w] = static_cast<s32>(sum);
+	}
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUM4SHS()
+bool ppu_interpreter_precise::VSUM4SHS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
 
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
+	for (uint w = 0; w < 4; w++)
 	{
-		auto r = gv_dots_s16x2(a, gv_bcst16(1), b);
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_xor32(gv_hadds16x2(std::move(a), std::move(b)), r), std::move(sat));
-		d = std::move(r);
-	};
+		s64 sum = b._s32[w];
 
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
+		for (uint h = 0; h < 2; h++)
+		{
+			sum += a._s16[w * 2 + h];
+		}
+
+		if (sum > INT32_MAX)
+		{
+			d._s32[w] = INT32_MAX;
+			ppu.sat = true;
+		}
+		else if (sum < INT32_MIN)
+		{
+			d._s32[w] = INT32_MIN;
+			ppu.sat = true;
+		}
+		else
+			d._s32[w] = static_cast<s32>(sum);
+	}
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto VSUM4UBS()
+bool ppu_interpreter_fast::VSUM4UBS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_sat>();
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
 
-	static const auto exec = [](auto&& d, auto&& a, auto&& b, auto&& sat)
+	for (uint w = 0; w < 4; w++)
 	{
-		auto x = gv_haddu8x4(a);
-		auto r = gv_addus_u32(x, b);
-		if constexpr (((Flags == set_sat) || ...))
-			sat = gv_or32(gv_xor32(gv_add32(std::move(x), std::move(b)), r), std::move(sat));
-		d = std::move(r);
-	};
+		u64 sum = b._u32[w];
 
-	RETURN_(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb], ppu.sat);
+		for (uint b = 0; b < 4; b++)
+		{
+			sum += a._u8[w * 4 + b];
+		}
+
+		if (sum > UINT32_MAX)
+		{
+			d._u32[w] = UINT32_MAX;
+		}
+		else
+			d._u32[w] = static_cast<u32>(sum);
+	}
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto VUPKHPX()
+bool ppu_interpreter_precise::VSUM4UBS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
+	auto& d = ppu.vr[op.vd];
+	const auto& a = ppu.vr[op.va];
+	const auto& b = ppu.vr[op.vb];
 
-	static const auto exec = [](auto&& d, auto&& b)
+	for (uint w = 0; w < 4; w++)
 	{
-		auto x = gv_extend_hi_s16(std::move(b));
-		auto y = gv_or32(gv_and32(gv_shl32(x, 6), gv_bcst32(0x1f0000)), gv_and32(gv_shl32(x, 3), gv_bcst32(0x1f00)));
-		d = gv_or32(std::move(y), gv_and32(std::move(x), gv_bcst32(0xff00001f)));
-	};
+		u64 sum = b._u32[w];
 
-	RETURN(ppu.vr[op.vd], ppu.vr[op.vb]);
+		for (uint b = 0; b < 4; b++)
+		{
+			sum += a._u8[w * 4 + b];
+		}
+
+		if (sum > UINT32_MAX)
+		{
+			d._u32[w] = UINT32_MAX;
+			ppu.sat = true;
+		}
+		else
+			d._u32[w] = static_cast<u32>(sum);
+	}
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto VUPKHSB()
+bool ppu_interpreter::VUPKHPX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& b)
+	auto& d = ppu.vr[op.vd];
+	v128 VB = ppu.vr[op.vb];
+	for (uint w = 0; w < 4; w++)
 	{
-		d = gv_extend_hi_s8(std::move(b));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.vb]);
+		d._s8[w * 4 + 3] = VB._s8[8 + w * 2 + 1] >> 7;  // signed shift sign extends
+		d._u8[w * 4 + 2] = (VB._u8[8 + w * 2 + 1] >> 2) & 0x1f;
+		d._u8[w * 4 + 1] = ((VB._u8[8 + w * 2 + 1] & 0x3) << 3) | ((VB._u8[8 + w * 2 + 0] >> 5) & 0x7);
+		d._u8[w * 4 + 0] = VB._u8[8 + w * 2 + 0] & 0x1f;
+	}
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto VUPKHSH()
+bool ppu_interpreter::VUPKHSB(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& b)
+	auto& d = ppu.vr[op.vd];
+	v128 VB = ppu.vr[op.vb];
+	for (uint h = 0; h < 8; h++)
 	{
-		d = gv_extend_hi_s16(std::move(b));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.vb]);
+		d._s16[h] = VB._s8[8 + h];
+	}
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto VUPKLPX()
+bool ppu_interpreter::VUPKHSH(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& b)
+	auto& d = ppu.vr[op.vd];
+	v128 VB = ppu.vr[op.vb];
+	for (uint w = 0; w < 4; w++)
 	{
-		auto x = gv_extend_lo_s16(std::move(b));
-		auto y = gv_or32(gv_and32(gv_shl32(x, 6), gv_bcst32(0x1f0000)), gv_and32(gv_shl32(x, 3), gv_bcst32(0x1f00)));
-		d = gv_or32(std::move(y), gv_and32(std::move(x), gv_bcst32(0xff00001f)));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.vb]);
+		d._s32[w] = VB._s16[4 + w];
+	}
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto VUPKLSB()
+bool ppu_interpreter::VUPKLPX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& b)
+	auto& d = ppu.vr[op.vd];
+	v128 VB = ppu.vr[op.vb];
+	for (uint w = 0; w < 4; w++)
 	{
-		d = gv_extend_lo_s8(std::move(b));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.vb]);
+		d._s8[w * 4 + 3] = VB._s8[w * 2 + 1] >> 7;  // signed shift sign extends
+		d._u8[w * 4 + 2] = (VB._u8[w * 2 + 1] >> 2) & 0x1f;
+		d._u8[w * 4 + 1] = ((VB._u8[w * 2 + 1] & 0x3) << 3) | ((VB._u8[w * 2 + 0] >> 5) & 0x7);
+		d._u8[w * 4 + 0] = VB._u8[w * 2 + 0] & 0x1f;
+	}
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto VUPKLSH()
+bool ppu_interpreter::VUPKLSB(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& b)
+	auto& d = ppu.vr[op.vd];
+	v128 VB = ppu.vr[op.vb];
+	for (uint h = 0; h < 8; h++)
 	{
-		d = gv_extend_lo_s16(std::move(b));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.vb]);
+		d._s16[h] = VB._s8[h];
+	}
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto VXOR()
+bool ppu_interpreter::VUPKLSH(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& d, auto&& a, auto&& b)
+	auto& d = ppu.vr[op.vd];
+	v128 VB = ppu.vr[op.vb];
+	for (uint w = 0; w < 4; w++)
 	{
-		d = gv_xorfs(std::move(a), std::move(b));
-	};
-
-	RETURN(ppu.vr[op.vd], ppu.vr[op.va], ppu.vr[op.vb]);
+		d._s32[w] = VB._s16[w];
+	}
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto TDI()
+bool ppu_interpreter::VXOR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
+	ppu.vr[op.vd] = ppu.vr[op.va] ^ ppu.vr[op.vb];
+	return true;
+}
 
-	if constexpr (Build == 0) return +[](ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func* next_fn)
-	{
+bool ppu_interpreter::TDI(ppu_thread& ppu, ppu_opcode_t op)
+{
 	const s64 a = ppu.gpr[op.ra], b = op.simm16;
 	const u64 a_ = a, b_ = b;
 
@@ -3054,22 +3033,15 @@ auto TDI()
 		((op.bo & 0x2) && a_ < b_) ||
 		((op.bo & 0x1) && a_ > b_))
 	{
-		[[unlikely]]
-		ppu_trap(ppu, vm::get_addr(this_op));
-		return;
+		ppu_trap(ppu, ppu.cia);
+		return false;
 	}
-	return next_fn->fn(ppu, {this_op[1]}, this_op + 1, next_fn + 1);
-	};
+
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto TWI()
+bool ppu_interpreter::TWI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	if constexpr (Build == 0) return +[](ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func* next_fn)
-	{
 	const s32 a = static_cast<u32>(ppu.gpr[op.ra]), b = op.simm16;
 	const u32 a_ = a, b_ = b;
 
@@ -3079,49 +3051,31 @@ auto TWI()
 		((op.bo & 0x2) && a_ < b_) ||
 		((op.bo & 0x1) && a_ > b_))
 	{
-		[[unlikely]]
-		ppu_trap(ppu, vm::get_addr(this_op));
-		return;
+		ppu_trap(ppu, ppu.cia);
+		return false;
 	}
-	return next_fn->fn(ppu, {this_op[1]}, this_op + 1, next_fn + 1);
-	};
+
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MULLI()
+bool ppu_interpreter::MULLI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.rd] = static_cast<s64>(ppu.gpr[op.ra]) * op.simm16;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SUBFIC()
+bool ppu_interpreter::SUBFIC(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 a = ppu.gpr[op.ra];
 	const s64 i = op.simm16;
 	const auto r = add64_flags(~a, i, 1);
 	ppu.gpr[op.rd] = r.result;
 	ppu.xer.ca = r.carry;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CMPLI()
+bool ppu_interpreter::CMPLI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	if (op.l10)
 	{
 		ppu_cr_set<u64>(ppu, op.crfd, ppu.gpr[op.ra], op.uimm16);
@@ -3130,17 +3084,11 @@ auto CMPLI()
 	{
 		ppu_cr_set<u32>(ppu, op.crfd, static_cast<u32>(ppu.gpr[op.ra]), op.uimm16);
 	}
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CMPI()
+bool ppu_interpreter::CMPI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	if (op.l10)
 	{
 		ppu_cr_set<s64>(ppu, op.crfd, ppu.gpr[op.ra], op.simm16);
@@ -3149,159 +3097,92 @@ auto CMPI()
 	{
 		ppu_cr_set<s32>(ppu, op.crfd, static_cast<u32>(ppu.gpr[op.ra]), op.simm16);
 	}
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ADDIC()
+bool ppu_interpreter::ADDIC(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const s64 a = ppu.gpr[op.ra];
 	const s64 i = op.simm16;
 	const auto r = add64_flags(a, i);
 	ppu.gpr[op.rd] = r.result;
 	ppu.xer.ca = r.carry;
 	if (op.main & 1) [[unlikely]] ppu_cr_set<s64>(ppu, 0, r.result, 0);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ADDI()
+bool ppu_interpreter::ADDI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.rd] = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ADDIS()
+bool ppu_interpreter::ADDIS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.rd] = op.ra ? ppu.gpr[op.ra] + (op.simm16 * 65536) : (op.simm16 * 65536);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto BC()
+bool ppu_interpreter::BC(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_call_history>();
-
-	if constexpr (Build == 0) return +[](ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func* next_fn)
-	{
 	const bool bo0 = (op.bo & 0x10) != 0;
 	const bool bo1 = (op.bo & 0x08) != 0;
 	const bool bo2 = (op.bo & 0x04) != 0;
 	const bool bo3 = (op.bo & 0x02) != 0;
 
 	ppu.ctr -= (bo2 ^ true);
-	const u32 link = vm::get_addr(this_op) + 4;
-	if (op.lk) ppu.lr = link;
+	if (op.lk) ppu.lr = ppu.cia + 4;
 
 	const bool ctr_ok = bo2 | ((ppu.ctr != 0) ^ bo3);
 	const bool cond_ok = bo0 | (!!(ppu.cr[op.bi]) ^ (bo1 ^ true));
 
-	const u32 old_cia = ppu.cia;
-
 	if (ctr_ok && cond_ok)
 	{
-		ppu.cia = vm::get_addr(this_op);
 		// Provide additional information by using the origin of the call
 		// Because this is a fixed target branch there's no abiguity about it
-		ppu_record_call<Flags...>(ppu, ppu.cia, op);
+		ppu_record_call(ppu, ppu.cia, op);
 
 		ppu.cia = (op.aa ? 0 : ppu.cia) + op.bt14;
-	}
-	else if (!ppu.state) [[likely]]
-	{
-		return next_fn->fn(ppu, {this_op[1]}, this_op + 1, next_fn + 1);
+		return false;
 	}
 	else
 	{
-		ppu.cia = link;
-	}
-
-	ppu.exec_bytes += link - old_cia;
-	};
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto SC()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	if constexpr (Build == 0)
-	{
-		return +[](ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func*)
-		{
-			const u32 old_cia = ppu.cia;
-			ppu.cia = vm::get_addr(this_op);
-			ppu.exec_bytes += ppu.cia - old_cia;
-			if (op.opcode != ppu_instructions::SC(0))
-			{
-				fmt::throw_exception("Unknown/Illegal SC: 0x%08x", op.opcode);
-			}
-
-			ppu_execute_syscall(ppu, ppu.gpr[11]);
-		};
+		return true;
 	}
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto B()
+bool ppu_interpreter::SC(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_call_history>();
-
-	if constexpr (Build == 0) return +[](ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func*)
+	if (op.opcode != ppu_instructions::SC(0))
 	{
-	const u32 old_cia = ppu.cia;
-	const u32 link = (ppu.cia = vm::get_addr(this_op)) + 4;
+		return UNK(ppu, op);
+	}
+
+	ppu_execute_syscall(ppu, ppu.gpr[11]);
+	return false;
+}
+
+bool ppu_interpreter::B(ppu_thread& ppu, ppu_opcode_t op)
+{
 	// Provide additional information by using the origin of the call
 	// Because this is a fixed target branch there's no abiguity about it
-	ppu_record_call<Flags...>(ppu, ppu.cia, op);
+	ppu_record_call(ppu, ppu.cia, op);
 
+	const u32 link = ppu.cia + 4;
 	ppu.cia = (op.aa ? 0 : ppu.cia) + op.bt24;
 	if (op.lk) ppu.lr = link;
-	ppu.exec_bytes += link - old_cia;
-	};
+	return false;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MCRF()
+bool ppu_interpreter::MCRF(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	CHECK_SIZE(ppu_thread::cr, 32);
 	ppu.cr.fields[op.crfd] = ppu.cr.fields[op.crfs];
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto BCLR()
+bool ppu_interpreter::BCLR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_call_history>();
-
-	if constexpr (Build == 0) return +[](ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func* next_fn)
-	{
 	const bool bo0 = (op.bo & 0x10) != 0;
 	const bool bo1 = (op.bo & 0x08) != 0;
 	const bool bo2 = (op.bo & 0x04) != 0;
@@ -3313,377 +3194,191 @@ auto BCLR()
 	const bool cond_ok = bo0 | (!!(ppu.cr[op.bi]) ^ (bo1 ^ true));
 
 	const u32 target = static_cast<u32>(ppu.lr) & ~3;
-	const u32 link = vm::get_addr(this_op) + 4;
-	if (op.lk) ppu.lr = link;
-
-	const u32 old_cia = ppu.cia;
+	if (op.lk) ppu.lr = ppu.cia + 4;
 
 	if (ctr_ok && cond_ok)
 	{
-		ppu_record_call<Flags...>(ppu, target, op, true);
-		ppu.cia = target;
-	}
-	else if (!ppu.state) [[likely]]
-	{
-		return next_fn->fn(ppu, {this_op[1]}, this_op + 1, next_fn + 1);
+		ppu.cia = ppu_record_call(ppu, target, op, true);
+		return false;
 	}
 	else
 	{
-		ppu.cia = link;
+		return true;
 	}
-
-	ppu.exec_bytes += link - old_cia;
-	};
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CRNOR()
+bool ppu_interpreter::CRNOR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.cr[op.crbd] = (ppu.cr[op.crba] | ppu.cr[op.crbb]) ^ true;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CRANDC()
+bool ppu_interpreter::CRANDC(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.cr[op.crbd] = ppu.cr[op.crba] & (ppu.cr[op.crbb] ^ true);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ISYNC()
+bool ppu_interpreter::ISYNC(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
 	atomic_fence_acquire();
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CRXOR()
+bool ppu_interpreter::CRXOR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.cr[op.crbd] = ppu.cr[op.crba] ^ ppu.cr[op.crbb];
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CRNAND()
+bool ppu_interpreter::CRNAND(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.cr[op.crbd] = (ppu.cr[op.crba] & ppu.cr[op.crbb]) ^ true;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CRAND()
+bool ppu_interpreter::CRAND(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.cr[op.crbd] = ppu.cr[op.crba] & ppu.cr[op.crbb];
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CREQV()
+bool ppu_interpreter::CREQV(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.cr[op.crbd] = (ppu.cr[op.crba] ^ ppu.cr[op.crbb]) ^ true;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CRORC()
+bool ppu_interpreter::CRORC(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.cr[op.crbd] = ppu.cr[op.crba] | (ppu.cr[op.crbb] ^ true);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CROR()
+bool ppu_interpreter::CROR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.cr[op.crbd] = ppu.cr[op.crba] | ppu.cr[op.crbb];
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto BCCTR()
+bool ppu_interpreter::BCCTR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_call_history>();
-
-	if constexpr (Build == 0) return +[](ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func* next_fn)
-	{
-	const u32 link = vm::get_addr(this_op) + 4;
-	if (op.lk) ppu.lr = link;
-	const u32 old_cia = ppu.cia;
+	if (op.lk) ppu.lr = ppu.cia + 4;
 
 	if (op.bo & 0x10 || ppu.cr[op.bi] == ((op.bo & 0x8) != 0))
 	{
-		const u32 target = static_cast<u32>(ppu.ctr) & ~3;
-		ppu_record_call<Flags...>(ppu, target, op, true);
-		ppu.cia = target;
-	}
-	else if (!ppu.state) [[likely]]
-	{
-		return next_fn->fn(ppu, {this_op[1]}, this_op + 1, next_fn + 1);
-	}
-	else
-	{
-		ppu.cia = link;
+		ppu.cia = ppu_record_call(ppu, static_cast<u32>(ppu.ctr) & ~3, op, true);
+		return false;
 	}
 
-	ppu.exec_bytes += link - old_cia;
-	};
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto RLWIMI()
+bool ppu_interpreter::RLWIMI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 mask = ppu_rotate_mask(32 + op.mb32, 32 + op.me32);
 	ppu.gpr[op.ra] = (ppu.gpr[op.ra] & ~mask) | (dup32(utils::rol32(static_cast<u32>(ppu.gpr[op.rs]), op.sh32)) & mask);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto RLWINM()
+bool ppu_interpreter::RLWINM(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = dup32(utils::rol32(static_cast<u32>(ppu.gpr[op.rs]), op.sh32)) & ppu_rotate_mask(32 + op.mb32, 32 + op.me32);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto RLWNM()
+bool ppu_interpreter::RLWNM(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = dup32(utils::rol32(static_cast<u32>(ppu.gpr[op.rs]), ppu.gpr[op.rb] & 0x1f)) & ppu_rotate_mask(32 + op.mb32, 32 + op.me32);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ORI()
+bool ppu_interpreter::ORI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ppu.gpr[op.rs] | op.uimm16;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ORIS()
+bool ppu_interpreter::ORIS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ppu.gpr[op.rs] | (u64{op.uimm16} << 16);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto XORI()
+bool ppu_interpreter::XORI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ppu.gpr[op.rs] ^ op.uimm16;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto XORIS()
+bool ppu_interpreter::XORIS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ppu.gpr[op.rs] ^ (u64{op.uimm16} << 16);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ANDI()
+bool ppu_interpreter::ANDI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ppu.gpr[op.rs] & op.uimm16;
 	ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ANDIS()
+bool ppu_interpreter::ANDIS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ppu.gpr[op.rs] & (u64{op.uimm16} << 16);
 	ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto RLDICL()
+bool ppu_interpreter::RLDICL(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = utils::rol64(ppu.gpr[op.rs], op.sh64) & (~0ull >> op.mbe64);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto RLDICR()
+bool ppu_interpreter::RLDICR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = utils::rol64(ppu.gpr[op.rs], op.sh64) & (~0ull << (op.mbe64 ^ 63));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto RLDIC()
+bool ppu_interpreter::RLDIC(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = utils::rol64(ppu.gpr[op.rs], op.sh64) & ppu_rotate_mask(op.mbe64, op.sh64 ^ 63);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto RLDIMI()
+bool ppu_interpreter::RLDIMI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 mask = ppu_rotate_mask(op.mbe64, op.sh64 ^ 63);
 	ppu.gpr[op.ra] = (ppu.gpr[op.ra] & ~mask) | (utils::rol64(ppu.gpr[op.rs], op.sh64) & mask);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto RLDCL()
+bool ppu_interpreter::RLDCL(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = utils::rol64(ppu.gpr[op.rs], ppu.gpr[op.rb] & 0x3f) & (~0ull >> op.mbe64);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto RLDCR()
+bool ppu_interpreter::RLDCR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = utils::rol64(ppu.gpr[op.rs], ppu.gpr[op.rb] & 0x3f) & (~0ull << (op.mbe64 ^ 63));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CMP()
+bool ppu_interpreter::CMP(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	if (op.l10)
 	{
 		ppu_cr_set<s64>(ppu, op.crfd, ppu.gpr[op.ra], ppu.gpr[op.rb]);
@@ -3692,18 +3387,11 @@ auto CMP()
 	{
 		ppu_cr_set<s32>(ppu, op.crfd, static_cast<u32>(ppu.gpr[op.ra]), static_cast<u32>(ppu.gpr[op.rb]));
 	}
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto TW()
+bool ppu_interpreter::TW(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	if constexpr (Build == 0) return +[](ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func* next_fn)
-	{
 	s32 a = static_cast<s32>(ppu.gpr[op.ra]);
 	s32 b = static_cast<s32>(ppu.gpr[op.rb]);
 
@@ -3713,285 +3401,143 @@ auto TW()
 		(static_cast<u32>(a) < static_cast<u32>(b) && (op.bo & 0x2)) ||
 		(static_cast<u32>(a) > static_cast<u32>(b) && (op.bo & 0x1)))
 	{
-		[[unlikely]]
-		ppu_trap(ppu, vm::get_addr(this_op));
-		return;
+		ppu_trap(ppu, ppu.cia);
+		return false;
 	}
-	return next_fn->fn(ppu, {this_op[1]}, this_op + 1, next_fn + 1);
-	};
+
+	return true;
 }
 
-const v128 s_lvsl_base = v128::from64r(0x0001020304050607, 0x08090a0b0c0d0e0f);
-
-const v128 s_lvsl_consts[16] =
+bool ppu_interpreter::LVSL(ppu_thread& ppu, ppu_opcode_t op)
 {
-	gv_add8(s_lvsl_base, gv_bcst8(0)),
-	gv_add8(s_lvsl_base, gv_bcst8(1)),
-	gv_add8(s_lvsl_base, gv_bcst8(2)),
-	gv_add8(s_lvsl_base, gv_bcst8(3)),
-	gv_add8(s_lvsl_base, gv_bcst8(4)),
-	gv_add8(s_lvsl_base, gv_bcst8(5)),
-	gv_add8(s_lvsl_base, gv_bcst8(6)),
-	gv_add8(s_lvsl_base, gv_bcst8(7)),
-	gv_add8(s_lvsl_base, gv_bcst8(8)),
-	gv_add8(s_lvsl_base, gv_bcst8(9)),
-	gv_add8(s_lvsl_base, gv_bcst8(10)),
-	gv_add8(s_lvsl_base, gv_bcst8(11)),
-	gv_add8(s_lvsl_base, gv_bcst8(12)),
-	gv_add8(s_lvsl_base, gv_bcst8(13)),
-	gv_add8(s_lvsl_base, gv_bcst8(14)),
-	gv_add8(s_lvsl_base, gv_bcst8(15)),
-};
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto LVSL()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op)
-	{
-		const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-		ppu.vr[op.vd] = s_lvsl_consts[addr % 16];
-	};
-
-	RETURN_(ppu, op);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
+	ppu.vr[op.vd].vi = sse_altivec_lvsl(addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LVEBX()
+bool ppu_interpreter::LVEBX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = (op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]) & ~0xfull;
-	ppu.vr[op.vd] = ppu_feed_data<v128, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	return LVX(ppu, op);
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SUBFC()
+bool ppu_interpreter::SUBFC(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 RA = ppu.gpr[op.ra];
 	const u64 RB = ppu.gpr[op.rb];
 	const auto r = add64_flags(~RA, RB, 1);
 	ppu.gpr[op.rd] = r.result;
 	ppu.xer.ca = r.carry;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, (~RA >> 63 == RB >> 63) && (~RA >> 63 != ppu.gpr[op.rd] >> 63));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, r.result, 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, (~RA >> 63 == RB >> 63) && (~RA >> 63 != ppu.gpr[op.rd] >> 63));
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, r.result, 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MULHDU()
+bool ppu_interpreter::MULHDU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.rd] = utils::umulh64(ppu.gpr[op.ra], ppu.gpr[op.rb]);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ADDC()
+bool ppu_interpreter::ADDC(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 RA = ppu.gpr[op.ra];
 	const u64 RB = ppu.gpr[op.rb];
 	const auto r = add64_flags(RA, RB);
 	ppu.gpr[op.rd] = r.result;
 	ppu.xer.ca = r.carry;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, (RA >> 63 == RB >> 63) && (RA >> 63 != ppu.gpr[op.rd] >> 63));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, r.result, 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, (RA >> 63 == RB >> 63) && (RA >> 63 != ppu.gpr[op.rd] >> 63));
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, r.result, 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MULHWU()
+bool ppu_interpreter::MULHWU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	u32 a = static_cast<u32>(ppu.gpr[op.ra]);
 	u32 b = static_cast<u32>(ppu.gpr[op.rb]);
 	ppu.gpr[op.rd] = (u64{a} * b) >> 32;
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
+	return true;
 }
 
-template <u32 N>
-struct MFOCRF
+bool ppu_interpreter::MFOCRF(ppu_thread& ppu, ppu_opcode_t op)
 {
-	template <ppu_exec_bit... Flags>
-	static auto select(bs_t<ppu_exec_bit> selected, auto func)
+	if (op.l11)
 	{
-		return ppu_exec_select<>::select<Flags...>(selected, func);
+		// MFOCRF
+		const u32 n = std::countl_zero<u32>(op.crm) & 7;
+		const u32 p = n * 4;
+		const u32 v = ppu.cr[p + 0] << 3 | ppu.cr[p + 1] << 2 | ppu.cr[p + 2] << 1 | ppu.cr[p + 3] << 0;
+
+		ppu.gpr[op.rd] = v << (p ^ 0x1c);
 	}
-
-	template <u32 Build, ppu_exec_bit... Flags>
-	static auto impl()
+	else
 	{
-		static const auto exec = [](ppu_thread& ppu, auto&& d)
-		{
-			const u32 p = N * 4;
-			const u32 v = ppu.cr[p + 0] << 3 | ppu.cr[p + 1] << 2 | ppu.cr[p + 2] << 1 | ppu.cr[p + 3] << 0;
-
-			d = v << (p ^ 0x1c);
-		};
-
-		RETURN_(ppu, ppu.gpr[op.rd]);
-	}
-};
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto MFCR()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d)
-	{
-#if defined(ARCH_X64)
+		// MFCR
 		be_t<v128> lane0, lane1;
 		std::memcpy(&lane0, ppu.cr.bits, sizeof(v128));
 		std::memcpy(&lane1, ppu.cr.bits + 16, sizeof(v128));
-		const u32 mh = _mm_movemask_epi8(_mm_slli_epi64(lane0.value(), 7));
-		const u32 ml = _mm_movemask_epi8(_mm_slli_epi64(lane1.value(), 7));
+		const u32 mh = _mm_movemask_epi8(_mm_slli_epi64(lane0.value().vi, 7));
+		const u32 ml = _mm_movemask_epi8(_mm_slli_epi64(lane1.value().vi, 7));
 
-		d = (mh << 16) | ml;
-#else
-		d = ppu.cr.pack();
-#endif
-	};
+		ppu.gpr[op.rd] = (mh << 16) | ml;
+	}
 
-	RETURN_(ppu, ppu.gpr[op.rd]);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LWARX()
+bool ppu_interpreter::LWARX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
 	ppu.gpr[op.rd] = ppu_lwarx(ppu, vm::cast(addr));
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LDX()
+bool ppu_interpreter::LDX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<u64, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.gpr[op.rd] = ppu_feed_data<u64>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LWZX()
+bool ppu_interpreter::LWZX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<u32, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.gpr[op.rd] = ppu_feed_data<u32>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SLW()
+bool ppu_interpreter::SLW(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = static_cast<u32>(ppu.gpr[op.rs] << (ppu.gpr[op.rb] & 0x3f));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CNTLZW()
+bool ppu_interpreter::CNTLZW(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = std::countl_zero(static_cast<u32>(ppu.gpr[op.rs]));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SLD()
+bool ppu_interpreter::SLD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u32 n = ppu.gpr[op.rb] & 0x7f;
 	ppu.gpr[op.ra] = n & 0x40 ? 0 : ppu.gpr[op.rs] << n;
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto AND()
+bool ppu_interpreter::AND(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ppu.gpr[op.rs] & ppu.gpr[op.rb];
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CMPL()
+bool ppu_interpreter::CMPL(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	if (op.l10)
 	{
 		ppu_cr_set<u64>(ppu, op.crfd, ppu.gpr[op.ra], ppu.gpr[op.rb]);
@@ -4000,151 +3546,68 @@ auto CMPL()
 	{
 		ppu_cr_set<u32>(ppu, op.crfd, static_cast<u32>(ppu.gpr[op.ra]), static_cast<u32>(ppu.gpr[op.rb]));
 	}
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-const v128 s_lvsr_consts[16] =
+bool ppu_interpreter::LVSR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	gv_add8(s_lvsl_base, gv_bcst8(16)),
-	gv_add8(s_lvsl_base, gv_bcst8(15)),
-	gv_add8(s_lvsl_base, gv_bcst8(14)),
-	gv_add8(s_lvsl_base, gv_bcst8(13)),
-	gv_add8(s_lvsl_base, gv_bcst8(12)),
-	gv_add8(s_lvsl_base, gv_bcst8(11)),
-	gv_add8(s_lvsl_base, gv_bcst8(10)),
-	gv_add8(s_lvsl_base, gv_bcst8(9)),
-	gv_add8(s_lvsl_base, gv_bcst8(8)),
-	gv_add8(s_lvsl_base, gv_bcst8(7)),
-	gv_add8(s_lvsl_base, gv_bcst8(6)),
-	gv_add8(s_lvsl_base, gv_bcst8(5)),
-	gv_add8(s_lvsl_base, gv_bcst8(4)),
-	gv_add8(s_lvsl_base, gv_bcst8(3)),
-	gv_add8(s_lvsl_base, gv_bcst8(2)),
-	gv_add8(s_lvsl_base, gv_bcst8(1)),
-};
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto LVSR()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op)
-	{
-		const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-		ppu.vr[op.vd] = s_lvsr_consts[addr % 16];
-	};
-
-	RETURN_(ppu, op);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
+	ppu.vr[op.vd].vi = sse_altivec_lvsr(addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LVEHX()
+bool ppu_interpreter::LVEHX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = (op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]) & ~0xfull;
-	ppu.vr[op.vd] = ppu_feed_data<v128, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	return LVX(ppu, op);
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SUBF()
+bool ppu_interpreter::SUBF(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 RA = ppu.gpr[op.ra];
 	const u64 RB = ppu.gpr[op.rb];
 	ppu.gpr[op.rd] = RB - RA;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, (~RA >> 63 == RB >> 63) && (~RA >> 63 != ppu.gpr[op.rd] >> 63));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, (~RA >> 63 == RB >> 63) && (~RA >> 63 != ppu.gpr[op.rd] >> 63));
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LDUX()
+bool ppu_interpreter::LDUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<u64, Flags...>(ppu, addr);
+	ppu.gpr[op.rd] = ppu_feed_data<u64>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto DCBST()
+bool ppu_interpreter::DCBST(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LWZUX()
+bool ppu_interpreter::LWZUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<u32, Flags...>(ppu, addr);
+	ppu.gpr[op.rd] = ppu_feed_data<u32>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto CNTLZD()
+bool ppu_interpreter::CNTLZD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = std::countl_zero(ppu.gpr[op.rs]);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ANDC()
+bool ppu_interpreter::ANDC(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ppu.gpr[op.rs] & ~ppu.gpr[op.rb];
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto TD()
+bool ppu_interpreter::TD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	if constexpr (Build == 0) return +[](ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func* next_fn)
-	{
 	const s64 a = ppu.gpr[op.ra], b = ppu.gpr[op.rb];
 	const u64 a_ = a, b_ = b;
 
@@ -4154,213 +3617,118 @@ auto TD()
 		((op.bo & 0x2) && a_ < b_) ||
 		((op.bo & 0x1) && a_ > b_))
 	{
-		[[unlikely]]
-		ppu_trap(ppu, vm::get_addr(this_op));
-		return;
+		ppu_trap(ppu, ppu.cia);
+		return false;
 	}
-	return next_fn->fn(ppu, {this_op[1]}, this_op + 1, next_fn + 1);
-	};
+
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LVEWX()
+bool ppu_interpreter::LVEWX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = (op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]) & ~0xfull;
-	ppu.vr[op.vd] = ppu_feed_data<v128, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	return LVX(ppu, op);
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MULHD()
+bool ppu_interpreter::MULHD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.rd] = utils::mulh64(ppu.gpr[op.ra], ppu.gpr[op.rb]);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MULHW()
+bool ppu_interpreter::MULHW(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	s32 a = static_cast<s32>(ppu.gpr[op.ra]);
 	s32 b = static_cast<s32>(ppu.gpr[op.rb]);
 	ppu.gpr[op.rd] = (s64{a} * b) >> 32;
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LDARX()
+bool ppu_interpreter::LDARX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
 	ppu.gpr[op.rd] = ppu_ldarx(ppu, vm::cast(addr));
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto DCBF()
+bool ppu_interpreter::DCBF(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LBZX()
+bool ppu_interpreter::LBZX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<u8, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.gpr[op.rd] = ppu_feed_data<u8>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LVX()
+bool ppu_interpreter::LVX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = (op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]) & ~0xfull;
-	ppu.vr[op.vd] = ppu_feed_data<v128, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.vr[op.vd] = ppu_feed_data<v128>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto NEG()
+bool ppu_interpreter::NEG(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 RA = ppu.gpr[op.ra];
 	ppu.gpr[op.rd] = 0 - RA;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, RA == (1ull << 63));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, (~RA >> 63 == 0) && (~RA >> 63 != ppu.gpr[op.rd] >> 63));
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LBZUX()
+bool ppu_interpreter::LBZUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<u8, Flags...>(ppu, addr);
+	ppu.gpr[op.rd] = ppu_feed_data<u8>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto NOR()
+bool ppu_interpreter::NOR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ~(ppu.gpr[op.rs] | ppu.gpr[op.rb]);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STVEBX()
+bool ppu_interpreter::STVEBX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
 	const u8 eb = addr & 0xf;
-	PPU_WRITE_8(vm::cast(addr), ppu.vr[op.vs]._u8[15 - eb]);
-	};
-	RETURN_(ppu, op);
+	vm::write8(vm::cast(addr), ppu.vr[op.vs]._u8[15 - eb]);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SUBFE()
+bool ppu_interpreter::SUBFE(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 RA = ppu.gpr[op.ra];
 	const u64 RB = ppu.gpr[op.rb];
 	const auto r = add64_flags(~RA, RB, ppu.xer.ca);
 	ppu.gpr[op.rd] = r.result;
 	ppu.xer.ca = r.carry;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, (~RA >> 63 == RB >> 63) && (~RA >> 63 != ppu.gpr[op.rd] >> 63));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, r.result, 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, (~RA >> 63 == RB >> 63) && (~RA >> 63 != ppu.gpr[op.rd] >> 63));
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, r.result, 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ADDE()
+bool ppu_interpreter::ADDE(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 RA = ppu.gpr[op.ra];
 	const u64 RB = ppu.gpr[op.rb];
 	const auto r = add64_flags(RA, RB, ppu.xer.ca);
 	ppu.gpr[op.rd] = r.result;
 	ppu.xer.ca = r.carry;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, (RA >> 63 == RB >> 63) && (RA >> 63 != ppu.gpr[op.rd] >> 63));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, r.result, 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, (RA >> 63 == RB >> 63) && (RA >> 63 != ppu.gpr[op.rd] >> 63));
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, r.result, 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MTOCRF()
+bool ppu_interpreter::MTOCRF(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	alignas(4) static const u8 s_table[16][4]
 	{
 		{0, 0, 0, 0},
@@ -4404,189 +3772,107 @@ auto MTOCRF()
 			}
 		}
 	}
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STDX()
+bool ppu_interpreter::STDX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	PPU_WRITE_64(vm::cast(addr), ppu.gpr[op.rs]);
-	};
-	RETURN_(ppu, op);
+	vm::write64(vm::cast(addr), ppu.gpr[op.rs]);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STWCX()
+bool ppu_interpreter::STWCX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
 	ppu_cr_set(ppu, 0, false, false, ppu_stwcx(ppu, vm::cast(addr), static_cast<u32>(ppu.gpr[op.rs])), ppu.xer.so);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STWX()
+bool ppu_interpreter::STWX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	PPU_WRITE_32(vm::cast(addr), static_cast<u32>(ppu.gpr[op.rs]));
-	};
-	RETURN_(ppu, op);
+	vm::write32(vm::cast(addr), static_cast<u32>(ppu.gpr[op.rs]));
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STVEHX()
+bool ppu_interpreter::STVEHX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = (op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]) & ~1ULL;
 	const u8 eb = (addr & 0xf) >> 1;
-	PPU_WRITE_16(vm::cast(addr), ppu.vr[op.vs]._u16[7 - eb]);
-	};
-	RETURN_(ppu, op);
+	vm::write16(vm::cast(addr), ppu.vr[op.vs]._u16[7 - eb]);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STDUX()
+bool ppu_interpreter::STDUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb];
-	PPU_WRITE_64(vm::cast(addr), ppu.gpr[op.rs]);
+	vm::write64(vm::cast(addr), ppu.gpr[op.rs]);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STWUX()
+bool ppu_interpreter::STWUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb];
-	PPU_WRITE_32(vm::cast(addr), static_cast<u32>(ppu.gpr[op.rs]));
+	vm::write32(vm::cast(addr), static_cast<u32>(ppu.gpr[op.rs]));
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STVEWX()
+bool ppu_interpreter::STVEWX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = (op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]) & ~3ULL;
 	const u8 eb = (addr & 0xf) >> 2;
-	PPU_WRITE_32(vm::cast(addr), ppu.vr[op.vs]._u32[3 - eb]);
-	};
-	RETURN_(ppu, op);
+	vm::write32(vm::cast(addr), ppu.vr[op.vs]._u32[3 - eb]);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SUBFZE()
+bool ppu_interpreter::SUBFZE(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 RA = ppu.gpr[op.ra];
 	const auto r = add64_flags(~RA, 0, ppu.xer.ca);
 	ppu.gpr[op.rd] = r.result;
 	ppu.xer.ca = r.carry;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, (~RA >> 63 == 0) && (~RA >> 63 != ppu.gpr[op.rd] >> 63));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, r.result, 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, (~RA >> 63 == 0) && (~RA >> 63 != ppu.gpr[op.rd] >> 63));
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, r.result, 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ADDZE()
+bool ppu_interpreter::ADDZE(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 RA = ppu.gpr[op.ra];
 	const auto r = add64_flags(RA, 0, ppu.xer.ca);
 	ppu.gpr[op.rd] = r.result;
 	ppu.xer.ca = r.carry;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, (RA >> 63 == 0) && (RA >> 63 != ppu.gpr[op.rd] >> 63));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, r.result, 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, (RA >> 63 == 0) && (RA >> 63 != ppu.gpr[op.rd] >> 63));
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, r.result, 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STDCX()
+bool ppu_interpreter::STDCX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
 	ppu_cr_set(ppu, 0, false, false, ppu_stdcx(ppu, vm::cast(addr), ppu.gpr[op.rs]), ppu.xer.so);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STBX()
+bool ppu_interpreter::STBX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	PPU_WRITE_8(vm::cast(addr), static_cast<u8>(ppu.gpr[op.rs]));
-	};
-	RETURN_(ppu, op);
+	vm::write8(vm::cast(addr), static_cast<u8>(ppu.gpr[op.rs]));
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STVX()
+bool ppu_interpreter::STVX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = (op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]) & ~0xfull;
-	PPU_WRITE(v128, vm::cast(addr), ppu.vr[op.vs]);
-	};
-	RETURN_(ppu, op);
+	vm::_ref<v128>(vm::cast(addr)) = ppu.vr[op.vs];
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MULLD()
+bool ppu_interpreter::MULLD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const s64 RA = ppu.gpr[op.ra];
 	const s64 RB = ppu.gpr[op.rb];
 	ppu.gpr[op.rd] = RA * RB;
@@ -4595,194 +3881,105 @@ auto MULLD()
 		const s64 high = utils::mulh64(RA, RB);
 		ppu_ov_set(ppu, high != s64(ppu.gpr[op.rd]) >> 63);
 	}
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SUBFME()
+bool ppu_interpreter::SUBFME(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 RA = ppu.gpr[op.ra];
 	const auto r = add64_flags(~RA, ~0ull, ppu.xer.ca);
 	ppu.gpr[op.rd] = r.result;
 	ppu.xer.ca = r.carry;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, (~RA >> 63 == 1) && (~RA >> 63 != ppu.gpr[op.rd] >> 63));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, r.result, 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, (~RA >> 63 == 1) && (~RA >> 63 != ppu.gpr[op.rd] >> 63));
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, r.result, 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ADDME()
+bool ppu_interpreter::ADDME(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const s64 RA = ppu.gpr[op.ra];
 	const auto r = add64_flags(RA, ~0ull, ppu.xer.ca);
 	ppu.gpr[op.rd] = r.result;
 	ppu.xer.ca = r.carry;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, (u64(RA) >> 63 == 1) && (u64(RA) >> 63 != ppu.gpr[op.rd] >> 63));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, r.result, 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, (u64(RA) >> 63 == 1) && (u64(RA) >> 63 != ppu.gpr[op.rd] >> 63));
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, r.result, 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MULLW()
+bool ppu_interpreter::MULLW(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.rd] = s64{static_cast<s32>(ppu.gpr[op.ra])} * static_cast<s32>(ppu.gpr[op.rb]);
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, s64(ppu.gpr[op.rd]) < INT32_MIN || s64(ppu.gpr[op.rd]) > INT32_MAX);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, s64(ppu.gpr[op.rd]) < INT32_MIN || s64(ppu.gpr[op.rd]) > INT32_MAX);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto DCBTST()
+bool ppu_interpreter::DCBTST(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STBUX()
+bool ppu_interpreter::STBUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb];
-	PPU_WRITE_8(vm::cast(addr), static_cast<u8>(ppu.gpr[op.rs]));
+	vm::write8(vm::cast(addr), static_cast<u8>(ppu.gpr[op.rs]));
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ADD()
+bool ppu_interpreter::ADD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 RA = ppu.gpr[op.ra];
 	const u64 RB = ppu.gpr[op.rb];
 	ppu.gpr[op.rd] = RA + RB;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, (RA >> 63 == RB >> 63) && (RA >> 63 != ppu.gpr[op.rd] >> 63));
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, (RA >> 63 == RB >> 63) && (RA >> 63 != ppu.gpr[op.rd] >> 63));
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto DCBT()
+bool ppu_interpreter::DCBT(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LHZX()
+bool ppu_interpreter::LHZX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<u16, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.gpr[op.rd] = ppu_feed_data<u16>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto EQV()
+bool ppu_interpreter::EQV(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ~(ppu.gpr[op.rs] ^ ppu.gpr[op.rb]);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ECIWX()
+bool ppu_interpreter::ECIWX(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
-	fmt::throw_exception("ECIWX");
-	};
-	RETURN_(ppu, op);
+	ppu_log.fatal("ECIWX");
+	return false;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LHZUX()
+bool ppu_interpreter::LHZUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<u16, Flags...>(ppu, addr);
+	ppu.gpr[op.rd] = ppu_feed_data<u16>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto XOR()
+bool ppu_interpreter::XOR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ppu.gpr[op.rs] ^ ppu.gpr[op.rb];
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MFSPR()
+bool ppu_interpreter::MFSPR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u32 n = (op.spr >> 5) | ((op.spr & 0x1f) << 5);
 
 	switch (n)
@@ -4797,67 +3994,37 @@ auto MFSPR()
 	default: fmt::throw_exception("MFSPR 0x%x", n);
 	}
 
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LWAX()
+bool ppu_interpreter::LWAX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<s32, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.gpr[op.rd] = ppu_feed_data<s32>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto DST()
+bool ppu_interpreter::DST(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LHAX()
+bool ppu_interpreter::LHAX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<s16, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.gpr[op.rd] = ppu_feed_data<s16>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LVXL()
+bool ppu_interpreter::LVXL(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = (op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]) & ~0xfull;
-	ppu.vr[op.vd] = ppu_feed_data<v128, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.vr[op.vd] = ppu_feed_data<v128>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MFTB()
+bool ppu_interpreter::MFTB(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u32 n = (op.spr >> 5) | ((op.spr & 0x1f) << 5);
 
 	switch (n)
@@ -4867,159 +4034,87 @@ auto MFTB()
 	default: fmt::throw_exception("MFTB 0x%x", n);
 	}
 
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LWAUX()
+bool ppu_interpreter::LWAUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<s32, Flags...>(ppu, addr);
+	ppu.gpr[op.rd] = ppu_feed_data<s32>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto DSTST()
+bool ppu_interpreter::DSTST(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LHAUX()
+bool ppu_interpreter::LHAUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<s16, Flags...>(ppu, addr);
+	ppu.gpr[op.rd] = ppu_feed_data<s16>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STHX()
+bool ppu_interpreter::STHX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	PPU_WRITE_16(vm::cast(addr), static_cast<u16>(ppu.gpr[op.rs]));
-	};
-	RETURN_(ppu, op);
+	vm::write16(vm::cast(addr), static_cast<u16>(ppu.gpr[op.rs]));
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ORC()
+bool ppu_interpreter::ORC(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ppu.gpr[op.rs] | ~ppu.gpr[op.rb];
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ECOWX()
+bool ppu_interpreter::ECOWX(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
-	fmt::throw_exception("ECOWX");
-	};
-	RETURN_(ppu, op);
+	ppu_log.fatal("ECOWX");
+	return false;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STHUX()
+bool ppu_interpreter::STHUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb];
-	PPU_WRITE_16(vm::cast(addr), static_cast<u16>(ppu.gpr[op.rs]));
+	vm::write16(vm::cast(addr), static_cast<u16>(ppu.gpr[op.rs]));
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto OR()
+bool ppu_interpreter::OR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ppu.gpr[op.rs] | ppu.gpr[op.rb];
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto DIVDU()
+bool ppu_interpreter::DIVDU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 RA = ppu.gpr[op.ra];
 	const u64 RB = ppu.gpr[op.rb];
 	ppu.gpr[op.rd] = RB == 0 ? 0 : RA / RB;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, RB == 0);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, RB == 0);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto DIVWU()
+bool ppu_interpreter::DIVWU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u32 RA = static_cast<u32>(ppu.gpr[op.ra]);
 	const u32 RB = static_cast<u32>(ppu.gpr[op.rb]);
 	ppu.gpr[op.rd] = RB == 0 ? 0 : RA / RB;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, RB == 0);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, RB == 0);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MTSPR()
+bool ppu_interpreter::MTSPR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u32 n = (op.spr >> 5) | ((op.spr & 0x1f) << 5);
 
 	switch (n)
@@ -5039,222 +4134,123 @@ auto MTSPR()
 	default: fmt::throw_exception("MTSPR 0x%x", n);
 	}
 
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto DCBI()
+bool ppu_interpreter::DCBI(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto NAND()
+bool ppu_interpreter::NAND(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = ~(ppu.gpr[op.rs] & ppu.gpr[op.rb]);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STVXL()
+bool ppu_interpreter::STVXL(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = (op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]) & ~0xfull;
-	PPU_WRITE(v128, vm::cast(addr), ppu.vr[op.vs]);
-	};
-	RETURN_(ppu, op);
+	vm::_ref<v128>(vm::cast(addr)) = ppu.vr[op.vs];
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto DIVD()
+bool ppu_interpreter::DIVD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const s64 RA = ppu.gpr[op.ra];
 	const s64 RB = ppu.gpr[op.rb];
 	const bool o = RB == 0 || (RA == INT64_MIN && RB == -1);
 	ppu.gpr[op.rd] = o ? 0 : RA / RB;
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, o);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, o);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto DIVW()
+bool ppu_interpreter::DIVW(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const s32 RA = static_cast<s32>(ppu.gpr[op.ra]);
 	const s32 RB = static_cast<s32>(ppu.gpr[op.rb]);
 	const bool o = RB == 0 || (RA == INT32_MIN && RB == -1);
 	ppu.gpr[op.rd] = o ? 0 : static_cast<u32>(RA / RB);
-	if constexpr (((Flags == has_oe) || ...))
-		ppu_ov_set(ppu, o);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.oe) [[unlikely]] ppu_ov_set(ppu, o);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.rd], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LVLX()
+bool ppu_interpreter::LVLX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op)
-	{
-		const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-		const u128 data = ppu_feed_data<u128, Flags...>(ppu, addr & -16);
-		ppu.vr[op.vd] = data << ((addr & 15) * 8);
-	};
-
-	RETURN_(ppu, op);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto LDBRX()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<le_t<u64>, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.vr[op.vd].vi = s_use_ssse3 ? sse_cellbe_lvlx(ppu, addr) : sse_cellbe_lvlx_v0(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LSWX()
+bool ppu_interpreter::LDBRX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
+	ppu.gpr[op.rd] = ppu_feed_data<le_t<u64>>(ppu, addr);
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
+bool ppu_interpreter::LSWX(ppu_thread& ppu, ppu_opcode_t op)
+{
 	u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
 	u32 count = ppu.xer.cnt & 0x7f;
 	for (; count >= 4; count -= 4, addr += 4, op.rd = (op.rd + 1) & 31)
 	{
-		ppu.gpr[op.rd] = ppu_feed_data<u32, Flags...>(ppu, addr);
+		ppu.gpr[op.rd] = ppu_feed_data<u32>(ppu, addr);
 	}
 	if (count)
 	{
 		u32 value = 0;
 		for (u32 byte = 0; byte < count; byte++)
 		{
-			u32 byte_value = ppu_feed_data<u8, Flags...>(ppu, addr + byte);
+			u32 byte_value = ppu_feed_data<u8>(ppu, addr + byte);
 			value |= byte_value << ((3 ^ byte) * 8);
 		}
 		ppu.gpr[op.rd] = value;
 	}
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LWBRX()
+bool ppu_interpreter::LWBRX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<le_t<u32>, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.gpr[op.rd] = ppu_feed_data<le_t<u32>>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LFSX()
+bool ppu_interpreter::LFSX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.fpr[op.frd] = ppu_feed_data<f32, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.fpr[op.frd] = ppu_feed_data<f32>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SRW()
+bool ppu_interpreter::SRW(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = (ppu.gpr[op.rs] & 0xffffffff) >> (ppu.gpr[op.rb] & 0x3f);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SRD()
+bool ppu_interpreter::SRD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u32 n = ppu.gpr[op.rb] & 0x7f;
 	ppu.gpr[op.ra] = n & 0x40 ? 0 : ppu.gpr[op.rs] >> n;
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LVRX()
+bool ppu_interpreter::LVRX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op)
-	{
-		const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-
-		// Read from instruction address if offset is 0, this prevents accessing potentially bad memory from addr (because no actual memory is dereferenced)
-		const u128 data = ppu_feed_data<u128, Flags...>(ppu, ((addr & 15) == 0 ? ppu.cia : addr) & -16);
-		ppu.vr[op.vd] = data >> ((~addr & 15) * 8) >> 8;
-	};
-
-	RETURN_(ppu, op);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
+	ppu.vr[op.vd].vi = s_use_ssse3 ? sse_cellbe_lvrx(ppu, addr) : sse_cellbe_lvrx_v0(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LSWI()
+bool ppu_interpreter::LSWI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	u64 addr = op.ra ? ppu.gpr[op.ra] : 0;
 	u64 N = op.rb ? op.rb : 32;
 	u8 reg = op.rd;
@@ -5263,7 +4259,7 @@ auto LSWI()
 	{
 		if (N > 3)
 		{
-			ppu.gpr[reg] = ppu_feed_data<u32, Flags...>(ppu, addr);
+			ppu.gpr[reg] = ppu_feed_data<u32>(ppu, addr);
 			addr += 4;
 			N -= 4;
 		}
@@ -5274,7 +4270,7 @@ auto LSWI()
 			while (N > 0)
 			{
 				N = N - 1;
-				buf |= ppu_feed_data<u8, Flags...>(ppu, addr) << (i * 8);
+				buf |= ppu_feed_data<u8>(ppu, addr) << (i * 8);
 				addr++;
 				i--;
 			}
@@ -5282,106 +4278,59 @@ auto LSWI()
 		}
 		reg = (reg + 1) % 32;
 	}
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LFSUX()
+bool ppu_interpreter::LFSUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb];
-	ppu.fpr[op.frd] = ppu_feed_data<f32, Flags...>(ppu, addr);
+	ppu.fpr[op.frd] = ppu_feed_data<f32>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SYNC()
+bool ppu_interpreter::SYNC(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
 	atomic_fence_seq_cst();
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LFDX()
+bool ppu_interpreter::LFDX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.fpr[op.frd] = ppu_feed_data<f64, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.fpr[op.frd] = ppu_feed_data<f64>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LFDUX()
+bool ppu_interpreter::LFDUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb];
-	ppu.fpr[op.frd] = ppu_feed_data<f64, Flags...>(ppu, addr);
+	ppu.fpr[op.frd] = ppu_feed_data<f64>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STVLX()
+bool ppu_interpreter::STVLX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& s, ppu_opcode_t op, auto&& a, auto&& b)
-	{
-		const u64 addr = op.ra ? a + b : b;
-		const u32 tail = u32(addr & 15);
-		u8* ptr = vm::_ptr<u8>(addr);
-		for (u32 j = 0; j < 16 - tail; j++)
-			ptr[j] = s.u8r[j];
-	};
-
-	RETURN_(ppu.vr[op.vs], op, ppu.gpr[op.ra], ppu.gpr[op.rb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto STDBRX()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	PPU_WRITE(le_t<u64>, vm::cast(addr), ppu.gpr[op.rs]);
-	};
-	RETURN_(ppu, op);
+	s_use_ssse3 ? sse_cellbe_stvlx(addr, ppu.vr[op.vs].vi) : sse_cellbe_stvlx_v0(addr, ppu.vr[op.vs].vi);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STSWX()
+bool ppu_interpreter::STDBRX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
+	vm::_ref<le_t<u64>>(vm::cast(addr)) = ppu.gpr[op.rs];
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
+bool ppu_interpreter::STSWX(ppu_thread& ppu, ppu_opcode_t op)
+{
 	u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
 	u32 count = ppu.xer.cnt & 0x7F;
 	for (; count >= 4; count -= 4, addr += 4, op.rs = (op.rs + 1) & 31)
 	{
-		PPU_WRITE_32(vm::cast(addr), static_cast<u32>(ppu.gpr[op.rs]));
+		vm::write32(vm::cast(addr), static_cast<u32>(ppu.gpr[op.rs]));
 	}
 	if (count)
 	{
@@ -5389,78 +4338,43 @@ auto STSWX()
 		for (u32 byte = 0; byte < count; byte++)
 		{
 			u8 byte_value = static_cast<u8>(value >> ((3 ^ byte) * 8));
-			PPU_WRITE_8(vm::cast(addr + byte), byte_value);
+			vm::write8(vm::cast(addr + byte), byte_value);
 		}
 	}
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STWBRX()
+bool ppu_interpreter::STWBRX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	PPU_WRITE(le_t<u32>, vm::cast(addr), static_cast<u32>(ppu.gpr[op.rs]));
-	};
-	RETURN_(ppu, op);
+	vm::_ref<le_t<u32>>(vm::cast(addr)) = static_cast<u32>(ppu.gpr[op.rs]);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STFSX()
+bool ppu_interpreter::STFSX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	PPU_WRITE(f32, vm::cast(addr), static_cast<float>(ppu.fpr[op.frs]));
-	};
-	RETURN_(ppu, op);
+	vm::_ref<f32>(vm::cast(addr)) = static_cast<float>(ppu.fpr[op.frs]);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STVRX()
+bool ppu_interpreter::STVRX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& s, ppu_opcode_t op, auto&& a, auto&& b)
-	{
-		const u64 addr = op.ra ? a + b : b;
-		const u32 tail = u32(addr & 15);
-		u8* ptr = vm::_ptr<u8>(addr - 16);
-		for (u32 i = 15; i > 15 - tail; i--)
-			ptr[i] = s.u8r[i];
-	};
-
-	RETURN_(ppu.vr[op.vs], op, ppu.gpr[op.ra], ppu.gpr[op.rb]);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
+	s_use_ssse3 ? sse_cellbe_stvrx(addr, ppu.vr[op.vs].vi) : sse_cellbe_stvrx_v0(addr, ppu.vr[op.vs].vi);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STFSUX()
+bool ppu_interpreter::STFSUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb];
-	PPU_WRITE(f32, vm::cast(addr), static_cast<float>(ppu.fpr[op.frs]));
+	vm::_ref<f32>(vm::cast(addr)) = static_cast<float>(ppu.fpr[op.frs]);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STSWI()
+bool ppu_interpreter::STSWI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	u64 addr = op.ra ? ppu.gpr[op.ra] : 0;
 	u64 N = op.rb ? op.rb : 32;
 	u8 reg = op.rd;
@@ -5469,7 +4383,7 @@ auto STSWI()
 	{
 		if (N > 3)
 		{
-			PPU_WRITE_32(vm::cast(addr), static_cast<u32>(ppu.gpr[reg]));
+			vm::write32(vm::cast(addr), static_cast<u32>(ppu.gpr[reg]));
 			addr += 4;
 			N -= 4;
 		}
@@ -5479,70 +4393,45 @@ auto STSWI()
 			while (N > 0)
 			{
 				N = N - 1;
-				PPU_WRITE_8(vm::cast(addr), (0xFF000000 & buf) >> 24);
+				vm::write8(vm::cast(addr), (0xFF000000 & buf) >> 24);
 				buf <<= 8;
 				addr++;
 			}
 		}
 		reg = (reg + 1) % 32;
 	}
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STFDX()
+bool ppu_interpreter::STFDX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	PPU_WRITE(f64, vm::cast(addr), ppu.fpr[op.frs]);
-	};
-	RETURN_(ppu, op);
+	vm::_ref<f64>(vm::cast(addr)) = ppu.fpr[op.frs];
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STFDUX()
+bool ppu_interpreter::STFDUX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb];
-	PPU_WRITE(f64, vm::cast(addr), ppu.fpr[op.frs]);
+	vm::_ref<f64>(vm::cast(addr)) = ppu.fpr[op.frs];
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LVLXL()
+bool ppu_interpreter::LVLXL(ppu_thread& ppu, ppu_opcode_t op)
 {
-	return LVLX<Build, Flags...>();
+	return LVLX(ppu, op);
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LHBRX()
+bool ppu_interpreter::LHBRX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	ppu.gpr[op.rd] = ppu_feed_data<le_t<u16>, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.gpr[op.rd] = ppu_feed_data<le_t<u16>>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SRAW()
+bool ppu_interpreter::SRAW(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	s32 RS = static_cast<s32>(ppu.gpr[op.rs]);
 	u8 shift = ppu.gpr[op.rb] & 63;
 	if (shift > 31)
@@ -5556,19 +4445,12 @@ auto SRAW()
 		ppu.xer.ca = (RS < 0) && ((ppu.gpr[op.ra] << shift) != static_cast<u64>(RS));
 	}
 
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SRAD()
+bool ppu_interpreter::SRAD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	s64 RS = ppu.gpr[op.rs];
 	u8 shift = ppu.gpr[op.rb] & 127;
 	if (shift > 63)
@@ -5582,174 +4464,99 @@ auto SRAD()
 		ppu.xer.ca = (RS < 0) && ((ppu.gpr[op.ra] << shift) != static_cast<u64>(RS));
 	}
 
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LVRXL()
+bool ppu_interpreter::LVRXL(ppu_thread& ppu, ppu_opcode_t op)
 {
-	return LVRX<Build, Flags...>();
+	return LVRX(ppu, op);
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto DSS()
+bool ppu_interpreter::DSS(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SRAWI()
+bool ppu_interpreter::SRAWI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	s32 RS = static_cast<u32>(ppu.gpr[op.rs]);
 	ppu.gpr[op.ra] = RS >> op.sh32;
 	ppu.xer.ca = (RS < 0) && (static_cast<u32>(ppu.gpr[op.ra] << op.sh32) != static_cast<u32>(RS));
 
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto SRADI()
+bool ppu_interpreter::SRADI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	auto sh = op.sh64;
 	s64 RS = ppu.gpr[op.rs];
 	ppu.gpr[op.ra] = RS >> sh;
 	ppu.xer.ca = (RS < 0) && ((ppu.gpr[op.ra] << sh) != static_cast<u64>(RS));
 
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto EIEIO()
+bool ppu_interpreter::EIEIO(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
 	atomic_fence_seq_cst();
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STVLXL()
+bool ppu_interpreter::STVLXL(ppu_thread& ppu, ppu_opcode_t op)
 {
-	return STVLX<Build, Flags...>();
+	return STVLX(ppu, op);
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STHBRX()
+bool ppu_interpreter::STHBRX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	PPU_WRITE(le_t<u16>, vm::cast(addr), static_cast<u16>(ppu.gpr[op.rs]));
-	};
-	RETURN_(ppu, op);
+	vm::_ref<le_t<u16>>(vm::cast(addr)) = static_cast<u16>(ppu.gpr[op.rs]);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto EXTSH()
+bool ppu_interpreter::EXTSH(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = static_cast<s16>(ppu.gpr[op.rs]);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STVRXL()
+bool ppu_interpreter::STVRXL(ppu_thread& ppu, ppu_opcode_t op)
 {
-	return STVRX<Build, Flags...>();
+	return STVRX(ppu, op);
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto EXTSB()
+bool ppu_interpreter::EXTSB(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = static_cast<s8>(ppu.gpr[op.rs]);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STFIWX()
+bool ppu_interpreter::STFIWX(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
-	PPU_WRITE_32(vm::cast(addr), static_cast<u32>(std::bit_cast<u64>(ppu.fpr[op.frs])));
-	};
-	RETURN_(ppu, op);
+	vm::write32(vm::cast(addr), static_cast<u32>(std::bit_cast<u64>(ppu.fpr[op.frs])));
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto EXTSW()
+bool ppu_interpreter::EXTSW(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.gpr[op.ra] = static_cast<s32>(ppu.gpr[op.rs]);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set<s64>(ppu, 0, ppu.gpr[op.ra], 0);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto ICBI()
+bool ppu_interpreter::ICBI(ppu_thread&, ppu_opcode_t)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&&, auto) {
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto DCBZ()
+bool ppu_interpreter::DCBZ(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb];
 	const u32 addr0 = vm::cast(addr) & ~127;
 
@@ -5757,78 +4564,48 @@ auto DCBZ()
 	{
 		alignas(64) static constexpr u8 zero_buf[128]{};
 		do_cell_atomic_128_store(addr0, zero_buf);
-		return;
+		return true;
 	}
 
 	std::memset(vm::base(addr0), 0, 128);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LWZ()
+bool ppu_interpreter::LWZ(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
-	ppu.gpr[op.rd] = ppu_feed_data<u32, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
+	ppu.gpr[op.rd] = ppu_feed_data<u32>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LWZU()
+bool ppu_interpreter::LWZU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + op.simm16;
-	ppu.gpr[op.rd] = ppu_feed_data<u32, Flags...>(ppu, addr);
+	ppu.gpr[op.rd] = ppu_feed_data<u32>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LBZ()
+bool ppu_interpreter::LBZ(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
-	ppu.gpr[op.rd] = ppu_feed_data<u8, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
+	ppu.gpr[op.rd] = ppu_feed_data<u8>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LBZU()
+bool ppu_interpreter::LBZU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + op.simm16;
-	ppu.gpr[op.rd] = ppu_feed_data<u8, Flags...>(ppu, addr);
+	ppu.gpr[op.rd] = ppu_feed_data<u8>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STW()
+bool ppu_interpreter::STW(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
 	const u32 value = static_cast<u32>(ppu.gpr[op.rs]);
-	PPU_WRITE_32(vm::cast(addr), value);
+	vm::write32(vm::cast(addr), value);
 
 	//Insomniac engine v3 & v4 (newer R&C, Fuse, Resitance 3)
 	if (value == 0xAAAAAAAA) [[unlikely]]
@@ -5836,544 +4613,351 @@ auto STW()
 		vm::reservation_update(vm::cast(addr));
 	}
 
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STWU()
+bool ppu_interpreter::STWU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + op.simm16;
-	PPU_WRITE_32(vm::cast(addr), static_cast<u32>(ppu.gpr[op.rs]));
+	vm::write32(vm::cast(addr), static_cast<u32>(ppu.gpr[op.rs]));
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STB()
+bool ppu_interpreter::STB(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
-	PPU_WRITE_8(vm::cast(addr), static_cast<u8>(ppu.gpr[op.rs]));
-	};
-	RETURN_(ppu, op);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
+	vm::write8(vm::cast(addr), static_cast<u8>(ppu.gpr[op.rs]));
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STBU()
+bool ppu_interpreter::STBU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + op.simm16;
-	PPU_WRITE_8(vm::cast(addr), static_cast<u8>(ppu.gpr[op.rs]));
+	vm::write8(vm::cast(addr), static_cast<u8>(ppu.gpr[op.rs]));
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LHZ()
+bool ppu_interpreter::LHZ(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
-	ppu.gpr[op.rd] = ppu_feed_data<u16, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
+	ppu.gpr[op.rd] = ppu_feed_data<u16>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LHZU()
+bool ppu_interpreter::LHZU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + op.simm16;
-	ppu.gpr[op.rd] = ppu_feed_data<u16, Flags...>(ppu, addr);
+	ppu.gpr[op.rd] = ppu_feed_data<u16>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LHA()
+bool ppu_interpreter::LHA(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
-	ppu.gpr[op.rd] = ppu_feed_data<s16, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
+	ppu.gpr[op.rd] = ppu_feed_data<s16>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LHAU()
+bool ppu_interpreter::LHAU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + op.simm16;
-	ppu.gpr[op.rd] = ppu_feed_data<s16, Flags...>(ppu, addr);
+	ppu.gpr[op.rd] = ppu_feed_data<s16>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STH()
+bool ppu_interpreter::STH(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
-	PPU_WRITE_16(vm::cast(addr), static_cast<u16>(ppu.gpr[op.rs]));
-	};
-	RETURN_(ppu, op);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
+	vm::write16(vm::cast(addr), static_cast<u16>(ppu.gpr[op.rs]));
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STHU()
+bool ppu_interpreter::STHU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + op.simm16;
-	PPU_WRITE_16(vm::cast(addr), static_cast<u16>(ppu.gpr[op.rs]));
+	vm::write16(vm::cast(addr), static_cast<u16>(ppu.gpr[op.rs]));
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LMW()
+bool ppu_interpreter::LMW(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
 	for (u32 i = op.rd; i<32; ++i, addr += 4)
 	{
-		ppu.gpr[i] = ppu_feed_data<u32, Flags...>(ppu, addr);
+		ppu.gpr[i] = ppu_feed_data<u32>(ppu, addr);
 	}
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STMW()
+bool ppu_interpreter::STMW(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
 	for (u32 i = op.rs; i<32; ++i, addr += 4)
 	{
-		PPU_WRITE_32(vm::cast(addr), static_cast<u32>(ppu.gpr[i]));
+		vm::write32(vm::cast(addr), static_cast<u32>(ppu.gpr[i]));
 	}
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LFS()
+bool ppu_interpreter::LFS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
-	ppu.fpr[op.frd] = ppu_feed_data<f32, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
+	ppu.fpr[op.frd] = ppu_feed_data<f32>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LFSU()
+bool ppu_interpreter::LFSU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + op.simm16;
-	ppu.fpr[op.frd] = ppu_feed_data<f32, Flags...>(ppu, addr);
+	ppu.fpr[op.frd] = ppu_feed_data<f32>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LFD()
+bool ppu_interpreter::LFD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
-	ppu.fpr[op.frd] = ppu_feed_data<f64, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
+	ppu.fpr[op.frd] = ppu_feed_data<f64>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LFDU()
+bool ppu_interpreter::LFDU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + op.simm16;
-	ppu.fpr[op.frd] = ppu_feed_data<f64, Flags...>(ppu, addr);
+	ppu.fpr[op.frd] = ppu_feed_data<f64>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STFS()
+bool ppu_interpreter::STFS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
-	PPU_WRITE(f32, vm::cast(addr), static_cast<float>(ppu.fpr[op.frs]));
-	};
-	RETURN_(ppu, op);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
+	vm::_ref<f32>(vm::cast(addr)) = static_cast<float>(ppu.fpr[op.frs]);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STFSU()
+bool ppu_interpreter::STFSU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + op.simm16;
-	PPU_WRITE(f32, vm::cast(addr), static_cast<float>(ppu.fpr[op.frs]));
+	vm::_ref<f32>(vm::cast(addr)) = static_cast<float>(ppu.fpr[op.frs]);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STFD()
+bool ppu_interpreter::STFD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
-	PPU_WRITE(f64, vm::cast(addr), ppu.fpr[op.frs]);
-	};
-	RETURN_(ppu, op);
+	const u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16;
+	vm::_ref<f64>(vm::cast(addr)) = ppu.fpr[op.frs];
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STFDU()
+bool ppu_interpreter::STFDU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + op.simm16;
-	PPU_WRITE(f64, vm::cast(addr), ppu.fpr[op.frs]);
+	vm::_ref<f64>(vm::cast(addr)) = ppu.fpr[op.frs];
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LD()
+bool ppu_interpreter::LD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = (op.simm16 & ~3) + (op.ra ? ppu.gpr[op.ra] : 0);
-	ppu.gpr[op.rd] = ppu_feed_data<u64, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.gpr[op.rd] = ppu_feed_data<u64>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LDU()
+bool ppu_interpreter::LDU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + (op.simm16 & ~3);
-	ppu.gpr[op.rd] = ppu_feed_data<u64, Flags...>(ppu, addr);
+	ppu.gpr[op.rd] = ppu_feed_data<u64>(ppu, addr);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto LWA()
+bool ppu_interpreter::LWA(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_feed_data>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = (op.simm16 & ~3) + (op.ra ? ppu.gpr[op.ra] : 0);
-	ppu.gpr[op.rd] = ppu_feed_data<s32, Flags...>(ppu, addr);
-	};
-	RETURN_(ppu, op);
+	ppu.gpr[op.rd] = ppu_feed_data<s32>(ppu, addr);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STD()
+bool ppu_interpreter::STD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = (op.simm16 & ~3) + (op.ra ? ppu.gpr[op.ra] : 0);
-	PPU_WRITE_64(vm::cast(addr), ppu.gpr[op.rs]);
-	};
-	RETURN_(ppu, op);
+	vm::write64(vm::cast(addr), ppu.gpr[op.rs]);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto STDU()
+bool ppu_interpreter::STDU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u64 addr = ppu.gpr[op.ra] + (op.simm16 & ~3);
-	PPU_WRITE_64(vm::cast(addr), ppu.gpr[op.rs]);
+	vm::write64(vm::cast(addr), ppu.gpr[op.rs]);
 	ppu.gpr[op.ra] = addr;
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FDIVS()
+bool ppu_interpreter_fast::FDIVS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.fpr[op.frd] = f32(ppu.fpr[op.fra] / ppu.fpr[op.frb]);
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FSUBS()
+bool ppu_interpreter_precise::FDIVS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
+	const f64 res = ppu.fpr[op.frd] = f32(ppu.fpr[op.fra] / ppu.fpr[op.frb]);
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
+bool ppu_interpreter_fast::FSUBS(ppu_thread& ppu, ppu_opcode_t op)
+{
 	ppu.fpr[op.frd] = f32(ppu.fpr[op.fra] - ppu.fpr[op.frb]);
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FADDS()
+bool ppu_interpreter_precise::FSUBS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
+	const f64 res = ppu.fpr[op.frd] = f32(ppu.fpr[op.fra] - ppu.fpr[op.frb]);
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
+bool ppu_interpreter_fast::FADDS(ppu_thread& ppu, ppu_opcode_t op)
+{
 	ppu.fpr[op.frd] = f32(ppu.fpr[op.fra] + ppu.fpr[op.frb]);
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FSQRTS()
+bool ppu_interpreter_precise::FADDS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
+	const f64 res = ppu.fpr[op.frd] = f32(ppu.fpr[op.fra] + ppu.fpr[op.frb]);
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
+bool ppu_interpreter_fast::FSQRTS(ppu_thread& ppu, ppu_opcode_t op)
+{
 	ppu.fpr[op.frd] = f32(std::sqrt(ppu.fpr[op.frb]));
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FRES()
+bool ppu_interpreter_precise::FSQRTS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op)
-	{
-		const f64 a = ppu.fpr[op.frb];
-		const u64 b = std::bit_cast<u64>(a);
-		const u64 e = (b >> 52) & 0x7ff; // double exp
-		const u64 i = (b >> 45) & 0x7f; // mantissa LUT index
-		const u64 r = e >= (0x3ff + 0x80) ? 0 : (0x7ff - 2 - e) << 52 | u64{ppu_fres_mantissas[i]} << (32 - 3);
-
-		ppu.fpr[op.frd] = f32(std::bit_cast<f64>(a == a ? (b & 0x8000'0000'0000'0000) | r : (0x8'0000'0000'0000 | b)));
-		ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	const f64 res = ppu.fpr[op.frd] = f32(std::sqrt(ppu.fpr[op.frb]));
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FMULS()
+bool ppu_interpreter_fast::FRES(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
+	ppu.fpr[op.frd] = f32(1.0 / ppu.fpr[op.frb]);
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
+bool ppu_interpreter_precise::FRES(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const f64 res = ppu.fpr[op.frd] = f32(1.0 / ppu.fpr[op.frb]);
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
+
+bool ppu_interpreter_fast::FMULS(ppu_thread& ppu, ppu_opcode_t op)
+{
 	ppu.fpr[op.frd] = f32(ppu.fpr[op.fra] * ppu.fpr[op.frc]);
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FMADDS()
+bool ppu_interpreter_precise::FMULS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	if constexpr (((Flags == use_dfma) || ...))
-		ppu.fpr[op.frd] = f32(std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], ppu.fpr[op.frb]));
-	else
-		ppu.fpr[op.frd] = f32(ppu.fpr[op.fra] * ppu.fpr[op.frc] + ppu.fpr[op.frb]);
-
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	const f64 res = ppu.fpr[op.frd] = f32(ppu.fpr[op.fra] * ppu.fpr[op.frc]);
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FMSUBS()
+bool ppu_interpreter_fast::FMADDS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc, use_dfma>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	if constexpr (((Flags == use_dfma) || ...))
-		ppu.fpr[op.frd] = f32(std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], -ppu.fpr[op.frb]));
-	else
-		ppu.fpr[op.frd] = f32(ppu.fpr[op.fra] * ppu.fpr[op.frc] - ppu.fpr[op.frb]);
-
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	ppu.fpr[op.frd] = f32(ppu.fpr[op.fra] * ppu.fpr[op.frc] + ppu.fpr[op.frb]);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FNMSUBS()
+bool ppu_interpreter_precise::FMADDS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc, use_dfma>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	if constexpr (((Flags == use_dfma) || ...))
-		ppu.fpr[op.frd] = f32(-std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], -ppu.fpr[op.frb]));
-	else
-		ppu.fpr[op.frd] = f32(-(ppu.fpr[op.fra] * ppu.fpr[op.frc] - ppu.fpr[op.frb]));
-
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	const f64 res = ppu.fpr[op.frd] = f32(std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], ppu.fpr[op.frb]));
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FNMADDS()
+bool ppu_interpreter_fast::FMSUBS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc, use_dfma>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	if constexpr (((Flags == use_dfma) || ...))
-		ppu.fpr[op.frd] = f32(-std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], ppu.fpr[op.frb]));
-	else
-		ppu.fpr[op.frd] = f32(-(ppu.fpr[op.fra] * ppu.fpr[op.frc] + ppu.fpr[op.frb]));
-
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	ppu.fpr[op.frd] = f32(ppu.fpr[op.fra] * ppu.fpr[op.frc] - ppu.fpr[op.frb]);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MTFSB1()
+bool ppu_interpreter_precise::FMSUBS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
+	const f64 res = ppu.fpr[op.frd] = f32(std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], -ppu.fpr[op.frb]));
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
+bool ppu_interpreter_fast::FNMSUBS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.fpr[op.frd] = f32(-(ppu.fpr[op.fra] * ppu.fpr[op.frc] - ppu.fpr[op.frb]));
+	return true;
+}
+
+bool ppu_interpreter_precise::FNMSUBS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const f64 res = ppu.fpr[op.frd] = f32(-std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], -ppu.fpr[op.frb]));
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
+
+bool ppu_interpreter_fast::FNMADDS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.fpr[op.frd] = f32(-(ppu.fpr[op.fra] * ppu.fpr[op.frc] + ppu.fpr[op.frb]));
+	return true;
+}
+
+bool ppu_interpreter_precise::FNMADDS(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const f64 res = ppu.fpr[op.frd] = f32(-std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], ppu.fpr[op.frb]));
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
+
+bool ppu_interpreter::MTFSB1(ppu_thread& ppu, ppu_opcode_t op)
+{
 	const u32 bit = op.crbd;
 	if (bit < 16 || bit > 19) ppu_log.warning("MTFSB1(%d)", bit);
 	ppu.fpscr.bits[bit] = 1;
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MCRFS()
+bool ppu_interpreter::MCRFS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	if (op.crfs != 4) ppu_log.warning("MCRFS(%d)", op.crfs);
 	ppu.cr.fields[op.crfd] = ppu.fpscr.fields[op.crfs];
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MTFSB0()
+bool ppu_interpreter::MTFSB0(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u32 bit = op.crbd;
 	if (bit < 16 || bit > 19) ppu_log.warning("MTFSB0(%d)", bit);
 	ppu.fpscr.bits[bit] = 0;
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MTFSFI()
+bool ppu_interpreter::MTFSFI(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const u32 bf = op.crfd;
 
 	if (bf != 4)
@@ -6403,1486 +4987,270 @@ auto MTFSFI()
 		ppu.fpscr.fields[bf] = all_values[op.i];
 	}
 
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MFFS()
+bool ppu_interpreter::MFFS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu_log.warning("MFFS");
 	ppu.fpr[op.frd] = std::bit_cast<f64>(u64{ppu.fpscr.fl} << 15 | u64{ppu.fpscr.fg} << 14 | u64{ppu.fpscr.fe} << 13 | u64{ppu.fpscr.fu} << 12);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto MTFSF()
+bool ppu_interpreter::MTFSF(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](auto&& ppu, auto) {
 	ppu_log.warning("MTFSF");
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FCMPU()
+bool ppu_interpreter::FCMPU(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	const f64 a = ppu.fpr[op.fra];
 	const f64 b = ppu.fpr[op.frb];
-	ppu_set_fpcc<set_fpcc, has_rc, Flags...>(ppu, a, b, op.crfd);
-	};
-	RETURN_(ppu, op);
+	ppu_fpcc_set(ppu, a, b, true, op.crfd);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FCTIW()
+bool ppu_interpreter::FCTIW(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& b)
-	{
-	#if defined(ARCH_X64)
-		const auto val = _mm_set_sd(b);
-		const auto res = _mm_xor_si128(_mm_cvtpd_epi32(val), _mm_castpd_si128(_mm_cmpge_pd(val, _mm_set1_pd(0x80000000))));
-		d = std::bit_cast<f64, s64>(_mm_cvtsi128_si32(res));
-	#elif defined(ARCH_ARM64)
-		d = std::bit_cast<f64, s64>(!(b == b) ? INT32_MIN : vqmovnd_s64(std::bit_cast<f64>(vrndi_f64(std::bit_cast<float64x1_t>(b)))));
-	#endif
-		ppu_set_fpcc<Flags...>(ppu, 0., 0.); // undefined (TODO)
-	};
-
-	RETURN_(ppu, ppu.fpr[op.frd], ppu.fpr[op.frb]);
+	const auto b = _mm_load_sd(&ppu.fpr[op.frb]);
+	const auto res = _mm_xor_si128(_mm_cvtpd_epi32(b), _mm_castpd_si128(_mm_cmpge_pd(b, _mm_set1_pd(0x80000000))));
+	ppu.fpr[op.frd] = std::bit_cast<f64, s64>(_mm_cvtsi128_si32(res));
+	if (op.rc) [[unlikely]] fmt::throw_exception("%s: op.rc", __func__); //ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FCTIWZ()
+bool ppu_interpreter::FCTIWZ(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& b)
-	{
-	#if defined(ARCH_X64)
-		const auto val = _mm_set_sd(b);
-		const auto res = _mm_xor_si128(_mm_cvttpd_epi32(val), _mm_castpd_si128(_mm_cmpge_pd(val, _mm_set1_pd(0x80000000))));
-		d = std::bit_cast<f64, s64>(_mm_cvtsi128_si32(res));
-	#elif defined(ARCH_ARM64)
-		d = std::bit_cast<f64, s64>(!(b == b) ? INT32_MIN : vqmovnd_s64(std::bit_cast<s64>(vcvt_s64_f64(std::bit_cast<float64x1_t>(b)))));
-	#endif
-		ppu_set_fpcc<Flags...>(ppu, 0., 0.); // undefined (TODO)
-	};
-
-	RETURN_(ppu, ppu.fpr[op.frd], ppu.fpr[op.frb]);
+	const auto b = _mm_load_sd(&ppu.fpr[op.frb]);
+	const auto res = _mm_xor_si128(_mm_cvttpd_epi32(b), _mm_castpd_si128(_mm_cmpge_pd(b, _mm_set1_pd(0x80000000))));
+	ppu.fpr[op.frd] = std::bit_cast<f64, s64>(_mm_cvtsi128_si32(res));
+	if (op.rc) [[unlikely]] fmt::throw_exception("%s: op.rc", __func__); //ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FRSP()
+bool ppu_interpreter_fast::FRSP(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.fpr[op.frd] = f32(ppu.fpr[op.frb]);
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FDIV()
+bool ppu_interpreter_precise::FRSP(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
+	const f64 res = ppu.fpr[op.frd] = f32(ppu.fpr[op.frb]);
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
+bool ppu_interpreter_fast::FDIV(ppu_thread& ppu, ppu_opcode_t op)
+{
 	ppu.fpr[op.frd] = ppu.fpr[op.fra] / ppu.fpr[op.frb];
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FSUB()
+bool ppu_interpreter_precise::FDIV(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
+	const f64 res = ppu.fpr[op.frd] = ppu.fpr[op.fra] / ppu.fpr[op.frb];
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
+bool ppu_interpreter_fast::FSUB(ppu_thread& ppu, ppu_opcode_t op)
+{
 	ppu.fpr[op.frd] = ppu.fpr[op.fra] - ppu.fpr[op.frb];
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FADD()
+bool ppu_interpreter_precise::FSUB(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
+	const f64 res = ppu.fpr[op.frd] = ppu.fpr[op.fra] - ppu.fpr[op.frb];
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
+bool ppu_interpreter_fast::FADD(ppu_thread& ppu, ppu_opcode_t op)
+{
 	ppu.fpr[op.frd] = ppu.fpr[op.fra] + ppu.fpr[op.frb];
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FSQRT()
+bool ppu_interpreter_precise::FADD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
+	const f64 res = ppu.fpr[op.frd] = ppu.fpr[op.fra] + ppu.fpr[op.frb];
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
+bool ppu_interpreter_fast::FSQRT(ppu_thread& ppu, ppu_opcode_t op)
+{
 	ppu.fpr[op.frd] = std::sqrt(ppu.fpr[op.frb]);
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FSEL()
+bool ppu_interpreter_precise::FSQRT(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
+	const f64 res = ppu.fpr[op.frd] = std::sqrt(ppu.fpr[op.frb]);
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
+bool ppu_interpreter::FSEL(ppu_thread& ppu, ppu_opcode_t op)
+{
 	ppu.fpr[op.frd] = ppu.fpr[op.fra] >= 0.0 ? ppu.fpr[op.frc] : ppu.fpr[op.frb];
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FMUL()
+bool ppu_interpreter_fast::FMUL(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.fpr[op.frd] = ppu.fpr[op.fra] * ppu.fpr[op.frc];
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FRSQRTE()
+bool ppu_interpreter_precise::FMUL(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op)
-	{
-		const u64 b = std::bit_cast<u64>(ppu.fpr[op.frb]);
-		ppu.fpr[op.frd] = std::bit_cast<f64>(u64{ppu_frqrte_lut.data[b >> 49]} << 32);
-		ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-
-	RETURN_(ppu, op);
+	const f64 res = ppu.fpr[op.frd] = ppu.fpr[op.fra] * ppu.fpr[op.frc];
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FMSUB()
+bool ppu_interpreter_fast::FRSQRTE(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc, use_dfma>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	if constexpr (((Flags == use_dfma) || ...))
-		ppu.fpr[op.frd] = std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], -ppu.fpr[op.frb]);
-	else
-		ppu.fpr[op.frd] = ppu.fpr[op.fra] * ppu.fpr[op.frc] - ppu.fpr[op.frb];
-
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	ppu.fpr[op.frd] = 1.0 / std::sqrt(ppu.fpr[op.frb]);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FMADD()
+bool ppu_interpreter_precise::FRSQRTE(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc, use_dfma>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	if constexpr (((Flags == use_dfma) || ...))
-		ppu.fpr[op.frd] = std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], ppu.fpr[op.frb]);
-	else
-		ppu.fpr[op.frd] = ppu.fpr[op.fra] * ppu.fpr[op.frc] + ppu.fpr[op.frb];
-
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	const f64 res = ppu.fpr[op.frd] = 1.0 / std::sqrt(ppu.fpr[op.frb]);
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FNMSUB()
+bool ppu_interpreter_fast::FMSUB(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc, use_dfma>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	if constexpr (((Flags == use_dfma) || ...))
-		ppu.fpr[op.frd] = -std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], -ppu.fpr[op.frb]);
-	else
-		ppu.fpr[op.frd] = -(ppu.fpr[op.fra] * ppu.fpr[op.frc] - ppu.fpr[op.frb]);
-
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	ppu.fpr[op.frd] = ppu.fpr[op.fra] * ppu.fpr[op.frc] - ppu.fpr[op.frb];
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FNMADD()
+bool ppu_interpreter_precise::FMSUB(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc, use_dfma>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
-	if constexpr (((Flags == use_dfma) || ...))
-		ppu.fpr[op.frd] = -std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], ppu.fpr[op.frb]);
-	else
-		ppu.fpr[op.frd] = -(ppu.fpr[op.fra] * ppu.fpr[op.frc] + ppu.fpr[op.frb]);
-
-	ppu_set_fpcc<Flags...>(ppu, ppu.fpr[op.frd], 0.);
-	};
-	RETURN_(ppu, op);
+	const f64 res = ppu.fpr[op.frd] = std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], -ppu.fpr[op.frb]);
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FCMPO()
+bool ppu_interpreter_fast::FMADD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	return FCMPU<Build, Flags...>();
+	ppu.fpr[op.frd] = ppu.fpr[op.fra] * ppu.fpr[op.frc] + ppu.fpr[op.frb];
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FNEG()
+bool ppu_interpreter_precise::FMADD(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<use_dfma>();
+	const f64 res = ppu.fpr[op.frd] = std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], ppu.fpr[op.frb]);
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
+bool ppu_interpreter_fast::FNMSUB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.fpr[op.frd] = -(ppu.fpr[op.fra] * ppu.fpr[op.frc] - ppu.fpr[op.frb]);
+	return true;
+}
+
+bool ppu_interpreter_precise::FNMSUB(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const f64 res = ppu.fpr[op.frd] = -std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], -ppu.fpr[op.frb]);
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
+
+bool ppu_interpreter_fast::FNMADD(ppu_thread& ppu, ppu_opcode_t op)
+{
+	ppu.fpr[op.frd] = -(ppu.fpr[op.fra] * ppu.fpr[op.frc] + ppu.fpr[op.frb]);
+	return true;
+}
+
+bool ppu_interpreter_precise::FNMADD(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const f64 res = ppu.fpr[op.frd] = -std::fma(ppu.fpr[op.fra], ppu.fpr[op.frc], ppu.fpr[op.frb]);
+	ppu_fpcc_set(ppu, res, 0., op.rc);
+	return true;
+}
+
+bool ppu_interpreter::FCMPO(ppu_thread& ppu, ppu_opcode_t op)
+{
+	return FCMPU(ppu, op);
+}
+
+bool ppu_interpreter::FNEG(ppu_thread& ppu, ppu_opcode_t op)
+{
 	ppu.fpr[op.frd] = -ppu.fpr[op.frb];
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FMR()
+bool ppu_interpreter::FMR(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.fpr[op.frd] = ppu.fpr[op.frb];
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FNABS()
+bool ppu_interpreter::FNABS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.fpr[op.frd] = -std::fabs(ppu.fpr[op.frb]);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FABS()
+bool ppu_interpreter::FABS(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) {
 	ppu.fpr[op.frd] = std::fabs(ppu.fpr[op.frb]);
-	if constexpr (((Flags == has_rc) || ...))
-		ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
-	};
-	RETURN_(ppu, op);
+	if (op.rc) [[unlikely]] ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
 }
 
-template <u32 Build, ppu_exec_bit... Flags>
-auto FCTID()
+bool ppu_interpreter::FCTID(ppu_thread& ppu, ppu_opcode_t op)
 {
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
+	const auto b = _mm_load_sd(&ppu.fpr[op.frb]);
+	const auto res = _mm_xor_si128(_mm_set1_epi64x(_mm_cvtsd_si64(b)), _mm_castpd_si128(_mm_cmpge_pd(b, _mm_set1_pd(f64(1ull << 63)))));
+	ppu.fpr[op.frd] = std::bit_cast<f64>(_mm_cvtsi128_si64(res));
+	if (op.rc) [[unlikely]] fmt::throw_exception("%s: op.rc", __func__); //ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
+}
 
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& b)
+bool ppu_interpreter::FCTIDZ(ppu_thread& ppu, ppu_opcode_t op)
+{
+	const auto b = _mm_load_sd(&ppu.fpr[op.frb]);
+	const auto res = _mm_xor_si128(_mm_set1_epi64x(_mm_cvttsd_si64(b)), _mm_castpd_si128(_mm_cmpge_pd(b, _mm_set1_pd(f64(1ull << 63)))));
+	ppu.fpr[op.frd] = std::bit_cast<f64>(_mm_cvtsi128_si64(res));
+	if (op.rc) [[unlikely]] fmt::throw_exception("%s: op.rc", __func__); //ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
+}
+
+bool ppu_interpreter::FCFID(ppu_thread& ppu, ppu_opcode_t op)
+{
+	_mm_store_sd(&ppu.fpr[op.frd], _mm_cvtsi64_sd(_mm_setzero_pd(), std::bit_cast<s64>(ppu.fpr[op.frb])));
+	if (op.rc) [[unlikely]] fmt::throw_exception("%s: op.rc", __func__); //ppu_cr_set(ppu, 1, ppu.fpscr.fg, ppu.fpscr.fl, ppu.fpscr.fe, ppu.fpscr.fu);
+	return true;
+}
+
+bool ppu_interpreter::UNK(ppu_thread& ppu, ppu_opcode_t op)
+{
+	// HLE function index
+	const u32 index = (ppu.cia - g_fxo->get<ppu_function_manager>().addr) / 8;
+
+	const auto& hle_funcs = ppu_function_manager::get();
+
+	if (ppu.cia % 8 == 4 && index < hle_funcs.size())
 	{
-	#if defined(ARCH_X64)
-		const auto val = _mm_set_sd(b);
-		const auto res = _mm_xor_si128(_mm_set1_epi64x(_mm_cvtsd_si64(val)), _mm_castpd_si128(_mm_cmpge_pd(val, _mm_set1_pd(f64(1ull << 63)))));
-		d = std::bit_cast<f64>(_mm_cvtsi128_si64(res));
-	#elif defined(ARCH_ARM64)
-		d = std::bit_cast<f64, s64>(!(b == b) ? f64{INT64_MIN} : std::bit_cast<f64>(vrndi_f64(std::bit_cast<float64x1_t>(b))));
-	#endif
-		ppu_set_fpcc<Flags...>(ppu, 0., 0.); // undefined (TODO)
-	};
-
-	RETURN_(ppu, ppu.fpr[op.frd], ppu.fpr[op.frb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto FCTIDZ()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& b)
-	{
-	#if defined(ARCH_X64)
-		const auto val = _mm_set_sd(b);
-		const auto res = _mm_xor_si128(_mm_set1_epi64x(_mm_cvttsd_si64(val)), _mm_castpd_si128(_mm_cmpge_pd(val, _mm_set1_pd(f64(1ull << 63)))));
-		d = std::bit_cast<f64>(_mm_cvtsi128_si64(res));
-	#elif defined(ARCH_ARM64)
-		d = std::bit_cast<f64>(!(b == b) ? int64x1_t{INT64_MIN} : vcvt_s64_f64(std::bit_cast<float64x1_t>(b)));
-	#endif
-		ppu_set_fpcc<Flags...>(ppu, 0., 0.); // undefined (TODO)
-	};
-
-	RETURN_(ppu, ppu.fpr[op.frd], ppu.fpr[op.frb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto FCFID()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<set_fpcc>();
-
-	static const auto exec = [](ppu_thread& ppu, auto&& d, auto&& b)
-	{
-		f64 r = static_cast<f64>(std::bit_cast<s64>(b));
-		d = r;
-		ppu_set_fpcc<Flags...>(ppu, r, 0.);
-	};
-
-	RETURN_(ppu, ppu.fpr[op.frd], ppu.fpr[op.frb]);
-}
-
-template <u32 Build, ppu_exec_bit... Flags>
-auto UNK()
-{
-	if constexpr (Build == 0xf1a6)
-		return ppu_exec_select<Flags...>::template select<>();
-
-	if constexpr (Build == 0)
-	{
-		return +[](ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func*)
-		{
-			const u32 old_cia = ppu.cia;
-			ppu.cia = vm::get_addr(this_op);
-			ppu.exec_bytes += ppu.cia - old_cia;
-
-			// HLE function index
-			const u32 index = (ppu.cia - g_fxo->get<ppu_function_manager>().addr) / 8;
-
-			const auto& hle_funcs = ppu_function_manager::get();
-
-			if (ppu.cia % 8 == 4 && index < hle_funcs.size())
-			{
-				return hle_funcs[index](ppu, op, this_op, nullptr);
-			}
-
-			fmt::throw_exception("Unknown/Illegal opcode: 0x%08x at 0x%x", op.opcode, ppu.cia);
-		};
-	}
-}
-
-template <typename IT>
-struct ppu_interpreter_t
-{
-	IT MFVSCR;
-	IT MTVSCR;
-	IT VADDCUW;
-	IT VADDFP;
-	IT VADDSBS;
-	IT VADDSHS;
-	IT VADDSWS;
-	IT VADDUBM;
-	IT VADDUBS;
-	IT VADDUHM;
-	IT VADDUHS;
-	IT VADDUWM;
-	IT VADDUWS;
-	IT VAND;
-	IT VANDC;
-	IT VAVGSB;
-	IT VAVGSH;
-	IT VAVGSW;
-	IT VAVGUB;
-	IT VAVGUH;
-	IT VAVGUW;
-	IT VCFSX;
-	IT VCFUX;
-	IT VCMPBFP;
-	IT VCMPBFP_;
-	IT VCMPEQFP;
-	IT VCMPEQFP_;
-	IT VCMPEQUB;
-	IT VCMPEQUB_;
-	IT VCMPEQUH;
-	IT VCMPEQUH_;
-	IT VCMPEQUW;
-	IT VCMPEQUW_;
-	IT VCMPGEFP;
-	IT VCMPGEFP_;
-	IT VCMPGTFP;
-	IT VCMPGTFP_;
-	IT VCMPGTSB;
-	IT VCMPGTSB_;
-	IT VCMPGTSH;
-	IT VCMPGTSH_;
-	IT VCMPGTSW;
-	IT VCMPGTSW_;
-	IT VCMPGTUB;
-	IT VCMPGTUB_;
-	IT VCMPGTUH;
-	IT VCMPGTUH_;
-	IT VCMPGTUW;
-	IT VCMPGTUW_;
-	IT VCTSXS;
-	IT VCTUXS;
-	IT VEXPTEFP;
-	IT VLOGEFP;
-	IT VMADDFP;
-	IT VMAXFP;
-	IT VMAXSB;
-	IT VMAXSH;
-	IT VMAXSW;
-	IT VMAXUB;
-	IT VMAXUH;
-	IT VMAXUW;
-	IT VMHADDSHS;
-	IT VMHRADDSHS;
-	IT VMINFP;
-	IT VMINSB;
-	IT VMINSH;
-	IT VMINSW;
-	IT VMINUB;
-	IT VMINUH;
-	IT VMINUW;
-	IT VMLADDUHM;
-	IT VMRGHB;
-	IT VMRGHH;
-	IT VMRGHW;
-	IT VMRGLB;
-	IT VMRGLH;
-	IT VMRGLW;
-	IT VMSUMMBM;
-	IT VMSUMSHM;
-	IT VMSUMSHS;
-	IT VMSUMUBM;
-	IT VMSUMUHM;
-	IT VMSUMUHS;
-	IT VMULESB;
-	IT VMULESH;
-	IT VMULEUB;
-	IT VMULEUH;
-	IT VMULOSB;
-	IT VMULOSH;
-	IT VMULOUB;
-	IT VMULOUH;
-	IT VNMSUBFP;
-	IT VNOR;
-	IT VOR;
-	IT VPERM;
-	IT VPKPX;
-	IT VPKSHSS;
-	IT VPKSHUS;
-	IT VPKSWSS;
-	IT VPKSWUS;
-	IT VPKUHUM;
-	IT VPKUHUS;
-	IT VPKUWUM;
-	IT VPKUWUS;
-	IT VREFP;
-	IT VRFIM;
-	IT VRFIN;
-	IT VRFIP;
-	IT VRFIZ;
-	IT VRLB;
-	IT VRLH;
-	IT VRLW;
-	IT VRSQRTEFP;
-	IT VSEL;
-	IT VSL;
-	IT VSLB;
-	IT VSLDOI{};
-	IT VSLDOI_[16];
-	IT VSLH;
-	IT VSLO;
-	IT VSLW;
-	IT VSPLTB;
-	IT VSPLTH;
-	IT VSPLTISB;
-	IT VSPLTISH;
-	IT VSPLTISW;
-	IT VSPLTW;
-	IT VSR;
-	IT VSRAB;
-	IT VSRAH;
-	IT VSRAW;
-	IT VSRB;
-	IT VSRH;
-	IT VSRO;
-	IT VSRW;
-	IT VSUBCUW;
-	IT VSUBFP;
-	IT VSUBSBS;
-	IT VSUBSHS;
-	IT VSUBSWS;
-	IT VSUBUBM;
-	IT VSUBUBS;
-	IT VSUBUHM;
-	IT VSUBUHS;
-	IT VSUBUWM;
-	IT VSUBUWS;
-	IT VSUMSWS;
-	IT VSUM2SWS;
-	IT VSUM4SBS;
-	IT VSUM4SHS;
-	IT VSUM4UBS;
-	IT VUPKHPX;
-	IT VUPKHSB;
-	IT VUPKHSH;
-	IT VUPKLPX;
-	IT VUPKLSB;
-	IT VUPKLSH;
-	IT VXOR;
-	IT TDI;
-	IT TWI;
-	IT MULLI;
-	IT SUBFIC;
-	IT CMPLI;
-	IT CMPI;
-	IT ADDIC;
-	IT ADDI;
-	IT ADDIS;
-	IT BC;
-	IT SC;
-	IT B;
-	IT MCRF;
-	IT BCLR;
-	IT CRNOR;
-	IT CRANDC;
-	IT ISYNC;
-	IT CRXOR;
-	IT CRNAND;
-	IT CRAND;
-	IT CREQV;
-	IT CRORC;
-	IT CROR;
-	IT BCCTR;
-	IT RLWIMI;
-	IT RLWINM;
-	IT RLWNM;
-	IT ORI;
-	IT ORIS;
-	IT XORI;
-	IT XORIS;
-	IT ANDI;
-	IT ANDIS;
-	IT RLDICL;
-	IT RLDICR;
-	IT RLDIC;
-	IT RLDIMI;
-	IT RLDCL;
-	IT RLDCR;
-	IT CMP;
-	IT TW;
-	IT LVSL;
-	IT LVEBX;
-	IT SUBFC;
-	IT ADDC;
-	IT MULHDU;
-	IT MULHWU;
-	IT MFOCRF{};
-	IT MFOCRF_[8];
-	IT MFCR; //+
-	IT LWARX;
-	IT LDX;
-	IT LWZX;
-	IT SLW;
-	IT CNTLZW;
-	IT SLD;
-	IT AND;
-	IT CMPL;
-	IT LVSR;
-	IT LVEHX;
-	IT SUBF;
-	IT LDUX;
-	IT DCBST;
-	IT LWZUX;
-	IT CNTLZD;
-	IT ANDC;
-	IT TD;
-	IT LVEWX;
-	IT MULHD;
-	IT MULHW;
-	IT LDARX;
-	IT DCBF;
-	IT LBZX;
-	IT LVX;
-	IT NEG;
-	IT LBZUX;
-	IT NOR;
-	IT STVEBX;
-	IT SUBFE;
-	IT ADDE;
-	IT MTOCRF;
-	IT STDX;
-	IT STWCX;
-	IT STWX;
-	IT STVEHX;
-	IT STDUX;
-	IT STWUX;
-	IT STVEWX;
-	IT SUBFZE;
-	IT ADDZE;
-	IT STDCX;
-	IT STBX;
-	IT STVX;
-	IT SUBFME;
-	IT MULLD;
-	IT ADDME;
-	IT MULLW;
-	IT DCBTST;
-	IT STBUX;
-	IT ADD;
-	IT DCBT;
-	IT LHZX;
-	IT EQV;
-	IT ECIWX;
-	IT LHZUX;
-	IT XOR;
-	IT MFSPR;
-	IT LWAX;
-	IT DST;
-	IT LHAX;
-	IT LVXL;
-	IT MFTB;
-	IT LWAUX;
-	IT DSTST;
-	IT LHAUX;
-	IT STHX;
-	IT ORC;
-	IT ECOWX;
-	IT STHUX;
-	IT OR;
-	IT DIVDU;
-	IT DIVWU;
-	IT MTSPR;
-	IT DCBI;
-	IT NAND;
-	IT STVXL;
-	IT DIVD;
-	IT DIVW;
-	IT LVLX;
-	IT LDBRX;
-	IT LSWX;
-	IT LWBRX;
-	IT LFSX;
-	IT SRW;
-	IT SRD;
-	IT LVRX;
-	IT LSWI;
-	IT LFSUX;
-	IT SYNC;
-	IT LFDX;
-	IT LFDUX;
-	IT STVLX;
-	IT STDBRX;
-	IT STSWX;
-	IT STWBRX;
-	IT STFSX;
-	IT STVRX;
-	IT STFSUX;
-	IT STSWI;
-	IT STFDX;
-	IT STFDUX;
-	IT LVLXL;
-	IT LHBRX;
-	IT SRAW;
-	IT SRAD;
-	IT LVRXL;
-	IT DSS;
-	IT SRAWI;
-	IT SRADI;
-	IT EIEIO;
-	IT STVLXL;
-	IT STHBRX;
-	IT EXTSH;
-	IT STVRXL;
-	IT EXTSB;
-	IT STFIWX;
-	IT EXTSW;
-	IT ICBI;
-	IT DCBZ;
-	IT LWZ;
-	IT LWZU;
-	IT LBZ;
-	IT LBZU;
-	IT STW;
-	IT STWU;
-	IT STB;
-	IT STBU;
-	IT LHZ;
-	IT LHZU;
-	IT LHA;
-	IT LHAU;
-	IT STH;
-	IT STHU;
-	IT LMW;
-	IT STMW;
-	IT LFS;
-	IT LFSU;
-	IT LFD;
-	IT LFDU;
-	IT STFS;
-	IT STFSU;
-	IT STFD;
-	IT STFDU;
-	IT LD;
-	IT LDU;
-	IT LWA;
-	IT STD;
-	IT STDU;
-	IT FDIVS;
-	IT FSUBS;
-	IT FADDS;
-	IT FSQRTS;
-	IT FRES;
-	IT FMULS;
-	IT FMADDS;
-	IT FMSUBS;
-	IT FNMSUBS;
-	IT FNMADDS;
-	IT MTFSB1;
-	IT MCRFS;
-	IT MTFSB0;
-	IT MTFSFI;
-	IT MFFS;
-	IT MTFSF;
-	IT FCMPU;
-	IT FRSP;
-	IT FCTIW;
-	IT FCTIWZ;
-	IT FDIV;
-	IT FSUB;
-	IT FADD;
-	IT FSQRT;
-	IT FSEL;
-	IT FMUL;
-	IT FRSQRTE;
-	IT FMSUB;
-	IT FMADD;
-	IT FNMSUB;
-	IT FNMADD;
-	IT FCMPO;
-	IT FNEG;
-	IT FMR;
-	IT FNABS;
-	IT FABS;
-	IT FCTID;
-	IT FCTIDZ;
-	IT FCFID;
-	IT UNK;
-
-	IT SUBFCO;
-	IT ADDCO;
-	IT SUBFO;
-	IT NEGO;
-	IT SUBFEO;
-	IT ADDEO;
-	IT SUBFZEO;
-	IT ADDZEO;
-	IT SUBFMEO;
-	IT MULLDO;
-	IT ADDMEO;
-	IT MULLWO;
-	IT ADDO;
-	IT DIVDUO;
-	IT DIVWUO;
-	IT DIVDO;
-	IT DIVWO;
-
-	IT SUBFCO_;
-	IT ADDCO_;
-	IT SUBFO_;
-	IT NEGO_;
-	IT SUBFEO_;
-	IT ADDEO_;
-	IT SUBFZEO_;
-	IT ADDZEO_;
-	IT SUBFMEO_;
-	IT MULLDO_;
-	IT ADDMEO_;
-	IT MULLWO_;
-	IT ADDO_;
-	IT DIVDUO_;
-	IT DIVWUO_;
-	IT DIVDO_;
-	IT DIVWO_;
-
-	IT RLWIMI_;
-	IT RLWINM_;
-	IT RLWNM_;
-	IT RLDICL_;
-	IT RLDICR_;
-	IT RLDIC_;
-	IT RLDIMI_;
-	IT RLDCL_;
-	IT RLDCR_;
-	IT SUBFC_;
-	IT MULHDU_;
-	IT ADDC_;
-	IT MULHWU_;
-	IT SLW_;
-	IT CNTLZW_;
-	IT SLD_;
-	IT AND_;
-	IT SUBF_;
-	IT CNTLZD_;
-	IT ANDC_;
-	IT MULHD_;
-	IT MULHW_;
-	IT NEG_;
-	IT NOR_;
-	IT SUBFE_;
-	IT ADDE_;
-	IT SUBFZE_;
-	IT ADDZE_;
-	IT MULLD_;
-	IT SUBFME_;
-	IT ADDME_;
-	IT MULLW_;
-	IT ADD_;
-	IT EQV_;
-	IT XOR_;
-	IT ORC_;
-	IT OR_;
-	IT DIVDU_;
-	IT DIVWU_;
-	IT NAND_;
-	IT DIVD_;
-	IT DIVW_;
-	IT SRW_;
-	IT SRD_;
-	IT SRAW_;
-	IT SRAD_;
-	IT SRAWI_;
-	IT SRADI_;
-	IT EXTSH_;
-	IT EXTSB_;
-	IT EXTSW_;
-	IT FDIVS_;
-	IT FSUBS_;
-	IT FADDS_;
-	IT FSQRTS_;
-	IT FRES_;
-	IT FMULS_;
-	IT FMADDS_;
-	IT FMSUBS_;
-	IT FNMSUBS_;
-	IT FNMADDS_;
-	IT MTFSB1_;
-	IT MTFSB0_;
-	IT MTFSFI_;
-	IT MFFS_;
-	IT MTFSF_;
-	IT FRSP_;
-	IT FCTIW_;
-	IT FCTIWZ_;
-	IT FDIV_;
-	IT FSUB_;
-	IT FADD_;
-	IT FSQRT_;
-	IT FSEL_;
-	IT FMUL_;
-	IT FRSQRTE_;
-	IT FMSUB_;
-	IT FMADD_;
-	IT FNMSUB_;
-	IT FNMADD_;
-	IT FNEG_;
-	IT FMR_;
-	IT FNABS_;
-	IT FABS_;
-	IT FCTID_;
-	IT FCTIDZ_;
-	IT FCFID_;
-
-	/* Optimized variants */
-};
-
-ppu_interpreter_rt_base::ppu_interpreter_rt_base() noexcept
-{
-	// Obtain required set of flags from settings
-	bs_t<ppu_exec_bit> selected{};
-	if (g_cfg.core.ppu_set_sat_bit)
-		selected += set_sat;
-	if (g_cfg.core.ppu_use_nj_bit)
-		selected += use_nj + fix_nj;
-	if (g_cfg.core.ppu_llvm_nj_fixup)
-		selected += fix_nj;
-	if (g_cfg.core.ppu_set_vnan)
-		selected += set_vnan + fix_vnan;
-	if (g_cfg.core.ppu_fix_vnan)
-		selected += fix_vnan;
-	if (g_cfg.core.ppu_set_fpcc)
-		selected += set_fpcc;
-	if (g_cfg.core.use_accurate_dfma)
-		selected += use_dfma;
-	if (g_cfg.core.ppu_debug)
-		selected += set_cr_stats; // TODO
-	if (g_cfg.core.ppu_call_history)
-		selected += set_call_history;
-	if (g_cfg.core.ppu_128_reservations_loop_max_length != 0)
-		selected += use_feed_data;
-
-	if (selected & use_nj)
-		ppu_log.success("Enabled: Accurate Non-Java Mode");
-	else if (selected & fix_nj)
-		ppu_log.success("Enabled: Non-Java Mode Fixup");
-	if (selected & set_vnan)
-		ppu_log.success("Enabled: Accurate VNAN");
-	else if (selected & fix_vnan)
-		ppu_log.success("Enabled: VNAN Fixup");
-	if (selected & set_sat)
-		ppu_log.success("Enabled: Accurate SAT");
-	if (selected & set_fpcc)
-		ppu_log.success("Enabled: Accurate FPCC");
-
-	ptrs = std::make_unique<decltype(ptrs)::element_type>();
-
-#ifndef __INTELLISENSE__
-
-#define INIT_VCMP(name) \
-	ptrs->name = ::name<0>(); \
-	ptrs->name##_ = ::name<0, has_oe>(); \
-
-#define INIT_OV(name) \
-	ptrs->name = ::name<0>(); \
-	ptrs->name##O = ::name<0, has_oe>(); \
-
-#define INIT_RC(name) \
-	ptrs->name = ::name<0xf1a6>()(selected, []<ppu_exec_bit... Flags>() { \
-		return ::name<0, Flags...>(); \
-	}); \
-	ptrs->name##_ = ::name<0xf1a6, set_fpcc>()(selected, []<ppu_exec_bit... Flags>() { \
-		/* Minor optimization: has_rc implies set_fpcc so don't compile has_rc alone */ \
-		return ::name<0, has_rc, Flags...>(); \
-	}); \
-
-#define INIT_RC_OV(name) \
-	ptrs->name = ::name<0>(); \
-	ptrs->name##O = ::name<0, has_oe>(); \
-	ptrs->name##_ = ::name<0, has_rc>(); \
-	ptrs->name##O_ = ::name<0, has_oe, has_rc>(); \
-
-	// Initialize instructions with their own sets of supported flags (except INIT_VCMP, INIT_OV, INIT_RC_OV)
-#define INIT(name) \
-	ptrs->name = ::name<0xf1a6>()(selected, []<ppu_exec_bit... Flags>() { \
-		return ::name<0, Flags...>(); \
-	}); \
-
-#define INIT_ONE(name, bits) \
-	ptrs->name##_[0b##bits] = ::name<0b##bits>::select(selected, []<ppu_exec_bit... Flags>() { \
-		return ::name<0b##bits>::impl<0, Flags...>(); \
-	}); \
-
-#define INIT_PACK2(name, bits) \
-	INIT_ONE(name, bits##0) \
-	INIT_ONE(name, bits##1) \
-
-#define INIT_PACK4(name, bits) \
-	INIT_PACK2(name, bits##0) \
-	INIT_PACK2(name, bits##1) \
-
-#define INIT_PACK8(name, bits) \
-	INIT_PACK4(name, bits##0) \
-	INIT_PACK4(name, bits##1) \
-
-#define INIT_PACK16(name, bits) \
-	INIT_PACK8(name, bits##0) \
-	INIT_PACK8(name, bits##1) \
-
-	INIT(MFVSCR);
-	INIT(MTVSCR);
-	INIT(VADDCUW);
-	INIT(VADDFP);
-	INIT(VADDSBS);
-	INIT(VADDSHS);
-	INIT(VADDSWS);
-	INIT(VADDUBM);
-	INIT(VADDUBS);
-	INIT(VADDUHM);
-	INIT(VADDUHS);
-	INIT(VADDUWM);
-	INIT(VADDUWS);
-	INIT(VAND);
-	INIT(VANDC);
-	INIT(VAVGSB);
-	INIT(VAVGSH);
-	INIT(VAVGSW);
-	INIT(VAVGUB);
-	INIT(VAVGUH);
-	INIT(VAVGUW);
-	INIT(VCFSX);
-	INIT(VCFUX);
-	INIT_VCMP(VCMPBFP);
-	INIT_VCMP(VCMPEQFP);
-	INIT_VCMP(VCMPEQUB);
-	INIT_VCMP(VCMPEQUH);
-	INIT_VCMP(VCMPEQUW);
-	INIT_VCMP(VCMPGEFP);
-	INIT_VCMP(VCMPGTFP);
-	INIT_VCMP(VCMPGTSB);
-	INIT_VCMP(VCMPGTSH);
-	INIT_VCMP(VCMPGTSW);
-	INIT_VCMP(VCMPGTUB);
-	INIT_VCMP(VCMPGTUH);
-	INIT_VCMP(VCMPGTUW);
-	INIT(VCTSXS);
-	INIT(VCTUXS);
-	INIT(VEXPTEFP);
-	INIT(VLOGEFP);
-	INIT(VMADDFP);
-	INIT(VMAXFP);
-	INIT(VMAXSB);
-	INIT(VMAXSH);
-	INIT(VMAXSW);
-	INIT(VMAXUB);
-	INIT(VMAXUH);
-	INIT(VMAXUW);
-	INIT(VMHADDSHS);
-	INIT(VMHRADDSHS);
-	INIT(VMINFP);
-	INIT(VMINSB);
-	INIT(VMINSH);
-	INIT(VMINSW);
-	INIT(VMINUB);
-	INIT(VMINUH);
-	INIT(VMINUW);
-	INIT(VMLADDUHM);
-	INIT(VMRGHB);
-	INIT(VMRGHH);
-	INIT(VMRGHW);
-	INIT(VMRGLB);
-	INIT(VMRGLH);
-	INIT(VMRGLW);
-	INIT(VMSUMMBM);
-	INIT(VMSUMSHM);
-	INIT(VMSUMSHS);
-	INIT(VMSUMUBM);
-	INIT(VMSUMUHM);
-	INIT(VMSUMUHS);
-	INIT(VMULESB);
-	INIT(VMULESH);
-	INIT(VMULEUB);
-	INIT(VMULEUH);
-	INIT(VMULOSB);
-	INIT(VMULOSH);
-	INIT(VMULOUB);
-	INIT(VMULOUH);
-	INIT(VNMSUBFP);
-	INIT(VNOR);
-	INIT(VOR);
-	INIT(VPERM);
-	INIT(VPKPX);
-	INIT(VPKSHSS);
-	INIT(VPKSHUS);
-	INIT(VPKSWSS);
-	INIT(VPKSWUS);
-	INIT(VPKUHUM);
-	INIT(VPKUHUS);
-	INIT(VPKUWUM);
-	INIT(VPKUWUS);
-	INIT(VREFP);
-	INIT(VRFIM);
-	INIT(VRFIN);
-	INIT(VRFIP);
-	INIT(VRFIZ);
-	INIT(VRLB);
-	INIT(VRLH);
-	INIT(VRLW);
-	INIT(VRSQRTEFP);
-	INIT(VSEL);
-	INIT(VSL);
-	INIT(VSLB);
-	INIT_PACK16(VSLDOI,);
-	INIT(VSLH);
-	INIT(VSLO);
-	INIT(VSLW);
-	INIT(VSPLTB);
-	INIT(VSPLTH);
-	INIT(VSPLTISB);
-	INIT(VSPLTISH);
-	INIT(VSPLTISW);
-	INIT(VSPLTW);
-	INIT(VSR);
-	INIT(VSRAB);
-	INIT(VSRAH);
-	INIT(VSRAW);
-	INIT(VSRB);
-	INIT(VSRH);
-	INIT(VSRO);
-	INIT(VSRW);
-	INIT(VSUBCUW);
-	INIT(VSUBFP);
-	INIT(VSUBSBS);
-	INIT(VSUBSHS);
-	INIT(VSUBSWS);
-	INIT(VSUBUBM);
-	INIT(VSUBUBS);
-	INIT(VSUBUHM);
-	INIT(VSUBUHS);
-	INIT(VSUBUWM);
-	INIT(VSUBUWS);
-	INIT(VSUMSWS);
-	INIT(VSUM2SWS);
-	INIT(VSUM4SBS);
-	INIT(VSUM4SHS);
-	INIT(VSUM4UBS);
-	INIT(VUPKHPX);
-	INIT(VUPKHSB);
-	INIT(VUPKHSH);
-	INIT(VUPKLPX);
-	INIT(VUPKLSB);
-	INIT(VUPKLSH);
-	INIT(VXOR);
-	INIT(TDI);
-	INIT(TWI);
-	INIT(MULLI);
-	INIT(SUBFIC);
-	INIT(CMPLI);
-	INIT(CMPI);
-	INIT(ADDIC);
-	INIT(ADDI);
-	INIT(ADDIS);
-	INIT(BC);
-	INIT(SC);
-	INIT(B);
-	INIT(MCRF);
-	INIT(BCLR);
-	INIT(CRNOR);
-	INIT(CRANDC);
-	INIT(ISYNC);
-	INIT(CRXOR);
-	INIT(CRNAND);
-	INIT(CRAND);
-	INIT(CREQV);
-	INIT(CRORC);
-	INIT(CROR);
-	INIT(BCCTR);
-	INIT_RC(RLWIMI);
-	INIT_RC(RLWINM);
-	INIT_RC(RLWNM);
-	INIT(ORI);
-	INIT(ORIS);
-	INIT(XORI);
-	INIT(XORIS);
-	INIT(ANDI);
-	INIT(ANDIS);
-	INIT_RC(RLDICL);
-	INIT_RC(RLDICR);
-	INIT_RC(RLDIC);
-	INIT_RC(RLDIMI);
-	INIT_RC(RLDCL);
-	INIT_RC(RLDCR);
-	INIT(CMP);
-	INIT(TW);
-	INIT(LVSL);
-	INIT(LVEBX);
-	INIT_RC_OV(SUBFC);
-	INIT_RC_OV(ADDC);
-	INIT_RC(MULHDU);
-	INIT_RC(MULHWU);
-	INIT_PACK8(MFOCRF,);
-	INIT(MFCR); //+
-	INIT(LWARX);
-	INIT(LDX);
-	INIT(LWZX);
-	INIT_RC(SLW);
-	INIT_RC(CNTLZW);
-	INIT_RC(SLD);
-	INIT_RC(AND);
-	INIT(CMPL);
-	INIT(LVSR);
-	INIT(LVEHX);
-	INIT_RC_OV(SUBF);
-	INIT(LDUX);
-	INIT(DCBST);
-	INIT(LWZUX);
-	INIT_RC(CNTLZD);
-	INIT_RC(ANDC);
-	INIT(TD);
-	INIT(LVEWX);
-	INIT_RC(MULHD);
-	INIT_RC(MULHW);
-	INIT(LDARX);
-	INIT(DCBF);
-	INIT(LBZX);
-	INIT(LVX);
-	INIT_RC_OV(NEG);
-	INIT(LBZUX);
-	INIT_RC(NOR);
-	INIT(STVEBX);
-	INIT_OV(SUBFE);
-	INIT_OV(ADDE);
-	INIT(MTOCRF);
-	INIT(STDX);
-	INIT(STWCX);
-	INIT(STWX);
-	INIT(STVEHX);
-	INIT(STDUX);
-	INIT(STWUX);
-	INIT(STVEWX);
-	INIT_RC_OV(SUBFZE);
-	INIT_RC_OV(ADDZE);
-	INIT(STDCX);
-	INIT(STBX);
-	INIT(STVX);
-	INIT_RC_OV(SUBFME);
-	INIT_RC_OV(MULLD);
-	INIT_RC_OV(ADDME);
-	INIT_RC_OV(MULLW);
-	INIT(DCBTST);
-	INIT(STBUX);
-	INIT_RC_OV(ADD);
-	INIT(DCBT);
-	INIT(LHZX);
-	INIT_RC(EQV);
-	INIT(ECIWX);
-	INIT(LHZUX);
-	INIT_RC(XOR);
-	INIT(MFSPR);
-	INIT(LWAX);
-	INIT(DST);
-	INIT(LHAX);
-	INIT(LVXL);
-	INIT(MFTB);
-	INIT(LWAUX);
-	INIT(DSTST);
-	INIT(LHAUX);
-	INIT(STHX);
-	INIT_RC(ORC);
-	INIT(ECOWX);
-	INIT(STHUX);
-	INIT_RC(OR);
-	INIT_RC_OV(DIVDU);
-	INIT_RC_OV(DIVWU);
-	INIT(MTSPR);
-	INIT(DCBI);
-	INIT_RC(NAND);
-	INIT(STVXL);
-	INIT_RC_OV(DIVD);
-	INIT_RC_OV(DIVW);
-	INIT(LVLX);
-	INIT(LDBRX);
-	INIT(LSWX);
-	INIT(LWBRX);
-	INIT(LFSX);
-	INIT_RC(SRW);
-	INIT_RC(SRD);
-	INIT(LVRX);
-	INIT(LSWI);
-	INIT(LFSUX);
-	INIT(SYNC);
-	INIT(LFDX);
-	INIT(LFDUX);
-	INIT(STVLX);
-	INIT(STDBRX);
-	INIT(STSWX);
-	INIT(STWBRX);
-	INIT(STFSX);
-	INIT(STVRX);
-	INIT(STFSUX);
-	INIT(STSWI);
-	INIT(STFDX);
-	INIT(STFDUX);
-	INIT(LVLXL);
-	INIT(LHBRX);
-	INIT_RC(SRAW);
-	INIT_RC(SRAD);
-	INIT(LVRXL);
-	INIT(DSS);
-	INIT_RC(SRAWI);
-	INIT_RC(SRADI);
-	INIT(EIEIO);
-	INIT(STVLXL);
-	INIT(STHBRX);
-	INIT_RC(EXTSH);
-	INIT(STVRXL);
-	INIT_RC(EXTSB);
-	INIT(STFIWX);
-	INIT_RC(EXTSW);
-	INIT(ICBI);
-	INIT(DCBZ);
-	INIT(LWZ);
-	INIT(LWZU);
-	INIT(LBZ);
-	INIT(LBZU);
-	INIT(STW);
-	INIT(STWU);
-	INIT(STB);
-	INIT(STBU);
-	INIT(LHZ);
-	INIT(LHZU);
-	INIT(LHA);
-	INIT(LHAU);
-	INIT(STH);
-	INIT(STHU);
-	INIT(LMW);
-	INIT(STMW);
-	INIT(LFS);
-	INIT(LFSU);
-	INIT(LFD);
-	INIT(LFDU);
-	INIT(STFS);
-	INIT(STFSU);
-	INIT(STFD);
-	INIT(STFDU);
-	INIT(LD);
-	INIT(LDU);
-	INIT(LWA);
-	INIT(STD);
-	INIT(STDU);
-	INIT_RC(FDIVS);
-	INIT_RC(FSUBS);
-	INIT_RC(FADDS);
-	INIT_RC(FSQRTS);
-	INIT_RC(FRES);
-	INIT_RC(FMULS);
-	INIT_RC(FMADDS);
-	INIT_RC(FMSUBS);
-	INIT_RC(FNMSUBS);
-	INIT_RC(FNMADDS);
-	INIT_RC(MTFSB1);
-	INIT(MCRFS);
-	INIT_RC(MTFSB0);
-	INIT_RC(MTFSFI);
-	INIT_RC(MFFS);
-	INIT_RC(MTFSF);
-	INIT(FCMPU);
-	INIT_RC(FRSP);
-	INIT_RC(FCTIW);
-	INIT_RC(FCTIWZ);
-	INIT_RC(FDIV);
-	INIT_RC(FSUB);
-	INIT_RC(FADD);
-	INIT_RC(FSQRT);
-	INIT_RC(FSEL);
-	INIT_RC(FMUL);
-	INIT_RC(FRSQRTE);
-	INIT_RC(FMSUB);
-	INIT_RC(FMADD);
-	INIT_RC(FNMSUB);
-	INIT_RC(FNMADD);
-	INIT(FCMPO);
-	INIT_RC(FNEG);
-	INIT_RC(FMR);
-	INIT_RC(FNABS);
-	INIT_RC(FABS);
-	INIT_RC(FCTID);
-	INIT_RC(FCTIDZ);
-	INIT_RC(FCFID);
-	INIT(UNK);
-#endif
-}
-
-ppu_interpreter_rt_base::~ppu_interpreter_rt_base()
-{
-}
-
-ppu_interpreter_rt::ppu_interpreter_rt() noexcept
-	: ppu_interpreter_rt_base()
-	, table(*ptrs)
-{
-}
-
-ppu_intrp_func_t ppu_interpreter_rt::decode(u32 opv) const noexcept
-{
-	const auto op = ppu_opcode_t{opv};
-
-	switch (g_ppu_itype.decode(opv))
-	{
-	case ppu_itype::LWZ:
-	case ppu_itype::LBZ:
-	case ppu_itype::STW:
-	case ppu_itype::STB:
-	case ppu_itype::LHZ:
-	case ppu_itype::LHA:
-	case ppu_itype::STH:
-	case ppu_itype::LFS:
-	case ppu_itype::LFD:
-	case ppu_itype::STFS:
-	case ppu_itype::STFD:
-	{
-		// Minor optimization: 16-bit absolute addressing never points to a valid memory
-		if (!op.ra)
-		{
-			return [](ppu_thread&, ppu_opcode_t op, be_t<u32>*, ppu_intrp_func*)
-			{
-				fmt::throw_exception("Invalid instruction: %s r%d,0x%016x(r0)", g_ppu_iname.decode(op.opcode), op.rd, op.simm16);
-			};
-		}
-
-		break;
-	}
-	case ppu_itype::VSLDOI: return ptrs->VSLDOI_[op.vsh];
-	case ppu_itype::MFOCRF:
-	{
-		if (op.l11)
-		{
-			const u32 n = std::countl_zero<u32>(op.crm) & 7;
-
-			if (0x80u >> n != op.crm)
-			{
-				return [](ppu_thread&, ppu_opcode_t op, be_t<u32>*, ppu_intrp_func*)
-				{
-					fmt::throw_exception("Invalid instruction: MFOCRF with bits 0x%x", op.crm);
-				};
-			}
-
-			return ptrs->MFOCRF_[n];
-		}
-
-		return ptrs->MFCR;
-	}
-	default: break;
+		return hle_funcs[index](ppu);
 	}
 
-	return table.decode(opv);
+	fmt::throw_exception("Unknown/Illegal opcode: 0x%08x at 0x%x", op.opcode, ppu.cia);
 }
diff --git a/rpcs3/Emu/Cell/PPUInterpreter.h b/rpcs3/Emu/Cell/PPUInterpreter.h
index 5b8f1037fd..77b91e78cf 100644
--- a/rpcs3/Emu/Cell/PPUInterpreter.h
+++ b/rpcs3/Emu/Cell/PPUInterpreter.h
@@ -4,41 +4,454 @@
 
 class ppu_thread;
 
-using ppu_intrp_func_t = void(*)(ppu_thread& ppu_, ppu_opcode_t op, be_t<u32>* this_op, struct ppu_intrp_func* next_fn);
+using ppu_inter_func_t = bool(*)(ppu_thread& ppu, ppu_opcode_t op);
 
-struct ppu_intrp_func
+struct ppu_interpreter
 {
-	ppu_intrp_func_t fn;
+	static bool MFVSCR(ppu_thread&, ppu_opcode_t);
+	static bool MTVSCR(ppu_thread&, ppu_opcode_t);
+	static bool VADDCUW(ppu_thread&, ppu_opcode_t);
+	static bool VADDFP(ppu_thread&, ppu_opcode_t);
+	static bool VADDUBM(ppu_thread&, ppu_opcode_t);
+	static bool VADDUHM(ppu_thread&, ppu_opcode_t);
+	static bool VADDUWM(ppu_thread&, ppu_opcode_t);
+	static bool VAND(ppu_thread&, ppu_opcode_t);
+	static bool VANDC(ppu_thread&, ppu_opcode_t);
+	static bool VAVGSB(ppu_thread&, ppu_opcode_t);
+	static bool VAVGSH(ppu_thread&, ppu_opcode_t);
+	static bool VAVGSW(ppu_thread&, ppu_opcode_t);
+	static bool VAVGUB(ppu_thread&, ppu_opcode_t);
+	static bool VAVGUH(ppu_thread&, ppu_opcode_t);
+	static bool VAVGUW(ppu_thread&, ppu_opcode_t);
+	static bool VCFSX(ppu_thread&, ppu_opcode_t);
+	static bool VCFUX(ppu_thread&, ppu_opcode_t);
+	static bool VCMPBFP(ppu_thread&, ppu_opcode_t);
+	static bool VCMPEQFP(ppu_thread&, ppu_opcode_t);
+	static bool VCMPEQUB(ppu_thread&, ppu_opcode_t);
+	static bool VCMPEQUH(ppu_thread&, ppu_opcode_t);
+	static bool VCMPEQUW(ppu_thread&, ppu_opcode_t);
+	static bool VCMPGEFP(ppu_thread&, ppu_opcode_t);
+	static bool VCMPGTFP(ppu_thread&, ppu_opcode_t);
+	static bool VCMPGTSB(ppu_thread&, ppu_opcode_t);
+	static bool VCMPGTSH(ppu_thread&, ppu_opcode_t);
+	static bool VCMPGTSW(ppu_thread&, ppu_opcode_t);
+	static bool VCMPGTUB(ppu_thread&, ppu_opcode_t);
+	static bool VCMPGTUH(ppu_thread&, ppu_opcode_t);
+	static bool VCMPGTUW(ppu_thread&, ppu_opcode_t);
+	static bool VEXPTEFP(ppu_thread&, ppu_opcode_t);
+	static bool VLOGEFP(ppu_thread&, ppu_opcode_t);
+	static bool VMAXFP(ppu_thread&, ppu_opcode_t);
+	static bool VMAXSB(ppu_thread&, ppu_opcode_t);
+	static bool VMAXSH(ppu_thread&, ppu_opcode_t);
+	static bool VMAXSW(ppu_thread&, ppu_opcode_t);
+	static bool VMAXUB(ppu_thread&, ppu_opcode_t);
+	static bool VMAXUH(ppu_thread&, ppu_opcode_t);
+	static bool VMAXUW(ppu_thread&, ppu_opcode_t);
+	static bool VMINFP(ppu_thread&, ppu_opcode_t);
+	static bool VMINSB(ppu_thread&, ppu_opcode_t);
+	static bool VMINSH(ppu_thread&, ppu_opcode_t);
+	static bool VMINSW(ppu_thread&, ppu_opcode_t);
+	static bool VMINUB(ppu_thread&, ppu_opcode_t);
+	static bool VMINUH(ppu_thread&, ppu_opcode_t);
+	static bool VMINUW(ppu_thread&, ppu_opcode_t);
+	static bool VMLADDUHM(ppu_thread&, ppu_opcode_t);
+	static bool VMRGHB(ppu_thread&, ppu_opcode_t);
+	static bool VMRGHH(ppu_thread&, ppu_opcode_t);
+	static bool VMRGHW(ppu_thread&, ppu_opcode_t);
+	static bool VMRGLB(ppu_thread&, ppu_opcode_t);
+	static bool VMRGLH(ppu_thread&, ppu_opcode_t);
+	static bool VMRGLW(ppu_thread&, ppu_opcode_t);
+	static bool VMSUMMBM(ppu_thread&, ppu_opcode_t);
+	static bool VMSUMSHM(ppu_thread&, ppu_opcode_t);
+	static bool VMSUMUBM(ppu_thread&, ppu_opcode_t);
+	static bool VMSUMUHM(ppu_thread&, ppu_opcode_t);
+	static bool VMULESB(ppu_thread&, ppu_opcode_t);
+	static bool VMULESH(ppu_thread&, ppu_opcode_t);
+	static bool VMULEUB(ppu_thread&, ppu_opcode_t);
+	static bool VMULEUH(ppu_thread&, ppu_opcode_t);
+	static bool VMULOSB(ppu_thread&, ppu_opcode_t);
+	static bool VMULOSH(ppu_thread&, ppu_opcode_t);
+	static bool VMULOUB(ppu_thread&, ppu_opcode_t);
+	static bool VMULOUH(ppu_thread&, ppu_opcode_t);
+	static bool VNOR(ppu_thread&, ppu_opcode_t);
+	static bool VOR(ppu_thread&, ppu_opcode_t);
+	static bool VPERM(ppu_thread&, ppu_opcode_t);
+	static bool VPKPX(ppu_thread&, ppu_opcode_t);
+	static bool VPKUHUM(ppu_thread&, ppu_opcode_t);
+	static bool VPKUWUM(ppu_thread&, ppu_opcode_t);
+	static bool VREFP(ppu_thread&, ppu_opcode_t);
+	static bool VRFIM(ppu_thread&, ppu_opcode_t);
+	static bool VRFIN(ppu_thread&, ppu_opcode_t);
+	static bool VRFIP(ppu_thread&, ppu_opcode_t);
+	static bool VRFIZ(ppu_thread&, ppu_opcode_t);
+	static bool VRLB(ppu_thread&, ppu_opcode_t);
+	static bool VRLH(ppu_thread&, ppu_opcode_t);
+	static bool VRLW(ppu_thread&, ppu_opcode_t);
+	static bool VRSQRTEFP(ppu_thread&, ppu_opcode_t);
+	static bool VSEL(ppu_thread&, ppu_opcode_t);
+	static bool VSL(ppu_thread&, ppu_opcode_t);
+	static bool VSLB(ppu_thread&, ppu_opcode_t);
+	static bool VSLDOI(ppu_thread&, ppu_opcode_t);
+	static bool VSLH(ppu_thread&, ppu_opcode_t);
+	static bool VSLO(ppu_thread&, ppu_opcode_t);
+	static bool VSLW(ppu_thread&, ppu_opcode_t);
+	static bool VSPLTB(ppu_thread&, ppu_opcode_t);
+	static bool VSPLTH(ppu_thread&, ppu_opcode_t);
+	static bool VSPLTISB(ppu_thread&, ppu_opcode_t);
+	static bool VSPLTISH(ppu_thread&, ppu_opcode_t);
+	static bool VSPLTISW(ppu_thread&, ppu_opcode_t);
+	static bool VSPLTW(ppu_thread&, ppu_opcode_t);
+	static bool VSR(ppu_thread&, ppu_opcode_t);
+	static bool VSRAB(ppu_thread&, ppu_opcode_t);
+	static bool VSRAH(ppu_thread&, ppu_opcode_t);
+	static bool VSRAW(ppu_thread&, ppu_opcode_t);
+	static bool VSRB(ppu_thread&, ppu_opcode_t);
+	static bool VSRH(ppu_thread&, ppu_opcode_t);
+	static bool VSRO(ppu_thread&, ppu_opcode_t);
+	static bool VSRW(ppu_thread&, ppu_opcode_t);
+	static bool VSUBCUW(ppu_thread&, ppu_opcode_t);
+	static bool VSUBFP(ppu_thread&, ppu_opcode_t);
+	static bool VSUBUBM(ppu_thread&, ppu_opcode_t);
+	static bool VSUBUHM(ppu_thread&, ppu_opcode_t);
+	static bool VSUBUWM(ppu_thread&, ppu_opcode_t);
+	static bool VUPKHPX(ppu_thread&, ppu_opcode_t);
+	static bool VUPKHSB(ppu_thread&, ppu_opcode_t);
+	static bool VUPKHSH(ppu_thread&, ppu_opcode_t);
+	static bool VUPKLPX(ppu_thread&, ppu_opcode_t);
+	static bool VUPKLSB(ppu_thread&, ppu_opcode_t);
+	static bool VUPKLSH(ppu_thread&, ppu_opcode_t);
+	static bool VXOR(ppu_thread&, ppu_opcode_t);
+	static bool TDI(ppu_thread&, ppu_opcode_t);
+	static bool TWI(ppu_thread&, ppu_opcode_t);
+	static bool MULLI(ppu_thread&, ppu_opcode_t);
+	static bool SUBFIC(ppu_thread&, ppu_opcode_t);
+	static bool CMPLI(ppu_thread&, ppu_opcode_t);
+	static bool CMPI(ppu_thread&, ppu_opcode_t);
+	static bool ADDIC(ppu_thread&, ppu_opcode_t);
+	static bool ADDI(ppu_thread&, ppu_opcode_t);
+	static bool ADDIS(ppu_thread&, ppu_opcode_t);
+	static bool BC(ppu_thread&, ppu_opcode_t);
+	static bool SC(ppu_thread&, ppu_opcode_t);
+	static bool B(ppu_thread&, ppu_opcode_t);
+	static bool MCRF(ppu_thread&, ppu_opcode_t);
+	static bool BCLR(ppu_thread&, ppu_opcode_t);
+	static bool CRNOR(ppu_thread&, ppu_opcode_t);
+	static bool CRANDC(ppu_thread&, ppu_opcode_t);
+	static bool ISYNC(ppu_thread&, ppu_opcode_t);
+	static bool CRXOR(ppu_thread&, ppu_opcode_t);
+	static bool CRNAND(ppu_thread&, ppu_opcode_t);
+	static bool CRAND(ppu_thread&, ppu_opcode_t);
+	static bool CREQV(ppu_thread&, ppu_opcode_t);
+	static bool CRORC(ppu_thread&, ppu_opcode_t);
+	static bool CROR(ppu_thread&, ppu_opcode_t);
+	static bool BCCTR(ppu_thread&, ppu_opcode_t);
+	static bool RLWIMI(ppu_thread&, ppu_opcode_t);
+	static bool RLWINM(ppu_thread&, ppu_opcode_t);
+	static bool RLWNM(ppu_thread&, ppu_opcode_t);
+	static bool ORI(ppu_thread&, ppu_opcode_t);
+	static bool ORIS(ppu_thread&, ppu_opcode_t);
+	static bool XORI(ppu_thread&, ppu_opcode_t);
+	static bool XORIS(ppu_thread&, ppu_opcode_t);
+	static bool ANDI(ppu_thread&, ppu_opcode_t);
+	static bool ANDIS(ppu_thread&, ppu_opcode_t);
+	static bool RLDICL(ppu_thread&, ppu_opcode_t);
+	static bool RLDICR(ppu_thread&, ppu_opcode_t);
+	static bool RLDIC(ppu_thread&, ppu_opcode_t);
+	static bool RLDIMI(ppu_thread&, ppu_opcode_t);
+	static bool RLDCL(ppu_thread&, ppu_opcode_t);
+	static bool RLDCR(ppu_thread&, ppu_opcode_t);
+	static bool CMP(ppu_thread&, ppu_opcode_t);
+	static bool TW(ppu_thread&, ppu_opcode_t);
+	static bool LVSL(ppu_thread&, ppu_opcode_t);
+	static bool LVEBX(ppu_thread&, ppu_opcode_t);
+	static bool SUBFC(ppu_thread&, ppu_opcode_t);
+	static bool MULHDU(ppu_thread&, ppu_opcode_t);
+	static bool ADDC(ppu_thread&, ppu_opcode_t);
+	static bool MULHWU(ppu_thread&, ppu_opcode_t);
+	static bool MFOCRF(ppu_thread&, ppu_opcode_t);
+	static bool LWARX(ppu_thread&, ppu_opcode_t);
+	static bool LDX(ppu_thread&, ppu_opcode_t);
+	static bool LWZX(ppu_thread&, ppu_opcode_t);
+	static bool SLW(ppu_thread&, ppu_opcode_t);
+	static bool CNTLZW(ppu_thread&, ppu_opcode_t);
+	static bool SLD(ppu_thread&, ppu_opcode_t);
+	static bool AND(ppu_thread&, ppu_opcode_t);
+	static bool CMPL(ppu_thread&, ppu_opcode_t);
+	static bool LVSR(ppu_thread&, ppu_opcode_t);
+	static bool LVEHX(ppu_thread&, ppu_opcode_t);
+	static bool SUBF(ppu_thread&, ppu_opcode_t);
+	static bool LDUX(ppu_thread&, ppu_opcode_t);
+	static bool DCBST(ppu_thread&, ppu_opcode_t);
+	static bool LWZUX(ppu_thread&, ppu_opcode_t);
+	static bool CNTLZD(ppu_thread&, ppu_opcode_t);
+	static bool ANDC(ppu_thread&, ppu_opcode_t);
+	static bool TD(ppu_thread&, ppu_opcode_t);
+	static bool LVEWX(ppu_thread&, ppu_opcode_t);
+	static bool MULHD(ppu_thread&, ppu_opcode_t);
+	static bool MULHW(ppu_thread&, ppu_opcode_t);
+	static bool LDARX(ppu_thread&, ppu_opcode_t);
+	static bool DCBF(ppu_thread&, ppu_opcode_t);
+	static bool LBZX(ppu_thread&, ppu_opcode_t);
+	static bool LVX(ppu_thread&, ppu_opcode_t);
+	static bool NEG(ppu_thread&, ppu_opcode_t);
+	static bool LBZUX(ppu_thread&, ppu_opcode_t);
+	static bool NOR(ppu_thread&, ppu_opcode_t);
+	static bool STVEBX(ppu_thread&, ppu_opcode_t);
+	static bool SUBFE(ppu_thread&, ppu_opcode_t);
+	static bool ADDE(ppu_thread&, ppu_opcode_t);
+	static bool MTOCRF(ppu_thread&, ppu_opcode_t);
+	static bool STDX(ppu_thread&, ppu_opcode_t);
+	static bool STWCX(ppu_thread&, ppu_opcode_t);
+	static bool STWX(ppu_thread&, ppu_opcode_t);
+	static bool STVEHX(ppu_thread&, ppu_opcode_t);
+	static bool STDUX(ppu_thread&, ppu_opcode_t);
+	static bool STWUX(ppu_thread&, ppu_opcode_t);
+	static bool STVEWX(ppu_thread&, ppu_opcode_t);
+	static bool SUBFZE(ppu_thread&, ppu_opcode_t);
+	static bool ADDZE(ppu_thread&, ppu_opcode_t);
+	static bool STDCX(ppu_thread&, ppu_opcode_t);
+	static bool STBX(ppu_thread&, ppu_opcode_t);
+	static bool STVX(ppu_thread&, ppu_opcode_t);
+	static bool MULLD(ppu_thread&, ppu_opcode_t);
+	static bool SUBFME(ppu_thread&, ppu_opcode_t);
+	static bool ADDME(ppu_thread&, ppu_opcode_t);
+	static bool MULLW(ppu_thread&, ppu_opcode_t);
+	static bool DCBTST(ppu_thread&, ppu_opcode_t);
+	static bool STBUX(ppu_thread&, ppu_opcode_t);
+	static bool ADD(ppu_thread&, ppu_opcode_t);
+	static bool DCBT(ppu_thread&, ppu_opcode_t);
+	static bool LHZX(ppu_thread&, ppu_opcode_t);
+	static bool EQV(ppu_thread&, ppu_opcode_t);
+	static bool ECIWX(ppu_thread&, ppu_opcode_t);
+	static bool LHZUX(ppu_thread&, ppu_opcode_t);
+	static bool XOR(ppu_thread&, ppu_opcode_t);
+	static bool MFSPR(ppu_thread&, ppu_opcode_t);
+	static bool LWAX(ppu_thread&, ppu_opcode_t);
+	static bool DST(ppu_thread&, ppu_opcode_t);
+	static bool LHAX(ppu_thread&, ppu_opcode_t);
+	static bool LVXL(ppu_thread&, ppu_opcode_t);
+	static bool MFTB(ppu_thread&, ppu_opcode_t);
+	static bool LWAUX(ppu_thread&, ppu_opcode_t);
+	static bool DSTST(ppu_thread&, ppu_opcode_t);
+	static bool LHAUX(ppu_thread&, ppu_opcode_t);
+	static bool STHX(ppu_thread&, ppu_opcode_t);
+	static bool ORC(ppu_thread&, ppu_opcode_t);
+	static bool ECOWX(ppu_thread&, ppu_opcode_t);
+	static bool STHUX(ppu_thread&, ppu_opcode_t);
+	static bool OR(ppu_thread&, ppu_opcode_t);
+	static bool DIVDU(ppu_thread&, ppu_opcode_t);
+	static bool DIVWU(ppu_thread&, ppu_opcode_t);
+	static bool MTSPR(ppu_thread&, ppu_opcode_t);
+	static bool DCBI(ppu_thread&, ppu_opcode_t);
+	static bool NAND(ppu_thread&, ppu_opcode_t);
+	static bool STVXL(ppu_thread&, ppu_opcode_t);
+	static bool DIVD(ppu_thread&, ppu_opcode_t);
+	static bool DIVW(ppu_thread&, ppu_opcode_t);
+	static bool LDBRX(ppu_thread&, ppu_opcode_t);
+	static bool LSWX(ppu_thread&, ppu_opcode_t);
+	static bool LWBRX(ppu_thread&, ppu_opcode_t);
+	static bool LFSX(ppu_thread&, ppu_opcode_t);
+	static bool SRW(ppu_thread&, ppu_opcode_t);
+	static bool SRD(ppu_thread&, ppu_opcode_t);
+	static bool LSWI(ppu_thread&, ppu_opcode_t);
+	static bool LFSUX(ppu_thread&, ppu_opcode_t);
+	static bool SYNC(ppu_thread&, ppu_opcode_t);
+	static bool LFDX(ppu_thread&, ppu_opcode_t);
+	static bool LFDUX(ppu_thread&, ppu_opcode_t);
+	static bool STDBRX(ppu_thread&, ppu_opcode_t);
+	static bool STSWX(ppu_thread&, ppu_opcode_t);
+	static bool STWBRX(ppu_thread&, ppu_opcode_t);
+	static bool STFSX(ppu_thread&, ppu_opcode_t);
+	static bool STFSUX(ppu_thread&, ppu_opcode_t);
+	static bool STSWI(ppu_thread&, ppu_opcode_t);
+	static bool STFDX(ppu_thread&, ppu_opcode_t);
+	static bool STFDUX(ppu_thread&, ppu_opcode_t);
+	static bool LHBRX(ppu_thread&, ppu_opcode_t);
+	static bool SRAW(ppu_thread&, ppu_opcode_t);
+	static bool SRAD(ppu_thread&, ppu_opcode_t);
+	static bool DSS(ppu_thread&, ppu_opcode_t);
+	static bool SRAWI(ppu_thread&, ppu_opcode_t);
+	static bool SRADI(ppu_thread&, ppu_opcode_t);
+	static bool EIEIO(ppu_thread&, ppu_opcode_t);
+	static bool STHBRX(ppu_thread&, ppu_opcode_t);
+	static bool EXTSH(ppu_thread&, ppu_opcode_t);
+	static bool EXTSB(ppu_thread&, ppu_opcode_t);
+	static bool STFIWX(ppu_thread&, ppu_opcode_t);
+	static bool EXTSW(ppu_thread&, ppu_opcode_t);
+	static bool ICBI(ppu_thread&, ppu_opcode_t);
+	static bool DCBZ(ppu_thread&, ppu_opcode_t);
+	static bool LWZ(ppu_thread&, ppu_opcode_t);
+	static bool LWZU(ppu_thread&, ppu_opcode_t);
+	static bool LBZ(ppu_thread&, ppu_opcode_t);
+	static bool LBZU(ppu_thread&, ppu_opcode_t);
+	static bool STW(ppu_thread&, ppu_opcode_t);
+	static bool STWU(ppu_thread&, ppu_opcode_t);
+	static bool STB(ppu_thread&, ppu_opcode_t);
+	static bool STBU(ppu_thread&, ppu_opcode_t);
+	static bool LHZ(ppu_thread&, ppu_opcode_t);
+	static bool LHZU(ppu_thread&, ppu_opcode_t);
+	static bool LHA(ppu_thread&, ppu_opcode_t);
+	static bool LHAU(ppu_thread&, ppu_opcode_t);
+	static bool STH(ppu_thread&, ppu_opcode_t);
+	static bool STHU(ppu_thread&, ppu_opcode_t);
+	static bool LMW(ppu_thread&, ppu_opcode_t);
+	static bool STMW(ppu_thread&, ppu_opcode_t);
+	static bool LFS(ppu_thread&, ppu_opcode_t);
+	static bool LFSU(ppu_thread&, ppu_opcode_t);
+	static bool LFD(ppu_thread&, ppu_opcode_t);
+	static bool LFDU(ppu_thread&, ppu_opcode_t);
+	static bool STFS(ppu_thread&, ppu_opcode_t);
+	static bool STFSU(ppu_thread&, ppu_opcode_t);
+	static bool STFD(ppu_thread&, ppu_opcode_t);
+	static bool STFDU(ppu_thread&, ppu_opcode_t);
+	static bool LD(ppu_thread&, ppu_opcode_t);
+	static bool LDU(ppu_thread&, ppu_opcode_t);
+	static bool LWA(ppu_thread&, ppu_opcode_t);
+	static bool STD(ppu_thread&, ppu_opcode_t);
+	static bool STDU(ppu_thread&, ppu_opcode_t);
+	static bool MTFSB1(ppu_thread&, ppu_opcode_t);
+	static bool MCRFS(ppu_thread&, ppu_opcode_t);
+	static bool MTFSB0(ppu_thread&, ppu_opcode_t);
+	static bool MTFSFI(ppu_thread&, ppu_opcode_t);
+	static bool MFFS(ppu_thread&, ppu_opcode_t);
+	static bool MTFSF(ppu_thread&, ppu_opcode_t);
+	static bool FCMPU(ppu_thread&, ppu_opcode_t);
+	static bool FCTIW(ppu_thread&, ppu_opcode_t);
+	static bool FCTIWZ(ppu_thread&, ppu_opcode_t);
+	static bool FSEL(ppu_thread&, ppu_opcode_t);
+	static bool FCMPO(ppu_thread&, ppu_opcode_t);
+	static bool FNEG(ppu_thread&, ppu_opcode_t);
+	static bool FMR(ppu_thread&, ppu_opcode_t);
+	static bool FNABS(ppu_thread&, ppu_opcode_t);
+	static bool FABS(ppu_thread&, ppu_opcode_t);
+	static bool FCTID(ppu_thread&, ppu_opcode_t);
+	static bool FCTIDZ(ppu_thread&, ppu_opcode_t);
+	static bool FCFID(ppu_thread&, ppu_opcode_t);
+
+	static bool LVLX(ppu_thread&, ppu_opcode_t);
+	static bool LVLXL(ppu_thread&, ppu_opcode_t);
+	static bool LVRX(ppu_thread&, ppu_opcode_t);
+	static bool LVRXL(ppu_thread&, ppu_opcode_t);
+	static bool STVLX(ppu_thread&, ppu_opcode_t);
+	static bool STVLXL(ppu_thread&, ppu_opcode_t);
+	static bool STVRX(ppu_thread&, ppu_opcode_t);
+	static bool STVRXL(ppu_thread&, ppu_opcode_t);
+
+	static bool UNK(ppu_thread&, ppu_opcode_t);
 };
 
-template <typename IT>
-struct ppu_interpreter_t;
-
-namespace asmjit
+struct ppu_interpreter_precise final : ppu_interpreter
 {
-	struct ppu_builder;
-}
+	static bool VPKSHSS(ppu_thread&, ppu_opcode_t);
+	static bool VPKSHUS(ppu_thread&, ppu_opcode_t);
+	static bool VPKSWSS(ppu_thread&, ppu_opcode_t);
+	static bool VPKSWUS(ppu_thread&, ppu_opcode_t);
+	static bool VPKUHUS(ppu_thread&, ppu_opcode_t);
+	static bool VPKUWUS(ppu_thread&, ppu_opcode_t);
+	static bool VADDSBS(ppu_thread&, ppu_opcode_t);
+	static bool VADDSHS(ppu_thread&, ppu_opcode_t);
+	static bool VADDSWS(ppu_thread&, ppu_opcode_t);
+	static bool VADDUBS(ppu_thread&, ppu_opcode_t);
+	static bool VADDUHS(ppu_thread&, ppu_opcode_t);
+	static bool VADDUWS(ppu_thread&, ppu_opcode_t);
+	static bool VSUBSBS(ppu_thread&, ppu_opcode_t);
+	static bool VSUBSHS(ppu_thread&, ppu_opcode_t);
+	static bool VSUBSWS(ppu_thread&, ppu_opcode_t);
+	static bool VSUBUBS(ppu_thread&, ppu_opcode_t);
+	static bool VSUBUHS(ppu_thread&, ppu_opcode_t);
+	static bool VSUBUWS(ppu_thread&, ppu_opcode_t);
+	static bool VMHADDSHS(ppu_thread&, ppu_opcode_t);
+	static bool VMHRADDSHS(ppu_thread&, ppu_opcode_t);
+	static bool VMSUMSHS(ppu_thread&, ppu_opcode_t);
+	static bool VMSUMUHS(ppu_thread&, ppu_opcode_t);
+	static bool VSUMSWS(ppu_thread&, ppu_opcode_t);
+	static bool VSUM2SWS(ppu_thread&, ppu_opcode_t);
+	static bool VSUM4SBS(ppu_thread&, ppu_opcode_t);
+	static bool VSUM4SHS(ppu_thread&, ppu_opcode_t);
+	static bool VSUM4UBS(ppu_thread&, ppu_opcode_t);
+	static bool VCTSXS(ppu_thread&, ppu_opcode_t);
+	static bool VCTUXS(ppu_thread&, ppu_opcode_t);
+	static bool VMADDFP(ppu_thread&, ppu_opcode_t);
+	static bool VNMSUBFP(ppu_thread&, ppu_opcode_t);
 
-struct ppu_interpreter_rt_base
-{
-protected:
-	std::unique_ptr<ppu_interpreter_t<ppu_intrp_func_t>> ptrs;
+	static bool FDIVS(ppu_thread&, ppu_opcode_t);
+	static bool FSUBS(ppu_thread&, ppu_opcode_t);
+	static bool FADDS(ppu_thread&, ppu_opcode_t);
+	static bool FSQRTS(ppu_thread&, ppu_opcode_t);
+	static bool FRES(ppu_thread&, ppu_opcode_t);
+	static bool FMULS(ppu_thread&, ppu_opcode_t);
+	static bool FMADDS(ppu_thread&, ppu_opcode_t);
+	static bool FMSUBS(ppu_thread&, ppu_opcode_t);
+	static bool FNMSUBS(ppu_thread&, ppu_opcode_t);
+	static bool FNMADDS(ppu_thread&, ppu_opcode_t);
 
-	ppu_interpreter_rt_base() noexcept;
-
-	ppu_interpreter_rt_base(const ppu_interpreter_rt_base&) = delete;
-
-	ppu_interpreter_rt_base& operator=(const ppu_interpreter_rt_base&) = delete;
-
-	virtual ~ppu_interpreter_rt_base();
+	static bool FRSP(ppu_thread&, ppu_opcode_t);
+	static bool FDIV(ppu_thread&, ppu_opcode_t);
+	static bool FSUB(ppu_thread&, ppu_opcode_t);
+	static bool FADD(ppu_thread&, ppu_opcode_t);
+	static bool FSQRT(ppu_thread&, ppu_opcode_t);
+	static bool FMUL(ppu_thread&, ppu_opcode_t);
+	static bool FRSQRTE(ppu_thread&, ppu_opcode_t);
+	static bool FMSUB(ppu_thread&, ppu_opcode_t);
+	static bool FMADD(ppu_thread&, ppu_opcode_t);
+	static bool FNMSUB(ppu_thread&, ppu_opcode_t);
+	static bool FNMADD(ppu_thread&, ppu_opcode_t);
 };
 
-struct ppu_interpreter_rt : ppu_interpreter_rt_base
+struct ppu_interpreter_fast final : ppu_interpreter
 {
-	ppu_interpreter_rt() noexcept;
+	static bool VPKSHSS(ppu_thread&, ppu_opcode_t);
+	static bool VPKSHUS(ppu_thread&, ppu_opcode_t);
+	static bool VPKSWSS(ppu_thread&, ppu_opcode_t);
+	static bool VPKSWUS(ppu_thread&, ppu_opcode_t);
+	static bool VPKUHUS(ppu_thread&, ppu_opcode_t);
+	static bool VPKUWUS(ppu_thread&, ppu_opcode_t);
+	static bool VADDSBS(ppu_thread&, ppu_opcode_t);
+	static bool VADDSHS(ppu_thread&, ppu_opcode_t);
+	static bool VADDSWS(ppu_thread&, ppu_opcode_t);
+	static bool VADDUBS(ppu_thread&, ppu_opcode_t);
+	static bool VADDUHS(ppu_thread&, ppu_opcode_t);
+	static bool VADDUWS(ppu_thread&, ppu_opcode_t);
+	static bool VSUBSBS(ppu_thread&, ppu_opcode_t);
+	static bool VSUBSHS(ppu_thread&, ppu_opcode_t);
+	static bool VSUBSWS(ppu_thread&, ppu_opcode_t);
+	static bool VSUBUBS(ppu_thread&, ppu_opcode_t);
+	static bool VSUBUHS(ppu_thread&, ppu_opcode_t);
+	static bool VSUBUWS(ppu_thread&, ppu_opcode_t);
+	static bool VMHADDSHS(ppu_thread&, ppu_opcode_t);
+	static bool VMHRADDSHS(ppu_thread&, ppu_opcode_t);
+	static bool VMSUMSHS(ppu_thread&, ppu_opcode_t);
+	static bool VMSUMUHS(ppu_thread&, ppu_opcode_t);
+	static bool VSUMSWS(ppu_thread&, ppu_opcode_t);
+	static bool VSUM2SWS(ppu_thread&, ppu_opcode_t);
+	static bool VSUM4SBS(ppu_thread&, ppu_opcode_t);
+	static bool VSUM4SHS(ppu_thread&, ppu_opcode_t);
+	static bool VSUM4UBS(ppu_thread&, ppu_opcode_t);
+	static bool VCTSXS(ppu_thread&, ppu_opcode_t);
+	static bool VCTUXS(ppu_thread&, ppu_opcode_t);
+	static bool VMADDFP(ppu_thread&, ppu_opcode_t);
+	static bool VNMSUBFP(ppu_thread&, ppu_opcode_t);
 
-	ppu_intrp_func_t decode(u32 op) const noexcept;
+	static bool FDIVS(ppu_thread&, ppu_opcode_t);
+	static bool FSUBS(ppu_thread&, ppu_opcode_t);
+	static bool FADDS(ppu_thread&, ppu_opcode_t);
+	static bool FSQRTS(ppu_thread&, ppu_opcode_t);
+	static bool FRES(ppu_thread&, ppu_opcode_t);
+	static bool FMULS(ppu_thread&, ppu_opcode_t);
+	static bool FMADDS(ppu_thread&, ppu_opcode_t);
+	static bool FMSUBS(ppu_thread&, ppu_opcode_t);
+	static bool FNMSUBS(ppu_thread&, ppu_opcode_t);
+	static bool FNMADDS(ppu_thread&, ppu_opcode_t);
 
-private:
-	ppu_decoder<ppu_interpreter_t<ppu_intrp_func_t>, ppu_intrp_func_t> table;
+	static bool FRSP(ppu_thread&, ppu_opcode_t);
+	static bool FDIV(ppu_thread&, ppu_opcode_t);
+	static bool FSUB(ppu_thread&, ppu_opcode_t);
+	static bool FADD(ppu_thread&, ppu_opcode_t);
+	static bool FSQRT(ppu_thread&, ppu_opcode_t);
+	static bool FMUL(ppu_thread&, ppu_opcode_t);
+	static bool FRSQRTE(ppu_thread&, ppu_opcode_t);
+	static bool FMSUB(ppu_thread&, ppu_opcode_t);
+	static bool FMADD(ppu_thread&, ppu_opcode_t);
+	static bool FNMSUB(ppu_thread&, ppu_opcode_t);
+	static bool FNMADD(ppu_thread&, ppu_opcode_t);
 };
diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp
index 65ab0fe18d..3762a5871e 100644
--- a/rpcs3/Emu/Cell/PPUModule.cpp
+++ b/rpcs3/Emu/Cell/PPUModule.cpp
@@ -4,18 +4,14 @@
 #include "Utilities/bin_patch.h"
 #include "Utilities/StrUtil.h"
 #include "Utilities/address_range.h"
-#include "util/serialization.hpp"
 #include "Crypto/sha1.h"
 #include "Crypto/unself.h"
 #include "Loader/ELF.h"
 #include "Emu/System.h"
-#include "Emu/system_config.h"
 #include "Emu/VFS.h"
 
 #include "Emu/Cell/PPUOpcodes.h"
-#include "Emu/Cell/SPUThread.h"
 #include "Emu/Cell/PPUAnalyser.h"
-#include "Emu/Cell/timers.hpp"
 
 #include "Emu/Cell/lv2/sys_process.h"
 #include "Emu/Cell/lv2/sys_prx.h"
@@ -25,7 +21,6 @@
 #include "Emu/Cell/Modules/StaticHLE.h"
 
 #include <map>
-#include <span>
 #include <set>
 #include <algorithm>
 #include "util/asm.hpp"
@@ -35,59 +30,28 @@ LOG_CHANNEL(ppu_loader);
 extern std::string ppu_get_function_name(const std::string& _module, u32 fnid);
 extern std::string ppu_get_variable_name(const std::string& _module, u32 vnid);
 extern void ppu_register_range(u32 addr, u32 size);
-extern void ppu_register_function_at(u32 addr, u32 size, ppu_intrp_func_t ptr);
+extern void ppu_register_function_at(u32 addr, u32 size, ppu_function_t ptr);
 
 extern void sys_initialize_tls(ppu_thread&, u64, u32, u32, u32);
 
-std::unordered_map<std::string, ppu_static_module*>& ppu_module_manager::get()
-{
-	// In C++ the order of static initialization is undefined if it happens in
-	// separate compilation units, therefore we have to initialize the map on first use.
-	static std::unordered_map<std::string, ppu_static_module*> s_module_map;
-	return s_module_map;
-}
-
 // HLE function name cache
 std::vector<std::string> g_ppu_function_names;
 
-atomic_t<u32> liblv2_begin = 0, liblv2_end = 0;
-
-extern u32 ppu_generate_id(std::string_view name)
+extern u32 ppu_generate_id(const char* name)
 {
 	// Symbol name suffix
-	constexpr auto suffix = "\x67\x59\x65\x99\x04\x25\x04\x90\x56\x64\x27\x49\x94\x89\x74\x1A"sv;
+	const auto suffix = "\x67\x59\x65\x99\x04\x25\x04\x90\x56\x64\x27\x49\x94\x89\x74\x1A";
 
 	sha1_context ctx;
 	u8 output[20];
 
 	// Compute SHA-1 hash
 	sha1_starts(&ctx);
-	sha1_update(&ctx, reinterpret_cast<const u8*>(name.data()), name.size());
-	sha1_update(&ctx, reinterpret_cast<const u8*>(suffix.data()), suffix.size());
+	sha1_update(&ctx, reinterpret_cast<const u8*>(name), std::strlen(name));
+	sha1_update(&ctx, reinterpret_cast<const u8*>(suffix), std::strlen(suffix));
 	sha1_finish(&ctx, output);
 
-	le_t<u32> result = 0;
-	std::memcpy(&result, output, sizeof(result));
-	return result;
-}
-
-static void select_from_nids_scenpdrm_addrs(std::map<u32, std::vector<std::pair<ppua_reg_mask_t, u64>>>& result, const std::unordered_map<u32, u32>& fnid_to_use_addr)
-{
-	static const u32 fnids_list[] =
-	{
-		ppu_generate_id("sceNpDrmProcessExitSpawn"),
-		ppu_generate_id("sceNpDrmProcessExitSpawn2"),
-		ppu_generate_id("sceNpDrmIsAvailable"),
-		ppu_generate_id("sceNpDrmIsAvailable2"),
-	};
-
-	for (const auto& [nid, use] : fnid_to_use_addr)
-	{
-		if (std::count(std::begin(fnids_list), std::end(fnids_list), nid))
-		{
-			result.emplace(use, 0);
-		}
-	}
+	return reinterpret_cast<le_t<u32>&>(output[0]);
 }
 
 ppu_static_module::ppu_static_module(const char* name)
@@ -111,12 +75,12 @@ void ppu_static_module::initialize()
 
 void ppu_module_manager::register_module(ppu_static_module* _module)
 {
-	ppu_module_manager::get().emplace(_module->name, _module);
+	ppu_module_manager::s_module_map.emplace(_module->name, _module);
 }
 
 ppu_static_function& ppu_module_manager::access_static_function(const char* _module, u32 fnid)
 {
-	auto& res = ::at32(ppu_module_manager::get(), _module)->functions[fnid];
+	auto& res = ppu_module_manager::s_module_map.at(_module)->functions[fnid];
 
 	if (res.name)
 	{
@@ -128,7 +92,7 @@ ppu_static_function& ppu_module_manager::access_static_function(const char* _mod
 
 ppu_static_variable& ppu_module_manager::access_static_variable(const char* _module, u32 vnid)
 {
-	auto& res = ::at32(ppu_module_manager::get(), _module)->variables[vnid];
+	auto& res = ppu_module_manager::s_module_map.at(_module)->variables[vnid];
 
 	if (res.name)
 	{
@@ -140,14 +104,14 @@ ppu_static_variable& ppu_module_manager::access_static_variable(const char* _mod
 
 const ppu_static_module* ppu_module_manager::get_module(const std::string& name)
 {
-	const auto& map = ppu_module_manager::get();
+	const auto& map = ppu_module_manager::s_module_map;
 	const auto found = map.find(name);
 	return found != map.end() ? found->second : nullptr;
 }
 
 void ppu_module_manager::initialize_modules()
 {
-	for (auto& _module : ppu_module_manager::get())
+	for (auto& _module : s_module_map)
 	{
 		_module.second->initialize();
 	}
@@ -174,19 +138,19 @@ struct ppu_linkage_info
 		};
 
 		// FNID -> (export; [imports...])
-		std::map<u32, info> functions{};
-		std::map<u32, info> variables{};
+		std::unordered_map<u32, info, value_hash<u32>> functions{};
+		std::unordered_map<u32, info, value_hash<u32>> variables{};
+
+		// Obsolete
+		bool imported = false;
 	};
 
 	// Module map
-	std::map<std::string, module_data> modules{};
-	std::map<std::string, atomic_t<bool>, std::less<>> lib_lock;
-	shared_mutex lib_lock_mutex;
-	shared_mutex mutex;
+	std::unordered_map<std::string, module_data> modules{};
 };
 
 // Initialize static modules.
-static void ppu_initialize_modules(ppu_linkage_info* link, utils::serial* ar = nullptr)
+static void ppu_initialize_modules(ppu_linkage_info* link)
 {
 	if (!link->modules.empty())
 	{
@@ -199,29 +163,18 @@ static void ppu_initialize_modules(ppu_linkage_info* link, utils::serial* ar = n
 	{
 		&ppu_module_manager::cellAdec,
 		&ppu_module_manager::cellAtrac,
-		&ppu_module_manager::cellAtrac3dec,
-		&ppu_module_manager::cellAtrac3multidec,
 		&ppu_module_manager::cellAtracMulti,
-		&ppu_module_manager::cellAtracXdec,
 		&ppu_module_manager::cellAudio,
 		&ppu_module_manager::cellAvconfExt,
 		&ppu_module_manager::cellAuthDialogUtility,
 		&ppu_module_manager::cellBGDL,
 		&ppu_module_manager::cellCamera,
-		&ppu_module_manager::cellCelp8Dec,
 		&ppu_module_manager::cellCelp8Enc,
-		&ppu_module_manager::cellCelpDec,
 		&ppu_module_manager::cellCelpEnc,
 		&ppu_module_manager::cellCrossController,
 		&ppu_module_manager::cellDaisy,
-		&ppu_module_manager::cellDDPdec,
 		&ppu_module_manager::cellDmux,
-		&ppu_module_manager::cellDmuxPamf,
 		&ppu_module_manager::cellDtcpIpUtility,
-		&ppu_module_manager::cellDTSdec,
-		&ppu_module_manager::cellDTSHDCOREdec,
-		&ppu_module_manager::cellDTSHDdec,
-		&ppu_module_manager::cellDTSLBRdec,
 		&ppu_module_manager::cellFiber,
 		&ppu_module_manager::cellFont,
 		&ppu_module_manager::cellFontFT,
@@ -240,16 +193,8 @@ static void ppu_initialize_modules(ppu_linkage_info* link, utils::serial* ar = n
 		&ppu_module_manager::cellJpgEnc,
 		&ppu_module_manager::cellKey2char,
 		&ppu_module_manager::cellL10n,
-		&ppu_module_manager::cell_libac3dec,
 		&ppu_module_manager::cellLibprof,
-		&ppu_module_manager::cellM2AACdec,
-		&ppu_module_manager::cellM2BCdec,
-		&ppu_module_manager::cellM4AacDec,
-		&ppu_module_manager::cellM4AacDec2ch,
-		&ppu_module_manager::cellM4AacDec2chmod,
 		&ppu_module_manager::cellMic,
-		&ppu_module_manager::cellMP3dec,
-		&ppu_module_manager::cellMP3Sdec,
 		&ppu_module_manager::cellMusic,
 		&ppu_module_manager::cellMusicDecode,
 		&ppu_module_manager::cellMusicExport,
@@ -293,7 +238,6 @@ static void ppu_initialize_modules(ppu_linkage_info* link, utils::serial* ar = n
 		&ppu_module_manager::cellSysutilAvcExt,
 		&ppu_module_manager::cellSysutilNpEula,
 		&ppu_module_manager::cellSysutilMisc,
-		&ppu_module_manager::cellTRHDdec,
 		&ppu_module_manager::cellUsbd,
 		&ppu_module_manager::cellUsbPspcm,
 		&ppu_module_manager::cellUserInfo,
@@ -303,9 +247,6 @@ static void ppu_initialize_modules(ppu_linkage_info* link, utils::serial* ar = n
 		&ppu_module_manager::cellVideoUpload,
 		&ppu_module_manager::cellVoice,
 		&ppu_module_manager::cellVpost,
-		&ppu_module_manager::cellWMAdec,
-		&ppu_module_manager::cellWMALSLdec,
-		&ppu_module_manager::cellWMAPROdec,
 		&ppu_module_manager::libad_async,
 		&ppu_module_manager::libad_core,
 		&ppu_module_manager::libfs_utility_init,
@@ -318,7 +259,6 @@ static void ppu_initialize_modules(ppu_linkage_info* link, utils::serial* ar = n
 		&ppu_module_manager::sceNpClans,
 		&ppu_module_manager::sceNpCommerce2,
 		&ppu_module_manager::sceNpMatchingInt,
-		&ppu_module_manager::sceNpPlus,
 		&ppu_module_manager::sceNpSns,
 		&ppu_module_manager::sceNpTrophy,
 		&ppu_module_manager::sceNpTus,
@@ -330,19 +270,15 @@ static void ppu_initialize_modules(ppu_linkage_info* link, utils::serial* ar = n
 		&ppu_module_manager::sys_libc,
 		&ppu_module_manager::sys_lv2dbg,
 		&ppu_module_manager::static_hle,
-		&ppu_module_manager::hle_patches,
 	};
 
 	// Initialize double-purpose fake OPD array for HLE functions
-	const auto& hle_funcs = ppu_function_manager::get(g_cfg.core.ppu_decoder != ppu_decoder_type::_static);
+	const auto& hle_funcs = ppu_function_manager::get(g_cfg.core.ppu_decoder == ppu_decoder_type::llvm);
 
 	u32& hle_funcs_addr = g_fxo->get<ppu_function_manager>().addr;
 
 	// Allocate memory for the array (must be called after fixed allocations)
-	if (!hle_funcs_addr)
-		hle_funcs_addr = vm::alloc(::size32(hle_funcs) * 8, vm::main);
-	else
-		vm::page_protect(hle_funcs_addr, utils::align(::size32(hle_funcs) * 8, 0x1000), 0, vm::page_writable);
+	hle_funcs_addr = vm::alloc(::size32(hle_funcs) * 8, vm::main);
 
 	// Initialize as PPU executable code
 	ppu_register_range(hle_funcs_addr, ::size32(hle_funcs) * 8);
@@ -376,82 +312,9 @@ static void ppu_initialize_modules(ppu_linkage_info* link, utils::serial* ar = n
 	u32 alloc_addr = 0;
 
 	// "Use" all the modules for correct linkage
-	if (ppu_loader.trace)
+	for (auto& _module : registered)
 	{
-		for (auto& _module : registered)
-		{
-			ppu_loader.trace("Registered static module: %s", _module->name);
-		}
-	}
-
-	struct hle_vars_save
-	{
-		hle_vars_save() = default;
-
-		hle_vars_save(const hle_vars_save&) = delete;
-
-		hle_vars_save& operator =(const hle_vars_save&) = delete;
-
-		hle_vars_save(utils::serial& ar)
-		{
-			auto& manager = ppu_module_manager::get();
-
-			while (true)
-			{
-				const std::string name = ar.pop<std::string>();
-
-				if (name.empty())
-				{
-					// Null termination
-					break;
-				}
-
-				const auto _module = ::at32(manager, name);
-
-				auto& variable = _module->variables;
-
-				for (usz i = 0, end = ar.pop<usz>(); i < end; i++)
-				{
-					auto* ptr = &::at32(variable, ar.pop<u32>());
-					ptr->addr = ar.pop<u32>();
-					ensure(!!ptr->var);
-				}
-			}
-		}
-
-		void save(utils::serial& ar)
-		{
-			for (auto& pair : ppu_module_manager::get())
-			{
-				const auto _module = pair.second;
-
-				if (_module->variables.empty())
-				{
-					continue;
-				}
-
-				ar(_module->name);
-
-				ar(_module->variables.size());
-
-				for (auto& variable : _module->variables)
-				{
-					ar(variable.first, variable.second.addr);
-				}
-			}
-
-			// Null terminator
-			ar(std::string{});
-		}
-	};
-
-	if (ar)
-	{
-		ensure(g_fxo->init<hle_vars_save>(*ar));
-	}
-	else
-	{
-		ensure(g_fxo->init<hle_vars_save>());
+		ppu_loader.trace("Registered static module: %s", _module->name);
 	}
 
 	for (auto& pair : ppu_module_manager::get())
@@ -468,11 +331,14 @@ static void ppu_initialize_modules(ppu_linkage_info* link, utils::serial* ar = n
 				g_ppu_function_names[function.second.index] = fmt::format("%s:%s", function.second.name, _module->name);
 			}
 
-			auto& flink = linkage.functions[function.first];
+			if ((function.second.flags & MFF_HIDDEN) == 0)
+			{
+				auto& flink = linkage.functions[function.first];
 
-			flink.static_func = &function.second;
-			flink.export_addr = g_fxo->get<ppu_function_manager>().func_addr(function.second.index);
-			function.second.export_addr = &flink.export_addr;
+				flink.static_func = &function.second;
+				flink.export_addr = g_fxo->get<ppu_function_manager>().func_addr(function.second.index);
+				function.second.export_addr = &flink.export_addr;
+			}
 		}
 
 		for (auto& variable : _module->variables)
@@ -480,11 +346,7 @@ static void ppu_initialize_modules(ppu_linkage_info* link, utils::serial* ar = n
 			ppu_loader.trace("** &0x%08X: %s (size=0x%x, align=0x%x)", variable.first, variable.second.name, variable.second.size, variable.second.align);
 
 			// Allocate HLE variable
-			if (ar)
-			{
-				// Already loaded
-			}
-			else if (variable.second.size >= 0x10000 || variable.second.align >= 0x10000)
+			if (variable.second.size >= 0x10000 || variable.second.align >= 0x10000)
 			{
 				variable.second.addr = vm::alloc(variable.second.size, vm::main, std::max<u32>(variable.second.align, 0x10000));
 			}
@@ -530,21 +392,8 @@ static void ppu_initialize_modules(ppu_linkage_info* link, utils::serial* ar = n
 // For the debugger (g_ppu_function_names shouldn't change, string_view should suffice)
 extern const std::unordered_map<u32, std::string_view>& get_exported_function_names_as_addr_indexed_map()
 {
-	struct info_t
-	{
-		std::unordered_map<u32, std::string_view> res;
-		u64 update_time = 0;
-	};
-
-	static thread_local std::unique_ptr<info_t> info;
-
-	if (!info)
-	{
-		info = std::make_unique<info_t>();
-		info->res.reserve(ppu_module_manager::get().size());
-	}
-
-	auto& [res, update_time] = *info;
+	static std::unordered_map<u32, std::string_view> res;
+	static u64 update_time = 0;
 
 	const auto link = g_fxo->try_get<ppu_linkage_info>();
 	const auto hle_funcs = g_fxo->try_get<ppu_function_manager>();
@@ -566,6 +415,7 @@ extern const std::unordered_map<u32, std::string_view>& get_exported_function_na
 	update_time = current_time;
 
 	res.clear();
+	res.reserve(ppu_module_manager::get().size());
 
 	for (auto& pair : ppu_module_manager::get())
 	{
@@ -593,7 +443,7 @@ extern const std::unordered_map<u32, std::string_view>& get_exported_function_na
 }
 
 // Resolve relocations for variable/function linkage.
-static void ppu_patch_refs(const ppu_module<lv2_obj>& _module, std::vector<ppu_reloc>* out_relocs, u32 fref, u32 faddr)
+static void ppu_patch_refs(std::vector<ppu_reloc>* out_relocs, u32 fref, u32 faddr)
 {
 	struct ref_t
 	{
@@ -602,7 +452,7 @@ static void ppu_patch_refs(const ppu_module<lv2_obj>& _module, std::vector<ppu_r
 		be_t<u32> addend; // Note: Treating it as addend seems to be correct for now, but still unknown if theres more in this variable
 	};
 
-	for (const ref_t* ref = &_module.get_ref<ref_t>(fref); ref->type; fref += sizeof(ref_t), ref = &_module.get_ref<ref_t>(fref))
+	for (auto ref = vm::ptr<ref_t>::make(fref); ref->type; ref++)
 	{
 		if (ref->addend) ppu_loader.warning("**** REF(%u): Addend value(0x%x, 0x%x)", ref->type, ref->addr, ref->addend);
 
@@ -625,28 +475,28 @@ static void ppu_patch_refs(const ppu_module<lv2_obj>& _module, std::vector<ppu_r
 		{
 		case 1:
 		{
-			const u32 value = _module.get_ref<u32>(ref->addr) = rdata;
+			const u32 value = vm::_ref<u32>(ref->addr) = rdata;
 			ppu_loader.trace("**** REF(1): 0x%x <- 0x%x", ref->addr, value);
 			break;
 		}
 
 		case 4:
 		{
-			const u16 value = _module.get_ref<u16>(ref->addr) = static_cast<u16>(rdata);
+			const u16 value = vm::_ref<u16>(ref->addr) = static_cast<u16>(rdata);
 			ppu_loader.trace("**** REF(4): 0x%x <- 0x%04x (0x%llx)", ref->addr, value, faddr);
 			break;
 		}
 
 		case 6:
 		{
-			const u16 value = _module.get_ref<u16>(ref->addr) = static_cast<u16>(rdata >> 16) + (rdata & 0x8000 ? 1 : 0);
+			const u16 value = vm::_ref<u16>(ref->addr) = static_cast<u16>(rdata >> 16) + (rdata & 0x8000 ? 1 : 0);
 			ppu_loader.trace("**** REF(6): 0x%x <- 0x%04x (0x%llx)", ref->addr, value, faddr);
 			break;
 		}
 
 		case 57:
 		{
-			const u16 value = _module.get_ref<ppu_bf_t<be_t<u16>, 0, 14>>(ref->addr) = static_cast<u16>(rdata) >> 2;
+			const u16 value = vm::_ref<ppu_bf_t<be_t<u16>, 0, 14>>(ref->addr) = static_cast<u16>(rdata) >> 2;
 			ppu_loader.trace("**** REF(57): 0x%x <- 0x%04x (0x%llx)", ref->addr, value, faddr);
 			break;
 		}
@@ -656,12 +506,6 @@ static void ppu_patch_refs(const ppu_module<lv2_obj>& _module, std::vector<ppu_r
 	}
 }
 
-enum PRX_EXPORT_ATTRIBUTES : u16
-{
-	PRX_EXPORT_LIBRARY_FLAG = 1,
-	PRX_EXPORT_PRX_MANAGEMENT_FUNCTIONS_FLAG = 0x8000,
-};
-
 // Export or import module struct
 struct ppu_prx_module_info
 {
@@ -684,83 +528,26 @@ struct ppu_prx_module_info
 	be_t<u32> unk5;
 };
 
-bool ppu_form_branch_to_code(u32 entry, u32 target);
-
-extern u32 ppu_get_exported_func_addr(u32 fnid, const std::string& module_name)
-{
-	return g_fxo->get<ppu_linkage_info>().modules[module_name].functions[fnid].export_addr;
-}
-
-extern bool ppu_register_library_lock(std::string_view libname, bool lock_lib)
-{
-	auto link = g_fxo->try_get<ppu_linkage_info>();
-
-	if (!link || libname.empty())
-	{
-		return false;
-	}
-
-	reader_lock lock(link->lib_lock_mutex);
-
-	if (auto it = link->lib_lock.find(libname); it != link->lib_lock.cend())
-	{
-		return lock_lib ? !it->second.test_and_set() : it->second.test_and_reset();
-	}
-
-	if (!lock_lib)
-	{
-		// If lock hasn't been installed it wasn't locked in the first place
-		return false;
-	}
-
-	lock.upgrade();
-
-	auto& lib_lock = link->lib_lock.emplace(std::string{libname}, false).first->second;
-
-	return !lib_lock.test_and_set();
-}
-
 // Load and register exports; return special exports found (nameless module)
-static auto ppu_load_exports(const ppu_module<lv2_obj>& _module, ppu_linkage_info* link, u32 exports_start, u32 exports_end, bool for_observing_callbacks = false, std::vector<u32>* funcs = nullptr, std::basic_string<char>* loaded_flags = nullptr)
+static auto ppu_load_exports(ppu_linkage_info* link, u32 exports_start, u32 exports_end)
 {
 	std::unordered_map<u32, u32> result;
 
-	// Flags were already provided meaning it's an unload operation
-	const bool unload_exports = loaded_flags && !loaded_flags->empty();
-
-	std::lock_guard lock(link->mutex);
-
-	usz unload_index = 0;
-	ppu_prx_module_info lib{};
-
-	for (u32 addr = exports_start; addr < exports_end; unload_index++, addr += lib.size ? lib.size : sizeof(ppu_prx_module_info))
+	for (u32 addr = exports_start; addr < exports_end;)
 	{
-		std::memcpy(&lib, &_module.get_ref<ppu_prx_module_info>(addr), sizeof(lib));
+		const auto& lib = vm::_ref<const ppu_prx_module_info>(addr);
 
-		const bool is_library = !!(lib.attributes & PRX_EXPORT_LIBRARY_FLAG);
-		const bool is_management = !is_library && !!(lib.attributes & PRX_EXPORT_PRX_MANAGEMENT_FUNCTIONS_FLAG);
-
-		if (loaded_flags && !unload_exports)
-		{
-			loaded_flags->push_back(false);
-		}
-
-		if (is_management)
+		if (!lib.name)
 		{
 			// Set special exports
 			for (u32 i = 0, end = lib.num_func + lib.num_var; i < end; i++)
 			{
-				const u32 nid = _module.get_ref<u32>(lib.nids, i);
-				const u32 addr = _module.get_ref<u32>(lib.addrs, i);
-
-				if (funcs)
-				{
-					funcs->emplace_back(addr);
-				}
+				const u32 nid = lib.nids[i];
+				const u32 addr = lib.addrs[i];
 
 				if (i < lib.num_func)
 				{
-					ppu_loader.notice("** Special: [%s] at 0x%x [0x%x, 0x%x]", ppu_get_function_name({}, nid), addr, _module.get_ref<u32>(addr), _module.get_ref<u32>(addr + 4));
+					ppu_loader.notice("** Special: [%s] at 0x%x [0x%x, 0x%x]", ppu_get_function_name({}, nid), addr, vm::_ref<u32>(addr), vm::_ref<u32>(addr + 4));
 				}
 				else
 				{
@@ -770,45 +557,17 @@ static auto ppu_load_exports(const ppu_module<lv2_obj>& _module, ppu_linkage_inf
 				result.emplace(nid, addr);
 			}
 
+			addr += lib.size ? lib.size : sizeof(ppu_prx_module_info);
 			continue;
 		}
 
-		if (!is_library)
-		{
-			// Skipped if none of the flags is set
-			continue;
-		}
+		const std::string module_name(lib.name.get_ptr());
 
-		const std::string module_name(&_module.get_ref<const char>(lib.name));
-
-		if (unload_exports)
-		{
-			if (::at32(*loaded_flags, unload_index))
-			{
-				ppu_register_library_lock(module_name, false);
-			}
-
-			continue;
-		}
-
-		ppu_loader.notice("** Exported module '%s' (vnids=0x%x, vstubs=0x%x, fnids=0x%x, faddrs=0x%x, version=0x%x, attributes=0x%x, unk4=0x%x, unk5=0x%x)", module_name, lib.vnids, lib.vstubs, lib.nids, lib.addrs, lib.version, lib.attributes, lib.unk4, lib.unk5);
+		ppu_loader.notice("** Exported module '%s' (0x%x, 0x%x, 0x%x, 0x%x)", module_name, lib.vnids, lib.vstubs, lib.unk4, lib.unk5);
 
 		if (lib.num_tlsvar)
 		{
-			ppu_loader.error("Unexpected num_tlsvar (%u)!", lib.num_tlsvar);
-		}
-
-		const bool should_load = for_observing_callbacks || ppu_register_library_lock(module_name, true);
-
-		if (loaded_flags)
-		{
-			loaded_flags->back() = should_load;
-		}
-
-		if (!should_load)
-		{
-			ppu_loader.notice("** Skipped module '%s' (already loaded)", module_name);
-			continue;
+			ppu_loader.fatal("Unexpected num_tlsvar (%u)!", lib.num_tlsvar);
 		}
 
 		// Static module
@@ -820,46 +579,12 @@ static auto ppu_load_exports(const ppu_module<lv2_obj>& _module, ppu_linkage_inf
 		const auto fnids = +lib.nids;
 		const auto faddrs = +lib.addrs;
 
-		u64 previous_rtoc = umax;
-
 		// Get functions
 		for (u32 i = 0, end = lib.num_func; i < end; i++)
 		{
-			const u32 fnid = _module.get_ref<u32>(fnids, i);
-			const u32 faddr = _module.get_ref<u32>(faddrs, i);
-
-			if (ppu_func_opd_t* fptr = _module.get_ptr<ppu_func_opd_t>(faddr), fdata = fptr ? *fptr : ppu_func_opd_t{};
-				fdata.addr % 4 == 0u && _module.get_ptr<u32>(fdata.addr))
-			{
-				if (previous_rtoc == fdata.rtoc)
-				{
-					// Shortened printing, replacement string is 10 characters as 0x%08x
-					ppu_loader.notice("**** %s export: (0x%08x) at 0x%07x [at:0x%07x, rtoc:same-above]:  %s", module_name, fnid, faddr, fdata.addr, ppu_get_function_name(module_name, fnid));
-				}
-				else
-				{
-					previous_rtoc = fdata.rtoc;
-					ppu_loader.notice("**** %s export: (0x%08x) at 0x%07x [at:0x%07x, rtoc:0x%08x]:  %s", module_name, fnid, faddr, fdata.addr, fdata.rtoc, ppu_get_function_name(module_name, fnid));
-				}
-			}
-			else if (fptr)
-			{
-				ppu_loader.error("**** %s export: (0x%08x) at 0x%07x [Invalid Function Address: 0x%07x!]: '%s'", module_name, fnid, faddr, fdata.addr, ppu_get_function_name(module_name, fnid));
-			}
-			else
-			{
-				ppu_loader.warning("**** %s export: (0x%08x) at 0x%07x [Illegal Descriptor Address!]: '%s'", module_name, fnid, faddr, ppu_get_function_name(module_name, fnid));
-			}
-
-			if (funcs)
-			{
-				funcs->emplace_back(faddr);
-			}
-
-			if (for_observing_callbacks)
-			{
-				continue;
-			}
+			const u32 fnid = fnids[i];
+			const u32 faddr = faddrs[i];
+			ppu_loader.notice("**** %s export: [%s] (0x%08x) at 0x%x", module_name, ppu_get_function_name(module_name, fnid), fnid, faddr);
 
 			// Function linkage info
 			auto& flink = mlink.functions[fnid];
@@ -871,24 +596,35 @@ static auto ppu_load_exports(const ppu_module<lv2_obj>& _module, ppu_linkage_inf
 
 			if (flink.export_addr)
 			{
-				ppu_loader.notice("Already linked function '%s' in module '%s'", ppu_get_function_name(module_name, fnid), module_name);
+				ppu_loader.error("Already linked function '%s' in module '%s'", ppu_get_function_name(module_name, fnid), module_name);
 			}
 			//else
 			{
 				// Static function
-				const auto _sf = _sm && _sm->functions.count(fnid) ? &::at32(_sm->functions, fnid) : nullptr;
+				const auto _sf = _sm && _sm->functions.count(fnid) ? &_sm->functions.at(fnid) : nullptr;
 
 				if (_sf && (_sf->flags & MFF_FORCED_HLE))
 				{
 					// Inject a branch to the HLE implementation
-					const u32 target = g_fxo->get<ppu_function_manager>().func_addr(_sf->index, true);
+					const u32 _entry = vm::read32(faddr);
+					const u32 target = g_fxo->get<ppu_function_manager>().func_addr(_sf->index) + 4;
 
 					// Set exported function
 					flink.export_addr = target - 4;
 
-					if (auto ptr = _module.get_ptr<u32>(faddr); vm::try_get_addr(ptr).first)
+					if ((target <= _entry && _entry - target <= 0x2000000) || (target > _entry && target - _entry < 0x2000000))
 					{
-						ppu_form_branch_to_code(*ptr, target);
+						// Use relative branch
+						vm::write32(_entry, ppu_instructions::B(target - _entry));
+					}
+					else if (target < 0x2000000)
+					{
+						// Use absolute branch if possible
+						vm::write32(_entry, ppu_instructions::B(target, true));
+					}
+					else
+					{
+						ppu_loader.fatal("Failed to patch function at 0x%x (0x%x)", _entry, target);
 					}
 				}
 				else
@@ -899,13 +635,13 @@ static auto ppu_load_exports(const ppu_module<lv2_obj>& _module, ppu_linkage_inf
 					// Fix imports
 					for (const u32 addr : flink.imports)
 					{
-						_module.get_ref<u32>(addr) = faddr;
+						vm::write32(addr, faddr);
 						//ppu_loader.warning("Exported function '%s' in module '%s'", ppu_get_function_name(module_name, fnid), module_name);
 					}
 
 					for (const u32 fref : flink.frefss)
 					{
-						ppu_patch_refs(_module, nullptr, fref, faddr);
+						ppu_patch_refs(nullptr, fref, faddr);
 					}
 				}
 			}
@@ -917,15 +653,10 @@ static auto ppu_load_exports(const ppu_module<lv2_obj>& _module, ppu_linkage_inf
 		// Get variables
 		for (u32 i = 0, end = lib.num_var; i < end; i++)
 		{
-			const u32 vnid = _module.get_ref<u32>(vnids, i);
-			const u32 vaddr = _module.get_ref<u32>(vaddrs, i);
+			const u32 vnid = vnids[i];
+			const u32 vaddr = vaddrs[i];
 			ppu_loader.notice("**** %s export: &[%s] at 0x%x", module_name, ppu_get_variable_name(module_name, vnid), vaddr);
 
-			if (for_observing_callbacks)
-			{
-				continue;
-			}
-
 			// Variable linkage info
 			auto& vlink = mlink.variables[vnid];
 
@@ -946,36 +677,33 @@ static auto ppu_load_exports(const ppu_module<lv2_obj>& _module, ppu_linkage_inf
 				// Fix imports
 				for (const auto vref : vlink.imports)
 				{
-					ppu_patch_refs(_module, nullptr, vref, vaddr);
+					ppu_patch_refs(nullptr, vref, vaddr);
 					//ppu_loader.warning("Exported variable '%s' in module '%s'", ppu_get_variable_name(module_name, vnid), module_name);
 				}
 			}
 		}
+
+		addr += lib.size ? lib.size : sizeof(ppu_prx_module_info);
 	}
 
 	return result;
 }
 
-using import_result_t = std::pair<std::unordered_map<u32, void*>, std::unordered_map<u32, u32>>;
-
-static import_result_t ppu_load_imports(const ppu_module<lv2_obj>& _module, std::vector<ppu_reloc>& relocs, ppu_linkage_info* link, u32 imports_start, u32 imports_end)
+static auto ppu_load_imports(std::vector<ppu_reloc>& relocs, ppu_linkage_info* link, u32 imports_start, u32 imports_end)
 {
-	import_result_t result;
-	auto& [import_table, nid_to_use_addr] = result;
-
-	std::lock_guard lock(link->mutex);
+	std::unordered_map<u32, void*> result;
 
 	for (u32 addr = imports_start; addr < imports_end;)
 	{
-		const auto& lib = _module.get_ref<const ppu_prx_module_info>(addr);
+		const auto& lib = vm::_ref<const ppu_prx_module_info>(addr);
 
-		const std::string module_name(&_module.get_ref<const char>(lib.name));
+		const std::string module_name(lib.name.get_ptr());
 
 		ppu_loader.notice("** Imported module '%s' (ver=0x%x, attr=0x%x, 0x%x, 0x%x) [0x%x]", module_name, lib.version, lib.attributes, lib.unk4, lib.unk5, addr);
 
 		if (lib.num_tlsvar)
 		{
-			ppu_loader.error("Unexpected num_tlsvar (%u)!", lib.num_tlsvar);
+			ppu_loader.fatal("Unexpected num_tlsvar (%u)!", lib.num_tlsvar);
 		}
 
 		// Static module
@@ -989,37 +717,31 @@ static import_result_t ppu_load_imports(const ppu_module<lv2_obj>& _module, std:
 
 		for (u32 i = 0, end = lib.num_func; i < end; i++)
 		{
-			const u32 fnid = _module.get_ref<u32>(fnids, i);
-			const u32 fstub = _module.get_ref<u32>(faddrs, i);
+			const u32 fnid = fnids[i];
+			const u32 fstub = faddrs[i];
 			const u32 faddr = (faddrs + i).addr();
 			ppu_loader.notice("**** %s import: [%s] (0x%08x) -> 0x%x", module_name, ppu_get_function_name(module_name, fnid), fnid, fstub);
 
 			// Function linkage info
-			auto& flink = mlink.functions[fnid];
+			auto& flink = link->modules[module_name].functions[fnid];
 
 			// Add new import
-			import_table.emplace(faddr, &flink);
+			result.emplace(faddr, &flink);
 			flink.imports.emplace(faddr);
-
-			// Check address
-			// TODO: The address of use should be extracted from analyser instead
-			if (fstub && fstub >= _module.segs[0].addr && fstub <= _module.segs[0].addr + _module.segs[0].size)
-			{
-				nid_to_use_addr.emplace(fnid, fstub);
-			}
+			mlink.imported = true;
 
 			// Link address (special HLE function by default)
 			const u32 link_addr = flink.export_addr ? flink.export_addr : g_fxo->get<ppu_function_manager>().addr;
 
 			// Write import table
-			_module.get_ref<u32>(faddr) = link_addr;
+			vm::write32(faddr, link_addr);
 
 			// Patch refs if necessary (0x2000 seems to be correct flag indicating the presence of additional info)
-			if (const u32 frefs = (lib.attributes & 0x2000) ? +_module.get_ref<u32>(fnids, i + lib.num_func) : 0)
+			if (const u32 frefs = (lib.attributes & 0x2000) ? +fnids[i + lib.num_func] : 0)
 			{
-				import_table.emplace(frefs, &flink);
+				result.emplace(frefs, &flink);
 				flink.frefss.emplace(frefs);
-				ppu_patch_refs(_module, &relocs, frefs, link_addr);
+				ppu_patch_refs(&relocs, frefs, link_addr);
 			}
 
 			//ppu_loader.warning("Imported function '%s' in module '%s' (0x%x)", ppu_get_function_name(module_name, fnid), module_name, faddr);
@@ -1030,19 +752,20 @@ static import_result_t ppu_load_imports(const ppu_module<lv2_obj>& _module, std:
 
 		for (u32 i = 0, end = lib.num_var; i < end; i++)
 		{
-			const u32 vnid = _module.get_ref<u32>(vnids, i);
-			const u32 vref = _module.get_ref<u32>(vstubs, i);
+			const u32 vnid = vnids[i];
+			const u32 vref = vstubs[i];
 			ppu_loader.notice("**** %s import: &[%s] (ref=*0x%x)", module_name, ppu_get_variable_name(module_name, vnid), vref);
 
 			// Variable linkage info
-			auto& vlink = mlink.variables[vnid];
+			auto& vlink = link->modules[module_name].variables[vnid];
 
 			// Add new import
-			import_table.emplace(vref, &vlink);
+			result.emplace(vref, &vlink);
 			vlink.imports.emplace(vref);
+			mlink.imported = true;
 
 			// Link if available
-			ppu_patch_refs(_module, &relocs, vref, vlink.export_addr);
+			ppu_patch_refs(&relocs, vref, vlink.export_addr);
 
 			//ppu_loader.warning("Imported variable '%s' in module '%s' (0x%x)", ppu_get_variable_name(module_name, vnid), module_name, vlink.first);
 		}
@@ -1054,314 +777,25 @@ static import_result_t ppu_load_imports(const ppu_module<lv2_obj>& _module, std:
 }
 
 // For _sys_prx_register_module
-void ppu_manual_load_imports_exports(u32 imports_start, u32 imports_size, u32 exports_start, u32 exports_size, std::basic_string<char>& loaded_flags)
+void ppu_manual_load_imports_exports(u32 imports_start, u32 imports_size, u32 exports_start, u32 exports_size)
 {
-	auto& _main = g_fxo->get<main_ppu_module<lv2_obj>>();
+	auto& _main = g_fxo->get<ppu_module>();
 	auto& link = g_fxo->get<ppu_linkage_info>();
 
-	ppu_module<lv2_obj> vm_all_fake_module{};
-	vm_all_fake_module.segs.emplace_back(ppu_segment{0x10000, 0 - 0x10000u, 1 /*LOAD*/, 0, 0 - 0x1000u, vm::base(0x10000)});
-	vm_all_fake_module.addr_to_seg_index.emplace(0x10000, 0);
-
-	ppu_load_exports(vm_all_fake_module, &link, exports_start, exports_start + exports_size, false, nullptr, &loaded_flags);
-
-	if (!imports_size)
-	{
-		return;
-	}
-
-	ppu_load_imports(vm_all_fake_module, _main.relocs, &link, imports_start, imports_start + imports_size);
+	ppu_load_exports(&link, exports_start, exports_start + exports_size);
+	ppu_load_imports(_main.relocs, &link, imports_start, imports_start + imports_size);
 }
 
-// For savestates
-extern bool is_memory_compatible_for_copy_from_executable_optimization(u32 addr, u32 size)
+static void ppu_check_patch_spu_images(const ppu_segment& seg)
 {
-	if (g_cfg.savestate.state_inspection_mode)
+	const std::string_view seg_view{vm::get_super_ptr<char>(seg.addr), seg.size};
+
+	for (usz i = seg_view.find("\177ELF"); i < seg.size; i = seg_view.find("\177ELF", i + 4))
 	{
-		return false;
-	}
-
-	static ppu_exec_object s_ppu_exec;
-	static std::vector<char> zeroes;
-
-	if (!addr)
-	{
-		// A call for cleanup
-		s_ppu_exec.clear();
-		zeroes = {};
-		return false;
-	}
-
-	if (s_ppu_exec != elf_error::ok)
-	{
-		if (s_ppu_exec != elf_error::stream)
-		{
-			// Failed before
-			return false;
-		}
-
-		s_ppu_exec.open(decrypt_self(fs::file(Emu.GetBoot()), Emu.klic.empty() ? nullptr : reinterpret_cast<u8*>(&Emu.klic[0])));
-
-		if (s_ppu_exec != elf_error::ok)
-		{
-			return false;
-		}
-	}
-
-	for (const auto& prog : s_ppu_exec.progs)
-	{
-		const u32 vaddr = static_cast<u32>(prog.p_vaddr);
-		const u32 seg_size = static_cast<u32>(prog.p_filesz);
-		const u32 aligned_vaddr = vaddr & -0x10000;
-		const u32 vaddr_offs = vaddr & 0xffff;
-
-		// Check if the address is a start of segment within the executable
-		if (prog.p_type == 0x1u /* LOAD */ && seg_size && aligned_vaddr == addr && prog.p_vaddr == prog.p_paddr && vaddr_offs + seg_size <= size)
-		{
-			zeroes.resize(std::max<usz>({zeroes.size(), usz{addr + size - (vaddr + seg_size)}, usz{vaddr_offs}}));
-
-			// Check if gaps between segment and allocation bounds are still zeroes-only
-			if (!std::memcmp(vm::_ptr<char>(aligned_vaddr), zeroes.data(), vaddr_offs) &&
-				!std::memcmp(vm::_ptr<char>(vaddr + seg_size), zeroes.data(), (addr + size - (vaddr + seg_size))))
-			{
-				// Test memory equality
-				return !std::memcmp(prog.bin.data(), vm::base(vaddr), seg_size);
-			}
-		}
-	}
-
-	return false;
-}
-
-void init_ppu_functions(utils::serial* ar, bool full = false)
-{
-	g_fxo->need<ppu_linkage_info>();
-
-	if (ar)
-	{
-		const u32 addr = ensure(g_fxo->init<ppu_function_manager>(*ar))->addr;
-
-		if (addr % 0x1000 || !vm::check_addr(addr))
-		{
-			fmt::throw_exception("init_ppu_functions(): Failure to initialize function manager. (addr=0x%x, %s)", addr, *ar);
-		}
-	}
-	else
-		g_fxo->init<ppu_function_manager>();
-
-	if (full)
-	{
-		// Initialize HLE modules
-		ppu_initialize_modules(&g_fxo->get<ppu_linkage_info>(), ar);
-	}
-}
-
-static void ppu_check_patch_spu_images(const ppu_module<lv2_obj>& mod, const ppu_segment& seg)
-{
-	if (!seg.size)
-	{
-		return;
-	}
-
-	const bool is_firmware = mod.path.starts_with(vfs::get("/dev_flash/"));
-
-	const auto _main = g_fxo->try_get<main_ppu_module<lv2_obj>>();
-
-	const std::string_view seg_view{ensure(mod.get_ptr<char>(seg.addr)), seg.size};
-
-	auto find_first_of_multiple = [](std::string_view data, std::initializer_list<std::string_view> values, usz index)
-	{
-		u32 pos = umax;
-
-		ensure(data.size() <= pos && index <= data.size());
-
-		for (std::string_view value : values)
-		{
-			if (usz pos0 = data.substr(index, pos - index).find(value); pos0 != umax && pos0 + index < pos)
-			{
-				pos = static_cast<u32>(pos0 + index);
-			}
-		}
-
-		return pos;
-	};
-
-	extern void utilize_spu_data_segment(u32 vaddr, const void* ls_data_vaddr, u32 size);
-
-	// Search for [stqd lr,0x10(sp)] instruction or ELF file signature, whichever comes first
-	const std::initializer_list<std::string_view> prefixes = {"\177ELF"sv, "\x24\0\x40\x80"sv};
-
-	u32 prev_bound = 0;
-
-	for (u32 prefix_addr = find_first_of_multiple(seg_view, prefixes, 0); prefix_addr < seg.size; prefix_addr = find_first_of_multiple(seg_view, prefixes, prefix_addr + 4))
-	{
-		const auto elf_header = ensure(mod.get_ptr<u8>(seg.addr + prefix_addr));
-
-		if (std::memcmp(elf_header, "\x24\0\x40\x80", 4) == 0)
-		{
-			const u32 old_prefix_addr = prefix_addr;
-
-			auto search_guid_pattern = [&](u32 index, std::string_view data_span, s32 advance_index, u32 lower_bound, u32 uppper_bound) -> u32
-			{
-				for (u32 search = index & -16, tries = 16 * 64; tries && search >= lower_bound && search < uppper_bound; tries = tries - 1, search = advance_index < 0 ? utils::sub_saturate<u32>(search, 0 - advance_index) : search + advance_index)
-				{
-					if (seg_view[search] != 0x42 && seg_view[search] != 0x43)
-					{
-						continue;
-					}
-
-					const u32 inst1 = read_from_ptr<be_t<u32>>(data_span, search);
-					const u32 inst2 = read_from_ptr<be_t<u32>>(data_span, search + 4);
-					const u32 inst3 = read_from_ptr<be_t<u32>>(data_span, search + 8);
-					const u32 inst4 = read_from_ptr<be_t<u32>>(data_span, search + 12);
-
-					if ((inst1 & 0xfe'00'00'7f) != 0x42000002 || (inst2 & 0xfe'00'00'7f) != 0x42000002 || (inst3 & 0xfe'00'00'7f) != 0x42000002 || (inst4 & 0xfe'00'00'7f) != 0x42000002)
-					{
-						continue;
-					}
-
-					if (!spu_thread::is_exec_code(search, {reinterpret_cast<const u8*>(data_span.data()), data_span.size()}, 0, true, true))
-					{
-						continue;
-					}
-
-					return search;
-				}
-
-				return umax;
-			};
-
-			prefix_addr = search_guid_pattern(prefix_addr, seg_view, -16, prev_bound, seg.size);
-
-			if (prefix_addr == umax)
-			{
-				prefix_addr = old_prefix_addr;
-				continue;
-			}
-
-			u32 guid_start = seg.addr + prefix_addr, guid_end = umax;
-
-			std::string_view ls_segment = seg_view.substr(prefix_addr);
-
-			// Bound to a bit less than LS size
-			ls_segment = ls_segment.substr(0, SPU_LS_SIZE - 0x8000);
-
-			for (u32 addr_last = 0, valid_count = 0, invalid_count = 0;;)
-			{
-				const u32 instruction = std::min<u32>(search_guid_pattern(addr_last, ls_segment, +16, 0, ::size32(ls_segment)), find_first_of_multiple(ls_segment, prefixes, addr_last));
-
-				if (instruction != umax && std::memcmp(ls_segment.data() + instruction, "\x24\0\x40\x80", 4) == 0)
-				{
-					if (instruction % 4 != prefix_addr % 4)
-					{
-						// Unaligned, continue
-						addr_last = instruction + (prefix_addr % 4 - instruction % 4) % 4;
-						continue;
-					}
-
-					// Check execution compatibility
-					if (spu_thread::is_exec_code(instruction, {reinterpret_cast<const u8*>(ls_segment.data()), ls_segment.size()}, 0, true, true))
-					{
-						addr_last = instruction + 4;
-						valid_count++;
-						invalid_count = 0;
-						continue;
-					}
-
-					if (invalid_count == 0)
-					{
-						// Allow a single case of invalid data
-						addr_last = instruction + 4;
-						invalid_count++;
-						continue;
-					}
-
-					addr_last = instruction;
-				}
-
-				if (addr_last >= 0x80 && valid_count >= 2)
-				{
-					u32 end = std::min<u32>({instruction, seg.size - prefix_addr, utils::align<u32>(addr_last + 256, 128)});
-
-					u32 guessed_ls_addr = 0;
-
-					// Try to guess LS address by observing the pattern for disable/enable interrupts
-					// ILA R2, PC + 8
-					// BIE/BID R2
-
-					for (u32 found = 0, last_vaddr = 0, it = 16; it < end - 16; it += 4)
-					{
-						const u32 inst1 = read_from_ptr<be_t<u32>>(ls_segment, it);
-						const u32 inst2 = read_from_ptr<be_t<u32>>(ls_segment, it + 4);
-						const u32 inst3 = read_from_ptr<be_t<u32>>(ls_segment, it + 8);
-						const u32 inst4 = read_from_ptr<be_t<u32>>(ls_segment, it + 12);
-
-						if ((inst1 & 0xfe'00'00'7f) == 0x42000002 && (inst2 & 0xfe'00'00'7f) == 0x42000002 && (inst3 & 0xfe'00'00'7f) == 0x42000002 && (inst4 & 0xfe'00'00'7f) == 0x42000002)
-						{
-							// SPURS GUID pattern
-							end = it;
-							guid_end = end + seg.addr;
-							break;
-						}
-
-						if ((inst1 >> 7) % 4 == 0 && (inst1 & 0xfe'00'00'7f) == 0x42000002 && (inst2 == 0x35040100 || inst2 == 0x35080100))
-						{
-							const u32 addr_inst = (inst1 >> 7) % 0x40000;
-
-							if (u32 addr_seg = addr_inst - std::min<u32>(it + 8, addr_inst))
-							{
-								if (last_vaddr != addr_seg)
-								{
-									guessed_ls_addr = 0;
-									found = 0;
-								}
-
-								found++;
-								last_vaddr = addr_seg;
-
-								if (found >= 2)
-								{
-									// Good segment address
-									guessed_ls_addr = last_vaddr;
-									ppu_log.notice("Found IENABLE/IDSIABLE Pattern at 0x%05x", it + seg.addr);
-								}
-							}
-						}
-					}
-
-					if (guessed_ls_addr)
-					{
-						end = prefix_addr + std::min<u32>(end, SPU_LS_SIZE - guessed_ls_addr);
-					}
-					else
-					{
-						end = prefix_addr + std::min<u32>(end, SPU_LS_SIZE);
-					}
-
-					ppu_log.success("Found valid roaming SPU code at 0x%x..0x%x (guessed_ls_addr=0x%x, GUID=0x%05x..0x%05x)", seg.addr + prefix_addr, seg.addr + end, guessed_ls_addr, guid_start, guid_end);
-
-					if (!is_firmware && _main == &mod)
-					{
-						// Siginify that the base address is unknown by passing 0
-						utilize_spu_data_segment(guessed_ls_addr ? guessed_ls_addr : 0x4000, seg_view.data() + prefix_addr, end - prefix_addr);
-					}
-
-					prefix_addr = std::max<u32>(end, prefix_addr + 4) - 4;
-					prev_bound = prefix_addr + 4;
-				}
-				else
-				{
-					prefix_addr = old_prefix_addr;
-				}
-
-				break;
-			}
-
-			continue;
-		}
+		const auto elf_header = vm::get_super_ptr<u8>(seg.addr + i);
 
 		// Try to load SPU image
-		const spu_exec_object obj(fs::file(elf_header, seg.size - prefix_addr));
+		const spu_exec_object obj(fs::file(elf_header, seg.size - i));
 
 		if (obj != elf_error::ok)
 		{
@@ -1373,7 +807,7 @@ static void ppu_check_patch_spu_images(const ppu_module<lv2_obj>& mod, const ppu
 		std::string name;
 		std::string dump;
 
-		std::vector<u32> applied;
+		std::basic_string<u32> applied;
 
 		// Executable hash
 		sha1_context sha2;
@@ -1391,13 +825,6 @@ static void ppu_check_patch_spu_images(const ppu_module<lv2_obj>& mod, const ppu
 
 			if (prog.p_type == 0x1u /* LOAD */ && prog.p_filesz > 0u)
 			{
-				if (prog.p_vaddr && !is_firmware && _main == &mod)
-				{
-					extern void utilize_spu_data_segment(u32 vaddr, const void* ls_data_vaddr, u32 size);
-
-					utilize_spu_data_segment(prog.p_vaddr, (elf_header + prog.p_offset), prog.p_filesz);
-				}
-
 				sha1_update(&sha2, (elf_header + prog.p_offset), prog.p_filesz);
 			}
 
@@ -1406,7 +833,7 @@ static void ppu_check_patch_spu_images(const ppu_module<lv2_obj>& mod, const ppu
 				sha1_update(&sha2, (elf_header + prog.p_offset), prog.p_filesz);
 
 				// We assume that the string SPUNAME exists 0x14 bytes into the NOTE segment
-				name = ensure(mod.get_ptr<const char>(seg.addr + prefix_addr + prog.p_offset + 0x14));
+				name = reinterpret_cast<char*>(elf_header + prog.p_offset + 0x14);
 
 				if (!name.empty())
 				{
@@ -1415,8 +842,6 @@ static void ppu_check_patch_spu_images(const ppu_module<lv2_obj>& mod, const ppu
 			}
 		}
 
-		fmt::append(dump, " (image addr: 0x%x, size: 0x%x)", seg.addr + prefix_addr, obj.highest_offset);
-
 		sha1_finish(&sha2, sha1_hash);
 
 		// Format patch name
@@ -1430,9 +855,9 @@ static void ppu_check_patch_spu_images(const ppu_module<lv2_obj>& mod, const ppu
 
 		if (g_cfg.core.spu_debug)
 		{
-			fs::file temp(fs::get_cache_dir() + "/spu_progs/" + vfs::escape(name.substr(name.find_last_of('/') + 1)) + '_' + hash.substr(4) + ".elf", fs::rewrite);
+			fs::pending_file temp(fs::get_cache_dir() + "/spu_progs/" + vfs::escape(name.substr(name.find_last_of('/') + 1)) + '_' + hash.substr(4) + ".elf");
 
-			if (!temp || !temp.write(obj.save()))
+			if (!temp.file || !(temp.file.write(obj.save()), temp.commit()))
 			{
 				ppu_loader.error("Failed to dump SPU program from PPU executable: name='%s', hash=%s", name, hash);
 			}
@@ -1441,18 +866,13 @@ static void ppu_check_patch_spu_images(const ppu_module<lv2_obj>& mod, const ppu
 		// Try to patch each segment, will only succeed if the address exists in SPU local storage
 		for (const auto& prog : obj.progs)
 		{
-			if (Emu.DeserialManager())
-			{
-				break;
-			}
-
 			// Apply the patch
-			g_fxo->get<patch_engine>().apply(applied, hash, [&](u32 addr, u32 /*size*/) { return addr + elf_header + prog.p_offset; }, prog.p_filesz, prog.p_vaddr);
+			applied += g_fxo->get<patch_engine>().apply(hash, (elf_header + prog.p_offset), prog.p_filesz, prog.p_vaddr);
 
 			if (!Emu.GetTitleID().empty())
 			{
 				// Alternative patch
-				g_fxo->get<patch_engine>().apply(applied, Emu.GetTitleID() + '-' + hash, [&](u32 addr, u32 /*size*/) { return addr + elf_header + prog.p_offset; }, prog.p_filesz, prog.p_vaddr);
+				applied += g_fxo->get<patch_engine>().apply(Emu.GetTitleID() + '-' + hash, (elf_header + prog.p_offset), prog.p_filesz, prog.p_vaddr);
 			}
 		}
 
@@ -1464,16 +884,13 @@ static void ppu_check_patch_spu_images(const ppu_module<lv2_obj>& mod, const ppu
 		{
 			ppu_loader.success("SPU executable hash: %s (<- %u)%s", hash, applied.size(), dump);
 		}
-
-		prefix_addr += ::narrow<u32>(obj.highest_offset - 4);
-		prev_bound = prefix_addr + 4;
 	}
 }
 
-void try_spawn_ppu_if_exclusive_program(const ppu_module<lv2_obj>& m)
+void try_spawn_ppu_if_exclusive_program(const ppu_module& m)
 {
 	// If only PRX/OVL has been loaded at Emu.BootGame(), launch a single PPU thread so its memory can be viewed
-	if (Emu.IsReady() && g_fxo->get<main_ppu_module<lv2_obj>>().segs.empty() && !Emu.DeserialManager())
+	if (Emu.IsReady() && g_fxo->get<ppu_module>().segs.empty())
 	{
 		ppu_thread_params p
 		{
@@ -1483,93 +900,22 @@ void try_spawn_ppu_if_exclusive_program(const ppu_module<lv2_obj>& m)
 
 		auto ppu = idm::make_ptr<named_thread<ppu_thread>>(p, "test_thread", 0);
 
-		ppu->cia = m.funcs.empty() ? m.secs[0].addr : m.funcs[0].addr;
+		ppu->cia = m.funcs[0].addr;
 
 		// For kernel explorer
 		g_fxo->init<lv2_memory_container>(4096);
 	}
 }
 
-struct prx_names_table
-{
-	shared_mutex mutex;
-	std::set<std::string, std::less<>> registered;
-	atomic_t<const char*> lut[0x1000'0000 / 0x1'0000]{};
-
-	SAVESTATE_INIT_POS(4.1); // Dependency on lv2_obj
-
-	prx_names_table() noexcept
-	{
-		idm::select<lv2_obj, lv2_prx>([this](u32, lv2_prx& prx)
-		{
-			install(prx.name, prx);
-		});
-	}
-
-	void install(std::string_view name, lv2_prx& prx)
-	{
-		if (name.empty())
-		{
-			return;
-		}
-
-		if (name.ends_with(".sprx"sv) && name.size() > (".sprx"sv).size())
-		{
-			name = name.substr(0, name.size() - (".sprx"sv).size());
-		}
-
-		std::lock_guard lock(mutex);
-
-		const auto ptr = registered.emplace(name).first->c_str();
-
-		for (auto& seg : prx.segs)
-		{
-			if (!seg.size)
-			{
-				continue;
-			}
-
-			// Doesn't support addresses above 256MB because it wastes memory and is very unlikely (if somehow does occur increase it)
-			const u32 max0 = (seg.addr + seg.size - 1) >> 16;
-			const u32 max = std::min<u32>(::size32(lut), max0);
-
-			if (max0 > max)
-			{
-				ppu_loader.error("Skipping PRX name registeration: %s, max=0x%x", name, max0 << 16);
-			}
-
-			for (u32 i = seg.addr >> 16; i <= max; i++)
-			{
-				lut[i].release(ptr);
-			}
-		}
-	}
-};
-
-const char* get_prx_name_by_cia(u32 addr)
-{
-	if (auto t = g_fxo->try_get<prx_names_table>())
-	{
-		addr >>= 16;
-
-		if (addr < std::size(t->lut))
-		{
-			return t->lut[addr];
-		}
-	}
-
-	return nullptr;
-}
-
-shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, const std::string& path, s64 file_offset, utils::serial* ar)
+std::shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, const std::string& path, s64 file_offset)
 {
 	if (elf != elf_error::ok)
 	{
-		return null_ptr;
+		return nullptr;
 	}
 
 	// Create new PRX object
-	const auto prx = !ar && !virtual_load ? idm::make_ptr<lv2_obj, lv2_prx>() : make_shared<lv2_prx>();
+	const auto prx = idm::make_ptr<lv2_obj, lv2_prx>();
 
 	// Access linkage information object
 	auto& link = g_fxo->get<ppu_linkage_info>();
@@ -1584,9 +930,6 @@ shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, c
 	u32 end = 0;
 	u32 toc = 0;
 
-	// 0x100000: Workaround for analyser glitches
-	u32 allocating_address = 0x100000;
-
 	for (const auto& prog : elf.progs)
 	{
 		ppu_loader.notice("** Segment: p_type=0x%x, p_vaddr=0x%llx, p_filesz=0x%llx, p_memsz=0x%llx, flags=0x%x", prog.p_type, prog.p_vaddr, prog.p_filesz, prog.p_memsz, prog.p_flags);
@@ -1610,43 +953,15 @@ shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, c
 				//const u32 init_addr = ::narrow<u32>(prog.p_vaddr);
 
 				// Alloc segment memory
-				// Or use saved address
-				u32 addr = 0;
+				const u32 addr = vm::alloc(mem_size, vm::main);
 
-				if (virtual_load)
-				{
-					addr = std::exchange(allocating_address, allocating_address + utils::align<u32>(mem_size, 0x10000));
-				}
-				else
-				{
-					addr = (!ar ? vm::alloc(mem_size, vm::main) : ar->operator u32());
-				}
-
-				_seg.ptr = vm::base(addr);
-
-				if (virtual_load)
-				{
-					// Leave additional room for the analyser so it can safely access beyond limit a bit
-					// Because with VM the address sapce is not really a limit so any u32 address is valid there, here it is UB to create pointer that goes beyond the boundaries
-					// TODO: Use make_shared_for_overwrite when all compilers support it
-					const usz alloc_size = utils::align<usz>(mem_size, 0x10000) + 4096;
-					prx->allocations.push_back(std::shared_ptr<u8[]>(new u8[alloc_size]));
-					_seg.ptr = prx->allocations.back().get();
-					std::memset(static_cast<u8*>(_seg.ptr) + prog.bin.size(), 0, alloc_size - 4096 - prog.bin.size());
-				}
-				else if (!vm::check_addr(addr))
+				if (!addr)
 				{
 					fmt::throw_exception("vm::alloc() failed (size=0x%x)", mem_size);
 				}
 
-				_seg.addr = addr;
-				_seg.size = mem_size;
-				_seg.filesz = file_size;
-
-				prx->addr_to_seg_index.emplace(addr, ::size32(prx->segs) - 1);
-
 				// Copy segment data
-				if (!ar) std::memcpy(ensure(prx->get_ptr<void>(addr)), prog.bin.data(), file_size);
+				std::memcpy(vm::base(addr), prog.bin.data(), file_size);
 				ppu_loader.warning("**** Loaded to 0x%x...0x%x (size=0x%x)", addr, addr + mem_size - 1, mem_size);
 
 				// Hash segment
@@ -1655,10 +970,14 @@ shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, c
 				sha1_update(&sha, prog.bin.data(), prog.bin.size());
 
 				// Initialize executable code if necessary
-				if (prog.p_flags & 0x1 && !virtual_load)
+				if (prog.p_flags & 0x1)
 				{
 					ppu_register_range(addr, mem_size);
 				}
+
+				_seg.addr = addr;
+				_seg.size = mem_size;
+				_seg.filesz = file_size;
 			}
 
 			break;
@@ -1672,9 +991,9 @@ shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, c
 
 	for (const auto& s : elf.shdrs)
 	{
-		ppu_loader.notice("** Section: sh_type=0x%x, addr=0x%llx, size=0x%llx, flags=0x%x", std::bit_cast<u32>(s.sh_type), s.sh_addr, s.sh_size, s._sh_flags);
+		ppu_loader.notice("** Section: sh_type=0x%x, addr=0x%llx, size=0x%llx, flags=0x%x", s.sh_type, s.sh_addr, s.sh_size, s.sh_flags);
 
-		if (s.sh_type != sec_type::sht_progbits) continue;
+		if (s.sh_type != 1u) continue;
 
 		const u32 addr = vm::cast(s.sh_addr);
 		const u32 size = vm::cast(s.sh_size);
@@ -1690,8 +1009,8 @@ shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, c
 					ppu_segment _sec;
 					_sec.addr = addr - saddr + prx->segs[i].addr;
 					_sec.size = size;
-					_sec.type = std::bit_cast<u32>(s.sh_type);
-					_sec.flags = static_cast<u32>(s._sh_flags & 7);
+					_sec.type = s.sh_type;
+					_sec.flags = static_cast<u32>(s.sh_flags & 7);
 					_sec.filesz = 0;
 					prx->secs.emplace_back(_sec);
 
@@ -1727,12 +1046,12 @@ shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, c
 			{
 				const auto& rel = reinterpret_cast<const ppu_prx_relocation_info&>(prog.bin[i]);
 
-				if (rel.offset >= utils::align<u64>(::at32(prx->segs, rel.index_addr).size, 0x100))
+				if (rel.offset >= prx->segs.at(rel.index_addr).size)
 				{
-					fmt::throw_exception("Relocation offset out of segment memory! (offset=0x%x, index_addr=%u, seg_size=0x%x)", rel.offset, rel.index_addr, prx->segs[rel.index_addr].size);
+					fmt::throw_exception("Relocation offset out of segment memory! (offset=0x%x, index_addr=%u)", rel.offset, rel.index_addr);
 				}
 
-				const u32 data_base = rel.index_value == 0xFF ? 0 : ::at32(prx->segs, rel.index_value).addr;
+				const u32 data_base = rel.index_value == 0xFF ? 0 : prx->segs.at(rel.index_value).addr;
 
 				if (rel.index_value != 0xFF && !data_base)
 				{
@@ -1740,77 +1059,72 @@ shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, c
 				}
 
 				ppu_reloc _rel;
-				const u32 raddr = _rel.addr = vm::cast(::at32(prx->segs, rel.index_addr).addr + rel.offset);
+				const u32 raddr = _rel.addr = vm::cast(prx->segs.at(rel.index_addr).addr + rel.offset);
 				const u32 rtype = _rel.type = rel.type;
 				const u64 rdata = _rel.data = data_base + rel.ptr.addr();
 				prx->relocs.emplace_back(_rel);
 
-				if (ar)
-				{
-					continue;
-				}
-
 				switch (rtype)
 				{
 				case 1: // R_PPC64_ADDR32
 				{
-					const u32 value = *ensure(prx->get_ptr<u32>(raddr)) = static_cast<u32>(rdata);
+					const u32 value = vm::_ref<u32>(raddr) = static_cast<u32>(rdata);
 					ppu_loader.trace("**** RELOCATION(1): 0x%x <- 0x%08x (0x%llx)", raddr, value, rdata);
 					break;
 				}
 
 				case 4: //R_PPC64_ADDR16_LO
 				{
-					const u16 value = *ensure(prx->get_ptr<u16>(raddr)) = static_cast<u16>(rdata);
+					const u16 value = vm::_ref<u16>(raddr) = static_cast<u16>(rdata);
 					ppu_loader.trace("**** RELOCATION(4): 0x%x <- 0x%04x (0x%llx)", raddr, value, rdata);
 					break;
 				}
 
 				case 5: //R_PPC64_ADDR16_HI
 				{
-					const u16 value = *ensure(prx->get_ptr<u16>(raddr)) = static_cast<u16>(rdata >> 16);
+					const u16 value = vm::_ref<u16>(raddr) = static_cast<u16>(rdata >> 16);
 					ppu_loader.trace("**** RELOCATION(5): 0x%x <- 0x%04x (0x%llx)", raddr, value, rdata);
 					break;
 				}
 
 				case 6: //R_PPC64_ADDR16_HA
 				{
-					const u16 value = *ensure(prx->get_ptr<u16>(raddr)) = static_cast<u16>(rdata >> 16) + (rdata & 0x8000 ? 1 : 0);
+					const u16 value = vm::_ref<u16>(raddr) = static_cast<u16>(rdata >> 16) + (rdata & 0x8000 ? 1 : 0);
 					ppu_loader.trace("**** RELOCATION(6): 0x%x <- 0x%04x (0x%llx)", raddr, value, rdata);
 					break;
 				}
 
 				case 10: //R_PPC64_REL24
 				{
-					const u32 value = *ensure(prx->get_ptr<ppu_bf_t<be_t<u32>, 6, 24>>(raddr)) = static_cast<u32>(rdata - raddr) >> 2;
+					const u32 value = vm::_ref<ppu_bf_t<be_t<u32>, 6, 24>>(raddr) = static_cast<u32>(rdata - raddr) >> 2;
 					ppu_loader.warning("**** RELOCATION(10): 0x%x <- 0x%06x (0x%llx)", raddr, value, rdata);
 					break;
 				}
 
 				case 11: //R_PPC64_REL14
 				{
-					const u32 value = *ensure(prx->get_ptr<ppu_bf_t<be_t<u32>, 16, 14>>(raddr)) = static_cast<u32>(rdata - raddr) >> 2;
+					const u32 value = vm::_ref<ppu_bf_t<be_t<u32>, 16, 14>>(raddr) = static_cast<u32>(rdata - raddr) >> 2;
 					ppu_loader.warning("**** RELOCATION(11): 0x%x <- 0x%06x (0x%llx)", raddr, value, rdata);
 					break;
 				}
 
 				case 38: //R_PPC64_ADDR64
 				{
-					const u64 value = *ensure(prx->get_ptr<u64>(raddr)) = rdata;
+					const u64 value = vm::_ref<u64>(raddr) = rdata;
 					ppu_loader.trace("**** RELOCATION(38): 0x%x <- 0x%016llx (0x%llx)", raddr, value, rdata);
 					break;
 				}
 
 				case 44: //R_PPC64_REL64
 				{
-					const u64 value = *ensure(prx->get_ptr<u64>(raddr)) = rdata - raddr;
+					const u64 value = vm::_ref<u64>(raddr) = rdata - raddr;
 					ppu_loader.trace("**** RELOCATION(44): 0x%x <- 0x%016llx (0x%llx)", raddr, value, rdata);
 					break;
 				}
 
 				case 57: //R_PPC64_ADDR16_LO_DS
 				{
-					const u16 value = *ensure(prx->get_ptr<ppu_bf_t<be_t<u16>, 0, 14>>(raddr)) = static_cast<u16>(rdata) >> 2;
+					const u16 value = vm::_ref<ppu_bf_t<be_t<u16>, 0, 14>>(raddr) = static_cast<u16>(rdata) >> 2;
 					ppu_loader.trace("**** RELOCATION(57): 0x%x <- 0x%04x (0x%llx)", raddr, value, rdata);
 					break;
 				}
@@ -1830,8 +1144,6 @@ shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, c
 		}
 	}
 
-	std::vector<u32> exported_funcs;
-
 	if (!elf.progs.empty() && elf.progs[0].p_paddr)
 	{
 		struct ppu_prx_library_info
@@ -1847,7 +1159,7 @@ shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, c
 		};
 
 		// Access library information (TODO)
-		const auto lib_info = ensure(prx->get_ptr<const ppu_prx_library_info>(::narrow<u32>(prx->segs[0].addr + elf.progs[0].p_paddr - elf.progs[0].p_offset)));
+		const vm::cptr<ppu_prx_library_info> lib_info = vm::cast(prx->segs[0].addr + elf.progs[0].p_paddr - elf.progs[0].p_offset);
 		const std::string lib_name = lib_info->name;
 
 		strcpy_trunc(prx->module_info_name, lib_name);
@@ -1855,46 +1167,16 @@ shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, c
 		prx->module_info_version[1] = lib_info->version[1];
 		prx->module_info_attributes = lib_info->attributes;
 
-		prx->imports_start = lib_info->imports_start;
-		prx->imports_end = lib_info->imports_end;
-
-		prx->exports_start = lib_info->exports_start;
-		prx->exports_end = lib_info->exports_end;
-
-		for (u32 start = prx->exports_start, size = 0;; size++)
-		{
-			if (start >= prx->exports_end)
-			{
-				// Preallocate storage
-				prx->m_external_loaded_flags.resize(size);
-				break;
-			}
-
-			const u8 increment = *ensure(prx->get_ptr<u8>(start));
-			start += increment ? increment : sizeof(ppu_prx_module_info);
-		}
-
 		ppu_loader.warning("Library %s (rtoc=0x%x):", lib_name, lib_info->toc);
 
-		std::unordered_map<u32, u32> nid_to_use_addr;
-		ppu_linkage_info dummy{};
-
-		prx->specials = ppu_load_exports(*prx, virtual_load ? &dummy : &link, prx->exports_start, prx->exports_end, true, &exported_funcs);
-
-		std::tie(prx->imports, nid_to_use_addr) = ppu_load_imports(*prx, prx->relocs, virtual_load ? &dummy : &link, lib_info->imports_start, lib_info->imports_end);
-		select_from_nids_scenpdrm_addrs(prx->stub_addr_to_constant_state_of_registers, nid_to_use_addr);
-
-		if (virtual_load)
-		{
-			prx->imports.clear();
-		}
-
+		prx->specials = ppu_load_exports(&link, lib_info->exports_start, lib_info->exports_end);
+		prx->imports = ppu_load_imports(prx->relocs, &link, lib_info->imports_start, lib_info->imports_end);
 		std::stable_sort(prx->relocs.begin(), prx->relocs.end());
 		toc = lib_info->toc;
 	}
 	else
 	{
-		ppu_loader.error("Library %s: PRX library info not found");
+		ppu_loader.fatal("Library %s: PRX library info not found");
 	}
 
 	prx->start.set(prx->specials[0xbc9a0086]);
@@ -1906,23 +1188,14 @@ shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, c
 	prx->path = path;
 	prx->offset = file_offset;
 
-	g_fxo->need<prx_names_table>();
-	g_fxo->get<prx_names_table>().install(prx->name, *prx);
-
 	sha1_finish(&sha, prx->sha1);
 
 	// Format patch name
 	std::string hash = fmt::format("PRX-%s", fmt::base57(prx->sha1));
 
-	if (prx->path.ends_with("sys/external/liblv2.sprx"sv))
-	{
-		liblv2_begin = prx->segs[0].addr;
-		liblv2_end = prx->segs[0].addr + prx->segs[0].size;
-	}
+	std::basic_string<u32> applied;
 
-	std::vector<u32> applied;
-
-	for (usz i = Emu.DeserialManager() ? prx->segs.size() : 0; i < prx->segs.size(); i++)
+	for (usz i = 0; i < prx->segs.size(); i++)
 	{
 		const auto& seg = prx->segs[i];
 
@@ -1931,19 +1204,18 @@ shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, c
 		const std::string hash_seg = fmt::format("%s-%u", hash, i);
 
 		// Apply the patch
-		std::vector<u32> _applied;
-		g_fxo->get<patch_engine>().apply(_applied, hash_seg, [&](u32 addr, u32 size) { return prx->get_ptr<u8>(addr + seg.addr, size); }, seg.size);
+		auto _applied = g_fxo->get<patch_engine>().apply(hash_seg, vm::get_super_ptr(seg.addr), seg.size);
 
 		if (!Emu.GetTitleID().empty())
 		{
 			// Alternative patch
-			g_fxo->get<patch_engine>().apply(_applied, Emu.GetTitleID() + '-' + hash_seg, [&](u32 addr, u32 size) { return prx->get_ptr<u8>(addr + seg.addr, size); }, seg.size);
+			_applied += g_fxo->get<patch_engine>().apply(Emu.GetTitleID() + '-' + hash_seg, vm::get_super_ptr(seg.addr), seg.size);
 		}
 
 		// Rebase patch offsets
 		std::for_each(_applied.begin(), _applied.end(), [&](u32& res) { if (res != umax) res += seg.addr; });
 
-		applied.insert(applied.end(), _applied.begin(), _applied.end());
+		applied += _applied;
 
 		if (_applied.empty())
 		{
@@ -1955,72 +1227,24 @@ shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, bool virtual_load, c
 		}
 	}
 
-	// Disabled for PRX for now (problematic and does not seem to have any benefit)
-	end = 0;
-
-	if (!applied.empty() || ar)
-	{
-		// Compare memory changes in memory after executable code sections end
-		if (end >= prx->segs[0].addr && end < prx->segs[0].addr + prx->segs[0].size)
-		{
-			for (const auto& prog : elf.progs)
-			{
-				// Find the first segment
-				if (prog.p_type == 0x1u /* LOAD */ && prog.p_memsz)
-				{
-					std::span<const uchar> elf_memory{prog.bin.begin(), prog.bin.size()};
-					elf_memory = elf_memory.subspan(end - prx->segs[0].addr);
-
-					const auto tmp = std::span<uchar>{&prx->get_ref<uchar>(end), elf_memory.size()};
-					if (!std::equal(elf_memory.begin(), elf_memory.end(), tmp.begin(), tmp.end()))
-					{
-						// There are changes, disable analysis optimization
-						ppu_loader.notice("Disabling analysis optimization due to memory changes from original file");
-
-						end = 0;
-					}
-
-					break;
-				}
-			}
-		}
-	}
-
 	// Embedded SPU elf patching
 	for (const auto& seg : prx->segs)
 	{
-		ppu_check_patch_spu_images(*prx, seg);
+		ppu_check_patch_spu_images(seg);
 	}
 
-	prx->applied_patches = applied;
-	prx->is_relocatable = true;
-	prx->analyse(toc, 0, end, applied, exported_funcs);
+	prx->analyse(toc, 0, end, applied);
 
-	if (!ar && !virtual_load)
-	{
-		try_spawn_ppu_if_exclusive_program(*prx);
-	}
+	try_spawn_ppu_if_exclusive_program(*prx);
 
 	return prx;
 }
 
 void ppu_unload_prx(const lv2_prx& prx)
 {
-	if (prx.segs.empty() || prx.segs[0].ptr != vm::base(prx.segs[0].addr))
-	{
-		return;
-	}
-
-	std::unique_lock lock(g_fxo->get<ppu_linkage_info>().mutex, std::defer_lock);
-
 	// Clean linkage info
 	for (auto& imp : prx.imports)
 	{
-		if (!lock)
-		{
-			lock.lock();
-		}
-
 		auto pinfo = static_cast<ppu_linkage_info::module_data::info*>(imp.second);
 		pinfo->frefss.erase(imp.first);
 		pinfo->imports.erase(imp.first);
@@ -2043,40 +1267,13 @@ void ppu_unload_prx(const lv2_prx& prx)
 	//	}
 	//}
 
-	if (lock)
-	{
-		lock.unlock();
-	}
-
-	if (prx.path.ends_with("sys/external/liblv2.sprx"sv))
-	{
-		liblv2_begin = 0;
-		liblv2_end = 0;
-	}
-
-	// Format patch name
-	std::string hash = fmt::format("PRX-%s", fmt::base57(prx.sha1));
-
 	for (auto& seg : prx.segs)
 	{
-		if (!seg.size) continue;
-
 		vm::dealloc(seg.addr, vm::main);
-
-		const std::string hash_seg = fmt::format("%s-%u", hash, &seg - prx.segs.data());
-
-		// Deallocatte memory used for patches
-		g_fxo->get<patch_engine>().unload(hash_seg);
-
-		if (!Emu.GetTitleID().empty())
-		{
-			// Alternative patch
-			g_fxo->get<patch_engine>().unload(Emu.GetTitleID() + '-' + hash_seg);
-		}
 	}
 }
 
-bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::string& elf_path, utils::serial* ar)
+bool ppu_load_exec(const ppu_exec_object& elf)
 {
 	if (elf != elf_error::ok)
 	{
@@ -2088,7 +1285,7 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 	{
 		if (prog.p_type == 0x1u /* LOAD */ && prog.p_memsz)
 		{
-			using addr_range = utils::address_range32;
+			using addr_range = utils::address_range;
 
 			const addr_range r = addr_range::start_length(static_cast<u32>(prog.p_vaddr), static_cast<u32>(prog.p_memsz));
 
@@ -2099,10 +1296,11 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 		}
 	}
 
-	init_ppu_functions(ar, false);
+	g_fxo->need<ppu_linkage_info>();
+	g_fxo->need<ppu_function_manager>();
 
 	// Set for delayed initialization in ppu_initialize()
-	auto& _main = g_fxo->get<main_ppu_module<lv2_obj>>();
+	auto& _main = g_fxo->get<ppu_module>();
 
 	// Access linkage information object
 	auto& link = g_fxo->get<ppu_linkage_info>();
@@ -2128,7 +1326,7 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 
 	struct on_fatal_error
 	{
-		ppu_module<lv2_obj>& _main;
+		ppu_module& _main;
 		bool errored = true;
 
 		~on_fatal_error()
@@ -2147,16 +1345,6 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 
 	} error_handler{_main};
 
-	if (virtual_load)
-	{
-		// No need for cleanup
-		error_handler.errored = false;
-	}
-
-	const auto old_process_info = g_ps3_process_info;
-
-	u32 segs_size = 0;
-
 	// Allocate memory at fixed positions
 	for (const auto& prog : elf.progs)
 	{
@@ -2178,97 +1366,51 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 		{
 			if (prog.bin.size() > size || prog.bin.size() != prog.p_filesz)
 			{
-				ppu_loader.error("ppu_load_exec(): Invalid binary size (0x%llx, memsz=0x%x)", prog.bin.size(), size);
+				ppu_loader.fatal("ppu_load_exec(): Invalid binary size (0x%llx, memsz=0x%x)", prog.bin.size(), size);
 				return false;
 			}
 
-			const bool already_loaded = ar && vm::check_addr(addr, vm::page_readable, size);
-
-			_seg.ptr = vm::base(addr);
-
-			if (virtual_load)
+			if (!vm::falloc(addr, size, vm::main))
 			{
-				// Leave additional room for the analyser so it can safely access beyond limit a bit
-				// Because with VM the address sapce is not really a limit so any u32 address is valid there, here it is UB to create pointer that goes beyond the boundaries
-				// TODO: Use make_shared_for_overwrite when all compilers support it
-				const usz alloc_size = utils::align<usz>(size, 0x10000) + 4096;
-				_main.allocations.push_back(std::shared_ptr<u8[]>(new u8[alloc_size]));
-				_seg.ptr = _main.allocations.back().get();
-				std::memset(static_cast<u8*>(_seg.ptr) + prog.bin.size(), 0, alloc_size - 4096 - prog.bin.size());
-			}
-			else if (already_loaded)
-			{
-			}
-			else if (![&]() -> bool
-			{
-				// 1M pages if it is RSX shared
-				const u32 area_flags = (_seg.flags >> 28) ? vm::page_size_1m : vm::page_size_64k;
-				const u32 alloc_at = std::max<u32>(addr & -0x10000000, 0x10000);
+				ppu_loader.error("vm::falloc(vm::main) failed (addr=0x%x, memsz=0x%x)", addr, size); // TODO
 
-				const auto area = vm::reserve_map(vm::any, std::max<u32>(addr & -0x10000000, 0x10000), 0x10000000, area_flags);
-
-				if (!area)
+				if (!vm::falloc(addr, size))
 				{
+					ppu_loader.fatal("ppu_load_exec(): vm::falloc() failed (addr=0x%x, memsz=0x%x)", addr, size);
 					return false;
 				}
-
-				if (area->addr != alloc_at || (area->flags & 0xf00) != area_flags)
-				{
-					ppu_loader.error("Failed to allocate memory at 0x%x - conflicting memory area exists: area->addr=0x%x, area->flags=0x%x", addr, area->addr, area->flags);
-					return false;
-				}
-
-				return area->falloc(addr, size);
-			}())
-			{
-				ppu_loader.error("ppu_load_exec(): vm::falloc() failed (addr=0x%x, memsz=0x%x)", addr, size);
-				return false;
 			}
 
-			// Store only LOAD segments (TODO)
-			_main.segs.emplace_back(_seg);
-			_main.addr_to_seg_index.emplace(addr, ::size32(_main.segs) - 1);
-
 			// Copy segment data, hash it
-			if (!already_loaded)
-			{
-				std::memcpy(_main.get_ptr<void>(addr), prog.bin.data(), prog.bin.size());
-			}
-			else
-			{
-				// For backwards compatibility: already loaded memory will always be writable
-				const u32 size0 = utils::align(size + addr % 0x10000, 0x10000);
-				const u32 addr0 = addr & -0x10000;
-				vm::page_protect(addr0, size0, 0, vm::page_writable | vm::page_readable, vm::page_executable);
-			}
-
+			std::memcpy(vm::base(addr), prog.bin.data(), prog.bin.size());
 			sha1_update(&sha, reinterpret_cast<const uchar*>(&prog.p_vaddr), sizeof(prog.p_vaddr));
 			sha1_update(&sha, reinterpret_cast<const uchar*>(&prog.p_memsz), sizeof(prog.p_memsz));
 			sha1_update(&sha, prog.bin.data(), prog.bin.size());
 
 			// Initialize executable code if necessary
-			if (prog.p_flags & 0x1 && !virtual_load)
+			if (prog.p_flags & 0x1)
 			{
 				ppu_register_range(addr, size);
 			}
 
-			segs_size += utils::align<u32>(size + (addr % 0x10000), 0x10000);
+			// Store only LOAD segments (TODO)
+			_main.segs.emplace_back(_seg);
 		}
 	}
 
 	// Load section list, used by the analyser
 	for (const auto& s : elf.shdrs)
 	{
-		ppu_loader.notice("** Section: sh_type=0x%x, addr=0x%llx, size=0x%llx, flags=0x%x", std::bit_cast<u32>(s.sh_type), s.sh_addr, s.sh_size, s._sh_flags);
+		ppu_loader.notice("** Section: sh_type=0x%x, addr=0x%llx, size=0x%llx, flags=0x%x", s.sh_type, s.sh_addr, s.sh_size, s.sh_flags);
 
-		if (s.sh_type != sec_type::sht_progbits) continue;
+		if (s.sh_type != 1u) continue;
 
 		ppu_segment _sec;
 		const u32 addr = _sec.addr = vm::cast(s.sh_addr);
 		const u32 size = _sec.size = vm::cast(s.sh_size);
 
-		_sec.type = std::bit_cast<u32>(s.sh_type);
-		_sec.flags = static_cast<u32>(s._sh_flags & 7);
+		_sec.type = s.sh_type;
+		_sec.flags = static_cast<u32>(s.sh_flags & 7);
 		_sec.filesz = 0;
 
 		if (addr && size)
@@ -2293,44 +1435,13 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 		hash[5 + i * 2] = pal[_main.sha1[i] & 15];
 	}
 
-	Emu.SetExecutableHash(hash);
-
 	// Apply the patch
-	std::vector<u32> applied;
-	g_fxo->get<patch_engine>().apply(applied, !ar ? hash : std::string{}, [&](u32 addr, u32 size) { return _main.get_ptr<u8>(addr, size);  });
+	auto applied = g_fxo->get<patch_engine>().apply(hash, vm::g_base_addr);
 
-	if (!ar && !Emu.GetTitleID().empty())
+	if (!Emu.GetTitleID().empty())
 	{
 		// Alternative patch
-		g_fxo->get<patch_engine>().apply(applied, Emu.GetTitleID() + '-' + hash, [&](u32 addr, u32 size) { return _main.get_ptr<u8>(addr, size); });
-	}
-
-	if (!applied.empty() || ar)
-	{
-		// Compare memory changes in memory after executable code sections end
-		if (end >= _main.segs[0].addr && end < _main.segs[0].addr + _main.segs[0].size)
-		{
-			for (const auto& prog : elf.progs)
-			{
-				// Find the first segment
-				if (prog.p_type == 0x1u /* LOAD */ && prog.p_memsz)
-				{
-					std::span<const uchar> elf_memory{prog.bin.begin(), prog.bin.size()};
-					elf_memory = elf_memory.subspan(end - _main.segs[0].addr);
-
-					const auto tmp = std::span<uchar>{&_main.get_ref<u8>(end), elf_memory.size()};
-					if (!std::equal(elf_memory.begin(), elf_memory.end(), tmp.begin(), tmp.end()))
-					{
-						// There are changes, disable analysis optimization
-						ppu_loader.notice("Disabling analysis optimization due to memory changes from original file");
-
-						end = 0;
-					}
-
-					break;
-				}
-			}
-		}
+		applied += g_fxo->get<patch_engine>().apply(Emu.GetTitleID() + '-' + hash, vm::g_base_addr);
 	}
 
 	if (applied.empty())
@@ -2343,18 +1454,18 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 	}
 
 	// Initialize HLE modules
-	ppu_initialize_modules(&link, ar);
+	ppu_initialize_modules(&link);
 
 	// Embedded SPU elf patching
 	for (const auto& seg : _main.segs)
 	{
-		ppu_check_patch_spu_images(_main, seg);
+		ppu_check_patch_spu_images(seg);
 	}
 
 	// Static HLE patching
-	if (g_cfg.core.hook_functions && !virtual_load)
+	if (g_cfg.core.hook_functions)
 	{
-		auto shle = ensure(g_fxo->init<statichle_handler>(0));
+		auto shle = g_fxo->init<statichle_handler>(0);
 
 		for (u32 i = _main.segs[0].addr; i < (_main.segs[0].addr + _main.segs[0].size); i += 4)
 		{
@@ -2368,23 +1479,23 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 
 	if (bool not_found = g_ps3_process_info.self_info.valid)
 	{
-		for (const auto& ctrl : g_ps3_process_info.self_info.supplemental_hdr)
+		for (const auto& ctrl : g_ps3_process_info.self_info.ctrl_info)
 		{
 			if (ctrl.type == 1)
 			{
 				if (!std::exchange(not_found, false))
 				{
 					ppu_loader.error("More than one control flags header found! (flags1=0x%x)",
-						ctrl.PS3_plaintext_capability_header.ctrl_flag1);
+						ctrl.control_flags.ctrl_flag1);
 					break;
 				}
 
-				g_ps3_process_info.ctrl_flags1 |= ctrl.PS3_plaintext_capability_header.ctrl_flag1;
+				g_ps3_process_info.ctrl_flags1 |= ctrl.control_flags.ctrl_flag1;
 			}
 		}
 
 		ppu_loader.notice("SELF header information found: ctrl_flags1=0x%x, authid=0x%llx",
-			g_ps3_process_info.ctrl_flags1, g_ps3_process_info.self_info.prog_id_hdr.program_authority_id);
+			g_ps3_process_info.ctrl_flags1, g_ps3_process_info.self_info.app_info.authid);
 	}
 
 	// Load other programs
@@ -2400,7 +1511,7 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 
 			if ((prog.p_vaddr | prog.p_filesz | prog.p_memsz) > u32{umax})
 			{
-				ppu_loader.error("ppu_load_exec(): TLS segment is invalid!");
+				ppu_loader.fatal("ppu_load_exec(): TLS segment is invalid!");
 				return false;
 			}
 
@@ -2427,7 +1538,7 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 					//be_t<u32> crash_dump_param_addr;
 				};
 
-				const auto& info = *ensure(_main.get_ptr<process_param_t>(vm::cast(prog.p_vaddr)));
+				const auto& info = vm::_ref<process_param_t>(vm::cast(prog.p_vaddr));
 
 				if (info.size < sizeof(process_param_t))
 				{
@@ -2482,7 +1593,7 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 					be_t<u32> unk2;
 				};
 
-				const auto& proc_prx_param = *ensure(_main.get_ptr<const ppu_proc_prx_param_t>(vm::cast(prog.p_vaddr)));
+				const auto& proc_prx_param = vm::_ref<const ppu_proc_prx_param_t>(vm::cast(prog.p_vaddr));
 
 				ppu_loader.notice("* libent_start = *0x%x", proc_prx_param.libent_start);
 				ppu_loader.notice("* libstub_start = *0x%x", proc_prx_param.libstub_start);
@@ -2491,18 +1602,12 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 
 				if (proc_prx_param.magic != 0x1b434cecu)
 				{
-					ppu_loader.error("ppu_load_exec(): Bad magic! (0x%x)", proc_prx_param.magic);
+					ppu_loader.fatal("ppu_load_exec(): Bad magic! (0x%x)", proc_prx_param.magic);
 					return false;
 				}
 
-				std::unordered_map<u32, u32> nid_to_use_addr;
-				ppu_linkage_info dummy{};
-
-				ppu_load_exports(_main, virtual_load ? &dummy : &link, proc_prx_param.libent_start, proc_prx_param.libent_end);
-
-				std::tie(std::ignore, nid_to_use_addr) = ppu_load_imports(_main, _main.relocs, virtual_load ? &dummy : &link, proc_prx_param.libstub_start, proc_prx_param.libstub_end);
-				select_from_nids_scenpdrm_addrs(_main.stub_addr_to_constant_state_of_registers, nid_to_use_addr);
-
+				ppu_load_exports(&link, proc_prx_param.libent_start, proc_prx_param.libent_end);
+				ppu_load_imports(_main.relocs, &link, proc_prx_param.libstub_start, proc_prx_param.libstub_end);
 				std::stable_sort(_main.relocs.begin(), _main.relocs.end());
 			}
 			break;
@@ -2514,9 +1619,172 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 		}
 	}
 
+	// Initialize process
+	std::vector<std::shared_ptr<lv2_prx>> loaded_modules;
+
+	// Module list to load at startup
+	std::set<std::string> load_libs;
+
+	if (g_cfg.core.libraries_control.get_set().count("liblv2.sprx:lle") || !g_cfg.core.libraries_control.get_set().count("liblv2.sprx:hle"))
+	{
+		// Will load libsysmodule.sprx internally
+		load_libs.emplace("liblv2.sprx");
+	}
+	else if (g_cfg.core.libraries_control.get_set().count("libsysmodule.sprx:lle") || !g_cfg.core.libraries_control.get_set().count("libsysmodule.sprx:hle"))
+	{
+		// Load only libsysmodule.sprx
+		load_libs.emplace("libsysmodule.sprx");
+	}
+
+	if (g_ps3_process_info.get_cellos_appname() == "vsh.self"sv)
+	{
+		// Cannot be used with vsh.self (it self-manages itself)
+		load_libs.clear();
+	}
+
+	const std::string lle_dir = vfs::get("/dev_flash/sys/external/");
+
+	if (!fs::is_file(lle_dir + "liblv2.sprx"))
+	{
+		ppu_loader.error("PS3 firmware is not installed or the installed firmware is invalid."
+			"\nYou should install the PS3 Firmware (Menu: File -> Install Firmware)."
+			"\nVisit https://rpcs3.net/ for Quickstart Guide and more information.");
+	}
+
+	// Program entry
+	u32 entry = 0;
+
+	if (!load_libs.empty())
+	{
+		for (const auto& name : load_libs)
+		{
+			const ppu_prx_object obj = decrypt_self(fs::file(lle_dir + name));
+
+			if (obj == elf_error::ok)
+			{
+				ppu_loader.warning("Loading library: %s", name);
+
+				auto prx = ppu_load_prx(obj, lle_dir + name, 0);
+
+				if (prx->funcs.empty())
+				{
+					ppu_loader.fatal("Module %s has no functions!", name);
+				}
+				else
+				{
+					// TODO: fix arguments
+					prx->validate(prx->funcs[0].addr);
+				}
+
+				if (name == "liblv2.sprx")
+				{
+ 					// Run liblv2.sprx entry point (TODO)
+					entry = prx->start.addr();
+				}
+				else
+				{
+					loaded_modules.emplace_back(std::move(prx));
+				}
+			}
+			else
+			{
+				ppu_loader.error("Failed to load /dev_flash/sys/external/%s: %s (forcing HLE implementation)", name, obj.get_error());
+			}
+		}
+	}
+
+	// Set path (TODO)
+	_main.name.clear();
+	_main.path = vfs::get(Emu.argv[0]);
+
+	// Analyse executable (TODO)
+	_main.analyse(0, static_cast<u32>(elf.header.e_entry), end, applied);
+
+	// Validate analyser results (not required)
+	_main.validate(0);
+
+	// Set SDK version
+	g_ps3_process_info.sdk_ver = sdk_version;
+
+	// Set ppc fixed allocations segment permission
+	g_ps3_process_info.ppc_seg = ppc_seg;
+
+	if (ppc_seg != 0x0)
+	{
+		if (ppc_seg != 0x1)
+		{
+			ppu_loader.todo("Unknown ppc_seg flag value = 0x%x", ppc_seg);
+		}
+
+		// Additional segment for fixed allocations
+		if (!vm::map(0x30000000, 0x10000000, 0x200))
+		{
+			fmt::throw_exception("Failed to map ppc_seg's segment!");
+		}
+	}
+
+	// Initialize process arguments
+	auto args = vm::ptr<u64>::make(vm::alloc(u32{sizeof(u64)} * (::size32(Emu.argv) + ::size32(Emu.envp) + 2), vm::main));
+	auto argv = args;
+
+	for (const auto& arg : Emu.argv)
+	{
+		const u32 arg_size = utils::align(::size32(arg) + 1, 0x10);
+		const u32 arg_addr = vm::alloc(arg_size, vm::main);
+
+		std::memcpy(vm::base(arg_addr), arg.data(), arg_size);
+
+		*args++ = arg_addr;
+	}
+
+	*args++ = 0;
+	auto envp = args;
+
+	for (const auto& arg : Emu.envp)
+	{
+		const u32 arg_size = utils::align(::size32(arg) + 1, 0x10);
+		const u32 arg_addr = vm::alloc(arg_size, vm::main);
+
+		std::memcpy(vm::base(arg_addr), arg.data(), arg_size);
+
+		*args++ = arg_addr;
+	}
+
+	// Fix primary stack size
+	switch (u32 sz = primary_stacksize)
+	{
+	case SYS_PROCESS_PRIMARY_STACK_SIZE_32K:  primary_stacksize =   32 * 1024; break;
+	case SYS_PROCESS_PRIMARY_STACK_SIZE_64K:  primary_stacksize =   64 * 1024; break;
+	case SYS_PROCESS_PRIMARY_STACK_SIZE_96K:  primary_stacksize =   96 * 1024; break;
+	case SYS_PROCESS_PRIMARY_STACK_SIZE_128K: primary_stacksize =  128 * 1024; break;
+	case SYS_PROCESS_PRIMARY_STACK_SIZE_256K: primary_stacksize =  256 * 1024; break;
+	case SYS_PROCESS_PRIMARY_STACK_SIZE_512K: primary_stacksize =  512 * 1024; break;
+	case SYS_PROCESS_PRIMARY_STACK_SIZE_1M:   primary_stacksize = 1024 * 1024; break;
+	default:
+	{
+		// According to elad335, the min value seems to be 64KB instead of the expected 4KB (SYS_PROCESS_PARAM_STACK_SIZE_MIN)
+		primary_stacksize = utils::align<u32>(std::clamp<u32>(sz, 0x10000, SYS_PROCESS_PARAM_STACK_SIZE_MAX), 4096);
+		break;
+	}
+	}
+
+	// Initialize main thread
+	ppu_thread_params p{};
+	p.stack_addr = vm::cast(vm::alloc(primary_stacksize, vm::stack, 4096));
+	p.stack_size = primary_stacksize;
+
+	auto ppu = idm::make_ptr<named_thread<ppu_thread>>(p, "main_thread", primary_prio, 1);
+
+	// Write initial data (exitspawn)
+	if (!Emu.data.empty())
+	{
+		std::memcpy(vm::base(ppu->stack_addr + ppu->stack_size - ::size32(Emu.data)), Emu.data.data(), Emu.data.size());
+		ppu->gpr[1] -= Emu.data.size();
+	}
+
 	// Initialize memory stats (according to sdk version)
 	u32 mem_size;
-	if (Emu.IsVsh())
+	if (g_ps3_process_info.get_cellos_appname() == "vsh.self"sv)
 	{
 		// Because vsh.self comes before any generic application, more memory is available to it
 		mem_size = 0xF000000;
@@ -2552,236 +1820,11 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 		mem_size += 0xC000000;
 	}
 
-	// Initialize process
-	std::vector<shared_ptr<lv2_prx>> loaded_modules;
-
-	// Module list to load at startup
-	std::set<std::string> load_libs;
-
-	if (g_cfg.core.libraries_control.get_set().count("liblv2.sprx:lle") || !g_cfg.core.libraries_control.get_set().count("liblv2.sprx:hle"))
-	{
-		// Will load libsysmodule.sprx internally
-		load_libs.emplace("liblv2.sprx");
-	}
-	else if (g_cfg.core.libraries_control.get_set().count("libsysmodule.sprx:lle") || !g_cfg.core.libraries_control.get_set().count("libsysmodule.sprx:hle"))
-	{
-		// Load only libsysmodule.sprx
-		load_libs.emplace("libsysmodule.sprx");
-	}
-
-	if (ar || Emu.IsVsh() || virtual_load)
-	{
-		// Cannot be used with vsh.self or savestates (they self-manage itself)
-		load_libs.clear();
-	}
-
-	const std::string lle_dir = vfs::get("/dev_flash/sys/external/");
-
-	if (!fs::is_file(lle_dir + "liblv2.sprx"))
-	{
-		ppu_loader.error("PS3 firmware is not installed or the installed firmware is invalid."
-			"\nYou should install the PS3 Firmware (Menu: File -> Install Firmware)."
-			"\nVisit https://rpcs3.net/ for Quickstart Guide and more information.");
-	}
-
-	// Program entry
-	u32 entry = static_cast<u32>(elf.header.e_entry); // Run entry from elf (HLE)
-
-	// Set path (TODO)
-	_main.name.clear();
-	_main.path = elf_path;
-
-	_main.elf_entry = static_cast<u32>(elf.header.e_entry);
-	_main.seg0_code_end = end;
-	_main.applied_patches = applied;
-
-	if (!virtual_load)
-	{
-		// Set SDK version
-		g_ps3_process_info.sdk_ver = sdk_version;
-
-		// Set ppc fixed allocations segment permission
-		g_ps3_process_info.ppc_seg = ppc_seg;
-
-		if (Emu.init_mem_containers)
-		{
-			// Refer to sys_process_exit2 for explanation
-			// Make init_mem_containers empty before call
-			const auto callback = std::move(Emu.init_mem_containers);
-			callback(mem_size);
-
-			ensure(g_fxo->is_init<id_manager::id_map<lv2_memory_container>>());
-			ensure(g_fxo->is_init<lv2_memory_container>());
-		}
-		else if (!ar)
-		{
-			ensure(g_fxo->init<id_manager::id_map<lv2_memory_container>>());
-			ensure(g_fxo->init<lv2_memory_container>(mem_size));
-		}
-
-		void init_fxo_for_exec(utils::serial* ar, bool full);
-		init_fxo_for_exec(ar, false);
-
-		liblv2_begin = 0;
-		liblv2_end = 0;
-	}
-	else
-	{
-		g_ps3_process_info = old_process_info;
-	}
-
-	if (!load_libs.empty())
-	{
-		for (const auto& name : load_libs)
-		{
-			const ppu_prx_object obj = decrypt_self(fs::file(lle_dir + name));
-
-			if (obj == elf_error::ok)
-			{
-				ppu_loader.warning("Loading library: %s", name);
-
-				auto prx = ppu_load_prx(obj, false, lle_dir + name, 0, nullptr);
-				prx->state = PRX_STATE_STARTED;
-				prx->load_exports();
-
-				if (prx->funcs.empty())
-				{
-					ppu_loader.error("Module %s has no functions!", name);
-				}
-				else
-				{
-					// TODO: fix arguments
-					prx->validate(prx->funcs[0].addr);
-				}
-
-				if (name == "liblv2.sprx")
-				{
- 					// Run liblv2.sprx entry point (TODO)
-					entry = prx->start.addr();
-				}
-				else
-				{
-					loaded_modules.emplace_back(std::move(prx));
-				}
-			}
-			else
-			{
-				ppu_loader.error("Failed to load /dev_flash/sys/external/%s: %s (forcing HLE implementation)", name, obj.get_error());
-			}
-		}
-	}
-
-	if (ar || virtual_load)
-	{
-		error_handler.errored = false;
-		return true;
-	}
-
-	if (ppc_seg != 0x0)
-	{
-		if (ppc_seg != 0x1)
-		{
-			ppu_loader.todo("Unknown ppc_seg flag value = 0x%x", ppc_seg);
-		}
-
-		// Additional segment for fixed allocations
-		if (!vm::map(0x30000000, 0x10000000, 0x200))
-		{
-			fmt::throw_exception("Failed to map ppc_seg's segment!");
-		}
-	}
-
-	// Fix primary stack size
-	switch (u32 sz = primary_stacksize)
-	{
-	case SYS_PROCESS_PRIMARY_STACK_SIZE_32K:  primary_stacksize =   32 * 1024; break;
-	case SYS_PROCESS_PRIMARY_STACK_SIZE_64K:  primary_stacksize =   64 * 1024; break;
-	case SYS_PROCESS_PRIMARY_STACK_SIZE_96K:  primary_stacksize =   96 * 1024; break;
-	case SYS_PROCESS_PRIMARY_STACK_SIZE_128K: primary_stacksize =  128 * 1024; break;
-	case SYS_PROCESS_PRIMARY_STACK_SIZE_256K: primary_stacksize =  256 * 1024; break;
-	case SYS_PROCESS_PRIMARY_STACK_SIZE_512K: primary_stacksize =  512 * 1024; break;
-	case SYS_PROCESS_PRIMARY_STACK_SIZE_1M:   primary_stacksize = 1024 * 1024; break;
-	default:
-	{
-		// According to elad335, the min value seems to be 64KB instead of the expected 4KB (SYS_PROCESS_PARAM_STACK_SIZE_MIN)
-		primary_stacksize = utils::align<u32>(std::clamp<u32>(sz, 0x10000, SYS_PROCESS_PARAM_STACK_SIZE_MAX), 4096);
-		break;
-	}
-	}
-
-	// Initialize main thread
-	ppu_thread_params p{};
-	p.stack_addr = vm::cast(vm::alloc(primary_stacksize, vm::stack, 4096));
-	p.stack_size = primary_stacksize;
-	p.entry = vm::_ref<ppu_func_opd_t>(entry);
-
-	auto ppu = idm::make_ptr<named_thread<ppu_thread>>(p, "main_thread", primary_prio, 1);
-
-	// Write initial data (exitspawn)
-	if (!Emu.data.empty())
-	{
-		std::memcpy(vm::base(ppu->stack_addr + ppu->stack_size - ::size32(Emu.data)), Emu.data.data(), Emu.data.size());
-		ppu->gpr[1] -= utils::align<u32>(::size32(Emu.data), 0x10);
-	}
-
-	// Initialize process arguments
-
-	// Calculate storage requirements on the stack
-	const u32 pointers_storage_size = u32{sizeof(u64)} * utils::align<u32>(::size32(Emu.envp) + ::size32(Emu.argv) + 2, 2);
-
-	u32 stack_alloc_size = pointers_storage_size;
-
-	for (const auto& arg : Emu.argv)
-	{
-		stack_alloc_size += utils::align<u32>(::size32(arg) + 1, 0x10);
-	}
-
-	for (const auto& arg : Emu.envp)
-	{
-		stack_alloc_size += utils::align<u32>(::size32(arg) + 1, 0x10);
-	}
-
-	ensure(ppu->stack_size > stack_alloc_size);
-
-	vm::ptr<u64> args = vm::cast(static_cast<u32>(ppu->stack_addr + ppu->stack_size - stack_alloc_size - utils::align<u32>(::size32(Emu.data), 0x10)));
-	vm::ptr<u8> args_data = vm::cast(args.addr() + pointers_storage_size);
-
-	const vm::ptr<u64> argv = args;
-
-	for (const auto& arg : Emu.argv)
-	{
-		const u32 arg_size = ::size32(arg) + 1;
-
-		std::memcpy(args_data.get_ptr(), arg.data(), arg_size);
-
-		*args++ = args_data.addr();
-		args_data = vm::cast(args_data.addr() + utils::align<u32>(arg_size, 0x10));
-	}
-
-	*args++ = 0;
-
-	const vm::ptr<u64> envp = args;
-	args = envp;
-
-	for (const auto& arg : Emu.envp)
-	{
-		const u32 arg_size = ::size32(arg) + 1;
-
-		std::memcpy(args_data.get_ptr(), arg.data(), arg_size);
-
-		*args++ = args_data.addr();
-		args_data = vm::cast(args_data.addr() + utils::align<u32>(arg_size, 0x10));
-	}
-
-	*args++ = 0;
-
-	ppu->gpr[1] -= stack_alloc_size;
-
-	ensure(g_fxo->get<lv2_memory_container>().take(primary_stacksize + segs_size));
+	g_fxo->init<lv2_memory_container>(mem_size)->used += primary_stacksize;
 
 	ppu->cmd_push({ppu_cmd::initialize, 0});
 
-	if (entry == static_cast<u32>(elf.header.e_entry) && !Emu.IsVsh())
+	if (!entry && g_ps3_process_info.get_cellos_appname() != "vsh.self"sv)
 	{
 		// Set TLS args, call sys_initialize_tls
 		ppu->cmd_list
@@ -2791,6 +1834,11 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 		});
 	}
 
+	if (!entry)
+	{
+		entry = static_cast<u32>(elf.header.e_entry); // Run entry from elf
+	}
+
 	// Run start functions
 	for (const auto& prx : loaded_modules)
 	{
@@ -2810,10 +1858,10 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 	// Set command line arguments, run entry function
 	ppu->cmd_list
 	({
-		{ ppu_cmd::set_args, 8 }, u64{Emu.argv.size()}, u64{argv.addr()}, u64{envp.addr()}, u64{Emu.envp.size()}, u64{ppu->id}, u64{tls_vaddr}, u64{tls_fsize}, u64{tls_vsize},
+		{ ppu_cmd::set_args, 8 }, u64{Emu.argv.size()}, u64{argv.addr()}, u64{envp.addr()}, u64{0}, u64{ppu->id}, u64{tls_vaddr}, u64{tls_fsize}, u64{tls_vsize},
 		{ ppu_cmd::set_gpr, 11 }, u64{elf.header.e_entry},
 		{ ppu_cmd::set_gpr, 12 }, u64{malloc_pagesize},
-		{ ppu_cmd::entry_call, 0 },
+		{ ppu_cmd::lle_call, entry },
 	});
 
 	// Set actual memory protection (experimental)
@@ -2822,9 +1870,9 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 		const u32 addr = static_cast<u32>(prog.p_vaddr);
 		const u32 size = static_cast<u32>(prog.p_memsz);
 
-		if (prog.p_type == 0x1u /* LOAD */ && prog.p_memsz && (prog.p_flags & 0x022000002) == 0u /* W */)
+		if (prog.p_type == 0x1u /* LOAD */ && prog.p_memsz && (prog.p_flags & 0x2) == 0u /* W */)
 		{
-			// Set memory protection to read-only when necessary (only if PPU-W, SPU-W, RSX-W are all disabled)
+			// Set memory protection to read-only when necessary
 			ensure(vm::page_protect(addr, utils::align(size, 0x1000), 0, 0, vm::page_writable));
 		}
 	}
@@ -2833,11 +1881,11 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str
 	return true;
 }
 
-std::pair<shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_object& elf, bool virtual_load, const std::string& path, s64 file_offset, utils::serial* ar)
+std::pair<std::shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_object& elf, const std::string& path, s64 file_offset)
 {
 	if (elf != elf_error::ok)
 	{
-		return {null_ptr, CELL_ENOENT};
+		return {nullptr, CELL_ENOENT};
 	}
 
 	// Access linkage information object
@@ -2852,19 +1900,19 @@ std::pair<shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_ob
 	{
 		if (prog.p_type == 0x1u /* LOAD */ && prog.p_memsz)
 		{
-			using addr_range = utils::address_range32;
+			using addr_range = utils::address_range;
 
 			const addr_range r = addr_range::start_length(::narrow<u32>(prog.p_vaddr), ::narrow<u32>(prog.p_memsz));
 
 			if (!r.valid() || !r.inside(addr_range::start_length(0x30000000, 0x10000000)))
 			{
 				// TODO: Check error and if there's a better way to error check
-				return {null_ptr, CELL_ENOEXEC};
+				return {nullptr, CELL_ENOEXEC};
 			}
 		}
 	}
 
-	shared_ptr<lv2_overlay> ovlm = make_shared<lv2_overlay>();
+	const auto ovlm = std::make_shared<lv2_overlay>();
 
 	// Set path (TODO)
 	ovlm->name = path.substr(path.find_last_of('/') + 1);
@@ -2895,29 +1943,7 @@ std::pair<shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_ob
 			if (prog.bin.size() > size || prog.bin.size() != prog.p_filesz)
 				fmt::throw_exception("Invalid binary size (0x%llx, memsz=0x%x)", prog.bin.size(), size);
 
-			const bool already_loaded = !!ar; // Unimplemented optimization for savestates
-
-			_seg.ptr = vm::base(addr);
-
-			if (virtual_load)
-			{
-				// Leave additional room for the analyser so it can safely access beyond limit a bit
-				// Because with VM the address sapce is not really a limit so any u32 address is valid there, here it is UB to create pointer that goes beyond the boundaries
-				// TODO: Use make_shared_for_overwrite when all compilers support it
-				const usz alloc_size = utils::align<usz>(size, 0x10000) + 4096;
-				ovlm->allocations.push_back(std::shared_ptr<u8[]>(new u8[alloc_size]));
-				_seg.ptr = ovlm->allocations.back().get();
-				std::memset(static_cast<u8*>(_seg.ptr) + prog.bin.size(), 0, alloc_size - 4096 - prog.bin.size());
-			}
-			else if (already_loaded)
-			{
-				if (!vm::check_addr(addr, vm::page_readable, size))
-				{
-					ppu_loader.error("ppu_load_overlay(): Archived PPU overlay memory has not been found! (addr=0x%x, memsz=0x%x)", addr, size);
-					return {null_ptr, CELL_EABORT};
-				}
-			}
-			else if (!vm::get(vm::any, 0x30000000)->falloc(addr, size))
+			if (!vm::get(vm::any, 0x30000000)->falloc(addr, size))
 			{
 				ppu_loader.error("ppu_load_overlay(): vm::falloc() failed (addr=0x%x, memsz=0x%x)", addr, size);
 
@@ -2928,40 +1954,39 @@ std::pair<shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_ob
 				}
 
 				// TODO: Check error code, maybe disallow more than one overlay instance completely
-				return {null_ptr, CELL_EBUSY};
+				return {nullptr, CELL_EBUSY};
 			}
 
-			// Store only LOAD segments (TODO)
-			ovlm->segs.emplace_back(_seg);
-			ovlm->addr_to_seg_index.emplace(addr, ::size32(ovlm->segs) - 1);
-
 			// Copy segment data, hash it
-			if (!already_loaded) std::memcpy(ensure(ovlm->get_ptr<void>(addr)), prog.bin.data(), prog.bin.size());
+			std::memcpy(vm::base(addr), prog.bin.data(), prog.bin.size());
 			sha1_update(&sha, reinterpret_cast<const uchar*>(&prog.p_vaddr), sizeof(prog.p_vaddr));
 			sha1_update(&sha, reinterpret_cast<const uchar*>(&prog.p_memsz), sizeof(prog.p_memsz));
 			sha1_update(&sha, prog.bin.data(), prog.bin.size());
 
 			// Initialize executable code if necessary
-			if (prog.p_flags & 0x1 && !virtual_load)
+			if (prog.p_flags & 0x1)
 			{
 				ppu_register_range(addr, size);
 			}
+
+			// Store only LOAD segments (TODO)
+			ovlm->segs.emplace_back(_seg);
 		}
 	}
 
 	// Load section list, used by the analyser
 	for (const auto& s : elf.shdrs)
 	{
-		ppu_loader.notice("** Section: sh_type=0x%x, addr=0x%llx, size=0x%llx, flags=0x%x", std::bit_cast<u32>(s.sh_type), s.sh_addr, s.sh_size, s._sh_flags);
+		ppu_loader.notice("** Section: sh_type=0x%x, addr=0x%llx, size=0x%llx, flags=0x%x", s.sh_type, s.sh_addr, s.sh_size, s.sh_flags);
 
-		if (s.sh_type != sec_type::sht_progbits) continue;
+		if (s.sh_type != 1u) continue;
 
 		ppu_segment _sec;
 		const u32 addr = _sec.addr = vm::cast(s.sh_addr);
 		const u32 size = _sec.size = vm::cast(s.sh_size);
 
-		_sec.type = std::bit_cast<u32>(s.sh_type);
-		_sec.flags = static_cast<u32>(s._sh_flags & 7);
+		_sec.type = s.sh_type;
+		_sec.flags = static_cast<u32>(s.sh_flags & 7);
 		_sec.filesz = 0;
 
 		if (addr && size)
@@ -2987,46 +2012,18 @@ std::pair<shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_ob
 	}
 
 	// Apply the patch
-	std::vector<u32> applied;
-	g_fxo->get<patch_engine>().apply(applied, !Emu.DeserialManager() ? hash : std::string{}, [ovlm](u32 addr, u32 size) { return ovlm->get_ptr<u8>(addr, size); });
+	auto applied = g_fxo->get<patch_engine>().apply(hash, vm::g_base_addr);
 
-	if (!Emu.DeserialManager() && !Emu.GetTitleID().empty())
+	if (!Emu.GetTitleID().empty())
 	{
 		// Alternative patch
-		g_fxo->get<patch_engine>().apply(applied, Emu.GetTitleID() + '-' + hash, [ovlm](u32 addr, u32 size) { return ovlm->get_ptr<u8>(addr, size); });
-	}
-
-	if (!applied.empty() || ar)
-	{
-		// Compare memory changes in memory after executable code sections end
-		if (end >= ovlm->segs[0].addr && end < ovlm->segs[0].addr + ovlm->segs[0].size)
-		{
-			for (const auto& prog : elf.progs)
-			{
-				// Find the first segment
-				if (prog.p_type == 0x1u /* LOAD */ && prog.p_memsz)
-				{
-					std::span<const uchar> elf_memory{prog.bin.begin(), prog.bin.size()};
-					elf_memory = elf_memory.subspan(end - ovlm->segs[0].addr);
-
-					if (!std::equal(elf_memory.begin(), elf_memory.end(), &ovlm->get_ref<u8>(end)))
-					{
-						// There are changes, disable analysis optimization
-						ppu_loader.notice("Disabling analysis optimization due to memory changes from original file");
-
-						end = 0;
-					}
-
-					break;
-				}
-			}
-		}
+		applied += g_fxo->get<patch_engine>().apply(Emu.GetTitleID() + '-' + hash, vm::g_base_addr);
 	}
 
 	// Embedded SPU elf patching
 	for (const auto& seg : ovlm->segs)
 	{
-		ppu_check_patch_spu_images(*ovlm, seg);
+		ppu_check_patch_spu_images(seg);
 	}
 
 	if (applied.empty())
@@ -3059,7 +2056,7 @@ std::pair<shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_ob
 											//and a lot of zeros.
 				};
 
-				const auto& info = *ensure(ovlm->get_ptr<process_param_t>(vm::cast(prog.p_vaddr)));
+				const auto& info = vm::_ref<process_param_t>(vm::cast(prog.p_vaddr));
 
 				if (info.size < sizeof(process_param_t))
 				{
@@ -3097,7 +2094,7 @@ std::pair<shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_ob
 					be_t<u32> unk2;
 				};
 
-				const auto& proc_prx_param = *ensure(ovlm->get_ptr<const ppu_proc_prx_param_t>(vm::cast(prog.p_vaddr)));
+				const auto& proc_prx_param = vm::_ref<const ppu_proc_prx_param_t>(vm::cast(prog.p_vaddr));
 
 				ppu_loader.notice("* libent_start = *0x%x", proc_prx_param.libent_start);
 				ppu_loader.notice("* libstub_start = *0x%x", proc_prx_param.libstub_start);
@@ -3109,14 +2106,8 @@ std::pair<shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_ob
 					fmt::throw_exception("Bad magic! (0x%x)", proc_prx_param.magic);
 				}
 
-				std::unordered_map<u32, u32> nid_to_use_addr;
-				ppu_linkage_info dummy{};
-
-				ppu_load_exports(*ovlm, virtual_load ? &dummy : &link, proc_prx_param.libent_start, proc_prx_param.libent_end);
-
-				std::tie(std::ignore, nid_to_use_addr) = ppu_load_imports(*ovlm, ovlm->relocs, virtual_load ? &dummy : &link, proc_prx_param.libstub_start, proc_prx_param.libstub_end);
-				select_from_nids_scenpdrm_addrs(ovlm->stub_addr_to_constant_state_of_registers, nid_to_use_addr);
-
+				ppu_load_exports(&link, proc_prx_param.libent_start, proc_prx_param.libent_end);
+				ppu_load_imports(ovlm->relocs, &link, proc_prx_param.libstub_start, proc_prx_param.libstub_end);
 			}
 			break;
 		}
@@ -3128,126 +2119,16 @@ std::pair<shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_ob
 	}
 
 	ovlm->entry = static_cast<u32>(elf.header.e_entry);
-	ovlm->seg0_code_end = end;
-	ovlm->applied_patches = std::move(applied);
-
-	const bool is_being_used_in_emulation = (vm::base(ovlm->segs[0].addr) == ovlm->segs[0].ptr);
-
-	if (!is_being_used_in_emulation)
-	{
-		// Postpone to later
-		return {std::move(ovlm), {}};
-	}
-
-	const auto cpu = cpu_thread::get_current();
 
 	// Analyse executable (TODO)
-	if (!ovlm->analyse(0, ovlm->entry, end, ovlm->applied_patches, std::vector<u32>{}, !cpu ? std::function<bool()>() : [cpu]()
-	{
-		return !!(cpu->state & cpu_flag::exit);
-	}))
-	{
-		return {null_ptr, CellError{CELL_CANCEL + 0u}};
-	}
+	ovlm->analyse(0, ovlm->entry, end, applied);
 
 	// Validate analyser results (not required)
 	ovlm->validate(0);
 
-	if (!ar && !virtual_load)
-	{
-		ensure(idm::import_existing<lv2_obj, lv2_overlay>(ovlm));
-		try_spawn_ppu_if_exclusive_program(*ovlm);
-	}
+	idm::import_existing<lv2_obj, lv2_overlay>(ovlm);
+
+	try_spawn_ppu_if_exclusive_program(*ovlm);
 
 	return {std::move(ovlm), {}};
 }
-
-bool ppu_load_rel_exec(const ppu_rel_object& elf)
-{
-	ppu_module<lv2_obj> relm{};
-
-	struct on_fatal_error
-	{
-		ppu_module<lv2_obj>& relm;
-		bool errored = true;
-
-		~on_fatal_error()
-		{
-			if (!errored)
-			{
-				return;
-			}
-
-			// Revert previous allocations on an error
-			for (const auto& seg : relm.secs)
-			{
-				vm::dealloc(seg.addr);
-			}
-		}
-
-	} error_handler{relm};
-
-	u32 memsize = 0;
-
-	for (const auto& s : elf.shdrs)
-	{
-		if (s.sh_type != sec_type::sht_progbits)
-		{
-			memsize = utils::align<u32>(memsize + vm::cast(s.sh_size), 128);
-		}
-	}
-
-	u32 addr = vm::alloc(memsize, vm::main);
-
-	if (!addr)
-	{
-		ppu_loader.error("ppu_load_rel_exec(): vm::alloc() failed (memsz=0x%x)", memsize);
-		return false;
-	}
-
-	ppu_register_range(addr, memsize);
-
-	// Copy references to sections for the purpose of sorting executable sections before non-executable ones
-	std::vector<const elf_shdata<elf_be, u64>*> shdrs(elf.shdrs.size());
-
-	for (auto& ref : shdrs)
-	{
-		ref = &elf.shdrs[&ref - shdrs.data()];
-	}
-
-	std::stable_sort(shdrs.begin(), shdrs.end(), [](auto& a, auto& b) -> bool
-	{
-		const bs_t<sh_flag> flags_a_has = a->sh_flags() - b->sh_flags();
-		return flags_a_has.all_of(sh_flag::shf_execinstr);
-	});
-
-	// Load sections
-	for (auto ptr : shdrs)
-	{
-		const auto& s = *ptr;
-
-		ppu_loader.notice("** Section: sh_type=0x%x, addr=0x%llx, size=0x%llx, flags=0x%x", std::bit_cast<u32>(s.sh_type), s.sh_addr, s.sh_size, s._sh_flags);
-
-		if (s.sh_type == sec_type::sht_progbits && s.sh_size && s.sh_flags().all_of(sh_flag::shf_alloc))
-		{
-			ppu_segment _sec;
-			const u32 size = _sec.size = vm::cast(s.sh_size);
-
-			_sec.type = std::bit_cast<u32>(s.sh_type);
-			_sec.flags = static_cast<u32>(s._sh_flags & 7);
-			_sec.filesz = size;
-
-			_sec.addr = addr;
-			relm.secs.emplace_back(_sec);
-
-			std::memcpy(vm::base(addr), s.get_bin().data(), size);
-			addr = utils::align<u32>(addr + size, 128);
-		}
-	}
-
-	try_spawn_ppu_if_exclusive_program(relm);
-
-	error_handler.errored = false;
-
-	return true;
-}
diff --git a/rpcs3/Emu/Cell/PPUModule.h b/rpcs3/Emu/Cell/PPUModule.h
index fdcd736f38..648937232a 100644
--- a/rpcs3/Emu/Cell/PPUModule.h
+++ b/rpcs3/Emu/Cell/PPUModule.h
@@ -18,7 +18,7 @@ constexpr const char* ppu_select_name(const char* /*name*/, const char* orig_nam
 }
 
 // Generate FNID or VNID for given name
-extern u32 ppu_generate_id(std::string_view name);
+extern u32 ppu_generate_id(const char* name);
 
 // Overload for REG_FNID, REG_VNID macro
 constexpr u32 ppu_generate_id(u32 id)
@@ -31,7 +31,7 @@ enum ppu_static_module_flags : u32
 {
 	MFF_FORCED_HLE = (1 << 0), // Always call HLE function
 	MFF_PERFECT    = (1 << 1), // Indicates complete implementation and LLE interchangeability
-	MFF_HIDDEN     = (1 << 2), // Invisible variable for internal use (TODO)
+	MFF_HIDDEN     = (1 << 2), // Invisible function for internal use (TODO)
 };
 
 // HLE function information
@@ -80,9 +80,9 @@ public:
 	std::unordered_map<u32, ppu_static_function, value_hash<u32>> functions{};
 	std::unordered_map<u32, ppu_static_variable, value_hash<u32>> variables{};
 
+public:
 	ppu_static_module(const char* name);
 
-public:
 	ppu_static_module(const char* name, void(*init)())
 		: ppu_static_module(name)
 	{
@@ -123,7 +123,7 @@ public:
 	static void initialize_modules();
 
 	template <auto* Func>
-	static auto& register_static_function(const char* _module, const char* name, ppu_intrp_func_t func, u32 fnid)
+	static auto& register_static_function(const char* _module, const char* name, ppu_function_t func, u32 fnid)
 	{
 		auto& info = access_static_function(_module, fnid);
 
@@ -147,7 +147,7 @@ public:
 	{
 		using gvar = std::decay_t<decltype(*Var)>;
 
-		static_assert(std::is_same_v<u32, typename gvar::addr_type>, "Static variable registration: vm::gvar<T> expected");
+		static_assert(std::is_same<u32, typename gvar::addr_type>::value, "Static variable registration: vm::gvar<T> expected");
 
 		auto& info = access_static_variable(_module, vnid);
 
@@ -163,33 +163,25 @@ public:
 	}
 
 	// We need this to deal with the enumeration over all ppu_static_modules that happens in ppu_initialize_modules
-	static std::unordered_map<std::string, ppu_static_module*>& get();
+	static const std::unordered_map<std::string, ppu_static_module*>& get()
+	{
+		return s_module_map;
+	}
 
 	static const ppu_static_module cellAdec;
 	static const ppu_static_module cellAtrac;
-	static const ppu_static_module cellAtrac3dec;
-	static const ppu_static_module cellAtrac3multidec;
 	static const ppu_static_module cellAtracMulti;
-	static const ppu_static_module cellAtracXdec;
 	static const ppu_static_module cellAudio;
 	static const ppu_static_module cellAvconfExt;
 	static const ppu_static_module cellAuthDialogUtility;
 	static const ppu_static_module cellBGDL;
 	static const ppu_static_module cellCamera;
-	static const ppu_static_module cellCelp8Dec;
 	static const ppu_static_module cellCelp8Enc;
-	static const ppu_static_module cellCelpDec;
 	static const ppu_static_module cellCelpEnc;
 	static const ppu_static_module cellCrossController;
 	static const ppu_static_module cellDaisy;
-	static const ppu_static_module cellDDPdec;
 	static const ppu_static_module cellDmux;
-	static const ppu_static_module cellDmuxPamf;
 	static const ppu_static_module cellDtcpIpUtility;
-	static const ppu_static_module cellDTSdec;
-	static const ppu_static_module cellDTSHDCOREdec;
-	static const ppu_static_module cellDTSHDdec;
-	static const ppu_static_module cellDTSLBRdec;
 	static const ppu_static_module cellFiber;
 	static const ppu_static_module cellFont;
 	static const ppu_static_module cellFontFT;
@@ -208,17 +200,8 @@ public:
 	static const ppu_static_module cellJpgEnc;
 	static const ppu_static_module cellKey2char;
 	static const ppu_static_module cellL10n;
-	static const ppu_static_module cell_libac3dec;
 	static const ppu_static_module cellLibprof;
-	static const ppu_static_module cellM2AACdec;
-	static const ppu_static_module cellM2BCdec;
-	static const ppu_static_module cellM4AacDec;
-	static const ppu_static_module cellM4AacDec2ch;
-	static const ppu_static_module cellM4AacDec2chmod;
 	static const ppu_static_module cellMic;
-	static const ppu_static_module cellMP3dec;
-	static const ppu_static_module cellMP3Sdec;
-	static const ppu_static_module cellMPL1dec;
 	static const ppu_static_module cellMusic;
 	static const ppu_static_module cellMusicDecode;
 	static const ppu_static_module cellMusicExport;
@@ -262,7 +245,6 @@ public:
 	static const ppu_static_module cellSysutilAvcExt;
 	static const ppu_static_module cellSysutilNpEula;
 	static const ppu_static_module cellSysutilMisc;
-	static const ppu_static_module cellTRHDdec;
 	static const ppu_static_module cellUsbd;
 	static const ppu_static_module cellUsbPspcm;
 	static const ppu_static_module cellUserInfo;
@@ -272,9 +254,6 @@ public:
 	static const ppu_static_module cellVideoUpload;
 	static const ppu_static_module cellVoice;
 	static const ppu_static_module cellVpost;
-	static const ppu_static_module cellWMAdec;
-	static const ppu_static_module cellWMALSLdec;
-	static const ppu_static_module cellWMAPROdec;
 	static const ppu_static_module libad_async;
 	static const ppu_static_module libad_core;
 	static const ppu_static_module libfs_utility_init;
@@ -291,7 +270,6 @@ public:
 	static const ppu_static_module sceNpTrophy;
 	static const ppu_static_module sceNpTus;
 	static const ppu_static_module sceNpUtil;
-	static const ppu_static_module sceNpPlus;
 	static const ppu_static_module sys_crashdump;
 	static const ppu_static_module sys_io;
 	static const ppu_static_module sys_net;
@@ -299,7 +277,9 @@ public:
 	static const ppu_static_module sys_libc;
 	static const ppu_static_module sys_lv2dbg;
 	static const ppu_static_module static_hle;
-	static const ppu_static_module hle_patches;
+
+private:
+	inline static std::unordered_map<std::string, ppu_static_module*> s_module_map;
 };
 
 template <auto* Func>
@@ -313,9 +293,7 @@ inline RT ppu_execute(ppu_thread& ppu, Args... args)
 	return func(ppu, args...);
 }
 
-#define BIND_FUNC_WITH_BLR(func, _module) BIND_FUNC(func, if (cpu_flag::again - ppu.state) ppu.cia = static_cast<u32>(ppu.lr) & ~3; else ppu.current_module = _module)
-
-#define REG_FNID(_module, nid, func) ppu_module_manager::register_static_function<&func>(#_module, ppu_select_name(#func, nid), BIND_FUNC_WITH_BLR(func, #_module), ppu_generate_id(nid))
+#define REG_FNID(_module, nid, func) ppu_module_manager::register_static_function<&func>(#_module, ppu_select_name(#func, nid), BIND_FUNC(func, ppu.cia = static_cast<u32>(ppu.lr) & ~3), ppu_generate_id(nid))
 
 #define REG_FUNC(_module, func) REG_FNID(_module, #func, func)
 
@@ -323,10 +301,6 @@ inline RT ppu_execute(ppu_thread& ppu, Args... args)
 
 #define REG_VAR(_module, var) REG_VNID(_module, #var, var)
 
-#define REG_HIDDEN_FUNC(func) ppu_function_manager::register_function<decltype(&func), &func>(BIND_FUNC_WITH_BLR(func, ""))
-
-#define REG_HIDDEN_FUNC_PURE(func) ppu_function_manager::register_function<decltype(&func), &func>(func)
-
 #define REINIT_FUNC(func) (ppu_module_manager::find_static_function<&func>().flags = 0, ppu_module_manager::find_static_function<&func>())
 
 #define UNIMPLEMENTED_FUNC(_module) _module.todo("%s()", __func__)
diff --git a/rpcs3/Emu/Cell/PPUOpcodes.h b/rpcs3/Emu/Cell/PPUOpcodes.h
index de517014b5..5526fed181 100644
--- a/rpcs3/Emu/Cell/PPUOpcodes.h
+++ b/rpcs3/Emu/Cell/PPUOpcodes.h
@@ -84,22 +84,19 @@ class ppu_decoder
 	struct instruction_info
 	{
 		u32 value;
-		T ptr0;
-		T ptr_rc;
+		T pointer;
 		u32 magn; // Non-zero for "columns" (effectively, number of most significant bits "eaten")
 
-		constexpr instruction_info(u32 v, T p, T p_rc, u32 m = 0)
+		constexpr instruction_info(u32 v, T p, u32 m = 0)
 			: value(v)
-			, ptr0(p)
-			, ptr_rc(p_rc)
+			, pointer(p)
 			, magn(m)
 		{
 		}
 
-		constexpr instruction_info(u32 v, const T* p, const T* p_rc, u32 m = 0)
+		constexpr instruction_info(u32 v, const T* p, u32 m = 0)
 			: value(v)
-			, ptr0(*p)
-			, ptr_rc(*p_rc)
+			, pointer(*p)
 			, magn(m)
 		{
 		}
@@ -116,8 +113,7 @@ class ppu_decoder
 				{
 					for (u32 j = 0; j < 1u << sh; j++)
 					{
-						const u32 k = (((i << (count - v.magn)) | v.value) << sh) | j;
-						::at32(m_table, (k << 6) | main_op) = k & 1 ? v.ptr_rc : v.ptr0;
+						m_table.at((((((i << (count - v.magn)) | v.value) << sh) | j) << 6) | main_op) = v.pointer;
 					}
 				}
 			}
@@ -129,498 +125,454 @@ class ppu_decoder
 			{
 				for (u32 i = 0; i < 1u << 11; i++)
 				{
-					::at32(m_table, i << 6 | v.value) = i & 1 ? v.ptr_rc : v.ptr0;
+					m_table.at(i << 6 | v.value) = v.pointer;
 				}
 			}
 		}
 	}
 
-	// Helper
-	static const D& _first(const D& arg)
-	{
-		return arg;
-	}
-
 public:
-	template <typename... Args>
-	ppu_decoder(const Args&... args) noexcept
+	ppu_decoder() noexcept
 	{
-		// If an object is passed to the constructor, assign values from that object
-#define GET_(name) [&]{ if constexpr (sizeof...(Args) > 0) return _first(args...).name; else return &D::name; }()
-#define GET(name) GET_(name), GET_(name)
-#define GETRC(name) GET_(name), GET_(name##_)
-
-		static_assert(sizeof...(Args) <= 1);
-
 		for (auto& x : m_table)
 		{
-			x = GET(UNK);
+			x = &D::UNK;
 		}
 
 		// Main opcodes (field 0..5)
 		fill_table(0x00, 6, -1,
 		{
-			{ 0x02, GET(TDI) },
-			{ 0x03, GET(TWI) },
-			{ 0x07, GET(MULLI) },
-			{ 0x08, GET(SUBFIC) },
-			{ 0x0a, GET(CMPLI) },
-			{ 0x0b, GET(CMPI) },
-			{ 0x0c, GET(ADDIC) },
-			{ 0x0d, GET(ADDIC) },
-			{ 0x0e, GET(ADDI) },
-			{ 0x0f, GET(ADDIS) },
-			{ 0x10, GET(BC) },
-			{ 0x11, GET(SC) },
-			{ 0x12, GET(B) },
-			{ 0x14, GETRC(RLWIMI) },
-			{ 0x15, GETRC(RLWINM) },
-			{ 0x17, GETRC(RLWNM) },
-			{ 0x18, GET(ORI) },
-			{ 0x19, GET(ORIS) },
-			{ 0x1a, GET(XORI) },
-			{ 0x1b, GET(XORIS) },
-			{ 0x1c, GET(ANDI) },
-			{ 0x1d, GET(ANDIS) },
-			{ 0x20, GET(LWZ) },
-			{ 0x21, GET(LWZU) },
-			{ 0x22, GET(LBZ) },
-			{ 0x23, GET(LBZU) },
-			{ 0x24, GET(STW) },
-			{ 0x25, GET(STWU) },
-			{ 0x26, GET(STB) },
-			{ 0x27, GET(STBU) },
-			{ 0x28, GET(LHZ) },
-			{ 0x29, GET(LHZU) },
-			{ 0x2a, GET(LHA) },
-			{ 0x2b, GET(LHAU) },
-			{ 0x2c, GET(STH) },
-			{ 0x2d, GET(STHU) },
-			{ 0x2e, GET(LMW) },
-			{ 0x2f, GET(STMW) },
-			{ 0x30, GET(LFS) },
-			{ 0x31, GET(LFSU) },
-			{ 0x32, GET(LFD) },
-			{ 0x33, GET(LFDU) },
-			{ 0x34, GET(STFS) },
-			{ 0x35, GET(STFSU) },
-			{ 0x36, GET(STFD) },
-			{ 0x37, GET(STFDU) },
+			{ 0x02, &D::TDI },
+			{ 0x03, &D::TWI },
+			{ 0x07, &D::MULLI },
+			{ 0x08, &D::SUBFIC },
+			{ 0x0a, &D::CMPLI },
+			{ 0x0b, &D::CMPI },
+			{ 0x0c, &D::ADDIC },
+			{ 0x0d, &D::ADDIC },
+			{ 0x0e, &D::ADDI },
+			{ 0x0f, &D::ADDIS },
+			{ 0x10, &D::BC },
+			{ 0x11, &D::SC },
+			{ 0x12, &D::B },
+			{ 0x14, &D::RLWIMI },
+			{ 0x15, &D::RLWINM },
+			{ 0x17, &D::RLWNM },
+			{ 0x18, &D::ORI },
+			{ 0x19, &D::ORIS },
+			{ 0x1a, &D::XORI },
+			{ 0x1b, &D::XORIS },
+			{ 0x1c, &D::ANDI },
+			{ 0x1d, &D::ANDIS },
+			{ 0x20, &D::LWZ },
+			{ 0x21, &D::LWZU },
+			{ 0x22, &D::LBZ },
+			{ 0x23, &D::LBZU },
+			{ 0x24, &D::STW },
+			{ 0x25, &D::STWU },
+			{ 0x26, &D::STB },
+			{ 0x27, &D::STBU },
+			{ 0x28, &D::LHZ },
+			{ 0x29, &D::LHZU },
+			{ 0x2a, &D::LHA },
+			{ 0x2b, &D::LHAU },
+			{ 0x2c, &D::STH },
+			{ 0x2d, &D::STHU },
+			{ 0x2e, &D::LMW },
+			{ 0x2f, &D::STMW },
+			{ 0x30, &D::LFS },
+			{ 0x31, &D::LFSU },
+			{ 0x32, &D::LFD },
+			{ 0x33, &D::LFDU },
+			{ 0x34, &D::STFS },
+			{ 0x35, &D::STFSU },
+			{ 0x36, &D::STFD },
+			{ 0x37, &D::STFDU },
 		});
 
 		// Group 0x04 opcodes (field 21..31)
 		fill_table(0x04, 11, 0,
 		{
-			{ 0x0, GET(VADDUBM) },
-			{ 0x2, GET(VMAXUB) },
-			{ 0x4, GET(VRLB) },
-			{ 0x006, GET(VCMPEQUB) },
-			{ 0x406, GET(VCMPEQUB_) },
-			{ 0x8, GET(VMULOUB) },
-			{ 0xa, GET(VADDFP) },
-			{ 0xc, GET(VMRGHB) },
-			{ 0xe, GET(VPKUHUM) },
+			{ 0x0, &D::VADDUBM },
+			{ 0x2, &D::VMAXUB },
+			{ 0x4, &D::VRLB },
+			{ 0x6, &D::VCMPEQUB, 1 },
+			{ 0x8, &D::VMULOUB },
+			{ 0xa, &D::VADDFP },
+			{ 0xc, &D::VMRGHB },
+			{ 0xe, &D::VPKUHUM },
 
-			{ 0x20, GET(VMHADDSHS), 5 },
-			{ 0x21, GET(VMHRADDSHS), 5 },
-			{ 0x22, GET(VMLADDUHM), 5 },
-			{ 0x24, GET(VMSUMUBM), 5 },
-			{ 0x25, GET(VMSUMMBM), 5 },
-			{ 0x26, GET(VMSUMUHM), 5 },
-			{ 0x27, GET(VMSUMUHS), 5 },
-			{ 0x28, GET(VMSUMSHM), 5 },
-			{ 0x29, GET(VMSUMSHS), 5 },
-			{ 0x2a, GET(VSEL), 5 },
-			{ 0x2b, GET(VPERM), 5 },
-			{ 0x2c, GET(VSLDOI), 5 },
-			{ 0x2e, GET(VMADDFP), 5 },
-			{ 0x2f, GET(VNMSUBFP), 5 },
+			{ 0x20, &D::VMHADDSHS, 5 },
+			{ 0x21, &D::VMHRADDSHS, 5 },
+			{ 0x22, &D::VMLADDUHM, 5 },
+			{ 0x24, &D::VMSUMUBM, 5 },
+			{ 0x25, &D::VMSUMMBM, 5 },
+			{ 0x26, &D::VMSUMUHM, 5 },
+			{ 0x27, &D::VMSUMUHS, 5 },
+			{ 0x28, &D::VMSUMSHM, 5 },
+			{ 0x29, &D::VMSUMSHS, 5 },
+			{ 0x2a, &D::VSEL, 5 },
+			{ 0x2b, &D::VPERM, 5 },
+			{ 0x2c, &D::VSLDOI, 5 },
+			{ 0x2e, &D::VMADDFP, 5 },
+			{ 0x2f, &D::VNMSUBFP, 5 },
 
-			{ 0x40, GET(VADDUHM) },
-			{ 0x42, GET(VMAXUH) },
-			{ 0x44, GET(VRLH) },
-			{ 0x046, GET(VCMPEQUH) },
-			{ 0x446, GET(VCMPEQUH_) },
-			{ 0x48, GET(VMULOUH) },
-			{ 0x4a, GET(VSUBFP) },
-			{ 0x4c, GET(VMRGHH) },
-			{ 0x4e, GET(VPKUWUM) },
-			{ 0x80, GET(VADDUWM) },
-			{ 0x82, GET(VMAXUW) },
-			{ 0x84, GET(VRLW) },
-			{ 0x086, GET(VCMPEQUW) },
-			{ 0x486, GET(VCMPEQUW_) },
-			{ 0x8c, GET(VMRGHW) },
-			{ 0x8e, GET(VPKUHUS) },
-			{ 0x0c6, GET(VCMPEQFP) },
-			{ 0x4c6, GET(VCMPEQFP_) },
-			{ 0xce, GET(VPKUWUS) },
+			{ 0x40, &D::VADDUHM },
+			{ 0x42, &D::VMAXUH },
+			{ 0x44, &D::VRLH },
+			{ 0x46, &D::VCMPEQUH, 1 },
+			{ 0x48, &D::VMULOUH },
+			{ 0x4a, &D::VSUBFP },
+			{ 0x4c, &D::VMRGHH },
+			{ 0x4e, &D::VPKUWUM },
+			{ 0x80, &D::VADDUWM },
+			{ 0x82, &D::VMAXUW },
+			{ 0x84, &D::VRLW },
+			{ 0x86, &D::VCMPEQUW, 1 },
+			{ 0x8c, &D::VMRGHW },
+			{ 0x8e, &D::VPKUHUS },
+			{ 0xc6, &D::VCMPEQFP, 1 },
+			{ 0xce, &D::VPKUWUS },
 
-			{ 0x102, GET(VMAXSB) },
-			{ 0x104, GET(VSLB) },
-			{ 0x108, GET(VMULOSB) },
-			{ 0x10a, GET(VREFP) },
-			{ 0x10c, GET(VMRGLB) },
-			{ 0x10e, GET(VPKSHUS) },
-			{ 0x142, GET(VMAXSH) },
-			{ 0x144, GET(VSLH) },
-			{ 0x148, GET(VMULOSH) },
-			{ 0x14a, GET(VRSQRTEFP) },
-			{ 0x14c, GET(VMRGLH) },
-			{ 0x14e, GET(VPKSWUS) },
-			{ 0x180, GET(VADDCUW) },
-			{ 0x182, GET(VMAXSW) },
-			{ 0x184, GET(VSLW) },
-			{ 0x18a, GET(VEXPTEFP) },
-			{ 0x18c, GET(VMRGLW) },
-			{ 0x18e, GET(VPKSHSS) },
-			{ 0x1c4, GET(VSL) },
-			{ 0x1c6, GET(VCMPGEFP) },
-			{ 0x5c6, GET(VCMPGEFP_) },
-			{ 0x1ca, GET(VLOGEFP) },
-			{ 0x1ce, GET(VPKSWSS) },
-			{ 0x200, GET(VADDUBS) },
-			{ 0x202, GET(VMINUB) },
-			{ 0x204, GET(VSRB) },
-			{ 0x206, GET(VCMPGTUB) },
-			{ 0x606, GET(VCMPGTUB_) },
-			{ 0x208, GET(VMULEUB) },
-			{ 0x20a, GET(VRFIN) },
-			{ 0x20c, GET(VSPLTB) },
-			{ 0x20e, GET(VUPKHSB) },
-			{ 0x240, GET(VADDUHS) },
-			{ 0x242, GET(VMINUH) },
-			{ 0x244, GET(VSRH) },
-			{ 0x246, GET(VCMPGTUH) },
-			{ 0x646, GET(VCMPGTUH_) },
-			{ 0x248, GET(VMULEUH) },
-			{ 0x24a, GET(VRFIZ) },
-			{ 0x24c, GET(VSPLTH) },
-			{ 0x24e, GET(VUPKHSH) },
-			{ 0x280, GET(VADDUWS) },
-			{ 0x282, GET(VMINUW) },
-			{ 0x284, GET(VSRW) },
-			{ 0x286, GET(VCMPGTUW) },
-			{ 0x686, GET(VCMPGTUW_) },
-			{ 0x28a, GET(VRFIP) },
-			{ 0x28c, GET(VSPLTW) },
-			{ 0x28e, GET(VUPKLSB) },
-			{ 0x2c4, GET(VSR) },
-			{ 0x2c6, GET(VCMPGTFP) },
-			{ 0x6c6, GET(VCMPGTFP_) },
-			{ 0x2ca, GET(VRFIM) },
-			{ 0x2ce, GET(VUPKLSH) },
-			{ 0x300, GET(VADDSBS) },
-			{ 0x302, GET(VMINSB) },
-			{ 0x304, GET(VSRAB) },
-			{ 0x306, GET(VCMPGTSB) },
-			{ 0x706, GET(VCMPGTSB_) },
-			{ 0x308, GET(VMULESB) },
-			{ 0x30a, GET(VCFUX) },
-			{ 0x30c, GET(VSPLTISB) },
-			{ 0x30e, GET(VPKPX) },
-			{ 0x340, GET(VADDSHS) },
-			{ 0x342, GET(VMINSH) },
-			{ 0x344, GET(VSRAH) },
-			{ 0x346, GET(VCMPGTSH) },
-			{ 0x746, GET(VCMPGTSH_) },
-			{ 0x348, GET(VMULESH) },
-			{ 0x34a, GET(VCFSX) },
-			{ 0x34c, GET(VSPLTISH) },
-			{ 0x34e, GET(VUPKHPX) },
-			{ 0x380, GET(VADDSWS) },
-			{ 0x382, GET(VMINSW) },
-			{ 0x384, GET(VSRAW) },
-			{ 0x386, GET(VCMPGTSW) },
-			{ 0x786, GET(VCMPGTSW_) },
-			{ 0x38a, GET(VCTUXS) },
-			{ 0x38c, GET(VSPLTISW) },
-			{ 0x3c6, GET(VCMPBFP) },
-			{ 0x7c6, GET(VCMPBFP_) },
-			{ 0x3ca, GET(VCTSXS) },
-			{ 0x3ce, GET(VUPKLPX) },
-			{ 0x400, GET(VSUBUBM) },
-			{ 0x402, GET(VAVGUB) },
-			{ 0x404, GET(VAND) },
-			{ 0x40a, GET(VMAXFP) },
-			{ 0x40c, GET(VSLO) },
-			{ 0x440, GET(VSUBUHM) },
-			{ 0x442, GET(VAVGUH) },
-			{ 0x444, GET(VANDC) },
-			{ 0x44a, GET(VMINFP) },
-			{ 0x44c, GET(VSRO) },
-			{ 0x480, GET(VSUBUWM) },
-			{ 0x482, GET(VAVGUW) },
-			{ 0x484, GET(VOR) },
-			{ 0x4c4, GET(VXOR) },
-			{ 0x502, GET(VAVGSB) },
-			{ 0x504, GET(VNOR) },
-			{ 0x542, GET(VAVGSH) },
-			{ 0x580, GET(VSUBCUW) },
-			{ 0x582, GET(VAVGSW) },
-			{ 0x600, GET(VSUBUBS) },
-			{ 0x604, GET(MFVSCR) },
-			{ 0x608, GET(VSUM4UBS) },
-			{ 0x640, GET(VSUBUHS) },
-			{ 0x644, GET(MTVSCR) },
-			{ 0x648, GET(VSUM4SHS) },
-			{ 0x680, GET(VSUBUWS) },
-			{ 0x688, GET(VSUM2SWS) },
-			{ 0x700, GET(VSUBSBS) },
-			{ 0x708, GET(VSUM4SBS) },
-			{ 0x740, GET(VSUBSHS) },
-			{ 0x780, GET(VSUBSWS) },
-			{ 0x788, GET(VSUMSWS) },
+			{ 0x102, &D::VMAXSB },
+			{ 0x104, &D::VSLB },
+			{ 0x108, &D::VMULOSB },
+			{ 0x10a, &D::VREFP },
+			{ 0x10c, &D::VMRGLB },
+			{ 0x10e, &D::VPKSHUS },
+			{ 0x142, &D::VMAXSH },
+			{ 0x144, &D::VSLH },
+			{ 0x148, &D::VMULOSH },
+			{ 0x14a, &D::VRSQRTEFP },
+			{ 0x14c, &D::VMRGLH },
+			{ 0x14e, &D::VPKSWUS },
+			{ 0x180, &D::VADDCUW },
+			{ 0x182, &D::VMAXSW },
+			{ 0x184, &D::VSLW },
+			{ 0x18a, &D::VEXPTEFP },
+			{ 0x18c, &D::VMRGLW },
+			{ 0x18e, &D::VPKSHSS },
+			{ 0x1c4, &D::VSL },
+			{ 0x1c6, &D::VCMPGEFP, 1 },
+			{ 0x1ca, &D::VLOGEFP },
+			{ 0x1ce, &D::VPKSWSS },
+			{ 0x200, &D::VADDUBS },
+			{ 0x202, &D::VMINUB },
+			{ 0x204, &D::VSRB },
+			{ 0x206, &D::VCMPGTUB, 1 },
+			{ 0x208, &D::VMULEUB },
+			{ 0x20a, &D::VRFIN },
+			{ 0x20c, &D::VSPLTB },
+			{ 0x20e, &D::VUPKHSB },
+			{ 0x240, &D::VADDUHS },
+			{ 0x242, &D::VMINUH },
+			{ 0x244, &D::VSRH },
+			{ 0x246, &D::VCMPGTUH, 1 },
+			{ 0x248, &D::VMULEUH },
+			{ 0x24a, &D::VRFIZ },
+			{ 0x24c, &D::VSPLTH },
+			{ 0x24e, &D::VUPKHSH },
+			{ 0x280, &D::VADDUWS },
+			{ 0x282, &D::VMINUW },
+			{ 0x284, &D::VSRW },
+			{ 0x286, &D::VCMPGTUW, 1 },
+			{ 0x28a, &D::VRFIP },
+			{ 0x28c, &D::VSPLTW },
+			{ 0x28e, &D::VUPKLSB },
+			{ 0x2c4, &D::VSR },
+			{ 0x2c6, &D::VCMPGTFP, 1 },
+			{ 0x2ca, &D::VRFIM },
+			{ 0x2ce, &D::VUPKLSH },
+			{ 0x300, &D::VADDSBS },
+			{ 0x302, &D::VMINSB },
+			{ 0x304, &D::VSRAB },
+			{ 0x306, &D::VCMPGTSB, 1 },
+			{ 0x308, &D::VMULESB },
+			{ 0x30a, &D::VCFUX },
+			{ 0x30c, &D::VSPLTISB },
+			{ 0x30e, &D::VPKPX },
+			{ 0x340, &D::VADDSHS },
+			{ 0x342, &D::VMINSH },
+			{ 0x344, &D::VSRAH },
+			{ 0x346, &D::VCMPGTSH, 1 },
+			{ 0x348, &D::VMULESH },
+			{ 0x34a, &D::VCFSX },
+			{ 0x34c, &D::VSPLTISH },
+			{ 0x34e, &D::VUPKHPX },
+			{ 0x380, &D::VADDSWS },
+			{ 0x382, &D::VMINSW },
+			{ 0x384, &D::VSRAW },
+			{ 0x386, &D::VCMPGTSW, 1 },
+			{ 0x38a, &D::VCTUXS },
+			{ 0x38c, &D::VSPLTISW },
+			{ 0x3c6, &D::VCMPBFP, 1 },
+			{ 0x3ca, &D::VCTSXS },
+			{ 0x3ce, &D::VUPKLPX },
+			{ 0x400, &D::VSUBUBM },
+			{ 0x402, &D::VAVGUB },
+			{ 0x404, &D::VAND },
+			{ 0x40a, &D::VMAXFP },
+			{ 0x40c, &D::VSLO },
+			{ 0x440, &D::VSUBUHM },
+			{ 0x442, &D::VAVGUH },
+			{ 0x444, &D::VANDC },
+			{ 0x44a, &D::VMINFP },
+			{ 0x44c, &D::VSRO },
+			{ 0x480, &D::VSUBUWM },
+			{ 0x482, &D::VAVGUW },
+			{ 0x484, &D::VOR },
+			{ 0x4c4, &D::VXOR },
+			{ 0x502, &D::VAVGSB },
+			{ 0x504, &D::VNOR },
+			{ 0x542, &D::VAVGSH },
+			{ 0x580, &D::VSUBCUW },
+			{ 0x582, &D::VAVGSW },
+			{ 0x600, &D::VSUBUBS },
+			{ 0x604, &D::MFVSCR },
+			{ 0x608, &D::VSUM4UBS },
+			{ 0x640, &D::VSUBUHS },
+			{ 0x644, &D::MTVSCR },
+			{ 0x648, &D::VSUM4SHS },
+			{ 0x680, &D::VSUBUWS },
+			{ 0x688, &D::VSUM2SWS },
+			{ 0x700, &D::VSUBSBS },
+			{ 0x708, &D::VSUM4SBS },
+			{ 0x740, &D::VSUBSHS },
+			{ 0x780, &D::VSUBSWS },
+			{ 0x788, &D::VSUMSWS },
 		});
 
 		// Group 0x13 opcodes (field 21..30)
 		fill_table(0x13, 10, 1,
 		{
-			{ 0x000, GET(MCRF) },
-			{ 0x010, GET(BCLR) },
-			{ 0x021, GET(CRNOR) },
-			{ 0x081, GET(CRANDC) },
-			{ 0x096, GET(ISYNC) },
-			{ 0x0c1, GET(CRXOR) },
-			{ 0x0e1, GET(CRNAND) },
-			{ 0x101, GET(CRAND) },
-			{ 0x121, GET(CREQV) },
-			{ 0x1a1, GET(CRORC) },
-			{ 0x1c1, GET(CROR) },
-			{ 0x210, GET(BCCTR) },
+			{ 0x000, &D::MCRF },
+			{ 0x010, &D::BCLR },
+			{ 0x021, &D::CRNOR },
+			{ 0x081, &D::CRANDC },
+			{ 0x096, &D::ISYNC },
+			{ 0x0c1, &D::CRXOR },
+			{ 0x0e1, &D::CRNAND },
+			{ 0x101, &D::CRAND },
+			{ 0x121, &D::CREQV },
+			{ 0x1a1, &D::CRORC },
+			{ 0x1c1, &D::CROR },
+			{ 0x210, &D::BCCTR },
 		});
 
 		// Group 0x1e opcodes (field 27..30)
 		fill_table(0x1e, 4, 1,
 		{
-			{ 0x0, GETRC(RLDICL) },
-			{ 0x1, GETRC(RLDICL) },
-			{ 0x2, GETRC(RLDICR) },
-			{ 0x3, GETRC(RLDICR) },
-			{ 0x4, GETRC(RLDIC) },
-			{ 0x5, GETRC(RLDIC) },
-			{ 0x6, GETRC(RLDIMI) },
-			{ 0x7, GETRC(RLDIMI) },
-			{ 0x8, GETRC(RLDCL) },
-			{ 0x9, GETRC(RLDCR) },
+			{ 0x0, &D::RLDICL },
+			{ 0x1, &D::RLDICL },
+			{ 0x2, &D::RLDICR },
+			{ 0x3, &D::RLDICR },
+			{ 0x4, &D::RLDIC },
+			{ 0x5, &D::RLDIC },
+			{ 0x6, &D::RLDIMI },
+			{ 0x7, &D::RLDIMI },
+			{ 0x8, &D::RLDCL },
+			{ 0x9, &D::RLDCR },
 		});
 
 		// Group 0x1f opcodes (field 21..30)
 		fill_table(0x1f, 10, 1,
 		{
-			{ 0x000, GET(CMP) },
-			{ 0x004, GET(TW) },
-			{ 0x006, GET(LVSL) },
-			{ 0x007, GET(LVEBX) },
-			{ 0x008, GETRC(SUBFC) },
-			{ 0x208, GETRC(SUBFCO) },
-			{ 0x009, GETRC(MULHDU) },
-			{ 0x00a, GETRC(ADDC) },
-			{ 0x20a, GETRC(ADDCO) },
-			{ 0x00b, GETRC(MULHWU) },
-			{ 0x013, GET(MFOCRF) },
-			{ 0x014, GET(LWARX) },
-			{ 0x015, GET(LDX) },
-			{ 0x017, GET(LWZX) },
-			{ 0x018, GETRC(SLW) },
-			{ 0x01a, GETRC(CNTLZW) },
-			{ 0x01b, GETRC(SLD) },
-			{ 0x01c, GETRC(AND) },
-			{ 0x020, GET(CMPL) },
-			{ 0x026, GET(LVSR) },
-			{ 0x027, GET(LVEHX) },
-			{ 0x028, GETRC(SUBF) },
-			{ 0x228, GETRC(SUBFO) },
-			{ 0x035, GET(LDUX) },
-			{ 0x036, GET(DCBST) },
-			{ 0x037, GET(LWZUX) },
-			{ 0x03a, GETRC(CNTLZD) },
-			{ 0x03c, GETRC(ANDC) },
-			{ 0x044, GET(TD) },
-			{ 0x047, GET(LVEWX) },
-			{ 0x049, GETRC(MULHD) },
-			{ 0x04b, GETRC(MULHW) },
-			{ 0x054, GET(LDARX) },
-			{ 0x056, GET(DCBF) },
-			{ 0x057, GET(LBZX) },
-			{ 0x067, GET(LVX) },
-			{ 0x068, GETRC(NEG) },
-			{ 0x268, GETRC(NEGO) },
-			{ 0x077, GET(LBZUX) },
-			{ 0x07c, GETRC(NOR) },
-			{ 0x087, GET(STVEBX) },
-			{ 0x088, GETRC(SUBFE) },
-			{ 0x288, GETRC(SUBFEO) },
-			{ 0x08a, GETRC(ADDE) },
-			{ 0x28a, GETRC(ADDEO) },
-			{ 0x090, GET(MTOCRF) },
-			{ 0x095, GET(STDX) },
-			{ 0x096, GET(STWCX) },
-			{ 0x097, GET(STWX) },
-			{ 0x0a7, GET(STVEHX) },
-			{ 0x0b5, GET(STDUX) },
-			{ 0x0b7, GET(STWUX) },
-			{ 0x0c7, GET(STVEWX) },
-			{ 0x0c8, GETRC(SUBFZE) },
-			{ 0x2c8, GETRC(SUBFZEO) },
-			{ 0x0ca, GETRC(ADDZE) },
-			{ 0x2ca, GETRC(ADDZEO) },
-			{ 0x0d6, GET(STDCX) },
-			{ 0x0d7, GET(STBX) },
-			{ 0x0e7, GET(STVX) },
-			{ 0x0e8, GETRC(SUBFME) },
-			{ 0x2e8, GETRC(SUBFMEO) },
-			{ 0x0e9, GETRC(MULLD) },
-			{ 0x2e9, GETRC(MULLDO) },
-			{ 0x0ea, GETRC(ADDME) },
-			{ 0x2ea, GETRC(ADDMEO) },
-			{ 0x0eb, GETRC(MULLW) },
-			{ 0x2eb, GETRC(MULLWO) },
-			{ 0x0f6, GET(DCBTST) },
-			{ 0x0f7, GET(STBUX) },
-			{ 0x10a, GETRC(ADD) },
-			{ 0x30a, GETRC(ADDO) },
-			{ 0x116, GET(DCBT) },
-			{ 0x117, GET(LHZX) },
-			{ 0x11c, GETRC(EQV) },
-			{ 0x136, GET(ECIWX) },
-			{ 0x137, GET(LHZUX) },
-			{ 0x13c, GETRC(XOR) },
-			{ 0x153, GET(MFSPR) },
-			{ 0x155, GET(LWAX) },
-			{ 0x156, GET(DST) },
-			{ 0x157, GET(LHAX) },
-			{ 0x167, GET(LVXL) },
-			{ 0x173, GET(MFTB) },
-			{ 0x175, GET(LWAUX) },
-			{ 0x176, GET(DSTST) },
-			{ 0x177, GET(LHAUX) },
-			{ 0x197, GET(STHX) },
-			{ 0x19c, GETRC(ORC) },
-			{ 0x1b6, GET(ECOWX) },
-			{ 0x1b7, GET(STHUX) },
-			{ 0x1bc, GETRC(OR) },
-			{ 0x1c9, GETRC(DIVDU) },
-			{ 0x3c9, GETRC(DIVDUO) },
-			{ 0x1cb, GETRC(DIVWU) },
-			{ 0x3cb, GETRC(DIVWUO) },
-			{ 0x1d3, GET(MTSPR) },
-			{ 0x1d6, GET(DCBI) },
-			{ 0x1dc, GETRC(NAND) },
-			{ 0x1e7, GET(STVXL) },
-			{ 0x1e9, GETRC(DIVD) },
-			{ 0x3e9, GETRC(DIVDO) },
-			{ 0x1eb, GETRC(DIVW) },
-			{ 0x3eb, GETRC(DIVWO) },
-			{ 0x207, GET(LVLX) },
-			{ 0x214, GET(LDBRX) },
-			{ 0x215, GET(LSWX) },
-			{ 0x216, GET(LWBRX) },
-			{ 0x217, GET(LFSX) },
-			{ 0x218, GETRC(SRW) },
-			{ 0x21b, GETRC(SRD) },
-			{ 0x227, GET(LVRX) },
-			{ 0x237, GET(LFSUX) },
-			{ 0x255, GET(LSWI) },
-			{ 0x256, GET(SYNC) },
-			{ 0x257, GET(LFDX) },
-			{ 0x277, GET(LFDUX) },
-			{ 0x287, GET(STVLX) },
-			{ 0x294, GET(STDBRX) },
-			{ 0x295, GET(STSWX) },
-			{ 0x296, GET(STWBRX) },
-			{ 0x297, GET(STFSX) },
-			{ 0x2a7, GET(STVRX) },
-			{ 0x2b7, GET(STFSUX) },
-			{ 0x2d5, GET(STSWI) },
-			{ 0x2d7, GET(STFDX) },
-			{ 0x2f7, GET(STFDUX) },
-			{ 0x307, GET(LVLXL) },
-			{ 0x316, GET(LHBRX) },
-			{ 0x318, GETRC(SRAW) },
-			{ 0x31a, GETRC(SRAD) },
-			{ 0x327, GET(LVRXL) },
-			{ 0x336, GET(DSS) },
-			{ 0x338, GETRC(SRAWI) },
-			{ 0x33a, GETRC(SRADI) },
-			{ 0x33b, GETRC(SRADI) },
-			{ 0x356, GET(EIEIO) },
-			{ 0x387, GET(STVLXL) },
-			{ 0x396, GET(STHBRX) },
-			{ 0x39a, GETRC(EXTSH) },
-			{ 0x3a7, GET(STVRXL) },
-			{ 0x3ba, GETRC(EXTSB) },
-			{ 0x3d7, GET(STFIWX) },
-			{ 0x3da, GETRC(EXTSW) },
-			{ 0x3d6, GET(ICBI) },
-			{ 0x3f6, GET(DCBZ) },
+			{ 0x000, &D::CMP },
+			{ 0x004, &D::TW },
+			{ 0x006, &D::LVSL },
+			{ 0x007, &D::LVEBX },
+			{ 0x008, &D::SUBFC, 1 },
+			{ 0x009, &D::MULHDU },
+			{ 0x00a, &D::ADDC, 1 },
+			{ 0x00b, &D::MULHWU },
+			{ 0x013, &D::MFOCRF },
+			{ 0x014, &D::LWARX },
+			{ 0x015, &D::LDX },
+			{ 0x017, &D::LWZX },
+			{ 0x018, &D::SLW },
+			{ 0x01a, &D::CNTLZW },
+			{ 0x01b, &D::SLD },
+			{ 0x01c, &D::AND },
+			{ 0x020, &D::CMPL },
+			{ 0x026, &D::LVSR },
+			{ 0x027, &D::LVEHX },
+			{ 0x028, &D::SUBF, 1 },
+			{ 0x035, &D::LDUX },
+			{ 0x036, &D::DCBST },
+			{ 0x037, &D::LWZUX },
+			{ 0x03a, &D::CNTLZD },
+			{ 0x03c, &D::ANDC },
+			{ 0x044, &D::TD },
+			{ 0x047, &D::LVEWX },
+			{ 0x049, &D::MULHD },
+			{ 0x04b, &D::MULHW },
+			{ 0x054, &D::LDARX },
+			{ 0x056, &D::DCBF },
+			{ 0x057, &D::LBZX },
+			{ 0x067, &D::LVX },
+			{ 0x068, &D::NEG, 1 },
+			{ 0x077, &D::LBZUX },
+			{ 0x07c, &D::NOR },
+			{ 0x087, &D::STVEBX },
+			{ 0x088, &D::SUBFE, 1 },
+			{ 0x08a, &D::ADDE, 1 },
+			{ 0x090, &D::MTOCRF },
+			{ 0x095, &D::STDX },
+			{ 0x096, &D::STWCX },
+			{ 0x097, &D::STWX },
+			{ 0x0a7, &D::STVEHX },
+			{ 0x0b5, &D::STDUX },
+			{ 0x0b7, &D::STWUX },
+			{ 0x0c7, &D::STVEWX },
+			{ 0x0c8, &D::SUBFZE, 1 },
+			{ 0x0ca, &D::ADDZE, 1 },
+			{ 0x0d6, &D::STDCX },
+			{ 0x0d7, &D::STBX },
+			{ 0x0e7, &D::STVX },
+			{ 0x0e8, &D::SUBFME, 1 },
+			{ 0x0e9, &D::MULLD, 1 },
+			{ 0x0ea, &D::ADDME, 1 },
+			{ 0x0eb, &D::MULLW, 1 },
+			{ 0x0f6, &D::DCBTST },
+			{ 0x0f7, &D::STBUX },
+			{ 0x10a, &D::ADD, 1 },
+			{ 0x116, &D::DCBT },
+			{ 0x117, &D::LHZX },
+			{ 0x11c, &D::EQV },
+			{ 0x136, &D::ECIWX },
+			{ 0x137, &D::LHZUX },
+			{ 0x13c, &D::XOR },
+			{ 0x153, &D::MFSPR },
+			{ 0x155, &D::LWAX },
+			{ 0x156, &D::DST },
+			{ 0x157, &D::LHAX },
+			{ 0x167, &D::LVXL },
+			{ 0x173, &D::MFTB },
+			{ 0x175, &D::LWAUX },
+			{ 0x176, &D::DSTST },
+			{ 0x177, &D::LHAUX },
+			{ 0x197, &D::STHX },
+			{ 0x19c, &D::ORC },
+			{ 0x1b6, &D::ECOWX },
+			{ 0x1b7, &D::STHUX },
+			{ 0x1bc, &D::OR },
+			{ 0x1c9, &D::DIVDU, 1 },
+			{ 0x1cb, &D::DIVWU, 1 },
+			{ 0x1d3, &D::MTSPR },
+			{ 0x1d6, &D::DCBI },
+			{ 0x1dc, &D::NAND },
+			{ 0x1e7, &D::STVXL },
+			{ 0x1e9, &D::DIVD, 1 },
+			{ 0x1eb, &D::DIVW, 1 },
+			{ 0x207, &D::LVLX },
+			{ 0x214, &D::LDBRX },
+			{ 0x215, &D::LSWX },
+			{ 0x216, &D::LWBRX },
+			{ 0x217, &D::LFSX },
+			{ 0x218, &D::SRW },
+			{ 0x21b, &D::SRD },
+			{ 0x227, &D::LVRX },
+			{ 0x237, &D::LFSUX },
+			{ 0x255, &D::LSWI },
+			{ 0x256, &D::SYNC },
+			{ 0x257, &D::LFDX },
+			{ 0x277, &D::LFDUX },
+			{ 0x287, &D::STVLX },
+			{ 0x294, &D::STDBRX },
+			{ 0x295, &D::STSWX },
+			{ 0x296, &D::STWBRX },
+			{ 0x297, &D::STFSX },
+			{ 0x2a7, &D::STVRX },
+			{ 0x2b7, &D::STFSUX },
+			{ 0x2d5, &D::STSWI },
+			{ 0x2d7, &D::STFDX },
+			{ 0x2f7, &D::STFDUX },
+			{ 0x307, &D::LVLXL },
+			{ 0x316, &D::LHBRX },
+			{ 0x318, &D::SRAW },
+			{ 0x31a, &D::SRAD },
+			{ 0x327, &D::LVRXL },
+			{ 0x336, &D::DSS },
+			{ 0x338, &D::SRAWI },
+			{ 0x33a, &D::SRADI },
+			{ 0x33b, &D::SRADI },
+			{ 0x356, &D::EIEIO },
+			{ 0x387, &D::STVLXL },
+			{ 0x396, &D::STHBRX },
+			{ 0x39a, &D::EXTSH },
+			{ 0x3a7, &D::STVRXL },
+			{ 0x3ba, &D::EXTSB },
+			{ 0x3d7, &D::STFIWX },
+			{ 0x3da, &D::EXTSW },
+			{ 0x3d6, &D::ICBI },
+			{ 0x3f6, &D::DCBZ },
 		});
 
 		// Group 0x3a opcodes (field 30..31)
 		fill_table(0x3a, 2, 0,
 		{
-			{ 0x0, GET(LD) },
-			{ 0x1, GET(LDU) },
-			{ 0x2, GET(LWA) },
+			{ 0x0, &D::LD },
+			{ 0x1, &D::LDU },
+			{ 0x2, &D::LWA },
 		});
 
 		// Group 0x3b opcodes (field 21..30)
 		fill_table(0x3b, 10, 1,
 		{
-			{ 0x12, GETRC(FDIVS), 5 },
-			{ 0x14, GETRC(FSUBS), 5 },
-			{ 0x15, GETRC(FADDS), 5 },
-			{ 0x16, GETRC(FSQRTS), 5 },
-			{ 0x18, GETRC(FRES), 5 },
-			{ 0x19, GETRC(FMULS), 5 },
-			{ 0x1c, GETRC(FMSUBS), 5 },
-			{ 0x1d, GETRC(FMADDS), 5 },
-			{ 0x1e, GETRC(FNMSUBS), 5 },
-			{ 0x1f, GETRC(FNMADDS), 5 },
+			{ 0x12, &D::FDIVS, 5 },
+			{ 0x14, &D::FSUBS, 5 },
+			{ 0x15, &D::FADDS, 5 },
+			{ 0x16, &D::FSQRTS, 5 },
+			{ 0x18, &D::FRES, 5 },
+			{ 0x19, &D::FMULS, 5 },
+			{ 0x1c, &D::FMSUBS, 5 },
+			{ 0x1d, &D::FMADDS, 5 },
+			{ 0x1e, &D::FNMSUBS, 5 },
+			{ 0x1f, &D::FNMADDS, 5 },
 		});
 
 		// Group 0x3e opcodes (field 30..31)
 		fill_table(0x3e, 2, 0,
 		{
-			{ 0x0, GET(STD) },
-			{ 0x1, GET(STDU) },
+			{ 0x0, &D::STD },
+			{ 0x1, &D::STDU },
 		});
 
 		// Group 0x3f opcodes (field 21..30)
 		fill_table(0x3f, 10, 1,
 		{
-			{ 0x026, GETRC(MTFSB1) },
-			{ 0x040, GET(MCRFS) },
-			{ 0x046, GETRC(MTFSB0) },
-			{ 0x086, GETRC(MTFSFI) },
-			{ 0x247, GETRC(MFFS) },
-			{ 0x2c7, GETRC(MTFSF) },
+			{ 0x026, &D::MTFSB1 },
+			{ 0x040, &D::MCRFS },
+			{ 0x046, &D::MTFSB0 },
+			{ 0x086, &D::MTFSFI },
+			{ 0x247, &D::MFFS },
+			{ 0x2c7, &D::MTFSF },
 
-			{ 0x000, GET(FCMPU) },
-			{ 0x00c, GETRC(FRSP) },
-			{ 0x00e, GETRC(FCTIW) },
-			{ 0x00f, GETRC(FCTIWZ) },
+			{ 0x000, &D::FCMPU },
+			{ 0x00c, &D::FRSP },
+			{ 0x00e, &D::FCTIW },
+			{ 0x00f, &D::FCTIWZ },
 
-			{ 0x012, GETRC(FDIV), 5 },
-			{ 0x014, GETRC(FSUB), 5 },
-			{ 0x015, GETRC(FADD), 5 },
-			{ 0x016, GETRC(FSQRT), 5 },
-			{ 0x017, GETRC(FSEL), 5 },
-			{ 0x019, GETRC(FMUL), 5 },
-			{ 0x01a, GETRC(FRSQRTE), 5 },
-			{ 0x01c, GETRC(FMSUB), 5 },
-			{ 0x01d, GETRC(FMADD), 5 },
-			{ 0x01e, GETRC(FNMSUB), 5 },
-			{ 0x01f, GETRC(FNMADD), 5 },
+			{ 0x012, &D::FDIV, 5 },
+			{ 0x014, &D::FSUB, 5 },
+			{ 0x015, &D::FADD, 5 },
+			{ 0x016, &D::FSQRT, 5 },
+			{ 0x017, &D::FSEL, 5 },
+			{ 0x019, &D::FMUL, 5 },
+			{ 0x01a, &D::FRSQRTE, 5 },
+			{ 0x01c, &D::FMSUB, 5 },
+			{ 0x01d, &D::FMADD, 5 },
+			{ 0x01e, &D::FNMSUB, 5 },
+			{ 0x01f, &D::FNMADD, 5 },
 
-			{ 0x020, GET(FCMPO) },
-			{ 0x028, GETRC(FNEG) },
-			{ 0x048, GETRC(FMR) },
-			{ 0x088, GETRC(FNABS) },
-			{ 0x108, GETRC(FABS) },
-			{ 0x32e, GETRC(FCTID) },
-			{ 0x32f, GETRC(FCTIDZ) },
-			{ 0x34e, GETRC(FCFID) },
+			{ 0x020, &D::FCMPO },
+			{ 0x028, &D::FNEG },
+			{ 0x048, &D::FMR },
+			{ 0x088, &D::FNABS },
+			{ 0x108, &D::FABS },
+			{ 0x32e, &D::FCTID },
+			{ 0x32f, &D::FCTIDZ },
+			{ 0x34e, &D::FCFID },
 		});
 	}
 
@@ -635,10 +587,6 @@ public:
 	}
 };
 
-#undef GET_
-#undef GET
-#undef GETRC
-
 namespace ppu_instructions
 {
 	namespace fields
@@ -674,7 +622,6 @@ namespace ppu_instructions
 
 	inline u32 ADDI(u32 rt, u32 ra, s32 si) { ppu_opcode_t op{ 0x0eu << 26 }; op.rd = rt; op.ra = ra; op.simm16 = si; return op.opcode; }
 	inline u32 ADDIS(u32 rt, u32 ra, s32 si) { ppu_opcode_t op{ 0x0fu << 26 }; op.rd = rt; op.ra = ra; op.simm16 = si; return op.opcode; }
-	inline u32 XORIS(u32 rt, u32 ra, s32 si) { ppu_opcode_t op{ 0x1bu << 26 }; op.rd = rt; op.ra = ra; op.simm16 = si; return op.opcode; }
 	inline u32 ORI(u32 rt, u32 ra, u32 ui) { ppu_opcode_t op{ 0x18u << 26 }; op.rd = rt; op.ra = ra; op.uimm16 = ui; return op.opcode; }
 	inline u32 ORIS(u32 rt, u32 ra, u32 ui) { ppu_opcode_t op{ 0x19u << 26 }; op.rd = rt; op.ra = ra; op.uimm16 = ui; return op.opcode; }
 	inline u32 OR(u32 ra, u32 rs, u32 rb, bool rc = false) { ppu_opcode_t op{ 0x1fu << 26 | 0x1bcu << 1 }; op.rs = rs; op.ra = ra; op.rb = rb; op.rc = rc; return op.opcode; }
@@ -686,7 +633,6 @@ namespace ppu_instructions
 	inline u32 MFSPR(u32 rt, u32 spr) { ppu_opcode_t op{ 0x1fu << 26 | 0x153u << 1 }; op.rd = rt; op.spr = spr; return op.opcode; }
 	inline u32 MTSPR(u32 spr, u32 rs) { ppu_opcode_t op{ 0x1fu << 26 | 0x1d3u << 1 }; op.rs = rs; op.spr = spr; return op.opcode; }
 	inline u32 LWZ(u32 rt, u32 ra, s32 si) { ppu_opcode_t op{ 0x20u << 26 }; op.rd = rt; op.ra = ra; op.simm16 = si; return op.opcode; }
-	inline u32 STW(u32 rt, u32 ra, s32 si) { ppu_opcode_t op{ 0x24u << 26 }; op.rd = rt; op.ra = ra; op.simm16 = si; return op.opcode; }
 	inline u32 STD(u32 rs, u32 ra, s32 si) { ppu_opcode_t op{ 0x3eu << 26 }; op.rs = rs; op.ra = ra; op.ds = si / 4; return op.opcode; }
 	inline u32 STDU(u32 rs, u32 ra, s32 si) { ppu_opcode_t op{ 0x3eu << 26 | 1 }; op.rs = rs; op.ra = ra; op.ds = si / 4; return op.opcode; }
 	inline u32 LD(u32 rt, u32 ra, s32 si) { ppu_opcode_t op{ 0x3au << 26 }; op.rd = rt; op.ra = ra; op.ds = si / 4; return op.opcode; }
@@ -699,7 +645,6 @@ namespace ppu_instructions
 	inline u32 STVX(u32 vs, u32 ra, u32 rb) { ppu_opcode_t op{ 31 << 26 | 231 << 1 }; op.vs = vs; op.ra = ra; op.rb = rb; return op.opcode; }
 	inline u32 LFD(u32 frd, u32 ra, s32 si) { ppu_opcode_t op{ 50u << 26 }; op.frd = frd; op.ra = ra; op.simm16 = si; return op.opcode; }
 	inline u32 LVX(u32 vd, u32 ra, u32 rb) { ppu_opcode_t op{ 31 << 26 | 103 << 1 }; op.vd = vd; op.ra = ra; op.rb = rb; return op.opcode; }
-	inline constexpr u32 EIEIO() { return 0x7c0006ac; }
 
 	namespace implicts
 	{
@@ -737,7 +682,7 @@ namespace ppu_instructions
 		inline u32 CLRLDI(u32 x, u32 y, u32 n) { return RLDICL(x, y, 0, n, false); }
 		inline u32 CLRRDI(u32 x, u32 y, u32 n) { return RLDICR(x, y, 0, 63 - n, false); }
 
-		inline constexpr u32 TRAP() { return 0x7FE00008; } // tw 31,r0,r0
+		inline u32 TRAP() { return 0x7FE00008; } // tw 31,r0,r0
 	}
 
 	using namespace implicts;
diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp
index 784cf27829..2785dd79ac 100644
--- a/rpcs3/Emu/Cell/PPUThread.cpp
+++ b/rpcs3/Emu/Cell/PPUThread.cpp
@@ -1,20 +1,17 @@
 #include "stdafx.h"
 #include "Utilities/JIT.h"
 #include "Utilities/StrUtil.h"
-#include "util/serialization.hpp"
 #include "Crypto/sha1.h"
 #include "Crypto/unself.h"
 #include "Loader/ELF.h"
 #include "Loader/mself.hpp"
-#include "Emu/localized_string.h"
 #include "Emu/perf_meter.hpp"
 #include "Emu/Memory/vm_reservation.h"
 #include "Emu/Memory/vm_locking.h"
-#include "Emu/RSX/Core/RSXReservationLock.hpp"
+#include "Emu/RSX/RSXThread.h"
 #include "Emu/VFS.h"
 #include "Emu/system_progress.hpp"
 #include "Emu/system_utils.hpp"
-#include "Emu/System.h"
 #include "PPUThread.h"
 #include "PPUInterpreter.h"
 #include "PPUAnalyser.h"
@@ -26,24 +23,29 @@
 #include "lv2/sys_prx.h"
 #include "lv2/sys_overlay.h"
 #include "lv2/sys_process.h"
-#include "lv2/sys_spu.h"
 
 #ifdef LLVM_AVAILABLE
 #ifdef _MSC_VER
 #pragma warning(push, 0)
 #else
 #pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-Wmissing-noreturn"
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#pragma GCC diagnostic ignored "-Weffc++"
+#pragma GCC diagnostic ignored "-Wmissing-noreturn"
 #endif
-#include <llvm/IR/Verifier.h>
-#include <llvm/Transforms/Utils/BasicBlockUtils.h>
-#include <llvm/Analysis/CGSCCPassManager.h>
-#include <llvm/Analysis/LoopAnalysisManager.h>
-#include <llvm/Passes/PassBuilder.h>
-#include <llvm/Transforms/Scalar/EarlyCSE.h>
+#include "llvm/Support/FormattedStream.h"
+#include "llvm/Support/Host.h"
+#include "llvm/Object/ObjectFile.h"
+#include "llvm/ADT/Triple.h"
+#include "llvm/IR/Verifier.h"
+#include "llvm/IR/InstIterator.h"
+#include "llvm/IR/LegacyPassManager.h"
+#include "llvm/Transforms/Utils/BasicBlockUtils.h"
+#include "llvm/Transforms/Scalar.h"
 #ifdef _MSC_VER
 #pragma warning(pop)
 #else
@@ -53,23 +55,17 @@
 #include "PPUTranslator.h"
 #endif
 
+#include <thread>
 #include <cfenv>
 #include <cctype>
-#include <span>
 #include <optional>
-#include <charconv>
-
 #include "util/asm.hpp"
 #include "util/vm.hpp"
 #include "util/v128.hpp"
-#include "util/simd.hpp"
+#include "util/v128sse.hpp"
 #include "util/sysinfo.hpp"
 
-#include "Utilities/sema.h"
-
-#ifdef __APPLE__
-#include <libkern/OSCacheControl.h>
-#endif
+const bool s_use_ssse3 = utils::has_ssse3();
 
 extern atomic_t<u64> g_watchdog_hold_ctr;
 
@@ -129,63 +125,35 @@ void fmt_class_string<typename ppu_thread::call_history_t>::format(std::string&
 
 	PPUDisAsm dis_asm(cpu_disasm_mode::normal, vm::g_sudo_addr);
 
-	for (u64 count = 0, idx = history.index - 1; idx != umax && count < history.data.size(); count++, idx--)
+	for (u64 count = 0, idx = history.index - 1; idx != umax && count < ppu_thread::call_history_max_size; count++, idx--)
 	{
-		const u32 pc = history.data[idx % history.data.size()];
+		const u32 pc = history.data[idx % ppu_thread::call_history_max_size];
 		dis_asm.disasm(pc);
 		fmt::append(out, "\n(%u) 0x%08x: %s", count, pc, dis_asm.last_opcode);
 	}
 }
 
-template <>
-void fmt_class_string<typename ppu_thread::syscall_history_t>::format(std::string& out, u64 arg)
-{
-	const auto& history = get_object(arg);
-
-	for (u64 count = 0, idx = history.index - 1; idx != umax && count < history.data.size(); count++, idx--)
-	{
-		const auto& entry = history.data[idx % history.data.size()];
-		fmt::append(out, "\n(%u) 0x%08x: %s, 0x%x, r3=0x%x, r4=0x%x, r5=0x%x, r6=0x%x", count, entry.cia, entry.func_name, entry.error, entry.args[0], entry.args[1], entry.args[2], entry.args[3]);
-	}
-}
-
-extern const ppu_decoder<ppu_itype> g_ppu_itype{};
-extern const ppu_decoder<ppu_iname> g_ppu_iname{};
-
-template <>
-bool serialize<ppu_thread::cr_bits>(utils::serial& ar, typename ppu_thread::cr_bits& o)
-{
-	if (ar.is_writing())
-	{
-		ar(o.pack());
-	}
-	else
-	{
-		o.unpack(ar);
-	}
-
-	return true;
-}
+const ppu_decoder<ppu_interpreter_precise> g_ppu_interpreter_precise;
+const ppu_decoder<ppu_interpreter_fast> g_ppu_interpreter_fast;
+const ppu_decoder<ppu_itype> g_ppu_itype;
 
 extern void ppu_initialize();
-extern void ppu_finalize(const ppu_module<lv2_obj>& info, bool force_mem_release = false);
-extern bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only = false, u64 file_size = 0);
-static void ppu_initialize2(class jit_compiler& jit, const ppu_module<lv2_obj>& module_part, const std::string& cache_path, const std::string& obj_name);
-extern bool ppu_load_exec(const ppu_exec_object&, bool virtual_load, const std::string&, utils::serial* = nullptr);
-extern std::pair<shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_object&, bool virtual_load, const std::string& path, s64 file_offset, utils::serial* = nullptr);
+extern void ppu_finalize(const ppu_module& info);
+extern bool ppu_initialize(const ppu_module& info, bool = false);
+static void ppu_initialize2(class jit_compiler& jit, const ppu_module& module_part, const std::string& cache_path, const std::string& obj_name);
+extern std::pair<std::shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_object&, const std::string& path, s64 file_offset);
 extern void ppu_unload_prx(const lv2_prx&);
-extern shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object&, bool virtual_load, const std::string&, s64 file_offset, utils::serial* = nullptr);
+extern std::shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object&, const std::string&, s64 file_offset);
 extern void ppu_execute_syscall(ppu_thread& ppu, u64 code);
-static void ppu_break(ppu_thread&, ppu_opcode_t, be_t<u32>*, ppu_intrp_func*);
+static bool ppu_break(ppu_thread& ppu, ppu_opcode_t op);
 
 extern void do_cell_atomic_128_store(u32 addr, const void* to_write);
 
-const auto ppu_gateway = build_function_asm<void(*)(ppu_thread*)>("ppu_gateway", [](native_asm& c, auto& args)
+const auto ppu_gateway = build_function_asm<void(*)(ppu_thread*)>([](asmjit::X86Assembler& c, auto& args)
 {
 	// Gateway for PPU, converts from native to GHC calling convention, also saves RSP value for escape
 	using namespace asmjit;
 
-#if defined(ARCH_X64)
 #ifdef _WIN32
 	c.push(x86::r15);
 	c.push(x86::r14);
@@ -217,24 +185,22 @@ const auto ppu_gateway = build_function_asm<void(*)(ppu_thread*)>("ppu_gateway",
 #endif
 
 	// Save native stack pointer for longjmp emulation
-	c.mov(x86::qword_ptr(args[0], ::offset32(&ppu_thread::hv_ctx, &rpcs3::hypervisor_context_t::regs)), x86::rsp);
+	c.mov(x86::qword_ptr(args[0], ::offset32(&ppu_thread::saved_native_sp)), x86::rsp);
 
 	// Initialize args
-	c.movabs(x86::r13, reinterpret_cast<u64>(&vm::g_exec_addr));
-	c.mov(x86::r13, x86::qword_ptr(x86::r13));
+	c.mov(x86::r13, x86::qword_ptr(reinterpret_cast<u64>(&vm::g_exec_addr)));
 	c.mov(x86::rbp, args[0]);
 	c.mov(x86::edx, x86::dword_ptr(x86::rbp, ::offset32(&ppu_thread::cia))); // Load PC
 
-	c.mov(x86::rax, x86::qword_ptr(x86::r13, x86::rdx, 1, 0)); // Load call target
-	c.movabs(x86::r12, vm::g_exec_addr_seg_offset);
-	c.add(x86::r12, x86::r13);
-	c.shr(x86::edx, 1);
-	c.mov(x86::edx, x86::word_ptr(x86::r12, x86::edx)); // Load relocation base
-	c.shl(x86::edx, 13);
-	c.mov(x86::r12d, x86::edx); // Set relocation base
+	c.mov(x86::rax, x86::qword_ptr(x86::r13, x86::edx, 1, 0)); // Load call target
+	c.mov(x86::rdx, x86::rax);
+	c.shl(x86::rax, 17);
+	c.shr(x86::rax, 17);
+	c.shr(x86::rdx, 47);
+	c.shl(x86::rdx, 12);
+	c.mov(x86::r12d, x86::edx); // Load relocation base
 
-	c.movabs(x86::rbx, reinterpret_cast<u64>(&vm::g_base_addr));
-	c.mov(x86::rbx, x86::qword_ptr(x86::rbx));
+	c.mov(x86::rbx, x86::qword_ptr(reinterpret_cast<u64>(&vm::g_base_addr)));
 	c.mov(x86::r14, x86::qword_ptr(x86::rbp, ::offset32(&ppu_thread::gpr, 0))); // Load some registers
 	c.mov(x86::rsi, x86::qword_ptr(x86::rbp, ::offset32(&ppu_thread::gpr, 1)));
 	c.mov(x86::rdi, x86::qword_ptr(x86::rbp, ::offset32(&ppu_thread::gpr, 2)));
@@ -282,274 +248,115 @@ const auto ppu_gateway = build_function_asm<void(*)(ppu_thread*)>("ppu_gateway",
 #endif
 
 	c.ret();
-#else
-	// See https://github.com/ghc/ghc/blob/master/rts/include/stg/MachRegs.h
-	// for GHC calling convention definitions on Aarch64
-	// and https://developer.arm.com/documentation/den0024/a/The-ABI-for-ARM-64-bit-Architecture/Register-use-in-the-AArch64-Procedure-Call-Standard/Parameters-in-general-purpose-registers
-	// for AArch64 calling convention
-
-	// PPU function argument layout:
-	// x19 = m_exec
-	// x20 = m_thread,
-	// x21 = seg0
-	// x22 = m_base
-	// x23 - x25 = gpr[0] - gpr[3]
-
-	// Push callee saved registers to the hv context
-	// Assume our LLVM compiled code is unsafe and can clobber our stack. GHC on aarch64 treats stack as scratch.
-	// We also want to store the register context at a fixed place so we can read the hypervisor state from any lcoation.
-	// We need to save x18-x30 = 13 x 8B each + 8 bytes for 16B alignment = 112B
-
-	// Pre-context save
-	// Layout:
-	// pc, sp
-	// x18, x19...x30
-	// NOTE: Do not touch x19..x30 before saving the registers!
-	const u64 hv_register_array_offset = ::offset32(&ppu_thread::hv_ctx, &rpcs3::hypervisor_context_t::regs);
-	Label hv_ctx_pc = c.newLabel(); // Used to hold the far jump return address
-
-	// Sanity
-	ensure(hv_register_array_offset < 4096); // Imm10
-
-	c.mov(a64::x15, args[0]);
-	c.add(a64::x14, a64::x15, Imm(hv_register_array_offset));  // Per-thread context save
-
-	c.adr(a64::x15, hv_ctx_pc); // x15 = pc
-	c.mov(a64::x13, a64::sp);   // x16 = sp
-
-	c.stp(a64::x15, a64::x13, arm::Mem(a64::x14));
-	c.stp(a64::x18, a64::x19, arm::Mem(a64::x14, 16));
-	c.stp(a64::x20, a64::x21, arm::Mem(a64::x14, 32));
-	c.stp(a64::x22, a64::x23, arm::Mem(a64::x14, 48));
-	c.stp(a64::x24, a64::x25, arm::Mem(a64::x14, 64));
-	c.stp(a64::x26, a64::x27, arm::Mem(a64::x14, 80));
-	c.stp(a64::x28, a64::x29, arm::Mem(a64::x14, 96));
-	c.str(a64::x30, arm::Mem(a64::x14, 112));
-
-	// Load REG_Base - use absolute jump target to bypass rel jmp range limits
-	c.mov(a64::x19, Imm(reinterpret_cast<u64>(&vm::g_exec_addr)));
-	c.ldr(a64::x19, arm::Mem(a64::x19));
-	// Load PPUThread struct base -> REG_Sp
-	const arm::GpX ppu_t_base = a64::x20;
-	c.mov(ppu_t_base, args[0]);
-	// Load PC
-	const arm::GpX pc = a64::x15;
-	const arm::GpX cia_addr_reg = a64::x11;
-	// Load offset value
-	c.mov(cia_addr_reg, Imm(static_cast<u64>(::offset32(&ppu_thread::cia))));
-	// Load cia
-	c.ldr(pc.w(), arm::Mem(ppu_t_base, cia_addr_reg));
-
-	// Multiply by 2 to index into ptr table
-	c.add(pc, pc, pc);
-
-	// Load call target
-	const arm::GpX call_target = a64::x13;
-	c.ldr(call_target, arm::Mem(a64::x19, pc));
-	// Compute REG_Hp
-	const arm::GpX reg_hp = a64::x21;
-	c.mov(reg_hp, Imm(vm::g_exec_addr_seg_offset));
-	c.add(reg_hp, reg_hp, pc, arm::Shift(arm::ShiftOp::kLSR, 2));
-	c.ldrh(reg_hp.w(), arm::Mem(a64::x19, reg_hp));
-	c.lsl(reg_hp.w(), reg_hp.w(), 13);
-
-	// Load registers
-	c.mov(a64::x22, Imm(reinterpret_cast<u64>(&vm::g_base_addr)));
-	c.ldr(a64::x22, arm::Mem(a64::x22));
-
-	const arm::GpX gpr_addr_reg = a64::x9;
-	c.mov(gpr_addr_reg, Imm(static_cast<u64>(::offset32(&ppu_thread::gpr))));
-	c.add(gpr_addr_reg, gpr_addr_reg, ppu_t_base);
-	c.ldr(a64::x23, arm::Mem(gpr_addr_reg));
-	c.ldr(a64::x24, arm::Mem(gpr_addr_reg, 8));
-	c.ldr(a64::x25, arm::Mem(gpr_addr_reg, 16));
-
-	// Thread context save. This is needed for PPU because different functions can switch between x19 and x20 for the base register.
-	// We need a different solution to ensure that no matter which version, we get the right vaue on far return.
-	c.mov(a64::x26, ppu_t_base);
-
-	// Save thread pointer to stack. SP is the only register preserved across GHC calls.
-	c.sub(a64::sp, a64::sp, Imm(16));
-	c.str(a64::x20, arm::Mem(a64::sp));
-
-	// GHC scratchpad mem. If managed correctly (i.e no returns ever), GHC functions should never require a stack frame.
-	// We allocate a slab to use for all functions as they tail-call into each other.
-	c.sub(a64::sp, a64::sp, Imm(8192));
-
-	// Execute LLE call
-	c.blr(call_target);
-
-	// Return address after far jump. Reset sp and start unwinding...
-	c.bind(hv_ctx_pc);
-
-	// Clear scratchpad allocation
-	c.add(a64::sp, a64::sp, Imm(8192));
-
-	c.ldr(a64::x20, arm::Mem(a64::sp));
-	c.add(a64::sp, a64::sp, Imm(16));
-
-	// We either got here through normal "ret" which keeps our x20 intact, or we jumped here and the escape reset our x20 reg
-	// Either way, x26 contains our thread base and we forcefully reset the stack pointer
-	c.add(a64::x14, a64::x20, Imm(hv_register_array_offset));  // Per-thread context save
-
-	c.ldr(a64::x15, arm::Mem(a64::x14, 8));
-	c.ldp(a64::x18, a64::x19, arm::Mem(a64::x14, 16));
-	c.ldp(a64::x20, a64::x21, arm::Mem(a64::x14, 32));
-	c.ldp(a64::x22, a64::x23, arm::Mem(a64::x14, 48));
-	c.ldp(a64::x24, a64::x25, arm::Mem(a64::x14, 64));
-	c.ldp(a64::x26, a64::x27, arm::Mem(a64::x14, 80));
-	c.ldp(a64::x28, a64::x29, arm::Mem(a64::x14, 96));
-	c.ldr(a64::x30, arm::Mem(a64::x14, 112));
-
-	// Return
-	c.mov(a64::sp, a64::x15);
-	c.ret(a64::x30);
-#endif
 });
 
-const extern auto ppu_escape = build_function_asm<void(*)(ppu_thread*)>("ppu_escape", [](native_asm& c, auto& args)
+const extern auto ppu_escape = build_function_asm<void(*)(ppu_thread*)>([](asmjit::X86Assembler& c, auto& args)
 {
 	using namespace asmjit;
 
-#if defined(ARCH_X64)
 	// Restore native stack pointer (longjmp emulation)
-	c.mov(x86::rsp, x86::qword_ptr(args[0], ::offset32(&ppu_thread::hv_ctx, &rpcs3::hypervisor_context_t::regs)));
+	c.mov(x86::rsp, x86::qword_ptr(args[0], ::offset32(&ppu_thread::saved_native_sp)));
 
 	// Return to the return location
-	c.sub(x86::rsp, 8);
-	c.ret();
-#else
-	// We really shouldn't be using this, but an implementation shoudln't hurt
-	// Far jump return. Only clobbers x30.
-	const arm::GpX ppu_t_base = a64::x20;
-	const u64 hv_register_array_offset = ::offset32(&ppu_thread::hv_ctx, &rpcs3::hypervisor_context_t::regs);
-	c.mov(ppu_t_base, args[0]);
-	c.mov(a64::x30, Imm(hv_register_array_offset));
-	c.ldr(a64::x30, arm::Mem(ppu_t_base, a64::x30));
-	c.ret(a64::x30);
-#endif
+	c.jmp(x86::qword_ptr(x86::rsp, -8));
 });
 
 void ppu_recompiler_fallback(ppu_thread& ppu);
 
-#if defined(ARCH_X64)
-const auto ppu_recompiler_fallback_ghc = build_function_asm<void(*)(ppu_thread& ppu)>("", [](native_asm& c, auto& args)
+const auto ppu_recompiler_fallback_ghc = build_function_asm<void(*)(ppu_thread& ppu)>([](asmjit::X86Assembler& c, auto& args)
 {
 	using namespace asmjit;
 
 	c.mov(args[0], x86::rbp);
-	c.jmp(ppu_recompiler_fallback);
+	c.jmp(imm_ptr(ppu_recompiler_fallback));
 });
-#elif defined(ARCH_ARM64)
-const auto ppu_recompiler_fallback_ghc = build_function_asm<void(*)(ppu_thread& ppu)>("", [](native_asm& c, auto& args)
-{
-	using namespace asmjit;
-
-	Label fallback_fn = c.newLabel();
-	Label escape_fn = c.newLabel();
-
-	// This is called as GHC so the first arg is in x20.
-	// Fix up the arg registers and call the real function.
-	c.mov(args[0], a64::x20);
-	c.ldr(a64::x13, arm::ptr(fallback_fn));
-	c.blr(a64::x13);
-
-	// There is no call-stack to return to in arm64 GHC. Escape to host.
-	c.mov(a64::x0, a64::x20);
-	c.ldr(a64::x13, arm::ptr(escape_fn));
-	c.br(a64::x13);
-
-	c.bind(fallback_fn);
-	c.embedUInt64(reinterpret_cast<u64>(ppu_recompiler_fallback));
-	c.bind(escape_fn);
-	c.embedUInt64(reinterpret_cast<u64>(ppu_escape));
-});
-#endif
 
 // Get pointer to executable cache
-static inline u8* ppu_ptr(u32 addr)
+static u64& ppu_ref(u32 addr)
 {
-	return vm::g_exec_addr + u64{addr} * 2;
-}
-
-static inline u8* ppu_seg_ptr(u32 addr)
-{
-	return vm::g_exec_addr + vm::g_exec_addr_seg_offset + (addr >> 1);
-}
-
-static inline ppu_intrp_func_t ppu_read(u32 addr)
-{
-	return read_from_ptr<ppu_intrp_func_t>(ppu_ptr(addr));
+	return *reinterpret_cast<u64*>(vm::g_exec_addr + u64{addr} * 2);
 }
 
 // Get interpreter cache value
-static ppu_intrp_func_t ppu_cache(u32 addr)
+static u64 ppu_cache(u32 addr)
 {
-	if (g_cfg.core.ppu_decoder != ppu_decoder_type::_static)
+	if (g_cfg.core.ppu_decoder > ppu_decoder_type::fast)
 	{
 		fmt::throw_exception("Invalid PPU decoder");
 	}
 
-	return g_fxo->get<ppu_interpreter_rt>().decode(vm::read32(addr));
+	// Select opcode table
+	const auto& table = *(
+		g_cfg.core.ppu_decoder == ppu_decoder_type::precise
+		? &g_ppu_interpreter_precise.get_table()
+		: &g_ppu_interpreter_fast.get_table());
+
+	return reinterpret_cast<uptr>(table[ppu_decode(vm::read32(addr))]);
 }
 
-static ppu_intrp_func ppu_ret = {[](ppu_thread& ppu, ppu_opcode_t, be_t<u32>* this_op, ppu_intrp_func*)
+static bool ppu_fallback(ppu_thread& ppu, ppu_opcode_t op)
 {
-	// Fix PC and return (step execution)
-	ppu.cia = vm::get_addr(this_op);
-	return;
-}};
+	if (g_cfg.core.ppu_debug)
+	{
+		ppu_log.error("Unregistered instruction: 0x%08x", op.opcode);
+	}
 
-static void ppu_fallback(ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func* next_fn)
-{
-	const auto _pc = vm::get_addr(this_op);
-	const auto _fn = ppu_cache(_pc);
-	write_to_ptr<ppu_intrp_func_t>(ppu_ptr(_pc), _fn);
-	return _fn(ppu, op, this_op, next_fn);
+	ppu_ref(ppu.cia) = ppu_cache(ppu.cia);
+	return false;
 }
 
 // TODO: Make this a dispatch call
 void ppu_recompiler_fallback(ppu_thread& ppu)
 {
-	perf_meter<"PPUFALL1"_u64> perf0;
-
 	if (g_cfg.core.ppu_debug)
 	{
-		ppu_log.error("Unregistered PPU Function (LR=0x%x)", ppu.lr);
+		ppu_log.error("Unregistered PPU Function (LR=0x%llx)", ppu.lr);
 	}
 
-	const auto& table = g_fxo->get<ppu_interpreter_rt>();
+	const auto& table = g_ppu_interpreter_fast.get_table();
+
+	u64 ctr = 0;
 
 	while (true)
 	{
-		if (uptr func = uptr(ppu_read(ppu.cia)); func != reinterpret_cast<uptr>(ppu_recompiler_fallback_ghc))
+		// Run instructions in interpreter
+		if (const u32 op = vm::read32(ppu.cia); ctr++, table[ppu_decode(op)](ppu, {op})) [[likely]]
+		{
+			ppu.cia += 4;
+			continue;
+		}
+
+		if (uptr func = ppu_ref(ppu.cia); (func << 17 >> 17) != reinterpret_cast<uptr>(ppu_recompiler_fallback_ghc))
 		{
 			// We found a recompiler function at cia, return
 			break;
 		}
 
-		// Run one instruction in interpreter (TODO)
-		const u32 op = vm::read32(ppu.cia);
-		table.decode(op)(ppu, {op}, vm::_ptr<u32>(ppu.cia), &ppu_ret);
-
 		if (ppu.test_stopped())
 		{
 			break;
 		}
 	}
+
+	if (g_cfg.core.ppu_debug)
+	{
+		ppu_log.warning("Exiting interpreter at 0x%x (executed %u functions)", ppu.cia, ctr);
+	}
 }
 
 void ppu_reservation_fallback(ppu_thread& ppu)
 {
-	perf_meter<"PPUFALL2"_u64> perf0;
-
-	const auto& table = g_fxo->get<ppu_interpreter_rt>();
+	const auto& table = g_ppu_interpreter_fast.get_table();
 
 	while (true)
 	{
-		// Run one instruction in interpreter (TODO)
+		// Run instructions in interpreter
 		const u32 op = vm::read32(ppu.cia);
-		table.decode(op)(ppu, {op}, vm::_ptr<u32>(ppu.cia), &ppu_ret);
+
+		if (table[ppu_decode(op)](ppu, {op})) [[likely]]
+		{
+			ppu.cia += 4;
+		}
 
 		if (!ppu.raddr || !ppu.use_full_rdata)
 		{
@@ -564,202 +371,31 @@ void ppu_reservation_fallback(ppu_thread& ppu)
 	}
 }
 
-u32 ppu_read_mmio_aware_u32(u8* vm_base, u32 eal)
+static std::unordered_map<u32, u32>* s_ppu_toc;
+
+static bool ppu_check_toc(ppu_thread& ppu, ppu_opcode_t)
 {
-	if (eal >= RAW_SPU_BASE_ADDR)
+	// Compare TOC with expected value
+	const auto found = s_ppu_toc->find(ppu.cia);
+
+	if (ppu.gpr[2] != found->second)
 	{
-		// RawSPU MMIO
-		auto thread = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu((eal - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET));
+		ppu_log.error("Unexpected TOC (0x%x, expected 0x%x)", ppu.gpr[2], found->second);
 
-		if (!thread)
+		if (!ppu.state.test_and_set(cpu_flag::dbg_pause) && ppu.check_state())
 		{
-			// Access Violation
-		}
-		else if ((eal - RAW_SPU_BASE_ADDR) % RAW_SPU_OFFSET + sizeof(u32) - 1 < SPU_LS_SIZE) // LS access
-		{
-		}
-		else if (u32 value{}; thread->read_reg(eal, value))
-		{
-			return std::bit_cast<be_t<u32>>(value);
-		}
-		else
-		{
-			fmt::throw_exception("Invalid RawSPU MMIO offset (addr=0x%x)", eal);
-		}
-	}
-
-	// Value is assumed to be swapped
-	return read_from_ptr<u32>(vm_base + eal);
-}
-
-void ppu_write_mmio_aware_u32(u8* vm_base, u32 eal, u32 value)
-{
-	if (eal >= RAW_SPU_BASE_ADDR)
-	{
-		// RawSPU MMIO
-		auto thread = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu((eal - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET));
-
-		if (!thread)
-		{
-			// Access Violation
-		}
-		else if ((eal - RAW_SPU_BASE_ADDR) % RAW_SPU_OFFSET + sizeof(u32) - 1 < SPU_LS_SIZE) // LS access
-		{
-		}
-		else if (thread->write_reg(eal, std::bit_cast<be_t<u32>>(value)))
-		{
-			return;
-		}
-		else
-		{
-			fmt::throw_exception("Invalid RawSPU MMIO offset (addr=0x%x)", eal);
-		}
-	}
-
-	// Value is assumed swapped
-	write_to_ptr<u32>(vm_base + eal, value);
-}
-
-extern bool ppu_test_address_may_be_mmio(std::span<const be_t<u32>> insts)
-{
-	std::set<u32> reg_offsets;
-	bool found_raw_spu_base = false;
-	bool found_spu_area_offset_element = false;
-
-	for (u32 inst : insts)
-	{
-		// Common around MMIO (orders IO)
-		if (inst == ppu_instructions::EIEIO())
-		{
-			return true;
-		}
-
-		const u32 op_imm16 = (inst & 0xfc00ffff);
-
-		// RawSPU MMIO base
-		// 0xe00000000 is a common constant so try to find an ORIS 0x10 or ADDIS 0x10 nearby (for multiplying SPU ID by it)
-		if (op_imm16 == ppu_instructions::ADDIS({}, {}, -0x2000) || op_imm16 == ppu_instructions::ORIS({}, {}, 0xe000)  || op_imm16 == ppu_instructions::XORIS({}, {}, 0xe000))
-		{
-			found_raw_spu_base = true;
-
-			if (found_spu_area_offset_element)
-			{
-				// Found both
-				return true;
-			}
-		}
-		else if (op_imm16 == ppu_instructions::ORIS({}, {}, 0x10) || op_imm16 == ppu_instructions::ADDIS({}, {}, 0x10))
-		{
-			found_spu_area_offset_element = true;
-
-			if (found_raw_spu_base)
-			{
-				// Found both
-				return true;
-			}
-		}
-		// RawSPU MMIO base + problem state offset
-		else if (op_imm16 == ppu_instructions::ADDIS({}, {}, -0x1ffc))
-		{
-			return true;
-		}
-		else if (op_imm16 == ppu_instructions::ORIS({}, {}, 0xe004))
-		{
-			return true;
-		}
-		else if (op_imm16 == ppu_instructions::XORIS({}, {}, 0xe004))
-		{
-			return true;
-		}
-		// RawSPU MMIO base + problem state offset + 64k of SNR1 offset
-		else if (op_imm16 == ppu_instructions::ADDIS({}, {}, -0x1ffb))
-		{
-			return true;
-		}
-		else if (op_imm16 == ppu_instructions::ORIS({}, {}, 0xe005))
-		{
-			return true;
-		}
-		else if (op_imm16 == ppu_instructions::XORIS({}, {}, 0xe005))
-		{
-			return true;
-		}
-		// RawSPU MMIO base + problem state offset + 264k of SNR2 offset (STW allows 32K+- offset so in order to access SNR2 it needs to first add another 64k)
-		// SNR2 is the only register currently implemented that has its 0x80000 bit is set so its the only one its hardcoded access is done this way
-		else if (op_imm16 == ppu_instructions::ADDIS({}, {}, -0x1ffa))
-		{
-			return true;
-		}
-		else if (op_imm16 == ppu_instructions::ORIS({}, {}, 0xe006))
-		{
-			return true;
-		}
-		else if (op_imm16 == ppu_instructions::XORIS({}, {}, 0xe006))
-		{
-			return true;
-		}
-		// Try to detect a function that receives RawSPU problem state base pointer as an argument
-		else if ((op_imm16 & ~0xffff) == ppu_instructions::LWZ({}, {}, 0) ||
-			(op_imm16 & ~0xffff) == ppu_instructions::STW({}, {}, 0) ||
-			(op_imm16 & ~0xffff) == ppu_instructions::ADDI({}, {}, 0))
-		{
-			const bool is_load = (op_imm16 & ~0xffff) == ppu_instructions::LWZ({}, {}, 0);
-			const bool is_store = (op_imm16 & ~0xffff) == ppu_instructions::STW({}, {}, 0);
-			const bool is_neither = !is_store && !is_load;
-			const bool is_snr = (is_store || is_neither) && ((op_imm16 & 0xffff) == (SPU_RdSigNotify2_offs & 0xffff) || (op_imm16 & 0xffff) == (SPU_RdSigNotify1_offs & 0xffff));
-
-			if (is_snr || spu_thread::test_is_problem_state_register_offset(op_imm16 & 0xffff, is_load || is_neither, is_store || is_neither))
-			{
-				reg_offsets.insert(op_imm16 & 0xffff);
-
-				if (reg_offsets.size() >= 2)
-				{
-					// Assume high MMIO likelyhood if more than one offset appears in nearby code
-					// Such as common IN_MBOX + OUT_MBOX
-					return true;
-				}
-			}
-		}
-	}
-
-	return false;
-}
-
-struct ppu_toc_manager
-{
-	std::unordered_map<u32, u32> toc_map;
-
-	shared_mutex mutex;
-};
-
-static void ppu_check_toc(ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func* next_fn)
-{
-	ppu.cia = vm::get_addr(this_op);
-
-	{
-		auto& toc_manager = g_fxo->get<ppu_toc_manager>();
-
-		reader_lock lock(toc_manager.mutex);
-
-		auto& ppu_toc = toc_manager.toc_map;
-
-		const auto found = ppu_toc.find(ppu.cia);
-
-		if (found != ppu_toc.end())
-		{
-			const u32 toc = atomic_storage<u32>::load(found->second);
-
-			// Compare TOC with expected value
-			if (toc != umax && ppu.gpr[2] != toc)
-			{
-				ppu_log.error("Unexpected TOC (0x%x, expected 0x%x)", ppu.gpr[2], toc);
-				atomic_storage<u32>::exchange(found->second, u32{umax});
-			}
+			return false;
 		}
 	}
 
 	// Fallback to the interpreter function
-	return ppu_cache(ppu.cia)(ppu, op, this_op, next_fn);
+	const u64 val = ppu_cache(ppu.cia);
+	if (reinterpret_cast<decltype(&ppu_interpreter::UNK)>(val & 0xffffffff)(ppu, {static_cast<u32>(val >> 32)}))
+	{
+		ppu.cia += 4;
+	}
+
+	return false;
 }
 
 extern void ppu_register_range(u32 addr, u32 size)
@@ -774,17 +410,15 @@ extern void ppu_register_range(u32 addr, u32 size)
 	addr &= -0x10000;
 
 	// Register executable range at
-	utils::memory_commit(ppu_ptr(addr), u64{size} * 2, utils::protection::rw);
-	ensure(vm::page_protect(addr, size, 0, vm::page_executable));
-
-	// Segment data
-	utils::memory_commit(ppu_seg_ptr(addr), size >> 1, utils::protection::rw);
+	utils::memory_commit(&ppu_ref(addr), u64{size} * 2, utils::protection::rw);
+	vm::page_protect(addr, size, 0, vm::page_executable);
 
 	if (g_cfg.core.ppu_debug)
 	{
 		utils::memory_commit(vm::g_stat_addr + addr, size);
 	}
 
+	const u64 fallback = reinterpret_cast<uptr>(ppu_fallback);
 	const u64 seg_base = addr;
 
 	while (size)
@@ -792,13 +426,11 @@ extern void ppu_register_range(u32 addr, u32 size)
 		if (g_cfg.core.ppu_decoder == ppu_decoder_type::llvm)
 		{
 			// Assume addr is the start of first segment of PRX
-			write_to_ptr<uptr>(ppu_ptr(addr), std::bit_cast<uptr>(ppu_recompiler_fallback_ghc));
-			write_to_ptr<u16>(ppu_seg_ptr(addr), static_cast<u16>(seg_base >> 13));
+			ppu_ref(addr) = reinterpret_cast<uptr>(ppu_recompiler_fallback_ghc) | (seg_base << (32 + 3));
 		}
 		else
 		{
-			write_to_ptr<ppu_intrp_func_t>(ppu_ptr(addr), ppu_fallback);
-			write_to_ptr<u16>(ppu_seg_ptr(addr), 0);
+			ppu_ref(addr) = fallback;
 		}
 
 		addr += 4;
@@ -806,14 +438,12 @@ extern void ppu_register_range(u32 addr, u32 size)
 	}
 }
 
-static void ppu_far_jump(ppu_thread&, ppu_opcode_t, be_t<u32>*, ppu_intrp_func*);
-
-extern void ppu_register_function_at(u32 addr, u32 size, ppu_intrp_func_t ptr = nullptr)
+extern void ppu_register_function_at(u32 addr, u32 size, ppu_function_t ptr)
 {
 	// Initialize specific function
 	if (ptr)
 	{
-		write_to_ptr<uptr>(ppu_ptr(addr), std::bit_cast<uptr>(ptr));
+		ppu_ref(addr) = (reinterpret_cast<uptr>(ptr) & 0x7fff'ffff'ffffu) | (ppu_ref(addr) & ~0x7fff'ffff'ffffu);
 		return;
 	}
 
@@ -833,11 +463,13 @@ extern void ppu_register_function_at(u32 addr, u32 size, ppu_intrp_func_t ptr =
 	}
 
 	// Initialize interpreter cache
+	const u64 _break = reinterpret_cast<uptr>(ppu_break);
+
 	while (size)
 	{
-		if (auto old = ppu_read(addr); old != ppu_break && old != ppu_far_jump)
+		if (ppu_ref(addr) != _break)
 		{
-			write_to_ptr<ppu_intrp_func_t>(ppu_ptr(addr), ppu_cache(addr));
+			ppu_ref(addr) = ppu_cache(addr);
 		}
 
 		addr += 4;
@@ -845,325 +477,13 @@ extern void ppu_register_function_at(u32 addr, u32 size, ppu_intrp_func_t ptr =
 	}
 }
 
-extern void ppu_register_function_at(u32 addr, u32 size, u64 ptr)
-{
-	return ppu_register_function_at(addr, size, reinterpret_cast<ppu_intrp_func_t>(ptr));
-}
-
-u32 ppu_get_exported_func_addr(u32 fnid, const std::string& module_name);
-
-void ppu_return_from_far_jump(ppu_thread& ppu, ppu_opcode_t, be_t<u32>*, ppu_intrp_func*)
-{
-	auto& calls_info = ppu.hle_func_calls_with_toc_info;
-	ensure(!calls_info.empty());
-
-	// Branch to next instruction after far jump call entry with restored R2 and LR
-	const auto restore_info = &calls_info.back();
-	ppu.cia = restore_info->cia + 4;
-	ppu.lr = restore_info->saved_lr;
-	ppu.gpr[2] = restore_info->saved_r2;
-
-	calls_info.pop_back();
-}
-
-static const bool s_init_return_far_jump_func = []
-{
-	REG_HIDDEN_FUNC_PURE(ppu_return_from_far_jump);
-	return true;
-}();
-
-struct ppu_far_jumps_t
-{
-	struct all_info_t
-	{
-		u32 target;
-		bool link;
-		bool with_toc;
-		std::string module_name;
-		ppu_intrp_func_t func;
-
-		u32 get_target(u32 pc, ppu_thread* ppu = nullptr) const
-		{
-			u32 direct_target = this->target;
-
-			bool to_link = this->link;
-			bool from_opd = this->with_toc;
-
-			if (!this->module_name.empty())
-			{
-				direct_target = ppu_get_exported_func_addr(direct_target, this->module_name);
-			}
-
-			if (from_opd && !vm::check_addr<sizeof(ppu_func_opd_t)>(direct_target))
-			{
-				// Avoid reading unmapped memory under mutex
-				from_opd = false;
-			}
-
-			if (from_opd)
-			{
-				auto& opd = vm::_ref<ppu_func_opd_t>(direct_target);
-				direct_target = opd.addr;
-
-				// We modify LR to custom values here
-				to_link = false;
-
-				if (ppu)
-				{
-					auto& calls_info = ppu->hle_func_calls_with_toc_info;
-
-					// Save LR and R2
-					// Set LR to the this ppu_return_from_far_jump branch for restoration of registers
-					// NOTE: In order to clean up this information all calls must return in order
-					auto& saved_info = calls_info.emplace_back();
-					saved_info.cia = pc;
-					saved_info.saved_lr = std::exchange(ppu->lr, g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(ppu_return_from_far_jump), true));
-					saved_info.saved_r2 = std::exchange(ppu->gpr[2], opd.rtoc);
-				}
-			}
-
-			if (to_link && ppu)
-			{
-				ppu->lr = pc + 4;
-			}
-
-			return direct_target;
-		}
-	};
-
-	ppu_far_jumps_t(int) noexcept {}
-
-	std::map<u32, all_info_t> vals;
-	::jit_runtime rt;
-
-	mutable shared_mutex mutex;
-
-	// Get target address, 'ppu' is used in ppu_far_jump in order to modify registers
-	u32 get_target(u32 pc, ppu_thread* ppu = nullptr)
-	{
-		reader_lock lock(mutex);
-
-		if (auto it = vals.find(pc); it != vals.end())
-		{
-			all_info_t& all_info = it->second;
-			return all_info.get_target(pc, ppu);
-		}
-
-		return {};
-	}
-
-	// Get function patches in range (entry -> target)
-	std::vector<std::pair<u32, u32>> get_targets(u32 pc, u32 size)
-	{
-		std::vector<std::pair<u32, u32>> targets;
-
-		reader_lock lock(mutex);
-
-		auto it = vals.lower_bound(pc);
-
-		if (it == vals.end())
-		{
-			return targets;
-		}
-
-		if (it->first >= pc + size)
-		{
-			return targets;
-		}
-
-		for (auto end = vals.lower_bound(pc + size); it != end; it++)
-		{
-			all_info_t& all_info = it->second;
-
-			if (u32 target = all_info.get_target(it->first))
-			{
-				targets.emplace_back(it->first, target);
-			}
-		}
-
-		return targets;
-	}
-
-	// Generate a mini-function which updates PC (for LLVM) and jumps to ppu_far_jump to handle redirections
-	template <bool Locked = true>
-	ppu_intrp_func_t gen_jump(u32 pc)
-	{
-		[[maybe_unused]] std::conditional_t<Locked, std::lock_guard<shared_mutex>, const shared_mutex&> lock(mutex);
-
-		auto it = vals.find(pc);
-
-		if (it == vals.end())
-		{
-			return nullptr;
-		}
-
-		if (!it->second.func)
-		{
-			it->second.func = build_function_asm<ppu_intrp_func_t>("", [&](native_asm& c, auto& args)
-			{
-				using namespace asmjit;
-
-#ifdef ARCH_X64
-				c.mov(args[0], x86::rbp);
-				c.mov(x86::dword_ptr(args[0], ::offset32(&ppu_thread::cia)), pc);
-				c.jmp(ppu_far_jump);
-#else
-				Label jmp_address = c.newLabel();
-				Label imm_address = c.newLabel();
-
-				c.ldr(args[1].w(), arm::ptr(imm_address));
-				c.str(args[1].w(), arm::Mem(args[0], ::offset32(&ppu_thread::cia)));
-				c.ldr(args[1], arm::ptr(jmp_address));
-				c.br(args[1]);
-
-				c.align(AlignMode::kCode, 16);
-				c.bind(jmp_address);
-				c.embedUInt64(reinterpret_cast<u64>(ppu_far_jump));
-				c.bind(imm_address);
-				c.embedUInt32(pc);
-#endif
-			}, &rt);
-		}
-
-		return it->second.func;
-	}
-};
-
-u32 ppu_get_far_jump(u32 pc)
-{
-	if (!g_fxo->is_init<ppu_far_jumps_t>())
-	{
-		return 0;
-	}
-
-	return g_fxo->get<ppu_far_jumps_t>().get_target(pc);
-}
-
-static void ppu_far_jump(ppu_thread& ppu, ppu_opcode_t, be_t<u32>*, ppu_intrp_func*)
-{
-	const u32 cia = g_fxo->get<ppu_far_jumps_t>().get_target(ppu.cia, &ppu);
-
-	if (!vm::check_addr(cia, vm::page_executable))
-	{
-		fmt::throw_exception("PPU far jump failed! (returned cia = 0x%08x)", cia);
-	}
-
-	ppu.cia = cia;
-}
-
-bool ppu_form_branch_to_code(u32 entry, u32 target, bool link, bool with_toc, std::string module_name)
-{
-	// Force align entry and target
-	entry &= -4;
-
-	// Exported functions are using target as FNID, must not be changed
-	if (module_name.empty())
-	{
-		target &= -4;
-
-		u32 cia_target = target;
-
-		if (with_toc)
-		{
-			ppu_func_opd_t opd{};
-			if (!vm::try_access(target, &opd, sizeof(opd), false))
-			{
-				// Cannot access function descriptor
-				return false;
-			}
-
-			// For now allow situations where OPD is changed later by patches or by the program itself
-			//cia_target = opd.addr;
-
-			// So force a valid target (executable, yet not equal to entry)
-			cia_target = entry ^ 8;
-		}
-
-		// Target CIA must be aligned, executable and not equal with
-		if (cia_target % 4 || entry == cia_target || !vm::check_addr(cia_target, vm::page_executable))
-		{
-			return false;
-		}
-	}
-
-	// Entry must be executable
-	if (!vm::check_addr(entry, vm::page_executable))
-	{
-		return false;
-	}
-
-	g_fxo->init<ppu_far_jumps_t>(0);
-
-	if (!module_name.empty())
-	{
-		// Always use function descriptor for exported functions
-		with_toc = true;
-	}
-
-	if (with_toc)
-	{
-		// Always link for calls with function descriptor
-		link = true;
-	}
-
-	// Register branch target in host memory, not guest memory
-	auto& jumps = g_fxo->get<ppu_far_jumps_t>();
-
-	std::lock_guard lock(jumps.mutex);
-	jumps.vals.insert_or_assign(entry, ppu_far_jumps_t::all_info_t{target, link, with_toc, std::move(module_name)});
-	ppu_register_function_at(entry, 4, g_cfg.core.ppu_decoder == ppu_decoder_type::_static ? &ppu_far_jump : ensure(g_fxo->get<ppu_far_jumps_t>().gen_jump<false>(entry)));
-
-	return true;
-}
-
-bool ppu_form_branch_to_code(u32 entry, u32 target, bool link, bool with_toc)
-{
-	return ppu_form_branch_to_code(entry, target, link, with_toc, std::string{});
-}
-
-bool ppu_form_branch_to_code(u32 entry, u32 target, bool link)
-{
-	return ppu_form_branch_to_code(entry, target, link, false);
-}
-
-bool ppu_form_branch_to_code(u32 entry, u32 target)
-{
-	return ppu_form_branch_to_code(entry, target, false);
-}
-
-void ppu_remove_hle_instructions(u32 addr, u32 size)
-{
-	if (Emu.IsStopped() || !g_fxo->is_init<ppu_far_jumps_t>())
-	{
-		return;
-	}
-
-	auto& jumps = g_fxo->get<ppu_far_jumps_t>();
-
-	std::lock_guard lock(jumps.mutex);
-
-	for (auto it = jumps.vals.begin(); it != jumps.vals.end();)
-	{
-		if (it->first >= addr && it->first <= addr + size - 1 && size)
-		{
-			it = jumps.vals.erase(it);
-			continue;
-		}
-
-		it++;
-	}
-}
-
-atomic_t<bool> g_debugger_pause_all_threads_on_bp = false;
+atomic_t<bool> g_debugger_pause_all_threads_on_bp = true;
 
 // Breakpoint entry point
-static void ppu_break(ppu_thread& ppu, ppu_opcode_t, be_t<u32>* this_op, ppu_intrp_func* next_fn)
+static bool ppu_break(ppu_thread& ppu, ppu_opcode_t)
 {
 	const bool pause_all = g_debugger_pause_all_threads_on_bp;
 
-	const u32 old_cia = vm::get_addr(this_op);
-	ppu.cia = old_cia;
-
 	// Pause
 	ppu.state.atomic_op([&](bs_t<cpu_flag>& state)
 	{
@@ -1174,17 +494,22 @@ static void ppu_break(ppu_thread& ppu, ppu_opcode_t, be_t<u32>* this_op, ppu_int
 	if (pause_all)
 	{
 		// Pause all other threads
-		Emu.CallFromMainThread([]() { Emu.Pause(); });
+		Emu.CallAfter([]() { Emu.Pause(); });
 	}
 
-	if (ppu.check_state() || old_cia != atomic_storage<u32>::load(ppu.cia))
+	if (ppu.check_state())
 	{
-		// Do not execute if PC changed
-		return;
+		return false;
 	}
 
 	// Fallback to the interpreter function
-	return ppu_cache(ppu.cia)(ppu, {*this_op}, this_op, ppu.state ? &ppu_ret : next_fn);
+	const u64 val = ppu_cache(ppu.cia);
+	if (reinterpret_cast<decltype(&ppu_interpreter::UNK)>(val)(ppu, {vm::read32(ppu.cia).get()}))
+	{
+		ppu.cia += 4;
+	}
+
+	return false;
 }
 
 // Set or remove breakpoint
@@ -1195,9 +520,11 @@ extern bool ppu_breakpoint(u32 addr, bool is_adding)
 		return false;
 	}
 
+	const u64 _break = reinterpret_cast<uptr>(&ppu_break);
+
 	// Remove breakpoint parameters
-	ppu_intrp_func_t func_original = 0;
-	ppu_intrp_func_t breakpoint = &ppu_break;
+	u64 to_set = 0;
+	u64 expected = _break;
 
 	if (u32 hle_addr{}; g_fxo->is_init<ppu_function_manager>() && (hle_addr = g_fxo->get<ppu_function_manager>().addr))
 	{
@@ -1207,40 +534,33 @@ extern bool ppu_breakpoint(u32 addr, bool is_adding)
 		if (addr % 8 == 4 && index < ppu_function_manager::get().size())
 		{
 			// HLE function placement
-			func_original = ppu_function_manager::get()[index];
+			to_set = reinterpret_cast<uptr>(ppu_function_manager::get()[index]);
 		}
 	}
 
-	if (!func_original)
+	if (!to_set)
 	{
 		// If not an HLE function use regular instruction function
-		func_original = ppu_cache(addr);
+		to_set = ppu_cache(addr);
 	}
 
+	u64& _ref = ppu_ref(addr);
+
 	if (is_adding)
 	{
-		if (ppu_read(addr) == ppu_fallback)
+		// Swap if adding
+		std::swap(to_set, expected);
+
+		const u64 _fall = reinterpret_cast<uptr>(&ppu_fallback);
+
+		if (_ref == _fall)
 		{
 			ppu_log.error("Unregistered instruction replaced with a breakpoint at 0x%08x", addr);
-			func_original = ppu_fallback;
+			expected = _fall;
 		}
-
-		if (ppu_read(addr) != func_original)
-		{
-			return false;
-		}
-
-		write_to_ptr<ppu_intrp_func_t>(ppu_ptr(addr), breakpoint);
-		return true;
 	}
 
-	if (ppu_read(addr) != breakpoint)
-	{
-		return false;
-	}
-
-	write_to_ptr<ppu_intrp_func_t>(ppu_ptr(addr), func_original);
-	return true;
+	return atomic_storage<u64>::compare_exchange(_ref, expected, to_set);
 }
 
 extern bool ppu_patch(u32 addr, u32 value)
@@ -1251,7 +571,7 @@ extern bool ppu_patch(u32 addr, u32 value)
 		return false;
 	}
 
-	vm::writer_lock rlock;
+	vm::reader_lock rlock;
 
 	if (!vm::check_addr(addr))
 	{
@@ -1270,11 +590,14 @@ extern bool ppu_patch(u32 addr, u32 value)
 
 	*vm::get_super_ptr<u32>(addr) = value;
 
+	const u64 _break = reinterpret_cast<uptr>(&ppu_break);
+	const u64 fallback = reinterpret_cast<uptr>(&ppu_fallback);
+
 	if (is_exec)
 	{
-		if (auto old = ppu_read(addr); old != ppu_break && old != ppu_fallback)
+		if (ppu_ref(addr) != _break && ppu_ref(addr) != fallback)
 		{
-			write_to_ptr<ppu_intrp_func_t>(ppu_ptr(addr), ppu_cache(addr));
+			ppu_ref(addr) = ppu_cache(addr);
 		}
 	}
 
@@ -1285,12 +608,6 @@ std::array<u32, 2> op_branch_targets(u32 pc, ppu_opcode_t op)
 {
 	std::array<u32, 2> res{pc + 4, umax};
 
-	if (u32 target = g_fxo->is_init<ppu_far_jumps_t>() ? g_fxo->get<ppu_far_jumps_t>().get_target(pc) : 0)
-	{
-		res[0] = target;
-		return res;
-	}
-
 	switch (const auto type = g_ppu_itype.decode(op.opcode))
 	{
 	case ppu_itype::B:
@@ -1312,31 +629,9 @@ std::array<u32, 2> op_branch_targets(u32 pc, ppu_opcode_t op)
 	return res;
 }
 
-void ppu_thread::dump_regs(std::string& ret, std::any& custom_data) const
+std::string ppu_thread::dump_regs() const
 {
-	const system_state emu_state = Emu.GetStatus(false);
-	const bool is_stopped_or_frozen = state & cpu_flag::exit || emu_state == system_state::frozen || emu_state <= system_state::stopping;
-	const ppu_debugger_mode mode = debugger_mode.load();
-
-	const bool is_decimal = !is_stopped_or_frozen && mode == ppu_debugger_mode::is_decimal;
-
-	struct dump_registers_data_t
-	{
-		u32 preferred_cr_field_index = 7;
-	};
-
-	dump_registers_data_t* func_data = nullptr;
-
-	func_data = std::any_cast<dump_registers_data_t>(&custom_data);
-
-	if (!func_data)
-	{
-		custom_data.reset();
-		custom_data = std::make_any<dump_registers_data_t>();
-		func_data = ensure(std::any_cast<dump_registers_data_t>(&custom_data));
-	}
-
-	PPUDisAsm dis_asm(cpu_disasm_mode::normal, vm::g_sudo_addr);
+	std::string ret;
 
 	for (uint i = 0; i < 32; ++i)
 	{
@@ -1345,47 +640,7 @@ void ppu_thread::dump_regs(std::string& ret, std::any& custom_data) const
 		// Fixup for syscall arguments
 		if (current_function && i >= 3 && i <= 10) reg = syscall_args[i - 3];
 
-		auto [is_const, const_value] = dis_asm.try_get_const_gpr_value(i, cia);
-
-		if (const_value != reg)
-		{
-			// Expectation of predictable code path has not been met (such as a branch directly to the instruction)
-			is_const = false;
-		}
-
-		fmt::append(ret, "r%d%s%s ", i, i <= 9 ? " " : "", is_const ? "©" : ":");
-
-		bool printed_error = false;
-
-		if ((reg >> 31) == 0x1'ffff'ffff)
-		{
-			const usz old_size = ret.size();
-
-			fmt::append(ret, "%s (0x%x)", CellError{static_cast<u32>(reg)}, reg);
-
-			// Test if failed to format (appended " 0x8".. in such case)
-			if (ret[old_size] == '0')
-			{
-				// Failed
-				ret.resize(old_size);
-			}
-			else
-			{
-				printed_error = true;
-			}
-		}
-
-		if (!printed_error)
-		{
-			if (is_decimal)
-			{
-				fmt::append(ret, "%-11d", reg);
-			}
-			else
-			{
-				fmt::append(ret, "0x%-8llx", reg);
-			}
-		}
+		fmt::append(ret, "r%d%s: 0x%-8llx", i, i <= 9 ? " " : "", reg);
 
 		constexpr u32 max_str_len = 32;
 		constexpr u32 hex_count = 8;
@@ -1395,32 +650,26 @@ void ppu_thread::dump_regs(std::string& ret, std::any& custom_data) const
 			bool is_function = false;
 			u32 toc = 0;
 
-			auto is_exec_code = [&](u32 addr)
+			if (const u32 reg_ptr = *vm::get_super_ptr<u32>(static_cast<u32>(reg));
+				vm::check_addr<max_str_len>(reg_ptr))
 			{
-				return addr % 4 == 0 && vm::check_addr(addr, vm::page_executable) && g_ppu_itype.decode(*vm::get_super_ptr<u32>(addr)) != ppu_itype::UNK;
-			};
-
-			if (const u32 reg_ptr = *vm::get_super_ptr<be_t<u32, 1>>(static_cast<u32>(reg));
-				vm::check_addr<8>(reg_ptr) && !vm::check_addr(toc, vm::page_executable))
-			{
-				// Check executability and alignment
-				if (reg % 4 == 0 && is_exec_code(reg_ptr))
+				if ((reg | reg_ptr) % 4 == 0 && vm::check_addr(reg_ptr, vm::page_executable))
 				{
 					toc = *vm::get_super_ptr<u32>(static_cast<u32>(reg + 4));
 
-					if (toc % 4 == 0 && (toc >> 29) == (reg_ptr >> 29) && vm::check_addr(toc) && !vm::check_addr(toc, vm::page_executable))
+					if (toc % 4 == 0 && vm::check_addr(toc))
 					{
 						is_function = true;
 						reg = reg_ptr;
 					}
 				}
 			}
-			else if (is_exec_code(static_cast<u32>(reg)))
+			else if (reg % 4 == 0 && vm::check_addr(reg, vm::page_executable))
 			{
 				is_function = true;
 			}
 
-			const auto gpr_buf = vm::get_super_ptr<u8>(static_cast<u32>(reg));
+			const auto gpr_buf = vm::get_super_ptr<u8>(reg);
 
 			std::string buf_tmp(gpr_buf, gpr_buf + max_str_len);
 
@@ -1434,7 +683,8 @@ void ppu_thread::dump_regs(std::string& ret, std::any& custom_data) const
 				}
 				else
 				{
-					dis_asm.disasm(static_cast<u32>(reg));
+					PPUDisAsm dis_asm(cpu_disasm_mode::normal, vm::g_sudo_addr);
+					dis_asm.disasm(reg);
 					fmt::append(ret, " -> %s", dis_asm.last_opcode);
 				}
 			}
@@ -1456,70 +706,12 @@ void ppu_thread::dump_regs(std::string& ret, std::any& custom_data) const
 			}
 		}
 
-		fmt::trim_back(ret);
-		ret += '\n';
+		fmt::append(ret, "\n");
 	}
 
-	const u32 current_cia = cia;
-	const u32 cr_packed = cr.pack();
-
-	for (u32 addr :
-	{
-		current_cia,
-		current_cia + 4,
-		current_cia + 8,
-		current_cia - 4,
-		current_cia + 12,
-	})
-	{
-		dis_asm.disasm(addr);
-
-		if (dis_asm.last_opcode.size() <= 4)
-		{
-			continue;
-		}
-
-		usz index = dis_asm.last_opcode.rfind(",cr");
-
-		if (index > dis_asm.last_opcode.size() - 4)
-		{
-			index = dis_asm.last_opcode.rfind(" cr");
-		}
-
-		if (index <= dis_asm.last_opcode.size() - 4)
-		{
-			const char result = dis_asm.last_opcode[index + 3];
-
-			if (result >= '0' && result <= '7')
-			{
-				func_data->preferred_cr_field_index = result - '0';
-				break;
-			}
-		}
-
-		if (dis_asm.last_opcode.find("stdcx.") != umax || dis_asm.last_opcode.find("stwcx.") != umax)
-		{
-			// Modifying CR0
-			func_data->preferred_cr_field_index = 0;
-			break;
-		}
-	}
-
-	const u32 displayed_cr_field = (cr_packed >> ((7 - func_data->preferred_cr_field_index) * 4)) & 0xf;
-
-	fmt::append(ret, "CR: 0x%08x, CR%d: [LT=%u GT=%u EQ=%u SO=%u]\n", cr_packed, func_data->preferred_cr_field_index, displayed_cr_field >> 3, (displayed_cr_field >> 2) & 1, (displayed_cr_field >> 1) & 1, displayed_cr_field & 1);
-
 	for (uint i = 0; i < 32; ++i)
 	{
-		const f64 r = fpr[i];
-
-		if (!std::bit_cast<u64>(r))
-		{
-			fmt::append(ret, "f%d%s: %-12.6G [%-18s] (f32=0x%x)\n", i, i <= 9 ? " " : "", r, "", std::bit_cast<u32>(f32(r)));
-			continue;
-		}
-
-		fmt::append(ret, "f%d%s: %-12.6G [0x%016x] (f32=0x%x)\n", i, i <= 9 ? " " : "", r, std::bit_cast<u64>(r), std::bit_cast<u32>(f32(r)));
+		fmt::append(ret, "f%d%s: %.6G\n", i, i <= 9 ? " " : "", fpr[i]);
 	}
 
 	for (uint i = 0; i < 32; ++i, ret += '\n')
@@ -1542,49 +734,19 @@ void ppu_thread::dump_regs(std::string& ret, std::any& custom_data) const
 		}
 	}
 
-	fmt::append(ret, "CIA: 0x%x\n", current_cia);
+	fmt::append(ret, "CR: 0x%08x\n", cr.pack());
 	fmt::append(ret, "LR: 0x%llx\n", lr);
 	fmt::append(ret, "CTR: 0x%llx\n", ctr);
 	fmt::append(ret, "VRSAVE: 0x%08x\n", vrsave);
 	fmt::append(ret, "XER: [CA=%u | OV=%u | SO=%u | CNT=%u]\n", xer.ca, xer.ov, xer.so, xer.cnt);
 	fmt::append(ret, "VSCR: [SAT=%u | NJ=%u]\n", sat, nj);
 	fmt::append(ret, "FPSCR: [FL=%u | FG=%u | FE=%u | FU=%u]\n", fpscr.fl, fpscr.fg, fpscr.fe, fpscr.fu);
-
-	const u32 addr = raddr;
-
-	if (addr)
+	if (const u32 addr = raddr)
 		fmt::append(ret, "Reservation Addr: 0x%x", addr);
 	else
 		fmt::append(ret, "Reservation Addr: none");
 
-	fmt::append(ret, "\nReservation Data (entire cache line):\n");
-
-	be_t<u32> data[32]{};
-	std::memcpy(data, rdata, sizeof(rdata)); // Show the data even if the reservation was lost inside the atomic loop
-
-	if (addr && !use_full_rdata)
-	{
-		const u32 offset = addr & 0x78;
-
-		fmt::append(ret, "[0x%02x] %08x %08x\n", offset, data[offset / sizeof(u32)], data[offset / sizeof(u32) + 1]);
-
-		// Asterisk marks the offset of data that had been given to the guest PPU code
-		*(&ret.back() - (addr & 4 ? 9 : 18)) = '*';
-	}
-	else
-	{
-		for (usz i = 0; i < std::size(data); i += 4)
-		{
-			fmt::append(ret, "[0x%02x] %08x %08x %08x %08x\n", i * sizeof(data[0])
-				, data[i + 0], data[i + 1], data[i + 2], data[i + 3]);
-		}
-
-		if (addr)
-		{
-			// See the note above
-			*(&ret.back() - (4 - (addr % 16 / 4)) * 9 - (8 - (addr % 128 / 16)) * std::size("[0x00]"sv)) = '*';
-		}
-	}
+	return ret;
 }
 
 std::string ppu_thread::dump_callstack() const
@@ -1637,19 +799,16 @@ std::vector<std::pair<u32, u32>> ppu_thread::dump_callstack_list() const
 
 	std::vector<std::pair<u32, u32>> call_stack_list;
 
-	bool is_first = true;
-	bool skip_single_frame = false;
-
-	const u64 _lr = this->lr;
-	const u32 _cia = this->cia;
-	const u64 gpr0 = this->gpr[0];
+	bool first = true;
 
 	for (
 		u64 sp = r1;
 		sp % 0x10 == 0u && sp >= stack_min && sp <= stack_max - ppu_stack_start_offset;
-		is_first = false
+		sp = *vm::get_super_ptr<u64>(static_cast<u32>(sp)), first = false
 		)
 	{
+		u64 addr = *vm::get_super_ptr<u64>(static_cast<u32>(sp + 16));
+
 		auto is_invalid = [](u64 addr)
 		{
 			if (addr > u32{umax} || addr % 4 || !vm::check_addr(static_cast<u32>(addr), vm::page_executable))
@@ -1658,343 +817,31 @@ std::vector<std::pair<u32, u32>> ppu_thread::dump_callstack_list() const
 			}
 
 			// Ignore HLE stop address
-			return addr == g_fxo->get<ppu_function_manager>().func_addr(1, true);
+			return addr == g_fxo->get<ppu_function_manager>().func_addr(1) + 4;
 		};
 
-		if (is_first && !is_invalid(_lr))
+		if (is_invalid(addr))
 		{
-			// Detect functions with no stack or before LR has been stored
-
-			// Tracking if instruction has already been passed through
-			// Instead of using map or set, use two vectors relative to CIA and resize as needed
-			std::vector<be_t<u32>> inst_neg;
-			std::vector<be_t<u32>> inst_pos;
-
-			auto get_inst = [&](u32 pos) -> be_t<u32>&
+			if (first)
 			{
-				static be_t<u32> s_inst_empty{};
+				// Function hasn't saved LR, could be because it's a leaf function
+				// Use LR directly instead
+				addr = lr;
 
-				if (pos < _cia)
+				if (is_invalid(addr))
 				{
-					const u32 neg_dist = (_cia - pos - 4) / 4;
-
-					if (neg_dist >= inst_neg.size())
-					{
-						const u32 inst_bound = pos & -256;
-
-						const usz old_size = inst_neg.size();
-						const usz new_size = neg_dist + (pos - inst_bound) / 4 + 1;
-
-						if (new_size >= 0x8000)
-						{
-							// Gross lower limit for the function (if it is that size it is unlikely that it is even a leaf function)
-							return s_inst_empty;
-						}
-
-						inst_neg.resize(new_size);
-
-						if (!vm::try_access(inst_bound, &inst_neg[old_size], ::narrow<u32>((new_size - old_size) * sizeof(be_t<u32>)), false))
-						{
-							// Failure (this would be detected as failure by zeroes)
-						}
-
-						// Reverse the array (because this buffer directs backwards in address)
-
-						for (usz start = old_size, end = new_size - 1; start < end; start++, end--)
-						{
-							std::swap(inst_neg[start], inst_neg[end]);
-						}
-					}
-
-					return inst_neg[neg_dist];
-				}
-
-				const u32 pos_dist = (pos - _cia) / 4;
-
-				if (pos_dist >= inst_pos.size())
-				{
-					const u32 inst_bound = utils::align<u32>(pos, 256);
-
-					const usz old_size = inst_pos.size();
-					const usz new_size = pos_dist + (inst_bound - pos) / 4 + 1;
-
-					if (new_size >= 0x8000)
-					{
-						// Gross upper limit for the function (if it is that size it is unlikely that it is even a leaf function)
-						return s_inst_empty;
-					}
-
-					inst_pos.resize(new_size);
-
-					if (!vm::try_access(pos, &inst_pos[old_size], ::narrow<u32>((new_size - old_size) * sizeof(be_t<u32>)), false))
-					{
-						// Failure (this would be detected as failure by zeroes)
-					}
-				}
-
-				return inst_pos[pos_dist];
-			};
-
-			bool upper_abort = false;
-
-			struct context_t
-			{
-				u32 start_point;
-				bool maybe_leaf = false; // True if the function is leaf or at the very end/start of non-leaf
-				bool non_leaf = false; // Absolutely not a leaf
-				bool about_to_push_frame = false; // STDU incoming
-				bool about_to_store_lr = false; // Link is about to be stored on stack
-				bool about_to_pop_frame = false; // ADDI R1 is about to be issued
-				bool about_to_load_link = false; // MTLR is about to be issued
-				bool maybe_use_reg0_instead_of_lr = false; // Use R0 at the end of a non-leaf function if ADDI has been issued before MTLR
-			};
-
-			// Start with CIA
-			std::deque<context_t> workload{context_t{_cia}};
-
-			usz start = 0;
-
-			for (; start < workload.size(); start++)
-			{
-				for (u32 wa = workload[start].start_point; vm::check_addr(wa, vm::page_executable);)
-				{
-					be_t<u32>& opcode = get_inst(wa);
-
-					auto& [_, maybe_leaf, non_leaf, about_to_push_frame, about_to_store_lr,
-						about_to_pop_frame, about_to_load_link, maybe_use_reg0_instead_of_lr] = workload[start];
-
-					if (!opcode)
-					{
-						// Already passed or failure of reading
-						break;
-					}
-
-					const ppu_opcode_t op{opcode};
-
-					// Mark as passed through
-					opcode = 0;
-
-					const auto type = g_ppu_itype.decode(op.opcode);
-
-					if (workload.size() == 1 && type == ppu_itype::STDU && op.rs == 1u && op.ra == 1u)
-					{
-						if (op.simm16 >= 0)
-						{
-							// Against ABI
-							non_leaf = true;
-							upper_abort = true;
-							break;
-						}
-
-						// Saving LR to register: this is indeed a new function (ok because LR has not been saved yet)
-						maybe_leaf = true;
-						about_to_push_frame = true;
-						about_to_pop_frame = false;
-						upper_abort = true;
-						break;
-					}
-
-					if (workload.size() == 1 && type == ppu_itype::STD && op.ra == 1u && op.rs == 0u)
-					{
-						bool found_matching_stdu = false;
-
-						for (u32 back = 1; back < 20; back++)
-						{
-							be_t<u32>& opcode = get_inst(utils::sub_saturate<u32>(_cia, back * 4));
-
-							if (!opcode)
-							{
-								// Already passed or failure of reading
-								break;
-							}
-
-							const ppu_opcode_t test_op{opcode};
-
-							const auto type = g_ppu_itype.decode(test_op.opcode);
-
-							if (type == ppu_itype::BCLR)
-							{
-								break;
-							}
-
-							if (type == ppu_itype::STDU && test_op.rs == 1u && test_op.ra == 1u)
-							{
-								if (0 - (test_op.ds << 2) == (op.ds << 2) - 0x10)
-								{
-									found_matching_stdu = true;
-								}
-
-								break;
-							}
-						}
-
-						if (found_matching_stdu)
-						{
-							// Saving LR to stack: this is indeed a new function (ok because LR has not been saved yet)
-							maybe_leaf = true;
-							about_to_store_lr = true;
-							about_to_pop_frame = true;
-							upper_abort = true;
-							break;
-						}
-					}
-
-					const u32 spr = ((op.spr >> 5) | ((op.spr & 0x1f) << 5));
-
-					// It can be placed before or after STDU, ignore for now
-					// if (workload.size() == 1 && type == ppu_itype::MFSPR && op.rs == 0u && spr == 0x8)
-					// {
-					// 	// Saving LR to register: this is indeed a new function (ok because LR has not been saved yet)
-					// 	maybe_leaf = true;
-					// 	about_to_store_lr = true;
-					// 	about_to_pop_frame = true;
-					// }
-
-					if (type == ppu_itype::MTSPR && spr == 0x8 && op.rs == 0u)
-					{
-						// Test for special case: if ADDI R1 is not found later in code, it means that LR is not restored and R0 should be used instead
-						// Can also search for ADDI R1 backwards and pull the value from stack (needs more research if it is more reliable)
-						maybe_use_reg0_instead_of_lr = true;
-					}
-
-					if (type == ppu_itype::UNK)
-					{
-						// Ignore for now
-						break;
-					}
-
-					if ((type & ppu_itype::branch) && op.lk)
-					{
-						// Gave up on LR before saving
-						non_leaf = true;
-						about_to_pop_frame = true;
-						upper_abort = true;
-						break;
-					}
-
-					// Even if BCLR is conditional, it still counts because LR value is ready for return
-					if (type == ppu_itype::BCLR)
-					{
-						// Returned
-						maybe_leaf = true;
-						upper_abort = true;
-						break;
-					}
-
-					if (type == ppu_itype::ADDI && op.ra == 1u && op.rd == 1u)
-					{
-						if (op.simm16 < 0)
-						{
-							// Against ABI
-							non_leaf = true;
-							upper_abort = true;
-							break;
-						}
-						else if (op.simm16 > 0)
-						{
-							// Remember that SP is about to be restored
-							about_to_pop_frame = true;
-							non_leaf = true;
-							upper_abort = true;
-							break;
-						}
-					}
-
-					const auto results = op_branch_targets(wa, op);
-
-					bool proceeded = false;
-
-					for (usz res_i = 0; res_i < results.size(); res_i++)
-					{
-						const u32 route_pc = results[res_i];
-
-						if (route_pc == umax)
-						{
-							continue;
-						}
-
-						if (vm::check_addr(route_pc, vm::page_executable) && get_inst(route_pc))
-						{
-							if (proceeded)
-							{
-								// Remember next route start point
-								workload.push_back(context_t{route_pc});
-							}
-							else
-							{
-								// Next PC
-								wa = route_pc;
-								proceeded = true;
-							}
-						}
-					}
-				}
-
-				if (upper_abort)
-				{
-					break;
+					// Skip it, workaround
+					continue;
 				}
 			}
-
-			const context_t& res = workload[std::min<usz>(start, workload.size() - 1)];
-
-			if (res.maybe_leaf && !res.non_leaf)
+			else
 			{
-				const u32 result = res.maybe_use_reg0_instead_of_lr ? static_cast<u32>(gpr0) : static_cast<u32>(_lr);
-
-				// Same stack as far as we know
-				call_stack_list.emplace_back(result, static_cast<u32>(sp));
-
-				if (res.about_to_store_lr)
-				{
-					// LR has yet to be stored on stack, ignore the stack value
-					skip_single_frame = true;
-				}
-			}
-
-			if (res.about_to_pop_frame || (res.maybe_leaf && !res.non_leaf))
-			{
-				const u64 temp_sp = *vm::get_super_ptr<u64>(static_cast<u32>(sp));
-
-				if (temp_sp <= sp)
-				{
-					// Ensure inequality and that the old stack pointer is higher than current
-					break;
-				}
-
-				// Read the first stack frame so caller addresses can be obtained
-				sp = temp_sp;
-				continue;
+				break;
 			}
 		}
 
-		u64 addr = *vm::get_super_ptr<u64>(static_cast<u32>(sp + 16));
-
-		if (skip_single_frame)
-		{
-			skip_single_frame = false;
-		}
-		else if (!is_invalid(addr))
-		{
-			// TODO: function addresses too
-			call_stack_list.emplace_back(static_cast<u32>(addr), static_cast<u32>(sp));
-		}
-		else if (!is_first)
-		{
-			break;
-		}
-
-		const u64 temp_sp = *vm::get_super_ptr<u64>(static_cast<u32>(sp));
-
-		if (temp_sp <= sp)
-		{
-			// Ensure inequality and that the old stack pointer is higher than current
-			break;
-		}
-
-		sp = temp_sp;
-
-		is_first = false;
+		// TODO: function addresses too
+		call_stack_list.emplace_back(static_cast<u32>(addr), static_cast<u32>(sp));
 	}
 
 	return call_stack_list;
@@ -2002,19 +849,9 @@ std::vector<std::pair<u32, u32>> ppu_thread::dump_callstack_list() const
 
 std::string ppu_thread::dump_misc() const
 {
-	std::string ret = cpu_thread::dump_misc();
+	std::string ret;
 
-	if (ack_suspend)
-	{
-		if (ret.ends_with("\n"))
-		{
-			ret.pop_back();
-		}
-
-		fmt::append(ret, " (LV2 suspended)\n");
-	}
-
-	fmt::append(ret, "Priority: %d\n", prio.load().prio);
+	fmt::append(ret, "Priority: %d\n", +prio);
 	fmt::append(ret, "Stack: 0x%x..0x%x\n", stack_addr, stack_addr + stack_size - 1);
 	fmt::append(ret, "Joiner: %s\n", joiner.load());
 
@@ -2033,7 +870,7 @@ std::string ppu_thread::dump_misc() const
 			if (u64 v = gpr[i]; v != syscall_args[i - 3])
 				fmt::append(ret, " ** r%d: 0x%llx\n", i, v);
 	}
-	else if (is_paused() || is_stopped())
+	else if (is_paused())
 	{
 		if (const auto last_func = last_function)
 		{
@@ -2060,11 +897,11 @@ std::string ppu_thread::dump_misc() const
 	return ret;
 }
 
-void ppu_thread::dump_all(std::string& ret) const
+std::string ppu_thread::dump_all() const
 {
-	cpu_thread::dump_all(ret);
+	std::string ret = cpu_thread::dump_all();
 
-	if (call_history.data.size() > 1)
+	if (!call_history.data.empty())
 	{
 		ret +=
 			"\nCalling History:"
@@ -2073,14 +910,7 @@ void ppu_thread::dump_all(std::string& ret) const
 		fmt::append(ret, "%s", call_history);
 	}
 
-	if (syscall_history.data.size() > 1)
-	{
-		ret +=
-			"\nHLE/LV2 History:"
-			"\n================";
-
-		fmt::append(ret, "%s", syscall_history);
-	}
+	return ret;
 }
 
 extern thread_local std::string(*g_tls_log_prefix)();
@@ -2089,13 +919,10 @@ void ppu_thread::cpu_task()
 {
 	std::fesetround(FE_TONEAREST);
 
-	if (g_cfg.core.set_daz_and_ftz)
+	if (g_cfg.core.set_daz_and_ftz && g_cfg.core.ppu_decoder != ppu_decoder_type::precise)
 	{
-		gv_set_zeroing_denormals();
-	}
-	else
-	{
-		gv_unset_zeroing_denormals();
+		// Set DAZ and FTZ
+		_mm_setcsr(_mm_getcsr() | 0x8840);
 	}
 
 	// Execute cmd_queue
@@ -2107,7 +934,9 @@ void ppu_thread::cpu_task()
 		{
 		case ppu_cmd::opcode:
 		{
-			cmd_pop(), g_fxo->get<ppu_interpreter_rt>().decode(arg)(*this, {arg}, vm::_ptr<u32>(cia - 4), &ppu_ret);
+			cmd_pop(), g_cfg.core.ppu_decoder == ppu_decoder_type::precise
+				? g_ppu_interpreter_precise.decode(arg)(*this, {arg})
+				: g_ppu_interpreter_fast.decode(arg)(*this, {arg});
 			break;
 		}
 		case ppu_cmd::set_gpr:
@@ -2138,113 +967,43 @@ void ppu_thread::cpu_task()
 		}
 		case ppu_cmd::lle_call:
 		{
-#ifdef __APPLE__
-			pthread_jit_write_protect_np(true);
-#endif
 			const vm::ptr<u32> opd(arg < 32 ? vm::cast(gpr[arg]) : vm::cast(arg));
 			cmd_pop(), fast_call(opd[0], opd[1]);
 			break;
 		}
-		case ppu_cmd::entry_call:
-		{
-#ifdef __APPLE__
-			pthread_jit_write_protect_np(true);
-#endif
-			cmd_pop(), fast_call(entry_func.addr, entry_func.rtoc, true);
-			break;
-		}
 		case ppu_cmd::hle_call:
 		{
-			cmd_pop(), ::at32(ppu_function_manager::get(), arg)(*this, {arg}, vm::_ptr<u32>(cia - 4), &ppu_ret);
+			cmd_pop(), ppu_function_manager::get().at(arg)(*this);
 			break;
 		}
 		case ppu_cmd::opd_call:
 		{
-#ifdef __APPLE__
-			pthread_jit_write_protect_np(true);
-#endif
 			const ppu_func_opd_t opd = cmd_get(1).as<ppu_func_opd_t>();
 			cmd_pop(1), fast_call(opd.addr, opd.rtoc);
 			break;
 		}
 		case ppu_cmd::ptr_call:
 		{
-			const ppu_intrp_func_t func = cmd_get(1).as<ppu_intrp_func_t>();
-			cmd_pop(1), func(*this, {}, vm::_ptr<u32>(cia - 4), &ppu_ret);
-			break;
-		}
-		case ppu_cmd::cia_call:
-		{
-			loaded_from_savestate = true;
-			cmd_pop(), fast_call(std::exchange(cia, 0), gpr[2], true);
+			const ppu_function_t func = cmd_get(1).as<ppu_function_t>();
+			cmd_pop(1), func(*this);
 			break;
 		}
 		case ppu_cmd::initialize:
 		{
-#ifdef __APPLE__
-			pthread_jit_write_protect_np(false);
-#endif
 			cmd_pop();
 
-			ppu_initialize();
-
-			if (Emu.IsStopped())
+			while (!g_fxo->get<rsx::thread>().is_inited && !is_stopped())
 			{
-				return;
+				// Wait for RSX to be initialized
+				thread_ctrl::wait_on(g_fxo->get<rsx::thread>().is_inited, false);
 			}
 
-			spu_cache::initialize();
-
-#ifdef __APPLE__
-			pthread_jit_write_protect_np(true);
-#endif
-#ifdef ARCH_ARM64
-			// Flush all cache lines after potentially writing executable code
-			asm("ISB");
-			asm("DSB ISH");
-#endif
+			ppu_initialize(), spu_cache::initialize();
 
 			// Wait until the progress dialog is closed.
 			// We don't want to open a cell dialog while a native progress dialog is still open.
-			while (u32 v = g_progr_ptotal)
-			{
-				if (Emu.IsStopped())
-				{
-					return;
-				}
-
-				g_progr_ptotal.wait(v);
-			}
-
-			g_fxo->get<progress_dialog_workaround>().show_overlay_message_only = true;
-
-			// Sadly we can't postpone initializing guest time because we need to run PPU threads
-			// (the farther it's postponed, the less accuracy of guest time has been lost)
-			Emu.FixGuestTime();
-
-			// Run SPUs waiting on a syscall (savestates related)
-			idm::select<named_thread<spu_thread>>([&](u32, named_thread<spu_thread>& spu)
-			{
-				if (spu.group && spu.index == spu.group->waiter_spu_index)
-				{
-					if (std::exchange(spu.stop_flag_removal_protection, false))
-					{
-						return;
-					}
-
-					ensure(spu.state.test_and_reset(cpu_flag::stop));
-					spu.state.notify_one();
-				}
-			});
-
-			// Check if this is the only PPU left to initialize (savestates related)
-			if (lv2_obj::is_scheduler_ready())
-			{
-				if (Emu.IsStarting())
-				{
-					Emu.FinalizeRunRequest();
-				}
-			}
+			thread_ctrl::wait_on<atomic_wait::op_ne>(g_progr_ptotal, 0);
+			g_fxo->get<progress_dialog_workaround>().skip_the_progress_dialog = true;
 
 			break;
 		}
@@ -2284,7 +1043,7 @@ void ppu_thread::cpu_sleep()
 
 void ppu_thread::cpu_on_stop()
 {
-	if (current_function && is_stopped())
+	if (current_function)
 	{
 		if (start_time)
 		{
@@ -2294,60 +1053,15 @@ void ppu_thread::cpu_on_stop()
 		{
 			ppu_log.warning("'%s' aborted", current_function);
 		}
+
+		current_function = {};
 	}
-
-	current_function = {};
-
-	// TODO: More conditions
-	if (Emu.IsStopped() && g_cfg.core.ppu_debug)
-	{
-		std::string ret;
-		dump_all(ret);
-		ppu_log.notice("thread context: %s", ret);
-	}
-
-	if (is_stopped())
-	{
-		if (last_succ == 0 && last_fail == 0 && exec_bytes == 0)
-		{
-			perf_log.notice("PPU thread perf stats are not available.");
-		}
-		else
-		{
-			perf_log.notice("Perf stats for STCX reload: success %u, failure %u", last_succ, last_fail);
-			perf_log.notice("Perf stats for instructions: total %u", exec_bytes / 4);
-		}
-	}
-}
-
-void ppu_thread::cpu_wait(bs_t<cpu_flag> old)
-{
-	// Meanwhile while waiting, notify SPU waiters
-	if (u32 addr = res_notify)
-	{
-		res_notify = 0;
-
-		if (res_notify_time == vm::reservation_notifier_count_index(addr).second)
-		{
-			vm::reservation_notifier_notify(addr);
-		}
-	}
-
-	if (old != state)
-	{
-		return;
-	}
-
-	state.wait(old);
 }
 
 void ppu_thread::exec_task()
 {
-	if (g_cfg.core.ppu_decoder != ppu_decoder_type::_static)
+	if (g_cfg.core.ppu_decoder == ppu_decoder_type::llvm)
 	{
-		// HVContext push to allow recursion. This happens with guest callback invocations.
-		const auto old_hv_ctx = hv_ctx;
-
 		while (true)
 		{
 			if (state) [[unlikely]]
@@ -2359,48 +1073,95 @@ void ppu_thread::exec_task()
 			ppu_gateway(this);
 		}
 
-		// HVContext pop
-		hv_ctx = old_hv_ctx;
 		return;
 	}
 
 	const auto cache = vm::g_exec_addr;
-	const auto mem_ = vm::g_base_addr;
+	using func_t = decltype(&ppu_interpreter::UNK);
 
 	while (true)
 	{
-		if (test_stopped()) [[unlikely]]
+		const auto exec_op = [this](u64 op)
 		{
-			return;
+			return reinterpret_cast<func_t>(op)(*this, {vm::read32(cia).get()});
+		};
+
+		if (cia % 8 || state) [[unlikely]]
+		{
+			if (test_stopped()) return;
+
+			// Decode single instruction (may be step)
+			if (exec_op(*reinterpret_cast<u64*>(cache + u64{cia} * 2))) { cia += 4; }
+			continue;
 		}
 
-		gv_zeroupper();
+		u64 op0, op1, op2, op3;
+		u64 _pos = u64{cia} * 2;
 
-		// Execute instruction (may be step; execute only one instruction if state)
-		const auto op = reinterpret_cast<be_t<u32>*>(mem_ + u64{cia});
-		const auto fn = reinterpret_cast<ppu_intrp_func*>(cache + u64{cia} * 2);
-		fn->fn(*this, {*op}, op, state ? &ppu_ret : fn + 1);
+		// Reinitialize
+		{
+			const v128 _op0 = *reinterpret_cast<const v128*>(cache + _pos);
+			const v128 _op1 = *reinterpret_cast<const v128*>(cache + _pos + 16);
+			op0 = _op0._u64[0];
+			op1 = _op0._u64[1];
+			op2 = _op1._u64[0];
+			op3 = _op1._u64[1];
+		}
+
+		while (exec_op(op0)) [[likely]]
+		{
+			cia += 4;
+
+			if (exec_op(op1)) [[likely]]
+			{
+				cia += 4;
+
+				if (exec_op(op2)) [[likely]]
+				{
+					cia += 4;
+
+					if (exec_op(op3)) [[likely]]
+					{
+						cia += 4;
+
+						if (state) [[unlikely]]
+						{
+							break;
+						}
+
+						_pos += 32;
+						const v128 _op0 = *reinterpret_cast<const v128*>(cache + _pos);
+						const v128 _op1 = *reinterpret_cast<const v128*>(cache + _pos + 16);
+						op0 = _op0._u64[0];
+						op1 = _op0._u64[1];
+						op2 = _op1._u64[0];
+						op3 = _op1._u64[1];
+						continue;
+					}
+					break;
+				}
+				break;
+			}
+			break;
+		}
 	}
 }
 
 ppu_thread::~ppu_thread()
 {
+	perf_log.notice("Perf stats for STCX reload: successs %u, failure %u", last_succ, last_fail);
 }
 
-ppu_thread::ppu_thread(const ppu_thread_params& param, std::string_view name, u32 _prio, int detached)
+ppu_thread::ppu_thread(const ppu_thread_params& param, std::string_view name, u32 prio, int detached)
 	: cpu_thread(idm::last_id())
+	, prio(prio)
 	, stack_size(param.stack_size)
 	, stack_addr(param.stack_addr)
 	, joiner(detached != 0 ? ppu_join_status::detached : ppu_join_status::joinable)
 	, entry_func(param.entry)
 	, start_time(get_guest_system_time())
-	, is_interrupt_thread(detached < 0)
 	, ppu_tname(make_single<std::string>(name))
 {
-	prio.raw().prio = _prio;
-
-	memset(&hv_ctx, 0, sizeof(hv_ctx));
-
 	gpr[1] = stack_addr + stack_size - ppu_stack_start_offset;
 
 	gpr[13] = param.tls_addr;
@@ -2412,8 +1173,6 @@ ppu_thread::ppu_thread(const ppu_thread_params& param, std::string_view name, u3
 		gpr[4] = param.arg1;
 	}
 
-	optional_savestate_state = std::make_shared<utils::serial>();
-
 	// Trigger the scheduler
 	state += cpu_flag::suspend;
 
@@ -2422,323 +1181,9 @@ ppu_thread::ppu_thread(const ppu_thread_params& param, std::string_view name, u3
 		state += cpu_flag::memory;
 	}
 
-	call_history.data.resize(g_cfg.core.ppu_call_history ? call_history_max_size : 1);
-	syscall_history.data.resize(g_cfg.core.ppu_call_history ? syscall_history_max_size : 1);
-	syscall_history.count_debug_arguments = static_cast<u32>(g_cfg.core.ppu_call_history ? std::size(syscall_history.data[0].args) : 0);
-
-#ifdef __APPLE__
-	pthread_jit_write_protect_np(true);
-#endif
-#ifdef ARCH_ARM64
-	// Flush all cache lines after potentially writing executable code
-	asm("ISB");
-	asm("DSB ISH");
-#endif
-}
-
-struct disable_precomp_t
-{
-	atomic_t<bool> disable = false;
-};
-
-void vdecEntry(ppu_thread& ppu, u32 vid);
-
-bool ppu_thread::savable() const
-{
-	if (joiner == ppu_join_status::exited)
+	if (g_cfg.core.ppu_call_history)
 	{
-		return false;
-	}
-
-	if (cia == g_fxo->get<ppu_function_manager>().func_addr(FIND_FUNC(vdecEntry)))
-	{
-		// Do not attempt to save the state of HLE VDEC threads
-		return false;
-	}
-
-	return true;
-}
-
-void ppu_thread::serialize_common(utils::serial& ar)
-{
-	[[maybe_unused]] const s32 version = GET_OR_USE_SERIALIZATION_VERSION(ar.is_writing(), ppu);
-
-	ar(gpr, fpr, cr, fpscr.bits, lr, ctr, vrsave, cia, xer, sat, nj, prio.raw().all);
-
-	if (cia % 4 || (cia >> 28) >= 0xCu)
-	{
-		fmt::throw_exception("Failed to serialize PPU thread ID=0x%x (cia=0x%x, ar=%s)", this->id, cia, ar);
-	}
-
-	ar(optional_savestate_state, vr);
-
-	if (!ar.is_writing())
-	{
-		if (optional_savestate_state->data.empty())
-		{
-			optional_savestate_state->clear();
-		}
-
-		optional_savestate_state->set_reading_state();
-	}
-}
-
-struct save_lv2_tag
-{
-	atomic_t<bool> saved = false;
-	atomic_t<bool> loaded = false;
-};
-
-ppu_thread::ppu_thread(utils::serial& ar)
-	: cpu_thread(idm::last_id()) // last_id() is showed to constructor on serialization
-	, stack_size(ar)
-	, stack_addr(ar)
-	, joiner(ar.pop<ppu_join_status>())
-	, entry_func(std::bit_cast<ppu_func_opd_t, u64>(ar))
-	, is_interrupt_thread(ar)
-{
-	[[maybe_unused]] const s32 version = GET_SERIALIZATION_VERSION(ppu);
-
-	struct init_pushed
-	{
-		bool pushed = false;
-		atomic_t<u32> inited = false;
-	};
-
-	call_history.data.resize(g_cfg.core.ppu_call_history ? call_history_max_size : 1);
-	syscall_history.data.resize(g_cfg.core.ppu_call_history ? syscall_history_max_size : 1);
-	syscall_history.count_debug_arguments = static_cast<u32>(g_cfg.core.ppu_call_history ? std::size(syscall_history.data[0].args) : 0);
-
-	if (version >= 2 && !g_fxo->get<save_lv2_tag>().loaded.exchange(true))
-	{
-		ar(lv2_obj::g_priority_order_tag);
-	}
-
-	if (version >= 3)
-	{
-		// Function and module for HLE function relocation
-		// TODO: Use it
-		ar.pop<std::string>();
-		ar.pop<std::string>();
-	}
-
-	serialize_common(ar);
-
-	// Restore jm_mask
-	jm_mask = nj ? 0x7F800000 : 0x7fff'ffff;
-
-	auto queue_intr_entry = [&]()
-	{
-		if (is_interrupt_thread)
-		{
-			void ppu_interrupt_thread_entry(ppu_thread&, ppu_opcode_t, be_t<u32>*, struct ppu_intrp_func*);
-
-			cmd_list
-			({
-				{ ppu_cmd::ptr_call, 0 },
-				std::bit_cast<u64>(&ppu_interrupt_thread_entry)
-			});
-		}
-	};
-
-	const u32 status = ar.pop<u32>();
-
-	switch (status)
-	{
-	case PPU_THREAD_STATUS_IDLE:
-	{
-		stop_flag_removal_protection = true;
-		break;
-	}
-	case PPU_THREAD_STATUS_RUNNABLE:
-	case PPU_THREAD_STATUS_ONPROC:
-	{
-		if (version >= 2)
-		{
-			const u32 order = ar.pop<u32>();
-
-			struct awake_pushed
-			{
-				bool pushed = false;
-				shared_mutex dummy;
-				std::map<u32, ppu_thread*> awake_ppus;
-			};
-
-			g_fxo->get<awake_pushed>().awake_ppus[order] = this;
-
-			if (!std::exchange(g_fxo->get<awake_pushed>().pushed, true))
-			{
-				Emu.PostponeInitCode([this]()
-				{
-					u32 prev = umax;
-
-					for (auto ppu : g_fxo->get<awake_pushed>().awake_ppus)
-					{
-						ensure(prev + 1 == ppu.first);
-						prev = ppu.first;
-						lv2_obj::awake(ppu.second);
-					}
-
-					g_fxo->get<awake_pushed>().awake_ppus.clear();
-				});
-			}
-		}
-		else
-		{
-			lv2_obj::awake(this);
-		}
-
-		[[fallthrough]];
-	}
-	case PPU_THREAD_STATUS_SLEEP:
-	{
-		if (std::exchange(g_fxo->get<init_pushed>().pushed, true))
-		{
-			cmd_list
-			({
-				{ppu_cmd::ptr_call, 0}, +[](ppu_thread&) -> bool
-				{
-					while (!Emu.IsStopped() && !g_fxo->get<init_pushed>().inited)
-					{
-						thread_ctrl::wait_on(g_fxo->get<init_pushed>().inited, 0);
-					}
-					return false;
-				}
-			});
-		}
-		else
-		{
-			g_fxo->init<disable_precomp_t>();
-			g_fxo->get<disable_precomp_t>().disable = true;
-
-			cmd_push({ppu_cmd::initialize, 0});
-			cmd_list
-			({
-				{ppu_cmd::ptr_call, 0}, +[](ppu_thread&) -> bool
-				{
-					auto& inited = g_fxo->get<init_pushed>().inited;
-					inited = 1;
-					inited.notify_all();
-					return true;
-				}
-			});
-		}
-
-		if (status == PPU_THREAD_STATUS_SLEEP)
-		{
-			cmd_list
-			({
-				{ppu_cmd::ptr_call, 0},
-
-				+[](ppu_thread& ppu) -> bool
-				{
-					const u32 op = vm::read32(ppu.cia);
-					const auto& table = g_fxo->get<ppu_interpreter_rt>();
-					ppu.loaded_from_savestate = true;
-					ppu.prio.raw().preserve_bit = 1;
-					table.decode(op)(ppu, {op}, vm::_ptr<u32>(ppu.cia), &ppu_ret);
-					ppu.prio.raw().preserve_bit = 0;
-
-					ppu.optional_savestate_state->clear(); // Reset to writing state
-					ppu.loaded_from_savestate = false;
-					return true;
-				}
-			});
-
-			lv2_obj::set_future_sleep(this);
-		}
-
-		queue_intr_entry();
-		cmd_push({ppu_cmd::cia_call, 0});
-		break;
-	}
-	case PPU_THREAD_STATUS_ZOMBIE:
-	{
-		state += cpu_flag::exit;
-		break;
-	}
-	case PPU_THREAD_STATUS_STOP:
-	{
-		queue_intr_entry();
-		break;
-	}
-	}
-
-	// Trigger the scheduler
-	state += cpu_flag::suspend;
-
-	if (!g_use_rtm)
-	{
-		state += cpu_flag::memory;
-	}
-
-	ppu_tname = make_single<std::string>(ar.pop<std::string>());
-
-	ppu_log.notice("Loading PPU Thread [0x%x: %s]: cia=0x%x, state=%s, status=%s", id, *ppu_tname.load(), cia, +state, ppu_thread_status{status});
-}
-
-void ppu_thread::save(utils::serial& ar)
-{
-	// For debugging purposes, load this as soon as this function enters
-	const bs_t<cpu_flag> state_flags = state;
-
-	USING_SERIALIZATION_VERSION(ppu);
-
-	const u64 entry = std::bit_cast<u64>(entry_func);
-
-	ppu_join_status _joiner = joiner;
-	if (_joiner >= ppu_join_status::max)
-	{
-		// Joining thread should recover this member properly
-		_joiner = ppu_join_status::joinable;
-	}
-
-	ar(stack_size, stack_addr, _joiner, entry, is_interrupt_thread);
-
-	const bool is_null = ar.m_file_handler && ar.m_file_handler->is_null();
-
-	if (!is_null && !g_fxo->get<save_lv2_tag>().saved.exchange(true))
-	{
-		ar(lv2_obj::g_priority_order_tag);
-	}
-
-	if (current_module && current_module[0])
-	{
-		ar(std::string{current_module});
-		ar(std::string{last_function});
-	}
-	else
-	{
-		ar(std::string{});
-		ar(std::string{});
-	}
-
-	serialize_common(ar);
-
-	auto [status, order] = lv2_obj::ppu_state(this, false);
-
-	if (status == PPU_THREAD_STATUS_SLEEP && cpu_flag::again - state)
-	{
-		// Hack for sys_fs
-		status = PPU_THREAD_STATUS_RUNNABLE;
-	}
-
-	ar(status);
-
-	if (status == PPU_THREAD_STATUS_RUNNABLE || status == PPU_THREAD_STATUS_ONPROC)
-	{
-		ar(order);
-	}
-
-	ar(*ppu_tname.load());
-
-	if (current_module && current_module[0])
-	{
-		ppu_log.notice("Saving PPU Thread [0x%x: %s]: cia=0x%x, state=%s, statu=%s (at function: %s)", id, *ppu_tname.load(), cia, state_flags, ppu_thread_status{status}, last_function);
-	}
-	else
-	{
-		ppu_log.notice("Saving PPU Thread [0x%x: %s]: cia=0x%x, state=%s, statu=%s", id, *ppu_tname.load(), cia, state_flags, ppu_thread_status{status});
+		call_history.data.resize(call_history_max_size);
 	}
 }
 
@@ -2818,7 +1263,7 @@ be_t<u64>* ppu_thread::get_stack_arg(s32 i, u64 align)
 	return vm::_ptr<u64>(vm::cast((gpr[1] + 0x30 + 0x8 * (i - 1)) & (0 - align)));
 }
 
-void ppu_thread::fast_call(u32 addr, u64 rtoc, bool is_thread_entry)
+void ppu_thread::fast_call(u32 addr, u32 rtoc)
 {
 	const auto old_cia = cia;
 	const auto old_rtoc = gpr[2];
@@ -2826,17 +1271,11 @@ void ppu_thread::fast_call(u32 addr, u64 rtoc, bool is_thread_entry)
 	const auto old_func = current_function;
 	const auto old_fmt = g_tls_log_prefix;
 
-	interrupt_thread_executing = true;
 	cia = addr;
 	gpr[2] = rtoc;
-	lr = g_fxo->get<ppu_function_manager>().func_addr(1, true); // HLE stop address
+	lr = g_fxo->get<ppu_function_manager>().func_addr(1) + 4; // HLE stop address
 	current_function = nullptr;
 
-	if (std::exchange(loaded_from_savestate, false))
-	{
-		lr = old_lr;
-	}
-
 	g_tls_log_prefix = []
 	{
 		const auto _this = static_cast<ppu_thread*>(get_current_cpu_thread());
@@ -2856,59 +1295,30 @@ void ppu_thread::fast_call(u32 addr, u64 rtoc, bool is_thread_entry)
 
 		const auto cia = _this->cia;
 
-		if (_this->current_function && g_fxo->get<ppu_function_manager>().is_func(cia))
+		if (_this->current_function && vm::read32(cia) != ppu_instructions::SC(0))
 		{
 			return fmt::format("PPU[0x%x] Thread (%s) [HLE:0x%08x, LR:0x%08x]", _this->id, *name_cache.get(), cia, _this->lr);
 		}
 
-		extern const char* get_prx_name_by_cia(u32 addr);
-
-		if (auto name = get_prx_name_by_cia(cia))
-		{
-			return fmt::format("PPU[0x%x] Thread (%s) [%s: 0x%08x]", _this->id, *name_cache.get(), name, cia);
-		}
-
 		return fmt::format("PPU[0x%x] Thread (%s) [0x%08x]", _this->id, *name_cache.get(), cia);
 	};
 
 	auto at_ret = [&]()
 	{
-		if (old_cia)
+		if (std::uncaught_exceptions())
 		{
-			if (state & cpu_flag::again)
-			{
-				ppu_log.error("HLE callstack savestate is not implemented!");
-			}
-
+			cpu_on_stop();
+			current_function = old_func;
+		}
+		else
+		{
+			state -= cpu_flag::ret;
 			cia = old_cia;
 			gpr[2] = old_rtoc;
 			lr = old_lr;
+			current_function = old_func;
+			g_tls_log_prefix = old_fmt;
 		}
-		else if (state & cpu_flag::ret && cia == g_fxo->get<ppu_function_manager>().func_addr(1, true) + 4 && is_thread_entry)
-		{
-			std::string ret;
-			dump_all(ret);
-
-			ppu_log.error("Returning from the thread entry function! (func=0x%x)", entry_func.addr);
-			ppu_log.notice("Thread context: %s", ret);
-
-			lv2_obj::sleep(*this);
-
-			// For savestates
-			state += cpu_flag::again;
-			std::memcpy(syscall_args, &gpr[3], sizeof(syscall_args));
-		}
-
-		if (!old_cia && state & cpu_flag::again)
-		{
-			// Fixup argument registers and CIA for reloading
-			std::memcpy(&gpr[3], syscall_args, sizeof(syscall_args));
-			cia -= 4;
-		}
-
-		current_function = old_func;
-		g_tls_log_prefix = old_fmt;
-		state -= cpu_flag::ret;
 	};
 
 	exec_task();
@@ -2965,7 +1375,22 @@ void ppu_thread::stack_pop_verbose(u32 addr, u32 size) noexcept
 	ppu_log.error("Invalid thread");
 }
 
-extern ppu_intrp_func_t ppu_get_syscall(u64 code);
+extern ppu_function_t ppu_get_syscall(u64 code);
+
+extern __m128 sse_exp2_ps(__m128 A);
+extern __m128 sse_log2_ps(__m128 A);
+extern __m128i sse_altivec_vperm(__m128i A, __m128i B, __m128i C);
+extern __m128i sse_altivec_vperm_v0(__m128i A, __m128i B, __m128i C);
+extern __m128i sse_altivec_lvsl(u64 addr);
+extern __m128i sse_altivec_lvsr(u64 addr);
+extern __m128i sse_cellbe_lvlx(u64 addr);
+extern __m128i sse_cellbe_lvrx(u64 addr);
+extern void sse_cellbe_stvlx(u64 addr, __m128i a);
+extern void sse_cellbe_stvrx(u64 addr, __m128i a);
+extern __m128i sse_cellbe_lvlx_v0(u64 addr);
+extern __m128i sse_cellbe_lvrx_v0(u64 addr);
+extern void sse_cellbe_stvlx_v0(u64 addr, __m128i a);
+extern void sse_cellbe_stvrx_v0(u64 addr, __m128i a);
 
 void ppu_trap(ppu_thread& ppu, u64 addr)
 {
@@ -2977,17 +1402,17 @@ void ppu_trap(ppu_thread& ppu, u64 addr)
 	// If stubbing is enabled, check current instruction and the following
 	if (!add || !vm::check_addr(ppu.cia, vm::page_executable) || !vm::check_addr(ppu.cia + add, vm::page_executable))
 	{
-		fmt::throw_exception("PPU Trap! Sometimes tweaking the setting \"Stub PPU Traps\" can be a workaround to this crash.\nBest values depend on game code, if unsure try 1.");
+		fmt::throw_exception("PPU Trap!");
 	}
 
 	ppu_log.error("PPU Trap: Stubbing %d instructions %s.", std::abs(static_cast<s32>(add) / 4), add >> 31 ? "backwards" : "forwards");
 	ppu.cia += add; // Skip instructions, hope for valid code (interprter may be invoked temporarily)
 }
 
-static void ppu_error(ppu_thread& ppu, u64 addr, u32 /*op*/)
+[[noreturn]] static void ppu_error(ppu_thread& ppu, u64 addr, u32 op)
 {
 	ppu.cia = ::narrow<u32>(addr);
-	ppu_recompiler_fallback(ppu);
+	fmt::throw_exception("Unknown/Illegal opcode 0x08x (0x%llx)", op, addr);
 }
 
 static void ppu_check(ppu_thread& ppu, u64 addr)
@@ -3055,7 +1480,7 @@ static T ppu_load_acquire_reservation(ppu_thread& ppu, u32 addr)
 			{
 				const auto _inst = v128::loadu(inst + i) & mask_vec;
 
-				if (!gv_testz(gv_eq32(_inst, store_vec)))
+				if (_mm_movemask_epi8(v128::eq32(_inst, store_vec).vi))
 				{
 					return false;
 				}
@@ -3084,7 +1509,7 @@ static T ppu_load_acquire_reservation(ppu_thread& ppu, u32 addr)
 		ppu.use_full_rdata = false;
 	}
 
-	if (ppu_log.trace && (addr & addr_mask) == (ppu.last_faddr & addr_mask))
+	if ((addr & addr_mask) == (ppu.last_faddr & addr_mask))
 	{
 		ppu_log.trace(u8"LARX after fail: addr=0x%x, faddr=0x%x, time=%u c", addr, ppu.last_faddr, (perf0.get() - ppu.last_ftsc));
 	}
@@ -3111,18 +1536,7 @@ static T ppu_load_acquire_reservation(ppu_thread& ppu, u32 addr)
 		ppu.last_faddr = 0;
 	}
 
-	const u32 res_cached = ppu.res_cached;
-
-	if ((addr & -128) == (res_cached & -128))
-	{
-		// Reload "cached" reservation of previous succeeded conditional store
-		// This seems like a hardware feature according to cellSpursAddUrgentCommand function
-		ppu.rtime -= 128;
-	}
-	else
-	{
-		ppu.rtime = vm::reservation_acquire(addr) & -128;
-	}
+	ppu.rtime = vm::reservation_acquire(addr) & -128;
 
 	be_t<u64> rdata;
 
@@ -3155,14 +1569,15 @@ extern u64 ppu_ldarx(ppu_thread& ppu, u32 addr)
 	return ppu_load_acquire_reservation<u64>(ppu, addr);
 }
 
-const auto ppu_stcx_accurate_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime, const void* _old, u64 _new)>("ppu_stcx_accurate_tx", [](native_asm& c, auto& args)
+const auto ppu_stcx_accurate_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime, const void* _old, u64 _new)>([](asmjit::X86Assembler& c, auto& args)
 {
 	using namespace asmjit;
 
-#if defined(ARCH_X64)
 	Label fall = c.newLabel();
 	Label fail = c.newLabel();
 	Label _ret = c.newLabel();
+	Label skip = c.newLabel();
+	Label next = c.newLabel();
 	Label load = c.newLabel();
 
 	//if (utils::has_avx() && !s_tsx_avx)
@@ -3173,8 +1588,11 @@ const auto ppu_stcx_accurate_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime
 	// Create stack frame if necessary (Windows ABI has only 6 volatile vector registers)
 	c.push(x86::rbp);
 	c.push(x86::r13);
+	c.push(x86::r12);
+	c.push(x86::rbx);
 	c.push(x86::r14);
-	c.sub(x86::rsp, 48);
+	c.push(x86::r15);
+	c.sub(x86::rsp, 40);
 #ifdef _WIN32
 	if (!s_tsx_avx)
 	{
@@ -3184,27 +1602,27 @@ const auto ppu_stcx_accurate_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime
 #endif
 
 	// Prepare registers
-	build_swap_rdx_with(c, args, x86::r10);
-	c.movabs(x86::rbp, reinterpret_cast<u64>(&vm::g_sudo_addr));
-	c.mov(x86::rbp, x86::qword_ptr(x86::rbp));
+	build_swap_rdx_with(c, args, x86::r12);
+	c.mov(x86::rbp, x86::qword_ptr(reinterpret_cast<u64>(&vm::g_sudo_addr)));
 	c.lea(x86::rbp, x86::qword_ptr(x86::rbp, args[0]));
 	c.and_(x86::rbp, -128);
 	c.prefetchw(x86::byte_ptr(x86::rbp, 0));
 	c.prefetchw(x86::byte_ptr(x86::rbp, 64));
 	c.movzx(args[0].r32(), args[0].r16());
 	c.shr(args[0].r32(), 1);
-	c.movabs(x86::r11, reinterpret_cast<u64>(+vm::g_reservations));
-	c.lea(x86::r11, x86::qword_ptr(x86::r11, args[0]));
-	c.and_(x86::r11, -128 / 2);
+	c.lea(x86::rbx, x86::qword_ptr(reinterpret_cast<u64>(+vm::g_reservations), args[0]));
+	c.and_(x86::rbx, -128 / 2);
+	c.prefetchw(x86::byte_ptr(x86::rbx));
 	c.and_(args[0].r32(), 63);
+	c.mov(x86::r13, args[1]);
 
 	// Prepare data
 	if (s_tsx_avx)
 	{
-		c.vmovups(x86::ymm0, x86::ymmword_ptr(args[2], 0));
-		c.vmovups(x86::ymm1, x86::ymmword_ptr(args[2], 32));
-		c.vmovups(x86::ymm2, x86::ymmword_ptr(args[2], 64));
-		c.vmovups(x86::ymm3, x86::ymmword_ptr(args[2], 96));
+		c.vmovups(x86::ymm0, x86::yword_ptr(args[2], 0));
+		c.vmovups(x86::ymm1, x86::yword_ptr(args[2], 32));
+		c.vmovups(x86::ymm2, x86::yword_ptr(args[2], 64));
+		c.vmovups(x86::ymm3, x86::yword_ptr(args[2], 96));
 	}
 	else
 	{
@@ -3220,30 +1638,34 @@ const auto ppu_stcx_accurate_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime
 
 	// Alloc r14 to stamp0
 	const auto stamp0 = x86::r14;
+	const auto stamp1 = x86::r15;
 	build_get_tsc(c, stamp0);
 
-	Label fail2 = c.newLabel();
-
-	Label tx1 = build_transaction_enter(c, fall, [&]()
+	// Begin transaction
+	Label tx0 = build_transaction_enter(c, fall, [&]()
 	{
-		build_get_tsc(c);
-		c.sub(x86::rax, stamp0);
-		c.movabs(x86::r13, reinterpret_cast<u64>(&g_rtm_tx_limit2));
-		c.cmp(x86::rax, x86::qword_ptr(x86::r13));
+		build_get_tsc(c, stamp1);
+		c.sub(stamp1, stamp0);
+		c.xor_(x86::eax, x86::eax);
+		c.cmp(stamp1, x86::qword_ptr(reinterpret_cast<u64>(&g_rtm_tx_limit1)));
 		c.jae(fall);
 	});
-
-	// Check pause flag
 	c.bt(x86::dword_ptr(args[2], ::offset32(&ppu_thread::state) - ::offset32(&ppu_thread::rdata)), static_cast<u32>(cpu_flag::pause));
 	c.jc(fall);
-	c.xbegin(tx1);
+	c.xbegin(tx0);
+	c.mov(x86::rax, x86::qword_ptr(x86::rbx));
+	c.test(x86::eax, vm::rsrv_unique_lock);
+	c.jnz(skip);
+	c.and_(x86::rax, -128);
+	c.cmp(x86::rax, x86::r13);
+	c.jne(fail);
 
 	if (s_tsx_avx)
 	{
-		c.vxorps(x86::ymm0, x86::ymm0, x86::ymmword_ptr(x86::rbp, 0));
-		c.vxorps(x86::ymm1, x86::ymm1, x86::ymmword_ptr(x86::rbp, 32));
-		c.vxorps(x86::ymm2, x86::ymm2, x86::ymmword_ptr(x86::rbp, 64));
-		c.vxorps(x86::ymm3, x86::ymm3, x86::ymmword_ptr(x86::rbp, 96));
+		c.vxorps(x86::ymm0, x86::ymm0, x86::yword_ptr(x86::rbp, 0));
+		c.vxorps(x86::ymm1, x86::ymm1, x86::yword_ptr(x86::rbp, 32));
+		c.vxorps(x86::ymm2, x86::ymm2, x86::yword_ptr(x86::rbp, 64));
+		c.vxorps(x86::ymm3, x86::ymm3, x86::yword_ptr(x86::rbp, 96));
 		c.vorps(x86::ymm0, x86::ymm0, x86::ymm1);
 		c.vorps(x86::ymm1, x86::ymm2, x86::ymm3);
 		c.vorps(x86::ymm0, x86::ymm1, x86::ymm0);
@@ -3274,22 +1696,145 @@ const auto ppu_stcx_accurate_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime
 	// Store 8 bytes
 	c.mov(x86::qword_ptr(x86::rbp, args[0], 1, 0), args[3]);
 
+	// Update reservation
+	c.sub(x86::qword_ptr(x86::rbx), -128);
 	c.xend();
-	c.lock().add(x86::qword_ptr(x86::r11), 64);
 	build_get_tsc(c);
 	c.sub(x86::rax, stamp0);
 	c.jmp(_ret);
 
-	// XABORT is expensive so try to finish with xend instead
+	// XABORT is expensive so finish with xend instead
 	c.bind(fail);
 
 	// Load old data to store back in rdata
 	if (s_tsx_avx)
 	{
-		c.vmovaps(x86::ymm0, x86::ymmword_ptr(x86::rbp, 0));
-		c.vmovaps(x86::ymm1, x86::ymmword_ptr(x86::rbp, 32));
-		c.vmovaps(x86::ymm2, x86::ymmword_ptr(x86::rbp, 64));
-		c.vmovaps(x86::ymm3, x86::ymmword_ptr(x86::rbp, 96));
+		c.vmovaps(x86::ymm0, x86::yword_ptr(x86::rbp, 0));
+		c.vmovaps(x86::ymm1, x86::yword_ptr(x86::rbp, 32));
+		c.vmovaps(x86::ymm2, x86::yword_ptr(x86::rbp, 64));
+		c.vmovaps(x86::ymm3, x86::yword_ptr(x86::rbp, 96));
+	}
+	else
+	{
+		c.movaps(x86::xmm0, x86::oword_ptr(x86::rbp, 0));
+		c.movaps(x86::xmm1, x86::oword_ptr(x86::rbp, 16));
+		c.movaps(x86::xmm2, x86::oword_ptr(x86::rbp, 32));
+		c.movaps(x86::xmm3, x86::oword_ptr(x86::rbp, 48));
+		c.movaps(x86::xmm4, x86::oword_ptr(x86::rbp, 64));
+		c.movaps(x86::xmm5, x86::oword_ptr(x86::rbp, 80));
+		c.movaps(x86::xmm6, x86::oword_ptr(x86::rbp, 96));
+		c.movaps(x86::xmm7, x86::oword_ptr(x86::rbp, 112));
+	}
+
+	c.xend();
+	c.jmp(load);
+
+	c.bind(skip);
+	c.xend();
+	build_get_tsc(c, stamp1);
+	//c.jmp(fall);
+
+	c.bind(fall);
+
+	Label fall2 = c.newLabel();
+	Label fail2 = c.newLabel();
+	Label fail3 = c.newLabel();
+
+	// Lightened transaction: only compare and swap data
+	c.bind(next);
+
+	// Try to "lock" reservation
+	c.mov(x86::eax, 1);
+	c.lock().xadd(x86::qword_ptr(x86::rbx), x86::rax);
+	c.test(x86::eax, vm::rsrv_unique_lock);
+	c.jnz(fail2);
+
+	// Check if already updated
+	c.and_(x86::rax, -128);
+	c.cmp(x86::rax, x86::r13);
+	c.jne(fail2);
+
+	// Exclude some time spent on touching memory: stamp1 contains last success or failure
+	c.mov(x86::rax, stamp1);
+	c.sub(x86::rax, stamp0);
+	c.cmp(x86::rax, x86::qword_ptr(reinterpret_cast<u64>(&g_rtm_tx_limit2)));
+	c.jae(fall2);
+	build_get_tsc(c, stamp1);
+	c.sub(stamp1, x86::rax);
+
+	Label tx1 = build_transaction_enter(c, fall2, [&]()
+	{
+		build_get_tsc(c);
+		c.sub(x86::rax, stamp1);
+		c.cmp(x86::rax, x86::qword_ptr(reinterpret_cast<u64>(&g_rtm_tx_limit2)));
+		c.jae(fall2);
+		c.test(x86::qword_ptr(x86::rbx), 127 - 1);
+		c.jnz(fall2);
+	});
+	c.prefetchw(x86::byte_ptr(x86::rbp, 0));
+	c.prefetchw(x86::byte_ptr(x86::rbp, 64));
+
+	// Check pause flag
+	c.bt(x86::dword_ptr(args[2], ::offset32(&ppu_thread::state) - ::offset32(&ppu_thread::rdata)), static_cast<u32>(cpu_flag::pause));
+	c.jc(fall2);
+	c.mov(x86::rax, x86::qword_ptr(x86::rbx));
+	c.and_(x86::rax, -128);
+	c.cmp(x86::rax, x86::r13);
+	c.jne(fail2);
+	c.xbegin(tx1);
+
+	if (s_tsx_avx)
+	{
+		c.vxorps(x86::ymm0, x86::ymm0, x86::yword_ptr(x86::rbp, 0));
+		c.vxorps(x86::ymm1, x86::ymm1, x86::yword_ptr(x86::rbp, 32));
+		c.vxorps(x86::ymm2, x86::ymm2, x86::yword_ptr(x86::rbp, 64));
+		c.vxorps(x86::ymm3, x86::ymm3, x86::yword_ptr(x86::rbp, 96));
+		c.vorps(x86::ymm0, x86::ymm0, x86::ymm1);
+		c.vorps(x86::ymm1, x86::ymm2, x86::ymm3);
+		c.vorps(x86::ymm0, x86::ymm1, x86::ymm0);
+		c.vptest(x86::ymm0, x86::ymm0);
+	}
+	else
+	{
+		c.xorps(x86::xmm0, x86::oword_ptr(x86::rbp, 0));
+		c.xorps(x86::xmm1, x86::oword_ptr(x86::rbp, 16));
+		c.xorps(x86::xmm2, x86::oword_ptr(x86::rbp, 32));
+		c.xorps(x86::xmm3, x86::oword_ptr(x86::rbp, 48));
+		c.xorps(x86::xmm4, x86::oword_ptr(x86::rbp, 64));
+		c.xorps(x86::xmm5, x86::oword_ptr(x86::rbp, 80));
+		c.xorps(x86::xmm6, x86::oword_ptr(x86::rbp, 96));
+		c.xorps(x86::xmm7, x86::oword_ptr(x86::rbp, 112));
+		c.orps(x86::xmm0, x86::xmm1);
+		c.orps(x86::xmm2, x86::xmm3);
+		c.orps(x86::xmm4, x86::xmm5);
+		c.orps(x86::xmm6, x86::xmm7);
+		c.orps(x86::xmm0, x86::xmm2);
+		c.orps(x86::xmm4, x86::xmm6);
+		c.orps(x86::xmm0, x86::xmm4);
+		c.ptest(x86::xmm0, x86::xmm0);
+	}
+
+	c.jnz(fail3);
+
+	// Store 8 bytes
+	c.mov(x86::qword_ptr(x86::rbp, args[0], 1, 0), args[3]);
+
+	c.xend();
+	c.lock().add(x86::qword_ptr(x86::rbx), 127);
+	build_get_tsc(c);
+	c.sub(x86::rax, stamp0);
+	c.jmp(_ret);
+
+	// XABORT is expensive so try to finish with xend instead
+	c.bind(fail3);
+
+	// Load old data to store back in rdata
+	if (s_tsx_avx)
+	{
+		c.vmovaps(x86::ymm0, x86::yword_ptr(x86::rbp, 0));
+		c.vmovaps(x86::ymm1, x86::yword_ptr(x86::rbp, 32));
+		c.vmovaps(x86::ymm2, x86::yword_ptr(x86::rbp, 64));
+		c.vmovaps(x86::ymm3, x86::yword_ptr(x86::rbp, 96));
 	}
 	else
 	{
@@ -3306,21 +1851,21 @@ const auto ppu_stcx_accurate_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime
 	c.xend();
 	c.jmp(fail2);
 
-	c.bind(fall);
+	c.bind(fall2);
 	c.mov(x86::rax, -1);
 	c.jmp(_ret);
 
 	c.bind(fail2);
-	c.lock().sub(x86::qword_ptr(x86::r11), 64);
+	c.lock().sub(x86::qword_ptr(x86::rbx), 1);
 	c.bind(load);
 
 	// Store previous data back to rdata
 	if (s_tsx_avx)
 	{
-		c.vmovaps(x86::ymmword_ptr(args[2], 0), x86::ymm0);
-		c.vmovaps(x86::ymmword_ptr(args[2], 32), x86::ymm1);
-		c.vmovaps(x86::ymmword_ptr(args[2], 64), x86::ymm2);
-		c.vmovaps(x86::ymmword_ptr(args[2], 96), x86::ymm3);
+		c.vmovaps(x86::yword_ptr(args[2], 0), x86::ymm0);
+		c.vmovaps(x86::yword_ptr(args[2], 32), x86::ymm1);
+		c.vmovaps(x86::yword_ptr(args[2], 64), x86::ymm2);
+		c.vmovaps(x86::yword_ptr(args[2], 96), x86::ymm3);
 	}
 	else
 	{
@@ -3354,20 +1899,14 @@ const auto ppu_stcx_accurate_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime
 		c.vzeroupper();
 	}
 
-	c.add(x86::rsp, 48);
+	c.add(x86::rsp, 40);
+	c.pop(x86::r15);
 	c.pop(x86::r14);
+	c.pop(x86::rbx);
+	c.pop(x86::r12);
 	c.pop(x86::r13);
 	c.pop(x86::rbp);
-
-	maybe_flush_lbr(c);
 	c.ret();
-#else
-	UNUSED(args);
-
-	// Unimplemented should fail.
-	c.brk(Imm(0x42));
-	c.ret(a64::x30);
-#endif
 });
 
 template <typename T>
@@ -3380,10 +1919,7 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
 		fmt::throw_exception("PPU %s: Unaligned address: 0x%08x", sizeof(T) == 4 ? "STWCX" : "STDCX", addr);
 	}
 
-	// Notify breakpoint handler
-	vm::write<void>(addr, T{0}, &ppu);
-
-	auto& data = const_cast<atomic_be_t<u64>&>(vm::_ref<atomic_be_t<u64>>(addr & -8));
+	auto& data = vm::_ref<atomic_be_t<u64>>(addr & -8);
 	auto& res = vm::reservation_acquire(addr);
 	const u64 rtime = ppu.rtime;
 
@@ -3403,7 +1939,7 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
 	}
 
 	// Test if store address is on the same aligned 8-bytes memory as load
-	if (const u32 raddr = ppu.raddr; raddr / 8 != addr / 8)
+	if (const u32 raddr = std::exchange(ppu.raddr, 0); raddr / 8 != addr / 8)
 	{
 		// If not and it is on the same aligned 128-byte memory, proceed only if 128-byte reservations are enabled
 		// In realhw the store address can be at any address of the 128-byte cache line
@@ -3416,16 +1952,12 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
 				data += 0;
 			}
 
-			ppu.raddr = 0;
-			ppu.res_cached = 0;
 			return false;
 		}
 	}
 
 	if (old_data != data || rtime != (res & -128))
 	{
-		ppu.raddr = 0;
-		ppu.res_cached = 0;
 		return false;
 	}
 
@@ -3433,23 +1965,6 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
 	{
 		if (ppu.use_full_rdata) [[unlikely]]
 		{
-			auto [_oldd, _ok] = res.fetch_op([&](u64& r)
-			{
-				if ((r & -128) != rtime || (r & 127))
-				{
-					return false;
-				}
-
-				r += vm::rsrv_unique_lock;
-				return true;
-			});
-
-			if (!_ok)
-			{
-				// Already locked or updated: give up
-				return false;
-			}
-
 			if (g_use_rtm) [[likely]]
 			{
 				switch (u64 count = ppu_stcx_accurate_tx(addr & -8, rtime, ppu.rdata, std::bit_cast<u64>(new_data)))
@@ -3464,12 +1979,12 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
 						if ((res & -128) == rtime && cmp_rdata(ppu.rdata, all_data))
 						{
 							sdata.release(new_data);
-							res += 64;
+							res += 127;
 							return true;
 						}
 
 						mov_rdata_nt(ppu.rdata, all_data);
-						res -= 64;
+						res -= 1;
 						return false;
 					});
 
@@ -3498,14 +2013,14 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
 					utils::prefetch_read(ppu.rdata + 64);
 					ppu.last_faddr = addr;
 					ppu.last_ftime = res.load() & -128;
-					ppu.last_ftsc = utils::get_tsc();
+					ppu.last_ftsc = __rdtsc();
 					return false;
 				}
 				default:
 				{
 					if (count > 20000 && g_cfg.core.perf_report) [[unlikely]]
 					{
-						perf_log.warning("STCX: took too long: %.3fus (%u c)", count / (utils::get_tsc_freq() / 1000'000.), count);
+						perf_log.warning(u8"STCX: took too long: %.3fµs (%u c)", count / (utils::get_tsc_freq() / 1000'000.), count);
 					}
 
 					break;
@@ -3521,6 +2036,23 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
 				return true;
 			}
 
+			auto [_oldd, _ok] = res.fetch_op([&](u64& r)
+			{
+				if ((r & -128) != rtime || (r & 127))
+				{
+					return false;
+				}
+
+				r += vm::rsrv_unique_lock;
+				return true;
+			});
+
+			if (!_ok)
+			{
+				// Already locked or updated: give up
+				return false;
+			}
+
 			// Align address: we do not need the lower 7 bits anymore
 			addr &= -128;
 
@@ -3528,30 +2060,25 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
 			//auto& cline_data = vm::_ref<spu_rdata_t>(addr);
 
 			data += 0;
-			auto range_lock = vm::alloc_range_lock();
-			bool success = false;
+			rsx::reservation_lock rsx_lock(addr, 128);
+
+			auto& super_data = *vm::get_super_ptr<spu_rdata_t>(addr);
+			const bool success = [&]()
 			{
-				rsx::reservation_lock rsx_lock(addr, 128);
+				// Full lock (heavyweight)
+				// TODO: vm::check_addr
+				vm::writer_lock lock(addr);
 
-				auto& super_data = *vm::get_super_ptr<spu_rdata_t>(addr);
-				success = [&]()
+				if (cmp_rdata(ppu.rdata, super_data))
 				{
-					// Full lock (heavyweight)
-					// TODO: vm::check_addr
-					vm::writer_lock lock(addr, range_lock);
+					data.release(new_data);
+					res += 64;
+					return true;
+				}
 
-					if (cmp_rdata(ppu.rdata, super_data))
-					{
-						data.release(new_data);
-						res += 64;
-						return true;
-					}
-
-					res -= 64;
-					return false;
-				}();
-			}
-			vm::free_range_lock(range_lock);
+				res -= 64;
+				return false;
+			}();
 
 			return success;
 		}
@@ -3565,7 +2092,7 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
 		// Aligned 8-byte reservations will be used here
 		addr &= -8;
 
-		const u64 lock_bits = vm::rsrv_unique_lock;
+		const u64 lock_bits = g_cfg.core.spu_accurate_dma ? vm::rsrv_unique_lock : 1;
 
 		auto [_oldd, _ok] = res.fetch_op([&](u64& r)
 		{
@@ -3574,6 +2101,7 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
 				return false;
 			}
 
+			// Despite using shared lock, doesn't allow other shared locks (TODO)
 			r += lock_bits;
 			return true;
 		});
@@ -3605,75 +2133,14 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
 
 			ppu.last_faddr = addr;
 			ppu.last_ftime = old_rtime & -128;
-			ppu.last_ftsc = utils::get_tsc();
+			ppu.last_ftsc = __rdtsc();
 			std::memcpy(&ppu.rdata[addr & 0x78], &old_data, 8);
 		}
 
 		return false;
 	}())
 	{
-		extern atomic_t<u32> liblv2_begin, liblv2_end;
-
-		// Avoid notifications from lwmutex or sys_spinlock
-		if (new_data != old_data && (ppu.cia < liblv2_begin || ppu.cia >= liblv2_end))
-		{
-			u32 notify = ppu.res_notify;
-
-			if (notify)
-			{
-				if (ppu.res_notify_time == vm::reservation_notifier_count_index(notify).second)
-				{
-					ppu.state += cpu_flag::wait;
-					vm::reservation_notifier_notify(notify);
-				}
-				else
-				{
-					notify = 0;
-				}
-
-				ppu.res_notify = 0;
-			}
-
-			if ((addr ^ notify) & -128)
-			{
-				// Try to postpone notification to when PPU is asleep or join notifications on the same address
-				// This also optimizes a mutex - won't notify after lock is aqcuired (prolonging the critical section duration), only notifies on unlock
-				const auto [count, index] = vm::reservation_notifier_count_index(addr);
-
-				switch (count)
-				{
-				case 0:
-				{
-					// Nothing to do
-					break;
-				}
-				case 1:
-				{
-					if (!notify)
-					{
-						ppu.res_notify = addr;
-						ppu.res_notify_time = index;
-						break;
-					}
-
-					// Notify both
-					[[fallthrough]];
-				}
-				default:
-				{
-					if (!notify)
-					{
-						ppu.state += cpu_flag::wait;
-					}
-
-					vm::reservation_notifier_notify(addr);
-					break;
-				}
-				}
-			}
-
-			static_cast<void>(ppu.test_stopped());
-		}
+		res.notify_all(-128);
 
 		if (addr == ppu.last_faddr)
 		{
@@ -3681,30 +2148,9 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
 		}
 
 		ppu.last_faddr = 0;
-		ppu.res_cached = ppu.raddr;
-		ppu.rtime += 128;
-		ppu.raddr = 0;
 		return true;
 	}
 
-	const u32 notify = ppu.res_notify;
-
-	// Do not risk postponing too much (because this is probably an indefinite loop)
-	// And on failure it has some time to do something else
-	if (notify && ((addr ^ notify) & -128))
-	{
-		if (ppu.res_notify_time == vm::reservation_notifier_count_index(notify).second)
-		{
-			ppu.state += cpu_flag::wait;
-			vm::reservation_notifier_notify(notify);
-			static_cast<void>(ppu.test_stopped());
-		}
-
-		ppu.res_notify = 0;
-	}
-
-	ppu.raddr = 0;
-	ppu.res_cached = 0;
 	return false;
 }
 
@@ -3718,102 +2164,41 @@ extern bool ppu_stdcx(ppu_thread& ppu, u32 addr, u64 reg_value)
 	return ppu_store_reservation<u64>(ppu, addr, reg_value);
 }
 
-struct jit_core_allocator
-{
-	const s16 thread_count = g_cfg.core.llvm_threads ? std::min<s32>(g_cfg.core.llvm_threads, limit()) : limit();
-
-	// Initialize global semaphore with the max number of threads
-	::semaphore<0x7fff> sem{std::max<s16>(thread_count, 1)};
-
-	// Mutex for special extra-large modules to compile alone
-	shared_mutex shared_mtx;
-
-	static s16 limit()
-	{
-		return static_cast<s16>(std::min<s32>(0x7fff, utils::get_thread_count()));
-	}
-};
-
 #ifdef LLVM_AVAILABLE
 namespace
 {
 	// Compiled PPU module info
 	struct jit_module
 	{
-		std::vector<void(*)(u8*, u64)> symbol_resolvers;
-		std::vector<std::shared_ptr<jit_compiler>> pjit;
+		std::vector<ppu_function_t> funcs;
+		std::shared_ptr<jit_compiler> pjit;
 		bool init = false;
 	};
 
 	struct jit_module_manager
 	{
-		struct bucket_t
-		{
-			shared_mutex mutex;
-			std::unordered_map<std::string, jit_module> map;
-		};
-
-		std::array<bucket_t, 30> buckets;
-
-		bucket_t& get_bucket(std::string_view sv)
-		{
-			return buckets[std::hash<std::string_view>()(sv) % std::size(buckets)];
-		}
+		shared_mutex mutex;
+		std::unordered_map<std::string, jit_module> map;
 
 		jit_module& get(const std::string& name)
 		{
-			bucket_t& bucket = get_bucket(name);
-			std::lock_guard lock(bucket.mutex);
-			return bucket.map.emplace(name, jit_module{}).first->second;
+			std::lock_guard lock(mutex);
+			return map.emplace(name, jit_module{}).first->second;
 		}
 
 		void remove(const std::string& name) noexcept
 		{
-			bucket_t& bucket = get_bucket(name);
+			std::lock_guard lock(mutex);
 
-			jit_module to_destroy{};
+			const auto found = map.find(name);
 
-			std::lock_guard lock(bucket.mutex);
-			const auto found = bucket.map.find(name);
-
-			if (found == bucket.map.end()) [[unlikely]]
+			if (found == map.end()) [[unlikely]]
 			{
 				ppu_log.error("Failed to remove module %s", name);
-
-				for (auto& buck : buckets)
-				{
-					for (auto& mod : buck.map)
-					{
-						ppu_log.notice("But there is module %s", mod.first);
-					}
-				}
-
 				return;
 			}
 
-			to_destroy.pjit = std::move(found->second.pjit);
-			to_destroy.symbol_resolvers = std::move(found->second.symbol_resolvers);
-
-			bucket.map.erase(found);
-		}
-
-		jit_module_manager& operator=(thread_state s) noexcept
-		{
-			if (s == thread_state::destroying_context)
-			{
-				for (auto& buck : buckets)
-				{
-					for (auto& mod : buck.map)
-					{
-						for (auto& jit : mod.second.pjit)
-						{
-							*jit = s;
-						}
-					}
-				}
-			}
-
-			return *this;
+			map.erase(found);
 		}
 	};
 }
@@ -3824,26 +2209,13 @@ namespace
 	// Read-only file view starting with specified offset (for MSELF)
 	struct file_view : fs::file_base
 	{
-		const fs::file m_storage;
-		const fs::file& m_file;
+		const fs::file m_file;
 		const u64 m_off;
-		const u64 m_max_size;
 		u64 m_pos;
 
-		explicit file_view(const fs::file& _file, u64 offset, u64 max_size) noexcept
-			: m_storage(fs::file())
-			, m_file(_file)
+		explicit file_view(fs::file&& _file, u64 offset)
+			: m_file(std::move(_file))
 			, m_off(offset)
-			, m_max_size(max_size)
-			, m_pos(0)
-		{
-		}
-
-		explicit file_view(fs::file&& _file, u64 offset, u64 max_size) noexcept
-			: m_storage(std::move(_file))
-			, m_file(m_storage)
-			, m_off(offset)
-			, m_max_size(max_size)
 			, m_pos(0)
 		{
 		}
@@ -3852,12 +2224,9 @@ namespace
 		{
 		}
 
-		fs::stat_t get_stat() override
+		fs::stat_t stat() override
 		{
-			fs::stat_t stat = m_file.get_stat();
-			stat.size = std::min<u64>(utils::sub_saturate<u64>(stat.size, m_off), m_max_size);
-			stat.is_writable = false;
-			return stat;
+			return m_file.stat();
 		}
 
 		bool trunc(u64) override
@@ -3867,16 +2236,15 @@ namespace
 
 		u64 read(void* buffer, u64 size) override
 		{
-			const u64 result = file_view::read_at(m_pos, buffer, size);
+			const u64 old_pos = m_file.pos();
+			m_file.seek(m_off + m_pos);
+			const u64 result = m_file.read(buffer, size);
+			ensure(old_pos == m_file.seek(old_pos));
+
 			m_pos += result;
 			return result;
 		}
 
-		u64 read_at(u64 offset, void* buffer, u64 size) override
-		{
-			return m_file.read_at(offset + m_off, buffer, std::min<u64>(size, utils::sub_saturate<u64>(m_max_size, offset)));
-		}
-
 		u64 write(const void*, u64) override
 		{
 			return 0;
@@ -3901,87 +2269,55 @@ namespace
 
 		u64 size() override
 		{
-			return std::min<u64>(utils::sub_saturate<u64>(m_file.size(), m_off), m_max_size);
+			return m_file.size();
 		}
 	};
 }
 
-extern fs::file make_file_view(const fs::file& _file, u64 offset, u64 max_size = umax)
+extern void ppu_finalize(const ppu_module& info)
 {
-	fs::file file;
-	file.reset(std::make_unique<file_view>(_file, offset, max_size));
-	return file;
-}
+	// Get cache path for this executable
+	std::string cache_path;
 
-extern fs::file make_file_view(fs::file&& _file, u64 offset, u64 max_size = umax)
-{
-	fs::file file;
-	file.reset(std::make_unique<file_view>(std::move(_file), offset, max_size));
-	return file;
-}
-
-extern void ppu_finalize(const ppu_module<lv2_obj>& info, bool force_mem_release)
-{
-	if (info.segs.empty())
-	{
-		// HLEd modules
-		return;
-	}
-
-	if (!force_mem_release && info.name.empty())
+	if (info.name.empty())
 	{
 		// Don't remove main module from memory
 		return;
 	}
-
-	if (!force_mem_release && Emu.GetCat() == "1P")
+	else
 	{
-		return;
-	}
+		// Get PPU cache location
+		cache_path = fs::get_cache_dir() + "cache/";
 
-	const bool may_be_elf = fmt::to_lower(info.path.substr(std::max<usz>(info.path.size(), 3) - 3)) != "prx";
+		const std::string dev_flash = vfs::get("/dev_flash/");
 
-	const std::string dev_flash = vfs::get("/dev_flash/");
-
-	if (!may_be_elf)
-	{
-		if (!force_mem_release && info.path.starts_with(dev_flash + "sys/external/"))
+		if (info.path.starts_with(dev_flash) || Emu.GetCat() == "1P")
 		{
 			// Don't remove dev_flash prx from memory
 			return;
 		}
+		else if (!Emu.GetTitleID().empty())
+		{
+			cache_path += Emu.GetTitleID();
+			cache_path += '/';
+		}
+
+		// Add PPU hash and filename
+		fmt::append(cache_path, "ppu-%s-%s/", fmt::base57(info.sha1), info.path.substr(info.path.find_last_of('/') + 1));
 	}
 
-	if (g_cfg.core.ppu_decoder != ppu_decoder_type::llvm)
-	{
-		return;
-	}
-
-	// Get cache path for this executable
-	std::string cache_path = rpcs3::utils::get_cache_dir(info.path);
-
-	// Add PPU hash and filename
-	fmt::append(cache_path, "ppu-%s-%s/", fmt::base57(info.sha1), info.path.substr(info.path.find_last_of('/') + 1));
-
 #ifdef LLVM_AVAILABLE
-	g_fxo->get<jit_module_manager>().remove(cache_path + "_" + std::to_string(std::bit_cast<usz>(info.segs[0].ptr)));
+	g_fxo->get<jit_module_manager>().remove(cache_path + info.name);
 #endif
 }
 
-extern void ppu_precompile(std::vector<std::string>& dir_queue, std::vector<ppu_module<lv2_obj>*>* loaded_modules)
+extern void ppu_precompile(std::vector<std::string>& dir_queue, std::vector<lv2_prx*>* loaded_prx)
 {
 	if (g_cfg.core.ppu_decoder != ppu_decoder_type::llvm)
 	{
 		return;
 	}
 
-	if (auto dis = g_fxo->try_get<disable_precomp_t>(); dis && dis->disable)
-	{
-		return;
-	}
-
-	std::optional<scoped_progress_dialog> progress_dialog(std::in_place, get_localized_string(localized_string_id::PROGRESS_DIALOG_SCANNING_PPU_EXECUTABLE));
-
 	// Make sure we only have one '/' at the end and remove duplicates.
 	for (std::string& dir : dir_queue)
 	{
@@ -3989,29 +2325,16 @@ extern void ppu_precompile(std::vector<std::string>& dir_queue, std::vector<ppu_
 			dir.pop_back();
 		dir += '/';
 	}
-
 	std::sort(dir_queue.begin(), dir_queue.end());
 	dir_queue.erase(std::unique(dir_queue.begin(), dir_queue.end()), dir_queue.end());
 
 	const std::string firmware_sprx_path = vfs::get("/dev_flash/sys/external/");
 
-	struct file_info
-	{
-		std::string path;
-		u64 offset;
-		u64 file_size;
+	// Map fixed address executables area, fake overlay support
+	const bool had_ovl = !vm::map(0x3000'0000, 0x1000'0000, 0x202).operator bool();
+	const u32 ppc_seg = std::exchange(g_ps3_process_info.ppc_seg, 0x3);
 
-		file_info() noexcept = default;
-
-		file_info(std::string _path, u64 offs, u64 size) noexcept
-			: path(std::move(_path))
-			, offset(offs)
-			, file_size(size)
-		{
-		}
-	};
-
-	std::vector<file_info> file_queue;
+	std::vector<std::pair<std::string, u64>> file_queue;
 	file_queue.reserve(2000);
 
 	// Find all .sprx files recursively
@@ -4043,68 +2366,67 @@ extern void ppu_precompile(std::vector<std::string>& dir_queue, std::vector<ppu_
 				continue;
 			}
 
-			// SCE header size
-			if (entry.size <= 0x20)
-			{
-				continue;
-			}
-
 			std::string upper = fmt::to_upper(entry.name);
 
-			// Skip already loaded modules or HLEd ones
-			auto is_ignored = [&](s64 /*offset*/) -> bool
+			// Check .sprx filename
+			if (upper.ends_with(".SPRX"))
 			{
-				if (dir_queue[i] != firmware_sprx_path)
+				// Skip already loaded modules or HLEd ones
+				if (dir_queue[i] == firmware_sprx_path)
 				{
-					return false;
-				}
+					bool ignore = false;
 
-				if (loaded_modules)
-				{
-					if (std::any_of(loaded_modules->begin(), loaded_modules->end(), [&](ppu_module<lv2_obj>* obj)
+					if (loaded_prx)
 					{
-						return obj->name == entry.name;
-					}))
+						for (auto* obj : *loaded_prx)
+						{
+							if (obj->name == entry.name)
+							{
+								ignore = true;
+								break;
+							}
+						}
+
+						if (ignore)
+						{
+							continue;
+						}
+					}
+
+					if (g_cfg.core.libraries_control.get_set().count(entry.name + ":lle"))
 					{
-						return true;
+						// Force LLE
+						ignore = false;
+					}
+					else if (g_cfg.core.libraries_control.get_set().count(entry.name + ":hle"))
+					{
+						// Force HLE
+						ignore = true;
+					}
+					else
+					{
+						extern const std::map<std::string_view, int> g_prx_list;
+
+						// Use list
+						ignore = g_prx_list.count(entry.name) && g_prx_list.at(entry.name) != 0;
+					}
+
+					if (ignore)
+					{
+						continue;
 					}
 				}
 
-				if (g_cfg.core.libraries_control.get_set().count(entry.name + ":lle"))
-				{
-					// Force LLE
-					return false;
-				}
-				else if (g_cfg.core.libraries_control.get_set().count(entry.name + ":hle"))
-				{
-					// Force HLE
-					return true;
-				}
-
-				extern const std::map<std::string_view, int> g_prx_list;
-
-				// Use list
-				return g_prx_list.count(entry.name) && ::at32(g_prx_list, entry.name) != 0;
-			};
-
-			// Check PRX filename
-			if (upper.ends_with(".PRX") || (upper.ends_with(".SPRX") && entry.name != "libfs_utility_init.sprx"sv))
-			{
-				if (is_ignored(0))
-				{
-					continue;
-				}
-
 				// Get full path
-				file_queue.emplace_back(dir_queue[i] + entry.name, 0, entry.size);
+				file_queue.emplace_back(dir_queue[i] + entry.name, 0);
 				continue;
 			}
 
-			// Check ELF filename
-			if ((upper.ends_with(".ELF") || upper.ends_with(".SELF")) && Emu.GetBoot() != dir_queue[i] + entry.name)
+			// Check .self filename
+			if (upper.ends_with(".SELF"))
 			{
 				// Get full path
-				file_queue.emplace_back(dir_queue[i] + entry.name, 0, entry.size);
+				file_queue.emplace_back(dir_queue[i] + entry.name,  0);
 				continue;
 			}
 
@@ -4121,40 +2443,23 @@ extern void ppu_precompile(std::vector<std::string>& dir_queue, std::vector<ppu_
 						{
 							mself_record rec{};
 
-							std::set<u64> offs;
-
 							if (mself.read(rec) && rec.get_pos(mself.size()))
 							{
-								if (rec.size <= 0x20)
-								{
-									continue;
-								}
-
-								if (!offs.emplace(rec.off).second)
-								{
-									// Duplicate
-									continue;
-								}
-
-								// Read characters safely
-								std::string name(sizeof(rec.name), '\0');
-
-								std::memcpy(name.data(), rec.name, name.size());
-								name = std::string(name.c_str());
+								std::string name = rec.name;
 
 								upper = fmt::to_upper(name);
 
-								if (upper.find(".SPRX") != umax || upper.find(".PRX") != umax)
+								if (upper.ends_with(".SPRX"))
 								{
 									// .sprx inside .mself found
-									file_queue.emplace_back(dir_queue[i] + entry.name, rec.off, rec.size);
+									file_queue.emplace_back(dir_queue[i] + entry.name, rec.off);
 									continue;
 								}
 
-								if (upper.find(".SELF") != umax || upper.find(".ELF") != umax)
+								if (upper.ends_with(".SELF"))
 								{
 									// .self inside .mself found
-									file_queue.emplace_back(dir_queue[i] + entry.name, rec.off, rec.size);
+									file_queue.emplace_back(dir_queue[i] + entry.name, rec.off);
 									continue;
 								}
 							}
@@ -4170,108 +2475,26 @@ extern void ppu_precompile(std::vector<std::string>& dir_queue, std::vector<ppu_
 		}
 	}
 
-	g_progr_ftotal += ::size32(file_queue);
-
-	u64 total_files_size = 0;
-
-	for (const file_info& info : file_queue)
-	{
-		total_files_size += info.file_size;
-	}
-
-	g_progr_ftotal_bits += total_files_size;
-
-	*progress_dialog = get_localized_string(localized_string_id::PROGRESS_DIALOG_COMPILING_PPU_MODULES);
+	g_progr_ftotal += file_queue.size();
+	scoped_progress_dialog progr = "Compiling PPU modules...";
 
 	atomic_t<usz> fnext = 0;
 
-	lf_queue<file_info> possible_exec_file_paths;
+	shared_mutex sprx_mtx, ovl_mtx;
 
-	// Allow to allocate 2000 times the size of each file for the use of LLVM
-	// This works very nicely with Metal Gear Solid 4 for example:
-	// 2 7MB overlay files -> 14GB
-	// The growth in memory requirements of LLVM is not linear with file size of course
-	// But these estimates should hopefully protect RPCS3 in the coming years
-	// Especially when thread count is on the rise with each CPU generation
-	atomic_t<u32> file_size_limit = static_cast<u32>(std::clamp<u64>(utils::aligned_div<u64>(utils::get_total_memory(), 2000), 65536, u32{umax}));
-
-	const u32 software_thread_limit = std::min<u32>(g_cfg.core.llvm_threads ? g_cfg.core.llvm_threads : u32{umax}, ::size32(file_queue));
-	const u32 cpu_thread_limit = utils::get_thread_count() > 8u ? std::max<u32>(utils::get_thread_count(), 2) - 1 : utils::get_thread_count(); // One LLVM thread less
-
-	std::vector<u128> decrypt_klics;
-
-	if (loaded_modules)
+	named_thread_group workers("SPRX Worker ", std::min<u32>(utils::get_thread_count(), ::size32(file_queue)), [&]
 	{
-		for (auto mod : *loaded_modules)
-		{
-			for (const auto& [stub, data_vec] : mod->stub_addr_to_constant_state_of_registers)
-			{
-				if (decrypt_klics.size() >= 4u)
-				{
-					break;
-				}
-
-				for (const auto& [reg_mask, constant_value] : data_vec)
-				{
-					if (decrypt_klics.size() >= 4u)
-					{
-						break;
-					}
-
-					if (constant_value > u32{umax})
-					{
-						continue;
-					}
-
-					// R3 - first argument
-					if (reg_mask.mask & (1u << 3))
-					{
-						// Sizeof KLIC
-						if (auto klic_ptr = mod->get_ptr<const u8>(static_cast<u32>(constant_value), 16))
-						{
-							// Try to read from that address
-							if (const u128 klic_value = read_from_ptr<u128>(klic_ptr))
-							{
-								if (!std::count_if(decrypt_klics.begin(), decrypt_klics.end(), FN(std::memcmp(&x, &klic_value, 16) == 0)))
-								{
-									decrypt_klics.emplace_back(klic_value);
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	named_thread_group workers("SPRX Worker ", std::min<u32>(software_thread_limit, cpu_thread_limit), [&]
-	{
-#ifdef __APPLE__
-		pthread_jit_write_protect_np(false);
-#endif
 		// Set low priority
 		thread_ctrl::scoped_priority low_prio(-1);
-		u32 inc_fdone = 1;
-		u32 restore_mem = 0;
 
-		for (usz func_i = fnext++; func_i < file_queue.size(); func_i = fnext++, g_progr_fdone += std::exchange(inc_fdone, 1))
+		for (usz func_i = fnext++; func_i < file_queue.size(); func_i = fnext++, g_progr_fdone++)
 		{
 			if (Emu.IsStopped())
 			{
 				continue;
 			}
 
-			if (restore_mem)
-			{
-				if (!file_size_limit.fetch_add(restore_mem))
-				{
-					file_size_limit.notify_all();
-				}
-
-				restore_mem = 0;
-			}
-
-			auto& [path, offset, file_size] = file_queue[func_i];
+			auto [path, offset] = std::as_const(file_queue)[func_i];
 
 			ppu_log.notice("Trying to load: %s", path);
 
@@ -4287,104 +2510,37 @@ extern void ppu_precompile(std::vector<std::string>& dir_queue, std::vector<ppu_
 			if (u64 off = offset)
 			{
 				// Adjust offset for MSELF
-				src = make_file_view(std::move(src), offset, file_size);
+				src.reset(std::make_unique<file_view>(std::move(src), off));
 
 				// Adjust path for MSELF too
 				fmt::append(path, "_x%x", off);
 			}
 
-			for (usz i = 0;; i++)
-			{
-				if (i > decrypt_klics.size())
-				{
-					src.close();
-					break;
-				}
-
-				// Some files may fail to decrypt due to the lack of klic
-				u128 key = i == decrypt_klics.size() ? u128{} : decrypt_klics[i];
-
-				if (auto result = decrypt_self(src, i == decrypt_klics.size() ? nullptr : reinterpret_cast<const u8*>(&key)))
-				{
-					src = std::move(result);
-					break;
-				}
-			}
-
-			if (!src && !Emu.klic.empty() && src.open(path))
-			{
-				src = decrypt_self(src, reinterpret_cast<u8*>(&Emu.klic[0]));
-
-				if (src)
-				{
-					ppu_log.error("Possible missed KLIC for precompilation of '%s', please report to developers.", path);
-
-					// Ignore executables larger than 500KB to prevent a long pause on exitspawn
-					if (src.size() >= 500000)
-					{
-						g_progr_ftotal_bits -= file_size;
-
-						continue;
-					}
-				}
-			}
+			// Some files may fail to decrypt due to the lack of klic
+			src = decrypt_self(std::move(src));
 
 			if (!src)
 			{
 				ppu_log.notice("Failed to decrypt '%s'", path);
-
-				g_progr_ftotal_bits -= file_size;
-
 				continue;
 			}
 
-			auto wait_for_memory = [&]() -> bool
-			{
-				// Try not to process too many files at once because it seems to reduce performance and cause RAM shortages
-				// Concurrently compiling more OVL or huge PRX files does not have much theoretical benefit
-				while (!file_size_limit.fetch_op([&](u32& value)
-				{
-					if (value)
-					{
-						// Allow at least one file, make 0 the "memory unavailable" sign value for atomic waiting efficiency
-						const u32 new_val = static_cast<u32>(utils::sub_saturate<u64>(value, file_size));
-						restore_mem = value - new_val;
-						value = new_val;
-						return true;
-					}
-
-					// Resort to waiting
-					restore_mem = 0;
-					return false;
-				}).second)
-				{
-					// Wait until not 0
-					file_size_limit.wait(0);
-				}
-
-				if (Emu.IsStopped())
-				{
-					return false;
-				}
-
-				return true;
-			};
-
 			elf_error prx_err{}, ovl_err{};
 
 			if (ppu_prx_object obj = src; (prx_err = obj, obj == elf_error::ok))
 			{
-				if (!wait_for_memory())
-				{
-					// Emulation stopped
-					continue;
-				}
+				std::unique_lock lock(sprx_mtx);
 
-				if (auto prx = ppu_load_prx(obj, true, path, offset))
+				if (auto prx = ppu_load_prx(obj, path, offset))
 				{
+					lock.unlock();
 					obj.clear(), src.close(); // Clear decrypted file and elf object memory
-					ppu_initialize(*prx, false, file_size);
-					ppu_finalize(*prx, true);
+					ppu_initialize(*prx);
+					idm::remove<lv2_obj, lv2_prx>(idm::last_id());
+					lock.lock();
+					ppu_unload_prx(*prx);
+					lock.unlock();
+					ppu_finalize(*prx);
 					continue;
 				}
 
@@ -4396,45 +2552,30 @@ extern void ppu_precompile(std::vector<std::string>& dir_queue, std::vector<ppu_
 			{
 				while (ovl_err == elf_error::ok)
 				{
-					if (Emu.IsStopped())
-					{
-						break;
-					}
+					// Only one thread compiles OVL atm, other can compile PRX cuncurrently
+					std::unique_lock lock(ovl_mtx);
 
-					const auto [ovlm, error] = ppu_load_overlay(obj, true, path, offset);
+					auto [ovlm, error] = ppu_load_overlay(obj, path, offset);
 
 					if (error)
 					{
-						if (error == CELL_CANCEL + 0u)
-						{
-							// Emulation stopped
-							break;
-						}
-
 						// Abort
 						ovl_err = elf_error::header_type;
 						break;
 					}
 
-					if (!wait_for_memory())
-					{
-						// Emulation stopped
-						break;
-					}
-
-					// Participate in thread execution limitation (takes a long time)
-					if (std::lock_guard lock(g_fxo->get<jit_core_allocator>().sem); !ovlm->analyse(0, ovlm->entry, ovlm->seg0_code_end, ovlm->applied_patches, std::vector<u32>{}, []()
-					{
-						return Emu.IsStopped();
-					}))
-					{
-						// Emulation stopped
-						break;
-					}
-
 					obj.clear(), src.close(); // Clear decrypted file and elf object memory
-					ppu_initialize(*ovlm, false, file_size);
-					ppu_finalize(*ovlm, true);
+
+					ppu_initialize(*ovlm);
+
+					for (auto& seg : ovlm->segs)
+					{
+						vm::dealloc(seg.addr);
+					}
+
+					lock.unlock();
+					idm::remove<lv2_obj, lv2_overlay>(idm::last_id());
+					ppu_finalize(*ovlm);
 					break;
 				}
 
@@ -4444,159 +2585,29 @@ extern void ppu_precompile(std::vector<std::string>& dir_queue, std::vector<ppu_
 				}
 			}
 
-			ppu_log.notice("Failed to precompile '%s' (prx: %s, ovl: %s): Attempting compilation as executable file", path, prx_err, ovl_err);
-			possible_exec_file_paths.push(path, offset, file_size);
-			inc_fdone = 0;
-		}
-
-		if (restore_mem)
-		{
-			if (!file_size_limit.fetch_add(restore_mem))
-			{
-				file_size_limit.notify_all();
-			}
+			ppu_log.notice("Failed to precompile '%s' (prx: %s, ovl: %s)", path, prx_err, ovl_err);
+			continue;
 		}
 	});
 
 	// Join every thread
 	workers.join();
 
-	named_thread exec_worker("PPU Exec Worker", [&]
+	// Revert changes
+
+	if (!had_ovl)
 	{
-		if (!possible_exec_file_paths)
-		{
-			return;
-		}
+		ensure(vm::unmap(0x3000'0000));
+	}
 
-#ifdef __APPLE__
-		pthread_jit_write_protect_np(false);
-#endif
-		// Set low priority
-		thread_ctrl::scoped_priority low_prio(-1);
-
-		auto slice = possible_exec_file_paths.pop_all();
-
-		auto main_module = std::move(g_fxo->get<main_ppu_module<lv2_obj>>());
-
-		for (; slice; slice.pop_front(), g_progr_fdone++)
-		{
-			if (Emu.IsStopped())
-			{
-				continue;
-			}
-
-			const auto& [path, _, file_size] = *slice;
-
-			ppu_log.notice("Trying to load as executable: %s", path);
-
-			// Load SELF
-			fs::file src{path};
-
-			if (!src)
-			{
-				ppu_log.error("Failed to open '%s' (%s)", path, fs::g_tls_error);
-				continue;
-			}
-
-			for (usz i = 0;; i++)
-			{
-				if (i > decrypt_klics.size())
-				{
-					src.close();
-					break;
-				}
-
-				// Some files may fail to decrypt due to the lack of klic
-				u128 key = i == decrypt_klics.size() ? u128{} : decrypt_klics[i];
-
-				if (auto result = decrypt_self(src, i == decrypt_klics.size() ? nullptr : reinterpret_cast<const u8*>(&key)))
-				{
-					src = std::move(result);
-					break;
-				}
-			}
-
-			if (!src && !Emu.klic.empty() && src.open(path))
-			{
-				src = decrypt_self(src, reinterpret_cast<u8*>(&Emu.klic[0]));
-
-				if (src)
-				{
-					ppu_log.error("Possible missed KLIC for precompilation of '%s', please report to developers.", path);
-				}
-			}
-
-			if (!src)
-			{
-				ppu_log.notice("Failed to decrypt '%s'", path);
-
-				g_progr_ftotal_bits -= file_size;
-
-				continue;
-			}
-
-			elf_error exec_err{};
-
-			if (ppu_exec_object obj = src; (exec_err = obj, obj == elf_error::ok))
-			{
-				while (exec_err == elf_error::ok)
-				{
-					main_ppu_module<lv2_obj>& _main = g_fxo->get<main_ppu_module<lv2_obj>>();
-					_main = {};
-
-					auto current_cache = std::move(g_fxo->get<spu_cache>());
-
-					if (!ppu_load_exec(obj, true, path))
-					{
-						// Abort
-						exec_err = elf_error::header_type;
-						break;
-					}
-
-					if (std::memcmp(main_module.sha1, _main.sha1, sizeof(_main.sha1)) == 0)
-					{
-						g_fxo->get<spu_cache>() = std::move(current_cache);
-						break;
-					}
-
-					if (!_main.analyse(0, _main.elf_entry, _main.seg0_code_end, _main.applied_patches, std::vector<u32>{}, [](){ return Emu.IsStopped(); }))
-					{
-						g_fxo->get<spu_cache>() = std::move(current_cache);
-						break;
-					}
-
-					obj.clear(), src.close(); // Clear decrypted file and elf object memory
-
-					_main.name = ' '; // Make ppu_finalize work
-					Emu.ConfigurePPUCache();
-					ppu_initialize(_main, false, file_size);
-					spu_cache::initialize(false);
-					ppu_finalize(_main, true);
-					_main = {};
-					g_fxo->get<spu_cache>() = std::move(current_cache);
-					break;
-				}
-
-				if (exec_err == elf_error::ok)
-				{
-					continue;
-				}
-			}
-
-			ppu_log.notice("Failed to precompile '%s' as executable (%s)", path, exec_err);
-		}
-
-		g_fxo->get<main_ppu_module<lv2_obj>>() = std::move(main_module);
-		g_fxo->get<spu_cache>().collect_funcs_to_precompile = true;
-		Emu.ConfigurePPUCache();
-	});
-
-	exec_worker();
+	g_ps3_process_info.ppc_seg = ppc_seg;
 }
 
 extern void ppu_initialize()
 {
-	if (!g_fxo->is_init<main_ppu_module<lv2_obj>>())
+	auto& _main = g_fxo->get<ppu_module>();
+
+	if (!g_fxo->is_init<ppu_module>())
 	{
 		return;
 	}
@@ -4606,20 +2617,7 @@ extern void ppu_initialize()
 		return;
 	}
 
-	auto& _main = g_fxo->get<main_ppu_module<lv2_obj>>();
-
-	std::optional<scoped_progress_dialog> progress_dialog(std::in_place, get_localized_string(localized_string_id::PROGRESS_DIALOG_ANALYZING_PPU_EXECUTABLE));
-
-	// Analyse executable
-	if (!_main.analyse(0, _main.elf_entry, _main.seg0_code_end, _main.applied_patches, std::vector<u32>{}, [](){ return Emu.IsStopped(); }))
-	{
-		return;
-	}
-
-	// Validate analyser results (not required)
-	_main.validate(0);
-
-	*progress_dialog = get_localized_string(localized_string_id::PROGRESS_DIALOG_SCANNING_PPU_MODULES);
+	scoped_progress_dialog progr = "Scanning PPU modules...";
 
 	bool compile_main = false;
 
@@ -4629,88 +2627,39 @@ extern void ppu_initialize()
 		compile_main = ppu_initialize(_main, true);
 	}
 
-	std::vector<ppu_module<lv2_obj>*> module_list;
-	module_list.emplace_back(&g_fxo->get<main_ppu_module<lv2_obj>>());
+	std::vector<lv2_prx*> prx_list;
 
-	const std::string firmware_sprx_path = vfs::get("/dev_flash/sys/external/");
-
-	// If empty we have no indication for firmware cache state, check everything
-	bool compile_fw = !Emu.IsVsh();
-
-	idm::select<lv2_obj, lv2_prx>([&](u32, lv2_prx& _module)
+	idm::select<lv2_obj, lv2_prx>([&](u32, lv2_prx& prx)
 	{
-		if (_module.get_funcs().empty())
-		{
-			return;
-		}
-
-		if (_module.path.starts_with(firmware_sprx_path))
-		{
-			// Postpone testing
-			compile_fw = false;
-		}
-
-		module_list.emplace_back(&_module);
+		prx_list.emplace_back(&prx);
 	});
 
-	idm::select<lv2_obj, lv2_overlay>([&](u32, lv2_overlay& _module)
-	{
-		module_list.emplace_back(&_module);
-	});
+	// If empty we have no indication for cache state, check everything
+	bool compile_fw = prx_list.empty();
 
 	// Check preloaded libraries cache
-	if (!compile_fw)
+	for (auto ptr : prx_list)
 	{
-		for (auto ptr : module_list)
-		{
-			if (ptr->path.starts_with(firmware_sprx_path))
-			{
-				compile_fw |= ppu_initialize(*ptr, true);
-
-				// Fixup for compatibility with old savestates
-				if (Emu.DeserialManager() && ptr->name == "liblv2.sprx")
-				{
-					static_cast<lv2_prx*>(ptr)->state = PRX_STATE_STARTED;
-					static_cast<lv2_prx*>(ptr)->load_exports();
-				}
-			}
-		}
+		compile_fw |= ppu_initialize(*ptr, true);
 	}
 
 	std::vector<std::string> dir_queue;
 
-	const std::string mount_point = vfs::get("/dev_flash/");
-
-	bool dev_flash_located = !Emu.GetCat().ends_with('P') && Emu.IsPathInsideDir(Emu.GetBoot(), mount_point) && g_cfg.core.llvm_precompilation;
-
-	if (compile_fw || dev_flash_located)
+	if (compile_fw)
 	{
-		if (dev_flash_located)
-		{
-			const std::string eseibrd = mount_point + "/vsh/module/eseibrd.sprx";
-
-			if (auto prx = ppu_load_prx(ppu_prx_object{decrypt_self(fs::file{eseibrd})}, true, eseibrd, 0))
-			{
-				// Check if cache exists for this infinitesimally small prx
-				dev_flash_located = ppu_initialize(*prx, true);
-			}
-		}
-
-		const std::string firmware_sprx_path = vfs::get(dev_flash_located ? "/dev_flash/"sv : "/dev_flash/sys/external/"sv);
+		const std::string firmware_sprx_path = vfs::get("/dev_flash/sys/external/");
 		dir_queue.emplace_back(firmware_sprx_path);
 	}
 
 	// Avoid compilation if main's cache exists or it is a standalone SELF with no PARAM.SFO
-	if (compile_main && g_cfg.core.llvm_precompilation && !Emu.GetTitleID().empty() && !Emu.IsChildProcess())
+	if (compile_main && g_cfg.core.ppu_llvm_precompilation && !Emu.GetTitleID().empty())
 	{
 		// Try to add all related directories
 		const std::set<std::string> dirs = Emu.GetGameDirs();
 		dir_queue.insert(std::end(dir_queue), std::begin(dirs), std::end(dirs));
 	}
 
-	progress_dialog.reset();
-
-	ppu_precompile(dir_queue, &module_list);
+	ppu_precompile(dir_queue, &prx_list);
 
 	if (Emu.IsStopped())
 	{
@@ -4724,7 +2673,7 @@ extern void ppu_initialize()
 	}
 
 	// Initialize preloaded libraries
-	for (auto ptr : module_list)
+	for (auto ptr : prx_list)
 	{
 		if (Emu.IsStopped())
 		{
@@ -4735,48 +2684,36 @@ extern void ppu_initialize()
 	}
 }
 
-bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_size)
+struct ppu_toc_manager
+{
+	std::unordered_map<u32, u32> toc_map;
+
+	shared_mutex mutex;
+};
+
+bool ppu_initialize(const ppu_module& info, bool check_only)
 {
 	if (g_cfg.core.ppu_decoder != ppu_decoder_type::llvm)
 	{
-		if (check_only || vm::base(info.segs[0].addr) != info.segs[0].ptr)
+		if (check_only)
 		{
 			return false;
 		}
 
-		auto& toc_manager = g_fxo->get<ppu_toc_manager>();
+		// Temporarily
+		s_ppu_toc = &g_fxo->get<ppu_toc_manager>().toc_map;
 
-		std::lock_guard lock(toc_manager.mutex);
-
-		auto& ppu_toc = toc_manager.toc_map;
-
-		for (const auto& func : info.get_funcs())
+		for (const auto& func : info.funcs)
 		{
-			if (func.size && func.blocks.empty())
-			{
-				ppu_register_function_at(func.addr, func.size);
-			}
-
 			for (auto& block : func.blocks)
 			{
-				if (!block.second)
-				{
-					continue;
-				}
-
-				if (g_fxo->is_init<ppu_far_jumps_t>() && !g_fxo->get<ppu_far_jumps_t>().get_targets(block.first, block.second).empty())
-				{
-					// Replace the block with ppu_far_jump
-					continue;
-				}
-
-				ppu_register_function_at(block.first, block.second);
+				ppu_register_function_at(block.first, block.second, nullptr);
 			}
 
-			if (g_cfg.core.ppu_debug && func.size && func.toc != umax && !ppu_get_far_jump(func.addr))
+			if (g_cfg.core.ppu_debug && func.size && func.toc != umax)
 			{
-				ppu_toc[func.addr] = func.toc;
-				write_to_ptr<ppu_intrp_func_t>(ppu_ptr(func.addr), &ppu_check_toc);
+				s_ppu_toc->emplace(func.addr, func.toc);
+				ppu_ref(func.addr) = reinterpret_cast<uptr>(&ppu_check_toc);
 			}
 		}
 
@@ -4788,7 +2725,6 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 	{
 		std::unordered_map<std::string, u64> link_table
 		{
-			{ "sys_game_set_system_sw_version", reinterpret_cast<u64>(ppu_execute_syscall) },
 			{ "__trap", reinterpret_cast<u64>(&ppu_trap) },
 			{ "__error", reinterpret_cast<u64>(&ppu_error) },
 			{ "__check", reinterpret_cast<u64>(&ppu_check) },
@@ -4799,12 +2735,17 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 			{ "__ldarx", reinterpret_cast<u64>(ppu_ldarx) },
 			{ "__stwcx", reinterpret_cast<u64>(ppu_stwcx) },
 			{ "__stdcx", reinterpret_cast<u64>(ppu_stdcx) },
+			{ "__vexptefp", reinterpret_cast<u64>(sse_exp2_ps) },
+			{ "__vlogefp", reinterpret_cast<u64>(sse_log2_ps) },
+			{ "__lvsl", reinterpret_cast<u64>(sse_altivec_lvsl) },
+			{ "__lvsr", reinterpret_cast<u64>(sse_altivec_lvsr) },
+			{ "__lvlx", s_use_ssse3 ? reinterpret_cast<u64>(sse_cellbe_lvlx) : reinterpret_cast<u64>(sse_cellbe_lvlx_v0) },
+			{ "__lvrx", s_use_ssse3 ? reinterpret_cast<u64>(sse_cellbe_lvrx) : reinterpret_cast<u64>(sse_cellbe_lvrx_v0) },
+			{ "__stvlx", s_use_ssse3 ? reinterpret_cast<u64>(sse_cellbe_stvlx) : reinterpret_cast<u64>(sse_cellbe_stvlx_v0) },
+			{ "__stvrx", s_use_ssse3 ? reinterpret_cast<u64>(sse_cellbe_stvrx) : reinterpret_cast<u64>(sse_cellbe_stvrx_v0) },
 			{ "__dcbz", reinterpret_cast<u64>(+[](u32 addr){ alignas(64) static constexpr u8 z[128]{}; do_cell_atomic_128_store(addr, z); }) },
 			{ "__resupdate", reinterpret_cast<u64>(vm::reservation_update) },
 			{ "__resinterp", reinterpret_cast<u64>(ppu_reservation_fallback) },
-			{ "__escape", reinterpret_cast<u64>(+ppu_escape) },
-			{ "__read_maybe_mmio32", reinterpret_cast<u64>(+ppu_read_mmio_aware_u32) },
-			{ "__write_maybe_mmio32", reinterpret_cast<u64>(+ppu_write_mmio_aware_u32) },
 		};
 
 		for (u64 index = 0; index < 1024; index++)
@@ -4822,14 +2763,23 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 	// Get cache path for this executable
 	std::string cache_path;
 
-	if (!info.cache.empty())
+	if (info.name.empty())
 	{
 		cache_path = info.cache;
 	}
 	else
 	{
 		// New PPU cache location
-		cache_path = rpcs3::utils::get_cache_dir(info.path);
+		cache_path = fs::get_cache_dir() + "cache/";
+
+		const std::string dev_flash = vfs::get("/dev_flash/");
+
+		if (!info.path.starts_with(dev_flash) && !Emu.GetTitleID().empty() && Emu.GetCat() != "1P")
+		{
+			// Add prefix for anything except dev_flash files, standalone elfs or PS1 classics
+			cache_path += Emu.GetTitleID();
+			cache_path += '/';
+		}
 
 		// Add PPU hash and filename
 		fmt::append(cache_path, "ppu-%s-%s/", fmt::base57(info.sha1), info.path.substr(info.path.find_last_of('/') + 1));
@@ -4841,31 +2791,41 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 	}
 
 #ifdef LLVM_AVAILABLE
-	std::optional<scoped_progress_dialog> progress_dialog;
+	std::optional<scoped_progress_dialog> progr;
 
 	if (!check_only)
 	{
 		// Initialize progress dialog
-		progress_dialog.emplace(get_localized_string(localized_string_id::PROGRESS_DIALOG_LOADING_PPU_MODULES));
+		progr.emplace("Loading PPU modules...");
 	}
 
+	struct jit_core_allocator
+	{
+		const s32 thread_count = g_cfg.core.llvm_threads ? std::min<s32>(g_cfg.core.llvm_threads, limit()) : limit();
+
+		// Initialize global semaphore with the max number of threads
+		::semaphore<0x7fffffff> sem{std::max<s32>(thread_count, 1)};
+
+		static s32 limit()
+		{
+			return static_cast<s32>(utils::get_thread_count());
+		}
+	};
+
 	// Permanently loaded compiled PPU modules (name -> data)
-	jit_module& jit_mod = g_fxo->get<jit_module_manager>().get(cache_path + "_" + std::to_string(std::bit_cast<usz>(info.segs[0].ptr)));
+	jit_module& jit_mod = g_fxo->get<jit_module_manager>().get(cache_path + info.name);
 
 	// Compiler instance (deferred initialization)
-	std::vector<std::shared_ptr<jit_compiler>>& jits = jit_mod.pjit;
+	std::shared_ptr<jit_compiler>& jit = jit_mod.pjit;
 
 	// Split module into fragments <= 1 MiB
 	usz fpos = 0;
 
-	// Modules counted so far
-	usz module_counter = 0;
-
 	// Difference between function name and current location
-	const u32 reloc = info.is_relocatable ? ::at32(info.segs, 0).addr : 0;
+	const u32 reloc = info.relocs.empty() ? 0 : info.segs.at(0).addr;
 
 	// Info sent to threads
-	std::vector<std::pair<std::string, ppu_module<lv2_obj>>> workload;
+	std::vector<std::pair<std::string, ppu_module>> workload;
 
 	// Info to load to main JIT instance (true - compiled)
 	std::vector<std::pair<std::string, bool>> link_workload;
@@ -4875,307 +2835,26 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 
 	bool compiled_new = false;
 
-	bool has_mfvscr = false;
-
-	const bool is_being_used_in_emulation = vm::base(info.segs[0].addr) == info.segs[0].ptr;
-
-	const cpu_thread* cpu = cpu_thread::get_current();
-
-	for (auto& func : info.get_funcs())
+	while (!jit_mod.init && fpos < info.funcs.size())
 	{
-		if (func.size == 0)
+		// Initialize compiler instance
+		if (!jit && get_current_cpu_thread())
 		{
-			continue;
+			jit = std::make_shared<jit_compiler>(s_link_table, g_cfg.core.llvm_cpu);
 		}
 
-		for (const auto [addr, size] : func)
-		{
-			if (size == 0)
-			{
-				continue;
-			}
-
-			auto i_ptr = ensure(info.get_ptr<u32>(addr));
-
-			for (u32 i = addr; i < addr + size; i += 4, i_ptr++)
-			{
-				if (g_ppu_itype.decode(*i_ptr) == ppu_itype::MFVSCR)
-				{
-					ppu_log.warning("MFVSCR found");
-					has_mfvscr = true;
-					break;
-				}
-			}
-
-			if (has_mfvscr)
-			{
-				break;
-			}
-		}
-
-		if (has_mfvscr)
-		{
-			break;
-		}
-	}
-
-	// Limit how many modules are per JIt instance
-	// Advantage to lower the limit:
-	// 1. Lowering contoniues memory requirements for allocations
-	// Its disadvantage:
-	// 1. B instruction can wander up to 16MB relatively to its range,
-	// each additional split of JIT instance results in a downgraded version of around (100% / N-1th) - (100% / Nth) percent of instructions
-	// where N is the total amunt of JIT instances
-	// Subject to change
-	constexpr u32 c_moudles_per_jit = 100;
-
-	std::shared_ptr<std::pair<u32, u32>> local_jit_bounds = std::make_shared<std::pair<u32, u32>>(u32{umax}, 0);
-
-	const auto shared_runtime = make_shared<jit_runtime>();
-	const auto shared_map = make_shared<std::unordered_map<u32, u64>>();
-	const auto full_sample = make_shared<u64>(0);
-	const auto shared_mtx = make_shared<shared_mutex>();
-
-	auto symbols_cement = [runtime = shared_runtime, reloc, seg0 = info.segs[0].addr, bound = info.segs[0].addr + info.segs[0].size - reloc, func_map = shared_map, shared_mtx, full_sample](const std::string& name) -> u64
-	{
-		u32 func_addr = umax;
-
-		if (name.starts_with("__0x"))
-		{
-			u32 addr = umax;
-			auto res = std::from_chars(name.c_str() + 4, name.c_str() + name.size(), addr, 16);
-
-			if (res.ec == std::errc() && res.ptr == name.c_str() + name.size() && addr < bound)
-			{
-				func_addr = addr + reloc;
-			}
-		}
-
-		if (func_addr == umax)
-		{
-			return {};
-		}
-
-		reader_lock rlock(*shared_mtx);
-
-		if (auto it = func_map->find(func_addr); it != func_map->end())
-		{
-			return it->second;
-		}
-
-		rlock.upgrade();
-
-		u64& code_ptr = (*func_map)[func_addr];
-
-		if (code_ptr)
-		{
-			return +code_ptr;
-		}
-
-		[[maybe_unused]] constexpr auto abs_diff = [](u64 a, u64 b) { return a <= b ? b - a : a - b; };
-
-		[[maybe_unused]] auto write_le = [](u8*& code, auto value)
-		{
-			write_to_ptr<le_t<std::remove_cvref_t<decltype(value)>>>(code, value);
-			code += sizeof(value);
-		};
-
-#if defined(ARCH_X64)
-		// Try to make the code fit in 16 bytes, may fail and fallback
-		if (*full_sample && (*full_sample <= s32{smax} || abs_diff(*full_sample, reinterpret_cast<u64>(jit_runtime::peek(true))) <= s32{smax}))
-		{
-			u8* code = jit_runtime::alloc(16, 8, true);
-			code_ptr = reinterpret_cast<u64>(code);
-
-			// mov edx, func_addr
-			*code++ = 0xba;
-			write_le(code, func_addr - seg0);
-
-			const u64 diff_for_jump = abs_diff(reinterpret_cast<u64>(code + 5), *full_sample);
-
-			if (diff_for_jump <= s32{smax})
-			{
-				// jmp (rel32) full_sample
-				*code++ = 0xe9;
-
-				write_le(code, static_cast<s32>(*full_sample - reinterpret_cast<u64>(code + 4)));
-				return code_ptr;
-			}
-			else if (*full_sample <= s32{smax})
-			{
-				// mov eax, full_sample
-				*code++ = 0xb8;
-
-				write_le(code, static_cast<s32>(*full_sample));
-
-				// jmp rax
-				*code++ = 0xff;
-				*code++ = 0xea;
-				return code_ptr;
-			}
-			else // fallback (requiring more than 16 bytes)
-			{
-				// movabs rax, full_sample
-				// *code++ = 0x48;
-				// *code++ = 0xb8;
-
-				// write_le(code, *full_sample);
-
-				// // jmp rax
-				// *code++ = 0xff;
-				// *code++ = 0xea;
-				// return code_ptr;
-				ppu_log.error("JIT symbol trampoline failed.");
-			}
-		}
-#elif 0
-		// Try to make the code fit in 16 bytes, may fail and fallback
-		if (*full_sample && abs_diff(*full_sample, reinterpret_cast<u64>(jit_runtime::peek(true) + 3 * 4)) < (128u << 20))
-		{
-#ifdef __APPLE__
-			pthread_jit_write_protect_np(false);
-#endif
-			u8* code = jit_runtime::alloc(12, 4, true);
-			code_ptr = reinterpret_cast<u64>(code);
-
-			union arm_op
-			{
-				u32 op;
-				bf_t<u32, 0, 26> b_target;
-				bf_t<u32, 5, 16> mov_imm16;
-			};
-
-			const u64 diff_for_jump = abs_diff(reinterpret_cast<u64>(code + 3 * 4), *full_sample);
-
-			if (diff_for_jump < (128u << 20))
-			{
-				// MOVZ w15, func_addr
-				arm_op mov_pcl{0x5280000F};
-				mov_pcl.mov_imm16 = func_addr & 0xffff;
-
-				write_le(code, mov_pcl.op);
-
-				// MOVK w15, func_addr >> 16, LSL #16
-				arm_op mov_pch{0x72A0000F};
-				mov_pch.mov_imm16 = func_addr >> 16;
-
-				write_le(code, mov_pch.op);
-
-				const s64 branch_offset = (*full_sample - reinterpret_cast<u64>(code + 4));
-
-				// B full_sample
-				arm_op b_sample{0x14000000};
-				b_sample.b_target = static_cast<s32>(branch_offset / 4);
-
-				write_le(code, b_sample.op);
-				return code_ptr;
-			}
-			else // fallback
-			{
-				ppu_log.error("JIT symbol trampoline failed.");
-			}
-		}
-#endif
-
-		using namespace asmjit;
-
-		usz code_size_until_jump = umax;
-
-		auto func = build_function_asm<u8*(*)(ppu_thread&, u64, u8*, u64, u64, u64)>(name, [&](native_asm& c, auto& /*args*/)
-		{
-#if defined(ARCH_X64)
-			c.mov(x86::edx, func_addr - seg0); // Load PC
-
-			const auto buf_start = reinterpret_cast<const u8*>(c.bufferData());
-			const auto buf_end = reinterpret_cast<const u8*>(c.bufferPtr());
-
-			code_size_until_jump = buf_end - buf_start;
-
-			c.add(x86::edx, seg0);
-			c.movabs(x86::rax, reinterpret_cast<u64>(&vm::g_exec_addr));
-			c.mov(x86::rax, x86::qword_ptr(x86::rax));
-			c.mov(x86::dword_ptr(x86::rbp, ::offset32(&ppu_thread::cia)), x86::edx);
-
-			c.mov(x86::rcx, x86::qword_ptr(x86::rax, x86::rdx, 1, 0)); // Load call target
-			c.movabs(x86::r12, vm::g_exec_addr_seg_offset);
-			c.add(x86::rax, x86::r12);
-			c.shr(x86::edx, 1);
-			c.mov(x86::edx, x86::word_ptr(x86::rax, x86::edx)); // Load relocation base
-			c.shl(x86::edx, 13);
-			c.mov(x86::r12d, x86::edx); // Set relocation base
-			c.jmp(x86::rcx);
-#else
-			// Load REG_Base - use absolute jump target to bypass rel jmp range limits
-			// X19 contains vm::g_exec_addr
-			const arm::GpX exec_addr = a64::x19;
-
-			// X20 contains ppu_thread*
-			const arm::GpX ppu_t_base = a64::x20;
-
-			// Load PC
-			const arm::GpX pc = a64::x15;
-			const arm::GpX cia_addr_reg = a64::x11;
-
-			// Load CIA
-			c.mov(pc.w(), func_addr);
-
-			const auto buf_start = reinterpret_cast<const u8*>(c.bufferData());
-			const auto buf_end = reinterpret_cast<const u8*>(c.bufferPtr());
-
-			code_size_until_jump = buf_end - buf_start;
-
-			// Load offset value
-			c.mov(cia_addr_reg, static_cast<u64>(::offset32(&ppu_thread::cia)));
-
-			// Update CIA
-			c.str(pc.w(), arm::Mem(ppu_t_base, cia_addr_reg));
-
-			// Multiply by 2 to index into ptr table
-			c.add(pc, pc, pc);
-
-			// Load call target
-			const arm::GpX call_target = a64::x13;
-			c.ldr(call_target, arm::Mem(exec_addr, pc));
-
-			// Compute REG_Hp
-			const arm::GpX reg_hp = a64::x21;
-			c.mov(reg_hp, Imm(vm::g_exec_addr_seg_offset));
-			c.add(reg_hp, reg_hp, pc, arm::Shift(arm::ShiftOp::kLSR, 2));
-			c.ldrh(reg_hp.w(), arm::Mem(exec_addr, reg_hp));
-			c.lsl(reg_hp.w(), reg_hp.w(), 13);
-
-			// Execute LLE call
-			c.br(call_target);
-#endif
-		}, runtime.get(), true);
-
-		// Full sample may exist already, but is very far away
-		// So in this case, a new sample is written
-		ensure(code_size_until_jump != umax);
-		*full_sample = reinterpret_cast<u64>(func) + code_size_until_jump;
-
-		code_ptr = reinterpret_cast<u64>(func);
-		return code_ptr;
-	};
-
-	if (has_mfvscr && g_cfg.core.ppu_set_sat_bit)
-	{
-		info.attr += ppu_attr::has_mfvscr;
-	}
-
-	while (!jit_mod.init && fpos < info.get_funcs().size())
-	{
-		// Copy module information
-		ppu_module<lv2_obj> part;
+		// Copy module information (TODO: optimize)
+		ppu_module part;
 		part.copy_part(info);
+		part.funcs.reserve(16000);
 
 		// Overall block size in bytes
 		usz bsize = 0;
 		usz bcount = 0;
 
-		while (fpos < info.get_funcs().size())
+		while (fpos < info.funcs.size())
 		{
-			auto& func = info.get_funcs()[fpos];
+			auto& func = info.funcs[fpos];
 
 			if (!func.size)
 			{
@@ -5191,36 +2870,17 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 				}
 			}
 
-			if (g_fxo->is_init<ppu_far_jumps_t>())
+			// Copy block or function entry
+			ppu_function& entry = part.funcs.emplace_back(func);
+
+			// Fixup some information
+			entry.name = fmt::format("__0x%x", entry.addr - reloc);
+
+			if (entry.blocks.empty())
 			{
-				auto targets = g_fxo->get<ppu_far_jumps_t>().get_targets(func.addr, func.size);
-
-				for (auto [source, target] : targets)
-				{
-					auto far_jump = ensure(g_fxo->get<ppu_far_jumps_t>().gen_jump(source));
-
-					if (source == func.addr)
-					{
-						(*shared_map)[func.addr] = reinterpret_cast<u64>(far_jump);
-					}
-
-					ppu_register_function_at(source, 4, far_jump);
-				}
-
-				if (!targets.empty())
-				{
-					// Replace the function with ppu_far_jump
-					fpos++;
-					continue;
-				}
+				entry.blocks.emplace(func.addr, func.size);
 			}
 
-			local_jit_bounds->first = std::min<u32>(local_jit_bounds->first, func.addr);
-			local_jit_bounds->second = std::max<u32>(local_jit_bounds->second, func.addr + func.size);
-
-			part.local_bounds.first = std::min<u32>(part.local_bounds.first, func.addr);
-			part.local_bounds.second = std::max<u32>(part.local_bounds.second, func.addr + func.size);
-
 			bsize += func.size;
 
 			fpos++;
@@ -5236,7 +2896,7 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 
 			int has_dcbz = !!g_cfg.core.accurate_cache_line_stores;
 
-			for (const auto& func : part.get_funcs())
+			for (const auto& func : part.funcs)
 			{
 				if (func.size == 0)
 				{
@@ -5248,7 +2908,7 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 				sha1_update(&ctx, reinterpret_cast<const u8*>(&addr), sizeof(addr));
 				sha1_update(&ctx, reinterpret_cast<const u8*>(&size), sizeof(size));
 
-				for (const auto block : func)
+				for (const auto& block : func.blocks)
 				{
 					if (block.second == 0 || reloc)
 					{
@@ -5268,7 +2928,7 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 						if (roff > addr)
 						{
 							// Hash from addr to the beginning of the relocation
-							sha1_update(&ctx, ensure(info.get_ptr<const u8>(addr)), roff - addr);
+							sha1_update(&ctx, vm::_ptr<const u8>(addr), roff - addr);
 						}
 
 						// Hash relocation type instead
@@ -5281,11 +2941,9 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 
 					if (has_dcbz == 1)
 					{
-						auto i_ptr = ensure(info.get_ptr<u32>(addr));
-
-						for (u32 i = addr, end = block.second + block.first - 1; i <= end; i += 4, i_ptr++)
+						for (u32 i = addr, end = block.second + block.first - 1; i <= end; i += 4)
 						{
-							if (g_ppu_itype.decode(*i_ptr) == ppu_itype::DCBZ)
+							if (g_ppu_itype.decode(vm::read32(i)) == ppu_itype::DCBZ)
 							{
 								has_dcbz = 2;
 								break;
@@ -5294,7 +2952,7 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 					}
 
 					// Hash from addr to the end of the block
-					sha1_update(&ctx, ensure(info.get_ptr<const u8>(addr)), block.second - (addr - block.first));
+					sha1_update(&ctx, vm::_ptr<const u8>(addr), block.second - (addr - block.first));
 				}
 
 				if (reloc)
@@ -5304,11 +2962,9 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 
 				if (has_dcbz == 1)
 				{
-					auto i_ptr = ensure(info.get_ptr<u32>(func.addr));
-
-					for (u32 i = func.addr, end = func.addr + func.size - 1; i <= end; i += 4, i_ptr++)
+					for (u32 i = func.addr, end = func.addr + func.size - 1; i <= end; i += 4)
 					{
-						if (g_ppu_itype.decode(*i_ptr) == ppu_itype::DCBZ)
+						if (g_ppu_itype.decode(vm::read32(i)) == ppu_itype::DCBZ)
 						{
 							has_dcbz = 2;
 							break;
@@ -5316,43 +2972,7 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 					}
 				}
 
-				sha1_update(&ctx, ensure(info.get_ptr<const u8>(func.addr)), func.size);
-			}
-
-			if (fpos >= info.get_funcs().size() || module_counter % c_moudles_per_jit == c_moudles_per_jit - 1)
-			{
-				// Hash the entire function grouped addresses for the integrity of the symbol resolver function
-				// Potentially occuring during patches
-				// Avoid doing it for files with a single module such as most PRX
-
-				std::vector<be_t<u32>> addrs;
-
-				constexpr auto compare = [](const ppu_function& a, u32 addr) { return a.addr < addr; };
-
-				const auto start = std::lower_bound(info.funcs.begin(), info.funcs.end(), local_jit_bounds->first, compare);
-
-				std::span<const ppu_function> span_range{ start, std::lower_bound(start, info.funcs.end(), local_jit_bounds->second, compare) };
-
-				for (const ppu_function& func : span_range)
-				{
-					if (func.size == 0)
-					{
-						continue;
-					}
-
-					addrs.emplace_back(func.addr - reloc);
-				}
-
-				// Hash its size too
-				addrs.emplace_back(::size32(addrs));
-
-				if (module_counter != 0)
-				{
-					sha1_update(&ctx, reinterpret_cast<const u8*>(addrs.data()), addrs.size() * sizeof(be_t<u32>));
-				}
-
-				part.jit_bounds = std::move(local_jit_bounds);
-				local_jit_bounds = std::make_shared<std::pair<u32, u32>>(u32{umax}, 0);
+				sha1_update(&ctx, vm::_ptr<const u8>(func.addr), func.size);
 			}
 
 			if (false)
@@ -5366,73 +2986,61 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 			// Settings: should be populated by settings which affect codegen (TODO)
 			enum class ppu_settings : u32
 			{
-				platform_bit,
-				accurate_dfma,
-				fixup_vnan,
-				fixup_nj_denormals,
+				non_win32,
+				accurate_fma,
+				accurate_ppu_vector_nan,
+				java_mode_handling,
 				accurate_cache_line_stores,
 				reservations_128_byte,
 				greedy_mode,
-				accurate_sat,
-				accurate_fpcc,
-				accurate_vnan,
-				accurate_nj_mode,
-				contains_symbol_resolver,
 
 				__bitset_enum_max
 			};
 
 			be_t<bs_t<ppu_settings>> settings{};
 
-#if !defined(_WIN32) && !defined(__APPLE__)
-			settings += ppu_settings::platform_bit;
+#ifndef _WIN32
+			settings += ppu_settings::non_win32;
 #endif
-			if (g_cfg.core.use_accurate_dfma)
-				settings += ppu_settings::accurate_dfma;
-			if (g_cfg.core.ppu_fix_vnan)
-				settings += ppu_settings::fixup_vnan;
-			if (g_cfg.core.ppu_llvm_nj_fixup)
-				settings += ppu_settings::fixup_nj_denormals;
+			if (g_cfg.core.llvm_accurate_dfma)
+				settings += ppu_settings::accurate_fma;
+			if (g_cfg.core.llvm_ppu_accurate_vector_nan)
+				settings += ppu_settings::accurate_ppu_vector_nan;
+			if (g_cfg.core.llvm_ppu_jm_handling)
+				settings += ppu_settings::java_mode_handling;
 			if (has_dcbz == 2)
 				settings += ppu_settings::accurate_cache_line_stores;
 			if (g_cfg.core.ppu_128_reservations_loop_max_length)
 				settings += ppu_settings::reservations_128_byte;
 			if (g_cfg.core.ppu_llvm_greedy_mode)
 				settings += ppu_settings::greedy_mode;
-			if (has_mfvscr && g_cfg.core.ppu_set_sat_bit)
-				settings += ppu_settings::accurate_sat;
-			if (g_cfg.core.ppu_set_fpcc)
-				settings += ppu_settings::accurate_fpcc, fmt::throw_exception("FPCC Not implemented");
-			if (g_cfg.core.ppu_set_vnan)
-				settings += ppu_settings::accurate_vnan, settings -= ppu_settings::fixup_vnan, fmt::throw_exception("VNAN Not implemented");
-			if (g_cfg.core.ppu_use_nj_bit)
-				settings += ppu_settings::accurate_nj_mode, settings -= ppu_settings::fixup_nj_denormals, fmt::throw_exception("NJ Not implemented");
-			if (fpos >= info.get_funcs().size() || module_counter % c_moudles_per_jit == c_moudles_per_jit - 1)
-				settings += ppu_settings::contains_symbol_resolver; // Avoid invalidating all modules for this purpose
 
 			// Write version, hash, CPU, settings
-			fmt::append(obj_name, "v7-kusa-%s-%s-%s.obj", fmt::base57(output, 16), fmt::base57(settings), jit_compiler::cpu(g_cfg.core.llvm_cpu));
+			fmt::append(obj_name, "v4-kusa-%s-%s-%s.obj", fmt::base57(output, 16), fmt::base57(settings), jit_compiler::cpu(g_cfg.core.llvm_cpu));
 		}
 
-		if (cpu ? cpu->state.all_of(cpu_flag::exit) : Emu.IsStopped())
+		if (Emu.IsStopped())
 		{
 			break;
 		}
 
-		module_counter++;
-
 		if (!check_only)
 		{
+			// Update progress dialog
+			g_progr_ptotal++;
+
 			link_workload.emplace_back(obj_name, false);
 		}
 
 		// Check object file
 		if (jit_compiler::check(cache_path + obj_name))
 		{
-			if (!is_being_used_in_emulation && !check_only)
+			if (!jit && !check_only)
 			{
 				ppu_log.success("LLVM: Module exists: %s", obj_name);
-				link_workload.pop_back();
+
+				// Update progress dialog
+				g_progr_pdone++;
 			}
 
 			continue;
@@ -5458,282 +3066,131 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 		return false;
 	}
 
-	if (g_progr_ftotal_bits && file_size)
-	{
-		g_progr_fknown_bits += file_size;
-	}
-
-	// Create worker threads for compilation
 	if (!workload.empty())
 	{
-		// Update progress dialog
-		g_progr_ptotal += ::size32(workload);
+		g_progr = "Compiling PPU modules...";
+	}
 
-		*progress_dialog = get_localized_string(localized_string_id::PROGRESS_DIALOG_COMPILING_PPU_MODULES);
+	// Create worker threads for compilation (TODO: how many threads)
+	{
+		u32 thread_count = rpcs3::utils::get_max_threads();
 
-		const u32 thread_count = std::min(::size32(workload), rpcs3::utils::get_max_threads());
+		if (workload.size() < thread_count)
+		{
+			thread_count = ::size32(workload);
+		}
 
 		struct thread_index_allocator
 		{
 			atomic_t<u64> index = 0;
 		};
 
-		struct thread_op
-		{
-			atomic_t<u32>& work_cv;
-			std::vector<std::pair<std::string, ppu_module<lv2_obj>>>& workload;
-			const ppu_module<lv2_obj>& main_module;
-			const std::string& cache_path;
-			const cpu_thread* cpu;
-
-			std::unique_lock<decltype(jit_core_allocator::sem)> core_lock;
-
-			thread_op(atomic_t<u32>& work_cv, std::vector<std::pair<std::string, ppu_module<lv2_obj>>>& workload
-				, const cpu_thread* cpu, const ppu_module<lv2_obj>& main_module, const std::string& cache_path, decltype(jit_core_allocator::sem)& sem) noexcept
-
-				: work_cv(work_cv)
-				, workload(workload)
-				, main_module(main_module)
-				, cache_path(cache_path)
-				, cpu(cpu)
-			{
-				// Save mutex
-				core_lock = std::unique_lock{sem, std::defer_lock};
-			}
-
-			thread_op(const thread_op& other) noexcept
-				: work_cv(other.work_cv)
-				, workload(other.workload)
-				, main_module(other.main_module)
-				, cache_path(other.cache_path)
-				, cpu(other.cpu)
-			{
-				if (auto mtx = other.core_lock.mutex())
-				{
-					// Save mutex
-					core_lock = std::unique_lock{*mtx, std::defer_lock};
-				}
-			}
-
-			thread_op(thread_op&& other) noexcept = default;
-
-			void operator()()
-			{
-				// Set low priority
-				thread_ctrl::scoped_priority low_prio(-1);
-
-	#ifdef __APPLE__
-				pthread_jit_write_protect_np(false);
-	#endif
-				for (u32 i = work_cv++; i < workload.size(); i = work_cv++, g_progr_pdone++)
-				{
-					if (cpu ? cpu->state.all_of(cpu_flag::exit) : Emu.IsStopped())
-					{
-						continue;
-					}
-
-					// Keep allocating workload
-					const auto& [obj_name, part] = std::as_const(workload)[i];
-
-					std::shared_lock rlock(g_fxo->get<jit_core_allocator>().shared_mtx, std::defer_lock);
-					std::unique_lock lock(g_fxo->get<jit_core_allocator>().shared_mtx, std::defer_lock);
-
-					if (false && part.jit_bounds && part.parent->funcs.size() >= 0x8000)
-					{
-						// Make a large symbol-resolving function compile alone because it has massive memory requirements
-						lock.lock();
-					}
-					else
-					{
-						rlock.lock();
-					}
-
-					ppu_log.warning("LLVM: Compiling module %s%s", cache_path, obj_name);
-
-					{
-						// Use another JIT instance
-						jit_compiler jit2({}, g_cfg.core.llvm_cpu, 0x1);
-						ppu_initialize2(jit2, part, cache_path, obj_name);
-					}
-
-					ppu_log.success("LLVM: Compiled module %s", obj_name);
-				}
-
-				core_lock.unlock();
-			}
-		};
-
 		// Prevent watchdog thread from terminating
 		g_watchdog_hold_ctr++;
 
-		named_thread_group threads(fmt::format("PPUW.%u.", ++g_fxo->get<thread_index_allocator>().index), thread_count
-			, thread_op(work_cv, workload, cpu, info, cache_path, g_fxo->get<jit_core_allocator>().sem)
-			, [&](u32 /*thread_index*/, thread_op& op)
+		named_thread_group threads(fmt::format("PPUW.%u.", ++g_fxo->get<thread_index_allocator>().index), thread_count, [&]()
 		{
-			// Allocate "core"
-			op.core_lock.lock();
+			// Set low priority
+			thread_ctrl::scoped_priority low_prio(-1);
 
-			// Second check before creating another thread
-			return work_cv < workload.size() && (cpu ? !cpu->state.all_of(cpu_flag::exit) : !Emu.IsStopped());
+			for (u32 i = work_cv++; i < workload.size(); i = work_cv++, g_progr_pdone++)
+			{
+				if (Emu.IsStopped())
+				{
+					continue;
+				}
+
+				// Keep allocating workload
+				const auto& [obj_name, part] = std::as_const(workload)[i];
+
+				// Allocate "core"
+				std::lock_guard jlock(g_fxo->get<jit_core_allocator>().sem);
+
+				ppu_log.warning("LLVM: Compiling module %s%s", cache_path, obj_name);
+
+				// Use another JIT instance
+				jit_compiler jit2({}, g_cfg.core.llvm_cpu, 0x1);
+				ppu_initialize2(jit2, part, cache_path, obj_name);
+
+				ppu_log.success("LLVM: Compiled module %s", obj_name);
+			}
 		});
 
 		threads.join();
 
 		g_watchdog_hold_ctr--;
-	}
 
-	// Initialize compiler instance
-	while (jits.size() < utils::aligned_div<u64>(module_counter, c_moudles_per_jit) && is_being_used_in_emulation)
-	{
-		jits.emplace_back(std::make_shared<jit_compiler>(s_link_table, g_cfg.core.llvm_cpu, 0, symbols_cement));
-
-		for (const auto& [addr, func] : *shared_map)
-		{
-			jits.back()->update_global_mapping(fmt::format("__0x%x", addr - reloc), func);
-		}
-	}
-
-	if (jit_mod.symbol_resolvers.empty() && is_being_used_in_emulation)
-	{
-		jit_mod.symbol_resolvers.resize(jits.size());
-	}
-
-	bool failed_to_load = false;
-	{
-		if (!is_being_used_in_emulation || (cpu ? cpu->state.all_of(cpu_flag::exit) : Emu.IsStopped()))
+		if (Emu.IsStopped() || !get_current_cpu_thread())
 		{
 			return compiled_new;
 		}
 
-		*progress_dialog = get_localized_string(localized_string_id::PROGRESS_DIALOG_LINKING_PPU_MODULES);
-
-		// Because linking is faster than compiling, consider each module linkages as a single module compilation in time
-		const bool divide_by_twenty = !workload.empty();
-		const usz increment_link_count_at = (divide_by_twenty ? 20 : 1);
-
-		g_progr_ptotal += static_cast<u32>(utils::aligned_div<u64>(link_workload.size(), increment_link_count_at));
-
-		usz mod_index = umax;
-
-		for (const auto& [obj_name, is_compiled] : link_workload)
+		if (workload.size() < link_workload.size())
 		{
-			mod_index++;
+			// Only show this message if this task is relevant
+			g_progr = "Linking PPU modules...";
+		}
 
-			if (cpu ? cpu->state.all_of(cpu_flag::exit) : Emu.IsStopped())
+		for (auto [obj_name, is_compiled] : link_workload)
+		{
+			if (Emu.IsStopped())
 			{
 				break;
 			}
 
-			if (!failed_to_load && !jits[mod_index / c_moudles_per_jit]->add(cache_path + obj_name))
-			{
-				ppu_log.error("LLVM: Failed to load module %s", obj_name);
-				failed_to_load = true;
-			}
-
-			if (mod_index % increment_link_count_at == (link_workload.size() - 1) % increment_link_count_at)
-			{
-				// Incremenet 'pdone' Nth times where N is link workload size ceil-divided by increment_link_count_at
-				g_progr_pdone++;
-			}
-
-			if (failed_to_load)
-			{
-				continue;
-			}
+			jit->add(cache_path + obj_name);
 
 			if (!is_compiled)
 			{
 				ppu_log.success("LLVM: Loaded module %s", obj_name);
+				g_progr_pdone++;
 			}
 		}
 	}
 
-	if (failed_to_load || !is_being_used_in_emulation || (cpu ? cpu->state.all_of(cpu_flag::exit) : Emu.IsStopped()))
+	if (Emu.IsStopped() || !get_current_cpu_thread())
 	{
 		return compiled_new;
 	}
 
 	// Jit can be null if the loop doesn't ever enter.
-#ifdef __APPLE__
-	pthread_jit_write_protect_np(false);
-#endif
-	// Try to patch all single and unregistered BLRs with the same function (TODO: Maybe generalize it into PIC code detection and patching)
-	ppu_intrp_func_t BLR_func = nullptr;
-
-	const bool showing_only_apply_stage = !g_progr_text.operator bool() && !g_progr_ptotal && !g_progr_ftotal && g_progr_ptotal.compare_and_swap_test(0, 1);
-
-	progress_dialog = get_localized_string(localized_string_id::PROGRESS_DIALOG_APPLYING_PPU_CODE);
-
-	if (jits.empty())
+	if (jit && !jit_mod.init)
 	{
-		// No functions - nothing to do
-		ensure(info.get_funcs().empty());
-		return compiled_new;
-	}
+		jit->fin();
 
-	const bool is_first = !jit_mod.init;
-
-	if (is_first)
-	{
-		for (auto& jit : jits)
+		// Get and install function addresses
+		for (const auto& func : info.funcs)
 		{
-			jit->fin();
+			if (!func.size) continue;
+
+			const auto name = fmt::format("__0x%x", func.addr - reloc);
+			const u64 addr = ensure(jit->get(name));
+			jit_mod.funcs.emplace_back(reinterpret_cast<ppu_function_t>(addr));
+			ppu_ref(func.addr) = (addr & 0x7fff'ffff'ffffu) | (ppu_ref(func.addr) & ~0x7fff'ffff'ffffu);
+
+			if (g_cfg.core.ppu_debug)
+				ppu_log.notice("Installing function %s at 0x%x: %p (reloc = 0x%x)", name, func.addr, ppu_ref(func.addr), reloc);
 		}
-	}
 
-#ifdef __APPLE__
-	// Symbol resolver is in JIT mem, so we must enable execution
-	pthread_jit_write_protect_np(true);
-#endif
-	{
-		usz index = umax;
-
-		for (auto& sim : jit_mod.symbol_resolvers)
-		{
-			index++;
-
-			sim = ensure(!is_first ? sim : reinterpret_cast<void(*)(u8*, u64)>(jits[index]->get("__resolve_symbols")));
-			sim(vm::g_exec_addr, info.segs[0].addr);
-		}
-	}
-
-#ifdef __APPLE__
-	// Symbol resolver is in JIT mem, so we must enable execution
-	pthread_jit_write_protect_np(false);
-#endif
-
-	// Find a BLR-only function in order to copy it to all BLRs (some games need it)
-	for (const auto& func : info.get_funcs())
-	{
-		if (func.size == 4 && *info.get_ptr<u32>(func.addr) == ppu_instructions::BLR())
-		{
-			BLR_func = ppu_read(func.addr);
-			break;
-		}
-	}
-
-	if (is_first)
-	{
 		jit_mod.init = true;
 	}
-
-	if (BLR_func)
+	else
 	{
-		auto inst_ptr = info.get_ptr<u32>(info.segs[0].addr);
+		usz index = 0;
 
-		for (u32 addr = info.segs[0].addr; addr < info.segs[0].addr + info.segs[0].size; addr += 4, inst_ptr++)
+		// Locate existing functions
+		for (const auto& func : info.funcs)
 		{
-			if (*inst_ptr == ppu_instructions::BLR() && reinterpret_cast<uptr>(ppu_read(addr)) == reinterpret_cast<uptr>(ppu_recompiler_fallback_ghc))
-			{
-				write_to_ptr<ppu_intrp_func_t>(ppu_ptr(addr), BLR_func);
-			}
-		}
-	}
+			if (!func.size) continue;
 
-	if (showing_only_apply_stage)
-	{
-		// Done
-		g_progr_pdone++;
+			const u64 addr = ensure(reinterpret_cast<uptr>(jit_mod.funcs[index++]));
+			ppu_ref(func.addr) = (addr & 0x7fff'ffff'ffffu) | (ppu_ref(func.addr) & ~0x7fff'ffff'ffffu);
+
+			if (g_cfg.core.ppu_debug)
+				ppu_log.notice("Reinstalling function at 0x%x: %p (reloc=0x%x)", func.addr, ppu_ref(func.addr), reloc);
+		}
+
+		index = 0;
 	}
 
 	return compiled_new;
@@ -5742,7 +3199,7 @@ bool ppu_initialize(const ppu_module<lv2_obj>& info, bool check_only, u64 file_s
 #endif
 }
 
-static void ppu_initialize2(jit_compiler& jit, const ppu_module<lv2_obj>& module_part, const std::string& cache_path, const std::string& obj_name)
+static void ppu_initialize2(jit_compiler& jit, const ppu_module& module_part, const std::string& cache_path, const std::string& obj_name)
 {
 #ifdef LLVM_AVAILABLE
 	using namespace llvm;
@@ -5751,7 +3208,7 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module<lv2_obj>& module
 	std::unique_ptr<Module> _module = std::make_unique<Module>(obj_name, jit.get_context());
 
 	// Initialize target
-	_module->setTargetTriple(jit_compiler::triple1());
+	_module->setTargetTriple(Triple::normalize(sys::getProcessTriple()));
 	_module->setDataLayout(jit.get_engine().getTargetMachine()->createDataLayout());
 
 	// Initialize translator
@@ -5760,7 +3217,7 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module<lv2_obj>& module
 	// Define some types
 	const auto _func = FunctionType::get(translator.get_type<void>(), {
 		translator.get_type<u8*>(), // Exec base
-		translator.get_type<u8*>(), // PPU context
+		translator.GetContextType()->getPointerTo(), // PPU context
 		translator.get_type<u64>(), // Segment address (for PRX)
 		translator.get_type<u8*>(), // Memory base
 		translator.get_type<u64>(), // r0
@@ -5768,60 +3225,43 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module<lv2_obj>& module
 		translator.get_type<u64>(), // r2
 		}, false);
 
-	// Difference between function name and current location
-	const u32 reloc = module_part.is_relocatable ? ::at32(module_part.segs, 0).addr : 0;
-
 	// Initialize function list
-	for (const auto& func : module_part.get_funcs())
+	for (const auto& func : module_part.funcs)
 	{
 		if (func.size)
 		{
-			const auto f = cast<Function>(_module->getOrInsertFunction(fmt::format("__0x%x", func.addr - reloc), _func).getCallee());
+			const auto f = cast<Function>(_module->getOrInsertFunction(func.name, _func).getCallee());
 			f->setCallingConv(CallingConv::GHC);
-			f->addParamAttr(1, llvm::Attribute::NoAlias);
+			f->addAttribute(2, Attribute::NoAlias);
 			f->addFnAttr(Attribute::NoUnwind);
 		}
 	}
 
 	{
-		if (g_cfg.core.ppu_debug)
-		{
-			translator.build_interpreter();
-		}
+		legacy::FunctionPassManager pm(_module.get());
 
-		// Create the analysis managers.
-		// These must be declared in this order so that they are destroyed in the
-		// correct order due to inter-analysis-manager references.
-		LoopAnalysisManager lam;
-		FunctionAnalysisManager fam;
-		CGSCCAnalysisManager cgam;
-		ModuleAnalysisManager mam;
-
-		// Create the new pass manager builder.
-		// Take a look at the PassBuilder constructor parameters for more
-		// customization, e.g. specifying a TargetMachine or various debugging
-		// options.
-		PassBuilder pb;
-
-		// Register all the basic analyses with the managers.
-		pb.registerModuleAnalyses(mam);
-		pb.registerCGSCCAnalyses(cgam);
-		pb.registerFunctionAnalyses(fam);
-		pb.registerLoopAnalyses(lam);
-		pb.crossRegisterProxies(lam, fam, cgam, mam);
-
-		FunctionPassManager fpm;
 		// Basic optimizations
-		fpm.addPass(EarlyCSEPass());
-
-		u32 guest_code_size = 0;
-		u32 min_addr = umax;
-		u32 max_addr = 0;
-		u32 num_func = 0;
+		//pm.add(createCFGSimplificationPass());
+		//pm.add(createPromoteMemoryToRegisterPass());
+		pm.add(createEarlyCSEPass());
+		//pm.add(createTailCallEliminationPass());
+		//pm.add(createInstructionCombiningPass());
+		//pm.add(createBasicAAWrapperPass());
+		//pm.add(new MemoryDependenceAnalysis());
+		//pm.add(createLICMPass());
+		//pm.add(createLoopInstSimplifyPass());
+		//pm.add(createNewGVNPass());
+		pm.add(createDeadStoreEliminationPass());
+		//pm.add(createSCCPPass());
+		//pm.add(createReassociatePass());
+		//pm.add(createInstructionCombiningPass());
+		//pm.add(createInstructionSimplifierPass());
+		//pm.add(createAggressiveDCEPass());
+		//pm.add(createCFGSimplificationPass());
+		//pm.add(createLintPass()); // Check
 
 		// Translate functions
-		// Start with the lowest bound of the module, function list is sorted
-		for (const auto& mod_func : module_part.get_funcs())
+		for (usz fi = 0, fmax = module_part.funcs.size(); fi < fmax; fi++)
 		{
 			if (Emu.IsStopped())
 			{
@@ -5829,20 +3269,13 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module<lv2_obj>& module
 				return;
 			}
 
-			if (mod_func.size)
+			if (module_part.funcs[fi].size)
 			{
-				num_func++;
-				guest_code_size += mod_func.size;
-				max_addr = std::max<u32>(max_addr, mod_func.addr + mod_func.size);
-				min_addr = std::min<u32>(min_addr, mod_func.addr);
-
 				// Translate
-				if ([[maybe_unused]] const auto func = translator.Translate(mod_func))
+				if (const auto func = translator.Translate(module_part.funcs[fi]))
 				{
-#ifdef ARCH_X64 // TODO
 					// Run optimization passes
-					fpm.run(*func, fam);
-#endif // ARCH_X64
+					pm.run(*func);
 				}
 				else
 				{
@@ -5852,23 +3285,6 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module<lv2_obj>& module
 			}
 		}
 
-		// Run this only in one module for all functions compiled
-		if (module_part.jit_bounds)
-		{
-			if ([[maybe_unused]] const auto func = translator.GetSymbolResolver(module_part))
-			{
-#ifdef ARCH_X64 // TODO
-				// Run optimization passes
-				fpm.run(*func, fam);
-#endif // ARCH_X64
-			}
-			else
-			{
-				Emu.Pause();
-				return;
-			}
-		}
-
 		//legacy::PassManager mpm;
 
 		// Remove unused functions, structs, global variables, etc
@@ -5883,7 +3299,7 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module<lv2_obj>& module
 		if (g_cfg.core.llvm_logs)
 		{
 			out << *_module; // print IR
-			fs::write_file(cache_path + obj_name + ".log", fs::rewrite, out.str());
+			fs::file(cache_path + obj_name + ".log", fs::rewrite).write(out.str());
 			result.clear();
 		}
 
@@ -5891,11 +3307,11 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module<lv2_obj>& module
 		{
 			out.flush();
 			ppu_log.error("LLVM: Verification failed for %s:\n%s", obj_name, result);
-			Emu.CallFromMainThread([]{ Emu.GracefulShutdown(false, true); });
+			Emu.CallAfter([]{ Emu.Stop(); });
 			return;
 		}
 
-		ppu_log.notice("LLVM: %zu functions generated (code_size=0x%x, num_func=%d, max_addr(-)min_addr=0x%x)", _module->getFunctionList().size(), guest_code_size, num_func, max_addr - min_addr);
+		ppu_log.notice("LLVM: %zu functions generated", _module->getFunctionList().size());
 	}
 
 	// Load or compile module
diff --git a/rpcs3/Emu/Cell/PPUThread.h b/rpcs3/Emu/Cell/PPUThread.h
index 322cc13ebe..b5d9d574a8 100644
--- a/rpcs3/Emu/Cell/PPUThread.h
+++ b/rpcs3/Emu/Cell/PPUThread.h
@@ -1,10 +1,8 @@
 #pragma once
 
 #include "../CPU/CPUThread.h"
-#include "../CPU/Hypervisor.h"
 #include "../Memory/vm_ptr.h"
 #include "Utilities/lockless.h"
-#include "Utilities/BitField.h"
 
 #include "util/logs.hpp"
 #include "util/v128.hpp"
@@ -22,8 +20,6 @@ enum class ppu_cmd : u32
 	hle_call, // Execute function by index (arg)
 	ptr_call, // Execute function by pointer
 	opd_call, // Execute function by provided rtoc and address (unlike lle_call, does not read memory)
-	cia_call, // Execute from current CIA, mo GPR modification applied
-	entry_call, // Load addr and rtoc from entry_func
 	initialize, // ppu_initialize()
 	sleep,
 	reset_stack, // resets stack address
@@ -126,14 +122,6 @@ struct cmd64
 	}
 };
 
-enum class ppu_debugger_mode : u32
-{
-	_default,
-	is_decimal,
-
-	max_mode,
-};
-
 class ppu_thread : public cpu_thread
 {
 public:
@@ -142,26 +130,20 @@ public:
 	static const u32 id_count = 100;
 	static constexpr std::pair<u32, u32> id_invl_range = {12, 12};
 
-	virtual void dump_regs(std::string&, std::any& custom_data) const override;
+	virtual std::string dump_regs() const override;
 	virtual std::string dump_callstack() const override;
 	virtual std::vector<std::pair<u32, u32>> dump_callstack_list() const override;
 	virtual std::string dump_misc() const override;
-	virtual void dump_all(std::string&) const override;
+	virtual std::string dump_all() const override;
 	virtual void cpu_task() override final;
 	virtual void cpu_sleep() override;
 	virtual void cpu_on_stop() override;
-	virtual void cpu_wait(bs_t<cpu_flag> old) override;
 	virtual ~ppu_thread() override;
 
-	SAVESTATE_INIT_POS(3);
-
 	ppu_thread(const ppu_thread_params&, std::string_view name, u32 prio, int detached = 0);
-	ppu_thread(utils::serial& ar);
+
 	ppu_thread(const ppu_thread&) = delete;
 	ppu_thread& operator=(const ppu_thread&) = delete;
-	bool savable() const;
-	void serialize_common(utils::serial& ar);
-	void save(utils::serial& ar);
 
 	using cpu_thread::operator=;
 
@@ -198,8 +180,8 @@ public:
 		{
 			for (u8& b : bits)
 			{
-				b = !!(value & (1u << 31));
-				value <<= 1;
+				b = value & 0x1;
+				value >>= 1;
 			}
 		}
 	};
@@ -233,8 +215,6 @@ public:
 	// Fixed-Point Exception Register (abstract representation)
 	struct
 	{
-		ENABLE_BITWISE_SERIALIZATION;
-
 		bool so{}; // Summary Overflow
 		bool ov{}; // Overflow
 		bool ca{}; // Carry
@@ -242,6 +222,27 @@ public:
 	}
 	xer;
 
+	/*
+		Saturation. A sticky status bit indicating that some field in a saturating instruction saturated since the last
+		time SAT was cleared. In other words when SAT = '1' it remains set to '1' until it is cleared to '0' by an
+		mtvscr instruction.
+		1	The vector saturate instruction implicitly sets when saturation has occurred on the results one of
+			the vector instructions having saturate in its name:
+			Move To VSCR (mtvscr)
+			Vector Add Integer with Saturation (vaddubs, vadduhs, vadduws, vaddsbs, vaddshs,
+			vaddsws)
+			Vector Subtract Integer with Saturation (vsububs, vsubuhs, vsubuws, vsubsbs, vsubshs,
+			vsubsws)
+			Vector Multiply-Add Integer with Saturation (vmhaddshs, vmhraddshs)
+			Vector Multiply-Sum with Saturation (vmsumuhs, vmsumshs, vsumsws)
+			Vector Sum-Across with Saturation (vsumsws, vsum2sws, vsum4sbs, vsum4shs,
+			vsum4ubs)
+			Vector Pack with Saturation (vpkuhus, vpkuwus, vpkshus, vpkswus, vpkshss, vpkswss)
+			Vector Convert to Fixed-Point with Saturation (vctuxs, vctsxs)
+		0	Indicates no saturation occurred; mtvscr can explicitly clear this bit.
+	*/
+	bool sat{};
+
 	/*
 		Non-Java. A mode control bit that determines whether vector floating-point operations will be performed
 		in a Java-IEEE-C9X-compliant mode or a possibly faster non-Java/non-IEEE mode.
@@ -254,9 +255,6 @@ public:
 	*/
 	bool nj = true;
 
-	// Sticky saturation bit
-	v128 sat{};
-
 	// Optimization: precomputed java-mode mask for handling denormals
 	u32 jm_mask = 0x7f80'0000;
 
@@ -264,24 +262,12 @@ public:
 	u64 rtime{0};
 	alignas(64) std::byte rdata[128]{}; // Reservation data
 	bool use_full_rdata{};
-	u32 res_cached{0}; // Reservation "cached" addresss
-	u32 res_notify{0};
-	u64 res_notify_time{0};
 
-	union ppu_prio_t
-	{
-		u64 all;
-		bf_t<s64, 0, 13> prio; // Thread priority (0..3071) (firs 12-bits)
-		bf_t<s64, 13, 50> order; // Thread enqueue order (last 52-bits)
-		bf_t<u64, 63, 1> preserve_bit; // Preserve value for savestates
-	};
-
-	atomic_t<ppu_prio_t> prio{};
+	atomic_t<s32> prio{0}; // Thread priority (0..3071)
 	const u32 stack_size; // Stack size
 	const u32 stack_addr; // Stack address
 
 	atomic_t<ppu_join_status> joiner; // Joining thread or status
-	u32 hw_sleep_time = 0; // Very specific delay for hardware threads switching, see lv2_obj::awake_unlocked for more details
 
 	lf_fifo<atomic_t<cmd64>, 127> cmd_queue; // Command queue for asynchronous operations.
 
@@ -294,30 +280,22 @@ public:
 
 	alignas(64) const ppu_func_opd_t entry_func;
 	u64 start_time{0}; // Sleep start timepoint
-	u64 end_time{umax}; // Sleep end timepoint
-	s32 cancel_sleep{0}; // Flag to cancel the next lv2_obj::sleep call (when equals 2)
 	u64 syscall_args[8]{0}; // Last syscall arguments stored
 	const char* current_function{}; // Current function name for diagnosis, optimized for speed.
 	const char* last_function{}; // Sticky copy of current_function, is not cleared on function return
-	const char* current_module{}; // Current module name, for savestates.
-
-	const bool is_interrupt_thread; // True for interrupts-handler threads
 
 	// Thread name
 	atomic_ptr<std::string> ppu_tname;
 
-	// Hypervisor context data
-	rpcs3::hypervisor_context_t hv_ctx; // HV context for gate enter exit. Keep at a low struct offset.
+	u64 saved_native_sp = 0; // Host thread's stack pointer for emulated longjmp
 
 	u64 last_ftsc = 0;
 	u64 last_ftime = 0;
 	u32 last_faddr = 0;
 	u64 last_fail = 0;
 	u64 last_succ = 0;
-	u64 exec_bytes = 0; // Amount of "bytes" executed (4 for each instruction)
 
 	u32 dbg_step_pc = 0;
-	atomic_t<ppu_debugger_mode> debugger_mode{};
 
 	struct call_history_t
 	{
@@ -329,32 +307,6 @@ public:
 
 	static constexpr u32 call_history_max_size = 4096;
 
-	struct syscall_history_t
-	{
-		struct entry_t
-		{
-			u64 cia;
-			const char* func_name;
-			u64 error;
-			std::array<u64, 4> args;
-		};
-
-		std::vector<entry_t> data;
-		u64 index = 0;
-		u32 count_debug_arguments;
-	} syscall_history;
-
-	static constexpr u32 syscall_history_max_size = 2048;
-
-	struct hle_func_call_with_toc_info_t
-	{
-		u32 cia;
-		u64 saved_lr;
-		u64 saved_r2;
-	};
-
-	std::vector<hle_func_call_with_toc_info_t> hle_func_calls_with_toc_info;
-
 	// For named_thread ctor
 	const struct thread_name_t
 	{
@@ -363,19 +315,9 @@ public:
 		operator std::string() const;
 	} thread_name{ this };
 
-	// For savestates
-	bool stop_flag_removal_protection = false; // If set, Emulator::Run won't remove stop flag
-	bool loaded_from_savestate = false; // Indicates the thread had just started straight from savestate load
-	std::shared_ptr<utils::serial> optional_savestate_state;
-	bool interrupt_thread_executing = false;
-
-	ppu_thread* next_cpu{}; // LV2 sleep queues' node link
-	ppu_thread* next_ppu{}; // LV2 PPU running queue's node link
-	bool ack_suspend = false;
-
 	be_t<u64>* get_stack_arg(s32 i, u64 align = alignof(u64));
 	void exec_task();
-	void fast_call(u32 addr, u64 rtoc, bool is_thread_entry = false);
+	void fast_call(u32 addr, u32 rtoc);
 
 	static std::pair<vm::addr_t, u32> stack_push(u32 size, u32 align_v);
 	static void stack_pop_verbose(u32 addr, u32 size) noexcept;
@@ -383,18 +325,17 @@ public:
 
 static_assert(ppu_join_status::max <= ppu_join_status{ppu_thread::id_base});
 
-template <typename T>
+template<typename T, typename = void>
 struct ppu_gpr_cast_impl
 {
 	static_assert(!sizeof(T), "Invalid type for ppu_gpr_cast<>");
 };
 
-template <typename T>
-	requires std::is_integral_v<T> || std::is_enum_v<T>
-struct ppu_gpr_cast_impl<T>
+template<typename T>
+struct ppu_gpr_cast_impl<T, std::enable_if_t<std::is_integral<T>::value || std::is_enum<T>::value>>
 {
 	static_assert(sizeof(T) <= 8, "Too big integral type for ppu_gpr_cast<>()");
-	static_assert(std::is_same_v<std::decay_t<T>, bool> == false, "bool type is deprecated in ppu_gpr_cast<>(), use b8 instead");
+	static_assert(std::is_same<std::decay_t<T>, bool>::value == false, "bool type is deprecated in ppu_gpr_cast<>(), use b8 instead");
 
 	static inline u64 to(const T& value)
 	{
@@ -407,8 +348,8 @@ struct ppu_gpr_cast_impl<T>
 	}
 };
 
-template <>
-struct ppu_gpr_cast_impl<b8>
+template<>
+struct ppu_gpr_cast_impl<b8, void>
 {
 	static inline u64 to(const b8& value)
 	{
@@ -421,8 +362,8 @@ struct ppu_gpr_cast_impl<b8>
 	}
 };
 
-template <typename T, typename AT>
-struct ppu_gpr_cast_impl<vm::_ptr_base<T, AT>>
+template<typename T, typename AT>
+struct ppu_gpr_cast_impl<vm::_ptr_base<T, AT>, void>
 {
 	static inline u64 to(const vm::_ptr_base<T, AT>& value)
 	{
@@ -435,8 +376,8 @@ struct ppu_gpr_cast_impl<vm::_ptr_base<T, AT>>
 	}
 };
 
-template <typename T, typename AT>
-struct ppu_gpr_cast_impl<vm::_ref_base<T, AT>>
+template<typename T, typename AT>
+struct ppu_gpr_cast_impl<vm::_ref_base<T, AT>, void>
 {
 	static inline u64 to(const vm::_ref_base<T, AT>& value)
 	{
@@ -450,7 +391,7 @@ struct ppu_gpr_cast_impl<vm::_ref_base<T, AT>>
 };
 
 template <>
-struct ppu_gpr_cast_impl<vm::null_t>
+struct ppu_gpr_cast_impl<vm::null_t, void>
 {
 	static inline u64 to(const vm::null_t& /*value*/)
 	{
diff --git a/rpcs3/Emu/Cell/PPUTranslator.cpp b/rpcs3/Emu/Cell/PPUTranslator.cpp
index 7380d8123f..87bf22b262 100644
--- a/rpcs3/Emu/Cell/PPUTranslator.cpp
+++ b/rpcs3/Emu/Cell/PPUTranslator.cpp
@@ -1,83 +1,31 @@
 #ifdef LLVM_AVAILABLE
 
 #include "Emu/system_config.h"
-#include "Emu/Cell/Common.h"
-#include "Emu/Cell/lv2/sys_sync.h"
 #include "PPUTranslator.h"
 #include "PPUThread.h"
-#include "SPUThread.h"
+#include "PPUInterpreter.h"
 
 #include "util/types.hpp"
 #include "util/endian.hpp"
 #include "util/logs.hpp"
 #include "util/v128.hpp"
-#include "util/simd.hpp"
+#include "util/v128sse.hpp"
 #include <algorithm>
-#include <unordered_set>
-#include <span>
-
-#ifdef ARCH_ARM64
-#include "Emu/CPU/Backends/AArch64/AArch64JIT.h"
-#include "Emu/IdManager.h"
-#include "Utilities/ppu_patch.h"
-#endif
 
 using namespace llvm;
 
 const ppu_decoder<PPUTranslator> s_ppu_decoder;
-extern const ppu_decoder<ppu_itype> g_ppu_itype;
-extern const ppu_decoder<ppu_iname> g_ppu_iname;
+const ppu_decoder<ppu_itype> s_ppu_itype;
+const ppu_decoder<ppu_iname> s_ppu_iname;
 
-PPUTranslator::PPUTranslator(LLVMContext& context, Module* _module, const ppu_module<lv2_obj>& info, ExecutionEngine& engine)
+PPUTranslator::PPUTranslator(LLVMContext& context, Module* _module, const ppu_module& info, ExecutionEngine& engine)
 	: cpu_translator(_module, false)
 	, m_info(info)
-	, m_pure_attr()
+	, m_pure_attr(AttributeList::get(m_context, AttributeList::FunctionIndex, {Attribute::NoUnwind, Attribute::ReadNone}))
 {
 	// Bind context
 	cpu_translator::initialize(context, engine);
 
-	// Initialize transform passes
-	clear_transforms();
-
-#ifdef ARCH_ARM64
-	{
-		// Base reg table definition
-		// Assume all functions named __0x... are PPU functions and take the m_exec as the first arg
-		std::vector<std::pair<std::string, aarch64::gpr>> base_reg_lookup = {
-			{ "__0x", aarch64::x20 }, // PPU blocks
-			{ "__indirect", aarch64::x20 }, // Indirect jumps
-			{ "ppu_", aarch64::x19 }, // Fixed JIT helpers (e.g ppu_gateway)
-			{ "__", aarch64::x19 }    // Probably link table entries
-		};
-
-		// Build list of imposter functions built by the patch manager.
-		g_fxo->need<ppu_patch_block_registry_t>();
-		std::vector<std::string> faux_functions_list;
-		for (const auto& a : g_fxo->get<ppu_patch_block_registry_t>().block_addresses)
-		{
-			faux_functions_list.push_back(fmt::format("__0x%x", a));
-		}
-
-		aarch64::GHC_frame_preservation_pass::config_t config =
-		{
-			.debug_info = false,         // Set to "true" to insert debug frames on x27
-			.use_stack_frames = false,   // We don't need this since the PPU GW allocates global scratch on the stack
-			.hypervisor_context_offset = ::offset32(&ppu_thread::hv_ctx),
-			.exclusion_callback = {},    // Unused, we don't have special exclusion functions on PPU
-			.base_register_lookup = base_reg_lookup,
-			.faux_function_list = std::move(faux_functions_list)
-		};
-
-		// Create transform pass
-		std::unique_ptr<translator_pass> ghc_fixup_pass = std::make_unique<aarch64::GHC_frame_preservation_pass>(config);
-
-		// Register it
-		register_transform_pass(ghc_fixup_pass);
-	}
-#endif
-
-	reset_transforms();
-
 	// Thread context struct (TODO: safer member access)
 	const u32 off0 = offset32(&ppu_thread::state);
 	const u32 off1 = offset32(&ppu_thread::gpr);
@@ -94,9 +42,8 @@ PPUTranslator::PPUTranslator(LLVMContext& context, Module* _module, const ppu_mo
 	thread_struct.insert(thread_struct.end(), 2, GetType<u32>()); // vrsave, cia
 	thread_struct.insert(thread_struct.end(), 3, GetType<bool>()); // so, ov, ca
 	thread_struct.insert(thread_struct.end(), 1, GetType<u8>()); // cnt
-	thread_struct.insert(thread_struct.end(), 1, GetType<bool>()); // nj
-	thread_struct.emplace_back(ArrayType::get(GetType<char>(), 3)); // Padding
-	thread_struct.insert(thread_struct.end(), 1, GetType<u32[4]>()); // sat
+	thread_struct.insert(thread_struct.end(), 2, GetType<bool>()); // sat, nj
+	thread_struct.emplace_back(ArrayType::get(GetType<char>(), 2)); // Padding
 	thread_struct.insert(thread_struct.end(), 1, GetType<u32>()); // jm_mask
 
 	m_thread_type = StructType::create(m_context, thread_struct, "context_t");
@@ -113,7 +60,7 @@ PPUTranslator::PPUTranslator(LLVMContext& context, Module* _module, const ppu_mo
 	const auto caddr = m_info.segs[0].addr;
 	const auto cend = caddr + m_info.segs[0].size;
 
-	for (const auto& rel : m_info.get_relocs())
+	for (const auto& rel : m_info.relocs)
 	{
 		if (rel.addr >= caddr && rel.addr < cend)
 		{
@@ -161,7 +108,7 @@ PPUTranslator::PPUTranslator(LLVMContext& context, Module* _module, const ppu_mo
 		}
 	}
 
-	if (m_info.is_relocatable)
+	if (!m_info.relocs.empty())
 	{
 		m_reloc = &m_info.segs[0];
 	}
@@ -179,17 +126,9 @@ Type* PPUTranslator::GetContextType()
 	return m_thread_type;
 }
 
-u32 ppu_get_far_jump(u32 pc);
-bool ppu_test_address_may_be_mmio(std::span<const be_t<u32>> insts);
-
 Function* PPUTranslator::Translate(const ppu_function& info)
 {
-	// Instruction address is (m_addr + base)
-	const u64 base = m_reloc ? m_reloc->addr : 0;
-	m_addr = info.addr - base;
-	m_attr = m_info.attr;
-
-	m_function = m_module->getFunction(fmt::format("__0x%x", m_addr));
+	m_function = m_module->getFunction(info.name);
 
 	std::fill(std::begin(m_globals), std::end(m_globals), nullptr);
 	std::fill(std::begin(m_locals), std::end(m_locals), nullptr);
@@ -197,14 +136,18 @@ Function* PPUTranslator::Translate(const ppu_function& info)
 	IRBuilder<> irb(BasicBlock::Create(m_context, "__entry", m_function));
 	m_ir = &irb;
 
+	// Instruction address is (m_addr + base)
+	const u64 base = m_reloc ? m_reloc->addr : 0;
+	m_addr = info.addr - base;
+
 	// Don't emit check in small blocks without terminator
 	bool need_check = info.size >= 16;
 
-	for (u64 addr = m_addr; addr < m_addr + info.size; addr += 4)
+	for (u32 addr = m_addr; addr < m_addr + info.size; addr += 4)
 	{
-		const u32 op = *ensure(m_info.get_ptr<u32>(::narrow<u32>(addr + base)));
+		const u32 op = vm::read32(vm::cast(addr + base));
 
-		switch (g_ppu_itype.decode(op))
+		switch (s_ppu_itype.decode(op))
 		{
 		case ppu_itype::UNK:
 		case ppu_itype::ECIWX:
@@ -229,14 +172,14 @@ Function* PPUTranslator::Translate(const ppu_function& info)
 		}
 	}
 
-	m_thread = m_function->getArg(1);
-	m_base = m_function->getArg(3);
-	m_exec = m_function->getArg(0);
-	m_seg0 = m_function->getArg(2);
+	m_thread = &*(m_function->arg_begin() + 1);
+	m_base = &*(m_function->arg_begin() + 3);
+	m_exec = &*(m_function->arg_begin() + 0);
+	m_seg0 = &*(m_function->arg_begin() + 2);
 
-	m_gpr[0] = m_function->getArg(4);
-	m_gpr[1] = m_function->getArg(5);
-	m_gpr[2] = m_function->getArg(6);
+	m_gpr[0] = &*(m_function->arg_begin() + 4);
+	m_gpr[1] = &*(m_function->arg_begin() + 5);
+	m_gpr[2] = &*(m_function->arg_begin() + 6);
 
 	const auto body = BasicBlock::Create(m_context, "__body", m_function);
 
@@ -244,19 +187,13 @@ Function* PPUTranslator::Translate(const ppu_function& info)
 	if (need_check)
 	{
 		// Check status register in the entry block
-		auto ptr = llvm::dyn_cast<GetElementPtrInst>(m_ir->CreateStructGEP(m_thread_type, m_thread, 1));
-		assert(ptr->getResultElementType() == GetType<u32>());
-		const auto vstate = m_ir->CreateLoad(ptr->getResultElementType(), ptr, true);
+		const auto vstate = m_ir->CreateLoad(m_ir->CreateStructGEP(nullptr, m_thread, 1), true);
 		const auto vcheck = BasicBlock::Create(m_context, "__test", m_function);
 		m_ir->CreateCondBr(m_ir->CreateIsNull(vstate), body, vcheck, m_md_likely);
 
-		m_ir->SetInsertPoint(vcheck);
-
-		// Raise wait flag as soon as possible
-		m_ir->CreateAtomicRMW(llvm::AtomicRMWInst::Or, ptr, m_ir->getInt32((+cpu_flag::wait).operator u32()), llvm::MaybeAlign{4}, llvm::AtomicOrdering::AcquireRelease);
-
 		// Create tail call to the check function
-		Call(GetType<void>(), "__check", m_thread, GetAddr())->setTailCall();
+		m_ir->SetInsertPoint(vcheck);
+		Call(GetType<void>(), "__check", m_thread, GetAddr())->setTailCallKind(llvm::CallInst::TCK_Tail);
 		m_ir->CreateRetVoid();
 	}
 	else
@@ -270,7 +207,7 @@ Function* PPUTranslator::Translate(const ppu_function& info)
 	const auto block = std::make_pair(info.addr, info.size);
 	{
 		// Optimize BLR (prefetch LR)
-		if (*ensure(m_info.get_ptr<u32>(block.first + block.second - 4)) == ppu_instructions::BLR())
+		if (vm::read32(vm::cast(block.first + block.second - 4)) == ppu_instructions::BLR())
 		{
 			RegLoad(m_lr);
 		}
@@ -295,17 +232,13 @@ Function* PPUTranslator::Translate(const ppu_function& info)
 				m_rel = nullptr;
 			}
 
-			// Reset MMIO hint
-			m_may_be_mmio = true;
-
-			const u32 op = *ensure(m_info.get_ptr<u32>(::narrow<u32>(m_addr + base)));
-
+			const u32 op = vm::read32(vm::cast(m_addr + base));
 			(this->*(s_ppu_decoder.decode(op)))({op});
 
 			if (m_rel)
 			{
 				// This is very bad. m_rel is normally set to nullptr after a relocation is handled (so it wasn't)
-				ppu_log.error("LLVM: [0x%x] Unsupported relocation(%u) in '%s' (opcode=0x%x '%s'). Please report.", rel_found->first, m_rel->type, m_info.name, op, g_ppu_iname.decode(op));
+				ppu_log.error("LLVM: [0x%x] Unsupported relocation(%u) in '%s' (opcode=0x%x '%s'). Please report.", rel_found->first, m_rel->type, m_info.name, op, s_ppu_iname.decode(op));
 				return nullptr;
 			}
 		}
@@ -318,126 +251,6 @@ Function* PPUTranslator::Translate(const ppu_function& info)
 		}
 	}
 
-	run_transforms(*m_function);
-	return m_function;
-}
-
-Function* PPUTranslator::GetSymbolResolver(const ppu_module<lv2_obj>& info)
-{
-	ensure(m_module->getFunction("__resolve_symbols") == nullptr);
-	ensure(info.jit_bounds);
-
-	m_function = cast<Function>(m_module->getOrInsertFunction("__resolve_symbols", FunctionType::get(get_type<void>(), { get_type<u8*>(), get_type<u64>() }, false)).getCallee());
-
-	IRBuilder<> irb(BasicBlock::Create(m_context, "__entry", m_function));
-	m_ir = &irb;
-
-	// Instruction address is (m_addr + base)
-	const u64 base = m_reloc ? m_reloc->addr : 0;
-
-	m_exec = m_function->getArg(0);
-	m_seg0 = m_function->getArg(1);
-
-	const auto ftype = FunctionType::get(get_type<void>(), {
-		get_type<u8*>(), // Exec base
-		m_ir->getPtrTy(), // PPU context
-		get_type<u64>(), // Segment address (for PRX)
-		get_type<u8*>(), // Memory base
-		get_type<u64>(), // r0
-		get_type<u64>(), // r1
-		get_type<u64>(), // r2
-		}, false);
-
-	// Store function addresses in PPU jumptable using internal resolving instead of patching it externally.
-	// Because, LLVM processed it extremely slow. (regression)
-	// This is made in loop instead of inlined because it took tremendous amount of time to compile.
-
-	std::vector<u32> vec_addrs;
-
-	// Create an array of function pointers
-	std::vector<llvm::Constant*> functions;
-
-	for (const auto& f : info.get_funcs(false, true))
-	{
-		if (!f.size)
-		{
-			continue;
-		}
-
-		vec_addrs.push_back(static_cast<u32>(f.addr - base));
-		functions.push_back(cast<Function>(m_module->getOrInsertFunction(fmt::format("__0x%x", f.addr - base), ftype).getCallee()));
-	}
-
-	if (vec_addrs.empty())
-	{
-		// Possible special case for no functions (allowing the do-while optimization)
-		m_ir->CreateRetVoid();
-		run_transforms(*m_function);
-		return m_function;
-	}
-
-	const auto addr_array_type = ArrayType::get(get_type<u32>(), vec_addrs.size());
-	const auto addr_array = new GlobalVariable(*m_module, addr_array_type, false, GlobalValue::PrivateLinkage, ConstantDataArray::get(m_context, vec_addrs));
-
-	// Create an array of function pointers
-	const auto func_table_type = ArrayType::get(m_ir->getPtrTy(), functions.size());
-	const auto init_func_table = ConstantArray::get(func_table_type, functions);
-	const auto func_table = new GlobalVariable(*m_module, func_table_type, false, GlobalVariable::PrivateLinkage, init_func_table);
-
-	const auto loop_block = BasicBlock::Create(m_context, "__loop", m_function);
-	const auto after_loop = BasicBlock::Create(m_context, "__after_loop", m_function);
-
-	m_ir->CreateBr(loop_block);
-	m_ir->SetInsertPoint(loop_block);
-
-	const auto init_index_value = m_ir->getInt64(0);
-
-	// Loop body
-	const auto body_block = BasicBlock::Create(m_context, "__body", m_function);
-
-	m_ir->CreateBr(body_block); // As do-while because vec_addrs is known to be more than 0
-	m_ir->SetInsertPoint(body_block);
-
-	const auto index_value = m_ir->CreatePHI(get_type<u64>(), 2);
-	index_value->addIncoming(init_index_value, loop_block);
-
-	auto ptr_inst = dyn_cast<GetElementPtrInst>(m_ir->CreateGEP(addr_array->getValueType(), addr_array, {m_ir->getInt64(0), index_value}));
-	assert(ptr_inst->getResultElementType() == get_type<u32>());
-
-	const auto func_pc = ZExt(m_ir->CreateLoad(ptr_inst->getResultElementType(), ptr_inst), get_type<u64>());
-
-	ptr_inst = dyn_cast<GetElementPtrInst>(m_ir->CreateGEP(func_table->getValueType(), func_table, {m_ir->getInt64(0), index_value}));
-	assert(ptr_inst->getResultElementType() == m_ir->getPtrTy());
-
-	const auto faddr = m_ir->CreateLoad(ptr_inst->getResultElementType(), ptr_inst);
-	const auto faddr_int = m_ir->CreatePtrToInt(faddr, get_type<uptr>());
-	const auto pos_32 = m_reloc ? m_ir->CreateAdd(func_pc, m_seg0) : func_pc;
-	const auto pos = m_ir->CreateShl(pos_32, 1);
-	const auto ptr = dyn_cast<GetElementPtrInst>(m_ir->CreateGEP(get_type<u8>(), m_exec, pos));
-
-	const auto seg_base_ptr = m_ir->CreateIntToPtr(m_ir->CreateAdd(
-		m_ir->CreatePtrToInt(m_exec, get_type<u64>()), m_ir->getInt64(vm::g_exec_addr_seg_offset)), m_exec->getType());
-	const auto seg_pos = m_ir->CreateLShr(pos_32, 1);
-	const auto seg_ptr = dyn_cast<GetElementPtrInst>(m_ir->CreateGEP(get_type<u8>(), seg_base_ptr, seg_pos));
-	const auto seg_val = m_ir->CreateTrunc(m_ir->CreateLShr(m_seg0, 13), get_type<u16>());
-
-	// Store to jumptable
-	m_ir->CreateStore(faddr_int, ptr);
-	m_ir->CreateStore(seg_val, seg_ptr);
-
-	// Increment index and branch back to loop
-	const auto post_add = m_ir->CreateAdd(index_value, m_ir->getInt64(1));
-	index_value->addIncoming(post_add, body_block);
-
-	Value* index_check = m_ir->CreateICmpULT(post_add, m_ir->getInt64(vec_addrs.size()));
-	m_ir->CreateCondBr(index_check, body_block, after_loop);
-
-	// Set insertion point to afterloop_block
-	m_ir->SetInsertPoint(after_loop);
-
-	m_ir->CreateRetVoid();
-
-	run_transforms(*m_function);
 	return m_function;
 }
 
@@ -464,8 +277,8 @@ Value* PPUTranslator::VecHandleDenormal(Value* val)
 
 Value* PPUTranslator::VecHandleResult(Value* val)
 {
-	val = g_cfg.core.ppu_fix_vnan ? VecHandleNan(val) : val;
-	val = g_cfg.core.ppu_llvm_nj_fixup ? VecHandleDenormal(val) : val;
+	val = g_cfg.core.llvm_ppu_accurate_vector_nan ? VecHandleNan(val) : val;
+	val = g_cfg.core.llvm_ppu_jm_handling ? VecHandleDenormal(val) : val;
 	return val;
 }
 
@@ -499,7 +312,7 @@ Type* PPUTranslator::ScaleType(Type* type, s32 pow2)
 
 	ensure(scaled);
 	const auto new_type = m_ir->getIntNTy(scaled);
-	const auto vec_type = dyn_cast<FixedVectorType>(type);
+	const auto vec_type = dyn_cast<VectorType>(type);
 	return vec_type ? VectorType::get(new_type, vec_type->getNumElements(), false) : cast<Type>(new_type);
 }
 
@@ -537,58 +350,10 @@ void PPUTranslator::CallFunction(u64 target, Value* indirect)
 		const u32 cend = caddr + m_info.segs[0].size - 1;
 		const u64 _target = target + base;
 
-		if (_target >= u32{umax})
+		if (_target >= caddr && _target <= cend)
 		{
-			Call(GetType<void>(), "__error", m_thread, GetAddr(), m_ir->getInt32(*ensure(m_info.get_ptr<u32>(::narrow<u32>(m_addr + base)))));
-			m_ir->CreateRetVoid();
-			return;
-		}
-		else if (_target >= caddr && _target <= cend)
-		{
-			u32 target_last = static_cast<u32>(_target);
-
-			std::unordered_set<u32> passed_targets{target_last};
-
-			// Try to follow unconditional branches as long as there is no infinite loop
-			while (target_last != _target)
-			{
-				const ppu_opcode_t op{*ensure(m_info.get_ptr<u32>(target_last))};
-				const ppu_itype::type itype = g_ppu_itype.decode(op.opcode);
-
-				if (((itype == ppu_itype::BC && (op.bo & 0x14) == 0x14) || itype == ppu_itype::B) && !op.lk)
-				{
-					const u32 new_target = (op.aa ? 0 : target_last) + (itype == ppu_itype::B ? +op.bt24 : +op.bt14);
-
-					if (target_last >= caddr && target_last <= cend)
-					{
-						if (passed_targets.emplace(new_target).second)
-						{
-							// Ok
-							target_last = new_target;
-							continue;
-						}
-
-						// Infinite loop detected
-						target_last = static_cast<u32>(_target);
-					}
-
-					// Odd destination
-				}
-				else if (itype == ppu_itype::BCLR && (op.bo & 0x14) == 0x14 && !op.lk)
-				{
-					// Special case: empty function
-					// In this case the branch can be treated as BCLR because previous CIA does not matter
-					indirect = RegLoad(m_lr);
-				}
-
-				break;
-			}
-
-			if (!indirect)
-			{
-				callee = m_module->getOrInsertFunction(fmt::format("__0x%x", target_last - base), type);
-				cast<Function>(callee.getCallee())->setCallingConv(CallingConv::GHC);
-			}
+			callee = m_module->getOrInsertFunction(fmt::format("__0x%x", target), type);
+			cast<Function>(callee.getCallee())->setCallingConv(CallingConv::GHC);
 		}
 		else
 		{
@@ -598,7 +363,7 @@ void PPUTranslator::CallFunction(u64 target, Value* indirect)
 
 	if (indirect)
 	{
-		m_ir->CreateStore(Trunc(indirect, GetType<u32>()), m_ir->CreateStructGEP(m_thread_type, m_thread, static_cast<uint>(&m_cia - m_locals)));
+		m_ir->CreateStore(Trunc(indirect, GetType<u32>()), m_ir->CreateStructGEP(nullptr, m_thread, static_cast<uint>(&m_cia - m_locals)), true);
 
 		// Try to optimize
 		if (auto inst = dyn_cast_or_null<Instruction>(indirect))
@@ -610,17 +375,12 @@ void PPUTranslator::CallFunction(u64 target, Value* indirect)
 		}
 
 		const auto pos = m_ir->CreateShl(indirect, 1);
-		const auto ptr = dyn_cast<GetElementPtrInst>(m_ir->CreateGEP(get_type<u8>(), m_exec, pos));
-		const auto val = m_ir->CreateLoad(get_type<u64>(), ptr);
-		callee = FunctionCallee(type, m_ir->CreateIntToPtr(val, m_ir->getPtrTy()));
+		const auto ptr = m_ir->CreateGEP(m_exec, pos);
+		const auto val = m_ir->CreateLoad(m_ir->CreateBitCast(ptr, get_type<u64*>()));
+		callee = FunctionCallee(type, m_ir->CreateIntToPtr(m_ir->CreateAnd(val, 0x7fff'ffff'ffff), type->getPointerTo()));
 
 		// Load new segment address
-		const auto seg_base_ptr = m_ir->CreateIntToPtr(m_ir->CreateAdd(
-			m_ir->CreatePtrToInt(m_exec, get_type<u64>()), m_ir->getInt64(vm::g_exec_addr_seg_offset)), m_exec->getType());
-		const auto seg_pos = m_ir->CreateLShr(indirect, 1);
-		const auto seg_ptr = dyn_cast<GetElementPtrInst>(m_ir->CreateGEP(get_type<u8>(), seg_base_ptr, seg_pos));
-		const auto seg_val = m_ir->CreateZExt(m_ir->CreateLoad(get_type<u16>(), seg_ptr), get_type<u64>());
-		seg0 = m_ir->CreateShl(seg_val, 13);
+		seg0 = m_ir->CreateShl(m_ir->CreateLShr(val, 47), 12);
 	}
 
 	m_ir->SetInsertPoint(block);
@@ -640,7 +400,7 @@ Value* PPUTranslator::RegInit(Value*& local)
 	}
 
 	// (Re)Initialize global, will be written in FlushRegisters
-	m_globals[index] = m_ir->CreateStructGEP(m_thread_type, m_thread, index);
+	m_globals[index] = m_ir->CreateStructGEP(nullptr, m_thread, index);
 
 	return m_globals[index];
 }
@@ -656,8 +416,7 @@ Value* PPUTranslator::RegLoad(Value*& local)
 	}
 
 	// Load from the global value
-	auto ptr = llvm::dyn_cast<llvm::GetElementPtrInst>(m_ir->CreateStructGEP(m_thread_type, m_thread, index));
-	local = m_ir->CreateLoad(ptr->getResultElementType(), ptr);
+	local = m_ir->CreateLoad(m_ir->CreateStructGEP(nullptr, m_thread, index));
 	return local;
 }
 
@@ -687,7 +446,7 @@ void PPUTranslator::FlushRegisters()
 				m_ir->SetInsertPoint(block);
 			}
 
-			m_ir->CreateStore(local, m_globals[index]);
+			m_ir->CreateStore(local, bitcast(m_globals[index], local->getType()->getPointerTo()));
 			m_globals[index] = nullptr;
 		}
 	}
@@ -745,12 +504,57 @@ Value* PPUTranslator::Broadcast(Value* value, u32 count)
 {
 	if (const auto cv = dyn_cast<Constant>(value))
 	{
-		return ConstantVector::getSplat(llvm::ElementCount::get(count, false), cv);
+		return ConstantVector::getSplat({count, false}, cv);
 	}
 
 	return m_ir->CreateVectorSplat(count, value);
 }
 
+std::pair<Value*, Value*> PPUTranslator::Saturate(Value* value, CmpInst::Predicate inst, Value* extreme)
+{
+	// Modify args
+	if (auto v = dyn_cast<VectorType>(value->getType()); v && !extreme->getType()->isVectorTy())
+		extreme = Broadcast(extreme, v->getNumElements());
+	if (auto e = dyn_cast<VectorType>(extreme->getType()); e && !value->getType()->isVectorTy())
+		value = Broadcast(value, e->getNumElements());
+
+	// Compare args
+	const auto cmp = m_ir->CreateICmp(inst, value, extreme);
+
+	// Return saturated result and saturation bitmask
+	return{m_ir->CreateSelect(cmp, extreme, value), cmp};
+}
+
+std::pair<Value*, Value*> PPUTranslator::SaturateSigned(Value* value, u64 min, u64 max)
+{
+	const auto type = value->getType()->getScalarType();
+	const auto sat_l = Saturate(value, ICmpInst::ICMP_SLT, ConstantInt::get(type, min, true));
+	const auto sat_h = Saturate(sat_l.first, ICmpInst::ICMP_SGT, ConstantInt::get(type, max, true));
+
+	// Return saturated result and saturation bitmask
+	return{sat_h.first, m_ir->CreateOr(sat_l.second, sat_h.second)};
+}
+
+Value* PPUTranslator::Scale(Value* value, s32 scale)
+{
+	if (scale)
+	{
+		const auto type = value->getType();
+		const auto power = std::pow(2, scale);
+
+		if (auto v = dyn_cast<VectorType>(type))
+		{
+			return m_ir->CreateFMul(value, ConstantVector::getSplat({v->getNumElements(), false}, ConstantFP::get(v->getElementType(), power)));
+		}
+		else
+		{
+			return m_ir->CreateFMul(value, ConstantFP::get(type, power));
+		}
+	}
+
+	return value;
+}
+
 Value* PPUTranslator::Shuffle(Value* left, Value* right, std::initializer_list<u32> indices)
 {
 	const auto type = left->getType();
@@ -764,12 +568,12 @@ Value* PPUTranslator::Shuffle(Value* left, Value* right, std::initializer_list<u
 	{
 		std::vector<u32> data; data.reserve(indices.size());
 
-		const u32 mask = cast<FixedVectorType>(type)->getNumElements() - 1;
+		const u32 mask = cast<VectorType>(type)->getNumElements() - 1;
 
 		// Transform indices (works for vectors with size 2^N)
 		for (usz i = 0; i < indices.size(); i++)
 		{
-			data.push_back(*(indices.begin() + indices.size() - 1 - i) ^ mask);
+			data.push_back(indices.end()[~i] ^ mask);
 		}
 
 		return m_ir->CreateShuffleVector(left, right, ConstantDataVector::get(m_context, data));
@@ -822,95 +626,25 @@ void PPUTranslator::UseCondition(MDNode* hint, Value* cond)
 	}
 }
 
-llvm::Value* PPUTranslator::GetMemory(llvm::Value* addr)
+llvm::Value* PPUTranslator::GetMemory(llvm::Value* addr, llvm::Type* type)
 {
-	return m_ir->CreateGEP(get_type<u8>(), m_base, addr);
-}
-
-void PPUTranslator::TestAborted()
-{
-	const auto body = BasicBlock::Create(m_context, fmt::format("__body_0x%x_%s", m_cia, m_ir->GetInsertBlock()->getName().str()), m_function);
-
-	// Check status register in the entry block
-	auto ptr = llvm::dyn_cast<GetElementPtrInst>(m_ir->CreateStructGEP(m_thread_type, m_thread, 1));
-	assert(ptr->getResultElementType() == GetType<u32>());
-	const auto vstate = m_ir->CreateLoad(ptr->getResultElementType(), ptr, true);
-	const auto vcheck = BasicBlock::Create(m_context, fmt::format("__test_0x%x_%s", m_cia, m_ir->GetInsertBlock()->getName().str()), m_function);
-	m_ir->CreateCondBr(m_ir->CreateIsNull(m_ir->CreateAnd(vstate, static_cast<u32>(cpu_flag::again + cpu_flag::exit))), body, vcheck, m_md_likely);
-
-	m_ir->SetInsertPoint(vcheck);
-
-	// Create tail call to the check function
-	Call(GetType<void>(), "__check", m_thread, GetAddr())->setTailCall();
-	m_ir->CreateRetVoid();
-	m_ir->SetInsertPoint(body);
+	return bitcast(m_ir->CreateGEP(m_base, addr), type->getPointerTo());
 }
 
 Value* PPUTranslator::ReadMemory(Value* addr, Type* type, bool is_be, u32 align)
 {
 	const u32 size = ::narrow<u32>(+type->getPrimitiveSizeInBits());
 
-	if (m_may_be_mmio && size == 32)
-	{
-		// Test for MMIO patterns
-		struct instructions_to_test
-		{
-			be_t<u32> insts[128];
-		};
-
-		m_may_be_mmio = false;
-
-		if (auto ptr = m_info.get_ptr<instructions_to_test>(std::max<u32>(m_info.segs[0].addr, (m_reloc ? m_reloc->addr : 0) + utils::sub_saturate<u32>(::narrow<u32>(m_addr), sizeof(instructions_to_test) / 2))))
-		{
-			if (ppu_test_address_may_be_mmio(std::span(ptr->insts)))
-			{
-				m_may_be_mmio = true;
-			}
-		}
-	}
-
 	if (is_be ^ m_is_be && size > 8)
 	{
-		llvm::Value* value{};
-
 		// Read, byteswap, bitcast
 		const auto int_type = m_ir->getIntNTy(size);
-
-		if (m_may_be_mmio && size == 32)
-		{
-			FlushRegisters();
-			RegStore(Trunc(GetAddr()), m_cia);
-
-			ppu_log.notice("LLVM: Detected potential MMIO32 read at [0x%08x]", m_addr + (m_reloc ? m_reloc->addr : 0));
-			value = Call(GetType<u32>(), "__read_maybe_mmio32", m_base, addr);
-
-			TestAborted();
-		}
-		else
-		{
-			const auto inst = m_ir->CreateAlignedLoad(int_type, GetMemory(addr), llvm::MaybeAlign{align});
-			inst->setVolatile(true);
-			value = inst;
-		}
-
+		const auto value = m_ir->CreateAlignedLoad(GetMemory(addr, int_type), llvm::MaybeAlign{align}, true);
 		return bitcast(Call(int_type, fmt::format("llvm.bswap.i%u", size), value), type);
 	}
 
-	if (m_may_be_mmio && size == 32)
-	{
-		FlushRegisters();
-		RegStore(Trunc(GetAddr()), m_cia);
-
-		ppu_log.notice("LLVM: Detected potential MMIO32 read at [0x%08x]", m_addr + (m_reloc ? m_reloc->addr : 0));
-		Value* r = Call(GetType<u32>(), "__read_maybe_mmio32", m_base, addr);
-		TestAborted();
-		return r;
-	}
-
 	// Read normally
-	const auto r = m_ir->CreateAlignedLoad(type, GetMemory(addr), llvm::MaybeAlign{align});
-	r->setVolatile(true);
-	return r;
+	return m_ir->CreateAlignedLoad(GetMemory(addr, type), llvm::MaybeAlign{align}, true);
 }
 
 void PPUTranslator::WriteMemory(Value* addr, Value* value, bool is_be, u32 align)
@@ -925,31 +659,8 @@ void PPUTranslator::WriteMemory(Value* addr, Value* value, bool is_be, u32 align
 		value = Call(int_type, fmt::format("llvm.bswap.i%u", size), bitcast(value, int_type));
 	}
 
-	if (m_may_be_mmio && size == 32)
-	{
-		// Test for MMIO patterns
-		struct instructions_to_test
-		{
-			be_t<u32> insts[128];
-		};
-
-		if (auto ptr = m_info.get_ptr<instructions_to_test>(std::max<u32>(m_info.segs[0].addr, (m_reloc ? m_reloc->addr : 0) + utils::sub_saturate<u32>(::narrow<u32>(m_addr), sizeof(instructions_to_test) / 2))))
-		{
-			if (ppu_test_address_may_be_mmio(std::span(ptr->insts)))
-			{
-				FlushRegisters();
-				RegStore(Trunc(GetAddr()), m_cia);
-
-				ppu_log.notice("LLVM: Detected potential MMIO32 write at [0x%08x]", m_addr + (m_reloc ? m_reloc->addr : 0));
-				Call(GetType<void>(), "__write_maybe_mmio32", m_base, addr, value);
-				TestAborted();
-				return;
-			}
-		}
-	}
-
 	// Write
-	m_ir->CreateAlignedStore(value, GetMemory(addr), llvm::MaybeAlign{align})->setVolatile(true);
+	m_ir->CreateAlignedStore(value, GetMemory(addr, value->getType()), llvm::MaybeAlign{align}, true);
 }
 
 void PPUTranslator::CompilationError(const std::string& error)
@@ -960,8 +671,7 @@ void PPUTranslator::CompilationError(const std::string& error)
 
 void PPUTranslator::MFVSCR(ppu_opcode_t op)
 {
-	const auto vsat = g_cfg.core.ppu_set_sat_bit ? ZExt(IsNotZero(RegLoad(m_sat)), GetType<u32>()) : m_ir->getInt32(0);
-	const auto vscr = m_ir->CreateOr(vsat, m_ir->CreateShl(ZExt(RegLoad(m_nj), GetType<u32>()), 16));
+	const auto vscr = m_ir->CreateOr(ZExt(RegLoad(m_sat), GetType<u32>()), m_ir->CreateShl(ZExt(RegLoad(m_nj), GetType<u32>()), 16));
 	SetVr(op.vd, m_ir->CreateInsertElement(ConstantAggregateZero::get(GetType<u32[4]>()), vscr, m_ir->getInt32(m_is_be ? 3 : 0)));
 }
 
@@ -970,296 +680,314 @@ void PPUTranslator::MTVSCR(ppu_opcode_t op)
 	const auto vscr = m_ir->CreateExtractElement(GetVr(op.vb, VrType::vi32), m_ir->getInt32(m_is_be ? 3 : 0));
 	const auto nj = Trunc(m_ir->CreateLShr(vscr, 16), GetType<bool>());
 	RegStore(nj, m_nj);
-	if (g_cfg.core.ppu_llvm_nj_fixup)
-		RegStore(m_ir->CreateSelect(nj, m_ir->getInt32(0x7f80'0000), m_ir->getInt32(0x7fff'ffff)), m_jm_mask);
-	if (g_cfg.core.ppu_set_sat_bit)
-		RegStore(m_ir->CreateInsertElement(ConstantAggregateZero::get(GetType<u32[4]>()), m_ir->CreateAnd(vscr, 1), m_ir->getInt32(0)), m_sat);
+	if (g_cfg.core.llvm_ppu_jm_handling) RegStore(m_ir->CreateSelect(nj, m_ir->getInt32(0x7f80'0000), m_ir->getInt32(0x7fff'ffff)), m_jm_mask);
+	RegStore(Trunc(vscr, GetType<bool>()), m_sat);
 }
 
 void PPUTranslator::VADDCUW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
+	const auto a = get_vr<u32[4]>(op.va);
+	const auto b = get_vr<u32[4]>(op.vb);
 	set_vr(op.vd, zext<u32[4]>(a + b < a));
 }
 
 void PPUTranslator::VADDFP(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<f32[4]>(op.va, op.vb);
+	const auto a = get_vr<f32[4]>(op.va);
+	const auto b = get_vr<f32[4]>(op.vb);
+
 	set_vr(op.vd, vec_handle_result(a + b));
 }
 
 void PPUTranslator::VADDSBS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s8[16]>(op.va, op.vb);
+	const auto a = get_vr<s8[16]>(op.va);
+	const auto b = get_vr<s8[16]>(op.vb);
 	const auto r = add_sat(a, b);
 	set_vr(op.vd, r);
-	set_sat(r ^ (a + b));
+	SetSat(IsNotZero(eval(r != (a + b)).value));
 }
 
 void PPUTranslator::VADDSHS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s16[8]>(op.va, op.vb);
+	const auto a = get_vr<s16[8]>(op.va);
+	const auto b = get_vr<s16[8]>(op.vb);
 	const auto r = add_sat(a, b);
 	set_vr(op.vd, r);
-	set_sat(r ^ (a + b));
+	SetSat(IsNotZero(eval(r != (a + b)).value));
 }
 
 void PPUTranslator::VADDSWS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s32[4]>(op.va, op.vb);
+	const auto a = get_vr<s32[4]>(op.va);
+	const auto b = get_vr<s32[4]>(op.vb);
 	const auto r = add_sat(a, b);
 	set_vr(op.vd, r);
-	set_sat(r ^ (a + b));
+	SetSat(IsNotZero(eval(r != (a + b)).value));
 }
 
 void PPUTranslator::VADDUBM(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
-	set_vr(op.vd, a + b);
+	const auto a = get_vr<u8[16]>(op.va);
+	const auto b = get_vr<u8[16]>(op.vb);
+	set_vr(op.vd, eval(a + b));
 }
 
 void PPUTranslator::VADDUBS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
+	const auto a = get_vr<u8[16]>(op.va);
+	const auto b = get_vr<u8[16]>(op.vb);
 	const auto r = add_sat(a, b);
 	set_vr(op.vd, r);
-	set_sat(r ^ (a + b));
+	SetSat(IsNotZero(eval(r != (a + b)).value));
 }
 
 void PPUTranslator::VADDUHM(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	set_vr(op.vd, a + b);
+	const auto a = get_vr<u16[8]>(op.va);
+	const auto b = get_vr<u16[8]>(op.vb);
+	set_vr(op.vd, eval(a + b));
 }
 
 void PPUTranslator::VADDUHS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
+	const auto a = get_vr<u16[8]>(op.va);
+	const auto b = get_vr<u16[8]>(op.vb);
 	const auto r = add_sat(a, b);
 	set_vr(op.vd, r);
-	set_sat(r ^ (a + b));
+	SetSat(IsNotZero(eval(r != (a + b)).value));
 }
 
 void PPUTranslator::VADDUWM(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, a + b);
+	const auto a = get_vr<u32[4]>(op.va);
+	const auto b = get_vr<u32[4]>(op.vb);
+	set_vr(op.vd, eval(a + b));
 }
 
 void PPUTranslator::VADDUWS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
+	const auto a = get_vr<u32[4]>(op.va);
+	const auto b = get_vr<u32[4]>(op.vb);
 	const auto r = add_sat(a, b);
 	set_vr(op.vd, r);
-	set_sat(r ^ (a + b));
+	SetSat(IsNotZero(eval(r != (a + b)).value));
 }
 
 void PPUTranslator::VAND(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, a & b);
+	const auto a = get_vr<u32[4]>(op.va);
+	const auto b = get_vr<u32[4]>(op.vb);
+	set_vr(op.vd, eval(a & b));
 }
 
 void PPUTranslator::VANDC(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, a & ~b);
+	const auto a = get_vr<u32[4]>(op.va);
+	const auto b = get_vr<u32[4]>(op.vb);
+	set_vr(op.vd, eval(a & ~b));
 }
 
 void PPUTranslator::VAVGSB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s8[16]>(op.va, op.vb);
-	set_vr(op.vd, avg(a, b));
+	const auto a = get_vr<s8[16]>(op.va);
+	const auto b = get_vr<s8[16]>(op.vb);
+	set_vr(op.vd, eval(avg(a, b)));
 }
 
 void PPUTranslator::VAVGSH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s16[8]>(op.va, op.vb);
-	set_vr(op.vd, avg(a, b));
+	const auto a = get_vr<s16[8]>(op.va);
+	const auto b = get_vr<s16[8]>(op.vb);
+	set_vr(op.vd, eval(avg(a, b)));
 }
 
 void PPUTranslator::VAVGSW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s32[4]>(op.va, op.vb);
-	set_vr(op.vd, avg(a, b));
+	const auto a = get_vr<s32[4]>(op.va);
+	const auto b = get_vr<s32[4]>(op.vb);
+	set_vr(op.vd, eval(avg(a, b)));
 }
 
 void PPUTranslator::VAVGUB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
-	set_vr(op.vd, avg(a, b));
+	const auto a = get_vr<u8[16]>(op.va);
+	const auto b = get_vr<u8[16]>(op.vb);
+	set_vr(op.vd, eval(avg(a, b)));
 }
 
 void PPUTranslator::VAVGUH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	set_vr(op.vd, avg(a, b));
+	const auto a = get_vr<u16[8]>(op.va);
+	const auto b = get_vr<u16[8]>(op.vb);
+	set_vr(op.vd, eval(avg(a, b)));
 }
 
 void PPUTranslator::VAVGUW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, avg(a, b));
+	const auto a = get_vr<u32[4]>(op.va);
+	const auto b = get_vr<u32[4]>(op.vb);
+	set_vr(op.vd, eval(avg(a, b)));
 }
 
 void PPUTranslator::VCFSX(ppu_opcode_t op)
 {
-	const auto b = get_vr<s32[4]>(op.vb);
-	set_vr(op.vd, fpcast<f32[4]>(b) * fsplat<f32[4]>(std::pow(2, -static_cast<int>(op.vuimm))));
+	const auto b = GetVr(op.vb, VrType::vi32);
+	SetVr(op.vd, Scale(m_ir->CreateSIToFP(b, GetType<f32[4]>()), 0 - op.vuimm));
 }
 
 void PPUTranslator::VCFUX(ppu_opcode_t op)
 {
-	const auto b = get_vr<u32[4]>(op.vb);
-	set_vr(op.vd, fpcast<f32[4]>(b) * fsplat<f32[4]>(std::pow(2, -static_cast<int>(op.vuimm))));
+	const auto b = GetVr(op.vb, VrType::vi32);
+	SetVr(op.vd, Scale(m_ir->CreateUIToFP(b, GetType<f32[4]>()), 0 - op.vuimm));
 }
 
 void PPUTranslator::VCMPBFP(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<f32[4]>(op.va, op.vb);
-	const auto nle = sext<s32[4]>(fcmp_uno(a > b)) & 0x8000'0000;
-	const auto nge = sext<s32[4]>(fcmp_uno(a < -b)) & 0x4000'0000;
-	const auto r = eval(nle | nge);
-	set_vr(op.vd, r);
-	if (op.oe) SetCrField(6, m_ir->getFalse(), m_ir->getFalse(), IsZero(r.value), m_ir->getFalse());
+	const auto ab = GetVrs(VrType::vf, op.va, op.vb);
+	const auto nle = m_ir->CreateFCmpUGT(ab[0], ab[1]);
+	const auto nge = m_ir->CreateFCmpULT(ab[0], m_ir->CreateFNeg(ab[1]));
+	const auto le_bit = m_ir->CreateShl(ZExt(nle, GetType<u32[4]>()), 31);
+	const auto ge_bit = m_ir->CreateShl(ZExt(nge, GetType<u32[4]>()), 30);
+	const auto result = m_ir->CreateOr(le_bit, ge_bit);
+	SetVr(op.vd, result);
+	if (op.oe) SetCrField(6, m_ir->getFalse(), m_ir->getFalse(), IsZero(result), m_ir->getFalse());
 }
 
 void PPUTranslator::VCMPEQFP(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<f32[4]>(op.va, op.vb);
-	const auto r = eval(sext<s32[4]>(fcmp_ord(a == b)));
-	set_vr(op.vd, r);
-	if (op.oe) SetCrField(6, IsOnes(r.value), m_ir->getFalse(), IsZero(r.value), m_ir->getFalse());
+	const auto ab = GetVrs(VrType::vf, op.va, op.vb);
+	const auto result = m_ir->CreateFCmpOEQ(ab[0], ab[1]);
+	SetVr(op.vd, result);
+	if (op.oe) SetCrField(6, IsOnes(result), m_ir->getFalse(), IsZero(result), m_ir->getFalse());
 }
 
 void PPUTranslator::VCMPEQUB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
-	const auto r = eval(sext<s8[16]>(a == b));
-	set_vr(op.vd, r);
-	if (op.oe) SetCrField(6, IsOnes(r.value), m_ir->getFalse(), IsZero(r.value), m_ir->getFalse());
+	const auto ab = GetVrs(VrType::vi8, op.va, op.vb);
+	const auto result = m_ir->CreateICmpEQ(ab[0], ab[1]);
+	SetVr(op.vd, result);
+	if (op.oe) SetCrField(6, IsOnes(result), m_ir->getFalse(), IsZero(result), m_ir->getFalse());
 }
 
 void PPUTranslator::VCMPEQUH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	const auto r = eval(sext<s16[8]>(a == b));
-	set_vr(op.vd, r);
-	if (op.oe) SetCrField(6, IsOnes(r.value), m_ir->getFalse(), IsZero(r.value), m_ir->getFalse());
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	const auto result = m_ir->CreateICmpEQ(ab[0], ab[1]);
+	SetVr(op.vd, result);
+	if (op.oe) SetCrField(6, IsOnes(result), m_ir->getFalse(), IsZero(result), m_ir->getFalse());
 }
 
 void PPUTranslator::VCMPEQUW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	const auto r = eval(sext<s32[4]>(a == b));
-	set_vr(op.vd, r);
-	if (op.oe) SetCrField(6, IsOnes(r.value), m_ir->getFalse(), IsZero(r.value), m_ir->getFalse());
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	const auto result = m_ir->CreateICmpEQ(ab[0], ab[1]);
+	SetVr(op.vd, result);
+	if (op.oe) SetCrField(6, IsOnes(result), m_ir->getFalse(), IsZero(result), m_ir->getFalse());
 }
 
 void PPUTranslator::VCMPGEFP(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<f32[4]>(op.va, op.vb);
-	const auto r = eval(sext<s32[4]>(fcmp_ord(a >= b)));
-	set_vr(op.vd, r);
-	if (op.oe) SetCrField(6, IsOnes(r.value), m_ir->getFalse(), IsZero(r.value), m_ir->getFalse());
+	const auto ab = GetVrs(VrType::vf, op.va, op.vb);
+	const auto result = m_ir->CreateFCmpOGE(ab[0], ab[1]);
+	SetVr(op.vd, result);
+	if (op.oe) SetCrField(6, IsOnes(result), m_ir->getFalse(), IsZero(result), m_ir->getFalse());
 }
 
 void PPUTranslator::VCMPGTFP(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<f32[4]>(op.va, op.vb);
-	const auto r = eval(sext<s32[4]>(fcmp_ord(a > b)));
-	set_vr(op.vd, r);
-	if (op.oe) SetCrField(6, IsOnes(r.value), m_ir->getFalse(), IsZero(r.value), m_ir->getFalse());
+	const auto ab = GetVrs(VrType::vf, op.va, op.vb);
+	const auto result = m_ir->CreateFCmpOGT(ab[0], ab[1]);
+	SetVr(op.vd, result);
+	if (op.oe) SetCrField(6, IsOnes(result), m_ir->getFalse(), IsZero(result), m_ir->getFalse());
 }
 
 void PPUTranslator::VCMPGTSB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s8[16]>(op.va, op.vb);
-	const auto r = eval(sext<s8[16]>(a > b));
-	set_vr(op.vd, r);
-	if (op.oe) SetCrField(6, IsOnes(r.value), m_ir->getFalse(), IsZero(r.value), m_ir->getFalse());
+	const auto ab = GetVrs(VrType::vi8, op.va, op.vb);
+	const auto result = m_ir->CreateICmpSGT(ab[0], ab[1]);
+	SetVr(op.vd, result);
+	if (op.oe) SetCrField(6, IsOnes(result), m_ir->getFalse(), IsZero(result), m_ir->getFalse());
 }
 
 void PPUTranslator::VCMPGTSH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s16[8]>(op.va, op.vb);
-	const auto r = eval(sext<s16[8]>(a > b));
-	set_vr(op.vd, r);
-	if (op.oe) SetCrField(6, IsOnes(r.value), m_ir->getFalse(), IsZero(r.value), m_ir->getFalse());
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	const auto result = m_ir->CreateICmpSGT(ab[0], ab[1]);
+	SetVr(op.vd, result);
+	if (op.oe) SetCrField(6, IsOnes(result), m_ir->getFalse(), IsZero(result), m_ir->getFalse());
 }
 
 void PPUTranslator::VCMPGTSW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s32[4]>(op.va, op.vb);
-	const auto r = eval(sext<s32[4]>(a > b));
-	set_vr(op.vd, r);
-	if (op.oe) SetCrField(6, IsOnes(r.value), m_ir->getFalse(), IsZero(r.value), m_ir->getFalse());
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	const auto result = m_ir->CreateICmpSGT(ab[0], ab[1]);
+	SetVr(op.vd, result);
+	if (op.oe) SetCrField(6, IsOnes(result), m_ir->getFalse(), IsZero(result), m_ir->getFalse());
 }
 
 void PPUTranslator::VCMPGTUB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
-	const auto r = eval(sext<s8[16]>(a > b));
-	set_vr(op.vd, r);
-	if (op.oe) SetCrField(6, IsOnes(r.value), m_ir->getFalse(), IsZero(r.value), m_ir->getFalse());
+	const auto ab = GetVrs(VrType::vi8, op.va, op.vb);
+	const auto result = m_ir->CreateICmpUGT(ab[0], ab[1]);
+	SetVr(op.vd, result);
+	if (op.oe) SetCrField(6, IsOnes(result), m_ir->getFalse(), IsZero(result), m_ir->getFalse());
 }
 
 void PPUTranslator::VCMPGTUH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	const auto r = eval(sext<s16[8]>(a > b));
-	set_vr(op.vd, r);
-	if (op.oe) SetCrField(6, IsOnes(r.value), m_ir->getFalse(), IsZero(r.value), m_ir->getFalse());
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	const auto result = m_ir->CreateICmpUGT(ab[0], ab[1]);
+	SetVr(op.vd, result);
+	if (op.oe) SetCrField(6, IsOnes(result), m_ir->getFalse(), IsZero(result), m_ir->getFalse());
 }
 
 void PPUTranslator::VCMPGTUW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	const auto r = eval(sext<s32[4]>(a > b));
-	set_vr(op.vd, r);
-	if (op.oe) SetCrField(6, IsOnes(r.value), m_ir->getFalse(), IsZero(r.value), m_ir->getFalse());
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	const auto result = m_ir->CreateICmpUGT(ab[0], ab[1]);
+	SetVr(op.vd, result);
+	if (op.oe) SetCrField(6, IsOnes(result), m_ir->getFalse(), IsZero(result), m_ir->getFalse());
 }
 
+// TODO: remove this (wrong casts)
+#define FP_SAT_OP(fcmp, value) m_ir->CreateSelect(fcmp, cast<Constant>(cast<FCmpInst>(fcmp)->getOperand(1)), value)
+
 void PPUTranslator::VCTSXS(ppu_opcode_t op)
 {
-	const auto b = get_vr<f32[4]>(op.vb);
-	const auto scaled = b * fsplat<f32[4]>(std::pow(2, 0 + op.vuimm));
-	const auto const1 = fsplat<f32[4]>(-std::pow(2, 31));
-	const auto is_nan = fcmp_uno(b != b);
-	const auto sat_l = fcmp_ord(scaled < const1);
-	const auto sat_h = fcmp_ord(scaled >= fsplat<f32[4]>(std::pow(2, 31)));
-	value_t<s32[4]> converted = eval(fpcast<s32[4]>(select(sat_l, const1, scaled)));
-	if (g_cfg.core.ppu_fix_vnan)
-		converted = eval(select(is_nan, splat<s32[4]>(0), converted));  // NaN -> 0
-	set_vr(op.vd, select(sat_h, splat<s32[4]>(0x7fff'ffff), converted));
-	set_sat(sext<s32[4]>(sat_l) | sext<s32[4]>(sat_h));
+	const auto b = GetVr(op.vb, VrType::vf);
+	const auto scaled = Scale(b, op.vuimm);
+	//const auto const0 = ConstantVector::getSplat(4, ConstantFP::get(GetType<f32>(), 0.0));
+	const auto const1 = ConstantVector::getSplat({4, false}, ConstantFP::get(GetType<f32>(), -std::pow(2, 31)));
+	//const auto is_nan = m_ir->CreateFCmpUNO(b, const0); // NaN -> 0.0
+	const auto sat_l = m_ir->CreateFCmpOLT(scaled, const1); // TODO ???
+	const auto sat_h = m_ir->CreateFCmpOGE(scaled, ConstantVector::getSplat({4, false}, ConstantFP::get(GetType<f32>(), std::pow(2, 31))));
+	const auto converted = m_ir->CreateFPToSI(m_ir->CreateSelect(sat_l, const1, scaled), GetType<s32[4]>());
+	SetVr(op.vd, m_ir->CreateSelect(sat_h, ConstantVector::getSplat({4, false}, m_ir->getInt32(0x7fffffff)), converted));
+	SetSat(IsNotZero(m_ir->CreateOr(sat_l, sat_h)));
 }
 
 void PPUTranslator::VCTUXS(ppu_opcode_t op)
 {
-	const auto b = get_vr<f32[4]>(op.vb);
-	const auto scaled = b * fsplat<f32[4]>(std::pow(2, 0 + op.vuimm));
-	const auto const0 = fsplat<f32[4]>(0.);
-	const auto is_nan = fcmp_uno(b != b);
-	const auto sat_l = fcmp_ord(scaled < const0);
-	const auto sat_h = fcmp_ord(scaled >= fsplat<f32[4]>(std::pow(2, 32)));
-	value_t<u32[4]> converted = eval(fpcast<u32[4]>(select(sat_l, const0, scaled)));
-	if (g_cfg.core.ppu_fix_vnan)
-		converted = eval(select(is_nan, splat<u32[4]>(0), converted)); // NaN -> 0
-	set_vr(op.vd, select(sat_h, splat<u32[4]>(0xffff'ffff), converted));
-	set_sat(sext<s32[4]>(sat_l) | sext<s32[4]>(sat_h));
+	const auto b = GetVr(op.vb, VrType::vf);
+	const auto scaled = Scale(b, op.vuimm);
+	const auto const0 = ConstantVector::getSplat({4, false}, ConstantFP::get(GetType<f32>(), 0.0));
+	//const auto is_nan = m_ir->CreateFCmpUNO(b, const0); // NaN -> 0.0
+	const auto sat_l = m_ir->CreateFCmpOLT(scaled, const0);
+	const auto sat_h = m_ir->CreateFCmpOGE(scaled, ConstantVector::getSplat({4, false}, ConstantFP::get(GetType<f32>(), std::pow(2, 32)))); // TODO ???
+	const auto converted = m_ir->CreateFPToUI(m_ir->CreateSelect(sat_l, const0, scaled), GetType<u32[4]>());
+	SetVr(op.vd, m_ir->CreateSelect(sat_h, ConstantVector::getSplat({4, false}, m_ir->getInt32(0xffffffff)), converted));
+	SetSat(IsNotZero(m_ir->CreateOr(sat_l, sat_h)));
 }
 
 void PPUTranslator::VEXPTEFP(ppu_opcode_t op)
 {
-	const auto b = get_vr<f32[4]>(op.vb);
-	set_vr(op.vd, vec_handle_result(llvm_calli<f32[4], decltype(b)>{"llvm.exp2.v4f32", {b}}));
+	SetVr(op.vd, Call(GetType<f32[4]>(), m_pure_attr, "__vexptefp", GetVr(op.vb, VrType::vf)));
 }
 
 void PPUTranslator::VLOGEFP(ppu_opcode_t op)
 {
-	const auto b = get_vr<f32[4]>(op.vb);
-	set_vr(op.vd, vec_handle_result(llvm_calli<f32[4], decltype(b)>{"llvm.log2.v4f32", {b}}));
+	SetVr(op.vd, Call(GetType<f32[4]>(), m_pure_attr, "__vlogefp", GetVr(op.vb, VrType::vf)));
 }
 
 void PPUTranslator::VMADDFP(ppu_opcode_t op)
@@ -1267,7 +995,7 @@ void PPUTranslator::VMADDFP(ppu_opcode_t op)
 	auto [a, b, c] = get_vrs<f32[4]>(op.va, op.vb, op.vc);
 
 	// Optimization: Emit only a floating multiply if the addend is zero
-	if (auto [ok, data] = get_const_vector(b.value, ::narrow<u32>(m_addr)); ok)
+	if (auto [ok, data] = get_const_vector(b.value, m_addr, 2000); ok)
 	{
 		if (data == v128::from32p(1u << 31))
 		{
@@ -1286,163 +1014,173 @@ void PPUTranslator::VMADDFP(ppu_opcode_t op)
 
 	if (m_use_fma)
 	{
-		set_vr(op.vd, vec_handle_result(fmuladd(a, c, b)));
+		SetVr(op.vd, VecHandleResult(m_ir->CreateCall(get_intrinsic<f32[4]>(llvm::Intrinsic::fma), { a.value, c.value, b.value })));
 		return;
 	}
 
-	// Emulated FMA via double precision (caution: out-of-lane algorithm)
-	const auto xa = fpcast<f64[4]>(a);
-	const auto xb = fpcast<f64[4]>(b);
-	const auto xc = fpcast<f64[4]>(c);
+	// Emulated FMA via double precision
+	const auto xa = m_ir->CreateFPExt(a.value, get_type<f64[4]>());
+	const auto xb = m_ir->CreateFPExt(b.value, get_type<f64[4]>());
+	const auto xc = m_ir->CreateFPExt(c.value, get_type<f64[4]>());
 
-	const auto xr = fmuladd(xa, xc, xb);
-	set_vr(op.vd, vec_handle_result(fpcast<f32[4]>(xr)));
+	const auto xr = m_ir->CreateCall(get_intrinsic<f64[4]>(llvm::Intrinsic::fmuladd), {xa, xc, xb});
+	SetVr(op.vd, VecHandleResult(m_ir->CreateFPTrunc(xr, get_type<f32[4]>())));
 }
 
 void PPUTranslator::VMAXFP(ppu_opcode_t op)
 {
 	const auto [a, b] = get_vrs<f32[4]>(op.va, op.vb);
-	set_vr(op.vd, vec_handle_result(select(fcmp_ord(a < b) | fcmp_uno(b != b), b, a)));
+	set_vr(op.vd, vec_handle_result(select(bitcast<u32[4]>(fmin(a, b)) == bitcast<u32[4]>(a), b, a)));
 }
 
 void PPUTranslator::VMAXSB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s8[16]>(op.va, op.vb);
-	set_vr(op.vd, max(a, b));
+	const auto ab = GetVrs(VrType::vi8, op.va, op.vb);
+	SetVr(op.vd, Saturate(ab[0], CmpInst::ICMP_SLT, ab[1]).first);
 }
 
 void PPUTranslator::VMAXSH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s16[8]>(op.va, op.vb);
-	set_vr(op.vd, max(a, b));
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	SetVr(op.vd, Saturate(ab[0], CmpInst::ICMP_SLT, ab[1]).first);
 }
 
 void PPUTranslator::VMAXSW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s32[4]>(op.va, op.vb);
-	set_vr(op.vd, max(a, b));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, Saturate(ab[0], CmpInst::ICMP_SLT, ab[1]).first);
 }
 
 void PPUTranslator::VMAXUB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
-	set_vr(op.vd, max(a, b));
+	const auto ab = GetVrs(VrType::vi8, op.va, op.vb);
+	SetVr(op.vd, Saturate(ab[0], CmpInst::ICMP_ULT, ab[1]).first);
 }
 
 void PPUTranslator::VMAXUH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	set_vr(op.vd, max(a, b));
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	SetVr(op.vd, Saturate(ab[0], CmpInst::ICMP_ULT, ab[1]).first);
 }
 
 void PPUTranslator::VMAXUW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, max(a, b));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, Saturate(ab[0], CmpInst::ICMP_ULT, ab[1]).first);
 }
 
 void PPUTranslator::VMHADDSHS(ppu_opcode_t op)
 {
-	// Caution: out-of-lane algorithm
-	const auto [a, b, c] = get_vrs<s16[8]>(op.va, op.vb, op.vc);
-	const auto m = ((sext<s32[8]>(a) * sext<s32[8]>(b)) >> 15) + sext<s32[8]>(c);
-	const auto r = trunc<u16[8]>(min(max(m, splat<s32[8]>(-0x8000)), splat<s32[8]>(0x7fff)));
-	set_vr(op.vd, r);
-	set_sat(trunc<u16[8]>((m + 0x8000) >> 16));
+	const auto abc = SExt(GetVrs(VrType::vi16, op.va, op.vb, op.vc));
+	const auto result = m_ir->CreateAdd(m_ir->CreateAShr(m_ir->CreateMul(abc[0], abc[1]), 15), abc[2]);
+	const auto saturated = SaturateSigned(result, -0x8000, 0x7fff);
+	SetVr(op.vd, saturated.first);
+	SetSat(IsNotZero(saturated.second));
+
+	// const auto a = get_vr<s16[8]>(op.va);
+	// const auto b = get_vr<s16[8]>(op.vb);
+	// const auto c = get_vr<s16[8]>(op.vc);
+	// value_t<s16[8]> m;
+	// m.value = m_ir->CreateShl(Trunc(m_ir->CreateAShr(m_ir->CreateMul(SExt(a.value), SExt(b.value)), 16)), 1);
+	// m.value = m_ir->CreateOr(m.value, m_ir->CreateLShr(m_ir->CreateMul(a.value, b.value), 15));
+	// const auto s = eval(c + m);
+	// const auto z = eval((c >> 15) ^ 0x7fff);
+	// const auto x = eval(((m ^ s) & ~(c ^ m)) >> 15);
+	// set_vr(op.vd, eval((z & x) | (s & ~x)));
+	//SetSat(IsNotZero(saturated.second));
 }
 
 void PPUTranslator::VMHRADDSHS(ppu_opcode_t op)
 {
-	// Caution: out-of-lane algorithm
-	const auto [a, b, c] = get_vrs<s16[8]>(op.va, op.vb, op.vc);
-	const auto m = ((sext<s32[8]>(a) * sext<s32[8]>(b) + splat<s32[8]>(0x4000)) >> 15) + sext<s32[8]>(c);
-	const auto r = trunc<u16[8]>(min(max(m, splat<s32[8]>(-0x8000)), splat<s32[8]>(0x7fff)));
-	set_vr(op.vd, r);
-	set_sat(trunc<u16[8]>((m + 0x8000) >> 16));
+	const auto abc = SExt(GetVrs(VrType::vi16, op.va, op.vb, op.vc));
+	const auto result = m_ir->CreateAdd(m_ir->CreateAShr(m_ir->CreateAdd(m_ir->CreateMul(abc[0], abc[1]), ConstantVector::getSplat({8, false}, m_ir->getInt32(0x4000))), 15), abc[2]);
+	const auto saturated = SaturateSigned(result, -0x8000, 0x7fff);
+	SetVr(op.vd, saturated.first);
+	SetSat(IsNotZero(saturated.second));
 }
 
 void PPUTranslator::VMINFP(ppu_opcode_t op)
 {
 	const auto [a, b] = get_vrs<f32[4]>(op.va, op.vb);
-	set_vr(op.vd, vec_handle_result(select(fcmp_ord(a > b) | fcmp_uno(b != b), b, a)));
+	set_vr(op.vd, vec_handle_result(select(bitcast<u32[4]>(fmax(a, b)) == bitcast<u32[4]>(a), b, a)));
 }
 
 void PPUTranslator::VMINSB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s8[16]>(op.va, op.vb);
-	set_vr(op.vd, min(a, b));
+	const auto ab = GetVrs(VrType::vi8, op.va, op.vb);
+	SetVr(op.vd, Saturate(ab[0], CmpInst::ICMP_SGT, ab[1]).first);
 }
 
 void PPUTranslator::VMINSH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s16[8]>(op.va, op.vb);
-	set_vr(op.vd, min(a, b));
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	SetVr(op.vd, Saturate(ab[0], CmpInst::ICMP_SGT, ab[1]).first);
 }
 
 void PPUTranslator::VMINSW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s32[4]>(op.va, op.vb);
-	set_vr(op.vd, min(a, b));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, Saturate(ab[0], CmpInst::ICMP_SGT, ab[1]).first);
 }
 
 void PPUTranslator::VMINUB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
-	set_vr(op.vd, min(a, b));
+	const auto ab = GetVrs(VrType::vi8, op.va, op.vb);
+	SetVr(op.vd, Saturate(ab[0], CmpInst::ICMP_UGT, ab[1]).first);
 }
 
 void PPUTranslator::VMINUH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	set_vr(op.vd, min(a, b));
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	SetVr(op.vd, Saturate(ab[0], CmpInst::ICMP_UGT, ab[1]).first);
 }
 
 void PPUTranslator::VMINUW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, min(a, b));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, Saturate(ab[0], CmpInst::ICMP_UGT, ab[1]).first);
 }
 
 void PPUTranslator::VMLADDUHM(ppu_opcode_t op)
 {
-	const auto [a, b, c] = get_vrs<u16[8]>(op.va, op.vb, op.vc);
-	set_vr(op.vd, a * b + c);
+	const auto abc = GetVrs(VrType::vi16, op.va, op.vb, op.vc);
+	SetVr(op.vd, m_ir->CreateAdd(m_ir->CreateMul(abc[0], abc[1]), abc[2]));
 }
 
 void PPUTranslator::VMRGHB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
-	set_vr(op.vd, shuffle2(a, b, 24, 8, 25, 9, 26, 10, 27, 11, 28, 12, 29, 13, 30, 14, 31, 15));
+	const auto ab = GetVrs(VrType::vi8, op.va, op.vb);
+	SetVr(op.vd, Shuffle(ab[0], ab[1], { 0, 16, 1, 17, 2, 18, 3, 19, 4, 20, 5, 21, 6, 22, 7, 23 }));
 }
 
 void PPUTranslator::VMRGHH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	set_vr(op.vd, shuffle2(a, b, 12, 4, 13, 5, 14, 6, 15, 7));
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	SetVr(op.vd, Shuffle(ab[0], ab[1], { 0, 8, 1, 9, 2, 10, 3, 11 }));
 }
 
 void PPUTranslator::VMRGHW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, shuffle2(a, b, 6, 2, 7, 3));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, Shuffle(ab[0], ab[1], { 0, 4, 1, 5 }));
 }
 
 void PPUTranslator::VMRGLB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
-	set_vr(op.vd, shuffle2(a, b, 16, 0, 17, 1, 18, 2, 19, 3, 20, 4, 21, 5, 22, 6, 23, 7));
+	const auto ab = GetVrs(VrType::vi8, op.va, op.vb);
+	SetVr(op.vd, Shuffle(ab[0], ab[1], { 8, 24, 9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31 }));
 }
 
 void PPUTranslator::VMRGLH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	set_vr(op.vd, shuffle2(a, b, 8, 0, 9, 1, 10, 2, 11, 3));
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	SetVr(op.vd, Shuffle(ab[0], ab[1], { 4, 12, 5, 13, 6, 14, 7, 15 }));
 }
 
 void PPUTranslator::VMRGLW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, shuffle2(a, b, 4, 0, 5, 1));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, Shuffle(ab[0], ab[1], { 2, 6, 3, 7 }));
 }
 
 void PPUTranslator::VMSUMMBM(ppu_opcode_t op)
@@ -1452,34 +1190,39 @@ void PPUTranslator::VMSUMMBM(ppu_opcode_t op)
 	const auto c = get_vr<s32[4]>(op.vc);
 	const auto ml = bitcast<s32[4]>((a << 8 >> 8) * noncast<s16[8]>(b << 8 >> 8));
 	const auto mh = bitcast<s32[4]>((a >> 8) * noncast<s16[8]>(b >> 8));
-	set_vr(op.vd, ((ml << 16 >> 16) + (ml >> 16)) + ((mh << 16 >> 16) + (mh >> 16)) + c);
+	set_vr(op.vd, eval(((ml << 16 >> 16) + (ml >> 16)) + ((mh << 16 >> 16) + (mh >> 16)) + c));
 }
 
 void PPUTranslator::VMSUMSHM(ppu_opcode_t op)
 {
-	const auto [a, b, c] = get_vrs<s32[4]>(op.va, op.vb, op.vc);
-	const auto ml = (a << 16 >> 16) * (b << 16 >> 16);
-	const auto mh = (a >> 16) * (b >> 16);
-	set_vr(op.vd, ml + mh + c);
+	const auto a = get_vr<s32[4]>(op.va);
+	const auto b = get_vr<s32[4]>(op.vb);
+	const auto c = get_vr<s32[4]>(op.vc);
+	const auto ml = eval((a << 16 >> 16) * (b << 16 >> 16));
+	const auto mh = eval((a >> 16) * (b >> 16));
+	set_vr(op.vd, eval(ml + mh + c));
 }
 
 void PPUTranslator::VMSUMSHS(ppu_opcode_t op)
 {
-	const auto [a, b, c] = get_vrs<s32[4]>(op.va, op.vb, op.vc);
-	const auto ml = (a << 16 >> 16) * (b << 16 >> 16);
-	const auto mh = (a >> 16) * (b >> 16);
+	const auto a = get_vr<s32[4]>(op.va);
+	const auto b = get_vr<s32[4]>(op.vb);
+	const auto c = get_vr<s32[4]>(op.vc);
+	const auto ml = eval((a << 16 >> 16) * (b << 16 >> 16));
+	const auto mh = eval((a >> 16) * (b >> 16));
 	const auto m = eval(ml + mh);
 	const auto s = eval(m + c);
 	const auto z = eval((c >> 31) ^ 0x7fffffff);
 	const auto mx = eval(m ^ sext<s32[4]>(m == 0x80000000u));
 	const auto x = eval(((mx ^ s) & ~(c ^ mx)) >> 31);
 	set_vr(op.vd, eval((z & x) | (s & ~x)));
-	set_sat(x);
+	SetSat(IsNotZero(x.value));
 }
 
 void PPUTranslator::VMSUMUBM(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
+	const auto a = get_vr<u16[8]>(op.va);
+	const auto b = get_vr<u16[8]>(op.vb);
 	const auto c = get_vr<u32[4]>(op.vc);
 	const auto ml = bitcast<u32[4]>((a << 8 >> 8) * (b << 8 >> 8));
 	const auto mh = bitcast<u32[4]>((a >> 8) * (b >> 8));
@@ -1488,70 +1231,74 @@ void PPUTranslator::VMSUMUBM(ppu_opcode_t op)
 
 void PPUTranslator::VMSUMUHM(ppu_opcode_t op)
 {
-	const auto [a, b, c] = get_vrs<u32[4]>(op.va, op.vb, op.vc);
-	const auto ml = (a << 16 >> 16) * (b << 16 >> 16);
-	const auto mh = (a >> 16) * (b >> 16);
-	set_vr(op.vd, ml + mh + c);
+	const auto a = get_vr<u32[4]>(op.va);
+	const auto b = get_vr<u32[4]>(op.vb);
+	const auto c = get_vr<u32[4]>(op.vc);
+	const auto ml = eval((a << 16 >> 16) * (b << 16 >> 16));
+	const auto mh = eval((a >> 16) * (b >> 16));
+	set_vr(op.vd, eval(ml + mh + c));
 }
 
 void PPUTranslator::VMSUMUHS(ppu_opcode_t op)
 {
-	const auto [a, b, c] = get_vrs<u32[4]>(op.va, op.vb, op.vc);
-	const auto ml = (a << 16 >> 16) * (b << 16 >> 16);
-	const auto mh = (a >> 16) * (b >> 16);
+	const auto a = get_vr<u32[4]>(op.va);
+	const auto b = get_vr<u32[4]>(op.vb);
+	const auto c = get_vr<u32[4]>(op.vc);
+	const auto ml = noncast<u32[4]>((a << 16 >> 16) * (b << 16 >> 16));
+	const auto mh = noncast<u32[4]>((a >> 16) * (b >> 16));
 	const auto s = eval(ml + mh);
 	const auto s2 = eval(s + c);
 	const auto x = eval((s < ml) | (s2 < s));
 	set_vr(op.vd, select(x, splat<u32[4]>(-1), s2));
-	set_sat(x);
+	SetSat(IsNotZero(x.value));
 }
 
 void PPUTranslator::VMULESB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s16[8]>(op.va, op.vb);
-	set_vr(op.vd, (a >> 8) * (b >> 8));
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateMul(m_ir->CreateAShr(ab[0], 8), m_ir->CreateAShr(ab[1], 8)));
 }
 
 void PPUTranslator::VMULESH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s32[4]>(op.va, op.vb);
-	set_vr(op.vd, (a >> 16) * (b >> 16));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateMul(m_ir->CreateAShr(ab[0], 16), m_ir->CreateAShr(ab[1], 16)));
 }
 
 void PPUTranslator::VMULEUB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	set_vr(op.vd, (a >> 8) * (b >> 8));
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateMul(m_ir->CreateLShr(ab[0], 8), m_ir->CreateLShr(ab[1], 8)));
 }
 
 void PPUTranslator::VMULEUH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, (a >> 16) * (b >> 16));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateMul(m_ir->CreateLShr(ab[0], 16), m_ir->CreateLShr(ab[1], 16)));
 }
 
 void PPUTranslator::VMULOSB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s16[8]>(op.va, op.vb);
-	set_vr(op.vd, (a << 8 >> 8) * (b << 8 >> 8));
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateMul(m_ir->CreateAShr(m_ir->CreateShl(ab[0], 8), 8), m_ir->CreateAShr(m_ir->CreateShl(ab[1], 8), 8)));
 }
 
 void PPUTranslator::VMULOSH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s32[4]>(op.va, op.vb);
-	set_vr(op.vd, (a << 16 >> 16) * (b << 16 >> 16));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateMul(m_ir->CreateAShr(m_ir->CreateShl(ab[0], 16), 16), m_ir->CreateAShr(m_ir->CreateShl(ab[1], 16), 16)));
 }
 
 void PPUTranslator::VMULOUB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	set_vr(op.vd, (a << 8 >> 8) * (b << 8 >> 8));
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateMul(m_ir->CreateLShr(m_ir->CreateShl(ab[0], 8), 8), m_ir->CreateLShr(m_ir->CreateShl(ab[1], 8), 8)));
 }
 
 void PPUTranslator::VMULOUH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, (a << 16 >> 16) * (b << 16 >> 16));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateMul(m_ir->CreateLShr(m_ir->CreateShl(ab[0], 16), 16), m_ir->CreateLShr(m_ir->CreateShl(ab[1], 16), 16)));
 }
 
 void PPUTranslator::VNMSUBFP(ppu_opcode_t op)
@@ -1559,18 +1306,18 @@ void PPUTranslator::VNMSUBFP(ppu_opcode_t op)
 	auto [a, b, c] = get_vrs<f32[4]>(op.va, op.vb, op.vc);
 
 	// Optimization: Emit only a floating multiply if the addend is zero
-	if (const auto [ok, data] = get_const_vector(b.value, ::narrow<u32>(m_addr)); ok)
+	if (const auto [ok, data] = get_const_vector(b.value, m_addr, 2004); ok)
 	{
 		if (data == v128{})
 		{
-			set_vr(op.vd, vec_handle_result(-(a * c)));
+			set_vr(op.vd, vec_handle_result(-a * c));
 			ppu_log.notice("LLVM: VNMSUBFP with 0 addend at [0x%08x]", m_addr + (m_reloc ? m_reloc->addr : 0));
 			return;
 		}
 
 		if (!m_use_fma && data == v128::from32p(1u << 31))
 		{
-			set_vr(op.vd, vec_handle_result(-(a * c - fsplat<f32[4]>(0.f))));
+			set_vr(op.vd, vec_handle_result(-a * c + fsplat<f32[4]>(0.f)));
 			ppu_log.notice("LLVM: VNMSUBFP with -0 addend at [0x%08x]", m_addr + (m_reloc ? m_reloc->addr : 0));
 			return;
 		}
@@ -1579,42 +1326,40 @@ void PPUTranslator::VNMSUBFP(ppu_opcode_t op)
 	// Differs from the emulated path with regards to negative zero
 	if (m_use_fma)
 	{
-		set_vr(op.vd, vec_handle_result(-fmuladd(a, c, -b)));
+		SetVr(op.vd, VecHandleResult(m_ir->CreateCall(get_intrinsic<f32[4]>(llvm::Intrinsic::fma), { m_ir->CreateFNeg(a.value), c.value, b.value })));
 		return;
 	}
 
-	// Emulated FMA via double precision (caution: out-of-lane algorithm)
-	const auto xa = fpcast<f64[4]>(a);
-	const auto xb = fpcast<f64[4]>(b);
-	const auto xc = fpcast<f64[4]>(c);
+	// Emulated FMA via double precision
+	const auto xa = m_ir->CreateFPExt(a.value, get_type<f64[4]>());
+	const auto xb = m_ir->CreateFPExt(b.value, get_type<f64[4]>());
+	const auto xc = m_ir->CreateFPExt(c.value, get_type<f64[4]>());
 
-	const auto nr = xa * xc - xb;
-	set_vr(op.vd, vec_handle_result(fpcast<f32[4]>(-nr)));
+	const auto xr = m_ir->CreateFNeg(m_ir->CreateFSub(m_ir->CreateFMul(xa, xc), xb));
+	SetVr(op.vd, VecHandleResult(m_ir->CreateFPTrunc(xr, get_type<f32[4]>())));
 }
 
 void PPUTranslator::VNOR(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, ~(a | b));
+	const auto a = get_vr<u32[4]>(op.va);
+	const auto b = get_vr<u32[4]>(op.vb);
+	set_vr(op.vd, eval(~(a | b)));
 }
 
 void PPUTranslator::VOR(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, a | b);
+	const auto a = get_vr<u32[4]>(op.va);
+	const auto b = get_vr<u32[4]>(op.vb);
+	set_vr(op.vd, eval(a | b));
 }
 
 void PPUTranslator::VPERM(ppu_opcode_t op)
 {
-	const auto [a, b, c] = get_vrs<u8[16]>(op.va, op.vb, op.vc);
+	const auto a = get_vr<u8[16]>(op.va);
+	const auto b = get_vr<u8[16]>(op.vb);
+	const auto c = get_vr<u8[16]>(op.vc);
 
-	if (op.ra == op.rb)
-	{
-		set_vr(op.vd, pshufb(a, ~c & 0xf));
-		return;
-	}
-
-	if (m_use_avx512_icl)
+	if (m_use_avx512_icl && op.ra != op.rb)
 	{
 		const auto i = eval(~c);
 		set_vr(op.vd, vperm2b(b, a, i));
@@ -1627,112 +1372,106 @@ void PPUTranslator::VPERM(ppu_opcode_t op)
 
 void PPUTranslator::VPKPX(ppu_opcode_t op)
 {
-	// Caution: out-of-lane algorithm
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	const auto ab = shuffle2(b, a, 0, 1, 2, 3, 4, 5, 6, 7);
-	const auto e1 = (ab & 0x01f80000) >> 9;
-	const auto e2 = (ab & 0xf800) >> 6;
-	const auto e3 = (ab & 0xf8) >> 3;
-	set_vr(op.vd, trunc<u16[8]>(e1 | e2 | e3));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	const auto px = Shuffle(ab[0], ab[1], { 0, 1, 2, 3, 4, 5, 6, 7 });
+	const auto e1 = m_ir->CreateLShr(m_ir->CreateAnd(px, 0x01f80000), 9);
+	const auto e2 = m_ir->CreateLShr(m_ir->CreateAnd(px, 0xf800), 6);
+	const auto e3 = m_ir->CreateLShr(m_ir->CreateAnd(px, 0xf8), 3);
+	SetVr(op.vd, m_ir->CreateOr(m_ir->CreateOr(e1, e2), e3));
 }
 
 void PPUTranslator::VPKSHSS(ppu_opcode_t op)
 {
-	// Caution: potentially out-of-lane algorithm
-	const auto [a, b] = get_vrs<s16[8]>(op.va, op.vb);
-	const auto ab = shuffle2(b, a, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
-	const auto r = trunc<u8[16]>(min(max(ab, splat<s16[16]>(-0x80)), splat<s16[16]>(0x7f)));
-	set_vr(op.vd, r);
-	set_sat(bitcast<u16[8]>((a + 0x80) | (b + 0x80)) >> 8);
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	const auto src = Shuffle(ab[0], ab[1], { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 });
+	const auto saturated = SaturateSigned(src, -0x80, 0x7f);
+	SetVr(op.vd, saturated.first);
+	SetSat(IsNotZero(saturated.second));
 }
 
 void PPUTranslator::VPKSHUS(ppu_opcode_t op)
 {
-	// Caution: potentially out-of-lane algorithm
-	const auto [a, b] = get_vrs<s16[8]>(op.va, op.vb);
-	const auto ab = shuffle2(b, a, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
-	const auto r = trunc<u8[16]>(min(max(ab, splat<s16[16]>(0)), splat<s16[16]>(0xff)));
-	set_vr(op.vd, r);
-	set_sat(bitcast<u16[8]>(a | b) >> 8);
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	const auto src = Shuffle(ab[0], ab[1], { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 });
+	const auto saturated = SaturateSigned(src, 0, 0xff);
+	SetVr(op.vd, saturated.first);
+	SetSat(IsNotZero(saturated.second));
 }
 
 void PPUTranslator::VPKSWSS(ppu_opcode_t op)
 {
-	// Caution: potentially out-of-lane algorithm
-	const auto [a, b] = get_vrs<s32[4]>(op.va, op.vb);
-	const auto ab = shuffle2(b, a, 0, 1, 2, 3, 4, 5, 6, 7);
-	const auto r = trunc<u16[8]>(min(max(ab, splat<s32[8]>(-0x8000)), splat<s32[8]>(0x7fff)));
-	set_vr(op.vd, r);
-	set_sat(bitcast<u32[4]>((a + 0x8000) | (b + 0x8000)) >> 16);
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	const auto src = Shuffle(ab[0], ab[1], { 0, 1, 2, 3, 4, 5, 6, 7 });
+	const auto saturated = SaturateSigned(src, -0x8000, 0x7fff);
+	SetVr(op.vd, saturated.first);
+	SetSat(IsNotZero(saturated.second));
 }
 
 void PPUTranslator::VPKSWUS(ppu_opcode_t op)
 {
-	// Caution: potentially out-of-lane algorithm
-	const auto [a, b] = get_vrs<s32[4]>(op.va, op.vb);
-	const auto ab = shuffle2(b, a, 0, 1, 2, 3, 4, 5, 6, 7);
-	const auto r = trunc<u16[8]>(min(max(ab, splat<s32[8]>(0)), splat<s32[8]>(0xffff)));
-	set_vr(op.vd, r);
-	set_sat(bitcast<u32[4]>(a | b) >> 16);
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	const auto src = Shuffle(ab[0], ab[1], { 0, 1, 2, 3, 4, 5, 6, 7 });
+	const auto saturated = SaturateSigned(src, 0, 0xffff);
+	SetVr(op.vd, saturated.first);
+	SetSat(IsNotZero(saturated.second));
 }
 
 void PPUTranslator::VPKUHUM(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
-	const auto r = shuffle2(b, a, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30);
-	set_vr(op.vd, r);
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	const auto src = Shuffle(ab[0], ab[1], { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 });
+	SetVr(op.vd, src); // Truncate
 }
 
 void PPUTranslator::VPKUHUS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	const auto ta = bitcast<u8[16]>(min(a, splat<u16[8]>(0xff)));
-	const auto tb = bitcast<u8[16]>(min(b, splat<u16[8]>(0xff)));
-	const auto r = shuffle2(tb, ta, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30);
-	set_vr(op.vd, r);
-	set_sat((a | b) >> 8);
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	const auto src = Shuffle(ab[0], ab[1], { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 });
+	const auto saturated = Saturate(src, ICmpInst::ICMP_UGT, m_ir->getInt16(0xff));
+	SetVr(op.vd, saturated.first);
+	SetSat(IsNotZero(saturated.second));
 }
 
 void PPUTranslator::VPKUWUM(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	const auto r = shuffle2(b, a, 0, 2, 4, 6, 8, 10, 12, 14);
-	set_vr(op.vd, r);
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	const auto src = Shuffle(ab[0], ab[1], { 0, 1, 2, 3, 4, 5, 6, 7 });
+	SetVr(op.vd, src); // Truncate
 }
 
 void PPUTranslator::VPKUWUS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	const auto ta = bitcast<u16[8]>(min(a, splat<u32[4]>(0xffff)));
-	const auto tb = bitcast<u16[8]>(min(b, splat<u32[4]>(0xffff)));
-	const auto r = shuffle2(tb, ta, 0, 2, 4, 6, 8, 10, 12, 14);
-	set_vr(op.vd, r);
-	set_sat((a | b) >> 16);
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	const auto src = Shuffle(ab[0], ab[1], { 0, 1, 2, 3, 4, 5, 6, 7 });
+	const auto saturated = Saturate(src, ICmpInst::ICMP_UGT, m_ir->getInt32(0xffff));
+	SetVr(op.vd, saturated.first);
+	SetSat(IsNotZero(saturated.second));
 }
 
 void PPUTranslator::VREFP(ppu_opcode_t op)
 {
-	set_vr(op.vd, vec_handle_result(fsplat<f32[4]>(1.0) / get_vr<f32[4]>(op.vb)));
+	const auto result = VecHandleResult(m_ir->CreateFDiv(ConstantVector::getSplat({4, false}, ConstantFP::get(GetType<f32>(), 1.0)), GetVr(op.vb, VrType::vf)));
+	SetVr(op.vd, result);
 }
 
 void PPUTranslator::VRFIM(ppu_opcode_t op)
 {
-	set_vr(op.vd, vec_handle_result(callf<f32[4]>(get_intrinsic<f32[4]>(Intrinsic::floor), get_vr<f32[4]>(op.vb))));
+	SetVr(op.vd, VecHandleResult(Call(GetType<f32[4]>(), "llvm.floor.v4f32", GetVr(op.vb, VrType::vf))));
 }
 
 void PPUTranslator::VRFIN(ppu_opcode_t op)
 {
-	set_vr(op.vd, vec_handle_result(callf<f32[4]>(get_intrinsic<f32[4]>(Intrinsic::roundeven), get_vr<f32[4]>(op.vb))));
+	SetVr(op.vd, VecHandleResult(Call(GetType<f32[4]>(), "llvm.nearbyint.v4f32", GetVr(op.vb, VrType::vf))));
 }
 
 void PPUTranslator::VRFIP(ppu_opcode_t op)
 {
-	set_vr(op.vd, vec_handle_result(callf<f32[4]>(get_intrinsic<f32[4]>(Intrinsic::ceil), get_vr<f32[4]>(op.vb))));
+	SetVr(op.vd, VecHandleResult(Call(GetType<f32[4]>(), "llvm.ceil.v4f32", GetVr(op.vb, VrType::vf))));
 }
 
 void PPUTranslator::VRFIZ(ppu_opcode_t op)
 {
-	set_vr(op.vd, vec_handle_result(callf<f32[4]>(get_intrinsic<f32[4]>(Intrinsic::trunc), get_vr<f32[4]>(op.vb))));
+	SetVr(op.vd, VecHandleResult(Call(GetType<f32[4]>(), "llvm.trunc.v4f32", GetVr(op.vb, VrType::vf))));
 }
 
 void PPUTranslator::VRLB(ppu_opcode_t op)
@@ -1755,7 +1494,9 @@ void PPUTranslator::VRLW(ppu_opcode_t op)
 
 void PPUTranslator::VRSQRTEFP(ppu_opcode_t op)
 {
-	set_vr(op.vd, vec_handle_result(fsplat<f32[4]>(1.0) / callf<f32[4]>(get_intrinsic<f32[4]>(Intrinsic::sqrt), get_vr<f32[4]>(op.vb))));
+	const auto result = m_ir->CreateFDiv(ConstantVector::getSplat({4, false}, ConstantFP::get(GetType<f32>(), 1.0)), Call(GetType<f32[4]>(), "llvm.sqrt.v4f32", GetVr(op.vb, VrType::vf)));
+
+	SetVr(op.vd, VecHandleResult(result));
 }
 
 void PPUTranslator::VSEL(ppu_opcode_t op)
@@ -1763,7 +1504,7 @@ void PPUTranslator::VSEL(ppu_opcode_t op)
 	const auto c = get_vr<u32[4]>(op.vc);
 
 	// Check if the constant mask doesn't require bit granularity
-	if (auto [ok, mask] = get_const_vector(c.value, ::narrow<u32>(m_addr)); ok)
+	if (auto [ok, mask] = get_const_vector(c.value, m_addr, 9000); ok)
 	{
 		bool sel_32 = true;
 		for (u32 i = 0; i < 4; i++)
@@ -1821,321 +1562,329 @@ void PPUTranslator::VSEL(ppu_opcode_t op)
 
 void PPUTranslator::VSL(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
-	set_vr(op.vd, fshl(a, zshuffle(a, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14), b));
+	// TODO (very rare)
+	SetVr(op.vd, m_ir->CreateShl(GetVr(op.va, VrType::i128), m_ir->CreateAnd(GetVr(op.vb, VrType::i128), 7)));
 }
 
 void PPUTranslator::VSLB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
-	set_vr(op.vd, a << (b & 7));
+	const auto ab = GetVrs(VrType::vi8, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateShl(ab[0], m_ir->CreateAnd(ab[1], 7)));
 }
 
 void PPUTranslator::VSLDOI(ppu_opcode_t op)
 {
 	if (op.vsh == 0)
 	{
-		set_vr(op.vd, get_vr<u32[4]>(op.va));
+		const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+		SetVr(op.vd, ab[0]);
 	}
 	else if ((op.vsh % 4) == 0)
 	{
-		const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
+		const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
 		const auto s = op.vsh / 4;
-		const auto x = 7;
-		set_vr(op.vd, shuffle2(b, a, (s + 3) ^ x, (s + 2) ^ x, (s + 1) ^ x, (s) ^ x));
+		SetVr(op.vd, Shuffle(ab[0], ab[1], { s, s + 1, s + 2, s + 3 }));
 	}
 	else if ((op.vsh % 2) == 0)
 	{
-		const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
+		const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
 		const auto s = op.vsh / 2;
-		const auto x = 15;
-		set_vr(op.vd, shuffle2(b, a, (s + 7) ^ x, (s + 6) ^ x, (s + 5) ^ x, (s + 4) ^ x, (s + 3) ^ x, (s + 2) ^ x, (s + 1) ^ x, (s) ^ x));
+		SetVr(op.vd, Shuffle(ab[0], ab[1], { s, s + 1, s + 2, s + 3, s + 4, s + 5, s + 6, s + 7 }));
 	}
 	else
 	{
-		const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
+		const auto ab = GetVrs(VrType::vi8, op.va, op.vb);
 		const auto s = op.vsh;
-		const auto x = 31;
-		set_vr(op.vd, shuffle2(b, a, (s + 15) ^ x, (s + 14) ^ x, (s + 13) ^ x, (s + 12) ^ x, (s + 11) ^ x, (s + 10) ^ x, (s + 9) ^ x, (s + 8) ^ x, (s + 7) ^ x, (s + 6) ^ x, (s + 5) ^ x, (s + 4) ^ x, (s + 3) ^ x, (s + 2) ^ x, (s + 1) ^ x, (s) ^ x));
+		SetVr(op.vd, Shuffle(ab[0], ab[1], { s, s + 1, s + 2, s + 3, s + 4, s + 5, s + 6, s + 7, s + 8, s + 9, s + 10, s + 11, s + 12, s + 13, s + 14, s + 15 }));
 	}
 }
 
 void PPUTranslator::VSLH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	set_vr(op.vd, a << (b & 15));
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateShl(ab[0], m_ir->CreateAnd(ab[1], 15)));
 }
 
 void PPUTranslator::VSLO(ppu_opcode_t op)
 {
 	// TODO (rare)
-	const auto [a, b] = get_vrs<u128>(op.va, op.vb);
-	set_vr(op.vd, a << (b & 0x78));
+	SetVr(op.vd, m_ir->CreateShl(GetVr(op.va, VrType::i128), m_ir->CreateAnd(GetVr(op.vb, VrType::i128), 0x78)));
 }
 
 void PPUTranslator::VSLW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, a << (b & 31));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateShl(ab[0], m_ir->CreateAnd(ab[1], 31)));
 }
 
 void PPUTranslator::VSPLTB(ppu_opcode_t op)
 {
-	const u32 ui = ~op.vuimm & 0xf;
-	set_vr(op.vd, zshuffle(get_vr<u8[16]>(op.vb), ui, ui, ui, ui, ui, ui, ui, ui, ui, ui, ui, ui, ui, ui, ui, ui));
+	const u32 ui = op.vuimm & 0xf;
+	SetVr(op.vd, Shuffle(GetVr(op.vb, VrType::vi8), nullptr, { ui, ui, ui, ui, ui, ui, ui, ui, ui, ui, ui, ui, ui, ui, ui, ui }));
 }
 
 void PPUTranslator::VSPLTH(ppu_opcode_t op)
 {
-	const u32 ui = ~op.vuimm & 0x7;
-	set_vr(op.vd, zshuffle(get_vr<u16[8]>(op.vb), ui, ui, ui, ui, ui, ui, ui, ui));
+	const u32 ui = op.vuimm & 0x7;
+	SetVr(op.vd, Shuffle(GetVr(op.vb, VrType::vi16), nullptr, { ui, ui, ui, ui, ui, ui, ui, ui }));
 }
 
 void PPUTranslator::VSPLTISB(ppu_opcode_t op)
 {
-	set_vr(op.vd, splat<u8[16]>(op.vsimm));
+	SetVr(op.vd, ConstantVector::getSplat({16, false}, m_ir->getInt8(op.vsimm)));
 }
 
 void PPUTranslator::VSPLTISH(ppu_opcode_t op)
 {
-	set_vr(op.vd, splat<u16[8]>(op.vsimm));
+	SetVr(op.vd, ConstantVector::getSplat({8, false}, m_ir->getInt16(op.vsimm)));
 }
 
 void PPUTranslator::VSPLTISW(ppu_opcode_t op)
 {
-	set_vr(op.vd, splat<u32[4]>(op.vsimm));
+	SetVr(op.vd, ConstantVector::getSplat({4, false}, m_ir->getInt32(op.vsimm)));
 }
 
 void PPUTranslator::VSPLTW(ppu_opcode_t op)
 {
-	const u32 ui = ~op.vuimm & 0x3;
-	set_vr(op.vd, zshuffle(get_vr<u32[4]>(op.vb), ui, ui, ui, ui));
+	const u32 ui = op.vuimm & 0x3;
+	SetVr(op.vd, Shuffle(GetVr(op.vb, VrType::vi32), nullptr, { ui, ui, ui, ui }));
 }
 
 void PPUTranslator::VSR(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
-	set_vr(op.vd, fshr(zshuffle(a, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16), a, b));
+	// TODO (very rare)
+	SetVr(op.vd, m_ir->CreateLShr(GetVr(op.va, VrType::i128), m_ir->CreateAnd(GetVr(op.vb, VrType::i128), 7)));
 }
 
 void PPUTranslator::VSRAB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s8[16]>(op.va, op.vb);
-	set_vr(op.vd, a >> (b & 7));
+	const auto ab = GetVrs(VrType::vi8, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateAShr(ab[0], m_ir->CreateAnd(ab[1], 7)));
 }
 
 void PPUTranslator::VSRAH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s16[8]>(op.va, op.vb);
-	set_vr(op.vd, a >> (b & 15));
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateAShr(ab[0], m_ir->CreateAnd(ab[1], 15)));
 }
 
 void PPUTranslator::VSRAW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s32[4]>(op.va, op.vb);
-	set_vr(op.vd, a >> (b & 31));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateAShr(ab[0], m_ir->CreateAnd(ab[1], 31)));
 }
 
 void PPUTranslator::VSRB(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
-	set_vr(op.vd, a >> (b & 7));
+	const auto ab = GetVrs(VrType::vi8, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateLShr(ab[0], m_ir->CreateAnd(ab[1], 7)));
 }
 
 void PPUTranslator::VSRH(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
-	set_vr(op.vd, a >> (b & 15));
+	const auto ab = GetVrs(VrType::vi16, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateLShr(ab[0], m_ir->CreateAnd(ab[1], 15)));
 }
 
 void PPUTranslator::VSRO(ppu_opcode_t op)
 {
 	// TODO (very rare)
-	const auto [a, b] = get_vrs<u128>(op.va, op.vb);
-	set_vr(op.vd, a >> (b & 0x78));
+	SetVr(op.vd, m_ir->CreateLShr(GetVr(op.va, VrType::i128), m_ir->CreateAnd(GetVr(op.vb, VrType::i128), 0x78)));
 }
 
 void PPUTranslator::VSRW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, a >> (b & 31));
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateLShr(ab[0], m_ir->CreateAnd(ab[1], 31)));
 }
 
 void PPUTranslator::VSUBCUW(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
+	const auto a = get_vr<u32[4]>(op.va);
+	const auto b = get_vr<u32[4]>(op.vb);
 	set_vr(op.vd, zext<u32[4]>(a >= b));
 }
 
 void PPUTranslator::VSUBFP(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<f32[4]>(op.va, op.vb);
-	set_vr(op.vd, vec_handle_result(a - b));
+	const auto a = get_vr<f32[4]>(op.va);
+	const auto b = get_vr<f32[4]>(op.vb);
+	SetVr(op.vd, VecHandleResult(eval(a - b).eval(m_ir)));
 }
 
 void PPUTranslator::VSUBSBS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s8[16]>(op.va, op.vb);
+	const auto a = get_vr<s8[16]>(op.va);
+	const auto b = get_vr<s8[16]>(op.vb);
 	const auto r = sub_sat(a, b);
 	set_vr(op.vd, r);
-	set_sat(r ^ (a - b));
+	SetSat(IsNotZero(eval(r != (a - b)).value));
 }
 
 void PPUTranslator::VSUBSHS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s16[8]>(op.va, op.vb);
+	const auto a = get_vr<s16[8]>(op.va);
+	const auto b = get_vr<s16[8]>(op.vb);
 	const auto r = sub_sat(a, b);
 	set_vr(op.vd, r);
-	set_sat(r ^ (a - b));
+	SetSat(IsNotZero(eval(r != (a - b)).value));
 }
 
 void PPUTranslator::VSUBSWS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s32[4]>(op.va, op.vb);
+	const auto a = get_vr<s32[4]>(op.va);
+	const auto b = get_vr<s32[4]>(op.vb);
 	const auto r = sub_sat(a, b);
 	set_vr(op.vd, r);
-	set_sat(r ^ (a - b));
+	SetSat(IsNotZero(eval(r != (a - b)).value));
 }
 
 void PPUTranslator::VSUBUBM(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
+	const auto a = get_vr<u8[16]>(op.va);
+	const auto b = get_vr<u8[16]>(op.vb);
 	set_vr(op.vd, eval(a - b));
 }
 
 void PPUTranslator::VSUBUBS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u8[16]>(op.va, op.vb);
+	const auto a = get_vr<u8[16]>(op.va);
+	const auto b = get_vr<u8[16]>(op.vb);
 	const auto r = sub_sat(a, b);
 	set_vr(op.vd, r);
-	set_sat(r ^ (a - b));
+	SetSat(IsNotZero(eval(r != (a - b)).value));
 }
 
 void PPUTranslator::VSUBUHM(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
+	const auto a = get_vr<u16[8]>(op.va);
+	const auto b = get_vr<u16[8]>(op.vb);
 	set_vr(op.vd, eval(a - b));
 }
 
 void PPUTranslator::VSUBUHS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u16[8]>(op.va, op.vb);
+	const auto a = get_vr<u16[8]>(op.va);
+	const auto b = get_vr<u16[8]>(op.vb);
 	const auto r = sub_sat(a, b);
 	set_vr(op.vd, r);
-	set_sat(r ^ (a - b));
+	SetSat(IsNotZero(eval(r != (a - b)).value));
 }
 
 void PPUTranslator::VSUBUWM(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
+	const auto a = get_vr<u32[4]>(op.va);
+	const auto b = get_vr<u32[4]>(op.vb);
 	set_vr(op.vd, eval(a - b));
 }
 
 void PPUTranslator::VSUBUWS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
+	const auto a = get_vr<u32[4]>(op.va);
+	const auto b = get_vr<u32[4]>(op.vb);
 	const auto r = sub_sat(a, b);
 	set_vr(op.vd, r);
-	set_sat(r ^ (a - b));
+	SetSat(IsNotZero(eval(r != (a - b)).value));
 }
 
 void PPUTranslator::VSUMSWS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s32[4]>(op.va, op.vb);
-	const auto x = sext<s64[2]>(zshuffle(a, 0, 1));
-	const auto y = sext<s64[2]>(zshuffle(a, 2, 3));
-	const auto z = sext<s64[2]>(zshuffle(b, 0, 4));
-	const auto s = eval(x + y + z);
-	const auto r = min(max(zshuffle(s, 0, 2) + zshuffle(s, 1, 2), splat<s64[2]>(-0x8000'0000ll)), splat<s64[2]>(0x7fff'ffff));
-	set_vr(op.vd, zshuffle(bitcast<u32[4]>(r), 0, 4, 4, 4));
-	set_sat(bitcast<u64[2]>(r + 0x8000'0000) >> 32);
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	const auto a = SExt(ab[0]);
+	const auto b = SExt(m_ir->CreateExtractElement(ab[1], m_ir->getInt32(m_is_be ? 3 : 0)));
+	const auto e0 = m_ir->CreateExtractElement(a, m_ir->getInt32(0));
+	const auto e1 = m_ir->CreateExtractElement(a, m_ir->getInt32(1));
+	const auto e2 = m_ir->CreateExtractElement(a, m_ir->getInt32(2));
+	const auto e3 = m_ir->CreateExtractElement(a, m_ir->getInt32(3));
+	const auto saturated = SaturateSigned(Add({ b, e0, e1, e2, e3 }), -0x80000000ll, 0x7fffffff);
+	SetVr(op.vd, ZExt(m_ir->CreateAnd(saturated.first, 0xffffffff)));
+	SetSat(saturated.second);
 }
 
 void PPUTranslator::VSUM2SWS(ppu_opcode_t op)
 {
-	const auto [a, b] = get_vrs<s64[2]>(op.va, op.vb);
-	const auto x = a << 32 >> 32;
-	const auto y = a >> 32;
-	const auto z = b >> 32;
-	const auto r = min(max(x + y + z, splat<s64[2]>(-0x8000'0000ll)), splat<s64[2]>(0x7fff'ffff));
-	set_vr(op.vd, zshuffle(bitcast<u32[4]>(r), 0, 4, 2, 4));
-	set_sat(bitcast<u64[2]>(r + 0x8000'0000) >> 32);
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	const auto b = SExt(Shuffle(ab[1], nullptr, { 1, 3 }));
+	const auto a = SExt(ab[0]);
+	const auto e0 = Shuffle(a, nullptr, { 0, 2 });
+	const auto e1 = Shuffle(a, nullptr, { 1, 3 });
+	const auto saturated = SaturateSigned(Add({ b, e0, e1 }), -0x80000000ll, 0x7fffffff);
+	SetVr(op.vd, m_ir->CreateAnd(saturated.first, 0xffffffff));
+	SetSat(IsNotZero(saturated.second));
 }
 
 void PPUTranslator::VSUM4SBS(ppu_opcode_t op)
 {
-	const auto a = get_vr<s16[8]>(op.va);
-	const auto b = get_vr<s32[4]>(op.vb);
-	const auto x = eval(bitcast<s32[4]>((a << 8 >> 8) + (a >> 8)));
-	const auto s = eval((x << 16 >> 16) + (x >> 16));
-	const auto r = add_sat(s, b);
-	set_vr(op.vd, r);
-	set_sat(r ^ (s + b));
+	const auto a = SExt(GetVr(op.va, VrType::vi8), GetType<s32[16]>());
+	const auto b = GetVr(op.vb, VrType::vi32);
+	const auto e0 = Shuffle(a, nullptr, { 0, 4, 8, 12 });
+	const auto e1 = Shuffle(a, nullptr, { 1, 5, 9, 13 });
+	const auto e2 = Shuffle(a, nullptr, { 2, 6, 10, 14 });
+	const auto e3 = Shuffle(a, nullptr, { 3, 7, 11, 15 });
+	const auto result = m_ir->CreateAdd(SExt(b), SExt(Add({ e0, e1, e2, e3 }))); // Summ, (e0+e1+e2+e3) is small
+	const auto saturated = SaturateSigned(result, -0x80000000ll, 0x7fffffff);
+	SetVr(op.vd, saturated.first);
+	SetSat(IsNotZero(saturated.second));
 }
 
 void PPUTranslator::VSUM4SHS(ppu_opcode_t op)
 {
-	const auto a = get_vr<s32[4]>(op.va);
-	const auto b = get_vr<s32[4]>(op.vb);
-	const auto s = eval((a << 16 >> 16) + (a >> 16));
-	const auto r = add_sat(s, b);
-	set_vr(op.vd, r);
-	set_sat(r ^ (s + b));
+	const auto a = SExt(GetVr(op.va, VrType::vi16));
+	const auto b = GetVr(op.vb, VrType::vi32);
+	const auto e0 = Shuffle(a, nullptr, { 0, 2, 4, 6 });
+	const auto e1 = Shuffle(a, nullptr, { 1, 3, 5, 7 });
+	const auto result = m_ir->CreateAdd(SExt(b), SExt(Add({ e0, e1 }))); // Summ, (e0+e1) is small
+	const auto saturated = SaturateSigned(result, -0x80000000ll, 0x7fffffff);
+	SetVr(op.vd, saturated.first);
+	SetSat(IsNotZero(saturated.second));
 }
 
 void PPUTranslator::VSUM4UBS(ppu_opcode_t op)
 {
-	const auto a = get_vr<u16[8]>(op.va);
-	const auto b = get_vr<u32[4]>(op.vb);
-	const auto x = eval(bitcast<u32[4]>((a & 0xff) + (a >> 8)));
-	const auto s = eval((x & 0xffff) + (x >> 16));
-	const auto r = add_sat(s, b);
-	set_vr(op.vd, r);
-	set_sat(r ^ (s + b));
+	const auto a = ZExt(GetVr(op.va, VrType::vi8), GetType<u32[16]>());
+	const auto b = GetVr(op.vb, VrType::vi32);
+	const auto e0 = Shuffle(a, nullptr, { 0, 4, 8, 12 });
+	const auto e1 = Shuffle(a, nullptr, { 1, 5, 9, 13 });
+	const auto e2 = Shuffle(a, nullptr, { 2, 6, 10, 14 });
+	const auto e3 = Shuffle(a, nullptr, { 3, 7, 11, 15 });
+	const auto r = Add({ b, e0, e1, e2, e3 }); // Summ, (e0+e1+e2+e3) is small
+	const auto s = m_ir->CreateICmpULT(r, b); // Carry (saturation)
+	SetVr(op.vd, m_ir->CreateSelect(s, ConstantVector::getSplat({4, false}, m_ir->getInt32(0xffffffff)), r));
+	SetSat(IsNotZero(s));
 }
 
-#define UNPACK_PIXEL_OP(px) (px & 0xff00001f) | ((px << 6) & 0x1f0000) | ((px << 3) & 0x1f00)
+#define UNPACK_PIXEL_OP(px) m_ir->CreateOr(m_ir->CreateAnd(px, 0xff00001f), m_ir->CreateOr(m_ir->CreateAnd(m_ir->CreateShl(px, 6), 0x1f0000), m_ir->CreateAnd(m_ir->CreateShl(px, 3), 0x1f00)))
 
 void PPUTranslator::VUPKHPX(ppu_opcode_t op)
 {
-	// Caution: potentially out-of-lane algorithm
-	const auto px = sext<s32[4]>(zshuffle(get_vr<s16[8]>(op.vb), 4, 5, 6, 7));
-	set_vr(op.vd, UNPACK_PIXEL_OP(px));
+	const auto px = SExt(Shuffle(GetVr(op.vb, VrType::vi16), nullptr, { 0, 1, 2, 3 }));
+	SetVr(op.vd, UNPACK_PIXEL_OP(px));
 }
 
 void PPUTranslator::VUPKHSB(ppu_opcode_t op)
 {
-	// Caution: potentially out-of-lane algorithm
-	const auto r = sext<s16[8]>(zshuffle(get_vr<s8[16]>(op.vb), 8, 9, 10, 11, 12, 13, 14, 15));
-	set_vr(op.vd, r);
+	SetVr(op.vd, SExt(Shuffle(GetVr(op.vb, VrType::vi8), nullptr, { 0, 1, 2, 3, 4, 5, 6, 7 })));
 }
 
 void PPUTranslator::VUPKHSH(ppu_opcode_t op)
 {
-	// Caution: potentially out-of-lane algorithm
-	const auto r = sext<s32[4]>(zshuffle(get_vr<s16[8]>(op.vb), 4, 5, 6, 7));
-	set_vr(op.vd, r);
+	SetVr(op.vd, SExt(Shuffle(GetVr(op.vb, VrType::vi16), nullptr, { 0, 1, 2, 3 })));
 }
 
 void PPUTranslator::VUPKLPX(ppu_opcode_t op)
 {
-	// Caution: potentially out-of-lane algorithm
-	const auto px = sext<s32[4]>(zshuffle(get_vr<s16[8]>(op.vb), 0, 1, 2, 3));
-	set_vr(op.vd, UNPACK_PIXEL_OP(px));
+	const auto px = SExt(Shuffle(GetVr(op.vb, VrType::vi16), nullptr, { 4, 5, 6, 7 }));
+	SetVr(op.vd, UNPACK_PIXEL_OP(px));
 }
 
 void PPUTranslator::VUPKLSB(ppu_opcode_t op)
 {
-	// Caution: potentially out-of-lane algorithm
-	const auto r = sext<s16[8]>(zshuffle(get_vr<s8[16]>(op.vb), 0, 1, 2, 3, 4, 5, 6, 7));
-	set_vr(op.vd, r);
+	SetVr(op.vd, SExt(Shuffle(GetVr(op.vb, VrType::vi8), nullptr, { 8, 9, 10, 11, 12, 13, 14, 15 })));
 }
 
 void PPUTranslator::VUPKLSH(ppu_opcode_t op)
 {
-	// Caution: potentially out-of-lane algorithm
-	const auto r = sext<s32[4]>(zshuffle(get_vr<s16[8]>(op.vb), 0, 1, 2, 3));
-	set_vr(op.vd, r);
+	SetVr(op.vd, SExt(Shuffle(GetVr(op.vb, VrType::vi16), nullptr, { 4, 5, 6, 7 })));
 }
 
 void PPUTranslator::VXOR(ppu_opcode_t op)
@@ -2143,12 +1892,12 @@ void PPUTranslator::VXOR(ppu_opcode_t op)
 	if (op.va == op.vb)
 	{
 		// Assign zero, break dependencies
-		set_vr(op.vd, splat<u32[4]>(0));
+		SetVr(op.vd, ConstantAggregateZero::get(GetType<u32[4]>()));
 		return;
 	}
 
-	const auto [a, b] = get_vrs<u32[4]>(op.va, op.vb);
-	set_vr(op.vd, a ^ b);
+	const auto ab = GetVrs(VrType::vi32, op.va, op.vb);
+	SetVr(op.vd, m_ir->CreateXor(ab[0], ab[1]));
 }
 
 void PPUTranslator::TDI(ppu_opcode_t op)
@@ -2242,7 +1991,7 @@ void PPUTranslator::BC(ppu_opcode_t op)
 
 	if (op.lk)
 	{
-		m_ir->CreateStore(GetAddr(+4), m_ir->CreateStructGEP(m_thread_type, m_thread, static_cast<uint>(&m_lr - m_locals)));
+		m_ir->CreateStore(GetAddr(+4), m_ir->CreateStructGEP(nullptr, m_thread, static_cast<uint>(&m_lr - m_locals)));
 	}
 
 	UseCondition(CheckBranchProbability(op.bo), CheckBranchCondition(op.bo, op.bi));
@@ -2268,15 +2017,13 @@ void PPUTranslator::SC(ppu_opcode_t op)
 
 		if (index < 1024)
 		{
-			Call(GetType<void>(), fmt::format("%s", ppu_syscall_code(index)), m_thread);
-			//Call(GetType<void>(), "__escape", m_thread)->setTailCall();
+			Call(GetType<void>(), fmt::format("%s", ppu_syscall_code(index)), m_thread)->setTailCallKind(llvm::CallInst::TCK_Tail);
 			m_ir->CreateRetVoid();
 			return;
 		}
 	}
 
-	Call(GetType<void>(), op.lev ? "__lv1call" : "__syscall", m_thread, num);
-	//Call(GetType<void>(), "__escape", m_thread)->setTailCall();
+	Call(GetType<void>(), op.lev ? "__lv1call" : "__syscall", m_thread, num)->setTailCallKind(llvm::CallInst::TCK_Tail);
 	m_ir->CreateRetVoid();
 }
 
@@ -2314,7 +2061,7 @@ void PPUTranslator::BCLR(ppu_opcode_t op)
 
 	if (op.lk)
 	{
-		m_ir->CreateStore(GetAddr(+4), m_ir->CreateStructGEP(m_thread_type, m_thread, static_cast<uint>(&m_lr - m_locals)));
+		m_ir->CreateStore(GetAddr(+4), m_ir->CreateStructGEP(nullptr, m_thread, static_cast<uint>(&m_lr - m_locals)));
 	}
 
 	UseCondition(CheckBranchProbability(op.bo), CheckBranchCondition(op.bo, op.bi));
@@ -2377,7 +2124,7 @@ void PPUTranslator::BCCTR(ppu_opcode_t op)
 
 	if (op.lk)
 	{
-		m_ir->CreateStore(GetAddr(+4), m_ir->CreateStructGEP(m_thread_type, m_thread, static_cast<uint>(&m_lr - m_locals)));
+		m_ir->CreateStore(GetAddr(+4), m_ir->CreateStructGEP(nullptr, m_thread, static_cast<uint>(&m_lr - m_locals)));
 	}
 
 	UseCondition(CheckBranchProbability(op.bo | 0x4), CheckBranchCondition(op.bo | 0x4, op.bi));
@@ -2724,8 +2471,11 @@ void PPUTranslator::TW(ppu_opcode_t op)
 
 void PPUTranslator::LVSL(ppu_opcode_t op)
 {
-	const auto addr = value<u64>(op.ra ? m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb)) : GetGpr(op.rb));
-	set_vr(op.vd, build<u8[16]>(15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) + vsplat<u8[16]>(trunc<u8>(addr & 0xf)));
+	const auto addr = op.ra ? m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb)) : GetGpr(op.rb);
+	//const auto _add = m_ir->CreateInsertElement(ConstantVector::getSplat(16, m_ir->getInt8(0)), Trunc(m_ir->CreateAnd(addr, 0xf), GetType<u8>()), m_ir->getInt32(0));
+	//const auto base = ConstantDataVector::get(m_context, std::vector<u8>{15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0});
+	//SetVr(op.vd, m_ir->CreateAdd(base, Shuffle(_add, nullptr, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})));
+	SetVr(op.vd, Call(GetType<u8[16]>(), m_pure_attr, "__lvsl", addr));
 }
 
 void PPUTranslator::LVEBX(ppu_opcode_t op)
@@ -2741,7 +2491,7 @@ void PPUTranslator::SUBFC(ppu_opcode_t op)
 	SetGpr(op.rd, result);
 	SetCarry(m_ir->CreateICmpULE(result, b));
 	if (op.rc) SetCrFieldSignedCmp(0, result, m_ir->getInt64(0));
-	if (op.oe) UNK(op);
+	if (op.oe) SetOverflow(Call(GetType<bool>(), m_pure_attr, "__subfc_get_ov", a, b));
 }
 
 void PPUTranslator::ADDC(ppu_opcode_t op)
@@ -2752,13 +2502,7 @@ void PPUTranslator::ADDC(ppu_opcode_t op)
 	SetGpr(op.rd, result);
 	SetCarry(m_ir->CreateICmpULT(result, b));
 	if (op.rc) SetCrFieldSignedCmp(0, result, m_ir->getInt64(0));
-
-	if (op.oe)
-	{
-		//const auto s = m_ir->CreateCall(get_intrinsic<u64>(llvm::Intrinsic::sadd_with_overflow), {a, b});
-		//SetOverflow(m_ir->CreateExtractValue(s, {1}));
-		SetOverflow(m_ir->CreateICmpSLT(m_ir->CreateAnd(m_ir->CreateXor(a, m_ir->CreateNot(b)), m_ir->CreateXor(a, result)), m_ir->getInt64(0)));
-	}
+	if (op.oe) SetOverflow(Call(GetType<bool>(), m_pure_attr, "__addc_get_ov", a, b));
 }
 
 void PPUTranslator::MULHDU(ppu_opcode_t op)
@@ -2783,7 +2527,8 @@ void PPUTranslator::MFOCRF(ppu_opcode_t op)
 	if (op.l11)
 	{
 		// MFOCRF
-		const u64 pos = countl_zero<u32>(op.crm) - 24;
+
+		const u64 pos = countLeadingZeros<u32>(op.crm, ZB_Width) - 24;
 
 		if (pos >= 8 || 0x80u >> pos != op.crm)
 		{
@@ -2794,19 +2539,19 @@ void PPUTranslator::MFOCRF(ppu_opcode_t op)
 	else if (std::none_of(m_cr + 0, m_cr + 32, [](auto* p) { return p; }))
 	{
 		// MFCR (optimized)
-		Value* ln0 = m_ir->CreateIntToPtr(m_ir->CreatePtrToInt(m_ir->CreateStructGEP(m_thread_type, m_thread, 99), GetType<uptr>()), m_ir->getPtrTy());
-		Value* ln1 = m_ir->CreateIntToPtr(m_ir->CreatePtrToInt(m_ir->CreateStructGEP(m_thread_type, m_thread, 115), GetType<uptr>()), m_ir->getPtrTy());
+		Value* ln0 = m_ir->CreateIntToPtr(m_ir->CreatePtrToInt(m_ir->CreateStructGEP(nullptr, m_thread, 99), GetType<uptr>()), GetType<u8[16]>()->getPointerTo());
+		Value* ln1 = m_ir->CreateIntToPtr(m_ir->CreatePtrToInt(m_ir->CreateStructGEP(nullptr, m_thread, 115), GetType<uptr>()), GetType<u8[16]>()->getPointerTo());
 
-		ln0 = m_ir->CreateLoad(GetType<u8[16]>(), ln0);
-		ln1 = m_ir->CreateLoad(GetType<u8[16]>(), ln1);
+		ln0 = m_ir->CreateLoad(ln0);
+		ln1 = m_ir->CreateLoad(ln1);
 		if (!m_is_be)
 		{
 			ln0 = Shuffle(ln0, nullptr, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0});
 			ln1 = Shuffle(ln1, nullptr, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0});
 		}
 
-		const auto m0 = ZExt(bitcast<u16>(Trunc(ln0, GetType<bool[16]>())));
-		const auto m1 = ZExt(bitcast<u16>(Trunc(ln1, GetType<bool[16]>())));
+		const auto m0 = Call(GetType<u32>(), m_pure_attr, "llvm.x86.sse2.pmovmskb.128", m_ir->CreateShl(ln0, 7));
+		const auto m1 = Call(GetType<u32>(), m_pure_attr, "llvm.x86.sse2.pmovmskb.128", m_ir->CreateShl(ln1, 7));
 		SetGpr(op.rd, m_ir->CreateOr(m_ir->CreateShl(m0, 16), m1));
 		return;
 	}
@@ -2833,8 +2578,7 @@ void PPUTranslator::LWARX(ppu_opcode_t op)
 	{
 		RegStore(Trunc(GetAddr()), m_cia);
 		FlushRegisters();
-		Call(GetType<void>(), "__resinterp", m_thread);
-		//Call(GetType<void>(), "__escape", m_thread)->setTailCall();
+		Call(GetType<void>(), "__resinterp", m_thread)->setTailCallKind(llvm::CallInst::TCK_Tail);
 		m_ir->CreateRetVoid();
 		return;
 	}
@@ -2849,7 +2593,6 @@ void PPUTranslator::LDX(ppu_opcode_t op)
 
 void PPUTranslator::LWZX(ppu_opcode_t op)
 {
-	m_may_be_mmio &= (op.ra != 1u && op.ra != 13u && op.rb != 1u && op.rb != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculation
 	SetGpr(op.rd, ReadMemory(op.ra ? m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb)) : GetGpr(op.rb), GetType<u32>()));
 }
 
@@ -2892,8 +2635,11 @@ void PPUTranslator::CMPL(ppu_opcode_t op)
 
 void PPUTranslator::LVSR(ppu_opcode_t op)
 {
-	const auto addr = value<u64>(op.ra ? m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb)) : GetGpr(op.rb));
-	set_vr(op.vd, build<u8[16]>(31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16) - vsplat<u8[16]>(trunc<u8>(addr & 0xf)));
+	const auto addr = op.ra ? m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb)) : GetGpr(op.rb);
+	//const auto _add = m_ir->CreateInsertElement(ConstantVector::getSplat(16, m_ir->getInt8(0)), Trunc(m_ir->CreateAnd(addr, 0xf), GetType<u8>()), m_ir->getInt32(0));
+	//const auto base = ConstantDataVector::get(m_context, std::vector<u8>{31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16});
+	//SetVr(op.vd, m_ir->CreateSub(base, Shuffle(_add, nullptr, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})));
+	SetVr(op.vd, Call(GetType<u8[16]>(), m_pure_attr, "__lvsr", addr));
 }
 
 void PPUTranslator::LVEHX(ppu_opcode_t op)
@@ -2908,13 +2654,7 @@ void PPUTranslator::SUBF(ppu_opcode_t op)
 	const auto result = m_ir->CreateSub(b, a);
 	SetGpr(op.rd, result);
 	if (op.rc) SetCrFieldSignedCmp(0, result, m_ir->getInt64(0));
-
-	if (op.oe)
-	{
-		//const auto s = m_ir->CreateCall(get_intrinsic<u64>(llvm::Intrinsic::ssub_with_overflow), {b, m_ir->CreateNot(a)});
-		//SetOverflow(m_ir->CreateExtractValue(s, {1}));
-		SetOverflow(m_ir->CreateICmpSLT(m_ir->CreateAnd(m_ir->CreateXor(a, b), m_ir->CreateXor(m_ir->CreateNot(a), result)), m_ir->getInt64(0)));
-	}
+	if (op.oe) SetOverflow(Call(GetType<bool>(), m_pure_attr, "__subf_get_ov", a, b));
 }
 
 void PPUTranslator::LDUX(ppu_opcode_t op)
@@ -2930,8 +2670,6 @@ void PPUTranslator::DCBST(ppu_opcode_t)
 
 void PPUTranslator::LWZUX(ppu_opcode_t op)
 {
-	m_may_be_mmio &= (op.ra != 1u && op.ra != 13u && op.rb != 1u && op.rb != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculation
-
 	const auto addr = m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb));
 	SetGpr(op.rd, ReadMemory(addr, GetType<u32>()));
 	SetGpr(op.ra, addr);
@@ -2985,8 +2723,7 @@ void PPUTranslator::LDARX(ppu_opcode_t op)
 	{
 		RegStore(Trunc(GetAddr()), m_cia);
 		FlushRegisters();
-		Call(GetType<void>(), "__resinterp", m_thread);
-		//Call(GetType<void>(), "__escape", m_thread)->setTailCall();
+		Call(GetType<void>(), "__resinterp", m_thread)->setTailCallKind(llvm::CallInst::TCK_Tail);
 		m_ir->CreateRetVoid();
 		return;
 	}
@@ -3016,7 +2753,7 @@ void PPUTranslator::NEG(ppu_opcode_t op)
 	const auto result = m_ir->CreateNeg(reg);
 	SetGpr(op.rd, result);
 	if (op.rc) SetCrFieldSignedCmp(0, result, m_ir->getInt64(0));
-	if (op.oe) SetOverflow(m_ir->CreateICmpEQ(result, m_ir->getInt64(1ull << 63)));
+	if (op.oe) SetOverflow(Call(GetType<bool>(), m_pure_attr, "__neg_get_ov", reg));
 }
 
 void PPUTranslator::LBZUX(ppu_opcode_t op)
@@ -3049,7 +2786,7 @@ void PPUTranslator::SUBFE(ppu_opcode_t op)
 	SetGpr(op.rd, r2);
 	SetCarry(m_ir->CreateOr(m_ir->CreateICmpULT(r1, a), m_ir->CreateICmpULT(r2, r1)));
 	if (op.rc) SetCrFieldSignedCmp(0, r2, m_ir->getInt64(0));
-	if (op.oe) UNK(op);
+	if (op.oe) SetOverflow(Call(GetType<bool>(), m_pure_attr, "__subfe_get_ov", a, b, c));
 }
 
 void PPUTranslator::ADDE(ppu_opcode_t op)
@@ -3062,7 +2799,7 @@ void PPUTranslator::ADDE(ppu_opcode_t op)
 	SetGpr(op.rd, r2);
 	SetCarry(m_ir->CreateOr(m_ir->CreateICmpULT(r1, a), m_ir->CreateICmpULT(r2, r1)));
 	if (op.rc) SetCrFieldSignedCmp(0, r2, m_ir->getInt64(0));
-	if (op.oe) UNK(op);
+	if (op.oe) SetOverflow(Call(GetType<bool>(), m_pure_attr, "__adde_get_ov", a, b, c));
 }
 
 void PPUTranslator::MTOCRF(ppu_opcode_t op)
@@ -3070,7 +2807,7 @@ void PPUTranslator::MTOCRF(ppu_opcode_t op)
 	if (op.l11)
 	{
 		// MTOCRF
-		const u64 pos = countl_zero<u32>(op.crm) - 24;
+		const u64 pos = countLeadingZeros<u32>(op.crm, ZB_Width) - 24;
 
 		if (pos >= 8 || 0x80u >> pos != op.crm)
 		{
@@ -3118,9 +2855,9 @@ void PPUTranslator::MTOCRF(ppu_opcode_t op)
 			std::fill_n(m_g_cr + i * 4, 4, nullptr);
 
 			const auto index = m_ir->CreateAnd(m_ir->CreateLShr(value, 28 - i * 4), 15);
-			const auto src = m_ir->CreateGEP(m_mtocr_table->getValueType(), m_mtocr_table, {m_ir->getInt32(0), m_ir->CreateShl(index, 2)});
-			const auto dst = m_ir->CreateStructGEP(m_thread_type, m_thread, static_cast<uint>(m_cr - m_locals) + i * 4);
-			Call(GetType<void>(), "llvm.memcpy.p0.p0.i32", dst, src, m_ir->getInt32(4), m_ir->getFalse());
+			const auto src = m_ir->CreateGEP(m_mtocr_table, {m_ir->getInt32(0), m_ir->CreateShl(index, 2)});
+			const auto dst = bitcast(m_ir->CreateStructGEP(nullptr, m_thread, static_cast<uint>(m_cr - m_locals) + i * 4), GetType<u8*>());
+			Call(GetType<void>(), "llvm.memcpy.p0i8.p0i8.i32", dst, src, m_ir->getInt32(4), m_ir->getFalse());
 		}
 	}
 }
@@ -3138,7 +2875,6 @@ void PPUTranslator::STWCX(ppu_opcode_t op)
 
 void PPUTranslator::STWX(ppu_opcode_t op)
 {
-	m_may_be_mmio &= (op.ra != 1u && op.ra != 13u && op.rb != 1u && op.rb != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculation
 	WriteMemory(op.ra ? m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb)) : GetGpr(op.rb), GetGpr(op.rs, 32));
 }
 
@@ -3158,7 +2894,6 @@ void PPUTranslator::STDUX(ppu_opcode_t op)
 void PPUTranslator::STWUX(ppu_opcode_t op)
 {
 	const auto addr = m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb));
-	m_may_be_mmio &= (op.ra != 1u && op.ra != 13u && op.rb != 1u && op.rb != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculation
 	WriteMemory(addr, GetGpr(op.rs, 32));
 	SetGpr(op.ra, addr);
 }
@@ -3177,7 +2912,7 @@ void PPUTranslator::ADDZE(ppu_opcode_t op)
 	SetGpr(op.rd, result);
 	SetCarry(m_ir->CreateICmpULT(result, a));
 	if (op.rc) SetCrFieldSignedCmp(0, result, m_ir->getInt64(0));
-	if (op.oe) UNK(op);
+	if (op.oe) SetOverflow(Call(GetType<bool>(), m_pure_attr, "__addze_get_ov", a, c));
 }
 
 void PPUTranslator::SUBFZE(ppu_opcode_t op)
@@ -3188,7 +2923,7 @@ void PPUTranslator::SUBFZE(ppu_opcode_t op)
 	SetGpr(op.rd, result);
 	SetCarry(m_ir->CreateICmpULT(result, a));
 	if (op.rc) SetCrFieldSignedCmp(0, result, m_ir->getInt64(0));
-	if (op.oe) UNK(op);
+	if (op.oe) SetOverflow(Call(GetType<bool>(), m_pure_attr, "__subfze_get_ov", a, c));
 }
 
 void PPUTranslator::STDCX(ppu_opcode_t op)
@@ -3217,7 +2952,7 @@ void PPUTranslator::SUBFME(ppu_opcode_t op)
 	SetGpr(op.rd, result);
 	SetCarry(m_ir->CreateOr(c, IsNotZero(a)));
 	if (op.rc) SetCrFieldSignedCmp(0, result, m_ir->getInt64(0));
-	if (op.oe) UNK(op);
+	if (op.oe) SetOverflow(Call(GetType<bool>(), m_pure_attr, "__subfme_get_ov", a, c));
 }
 
 void PPUTranslator::MULLD(ppu_opcode_t op)
@@ -3227,7 +2962,7 @@ void PPUTranslator::MULLD(ppu_opcode_t op)
 	const auto result = m_ir->CreateMul(a, b);
 	SetGpr(op.rd, result);
 	if (op.rc) SetCrFieldSignedCmp(0, result, m_ir->getInt64(0));
-	if (op.oe) UNK(op);
+	if (op.oe) SetOverflow(Call(GetType<bool>(), m_pure_attr, "__mulld_get_ov", a, b));
 }
 
 void PPUTranslator::ADDME(ppu_opcode_t op)
@@ -3238,7 +2973,7 @@ void PPUTranslator::ADDME(ppu_opcode_t op)
 	SetGpr(op.rd, result);
 	SetCarry(m_ir->CreateOr(c, IsNotZero(a)));
 	if (op.rc) SetCrFieldSignedCmp(0, result, m_ir->getInt64(0));
-	if (op.oe) UNK(op);
+	if (op.oe) SetOverflow(Call(GetType<bool>(), m_pure_attr, "__addme_get_ov", a, c));
 }
 
 void PPUTranslator::MULLW(ppu_opcode_t op)
@@ -3248,7 +2983,7 @@ void PPUTranslator::MULLW(ppu_opcode_t op)
 	const auto result = m_ir->CreateMul(a, b);
 	SetGpr(op.rd, result);
 	if (op.rc) SetCrFieldSignedCmp(0, result, m_ir->getInt64(0));
-	if (op.oe) UNK(op);
+	if (op.oe) SetOverflow(Call(GetType<bool>(), m_pure_attr, "__mullw_get_ov", a, b));
 }
 
 void PPUTranslator::DCBTST(ppu_opcode_t)
@@ -3521,8 +3256,7 @@ void PPUTranslator::DIVW(ppu_opcode_t op)
 void PPUTranslator::LVLX(ppu_opcode_t op)
 {
 	const auto addr = op.ra ? m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb)) : GetGpr(op.rb);
-	const auto data = ReadMemory(m_ir->CreateAnd(addr, ~0xfull), GetType<u8[16]>(), m_is_be, 16);
-	set_vr(op.vd, pshufb(value<u8[16]>(data), build<u8[16]>(127, 126, 125, 124, 123, 122, 121, 120, 119, 118, 117, 116, 115, 114, 113, 112) + vsplat<u8[16]>(trunc<u8>(value<u64>(addr) & 0xf))));
+	SetVr(op.vd, Call(GetType<u8[16]>(), "__lvlx", addr));
 }
 
 void PPUTranslator::LDBRX(ppu_opcode_t op)
@@ -3542,7 +3276,6 @@ void PPUTranslator::LWBRX(ppu_opcode_t op)
 
 void PPUTranslator::LFSX(ppu_opcode_t op)
 {
-	m_may_be_mmio &= (op.ra != 1u && op.ra != 13u && op.rb != 1u && op.rb != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculation
 	SetFpr(op.frd, ReadMemory(op.ra ? m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb)) : GetGpr(op.rb), GetType<f32>()));
 }
 
@@ -3567,11 +3300,7 @@ void PPUTranslator::SRD(ppu_opcode_t op)
 void PPUTranslator::LVRX(ppu_opcode_t op)
 {
 	const auto addr = op.ra ? m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb)) : GetGpr(op.rb);
-	const auto offset = eval(trunc<u8>(value<u64>(addr) & 0xf));
-
-	// Read from instruction address if offset is 0, this prevents accessing potentially bad memory from addr (because no actual memory is dereferenced)
-	const auto data = ReadMemory(m_ir->CreateAnd(m_ir->CreateSelect(m_ir->CreateIsNull(offset.value), m_reloc ? m_seg0 : GetAddr(0), addr), ~0xfull), GetType<u8[16]>(), m_is_be, 16);
-	set_vr(op.vd, pshufb(value<u8[16]>(data), build<u8[16]>(255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240) + vsplat<u8[16]>(offset)));
+	SetVr(op.vd, Call(GetType<u8[16]>(), "__lvrx", addr));
 }
 
 void PPUTranslator::LSWI(ppu_opcode_t op)
@@ -3626,8 +3355,8 @@ void PPUTranslator::LFSUX(ppu_opcode_t op)
 void PPUTranslator::SYNC(ppu_opcode_t op)
 {
 	// sync: Full seq cst barrier
-	// lwsync: Acq/Release barrier (but not really it seems from observing libsre.sprx)
-	m_ir->CreateFence(op.l10 && false ? AtomicOrdering::AcquireRelease : AtomicOrdering::SequentiallyConsistent);
+	// lwsync: Acq/Release barrier
+	m_ir->CreateFence(op.l10 ? AtomicOrdering::AcquireRelease : AtomicOrdering::SequentiallyConsistent);
 }
 
 void PPUTranslator::LFDX(ppu_opcode_t op)
@@ -3644,12 +3373,7 @@ void PPUTranslator::LFDUX(ppu_opcode_t op)
 
 void PPUTranslator::STVLX(ppu_opcode_t op)
 {
-	const auto addr = op.ra ? m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb)) : GetGpr(op.rb);
-	const auto data = pshufb(get_vr<u8[16]>(op.vs), build<u8[16]>(127, 126, 125, 124, 123, 122, 121, 120, 119, 118, 117, 116, 115, 114, 113, 112) + vsplat<u8[16]>(trunc<u8>(value<u64>(addr) & 0xf)));
-	const auto mask = bitcast<bool[16]>(splat<u16>(0xffff) << trunc<u16>(value<u64>(addr) & 0xf));
-	const auto ptr = value<u8(*)[16]>(GetMemory(m_ir->CreateAnd(addr, ~0xfull)));
-	const auto align = splat<u32>(16);
-	eval(llvm_calli<void, decltype(data), decltype(ptr), decltype(align), decltype(mask)>{"llvm.masked.store.v16i8.p0", {data, ptr, align, mask}});
+	Call(GetType<void>(), "__stvlx", op.ra ? m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb)) : GetGpr(op.rb), GetVr(op.vs, VrType::vi8));
 }
 
 void PPUTranslator::STDBRX(ppu_opcode_t op)
@@ -3674,12 +3398,7 @@ void PPUTranslator::STFSX(ppu_opcode_t op)
 
 void PPUTranslator::STVRX(ppu_opcode_t op)
 {
-	const auto addr = op.ra ? m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb)) : GetGpr(op.rb);
-	const auto data = pshufb(get_vr<u8[16]>(op.vs), build<u8[16]>(255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240) + vsplat<u8[16]>(trunc<u8>(value<u64>(addr) & 0xf)));
-	const auto mask = bitcast<bool[16]>(trunc<u16>(splat<u64>(0xffff) << (value<u64>(addr) & 0xf) >> 16));
-	const auto ptr = value<u8(*)[16]>(GetMemory(m_ir->CreateAnd(addr, ~0xfull)));
-	const auto align = splat<u32>(16);
-	eval(llvm_calli<void, decltype(data), decltype(ptr), decltype(align), decltype(mask)>{"llvm.masked.store.v16i8.p0", {data, ptr, align, mask}});
+	Call(GetType<void>(), "__stvrx", op.ra ? m_ir->CreateAdd(GetGpr(op.ra), GetGpr(op.rb)) : GetGpr(op.rb), GetVr(op.vs, VrType::vi8));
 }
 
 void PPUTranslator::STFSUX(ppu_opcode_t op)
@@ -3860,7 +3579,7 @@ void PPUTranslator::DCBZ(ppu_opcode_t op)
 	}
 	else
 	{
-		Call(GetType<void>(), "llvm.memset.p0.i32", GetMemory(addr), m_ir->getInt8(0), m_ir->getInt32(128), m_ir->getFalse());
+		Call(GetType<void>(), "llvm.memset.p0i8.i32", GetMemory(addr, GetType<u8>()), m_ir->getInt8(0), m_ir->getInt32(128), m_ir->getTrue());
 	}
 }
 
@@ -3874,50 +3593,6 @@ void PPUTranslator::LWZ(ppu_opcode_t op)
 		m_rel = nullptr;
 	}
 
-	m_may_be_mmio &= (op.ra != 1u && op.ra != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculation
-	m_may_be_mmio &= op.simm16 == 0 || spu_thread::test_is_problem_state_register_offset(op.uimm16, true, false); // Either exact MMIO address or MMIO base with completing s16 address offset
-
-	if (m_may_be_mmio)
-	{
-		struct instructions_data
-		{
-			be_t<u32> insts[3];
-		};
-
-		// Quick invalidation: expect exact MMIO address, so if the register is being reused with different offset than it's likely not MMIO
-		if (auto ptr = m_info.get_ptr<instructions_data>(::narrow<u32>(m_addr + 4 + (m_reloc ? m_reloc->addr : 0))))
-		{
-			for (u32 inst : ptr->insts)
-			{
-				ppu_opcode_t test_op{inst};
-
-				if (test_op.simm16 == op.simm16 || test_op.ra != op.ra)
-				{
-					// Same offset (at least according to this test) or different register
-					continue;
-				}
-
-				if (op.simm16 && spu_thread::test_is_problem_state_register_offset(test_op.uimm16, true, false))
-				{
-					// Found register reuse with different MMIO offset
-					continue;
-				}
-
-				switch (g_ppu_itype.decode(inst))
-				{
-				case ppu_itype::LWZ:
-				case ppu_itype::STW:
-				{
-					// Not MMIO
-					m_may_be_mmio = false;
-					break;
-				}
-				default: break;
-				}
-			}
-		}
-	}
-
 	SetGpr(op.rd, ReadMemory(op.ra ? m_ir->CreateAdd(GetGpr(op.ra), imm) : imm, GetType<u32>()));
 }
 
@@ -3931,9 +3606,6 @@ void PPUTranslator::LWZU(ppu_opcode_t op)
 		m_rel = nullptr;
 	}
 
-	m_may_be_mmio &= (op.ra != 1u && op.ra != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculation
-	m_may_be_mmio &= op.simm16 == 0 || spu_thread::test_is_problem_state_register_offset(op.uimm16, true, false); // Either exact MMIO address or MMIO base with completing s16 address offset
-
 	const auto addr = m_ir->CreateAdd(GetGpr(op.ra), imm);
 	SetGpr(op.rd, ReadMemory(addr, GetType<u32>()));
 	SetGpr(op.ra, addr);
@@ -3977,50 +3649,6 @@ void PPUTranslator::STW(ppu_opcode_t op)
 		m_rel = nullptr;
 	}
 
-	m_may_be_mmio &= (op.ra != 1u && op.ra != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculation
-	m_may_be_mmio &= op.simm16 == 0 || spu_thread::test_is_problem_state_register_offset(op.uimm16, false, true); // Either exact MMIO address or MMIO base with completing s16 address offset
-
-	if (m_may_be_mmio)
-	{
-		struct instructions_data
-		{
-			be_t<u32> insts[3];
-		};
-
-		// Quick invalidation: expect exact MMIO address, so if the register is being reused with different offset than it's likely not MMIO
-		if (auto ptr = m_info.get_ptr<instructions_data>(::narrow<u32>(m_addr + 4 + (m_reloc ? m_reloc->addr : 0))))
-		{
-			for (u32 inst : ptr->insts)
-			{
-				ppu_opcode_t test_op{inst};
-
-				if (test_op.simm16 == op.simm16 || test_op.ra != op.ra)
-				{
-					// Same offset (at least according to this test) or different register
-					continue;
-				}
-
-				if (op.simm16 && spu_thread::test_is_problem_state_register_offset(test_op.uimm16, false, true))
-				{
-					// Found register reuse with different MMIO offset
-					continue;
-				}
-
-				switch (g_ppu_itype.decode(inst))
-				{
-				case ppu_itype::LWZ:
-				case ppu_itype::STW:
-				{
-					// Not MMIO
-					m_may_be_mmio = false;
-					break;
-				}
-				default: break;
-				}
-			}
-		}
-	}
-
 	const auto value = GetGpr(op.rs, 32);
 	const auto addr = op.ra ? m_ir->CreateAdd(GetGpr(op.ra), imm) : imm;
 	WriteMemory(addr, value);
@@ -4045,9 +3673,6 @@ void PPUTranslator::STWU(ppu_opcode_t op)
 		m_rel = nullptr;
 	}
 
-	m_may_be_mmio &= (op.ra != 1u && op.ra != 13u);// Stack register and TLS address register are unlikely to be used in MMIO address calculatio
-	m_may_be_mmio &= op.simm16 == 0 || spu_thread::test_is_problem_state_register_offset(op.uimm16, false, true); // Either exact MMIO address or MMIO base with completing s16 address offset
-
 	const auto addr = m_ir->CreateAdd(GetGpr(op.ra), imm);
 	WriteMemory(addr, GetGpr(op.rs, 32));
 	SetGpr(op.ra, addr);
@@ -4167,8 +3792,6 @@ void PPUTranslator::STHU(ppu_opcode_t op)
 
 void PPUTranslator::LMW(ppu_opcode_t op)
 {
-	m_may_be_mmio &= op.rd == 31u && (op.ra != 1u && op.ra != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculatio
-
 	for (u32 i = 0; i < 32 - op.rd; i++)
 	{
 		SetGpr(i + op.rd, ReadMemory(op.ra ? m_ir->CreateAdd(m_ir->getInt64(op.simm16 + i * 4), GetGpr(op.ra)) : m_ir->getInt64(op.simm16 + i * 4), GetType<u32>()));
@@ -4177,8 +3800,6 @@ void PPUTranslator::LMW(ppu_opcode_t op)
 
 void PPUTranslator::STMW(ppu_opcode_t op)
 {
-	m_may_be_mmio &= op.rs == 31u && (op.ra != 1u && op.ra != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculatio
-
 	for (u32 i = 0; i < 32 - op.rs; i++)
 	{
 		WriteMemory(op.ra ? m_ir->CreateAdd(m_ir->getInt64(op.simm16 + i * 4), GetGpr(op.ra)) : m_ir->getInt64(op.simm16 + i * 4), GetGpr(i + op.rs, 32));
@@ -4195,9 +3816,6 @@ void PPUTranslator::LFS(ppu_opcode_t op)
 		m_rel = nullptr;
 	}
 
-	m_may_be_mmio &= (op.ra != 1u && op.ra != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculatio
-	m_may_be_mmio &= op.simm16 == 0 || spu_thread::test_is_problem_state_register_offset(op.uimm16, true, false); // Either exact MMIO address or MMIO base with completing s16 address offset
-
 	SetFpr(op.frd, ReadMemory(op.ra ? m_ir->CreateAdd(GetGpr(op.ra), imm) : imm, GetType<f32>()));
 }
 
@@ -4211,9 +3829,6 @@ void PPUTranslator::LFSU(ppu_opcode_t op)
 		m_rel = nullptr;
 	}
 
-	m_may_be_mmio &= (op.ra != 1u && op.ra != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculatio
-	m_may_be_mmio &= op.simm16 == 0 || spu_thread::test_is_problem_state_register_offset(op.uimm16, true, false); // Either exact MMIO address or MMIO base with completing s16 address offset
-
 	const auto addr = m_ir->CreateAdd(GetGpr(op.ra), imm);
 	SetFpr(op.frd, ReadMemory(addr, GetType<f32>()));
 	SetGpr(op.ra, addr);
@@ -4256,12 +3871,7 @@ void PPUTranslator::STFS(ppu_opcode_t op)
 		imm = SExt(ReadMemory(GetAddr(+2), GetType<u16>()), GetType<u64>());
 		m_rel = nullptr;
 	}
-	else
-	{
-		m_may_be_mmio &= op.simm16 == 0 || spu_thread::test_is_problem_state_register_offset(op.uimm16, false, true); // Either exact MMIO address or MMIO base with completing s16 address offset
-	}
 
-	m_may_be_mmio &= (op.ra != 1u && op.ra != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculation
 	WriteMemory(op.ra ? m_ir->CreateAdd(GetGpr(op.ra), imm) : imm, GetFpr(op.frs, 32));
 }
 
@@ -4274,12 +3884,6 @@ void PPUTranslator::STFSU(ppu_opcode_t op)
 		imm = SExt(ReadMemory(GetAddr(+2), GetType<u16>()), GetType<u64>());
 		m_rel = nullptr;
 	}
-	else
-	{
-		m_may_be_mmio &= op.simm16 == 0 || spu_thread::test_is_problem_state_register_offset(op.uimm16, false, true); // Either exact MMIO address or MMIO base with completing s16 address offset
-	}
-
-	m_may_be_mmio &= (op.ra != 1u && op.ra != 13u); // Stack register and TLS address register are unlikely to be used in MMIO address calculation
 
 	const auto addr = m_ir->CreateAdd(GetGpr(op.ra), imm);
 	WriteMemory(addr, GetFpr(op.frs, 32));
@@ -4450,24 +4054,9 @@ void PPUTranslator::FSQRTS(ppu_opcode_t op)
 
 void PPUTranslator::FRES(ppu_opcode_t op)
 {
-	if (!m_fres_table)
-	{
-		m_fres_table = new GlobalVariable(*m_module, ArrayType::get(GetType<u32>(), 128), true, GlobalValue::PrivateLinkage, ConstantDataArray::get(m_context, ppu_fres_mantissas));
-	}
-
-	const auto a = GetFpr(op.frb);
-	const auto b = bitcast<u64>(a);
-	const auto n = m_ir->CreateFCmpUNO(a, a); // test for NaN
-	const auto e = m_ir->CreateAnd(m_ir->CreateLShr(b, 52), 0x7ff); // double exp
-	const auto i = m_ir->CreateAnd(m_ir->CreateLShr(b, 45), 0x7f); // mantissa LUT index
-	const auto ptr = dyn_cast<GetElementPtrInst>(m_ir->CreateGEP(m_fres_table->getValueType(), m_fres_table, {m_ir->getInt64(0), i}));
-	assert(ptr->getResultElementType() == get_type<u32>());
-	const auto m = m_ir->CreateShl(ZExt(m_ir->CreateLoad(ptr->getResultElementType(), ptr)), 29);
-	const auto c = m_ir->CreateICmpUGE(e, m_ir->getInt64(0x3ff + 0x80)); // test for INF
-	const auto x = m_ir->CreateShl(m_ir->CreateSub(m_ir->getInt64(0x7ff - 2), e), 52);
-	const auto s = m_ir->CreateSelect(c, m_ir->getInt64(0), m_ir->CreateOr(x, m));
-	const auto r = bitcast<f64>(m_ir->CreateSelect(n, m_ir->CreateOr(b, 0x8'0000'0000'0000), m_ir->CreateOr(s, m_ir->CreateAnd(b, 0x8000'0000'0000'0000))));
-	SetFpr(op.frd, m_ir->CreateFPTrunc(r, GetType<f32>()));
+	const auto b = GetFpr(op.frb, 32);
+	const auto result = m_ir->CreateFDiv(ConstantFP::get(GetType<f32>(), 1.0), b);
+	SetFpr(op.frd, result);
 
 	//m_ir->CreateStore(GetUndef<bool>(), m_fpscr_fr);
 	//m_ir->CreateStore(GetUndef<bool>(), m_fpscr_fi);
@@ -4476,7 +4065,7 @@ void PPUTranslator::FRES(ppu_opcode_t op)
 	//SetFPSCRException(m_fpscr_ux, Call(GetType<bool>(), m_pure_attr, "__fres_get_ux", b));
 	//SetFPSCRException(m_fpscr_zx, Call(GetType<bool>(), m_pure_attr, "__fres_get_zx", b));
 	//SetFPSCRException(m_fpscr_vxsnan, Call(GetType<bool>(), m_pure_attr, "__fres_get_vxsnan", b));
-	SetFPRF(r, op.rc != 0);
+	SetFPRF(result, op.rc != 0);
 }
 
 void PPUTranslator::FMULS(ppu_opcode_t op)
@@ -4502,7 +4091,7 @@ void PPUTranslator::FMADDS(ppu_opcode_t op)
 	const auto c = GetFpr(op.frc);
 
 	llvm::Value* result;
-	if (g_cfg.core.use_accurate_dfma)
+	if (g_cfg.core.llvm_accurate_dfma)
 	{
 		result = m_ir->CreateCall(get_intrinsic<f64>(llvm::Intrinsic::fma), {a, c, b});
 	}
@@ -4530,7 +4119,7 @@ void PPUTranslator::FMSUBS(ppu_opcode_t op)
 	const auto c = GetFpr(op.frc);
 
 	llvm::Value* result;
-	if (g_cfg.core.use_accurate_dfma)
+	if (g_cfg.core.llvm_accurate_dfma)
 	{
 		result = m_ir->CreateCall(get_intrinsic<f64>(llvm::Intrinsic::fma), {a, c, m_ir->CreateFNeg(b)});
 	}
@@ -4558,7 +4147,7 @@ void PPUTranslator::FNMSUBS(ppu_opcode_t op)
 	const auto c = GetFpr(op.frc);
 
 	llvm::Value* result;
-	if (g_cfg.core.use_accurate_dfma)
+	if (g_cfg.core.llvm_accurate_dfma)
 	{
 		result = m_ir->CreateCall(get_intrinsic<f64>(llvm::Intrinsic::fma), {a, c, m_ir->CreateFNeg(b)});
 	}
@@ -4586,7 +4175,7 @@ void PPUTranslator::FNMADDS(ppu_opcode_t op)
 	const auto c = GetFpr(op.frc);
 
 	llvm::Value* result;
-	if (g_cfg.core.use_accurate_dfma)
+	if (g_cfg.core.llvm_accurate_dfma)
 	{
 		result = m_ir->CreateCall(get_intrinsic<f64>(llvm::Intrinsic::fma), {a, c, b});
 	}
@@ -4633,13 +4222,8 @@ void PPUTranslator::MTFSB0(ppu_opcode_t op)
 void PPUTranslator::MTFSFI(ppu_opcode_t op)
 {
 	SetFPSCRBit(op.crfd * 4 + 0, m_ir->getInt1((op.i & 8) != 0), false);
-
-	if (op.crfd != 0)
-	{
-		SetFPSCRBit(op.crfd * 4 + 1, m_ir->getInt1((op.i & 4) != 0), false);
-		SetFPSCRBit(op.crfd * 4 + 2, m_ir->getInt1((op.i & 2) != 0), false);
-	}
-
+	if (op.crfd != 0) SetFPSCRBit(op.crfd * 4 + 1, m_ir->getInt1((op.i & 4) != 0), false);
+	if (op.crfd != 0) SetFPSCRBit(op.crfd * 4 + 2, m_ir->getInt1((op.i & 2) != 0), false);
 	SetFPSCRBit(op.crfd * 4 + 3, m_ir->getInt1((op.i & 1) != 0), false);
 
 	if (op.rc) SetCrFieldFPCC(1);
@@ -4665,7 +4249,7 @@ void PPUTranslator::MTFSF(ppu_opcode_t op)
 
 	for (u32 i = 16; i < 20; i++)
 	{
-		if ((op.flm & (128 >> (i / 4))) != 0)
+		if (i != 1 && i != 2 && (op.flm & (128 >> (i / 4))) != 0)
 		{
 			SetFPSCRBit(i, Trunc(m_ir->CreateLShr(value, i ^ 31), GetType<bool>()), false);
 		}
@@ -4707,11 +4291,7 @@ void PPUTranslator::FCTIW(ppu_opcode_t op)
 	const auto xormask = m_ir->CreateSExt(m_ir->CreateFCmpOGE(b, ConstantFP::get(GetType<f64>(), std::exp2l(31.))), GetType<s32>());
 
 	// fix result saturation (0x80000000 -> 0x7fffffff)
-#if defined(ARCH_X64)
 	SetFpr(op.frd, m_ir->CreateXor(xormask, Call(GetType<s32>(), "llvm.x86.sse2.cvtsd2si", m_ir->CreateInsertElement(GetUndef<f64[2]>(), b, u64{0}))));
-#elif defined(ARCH_ARM64)
-	SetFpr(op.frd, m_ir->CreateXor(xormask, Call(GetType<s32>(), "llvm.aarch64.neon.fcvtns.i32.f64", b)));
-#endif
 
 	//SetFPSCR_FR(Call(GetType<bool>(), m_pure_attr, "__fctiw_get_fr", b));
 	//SetFPSCR_FI(Call(GetType<bool>(), m_pure_attr, "__fctiw_get_fi", b));
@@ -4727,11 +4307,7 @@ void PPUTranslator::FCTIWZ(ppu_opcode_t op)
 	const auto xormask = m_ir->CreateSExt(m_ir->CreateFCmpOGE(b, ConstantFP::get(GetType<f64>(), std::exp2l(31.))), GetType<s32>());
 
 	// fix result saturation (0x80000000 -> 0x7fffffff)
-#if defined(ARCH_X64)
 	SetFpr(op.frd, m_ir->CreateXor(xormask, Call(GetType<s32>(), "llvm.x86.sse2.cvttsd2si", m_ir->CreateInsertElement(GetUndef<f64[2]>(), b, u64{0}))));
-#elif defined(ARCH_ARM64)
-	SetFpr(op.frd, m_ir->CreateXor(xormask, Call(GetType<s32>(), "llvm.aarch64.neon.fcvtzs.i32.f64", b)));
-#endif
 }
 
 void PPUTranslator::FDIV(ppu_opcode_t op)
@@ -4827,16 +4403,8 @@ void PPUTranslator::FMUL(ppu_opcode_t op)
 
 void PPUTranslator::FRSQRTE(ppu_opcode_t op)
 {
-	if (!m_frsqrte_table)
-	{
-		m_frsqrte_table = new GlobalVariable(*m_module, ArrayType::get(GetType<u32>(), 0x8000), true, GlobalValue::PrivateLinkage, ConstantDataArray::get(m_context, ppu_frqrte_lut.data));
-	}
-
-	const auto b = m_ir->CreateBitCast(GetFpr(op.frb), GetType<u64>());
-	const auto ptr = dyn_cast<GetElementPtrInst>(m_ir->CreateGEP(m_frsqrte_table->getValueType(), m_frsqrte_table, {m_ir->getInt64(0), m_ir->CreateLShr(b, 49)}));
-	assert(ptr->getResultElementType() == get_type<u32>());
-	const auto v = m_ir->CreateLoad(ptr->getResultElementType(), ptr);
-	const auto result = m_ir->CreateBitCast(m_ir->CreateShl(ZExt(v), 32), GetType<f64>());
+	const auto b = GetFpr(op.frb, 32);
+	const auto result = m_ir->CreateFDiv(ConstantFP::get(GetType<f32>(), 1.0), Call(GetType<f32>(), "llvm.sqrt.f32", b));
 	SetFpr(op.frd, result);
 
 	//m_ir->CreateStore(GetUndef<bool>(), m_fpscr_fr);
@@ -4855,7 +4423,7 @@ void PPUTranslator::FMSUB(ppu_opcode_t op)
 	const auto c = GetFpr(op.frc);
 
 	llvm::Value* result;
-	if (g_cfg.core.use_accurate_dfma)
+	if (g_cfg.core.llvm_accurate_dfma)
 	{
 		result = m_ir->CreateCall(get_intrinsic<f64>(llvm::Intrinsic::fma), {a, c, m_ir->CreateFNeg(b)});
 	}
@@ -4883,7 +4451,7 @@ void PPUTranslator::FMADD(ppu_opcode_t op)
 	const auto c = GetFpr(op.frc);
 
 	llvm::Value* result;
-	if (g_cfg.core.use_accurate_dfma)
+	if (g_cfg.core.llvm_accurate_dfma)
 	{
 		result = m_ir->CreateCall(get_intrinsic<f64>(llvm::Intrinsic::fma), { a, c, b });
 	}
@@ -4911,7 +4479,7 @@ void PPUTranslator::FNMSUB(ppu_opcode_t op)
 	const auto c = GetFpr(op.frc);
 
 	llvm::Value* result;
-	if (g_cfg.core.use_accurate_dfma)
+	if (g_cfg.core.llvm_accurate_dfma)
 	{
 		result = m_ir->CreateCall(get_intrinsic<f64>(llvm::Intrinsic::fma), {a, c, m_ir->CreateFNeg(b)});
 	}
@@ -4939,7 +4507,7 @@ void PPUTranslator::FNMADD(ppu_opcode_t op)
 	const auto c = GetFpr(op.frc);
 
 	llvm::Value* result;
-	if (g_cfg.core.use_accurate_dfma)
+	if (g_cfg.core.llvm_accurate_dfma)
 	{
 		result = m_ir->CreateCall(get_intrinsic<f64>(llvm::Intrinsic::fma), {a, c, b});
 	}
@@ -5009,12 +4577,7 @@ void PPUTranslator::FCTID(ppu_opcode_t op)
 	const auto xormask = m_ir->CreateSExt(m_ir->CreateFCmpOGE(b, ConstantFP::get(GetType<f64>(), std::exp2l(63.))), GetType<s64>());
 
 	// fix result saturation (0x8000000000000000 -> 0x7fffffffffffffff)
-#if defined(ARCH_X64)
 	SetFpr(op.frd, m_ir->CreateXor(xormask, Call(GetType<s64>(), "llvm.x86.sse2.cvtsd2si64", m_ir->CreateInsertElement(GetUndef<f64[2]>(), b, u64{0}))));
-#elif defined(ARCH_ARM64)
-	SetFpr(op.frd, m_ir->CreateXor(xormask, Call(GetType<s64>(), "llvm.aarch64.neon.fcvtns.i64.f64", b)));
-#endif
-
 
 	//SetFPSCR_FR(Call(GetType<bool>(), m_pure_attr, "__fctid_get_fr", b));
 	//SetFPSCR_FI(Call(GetType<bool>(), m_pure_attr, "__fctid_get_fi", b));
@@ -5030,11 +4593,7 @@ void PPUTranslator::FCTIDZ(ppu_opcode_t op)
 	const auto xormask = m_ir->CreateSExt(m_ir->CreateFCmpOGE(b, ConstantFP::get(GetType<f64>(), std::exp2l(63.))), GetType<s64>());
 
 	// fix result saturation (0x8000000000000000 -> 0x7fffffffffffffff)
-#if defined(ARCH_X64)
 	SetFpr(op.frd, m_ir->CreateXor(xormask, Call(GetType<s64>(), "llvm.x86.sse2.cvttsd2si64", m_ir->CreateInsertElement(GetUndef<f64[2]>(), b, u64{0}))));
-#elif defined(ARCH_ARM64)
-	SetFpr(op.frd, m_ir->CreateXor(xormask, Call(GetType<s64>(), "llvm.aarch64.neon.fcvtzs.i64.f64", b)));
-#endif
 }
 
 void PPUTranslator::FCFID(ppu_opcode_t op)
@@ -5051,8 +4610,7 @@ void PPUTranslator::FCFID(ppu_opcode_t op)
 void PPUTranslator::UNK(ppu_opcode_t op)
 {
 	FlushRegisters();
-	Call(GetType<void>(), "__error", m_thread, GetAddr(), m_ir->getInt32(op.opcode));
-	//Call(GetType<void>(), "__escape", m_thread)->setTailCall();
+	Call(GetType<void>(), "__error", m_thread, GetAddr(), m_ir->getInt32(op.opcode))->setTailCallKind(llvm::CallInst::TCK_Tail);
 	m_ir->CreateRetVoid();
 }
 
@@ -5133,7 +4691,6 @@ void PPUTranslator::SetVr(u32 vr, Value* value)
 		}
 	}
 
-	ensure(value->getType()->getPrimitiveSizeInBits() == 128);
 	RegStore(value, m_vr[vr]);
 }
 
@@ -5300,40 +4857,25 @@ void PPUTranslator::SetOverflow(Value* bit)
 	RegStore(m_ir->CreateOr(RegLoad(m_so), bit), m_so);
 }
 
+void PPUTranslator::SetSat(Value* bit)
+{
+	RegStore(m_ir->CreateOr(RegLoad(m_sat), bit), m_sat);
+}
+
 Value* PPUTranslator::CheckTrapCondition(u32 to, Value* left, Value* right)
 {
-	if ((to & 0x3) == 0x3 || (to & 0x18) == 0x18)
-	{
-		// Not-equal check or always-true
-		return to & 0x4 ? m_ir->getTrue() : m_ir->CreateICmpNE(left, right);
-	}
-
-	Value* trap_condition = nullptr;
-
-	auto add_condition = [&](Value* cond)
-	{
-		if (!trap_condition)
-		{
-			trap_condition = cond;
-			return;
-		}
-
-		trap_condition = m_ir->CreateOr(trap_condition, cond);
-	};
-
-	if (to & 0x10) add_condition(m_ir->CreateICmpSLT(left, right));
-	if (to & 0x8) add_condition(m_ir->CreateICmpSGT(left, right));
-	if (to & 0x4) add_condition(m_ir->CreateICmpEQ(left, right));
-	if (to & 0x2) add_condition(m_ir->CreateICmpULT(left, right));
-	if (to & 0x1) add_condition(m_ir->CreateICmpUGT(left, right));
-
-	return trap_condition ? trap_condition : m_ir->getFalse();
+	Value* trap_condition = m_ir->getFalse();
+	if (to & 0x10) trap_condition = m_ir->CreateOr(trap_condition, m_ir->CreateICmpSLT(left, right));
+	if (to & 0x8) trap_condition = m_ir->CreateOr(trap_condition, m_ir->CreateICmpSGT(left, right));
+	if (to & 0x4) trap_condition = m_ir->CreateOr(trap_condition, m_ir->CreateICmpEQ(left, right));
+	if (to & 0x2) trap_condition = m_ir->CreateOr(trap_condition, m_ir->CreateICmpULT(left, right));
+	if (to & 0x1) trap_condition = m_ir->CreateOr(trap_condition, m_ir->CreateICmpUGT(left, right));
+	return trap_condition;
 }
 
 void PPUTranslator::Trap()
 {
-	Call(GetType<void>(), "__trap", m_thread, GetAddr());
-	//Call(GetType<void>(), "__escape", m_thread)->setTailCall();
+	Call(GetType<void>(), "__trap", m_thread, GetAddr())->setTailCallKind(llvm::CallInst::TCK_Tail);
 	m_ir->CreateRetVoid();
 }
 
@@ -5381,184 +4923,4 @@ MDNode* PPUTranslator::CheckBranchProbability(u32 bo)
 	return nullptr;
 }
 
-void PPUTranslator::build_interpreter()
-{
-#define BUILD_VEC_INST(i) { \
-		m_function = llvm::cast<llvm::Function>(m_module->getOrInsertFunction("op_" #i, get_type<void>(), m_ir->getPtrTy()).getCallee()); \
-		std::fill(std::begin(m_globals), std::end(m_globals), nullptr); \
-		std::fill(std::begin(m_locals), std::end(m_locals), nullptr); \
-		IRBuilder<> irb(BasicBlock::Create(m_context, "__entry", m_function)); \
-		m_ir = &irb; \
-		m_thread = m_function->getArg(0); \
-		ppu_opcode_t op{}; \
-		op.vd = 0; \
-		op.va = 1; \
-		op.vb = 2; \
-		op.vc = 3; \
-		this->i(op); \
-		FlushRegisters(); \
-		m_ir->CreateRetVoid(); \
-		run_transforms(*m_function); \
-	}
-
-	BUILD_VEC_INST(VADDCUW);
-	BUILD_VEC_INST(VADDFP);
-	BUILD_VEC_INST(VADDSBS);
-	BUILD_VEC_INST(VADDSHS);
-	BUILD_VEC_INST(VADDSWS);
-	BUILD_VEC_INST(VADDUBM);
-	BUILD_VEC_INST(VADDUBS);
-	BUILD_VEC_INST(VADDUHM);
-	BUILD_VEC_INST(VADDUHS);
-	BUILD_VEC_INST(VADDUWM);
-	BUILD_VEC_INST(VADDUWS);
-	BUILD_VEC_INST(VAND);
-	BUILD_VEC_INST(VANDC);
-	BUILD_VEC_INST(VAVGSB);
-	BUILD_VEC_INST(VAVGSH);
-	BUILD_VEC_INST(VAVGSW);
-	BUILD_VEC_INST(VAVGUB);
-	BUILD_VEC_INST(VAVGUH);
-	BUILD_VEC_INST(VAVGUW);
-	BUILD_VEC_INST(VCFSX);
-	BUILD_VEC_INST(VCFUX);
-	BUILD_VEC_INST(VCMPBFP);
-	BUILD_VEC_INST(VCMPBFP_);
-	BUILD_VEC_INST(VCMPEQFP);
-	BUILD_VEC_INST(VCMPEQFP_);
-	BUILD_VEC_INST(VCMPEQUB);
-	BUILD_VEC_INST(VCMPEQUB_);
-	BUILD_VEC_INST(VCMPEQUH);
-	BUILD_VEC_INST(VCMPEQUH_);
-	BUILD_VEC_INST(VCMPEQUW);
-	BUILD_VEC_INST(VCMPEQUW_);
-	BUILD_VEC_INST(VCMPGEFP);
-	BUILD_VEC_INST(VCMPGEFP_);
-	BUILD_VEC_INST(VCMPGTFP);
-	BUILD_VEC_INST(VCMPGTFP_);
-	BUILD_VEC_INST(VCMPGTSB);
-	BUILD_VEC_INST(VCMPGTSB_);
-	BUILD_VEC_INST(VCMPGTSH);
-	BUILD_VEC_INST(VCMPGTSH_);
-	BUILD_VEC_INST(VCMPGTSW);
-	BUILD_VEC_INST(VCMPGTSW_);
-	BUILD_VEC_INST(VCMPGTUB);
-	BUILD_VEC_INST(VCMPGTUB_);
-	BUILD_VEC_INST(VCMPGTUH);
-	BUILD_VEC_INST(VCMPGTUH_);
-	BUILD_VEC_INST(VCMPGTUW);
-	BUILD_VEC_INST(VCMPGTUW_);
-	BUILD_VEC_INST(VCTSXS);
-	BUILD_VEC_INST(VCTUXS);
-	BUILD_VEC_INST(VEXPTEFP);
-	BUILD_VEC_INST(VLOGEFP);
-	BUILD_VEC_INST(VMADDFP);
-	BUILD_VEC_INST(VMAXFP);
-	BUILD_VEC_INST(VMAXSB);
-	BUILD_VEC_INST(VMAXSH);
-	BUILD_VEC_INST(VMAXSW);
-	BUILD_VEC_INST(VMAXUB);
-	BUILD_VEC_INST(VMAXUH);
-	BUILD_VEC_INST(VMAXUW);
-	BUILD_VEC_INST(VMHADDSHS);
-	BUILD_VEC_INST(VMHRADDSHS);
-	BUILD_VEC_INST(VMINFP);
-	BUILD_VEC_INST(VMINSB);
-	BUILD_VEC_INST(VMINSH);
-	BUILD_VEC_INST(VMINSW);
-	BUILD_VEC_INST(VMINUB);
-	BUILD_VEC_INST(VMINUH);
-	BUILD_VEC_INST(VMINUW);
-	BUILD_VEC_INST(VMLADDUHM);
-	BUILD_VEC_INST(VMRGHB);
-	BUILD_VEC_INST(VMRGHH);
-	BUILD_VEC_INST(VMRGHW);
-	BUILD_VEC_INST(VMRGLB);
-	BUILD_VEC_INST(VMRGLH);
-	BUILD_VEC_INST(VMRGLW);
-	BUILD_VEC_INST(VMSUMMBM);
-	BUILD_VEC_INST(VMSUMSHM);
-	BUILD_VEC_INST(VMSUMSHS);
-	BUILD_VEC_INST(VMSUMUBM);
-	BUILD_VEC_INST(VMSUMUHM);
-	BUILD_VEC_INST(VMSUMUHS);
-	BUILD_VEC_INST(VMULESB);
-	BUILD_VEC_INST(VMULESH);
-	BUILD_VEC_INST(VMULEUB);
-	BUILD_VEC_INST(VMULEUH);
-	BUILD_VEC_INST(VMULOSB);
-	BUILD_VEC_INST(VMULOSH);
-	BUILD_VEC_INST(VMULOUB);
-	BUILD_VEC_INST(VMULOUH);
-	BUILD_VEC_INST(VNMSUBFP);
-	BUILD_VEC_INST(VNOR);
-	BUILD_VEC_INST(VOR);
-	BUILD_VEC_INST(VPERM);
-	BUILD_VEC_INST(VPKPX);
-	BUILD_VEC_INST(VPKSHSS);
-	BUILD_VEC_INST(VPKSHUS);
-	BUILD_VEC_INST(VPKSWSS);
-	BUILD_VEC_INST(VPKSWUS);
-	BUILD_VEC_INST(VPKUHUM);
-	BUILD_VEC_INST(VPKUHUS);
-	BUILD_VEC_INST(VPKUWUM);
-	BUILD_VEC_INST(VPKUWUS);
-	BUILD_VEC_INST(VREFP);
-	BUILD_VEC_INST(VRFIM);
-	BUILD_VEC_INST(VRFIN);
-	BUILD_VEC_INST(VRFIP);
-	BUILD_VEC_INST(VRFIZ);
-	BUILD_VEC_INST(VRLB);
-	BUILD_VEC_INST(VRLH);
-	BUILD_VEC_INST(VRLW);
-	BUILD_VEC_INST(VRSQRTEFP);
-	BUILD_VEC_INST(VSEL);
-	BUILD_VEC_INST(VSL);
-	BUILD_VEC_INST(VSLB);
-	BUILD_VEC_INST(VSLDOI);
-	BUILD_VEC_INST(VSLH);
-	BUILD_VEC_INST(VSLO);
-	BUILD_VEC_INST(VSLW);
-	BUILD_VEC_INST(VSPLTB);
-	BUILD_VEC_INST(VSPLTH);
-	BUILD_VEC_INST(VSPLTISB);
-	BUILD_VEC_INST(VSPLTISH);
-	BUILD_VEC_INST(VSPLTISW);
-	BUILD_VEC_INST(VSPLTW);
-	BUILD_VEC_INST(VSR);
-	BUILD_VEC_INST(VSRAB);
-	BUILD_VEC_INST(VSRAH);
-	BUILD_VEC_INST(VSRAW);
-	BUILD_VEC_INST(VSRB);
-	BUILD_VEC_INST(VSRH);
-	BUILD_VEC_INST(VSRO);
-	BUILD_VEC_INST(VSRW);
-	BUILD_VEC_INST(VSUBCUW);
-	BUILD_VEC_INST(VSUBFP);
-	BUILD_VEC_INST(VSUBSBS);
-	BUILD_VEC_INST(VSUBSHS);
-	BUILD_VEC_INST(VSUBSWS);
-	BUILD_VEC_INST(VSUBUBM);
-	BUILD_VEC_INST(VSUBUBS);
-	BUILD_VEC_INST(VSUBUHM);
-	BUILD_VEC_INST(VSUBUHS);
-	BUILD_VEC_INST(VSUBUWM);
-	BUILD_VEC_INST(VSUBUWS);
-	BUILD_VEC_INST(VSUMSWS);
-	BUILD_VEC_INST(VSUM2SWS);
-	BUILD_VEC_INST(VSUM4SBS);
-	BUILD_VEC_INST(VSUM4SHS);
-	BUILD_VEC_INST(VSUM4UBS);
-	BUILD_VEC_INST(VUPKHPX);
-	BUILD_VEC_INST(VUPKHSB);
-	BUILD_VEC_INST(VUPKHSH);
-	BUILD_VEC_INST(VUPKLPX);
-	BUILD_VEC_INST(VUPKLSB);
-	BUILD_VEC_INST(VUPKLSH);
-	BUILD_VEC_INST(VXOR);
-#undef BUILD_VEC_INST
-
-
-}
-
 #endif
diff --git a/rpcs3/Emu/Cell/PPUTranslator.h b/rpcs3/Emu/Cell/PPUTranslator.h
index 010945656e..f5a14115cb 100644
--- a/rpcs3/Emu/Cell/PPUTranslator.h
+++ b/rpcs3/Emu/Cell/PPUTranslator.h
@@ -8,15 +8,10 @@
 
 #include "util/types.hpp"
 
-template <typename T>
-struct ppu_module;
-
-struct lv2_obj;
-
 class PPUTranslator final : public cpu_translator
 {
 	// PPU Module
-	const ppu_module<lv2_obj>& m_info;
+	const ppu_module& m_info;
 
 	// Relevant relocations
 	std::map<u64, const ppu_reloc*> m_relocs;
@@ -33,9 +28,6 @@ class PPUTranslator final : public cpu_translator
 	// Current position-independent address
 	u64 m_addr = 0;
 
-	// Function attributes
-	bs_t<ppu_attr> m_attr{};
-
 	// Relocation info
 	const ppu_segment* m_reloc = nullptr;
 
@@ -59,9 +51,7 @@ class PPUTranslator final : public cpu_translator
 	// Thread context struct
 	llvm::StructType* m_thread_type;
 
-	llvm::GlobalVariable* m_mtocr_table{};
-	llvm::GlobalVariable* m_frsqrte_table{};
-	llvm::GlobalVariable* m_fres_table{};
+	llvm::Value* m_mtocr_table{};
 
 	llvm::Value* m_globals[175];
 	llvm::Value** const m_g_cr = m_globals + 99;
@@ -73,7 +63,6 @@ class PPUTranslator final : public cpu_translator
 	llvm::Value** const m_fc = m_locals + 131; // FPSCR bits (used partially)
 
 	llvm::Value* nan_vec4;
-	bool m_may_be_mmio = false;
 
 #define DEF_VALUE(loc, glb, pos)\
 	llvm::Value*& loc = m_locals[pos];\
@@ -87,8 +76,8 @@ class PPUTranslator final : public cpu_translator
 	DEF_VALUE(m_ov, m_g_ov, 168) // XER.OV bit, overflow flag
 	DEF_VALUE(m_ca, m_g_ca, 169) // XER.CA bit, carry flag
 	DEF_VALUE(m_cnt, m_g_cnt, 170) // XER.CNT
-	DEF_VALUE(m_nj, m_g_nj, 171) // VSCR.NJ bit, non-Java mode
-	DEF_VALUE(m_sat, m_g_sat, 173) // VSCR.SAT bit, sticky saturation flag
+	DEF_VALUE(m_sat, m_g_sat, 171) // VSCR.SAT bit, sticky saturation flag
+	DEF_VALUE(m_nj, m_g_nj, 172) // VSCR.NJ bit, non-Java mode
 	DEF_VALUE(m_jm_mask, m_g_jm_mask, 174) // Java-Mode helper mask
 
 #undef DEF_VALUE
@@ -98,7 +87,7 @@ public:
 	value_t<T> get_vr(u32 vr)
 	{
 		value_t<T> result;
-		result.value = bitcast(GetVr(vr, VrType::vi32), value_t<T>::get_type(m_context));
+		result.value = m_ir->CreateBitCast(GetVr(vr, VrType::vi32), value_t<T>::get_type(m_context));
 		return result;
 	}
 
@@ -126,17 +115,6 @@ public:
 		return result;
 	}
 
-	// Update sticky VSCR.SAT bit (|=)
-	template <typename T>
-	void set_sat(T&& expr)
-	{
-		if (m_attr & ppu_attr::has_mfvscr)
-		{
-			const auto val = expr.eval(m_ir);
-			RegStore(m_ir->CreateOr(bitcast(RegLoad(m_sat), val->getType()), val), m_sat);
-		}
-	}
-
 	// Get current instruction address
 	llvm::Value* GetAddr(u64 _add = 0);
 
@@ -155,9 +133,6 @@ public:
 	// Emit function call
 	void CallFunction(u64 target, llvm::Value* indirect = nullptr);
 
-	// Emit state check mid-block
-	void TestAborted();
-
 	// Initialize global for writing
 	llvm::Value* RegInit(llvm::Value*& local);
 
@@ -195,6 +170,14 @@ public:
 	// Load vr
 	llvm::Value* GetVr(u32 vr, VrType);
 
+	// Load VRs
+	template<typename... Vrs>
+	std::array<llvm::Value*, sizeof...(Vrs)> GetVrs(VrType type, Vrs... regs)
+	{
+		static_assert(sizeof...(Vrs), "Empty VR list");
+		return{ GetVr(regs, type)... };
+	}
+
 	// Set vr to the specified value
 	void SetVr(u32 vr, llvm::Value*);
 
@@ -210,6 +193,15 @@ public:
 	// Broadcast specified value
 	llvm::Value* Broadcast(llvm::Value* value, u32 count);
 
+	// Saturate scalar or vector given the comparison operand and the extreme value to compare with (second result is the comparison result)
+	std::pair<llvm::Value*, llvm::Value*> Saturate(llvm::Value* value, llvm::CmpInst::Predicate inst, llvm::Value* extreme);
+
+	// Saturate signed value (second result is the disjunction of comparison results)
+	std::pair<llvm::Value*, llvm::Value*> SaturateSigned(llvm::Value* value, u64 min, u64 max);
+
+	// Multiply FP value or vector by the pow(2, scale)
+	llvm::Value* Scale(llvm::Value* value, s32 scale);
+
 	// Create shuffle instruction with constant args
 	llvm::Value* Shuffle(llvm::Value* left, llvm::Value* right, std::initializer_list<u32> indices);
 
@@ -287,6 +279,9 @@ public:
 	// Set XER.OV bit, and update XER.SO bit (|=)
 	void SetOverflow(llvm::Value*);
 
+	// Update sticky VSCR.SAT bit (|=)
+	void SetSat(llvm::Value*);
+
 	// Check condition for trap instructions
 	llvm::Value* CheckTrapCondition(u32 to, llvm::Value* left, llvm::Value* right);
 
@@ -303,7 +298,7 @@ public:
 	void UseCondition(llvm::MDNode* hint, llvm::Value* = nullptr);
 
 	// Get memory pointer
-	llvm::Value* GetMemory(llvm::Value* addr);
+	llvm::Value* GetMemory(llvm::Value* addr, llvm::Type* type);
 
 	// Read from memory
 	llvm::Value* ReadMemory(llvm::Value* addr, llvm::Type* type, bool is_be = true, u32 align = 1);
@@ -336,7 +331,7 @@ public:
 	// Handle compilation errors
 	void CompilationError(const std::string& error);
 
-	PPUTranslator(llvm::LLVMContext& context, llvm::Module* _module, const ppu_module<lv2_obj>& info, llvm::ExecutionEngine& engine);
+	PPUTranslator(llvm::LLVMContext& context, llvm::Module* _module, const ppu_module& info, llvm::ExecutionEngine& engine);
 	~PPUTranslator();
 
 	// Get thread context struct type
@@ -344,7 +339,6 @@ public:
 
 	// Parses PPU opcodes and translate them into LLVM IR
 	llvm::Function* Translate(const ppu_function& info);
-	llvm::Function* GetSymbolResolver(const ppu_module<lv2_obj>& info);
 
 	void MFVSCR(ppu_opcode_t op);
 	void MTVSCR(ppu_opcode_t op);
@@ -370,31 +364,18 @@ public:
 	void VCFSX(ppu_opcode_t op);
 	void VCFUX(ppu_opcode_t op);
 	void VCMPBFP(ppu_opcode_t op);
-	void VCMPBFP_(ppu_opcode_t op) { return VCMPBFP(op); }
 	void VCMPEQFP(ppu_opcode_t op);
-	void VCMPEQFP_(ppu_opcode_t op) { return VCMPEQFP(op); }
 	void VCMPEQUB(ppu_opcode_t op);
-	void VCMPEQUB_(ppu_opcode_t op) { return VCMPEQUB(op); }
 	void VCMPEQUH(ppu_opcode_t op);
-	void VCMPEQUH_(ppu_opcode_t op) { return VCMPEQUH(op); }
 	void VCMPEQUW(ppu_opcode_t op);
-	void VCMPEQUW_(ppu_opcode_t op) { return VCMPEQUW(op); }
 	void VCMPGEFP(ppu_opcode_t op);
-	void VCMPGEFP_(ppu_opcode_t op) { return VCMPGEFP(op); }
 	void VCMPGTFP(ppu_opcode_t op);
-	void VCMPGTFP_(ppu_opcode_t op) { return VCMPGTFP(op); }
 	void VCMPGTSB(ppu_opcode_t op);
-	void VCMPGTSB_(ppu_opcode_t op) { return VCMPGTSB(op); }
 	void VCMPGTSH(ppu_opcode_t op);
-	void VCMPGTSH_(ppu_opcode_t op) { return VCMPGTSH(op); }
 	void VCMPGTSW(ppu_opcode_t op);
-	void VCMPGTSW_(ppu_opcode_t op) { return VCMPGTSW(op); }
 	void VCMPGTUB(ppu_opcode_t op);
-	void VCMPGTUB_(ppu_opcode_t op) { return VCMPGTUB(op); }
 	void VCMPGTUH(ppu_opcode_t op);
-	void VCMPGTUH_(ppu_opcode_t op) { return VCMPGTUH(op); }
 	void VCMPGTUW(ppu_opcode_t op);
-	void VCMPGTUW_(ppu_opcode_t op) { return VCMPGTUW(op); }
 	void VCTSXS(ppu_opcode_t op);
 	void VCTUXS(ppu_opcode_t op);
 	void VEXPTEFP(ppu_opcode_t op);
@@ -742,132 +723,6 @@ public:
 	void FCFID(ppu_opcode_t op);
 
 	void UNK(ppu_opcode_t op);
-
-	void SUBFCO(ppu_opcode_t op) { return SUBFC(op); }
-	void ADDCO(ppu_opcode_t op) { return ADDC(op); }
-	void SUBFO(ppu_opcode_t op) { return SUBF(op); }
-	void NEGO(ppu_opcode_t op) { return NEG(op); }
-	void SUBFEO(ppu_opcode_t op) { return SUBFE(op); }
-	void ADDEO(ppu_opcode_t op) { return ADDE(op); }
-	void SUBFZEO(ppu_opcode_t op) { return SUBFZE(op); }
-	void ADDZEO(ppu_opcode_t op) { return ADDZE(op); }
-	void SUBFMEO(ppu_opcode_t op) { return SUBFME(op); }
-	void MULLDO(ppu_opcode_t op) { return MULLD(op); }
-	void ADDMEO(ppu_opcode_t op) { return ADDME(op); }
-	void MULLWO(ppu_opcode_t op) { return MULLW(op); }
-	void ADDO(ppu_opcode_t op) { return ADD(op); }
-	void DIVDUO(ppu_opcode_t op) { return DIVDU(op); }
-	void DIVWUO(ppu_opcode_t op) { return DIVWU(op); }
-	void DIVDO(ppu_opcode_t op) { return DIVD(op); }
-	void DIVWO(ppu_opcode_t op) { return DIVW(op); }
-
-	void SUBFCO_(ppu_opcode_t op) { return SUBFC(op); }
-	void ADDCO_(ppu_opcode_t op) { return ADDC(op); }
-	void SUBFO_(ppu_opcode_t op) { return SUBF(op); }
-	void NEGO_(ppu_opcode_t op) { return NEG(op); }
-	void SUBFEO_(ppu_opcode_t op) { return SUBFE(op); }
-	void ADDEO_(ppu_opcode_t op) { return ADDE(op); }
-	void SUBFZEO_(ppu_opcode_t op) { return SUBFZE(op); }
-	void ADDZEO_(ppu_opcode_t op) { return ADDZE(op); }
-	void SUBFMEO_(ppu_opcode_t op) { return SUBFME(op); }
-	void MULLDO_(ppu_opcode_t op) { return MULLD(op); }
-	void ADDMEO_(ppu_opcode_t op) { return ADDME(op); }
-	void MULLWO_(ppu_opcode_t op) { return MULLW(op); }
-	void ADDO_(ppu_opcode_t op) { return ADD(op); }
-	void DIVDUO_(ppu_opcode_t op) { return DIVDU(op); }
-	void DIVWUO_(ppu_opcode_t op) { return DIVWU(op); }
-	void DIVDO_(ppu_opcode_t op) { return DIVD(op); }
-	void DIVWO_(ppu_opcode_t op) { return DIVW(op); }
-
-	void RLWIMI_(ppu_opcode_t op) { return RLWIMI(op); }
-	void RLWINM_(ppu_opcode_t op) { return RLWINM(op); }
-	void RLWNM_(ppu_opcode_t op) { return RLWNM(op); }
-	void RLDICL_(ppu_opcode_t op) { return RLDICL(op); }
-	void RLDICR_(ppu_opcode_t op) { return RLDICR(op); }
-	void RLDIC_(ppu_opcode_t op) { return RLDIC(op); }
-	void RLDIMI_(ppu_opcode_t op) { return RLDIMI(op); }
-	void RLDCL_(ppu_opcode_t op) { return RLDCL(op); }
-	void RLDCR_(ppu_opcode_t op) { return RLDCR(op); }
-	void SUBFC_(ppu_opcode_t op) { return SUBFC(op); }
-	void MULHDU_(ppu_opcode_t op) { return MULHDU(op); }
-	void ADDC_(ppu_opcode_t op) { return ADDC(op); }
-	void MULHWU_(ppu_opcode_t op) { return MULHWU(op); }
-	void SLW_(ppu_opcode_t op) { return SLW(op); }
-	void CNTLZW_(ppu_opcode_t op) { return CNTLZW(op); }
-	void SLD_(ppu_opcode_t op) { return SLD(op); }
-	void AND_(ppu_opcode_t op) { return AND(op); }
-	void SUBF_(ppu_opcode_t op) { return SUBF(op); }
-	void CNTLZD_(ppu_opcode_t op) { return CNTLZD(op); }
-	void ANDC_(ppu_opcode_t op) { return ANDC(op); }
-	void MULHD_(ppu_opcode_t op) { return MULHD(op); }
-	void MULHW_(ppu_opcode_t op) { return MULHW(op); }
-	void NEG_(ppu_opcode_t op) { return NEG(op); }
-	void NOR_(ppu_opcode_t op) { return NOR(op); }
-	void SUBFE_(ppu_opcode_t op) { return SUBFE(op); }
-	void ADDE_(ppu_opcode_t op) { return ADDE(op); }
-	void SUBFZE_(ppu_opcode_t op) { return SUBFZE(op); }
-	void ADDZE_(ppu_opcode_t op) { return ADDZE(op); }
-	void MULLD_(ppu_opcode_t op) { return MULLD(op); }
-	void SUBFME_(ppu_opcode_t op) { return SUBFME(op); }
-	void ADDME_(ppu_opcode_t op) { return ADDME(op); }
-	void MULLW_(ppu_opcode_t op) { return MULLW(op); }
-	void ADD_(ppu_opcode_t op) { return ADD(op); }
-	void EQV_(ppu_opcode_t op) { return EQV(op); }
-	void XOR_(ppu_opcode_t op) { return XOR(op); }
-	void ORC_(ppu_opcode_t op) { return ORC(op); }
-	void OR_(ppu_opcode_t op) { return OR(op); }
-	void DIVDU_(ppu_opcode_t op) { return DIVDU(op); }
-	void DIVWU_(ppu_opcode_t op) { return DIVWU(op); }
-	void NAND_(ppu_opcode_t op) { return NAND(op); }
-	void DIVD_(ppu_opcode_t op) { return DIVD(op); }
-	void DIVW_(ppu_opcode_t op) { return DIVW(op); }
-	void SRW_(ppu_opcode_t op) { return SRW(op); }
-	void SRD_(ppu_opcode_t op) { return SRD(op); }
-	void SRAW_(ppu_opcode_t op) { return SRAW(op); }
-	void SRAD_(ppu_opcode_t op) { return SRAD(op); }
-	void SRAWI_(ppu_opcode_t op) { return SRAWI(op); }
-	void SRADI_(ppu_opcode_t op) { return SRADI(op); }
-	void EXTSH_(ppu_opcode_t op) { return EXTSH(op); }
-	void EXTSB_(ppu_opcode_t op) { return EXTSB(op); }
-	void EXTSW_(ppu_opcode_t op) { return EXTSW(op); }
-	void FDIVS_(ppu_opcode_t op) { return FDIVS(op); }
-	void FSUBS_(ppu_opcode_t op) { return FSUBS(op); }
-	void FADDS_(ppu_opcode_t op) { return FADDS(op); }
-	void FSQRTS_(ppu_opcode_t op) { return FSQRTS(op); }
-	void FRES_(ppu_opcode_t op) { return FRES(op); }
-	void FMULS_(ppu_opcode_t op) { return FMULS(op); }
-	void FMADDS_(ppu_opcode_t op) { return FMADDS(op); }
-	void FMSUBS_(ppu_opcode_t op) { return FMSUBS(op); }
-	void FNMSUBS_(ppu_opcode_t op) { return FNMSUBS(op); }
-	void FNMADDS_(ppu_opcode_t op) { return FNMADDS(op); }
-	void MTFSB1_(ppu_opcode_t op) { return MTFSB1(op); }
-	void MTFSB0_(ppu_opcode_t op) { return MTFSB0(op); }
-	void MTFSFI_(ppu_opcode_t op) { return MTFSFI(op); }
-	void MFFS_(ppu_opcode_t op) { return MFFS(op); }
-	void MTFSF_(ppu_opcode_t op) { return MTFSF(op); }
-	void FRSP_(ppu_opcode_t op) { return FRSP(op); }
-	void FCTIW_(ppu_opcode_t op) { return FCTIW(op); }
-	void FCTIWZ_(ppu_opcode_t op) { return FCTIWZ(op); }
-	void FDIV_(ppu_opcode_t op) { return FDIV(op); }
-	void FSUB_(ppu_opcode_t op) { return FSUB(op); }
-	void FADD_(ppu_opcode_t op) { return FADD(op); }
-	void FSQRT_(ppu_opcode_t op) { return FSQRT(op); }
-	void FSEL_(ppu_opcode_t op) { return FSEL(op); }
-	void FMUL_(ppu_opcode_t op) { return FMUL(op); }
-	void FRSQRTE_(ppu_opcode_t op) { return FRSQRTE(op); }
-	void FMSUB_(ppu_opcode_t op) { return FMSUB(op); }
-	void FMADD_(ppu_opcode_t op) { return FMADD(op); }
-	void FNMSUB_(ppu_opcode_t op) { return FNMSUB(op); }
-	void FNMADD_(ppu_opcode_t op) { return FNMADD(op); }
-	void FNEG_(ppu_opcode_t op) { return FNEG(op); }
-	void FMR_(ppu_opcode_t op) { return FMR(op); }
-	void FNABS_(ppu_opcode_t op) { return FNABS(op); }
-	void FABS_(ppu_opcode_t op) { return FABS(op); }
-	void FCTID_(ppu_opcode_t op) { return FCTID(op); }
-	void FCTIDZ_(ppu_opcode_t op) { return FCTIDZ(op); }
-	void FCFID_(ppu_opcode_t op) { return FCFID(op); }
-
-	void build_interpreter();
 };
 
 #endif
diff --git a/rpcs3/Emu/Cell/RawSPUThread.cpp b/rpcs3/Emu/Cell/RawSPUThread.cpp
index 81bb6fd89e..81d943179e 100644
--- a/rpcs3/Emu/Cell/RawSPUThread.cpp
+++ b/rpcs3/Emu/Cell/RawSPUThread.cpp
@@ -1,37 +1,26 @@
 #include "stdafx.h"
 #include "Emu/IdManager.h"
 #include "Loader/ELF.h"
-#include "util/asm.hpp"
 
-#include "SPUThread.h"
+#include "Emu/Cell/RawSPUThread.h"
 
 inline void try_start(spu_thread& spu)
 {
-	bool notify = false;
+	reader_lock lock(spu.run_ctrl_mtx);
 
-	if (~spu.status_npc.load().status & SPU_STATUS_RUNNING)
+	if (spu.status_npc.fetch_op([](spu_thread::status_npc_sync_var& value)
 	{
-		reader_lock lock(spu.run_ctrl_mtx);
-
-		if (spu.status_npc.fetch_op([](spu_thread::status_npc_sync_var& value)
+		if (value.status & SPU_STATUS_RUNNING)
 		{
-			if (value.status & SPU_STATUS_RUNNING)
-			{
-				return false;
-			}
-
-			value.status = SPU_STATUS_RUNNING | (value.status & SPU_STATUS_IS_ISOLATED);
-			return true;
-		}).second)
-		{
-			spu.state -= cpu_flag::stop;
-			notify = true;
+			return false;
 		}
-	}
 
-	if (notify)
+		value.status = SPU_STATUS_RUNNING | (value.status & SPU_STATUS_IS_ISOLATED);
+		return true;
+	}).second)
 	{
-		spu.state.notify_one();
+		spu.state -= cpu_flag::stop;
+		spu.state.notify_one(cpu_flag::stop);
 	}
 };
 
@@ -130,18 +119,6 @@ bool spu_thread::read_reg(const u32 addr, u32& value)
 		return true;
 	}
 
-	case Prxy_QueryMask_offs:
-	{
-		value = mfc_prxy_mask;
-		return true;
-	}
-
-	case Prxy_QueryType_offs:
-	{
-		value = 0;
-		return true;
-	}
-
 	case SPU_Out_MBox_offs:
 	{
 		value = ch_out_mbox.pop();
@@ -150,29 +127,7 @@ bool spu_thread::read_reg(const u32 addr, u32& value)
 
 	case SPU_MBox_Status_offs:
 	{
-		// Load channel counts atomically
-		auto counts = std::make_tuple(ch_out_mbox.get_count(), ch_in_mbox.get_count(), ch_out_intr_mbox.get_count());
-
-		while (true)
-		{
-			atomic_fence_acquire();
-
-			const auto counts_check = std::make_tuple(ch_out_mbox.get_count(), ch_in_mbox.get_count(), ch_out_intr_mbox.get_count());
-
-			if (counts_check == counts)
-			{
-				break;
-			}
-
-			// Update and reload
-			counts = counts_check;
-		}
-
-		const u32 out_mbox = std::get<0>(counts);
-		const u32 in_mbox = 4 - std::get<1>(counts);
-		const u32 intr_mbox = std::get<2>(counts);
-
-		value = (out_mbox & 0xff) | ((in_mbox << 8) & 0xff00) | ((intr_mbox << 16) & 0xff0000);
+		value = (ch_out_mbox.get_count() & 0xff) | ((4 - ch_in_mbox.get_count()) << 8 & 0xff00) | (ch_out_intr_mbox.get_count() << 16 & 0xff0000);
 		return true;
 	}
 
@@ -288,14 +243,7 @@ bool spu_thread::write_reg(const u32 addr, const u32 value)
 
 	case SPU_In_MBox_offs:
 	{
-		if (!ch_in_mbox.push(value).op_done)
-		{
-			if (auto cpu = cpu_thread::get_current())
-			{
-				cpu->state += cpu_flag::again;
-			}
-		}
-
+		ch_in_mbox.push(*this, value);
 		return true;
 	}
 
@@ -324,7 +272,7 @@ bool spu_thread::write_reg(const u32 addr, const u32 value)
 
 				for (status_npc_sync_var old; (old = status_npc).status & SPU_STATUS_RUNNING;)
 				{
-					utils::bless<atomic_t<u32>>(&status_npc)[0].wait(old.status);
+					status_npc.wait(old);
 				}
 			}
 		}
@@ -369,59 +317,11 @@ bool spu_thread::write_reg(const u32 addr, const u32 value)
 	return false;
 }
 
-bool spu_thread::test_is_problem_state_register_offset(u32 offset, bool for_read, bool for_write) noexcept
-{
-	if (for_read)
-	{
-		switch (offset)
-		{
-		case MFC_CMDStatus_offs:
-		case MFC_QStatus_offs:
-		case SPU_Out_MBox_offs:
-		case SPU_MBox_Status_offs:
-		case Prxy_QueryType_offs:
-		case Prxy_QueryMask_offs:
-		case SPU_Status_offs:
-		case Prxy_TagStatus_offs:
-		case SPU_NPC_offs:
-		case SPU_RunCntl_offs:
-			return true;
-		default: break;
-		}
-	}
-
-	if (for_write)
-	{
-		switch (offset)
-		{
-		case MFC_LSA_offs:
-		case MFC_EAH_offs:
-		case MFC_EAL_offs:
-		case MFC_Size_Tag_offs:
-		case MFC_Class_CMD_offs:
-		case Prxy_QueryType_offs:
-		case Prxy_QueryMask_offs:
-		case SPU_In_MBox_offs:
-		case SPU_RunCntl_offs:
-		case SPU_NPC_offs:
-		case SPU_RdSigNotify1_offs:
-		case SPU_RdSigNotify2_offs:
-		case (SPU_RdSigNotify2_offs & 0xffff): // Fow now accept both (this is used for an optimization so it can be imperfect)
-			return true;
-		default: break;
-		}
-	}
-
-	return false;
-}
-
 void spu_load_exec(const spu_exec_object& elf)
 {
 	spu_thread::g_raw_spu_ctr++;
 
 	auto spu = idm::make_ptr<named_thread<spu_thread>>(nullptr, 0, "test_spu", 0);
-	ensure(vm::get(vm::spu)->falloc(spu->vm_offset(), SPU_LS_SIZE, &spu->shm, vm::page_size_64k));
-	spu->map_ls(*spu->shm, spu->ls);
 
 	for (const auto& prog : elf.progs)
 	{
@@ -435,76 +335,4 @@ void spu_load_exec(const spu_exec_object& elf)
 
 	spu->status_npc = {SPU_STATUS_RUNNING, elf.header.e_entry};
 	atomic_storage<u32>::release(spu->pc, elf.header.e_entry);
-
-	const auto funcs = spu->discover_functions(0, { spu->ls , SPU_LS_SIZE }, true, umax);
-
-	if (spu_log.notice && !funcs.empty())
-	{
-		std::string to_log;
-
-		for (usz i = 0; i < funcs.size(); i++)
-		{
-			if (i == 0 && funcs.size() < 4)
-			{
-				// Skip newline in this case
-				to_log += ' ';
-			}
-			else if (i % 4 == 0)
-			{
-				fmt::append(to_log, "\n[%02u] ", i / 8);
-			}
-			else
-			{
-				to_log += ", ";
-			}
-
-			fmt::append(to_log, "0x%05x", funcs[i]);
-		}
-
-		spu_log.notice("Found SPU function(s) at:%s", to_log);
-	}
-
-	if (!funcs.empty())
-	{
-		spu_log.success("Found %u SPU function(s)", funcs.size());
-	}
-}
-
-void spu_load_rel_exec(const spu_rel_object& elf)
-{
-	spu_thread::g_raw_spu_ctr++;
-
-	auto spu = idm::make_ptr<named_thread<spu_thread>>(nullptr, 0, "test_spu", 0);
-	ensure(vm::get(vm::spu)->falloc(spu->vm_offset(), SPU_LS_SIZE, &spu->shm, vm::page_size_64k));
-	spu->map_ls(*spu->shm, spu->ls);
-
-	u32 total_memsize = 0;
-
-	// Compute executable data size
-	for (const auto& shdr : elf.shdrs)
-	{
-		if (shdr.sh_type == sec_type::sht_progbits && shdr.sh_flags().all_of(sh_flag::shf_alloc))
-		{
-			total_memsize = utils::align<u32>(total_memsize + shdr.sh_size, 4);
-		}
-	}
-
-	// Place executable data in SPU local memory
-	u32 offs = 0;
-
-	for (const auto& shdr : elf.shdrs)
-	{
-		if (shdr.sh_type == sec_type::sht_progbits && shdr.sh_flags().all_of(sh_flag::shf_alloc))
-		{
-			std::memcpy(spu->_ptr<void>(offs), shdr.get_bin().data(), shdr.sh_size);
-			offs = utils::align<u32>(offs + shdr.sh_size, 4);
-		}
-	}
-
-	spu_log.success("Loaded 0x%x of SPU relocatable executable data", total_memsize);
-
-	spu_thread::g_raw_spu_id[0] = spu->id;
-
-	spu->status_npc = {SPU_STATUS_RUNNING, elf.header.e_entry};
-	atomic_storage<u32>::release(spu->pc, elf.header.e_entry);
 }
diff --git a/rpcs3/Emu/Cell/RawSPUThread.h b/rpcs3/Emu/Cell/RawSPUThread.h
index 6f70f09bee..921db8f1f6 100644
--- a/rpcs3/Emu/Cell/RawSPUThread.h
+++ b/rpcs3/Emu/Cell/RawSPUThread.h
@@ -1 +1,3 @@
 #pragma once
+
+#include "SPUThread.h"
diff --git a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp b/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp
index 6b4b456f3d..3ff14609d5 100644
--- a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp
+++ b/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp
@@ -5,12 +5,15 @@
 #include "Emu/IdManager.h"
 #include "Emu/Cell/timers.hpp"
 
+#include "SPUDisAsm.h"
 #include "SPUThread.h"
 #include "SPUInterpreter.h"
+#include "PPUAnalyser.h"
 #include "Crypto/sha1.h"
 
 #include "util/asm.hpp"
 #include "util/v128.hpp"
+#include "util/v128sse.hpp"
 #include "util/sysinfo.hpp"
 
 #include <cmath>
@@ -22,6 +25,7 @@
 #define SPU_OFF_16(x, ...) asmjit::x86::word_ptr(*cpu, offset32(&spu_thread::x, ##__VA_ARGS__))
 #define SPU_OFF_8(x, ...) asmjit::x86::byte_ptr(*cpu, offset32(&spu_thread::x, ##__VA_ARGS__))
 
+extern const spu_decoder<spu_interpreter_fast> g_spu_interpreter_fast{}; // TODO: avoid
 const spu_decoder<spu_recompiler> s_spu_decoder;
 
 std::unique_ptr<spu_recompiler_base> spu_recompiler_base::make_asmjit_recompiler()
@@ -92,22 +96,22 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 	using namespace asmjit;
 
 	StringLogger logger;
-	logger.addFlags(FormatFlags::kMachineCode);
+	logger.addOptions(Logger::kOptionBinaryForm);
 
 	std::string log;
 
 	CodeHolder code;
-	code.init(m_asmrt.environment());
+	code.init(m_asmrt.getCodeInfo());
+	code._globalHints = asmjit::CodeEmitter::kHintOptimizedAlign;
 
-	x86::Assembler compiler(&code);
-	compiler.addEncodingOptions(EncodingOptions::kOptimizedAlign);
+	X86Assembler compiler(&code);
 	this->c = &compiler;
 
 	if (g_cfg.core.spu_debug && !add_loc->logged.exchange(1))
 	{
 		// Dump analyser data
 		this->dump(func, log);
-		fs::write_file(m_spurt->get_cache_path() + "spu.log", fs::write + fs::append, log);
+		fs::file(m_spurt->get_cache_path() + "spu.log", fs::write + fs::append).write(log);
 
 		// Set logger
 		code.setLogger(&logger);
@@ -133,7 +137,7 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 	this->qw1 = &x86::rcx;
 #endif
 
-	const std::array<const x86::Xmm*, 16> vec_vars
+	const std::array<const X86Xmm*, 16> vec_vars
 	{
 		&x86::xmm0,
 		&x86::xmm1,
@@ -277,9 +281,9 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 			c->vzeroupper();
 		}
 	}
-	else if (utils::has_avx512() && false)
+	else if (utils::has_avx512() && g_cfg.core.full_width_avx512)
 	{
-		// AVX-512 optimized check using 512-bit registers (disabled)
+		// AVX-512 optimized check using 512-bit registers
 		words_align = 64;
 
 		const u32 starta = start & -64;
@@ -329,20 +333,20 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 				});
 
 				c->setExtraReg(x86::k7);
-				c->z().vmovdqa32(x86::zmm0, x86::zmmword_ptr(*qw1, j - ls_off));
+				c->z().vmovdqa32(x86::zmm0, x86::zword_ptr(*qw1, j - ls_off));
 			}
 			else
 			{
-				c->vmovdqa32(x86::zmm0, x86::zmmword_ptr(*qw1, j - ls_off));
+				c->vmovdqa32(x86::zmm0, x86::zword_ptr(*qw1, j - ls_off));
 			}
 
 			if (first)
 			{
-				c->vpcmpud(x86::k1, x86::zmm0, x86::zmmword_ptr(x86::rax, code_off), 4);
+				c->vpcmpud(x86::k1, x86::zmm0, x86::zword_ptr(x86::rax, code_off), 4);
 			}
 			else
 			{
-				c->vpcmpud(x86::k3, x86::zmm0, x86::zmmword_ptr(x86::rax, code_off), 4);
+				c->vpcmpud(x86::k3, x86::zmm0, x86::zword_ptr(x86::rax, code_off), 4);
 				c->korw(x86::k1, x86::k3, x86::k1);
 			}
 
@@ -374,15 +378,15 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 
 			if (cmask == 0xff)
 			{
-				c->vmovdqa(x86::ymm0, x86::ymmword_ptr(*ls, starta));
+				c->vmovdqa(x86::ymm0, x86::yword_ptr(*ls, starta));
 			}
 			else
 			{
 				c->vpxor(x86::ymm0, x86::ymm0, x86::ymm0);
-				c->vpblendd(x86::ymm0, x86::ymm0, x86::ymmword_ptr(*ls, starta), cmask);
+				c->vpblendd(x86::ymm0, x86::ymm0, x86::yword_ptr(*ls, starta), cmask);
 			}
 
-			c->vpxor(x86::ymm0, x86::ymm0, x86::ymmword_ptr(label_code));
+			c->vpxor(x86::ymm0, x86::ymm0, x86::yword_ptr(label_code));
 			c->vptest(x86::ymm0, x86::ymm0);
 			c->jnz(label_diff);
 
@@ -397,9 +401,9 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 			const u32 cmask1 = get_code_mask(starta + 32, enda);
 
 			c->vpxor(x86::ymm0, x86::ymm0, x86::ymm0);
-			c->vpblendd(x86::ymm0, x86::ymm0, x86::ymmword_ptr(*ls, starta), cmask0);
-			c->vpblendd(x86::ymm0, x86::ymm0, x86::ymmword_ptr(*ls, starta + 32), cmask1);
-			c->vpxor(x86::ymm0, x86::ymm0, x86::ymmword_ptr(label_code));
+			c->vpblendd(x86::ymm0, x86::ymm0, x86::yword_ptr(*ls, starta), cmask0);
+			c->vpblendd(x86::ymm0, x86::ymm0, x86::yword_ptr(*ls, starta + 32), cmask1);
+			c->vpxor(x86::ymm0, x86::ymm0, x86::yword_ptr(label_code));
 			c->vptest(x86::ymm0, x86::ymm0);
 			c->jnz(label_diff);
 
@@ -449,21 +453,21 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 						xmm2z = true;
 					}
 
-					c->vpblendd(x86::ymm1, x86::ymm2, x86::ymmword_ptr(*qw1, j - ls_off), cmask);
+					c->vpblendd(x86::ymm1, x86::ymm2, x86::yword_ptr(*qw1, j - ls_off), cmask);
 				}
 				else
 				{
-					c->vmovdqa32(x86::ymm1, x86::ymmword_ptr(*qw1, j - ls_off));
+					c->vmovdqa32(x86::ymm1, x86::yword_ptr(*qw1, j - ls_off));
 				}
 
 				// Perform bitwise comparison and accumulate
 				if (first)
 				{
-					c->vpxor(x86::ymm0, x86::ymm1, x86::ymmword_ptr(x86::rax, code_off));
+					c->vpxor(x86::ymm0, x86::ymm1, x86::yword_ptr(x86::rax, code_off));
 				}
 				else
 				{
-					c->vpternlogd(x86::ymm0, x86::ymm1, x86::ymmword_ptr(x86::rax, code_off), 0xf6 /* orAxorBC */);
+					c->vpternlogd(x86::ymm0, x86::ymm1, x86::yword_ptr(x86::rax, code_off), 0xf6 /* orAxorBC */);
 				}
 
 				for (u32 i = j; i < j + 32; i += 4)
@@ -496,15 +500,15 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 
 			if (cmask == 0xff)
 			{
-				c->vmovaps(x86::ymm0, x86::ymmword_ptr(*ls, starta));
+				c->vmovaps(x86::ymm0, x86::yword_ptr(*ls, starta));
 			}
 			else
 			{
 				c->vxorps(x86::ymm0, x86::ymm0, x86::ymm0);
-				c->vblendps(x86::ymm0, x86::ymm0, x86::ymmword_ptr(*ls, starta), cmask);
+				c->vblendps(x86::ymm0, x86::ymm0, x86::yword_ptr(*ls, starta), cmask);
 			}
 
-			c->vxorps(x86::ymm0, x86::ymm0, x86::ymmword_ptr(label_code));
+			c->vxorps(x86::ymm0, x86::ymm0, x86::yword_ptr(label_code));
 			c->vptest(x86::ymm0, x86::ymm0);
 			c->jnz(label_diff);
 
@@ -519,9 +523,9 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 			const u32 cmask1 = get_code_mask(starta + 32, enda);
 
 			c->vxorps(x86::ymm0, x86::ymm0, x86::ymm0);
-			c->vblendps(x86::ymm0, x86::ymm0, x86::ymmword_ptr(*ls, starta), cmask0);
-			c->vblendps(x86::ymm0, x86::ymm0, x86::ymmword_ptr(*ls, starta + 32), cmask1);
-			c->vxorps(x86::ymm0, x86::ymm0, x86::ymmword_ptr(label_code));
+			c->vblendps(x86::ymm0, x86::ymm0, x86::yword_ptr(*ls, starta), cmask0);
+			c->vblendps(x86::ymm0, x86::ymm0, x86::yword_ptr(*ls, starta + 32), cmask1);
+			c->vxorps(x86::ymm0, x86::ymm0, x86::yword_ptr(label_code));
 			c->vptest(x86::ymm0, x86::ymm0);
 			c->jnz(label_diff);
 
@@ -582,21 +586,21 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 						xmm2z = true;
 					}
 
-					c->vblendps(reg1, x86::ymm2, x86::ymmword_ptr(*ls, j - ls_off), cmask);
+					c->vblendps(reg1, x86::ymm2, x86::yword_ptr(*ls, j - ls_off), cmask);
 				}
 				else
 				{
-					c->vmovaps(reg1, x86::ymmword_ptr(*ls, j - ls_off));
+					c->vmovaps(reg1, x86::yword_ptr(*ls, j - ls_off));
 				}
 
 				// Perform bitwise comparison and accumulate
 				if (!order++)
 				{
-					c->vxorps(reg0, reg1, x86::ymmword_ptr(x86::rax, code_off));
+					c->vxorps(reg0, reg1, x86::yword_ptr(x86::rax, code_off));
 				}
 				else
 				{
-					c->vxorps(reg1, reg1, x86::ymmword_ptr(x86::rax, code_off));
+					c->vxorps(reg1, reg1, x86::yword_ptr(x86::rax, code_off));
 					c->vorps(reg0, reg1, reg0);
 				}
 
@@ -672,7 +676,7 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 			}
 
 			// Determine which value will be duplicated at hole positions
-			const u32 w3 = ::at32(func.data, (j - start + ~static_cast<u32>(std::countl_zero(cmask)) % 4 * 4) / 4);
+			const u32 w3 = func.data.at((j - start + ~static_cast<u32>(std::countl_zero(cmask)) % 4 * 4) / 4);
 			words.push_back(cmask & 1 ? func.data[(j - start + 0) / 4] : w3);
 			words.push_back(cmask & 2 ? func.data[(j - start + 4) / 4] : w3);
 			words.push_back(cmask & 4 ? func.data[(j - start + 8) / 4] : w3);
@@ -796,7 +800,7 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 		{
 			if (m_preds.count(pos))
 			{
-				c->align(AlignMode::kCode, 16);
+				c->align(kAlignCode, 16);
 			}
 
 			c->bind(found->second);
@@ -828,7 +832,7 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 	}
 
 	// Simply return
-	c->align(AlignMode::kCode, 16);
+	c->align(kAlignCode, 16);
 	c->bind(label_stop);
 	c->add(x86::rsp, 0x28);
 	c->ret();
@@ -836,11 +840,11 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 	if (g_cfg.core.spu_verification)
 	{
 		// Dispatch
-		c->align(AlignMode::kCode, 16);
+		c->align(kAlignCode, 16);
 		c->bind(label_diff);
 		c->inc(SPU_OFF_64(block_failure));
 		c->add(x86::rsp, 0x28);
-		c->jmp(spu_runtime::tr_dispatch);
+		c->jmp(imm_ptr(spu_runtime::tr_dispatch));
 	}
 
 	for (auto&& work : ::as_rvalue(std::move(after)))
@@ -851,7 +855,7 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 	// Build instruction dispatch table
 	if (instr_table.isValid())
 	{
-		c->align(AlignMode::kData, 8);
+		c->align(kAlignData, 8);
 		c->bind(instr_table);
 
 		// Get actual instruction table bounds
@@ -873,7 +877,7 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 		}
 	}
 
-	c->align(AlignMode::kData, words_align);
+	c->align(kAlignData, words_align);
 	c->bind(label_code);
 	for (u32 d : words)
 		c->dd(d);
@@ -889,16 +893,17 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 	xmm_consts.clear();
 
 	// Compile and get function address
-	spu_function_t fn = reinterpret_cast<spu_function_t>(m_asmrt._add(&code));
+	spu_function_t fn;
 
-	if (!fn)
+	if (auto err = m_asmrt.add(&fn, &code))
 	{
+		if (err == asmjit::ErrorCode::kErrorNoVirtualMemory)
+		{
+			return nullptr;
+		}
+
 		spu_log.fatal("Failed to build a function");
 	}
-	else
-	{
-		jit_announce(fn, code.codeSize(), fmt::format("spu-b-%s", fmt::base57(be_t<u64>(m_hash_start))));
-	}
 
 	// Install compiled function pointer
 	const bool added = !add_loc->compiled && add_loc->compiled.compare_and_swap_test(nullptr, fn);
@@ -918,11 +923,11 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
 	{
 		// Add ASMJIT logs
 		fmt::append(log, "Address: %p\n\n", fn);
-		log.append(logger._content.data(), logger._content.size());
+		log += logger.getString();
 		log += "\n\n\n";
 
 		// Append log file
-		fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::write + fs::append, log);
+		fs::file(m_spurt->get_cache_path() + "spu-ir.log", fs::write + fs::append).write(log);
 	}
 
 	return fn;
@@ -953,7 +958,7 @@ spu_recompiler::XmmLink spu_recompiler::XmmGet(s8 reg, XmmType type) // get xmm
 	return result;
 }
 
-inline asmjit::x86::Mem spu_recompiler::XmmConst(const v128& data)
+inline asmjit::X86Mem spu_recompiler::XmmConst(const v128& data)
 {
 	// Find existing const
 	auto& xmm_label = xmm_consts[std::make_pair(data._u64[0], data._u64[1])];
@@ -964,7 +969,7 @@ inline asmjit::x86::Mem spu_recompiler::XmmConst(const v128& data)
 
 		consts.emplace_back([=, this]
 		{
-			c->align(asmjit::AlignMode::kData, 16);
+			c->align(asmjit::kAlignData, 16);
 			c->bind(xmm_label);
 			c->dq(data._u64[0]);
 			c->dq(data._u64[1]);
@@ -974,7 +979,17 @@ inline asmjit::x86::Mem spu_recompiler::XmmConst(const v128& data)
 	return asmjit::x86::oword_ptr(xmm_label);
 }
 
-inline asmjit::x86::Mem spu_recompiler::get_pc(u32 addr)
+inline asmjit::X86Mem spu_recompiler::XmmConst(const __m128& data)
+{
+	return XmmConst(v128::fromF(data));
+}
+
+inline asmjit::X86Mem spu_recompiler::XmmConst(const __m128i& data)
+{
+	return XmmConst(v128::fromV(data));
+}
+
+inline asmjit::X86Mem spu_recompiler::get_pc(u32 addr)
 {
 	return asmjit::x86::qword_ptr(*pc0, addr - m_base);
 }
@@ -1011,7 +1026,7 @@ void spu_recompiler::branch_fixed(u32 target, bool absolute)
 		c->and_(*addr, 0x3fffc);
 		c->mov(SPU_OFF_32(pc), *addr);
 		c->mov(*arg0, *cpu);
-		c->call(&check_state);
+		c->call(imm_ptr(&check_state));
 		c->jmp(local->second);
 
 		if (absolute)
@@ -1044,7 +1059,7 @@ void spu_recompiler::branch_fixed(u32 target, bool absolute)
 	if (ppptr)
 	{
 		c->add(x86::rsp, 0x28);
-		c->jmp(ppptr);
+		c->jmp(imm_ptr(ppptr));
 	}
 	else
 	{
@@ -1089,7 +1104,7 @@ void spu_recompiler::branch_indirect(spu_opcode_t op, bool jt, bool ret)
 		c->mov(SPU_OFF_32(pc), *addr);
 		c->mov(*arg0, *cpu);
 		c->add(x86::rsp, 0x28);
-		c->jmp(+_throw);
+		c->jmp(imm_ptr<void(*)(spu_thread*)>(_throw));
 
 		// Save addr in srr0 and disable interrupts
 		c->bind(intr);
@@ -1104,7 +1119,7 @@ void spu_recompiler::branch_indirect(spu_opcode_t op, bool jt, bool ret)
 		c->test(*addr, 0xff80007f);
 		c->cmovnz(*addr, rip->r32());
 		c->shr(*addr, 5);
-		c->align(AlignMode::kCode, 16);
+		c->align(kAlignCode, 16);
 		c->bind(no_intr);
 	}
 
@@ -1156,7 +1171,7 @@ void spu_recompiler::branch_indirect(spu_opcode_t op, bool jt, bool ret)
 	if (ppptr)
 	{
 		c->add(x86::rsp, 0x28);
-		c->jmp(ppptr);
+		c->jmp(imm_ptr(ppptr));
 	}
 	else
 	{
@@ -1191,7 +1206,7 @@ void spu_recompiler::branch_set_link(u32 target)
 			after.emplace_back([=, this, target = local->second]
 			{
 				// Clear return info after use
-				c->align(AlignMode::kCode, 16);
+				c->align(kAlignCode, 16);
 				c->bind(ret);
 				c->mov(qw1->r32(), SPU_OFF_32(gpr, 1, &v128::_u32, 3));
 				c->and_(qw1->r32(), 0x3fff0);
@@ -1213,7 +1228,7 @@ void spu_recompiler::branch_set_link(u32 target)
 
 void spu_recompiler::fall(spu_opcode_t op)
 {
-	auto gate = [](spu_thread* _spu, u32 opcode, spu_intrp_func_t _func)
+	auto gate = [](spu_thread* _spu, u32 opcode, spu_inter_func_t _func)
 	{
 		if (!_func(*_spu, {opcode}))
 		{
@@ -1227,9 +1242,9 @@ void spu_recompiler::fall(spu_opcode_t op)
 	c->and_(*addr, 0x3fffc);
 	c->mov(SPU_OFF_32(pc), *addr);
 	c->mov(arg1->r32(), op.opcode);
-	c->mov(*qw0, g_fxo->get<spu_interpreter_rt>().decode(op.opcode));
+	c->mov(*qw0, asmjit::imm_ptr(asmjit::Internal::ptr_cast<void*>(g_spu_interpreter_fast.decode(op.opcode))));
 	c->mov(*arg0, *cpu);
-	c->call(+gate);
+	c->call(asmjit::imm_ptr<void(*)(spu_thread*, u32, spu_inter_func_t)>(gate));
 }
 
 void spu_recompiler::UNK(spu_opcode_t op)
@@ -1247,13 +1262,13 @@ void spu_recompiler::UNK(spu_opcode_t op)
 	c->mov(arg1->r32(), op.opcode);
 	c->mov(*arg0, *cpu);
 	c->add(asmjit::x86::rsp, 0x28);
-	c->jmp(+gate);
+	c->jmp(asmjit::imm_ptr<void(*)(spu_thread*, u32)>(gate));
 	m_pos = -1;
 }
 
 void spu_stop(spu_thread* _spu, u32 code)
 {
-	if (!_spu->stop_and_signal(code) || _spu->state & cpu_flag::again)
+	if (!_spu->stop_and_signal(code))
 	{
 		spu_runtime::g_escape(_spu);
 	}
@@ -1275,8 +1290,8 @@ void spu_recompiler::STOP(spu_opcode_t op)
 	c->mov(SPU_OFF_32(pc), *addr);
 	c->mov(arg1->r32(), op.opcode & 0x3fff);
 	c->mov(*arg0, *cpu);
-	c->call(spu_stop);
-	c->align(AlignMode::kCode, 16);
+	c->call(imm_ptr(spu_stop));
+	c->align(kAlignCode, 16);
 	c->bind(ret);
 
 	c->add(SPU_OFF_32(pc), 4);
@@ -1325,7 +1340,7 @@ static u32 spu_rdch(spu_thread* _spu, u32 ch)
 {
 	const s64 result = _spu->get_ch_value(ch);
 
-	if (result < 0 || _spu->state & cpu_flag::again)
+	if (result < 0)
 	{
 		spu_runtime::g_escape(_spu);
 	}
@@ -1343,14 +1358,14 @@ void spu_recompiler::RDCH(spu_opcode_t op)
 {
 	using namespace asmjit;
 
-	auto read_channel = [&](x86::Mem channel_ptr, bool sync = true)
+	auto read_channel = [&](X86Mem channel_ptr, bool sync = true)
 	{
 		Label wait = c->newLabel();
 		Label again = c->newLabel();
 		Label ret = c->newLabel();
 		c->mov(addr->r64(), channel_ptr);
 		c->xor_(qw0->r32(), qw0->r32());
-		c->align(AlignMode::kCode, 16);
+		c->align(kAlignCode, 16);
 		c->bind(again);
 		c->bt(addr->r64(), spu_channel::off_count);
 		c->jnc(wait);
@@ -1361,9 +1376,9 @@ void spu_recompiler::RDCH(spu_opcode_t op)
 			c->lea(addr->r64(), get_pc(pos));
 			c->and_(*addr, 0x3fffc);
 			c->mov(SPU_OFF_32(pc), *addr);
-			c->mov(arg1->r32(), +op.ra);
+			c->mov(arg1->r32(), op.ra);
 			c->mov(*arg0, *cpu);
-			c->call(spu_rdch);
+			c->call(imm_ptr(spu_rdch));
 			c->jmp(ret);
 		});
 
@@ -1458,17 +1473,18 @@ void spu_recompiler::RDCH(spu_opcode_t op)
 
 		auto sub2 = [](spu_thread* _spu, v128* _res)
 		{
-			const u32 out = _spu->read_dec().first;
+			const u32 out = _spu->ch_dec_value - static_cast<u32>(get_timebased_time() - _spu->ch_dec_start_timestamp);
 
 			*_res = v128::from32r(out);
 		};
 
+		using ftype = void (*)(spu_thread*, v128*);
 		c->lea(addr->r64(), get_pc(m_pos));
 		c->and_(*addr, 0x3fffc);
 		c->mov(SPU_OFF_32(pc), *addr);
 		c->lea(*arg1, SPU_OFF_128(gpr, op.rt));
 		c->mov(*arg0, *cpu);
-		c->call(g_cfg.core.spu_loop_detection ? +sub1 : +sub2);
+		c->call(g_cfg.core.spu_loop_detection ? asmjit::imm_ptr<ftype>(sub1) : asmjit::imm_ptr<ftype>(sub2));
 		return;
 	}
 	case SPU_RdEventMask:
@@ -1503,9 +1519,9 @@ void spu_recompiler::RDCH(spu_opcode_t op)
 	c->lea(addr->r64(), get_pc(m_pos));
 	c->and_(*addr, 0x3fffc);
 	c->mov(SPU_OFF_32(pc), *addr);
-	c->mov(arg1->r32(), +op.ra);
+	c->mov(arg1->r32(), op.ra);
 	c->mov(*arg0, *cpu);
-	c->call(spu_rdch);
+	c->call(imm_ptr(spu_rdch));
 	c->movd(x86::xmm0, *addr);
 	c->pslldq(x86::xmm0, 12);
 	c->movdqa(SPU_OFF_128(gpr, op.rt), x86::xmm0);
@@ -1520,14 +1536,14 @@ void spu_recompiler::RCHCNT(spu_opcode_t op)
 {
 	using namespace asmjit;
 
-	auto ch_cnt = [&](x86::Mem channel_ptr, bool inv = false)
+	auto ch_cnt = [&](X86Mem channel_ptr, bool inv = false)
 	{
 		// Load channel count
 		const XmmLink& vr = XmmAlloc();
 		c->movq(vr, channel_ptr);
 		c->psrlq(vr, spu_channel::off_count);
 		if (inv)
-			c->pxor(vr, XmmConst(v128::from32p(1)));
+			c->pxor(vr, XmmConst(_mm_set1_epi32(1)));
 		c->pslldq(vr, 12);
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 	};
@@ -1556,7 +1572,7 @@ void spu_recompiler::RCHCNT(spu_opcode_t op)
 	{
 		const XmmLink& vr = XmmAlloc();
 		const XmmLink& v1 = XmmAlloc();
-		c->movdqa(vr, XmmConst(v128::from32p(16)));
+		c->movdqa(vr, XmmConst(_mm_set1_epi32(16)));
 		c->movd(v1, SPU_OFF_32(mfc_size));
 		c->psubd(vr, v1);
 		c->pslldq(vr, 12);
@@ -1611,9 +1627,9 @@ void spu_recompiler::RCHCNT(spu_opcode_t op)
 		c->lea(addr->r64(), get_pc(m_pos));
 		c->and_(*addr, 0x3fffc);
 		c->mov(SPU_OFF_32(pc), *addr);
-		c->mov(arg1->r32(), +op.ra);
+		c->mov(arg1->r32(), op.ra);
 		c->mov(*arg0, *cpu);
-		c->call(spu_rchcnt);
+		c->call(imm_ptr(spu_rchcnt));
 		break;
 	}
 	}
@@ -1655,11 +1671,11 @@ void spu_recompiler::BG(spu_opcode_t op)
 		return;
 	}
 
-	c->movdqa(vi, XmmConst(v128::from32p(0x80000000)));
+	c->movdqa(vi, XmmConst(_mm_set1_epi32(0x80000000)));
 	c->pxor(va, vi);
 	c->pxor(vi, SPU_OFF_128(gpr, op.rb));
 	c->pcmpgtd(va, vi);
-	c->paddd(va, XmmConst(v128::from32p(1)));
+	c->paddd(va, XmmConst(_mm_set1_epi32(1)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
@@ -1683,7 +1699,7 @@ void spu_recompiler::NOR(spu_opcode_t op)
 	}
 
 	c->por(va, SPU_OFF_128(gpr, op.rb));
-	c->pxor(va, XmmConst(v128::from32p(0xffffffff)));
+	c->pxor(va, XmmConst(_mm_set1_epi32(0xffffffff)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
@@ -1717,10 +1733,10 @@ void spu_recompiler::ROT(spu_opcode_t op)
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
 		const XmmLink& v4 = XmmAlloc();
-		c->movdqa(v4, XmmConst(v128::from32p(0x1f)));
+		c->movdqa(v4, XmmConst(_mm_set1_epi32(0x1f)));
 		c->pand(vb, v4);
 		c->vpsllvd(vt, va, vb);
-		c->psubd(vb, XmmConst(v128::from32p(1)));
+		c->psubd(vb, XmmConst(_mm_set1_epi32(1)));
 		c->pandn(vb, v4);
 		c->vpsrlvd(va, va, vb);
 		c->por(vt, va);
@@ -1754,8 +1770,8 @@ void spu_recompiler::ROTM(spu_opcode_t op)
 		const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
-		c->psubd(vb, XmmConst(v128::from32p(1)));
-		c->pandn(vb, XmmConst(v128::from32p(0x3f)));
+		c->psubd(vb, XmmConst(_mm_set1_epi32(1)));
+		c->pandn(vb, XmmConst(_mm_set1_epi32(0x3f)));
 		c->vpsrlvd(vt, va, vb);
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
 		return;
@@ -1766,11 +1782,11 @@ void spu_recompiler::ROTM(spu_opcode_t op)
 		const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
-		c->psubd(vb, XmmConst(v128::from32p(1)));
-		c->pandn(vb, XmmConst(v128::from32p(0x3f)));
+		c->psubd(vb, XmmConst(_mm_set1_epi32(1)));
+		c->pandn(vb, XmmConst(_mm_set1_epi32(0x3f)));
 		c->pxor(vt, vt);
 		c->psubd(vt, vb);
-		c->pcmpgtd(vb, XmmConst(v128::from32p(31)));
+		c->pcmpgtd(vb, XmmConst(_mm_set1_epi32(31)));
 		c->vpshld(vt, va, vt);
 		c->vpandn(vt, vb, vt);
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
@@ -1794,8 +1810,8 @@ void spu_recompiler::ROTMA(spu_opcode_t op)
 		const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
-		c->psubd(vb, XmmConst(v128::from32p(1)));
-		c->pandn(vb, XmmConst(v128::from32p(0x3f)));
+		c->psubd(vb, XmmConst(_mm_set1_epi32(1)));
+		c->pandn(vb, XmmConst(_mm_set1_epi32(0x3f)));
 		c->vpsravd(vt, va, vb);
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
 		return;
@@ -1806,10 +1822,10 @@ void spu_recompiler::ROTMA(spu_opcode_t op)
 		const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
-		c->psubd(vb, XmmConst(v128::from32p(1)));
-		c->pandn(vb, XmmConst(v128::from32p(0x3f)));
+		c->psubd(vb, XmmConst(_mm_set1_epi32(1)));
+		c->pandn(vb, XmmConst(_mm_set1_epi32(0x3f)));
 		c->pxor(vt, vt);
-		c->pminud(vb, XmmConst(v128::from32p(31)));
+		c->pminud(vb, XmmConst(_mm_set1_epi32(31)));
 		c->psubd(vt, vb);
 		c->vpshad(vt, va, vt);
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
@@ -1833,7 +1849,7 @@ void spu_recompiler::SHL(spu_opcode_t op)
 		const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
-		c->pand(vb, XmmConst(v128::from32p(0x3f)));
+		c->pand(vb, XmmConst(_mm_set1_epi32(0x3f)));
 		c->vpsllvd(vt, va, vb);
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
 		return;
@@ -1844,8 +1860,8 @@ void spu_recompiler::SHL(spu_opcode_t op)
 		const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
-		c->pand(vb, XmmConst(v128::from32p(0x3f)));
-		c->vpcmpgtd(vt, vb, XmmConst(v128::from32p(31)));
+		c->pand(vb, XmmConst(_mm_set1_epi32(0x3f)));
+		c->vpcmpgtd(vt, vb, XmmConst(_mm_set1_epi32(31)));
 		c->vpshld(vb, va, vb);
 		c->pandn(vt, vb);
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
@@ -1869,7 +1885,7 @@ void spu_recompiler::ROTH(spu_opcode_t op) //nf
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
 		const XmmLink& v4 = XmmAlloc();
-		c->vmovdqa(v4, XmmConst(v128::from32r(0x0d0c0d0c, 0x09080908, 0x05040504, 0x01000100)));
+		c->vmovdqa(v4, XmmConst(_mm_set_epi32(0x0d0c0d0c, 0x09080908, 0x05040504, 0x01000100)));
 		c->vpshufb(vt, va, v4); // duplicate low word
 		c->vpsrld(va, va, 16);
 		c->vpshufb(va, va, v4);
@@ -1907,8 +1923,8 @@ void spu_recompiler::ROTHM(spu_opcode_t op)
 		const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
-		c->psubw(vb, XmmConst(v128::from16p(1)));
-		c->pandn(vb, XmmConst(v128::from16p(0x1f)));
+		c->psubw(vb, XmmConst(_mm_set1_epi16(1)));
+		c->pandn(vb, XmmConst(_mm_set1_epi16(0x1f)));
 		c->vpsrlvw(vt, va, vb);
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
 		return;
@@ -1921,9 +1937,9 @@ void spu_recompiler::ROTHM(spu_opcode_t op)
 		const XmmLink& vt = XmmAlloc();
 		const XmmLink& v4 = XmmAlloc();
 		const XmmLink& v5 = XmmAlloc();
-		c->psubw(vb, XmmConst(v128::from16p(1)));
-		c->pandn(vb, XmmConst(v128::from16p(0x1f)));
-		c->movdqa(vt, XmmConst(v128::from32p(0xffff0000))); // mask: select high words
+		c->psubw(vb, XmmConst(_mm_set1_epi16(1)));
+		c->pandn(vb, XmmConst(_mm_set1_epi16(0x1f)));
+		c->movdqa(vt, XmmConst(_mm_set1_epi32(0xffff0000))); // mask: select high words
 		c->vpsrld(v4, vb, 16);
 		c->vpsubusw(v5, vb, vt); // clear high words (using saturation sub for throughput)
 		c->vpandn(vb, vt, va); // clear high words
@@ -1939,11 +1955,11 @@ void spu_recompiler::ROTHM(spu_opcode_t op)
 		const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
-		c->psubw(vb, XmmConst(v128::from16p(1)));
-		c->pandn(vb, XmmConst(v128::from16p(0x1f)));
+		c->psubw(vb, XmmConst(_mm_set1_epi16(1)));
+		c->pandn(vb, XmmConst(_mm_set1_epi16(0x1f)));
 		c->pxor(vt, vt);
 		c->psubw(vt, vb);
-		c->pcmpgtw(vb, XmmConst(v128::from16p(15)));
+		c->pcmpgtw(vb, XmmConst(_mm_set1_epi16(15)));
 		c->vpshlw(vt, va, vt);
 		c->vpandn(vt, vb, vt);
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
@@ -1967,8 +1983,8 @@ void spu_recompiler::ROTMAH(spu_opcode_t op)
 		const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
-		c->psubw(vb, XmmConst(v128::from16p(1)));
-		c->pandn(vb, XmmConst(v128::from16p(0x1f)));
+		c->psubw(vb, XmmConst(_mm_set1_epi16(1)));
+		c->pandn(vb, XmmConst(_mm_set1_epi16(0x1f)));
 		c->vpsravw(vt, va, vb);
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
 		return;
@@ -1981,11 +1997,11 @@ void spu_recompiler::ROTMAH(spu_opcode_t op)
 		const XmmLink& vt = XmmAlloc();
 		const XmmLink& v4 = XmmAlloc();
 		const XmmLink& v5 = XmmAlloc();
-		c->psubw(vb, XmmConst(v128::from16p(1)));
-		c->movdqa(vt, XmmConst(v128::from16p(0x1f)));
+		c->psubw(vb, XmmConst(_mm_set1_epi16(1)));
+		c->movdqa(vt, XmmConst(_mm_set1_epi16(0x1f)));
 		c->vpandn(v4, vb, vt);
 		c->vpand(v5, vb, vt);
-		c->movdqa(vt, XmmConst(v128::from32p(0x2f)));
+		c->movdqa(vt, XmmConst(_mm_set1_epi32(0x2f)));
 		c->vpsrld(v4, v4, 16);
 		c->vpsubusw(v5, vt, v5); // clear high word and add 16 to low word
 		c->vpslld(vb, va, 16);
@@ -2001,10 +2017,10 @@ void spu_recompiler::ROTMAH(spu_opcode_t op)
 		const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
-		c->psubw(vb, XmmConst(v128::from16p(1)));
-		c->pandn(vb, XmmConst(v128::from16p(0x1f)));
+		c->psubw(vb, XmmConst(_mm_set1_epi16(1)));
+		c->pandn(vb, XmmConst(_mm_set1_epi16(0x1f)));
 		c->pxor(vt, vt);
-		c->pminuw(vb, XmmConst(v128::from16p(15)));
+		c->pminuw(vb, XmmConst(_mm_set1_epi16(15)));
 		c->psubw(vt, vb);
 		c->vpshaw(vt, va, vt);
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
@@ -2028,7 +2044,7 @@ void spu_recompiler::SHLH(spu_opcode_t op)
 		const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
-		c->pand(vb, XmmConst(v128::from16p(0x1f)));
+		c->pand(vb, XmmConst(_mm_set1_epi16(0x1f)));
 		c->vpsllvw(vt, va, vb);
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
 		return;
@@ -2041,8 +2057,8 @@ void spu_recompiler::SHLH(spu_opcode_t op)
 		const XmmLink& vt = XmmAlloc();
 		const XmmLink& v4 = XmmAlloc();
 		const XmmLink& v5 = XmmAlloc();
-		c->pand(vb, XmmConst(v128::from16p(0x1f)));
-		c->movdqa(vt, XmmConst(v128::from32p(0xffff0000))); // mask: select high words
+		c->pand(vb, XmmConst(_mm_set1_epi16(0x1f)));
+		c->movdqa(vt, XmmConst(_mm_set1_epi32(0xffff0000))); // mask: select high words
 		c->vpsrld(v4, vb, 16);
 		c->vpsubusw(v5, vb, vt); // clear high words (using saturation sub for throughput)
 		c->vpand(vb, vt, va); // clear low words
@@ -2058,8 +2074,8 @@ void spu_recompiler::SHLH(spu_opcode_t op)
 		const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 		const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
-		c->pand(vb, XmmConst(v128::from16p(0x1f)));
-		c->vpcmpgtw(vt, vb, XmmConst(v128::from16p(15)));
+		c->pand(vb, XmmConst(_mm_set1_epi16(0x1f)));
+		c->vpcmpgtw(vt, vb, XmmConst(_mm_set1_epi16(15)));
 		c->vpshlw(vb, va, vb);
 		c->pandn(vt, vb);
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
@@ -2202,7 +2218,7 @@ void spu_recompiler::CG(spu_opcode_t op)
 		return;
 	}
 
-	c->movdqa(vi, XmmConst(v128::from32p(0x80000000)));
+	c->movdqa(vi, XmmConst(_mm_set1_epi32(0x80000000)));
 	c->paddd(vb, va);
 	c->pxor(va, vi);
 	c->pxor(vb, vi);
@@ -2231,7 +2247,7 @@ void spu_recompiler::NAND(spu_opcode_t op)
 	}
 
 	c->pand(va, SPU_OFF_128(gpr, op.rb));
-	c->pxor(va, XmmConst(v128::from32p(0xffffffff)));
+	c->pxor(va, XmmConst(_mm_set1_epi32(0xffffffff)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
@@ -2249,7 +2265,7 @@ void spu_recompiler::MTSPR(spu_opcode_t)
 
 static void spu_wrch(spu_thread* _spu, u32 ch, u32 value)
 {
-	if (!_spu->set_ch_value(ch, value) || _spu->state & cpu_flag::again)
+	if (!_spu->set_ch_value(ch, value))
 	{
 		spu_runtime::g_escape(_spu);
 	}
@@ -2263,7 +2279,7 @@ static void spu_wrch(spu_thread* _spu, u32 ch, u32 value)
 
 static void spu_wrch_mfc(spu_thread* _spu)
 {
-	if (!_spu->process_mfc_cmd() || _spu->state & cpu_flag::again)
+	if (!_spu->process_mfc_cmd())
 	{
 		spu_runtime::g_escape(_spu);
 	}
@@ -2300,7 +2316,7 @@ void spu_recompiler::WRCH(spu_opcode_t op)
 		Label ret = c->newLabel();
 		c->mov(qw0->r32(), SPU_OFF_32(gpr, op.rt, &v128::_u32, 3));
 		c->mov(addr->r64(), SPU_OFF_64(ch_out_mbox));
-		c->align(AlignMode::kCode, 16);
+		c->align(kAlignCode, 16);
 		c->bind(again);
 		c->mov(qw0->r32(), qw0->r32());
 		c->bt(addr->r64(), spu_channel::off_count);
@@ -2312,9 +2328,9 @@ void spu_recompiler::WRCH(spu_opcode_t op)
 			c->lea(addr->r64(), get_pc(pos));
 			c->and_(*addr, 0x3fffc);
 			c->mov(SPU_OFF_32(pc), *addr);
-			c->mov(arg1->r32(), +op.ra);
+			c->mov(arg1->r32(), op.ra);
 			c->mov(*arg0, *cpu);
-			c->call(spu_wrch);
+			c->call(imm_ptr(spu_wrch));
 			c->jmp(ret);
 		});
 
@@ -2339,9 +2355,9 @@ void spu_recompiler::WRCH(spu_opcode_t op)
 			c->lea(addr->r64(), get_pc(pos));
 			c->and_(*addr, 0x3fffc);
 			c->mov(SPU_OFF_32(pc), *addr);
-			c->mov(arg1->r32(), MFC_WrTagMask);
+			c->lea(arg1->r32(), MFC_WrTagMask);
 			c->mov(*arg0, *cpu);
-			c->call(spu_wrch);
+			c->call(imm_ptr(spu_wrch));
 			c->jmp(ret);
 		});
 
@@ -2363,9 +2379,9 @@ void spu_recompiler::WRCH(spu_opcode_t op)
 			c->lea(addr->r64(), get_pc(pos));
 			c->and_(*addr, 0x3fffc);
 			c->mov(SPU_OFF_32(pc), *addr);
-			c->mov(arg1->r32(), +op.ra);
+			c->mov(arg1->r32(), op.ra);
 			c->mov(*arg0, *cpu);
-			c->call(spu_wrch);
+			c->call(imm_ptr(spu_wrch));
 			c->jmp(ret);
 
 			c->bind(zero);
@@ -2431,7 +2447,7 @@ void spu_recompiler::WRCH(spu_opcode_t op)
 		c->and_(*addr, 0x3fffc);
 		c->mov(SPU_OFF_32(pc), *addr);
 		c->mov(*arg0, *cpu);
-		c->call(spu_wrch_mfc);
+		c->call(imm_ptr(spu_wrch_mfc));
 		return;
 	}
 	case MFC_WrListStallAck:
@@ -2456,7 +2472,7 @@ void spu_recompiler::WRCH(spu_opcode_t op)
 		c->btr(SPU_OFF_32(ch_stall_mask), arg1->r32());
 		c->jnc(ret);
 		c->mov(*arg0, *cpu);
-		c->call(+sub);
+		c->call(imm_ptr<void(*)(spu_thread*, u32)>(sub));
 		c->bind(ret);
 		return;
 	}
@@ -2464,15 +2480,13 @@ void spu_recompiler::WRCH(spu_opcode_t op)
 	{
 		auto sub = [](spu_thread* _spu)
 		{
-			_spu->get_events(SPU_EVENT_TM);
 			_spu->ch_dec_start_timestamp = get_timebased_time();
 		};
 
 		c->mov(*arg0, *cpu);
-		c->call(+sub);
+		c->call(imm_ptr<void(*)(spu_thread*)>(sub));
 		c->mov(qw0->r32(), SPU_OFF_32(gpr, op.rt, &v128::_u32, 3));
 		c->mov(SPU_OFF_32(ch_dec_value), qw0->r32());
-		c->mov(SPU_OFF_8(is_dec_frozen), 0);
 		return;
 	}
 	case SPU_WrEventMask:
@@ -2497,10 +2511,10 @@ void spu_recompiler::WRCH(spu_opcode_t op)
 	c->lea(addr->r64(), get_pc(m_pos));
 	c->and_(*addr, 0x3fffc);
 	c->mov(SPU_OFF_32(pc), *addr);
-	c->mov(arg1->r32(), +op.ra);
+	c->mov(arg1->r32(), op.ra);
 	c->mov(qw0->r32(), SPU_OFF_32(gpr, op.rt, &v128::_u32, 3));
 	c->mov(*arg0, *cpu);
-	c->call(spu_wrch);
+	c->call(imm_ptr(spu_wrch));
 }
 
 void spu_recompiler::BIZ(spu_opcode_t op)
@@ -2511,7 +2525,7 @@ void spu_recompiler::BIZ(spu_opcode_t op)
 
 	after.emplace_back([=, this, jt = m_targets[m_pos].size() > 1]
 	{
-		c->align(asmjit::AlignMode::kCode, 16);
+		c->align(asmjit::kAlignCode, 16);
 		c->bind(branch_label);
 		c->mov(*addr, SPU_OFF_32(gpr, op.ra, &v128::_u32, 3));
 		c->and_(*addr, 0x3fffc);
@@ -2527,7 +2541,7 @@ void spu_recompiler::BINZ(spu_opcode_t op)
 
 	after.emplace_back([=, this, jt = m_targets[m_pos].size() > 1]
 	{
-		c->align(asmjit::AlignMode::kCode, 16);
+		c->align(asmjit::kAlignCode, 16);
 		c->bind(branch_label);
 		c->mov(*addr, SPU_OFF_32(gpr, op.ra, &v128::_u32, 3));
 		c->and_(*addr, 0x3fffc);
@@ -2543,7 +2557,7 @@ void spu_recompiler::BIHZ(spu_opcode_t op)
 
 	after.emplace_back([=, this, jt = m_targets[m_pos].size() > 1]
 	{
-		c->align(asmjit::AlignMode::kCode, 16);
+		c->align(asmjit::kAlignCode, 16);
 		c->bind(branch_label);
 		c->mov(*addr, SPU_OFF_32(gpr, op.ra, &v128::_u32, 3));
 		c->and_(*addr, 0x3fffc);
@@ -2559,7 +2573,7 @@ void spu_recompiler::BIHNZ(spu_opcode_t op)
 
 	after.emplace_back([=, this, jt = m_targets[m_pos].size() > 1]
 	{
-		c->align(asmjit::AlignMode::kCode, 16);
+		c->align(asmjit::kAlignCode, 16);
 		c->bind(branch_label);
 		c->mov(*addr, SPU_OFF_32(gpr, op.ra, &v128::_u32, 3));
 		c->and_(*addr, 0x3fffc);
@@ -2581,7 +2595,7 @@ void spu_recompiler::STQX(spu_opcode_t op)
 	if (utils::has_ssse3())
 	{
 		const XmmLink& vt = XmmGet(op.rt, XmmType::Int);
-		c->pshufb(vt, XmmConst(v128::from32r(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
+		c->pshufb(vt, XmmConst(_mm_set_epi32(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
 		c->movdqa(asmjit::x86::oword_ptr(*ls, addr->r64()), vt);
 	}
 	else
@@ -2604,12 +2618,6 @@ void spu_recompiler::BI(spu_opcode_t op)
 	{
 		spu_log.error("[0x%x] BI: no targets", m_pos);
 	}
-	else if (op.d && found->second.size() == 1 && found->second[0] == spu_branch_target(m_pos, 1))
-	{
-		// Interrupts-disable pattern
-		c->mov(SPU_OFF_8(interrupts_enabled), 0);
-		return;
-	}
 
 	c->mov(*addr, SPU_OFF_32(gpr, op.ra, &v128::_u32, 3));
 	c->and_(*addr, 0x3fffc);
@@ -2651,19 +2659,19 @@ void spu_recompiler::BISLED(spu_opcode_t op)
 	const XmmLink& vr = XmmAlloc();
 	c->lea(*qw0, get_pc(m_pos + 4));
 	c->movd(vr, qw0->r32());
-	c->pand(vr, XmmConst(v128::from32p(0x3fffc)));
+	c->pand(vr, XmmConst(_mm_set1_epi32(0x3fffc)));
 	c->pslldq(vr, 12);
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 
 	asmjit::Label branch_label = c->newLabel();
 	c->mov(*arg0, *cpu);
-	c->call(+get_events);
+	c->call(asmjit::imm_ptr<u32(*)(spu_thread*)>(get_events));
 	c->test(*addr, 1);
 	c->jne(branch_label);
 
 	after.emplace_back([=, this]()
 	{
-		c->align(asmjit::AlignMode::kCode, 16);
+		c->align(asmjit::kAlignCode, 16);
 		c->bind(branch_label);
 		c->and_(*addr, 0x3fffc);
 		branch_indirect(op, true, false);
@@ -2688,7 +2696,7 @@ void spu_recompiler::GBH(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 	c->psllw(va, 15);
-	c->packsswb(va, XmmConst({}));
+	c->packsswb(va, XmmConst(_mm_setzero_si128()));
 	c->pmovmskb(*addr, va);
 	c->pxor(va, va);
 	c->pinsrw(va, *addr, 6);
@@ -2710,7 +2718,7 @@ void spu_recompiler::FSM(spu_opcode_t op)
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 	const XmmLink& vm = XmmAlloc();
 	c->pshufd(va, va, 0xff);
-	c->movdqa(vm, XmmConst(v128::from32r(8, 4, 2, 1)));
+	c->movdqa(vm, XmmConst(_mm_set_epi32(8, 4, 2, 1)));
 	c->pand(va, vm);
 	c->pcmpeqd(va, vm);
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
@@ -2722,7 +2730,7 @@ void spu_recompiler::FSMH(spu_opcode_t op)
 	const XmmLink& vm = XmmAlloc();
 	c->punpckhwd(va, va);
 	c->pshufd(va, va, 0xaa);
-	c->movdqa(vm, XmmConst(v128::from64r(0x0080004000200010, 0x0008000400020001)));
+	c->movdqa(vm, XmmConst(_mm_set_epi16(128, 64, 32, 16, 8, 4, 2, 1)));
 	c->pand(va, vm);
 	c->pcmpeqw(va, vm);
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
@@ -2735,7 +2743,7 @@ void spu_recompiler::FSMB(spu_opcode_t op)
 
 	if (utils::has_ssse3())
 	{
-		c->pshufb(va, XmmConst(v128::from64r(0x0d0d0d0d0d0d0d0d, 0x0c0c0c0c0c0c0c0c)));
+		c->pshufb(va, XmmConst(_mm_set_epi8(13, 13, 13, 13, 13, 13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 12)));
 	}
 	else
 	{
@@ -2744,7 +2752,7 @@ void spu_recompiler::FSMB(spu_opcode_t op)
 		c->pshufd(va, va, 0xfa);
 	}
 
-	c->movdqa(vm, XmmConst(v128::from64p(0x8040201008040201)));
+	c->movdqa(vm, XmmConst(_mm_set_epi8(-128, 64, 32, 16, 8, 4, 2, 1, -128, 64, 32, 16, 8, 4, 2, 1)));
 	c->pand(va, vm);
 	c->pcmpeqb(va, vm);
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
@@ -2753,83 +2761,16 @@ void spu_recompiler::FSMB(spu_opcode_t op)
 void spu_recompiler::FREST(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Float);
-	const XmmLink& v_fraction = XmmAlloc();
-	const XmmLink& v_exponent = XmmAlloc();
-	const XmmLink& v_sign = XmmAlloc();
-	c->movdqa(v_fraction, va);
-	c->movdqa(v_exponent, va);
-	c->movdqa(v_sign, va);
-
-	c->psrld(v_fraction, 18);
-	c->psrld(v_exponent, 23);
-
-	c->andps(v_fraction, XmmConst(v128::from32p(0x1F)));
-	c->andps(v_exponent, XmmConst(v128::from32p(0xFF)));
-	c->andps(v_sign, XmmConst(v128::from32p(0x80000000)));
-
-	const u64 fraction_lut_addr = reinterpret_cast<u64>(spu_frest_fraction_lut);
-	const u64 exponent_lut_addr = reinterpret_cast<u64>(spu_frest_exponent_lut);
-
-	c->movabs(*arg0, fraction_lut_addr);
-	c->movabs(*arg1, exponent_lut_addr);
-
-	for (u32 index = 0; index < 4; index++)
-	{
-		c->pextrd(*qw0, v_fraction, index);
-		c->mov(*qw1, asmjit::x86::dword_ptr(*arg0, *qw0, 2));
-		c->pinsrd(v_fraction, *qw1, index);
-
-		c->pextrd(*qw0, v_exponent, index);
-		c->mov(*qw1, asmjit::x86::dword_ptr(*arg1, *qw0, 2));
-		c->pinsrd(v_exponent, *qw1, index);
-	}
-
-	// AVX2(not working?)
-	// c->mov(qw1->r64(),spu_frest_fraction_lut);
-	// c->vpgatherdd(v_fraction, asmjit::x86::dword_ptr(*qw1));
-	// c->mov(qw0->r64(),spu_frest_exponent_lut);
-	// c->vpgatherdd(v_exponent, asmjit::x86::dword_ptr(*qw0));
-
-	c->orps(v_fraction, v_exponent);
-	c->orps(v_sign, v_fraction);
-
-	c->movaps(SPU_OFF_128(gpr, op.rt), v_sign);
+	c->rcpps(va, va);
+	c->movaps(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::FRSQEST(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Float);
-	const XmmLink& v_fraction = XmmAlloc();
-	const XmmLink& v_exponent = XmmAlloc();
-	c->movdqa(v_fraction, va);
-	c->movdqa(v_exponent, va);
-
-	c->psrld(v_fraction, 18);
-	c->psrld(v_exponent, 23);
-
-	c->andps(v_fraction, XmmConst(v128::from32p(0x3F)));
-	c->andps(v_exponent, XmmConst(v128::from32p(0xFF)));
-
-	const u64 fraction_lut_addr = reinterpret_cast<u64>(spu_frsqest_fraction_lut);
-	const u64 exponent_lut_addr = reinterpret_cast<u64>(spu_frsqest_exponent_lut);
-
-	c->movabs(*arg0, fraction_lut_addr);
-	c->movabs(*arg1, exponent_lut_addr);
-
-	for (u32 index = 0; index < 4; index++)
-	{
-		c->pextrd(*qw0, v_fraction, index);
-		c->mov(*qw1, asmjit::x86::dword_ptr(*arg0, *qw0, 2));
-		c->pinsrd(v_fraction, *qw1, index);
-
-		c->pextrd(*qw0, v_exponent, index);
-		c->mov(*qw1, asmjit::x86::dword_ptr(*arg1, *qw0, 2));
-		c->pinsrd(v_exponent, *qw1, index);
-	}
-
-	c->orps(v_fraction, v_exponent);
-
-	c->movaps(SPU_OFF_128(gpr, op.rt), v_fraction);
+	c->andps(va, XmmConst(_mm_set1_epi32(0x7fffffff))); // abs
+	c->rsqrtps(va, va);
+	c->movaps(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::LQX(spu_opcode_t op)
@@ -2842,7 +2783,7 @@ void spu_recompiler::LQX(spu_opcode_t op)
 	{
 		const XmmLink& vt = XmmAlloc();
 		c->movdqa(vt, asmjit::x86::oword_ptr(*ls, addr->r64()));
-		c->pshufb(vt, XmmConst(v128::from32r(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
+		c->pshufb(vt, XmmConst(_mm_set_epi32(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
 	}
 	else
@@ -2864,7 +2805,7 @@ void spu_recompiler::ROTQBYBI(spu_opcode_t op)
 	}
 
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->mov(*qw0, +g_spu_imm.rldq_pshufb);
+	c->mov(*qw0, asmjit::imm_ptr(+g_spu_imm.rldq_pshufb));
 	c->mov(*addr, SPU_OFF_32(gpr, op.rb, &v128::_u32, 3));
 	c->and_(*addr, 0xf << 3);
 	c->pshufb(va, asmjit::x86::oword_ptr(*qw0, addr->r64(), 1));
@@ -2879,7 +2820,7 @@ void spu_recompiler::ROTQMBYBI(spu_opcode_t op)
 	}
 
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->mov(*qw0, +g_spu_imm.srdq_pshufb);
+	c->mov(*qw0, asmjit::imm_ptr(+g_spu_imm.srdq_pshufb));
 	c->mov(*addr, SPU_OFF_32(gpr, op.rb, &v128::_u32, 3));
 	c->and_(*addr, 0x1f << 3);
 	c->pshufb(va, asmjit::x86::oword_ptr(*qw0, addr->r64(), 1));
@@ -2894,7 +2835,7 @@ void spu_recompiler::SHLQBYBI(spu_opcode_t op)
 	}
 
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->mov(*qw0, +g_spu_imm.sldq_pshufb);
+	c->mov(*qw0, asmjit::imm_ptr(+g_spu_imm.sldq_pshufb));
 	c->mov(*addr, SPU_OFF_32(gpr, op.rb, &v128::_u32, 3));
 	c->and_(*addr, 0x1f << 3);
 	c->pshufb(va, asmjit::x86::oword_ptr(*qw0, addr->r64(), 1));
@@ -2909,7 +2850,7 @@ void spu_recompiler::CBX(spu_opcode_t op)
 	c->and_(*addr, 0xf);
 
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from32r(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
+	c->movdqa(vr, XmmConst(_mm_set_epi32(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 	c->mov(asmjit::x86::byte_ptr(*cpu, addr->r64(), 0, offset32(&spu_thread::gpr, op.rt)), 0x03);
 }
@@ -2922,7 +2863,7 @@ void spu_recompiler::CHX(spu_opcode_t op)
 	c->and_(*addr, 0xe);
 
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from32r(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
+	c->movdqa(vr, XmmConst(_mm_set_epi32(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 	c->mov(asmjit::x86::word_ptr(*cpu, addr->r64(), 0, offset32(&spu_thread::gpr, op.rt)), 0x0203);
 }
@@ -2935,7 +2876,7 @@ void spu_recompiler::CWX(spu_opcode_t op)
 	c->and_(*addr, 0xc);
 
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from32r(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
+	c->movdqa(vr, XmmConst(_mm_set_epi32(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 	c->mov(asmjit::x86::dword_ptr(*cpu, addr->r64(), 0, offset32(&spu_thread::gpr, op.rt)), 0x00010203);
 }
@@ -2948,9 +2889,9 @@ void spu_recompiler::CDX(spu_opcode_t op)
 	c->and_(*addr, 0x8);
 
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from32r(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
+	c->movdqa(vr, XmmConst(_mm_set_epi32(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
-	c->mov(*qw0, asmjit::Imm(0x0001020304050607ull));
+	c->mov(*qw0, asmjit::imm_u(0x0001020304050607));
 	c->mov(asmjit::x86::qword_ptr(*cpu, addr->r64(), 0, offset32(&spu_thread::gpr, op.rt)), *qw0);
 }
 
@@ -2961,8 +2902,8 @@ void spu_recompiler::ROTQBI(spu_opcode_t op)
 	const XmmLink& vt = XmmAlloc();
 	const XmmLink& v4 = XmmAlloc();
 	c->psrldq(vb, 12);
-	c->pand(vb, XmmConst(v128::from64r(0, 7)));
-	c->movdqa(v4, XmmConst(v128::from64r(0, 64)));
+	c->pand(vb, XmmConst(_mm_set_epi64x(0, 7)));
+	c->movdqa(v4, XmmConst(_mm_set_epi64x(0, 64)));
 	c->pshufd(vt, va, 0x4e);
 	c->psubq(v4, vb);
 	c->psllq(va, vb);
@@ -2980,8 +2921,8 @@ void spu_recompiler::ROTQMBI(spu_opcode_t op)
 	c->psrldq(vt, 12);
 	c->pxor(vb, vb);
 	c->psubq(vb, vt);
-	c->pand(vb, XmmConst(v128::from64r(0, 7)));
-	c->movdqa(v4, XmmConst(v128::from64r(0, 64)));
+	c->pand(vb, XmmConst(_mm_set_epi64x(0, 7)));
+	c->movdqa(v4, XmmConst(_mm_set_epi64x(0, 64)));
 	c->movdqa(vt, va);
 	c->psrldq(vt, 8);
 	c->psubq(v4, vb);
@@ -2998,8 +2939,8 @@ void spu_recompiler::SHLQBI(spu_opcode_t op)
 	const XmmLink& vt = XmmAlloc();
 	const XmmLink& v4 = XmmAlloc();
 	c->psrldq(vb, 12);
-	c->pand(vb, XmmConst(v128::from64r(0, 7)));
-	c->movdqa(v4, XmmConst(v128::from64r(0, 64)));
+	c->pand(vb, XmmConst(_mm_set_epi64x(0, 7)));
+	c->movdqa(v4, XmmConst(_mm_set_epi64x(0, 64)));
 	c->movdqa(vt, va);
 	c->pslldq(vt, 8);
 	c->psubq(v4, vb);
@@ -3017,7 +2958,7 @@ void spu_recompiler::ROTQBY(spu_opcode_t op)
 	}
 
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->mov(*qw0, +g_spu_imm.rldq_pshufb);
+	c->mov(*qw0, asmjit::imm_ptr(+g_spu_imm.rldq_pshufb));
 	c->mov(*addr, SPU_OFF_32(gpr, op.rb, &v128::_u32, 3));
 	c->and_(*addr, 0xf);
 	c->shl(*addr, 4);
@@ -3033,7 +2974,7 @@ void spu_recompiler::ROTQMBY(spu_opcode_t op)
 	}
 
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->mov(*qw0, +g_spu_imm.srdq_pshufb);
+	c->mov(*qw0, asmjit::imm_ptr(+g_spu_imm.srdq_pshufb));
 	c->mov(*addr, SPU_OFF_32(gpr, op.rb, &v128::_u32, 3));
 	c->and_(*addr, 0x1f);
 	c->shl(*addr, 4);
@@ -3049,7 +2990,7 @@ void spu_recompiler::SHLQBY(spu_opcode_t op)
 	}
 
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->mov(*qw0, +g_spu_imm.sldq_pshufb);
+	c->mov(*qw0, asmjit::imm_ptr(+g_spu_imm.sldq_pshufb));
 	c->mov(*addr, SPU_OFF_32(gpr, op.rb, &v128::_u32, 3));
 	c->and_(*addr, 0x1f);
 	c->shl(*addr, 4);
@@ -3075,7 +3016,7 @@ void spu_recompiler::CBD(spu_opcode_t op)
 	//{
 	//	// assuming that SP % 16 is always zero
 	//	const XmmLink& vr = XmmAlloc();
-	//	v128 value = v128::fromV(v128::from32r(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f));
+	//	v128 value = v128::fromV(_mm_set_epi32(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f));
 	//	value.u8r[op.i7 & 0xf] = 0x03;
 	//	c->movdqa(vr, XmmConst(value));
 	//	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
@@ -3083,12 +3024,12 @@ void spu_recompiler::CBD(spu_opcode_t op)
 	//}
 
 	c->mov(*addr, SPU_OFF_32(gpr, op.ra, &v128::_u32, 3));
-	if (op.i7) c->add(*addr, +op.i7);
+	if (op.i7) c->add(*addr, op.i7);
 	c->not_(*addr);
 	c->and_(*addr, 0xf);
 
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from32r(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
+	c->movdqa(vr, XmmConst(_mm_set_epi32(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 	c->mov(asmjit::x86::byte_ptr(*cpu, addr->r64(), 0, offset32(&spu_thread::gpr, op.rt)), 0x03);
 }
@@ -3099,7 +3040,7 @@ void spu_recompiler::CHD(spu_opcode_t op)
 	//{
 	//	// assuming that SP % 16 is always zero
 	//	const XmmLink& vr = XmmAlloc();
-	//	v128 value = v128::fromV(v128::from32r(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f));
+	//	v128 value = v128::fromV(_mm_set_epi32(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f));
 	//	value.u16r[(op.i7 >> 1) & 0x7] = 0x0203;
 	//	c->movdqa(vr, XmmConst(value));
 	//	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
@@ -3107,12 +3048,12 @@ void spu_recompiler::CHD(spu_opcode_t op)
 	//}
 
 	c->mov(*addr, SPU_OFF_32(gpr, op.ra, &v128::_u32, 3));
-	if (op.i7) c->add(*addr, +op.i7);
+	if (op.i7) c->add(*addr, op.i7);
 	c->not_(*addr);
 	c->and_(*addr, 0xe);
 
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from32r(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
+	c->movdqa(vr, XmmConst(_mm_set_epi32(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 	c->mov(asmjit::x86::word_ptr(*cpu, addr->r64(), 0, offset32(&spu_thread::gpr, op.rt)), 0x0203);
 }
@@ -3123,7 +3064,7 @@ void spu_recompiler::CWD(spu_opcode_t op)
 	//{
 	//	// assuming that SP % 16 is always zero
 	//	const XmmLink& vr = XmmAlloc();
-	//	v128 value = v128::fromV(v128::from32r(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f));
+	//	v128 value = v128::fromV(_mm_set_epi32(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f));
 	//	value.u32r[(op.i7 >> 2) & 0x3] = 0x00010203;
 	//	c->movdqa(vr, XmmConst(value));
 	//	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
@@ -3131,12 +3072,12 @@ void spu_recompiler::CWD(spu_opcode_t op)
 	//}
 
 	c->mov(*addr, SPU_OFF_32(gpr, op.ra, &v128::_u32, 3));
-	if (op.i7) c->add(*addr, +op.i7);
+	if (op.i7) c->add(*addr, op.i7);
 	c->not_(*addr);
 	c->and_(*addr, 0xc);
 
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from32r(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
+	c->movdqa(vr, XmmConst(_mm_set_epi32(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 	c->mov(asmjit::x86::dword_ptr(*cpu, addr->r64(), 0, offset32(&spu_thread::gpr, op.rt)), 0x00010203);
 }
@@ -3147,7 +3088,7 @@ void spu_recompiler::CDD(spu_opcode_t op)
 	//{
 	//	// assuming that SP % 16 is always zero
 	//	const XmmLink& vr = XmmAlloc();
-	//	v128 value = v128::fromV(v128::from32r(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f));
+	//	v128 value = v128::fromV(_mm_set_epi32(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f));
 	//	value.u64r[(op.i7 >> 3) & 0x1] = 0x0001020304050607ull;
 	//	c->movdqa(vr, XmmConst(value));
 	//	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
@@ -3155,14 +3096,14 @@ void spu_recompiler::CDD(spu_opcode_t op)
 	//}
 
 	c->mov(*addr, SPU_OFF_32(gpr, op.ra, &v128::_u32, 3));
-	if (op.i7) c->add(*addr, +op.i7);
+	if (op.i7) c->add(*addr, op.i7);
 	c->not_(*addr);
 	c->and_(*addr, 0x8);
 
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from32r(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
+	c->movdqa(vr, XmmConst(_mm_set_epi32(0x10111213, 0x14151617, 0x18191a1b, 0x1c1d1e1f)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
-	c->mov(*qw0, asmjit::Imm(0x0001020304050607ull));
+	c->mov(*qw0, asmjit::imm_u(0x0001020304050607));
 	c->mov(asmjit::x86::qword_ptr(*cpu, addr->r64(), 0, offset32(&spu_thread::gpr, op.rt)), *qw0);
 }
 
@@ -3282,7 +3223,7 @@ void spu_recompiler::EQV(spu_opcode_t op)
 		return;
 	}
 
-	c->pxor(vb, XmmConst(v128::from32p(0xffffffff)));
+	c->pxor(vb, XmmConst(_mm_set1_epi32(0xffffffff)));
 	c->pxor(vb, SPU_OFF_128(gpr, op.ra));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vb);
 }
@@ -3300,7 +3241,7 @@ void spu_recompiler::SUMB(spu_opcode_t op)
 	const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 	const XmmLink& v1 = XmmAlloc();
 	const XmmLink& v2 = XmmAlloc();
-	c->movdqa(v2, XmmConst(v128::from16p(0xff)));
+	c->movdqa(v2, XmmConst(_mm_set1_epi16(0xff)));
 	c->movdqa(v1, va);
 	c->psrlw(va, 8);
 	c->pand(v1, v2);
@@ -3308,7 +3249,7 @@ void spu_recompiler::SUMB(spu_opcode_t op)
 	c->psrlw(vb, 8);
 	c->paddw(va, v1);
 	c->paddw(vb, v2);
-	c->movdqa(v2, XmmConst(v128::from32p(0xffff)));
+	c->movdqa(v2, XmmConst(_mm_set1_epi32(0xffff)));
 	c->movdqa(v1, va);
 	c->psrld(va, 16);
 	c->pand(v1, v2);
@@ -3383,19 +3324,19 @@ void spu_recompiler::CNTB(spu_opcode_t op)
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 	const XmmLink& v1 = XmmAlloc();
 	const XmmLink& vm = XmmAlloc();
-	c->movdqa(vm, XmmConst(v128::from8p(0x55)));
+	c->movdqa(vm, XmmConst(_mm_set1_epi8(0x55)));
 	c->movdqa(v1, va);
 	c->pand(va, vm);
 	c->psrlq(v1, 1);
 	c->pand(v1, vm);
 	c->paddb(va, v1);
-	c->movdqa(vm, XmmConst(v128::from8p(0x33)));
+	c->movdqa(vm, XmmConst(_mm_set1_epi8(0x33)));
 	c->movdqa(v1, va);
 	c->pand(va, vm);
 	c->psrlq(v1, 2);
 	c->pand(v1, vm);
 	c->paddb(va, v1);
-	c->movdqa(vm, XmmConst(v128::from8p(0x0f)));
+	c->movdqa(vm, XmmConst(_mm_set1_epi8(0x0f)));
 	c->movdqa(v1, va);
 	c->pand(va, vm);
 	c->psrlq(v1, 4);
@@ -3417,7 +3358,7 @@ void spu_recompiler::CLGT(spu_opcode_t op)
 	// compare if-greater-than
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 	const XmmLink& vi = XmmAlloc();
-	c->movdqa(vi, XmmConst(v128::from32p(0x80000000)));
+	c->movdqa(vi, XmmConst(_mm_set1_epi32(0x80000000)));
 	c->pxor(va, vi);
 	c->pxor(vi, SPU_OFF_128(gpr, op.rb));
 	c->pcmpgtd(va, vi);
@@ -3434,8 +3375,8 @@ void spu_recompiler::ANDC(spu_opcode_t op)
 
 void spu_recompiler::FCGT(spu_opcode_t op)
 {
-	const auto last_exp_bit = XmmConst(v128::from32p(0x00800000));
-	const auto all_exp_bits = XmmConst(v128::from32p(0x7f800000));
+	const auto last_exp_bit = XmmConst(_mm_set1_epi32(0x00800000));
+	const auto all_exp_bits = XmmConst(_mm_set1_epi32(0x7f800000));
 
 	const XmmLink& tmp0 = XmmAlloc();
 	const XmmLink& tmp1 = XmmAlloc();
@@ -3502,8 +3443,8 @@ void spu_recompiler::FS(spu_opcode_t op)
 
 void spu_recompiler::FM(spu_opcode_t op)
 {
-	const auto sign_bits = XmmConst(v128::from32p(0x80000000));
-	const auto all_exp_bits = XmmConst(v128::from32p(0x7f800000));
+	const auto sign_bits = XmmConst(_mm_set1_epi32(0x80000000));
+	const auto all_exp_bits = XmmConst(_mm_set1_epi32(0x7f800000));
 
 	const XmmLink& tmp0 = XmmAlloc();
 	const XmmLink& tmp1 = XmmAlloc();
@@ -3558,7 +3499,7 @@ void spu_recompiler::CLGTH(spu_opcode_t op)
 	// compare if-greater-than
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 	const XmmLink& vi = XmmAlloc();
-	c->movdqa(vi, XmmConst(v128::from16p(0x8000)));
+	c->movdqa(vi, XmmConst(_mm_set1_epi16(smin)));
 	c->pxor(va, vi);
 	c->pxor(vi, SPU_OFF_128(gpr, op.rb));
 	c->pcmpgtw(va, vi);
@@ -3576,7 +3517,7 @@ void spu_recompiler::ORC(spu_opcode_t op)
 		return;
 	}
 
-	c->pxor(vb, XmmConst(v128::from32p(0xffffffff)));
+	c->pxor(vb, XmmConst(_mm_set1_epi32(0xffffffff)));
 	c->por(vb, SPU_OFF_128(gpr, op.ra));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vb);
 }
@@ -3586,8 +3527,8 @@ void spu_recompiler::FCMGT(spu_opcode_t op)
 	// reverted less-than
 	// since comparison is absoulte, a > b if a is extended and b is not extended
 	// flush denormals to zero to make zero == zero work
-	const auto all_exp_bits = XmmConst(v128::from32p(0x7f800000));
-	const auto remove_sign_bits = XmmConst(v128::from32p(0x7fffffff));
+	const auto all_exp_bits = XmmConst(_mm_set1_epi32(0x7f800000));
+	const auto remove_sign_bits = XmmConst(_mm_set1_epi32(0x7fffffff));
 
 	const XmmLink& tmp0 = XmmAlloc();
 	const XmmLink& tmp1 = XmmAlloc();
@@ -3654,7 +3595,7 @@ void spu_recompiler::CLGTB(spu_opcode_t op)
 	// compare if-greater-than
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 	const XmmLink& vi = XmmAlloc();
-	c->movdqa(vi, XmmConst(v128::from8p(0x80)));
+	c->movdqa(vi, XmmConst(_mm_set1_epi8(smin)));
 	c->pxor(va, vi);
 	c->pxor(vi, SPU_OFF_128(gpr, op.rb));
 	c->pcmpgtb(va, vi);
@@ -3715,7 +3656,7 @@ void spu_recompiler::DFNMA(spu_opcode_t op)
 	const XmmLink& vt = XmmGet(op.rt, XmmType::Double);
 	c->mulpd(va, SPU_OFF_128(gpr, op.rb));
 	c->addpd(va, vt);
-	c->xorpd(va, XmmConst(v128::from64p(0x8000000000000000)));
+	c->xorpd(va, XmmConst(_mm_set1_epi64x(0x8000000000000000)));
 	c->movapd(SPU_OFF_128(gpr, op.rt), va);
 }
 
@@ -3734,7 +3675,7 @@ void spu_recompiler::MPYHHU(spu_opcode_t op)
 	c->movdqa(va2, va);
 	c->pmulhuw(va, vb);
 	c->pmullw(va2, vb);
-	c->pand(va, XmmConst(v128::from32p(0xffff0000)));
+	c->pand(va, XmmConst(_mm_set1_epi32(0xffff0000)));
 	c->psrld(va2, 16);
 	c->por(va, va2);
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
@@ -3743,7 +3684,7 @@ void spu_recompiler::MPYHHU(spu_opcode_t op)
 void spu_recompiler::ADDX(spu_opcode_t op)
 {
 	const XmmLink& vt = XmmGet(op.rt, XmmType::Int);
-	c->pand(vt, XmmConst(v128::from32p(1)));
+	c->pand(vt, XmmConst(_mm_set1_epi32(1)));
 	c->paddd(vt, SPU_OFF_128(gpr, op.ra));
 	c->paddd(vt, SPU_OFF_128(gpr, op.rb));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
@@ -3753,7 +3694,7 @@ void spu_recompiler::SFX(spu_opcode_t op)
 {
 	const XmmLink& vt = XmmGet(op.rt, XmmType::Int);
 	const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
-	c->pandn(vt, XmmConst(v128::from32p(1)));
+	c->pandn(vt, XmmConst(_mm_set1_epi32(1)));
 	c->psubd(vb, SPU_OFF_128(gpr, op.ra));
 	c->psubd(vb, vt);
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vb);
@@ -3780,7 +3721,7 @@ void spu_recompiler::CGX(spu_opcode_t op) //nf
 		c->paddd(res, vb);
 	}
 
-	c->movdqa(sign, XmmConst(v128::from32p(0x80000000)));
+	c->movdqa(sign, XmmConst(_mm_set1_epi32(smin)));
 	c->pxor(va, sign);
 	c->pxor(res, sign);
 	c->pcmpgtd(va, res);
@@ -3813,7 +3754,7 @@ void spu_recompiler::BGX(spu_opcode_t op) //nf
 	}
 
 	c->pand(vt, temp);
-	c->movdqa(sign, XmmConst(v128::from32p(0x80000000)));
+	c->movdqa(sign, XmmConst(_mm_set1_epi32(smin)));
 	c->pxor(va, sign);
 	c->pxor(vb, sign);
 	c->pcmpgtd(vb, va);
@@ -3843,7 +3784,7 @@ void spu_recompiler::MPYHHAU(spu_opcode_t op)
 	c->movdqa(va2, va);
 	c->pmulhuw(va, vb);
 	c->pmullw(va2, vb);
-	c->pand(va, XmmConst(v128::from32p(0xffff0000)));
+	c->pand(va, XmmConst(_mm_set1_epi32(0xffff0000)));
 	c->psrld(va2, 16);
 	c->paddd(vt, va);
 	c->paddd(vt, va2);
@@ -3902,7 +3843,7 @@ void spu_recompiler::MPY(spu_opcode_t op)
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 	const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 	const XmmLink& vi = XmmAlloc();
-	c->movdqa(vi, XmmConst(v128::from32p(0xffff)));
+	c->movdqa(vi, XmmConst(_mm_set1_epi32(0xffff)));
 	c->pand(va, vi);
 	c->pand(vb, vi);
 	c->pmaddwd(va, vb);
@@ -3950,7 +3891,7 @@ void spu_recompiler::FCMEQ(spu_opcode_t op)
 {
 	const XmmLink& vb = XmmGet(op.rb, XmmType::Float);
 	const XmmLink& vi = XmmAlloc();
-	c->movaps(vi, XmmConst(v128::from32p(0x7fffffff)));
+	c->movaps(vi, XmmConst(_mm_set1_epi32(0x7fffffff)));
 	c->andps(vb, vi); // abs
 	c->andps(vi, SPU_OFF_128(gpr, op.ra));
 	c->cmpps(vb, vi, 0); // ==
@@ -3971,7 +3912,7 @@ void spu_recompiler::MPYU(spu_opcode_t op)
 	c->pmulhuw(va, vb);
 	c->pmullw(va2, vb);
 	c->pslld(va, 16);
-	c->pand(va2, XmmConst(v128::from32p(0xffff)));
+	c->pand(va2, XmmConst(_mm_set1_epi32(0xffff)));
 	c->por(va, va2);
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
@@ -3986,49 +3927,7 @@ void spu_recompiler::CEQB(spu_opcode_t op)
 void spu_recompiler::FI(spu_opcode_t op)
 {
 	// Floating Interpolate
-	const XmmLink& va = XmmGet(op.ra, XmmType::Float);
 	const XmmLink& vb = XmmGet(op.rb, XmmType::Float);
-	const XmmLink& vb_base = XmmAlloc();
-	const XmmLink& ymul = XmmAlloc();
-	const XmmLink& temp_reg = XmmAlloc();
-	const XmmLink& temp_reg2 = XmmAlloc();
-
-	c->movdqa(vb_base, vb);
-	c->movdqa(ymul, vb);
-	c->movdqa(temp_reg, va);
-
-	c->pand(vb_base, XmmConst(v128::from32p(0x007ffc00u)));
-	c->pslld(vb_base, 9);
-
-	c->pand(temp_reg, XmmConst(v128::from32p(0x7ffff))); // va_fraction
-	c->pand(ymul, XmmConst(v128::from32p(0x3ff)));
-	c->pmulld(ymul, temp_reg);
-
-	c->movdqa(temp_reg, vb_base);
-	c->psubd(temp_reg, ymul);
-
-	// Makes signed comparison unsigned and determines if we need to adjust exponent
-	auto xor_const = XmmConst(v128::from32p(0x80000000));
-	c->pxor(ymul, xor_const);
-	c->pxor(vb_base, xor_const);
-	c->pcmpgtd(ymul, vb_base);
-	c->movdqa(vb_base, ymul);
-
-	c->movdqa(temp_reg2, temp_reg);
-	c->pand(temp_reg2, vb_base);
-	c->psrld(temp_reg2, 8); // only shift right by 8 if exponent is adjusted
-	c->xorps(vb_base, XmmConst(v128::from32p(0xFFFFFFFF))); // Invert the mask
-	c->pand(temp_reg, vb_base);
-	c->psrld(temp_reg, 9); // shift right by 9 if not adjusted
-	c->por(temp_reg, temp_reg2);
-
-	c->pand(vb, XmmConst(v128::from32p(0xff800000u)));
-	c->pand(temp_reg, XmmConst(v128::from32p(~0xff800000u)));
-	c->por(vb, temp_reg);
-
-	c->pand(ymul, XmmConst(v128::from32p(1 << 23)));
-	c->psubd(vb, ymul);
-
 	c->movaps(SPU_OFF_128(gpr, op.rt), vb);
 }
 
@@ -4057,8 +3956,8 @@ void spu_recompiler::CFLTS(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Float);
 	const XmmLink& vi = XmmAlloc();
-	if (op.i8 != 173) c->mulps(va, XmmConst(v128::fromf32p(std::exp2(static_cast<float>(static_cast<s16>(173 - op.i8)))))); // scale
-	c->movaps(vi, XmmConst(v128::fromf32p(std::exp2(31.f))));
+	if (op.i8 != 173) c->mulps(va, XmmConst(_mm_set1_ps(std::exp2(static_cast<float>(static_cast<s16>(173 - op.i8)))))); // scale
+	c->movaps(vi, XmmConst(_mm_set1_ps(std::exp2(31.f))));
 	c->cmpps(vi, va, 2);
 	c->cvttps2dq(va, va); // convert to ints with truncation
 	c->pxor(va, vi); // fix result saturation (0x80000000 -> 0x7fffffff)
@@ -4071,7 +3970,7 @@ void spu_recompiler::CFLTU(spu_opcode_t op)
 	const XmmLink& vs = XmmAlloc();
 	const XmmLink& vs2 = XmmAlloc();
 	const XmmLink& vs3 = XmmAlloc();
-	if (op.i8 != 173) c->mulps(va, XmmConst(v128::fromf32p(std::exp2(static_cast<float>(static_cast<s16>(173 - op.i8)))))); // scale
+	if (op.i8 != 173) c->mulps(va, XmmConst(_mm_set1_ps(std::exp2(static_cast<float>(static_cast<s16>(173 - op.i8)))))); // scale
 
 	if (utils::has_avx512())
 	{
@@ -4087,12 +3986,12 @@ void spu_recompiler::CFLTU(spu_opcode_t op)
 	c->andnps(va, vs);
 	c->movaps(vs, va); // copy scaled value
 	c->movaps(vs2, va);
-	c->movaps(vs3, XmmConst(v128::fromf32p(std::exp2(31.f))));
+	c->movaps(vs3, XmmConst(_mm_set1_ps(std::exp2(31.f))));
 	c->subps(vs2, vs3);
 	c->cmpps(vs3, vs, 2);
 	c->andps(vs2, vs3);
 	c->cvttps2dq(va, va);
-	c->cmpps(vs, XmmConst(v128::fromf32p(std::exp2(32.f))), 5);
+	c->cmpps(vs, XmmConst(_mm_set1_ps(std::exp2(32.f))), 5);
 	c->cvttps2dq(vs2, vs2);
 	c->por(va, vs);
 	c->por(va, vs2);
@@ -4103,7 +4002,7 @@ void spu_recompiler::CSFLT(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 	c->cvtdq2ps(va, va); // convert to floats
-	if (op.i8 != 155) c->mulps(va, XmmConst(v128::fromf32p(std::exp2(static_cast<float>(static_cast<s16>(op.i8 - 155)))))); // scale
+	if (op.i8 != 155) c->mulps(va, XmmConst(_mm_set1_ps(std::exp2(static_cast<float>(static_cast<s16>(op.i8 - 155)))))); // scale
 	c->movaps(SPU_OFF_128(gpr, op.rt), va);
 }
 
@@ -4119,14 +4018,14 @@ void spu_recompiler::CUFLT(spu_opcode_t op)
 	else
 	{
 		c->movdqa(v1, va);
-		c->pand(va, XmmConst(v128::from32p(0x7fffffff)));
+		c->pand(va, XmmConst(_mm_set1_epi32(0x7fffffff)));
 		c->cvtdq2ps(va, va); // convert to floats
 		c->psrad(v1, 31); // generate mask from sign bit
-		c->andps(v1, XmmConst(v128::fromf32p(std::exp2(31.f)))); // generate correction component
+		c->andps(v1, XmmConst(_mm_set1_ps(std::exp2(31.f)))); // generate correction component
 		c->addps(va, v1); // add correction component
 	}
 
-	if (op.i8 != 155) c->mulps(va, XmmConst(v128::fromf32p(std::exp2(static_cast<float>(static_cast<s16>(op.i8 - 155)))))); // scale
+	if (op.i8 != 155) c->mulps(va, XmmConst(_mm_set1_ps(std::exp2(static_cast<float>(static_cast<s16>(op.i8 - 155)))))); // scale
 	c->movaps(SPU_OFF_128(gpr, op.rt), va);
 }
 
@@ -4145,7 +4044,7 @@ void spu_recompiler::BRZ(spu_opcode_t op)
 
 	after.emplace_back([=, this]()
 	{
-		c->align(asmjit::AlignMode::kCode, 16);
+		c->align(asmjit::kAlignCode, 16);
 		c->bind(branch_label);
 		branch_fixed(target);
 	});
@@ -4156,7 +4055,7 @@ void spu_recompiler::STQA(spu_opcode_t op)
 	if (utils::has_ssse3())
 	{
 		const XmmLink& vt = XmmGet(op.rt, XmmType::Int);
-		c->pshufb(vt, XmmConst(v128::from32r(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
+		c->pshufb(vt, XmmConst(_mm_set_epi32(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
 		c->movdqa(asmjit::x86::oword_ptr(*ls, spu_ls_target(0, op.i16)), vt);
 	}
 	else
@@ -4185,7 +4084,7 @@ void spu_recompiler::BRNZ(spu_opcode_t op)
 
 	after.emplace_back([=, this]()
 	{
-		c->align(asmjit::AlignMode::kCode, 16);
+		c->align(asmjit::kAlignCode, 16);
 		c->bind(branch_label);
 		branch_fixed(target);
 	});
@@ -4206,7 +4105,7 @@ void spu_recompiler::BRHZ(spu_opcode_t op)
 
 	after.emplace_back([=, this]()
 	{
-		c->align(asmjit::AlignMode::kCode, 16);
+		c->align(asmjit::kAlignCode, 16);
 		c->bind(branch_label);
 		branch_fixed(target);
 	});
@@ -4227,7 +4126,7 @@ void spu_recompiler::BRHNZ(spu_opcode_t op)
 
 	after.emplace_back([=, this]()
 	{
-		c->align(asmjit::AlignMode::kCode, 16);
+		c->align(asmjit::kAlignCode, 16);
 		c->bind(branch_label);
 		branch_fixed(target);
 	});
@@ -4241,7 +4140,7 @@ void spu_recompiler::STQR(spu_opcode_t op)
 	if (utils::has_ssse3())
 	{
 		const XmmLink& vt = XmmGet(op.rt, XmmType::Int);
-		c->pshufb(vt, XmmConst(v128::from32r(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
+		c->pshufb(vt, XmmConst(_mm_set_epi32(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
 		c->movdqa(asmjit::x86::oword_ptr(*ls, addr->r64()), vt);
 	}
 	else
@@ -4269,7 +4168,7 @@ void spu_recompiler::LQA(spu_opcode_t op)
 	{
 		const XmmLink& vt = XmmAlloc();
 		c->movdqa(vt, asmjit::x86::oword_ptr(*ls, spu_ls_target(0, op.i16)));
-		c->pshufb(vt, XmmConst(v128::from32r(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
+		c->pshufb(vt, XmmConst(_mm_set_epi32(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
 	}
 	else
@@ -4349,7 +4248,7 @@ void spu_recompiler::LQR(spu_opcode_t op)
 	{
 		const XmmLink& vt = XmmAlloc();
 		c->movdqa(vt, asmjit::x86::oword_ptr(*ls, addr->r64()));
-		c->pshufb(vt, XmmConst(v128::from32r(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
+		c->pshufb(vt, XmmConst(_mm_set_epi32(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
 	}
 	else
@@ -4366,56 +4265,56 @@ void spu_recompiler::LQR(spu_opcode_t op)
 void spu_recompiler::IL(spu_opcode_t op)
 {
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from32p(op.si16)));
+	c->movdqa(vr, XmmConst(_mm_set1_epi32(op.si16)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 }
 
 void spu_recompiler::ILHU(spu_opcode_t op)
 {
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from32p(op.i16 << 16)));
+	c->movdqa(vr, XmmConst(_mm_set1_epi32(op.i16 << 16)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 }
 
 void spu_recompiler::ILH(spu_opcode_t op)
 {
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from16p(op.i16)));
+	c->movdqa(vr, XmmConst(_mm_set1_epi16(op.i16)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 }
 
 void spu_recompiler::IOHL(spu_opcode_t op)
 {
 	const XmmLink& vt = XmmGet(op.rt, XmmType::Int);
-	c->por(vt, XmmConst(v128::from32p(op.i16)));
+	c->por(vt, XmmConst(_mm_set1_epi32(op.i16)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
 }
 
 void spu_recompiler::ORI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	if (op.si10) c->por(va, XmmConst(v128::from32p(op.si10)));
+	if (op.si10) c->por(va, XmmConst(_mm_set1_epi32(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::ORHI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->por(va, XmmConst(v128::from16p(op.si10)));
+	c->por(va, XmmConst(_mm_set1_epi16(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::ORBI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->por(va, XmmConst(v128::from8p(op.si10)));
+	c->por(va, XmmConst(_mm_set1_epi8(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::SFI(spu_opcode_t op)
 {
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from32p(op.si10)));
+	c->movdqa(vr, XmmConst(_mm_set1_epi32(op.si10)));
 	c->psubd(vr, SPU_OFF_128(gpr, op.ra));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 }
@@ -4423,7 +4322,7 @@ void spu_recompiler::SFI(spu_opcode_t op)
 void spu_recompiler::SFHI(spu_opcode_t op)
 {
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from16p(op.si10)));
+	c->movdqa(vr, XmmConst(_mm_set1_epi16(op.si10)));
 	c->psubw(vr, SPU_OFF_128(gpr, op.ra));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 }
@@ -4431,21 +4330,21 @@ void spu_recompiler::SFHI(spu_opcode_t op)
 void spu_recompiler::ANDI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pand(va, XmmConst(v128::from32p(op.si10)));
+	c->pand(va, XmmConst(_mm_set1_epi32(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::ANDHI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pand(va, XmmConst(v128::from16p(op.si10)));
+	c->pand(va, XmmConst(_mm_set1_epi16(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::ANDBI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pand(va, XmmConst(v128::from8p(op.si10)));
+	c->pand(va, XmmConst(_mm_set1_epi8(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
@@ -4453,7 +4352,7 @@ void spu_recompiler::AI(spu_opcode_t op)
 {
 	// add
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->paddd(va, XmmConst(v128::from32p(op.si10)));
+	c->paddd(va, XmmConst(_mm_set1_epi32(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
@@ -4461,7 +4360,7 @@ void spu_recompiler::AHI(spu_opcode_t op)
 {
 	// add
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->paddw(va, XmmConst(v128::from16p(op.si10)));
+	c->paddw(va, XmmConst(_mm_set1_epi16(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
@@ -4474,7 +4373,7 @@ void spu_recompiler::STQD(spu_opcode_t op)
 	if (utils::has_ssse3())
 	{
 		const XmmLink& vt = XmmGet(op.rt, XmmType::Int);
-		c->pshufb(vt, XmmConst(v128::from32r(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
+		c->pshufb(vt, XmmConst(_mm_set_epi32(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
 		c->movdqa(asmjit::x86::oword_ptr(*ls, addr->r64()), vt);
 	}
 	else
@@ -4498,7 +4397,7 @@ void spu_recompiler::LQD(spu_opcode_t op)
 	{
 		const XmmLink& vt = XmmAlloc();
 		c->movdqa(vt, asmjit::x86::oword_ptr(*ls, addr->r64()));
-		c->pshufb(vt, XmmConst(v128::from32r(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
+		c->pshufb(vt, XmmConst(_mm_set_epi32(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f)));
 		c->movdqa(SPU_OFF_128(gpr, op.rt), vt);
 	}
 	else
@@ -4515,48 +4414,48 @@ void spu_recompiler::LQD(spu_opcode_t op)
 void spu_recompiler::XORI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pxor(va, XmmConst(v128::from32p(op.si10)));
+	c->pxor(va, XmmConst(_mm_set1_epi32(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::XORHI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pxor(va, XmmConst(v128::from16p(op.si10)));
+	c->pxor(va, XmmConst(_mm_set1_epi16(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::XORBI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pxor(va, XmmConst(v128::from8p(op.si10)));
+	c->pxor(va, XmmConst(_mm_set1_epi8(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::CGTI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pcmpgtd(va, XmmConst(v128::from32p(op.si10)));
+	c->pcmpgtd(va, XmmConst(_mm_set1_epi32(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::CGTHI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pcmpgtw(va, XmmConst(v128::from16p(op.si10)));
+	c->pcmpgtw(va, XmmConst(_mm_set1_epi16(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::CGTBI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pcmpgtb(va, XmmConst(v128::from8p(op.si10)));
+	c->pcmpgtb(va, XmmConst(_mm_set1_epi8(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::HGTI(spu_opcode_t op)
 {
-	c->cmp(SPU_OFF_32(gpr, op.ra, &v128::_s32, 3), +op.si10);
+	c->cmp(SPU_OFF_32(gpr, op.ra, &v128::_s32, 3), op.si10);
 
 	asmjit::Label label = c->newLabel();
 	asmjit::Label ret = c->newLabel();
@@ -4577,30 +4476,30 @@ void spu_recompiler::HGTI(spu_opcode_t op)
 void spu_recompiler::CLGTI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pxor(va, XmmConst(v128::from32p(0x80000000)));
-	c->pcmpgtd(va, XmmConst(v128::from32p(op.si10 - 0x80000000)));
+	c->pxor(va, XmmConst(_mm_set1_epi32(0x80000000)));
+	c->pcmpgtd(va, XmmConst(_mm_set1_epi32(op.si10 - 0x80000000)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::CLGTHI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pxor(va, XmmConst(v128::from16p(0x8000)));
-	c->pcmpgtw(va, XmmConst(v128::from16p(op.si10 - 0x8000)));
+	c->pxor(va, XmmConst(_mm_set1_epi16(smin)));
+	c->pcmpgtw(va, XmmConst(_mm_set1_epi16(op.si10 - 0x8000)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::CLGTBI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->psubb(va, XmmConst(v128::from8p(0x80)));
-	c->pcmpgtb(va, XmmConst(v128::from8p(op.si10 - 0x80)));
+	c->psubb(va, XmmConst(_mm_set1_epi8(smin)));
+	c->pcmpgtb(va, XmmConst(_mm_set1_epi8(op.si10 - 0x80)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::HLGTI(spu_opcode_t op)
 {
-	c->cmp(SPU_OFF_32(gpr, op.ra, &v128::_u32, 3), +op.si10);
+	c->cmp(SPU_OFF_32(gpr, op.ra, &v128::_u32, 3), op.si10);
 
 	asmjit::Label label = c->newLabel();
 	asmjit::Label ret = c->newLabel();
@@ -4621,7 +4520,7 @@ void spu_recompiler::HLGTI(spu_opcode_t op)
 void spu_recompiler::MPYI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pmaddwd(va, XmmConst(v128::from32p(op.si10 & 0xffff)));
+	c->pmaddwd(va, XmmConst(_mm_set1_epi32(op.si10 & 0xffff)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
@@ -4631,7 +4530,7 @@ void spu_recompiler::MPYUI(spu_opcode_t op)
 	const XmmLink& vi = XmmAlloc();
 	const XmmLink& va2 = XmmAlloc();
 	c->movdqa(va2, va);
-	c->movdqa(vi, XmmConst(v128::from32p(op.si10 & 0xffff)));
+	c->movdqa(vi, XmmConst(_mm_set1_epi32(op.si10 & 0xffff)));
 	c->pmulhuw(va, vi);
 	c->pmullw(va2, vi);
 	c->pslld(va, 16);
@@ -4642,27 +4541,27 @@ void spu_recompiler::MPYUI(spu_opcode_t op)
 void spu_recompiler::CEQI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pcmpeqd(va, XmmConst(v128::from32p(op.si10)));
+	c->pcmpeqd(va, XmmConst(_mm_set1_epi32(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::CEQHI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pcmpeqw(va, XmmConst(v128::from16p(op.si10)));
+	c->pcmpeqw(va, XmmConst(_mm_set1_epi16(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::CEQBI(spu_opcode_t op)
 {
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
-	c->pcmpeqb(va, XmmConst(v128::from8p(op.si10)));
+	c->pcmpeqb(va, XmmConst(_mm_set1_epi8(op.si10)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), va);
 }
 
 void spu_recompiler::HEQI(spu_opcode_t op)
 {
-	c->cmp(SPU_OFF_32(gpr, op.ra, &v128::_u32, 3), +op.si10);
+	c->cmp(SPU_OFF_32(gpr, op.ra, &v128::_u32, 3), op.si10);
 
 	asmjit::Label label = c->newLabel();
 	asmjit::Label ret = c->newLabel();
@@ -4691,7 +4590,7 @@ void spu_recompiler::HBRR([[maybe_unused]] spu_opcode_t op)
 void spu_recompiler::ILA(spu_opcode_t op)
 {
 	const XmmLink& vr = XmmAlloc();
-	c->movdqa(vr, XmmConst(v128::from32p(op.i18)));
+	c->movdqa(vr, XmmConst(_mm_set1_epi32(op.i18)));
 	c->movdqa(SPU_OFF_128(gpr, op.rt), vr);
 }
 
@@ -4730,15 +4629,15 @@ void spu_recompiler::SHUFB(spu_opcode_t op)
 		const XmmLink& vc = XmmGet(op.rc, XmmType::Int);
 		const XmmLink& vt = XmmAlloc();
 		const XmmLink& vm = XmmAlloc();
-		c->vpcmpub(asmjit::x86::k1, vc, XmmConst(v128::from8p(-0x40)), 5 /* GE */);
-		c->vpxor(vm, vc, XmmConst(v128::from8p(0xf)));
+		c->vpcmpub(asmjit::x86::k1, vc, XmmConst(_mm_set1_epi8(-0x40)), 5 /* GE */);
+		c->vpxor(vm, vc, XmmConst(_mm_set1_epi8(0xf)));
 		c->setExtraReg(asmjit::x86::k1);
-		c->z().vpblendmb(vc, vc, XmmConst(v128::from8p(-1))); // {k1}
-		c->vpcmpub(asmjit::x86::k2, vm, XmmConst(v128::from8p(-0x20)), 5 /* GE */);
-		c->vptestmb(asmjit::x86::k1, vm, XmmConst(v128::from8p(0x10)));
+		c->z().vblendmb(vc, vc, XmmConst(_mm_set1_epi8(-1))); // {k1}
+		c->vpcmpub(asmjit::x86::k2, vm, XmmConst(_mm_set1_epi8(-0x20)), 5 /* GE */);
+		c->vptestmb(asmjit::x86::k1, vm, XmmConst(_mm_set1_epi8(0x10)));
 		c->vpshufb(vt, va, vm);
 		c->setExtraReg(asmjit::x86::k2);
-		c->z().vpblendmb(va, va, XmmConst(v128::from8p(0x7f))); // {k2}
+		c->z().vblendmb(va, va, XmmConst(_mm_set1_epi8(0x7f))); // {k2}
 		c->setExtraReg(asmjit::x86::k1);
 		c->vpshufb(vt, vb, vm); // {k1}
 		c->vpternlogd(vt, va, vc, 0xf6 /* orAxorBC */);
@@ -4757,12 +4656,12 @@ void spu_recompiler::SHUFB(spu_opcode_t op)
 	const XmmLink& vt = XmmAlloc();
 	const XmmLink& vm = XmmAlloc();
 	const XmmLink& v5 = XmmAlloc();
-	c->movdqa(vm, XmmConst(v128::from8p(static_cast<s8>(0xc0))));
+	c->movdqa(vm, XmmConst(_mm_set1_epi8(static_cast<s8>(0xc0))));
 
 	if (utils::has_avx())
 	{
-		c->vpand(v5, vc, XmmConst(v128::from8p(static_cast<s8>(0xe0))));
-		c->vpxor(vc, vc, XmmConst(v128::from8p(0xf)));
+		c->vpand(v5, vc, XmmConst(_mm_set1_epi8(static_cast<s8>(0xe0))));
+		c->vpxor(vc, vc, XmmConst(_mm_set1_epi8(0xf)));
 		c->vpshufb(va, va, vc);
 		c->vpslld(vt, vc, 3);
 		c->vpcmpeqb(v5, v5, vm);
@@ -4776,10 +4675,10 @@ void spu_recompiler::SHUFB(spu_opcode_t op)
 	else
 	{
 		c->movdqa(v5, vc);
-		c->pand(v5, XmmConst(v128::from8p(static_cast<s8>(0xe0))));
+		c->pand(v5, XmmConst(_mm_set1_epi8(static_cast<s8>(0xe0))));
 		c->movdqa(vt, vc);
 		c->pand(vt, vm);
-		c->pxor(vc, XmmConst(v128::from8p(0xf)));
+		c->pxor(vc, XmmConst(_mm_set1_epi8(0xf)));
 		c->pshufb(va, vc);
 		c->pshufb(vb, vc);
 		c->pslld(vc, 3);
@@ -4802,7 +4701,7 @@ void spu_recompiler::MPYA(spu_opcode_t op)
 	const XmmLink& va = XmmGet(op.ra, XmmType::Int);
 	const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
 	const XmmLink& vi = XmmAlloc();
-	c->movdqa(vi, XmmConst(v128::from32p(0xffff)));
+	c->movdqa(vi, XmmConst(_mm_set1_epi32(0xffff)));
 	c->pand(va, vi);
 	c->pand(vb, vi);
 	c->pmaddwd(va, vb);
@@ -4817,7 +4716,7 @@ void spu_recompiler::FNMS(spu_opcode_t op)
 	const XmmLink& mask = XmmAlloc();
 	const XmmLink& v1 = XmmAlloc();
 	const XmmLink& v2 = XmmAlloc();
-	c->movaps(mask, XmmConst(v128::from32p(0x7f800000)));
+	c->movaps(mask, XmmConst(_mm_set1_epi32(0x7f800000)));
 	c->movaps(v1, va);
 	c->movaps(v2, vb);
 	c->andps(va, mask);
@@ -4840,7 +4739,7 @@ void spu_recompiler::FMA(spu_opcode_t op)
 	const XmmLink& mask = XmmAlloc();
 	const XmmLink& v1 = XmmAlloc();
 	const XmmLink& v2 = XmmAlloc();
-	c->movaps(mask, XmmConst(v128::from32p(0x7f800000)));
+	c->movaps(mask, XmmConst(_mm_set1_epi32(0x7f800000)));
 	c->movaps(v1, va);
 	c->movaps(v2, vb);
 	c->andps(va, mask);
@@ -4862,7 +4761,7 @@ void spu_recompiler::FMS(spu_opcode_t op)
 	const XmmLink& mask = XmmAlloc();
 	const XmmLink& v1 = XmmAlloc();
 	const XmmLink& v2 = XmmAlloc();
-	c->movaps(mask, XmmConst(v128::from32p(0x7f800000)));
+	c->movaps(mask, XmmConst(_mm_set1_epi32(0x7f800000)));
 	c->movaps(v1, va);
 	c->movaps(v2, vb);
 	c->andps(va, mask);
diff --git a/rpcs3/Emu/Cell/SPUASMJITRecompiler.h b/rpcs3/Emu/Cell/SPUASMJITRecompiler.h
index 36c238f231..7d5073d02f 100644
--- a/rpcs3/Emu/Cell/SPUASMJITRecompiler.h
+++ b/rpcs3/Emu/Cell/SPUASMJITRecompiler.h
@@ -24,23 +24,23 @@ private:
 	u32 m_base;
 
 	// emitter:
-	asmjit::x86::Assembler* c;
+	asmjit::X86Assembler* c;
 
 	// arguments:
-	const asmjit::x86::Gp* cpu;
-	const asmjit::x86::Gp* ls;
-	const asmjit::x86::Gp* rip;
-	const asmjit::x86::Gp* pc0;
+	const asmjit::X86Gp* cpu;
+	const asmjit::X86Gp* ls;
+	const asmjit::X86Gp* rip;
+	const asmjit::X86Gp* pc0;
 
 	// Native args or temp variables:
-	const asmjit::x86::Gp* arg0;
-	const asmjit::x86::Gp* arg1;
-	const asmjit::x86::Gp* qw0;
-	const asmjit::x86::Gp* qw1;
+	const asmjit::X86Gp* arg0;
+	const asmjit::X86Gp* arg1;
+	const asmjit::X86Gp* qw0;
+	const asmjit::X86Gp* qw1;
 
 	// temporary:
-	const asmjit::x86::Gp* addr;
-	std::array<const asmjit::x86::Xmm*, 16> vec;
+	const asmjit::X86Gp* addr;
+	std::array<const asmjit::X86Xmm*, 16> vec;
 
 	// workload for the end of function:
 	std::vector<std::function<void()>> after;
@@ -60,10 +60,10 @@ private:
 
 	class XmmLink
 	{
-		const asmjit::x86::Xmm* m_var;
+		const asmjit::X86Xmm* m_var;
 
 	public:
-		XmmLink(const asmjit::x86::Xmm*& xmm_var)
+		XmmLink(const asmjit::X86Xmm*& xmm_var)
 			: m_var(xmm_var)
 		{
 			xmm_var = nullptr;
@@ -71,7 +71,7 @@ private:
 
 		XmmLink(XmmLink&&) = default; // MoveConstructible + delete copy constructor and copy/move operators
 
-		operator const asmjit::x86::Xmm&() const
+		operator const asmjit::X86Xmm&() const
 		{
 			return *m_var;
 		}
@@ -87,9 +87,11 @@ private:
 	XmmLink XmmAlloc();
 	XmmLink XmmGet(s8 reg, XmmType type);
 
-	asmjit::x86::Mem XmmConst(const v128& data);
+	asmjit::X86Mem XmmConst(const v128& data);
+	asmjit::X86Mem XmmConst(const __m128& data);
+	asmjit::X86Mem XmmConst(const __m128i& data);
 
-	asmjit::x86::Mem get_pc(u32 addr);
+	asmjit::X86Mem get_pc(u32 addr);
 	void branch_fixed(u32 target, bool absolute = false);
 	void branch_indirect(spu_opcode_t op, bool jt = false, bool ret = true);
 	void branch_set_link(u32 target);
diff --git a/rpcs3/Emu/Cell/SPUAnalyser.cpp b/rpcs3/Emu/Cell/SPUAnalyser.cpp
index 73ba8fb17c..ccf284487b 100644
--- a/rpcs3/Emu/Cell/SPUAnalyser.cpp
+++ b/rpcs3/Emu/Cell/SPUAnalyser.cpp
@@ -1,7 +1,2 @@
 #include "stdafx.h"
 #include "SPUAnalyser.h"
-#include "SPUOpcodes.h"
-
-const extern spu_decoder<spu_itype> g_spu_itype{};
-const extern spu_decoder<spu_iname> g_spu_iname{};
-const extern spu_decoder<spu_iflag> g_spu_iflag{};
diff --git a/rpcs3/Emu/Cell/SPUAnalyser.h b/rpcs3/Emu/Cell/SPUAnalyser.h
index 103c655a9e..fa322c242b 100644
--- a/rpcs3/Emu/Cell/SPUAnalyser.h
+++ b/rpcs3/Emu/Cell/SPUAnalyser.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "util/types.hpp"
+
 // SPU Instruction Type
 struct spu_itype
 {
@@ -12,13 +14,12 @@ struct spu_itype
 	static constexpr struct floating_tag{} floating{}; // Floating-Point Instructions
 	static constexpr struct quadrop_tag{} _quadrop{}; // 4-op Instructions
 	static constexpr struct xfloat_tag{} xfloat{}; // Instructions producing xfloat values
-	static constexpr struct zregmod_tag{} zregmod{}; // Instructions not modifying any GPR
 
-	enum class type : unsigned char
+	enum type : unsigned char
 	{
 		UNK = 0,
 
-		HEQ, // zregmod_tag first
+		HEQ,
 		HEQI,
 		HGT,
 		HGTI,
@@ -35,21 +36,11 @@ struct spu_itype
 		NOP,
 		SYNC,
 		DSYNC,
-		MTSPR,
-		WRCH,
-
-		STQD, // memory_tag first
-		STQX,
-		STQA,
-		STQR, // zregmod_tag last
-		LQD,
-		LQX,
-		LQA,
-		LQR, // memory_tag last
-
 		MFSPR,
+		MTSPR,
 		RDCH,
 		RCHCNT,
+		WRCH,
 
 		BR, // branch_tag first
 		BRA,
@@ -68,10 +59,28 @@ struct spu_itype
 		BIHZ,
 		BIHNZ, // branch_tag last
 
-		ILH, // constant_tag_first
+		LQD, // memory_tag first
+		LQX,
+		LQA,
+		LQR,
+		STQD,
+		STQX,
+		STQA,
+		STQR, // memory_tag last
+
+		CBD, // constant_tag first
+		CBX,
+		CHD,
+		CHX,
+		CWD,
+		CWX,
+		CDD,
+		CDX,
+		ILH,
 		ILHU,
 		IL,
 		ILA,
+		IOHL,
 		FSMBI, // constant_tag last
 
 		AH, // integer_tag first
@@ -98,14 +107,6 @@ struct spu_itype
 		MPYHHA,
 		MPYHHU,
 		MPYHHAU,
-		CBD,
-		CHD,
-		CWD,
-		CDD,
-		CBX,
-		CHX,
-		CWX,
-		CDX,
 		CLZ,
 		CNTB,
 		FSMB,
@@ -129,7 +130,6 @@ struct spu_itype
 		ORC,
 		ORBI,
 		ORHI,
-		IOHL,
 		ORI,
 		ORX,
 		XOR,
@@ -234,8 +234,6 @@ struct spu_itype
 		CLGTI, // compare_tag last
 	};
 
-	using enum type;
-
 	// Enable address-of operator for spu_decoder<>
 	friend constexpr type operator &(type value)
 	{
@@ -265,42 +263,6 @@ struct spu_itype
 	{
 		return value >= FMA && value <= FRDS;
 	}
-
-	// Test for memory instruction
-	friend constexpr bool operator &(type value, memory_tag)
-	{
-		return value >= STQD && value <= LQR;
-	}
-
-	// Test for compare instruction
-	friend constexpr bool operator &(type value, compare_tag)
-	{
-		return value >= CEQB && value <= CLGTI;
-	}
-
-	// Test for integer instruction
-	friend constexpr bool operator &(type value, integer_tag)
-	{
-		return value >= AH && value <= SHUFB;
-	}
-
-	// Test for shift or rotate instruction
-	friend constexpr bool operator &(type value, shiftrot_tag)
-	{
-		return value >= SHLH && value <= ROTMAI;
-	}
-
-	// Test for constant loading instruction
-	friend constexpr bool operator &(type value, constant_tag)
-	{
-		return value >= ILH && value <= FSMBI;
-	}
-
-	// Test for non register-modifying instruction
-	friend constexpr bool operator &(type value, zregmod_tag)
-	{
-		return value >= HEQ && value <= STQR;
-	}
 };
 
 struct spu_iflag
diff --git a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp b/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp
deleted file mode 100644
index 41e81ac4e2..0000000000
--- a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp
+++ /dev/null
@@ -1,8345 +0,0 @@
-#include "stdafx.h"
-#include "SPURecompiler.h"
-
-#include "Emu/System.h"
-#include "Emu/system_config.h"
-#include "Emu/system_progress.hpp"
-#include "Emu/system_utils.hpp"
-#include "Emu/cache_utils.hpp"
-#include "Emu/IdManager.h"
-#include "Emu/localized_string.h"
-#include "Crypto/sha1.h"
-#include "Utilities/StrUtil.h"
-#include "Utilities/JIT.h"
-#include "util/init_mutex.hpp"
-#include "util/shared_ptr.hpp"
-
-#include "Emu/Cell/Modules/cellSync.h"
-
-#include "SPUThread.h"
-#include "SPUAnalyser.h"
-#include "SPUInterpreter.h"
-#include "SPUDisAsm.h"
-#include <algorithm>
-#include <cstring>
-#include <optional>
-#include <unordered_set>
-
-#include "util/v128.hpp"
-#include "util/simd.hpp"
-#include "util/sysinfo.hpp"
-
-const extern spu_decoder<spu_itype> g_spu_itype;
-const extern spu_decoder<spu_iname> g_spu_iname;
-const extern spu_decoder<spu_iflag> g_spu_iflag;
-
-constexpr u32 s_reg_max = spu_recompiler_base::s_reg_max;
-
-template<typename T>
-struct span_less
-{
-	static int compare(const std::span<T>& lhs, const std::span<T>& rhs) noexcept
-	{
-		// TODO: Replace with std::lexicographical_compare_three_way when it becomes available to all compilers
-		for (usz i = 0, last = std::min(lhs.size(), rhs.size()); i != last; i++)
-		{
-			const T vl = lhs[i];
-			const T vr = rhs[i];
-
-			if (vl != vr)
-			{
-				return vl < vr ? -1 : 1;
-			}
-		}
-
-		if (lhs.size() != rhs.size())
-		{
-			return lhs.size() < rhs.size() ? -1 : 1;
-		}
-
-		return 0;
-	}
-
-	bool operator()(const std::span<T>& lhs, const std::span<T>& rhs) const noexcept
-	{
-		return compare(lhs, rhs) < 0;
-	}
-};
-
-template <typename T>
-inline constexpr span_less<T> s_span_less{};
-
-// Move 4 args for calling native function from a GHC calling convention function
-#if defined(ARCH_X64)
-static u8* move_args_ghc_to_native(u8* raw)
-{
-#ifdef _WIN32
-	// mov  rcx, r13
-	// mov  rdx, rbp
-	// mov  r8,  r12
-	// mov  r9,  rbx
-	std::memcpy(raw, "\x4C\x89\xE9\x48\x89\xEA\x4D\x89\xE0\x49\x89\xD9", 12);
-#else
-	// mov  rdi, r13
-	// mov  rsi, rbp
-	// mov  rdx, r12
-	// mov  rcx, rbx
-	std::memcpy(raw, "\x4C\x89\xEF\x48\x89\xEE\x4C\x89\xE2\x48\x89\xD9", 12);
-#endif
-
-	return raw + 12;
-}
-#elif defined(ARCH_ARM64)
-static void ghc_cpp_trampoline(u64 fn_target, native_asm& c, auto& args)
-{
-	using namespace asmjit;
-
-	c.mov(args[0], a64::x19);
-	c.mov(args[1], a64::x20);
-	c.mov(args[2], a64::x21);
-	c.mov(args[3], a64::x22);
-
-	c.mov(a64::x15, Imm(fn_target));
-	c.br(a64::x15);
-}
-#endif
-
-DECLARE(spu_runtime::tr_dispatch) = []
-{
-#ifdef __APPLE__
-	pthread_jit_write_protect_np(false);
-#endif
-#if defined(ARCH_X64)
-	// Generate a special trampoline to spu_recompiler_base::dispatch with pause instruction
-	u8* const trptr = jit_runtime::alloc(32, 16);
-	u8* raw = move_args_ghc_to_native(trptr);
-	*raw++ = 0xf3; // pause
-	*raw++ = 0x90;
-	*raw++ = 0xff; // jmp [rip]
-	*raw++ = 0x25;
-	std::memset(raw, 0, 4);
-	const u64 target = reinterpret_cast<u64>(&spu_recompiler_base::dispatch);
-	std::memcpy(raw + 4, &target, 8);
-	return reinterpret_cast<spu_function_t>(trptr);
-#elif defined(ARCH_ARM64)
-	auto trptr = build_function_asm<spu_function_t>("tr_dispatch",
-		[](native_asm& c, auto& args)
-		{
-			c.yield();
-			ghc_cpp_trampoline(reinterpret_cast<u64>(&spu_recompiler_base::dispatch), c, args);
-		});
-	return trptr;
-#else
-#error "Unimplemented"
-#endif
-}();
-
-DECLARE(spu_runtime::tr_branch) = []
-{
-#if defined(ARCH_X64)
-	// Generate a trampoline to spu_recompiler_base::branch
-	u8* const trptr = jit_runtime::alloc(32, 16);
-	u8* raw = move_args_ghc_to_native(trptr);
-	*raw++ = 0xff; // jmp [rip]
-	*raw++ = 0x25;
-	std::memset(raw, 0, 4);
-	const u64 target = reinterpret_cast<u64>(&spu_recompiler_base::branch);
-	std::memcpy(raw + 4, &target, 8);
-	return reinterpret_cast<spu_function_t>(trptr);
-
-#elif defined(ARCH_ARM64)
-	auto trptr = build_function_asm<spu_function_t>("tr_branch",
-		[](native_asm& c, auto& args)
-		{
-			ghc_cpp_trampoline(reinterpret_cast<u64>(&spu_recompiler_base::branch), c, args);
-		});
-	return trptr;
-#else
-#error "Unimplemented"
-#endif
-}();
-
-DECLARE(spu_runtime::tr_interpreter) = []
-{
-#if defined(ARCH_X64)
-	u8* const trptr = jit_runtime::alloc(32, 16);
-	u8* raw = move_args_ghc_to_native(trptr);
-	*raw++ = 0xff; // jmp [rip]
-	*raw++ = 0x25;
-	std::memset(raw, 0, 4);
-	const u64 target = reinterpret_cast<u64>(&spu_recompiler_base::old_interpreter);
-	std::memcpy(raw + 4, &target, 8);
-	return reinterpret_cast<spu_function_t>(trptr);
-#elif defined(ARCH_ARM64)
-	auto trptr = build_function_asm<spu_function_t>("tr_interpreter",
-		[](native_asm& c, auto& args)
-		{
-			ghc_cpp_trampoline(reinterpret_cast<u64>(&spu_recompiler_base::old_interpreter), c, args);
-		});
-	return trptr;
-#endif
-}();
-
-DECLARE(spu_runtime::g_dispatcher) = []
-{
-	// Allocate 2^20 positions in data area
-	const auto ptr = reinterpret_cast<std::remove_const_t<decltype(spu_runtime::g_dispatcher)>>(jit_runtime::alloc(sizeof(*g_dispatcher), 64, false));
-
-	for (auto& x : *ptr)
-	{
-		x.raw() = tr_dispatch;
-	}
-
-	return ptr;
-}();
-
-DECLARE(spu_runtime::tr_all) = []
-{
-#if defined(ARCH_X64)
-	u8* const trptr = jit_runtime::alloc(32, 16);
-	u8* raw = trptr;
-
-	// Load PC: mov eax, [r13 + spu_thread::pc]
-	*raw++ = 0x41;
-	*raw++ = 0x8b;
-	*raw++ = 0x45;
-	*raw++ = ::narrow<s8>(::offset32(&spu_thread::pc));
-
-	// Get LS address starting from PC: lea rcx, [rbp + rax]
-	*raw++ = 0x48;
-	*raw++ = 0x8d;
-	*raw++ = 0x4c;
-	*raw++ = 0x05;
-	*raw++ = 0x00;
-
-	// mov eax, [rcx]
-	*raw++ = 0x8b;
-	*raw++ = 0x01;
-
-	// shr eax, (32 - 20)
-	*raw++ = 0xc1;
-	*raw++ = 0xe8;
-	*raw++ = 0x0c;
-
-	// Load g_dispatcher to rdx
-	*raw++ = 0x48;
-	*raw++ = 0x8d;
-	*raw++ = 0x15;
-	const s32 r32 = ::narrow<s32>(reinterpret_cast<u64>(g_dispatcher) - reinterpret_cast<u64>(raw) - 4);
-	std::memcpy(raw, &r32, 4);
-	raw += 4;
-
-	// Update block_hash (set zero): mov [r13 + spu_thread::m_block_hash], 0
-	*raw++ = 0x49;
-	*raw++ = 0xc7;
-	*raw++ = 0x45;
-	*raw++ = ::narrow<s8>(::offset32(&spu_thread::block_hash));
-	*raw++ = 0x00;
-	*raw++ = 0x00;
-	*raw++ = 0x00;
-	*raw++ = 0x00;
-
-	// jmp [rdx + rax * 8]
-	*raw++ = 0xff;
-	*raw++ = 0x24;
-	*raw++ = 0xc2;
-
-	return reinterpret_cast<spu_function_t>(trptr);
-
-#elif defined(ARCH_ARM64)
-	auto trptr = build_function_asm<spu_function_t>("tr_all",
-		[](native_asm& c, auto& args)
-		{
-			using namespace asmjit;
-
-			// Args implicitly defined via registers
-			UNUSED(args);
-
-			// Inputs:
-			// x19 = m_thread a.k.a arg[0]
-			// x20 = ls_base
-			// x21 - x22 = args[2 - 3]
-			//ensure(::offset32(&spu_thread::pc) <= 32760);
-			//ensure(::offset32(&spu_thread::block_hash) <= 32760);
-
-			// Load PC
-			c.ldr(a64::w1, arm::Mem(a64::x19, ::offset32(&spu_thread::pc))); // REG_Base + offset(spu_thread::pc)
-			// Compute LS address = REG_Sp + PC, store into x7 (use later)
-			c.add(a64::x7, a64::x20, a64::x1);
-			// Load 32b from LS address
-			c.ldr(a64::w3, arm::Mem(a64::x7));
-			// shr (32 - 20)
-			c.lsr(a64::w3, a64::w3, Imm(32 - 20));
-			// Load g_dispatcher
-			c.mov(a64::x4, Imm(reinterpret_cast<u64>(g_dispatcher)));
-			// Update block hash
-			c.mov(a64::x5, Imm(0));
-			c.str(a64::x5, arm::Mem(a64::x19, ::offset32(&spu_thread::block_hash))); // REG_Base + offset(spu_thread::block_hash)
-			// Jump to [g_dispatcher + idx * 8]
-			c.mov(a64::x6, Imm(8));
-			c.mul(a64::x6, a64::x3, a64::x6);
-			c.add(a64::x4, a64::x4, a64::x6);
-			c.ldr(a64::x4, arm::Mem(a64::x4));
-			c.br(a64::x4);
-			// Unreachable guard
-			c.brk(0x42);
-		});
-	return trptr;
-#else
-#error "Unimplemented"
-#endif
-}();
-
-DECLARE(spu_runtime::g_gateway) = build_function_asm<spu_function_t>("spu_gateway", [](native_asm& c, auto& args)
-{
-	// Gateway for SPU dispatcher, converts from native to GHC calling convention, also saves RSP value for spu_escape
-	using namespace asmjit;
-
-#if defined(ARCH_X64)
-#ifdef _WIN32
-	c.push(x86::r15);
-	c.push(x86::r14);
-	c.push(x86::r13);
-	c.push(x86::r12);
-	c.push(x86::rsi);
-	c.push(x86::rdi);
-	c.push(x86::rbp);
-	c.push(x86::rbx);
-	c.sub(x86::rsp, 0xa8);
-	c.movaps(x86::oword_ptr(x86::rsp, 0x90), x86::xmm15);
-	c.movaps(x86::oword_ptr(x86::rsp, 0x80), x86::xmm14);
-	c.movaps(x86::oword_ptr(x86::rsp, 0x70), x86::xmm13);
-	c.movaps(x86::oword_ptr(x86::rsp, 0x60), x86::xmm12);
-	c.movaps(x86::oword_ptr(x86::rsp, 0x50), x86::xmm11);
-	c.movaps(x86::oword_ptr(x86::rsp, 0x40), x86::xmm10);
-	c.movaps(x86::oword_ptr(x86::rsp, 0x30), x86::xmm9);
-	c.movaps(x86::oword_ptr(x86::rsp, 0x20), x86::xmm8);
-	c.movaps(x86::oword_ptr(x86::rsp, 0x10), x86::xmm7);
-	c.movaps(x86::oword_ptr(x86::rsp, 0), x86::xmm6);
-#else
-	c.push(x86::rbp);
-	c.push(x86::r15);
-	c.push(x86::r14);
-	c.push(x86::r13);
-	c.push(x86::r12);
-	c.push(x86::rbx);
-	c.push(x86::rax);
-#endif
-
-	// Save native stack pointer for longjmp emulation
-	c.mov(x86::qword_ptr(args[0], ::offset32(&spu_thread::hv_ctx, &rpcs3::hypervisor_context_t::regs)), x86::rsp);
-
-	// Move 4 args (despite spu_function_t def)
-	c.mov(x86::r13, args[0]);
-	c.mov(x86::rbp, args[1]);
-	c.mov(x86::r12, args[2]);
-	c.mov(x86::rbx, args[3]);
-
-	if (utils::has_avx())
-	{
-		c.vzeroupper();
-	}
-
-	c.call(spu_runtime::tr_all);
-
-	if (utils::has_avx())
-	{
-		c.vzeroupper();
-	}
-
-#ifdef _WIN32
-	c.movaps(x86::xmm6, x86::oword_ptr(x86::rsp, 0));
-	c.movaps(x86::xmm7, x86::oword_ptr(x86::rsp, 0x10));
-	c.movaps(x86::xmm8, x86::oword_ptr(x86::rsp, 0x20));
-	c.movaps(x86::xmm9, x86::oword_ptr(x86::rsp, 0x30));
-	c.movaps(x86::xmm10, x86::oword_ptr(x86::rsp, 0x40));
-	c.movaps(x86::xmm11, x86::oword_ptr(x86::rsp, 0x50));
-	c.movaps(x86::xmm12, x86::oword_ptr(x86::rsp, 0x60));
-	c.movaps(x86::xmm13, x86::oword_ptr(x86::rsp, 0x70));
-	c.movaps(x86::xmm14, x86::oword_ptr(x86::rsp, 0x80));
-	c.movaps(x86::xmm15, x86::oword_ptr(x86::rsp, 0x90));
-	c.add(x86::rsp, 0xa8);
-	c.pop(x86::rbx);
-	c.pop(x86::rbp);
-	c.pop(x86::rdi);
-	c.pop(x86::rsi);
-	c.pop(x86::r12);
-	c.pop(x86::r13);
-	c.pop(x86::r14);
-	c.pop(x86::r15);
-#else
-	c.add(x86::rsp, +8);
-	c.pop(x86::rbx);
-	c.pop(x86::r12);
-	c.pop(x86::r13);
-	c.pop(x86::r14);
-	c.pop(x86::r15);
-	c.pop(x86::rbp);
-#endif
-
-	c.ret();
-#elif defined(ARCH_ARM64)
-
-	// Save non-volatile regs. We do this within the thread context instead of normal stack
-	const u32 hv_regs_base = ::offset32(&spu_thread::hv_ctx, &rpcs3::hypervisor_context_t::regs);
-	// NOTE: A64 gp-gp-imm add only takes immediates of upto 4095. Larger numbers can work, but need to be multiples of 2 for lowering to replace the instruction correctly
-	// Unfortunately asmjit fails silently on these patterns which can generate incorrect code
-	c.mov(a64::x15, args[0]);
-	c.mov(a64::x14, Imm(hv_regs_base));
-	c.add(a64::x14, a64::x14, a64::x15); // Reg context offset
-
-	// Return address of escape should jump to the restore block
-	auto epilogue_addr = c.newLabel();
-	c.adr(a64::x15, epilogue_addr);
-	c.mov(a64::x16, a64::sp);
-
-	c.stp(a64::x15, a64::x16, arm::Mem(a64::x14));
-	c.stp(a64::x18, a64::x19, arm::Mem(a64::x14, 16));
-	c.stp(a64::x20, a64::x21, arm::Mem(a64::x14, 32));
-	c.stp(a64::x22, a64::x23, arm::Mem(a64::x14, 48));
-	c.stp(a64::x24, a64::x25, arm::Mem(a64::x14, 64));
-	c.stp(a64::x26, a64::x27, arm::Mem(a64::x14, 80));
-	c.stp(a64::x28, a64::x29, arm::Mem(a64::x14, 96));
-	c.str(a64::x30, arm::Mem(a64::x14, 112));
-
-	// Move 4 args (despite spu_function_t def)
-	c.mov(a64::x19, args[0]);
-	c.mov(a64::x20, args[1]);
-	c.mov(a64::x21, args[2]);
-	c.mov(a64::x22, args[3]);
-
-	// Inject stack frame for scratchpad. Alternatively use per-function frames but that adds some overhead
-	c.sub(a64::sp, a64::sp, Imm(8192));
-
-	c.mov(a64::x0, Imm(reinterpret_cast<u64>(spu_runtime::tr_all)));
-	c.blr(a64::x0);
-
-	// This is the return point for the far ret. Never jump back into host code without coming through this exit
-	c.bind(epilogue_addr);
-
-	// Cleanup scratchpad (not needed, we'll reload sp shortly)
-	// c.add(a64::sp, a64::sp, Imm(8192));
-
-	// Restore thread context
-	c.mov(a64::x14, Imm(hv_regs_base));
-	c.add(a64::x14, a64::x14, a64::x19);
-
-	c.ldr(a64::x16, arm::Mem(a64::x14, 8));
-	c.ldp(a64::x18, a64::x19, arm::Mem(a64::x14, 16));
-	c.ldp(a64::x20, a64::x21, arm::Mem(a64::x14, 32));
-	c.ldp(a64::x22, a64::x23, arm::Mem(a64::x14, 48));
-	c.ldp(a64::x24, a64::x25, arm::Mem(a64::x14, 64));
-	c.ldp(a64::x26, a64::x27, arm::Mem(a64::x14, 80));
-	c.ldp(a64::x28, a64::x29, arm::Mem(a64::x14, 96));
-	c.ldr(a64::x30, arm::Mem(a64::x14, 112));
-
-	// Return
-	c.mov(a64::sp, a64::x16);
-	c.ret(a64::x30);
-#else
-#error "Unimplemented"
-#endif
-});
-
-DECLARE(spu_runtime::g_escape) = build_function_asm<void(*)(spu_thread*)>("spu_escape", [](native_asm& c, auto& args)
-{
-	using namespace asmjit;
-
-#if defined(ARCH_X64)
-	// Restore native stack pointer (longjmp emulation)
-	c.mov(x86::rsp, x86::qword_ptr(args[0], ::offset32(&spu_thread::hv_ctx, &rpcs3::hypervisor_context_t::regs)));
-
-	// Return to the return location
-	c.sub(x86::rsp, 8);
-	c.ret();
-#elif defined(ARCH_ARM64)
-	// Far ret, jumps to gateway epilogue
-	const u32 reg_base = ::offset32(&spu_thread::hv_ctx, &rpcs3::hypervisor_context_t::regs);
-	c.mov(a64::x19, args[0]);
-	c.mov(a64::x15, Imm(reg_base));
-	c.add(a64::x15, a64::x15, args[0]);
-	c.ldr(a64::x30, arm::Mem(a64::x15));
-	c.ret(a64::x30);
-#else
-#error "Unimplemented"
-#endif
-});
-
-DECLARE(spu_runtime::g_tail_escape) = build_function_asm<void(*)(spu_thread*, spu_function_t, u8*)>("spu_tail_escape", [](native_asm& c, auto& args)
-{
-	using namespace asmjit;
-
-#if defined(ARCH_X64)
-	// Restore native stack pointer (longjmp emulation)
-	c.mov(x86::rsp, x86::qword_ptr(args[0], ::offset32(&spu_thread::hv_ctx, &rpcs3::hypervisor_context_t::regs)));
-
-	// Adjust stack for initial call instruction in the gateway
-	c.sub(x86::rsp, 16);
-
-	// Tail call, GHC CC (second arg)
-	c.mov(x86::r13, args[0]);
-	c.mov(x86::rbp, x86::qword_ptr(args[0], ::offset32(&spu_thread::ls)));
-	c.mov(x86::r12, args[2]);
-	c.xor_(x86::ebx, x86::ebx);
-	c.mov(x86::qword_ptr(x86::rsp), args[1]);
-	c.ret();
-#elif defined(ARCH_ARM64)
-	// HV pointer
-	const u32 reg_base = ::offset32(&spu_thread::hv_ctx, &rpcs3::hypervisor_context_t::regs);
-
-	// Tail call, GHC CC
-	c.mov(a64::x19, args[0]); // REG_Base
-	c.mov(a64::x15, Imm(::offset32(&spu_thread::ls))); // SPU::ls offset cannot be correctly encoded for ldr as it is too large
-	c.ldr(a64::x20, arm::Mem(a64::x19, a64::x15)); // REG_Sp
-	c.mov(a64::x21, args[2]);  // REG_Hp
-	c.mov(a64::x22, a64::xzr); // REG_R1
-
-	// Reset sp to patch leaks. Calls to tail escape may leave their stack "dirty" due to optimizations.
-	c.mov(a64::x14, Imm(reg_base + 8));
-	c.ldr(a64::x15, arm::Mem(a64::x19, a64::x14));
-	c.mov(a64::sp, a64::x15);
-
-	// Push context. This gateway can be returned to normally through a ret chain.
-	// FIXME: Push the current PC and "this" as part of the pseudo-frame and return here directly.
-	c.sub(a64::sp, a64::sp, Imm(16));
-	c.str(args[0], arm::Mem(a64::sp));
-
-	// Allocate scratchpad. Not needed if using per-function frames, or if we just don't care about returning to C++ (jump to gw exit instead)
-	c.sub(a64::sp, a64::sp, Imm(8192));
-
-	// Make the far jump
-	c.mov(a64::x15, args[1]);
-	c.blr(a64::x15);
-
-	// Clear scratch allocation
-	c.add(a64::sp, a64::sp, Imm(8192));
-
-	// Restore context. Escape point expects the current thread pointer at x19
-	c.ldr(a64::x19, arm::Mem(a64::sp));
-	c.add(a64::sp, a64::sp, Imm(16));
-
-	// <Optional> We could technically just emit a return here, but we may not want to for now until support is more mature.
-	// Should we attempt a normal return after this point, we'd be going back to C++ code which we really don't want.
-	// We can't guarantee stack sanity for the C++ code and it's cookies since we're basically treating stack as a scratch playground since we entered the main gateway.
-	// Instead, just fall back to hypervisor here. It also makes debugging easier.
-	c.mov(a64::x15, Imm(reg_base));
-	c.ldr(a64::x30, arm::Mem(a64::x19, a64::x15));
-	c.ret(a64::x30);
-#else
-#error "Unimplemented"
-#endif
-});
-
-DECLARE(spu_runtime::g_interpreter_table) = {};
-
-DECLARE(spu_runtime::g_interpreter) = nullptr;
-
-spu_cache::spu_cache(const std::string& loc)
-	: m_file(loc, fs::read + fs::write + fs::create + fs::append)
-{
-}
-
-spu_cache::~spu_cache()
-{
-}
-
-extern void utilize_spu_data_segment(u32 vaddr, const void* ls_data_vaddr, u32 size)
-{
-	if (vaddr % 4)
-	{
-		return;
-	}
-
-	size &= -4;
-
-	if (!size || vaddr + size > SPU_LS_SIZE)
-	{
-		return;
-	}
-
-	if (!g_cfg.core.llvm_precompilation)
-	{
-		return;
-	}
-
-	g_fxo->need<spu_cache>();
-
-	if (!g_fxo->get<spu_cache>().collect_funcs_to_precompile)
-	{
-		return;
-	}
-
-	std::vector<u32> data(size / 4);
-	std::memcpy(data.data(), ls_data_vaddr, size);
-
-	spu_cache::precompile_data_t obj{vaddr, std::move(data)};
-
-	obj.funcs = spu_thread::discover_functions(vaddr, { reinterpret_cast<const u8*>(ls_data_vaddr), size }, vaddr != 0, umax);
-
-	if (obj.funcs.empty())
-	{
-		// Nothing to add
-		return;
-	}
-
-	if (spu_log.notice)
-	{
-		std::string to_log;
-
-		for (usz i = 0; i < obj.funcs.size(); i++)
-		{
-			if (i == 0 && obj.funcs.size() < 4)
-			{
-				// Skip newline in this case
-				to_log += ' ';
-			}
-			else if (i % 4 == 0)
-			{
-				fmt::append(to_log, "\n[%02u] ", i / 8);
-			}
-			else
-			{
-				to_log += ", ";
-			}
-
-			fmt::append(to_log, "0x%05x", obj.funcs[i]);
-		}
-
-		spu_log.notice("Found SPU function(s) at:%s", to_log);
-	}
-
-	spu_log.success("Found %u SPU function(s)", obj.funcs.size());
-
-	g_fxo->get<spu_cache>().precompile_funcs.push(std::move(obj));
-}
-
-// For SPU cache validity check
-static u16 calculate_crc16(const uchar* data, usz length)
-{
-	u16 crc = umax;
-
-	while (length--)
-	{
-		u8 x = (crc >> 8) ^ *data++;
-		x ^= (x >> 4);
-		crc = static_cast<u16>((crc << 8) ^ (x << 12) ^ (x << 5) ^ x);
-	}
-
-	return crc;
-}
-
-std::deque<spu_program> spu_cache::get()
-{
-	std::deque<spu_program> result;
-
-	if (!m_file)
-	{
-		return result;
-	}
-
-	m_file.seek(0);
-
-	// TODO: signal truncated or otherwise broken file
-	while (true)
-	{
-		struct block_info_t
-		{
-			be_t<u16> crc;
-			be_t<u16> size;
-			be_t<u32> addr;
-		} block_info{};
-
-		if (!m_file.read(block_info))
-		{
-			break;
-		}
-
-		const u32 crc = block_info.crc;
-		const u32 size = block_info.size;
-		const u32 addr = block_info.addr;
-
-		if (utils::add_saturate<u32>(addr, size * 4) > SPU_LS_SIZE)
-		{
-			break;
-		}
-
-		std::vector<u32> func;
-
-		if (!m_file.read(func, size))
-		{
-			break;
-		}
-
-		if (!size || !func[0])
-		{
-			// Skip old format Giga entries
-			continue;
-		}
-
-		// CRC check is optional to be compatible with old format
-		if (crc && std::max<u32>(calculate_crc16(reinterpret_cast<const uchar*>(func.data()), size * 4), 1) != crc)
-		{
-			// Invalid, but continue anyway
-			continue;
-		}
-
-		spu_program res;
-		res.entry_point = addr;
-		res.lower_bound = addr;
-		res.data = std::move(func);
-		result.emplace_front(std::move(res));
-	}
-
-	return result;
-}
-
-void spu_cache::add(const spu_program& func)
-{
-	if (!m_file)
-	{
-		return;
-	}
-
-	be_t<u32> size = ::size32(func.data);
-	be_t<u32> addr = func.entry_point;
-
-	// Add CRC (forced non-zero)
-	size |= std::max<u32>(calculate_crc16(reinterpret_cast<const uchar*>(func.data.data()), size * 4), 1) << 16;
-
-	const fs::iovec_clone gather[3]
-	{
-		{&size, sizeof(size)},
-		{&addr, sizeof(addr)},
-		{func.data.data(), func.data.size() * 4}
-	};
-
-	// Append data
-	m_file.write_gather(gather, 3);
-}
-
-void spu_cache::initialize(bool build_existing_cache)
-{
-	spu_runtime::g_interpreter = spu_runtime::g_gateway;
-
-	if (g_cfg.core.spu_decoder == spu_decoder_type::_static || g_cfg.core.spu_decoder == spu_decoder_type::dynamic)
-	{
-		for (auto& x : *spu_runtime::g_dispatcher)
-		{
-			x.raw() = spu_runtime::tr_interpreter;
-		}
-	}
-
-	const std::string ppu_cache = rpcs3::cache::get_ppu_cache();
-
-	if (ppu_cache.empty())
-	{
-		return;
-	}
-
-	// SPU cache file (version + block size type)
-	const std::string loc = ppu_cache + "spu-" + fmt::to_lower(g_cfg.core.spu_block_size.to_string()) + "-v1-tane.dat";
-
-	spu_cache cache(loc);
-
-	if (!cache)
-	{
-		spu_log.error("Failed to initialize SPU cache at: %s", loc);
-		return;
-	}
-
-	// Read cache
-	auto func_list = cache.get();
-	atomic_t<usz> fnext{};
-	atomic_t<u8> fail_flag{0};
-
-	auto data_list = g_fxo->get<spu_cache>().precompile_funcs.pop_all();
-	g_fxo->get<spu_cache>().collect_funcs_to_precompile = false;
-
-	usz total_precompile = 0;
-
-	for (auto& sec : data_list)
-	{
-		total_precompile += sec.funcs.size();
-	}
-
-	const bool spu_precompilation_enabled = func_list.empty() && g_cfg.core.spu_cache && g_cfg.core.llvm_precompilation;
-
-	if (spu_precompilation_enabled)
-	{
-		// What compiles in this case goes straight to disk
-		g_fxo->get<spu_cache>() = std::move(cache);
-	}
-	else if (!build_existing_cache)
-	{
-		return;
-	}
-	else
-	{
-		total_precompile = 0;
-		data_list = {};
-	}
-
-	atomic_t<usz> data_indexer = 0;
-
-	if (g_cfg.core.spu_decoder == spu_decoder_type::dynamic || g_cfg.core.spu_decoder == spu_decoder_type::llvm)
-	{
-		if (auto compiler = spu_recompiler_base::make_llvm_recompiler(11))
-		{
-			compiler->init();
-
-			if (compiler->compile({}) && spu_runtime::g_interpreter)
-			{
-				spu_log.success("SPU Runtime: Built the interpreter.");
-
-				if (g_cfg.core.spu_decoder != spu_decoder_type::llvm)
-				{
-					return;
-				}
-			}
-			else
-			{
-				spu_log.fatal("SPU Runtime: Failed to build the interpreter.");
-			}
-		}
-	}
-
-	u32 worker_count = 0;
-
-	std::optional<scoped_progress_dialog> progress_dialog;
-
-	u32 total_funcs = 0;
-
-	if (g_cfg.core.spu_decoder == spu_decoder_type::asmjit || g_cfg.core.spu_decoder == spu_decoder_type::llvm)
-	{
-		const usz add_count = func_list.size() + total_precompile;
-
-		if (add_count)
-		{
-			total_funcs = build_existing_cache ? ::narrow<u32>(add_count) : 0;
-		}
-
-		worker_count = std::min<u32>(rpcs3::utils::get_max_threads(), ::narrow<u32>(add_count));
-	}
-
-	atomic_t<u32> pending_progress = 0;
-	atomic_t<bool> showing_progress = false;
-
-	if (!g_progr_ptotal)
-	{
-		g_progr_ptotal += total_funcs;
-		showing_progress.release(true);
-		progress_dialog.emplace(get_localized_string(localized_string_id::PROGRESS_DIALOG_BUILDING_SPU_CACHE));
-	}
-
-	named_thread_group workers("SPU Worker ", worker_count, [&]() -> uint
-	{
-#ifdef __APPLE__
-		pthread_jit_write_protect_np(false);
-#endif
-		// Set low priority
-		thread_ctrl::scoped_priority low_prio(-1);
-
-		// Initialize compiler instances for parallel compilation
-		std::unique_ptr<spu_recompiler_base> compiler;
-
-#if defined(ARCH_X64)
-		if (g_cfg.core.spu_decoder == spu_decoder_type::asmjit)
-		{
-			compiler = spu_recompiler_base::make_asmjit_recompiler();
-		}
-		else if (g_cfg.core.spu_decoder == spu_decoder_type::llvm)
-		{
-			compiler = spu_recompiler_base::make_llvm_recompiler();
-		}
-		else
-		{
-			fmt::throw_exception("Unsupported spu decoder '%s'", g_cfg.core.spu_decoder);
-		}
-#elif defined(ARCH_ARM64)
-		if (g_cfg.core.spu_decoder == spu_decoder_type::llvm)
-		{
-			compiler = spu_recompiler_base::make_llvm_recompiler();
-		}
-		else
-		{
-			fmt::throw_exception("Unsupported spu decoder '%s'", g_cfg.core.spu_decoder);
-		}
-#else
-#error "Unimplemented"
-#endif
-
-		compiler->init();
-
-		// Counter for error reporting
-		u32 logged_error = 0;
-
-		// How much every thread compiled
-		uint result = 0;
-
-		// Fake LS
-		std::vector<be_t<u32>> ls(0x10000);
-
-		usz func_i = fnext++;
-
-		// Ensure some actions are performed on a single thread
-		const bool is_first_thread = func_i == 0;
-
-		// Build functions
-		for (; func_i < func_list.size(); func_i = fnext++, (showing_progress ? g_progr_pdone : pending_progress) += build_existing_cache ? 1 : 0)
-		{
-			const spu_program& func = std::as_const(func_list)[func_i];
-
-			if (Emu.IsStopped() || fail_flag)
-			{
-				continue;
-			}
-
-			// Get data start
-			const u32 start = func.lower_bound;
-			const u32 size0 = ::size32(func.data);
-
-			be_t<u64> hash_start;
-			{
-				sha1_context ctx;
-				u8 output[20];
-
-				sha1_starts(&ctx);
-				sha1_update(&ctx, reinterpret_cast<const u8*>(func.data.data()), func.data.size() * 4);
-				sha1_finish(&ctx, output);
-				std::memcpy(&hash_start, output, sizeof(hash_start));
-			}
-
-			// Check hash against allowed bounds
-			const bool inverse_bounds = g_cfg.core.spu_llvm_lower_bound > g_cfg.core.spu_llvm_upper_bound;
-
-			if ((!inverse_bounds && (hash_start < g_cfg.core.spu_llvm_lower_bound || hash_start > g_cfg.core.spu_llvm_upper_bound)) ||
-				(inverse_bounds && (hash_start < g_cfg.core.spu_llvm_lower_bound && hash_start > g_cfg.core.spu_llvm_upper_bound)))
-			{
-				spu_log.error("[Debug] Skipped function %s", fmt::base57(hash_start));
-				result++;
-				continue;
-			}
-
-			// Initialize LS with function data only
-			for (u32 i = 0, pos = start; i < size0; i++, pos += 4)
-			{
-				ls[pos / 4] = std::bit_cast<be_t<u32>>(func.data[i]);
-			}
-
-			// Call analyser
-			spu_program func2 = compiler->analyse(ls.data(), func.entry_point);
-
-			if (func2 != func)
-			{
-				spu_log.error("[0x%05x] SPU Analyser failed, %u vs %u", func2.entry_point, func2.data.size(), size0);
-
-				if (logged_error < 2)
-				{
-					std::string log;
-					compiler->dump(func, log);
-					spu_log.notice("[0x%05x] Function: %s", func.entry_point, log);
-					logged_error++;
-				}
-			}
-			else if (!compiler->compile(std::move(func2)))
-			{
-				// Likely, out of JIT memory. Signal to prevent further building.
-				fail_flag |= 1;
-				continue;
-			}
-
-			// Clear fake LS
-			std::memset(ls.data() + start / 4, 0, 4 * (size0 - 1));
-
-			result++;
-
-			if (is_first_thread && !showing_progress)
-			{
-				if (!g_progr_text && !g_progr_ptotal && !g_progr_ftotal)
-				{
-					showing_progress = true;
-					g_progr_pdone += pending_progress.exchange(0);
-					g_progr_ptotal += total_funcs;
-					progress_dialog.emplace(get_localized_string(localized_string_id::PROGRESS_DIALOG_BUILDING_SPU_CACHE));
-				}
-			}
-			else if (showing_progress && pending_progress)
-			{
-				// Cover missing progress due to a race
-				g_progr_pdone += pending_progress.exchange(0);
-			}
-		}
-
-		u32 last_sec_idx = umax;
-
-		for (func_i = data_indexer++;; func_i = data_indexer++, (showing_progress ? g_progr_pdone : pending_progress) += build_existing_cache ? 1 : 0)
-		{
-			usz passed_count = 0;
-			u32 func_addr = 0;
-			u32 next_func = 0;
-			u32 sec_addr = umax;
-			u32 sec_idx = 0;
-			std::span<const u32> inst_data;
-
-			// Try to get the data this index points to
-			for (auto& sec : data_list)
-			{
-				if (func_i < passed_count + sec.funcs.size())
-				{
-					const usz func_idx = func_i - passed_count;
-					sec_addr = sec.vaddr;
-					func_addr = ::at32(sec.funcs, func_idx);
-					inst_data = { sec.inst_data.data(), sec.inst_data.size() };
-					next_func = sec.funcs.size() >= func_idx ? ::narrow<u32>(sec_addr + inst_data.size() * 4) : sec.funcs[func_idx];
-					break;
-				}
-
-				passed_count += sec.funcs.size();
-				sec_idx++;
-			}
-
-			if (sec_addr == umax)
-			{
-				// End of compilation for thread
-				break;
-			}
-
-			if (Emu.IsStopped() || fail_flag)
-			{
-				continue;
-			}
-
-			if (last_sec_idx != sec_idx)
-			{
-				if (last_sec_idx != umax)
-				{
-					// Clear fake LS of previous section
-					auto& sec = data_list[last_sec_idx];
-					std::memset(ls.data() + sec.vaddr / 4, 0, sec.inst_data.size() * 4);
-				}
-
-				// Initialize LS with the entire section data
-				for (u32 i = 0, pos = sec_addr; i < inst_data.size(); i++, pos += 4)
-				{
-					ls[pos / 4] =  std::bit_cast<be_t<u32>>(inst_data[i]);
-				}
-
-				last_sec_idx = sec_idx;
-			}
-
-			u32 block_addr = func_addr;
-
-			std::map<u32, std::vector<u32>> targets;
-
-			// Call analyser
-			spu_program func2 = compiler->analyse(ls.data(), block_addr, &targets);
-
-			while (!func2.data.empty())
-			{
-				const u32 last_inst = std::bit_cast<be_t<u32>>(func2.data.back());
-				const u32 prog_size = ::size32(func2.data);
-
-				if (!compiler->compile(std::move(func2)))
-				{
-					// Likely, out of JIT memory. Signal to prevent further building.
-					fail_flag |= 1;
-					break;
-				}
-
-				result++;
-
-				const u32 start_new = block_addr + prog_size * 4;
-
-				if (start_new >= next_func || (start_new == next_func - 4 && ls[start_new / 4] == 0x200000u))
-				{
-					// Completed
-					break;
-				}
-
-				if (auto type = g_spu_itype.decode(last_inst);
-					type == spu_itype::BRSL || type == spu_itype::BRASL || type == spu_itype::BISL || type == spu_itype::SYNC)
-				{
-					if (ls[start_new / 4] && g_spu_itype.decode(ls[start_new / 4]) != spu_itype::UNK)
-					{
-						spu_log.notice("Precompiling fallthrough to 0x%05x", start_new);
-						func2 = compiler->analyse(ls.data(), start_new, &targets);
-						block_addr = start_new;
-						continue;
-					}
-				}
-
-				if (targets.empty())
-				{
-					break;
-				}
-
-				const auto upper = targets.upper_bound(func_addr);
-
-				if (upper == targets.begin())
-				{
-					break;
-				}
-
-				u32 new_entry = umax;
-
-				// Find the lowest target in the space in-between
-				for (auto it = std::prev(upper); it != targets.end() && it->first < start_new && new_entry > start_new; it++)
-				{
-					for (u32 target : it->second)
-					{
-						if (target >= start_new && target < next_func)
-						{
-							if (target < new_entry)
-							{
-								new_entry = target;
-
-								if (new_entry == start_new)
-								{
-									// Cannot go lower
-									break;
-								}
-							}
-						}
-					}
-				}
-
-				if (new_entry != umax && !spu_thread::is_exec_code(new_entry, { reinterpret_cast<const u8*>(ls.data()), SPU_LS_SIZE }, 0, true))
-				{
-					new_entry = umax;
-				}
-
-				if (new_entry == umax)
-				{
-					new_entry = start_new;
-
-					while (new_entry < next_func && (ls[start_new / 4] < 0x3fffc || !spu_thread::is_exec_code(new_entry, { reinterpret_cast<const u8*>(ls.data()), SPU_LS_SIZE }, 0, true)))
-					{
-						new_entry += 4;
-					}
-
-					if (new_entry >= next_func || (new_entry == next_func - 4 && ls[new_entry / 4] == 0x200000u))
-					{
-						// Completed
-						break;
-					}
-				}
-
-
-				spu_log.notice("Precompiling filler space at 0x%05x (next=0x%05x)", new_entry, next_func);
-				func2 = compiler->analyse(ls.data(), new_entry, &targets);
-				block_addr = new_entry;
-			}
-
-			if (is_first_thread && !showing_progress)
-			{
-				if (!g_progr_text && !g_progr_ptotal && !g_progr_ftotal)
-				{
-					showing_progress = true;
-					g_progr_pdone += pending_progress.exchange(0);
-					g_progr_ptotal += total_funcs;
-
-					progress_dialog.emplace(get_localized_string(localized_string_id::PROGRESS_DIALOG_BUILDING_SPU_CACHE));
-				}
-			}
-			else if (showing_progress && pending_progress)
-			{
-				// Cover missing progress due to a race
-				g_progr_pdone += pending_progress.exchange(0);
-			}
-		}
-
-		if (showing_progress && pending_progress)
-		{
-			// Cover missing progress due to a race
-			g_progr_pdone += pending_progress.exchange(0);
-		}
-
-		return result;
-	});
-
-	u32 built_total = 0;
-
-	// Join (implicitly) and print individual results
-	for (u32 i = 0; i < workers.size(); i++)
-	{
-		spu_log.notice("SPU Runtime: Worker %u built %u programs.", i + 1, workers[i]);
-		built_total += workers[i];
-	}
-
-	spu_log.notice("SPU Runtime: Workers built %u programs.", built_total);
-
-	if (Emu.IsStopped())
-	{
-		spu_log.error("SPU Runtime: Cache building aborted.");
-		return;
-	}
-
-	if (fail_flag)
-	{
-		spu_log.fatal("SPU Runtime: Cache building failed (out of memory).");
-		return;
-	}
-
-	if ((g_cfg.core.spu_decoder == spu_decoder_type::asmjit || g_cfg.core.spu_decoder == spu_decoder_type::llvm) && !func_list.empty())
-	{
-		spu_log.success("SPU Runtime: Built %u functions.", func_list.size());
-
-		if (g_cfg.core.spu_debug)
-		{
-			std::string dump;
-			dump.reserve(10'000'000);
-
-			std::map<std::span<u8>, spu_program*, span_less<u8>> sorted;
-
-			for (auto&& f : func_list)
-			{
-				// Interpret as a byte string
-				std::span<u8> data = {reinterpret_cast<u8*>(f.data.data()), f.data.size() * sizeof(u32)};
-
-				sorted[data] = &f;
-			}
-
-			std::unordered_set<u32> depth_n;
-
-			u32 n_max = 0;
-
-			for (auto&& [bytes, f] : sorted)
-			{
-				{
-					sha1_context ctx;
-					u8 output[20];
-
-					sha1_starts(&ctx);
-					sha1_update(&ctx, bytes.data(), bytes.size());
-					sha1_finish(&ctx, output);
-					fmt::append(dump, "\n\t[%s] ", fmt::base57(output));
-				}
-
-				u32 depth_m = 0;
-
-				for (auto&& [data, f2] : sorted)
-				{
-					u32 depth = 0;
-
-					if (f2 == f)
-					{
-						continue;
-					}
-
-					for (u32 i = 0; i < bytes.size(); i++)
-					{
-						if (i < data.size() && data[i] == bytes[i])
-						{
-							depth++;
-						}
-						else
-						{
-							break;
-						}
-					}
-
-					depth_n.emplace(depth);
-					depth_m = std::max(depth, depth_m);
-				}
-
-				fmt::append(dump, "c=%06d,d=%06d ", depth_n.size(), depth_m);
-
-				bool sk = false;
-
-				for (u32 i = 0; i < std::min<usz>(bytes.size(), std::max<usz>(256, depth_m)); i++)
-				{
-					if (depth_m == i)
-					{
-						dump += '|';
-						sk = true;
-					}
-
-					fmt::append(dump, "%02x", bytes[i]);
-
-					if (i % 4 == 3)
-					{
-						if (sk)
-						{
-							sk = false;
-						}
-						else
-						{
-							dump += ' ';
-						}
-
-						dump += ' ';
-					}
-				}
-
-				fmt::append(dump, "\n\t%49s", "");
-
-				for (u32 i = 0; i < std::min<usz>(f->data.size(), std::max<usz>(64, utils::aligned_div<u32>(depth_m, 4))); i++)
-				{
-					fmt::append(dump, "%-10s", g_spu_iname.decode(std::bit_cast<be_t<u32>>(f->data[i])));
-				}
-
-				n_max = std::max(n_max, ::size32(depth_n));
-
-				depth_n.clear();
-			}
-
-			spu_log.notice("SPU Cache Dump (max_c=%d): %s", n_max, dump);
-		}
-	}
-
-	// Initialize global cache instance
-	if (g_cfg.core.spu_cache && cache)
-	{
-		g_fxo->get<spu_cache>() = std::move(cache);
-	}
-}
-
-bool spu_program::operator==(const spu_program& rhs) const noexcept
-{
-	// TODO
-	return entry_point - lower_bound == rhs.entry_point - rhs.lower_bound && data == rhs.data;
-}
-
-bool spu_program::operator<(const spu_program& rhs) const noexcept
-{
-	const u32 lhs_offs = (entry_point - lower_bound) / 4;
-	const u32 rhs_offs = (rhs.entry_point - rhs.lower_bound) / 4;
-
-	// Select range for comparison
-	std::span<const u32> lhs_data(data.data() + lhs_offs, data.size() - lhs_offs);
-	std::span<const u32> rhs_data(rhs.data.data() + rhs_offs, rhs.data.size() - rhs_offs);
-
-	const int cmp0 = span_less<const u32>::compare(lhs_data, rhs_data);
-
-	if (cmp0 < 0)
-		return true;
-	else if (cmp0 > 0)
-		return false;
-
-	// Compare from address 0 to the point before the entry point (TODO: undesirable)
-	lhs_data = {data.data(), lhs_offs};
-	rhs_data = {rhs.data.data(), rhs_offs};
-
-	const int cmp1 = span_less<const u32>::compare(lhs_data, rhs_data);
-
-	if (cmp1 < 0)
-		return true;
-	else if (cmp1 > 0)
-		return false;
-
-	// TODO
-	return lhs_offs < rhs_offs;
-}
-
-spu_runtime::spu_runtime()
-{
-	// Clear LLVM output
-	m_cache_path = rpcs3::cache::get_ppu_cache();
-
-	if (m_cache_path.empty())
-	{
-		return;
-	}
-
-	if (g_cfg.core.spu_debug && g_cfg.core.spu_decoder != spu_decoder_type::dynamic && g_cfg.core.spu_decoder != spu_decoder_type::_static)
-	{
-		if (!fs::create_dir(m_cache_path + "llvm/"))
-		{
-			fs::remove_all(m_cache_path + "llvm/", false);
-		}
-
-		fs::file(m_cache_path + "spu.log", fs::rewrite);
-		fs::file(m_cache_path + "spu-ir.log", fs::rewrite);
-	}
-}
-
-spu_item* spu_runtime::add_empty(spu_program&& data)
-{
-	if (data.data.empty())
-	{
-		return nullptr;
-	}
-
-	// Store previous item if already added
-	spu_item* prev = nullptr;
-
-	//Try to add item that doesn't exist yet
-	const auto ret = m_stuff[data.data[0] >> 12].push_if([&](spu_item& _new, spu_item& _old)
-	{
-		if (_new.data == _old.data)
-		{
-			prev = &_old;
-			return false;
-		}
-
-		return true;
-	}, std::move(data));
-
-	if (ret)
-	{
-		return ret;
-	}
-
-	return prev;
-}
-
-spu_function_t spu_runtime::rebuild_ubertrampoline(u32 id_inst)
-{
-	// Prepare sorted list
-	static thread_local std::vector<std::pair<std::span<const u32>, spu_function_t>> m_flat_list;
-
-	// Remember top position
-	auto stuff_it = ::at32(m_stuff, id_inst >> 12).begin();
-	auto stuff_end = ::at32(m_stuff, id_inst >> 12).end();
-	{
-		if (stuff_it->trampoline)
-		{
-			return stuff_it->trampoline;
-		}
-
-		m_flat_list.clear();
-
-		for (auto it = stuff_it; it != stuff_end; ++it)
-		{
-			if (const auto ptr = it->compiled.load())
-			{
-				std::span<const u32> range{it->data.data.data(), it->data.data.size()};
-				range = range.subspan((it->data.entry_point - it->data.lower_bound) / 4);
-				m_flat_list.emplace_back(range, ptr);
-			}
-			else
-			{
-				// Pull oneself deeper (TODO)
-				++stuff_it;
-			}
-		}
-	}
-
-	std::sort(m_flat_list.begin(), m_flat_list.end(), FN(s_span_less<const u32>(x.first, y.first)));
-
-	struct work
-	{
-		u32 size;
-		u16 from;
-		u16 level;
-		u8* rel32;
-		decltype(m_flat_list)::iterator beg;
-		decltype(m_flat_list)::iterator end;
-	};
-
-	// Scratch vector
-	static thread_local std::vector<work> workload;
-
-	// Generate a dispatcher (übertrampoline)
-	const auto beg = m_flat_list.begin();
-	const auto _end = m_flat_list.end();
-	const u32 size0 = ::size32(m_flat_list);
-
-	auto result = beg->second;
-
-	if (size0 != 1)
-	{
-#if defined(ARCH_ARM64)
-		// Allocate some writable executable memory
-		u8* const wxptr = jit_runtime::alloc(size0 * 128 + 16, 16);
-
-		if (!wxptr)
-		{
-			return nullptr;
-		}
-
-		// Raw assembly pointer
-		u8* raw = wxptr;
-
-		auto make_jump = [&](asmjit::arm::CondCode op, auto target)
-		{
-			// 36 bytes
-			// Fallback to dispatch if no target
-			const u64 taddr = target ? reinterpret_cast<u64>(target) : reinterpret_cast<u64>(tr_dispatch);
-
-			// ldr x9, #16 -> ldr x9, taddr
-			*raw++ = 0x89;
-			*raw++ = 0x00;
-			*raw++ = 0x00;
-			*raw++ = 0x58;
-
-			if (op == asmjit::arm::CondCode::kAlways)
-			{
-				// br x9
-				*raw++ = 0x20;
-				*raw++ = 0x01;
-				*raw++ = 0x1F;
-				*raw++ = 0xD6;
-
-				// nop
-				*raw++ = 0x1F;
-				*raw++ = 0x20;
-				*raw++ = 0x03;
-				*raw++ = 0xD5;
-
-				// nop
-				*raw++ = 0x1F;
-				*raw++ = 0x20;
-				*raw++ = 0x03;
-				*raw++ = 0xD5;
-			}
-			else
-			{
-				// b.COND #8 -> b.COND do_branch
-				switch (op)
-				{
-				case asmjit::arm::CondCode::kUnsignedLT:
-					*raw++ = 0x43;
-					break;
-				case asmjit::arm::CondCode::kUnsignedGT:
-					*raw++ = 0x48;
-					break;
-				default:
-					asm("brk 0x42");
-				}
-
-				*raw++ = 0x00;
-				*raw++ = 0x00;
-				*raw++ = 0x54;
-
-				// b #16 -> b cont
-				*raw++ = 0x04;
-				*raw++ = 0x00;
-				*raw++ = 0x00;
-				*raw++ = 0x14;
-
-				// do_branch: br x9
-				*raw++ = 0x20;
-				*raw++ = 0x01;
-				*raw++ = 0x1f;
-				*raw++ = 0xD6;
-			}
-
-			// taddr
-			std::memcpy(raw, &taddr, 8);
-			raw += 8;
-
-			// cont: next instruction
-		};
-#elif defined(ARCH_X64)
-		// Allocate some writable executable memory
-		u8* const wxptr = jit_runtime::alloc(size0 * 22 + 14, 16);
-
-		if (!wxptr)
-		{
-			return nullptr;
-		}
-
-		// Raw assembly pointer
-		u8* raw = wxptr;
-
-		// Write jump instruction with rel32 immediate
-		auto make_jump = [&](u8 op, auto target)
-		{
-			ensure(raw + 8 <= wxptr + size0 * 22 + 16);
-
-			// Fallback to dispatch if no target
-			const u64 taddr = target ? reinterpret_cast<u64>(target) : reinterpret_cast<u64>(tr_dispatch);
-
-			// Compute the distance
-			const s64 rel = taddr - reinterpret_cast<u64>(raw) - (op != 0xe9 ? 6 : 5);
-
-			ensure(rel >= s32{smin} && rel <= s32{smax});
-
-			if (op != 0xe9)
-			{
-				// First jcc byte
-				*raw++ = 0x0f;
-				ensure((op >> 4) == 0x8);
-			}
-
-			*raw++ = op;
-
-			const s32 r32 = static_cast<s32>(rel);
-
-			std::memcpy(raw, &r32, 4);
-			raw += 4;
-		};
-#endif
-
-		workload.clear();
-		workload.reserve(size0);
-		workload.emplace_back();
-		workload.back().size  = size0;
-		workload.back().level = 0;
-		workload.back().from  = -1;
-		workload.back().rel32 = nullptr;
-		workload.back().beg   = beg;
-		workload.back().end   = _end;
-
-		// LS address starting from PC is already loaded into rcx (see spu_runtime::tr_all)
-
-		for (usz i = 0; i < workload.size(); i++)
-		{
-			// Get copy of the workload info
-			auto w = workload[i];
-
-			// Split range in two parts
-			auto it = w.beg;
-			auto it2 = w.beg;
-			u32 size1 = w.size / 2;
-			u32 size2 = w.size - size1;
-			std::advance(it2, w.size / 2);
-
-			while (ensure(w.level < umax))
-			{
-				it = it2;
-				size1 = w.size - size2;
-
-				if (w.level >= w.beg->first.size())
-				{
-					// Cannot split: smallest function is a prefix of bigger ones (TODO)
-					break;
-				}
-
-				const u32 x1 = ::at32(w.beg->first, w.level);
-
-				if (!x1)
-				{
-					// Cannot split: some functions contain holes at this level
-					w.level++;
-
-					// Resort subrange starting from the new level
-					std::stable_sort(w.beg, w.end, [&](const auto& a, const auto& b)
-					{
-						std::span<const u32> lhs = a.first;
-						std::span<const u32> rhs = b.first;
-
-						lhs = lhs.subspan(w.level);
-						rhs = rhs.subspan(w.level);
-
-						return s_span_less<const u32>(lhs, rhs);
-					});
-
-					continue;
-				}
-
-				// Adjust ranges (forward)
-				while (it != w.end && x1 == ::at32(it->first, w.level))
-				{
-					it++;
-					size1++;
-				}
-
-				if (it == w.end)
-				{
-					// Cannot split: words are identical within the range at this level
-					w.level++;
-				}
-				else
-				{
-					size2 = w.size - size1;
-					break;
-				}
-			}
-
-			if (w.rel32)
-			{
-#if defined(ARCH_X64)
-				// Patch rel32 linking it to the current location if necessary
-				const s32 r32 = ::narrow<s32>(raw - w.rel32);
-				std::memcpy(w.rel32 - 4, &r32, 4);
-#elif defined(ARCH_ARM64)
-				//	Rewrite jump address
-				{
-					u64 raw64 = reinterpret_cast<u64>(raw);
-					memcpy(w.rel32 - 8, &raw64, 8);
-				}
-#else
-#error "Unimplemented"
-#endif
-			}
-
-			if (w.level >= w.beg->first.size() || w.level >= it->first.size())
-			{
-				// If functions cannot be compared, assume smallest function
-				spu_log.error("Trampoline simplified at ??? (level=%u)", w.level);
-#if defined(ARCH_X64)
-				make_jump(0xe9, w.beg->second); // jmp rel32
-#elif defined(ARCH_ARM64)
-				u64 branch_target = reinterpret_cast<u64>(w.beg->second);
-				make_jump(asmjit::arm::CondCode::kAlways, branch_target);
-#else
-#error "Unimplemented"
-#endif
-				continue;
-			}
-
-			// Value for comparison
-			const u32 x = ::at32(it->first, w.level);
-
-			// Adjust ranges (backward)
-			while (it != m_flat_list.begin())
-			{
-				it--;
-
-				if (w.level >= it->first.size())
-				{
-					it = m_flat_list.end();
-					break;
-				}
-
-				if (::at32(it->first, w.level) != x)
-				{
-					it++;
-					break;
-				}
-
-				ensure(it != w.beg);
-				size1--;
-				size2++;
-			}
-
-			if (it == m_flat_list.end())
-			{
-				spu_log.error("Trampoline simplified (II) at ??? (level=%u)", w.level);
-#if defined(ARCH_X64)
-				make_jump(0xe9, w.beg->second); // jmp rel32
-#elif defined(ARCH_ARM64)
-				u64 branch_target = reinterpret_cast<u64>(w.beg->second);
-				make_jump(asmjit::arm::CondCode::kAlways, branch_target);
-#else
-#error "Unimplemented"
-#endif
-				continue;
-			}
-
-			// Emit 32-bit comparison
-#if defined(ARCH_X64)
-			ensure(raw + 12 <= wxptr + size0 * 22 + 16); // "Asm overflow"
-#elif defined(ARCH_ARM64)
-			ensure(raw + (4 * 4) <= wxptr + size0 * 128 + 16);
-#else
-#error "Unimplemented"
-#endif
-
-			if (w.from != w.level)
-			{
-				// If necessary (level has advanced), emit load: mov eax, [rcx + addr]
-				const u32 cmp_lsa = w.level * 4u;
-#if defined(ARCH_X64)
-				if (cmp_lsa < 0x80)
-				{
-					*raw++ = 0x8b;
-					*raw++ = 0x41;
-					*raw++ = ::narrow<s8>(cmp_lsa);
-				}
-				else
-				{
-					*raw++ = 0x8b;
-					*raw++ = 0x81;
-					std::memcpy(raw, &cmp_lsa, 4);
-					raw += 4;
-				}
-#elif defined(ARCH_ARM64)
-				// ldr w9, #8
-				*raw++ = 0x49;
-				*raw++ = 0x00;
-				*raw++ = 0x00;
-				*raw++ = 0x18;
-
-				// b #8
-				*raw++ = 0x02;
-				*raw++ = 0x00;
-				*raw++ = 0x00;
-				*raw++ = 0x14;
-
-				// cmp_lsa
-				std::memcpy(raw, &cmp_lsa, 4);
-				raw += 4;
-
-				// ldr w1, [x7, x9]
-				*raw++ = 0xE1;
-				*raw++ = 0x68;
-				*raw++ = 0x69;
-				*raw++ = 0xB8;
-#else
-#error "Unimplemented"
-#endif
-			}
-
-			// Emit comparison: cmp eax, imm32
-#if defined(ARCH_X64)
-			*raw++ = 0x3d;
-			std::memcpy(raw, &x, 4);
-			raw += 4;
-#elif defined(ARCH_ARM64)
-			// ldr w9, #8
-			*raw++ = 0x49;
-			*raw++ = 0x00;
-			*raw++ = 0x00;
-			*raw++ = 0x18;
-
-			// b #8
-			*raw++ = 0x02;
-			*raw++ = 0x00;
-			*raw++ = 0x00;
-			*raw++ = 0x14;
-
-			// x
-			std::memcpy(raw, &x, 4);
-			raw += 4;
-
-			// cmp w1, w9
-			*raw++ = 0x3f;
-			*raw++ = 0x00;
-			*raw++ = 0x09;
-			*raw++ = 0x6B;
-#else
-#error "Unimplemented"
-#endif
-
-			// Low subrange target
-			if (size1 == 1)
-			{
-#if defined(ARCH_X64)
-				make_jump(0x82, w.beg->second); // jb rel32
-#elif defined(ARCH_ARM64)
-				u64 branch_target = reinterpret_cast<u64>(w.beg->second);
-				make_jump(asmjit::arm::CondCode::kUnsignedLT, branch_target);
-#else
-#error "Unimplemented"
-#endif
-			}
-			else
-			{
-#if defined(ARCH_X64)
-				make_jump(0x82, raw); // jb rel32 (stub)
-#elif defined(ARCH_ARM64)
-				make_jump(asmjit::arm::CondCode::kUnsignedLT, raw);
-#else
-#error "Unimplemented"
-#endif
-				auto& to = workload.emplace_back(w);
-				to.end   = it;
-				to.size  = size1;
-				to.rel32 = raw;
-				to.from  = w.level;
-			}
-
-			// Second subrange target
-			if (size2 == 1)
-			{
-#if defined(ARCH_X64)
-				make_jump(0xe9, it->second); // jmp rel32
-#elif defined(ARCH_ARM64)
-				u64 branch_target = reinterpret_cast<u64>(it->second);
-				make_jump(asmjit::arm::CondCode::kAlways, branch_target);
-#else
-#error "Unimplemented"
-#endif
-			}
-			else
-			{
-				it2 = it;
-
-				// Select additional midrange for equality comparison
-				while (it2 != w.end && ::at32(it2->first, w.level) == x)
-				{
-					size2--;
-					it2++;
-				}
-
-				if (it2 != w.end)
-				{
-					// High subrange target
-					if (size2 == 1)
-					{
-#if defined(ARCH_X64)
-						make_jump(0x87, it2->second); // ja rel32
-#elif defined(ARCH_ARM64)
-						u64 branch_target = reinterpret_cast<u64>(it2->second);
-						make_jump(asmjit::arm::CondCode::kUnsignedGT, branch_target);
-#else
-#throw "Unimplemented"
-#endif
-					}
-					else
-					{
-#if defined(ARCH_X64)
-						make_jump(0x87, raw); // ja rel32 (stub)
-#elif defined(ARCH_ARM64)
-						make_jump(asmjit::arm::CondCode::kUnsignedGT, raw);
-#else
-#error "Unimplemented"
-#endif
-						auto& to = workload.emplace_back(w);
-						to.beg   = it2;
-						to.size  = size2;
-						to.rel32 = raw;
-						to.from  = w.level;
-					}
-
-					const u32 size3 = w.size - size1 - size2;
-
-					if (size3 == 1)
-					{
-#if defined(ARCH_X64)
-						make_jump(0xe9, it->second); // jmp rel32
-#elif defined(ARCH_ARM64)
-						u64 branch_target = reinterpret_cast<u64>(it->second);
-						make_jump(asmjit::arm::CondCode::kAlways, branch_target);
-#else
-#error "Unimplemented"
-#endif
-					}
-					else
-					{
-#if defined(ARCH_X64)
-						make_jump(0xe9, raw); // jmp rel32 (stub)
-#elif defined(ARCH_ARM64)
-						make_jump(asmjit::arm::CondCode::kAlways, raw);
-#else
-#error "Unimplemented"
-#endif
-						auto& to = workload.emplace_back(w);
-						to.beg   = it;
-						to.end   = it2;
-						to.size  = size3;
-						to.rel32 = raw;
-						to.from  = w.level;
-					}
-				}
-				else
-				{
-#if defined(ARCH_X64)
-					make_jump(0xe9, raw); // jmp rel32 (stub)
-#elif defined(ARCH_ARM64)
-					make_jump(asmjit::arm::CondCode::kAlways, raw);
-#else
-#error "Unimplemented"
-#endif
-					auto& to = workload.emplace_back(w);
-					to.beg   = it;
-					to.size  = w.size - size1;
-					to.rel32 = raw;
-					to.from  = w.level;
-				}
-			}
-		}
-
-		workload.clear();
-		result = reinterpret_cast<spu_function_t>(reinterpret_cast<u64>(wxptr));
-
-		std::string fname;
-		fmt::append(fname, "__ub%u", m_flat_list.size());
-		jit_announce(wxptr, raw - wxptr, fname);
-	}
-
-	if (auto _old = stuff_it->trampoline.compare_and_swap(nullptr, result))
-	{
-		return _old;
-	}
-
-	// Install ubertrampoline
-	auto& insert_to = ::at32(*spu_runtime::g_dispatcher, id_inst >> 12);
-
-	auto _old = insert_to.load();
-
-	do
-	{
-		// Make sure we are replacing an older ubertrampoline but not newer one
-		if (_old != tr_dispatch)
-		{
-			bool ok = false;
-
-			for (auto it = stuff_it; it != stuff_end; ++it)
-			{
-				if (it->trampoline == _old)
-				{
-					ok = true;
-					break;
-				}
-			}
-
-			if (!ok)
-			{
-				return result;
-			}
-		}
-	}
-	while (!insert_to.compare_exchange(_old, result));
-
-	return result;
-}
-
-spu_function_t spu_runtime::find(const u32* ls, u32 addr) const
-{
-	const u32 index = ls[addr / 4] >> 12;
-	for (const auto& item : ::at32(m_stuff, index))
-	{
-		if (const auto ptr = item.compiled.load())
-		{
-			std::span<const u32> range{item.data.data.data(), item.data.data.size()};
-			range = range.subspan((item.data.entry_point - item.data.lower_bound) / 4);
-
-			if (addr / 4 + range.size() > 0x10000)
-			{
-				continue;
-			}
-
-			if (std::equal(range.begin(), range.end(), ls + addr / 4))
-			{
-				return ptr;
-			}
-		}
-	}
-
-	return nullptr;
-}
-
-spu_function_t spu_runtime::make_branch_patchpoint(u16 data) const
-{
-#if defined(ARCH_X64)
-	u8* const raw = jit_runtime::alloc(16, 16);
-
-	if (!raw)
-	{
-		return nullptr;
-	}
-
-	// Save address of the following jmp (GHC CC 3rd argument)
-	raw[0] = 0x4c; // lea r12, [rip+1]
-	raw[1] = 0x8d;
-	raw[2] = 0x25;
-	raw[3] = 0x01;
-	raw[4] = 0x00;
-	raw[5] = 0x00;
-	raw[6] = 0x00;
-
-	raw[7] = 0x90; // nop
-
-	// Jump to spu_recompiler_base::branch
-	raw[8] = 0xe9;
-	// Compute the distance
-	const s64 rel = reinterpret_cast<u64>(tr_branch) - reinterpret_cast<u64>(raw + 8) - 5;
-	std::memcpy(raw + 9, &rel, 4);
-	raw[13] = 0xcc;
-	raw[14] = data >> 8;
-	raw[15] = data & 0xff;
-
-	return reinterpret_cast<spu_function_t>(raw);
-#elif defined(ARCH_ARM64)
-#if defined(__APPLE__)
-	pthread_jit_write_protect_np(false);
-#endif
-
-	u8* const patch_fn = ensure(jit_runtime::alloc(36, 16));
-	u8* raw = patch_fn;
-
-	// adr x21, #16
-	*raw++ = 0x95;
-	*raw++ = 0x00;
-	*raw++ = 0x00;
-	*raw++ = 0x10;
-
-	// nop x3
-	for (int i = 0; i < 3; i++)
-	{
-		*raw++ = 0x1F;
-		*raw++ = 0x20;
-		*raw++ = 0x03;
-		*raw++ = 0xD5;
-	}
-
-	// ldr x9, #8
-	*raw++ = 0x49;
-	*raw++ = 0x00;
-	*raw++ = 0x00;
-	*raw++ = 0x58;
-
-	// br x9
-	*raw++ = 0x20;
-	*raw++ = 0x01;
-	*raw++ = 0x1F;
-	*raw++ = 0xD6;
-
-	u64 branch_target = reinterpret_cast<u64>(tr_branch);
-	std::memcpy(raw, &branch_target, 8);
-	raw += 8;
-
-	*raw++ = static_cast<u8>(data >> 8);
-	*raw++ = static_cast<u8>(data & 0xff);
-
-#if defined(__APPLE__)
-	pthread_jit_write_protect_np(true);
-#endif
-
-	// Flush all cache lines after potentially writing executable code
-	asm("ISB");
-	asm("DSB ISH");
-
-	return reinterpret_cast<spu_function_t>(patch_fn);
-#else
-#error "Unimplemented"
-#endif
-}
-
-spu_recompiler_base::spu_recompiler_base()
-{
-}
-
-spu_recompiler_base::~spu_recompiler_base()
-{
-}
-
-void spu_recompiler_base::dispatch(spu_thread& spu, void*, u8* rip)
-{
-	// If code verification failed from a patched patchpoint, clear it with a dispatcher jump
-	if (rip)
-	{
-#if defined(ARCH_X64)
-		const s64 rel = reinterpret_cast<u64>(spu_runtime::tr_all) - reinterpret_cast<u64>(rip - 8) - 5;
-
-		union
-		{
-			u8 bytes[8];
-			u64 result;
-		};
-
-		bytes[0] = 0xe9; // jmp rel32
-		std::memcpy(bytes + 1, &rel, 4);
-		bytes[5] = 0x66; // lnop (2 bytes)
-		bytes[6] = 0x90;
-		bytes[7] = 0x90;
-
-		atomic_storage<u64>::release(*reinterpret_cast<u64*>(rip - 8), result);
-#elif defined(ARCH_ARM64)
-		union
-		{
-			u8 bytes[16];
-			u128 result;
-		};
-
-		// ldr x9, #8
-		bytes[0] = 0x49;
-		bytes[1] = 0x00;
-		bytes[2] = 0x00;
-		bytes[3] = 0x58;
-
-		// br x9
-		bytes[4] = 0x20;
-		bytes[5] = 0x01;
-		bytes[6] = 0x1F;
-		bytes[7] = 0xD6;
-
-		const u64 target = reinterpret_cast<u64>(spu_runtime::tr_all);
-		std::memcpy(bytes + 8, &target, 8);
-#if defined(__APPLE__)
-		pthread_jit_write_protect_np(false);
-#endif
-		atomic_storage<u128>::release(*reinterpret_cast<u128*>(rip), result);
-#if defined(__APPLE__)
-		pthread_jit_write_protect_np(true);
-#endif
-
-		// Flush all cache lines after potentially writing executable code
-		asm("ISB");
-		asm("DSB ISH");
-#else
-#error "Unimplemented"
-#endif
-	}
-
-	// Second attempt (recover from the recursion after repeated unsuccessful trampoline call)
-	if (spu.block_counter != spu.block_recover && &dispatch != ::at32(*spu_runtime::g_dispatcher, spu._ref<nse_t<u32>>(spu.pc) >> 12))
-	{
-		spu.block_recover = spu.block_counter;
-		return;
-	}
-
-	spu.jit->init();
-
-	// Compile
-	if (spu._ref<u32>(spu.pc) == 0u)
-	{
-		spu_runtime::g_escape(&spu);
-		return;
-	}
-
-	const auto func = spu.jit->compile(spu.jit->analyse(spu._ptr<u32>(0), spu.pc));
-
-	if (!func)
-	{
-		spu_log.fatal("[0x%05x] Compilation failed.", spu.pc);
-		return;
-	}
-
-	// Diagnostic
-	if (g_cfg.core.spu_block_size == spu_block_size_type::giga)
-	{
-		const v128 _info = spu.stack_mirror[(spu.gpr[1]._u32[3] & 0x3fff0) >> 4];
-
-		if (_info._u64[0] + 1)
-		{
-			spu_log.trace("Called from 0x%x", _info._u32[2] - 4);
-		}
-	}
-#if defined(__APPLE__)
-	pthread_jit_write_protect_np(true);
-#endif
-
-#if defined(ARCH_ARM64)
-	// Flush all cache lines after potentially writing executable code
-	asm("ISB");
-	asm("DSB ISH");
-#endif
-	spu_runtime::g_tail_escape(&spu, func, nullptr);
-}
-
-void spu_recompiler_base::branch(spu_thread& spu, void*, u8* rip)
-{
-#if defined(ARCH_X64)
-	if (const u32 ls_off = ((rip[6] << 8) | rip[7]) * 4)
-#elif defined(ARCH_ARM64)
-	if (const u32 ls_off = ((rip[16] << 8) | rip[17]) * 4) // See branch_patchpoint `data`
-#else
-#error "Unimplemented"
-#endif
-	{
-		spu_log.todo("Special branch patchpoint hit.\nPlease report to the developer (0x%05x).", ls_off);
-	}
-
-	// Find function
-	const auto func = spu.jit->get_runtime().find(static_cast<u32*>(spu._ptr<void>(0)), spu.pc);
-
-	if (!func)
-	{
-		return;
-	}
-
-#if defined(ARCH_X64)
-	// Overwrite jump to this function with jump to the compiled function
-	const s64 rel = reinterpret_cast<u64>(func) - reinterpret_cast<u64>(rip) - 5;
-
-	union
-	{
-		u8 bytes[8];
-		u64 result;
-	};
-
-	if (rel >= s32{smin} && rel <= s32{smax})
-	{
-		const s64 rel8 = (rel + 5) - 2;
-
-		if (rel8 >= s8{smin} && rel8 <= s8{smax})
-		{
-			bytes[0] = 0xeb; // jmp rel8
-			bytes[1] = static_cast<s8>(rel8);
-			std::memset(bytes + 2, 0xcc, 4);
-		}
-		else
-		{
-			bytes[0] = 0xe9; // jmp rel32
-			std::memcpy(bytes + 1, &rel, 4);
-			bytes[5] = 0xcc;
-		}
-
-		bytes[6] = rip[6];
-		bytes[7] = rip[7];
-	}
-	else
-	{
-		fmt::throw_exception("Impossible far jump: %p -> %p", rip, func);
-	}
-
-	atomic_storage<u64>::release(*reinterpret_cast<u64*>(rip), result);
-#elif defined(ARCH_ARM64)
-	union
-	{
-		u8 bytes[16];
-		u128 result;
-	};
-
-	// ldr x9, #8
-	bytes[0] = 0x49;
-	bytes[1] = 0x00;
-	bytes[2] = 0x00;
-	bytes[3] = 0x58;
-
-	// br x9
-	bytes[4] = 0x20;
-	bytes[5] = 0x01;
-	bytes[6] = 0x1F;
-	bytes[7] = 0xD6;
-
-	const u64 target = reinterpret_cast<u64>(func);
-	std::memcpy(bytes + 8, &target, 8);
-#if defined(__APPLE__)
-	pthread_jit_write_protect_np(false);
-#endif
-	atomic_storage<u128>::release(*reinterpret_cast<u128*>(rip), result);
-#if defined(__APPLE__)
-	pthread_jit_write_protect_np(true);
-#endif
-
-	// Flush all cache lines after potentially writing executable code
-	asm("ISB");
-	asm("DSB ISH");
-#else
-#error "Unimplemented"
-#endif
-
-	spu_runtime::g_tail_escape(&spu, func, rip);
-}
-
-void spu_recompiler_base::old_interpreter(spu_thread& spu, void* ls, u8* /*rip*/)
-{
-	if (g_cfg.core.spu_decoder != spu_decoder_type::_static)
-	{
-		fmt::throw_exception("Invalid SPU decoder");
-	}
-
-	// Select opcode table
-	const auto& table = g_fxo->get<spu_interpreter_rt>();
-
-	// LS pointer
-	const auto base = static_cast<const u8*>(ls);
-
-	while (true)
-	{
-		if (spu.state) [[unlikely]]
-		{
-			if (spu.check_state())
-				break;
-		}
-
-		const u32 op = *reinterpret_cast<const be_t<u32>*>(base + spu.pc);
-		if (table.decode(op)(spu, {op}))
-			spu.pc += 4;
-	}
-}
-
-std::vector<u32> spu_thread::discover_functions(u32 base_addr, std::span<const u8> ls, bool is_known_addr, u32 /*entry*/)
-{
-	std::vector<u32> calls;
-	std::vector<u32> branches;
-
-	calls.reserve(100);
-
-	// Discover functions
-	// Use the most simple method: search for instructions that calls them
-	// And then filter invalid cases
-	// TODO: Does not detect jumptables or fixed-addr indirect calls
-	const v128 brasl_mask = is_known_addr ? v128::from32p(0x62u << 23) : v128::from32p(umax);
-
-	for (u32 i = utils::align<u32>(base_addr, 0x10); i < std::min<u32>(base_addr + ::size32(ls), 0x3FFF0); i += 0x10)
-	{
-		// Search for BRSL LR and BRASL LR or BR
-		// TODO: BISL
-		const v128 inst = read_from_ptr<be_t<v128>>(ls.data(), i - base_addr);
-		const v128 cleared_i16 = gv_and32(inst, v128::from32p(utils::rol32(~0xffff, 7)));
-		const v128 eq_brsl = gv_eq32(cleared_i16, v128::from32p(0x66u << 23));
-		const v128 eq_brasl = gv_eq32(cleared_i16, brasl_mask);
-		const v128 eq_br = gv_eq32(cleared_i16, v128::from32p(0x64u << 23));
-		const v128 result = eq_brsl | eq_brasl;
-
-		if (!gv_testz(result))
-		{
-			for (u32 j = 0; j < 4; j++)
-			{
-				if (result.u32r[j])
-				{
-					calls.push_back(i + j * 4);
-				}
-			}
-		}
-
-		if (!gv_testz(eq_br))
-		{
-			for (u32 j = 0; j < 4; j++)
-			{
-				if (eq_br.u32r[j])
-				{
-					branches.push_back(i + j * 4);
-				}
-			}
-		}
-	}
-
-	calls.erase(std::remove_if(calls.begin(), calls.end(), [&](u32 caller)
-	{
-		// Check the validity of both the callee code and the following caller code
-		return !is_exec_code(caller, ls, base_addr, true) || !is_exec_code(caller + 4, ls, base_addr, true);
-	}), calls.end());
-
-	branches.erase(std::remove_if(branches.begin(), branches.end(), [&](u32 caller)
-	{
-		// Check the validity of the callee code
-		return !is_exec_code(caller, ls, base_addr, true);
-	}), branches.end());
-
-	std::vector<u32> addrs;
-
-	for (u32 addr : calls)
-	{
-		const spu_opcode_t op{read_from_ptr<be_t<u32>>(ls, addr - base_addr)};
-
-		const u32 func = op_branch_targets(addr, op)[0];
-
-		if (func == umax || addr + 4 == func || func == addr || std::count(addrs.begin(), addrs.end(), func))
-		{
-			continue;
-		}
-
-		if (std::count(calls.begin(), calls.end(), func))
-		{
-			// Cannot call another call instruction (link is overwritten)
-			continue;
-		}
-
-		addrs.push_back(func);
-
-		// Detect an "arguments passing" block, possible queue another function
-		for (u32 next = func, it = 10; it && next >= base_addr && next < std::min<u32>(base_addr + ::size32(ls), 0x3FFF0); it--, next += 4)
-		{
-			const spu_opcode_t test_op{read_from_ptr<be_t<u32>>(ls, next - base_addr)};
-			const auto type = g_spu_itype.decode(test_op.opcode);
-
-			if (type & spu_itype::branch && type != spu_itype::BR)
-			{
-				break;
-			}
-
-			if (type == spu_itype::UNK || !test_op.opcode)
-			{
-				break;
-			}
-
-			if (type != spu_itype::BR)
-			{
-				continue;
-			}
-
-			const u32 target = op_branch_targets(next, op)[0];
-
-			if (target == umax || addr + 4 == target || target == addr || std::count(addrs.begin(), addrs.end(), target))
-			{
-				break;
-			}
-
-			// Detect backwards branch to the block in examination
-			if (target >= func && target <= next)
-			{
-				break;
-			}
-
-			if (!is_exec_code(target, ls, base_addr, true))
-			{
-				break;
-			}
-
-			addrs.push_back(target);
-			break;
-		}
-	}
-
-	for (u32 addr : branches)
-	{
-		const spu_opcode_t op{read_from_ptr<be_t<u32>>(ls, addr - base_addr)};
-
-		const u32 func = op_branch_targets(addr, op)[0];
-
-		if (func == umax || addr + 4 == func || func == addr || !addr)
-		{
-			continue;
-		}
-
-		// Search for AI R1, -x in the called code
-		// Reasoning: AI R1, -x means stack frame creation, this is likely be a function
-		for (u32 next = func, it = 10; it && next >= base_addr && next < std::min<u32>(base_addr + ::size32(ls), 0x3FFF0); it--, next += 4)
-		{
-			const spu_opcode_t test_op{read_from_ptr<be_t<u32>>(ls, next - base_addr)};
-			const auto type = g_spu_itype.decode(test_op.opcode);
-
-			if (type & spu_itype::branch)
-			{
-				break;
-			}
-
-			if (type == spu_itype::UNK || !test_op.opcode)
-			{
-				break;
-			}
-
-			bool is_func = false;
-
-			if (type == spu_itype::AI && test_op.rt == 1u && test_op.ra == 1u)
-			{
-				if (test_op.si10 >= 0)
-				{
-					break;
-				}
-
-				is_func = true;
-			}
-
-			if (!is_func)
-			{
-				continue;
-			}
-
-			addr = SPU_LS_SIZE + 4; // Terminate the next condition, no further checks needed
-
-			if (std::count(addrs.begin(), addrs.end(), func))
-			{
-				break;
-			}
-
-			addrs.push_back(func);
-			break;
-		}
-
-		// Search for AI R1, +x or OR R3/4, Rx, 0 before the branch
-		// Reasoning: AI R1, +x means stack pointer restoration, branch after that is likely a tail call
-		// R3 and R4 are common function arguments because they are the first two
-		for (u32 back = addr - 4, it = 10; it && back >= base_addr && back < std::min<u32>(base_addr + ::size32(ls), 0x3FFF0); it--, back -= 4)
-		{
-			const spu_opcode_t test_op{read_from_ptr<be_t<u32>>(ls, back - base_addr)};
-			const auto type = g_spu_itype.decode(test_op.opcode);
-
-			if (type & spu_itype::branch)
-			{
-				break;
-			}
-
-			bool is_tail = false;
-
-			if (type == spu_itype::AI && test_op.rt == 1u && test_op.ra == 1u)
-			{
-				if (test_op.si10 <= 0)
-				{
-					break;
-				}
-
-				is_tail = true;
-			}
-			else if (!(type & spu_itype::zregmod))
-			{
-				const u32 op_rt = type & spu_itype::_quadrop ? +test_op.rt4 : +test_op.rt;
-
-				if (op_rt >= 80u && (type != spu_itype::LQD || test_op.ra != 1u))
-				{
-					// Modifying non-volatile registers, not a call (and not context restoration)
-					break;
-				}
-
-				//is_tail = op_rt == 3u || op_rt == 4u;
-			}
-
-			if (!is_tail)
-			{
-				continue;
-			}
-
-			if (std::count(addrs.begin(), addrs.end(), func))
-			{
-				break;
-			}
-
-			addrs.push_back(func);
-			break;
-		}
-	}
-
-	std::sort(addrs.begin(), addrs.end());
-
-	return addrs;
-}
-
-using reg_state_t = spu_recompiler_base::reg_state_t;
-using vf = spu_recompiler_base::vf;
-
-bool reg_state_t::is_const() const
-{
-	return !!(flag & vf::is_const);
-}
-
-bool reg_state_t::compare_tags(const reg_state_t& rhs) const
-{
-	// Compare by tag, address of instruction origin
-	return tag == rhs.tag && origin == rhs.origin && is_instruction == rhs.is_instruction;
-}
-
-bool reg_state_t::operator&(vf to_test) const
-{
-	return this->flag.all_of(to_test);
-}
-
-bool reg_state_t::is_less_than(u32 imm) const
-{
-	if (flag & vf::is_const && value < imm)
-	{
-		return true;
-	}
-
-	if (~known_zeroes < imm)
-	{
-		// The highest number possible within the mask's limit is less than imm
-		return true;
-	}
-
-	return false;
-}
-
-bool reg_state_t::operator==(const reg_state_t& r) const
-{
-	if ((flag ^ r.flag) - (vf::is_null + vf::is_mask))
-	{
-		return false;
-	}
-
-	return (flag & vf::is_const ? value == r.value : (compare_tags(r) && known_ones == r.known_ones && known_zeroes == r.known_zeroes));
-}
-
-bool reg_state_t::operator==(u32 imm) const
-{
-	return flag == vf::is_const && value == imm;
-}
-
-// Compare equality but try to ignore changes in unmasked bits
-bool reg_state_t::compare_with_mask_indifference(const reg_state_t& r, u32 mask_bits) const
-{
-	if (!mask_bits)
-	{
-		return true;
-	}
-
-	if ((r.flag & flag) & vf::is_const)
-	{
-		// Simplified path for consts
-		if (((value ^ r.value) & mask_bits) == 0)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	const bool is_equal = *this == r;
-
-	if (is_equal)
-	{
-		return true;
-	}
-
-	const auto _this = this->downgrade();
-	const auto _r = r.downgrade();
-
-	const bool is_mask_equal = (_this.compare_tags(_r) && _this.flag == _r.flag && !((_this.known_ones ^ _r.known_ones) & mask_bits) && !((_this.known_zeroes ^ _r.known_zeroes) & mask_bits));
-
-	return is_mask_equal;
-}
-
-bool reg_state_t::compare_with_mask_indifference(u32 imm, u32 mask_bits) const
-{
-	if (!mask_bits)
-	{
-		return true;
-	}
-
-	if (flag & vf::is_const)
-	{
-		if (((value ^ imm) & mask_bits) == 0)
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
-// Ensure unequality but try to ignore changes in unmasked bits
-bool reg_state_t::unequal_with_mask_indifference(const reg_state_t& r, u32 mask_bits) const
-{
-	if (!mask_bits)
-	{
-		return true;
-	}
-
-	if ((r.flag & flag) & vf::is_const)
-	{
-		// Simplified path for consts
-		if ((value ^ r.value) & mask_bits)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	const bool is_equal = *this == r;
-
-	if (is_equal)
-	{
-		return false;
-	}
-
-	// Full path
-	const auto _this = this->downgrade();
-	const auto _r = r.downgrade();
-
-	const bool is_base_value_equal = (_this.compare_tags(_r) && _this.flag == _r.flag);
-
-	if (!is_base_value_equal)
-	{
-		// Cannot ascertain unequality if the value origin is different
-		return false;
-	}
-
-	// Find at least one bit that is known to be X state at value 'r', and known to be X^1 state at the objects' value
-	return (((_this.known_ones ^ _r.known_ones) & mask_bits) & ((_this.known_zeroes ^ _r.known_zeroes) & mask_bits)) != 0;
-}
-
-reg_state_t reg_state_t::downgrade() const
-{
-	if (flag & vf::is_const)
-	{
-		return reg_state_t{vf::is_mask, 0, umax, this->value, ~this->value, this->origin};
-	}
-
-	if (!(flag - vf::is_null))
-	{
-		return reg_state_t{vf::is_mask, 0, this->tag, 0, 0, this->origin};
-	}
-
-	return *this;
-}
-
-reg_state_t reg_state_t::merge(const reg_state_t& rhs, u32 current_pc) const
-{
-	if (rhs == *this)
-	{
-		// Perfect state: no conflicts
-		return rhs;
-	}
-
-	if ((rhs.flag + flag).all_of(vf::is_const + vf::is_mask))
-	{
-		// Try to downgrade to a known-bits type value
-		const reg_state_t _rhs = rhs.downgrade();
-		const reg_state_t _this = this->downgrade();
-
-		if ((_rhs.flag & _this.flag) & vf::is_mask)
-		{
-			// Now it is possible to merge the two values
-			reg_state_t res{vf::is_mask, 0, 0, _rhs.known_ones & _this.known_ones, _rhs.known_zeroes & _this.known_zeroes};
-
-			if (res.known_zeroes | res.known_ones)
-			{
-				// Success (create new value tag)
-				res.tag = reg_state_t::alloc_tag();
-				res.origin = current_pc;
-				res.is_instruction = false;
-				return res;
-			}
-		}
-	}
-
-	return make_unknown(current_pc);
-}
-
-reg_state_t reg_state_t::build_on_top_of(const reg_state_t& rhs) const
-{
-	if (flag & vf::is_null)
-	{
-		// Value unmodified
-		return rhs;
-	}
-
-	if (rhs == *this)
-	{
-		// Perfect state: no conflicts
-		return rhs;
-	}
-
-	return *this;
-}
-
-u32 reg_state_t::get_known_zeroes() const
-{
-	if (flag & vf::is_const)
-	{
-		return ~value;
-	}
-
-	return known_zeroes;
-}
-
-
-u32 reg_state_t::get_known_ones() const
-{
-	if (flag & vf::is_const)
-	{
-		return value;
-	}
-
-	return known_ones;
-}
-
-reg_state_t reg_state_t::from_value(u32 value) noexcept
-{
-	reg_state_t v{};
-	v.value = value;
-	v.flag = vf::is_const;
-	return v;
-}
-
-u32 reg_state_t::alloc_tag(bool reset) noexcept
-{
-	static thread_local u32 g_tls_tag = 0;
-
-	if (reset)
-	{
-		g_tls_tag = 0;
-		return 0;
-	}
-
-	return ++g_tls_tag;
-}
-
-void reg_state_t::invalidate_if_created(u32 current_pc)
-{
-	if (!is_const() && origin == current_pc)
-	{
-		tag = reg_state_t::alloc_tag();
-	}
-}
-
-// Converge 2 register states to the same flow in execution
-template <usz N>
-static void merge(std::array<reg_state_t, N>& result, const std::array<reg_state_t, N>& lhs, const std::array<reg_state_t, N>& rhs, u32 current_pc)
-{
-	usz index = umax;
-
-	for (reg_state_t& state : result)
-	{
-		index++;
-
-		state = lhs[index].merge(rhs[index], current_pc);
-	}
-}
-
-// Override RHS state with the newer LHS state
-template <usz N>
-static void build_on_top_of(std::array<reg_state_t, N>& result, const std::array<reg_state_t, N>& lhs, const std::array<reg_state_t, N>& rhs)
-{
-	usz index = umax;
-
-	for (reg_state_t& state : result)
-	{
-		index++;
-
-		state = lhs[index].build_on_top_of(rhs[index]);
-	}
-}
-
-struct block_reg_info
-{
-	u32 pc = SPU_LS_SIZE; // Address
-	std::array<reg_state_t, s_reg_max> local_state{};
-	bool has_true_state = false;
-	std::array<reg_state_t, s_reg_max> start_reg_state{};
-	std::array<reg_state_t, s_reg_max> end_reg_state{};
-	std::array<reg_state_t, s_reg_max> addend_reg_state{};
-	std::array<reg_state_t, s_reg_max> walkby_state{}; // State that is made by merging state_predecessor and iterating over instructions for final instrucion walk
-
-	usz next_nodes_count = 0;
-
-	struct node_t
-	{
-		u32 prev_pc = umax;
-	};
-
-	std::vector<node_t> prev_nodes;
-
-	static std::unique_ptr<block_reg_info> create(u32 pc) noexcept
-	{
-		auto ptr = new block_reg_info{ pc, reg_state_t::make_unknown<s_reg_max>(pc) };
-
-		for (reg_state_t& f : ptr->local_state)
-		{
-			f.flag += vf::is_null;
-		}
-
-		ptr->start_reg_state = ptr->local_state;
-		return std::unique_ptr<block_reg_info>(ptr);
-	}
-
-	// Evaluate registers state
-	std::array<reg_state_t, s_reg_max>& evaluate_start_state(const std::map<u32, std::unique_ptr<block_reg_info>>& map, bool extensive_evaluation);
-
-	// This function creates new node if not found and links the proceeding node to the old node
-	// In a manner in which no duplicate paths are formed
-	static void create_node(u32 pc_rhs, u32 parent_pc, std::map<u32, std::unique_ptr<block_reg_info>>& map)
-	{
-		//ensure(parent_node != pc_rhs);
-		ensure(map[parent_pc]);
-
-		if (!map[pc_rhs])
-		{
-			map[pc_rhs] = create(pc_rhs);
-		}
-
-		node_t prev_node{parent_pc};
-		map[parent_pc]->next_nodes_count++;
-		map[pc_rhs]->prev_nodes.emplace_back(prev_node);
-	}
-};
-
-spu_program spu_recompiler_base::analyse(const be_t<u32>* ls, u32 entry_point, std::map<u32, std::vector<u32>>* out_target_list)
-{
-	// Result: addr + raw instruction data
-	spu_program result;
-	result.data.reserve(10000);
-	result.entry_point = entry_point;
-	result.lower_bound = entry_point;
-
-	// Initialize block entries
-	m_block_info.reset();
-	m_block_info.set(entry_point / 4);
-	m_entry_info.reset();
-	m_entry_info.set(entry_point / 4);
-	m_ret_info.reset();
-
-	// Simple block entry workload list
-	workload.clear();
-	workload.push_back(entry_point);
-
-	std::memset(m_regmod.data(), 0xff, sizeof(m_regmod));
-	m_use_ra.reset();
-	m_use_rb.reset();
-	m_use_rc.reset();
-	m_targets.clear();
-	m_preds.clear();
-	m_preds[entry_point];
-	m_bbs.clear();
-	m_chunks.clear();
-	m_funcs.clear();
-	m_inst_attrs.clear();
-	m_patterns.clear();
-
-	// SYNC instruction found
-	bool sync = false;
-
-	u32 hbr_loc = 0;
-	u32 hbr_tg = -1;
-
-	// Result bounds
-	u32 lsa = entry_point;
-	u32 limit = SPU_LS_SIZE;
-
-	if (g_cfg.core.spu_block_size == spu_block_size_type::giga)
-	{
-	}
-
-	// Weak constant propagation context (for guessing branch targets)
-	std::array<bs_t<vf>, 128> vflags{};
-
-	// Associated constant values for 32-bit preferred slot
-	std::array<u32, 128> values;
-
-	for (u32 wi = 0, wa = workload[0]; wi < workload.size();)
-	{
-		const auto next_block = [&]
-		{
-			// Reset value information
-			vflags.fill({});
-			sync = false;
-			hbr_loc = 0;
-			hbr_tg = -1;
-			wi++;
-
-			if (wi < workload.size())
-			{
-				wa = workload[wi];
-			}
-		};
-
-		const u32 pos = wa;
-
-		const auto add_block = [&](u32 target)
-		{
-			// Validate new target (TODO)
-			if (target >= lsa && target < limit)
-			{
-				// Check for redundancy
-				if (!m_block_info[target / 4])
-				{
-					m_block_info[target / 4] = true;
-					workload.push_back(target);
-				}
-
-				// Add predecessor
-				if (std::find(m_preds[target].begin(), m_preds[target].end(), pos) == m_preds[target].end())
-				{
-					m_preds[target].push_back(pos);
-				}
-			}
-		};
-
-		if (pos < lsa || pos >= limit)
-		{
-			// Don't analyse if already beyond the limit
-			next_block();
-			continue;
-		}
-
-		const u32 data = ls[pos / 4];
-		const auto op = spu_opcode_t{data};
-
-		wa += 4;
-
-		m_targets.erase(pos);
-
-		// Fill register access info
-		if (auto iflags = g_spu_iflag.decode(data))
-		{
-			if (+iflags & +spu_iflag::use_ra)
-				m_use_ra.set(pos / 4);
-			if (+iflags & +spu_iflag::use_rb)
-				m_use_rb.set(pos / 4);
-			if (+iflags & +spu_iflag::use_rc)
-				m_use_rc.set(pos / 4);
-		}
-
-		// Analyse instruction
-		switch (const auto type = g_spu_itype.decode(data))
-		{
-		case spu_itype::UNK:
-		case spu_itype::DFCEQ:
-		case spu_itype::DFCMEQ:
-		case spu_itype::DFCGT:
-		case spu_itype::DFCMGT:
-		case spu_itype::DFTSV:
-		{
-			next_block();
-			continue;
-		}
-
-		case spu_itype::SYNC:
-		case spu_itype::STOP:
-		case spu_itype::STOPD:
-		{
-			if (data == 0)
-			{
-				// Stop before null data
-				next_block();
-				continue;
-			}
-
-			if (g_cfg.core.spu_block_size == spu_block_size_type::safe)
-			{
-				// Stop on special instructions (TODO)
-				m_targets[pos];
-				next_block();
-				break;
-			}
-
-			if (type == spu_itype::SYNC)
-			{
-				// Remember
-				sync = true;
-			}
-
-			break;
-		}
-
-		case spu_itype::IRET:
-		{
-			if (op.d && op.e)
-			{
-				spu_log.error("[0x%x] Invalid interrupt flags (DE)", pos);
-			}
-
-			m_targets[pos];
-			next_block();
-			break;
-		}
-
-		case spu_itype::BI:
-		case spu_itype::BISL:
-		case spu_itype::BISLED:
-		case spu_itype::BIZ:
-		case spu_itype::BINZ:
-		case spu_itype::BIHZ:
-		case spu_itype::BIHNZ:
-		{
-			if (op.d && op.e)
-			{
-				spu_log.error("[0x%x] Invalid interrupt flags (DE)", pos);
-			}
-
-			const auto af = vflags[op.ra];
-			const auto av = values[op.ra];
-			const bool sl = type == spu_itype::BISL || type == spu_itype::BISLED;
-
-			if (sl)
-			{
-				m_regmod[pos / 4] = op.rt;
-				vflags[op.rt] = +vf::is_const;
-				values[op.rt] = pos + 4;
-			}
-
-			if (af & vf::is_const)
-			{
-				const u32 target = spu_branch_target(av);
-
-				spu_log.warning("[0x%x] At 0x%x: indirect branch to 0x%x%s", entry_point, pos, target, op.d ? " (D)" : op.e ? " (E)" : "");
-
-				if (type == spu_itype::BI && target == pos + 4 && op.d)
-				{
-					// Disable interrupts idiom
-					break;
-				}
-
-				m_targets[pos].push_back(target);
-
-				if (g_cfg.core.spu_block_size == spu_block_size_type::giga)
-				{
-					if (sync)
-					{
-						spu_log.notice("[0x%x] At 0x%x: ignoring %scall to 0x%x (SYNC)", entry_point, pos, sl ? "" : "tail ", target);
-
-						if (target > entry_point)
-						{
-							limit = std::min<u32>(limit, target);
-						}
-					}
-					else
-					{
-						m_entry_info[target / 4] = true;
-						add_block(target);
-					}
-				}
-				else if (target > entry_point)
-				{
-					limit = std::min<u32>(limit, target);
-				}
-
-				if (sl && g_cfg.core.spu_block_size != spu_block_size_type::safe)
-				{
-					m_ret_info[pos / 4 + 1] = true;
-					m_entry_info[pos / 4 + 1] = true;
-					m_targets[pos].push_back(pos + 4);
-					add_block(pos + 4);
-				}
-			}
-			else if (type == spu_itype::BI && g_cfg.core.spu_block_size != spu_block_size_type::safe && !op.d && !op.e && !sync)
-			{
-				// Analyse jump table (TODO)
-				std::vector<u32> jt_abs;
-				std::vector<u32> jt_rel;
-				const u32 start = pos + 4;
-				u64 dabs = 0;
-				u64 drel = 0;
-
-				for (u32 i = start; i < limit; i += 4)
-				{
-					const u32 target = ls[i / 4];
-
-					if (target == 0 || target % 4)
-					{
-						// Address cannot be misaligned: abort
-						break;
-					}
-
-					if (target >= lsa && target < SPU_LS_SIZE)
-					{
-						// Possible jump table entry (absolute)
-						jt_abs.push_back(target);
-					}
-
-					if (target + start >= lsa && target + start < SPU_LS_SIZE)
-					{
-						// Possible jump table entry (relative)
-						jt_rel.push_back(target + start);
-					}
-
-					if (std::max(jt_abs.size(), jt_rel.size()) * 4 + start <= i)
-					{
-						// Neither type of jump table completes
-						jt_abs.clear();
-						jt_rel.clear();
-						break;
-					}
-				}
-
-				// Choose position after the jt as an anchor and compute the average distance
-				for (u32 target : jt_abs)
-				{
-					dabs += std::abs(static_cast<s32>(target - start - jt_abs.size() * 4));
-				}
-
-				for (u32 target : jt_rel)
-				{
-					drel += std::abs(static_cast<s32>(target - start - jt_rel.size() * 4));
-				}
-
-				// Add detected jump table blocks
-				if (jt_abs.size() >= 3 || jt_rel.size() >= 3)
-				{
-					if (jt_abs.size() == jt_rel.size())
-					{
-						if (dabs < drel)
-						{
-							jt_rel.clear();
-						}
-
-						if (dabs > drel)
-						{
-							jt_abs.clear();
-						}
-
-						ensure(jt_abs.size() != jt_rel.size());
-					}
-
-					if (jt_abs.size() >= jt_rel.size())
-					{
-						const u32 new_size = (start - lsa) / 4 + ::size32(jt_abs);
-
-						if (result.data.size() < new_size)
-						{
-							result.data.resize(new_size);
-						}
-
-						for (u32 i = 0; i < jt_abs.size(); i++)
-						{
-							add_block(jt_abs[i]);
-							result.data[(start - lsa) / 4 + i] = std::bit_cast<u32, be_t<u32>>(jt_abs[i]);
-							m_targets[start + i * 4];
-						}
-
-						m_targets.emplace(pos, std::move(jt_abs));
-					}
-
-					if (jt_rel.size() >= jt_abs.size())
-					{
-						const u32 new_size = (start - lsa) / 4 + ::size32(jt_rel);
-
-						if (result.data.size() < new_size)
-						{
-							result.data.resize(new_size);
-						}
-
-						for (u32 i = 0; i < jt_rel.size(); i++)
-						{
-							add_block(jt_rel[i]);
-							result.data[(start - lsa) / 4 + i] = std::bit_cast<u32, be_t<u32>>(jt_rel[i] - start);
-							m_targets[start + i * 4];
-						}
-
-						m_targets.emplace(pos, std::move(jt_rel));
-					}
-				}
-				else if (start + 12 * 4 < limit &&
-					ls[start / 4 + 0] == 0x1ce00408u &&
-					ls[start / 4 + 1] == 0x24000389u &&
-					ls[start / 4 + 2] == 0x24004809u &&
-					ls[start / 4 + 3] == 0x24008809u &&
-					ls[start / 4 + 4] == 0x2400c809u &&
-					ls[start / 4 + 5] == 0x24010809u &&
-					ls[start / 4 + 6] == 0x24014809u &&
-					ls[start / 4 + 7] == 0x24018809u &&
-					ls[start / 4 + 8] == 0x1c200807u &&
-					ls[start / 4 + 9] == 0x2401c809u)
-				{
-					spu_log.warning("[0x%x] Pattern 1 detected (hbr=0x%x:0x%x)", pos, hbr_loc, hbr_tg);
-
-					// Add 8 targets (TODO)
-					for (u32 addr = start + 4; addr < start + 36; addr += 4)
-					{
-						m_targets[pos].push_back(addr);
-						add_block(addr);
-					}
-				}
-				else if (hbr_loc > start && hbr_loc < limit && hbr_tg == start)
-				{
-					spu_log.warning("[0x%x] No patterns detected (hbr=0x%x:0x%x)", pos, hbr_loc, hbr_tg);
-				}
-			}
-			else if (type == spu_itype::BI && sync)
-			{
-				spu_log.notice("[0x%x] At 0x%x: ignoring indirect branch (SYNC)", entry_point, pos);
-			}
-
-			if (type == spu_itype::BI || sl)
-			{
-				if (type == spu_itype::BI || g_cfg.core.spu_block_size == spu_block_size_type::safe)
-				{
-					m_targets[pos];
-				}
-				else
-				{
-					m_ret_info[pos / 4 + 1] = true;
-					m_entry_info[pos / 4 + 1] = true;
-					m_targets[pos].push_back(pos + 4);
-					add_block(pos + 4);
-				}
-			}
-			else
-			{
-				m_targets[pos].push_back(pos + 4);
-				add_block(pos + 4);
-			}
-
-			next_block();
-			break;
-		}
-
-		case spu_itype::BRSL:
-		case spu_itype::BRASL:
-		{
-			const u32 target = spu_branch_target(type == spu_itype::BRASL ? 0 : pos, op.i16);
-
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = +vf::is_const;
-			values[op.rt] = pos + 4;
-
-			if (type == spu_itype::BRSL && target == pos + 4)
-			{
-				// Get next instruction address idiom
-				break;
-			}
-
-			m_targets[pos].push_back(target);
-
-			if (g_cfg.core.spu_block_size != spu_block_size_type::safe)
-			{
-				m_ret_info[pos / 4 + 1] = true;
-				m_entry_info[pos / 4 + 1] = true;
-				m_targets[pos].push_back(pos + 4);
-				add_block(pos + 4);
-			}
-
-			if (g_cfg.core.spu_block_size == spu_block_size_type::giga && !sync)
-			{
-				m_entry_info[target / 4] = true;
-				add_block(target);
-			}
-			else
-			{
-				if (g_cfg.core.spu_block_size == spu_block_size_type::giga)
-				{
-					spu_log.notice("[0x%x] At 0x%x: ignoring fixed call to 0x%x (SYNC)", entry_point, pos, target);
-				}
-
-				if (target > entry_point)
-				{
-					limit = std::min<u32>(limit, target);
-				}
-			}
-
-			next_block();
-			break;
-		}
-
-		case spu_itype::BRA:
-		{
-			const u32 target = spu_branch_target(0, op.i16);
-
-			if (g_cfg.core.spu_block_size == spu_block_size_type::giga && !sync)
-			{
-				m_entry_info[target / 4] = true;
-			}
-			else
-			{
-				m_targets[pos].push_back(target);
-
-				if (g_cfg.core.spu_block_size == spu_block_size_type::giga)
-				{
-					spu_log.notice("[0x%x] At 0x%x: ignoring fixed tail call to 0x%x (SYNC)", entry_point, pos, target);
-				}
-			}
-
-			add_block(target);
-			next_block();
-			break;
-		}
-
-		case spu_itype::BR:
-		case spu_itype::BRZ:
-		case spu_itype::BRNZ:
-		case spu_itype::BRHZ:
-		case spu_itype::BRHNZ:
-		{
-			const u32 target = spu_branch_target(pos, op.i16);
-
-			if (target == pos + 4)
-			{
-				// Nop
-				break;
-			}
-
-			m_targets[pos].push_back(target);
-			add_block(target);
-
-			if (type != spu_itype::BR)
-			{
-				m_targets[pos].push_back(pos + 4);
-				add_block(pos + 4);
-			}
-
-			next_block();
-			break;
-		}
-
-		case spu_itype::DSYNC:
-		case spu_itype::HEQ:
-		case spu_itype::HEQI:
-		case spu_itype::HGT:
-		case spu_itype::HGTI:
-		case spu_itype::HLGT:
-		case spu_itype::HLGTI:
-		case spu_itype::LNOP:
-		case spu_itype::NOP:
-		case spu_itype::MTSPR:
-		case spu_itype::FSCRWR:
-		case spu_itype::STQA:
-		case spu_itype::STQD:
-		case spu_itype::STQR:
-		case spu_itype::STQX:
-		{
-			// Do nothing
-			break;
-		}
-
-		case spu_itype::WRCH:
-		{
-			switch (op.ra)
-			{
-			case MFC_EAL:
-			{
-				m_regmod[pos / 4] = s_reg_mfc_eal;
-				break;
-			}
-			case MFC_LSA:
-			{
-				m_regmod[pos / 4] = s_reg_mfc_lsa;
-				break;
-			}
-			case MFC_TagID:
-			{
-				m_regmod[pos / 4] = s_reg_mfc_tag;
-				break;
-			}
-			case MFC_Size:
-			{
-				m_regmod[pos / 4] = s_reg_mfc_size;
-				break;
-			}
-			default: break;
-			}
-
-			break;
-		}
-
-		case spu_itype::LQA:
-		case spu_itype::LQD:
-		case spu_itype::LQR:
-		case spu_itype::LQX:
-		{
-			// Unconst
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = {};
-			break;
-		}
-
-		case spu_itype::HBR:
-		{
-			hbr_loc = spu_branch_target(pos, op.roh << 7 | op.rt);
-			hbr_tg  = vflags[op.ra] & vf::is_const && !op.c ? values[op.ra] & 0x3fffc : -1;
-			break;
-		}
-
-		case spu_itype::HBRA:
-		{
-			hbr_loc = spu_branch_target(pos, op.r0h << 7 | op.rt);
-			hbr_tg  = spu_branch_target(0x0, op.i16);
-			break;
-		}
-
-		case spu_itype::HBRR:
-		{
-			hbr_loc = spu_branch_target(pos, op.r0h << 7 | op.rt);
-			hbr_tg  = spu_branch_target(pos, op.i16);
-			break;
-		}
-
-		case spu_itype::IL:
-		{
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = +vf::is_const;
-			values[op.rt] = op.si16;
-			break;
-		}
-		case spu_itype::ILA:
-		{
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = +vf::is_const;
-			values[op.rt] = op.i18;
-			break;
-		}
-		case spu_itype::ILH:
-		{
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = +vf::is_const;
-			values[op.rt] = op.i16 << 16 | op.i16;
-			break;
-		}
-		case spu_itype::ILHU:
-		{
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = +vf::is_const;
-			values[op.rt] = op.i16 << 16;
-			break;
-		}
-		case spu_itype::IOHL:
-		{
-			m_regmod[pos / 4] = op.rt;
-			values[op.rt] = values[op.rt] | op.i16;
-			break;
-		}
-		case spu_itype::ORI:
-		{
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = vflags[op.ra] & vf::is_const;
-			values[op.rt] = values[op.ra] | op.si10;
-			break;
-		}
-		case spu_itype::OR:
-		{
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = vflags[op.ra] & vflags[op.rb] & vf::is_const;
-			values[op.rt] = values[op.ra] | values[op.rb];
-			break;
-		}
-		case spu_itype::ANDI:
-		{
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = vflags[op.ra] & vf::is_const;
-			values[op.rt] = values[op.ra] & op.si10;
-			break;
-		}
-		case spu_itype::AND:
-		{
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = vflags[op.ra] & vflags[op.rb] & vf::is_const;
-			values[op.rt] = values[op.ra] & values[op.rb];
-			break;
-		}
-		case spu_itype::AI:
-		{
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = vflags[op.ra] & vf::is_const;
-			values[op.rt] = values[op.ra] + op.si10;
-			break;
-		}
-		case spu_itype::A:
-		{
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = vflags[op.ra] & vflags[op.rb] & vf::is_const;
-			values[op.rt] = values[op.ra] + values[op.rb];
-			break;
-		}
-		case spu_itype::SFI:
-		{
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = vflags[op.ra] & vf::is_const;
-			values[op.rt] = op.si10 - values[op.ra];
-			break;
-		}
-		case spu_itype::SF:
-		{
-			m_regmod[pos / 4] = op.rt;
-			vflags[op.rt] = vflags[op.ra] & vflags[op.rb] & vf::is_const;
-			values[op.rt] = values[op.rb] - values[op.ra];
-			break;
-		}
-		case spu_itype::ROTMI:
-		{
-			m_regmod[pos / 4] = op.rt;
-
-			if ((0 - op.i7) & 0x20)
-			{
-				vflags[op.rt] = +vf::is_const;
-				values[op.rt] = 0;
-				break;
-			}
-
-			vflags[op.rt] = vflags[op.ra] & vf::is_const;
-			values[op.rt] = values[op.ra] >> ((0 - op.i7) & 0x1f);
-			break;
-		}
-		case spu_itype::SHLI:
-		{
-			m_regmod[pos / 4] = op.rt;
-
-			if (op.i7 & 0x20)
-			{
-				vflags[op.rt] = +vf::is_const;
-				values[op.rt] = 0;
-				break;
-			}
-
-			vflags[op.rt] = vflags[op.ra] & vf::is_const;
-			values[op.rt] = values[op.ra] << (op.i7 & 0x1f);
-			break;
-		}
-
-		default:
-		{
-			// Unconst
-			const u32 op_rt = type & spu_itype::_quadrop ? +op.rt4 : +op.rt;
-			m_regmod[pos / 4] = op_rt;
-			vflags[op_rt] = {};
-			break;
-		}
-		}
-
-		// Insert raw instruction value
-		const u32 new_size = (pos - lsa) / 4;
-
-		if (result.data.size() <= new_size)
-		{
-			if (result.data.size() < new_size)
-			{
-				result.data.resize(new_size);
-			}
-
-			result.data.emplace_back(std::bit_cast<u32, be_t<u32>>(data));
-		}
-		else if (u32& raw_val = result.data[new_size])
-		{
-			ensure(raw_val == std::bit_cast<u32, be_t<u32>>(data));
-		}
-		else
-		{
-			raw_val = std::bit_cast<u32, be_t<u32>>(data);
-		}
-	}
-
-	while (lsa > 0 || limit < SPU_LS_SIZE)
-	{
-		const u32 initial_size = ::size32(result.data);
-
-		// Check unreachable blocks
-		limit = std::min<u32>(limit, lsa + initial_size * 4);
-
-		for (auto& pair : m_preds)
-		{
-			bool reachable = false;
-
-			if (pair.first >= limit)
-			{
-				continue;
-			}
-
-			// All (direct and indirect) predecessors to check
-			std::vector<u32> workload;
-
-			// Bit array used to deduplicate workload list
-			workload.push_back(pair.first);
-			m_bits[pair.first / 4] = true;
-
-			for (usz i = 0; !reachable && i < workload.size(); i++)
-			{
-				for (u32 j = workload[i];; j -= 4)
-				{
-					// Go backward from an address until the entry point is reached
-					if (j == entry_point)
-					{
-						reachable = true;
-						break;
-					}
-
-					const auto found = m_preds.find(j);
-
-					bool had_fallthrough = false;
-
-					if (found != m_preds.end())
-					{
-						for (u32 new_pred : found->second)
-						{
-							// Check whether the predecessor is previous instruction
-							if (new_pred == j - 4)
-							{
-								had_fallthrough = true;
-								continue;
-							}
-
-							// Check whether in range and not already added
-							if (new_pred >= lsa && new_pred < limit && !m_bits[new_pred / 4])
-							{
-								workload.push_back(new_pred);
-								m_bits[new_pred / 4] = true;
-							}
-						}
-					}
-
-					// Check for possible fallthrough predecessor
-					if (!had_fallthrough)
-					{
-						if (::at32(result.data, (j - lsa) / 4 - 1) == 0 || m_targets.count(j - 4))
-						{
-							break;
-						}
-					}
-
-					if (i == 0)
-					{
-						// TODO
-					}
-				}
-			}
-
-			for (u32 pred : workload)
-			{
-				m_bits[pred / 4] = false;
-			}
-
-			if (!reachable && pair.first < limit)
-			{
-				limit = pair.first;
-			}
-		}
-
-		result.data.resize((limit - lsa) / 4);
-
-		// Check holes in safe mode (TODO)
-		u32 valid_size = 0;
-
-		for (u32 i = 0; i < result.data.size(); i++)
-		{
-			if (result.data[i] == 0)
-			{
-				const u32 pos  = lsa + i * 4;
-				const u32 data = ls[pos / 4];
-
-				// Allow only NOP or LNOP instructions in holes
-				if (data == 0x200000 || (data & 0xffffff80) == 0x40200000)
-				{
-					continue;
-				}
-
-				if (g_cfg.core.spu_block_size != spu_block_size_type::giga)
-				{
-					result.data.resize(valid_size);
-					break;
-				}
-			}
-			else
-			{
-				valid_size = i + 1;
-			}
-		}
-
-		// Even if NOP or LNOP, should be removed at the end
-		result.data.resize(valid_size);
-
-		// Repeat if blocks were removed
-		if (result.data.size() == initial_size)
-		{
-			break;
-		}
-	}
-
-	limit = std::min<u32>(limit, lsa + ::size32(result.data) * 4);
-	m_inst_attrs.resize(result.data.size());
-
-	// Cleanup block info
-	for (u32 i = 0; i < workload.size(); i++)
-	{
-		const u32 addr = workload[i];
-
-		if (addr < lsa || addr >= limit || !result.data[(addr - lsa) / 4])
-		{
-			m_block_info[addr / 4] = false;
-			m_entry_info[addr / 4] = false;
-			m_ret_info[addr / 4] = false;
-			m_preds.erase(addr);
-		}
-	}
-
-	// Complete m_preds and associated m_targets for adjacent blocks
-	for (auto it = m_preds.begin(); it != m_preds.end();)
-	{
-		if (it->first < lsa || it->first >= limit)
-		{
-			it = m_preds.erase(it);
-			continue;
-		}
-
-		// Erase impossible predecessors
-		const auto new_end = std::remove_if(it->second.begin(), it->second.end(), [&](u32 addr)
-		{
-			return addr < lsa || addr >= limit;
-		});
-
-		it->second.erase(new_end, it->second.end());
-
-		// Don't add fallthrough target if all predecessors are removed
-		if (it->second.empty() && !m_entry_info[it->first / 4])
-		{
-			// If not an entry point, remove the block completely
-			m_block_info[it->first / 4] = false;
-			it = m_preds.erase(it);
-			continue;
-		}
-
-		// Previous instruction address
-		const u32 prev = (it->first - 4) & 0x3fffc;
-
-		// TODO: check the correctness
-		if (m_targets.count(prev) == 0 && prev >= lsa && prev < limit && result.data[(prev - lsa) / 4])
-		{
-			// Add target and the predecessor
-			m_targets[prev].push_back(it->first);
-			it->second.push_back(prev);
-		}
-
-		it++;
-	}
-
-	if (out_target_list)
-	{
-		out_target_list->insert(m_targets.begin(), m_targets.end());
-	}
-
-	// Remove unnecessary target lists
-	for (auto it = m_targets.begin(); it != m_targets.end();)
-	{
-		if (it->first < lsa || it->first >= limit)
-		{
-			it = m_targets.erase(it);
-			continue;
-		}
-
-		it++;
-	}
-
-	// Fill holes which contain only NOP and LNOP instructions (TODO: compile)
-	for (u32 i = 0, nnop = 0, vsize = 0; i <= result.data.size(); i++)
-	{
-		if (i >= result.data.size() || result.data[i])
-		{
-			if (nnop && nnop == i - vsize)
-			{
-				// Write only complete NOP sequence
-				for (u32 j = vsize; j < i; j++)
-				{
-					result.data[j] = std::bit_cast<u32, be_t<u32>>(ls[lsa / 4 + j]);
-				}
-			}
-
-			nnop  = 0;
-			vsize = i + 1;
-		}
-		else
-		{
-			const u32 pos  = lsa + i * 4;
-			const u32 data = ls[pos / 4];
-
-			if (data == 0x200000 || (data & 0xffffff80) == 0x40200000)
-			{
-				nnop++;
-			}
-		}
-	}
-
-	// Fill block info
-	for (auto& pred : m_preds)
-	{
-		auto& block = m_bbs[pred.first];
-
-		// Copy predeccessors (wrong at this point, needs a fixup later)
-		block.preds = pred.second;
-
-		// Fill register usage info
-		for (u32 ia = pred.first; ia < limit; ia += 4)
-		{
-			block.size++;
-
-			// Decode instruction
-			const spu_opcode_t op{std::bit_cast<be_t<u32>>(result.data[(ia - lsa) / 4])};
-
-			const auto type = g_spu_itype.decode(op.opcode);
-
-			u8 reg_save = 255;
-
-			if (type == spu_itype::STQD && op.ra == s_reg_sp && !block.reg_mod[op.rt] && !block.reg_use[op.rt])
-			{
-				// Register saved onto the stack before use
-				block.reg_save_dom[op.rt] = true;
-
-				reg_save = op.rt;
-			}
-
-			for (auto _use : std::initializer_list<std::pair<u32, bool>>{{op.ra, m_use_ra.test(ia / 4)}
-				, {op.rb, m_use_rb.test(ia / 4)}, {op.rc, m_use_rc.test(ia / 4)}})
-			{
-				if (_use.second)
-				{
-					const u32 reg = _use.first;
-
-					// Register reg use only if it happens before reg mod
-					if (!block.reg_mod[reg])
-					{
-						block.reg_use.set(reg);
-
-						if (reg_save != reg && block.reg_save_dom[reg])
-						{
-							// Register is still used after saving; probably not eligible for optimization
-							block.reg_save_dom[reg] = false;
-						}
-					}
-				}
-			}
-
-			if (type == spu_itype::WRCH && op.ra == MFC_Cmd)
-			{
-				// Expand MFC_Cmd reg use
-				for (u8 reg : {s_reg_mfc_lsa, s_reg_mfc_tag, s_reg_mfc_size})
-				{
-					if (!block.reg_mod[reg])
-						block.reg_use.set(reg);
-				}
-			}
-
-			// Register reg modification
-			if (u8 reg = m_regmod[ia / 4]; reg < s_reg_max)
-			{
-				block.reg_mod.set(reg);
-				block.reg_mod_xf.set(reg, type & spu_itype::xfloat);
-
-				if (type == spu_itype::SELB && (block.reg_mod_xf[op.ra] || block.reg_mod_xf[op.rb]))
-					block.reg_mod_xf.set(reg);
-
-				// Possible post-dominating register load
-				if (type == spu_itype::LQD && op.ra == s_reg_sp)
-					block.reg_load_mod[reg] = ia + 1;
-				else
-					block.reg_load_mod[reg] = 0;
-			}
-
-			// Find targets (also means end of the block)
-			const auto tfound = m_targets.find(ia);
-
-			if (tfound != m_targets.end())
-			{
-				// Copy targets
-				block.targets = tfound->second;
-
-				// Assume that the call reads and modifies all volatile registers (TODO)
-				bool is_call = false;
-				bool is_tail = false;
-				switch (type)
-				{
-				case spu_itype::BRSL:
-					is_call = spu_branch_target(ia, op.i16) != ia + 4;
-					break;
-				case spu_itype::BRASL:
-					is_call = spu_branch_target(0, op.i16) != ia + 4;
-					break;
-				case spu_itype::BISL:
-				case spu_itype::BISLED:
-					is_call = true;
-					break;
-				default:
-					break;
-				}
-
-				if (is_call)
-				{
-					for (u32 i = 0; i < s_reg_max; ++i)
-					{
-						if (i == s_reg_lr || (i >= 2 && i < s_reg_80) || i > s_reg_127)
-						{
-							if (!block.reg_mod[i])
-								block.reg_use.set(i);
-
-							if (!is_tail)
-							{
-								block.reg_mod.set(i);
-								block.reg_mod_xf[i] = false;
-							}
-						}
-					}
-				}
-
-				break;
-			}
-		}
-	}
-
-	// Fixup block predeccessors to point to basic blocks, not last instructions
-	for (auto& bb : m_bbs)
-	{
-		const u32 addr = bb.first;
-
-		for (u32& pred : bb.second.preds)
-		{
-			pred = std::prev(m_bbs.upper_bound(pred))->first;
-		}
-
-		if (m_entry_info[addr / 4] && g_cfg.core.spu_block_size == spu_block_size_type::giga)
-		{
-			// Register empty chunk
-			m_chunks.push_back(addr);
-
-			// Register function if necessary
-			if (!m_ret_info[addr / 4])
-			{
-				m_funcs[addr];
-			}
-		}
-	}
-
-	// Ensure there is a function at the lowest address
-	if (g_cfg.core.spu_block_size == spu_block_size_type::giga)
-	{
-		if (auto emp = m_funcs.try_emplace(m_bbs.begin()->first); emp.second)
-		{
-			const u32 addr = emp.first->first;
-			spu_log.error("[0x%05x] Fixed first function at 0x%05x", entry_point, addr);
-			m_entry_info[addr / 4] = true;
-			m_ret_info[addr / 4] = false;
-		}
-	}
-
-	// Split functions
-	while (g_cfg.core.spu_block_size == spu_block_size_type::giga)
-	{
-		bool need_repeat = false;
-
-		u32 start = 0;
-		u32 limit = SPU_LS_SIZE;
-
-		// Walk block list in ascending order
-		for (auto& block : m_bbs)
-		{
-			const u32 addr = block.first;
-
-			if (m_entry_info[addr / 4] && !m_ret_info[addr / 4])
-			{
-				const auto upper = m_funcs.upper_bound(addr);
-				start = addr;
-				limit = upper == m_funcs.end() ? SPU_LS_SIZE : upper->first;
-			}
-
-			// Find targets that exceed [start; limit) range and make new functions from them
-			for (u32 target : block.second.targets)
-			{
-				const auto tfound = m_bbs.find(target);
-
-				if (tfound == m_bbs.end())
-				{
-					continue;
-				}
-
-				if (target < start || target >= limit)
-				{
-					if (!m_entry_info[target / 4] || m_ret_info[target / 4])
-					{
-						// Create new function entry (likely a tail call)
-						m_entry_info[target / 4] = true;
-
-						m_ret_info[target / 4] = false;
-
-						m_funcs.try_emplace(target);
-
-						if (target < limit)
-						{
-							need_repeat = true;
-						}
-					}
-				}
-			}
-
-			block.second.func = start;
-		}
-
-		if (!need_repeat)
-		{
-			break;
-		}
-	}
-
-	if (!m_bbs.count(entry_point))
-	{
-		// Invalid code
-		spu_log.error("[0x%x] Invalid code", entry_point);
-		return {};
-	}
-
-	// Fill entry map
-	while (true)
-	{
-		workload.clear();
-		workload.push_back(entry_point);
-		ensure(m_bbs.count(entry_point));
-
-		std::vector<u32> new_entries;
-
-		for (u32 wi = 0; wi < workload.size(); wi++)
-		{
-			const u32 addr = workload[wi];
-			auto& block = ::at32(m_bbs, addr);
-			const u32 _new = block.chunk;
-
-			if (!m_entry_info[addr / 4])
-			{
-				// Check block predecessors
-				for (u32 pred : block.preds)
-				{
-					const u32 _old = ::at32(m_bbs, pred).chunk;
-
-					if (_old < SPU_LS_SIZE && _old != _new)
-					{
-						// If block has multiple 'entry' points, it becomes an entry point itself
-						new_entries.push_back(addr);
-					}
-				}
-			}
-
-			// Update chunk address
-			block.chunk = m_entry_info[addr / 4] ? addr : _new;
-
-			// Process block targets
-			for (u32 target : block.targets)
-			{
-				const auto tfound = m_bbs.find(target);
-
-				if (tfound == m_bbs.end())
-				{
-					continue;
-				}
-
-				auto& tb = tfound->second;
-
-				const u32 value = m_entry_info[target / 4] ? target : block.chunk;
-
-				if (u32& tval = tb.chunk; tval < SPU_LS_SIZE)
-				{
-					// TODO: fix condition
-					if (tval != value && !m_entry_info[target / 4])
-					{
-						new_entries.push_back(target);
-					}
-				}
-				else
-				{
-					tval = value;
-					workload.emplace_back(target);
-				}
-			}
-		}
-
-		if (new_entries.empty())
-		{
-			break;
-		}
-
-		for (u32 entry : new_entries)
-		{
-			m_entry_info[entry / 4] = true;
-
-			// Acknowledge artificial (reversible) chunk entry point
-			m_ret_info[entry / 4] = true;
-		}
-
-		for (auto& bb : m_bbs)
-		{
-			// Reset chunk info
-			bb.second.chunk = SPU_LS_SIZE;
-		}
-	}
-
-	workload.clear();
-	workload.push_back(entry_point);
-
-	// Fill workload adding targets
-	for (u32 wi = 0; wi < workload.size(); wi++)
-	{
-		const u32 addr = workload[wi];
-		auto& block = ::at32(m_bbs, addr);
-		block.analysed = true;
-
-		for (u32 target : block.targets)
-		{
-			const auto tfound = m_bbs.find(target);
-
-			if (tfound == m_bbs.end())
-			{
-				continue;
-			}
-
-			auto& tb = tfound->second;
-
-			if (!tb.analysed)
-			{
-				workload.push_back(target);
-				tb.analysed = true;
-			}
-
-			// Limited xfloat hint propagation (possibly TODO)
-			if (tb.chunk == block.chunk)
-			{
-				tb.reg_maybe_xf &= block.reg_mod_xf;
-			}
-			else
-			{
-				tb.reg_maybe_xf.reset();
-			}
-		}
-
-		block.reg_origin.fill(0x80000000);
-		block.reg_origin_abs.fill(0x80000000);
-	}
-
-	// Fill register origin info
-	while (true)
-	{
-		bool must_repeat = false;
-
-		for (u32 wi = 0; wi < workload.size(); wi++)
-		{
-			const u32 addr = workload[wi];
-			auto& block = ::at32(m_bbs, addr);
-
-			// Initialize entry point with default value: unknown origin (requires load)
-			if (m_entry_info[addr / 4])
-			{
-				for (u32 i = 0; i < s_reg_max; i++)
-				{
-					if (block.reg_origin[i] == 0x80000000)
-						block.reg_origin[i] = SPU_LS_SIZE;
-				}
-			}
-
-			if (g_cfg.core.spu_block_size == spu_block_size_type::giga && m_entry_info[addr / 4] && !m_ret_info[addr / 4])
-			{
-				for (u32 i = 0; i < s_reg_max; i++)
-				{
-					if (block.reg_origin_abs[i] == 0x80000000)
-						block.reg_origin_abs[i] = SPU_LS_SIZE;
-					else if (block.reg_origin_abs[i] + 1 == 0)
-						block.reg_origin_abs[i] = -2;
-				}
-			}
-
-			for (u32 target : block.targets)
-			{
-				const auto tfound = m_bbs.find(target);
-
-				if (tfound == m_bbs.end())
-				{
-					continue;
-				}
-
-				auto& tb = tfound->second;
-
-				for (u32 i = 0; i < s_reg_max; i++)
-				{
-					if (tb.chunk == block.chunk && tb.reg_origin[i] + 1)
-					{
-						const u32 expected = block.reg_mod[i] ? addr : block.reg_origin[i];
-
-						if (tb.reg_origin[i] == 0x80000000)
-						{
-							tb.reg_origin[i] = expected;
-						}
-						else if (tb.reg_origin[i] != expected)
-						{
-							// Set umax if multiple origins merged (requires PHI node)
-							tb.reg_origin[i] = umax;
-
-							must_repeat |= !tb.targets.empty();
-						}
-					}
-
-					if (g_cfg.core.spu_block_size == spu_block_size_type::giga && tb.func == block.func && tb.reg_origin_abs[i] + 2)
-					{
-						const u32 expected = block.reg_mod[i] ? addr : block.reg_origin_abs[i];
-
-						if (tb.reg_origin_abs[i] == 0x80000000)
-						{
-							tb.reg_origin_abs[i] = expected;
-						}
-						else if (tb.reg_origin_abs[i] != expected)
-						{
-							if (tb.reg_origin_abs[i] == SPU_LS_SIZE || expected + 2 == 0 || expected == SPU_LS_SIZE)
-							{
-								// Set -2: sticky value indicating possible external reg origin (SPU_LS_SIZE)
-								tb.reg_origin_abs[i] = -2;
-
-								must_repeat |= !tb.targets.empty();
-							}
-							else if (tb.reg_origin_abs[i] + 1)
-							{
-								tb.reg_origin_abs[i] = -1;
-
-								must_repeat |= !tb.targets.empty();
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if (!must_repeat)
-		{
-			break;
-		}
-
-		for (u32 wi = 0; wi < workload.size(); wi++)
-		{
-			const u32 addr = workload[wi];
-			auto& block = ::at32(m_bbs, addr);
-
-			// Reset values for the next attempt (keep negative values)
-			for (u32 i = 0; i < s_reg_max; i++)
-			{
-				if (block.reg_origin[i] <= SPU_LS_SIZE)
-					block.reg_origin[i] = 0x80000000;
-				if (block.reg_origin_abs[i] <= SPU_LS_SIZE)
-					block.reg_origin_abs[i] = 0x80000000;
-			}
-		}
-	}
-
-	// Fill more block info
-	for (u32 wi = 0; wi < workload.size(); wi++)
-	{
-		if (g_cfg.core.spu_block_size != spu_block_size_type::giga)
-		{
-			break;
-		}
-
-		const u32 addr = workload[wi];
-		auto& bb = ::at32(m_bbs, addr);
-		auto& func = ::at32(m_funcs, bb.func);
-
-		// Update function size
-		func.size = std::max<u16>(func.size, bb.size + (addr - bb.func) / 4);
-
-		// Copy constants according to reg origin info
-		for (u32 i = 0; i < s_reg_max; i++)
-		{
-			const u32 orig = bb.reg_origin_abs[i];
-
-			if (orig < 0x40000)
-			{
-				auto& src = ::at32(m_bbs, orig);
-				bb.reg_const[i] = src.reg_const[i];
-				bb.reg_val32[i] = src.reg_val32[i];
-			}
-
-			if (!bb.reg_save_dom[i] && bb.reg_use[i] && (orig == SPU_LS_SIZE || orig + 2 == 0))
-			{
-				// Destroy offset if external reg value is used
-				func.reg_save_off[i] = -1;
-			}
-		}
-
-		if (u32 orig = bb.reg_origin_abs[s_reg_sp]; orig < SPU_LS_SIZE)
-		{
-			auto& prologue = ::at32(m_bbs, orig);
-
-			// Copy stack offset (from the assumed prologue)
-			bb.stack_sub = prologue.stack_sub;
-		}
-		else if (orig > SPU_LS_SIZE)
-		{
-			// Unpredictable stack
-			bb.stack_sub = 0x80000000;
-		}
-
-		spu_opcode_t op{};
-
-		auto last_inst = spu_itype::UNK;
-
-		for (u32 ia = addr; ia < addr + bb.size * 4; ia += 4)
-		{
-			// Decode instruction again
-			op.opcode = std::bit_cast<be_t<u32>>(result.data[(ia - lsa) / 41]);
-			last_inst = g_spu_itype.decode(op.opcode);
-
-			// Propagate some constants
-			switch (last_inst)
-			{
-			case spu_itype::IL:
-			{
-				bb.reg_const[op.rt] = true;
-				bb.reg_val32[op.rt] = op.si16;
-				break;
-			}
-			case spu_itype::ILA:
-			{
-				bb.reg_const[op.rt] = true;
-				bb.reg_val32[op.rt] = op.i18;
-				break;
-			}
-			case spu_itype::ILHU:
-			{
-				bb.reg_const[op.rt] = true;
-				bb.reg_val32[op.rt] = op.i16 << 16;
-				break;
-			}
-			case spu_itype::ILH:
-			{
-				bb.reg_const[op.rt] = true;
-				bb.reg_val32[op.rt] = op.i16 << 16 | op.i16;
-				break;
-			}
-			case spu_itype::IOHL:
-			{
-				bb.reg_val32[op.rt] = bb.reg_val32[op.rt] | op.i16;
-				break;
-			}
-			case spu_itype::ORI:
-			{
-				bb.reg_const[op.rt] = bb.reg_const[op.ra];
-				bb.reg_val32[op.rt] = bb.reg_val32[op.ra] | op.si10;
-				break;
-			}
-			case spu_itype::OR:
-			{
-				bb.reg_const[op.rt] = bb.reg_const[op.ra] && bb.reg_const[op.rb];
-				bb.reg_val32[op.rt] = bb.reg_val32[op.ra] | bb.reg_val32[op.rb];
-				break;
-			}
-			case spu_itype::AI:
-			{
-				bb.reg_const[op.rt] = bb.reg_const[op.ra];
-				bb.reg_val32[op.rt] = bb.reg_val32[op.ra] + op.si10;
-				break;
-			}
-			case spu_itype::A:
-			{
-				bb.reg_const[op.rt] = bb.reg_const[op.ra] && bb.reg_const[op.rb];
-				bb.reg_val32[op.rt] = bb.reg_val32[op.ra] + bb.reg_val32[op.rb];
-				break;
-			}
-			case spu_itype::SFI:
-			{
-				bb.reg_const[op.rt] = bb.reg_const[op.ra];
-				bb.reg_val32[op.rt] = op.si10 - bb.reg_val32[op.ra];
-				break;
-			}
-			case spu_itype::SF:
-			{
-				bb.reg_const[op.rt] = bb.reg_const[op.ra] && bb.reg_const[op.rb];
-				bb.reg_val32[op.rt] = bb.reg_val32[op.rb] - bb.reg_val32[op.ra];
-				break;
-			}
-			case spu_itype::STQD:
-			{
-				if (op.ra == s_reg_sp && bb.stack_sub != 0x80000000 && bb.reg_save_dom[op.rt])
-				{
-					const u32 offset = 0x80000000 + op.si10 * 16 - bb.stack_sub;
-
-					if (func.reg_save_off[op.rt] == 0)
-					{
-						// Store reg save offset
-						func.reg_save_off[op.rt] = offset;
-					}
-					else if (func.reg_save_off[op.rt] != offset)
-					{
-						// Conflict of different offsets
-						func.reg_save_off[op.rt] = -1;
-					}
-				}
-
-				break;
-			}
-			case spu_itype::LQD:
-			{
-				if (op.ra == s_reg_sp && bb.stack_sub != 0x80000000 && bb.reg_load_mod[op.rt] == ia + 1)
-				{
-					// Adjust reg load offset
-					bb.reg_load_mod[op.rt] = 0x80000000 + op.si10 * 16 - bb.stack_sub;
-				}
-
-				// Clear const
-				bb.reg_const[op.rt] = false;
-				break;
-			}
-			default:
-			{
-				// Clear const if reg is modified here
-				if (u8 reg = m_regmod[ia / 4]; reg < s_reg_max)
-					bb.reg_const[reg] = false;
-				break;
-			}
-			}
-
-			// $SP is modified
-			if (m_regmod[ia / 4] == s_reg_sp)
-			{
-				if (bb.reg_const[s_reg_sp])
-				{
-					// Making $SP a constant is a funny thing too.
-					bb.stack_sub = 0x80000000;
-				}
-
-				if (bb.stack_sub != 0x80000000)
-				{
-					switch (last_inst)
-					{
-					case spu_itype::AI:
-					{
-						if (op.ra == s_reg_sp)
-							bb.stack_sub -= op.si10;
-						else
-							bb.stack_sub = 0x80000000;
-						break;
-					}
-					case spu_itype::A:
-					{
-						if (op.ra == s_reg_sp && bb.reg_const[op.rb])
-							bb.stack_sub -= bb.reg_val32[op.rb];
-						else if (op.rb == s_reg_sp && bb.reg_const[op.ra])
-							bb.stack_sub -= bb.reg_val32[op.ra];
-						else
-							bb.stack_sub = 0x80000000;
-						break;
-					}
-					case spu_itype::SF:
-					{
-						if (op.rb == s_reg_sp && bb.reg_const[op.ra])
-							bb.stack_sub += bb.reg_val32[op.ra];
-						else
-							bb.stack_sub = 0x80000000;
-						break;
-					}
-					default:
-					{
-						bb.stack_sub = 0x80000000;
-						break;
-					}
-					}
-				}
-
-				// Check for funny values.
-				if (bb.stack_sub >= SPU_LS_SIZE || bb.stack_sub % 16)
-				{
-					bb.stack_sub = 0x80000000;
-				}
-			}
-		}
-
-		// Analyse terminator instruction
-		const u32 tia = addr + bb.size * 4 - 4;
-
-		switch (last_inst)
-		{
-		case spu_itype::BR:
-		case spu_itype::BRNZ:
-		case spu_itype::BRZ:
-		case spu_itype::BRHNZ:
-		case spu_itype::BRHZ:
-		case spu_itype::BRSL:
-		{
-			const u32 target = spu_branch_target(tia, op.i16);
-
-			if (target == tia + 4)
-			{
-				bb.terminator = term_type::fallthrough;
-			}
-			else if (last_inst != spu_itype::BRSL)
-			{
-				// No-op terminator or simple branch instruction
-				bb.terminator = term_type::br;
-
-				if (target == bb.func)
-				{
-					// Recursive tail call
-					bb.terminator = term_type::ret;
-				}
-			}
-			else if (op.rt == s_reg_lr)
-			{
-				bb.terminator = term_type::call;
-			}
-			else
-			{
-				bb.terminator = term_type::interrupt_call;
-			}
-
-			break;
-		}
-		case spu_itype::BRA:
-		case spu_itype::BRASL:
-		{
-			bb.terminator = term_type::indirect_call;
-			break;
-		}
-		case spu_itype::BI:
-		{
-			if (op.d || op.e || bb.targets.size() == 1)
-			{
-				bb.terminator = term_type::interrupt_call;
-			}
-			else if (bb.targets.size() > 1)
-			{
-				// Jump table
-				bb.terminator = term_type::br;
-			}
-			else if (op.ra == s_reg_lr)
-			{
-				// Return (TODO)
-				bb.terminator = term_type::ret;
-			}
-			else
-			{
-				// Indirect tail call (TODO)
-				bb.terminator = term_type::interrupt_call;
-			}
-
-			break;
-		}
-		case spu_itype::BISLED:
-		case spu_itype::IRET:
-		{
-			bb.terminator = term_type::interrupt_call;
-			break;
-		}
-		case spu_itype::BISL:
-		case spu_itype::BIZ:
-		case spu_itype::BINZ:
-		case spu_itype::BIHZ:
-		case spu_itype::BIHNZ:
-		{
-			if (op.d || op.e || bb.targets.size() != 1)
-			{
-				bb.terminator = term_type::interrupt_call;
-			}
-			else if (last_inst != spu_itype::BISL && !bb.targets.empty() && bb.targets[0] == tia + 4 && op.ra == s_reg_lr)
-			{
-				// Conditional return (TODO)
-				bb.terminator = term_type::ret;
-			}
-			else if (last_inst == spu_itype::BISL)
-			{
-				// Indirect call
-				bb.terminator = term_type::indirect_call;
-			}
-			else
-			{
-				// TODO
-				bb.terminator = term_type::interrupt_call;
-			}
-
-			break;
-		}
-		default:
-		{
-			// Normal instruction
-			bb.terminator = term_type::fallthrough;
-			break;
-		}
-		}
-	}
-
-	// Check function blocks, verify and print some reasons
-	for (auto& f : m_funcs)
-	{
-		if (g_cfg.core.spu_block_size != spu_block_size_type::giga)
-		{
-			break;
-		}
-
-		bool is_ok = true;
-
-		u32 used_stack = 0;
-
-		for (auto it = m_bbs.lower_bound(f.first); it != m_bbs.end() && it->second.func == f.first; ++it)
-		{
-			auto& bb = it->second;
-			auto& func = ::at32(m_funcs, bb.func);
-			const u32 addr = it->first;
-			const u32 flim = bb.func + func.size * 4;
-
-			used_stack |= bb.stack_sub;
-
-			if (is_ok && bb.terminator >= term_type::indirect_call)
-			{
-				is_ok = false;
-			}
-
-			if (is_ok && bb.terminator == term_type::ret)
-			{
-				// Check $LR (alternative return registers are currently not supported)
-				if (u32 lr_orig = bb.reg_mod[s_reg_lr] ? addr : bb.reg_origin_abs[s_reg_lr]; lr_orig < SPU_LS_SIZE)
-				{
-					auto& src = ::at32(m_bbs, lr_orig);
-
-					if (src.reg_load_mod[s_reg_lr] != func.reg_save_off[s_reg_lr])
-					{
-						spu_log.error("Function 0x%05x: [0x%05x] $LR mismatch (src=0x%x; 0x%x vs 0x%x)", f.first, addr, lr_orig, src.reg_load_mod[0], func.reg_save_off[0]);
-						is_ok = false;
-					}
-					else if (src.reg_load_mod[s_reg_lr] == 0)
-					{
-						spu_log.error("Function 0x%05x: [0x%05x] $LR modified (src=0x%x)", f.first, addr, lr_orig);
-						is_ok = false;
-					}
-				}
-				else if (lr_orig > SPU_LS_SIZE)
-				{
-					spu_log.todo("Function 0x%05x: [0x%05x] $LR unpredictable (src=0x%x)", f.first, addr, lr_orig);
-					is_ok = false;
-				}
-
-				// Check $80..$127 (should be restored or unmodified)
-				for (u32 i = s_reg_80; is_ok && i <= s_reg_127; i++)
-				{
-					if (u32 orig = bb.reg_mod[i] ? addr : bb.reg_origin_abs[i]; orig < SPU_LS_SIZE)
-					{
-						auto& src = ::at32(m_bbs, orig);
-
-						if (src.reg_load_mod[i] != func.reg_save_off[i])
-						{
-							spu_log.error("Function 0x%05x: [0x%05x] $%u mismatch (src=0x%x; 0x%x vs 0x%x)", f.first, addr, i, orig, src.reg_load_mod[i], func.reg_save_off[i]);
-							is_ok = false;
-						}
-					}
-					else if (orig > SPU_LS_SIZE)
-					{
-						spu_log.todo("Function 0x%05x: [0x%05x] $%u unpredictable (src=0x%x)", f.first, addr, i, orig);
-						is_ok = false;
-					}
-
-					if (func.reg_save_off[i] + 1 == 0)
-					{
-						spu_log.error("Function 0x%05x: [0x%05x] $%u used incorrectly", f.first, addr, i);
-						is_ok = false;
-					}
-				}
-
-				// Check $SP (should be restored or unmodified)
-				if (bb.stack_sub != 0 && bb.stack_sub != 0x80000000)
-				{
-					spu_log.error("Function 0x%05x: [0x%05x] return with stack frame 0x%x", f.first, addr, bb.stack_sub);
-					is_ok = false;
-				}
-			}
-
-			if (is_ok && bb.terminator == term_type::call)
-			{
-				// Check call instruction (TODO)
-				if (bb.stack_sub == 0)
-				{
-					// Call without a stack frame
-					spu_log.error("Function 0x%05x: [0x%05x] frameless call", f.first, addr);
-					is_ok = false;
-				}
-			}
-
-			if (is_ok && bb.terminator == term_type::fallthrough)
-			{
-				// Can't just fall out of the function
-				const auto bb_target_value = bb.targets.empty() ? 0 : bb.targets[0];
-
-				if (bb.targets.size() != 1 || bb_target_value >= flim)
-				{
-					spu_log.error("Function 0x%05x: [0x%05x] bad fallthrough to 0x%x", f.first, addr, bb_target_value);
-					is_ok = false;
-				}
-			}
-
-			if (is_ok && bb.stack_sub == 0x80000000)
-			{
-				spu_log.error("Function 0x%05x: [0x%05x] bad stack frame", f.first, addr);
-				is_ok = false;
-			}
-
-			// Fill external function targets (calls, possibly tail calls)
-			for (u32 target : bb.targets)
-			{
-				if (target < bb.func || target >= flim || (bb.terminator == term_type::call && target == bb.func))
-				{
-					if (std::find(func.calls.begin(), func.calls.end(), target) == func.calls.end())
-					{
-						func.calls.push_back(target);
-					}
-				}
-			}
-		}
-
-		if (is_ok && used_stack && f.first == entry_point)
-		{
-			spu_log.error("Function 0x%05x: considered possible chunk", f.first);
-			is_ok = false;
-		}
-
-		// if (is_ok && f.first > 0x1d240 && f.first < 0x1e000)
-		// {
-		// 	spu_log.error("Function 0x%05x: manually disabled", f.first);
-		// 	is_ok = false;
-		// }
-
-		f.second.good = is_ok;
-	}
-
-	// Check function call graph
-	while (g_cfg.core.spu_block_size == spu_block_size_type::giga)
-	{
-		bool need_repeat = false;
-
-		for (auto& f : m_funcs)
-		{
-			if (!f.second.good)
-			{
-				continue;
-			}
-
-			for (u32 call : f.second.calls)
-			{
-				const auto ffound = std::as_const(m_funcs).find(call);
-
-				if (ffound == m_funcs.cend() || ffound->second.good == false)
-				{
-					need_repeat = true;
-
-					if (f.second.good)
-					{
-						spu_log.error("Function 0x%05x: calls bad function (0x%05x)", f.first, call);
-						f.second.good = false;
-					}
-				}
-			}
-		}
-
-		if (!need_repeat)
-		{
-			break;
-		}
-	}
-
-	auto sort_breakig_reasons = [](const std::array<atomic_t<u64>, 128>& breaking_reason)
-	{
-		std::vector<std::pair<u32, u64>> map;
-		for (u32 i = 0; i < static_cast<u32>(breaking_reason.size()); i++)
-		{
-			if (u64 v = breaking_reason[i])
-			{
-				map.emplace_back(i, v);
-			}
-		}
-
-		std::stable_sort(map.begin(), map.end(), FN(x.second > y.second));
-		return map;
-	};
-
-	struct putllc16_statistics_t
-	{
-		atomic_t<u64> all = 0;
-		atomic_t<u64> single = 0;
-		atomic_t<u64> nowrite = 0;
-		std::array<atomic_t<u64>, 128> breaking_reason{};
-	};
-
-	struct rchcnt_statistics_t
-	{
-		atomic_t<u64> all = 0;
-		atomic_t<u64> single = 0;
-		std::array<atomic_t<u64>, 128> breaking_reason{};
-	};
-
-	// Pattern structures
-
-	struct atomic16_t
-	{
-		bool active = false; // GETLLAR happened
-		u32 lsa_pc = SPU_LS_SIZE; // PC of first LSA write
-		u32 lsa_last_pc = SPU_LS_SIZE; // PC of first LSA write
-		u32 get_pc = SPU_LS_SIZE; // PC of GETLLAR
-		u32 put_pc = SPU_LS_SIZE; // PC of PUTLLC
-		reg_state_t ls{}; // state of LS load/store address register
-		reg_state_t ls_offs = reg_state_t::from_value(0); // Added value to ls
-		reg_state_t lsa{}; // state of LSA register on GETLLAR
-		reg_state_t ls_reg[8]{}; // stores/loads using register bundles with offset
-		reg_state_t ls_abs[8]{}; // stores/loads using absolute address
-		u32 reg = s_reg_max; // Source of address register of LS load/store
-		u32 reg2 = s_reg_max; // Source 2 of address register of LS load/store (STQX/LQX)
-		//u32 ls_offs[8]{}; // LS offset from register (0 if const)
-		bool ls_pc_rel = false; // For STQR/LQR
-		bool ls_access = false; // LS accessed
-		bool ls_write = false; // LS written
-		bool ls_invalid = false; // From this point and on, any store will cancel the optimization
-		bool select_16_or_0_at_runtime = false;
-		bool put_active = false; // PUTLLC happened
-		bool get_rdatomic = false; // True if MFC_RdAtomicStat was read after GETLLAR
-		u32 mem_count = 0;
-
-		// Return old state for error reporting
-		atomic16_t discard()
-		{
-			const u32 pc = lsa_pc;
-			const u32 last_pc = lsa_last_pc;
-
-			const atomic16_t old = *this;
-			*this = atomic16_t{};
-
-			// Keep some members
-			lsa_pc = pc;
-			lsa_last_pc = last_pc;
-			return old;
-		}
-
-		// Conditional breakage (break if a full 128-byte reservation is needed)
-		atomic16_t set_invalid_ls(bool write)
-		{
-			ls_invalid = true;
-			ls_write |= write;
-
-			if (write)
-			{
-				return discard();
-			}
-
-			return atomic16_t{};
-		}
-	};
-
-	struct rchcnt_loop_t
-	{
-		bool active = false; // RDCH/RCHCNT happened
-		bool failed = false; // needc this flag to distinguish start of the pattern vs failed pattern (they begin and end of the same address)
-		bool conditioned = false; // needc this flag to distinguish start of the pattern vs failed pattern (they begin and end of the same address)
-		u32 channel = 128;
-		u32 read_pc = SPU_LS_SIZE; // PC of RDCH or RCHCNT (that encloses the loop)
-		reg_state_t ch_state{+vf::is_null}; // Channel stat, example: RCNCNT ch_state, MFC_Cmd
-		reg_state_t ch_product{+vf::is_null}; // Optional comparison state for channl state, example: CEQI ch_product, ch_state, 1
-		bool product_test_negate = false; // Compare the opposite way, such as: CEQI ch_product, ch_state, 0 which turns 0 t -1 and 1 to 0
-		std::vector<u32> origins;
-		u32 branch_pc = SPU_LS_SIZE; // Where the loop branch is located
-		u32 branch_target = SPU_LS_SIZE; // The target of the loop branch
-
-		// Return old state for error reporting
-		rchcnt_loop_t discard()
-		{
-			const rchcnt_loop_t old = *this;
-			*this = rchcnt_loop_t{};
-			return old;
-		}
-	};
-
-	// Reset tags
-	reg_state_t::alloc_tag(true);
-
-	std::map<u32, std::unique_ptr<block_reg_info>> infos;
-	infos.emplace(entry_point, block_reg_info::create(entry_point));
-
-	struct block_reg_state_iterator
-	{
-		u32 pc{};
-		usz parent_iterator_index = umax;
-		usz parent_target_index = 0;
-		usz iterator_id = 0;
-
-		usz temp_child_index = umax;
-		usz temp_list_index = umax;
-
-		// PUTLLC16 optimization analysis tracker
-		atomic16_t atomic16{};
-
-		// RDCH/RCHCNT Loop analysis tracker
-		rchcnt_loop_t rchcnt_loop{};
-
-		block_reg_state_iterator(u32 _pc, usz _parent_iterator_index = umax, usz _parent_target_index = 0) noexcept
-			: pc(_pc)
-			, parent_iterator_index(_parent_iterator_index)
-			, parent_target_index(_parent_target_index)
-		{
-		}
-	};
-
-	std::vector<block_reg_state_iterator> reg_state_it;
-
-	std::map<u32, atomic16_t> atomic16_all; // RdAtomicStat location -> atomic loop optimization state
-	std::map<u32, rchcnt_loop_t> rchcnt_loop_all; // RDCH/RCHCNT location -> channel read loop optimization state
-	std::map<u32, bool> getllar_starts; // True for failed loops
-	std::map<u32, bool> run_on_block;
-	std::map<u32, bool> logged_block;
-
-	std::array<reg_state_t, s_reg_max>* true_state_walkby = nullptr;
-
-	atomic16_t dummy16{};
-	rchcnt_loop_t dummy_loop{};
-
-	bool likely_putllc_loop = false;
-	bool had_putllc_evaluation = false;
-
-	for (u32 i = 0, count = 0; i < result.data.size(); i++)
-	{
-		const u32 inst = std::bit_cast<be_t<u32>>(result.data[i]);
-
-		if (spu_opcode_t{inst}.ra == MFC_RdAtomicStat && g_spu_itype.decode(inst) == spu_itype::RDCH)
-		{
-			count++;
-
-			if (count == 2)
-			{
-				likely_putllc_loop = true;
-				break;
-			}
-		}
-	}
-
-	usz target_count = 0;
-
-	for (auto& [pc, loc] : m_targets)
-	{
-		target_count += loc.size();
-	}
-
-	const bool should_search_patterns = target_count < 300u;
-
-	// Treat start of function as an unknown value with tag (because it is)
-	const reg_state_t start_program_count = reg_state_t::make_unknown(entry_point - 1);
-
-	// Initialize
-	reg_state_it.emplace_back(entry_point);
-	run_on_block[entry_point / 4] = true;
-
-	enum spu_addr_mask_t : u32
-	{
-		SPU_LS_MASK_128 = (SPU_LS_SIZE - 1) & -128,
-		SPU_LS_MASK_16  = (SPU_LS_SIZE - 1) & -16,
-		SPU_LS_MASK_4   = (SPU_LS_SIZE - 1) & -4,
-		SPU_LS_MASK_1   = (SPU_LS_SIZE - 1),
-	};
-
-	u32 iterator_id_alloc = 0;
-
-	for (u32 wf = 0, wi = 0, wa = entry_point, bpc = wa; wf <= 1;)
-	{
-		const bool is_form_block = wf == 0;
-		const bool is_pattern_match = wf == 1;
-
-		dummy16.active = false;
-		dummy_loop.active = false;
-
-		if (!is_form_block && wa == bpc)
-		{
-			if (wi == 0)
-			{
-				for (auto& [addr, block] : infos)
-				{
-					// Evaluate state for all blocks
-					block->evaluate_start_state(infos, should_search_patterns);
-				}
-			}
-
-			if (!should_search_patterns)
-			{
-				break;
-			}
-
-			if (!infos[bpc])
-			{
-				std::string out = fmt::format("Blocks:");
-
-				for (auto& [pc, _] : infos)
-				{
-					if (!_) continue;
-					fmt::append(out, " [0x%x]", pc);
-				}
-
-				out += '\n';
-				for (auto& [pc, bb] : m_bbs)
-				{
-					if (!m_block_info[pc / 4])
-					{
-						continue;
-					}
-
-					out += fmt::format("\nTargets 0x%x:", pc);
-
-					for (auto addr : bb.targets)
-					{
-						fmt::append(out, " [0x%x]", addr);
-					}
-				}
-
-				spu_log.fatal("%s", out);
-			}
-
-			true_state_walkby = &ensure(infos[bpc])->evaluate_start_state(infos, should_search_patterns);
-
-			for (reg_state_t& f : *true_state_walkby)
-			{
-				if (f.flag & vf::is_null)
-				{
-					// Evaluate locally
-					f.flag -= vf::is_null;
-				}
-			}
-		}
-
-		auto& vregs = is_form_block ? infos[bpc]->local_state : *true_state_walkby;
-		const auto atomic16 = is_pattern_match ? &::at32(reg_state_it, wi).atomic16 : &dummy16;
-		const auto rchcnt_loop = is_pattern_match ? &::at32(reg_state_it, wi).rchcnt_loop : &dummy_loop;
-
-		const u32 pos = wa;
-
-		wa += 4;
-
-		const auto break_putllc16 = [&](u32 cause, atomic16_t previous)
-		{
-			if (previous.active && likely_putllc_loop && getllar_starts.contains(previous.lsa_pc))
-			{
-				const bool is_first = !std::exchange(getllar_starts[previous.lsa_pc], true);
-
-				if (!is_first)
-				{
-					return;
-				}
-
-				had_putllc_evaluation = true;
-
-				g_fxo->get<putllc16_statistics_t>().breaking_reason[cause]++;
-
-				if (!spu_log.notice)
-				{
-					return;
-				}
-
-				std::string break_error = fmt::format("PUTLLC pattern breakage [%x mem=%d lsa_const=%d cause=%u] (lsa_pc=0x%x)", pos, previous.mem_count, u32{!previous.ls_offs.is_const()} * 2 + previous.lsa.is_const(), cause, previous.lsa_pc);
-
-				const auto values = sort_breakig_reasons(g_fxo->get<putllc16_statistics_t>().breaking_reason);
-
-				std::string tracing = "Top Breaking Reasons:";
-
-				usz i = 0;
-				usz fail_count = 0;
-				bool switched_to_minimal = false;
-
-				for (auto it = values.begin(); it != values.end(); i++, it++)
-				{
-					fail_count += it->second;
-
-					if (i >= 12)
-					{
-						continue;
-					}
-
-					if (i < 8 && it->second > 1)
-					{
-						fmt::append(tracing, " [cause=%u, n=%d]", it->first, it->second);
-					}
-					else
-					{
-						if (!std::exchange(switched_to_minimal, true))
-						{
-							fmt::append(tracing, "; More:");
-						}
-
-						fmt::append(tracing, " %u", it->first);
-					}
-				}
-
-				fmt::append(tracing, " of %d failures", fail_count);
-				spu_log.notice("%s\n%s", break_error, tracing);
-			}
-		};
-
-		const auto break_channel_pattern = [&](u32 cause, rchcnt_loop_t previous)
-		{
-			if (previous.active && rchcnt_loop_all.contains(previous.read_pc))
-			{
-				const bool is_first = !std::exchange(rchcnt_loop_all[previous.read_pc].failed, true);
-
-				if (!is_first)
-				{
-					return;
-				}
-
-				g_fxo->get<rchcnt_statistics_t>().breaking_reason[cause]++;
-
-				if (!spu_log.notice)
-				{
-					return;
-				}
-
-				std::string break_error = fmt::format("Channel pattern breakage [%x cause=%u] (read_pc=0x%x)", pos, cause, previous.read_pc);
-
-				const auto values = sort_breakig_reasons(g_fxo->get<rchcnt_statistics_t>().breaking_reason);
-
-				std::string tracing = "Top Breaking Reasons:";
-
-				usz i = 0;
-				usz fail_count = 0;
-				bool switched_to_minimal = false;
-
-				for (auto it = values.begin(); it != values.end(); i++, it++)
-				{
-					fail_count += it->second;
-
-					if (i >= 12)
-					{
-						continue;
-					}
-
-					if (i < 8 && it->second > 1)
-					{
-						fmt::append(tracing, " [cause=%u, n=%d]", it->first, it->second);
-					}
-					else
-					{
-						if (!std::exchange(switched_to_minimal, true))
-						{
-							fmt::append(tracing, "; More:");
-						}
-
-						fmt::append(tracing, " %u", it->first);
-					}
-				}
-
-				fmt::append(tracing, " of %d failures", fail_count);
-				spu_log.notice("%s\n%s", break_error, tracing);
-			}
-		};
-
-		const auto break_all_patterns = [&](u32 cause)
-		{
-			break_putllc16(cause, atomic16->discard());
-			break_channel_pattern(cause, rchcnt_loop->discard());
-		};
-
-		const auto calculate_absolute_ls_difference = [](u32 addr1, u32 addr2)
-		{
-			addr1 &= SPU_LS_MASK_1;
-			addr2 &= SPU_LS_MASK_1;
-
-			const u32 abs_diff = (addr1 >= addr2 ? addr1 - addr2 : addr2 - addr1);
-
-			// Because memory is wrapping-around, take the gap that is smaller
-			return abs_diff >= SPU_LS_SIZE / 2 ? SPU_LS_SIZE - abs_diff : abs_diff;
-		};
-
-		bool called_next = false;
-
-		u32 data{};
-
-		const auto next_block = [&]()
-		{
-			if (called_next)
-			{
-				// Guard multiple calles to next_block()
-				return;
-			}
-
-			called_next = true;
-
-			if (wf == 0)
-			{
-				wi++;
-
-				auto& block = infos[bpc];
-
-				if (bpc == entry_point || (g_cfg.core.spu_block_size != spu_block_size_type::safe && (m_ret_info[bpc / 4] || m_entry_info[bpc / 4])))
-				{
-					// Do not allow value passthrough
-					for (reg_state_t& f : block->start_reg_state)
-					{
-						f.flag -= vf::is_null;
-					}
-
-					for (reg_state_t& f : block->local_state)
-					{
-						f.flag -= vf::is_null;
-					}
-
-					// Block has an external origin, discard all previous information
-					block->end_reg_state = block->local_state;
-					block->has_true_state = true;
-				}
-
-				block->addend_reg_state = block->local_state;
-			}
-			else
-			{
-				std::vector<usz> to_pop;
-
-				usz stackframe_it = wi;
-				u32 stackframe_pc = SPU_LS_SIZE;
-				usz entry_index = umax;
-
-				auto get_block_targets = [&](u32 pc) -> std::span<u32>
-				{
-					if (m_block_info[pc / 4] && m_bbs.count(pc))
-					{
-						return m_bbs.at(pc).targets;
-					}
-
-					return {};
-				};
-
-				u32 target_pc = SPU_LS_SIZE;
-				bool insert_entry = false;
-				bool is_code_backdoor = false;
-
-				while (true)
-				{
-					const auto state_it = &reg_state_it[stackframe_it];
-
-					stackframe_pc = state_it->pc;
-					entry_index = state_it->parent_target_index;
-
-					const auto targets = get_block_targets(stackframe_pc);
-
-					const usz target_size = targets.size();
-
-					while (entry_index < target_size && (targets[entry_index] < lsa || targets[entry_index] >= limit || !m_block_info[targets[entry_index] / 4]))
-					{
-						state_it->parent_target_index++;
-						entry_index = state_it->parent_target_index;
-					}
-
-					if (entry_index == target_size)
-					{
-						const usz parent_index = state_it->parent_iterator_index;
-
-						to_pop.emplace_back(stackframe_it);
-
-						if (parent_index != umax)
-						{
-							stackframe_it = parent_index;
-						}
-						else
-						{
-							// Final
-							wi = 0;
-							break;
-						}
-					}
-					else
-					{
-						target_pc = ::at32(targets, entry_index);
-
-						usz occurence_count = 0;
-						std::array<usz, 16> duplicate_positions;
-
-						// Virtual concept (there is no really such thing as loop connectors from the ccompiled-code level)
-						// But it helps to simplify this process
-						bool is_loop_connector = false;
-						bool is_too_extensive = false;
-						bool is_skipable = false;
-
-						// Hack to avoid extensive analysis of all code paths possible:
-						// Allow up to 4 occurences of the upper-most block
-						// Because, loop "connectors" are usually backward in direction
-						// The proper solution would be to add a precursry function analysis stage which identifies all loop "connectors" and allows duplicates based on it
-						for (usz i = stackframe_it, count = 0;; count++)
-						{
-							auto& entry = ::at32(reg_state_it, i);
-							const u32 entry_pc = entry.pc;
-
-							if (count == (state_it->atomic16.active ? 25 : 12))
-							{
-								if (state_it->atomic16.active && !std::exchange(logged_block[target_pc / 4], true))
-								{
-									spu_log.notice("SPU Blcok Analysis is too extensive at 0x%x", entry_pc);
-								}
-
-								is_too_extensive = true;
-								break;
-							}
-
-							if (entry_pc == target_pc)
-							{
-								duplicate_positions[occurence_count++] = i;
-
-								if (occurence_count == duplicate_positions.size())
-								{
-									is_loop_connector = true;
-									break;
-								}
-							}
-
-							const usz parent_idx = entry.parent_iterator_index;
-
-							if (parent_idx == umax)
-							{
-								break;
-							}
-
-							ensure(i != parent_idx);
-
-							// Fill info for later
-							auto& parent = ::at32(reg_state_it, parent_idx);
-							parent.temp_child_index = i;
-							parent.temp_list_index = count;
-
-							i = parent_idx;
-						}
-
-						// Scan the code for "code flow" repetitions (entire sequences of blocks equal to each other)
-						// If found, this is 100% a loop, shoulkd it start a third time ignore it
-						if (occurence_count >= 2)
-						{
-							for (usz it_begin = 0; !is_skipable && it_begin < occurence_count - 1; it_begin++)
-							{
-								const usz block_start = duplicate_positions[it_begin + 1];
-
-								for (usz it_tail = 0; it_tail < it_begin + 1; it_tail++)
-								{
-									const usz block_tail = duplicate_positions[it_begin - it_tail];
-
-									// Check if the distance is precisely two times from the end
-									if (reg_state_it.size() - block_start != utils::rol64(reg_state_it.size() - block_tail, 1))
-									{
-										continue;
-									}
-
-									bool is_equal = true;
-
-									for (usz j = 1; j < reg_state_it.size() - block_tail; j++)
-									{
-										if (reg_state_it[block_start + j].pc != reg_state_it[block_tail + j].pc)
-										{
-											is_equal = false;
-											break;
-										}
-									}
-
-									if (is_equal)
-									{
-										is_skipable = true;
-										break;
-									}
-								}
-							}
-						}
-
-						if (is_skipable)
-						{
-							if (!std::exchange(logged_block[target_pc / 4], true))
-							{
-								spu_log.notice("SPU block is a loop at [0x%05x -> 0x%05x]", state_it->pc, target_pc);
-							}
-
-							state_it->parent_target_index++;
-							continue;
-						}
-
-						if (is_loop_connector && !std::exchange(logged_block[target_pc / 4], true))
-						{
-							spu_log.notice("SPU block analysis is too repetitive at [0x%05x -> 0x%05x]", state_it->pc, target_pc);
-						}
-
-						insert_entry = true;
-
-						// Test if the code is an opening to external code (start of the function is always respected because it is already assumed to have no origin)
-						is_code_backdoor = m_ret_info[target_pc / 4] || (m_entry_info[target_pc / 4] && target_pc != entry_point);
-
-						if (run_on_block[target_pc / 4])
-						{
-							insert_entry = false;
-						}
-						else if (is_code_backdoor || is_too_extensive || is_loop_connector)
-						{
-							if (reg_state_it[stackframe_it].atomic16.active)
-							{
-								break_putllc16(40, reg_state_it[stackframe_it].atomic16.discard());
-							}
-
-							if (reg_state_it[stackframe_it].rchcnt_loop.active)
-							{
-								break_channel_pattern(40, reg_state_it[stackframe_it].rchcnt_loop.discard());
-							}
-
-							// Allow the block to run only once, to avoid unnecessary iterations
-							run_on_block[target_pc / 4] = true;
-						}
-
-						state_it->parent_target_index++;
-
-						if (!insert_entry)
-						{
-							continue;
-						}
-
-						break;
-					}
-				}
-
-				const u32 previous_pc = m_bbs.at(reg_state_it[stackframe_it].pc).size * 4 + reg_state_it[stackframe_it].pc - 4;
-
-				bool may_return = previous_pc + 4 != entry_point + result.data.size() * 4 && (m_ret_info[(previous_pc / 4) + 1] || m_entry_info[previous_pc / 4]);
-
-				if (!may_return)
-				{
-					const u32 branch_target = op_branch_targets(previous_pc, spu_opcode_t{data})[0];
-
-					if (branch_target == umax || branch_target >= entry_point + result.data.size() * 4 || branch_target < entry_point)
-					{
-						may_return = true;
-					}
-				}
-
-				if (wi != stackframe_it || may_return || !insert_entry)
-				{
-					// Possible function end
-					if (rchcnt_loop->active)
-					{
-						// Does not post-dominates channel reads
-						auto& pair = rchcnt_loop_all[rchcnt_loop->read_pc];
-						pair.failed = true;
-						pair.active = false;
-					}
-				}
-
-				// Backup analyser information
-				const auto atomic16_info = reg_state_it[stackframe_it].atomic16;
-				const auto rchcnt_loop_info = reg_state_it[stackframe_it].rchcnt_loop;
-
-				// Clean from the back possible because it does not affect old indices
-				// Technically should always do a full cleanup at the moment
-				// TODO: Proper cleanup with keeping old indices valid
-				for (usz it : to_pop)
-				{
-					if (it == reg_state_it.size() - 1)
-					{
-						reg_state_it.pop_back();
-					}
-					else
-					{
-						// Should not be reachable at the moment
-						//ensure(false);
-						spu_log.error("Failed to clean block analyis steps at block_id %d", reg_state_it[it].iterator_id);
-					}
-				}
-
-				if (insert_entry)
-				{
-					const usz target_size = get_block_targets(stackframe_pc).size();
-
-					spu_log.trace("Emplacing: block_id=%d, pc=0x%x, target_it=%d/%d, new_pc=0x%x (has_it=%d)", reg_state_it[stackframe_it].iterator_id, stackframe_pc, entry_index + 1, target_size, target_pc, atomic16_info.active);
-					auto& next = reg_state_it.emplace_back(target_pc, stackframe_it, 0);
-
-					if (!is_code_backdoor)
-					{
-						// Restore analyser information (if not an entry)
-						next.atomic16 = atomic16_info;
-
-						if (previous_pc != rchcnt_loop_info.branch_pc || target_pc == rchcnt_loop_info.branch_target)
-							next.rchcnt_loop = rchcnt_loop_info;
-					}
-					else
-					{
-						if (atomic16_info.active)
-						{
-							break_putllc16(39, atomic16_info);
-						}
-
-						if (rchcnt_loop_info.active)
-						{
-							// Does not post-dominates channel read
-							auto& pair = rchcnt_loop_all[rchcnt_loop_info.read_pc];
-							pair.failed = true;
-							pair.active = false;
-						}
-					}
-
-					next.iterator_id = iterator_id_alloc++;
-					wi = static_cast<u32>(stackframe_it + 1);
-					ensure(stackframe_it + 1 == reg_state_it.size() - 1);
-				}
-			}
-
-			if (wi >= reg_state_it.size())
-			{
-				wf++;
-				wi = 0;
-				run_on_block.clear();
-
-				if (wf == 1)
-				{
-					reg_state_it.clear();
-
-					if (!infos.empty())
-					{
-						reg_state_it.emplace_back(::at32(infos, entry_point)->pc).iterator_id = iterator_id_alloc++;;
-					}
-				}
-			}
-
-			if (wi < reg_state_it.size())
-			{
-				wa = ::at32(reg_state_it, wi).pc;
-				bpc = wa;
-			}
-		};
-
-		const auto get_reg = [&](u32 reg) -> const reg_state_t&
-		{
-			return vregs[reg];
-		};
-
-		const auto move_reg = [&](u32 dst, u32 src)
-		{
-			if (dst == src || vregs[src] == vregs[dst])
-			{
-				return;
-			}
-
-			vregs[dst] = vregs[src];
-
-			// Register storage has changed
-			vregs[dst].flag -= vf::is_null;
-		};
-
-		const auto set_const_value = [&](u32 reg, u32 value)
-		{
-			vregs[reg] = reg_state_t::from_value(value);
-		};
-
-		const auto inherit_const_value = [&](u32 reg, const reg_state_t& ra, const reg_state_t& rb, u32 value, u32 pos)
-		{
-			if (ra.origin != rb.origin)
-			{
-				pos = reg_state_it[wi].pc;
-			}
-			else
-			{
-				pos = ra.origin;
-			}
-
-			const bs_t<vf> flag = (ra.flag & rb.flag) - vf::is_null;
-
-			vregs[reg] = reg_state_t{flag, value, flag & vf::is_const ? u32{umax} : reg_state_t::alloc_tag(), 0, 0, pos};
-		};
-
-		const auto inherit_const_mask_value = [&](u32 reg, reg_state_t state, u32 mask_ones, u32 mask_zeroes)
-		{
-			if ((mask_ones | mask_zeroes) == 0)
-			{
-				state.flag -= vf::is_null;
-				vregs[reg] = state;
-				return;
-			}
-
-			if (state.flag & vf::is_const)
-			{
-				vregs[reg] = reg_state_t::from_value((state.value | mask_ones) & ~mask_zeroes);
-				return;
-			}
-
-			const u32 ones = (state.known_ones | mask_ones) & ~mask_zeroes;
-			const u32 zeroes = (state.known_zeroes | mask_zeroes) & ~mask_ones;
-
-			if ((ones ^ zeroes) == umax)
-			{
-				// Special case: create a constant from full masks
-				vregs[reg] = reg_state_t::from_value(ones);
-				return;
-			}
-
-			ensure(state.tag != umax);
-			vregs[reg] = reg_state_t{vf::is_mask, 0, state.tag, ones, zeroes, state.origin};
-		};
-
-		const auto unconst = [&](u32 reg, u32 pc)
-		{
-			vregs[reg] = reg_state_t::make_unknown(pc, pos);
-		};
-
-		const auto add_block = [&](u32 target)
-		{
-			if (!is_form_block)
-			{
-				return;
-			}
-
-			// Validate new target (TODO)
-			if (target >= lsa && target < limit)
-			{
-				if (!infos[target])
-				{
-					infos[target] = block_reg_info::create(target);
-				}
-
-				block_reg_info::create_node(target, bpc, infos);
-
-				if (!run_on_block[target / 4])
-				{
-					reg_state_it.emplace_back(target).iterator_id = iterator_id_alloc++;
-					run_on_block[target / 4] = true;
-				}
-			}
-		};
-
-		if (pos < lsa || pos >= limit)
-		{
-			// Don't analyse if already beyond the limit
-			next_block();
-			continue;
-		}
-
-		if (bpc != pos && m_preds.count(pos))
-		{
-			// End of block reached
-			next_block();
-			continue;
-		}
-
-		if (g_cfg.core.spu_block_size != spu_block_size_type::safe && (m_ret_info[pos / 4] || m_entry_info[pos / 4] || pos == entry_point))
-		{
-			ensure(bpc == pos);
-
-			// Block has an external origin, discard all previous information
-			// TODO: Make the optimizations conditional at runtime instead
-			if (!is_form_block)
-			{
-				// Call for external code
-				break_all_patterns(25);
-			}
-		}
-
-		if (atomic16->active)
-		{
-			for (auto state : {&atomic16->lsa, &atomic16->ls, &atomic16->ls_offs})
-			{
-				state->invalidate_if_created(pos);
-			}
-		}
-
-		if (rchcnt_loop->active)
-		{
-			if (std::find(rchcnt_loop->origins.begin(), rchcnt_loop->origins.end(), pos) != rchcnt_loop->origins.end())
-			{
-				rchcnt_loop->failed = true;
-				rchcnt_loop->active = false;
-			}
-		}
-
-		data = std::bit_cast<be_t<u32>>(::at32(result.data, (pos - lsa) / 4));
-		const auto op = spu_opcode_t{data};
-		const auto type = g_spu_itype.decode(data);
-
-		// For debugging
-		if (false && likely_putllc_loop && is_pattern_match)
-		{
-			SPUDisAsm dis_asm(cpu_disasm_mode::dump, reinterpret_cast<const u8*>(result.data.data()), result.lower_bound);
-			dis_asm.disasm(pos);
-
-			std::string consts;
-
-			for (auto _use : std::initializer_list<std::pair<u32, bool>>{{op.ra, m_use_ra.test(pos / 4)}
-				, {op.rb, m_use_rb.test(pos / 4)}, {op.rc, m_use_rc.test(pos / 4)}})
-			{
-				if (!_use.second)
-				{
-					continue;
-				}
-
-				if (!consts.empty())
-				{
-					consts += ',';
-				}
-
-				const u32 reg_file = _use.first;
-				const auto& reg = get_reg(reg_file);
-				if (reg.is_const())
-				{
-					fmt::append(consts, " r%d=0x%x", reg_file, reg.value);
-				}
-				else
-				{
-					if (u32 mask = reg.known_zeroes | reg.known_ones)
-					{
-						fmt::append(consts, " r%d=#%d-&|0x%x", reg_file, reg.tag, mask);
-					}
-					else
-					{
-						fmt::append(consts, " r%d=#%d", reg_file, reg.tag);
-					}
-				}
-			}
-
-			if (!consts.empty())
-			{
-				consts = " {" + consts + " }";
-			}
-
-			if (dis_asm.last_opcode.ends_with('\n'))
-			{
-				dis_asm.last_opcode.pop_back();
-			}
-
-			spu_log.always()("[SPU=0%x, it=%d] %s%s     [%d]", pos, reg_state_it[wi].iterator_id, dis_asm.last_opcode, consts, atomic16->active);
-		}
-
-		// Analyse instruction
-		switch (type)
-		{
-		case spu_itype::UNK:
-		case spu_itype::DFCEQ:
-		case spu_itype::DFCMEQ:
-		case spu_itype::DFCGT:
-		case spu_itype::DFCMGT:
-		case spu_itype::DFTSV:
-		{
-			// Stop before invalid instructions (TODO)
-			next_block();
-			continue;
-		}
-
-		case spu_itype::SYNC:
-		case spu_itype::STOP:
-		case spu_itype::STOPD:
-		{
-			if (data == 0)
-			{
-				// Stop before null data
-				next_block();
-				continue;
-			}
-
-			if (g_cfg.core.spu_block_size == spu_block_size_type::safe)
-			{
-				// Stop on special instructions (TODO)
-				next_block();
-				break;
-			}
-
-			if (type == spu_itype::SYNC)
-			{
-				// Remember
-				sync = true;
-			}
-
-			break;
-		}
-
-		case spu_itype::IRET:
-		case spu_itype::BI:
-		case spu_itype::BISL:
-		case spu_itype::BISLED:
-		case spu_itype::BIZ:
-		case spu_itype::BINZ:
-		case spu_itype::BIHZ:
-		case spu_itype::BIHNZ:
-		{
-			if (op.e || op.d)
-			{
-				break_all_patterns(27);
-			}
-
-			break;
-		}
-
-		case spu_itype::BRSL:
-		case spu_itype::BRASL:
-		{
-			break;
-		}
-
-		case spu_itype::BRA:
-		{
-			break;
-		}
-
-		case spu_itype::BRZ:
-		case spu_itype::BRNZ:
-		{
-			const u32 next_pc = spu_branch_target(pos, 1);
-			const u32 target = spu_branch_target(pos, op.i16);
-
-			if (rchcnt_loop->active)
-			{
-				const reg_state_t& rt = vregs[op.rt];
-
-				if (rt.is_instruction && (rchcnt_loop->ch_state.origin == rt.origin || rchcnt_loop->ch_product.origin == rt.origin))
-				{
-					if (rchcnt_loop->conditioned)
-					{
-						// Let's not make it complicated, have a single branch determining the condition
-						break_channel_pattern(54, rchcnt_loop->discard());
-						break;
-					}
-
-					rchcnt_loop->conditioned = true;
-					rchcnt_loop->branch_pc = pos;
-					rchcnt_loop->branch_target = rchcnt_loop->product_test_negate != (type == spu_itype::BRZ) ? target : next_pc;
-					break;
-				}
-			}
-
-			break;
-		}
-		case spu_itype::BR:
-		case spu_itype::BRHZ:
-		case spu_itype::BRHNZ:
-		{
-			break;
-		}
-
-		case spu_itype::DSYNC:
-		case spu_itype::HEQ:
-		case spu_itype::HEQI:
-		case spu_itype::HGT:
-		case spu_itype::HGTI:
-		case spu_itype::HLGT:
-		case spu_itype::HLGTI:
-		case spu_itype::LNOP:
-		case spu_itype::NOP:
-		case spu_itype::MTSPR:
-		case spu_itype::FSCRWR:
-		{
-			// Do nothing
-			break;
-		}
-
-		case spu_itype::WRCH:
-		{
-			break_channel_pattern(56, rchcnt_loop->discard());
-
-			switch (op.ra)
-			{
-			case MFC_EAL:
-			{
-				move_reg(s_reg_mfc_eal, op.rt);
-				break;
-			}
-			case MFC_LSA:
-			{
-				auto rt = get_reg(op.rt);
-				inherit_const_mask_value(s_reg_mfc_lsa, rt, 0, ~SPU_LS_MASK_1);
-
-				if (is_pattern_match)
-				{
-					atomic16->lsa_last_pc = pos;
-				}
-
-				break;
-			}
-			case MFC_TagID:
-			{
-				break;
-			}
-			case MFC_Size:
-			{
-				break;
-			}
-			case MFC_Cmd:
-			{
-				const auto [af, av, atagg, _3, _5, apc, ainst] = get_reg(op.rt);
-
-				if (!is_pattern_match)
-				{
-					//
-				}
-				else if (af & vf::is_const)
-				{
-					switch (av)
-					{
-					case MFC_GETLLAR_CMD:
-					{
-						// Get LSA and apply mask for GETLLAR
-						// TODO: Simplify this to be a value returning function
-						auto old_lsa = get_reg(s_reg_mfc_lsa);
-						inherit_const_mask_value(s_reg_mfc_lsa, old_lsa, 0, ~SPU_LS_MASK_128);
-
-						// Restore LSA
-						auto lsa = get_reg(s_reg_mfc_lsa);
-						vregs[s_reg_mfc_lsa] = old_lsa;
-
-						const u32 lsa_pc = atomic16->lsa_last_pc == SPU_LS_SIZE ? bpc : atomic16->lsa_last_pc;
-
-						if (atomic16->active)
-						{
-							if (atomic16->lsa_pc != lsa_pc || atomic16->get_pc != pos || atomic16->lsa != lsa)
-							{
-								break_putllc16(30, atomic16->discard());
-							}
-						}
-
-						// If LSA write has not happened, use block start
-						atomic16->lsa_pc = lsa_pc;
-						atomic16->get_pc = pos;
-						atomic16->active = true;
-
-						atomic16->lsa = lsa;
-
-						if (likely_putllc_loop)
-						{
-							// Register loop entry
-							if (getllar_starts.emplace(atomic16->lsa_pc, false).second)
-							{
-								g_fxo->get<putllc16_statistics_t>().all++;
-								spu_log.notice("[0x%05x] GETLLAR pattern entry point", pos);
-							}
-						}
-
-						break;
-					}
-					case MFC_PUTLLC_CMD:
-					{
-						if (atomic16->active)
-						{
-							const auto _lsa = get_reg(s_reg_mfc_lsa);
-
-							// Search the value of LS address stoire/load in latest register file
-							if (atomic16->ls_access && atomic16->ls_write && !atomic16->ls_pc_rel && !atomic16->ls.is_const())
-							{
-								usz reg_it = umax;
-								u32 regs[2]{s_reg_max, s_reg_max};
-
-								for (auto val : {&atomic16->ls, &atomic16->ls_offs})
-								{
-									reg_it++;
-
-									if (val->is_const())
-									{
-										regs[reg_it] = 0;
-										continue;
-									}
-
-									if (vregs[s_reg_mfc_lsa].compare_with_mask_indifference(*val, SPU_LS_MASK_16))
-									{
-										regs[reg_it] = s_reg_mfc_lsa;
-										continue;
-									}
-
-									for (u32 i = 0; i <= s_reg_127; i++)
-									{
-										const auto& _reg = vregs[i];
-
-										if (_reg.compare_with_mask_indifference(*val, SPU_LS_MASK_16))
-										{
-											regs[reg_it] = i;
-											break;
-										}
-									}
-								}
-
-								if (regs[0] == s_reg_max || regs[1] == s_reg_max)
-								{
-									break_putllc16(3, atomic16->discard());
-									break;
-								}
-
-								atomic16->reg = regs[0];
-
-								if (!atomic16->ls_offs.is_const())
-								{
-									atomic16->reg2 = regs[1];
-								}
-							}
-
-							if (atomic16->ls_access && atomic16->ls_write && !atomic16->lsa.compare_with_mask_indifference(_lsa, SPU_LS_MASK_128))
-							{
-								// LSA latest value mismatches with the one written with GETLLAR
-
-								if (atomic16->lsa.flag != _lsa.flag)
-								{
-									break_putllc16(1, atomic16->discard());
-								}
-								else
-								{
-									break_putllc16(2, atomic16->discard());
-								}
-
-								break;
-							}
-
-							if (atomic16->ls_access && atomic16->ls_write)
-							{
-								atomic16->select_16_or_0_at_runtime = false;
-
-								bool ok = false;
-
-								if (atomic16->ls_pc_rel || !atomic16->ls_offs.is_const())
-								{
-									//
-								}
-								else if (atomic16->lsa.is_const())
-								{
-									if (atomic16->ls.is_const())
-									{
-										if (atomic16->ls_offs.value != 0)
-										{
-											// Rebase constant so we can get rid of ls_offs
-											atomic16->ls.value = spu_ls_target(atomic16->ls_offs.value + atomic16->ls.value);
-											atomic16->ls_offs = reg_state_t::from_value(0);
-										}
-
-										if (atomic16->ls.compare_with_mask_indifference(atomic16->lsa, SPU_LS_MASK_128))
-										{
-											ok = true;
-										}
-									}
-									else if (atomic16->ls_offs.compare_with_mask_indifference(atomic16->lsa, SPU_LS_MASK_128) && atomic16->ls.is_less_than(128 - (atomic16->ls_offs.value & 127)))
-									{
-										// Relative memory access with offset less than 128 bytes
-										// Common around SPU utilities which have less strict restrictions about memory alignment
-										ok = true;
-									}
-								}
-								else if (atomic16->lsa.compare_with_mask_indifference(atomic16->ls, SPU_LS_MASK_128) && atomic16->ls_offs == 0)
-								{
-									// Unknown value with known offset of less than 128 bytes
-									ok = true;
-								}
-
-								if (!ok)
-								{
-									// This is quite common.. let's try to select between putllc16 and putllc0 at runtime!
-									// break_putllc16(100);
-									// atomic16->discard();
-									// break;
-									atomic16->select_16_or_0_at_runtime = true;
-								}
-							}
-
-							if (!atomic16->get_rdatomic)
-							{
-								// MFC_RdAtomicStat must have been read, otherwise GETLLAR may not be executed (according to HW tests)
-								break_putllc16(21, atomic16->discard());
-							}
-
-							atomic16->put_pc = pos;
-							atomic16->put_active = true;
-						}
-
-						break;
-					}
-					default:
-					{
-						break_putllc16(4, atomic16->discard());
-						break;
-					}
-					}
-				}
-				else
-				{
-					break_putllc16(5, atomic16->discard());
-				}
-
-				if (!atomic16->active)
-				{
-					// Propagate failure
-					for (auto& atm : atomic16_all)
-					{
-						if (atm.second.active && atm.second.put_pc == pos)
-						{
-							break_putllc16(31, atm.second.discard());
-						}
-					}
-				}
-
-				break;
-			}
-			case MFC_EAH:
-			case SPU_WrDec:
-			case SPU_WrSRR0:
-			case SPU_WrEventAck:
-			case SPU_Set_Bkmk_Tag:
-			case SPU_PM_Start_Ev:
-			case SPU_PM_Stop_Ev:
-			case MFC_WrTagMask:
-			//case MFC_WrTagUpdate: // Technically correct to ignore but risky
-				break;
-			default:
-			{
-				break_all_patterns(6);
-				break;
-			}
-			}
-
-			break;
-		}
-
-		case spu_itype::RCHCNT:
-		case spu_itype::RDCH:
-		{
-			const bool is_read = type == spu_itype::RDCH;
-			bool invalidate = true;
-
-			const auto it = rchcnt_loop_all.find(pos);
-
-			if (it != rchcnt_loop_all.end())
-			{
-				if (rchcnt_loop->failed || !rchcnt_loop->conditioned || rchcnt_loop->read_pc != pos)
-				{
-					// Propagate faiure
-					it->second.failed = true;
-					it->second.active = false;
-					it->second.conditioned = false;
-				}
-				else
-				{
-					it->second.active = false;
-				}
-
-				rchcnt_loop->active = false;
-			}
-
-			if (rchcnt_loop->active)
-			{
-				if (rchcnt_loop->read_pc != pos)
-				{
-					break_channel_pattern(53, rchcnt_loop->discard());
-				}
-			}
-
-			switch (op.ra)
-			{
-			case MFC_RdAtomicStat:
-			{
-				if (!is_read)
-				{
-					break;
-				}
-
-				if (atomic16->active)
-				{
-					if (atomic16->put_active)
-					{
-						if (getllar_starts.contains(atomic16->lsa_pc) && getllar_starts[atomic16->lsa_pc])
-						{
-							break_putllc16(24, atomic16->discard());
-							break;
-						}
-
-						const auto it = atomic16_all.find(pos);
-
-						if (it == atomic16_all.end())
-						{
-							// Fresh new pattern detected in a single code path
-							atomic16_all.emplace(pos, *atomic16);
-						}
-						else if (it->second.active)
-						{
-							// Merge pattern attributes between different code paths, may cause detection of failures
-							atomic16_t& existing = it->second;
-
-							auto compare_tag_and_reg = [](std::pair<const reg_state_t*, u32> a, std::pair<const reg_state_t*, u32> b)
-							{
-								if (b.first->is_const() && a.first->is_const())
-								{
-									return a.first->compare_with_mask_indifference(*b.first, SPU_LS_MASK_1);
-								}
-
-								// Compare register source
-								return a.second == b.second;
-							};
-
-							if (existing.lsa_pc != atomic16->lsa_pc || existing.put_pc != atomic16->put_pc || !existing.lsa.compare_with_mask_indifference(atomic16->lsa, SPU_LS_MASK_128))
-							{
-								// Register twice
-								break_putllc16(22, atomic16->discard());
-								break_putllc16(22, existing.discard());
-							}
-
-							if (existing.active && existing.ls_access && atomic16->ls_access && (!compare_tag_and_reg({&existing.ls, existing.reg}, {&atomic16->ls, atomic16->reg}) || existing.ls_offs != atomic16->ls_offs || existing.reg2 != atomic16->reg2))
-							{
-								// Conflicting loads with stores in more than one code path
-								break_putllc16(27, atomic16->set_invalid_ls(existing.ls_write || atomic16->ls_write));
-
-								if (!atomic16->active)
-								{
-									existing.active = false;
-								}
-							}
-
-							if (existing.active && (existing.ls_write || atomic16->ls_write) && (existing.ls_invalid || atomic16->ls_invalid))
-							{
-								// Conflicting loads with stores in more than one code path
-								break_putllc16(33, atomic16->discard());
-								existing.active = false;
-								existing.ls_invalid = true;
-							}
-
-							if (existing.active && !existing.ls_access && atomic16->ls_access)
-							{
-								// Propagate LS access
-								existing.ls = atomic16->ls;
-								existing.reg = atomic16->reg;
-								existing.reg2 = atomic16->reg2;
-								existing.ls_offs = atomic16->ls_offs;
-							}
-
-							existing.ls_write |= atomic16->ls_write;
-							existing.ls_invalid |= atomic16->ls_invalid;
-							existing.ls_access |= atomic16->ls_access;
-							existing.mem_count = std::max<u32>(existing.mem_count, atomic16->mem_count);
-							existing.select_16_or_0_at_runtime |= atomic16->select_16_or_0_at_runtime;
-						}
-
-						atomic16->discard();
-					}
-					else if (!atomic16->get_rdatomic)
-					{
-						atomic16->get_rdatomic = true;
-
-						// Go above and beyond and also set the constant for it
-						set_const_value(op.rt, MFC_GETLLAR_SUCCESS);
-						invalidate = false;
-					}
-				}
-
-				break;
-			}
-			// Let's be safe here and no not allow multi-threaded communications
-			case SPU_WrOutMbox:
-			case SPU_WrOutIntrMbox:
-			case SPU_RdSigNotify1:
-			case SPU_RdSigNotify2:
-			case SPU_RdInMbox:
-			//case SPU_RdEventStat:
-			{
-				if (is_read)
-				{
-					break_putllc16(28, atomic16->discard());
-				}
-				else
-				{
-					break_putllc16(29, atomic16->discard());
-				}
-
-				if (!is_pattern_match || is_read)
-				{
-					//
-				}
-				else if (!rchcnt_loop->active && it == rchcnt_loop_all.end())
-				{
-					rchcnt_loop->read_pc = pos;
-					rchcnt_loop->channel = op.ra;
-					rchcnt_loop->active = true;
-					unconst(op.rt, pos);
-					rchcnt_loop->ch_state = vregs[op.rt];
-					invalidate = false;
-				}
-				else if (rchcnt_loop->active)
-				{
-					// Success
-					rchcnt_loop->active = false;
-
-					if (it == rchcnt_loop_all.end())
-					{
-						rchcnt_loop_all.emplace(pos, *rchcnt_loop);
-					}
-				}
-
-				break;
-			}
-			default:
-			{
-				break;
-			}
-			}
-
-			if (invalidate)
-			{
-				unconst(op.rt, pos);
-			}
-
-			break;
-		}
-		case spu_itype::STQR:
-		case spu_itype::LQR:
-		{
-			const bool is_store = type == spu_itype::STQR;
-
-			if (atomic16->active)
-			{
-				atomic16->mem_count++;
-
-				// Do not clear lower 16 bytes addressing because the program can move on 4-byte basis
-				const u32 offs = spu_branch_target(pos - result.lower_bound, op.si16);
-
-				if (atomic16->lsa.is_const() && [&]()
-				{
-					bool hack = false;
-
-					if (offs % 16 == 0 && (pos - result.lower_bound + op.si16 * 4) == offs)
-					{
-						const u32 reservation_bound = (atomic16->lsa.value | 127);
-						const u32 min_offs = offs;
-
-						// Hack: assume there is no overflow in relative instruction offset
-						// Thus, use instruction position + offset as a lower bound for reservation access
-						if (min_offs > reservation_bound)
-						{
-							spu_log.success("STQR/LQR Atomic Loop Hack: abs_pos=0x%x, abs=0x%x, i16*4=0x%x, ls_bound=0x%x", offs, pos + op.si16 * 4, op.si16 * 4, reservation_bound);
-							hack = true;
-						}
-					}
-
-					return hack;
-				}())
-				{
-					// Ignore memory access in this case
-				}
-				else if (atomic16->ls_invalid && is_store)
-				{
-					break_putllc16(35, atomic16->set_invalid_ls(is_store));
-				}
-				else if (atomic16->ls_access && atomic16->ls != start_program_count)
-				{
-					break_putllc16(7, atomic16->set_invalid_ls(is_store));
-				}
-				else if (atomic16->ls_access && offs != atomic16->ls_offs)
-				{
-					if (atomic16->ls_offs.compare_with_mask_indifference(offs, SPU_LS_MASK_1))
-					{
-						atomic16->ls_write |= is_store;
-					}
-					else
-					{
-						// Sad
-						break_putllc16(8, atomic16->set_invalid_ls(is_store));
-					}
-				}
-				else
-				{
-					atomic16->ls = start_program_count;
-					atomic16->ls_offs = reg_state_t::from_value(offs);
-					atomic16->ls_pc_rel = true;
-					atomic16->ls_write |= is_store;
-					atomic16->ls_access = true;
-				}
-
-				// atomic16->ls_reg[offs % 128 / 16] = start_program_count;
-				// atomic16->ls_offs[offs % 128 / 16] = offs;
-			}
-
-			if (is_store)
-			{
-				break;
-			}
-
-			// Unconst
-			unconst(op.rt, pos);
-			break;
-		}
-
-		case spu_itype::STQX:
-		case spu_itype::LQX:
-		{
-			const bool is_store = type == spu_itype::STQX;
-
-			if (atomic16->active)
-			{
-				atomic16->mem_count++;
-
-				auto ra = get_reg(op.ra);
-				ra.value &= SPU_LS_MASK_1;
-				auto rb = get_reg(op.rb);
-				rb.value &= SPU_LS_MASK_1;
-
-				const u32 const_flags = u32{ra.is_const()} + u32{rb.is_const()};
-
-				switch (const_flags)
-				{
-				case 2:
-				{
-					auto add_res = ra;
-					add_res.value += rb.value;
-					add_res.value &= SPU_LS_MASK_16;
-					add_res.tag = umax;
-
-					if (atomic16->lsa.unequal_with_mask_indifference(add_res, SPU_LS_MASK_128))
-					{
-						// Unrelated, ignore
-					}
-					else if (atomic16->ls_invalid && is_store)
-					{
-						break_putllc16(20, atomic16->set_invalid_ls(is_store));
-					}
-					else if (atomic16->ls_access && add_res != atomic16->ls)
-					{
-						if (atomic16->ls.unequal_with_mask_indifference(add_res, SPU_LS_MASK_128) && atomic16->ls_offs == 0)
-						{
-							// Ok
-						}
-						else if (atomic16->ls_pc_rel)
-						{
-							break_putllc16(8, atomic16->set_invalid_ls(is_store));
-						}
-						else
-						{
-							// Sad
-							break_putllc16(9, atomic16->set_invalid_ls(is_store));
-						}
-					}
-					else
-					{
-						atomic16->ls = reg_state_t::from_value(add_res.value);
-						atomic16->ls_offs = reg_state_t::from_value(0);
-						atomic16->ls_pc_rel = false;
-						atomic16->ls_write |= is_store;
-						atomic16->ls_access = true;
-					}
-
-					break;
-				}
-				case 1:
-				{
-					const auto& state = ra.is_const() ? rb : ra;
-					const auto& _lsa = atomic16->lsa;
-					const u32 offs = (ra.is_const() ? ra.value : rb.value) & SPU_LS_MASK_1;
-					const u32 abs_diff = calculate_absolute_ls_difference(offs, 0);
-
-					if ((_lsa.unequal_with_mask_indifference(state, SPU_LS_MASK_128) && offs == 0) ||
-						(_lsa.compare_with_mask_indifference(state, SPU_LS_MASK_1) && abs_diff >= 128u) ||
-						(_lsa.compare_with_mask_indifference(state, SPU_LS_MASK_128) && abs_diff >= 256u)
-						)
-					{
-						// We already know it's an unrelated load/store
-						// The reason for SPU_LS_SIZE - 128 check is that in case LSA is not aligned, it detects the possible wraparound
-					}
-					else if (atomic16->ls_invalid && is_store)
-					{
-						break_putllc16(23, atomic16->set_invalid_ls(is_store));
-					}
-					else if (atomic16->ls_access && atomic16->ls != state)
-					{
-						if (atomic16->ls.unequal_with_mask_indifference(state, SPU_LS_MASK_128) && offs == 0)
-						{
-							// Ok
-						}
-						else if (atomic16->ls_pc_rel)
-						{
-							break_putllc16(36, atomic16->set_invalid_ls(is_store));
-						}
-						else
-						{
-							// Sad
-							break_putllc16(11, atomic16->set_invalid_ls(is_store));
-						}
-					}
-					else if (atomic16->ls_access)
-					{
-						ensure(!atomic16->ls.is_const());
-
-						if (atomic16->ls_offs.compare_with_mask_indifference(offs, SPU_LS_MASK_1))
-						{
-							// Ok
-							atomic16->ls_write |= is_store;
-						}
-						else if (atomic16->ls_offs.is_const() && atomic16->ls_offs.value / 16 == offs / 16 && state.get_known_zeroes() % 16 >= std::max<u32>(offs % 16, atomic16->ls_offs.value % 16))
-						{
-							// For special case observed in games (offset cannot cause the address to roll over the next 16 bytes)
-							atomic16->ls_write |= is_store;
-						}
-						else
-						{
-							break_putllc16(12, atomic16->set_invalid_ls(is_store));
-						}
-					}
-					else
-					{
-						atomic16->ls = state;
-						atomic16->ls_offs = reg_state_t::from_value(offs);
-						atomic16->ls_pc_rel = false;
-						atomic16->ls_write |= is_store;
-						atomic16->ls_access = true;
-					}
-
-					break;
-				}
-				case 0:
-				{
-					const bool is_ra_first = atomic16->ls_access ? ra == atomic16->ls : op.ra <= op.rb;
-
-					const auto& state1 = is_ra_first ? ra : rb;
-					const auto& state2 = is_ra_first ? rb : ra;
-
-					if (atomic16->ls_access && (atomic16->ls != state1 || atomic16->ls_offs != state2))
-					{
-						if (atomic16->ls_pc_rel)
-						{
-							break_putllc16(32, atomic16->set_invalid_ls(is_store));
-						}
-						else
-						{
-							// Sad
-							break_putllc16(13, atomic16->set_invalid_ls(is_store));
-						}
-					}
-					else
-					{
-						atomic16->ls = state1;
-						atomic16->ls_offs = state2;
-						atomic16->ls_pc_rel = false;
-						atomic16->ls_write |= is_store;
-						atomic16->ls_access = true;
-					}
-
-					break;
-				}
-				default: fmt::throw_exception("Unreachable!");
-				}
-			}
-
-			if (is_store)
-			{
-				break;
-			}
-
-			// Unconst
-			unconst(op.rt, pos);
-			break;
-		}
-		case spu_itype::STQA:
-		case spu_itype::LQA:
-		{
-			const bool is_store = type == spu_itype::STQA;
-
-			if (atomic16->active)
-			{
-				atomic16->mem_count++;
-
-				const reg_state_t ca = reg_state_t::from_value(spu_ls_target(0, op.i16));
-
-				if (atomic16->lsa.unequal_with_mask_indifference(ca, SPU_LS_MASK_128))
-				{
-					// We already know it's an unrelated load/store
-				}
-				else if (atomic16->ls_invalid && is_store)
-				{
-					break_putllc16(37, atomic16->set_invalid_ls(is_store));
-				}
-				else if (atomic16->ls_access && ca != atomic16->ls)
-				{
-					if (atomic16->ls.unequal_with_mask_indifference(ca, SPU_LS_MASK_128) && atomic16->ls_offs == 0)
-					{
-						// Ok
-					}
-					else if (atomic16->ls_pc_rel)
-					{
-						break_putllc16(14, atomic16->set_invalid_ls(is_store));
-					}
-					else
-					{
-						// Sad
-						break_putllc16(15, atomic16->set_invalid_ls(is_store));
-					}
-				}
-				else
-				{
-					atomic16->ls = ca;
-					atomic16->ls_offs = reg_state_t::from_value(0);
-					atomic16->ls_pc_rel = false;
-					atomic16->ls_write |= is_store;
-					atomic16->ls_access = true;
-				}
-			}
-
-			if (is_store)
-			{
-				break;
-			}
-
-			// Unconst
-			unconst(op.rt, pos);
-			break;
-		}
-
-		case spu_itype::STQD:
-		case spu_itype::LQD:
-		{
-			const bool is_store = type == spu_itype::STQD;
-
-			if (atomic16->active)
-			{
-				atomic16->mem_count++;
-
-				auto ra = get_reg(op.ra);
-				const auto& _lsa = atomic16->lsa;
-
-				ra.value = ra.is_const() ? spu_ls_target(ra.value, op.si10 * 4) : 0;
-				const u32 offs = ra.is_const() ? 0 : spu_ls_target(0, op.si10 * 4);
-				const u32 abs_diff = calculate_absolute_ls_difference(offs, 0);
-
-				if ((_lsa.unequal_with_mask_indifference(ra, SPU_LS_MASK_128) && offs == 0) ||
-					(_lsa.compare_with_mask_indifference(ra, SPU_LS_MASK_1) && abs_diff >= 128u) ||
-					(_lsa.compare_with_mask_indifference(ra, SPU_LS_MASK_128) && abs_diff >= 256u)
-					)
-				{
-					// We already know it's an unrelated load/store
-					// The reason for SPU_LS_SIZE - 128 check is that in case LSA is not aligned, it detects the possible wraparound
-				}
-				else if (atomic16->ls_invalid && is_store)
-				{
-					break_putllc16(34, atomic16->set_invalid_ls(is_store));
-				}
-				else if (atomic16->ls_access && atomic16->ls != ra)
-				{
-					if (atomic16->ls.unequal_with_mask_indifference(ra, SPU_LS_MASK_128) && (offs == 0 && atomic16->ls_offs == 0))
-					{
-						// Ok
-					}
-					else if (atomic16->ls_pc_rel)
-					{
-						break_putllc16(16, atomic16->set_invalid_ls(is_store));
-					}
-					else
-					{
-						// Sad
-						break_putllc16(17, atomic16->set_invalid_ls(is_store));
-					}
-				}
-				else if (atomic16->ls_access)
-				{
-					if (atomic16->ls_offs.compare_with_mask_indifference(offs, SPU_LS_MASK_1))
-					{
-						atomic16->ls_write |= is_store;
-					}
-					else if (atomic16->ls_offs.is_const() && atomic16->ls_offs.value / 16 == offs / 16 && ra.get_known_zeroes() % 16 >= std::max<u32>(offs % 16, atomic16->ls_offs.value % 16))
-					{
-						// For special case observed in games (offset cannot cause the address to roll over the next 16 bytes)
-						atomic16->ls_write |= is_store;
-					}
-					else
-					{
-						break_putllc16(18, atomic16->set_invalid_ls(is_store));
-					}
-				}
-				else
-				{
-					atomic16->ls = ra;
-					atomic16->ls_offs = reg_state_t::from_value(offs);
-					atomic16->ls_pc_rel = false;
-					atomic16->ls_write |= is_store;
-					atomic16->ls_access = true;
-				}
-			}
-
-			if (type == spu_itype::STQD)
-			{
-				break;
-			}
-
-			// Unconst
-			unconst(op.rt, pos);
-			break;
-		}
-
-		case spu_itype::HBR:
-		{
-			hbr_loc = spu_branch_target(pos, op.roh << 7 | op.rt);
-			const auto [af, av, at, ao, az, apc, ainst] = get_reg(op.ra);
-			hbr_tg  = af & vf::is_const && !op.c ? av & 0x3fffc : -1;
-			break;
-		}
-
-		case spu_itype::HBRA:
-		{
-			hbr_loc = spu_branch_target(pos, op.r0h << 7 | op.rt);
-			hbr_tg  = spu_branch_target(0x0, op.i16);
-			break;
-		}
-
-		case spu_itype::HBRR:
-		{
-			hbr_loc = spu_branch_target(pos, op.r0h << 7 | op.rt);
-			hbr_tg  = spu_branch_target(pos, op.i16);
-			break;
-		}
-
-		case spu_itype::IL:
-		{
-			set_const_value(op.rt, op.si16);
-			break;
-		}
-		case spu_itype::ILA:
-		{
-			set_const_value(op.rt, op.i18);
-			break;
-		}
-		case spu_itype::ILH:
-		{
-			set_const_value(op.rt, op.i16 << 16 | op.i16);
-			break;
-		}
-		case spu_itype::ILHU:
-		{
-			set_const_value(op.rt, op.i16 << 16);
-			break;
-		}
-		case spu_itype::IOHL:
-		{
-			const auto rt = get_reg(op.rt);
-			inherit_const_mask_value(op.rt, rt, op.i16, 0);
-			break;
-		}
-		case spu_itype::ORI:
-		{
-			if (!op.si10)
-			{
-				move_reg(op.rt, op.ra);
-				break;
-			}
-
-			const auto ra = get_reg(op.ra);
-			inherit_const_mask_value(op.rt, ra, op.si10, 0);
-			break;
-		}
-		case spu_itype::OR:
-		{
-			if (op.ra == op.rb)
-			{
-				move_reg(op.rt, op.ra);
-				break;
-			}
-
-			const auto ra = get_reg(op.ra);
-			const auto rb = get_reg(op.rb);
-
-			const auto [af, av, at, ao, az, apc, ainst] = ra;
-			const auto [bf, bv, bt, bo, bz, bpc, binst] = rb;
-
-			inherit_const_value(op.rt, ra, rb, av | bv, pos);
-			break;
-		}
-		case spu_itype::XORI:
-		{
-			if (!op.si10)
-			{
-				move_reg(op.rt, op.ra);
-				break;
-			}
-
-			const auto ra = get_reg(op.ra);
-
-			const auto [af, av, at, ao, az, apc, ainst] = ra;
-
-			inherit_const_value(op.rt, ra, ra, av ^ op.si10, pos);
-			break;
-		}
-		case spu_itype::XOR:
-		{
-			if (op.ra == op.rb)
-			{
-				set_const_value(op.rt, 0);
-				break;
-			}
-
-			const auto ra = get_reg(op.ra);
-			const auto rb = get_reg(op.rb);
-
-			const auto [af, av, at, ao, az, apc, ainst] = ra;
-			const auto [bf, bv, bt, bo, bz, bpc, binst] = rb;
-
-			inherit_const_value(op.rt, ra, rb, bv ^ av, pos);
-			break;
-		}
-		case spu_itype::NOR:
-		{
-			const auto ra = get_reg(op.ra);
-			const auto rb = get_reg(op.rb);
-
-			const auto [af, av, at, ao, az, apc, ainst] = ra;
-			const auto [bf, bv, bt, bo, bz, bpc, binst] = rb;
-
-			inherit_const_value(op.rt, ra, rb, ~(bv | av), pos);
-			break;
-		}
-		case spu_itype::ANDI:
-		{
-			const auto ra = get_reg(op.ra);
-			inherit_const_mask_value(op.rt, ra, 0, ~op.si10);
-			break;
-		}
-		case spu_itype::AND:
-		{
-			if (op.ra == op.rb)
-			{
-				move_reg(op.rt, op.ra);
-				break;
-			}
-
-			const auto ra = get_reg(op.ra);
-			const auto rb = get_reg(op.rb);
-
-			const auto [af, av, at, ao, az, apc, ainst] = ra;
-			const auto [bf, bv, bt, bo, bz, bpc, binst] = rb;
-
-			inherit_const_value(op.rt, ra, rb, bv & av, pos);
-			break;
-		}
-		case spu_itype::AI:
-		{
-			if (!op.si10)
-			{
-				move_reg(op.rt, op.ra);
-				break;
-			}
-
-			const auto ra = get_reg(op.ra);
-			const auto [af, av, at, ao, az, apc, ainst] = ra;
-
-			inherit_const_value(op.rt, ra, ra, av + op.si10, pos);
-
-			if (u32 mask = ra.get_known_zeroes() & ~op.si10; mask & 1)
-			{
-				// Added zeroes are always zeroes which comes in handy later
-				inherit_const_mask_value(op.rt, vregs[op.rt], 0, (1u << std::countr_one(mask)) - 1);
-			}
-
-			break;
-		}
-		case spu_itype::A:
-		{
-			const auto ra = get_reg(op.ra);
-			const auto rb = get_reg(op.rb);
-
-			const auto [af, av, at, ao, az, apc, ainst] = ra;
-			const auto [bf, bv, bt, bo, bz, bpc, binst] = rb;
-
-			inherit_const_value(op.rt, ra, rb, bv + av, pos);
-
-			if (u32 mask = ra.get_known_zeroes() & rb.get_known_zeroes(); mask & 1)
-			{
-				// Added zeroes are always zeroes which comes in handy later
-				inherit_const_mask_value(op.rt, vregs[op.rt], 0, (1u << std::countr_one(mask)) - 1);
-			}
-
-			break;
-		}
-		case spu_itype::SFI:
-		{
-			const auto ra = get_reg(op.ra);
-			const auto [af, av, at, ao, az, apc, ainst] = get_reg(op.ra);
-
-			inherit_const_value(op.rt, ra, ra, op.si10 - av, pos);
-			break;
-		}
-		case spu_itype::SF:
-		{
-			const auto ra = get_reg(op.ra);
-			const auto rb = get_reg(op.rb);
-
-			const auto [af, av, at, ao, az, apc, ainst] = ra;
-			const auto [bf, bv, bt, bo, bz, bpc, binst] = rb;
-
-			inherit_const_value(op.rt, ra, rb, bv - av, pos);
-
-			if (u32 mask = ra.get_known_zeroes() & rb.get_known_zeroes(); mask & 1)
-			{
-				// Subtracted zeroes are always zeroes which comes in handy later
-				inherit_const_mask_value(op.rt, vregs[op.rt], 0, (1u << std::countr_one(mask)) - 1);
-			}
-
-			break;
-		}
-		case spu_itype::FSMBI:
-		{
-			const u32 mask = (op.i16 >> 12);
-
-			const u32 value = (mask & 1 ? 0xff : 0) |
-				(mask & 2 ? 0xff00 : 0) |
-				(mask & 4 ? 0xff0000 : 0) |
-				(mask & 8 ? 0xff000000u : 0);
-
-			set_const_value(op.rt, value);
-			break;
-		}
-		case spu_itype::ROTMI:
-		{
-			if ((0 - op.i7) & 0x20)
-			{
-				set_const_value(op.rt, 0);
-				break;
-			}
-
-			if (!op.i7)
-			{
-				move_reg(op.rt, op.ra);
-				break;
-			}
-
-			const auto ra = get_reg(op.ra);
-			const auto [af, av, at, ao, az, apc, ainst] = get_reg(op.ra);
-
-			inherit_const_value(op.rt, ra, ra, av >> ((0 - op.i7) & 0x1f), pos);
-			break;
-		}
-		case spu_itype::SHLI:
-		{
-			if (op.i7 & 0x20)
-			{
-				set_const_value(op.rt, 0);
-				break;
-			}
-
-			if (!op.i7)
-			{
-				move_reg(op.rt, op.ra);
-				break;
-			}
-
-			const auto ra = get_reg(op.ra);
-			const auto [af, av, at, ao, az, apc, ainst] = ra;
-
-			inherit_const_value(op.rt, ra, ra, av << (op.i7 & 0x1f), pos);
-			break;
-		}
-		case spu_itype::SELB:
-		{
-			const auto ra = get_reg(op.ra);
-			const auto rb = get_reg(op.rb);
-
-			// Ignore RC, perform a value merge which also respect bitwise information
-			vregs[op.rt4] = ra.merge(rb, pos);
-			break;
-		}
-		case spu_itype::CEQI:
-		{
-			const auto ra = get_reg(op.ra);
-			const auto [af, av, at, ao, az, apc, ainst] = ra;
-
-			inherit_const_value(op.rt, ra, ra, av == op.si10 + 0u, pos);
-
-			if (rchcnt_loop->active)
-			{
-				if (ra.is_instruction && ra.origin == rchcnt_loop->ch_state.origin)
-				{
-					if (op.si10 != 0 && op.si10 != 1)
-					{
-						break_channel_pattern(55, rchcnt_loop->discard());
-						break;
-					}
-
-					rchcnt_loop->ch_product = vregs[op.rt];
-					rchcnt_loop->product_test_negate = op.si10 == 1;
-				}
-			}
-
-			break;
-		}
-		case spu_itype::SHLQBYI:
-		{
-			if (op.i7 & 0x10)
-			{
-				set_const_value(op.rt, 0);
-				break;
-			}
-
-			if (!op.i7)
-			{
-				move_reg(op.rt, op.ra);
-				break;
-			}
-
-			[[fallthrough]];
-		}
-		default:
-		{
-			// Make unknown value
-			if (!(type & spu_itype::zregmod))
-			{
-				const u32 op_rt = type & spu_itype::_quadrop ? +op.rt4 : +op.rt;
-
-				u32 ra = s_reg_max, rb = s_reg_max, rc = s_reg_max;
-
-				if (m_use_ra.test(pos / 4))
-				{
-					ra = op.ra;
-				}
-
-				if (m_use_rb.test(pos / 4))
-				{
-					rb = op.rb;
-				}
-
-				if (type & spu_itype::_quadrop && m_use_rc.test(pos / 4))
-				{
-					rc = op.rc;
-				}
-
-				u32 reg_pos = SPU_LS_SIZE;
-
-				for (u32 reg : {ra, rb, rc})
-				{
-					if (reg != s_reg_max)
-					{
-						if (reg_pos == SPU_LS_SIZE)
-						{
-							reg = vregs[reg].origin;
-						}
-						else if (reg_pos != vregs[reg].origin)
-						{
-							const u32 block_start = reg_state_it[wi].pc;
-
-							// if (vregs[reg].origin >= block_start && vregs[reg].origin <= pos)
-							// {
-							// 	reg_pos = std::max<u32>(vregs[reg].origin, reg_pos);
-							// }
-							reg_pos = block_start;
-							break;
-						}
-					}
-				}
-
-				unconst(op_rt, reg_pos == SPU_LS_SIZE ? pos : reg_pos);
-
-				if (rchcnt_loop->active)
-				{
-					if (std::find(rchcnt_loop->origins.begin(), rchcnt_loop->origins.end(), vregs[op_rt].origin) == rchcnt_loop->origins.end())
-					{
-						rchcnt_loop->origins.push_back(vregs[op_rt].origin);
-					}
-				}
-			}
-
-			break;
-		}
-		}
-
-		if (m_targets.count(pos))
-		{
-			for (u32 next_target : ::at32(m_targets, pos))
-			{
-				add_block(next_target);
-			}
-
-			next_block();
-		}
-	}
-
-	std::string func_hash;
-	if (!result.data.empty())
-	{
-		sha1_context ctx;
-		u8 output[20]{};
-
-		sha1_starts(&ctx);
-		sha1_update(&ctx, reinterpret_cast<const u8*>(result.data.data()), result.data.size() * 4);
-		sha1_finish(&ctx, output);
-		fmt::append(func_hash, "%s", fmt::base57(output));
-	}
-
-	for (const auto& [pc_commited, pattern] : atomic16_all)
-	{
-		if (!pattern.active)
-		{
-			continue;
-		}
-
-		if (getllar_starts.contains(pattern.lsa_pc) && getllar_starts[pattern.lsa_pc])
-		{
-			continue;
-		}
-
-		auto& stats = g_fxo->get<putllc16_statistics_t>();
-		had_putllc_evaluation = true;
-
-		if (!pattern.ls_write)
-		{
-			spu_log.success("PUTLLC0 Pattern Detected! (put_pc=0x%x, %s) (putllc0=%d, putllc16+0=%d, all=%d)", pattern.put_pc, func_hash, ++stats.nowrite, ++stats.single, +stats.all);
-			add_pattern(false, inst_attr::putllc0, pattern.put_pc - lsa);
-			continue;
-		}
-
-		union putllc16_info
-		{
-			u32 data;
-			bf_t<u32, 30, 2> type;
-			bf_t<u32, 29, 1> runtime16_select;
-			bf_t<u32, 28, 1> no_notify;
-			bf_t<u32, 18, 8> reg;
-			bf_t<u32, 0, 18> off18;
-			bf_t<u32, 0, 8> reg2;
-		} value{};
-
-		enum : u32
-		{
-			v_const = 0,
-			v_relative = 1,
-			v_reg_offs = 2,
-			v_reg2 = 3,
-		};
-
-		for (auto it = infos.lower_bound(utils::sub_saturate<u32>(pattern.put_pc, 512)); it != infos.end() && it->first < pattern.put_pc + 512; it++)
-		{
-			for (auto& state : it->second->end_reg_state)
-			{
-				if (state.is_const() && (state.value & -0x20) == (CELL_SYNC_ERROR_ALIGN & -0x20))
-				{
-					// Do not notify if it is a cellSync function
-					value.no_notify = 1;
-					spu_log.success("Detected cellSync function at 0x%x, disabling reservation notification.", pattern.put_pc);
-					break;
-				}
-			}
-
-			if (value.no_notify)
-			{
-				break;
-			}
-		}
-
-		value.runtime16_select = pattern.select_16_or_0_at_runtime;
-		value.reg = s_reg_max;
-
-		if (pattern.ls.is_const())
-		{
-			ensure(pattern.reg == s_reg_max && pattern.reg2 == s_reg_max && pattern.ls_offs.is_const(), "Unexpected register usage");
-			value.type = v_const;
-			value.off18 = pattern.ls.value & SPU_LS_MASK_1;
-		}
-		else if (pattern.ls == start_program_count)
-		{
-			ensure(pattern.ls_offs.is_const(), "Unexpected register2 usage");
-			value.type = v_relative;
-			value.off18 = pattern.ls_offs.value & SPU_LS_MASK_1;
-		}
-		else if (pattern.ls_offs.is_const())
-		{
-			ensure(pattern.reg != s_reg_max, "Not found register usage");
-			value.type = v_reg_offs;
-			value.reg = pattern.reg;
-			value.off18 = pattern.ls_offs.value;
-		}
-		else
-		{
-			ensure(pattern.reg != s_reg_max, "Not found register usage");
-			ensure(pattern.reg2 != s_reg_max, "Not found register2 usage");
-			value.type = v_reg2;
-			value.reg = pattern.reg;
-			value.reg2 = pattern.reg2;
-		}
-
-		if (g_cfg.core.spu_accurate_reservations)
-		{
-			// Because enabling it is a hack, as it turns out
-			continue;
-		}
-
-		add_pattern(false, inst_attr::putllc16, pattern.put_pc - result.entry_point, value.data);
-
-		spu_log.success("PUTLLC16 Pattern Detected! (mem_count=%d, put_pc=0x%x, pc_rel=%d, offset=0x%x, const=%u, two_regs=%d, reg=%u, runtime=%d, 0x%x-%s) (putllc0=%d, putllc16+0=%d, all=%d)"
-			, pattern.mem_count, pattern.put_pc, value.type == v_relative, value.off18, value.type == v_const, value.type == v_reg2, value.reg, value.runtime16_select, entry_point, func_hash, +stats.nowrite, ++stats.single, +stats.all);
-	}
-
-	for (const auto& [read_pc, pattern] : rchcnt_loop_all)
-	{
-		if (pattern.failed || pattern.read_pc == SPU_LS_SIZE)
-		{
-			continue;
-		}
-
-		if (pattern.active)
-		{
-			spu_log.error("Channel loop error! (get_pc=0x%x,  0x%x-%s)", read_pc, entry_point, func_hash);
-			continue;
-		}
-
-		if (inst_attr attr = m_inst_attrs[(read_pc - entry_point) / 4]; attr == inst_attr::none)
-		{
-			add_pattern(false, inst_attr::rchcnt_loop, read_pc - result.entry_point);
-
-			spu_log.error("Channel Loop Pattern Detected! Report to developers! (read_pc=0x%x, branch_pc=0x%x, branch_target=0x%x, 0x%x-%s)", read_pc, pattern.branch_pc, pattern.branch_target, entry_point, func_hash);
-		}
-	}
-
-	if (likely_putllc_loop && !had_putllc_evaluation)
-	{
-		spu_log.notice("Likely missed PUTLLC16 patterns. (entry=0x%x)", entry_point);
-	}
-
-	if (result.data.empty())
-	{
-		// Blocks starting from 0x0 or invalid instruction won't be compiled, may need special interpreter fallback
-	}
-
-	return result;
-}
-
-void spu_recompiler_base::dump(const spu_program& result, std::string& out)
-{
-	SPUDisAsm dis_asm(cpu_disasm_mode::dump, reinterpret_cast<const u8*>(result.data.data()), result.lower_bound);
-
-	std::string hash;
-
-	if (!result.data.empty())
-	{
-		sha1_context ctx;
-		u8 output[20];
-
-		sha1_starts(&ctx);
-		sha1_update(&ctx, reinterpret_cast<const u8*>(result.data.data()), result.data.size() * 4);
-		sha1_finish(&ctx, output);
-		fmt::append(hash, "%s", fmt::base57(output));
-	}
-	else
-	{
-		hash = "N/A";
-	}
-
-	fmt::append(out, "========== SPU BLOCK 0x%05x (size %u, %s) ==========\n\n", result.entry_point, result.data.size(), hash);
-
-	for (auto& bb : m_bbs)
-	{
-		if (m_block_info[bb.first / 4])
-		{
-			fmt::append(out, "A: [0x%05x] %s\n", bb.first, m_entry_info[bb.first / 4] ? (m_ret_info[bb.first / 4] ? "Chunk" : "Entry") : "Block");
-
-			fmt::append(out, "\t F: 0x%05x\n", bb.second.func);
-
-			for (u32 pred : bb.second.preds)
-			{
-				fmt::append(out, "\t <- 0x%05x\n", pred);
-			}
-		}
-		else
-		{
-			fmt::append(out, "A: [0x%05x] ?\n", bb.first);
-		}
-
-		out += "\n";
-
-		for (u32 pos = bb.first, end = bb.first + bb.second.size * 4; pos < end; pos += 4)
-		{
-			dis_asm.disasm(pos);
-
-			if (!dis_asm.last_opcode.ends_with('\n'))
-			{
-				dis_asm.last_opcode += '\n';
-			}
-
-			fmt::append(out, ">%s", dis_asm.last_opcode);
-		}
-
-		out += '\n';
-
-		if (m_block_info[bb.first / 4])
-		{
-			for (u32 target : bb.second.targets)
-			{
-				fmt::append(out, "\t-> 0x%05x%s\n", target, m_bbs.count(target) ? "" : " (null)");
-			}
-		}
-
-		out += '\n';
-	}
-
-	for (auto& f : m_funcs)
-	{
-		fmt::append(out, "F: [0x%05x]%s\n", f.first, f.second.good ? " (good)" : " (bad)");
-
-		fmt::append(out, "\tN: 0x%05x\n", f.second.size * 4 + f.first);
-
-		for (u32 call : f.second.calls)
-		{
-			fmt::append(out, "\t>> 0x%05x%s\n", call, m_funcs.count(call) ? "" : " (null)");
-		}
-	}
-
-	out += '\n';
-}
-
-struct spu_llvm_worker
-{
-	lf_queue<std::pair<u64, const spu_program*>> registered;
-
-	void operator()()
-	{
-		// SPU LLVM Recompiler instance
-		std::unique_ptr<spu_recompiler_base> compiler;
-
-		// Fake LS
-		std::vector<be_t<u32>> ls;
-
-		bool set_relax_flag = false;
-
-		for (auto slice = registered.pop_all();; [&]
-		{
-			if (slice)
-			{
-				slice.pop_front();
-			}
-
-			if (slice || thread_ctrl::state() == thread_state::aborting)
-			{
-				return;
-			}
-
-			if (set_relax_flag)
-			{
-				spu_thread::g_spu_work_count--;
-				set_relax_flag = false;
-			}
-
-			thread_ctrl::wait_on(registered.get_wait_atomic(), 0);
-			slice = registered.pop_all();
-		}())
-		{
-			auto* prog = slice.get();
-
-			if (thread_ctrl::state() == thread_state::aborting)
-			{
-				break;
-			}
-
-			if (!prog)
-			{
-				continue;
-			}
-
-			if (!prog->second)
-			{
-				break;
-			}
-
-			if (!compiler)
-			{
-				// Postponed initialization
-				compiler = spu_recompiler_base::make_llvm_recompiler();
-				compiler->init();
-
-				ls.resize(SPU_LS_SIZE / sizeof(be_t<u32>));
-			}
-
-			if (!set_relax_flag)
-			{
-				spu_thread::g_spu_work_count++;
-				set_relax_flag = true;
-			}
-
-			const auto& func = *prog->second;
-
-			// Get data start
-			const u32 start = func.lower_bound;
-			const u32 size0 = ::size32(func.data);
-
-			// Initialize LS with function data only
-			for (u32 i = 0, pos = start; i < size0; i++, pos += 4)
-			{
-				ls[pos / 4] = std::bit_cast<be_t<u32>>(func.data[i]);
-			}
-
-			// Call analyser
-			spu_program func2 = compiler->analyse(ls.data(), func.entry_point);
-
-			if (func2 != func)
-			{
-				spu_log.error("[0x%05x] SPU Analyser failed, %u vs %u", func2.entry_point, func2.data.size(), size0);
-			}
-			else if (const auto target = compiler->compile(std::move(func2)))
-			{
-				// Redirect old function (TODO: patch in multiple places)
-				const s64 rel = reinterpret_cast<u64>(target) - prog->first - 5;
-
-				union
-				{
-					u8 bytes[8];
-					u64 result;
-				};
-
-				bytes[0] = 0xe9; // jmp rel32
-				std::memcpy(bytes + 1, &rel, 4);
-				bytes[5] = 0x90;
-				bytes[6] = 0x90;
-				bytes[7] = 0x90;
-
-				atomic_storage<u64>::release(*reinterpret_cast<u64*>(prog->first), result);
-			}
-			else
-			{
-				spu_log.fatal("[0x%05x] Compilation failed.", func.entry_point);
-				break;
-			}
-
-			// Clear fake LS
-			std::memset(ls.data() + start / 4, 0, 4 * (size0 - 1));
-		}
-
-		if (set_relax_flag)
-		{
-			spu_thread::g_spu_work_count--;
-			set_relax_flag = false;
-		}
-	}
-};
-
-// SPU LLVM recompiler thread context
-struct spu_llvm
-{
-	// Workload
-	lf_queue<std::pair<const u64, spu_item*>> registered;
-	atomic_ptr<named_thread_group<spu_llvm_worker>> m_workers;
-
-	spu_llvm()
-	{
-		// Dependency
-		g_fxo->init<spu_cache>();
-	}
-
-	void operator()()
-	{
-		if (g_cfg.core.spu_decoder != spu_decoder_type::llvm)
-		{
-			return;
-		}
-
-		while (!registered && thread_ctrl::state() != thread_state::aborting)
-		{
-			// Wait for the first SPU block before launching any thread
-			thread_ctrl::wait_on(registered.get_wait_atomic(), 0);
-		}
-
-		if (thread_ctrl::state() == thread_state::aborting)
-		{
-			return;
-		}
-
-		// To compile (hash -> item)
-		std::unordered_multimap<u64, spu_item*, value_hash<u64>> enqueued;
-
-		// Mini-profiler (hash -> number of occurrences)
-		std::unordered_map<u64, atomic_t<u64>, value_hash<u64>> samples;
-
-		// For synchronization with profiler thread
-		stx::init_mutex prof_mutex;
-
-		named_thread profiler("SPU LLVM Profiler"sv, [&]()
-		{
-			while (thread_ctrl::state() != thread_state::aborting)
-			{
-				{
-					// Lock if enabled
-					const auto lock = prof_mutex.access();
-
-					if (!lock)
-					{
-						// Wait when the profiler is disabled
-						prof_mutex.wait_for_initialized();
-						continue;
-					}
-
-					// Collect profiling samples
-					idm::select<named_thread<spu_thread>>([&](u32 /*id*/, spu_thread& spu)
-					{
-						const u64 name = atomic_storage<u64>::load(spu.block_hash);
-
-						if (auto state = +spu.state; !::is_paused(state) && !::is_stopped(state) && cpu_flag::wait - state)
-						{
-							const auto found = std::as_const(samples).find(name);
-
-							if (found != std::as_const(samples).end())
-							{
-								const_cast<atomic_t<u64>&>(found->second)++;
-							}
-						}
-					});
-				}
-
-				// Sleep for a short period if enabled
-				thread_ctrl::wait_for(20, false);
-			}
-		});
-
-		u32 worker_count = 1;
-
-		if (uint hc = utils::get_thread_count(); hc >= 12)
-		{
-			worker_count = hc - 12 + 3;
-		}
-		else if (hc >= 6)
-		{
-			worker_count = 2;
-		}
-
-		u32 worker_index = 0;
-		u32 notify_compile_count = 0;
-		u32 compile_pending = 0;
-		std::vector<u8> notify_compile(worker_count);
-
-		m_workers = make_single<named_thread_group<spu_llvm_worker>>("SPUW.", worker_count);
-		auto workers_ptr = m_workers.load();
-		auto& workers = *workers_ptr;
-
-		while (thread_ctrl::state() != thread_state::aborting)
-		{
-			for (const auto& pair : registered.pop_all())
-			{
-				enqueued.emplace(pair);
-
-				// Interrupt and kick profiler thread
-				const auto lock = prof_mutex.init_always([&]{});
-
-				// Register new blocks to collect samples
-				samples.emplace(pair.first, 0);
-			}
-
-			if (enqueued.empty())
-			{
-				// Send pending notifications
-				if (notify_compile_count)
-				{
-					for (usz i = 0; i < worker_count; i++)
-					{
-						if (notify_compile[i])
-						{
-							(workers.begin() + i)->registered.notify();
-						}
-					}
-				}
-
-				// Interrupt profiler thread and put it to sleep
-				static_cast<void>(prof_mutex.reset());
-				thread_ctrl::wait_on(registered.get_wait_atomic(), 0);
-				std::fill(notify_compile.begin(), notify_compile.end(), 0); // Reset notification flags
-				notify_compile_count = 0;
-				compile_pending = 0;
-				continue;
-			}
-
-			// Find the most used enqueued item
-			u64 sample_max = 0;
-			auto found_it  = enqueued.begin();
-
-			for (auto it = enqueued.begin(), end = enqueued.end(); it != end; ++it)
-			{
-				const u64 cur = ::at32(std::as_const(samples), it->first);
-
-				if (cur > sample_max)
-				{
-					sample_max = cur;
-					found_it = it;
-				}
-			}
-
-			// Start compiling
-			const spu_program& func = found_it->second->data;
-
-			// Old function pointer (pre-recompiled)
-			const spu_function_t _old = found_it->second->compiled;
-
-			// Remove item from the queue
-			enqueued.erase(found_it);
-
-			// Prefer using an inactive thread
-			for (usz i = 0; i < worker_count && !!(workers.begin() + (worker_index % worker_count))->registered; i++)
-			{
-				worker_index++;
-			}
-
-			// Push the workload
-			const bool notify = (workers.begin() + (worker_index % worker_count))->registered.template push<false>(reinterpret_cast<u64>(_old), &func);
-
-			if (notify && !notify_compile[worker_index % worker_count])
-			{
-				notify_compile[worker_index % worker_count] = 1;
-				notify_compile_count++;
-			}
-
-			compile_pending++;
-
-			// Notify all before queue runs out if there is considerable excess
-			// Optimized that: if there are many workers, it acts soon
-			// If there are only a few workers, it postpones notifications until there is some more workload
-			if (notify_compile_count && std::min<u32>(7, utils::aligned_div<u32>(worker_count * 2, 3) + 2) <= compile_pending)
-			{
-				for (usz i = 0; i < worker_count; i++)
-				{
-					if (notify_compile[i])
-					{
-						(workers.begin() + i)->registered.notify();
-					}
-				}
-
-				std::fill(notify_compile.begin(), notify_compile.end(), 0); // Reset notification flags
-				notify_compile_count = 0;
-				compile_pending = 0;
-			}
-
-			worker_index++;
-		}
-
-		static_cast<void>(prof_mutex.init_always([&]{ samples.clear(); }));
-
-		m_workers.reset();
-
-		for (u32 i = 0; i < worker_count; i++)
-		{
-			(workers.begin() + i)->operator=(thread_state::aborting);
-		}
-	}
-
-	spu_llvm& operator=(thread_state)
-	{
-		if (const auto workers = m_workers.load())
-		{
-			for (u32 i = 0; i < workers->size(); i++)
-			{
-				(workers->begin() + i)->operator=(thread_state::aborting);
-			}
-		}
-
-		return *this;
-	}
-
-	static constexpr auto thread_name = "SPU LLVM"sv;
-};
-
-using spu_llvm_thread = named_thread<spu_llvm>;
-
-struct spu_fast : public spu_recompiler_base
-{
-	virtual void init() override
-	{
-		if (!m_spurt)
-		{
-			m_spurt = &g_fxo->get<spu_runtime>();
-		}
-	}
-
-	virtual spu_function_t compile(spu_program&& _func) override
-	{
-#ifndef ARCH_X64
-		fmt::throw_exception("Fast LLVM recompiler is unimplemented for architectures other than X86-64");
-#endif
-
-		const auto add_loc = m_spurt->add_empty(std::move(_func));
-
-		if (!add_loc)
-		{
-			return nullptr;
-		}
-
-		if (add_loc->compiled)
-		{
-			return add_loc->compiled;
-		}
-
-		const spu_program& func = add_loc->data;
-
-		if (g_cfg.core.spu_debug && !add_loc->logged.exchange(1))
-		{
-			std::string log;
-			this->dump(func, log);
-			fs::write_file(m_spurt->get_cache_path() + "spu.log", fs::create + fs::write + fs::append, log);
-		}
-
-		// Allocate executable area with necessary size
-		const auto result = jit_runtime::alloc(22 + 1 + 9 + ::size32(func.data) * (16 + 16) + 36 + 47, 16);
-
-		if (!result)
-		{
-			return nullptr;
-		}
-
-		m_pos = func.lower_bound;
-		m_size = ::size32(func.data) * 4;
-
-		{
-			sha1_context ctx;
-			u8 output[20];
-
-			sha1_starts(&ctx);
-			sha1_update(&ctx, reinterpret_cast<const u8*>(func.data.data()), func.data.size() * 4);
-			sha1_finish(&ctx, output);
-
-			be_t<u64> hash_start;
-			std::memcpy(&hash_start, output, sizeof(hash_start));
-			m_hash_start = hash_start;
-		}
-
-		u8* raw = result;
-
-		// 8-byte intruction for patching (long NOP)
-		*raw++ = 0x0f;
-		*raw++ = 0x1f;
-		*raw++ = 0x84;
-		*raw++ = 0;
-		*raw++ = 0;
-		*raw++ = 0;
-		*raw++ = 0;
-		*raw++ = 0;
-
-		// mov rax, m_hash_start
-		*raw++ = 0x48;
-		*raw++ = 0xb8;
-		std::memcpy(raw, &m_hash_start, sizeof(m_hash_start));
-		raw += 8;
-
-		// Update block_hash: mov [r13 + spu_thread::m_block_hash], rax
-		*raw++ = 0x49;
-		*raw++ = 0x89;
-		*raw++ = 0x45;
-		*raw++ = ::narrow<s8>(::offset32(&spu_thread::block_hash));
-
-		// Load PC: mov eax, [r13 + spu_thread::pc]
-		*raw++ = 0x41;
-		*raw++ = 0x8b;
-		*raw++ = 0x45;
-		*raw++ = ::narrow<s8>(::offset32(&spu_thread::pc));
-
-		// Get LS address starting from PC: lea rcx, [rbp + rax]
-		*raw++ = 0x48;
-		*raw++ = 0x8d;
-		*raw++ = 0x4c;
-		*raw++ = 0x05;
-		*raw++ = 0x00;
-
-		// Verification (slow)
-		for (u32 i = 0; i < func.data.size(); i++)
-		{
-			if (!func.data[i])
-			{
-				continue;
-			}
-
-			// cmp dword ptr [rcx + off], opc
-			*raw++ = 0x81;
-			*raw++ = 0xb9;
-			const u32 off = i * 4;
-			const u32 opc = func.data[i];
-			std::memcpy(raw + 0, &off, 4);
-			std::memcpy(raw + 4, &opc, 4);
-			raw += 8;
-
-			// jne tr_dispatch
-			const s64 rel = reinterpret_cast<u64>(spu_runtime::tr_dispatch) - reinterpret_cast<u64>(raw) - 6;
-			*raw++ = 0x0f;
-			*raw++ = 0x85;
-			std::memcpy(raw + 0, &rel, 4);
-			raw += 4;
-		}
-
-		// trap
-		//*raw++ = 0xcc;
-
-		// Secondary prologue: sub rsp,0x28
-		*raw++ = 0x48;
-		*raw++ = 0x83;
-		*raw++ = 0xec;
-		*raw++ = 0x28;
-
-		// Fix args: xchg r13,rbp
-		*raw++ = 0x49;
-		*raw++ = 0x87;
-		*raw++ = 0xed;
-
-		// mov r12d, eax
-		*raw++ = 0x41;
-		*raw++ = 0x89;
-		*raw++ = 0xc4;
-
-		// mov esi, 0x7f0
-		*raw++ = 0xbe;
-		*raw++ = 0xf0;
-		*raw++ = 0x07;
-		*raw++ = 0x00;
-		*raw++ = 0x00;
-
-		// lea rdi, [rbp + spu_thread::gpr]
-		*raw++ = 0x48;
-		*raw++ = 0x8d;
-		*raw++ = 0x7d;
-		*raw++ = ::narrow<s8>(::offset32(&spu_thread::gpr));
-
-		// Save base pc: mov [rbp + spu_thread::base_pc], eax
-		*raw++ = 0x89;
-		*raw++ = 0x45;
-		*raw++ = ::narrow<s8>(::offset32(&spu_thread::base_pc));
-
-		// inc block_counter
-		*raw++ = 0x48;
-		*raw++ = 0xff;
-		*raw++ = 0x85;
-		const u32 blc_off = ::offset32(&spu_thread::block_counter);
-		std::memcpy(raw, &blc_off, 4);
-		raw += 4;
-
-		// lea r14, [local epilogue]
-		*raw++ = 0x4c;
-		*raw++ = 0x8d;
-		*raw++ = 0x35;
-		const u32 epi_off = ::size32(func.data) * 16;
-		std::memcpy(raw, &epi_off, 4);
-		raw += 4;
-
-		// Instructions (each instruction occupies fixed number of bytes)
-		for (u32 i = 0; i < func.data.size(); i++)
-		{
-			const u32 pos = m_pos + i * 4;
-
-			if (!func.data[i])
-			{
-				// Save pc: mov [rbp + spu_thread::pc], r12d
-				*raw++ = 0x44;
-				*raw++ = 0x89;
-				*raw++ = 0x65;
-				*raw++ = ::narrow<s8>(::offset32(&spu_thread::pc));
-
-				// Epilogue: add rsp,0x28
-				*raw++ = 0x48;
-				*raw++ = 0x83;
-				*raw++ = 0xc4;
-				*raw++ = 0x28;
-
-				// ret (TODO)
-				*raw++ = 0xc3;
-				std::memset(raw, 0xcc, 16 - 9);
-				raw += 16 - 9;
-				continue;
-			}
-
-			// Fix endianness
-			const spu_opcode_t op{std::bit_cast<be_t<u32>>(func.data[i])};
-
-			switch (auto type = g_spu_itype.decode(op.opcode))
-			{
-			case spu_itype::BRZ:
-			case spu_itype::BRHZ:
-			case spu_itype::BRNZ:
-			case spu_itype::BRHNZ:
-			{
-				const u32 target = spu_branch_target(pos, op.i16);
-
-				if (0 && target >= m_pos && target < m_pos + m_size)
-				{
-					*raw++ = type == spu_itype::BRHZ || type == spu_itype::BRHNZ ? 0x66 : 0x90;
-					*raw++ = 0x83;
-					*raw++ = 0xbd;
-					const u32 off = ::offset32(&spu_thread::gpr, op.rt) + 12;
-					std::memcpy(raw, &off, 4);
-					raw += 4;
-					*raw++ = 0x00;
-
-					*raw++ = 0x0f;
-					*raw++ = type == spu_itype::BRZ || type == spu_itype::BRHZ ? 0x84 : 0x85;
-					const u32 dif = (target - (pos + 4)) / 4 * 16 + 2;
-					std::memcpy(raw, &dif, 4);
-					raw += 4;
-
-					*raw++ = 0x66;
-					*raw++ = 0x90;
-					break;
-				}
-
-				[[fallthrough]];
-			}
-			default:
-			{
-				// Ballast: mov r15d, pos
-				*raw++ = 0x41;
-				*raw++ = 0xbf;
-				std::memcpy(raw, &pos, 4);
-				raw += 4;
-
-				// mov ebx, opc
-				*raw++ = 0xbb;
-				std::memcpy(raw, &op, 4);
-				raw += 4;
-
-				// call spu_* (specially built interpreter function)
-				const s64 rel = spu_runtime::g_interpreter_table[static_cast<usz>(type)] - reinterpret_cast<u64>(raw) - 5;
-				*raw++ = 0xe8;
-				std::memcpy(raw, &rel, 4);
-				raw += 4;
-				break;
-			}
-			}
-		}
-
-		// Local dispatcher/epilogue: fix stack after branch instruction, then dispatch or return
-
-		// add rsp, 8
-		*raw++ = 0x48;
-		*raw++ = 0x83;
-		*raw++ = 0xc4;
-		*raw++ = 0x08;
-
-		// and rsp, -16
-		*raw++ = 0x48;
-		*raw++ = 0x83;
-		*raw++ = 0xe4;
-		*raw++ = 0xf0;
-
-		// lea rax, [r12 - size]
-		*raw++ = 0x49;
-		*raw++ = 0x8d;
-		*raw++ = 0x84;
-		*raw++ = 0x24;
-		const u32 msz = 0u - m_size;
-		std::memcpy(raw, &msz, 4);
-		raw += 4;
-
-		// sub eax, [rbp + spu_thread::base_pc]
-		*raw++ = 0x2b;
-		*raw++ = 0x45;
-		*raw++ = ::narrow<s8>(::offset32(&spu_thread::base_pc));
-
-		// cmp eax, (0 - size)
-		*raw++ = 0x3d;
-		std::memcpy(raw, &msz, 4);
-		raw += 4;
-
-		// jb epilogue
-		*raw++ = 0x72;
-		*raw++ = +12;
-
-		// movsxd rax, eax
-		*raw++ = 0x48;
-		*raw++ = 0x63;
-		*raw++ = 0xc0;
-
-		// shl rax, 2
-		*raw++ = 0x48;
-		*raw++ = 0xc1;
-		*raw++ = 0xe0;
-		*raw++ = 0x02;
-
-		// add rax, r14
-		*raw++ = 0x4c;
-		*raw++ = 0x01;
-		*raw++ = 0xf0;
-
-		// jmp rax
-		*raw++ = 0xff;
-		*raw++ = 0xe0;
-
-		// Save pc: mov [rbp + spu_thread::pc], r12d
-		*raw++ = 0x44;
-		*raw++ = 0x89;
-		*raw++ = 0x65;
-		*raw++ = ::narrow<s8>(::offset32(&spu_thread::pc));
-
-		// Epilogue: add rsp,0x28 ; ret
-		*raw++ = 0x48;
-		*raw++ = 0x83;
-		*raw++ = 0xc4;
-		*raw++ = 0x28;
-		*raw++ = 0xc3;
-
-		const auto fn = reinterpret_cast<spu_function_t>(result);
-
-		// Install pointer carefully
-		const bool added = !add_loc->compiled && add_loc->compiled.compare_and_swap_test(nullptr, fn);
-
-		// Check hash against allowed bounds
-		const bool inverse_bounds = g_cfg.core.spu_llvm_lower_bound > g_cfg.core.spu_llvm_upper_bound;
-
-		if ((!inverse_bounds && (m_hash_start < g_cfg.core.spu_llvm_lower_bound || m_hash_start > g_cfg.core.spu_llvm_upper_bound)) ||
-			(inverse_bounds && (m_hash_start < g_cfg.core.spu_llvm_lower_bound && m_hash_start > g_cfg.core.spu_llvm_upper_bound)))
-		{
-			spu_log.error("[Debug] Skipped function %s", fmt::base57(be_t<u64>{m_hash_start}));
-		}
-		else if (added)
-		{
-			// Send work to LLVM compiler thread
-			g_fxo->get<spu_llvm_thread>().registered.push(m_hash_start, add_loc);
-		}
-
-		// Rebuild trampoline if necessary
-		if (!m_spurt->rebuild_ubertrampoline(func.data[0]))
-		{
-			return nullptr;
-		}
-
-		if (added)
-		{
-			add_loc->compiled.notify_all();
-		}
-
-		return fn;
-	}
-};
-
-std::unique_ptr<spu_recompiler_base> spu_recompiler_base::make_fast_llvm_recompiler()
-{
-	return std::make_unique<spu_fast>();
-}
-
-std::array<reg_state_t, s_reg_max>& block_reg_info::evaluate_start_state(const std::map<u32, std::unique_ptr<block_reg_info>>& map, bool extensive_evaluation)
-{
-	if (!has_true_state)
-	{
-		std::array<reg_state_t, s_reg_max> temp;
-		std::vector<u32> been_there;
-
-		struct iterator_info
-		{
-			u32 block_pc = SPU_LS_SIZE;
-
-			struct state_t
-			{
-				u32 block_pc = SPU_LS_SIZE;
-				std::array<reg_state_t, s_reg_max> reg_state;
-				bool disconnected = false;
-				bool state_written = false;
-			};
-
-			std::vector<state_t> state_prev;
-			usz completed = 0;
-			usz parent_iterator_index = umax;
-			usz parent_state_index = umax;
-		};
-
-		std::vector<iterator_info> info_queue;
-
-		iterator_info first_entry{pc, {}, 0, umax, umax};
-		info_queue.emplace_back(std::move(first_entry));
-
-		// info_queue may grow
-		for (usz qi = 0; qi < info_queue.size();)
-		{
-			const auto it = std::addressof(info_queue[qi]);
-			ensure(qi == info_queue.size() - 1);
-
-			auto& cur_node = ::at32(map, it->block_pc);
-
-			ensure(it->parent_iterator_index == qi - 1);
-
-			if (cur_node->has_true_state)
-			{
-				// Evaluted somewhen before
-				if (qi != 0)
-				{
-					ensure(!been_there.empty());
-					been_there.pop_back();
-					info_queue.pop_back();
-					qi--;
-					continue;
-				}
-				else
-				{
-					break;
-				}
-			}
-
-			if (it->state_prev.empty())
-			{
-				// Build the list here to avoid code duplication
-				const usz real_size = cur_node->prev_nodes.size();
-
-				if (real_size)
-				{
-					it->state_prev.resize(real_size);
-
-					for (usz i = 0; i < real_size; i++)
-					{
-						it->state_prev[i].block_pc = cur_node->prev_nodes[i].prev_pc;
-					}
-				}
-			}
-
-			const usz next_entry_idx = it->completed;
-
-			if (next_entry_idx == it->state_prev.size())
-			{
-				// Result merge from all predecessors
-
-				// Flag to mark the state as resolved
-				bool is_all_resolved = true;
-				bool has_past_state = false;
-
-				for (usz bi = 0; bi < it->state_prev.size(); bi++)
-				{
-					if (it->state_prev[bi].disconnected)
-					{
-						is_all_resolved = false;
-						continue;
-					}
-
-					has_past_state = true;
-
-					const u32 node_pc = it->state_prev[bi].block_pc;
-					const auto& node = ::at32(map, node_pc);
-
-					// Check if the node is resolved
-					if (!node->has_true_state)
-					{
-						// Assume this block cannot be resolved at the moment
-						is_all_resolved = false;
-						break;
-					}
-				}
-
-				if (qi == 0)
-				{
-					// TODO: First block is always resolved here, but this logic can be improved to detect more cases of opportunistic resolving
-					is_all_resolved = true;
-				}
-
-				auto& res_state = is_all_resolved ? cur_node->start_reg_state : temp;
-
-				for (usz bi = 0, is_first = 1; bi < it->state_prev.size(); bi++)
-				{
-					if (it->state_prev[bi].disconnected)
-					{
-						// Loop state, even if not ignored for a million times the result would still be the same
-						// So ignore it
-						continue;
-					}
-
-					std::array<reg_state_t, s_reg_max>* arg_state{};
-					const auto& node = ::at32(map, it->state_prev[bi].block_pc);
-
-					if (node->has_true_state)
-					{
-						// State is resolved, use the entry's state
-						arg_state = std::addressof(node->end_reg_state);
-					}
-					else
-					{
-						// Use accumulated state from one path of code history
-						arg_state = std::addressof(it->state_prev[bi].reg_state);
-						ensure(it->state_prev[bi].state_written);
-					}
-
-					if (is_first)
-					{
-						res_state = *arg_state;
-					}
-					else
-					{
-						merge(res_state, res_state, *arg_state, it->block_pc);
-					}
-
-					is_first = 0;
-				}
-
-				std::array<reg_state_t, s_reg_max>* result_storage{};
-
-				if (is_all_resolved)
-				{
-					// Complete state of this block
-					result_storage = std::addressof(cur_node->end_reg_state);
-					cur_node->has_true_state = true;
-				}
-				else
-				{
-					// Patch incomplete state into saved state entry of parent block
-					ensure(it->parent_iterator_index != qi);
-					ensure(it->parent_iterator_index != umax);
-
-					auto& state_vec = ::at32(info_queue, it->parent_iterator_index).state_prev;
-					auto& state = ::at32(state_vec, it->parent_state_index);
-
-					ensure(state.block_pc == it->block_pc);
-
-					result_storage = std::addressof(state.reg_state);
-
-					ensure(!state.state_written);
-					state.state_written = true;
-				}
-
-				// Stack the newer state on top of the old (if exists)
-				if (has_past_state)
-				{
-					build_on_top_of(*result_storage, cur_node->addend_reg_state, res_state);
-				}
-				else
-				{
-					*result_storage = cur_node->addend_reg_state;
-				}
-
-				if (qi != 0)
-				{
-					ensure(!been_there.empty());
-					been_there.pop_back();
-					info_queue.pop_back();
-					qi--;
-				}
-				else
-				{
-					ensure(cur_node->has_true_state);
-					break;
-				}
-			}
-			else
-			{
-				const u32 prev_pc = cur_node->prev_nodes[it->completed++].prev_pc;
-				const auto& prev_node = ::at32(map, prev_pc);
-
-				// Queue for resolving if needed
-				if (!prev_node->has_true_state)
-				{
-					// TODO: The true maximum occurence count need to depend on the amount of branching-outs passed through
-					// Currently allow 2 for short-term code and 1 for long-term code
-					const bool loop_terminator_detected = std::count(been_there.begin(), been_there.end(), prev_pc) >= (qi < 20 ? 2u : 1u);
-					const bool avoid_extensive_analysis = qi >= (extensive_evaluation ? 22 : 16);
-
-					if (!loop_terminator_detected && !avoid_extensive_analysis)
-					{
-						info_queue.emplace_back(iterator_info{prev_pc, {}, 0, qi, it->completed - 1});
-						been_there.push_back(prev_pc);
-						qi++;
-					}
-					else
-					{
-						auto& state = ::at32(it->state_prev, it->completed - 1);
-
-						// Loop state, even if not ignored for a million times the result would be the same
-						// This is similar to multiplying zero a million times
-						// This is true at least for now, that any register difference is considered an unknown state change
-						// So ignore it
-						ensure(state.block_pc == prev_pc);
-						ensure(!state.disconnected);
-						state.disconnected = true;
-
-						// Repeat
-						// qi += 0;
-					}
-				}
-				else
-				{
-					// Repeat
-					// qi += 0;
-				}
-			}
-		}
-
-		ensure(has_true_state);
-	}
-
-	walkby_state = start_reg_state;
-	return walkby_state;
-}
-
-void spu_recompiler_base::add_pattern(bool fill_all, inst_attr attr, u32 start, u32 end)
-{
-	if (end == umax)
-	{
-		end = start;
-	}
-
-	m_patterns[start] = pattern_info{utils::address_range32::start_end(start, end)};
-
-	for (u32 i = start; i <= (fill_all ? end : start); i += 4)
-	{
-		m_inst_attrs[i / 4] = attr;
-	}
-}
-
-extern std::string format_spu_func_info(u32 addr, cpu_thread* spu)
-{
-	spu_thread* _spu = static_cast<spu_thread*>(spu);
-
-	std::unique_ptr<spu_recompiler_base> compiler = spu_recompiler_base::make_asmjit_recompiler();
-	compiler->init();
-	auto func = compiler->analyse(reinterpret_cast<const be_t<u32>*>(_spu->ls), addr);
-
-	std::string info;
-	{
-		sha1_context ctx;
-		u8 output[20];
-
-		sha1_starts(&ctx);
-		sha1_update(&ctx, reinterpret_cast<const u8*>(func.data.data()), func.data.size() * 4);
-		sha1_finish(&ctx, output);
-		fmt::append(info, "size=%d, end=0x%x, hash=%s", func.data.size(), addr + func.data.size() * 4, fmt::base57(output));
-	}
-
-	return info;
-}
diff --git a/rpcs3/Emu/Cell/SPUDisAsm.cpp b/rpcs3/Emu/Cell/SPUDisAsm.cpp
index 645a79969f..a54a89d7d1 100644
--- a/rpcs3/Emu/Cell/SPUDisAsm.cpp
+++ b/rpcs3/Emu/Cell/SPUDisAsm.cpp
@@ -4,72 +4,43 @@
 #include "SPUThread.h"
 
 const spu_decoder<SPUDisAsm> s_spu_disasm;
-const extern spu_decoder<spu_itype> g_spu_itype;
-const extern spu_decoder<spu_iname> g_spu_iname;
-const extern spu_decoder<spu_iflag> g_spu_iflag;
+const spu_decoder<spu_itype> s_spu_itype;
+const spu_decoder<spu_iflag> s_spu_iflag;
 
 #include "util/v128.hpp"
-#include "util/simd.hpp"
+#include "util/v128sse.hpp"
 
 u32 SPUDisAsm::disasm(u32 pc)
 {
-	last_opcode.clear();
-
-	if (pc < m_start_pc || pc >= SPU_LS_SIZE)
-	{
-		return 0;
-	}
-
 	dump_pc = pc;
 	be_t<u32> op;
 	std::memcpy(&op, m_offset + pc, 4);
 	m_op = op;
 	(this->*(s_spu_disasm.decode(m_op)))({ m_op });
-
-	format_by_mode();
 	return 4;
 }
 
-std::pair<const void*, usz> SPUDisAsm::get_memory_span() const
+std::pair<bool, v128> SPUDisAsm::try_get_const_value(u32 reg, u32 pc) const
 {
-	return {m_offset + m_start_pc, SPU_LS_SIZE - m_start_pc};
-}
-
-std::unique_ptr<CPUDisAsm> SPUDisAsm::copy_type_erased() const
-{
-	return std::make_unique<SPUDisAsm>(*this);
-}
-
-std::pair<bool, v128> SPUDisAsm::try_get_const_value(u32 reg, u32 pc, u32 TTL) const
-{
-	if (!TTL)
+	if (m_mode != cpu_disasm_mode::interpreter)
 	{
-		// Recursion limit (Time To Live)
 		return {};
 	}
 
 	if (pc == umax)
 	{
-		// Default arg: choose pc of previous instruction
-
-		if (dump_pc == 0)
-		{
-			// Do not underflow
-			return {};
-		}
-
-		pc = dump_pc - 4;
+		pc = dump_pc;
 	}
 
 	// Scan LS backwards from this instruction (until PC=0)
 	// Search for the first register modification or branch instruction
 
-	for (s32 i = static_cast<s32>(pc); i >= static_cast<s32>(m_start_pc); i -= 4)
+	for (s32 i = pc - 4; i >= 0; i -= 4)
 	{
 		const u32 opcode = *reinterpret_cast<const be_t<u32>*>(m_offset + i);
 		const spu_opcode_t op0{ opcode };
 
-		const auto type = g_spu_itype.decode(opcode);
+		const auto type = s_spu_itype.decode(opcode);
 
 		if (type & spu_itype::branch || type == spu_itype::UNK || !opcode)
 		{
@@ -87,24 +58,10 @@ std::pair<bool, v128> SPUDisAsm::try_get_const_value(u32 reg, u32 pc, u32 TTL) c
 			continue;
 		}
 
-		// Get constant register value
-		#define GET_CONST_REG(var, reg) \
-		{\
-			/* Search for the constant value of the register*/\
-			const auto [is_const, value] = try_get_const_value(reg, i - 4, TTL - 1);\
-		\
-			if (!is_const)\
-			{\
-				/* Cannot compute constant value if register is not constant*/\
-				return {};\
-			}\
-		\
-			var = value;\
-		} void() /*<- Require a semicolon*/
+		//const auto flag = s_spu_iflag.decode(opcode);
 
-		//const auto flag = g_spu_iflag.decode(opcode);
-
-		if (u32 dst = type & spu_itype::_quadrop ? +op0.rt4 : +op0.rt; dst == reg && !(type & spu_itype::zregmod))
+		// TODO: It detects spurious register modifications
+		if (u32 dst = type & spu_itype::_quadrop ? +op0.rt4 : +op0.rt; dst == reg)
 		{
 			// Note: It's not 100% reliable because it won't detect branch targets within [i, dump_pc] range (e.g. if-else statement for command's value)
 			switch (type)
@@ -121,10 +78,6 @@ std::pair<bool, v128> SPUDisAsm::try_get_const_value(u32 reg, u32 pc, u32 TTL) c
 			{
 				return { true, v128::from32p(op0.i16 << 16) };
 			}
-			case spu_itype::ILH:
-			{
-				return { true, v128::from16p(op0.i16) };
-			}
 			case spu_itype::CBD:
 			case spu_itype::CHD:
 			case spu_itype::CWD:
@@ -174,34 +127,34 @@ std::pair<bool, v128> SPUDisAsm::try_get_const_value(u32 reg, u32 pc, u32 TTL) c
 			}
 			case spu_itype::IOHL:
 			{
-				v128 reg_val{};
-
-				// Search for ILHU+IOHL pattern (common pattern for 32-bit constants formation)
-				// But don't limit to it
-				GET_CONST_REG(reg_val, op0.rt);
-
-				return { true, reg_val | v128::from32p(op0.i16) };
-			}
-			case spu_itype::SHLQBYI:
-			{
-				if (op0.si7)
+				// Avoid multi-recursion for now
+				if (dump_pc != pc)
 				{
-					// Unimplemented, doubt needed
 					return {};
 				}
 
-				// Move register value operation
-				v128 reg_val{};
-				GET_CONST_REG(reg_val, op0.ra);
+				if (i >= 4)
+				{
+					// Search for ILHU+IOHL pattern (common pattern for 32-bit constants formation)
+					// But don't limit to it
+					const auto [is_const, value] = try_get_const_value(reg, i);
 
-				return { true, reg_val };
+					if (is_const)
+					{
+						return { true, value | v128::from32p(op0.i16) };
+					}
+				}
+
+				return {};
 			}
-			case spu_itype::ORI:
+			case spu_itype::STQA:
+			case spu_itype::STQD:
+			case spu_itype::STQR:
+			case spu_itype::STQX:
+			case spu_itype::WRCH:
 			{
-				v128 reg_val{};
-				GET_CONST_REG(reg_val, op0.ra);
-
-				return { true, reg_val | v128::from32p(op0.si10) };
+				// Do not modify RT
+				break;
 			}
 			default: return {};
 			}
@@ -283,8 +236,6 @@ SPUDisAsm::insert_mask_info SPUDisAsm::try_get_insert_mask_info(const v128& mask
 
 void SPUDisAsm::WRCH(spu_opcode_t op)
 {
-	DisAsm("wrch", spu_ch_name[op.ra], spu_reg_name[op.rt]);
-
 	const auto [is_const, value] = try_get_const_value(op.rt);
 
 	if (is_const)
@@ -293,7 +244,7 @@ void SPUDisAsm::WRCH(spu_opcode_t op)
 		{
 		case MFC_Cmd:
 		{
-			fmt::append(last_opcode, " #%s", MFC(value._u8[12]));
+			DisAsm("wrch", spu_ch_name[op.ra], fmt::format("%s #%s", spu_reg_name[op.rt], MFC(value._u8[12])).c_str());
 			return;
 		}
 		case MFC_WrListStallAck:
@@ -301,79 +252,62 @@ void SPUDisAsm::WRCH(spu_opcode_t op)
 		{
 			const u32 v = value._u32[3];
 			if (v && !(v & (v - 1)))
-				fmt::append(last_opcode, " #%s (tag=%u)", SignedHex(v), std::countr_zero(v)); // Single-tag mask
+				DisAsm("wrch", spu_ch_name[op.ra], fmt::format("%s #%s (tag=%u)", spu_reg_name[op.rt], SignedHex(v), std::countr_zero(v)).c_str()); // Single-tag mask
 			else
-				fmt::append(last_opcode, " #%s", SignedHex(v)); // Multi-tag mask (or zero)
+				DisAsm("wrch", spu_ch_name[op.ra], fmt::format("%s #%s", spu_reg_name[op.rt], SignedHex(v)).c_str()); // Multi-tag mask (or zero)
 			return;
 		}
 		case MFC_EAH:
 		{
-			fmt::append(last_opcode, " #%s", SignedHex(value._u32[3]));
+			DisAsm("wrch", spu_ch_name[op.ra], fmt::format("%s #%s", spu_reg_name[op.rt], SignedHex(value._u32[3])).c_str());
 			return;
 		}
 		case MFC_Size:
 		{
-			fmt::append(last_opcode, " #%s", SignedHex(value._u16[6]));
+			DisAsm("wrch", spu_ch_name[op.ra], fmt::format("%s #%s", spu_reg_name[op.rt], SignedHex(value._u16[6])).c_str());
 			return;
 		}
 		case MFC_TagID:
 		{
-			fmt::append(last_opcode, " #%u", value._u8[12]);
+			DisAsm("wrch", spu_ch_name[op.ra], fmt::format("%s #%u", spu_reg_name[op.rt], value._u8[12]).c_str());
 			return;
 		}
 		case MFC_WrTagUpdate:
 		{
 			const auto upd = fmt::format("%s", mfc_tag_update(value._u32[3]));
-			fmt::append(last_opcode, " #%s", upd == "empty" ? "IMMEDIATE" : upd);
-			return;
-		}
-		case SPU_WrOutIntrMbox:
-		{
-			const u32 code = value._u32[3] >> 24;
-
-			if (code == 128u)
-			{
-				last_opcode += " #sys_event_flag_set_bit";
-			}
-			else if (code == 192u)
-			{
-				last_opcode += " #sys_event_flag_set_bit_impatient";
-			}
-			else
-			{
-				fmt::append(last_opcode, " #%s", SignedHex(value._u32[3]));
-			}
-
+			DisAsm("wrch", spu_ch_name[op.ra], fmt::format("%s #%s", spu_reg_name[op.rt], upd == "empty" ? "IMMEDIATE" : upd).c_str());
 			return;
 		}
 		default:
 		{
-			fmt::append(last_opcode, " #%s", SignedHex(value._u32[3]));
+			DisAsm("wrch", spu_ch_name[op.ra], fmt::format("%s #%s", spu_reg_name[op.rt], SignedHex(value._u32[3])).c_str());
 			return;
 		}
 		}
 	}
-}
 
-enum CellError : u32;
+	DisAsm("wrch", spu_ch_name[op.ra], spu_reg_name[op.rt]);
+}
 
 void SPUDisAsm::IOHL(spu_opcode_t op)
 {
-	DisAsm("iohl", spu_reg_name[op.rt], op.i16);
+	const auto [is_const, value] = try_get_const_value(op.rt);
 
-	const auto [is_const, value] = try_get_const_equal_value_array<u32>(op.rt);
-
-	// Only print constant for a 4 equal 32-bit constants array
 	if (is_const)
 	{
-		comment_constant(last_opcode, value | op.i16);
+		// Only print constant for a 4 equal 32-bit constants array
+		if (value == v128::from32p(value._u32[0]))
+		{
+			DisAsm("iohl", spu_reg_name[op.rt], fmt::format("%s #%s", SignedHex(+op.i16), (value._u32[0] | op.i16)).c_str());
+			return;
+		}
 	}
+
+	DisAsm("iohl", spu_reg_name[op.rt], op.i16);
 }
 
 void SPUDisAsm::SHUFB(spu_opcode_t op)
 {
-	DisAsm("shufb", spu_reg_name[op.rt4], spu_reg_name[op.ra], spu_reg_name[op.rb], spu_reg_name[op.rc]);
-
 	const auto [is_const, value] = try_get_const_value(op.rc);
 
 	if (is_const)
@@ -385,13 +319,15 @@ void SPUDisAsm::SHUFB(spu_opcode_t op)
 			if ((size >= 4u && !src) || (size == 2u && src == 1u) || (size == 1u && src == 3u))
 			{
 				// Comment insertion pattern for CWD-alike instruction
-				fmt::append(last_opcode, " #i%u[%u]", size * 8, dst);
+				DisAsm("shufb", spu_reg_name[op.rt4], spu_reg_name[op.ra], spu_reg_name[op.rb], fmt::format("%s #i%u[%u]", spu_reg_name[op.rc], size * 8, dst).c_str());
 				return;
 			}
 
 			// Comment insertion pattern for unknown instruction formations
-			fmt::append(last_opcode, " #i%u[%u] = [%u]", size * 8, dst, src);
+			DisAsm("shufb", spu_reg_name[op.rt4], spu_reg_name[op.ra], spu_reg_name[op.rb], fmt::format("%s #i%u[%u] = [%u]", spu_reg_name[op.rc], size * 8, dst, src).c_str());
 			return;
 		}
 	}
+
+	DisAsm("shufb", spu_reg_name[op.rt4], spu_reg_name[op.ra], spu_reg_name[op.rb], spu_reg_name[op.rc]);
 }
diff --git a/rpcs3/Emu/Cell/SPUDisAsm.h b/rpcs3/Emu/Cell/SPUDisAsm.h
index 0d5862025b..0f2fafe948 100644
--- a/rpcs3/Emu/Cell/SPUDisAsm.h
+++ b/rpcs3/Emu/Cell/SPUDisAsm.h
@@ -2,9 +2,8 @@
 
 #include "PPCDisAsm.h"
 #include "SPUOpcodes.h"
-#include "util/v128.hpp"
 
-enum spu_stop_syscall : u32;
+union v128;
 
 static constexpr const char* spu_reg_name[128] =
 {
@@ -69,26 +68,15 @@ static constexpr const char* spu_ch_name[128] =
 	"ch121", "ch122", "ch123", "ch124", "ch125", "ch126", "ch127",
 };
 
-namespace utils
-{
-	class shm;
-}
-
-void comment_constant(std::string& last_opocde, u64 value, bool print_float = true);
-
 class SPUDisAsm final : public PPCDisAsm
 {
-	std::shared_ptr<utils::shm> m_shm;
 public:
-	SPUDisAsm(cpu_disasm_mode mode, const u8* offset, u32 start_pc = 0) : PPCDisAsm(mode, offset, start_pc)
+	SPUDisAsm(cpu_disasm_mode mode, const u8* offset) : PPCDisAsm(mode, offset)
 	{
 	}
 
-	~SPUDisAsm() = default;
-
-	void set_shm(std::shared_ptr<utils::shm> shm)
+	~SPUDisAsm()
 	{
-		m_shm = std::move(shm);
 	}
 
 private:
@@ -97,125 +85,84 @@ private:
 		return spu_branch_target(dump_pc, imm);
 	}
 
-	static char BrIndirectSuffix(u32 de)
+	static const char* BrIndirectSuffix(u32 de)
 	{
 		switch (de)
 		{
-		case 0b01: return 'e';
-		case 0b10: return 'd';
-		case 0b11: return '!';
-		default: return '\0';
+		case 0b01: return "e";
+		case 0b10: return "d";
+		//case 0b11: return "(undef)";
+		default: return "";
 		}
 	}
 
+	std::string& FixOp(std::string& op) const
+	{
+		if (m_mode != cpu_disasm_mode::normal)
+		{
+			op.append(std::max<int>(10 - ::narrow<int>(op.size()), 0), ' ');
+		}
+
+		return op;
+	}
 	void DisAsm(const char* op)
 	{
-		last_opcode += op;
+		Write(op);
 	}
-	void DisAsm(std::string_view op, u32 a1)
+	void DisAsm(std::string op, u32 a1)
 	{
-		fmt::append(last_opcode, "%-*s 0x%x", PadOp(), op, a1);
+		Write(fmt::format("%s 0x%x", FixOp(op), a1));
 	}
-	void DisAsm(std::string_view op, const char* a1)
+	void DisAsm(std::string op, const char* a1)
 	{
-		fmt::append(last_opcode, "%-*s %s", PadOp(), op, a1);
+		Write(fmt::format("%s %s", FixOp(op), a1));
 	}
-	void DisAsm(std::string_view op, const char* a1, const char* a2)
+	void DisAsm(std::string op, const char* a1, const char* a2)
 	{
-		fmt::append(last_opcode, "%-*s %s,%s", PadOp(), op, a1, a2);
+		Write(fmt::format("%s %s,%s", FixOp(op), a1, a2));
 	}
-	void DisAsm(std::string_view op, int a1, const char* a2)
+	void DisAsm(std::string op, int a1, const char* a2)
 	{
-		fmt::append(last_opcode, "%-*s 0x%x,%s", PadOp(), op, a1, a2);
+		Write(fmt::format("%s 0x%x,%s", FixOp(op), a1, a2));
 	}
-	void DisAsm(std::string_view op, const char* a1, int a2)
+	void DisAsm(std::string op, const char* a1, int a2)
 	{
-		fmt::append(last_opcode, "%-*s %s,%s", PadOp(), op, a1, SignedHex(a2));
+		Write(fmt::format("%s %s,%s", FixOp(op), a1, SignedHex(a2)));
 	}
-	void DisAsm(std::string_view op, int a1, int a2)
+	void DisAsm(std::string op, int a1, int a2)
 	{
-		fmt::append(last_opcode, "%-*s 0x%x,0x%x", PadOp(), op, a1, a2);
+		Write(fmt::format("%s 0x%x,0x%x", FixOp(op), a1, a2));
 	}
-	void DisAsm(std::string_view op, const char* a1, const char* a2, const char* a3)
+	void DisAsm(std::string op, const char* a1, const char* a2, const char* a3)
 	{
-		fmt::append(last_opcode, "%-*s %s,%s,%s", PadOp(), op, a1, a2, a3);
+		Write(fmt::format("%s %s,%s,%s", FixOp(op), a1, a2, a3));
 	}
-	void DisAsm(std::string_view op, const char* a1, int a2, const char* a3)
+	void DisAsm(std::string op, const char* a1, int a2, const char* a3)
 	{
-		fmt::append(last_opcode, "%-*s %s,%s(%s)", PadOp(), op, a1, SignedHex(a2), a3);
+		Write(fmt::format("%s %s,%s(%s)", FixOp(op), a1, SignedHex(a2), a3));
 	}
-	void DisAsm(std::string_view op, const char* a1, const char* a2, int a3)
+	void DisAsm(std::string op, const char* a1, const char* a2, int a3)
 	{
-		fmt::append(last_opcode, "%-*s %s,%s,%s", PadOp(), op, a1, a2, SignedHex(a3));
+		Write(fmt::format("%s %s,%s,%s", FixOp(op), a1, a2, SignedHex(a3)));
 	}
-	void DisAsm(std::string_view op, const char* a1, const char* a2, const char* a3, const char* a4)
+	void DisAsm(std::string op, const char* a1, const char* a2, const char* a3, const char* a4)
 	{
-		fmt::append(last_opcode, "%-*s %s,%s,%s,%s", PadOp(), op, a1, a2, a3, a4);
+		Write(fmt::format("%s %s,%s,%s,%s", FixOp(op), a1, a2, a3, a4));
 	}
 
 	using field_de_t = decltype(spu_opcode_t::de);
-	void DisAsm(std::string_view op, field_de_t de, const char* a1)
+	void DisAsm(std::string op, field_de_t de, const char* a1)
 	{
-		const char c = BrIndirectSuffix(de);
-
-		if (c == '!')
-		{
-			// Invalid
-			fmt::append(last_opcode, "?? ?? (%s)", op);
-			return;
-		}
-
-		fmt::append(last_opcode, "%-*s %s", PadOp(op, c ? 1 : 0), op, a1);
-		insert_char_if(op, !!c, c);
+		Write(fmt::format("%s %s", FixOp(op.append(BrIndirectSuffix(de))), a1));
 	}
-	void DisAsm(std::string_view op, field_de_t de, const char* a1, const char* a2)
+	void DisAsm(std::string op, field_de_t de, const char* a1, const char* a2)
 	{
-		const char c = BrIndirectSuffix(de);
-
-		if (c == '!')
-		{
-			fmt::append(last_opcode, "?? ?? (%s)", op);
-			return;
-		}
-
-		fmt::append(last_opcode, "%-*s %s,%s", PadOp(op, c ? 1 : 0), op, a1, a2);
-		insert_char_if(op, !!c, c);
+		Write(fmt::format("%s %s,%s", FixOp(op.append(BrIndirectSuffix(de))), a1, a2));
 	}
 
 public:
 	u32 disasm(u32 pc) override;
-	std::pair<const void*, usz> get_memory_span() const override;
-	std::unique_ptr<CPUDisAsm> copy_type_erased() const override;
-	std::pair<bool, v128> try_get_const_value(u32 reg, u32 pc = -1, u32 TTL = 10) const;
-
-	// Get constant value if the original array is made of only repetitions of the same value
-	template <typename T> requires (sizeof(T) < sizeof(v128) && !(sizeof(v128) % sizeof(T)))
-	std::pair<bool, T> try_get_const_equal_value_array(u32 reg, u32 pc = -1, u32 TTL = 10) const
-	{
-		auto [ok, res] = try_get_const_value(reg, pc, TTL);
-
-		if (!ok)
-		{
-			return {};
-		}
-
-		v128 test_value{};
-
-		T sample{};
-		std::memcpy(&sample, res._bytes, sizeof(T));
-
-		for (u32 i = 0; i < sizeof(v128); i += sizeof(T))
-		{
-			std::memcpy(test_value._bytes + i, &sample, sizeof(T));
-		}
-
-		if (test_value != res)
-		{
-			return {};
-		}
-
-		return {ok, sample};
-	}
+	std::pair<bool, v128> try_get_const_value(u32 reg, u32 pc = -1) const;
 
 	struct insert_mask_info
 	{
@@ -229,7 +176,7 @@ public:
 	//0 - 10
 	void STOP(spu_opcode_t op)
 	{
-		op.rb ? UNK(op) : DisAsm("stop", fmt::format("0x%x #%s", op.opcode & 0x3fff, spu_stop_syscall{op.opcode & 0x3fff}).c_str());
+		op.rb ? UNK(op) : DisAsm("stop", op.opcode & 0x3fff);
 	}
 	void LNOP(spu_opcode_t /*op*/)
 	{
@@ -851,13 +798,6 @@ public:
 	}
 	void BR(spu_opcode_t op)
 	{
-		if (op.rt && op.rt != 127u)
-		{
-			// Valid but makes no sense
-			DisAsm("br??", DisAsmBranchTarget(op.i16));
-			return;
-		}
-
 		DisAsm("br", DisAsmBranchTarget(op.i16));
 	}
 	void FSMBI(spu_opcode_t op)
@@ -879,12 +819,10 @@ public:
 	void ILHU(spu_opcode_t op)
 	{
 		DisAsm("ilhu", spu_reg_name[op.rt], op.i16);
-		comment_constant(last_opcode, op.i16 << 16);
 	}
 	void ILH(spu_opcode_t op)
 	{
 		DisAsm("ilh", spu_reg_name[op.rt], op.i16);
-		comment_constant(last_opcode, (op.i16 << 16) | op.i16);
 	}
 
 	void IOHL(spu_opcode_t op);
@@ -900,12 +838,6 @@ public:
 		}
 
 		DisAsm("ori", spu_reg_name[op.rt], spu_reg_name[op.ra], op.si10);
-
-		if (auto [is_const, value] = try_get_const_equal_value_array<u32>(+op.ra); is_const)
-		{
-			// Comment constant formation
-			comment_constant(last_opcode, value | static_cast<u32>(op.si10));
-		}
 	}
 	void ORHI(spu_opcode_t op)
 	{
@@ -938,12 +870,6 @@ public:
 	void AI(spu_opcode_t op)
 	{
 		DisAsm("ai", spu_reg_name[op.rt], spu_reg_name[op.ra], op.si10);
-
-		if (auto [is_const, value] = try_get_const_equal_value_array<u32>(op.ra); is_const)
-		{
-			// Comment constant formation
-			comment_constant(last_opcode, value + static_cast<u32>(op.si10));
-		}
 	}
 	void AHI(spu_opcode_t op)
 	{
@@ -960,12 +886,6 @@ public:
 	void XORI(spu_opcode_t op)
 	{
 		DisAsm("xori", spu_reg_name[op.rt], spu_reg_name[op.ra], op.si10);
-
-		if (auto [is_const, value] = try_get_const_equal_value_array<u32>(op.ra); is_const)
-		{
-			// Comment constant formation
-			comment_constant(last_opcode, value ^ static_cast<u32>(op.si10));
-		}
 	}
 	void XORHI(spu_opcode_t op)
 	{
@@ -1071,6 +991,6 @@ public:
 
 	void UNK(spu_opcode_t /*op*/)
 	{
-		DisAsm("?? ??");
+		Write("?? ??");
 	}
 };
diff --git a/rpcs3/Emu/Cell/SPUInterpreter.cpp b/rpcs3/Emu/Cell/SPUInterpreter.cpp
index a781da5e8f..2660f997ce 100644
--- a/rpcs3/Emu/Cell/SPUInterpreter.cpp
+++ b/rpcs3/Emu/Cell/SPUInterpreter.cpp
@@ -3,78 +3,47 @@
 
 #include "Utilities/JIT.h"
 #include "SPUThread.h"
-#include "Emu/Cell/SPUAnalyser.h"
-#include "Emu/system_config.h"
+#include "Emu/Cell/Common.h"
 
 #include "util/asm.hpp"
 #include "util/v128.hpp"
-#include "util/simd.hpp"
+#include "util/v128sse.hpp"
 #include "util/sysinfo.hpp"
 
 #include <cmath>
+#include <cfenv>
 
-#if !defined(_MSC_VER)
+#if !defined(_MSC_VER) && defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
 
-#if defined(ARCH_ARM64)
-#if !defined(_MSC_VER)
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif
-#undef FORCE_INLINE
-#include "Emu/CPU/sse2neon.h"
-#endif
-
-const extern spu_decoder<spu_itype> g_spu_itype;
-const extern spu_decoder<spu_iname> g_spu_iname;
-const extern spu_decoder<spu_iflag> g_spu_iflag;
-
-enum class spu_exec_bit : u64
+// Compare 16 packed unsigned bytes (greater than)
+inline __m128i sse_cmpgt_epu8(__m128i A, __m128i B)
 {
-	use_dfma,
+	// (A xor 0x80) > (B xor 0x80)
+	const auto sign = _mm_set1_epi32(0x80808080);
+	return _mm_cmpgt_epi8(_mm_xor_si128(A, sign), _mm_xor_si128(B, sign));
+}
 
-	__bitset_enum_max
-};
-
-using enum spu_exec_bit;
-
-template <spu_exec_bit... Flags0>
-struct spu_exec_select
+inline __m128i sse_cmpgt_epu16(__m128i A, __m128i B)
 {
-	template <spu_exec_bit Flag, spu_exec_bit... Flags, typename F>
-	static spu_intrp_func_t select(bs_t<spu_exec_bit> selected, F func)
-	{
-		// Make sure there is no flag duplication, otherwise skip flag
-		if constexpr (((Flags0 != Flag) && ...))
-		{
-			// Test only relevant flags at runtime (compiling both variants)
-			if (selected & Flag)
-			{
-				// In this branch, selected flag is added to Flags0
-				return spu_exec_select<Flags0..., Flag>::template select<Flags...>(selected, func);
-			}
-		}
+	const auto sign = _mm_set1_epi32(0x80008000);
+	return _mm_cmpgt_epi16(_mm_xor_si128(A, sign), _mm_xor_si128(B, sign));
+}
 
-		return spu_exec_select<Flags0...>::template select<Flags...>(selected, func);
-	}
-
-	template <typename F>
-	static spu_intrp_func_t select(bs_t<spu_exec_bit>, F func)
-	{
-		// Instantiate interpreter function with required set of flags
-		return func.template operator()<Flags0...>();
-	}
-};
-
-#ifdef ARCH_X64
-static constexpr spu_opcode_t s_op{};
-#endif
+inline __m128i sse_cmpgt_epu32(__m128i A, __m128i B)
+{
+	const auto sign = _mm_set1_epi32(0x80000000);
+	return _mm_cmpgt_epi32(_mm_xor_si128(A, sign), _mm_xor_si128(B, sign));
+}
 
 namespace asmjit
 {
+	static constexpr spu_opcode_t s_op{};
+
 	template <uint I, uint N>
-	static void build_spu_gpr_load(x86::Assembler& c, x86::Xmm x, const bf_t<u32, I, N>&, bool store = false)
+	static void build_spu_gpr_load(X86Assembler& c, X86Xmm x, const bf_t<u32, I, N>&, bool store = false)
 	{
 		static_assert(N == 7, "Invalid bitfield");
 
@@ -118,14 +87,13 @@ namespace asmjit
 	}
 
 	template <uint I, uint N>
-	static void build_spu_gpr_store(x86::Assembler& c, x86::Xmm x, const bf_t<u32, I, N>&, bool store = true)
+	static void build_spu_gpr_store(X86Assembler& c, X86Xmm x, const bf_t<u32, I, N>&, bool store = true)
 	{
 		build_spu_gpr_load(c, x, bf_t<u32, I, N>{}, store);
 	}
 }
 
-template <spu_exec_bit... Flags>
-bool UNK(spu_thread&, spu_opcode_t op)
+bool spu_interpreter::UNK(spu_thread&, spu_opcode_t op)
 {
 	spu_log.fatal("Unknown/Illegal instruction (0x%08x)", op.opcode);
 	return false;
@@ -148,23 +116,13 @@ void spu_interpreter::set_interrupt_status(spu_thread& spu, spu_opcode_t op)
 		spu.set_interrupt_status(false);
 	}
 
-	if (spu.check_mfc_interrupts(spu.pc) && spu.state & cpu_flag::pending)
-	{
-		spu.do_mfc();
-	}
+	spu.check_mfc_interrupts(spu.pc);
 }
 
 
-template <spu_exec_bit... Flags>
-bool STOP(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::STOP(spu_thread& spu, spu_opcode_t op)
 {
-	const bool allow = std::exchange(spu.allow_interrupts_in_cpu_work, false);
-
-	const bool advance_pc = spu.stop_and_signal(op.opcode & 0x3fff);
-
-	spu.allow_interrupts_in_cpu_work = allow;
-
-	if (!advance_pc)
+	if (!spu.stop_and_signal(op.opcode & 0x3fff))
 	{
 		return false;
 	}
@@ -178,44 +136,35 @@ bool STOP(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool LNOP(spu_thread&, spu_opcode_t)
+bool spu_interpreter::LNOP(spu_thread&, spu_opcode_t)
 {
 	return true;
 }
 
 // This instruction must be used following a store instruction that modifies the instruction stream.
-template <spu_exec_bit... Flags>
-bool SYNC(spu_thread&, spu_opcode_t)
+bool spu_interpreter::SYNC(spu_thread&, spu_opcode_t)
 {
 	atomic_fence_seq_cst();
 	return true;
 }
 
 // This instruction forces all earlier load, store, and channel instructions to complete before proceeding.
-template <spu_exec_bit... Flags>
-bool DSYNC(spu_thread&, spu_opcode_t)
+bool spu_interpreter::DSYNC(spu_thread&, spu_opcode_t)
 {
 	atomic_fence_seq_cst();
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool MFSPR(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::MFSPR(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt].clear(); // All SPRs read as zero. TODO: check it.
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool RDCH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::RDCH(spu_thread& spu, spu_opcode_t op)
 {
-	const bool allow = std::exchange(spu.allow_interrupts_in_cpu_work, false);
-
 	const s64 result = spu.get_ch_value(op.ra);
 
-	spu.allow_interrupts_in_cpu_work = allow;
-
 	if (result < 0)
 	{
 		return false;
@@ -232,59 +181,51 @@ bool RDCH(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool RCHCNT(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::RCHCNT(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt] = v128::from32r(spu.get_ch_count(op.ra));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SF(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SF(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_sub32(spu.gpr[op.rb], spu.gpr[op.ra]);
+	spu.gpr[op.rt] = v128::sub32(spu.gpr[op.rb], spu.gpr[op.ra]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool OR(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::OR(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt] = spu.gpr[op.ra] | spu.gpr[op.rb];
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool BG(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BG(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_add_epi32(gv_gtu32(spu.gpr[op.ra], spu.gpr[op.rb]), _mm_set1_epi32(1));
+	spu.gpr[op.rt].vi = _mm_add_epi32(sse_cmpgt_epu32(spu.gpr[op.ra].vi, spu.gpr[op.rb].vi), _mm_set1_epi32(1));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SFH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SFH(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_sub16(spu.gpr[op.rb], spu.gpr[op.ra]);
+	spu.gpr[op.rt] = v128::sub16(spu.gpr[op.rb], spu.gpr[op.ra]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool NOR(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::NOR(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt] = ~(spu.gpr[op.ra] | spu.gpr[op.rb]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ABSDB(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ABSDB(spu_thread& spu, spu_opcode_t op)
 {
 	const auto a = spu.gpr[op.ra];
 	const auto b = spu.gpr[op.rb];
-	spu.gpr[op.rt] = gv_sub8(gv_maxu8(a, b), gv_minu8(a, b));
+	spu.gpr[op.rt] = v128::sub8(v128::maxu8(a, b), v128::minu8(a, b));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROT(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROT(spu_thread& spu, spu_opcode_t op)
 {
 	const auto a = spu.gpr[op.ra];
 	const auto b = spu.gpr[op.rb];
@@ -296,8 +237,7 @@ bool ROT(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTM(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTM(spu_thread& spu, spu_opcode_t op)
 {
 	const auto a = spu.gpr[op.ra];
 	const auto b = spu.gpr[op.rb];
@@ -310,8 +250,7 @@ bool ROTM(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTMA(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTMA(spu_thread& spu, spu_opcode_t op)
 {
 	const auto a = spu.gpr[op.ra];
 	const auto b = spu.gpr[op.rb];
@@ -324,8 +263,7 @@ bool ROTMA(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SHL(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SHL(spu_thread& spu, spu_opcode_t op)
 {
 	const auto a = spu.gpr[op.ra];
 	const auto b = spu.gpr[op.rb];
@@ -338,8 +276,7 @@ bool SHL(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTH(spu_thread& spu, spu_opcode_t op)
 {
 	const auto a = spu.gpr[op.ra];
 	const auto b = spu.gpr[op.rb];
@@ -351,8 +288,7 @@ bool ROTH(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTHM(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTHM(spu_thread& spu, spu_opcode_t op)
 {
 	const auto a = spu.gpr[op.ra];
 	const auto b = spu.gpr[op.rb];
@@ -365,8 +301,7 @@ bool ROTHM(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTMAH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTMAH(spu_thread& spu, spu_opcode_t op)
 {
 	const auto a = spu.gpr[op.ra];
 	const auto b = spu.gpr[op.rb];
@@ -379,8 +314,7 @@ bool ROTMAH(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SHLH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SHLH(spu_thread& spu, spu_opcode_t op)
 {
 	const auto a = spu.gpr[op.ra];
 	const auto b = spu.gpr[op.rb];
@@ -393,127 +327,105 @@ bool SHLH(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTI(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	const s32 n = op.i7 & 0x1f;
-	spu.gpr[op.rt] = _mm_or_si128(_mm_slli_epi32(a, n), _mm_srli_epi32(a, 32 - n));
+	spu.gpr[op.rt].vi = _mm_or_si128(_mm_slli_epi32(a, n), _mm_srli_epi32(a, 32 - n));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTMI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTMI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_srli_epi32(spu.gpr[op.ra], (0-op.i7) & 0x3f);
+	spu.gpr[op.rt].vi = _mm_srli_epi32(spu.gpr[op.ra].vi, (0-op.i7) & 0x3f);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTMAI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTMAI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_srai_epi32(spu.gpr[op.ra], (0-op.i7) & 0x3f);
+	spu.gpr[op.rt].vi = _mm_srai_epi32(spu.gpr[op.ra].vi, (0-op.i7) & 0x3f);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SHLI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SHLI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_slli_epi32(spu.gpr[op.ra], op.i7 & 0x3f);
+	spu.gpr[op.rt].vi = _mm_slli_epi32(spu.gpr[op.ra].vi, op.i7 & 0x3f);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTHI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTHI(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	const s32 n = op.i7 & 0xf;
-	spu.gpr[op.rt] = _mm_or_si128(_mm_slli_epi16(a, n), _mm_srli_epi16(a, 16 - n));
+	spu.gpr[op.rt].vi = _mm_or_si128(_mm_slli_epi16(a, n), _mm_srli_epi16(a, 16 - n));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTHMI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTHMI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_srli_epi16(spu.gpr[op.ra], (0-op.i7) & 0x1f);
+	spu.gpr[op.rt].vi = _mm_srli_epi16(spu.gpr[op.ra].vi, (0-op.i7) & 0x1f);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTMAHI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTMAHI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_srai_epi16(spu.gpr[op.ra], (0-op.i7) & 0x1f);
+	spu.gpr[op.rt].vi = _mm_srai_epi16(spu.gpr[op.ra].vi, (0-op.i7) & 0x1f);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SHLHI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SHLHI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_slli_epi16(spu.gpr[op.ra], op.i7 & 0x1f);
+	spu.gpr[op.rt].vi = _mm_slli_epi16(spu.gpr[op.ra].vi, op.i7 & 0x1f);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool A(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::A(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_add32(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt] = v128::add32(spu.gpr[op.ra], spu.gpr[op.rb]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool AND(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::AND(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt] = spu.gpr[op.ra] & spu.gpr[op.rb];
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CG(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CG(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = _mm_xor_si128(spu.gpr[op.ra], _mm_set1_epi32(0x7fffffff));
-	const auto b = _mm_xor_si128(spu.gpr[op.rb], _mm_set1_epi32(0x80000000));
-	spu.gpr[op.rt] = _mm_srli_epi32(_mm_cmpgt_epi32(b, a), 31);
+	const auto a = _mm_xor_si128(spu.gpr[op.ra].vi, _mm_set1_epi32(0x7fffffff));
+	const auto b = _mm_xor_si128(spu.gpr[op.rb].vi, _mm_set1_epi32(0x80000000));
+	spu.gpr[op.rt].vi = _mm_srli_epi32(_mm_cmpgt_epi32(b, a), 31);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool AH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::AH(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_add16(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt] = v128::add16(spu.gpr[op.ra], spu.gpr[op.rb]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool NAND(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::NAND(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt] = ~(spu.gpr[op.ra] & spu.gpr[op.rb]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool AVGB(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::AVGB(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_avg_epu8(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt].vi = _mm_avg_epu8(spu.gpr[op.ra].vi, spu.gpr[op.rb].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool MTSPR(spu_thread&, spu_opcode_t)
+bool spu_interpreter::MTSPR(spu_thread&, spu_opcode_t)
 {
 	// SPR writes are ignored. TODO: check it.
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool WRCH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::WRCH(spu_thread& spu, spu_opcode_t op)
 {
-	const bool allow = std::exchange(spu.allow_interrupts_in_cpu_work, false);
-
-	const bool advance_pc = spu.set_ch_value(op.ra, spu.gpr[op.rt]._u32[3]);
-
-	spu.allow_interrupts_in_cpu_work = allow;
-
-	if (!advance_pc)
+	if (!spu.set_ch_value(op.ra, spu.gpr[op.rt]._u32[3]))
 	{
 		return false;
 	}
@@ -527,95 +439,85 @@ bool WRCH(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool BIZ(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BIZ(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.rt]._u32[3] == 0)
 	{
 		spu.pc = spu_branch_target(spu.gpr[op.ra]._u32[3]);
-		spu_interpreter::set_interrupt_status(spu, op);
+		set_interrupt_status(spu, op);
 		return false;
 	}
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool BINZ(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BINZ(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.rt]._u32[3] != 0)
 	{
 		spu.pc = spu_branch_target(spu.gpr[op.ra]._u32[3]);
-		spu_interpreter::set_interrupt_status(spu, op);
+		set_interrupt_status(spu, op);
 		return false;
 	}
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool BIHZ(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BIHZ(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.rt]._u16[6] == 0)
 	{
 		spu.pc = spu_branch_target(spu.gpr[op.ra]._u32[3]);
-		spu_interpreter::set_interrupt_status(spu, op);
+		set_interrupt_status(spu, op);
 		return false;
 	}
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool BIHNZ(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BIHNZ(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.rt]._u16[6] != 0)
 	{
 		spu.pc = spu_branch_target(spu.gpr[op.ra]._u32[3]);
-		spu_interpreter::set_interrupt_status(spu, op);
+		set_interrupt_status(spu, op);
 		return false;
 	}
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool STOPD(spu_thread& spu, spu_opcode_t)
+bool spu_interpreter::STOPD(spu_thread& spu, spu_opcode_t)
 {
 	return spu.stop_and_signal(0x3fff);
 }
 
-template <spu_exec_bit... Flags>
-bool STQX(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::STQX(spu_thread& spu, spu_opcode_t op)
 {
 	spu._ref<v128>((spu.gpr[op.ra]._u32[3] + spu.gpr[op.rb]._u32[3]) & 0x3fff0) = spu.gpr[op.rt];
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool BI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BI(spu_thread& spu, spu_opcode_t op)
 {
 	spu.pc = spu_branch_target(spu.gpr[op.ra]._u32[3]);
-	spu_interpreter::set_interrupt_status(spu, op);
+	set_interrupt_status(spu, op);
 	return false;
 }
 
-template <spu_exec_bit... Flags>
-bool BISL(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BISL(spu_thread& spu, spu_opcode_t op)
 {
 	const u32 target = spu_branch_target(spu.gpr[op.ra]._u32[3]);
 	spu.gpr[op.rt] = v128::from32r(spu_branch_target(spu.pc + 4));
 	spu.pc = target;
-	spu_interpreter::set_interrupt_status(spu, op);
+	set_interrupt_status(spu, op);
 	return false;
 }
 
-template <spu_exec_bit... Flags>
-bool IRET(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::IRET(spu_thread& spu, spu_opcode_t op)
 {
 	spu.pc = spu.srr0;
-	spu_interpreter::set_interrupt_status(spu, op);
+	set_interrupt_status(spu, op);
 	return false;
 }
 
-template <spu_exec_bit... Flags>
-bool BISLED(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BISLED(spu_thread& spu, spu_opcode_t op)
 {
 	const u32 target = spu_branch_target(spu.gpr[op.ra]._u32[3]);
 	spu.gpr[op.rt] = v128::from32r(spu_branch_target(spu.pc + 4));
@@ -623,153 +525,111 @@ bool BISLED(spu_thread& spu, spu_opcode_t op)
 	if (spu.get_events().count)
 	{
 		spu.pc = target;
-		spu_interpreter::set_interrupt_status(spu, op);
+		set_interrupt_status(spu, op);
 		return false;
 	}
 
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool HBR(spu_thread&, spu_opcode_t)
+bool spu_interpreter::HBR(spu_thread&, spu_opcode_t)
 {
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool GB(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::GB(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = v128::from32r(_mm_movemask_ps(_mm_castsi128_ps(_mm_slli_epi32(spu.gpr[op.ra], 31))));
+	spu.gpr[op.rt] = v128::from32r(_mm_movemask_ps(_mm_castsi128_ps(_mm_slli_epi32(spu.gpr[op.ra].vi, 31))));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool GBH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::GBH(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = v128::from32r(_mm_movemask_epi8(_mm_packs_epi16(_mm_slli_epi16(spu.gpr[op.ra], 15), _mm_setzero_si128())));
+	spu.gpr[op.rt] = v128::from32r(_mm_movemask_epi8(_mm_packs_epi16(_mm_slli_epi16(spu.gpr[op.ra].vi, 15), _mm_setzero_si128())));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool GBB(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::GBB(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = v128::from32r(_mm_movemask_epi8(_mm_slli_epi64(spu.gpr[op.ra], 7)));
+	spu.gpr[op.rt] = v128::from32r(_mm_movemask_epi8(_mm_slli_epi64(spu.gpr[op.ra].vi, 7)));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FSM(spu_thread& spu, spu_opcode_t op)
+#ifndef _MSC_VER
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+
+bool spu_interpreter::FSM(spu_thread& spu, spu_opcode_t op)
 {
-	const auto bits = _mm_shuffle_epi32(spu.gpr[op.ra], 0xff);
+	const auto bits = _mm_shuffle_epi32(spu.gpr[op.ra].vi, 0xff);
 	const auto mask = _mm_set_epi32(8, 4, 2, 1);
-	spu.gpr[op.rt] = _mm_cmpeq_epi32(_mm_and_si128(bits, mask), mask);
+	spu.gpr[op.rt].vi = _mm_cmpeq_epi32(_mm_and_si128(bits, mask), mask);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FSMH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::FSMH(spu_thread& spu, spu_opcode_t op)
 {
-	const auto vsrc = spu.gpr[op.ra];
+	const auto vsrc = spu.gpr[op.ra].vi;
 	const auto bits = _mm_shuffle_epi32(_mm_unpackhi_epi16(vsrc, vsrc), 0xaa);
 	const auto mask = _mm_set_epi16(128, 64, 32, 16, 8, 4, 2, 1);
-	spu.gpr[op.rt] = _mm_cmpeq_epi16(_mm_and_si128(bits, mask), mask);
+	spu.gpr[op.rt].vi = _mm_cmpeq_epi16(_mm_and_si128(bits, mask), mask);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FSMB(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::FSMB(spu_thread& spu, spu_opcode_t op)
 {
-	const auto vsrc = spu.gpr[op.ra];
+	const auto vsrc = spu.gpr[op.ra].vi;
 	const auto bits = _mm_shuffle_epi32(_mm_shufflehi_epi16(_mm_unpackhi_epi8(vsrc, vsrc), 0x50), 0xfa);
 	const auto mask = _mm_set_epi8(-128, 64, 32, 16, 8, 4, 2, 1, -128, 64, 32, 16, 8, 4, 2, 1);
-	spu.gpr[op.rt] = _mm_cmpeq_epi8(_mm_and_si128(bits, mask), mask);
+	spu.gpr[op.rt].vi = _mm_cmpeq_epi8(_mm_and_si128(bits, mask), mask);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FREST(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FREST(spu_thread& spu, spu_opcode_t op)
 {
-	v128 fraction_index = v128(_mm_srli_epi32(spu.gpr[op.ra], 18)) & v128(_mm_set1_epi32(0x1F));
-	v128 exponent_index = v128(_mm_srli_epi32(spu.gpr[op.ra], 23)) & v128(_mm_set1_epi32(0xFF));
-	v128 sign = spu.gpr[op.ra] & _mm_set1_epi32(0x80000000);
-
-	// AVX2
-	// v128 fraction = _mm_i32gather_epi32(spu_frest_fraction_lut, fraction_index, 4);
-	// v128 exponent = _mm_i32gather_epi32(spu_frest_exponent_lut, exponent_index, 4);
-
-	v128 result;
-
-	for (u32 index = 0; index < 4; index++)
-	{
-		u32 r = spu_frest_fraction_lut[fraction_index._u32[index]];
-		r |= spu_frest_exponent_lut[exponent_index._u32[index]];
-		r |= sign._u32[index];
-		result._u32[index] = r;
-	}
-
-	spu.gpr[op.rt] = result;
+	spu.gpr[op.rt].vf = _mm_rcp_ps(spu.gpr[op.ra].vf);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FRSQEST(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FRSQEST(spu_thread& spu, spu_opcode_t op)
 {
-	v128 fraction_index = v128(_mm_srli_epi32(spu.gpr[op.ra], 18)) & v128(_mm_set1_epi32(0x3F));
-	v128 exponent_index = v128(_mm_srli_epi32(spu.gpr[op.ra], 23)) & v128(_mm_set1_epi32(0xFF));
-
-	// AVX2
-	// v128 fraction = _mm_i32gather_epi32(spu_frsqest_fraction_lut, fraction_index, 4);
-	// v128 exponent = _mm_i32gather_epi32(spu_frsqest_exponent_lut, exponent_index, 4);
-
-	v128 result;
-
-	for (u32 index = 0; index < 4; index++)
-	{
-		u32 r = spu_frsqest_fraction_lut[fraction_index._u32[index]];
-		r |= spu_frsqest_exponent_lut[exponent_index._u32[index]];
-		result._u32[index] = r;
-	}
-
-	spu.gpr[op.rt] = result;
+	const auto mask = _mm_castsi128_ps(_mm_set1_epi32(0x7fffffff));
+	spu.gpr[op.rt].vf = _mm_rsqrt_ps(_mm_and_ps(spu.gpr[op.ra].vf, mask));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool LQX(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::LQX(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt] = spu._ref<v128>((spu.gpr[op.ra]._u32[3] + spu.gpr[op.rb]._u32[3]) & 0x3fff0);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTQBYBI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTQBYBI(spu_thread& spu, spu_opcode_t op)
 {
-	const __m128i a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	alignas(32) const __m128i buf[2]{a, a};
-	spu.gpr[op.rt] = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + (16 - (spu.gpr[op.rb]._u32[3] >> 3 & 0xf))));
+	spu.gpr[op.rt].vi = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + (16 - (spu.gpr[op.rb]._u32[3] >> 3 & 0xf))));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTQMBYBI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTQMBYBI(spu_thread& spu, spu_opcode_t op)
 {
-	const __m128i a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	alignas(64) const __m128i buf[3]{a, _mm_setzero_si128(), _mm_setzero_si128()};
-	spu.gpr[op.rt] = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + ((0 - (spu.gpr[op.rb]._u32[3] >> 3)) & 0x1f)));
+	spu.gpr[op.rt].vi = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + ((0 - (spu.gpr[op.rb]._u32[3] >> 3)) & 0x1f)));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SHLQBYBI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SHLQBYBI(spu_thread& spu, spu_opcode_t op)
 {
-	const __m128i a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	alignas(64) const __m128i buf[3]{_mm_setzero_si128(), _mm_setzero_si128(), a};
-	spu.gpr[op.rt] = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + (32 - (spu.gpr[op.rb]._u32[3] >> 3 & 0x1f))));
+	spu.gpr[op.rt].vi = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + (32 - (spu.gpr[op.rb]._u32[3] >> 3 & 0x1f))));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CBX(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CBX(spu_thread& spu, spu_opcode_t op)
 {
 	if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF))
 	{
@@ -782,8 +642,7 @@ bool CBX(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CHX(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CHX(spu_thread& spu, spu_opcode_t op)
 {
 	if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF))
 	{
@@ -796,8 +655,7 @@ bool CHX(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CWX(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CWX(spu_thread& spu, spu_opcode_t op)
 {
 	if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF))
 	{
@@ -810,8 +668,7 @@ bool CWX(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CDX(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CDX(spu_thread& spu, spu_opcode_t op)
 {
 	if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF))
 	{
@@ -824,69 +681,61 @@ bool CDX(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTQBI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTQBI(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	const s32 n = spu.gpr[op.rb]._s32[3] & 0x7;
-	spu.gpr[op.rt] = _mm_or_si128(_mm_slli_epi64(a, n), _mm_srli_epi64(_mm_shuffle_epi32(a, 0x4E), 64 - n));
+	spu.gpr[op.rt].vi = _mm_or_si128(_mm_slli_epi64(a, n), _mm_srli_epi64(_mm_shuffle_epi32(a, 0x4E), 64 - n));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTQMBI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTQMBI(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	const s32 n = -spu.gpr[op.rb]._s32[3] & 0x7;
-	spu.gpr[op.rt] = _mm_or_si128(_mm_srli_epi64(a, n), _mm_slli_epi64(_mm_srli_si128(a, 8), 64 - n));
+	spu.gpr[op.rt].vi = _mm_or_si128(_mm_srli_epi64(a, n), _mm_slli_epi64(_mm_srli_si128(a, 8), 64 - n));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SHLQBI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SHLQBI(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	const s32 n = spu.gpr[op.rb]._u32[3] & 0x7;
-	spu.gpr[op.rt] = _mm_or_si128(_mm_slli_epi64(a, n), _mm_srli_epi64(_mm_slli_si128(a, 8), 64 - n));
+	spu.gpr[op.rt].vi = _mm_or_si128(_mm_slli_epi64(a, n), _mm_srli_epi64(_mm_slli_si128(a, 8), 64 - n));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTQBY(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTQBY(spu_thread& spu, spu_opcode_t op)
 {
-	const __m128i a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	alignas(32) const __m128i buf[2]{a, a};
-	spu.gpr[op.rt] = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + (16 - (spu.gpr[op.rb]._u32[3] & 0xf))));
+	spu.gpr[op.rt].vi = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + (16 - (spu.gpr[op.rb]._u32[3] & 0xf))));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTQMBY(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTQMBY(spu_thread& spu, spu_opcode_t op)
 {
-	const __m128i a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	alignas(64) const __m128i buf[3]{a, _mm_setzero_si128(), _mm_setzero_si128()};
-	spu.gpr[op.rt] = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + ((0 - spu.gpr[op.rb]._u32[3]) & 0x1f)));
+	spu.gpr[op.rt].vi = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + ((0 - spu.gpr[op.rb]._u32[3]) & 0x1f)));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SHLQBY(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SHLQBY(spu_thread& spu, spu_opcode_t op)
 {
-	const __m128i a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	alignas(64) const __m128i buf[3]{_mm_setzero_si128(), _mm_setzero_si128(), a};
-	spu.gpr[op.rt] = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + (32 - (spu.gpr[op.rb]._u32[3] & 0x1f))));
+	spu.gpr[op.rt].vi = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + (32 - (spu.gpr[op.rb]._u32[3] & 0x1f))));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ORX(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ORX(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt] = v128::from32r(spu.gpr[op.ra]._u32[0] | spu.gpr[op.ra]._u32[1] | spu.gpr[op.ra]._u32[2] | spu.gpr[op.ra]._u32[3]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CBD(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CBD(spu_thread& spu, spu_opcode_t op)
 {
 	if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF))
 	{
@@ -899,8 +748,7 @@ bool CBD(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CHD(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CHD(spu_thread& spu, spu_opcode_t op)
 {
 	if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF))
 	{
@@ -913,8 +761,7 @@ bool CHD(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CWD(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CWD(spu_thread& spu, spu_opcode_t op)
 {
 	if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF))
 	{
@@ -927,8 +774,7 @@ bool CWD(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CDD(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CDD(spu_thread& spu, spu_opcode_t op)
 {
 	if (op.ra == 1 && (spu.gpr[1]._u32[3] & 0xF))
 	{
@@ -941,108 +787,95 @@ bool CDD(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTQBII(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTQBII(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	const s32 n = op.i7 & 0x7;
-	spu.gpr[op.rt] = _mm_or_si128(_mm_slli_epi64(a, n), _mm_srli_epi64(_mm_shuffle_epi32(a, 0x4E), 64 - n));
+	spu.gpr[op.rt].vi = _mm_or_si128(_mm_slli_epi64(a, n), _mm_srli_epi64(_mm_shuffle_epi32(a, 0x4E), 64 - n));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTQMBII(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTQMBII(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	const s32 n = (0-op.i7) & 0x7;
-	spu.gpr[op.rt] = _mm_or_si128(_mm_srli_epi64(a, n), _mm_slli_epi64(_mm_srli_si128(a, 8), 64 - n));
+	spu.gpr[op.rt].vi = _mm_or_si128(_mm_srli_epi64(a, n), _mm_slli_epi64(_mm_srli_si128(a, 8), 64 - n));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SHLQBII(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SHLQBII(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	const s32 n = op.i7 & 0x7;
-	spu.gpr[op.rt] = _mm_or_si128(_mm_slli_epi64(a, n), _mm_srli_epi64(_mm_slli_si128(a, 8), 64 - n));
+	spu.gpr[op.rt].vi = _mm_or_si128(_mm_slli_epi64(a, n), _mm_srli_epi64(_mm_slli_si128(a, 8), 64 - n));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTQBYI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTQBYI(spu_thread& spu, spu_opcode_t op)
 {
-	const __m128i a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	alignas(32) const __m128i buf[2]{a, a};
-	spu.gpr[op.rt] = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + (16 - (op.i7 & 0xf))));
+	spu.gpr[op.rt].vi = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + (16 - (op.i7 & 0xf))));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ROTQMBYI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ROTQMBYI(spu_thread& spu, spu_opcode_t op)
 {
-	const __m128i a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	alignas(64) const __m128i buf[3]{a, _mm_setzero_si128(), _mm_setzero_si128()};
-	spu.gpr[op.rt] = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + ((0 - op.i7) & 0x1f)));
+	spu.gpr[op.rt].vi = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + ((0 - op.i7) & 0x1f)));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SHLQBYI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SHLQBYI(spu_thread& spu, spu_opcode_t op)
 {
-	const __m128i a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	alignas(64) const __m128i buf[3]{_mm_setzero_si128(), _mm_setzero_si128(), a};
-	spu.gpr[op.rt] = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + (32 - (op.i7 & 0x1f))));
+	spu.gpr[op.rt].vi = _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + (32 - (op.i7 & 0x1f))));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool NOP(spu_thread&, spu_opcode_t)
+bool spu_interpreter::NOP(spu_thread&, spu_opcode_t)
 {
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CGT(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CGT(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpgt_epi32(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt].vi = _mm_cmpgt_epi32(spu.gpr[op.ra].vi, spu.gpr[op.rb].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool XOR(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::XOR(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt] = spu.gpr[op.ra] ^ spu.gpr[op.rb];
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CGTH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CGTH(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpgt_epi16(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt].vi = _mm_cmpgt_epi16(spu.gpr[op.ra].vi, spu.gpr[op.rb].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool EQV(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::EQV(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt] = ~(spu.gpr[op.ra] ^ spu.gpr[op.rb]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CGTB(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CGTB(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpgt_epi8(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt].vi = _mm_cmpgt_epi8(spu.gpr[op.ra].vi, spu.gpr[op.rb].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SUMB(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SUMB(spu_thread& spu, spu_opcode_t op)
 {
 	const auto m1 = _mm_set1_epi16(0xff);
 	const auto m2 = _mm_set1_epi32(0xffff);
-	const auto a = spu.gpr[op.ra];
-	const auto b = spu.gpr[op.rb];
+	const auto a = spu.gpr[op.ra].vi;
+	const auto b = spu.gpr[op.rb].vi;
 	const auto a1 = _mm_srli_epi16(a, 8);
 	const auto a2 = _mm_and_si128(a, m1);
 	const auto b1 = _mm_srli_epi16(b, 8);
@@ -1053,12 +886,11 @@ bool SUMB(spu_thread& spu, spu_opcode_t op)
 	const auto s1 = _mm_srli_epi32(sa, 16);
 	const auto s4 = _mm_andnot_si128(m2, sb);
 	const auto s3 = _mm_slli_epi32(sb, 16);
-	spu.gpr[op.rt] = _mm_or_si128(_mm_add_epi16(s1, s2), _mm_add_epi16(s3, s4));
+	spu.gpr[op.rt].vi = _mm_or_si128(_mm_add_epi16(s1, s2), _mm_add_epi16(s3, s4));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool HGT(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::HGT(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.ra]._s32[3] > spu.gpr[op.rb]._s32[3])
 	{
@@ -1067,8 +899,7 @@ bool HGT(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CLZ(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CLZ(spu_thread& spu, spu_opcode_t op)
 {
 	for (u32 i = 0; i < 4; i++)
 	{
@@ -1077,58 +908,51 @@ bool CLZ(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool XSWD(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::XSWD(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt]._s64[0] = spu.gpr[op.ra]._s32[0];
 	spu.gpr[op.rt]._s64[1] = spu.gpr[op.ra]._s32[2];
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool XSHW(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::XSHW(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_srai_epi32(_mm_slli_epi32(spu.gpr[op.ra], 16), 16);
+	spu.gpr[op.rt].vi = _mm_srai_epi32(_mm_slli_epi32(spu.gpr[op.ra].vi, 16), 16);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CNTB(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CNTB(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	const auto mask1 = _mm_set1_epi8(0x55);
 	const auto sum1 = _mm_add_epi8(_mm_and_si128(_mm_srli_epi64(a, 1), mask1), _mm_and_si128(a, mask1));
 	const auto mask2 = _mm_set1_epi8(0x33);
 	const auto sum2 = _mm_add_epi8(_mm_and_si128(_mm_srli_epi64(sum1, 2), mask2), _mm_and_si128(sum1, mask2));
 	const auto mask3 = _mm_set1_epi8(0x0f);
 	const auto sum3 = _mm_add_epi8(_mm_and_si128(_mm_srli_epi64(sum2, 4), mask3), _mm_and_si128(sum2, mask3));
-	spu.gpr[op.rt] = sum3;
+	spu.gpr[op.rt].vi = sum3;
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool XSBH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::XSBH(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_srai_epi16(_mm_slli_epi16(spu.gpr[op.ra], 8), 8);
+	spu.gpr[op.rt].vi = _mm_srai_epi16(_mm_slli_epi16(spu.gpr[op.ra].vi, 8), 8);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CLGT(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CLGT(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_gtu32(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt].vi = sse_cmpgt_epu32(spu.gpr[op.ra].vi, spu.gpr[op.rb].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ANDC(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ANDC(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_andn(spu.gpr[op.rb], spu.gpr[op.ra]);
+	spu.gpr[op.rt] = v128::andnot(spu.gpr[op.rb], spu.gpr[op.ra]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FCGT(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FCGT(spu_thread& spu, spu_opcode_t op)
 {
 	// IMPL NOTES:
 	// if (v is inf) v = (inf - 1) i.e nearest normal value to inf with mantissa bits left intact
@@ -1137,77 +961,73 @@ bool FCGT(spu_thread& spu, spu_opcode_t op)
 	// branching simulated using bitwise ops and_not+or
 
 	const auto zero = _mm_set1_ps(0.f);
-	const auto nan_check_a = _mm_cmpunord_ps(spu.gpr[op.ra], zero);    //mask true where a is extended
-	const auto nan_check_b = _mm_cmpunord_ps(spu.gpr[op.rb], zero);    //mask true where b is extended
+	const auto nan_check_a = _mm_cmpunord_ps(spu.gpr[op.ra].vf, zero);    //mask true where a is extended
+	const auto nan_check_b = _mm_cmpunord_ps(spu.gpr[op.rb].vf, zero);    //mask true where b is extended
 
 	//calculate lowered a and b. The mantissa bits are left untouched for now unless its proven they should be flushed
 	const auto last_exp_bit = _mm_castsi128_ps(_mm_set1_epi32(0x00800000));
-	const auto lowered_a =_mm_andnot_ps(last_exp_bit, spu.gpr[op.ra]);      //a is lowered to largest unextended value with sign
-	const auto lowered_b = _mm_andnot_ps(last_exp_bit, spu.gpr[op.rb]);		//b is lowered to largest unextended value with sign
+	const auto lowered_a =_mm_andnot_ps(last_exp_bit, spu.gpr[op.ra].vf);      //a is lowered to largest unextended value with sign
+	const auto lowered_b = _mm_andnot_ps(last_exp_bit, spu.gpr[op.rb].vf);		//b is lowered to largest unextended value with sign
 
 	//check if a and b are denormalized
 	const auto all_exp_bits = _mm_castsi128_ps(_mm_set1_epi32(0x7f800000));
-	const auto denorm_check_a = _mm_cmpeq_ps(zero, _mm_and_ps(all_exp_bits, spu.gpr[op.ra]));
-	const auto denorm_check_b = _mm_cmpeq_ps(zero, _mm_and_ps(all_exp_bits, spu.gpr[op.rb]));
+	const auto denorm_check_a = _mm_cmpeq_ps(zero, _mm_and_ps(all_exp_bits, spu.gpr[op.ra].vf));
+	const auto denorm_check_b = _mm_cmpeq_ps(zero, _mm_and_ps(all_exp_bits, spu.gpr[op.rb].vf));
 
 	//set a and b to their lowered values if they are extended
 	const auto a_values_lowered = _mm_and_ps(nan_check_a, lowered_a);
-	const auto original_a_masked = _mm_andnot_ps(nan_check_a, spu.gpr[op.ra]);
+	const auto original_a_masked = _mm_andnot_ps(nan_check_a, spu.gpr[op.ra].vf);
 	const auto a_final1 = _mm_or_ps(a_values_lowered, original_a_masked);
 
 	const auto b_values_lowered = _mm_and_ps(nan_check_b, lowered_b);
-	const auto original_b_masked = _mm_andnot_ps(nan_check_b, spu.gpr[op.rb]);
+	const auto original_b_masked = _mm_andnot_ps(nan_check_b, spu.gpr[op.rb].vf);
 	const auto b_final1 = _mm_or_ps(b_values_lowered, original_b_masked);
 
 	//Flush denormals to zero
 	const auto final_a = _mm_andnot_ps(denorm_check_a, a_final1);
 	const auto final_b = _mm_andnot_ps(denorm_check_b, b_final1);
 
-	spu.gpr[op.rt] = _mm_cmplt_ps(final_b, final_a);
+	spu.gpr[op.rt].vf = _mm_cmplt_ps(final_b, final_a);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool DFCGT(spu_thread&, spu_opcode_t)
+bool spu_interpreter::DFCGT(spu_thread&, spu_opcode_t)
 {
 	spu_log.fatal("DFCGT");
 	return false;
 }
 
-template <spu_exec_bit... Flags>
-bool FA(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FA(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_addfs(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt] = v128::addfs(spu.gpr[op.ra], spu.gpr[op.rb]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FS(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FS(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_subfs(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt] = v128::subfs(spu.gpr[op.ra], spu.gpr[op.rb]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FM(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FM(spu_thread& spu, spu_opcode_t op)
 {
 	const auto zero = _mm_set1_ps(0.f);
 	const auto sign_bits = _mm_castsi128_ps(_mm_set1_epi32(0x80000000));
 	const auto all_exp_bits = _mm_castsi128_ps(_mm_set1_epi32(0x7f800000));
 
 	//check denormals
-	const auto denorm_check_a = _mm_cmpeq_ps(zero, _mm_and_ps(all_exp_bits, spu.gpr[op.ra]));
-	const auto denorm_check_b = _mm_cmpeq_ps(zero, _mm_and_ps(all_exp_bits, spu.gpr[op.rb]));
+	const auto denorm_check_a = _mm_cmpeq_ps(zero, _mm_and_ps(all_exp_bits, spu.gpr[op.ra].vf));
+	const auto denorm_check_b = _mm_cmpeq_ps(zero, _mm_and_ps(all_exp_bits, spu.gpr[op.rb].vf));
 	const auto denorm_operand_mask = _mm_or_ps(denorm_check_a, denorm_check_b);
 
 	//compute result with flushed denormal inputs
-	const auto primary_result = _mm_mul_ps(spu.gpr[op.ra], spu.gpr[op.rb]);
+	const auto primary_result = _mm_mul_ps(spu.gpr[op.ra].vf, spu.gpr[op.rb].vf);
 	const auto denom_result_mask = _mm_cmpeq_ps(zero, _mm_and_ps(all_exp_bits, primary_result));
 	const auto flushed_result = _mm_andnot_ps(_mm_or_ps(denom_result_mask, denorm_operand_mask), primary_result);
 
 	//check for extended
 	const auto nan_check = _mm_cmpeq_ps(_mm_and_ps(primary_result, all_exp_bits), all_exp_bits);
-	const auto sign_mask = _mm_xor_ps(_mm_and_ps(sign_bits, spu.gpr[op.ra]), _mm_and_ps(sign_bits, spu.gpr[op.rb]));
+	const auto sign_mask = _mm_xor_ps(_mm_and_ps(sign_bits, spu.gpr[op.ra].vf), _mm_and_ps(sign_bits, spu.gpr[op.rb].vf));
 	const auto extended_result = _mm_or_ps(sign_mask, _mm_andnot_ps(sign_bits, primary_result));
 	const auto final_extended = _mm_andnot_ps(denorm_operand_mask, extended_result);
 
@@ -1215,41 +1035,38 @@ bool FM(spu_thread& spu, spu_opcode_t op)
 	const auto set1 = _mm_andnot_ps(nan_check, flushed_result);
 	const auto set2 = _mm_and_ps(nan_check, final_extended);
 
-	spu.gpr[op.rt] = _mm_or_ps(set1, set2);
+	spu.gpr[op.rt].vf = _mm_or_ps(set1, set2);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CLGTH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CLGTH(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_gtu16(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt].vi = sse_cmpgt_epu16(spu.gpr[op.ra].vi, spu.gpr[op.rb].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ORC(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ORC(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt] = spu.gpr[op.ra] | ~spu.gpr[op.rb];
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FCMGT(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FCMGT(spu_thread& spu, spu_opcode_t op)
 {
 	//IMPL NOTES: See FCGT
 
 	const auto zero = _mm_set1_ps(0.f);
-	const auto nan_check_a = _mm_cmpunord_ps(spu.gpr[op.ra], zero);    //mask true where a is extended
-	const auto nan_check_b = _mm_cmpunord_ps(spu.gpr[op.rb], zero);    //mask true where b is extended
+	const auto nan_check_a = _mm_cmpunord_ps(spu.gpr[op.ra].vf, zero);    //mask true where a is extended
+	const auto nan_check_b = _mm_cmpunord_ps(spu.gpr[op.rb].vf, zero);    //mask true where b is extended
 
 	//check if a and b are denormalized
 	const auto all_exp_bits = _mm_castsi128_ps(_mm_set1_epi32(0x7f800000));
-	const auto denorm_check_a = _mm_cmpeq_ps(zero, _mm_and_ps(all_exp_bits, spu.gpr[op.ra]));
-	const auto denorm_check_b = _mm_cmpeq_ps(zero, _mm_and_ps(all_exp_bits, spu.gpr[op.rb]));
+	const auto denorm_check_a = _mm_cmpeq_ps(zero, _mm_and_ps(all_exp_bits, spu.gpr[op.ra].vf));
+	const auto denorm_check_b = _mm_cmpeq_ps(zero, _mm_and_ps(all_exp_bits, spu.gpr[op.rb].vf));
 
 	//Flush denormals to zero
-	const auto final_a = _mm_andnot_ps(denorm_check_a, spu.gpr[op.ra]);
-	const auto final_b = _mm_andnot_ps(denorm_check_b, spu.gpr[op.rb]);
+	const auto final_a = _mm_andnot_ps(denorm_check_a, spu.gpr[op.ra].vf);
+	const auto final_b = _mm_andnot_ps(denorm_check_b, spu.gpr[op.rb].vf);
 
 	//Mask to make a > b if a is extended but b is not (is this necessary on x86?)
 	const auto nan_mask = _mm_andnot_ps(nan_check_b, _mm_xor_ps(nan_check_a, nan_check_b));
@@ -1257,47 +1074,41 @@ bool FCMGT(spu_thread& spu, spu_opcode_t op)
 	const auto sign_mask = _mm_castsi128_ps(_mm_set1_epi32(0x7fffffff));
 	const auto comparison = _mm_cmplt_ps(_mm_and_ps(final_b, sign_mask), _mm_and_ps(final_a, sign_mask));
 
-	spu.gpr[op.rt] = _mm_or_ps(comparison, nan_mask);
+	spu.gpr[op.rt].vf = _mm_or_ps(comparison, nan_mask);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool DFCMGT(spu_thread&, spu_opcode_t)
+bool spu_interpreter::DFCMGT(spu_thread&, spu_opcode_t)
 {
 	spu_log.fatal("DFCMGT");
 	return false;
 }
 
-template <spu_exec_bit... Flags>
-bool DFA(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::DFA(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_addfd(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt] = v128::addfd(spu.gpr[op.ra], spu.gpr[op.rb]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool DFS(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::DFS(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_subfd(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt] = v128::subfd(spu.gpr[op.ra], spu.gpr[op.rb]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool DFM(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::DFM(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_mul_pd(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt].vd = _mm_mul_pd(spu.gpr[op.ra].vd, spu.gpr[op.rb].vd);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CLGTB(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CLGTB(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_gtu8(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt].vi = sse_cmpgt_epu8(spu.gpr[op.ra].vi, spu.gpr[op.rb].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool HLGT(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::HLGT(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.ra]._u32[3] > spu.gpr[op.rb]._u32[3])
 	{
@@ -1306,66 +1117,57 @@ bool HLGT(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool DFMA(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::DFMA(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_add_pd(_mm_mul_pd(spu.gpr[op.ra], spu.gpr[op.rb]), spu.gpr[op.rt]);
+	spu.gpr[op.rt].vd = _mm_add_pd(_mm_mul_pd(spu.gpr[op.ra].vd, spu.gpr[op.rb].vd), spu.gpr[op.rt].vd);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool DFMS(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::DFMS(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_sub_pd(_mm_mul_pd(spu.gpr[op.ra], spu.gpr[op.rb]), spu.gpr[op.rt]);
+	spu.gpr[op.rt].vd = _mm_sub_pd(_mm_mul_pd(spu.gpr[op.ra].vd, spu.gpr[op.rb].vd), spu.gpr[op.rt].vd);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool DFNMS(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::DFNMS(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_sub_pd(spu.gpr[op.rt], _mm_mul_pd(spu.gpr[op.ra], spu.gpr[op.rb]));
+	spu.gpr[op.rt].vd = _mm_sub_pd(spu.gpr[op.rt].vd, _mm_mul_pd(spu.gpr[op.ra].vd, spu.gpr[op.rb].vd));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool DFNMA(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::DFNMA(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_xor_pd(_mm_add_pd(_mm_mul_pd(spu.gpr[op.ra], spu.gpr[op.rb]), spu.gpr[op.rt]), _mm_set1_pd(-0.0));
+	spu.gpr[op.rt].vd = _mm_xor_pd(_mm_add_pd(_mm_mul_pd(spu.gpr[op.ra].vd, spu.gpr[op.rb].vd), spu.gpr[op.rt].vd), _mm_set1_pd(-0.0));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CEQ(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CEQ(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpeq_epi32(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt].vi = _mm_cmpeq_epi32(spu.gpr[op.ra].vi, spu.gpr[op.rb].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool MPYHHU(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::MPYHHU(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
-	const auto b = spu.gpr[op.rb];
-	spu.gpr[op.rt] = _mm_or_si128(_mm_srli_epi32(_mm_mullo_epi16(a, b), 16), _mm_and_si128(_mm_mulhi_epu16(a, b), _mm_set1_epi32(0xffff0000)));
+	const auto a = spu.gpr[op.ra].vi;
+	const auto b = spu.gpr[op.rb].vi;
+	spu.gpr[op.rt].vi = _mm_or_si128(_mm_srli_epi32(_mm_mullo_epi16(a, b), 16), _mm_and_si128(_mm_mulhi_epu16(a, b), _mm_set1_epi32(0xffff0000)));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ADDX(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ADDX(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_add32(gv_add32(spu.gpr[op.ra], spu.gpr[op.rb]), spu.gpr[op.rt] & v128::from32p(1));
+	spu.gpr[op.rt] = v128::add32(v128::add32(spu.gpr[op.ra], spu.gpr[op.rb]), spu.gpr[op.rt] & v128::from32p(1));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SFX(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SFX(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = gv_sub32(gv_sub32(spu.gpr[op.rb], spu.gpr[op.ra]), gv_andn(spu.gpr[op.rt], v128::from32p(1)));
+	spu.gpr[op.rt] = v128::sub32(v128::sub32(spu.gpr[op.rb], spu.gpr[op.ra]), v128::andnot(spu.gpr[op.rt], v128::from32p(1)));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CGX(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CGX(spu_thread& spu, spu_opcode_t op)
 {
 	for (s32 i = 0; i < 4; i++)
 	{
@@ -1375,8 +1177,7 @@ bool CGX(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool BGX(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BGX(spu_thread& spu, spu_opcode_t op)
 {
 	for (s32 i = 0; i < 4; i++)
 	{
@@ -1386,156 +1187,136 @@ bool BGX(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool MPYHHA(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::MPYHHA(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_add_epi32(spu.gpr[op.rt], _mm_madd_epi16(_mm_srli_epi32(spu.gpr[op.ra], 16), _mm_srli_epi32(spu.gpr[op.rb], 16)));
+	spu.gpr[op.rt].vi = _mm_add_epi32(spu.gpr[op.rt].vi, _mm_madd_epi16(_mm_srli_epi32(spu.gpr[op.ra].vi, 16), _mm_srli_epi32(spu.gpr[op.rb].vi, 16)));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool MPYHHAU(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::MPYHHAU(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
-	const auto b = spu.gpr[op.rb];
-	spu.gpr[op.rt] = _mm_add_epi32(spu.gpr[op.rt], _mm_or_si128(_mm_srli_epi32(_mm_mullo_epi16(a, b), 16), _mm_and_si128(_mm_mulhi_epu16(a, b), _mm_set1_epi32(0xffff0000))));
+	const auto a = spu.gpr[op.ra].vi;
+	const auto b = spu.gpr[op.rb].vi;
+	spu.gpr[op.rt].vi = _mm_add_epi32(spu.gpr[op.rt].vi, _mm_or_si128(_mm_srli_epi32(_mm_mullo_epi16(a, b), 16), _mm_and_si128(_mm_mulhi_epu16(a, b), _mm_set1_epi32(0xffff0000))));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FSCRRD(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FSCRRD(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt].clear();
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FESD(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FESD(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
-	spu.gpr[op.rt] = _mm_cvtps_pd(_mm_shuffle_ps(a, a, 0x8d));
+	const auto a = spu.gpr[op.ra].vf;
+	spu.gpr[op.rt].vd = _mm_cvtps_pd(_mm_shuffle_ps(a, a, 0x8d));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FRDS(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FRDS(spu_thread& spu, spu_opcode_t op)
 {
-	const auto t = _mm_cvtpd_ps(spu.gpr[op.ra]);
-	spu.gpr[op.rt] = _mm_shuffle_ps(t, t, 0x72);
+	const auto t = _mm_cvtpd_ps(spu.gpr[op.ra].vd);
+	spu.gpr[op.rt].vf = _mm_shuffle_ps(t, t, 0x72);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FSCRWR(spu_thread&, spu_opcode_t)
+bool spu_interpreter_fast::FSCRWR(spu_thread&, spu_opcode_t)
 {
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool DFTSV(spu_thread&, spu_opcode_t)
+bool spu_interpreter::DFTSV(spu_thread&, spu_opcode_t)
 {
 	spu_log.fatal("DFTSV");
 	return false;
 }
 
-template <spu_exec_bit... Flags>
-bool FCEQ(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FCEQ(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpeq_ps(spu.gpr[op.rb], spu.gpr[op.ra]);
+	spu.gpr[op.rt].vf = _mm_cmpeq_ps(spu.gpr[op.rb].vf, spu.gpr[op.ra].vf);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool DFCEQ(spu_thread&, spu_opcode_t)
+bool spu_interpreter::DFCEQ(spu_thread&, spu_opcode_t)
 {
 	spu_log.fatal("DFCEQ");
 	return false;
 }
 
-template <spu_exec_bit... Flags>
-bool MPY(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::MPY(spu_thread& spu, spu_opcode_t op)
 {
 	const auto mask = _mm_set1_epi32(0xffff);
-	spu.gpr[op.rt] = _mm_madd_epi16(_mm_and_si128(spu.gpr[op.ra], mask), _mm_and_si128(spu.gpr[op.rb], mask));
+	spu.gpr[op.rt].vi = _mm_madd_epi16(_mm_and_si128(spu.gpr[op.ra].vi, mask), _mm_and_si128(spu.gpr[op.rb].vi, mask));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool MPYH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::MPYH(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_slli_epi32(_mm_mullo_epi16(_mm_srli_epi32(spu.gpr[op.ra], 16), spu.gpr[op.rb]), 16);
+	spu.gpr[op.rt].vi = _mm_slli_epi32(_mm_mullo_epi16(_mm_srli_epi32(spu.gpr[op.ra].vi, 16), spu.gpr[op.rb].vi), 16);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool MPYHH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::MPYHH(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_madd_epi16(_mm_srli_epi32(spu.gpr[op.ra], 16), _mm_srli_epi32(spu.gpr[op.rb], 16));
+	spu.gpr[op.rt].vi = _mm_madd_epi16(_mm_srli_epi32(spu.gpr[op.ra].vi, 16), _mm_srli_epi32(spu.gpr[op.rb].vi, 16));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool MPYS(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::MPYS(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_srai_epi32(_mm_slli_epi32(_mm_mulhi_epi16(spu.gpr[op.ra], spu.gpr[op.rb]), 16), 16);
+	spu.gpr[op.rt].vi = _mm_srai_epi32(_mm_slli_epi32(_mm_mulhi_epi16(spu.gpr[op.ra].vi, spu.gpr[op.rb].vi), 16), 16);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CEQH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CEQH(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpeq_epi16(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt].vi = _mm_cmpeq_epi16(spu.gpr[op.ra].vi, spu.gpr[op.rb].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FCMEQ(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FCMEQ(spu_thread& spu, spu_opcode_t op)
 {
 	const auto mask = _mm_castsi128_ps(_mm_set1_epi32(0x7fffffff));
-	spu.gpr[op.rt] = _mm_cmpeq_ps(_mm_and_ps(spu.gpr[op.rb], mask), _mm_and_ps(spu.gpr[op.ra], mask));
+	spu.gpr[op.rt].vf = _mm_cmpeq_ps(_mm_and_ps(spu.gpr[op.rb].vf, mask), _mm_and_ps(spu.gpr[op.ra].vf, mask));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool DFCMEQ(spu_thread&, spu_opcode_t)
+bool spu_interpreter::DFCMEQ(spu_thread&, spu_opcode_t)
 {
 	spu_log.fatal("DFCMEQ");
 	return false;
 }
 
-template <spu_exec_bit... Flags>
-bool MPYU(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::MPYU(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
-	const auto b = spu.gpr[op.rb];
-	spu.gpr[op.rt] = _mm_or_si128(_mm_slli_epi32(_mm_mulhi_epu16(a, b), 16), _mm_and_si128(_mm_mullo_epi16(a, b), _mm_set1_epi32(0xffff)));
+	const auto a = spu.gpr[op.ra].vi;
+	const auto b = spu.gpr[op.rb].vi;
+	spu.gpr[op.rt].vi = _mm_or_si128(_mm_slli_epi32(_mm_mulhi_epu16(a, b), 16), _mm_and_si128(_mm_mullo_epi16(a, b), _mm_set1_epi32(0xffff)));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CEQB(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CEQB(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpeq_epi8(spu.gpr[op.ra], spu.gpr[op.rb]);
+	spu.gpr[op.rt].vi = _mm_cmpeq_epi8(spu.gpr[op.ra].vi, spu.gpr[op.rb].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FI(spu_thread& spu, spu_opcode_t op)
 {
 	// TODO
 	const auto mask_se = _mm_castsi128_ps(_mm_set1_epi32(0xff800000)); // sign and exponent mask
 	const auto mask_bf = _mm_castsi128_ps(_mm_set1_epi32(0x007ffc00)); // base fraction mask
 	const auto mask_sf = _mm_set1_epi32(0x000003ff); // step fraction mask
 	const auto mask_yf = _mm_set1_epi32(0x0007ffff); // Y fraction mask (bits 13..31)
-	const auto base = _mm_or_ps(_mm_and_ps(spu.gpr[op.rb], mask_bf), _mm_castsi128_ps(_mm_set1_epi32(0x3f800000)));
-	const auto step = _mm_mul_ps(_mm_cvtepi32_ps(_mm_and_si128(spu.gpr[op.rb], mask_sf)), _mm_set1_ps(std::exp2(-13.f)));
-	const auto y = _mm_mul_ps(_mm_cvtepi32_ps(_mm_and_si128(spu.gpr[op.ra], mask_yf)), _mm_set1_ps(std::exp2(-19.f)));
-	spu.gpr[op.rt] = _mm_or_ps(_mm_and_ps(mask_se, spu.gpr[op.rb]), _mm_andnot_ps(mask_se, _mm_sub_ps(base, _mm_mul_ps(step, y))));
+	const auto base = _mm_or_ps(_mm_and_ps(spu.gpr[op.rb].vf, mask_bf), _mm_castsi128_ps(_mm_set1_epi32(0x3f800000)));
+	const auto step = _mm_mul_ps(_mm_cvtepi32_ps(_mm_and_si128(spu.gpr[op.rb].vi, mask_sf)), _mm_set1_ps(std::exp2(-13.f)));
+	const auto y = _mm_mul_ps(_mm_cvtepi32_ps(_mm_and_si128(spu.gpr[op.ra].vi, mask_yf)), _mm_set1_ps(std::exp2(-19.f)));
+	spu.gpr[op.rt].vf = _mm_or_ps(_mm_and_ps(mask_se, spu.gpr[op.rb].vf), _mm_andnot_ps(mask_se, _mm_sub_ps(base, _mm_mul_ps(step, y))));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool HEQ(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::HEQ(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.ra]._s32[3] == spu.gpr[op.rb]._s32[3])
 	{
@@ -1545,42 +1326,37 @@ bool HEQ(spu_thread& spu, spu_opcode_t op)
 }
 
 
-template <spu_exec_bit... Flags>
-bool CFLTS(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::CFLTS(spu_thread& spu, spu_opcode_t op)
 {
-	const auto scaled = _mm_mul_ps(spu.gpr[op.ra], g_spu_imm.scale[173 - op.i8]);
-	spu.gpr[op.rt] = _mm_xor_si128(_mm_cvttps_epi32(scaled), _mm_castps_si128(_mm_cmpge_ps(scaled, _mm_set1_ps(0x80000000))));
+	const auto scaled = _mm_mul_ps(spu.gpr[op.ra].vf, g_spu_imm.scale[173 - op.i8]);
+	spu.gpr[op.rt].vi = _mm_xor_si128(_mm_cvttps_epi32(scaled), _mm_castps_si128(_mm_cmpge_ps(scaled, _mm_set1_ps(0x80000000))));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CFLTU(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::CFLTU(spu_thread& spu, spu_opcode_t op)
 {
-	const auto scaled1 = _mm_max_ps(_mm_mul_ps(spu.gpr[op.ra], g_spu_imm.scale[173 - op.i8]), _mm_set1_ps(0.0f));
+	const auto scaled1 = _mm_max_ps(_mm_mul_ps(spu.gpr[op.ra].vf, g_spu_imm.scale[173 - op.i8]), _mm_set1_ps(0.0f));
 	const auto scaled2 = _mm_and_ps(_mm_sub_ps(scaled1, _mm_set1_ps(0x80000000)), _mm_cmpge_ps(scaled1, _mm_set1_ps(0x80000000)));
-	spu.gpr[op.rt] = _mm_or_si128(_mm_or_si128(_mm_cvttps_epi32(scaled1), _mm_cvttps_epi32(scaled2)), _mm_castps_si128(_mm_cmpge_ps(scaled1, _mm_set1_ps(0x100000000))));
+	spu.gpr[op.rt].vi = _mm_or_si128(_mm_or_si128(_mm_cvttps_epi32(scaled1), _mm_cvttps_epi32(scaled2)), _mm_castps_si128(_mm_cmpge_ps(scaled1, _mm_set1_ps(0x100000000))));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CSFLT(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::CSFLT(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_mul_ps(_mm_cvtepi32_ps(spu.gpr[op.ra]), g_spu_imm.scale[op.i8 - 155]);
+	spu.gpr[op.rt].vf = _mm_mul_ps(_mm_cvtepi32_ps(spu.gpr[op.ra].vi), g_spu_imm.scale[op.i8 - 155]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CUFLT(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::CUFLT(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	const auto fix = _mm_and_ps(_mm_castsi128_ps(_mm_srai_epi32(a, 31)), _mm_set1_ps(0x80000000));
-	spu.gpr[op.rt] = _mm_mul_ps(_mm_add_ps(_mm_cvtepi32_ps(_mm_and_si128(a, _mm_set1_epi32(0x7fffffff))), fix), g_spu_imm.scale[op.i8 - 155]);
+	spu.gpr[op.rt].vf = _mm_mul_ps(_mm_add_ps(_mm_cvtepi32_ps(_mm_and_si128(a, _mm_set1_epi32(0x7fffffff))), fix), g_spu_imm.scale[op.i8 - 155]);
 	return true;
 }
 
 
-template <spu_exec_bit... Flags>
-bool BRZ(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BRZ(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.rt]._u32[3] == 0)
 	{
@@ -1590,15 +1366,13 @@ bool BRZ(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool STQA(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::STQA(spu_thread& spu, spu_opcode_t op)
 {
 	spu._ref<v128>(spu_ls_target(0, op.i16)) = spu.gpr[op.rt];
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool BRNZ(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BRNZ(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.rt]._u32[3] != 0)
 	{
@@ -1608,8 +1382,7 @@ bool BRNZ(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool BRHZ(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BRHZ(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.rt]._u16[6] == 0)
 	{
@@ -1619,8 +1392,7 @@ bool BRHZ(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool BRHNZ(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BRHNZ(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.rt]._u16[6] != 0)
 	{
@@ -1630,29 +1402,25 @@ bool BRHNZ(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool STQR(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::STQR(spu_thread& spu, spu_opcode_t op)
 {
 	spu._ref<v128>(spu_ls_target(spu.pc, op.i16)) = spu.gpr[op.rt];
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool BRA(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BRA(spu_thread& spu, spu_opcode_t op)
 {
 	spu.pc = spu_branch_target(0, op.i16);
 	return false;
 }
 
-template <spu_exec_bit... Flags>
-bool LQA(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::LQA(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt] = spu._ref<v128>(spu_ls_target(0, op.i16));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool BRASL(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BRASL(spu_thread& spu, spu_opcode_t op)
 {
 	const u32 target = spu_branch_target(0, op.i16);
 	spu.gpr[op.rt] = v128::from32r(spu_branch_target(spu.pc + 4));
@@ -1660,25 +1428,22 @@ bool BRASL(spu_thread& spu, spu_opcode_t op)
 	return false;
 }
 
-template <spu_exec_bit... Flags>
-bool BR(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BR(spu_thread& spu, spu_opcode_t op)
 {
 	spu.pc = spu_branch_target(spu.pc, op.i16);
 	return false;
 }
 
-template <spu_exec_bit... Flags>
-bool FSMBI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::FSMBI(spu_thread& spu, spu_opcode_t op)
 {
 	const auto vsrc = _mm_set_epi32(0, 0, 0, op.i16);
 	const auto bits = _mm_shuffle_epi32(_mm_shufflelo_epi16(_mm_unpacklo_epi8(vsrc, vsrc), 0x50), 0x50);
 	const auto mask = _mm_set_epi8(-128, 64, 32, 16, 8, 4, 2, 1, -128, 64, 32, 16, 8, 4, 2, 1);
-	spu.gpr[op.rt] = _mm_cmpeq_epi8(_mm_and_si128(bits, mask), mask);
+	spu.gpr[op.rt].vi = _mm_cmpeq_epi8(_mm_and_si128(bits, mask), mask);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool BRSL(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::BRSL(spu_thread& spu, spu_opcode_t op)
 {
 	const u32 target = spu_branch_target(spu.pc, op.i16);
 	spu.gpr[op.rt] = v128::from32r(spu_branch_target(spu.pc + 4));
@@ -1686,170 +1451,146 @@ bool BRSL(spu_thread& spu, spu_opcode_t op)
 	return false;
 }
 
-template <spu_exec_bit... Flags>
-bool LQR(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::LQR(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt] = spu._ref<v128>(spu_ls_target(spu.pc, op.i16));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool IL(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::IL(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_set1_epi32(op.si16);
+	spu.gpr[op.rt].vi = _mm_set1_epi32(op.si16);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ILHU(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ILHU(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_set1_epi32(op.i16 << 16);
+	spu.gpr[op.rt].vi = _mm_set1_epi32(op.i16 << 16);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ILH(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ILH(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_set1_epi16(op.i16);
+	spu.gpr[op.rt].vi = _mm_set1_epi16(op.i16);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool IOHL(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::IOHL(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_or_si128(spu.gpr[op.rt], _mm_set1_epi32(op.i16));
+	spu.gpr[op.rt].vi = _mm_or_si128(spu.gpr[op.rt].vi, _mm_set1_epi32(op.i16));
 	return true;
 }
 
 
-template <spu_exec_bit... Flags>
-bool ORI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ORI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_or_si128(spu.gpr[op.ra], _mm_set1_epi32(op.si10));
+	spu.gpr[op.rt].vi = _mm_or_si128(spu.gpr[op.ra].vi, _mm_set1_epi32(op.si10));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ORHI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ORHI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_or_si128(spu.gpr[op.ra], _mm_set1_epi16(op.si10));
+	spu.gpr[op.rt].vi = _mm_or_si128(spu.gpr[op.ra].vi, _mm_set1_epi16(op.si10));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ORBI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ORBI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_or_si128(spu.gpr[op.ra], _mm_set1_epi8(op.i8));
+	spu.gpr[op.rt].vi = _mm_or_si128(spu.gpr[op.ra].vi, _mm_set1_epi8(op.i8));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SFI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SFI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_sub_epi32(_mm_set1_epi32(op.si10), spu.gpr[op.ra]);
+	spu.gpr[op.rt].vi = _mm_sub_epi32(_mm_set1_epi32(op.si10), spu.gpr[op.ra].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SFHI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SFHI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_sub_epi16(_mm_set1_epi16(op.si10), spu.gpr[op.ra]);
+	spu.gpr[op.rt].vi = _mm_sub_epi16(_mm_set1_epi16(op.si10), spu.gpr[op.ra].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ANDI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ANDI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_and_si128(spu.gpr[op.ra], _mm_set1_epi32(op.si10));
+	spu.gpr[op.rt].vi = _mm_and_si128(spu.gpr[op.ra].vi, _mm_set1_epi32(op.si10));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ANDHI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ANDHI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_and_si128(spu.gpr[op.ra], _mm_set1_epi16(op.si10));
+	spu.gpr[op.rt].vi = _mm_and_si128(spu.gpr[op.ra].vi, _mm_set1_epi16(op.si10));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ANDBI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ANDBI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_and_si128(spu.gpr[op.ra], _mm_set1_epi8(op.i8));
+	spu.gpr[op.rt].vi = _mm_and_si128(spu.gpr[op.ra].vi, _mm_set1_epi8(op.i8));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool AI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::AI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_add_epi32(_mm_set1_epi32(op.si10), spu.gpr[op.ra]);
+	spu.gpr[op.rt].vi = _mm_add_epi32(_mm_set1_epi32(op.si10), spu.gpr[op.ra].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool AHI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::AHI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_add_epi16(_mm_set1_epi16(op.si10), spu.gpr[op.ra]);
+	spu.gpr[op.rt].vi = _mm_add_epi16(_mm_set1_epi16(op.si10), spu.gpr[op.ra].vi);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool STQD(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::STQD(spu_thread& spu, spu_opcode_t op)
 {
 	spu._ref<v128>((spu.gpr[op.ra]._s32[3] + (op.si10 * 16)) & 0x3fff0) = spu.gpr[op.rt];
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool LQD(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::LQD(spu_thread& spu, spu_opcode_t op)
 {
 	spu.gpr[op.rt] = spu._ref<v128>((spu.gpr[op.ra]._s32[3] + (op.si10 * 16)) & 0x3fff0);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool XORI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::XORI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_xor_si128(spu.gpr[op.ra], _mm_set1_epi32(op.si10));
+	spu.gpr[op.rt].vi = _mm_xor_si128(spu.gpr[op.ra].vi, _mm_set1_epi32(op.si10));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool XORHI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::XORHI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_xor_si128(spu.gpr[op.ra], _mm_set1_epi16(op.si10));
+	spu.gpr[op.rt].vi = _mm_xor_si128(spu.gpr[op.ra].vi, _mm_set1_epi16(op.si10));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool XORBI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::XORBI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_xor_si128(spu.gpr[op.ra], _mm_set1_epi8(op.i8));
+	spu.gpr[op.rt].vi = _mm_xor_si128(spu.gpr[op.ra].vi, _mm_set1_epi8(op.i8));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CGTI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CGTI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpgt_epi32(spu.gpr[op.ra], _mm_set1_epi32(op.si10));
+	spu.gpr[op.rt].vi = _mm_cmpgt_epi32(spu.gpr[op.ra].vi, _mm_set1_epi32(op.si10));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CGTHI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CGTHI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpgt_epi16(spu.gpr[op.ra], _mm_set1_epi16(op.si10));
+	spu.gpr[op.rt].vi = _mm_cmpgt_epi16(spu.gpr[op.ra].vi, _mm_set1_epi16(op.si10));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CGTBI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CGTBI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpgt_epi8(spu.gpr[op.ra], _mm_set1_epi8(op.i8));
+	spu.gpr[op.rt].vi = _mm_cmpgt_epi8(spu.gpr[op.ra].vi, _mm_set1_epi8(op.i8));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool HGTI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::HGTI(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.ra]._s32[3] > op.si10)
 	{
@@ -1858,29 +1599,25 @@ bool HGTI(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CLGTI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CLGTI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpgt_epi32(_mm_xor_si128(spu.gpr[op.ra], _mm_set1_epi32(0x80000000)), _mm_set1_epi32(op.si10 ^ 0x80000000));
+	spu.gpr[op.rt].vi = _mm_cmpgt_epi32(_mm_xor_si128(spu.gpr[op.ra].vi, _mm_set1_epi32(0x80000000)), _mm_set1_epi32(op.si10 ^ 0x80000000));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CLGTHI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CLGTHI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpgt_epi16(_mm_xor_si128(spu.gpr[op.ra], _mm_set1_epi32(0x80008000)), _mm_set1_epi16(op.si10 ^ 0x8000));
+	spu.gpr[op.rt].vi = _mm_cmpgt_epi16(_mm_xor_si128(spu.gpr[op.ra].vi, _mm_set1_epi32(0x80008000)), _mm_set1_epi16(op.si10 ^ 0x8000));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CLGTBI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CLGTBI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpgt_epi8(_mm_xor_si128(spu.gpr[op.ra], _mm_set1_epi32(0x80808080)), _mm_set1_epi8(op.i8 ^ 0x80));
+	spu.gpr[op.rt].vi = _mm_cmpgt_epi8(_mm_xor_si128(spu.gpr[op.ra].vi, _mm_set1_epi32(0x80808080)), _mm_set1_epi8(op.i8 ^ 0x80));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool HLGTI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::HLGTI(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.ra]._u32[3] > static_cast<u32>(op.si10))
 	{
@@ -1889,45 +1626,39 @@ bool HLGTI(spu_thread& spu, spu_opcode_t op)
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool MPYI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::MPYI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_madd_epi16(spu.gpr[op.ra], _mm_set1_epi32(op.si10 & 0xffff));
+	spu.gpr[op.rt].vi = _mm_madd_epi16(spu.gpr[op.ra].vi, _mm_set1_epi32(op.si10 & 0xffff));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool MPYUI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::MPYUI(spu_thread& spu, spu_opcode_t op)
 {
-	const auto a = spu.gpr[op.ra];
+	const auto a = spu.gpr[op.ra].vi;
 	const auto i = _mm_set1_epi32(op.si10 & 0xffff);
-	spu.gpr[op.rt] = _mm_or_si128(_mm_slli_epi32(_mm_mulhi_epu16(a, i), 16), _mm_mullo_epi16(a, i));
+	spu.gpr[op.rt].vi = _mm_or_si128(_mm_slli_epi32(_mm_mulhi_epu16(a, i), 16), _mm_mullo_epi16(a, i));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CEQI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CEQI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpeq_epi32(spu.gpr[op.ra], _mm_set1_epi32(op.si10));
+	spu.gpr[op.rt].vi = _mm_cmpeq_epi32(spu.gpr[op.ra].vi, _mm_set1_epi32(op.si10));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CEQHI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CEQHI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpeq_epi16(spu.gpr[op.ra], _mm_set1_epi16(op.si10));
+	spu.gpr[op.rt].vi = _mm_cmpeq_epi16(spu.gpr[op.ra].vi, _mm_set1_epi16(op.si10));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool CEQBI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::CEQBI(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_cmpeq_epi8(spu.gpr[op.ra], _mm_set1_epi8(op.i8));
+	spu.gpr[op.rt].vi = _mm_cmpeq_epi8(spu.gpr[op.ra].vi, _mm_set1_epi8(op.i8));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool HEQI(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::HEQI(spu_thread& spu, spu_opcode_t op)
 {
 	if (spu.gpr[op.ra]._s32[3] == op.si10)
 	{
@@ -1937,39 +1668,34 @@ bool HEQI(spu_thread& spu, spu_opcode_t op)
 }
 
 
-template <spu_exec_bit... Flags>
-bool HBRA(spu_thread&, spu_opcode_t)
+bool spu_interpreter::HBRA(spu_thread&, spu_opcode_t)
 {
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool HBRR(spu_thread&, spu_opcode_t)
+bool spu_interpreter::HBRR(spu_thread&, spu_opcode_t)
 {
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool ILA(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::ILA(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt] = _mm_set1_epi32(op.i18);
+	spu.gpr[op.rt].vi = _mm_set1_epi32(op.i18);
 	return true;
 }
 
 
-template <spu_exec_bit... Flags>
-bool SELB(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SELB(spu_thread& spu, spu_opcode_t op)
 {
-	spu.gpr[op.rt4] = (spu.gpr[op.rc] & spu.gpr[op.rb]) | gv_andn(spu.gpr[op.rc], spu.gpr[op.ra]);
+	spu.gpr[op.rt4] = (spu.gpr[op.rc] & spu.gpr[op.rb]) | v128::andnot(spu.gpr[op.rc], spu.gpr[op.ra]);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool SHUFB(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::SHUFB(spu_thread& spu, spu_opcode_t op)
 {
-	__m128i ab[2]{__m128i(spu.gpr[op.rb]), __m128i(spu.gpr[op.ra])};
+	__m128i ab[2]{spu.gpr[op.rb].vi, spu.gpr[op.ra].vi};
 	v128 c = spu.gpr[op.rc];
-	v128 x = _mm_andnot_si128(c, _mm_set1_epi8(0x1f));
+	v128 x = v128::fromV(_mm_andnot_si128(c.vi, _mm_set1_epi8(0x1f)));
 	v128 res;
 
 	// Select bytes
@@ -1981,15 +1707,14 @@ bool SHUFB(spu_thread& spu, spu_opcode_t op)
 	// Select special values
 	const auto xc0 = _mm_set1_epi8(static_cast<s8>(0xc0));
 	const auto xe0 = _mm_set1_epi8(static_cast<s8>(0xe0));
-	const auto cmp0 = _mm_cmpgt_epi8(_mm_setzero_si128(), c);
-	const auto cmp1 = _mm_cmpeq_epi8(_mm_and_si128(c, xc0), xc0);
-	const auto cmp2 = _mm_cmpeq_epi8(_mm_and_si128(c, xe0), xc0);
-	spu.gpr[op.rt4] = _mm_or_si128(_mm_andnot_si128(cmp0, res), _mm_avg_epu8(cmp1, cmp2));
+	const auto cmp0 = _mm_cmpgt_epi8(_mm_setzero_si128(), c.vi);
+	const auto cmp1 = _mm_cmpeq_epi8(_mm_and_si128(c.vi, xc0), xc0);
+	const auto cmp2 = _mm_cmpeq_epi8(_mm_and_si128(c.vi, xe0), xc0);
+	spu.gpr[op.rt4].vi = _mm_or_si128(_mm_andnot_si128(cmp0, res.vi), _mm_avg_epu8(cmp1, cmp2));
 	return true;
 }
 
-#if defined(ARCH_X64)
-const spu_intrp_func_t optimized_shufb = build_function_asm<spu_intrp_func_t>("spu_shufb", [](asmjit::x86::Assembler& c, auto& /*args*/)
+const spu_inter_func_t optimized_shufb = build_function_asm<spu_inter_func_t>([](asmjit::X86Assembler& c, auto& /*args*/)
 {
 	using namespace asmjit;
 
@@ -2049,7 +1774,7 @@ const spu_intrp_func_t optimized_shufb = build_function_asm<spu_intrp_func_t>("s
 	c.mov(x86::eax, 1);
 	c.ret();
 
-	c.align(AlignMode::kData, 16);
+	c.align(kAlignData, 16);
 	c.bind(xc0);
 	c.dq(0xc0c0c0c0c0c0c0c0);
 	c.dq(0xc0c0c0c0c0c0c0c0);
@@ -2060,72 +1785,65 @@ const spu_intrp_func_t optimized_shufb = build_function_asm<spu_intrp_func_t>("s
 	c.dq(0x0f0f0f0f0f0f0f0f);
 	c.dq(0x0f0f0f0f0f0f0f0f);
 });
-#endif
 
-template <spu_exec_bit... Flags>
-bool MPYA(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter::MPYA(spu_thread& spu, spu_opcode_t op)
 {
 	const auto mask = _mm_set1_epi32(0xffff);
-	spu.gpr[op.rt4] = _mm_add_epi32(spu.gpr[op.rc], _mm_madd_epi16(_mm_and_si128(spu.gpr[op.ra], mask), _mm_and_si128(spu.gpr[op.rb], mask)));
+	spu.gpr[op.rt4].vi = _mm_add_epi32(spu.gpr[op.rc].vi, _mm_madd_epi16(_mm_and_si128(spu.gpr[op.ra].vi, mask), _mm_and_si128(spu.gpr[op.rb].vi, mask)));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FNMS(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FNMS(spu_thread& spu, spu_opcode_t op)
 {
 	const u32 test_bits = 0x7f800000;
 	auto mask = _mm_set1_ps(std::bit_cast<f32>(test_bits));
 
-	auto test_a = _mm_and_ps(spu.gpr[op.ra], mask);
+	auto test_a = _mm_and_ps(spu.gpr[op.ra].vf, mask);
 	auto mask_a = _mm_cmpneq_ps(test_a, mask);
-	auto test_b = _mm_and_ps(spu.gpr[op.rb], mask);
+	auto test_b = _mm_and_ps(spu.gpr[op.rb].vf, mask);
 	auto mask_b = _mm_cmpneq_ps(test_b, mask);
 
-	auto a = _mm_and_ps(spu.gpr[op.ra], mask_a);
-	auto b = _mm_and_ps(spu.gpr[op.rb], mask_b);
+	auto a = _mm_and_ps(spu.gpr[op.ra].vf, mask_a);
+	auto b = _mm_and_ps(spu.gpr[op.rb].vf, mask_b);
 
-	spu.gpr[op.rt4] = _mm_sub_ps(spu.gpr[op.rc], _mm_mul_ps(a, b));
+	spu.gpr[op.rt4].vf = _mm_sub_ps(spu.gpr[op.rc].vf, _mm_mul_ps(a, b));
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FMA(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FMA(spu_thread& spu, spu_opcode_t op)
 {
 	const u32 test_bits = 0x7f800000;
 	auto mask = _mm_set1_ps(std::bit_cast<f32>(test_bits));
 
-	auto test_a = _mm_and_ps(spu.gpr[op.ra], mask);
+	auto test_a = _mm_and_ps(spu.gpr[op.ra].vf, mask);
 	auto mask_a = _mm_cmpneq_ps(test_a, mask);
-	auto test_b = _mm_and_ps(spu.gpr[op.rb], mask);
+	auto test_b = _mm_and_ps(spu.gpr[op.rb].vf, mask);
 	auto mask_b = _mm_cmpneq_ps(test_b, mask);
 
-	auto a = _mm_and_ps(spu.gpr[op.ra], mask_a);
-	auto b = _mm_and_ps(spu.gpr[op.rb], mask_b);
+	auto a = _mm_and_ps(spu.gpr[op.ra].vf, mask_a);
+	auto b = _mm_and_ps(spu.gpr[op.rb].vf, mask_b);
 
-	spu.gpr[op.rt4] = _mm_add_ps(_mm_mul_ps(a, b), spu.gpr[op.rc]);
+	spu.gpr[op.rt4].vf = _mm_add_ps(_mm_mul_ps(a, b), spu.gpr[op.rc].vf);
 	return true;
 }
 
-template <spu_exec_bit... Flags>
-bool FMS(spu_thread& spu, spu_opcode_t op)
+bool spu_interpreter_fast::FMS(spu_thread& spu, spu_opcode_t op)
 {
 	const u32 test_bits = 0x7f800000;
 	auto mask = _mm_set1_ps(std::bit_cast<f32>(test_bits));
 
-	auto test_a = _mm_and_ps(spu.gpr[op.ra], mask);
+	auto test_a = _mm_and_ps(spu.gpr[op.ra].vf, mask);
 	auto mask_a = _mm_cmpneq_ps(test_a, mask);
-	auto test_b = _mm_and_ps(spu.gpr[op.rb], mask);
+	auto test_b = _mm_and_ps(spu.gpr[op.rb].vf, mask);
 	auto mask_b = _mm_cmpneq_ps(test_b, mask);
 
-	auto a = _mm_and_ps(spu.gpr[op.ra], mask_a);
-	auto b = _mm_and_ps(spu.gpr[op.rb], mask_b);
+	auto a = _mm_and_ps(spu.gpr[op.ra].vf, mask_a);
+	auto b = _mm_and_ps(spu.gpr[op.rb].vf, mask_b);
 
-	spu.gpr[op.rt4] = _mm_sub_ps(_mm_mul_ps(a, b), spu.gpr[op.rc]);
+	spu.gpr[op.rt4].vf = _mm_sub_ps(_mm_mul_ps(a, b), spu.gpr[op.rc].vf);
 	return true;
 }
 
-#if 0
-
 static void SetHostRoundingMode(u32 rn)
 {
 	switch (rn)
@@ -2195,7 +1913,7 @@ bool spu_interpreter_precise::FREST(spu_thread& spu, spu_opcode_t op)
 {
 	fesetround(FE_TOWARDZERO);
 	const auto ra = spu.gpr[op.ra];
-	v128 res = _mm_rcp_ps(ra);
+	auto res = v128::fromF(_mm_rcp_ps(ra.vf));
 	for (int i = 0; i < 4; i++)
 	{
 		const auto a = ra._f[i];
@@ -2927,437 +2645,3 @@ bool spu_interpreter_precise::FNMS(spu_thread& spu, spu_opcode_t op) { ::FMA(spu
 bool spu_interpreter_precise::FMA(spu_thread& spu, spu_opcode_t op) { ::FMA(spu, op, false, false); return true; }
 
 bool spu_interpreter_precise::FMS(spu_thread& spu, spu_opcode_t op) { ::FMA(spu, op, false, true); return true; }
-
-#endif /* __SSE2__ */
-
-template <typename IT>
-struct spu_interpreter_t
-{
-	IT UNK;
-	IT HEQ;
-	IT HEQI;
-	IT HGT;
-	IT HGTI;
-	IT HLGT;
-	IT HLGTI;
-	IT HBR;
-	IT HBRA;
-	IT HBRR;
-	IT STOP;
-	IT STOPD;
-	IT LNOP;
-	IT NOP;
-	IT SYNC;
-	IT DSYNC;
-	IT MFSPR;
-	IT MTSPR;
-	IT RDCH;
-	IT RCHCNT;
-	IT WRCH;
-	IT LQD;
-	IT LQX;
-	IT LQA;
-	IT LQR;
-	IT STQD;
-	IT STQX;
-	IT STQA;
-	IT STQR;
-	IT CBD;
-	IT CBX;
-	IT CHD;
-	IT CHX;
-	IT CWD;
-	IT CWX;
-	IT CDD;
-	IT CDX;
-	IT ILH;
-	IT ILHU;
-	IT IL;
-	IT ILA;
-	IT IOHL;
-	IT FSMBI;
-	IT AH;
-	IT AHI;
-	IT A;
-	IT AI;
-	IT SFH;
-	IT SFHI;
-	IT SF;
-	IT SFI;
-	IT ADDX;
-	IT CG;
-	IT CGX;
-	IT SFX;
-	IT BG;
-	IT BGX;
-	IT MPY;
-	IT MPYU;
-	IT MPYI;
-	IT MPYUI;
-	IT MPYH;
-	IT MPYS;
-	IT MPYHH;
-	IT MPYHHA;
-	IT MPYHHU;
-	IT MPYHHAU;
-	IT CLZ;
-	IT CNTB;
-	IT FSMB;
-	IT FSMH;
-	IT FSM;
-	IT GBB;
-	IT GBH;
-	IT GB;
-	IT AVGB;
-	IT ABSDB;
-	IT SUMB;
-	IT XSBH;
-	IT XSHW;
-	IT XSWD;
-	IT AND;
-	IT ANDC;
-	IT ANDBI;
-	IT ANDHI;
-	IT ANDI;
-	IT OR;
-	IT ORC;
-	IT ORBI;
-	IT ORHI;
-	IT ORI;
-	IT ORX;
-	IT XOR;
-	IT XORBI;
-	IT XORHI;
-	IT XORI;
-	IT NAND;
-	IT NOR;
-	IT EQV;
-	IT MPYA;
-	IT SELB;
-	IT SHUFB;
-	IT SHLH;
-	IT SHLHI;
-	IT SHL;
-	IT SHLI;
-	IT SHLQBI;
-	IT SHLQBII;
-	IT SHLQBY;
-	IT SHLQBYI;
-	IT SHLQBYBI;
-	IT ROTH;
-	IT ROTHI;
-	IT ROT;
-	IT ROTI;
-	IT ROTQBY;
-	IT ROTQBYI;
-	IT ROTQBYBI;
-	IT ROTQBI;
-	IT ROTQBII;
-	IT ROTHM;
-	IT ROTHMI;
-	IT ROTM;
-	IT ROTMI;
-	IT ROTQMBY;
-	IT ROTQMBYI;
-	IT ROTQMBYBI;
-	IT ROTQMBI;
-	IT ROTQMBII;
-	IT ROTMAH;
-	IT ROTMAHI;
-	IT ROTMA;
-	IT ROTMAI;
-	IT CEQB;
-	IT CEQBI;
-	IT CEQH;
-	IT CEQHI;
-	IT CEQ;
-	IT CEQI;
-	IT CGTB;
-	IT CGTBI;
-	IT CGTH;
-	IT CGTHI;
-	IT CGT;
-	IT CGTI;
-	IT CLGTB;
-	IT CLGTBI;
-	IT CLGTH;
-	IT CLGTHI;
-	IT CLGT;
-	IT CLGTI;
-	IT BR;
-	IT BRA;
-	IT BRSL;
-	IT BRASL;
-	IT BI;
-	IT IRET;
-	IT BISLED;
-	IT BISL;
-	IT BRNZ;
-	IT BRZ;
-	IT BRHNZ;
-	IT BRHZ;
-	IT BIZ;
-	IT BINZ;
-	IT BIHZ;
-	IT BIHNZ;
-	IT FA;
-	IT DFA;
-	IT FS;
-	IT DFS;
-	IT FM;
-	IT DFM;
-	IT DFMA;
-	IT DFNMS;
-	IT DFMS;
-	IT DFNMA;
-	IT FREST;
-	IT FRSQEST;
-	IT FI;
-	IT CSFLT;
-	IT CFLTS;
-	IT CUFLT;
-	IT CFLTU;
-	IT FRDS;
-	IT FESD;
-	IT FCEQ;
-	IT FCMEQ;
-	IT FCGT;
-	IT FCMGT;
-	IT FSCRWR;
-	IT FSCRRD;
-	IT DFCEQ;
-	IT DFCMEQ;
-	IT DFCGT;
-	IT DFCMGT;
-	IT DFTSV;
-	IT FMA;
-	IT FNMS;
-	IT FMS;
-};
-
-spu_interpreter_rt_base::spu_interpreter_rt_base() noexcept
-{
-	// Obtain required set of flags from settings
-	bs_t<spu_exec_bit> selected{};
-	if (g_cfg.core.use_accurate_dfma)
-		selected += use_dfma;
-
-	ptrs = std::make_unique<decltype(ptrs)::element_type>();
-
-	// Initialize instructions with their own sets of supported flags
-#define INIT(name, ...) \
-	ptrs->name = spu_exec_select<>::select<__VA_ARGS__>(selected, []<spu_exec_bit... Flags>(){ return &::name<Flags...>; }); \
-
-	using enum spu_exec_bit;
-
-	INIT(UNK);
-	INIT(HEQ);
-	INIT(HEQI);
-	INIT(HGT);
-	INIT(HGTI);
-	INIT(HLGT);
-	INIT(HLGTI);
-	INIT(HBR);
-	INIT(HBRA);
-	INIT(HBRR);
-	INIT(STOP);
-	INIT(STOPD);
-	INIT(LNOP);
-	INIT(NOP);
-	INIT(SYNC);
-	INIT(DSYNC);
-	INIT(MFSPR);
-	INIT(MTSPR);
-	INIT(RDCH);
-	INIT(RCHCNT);
-	INIT(WRCH);
-	INIT(LQD);
-	INIT(LQX);
-	INIT(LQA);
-	INIT(LQR);
-	INIT(STQD);
-	INIT(STQX);
-	INIT(STQA);
-	INIT(STQR);
-	INIT(CBD);
-	INIT(CBX);
-	INIT(CHD);
-	INIT(CHX);
-	INIT(CWD);
-	INIT(CWX);
-	INIT(CDD);
-	INIT(CDX);
-	INIT(ILH);
-	INIT(ILHU);
-	INIT(IL);
-	INIT(ILA);
-	INIT(IOHL);
-	INIT(FSMBI);
-	INIT(AH);
-	INIT(AHI);
-	INIT(A);
-	INIT(AI);
-	INIT(SFH);
-	INIT(SFHI);
-	INIT(SF);
-	INIT(SFI);
-	INIT(ADDX);
-	INIT(CG);
-	INIT(CGX);
-	INIT(SFX);
-	INIT(BG);
-	INIT(BGX);
-	INIT(MPY);
-	INIT(MPYU);
-	INIT(MPYI);
-	INIT(MPYUI);
-	INIT(MPYH);
-	INIT(MPYS);
-	INIT(MPYHH);
-	INIT(MPYHHA);
-	INIT(MPYHHU);
-	INIT(MPYHHAU);
-	INIT(CLZ);
-	INIT(CNTB);
-	INIT(FSMB);
-	INIT(FSMH);
-	INIT(FSM);
-	INIT(GBB);
-	INIT(GBH);
-	INIT(GB);
-	INIT(AVGB);
-	INIT(ABSDB);
-	INIT(SUMB);
-	INIT(XSBH);
-	INIT(XSHW);
-	INIT(XSWD);
-	INIT(AND);
-	INIT(ANDC);
-	INIT(ANDBI);
-	INIT(ANDHI);
-	INIT(ANDI);
-	INIT(OR);
-	INIT(ORC);
-	INIT(ORBI);
-	INIT(ORHI);
-	INIT(ORI);
-	INIT(ORX);
-	INIT(XOR);
-	INIT(XORBI);
-	INIT(XORHI);
-	INIT(XORI);
-	INIT(NAND);
-	INIT(NOR);
-	INIT(EQV);
-	INIT(MPYA);
-	INIT(SELB);
-	INIT(SHUFB);
-	INIT(SHLH);
-	INIT(SHLHI);
-	INIT(SHL);
-	INIT(SHLI);
-	INIT(SHLQBI);
-	INIT(SHLQBII);
-	INIT(SHLQBY);
-	INIT(SHLQBYI);
-	INIT(SHLQBYBI);
-	INIT(ROTH);
-	INIT(ROTHI);
-	INIT(ROT);
-	INIT(ROTI);
-	INIT(ROTQBY);
-	INIT(ROTQBYI);
-	INIT(ROTQBYBI);
-	INIT(ROTQBI);
-	INIT(ROTQBII);
-	INIT(ROTHM);
-	INIT(ROTHMI);
-	INIT(ROTM);
-	INIT(ROTMI);
-	INIT(ROTQMBY);
-	INIT(ROTQMBYI);
-	INIT(ROTQMBYBI);
-	INIT(ROTQMBI);
-	INIT(ROTQMBII);
-	INIT(ROTMAH);
-	INIT(ROTMAHI);
-	INIT(ROTMA);
-	INIT(ROTMAI);
-	INIT(CEQB);
-	INIT(CEQBI);
-	INIT(CEQH);
-	INIT(CEQHI);
-	INIT(CEQ);
-	INIT(CEQI);
-	INIT(CGTB);
-	INIT(CGTBI);
-	INIT(CGTH);
-	INIT(CGTHI);
-	INIT(CGT);
-	INIT(CGTI);
-	INIT(CLGTB);
-	INIT(CLGTBI);
-	INIT(CLGTH);
-	INIT(CLGTHI);
-	INIT(CLGT);
-	INIT(CLGTI);
-	INIT(BR);
-	INIT(BRA);
-	INIT(BRSL);
-	INIT(BRASL);
-	INIT(BI);
-	INIT(IRET);
-	INIT(BISLED);
-	INIT(BISL);
-	INIT(BRNZ);
-	INIT(BRZ);
-	INIT(BRHNZ);
-	INIT(BRHZ);
-	INIT(BIZ);
-	INIT(BINZ);
-	INIT(BIHZ);
-	INIT(BIHNZ);
-	INIT(FA);
-	INIT(DFA);
-	INIT(FS);
-	INIT(DFS);
-	INIT(FM);
-	INIT(DFM);
-	INIT(DFMA);
-	INIT(DFNMS);
-	INIT(DFMS);
-	INIT(DFNMA);
-	INIT(FREST);
-	INIT(FRSQEST);
-	INIT(FI);
-	INIT(CSFLT);
-	INIT(CFLTS);
-	INIT(CUFLT);
-	INIT(CFLTU);
-	INIT(FRDS);
-	INIT(FESD);
-	INIT(FCEQ);
-	INIT(FCMEQ);
-	INIT(FCGT);
-	INIT(FCMGT);
-	INIT(FSCRWR);
-	INIT(FSCRRD);
-	INIT(DFCEQ);
-	INIT(DFCMEQ);
-	INIT(DFCGT);
-	INIT(DFCMGT);
-	INIT(DFTSV);
-	INIT(FMA);
-	INIT(FNMS);
-	INIT(FMS);
-}
-
-spu_interpreter_rt_base::~spu_interpreter_rt_base()
-{
-}
-
-spu_interpreter_rt::spu_interpreter_rt() noexcept
-	: spu_interpreter_rt_base()
-	, table(*ptrs)
-{
-}
diff --git a/rpcs3/Emu/Cell/SPUInterpreter.h b/rpcs3/Emu/Cell/SPUInterpreter.h
index c6073ba575..9e30793c3b 100644
--- a/rpcs3/Emu/Cell/SPUInterpreter.h
+++ b/rpcs3/Emu/Cell/SPUInterpreter.h
@@ -4,39 +4,246 @@
 
 class spu_thread;
 
-using spu_intrp_func_t = bool(*)(spu_thread& spu, spu_opcode_t op);
-
-template <typename IT>
-struct spu_interpreter_t;
+using spu_inter_func_t = bool(*)(spu_thread& spu, spu_opcode_t op);
 
 struct spu_interpreter
 {
+	static bool UNK(spu_thread&, spu_opcode_t);
 	static void set_interrupt_status(spu_thread&, spu_opcode_t);
+
+	static bool STOP(spu_thread&, spu_opcode_t);
+	static bool LNOP(spu_thread&, spu_opcode_t);
+	static bool SYNC(spu_thread&, spu_opcode_t);
+	static bool DSYNC(spu_thread&, spu_opcode_t);
+	static bool MFSPR(spu_thread&, spu_opcode_t);
+	static bool RDCH(spu_thread&, spu_opcode_t);
+	static bool RCHCNT(spu_thread&, spu_opcode_t);
+	static bool SF(spu_thread&, spu_opcode_t);
+	static bool OR(spu_thread&, spu_opcode_t);
+	static bool BG(spu_thread&, spu_opcode_t);
+	static bool SFH(spu_thread&, spu_opcode_t);
+	static bool NOR(spu_thread&, spu_opcode_t);
+	static bool ABSDB(spu_thread&, spu_opcode_t);
+	static bool ROT(spu_thread&, spu_opcode_t);
+	static bool ROTM(spu_thread&, spu_opcode_t);
+	static bool ROTMA(spu_thread&, spu_opcode_t);
+	static bool SHL(spu_thread&, spu_opcode_t);
+	static bool ROTH(spu_thread&, spu_opcode_t);
+	static bool ROTHM(spu_thread&, spu_opcode_t);
+	static bool ROTMAH(spu_thread&, spu_opcode_t);
+	static bool SHLH(spu_thread&, spu_opcode_t);
+	static bool ROTI(spu_thread&, spu_opcode_t);
+	static bool ROTMI(spu_thread&, spu_opcode_t);
+	static bool ROTMAI(spu_thread&, spu_opcode_t);
+	static bool SHLI(spu_thread&, spu_opcode_t);
+	static bool ROTHI(spu_thread&, spu_opcode_t);
+	static bool ROTHMI(spu_thread&, spu_opcode_t);
+	static bool ROTMAHI(spu_thread&, spu_opcode_t);
+	static bool SHLHI(spu_thread&, spu_opcode_t);
+	static bool A(spu_thread&, spu_opcode_t);
+	static bool AND(spu_thread&, spu_opcode_t);
+	static bool CG(spu_thread&, spu_opcode_t);
+	static bool AH(spu_thread&, spu_opcode_t);
+	static bool NAND(spu_thread&, spu_opcode_t);
+	static bool AVGB(spu_thread&, spu_opcode_t);
+	static bool MTSPR(spu_thread&, spu_opcode_t);
+	static bool WRCH(spu_thread&, spu_opcode_t);
+	static bool BIZ(spu_thread&, spu_opcode_t);
+	static bool BINZ(spu_thread&, spu_opcode_t);
+	static bool BIHZ(spu_thread&, spu_opcode_t);
+	static bool BIHNZ(spu_thread&, spu_opcode_t);
+	static bool STOPD(spu_thread&, spu_opcode_t);
+	static bool STQX(spu_thread&, spu_opcode_t);
+	static bool BI(spu_thread&, spu_opcode_t);
+	static bool BISL(spu_thread&, spu_opcode_t);
+	static bool IRET(spu_thread&, spu_opcode_t);
+	static bool BISLED(spu_thread&, spu_opcode_t);
+	static bool HBR(spu_thread&, spu_opcode_t);
+	static bool GB(spu_thread&, spu_opcode_t);
+	static bool GBH(spu_thread&, spu_opcode_t);
+	static bool GBB(spu_thread&, spu_opcode_t);
+	static bool FSM(spu_thread&, spu_opcode_t);
+	static bool FSMH(spu_thread&, spu_opcode_t);
+	static bool FSMB(spu_thread&, spu_opcode_t);
+	static bool LQX(spu_thread&, spu_opcode_t);
+	static bool ROTQBYBI(spu_thread&, spu_opcode_t);
+	static bool ROTQMBYBI(spu_thread&, spu_opcode_t);
+	static bool SHLQBYBI(spu_thread&, spu_opcode_t);
+	static bool CBX(spu_thread&, spu_opcode_t);
+	static bool CHX(spu_thread&, spu_opcode_t);
+	static bool CWX(spu_thread&, spu_opcode_t);
+	static bool CDX(spu_thread&, spu_opcode_t);
+	static bool ROTQBI(spu_thread&, spu_opcode_t);
+	static bool ROTQMBI(spu_thread&, spu_opcode_t);
+	static bool SHLQBI(spu_thread&, spu_opcode_t);
+	static bool ROTQBY(spu_thread&, spu_opcode_t);
+	static bool ROTQMBY(spu_thread&, spu_opcode_t);
+	static bool SHLQBY(spu_thread&, spu_opcode_t);
+	static bool ORX(spu_thread&, spu_opcode_t);
+	static bool CBD(spu_thread&, spu_opcode_t);
+	static bool CHD(spu_thread&, spu_opcode_t);
+	static bool CWD(spu_thread&, spu_opcode_t);
+	static bool CDD(spu_thread&, spu_opcode_t);
+	static bool ROTQBII(spu_thread&, spu_opcode_t);
+	static bool ROTQMBII(spu_thread&, spu_opcode_t);
+	static bool SHLQBII(spu_thread&, spu_opcode_t);
+	static bool ROTQBYI(spu_thread&, spu_opcode_t);
+	static bool ROTQMBYI(spu_thread&, spu_opcode_t);
+	static bool SHLQBYI(spu_thread&, spu_opcode_t);
+	static bool NOP(spu_thread&, spu_opcode_t);
+	static bool CGT(spu_thread&, spu_opcode_t);
+	static bool XOR(spu_thread&, spu_opcode_t);
+	static bool CGTH(spu_thread&, spu_opcode_t);
+	static bool EQV(spu_thread&, spu_opcode_t);
+	static bool CGTB(spu_thread&, spu_opcode_t);
+	static bool SUMB(spu_thread&, spu_opcode_t);
+	static bool HGT(spu_thread&, spu_opcode_t);
+	static bool CLZ(spu_thread&, spu_opcode_t);
+	static bool XSWD(spu_thread&, spu_opcode_t);
+	static bool XSHW(spu_thread&, spu_opcode_t);
+	static bool CNTB(spu_thread&, spu_opcode_t);
+	static bool XSBH(spu_thread&, spu_opcode_t);
+	static bool CLGT(spu_thread&, spu_opcode_t);
+	static bool ANDC(spu_thread&, spu_opcode_t);
+	static bool CLGTH(spu_thread&, spu_opcode_t);
+	static bool ORC(spu_thread&, spu_opcode_t);
+	static bool CLGTB(spu_thread&, spu_opcode_t);
+	static bool HLGT(spu_thread&, spu_opcode_t);
+	static bool CEQ(spu_thread&, spu_opcode_t);
+	static bool MPYHHU(spu_thread&, spu_opcode_t);
+	static bool ADDX(spu_thread&, spu_opcode_t);
+	static bool SFX(spu_thread&, spu_opcode_t);
+	static bool CGX(spu_thread&, spu_opcode_t);
+	static bool BGX(spu_thread&, spu_opcode_t);
+	static bool MPYHHA(spu_thread&, spu_opcode_t);
+	static bool MPYHHAU(spu_thread&, spu_opcode_t);
+	static bool MPY(spu_thread&, spu_opcode_t);
+	static bool MPYH(spu_thread&, spu_opcode_t);
+	static bool MPYHH(spu_thread&, spu_opcode_t);
+	static bool MPYS(spu_thread&, spu_opcode_t);
+	static bool CEQH(spu_thread&, spu_opcode_t);
+	static bool MPYU(spu_thread&, spu_opcode_t);
+	static bool CEQB(spu_thread&, spu_opcode_t);
+	static bool HEQ(spu_thread&, spu_opcode_t);
+	static bool BRZ(spu_thread&, spu_opcode_t);
+	static bool STQA(spu_thread&, spu_opcode_t);
+	static bool BRNZ(spu_thread&, spu_opcode_t);
+	static bool BRHZ(spu_thread&, spu_opcode_t);
+	static bool BRHNZ(spu_thread&, spu_opcode_t);
+	static bool STQR(spu_thread&, spu_opcode_t);
+	static bool BRA(spu_thread&, spu_opcode_t);
+	static bool LQA(spu_thread&, spu_opcode_t);
+	static bool BRASL(spu_thread&, spu_opcode_t);
+	static bool BR(spu_thread&, spu_opcode_t);
+	static bool FSMBI(spu_thread&, spu_opcode_t);
+	static bool BRSL(spu_thread&, spu_opcode_t);
+	static bool LQR(spu_thread&, spu_opcode_t);
+	static bool IL(spu_thread&, spu_opcode_t);
+	static bool ILHU(spu_thread&, spu_opcode_t);
+	static bool ILH(spu_thread&, spu_opcode_t);
+	static bool IOHL(spu_thread&, spu_opcode_t);
+	static bool ORI(spu_thread&, spu_opcode_t);
+	static bool ORHI(spu_thread&, spu_opcode_t);
+	static bool ORBI(spu_thread&, spu_opcode_t);
+	static bool SFI(spu_thread&, spu_opcode_t);
+	static bool SFHI(spu_thread&, spu_opcode_t);
+	static bool ANDI(spu_thread&, spu_opcode_t);
+	static bool ANDHI(spu_thread&, spu_opcode_t);
+	static bool ANDBI(spu_thread&, spu_opcode_t);
+	static bool AI(spu_thread&, spu_opcode_t);
+	static bool AHI(spu_thread&, spu_opcode_t);
+	static bool STQD(spu_thread&, spu_opcode_t);
+	static bool LQD(spu_thread&, spu_opcode_t);
+	static bool XORI(spu_thread&, spu_opcode_t);
+	static bool XORHI(spu_thread&, spu_opcode_t);
+	static bool XORBI(spu_thread&, spu_opcode_t);
+	static bool CGTI(spu_thread&, spu_opcode_t);
+	static bool CGTHI(spu_thread&, spu_opcode_t);
+	static bool CGTBI(spu_thread&, spu_opcode_t);
+	static bool HGTI(spu_thread&, spu_opcode_t);
+	static bool CLGTI(spu_thread&, spu_opcode_t);
+	static bool CLGTHI(spu_thread&, spu_opcode_t);
+	static bool CLGTBI(spu_thread&, spu_opcode_t);
+	static bool HLGTI(spu_thread&, spu_opcode_t);
+	static bool MPYI(spu_thread&, spu_opcode_t);
+	static bool MPYUI(spu_thread&, spu_opcode_t);
+	static bool CEQI(spu_thread&, spu_opcode_t);
+	static bool CEQHI(spu_thread&, spu_opcode_t);
+	static bool CEQBI(spu_thread&, spu_opcode_t);
+	static bool HEQI(spu_thread&, spu_opcode_t);
+	static bool HBRA(spu_thread&, spu_opcode_t);
+	static bool HBRR(spu_thread&, spu_opcode_t);
+	static bool ILA(spu_thread&, spu_opcode_t);
+	static bool SELB(spu_thread&, spu_opcode_t);
+	static bool SHUFB(spu_thread&, spu_opcode_t);
+	static bool MPYA(spu_thread&, spu_opcode_t);
+	static bool DFCGT(spu_thread&, spu_opcode_t);
+	static bool DFCMGT(spu_thread&, spu_opcode_t);
+	static bool DFTSV(spu_thread&, spu_opcode_t);
+	static bool DFCEQ(spu_thread&, spu_opcode_t);
+	static bool DFCMEQ(spu_thread&, spu_opcode_t);
 };
 
-struct spu_interpreter_rt_base
+struct spu_interpreter_fast final : spu_interpreter
 {
-protected:
-	std::unique_ptr<spu_interpreter_t<spu_intrp_func_t>> ptrs;
-
-	spu_interpreter_rt_base() noexcept;
-
-	spu_interpreter_rt_base(const spu_interpreter_rt_base&) = delete;
-
-	spu_interpreter_rt_base& operator=(const spu_interpreter_rt_base&) = delete;
-
-	virtual ~spu_interpreter_rt_base();
+	static bool FREST(spu_thread&, spu_opcode_t);
+	static bool FRSQEST(spu_thread&, spu_opcode_t);
+	static bool FCGT(spu_thread&, spu_opcode_t);
+	static bool FA(spu_thread&, spu_opcode_t);
+	static bool FS(spu_thread&, spu_opcode_t);
+	static bool FM(spu_thread&, spu_opcode_t);
+	static bool FCMGT(spu_thread&, spu_opcode_t);
+	static bool DFA(spu_thread&, spu_opcode_t);
+	static bool DFS(spu_thread&, spu_opcode_t);
+	static bool DFM(spu_thread&, spu_opcode_t);
+	static bool DFMA(spu_thread&, spu_opcode_t);
+	static bool DFMS(spu_thread&, spu_opcode_t);
+	static bool DFNMS(spu_thread&, spu_opcode_t);
+	static bool DFNMA(spu_thread&, spu_opcode_t);
+	static bool FSCRRD(spu_thread&, spu_opcode_t);
+	static bool FESD(spu_thread&, spu_opcode_t);
+	static bool FRDS(spu_thread&, spu_opcode_t);
+	static bool FSCRWR(spu_thread&, spu_opcode_t);
+	static bool FCEQ(spu_thread&, spu_opcode_t);
+	static bool FCMEQ(spu_thread&, spu_opcode_t);
+	static bool FI(spu_thread&, spu_opcode_t);
+	static bool CFLTS(spu_thread&, spu_opcode_t);
+	static bool CFLTU(spu_thread&, spu_opcode_t);
+	static bool CSFLT(spu_thread&, spu_opcode_t);
+	static bool CUFLT(spu_thread&, spu_opcode_t);
+	static bool FNMS(spu_thread&, spu_opcode_t);
+	static bool FMA(spu_thread&, spu_opcode_t);
+	static bool FMS(spu_thread&, spu_opcode_t);
 };
 
-struct spu_interpreter_rt : spu_interpreter_rt_base
+struct spu_interpreter_precise final : spu_interpreter
 {
-	spu_interpreter_rt() noexcept;
-
-	spu_intrp_func_t decode(u32 op) const noexcept
-	{
-		return table.decode(op);
-	}
-
-private:
-	spu_decoder<spu_interpreter_t<spu_intrp_func_t>, spu_intrp_func_t> table;
+	static bool FREST(spu_thread&, spu_opcode_t);
+	static bool FRSQEST(spu_thread&, spu_opcode_t);
+	static bool FCGT(spu_thread&, spu_opcode_t);
+	static bool FA(spu_thread&, spu_opcode_t);
+	static bool FS(spu_thread&, spu_opcode_t);
+	static bool FM(spu_thread&, spu_opcode_t);
+	static bool FCMGT(spu_thread&, spu_opcode_t);
+	static bool DFA(spu_thread&, spu_opcode_t);
+	static bool DFS(spu_thread&, spu_opcode_t);
+	static bool DFM(spu_thread&, spu_opcode_t);
+	static bool DFMA(spu_thread&, spu_opcode_t);
+	static bool DFMS(spu_thread&, spu_opcode_t);
+	static bool DFNMS(spu_thread&, spu_opcode_t);
+	static bool DFNMA(spu_thread&, spu_opcode_t);
+	static bool FSCRRD(spu_thread&, spu_opcode_t);
+	static bool FESD(spu_thread&, spu_opcode_t);
+	static bool FRDS(spu_thread&, spu_opcode_t);
+	static bool FSCRWR(spu_thread&, spu_opcode_t);
+	static bool FCEQ(spu_thread&, spu_opcode_t);
+	static bool FCMEQ(spu_thread&, spu_opcode_t);
+	static bool FI(spu_thread&, spu_opcode_t);
+	static bool CFLTS(spu_thread&, spu_opcode_t);
+	static bool CFLTU(spu_thread&, spu_opcode_t);
+	static bool CSFLT(spu_thread&, spu_opcode_t);
+	static bool CUFLT(spu_thread&, spu_opcode_t);
+	static bool FNMS(spu_thread&, spu_opcode_t);
+	static bool FMA(spu_thread&, spu_opcode_t);
+	static bool FMS(spu_thread&, spu_opcode_t);
 };
diff --git a/rpcs3/Emu/Cell/SPUOpcodes.h b/rpcs3/Emu/Cell/SPUOpcodes.h
index cea4513e3f..efdc68a7f0 100644
--- a/rpcs3/Emu/Cell/SPUOpcodes.h
+++ b/rpcs3/Emu/Cell/SPUOpcodes.h
@@ -26,17 +26,17 @@ union spu_opcode_t
 	bf_t<u32, 7, 18> i18; // 7..24
 };
 
-constexpr u32 spu_branch_target(u32 pc, u32 imm = 0)
+inline u32 spu_branch_target(u32 pc, u32 imm = 0)
 {
 	return (pc + (imm << 2)) & 0x3fffc;
 }
 
-constexpr u32 spu_ls_target(u32 pc, u32 imm = 0)
+inline u32 spu_ls_target(u32 pc, u32 imm = 0)
 {
 	return (pc + (imm << 2)) & 0x3fff0;
 }
 
-constexpr u32 spu_decode(u32 inst)
+inline u32 spu_decode(u32 inst)
 {
 	return inst >> 21;
 }
@@ -71,227 +71,215 @@ class spu_decoder
 		}
 	};
 
-	// Helper
-	static const D& _first(const D& arg)
-	{
-		return arg;
-	}
-
 public:
-	template <typename... Args>
-	spu_decoder(const Args&... args) noexcept
+	spu_decoder() noexcept
 	{
-		// If an object is passed to the constructor, assign values from that object
-#define GET(name) [&]{ if constexpr (sizeof...(Args) > 0) return _first(args...).name; else return &D::name; }()
-
-		static_assert(sizeof...(Args) <= 1);
-
 		const std::initializer_list<instruction_info> instructions
 		{
-			{ 0, 0x0, GET(STOP) },
-			{ 0, 0x1, GET(LNOP) },
-			{ 0, 0x2, GET(SYNC) },
-			{ 0, 0x3, GET(DSYNC) },
-			{ 0, 0xc, GET(MFSPR) },
-			{ 0, 0xd, GET(RDCH) },
-			{ 0, 0xf, GET(RCHCNT) },
-			{ 0, 0x40, GET(SF) },
-			{ 0, 0x41, GET(OR) },
-			{ 0, 0x42, GET(BG) },
-			{ 0, 0x48, GET(SFH) },
-			{ 0, 0x49, GET(NOR) },
-			{ 0, 0x53, GET(ABSDB) },
-			{ 0, 0x58, GET(ROT) },
-			{ 0, 0x59, GET(ROTM) },
-			{ 0, 0x5a, GET(ROTMA) },
-			{ 0, 0x5b, GET(SHL) },
-			{ 0, 0x5c, GET(ROTH) },
-			{ 0, 0x5d, GET(ROTHM) },
-			{ 0, 0x5e, GET(ROTMAH) },
-			{ 0, 0x5f, GET(SHLH) },
-			{ 0, 0x78, GET(ROTI) },
-			{ 0, 0x79, GET(ROTMI) },
-			{ 0, 0x7a, GET(ROTMAI) },
-			{ 0, 0x7b, GET(SHLI) },
-			{ 0, 0x7c, GET(ROTHI) },
-			{ 0, 0x7d, GET(ROTHMI) },
-			{ 0, 0x7e, GET(ROTMAHI) },
-			{ 0, 0x7f, GET(SHLHI) },
-			{ 0, 0xc0, GET(A) },
-			{ 0, 0xc1, GET(AND) },
-			{ 0, 0xc2, GET(CG) },
-			{ 0, 0xc8, GET(AH) },
-			{ 0, 0xc9, GET(NAND) },
-			{ 0, 0xd3, GET(AVGB) },
-			{ 0, 0x10c, GET(MTSPR) },
-			{ 0, 0x10d, GET(WRCH) },
-			{ 0, 0x128, GET(BIZ) },
-			{ 0, 0x129, GET(BINZ) },
-			{ 0, 0x12a, GET(BIHZ) },
-			{ 0, 0x12b, GET(BIHNZ) },
-			{ 0, 0x140, GET(STOPD) },
-			{ 0, 0x144, GET(STQX) },
-			{ 0, 0x1a8, GET(BI) },
-			{ 0, 0x1a9, GET(BISL) },
-			{ 0, 0x1aa, GET(IRET) },
-			{ 0, 0x1ab, GET(BISLED) },
-			{ 0, 0x1ac, GET(HBR) },
-			{ 0, 0x1b0, GET(GB) },
-			{ 0, 0x1b1, GET(GBH) },
-			{ 0, 0x1b2, GET(GBB) },
-			{ 0, 0x1b4, GET(FSM) },
-			{ 0, 0x1b5, GET(FSMH) },
-			{ 0, 0x1b6, GET(FSMB) },
-			{ 0, 0x1b8, GET(FREST) },
-			{ 0, 0x1b9, GET(FRSQEST) },
-			{ 0, 0x1c4, GET(LQX) },
-			{ 0, 0x1cc, GET(ROTQBYBI) },
-			{ 0, 0x1cd, GET(ROTQMBYBI) },
-			{ 0, 0x1cf, GET(SHLQBYBI) },
-			{ 0, 0x1d4, GET(CBX) },
-			{ 0, 0x1d5, GET(CHX) },
-			{ 0, 0x1d6, GET(CWX) },
-			{ 0, 0x1d7, GET(CDX) },
-			{ 0, 0x1d8, GET(ROTQBI) },
-			{ 0, 0x1d9, GET(ROTQMBI) },
-			{ 0, 0x1db, GET(SHLQBI) },
-			{ 0, 0x1dc, GET(ROTQBY) },
-			{ 0, 0x1dd, GET(ROTQMBY) },
-			{ 0, 0x1df, GET(SHLQBY) },
-			{ 0, 0x1f0, GET(ORX) },
-			{ 0, 0x1f4, GET(CBD) },
-			{ 0, 0x1f5, GET(CHD) },
-			{ 0, 0x1f6, GET(CWD) },
-			{ 0, 0x1f7, GET(CDD) },
-			{ 0, 0x1f8, GET(ROTQBII) },
-			{ 0, 0x1f9, GET(ROTQMBII) },
-			{ 0, 0x1fb, GET(SHLQBII) },
-			{ 0, 0x1fc, GET(ROTQBYI) },
-			{ 0, 0x1fd, GET(ROTQMBYI) },
-			{ 0, 0x1ff, GET(SHLQBYI) },
-			{ 0, 0x201, GET(NOP) },
-			{ 0, 0x240, GET(CGT) },
-			{ 0, 0x241, GET(XOR) },
-			{ 0, 0x248, GET(CGTH) },
-			{ 0, 0x249, GET(EQV) },
-			{ 0, 0x250, GET(CGTB) },
-			{ 0, 0x253, GET(SUMB) },
-			{ 0, 0x258, GET(HGT) },
-			{ 0, 0x2a5, GET(CLZ) },
-			{ 0, 0x2a6, GET(XSWD) },
-			{ 0, 0x2ae, GET(XSHW) },
-			{ 0, 0x2b4, GET(CNTB) },
-			{ 0, 0x2b6, GET(XSBH) },
-			{ 0, 0x2c0, GET(CLGT) },
-			{ 0, 0x2c1, GET(ANDC) },
-			{ 0, 0x2c2, GET(FCGT) },
-			{ 0, 0x2c3, GET(DFCGT) },
-			{ 0, 0x2c4, GET(FA) },
-			{ 0, 0x2c5, GET(FS) },
-			{ 0, 0x2c6, GET(FM) },
-			{ 0, 0x2c8, GET(CLGTH) },
-			{ 0, 0x2c9, GET(ORC) },
-			{ 0, 0x2ca, GET(FCMGT) },
-			{ 0, 0x2cb, GET(DFCMGT) },
-			{ 0, 0x2cc, GET(DFA) },
-			{ 0, 0x2cd, GET(DFS) },
-			{ 0, 0x2ce, GET(DFM) },
-			{ 0, 0x2d0, GET(CLGTB) },
-			{ 0, 0x2d8, GET(HLGT) },
-			{ 0, 0x35c, GET(DFMA) },
-			{ 0, 0x35d, GET(DFMS) },
-			{ 0, 0x35e, GET(DFNMS) },
-			{ 0, 0x35f, GET(DFNMA) },
-			{ 0, 0x3c0, GET(CEQ) },
-			{ 0, 0x3ce, GET(MPYHHU) },
-			{ 0, 0x340, GET(ADDX) },
-			{ 0, 0x341, GET(SFX) },
-			{ 0, 0x342, GET(CGX) },
-			{ 0, 0x343, GET(BGX) },
-			{ 0, 0x346, GET(MPYHHA) },
-			{ 0, 0x34e, GET(MPYHHAU) },
-			{ 0, 0x398, GET(FSCRRD) },
-			{ 0, 0x3b8, GET(FESD) },
-			{ 0, 0x3b9, GET(FRDS) },
-			{ 0, 0x3ba, GET(FSCRWR) },
-			{ 0, 0x3bf, GET(DFTSV) },
-			{ 0, 0x3c2, GET(FCEQ) },
-			{ 0, 0x3c3, GET(DFCEQ) },
-			{ 0, 0x3c4, GET(MPY) },
-			{ 0, 0x3c5, GET(MPYH) },
-			{ 0, 0x3c6, GET(MPYHH) },
-			{ 0, 0x3c7, GET(MPYS) },
-			{ 0, 0x3c8, GET(CEQH) },
-			{ 0, 0x3ca, GET(FCMEQ) },
-			{ 0, 0x3cb, GET(DFCMEQ) },
-			{ 0, 0x3cc, GET(MPYU) },
-			{ 0, 0x3d0, GET(CEQB) },
-			{ 0, 0x3d4, GET(FI) },
-			{ 0, 0x3d8, GET(HEQ) },
-			{ 1, 0x1d8, GET(CFLTS) },
-			{ 1, 0x1d9, GET(CFLTU) },
-			{ 1, 0x1da, GET(CSFLT) },
-			{ 1, 0x1db, GET(CUFLT) },
-			{ 2, 0x40, GET(BRZ) },
-			{ 2, 0x41, GET(STQA) },
-			{ 2, 0x42, GET(BRNZ) },
-			{ 2, 0x44, GET(BRHZ) },
-			{ 2, 0x46, GET(BRHNZ) },
-			{ 2, 0x47, GET(STQR) },
-			{ 2, 0x60, GET(BRA) },
-			{ 2, 0x61, GET(LQA) },
-			{ 2, 0x62, GET(BRASL) },
-			{ 2, 0x64, GET(BR) },
-			{ 2, 0x65, GET(FSMBI) },
-			{ 2, 0x66, GET(BRSL) },
-			{ 2, 0x67, GET(LQR) },
-			{ 2, 0x81, GET(IL) },
-			{ 2, 0x82, GET(ILHU) },
-			{ 2, 0x83, GET(ILH) },
-			{ 2, 0xc1, GET(IOHL) },
-			{ 3, 0x4, GET(ORI) },
-			{ 3, 0x5, GET(ORHI) },
-			{ 3, 0x6, GET(ORBI) },
-			{ 3, 0xc, GET(SFI) },
-			{ 3, 0xd, GET(SFHI) },
-			{ 3, 0x14, GET(ANDI) },
-			{ 3, 0x15, GET(ANDHI) },
-			{ 3, 0x16, GET(ANDBI) },
-			{ 3, 0x1c, GET(AI) },
-			{ 3, 0x1d, GET(AHI) },
-			{ 3, 0x24, GET(STQD) },
-			{ 3, 0x34, GET(LQD) },
-			{ 3, 0x44, GET(XORI) },
-			{ 3, 0x45, GET(XORHI) },
-			{ 3, 0x46, GET(XORBI) },
-			{ 3, 0x4c, GET(CGTI) },
-			{ 3, 0x4d, GET(CGTHI) },
-			{ 3, 0x4e, GET(CGTBI) },
-			{ 3, 0x4f, GET(HGTI) },
-			{ 3, 0x5c, GET(CLGTI) },
-			{ 3, 0x5d, GET(CLGTHI) },
-			{ 3, 0x5e, GET(CLGTBI) },
-			{ 3, 0x5f, GET(HLGTI) },
-			{ 3, 0x74, GET(MPYI) },
-			{ 3, 0x75, GET(MPYUI) },
-			{ 3, 0x7c, GET(CEQI) },
-			{ 3, 0x7d, GET(CEQHI) },
-			{ 3, 0x7e, GET(CEQBI) },
-			{ 3, 0x7f, GET(HEQI) },
-			{ 4, 0x8, GET(HBRA) },
-			{ 4, 0x9, GET(HBRR) },
-			{ 4, 0x21, GET(ILA) },
-			{ 7, 0x8, GET(SELB) },
-			{ 7, 0xb, GET(SHUFB) },
-			{ 7, 0xc, GET(MPYA) },
-			{ 7, 0xd, GET(FNMS) },
-			{ 7, 0xe, GET(FMA) },
-			{ 7, 0xf, GET(FMS) },
+			{ 0, 0x0, &D::STOP },
+			{ 0, 0x1, &D::LNOP },
+			{ 0, 0x2, &D::SYNC },
+			{ 0, 0x3, &D::DSYNC },
+			{ 0, 0xc, &D::MFSPR },
+			{ 0, 0xd, &D::RDCH },
+			{ 0, 0xf, &D::RCHCNT },
+			{ 0, 0x40, &D::SF },
+			{ 0, 0x41, &D::OR },
+			{ 0, 0x42, &D::BG },
+			{ 0, 0x48, &D::SFH },
+			{ 0, 0x49, &D::NOR },
+			{ 0, 0x53, &D::ABSDB },
+			{ 0, 0x58, &D::ROT },
+			{ 0, 0x59, &D::ROTM },
+			{ 0, 0x5a, &D::ROTMA },
+			{ 0, 0x5b, &D::SHL },
+			{ 0, 0x5c, &D::ROTH },
+			{ 0, 0x5d, &D::ROTHM },
+			{ 0, 0x5e, &D::ROTMAH },
+			{ 0, 0x5f, &D::SHLH },
+			{ 0, 0x78, &D::ROTI },
+			{ 0, 0x79, &D::ROTMI },
+			{ 0, 0x7a, &D::ROTMAI },
+			{ 0, 0x7b, &D::SHLI },
+			{ 0, 0x7c, &D::ROTHI },
+			{ 0, 0x7d, &D::ROTHMI },
+			{ 0, 0x7e, &D::ROTMAHI },
+			{ 0, 0x7f, &D::SHLHI },
+			{ 0, 0xc0, &D::A },
+			{ 0, 0xc1, &D::AND },
+			{ 0, 0xc2, &D::CG },
+			{ 0, 0xc8, &D::AH },
+			{ 0, 0xc9, &D::NAND },
+			{ 0, 0xd3, &D::AVGB },
+			{ 0, 0x10c, &D::MTSPR },
+			{ 0, 0x10d, &D::WRCH },
+			{ 0, 0x128, &D::BIZ },
+			{ 0, 0x129, &D::BINZ },
+			{ 0, 0x12a, &D::BIHZ },
+			{ 0, 0x12b, &D::BIHNZ },
+			{ 0, 0x140, &D::STOPD },
+			{ 0, 0x144, &D::STQX },
+			{ 0, 0x1a8, &D::BI },
+			{ 0, 0x1a9, &D::BISL },
+			{ 0, 0x1aa, &D::IRET },
+			{ 0, 0x1ab, &D::BISLED },
+			{ 0, 0x1ac, &D::HBR },
+			{ 0, 0x1b0, &D::GB },
+			{ 0, 0x1b1, &D::GBH },
+			{ 0, 0x1b2, &D::GBB },
+			{ 0, 0x1b4, &D::FSM },
+			{ 0, 0x1b5, &D::FSMH },
+			{ 0, 0x1b6, &D::FSMB },
+			{ 0, 0x1b8, &D::FREST },
+			{ 0, 0x1b9, &D::FRSQEST },
+			{ 0, 0x1c4, &D::LQX },
+			{ 0, 0x1cc, &D::ROTQBYBI },
+			{ 0, 0x1cd, &D::ROTQMBYBI },
+			{ 0, 0x1cf, &D::SHLQBYBI },
+			{ 0, 0x1d4, &D::CBX },
+			{ 0, 0x1d5, &D::CHX },
+			{ 0, 0x1d6, &D::CWX },
+			{ 0, 0x1d7, &D::CDX },
+			{ 0, 0x1d8, &D::ROTQBI },
+			{ 0, 0x1d9, &D::ROTQMBI },
+			{ 0, 0x1db, &D::SHLQBI },
+			{ 0, 0x1dc, &D::ROTQBY },
+			{ 0, 0x1dd, &D::ROTQMBY },
+			{ 0, 0x1df, &D::SHLQBY },
+			{ 0, 0x1f0, &D::ORX },
+			{ 0, 0x1f4, &D::CBD },
+			{ 0, 0x1f5, &D::CHD },
+			{ 0, 0x1f6, &D::CWD },
+			{ 0, 0x1f7, &D::CDD },
+			{ 0, 0x1f8, &D::ROTQBII },
+			{ 0, 0x1f9, &D::ROTQMBII },
+			{ 0, 0x1fb, &D::SHLQBII },
+			{ 0, 0x1fc, &D::ROTQBYI },
+			{ 0, 0x1fd, &D::ROTQMBYI },
+			{ 0, 0x1ff, &D::SHLQBYI },
+			{ 0, 0x201, &D::NOP },
+			{ 0, 0x240, &D::CGT },
+			{ 0, 0x241, &D::XOR },
+			{ 0, 0x248, &D::CGTH },
+			{ 0, 0x249, &D::EQV },
+			{ 0, 0x250, &D::CGTB },
+			{ 0, 0x253, &D::SUMB },
+			{ 0, 0x258, &D::HGT },
+			{ 0, 0x2a5, &D::CLZ },
+			{ 0, 0x2a6, &D::XSWD },
+			{ 0, 0x2ae, &D::XSHW },
+			{ 0, 0x2b4, &D::CNTB },
+			{ 0, 0x2b6, &D::XSBH },
+			{ 0, 0x2c0, &D::CLGT },
+			{ 0, 0x2c1, &D::ANDC },
+			{ 0, 0x2c2, &D::FCGT },
+			{ 0, 0x2c3, &D::DFCGT },
+			{ 0, 0x2c4, &D::FA },
+			{ 0, 0x2c5, &D::FS },
+			{ 0, 0x2c6, &D::FM },
+			{ 0, 0x2c8, &D::CLGTH },
+			{ 0, 0x2c9, &D::ORC },
+			{ 0, 0x2ca, &D::FCMGT },
+			{ 0, 0x2cb, &D::DFCMGT },
+			{ 0, 0x2cc, &D::DFA },
+			{ 0, 0x2cd, &D::DFS },
+			{ 0, 0x2ce, &D::DFM },
+			{ 0, 0x2d0, &D::CLGTB },
+			{ 0, 0x2d8, &D::HLGT },
+			{ 0, 0x35c, &D::DFMA },
+			{ 0, 0x35d, &D::DFMS },
+			{ 0, 0x35e, &D::DFNMS },
+			{ 0, 0x35f, &D::DFNMA },
+			{ 0, 0x3c0, &D::CEQ },
+			{ 0, 0x3ce, &D::MPYHHU },
+			{ 0, 0x340, &D::ADDX },
+			{ 0, 0x341, &D::SFX },
+			{ 0, 0x342, &D::CGX },
+			{ 0, 0x343, &D::BGX },
+			{ 0, 0x346, &D::MPYHHA },
+			{ 0, 0x34e, &D::MPYHHAU },
+			{ 0, 0x398, &D::FSCRRD },
+			{ 0, 0x3b8, &D::FESD },
+			{ 0, 0x3b9, &D::FRDS },
+			{ 0, 0x3ba, &D::FSCRWR },
+			{ 0, 0x3bf, &D::DFTSV },
+			{ 0, 0x3c2, &D::FCEQ },
+			{ 0, 0x3c3, &D::DFCEQ },
+			{ 0, 0x3c4, &D::MPY },
+			{ 0, 0x3c5, &D::MPYH },
+			{ 0, 0x3c6, &D::MPYHH },
+			{ 0, 0x3c7, &D::MPYS },
+			{ 0, 0x3c8, &D::CEQH },
+			{ 0, 0x3ca, &D::FCMEQ },
+			{ 0, 0x3cb, &D::DFCMEQ },
+			{ 0, 0x3cc, &D::MPYU },
+			{ 0, 0x3d0, &D::CEQB },
+			{ 0, 0x3d4, &D::FI },
+			{ 0, 0x3d8, &D::HEQ },
+			{ 1, 0x1d8, &D::CFLTS },
+			{ 1, 0x1d9, &D::CFLTU },
+			{ 1, 0x1da, &D::CSFLT },
+			{ 1, 0x1db, &D::CUFLT },
+			{ 2, 0x40, &D::BRZ },
+			{ 2, 0x41, &D::STQA },
+			{ 2, 0x42, &D::BRNZ },
+			{ 2, 0x44, &D::BRHZ },
+			{ 2, 0x46, &D::BRHNZ },
+			{ 2, 0x47, &D::STQR },
+			{ 2, 0x60, &D::BRA },
+			{ 2, 0x61, &D::LQA },
+			{ 2, 0x62, &D::BRASL },
+			{ 2, 0x64, &D::BR },
+			{ 2, 0x65, &D::FSMBI },
+			{ 2, 0x66, &D::BRSL },
+			{ 2, 0x67, &D::LQR },
+			{ 2, 0x81, &D::IL },
+			{ 2, 0x82, &D::ILHU },
+			{ 2, 0x83, &D::ILH },
+			{ 2, 0xc1, &D::IOHL },
+			{ 3, 0x4, &D::ORI },
+			{ 3, 0x5, &D::ORHI },
+			{ 3, 0x6, &D::ORBI },
+			{ 3, 0xc, &D::SFI },
+			{ 3, 0xd, &D::SFHI },
+			{ 3, 0x14, &D::ANDI },
+			{ 3, 0x15, &D::ANDHI },
+			{ 3, 0x16, &D::ANDBI },
+			{ 3, 0x1c, &D::AI },
+			{ 3, 0x1d, &D::AHI },
+			{ 3, 0x24, &D::STQD },
+			{ 3, 0x34, &D::LQD },
+			{ 3, 0x44, &D::XORI },
+			{ 3, 0x45, &D::XORHI },
+			{ 3, 0x46, &D::XORBI },
+			{ 3, 0x4c, &D::CGTI },
+			{ 3, 0x4d, &D::CGTHI },
+			{ 3, 0x4e, &D::CGTBI },
+			{ 3, 0x4f, &D::HGTI },
+			{ 3, 0x5c, &D::CLGTI },
+			{ 3, 0x5d, &D::CLGTHI },
+			{ 3, 0x5e, &D::CLGTBI },
+			{ 3, 0x5f, &D::HLGTI },
+			{ 3, 0x74, &D::MPYI },
+			{ 3, 0x75, &D::MPYUI },
+			{ 3, 0x7c, &D::CEQI },
+			{ 3, 0x7d, &D::CEQHI },
+			{ 3, 0x7e, &D::CEQBI },
+			{ 3, 0x7f, &D::HEQI },
+			{ 4, 0x8, &D::HBRA },
+			{ 4, 0x9, &D::HBRR },
+			{ 4, 0x21, &D::ILA },
+			{ 7, 0x8, &D::SELB },
+			{ 7, 0xb, &D::SHUFB },
+			{ 7, 0xc, &D::MPYA },
+			{ 7, 0xd, &D::FNMS },
+			{ 7, 0xe, &D::FMA },
+			{ 7, 0xf, &D::FMS },
 		};
 
 		for (auto& x : m_table)
 		{
-			x = GET(UNK);
+			x = &D::UNK;
 		}
 
 		for (auto& entry : instructions)
@@ -313,5 +301,3 @@ public:
 		return m_table[spu_decode(inst)];
 	}
 };
-
-#undef GET
diff --git a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/SPURecompiler.cpp
similarity index 54%
rename from rpcs3/Emu/Cell/SPULLVMRecompiler.cpp
rename to rpcs3/Emu/Cell/SPURecompiler.cpp
index c226e678ad..d9f1a9ed7e 100644
--- a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp
+++ b/rpcs3/Emu/Cell/SPURecompiler.cpp
@@ -3,27 +3,3313 @@
 
 #include "Emu/System.h"
 #include "Emu/system_config.h"
+#include "Emu/system_progress.hpp"
+#include "Emu/system_utils.hpp"
+#include "Emu/cache_utils.hpp"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/timers.hpp"
-#include "Emu/Cell/lv2/sys_time.h"
-#include "Emu/Memory/vm_reservation.h"
-#include "Emu/RSX/Core/RSXReservationLock.hpp"
 #include "Crypto/sha1.h"
+#include "Utilities/StrUtil.h"
 #include "Utilities/JIT.h"
+#include "util/init_mutex.hpp"
 
 #include "SPUThread.h"
 #include "SPUAnalyser.h"
 #include "SPUInterpreter.h"
+#include "SPUDisAsm.h"
 #include <algorithm>
+#include <mutex>
 #include <thread>
+#include <optional>
+#include <unordered_set>
 
 #include "util/v128.hpp"
-#include "util/simd.hpp"
+#include "util/v128sse.hpp"
 #include "util/sysinfo.hpp"
 
-const extern spu_decoder<spu_itype> g_spu_itype;
-const extern spu_decoder<spu_iname> g_spu_iname;
-const extern spu_decoder<spu_iflag> g_spu_iflag;
+const spu_decoder<spu_itype> s_spu_itype;
+const spu_decoder<spu_iname> s_spu_iname;
+const spu_decoder<spu_iflag> s_spu_iflag;
+
+extern const spu_decoder<spu_interpreter_precise> g_spu_interpreter_precise{};
+extern const spu_decoder<spu_interpreter_fast> g_spu_interpreter_fast;
+
+// Move 4 args for calling native function from a GHC calling convention function
+static u8* move_args_ghc_to_native(u8* raw)
+{
+#ifdef _WIN32
+	// mov  rcx, r13
+	// mov  rdx, rbp
+	// mov  r8,  r12
+	// mov  r9,  rbx
+	std::memcpy(raw, "\x4C\x89\xE9\x48\x89\xEA\x4D\x89\xE0\x49\x89\xD9", 12);
+#else
+	// mov  rdi, r13
+	// mov  rsi, rbp
+	// mov  rdx, r12
+	// mov  rcx, rbx
+	std::memcpy(raw, "\x4C\x89\xEF\x48\x89\xEE\x4C\x89\xE2\x48\x89\xD9", 12);
+#endif
+
+	return raw + 12;
+}
+
+DECLARE(spu_runtime::tr_dispatch) = []
+{
+	// Generate a special trampoline to spu_recompiler_base::dispatch with pause instruction
+	u8* const trptr = jit_runtime::alloc(32, 16);
+	u8* raw = move_args_ghc_to_native(trptr);
+	*raw++ = 0xf3; // pause
+	*raw++ = 0x90;
+	*raw++ = 0xff; // jmp [rip]
+	*raw++ = 0x25;
+	std::memset(raw, 0, 4);
+	const u64 target = reinterpret_cast<u64>(&spu_recompiler_base::dispatch);
+	std::memcpy(raw + 4, &target, 8);
+	return reinterpret_cast<spu_function_t>(trptr);
+}();
+
+DECLARE(spu_runtime::tr_branch) = []
+{
+	// Generate a trampoline to spu_recompiler_base::branch
+	u8* const trptr = jit_runtime::alloc(32, 16);
+	u8* raw = move_args_ghc_to_native(trptr);
+	*raw++ = 0xff; // jmp [rip]
+	*raw++ = 0x25;
+	std::memset(raw, 0, 4);
+	const u64 target = reinterpret_cast<u64>(&spu_recompiler_base::branch);
+	std::memcpy(raw + 4, &target, 8);
+	return reinterpret_cast<spu_function_t>(trptr);
+}();
+
+DECLARE(spu_runtime::tr_interpreter) = []
+{
+	u8* const trptr = jit_runtime::alloc(32, 16);
+	u8* raw = move_args_ghc_to_native(trptr);
+	*raw++ = 0xff; // jmp [rip]
+	*raw++ = 0x25;
+	std::memset(raw, 0, 4);
+	const u64 target = reinterpret_cast<u64>(&spu_recompiler_base::old_interpreter);
+	std::memcpy(raw + 4, &target, 8);
+	return reinterpret_cast<spu_function_t>(trptr);
+}();
+
+DECLARE(spu_runtime::g_dispatcher) = []
+{
+	// Allocate 2^20 positions in data area
+	const auto ptr = reinterpret_cast<std::remove_const_t<decltype(spu_runtime::g_dispatcher)>>(jit_runtime::alloc(sizeof(*g_dispatcher), 64, false));
+
+	for (auto& x : *ptr)
+	{
+		x.raw() = tr_dispatch;
+	}
+
+	return ptr;
+}();
+
+DECLARE(spu_runtime::tr_all) = []
+{
+	u8* const trptr = jit_runtime::alloc(32, 16);
+	u8* raw = trptr;
+
+	// Load PC: mov eax, [r13 + spu_thread::pc]
+	*raw++ = 0x41;
+	*raw++ = 0x8b;
+	*raw++ = 0x45;
+	*raw++ = ::narrow<s8>(::offset32(&spu_thread::pc));
+
+	// Get LS address starting from PC: lea rcx, [rbp + rax]
+	*raw++ = 0x48;
+	*raw++ = 0x8d;
+	*raw++ = 0x4c;
+	*raw++ = 0x05;
+	*raw++ = 0x00;
+
+	// mov eax, [rcx]
+	*raw++ = 0x8b;
+	*raw++ = 0x01;
+
+	// shr eax, (32 - 20)
+	*raw++ = 0xc1;
+	*raw++ = 0xe8;
+	*raw++ = 0x0c;
+
+	// Load g_dispatcher to rdx
+	*raw++ = 0x48;
+	*raw++ = 0x8d;
+	*raw++ = 0x15;
+	const s32 r32 = ::narrow<s32>(reinterpret_cast<u64>(g_dispatcher) - reinterpret_cast<u64>(raw) - 4);
+	std::memcpy(raw, &r32, 4);
+	raw += 4;
+
+	// Update block_hash (set zero): mov [r13 + spu_thread::m_block_hash], 0
+	*raw++ = 0x49;
+	*raw++ = 0xc7;
+	*raw++ = 0x45;
+	*raw++ = ::narrow<s8>(::offset32(&spu_thread::block_hash));
+	*raw++ = 0x00;
+	*raw++ = 0x00;
+	*raw++ = 0x00;
+	*raw++ = 0x00;
+
+	// jmp [rdx + rax * 8]
+	*raw++ = 0xff;
+	*raw++ = 0x24;
+	*raw++ = 0xc2;
+
+	return reinterpret_cast<spu_function_t>(trptr);
+}();
+
+DECLARE(spu_runtime::g_gateway) = build_function_asm<spu_function_t>([](asmjit::X86Assembler& c, auto& args)
+{
+	// Gateway for SPU dispatcher, converts from native to GHC calling convention, also saves RSP value for spu_escape
+	using namespace asmjit;
+
+#ifdef _WIN32
+	c.push(x86::r15);
+	c.push(x86::r14);
+	c.push(x86::r13);
+	c.push(x86::r12);
+	c.push(x86::rsi);
+	c.push(x86::rdi);
+	c.push(x86::rbp);
+	c.push(x86::rbx);
+	c.sub(x86::rsp, 0xa8);
+	c.movaps(x86::oword_ptr(x86::rsp, 0x90), x86::xmm15);
+	c.movaps(x86::oword_ptr(x86::rsp, 0x80), x86::xmm14);
+	c.movaps(x86::oword_ptr(x86::rsp, 0x70), x86::xmm13);
+	c.movaps(x86::oword_ptr(x86::rsp, 0x60), x86::xmm12);
+	c.movaps(x86::oword_ptr(x86::rsp, 0x50), x86::xmm11);
+	c.movaps(x86::oword_ptr(x86::rsp, 0x40), x86::xmm10);
+	c.movaps(x86::oword_ptr(x86::rsp, 0x30), x86::xmm9);
+	c.movaps(x86::oword_ptr(x86::rsp, 0x20), x86::xmm8);
+	c.movaps(x86::oword_ptr(x86::rsp, 0x10), x86::xmm7);
+	c.movaps(x86::oword_ptr(x86::rsp, 0), x86::xmm6);
+#else
+	c.push(x86::rbp);
+	c.push(x86::r15);
+	c.push(x86::r14);
+	c.push(x86::r13);
+	c.push(x86::r12);
+	c.push(x86::rbx);
+	c.push(x86::rax);
+#endif
+
+	// Save native stack pointer for longjmp emulation
+	c.mov(x86::qword_ptr(args[0], ::offset32(&spu_thread::saved_native_sp)), x86::rsp);
+
+	// Move 4 args (despite spu_function_t def)
+	c.mov(x86::r13, args[0]);
+	c.mov(x86::rbp, args[1]);
+	c.mov(x86::r12, args[2]);
+	c.mov(x86::rbx, args[3]);
+
+	if (utils::has_avx())
+	{
+		c.vzeroupper();
+	}
+
+	c.call(asmjit::imm_ptr(spu_runtime::tr_all));
+
+	if (utils::has_avx())
+	{
+		c.vzeroupper();
+	}
+
+#ifdef _WIN32
+	c.movaps(x86::xmm6, x86::oword_ptr(x86::rsp, 0));
+	c.movaps(x86::xmm7, x86::oword_ptr(x86::rsp, 0x10));
+	c.movaps(x86::xmm8, x86::oword_ptr(x86::rsp, 0x20));
+	c.movaps(x86::xmm9, x86::oword_ptr(x86::rsp, 0x30));
+	c.movaps(x86::xmm10, x86::oword_ptr(x86::rsp, 0x40));
+	c.movaps(x86::xmm11, x86::oword_ptr(x86::rsp, 0x50));
+	c.movaps(x86::xmm12, x86::oword_ptr(x86::rsp, 0x60));
+	c.movaps(x86::xmm13, x86::oword_ptr(x86::rsp, 0x70));
+	c.movaps(x86::xmm14, x86::oword_ptr(x86::rsp, 0x80));
+	c.movaps(x86::xmm15, x86::oword_ptr(x86::rsp, 0x90));
+	c.add(x86::rsp, 0xa8);
+	c.pop(x86::rbx);
+	c.pop(x86::rbp);
+	c.pop(x86::rdi);
+	c.pop(x86::rsi);
+	c.pop(x86::r12);
+	c.pop(x86::r13);
+	c.pop(x86::r14);
+	c.pop(x86::r15);
+#else
+	c.add(x86::rsp, +8);
+	c.pop(x86::rbx);
+	c.pop(x86::r12);
+	c.pop(x86::r13);
+	c.pop(x86::r14);
+	c.pop(x86::r15);
+	c.pop(x86::rbp);
+#endif
+
+	c.ret();
+});
+
+DECLARE(spu_runtime::g_escape) = build_function_asm<void(*)(spu_thread*)>([](asmjit::X86Assembler& c, auto& args)
+{
+	using namespace asmjit;
+
+	// Restore native stack pointer (longjmp emulation)
+	c.mov(x86::rsp, x86::qword_ptr(args[0], ::offset32(&spu_thread::saved_native_sp)));
+
+	// Return to the return location
+	c.jmp(x86::qword_ptr(x86::rsp, -8));
+});
+
+DECLARE(spu_runtime::g_tail_escape) = build_function_asm<void(*)(spu_thread*, spu_function_t, u8*)>([](asmjit::X86Assembler& c, auto& args)
+{
+	using namespace asmjit;
+
+	// Restore native stack pointer (longjmp emulation)
+	c.mov(x86::rsp, x86::qword_ptr(args[0], ::offset32(&spu_thread::saved_native_sp)));
+
+	// Adjust stack for initial call instruction in the gateway
+	c.sub(x86::rsp, 8);
+
+	// Tail call, GHC CC (second arg)
+	c.mov(x86::r13, args[0]);
+	c.mov(x86::rbp, x86::qword_ptr(args[0], ::offset32(&spu_thread::ls)));
+	c.mov(x86::r12, args[2]);
+	c.xor_(x86::ebx, x86::ebx);
+	c.jmp(args[1]);
+});
+
+DECLARE(spu_runtime::g_interpreter_table) = {};
+
+DECLARE(spu_runtime::g_interpreter) = nullptr;
+
+spu_cache::spu_cache(const std::string& loc)
+	: m_file(loc, fs::read + fs::write + fs::create + fs::append)
+{
+}
+
+spu_cache::~spu_cache()
+{
+}
+
+std::deque<spu_program> spu_cache::get()
+{
+	std::deque<spu_program> result;
+
+	if (!m_file)
+	{
+		return result;
+	}
+
+	m_file.seek(0);
+
+	// TODO: signal truncated or otherwise broken file
+	while (true)
+	{
+		be_t<u32> size;
+		be_t<u32> addr;
+		std::vector<u32> func;
+
+		if (!m_file.read(size) || !m_file.read(addr))
+		{
+			break;
+		}
+
+		func.resize(size);
+
+		if (m_file.read(func.data(), func.size() * 4) != func.size() * 4)
+		{
+			break;
+		}
+
+		if (!size || !func[0])
+		{
+			// Skip old format Giga entries
+			continue;
+		}
+
+		spu_program res;
+		res.entry_point = addr;
+		res.lower_bound = addr;
+		res.data = std::move(func);
+		result.emplace_front(std::move(res));
+	}
+
+	return result;
+}
+
+void spu_cache::add(const spu_program& func)
+{
+	if (!m_file)
+	{
+		return;
+	}
+
+	be_t<u32> size = ::size32(func.data);
+	be_t<u32> addr = func.entry_point;
+
+	const fs::iovec_clone gather[3]
+	{
+		{&size, sizeof(size)},
+		{&addr, sizeof(addr)},
+		{func.data.data(), func.data.size() * 4}
+	};
+
+	// Append data
+	m_file.write_gather(gather, 3);
+}
+
+void spu_cache::initialize()
+{
+	spu_runtime::g_interpreter = spu_runtime::g_gateway;
+
+	if (g_cfg.core.spu_decoder == spu_decoder_type::precise || g_cfg.core.spu_decoder == spu_decoder_type::fast)
+	{
+		for (auto& x : *spu_runtime::g_dispatcher)
+		{
+			x.raw() = spu_runtime::tr_interpreter;
+		}
+	}
+
+	const std::string ppu_cache = rpcs3::cache::get_ppu_cache();
+
+	if (ppu_cache.empty())
+	{
+		return;
+	}
+
+	// SPU cache file (version + block size type)
+	const std::string loc = ppu_cache + "spu-" + fmt::to_lower(g_cfg.core.spu_block_size.to_string()) + "-v1-tane.dat";
+
+	spu_cache cache(loc);
+
+	if (!cache)
+	{
+		spu_log.error("Failed to initialize SPU cache at: %s", loc);
+		return;
+	}
+
+	// Read cache
+	auto func_list = cache.get();
+	atomic_t<usz> fnext{};
+	atomic_t<u8> fail_flag{0};
+
+	if (g_cfg.core.spu_decoder == spu_decoder_type::fast || g_cfg.core.spu_decoder == spu_decoder_type::llvm)
+	{
+		if (auto compiler = spu_recompiler_base::make_llvm_recompiler(11))
+		{
+			compiler->init();
+
+			if (compiler->compile({}) && spu_runtime::g_interpreter)
+			{
+				spu_log.success("SPU Runtime: Built the interpreter.");
+
+				if (g_cfg.core.spu_decoder != spu_decoder_type::llvm)
+				{
+					return;
+				}
+			}
+			else
+			{
+				spu_log.fatal("SPU Runtime: Failed to build the interpreter.");
+			}
+		}
+	}
+
+	u32 worker_count = 0;
+
+	std::optional<scoped_progress_dialog> progr;
+
+	if (g_cfg.core.spu_decoder == spu_decoder_type::asmjit || g_cfg.core.spu_decoder == spu_decoder_type::llvm)
+	{
+		// Initialize progress dialog (wait for previous progress done)
+		thread_ctrl::wait_on<atomic_wait::op_ne>(g_progr_ptotal, 0);
+
+		g_progr_ptotal += ::size32(func_list);
+		progr.emplace("Building SPU cache...");
+
+		worker_count = rpcs3::utils::get_max_threads();
+	}
+
+	named_thread_group workers("SPU Worker ", worker_count, [&]() -> uint
+	{
+		// Set low priority
+		thread_ctrl::scoped_priority low_prio(-1);
+
+		// Initialize compiler instances for parallel compilation
+		std::unique_ptr<spu_recompiler_base> compiler;
+
+		if (g_cfg.core.spu_decoder == spu_decoder_type::asmjit)
+		{
+			compiler = spu_recompiler_base::make_asmjit_recompiler();
+		}
+		else if (g_cfg.core.spu_decoder == spu_decoder_type::llvm)
+		{
+			compiler = spu_recompiler_base::make_llvm_recompiler();
+		}
+
+		compiler->init();
+
+		// How much every thread compiled
+		uint result = 0;
+
+		// Fake LS
+		std::vector<be_t<u32>> ls(0x10000);
+
+		// Build functions
+		for (usz func_i = fnext++; func_i < func_list.size(); func_i = fnext++, g_progr_pdone++)
+		{
+			const spu_program& func = std::as_const(func_list)[func_i];
+
+			if (Emu.IsStopped() || fail_flag)
+			{
+				continue;
+			}
+
+			// Get data start
+			const u32 start = func.lower_bound;
+			const u32 size0 = ::size32(func.data);
+
+			be_t<u64> hash_start;
+			{
+				sha1_context ctx;
+				u8 output[20];
+
+				sha1_starts(&ctx);
+				sha1_update(&ctx, reinterpret_cast<const u8*>(func.data.data()), func.data.size() * 4);
+				sha1_finish(&ctx, output);
+				std::memcpy(&hash_start, output, sizeof(hash_start));
+			}
+
+			// Check hash against allowed bounds
+			const bool inverse_bounds = g_cfg.core.spu_llvm_lower_bound > g_cfg.core.spu_llvm_upper_bound;
+
+			if ((!inverse_bounds && (hash_start < g_cfg.core.spu_llvm_lower_bound || hash_start > g_cfg.core.spu_llvm_upper_bound)) ||
+				(inverse_bounds && (hash_start < g_cfg.core.spu_llvm_lower_bound && hash_start > g_cfg.core.spu_llvm_upper_bound)))
+			{
+				spu_log.error("[Debug] Skipped function %s", fmt::base57(hash_start));
+				result++;
+				continue;
+			}
+
+			// Initialize LS with function data only
+			for (u32 i = 0, pos = start; i < size0; i++, pos += 4)
+			{
+				ls[pos / 4] = std::bit_cast<be_t<u32>>(func.data[i]);
+			}
+
+			// Call analyser
+			spu_program func2 = compiler->analyse(ls.data(), func.entry_point);
+
+			if (func2 != func)
+			{
+				spu_log.error("[0x%05x] SPU Analyser failed, %u vs %u", func2.entry_point, func2.data.size(), size0);
+			}
+			else if (!compiler->compile(std::move(func2)))
+			{
+				// Likely, out of JIT memory. Signal to prevent further building.
+				fail_flag |= 1;
+			}
+
+			// Clear fake LS
+			std::memset(ls.data() + start / 4, 0, 4 * (size0 - 1));
+
+			result++;
+		}
+
+		return result;
+	});
+
+	// Join (implicitly) and print individual results
+	for (u32 i = 0; i < workers.size(); i++)
+	{
+		spu_log.notice("SPU Runtime: Worker %u built %u programs.", i + 1, workers[i]);
+	}
+
+	if (Emu.IsStopped())
+	{
+		spu_log.error("SPU Runtime: Cache building aborted.");
+		return;
+	}
+
+	if (fail_flag)
+	{
+		spu_log.fatal("SPU Runtime: Cache building failed (out of memory).");
+		return;
+	}
+
+	if ((g_cfg.core.spu_decoder == spu_decoder_type::asmjit || g_cfg.core.spu_decoder == spu_decoder_type::llvm) && !func_list.empty())
+	{
+		spu_log.success("SPU Runtime: Built %u functions.", func_list.size());
+
+		if (g_cfg.core.spu_debug)
+		{
+			std::string dump;
+			dump.reserve(10'000'000);
+
+			std::map<std::basic_string_view<u8>, spu_program*> sorted;
+
+			for (auto&& f : func_list)
+			{
+				// Interpret as a byte string
+				std::basic_string_view<u8> data = {reinterpret_cast<u8*>(f.data.data()), f.data.size() * sizeof(u32)};
+
+				sorted[data] = &f;
+			}
+
+			std::unordered_set<u32> depth_n;
+
+			u32 n_max = 0;
+
+			for (auto&& [bytes, f] : sorted)
+			{
+				{
+					sha1_context ctx;
+					u8 output[20];
+
+					sha1_starts(&ctx);
+					sha1_update(&ctx, bytes.data(), bytes.size());
+					sha1_finish(&ctx, output);
+					fmt::append(dump, "\n\t[%s] ", fmt::base57(output));
+				}
+
+				u32 depth_m = 0;
+
+				for (auto&& [data, f2] : sorted)
+				{
+					u32 depth = 0;
+
+					if (f2 == f)
+					{
+						continue;
+					}
+
+					for (u32 i = 0; i < bytes.size(); i++)
+					{
+						if (i < data.size() && data[i] == bytes[i])
+						{
+							depth++;
+						}
+						else
+						{
+							break;
+						}
+					}
+
+					depth_n.emplace(depth);
+					depth_m = std::max(depth, depth_m);
+				}
+
+				fmt::append(dump, "c=%06d,d=%06d ", depth_n.size(), depth_m);
+
+				bool sk = false;
+
+				for (u32 i = 0; i < bytes.size(); i++)
+				{
+					if (depth_m == i)
+					{
+						dump += '|';
+						sk = true;
+					}
+
+					fmt::append(dump, "%02x", bytes[i]);
+
+					if (i % 4 == 3)
+					{
+						if (sk)
+						{
+							sk = false;
+						}
+						else
+						{
+							dump += ' ';
+						}
+
+						dump += ' ';
+					}
+				}
+
+				fmt::append(dump, "\n\t%49s", "");
+
+				for (u32 i = 0; i < f->data.size(); i++)
+				{
+					fmt::append(dump, "%-10s", s_spu_iname.decode(std::bit_cast<be_t<u32>>(f->data[i])));
+				}
+
+				n_max = std::max(n_max, ::size32(depth_n));
+
+				depth_n.clear();
+			}
+
+			spu_log.notice("SPU Cache Dump (max_c=%d): %s", n_max, dump);
+		}
+	}
+
+	// Initialize global cache instance
+	if (g_cfg.core.spu_cache)
+	{
+		g_fxo->get<spu_cache>() = std::move(cache);
+	}
+}
+
+bool spu_program::operator==(const spu_program& rhs) const noexcept
+{
+	// TODO
+	return entry_point - lower_bound == rhs.entry_point - rhs.lower_bound && data == rhs.data;
+}
+
+bool spu_program::operator<(const spu_program& rhs) const noexcept
+{
+	const u32 lhs_offs = (entry_point - lower_bound) / 4;
+	const u32 rhs_offs = (rhs.entry_point - rhs.lower_bound) / 4;
+
+	// Select range for comparison
+	std::basic_string_view<u32> lhs_data(data.data() + lhs_offs, data.size() - lhs_offs);
+	std::basic_string_view<u32> rhs_data(rhs.data.data() + rhs_offs, rhs.data.size() - rhs_offs);
+	const auto cmp0 = lhs_data.compare(rhs_data);
+
+	if (cmp0 < 0)
+		return true;
+	else if (cmp0 > 0)
+		return false;
+
+	// Compare from address 0 to the point before the entry point (TODO: undesirable)
+	lhs_data = {data.data(), lhs_offs};
+	rhs_data = {rhs.data.data(), rhs_offs};
+	const auto cmp1 = lhs_data.compare(rhs_data);
+
+	if (cmp1 < 0)
+		return true;
+	else if (cmp1 > 0)
+		return false;
+
+	// TODO
+	return lhs_offs < rhs_offs;
+}
+
+spu_runtime::spu_runtime()
+{
+	// Clear LLVM output
+	m_cache_path = rpcs3::cache::get_ppu_cache();
+
+	if (m_cache_path.empty())
+	{
+		return;
+	}
+
+	fs::create_dir(m_cache_path + "llvm/");
+	fs::remove_all(m_cache_path + "llvm/", false);
+
+	if (g_cfg.core.spu_debug)
+	{
+		fs::file(m_cache_path + "spu.log", fs::rewrite);
+		fs::file(m_cache_path + "spu-ir.log", fs::rewrite);
+	}
+}
+
+spu_item* spu_runtime::add_empty(spu_program&& data)
+{
+	if (data.data.empty())
+	{
+		return nullptr;
+	}
+
+	// Store previous item if already added
+	spu_item* prev = nullptr;
+
+	//Try to add item that doesn't exist yet
+	const auto ret = m_stuff[data.data[0] >> 12].push_if([&](spu_item& _new, spu_item& _old)
+	{
+		if (_new.data == _old.data)
+		{
+			prev = &_old;
+			return false;
+		}
+
+		return true;
+	}, std::move(data));
+
+	if (ret)
+	{
+		return ret;
+	}
+
+	return prev;
+}
+
+spu_function_t spu_runtime::rebuild_ubertrampoline(u32 id_inst)
+{
+	// Prepare sorted list
+	static thread_local std::vector<std::pair<std::basic_string_view<u32>, spu_function_t>> m_flat_list;
+
+	// Remember top position
+	auto stuff_it = m_stuff.at(id_inst >> 12).begin();
+	auto stuff_end = m_stuff.at(id_inst >> 12).end();
+	{
+		if (stuff_it->trampoline)
+		{
+			return stuff_it->trampoline;
+		}
+
+		m_flat_list.clear();
+
+		for (auto it = stuff_it; it != stuff_end; ++it)
+		{
+			if (const auto ptr = it->compiled.load())
+			{
+				std::basic_string_view<u32> range{it->data.data.data(), it->data.data.size()};
+				range.remove_prefix((it->data.entry_point - it->data.lower_bound) / 4);
+				m_flat_list.emplace_back(range, ptr);
+			}
+			else
+			{
+				// Pull oneself deeper (TODO)
+				++stuff_it;
+			}
+		}
+	}
+
+	std::sort(m_flat_list.begin(), m_flat_list.end(), [&](const auto& a, const auto& b)
+	{
+		std::basic_string_view<u32> lhs = a.first;
+		std::basic_string_view<u32> rhs = b.first;
+		return lhs < rhs;
+	});
+
+	struct work
+	{
+		u32 size;
+		u16 from;
+		u16 level;
+		u8* rel32;
+		decltype(m_flat_list)::iterator beg;
+		decltype(m_flat_list)::iterator end;
+	};
+
+	// Scratch vector
+	static thread_local std::vector<work> workload;
+
+	// Generate a dispatcher (übertrampoline)
+	const auto beg = m_flat_list.begin();
+	const auto _end = m_flat_list.end();
+	const u32 size0 = ::size32(m_flat_list);
+
+	auto result = beg->second;
+
+	if (size0 != 1)
+	{
+		// Allocate some writable executable memory
+		u8* const wxptr = jit_runtime::alloc(size0 * 22 + 14, 16);
+
+		if (!wxptr)
+		{
+			return nullptr;
+		}
+
+		// Raw assembly pointer
+		u8* raw = wxptr;
+
+		// Write jump instruction with rel32 immediate
+		auto make_jump = [&](u8 op, auto target)
+		{
+			ensure(raw + 8 <= wxptr + size0 * 22 + 16);
+
+			// Fallback to dispatch if no target
+			const u64 taddr = target ? reinterpret_cast<u64>(target) : reinterpret_cast<u64>(tr_dispatch);
+
+			// Compute the distance
+			const s64 rel = taddr - reinterpret_cast<u64>(raw) - (op != 0xe9 ? 6 : 5);
+
+			ensure(rel >= s32{smin} && rel <= s32{smax});
+
+			if (op != 0xe9)
+			{
+				// First jcc byte
+				*raw++ = 0x0f;
+				ensure((op >> 4) == 0x8);
+			}
+
+			*raw++ = op;
+
+			const s32 r32 = static_cast<s32>(rel);
+
+			std::memcpy(raw, &r32, 4);
+			raw += 4;
+		};
+
+		workload.clear();
+		workload.reserve(size0);
+		workload.emplace_back();
+		workload.back().size  = size0;
+		workload.back().level = 0;
+		workload.back().from  = -1;
+		workload.back().rel32 = nullptr;
+		workload.back().beg   = beg;
+		workload.back().end   = _end;
+
+		// LS address starting from PC is already loaded into rcx (see spu_runtime::tr_all)
+
+		for (usz i = 0; i < workload.size(); i++)
+		{
+			// Get copy of the workload info
+			auto w = workload[i];
+
+			// Split range in two parts
+			auto it = w.beg;
+			auto it2 = w.beg;
+			u32 size1 = w.size / 2;
+			u32 size2 = w.size - size1;
+			std::advance(it2, w.size / 2);
+
+			while (ensure(w.level < umax))
+			{
+				it = it2;
+				size1 = w.size - size2;
+
+				if (w.level >= w.beg->first.size())
+				{
+					// Cannot split: smallest function is a prefix of bigger ones (TODO)
+					break;
+				}
+
+				const u32 x1 = w.beg->first.at(w.level);
+
+				if (!x1)
+				{
+					// Cannot split: some functions contain holes at this level
+					w.level++;
+
+					// Resort subrange starting from the new level
+					std::stable_sort(w.beg, w.end, [&](const auto& a, const auto& b)
+					{
+						std::basic_string_view<u32> lhs = a.first;
+						std::basic_string_view<u32> rhs = b.first;
+
+						lhs.remove_prefix(w.level);
+						rhs.remove_prefix(w.level);
+
+						return lhs < rhs;
+					});
+
+					continue;
+				}
+
+				// Adjust ranges (forward)
+				while (it != w.end && x1 == it->first.at(w.level))
+				{
+					it++;
+					size1++;
+				}
+
+				if (it == w.end)
+				{
+					// Cannot split: words are identical within the range at this level
+					w.level++;
+				}
+				else
+				{
+					size2 = w.size - size1;
+					break;
+				}
+			}
+
+			if (w.rel32)
+			{
+				// Patch rel32 linking it to the current location if necessary
+				const s32 r32 = ::narrow<s32>(raw - w.rel32);
+				std::memcpy(w.rel32 - 4, &r32, 4);
+			}
+
+			if (w.level >= w.beg->first.size() || w.level >= it->first.size())
+			{
+				// If functions cannot be compared, assume smallest function
+				spu_log.error("Trampoline simplified at ??? (level=%u)", w.level);
+				make_jump(0xe9, w.beg->second); // jmp rel32
+				continue;
+			}
+
+			// Value for comparison
+			const u32 x = it->first.at(w.level);
+
+			// Adjust ranges (backward)
+			while (it != m_flat_list.begin())
+			{
+				it--;
+
+				if (w.level >= it->first.size())
+				{
+					it = m_flat_list.end();
+					break;
+				}
+
+				if (it->first.at(w.level) != x)
+				{
+					it++;
+					break;
+				}
+
+				ensure(it != w.beg);
+				size1--;
+				size2++;
+			}
+
+			if (it == m_flat_list.end())
+			{
+				spu_log.error("Trampoline simplified (II) at ??? (level=%u)", w.level);
+				make_jump(0xe9, w.beg->second); // jmp rel32
+				continue;
+			}
+
+			// Emit 32-bit comparison
+			ensure(raw + 12 <= wxptr + size0 * 22 + 16); // "Asm overflow"
+
+			if (w.from != w.level)
+			{
+				// If necessary (level has advanced), emit load: mov eax, [rcx + addr]
+				const u32 cmp_lsa = w.level * 4u;
+
+				if (cmp_lsa < 0x80)
+				{
+					*raw++ = 0x8b;
+					*raw++ = 0x41;
+					*raw++ = ::narrow<s8>(cmp_lsa);
+				}
+				else
+				{
+					*raw++ = 0x8b;
+					*raw++ = 0x81;
+					std::memcpy(raw, &cmp_lsa, 4);
+					raw += 4;
+				}
+			}
+
+			// Emit comparison: cmp eax, imm32
+			*raw++ = 0x3d;
+			std::memcpy(raw, &x, 4);
+			raw += 4;
+
+			// Low subrange target
+			if (size1 == 1)
+			{
+				make_jump(0x82, w.beg->second); // jb rel32
+			}
+			else
+			{
+				make_jump(0x82, raw); // jb rel32 (stub)
+				auto& to = workload.emplace_back(w);
+				to.end   = it;
+				to.size  = size1;
+				to.rel32 = raw;
+				to.from  = w.level;
+			}
+
+			// Second subrange target
+			if (size2 == 1)
+			{
+				make_jump(0xe9, it->second); // jmp rel32
+			}
+			else
+			{
+				it2 = it;
+
+				// Select additional midrange for equality comparison
+				while (it2 != w.end && it2->first.at(w.level) == x)
+				{
+					size2--;
+					it2++;
+				}
+
+				if (it2 != w.end)
+				{
+					// High subrange target
+					if (size2 == 1)
+					{
+						make_jump(0x87, it2->second); // ja rel32
+					}
+					else
+					{
+						make_jump(0x87, raw); // ja rel32 (stub)
+						auto& to = workload.emplace_back(w);
+						to.beg   = it2;
+						to.size  = size2;
+						to.rel32 = raw;
+						to.from  = w.level;
+					}
+
+					const u32 size3 = w.size - size1 - size2;
+
+					if (size3 == 1)
+					{
+						make_jump(0xe9, it->second); // jmp rel32
+					}
+					else
+					{
+						make_jump(0xe9, raw); // jmp rel32 (stub)
+						auto& to = workload.emplace_back(w);
+						to.beg   = it;
+						to.end   = it2;
+						to.size  = size3;
+						to.rel32 = raw;
+						to.from  = w.level;
+					}
+				}
+				else
+				{
+					make_jump(0xe9, raw); // jmp rel32 (stub)
+					auto& to = workload.emplace_back(w);
+					to.beg   = it;
+					to.size  = w.size - size1;
+					to.rel32 = raw;
+					to.from  = w.level;
+				}
+			}
+		}
+
+		workload.clear();
+		result = reinterpret_cast<spu_function_t>(reinterpret_cast<u64>(wxptr));
+	}
+
+	if (auto _old = stuff_it->trampoline.compare_and_swap(nullptr, result))
+	{
+		return _old;
+	}
+
+	// Install ubertrampoline
+	auto& insert_to = spu_runtime::g_dispatcher->at(id_inst >> 12);
+
+	auto _old = insert_to.load();
+
+	do
+	{
+		// Make sure we are replacing an older ubertrampoline but not newer one
+		if (_old != tr_dispatch)
+		{
+			bool ok = false;
+
+			for (auto it = stuff_it; it != stuff_end; ++it)
+			{
+				if (it->trampoline == _old)
+				{
+					ok = true;
+					break;
+				}
+			}
+
+			if (!ok)
+			{
+				return result;
+			}
+		}
+	}
+	while (!insert_to.compare_exchange(_old, result));
+
+	return result;
+}
+
+spu_function_t spu_runtime::find(const u32* ls, u32 addr) const
+{
+	for (auto& item : m_stuff.at(ls[addr / 4] >> 12))
+	{
+		if (const auto ptr = item.compiled.load())
+		{
+			std::basic_string_view<u32> range{item.data.data.data(), item.data.data.size()};
+			range.remove_prefix((item.data.entry_point - item.data.lower_bound) / 4);
+
+			if (addr / 4 + range.size() > 0x10000)
+			{
+				continue;
+			}
+
+			if (range.compare(0, range.size(), ls + addr / 4, range.size()) == 0)
+			{
+				return ptr;
+			}
+		}
+	}
+
+	return nullptr;
+}
+
+spu_function_t spu_runtime::make_branch_patchpoint(u16 data) const
+{
+	u8* const raw = jit_runtime::alloc(16, 16);
+
+	if (!raw)
+	{
+		return nullptr;
+	}
+
+	// Save address of the following jmp (GHC CC 3rd argument)
+	raw[0] = 0x4c; // lea r12, [rip+1]
+	raw[1] = 0x8d;
+	raw[2] = 0x25;
+	raw[3] = 0x01;
+	raw[4] = 0x00;
+	raw[5] = 0x00;
+	raw[6] = 0x00;
+
+	raw[7] = 0x90; // nop
+
+	// Jump to spu_recompiler_base::branch
+	raw[8] = 0xe9;
+	// Compute the distance
+	const s64 rel = reinterpret_cast<u64>(tr_branch) - reinterpret_cast<u64>(raw + 8) - 5;
+	std::memcpy(raw + 9, &rel, 4);
+	raw[13] = 0xcc;
+	raw[14] = data >> 8;
+	raw[15] = data & 0xff;
+
+	return reinterpret_cast<spu_function_t>(raw);
+}
+
+spu_recompiler_base::spu_recompiler_base()
+{
+}
+
+spu_recompiler_base::~spu_recompiler_base()
+{
+}
+
+void spu_recompiler_base::dispatch(spu_thread& spu, void*, u8* rip)
+{
+	// If code verification failed from a patched patchpoint, clear it with a dispatcher jump
+	if (rip)
+	{
+		const s64 rel = reinterpret_cast<u64>(spu_runtime::tr_all) - reinterpret_cast<u64>(rip - 8) - 5;
+
+		union
+		{
+			u8 bytes[8];
+			u64 result;
+		};
+
+		bytes[0] = 0xe9; // jmp rel32
+		std::memcpy(bytes + 1, &rel, 4);
+		bytes[5] = 0x66; // lnop (2 bytes)
+		bytes[6] = 0x90;
+		bytes[7] = 0x90;
+
+		atomic_storage<u64>::release(*reinterpret_cast<u64*>(rip - 8), result);
+	}
+
+	// Second attempt (recover from the recursion after repeated unsuccessful trampoline call)
+	if (spu.block_counter != spu.block_recover && &dispatch != spu_runtime::g_dispatcher->at(spu._ref<nse_t<u32>>(spu.pc) >> 12))
+	{
+		spu.block_recover = spu.block_counter;
+		return;
+	}
+
+	spu.jit->init();
+
+	// Compile
+	if (spu._ref<u32>(spu.pc) == 0u)
+	{
+		spu_runtime::g_escape(&spu);
+		return;
+	}
+
+	const auto func = spu.jit->compile(spu.jit->analyse(spu._ptr<u32>(0), spu.pc));
+
+	if (!func)
+	{
+		spu_log.fatal("[0x%05x] Compilation failed.", spu.pc);
+		return;
+	}
+
+	// Diagnostic
+	if (g_cfg.core.spu_block_size == spu_block_size_type::giga)
+	{
+		const v128 _info = spu.stack_mirror[(spu.gpr[1]._u32[3] & 0x3fff0) >> 4];
+
+		if (_info._u64[0] + 1)
+		{
+			spu_log.trace("Called from 0x%x", _info._u32[2] - 4);
+		}
+	}
+
+	spu_runtime::g_tail_escape(&spu, func, nullptr);
+}
+
+void spu_recompiler_base::branch(spu_thread& spu, void*, u8* rip)
+{
+	if (const u32 ls_off = ((rip[6] << 8) | rip[7]) * 4)
+	{
+		spu_log.todo("Special branch patchpoint hit.\nPlease report to the developer (0x%05x).", ls_off);
+	}
+
+	// Find function
+	const auto func = spu.jit->get_runtime().find(static_cast<u32*>(spu._ptr<void>(0)), spu.pc);
+
+	if (!func)
+	{
+		return;
+	}
+
+	// Overwrite jump to this function with jump to the compiled function
+	const s64 rel = reinterpret_cast<u64>(func) - reinterpret_cast<u64>(rip) - 5;
+
+	union
+	{
+		u8 bytes[8];
+		u64 result;
+	};
+
+	if (rel >= s32{smin} && rel <= s32{smax})
+	{
+		const s64 rel8 = (rel + 5) - 2;
+
+		if (rel8 >= s8{smin} && rel8 <= s8{smax})
+		{
+			bytes[0] = 0xeb; // jmp rel8
+			bytes[1] = static_cast<s8>(rel8);
+			std::memset(bytes + 2, 0xcc, 4);
+		}
+		else
+		{
+			bytes[0] = 0xe9; // jmp rel32
+			std::memcpy(bytes + 1, &rel, 4);
+			bytes[5] = 0xcc;
+		}
+
+		bytes[6] = rip[6];
+		bytes[7] = rip[7];
+	}
+	else
+	{
+		fmt::throw_exception("Impossible far jump: %p -> %p", rip, func);
+	}
+
+	atomic_storage<u64>::release(*reinterpret_cast<u64*>(rip), result);
+
+	spu_runtime::g_tail_escape(&spu, func, rip);
+}
+
+void spu_recompiler_base::old_interpreter(spu_thread& spu, void* ls, u8* /*rip*/)
+{
+	if (g_cfg.core.spu_decoder > spu_decoder_type::fast)
+	{
+		fmt::throw_exception("Invalid SPU decoder");
+	}
+
+	// Select opcode table
+	const auto& table = *(g_cfg.core.spu_decoder == spu_decoder_type::precise
+		? &g_spu_interpreter_precise.get_table()
+		: &g_spu_interpreter_fast.get_table());
+
+	// LS pointer
+	const auto base = static_cast<const u8*>(ls);
+
+	while (true)
+	{
+		if (spu.state) [[unlikely]]
+		{
+			if (spu.check_state())
+				break;
+		}
+
+		const u32 op = *reinterpret_cast<const be_t<u32>*>(base + spu.pc);
+		if (table[spu_decode(op)](spu, {op}))
+			spu.pc += 4;
+	}
+}
+
+spu_program spu_recompiler_base::analyse(const be_t<u32>* ls, u32 entry_point)
+{
+	// Result: addr + raw instruction data
+	spu_program result;
+	result.data.reserve(10000);
+	result.entry_point = entry_point;
+	result.lower_bound = entry_point;
+
+	// Initialize block entries
+	m_block_info.reset();
+	m_block_info.set(entry_point / 4);
+	m_entry_info.reset();
+	m_entry_info.set(entry_point / 4);
+	m_ret_info.reset();
+
+	// Simple block entry workload list
+	workload.clear();
+	workload.push_back(entry_point);
+
+	std::memset(m_regmod.data(), 0xff, sizeof(m_regmod));
+	std::memset(m_use_ra.data(), 0xff, sizeof(m_use_ra));
+	std::memset(m_use_rb.data(), 0xff, sizeof(m_use_rb));
+	std::memset(m_use_rc.data(), 0xff, sizeof(m_use_rc));
+	m_targets.clear();
+	m_preds.clear();
+	m_preds[entry_point];
+	m_bbs.clear();
+	m_chunks.clear();
+	m_funcs.clear();
+
+	// Value flags (TODO: only is_const is implemented)
+	enum class vf : u32
+	{
+		is_const,
+		is_mask,
+		is_rel,
+
+		__bitset_enum_max
+	};
+
+	// Weak constant propagation context (for guessing branch targets)
+	std::array<bs_t<vf>, 128> vflags{};
+
+	// Associated constant values for 32-bit preferred slot
+	std::array<u32, 128> values;
+
+	// SYNC instruction found
+	bool sync = false;
+
+	u32 hbr_loc = 0;
+	u32 hbr_tg = -1;
+
+	// Result bounds
+	u32 lsa = entry_point;
+	u32 limit = 0x40000;
+
+	if (g_cfg.core.spu_block_size == spu_block_size_type::giga)
+	{
+	}
+
+	for (u32 wi = 0, wa = workload[0]; wi < workload.size();)
+	{
+		const auto next_block = [&]
+		{
+			// Reset value information
+			vflags.fill({});
+			sync = false;
+			hbr_loc = 0;
+			hbr_tg = -1;
+			wi++;
+
+			if (wi < workload.size())
+			{
+				wa = workload[wi];
+			}
+		};
+
+		const u32 pos = wa;
+
+		const auto add_block = [&](u32 target)
+		{
+			// Validate new target (TODO)
+			if (target >= lsa && target < limit)
+			{
+				// Check for redundancy
+				if (!m_block_info[target / 4])
+				{
+					m_block_info[target / 4] = true;
+					workload.push_back(target);
+				}
+
+				// Add predecessor
+				if (m_preds[target].find_first_of(pos) + 1 == 0)
+				{
+					m_preds[target].push_back(pos);
+				}
+			}
+		};
+
+		if (pos < lsa || pos >= limit)
+		{
+			// Don't analyse if already beyond the limit
+			next_block();
+			continue;
+		}
+
+		const u32 data = ls[pos / 4];
+		const auto op = spu_opcode_t{data};
+
+		wa += 4;
+
+		m_targets.erase(pos);
+
+		// Fill register access info
+		if (auto iflags = s_spu_iflag.decode(data))
+		{
+			if (+iflags & +spu_iflag::use_ra)
+				m_use_ra[pos / 4] = op.ra;
+			if (+iflags & +spu_iflag::use_rb)
+				m_use_rb[pos / 4] = op.rb;
+			if (+iflags & +spu_iflag::use_rc)
+				m_use_rc[pos / 4] = op.rc;
+		}
+
+		// Analyse instruction
+		switch (const auto type = s_spu_itype.decode(data))
+		{
+		case spu_itype::UNK:
+		case spu_itype::DFCEQ:
+		case spu_itype::DFCMEQ:
+		case spu_itype::DFCGT:
+		case spu_itype::DFCMGT:
+		case spu_itype::DFTSV:
+		{
+			// Stop before invalid instructions (TODO)
+			next_block();
+			continue;
+		}
+
+		case spu_itype::SYNC:
+		case spu_itype::STOP:
+		case spu_itype::STOPD:
+		{
+			if (data == 0)
+			{
+				// Stop before null data
+				next_block();
+				continue;
+			}
+
+			if (g_cfg.core.spu_block_size == spu_block_size_type::safe)
+			{
+				// Stop on special instructions (TODO)
+				m_targets[pos];
+				next_block();
+				break;
+			}
+
+			if (type == spu_itype::SYNC)
+			{
+				// Remember
+				sync = true;
+			}
+
+			break;
+		}
+
+		case spu_itype::IRET:
+		{
+			if (op.d && op.e)
+			{
+				spu_log.error("[0x%x] Invalid interrupt flags (DE)", pos);
+			}
+
+			m_targets[pos];
+			next_block();
+			break;
+		}
+
+		case spu_itype::BI:
+		case spu_itype::BISL:
+		case spu_itype::BISLED:
+		case spu_itype::BIZ:
+		case spu_itype::BINZ:
+		case spu_itype::BIHZ:
+		case spu_itype::BIHNZ:
+		{
+			if (op.d && op.e)
+			{
+				spu_log.error("[0x%x] Invalid interrupt flags (DE)", pos);
+			}
+
+			const auto af = vflags[op.ra];
+			const auto av = values[op.ra];
+			const bool sl = type == spu_itype::BISL || type == spu_itype::BISLED;
+
+			if (sl)
+			{
+				m_regmod[pos / 4] = op.rt;
+				vflags[op.rt] = +vf::is_const;
+				values[op.rt] = pos + 4;
+			}
+
+			if (af & vf::is_const)
+			{
+				const u32 target = spu_branch_target(av);
+
+				spu_log.warning("[0x%x] At 0x%x: indirect branch to 0x%x%s", entry_point, pos, target, op.d ? " (D)" : op.e ? " (E)" : "");
+
+				m_targets[pos].push_back(target);
+
+				if (g_cfg.core.spu_block_size == spu_block_size_type::giga)
+				{
+					if (sync)
+					{
+						spu_log.notice("[0x%x] At 0x%x: ignoring %scall to 0x%x (SYNC)", entry_point, pos, sl ? "" : "tail ", target);
+
+						if (target > entry_point)
+						{
+							limit = std::min<u32>(limit, target);
+						}
+					}
+					else
+					{
+						m_entry_info[target / 4] = true;
+						add_block(target);
+					}
+				}
+				else if (target > entry_point)
+				{
+					limit = std::min<u32>(limit, target);
+				}
+
+				if (sl && g_cfg.core.spu_block_size != spu_block_size_type::safe)
+				{
+					m_ret_info[pos / 4 + 1] = true;
+					m_entry_info[pos / 4 + 1] = true;
+					m_targets[pos].push_back(pos + 4);
+					add_block(pos + 4);
+				}
+			}
+			else if (type == spu_itype::BI && g_cfg.core.spu_block_size != spu_block_size_type::safe && !op.d && !op.e && !sync)
+			{
+				// Analyse jump table (TODO)
+				std::basic_string<u32> jt_abs;
+				std::basic_string<u32> jt_rel;
+				const u32 start = pos + 4;
+				u64 dabs = 0;
+				u64 drel = 0;
+
+				for (u32 i = start; i < limit; i += 4)
+				{
+					const u32 target = ls[i / 4];
+
+					if (target == 0 || target % 4)
+					{
+						// Address cannot be misaligned: abort
+						break;
+					}
+
+					if (target >= lsa && target < 0x40000)
+					{
+						// Possible jump table entry (absolute)
+						jt_abs.push_back(target);
+					}
+
+					if (target + start >= lsa && target + start < 0x40000)
+					{
+						// Possible jump table entry (relative)
+						jt_rel.push_back(target + start);
+					}
+
+					if (std::max(jt_abs.size(), jt_rel.size()) * 4 + start <= i)
+					{
+						// Neither type of jump table completes
+						jt_abs.clear();
+						jt_rel.clear();
+						break;
+					}
+				}
+
+				// Choose position after the jt as an anchor and compute the average distance
+				for (u32 target : jt_abs)
+				{
+					dabs += std::abs(static_cast<s32>(target - start - jt_abs.size() * 4));
+				}
+
+				for (u32 target : jt_rel)
+				{
+					drel += std::abs(static_cast<s32>(target - start - jt_rel.size() * 4));
+				}
+
+				// Add detected jump table blocks
+				if (jt_abs.size() >= 3 || jt_rel.size() >= 3)
+				{
+					if (jt_abs.size() == jt_rel.size())
+					{
+						if (dabs < drel)
+						{
+							jt_rel.clear();
+						}
+
+						if (dabs > drel)
+						{
+							jt_abs.clear();
+						}
+
+						ensure(jt_abs.size() != jt_rel.size());
+					}
+
+					if (jt_abs.size() >= jt_rel.size())
+					{
+						const u32 new_size = (start - lsa) / 4 + ::size32(jt_abs);
+
+						if (result.data.size() < new_size)
+						{
+							result.data.resize(new_size);
+						}
+
+						for (u32 i = 0; i < jt_abs.size(); i++)
+						{
+							add_block(jt_abs[i]);
+							result.data[(start - lsa) / 4 + i] = std::bit_cast<u32, be_t<u32>>(jt_abs[i]);
+							m_targets[start + i * 4];
+						}
+
+						m_targets.emplace(pos, std::move(jt_abs));
+					}
+
+					if (jt_rel.size() >= jt_abs.size())
+					{
+						const u32 new_size = (start - lsa) / 4 + ::size32(jt_rel);
+
+						if (result.data.size() < new_size)
+						{
+							result.data.resize(new_size);
+						}
+
+						for (u32 i = 0; i < jt_rel.size(); i++)
+						{
+							add_block(jt_rel[i]);
+							result.data[(start - lsa) / 4 + i] = std::bit_cast<u32, be_t<u32>>(jt_rel[i] - start);
+							m_targets[start + i * 4];
+						}
+
+						m_targets.emplace(pos, std::move(jt_rel));
+					}
+				}
+				else if (start + 12 * 4 < limit &&
+					ls[start / 4 + 0] == 0x1ce00408u &&
+					ls[start / 4 + 1] == 0x24000389u &&
+					ls[start / 4 + 2] == 0x24004809u &&
+					ls[start / 4 + 3] == 0x24008809u &&
+					ls[start / 4 + 4] == 0x2400c809u &&
+					ls[start / 4 + 5] == 0x24010809u &&
+					ls[start / 4 + 6] == 0x24014809u &&
+					ls[start / 4 + 7] == 0x24018809u &&
+					ls[start / 4 + 8] == 0x1c200807u &&
+					ls[start / 4 + 9] == 0x2401c809u)
+				{
+					spu_log.warning("[0x%x] Pattern 1 detected (hbr=0x%x:0x%x)", pos, hbr_loc, hbr_tg);
+
+					// Add 8 targets (TODO)
+					for (u32 addr = start + 4; addr < start + 36; addr += 4)
+					{
+						m_targets[pos].push_back(addr);
+						add_block(addr);
+					}
+				}
+				else if (hbr_loc > start && hbr_loc < limit && hbr_tg == start)
+				{
+					spu_log.warning("[0x%x] No patterns detected (hbr=0x%x:0x%x)", pos, hbr_loc, hbr_tg);
+				}
+			}
+			else if (type == spu_itype::BI && sync)
+			{
+				spu_log.notice("[0x%x] At 0x%x: ignoring indirect branch (SYNC)", entry_point, pos);
+			}
+
+			if (type == spu_itype::BI || sl)
+			{
+				if (type == spu_itype::BI || g_cfg.core.spu_block_size == spu_block_size_type::safe)
+				{
+					m_targets[pos];
+				}
+				else
+				{
+					m_ret_info[pos / 4 + 1] = true;
+					m_entry_info[pos / 4 + 1] = true;
+					m_targets[pos].push_back(pos + 4);
+					add_block(pos + 4);
+				}
+			}
+			else
+			{
+				m_targets[pos].push_back(pos + 4);
+				add_block(pos + 4);
+			}
+
+			next_block();
+			break;
+		}
+
+		case spu_itype::BRSL:
+		case spu_itype::BRASL:
+		{
+			const u32 target = spu_branch_target(type == spu_itype::BRASL ? 0 : pos, op.i16);
+
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = +vf::is_const;
+			values[op.rt] = pos + 4;
+
+			if (type == spu_itype::BRSL && target == pos + 4)
+			{
+				// Get next instruction address idiom
+				break;
+			}
+
+			m_targets[pos].push_back(target);
+
+			if (g_cfg.core.spu_block_size != spu_block_size_type::safe)
+			{
+				m_ret_info[pos / 4 + 1] = true;
+				m_entry_info[pos / 4 + 1] = true;
+				m_targets[pos].push_back(pos + 4);
+				add_block(pos + 4);
+			}
+
+			if (g_cfg.core.spu_block_size == spu_block_size_type::giga && !sync)
+			{
+				m_entry_info[target / 4] = true;
+				add_block(target);
+			}
+			else
+			{
+				if (g_cfg.core.spu_block_size == spu_block_size_type::giga)
+				{
+					spu_log.notice("[0x%x] At 0x%x: ignoring fixed call to 0x%x (SYNC)", entry_point, pos, target);
+				}
+
+				if (target > entry_point)
+				{
+					limit = std::min<u32>(limit, target);
+				}
+			}
+
+			next_block();
+			break;
+		}
+
+		case spu_itype::BRA:
+		{
+			const u32 target = spu_branch_target(0, op.i16);
+
+			if (g_cfg.core.spu_block_size == spu_block_size_type::giga && !sync)
+			{
+				m_entry_info[target / 4] = true;
+				add_block(target);
+			}
+			else
+			{
+				if (g_cfg.core.spu_block_size == spu_block_size_type::giga)
+				{
+					spu_log.notice("[0x%x] At 0x%x: ignoring fixed tail call to 0x%x (SYNC)", entry_point, pos, target);
+				}
+
+				if (target > entry_point)
+				{
+					limit = std::min<u32>(limit, target);
+				}
+			}
+
+			next_block();
+			break;
+		}
+
+		case spu_itype::BR:
+		case spu_itype::BRZ:
+		case spu_itype::BRNZ:
+		case spu_itype::BRHZ:
+		case spu_itype::BRHNZ:
+		{
+			const u32 target = spu_branch_target(pos, op.i16);
+
+			if (target == pos + 4)
+			{
+				// Nop
+				break;
+			}
+
+			m_targets[pos].push_back(target);
+			add_block(target);
+
+			if (type != spu_itype::BR)
+			{
+				m_targets[pos].push_back(pos + 4);
+				add_block(pos + 4);
+			}
+
+			next_block();
+			break;
+		}
+
+		case spu_itype::DSYNC:
+		case spu_itype::HEQ:
+		case spu_itype::HEQI:
+		case spu_itype::HGT:
+		case spu_itype::HGTI:
+		case spu_itype::HLGT:
+		case spu_itype::HLGTI:
+		case spu_itype::LNOP:
+		case spu_itype::NOP:
+		case spu_itype::MTSPR:
+		case spu_itype::FSCRWR:
+		case spu_itype::STQA:
+		case spu_itype::STQD:
+		case spu_itype::STQR:
+		case spu_itype::STQX:
+		{
+			// Do nothing
+			break;
+		}
+
+		case spu_itype::WRCH:
+		{
+			switch (op.ra)
+			{
+			case MFC_EAL:
+			{
+				m_regmod[pos / 4] = s_reg_mfc_eal;
+				break;
+			}
+			case MFC_LSA:
+			{
+				m_regmod[pos / 4] = s_reg_mfc_lsa;
+				break;
+			}
+			case MFC_TagID:
+			{
+				m_regmod[pos / 4] = s_reg_mfc_tag;
+				break;
+			}
+			case MFC_Size:
+			{
+				m_regmod[pos / 4] = s_reg_mfc_size;
+				break;
+			}
+			case MFC_Cmd:
+			{
+				m_use_rb[pos / 4] = s_reg_mfc_eal;
+				break;
+			}
+			default: break;
+			}
+
+			break;
+		}
+
+		case spu_itype::LQA:
+		case spu_itype::LQD:
+		case spu_itype::LQR:
+		case spu_itype::LQX:
+		{
+			// Unconst
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = {};
+			break;
+		}
+
+		case spu_itype::HBR:
+		{
+			hbr_loc = spu_branch_target(pos, op.roh << 7 | op.rt);
+			hbr_tg  = vflags[op.ra] & vf::is_const && !op.c ? values[op.ra] & 0x3fffc : -1;
+			break;
+		}
+
+		case spu_itype::HBRA:
+		{
+			hbr_loc = spu_branch_target(pos, op.r0h << 7 | op.rt);
+			hbr_tg  = spu_branch_target(0x0, op.i16);
+			break;
+		}
+
+		case spu_itype::HBRR:
+		{
+			hbr_loc = spu_branch_target(pos, op.r0h << 7 | op.rt);
+			hbr_tg  = spu_branch_target(pos, op.i16);
+			break;
+		}
+
+		case spu_itype::IL:
+		{
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = +vf::is_const;
+			values[op.rt] = op.si16;
+			break;
+		}
+		case spu_itype::ILA:
+		{
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = +vf::is_const;
+			values[op.rt] = op.i18;
+			break;
+		}
+		case spu_itype::ILH:
+		{
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = +vf::is_const;
+			values[op.rt] = op.i16 << 16 | op.i16;
+			break;
+		}
+		case spu_itype::ILHU:
+		{
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = +vf::is_const;
+			values[op.rt] = op.i16 << 16;
+			break;
+		}
+		case spu_itype::IOHL:
+		{
+			m_regmod[pos / 4] = op.rt;
+			values[op.rt] = values[op.rt] | op.i16;
+			break;
+		}
+		case spu_itype::ORI:
+		{
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = vflags[op.ra] & vf::is_const;
+			values[op.rt] = values[op.ra] | op.si10;
+			break;
+		}
+		case spu_itype::OR:
+		{
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = vflags[op.ra] & vflags[op.rb] & vf::is_const;
+			values[op.rt] = values[op.ra] | values[op.rb];
+			break;
+		}
+		case spu_itype::ANDI:
+		{
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = vflags[op.ra] & vf::is_const;
+			values[op.rt] = values[op.ra] & op.si10;
+			break;
+		}
+		case spu_itype::AND:
+		{
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = vflags[op.ra] & vflags[op.rb] & vf::is_const;
+			values[op.rt] = values[op.ra] & values[op.rb];
+			break;
+		}
+		case spu_itype::AI:
+		{
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = vflags[op.ra] & vf::is_const;
+			values[op.rt] = values[op.ra] + op.si10;
+			break;
+		}
+		case spu_itype::A:
+		{
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = vflags[op.ra] & vflags[op.rb] & vf::is_const;
+			values[op.rt] = values[op.ra] + values[op.rb];
+			break;
+		}
+		case spu_itype::SFI:
+		{
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = vflags[op.ra] & vf::is_const;
+			values[op.rt] = op.si10 - values[op.ra];
+			break;
+		}
+		case spu_itype::SF:
+		{
+			m_regmod[pos / 4] = op.rt;
+			vflags[op.rt] = vflags[op.ra] & vflags[op.rb] & vf::is_const;
+			values[op.rt] = values[op.rb] - values[op.ra];
+			break;
+		}
+		case spu_itype::ROTMI:
+		{
+			m_regmod[pos / 4] = op.rt;
+
+			if ((0 - op.i7) & 0x20)
+			{
+				vflags[op.rt] = +vf::is_const;
+				values[op.rt] = 0;
+				break;
+			}
+
+			vflags[op.rt] = vflags[op.ra] & vf::is_const;
+			values[op.rt] = values[op.ra] >> ((0 - op.i7) & 0x1f);
+			break;
+		}
+		case spu_itype::SHLI:
+		{
+			m_regmod[pos / 4] = op.rt;
+
+			if (op.i7 & 0x20)
+			{
+				vflags[op.rt] = +vf::is_const;
+				values[op.rt] = 0;
+				break;
+			}
+
+			vflags[op.rt] = vflags[op.ra] & vf::is_const;
+			values[op.rt] = values[op.ra] << (op.i7 & 0x1f);
+			break;
+		}
+
+		default:
+		{
+			// Unconst
+			const u32 op_rt = type & spu_itype::_quadrop ? +op.rt4 : +op.rt;
+			m_regmod[pos / 4] = op_rt;
+			vflags[op_rt] = {};
+			break;
+		}
+		}
+
+		// Insert raw instruction value
+		const u32 new_size = (pos - lsa) / 4;
+
+		if (result.data.size() <= new_size)
+		{
+			if (result.data.size() < new_size)
+			{
+				result.data.resize(new_size);
+			}
+
+			result.data.emplace_back(std::bit_cast<u32, be_t<u32>>(data));
+		}
+		else if (u32& raw_val = result.data[new_size])
+		{
+			ensure(raw_val == std::bit_cast<u32, be_t<u32>>(data));
+		}
+		else
+		{
+			raw_val = std::bit_cast<u32, be_t<u32>>(data);
+		}
+	}
+
+	while (lsa > 0 || limit < 0x40000)
+	{
+		const u32 initial_size = ::size32(result.data);
+
+		// Check unreachable blocks
+		limit = std::min<u32>(limit, lsa + initial_size * 4);
+
+		for (auto& pair : m_preds)
+		{
+			bool reachable = false;
+
+			if (pair.first >= limit)
+			{
+				continue;
+			}
+
+			// All (direct and indirect) predecessors to check
+			std::basic_string<u32> workload;
+
+			// Bit array used to deduplicate workload list
+			workload.push_back(pair.first);
+			m_bits[pair.first / 4] = true;
+
+			for (usz i = 0; !reachable && i < workload.size(); i++)
+			{
+				for (u32 j = workload[i];; j -= 4)
+				{
+					// Go backward from an address until the entry point is reached
+					if (j == entry_point)
+					{
+						reachable = true;
+						break;
+					}
+
+					const auto found = m_preds.find(j);
+
+					bool had_fallthrough = false;
+
+					if (found != m_preds.end())
+					{
+						for (u32 new_pred : found->second)
+						{
+							// Check whether the predecessor is previous instruction
+							if (new_pred == j - 4)
+							{
+								had_fallthrough = true;
+								continue;
+							}
+
+							// Check whether in range and not already added
+							if (new_pred >= lsa && new_pred < limit && !m_bits[new_pred / 4])
+							{
+								workload.push_back(new_pred);
+								m_bits[new_pred / 4] = true;
+							}
+						}
+					}
+
+					// Check for possible fallthrough predecessor
+					if (!had_fallthrough)
+					{
+						if (result.data.at((j - lsa) / 4 - 1) == 0 || m_targets.count(j - 4))
+						{
+							break;
+						}
+					}
+
+					if (i == 0)
+					{
+						// TODO
+					}
+				}
+			}
+
+			for (u32 pred : workload)
+			{
+				m_bits[pred / 4] = false;
+			}
+
+			if (!reachable && pair.first < limit)
+			{
+				limit = pair.first;
+			}
+		}
+
+		result.data.resize((limit - lsa) / 4);
+
+		// Check holes in safe mode (TODO)
+		u32 valid_size = 0;
+
+		for (u32 i = 0; i < result.data.size(); i++)
+		{
+			if (result.data[i] == 0)
+			{
+				const u32 pos  = lsa + i * 4;
+				const u32 data = ls[pos / 4];
+
+				// Allow only NOP or LNOP instructions in holes
+				if (data == 0x200000 || (data & 0xffffff80) == 0x40200000)
+				{
+					continue;
+				}
+
+				if (g_cfg.core.spu_block_size != spu_block_size_type::giga)
+				{
+					result.data.resize(valid_size);
+					break;
+				}
+			}
+			else
+			{
+				valid_size = i + 1;
+			}
+		}
+
+		// Even if NOP or LNOP, should be removed at the end
+		result.data.resize(valid_size);
+
+		// Repeat if blocks were removed
+		if (result.data.size() == initial_size)
+		{
+			break;
+		}
+	}
+
+	limit = std::min<u32>(limit, lsa + ::size32(result.data) * 4);
+
+	// Cleanup block info
+	for (u32 i = 0; i < workload.size(); i++)
+	{
+		const u32 addr = workload[i];
+
+		if (addr < lsa || addr >= limit || !result.data[(addr - lsa) / 4])
+		{
+			m_block_info[addr / 4] = false;
+			m_entry_info[addr / 4] = false;
+			m_ret_info[addr / 4] = false;
+			m_preds.erase(addr);
+		}
+	}
+
+	// Complete m_preds and associated m_targets for adjacent blocks
+	for (auto it = m_preds.begin(); it != m_preds.end();)
+	{
+		if (it->first < lsa || it->first >= limit)
+		{
+			it = m_preds.erase(it);
+			continue;
+		}
+
+		// Erase impossible predecessors
+		const auto new_end = std::remove_if(it->second.begin(), it->second.end(), [&](u32 addr)
+		{
+			return addr < lsa || addr >= limit;
+		});
+
+		it->second.erase(new_end, it->second.end());
+
+		// Don't add fallthrough target if all predecessors are removed
+		if (it->second.empty() && !m_entry_info[it->first / 4])
+		{
+			// If not an entry point, remove the block completely
+			m_block_info[it->first / 4] = false;
+			it = m_preds.erase(it);
+			continue;
+		}
+
+		// Previous instruction address
+		const u32 prev = (it->first - 4) & 0x3fffc;
+
+		// TODO: check the correctness
+		if (m_targets.count(prev) == 0 && prev >= lsa && prev < limit && result.data[(prev - lsa) / 4])
+		{
+			// Add target and the predecessor
+			m_targets[prev].push_back(it->first);
+			it->second.push_back(prev);
+		}
+
+		it++;
+	}
+
+	// Remove unnecessary target lists
+	for (auto it = m_targets.begin(); it != m_targets.end();)
+	{
+		if (it->first < lsa || it->first >= limit)
+		{
+			it = m_targets.erase(it);
+			continue;
+		}
+
+		it++;
+	}
+
+	// Fill holes which contain only NOP and LNOP instructions (TODO: compile)
+	for (u32 i = 0, nnop = 0, vsize = 0; i <= result.data.size(); i++)
+	{
+		if (i >= result.data.size() || result.data[i])
+		{
+			if (nnop && nnop == i - vsize)
+			{
+				// Write only complete NOP sequence
+				for (u32 j = vsize; j < i; j++)
+				{
+					result.data[j] = std::bit_cast<u32, be_t<u32>>(ls[lsa / 4 + j]);
+				}
+			}
+
+			nnop  = 0;
+			vsize = i + 1;
+		}
+		else
+		{
+			const u32 pos  = lsa + i * 4;
+			const u32 data = ls[pos / 4];
+
+			if (data == 0x200000 || (data & 0xffffff80) == 0x40200000)
+			{
+				nnop++;
+			}
+		}
+	}
+
+	// Fill block info
+	for (auto& pred : m_preds)
+	{
+		auto& block = m_bbs[pred.first];
+
+		// Copy predeccessors (wrong at this point, needs a fixup later)
+		block.preds = pred.second;
+
+		// Fill register usage info
+		for (u32 ia = pred.first; ia < limit; ia += 4)
+		{
+			block.size++;
+
+			// Decode instruction
+			const spu_opcode_t op{std::bit_cast<be_t<u32>>(result.data[(ia - lsa) / 4])};
+
+			const auto type = s_spu_itype.decode(op.opcode);
+
+			u8 reg_save = 255;
+
+			if (type == spu_itype::STQD && op.ra == s_reg_sp && !block.reg_mod[op.rt] && !block.reg_use[op.rt])
+			{
+				// Register saved onto the stack before use
+				block.reg_save_dom[op.rt] = true;
+
+				reg_save = op.rt;
+			}
+
+			for (auto* _use : {&m_use_ra, &m_use_rb, &m_use_rc})
+			{
+				if (u8 reg = (*_use)[ia / 4]; reg < s_reg_max)
+				{
+					// Register reg use only if it happens before reg mod
+					if (!block.reg_mod[reg])
+					{
+						block.reg_use.set(reg);
+
+						if (reg_save != reg && block.reg_save_dom[reg])
+						{
+							// Register is still used after saving; probably not eligible for optimization
+							block.reg_save_dom[reg] = false;
+						}
+					}
+				}
+			}
+
+			if (m_use_rb[ia / 4] == s_reg_mfc_eal)
+			{
+				// Expand MFC_Cmd reg use
+				for (u8 reg : {s_reg_mfc_lsa, s_reg_mfc_tag, s_reg_mfc_size})
+				{
+					if (!block.reg_mod[reg])
+						block.reg_use.set(reg);
+				}
+			}
+
+			// Register reg modification
+			if (u8 reg = m_regmod[ia / 4]; reg < s_reg_max)
+			{
+				block.reg_mod.set(reg);
+				block.reg_mod_xf.set(reg, type & spu_itype::xfloat);
+
+				if (type == spu_itype::SELB && (block.reg_mod_xf[op.ra] || block.reg_mod_xf[op.rb]))
+					block.reg_mod_xf.set(reg);
+
+				// Possible post-dominating register load
+				if (type == spu_itype::LQD && op.ra == s_reg_sp)
+					block.reg_load_mod[reg] = ia + 1;
+				else
+					block.reg_load_mod[reg] = 0;
+			}
+
+			// Find targets (also means end of the block)
+			const auto tfound = m_targets.find(ia);
+
+			if (tfound != m_targets.end())
+			{
+				// Copy targets
+				block.targets = tfound->second;
+
+				// Assume that the call reads and modifies all volatile registers (TODO)
+				bool is_call = false;
+				bool is_tail = false;
+				switch (type)
+				{
+				case spu_itype::BRSL:
+					is_call = spu_branch_target(ia, op.i16) != ia + 4;
+					break;
+				case spu_itype::BRASL:
+					is_call = spu_branch_target(0, op.i16) != ia + 4;
+					break;
+				case spu_itype::BRA:
+					is_call = true;
+					is_tail = true;
+					break;
+				case spu_itype::BISL:
+				case spu_itype::BISLED:
+					is_call = true;
+					break;
+				default:
+					break;
+				}
+
+				if (is_call)
+				{
+					for (u32 i = 0; i < s_reg_max; ++i)
+					{
+						if (i == s_reg_lr || (i >= 2 && i < s_reg_80) || i > s_reg_127)
+						{
+							if (!block.reg_mod[i])
+								block.reg_use.set(i);
+
+							if (!is_tail)
+							{
+								block.reg_mod.set(i);
+								block.reg_mod_xf[i] = false;
+							}
+						}
+					}
+				}
+
+				break;
+			}
+		}
+	}
+
+	// Fixup block predeccessors to point to basic blocks, not last instructions
+	for (auto& bb : m_bbs)
+	{
+		const u32 addr = bb.first;
+
+		for (u32& pred : bb.second.preds)
+		{
+			pred = std::prev(m_bbs.upper_bound(pred))->first;
+		}
+
+		if (m_entry_info[addr / 4] && g_cfg.core.spu_block_size == spu_block_size_type::giga)
+		{
+			// Register empty chunk
+			m_chunks.push_back(addr);
+
+			// Register function if necessary
+			if (!m_ret_info[addr / 4])
+			{
+				m_funcs[addr];
+			}
+		}
+	}
+
+	// Ensure there is a function at the lowest address
+	if (g_cfg.core.spu_block_size == spu_block_size_type::giga)
+	{
+		if (auto emp = m_funcs.try_emplace(m_bbs.begin()->first); emp.second)
+		{
+			const u32 addr = emp.first->first;
+			spu_log.error("[0x%05x] Fixed first function at 0x%05x", entry_point, addr);
+			m_entry_info[addr / 4] = true;
+			m_ret_info[addr / 4] = false;
+		}
+	}
+
+	// Split functions
+	while (g_cfg.core.spu_block_size == spu_block_size_type::giga)
+	{
+		bool need_repeat = false;
+
+		u32 start = 0;
+		u32 limit = 0x40000;
+
+		// Walk block list in ascending order
+		for (auto& block : m_bbs)
+		{
+			const u32 addr = block.first;
+
+			if (m_entry_info[addr / 4] && !m_ret_info[addr / 4])
+			{
+				const auto upper = m_funcs.upper_bound(addr);
+				start = addr;
+				limit = upper == m_funcs.end() ? 0x40000 : upper->first;
+			}
+
+			// Find targets that exceed [start; limit) range and make new functions from them
+			for (u32 target : block.second.targets)
+			{
+				const auto tfound = m_bbs.find(target);
+
+				if (tfound == m_bbs.end())
+				{
+					continue;
+				}
+
+				if (target < start || target >= limit)
+				{
+					if (!m_entry_info[target / 4] || m_ret_info[target / 4])
+					{
+						// Create new function entry (likely a tail call)
+						m_entry_info[target / 4] = true;
+
+						m_ret_info[target / 4] = false;
+
+						m_funcs.try_emplace(target);
+
+						if (target < limit)
+						{
+							need_repeat = true;
+						}
+					}
+				}
+			}
+
+			block.second.func = start;
+		}
+
+		if (!need_repeat)
+		{
+			break;
+		}
+	}
+
+	// Fill entry map
+	while (true)
+	{
+		workload.clear();
+		workload.push_back(entry_point);
+
+		std::basic_string<u32> new_entries;
+
+		for (u32 wi = 0; wi < workload.size(); wi++)
+		{
+			const u32 addr = workload[wi];
+			auto& block    = m_bbs.at(addr);
+			const u32 _new = block.chunk;
+
+			if (!m_entry_info[addr / 4])
+			{
+				// Check block predecessors
+				for (u32 pred : block.preds)
+				{
+					const u32 _old = m_bbs.at(pred).chunk;
+
+					if (_old < 0x40000 && _old != _new)
+					{
+						// If block has multiple 'entry' points, it becomes an entry point itself
+						new_entries.push_back(addr);
+					}
+				}
+			}
+
+			// Update chunk address
+			block.chunk = m_entry_info[addr / 4] ? addr : _new;
+
+			// Process block targets
+			for (u32 target : block.targets)
+			{
+				const auto tfound = m_bbs.find(target);
+
+				if (tfound == m_bbs.end())
+				{
+					continue;
+				}
+
+				auto& tb = tfound->second;
+
+				const u32 value = m_entry_info[target / 4] ? target : block.chunk;
+
+				if (u32& tval = tb.chunk; tval < 0x40000)
+				{
+					// TODO: fix condition
+					if (tval != value && !m_entry_info[target / 4])
+					{
+						new_entries.push_back(target);
+					}
+				}
+				else
+				{
+					tval = value;
+					workload.emplace_back(target);
+				}
+			}
+		}
+
+		if (new_entries.empty())
+		{
+			break;
+		}
+
+		for (u32 entry : new_entries)
+		{
+			m_entry_info[entry / 4] = true;
+
+			// Acknowledge artificial (reversible) chunk entry point
+			m_ret_info[entry / 4] = true;
+		}
+
+		for (auto& bb : m_bbs)
+		{
+			// Reset chunk info
+			bb.second.chunk = 0x40000;
+		}
+	}
+
+	workload.clear();
+	workload.push_back(entry_point);
+
+	// Fill workload adding targets
+	for (u32 wi = 0; wi < workload.size(); wi++)
+	{
+		const u32 addr  = workload[wi];
+		auto& block     = m_bbs.at(addr);
+		block.analysed  = true;
+
+		for (u32 target : block.targets)
+		{
+			const auto tfound = m_bbs.find(target);
+
+			if (tfound == m_bbs.end())
+			{
+				continue;
+			}
+
+			auto& tb = tfound->second;
+
+			if (!tb.analysed)
+			{
+				workload.push_back(target);
+				tb.analysed = true;
+			}
+
+			// Limited xfloat hint propagation (possibly TODO)
+			if (tb.chunk == block.chunk)
+			{
+				tb.reg_maybe_xf &= block.reg_mod_xf;
+			}
+			else
+			{
+				tb.reg_maybe_xf.reset();
+			}
+		}
+
+		block.reg_origin.fill(0x80000000);
+		block.reg_origin_abs.fill(0x80000000);
+	}
+
+	// Fill register origin info
+	while (true)
+	{
+		bool must_repeat = false;
+
+		for (u32 wi = 0; wi < workload.size(); wi++)
+		{
+			const u32 addr = workload[wi];
+			auto& block    = m_bbs.at(addr);
+
+			// Initialize entry point with default value: unknown origin (requires load)
+			if (m_entry_info[addr / 4])
+			{
+				for (u32 i = 0; i < s_reg_max; i++)
+				{
+					if (block.reg_origin[i] == 0x80000000)
+						block.reg_origin[i] = 0x40000;
+				}
+			}
+
+			if (g_cfg.core.spu_block_size == spu_block_size_type::giga && m_entry_info[addr / 4] && !m_ret_info[addr / 4])
+			{
+				for (u32 i = 0; i < s_reg_max; i++)
+				{
+					if (block.reg_origin_abs[i] == 0x80000000)
+						block.reg_origin_abs[i] = 0x40000;
+					else if (block.reg_origin_abs[i] + 1 == 0)
+						block.reg_origin_abs[i] = -2;
+				}
+			}
+
+			for (u32 target : block.targets)
+			{
+				const auto tfound = m_bbs.find(target);
+
+				if (tfound == m_bbs.end())
+				{
+					continue;
+				}
+
+				auto& tb = tfound->second;
+
+				for (u32 i = 0; i < s_reg_max; i++)
+				{
+					if (tb.chunk == block.chunk && tb.reg_origin[i] + 1)
+					{
+						const u32 expected = block.reg_mod[i] ? addr : block.reg_origin[i];
+
+						if (tb.reg_origin[i] == 0x80000000)
+						{
+							tb.reg_origin[i] = expected;
+						}
+						else if (tb.reg_origin[i] != expected)
+						{
+							// Set -1 if multiple origins merged (requires PHI node)
+							tb.reg_origin[i] = -1;
+
+							must_repeat |= !tb.targets.empty();
+						}
+					}
+
+					if (g_cfg.core.spu_block_size == spu_block_size_type::giga && tb.func == block.func && tb.reg_origin_abs[i] + 2)
+					{
+						const u32 expected = block.reg_mod[i] ? addr : block.reg_origin_abs[i];
+
+						if (tb.reg_origin_abs[i] == 0x80000000)
+						{
+							tb.reg_origin_abs[i] = expected;
+						}
+						else if (tb.reg_origin_abs[i] != expected)
+						{
+							if (tb.reg_origin_abs[i] == 0x40000 || expected + 2 == 0 || expected == 0x40000)
+							{
+								// Set -2: sticky value indicating possible external reg origin (0x40000)
+								tb.reg_origin_abs[i] = -2;
+
+								must_repeat |= !tb.targets.empty();
+							}
+							else if (tb.reg_origin_abs[i] + 1)
+							{
+								tb.reg_origin_abs[i] = -1;
+
+								must_repeat |= !tb.targets.empty();
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (!must_repeat)
+		{
+			break;
+		}
+
+		for (u32 wi = 0; wi < workload.size(); wi++)
+		{
+			const u32 addr = workload[wi];
+			auto& block    = m_bbs.at(addr);
+
+			// Reset values for the next attempt (keep negative values)
+			for (u32 i = 0; i < s_reg_max; i++)
+			{
+				if (block.reg_origin[i] <= 0x40000)
+					block.reg_origin[i] = 0x80000000;
+				if (block.reg_origin_abs[i] <= 0x40000)
+					block.reg_origin_abs[i] = 0x80000000;
+			}
+		}
+	}
+
+	// Fill more block info
+	for (u32 wi = 0; wi < workload.size(); wi++)
+	{
+		if (g_cfg.core.spu_block_size != spu_block_size_type::giga)
+		{
+			break;
+		}
+
+		const u32 addr = workload[wi];
+		auto& bb       = m_bbs.at(addr);
+		auto& func     = m_funcs.at(bb.func);
+
+		// Update function size
+		func.size = std::max<u16>(func.size, bb.size + (addr - bb.func) / 4);
+
+		// Copy constants according to reg origin info
+		for (u32 i = 0; i < s_reg_max; i++)
+		{
+			const u32 orig = bb.reg_origin_abs[i];
+
+			if (orig < 0x40000)
+			{
+				auto& src = m_bbs.at(orig);
+				bb.reg_const[i] = src.reg_const[i];
+				bb.reg_val32[i] = src.reg_val32[i];
+			}
+
+			if (!bb.reg_save_dom[i] && bb.reg_use[i] && (orig == 0x40000 || orig + 2 == 0))
+			{
+				// Destroy offset if external reg value is used
+				func.reg_save_off[i] = -1;
+			}
+		}
+
+		if (u32 orig = bb.reg_origin_abs[s_reg_sp]; orig < 0x40000)
+		{
+			auto& prologue = m_bbs.at(orig);
+
+			// Copy stack offset (from the assumed prologue)
+			bb.stack_sub = prologue.stack_sub;
+		}
+		else if (orig > 0x40000)
+		{
+			// Unpredictable stack
+			bb.stack_sub = 0x80000000;
+		}
+
+		spu_opcode_t op;
+
+		auto last_inst = spu_itype::UNK;
+
+		for (u32 ia = addr; ia < addr + bb.size * 4; ia += 4)
+		{
+			// Decode instruction again
+			op.opcode = std::bit_cast<be_t<u32>>(result.data[(ia - lsa) / 41]);
+			last_inst = s_spu_itype.decode(op.opcode);
+
+			// Propagate some constants
+			switch (last_inst)
+			{
+			case spu_itype::IL:
+			{
+				bb.reg_const[op.rt] = true;
+				bb.reg_val32[op.rt] = op.si16;
+				break;
+			}
+			case spu_itype::ILA:
+			{
+				bb.reg_const[op.rt] = true;
+				bb.reg_val32[op.rt] = op.i18;
+				break;
+			}
+			case spu_itype::ILHU:
+			{
+				bb.reg_const[op.rt] = true;
+				bb.reg_val32[op.rt] = op.i16 << 16;
+				break;
+			}
+			case spu_itype::ILH:
+			{
+				bb.reg_const[op.rt] = true;
+				bb.reg_val32[op.rt] = op.i16 << 16 | op.i16;
+				break;
+			}
+			case spu_itype::IOHL:
+			{
+				bb.reg_val32[op.rt] = bb.reg_val32[op.rt] | op.i16;
+				break;
+			}
+			case spu_itype::ORI:
+			{
+				bb.reg_const[op.rt] = bb.reg_const[op.ra];
+				bb.reg_val32[op.rt] = bb.reg_val32[op.ra] | op.si10;
+				break;
+			}
+			case spu_itype::OR:
+			{
+				bb.reg_const[op.rt] = bb.reg_const[op.ra] & bb.reg_const[op.rb];
+				bb.reg_val32[op.rt] = bb.reg_val32[op.ra] | bb.reg_val32[op.rb];
+				break;
+			}
+			case spu_itype::AI:
+			{
+				bb.reg_const[op.rt] = bb.reg_const[op.ra];
+				bb.reg_val32[op.rt] = bb.reg_val32[op.ra] + op.si10;
+				break;
+			}
+			case spu_itype::A:
+			{
+				bb.reg_const[op.rt] = bb.reg_const[op.ra] & bb.reg_const[op.rb];
+				bb.reg_val32[op.rt] = bb.reg_val32[op.ra] + bb.reg_val32[op.rb];
+				break;
+			}
+			case spu_itype::SFI:
+			{
+				bb.reg_const[op.rt] = bb.reg_const[op.ra];
+				bb.reg_val32[op.rt] = op.si10 - bb.reg_val32[op.ra];
+				break;
+			}
+			case spu_itype::SF:
+			{
+				bb.reg_const[op.rt] = bb.reg_const[op.ra] & bb.reg_const[op.rb];
+				bb.reg_val32[op.rt] = bb.reg_val32[op.rb] - bb.reg_val32[op.ra];
+				break;
+			}
+			case spu_itype::STQD:
+			{
+				if (op.ra == s_reg_sp && bb.stack_sub != 0x80000000 && bb.reg_save_dom[op.rt])
+				{
+					const u32 offset = 0x80000000 + op.si10 * 16 - bb.stack_sub;
+
+					if (func.reg_save_off[op.rt] == 0)
+					{
+						// Store reg save offset
+						func.reg_save_off[op.rt] = offset;
+					}
+					else if (func.reg_save_off[op.rt] != offset)
+					{
+						// Conflict of different offsets
+						func.reg_save_off[op.rt] = -1;
+					}
+				}
+
+				break;
+			}
+			case spu_itype::LQD:
+			{
+				if (op.ra == s_reg_sp && bb.stack_sub != 0x80000000 && bb.reg_load_mod[op.rt] == ia + 1)
+				{
+					// Adjust reg load offset
+					bb.reg_load_mod[op.rt] = 0x80000000 + op.si10 * 16 - bb.stack_sub;
+				}
+
+				// Clear const
+				bb.reg_const[op.rt] = false;
+				break;
+			}
+			default:
+			{
+				// Clear const if reg is modified here
+				if (u8 reg = m_regmod[ia / 4]; reg < s_reg_max)
+					bb.reg_const[reg] = false;
+				break;
+			}
+			}
+
+			// $SP is modified
+			if (m_regmod[ia / 4] == s_reg_sp)
+			{
+				if (bb.reg_const[s_reg_sp])
+				{
+					// Making $SP a constant is a funny thing too.
+					bb.stack_sub = 0x80000000;
+				}
+
+				if (bb.stack_sub != 0x80000000)
+				{
+					switch (last_inst)
+					{
+					case spu_itype::AI:
+					{
+						if (op.ra == s_reg_sp)
+							bb.stack_sub -= op.si10;
+						else
+							bb.stack_sub = 0x80000000;
+						break;
+					}
+					case spu_itype::A:
+					{
+						if (op.ra == s_reg_sp && bb.reg_const[op.rb])
+							bb.stack_sub -= bb.reg_val32[op.rb];
+						else if (op.rb == s_reg_sp && bb.reg_const[op.ra])
+							bb.stack_sub -= bb.reg_val32[op.ra];
+						else
+							bb.stack_sub = 0x80000000;
+						break;
+					}
+					case spu_itype::SF:
+					{
+						if (op.rb == s_reg_sp && bb.reg_const[op.ra])
+							bb.stack_sub += bb.reg_val32[op.ra];
+						else
+							bb.stack_sub = 0x80000000;
+						break;
+					}
+					default:
+					{
+						bb.stack_sub = 0x80000000;
+						break;
+					}
+					}
+				}
+
+				// Check for funny values.
+				if (bb.stack_sub >= 0x40000 || bb.stack_sub % 16)
+				{
+					bb.stack_sub = 0x80000000;
+				}
+			}
+		}
+
+		// Analyse terminator instruction
+		const u32 tia = addr + bb.size * 4 - 4;
+
+		switch (last_inst)
+		{
+		case spu_itype::BR:
+		case spu_itype::BRNZ:
+		case spu_itype::BRZ:
+		case spu_itype::BRHNZ:
+		case spu_itype::BRHZ:
+		case spu_itype::BRSL:
+		{
+			const u32 target = spu_branch_target(tia, op.i16);
+
+			if (target == tia + 4)
+			{
+				bb.terminator = term_type::fallthrough;
+			}
+			else if (last_inst != spu_itype::BRSL)
+			{
+				// No-op terminator or simple branch instruction
+				bb.terminator = term_type::br;
+
+				if (target == bb.func)
+				{
+					// Recursive tail call
+					bb.terminator = term_type::ret;
+				}
+			}
+			else if (op.rt == s_reg_lr)
+			{
+				bb.terminator = term_type::call;
+			}
+			else
+			{
+				bb.terminator = term_type::interrupt_call;
+			}
+
+			break;
+		}
+		case spu_itype::BRA:
+		case spu_itype::BRASL:
+		{
+			bb.terminator = term_type::indirect_call;
+			break;
+		}
+		case spu_itype::BI:
+		{
+			if (op.d || op.e || bb.targets.size() == 1)
+			{
+				bb.terminator = term_type::interrupt_call;
+			}
+			else if (bb.targets.size() > 1)
+			{
+				// Jump table
+				bb.terminator = term_type::br;
+			}
+			else if (op.ra == s_reg_lr)
+			{
+				// Return (TODO)
+				bb.terminator = term_type::ret;
+			}
+			else
+			{
+				// Indirect tail call (TODO)
+				bb.terminator = term_type::interrupt_call;
+			}
+
+			break;
+		}
+		case spu_itype::BISLED:
+		case spu_itype::IRET:
+		{
+			bb.terminator = term_type::interrupt_call;
+			break;
+		}
+		case spu_itype::BISL:
+		case spu_itype::BIZ:
+		case spu_itype::BINZ:
+		case spu_itype::BIHZ:
+		case spu_itype::BIHNZ:
+		{
+			if (op.d || op.e || bb.targets.size() != 1)
+			{
+				bb.terminator = term_type::interrupt_call;
+			}
+			else if (last_inst != spu_itype::BISL && bb.targets[0] == tia + 4 && op.ra == s_reg_lr)
+			{
+				// Conditional return (TODO)
+				bb.terminator = term_type::ret;
+			}
+			else if (last_inst == spu_itype::BISL)
+			{
+				// Indirect call
+				bb.terminator = term_type::indirect_call;
+			}
+			else
+			{
+				// TODO
+				bb.terminator = term_type::interrupt_call;
+			}
+
+			break;
+		}
+		default:
+		{
+			// Normal instruction
+			bb.terminator = term_type::fallthrough;
+			break;
+		}
+		}
+	}
+
+	// Check function blocks, verify and print some reasons
+	for (auto& f : m_funcs)
+	{
+		if (g_cfg.core.spu_block_size != spu_block_size_type::giga)
+		{
+			break;
+		}
+
+		bool is_ok = true;
+
+		u32 used_stack = 0;
+
+		for (auto it = m_bbs.lower_bound(f.first); it != m_bbs.end() && it->second.func == f.first; ++it)
+		{
+			auto& bb       = it->second;
+			auto& func     = m_funcs.at(bb.func);
+			const u32 addr = it->first;
+			const u32 flim = bb.func + func.size * 4;
+
+			used_stack |= bb.stack_sub;
+
+			if (is_ok && bb.terminator >= term_type::indirect_call)
+			{
+				is_ok = false;
+			}
+
+			if (is_ok && bb.terminator == term_type::ret)
+			{
+				// Check $LR (alternative return registers are currently not supported)
+				if (u32 lr_orig = bb.reg_mod[s_reg_lr] ? addr : bb.reg_origin_abs[s_reg_lr]; lr_orig < 0x40000)
+				{
+					auto& src = m_bbs.at(lr_orig);
+
+					if (src.reg_load_mod[s_reg_lr] != func.reg_save_off[s_reg_lr])
+					{
+						spu_log.error("Function 0x%05x: [0x%05x] $LR mismatch (src=0x%x; 0x%x vs 0x%x)", f.first, addr, lr_orig, src.reg_load_mod[0], func.reg_save_off[0]);
+						is_ok = false;
+					}
+					else if (src.reg_load_mod[s_reg_lr] == 0)
+					{
+						spu_log.error("Function 0x%05x: [0x%05x] $LR modified (src=0x%x)", f.first, addr, lr_orig);
+						is_ok = false;
+					}
+				}
+				else if (lr_orig > 0x40000)
+				{
+					spu_log.todo("Function 0x%05x: [0x%05x] $LR unpredictable (src=0x%x)", f.first, addr, lr_orig);
+					is_ok = false;
+				}
+
+				// Check $80..$127 (should be restored or unmodified)
+				for (u32 i = s_reg_80; is_ok && i <= s_reg_127; i++)
+				{
+					if (u32 orig = bb.reg_mod[i] ? addr : bb.reg_origin_abs[i]; orig < 0x40000)
+					{
+						auto& src = m_bbs.at(orig);
+
+						if (src.reg_load_mod[i] != func.reg_save_off[i])
+						{
+							spu_log.error("Function 0x%05x: [0x%05x] $%u mismatch (src=0x%x; 0x%x vs 0x%x)", f.first, addr, i, orig, src.reg_load_mod[i], func.reg_save_off[i]);
+							is_ok = false;
+						}
+					}
+					else if (orig > 0x40000)
+					{
+						spu_log.todo("Function 0x%05x: [0x%05x] $%u unpredictable (src=0x%x)", f.first, addr, i, orig);
+						is_ok = false;
+					}
+
+					if (func.reg_save_off[i] + 1 == 0)
+					{
+						spu_log.error("Function 0x%05x: [0x%05x] $%u used incorrectly", f.first, addr, i);
+						is_ok = false;
+					}
+				}
+
+				// Check $SP (should be restored or unmodified)
+				if (bb.stack_sub != 0 && bb.stack_sub != 0x80000000)
+				{
+					spu_log.error("Function 0x%05x: [0x%05x] return with stack frame 0x%x", f.first, addr, bb.stack_sub);
+					is_ok = false;
+				}
+			}
+
+			if (is_ok && bb.terminator == term_type::call)
+			{
+				// Check call instruction (TODO)
+				if (bb.stack_sub == 0)
+				{
+					// Call without a stack frame
+					spu_log.error("Function 0x%05x: [0x%05x] frameless call", f.first, addr);
+					is_ok = false;
+				}
+			}
+
+			if (is_ok && bb.terminator == term_type::fallthrough)
+			{
+				// Can't just fall out of the function
+				if (bb.targets.size() != 1 || bb.targets[0] >= flim)
+				{
+					spu_log.error("Function 0x%05x: [0x%05x] bad fallthrough to 0x%x", f.first, addr, bb.targets[0]);
+					is_ok = false;
+				}
+			}
+
+			if (is_ok && bb.stack_sub == 0x80000000)
+			{
+				spu_log.error("Function 0x%05x: [0x%05x] bad stack frame", f.first, addr);
+				is_ok = false;
+			}
+
+			// Fill external function targets (calls, possibly tail calls)
+			for (u32 target : bb.targets)
+			{
+				if (target < bb.func || target >= flim || (bb.terminator == term_type::call && target == bb.func))
+				{
+					if (func.calls.find_first_of(target) + 1 == 0)
+					{
+						func.calls.push_back(target);
+					}
+				}
+			}
+		}
+
+		if (is_ok && used_stack && f.first == entry_point)
+		{
+			spu_log.error("Function 0x%05x: considered possible chunk", f.first);
+			is_ok = false;
+		}
+
+		// if (is_ok && f.first > 0x1d240 && f.first < 0x1e000)
+		// {
+		// 	spu_log.error("Function 0x%05x: manually disabled", f.first);
+		// 	is_ok = false;
+		// }
+
+		f.second.good = is_ok;
+	}
+
+	// Check function call graph
+	while (g_cfg.core.spu_block_size == spu_block_size_type::giga)
+	{
+		bool need_repeat = false;
+
+		for (auto& f : m_funcs)
+		{
+			if (!f.second.good)
+			{
+				continue;
+			}
+
+			for (u32 call : f.second.calls)
+			{
+				const auto ffound = std::as_const(m_funcs).find(call);
+
+				if (ffound == m_funcs.cend() || ffound->second.good == false)
+				{
+					need_repeat = true;
+
+					if (f.second.good)
+					{
+						spu_log.error("Function 0x%05x: calls bad function (0x%05x)", f.first, call);
+						f.second.good = false;
+					}
+				}
+			}
+		}
+
+		if (!need_repeat)
+		{
+			break;
+		}
+	}
+
+	if (result.data.empty())
+	{
+		// Blocks starting from 0x0 or invalid instruction won't be compiled, may need special interpreter fallback
+	}
+
+	return result;
+}
+
+void spu_recompiler_base::dump(const spu_program& result, std::string& out)
+{
+	SPUDisAsm dis_asm(cpu_disasm_mode::dump, reinterpret_cast<const u8*>(result.data.data()) - result.lower_bound);
+
+	std::string hash;
+	{
+		sha1_context ctx;
+		u8 output[20];
+
+		sha1_starts(&ctx);
+		sha1_update(&ctx, reinterpret_cast<const u8*>(result.data.data()), result.data.size() * 4);
+		sha1_finish(&ctx, output);
+		fmt::append(hash, "%s", fmt::base57(output));
+	}
+
+	fmt::append(out, "========== SPU BLOCK 0x%05x (size %u, %s) ==========\n", result.entry_point, result.data.size(), hash);
+
+	for (auto& bb : m_bbs)
+	{
+		for (u32 pos = bb.first, end = bb.first + bb.second.size * 4; pos < end; pos += 4)
+		{
+			dis_asm.disasm(pos);
+			fmt::append(out, ">%s\n", dis_asm.last_opcode);
+		}
+
+		if (m_block_info[bb.first / 4])
+		{
+			fmt::append(out, "A: [0x%05x] %s\n", bb.first, m_entry_info[bb.first / 4] ? (m_ret_info[bb.first / 4] ? "Chunk" : "Entry") : "Block");
+
+			fmt::append(out, "\tF: 0x%05x\n", bb.second.func);
+
+			for (u32 pred : bb.second.preds)
+			{
+				fmt::append(out, "\t<- 0x%05x\n", pred);
+			}
+
+			for (u32 target : bb.second.targets)
+			{
+				fmt::append(out, "\t-> 0x%05x%s\n", target, m_bbs.count(target) ? "" : " (null)");
+			}
+		}
+		else
+		{
+			fmt::append(out, "A: [0x%05x] ?\n", bb.first);
+		}
+
+		out += '\n';
+	}
+
+	for (auto& f : m_funcs)
+	{
+		fmt::append(out, "F: [0x%05x]%s\n", f.first, f.second.good ? " (good)" : " (bad)");
+
+		fmt::append(out, "\tN: 0x%05x\n", f.second.size * 4 + f.first);
+
+		for (u32 call : f.second.calls)
+		{
+			fmt::append(out, "\t>> 0x%05x%s\n", call, m_funcs.count(call) ? "" : " (null)");
+		}
+	}
+
+	out += '\n';
+}
 
 #ifdef LLVM_AVAILABLE
 
@@ -33,37 +3319,26 @@ const extern spu_decoder<spu_iflag> g_spu_iflag;
 #pragma warning(push, 0)
 #else
 #pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-Wmissing-noreturn"
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#pragma GCC diagnostic ignored "-Weffc++"
+#pragma GCC diagnostic ignored "-Wmissing-noreturn"
 #endif
-#include <llvm/ADT/PostOrderIterator.h>
-#include <llvm/Analysis/PostDominators.h>
-#include <llvm/IR/InlineAsm.h>
-#include <llvm/IR/Verifier.h>
-#include <llvm/TargetParser/Host.h>
-#include <llvm/Transforms/Utils/BasicBlockUtils.h>
-#include <llvm/Analysis/CGSCCPassManager.h>
-#include <llvm/Analysis/LoopAnalysisManager.h>
-#include <llvm/IR/PassManager.h>
-#include <llvm/Passes/PassBuilder.h>
-#include <llvm/Transforms/Scalar/ADCE.h>
-#include <llvm/Transforms/Scalar/DeadStoreElimination.h>
-#include <llvm/Transforms/Scalar/EarlyCSE.h>
-#include <llvm/Transforms/Scalar/LICM.h>
-#include <llvm/Transforms/Scalar/LoopPassManager.h>
-#include <llvm/Transforms/Scalar/SimplifyCFG.h>
+#include "llvm/ADT/Triple.h"
+#include "llvm/IR/LegacyPassManager.h"
+#include "llvm/IR/Verifier.h"
+#include "llvm/IR/InlineAsm.h"
+#include "llvm/Transforms/Utils/BasicBlockUtils.h"
+#include "llvm/Transforms/Scalar.h"
 #ifdef _MSC_VER
 #pragma warning(pop)
 #else
 #pragma GCC diagnostic pop
 #endif
 
-#ifdef ARCH_ARM64
-#include "Emu/CPU/Backends/AArch64/AArch64JIT.h"
-#endif
-
 class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 {
 	// JIT Instance
@@ -115,15 +3390,13 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 	// Global variable (function table)
 	llvm::GlobalVariable* m_function_table{};
 
-	// Global LUTs
-	llvm::GlobalVariable* m_spu_frest_fraction_lut{};
-	llvm::GlobalVariable* m_spu_frsqest_fraction_lut{};
-	llvm::GlobalVariable* m_spu_frsqest_exponent_lut{};
-
 	// Helpers (interpreter)
 	llvm::GlobalVariable* m_scale_float_to{};
 	llvm::GlobalVariable* m_scale_to_float{};
 
+	// Helper for check_state
+	llvm::GlobalVariable* m_fake_global1{};
+
 	// Function for check_state execution
 	llvm::Function* m_test_state{};
 
@@ -144,9 +3417,6 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 		// Final block (for PHI nodes, set after completion)
 		llvm::BasicBlock* block_end{};
 
-		// Additional blocks for sinking instructions after block_end:
-		std::unordered_map<u32, llvm::BasicBlock*, value_hash<u32, 2>> block_edges;
-
 		// Current register values
 		std::array<llvm::Value*, s_reg_max> reg{};
 
@@ -155,25 +3425,6 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 
 		// Store instructions
 		std::array<llvm::StoreInst*, s_reg_max> store{};
-
-		// Store reordering/elimination protection
-		std::array<usz, s_reg_max> store_context_last_id = fill_array<usz>(0); // Protects against illegal forward ordering
-		std::array<usz, s_reg_max> store_context_first_id = fill_array<usz>(usz{umax}); // Protects against illegal past store elimination (backwards ordering is not implemented)
-		std::array<usz, s_reg_max> store_context_ctr = fill_array<usz>(1); // Store barrier counter
-		bool has_gpr_memory_barriers = false; // Summarizes whether GPR barriers exist this block (as if checking all store_context_ctr entries)
-
-		bool does_gpr_barrier_proceed_last_store(u32 i) const noexcept
-		{
-			const usz counter = store_context_ctr[i];
-			return counter != 1 && counter > store_context_last_id[i];
-		}
-
-		bool does_gpr_barrier_preceed_first_store(u32 i) const noexcept
-		{
-			const usz counter = store_context_ctr[i];
-			const usz first_id = store_context_first_id[i];
-			return counter != 1 && first_id != umax && counter < first_id;
-		}
 	};
 
 	struct function_info
@@ -229,13 +3480,13 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 #endif
 
 		// Get function chunk name
-		const std::string name = fmt::format("__spu-cx%05x-%s", addr, fmt::base57(be_t<u64>{m_hash_start}));
+		const std::string name = fmt::format("spu-chunk-0x%05x", addr);
 		llvm::Function* result = llvm::cast<llvm::Function>(m_module->getOrInsertFunction(name, chunk_type).getCallee());
 
 		// Set parameters
 		result->setLinkage(llvm::GlobalValue::InternalLinkage);
-		result->addParamAttr(0, llvm::Attribute::NoAlias);
-		result->addParamAttr(1, llvm::Attribute::NoAlias);
+		result->addAttribute(1, llvm::Attribute::NoAlias);
+		result->addAttribute(2, llvm::Attribute::NoAlias);
 #if 1
 		result->setCallingConv(llvm::CallingConv::GHC);
 #endif
@@ -254,12 +3505,12 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 				// 5. $3
 				const auto func_type = get_ftype<u32[4], u8*, u8*, u32, u32[4], u32[4]>();
 
-				const std::string fname = fmt::format("__spu-fx%05x-%s", addr, fmt::base57(be_t<u64>{m_hash_start}));
+				const std::string fname = fmt::format("spu-function-0x%05x", addr);
 				llvm::Function* fn = llvm::cast<llvm::Function>(m_module->getOrInsertFunction(fname, func_type).getCallee());
 
 				fn->setLinkage(llvm::GlobalValue::InternalLinkage);
-				fn->addParamAttr(0, llvm::Attribute::NoAlias);
-				fn->addParamAttr(1, llvm::Attribute::NoAlias);
+				fn->addAttribute(1, llvm::Attribute::NoAlias);
+				fn->addAttribute(2, llvm::Attribute::NoAlias);
 #if 1
 				fn->setCallingConv(llvm::CallingConv::GHC);
 #endif
@@ -296,7 +3547,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 
 			if (m_finfo->chunk->getReturnType() != get_type<void>())
 			{
-				m_ir->CreateRet(ppfunc);
+				m_ir->CreateRet(m_ir->CreateBitCast(ppfunc, get_type<u8*>()));
 				return;
 			}
 
@@ -329,9 +3580,9 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 
 		if (!m_finfo->fn && !m_block)
 		{
-			lr = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::gpr, +s_reg_lr, &v128::_u32, 3));
-			sp = m_ir->CreateLoad(get_type<u32[4]>(), spu_ptr<u32[4]>(&spu_thread::gpr, +s_reg_sp));
-			r3 = m_ir->CreateLoad(get_type<u32[4]>(), spu_ptr<u32[4]>(&spu_thread::gpr, 3));
+			lr = m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::gpr, +s_reg_lr, &v128::_u32, 3));
+			sp = m_ir->CreateLoad(spu_ptr<u32[4]>(&spu_thread::gpr, +s_reg_sp));
+			r3 = m_ir->CreateLoad(spu_ptr<u32[4]>(&spu_thread::gpr, 3));
 		}
 		else
 		{
@@ -364,7 +3615,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 			{
 				if (i != s_reg_lr && i != s_reg_sp && (i < s_reg_80 || i > s_reg_127))
 				{
-					m_block->reg[i] = m_ir->CreateLoad(get_reg_type(i), init_reg_fixed(i));
+					m_block->reg[i] = m_ir->CreateLoad(init_reg_fixed(i));
 				}
 			}
 
@@ -382,9 +3633,9 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 	void set_function(llvm::Function* func)
 	{
 		m_function = func;
-		m_thread = func->getArg(0);
-		m_lsptr = func->getArg(1);
-		m_base_pc = func->getArg(2);
+		m_thread = &*func->arg_begin();
+		m_lsptr = &*(func->arg_begin() + 1);
+		m_base_pc = &*(func->arg_begin() + 2);
 
 		m_reg_addr.fill(nullptr);
 		m_block = nullptr;
@@ -392,14 +3643,14 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 		m_blocks.clear();
 		m_block_queue.clear();
 		m_ir->SetInsertPoint(llvm::BasicBlock::Create(m_context, "", m_function));
-		m_memptr = m_ir->CreateLoad(get_type<u8*>(), spu_ptr<u8*>(&spu_thread::memory_base_addr));
+		m_memptr = m_ir->CreateLoad(spu_ptr<u8*>(&spu_thread::memory_base_addr));
 	}
 
 	// Add block with current block as a predecessor
 	llvm::BasicBlock* add_block(u32 target, bool absolute = false)
 	{
 		// Check the predecessor
-		const bool pred_found = m_block_info[target / 4] && std::find(m_preds[target].begin(), m_preds[target].end(), m_pos) != m_preds[target].end();
+		const bool pred_found = m_block_info[target / 4] && m_preds[target].find_first_of(m_pos) + 1;
 
 		if (m_blocks.empty())
 		{
@@ -411,11 +3662,11 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 
 				m_finfo->fn = fn;
 				m_function = fn;
-				m_thread = fn->getArg(0);
-				m_lsptr = fn->getArg(1);
-				m_base_pc = fn->getArg(2);
+				m_thread = &*fn->arg_begin();
+				m_lsptr = &*(fn->arg_begin() + 1);
+				m_base_pc = &*(fn->arg_begin() + 2);
 				m_ir->SetInsertPoint(llvm::BasicBlock::Create(m_context, "", fn));
-				m_memptr = m_ir->CreateLoad(get_type<u8*>(), spu_ptr<u8*>(&spu_thread::memory_base_addr));
+				m_memptr = m_ir->CreateLoad(spu_ptr<u8*>(&spu_thread::memory_base_addr));
 
 				// Load registers at the entry chunk
 				for (u32 i = 0; i < s_reg_max; i++)
@@ -426,14 +3677,14 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 						//m_finfo->load[i] = llvm::UndefValue::get(get_reg_type(i));
 					}
 
-					m_finfo->load[i] = m_ir->CreateLoad(get_reg_type(i), init_reg_fixed(i));
+					m_finfo->load[i] = m_ir->CreateLoad(init_reg_fixed(i));
 				}
 
 				// Load $SP
-				m_finfo->load[s_reg_sp] = fn->getArg(3);
+				m_finfo->load[s_reg_sp] = &*(fn->arg_begin() + 3);
 
 				// Load first args
-				m_finfo->load[3] = fn->getArg(4);
+				m_finfo->load[3] = &*(fn->arg_begin() + 4);
 			}
 		}
 		else if (m_block_info[target / 4] && m_entry_info[target / 4] && !(pred_found && m_entry == target) && (!m_finfo->fn || !m_ret_info[target / 4]))
@@ -452,7 +3703,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 				const auto fail = llvm::BasicBlock::Create(m_context, "", m_function);
 				m_ir->CreateCondBr(m_ir->CreateICmpEQ(m_base_pc, m_ir->getInt32(m_base)), next, fail);
 				m_ir->SetInsertPoint(fail);
-				m_ir->CreateStore(m_ir->getInt32(target), spu_ptr<u32>(&spu_thread::pc));
+				m_ir->CreateStore(m_ir->getInt32(target), spu_ptr<u32>(&spu_thread::pc), true);
 				tail_chunk(nullptr);
 				m_ir->SetInsertPoint(next);
 			}
@@ -490,7 +3741,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 			{
 				ensure(!m_finfo->fn);
 
-				m_ir->CreateStore(m_ir->getInt32(target), spu_ptr<u32>(&spu_thread::pc));
+				m_ir->CreateStore(m_ir->getInt32(target), spu_ptr<u32>(&spu_thread::pc), true);
 			}
 			else
 			{
@@ -502,6 +3753,8 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 			return result;
 		}
 
+		ensure(!absolute);
+
 		auto& result = m_blocks[target].block;
 
 		if (!result)
@@ -530,13 +3783,9 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 	template <typename T = u8>
 	llvm::Value* _ptr(llvm::Value* base, u32 offset)
 	{
-		return m_ir->CreateGEP(get_type<u8>(), base, m_ir->getInt64(offset));
-	}
-
-	template <typename T = u8>
-	llvm::Value* _ptr(llvm::Value* base, llvm::Value* offset)
-	{
-		return m_ir->CreateGEP(get_type<u8>(), base, offset);
+		const auto off = m_ir->CreateGEP(base, m_ir->getInt64(offset));
+		const auto ptr = m_ir->CreateBitCast(off, get_type<T*>());
+		return ptr;
 	}
 
 	template <typename T, typename... Args>
@@ -548,8 +3797,9 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 	template <typename T, typename... Args>
 	llvm::Value* spu_ptr(value_t<u64> add, Args... offset_args)
 	{
-		const auto off = m_ir->CreateGEP(get_type<u8>(), m_thread, m_ir->getInt64(::offset32(offset_args...)));
-		return m_ir->CreateAdd(off, add.value);
+		const auto off = m_ir->CreateGEP(m_thread, m_ir->getInt64(::offset32(offset_args...)));
+		const auto ptr = m_ir->CreateBitCast(m_ir->CreateAdd(off, add.value), get_type<T*>());
+		return ptr;
 	}
 
 	// Return default register type
@@ -596,10 +3846,10 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 	{
 		if (!m_block)
 		{
-			return _ptr<u8>(m_thread, get_reg_offset(index));
+			return m_ir->CreateBitCast(_ptr<u8>(m_thread, get_reg_offset(index)), get_reg_type(index)->getPointerTo());
 		}
 
-		auto& ptr = ::at32(m_reg_addr, index);
+		auto& ptr = m_reg_addr.at(index);
 
 		if (!ptr)
 		{
@@ -609,6 +3859,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 			// Emit register pointer at the beginning of the function chunk
 			m_ir->SetInsertPoint(m_function->getEntryBlock().getTerminator());
 			ptr = _ptr<u8>(m_thread, get_reg_offset(index));
+			ptr = m_ir->CreateBitCast(ptr, get_reg_type(index)->getPointerTo());
 			m_ir->SetInsertPoint(block_cur);
 		}
 
@@ -631,7 +3882,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 		const auto idx = m_ir->CreateAnd(I > 4 ? isr : isl, m_interp_7f0);
 
 		// Pointer to the register
-		return m_ir->CreateGEP(get_type<u8>(), m_interp_regs, m_ir->CreateZExt(idx, get_type<u64>()));
+		return m_ir->CreateBitCast(m_ir->CreateGEP(m_interp_regs, m_ir->CreateZExt(idx, get_type<u64>())), get_type<T*>());
 	}
 
 	llvm::Value* double_as_uint64(llvm::Value* val)
@@ -708,12 +3959,12 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 	{
 		llvm::Value* dummy{};
 
-		auto& reg = *(m_block ? &::at32(m_block->reg, index) : &dummy);
+		auto& reg = *(m_block ? &m_block->reg.at(index) : &dummy);
 
 		if (!reg)
 		{
 			// Load register value if necessary
-			reg = m_finfo && m_finfo->load[index] ? m_finfo->load[index] : m_ir->CreateLoad(get_reg_type(index), init_reg_fixed(index));
+			reg = m_finfo && m_finfo->load[index] ? m_finfo->load[index] : m_ir->CreateLoad(init_reg_fixed(index));
 		}
 
 		if (reg->getType() == get_type<f64[4]>())
@@ -758,11 +4009,11 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 			// Load reg
 			if (get_type<T>() == get_type<f64[4]>())
 			{
-				r.value = xfloat_to_double(m_ir->CreateLoad(get_type<u32[4]>(), init_vr<u32[4]>(index)));
+				r.value = xfloat_to_double(m_ir->CreateLoad(init_vr<u32[4]>(index)));
 			}
 			else
 			{
-				r.value = m_ir->CreateLoad(get_type<T>(), init_vr<T>(index));
+				r.value = m_ir->CreateLoad(init_vr<T>(index));
 			}
 		}
 		else
@@ -792,7 +4043,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 
 		if (m_block)
 		{
-			auto v = ::at32(m_block->reg, index);
+			auto v = m_block->reg.at(index);
 
 			if (v && v->getType() == get_type<T>())
 			{
@@ -898,12 +4149,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 		// Set register value
 		if (m_block)
 		{
-#ifndef _WIN32
-			if (g_cfg.core.spu_debug)
-				value->setName(fmt::format("result_0x%05x", m_pos));
-#endif
-
-			::at32(m_block->reg, index) = saved_value;
+			m_block->reg.at(index) = saved_value;
 		}
 
 		// Get register location
@@ -914,18 +4160,8 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 		// Erase previous dead store instruction if necessary
 		if (_store)
 		{
-			if (m_block->store_context_last_id[index] == m_block->store_context_ctr[index])
-			{
-				// Erase store of it is not preserved by ensure_gpr_stores()
-				_store->eraseFromParent();
-			}
-		}
-
-		if (m_block)
-		{
-			// Keep the store's location in history of gpr preservaions
-			m_block->store_context_last_id[index] = m_block->store_context_ctr[index];
-			m_block->store_context_first_id[index] = std::min<usz>(m_block->store_context_first_id[index], m_block->store_context_ctr[index]);
+			// TODO: better cross-block dead store elimination
+			_store->eraseFromParent();
 		}
 
 		if (m_finfo && m_finfo->fn)
@@ -938,11 +4174,11 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 		}
 
 		// Write register to the context
-		_store = m_ir->CreateStore(is_xfloat ? double_to_xfloat(saved_value) : m_ir->CreateBitCast(value, get_reg_type(index)), addr);
+		_store = m_ir->CreateStore(is_xfloat ? double_to_xfloat(saved_value) : m_ir->CreateBitCast(value, addr->getType()->getPointerElementType()), addr);
 	}
 
 	template <typename T, uint I>
-	void set_vr(const bf_t<u32, I, 7>& index, T expr, std::function<llvm::KnownBits()> vr_assume = nullptr, bool fixup = true)
+	void set_vr(const bf_t<u32, I, 7>& index, T expr, bool fixup = true)
 	{
 		// Process expression
 		const auto value = expr.eval(m_ir);
@@ -966,10 +4202,6 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 			return;
 		}
 
-		if (vr_assume)
-		{
-		}
-
 		set_reg_fixed(index, value, fixup);
 	}
 
@@ -1049,396 +4281,23 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
 	// Update PC for current or explicitly specified instruction address
 	void update_pc(u32 target = -1)
 	{
-		m_ir->CreateStore(m_ir->CreateAnd(get_pc(target + 1 ? target : m_pos), 0x3fffc), spu_ptr<u32>(&spu_thread::pc))->setVolatile(true);
+		m_ir->CreateStore(m_ir->CreateAnd(get_pc(target + 1 ? target : m_pos), 0x3fffc), spu_ptr<u32>(&spu_thread::pc), true);
 	}
 
 	// Call cpu_thread::check_state if necessary and return or continue (full check)
-	void check_state(u32 addr, bool may_be_unsafe_for_savestate = true)
+	void check_state(u32 addr)
 	{
 		const auto pstate = spu_ptr<u32>(&spu_thread::state);
 		const auto _body = llvm::BasicBlock::Create(m_context, "", m_function);
 		const auto check = llvm::BasicBlock::Create(m_context, "", m_function);
-		m_ir->CreateCondBr(m_ir->CreateICmpEQ(m_ir->CreateLoad(get_type<u32>(), pstate, true), m_ir->getInt32(0)), _body, check, m_md_likely);
+		m_ir->CreateCondBr(m_ir->CreateICmpEQ(m_ir->CreateLoad(pstate, true), m_ir->getInt32(0)), _body, check, m_md_likely);
 		m_ir->SetInsertPoint(check);
 		update_pc(addr);
-
-		if (may_be_unsafe_for_savestate && m_block && m_block->bb->preds.empty())
-		{
-			may_be_unsafe_for_savestate = false;
-		}
-
-		if (may_be_unsafe_for_savestate)
-		{
-			m_ir->CreateStore(m_ir->getInt8(1), spu_ptr<u8>(&spu_thread::unsavable))->setVolatile(true);
-		}
-
-		m_ir->CreateCall(m_test_state, {m_thread});
-
-		if (may_be_unsafe_for_savestate)
-		{
-			m_ir->CreateStore(m_ir->getInt8(0), spu_ptr<u8>(&spu_thread::unsavable))->setVolatile(true);
-		}
-
+		m_ir->CreateStore(m_ir->getFalse(), m_fake_global1, true);
 		m_ir->CreateBr(_body);
 		m_ir->SetInsertPoint(_body);
 	}
 
-	void putllc16_pattern(const spu_program& /*prog*/, utils::address_range32 range)
-	{
-		// Prevent store elimination
-		m_block->store_context_ctr[s_reg_mfc_eal]++;
-		m_block->store_context_ctr[s_reg_mfc_lsa]++;
-		m_block->store_context_ctr[s_reg_mfc_tag]++;
-		m_block->store_context_ctr[s_reg_mfc_size]++;
-
-		static const auto on_fail = [](spu_thread* _spu, u32 addr)
-		{
-			if (const u32 raddr = _spu->raddr)
-			{
-				// Last check for event before we clear the reservation
-				if (~_spu->ch_events.load().events & SPU_EVENT_LR)
-				{
-					if (raddr == addr)
-					{
-						_spu->set_events(SPU_EVENT_LR);
-					}
-					else
-					{
-						_spu->get_events(SPU_EVENT_LR);
-					}
-				}
-
-				_spu->raddr = 0;
-			}
-		};
-
-		const union putllc16_info
-		{
-			u32 data;
-			bf_t<u32, 30, 2> type;
-			bf_t<u32, 29, 1> runtime16_select;
-			bf_t<u32, 28, 1> no_notify;
-			bf_t<u32, 18, 8> reg;
-			bf_t<u32, 0, 18> off18;
-			bf_t<u32, 0, 8> reg2;
-		} info = std::bit_cast<putllc16_info>(range.end);
-
-		enum : u32
-		{
-			v_const = 0,
-			v_relative = 1,
-			v_reg_offs = 2,
-			v_reg2 = 3,
-		};
-
-		const auto _raddr_match = llvm::BasicBlock::Create(m_context, "__raddr_match", m_function);
-		const auto _lock_success = llvm::BasicBlock::Create(m_context, "__putllc16_lock", m_function);
-		const auto _begin_op = llvm::BasicBlock::Create(m_context, "__putllc16_begin", m_function);
-		const auto _repeat_lock = llvm::BasicBlock::Create(m_context, "__putllc16_repeat", m_function);
-		const auto _repeat_lock_fail = llvm::BasicBlock::Create(m_context, "__putllc16_lock_fail", m_function);
-		const auto _success = llvm::BasicBlock::Create(m_context, "__putllc16_success", m_function);
-		const auto _inc_res = llvm::BasicBlock::Create(m_context, "__putllc16_inc_resv", m_function);
-		const auto _inc_res_unlocked = llvm::BasicBlock::Create(m_context, "__putllc16_inc_resv_unlocked", m_function);
-		const auto _success_and_unlock = llvm::BasicBlock::Create(m_context, "__putllc16_succ_unlock", m_function);
-		const auto _fail = llvm::BasicBlock::Create(m_context, "__putllc16_fail", m_function);
-		const auto _fail_and_unlock = llvm::BasicBlock::Create(m_context, "__putllc16_unlock", m_function);
-		const auto _final = llvm::BasicBlock::Create(m_context, "__putllc16_final", m_function);
-
-		const auto _eal = (get_reg_fixed<u32>(s_reg_mfc_eal) & -128).eval(m_ir);
-		const auto _raddr = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::raddr));
-
-		m_ir->CreateCondBr(m_ir->CreateAnd(m_ir->CreateICmpEQ(_eal, _raddr), m_ir->CreateIsNotNull(_raddr)), _raddr_match, _fail, m_md_likely);
-		m_ir->SetInsertPoint(_raddr_match);
-
-		value_t<u32> eal_val;
-		eal_val.value = _eal;
-
-		auto get_reg32 = [&](u32 reg)
-		{
-			if (get_reg_type(reg) != get_type<u32[4]>())
-			{
-				return get_reg_fixed(reg, get_type<u32>());
-			}
-
-			return extract(get_reg_fixed(reg), 3).eval(m_ir);
-		};
-
-		const auto _lsa = (get_reg_fixed<u32>(s_reg_mfc_lsa) & 0x3ff80).eval(m_ir);
-
-		llvm::Value* dest{};
-
-		if (info.type == v_const)
-		{
-			dest = m_ir->getInt32(info.off18);
-		}
-		else if (info.type == v_relative)
-		{
-			dest = m_ir->CreateAnd(get_pc(spu_branch_target(info.off18 + m_base)), 0x3fff0);
-		}
-		else if (info.type == v_reg_offs)
-		{
-			dest = m_ir->CreateAnd(m_ir->CreateAdd(get_reg32(info.reg), m_ir->getInt32(info.off18)), 0x3fff0);
-		}
-		else
-		{
-			dest = m_ir->CreateAnd(m_ir->CreateAdd(get_reg32(info.reg), get_reg32(info.reg2)), 0x3fff0);
-		}
-
-		if (g_cfg.core.rsx_accurate_res_access)
-		{
-			const auto success = call("spu_putllc16_rsx_res", +[](spu_thread* _spu, u32 ls_dst, u32 lsa, u32 eal, u32 notify) -> bool
-			{
-				const u32 raddr = eal;
-
-				const v128 rdata = read_from_ptr<v128>(_spu->rdata, ls_dst % 0x80);
-				const v128 to_write = _spu->_ref<const nse_t<v128>>(ls_dst);
-
-				const auto dest = raddr | (ls_dst & 127);
-				const auto _dest = vm::get_super_ptr<atomic_t<nse_t<v128>>>(dest);
-
-				if (rdata == to_write || ((lsa ^ ls_dst) & (SPU_LS_SIZE - 128)))
-				{
-					vm::reservation_update(raddr);
-					_spu->ch_atomic_stat.set_value(MFC_PUTLLC_SUCCESS);
-					_spu->raddr = 0;
-					return true;
-				}
-
-				auto& res = vm::reservation_acquire(eal);
-
-				if (res % 128)
-				{
-					return false;
-				}
-
-				{
-					rsx::reservation_lock rsx_lock(raddr, 128);
-
-					// Touch memory
-					utils::trigger_write_page_fault(vm::base(dest ^ (4096 / 2)));
-
-					auto [old_res, ok] = res.fetch_op([&](u64& rval)
-					{
-						if (rval % 128)
-						{
-							return false;
-						}
-
-						rval |= 127;
-						return true;
-					});
-
-					if (!ok)
-					{
-						return false;
-					}
-
-					if (!_dest->compare_and_swap_test(rdata, to_write))
-					{
-						res.release(old_res);
-						return false;
-					}
-
-					// Success
-					res.release(old_res + 128);
-				}
-
-				_spu->ch_atomic_stat.set_value(MFC_PUTLLC_SUCCESS);
-				_spu->raddr = 0;
-
-				if (notify)
-				{
-					res.notify_all();
-				}
-
-				return true;
-			}, m_thread, dest, _lsa, _eal, m_ir->getInt32(!info.no_notify));
-
-
-			m_ir->CreateCondBr(success, _final, _fail);
-
-			m_ir->SetInsertPoint(_fail);
-			call("PUTLLC16_fail", +on_fail, m_thread, _eal);
-			m_ir->CreateStore(m_ir->getInt64(spu_channel::bit_count | MFC_PUTLLC_FAILURE), spu_ptr<u64>(&spu_thread::ch_atomic_stat));
-			m_ir->CreateBr(_final);
-
-			m_ir->SetInsertPoint(_final);
-			return;
-		}
-
-		const auto diff = m_ir->CreateZExt(m_ir->CreateSub(dest, _lsa), get_type<u64>());
-
-		const auto _new = m_ir->CreateAlignedLoad(get_type<u128>(), _ptr<u128>(m_lsptr, dest), llvm::MaybeAlign{16});
-		const auto _rdata = m_ir->CreateAlignedLoad(get_type<u128>(), _ptr<u128>(spu_ptr<u8>(&spu_thread::rdata), m_ir->CreateAnd(diff, 0x70)), llvm::MaybeAlign{16});
-
-		const bool is_accurate_op = !!g_cfg.core.spu_accurate_reservations;
-
-		const auto compare_data_change_res = is_accurate_op ? m_ir->getTrue() : m_ir->CreateICmpNE(_new, _rdata);
-
-		if (info.runtime16_select)
-		{
-			m_ir->CreateCondBr(m_ir->CreateAnd(m_ir->CreateICmpULT(diff, m_ir->getInt64(128)), compare_data_change_res), _begin_op, _inc_res, m_md_likely);
-		}
-		else
-		{
-			m_ir->CreateCondBr(compare_data_change_res, _begin_op, _inc_res, m_md_unlikely);
-		}
-
-		m_ir->SetInsertPoint(_begin_op);
-
-		// Touch memory (on the opposite side of the page)
-		m_ir->CreateAtomicRMW(llvm::AtomicRMWInst::Or, _ptr<u8>(m_memptr, m_ir->CreateXor(_eal, 4096 / 2)), m_ir->getInt8(0), llvm::MaybeAlign{16}, llvm::AtomicOrdering::SequentiallyConsistent);
-
-		const auto rptr = _ptr<u64>(m_ir->CreateLoad(get_type<u8*>(), spu_ptr<u8*>(&spu_thread::reserv_base_addr)), ((eal_val & 0xff80) >> 1).eval(m_ir));
-		const auto rtime = m_ir->CreateLoad(get_type<u64>(), spu_ptr<u64>(&spu_thread::rtime));
-
-		m_ir->CreateBr(_repeat_lock);
-		m_ir->SetInsertPoint(_repeat_lock);
-
-		const auto rval = m_ir->CreatePHI(get_type<u64>(), 2);
-		rval->addIncoming(rtime, _begin_op);
-
-		// Lock reservation
-		const auto cmp_res = m_ir->CreateAtomicCmpXchg(rptr, rval, m_ir->CreateOr(rval, 0x7f), llvm::MaybeAlign{16}, llvm::AtomicOrdering::SequentiallyConsistent, llvm::AtomicOrdering::SequentiallyConsistent);
-
-		m_ir->CreateCondBr(m_ir->CreateExtractValue(cmp_res, 1), _lock_success, _repeat_lock_fail, m_md_likely);
-
-		m_ir->SetInsertPoint(_repeat_lock_fail);
-
-		const auto last_rval = m_ir->CreateExtractValue(cmp_res, 0);
-		rval->addIncoming(last_rval, _repeat_lock_fail);
-
-		m_ir->CreateCondBr(is_accurate_op ? m_ir->CreateICmpEQ(last_rval, rval) : m_ir->CreateIsNull(m_ir->CreateAnd(last_rval, 0x7f)), _repeat_lock, _fail);
-
-		m_ir->SetInsertPoint(_lock_success);
-
-		// Commit 16 bytes compare-exchange
-		const auto sudo_ptr = _ptr<u8>(m_ir->CreateLoad(get_type<u8*>(), spu_ptr<u8*>(&spu_thread::memory_sudo_addr)), _eal);
-
-		m_ir->CreateCondBr(
-			m_ir->CreateExtractValue(m_ir->CreateAtomicCmpXchg(_ptr<u128>(sudo_ptr, diff), _rdata, _new, llvm::MaybeAlign{16}, llvm::AtomicOrdering::SequentiallyConsistent, llvm::AtomicOrdering::SequentiallyConsistent), 1)
-			, _success_and_unlock
-			, _fail_and_unlock);
-
-		// Unlock and notify
-		m_ir->SetInsertPoint(_success_and_unlock);
-		m_ir->CreateAlignedStore(m_ir->CreateAdd(rval, m_ir->getInt64(128)), rptr, llvm::MaybeAlign{8});
-
-		if (!info.no_notify)
-		{
-			call("atomic_wait_engine::notify_all", static_cast<void(*)(const void*)>(atomic_wait_engine::notify_all), rptr);
-		}
-
-		m_ir->CreateBr(_success);
-
-		// Perform unlocked vm::reservation_update if no physical memory changes needed
-		m_ir->SetInsertPoint(_inc_res);
-		const auto rptr2 = _ptr<u64>(m_ir->CreateLoad(get_type<u8*>(), spu_ptr<u8*>(&spu_thread::reserv_base_addr)), ((eal_val & 0xff80) >> 1).eval(m_ir));
-
-		llvm::Value* old_val{};
-
-		if (true || is_accurate_op)
-		{
-			old_val = m_ir->CreateLoad(get_type<u64>(), spu_ptr<u64>(&spu_thread::rtime));
-		}
-		else
-		{
-			old_val = m_ir->CreateAlignedLoad(get_type<u64>(), rptr2, llvm::MaybeAlign{8});
-			m_ir->CreateCondBr(m_ir->CreateIsNotNull(m_ir->CreateAnd(old_val, 0x7f)), _success, _inc_res_unlocked);
-			m_ir->SetInsertPoint(_inc_res_unlocked);
-		}
-
-		const auto cmp_res2 = m_ir->CreateAtomicCmpXchg(rptr2, old_val, m_ir->CreateAdd(old_val, m_ir->getInt64(128)), llvm::MaybeAlign{16}, llvm::AtomicOrdering::SequentiallyConsistent, llvm::AtomicOrdering::SequentiallyConsistent);
-
-		if (true || is_accurate_op)
-		{
-			m_ir->CreateCondBr(m_ir->CreateExtractValue(cmp_res2, 1), _success, _fail);
-		}
-		else
-		{
-			m_ir->CreateBr(_success);
-		}
-
-		m_ir->SetInsertPoint(_success);
-		m_ir->CreateStore(m_ir->getInt64(spu_channel::bit_count | MFC_PUTLLC_SUCCESS), spu_ptr<u64>(&spu_thread::ch_atomic_stat));
-		m_ir->CreateStore(m_ir->getInt32(0), spu_ptr<u32>(&spu_thread::raddr));
-		m_ir->CreateBr(_final);
-
-		m_ir->SetInsertPoint(_fail_and_unlock);
-		m_ir->CreateAlignedStore(rval, rptr, llvm::MaybeAlign{8});
-		m_ir->CreateBr(_fail);
-
-		m_ir->SetInsertPoint(_fail);
-		call("PUTLLC16_fail", +on_fail, m_thread, _eal);
-		m_ir->CreateStore(m_ir->getInt64(spu_channel::bit_count | MFC_PUTLLC_FAILURE), spu_ptr<u64>(&spu_thread::ch_atomic_stat));
-		m_ir->CreateBr(_final);
-
-		m_ir->SetInsertPoint(_final);
-	}
-
-	void putllc0_pattern(const spu_program& /*prog*/, utils::address_range32 /*range*/)
-	{
-		// Prevent store elimination
-		m_block->store_context_ctr[s_reg_mfc_eal]++;
-		m_block->store_context_ctr[s_reg_mfc_lsa]++;
-		m_block->store_context_ctr[s_reg_mfc_tag]++;
-		m_block->store_context_ctr[s_reg_mfc_size]++;
-
-		static const auto on_fail = [](spu_thread* _spu, u32 addr)
-		{
-			if (const u32 raddr = _spu->raddr)
-			{
-				// Last check for event before we clear the reservation
-				if (~_spu->ch_events.load().events & SPU_EVENT_LR)
-				{
-					if (raddr == addr)
-					{
-						_spu->set_events(SPU_EVENT_LR);
-					}
-					else
-					{
-						_spu->get_events(SPU_EVENT_LR);
-					}
-				}
-				_spu->raddr = 0;
-			}
-		};
-
-		const auto _next = llvm::BasicBlock::Create(m_context, "", m_function);
-		const auto _next0 = llvm::BasicBlock::Create(m_context, "", m_function);
-		const auto _fail = llvm::BasicBlock::Create(m_context, "", m_function);
-		const auto _final = llvm::BasicBlock::Create(m_context, "", m_function);
-
-		const auto _eal = (get_reg_fixed<u32>(s_reg_mfc_eal) & -128).eval(m_ir);
-		const auto _raddr = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::raddr));
-
-		m_ir->CreateCondBr(m_ir->CreateAnd(m_ir->CreateICmpEQ(_eal, _raddr), m_ir->CreateIsNotNull(_raddr)), _next, _fail, m_md_likely);
-		m_ir->SetInsertPoint(_next);
-
-		value_t<u32> eal_val;
-		eal_val.value = _eal;
-
-		const auto rptr = _ptr<u64>(m_ir->CreateLoad(get_type<u8*>(), spu_ptr<u8*>(&spu_thread::reserv_base_addr)), ((eal_val & 0xff80) >> 1).eval(m_ir));
-		const auto rval = m_ir->CreateLoad(get_type<u64>(), spu_ptr<u64>(&spu_thread::rtime));
-		m_ir->CreateCondBr(
-			m_ir->CreateExtractValue(m_ir->CreateAtomicCmpXchg(rptr, rval, m_ir->CreateAdd(rval, m_ir->getInt64(128)), llvm::MaybeAlign{16}, llvm::AtomicOrdering::SequentiallyConsistent, llvm::AtomicOrdering::SequentiallyConsistent), 1)
-			, _next0
-			, g_cfg.core.spu_accurate_reservations ? _fail : _next0); // Succeed unconditionally
-
-		m_ir->SetInsertPoint(_next0);
-		//call("atomic_wait_engine::notify_all", static_cast<void(*)(const void*)>(atomic_wait_engine::notify_all), rptr);
-		m_ir->CreateStore(m_ir->getInt64(spu_channel::bit_count | MFC_PUTLLC_SUCCESS), spu_ptr<u64>(&spu_thread::ch_atomic_stat));
-		m_ir->CreateBr(_final);
-
-		m_ir->SetInsertPoint(_fail);
-		call("PUTLLC0_fail", +on_fail, m_thread, _eal);
-		m_ir->CreateStore(m_ir->getInt64(spu_channel::bit_count | MFC_PUTLLC_FAILURE), spu_ptr<u64>(&spu_thread::ch_atomic_stat));
-		m_ir->CreateBr(_final);
-
-		m_ir->SetInsertPoint(_final);
-		m_ir->CreateStore(m_ir->getInt32(0), spu_ptr<u32>(&spu_thread::raddr));
-	}
-
 public:
 	spu_llvm_recompiler(u8 interp_magn = 0)
 		: spu_recompiler_base()
@@ -1462,43 +4321,7 @@ public:
 			// Metadata for branch weights
 			m_md_likely = llvm::MDTuple::get(m_context, {md_name, md_high, md_low});
 			m_md_unlikely = llvm::MDTuple::get(m_context, {md_name, md_low, md_high});
-
-			// Initialize transform passes
-			clear_transforms();
-#ifdef ARCH_ARM64
-			{
-				auto should_exclude_function = [](const std::string& fn_name)
-				{
-					return fn_name.starts_with("spu_") || fn_name.starts_with("tr_");
-				};
-
-				aarch64::GHC_frame_preservation_pass::config_t config =
-				{
-					.debug_info = false,         // Set to "true" to insert debug frames on x27
-					.use_stack_frames = false,   // We don't need this since the SPU GW allocates global scratch on the stack
-					.hypervisor_context_offset = ::offset32(&spu_thread::hv_ctx),
-					.exclusion_callback = should_exclude_function,
-					.base_register_lookup = {}   // Unused, always x19 on SPU
-				};
-
-				// Create transform pass
-				std::unique_ptr<translator_pass> ghc_fixup_pass = std::make_unique<aarch64::GHC_frame_preservation_pass>(config);
-
-				// Register it
-				register_transform_pass(ghc_fixup_pass);
-			}
-#endif
 		}
-
-		reset_transforms();
-	}
-
-	void init_luts()
-	{
-		// LUTs for some instructions
-		m_spu_frest_fraction_lut = new llvm::GlobalVariable(*m_module, llvm::ArrayType::get(GetType<u32>(), 32), true, llvm::GlobalValue::PrivateLinkage, llvm::ConstantDataArray::get(m_context, spu_frest_fraction_lut));
-		m_spu_frsqest_fraction_lut = new llvm::GlobalVariable(*m_module, llvm::ArrayType::get(GetType<u32>(), 64), true, llvm::GlobalValue::PrivateLinkage, llvm::ConstantDataArray::get(m_context, spu_frsqest_fraction_lut));
-		m_spu_frsqest_exponent_lut = new llvm::GlobalVariable(*m_module, llvm::ArrayType::get(GetType<u32>(), 256), true, llvm::GlobalValue::PrivateLinkage, llvm::ConstantDataArray::get(m_context, spu_frsqest_exponent_lut));
 	}
 
 	virtual spu_function_t compile(spu_program&& _func) override
@@ -1509,7 +4332,6 @@ public:
 		}
 
 		const u32 start0 = _func.entry_point;
-		const usz func_size = _func.data.size();
 
 		const auto add_loc = m_spurt->add_empty(std::move(_func));
 
@@ -1531,11 +4353,11 @@ public:
 			return add_loc->compiled;
 		}
 
-		bool add_to_file = false;
+		std::string log;
 
 		if (auto& cache = g_fxo->get<spu_cache>(); cache && g_cfg.core.spu_cache && !add_loc->cached.exchange(1))
 		{
-			add_to_file = true;
+			cache.add(func);
 		}
 
 		{
@@ -1547,7 +4369,7 @@ public:
 			sha1_finish(&ctx, output);
 
 			m_hash.clear();
-			fmt::append(m_hash, "__spu-0x%05x-%s", func.entry_point, fmt::base57(output));
+			fmt::append(m_hash, "spu-0x%05x-%s", func.entry_point, fmt::base57(output));
 
 			be_t<u64> hash_start;
 			std::memcpy(&hash_start, output, sizeof(hash_start));
@@ -1564,35 +4386,10 @@ public:
 
 		m_pp_id = 0;
 
-		std::string function_log;
-
-		this->dump(func, function_log);
-		bool to_log_func = false;
-
 		if (g_cfg.core.spu_debug && !add_loc->logged.exchange(1))
 		{
-			if (!fs::write_file(m_spurt->get_cache_path() + "spu.log", fs::write + fs::append, function_log))
-			{
-				// Fallback: write to main log
-				to_log_func = true;
-			}
-		}
-
-		for (u32 data : func.data)
-		{
-			const spu_opcode_t op{std::bit_cast<be_t<u32>>(data)};
-
-			const auto itype = g_spu_itype.decode(op.opcode);
-
-			if (itype == spu_itype::RDCH && op.ra == SPU_RdDec)
-			{
-				to_log_func = true;
-			}
-		}
-
-		if (to_log_func)
-		{
-			spu_log.notice("Function %s dump:\n%s", m_hash, function_log);
+			this->dump(func, log);
+			fs::file(m_spurt->get_cache_path() + "spu.log", fs::write + fs::append).write(log);
 		}
 
 		using namespace llvm;
@@ -1601,7 +4398,7 @@ public:
 
 		// Create LLVM module
 		std::unique_ptr<Module> _module = std::make_unique<Module>(m_hash + ".obj", m_context);
-		_module->setTargetTriple(jit_compiler::triple2());
+		_module->setTargetTriple(Triple::normalize("x86_64-unknown-linux-gnu"));
 		_module->setDataLayout(m_jit.get_engine().getTargetMachine()->createDataLayout());
 		m_module = _module.get();
 
@@ -1609,14 +4406,15 @@ public:
 		IRBuilder<> irb(m_context);
 		m_ir = &irb;
 
+		// Helper for check_state. Used to not interfere with LICM pass.
+		m_fake_global1 = new llvm::GlobalVariable(*m_module, get_type<bool>(), false, llvm::GlobalValue::InternalLinkage, m_ir->getFalse());
+
 		// Add entry function (contains only state/code check)
 		const auto main_func = llvm::cast<llvm::Function>(m_module->getOrInsertFunction(m_hash, get_ftype<void, u8*, u8*, u64>()).getCallee());
-		const auto main_arg2 = main_func->getArg(2);
+		const auto main_arg2 = &*(main_func->arg_begin() + 2);
 		main_func->setCallingConv(CallingConv::GHC);
 		set_function(main_func);
 
-		init_luts();
-
 		// Start compilation
 		const auto label_test = BasicBlock::Create(m_context, "", m_function);
 		const auto label_diff = BasicBlock::Create(m_context, "", m_function);
@@ -1624,11 +4422,11 @@ public:
 		const auto label_stop = BasicBlock::Create(m_context, "", m_function);
 
 		// Load PC, which will be the actual value of 'm_base'
-		m_base_pc = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::pc));
+		m_base_pc = m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::pc));
 
 		// Emit state check
 		const auto pstate = spu_ptr<u32>(&spu_thread::state);
-		m_ir->CreateCondBr(m_ir->CreateICmpNE(m_ir->CreateLoad(get_type<u32>(), pstate), m_ir->getInt32(0)), label_stop, label_test, m_md_unlikely);
+		m_ir->CreateCondBr(m_ir->CreateICmpNE(m_ir->CreateLoad(pstate, true), m_ir->getInt32(0)), label_stop, label_test, m_md_unlikely);
 
 		// Emit code check
 		u32 check_iterations = 0;
@@ -1636,7 +4434,7 @@ public:
 
 		// Set block hash for profiling (if enabled)
 		if (g_cfg.core.spu_prof && g_cfg.core.spu_verification)
-			m_ir->CreateStore(m_ir->getInt64((m_hash_start & -65536)), spu_ptr<u64>(&spu_thread::block_hash));
+			m_ir->CreateStore(m_ir->getInt64((m_hash_start & -65536)), spu_ptr<u64>(&spu_thread::block_hash), true);
 
 		if (!g_cfg.core.spu_verification)
 		{
@@ -1645,14 +4443,14 @@ public:
 		}
 		else if (func.data.size() == 1)
 		{
-			const auto pu32 = m_ir->CreateGEP(get_type<u8>(), m_lsptr, m_base_pc);
-			const auto cond = m_ir->CreateICmpNE(m_ir->CreateLoad(get_type<u32>(), pu32), m_ir->getInt32(func.data[0]));
+			const auto pu32 = m_ir->CreateBitCast(m_ir->CreateGEP(m_lsptr, m_base_pc), get_type<u32*>());
+			const auto cond = m_ir->CreateICmpNE(m_ir->CreateLoad(pu32), m_ir->getInt32(func.data[0]));
 			m_ir->CreateCondBr(cond, label_diff, label_body, m_md_unlikely);
 		}
 		else if (func.data.size() == 2)
 		{
-			const auto pu64 = m_ir->CreateGEP(get_type<u8>(), m_lsptr, m_base_pc);
-			const auto cond = m_ir->CreateICmpNE(m_ir->CreateLoad(get_type<u64>(), pu64), m_ir->getInt64(static_cast<u64>(func.data[1]) << 32 | func.data[0]));
+			const auto pu64 = m_ir->CreateBitCast(m_ir->CreateGEP(m_lsptr, m_base_pc), get_type<u64*>());
+			const auto cond = m_ir->CreateICmpNE(m_ir->CreateLoad(pu64), m_ir->getInt64(static_cast<u64>(func.data[1]) << 32 | func.data[0]));
 			m_ir->CreateCondBr(cond, label_diff, label_body, m_md_unlikely);
 		}
 		else
@@ -1676,19 +4474,19 @@ public:
 			u32 elements;
 			u32 dwords;
 
-			if (m_use_avx512)
+			if (m_use_avx512 && g_cfg.core.full_width_avx512)
 			{
 				stride = 64;
 				elements = 16;
 				dwords = 8;
 			}
-			else if (m_use_avx)
+			else if (true)
 			{
 				stride = 32;
 				elements = 8;
 				dwords = 4;
 			}
-			else
+			else // TODO: Use this path when the cpu doesn't support AVX
 			{
 				stride = 16;
 				elements = 4;
@@ -1697,210 +4495,104 @@ public:
 
 			// Get actual pc corresponding to the found beginning of the data
 			llvm::Value* starta_pc = m_ir->CreateAnd(get_pc(starta), 0x3fffc);
-			llvm::Value* data_addr = m_ir->CreateGEP(get_type<u8>(), m_lsptr, starta_pc);
+			llvm::Value* data_addr = m_ir->CreateGEP(m_lsptr, starta_pc);
 
-			llvm::Value* acc0 = nullptr;
-			llvm::Value* acc1 = nullptr;
-			bool toggle = true;
+			llvm::Value* acc = nullptr;
 
-			// Use a 512bit simple checksum to verify integrity if size is atleast 512b * 3
-			// This code uses a 512bit vector for all hardware to ensure behavior matches.
-			// The checksum path is still faster even on narrow hardware.
-			if ((end - starta) >= 192 && !g_cfg.core.precise_spu_verification)
+			for (u32 j = starta; j < end; j += stride)
 			{
-				for (u32 j = starta; j < end; j += 64)
+				int indices[16];
+				bool holes = false;
+				bool data = false;
+
+				for (u32 i = 0; i < elements; i++)
 				{
-					int indices[16];
-					bool holes = false;
-					bool data = false;
+					const u32 k = j + i * 4;
 
-					for (u32 i = 0; i < 16; i++)
+					if (k < start || k >= end || !func.data[(k - start) / 4])
 					{
-						const u32 k = j + i * 4;
-
-						if (k < start || k >= end || !func.data[(k - start) / 4])
-						{
-							indices[i] = 16;
-							holes      = true;
-						}
-						else
-						{
-							indices[i] = i;
-							data       = true;
-						}
-					}
-
-					if (!data)
-					{
-						// Skip full-sized holes
-						continue;
-					}
-
-					llvm::Value* vls = nullptr;
-
-					// Load unaligned code block from LS
-					vls = m_ir->CreateAlignedLoad(get_type<u32[16]>(), _ptr<u32[16]>(data_addr, j - starta), llvm::MaybeAlign{4});
-
-					// Mask if necessary
-					if (holes)
-					{
-						vls = m_ir->CreateShuffleVector(vls, ConstantAggregateZero::get(vls->getType()), llvm::ArrayRef(indices, 16));
-					}
-
-					// Interleave accumulators for more performance
-					if (toggle)
-					{
-						acc0 = acc0 ? m_ir->CreateAdd(acc0, vls) : vls;
+						indices[i] = elements;
+						holes      = true;
 					}
 					else
 					{
-						acc1 = acc1 ? m_ir->CreateAdd(acc1, vls) : vls;
-					}
-					toggle = !toggle;
-					check_iterations++;
-				}
-
-				llvm::Value* acc = (acc0 && acc1) ? m_ir->CreateAdd(acc0, acc1): (acc0 ? acc0 : acc1);
-
-				// Create the checksum
-				u32 checksum[16] = {0};
-
-				for (u32 j = 0; j < func.data.size(); j += 16) // Process 16 elements per iteration
-				{
-					for (u32 i = 0; i < 16; i++)
-					{
-						if (j + i < func.data.size())
-						{
-							checksum[i] += func.data[j + i];
-						}
+						indices[i] = i;
+						data       = true;
 					}
 				}
 
-				auto* const_vector = ConstantDataVector::get(m_context, llvm::ArrayRef(checksum, 16));
-				acc = m_ir->CreateXor(acc, const_vector);
-
-				// Pattern for PTEST
-				acc = m_ir->CreateBitCast(acc, get_type<u64[8]>());
-
-				llvm::Value* elem = m_ir->CreateExtractElement(acc, u64{0});
-
-				for (u32 i = 1; i < 8; i++)
+				if (!data)
 				{
-					elem = m_ir->CreateOr(elem, m_ir->CreateExtractElement(acc, i));
+					// Skip full-sized holes
+					continue;
 				}
 
-				// Compare result with zero
-				const auto cond = m_ir->CreateICmpNE(elem, m_ir->getInt64(0));
-				m_ir->CreateCondBr(cond, label_diff, label_body, m_md_unlikely);
-			}
-			else
-			{
-				for (u32 j = starta; j < end; j += stride)
+				llvm::Value* vls = nullptr;
+
+				// Load unaligned code block from LS
+				if (m_use_avx512 && g_cfg.core.full_width_avx512)
 				{
-					int indices[16];
-					bool holes = false;
-					bool data = false;
-
-					for (u32 i = 0; i < elements; i++)
-					{
-						const u32 k = j + i * 4;
-
-						if (k < start || k >= end || !func.data[(k - start) / 4])
-						{
-							indices[i] = elements;
-							holes      = true;
-						}
-						else
-						{
-							indices[i] = i;
-							data       = true;
-						}
-					}
-
-					if (!data)
-					{
-						// Skip full-sized holes
-						continue;
-					}
-
-					llvm::Value* vls = nullptr;
-
-					// Load unaligned code block from LS
-					if (m_use_avx512)
-					{
-						vls = m_ir->CreateAlignedLoad(get_type<u32[16]>(), _ptr<u32[16]>(data_addr, j - starta), llvm::MaybeAlign{4});
-					}
-					else if (m_use_avx)
-					{
-						vls = m_ir->CreateAlignedLoad(get_type<u32[8]>(), _ptr<u32[8]>(data_addr, j - starta), llvm::MaybeAlign{4});
-					}
-					else
-					{
-						vls = m_ir->CreateAlignedLoad(get_type<u32[4]>(), _ptr<u32[4]>(data_addr, j - starta), llvm::MaybeAlign{4});
-					}
-
-					// Mask if necessary
-					if (holes)
-					{
-						vls = m_ir->CreateShuffleVector(vls, ConstantAggregateZero::get(vls->getType()), llvm::ArrayRef(indices, elements));
-					}
-
-					// Perform bitwise comparison and accumulate
-					u32 words[16];
-
-					for (u32 i = 0; i < elements; i++)
-					{
-						const u32 k = j + i * 4;
-						words[i] = k >= start && k < end ? func.data[(k - start) / 4] : 0;
-					}
-
-					vls = m_ir->CreateXor(vls, ConstantDataVector::get(m_context, llvm::ArrayRef(words, elements)));
-					
-					// Interleave accumulators for more performance
-					if (toggle)
-					{
-						acc0 = acc0 ? m_ir->CreateAdd(acc0, vls) : vls;
-					}
-					else
-					{
-						acc1 = acc1 ? m_ir->CreateAdd(acc1, vls) : vls;
-					}
-					toggle = !toggle;
-					check_iterations++;
+					vls = m_ir->CreateAlignedLoad(_ptr<u32[16]>(data_addr, j - starta), llvm::MaybeAlign{4});
 				}
-				llvm::Value* acc = (acc0 && acc1) ? m_ir->CreateAdd(acc0, acc1): (acc0 ? acc0 : acc1);
-
-				// Pattern for PTEST
-				if (m_use_avx512)
+				else if (true)
 				{
-					acc = m_ir->CreateBitCast(acc, get_type<u64[8]>());
-				}
-				else if (m_use_avx)
-				{
-					acc = m_ir->CreateBitCast(acc, get_type<u64[4]>());
+					vls = m_ir->CreateAlignedLoad(_ptr<u32[8]>(data_addr, j - starta), llvm::MaybeAlign{4});
 				}
 				else
 				{
-					acc = m_ir->CreateBitCast(acc, get_type<u64[2]>());
+					vls = m_ir->CreateAlignedLoad(_ptr<u32[4]>(data_addr, j - starta), llvm::MaybeAlign{4});
 				}
 
-				llvm::Value* elem = m_ir->CreateExtractElement(acc, u64{0});
-
-				for (u32 i = 1; i < dwords; i++)
+				// Mask if necessary
+				if (holes)
 				{
-					elem = m_ir->CreateOr(elem, m_ir->CreateExtractElement(acc, i));
+					vls = m_ir->CreateShuffleVector(vls, ConstantAggregateZero::get(vls->getType()), llvm::makeArrayRef(indices, elements));
 				}
 
-				// Compare result with zero
-				const auto cond = m_ir->CreateICmpNE(elem, m_ir->getInt64(0));
-				m_ir->CreateCondBr(cond, label_diff, label_body, m_md_unlikely);
+				// Perform bitwise comparison and accumulate
+				u32 words[16];
+
+				for (u32 i = 0; i < elements; i++)
+				{
+					const u32 k = j + i * 4;
+					words[i] = k >= start && k < end ? func.data[(k - start) / 4] : 0;
+				}
+
+				vls = m_ir->CreateXor(vls, ConstantDataVector::get(m_context, llvm::makeArrayRef(words, elements)));
+				acc = acc ? m_ir->CreateOr(acc, vls) : vls;
+				check_iterations++;
 			}
+
+			// Pattern for PTEST
+			if (m_use_avx512 && g_cfg.core.full_width_avx512)
+			{
+				acc = m_ir->CreateBitCast(acc, get_type<u64[8]>());
+			}
+			else if (true)
+			{
+				acc = m_ir->CreateBitCast(acc, get_type<u64[4]>());
+			}
+			else
+			{
+				acc = m_ir->CreateBitCast(acc, get_type<u64[2]>());
+			}
+
+			llvm::Value* elem = m_ir->CreateExtractElement(acc, u64{0});
+
+			for (u32 i = 1; i < dwords; i++)
+			{
+				elem = m_ir->CreateOr(elem, m_ir->CreateExtractElement(acc, i));
+			}
+
+			// Compare result with zero
+			const auto cond = m_ir->CreateICmpNE(elem, m_ir->getInt64(0));
+			m_ir->CreateCondBr(cond, label_diff, label_body, m_md_unlikely);
 		}
 
 		// Increase block counter with statistics
 		m_ir->SetInsertPoint(label_body);
 		const auto pbcount = spu_ptr<u64>(&spu_thread::block_counter);
-		m_ir->CreateStore(m_ir->CreateAdd(m_ir->CreateLoad(get_type<u64>(), pbcount), m_ir->getInt64(check_iterations)), pbcount);
+		m_ir->CreateStore(m_ir->CreateAdd(m_ir->CreateLoad(pbcount), m_ir->getInt64(check_iterations)), pbcount);
 
 		// Call the entry function chunk
 		const auto entry_chunk = add_function(m_pos);
@@ -1914,7 +4606,8 @@ public:
 		// Proceed to the next code
 		if (entry_chunk->chunk->getReturnType() != get_type<void>())
 		{
-			const auto next_call = m_ir->CreateCall(main_func->getFunctionType(), entry_call, {m_thread, m_lsptr, m_ir->getInt64(0)});
+			const auto f_ptr = m_ir->CreateBitCast(entry_call, main_func->getType());
+			const auto next_call = m_ir->CreateCall({main_func->getFunctionType(), f_ptr}, {m_thread, m_lsptr, m_ir->getInt64(0)});
 			next_call->setCallingConv(main_func->getCallingConv());
 			next_call->setTailCall();
 		}
@@ -1926,7 +4619,6 @@ public:
 		m_ir->CreateRetVoid();
 
 		m_ir->SetInsertPoint(label_stop);
-		call("spu_escape", spu_runtime::g_escape, m_thread)->setTailCall();
 		m_ir->CreateRetVoid();
 
 		m_ir->SetInsertPoint(label_diff);
@@ -1934,7 +4626,7 @@ public:
 		if (g_cfg.core.spu_verification)
 		{
 			const auto pbfail = spu_ptr<u64>(&spu_thread::block_failure);
-			m_ir->CreateStore(m_ir->CreateAdd(m_ir->CreateLoad(get_type<u64>(), pbfail), m_ir->getInt64(1)), pbfail);
+			m_ir->CreateStore(m_ir->CreateAdd(m_ir->CreateLoad(pbfail), m_ir->getInt64(1)), pbfail);
 			const auto dispci = call("spu_dispatch", spu_runtime::tr_dispatch, m_thread, m_lsptr, main_arg2);
 			dispci->setCallingConv(CallingConv::GHC);
 			dispci->setTailCall();
@@ -1945,38 +4637,34 @@ public:
 			m_ir->CreateUnreachable();
 		}
 
-		m_dispatch = cast<Function>(_module->getOrInsertFunction("__spu-null", entry_chunk->chunk->getFunctionType()).getCallee());
+		m_dispatch = cast<Function>(_module->getOrInsertFunction("spu-null", entry_chunk->chunk->getFunctionType()).getCallee());
 		m_dispatch->setLinkage(llvm::GlobalValue::InternalLinkage);
 		m_dispatch->setCallingConv(entry_chunk->chunk->getCallingConv());
 		set_function(m_dispatch);
 
 		if (entry_chunk->chunk->getReturnType() == get_type<void>())
 		{
-			const auto next_call = m_ir->CreateCall(main_func->getFunctionType(), dispatcher, {m_thread, m_lsptr, m_ir->getInt64(0)});
+			const auto f_ptr = m_ir->CreateBitCast(dispatcher, main_func->getType());
+			const auto next_call = m_ir->CreateCall({main_func->getFunctionType(), f_ptr}, {m_thread, m_lsptr, m_ir->getInt64(0)});
 			next_call->setCallingConv(main_func->getCallingConv());
 			next_call->setTailCall();
 			m_ir->CreateRetVoid();
 		}
 		else
 		{
-			m_ir->CreateRet(dispatcher);
+			m_ir->CreateRet(m_ir->CreateBitCast(dispatcher, get_type<u8*>()));
 		}
 
 		// Function that executes check_state and escapes if necessary
 		m_test_state = llvm::cast<llvm::Function>(m_module->getOrInsertFunction("spu_test_state", get_ftype<void, u8*>()).getCallee());
 		m_test_state->setLinkage(GlobalValue::InternalLinkage);
-#ifdef ARCH_ARM64
-		// LLVM doesn't support PreserveAll on arm64.
-		m_test_state->setCallingConv(CallingConv::PreserveMost);
-#else
 		m_test_state->setCallingConv(CallingConv::PreserveAll);
-#endif
 		m_ir->SetInsertPoint(BasicBlock::Create(m_context, "", m_test_state));
 		const auto escape_yes = BasicBlock::Create(m_context, "", m_test_state);
 		const auto escape_no = BasicBlock::Create(m_context, "", m_test_state);
-		m_ir->CreateCondBr(call("spu_exec_check_state", &exec_check_state, m_test_state->getArg(0)), escape_yes, escape_no);
+		m_ir->CreateCondBr(call("spu_exec_check_state", &exec_check_state, &*m_test_state->arg_begin()), escape_yes, escape_no);
 		m_ir->SetInsertPoint(escape_yes);
-		call("spu_escape", spu_runtime::g_escape, m_test_state->getArg(0));
+		call("spu_escape", spu_runtime::g_escape, &*m_test_state->arg_begin());
 		m_ir->CreateRetVoid();
 		m_ir->SetInsertPoint(escape_no);
 		m_ir->CreateRetVoid();
@@ -1993,7 +4681,7 @@ public:
 
 			// Set block hash for profiling (if enabled)
 			if (g_cfg.core.spu_prof)
-				m_ir->CreateStore(m_ir->getInt64((m_hash_start & -65536) | (m_entry >> 2)), spu_ptr<u64>(&spu_thread::block_hash));
+				m_ir->CreateStore(m_ir->getInt64((m_hash_start & -65536) | (m_entry >> 2)), spu_ptr<u64>(&spu_thread::block_hash), true);
 
 			m_finfo = &m_functions[m_entry];
 			m_ir->CreateBr(add_block(m_entry));
@@ -2005,7 +4693,7 @@ public:
 				const u32 baddr = m_block_queue[bi];
 				m_block = &m_blocks[baddr];
 				m_ir->SetInsertPoint(m_block->block);
-				auto& bb = ::at32(m_bbs, baddr);
+				auto& bb = m_bbs.at(baddr);
 				bool need_check = false;
 				m_block->bb = &bb;
 
@@ -2019,7 +4707,7 @@ public:
 						if (src > 0x40000)
 						{
 							// Use the xfloat hint to create 256-bit (4x double) PHI
-							llvm::Type* type = g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate && bb.reg_maybe_xf[i] ? get_type<f64[4]>() : get_reg_type(i);
+							llvm::Type* type = g_cfg.core.spu_accurate_xfloat && bb.reg_maybe_xf[i] ? get_type<f64[4]>() : get_reg_type(i);
 
 							const auto _phi = m_ir->CreatePHI(type, ::size32(bb.preds), fmt::format("phi0x%05x_r%u", baddr, i));
 							m_block->phi[i] = _phi;
@@ -2042,7 +4730,7 @@ public:
 										if (!value)
 										{
 											// Value hasn't been loaded yet
-											value = m_finfo && m_finfo->load[i] ? m_finfo->load[i] : m_ir->CreateLoad(get_reg_type(i), regptr);
+											value = m_finfo && m_finfo->load[i] ? m_finfo->load[i] : m_ir->CreateLoad(regptr);
 										}
 
 										if (value->getType() == get_type<f64[4]>() && type != get_type<f64[4]>())
@@ -2073,12 +4761,12 @@ public:
 								const auto regptr = init_reg_fixed(i);
 								const auto cblock = m_ir->GetInsertBlock();
 								m_ir->SetInsertPoint(m_function->getEntryBlock().getTerminator());
-								const auto value = m_finfo && m_finfo->load[i] ? m_finfo->load[i] : m_ir->CreateLoad(get_reg_type(i), regptr);
+								const auto value = m_finfo && m_finfo->load[i] ? m_finfo->load[i] : m_ir->CreateLoad(regptr);
 								m_ir->SetInsertPoint(cblock);
 								_phi->addIncoming(value, &m_function->getEntryBlock());
 							}
 						}
-						else if (src < SPU_LS_SIZE)
+						else if (src < 0x40000)
 						{
 							// Passthrough register value
 							const auto bfound = m_blocks.find(src);
@@ -2138,26 +4826,6 @@ public:
 					else
 						m_next_op = func.data[(m_pos - start) / 4 + 1];
 
-					switch (m_inst_attrs[(m_pos - start) / 4])
-					{
-					case inst_attr::putllc0:
-					{
-						putllc0_pattern(func, m_patterns.at(m_pos - start).range);
-						continue;
-					}
-					case inst_attr::putllc16:
-					{
-						putllc16_pattern(func, m_patterns.at(m_pos - start).range);
-						continue;
-					}
-					case inst_attr::omit:
-					{
-						// TODO
-						continue;
-					}
-					default: break;
-					}
-
 					// Execute recompiler function (TODO)
 					(this->*decode(op))({op});
 				}
@@ -2175,7 +4843,7 @@ public:
 						{
 							const auto tfound = m_targets.find(m_pos);
 
-							if (tfound == m_targets.end() || std::find(tfound->second.begin(), tfound->second.end(), target) == tfound->second.end())
+							if (tfound == m_targets.end() || tfound->second.find_first_of(target) + 1 == 0)
 							{
 								spu_log.error("[%s] Unregistered fallthrough to 0x%x (chunk=0x%x, entry=0x%x)", m_hash, target, m_entry, m_function_queue[0]);
 							}
@@ -2188,469 +4856,6 @@ public:
 
 				ensure(m_block->block_end);
 			}
-
-			// Work on register stores.
-			// 1. Remove stores which are overwritten later.
-			// 2. Sink stores to post-dominating blocks.
-			llvm::PostDominatorTree pdt(*m_function);
-			llvm::DominatorTree dt(*m_function);
-
-			// Post-order indices
-			std::unordered_map<llvm::BasicBlock*, usz> pois;
-			{
-				usz i = 0;
-				for (auto* bb : llvm::post_order(m_function))
-					pois[bb] = i++;
-			}
-
-			// Basic block to block_info
-			std::unordered_map<llvm::BasicBlock*, block_info*> bb_to_info;
-
-			std::vector<std::pair<u32, block_info*>> block_q;
-			block_q.reserve(m_blocks.size());
-
-			bool has_gpr_memory_barriers = false;
-
-			for (auto& [a, b] : m_blocks)
-			{
-				block_q.emplace_back(a, &b);
-				bb_to_info[b.block] = &b;
-				has_gpr_memory_barriers |= b.has_gpr_memory_barriers;
-			}
-
-			for (usz bi = 0; bi < block_q.size(); bi++)
-			{
-				auto bqbi = block_q[bi].second;
-
-				// TODO: process all registers up to s_reg_max
-				for (u32 i = 0; i <= s_reg_127; i++)
-				{
-					// Check if the store is beyond the last barrier
-					if (auto& bs = bqbi->store[i]; bs && !bqbi->does_gpr_barrier_proceed_last_store(i))
-					{
-						for (auto& [a, b] : m_blocks)
-						{
-							// Check if the store occurs before any barrier in the block
-							if (b.store[i] && b.store[i] != bs && b.store_context_first_id[i] == 1)
-							{
-								if (pdt.dominates(b.store[i], bs))
-								{
-									spu_log.trace("Erased r%u store from block 0x%x (simple)", i, block_q[bi].first);
-
-									bs->eraseFromParent();
-									bs = nullptr;
-									break;
-								}
-							}
-						}
-
-						if (!bs)
-							continue;
-
-						// Set of store instructions which overwrite bs
-						std::vector<llvm::BasicBlock*> killers;
-
-						for (auto& [a, b] : m_blocks)
-						{
-							const auto si = b.store[i];
-
-							if (si && si != bs)
-							{
-								if (pois[bs->getParent()] > pois[si->getParent()])
-								{
-									killers.emplace_back(si->getParent());
-								}
-								else
-								{
-									// Reset: store is not the first in the set
-									killers.clear();
-									break;
-								}
-							}
-						}
-
-						if (killers.empty())
-							continue;
-
-						// Find nearest common post-dominator
-						llvm::BasicBlock* common_pdom = killers[0];
-
-						if (has_gpr_memory_barriers)
-						{
-							// Cannot optimize block walk-through, need to inspect all possible memory barriers in the way
-							common_pdom = nullptr;
-						}
-
-						for (auto* bbb : llvm::drop_begin(killers))
-						{
-							if (!common_pdom)
-							{
-								break;
-							}
-
-							common_pdom = pdt.findNearestCommonDominator(common_pdom, bbb);
-						}
-
-						// Shortcut
-						if (common_pdom && !pdt.dominates(common_pdom, bs->getParent()))
-						{
-							common_pdom = nullptr;
-						}
-
-						// Look for possibly-dead store in CFG starting from the exit nodes
-						llvm::SetVector<llvm::BasicBlock*> work_list;
-						std::unordered_map<llvm::BasicBlock*, bool> worked_on;
-
-						if (!common_pdom || std::none_of(killers.begin(), killers.end(), [common_pdom](const llvm::BasicBlock* block){ return block == common_pdom;}))
-						{
-							if (common_pdom)
-							{
-								// Shortcut
-								work_list.insert(common_pdom);
-								worked_on[common_pdom] = true;
-							}
-							else
-							{
-								// Check all exits
-								for (auto* r : pdt.roots())
-								{
-									worked_on[r] = true;
-									work_list.insert(r);
-								}
-							}
-						}
-
-						// bool flag indicates the presence of a memory barrier before the killer store
-						std::vector<std::pair<llvm::BasicBlock*, bool>> work2_list;
-
-						for (usz wi = 0; wi < work_list.size(); wi++)
-						{
-							auto* cur = work_list[wi];
-							if (std::any_of(killers.begin(), killers.end(), [cur](const llvm::BasicBlock* block){ return block == cur; }))
-							{
-								work2_list.emplace_back(cur, bb_to_info[cur] && bb_to_info[cur]->does_gpr_barrier_preceed_first_store(i));
-								continue;
-							}
-
-							if (cur == bs->getParent())
-							{
-								// Reset: store is not dead
-								killers.clear();
-								break;
-							}
-
-							for (auto* p : llvm::predecessors(cur))
-							{
-								if (!worked_on[p])
-								{
-									worked_on[p] = true;
-									work_list.insert(p);
-								}
-							}
-						}
-
-						if (killers.empty())
-							continue;
-
-						worked_on.clear();
-
-						for (usz wi = 0; wi < work2_list.size(); wi++)
-						{
-							worked_on[work2_list[wi].first] = true;
-						}
-
-						// Need to treat tails differently: do not require checking barrier (checked before in a suitable manner)
-						const usz work_list_tail_blocks_max_index = work2_list.size();
-
-						for (usz wi = 0; wi < work2_list.size(); wi++)
-						{
-							auto [cur, found_user] = work2_list[wi];
-
-							ensure(cur != bs->getParent());
-
-							if (!found_user && wi >= work_list_tail_blocks_max_index)
-							{
-								if (auto info = bb_to_info[cur])
-								{
-									if (info->store_context_ctr[i] != 1)
-									{
-										found_user = true;
-									}
-								}
-							}
-
-							for (auto* p : llvm::predecessors(cur))
-							{
-								if (p == bs->getParent())
-								{
-									if (found_user)
-									{
-										// Reset: store is being used and preserved by ensure_gpr_stores()
-										killers.clear();
-										break;
-									}
-
-									continue;
-								}
-
-								if (!worked_on[p])
-								{
-									worked_on[p] = true;
-									work2_list.push_back(std::make_pair(p, found_user));
-								}
-								// Enqueue a second iteration for found_user=true if only found with found_user=false 
-								else if (found_user && !std::find_if(work2_list.rbegin(), work2_list.rend(), [&](auto& it){ return it.first == p; })->second)
-								{
-									work2_list.push_back(std::make_pair(p, true));
-								}
-							}
-
-							if (killers.empty())
-							{
-								break;
-							}
-						}
-
-						// Finally erase the dead store
-						if (!killers.empty())
-						{
-							spu_log.trace("Erased r%u store from block 0x%x (reversed)", i, block_q[bi].first);
-
-							bs->eraseFromParent();
-							bs = nullptr;
-
-							// Run the loop from the start
-							bi = 0;
-						}
-					}
-				}
-			}
-
-			block_q.clear();
-			for (auto& [a, b] : m_blocks)
-			{
-				block_q.emplace_back(a, &b);
-			}
-
-			for (usz bi = 0; bi < block_q.size(); bi++)
-			{
-				auto bqbi = block_q[bi].second;
-
-				std::vector<std::pair<u32, bool>> work_list;
-				std::map<u32, block_info*, std::greater<>> sucs;
-				std::unordered_map<u32, bool> worked_on;
-
-				for (u32 i = 0; i <= s_reg_127; i++)
-				{
-					if (i == s_reg_sp)
-					{
-						// If we postpone R1 store we lose effortless meta-analytical capabilities for little gain
-						continue;
-					}
-
-					// If store isn't erased, try to sink it
-					if (auto& bs = bqbi->store[i]; bs && bqbi->bb->targets.size() > 1 && !bqbi->does_gpr_barrier_proceed_last_store(i))
-					{
-						if (sucs.empty())
-						{
-							for (u32 tj : bqbi->bb->targets)
-							{
-								auto b2it = m_blocks.find(tj);
-
-								if (b2it != m_blocks.end())
-								{
-									sucs.emplace(tj, &b2it->second);
-								}
-							}
-						}
-
-						// Reset
-						work_list.clear();
-
-						for (auto& [_, worked] : worked_on)
-						{
-							worked = false;
-						}
-
-						bool has_gpr_barriers_in_the_way = false;
-
-						for (auto [a2, b2] : sucs)
-						{
-							if (a2 == block_q[bi].first)
-							{
-								if (bqbi->store_context_ctr[i] != 1)
-								{
-									has_gpr_barriers_in_the_way = true;
-									break;
-								}
-
-								continue;
-							}
-
-							if (!worked_on[a2])
-							{
-								work_list.emplace_back(a2, b2->store_context_ctr[i] != 1);
-								worked_on[a2] = true;
-							}
-						}
-
-						if (has_gpr_barriers_in_the_way)
-						{
-							// Cannot sink store, has barriers in the way
-							continue;
-						}
-
-						for (usz wi = 0; wi < work_list.size(); wi++)
-						{
-							auto [cur, found_barrier] = work_list[wi];
-
-							if (!found_barrier)
-							{
-								if (const auto it = m_blocks.find(cur); it != m_blocks.cend())
-								{
-									if (it->second.store_context_ctr[i] != 1)
-									{
-										found_barrier = true;
-									}
-								}
-							}
-
-							if (cur == block_q[bi].first)
-							{
-								if (found_barrier)
-								{
-									has_gpr_barriers_in_the_way = true;
-									break;
-								}
-
-								continue;
-							}
-
-							for (u32 target : m_bbs[cur].targets)
-							{
-								if (!m_block_info[target / 4])
-								{
-									continue;
-								}
-
-								if (m_blocks.find(target) == m_blocks.end())
-								{
-									continue;
-								}
-
-								if (!worked_on[target])
-								{
-									worked_on[target] = true;
-									work_list.emplace_back(target, found_barrier);
-								}
-								// Enqueue a second iteration for found_barrier=true if only found with found_barrier=false 
-								else if (found_barrier && !std::find_if(work_list.rbegin(), work_list.rend(), [&](auto& it){ return it.first == target; })->second)
-								{
-									work_list.emplace_back(target, true);
-								}
-							}
-						}
-
-						if (has_gpr_barriers_in_the_way)
-						{
-							// Cannot sink store, has barriers in the way
-							continue;
-						}
-
-						for (auto [a2, b2] : sucs)
-						{
-							if (b2 != bqbi)
-							{
-								auto ins = b2->block->getFirstNonPHI();
-
-								if (b2->bb->preds.size() == 1)
-								{
-									if (!dt.dominates(bs->getOperand(0), ins))
-										continue;
-									if (!pdt.dominates(ins, bs))
-										continue;
-
-									m_ir->SetInsertPoint(ins);
-									auto si = llvm::cast<StoreInst>(m_ir->Insert(bs->clone()));
-									if (b2->store[i] == nullptr)
-									{
-										// Protect against backwards ordering now
-										b2->store[i] = si;
-										b2->store_context_last_id[i] = 0;
-										b2->store_context_first_id[i] = b2->store_context_ctr[i] + 1;
-
-										if (std::none_of(block_q.begin() + bi, block_q.end(), [b_info = b2](auto&& a) { return a.second == b_info; }))
-										{
-											// Sunk store can be checked again
-											block_q.emplace_back(a2, b2);
-										}
-									}
-
-									spu_log.trace("Postponed r%u store from block 0x%x (single)", i, block_q[bi].first);
-								}
-								else
-								{
-									// Initialize additional block between two basic blocks
-									auto& edge = bqbi->block_edges[a2];
-									if (!edge)
-									{
-										const auto succ_range = llvm::successors(bqbi->block_end);
-
-										auto succ = b2->block;
-
-										llvm::SmallSetVector<llvm::BasicBlock*, 32> succ_q;
-										succ_q.insert(b2->block);
-
-										for (usz j = 0; j < 32 && j < succ_q.size(); j++)
-										{
-											if (!llvm::count(succ_range, (succ = succ_q[j])))
-											{
-												for (auto pred : llvm::predecessors(succ))
-												{
-													succ_q.insert(pred);
-												}
-											}
-											else
-											{
-												break;
-											}
-										}
-
-										if (!llvm::count(succ_range, succ))
-										{
-											// TODO: figure this out
-											spu_log.notice("[%s] Failed successor to 0x%05x", fmt::base57(be_t<u64>{m_hash_start}), a2);
-											continue;
-										}
-
-										edge = llvm::SplitEdge(bqbi->block_end, succ);
-										pdt.recalculate(*m_function);
-										dt.recalculate(*m_function);
-
-										spu_log.trace("Postponed r%u store from block 0x%x (multiple)", i, block_q[bi].first);
-									}
-
-									ins = edge->getTerminator();
-									if (!dt.dominates(bs->getOperand(0), ins))
-										continue;
-									if (!pdt.dominates(ins, bs))
-										continue;
-
-									m_ir->SetInsertPoint(ins);
-									m_ir->Insert(bs->clone());
-								}
-
-								bs->eraseFromParent();
-								bs = nullptr;
-
-								pdt.recalculate(*m_function);
-								dt.recalculate(*m_function);
-								break;
-							}
-						}
-					}
-				}
-			}
 		}
 
 		// Create function table if necessary
@@ -2691,44 +4896,49 @@ public:
 			m_function_table->eraseFromParent();
 		}
 
-		// Create the analysis managers.
-		// These must be declared in this order so that they are destroyed in the
-		// correct order due to inter-analysis-manager references.
-		LoopAnalysisManager lam;
-		FunctionAnalysisManager fam;
-		CGSCCAnalysisManager cgam;
-		ModuleAnalysisManager mam;
+		// Initialize pass manager
+		legacy::FunctionPassManager pm(_module.get());
 
-		// Create the new pass manager builder.
-		// Take a look at the PassBuilder constructor parameters for more
-		// customization, e.g. specifying a TargetMachine or various debugging
-		// options.
-		PassBuilder pb;
-
-		// Register all the basic analyses with the managers.
-		pb.registerModuleAnalyses(mam);
-		pb.registerCGSCCAnalyses(cgam);
-		pb.registerFunctionAnalyses(fam);
-		pb.registerLoopAnalyses(lam);
-		pb.crossRegisterProxies(lam, fam, cgam, mam);
-
-		FunctionPassManager fpm;
 		// Basic optimizations
-		fpm.addPass(EarlyCSEPass(true));
-		fpm.addPass(SimplifyCFGPass());
-		fpm.addPass(DSEPass());
-		fpm.addPass(createFunctionToLoopPassAdaptor(LICMPass(LICMOptions()), true));
-		fpm.addPass(ADCEPass());
-
-		for (auto& f : *m_module)
-		{
-			run_transforms(f);
-		}
+		pm.add(createEarlyCSEPass());
+		pm.add(createCFGSimplificationPass());
+		//pm.add(createNewGVNPass());
+		pm.add(createDeadStoreEliminationPass());
+		pm.add(createLICMPass());
+		pm.add(createAggressiveDCEPass());
+		//pm.add(createLintPass()); // Check
 
 		for (const auto& func : m_functions)
 		{
 			const auto f = func.second.fn ? func.second.fn : func.second.chunk;
-			fpm.run(*f, fam);
+			pm.run(*f);
+
+			for (auto& bb : *f)
+			{
+				for (auto& i : bb)
+				{
+					// Replace volatile fake store with spu_test_state call
+					if (auto si = dyn_cast<StoreInst>(&i); si && si->getOperand(1) == m_fake_global1)
+					{
+						m_ir->SetInsertPoint(si);
+
+						CallInst* ci{};
+						if (si->getOperand(0) == m_ir->getFalse())
+						{
+							ci = m_ir->CreateCall(m_test_state, {&*f->arg_begin()});
+							ci->setCallingConv(m_test_state->getCallingConv());
+						}
+						else
+						{
+							continue;
+						}
+
+						si->replaceAllUsesWith(ci);
+						si->eraseFromParent();
+						break;
+					}
+				}
+			}
 		}
 
 		// Clear context (TODO)
@@ -2738,13 +4948,11 @@ public:
 		m_function_queue.clear();
 		m_function_table = nullptr;
 
-		// Append for now
-		std::string& llvm_log = function_log;
-		raw_string_ostream out(llvm_log);
+		raw_string_ostream out(log);
 
 		if (g_cfg.core.spu_debug)
 		{
-			fmt::append(llvm_log, "LLVM IR at 0x%x:\n", func.entry_point);
+			fmt::append(log, "LLVM IR at 0x%x:\n", func.entry_point);
 			out << *_module; // print IR
 			out << "\n\n";
 		}
@@ -2752,28 +4960,16 @@ public:
 		if (verifyModule(*_module, &out))
 		{
 			out.flush();
-			spu_log.error("LLVM: Verification failed at 0x%x:\n%s", func.entry_point, llvm_log);
+			spu_log.error("LLVM: Verification failed at 0x%x:\n%s", func.entry_point, log);
 
 			if (g_cfg.core.spu_debug)
 			{
-				fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::write + fs::append, llvm_log);
-			}
-
-			if (auto& cache = g_fxo->get<spu_cache>())
-			{
-				if (add_to_file)
-				{
-					cache.add(func);
-				}
+				fs::file(m_spurt->get_cache_path() + "spu-ir.log", fs::write + fs::append).write(log);
 			}
 
 			fmt::throw_exception("Compilation failed");
 		}
 
-#if defined(__APPLE__)
-		pthread_jit_write_protect_np(false);
-#endif
-
 		if (g_cfg.core.spu_debug)
 		{
 			// Testing only
@@ -2795,14 +4991,6 @@ public:
 		// Rebuild trampoline if necessary
 		if (!m_spurt->rebuild_ubertrampoline(func.data[0]))
 		{
-			if (auto& cache = g_fxo->get<spu_cache>())
-			{
-				if (add_to_file)
-				{
-					cache.add(func);
-				}
-			}
-
 			return nullptr;
 		}
 
@@ -2811,26 +4999,12 @@ public:
 		if (g_cfg.core.spu_debug)
 		{
 			out.flush();
-			fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::create + fs::write + fs::append, llvm_log);
+			fs::file(m_spurt->get_cache_path() + "spu-ir.log", fs::write + fs::append).write(log);
 		}
 
-#if defined(__APPLE__)
-		pthread_jit_write_protect_np(true);
-#endif
-#if defined(ARCH_ARM64)
-		// Flush all cache lines after potentially writing executable code
-		asm("ISB");
-		asm("DSB ISH");
-#endif
-
-		if (auto& cache = g_fxo->get<spu_cache>())
+		if (g_fxo->get<spu_cache>().operator bool())
 		{
-			if (add_to_file)
-			{
-				cache.add(func);
-			}
-
-			spu_log.success("New SPU block compiled successfully (size=%u)", func_size);
+			spu_log.success("New block compiled successfully");
 		}
 
 		return fn;
@@ -2847,7 +5021,7 @@ public:
 
 			// Execute interpreter instruction
 			const u32 op = *reinterpret_cast<const be_t<u32>*>(_spu->_ptr<u8>(0) + _spu->pc);
-			if (!g_fxo->get<spu_interpreter_rt>().decode(op)(*_spu, {op}))
+			if (!g_spu_interpreter_fast.decode(op)(*_spu, {op}))
 				spu_log.fatal("Bad instruction");
 
 			// Swap state
@@ -2876,7 +5050,7 @@ public:
 
 		// Create LLVM module
 		std::unique_ptr<Module> _module = std::make_unique<Module>("spu_interpreter.obj", m_context);
-		_module->setTargetTriple(jit_compiler::triple2());
+		_module->setTargetTriple(Triple::normalize("x86_64-unknown-linux-gnu"));
 		_module->setDataLayout(m_jit.get_engine().getTargetMachine()->createDataLayout());
 		m_module = _module.get();
 
@@ -2886,17 +5060,16 @@ public:
 
 		// Create interpreter table
 		const auto if_type = get_ftype<void, u8*, u8*, u32, u32, u8*, u32, u8*>();
-		m_function_table = new GlobalVariable(*m_module, ArrayType::get(m_ir->getPtrTy(), 1ull << m_interp_magn), true, GlobalValue::InternalLinkage, nullptr);
-
-		init_luts();
+		const auto if_pptr = if_type->getPointerTo()->getPointerTo();
+		m_function_table = new GlobalVariable(*m_module, ArrayType::get(if_type->getPointerTo(), 1ull << m_interp_magn), true, GlobalValue::InternalLinkage, nullptr);
 
 		// Add return function
 		const auto ret_func = cast<Function>(_module->getOrInsertFunction("spu_ret", if_type).getCallee());
 		ret_func->setCallingConv(CallingConv::GHC);
 		ret_func->setLinkage(GlobalValue::InternalLinkage);
 		m_ir->SetInsertPoint(BasicBlock::Create(m_context, "", ret_func));
-		m_thread = ret_func->getArg(1);
-		m_interp_pc = ret_func->getArg(2);
+		m_thread = &*(ret_func->arg_begin() + 1);
+		m_interp_pc = &*(ret_func->arg_begin() + 2);
 		m_ir->CreateRetVoid();
 
 		// Add entry function, serves as a trampoline
@@ -2907,12 +5080,12 @@ public:
 		set_function(main_func);
 
 		// Load pc and opcode
-		m_interp_pc = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::pc));
-		m_interp_op = m_ir->CreateLoad(get_type<u32>(), m_ir->CreateGEP(get_type<u8>(), m_lsptr, m_ir->CreateZExt(m_interp_pc, get_type<u64>())));
+		m_interp_pc = m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::pc));
+		m_interp_op = m_ir->CreateLoad(m_ir->CreateBitCast(m_ir->CreateGEP(m_lsptr, m_ir->CreateZExt(m_interp_pc, get_type<u64>())), get_type<u32*>()));
 		m_interp_op = m_ir->CreateCall(get_intrinsic<u32>(Intrinsic::bswap), {m_interp_op});
 
 		// Pinned constant, address of interpreter table
-		m_interp_table = m_ir->CreateGEP(m_function_table->getValueType(), m_function_table, {m_ir->getInt64(0), m_ir->getInt64(0)});
+		m_interp_table = m_ir->CreateBitCast(m_ir->CreateGEP(m_function_table, {m_ir->getInt64(0), m_ir->getInt64(0)}), get_type<u8*>());
 
 		// Pinned constant, mask for shifted register index
 		m_interp_7f0 = m_ir->getInt32(0x7f0);
@@ -2921,17 +5094,13 @@ public:
 		m_interp_regs = _ptr(m_thread, get_reg_offset(0));
 
 		// Save host thread's stack pointer
-		const auto native_sp = spu_ptr<u64>(&spu_thread::hv_ctx, &rpcs3::hypervisor_context_t::regs);
-#if defined(ARCH_X64)
+		const auto native_sp = spu_ptr<u64>(&spu_thread::saved_native_sp);
 		const auto rsp_name = MetadataAsValue::get(m_context, MDNode::get(m_context, {MDString::get(m_context, "rsp")}));
-#elif defined(ARCH_ARM64)
-		const auto rsp_name = MetadataAsValue::get(m_context, MDNode::get(m_context, {MDString::get(m_context, "sp")}));
-#endif
 		m_ir->CreateStore(m_ir->CreateCall(get_intrinsic<u64>(Intrinsic::read_register), {rsp_name}), native_sp);
 
 		// Decode (shift) and load function pointer
-		const auto first = m_ir->CreateLoad(m_ir->getPtrTy(), m_ir->CreateGEP(m_ir->getPtrTy(), m_interp_table, m_ir->CreateLShr(m_interp_op, 32u - m_interp_magn)));
-		const auto call0 = m_ir->CreateCall(if_type, first, {m_lsptr, m_thread, m_interp_pc, m_interp_op, m_interp_table, m_interp_7f0, m_interp_regs});
+		const auto first = m_ir->CreateLoad(m_ir->CreateGEP(m_ir->CreateBitCast(m_interp_table, if_pptr), m_ir->CreateLShr(m_interp_op, 32u - m_interp_magn)));
+		const auto call0 = m_ir->CreateCall({if_type, first}, {m_lsptr, m_thread, m_interp_pc, m_interp_op, m_interp_table, m_interp_7f0, m_interp_regs});
 		call0->setCallingConv(CallingConv::GHC);
 		m_ir->CreateRetVoid();
 
@@ -2968,10 +5137,10 @@ public:
 			const u32 op = i << (32u - m_interp_magn);
 
 			// Instruction type
-			const auto itype = g_spu_itype.decode(op);
+			const auto itype = s_spu_itype.decode(op);
 
 			// Function name
-			std::string fname = fmt::format("spu_%s", g_spu_iname.decode(op));
+			std::string fname = fmt::format("spu_%s", s_spu_iname.decode(op));
 
 			if (last_itype != itype)
 			{
@@ -2992,22 +5161,22 @@ public:
 			{
 				if (last_itype != itype)
 				{
-					ifuncs[static_cast<usz>(itype)] = f;
+					ifuncs[itype] = f;
 				}
 
 				f->setCallingConv(CallingConv::GHC);
 
 				m_function = f;
-				m_lsptr  = f->getArg(0);
-				m_thread = f->getArg(1);
-				m_interp_pc = f->getArg(2);
-				m_interp_op = f->getArg(3);
-				m_interp_table = f->getArg(4);
-				m_interp_7f0 = f->getArg(5);
-				m_interp_regs = f->getArg(6);
+				m_lsptr  = &*(f->arg_begin() + 0);
+				m_thread = &*(f->arg_begin() + 1);
+				m_interp_pc = &*(f->arg_begin() + 2);
+				m_interp_op = &*(f->arg_begin() + 3);
+				m_interp_table = &*(f->arg_begin() + 4);
+				m_interp_7f0 = &*(f->arg_begin() + 5);
+				m_interp_regs = &*(f->arg_begin() + 6);
 
 				m_ir->SetInsertPoint(BasicBlock::Create(m_context, "", f));
-				m_memptr = m_ir->CreateLoad(get_type<u8*>(), spu_ptr<u8*>(&spu_thread::memory_base_addr));
+				m_memptr = m_ir->CreateLoad(spu_ptr<u8*>(&spu_thread::memory_base_addr));
 
 				switch (itype)
 				{
@@ -3072,9 +5241,9 @@ public:
 
 						// Decode next instruction.
 						const auto next_pc = itype & spu_itype::branch ? m_interp_pc : m_interp_pc_next;
-						const auto be32_op = m_ir->CreateLoad(get_type<u32>(), m_ir->CreateGEP(get_type<u8>(), m_lsptr, m_ir->CreateZExt(next_pc, get_type<u64>())));
+						const auto be32_op = m_ir->CreateLoad(m_ir->CreateBitCast(m_ir->CreateGEP(m_lsptr, m_ir->CreateZExt(next_pc, get_type<u64>())), get_type<u32*>()));
 						const auto next_op = m_ir->CreateCall(get_intrinsic<u32>(Intrinsic::bswap), {be32_op});
-						const auto next_if = m_ir->CreateLoad(m_ir->getPtrTy(), m_ir->CreateGEP(m_ir->getPtrTy(), m_interp_table, m_ir->CreateLShr(next_op, 32u - m_interp_magn)));
+						const auto next_if = m_ir->CreateLoad(m_ir->CreateGEP(m_ir->CreateBitCast(m_interp_table, if_pptr), m_ir->CreateLShr(next_op, 32u - m_interp_magn)));
 						llvm::cast<LoadInst>(next_if)->setVolatile(true);
 
 						if (!(itype & spu_itype::branch))
@@ -3104,7 +5273,7 @@ public:
 							{
 								const auto _stop = BasicBlock::Create(m_context, "", f);
 								const auto _next = BasicBlock::Create(m_context, "", f);
-								m_ir->CreateCondBr(m_ir->CreateIsNotNull(m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::state))), _stop, _next, m_md_unlikely);
+								m_ir->CreateCondBr(m_ir->CreateIsNotNull(m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::state))), _stop, _next, m_md_unlikely);
 								m_ir->SetInsertPoint(_stop);
 								m_ir->CreateStore(m_interp_pc, spu_ptr<u32>(&spu_thread::pc));
 
@@ -3119,7 +5288,7 @@ public:
 								m_ir->SetInsertPoint(_next);
 							}
 
-							llvm::Value* fret = m_interp_table;
+							llvm::Value* fret = m_ir->CreateBitCast(m_interp_table, if_type->getPointerTo());
 
 							if (itype == spu_itype::WRCH ||
 								itype == spu_itype::RDCH ||
@@ -3140,16 +5309,12 @@ public:
 							else if (!(itype & spu_itype::branch))
 							{
 								// Hack: inline ret instruction before final jmp; this is not reliable.
-#ifdef ARCH_X64
 								m_ir->CreateCall(InlineAsm::get(get_ftype<void>(), "ret", "", true, false, InlineAsm::AD_Intel));
-#else
-								m_ir->CreateCall(InlineAsm::get(get_ftype<void>(), "ret", "", true, false));
-#endif
 								fret = ret_func;
 							}
 
 							const auto arg3 = UndefValue::get(get_type<u32>());
-							const auto _ret = m_ir->CreateCall(if_type, fret, {m_lsptr, m_thread, m_interp_pc, arg3, m_interp_table, m_interp_7f0, m_interp_regs});
+							const auto _ret = m_ir->CreateCall({if_type, fret}, {m_lsptr, m_thread, m_interp_pc, arg3, m_interp_table, m_interp_7f0, m_interp_regs});
 							_ret->setCallingConv(CallingConv::GHC);
 							_ret->setTailCall();
 							m_ir->CreateRetVoid();
@@ -3160,7 +5325,7 @@ public:
 							// Call next instruction.
 							const auto _stop = BasicBlock::Create(m_context, "", f);
 							const auto _next = BasicBlock::Create(m_context, "", f);
-							m_ir->CreateCondBr(m_ir->CreateIsNotNull(m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::state))), _stop, _next, m_md_unlikely);
+							m_ir->CreateCondBr(m_ir->CreateIsNotNull(m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::state))), _stop, _next, m_md_unlikely);
 							m_ir->SetInsertPoint(_next);
 
 							if (itype == spu_itype::WRCH ||
@@ -3173,13 +5338,12 @@ public:
 								m_interp_regs = _ptr(m_thread, get_reg_offset(0));
 							}
 
-							const auto ncall = m_ir->CreateCall(if_type, next_if, {m_lsptr, m_thread, m_interp_pc, next_op, m_interp_table, m_interp_7f0, m_interp_regs});
+							const auto ncall = m_ir->CreateCall({if_type, next_if}, {m_lsptr, m_thread, m_interp_pc, next_op, m_interp_table, m_interp_7f0, m_interp_regs});
 							ncall->setCallingConv(CallingConv::GHC);
 							ncall->setTailCall();
 							m_ir->CreateRetVoid();
 							m_ir->SetInsertPoint(_stop);
 							m_ir->CreateStore(m_interp_pc, spu_ptr<u32>(&spu_thread::pc));
-							call("spu_escape", spu_runtime::g_escape, m_thread)->setTailCall();
 							m_ir->CreateRetVoid();
 						}
 					}
@@ -3199,20 +5363,26 @@ public:
 			}
 		}
 
-		m_function_table->setInitializer(ConstantArray::get(ArrayType::get(m_ir->getPtrTy(), 1ull << m_interp_magn), iptrs));
+		m_function_table->setInitializer(ConstantArray::get(ArrayType::get(if_type->getPointerTo(), 1ull << m_interp_magn), iptrs));
 		m_function_table = nullptr;
 
-		for (auto& f : *_module)
-		{
-			run_transforms(f);
-		}
+		// Initialize pass manager
+		legacy::FunctionPassManager pm(_module.get());
 
-		std::string llvm_log;
-		raw_string_ostream out(llvm_log);
+		// Basic optimizations
+		pm.add(createEarlyCSEPass());
+		pm.add(createCFGSimplificationPass());
+		pm.add(createDeadStoreEliminationPass());
+		pm.add(createAggressiveDCEPass());
+		//pm.add(createLintPass());
+
+		std::string log;
+
+		raw_string_ostream out(log);
 
 		if (g_cfg.core.spu_debug)
 		{
-			fmt::append(llvm_log, "LLVM IR (interpreter):\n");
+			fmt::append(log, "LLVM IR (interpreter):\n");
 			out << *_module; // print IR
 			out << "\n\n";
 		}
@@ -3220,11 +5390,11 @@ public:
 		if (verifyModule(*_module, &out))
 		{
 			out.flush();
-			spu_log.error("LLVM: Verification failed:\n%s", llvm_log);
+			spu_log.error("LLVM: Verification failed:\n%s", log);
 
 			if (g_cfg.core.spu_debug)
 			{
-				fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::create + fs::write + fs::append, llvm_log);
+				fs::file(m_spurt->get_cache_path() + "spu-ir.log", fs::write + fs::append).write(log);
 			}
 
 			fmt::throw_exception("Compilation failed");
@@ -3259,7 +5429,7 @@ public:
 		if (g_cfg.core.spu_debug)
 		{
 			out.flush();
-			fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::create + fs::write + fs::append, llvm_log);
+			fs::file(m_spurt->get_cache_path() + "spu-ir.log", fs::write + fs::append).write(log);
 		}
 
 		return spu_runtime::g_interpreter;
@@ -3270,7 +5440,7 @@ public:
 		return _spu->check_state();
 	}
 
-	template <spu_intrp_func_t F>
+	template <spu_inter_func_t F>
 	static void exec_fall(spu_thread* _spu, spu_opcode_t op)
 	{
 		if (F(*_spu, op))
@@ -3279,10 +5449,10 @@ public:
 		}
 	}
 
-	template <spu_intrp_func_t F>
+	template <spu_inter_func_t F>
 	void fall(spu_opcode_t op)
 	{
-		std::string name = fmt::format("spu_%s", g_spu_iname.decode(op.opcode));
+		std::string name = fmt::format("spu_%s", s_spu_iname.decode(op.opcode));
 
 		if (m_interp_magn)
 		{
@@ -3315,7 +5485,7 @@ public:
 
 	static void exec_stop(spu_thread* _spu, u32 code)
 	{
-		if (!_spu->stop_and_signal(code) || _spu->state & cpu_flag::again)
+		if (!_spu->stop_and_signal(code))
 		{
 			spu_runtime::g_escape(_spu);
 		}
@@ -3336,7 +5506,6 @@ public:
 		}
 
 		update_pc();
-		ensure_gpr_stores();
 		call("spu_syscall", &exec_stop, m_thread, m_ir->getInt32(op.opcode & 0x3fff));
 
 		if (g_cfg.core.spu_block_size == spu_block_size_type::safe)
@@ -3363,12 +5532,17 @@ public:
 	{
 		const s64 result = _spu->get_ch_value(ch);
 
-		if (result < 0 || _spu->state & cpu_flag::again)
+		if (result < 0)
 		{
 			spu_runtime::g_escape(_spu);
 		}
 
-		static_cast<void>(_spu->test_stopped());
+		if (_spu->test_stopped())
+		{
+			_spu->pc += 4;
+			spu_runtime::g_escape(_spu);
+		}
+
 		return static_cast<u32>(result & 0xffffffff);
 	}
 
@@ -3380,13 +5554,18 @@ public:
 
 	static u32 exec_read_dec(spu_thread* _spu)
 	{
-		const u32 res = _spu->read_dec().first;
+		const u32 res = _spu->ch_dec_value - static_cast<u32>(get_timebased_time() - _spu->ch_dec_start_timestamp);
 
 		if (res > 1500 && g_cfg.core.spu_loop_detection)
 		{
 			_spu->state += cpu_flag::wait;
 			std::this_thread::yield();
-			static_cast<void>(_spu->test_stopped());
+
+			if (_spu->test_stopped())
+			{
+				_spu->pc += 4;
+				spu_runtime::g_escape(_spu);
+			}
 		}
 
 		return res;
@@ -3398,16 +5577,6 @@ public:
 		return exec_rdch(_spu, SPU_RdEventStat);
 	}
 
-	void ensure_gpr_stores()
-	{
-		if (m_block)
-		{
-			// Make previous stores not able to be reordered beyond this point or be deleted
-			std::for_each(m_block->store_context_ctr.begin(), m_block->store_context_ctr.end(), FN(x++));
-			m_block->has_gpr_memory_barriers = true;
-		}
-	}
-
 	llvm::Value* get_rdch(spu_opcode_t op, u32 off, bool atomic)
 	{
 		const auto ptr = _ptr<u64>(m_thread, off);
@@ -3415,14 +5584,13 @@ public:
 
 		if (atomic)
 		{
-			const auto val = m_ir->CreateAtomicRMW(llvm::AtomicRMWInst::Xchg, ptr, m_ir->getInt64(0), llvm::MaybeAlign{8}, llvm::AtomicOrdering::Acquire);
+			const auto val = m_ir->CreateAtomicRMW(llvm::AtomicRMWInst::Xchg, ptr, m_ir->getInt64(0), llvm::AtomicOrdering::Acquire);
 			val0 = val;
 		}
 		else
 		{
-			const auto val = m_ir->CreateLoad(get_type<u64>(), ptr);
-			val->setAtomic(llvm::AtomicOrdering::Acquire);
-			m_ir->CreateStore(m_ir->getInt64(0), ptr)->setAtomic(llvm::AtomicOrdering::Release);
+			const auto val = m_ir->CreateLoad(ptr, true);
+			m_ir->CreateStore(m_ir->getInt64(0), ptr, true);
 			val0 = val;
 		}
 
@@ -3433,7 +5601,6 @@ public:
 		val0 = m_ir->CreateTrunc(val0, get_type<u32>());
 		m_ir->CreateCondBr(cond, done, wait);
 		m_ir->SetInsertPoint(wait);
-		update_pc();
 		const auto val1 = call("spu_read_channel", &exec_rdch, m_thread, m_ir->getInt32(op.ra));
 		m_ir->CreateBr(done);
 		m_ir->SetInsertPoint(done);
@@ -3458,13 +5625,12 @@ public:
 		{
 		case SPU_RdSRR0:
 		{
-			res.value = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::srr0));
+			res.value = m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::srr0));
 			break;
 		}
 		case SPU_RdInMbox:
 		{
 			update_pc();
-			ensure_gpr_stores();
 			res.value = call("spu_read_in_mbox", &exec_read_in_mbox, m_thread);
 			break;
 		}
@@ -3475,20 +5641,16 @@ public:
 		}
 		case MFC_RdTagMask:
 		{
-			res.value = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::ch_tag_mask));
+			res.value = m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::ch_tag_mask));
 			break;
 		}
 		case SPU_RdSigNotify1:
 		{
-			update_pc();
-			ensure_gpr_stores();
 			res.value = get_rdch(op, ::offset32(&spu_thread::ch_snr1), true);
 			break;
 		}
 		case SPU_RdSigNotify2:
 		{
-			update_pc();
-			ensure_gpr_stores();
 			res.value = get_rdch(op, ::offset32(&spu_thread::ch_snr2), true);
 			break;
 		}
@@ -3504,68 +5666,30 @@ public:
 		}
 		case SPU_RdDec:
 		{
-#if defined(ARCH_X64)
-			if (utils::get_tsc_freq() && !(g_cfg.core.spu_loop_detection) && (g_cfg.core.clocks_scale == 100))
-			{
-				const auto timebase_offs = m_ir->CreateLoad(get_type<u64>(), m_ir->CreateIntToPtr(m_ir->getInt64(reinterpret_cast<u64>(&g_timebase_offs)), get_type<u64*>()));
-				const auto timestamp = m_ir->CreateLoad(get_type<u64>(), spu_ptr<u64>(&spu_thread::ch_dec_start_timestamp));
-				const auto dec_value = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::ch_dec_value));
-				const auto tsc = m_ir->CreateCall(get_intrinsic(llvm::Intrinsic::x86_rdtsc));
-				const auto tscx = m_ir->CreateMul(m_ir->CreateUDiv(tsc, m_ir->getInt64(utils::get_tsc_freq())), m_ir->getInt64(80000000));
-				const auto tscm = m_ir->CreateUDiv(m_ir->CreateMul(m_ir->CreateURem(tsc, m_ir->getInt64(utils::get_tsc_freq())), m_ir->getInt64(80000000)), m_ir->getInt64(utils::get_tsc_freq()));
-				const auto tsctb = m_ir->CreateSub(m_ir->CreateAdd(tscx, tscm), timebase_offs);
-				const auto frz = m_ir->CreateLoad(get_type<u8>(), spu_ptr<u8>(&spu_thread::is_dec_frozen));
-				const auto frzev = m_ir->CreateICmpEQ(frz, m_ir->getInt8(0));
-
-				const auto delta = m_ir->CreateTrunc(m_ir->CreateSub(tsctb, timestamp), get_type<u32>());
-				const auto deltax = m_ir->CreateSelect(frzev, delta, m_ir->getInt32(0));
-				res.value = m_ir->CreateSub(dec_value, deltax);
-				break;
-			}
-#endif
 			res.value = call("spu_read_decrementer", &exec_read_dec, m_thread);
 			break;
 		}
 		case SPU_RdEventMask:
 		{
-			const auto value = m_ir->CreateLoad(get_type<u64>(), spu_ptr<u64>(&spu_thread::ch_events));
-			value->setAtomic(llvm::AtomicOrdering::Acquire);
-			res.value = m_ir->CreateTrunc(m_ir->CreateLShr(value, 32), get_type<u32>());
+			res.value = m_ir->CreateTrunc(m_ir->CreateLShr(m_ir->CreateLoad(spu_ptr<u64>(&spu_thread::ch_events), true), 32), get_type<u32>());
 			break;
 		}
 		case SPU_RdEventStat:
 		{
 			update_pc();
-
-			if (g_cfg.savestate.compatible_mode)
-			{
-				ensure_gpr_stores();
-			}
-			else
-			{
-				m_ir->CreateStore(m_ir->getInt8(1), spu_ptr<u8>(&spu_thread::unsavable));
-			}
-
 			res.value = call("spu_read_events", &exec_read_events, m_thread);
-
-			if (!g_cfg.savestate.compatible_mode)
-			{
-				m_ir->CreateStore(m_ir->getInt8(0), spu_ptr<u8>(&spu_thread::unsavable));
-			}
-
 			break;
 		}
 		case SPU_RdMachStat:
 		{
-			res.value = m_ir->CreateZExt(m_ir->CreateLoad(get_type<u8>(), spu_ptr<u8>(&spu_thread::interrupts_enabled)), get_type<u32>());
-			res.value = m_ir->CreateOr(res.value, m_ir->CreateAnd(m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::thread_type)), m_ir->getInt32(2)));
+			res.value = m_ir->CreateZExt(m_ir->CreateLoad(spu_ptr<u8>(&spu_thread::interrupts_enabled)), get_type<u32>());
+			res.value = m_ir->CreateOr(res.value, m_ir->CreateAnd(m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::thread_type)), m_ir->getInt32(2)));
 			break;
 		}
 
 		default:
 		{
 			update_pc();
-			ensure_gpr_stores();
 			res.value = call("spu_read_channel", &exec_rdch, m_thread, m_ir->getInt32(op.ra));
 			break;
 		}
@@ -3586,34 +5710,14 @@ public:
 
 	llvm::Value* get_rchcnt(u32 off, u64 inv = 0)
 	{
-		const auto val = m_ir->CreateLoad(get_type<u64>(), _ptr<u64>(m_thread, off));
-		val->setAtomic(llvm::AtomicOrdering::Acquire);
+		const auto val = m_ir->CreateLoad(_ptr<u64>(m_thread, off), true);
 		const auto shv = m_ir->CreateLShr(val, spu_channel::off_count);
-		return m_ir->CreateTrunc(m_ir->CreateXor(shv, inv), get_type<u32>());
-	}
-
-	llvm::Value* wait_rchcnt(u32 off, u32 inv = 0)
-	{
-		auto wait_on_channel = [](spu_thread* _spu, spu_channel* ch, u32 is_read) -> u32
-		{
-			if (is_read)
-			{
-				ch->pop_wait(*_spu, false);
-			}
-			else
-			{
-				ch->push_wait(*_spu, 0, false);
-			}
-
-			return ch->get_count();
-		};
-
-		return m_ir->CreateXor(call("wait_on_spu_channel", +wait_on_channel, m_thread, _ptr<u64>(m_thread, off), m_ir->getInt32(inv == 0u)), m_ir->getInt32(inv));
+		return m_ir->CreateTrunc(m_ir->CreateXor(shv, u64{inv}), get_type<u32>());
 	}
 
 	void RCHCNT(spu_opcode_t op) //
 	{
-		value_t<u32> res{};
+		value_t<u32> res;
 
 		if (m_interp_magn)
 		{
@@ -3622,84 +5726,6 @@ public:
 			return;
 		}
 
-		switch (op.ra)
-		{
-		case SPU_WrOutMbox:
-		case SPU_WrOutIntrMbox:
-		case SPU_RdSigNotify1:
-		case SPU_RdSigNotify2:
-		case SPU_RdInMbox:
-		case SPU_RdEventStat:
-		{
-			bool loop_is_likely = op.ra == SPU_RdSigNotify1 || op.ra == SPU_RdSigNotify2;
-
-			for (u32 block_start : m_block->bb->preds)
-			{
-				if (block_start >= m_pos)
-				{
-					loop_is_likely = true;
-					break;
-				}
-			}
-
-			if (loop_is_likely || g_cfg.savestate.compatible_mode)
-			{
-				ensure_gpr_stores();
-				check_state(m_pos, false);
-			}
-
-			break;
-		}
-		default:
-		{
-			break;
-		}
-		}
-
-		if (m_inst_attrs[(m_pos - m_base) / 4] == inst_attr::rchcnt_loop)
-		{
-			switch (op.ra)
-			{
-			case SPU_WrOutMbox:
-			{
-				res.value = wait_rchcnt(::offset32(&spu_thread::ch_out_mbox), true);
-				break;
-			}
-			case SPU_WrOutIntrMbox:
-			{
-				res.value = wait_rchcnt(::offset32(&spu_thread::ch_out_intr_mbox), true);
-				break;
-			}
-			case SPU_RdSigNotify1:
-			{
-				res.value = wait_rchcnt(::offset32(&spu_thread::ch_snr1));
-				break;
-			}
-			case SPU_RdSigNotify2:
-			{
-				res.value = wait_rchcnt(::offset32(&spu_thread::ch_snr2));
-				break;
-			}
-			case SPU_RdInMbox:
-			{
-				auto wait_inbox = [](spu_thread* _spu, spu_channel_4_t* ch) -> u32
-				{
-					return ch->pop_wait(*_spu, false), ch->get_count();
-				};
-
-				res.value = call("wait_spu_inbox", +wait_inbox, m_thread, spu_ptr<void*>(&spu_thread::ch_in_mbox));
-				break;
-			}
-			default: break;
-			}
-
-			if (res.value)
-			{
-				set_vr(op.rt, insert(splat<u32[4]>(0), 3, res));
-				return;
-			}
-		}
-
 		switch (op.ra)
 		{
 		case SPU_WrOutMbox:
@@ -3744,22 +5770,20 @@ public:
 		}
 		case MFC_Cmd:
 		{
-			res.value = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::mfc_size));
+			res.value = m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::mfc_size), true);
 			res.value = m_ir->CreateSub(m_ir->getInt32(16), res.value);
 			break;
 		}
 		case SPU_RdInMbox:
 		{
-			const auto value = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::ch_in_mbox));
-			value->setAtomic(llvm::AtomicOrdering::Acquire);
-			res.value = value;
+			res.value = m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::ch_in_mbox), true);
 			res.value = m_ir->CreateLShr(res.value, 8);
 			res.value = m_ir->CreateAnd(res.value, 7);
 			break;
 		}
 		case SPU_RdEventStat:
 		{
-			const auto mask = m_ir->CreateTrunc(m_ir->CreateLShr(m_ir->CreateLoad(get_type<u64>(), spu_ptr<u64>(&spu_thread::ch_events)), 32), get_type<u32>());
+			const auto mask = m_ir->CreateTrunc(m_ir->CreateLShr(m_ir->CreateLoad(spu_ptr<u64>(&spu_thread::ch_events), true), 32), get_type<u32>());
 			res.value = call("spu_get_events", &exec_get_events, m_thread, mask);
 			break;
 		}
@@ -3801,12 +5825,16 @@ public:
 
 	static void exec_wrch(spu_thread* _spu, u32 ch, u32 value)
 	{
-		if (!_spu->set_ch_value(ch, value) || _spu->state & cpu_flag::again)
+		if (!_spu->set_ch_value(ch, value))
 		{
 			spu_runtime::g_escape(_spu);
 		}
 
-		static_cast<void>(_spu->test_stopped());
+		if (_spu->test_stopped())
+		{
+			_spu->pc += 4;
+			spu_runtime::g_escape(_spu);
+		}
 	}
 
 	static void exec_list_unstall(spu_thread* _spu, u32 tag)
@@ -3822,24 +5850,17 @@ public:
 		_spu->do_mfc();
 	}
 
-	template <bool Saveable>
 	static void exec_mfc_cmd(spu_thread* _spu)
 	{
-		if constexpr (!Saveable)
+		if (!_spu->process_mfc_cmd())
 		{
-			_spu->unsavable = true;
+			spu_runtime::g_escape(_spu);
 		}
 
-		if (!_spu->process_mfc_cmd() || _spu->state & cpu_flag::again)
+		if (_spu->test_stopped())
 		{
-			fmt::throw_exception("exec_mfc_cmd(): Should not abort!");
-		}
-
-		static_cast<void>(_spu->test_stopped());
-
-		if constexpr (!Saveable)
-		{
-			_spu->unsavable = false;
+			_spu->pc += 4;
+			spu_runtime::g_escape(_spu);
 		}
 	}
 
@@ -3876,7 +5897,7 @@ public:
 			m_ir->CreateStore(val.value, spu_ptr<u32>(&spu_thread::ch_tag_mask));
 			const auto next = llvm::BasicBlock::Create(m_context, "", m_function);
 			const auto _mfc = llvm::BasicBlock::Create(m_context, "", m_function);
-			m_ir->CreateCondBr(m_ir->CreateICmpNE(m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::ch_tag_upd)), m_ir->getInt32(MFC_TAG_UPDATE_IMMEDIATE)), _mfc, next);
+			m_ir->CreateCondBr(m_ir->CreateICmpNE(m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::ch_tag_upd)), m_ir->getInt32(MFC_TAG_UPDATE_IMMEDIATE)), _mfc, next);
 			m_ir->SetInsertPoint(_mfc);
 			update_pc();
 			call("spu_write_channel", &exec_wrch, m_thread, m_ir->getInt32(op.ra), val.value);
@@ -3888,8 +5909,8 @@ public:
 		{
 			if (true)
 			{
-				const auto tag_mask  = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::ch_tag_mask));
-				const auto mfc_fence = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::mfc_fence));
+				const auto tag_mask  = m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::ch_tag_mask));
+				const auto mfc_fence = m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::mfc_fence));
 				const auto completed = m_ir->CreateAnd(tag_mask, m_ir->CreateNot(mfc_fence));
 				const auto upd_ptr   = spu_ptr<u32>(&spu_thread::ch_tag_upd);
 				const auto stat_ptr  = spu_ptr<u64>(&spu_thread::ch_tag_stat);
@@ -3913,7 +5934,7 @@ public:
 				// Illegal update, access violate with special address
 				m_ir->SetInsertPoint(fail);
 				const auto ptr = _ptr<u32>(m_memptr, 0xffdead04);
-				m_ir->CreateStore(m_ir->getInt32("TAG\0"_u32), ptr);
+				m_ir->CreateStore(m_ir->getInt32("TAG\0"_u32), ptr, true);
 				m_ir->CreateBr(next);
 
 				m_ir->SetInsertPoint(any);
@@ -3926,8 +5947,8 @@ public:
 				m_ir->CreateStore(stat_val, stat_ptr);
 				m_ir->CreateBr(next);
 				m_ir->SetInsertPoint(next);
+				return;
 			}
-			return;
 		}
 		case MFC_LSA:
 		{
@@ -3955,7 +5976,7 @@ public:
 		}
 		case MFC_Size:
 		{
-			set_reg_fixed(s_reg_mfc_size, trunc<u16>(val).eval(m_ir));
+			set_reg_fixed(s_reg_mfc_size, trunc<u16>(val & 0x7fff).eval(m_ir));
 			return;
 		}
 		case MFC_TagID:
@@ -3966,26 +5987,24 @@ public:
 		case MFC_Cmd:
 		{
 			// Prevent store elimination (TODO)
-			m_block->store_context_ctr[s_reg_mfc_eal]++;
-			m_block->store_context_ctr[s_reg_mfc_lsa]++;
-			m_block->store_context_ctr[s_reg_mfc_tag]++;
-			m_block->store_context_ctr[s_reg_mfc_size]++;
+			m_block->store[s_reg_mfc_eal] = nullptr;
+			m_block->store[s_reg_mfc_lsa] = nullptr;
+			m_block->store[s_reg_mfc_tag] = nullptr;
+			m_block->store[s_reg_mfc_size] = nullptr;
 
 			if (auto ci = llvm::dyn_cast<llvm::ConstantInt>(trunc<u8>(val).eval(m_ir)))
 			{
-				if (g_cfg.core.mfc_debug)
+				if (g_cfg.core.spu_accurate_dma)
 				{
 					break;
 				}
 
-				bool must_use_cpp_functions = !!g_cfg.core.spu_accurate_dma;
-
-				if (u64 cmdh = ci->getZExtValue() & ~(MFC_BARRIER_MASK | MFC_FENCE_MASK | MFC_RESULT_MASK); g_cfg.core.rsx_fifo_accuracy || g_cfg.video.strict_rendering_mode || !g_use_rtm)
+				if (u64 cmdh = ci->getZExtValue() & ~(MFC_BARRIER_MASK | MFC_FENCE_MASK | MFC_RESULT_MASK); !g_use_rtm)
 				{
 					// TODO: don't require TSX (current implementation is TSX-only)
 					if (cmdh == MFC_PUT_CMD || cmdh == MFC_SNDSIG_CMD)
 					{
-						must_use_cpp_functions = true;
+						break;
 					}
 				}
 
@@ -4009,6 +6028,10 @@ public:
 				{
 					return;
 				}
+				case MFC_GETLLAR_CMD:
+				case MFC_PUTLLC_CMD:
+				case MFC_PUTLLUC_CMD:
+				case MFC_PUTQLLUC_CMD:
 				case MFC_PUTL_CMD:
 				case MFC_PUTLB_CMD:
 				case MFC_PUTLF_CMD:
@@ -4018,24 +6041,7 @@ public:
 				case MFC_GETL_CMD:
 				case MFC_GETLB_CMD:
 				case MFC_GETLF_CMD:
-				{
-					m_ir->CreateBr(next);
-					m_ir->SetInsertPoint(exec);
-					m_ir->CreateUnreachable();
-					m_ir->SetInsertPoint(fail);
-					m_ir->CreateUnreachable();
-					m_ir->SetInsertPoint(next);
-					m_ir->CreateStore(ci, spu_ptr<u8>(&spu_thread::ch_mfc_cmd, &spu_mfc_cmd::cmd));
-					update_pc();
-					ensure_gpr_stores();
-					call("spu_exec_mfc_cmd_saveable", &exec_mfc_cmd<true>, m_thread);
-					return;
-				}
 				case MFC_SDCRZ_CMD:
-				case MFC_GETLLAR_CMD:
-				case MFC_PUTLLC_CMD:
-				case MFC_PUTLLUC_CMD:
-				case MFC_PUTQLLUC_CMD:
 				{
 					// TODO
 					m_ir->CreateBr(next);
@@ -4046,7 +6052,7 @@ public:
 					m_ir->SetInsertPoint(next);
 					m_ir->CreateStore(ci, spu_ptr<u8>(&spu_thread::ch_mfc_cmd, &spu_mfc_cmd::cmd));
 					update_pc();
-					call("spu_exec_mfc_cmd", &exec_mfc_cmd<false>, m_thread);
+					call("spu_exec_mfc_cmd", &exec_mfc_cmd, m_thread);
 					return;
 				}
 				case MFC_SNDSIG_CMD:
@@ -4075,41 +6081,37 @@ public:
 						csize = -1;
 					}
 
-					llvm::Value* src = m_ir->CreateGEP(get_type<u8>(), m_lsptr, zext<u64>(lsa).eval(m_ir));
-					llvm::Value* dst = m_ir->CreateGEP(get_type<u8>(), m_memptr, zext<u64>(eal).eval(m_ir));
+					llvm::Value* src = m_ir->CreateGEP(m_lsptr, zext<u64>(lsa).eval(m_ir));
+					llvm::Value* dst = m_ir->CreateGEP(m_memptr, zext<u64>(eal).eval(m_ir));
 
 					if (cmd & MFC_GET_CMD)
 					{
 						std::swap(src, dst);
 					}
 
-					llvm::Value* barrier = m_ir->CreateLoad(get_type<u32>(), pb);
+					llvm::Value* barrier = m_ir->CreateLoad(pb);
 
 					if (cmd & (MFC_BARRIER_MASK | MFC_FENCE_MASK))
 					{
-						barrier = m_ir->CreateOr(barrier, m_ir->CreateLoad(get_type<u32>(), pf));
+						barrier = m_ir->CreateOr(barrier, m_ir->CreateLoad(pf));
 					}
 
 					const auto cond = m_ir->CreateIsNull(m_ir->CreateAnd(mask, barrier));
 					m_ir->CreateCondBr(cond, exec, fail, m_md_likely);
 					m_ir->SetInsertPoint(exec);
 
+					const auto mmio = llvm::BasicBlock::Create(m_context, "", m_function);
 					const auto copy = llvm::BasicBlock::Create(m_context, "", m_function);
 
 					// Always use interpreter function for MFC debug option
-					if (!must_use_cpp_functions)
-					{
-						const auto mmio = llvm::BasicBlock::Create(m_context, "", m_function);
-						m_ir->CreateCondBr(m_ir->CreateICmpUGE(eal.value, m_ir->getInt32(0xe0000000)), mmio, copy, m_md_unlikely);
-						m_ir->SetInsertPoint(mmio);
-					}
-
+					m_ir->CreateCondBr(m_ir->CreateICmpUGE(eal.value, m_ir->getInt32(g_cfg.core.mfc_debug ? 0 : 0xe0000000)), mmio, copy, m_md_unlikely);
+					m_ir->SetInsertPoint(mmio);
 					m_ir->CreateStore(ci, spu_ptr<u8>(&spu_thread::ch_mfc_cmd, &spu_mfc_cmd::cmd));
-					call("spu_exec_mfc_cmd", &exec_mfc_cmd<false>, m_thread);
+					call("spu_exec_mfc_cmd", &exec_mfc_cmd, m_thread);
 					m_ir->CreateBr(next);
 					m_ir->SetInsertPoint(copy);
 
-					llvm::Type* vtype = get_type<u8[16]>();
+					llvm::Type* vtype = get_type<u8(*)[16]>();
 
 					switch (csize)
 					{
@@ -4120,22 +6122,22 @@ public:
 					}
 					case 1:
 					{
-						vtype = get_type<u8>();
+						vtype = get_type<u8*>();
 						break;
 					}
 					case 2:
 					{
-						vtype = get_type<u16>();
+						vtype = get_type<u16*>();
 						break;
 					}
 					case 4:
 					{
-						vtype = get_type<u32>();
+						vtype = get_type<u32*>();
 						break;
 					}
 					case 8:
 					{
-						vtype = get_type<u64>();
+						vtype = get_type<u64*>();
 						break;
 					}
 					default:
@@ -4147,42 +6149,19 @@ public:
 					}
 					}
 
-					// Check if the LS address is constant and 256 bit aligned
-					u64 clsa = umax;
-
-					if (auto ci = llvm::dyn_cast<llvm::ConstantInt>(lsa.value))
-					{
-						clsa = ci->getZExtValue();
-					}
-
-					u32 stride = 16;
-
-					if (m_use_avx && csize >= 32 && !(clsa % 32))
-					{
-						vtype = get_type<u8[32]>();
-						stride = 32;
-					}
-
 					if (csize > 0 && csize <= 16)
 					{
 						// Generate single copy operation
-						m_ir->CreateStore(m_ir->CreateLoad(vtype, src), dst);
+						m_ir->CreateStore(m_ir->CreateLoad(m_ir->CreateBitCast(src, vtype), true), m_ir->CreateBitCast(dst, vtype), true);
 					}
-					else if (csize <= stride * 16 && !(csize % 32))
+					else if (csize <= 256)
 					{
 						// Generate fixed sequence of copy operations
-						for (u32 i = 0; i < csize; i += stride)
+						for (u32 i = 0; i < csize; i += 16)
 						{
-							const auto _src = m_ir->CreateGEP(get_type<u8>(), src, m_ir->getInt32(i));
-							const auto _dst = m_ir->CreateGEP(get_type<u8>(), dst, m_ir->getInt32(i));
-							if (csize - i < stride)
-							{
-								m_ir->CreateStore(m_ir->CreateLoad(get_type<u8[16]>(), _src), _dst);
-							}
-							else
-							{
-								m_ir->CreateAlignedStore(m_ir->CreateAlignedLoad(vtype, _src, llvm::MaybeAlign{16}), _dst, llvm::MaybeAlign{16});
-							}
+							const auto _src = m_ir->CreateGEP(src, m_ir->getInt32(i));
+							const auto _dst = m_ir->CreateGEP(dst, m_ir->getInt32(i));
+							m_ir->CreateStore(m_ir->CreateLoad(m_ir->CreateBitCast(_src, vtype), true), m_ir->CreateBitCast(_dst, vtype), true);
 						}
 					}
 					else if (csize)
@@ -4204,7 +6183,7 @@ public:
 				case MFC_EIEIO_CMD:
 				case MFC_SYNC_CMD:
 				{
-					const auto cond = m_ir->CreateIsNull(m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::mfc_size)));
+					const auto cond = m_ir->CreateIsNull(m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::mfc_size)));
 					m_ir->CreateCondBr(cond, exec, fail, m_md_likely);
 					m_ir->SetInsertPoint(exec);
 					m_ir->CreateFence(llvm::AtomicOrdering::SequentiallyConsistent);
@@ -4226,10 +6205,10 @@ public:
 				m_ir->SetInsertPoint(fail);
 
 				// Get MFC slot, redirect to invalid memory address
-				const auto slot = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::mfc_size));
+				const auto slot = m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::mfc_size));
 				const auto off0 = m_ir->CreateAdd(m_ir->CreateMul(slot, m_ir->getInt32(sizeof(spu_mfc_cmd))), m_ir->getInt32(::offset32(&spu_thread::mfc_queue)));
-				const auto ptr0 = m_ir->CreateGEP(get_type<u8>(), m_thread, m_ir->CreateZExt(off0, get_type<u64>()));
-				const auto ptr1 = m_ir->CreateGEP(get_type<u8>(), m_memptr, m_ir->getInt64(0xffdeadf0));
+				const auto ptr0 = m_ir->CreateGEP(m_thread, m_ir->CreateZExt(off0, get_type<u64>()));
+				const auto ptr1 = m_ir->CreateGEP(m_memptr, m_ir->getInt64(0xffdeadf0));
 				const auto pmfc = m_ir->CreateSelect(m_ir->CreateICmpULT(slot, m_ir->getInt32(16)), ptr0, ptr1);
 				m_ir->CreateStore(ci, _ptr<u8>(pmfc, ::offset32(&spu_mfc_cmd::cmd)));
 
@@ -4275,9 +6254,9 @@ public:
 					m_ir->CreateStore(size.value, _ptr<u16>(pmfc, ::offset32(&spu_mfc_cmd::size)));
 					m_ir->CreateStore(lsa.value, _ptr<u32>(pmfc, ::offset32(&spu_mfc_cmd::lsa)));
 					m_ir->CreateStore(eal.value, _ptr<u32>(pmfc, ::offset32(&spu_mfc_cmd::eal)));
-					m_ir->CreateStore(m_ir->CreateOr(m_ir->CreateLoad(get_type<u32>(), pf), mask), pf);
+					m_ir->CreateStore(m_ir->CreateOr(m_ir->CreateLoad(pf), mask), pf);
 					if (cmd & MFC_BARRIER_MASK)
-						m_ir->CreateStore(m_ir->CreateOr(m_ir->CreateLoad(get_type<u32>(), pb), mask), pb);
+						m_ir->CreateStore(m_ir->CreateOr(m_ir->CreateLoad(pb), mask), pb);
 					break;
 				}
 				case MFC_BARRIER_CMD:
@@ -4285,7 +6264,7 @@ public:
 				case MFC_SYNC_CMD:
 				{
 					m_ir->CreateStore(m_ir->getInt32(-1), pb);
-					m_ir->CreateStore(m_ir->CreateOr(m_ir->CreateLoad(get_type<u32>(), pf), mask), pf);
+					m_ir->CreateStore(m_ir->CreateOr(m_ir->CreateLoad(pf), mask), pf);
 					break;
 				}
 				default:
@@ -4309,14 +6288,13 @@ public:
 		{
 			const auto mask = eval(splat<u32>(1) << (val & 0x1f));
 			const auto _ptr = spu_ptr<u32>(&spu_thread::ch_stall_mask);
-			const auto _old = m_ir->CreateLoad(get_type<u32>(), _ptr);
+			const auto _old = m_ir->CreateLoad(_ptr);
 			const auto _new = m_ir->CreateAnd(_old, m_ir->CreateNot(mask.value));
 			m_ir->CreateStore(_new, _ptr);
 			const auto next = llvm::BasicBlock::Create(m_context, "", m_function);
 			const auto _mfc = llvm::BasicBlock::Create(m_context, "", m_function);
 			m_ir->CreateCondBr(m_ir->CreateICmpNE(_old, _new), _mfc, next);
 			m_ir->SetInsertPoint(_mfc);
-			ensure_gpr_stores();
 			update_pc();
 			call("spu_list_unstall", &exec_list_unstall, m_thread, eval(val & 0x1f).value);
 			m_ir->CreateBr(next);
@@ -4326,25 +6304,8 @@ public:
 		case SPU_WrDec:
 		{
 			call("spu_get_events", &exec_get_events, m_thread, m_ir->getInt32(SPU_EVENT_TM));
-
-#if defined(ARCH_X64)
-			if (utils::get_tsc_freq() && !(g_cfg.core.spu_loop_detection) && (g_cfg.core.clocks_scale == 100))
-			{
-				const auto timebase_offs = m_ir->CreateLoad(get_type<u64>(), m_ir->CreateIntToPtr(m_ir->getInt64(reinterpret_cast<u64>(&g_timebase_offs)), get_type<u64*>()));
-				const auto tsc = m_ir->CreateCall(get_intrinsic(llvm::Intrinsic::x86_rdtsc));
-				const auto tscx = m_ir->CreateMul(m_ir->CreateUDiv(tsc, m_ir->getInt64(utils::get_tsc_freq())), m_ir->getInt64(80000000));
-				const auto tscm = m_ir->CreateUDiv(m_ir->CreateMul(m_ir->CreateURem(tsc, m_ir->getInt64(utils::get_tsc_freq())), m_ir->getInt64(80000000)), m_ir->getInt64(utils::get_tsc_freq()));
-				const auto tsctb = m_ir->CreateSub(m_ir->CreateAdd(tscx, tscm), timebase_offs);
-				m_ir->CreateStore(tsctb, spu_ptr<u64>(&spu_thread::ch_dec_start_timestamp));
-			}
-			else
-#endif
-			{
-				m_ir->CreateStore(call("get_timebased_time", &get_timebased_time), spu_ptr<u64>(&spu_thread::ch_dec_start_timestamp));
-			}
-
+			m_ir->CreateStore(call("get_timebased_time", &get_timebased_time), spu_ptr<u64>(&spu_thread::ch_dec_start_timestamp));
 			m_ir->CreateStore(val.value, spu_ptr<u32>(&spu_thread::ch_dec_value));
-			m_ir->CreateStore(m_ir->getInt8(0), spu_ptr<u8>(&spu_thread::is_dec_frozen));
 			return;
 		}
 		case SPU_Set_Bkmk_Tag:
@@ -4357,7 +6318,6 @@ public:
 		}
 
 		update_pc();
-		ensure_gpr_stores();
 		call("spu_write_channel", &exec_wrch, m_thread, m_ir->getInt32(op.ra), val.value);
 	}
 
@@ -4411,6 +6371,12 @@ public:
 		return (std::forward<TA>(a) << 16 >> 16) * (std::forward<TB>(b) << 16 >> 16);
 	}
 
+	template <typename TA, typename TB>
+	auto fm(TA&& a, TB&& b)
+	{
+		return (std::forward<TA>(a)) * (std::forward<TB>(b));
+	}
+
 	void SF(spu_opcode_t op)
 	{
 		set_vr(op.rt, get_vr(op.rb) - get_vr(op.ra));
@@ -4440,177 +6406,131 @@ public:
 	void ABSDB(spu_opcode_t op)
 	{
 		const auto [a, b] = get_vrs<u8[16]>(op.ra, op.rb);
-		set_vr(op.rt, absd(a, b));
+		set_vr(op.rt, max(a, b) - min(a, b));
+	}
+
+	template <typename T>
+	void make_spu_rol(spu_opcode_t op, value_t<T> by)
+	{
+		set_vr(op.rt, rol(get_vr<T>(op.ra), by));
+	}
+
+	template <typename R, typename T>
+	void make_spu_rotate_mask(spu_opcode_t op, value_t<T> by)
+	{
+		value_t<R> sh;
+		static_assert(sh.esize == by.esize);
+		sh.value = m_ir->CreateAnd(m_ir->CreateNeg(by.value), by.esize * 2 - 1);
+		if constexpr (!by.is_vector)
+			sh.value = m_ir->CreateVectorSplat(sh.is_vector, sh.value);
+
+		set_vr(op.rt, select(sh < by.esize, get_vr<R>(op.ra) >> sh, splat<R>(0)));
+	}
+
+	template <typename R, typename T>
+	void make_spu_rotate_sext(spu_opcode_t op, value_t<T> by)
+	{
+		value_t<R> sh;
+		static_assert(sh.esize == by.esize);
+		sh.value = m_ir->CreateAnd(m_ir->CreateNeg(by.value), by.esize * 2 - 1);
+		if constexpr (!by.is_vector)
+			sh.value = m_ir->CreateVectorSplat(sh.is_vector, sh.value);
+
+		value_t<R> max_sh = eval(splat<R>(by.esize - 1));
+		sh.value = m_ir->CreateSelect(m_ir->CreateICmpUGT(max_sh.value, sh.value), sh.value, max_sh.value);
+		set_vr(op.rt, get_vr<R>(op.ra) >> sh);
+	}
+
+	template <typename R, typename T>
+	void make_spu_shift_left(spu_opcode_t op, value_t<T> by)
+	{
+		value_t<R> sh;
+		static_assert(sh.esize == by.esize);
+		sh.value = m_ir->CreateAnd(by.value, by.esize * 2 - 1);
+		if constexpr (!by.is_vector)
+			sh.value = m_ir->CreateVectorSplat(sh.is_vector, sh.value);
+
+		set_vr(op.rt, select(sh < by.esize, get_vr<R>(op.ra) << sh, splat<R>(0)));
 	}
 
 	void ROT(spu_opcode_t op)
 	{
-		const auto [a, b] = get_vrs<u32[4]>(op.ra, op.rb);
-		set_vr(op.rt, rol(a, b));
+		make_spu_rol(op, get_vr<u32[4]>(op.rb));
 	}
 
 	void ROTM(spu_opcode_t op)
 	{
-		const auto [a, b] = get_vrs<u32[4]>(op.ra, op.rb);
-
-		auto minusb = eval(-b);
-		if (auto [ok, x] = match_expr(b, -match<u32[4]>()); ok)
-		{
-			minusb = eval(x);
-		}
-
-		if (auto k = get_known_bits(minusb); !!(k.Zero & 32))
-		{
-			set_vr(op.rt, a >> (minusb & 31));
-			return;
-		}
-
-		set_vr(op.rt, inf_lshr(a, minusb & 63));
+		make_spu_rotate_mask<u32[4]>(op, get_vr(op.rb));
 	}
 
 	void ROTMA(spu_opcode_t op)
 	{
-		const auto [a, b] = get_vrs<s32[4]>(op.ra, op.rb);
-
-		auto minusb = eval(-b);
-		if (auto [ok, x] = match_expr(b, -match<s32[4]>()); ok)
-		{
-			minusb = eval(x);
-		}
-
-		if (auto k = get_known_bits(minusb); !!(k.Zero & 32))
-		{
-			set_vr(op.rt, a >> (minusb & 31));
-			return;
-		}
-
-		set_vr(op.rt, inf_ashr(a, minusb & 63));
+		make_spu_rotate_sext<s32[4]>(op, get_vr(op.rb));
 	}
 
 	void SHL(spu_opcode_t op)
 	{
-		const auto [a, b] = get_vrs<u32[4]>(op.ra, op.rb);
-
-		if (auto k = get_known_bits(b); !!(k.Zero & 32))
-		{
-			set_vr(op.rt, a << (b & 31));
-			return;
-		}
-
-		set_vr(op.rt, inf_shl(a, b & 63));
+		make_spu_shift_left<u32[4]>(op, get_vr(op.rb));
 	}
 
 	void ROTH(spu_opcode_t op)
 	{
-		const auto [a, b] = get_vrs<u16[8]>(op.ra, op.rb);
-		set_vr(op.rt, rol(a, b));
+		make_spu_rol(op, get_vr<u16[8]>(op.rb));
 	}
 
 	void ROTHM(spu_opcode_t op)
 	{
-		const auto [a, b] = get_vrs<u16[8]>(op.ra, op.rb);
-
-		auto minusb = eval(-b);
-		if (auto [ok, x] = match_expr(b, -match<u16[8]>()); ok)
-		{
-			minusb = eval(x);
-		}
-
-		if (auto k = get_known_bits(minusb); !!(k.Zero & 16))
-		{
-			set_vr(op.rt, a >> (minusb & 15));
-			return;
-		}
-
-		set_vr(op.rt, inf_lshr(a, minusb & 31));
+		make_spu_rotate_mask<u16[8]>(op, get_vr<u16[8]>(op.rb));
 	}
 
 	void ROTMAH(spu_opcode_t op)
 	{
-		const auto [a, b] = get_vrs<s16[8]>(op.ra, op.rb);
-
-		auto minusb = eval(-b);
-		if (auto [ok, x] = match_expr(b, -match<s16[8]>()); ok)
-		{
-			minusb = eval(x);
-		}
-
-		if (auto k = get_known_bits(minusb); !!(k.Zero & 16))
-		{
-			set_vr(op.rt, a >> (minusb & 15));
-			return;
-		}
-
-		set_vr(op.rt, inf_ashr(a, minusb & 31));
+		make_spu_rotate_sext<s16[8]>(op, get_vr<s16[8]>(op.rb));
 	}
 
 	void SHLH(spu_opcode_t op)
 	{
-		const auto [a, b] = get_vrs<u16[8]>(op.ra, op.rb);
-
-		if (auto k = get_known_bits(b); !!(k.Zero & 16))
-		{
-			set_vr(op.rt, a << (b & 15));
-			return;
-		}
-
-		set_vr(op.rt, inf_shl(a, b & 31));
+		make_spu_shift_left<u16[8]>(op, get_vr<u16[8]>(op.rb));
 	}
 
 	void ROTI(spu_opcode_t op)
 	{
-		const auto a = get_vr<u32[4]>(op.ra);
-		const auto i = get_imm<u32[4]>(op.i7, false);
-		set_vr(op.rt, rol(a, i));
+		make_spu_rol(op, get_imm<u32[4]>(op.i7, false));
 	}
 
 	void ROTMI(spu_opcode_t op)
 	{
-		const auto a = get_vr<u32[4]>(op.ra);
-		const auto i = get_imm<u32[4]>(op.i7, false);
-		set_vr(op.rt, inf_lshr(a, -i & 63));
+		make_spu_rotate_mask<u32[4]>(op, get_imm<u32>(op.i7, false));
 	}
 
 	void ROTMAI(spu_opcode_t op)
 	{
-		const auto a = get_vr<s32[4]>(op.ra);
-		const auto i = get_imm<s32[4]>(op.i7, false);
-		set_vr(op.rt, inf_ashr(a, -i & 63));
+		make_spu_rotate_sext<s32[4]>(op, get_imm<u32>(op.i7, false));
 	}
 
 	void SHLI(spu_opcode_t op)
 	{
-		const auto a = get_vr<u32[4]>(op.ra);
-		const auto i = get_imm<u32[4]>(op.i7, false);
-		set_vr(op.rt, inf_shl(a, i & 63));
+		make_spu_shift_left<u32[4]>(op, get_imm<u32>(op.i7, false));
 	}
 
 	void ROTHI(spu_opcode_t op)
 	{
-		const auto a = get_vr<u16[8]>(op.ra);
-		const auto i = get_imm<u16[8]>(op.i7, false);
-		set_vr(op.rt, rol(a, i));
+		make_spu_rol(op, get_imm<u16[8]>(op.i7, false));
 	}
 
 	void ROTHMI(spu_opcode_t op)
 	{
-		const auto a = get_vr<u16[8]>(op.ra);
-		const auto i = get_imm<u16[8]>(op.i7, false);
-		set_vr(op.rt, inf_lshr(a, -i & 31));
+		make_spu_rotate_mask<u16[8]>(op, get_imm<u16>(op.i7, false));
 	}
 
 	void ROTMAHI(spu_opcode_t op)
 	{
-		const auto a = get_vr<s16[8]>(op.ra);
-		const auto i = get_imm<s16[8]>(op.i7, false);
-		set_vr(op.rt, inf_ashr(a, -i & 31));
+		make_spu_rotate_sext<s16[8]>(op, get_imm<u16>(op.i7, false));
 	}
 
 	void SHLHI(spu_opcode_t op)
 	{
-		const auto a = get_vr<u16[8]>(op.ra);
-		const auto i = get_imm<u16[8]>(op.i7, false);
-		set_vr(op.rt, inf_shl(a, i & 31));
+		make_spu_shift_left<u16[8]>(op, get_imm<u16>(op.i7, false));
 	}
 
 	void A(spu_opcode_t op)
@@ -4680,18 +6600,6 @@ public:
 
 	void GB(spu_opcode_t op)
 	{
-		// GFNI trick to extract selected bit from bytes
-		// By treating the first input as constant, and the second input as variable,
-		// with only 1 bit set in our constant, gf2p8affineqb will extract that selected bit
-		// from each byte of the second operand
-		if (m_use_gfni)
-		{
-			const auto a = get_vr<u8[16]>(op.ra);
-			const auto as = zshuffle(a, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 12, 8, 4, 0);
-			set_vr(op.rt, gf2p8affineqb(build<u8[16]>(0x0, 0x0, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0), as, 0x0));
-			return;
-		}
-
 		const auto a = get_vr<s32[4]>(op.ra);
 		const auto m = zext<u32>(bitcast<i4>(trunc<bool[4]>(a)));
 		set_vr(op.rt, insert(splat<u32[4]>(0), 3, eval(m)));
@@ -4699,14 +6607,6 @@ public:
 
 	void GBH(spu_opcode_t op)
 	{
-		if (m_use_gfni)
-		{
-			const auto a = get_vr<u8[16]>(op.ra);
-			const auto as = zshuffle(a, 16, 16, 16, 16, 16, 16, 16, 16, 14, 12, 10, 8, 6, 4, 2, 0);
-			set_vr(op.rt, gf2p8affineqb(build<u8[16]>(0x0, 0x0, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0), as, 0x0));
-			return;
-		}
-
 		const auto a = get_vr<s16[8]>(op.ra);
 		const auto m = zext<u32>(bitcast<u8>(trunc<bool[8]>(a)));
 		set_vr(op.rt, insert(splat<u32[4]>(0), 3, eval(m)));
@@ -4714,16 +6614,7 @@ public:
 
 	void GBB(spu_opcode_t op)
 	{
-		const auto a = get_vr<u8[16]>(op.ra);
-
-		if (m_use_gfni)
-		{
-			const auto as = zshuffle(a, 7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8);
-			const auto m = gf2p8affineqb(build<u8[16]>(0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x01, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0), as, 0x0);
-			set_vr(op.rt, zshuffle(m, 16, 16, 16, 16, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
-			return;
-		}
-
+		const auto a = get_vr<s8[16]>(op.ra);
 		const auto m = zext<u32>(bitcast<u16>(trunc<bool[16]>(a)));
 		set_vr(op.rt, insert(splat<u32[4]>(0), 3, eval(m)));
 	}
@@ -4772,76 +6663,53 @@ public:
 		return zshuffle(std::forward<TA>(a), 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0);
 	}
 
-	template <typename T, typename U>
-	static llvm_calli<u8[16], T, U> rotqbybi(T&& a, U&& b)
-	{
-		return {"spu_rotqbybi", {std::forward<T>(a), std::forward<U>(b)}};
-	}
-
 	void ROTQBYBI(spu_opcode_t op)
-	{
-		register_intrinsic("spu_rotqbybi", [&](llvm::CallInst* ci)
-		{
-			const auto a = value<u8[16]>(ci->getOperand(0));
-			const auto b = value<u8[16]>(ci->getOperand(1));
-
-			// Data with swapped endian from a load instruction
-			if (auto [ok, as] = match_expr(a, byteswap(match<u8[16]>())); ok)
-			{
-				const auto sc = build<u8[16]>(15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0);
-				const auto sh = sc + (splat_scalar(b) >> 3);
-
-				if (m_use_avx512_icl)
-				{
-					return eval(vpermb(as, sh));
-				}
-
-				return eval(pshufb(as, (sh & 0xf)));
-			}
-			const auto sc = build<u8[16]>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
-			const auto sh = sc - (splat_scalar(b) >> 3);
-
-			if (m_use_avx512_icl)
-			{
-				return eval(vpermb(a, sh));
-			}
-
-			return eval(pshufb(a, (sh & 0xf)));
-		});
-
-		set_vr(op.rt, rotqbybi(get_vr<u8[16]>(op.ra), get_vr<u8[16]>(op.rb)));
-	}
-
-	void ROTQMBYBI(spu_opcode_t op)
 	{
 		const auto a = get_vr<u8[16]>(op.ra);
-		const auto b = get_vr<s32[4]>(op.rb);
-
-		auto minusb = eval(-(b >> 3));
-		if (auto [ok, v0, v1] = match_expr(b, match<s32[4]>() - match<s32[4]>()); ok)
-		{
-			if (auto [ok1, data] = get_const_vector(v0.value, m_pos); ok1)
-			{
-				if (data == v128::from32p(7))
-				{
-					minusb = eval(v1 >> 3);
-				}
-			}
-		}
-
-		const auto minusbx = eval(bitcast<u8[16]>(minusb) & 0x1f);
 
 		// Data with swapped endian from a load instruction
 		if (auto [ok, as] = match_expr(a, byteswap(match<u8[16]>())); ok)
 		{
 			const auto sc = build<u8[16]>(15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0);
-			const auto sh = sc - splat_scalar(minusbx);
+			const auto sh = sc + (splat_scalar(get_vr<u8[16]>(op.rb)) >> 3);
+
+			if (m_use_avx512_icl)
+			{
+				set_vr(op.rt, vpermb(as, sh));
+				return;
+			}
+
+			set_vr(op.rt, pshufb(as, (sh & 0xf)));
+			return;
+		}
+		const auto sc = build<u8[16]>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
+		const auto sh = sc - (splat_scalar(get_vr<u8[16]>(op.rb)) >> 3);
+
+		if (m_use_avx512_icl)
+		{
+			set_vr(op.rt, vpermb(a, sh));
+			return;
+		}
+
+		set_vr(op.rt, pshufb(a, (sh & 0xf)));
+	}
+
+	void ROTQMBYBI(spu_opcode_t op)
+	{
+		const auto a = get_vr<u8[16]>(op.ra);
+		const auto b = get_vr<u8[16]>(op.rb);
+
+		// Data with swapped endian from a load instruction
+		if (auto [ok, as] = match_expr(a, byteswap(match<u8[16]>())); ok)
+		{
+			const auto sc = build<u8[16]>(15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0);
+			const auto sh = sc - (-(splat_scalar(b) >> 3) & 0x1f);
 			set_vr(op.rt, pshufb(as, sh));
 			return;
 		}
 
 		const auto sc = build<u8[16]>(112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127);
-		const auto sh = sc + splat_scalar(minusbx);
+		const auto sh = sc + (-(splat_scalar(b) >> 3) & 0x1f);
 		set_vr(op.rt, pshufb(a, sh));
 	}
 
@@ -4928,55 +6796,15 @@ public:
 	void ROTQBI(spu_opcode_t op)
 	{
 		const auto a = get_vr(op.ra);
-		const auto ax = get_vr<u8[16]>(op.ra);
-		const auto bx = get_vr<u8[16]>(op.rb);
-
-		// Combined bit and bytes shift
-		if (auto [ok, v0, v1] = match_expr(ax, rotqbybi(match<u8[16]>(), match<u8[16]>())); ok && v1.eq(bx))
-		{
-			const auto b32 = get_vr<s32[4]>(op.rb);
-
-			// Is the rotate less than 31 bits?
-			if (auto k = get_known_bits(b32); (k.Zero & 0x60) == 0x60u)
-			{
-				const auto b = splat_scalar(get_vr(op.rb));
-				set_vr(op.rt, fshl(bitcast<u32[4]>(v0), zshuffle(bitcast<u32[4]>(v0), 3, 0, 1, 2), b));
-				return;
-			}
-
-			// Inverted shift count
-			if (auto [ok1, v10, v11] = match_expr(b32, match<s32[4]>() - match<s32[4]>()); ok1)
-			{
-				if (auto [ok2, data] = get_const_vector(v10.value, m_pos); ok2)
-				{
-					if ((data & v128::from32p(0x7f)) == v128{})
-					{
-						if (auto k = get_known_bits(v11); (k.Zero & 0x60) == 0x60u)
-						{
-							set_vr(op.rt, fshr(zshuffle(bitcast<u32[4]>(v0), 1, 2, 3, 0), bitcast<u32[4]>(v0), splat_scalar(bitcast<u32[4]>(v11))));
-							return;
-						}
-					}
-				}
-			}
-		}
-
 		const auto b = splat_scalar(get_vr(op.rb) & 0x7);
 		set_vr(op.rt, fshl(a, zshuffle(a, 3, 0, 1, 2), b));
 	}
 
 	void ROTQMBI(spu_opcode_t op)
 	{
-		const auto [a, b] = get_vrs<u32[4]>(op.ra, op.rb);
-
-		auto minusb = eval(-b);
-		if (auto [ok, x] = match_expr(b, -match<u32[4]>()); ok)
-		{
-			minusb = eval(x);
-		}
-		
-		const auto bx = splat_scalar(minusb) & 0x7;
-		set_vr(op.rt, fshr(zshuffle(a, 1, 2, 3, 4), a, bx));
+		const auto a = get_vr(op.ra);
+		const auto b = splat_scalar(-get_vr(op.rb) & 0x7);
+		set_vr(op.rt, fshr(zshuffle(a, 1, 2, 3, 4), a, b));
 	}
 
 	void SHLQBI(spu_opcode_t op)
@@ -4986,31 +6814,24 @@ public:
 		set_vr(op.rt, fshl(a, zshuffle(a, 4, 0, 1, 2), b));
 	}
 
-#if defined(ARCH_X64)
 	static __m128i exec_rotqby(__m128i a, u8 b)
 	{
 		alignas(32) const __m128i buf[2]{a, a};
 		return _mm_loadu_si128(reinterpret_cast<const __m128i*>(reinterpret_cast<const u8*>(buf) + (16 - (b & 0xf))));
 	}
-#elif defined(ARCH_ARM64)
-#else
-#error "Unimplemented"
-#endif
 
 	void ROTQBY(spu_opcode_t op)
 	{
 		const auto a = get_vr<u8[16]>(op.ra);
 		const auto b = get_vr<u8[16]>(op.rb);
 
-#if defined(ARCH_X64)
 		if (!m_use_ssse3)
 		{
 			value_t<u8[16]> r;
-			r.value = call<u8[16]>("spu_rotqby", &exec_rotqby, a.value, eval(extract(b, 12)).value);
+			r.value = call("spu_rotqby", &exec_rotqby, a.value, eval(extract(b, 12)).value);
 			set_vr(op.rt, r);
 			return;
 		}
-#endif
 
 		// Data with swapped endian from a load instruction
 		if (auto [ok, as] = match_expr(a, byteswap(match<u8[16]>())); ok)
@@ -5043,27 +6864,19 @@ public:
 	void ROTQMBY(spu_opcode_t op)
 	{
 		const auto a = get_vr<u8[16]>(op.ra);
-		const auto b = get_vr<u32[4]>(op.rb);
-
-		auto minusb = eval(-b);
-		if (auto [ok, x] = match_expr(b, -match<u32[4]>()); ok)
-		{
-			minusb = eval(x);
-		}
-
-		const auto minusbx = bitcast<u8[16]>(minusb);
+		const auto b = get_vr<u8[16]>(op.rb);
 
 		// Data with swapped endian from a load instruction
 		if (auto [ok, as] = match_expr(a, byteswap(match<u8[16]>())); ok)
 		{
 			const auto sc = build<u8[16]>(15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0);
-			const auto sh = sc - (splat_scalar(minusbx) & 0x1f);
+			const auto sh = sc - (-splat_scalar(b) & 0x1f);
 			set_vr(op.rt, pshufb(as, sh));
 			return;
 		}
 
 		const auto sc = build<u8[16]>(112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127);
-		const auto sh = sc + (splat_scalar(minusbx) & 0x1f);
+		const auto sh = sc + (-splat_scalar(b) & 0x1f);
 		set_vr(op.rt, pshufb(a, sh));
 	}
 
@@ -5086,23 +6899,12 @@ public:
 		set_vr(op.rt, pshufb(a, sh));
 	}
 
-	template <typename T>
-	static llvm_calli<u32[4], T> orx(T&& a)
-	{
-		return {"spu_orx", {std::forward<T>(a)}};
-	}
-
 	void ORX(spu_opcode_t op)
 	{
-		register_intrinsic("spu_orx", [&](llvm::CallInst* ci)
-		{
-			const auto a = value<u32[4]>(ci->getOperand(0));
-			const auto x = zshuffle(a, 2, 3, 0, 1) | a;
-			const auto y = zshuffle(x, 1, 0, 3, 2) | x;
-			return zshuffle(y, 4, 4, 4, 3);
-		});
-
-		set_vr(op.rt, orx(get_vr(op.ra)));
+		const auto a = get_vr(op.ra);
+		const auto x = zshuffle(a, 2, 3, 0, 1) | a;
+		const auto y = zshuffle(x, 1, 0, 3, 2) | x;
+		set_vr(op.rt, zshuffle(y, 4, 4, 4, 3));
 	}
 
 	void CBD(spu_opcode_t op)
@@ -5196,7 +6998,7 @@ public:
 
 	void SHLQBYI(spu_opcode_t op)
 	{
-		if (get_reg_raw(op.ra) && !op.i7) return set_reg_fixed(op.rt, get_reg_raw(op.ra), false); // For expressions matching
+		if (!m_interp_magn && !op.i7) return set_vr(op.rt, get_vr(op.ra)); // For expressions matching
 		const auto a = get_vr<u8[16]>(op.ra);
 		const auto sc = build<u8[16]>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
 		const auto sh = sc - (get_imm<u8[16]>(op.i7, false) & 0x1f);
@@ -5230,23 +7032,6 @@ public:
 
 	void SUMB(spu_opcode_t op)
 	{
-		if (m_use_avx512)
-		{
-			const auto [a, b] = get_vrs<u8[16]>(op.ra, op.rb);
-			const auto zeroes = splat<u8[16]>(0);
-
-			if (op.ra == op.rb && !m_interp_magn)
-			{
-				set_vr(op.rt, vdbpsadbw(a, zeroes, 0));
-				return;
-			}
-
-			const auto ax = vdbpsadbw(a, zeroes, 0);
-			const auto bx = vdbpsadbw(b, zeroes, 0);
-			set_vr(op.rt, shuffle2(ax, bx, 0, 9, 2, 11, 4, 13, 6, 15));
-			return;
-		}
-
 		if (m_use_vnni)
 		{
 			const auto [a, b] = get_vrs<u32[4]>(op.ra, op.rb);
@@ -5424,19 +7209,19 @@ public:
 
 	void ORI(spu_opcode_t op)
 	{
-		if (get_reg_raw(op.ra) && !op.si10) return set_reg_fixed(op.rt, get_reg_raw(op.ra), false); // For expressions matching
+		if (!m_interp_magn && !op.si10) return set_vr(op.rt, get_vr(op.ra)); // For expressions matching
 		set_vr(op.rt, get_vr<s32[4]>(op.ra) | get_imm<s32[4]>(op.si10));
 	}
 
 	void ORHI(spu_opcode_t op)
 	{
-		if (get_reg_raw(op.ra) && !op.si10) return set_reg_fixed(op.rt, get_reg_raw(op.ra), false);
+		if (!m_interp_magn && !op.si10) return set_vr(op.rt, get_vr(op.ra));
 		set_vr(op.rt, get_vr<s16[8]>(op.ra) | get_imm<s16[8]>(op.si10));
 	}
 
 	void ORBI(spu_opcode_t op)
 	{
-		if (get_reg_raw(op.ra) && !op.si10) return set_reg_fixed(op.rt, get_reg_raw(op.ra), false);
+		if (!m_interp_magn && !op.si10) return set_vr(op.rt, get_vr(op.ra));
 		set_vr(op.rt, get_vr<s8[16]>(op.ra) | get_imm<s8[16]>(op.si10));
 	}
 
@@ -5452,49 +7237,49 @@ public:
 
 	void ANDI(spu_opcode_t op)
 	{
-		if (get_reg_raw(op.ra) && op.si10 == -1) return set_reg_fixed(op.rt, get_reg_raw(op.ra), false);
+		if (!m_interp_magn && op.si10 == -1) return set_vr(op.rt, get_vr(op.ra));
 		set_vr(op.rt, get_vr<s32[4]>(op.ra) & get_imm<s32[4]>(op.si10));
 	}
 
 	void ANDHI(spu_opcode_t op)
 	{
-		if (get_reg_raw(op.ra) && op.si10 == -1) return set_reg_fixed(op.rt, get_reg_raw(op.ra), false);
+		if (!m_interp_magn && op.si10 == -1) return set_vr(op.rt, get_vr(op.ra));
 		set_vr(op.rt, get_vr<s16[8]>(op.ra) & get_imm<s16[8]>(op.si10));
 	}
 
 	void ANDBI(spu_opcode_t op)
 	{
-		if (get_reg_raw(op.ra) && static_cast<s8>(op.si10) == -1) return set_reg_fixed(op.rt, get_reg_raw(op.ra), false);
+		if (!m_interp_magn && static_cast<s8>(op.si10) == -1) return set_vr(op.rt, get_vr(op.ra));
 		set_vr(op.rt, get_vr<s8[16]>(op.ra) & get_imm<s8[16]>(op.si10));
 	}
 
 	void AI(spu_opcode_t op)
 	{
-		if (get_reg_raw(op.ra) && !op.si10) return set_reg_fixed(op.rt, get_reg_raw(op.ra), false);
+		if (!m_interp_magn && !op.si10) return set_vr(op.rt, get_vr(op.ra));
 		set_vr(op.rt, get_vr<s32[4]>(op.ra) + get_imm<s32[4]>(op.si10));
 	}
 
 	void AHI(spu_opcode_t op)
 	{
-		if (get_reg_raw(op.ra) && !op.si10) return set_reg_fixed(op.rt, get_reg_raw(op.ra), false);
+		if (!m_interp_magn && !op.si10) return set_vr(op.rt, get_vr(op.ra));
 		set_vr(op.rt, get_vr<s16[8]>(op.ra) + get_imm<s16[8]>(op.si10));
 	}
 
 	void XORI(spu_opcode_t op)
 	{
-		if (get_reg_raw(op.ra) && !op.si10) return set_reg_fixed(op.rt, get_reg_raw(op.ra), false);
+		if (!m_interp_magn && !op.si10) return set_vr(op.rt, get_vr(op.ra));
 		set_vr(op.rt, get_vr<s32[4]>(op.ra) ^ get_imm<s32[4]>(op.si10));
 	}
 
 	void XORHI(spu_opcode_t op)
 	{
-		if (get_reg_raw(op.ra) && !op.si10) return set_reg_fixed(op.rt, get_reg_raw(op.ra), false);
+		if (!m_interp_magn && !op.si10) return set_vr(op.rt, get_vr(op.ra));
 		set_vr(op.rt, get_vr<s16[8]>(op.ra) ^ get_imm<s16[8]>(op.si10));
 	}
 
 	void XORBI(spu_opcode_t op)
 	{
-		if (get_reg_raw(op.ra) && !op.si10) return set_reg_fixed(op.rt, get_reg_raw(op.ra), false);
+		if (!m_interp_magn && !op.si10) return set_vr(op.rt, get_vr(op.ra));
 		set_vr(op.rt, get_vr<s8[16]>(op.ra) ^ get_imm<s8[16]>(op.si10));
 	}
 
@@ -5579,39 +7364,6 @@ public:
 
 				if constexpr (std::extent_v<VT> == 4) // u32[4]
 				{
-					// Match division (adjusted) (TODO)
-					if (auto a = match_vr<f32[4]>(op.ra))
-					{
-						static const auto MT = match<f32[4]>();
-
-						if (auto [div_ok, diva, divb] = match_expr(a, MT / MT); div_ok)
-						{
-							if (auto b = match_vr<s32[4]>(op.rb))
-							{
-								if (auto [add1_ok] = match_expr(b, bitcast<s32[4]>(a) + splat<s32[4]>(1)); add1_ok)
-								{
-									if (auto [fm_ok, a1, b1] = match_expr(x, bitcast<s32[4]>(fm(MT, MT)) > splat<s32[4]>(-1)); fm_ok)
-									{
-										if (auto [fnma_ok] = match_expr(a1, fnms(divb, bitcast<f32[4]>(b), diva)); fnma_ok)
-										{
-											if (fabs(b1).eval(m_ir) == fsplat<f32[4]>(1.0).eval(m_ir))
-											{
-												set_vr(op.rt4, diva / divb);
-												return true;
-											}
-
-											if (auto [sel_ok] = match_expr(b1, bitcast<f32[4]>((bitcast<u32[4]>(diva) & 0x80000000) | 0x3f800000)); sel_ok)
-											{
-												set_vr(op.rt4, diva / divb);
-												return true;
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-
 					if (auto [a, b] = match_vrs<f64[4]>(op.ra, op.rb); a || b)
 					{
 						set_vr(op.rt4, select(x, get_vr<f64[4]>(op.rb), get_vr<f64[4]>(op.ra)));
@@ -5625,12 +7377,6 @@ public:
 					}
 				}
 
-				if (auto [ok, y] = match_expr(x, bitcast<bool[std::extent_v<VT>]>(match<get_int_vt<std::extent_v<VT>>>())); ok)
-				{
-					// Don't ruin FSMB/FSM/FSMH instructions
-					return false;
-				}
-
 				set_vr(op.rt4, select(x, get_vr<VT>(op.rb), get_vr<VT>(op.ra)));
 				return true;
 			}
@@ -5644,7 +7390,7 @@ public:
 		const auto c = get_vr(op.rc);
 
 		// Check if the constant mask doesn't require bit granularity
-		if (auto [ok, mask] = get_const_vector(c.value, m_pos); ok)
+		if (auto [ok, mask] = get_const_vector(c.value, m_pos, 8000); ok)
 		{
 			bool sel_32 = true;
 			for (u32 i = 0; i < 4; i++)
@@ -5746,7 +7492,7 @@ public:
 
 		const auto c = get_vr<u8[16]>(op.rc);
 
-		if (auto [ok, mask] = get_const_vector(c.value, m_pos); ok)
+		if (auto [ok, mask] = get_const_vector(c.value, m_pos, 57216); ok)
 		{
 			// Optimization: SHUFB with constant mask
 			if (((mask._u64[0] | mask._u64[1]) & 0xe0e0e0e0e0e0e0e0) == 0)
@@ -5806,49 +7552,23 @@ public:
 						return;
 					}
 				}
-			}
 
-			// Adjusted shuffle mask
-			v128 smask = ~mask & v128::from8p(op.ra == op.rb ? 0xf : 0x1f);
+				// Generic constant shuffle without constant-generation bits
+				mask = mask ^ v128::from8p(0x1f);
 
-			// Blend mask for encoded constants
-			v128 bmask{};
-
-			for (u32 i = 0; i < 16; i++)
-			{
-				if (mask._bytes[i] >= 0xe0)
-					bmask._bytes[i] = 0x80;
-				else if (mask._bytes[i] >= 0xc0)
-					bmask._bytes[i] = 0xff;
-			}
-
-			const auto a = get_vr<u8[16]>(op.ra);
-			const auto b = get_vr<u8[16]>(op.rb);
-			const auto c = make_const_vector(smask, get_type<u8[16]>());
-			const auto d = make_const_vector(bmask, get_type<u8[16]>());
-
-			llvm::Value* r = d;
-
-			if ((~mask._u64[0] | ~mask._u64[1]) & 0x8080808080808080) [[likely]]
-			{
-				r = m_ir->CreateShuffleVector(b.value, op.ra == op.rb ? b.value : a.value, m_ir->CreateZExt(c, get_type<u32[16]>()));
-
-				if ((mask._u64[0] | mask._u64[1]) & 0x8080808080808080)
+				if (op.ra == op.rb)
 				{
-					r = m_ir->CreateSelect(m_ir->CreateICmpSLT(make_const_vector(mask, get_type<u8[16]>()), llvm::ConstantInt::get(get_type<u8[16]>(), 0)), d, r);
+					mask = mask & v128::from8p(0xf);
 				}
+
+				const auto a = get_vr<u8[16]>(op.ra);
+				const auto b = get_vr<u8[16]>(op.rb);
+				const auto c = make_const_vector(mask, get_type<u8[16]>());
+				set_reg_fixed(op.rt4, m_ir->CreateShuffleVector(b.value, op.ra == op.rb ? b.value : a.value, m_ir->CreateZExt(c, get_type<u32[16]>())));
+				return;
 			}
 
-			set_reg_fixed(op.rt4, r);
-			return;
-		}
-
-		// Check whether shuffle mask doesn't contain fixed value selectors
-		bool perm_only = false;
-
-		if (auto k = get_known_bits(c); !!(k.Zero & 0x80))
-		{
-			perm_only = true;
+			spu_log.todo("[0x%x] Const SHUFB mask: %s", m_pos, mask);
 		}
 
 		const auto a = get_vr<u8[16]>(op.ra);
@@ -5860,14 +7580,9 @@ public:
 			if (auto [ok, bs] = match_expr(b, byteswap(match<u8[16]>())); ok)
 			{
 				// Undo endian swapping, and rely on pshufb/vperm2b to re-reverse endianness
+
 				if (m_use_avx512_icl && (op.ra != op.rb))
 				{
-					if (perm_only)
-					{
-						set_vr(op.rt4, vperm2b(as, bs, c));
-						return;
-					}
-
 					const auto m = gf2p8affineqb(c, build<u8[16]>(0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20), 0x7f);
 					const auto mm = select(noncast<s8[16]>(m) >= 0, splat<u8[16]>(0), m);
 					const auto ab = vperm2b(as, bs, c);
@@ -5875,43 +7590,22 @@ public:
 					return;
 				}
 
-				const auto x = pshufb(build<u8[16]>(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x80), (c >> 4));
+				const auto x = avg(noncast<u8[16]>(sext<s8[16]>((c & 0xc0) == 0xc0)), noncast<u8[16]>(sext<s8[16]>((c & 0xe0) == 0xc0)));
 				const auto ax = pshufb(as, c);
 				const auto bx = pshufb(bs, c);
-
-				if (perm_only)
-					set_vr(op.rt4, select_by_bit4(c, ax, bx));
-				else
-					set_vr(op.rt4, select_by_bit4(c, ax, bx) | x);
+				set_vr(op.rt4, select(noncast<s8[16]>(c << 3) >= 0, ax, bx) | x);
 				return;
 			}
 
-			if (auto [ok, data] = get_const_vector(b.value, m_pos); ok)
+			if (auto [ok, data] = get_const_vector(b.value, m_pos, 7000); ok)
 			{
-				if (data == v128::from8p(data._u8[0]))
+				const bool all_bytes_equiv = data == v128::from8p(data._u8[0]);
+				if (all_bytes_equiv)
 				{
-					if (m_use_avx512_icl)
-					{
-						if (perm_only)
-						{
-							set_vr(op.rt4, vperm2b(as, b, c));
-							return;
-						}
-
-						const auto m = gf2p8affineqb(c, build<u8[16]>(0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20), 0x7f);
-						const auto mm = select(noncast<s8[16]>(m) >= 0, splat<u8[16]>(0), m);
-						const auto ab = vperm2b(as, b, c);
-						set_vr(op.rt4, select(noncast<s8[16]>(c) >= 0, ab, mm));
-						return;
-					}
 					// See above
-					const auto x = pshufb(build<u8[16]>(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x80), (c >> 4));
+					const auto x = avg(noncast<u8[16]>(sext<s8[16]>((c & 0xc0) == 0xc0)), noncast<u8[16]>(sext<s8[16]>((c & 0xe0) == 0xc0)));
 					const auto ax = pshufb(as, c);
-
-					if (perm_only)
-						set_vr(op.rt4, select_by_bit4(c, ax, b));
-					else
-						set_vr(op.rt4, select_by_bit4(c, ax, b) | x);
+					set_vr(op.rt4, select(noncast<s8[16]>(c << 3) >= 0, ax, b) | x);
 					return;
 				}
 			}
@@ -5919,18 +7613,15 @@ public:
 
 		if (auto [ok, bs] = match_expr(b, byteswap(match<u8[16]>())); ok)
 		{
-			if (auto [ok, data] = get_const_vector(a.value, m_pos); ok)
+			if (auto [ok, data] = get_const_vector(a.value, m_pos, 7000); ok)
 			{
-				if (data == v128::from8p(data._u8[0]))
+				const bool all_bytes_equiv = data == v128::from8p(data._u8[0]);
+				if (all_bytes_equiv)
 				{
 					// See above
-					const auto x = pshufb(build<u8[16]>(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x80), (c >> 4));
+					const auto x = avg(noncast<u8[16]>(sext<s8[16]>((c & 0xc0) == 0xc0)), noncast<u8[16]>(sext<s8[16]>((c & 0xe0) == 0xc0)));
 					const auto bx = pshufb(bs, c);
-
-					if (perm_only)
-						set_vr(op.rt4, select_by_bit4(c, a, bx));
-					else
-						set_vr(op.rt4, select_by_bit4(c, a, bx) | x);
+					set_vr(op.rt4, select(noncast<s8[16]>(c << 3) >= 0, a, bx) | x);
 					return;
 				}
 			}
@@ -5938,65 +7629,19 @@ public:
 
 		if (m_use_avx512_icl && (op.ra != op.rb || m_interp_magn))
 		{
-			if (auto [ok, data] = get_const_vector(b.value, m_pos); ok)
-			{
-				if (data == v128::from8p(data._u8[0]))
-				{
-					if (perm_only)
-					{
-						set_vr(op.rt4, vperm2b(a, b, eval(c ^ 0xf)));
-						return;
-					}
-
-					const auto m = gf2p8affineqb(c, build<u8[16]>(0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20), 0x7f);
-					const auto mm = select(noncast<s8[16]>(m) >= 0, splat<u8[16]>(0), m);
-					const auto ab = vperm2b(a, b, eval(c ^ 0xf));
-					set_vr(op.rt4, select(noncast<s8[16]>(c) >= 0, ab, mm));
-					return;
-				}
-			}
-
-			if (auto [ok, data] = get_const_vector(a.value, m_pos); ok)
-			{
-				if (data == v128::from8p(data._u8[0]))
-				{
-					if (perm_only)
-					{
-						set_vr(op.rt4, vperm2b(b, a, eval(c ^ 0x1f)));
-						return;
-					}
-
-					const auto m = gf2p8affineqb(c, build<u8[16]>(0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20), 0x7f);
-					const auto mm = select(noncast<s8[16]>(m) >= 0, splat<u8[16]>(0), m);
-					const auto ab = vperm2b(b, a, eval(c ^ 0x1f));
-					set_vr(op.rt4, select(noncast<s8[16]>(c) >= 0, ab, mm));
-					return;
-				}
-			}
-
-			if (perm_only)
-			{
-				set_vr(op.rt4, vperm2b(a, b, eval(c ^ 0xf)));
-				return;
-			}
-
 			const auto m = gf2p8affineqb(c, build<u8[16]>(0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20), 0x7f);
 			const auto mm = select(noncast<s8[16]>(m) >= 0, splat<u8[16]>(0), m);
-			const auto cr = eval(c ^ 0xf);
-			const auto ab = vperm2b(a, b, cr);
-			set_vr(op.rt4, select(noncast<s8[16]>(c) >= 0, ab, mm));
+			const auto cr = eval(~c);
+			const auto ab = vperm2b(b, a, cr);
+			set_vr(op.rt4, select(noncast<s8[16]>(cr) >= 0, mm, ab));
 			return;
 		}
 
-		const auto x = pshufb(build<u8[16]>(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x80), (c >> 4));
+		const auto x = avg(noncast<u8[16]>(sext<s8[16]>((c & 0xc0) == 0xc0)), noncast<u8[16]>(sext<s8[16]>((c & 0xe0) == 0xc0)));
 		const auto cr = eval(c ^ 0xf);
 		const auto ax = pshufb(a, cr);
 		const auto bx = pshufb(b, cr);
-
-		if (perm_only)
-			set_vr(op.rt4, select_by_bit4(cr, ax, bx));
-		else
-			set_vr(op.rt4, select_by_bit4(cr, ax, bx) | x);
+		set_vr(op.rt4, select(noncast<s8[16]>(cr << 3) >= 0, ax, bx) | x);
 	}
 
 	void MPYA(spu_opcode_t op)
@@ -6059,8 +7704,12 @@ public:
 	{
 		const auto [a, b, c] = get_vrs<f64[2]>(op.ra, op.rb, op.rt);
 
-		if (g_cfg.core.use_accurate_dfma)
-			set_vr(op.rt, fmuladd(a, b, c, true));
+		if (g_cfg.core.llvm_accurate_dfma)
+		{
+			value_t<f64[2]> r;
+			r.value = m_ir->CreateCall(get_intrinsic<f64[2]>(llvm::Intrinsic::fma), {a.value, b.value, c.value});
+			set_vr(op.rt, r);
+		}
 		else
 			set_vr(op.rt, a * b + c);
 	}
@@ -6069,8 +7718,12 @@ public:
 	{
 		const auto [a, b, c] = get_vrs<f64[2]>(op.ra, op.rb, op.rt);
 
-		if (g_cfg.core.use_accurate_dfma)
-			set_vr(op.rt, fmuladd(a, b, -c, true));
+		if (g_cfg.core.llvm_accurate_dfma)
+		{
+			value_t<f64[2]> r;
+			r.value = m_ir->CreateCall(get_intrinsic<f64[2]>(llvm::Intrinsic::fma), {a.value, b.value, eval(-c).value});
+			set_vr(op.rt, r);
+		}
 		else
 			set_vr(op.rt, a * b - c);
 	}
@@ -6079,8 +7732,12 @@ public:
 	{
 		const auto [a, b, c] = get_vrs<f64[2]>(op.ra, op.rb, op.rt);
 
-		if (g_cfg.core.use_accurate_dfma)
-			set_vr(op.rt, fmuladd(-a, b, c, true));
+		if (g_cfg.core.llvm_accurate_dfma)
+		{
+			value_t<f64[2]> r;
+			r.value = m_ir->CreateCall(get_intrinsic<f64[2]>(llvm::Intrinsic::fma), {eval(-a).value, b.value, c.value});
+			set_vr(op.rt, r);
+		}
 		else
 			set_vr(op.rt, c - (a * b));
 	}
@@ -6089,17 +7746,24 @@ public:
 	{
 		const auto [a, b, c] = get_vrs<f64[2]>(op.ra, op.rb, op.rt);
 
-		if (g_cfg.core.use_accurate_dfma)
-			set_vr(op.rt, -fmuladd(a, b, c, true));
+		if (g_cfg.core.llvm_accurate_dfma)
+		{
+			value_t<f64[2]> r;
+			r.value = m_ir->CreateCall(get_intrinsic<f64[2]>(llvm::Intrinsic::fma), {a.value, b.value, c.value});
+			set_vr(op.rt, -r);
+		}
 		else
 			set_vr(op.rt, -(a * b + c));
 	}
 
 	bool is_input_positive(value_t<f32[4]> a)
 	{
-		if (auto [ok, v0, v1] = match_expr(a, match<f32[4]>() * match<f32[4]>()); ok && v0.eq(v1))
+		if (auto [ok, v0, v1] = match_expr(a, fm(match<f32[4]>(), match<f32[4]>())); ok)
 		{
-			return true;
+			if (v0.value == v1.value)
+			{
+				return true;
+			}
 		}
 
 		return false;
@@ -6123,22 +7787,6 @@ public:
 
 	value_t<f32[4]> clamp_smax(value_t<f32[4]> v)
 	{
-		if (m_use_avx512)
-		{
-			if (is_input_positive(v))
-			{
-				return eval(clamp_positive_smax(v));
-			}
-
-			if (auto [ok, data] = get_const_vector(v.value, m_pos); ok)
-			{
-				// Avoid pessimation when input is constant
-				return eval(clamp_positive_smax(clamp_negative_smax(v)));
-			}
-
-			return eval(vrangeps(v, fsplat<f32[4]>(std::bit_cast<f32, u32>(0x7f7fffff)), 0x2, 0xff));
-		}
-
 		return eval(clamp_positive_smax(clamp_negative_smax(v)));
 	}
 
@@ -6169,394 +7817,183 @@ public:
 		return true;
 	}
 
-	template <typename T>
-	static llvm_calli<f32[4], T> frest(T&& a)
-	{
-		return {"spu_frest", {std::forward<T>(a)}};
-	}
-
 	void FREST(spu_opcode_t op)
 	{
-		register_intrinsic("spu_frest", [&](llvm::CallInst* ci)
+		// TODO
+		if (g_cfg.core.spu_accurate_xfloat)
 		{
-			const auto a = bitcast<u32[4]>(value<f32[4]>(ci->getOperand(0)));
-
-			const auto a_fraction = (a >> splat<u32[4]>(18)) & splat<u32[4]>(0x1F);
-			const auto a_exponent = (a & splat<u32[4]>(0x7F800000u));
-			const auto r_exponent = sub_sat(build<u16[8]>(0000, 0x7E80, 0000, 0x7E80, 0000, 0x7E80, 0000, 0x7E80), bitcast<u16[8]>(a_exponent));
-			const auto fix_exponent = select((a_exponent > 0), bitcast<u32[4]>(r_exponent), splat<u32[4]>(0x7F800000u));
-			const auto a_sign = (a & splat<u32[4]>(0x80000000));
-			value_t<u32[4]> final_result = eval(splat<u32[4]>(0));
-
-			for (u32 i = 0; i < 4; i++)
-			{
-				const auto eval_fraction = eval(extract(a_fraction, i));
-
-				value_t<u32> r_fraction = load_const<u32>(m_spu_frest_fraction_lut, eval_fraction);
-
-				final_result = eval(insert(final_result, i, r_fraction));
-			}
-
-			//final_result = eval(select(final_result != (0), final_result, bitcast<u32[4]>(pshufb(splat<u8[16]>(0), bitcast<u8[16]>(final_result)))));
-
-			return bitcast<f32[4]>(bitcast<u32[4]>(final_result | bitcast<u32[4]>(fix_exponent) | a_sign));
-		});
-
-		set_vr(op.rt, frest(get_vr<f32[4]>(op.ra)));
-	}
-
-	template <typename T>
-	static llvm_calli<f32[4], T> frsqest(T&& a)
-	{
-		return {"spu_frsqest", {std::forward<T>(a)}};
+			const auto a = get_vr<f32[4]>(op.ra);
+			const auto mask_ov = sext<s32[4]>(bitcast<s32[4]>(fabs(a)) > splat<s32[4]>(0x7e7fffff));
+			const auto mask_de = eval(noncast<u32[4]>(sext<s32[4]>(fcmp_ord(a == fsplat<f32[4]>(0.)))) >> 1);
+			set_vr(op.rt, (bitcast<s32[4]>(fre(a)) & ~mask_ov) | noncast<s32[4]>(mask_de));
+		}
+		else
+		{
+			set_vr(op.rt, fre(get_vr<f32[4]>(op.ra)));
+		}
 	}
 
 	void FRSQEST(spu_opcode_t op)
 	{
-		register_intrinsic("spu_frsqest", [&](llvm::CallInst* ci)
-		{
-			const auto a = bitcast<u32[4]>(value<f32[4]>(ci->getOperand(0)));
-
-			const auto a_fraction = (a >> splat<u32[4]>(18)) & splat<u32[4]>(0x3F);
-			const auto a_exponent = (a >> splat<u32[4]>(23)) & splat<u32[4]>(0xFF);
-			value_t<u32[4]> final_result = eval(splat<u32[4]>(0));
-
-			for (u32 i = 0; i < 4; i++)
-			{
-				const auto eval_fraction = eval(extract(a_fraction, i));
-				const auto eval_exponent = eval(extract(a_exponent, i));
-
-				value_t<u32> r_fraction = load_const<u32>(m_spu_frsqest_fraction_lut, eval_fraction);
-				value_t<u32> r_exponent = load_const<u32>(m_spu_frsqest_exponent_lut, eval_exponent);
-
-				final_result = eval(insert(final_result, i, eval(r_fraction | r_exponent)));
-			}
-
-			return bitcast<f32[4]>(final_result);
-		});
-
-		set_vr(op.rt, frsqest(get_vr<f32[4]>(op.ra)));
-	}
-
-	template <typename T, typename U>
-	static llvm_calli<s32[4], T, U> fcgt(T&& a, U&& b)
-	{
-		return {"spu_fcgt", {std::forward<T>(a), std::forward<U>(b)}};
+		// TODO
+		if (g_cfg.core.spu_accurate_xfloat)
+			set_vr(op.rt, fsplat<f64[4]>(1.0) / sqrt(fabs(get_vr<f64[4]>(op.ra))));
+		else
+			set_vr(op.rt, fsplat<f32[4]>(1.0) / sqrt(fabs(get_vr<f32[4]>(op.ra))));
 	}
 
 	void FCGT(spu_opcode_t op)
 	{
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
+		if (g_cfg.core.spu_accurate_xfloat)
 		{
 			set_vr(op.rt, sext<s32[4]>(fcmp_ord(get_vr<f64[4]>(op.ra) > get_vr<f64[4]>(op.rb))));
 			return;
 		}
 
-		register_intrinsic("spu_fcgt", [&](llvm::CallInst* ci)
+		const auto [a, b] = get_vrs<f32[4]>(op.ra, op.rb);
+		const value_t<f32[4]> ab[2]{a, b};
+
+		std::bitset<2> safe_int_compare(0);
+		std::bitset<2> safe_nonzero_compare(0);
+
+		for (u32 i = 0; i < 2; i++)
 		{
-			const auto a = value<f32[4]>(ci->getOperand(0));
-			const auto b = value<f32[4]>(ci->getOperand(1));
-
-			const value_t<f32[4]> ab[2]{a, b};
-
-			std::bitset<2> safe_int_compare(0);
-			std::bitset<2> safe_finite_compare(0);
-
-			for (u32 i = 0; i < 2; i++)
+			if (auto [ok, data] = get_const_vector(ab[i].value, m_pos, 5000); ok)
 			{
-				if (auto [ok, data] = get_const_vector(ab[i].value, m_pos, __LINE__ + i); ok)
+				safe_int_compare.set(i);
+				safe_nonzero_compare.set(i);
+
+				for (u32 j = 0; j < 4; j++)
 				{
-					safe_int_compare.set(i);
-					safe_finite_compare.set(i);
+					const u32 value = data._u32[j];
+					const u8 exponent = static_cast<u8>(value >> 23);
 
-					for (u32 j = 0; j < 4; j++)
+					if (value >= 0x7f7fffffu || !exponent)
 					{
-						const u32 value = data._u32[j];
-						const u8 exponent = static_cast<u8>(value >> 23);
-
-						if (value >= 0x7f7fffffu || !exponent)
-						{
-							// Postive or negative zero, Denormal (treated as zero), Negative constant, or Normalized number with exponent +127
-							// Cannot used signed integer compare safely
-							// Note: Technically this optimization is accurate for any positive value, but due to the fact that
-							// we don't produce "extended range" values the same way as real hardware, it's not safe to apply
-							// this optimization for values outside of the range of x86 floating point hardware.
-							safe_int_compare.reset(i);
-							if ((value & 0x7fffffffu) >= 0x7f7ffffeu) safe_finite_compare.reset(i);
-						}
+						// Postive or negative zero, Denormal (treated as zero), Negative constant, or Normalized number with exponent +127
+		 				// Cannot used signed integer compare safely
+						// Note: Technically this optimization is accurate for any positive value, but due to the fact that
+						// we don't produce "extended range" values the same way as real hardware, it's not safe to apply
+						// this optimization for values outside of the range of x86 floating point hardware.
+						safe_int_compare.reset(i);
+						if (!exponent) safe_nonzero_compare.reset(i);
 					}
 				}
 			}
+		}
 
-			if (safe_int_compare.any())
-			{
-				return eval(sext<s32[4]>(bitcast<s32[4]>(a) > bitcast<s32[4]>(b)));
-			}
-
-			if  (safe_finite_compare.test(1))
-			{
-				return eval(sext<s32[4]>(fcmp_uno(clamp_negative_smax(a) > b)));
-			}
-
-			if  (safe_finite_compare.test(0))
-			{
-				return eval(sext<s32[4]>(fcmp_ord(a > clamp_smax(b))));
-			}
+		if (safe_int_compare.any())
+		{
+			set_vr(op.rt, sext<s32[4]>(bitcast<s32[4]>(a) > bitcast<s32[4]>(b)));
+			return;
+		}
 
+		if (g_cfg.core.spu_approx_xfloat)
+		{
 			const auto ai = eval(bitcast<s32[4]>(a));
 			const auto bi = eval(bitcast<s32[4]>(b));
 
-			return eval(sext<s32[4]>(fcmp_uno(a != b) & select((ai & bi) >= 0, ai > bi, ai < bi)));
-		});
-
-		set_vr(op.rt, fcgt(get_vr<f32[4]>(op.ra), get_vr<f32[4]>(op.rb)));
-	}
-
-	template <typename T, typename U>
-	static llvm_calli<s32[4], T, U> fcmgt(T&& a, U&& b)
-	{
-		return {"spu_fcmgt", {std::forward<T>(a), std::forward<U>(b)}};
+			if (!safe_nonzero_compare.any())
+				set_vr(op.rt, sext<s32[4]>(fcmp_uno(a != b) & select((ai & bi) >= 0, ai > bi, ai < bi)));
+			else
+				set_vr(op.rt, sext<s32[4]>(select((ai & bi) >= 0, ai > bi, ai < bi)));
+		}
+		else
+		{
+			set_vr(op.rt, sext<s32[4]>(fcmp_ord(a > b)));
+		}
 	}
 
 	void FCMGT(spu_opcode_t op)
 	{
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
+		if (g_cfg.core.spu_accurate_xfloat)
 		{
 			set_vr(op.rt, sext<s32[4]>(fcmp_ord(fabs(get_vr<f64[4]>(op.ra)) > fabs(get_vr<f64[4]>(op.rb)))));
 			return;
 		}
 
-		register_intrinsic("spu_fcmgt", [&](llvm::CallInst* ci)
+		const auto a = eval(fabs(get_vr<f32[4]>(op.ra)));
+		const auto b = eval(fabs(get_vr<f32[4]>(op.rb)));
+
+		if (g_cfg.core.spu_approx_xfloat)
 		{
-			const auto a = value<f32[4]>(ci->getOperand(0));
-			const auto b = value<f32[4]>(ci->getOperand(1));
-
-			const value_t<f32[4]> ab[2]{a, b};
-
-			std::bitset<2> safe_int_compare(0);
-
-			for (u32 i = 0; i < 2; i++)
-			{
-				if (auto [ok, data] = get_const_vector(ab[i].value, m_pos, __LINE__ + i); ok)
-				{
-					safe_int_compare.set(i);
-
-					for (u32 j = 0; j < 4; j++)
-					{
-						const u32 value = data._u32[j];
-						const u8 exponent = static_cast<u8>(value >> 23);
-
-						if ((value & 0x7fffffffu) >= 0x7f7fffffu || !exponent)
-						{
-							// See above
-							safe_int_compare.reset(i);
-						}
-					}
-				}
-			}
-
-			const auto ma = eval(fabs(a));
-			const auto mb = eval(fabs(b));
-
-			const auto mai = eval(bitcast<s32[4]>(ma));
-			const auto mbi = eval(bitcast<s32[4]>(mb));
-
-			if (safe_int_compare.any())
-			{
-				return eval(sext<s32[4]>(mai > mbi));
-			}
-
-			if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::approximate)
-			{
-				return eval(sext<s32[4]>(fcmp_uno(ma > mb) & (mai > mbi)));
-			}
-			else
-			{
-				return eval(sext<s32[4]>(fcmp_ord(ma > mb)));
-			}
-		});
-
-		set_vr(op.rt, fcmgt(get_vr<f32[4]>(op.ra), get_vr<f32[4]>(op.rb)));
-	}
-
-	template <typename T, typename U>
-	static llvm_calli<f32[4], T, U> fa(T&& a, U&& b)
-	{
-		return {"spu_fa", {std::forward<T>(a), std::forward<U>(b)}};
+			set_vr(op.rt, sext<s32[4]>(fcmp_uno(a > b) & (bitcast<s32[4]>(a) > bitcast<s32[4]>(b))));
+		}
+		else
+		{
+			set_vr(op.rt, sext<s32[4]>(fcmp_ord(a > b)));
+		}
 	}
 
 	void FA(spu_opcode_t op)
 	{
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
-		{
+		if (g_cfg.core.spu_accurate_xfloat)
 			set_vr(op.rt, get_vr<f64[4]>(op.ra) + get_vr<f64[4]>(op.rb));
-			return;
-		}
-
-		register_intrinsic("spu_fa", [&](llvm::CallInst* ci)
-		{
-			const auto a = value<f32[4]>(ci->getOperand(0));
-			const auto b = value<f32[4]>(ci->getOperand(1));
-
-			return a + b;
-		});
-
-		set_vr(op.rt, fa(get_vr<f32[4]>(op.ra), get_vr<f32[4]>(op.rb)));
-	}
-
-	template <typename T, typename U>
-	static llvm_calli<f32[4], T, U> fs(T&& a, U&& b)
-	{
-		return {"spu_fs", {std::forward<T>(a), std::forward<U>(b)}};
+		else
+			set_vr(op.rt, get_vr<f32[4]>(op.ra) + get_vr<f32[4]>(op.rb));
 	}
 
 	void FS(spu_opcode_t op)
 	{
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
-		{
+		if (g_cfg.core.spu_accurate_xfloat)
 			set_vr(op.rt, get_vr<f64[4]>(op.ra) - get_vr<f64[4]>(op.rb));
-			return;
-		}
-
-		register_intrinsic("spu_fs", [&](llvm::CallInst* ci)
+		else if (g_cfg.core.spu_approx_xfloat)
 		{
-			const auto a = value<f32[4]>(ci->getOperand(0));
-			const auto b = value<f32[4]>(ci->getOperand(1));
-
-			if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::approximate)
-			{
-				const auto bc = clamp_smax(b); // for #4478
-				return eval(a - bc);
-			}
-			else
-			{
-				return eval(a - b);
-			}
-		});
-
-		set_vr(op.rt, fs(get_vr<f32[4]>(op.ra), get_vr<f32[4]>(op.rb)));
-	}
-
-	template <typename T, typename U>
-	static llvm_calli<f32[4], T, U> fm(T&& a, U&& b)
-	{
-		return llvm_calli<f32[4], T, U>{"spu_fm", {std::forward<T>(a), std::forward<U>(b)}}.set_order_equality_hint(1, 1);
+			const auto b = eval(clamp_smax(get_vr<f32[4]>(op.rb))); // for #4478
+			set_vr(op.rt, get_vr<f32[4]>(op.ra) - b);
+		}
+		else
+			set_vr(op.rt, get_vr<f32[4]>(op.ra) - get_vr<f32[4]>(op.rb));
 	}
 
 	void FM(spu_opcode_t op)
 	{
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
-		{
+		if (g_cfg.core.spu_accurate_xfloat)
 			set_vr(op.rt, get_vr<f64[4]>(op.ra) * get_vr<f64[4]>(op.rb));
-			return;
-		}
-
-		register_intrinsic("spu_fm", [&](llvm::CallInst* ci)
-		{
-			const auto a = value<f32[4]>(ci->getOperand(0));
-			const auto b = value<f32[4]>(ci->getOperand(1));
-
-			if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::approximate)
-			{
-				if (a.value == b.value)
-				{
-					return eval(a * b);
-				}
-
-				const auto ma = sext<s32[4]>(fcmp_uno(a != fsplat<f32[4]>(0.)));
-				const auto mb = sext<s32[4]>(fcmp_uno(b != fsplat<f32[4]>(0.)));
-				return eval(bitcast<f32[4]>(bitcast<s32[4]>(a * b) & ma & mb));
-			}
-			else
-			{
-				return eval(a * b);
-			}
-		});
-
-		if (op.ra == op.rb && !m_interp_magn)
+		else if (g_cfg.core.spu_approx_xfloat)
 		{
 			const auto a = get_vr<f32[4]>(op.ra);
-			set_vr(op.rt, fm(a, a));
-			return;
-		}
+			const auto b = get_vr<f32[4]>(op.rb);
 
-		const auto [a, b] = get_vrs<f32[4]>(op.ra, op.rb);
-
-		// This causes issues in LBP 1(first platform on first temple level doesn't come down when grabbed)
-		// Presumably 1/x might result in Zero/NaN when a/x doesn't
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::relaxed)
-		{
-			auto full_fm_accurate = [&](const auto& a, const auto& div)
+			if (op.ra == op.rb && !m_interp_magn)
 			{
-				const auto div_result = a / div;
-				const auto result_and = bitcast<u32[4]>(div_result) & 0x7fffffffu;
-				const auto result_cmp_inf = sext<s32[4]>(result_and == splat<u32[4]>(0x7F800000u));
-				const auto result_cmp_nan = sext<s32[4]>(result_and <= splat<u32[4]>(0x7F800000u));
-
-				const auto and_mask = bitcast<u32[4]>(result_cmp_nan) & splat<u32[4]>(0xFFFFFFFFu);
-				const auto or_mask = bitcast<u32[4]>(result_cmp_inf) & splat<u32[4]>(0xFFFFFFFu);
-				set_vr(op.rt, bitcast<f32[4]>((bitcast<u32[4]>(div_result) & and_mask) | or_mask));
-			};
-
-			// FM(a, re_accurate(div))
-			if (const auto [ok_re_acc, div, one] = match_expr(b, re_accurate(match<f32[4]>(), match<f32[4]>())); ok_re_acc)
-			{
-				full_fm_accurate(a, div);
-				erase_stores(one, b);
+				set_vr(op.rt, fm(a, b));
 				return;
 			}
 
-			// FM(re_accurate(div), b)
-			if (const auto [ok_re_acc, div, one] = match_expr(a, re_accurate(match<f32[4]>(), match<f32[4]>())); ok_re_acc)
-			{
-				full_fm_accurate(b, div);
-				erase_stores(one, a);
-				return;
-			}
+			const auto ma = eval(sext<s32[4]>(fcmp_uno(a != fsplat<f32[4]>(0.))));
+			const auto mb = eval(sext<s32[4]>(fcmp_uno(b != fsplat<f32[4]>(0.))));
+			const auto cx = eval(ma & mb);
+			const auto x = fm(a, b);
+			set_vr(op.rt, eval(bitcast<f32[4]>(bitcast<s32[4]>(x) & cx)));
 		}
-
-		set_vr(op.rt, fm(a, b));
-	}
-
-	template <typename T>
-	static llvm_calli<f64[2], T> fesd(T&& a)
-	{
-		return {"spu_fesd", {std::forward<T>(a)}};
+		else
+			set_vr(op.rt, get_vr<f32[4]>(op.ra) * get_vr<f32[4]>(op.rb));
 	}
 
 	void FESD(spu_opcode_t op)
 	{
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
+		if (g_cfg.core.spu_accurate_xfloat)
 		{
-			const auto r = zshuffle(get_vr<f64[4]>(op.ra), 1, 3);
+			const auto r = shuffle2(get_vr<f64[4]>(op.ra), fsplat<f64[4]>(0.), 1, 3);
 			const auto d = bitcast<s64[2]>(r);
 			const auto a = eval(d & 0x7fffffffffffffff);
 			const auto s = eval(d & 0x8000000000000000);
 			const auto i = select(a == 0x47f0000000000000, eval(s | 0x7ff0000000000000), d);
 			const auto n = select(a > 0x47f0000000000000, splat<s64[2]>(0x7ff8000000000000), i);
 			set_vr(op.rt, bitcast<f64[2]>(n));
-			return;
 		}
-
-		register_intrinsic("spu_fesd", [&](llvm::CallInst* ci)
+		else
 		{
-			const auto a = value<f32[4]>(ci->getOperand(0));
-
-			return fpcast<f64[2]>(zshuffle(a, 1, 3));
-		});
-
-		set_vr(op.rt, fesd(get_vr<f32[4]>(op.ra)));
-	}
-
-	template <typename T>
-	static llvm_calli<f32[4], T> frds(T&& a)
-	{
-		return {"spu_frds", {std::forward<T>(a)}};
+			value_t<f64[2]> r;
+			r.value = m_ir->CreateFPExt(shuffle2(get_vr<f32[4]>(op.ra), fsplat<f32[4]>(0.), 1, 3).eval(m_ir), get_type<f64[2]>());
+			set_vr(op.rt, r);
+		}
 	}
 
 	void FRDS(spu_opcode_t op)
 	{
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
+		if (g_cfg.core.spu_accurate_xfloat)
 		{
 			const auto r = get_vr<f64[2]>(op.ra);
 			const auto d = bitcast<s64[2]>(r);
@@ -6565,708 +8002,287 @@ public:
 			const auto i = select(a > 0x47f0000000000000, eval(s | 0x47f0000000000000), d);
 			const auto n = select(a > 0x7ff0000000000000, splat<s64[2]>(0x47f8000000000000), i);
 			const auto z = select(a < 0x3810000000000000, s, n);
-			set_vr(op.rt, zshuffle(bitcast<f64[2]>(z), 2, 0, 3, 1), nullptr, false);
-			return;
+			set_vr(op.rt, shuffle2(bitcast<f64[2]>(z), fsplat<f64[2]>(0.), 2, 0, 3, 1), false);
 		}
-
-		register_intrinsic("spu_frds", [&](llvm::CallInst* ci)
+		else
 		{
-			const auto a = value<f64[2]>(ci->getOperand(0));
-
-			return zshuffle(fpcast<f32[2]>(a), 2, 0, 3, 1);
-		});
-
-		set_vr(op.rt, frds(get_vr<f64[2]>(op.ra)));
-	}
-
-	template <typename T, typename U>
-	static llvm_calli<s32[4], T, U> fceq(T&& a, U&& b)
-	{
-		return {"spu_fceq", {std::forward<T>(a), std::forward<U>(b)}};
+			value_t<f32[2]> r;
+			r.value = m_ir->CreateFPTrunc(get_vr<f64[2]>(op.ra).value, get_type<f32[2]>());
+			set_vr(op.rt, shuffle2(r, fsplat<f32[2]>(0.), 2, 0, 3, 1));
+		}
 	}
 
 	void FCEQ(spu_opcode_t op)
 	{
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
+		if (g_cfg.core.spu_accurate_xfloat)
 		{
 			set_vr(op.rt, sext<s32[4]>(fcmp_ord(get_vr<f64[4]>(op.ra) == get_vr<f64[4]>(op.rb))));
 			return;
 		}
 
-		register_intrinsic("spu_fceq", [&](llvm::CallInst* ci)
+		const auto [a, b] = get_vrs<f32[4]>(op.ra, op.rb);
+		const value_t<f32[4]> ab[2]{a, b};
+
+		std::bitset<2> safe_float_compare(0);
+		std::bitset<2> safe_int_compare(0);
+
+		for (u32 i = 0; i < 2; i++)
 		{
-			const auto a = value<f32[4]>(ci->getOperand(0));
-			const auto b = value<f32[4]>(ci->getOperand(1));
-
-			const value_t<f32[4]> ab[2]{a, b};
-
-			std::bitset<2> safe_float_compare(0);
-			std::bitset<2> safe_int_compare(0);
-
-			for (u32 i = 0; i < 2; i++)
+			if (auto [ok, data] = get_const_vector(ab[i].value, m_pos, 6000); ok)
 			{
-				if (auto [ok, data] = get_const_vector(ab[i].value, m_pos, __LINE__ + i); ok)
+				safe_float_compare.set(i);
+				safe_int_compare.set(i);
+
+				for (u32 j = 0; j < 4; j++)
 				{
-					safe_float_compare.set(i);
-					safe_int_compare.set(i);
+					const u32 value = data._u32[j];
+					const u8 exponent = static_cast<u8>(value >> 23);
 
-					for (u32 j = 0; j < 4; j++)
+					// unsafe if nan
+					if (exponent == 255)
 					{
-						const u32 value = data._u32[j];
-						const u8 exponent = static_cast<u8>(value >> 23);
+						safe_float_compare.reset(i);
+					}
 
-						// unsafe if nan
-						if (exponent == 255)
-						{
-							safe_float_compare.reset(i);
-						}
-
-						// unsafe if denormal or 0
-						if (!exponent)
-						{
-							safe_int_compare.reset(i);
-						}
+					// unsafe if denormal or 0
+					if (!exponent)
+					{
+						safe_int_compare.reset(i);
 					}
 				}
 			}
+		}
 
-			if (safe_float_compare.any())
-			{
-				return eval(sext<s32[4]>(fcmp_ord(a == b)));
-			}
+		if (safe_float_compare.any())
+		{
+			set_vr(op.rt, sext<s32[4]>(fcmp_ord(a == b)));
+			return;
+		}
 
-			if (safe_int_compare.any())
-			{
-				return eval(sext<s32[4]>(bitcast<s32[4]>(a) == bitcast<s32[4]>(b)));
-			}
+		if (safe_int_compare.any())
+		{
+			set_vr(op.rt, sext<s32[4]>(bitcast<s32[4]>(a) == bitcast<s32[4]>(b)));
+			return;
+		}
 
-			if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::approximate)
-			{
-				return eval(sext<s32[4]>(fcmp_ord(a == b)) | sext<s32[4]>(bitcast<s32[4]>(a) == bitcast<s32[4]>(b)));
-			}
-			else
-			{
-				return eval(sext<s32[4]>(fcmp_ord(a == b)));
-			}
-		});
-
-		set_vr(op.rt, fceq(get_vr<f32[4]>(op.ra), get_vr<f32[4]>(op.rb)));
-	}
-
-	template <typename T, typename U>
-	static llvm_calli<s32[4], T, U> fcmeq(T&& a, U&& b)
-	{
-		return {"spu_fcmeq", {std::forward<T>(a), std::forward<U>(b)}};
+		if (g_cfg.core.spu_approx_xfloat)
+		{
+			const auto ai = eval(bitcast<s32[4]>(a));
+			const auto bi = eval(bitcast<s32[4]>(b));
+			set_vr(op.rt, sext<s32[4]>(fcmp_ord(a == b)) | sext<s32[4]>(ai == bi));
+		}
+		else
+		{
+			set_vr(op.rt, sext<s32[4]>(fcmp_ord(a == b)));
+		}
 	}
 
 	void FCMEQ(spu_opcode_t op)
 	{
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
+		if (g_cfg.core.spu_accurate_xfloat)
 		{
 			set_vr(op.rt, sext<s32[4]>(fcmp_ord(fabs(get_vr<f64[4]>(op.ra)) == fabs(get_vr<f64[4]>(op.rb)))));
 			return;
 		}
 
-		register_intrinsic("spu_fcmeq", [&](llvm::CallInst* ci)
+		const auto [a, b] = get_vrs<f32[4]>(op.ra, op.rb);
+		const value_t<f32[4]> ab[2]{a, b};
+
+		std::bitset<2> safe_float_compare(0);
+		std::bitset<2> safe_int_compare(0);
+
+		for (u32 i = 0; i < 2; i++)
 		{
-			const auto a = value<f32[4]>(ci->getOperand(0));
-			const auto b = value<f32[4]>(ci->getOperand(1));
-
-			const value_t<f32[4]> ab[2]{a, b};
-
-			std::bitset<2> safe_float_compare(0);
-			std::bitset<2> safe_int_compare(0);
-
-			for (u32 i = 0; i < 2; i++)
+			if (auto [ok, data] = get_const_vector(ab[i].value, m_pos, 6000); ok)
 			{
-				if (auto [ok, data] = get_const_vector(ab[i].value, m_pos, __LINE__ + i); ok)
+				safe_float_compare.set(i);
+				safe_int_compare.set(i);
+
+				for (u32 j = 0; j < 4; j++)
 				{
-					safe_float_compare.set(i);
-					safe_int_compare.set(i);
+					const u32 value = data._u32[j];
+					const u8 exponent = static_cast<u8>(value >> 23);
 
-					for (u32 j = 0; j < 4; j++)
+					// unsafe if nan
+					if (exponent == 255)
 					{
-						const u32 value = data._u32[j];
-						const u8 exponent = static_cast<u8>(value >> 23);
+						safe_float_compare.reset(i);
+					}
 
-						// unsafe if nan
-						if (exponent == 255)
-						{
-							safe_float_compare.reset(i);
-						}
-
-						// unsafe if denormal or 0
-						if (!exponent)
-						{
-							safe_int_compare.reset(i);
-						}
+					// unsafe if denormal or 0
+					if (!exponent)
+					{
+						safe_int_compare.reset(i);
 					}
 				}
 			}
+		}
 
-			const auto fa = eval(fabs(a));
-			const auto fb = eval(fabs(b));
+		const auto fa = eval(fabs(a));
+		const auto fb = eval(fabs(b));
 
-			if (safe_float_compare.any())
-			{
-				return eval(sext<s32[4]>(fcmp_ord(fa == fb)));
-			}
+		if (safe_float_compare.any())
+		{
+			set_vr(op.rt, sext<s32[4]>(fcmp_ord(fa == fb)));
+			return;
+		}
 
-			if (safe_int_compare.any())
-			{
-				return eval(sext<s32[4]>(bitcast<s32[4]>(fa) == bitcast<s32[4]>(fb)));
-			}
+		if (safe_int_compare.any())
+		{
+			set_vr(op.rt, sext<s32[4]>(bitcast<s32[4]>(fa) == bitcast<s32[4]>(fb)));
+			return;
+		}
 
-			if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::approximate)
-			{
-				return eval(sext<s32[4]>(fcmp_ord(fa == fb)) | sext<s32[4]>(bitcast<s32[4]>(fa) == bitcast<s32[4]>(fb)));
-			}
-			else
-			{
-				return eval(sext<s32[4]>(fcmp_ord(fa == fb)));
-			}
-		});
-
-		set_vr(op.rt, fcmeq(get_vr<f32[4]>(op.ra), get_vr<f32[4]>(op.rb)));
+		if (g_cfg.core.spu_approx_xfloat)
+		{
+			const auto ai = eval(bitcast<s32[4]>(fa));
+			const auto bi = eval(bitcast<s32[4]>(fb));
+			set_vr(op.rt, sext<s32[4]>(fcmp_ord(fa == fb)) | sext<s32[4]>(ai == bi));
+		}
+		else
+		{
+			set_vr(op.rt, sext<s32[4]>(fcmp_ord(fa == fb)));
+		}
 	}
 
 	value_t<f32[4]> fma32x4(value_t<f32[4]> a, value_t<f32[4]> b, value_t<f32[4]> c)
 	{
+		value_t<f32[4]> r;
+
 		// Optimization: Emit only a floating multiply if the addend is zero
 		// This is odd since SPU code could just use the FM instruction, but it seems common enough
-		if (auto [ok, data] = get_const_vector(c.value, m_pos); ok)
+		if (auto [ok, data] = get_const_vector(c.value, m_pos, 4000); ok)
 		{
-			if (is_spu_float_zero(data, 0))
+			if (is_spu_float_zero(data, -1))
 			{
-				return eval(a * b);
+				r = eval(a * b);
+				return r;
+			}
+
+			if (!m_use_fma && is_spu_float_zero(data, +1))
+			{
+				r = eval(a * b + fsplat<f32[4]>(0.f));
+				return r;
 			}
 		}
 
 		if ([&]()
 		{
-			if (auto [ok, data] = get_const_vector(a.value, m_pos); ok)
+			if (auto [ok, data] = get_const_vector(a.value, m_pos, 4000); ok)
 			{
-				if (is_spu_float_zero(data, 0))
+				if (!is_spu_float_zero(data, +1))
 				{
-					return true;
+					return false;
+				}
+
+				if (auto [ok0, data0] = get_const_vector(b.value, m_pos, 4000); ok0)
+				{
+					if (is_spu_float_zero(data0, +1))
+					{
+						return true;
+					}
 				}
 			}
 
-			if (auto [ok, data] = get_const_vector(b.value, m_pos); ok)
+			if (auto [ok, data] = get_const_vector(a.value, m_pos, 4000); ok)
 			{
-				if (is_spu_float_zero(data, 0))
+				if (!is_spu_float_zero(data, -1))
 				{
-					return true;
+					return false;
+				}
+
+				if (auto [ok0, data0] = get_const_vector(b.value, m_pos, 4000); ok0)
+				{
+					if (is_spu_float_zero(data0, -1))
+					{
+						return true;
+					}
 				}
 			}
 
 			return false;
 		}())
 		{
-			// Just return the added value if either a or b are +-0
+			// Just return the added value if both a and b is +0 or -0 (+0 and -0 arent't allowed alone)
 			return c;
 		}
 
 		if (m_use_fma)
 		{
-			return eval(fmuladd(a, b, c, true));
+			r.value = m_ir->CreateCall(get_intrinsic<f32[4]>(llvm::Intrinsic::fma), {a.value, b.value, c.value});
+			return r;
 		}
 
 		// Convert to doubles
-		const auto xa = fpcast<f64[4]>(a);
-		const auto xb = fpcast<f64[4]>(b);
-		const auto xc = fpcast<f64[4]>(c);
-		const auto xr = fmuladd(xa, xb, xc, false);
-		return eval(fpcast<f32[4]>(xr));
-	}
-
-	template <typename T, typename U, typename V>
-	static llvm_calli<f32[4], T, U, V> fnms(T&& a, U&& b, V&& c)
-	{
-		return llvm_calli<f32[4], T, U, V>{"spu_fnms", {std::forward<T>(a), std::forward<U>(b), std::forward<V>(c)}}.set_order_equality_hint(1, 1, 0);
+		const auto xa = m_ir->CreateFPExt(a.value, get_type<f64[4]>());
+		const auto xb = m_ir->CreateFPExt(b.value, get_type<f64[4]>());
+		const auto xc = m_ir->CreateFPExt(c.value, get_type<f64[4]>());
+		const auto xr = m_ir->CreateCall(get_intrinsic<f64[4]>(llvm::Intrinsic::fmuladd), {xa, xb, xc});
+		r.value = m_ir->CreateFPTrunc(xr, get_type<f32[4]>());
+		return r;
 	}
 
 	void FNMS(spu_opcode_t op)
 	{
 		// See FMA.
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
+		if (g_cfg.core.spu_accurate_xfloat)
+			set_vr(op.rt4, fmuladd(eval(-get_vr<f64[4]>(op.ra)), get_vr<f64[4]>(op.rb), get_vr<f64[4]>(op.rc)));
+		else if (g_cfg.core.spu_approx_xfloat)
 		{
-			const auto [a, b, c] = get_vrs<f64[4]>(op.ra, op.rb, op.rc);
-			set_vr(op.rt4, fmuladd(-a, b, c));
-			return;
+			const auto a = eval(clamp_smax(get_vr<f32[4]>(op.ra)));
+			const auto b = eval(clamp_smax(get_vr<f32[4]>(op.rb)));
+			set_vr(op.rt4, fma32x4(eval(-(a)), (b), get_vr<f32[4]>(op.rc)));
 		}
-
-		register_intrinsic("spu_fnms", [&](llvm::CallInst* ci)
-		{
-			const auto a = value<f32[4]>(ci->getOperand(0));
-			const auto b = value<f32[4]>(ci->getOperand(1));
-			const auto c = value<f32[4]>(ci->getOperand(2));
-
-			return fma32x4(eval(-clamp_smax(a)), clamp_smax(b), c);
-		});
-
-		set_vr(op.rt4, fnms(get_vr<f32[4]>(op.ra), get_vr<f32[4]>(op.rb), get_vr<f32[4]>(op.rc)));
-	}
-
-	template <typename T, typename U, typename V>
-	static llvm_calli<f32[4], T, U, V> fma(T&& a, U&& b, V&& c)
-	{
-		return llvm_calli<f32[4], T, U, V>{"spu_fma", {std::forward<T>(a), std::forward<U>(b), std::forward<V>(c)}}.set_order_equality_hint(1, 1, 0);
-	}
-
-	template <typename T, typename U>
-	static llvm_calli<f32[4], T, U> re_accurate(T&& a, U&& b)
-	{
-		return {"spu_re_acc", {std::forward<T>(a), std::forward<U>(b)}};
+		else
+			set_vr(op.rt4, fma32x4(eval(-get_vr<f32[4]>(op.ra)), get_vr<f32[4]>(op.rb), get_vr<f32[4]>(op.rc)));
 	}
 
 	void FMA(spu_opcode_t op)
 	{
 		// Hardware FMA produces the same result as multiple + add on the limited double range (xfloat).
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
+		if (g_cfg.core.spu_accurate_xfloat)
+			set_vr(op.rt4, fmuladd(get_vr<f64[4]>(op.ra), get_vr<f64[4]>(op.rb), get_vr<f64[4]>(op.rc)));
+		else if (g_cfg.core.spu_approx_xfloat)
 		{
-			const auto [a, b, c] = get_vrs<f64[4]>(op.ra, op.rb, op.rc);
-			set_vr(op.rt4, fmuladd(a, b, c));
-			return;
-		}
-
-		register_intrinsic("spu_fma", [&](llvm::CallInst* ci)
-		{
-			const auto a = value<f32[4]>(ci->getOperand(0));
-			const auto b = value<f32[4]>(ci->getOperand(1));
-			const auto c = value<f32[4]>(ci->getOperand(2));
-
-			if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::approximate)
-			{
-				const auto ma = sext<s32[4]>(fcmp_uno(a != fsplat<f32[4]>(0.)));
-				const auto mb = sext<s32[4]>(fcmp_uno(b != fsplat<f32[4]>(0.)));
-				const auto ca = bitcast<f32[4]>(bitcast<s32[4]>(a) & mb);
-				const auto cb = bitcast<f32[4]>(bitcast<s32[4]>(b) & ma);
-				return fma32x4(eval(ca), eval(cb), c);
-			}
-			else
-			{
-				return fma32x4(a, b, c);
-			}
-		});
-
-		if (m_use_avx512)
-		{
-			register_intrinsic("spu_re_acc", [&](llvm::CallInst* ci)
-			{
-				const auto div = value<f32[4]>(ci->getOperand(0));
-				const auto the_one = value<f32[4]>(ci->getOperand(1));
-
-				const auto div_result = the_one / div;
-
-				return vfixupimmps(div_result, div_result, splat<u32[4]>(0x00220088u), 0, 0xff);
-			});	
+			const auto a = get_vr<f32[4]>(op.ra);
+			const auto b = get_vr<f32[4]>(op.rb);
+			const auto ma = eval(sext<s32[4]>(fcmp_uno(a != fsplat<f32[4]>(0.))));
+			const auto mb = eval(sext<s32[4]>(fcmp_uno(b != fsplat<f32[4]>(0.))));
+			const auto ca = eval(bitcast<f32[4]>(bitcast<s32[4]>(a) & mb));
+			const auto cb = eval(bitcast<f32[4]>(bitcast<s32[4]>(b) & ma));
+			set_vr(op.rt4, fma32x4((ca), (cb), get_vr<f32[4]>(op.rc)));
 		}
 		else
-		{
-			register_intrinsic("spu_re_acc", [&](llvm::CallInst* ci)
-			{			
-				const auto div = value<f32[4]>(ci->getOperand(0));
-				const auto the_one = value<f32[4]>(ci->getOperand(1));
-
-				const auto div_result = the_one / div;
-
-				// from ps3 hardware testing: Inf => NaN and NaN => Zero
-				const auto result_and = bitcast<u32[4]>(div_result) & 0x7fffffffu;
-				const auto result_cmp_inf = sext<s32[4]>(result_and == splat<u32[4]>(0x7F800000u));
-				const auto result_cmp_nan = sext<s32[4]>(result_and <= splat<u32[4]>(0x7F800000u));
-
-				const auto and_mask = bitcast<u32[4]>(result_cmp_nan) & splat<u32[4]>(0xFFFFFFFFu);
-				const auto or_mask = bitcast<u32[4]>(result_cmp_inf) & splat<u32[4]>(0xFFFFFFFu);
-				return bitcast<f32[4]>((bitcast<u32[4]>(div_result) & and_mask) | or_mask);
-			});
-		}
-
-		
-		const auto [a, b, c] = get_vrs<f32[4]>(op.ra, op.rb, op.rc);
-		static const auto MT = match<f32[4]>();
-
-		auto check_sqrt_pattern_for_float = [&](f32 float_value) -> bool
-		{
-			auto match_fnms = [&](f32 float_value)
-			{
-				auto res = match_expr(a, fnms(MT, MT, fsplat<f32[4]>(float_value)));
-				if (std::get<0>(res))
-					return res;
-
-				return match_expr(b, fnms(MT, MT, fsplat<f32[4]>(float_value)));
-			};
-
-			auto match_fm_half = [&]()
-			{
-				auto res = match_expr(a, fm(MT, fsplat<f32[4]>(0.5)));
-				if (std::get<0>(res))
-					return res;
-
-				res = match_expr(a, fm(fsplat<f32[4]>(0.5), MT));
-				if (std::get<0>(res))
-					return res;
-
-				res = match_expr(b, fm(MT, fsplat<f32[4]>(0.5)));
-				if (std::get<0>(res))
-					return res;
-
-				return match_expr(b, fm(fsplat<f32[4]>(0.5), MT));
-			};
-
-
-			if (auto [ok_fnma, a1, b1] = match_fnms(float_value); ok_fnma)
-			{
-				if (auto [ok_fm2, fm_half_mul] = match_fm_half(); ok_fm2 && fm_half_mul.eq(b1))
-				{
-					if (fm_half_mul.eq(b1))
-					{
-						if (auto [ok_fm1, a3, b3] = match_expr(c, fm(MT, MT)); ok_fm1 && a3.eq(a1))
-						{
-							if (auto [ok_sqrte, src] = match_expr(a3, spu_rsqrte(MT)); ok_sqrte && src.eq(b3))
-							{
-								erase_stores(a, b, c, a3);
-								set_vr(op.rt4, fsqrt(fabs(src)));
-								return true;
-							}	
-						}
-						else if (auto [ok_fm1, a3, b3] = match_expr(c, fm(MT, MT)); ok_fm1 && b3.eq(a1))
-						{
-							if (auto [ok_sqrte, src] = match_expr(b3, spu_rsqrte(MT)); ok_sqrte && src.eq(a3))
-							{
-								erase_stores(a, b, c, b3);
-								set_vr(op.rt4, fsqrt(fabs(src)));
-								return true;
-							}	
-						}
-					}
-					else if (fm_half_mul.eq(a1))
-					{
-						if (auto [ok_fm1, a3, b3] = match_expr(c, fm(MT, MT)); ok_fm1 && a3.eq(b1))
-						{
-							if (auto [ok_sqrte, src] = match_expr(a3, spu_rsqrte(MT)); ok_sqrte && src.eq(b3))
-							{
-								erase_stores(a, b, c, a3);
-								set_vr(op.rt4, fsqrt(fabs(src)));
-								return true;
-							}	
-						}
-						else if (auto [ok_fm1, a3, b3] = match_expr(c, fm(MT, MT)); ok_fm1 && b3.eq(b1))
-						{
-							if (auto [ok_sqrte, src] = match_expr(b3, spu_rsqrte(MT)); ok_sqrte && src.eq(a3))
-							{
-								erase_stores(a, b, c, b3);
-								set_vr(op.rt4, fsqrt(fabs(src)));
-								return true;
-							}	
-						}
-					}
-				}
-			}
-
-			return false;
-		};
-
-		if (check_sqrt_pattern_for_float(1.0f))
-			return;
-
-		if (check_sqrt_pattern_for_float(std::bit_cast<f32>(std::bit_cast<u32>(1.0f) + 1)))
-			return;
-
-		auto check_accurate_reciprocal_pattern_for_float = [&](f32 float_value) -> bool
-		{
-			// FMA(FNMS(div, spu_re(div), float_value), spu_re(div), spu_re(div))
-			if (auto [ok_fnms, div] = match_expr(a, fnms(MT, b, fsplat<f32[4]>(float_value))); ok_fnms && op.rb == op.rc)
-			{
-				if (auto [ok_re] = match_expr(b, spu_re(div)); ok_re)
-				{
-					erase_stores(a, b, c);
-					set_vr(op.rt4, re_accurate(div, fsplat<f32[4]>(float_value)));
-					return true;
-				}
-			}
-
-			// FMA(FNMS(spu_re(div), div, float_value), spu_re(div), spu_re(div))
-			if (auto [ok_fnms, div] = match_expr(a, fnms(b, MT, fsplat<f32[4]>(float_value))); ok_fnms && op.rb == op.rc)
-			{
-				if (auto [ok_re] = match_expr(b, spu_re(div)); ok_re)
-				{
-					erase_stores(a, b, c);
-					set_vr(op.rt4, re_accurate(div, fsplat<f32[4]>(float_value)));
-					return true;
-				}
-			}
-
-			// FMA(spu_re(div), FNMS(div, spu_re(div), float_value), spu_re(div))
-			if (auto [ok_fnms, div] = match_expr(b, fnms(MT, a, fsplat<f32[4]>(float_value))); ok_fnms && op.ra == op.rc)
-			{
-				if (auto [ok_re] = match_expr(a, spu_re(div)); ok_re)
-				{
-					erase_stores(a, b, c);
-					set_vr(op.rt4, re_accurate(div, fsplat<f32[4]>(float_value)));
-					return true;
-				}
-			}
-
-			// FMA(spu_re(div), FNMS(spu_re(div), div, float_value), spu_re(div))
-			if (auto [ok_fnms, div] = match_expr(b, fnms(a, MT, fsplat<f32[4]>(float_value))); ok_fnms && op.ra == op.rc)
-			{
-				if (auto [ok_re] = match_expr(a, spu_re(div)); ok_re)
-				{
-					erase_stores(a, b, c);
-					set_vr(op.rt4, re_accurate(div, fsplat<f32[4]>(float_value)));
-					return true;
-				}
-			}
-
-			return false;
-		};
-
-		if (check_accurate_reciprocal_pattern_for_float(1.0f))
-			return;
-
-		if (check_accurate_reciprocal_pattern_for_float(std::bit_cast<f32>(std::bit_cast<u32>(1.0f) + 1)))
-			return;
-
-		// NFS Most Wanted doesn't like this
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::relaxed)
-		{
-			// Those patterns are not safe vs non optimization as inaccuracy from spu_re will spread with early fm before the accuracy is improved
-
-			// Match division (fast)
-			// FMA(FNMS(fm(diva<*> spu_re(divb)), divb, diva), spu_re(divb), fm(diva<*> spu_re(divb)))
-			if (auto [ok_fnma, divb, diva] = match_expr(a, fnms(c, MT, MT)); ok_fnma)
-			{
-				if (auto [ok_fm, fm1, fm2] = match_expr(c, fm(MT, MT)); ok_fm && ((fm1.eq(diva) && fm2.eq(b)) || (fm1.eq(b) && fm2.eq(diva))))
-				{
-					if (auto [ok_re] = match_expr(b, spu_re(divb)); ok_re)
-					{
-						erase_stores(b, c);
-						set_vr(op.rt4, diva / divb);
-						return;
-					}
-				}
-			}
-
-			// FMA(spu_re(divb), FNMS(fm(diva <*> spu_re(divb)), divb, diva), fm(diva <*> spu_re(divb)))
-			if (auto [ok_fnma, divb, diva] = match_expr(b, fnms(c, MT, MT)); ok_fnma)
-			{
-				if (auto [ok_fm, fm1, fm2] = match_expr(c, fm(MT, MT)); ok_fm && ((fm1.eq(diva) && fm2.eq(a)) || (fm1.eq(a) && fm2.eq(diva))))
-				{
-					if (auto [ok_re] = match_expr(a, spu_re(divb)); ok_re)
-					{
-						erase_stores(a, c);
-						set_vr(op.rt4, diva / divb);
-						return;
-					}
-				}
-			}
-		}
-
-		// Not all patterns can be simplified because of block scope
-		// Those todos don't necessarily imply a missing pattern
-
-		if (auto [ok_re, mystery] = match_expr(a, spu_re(MT)); ok_re)
-		{
-			spu_log.todo("[%s:0x%05x] Unmatched spu_re(a) found in FMA", m_hash, m_pos);
-		}
-
-		if (auto [ok_re, mystery] = match_expr(b, spu_re(MT)); ok_re)
-		{
-			spu_log.todo("[%s:0x%05x] Unmatched spu_re(b) found in FMA", m_hash, m_pos);
-		}
-
-		if (auto [ok_resq, mystery] = match_expr(c, spu_rsqrte(MT)); ok_resq)
-		{
-			spu_log.todo("[%s:0x%05x] Unmatched spu_rsqrte(c) found in FMA", m_hash, m_pos);
-		}
-
-		set_vr(op.rt4, fma(a, b, c));
-	}
-
-	template <typename T, typename U, typename V>
-	static llvm_calli<f32[4], T, U, V> fms(T&& a, U&& b, V&& c)
-	{
-		return llvm_calli<f32[4], T, U, V>{"spu_fms", {std::forward<T>(a), std::forward<U>(b), std::forward<V>(c)}}.set_order_equality_hint(1, 1, 0);
+			set_vr(op.rt4, fma32x4(get_vr<f32[4]>(op.ra), get_vr<f32[4]>(op.rb), get_vr<f32[4]>(op.rc)));
 	}
 
 	void FMS(spu_opcode_t op)
 	{
 		// See FMA.
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
+		if (g_cfg.core.spu_accurate_xfloat)
+			set_vr(op.rt4, fmuladd(get_vr<f64[4]>(op.ra), get_vr<f64[4]>(op.rb), eval(-get_vr<f64[4]>(op.rc))));
+		else if (g_cfg.core.spu_approx_xfloat)
 		{
-			const auto [a, b, c] = get_vrs<f64[4]>(op.ra, op.rb, op.rc);
-			set_vr(op.rt4, fmuladd(a, b, -c));
-			return;
+			const auto a = eval(clamp_smax(get_vr<f32[4]>(op.ra)));
+			const auto b = eval(clamp_smax(get_vr<f32[4]>(op.rb)));
+			set_vr(op.rt4, fma32x4((a), (b), eval(-get_vr<f32[4]>(op.rc))));
 		}
-
-		register_intrinsic("spu_fms", [&](llvm::CallInst* ci)
-		{
-			const auto a = value<f32[4]>(ci->getOperand(0));
-			const auto b = value<f32[4]>(ci->getOperand(1));
-			const auto c = value<f32[4]>(ci->getOperand(2));
-
-			if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::approximate)
-			{
-				return fma32x4(clamp_smax(a), clamp_smax(b), eval(-c));
-			}
-			else
-			{
-				return fma32x4(a, b, eval(-c));
-			}
-		});
-
-		set_vr(op.rt4, fms(get_vr<f32[4]>(op.ra), get_vr<f32[4]>(op.rb), get_vr<f32[4]>(op.rc)));
-	}
-
-	template <typename T, typename U>
-	static llvm_calli<f32[4], T, U> fi(T&& a, U&& b)
-	{
-		return {"spu_fi", {std::forward<T>(a), std::forward<U>(b)}};
-	}
-
-	template <typename T>
-	static llvm_calli<f32[4], T> spu_re(T&& a)
-	{
-		return {"spu_re", {std::forward<T>(a)}};
-	}
-
-	template <typename T>
-	static llvm_calli<f32[4], T> spu_rsqrte(T&& a)
-	{
-		return {"spu_rsqrte", {std::forward<T>(a)}};
+		else
+			set_vr(op.rt4, fma32x4(get_vr<f32[4]>(op.ra), get_vr<f32[4]>(op.rb), eval(-get_vr<f32[4]>(op.rc))));
 	}
 
 	void FI(spu_opcode_t op)
 	{
-		register_intrinsic("spu_fi", [&](llvm::CallInst* ci)
-		{
-			// TODO: adjustment for denormals(for accurate xfloat only?)
-			const auto a = bitcast<u32[4]>(value<f32[4]>(ci->getOperand(0)));
-			const auto b = bitcast<u32[4]>(value<f32[4]>(ci->getOperand(1)));
-
-			const auto base = (b & 0x007ffc00u) << 9; // Base fraction
-			const auto ymul = (b & 0x3ff) * (a & 0x7ffff); // Step fraction * Y fraction (fixed point at 2^-32)
-			const auto comparison = (ymul > base); // Should exponent be adjusted?
-			const auto bnew = (base - ymul) >> (zext<u32[4]>(comparison) ^ 9); // Shift one less bit if exponent is adjusted
-			const auto base_result = (b & 0xff800000u) | (bnew & ~0xff800000u); // Inject old sign and exponent
-			const auto adjustment = bitcast<u32[4]>(sext<s32[4]>(comparison)) & (1 << 23); // exponent adjustement for negative bnew
-			return clamp_smax(eval(bitcast<f32[4]>(base_result - adjustment)));
-		});
-
-		const auto [a, b] = get_vrs<f32[4]>(op.ra, op.rb);
-
-		switch (g_cfg.core.spu_xfloat_accuracy)
-		{
-		case xfloat_accuracy::approximate:
-		{
-			// For approximate, create a pattern but do not optimize yet
-			register_intrinsic("spu_re", [&](llvm::CallInst* ci)
-			{
-				const auto a = bitcast<u32[4]>(value<f32[4]>(ci->getOperand(0)));
-				const auto a_fraction = (a >> splat<u32[4]>(18)) & splat<u32[4]>(0x1F);
-				const auto a_exponent = (a & splat<u32[4]>(0x7F800000u));
-				const auto r_exponent = sub_sat(build<u16[8]>(0000, 0x7E80, 0000, 0x7E80, 0000, 0x7E80, 0000, 0x7E80), bitcast<u16[8]>(a_exponent));
-				const auto fix_exponent = select((a_exponent > 0), bitcast<u32[4]>(r_exponent), splat<u32[4]>(0x7F800000u));
-				const auto a_sign = (a & splat<u32[4]>(0x80000000));
-				value_t<u32[4]> b = eval(splat<u32[4]>(0));
-
-				for (u32 i = 0; i < 4; i++)
-				{
-					const auto eval_fraction = eval(extract(a_fraction, i));
-
-					value_t<u32> r_fraction = load_const<u32>(m_spu_frest_fraction_lut, eval_fraction);
-
-					b = eval(insert(b, i, r_fraction));
-				}
-
-				b = eval(b | fix_exponent | a_sign);
-
-				const auto base = (b & 0x007ffc00u) << 9; // Base fraction
-				const auto ymul = (b & 0x3ff) * (a & 0x7ffff); // Step fraction * Y fraction (fixed point at 2^-32)
-				const auto comparison = (ymul > base); // Should exponent be adjusted?
-				const auto bnew = (base - ymul) >> (zext<u32[4]>(comparison) ^ 9); // Shift one less bit if exponent is adjusted
-				const auto base_result = (b & 0xff800000u) | (bnew & ~0xff800000u); // Inject old sign and exponent
-				const auto adjustment = bitcast<u32[4]>(sext<s32[4]>(comparison)) & (1 << 23); // exponent adjustement for negative bnew
-				return clamp_smax(eval(bitcast<f32[4]>(base_result - adjustment)));
-			});
-
-			register_intrinsic("spu_rsqrte", [&](llvm::CallInst* ci)
-			{
-				const auto a = bitcast<u32[4]>(value<f32[4]>(ci->getOperand(0)));
-				const auto a_fraction = (a >> splat<u32[4]>(18)) & splat<u32[4]>(0x3F);
-				const auto a_exponent = (a >> splat<u32[4]>(23)) & splat<u32[4]>(0xFF);
-				value_t<u32[4]> b = eval(splat<u32[4]>(0));
-
-				for (u32 i = 0; i < 4; i++)
-				{
-					const auto eval_fraction = eval(extract(a_fraction, i));
-					const auto eval_exponent = eval(extract(a_exponent, i));
-
-					value_t<u32> r_fraction = load_const<u32>(m_spu_frsqest_fraction_lut, eval_fraction);
-					value_t<u32> r_exponent = load_const<u32>(m_spu_frsqest_exponent_lut, eval_exponent);
-
-					b = eval(insert(b, i, eval(r_fraction | r_exponent)));
-				}
-
-				const auto base = (b & 0x007ffc00u) << 9; // Base fraction
-				const auto ymul = (b & 0x3ff) * (a & 0x7ffff); // Step fraction * Y fraction (fixed point at 2^-32)
-				const auto comparison = (ymul > base); // Should exponent be adjusted?
-				const auto bnew = (base - ymul) >> (zext<u32[4]>(comparison) ^ 9); // Shift one less bit if exponent is adjusted
-				const auto base_result = (b & 0xff800000u) | (bnew & ~0xff800000u); // Inject old sign and exponent
-				const auto adjustment = bitcast<u32[4]>(sext<s32[4]>(comparison)) & (1 << 23); // exponent adjustement for negative bnew
-				return clamp_smax(eval(bitcast<f32[4]>(base_result - adjustment)));
-			});
-			break;
-		}
-		case xfloat_accuracy::relaxed:
-		{
-			// For relaxed, agressively optimize and use intrinsics, those make the results vary per cpu
-			register_intrinsic("spu_re", [&](llvm::CallInst* ci)
-			{
-				const auto a = value<f32[4]>(ci->getOperand(0));
-				return fre(a);
-			});
-
-			register_intrinsic("spu_rsqrte", [&](llvm::CallInst* ci)
-			{
-				const auto a = value<f32[4]>(ci->getOperand(0));
-				return frsqe(a);
-			});
-			break;
-		}
-		default:
-			break;
-		}
-
-		// Do not pattern match for accurate
-		if(g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::approximate || g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::relaxed)
-		{
-			if (const auto [ok, mb] = match_expr(b, frest(match<f32[4]>())); ok && mb.eq(a))
-			{
-				erase_stores(b);
-				set_vr(op.rt, spu_re(a));
-				return;
-			}
-
-			if (const auto [ok, mb] = match_expr(b, frsqest(match<f32[4]>())); ok && mb.eq(a))
-			{
-				erase_stores(b);
-				set_vr(op.rt, spu_rsqrte(a));
-				return;
-			}
-		}
-
-		const auto r = eval(fi(a, b));
-		if (!m_interp_magn && g_cfg.core.spu_xfloat_accuracy != xfloat_accuracy::accurate)
-			spu_log.todo("[%s:0x%05x] Unmatched spu_fi found", m_hash, m_pos);
-
-		set_vr(op.rt, r);
+		// TODO
+		if (g_cfg.core.spu_accurate_xfloat)
+			set_vr(op.rt, get_vr<f64[4]>(op.rb));
+		else
+			set_vr(op.rt, get_vr<f32[4]>(op.rb));
 	}
 
 	void CFLTS(spu_opcode_t op)
 	{
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
+		if (g_cfg.core.spu_accurate_xfloat)
 		{
 			value_t<f64[4]> a = get_vr<f64[4]>(op.ra);
 			value_t<f64[4]> s;
@@ -7340,7 +8356,7 @@ public:
 
 	void CFLTU(spu_opcode_t op)
 	{
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
+		if (g_cfg.core.spu_accurate_xfloat)
 		{
 			value_t<f64[4]> a = get_vr<f64[4]>(op.ra);
 			value_t<f64[4]> s;
@@ -7407,15 +8423,6 @@ public:
 				a = eval(a * s);
 
 			value_t<s32[4]> r;
-
-			if (m_use_avx512)
-			{
-				const auto sc = eval(bitcast<f32[4]>(max(bitcast<s32[4]>(a),splat<s32[4]>(0x0))));
-				r.value = m_ir->CreateFPToUI(sc.value, get_type<s32[4]>());
-				set_vr(op.rt, r);
-				return;
-			}
-
 			r.value = m_ir->CreateFPToUI(a.value, get_type<s32[4]>());
 			set_vr(op.rt, select(bitcast<s32[4]>(a) > splat<s32[4]>(((32 + 127) << 23) - 1), splat<s32[4]>(-1), r & ~(bitcast<s32[4]>(a) >> 31)));
 		}
@@ -7423,12 +8430,12 @@ public:
 
 	void CSFLT(spu_opcode_t op)
 	{
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
+		if (g_cfg.core.spu_accurate_xfloat)
 		{
 			value_t<s32[4]> a = get_vr<s32[4]>(op.ra);
 			value_t<f64[4]> r;
 
-			if (auto [ok, data] = get_const_vector(a.value, m_pos); ok)
+			if (auto [ok, data] = get_const_vector(a.value, m_pos, 25971); ok)
 			{
 				r.value = build<f64[4]>(data._s32[0], data._s32[1], data._s32[2], data._s32[3]).eval(m_ir);
 			}
@@ -7463,12 +8470,12 @@ public:
 
 	void CUFLT(spu_opcode_t op)
 	{
-		if (g_cfg.core.spu_xfloat_accuracy == xfloat_accuracy::accurate)
+		if (g_cfg.core.spu_accurate_xfloat)
 		{
 			value_t<s32[4]> a = get_vr<s32[4]>(op.ra);
 			value_t<f64[4]> r;
 
-			if (auto [ok, data] = get_const_vector(a.value, m_pos); ok)
+			if (auto [ok, data] = get_const_vector(a.value, m_pos, 20971); ok)
 			{
 				r.value = build<f64[4]>(data._u32[0], data._u32[1], data._u32[2], data._u32[3]).eval(m_ir);
 			}
@@ -7504,13 +8511,13 @@ public:
 	void make_store_ls(value_t<u64> addr, value_t<u8[16]> data)
 	{
 		const auto bswapped = byteswap(data);
-		m_ir->CreateStore(bswapped.eval(m_ir), m_ir->CreateGEP(get_type<u8>(), m_lsptr, addr.value));
+		m_ir->CreateStore(bswapped.eval(m_ir), m_ir->CreateBitCast(m_ir->CreateGEP(m_lsptr, addr.value), get_type<u8(*)[16]>()), true);
 	}
 
 	auto make_load_ls(value_t<u64> addr)
 	{
 		value_t<u8[16]> data;
-		data.value = m_ir->CreateLoad(get_type<u8[16]>(), m_ir->CreateGEP(get_type<u8>(), m_lsptr, addr.value));
+		data.value = m_ir->CreateLoad(m_ir->CreateBitCast(m_ir->CreateGEP(m_lsptr, addr.value), get_type<u8(*)[16]>()), true);
 		return byteswap(data);
 	}
 
@@ -7521,7 +8528,7 @@ public:
 
 		for (auto pair : std::initializer_list<std::pair<value_t<u32[4]>, value_t<u32[4]>>>{{a, b}, {b, a}})
 		{
-			if (auto [ok, data] = get_const_vector(pair.first.value, m_pos); ok)
+			if (auto [ok, data] = get_const_vector(pair.first.value, m_pos, 10000); ok)
 			{
 				data._u32[3] %= SPU_LS_SIZE;
 
@@ -7545,7 +8552,7 @@ public:
 
 		for (auto pair : std::initializer_list<std::pair<value_t<u32[4]>, value_t<u32[4]>>>{{a, b}, {b, a}})
 		{
-			if (auto [ok, data] = get_const_vector(pair.first.value, m_pos); ok)
+			if (auto [ok, data] = get_const_vector(pair.first.value, m_pos, 10000); ok)
 			{
 				data._u32[3] %= SPU_LS_SIZE;
 
@@ -7574,15 +8581,10 @@ public:
 		set_vr(op.rt, make_load_ls(addr));
 	}
 
-	llvm::Value* get_pc_as_u64(u32 addr)
-	{
-		return m_ir->CreateAdd(m_ir->CreateZExt(m_base_pc, get_type<u64>()), m_ir->getInt64(addr - m_base));
-	}
-
 	void STQR(spu_opcode_t op) //
 	{
 		value_t<u64> addr;
-		addr.value = m_interp_magn ? m_ir->CreateZExt(m_interp_pc, get_type<u64>()) : get_pc_as_u64(m_pos);
+		addr.value = m_ir->CreateZExt(m_interp_magn ? m_interp_pc : get_pc(m_pos), get_type<u64>());
 		addr = eval(((get_imm<u64>(op.i16, false) << 2) + addr) & (m_interp_magn ? 0x3fff0 : ~0xf));
 		make_store_ls(addr, get_vr<u8[16]>(op.rt));
 	}
@@ -7590,7 +8592,7 @@ public:
 	void LQR(spu_opcode_t op) //
 	{
 		value_t<u64> addr;
-		addr.value = m_interp_magn ? m_ir->CreateZExt(m_interp_pc, get_type<u64>()) : get_pc_as_u64(m_pos);
+		addr.value = m_ir->CreateZExt(m_interp_magn ? m_interp_pc : get_pc(m_pos), get_type<u64>());
 		addr = eval(((get_imm<u64>(op.i16, false) << 2) + addr) & (m_interp_magn ? 0x3fff0 : ~0xf));
 		set_vr(op.rt, make_load_ls(addr));
 	}
@@ -7625,11 +8627,11 @@ public:
 		m_ir->CreateCondBr(cond.value, halt, next, m_md_unlikely);
 		m_ir->SetInsertPoint(halt);
 		if (m_interp_magn)
-			m_ir->CreateStore(m_function->getArg(2), spu_ptr<u32>(&spu_thread::pc));
+			m_ir->CreateStore(&*(m_function->arg_begin() + 2), spu_ptr<u32>(&spu_thread::pc))->setVolatile(true);
 		else
 			update_pc();
 		const auto ptr = _ptr<u32>(m_memptr, 0xffdead00);
-		m_ir->CreateStore(m_ir->getInt32("HALT"_u32), ptr);
+		m_ir->CreateStore(m_ir->getInt32("HALT"_u32), ptr)->setVolatile(true);
 		m_ir->CreateBr(next);
 		m_ir->SetInsertPoint(next);
 	}
@@ -7732,7 +8734,7 @@ public:
 			target->addIncoming(e_addr, e_exec);
 			m_ir->CreateCondBr(get_imm<bool>(op.d).value, d_exec, d_done, m_md_unlikely);
 			m_ir->SetInsertPoint(d_exec);
-			m_ir->CreateStore(m_ir->getFalse(), spu_ptr<bool>(&spu_thread::interrupts_enabled));
+			m_ir->CreateStore(m_ir->getFalse(), spu_ptr<bool>(&spu_thread::interrupts_enabled))->setVolatile(true);
 			m_ir->CreateBr(d_done);
 			m_ir->SetInsertPoint(d_done);
 			m_ir->CreateBr(m_interp_bblock);
@@ -7768,7 +8770,7 @@ public:
 			}
 			else
 			{
-				sp.value = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::gpr, 1, &v128::_u32, 3));
+				sp.value = m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::gpr, 1, &v128::_u32, 3));
 			}
 		}
 
@@ -7783,7 +8785,7 @@ public:
 
 		if (op.d)
 		{
-			m_ir->CreateStore(m_ir->getFalse(), spu_ptr<bool>(&spu_thread::interrupts_enabled));
+			m_ir->CreateStore(m_ir->getFalse(), spu_ptr<bool>(&spu_thread::interrupts_enabled))->setVolatile(true);
 		}
 
 		m_ir->CreateStore(addr.value, spu_ptr<u32>(&spu_thread::pc));
@@ -7793,22 +8795,22 @@ public:
 			// Compare address stored in stack mirror with addr
 			const auto stack0 = eval(zext<u64>(sp) + ::offset32(&spu_thread::stack_mirror));
 			const auto stack1 = eval(stack0 + 8);
-			const auto _ret = m_ir->CreateLoad(get_type<u64>(), m_ir->CreateGEP(get_type<u8>(), m_thread, stack0.value));
-			const auto link = m_ir->CreateLoad(get_type<u64>(), m_ir->CreateGEP(get_type<u8>(), m_thread, stack1.value));
+			const auto _ret = m_ir->CreateLoad(m_ir->CreateBitCast(m_ir->CreateGEP(m_thread, stack0.value), get_type<u64*>()));
+			const auto link = m_ir->CreateLoad(m_ir->CreateBitCast(m_ir->CreateGEP(m_thread, stack1.value), get_type<u64*>()));
 			const auto fail = llvm::BasicBlock::Create(m_context, "", m_function);
 			const auto done = llvm::BasicBlock::Create(m_context, "", m_function);
 			const auto next = llvm::BasicBlock::Create(m_context, "", m_function);
 			m_ir->CreateCondBr(m_ir->CreateICmpEQ(addr.value, m_ir->CreateTrunc(link, get_type<u32>())), next, fail, m_md_likely);
 			m_ir->SetInsertPoint(next);
-			const auto cmp2 = m_ir->CreateLoad(get_type<u32>(), m_ir->CreateGEP(get_type<u8>(), m_lsptr, addr.value));
+			const auto cmp2 = m_ir->CreateLoad(m_ir->CreateBitCast(m_ir->CreateGEP(m_lsptr, addr.value), get_type<u32*>()));
 			m_ir->CreateCondBr(m_ir->CreateICmpEQ(cmp2, m_ir->CreateTrunc(_ret, get_type<u32>())), done, fail, m_md_likely);
 			m_ir->SetInsertPoint(done);
 
 			// Clear stack mirror and return by tail call to the provided return address
-			m_ir->CreateStore(splat<u64[2]>(-1).eval(m_ir), m_ir->CreateGEP(get_type<u8>(), m_thread, stack0.value));
+			m_ir->CreateStore(splat<u64[2]>(-1).eval(m_ir), m_ir->CreateBitCast(m_ir->CreateGEP(m_thread, stack0.value), get_type<u64(*)[2]>()));
 			const auto targ = m_ir->CreateAdd(m_ir->CreateLShr(_ret, 32), get_segment_base());
 			const auto type = m_finfo->chunk->getFunctionType();
-			const auto fval = m_ir->CreateIntToPtr(targ, m_ir->getPtrTy());
+			const auto fval = m_ir->CreateIntToPtr(targ, type->getPointerTo());
 			tail_chunk({type, fval}, m_ir->CreateTrunc(m_ir->CreateLShr(link, 32), get_type<u32>()));
 			m_ir->SetInsertPoint(fail);
 		}
@@ -7823,8 +8825,8 @@ public:
 			m_ir->SetInsertPoint(done);
 
 			const auto ad64 = m_ir->CreateZExt(ad32, get_type<u64>());
-			const auto pptr = dyn_cast<llvm::GetElementPtrInst>(m_ir->CreateGEP(m_function_table->getValueType(), m_function_table, {m_ir->getInt64(0), m_ir->CreateLShr(ad64, 2, "", true)}));
-			tail_chunk({m_dispatch->getFunctionType(), m_ir->CreateLoad(pptr->getResultElementType(), pptr)});
+			const auto pptr = m_ir->CreateGEP(m_function_table, {m_ir->getInt64(0), m_ir->CreateLShr(ad64, 2, "", true)});
+			tail_chunk({m_dispatch->getFunctionType(), m_ir->CreateLoad(pptr)});
 			m_ir->SetInsertPoint(fail);
 		}
 
@@ -7854,36 +8856,6 @@ public:
 	{
 		if (m_block) m_block->block_end = m_ir->GetInsertBlock();
 
-		const auto rt = get_vr<u8[16]>(op.rt);
-
-		// Checking for zero doesn't care about the order of the bytes,
-		// so load the data before it's byteswapped
-		if (auto [ok, as] = match_expr(rt, byteswap(match<u8[16]>())); ok)
-		{
-			m_block->block_end = m_ir->GetInsertBlock();
-			const auto cond = eval(extract(bitcast<u32[4]>(as), 0) == 0);
-			const auto addr = eval(extract(get_vr(op.ra), 3) & 0x3fffc);
-			const auto target = add_block_indirect(op, addr);
-			m_ir->CreateCondBr(cond.value, target, add_block_next());
-			return;
-		}
-
-		const auto ox = get_vr<u32[4]>(op.rt);
-
-		// Instead of extracting the value generated by orx, just test the input to orx with ptest
-		if (auto [ok, as] = match_expr(ox, orx(match<u32[4]>())); ok)
-		{
-			m_block->block_end = m_ir->GetInsertBlock();
-			const auto a = extract(bitcast<u64[2]>(as), 0);
-			const auto b = extract(bitcast<u64[2]>(as), 1);
-			const auto cond = eval((a | b) == 0);
-			const auto addr = eval(extract(get_vr(op.ra), 3) & 0x3fffc);
-			const auto target = add_block_indirect(op, addr);
-			m_ir->CreateCondBr(cond.value, target, add_block_next());
-			return;
-		}
-
-
 		// Check sign bit instead (optimization)
 		if (match_vr<s32[4], s64[2]>(op.rt, [&](auto c, auto MP)
 		{
@@ -7915,36 +8887,6 @@ public:
 	{
 		if (m_block) m_block->block_end = m_ir->GetInsertBlock();
 
-		const auto rt = get_vr<u8[16]>(op.rt);
-
-		// Checking for zero doesn't care about the order of the bytes,
-		// so load the data before it's byteswapped
-		if (auto [ok, as] = match_expr(rt, byteswap(match<u8[16]>())); ok)
-		{
-			m_block->block_end = m_ir->GetInsertBlock();
-			const auto cond = eval(extract(bitcast<u32[4]>(as), 0) != 0);
-			const auto addr = eval(extract(get_vr(op.ra), 3) & 0x3fffc);
-			const auto target = add_block_indirect(op, addr);
-			m_ir->CreateCondBr(cond.value, target, add_block_next());
-			return;
-		}
-
-		const auto ox = get_vr<u32[4]>(op.rt);
-
-		// Instead of extracting the value generated by orx, just test the input to orx with ptest
-		if (auto [ok, as] = match_expr(ox, orx(match<u32[4]>())); ok)
-		{
-			m_block->block_end = m_ir->GetInsertBlock();
-			const auto a = extract(bitcast<u64[2]>(as), 0);
-			const auto b = extract(bitcast<u64[2]>(as), 1);
-			const auto cond = eval((a | b) != 0);
-			const auto addr = eval(extract(get_vr(op.ra), 3) & 0x3fffc);
-			const auto target = add_block_indirect(op, addr);
-			m_ir->CreateCondBr(cond.value, target, add_block_next());
-			return;
-		}
-
-
 		// Check sign bit instead (optimization)
 		if (match_vr<s32[4], s64[2]>(op.rt, [&](auto c, auto MP)
 		{
@@ -8048,13 +8990,6 @@ public:
 		// Create jump table if necessary (TODO)
 		const auto tfound = m_targets.find(m_pos);
 
-		if (op.d && tfound != m_targets.end() && tfound->second.size() == 1 && tfound->second[0] == spu_branch_target(m_pos, 1))
-		{
-			// Interrupts-disable pattern
-			m_ir->CreateStore(m_ir->getFalse(), spu_ptr<bool>(&spu_thread::interrupts_enabled));
-			return;
-		}
-
 		if (!op.d && !op.e && tfound != m_targets.end() && tfound->second.size() > 1)
 		{
 			// Shift aligned address for switch
@@ -8111,13 +9046,13 @@ public:
 
 			// Exit function on unexpected target
 			m_ir->SetInsertPoint(sw->getDefaultDest());
-			m_ir->CreateStore(addr.value, spu_ptr<u32>(&spu_thread::pc));
+			m_ir->CreateStore(addr.value, spu_ptr<u32>(&spu_thread::pc), true);
 
 			if (m_finfo && m_finfo->fn)
 			{
 				// Can't afford external tail call in true functions
-				m_ir->CreateStore(m_ir->getInt32("BIJT"_u32), _ptr<u32>(m_memptr, 0xffdead20));
-				m_ir->CreateCall(m_test_state, {m_thread});
+				m_ir->CreateStore(m_ir->getInt32("BIJT"_u32), _ptr<u32>(m_memptr, 0xffdead20))->setVolatile(true);
+				m_ir->CreateStore(m_ir->getFalse(), m_fake_global1, true);
 				m_ir->CreateBr(sw->getDefaultDest());
 			}
 			else
@@ -8144,7 +9079,7 @@ public:
 	{
 		if (m_block) m_block->block_end = m_ir->GetInsertBlock();
 		value_t<u32> srr0;
-		srr0.value = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::srr0));
+		srr0.value = m_ir->CreateLoad(spu_ptr<u32>(&spu_thread::srr0));
 		m_ir->CreateBr(add_block_indirect(op, srr0));
 	}
 
@@ -8153,7 +9088,7 @@ public:
 		if (m_block) m_block->block_end = m_ir->GetInsertBlock();
 		const auto addr = eval(extract(get_vr(op.ra), 3) & 0x3fffc);
 		set_link(op);
-		const auto mask = m_ir->CreateTrunc(m_ir->CreateLShr(m_ir->CreateLoad(get_type<u64>(), spu_ptr<u64>(&spu_thread::ch_events), true), 32), get_type<u32>());
+		const auto mask = m_ir->CreateTrunc(m_ir->CreateLShr(m_ir->CreateLoad(spu_ptr<u64>(&spu_thread::ch_events), true), 32), get_type<u32>());
 		const auto res = call("spu_get_events", &exec_get_events, m_thread, mask);
 		const auto target = add_block_indirect(op, addr);
 		m_ir->CreateCondBr(m_ir->CreateICmpNE(res, m_ir->getInt32(0)), target, add_block_next());
@@ -8172,38 +9107,6 @@ public:
 
 		const u32 target = spu_branch_target(m_pos, op.i16);
 
-		const auto rt = get_vr<u8[16]>(op.rt);
-
-		// Checking for zero doesn't care about the order of the bytes,
-		// so load the data before it's byteswapped
-		if (auto [ok, as] = match_expr(rt, byteswap(match<u8[16]>())); ok)
-		{
-			if (target != m_pos + 4)
-			{
-				m_block->block_end = m_ir->GetInsertBlock();
-				const auto cond = eval(extract(bitcast<u32[4]>(as), 0) == 0);
-				m_ir->CreateCondBr(cond.value, add_block(target), add_block(m_pos + 4));
-				return;
-			}
-		}
-
-		const auto ox = get_vr<u32[4]>(op.rt);
-
-		// Instead of extracting the value generated by orx, just test the input to orx with ptest
-		if (auto [ok, as] = match_expr(ox, orx(match<u32[4]>())); ok)
-		{
-			if (target != m_pos + 4)
-			{
-				m_block->block_end = m_ir->GetInsertBlock();
-				const auto a = extract(bitcast<u64[2]>(as), 0);
-				const auto b = extract(bitcast<u64[2]>(as), 1);
-				const auto cond = eval((a | b) == 0);
-				m_ir->CreateCondBr(cond.value, add_block(target), add_block(m_pos + 4));
-				return;
-			}
-		}
-
-
 		// Check sign bit instead (optimization)
 		if (match_vr<s32[4], s64[2]>(op.rt, [&](auto c, auto MP)
 		{
@@ -8248,37 +9151,6 @@ public:
 
 		const u32 target = spu_branch_target(m_pos, op.i16);
 
-		const auto rt = get_vr<u8[16]>(op.rt);
-
-		// Checking for zero doesn't care about the order of the bytes,
-		// so load the data before it's byteswapped
-		if (auto [ok, as] = match_expr(rt, byteswap(match<u8[16]>())); ok)
-		{
-			if (target != m_pos + 4)
-			{
-				m_block->block_end = m_ir->GetInsertBlock();
-				const auto cond = eval(extract(bitcast<u32[4]>(as), 0) != 0);
-				m_ir->CreateCondBr(cond.value, add_block(target), add_block(m_pos + 4));
-				return;
-			}
-		}
-
-		const auto ox = get_vr<u32[4]>(op.rt);
-
-		// Instead of extracting the value generated by orx, just test the input to orx with ptest
-		if (auto [ok, as] = match_expr(ox, orx(match<u32[4]>())); ok)
-		{
-			if (target != m_pos + 4)
-			{
-				m_block->block_end = m_ir->GetInsertBlock();
-				const auto a = extract(bitcast<u64[2]>(as), 0);
-				const auto b = extract(bitcast<u64[2]>(as), 1);
-				const auto cond = eval((a | b) != 0);
-				m_ir->CreateCondBr(cond.value, add_block(target), add_block(m_pos + 4));
-				return;
-			}
-		}
-
 		// Check sign bit instead (optimization)
 		if (match_vr<s32[4], s64[2]>(op.rt, [&](auto c, auto MP)
 		{
@@ -8335,6 +9207,7 @@ public:
 					m_block->block_end = m_ir->GetInsertBlock();
 					const auto a = get_vr<s8[16]>(op.rt);
 					const auto cond = eval((bitcast<s16>(trunc<bool[16]>(a)) & 0x3000) == 0);
+					//const auto cond = eval((m & 0x3000) == 0);
 					m_ir->CreateCondBr(cond.value, add_block(target), add_block(m_pos + 4));
 					return true;
 				}
@@ -8406,14 +9279,10 @@ public:
 			return;
 		}
 
-		const auto compiled_pos = m_ir->getInt32(m_pos);
 		const u32 target = spu_branch_target(0, op.i16);
 
 		m_block->block_end = m_ir->GetInsertBlock();
-		const auto real_pos = get_pc(m_pos);
-		value_t<u32> target_val;
-		target_val.value = m_ir->getInt32(target);
-		m_ir->CreateCondBr(m_ir->CreateICmpEQ(real_pos, compiled_pos), add_block(target, true), add_block_indirect({}, target_val));
+		m_ir->CreateBr(add_block(target, true));
 	}
 
 	void BRASL(spu_opcode_t op) //
@@ -8491,8 +9360,8 @@ public:
 			const auto rel_ptr = m_ir->CreateSub(m_ir->CreatePtrToInt(pfunc->chunk, get_type<u64>()), get_segment_base());
 			const auto ptr_plus_op = m_ir->CreateOr(m_ir->CreateShl(rel_ptr, 32), m_ir->getInt64(m_next_op));
 			const auto base_plus_pc = m_ir->CreateOr(m_ir->CreateShl(m_ir->CreateZExt(m_base_pc, get_type<u64>()), 32), m_ir->getInt64(m_pos + 4));
-			m_ir->CreateStore(ptr_plus_op, m_ir->CreateGEP(get_type<u8>(), m_thread, stack0.value));
-			m_ir->CreateStore(base_plus_pc, m_ir->CreateGEP(get_type<u8>(), m_thread, stack1.value));
+			m_ir->CreateStore(ptr_plus_op, m_ir->CreateBitCast(m_ir->CreateGEP(m_thread, stack0.value), get_type<u64*>()));
+			m_ir->CreateStore(base_plus_pc, m_ir->CreateBitCast(m_ir->CreateGEP(m_thread, stack1.value), get_type<u64*>()));
 		}
 	}
 
@@ -8512,11 +9381,11 @@ std::unique_ptr<spu_recompiler_base> spu_recompiler_base::make_llvm_recompiler(u
 	return std::make_unique<spu_llvm_recompiler>(magn);
 }
 
-const spu_decoder<spu_llvm_recompiler> s_spu_llvm_decoder;
+const spu_decoder<spu_llvm_recompiler> g_spu_llvm_decoder;
 
 decltype(&spu_llvm_recompiler::UNK) spu_llvm_recompiler::decode(u32 op)
 {
-	return s_spu_llvm_decoder.decode(op);
+	return g_spu_llvm_decoder.decode(op);
 }
 
 #else
@@ -8531,4 +9400,599 @@ std::unique_ptr<spu_recompiler_base> spu_recompiler_base::make_llvm_recompiler(u
 	fmt::throw_exception("LLVM is not available in this build.");
 }
 
-#endif // LLVM_AVAILABLE
+#endif
+
+struct spu_llvm_worker
+{
+	lf_queue<std::pair<u64, const spu_program*>> registered;
+
+	void operator()()
+	{
+		// SPU LLVM Recompiler instance
+		const auto compiler = spu_recompiler_base::make_llvm_recompiler();
+		compiler->init();
+
+		// Fake LS
+		std::vector<be_t<u32>> ls(0x10000);
+
+		for (auto slice = registered.pop_all();; [&]
+		{
+			if (slice)
+			{
+				slice.pop_front();
+			}
+
+			if (slice || thread_ctrl::state() == thread_state::aborting)
+			{
+				return;
+			}
+
+			thread_ctrl::wait_on(registered, nullptr);
+			slice = registered.pop_all();
+		}())
+		{
+			auto* prog = slice.get();
+
+			if (thread_ctrl::state() == thread_state::aborting)
+			{
+				break;
+			}
+
+			if (!prog)
+			{
+				continue;
+			}
+
+			if (!prog->second)
+			{
+				break;
+			}
+
+			const auto& func = *prog->second;
+
+			// Get data start
+			const u32 start = func.lower_bound;
+			const u32 size0 = ::size32(func.data);
+
+			// Initialize LS with function data only
+			for (u32 i = 0, pos = start; i < size0; i++, pos += 4)
+			{
+				ls[pos / 4] = std::bit_cast<be_t<u32>>(func.data[i]);
+			}
+
+			// Call analyser
+			spu_program func2 = compiler->analyse(ls.data(), func.entry_point);
+
+			if (func2 != func)
+			{
+				spu_log.error("[0x%05x] SPU Analyser failed, %u vs %u", func2.entry_point, func2.data.size(), size0);
+			}
+			else if (const auto target = compiler->compile(std::move(func2)))
+			{
+				// Redirect old function (TODO: patch in multiple places)
+				const s64 rel = reinterpret_cast<u64>(target) - prog->first - 5;
+
+				union
+				{
+					u8 bytes[8];
+					u64 result;
+				};
+
+				bytes[0] = 0xe9; // jmp rel32
+				std::memcpy(bytes + 1, &rel, 4);
+				bytes[5] = 0x90;
+				bytes[6] = 0x90;
+				bytes[7] = 0x90;
+
+				atomic_storage<u64>::release(*reinterpret_cast<u64*>(prog->first), result);
+			}
+			else
+			{
+				spu_log.fatal("[0x%05x] Compilation failed.", func.entry_point);
+				Emu.Pause();
+				return;
+			}
+
+			// Clear fake LS
+			std::memset(ls.data() + start / 4, 0, 4 * (size0 - 1));
+		}
+	}
+};
+
+// SPU LLVM recompiler thread context
+struct spu_llvm
+{
+	// Workload
+	lf_queue<std::pair<const u64, spu_item*>> registered;
+
+	spu_llvm()
+	{
+		// Dependency
+		g_fxo->init<spu_cache>();
+	}
+
+	void operator()()
+	{
+		// To compile (hash -> item)
+		std::unordered_multimap<u64, spu_item*, value_hash<u64>> enqueued;
+
+		// Mini-profiler (hash -> number of occurrences)
+		std::unordered_map<u64, atomic_t<u64>, value_hash<u64>> samples;
+
+		// For synchronization with profiler thread
+		stx::init_mutex prof_mutex;
+
+		named_thread profiler("SPU LLVM Profiler"sv, [&]()
+		{
+			while (thread_ctrl::state() != thread_state::aborting)
+			{
+				{
+					// Lock if enabled
+					const auto lock = prof_mutex.access();
+
+					if (!lock)
+					{
+						// Wait when the profiler is disabled
+						prof_mutex.wait_for_initialized();
+						continue;
+					}
+
+					// Collect profiling samples
+					idm::select<named_thread<spu_thread>>([&](u32 /*id*/, spu_thread& spu)
+					{
+						const u64 name = atomic_storage<u64>::load(spu.block_hash);
+
+						if (auto state = +spu.state; !::is_paused(state) && !::is_stopped(state) && cpu_flag::wait - state)
+						{
+							const auto found = std::as_const(samples).find(name);
+
+							if (found != std::as_const(samples).end())
+							{
+								const_cast<atomic_t<u64>&>(found->second)++;
+							}
+						}
+					});
+				}
+
+				// Sleep for a short period if enabled
+				thread_ctrl::wait_for(20, false);
+			}
+		});
+
+		u32 worker_count = 1;
+
+		if (uint hc = utils::get_thread_count(); hc >= 12)
+		{
+			worker_count = hc - 10;
+		}
+
+		u32 worker_index = 0;
+
+		named_thread_group<spu_llvm_worker> workers("SPUW.", worker_count);
+
+		while (thread_ctrl::state() != thread_state::aborting)
+		{
+			for (const auto& pair : registered.pop_all())
+			{
+				enqueued.emplace(pair);
+
+				// Interrupt and kick profiler thread
+				const auto lock = prof_mutex.init_always([&]{});
+
+				// Register new blocks to collect samples
+				samples.emplace(pair.first, 0);
+			}
+
+			if (enqueued.empty())
+			{
+				// Interrupt profiler thread and put it to sleep
+				static_cast<void>(prof_mutex.reset());
+				thread_ctrl::wait_on(registered, nullptr);
+				continue;
+			}
+
+			// Find the most used enqueued item
+			u64 sample_max = 0;
+			auto found_it  = enqueued.begin();
+
+			for (auto it = enqueued.begin(), end = enqueued.end(); it != end; ++it)
+			{
+				const u64 cur = std::as_const(samples).at(it->first);
+
+				if (cur > sample_max)
+				{
+					sample_max = cur;
+					found_it = it;
+				}
+			}
+
+			// Start compiling
+			const spu_program& func = found_it->second->data;
+
+			// Old function pointer (pre-recompiled)
+			const spu_function_t _old = found_it->second->compiled;
+
+			// Remove item from the queue
+			enqueued.erase(found_it);
+
+			// Push the workload
+			(workers.begin() + (worker_index++ % worker_count))->registered.push(reinterpret_cast<u64>(_old), &func);
+		}
+
+		static_cast<void>(prof_mutex.init_always([&]{ samples.clear(); }));
+
+		for (u32 i = 0; i < worker_count; i++)
+		{
+			(workers.begin() + i)->registered.push(0, nullptr);
+		}
+	}
+
+	static constexpr auto thread_name = "SPU LLVM"sv;
+};
+
+using spu_llvm_thread = named_thread<spu_llvm>;
+
+struct spu_fast : public spu_recompiler_base
+{
+	virtual void init() override
+	{
+		if (!m_spurt)
+		{
+			m_spurt = &g_fxo->get<spu_runtime>();
+		}
+	}
+
+	virtual spu_function_t compile(spu_program&& _func) override
+	{
+		const auto add_loc = m_spurt->add_empty(std::move(_func));
+
+		if (!add_loc)
+		{
+			return nullptr;
+		}
+
+		if (add_loc->compiled)
+		{
+			return add_loc->compiled;
+		}
+
+		const spu_program& func = add_loc->data;
+
+		if (g_cfg.core.spu_debug && !add_loc->logged.exchange(1))
+		{
+			std::string log;
+			this->dump(func, log);
+			fs::file(m_spurt->get_cache_path() + "spu.log", fs::write + fs::append).write(log);
+		}
+
+		// Allocate executable area with necessary size
+		const auto result = jit_runtime::alloc(22 + 1 + 9 + ::size32(func.data) * (16 + 16) + 36 + 47, 16);
+
+		if (!result)
+		{
+			return nullptr;
+		}
+
+		m_pos = func.lower_bound;
+		m_size = ::size32(func.data) * 4;
+
+		{
+			sha1_context ctx;
+			u8 output[20];
+
+			sha1_starts(&ctx);
+			sha1_update(&ctx, reinterpret_cast<const u8*>(func.data.data()), func.data.size() * 4);
+			sha1_finish(&ctx, output);
+
+			be_t<u64> hash_start;
+			std::memcpy(&hash_start, output, sizeof(hash_start));
+			m_hash_start = hash_start;
+		}
+
+		u8* raw = result;
+
+		// 8-byte intruction for patching (long NOP)
+		*raw++ = 0x0f;
+		*raw++ = 0x1f;
+		*raw++ = 0x84;
+		*raw++ = 0;
+		*raw++ = 0;
+		*raw++ = 0;
+		*raw++ = 0;
+		*raw++ = 0;
+
+		// mov rax, m_hash_start
+		*raw++ = 0x48;
+		*raw++ = 0xb8;
+		std::memcpy(raw, &m_hash_start, sizeof(m_hash_start));
+		raw += 8;
+
+		// Update block_hash: mov [r13 + spu_thread::m_block_hash], rax
+		*raw++ = 0x49;
+		*raw++ = 0x89;
+		*raw++ = 0x45;
+		*raw++ = ::narrow<s8>(::offset32(&spu_thread::block_hash));
+
+		// Load PC: mov eax, [r13 + spu_thread::pc]
+		*raw++ = 0x41;
+		*raw++ = 0x8b;
+		*raw++ = 0x45;
+		*raw++ = ::narrow<s8>(::offset32(&spu_thread::pc));
+
+		// Get LS address starting from PC: lea rcx, [rbp + rax]
+		*raw++ = 0x48;
+		*raw++ = 0x8d;
+		*raw++ = 0x4c;
+		*raw++ = 0x05;
+		*raw++ = 0x00;
+
+		// Verification (slow)
+		for (u32 i = 0; i < func.data.size(); i++)
+		{
+			if (!func.data[i])
+			{
+				continue;
+			}
+
+			// cmp dword ptr [rcx + off], opc
+			*raw++ = 0x81;
+			*raw++ = 0xb9;
+			const u32 off = i * 4;
+			const u32 opc = func.data[i];
+			std::memcpy(raw + 0, &off, 4);
+			std::memcpy(raw + 4, &opc, 4);
+			raw += 8;
+
+			// jne tr_dispatch
+			const s64 rel = reinterpret_cast<u64>(spu_runtime::tr_dispatch) - reinterpret_cast<u64>(raw) - 6;
+			*raw++ = 0x0f;
+			*raw++ = 0x85;
+			std::memcpy(raw + 0, &rel, 4);
+			raw += 4;
+		}
+
+		// trap
+		//*raw++ = 0xcc;
+
+		// Secondary prologue: sub rsp,0x28
+		*raw++ = 0x48;
+		*raw++ = 0x83;
+		*raw++ = 0xec;
+		*raw++ = 0x28;
+
+		// Fix args: xchg r13,rbp
+		*raw++ = 0x49;
+		*raw++ = 0x87;
+		*raw++ = 0xed;
+
+		// mov r12d, eax
+		*raw++ = 0x41;
+		*raw++ = 0x89;
+		*raw++ = 0xc4;
+
+		// mov esi, 0x7f0
+		*raw++ = 0xbe;
+		*raw++ = 0xf0;
+		*raw++ = 0x07;
+		*raw++ = 0x00;
+		*raw++ = 0x00;
+
+		// lea rdi, [rbp + spu_thread::gpr]
+		*raw++ = 0x48;
+		*raw++ = 0x8d;
+		*raw++ = 0x7d;
+		*raw++ = ::narrow<s8>(::offset32(&spu_thread::gpr));
+
+		// Save base pc: mov [rbp + spu_thread::base_pc], eax
+		*raw++ = 0x89;
+		*raw++ = 0x45;
+		*raw++ = ::narrow<s8>(::offset32(&spu_thread::base_pc));
+
+		// inc block_counter
+		*raw++ = 0x48;
+		*raw++ = 0xff;
+		*raw++ = 0x85;
+		const u32 blc_off = ::offset32(&spu_thread::block_counter);
+		std::memcpy(raw, &blc_off, 4);
+		raw += 4;
+
+		// lea r14, [local epilogue]
+		*raw++ = 0x4c;
+		*raw++ = 0x8d;
+		*raw++ = 0x35;
+		const u32 epi_off = ::size32(func.data) * 16;
+		std::memcpy(raw, &epi_off, 4);
+		raw += 4;
+
+		// Instructions (each instruction occupies fixed number of bytes)
+		for (u32 i = 0; i < func.data.size(); i++)
+		{
+			const u32 pos = m_pos + i * 4;
+
+			if (!func.data[i])
+			{
+				// Save pc: mov [rbp + spu_thread::pc], r12d
+				*raw++ = 0x44;
+				*raw++ = 0x89;
+				*raw++ = 0x65;
+				*raw++ = ::narrow<s8>(::offset32(&spu_thread::pc));
+
+				// Epilogue: add rsp,0x28
+				*raw++ = 0x48;
+				*raw++ = 0x83;
+				*raw++ = 0xc4;
+				*raw++ = 0x28;
+
+				// ret (TODO)
+				*raw++ = 0xc3;
+				std::memset(raw, 0xcc, 16 - 9);
+				raw += 16 - 9;
+				continue;
+			}
+
+			// Fix endianness
+			const spu_opcode_t op{std::bit_cast<be_t<u32>>(func.data[i])};
+
+			switch (auto type = s_spu_itype.decode(op.opcode))
+			{
+			case spu_itype::BRZ:
+			case spu_itype::BRHZ:
+			case spu_itype::BRNZ:
+			case spu_itype::BRHNZ:
+			{
+				const u32 target = spu_branch_target(pos, op.i16);
+
+				if (0 && target >= m_pos && target < m_pos + m_size)
+				{
+					*raw++ = type == spu_itype::BRHZ || type == spu_itype::BRHNZ ? 0x66 : 0x90;
+					*raw++ = 0x83;
+					*raw++ = 0xbd;
+					const u32 off = ::offset32(&spu_thread::gpr, op.rt) + 12;
+					std::memcpy(raw, &off, 4);
+					raw += 4;
+					*raw++ = 0x00;
+
+					*raw++ = 0x0f;
+					*raw++ = type == spu_itype::BRZ || type == spu_itype::BRHZ ? 0x84 : 0x85;
+					const u32 dif = (target - (pos + 4)) / 4 * 16 + 2;
+					std::memcpy(raw, &dif, 4);
+					raw += 4;
+
+					*raw++ = 0x66;
+					*raw++ = 0x90;
+					break;
+				}
+
+				[[fallthrough]];
+			}
+			default:
+			{
+				// Ballast: mov r15d, pos
+				*raw++ = 0x41;
+				*raw++ = 0xbf;
+				std::memcpy(raw, &pos, 4);
+				raw += 4;
+
+				// mov ebx, opc
+				*raw++ = 0xbb;
+				std::memcpy(raw, &op, 4);
+				raw += 4;
+
+				// call spu_* (specially built interpreter function)
+				const s64 rel = spu_runtime::g_interpreter_table[type] - reinterpret_cast<u64>(raw) - 5;
+				*raw++ = 0xe8;
+				std::memcpy(raw, &rel, 4);
+				raw += 4;
+				break;
+			}
+			}
+		}
+
+		// Local dispatcher/epilogue: fix stack after branch instruction, then dispatch or return
+
+		// add rsp, 8
+		*raw++ = 0x48;
+		*raw++ = 0x83;
+		*raw++ = 0xc4;
+		*raw++ = 0x08;
+
+		// and rsp, -16
+		*raw++ = 0x48;
+		*raw++ = 0x83;
+		*raw++ = 0xe4;
+		*raw++ = 0xf0;
+
+		// lea rax, [r12 - size]
+		*raw++ = 0x49;
+		*raw++ = 0x8d;
+		*raw++ = 0x84;
+		*raw++ = 0x24;
+		const u32 msz = 0u - m_size;
+		std::memcpy(raw, &msz, 4);
+		raw += 4;
+
+		// sub eax, [rbp + spu_thread::base_pc]
+		*raw++ = 0x2b;
+		*raw++ = 0x45;
+		*raw++ = ::narrow<s8>(::offset32(&spu_thread::base_pc));
+
+		// cmp eax, (0 - size)
+		*raw++ = 0x3d;
+		std::memcpy(raw, &msz, 4);
+		raw += 4;
+
+		// jb epilogue
+		*raw++ = 0x72;
+		*raw++ = +12;
+
+		// movsxd rax, eax
+		*raw++ = 0x48;
+		*raw++ = 0x63;
+		*raw++ = 0xc0;
+
+		// shl rax, 2
+		*raw++ = 0x48;
+		*raw++ = 0xc1;
+		*raw++ = 0xe0;
+		*raw++ = 0x02;
+
+		// add rax, r14
+		*raw++ = 0x4c;
+		*raw++ = 0x01;
+		*raw++ = 0xf0;
+
+		// jmp rax
+		*raw++ = 0xff;
+		*raw++ = 0xe0;
+
+		// Save pc: mov [rbp + spu_thread::pc], r12d
+		*raw++ = 0x44;
+		*raw++ = 0x89;
+		*raw++ = 0x65;
+		*raw++ = ::narrow<s8>(::offset32(&spu_thread::pc));
+
+		// Epilogue: add rsp,0x28 ; ret
+		*raw++ = 0x48;
+		*raw++ = 0x83;
+		*raw++ = 0xc4;
+		*raw++ = 0x28;
+		*raw++ = 0xc3;
+
+		const auto fn = reinterpret_cast<spu_function_t>(result);
+
+		// Install pointer carefully
+		const bool added = !add_loc->compiled && add_loc->compiled.compare_and_swap_test(nullptr, fn);
+
+		// Check hash against allowed bounds
+		const bool inverse_bounds = g_cfg.core.spu_llvm_lower_bound > g_cfg.core.spu_llvm_upper_bound;
+
+		if ((!inverse_bounds && (m_hash_start < g_cfg.core.spu_llvm_lower_bound || m_hash_start > g_cfg.core.spu_llvm_upper_bound)) ||
+			(inverse_bounds && (m_hash_start < g_cfg.core.spu_llvm_lower_bound && m_hash_start > g_cfg.core.spu_llvm_upper_bound)))
+		{
+			spu_log.error("[Debug] Skipped function %s", fmt::base57(be_t<u64>{m_hash_start}));
+		}
+		else if (added)
+		{
+			// Send work to LLVM compiler thread
+			g_fxo->get<spu_llvm_thread>().registered.push(m_hash_start, add_loc);
+		}
+
+		// Rebuild trampoline if necessary
+		if (!m_spurt->rebuild_ubertrampoline(func.data[0]))
+		{
+			return nullptr;
+		}
+
+		if (added)
+		{
+			add_loc->compiled.notify_all();
+		}
+
+		return fn;
+	}
+};
+
+std::unique_ptr<spu_recompiler_base> spu_recompiler_base::make_fast_llvm_recompiler()
+{
+	return std::make_unique<spu_fast>();
+}
diff --git a/rpcs3/Emu/Cell/SPURecompiler.h b/rpcs3/Emu/Cell/SPURecompiler.h
index ddee888b1e..2bec70cb42 100644
--- a/rpcs3/Emu/Cell/SPURecompiler.h
+++ b/rpcs3/Emu/Cell/SPURecompiler.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Utilities/File.h"
+#include "Utilities/JIT.h"
 #include "Utilities/lockless.h"
-#include "Utilities/address_range.h"
 #include "SPUThread.h"
 #include <vector>
 #include <bitset>
@@ -35,18 +35,7 @@ public:
 
 	void add(const struct spu_program& func);
 
-	static void initialize(bool build_existing_cache = true);
-
-	struct precompile_data_t
-	{
-		u32 vaddr;
-		std::vector<u32> inst_data;
-		std::vector<u32> funcs;
-	};
-
-	bool collect_funcs_to_precompile = true;
-
-	lf_queue<precompile_data_t> precompile_funcs;
+	static void initialize();
 };
 
 struct spu_program
@@ -190,89 +179,6 @@ public:
 		interrupt_call,
 	};
 
-	// Value flags (TODO: only is_const is implemented)
-	enum class vf : u32
-	{
-		is_const,
-		is_mask,
-		is_rel,
-		is_null,
-
-		__bitset_enum_max
-	};
-
-	struct reg_state_t
-	{
-		bs_t<vf> flag{+vf::is_null};
-		u32 value{};
-		u32 tag = umax;
-		u32 known_ones{};
-		u32 known_zeroes{};
-		u32 origin = SPU_LS_SIZE;
-		bool is_instruction = false;
-
-		bool is_const() const;
-
-		bool operator&(vf to_test) const;
-
-		bool is_less_than(u32 imm) const;
-		bool operator==(const reg_state_t& r) const;
-		bool operator==(u32 imm) const;
-
-		// Compare equality but try to ignore changes in unmasked bits
-		bool compare_with_mask_indifference(const reg_state_t& r, u32 mask_bits) const;
-		bool compare_with_mask_indifference(u32 imm, u32 mask_bits) const;
-		bool unequal_with_mask_indifference(const reg_state_t& r, u32 mask_bits) const;
-
-		// Convert constant-based value to mask-based value
-		reg_state_t downgrade() const;
-
-		// Connect two register states between different blocks
-		reg_state_t merge(const reg_state_t& rhs, u32 current_pc) const;
-
-		// Override value with newer value if needed
-		reg_state_t build_on_top_of(const reg_state_t& rhs) const;
-
-		// Get known zeroes mask
-		u32 get_known_zeroes() const;
-
-		// Get known ones mask
-		u32 get_known_ones() const;
-
-		// Invalidate value if non-constant and reached the point in history of its creation
-		void invalidate_if_created(u32 current_pc);
-
-		template <usz Count = 1>
-		static std::conditional_t<Count == 1, reg_state_t, std::array<reg_state_t, Count>> make_unknown(u32 pc, u32 current_pc = SPU_LS_SIZE) noexcept
-		{
-			if constexpr (Count == 1)
-			{
-				reg_state_t v{};
-				v.tag = alloc_tag();
-				v.flag = {};
-				v.origin = pc;
-				v.is_instruction = pc == current_pc;
-				return v;
-			}
-			else
-			{
-				std::array<reg_state_t, Count> result{};
-
-				for (reg_state_t& state : result)
-				{
-					state = make_unknown<1>(pc, current_pc);
-				}
-
-				return result;
-			}
-		}
-
-		bool compare_tags(const reg_state_t& rhs) const;
-
-		static reg_state_t from_value(u32 value) noexcept;
-		static u32 alloc_tag(bool reset = false) noexcept;
-	};
-
 protected:
 	spu_runtime* m_spurt{};
 
@@ -286,15 +192,15 @@ protected:
 	// GPR modified by the instruction (-1 = not set)
 	std::array<u8, 0x10000> m_regmod;
 
-	std::bitset<0x10000> m_use_ra;
-	std::bitset<0x10000> m_use_rb;
-	std::bitset<0x10000> m_use_rc;
+	std::array<u8, 0x10000> m_use_ra;
+	std::array<u8, 0x10000> m_use_rb;
+	std::array<u8, 0x10000> m_use_rc;
 
 	// List of possible targets for the instruction (entry shouldn't exist for simple instructions)
-	std::unordered_map<u32, std::vector<u32>, value_hash<u32, 2>> m_targets;
+	std::unordered_map<u32, std::basic_string<u32>, value_hash<u32, 2>> m_targets;
 
 	// List of block predecessors
-	std::unordered_map<u32, std::vector<u32>, value_hash<u32, 2>> m_preds;
+	std::unordered_map<u32, std::basic_string<u32>, value_hash<u32, 2>> m_preds;
 
 	// List of function entry points and return points (set after BRSL, BRASL, BISL, BISLED)
 	std::bitset<0x10000> m_entry_info;
@@ -351,17 +257,17 @@ protected:
 		std::array<u32, s_reg_max> reg_origin, reg_origin_abs;
 
 		// All possible successor blocks
-		std::vector<u32> targets;
+		std::basic_string<u32> targets;
 
 		// All predeccessor blocks
-		std::vector<u32> preds;
+		std::basic_string<u32> preds;
 	};
 
 	// Sorted basic block info
 	std::map<u32, block_info> m_bbs;
 
 	// Sorted advanced block (chunk) list
-	std::vector<u32> m_chunks;
+	std::basic_string<u32> m_chunks;
 
 	// Function information
 	struct func_info
@@ -373,7 +279,7 @@ protected:
 		bool good = false;
 
 		// Call targets
-		std::vector<u32> calls;
+		std::basic_string<u32> calls;
 
 		// Register save info (stack offset)
 		std::array<u32, s_reg_max> reg_save_off{};
@@ -382,28 +288,6 @@ protected:
 	// Sorted function info
 	std::map<u32, func_info> m_funcs;
 
-	// TODO: Add patterns
-	// Not a bitset to allow more possibilities
-	enum class inst_attr : u8
-	{
-		none,
-		omit,
-		putllc16,
-		putllc0,
-		rchcnt_loop,
-	};
-
-	std::vector<inst_attr> m_inst_attrs;
-
-	struct pattern_info
-	{
-		utils::address_range32 range;
-	};
-
-	std::unordered_map<u32, pattern_info> m_patterns;
-
-	void add_pattern(bool fill_all, inst_attr attr, u32 start, u32 end = -1);
-
 private:
 	// For private use
 	std::bitset<0x10000> m_bits;
@@ -432,7 +316,7 @@ public:
 	static void old_interpreter(spu_thread&, void* ls, u8*);
 
 	// Get the function data at specified address
-	spu_program analyse(const be_t<u32>* ls, u32 entry_point, std::map<u32, std::vector<u32>>* out_target_list = nullptr);
+	spu_program analyse(const be_t<u32>* ls, u32 entry_point);
 
 	// Print analyser internal state
 	void dump(const spu_program& result, std::string& out);
diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp
index bd474d8122..37fb6a67df 100644
--- a/rpcs3/Emu/Cell/SPUThread.cpp
+++ b/rpcs3/Emu/Cell/SPUThread.cpp
@@ -8,8 +8,8 @@
 #include "Loader/ELF.h"
 #include "Emu/VFS.h"
 #include "Emu/IdManager.h"
-#include "Emu/System.h"
 #include "Emu/perf_meter.hpp"
+#include "Emu/RSX/RSXThread.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/lv2/sys_spu.h"
@@ -23,86 +23,15 @@
 #include "Emu/Cell/SPURecompiler.h"
 #include "Emu/Cell/timers.hpp"
 
-#include "Emu/RSX/Core/RSXReservationLock.hpp"
-
 #include <cmath>
 #include <cfenv>
 #include <thread>
 #include <shared_mutex>
-#include <span>
 #include "util/vm.hpp"
 #include "util/asm.hpp"
 #include "util/v128.hpp"
-#include "util/simd.hpp"
+#include "util/v128sse.hpp"
 #include "util/sysinfo.hpp"
-#include "util/serialization.hpp"
-
-#if defined(ARCH_X64)
-#ifdef _MSC_VER
-#include <intrin.h>
-#include <immintrin.h>
-#else
-#include <x86intrin.h>
-#endif
-#endif
-
-// LUTs for SPU instructions
-
-const u32 spu_frest_fraction_lut[32] =
-{
-	0x7FFBE0, 0x7F87A6, 0x70EF72, 0x708B40, 0x638B12, 0x633AEA, 0x5792C4, 0x574AA0,
-	0x4CCA7E, 0x4C9262, 0x430A44, 0x42D62A, 0x3A2E12, 0x39FDFA, 0x3215E4, 0x31F1D2,
-	0x2AA9BE, 0x2A85AC, 0x23D59A, 0x23BD8E, 0x1D8576, 0x1D8576, 0x17AD5A, 0x17AD5A,
-	0x124543, 0x124543, 0x0D392D, 0x0D392D, 0x08851A, 0x08851A, 0x041D07, 0x041D07
-};
-
-const u32 spu_frest_exponent_lut[256] =
-{
-	0x7F800000, 0x7E000000, 0x7D800000, 0x7D000000, 0x7C800000, 0x7C000000, 0x7B800000, 0x7B000000, 0x7A800000, 0x7A000000, 0x79800000, 0x79000000, 0x78800000, 0x78000000, 0x77800000, 0x77000000,
-	0x76800000, 0x76000000, 0x75800000, 0x75000000, 0x74800000, 0x74000000, 0x73800000, 0x73000000, 0x72800000, 0x72000000, 0x71800000, 0x71000000, 0x70800000, 0x70000000, 0x6F800000, 0x6F000000,
-	0x6E800000, 0x6E000000, 0x6D800000, 0x6D000000, 0x6C800000, 0x6C000000, 0x6B800000, 0x6B000000, 0x6A800000, 0x6A000000, 0x69800000, 0x69000000, 0x68800000, 0x68000000, 0x67800000, 0x67000000,
-	0x66800000, 0x66000000, 0x65800000, 0x65000000, 0x64800000, 0x64000000, 0x63800000, 0x63000000, 0x62800000, 0x62000000, 0x61800000, 0x61000000, 0x60800000, 0x60000000, 0x5F800000, 0x5F000000,
-	0x5E800000, 0x5E000000, 0x5D800000, 0x5D000000, 0x5C800000, 0x5C000000, 0x5B800000, 0x5B000000, 0x5A800000, 0x5A000000, 0x59800000, 0x59000000, 0x58800000, 0x58000000, 0x57800000, 0x57000000,
-	0x56800000, 0x56000000, 0x55800000, 0x55000000, 0x54800000, 0x54000000, 0x53800000, 0x53000000, 0x52800000, 0x52000000, 0x51800000, 0x51000000, 0x50800000, 0x50000000, 0x4F800000, 0x4F000000,
-	0x4E800000, 0x4E000000, 0x4D800000, 0x4D000000, 0x4C800000, 0x4C000000, 0x4B800000, 0x4B000000, 0x4A800000, 0x4A000000, 0x49800000, 0x49000000, 0x48800000, 0x48000000, 0x47800000, 0x47000000,
-	0x46800000, 0x46000000, 0x45800000, 0x45000000, 0x44800000, 0x44000000, 0x43800000, 0x43000000, 0x42800000, 0x42000000, 0x41800000, 0x41000000, 0x40800000, 0x40000000, 0x3F800000, 0x3F000000,
-	0x3E800000, 0x3E000000, 0x3D800000, 0x3D000000, 0x3C800000, 0x3C000000, 0x3B800000, 0x3B000000, 0x3A800000, 0x3A000000, 0x39800000, 0x39000000, 0x38800000, 0x38000000, 0x37800000, 0x37000000,
-	0x36800000, 0x36000000, 0x35800000, 0x35000000, 0x34800000, 0x34000000, 0x33800000, 0x33000000, 0x32800000, 0x32000000, 0x31800000, 0x31000000, 0x30800000, 0x30000000, 0x2F800000, 0x2F000000,
-	0x2E800000, 0x2E000000, 0x2D800000, 0x2D000000, 0x2C800000, 0x2C000000, 0x2B800000, 0x2B000000, 0x2A800000, 0x2A000000, 0x29800000, 0x29000000, 0x28800000, 0x28000000, 0x27800000, 0x27000000,
-	0x26800000, 0x26000000, 0x25800000, 0x25000000, 0x24800000, 0x24000000, 0x23800000, 0x23000000, 0x22800000, 0x22000000, 0x21800000, 0x21000000, 0x20800000, 0x20000000, 0x1F800000, 0x1F000000,
-	0x1E800000, 0x1E000000, 0x1D800000, 0x1D000000, 0x1C800000, 0x1C000000, 0x1B800000, 0x1B000000, 0x1A800000, 0x1A000000, 0x19800000, 0x19000000, 0x18800000, 0x18000000, 0x17800000, 0x17000000,
-	0x16800000, 0x16000000, 0x15800000, 0x15000000, 0x14800000, 0x14000000, 0x13800000, 0x13000000, 0x12800000, 0x12000000, 0x11800000, 0x11000000, 0x10800000, 0x10000000, 0x0F800000, 0x0F000000,
-	0x0E800000, 0x0E000000, 0x0D800000, 0x0D000000, 0x0C800000, 0x0C000000, 0x0B800000, 0x0B000000, 0x0A800000, 0x0A000000, 0x09800000, 0x09000000, 0x08800000, 0x08000000, 0x07800000, 0x07000000,
-	0x06800000, 0x06000000, 0x05800000, 0x05000000, 0x04800000, 0x04000000, 0x03800000, 0x03000000, 0x02800000, 0x02000000, 0x01800000, 0x01000000, 0x00800000, 0x00000000, 0x00000000, 0x00000000
-};
-
-const u32 spu_frsqest_fraction_lut[64] =
-{
-	0x350160, 0x34E954, 0x2F993D, 0x2F993D, 0x2AA523, 0x2AA523, 0x26190D, 0x26190D, 0x21E4F9, 0x21E4F9, 0x1E00E9, 0x1E00E9, 0x1A5CD9, 0x1A5CD9, 0x16F8CB, 0x16F8CB,
-	0x13CCC0, 0x13CCC0, 0x10CCB3, 0x10CCB3, 0x0E00AA, 0x0E00AA, 0x0B58A1, 0x0B58A1, 0x08D498, 0x08D498, 0x067491, 0x067491, 0x043089, 0x043089, 0x020C83, 0x020C83,
-	0x7FFDF4, 0x7FD1DE, 0x7859C8, 0x783DBA, 0x71559C, 0x71559C, 0x6AE57C, 0x6AE57C, 0x64F561, 0x64F561, 0x5F7149, 0x5F7149, 0x5A4D33, 0x5A4D33, 0x55811F, 0x55811F,
-	0x51050F, 0x51050F, 0x4CC8FE, 0x4CC8FE, 0x48D0F0, 0x48D0F0, 0x4510E4, 0x4510E4, 0x4180D7, 0x4180D7, 0x3E24CC, 0x3E24CC, 0x3AF4C3, 0x3AF4C3, 0x37E8BA, 0x37E8BA
-};
-
-const u32 spu_frsqest_exponent_lut[256] =
-{
-	0x7F800000, 0x5E800000, 0x5E800000, 0x5E000000, 0x5E000000, 0x5D800000, 0x5D800000, 0x5D000000, 0x5D000000, 0x5C800000, 0x5C800000, 0x5C000000, 0x5C000000, 0x5B800000, 0x5B800000, 0x5B000000,
-	0x5B000000, 0x5A800000, 0x5A800000, 0x5A000000, 0x5A000000, 0x59800000, 0x59800000, 0x59000000, 0x59000000, 0x58800000, 0x58800000, 0x58000000, 0x58000000, 0x57800000, 0x57800000, 0x57000000,
-	0x57000000, 0x56800000, 0x56800000, 0x56000000, 0x56000000, 0x55800000, 0x55800000, 0x55000000, 0x55000000, 0x54800000, 0x54800000, 0x54000000, 0x54000000, 0x53800000, 0x53800000, 0x53000000,
-	0x53000000, 0x52800000, 0x52800000, 0x52000000, 0x52000000, 0x51800000, 0x51800000, 0x51000000, 0x51000000, 0x50800000, 0x50800000, 0x50000000, 0x50000000, 0x4F800000, 0x4F800000, 0x4F000000,
-	0x4F000000, 0x4E800000, 0x4E800000, 0x4E000000, 0x4E000000, 0x4D800000, 0x4D800000, 0x4D000000, 0x4D000000, 0x4C800000, 0x4C800000, 0x4C000000, 0x4C000000, 0x4B800000, 0x4B800000, 0x4B000000,
-	0x4B000000, 0x4A800000, 0x4A800000, 0x4A000000, 0x4A000000, 0x49800000, 0x49800000, 0x49000000, 0x49000000, 0x48800000, 0x48800000, 0x48000000, 0x48000000, 0x47800000, 0x47800000, 0x47000000,
-	0x47000000, 0x46800000, 0x46800000, 0x46000000, 0x46000000, 0x45800000, 0x45800000, 0x45000000, 0x45000000, 0x44800000, 0x44800000, 0x44000000, 0x44000000, 0x43800000, 0x43800000, 0x43000000,
-	0x43000000, 0x42800000, 0x42800000, 0x42000000, 0x42000000, 0x41800000, 0x41800000, 0x41000000, 0x41000000, 0x40800000, 0x40800000, 0x40000000, 0x40000000, 0x3F800000, 0x3F800000, 0x3F000000,
-	0x3F000000, 0x3E800000, 0x3E800000, 0x3E000000, 0x3E000000, 0x3D800000, 0x3D800000, 0x3D000000, 0x3D000000, 0x3C800000, 0x3C800000, 0x3C000000, 0x3C000000, 0x3B800000, 0x3B800000, 0x3B000000,
-	0x3B000000, 0x3A800000, 0x3A800000, 0x3A000000, 0x3A000000, 0x39800000, 0x39800000, 0x39000000, 0x39000000, 0x38800000, 0x38800000, 0x38000000, 0x38000000, 0x37800000, 0x37800000, 0x37000000,
-	0x37000000, 0x36800000, 0x36800000, 0x36000000, 0x36000000, 0x35800000, 0x35800000, 0x35000000, 0x35000000, 0x34800000, 0x34800000, 0x34000000, 0x34000000, 0x33800000, 0x33800000, 0x33000000,
-	0x33000000, 0x32800000, 0x32800000, 0x32000000, 0x32000000, 0x31800000, 0x31800000, 0x31000000, 0x31000000, 0x30800000, 0x30800000, 0x30000000, 0x30000000, 0x2F800000, 0x2F800000, 0x2F000000,
-	0x2F000000, 0x2E800000, 0x2E800000, 0x2E000000, 0x2E000000, 0x2D800000, 0x2D800000, 0x2D000000, 0x2D000000, 0x2C800000, 0x2C800000, 0x2C000000, 0x2C000000, 0x2B800000, 0x2B800000, 0x2B000000,
-	0x2B000000, 0x2A800000, 0x2A800000, 0x2A000000, 0x2A000000, 0x29800000, 0x29800000, 0x29000000, 0x29000000, 0x28800000, 0x28800000, 0x28000000, 0x28000000, 0x27800000, 0x27800000, 0x27000000,
-	0x27000000, 0x26800000, 0x26800000, 0x26000000, 0x26000000, 0x25800000, 0x25800000, 0x25000000, 0x25000000, 0x24800000, 0x24800000, 0x24000000, 0x24000000, 0x23800000, 0x23800000, 0x23000000,
-	0x23000000, 0x22800000, 0x22800000, 0x22000000, 0x22000000, 0x21800000, 0x21800000, 0x21000000, 0x21000000, 0x20800000, 0x20800000, 0x20000000, 0x20000000, 0x1F800000, 0x1F800000, 0x1F000000
-};
 
 using spu_rdata_t = decltype(spu_thread::rdata);
 
@@ -155,61 +84,18 @@ void fmt_class_string<spu_type>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
-void fmt_class_string<spu_block_hash>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%s", fmt::base57(be_t<u64>{arg}));
-
-	// Print only 7 hash characters out of 11 (which covers roughly 48 bits)
-	out.resize(out.size() - 4);
-
-	// Print chunk address from lowest 16 bits
-	fmt::append(out, "...chunk-0x%05x", (arg & 0xffff) * 4);
-}
-
-enum class spu_block_hash_short : u64{};
-
-template <>
-void fmt_class_string<spu_block_hash_short>::format(std::string& out, u64 arg)
-{
-	fmt::append(out, "%s", fmt::base57(be_t<u64>{arg}));
-
-	// Print only 7 hash characters out of 11 (which covers roughly 48 bits)
-	out.resize(out.size() - 4);
-}
-
 // Verify AVX availability for TSX transactions
 static const bool s_tsx_avx = utils::has_avx();
 
-// Threshold for when rep mosvb is expected to outperform simd copies
-// The threshold will be 0xFFFFFFFF when the performance of rep movsb is expected to be bad
-static const u32 s_rep_movsb_threshold = utils::get_rep_movsb_threshold();
+// For special case
+static const bool s_tsx_haswell = utils::has_rtm() && !utils::has_mpx();
 
-#if defined(_M_X64)
-extern "C" void __movsb(uchar*, const uchar*, size_t);
-#elif defined(ARCH_X64)
-static FORCE_INLINE void __movsb(unsigned char * Dst, const unsigned char * Src, size_t Size)
-{
-	__asm__ __volatile__
-	(
-		"rep; movsb" :
-		[Dst] "=D" (Dst), [Src] "=S" (Src), [Size] "=c" (Size) :
-		"[Dst]" (Dst), "[Src]" (Src), "[Size]" (Size)
-	);
-}
-#else
-#define s_rep_movsb_threshold umax
-#define __movsb std::memcpy
-#endif
-
-#if defined(ARCH_X64)
 static FORCE_INLINE bool cmp_rdata_avx(const __m256i* lhs, const __m256i* rhs)
 {
 #if defined(_MSC_VER) || defined(__AVX__)
-	// Interleave 2 cache line accesses (optimization)
 	const __m256 x0 = _mm256_xor_ps(_mm256_castsi256_ps(_mm256_loadu_si256(lhs + 0)), _mm256_castsi256_ps(_mm256_loadu_si256(rhs + 0)));
-	const __m256 x2 = _mm256_xor_ps(_mm256_castsi256_ps(_mm256_loadu_si256(lhs + 2)), _mm256_castsi256_ps(_mm256_loadu_si256(rhs + 2)));
 	const __m256 x1 = _mm256_xor_ps(_mm256_castsi256_ps(_mm256_loadu_si256(lhs + 1)), _mm256_castsi256_ps(_mm256_loadu_si256(rhs + 1)));
+	const __m256 x2 = _mm256_xor_ps(_mm256_castsi256_ps(_mm256_loadu_si256(lhs + 2)), _mm256_castsi256_ps(_mm256_loadu_si256(rhs + 2)));
 	const __m256 x3 = _mm256_xor_ps(_mm256_castsi256_ps(_mm256_loadu_si256(lhs + 3)), _mm256_castsi256_ps(_mm256_loadu_si256(rhs + 3)));
 	const __m256 c0 = _mm256_or_ps(x0, x1);
 	const __m256 c1 = _mm256_or_ps(x2, x3);
@@ -219,12 +105,12 @@ static FORCE_INLINE bool cmp_rdata_avx(const __m256i* lhs, const __m256i* rhs)
 	bool result = 0;
 	__asm__(
 		"vmovups 0*32(%[lhs]), %%ymm0;" // load
-		"vmovups 2*32(%[lhs]), %%ymm2;"
 		"vmovups 1*32(%[lhs]), %%ymm1;"
+		"vmovups 2*32(%[lhs]), %%ymm2;"
 		"vmovups 3*32(%[lhs]), %%ymm3;"
 		"vxorps 0*32(%[rhs]), %%ymm0, %%ymm0;" // compare
-		"vxorps 2*32(%[rhs]), %%ymm2, %%ymm2;"
 		"vxorps 1*32(%[rhs]), %%ymm1, %%ymm1;"
+		"vxorps 2*32(%[rhs]), %%ymm2, %%ymm2;"
 		"vxorps 3*32(%[rhs]), %%ymm3, %%ymm3;"
 		"vorps %%ymm0, %%ymm1, %%ymm0;" // merge
 		"vorps %%ymm2, %%ymm3, %%ymm2;"
@@ -243,48 +129,44 @@ static FORCE_INLINE bool cmp_rdata_avx(const __m256i* lhs, const __m256i* rhs)
 	return result;
 #endif
 }
-#endif
 
 #ifdef _MSC_VER
 __forceinline
 #endif
 extern bool cmp_rdata(const spu_rdata_t& _lhs, const spu_rdata_t& _rhs)
 {
-#if defined(ARCH_X64)
 #ifndef __AVX__
 	if (s_tsx_avx) [[likely]]
 #endif
 	{
 		return cmp_rdata_avx(reinterpret_cast<const __m256i*>(_lhs), reinterpret_cast<const __m256i*>(_rhs));
 	}
-#endif
 
 	const auto lhs = reinterpret_cast<const v128*>(_lhs);
 	const auto rhs = reinterpret_cast<const v128*>(_rhs);
 	const v128 a = (lhs[0] ^ rhs[0]) | (lhs[1] ^ rhs[1]);
-	const v128 c = (lhs[4] ^ rhs[4]) | (lhs[5] ^ rhs[5]);
 	const v128 b = (lhs[2] ^ rhs[2]) | (lhs[3] ^ rhs[3]);
+	const v128 c = (lhs[4] ^ rhs[4]) | (lhs[5] ^ rhs[5]);
 	const v128 d = (lhs[6] ^ rhs[6]) | (lhs[7] ^ rhs[7]);
 	const v128 r = (a | b) | (c | d);
-	return gv_testz(r);
+	return r == v128{};
 }
 
-#if defined(ARCH_X64)
 static FORCE_INLINE void mov_rdata_avx(__m256i* dst, const __m256i* src)
 {
 #ifdef _MSC_VER
 	_mm256_storeu_si256(dst + 0, _mm256_loadu_si256(src + 0));
-	_mm256_storeu_si256(dst + 2, _mm256_loadu_si256(src + 2));
 	_mm256_storeu_si256(dst + 1, _mm256_loadu_si256(src + 1));
+	_mm256_storeu_si256(dst + 2, _mm256_loadu_si256(src + 2));
 	_mm256_storeu_si256(dst + 3, _mm256_loadu_si256(src + 3));
 #else
 	__asm__(
 		"vmovdqu 0*32(%[src]), %%ymm0;" // load
 		"vmovdqu %%ymm0, 0*32(%[dst]);" // store
-		"vmovdqu 2*32(%[src]), %%ymm0;"
-		"vmovdqu %%ymm0, 2*32(%[dst]);"
 		"vmovdqu 1*32(%[src]), %%ymm0;"
 		"vmovdqu %%ymm0, 1*32(%[dst]);"
+		"vmovdqu 2*32(%[src]), %%ymm0;"
+		"vmovdqu %%ymm0, 2*32(%[dst]);"
 		"vmovdqu 3*32(%[src]), %%ymm0;"
 		"vmovdqu %%ymm0, 3*32(%[dst]);"
 #ifndef __AVX__
@@ -301,14 +183,12 @@ static FORCE_INLINE void mov_rdata_avx(__m256i* dst, const __m256i* src)
 	);
 #endif
 }
-#endif
 
 #ifdef _MSC_VER
 __forceinline
 #endif
 extern void mov_rdata(spu_rdata_t& _dst, const spu_rdata_t& _src)
 {
-#if defined(ARCH_X64)
 #ifndef __AVX__
 	if (s_tsx_avx) [[likely]]
 #endif
@@ -336,42 +216,23 @@ extern void mov_rdata(spu_rdata_t& _dst, const spu_rdata_t& _src)
 	_mm_storeu_si128(reinterpret_cast<__m128i*>(_dst + 80), v1);
 	_mm_storeu_si128(reinterpret_cast<__m128i*>(_dst + 96), v2);
 	_mm_storeu_si128(reinterpret_cast<__m128i*>(_dst + 112), v3);
-#else
-	std::memcpy(_dst, _src, 128);
-#endif
 }
 
-#ifdef _MSC_VER
-__forceinline
-#endif
-extern u32 compute_rdata_hash32(const spu_rdata_t& _src)
-{
-	const auto rhs = reinterpret_cast<const v128*>(_src);
-	const v128 a = gv_add32(rhs[0], rhs[1]);
-	const v128 c = gv_add32(rhs[4], rhs[5]);
-	const v128 b = gv_add32(rhs[2], rhs[3]);
-	const v128 d = gv_add32(rhs[6], rhs[7]);
-	const v128 r = gv_add32(gv_add32(a, b), gv_add32(c, d));
-	const v128 r1 = gv_add32(r, gv_shuffle32<1, 0, 3, 2>(r));
-	return r1._u32[0] + r1._u32[2];
-}
-
-#if defined(ARCH_X64)
 static FORCE_INLINE void mov_rdata_nt_avx(__m256i* dst, const __m256i* src)
 {
 #ifdef _MSC_VER
 	_mm256_stream_si256(dst + 0, _mm256_load_si256(src + 0));
-	_mm256_stream_si256(dst + 2, _mm256_load_si256(src + 2));
 	_mm256_stream_si256(dst + 1, _mm256_load_si256(src + 1));
+	_mm256_stream_si256(dst + 2, _mm256_load_si256(src + 2));
 	_mm256_stream_si256(dst + 3, _mm256_load_si256(src + 3));
 #else
 	__asm__(
 		"vmovdqa 0*32(%[src]), %%ymm0;" // load
 		"vmovntdq %%ymm0, 0*32(%[dst]);" // store
-		"vmovdqa 2*32(%[src]), %%ymm0;"
-		"vmovntdq %%ymm0, 2*32(%[dst]);"
 		"vmovdqa 1*32(%[src]), %%ymm0;"
 		"vmovntdq %%ymm0, 1*32(%[dst]);"
+		"vmovdqa 2*32(%[src]), %%ymm0;"
+		"vmovntdq %%ymm0, 2*32(%[dst]);"
 		"vmovdqa 3*32(%[src]), %%ymm0;"
 		"vmovntdq %%ymm0, 3*32(%[dst]);"
 #ifndef __AVX__
@@ -388,11 +249,9 @@ static FORCE_INLINE void mov_rdata_nt_avx(__m256i* dst, const __m256i* src)
 	);
 #endif
 }
-#endif
 
 extern void mov_rdata_nt(spu_rdata_t& _dst, const spu_rdata_t& _src)
 {
-#if defined(ARCH_X64)
 #ifndef __AVX__
 	if (s_tsx_avx) [[likely]]
 #endif
@@ -420,48 +279,6 @@ extern void mov_rdata_nt(spu_rdata_t& _dst, const spu_rdata_t& _src)
 	_mm_stream_si128(reinterpret_cast<__m128i*>(_dst + 80), v1);
 	_mm_stream_si128(reinterpret_cast<__m128i*>(_dst + 96), v2);
 	_mm_stream_si128(reinterpret_cast<__m128i*>(_dst + 112), v3);
-#else
-	std::memcpy(_dst, _src, 128);
-#endif
-}
-
-#if defined(_MSC_VER)
-#define mwaitx_func
-#define waitpkg_func
-#else
-#define mwaitx_func __attribute__((__target__("mwaitx")))
-#define waitpkg_func __attribute__((__target__("waitpkg")))
-#endif
-
-#if defined(ARCH_X64)
-// Waits for a number of TSC clock cycles in power optimized state
-// Cstate is represented in bits [7:4]+1 cstate. So C0 requires bits [7:4] to be set to 0xf, C1 requires bits [7:4] to be set to 0.
-template <typename T, typename... Args>
-mwaitx_func static void __mwaitx(u32 cycles, u32 cstate, const void* cline, const Args&... args)
-{
-	constexpr u32 timer_enable = 0x2;
-
-	// monitorx will wake if the cache line is written to, use it for reservations which fits it almost perfectly
-	_mm_monitorx(const_cast<void*>(cline), 0, 0);
-
-	// Use static function to force inline
-	if (T::needs_wait(args...))
-	{
-		_mm_mwaitx(timer_enable, cstate, cycles);
-	}
-}
-
-// First bit indicates cstate, 0x0 for C.02 state (lower power) or 0x1 for C.01 state (higher power)
-waitpkg_func static void __tpause(u32 cycles, u32 cstate)
-{
-	const u64 tsc = utils::get_tsc() + cycles;
-	_tpause(cstate, tsc);
-}
-#endif
-
-namespace vm
-{
-	std::array<atomic_t<reservation_waiter_t>, 1024> g_resrv_waiters_count{};
 }
 
 void do_cell_atomic_128_store(u32 addr, const void* to_write);
@@ -470,24 +287,6 @@ extern thread_local u64 g_tls_fault_spu;
 
 const spu_decoder<spu_itype> s_spu_itype;
 
-namespace vm
-{
-	extern atomic_t<u64, 64> g_range_lock_set[64];
-
-	// Defined here for performance reasons
-	writer_lock::~writer_lock() noexcept
-	{
-		if (range_lock)
-		{
-			g_range_lock_bits[1] &= ~(1ull << (range_lock - g_range_lock_set));
-			range_lock->release(0);
-			return;
-		}
-
-		g_range_lock_bits[1].release(0);
-	}
-}
-
 namespace spu
 {
 	namespace scheduler
@@ -584,12 +383,6 @@ std::array<u32, 2> op_branch_targets(u32 pc, spu_opcode_t op)
 	{
 		const int index = (type == spu_itype::BR || type == spu_itype::BRA || type == spu_itype::BRSL || type == spu_itype::BRASL ? 0 : 1);
 		res[index] = (spu_branch_target(type == spu_itype::BRASL || type == spu_itype::BRA ? 0 : pc, op.i16));
-
-		if (res[0] == res[1])
-		{
-			res[1] = umax;
-		}
-
 		break;
 	}
 	case spu_itype::IRET:
@@ -612,14 +405,15 @@ std::array<u32, 2> op_branch_targets(u32 pc, spu_opcode_t op)
 	return res;
 }
 
-const auto spu_putllc_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime, void* _old, const void* _new)>("spu_putllc_tx", [](native_asm& c, auto& args)
+const auto spu_putllc_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime, void* _old, const void* _new)>([](asmjit::X86Assembler& c, auto& args)
 {
 	using namespace asmjit;
 
-#if defined(ARCH_X64)
 	Label fall = c.newLabel();
 	Label fail = c.newLabel();
 	Label _ret = c.newLabel();
+	Label skip = c.newLabel();
+	Label next = c.newLabel();
 	Label load = c.newLabel();
 
 	//if (utils::has_avx() && !s_tsx_avx)
@@ -629,9 +423,11 @@ const auto spu_putllc_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime, void*
 
 	// Create stack frame if necessary (Windows ABI has only 6 volatile vector registers)
 	c.push(x86::rbp);
+	c.push(x86::r13);
+	c.push(x86::r12);
 	c.push(x86::rbx);
-#ifdef _WIN32
 	c.sub(x86::rsp, 168);
+#ifdef _WIN32
 	if (s_tsx_avx)
 	{
 		c.vmovups(x86::oword_ptr(x86::rsp, 0), x86::xmm6);
@@ -650,33 +446,31 @@ const auto spu_putllc_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime, void*
 		c.movups(x86::oword_ptr(x86::rsp, 128), x86::xmm14);
 		c.movups(x86::oword_ptr(x86::rsp, 144), x86::xmm15);
 	}
-#else
-	c.sub(x86::rsp, 40);
 #endif
 
 	// Prepare registers
-	build_swap_rdx_with(c, args, x86::r10);
-	c.movabs(args[1], reinterpret_cast<u64>(&vm::g_sudo_addr));
-	c.mov(args[1], x86::qword_ptr(args[1]));
-	c.lea(args[1], x86::qword_ptr(args[1], args[0]));
-	c.prefetchw(x86::byte_ptr(args[1], 0));
-	c.prefetchw(x86::byte_ptr(args[1], 64));
+	build_swap_rdx_with(c, args, x86::r12);
+	c.mov(x86::rbp, x86::qword_ptr(reinterpret_cast<u64>(&vm::g_sudo_addr)));
+	c.lea(x86::rbp, x86::qword_ptr(x86::rbp, args[0]));
+	c.prefetchw(x86::byte_ptr(x86::rbp, 0));
+	c.prefetchw(x86::byte_ptr(x86::rbp, 64));
 	c.and_(args[0].r32(), 0xff80);
 	c.shr(args[0].r32(), 1);
-	c.movabs(x86::r11, reinterpret_cast<u64>(+vm::g_reservations));
-	c.lea(x86::r11, x86::qword_ptr(x86::r11, args[0]));
+	c.lea(x86::rbx, x86::qword_ptr(reinterpret_cast<u64>(+vm::g_reservations), args[0]));
+	c.prefetchw(x86::byte_ptr(x86::rbx));
+	c.mov(x86::r13, args[1]);
 
 	// Prepare data
 	if (s_tsx_avx)
 	{
-		c.vmovups(x86::ymm0, x86::ymmword_ptr(args[2], 0));
-		c.vmovups(x86::ymm1, x86::ymmword_ptr(args[2], 32));
-		c.vmovups(x86::ymm2, x86::ymmword_ptr(args[2], 64));
-		c.vmovups(x86::ymm3, x86::ymmword_ptr(args[2], 96));
-		c.vmovups(x86::ymm4, x86::ymmword_ptr(args[3], 0));
-		c.vmovups(x86::ymm5, x86::ymmword_ptr(args[3], 32));
-		c.vmovups(x86::ymm6, x86::ymmword_ptr(args[3], 64));
-		c.vmovups(x86::ymm7, x86::ymmword_ptr(args[3], 96));
+		c.vmovups(x86::ymm0, x86::yword_ptr(args[2], 0));
+		c.vmovups(x86::ymm1, x86::yword_ptr(args[2], 32));
+		c.vmovups(x86::ymm2, x86::yword_ptr(args[2], 64));
+		c.vmovups(x86::ymm3, x86::yword_ptr(args[2], 96));
+		c.vmovups(x86::ymm4, x86::yword_ptr(args[3], 0));
+		c.vmovups(x86::ymm5, x86::yword_ptr(args[3], 32));
+		c.vmovups(x86::ymm6, x86::yword_ptr(args[3], 64));
+		c.vmovups(x86::ymm7, x86::yword_ptr(args[3], 96));
 	}
 	else
 	{
@@ -700,31 +494,35 @@ const auto spu_putllc_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime, void*
 
 	// Alloc args[0] to stamp0
 	const auto stamp0 = args[0];
+	const auto stamp1 = args[1];
 	build_get_tsc(c, stamp0);
 
-	Label fail2 = c.newLabel();
-
-	Label tx1 = build_transaction_enter(c, fall, [&]()
+	// Begin transaction
+	Label tx0 = build_transaction_enter(c, fall, [&]()
 	{
 		c.add(x86::qword_ptr(args[2], ::offset32(&spu_thread::ftx) - ::offset32(&spu_thread::rdata)), 1);
-		build_get_tsc(c);
-		c.sub(x86::rax, stamp0);
-		c.movabs(x86::rbx, reinterpret_cast<u64>(&g_rtm_tx_limit2));
-		c.cmp(x86::rax, x86::qword_ptr(x86::rbx));
+		build_get_tsc(c, stamp1);
+		c.sub(stamp1, stamp0);
+		c.xor_(x86::eax, x86::eax);
+		c.cmp(stamp1, x86::qword_ptr(reinterpret_cast<u64>(&g_rtm_tx_limit1)));
 		c.jae(fall);
 	});
-
-	// Check pause flag
 	c.bt(x86::dword_ptr(args[2], ::offset32(&spu_thread::state) - ::offset32(&spu_thread::rdata)), static_cast<u32>(cpu_flag::pause));
 	c.jc(fall);
-	c.xbegin(tx1);
+	c.xbegin(tx0);
+	c.mov(x86::rax, x86::qword_ptr(x86::rbx));
+	c.test(x86::eax, vm::rsrv_unique_lock);
+	c.jnz(skip);
+	c.and_(x86::rax, -128);
+	c.cmp(x86::rax, x86::r13);
+	c.jne(fail);
 
 	if (s_tsx_avx)
 	{
-		c.vxorps(x86::ymm0, x86::ymm0, x86::ymmword_ptr(args[1], 0));
-		c.vxorps(x86::ymm1, x86::ymm1, x86::ymmword_ptr(args[1], 32));
-		c.vxorps(x86::ymm2, x86::ymm2, x86::ymmword_ptr(args[1], 64));
-		c.vxorps(x86::ymm3, x86::ymm3, x86::ymmword_ptr(args[1], 96));
+		c.vxorps(x86::ymm0, x86::ymm0, x86::yword_ptr(x86::rbp, 0));
+		c.vxorps(x86::ymm1, x86::ymm1, x86::yword_ptr(x86::rbp, 32));
+		c.vxorps(x86::ymm2, x86::ymm2, x86::yword_ptr(x86::rbp, 64));
+		c.vxorps(x86::ymm3, x86::ymm3, x86::yword_ptr(x86::rbp, 96));
 		c.vorps(x86::ymm0, x86::ymm0, x86::ymm1);
 		c.vorps(x86::ymm1, x86::ymm2, x86::ymm3);
 		c.vorps(x86::ymm0, x86::ymm1, x86::ymm0);
@@ -732,14 +530,14 @@ const auto spu_putllc_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime, void*
 	}
 	else
 	{
-		c.xorps(x86::xmm0, x86::oword_ptr(args[1], 0));
-		c.xorps(x86::xmm1, x86::oword_ptr(args[1], 16));
-		c.xorps(x86::xmm2, x86::oword_ptr(args[1], 32));
-		c.xorps(x86::xmm3, x86::oword_ptr(args[1], 48));
-		c.xorps(x86::xmm4, x86::oword_ptr(args[1], 64));
-		c.xorps(x86::xmm5, x86::oword_ptr(args[1], 80));
-		c.xorps(x86::xmm6, x86::oword_ptr(args[1], 96));
-		c.xorps(x86::xmm7, x86::oword_ptr(args[1], 112));
+		c.xorps(x86::xmm0, x86::oword_ptr(x86::rbp, 0));
+		c.xorps(x86::xmm1, x86::oword_ptr(x86::rbp, 16));
+		c.xorps(x86::xmm2, x86::oword_ptr(x86::rbp, 32));
+		c.xorps(x86::xmm3, x86::oword_ptr(x86::rbp, 48));
+		c.xorps(x86::xmm4, x86::oword_ptr(x86::rbp, 64));
+		c.xorps(x86::xmm5, x86::oword_ptr(x86::rbp, 80));
+		c.xorps(x86::xmm6, x86::oword_ptr(x86::rbp, 96));
+		c.xorps(x86::xmm7, x86::oword_ptr(x86::rbp, 112));
 		c.orps(x86::xmm0, x86::xmm1);
 		c.orps(x86::xmm2, x86::xmm3);
 		c.orps(x86::xmm4, x86::xmm5);
@@ -754,72 +552,214 @@ const auto spu_putllc_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime, void*
 
 	if (s_tsx_avx)
 	{
-		c.vmovaps(x86::ymmword_ptr(args[1], 0), x86::ymm4);
-		c.vmovaps(x86::ymmword_ptr(args[1], 32), x86::ymm5);
-		c.vmovaps(x86::ymmword_ptr(args[1], 64), x86::ymm6);
-		c.vmovaps(x86::ymmword_ptr(args[1], 96), x86::ymm7);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 0), x86::ymm4);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 32), x86::ymm5);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 64), x86::ymm6);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 96), x86::ymm7);
 	}
 	else
 	{
-		c.movaps(x86::oword_ptr(args[1], 0), x86::xmm8);
-		c.movaps(x86::oword_ptr(args[1], 16), x86::xmm9);
-		c.movaps(x86::oword_ptr(args[1], 32), x86::xmm10);
-		c.movaps(x86::oword_ptr(args[1], 48), x86::xmm11);
-		c.movaps(x86::oword_ptr(args[1], 64), x86::xmm12);
-		c.movaps(x86::oword_ptr(args[1], 80), x86::xmm13);
-		c.movaps(x86::oword_ptr(args[1], 96), x86::xmm14);
-		c.movaps(x86::oword_ptr(args[1], 112), x86::xmm15);
+		c.movaps(x86::oword_ptr(x86::rbp, 0), x86::xmm8);
+		c.movaps(x86::oword_ptr(x86::rbp, 16), x86::xmm9);
+		c.movaps(x86::oword_ptr(x86::rbp, 32), x86::xmm10);
+		c.movaps(x86::oword_ptr(x86::rbp, 48), x86::xmm11);
+		c.movaps(x86::oword_ptr(x86::rbp, 64), x86::xmm12);
+		c.movaps(x86::oword_ptr(x86::rbp, 80), x86::xmm13);
+		c.movaps(x86::oword_ptr(x86::rbp, 96), x86::xmm14);
+		c.movaps(x86::oword_ptr(x86::rbp, 112), x86::xmm15);
 	}
 
+	c.sub(x86::qword_ptr(x86::rbx), -128);
 	c.xend();
-	c.lock().add(x86::qword_ptr(x86::r11), 64);
 	c.add(x86::qword_ptr(args[2], ::offset32(&spu_thread::stx) - ::offset32(&spu_thread::rdata)), 1);
 	build_get_tsc(c);
 	c.sub(x86::rax, stamp0);
 	c.jmp(_ret);
 
-	// XABORT is expensive so try to finish with xend instead
+	// XABORT is expensive so finish with xend instead
 	c.bind(fail);
 
+	// Load old data to store back in rdata
+	if (s_tsx_avx)
+	{
+		c.vmovaps(x86::ymm0, x86::yword_ptr(x86::rbp, 0));
+		c.vmovaps(x86::ymm1, x86::yword_ptr(x86::rbp, 32));
+		c.vmovaps(x86::ymm2, x86::yword_ptr(x86::rbp, 64));
+		c.vmovaps(x86::ymm3, x86::yword_ptr(x86::rbp, 96));
+	}
+	else
+	{
+		c.movaps(x86::xmm0, x86::oword_ptr(x86::rbp, 0));
+		c.movaps(x86::xmm1, x86::oword_ptr(x86::rbp, 16));
+		c.movaps(x86::xmm2, x86::oword_ptr(x86::rbp, 32));
+		c.movaps(x86::xmm3, x86::oword_ptr(x86::rbp, 48));
+		c.movaps(x86::xmm4, x86::oword_ptr(x86::rbp, 64));
+		c.movaps(x86::xmm5, x86::oword_ptr(x86::rbp, 80));
+		c.movaps(x86::xmm6, x86::oword_ptr(x86::rbp, 96));
+		c.movaps(x86::xmm7, x86::oword_ptr(x86::rbp, 112));
+	}
+
+	c.xend();
+	c.add(x86::qword_ptr(args[2], ::offset32(&spu_thread::stx) - ::offset32(&spu_thread::rdata)), 1);
+	c.jmp(load);
+
+	c.bind(skip);
+	c.xend();
+	c.add(x86::qword_ptr(args[2], ::offset32(&spu_thread::stx) - ::offset32(&spu_thread::rdata)), 1);
+	build_get_tsc(c, stamp1);
+	//c.jmp(fall);
+
+	c.bind(fall);
+
+	Label fall2 = c.newLabel();
+	Label fail2 = c.newLabel();
+	Label fail3 = c.newLabel();
+
+	// Lightened transaction: only compare and swap data
+	c.bind(next);
+
+	// Try to "lock" reservation
+	c.mov(x86::eax, 1);
+	c.lock().xadd(x86::qword_ptr(x86::rbx), x86::rax);
+	c.test(x86::eax, vm::rsrv_unique_lock);
+	c.jnz(fail2);
+
+	// Check if already updated
+	c.and_(x86::rax, -128);
+	c.cmp(x86::rax, x86::r13);
+	c.jne(fail2);
+
+	// Exclude some time spent on touching memory: stamp1 contains last success or failure
+	c.mov(x86::rax, stamp1);
+	c.sub(x86::rax, stamp0);
+	build_get_tsc(c, stamp1);
+	c.sub(stamp1, x86::rax);
+	c.cmp(x86::rax, x86::qword_ptr(reinterpret_cast<u64>(&g_rtm_tx_limit2)));
+	c.jae(fall2);
+
+	Label tx1 = build_transaction_enter(c, fall2, [&]()
+	{
+		c.add(x86::qword_ptr(args[2], ::offset32(&spu_thread::ftx) - ::offset32(&spu_thread::rdata)), 1);
+		build_get_tsc(c);
+		c.sub(x86::rax, stamp1);
+		c.cmp(x86::rax, x86::qword_ptr(reinterpret_cast<u64>(&g_rtm_tx_limit2)));
+		c.jae(fall2);
+		c.test(x86::qword_ptr(x86::rbx), 127 - 1);
+		c.jnz(fall2);
+	});
+	c.prefetchw(x86::byte_ptr(x86::rbp, 0));
+	c.prefetchw(x86::byte_ptr(x86::rbp, 64));
+
+	// Check pause flag
+	c.bt(x86::dword_ptr(args[2], ::offset32(&spu_thread::state) - ::offset32(&spu_thread::rdata)), static_cast<u32>(cpu_flag::pause));
+	c.jc(fall2);
+	c.mov(x86::rax, x86::qword_ptr(x86::rbx));
+	c.and_(x86::rax, -128);
+	c.cmp(x86::rax, x86::r13);
+	c.jne(fail2);
+	c.xbegin(tx1);
+
+	if (s_tsx_avx)
+	{
+		c.vxorps(x86::ymm0, x86::ymm0, x86::yword_ptr(x86::rbp, 0));
+		c.vxorps(x86::ymm1, x86::ymm1, x86::yword_ptr(x86::rbp, 32));
+		c.vxorps(x86::ymm2, x86::ymm2, x86::yword_ptr(x86::rbp, 64));
+		c.vxorps(x86::ymm3, x86::ymm3, x86::yword_ptr(x86::rbp, 96));
+		c.vorps(x86::ymm0, x86::ymm0, x86::ymm1);
+		c.vorps(x86::ymm1, x86::ymm2, x86::ymm3);
+		c.vorps(x86::ymm0, x86::ymm1, x86::ymm0);
+		c.vptest(x86::ymm0, x86::ymm0);
+	}
+	else
+	{
+		c.xorps(x86::xmm0, x86::oword_ptr(x86::rbp, 0));
+		c.xorps(x86::xmm1, x86::oword_ptr(x86::rbp, 16));
+		c.xorps(x86::xmm2, x86::oword_ptr(x86::rbp, 32));
+		c.xorps(x86::xmm3, x86::oword_ptr(x86::rbp, 48));
+		c.xorps(x86::xmm4, x86::oword_ptr(x86::rbp, 64));
+		c.xorps(x86::xmm5, x86::oword_ptr(x86::rbp, 80));
+		c.xorps(x86::xmm6, x86::oword_ptr(x86::rbp, 96));
+		c.xorps(x86::xmm7, x86::oword_ptr(x86::rbp, 112));
+		c.orps(x86::xmm0, x86::xmm1);
+		c.orps(x86::xmm2, x86::xmm3);
+		c.orps(x86::xmm4, x86::xmm5);
+		c.orps(x86::xmm6, x86::xmm7);
+		c.orps(x86::xmm0, x86::xmm2);
+		c.orps(x86::xmm4, x86::xmm6);
+		c.orps(x86::xmm0, x86::xmm4);
+		c.ptest(x86::xmm0, x86::xmm0);
+	}
+
+	c.jnz(fail3);
+
+	if (s_tsx_avx)
+	{
+		c.vmovaps(x86::yword_ptr(x86::rbp, 0), x86::ymm4);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 32), x86::ymm5);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 64), x86::ymm6);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 96), x86::ymm7);
+	}
+	else
+	{
+		c.movaps(x86::oword_ptr(x86::rbp, 0), x86::xmm8);
+		c.movaps(x86::oword_ptr(x86::rbp, 16), x86::xmm9);
+		c.movaps(x86::oword_ptr(x86::rbp, 32), x86::xmm10);
+		c.movaps(x86::oword_ptr(x86::rbp, 48), x86::xmm11);
+		c.movaps(x86::oword_ptr(x86::rbp, 64), x86::xmm12);
+		c.movaps(x86::oword_ptr(x86::rbp, 80), x86::xmm13);
+		c.movaps(x86::oword_ptr(x86::rbp, 96), x86::xmm14);
+		c.movaps(x86::oword_ptr(x86::rbp, 112), x86::xmm15);
+	}
+
+	c.xend();
+	c.add(x86::qword_ptr(args[2], ::offset32(&spu_thread::stx) - ::offset32(&spu_thread::rdata)), 1);
+	c.lock().add(x86::qword_ptr(x86::rbx), 127);
+	build_get_tsc(c);
+	c.sub(x86::rax, stamp0);
+	c.jmp(_ret);
+
+	// XABORT is expensive so try to finish with xend instead
+	c.bind(fail3);
+
 	// Load previous data to store back to rdata
 	if (s_tsx_avx)
 	{
-		c.vmovaps(x86::ymm0, x86::ymmword_ptr(args[1], 0));
-		c.vmovaps(x86::ymm1, x86::ymmword_ptr(args[1], 32));
-		c.vmovaps(x86::ymm2, x86::ymmword_ptr(args[1], 64));
-		c.vmovaps(x86::ymm3, x86::ymmword_ptr(args[1], 96));
+		c.vmovaps(x86::ymm0, x86::yword_ptr(x86::rbp, 0));
+		c.vmovaps(x86::ymm1, x86::yword_ptr(x86::rbp, 32));
+		c.vmovaps(x86::ymm2, x86::yword_ptr(x86::rbp, 64));
+		c.vmovaps(x86::ymm3, x86::yword_ptr(x86::rbp, 96));
 	}
 	else
 	{
-		c.movaps(x86::xmm0, x86::oword_ptr(args[1], 0));
-		c.movaps(x86::xmm1, x86::oword_ptr(args[1], 16));
-		c.movaps(x86::xmm2, x86::oword_ptr(args[1], 32));
-		c.movaps(x86::xmm3, x86::oword_ptr(args[1], 48));
-		c.movaps(x86::xmm4, x86::oword_ptr(args[1], 64));
-		c.movaps(x86::xmm5, x86::oword_ptr(args[1], 80));
-		c.movaps(x86::xmm6, x86::oword_ptr(args[1], 96));
-		c.movaps(x86::xmm7, x86::oword_ptr(args[1], 112));
+		c.movaps(x86::xmm0, x86::oword_ptr(x86::rbp, 0));
+		c.movaps(x86::xmm1, x86::oword_ptr(x86::rbp, 16));
+		c.movaps(x86::xmm2, x86::oword_ptr(x86::rbp, 32));
+		c.movaps(x86::xmm3, x86::oword_ptr(x86::rbp, 48));
+		c.movaps(x86::xmm4, x86::oword_ptr(x86::rbp, 64));
+		c.movaps(x86::xmm5, x86::oword_ptr(x86::rbp, 80));
+		c.movaps(x86::xmm6, x86::oword_ptr(x86::rbp, 96));
+		c.movaps(x86::xmm7, x86::oword_ptr(x86::rbp, 112));
 	}
 
 	c.xend();
 	c.add(x86::qword_ptr(args[2], ::offset32(&spu_thread::stx) - ::offset32(&spu_thread::rdata)), 1);
 	c.jmp(fail2);
 
-	c.bind(fall);
+	c.bind(fall2);
 	c.mov(x86::rax, -1);
 	c.jmp(_ret);
 
 	c.bind(fail2);
-	c.lock().sub(x86::qword_ptr(x86::r11), 64);
+	c.lock().sub(x86::qword_ptr(x86::rbx), 1);
 	c.bind(load);
 
 	// Store previous data back to rdata
 	if (s_tsx_avx)
 	{
-		c.vmovaps(x86::ymmword_ptr(args[2], 0), x86::ymm0);
-		c.vmovaps(x86::ymmword_ptr(args[2], 32), x86::ymm1);
-		c.vmovaps(x86::ymmword_ptr(args[2], 64), x86::ymm2);
-		c.vmovaps(x86::ymmword_ptr(args[2], 96), x86::ymm3);
+		c.vmovaps(x86::yword_ptr(args[2], 0), x86::ymm0);
+		c.vmovaps(x86::yword_ptr(args[2], 32), x86::ymm1);
+		c.vmovaps(x86::yword_ptr(args[2], 64), x86::ymm2);
+		c.vmovaps(x86::yword_ptr(args[2], 96), x86::ymm3);
 	}
 	else
 	{
@@ -859,36 +799,29 @@ const auto spu_putllc_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime, void*
 		c.movups(x86::xmm14, x86::oword_ptr(x86::rsp, 128));
 		c.movups(x86::xmm15, x86::oword_ptr(x86::rsp, 144));
 	}
-	c.add(x86::rsp, 168);
-#else
-	c.add(x86::rsp, 40);
 #endif
 
-	c.pop(x86::rbx);
-	c.pop(x86::rbp);
-
 	if (s_tsx_avx)
 	{
 		c.vzeroupper();
 	}
 
-	maybe_flush_lbr(c);
+	c.add(x86::rsp, 168);
+	c.pop(x86::rbx);
+	c.pop(x86::r12);
+	c.pop(x86::r13);
+	c.pop(x86::rbp);
 	c.ret();
-#else
-	UNUSED(args);
-
-	c.brk(Imm(0x42));
-	c.ret(a64::x30);
-#endif
 });
 
-const auto spu_putlluc_tx = build_function_asm<u64(*)(u32 raddr, const void* rdata, u64* _stx, u64* _ftx)>("spu_putlluc_tx", [](native_asm& c, auto& args)
+const auto spu_putlluc_tx = build_function_asm<u64(*)(u32 raddr, const void* rdata, cpu_thread* _spu)>([](asmjit::X86Assembler& c, auto& args)
 {
 	using namespace asmjit;
 
-#if defined(ARCH_X64)
 	Label fall = c.newLabel();
 	Label _ret = c.newLabel();
+	Label skip = c.newLabel();
+	Label next = c.newLabel();
 
 	//if (utils::has_avx() && !s_tsx_avx)
 	//{
@@ -897,6 +830,8 @@ const auto spu_putlluc_tx = build_function_asm<u64(*)(u32 raddr, const void* rda
 
 	// Create stack frame if necessary (Windows ABI has only 6 volatile vector registers)
 	c.push(x86::rbp);
+	c.push(x86::r13);
+	c.push(x86::r12);
 	c.push(x86::rbx);
 	c.sub(x86::rsp, 40);
 #ifdef _WIN32
@@ -906,21 +841,26 @@ const auto spu_putlluc_tx = build_function_asm<u64(*)(u32 raddr, const void* rda
 		c.movups(x86::oword_ptr(x86::rsp, 16), x86::xmm7);
 	}
 #endif
+
 	// Prepare registers
-	build_swap_rdx_with(c, args, x86::r10);
-	c.movabs(x86::r11, reinterpret_cast<u64>(&vm::g_sudo_addr));
-	c.mov(x86::r11, x86::qword_ptr(x86::r11));
-	c.lea(x86::r11, x86::qword_ptr(x86::r11, args[0]));
-	c.prefetchw(x86::byte_ptr(x86::r11, 0));
-	c.prefetchw(x86::byte_ptr(x86::r11, 64));
+	build_swap_rdx_with(c, args, x86::r12);
+	c.mov(x86::rbp, x86::qword_ptr(reinterpret_cast<u64>(&vm::g_sudo_addr)));
+	c.lea(x86::rbp, x86::qword_ptr(x86::rbp, args[0]));
+	c.prefetchw(x86::byte_ptr(x86::rbp, 0));
+	c.prefetchw(x86::byte_ptr(x86::rbp, 64));
+	c.and_(args[0].r32(), 0xff80);
+	c.shr(args[0].r32(), 1);
+	c.lea(x86::rbx, x86::qword_ptr(reinterpret_cast<u64>(+vm::g_reservations), args[0]));
+	c.prefetchw(x86::byte_ptr(x86::rbx));
+	c.mov(x86::r13, args[1]);
 
 	// Prepare data
 	if (s_tsx_avx)
 	{
-		c.vmovups(x86::ymm0, x86::ymmword_ptr(args[1], 0));
-		c.vmovups(x86::ymm1, x86::ymmword_ptr(args[1], 32));
-		c.vmovups(x86::ymm2, x86::ymmword_ptr(args[1], 64));
-		c.vmovups(x86::ymm3, x86::ymmword_ptr(args[1], 96));
+		c.vmovups(x86::ymm0, x86::yword_ptr(args[1], 0));
+		c.vmovups(x86::ymm1, x86::yword_ptr(args[1], 32));
+		c.vmovups(x86::ymm2, x86::yword_ptr(args[1], 64));
+		c.vmovups(x86::ymm3, x86::yword_ptr(args[1], 96));
 	}
 	else
 	{
@@ -934,56 +874,125 @@ const auto spu_putlluc_tx = build_function_asm<u64(*)(u32 raddr, const void* rda
 		c.movaps(x86::xmm7, x86::oword_ptr(args[1], 112));
 	}
 
-	c.and_(args[0].r32(), 0xff80);
-	c.shr(args[0].r32(), 1);
-	c.movabs(args[1], reinterpret_cast<u64>(+vm::g_reservations));
-	c.lea(args[1], x86::qword_ptr(args[1], args[0]));
-
 	// Alloc args[0] to stamp0
 	const auto stamp0 = args[0];
+	const auto stamp1 = args[1];
 	build_get_tsc(c, stamp0);
 
-	Label tx1 = build_transaction_enter(c, fall, [&]()
+	// Begin transaction
+	Label tx0 = build_transaction_enter(c, fall, [&]()
 	{
-		// ftx++;
-		c.add(x86::qword_ptr(args[3]), 1);
-		build_get_tsc(c);
-		c.sub(x86::rax, stamp0);
-		c.movabs(x86::rbx, reinterpret_cast<u64>(&g_rtm_tx_limit2));
-		c.cmp(x86::rax, x86::qword_ptr(x86::rbx));
+		c.add(x86::qword_ptr(args[2], ::offset32(&spu_thread::ftx)), 1);
+		build_get_tsc(c, stamp1);
+		c.sub(stamp1, stamp0);
+		c.xor_(x86::eax, x86::eax);
+		c.cmp(stamp1, x86::qword_ptr(reinterpret_cast<u64>(&g_rtm_tx_limit1)));
 		c.jae(fall);
 	});
-
-	c.xbegin(tx1);
+	c.xbegin(tx0);
+	c.test(x86::qword_ptr(x86::rbx), vm::rsrv_unique_lock);
+	c.jnz(skip);
 
 	if (s_tsx_avx)
 	{
-		c.vmovaps(x86::ymmword_ptr(x86::r11, 0), x86::ymm0);
-		c.vmovaps(x86::ymmword_ptr(x86::r11, 32), x86::ymm1);
-		c.vmovaps(x86::ymmword_ptr(x86::r11, 64), x86::ymm2);
-		c.vmovaps(x86::ymmword_ptr(x86::r11, 96), x86::ymm3);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 0), x86::ymm0);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 32), x86::ymm1);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 64), x86::ymm2);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 96), x86::ymm3);
 	}
 	else
 	{
-		c.movaps(x86::oword_ptr(x86::r11, 0), x86::xmm0);
-		c.movaps(x86::oword_ptr(x86::r11, 16), x86::xmm1);
-		c.movaps(x86::oword_ptr(x86::r11, 32), x86::xmm2);
-		c.movaps(x86::oword_ptr(x86::r11, 48), x86::xmm3);
-		c.movaps(x86::oword_ptr(x86::r11, 64), x86::xmm4);
-		c.movaps(x86::oword_ptr(x86::r11, 80), x86::xmm5);
-		c.movaps(x86::oword_ptr(x86::r11, 96), x86::xmm6);
-		c.movaps(x86::oword_ptr(x86::r11, 112), x86::xmm7);
+		c.movaps(x86::oword_ptr(x86::rbp, 0), x86::xmm0);
+		c.movaps(x86::oword_ptr(x86::rbp, 16), x86::xmm1);
+		c.movaps(x86::oword_ptr(x86::rbp, 32), x86::xmm2);
+		c.movaps(x86::oword_ptr(x86::rbp, 48), x86::xmm3);
+		c.movaps(x86::oword_ptr(x86::rbp, 64), x86::xmm4);
+		c.movaps(x86::oword_ptr(x86::rbp, 80), x86::xmm5);
+		c.movaps(x86::oword_ptr(x86::rbp, 96), x86::xmm6);
+		c.movaps(x86::oword_ptr(x86::rbp, 112), x86::xmm7);
 	}
 
+	c.sub(x86::qword_ptr(x86::rbx), -128);
 	c.xend();
-	c.lock().add(x86::qword_ptr(args[1]), 32);
-	// stx++
-	c.add(x86::qword_ptr(args[2]), 1);
+	c.add(x86::qword_ptr(args[2], ::offset32(&spu_thread::stx)), 1);
 	build_get_tsc(c);
 	c.sub(x86::rax, stamp0);
 	c.jmp(_ret);
 
+	c.bind(skip);
+	c.xend();
+	c.add(x86::qword_ptr(args[2], ::offset32(&spu_thread::stx)), 1);
+	build_get_tsc(c, stamp1);
+	//c.jmp(fall);
+
 	c.bind(fall);
+
+	Label fall2 = c.newLabel();
+
+	// Lightened transaction
+	c.bind(next);
+
+	// Lock reservation
+	c.mov(x86::eax, 1);
+	c.lock().xadd(x86::qword_ptr(x86::rbx), x86::rax);
+	c.test(x86::eax, 127 - 1);
+	c.jnz(fall2);
+
+	// Exclude some time spent on touching memory: stamp1 contains last success or failure
+	c.mov(x86::rax, stamp1);
+	c.sub(x86::rax, stamp0);
+	c.cmp(x86::rax, x86::qword_ptr(reinterpret_cast<u64>(&g_rtm_tx_limit2)));
+	c.jae(fall2);
+	build_get_tsc(c, stamp1);
+	c.sub(stamp1, x86::rax);
+
+	Label tx1 = build_transaction_enter(c, fall2, [&]()
+	{
+		c.add(x86::qword_ptr(args[2], ::offset32(&spu_thread::ftx)), 1);
+		build_get_tsc(c);
+		c.sub(x86::rax, stamp1);
+		c.cmp(x86::rax, x86::qword_ptr(reinterpret_cast<u64>(&g_rtm_tx_limit2)));
+		c.jae(fall2);
+	});
+
+	c.prefetchw(x86::byte_ptr(x86::rbp, 0));
+	c.prefetchw(x86::byte_ptr(x86::rbp, 64));
+
+	// Check pause flag
+	c.bt(x86::dword_ptr(args[2], ::offset32(&cpu_thread::state)), static_cast<u32>(cpu_flag::pause));
+	c.jc(fall2);
+	// Check contention
+	c.test(x86::qword_ptr(x86::rbx), 127 - 1);
+	c.jc(fall2);
+	c.xbegin(tx1);
+
+	if (s_tsx_avx)
+	{
+		c.vmovaps(x86::yword_ptr(x86::rbp, 0), x86::ymm0);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 32), x86::ymm1);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 64), x86::ymm2);
+		c.vmovaps(x86::yword_ptr(x86::rbp, 96), x86::ymm3);
+	}
+	else
+	{
+		c.movaps(x86::oword_ptr(x86::rbp, 0), x86::xmm0);
+		c.movaps(x86::oword_ptr(x86::rbp, 16), x86::xmm1);
+		c.movaps(x86::oword_ptr(x86::rbp, 32), x86::xmm2);
+		c.movaps(x86::oword_ptr(x86::rbp, 48), x86::xmm3);
+		c.movaps(x86::oword_ptr(x86::rbp, 64), x86::xmm4);
+		c.movaps(x86::oword_ptr(x86::rbp, 80), x86::xmm5);
+		c.movaps(x86::oword_ptr(x86::rbp, 96), x86::xmm6);
+		c.movaps(x86::oword_ptr(x86::rbp, 112), x86::xmm7);
+	}
+
+	c.xend();
+	c.add(x86::qword_ptr(args[2], ::offset32(&spu_thread::stx)), 1);
+	c.lock().add(x86::qword_ptr(x86::rbx), 127);
+	build_get_tsc(c);
+	c.sub(x86::rax, stamp0);
+	c.jmp(_ret);
+
+	c.bind(fall2);
 	c.xor_(x86::eax, x86::eax);
 	//c.jmp(_ret);
 
@@ -995,7 +1004,6 @@ const auto spu_putlluc_tx = build_function_asm<u64(*)(u32 raddr, const void* rda
 		c.movups(x86::xmm6, x86::oword_ptr(x86::rsp, 0));
 		c.movups(x86::xmm7, x86::oword_ptr(x86::rsp, 16));
 	}
-	c.add(x86::rsp, 40);
 #endif
 
 	if (s_tsx_avx)
@@ -1005,23 +1013,16 @@ const auto spu_putlluc_tx = build_function_asm<u64(*)(u32 raddr, const void* rda
 
 	c.add(x86::rsp, 40);
 	c.pop(x86::rbx);
+	c.pop(x86::r12);
+	c.pop(x86::r13);
 	c.pop(x86::rbp);
-
-	maybe_flush_lbr(c);
 	c.ret();
-#else
-	UNUSED(args);
-
-	c.brk(Imm(0x42));
-	c.ret(a64::x30);
-#endif
 });
 
-const auto spu_getllar_tx = build_function_asm<u64(*)(u32 raddr, void* rdata, cpu_thread* _cpu, u64 rtime)>("spu_getllar_tx", [](native_asm& c, auto& args)
+const extern auto spu_getllar_tx = build_function_asm<u64(*)(u32 raddr, void* rdata, cpu_thread* _cpu, u64 rtime)>([](asmjit::X86Assembler& c, auto& args)
 {
 	using namespace asmjit;
 
-#if defined(ARCH_X64)
 	Label fall = c.newLabel();
 	Label _ret = c.newLabel();
 
@@ -1032,6 +1033,8 @@ const auto spu_getllar_tx = build_function_asm<u64(*)(u32 raddr, void* rdata, cp
 
 	// Create stack frame if necessary (Windows ABI has only 6 volatile vector registers)
 	c.push(x86::rbp);
+	c.push(x86::r13);
+	c.push(x86::r12);
 	c.push(x86::rbx);
 	c.sub(x86::rsp, 40);
 #ifdef _WIN32
@@ -1043,14 +1046,13 @@ const auto spu_getllar_tx = build_function_asm<u64(*)(u32 raddr, void* rdata, cp
 #endif
 
 	// Prepare registers
-	build_swap_rdx_with(c, args, x86::r10);
-	c.movabs(x86::rbp, reinterpret_cast<u64>(&vm::g_sudo_addr));
-	c.mov(x86::rbp, x86::qword_ptr(x86::rbp));
+	build_swap_rdx_with(c, args, x86::r12);
+	c.mov(x86::rbp, x86::qword_ptr(reinterpret_cast<u64>(&vm::g_sudo_addr)));
 	c.lea(x86::rbp, x86::qword_ptr(x86::rbp, args[0]));
 	c.and_(args[0].r32(), 0xff80);
 	c.shr(args[0].r32(), 1);
-	c.movabs(x86::r11, reinterpret_cast<u64>(+vm::g_reservations));
-	c.lea(x86::r11, x86::qword_ptr(x86::r11, args[0]));
+	c.lea(x86::rbx, x86::qword_ptr(reinterpret_cast<u64>(+vm::g_reservations), args[0]));
+	c.mov(x86::r13, args[1]);
 
 	// Alloc args[0] to stamp0
 	const auto stamp0 = args[0];
@@ -1062,16 +1064,15 @@ const auto spu_getllar_tx = build_function_asm<u64(*)(u32 raddr, void* rdata, cp
 		c.add(x86::qword_ptr(args[2], ::offset32(&spu_thread::ftx)), 1);
 		build_get_tsc(c);
 		c.sub(x86::rax, stamp0);
-		c.movabs(x86::rbx, reinterpret_cast<u64>(&g_rtm_tx_limit1));
-		c.cmp(x86::rax, x86::qword_ptr(x86::rbx));
+		c.cmp(x86::rax, x86::qword_ptr(reinterpret_cast<u64>(&g_rtm_tx_limit1)));
 		c.jae(fall);
 	});
 
 	// Check pause flag
 	c.bt(x86::dword_ptr(args[2], ::offset32(&cpu_thread::state)), static_cast<u32>(cpu_flag::pause));
 	c.jc(fall);
-	c.mov(x86::rax, x86::qword_ptr(x86::r11));
-	c.and_(x86::rax, -128);
+	c.mov(x86::rax, x86::qword_ptr(x86::rbx));
+	c.and_(x86::rax, ~vm::rsrv_shared_mask);
 	c.cmp(x86::rax, args[3]);
 	c.jne(fall);
 	c.xbegin(tx0);
@@ -1079,10 +1080,10 @@ const auto spu_getllar_tx = build_function_asm<u64(*)(u32 raddr, void* rdata, cp
 	// Just read data to registers
 	if (s_tsx_avx)
 	{
-		c.vmovups(x86::ymm0, x86::ymmword_ptr(x86::rbp, 0));
-		c.vmovups(x86::ymm1, x86::ymmword_ptr(x86::rbp, 32));
-		c.vmovups(x86::ymm2, x86::ymmword_ptr(x86::rbp, 64));
-		c.vmovups(x86::ymm3, x86::ymmword_ptr(x86::rbp, 96));
+		c.vmovups(x86::ymm0, x86::yword_ptr(x86::rbp, 0));
+		c.vmovups(x86::ymm1, x86::yword_ptr(x86::rbp, 32));
+		c.vmovups(x86::ymm2, x86::yword_ptr(x86::rbp, 64));
+		c.vmovups(x86::ymm3, x86::yword_ptr(x86::rbp, 96));
 	}
 	else
 	{
@@ -1104,10 +1105,10 @@ const auto spu_getllar_tx = build_function_asm<u64(*)(u32 raddr, void* rdata, cp
 	// Store data
 	if (s_tsx_avx)
 	{
-		c.vmovaps(x86::ymmword_ptr(args[1], 0), x86::ymm0);
-		c.vmovaps(x86::ymmword_ptr(args[1], 32), x86::ymm1);
-		c.vmovaps(x86::ymmword_ptr(args[1], 64), x86::ymm2);
-		c.vmovaps(x86::ymmword_ptr(args[1], 96), x86::ymm3);
+		c.vmovaps(x86::yword_ptr(args[1], 0), x86::ymm0);
+		c.vmovaps(x86::yword_ptr(args[1], 32), x86::ymm1);
+		c.vmovaps(x86::yword_ptr(args[1], 64), x86::ymm2);
+		c.vmovaps(x86::yword_ptr(args[1], 96), x86::ymm3);
 	}
 	else
 	{
@@ -1143,16 +1144,10 @@ const auto spu_getllar_tx = build_function_asm<u64(*)(u32 raddr, void* rdata, cp
 
 	c.add(x86::rsp, 40);
 	c.pop(x86::rbx);
+	c.pop(x86::r12);
+	c.pop(x86::r13);
 	c.pop(x86::rbp);
-
-	maybe_flush_lbr(c);
 	c.ret();
-#else
-	UNUSED(args);
-
-	c.brk(Imm(0x42));
-	c.ret(a64::x30);
-#endif
 });
 
 void spu_int_ctrl_t::set(u64 ints)
@@ -1170,7 +1165,7 @@ void spu_int_ctrl_t::set(u64 ints)
 			if (auto handler = tag->handler; lv2_obj::check(handler))
 			{
 				rlock.unlock();
-				thread_ctrl::notify(*handler->thread);
+				handler->exec();
 			}
 		}
 	}
@@ -1182,7 +1177,7 @@ spu_imm_table_t::scale_table_t::scale_table_t()
 {
 	for (s32 i = -155; i < 174; i++)
 	{
-		m_data[i + 155] = v128::fromf32p(static_cast<float>(std::exp2(i)));
+		m_data[i + 155].vf = _mm_set1_ps(static_cast<float>(std::exp2(i)));
 	}
 }
 
@@ -1215,55 +1210,17 @@ spu_imm_table_t::spu_imm_table_t()
 	}
 }
 
-void spu_thread::dump_regs(std::string& ret, std::any& /*custom_data*/) const
+std::string spu_thread::dump_regs() const
 {
-	const system_state emu_state = Emu.GetStatus(false);
-	const bool is_stopped_or_frozen = state & cpu_flag::exit || emu_state == system_state::frozen || emu_state <= system_state::stopping;
-	const spu_debugger_mode mode = debugger_mode.load();
+	std::string ret;
 
-	const bool floats_only = !is_stopped_or_frozen && mode == spu_debugger_mode::is_float;
-	const bool is_decimal = !is_stopped_or_frozen && mode == spu_debugger_mode::is_decimal;
-
-	SPUDisAsm dis_asm(cpu_disasm_mode::normal, ls);
-
-	std::vector<v128> gpr_saved(128);
-	be_t<u32> rdata_saved[32]{};
-	be_t<u32> lsa_saved[32]{};
-	spu_mfc_cmd mfc_regs_saved{};
-	u32 saved_pc = umax;
-	const u8* lsa_state_ptr = nullptr;
-
-	// Load PC, GPRs and reservation data atomically
-	// We may not load the entire context atomically, but there is importance their state being intact for debugging
-	do
-	{
-		saved_pc = pc;
-
-		// Account for list transfer: record EAL instead
-		mfc_regs_saved = ch_mfc_cmd;
-		lsa_state_ptr = _ptr<const u8>(mfc_regs_saved.eal < SPU_LS_SIZE && mfc_regs_saved.eal % 8 == 0 ? mfc_regs_saved.eal : mfc_regs_saved.lsa);
-
-		std::memcpy(gpr_saved.data(), gpr.data(), sizeof(v128) * gpr.size());
-		std::memcpy(rdata_saved, rdata, sizeof(rdata));
-		std::memcpy(lsa_saved, lsa_state_ptr, std::min<usz>(128, SPU_LS_SIZE - (lsa_state_ptr - _ptr<u8>(0))));
-		atomic_fence_acquire();
-	}
-	while (saved_pc != pc || std::memcmp(rdata_saved, rdata, sizeof(rdata)) != 0 || std::memcmp(gpr_saved.data(), gpr.data(), sizeof(v128) * gpr.size()) != 0
-		|| std::memcmp(&mfc_regs_saved, &ch_mfc_cmd, sizeof(mfc_regs_saved)) != 0 || std::memcmp(lsa_saved, lsa_state_ptr, std::min<usz>(128, SPU_LS_SIZE - (lsa_state_ptr - _ptr<u8>(0)))) != 0);
+	const bool floats_only = debugger_float_mode.load();
 
 	for (u32 i = 0; i < 128; i++, ret += '\n')
 	{
-		const auto r = gpr_saved[i];
+		fmt::append(ret, "%s: ", spu_reg_name[i]);
 
-		auto [is_const, const_value] = dis_asm.try_get_const_value(i, saved_pc & ~3);
-
-		if (const_value != r)
-		{
-			// Expectation of predictable code path has not been met (such as a branch directly to the instruction)
-			is_const = false;
-		}
-
-		fmt::append(ret, "%s%s ", spu_reg_name[i], is_const ? "©" : ":");
+		const auto r = gpr[i];
 
 		if (auto [size, dst, src] = SPUDisAsm::try_get_insert_mask_info(r); size)
 		{
@@ -1302,53 +1259,17 @@ void spu_thread::dump_regs(std::string& ret, std::any& /*custom_data*/) const
 
 		if (is_packed)
 		{
-			bool printed_error = false;
-
-			if (i3 >> 31)
-			{
-				const usz old_size = ret.size();
-
-				fmt::append(ret, "%s (0x%x)", CellError{i3}, i3);
-
-				// Test if failed to format (appended " 0x8".. in such case)
-				if (ret[old_size] == '0')
-				{
-					// Failed
-					ret.resize(old_size);
-				}
-				else
-				{
-					printed_error = true;
-				}
-			}
-
-			if (!printed_error)
-			{
-				// Shortand formatting
-				if (is_decimal)
-				{
-					fmt::append(ret, "%-11d", i3);
-				}
-				else
-				{
-					fmt::append(ret, "%08x", i3);
-				}
-			}
+			// Shortand formatting
+			fmt::append(ret, "%08x", i3);
 		}
 		else
 		{
-			if (is_decimal)
-			{
-				fmt::append(ret, "%-11d %-11d %-11d %-11d", r.u32r[0], r.u32r[1], r.u32r[2], r.u32r[3]);
-			}
-			else
-			{
-				fmt::append(ret, "%08x %08x %08x %08x", r.u32r[0], r.u32r[1], r.u32r[2], r.u32r[3]);
-			}
+			fmt::append(ret, "%08x %08x %08x %08x", r.u32r[0], r.u32r[1], r.u32r[2], r.u32r[3]);
 		}
 
-		if (i3 >= 0x80 && is_exec_code(i3, { ls, SPU_LS_SIZE }))
+		if (i3 >= 0x80 && is_exec_code(i3))
 		{
+			SPUDisAsm dis_asm(cpu_disasm_mode::normal, ls);
 			dis_asm.disasm(i3);
 			fmt::append(ret, " -> %s", dis_asm.last_opcode);
 		}
@@ -1384,53 +1305,22 @@ void spu_thread::dump_regs(std::string& ret, std::any& /*custom_data*/) const
 	fmt::append(ret, "SNR config: 0x%llx\n", snr_config);
 	fmt::append(ret, "SNR1: %s\n", ch_snr1);
 	fmt::append(ret, "SNR2: %s\n", ch_snr2);
-	fmt::append(ret, "Last WrDec: %-9d (0x%08x) (%s)\n", ch_dec_value, ch_dec_value, is_dec_frozen ? "suspend" : "running");
-
-	if (get_type() != spu_type::threaded)
-	{
-		for (usz i = 0; i < int_ctrl.size(); i++)
-		{
-			fmt::append(ret, "Int Ctrl[%u]: stat=0x%x, mask=0x%x\n", i, +int_ctrl[i].stat, +int_ctrl[i].mask);
-		}
-
-		fmt::append(ret, "MFC Prxy Cmd: [%s written: %x]\n", mfc_prxy_cmd, mfc_prxy_write_state.all);
-		fmt::append(ret, "MFC Prxy Mask: 0x%x\n", +mfc_prxy_mask);
-	}
 
 	const u32 addr = raddr;
-	const u64 rtime0 = rtime;
-
-	if (vm::check_addr(addr))
-	{
-		fmt::append(ret, "Reservation Addr: 0x%x\n", addr);
-		fmt::append(ret, "Reservation Time: 0x%x\n", rtime0 & 0xff'ff'ff);
-	}
-	else if (addr)
-	{
-		fmt::append(ret, "Reservation Addr: 0x%x (unmapped)\n", addr);
-		fmt::append(ret, "Reservation Time: 0x%x\n", rtime0 & 0xff'ff'ff);
-	}
-	else
-	{
-		fmt::append(ret, "Reservation Addr: N/A\n");
-		fmt::append(ret, "Reservation Time: N/A\n");
-	}
 
+	fmt::append(ret, "Reservation Addr: %s\n", addr ? fmt::format("0x%x", addr) : "N/A");
 	fmt::append(ret, "Reservation Data:\n");
 
-	for (usz i = 0; i < std::size(rdata_saved); i += 4)
+	be_t<u32> data[32]{};
+	std::memcpy(data, rdata, sizeof(rdata)); // Show the data even if the reservation was lost inside the atomic loop
+
+	for (usz i = 0; i < std::size(data); i += 4)
 	{
-		fmt::append(ret, "[0x%02x] %08x %08x %08x %08x\n", i * sizeof(rdata_saved[0])
-			, rdata_saved[i + 0], rdata_saved[i + 1], rdata_saved[i + 2], rdata_saved[i + 3]);
+		fmt::append(ret, "[0x%02x] %08x %08x %08x %08x\n", i * sizeof(data[0])
+			, data[i + 0], data[i + 1], data[i + 2], data[i + 3]);
 	}
 
-	fmt::append(ret, "\nLSA Data:\n");
-
-	for (usz i = 0; i < std::size(lsa_saved); i += 4)
-	{
-		fmt::append(ret, "[0x%02x] %08x %08x %08x %08x\n", i * sizeof(lsa_saved[0])
-			, lsa_saved[i + 0], lsa_saved[i + 1], lsa_saved[i + 2], lsa_saved[i + 3]);
-	}
+	return ret;
 }
 
 std::string spu_thread::dump_callstack() const
@@ -1454,11 +1344,8 @@ std::vector<std::pair<u32, u32>> spu_thread::dump_callstack_list() const
 
 	bool first = true;
 
-	const v128 gpr0 = gpr[0];
-	const u32 _pc = pc;
-
 	// Declare first 128-bytes as invalid for stack (common values such as 0 do not make sense here)
-	for (u32 sp = gpr[1]._u32[3]; (sp & 0xF) == 0u && sp >= 0x80u && sp <= 0x3FFE0u; first = false)
+	for (u32 sp = gpr[1]._u32[3]; (sp & 0xF) == 0u && sp >= 0x80u && sp <= 0x3FFE0u; sp = _ref<u32>(sp), first = false)
 	{
 		v128 lr = _ref<v128>(sp + 16);
 
@@ -1469,138 +1356,35 @@ std::vector<std::pair<u32, u32>> spu_thread::dump_callstack_list() const
 			if (v != v128::from32r(addr))
 			{
 				// 1) Non-zero lower words are invalid (because BRSL-like instructions generate only zeroes)
-				// 2) Bits normally masked out by indirect branches are considered invalid
+				// 2) Bits normally masked out by indirect braches are considered invalid
 				return true;
 			}
 
-			return !addr || !is_exec_code(addr, { ls, SPU_LS_SIZE });
+			return !addr || !is_exec_code(addr);
 		};
 
-		if (first && lr._u32[3] != gpr0._u32[3] && !is_invalid(gpr0))
+		if (is_invalid(lr))
 		{
-			// Detect functions with no stack or before LR has been stored
-			std::vector<bool> passed(_pc / 4);
-
-			// Start with PC
-			std::vector<u32> start_points{_pc};
-
-			bool is_ok = false;
-			bool all_failed = false;
-
-			for (usz start = 0; !all_failed && start < start_points.size(); start++)
+			if (first)
 			{
-				for (u32 i = start_points[start]; i < SPU_LS_SIZE;)
+				// Function hasn't saved LR, could be because it's a leaf function
+				// Use LR directly instead
+				lr = gpr[0];
+
+				if (is_invalid(lr))
 				{
-					if (i / 4 >= passed.size())
-					{
-						passed.resize(i / 4 + 1);
-					}
-					else if (passed[i / 4])
-					{
-						// Already passed
-						break;
-					}
-
-					passed[i / 4] = true;
-
-					const spu_opcode_t op{_ref<u32>(i)};
-					const auto type = s_spu_itype.decode(op.opcode);
-
-					if (start == 0 && type == spu_itype::STQD && op.ra == 1u && op.rt == 0u)
-					{
-						// Saving LR to stack: this is indeed a new function (ok because LR has not been saved yet)
-						is_ok = true;
-						break;
-					}
-
-					if (type == spu_itype::LQD && op.rt == 0u)
-					{
-						// Loading LR from stack: this is not a leaf function
-						all_failed = true;
-						break;
-					}
-
-					if (type == spu_itype::UNK)
-					{
-						// Ignore for now
-						break;
-					}
-
-					if ((type == spu_itype::BRSL || type == spu_itype::BRASL || type == spu_itype::BISL) && op.rt == 0u)
-					{
-						// Gave up on link before saving
-						all_failed = true;
-						break;
-					}
-
-					if (type & spu_itype::branch && type >= spu_itype::BI && op.ra == 0u)
-					{
-						// Returned
-						is_ok = true;
-						break;
-					}
-
-					const auto results = op_branch_targets(i, op);
-
-					bool proceeded = false;
-					for (usz res_i = 0; res_i < results.size(); res_i++)
-					{
-						const u32 route_pc = results[res_i];
-
-						if (route_pc >= SPU_LS_SIZE)
-						{
-							continue;
-						}
-
-						if (route_pc / 4 >= passed.size())
-						{
-							passed.resize(route_pc / 4 + 1);
-						}
-
-						if (!passed[route_pc / 4])
-						{
-							if (proceeded)
-							{
-								// Remember next route start point
-								start_points.push_back(route_pc);
-							}
-							else
-							{
-								// Next PC
-								i = route_pc;
-								proceeded = true;
-							}
-						}
-					}
+					// Skip it, workaround
+					continue;
 				}
 			}
-
-			if (is_ok && !all_failed)
+			else
 			{
-				// Same stack as far as we know (for now)
-				call_stack_list.emplace_back(gpr0._u32[3], sp);
+				break;
 			}
 		}
 
-		if (!is_invalid(lr))
-		{
-			// TODO: function addresses too
-			call_stack_list.emplace_back(lr._u32[3], sp);
-		}
-		else if (!first)
-		{
-			break;
-		}
-
-		const u32 temp_sp = _ref<u32>(sp);
-
-		if (temp_sp <= sp)
-		{
-			// Ensure ascending stack frame pointers
-			break;
-		}
-
-		sp = temp_sp;
+		// TODO: function addresses too
+		call_stack_list.emplace_back(lr._u32[3], sp);
 	}
 
 	return call_stack_list;
@@ -1608,14 +1392,22 @@ std::vector<std::pair<u32, u32>> spu_thread::dump_callstack_list() const
 
 std::string spu_thread::dump_misc() const
 {
-	std::string ret = cpu_thread::dump_misc();
+	std::string ret;
 
 	fmt::append(ret, "Block Weight: %u (Retreats: %u)", block_counter, block_failure);
 
 	if (g_cfg.core.spu_prof)
 	{
-		// Get short function hash and position in chunk
-		fmt::append(ret, "\nCurrent block: %s", spu_block_hash{atomic_storage<u64>::load(block_hash)});
+		// Get short function hash
+		const u64 name = atomic_storage<u64>::load(block_hash);
+
+		fmt::append(ret, "\nCurrent block: %s", fmt::base57(be_t<u64>{name}));
+
+		// Print only 7 hash characters out of 11 (which covers roughly 48 bits)
+		ret.resize(ret.size() - 4);
+
+		// Print chunk address from lowest 16 bits
+		fmt::append(ret, "...chunk-0x%05x", (name & 0xffff) * 4);
 	}
 
 	const u32 offset = group ? SPU_FAKE_BASE_ADDR + (id & 0xffffff) * SPU_LS_SIZE : RAW_SPU_BASE_ADDR + index * RAW_SPU_OFFSET;
@@ -1661,44 +1453,6 @@ std::string spu_thread::dump_misc() const
 	return ret;
 }
 
-void spu_thread::cpu_on_stop()
-{
-	if (current_func && is_stopped(state - cpu_flag::stop))
-	{
-		if (start_time)
-		{
-			ppu_log.warning("'%s' aborted (%fs)", current_func, (get_system_time() - start_time) / 1000000.);
-		}
-		else
-		{
-			ppu_log.warning("'%s' aborted", current_func);
-		}
-
-		current_func = {};
-	}
-
-	// TODO: More conditions
-	if (Emu.IsStopped() && g_cfg.core.spu_debug)
-	{
-		std::string ret;
-		dump_all(ret);
-		spu_log.notice("thread context: %s", ret);
-	}
-
-	if (is_stopped(state - cpu_flag::stop))
-	{
-		if (stx == 0 && ftx == 0 && last_succ == 0 && last_fail == 0)
-		{
-			perf_log.notice("SPU thread perf stats are not available.");
-		}
-		else
-		{
-			perf_log.notice("Perf stats for transactions: success %u, failure %u", stx, ftx);
-			perf_log.notice("Perf stats for PUTLLC reload: success %u, failure %u", last_succ, last_fail);
-		}
-	}
-}
-
 void spu_thread::cpu_init()
 {
 	std::memset(gpr.data(), 0, gpr.size() * sizeof(gpr[0]));
@@ -1726,7 +1480,6 @@ void spu_thread::cpu_init()
 
 	ch_dec_start_timestamp = get_timebased_time();
 	ch_dec_value = option & SYS_SPU_THREAD_OPTION_DEC_SYNC_TB_ENABLE ? ~static_cast<u32>(ch_dec_start_timestamp) : 0;
-	is_dec_frozen = false;
 
 	if (get_type() >= spu_type::raw)
 	{
@@ -1743,12 +1496,6 @@ void spu_thread::cpu_init()
 	status_npc.raw() = {get_type() == spu_type::isolated ? SPU_STATUS_IS_ISOLATED : 0, 0};
 	run_ctrl.raw() = 0;
 
-	spurs_last_task_timestamp = 0;
-	spurs_wait_duration_last = 0;
-	spurs_average_task_duration = 0;
-	spurs_waited = false;
-	spurs_entered_wait = false;
-
 	int_ctrl[0].clear();
 	int_ctrl[1].clear();
 	int_ctrl[2].clear();
@@ -1783,9 +1530,7 @@ void spu_thread::cpu_return()
 
 		if (ensure(group->running)-- == 1)
 		{
-			u32 last_stop = 0;
 			{
-				lv2_obj::notify_all_t notify;
 				std::lock_guard lock(group->mutex);
 				group->run_state = SPU_THREAD_GROUP_STATUS_INITIALIZED;
 
@@ -1813,17 +1558,7 @@ void spu_thread::cpu_return()
 					exit_status.set_value(last_exit_status);
 				}
 
-				last_stop = group->stop_count;
-
-				if (last_stop == umax)
-				{
-					// Restart with some high count to preserve some meaning
-					group->stop_count = 1000;
-				}
-				else
-				{
-					group->stop_count++;
-				}
+				group->stop_count++;
 
 				if (const auto ppu = std::exchange(group->waiter, nullptr))
 				{
@@ -1837,12 +1572,6 @@ void spu_thread::cpu_return()
 
 			// Notify on last thread stopped
 			group->stop_count.notify_all();
-
-			// Wait for terminators manually if needed (ensuring they quit before value-wrapping)
-			while (last_stop == umax && group->wait_term_count)
-			{
-				std::this_thread::yield();
-			}
 		}
 		else if (status_npc.load().status >> 16 == SYS_SPU_THREAD_STOP_THREAD_EXIT)
 		{
@@ -1855,11 +1584,6 @@ extern thread_local std::string(*g_tls_log_prefix)();
 
 void spu_thread::cpu_task()
 {
-#ifdef __APPLE__
-	pthread_jit_write_protect_np(true);
-#endif
-	start_time = 0;
-
 	// Get next PC and SPU Interrupt status
 	pc = status_npc.load().npc;
 
@@ -1870,8 +1594,6 @@ void spu_thread::cpu_task()
 
 	std::fesetround(FE_TOWARDZERO);
 
-	gv_set_zeroing_denormals();
-
 	g_tls_log_prefix = []
 	{
 		const auto cpu = static_cast<spu_thread*>(get_current_cpu_thread());
@@ -1890,40 +1612,9 @@ void spu_thread::cpu_task()
 		}
 
 		const auto type = cpu->get_type();
-
-		if (u64 hash = cpu->block_hash)
-		{
-			return fmt::format("%sSPU[0x%07x] Thread (%s) [0x%05x: %s]", type >= spu_type::raw ? type == spu_type::isolated ? "Iso" : "Raw" : "", cpu->lv2_id, *name_cache.get(), cpu->pc, spu_block_hash_short{atomic_storage<u64>::load(hash)});
-		}
-
 		return fmt::format("%sSPU[0x%07x] Thread (%s) [0x%05x]", type >= spu_type::raw ? type == spu_type::isolated ? "Iso" : "Raw" : "", cpu->lv2_id, *name_cache.get(), cpu->pc);
 	};
 
-	constexpr u32 invalid_spurs = 0u - 0x80;
-
-	if (spurs_addr == 0)
-	{
-		// Evaluate it
-		if (!group)
-		{
-			spurs_addr = invalid_spurs; // Some invalid non-0 address
-		}
-		else
-		{
-			const u32 arg = static_cast<u32>(group->args[index][1]);
-
-			if (group->name.ends_with("CellSpursKernelGroup"sv) && vm::check_addr(arg))
-			{
-				spurs_addr = arg;
-				group->spurs_running++;
-			}
-			else
-			{
-				spurs_addr = invalid_spurs;
-			}
-		}
-	}
-
 	if (jit)
 	{
 		while (true)
@@ -1944,20 +1635,13 @@ void spu_thread::cpu_task()
 			spu_runtime::g_gateway(*this, _ptr<u8>(0), nullptr);
 		}
 
-		if (unsavable && is_stopped(state - cpu_flag::stop))
-		{
-			spu_log.warning("Aborting unsaveable state");
-		}
-
 		// Print some stats
-		(!group || group->stop_count < 5 ? spu_log.notice : spu_log.trace)("Stats: Block Weight: %u (Retreats: %u);", block_counter, block_failure);
+		spu_log.notice("Stats: Block Weight: %u (Retreats: %u);", block_counter, block_failure);
 	}
 	else
 	{
 		ensure(spu_runtime::g_interpreter);
 
-		allow_interrupts_in_cpu_work = true;
-
 		while (true)
 		{
 			if (state) [[unlikely]]
@@ -1968,111 +1652,6 @@ void spu_thread::cpu_task()
 
 			spu_runtime::g_interpreter(*this, _ptr<u8>(0), nullptr);
 		}
-
-		allow_interrupts_in_cpu_work = false;
-	}
-
-	if (spurs_addr != invalid_spurs)
-	{
-		if (group->spurs_running.exchange(0))
-		{
-			group->spurs_running.notify_all();
-		}
-	}
-}
-
-void spu_thread::cpu_work()
-{
-	if (std::exchange(in_cpu_work, true))
-	{
-		return;
-	}
-
-	const u32 old_iter_count = cpu_work_iteration_count++;
-
-	bool work_left = false;
-
-	if (has_active_local_bps)
-	{
-		const u32 pos_at = pc / 4;
-		const u32 pos_bit = 1u << (pos_at % 8);
-
-		if (local_breakpoints[pos_at / 8] & pos_bit)
-		{
-			// Ignore repeatations until a different instruction is issued
-			if (pc != current_bp_pc)
-			{
-				// Breakpoint hit
-				state += cpu_flag::dbg_pause;
-			}
-		}
-
-		current_bp_pc = pc;
-		work_left = true;
-	}
-	else
-	{
-		current_bp_pc = umax;
-	}
-
-	const auto timeout = +g_cfg.core.mfc_transfers_timeout;
-
-	if (u32 shuffle_count = g_cfg.core.mfc_transfers_shuffling)
-	{
-		// If either MFC size exceeds limit or timeout has been reached execute pending MFC commands
-		if (mfc_size > shuffle_count || (timeout && get_system_time() - mfc_last_timestamp >= timeout))
-		{
-			work_left = do_mfc(false, false);
-		}
-		else
-		{
-			work_left = mfc_size != 0; // TODO: Optimize
-		}
-	}
-
-	bool gen_interrupt = false;
-
-	// Check interrupts every 16 iterations
-	if (!(old_iter_count % 16) && allow_interrupts_in_cpu_work)
-	{
-		if (u32 mask = ch_events.load().mask & SPU_EVENT_INTR_BUSY_CHECK)
-		{
-			// LR check is expensive, do it once in a while
-			if (old_iter_count /*% 256*/)
-			{
-				mask &= ~SPU_EVENT_LR;
-			}
-
-			get_events(mask);
-		}
-
-		gen_interrupt = check_mfc_interrupts(pc);
-		work_left |= interrupts_enabled;
-	}
-
-	in_cpu_work = false;
-
-	if (!work_left)
-	{
-		// No more pending work
-		state.atomic_op([](bs_t<cpu_flag>& flags)
-		{
-			if (flags & cpu_flag::pending_recheck)
-			{
-				// Do not really remove ::pending because external thread may have pushed more pending work
-				flags -= cpu_flag::pending_recheck;
-			}
-			else
-			{
-				flags -= cpu_flag::pending;
-			}
-		});
-	}
-
-	if (gen_interrupt)
-	{
-		// Interrupt! escape everything and restart execution
-		spu_runtime::g_escape(this);
 	}
 }
 
@@ -2107,8 +1686,8 @@ void spu_thread::cleanup()
 	// Free range lock (and signals cleanup was called to the destructor)
 	vm::free_range_lock(range_lock);
 
-	// Terminate and join thread
-	static_cast<named_thread<spu_thread>&>(*this) = thread_state::finished;
+	// Signal the debugger about the termination
+	state += cpu_flag::exit;
 }
 
 spu_thread::~spu_thread()
@@ -2117,73 +1696,78 @@ spu_thread::~spu_thread()
 	shm->unmap(ls + SPU_LS_SIZE);
 	shm->unmap(ls);
 	shm->unmap(ls - SPU_LS_SIZE);
-	utils::memory_release(ls - SPU_LS_SIZE * 2, SPU_LS_SIZE * 5);
-}
 
-u8* spu_thread::map_ls(utils::shm& shm, void* ptr)
-{
-	vm::writer_lock mlock;
-
-	const auto ls = ptr ? static_cast<u8*>(ptr) : static_cast<u8*>(ensure(utils::memory_reserve(SPU_LS_SIZE * 5, nullptr, true))) + SPU_LS_SIZE * 2;
-	ensure(shm.map_critical(ls - SPU_LS_SIZE).first && shm.map_critical(ls).first && shm.map_critical(ls + SPU_LS_SIZE).first);
-	return ls;
-}
-
-void spu_thread::init_spu_decoder()
-{
-	ensure(!jit);
-
-#if !defined(ARCH_X64) && !defined(ARCH_ARM64)
-#error "Unimplemented"
-#else
-	const spu_decoder_type spu_decoder = g_cfg.core.spu_decoder;
-
-#if defined(ARCH_X64)
-	if (spu_decoder == spu_decoder_type::asmjit)
-	{
-		jit = spu_recompiler_base::make_asmjit_recompiler();
-	}
-	else
-#endif
-	if (spu_decoder == spu_decoder_type::llvm)
-	{
-#if defined(ARCH_X64)
-		jit = spu_recompiler_base::make_fast_llvm_recompiler();
-#elif defined(ARCH_ARM64)
-		jit = spu_recompiler_base::make_llvm_recompiler();
-#endif
-	}
-	else if (spu_decoder == spu_decoder_type::_static || spu_decoder == spu_decoder_type::dynamic)
-	{
-		//
-	}
-	else
-	{
-		fmt::throw_exception("Unsupported spu decoder '%s'", g_cfg.core.spu_decoder);
-	}
-#endif
+	perf_log.notice("Perf stats for transactions: success %u, failure %u", stx, ftx);
+	perf_log.notice("Perf stats for PUTLLC reload: successs %u, failure %u", last_succ, last_fail);
 }
 
 spu_thread::spu_thread(lv2_spu_group* group, u32 index, std::string_view name, u32 lv2_id, bool is_isolated, u32 option)
 	: cpu_thread(idm::last_id())
 	, group(group)
 	, index(index)
-	, thread_type(group ? spu_type::threaded : is_isolated ? spu_type::isolated : spu_type::raw)
 	, shm(std::make_shared<utils::shm>(SPU_LS_SIZE))
-	, ls(static_cast<u8*>(utils::memory_reserve(SPU_LS_SIZE * 5, nullptr, true)) + SPU_LS_SIZE * 2)
+	, ls([&]()
+	{
+		if (!group)
+		{
+			ensure(vm::get(vm::spu)->falloc(vm_offset(), SPU_LS_SIZE, &shm, 0x200));
+		}
+		else
+		{
+			// 0x1000 indicates falloc to allocate page with no access rights in base memory
+			ensure(vm::get(vm::spu)->falloc(vm_offset(), SPU_LS_SIZE, &shm, 0x1200));
+		}
+
+		// Try to guess free area
+		const auto start = vm::g_free_addr + SPU_LS_SIZE * (cpu_thread::id & 0xffffff) * 12;
+
+		u32 total = 0;
+
+		// Map LS and its mirrors
+		for (u64 addr = reinterpret_cast<u64>(start); addr < 0x8000'0000'0000;)
+		{
+			if (auto ptr = shm->try_map(reinterpret_cast<u8*>(addr)))
+			{
+				if (++total == 3)
+				{
+					// Use the middle mirror
+					return ptr - SPU_LS_SIZE;
+				}
+
+				addr += SPU_LS_SIZE;
+			}
+			else
+			{
+				// Reset, cleanup and start again
+				for (u32 i = 1; i <= total; i++)
+				{
+					shm->unmap(reinterpret_cast<u8*>(addr - i * SPU_LS_SIZE));
+				}
+
+				total = 0;
+
+				addr += 0x10000;
+			}
+		}
+
+		fmt::throw_exception("Failed to map SPU LS memory");
+	}())
+	, thread_type(group ? spu_type::threaded : is_isolated ? spu_type::isolated : spu_type::raw)
 	, option(option)
 	, lv2_id(lv2_id)
 	, spu_tname(make_single<std::string>(name))
 {
-	init_spu_decoder();
-
-	if (g_cfg.core.mfc_debug)
+	if (g_cfg.core.spu_decoder == spu_decoder_type::asmjit)
 	{
-		utils::memory_commit(vm::g_stat_addr + vm_offset(), SPU_LS_SIZE);
-		mfc_history.resize(max_mfc_dump_idx);
+		jit = spu_recompiler_base::make_asmjit_recompiler();
 	}
 
-	if (g_cfg.core.spu_decoder == spu_decoder_type::asmjit || g_cfg.core.spu_decoder == spu_decoder_type::llvm)
+	if (g_cfg.core.spu_decoder == spu_decoder_type::llvm)
+	{
+		jit = spu_recompiler_base::make_fast_llvm_recompiler();
+	}
+
+	if (g_cfg.core.spu_decoder != spu_decoder_type::fast && g_cfg.core.spu_decoder != spu_decoder_type::precise)
 	{
 		if (g_cfg.core.spu_block_size != spu_block_size_type::safe)
 		{
@@ -2197,157 +1781,12 @@ spu_thread::spu_thread(lv2_spu_group* group, u32 index, std::string_view name, u
 		cpu_init();
 	}
 
-	range_lock = vm::alloc_range_lock();
-
-	memset(&hv_ctx, 0, sizeof(hv_ctx));
-}
-
-void spu_thread::serialize_common(utils::serial& ar)
-{
-	ar(gpr, pc, ch_mfc_cmd, mfc_size, mfc_barrier, mfc_fence, mfc_prxy_cmd, mfc_prxy_mask, mfc_prxy_write_state.all
-		, srr0, ch_tag_upd, ch_tag_mask, ch_tag_stat.data, ch_stall_mask, ch_stall_stat.data, ch_atomic_stat.data
-		, ch_out_mbox.data, ch_out_intr_mbox.data, snr_config, ch_snr1.data, ch_snr2.data, ch_events.raw().all, interrupts_enabled
-		, run_ctrl, exit_status.data, status_npc.raw().status, ch_dec_start_timestamp, ch_dec_value, is_dec_frozen);
-
-	ar(std::span(mfc_queue, mfc_size));
-
-	u32 vals[4]{};
-
-	if (ar.is_writing())
-	{
-		const u8 count = ch_in_mbox.try_read(vals);
-		ar(count, std::span(vals, count));
-	}
-	else
-	{
-		const u8 count = ar;
-		ar(std::span(vals, count));
-		ch_in_mbox.set_values(count, vals[0], vals[1], vals[2], vals[3]);
-	}
-}
-
-spu_thread::spu_thread(utils::serial& ar, lv2_spu_group* group)
-	: cpu_thread(idm::last_id())
-	, group(group)
-	, index(ar)
-	, thread_type(group ? spu_type::threaded : ar.pop<u8>() ? spu_type::isolated : spu_type::raw)
-	, shm(ensure(vm::get(vm::spu)->peek(vm_offset()).second))
-	, ls(map_ls(*this->shm))
-	, option(ar)
-	, lv2_id(ar)
-	, spu_tname(make_single<std::string>(ar.operator std::string()))
-{
-	init_spu_decoder();
-
 	if (g_cfg.core.mfc_debug)
 	{
-		utils::memory_commit(vm::g_stat_addr + vm_offset(), SPU_LS_SIZE);
 		mfc_history.resize(max_mfc_dump_idx);
 	}
 
-	if (g_cfg.core.spu_decoder != spu_decoder_type::_static && g_cfg.core.spu_decoder != spu_decoder_type::dynamic)
-	{
-		if (g_cfg.core.spu_block_size != spu_block_size_type::safe)
-		{
-			// Initialize stack mirror
-			std::memset(stack_mirror.data(), 0xff, sizeof(stack_mirror));
-		}
-	}
-
 	range_lock = vm::alloc_range_lock();
-
-	serialize_common(ar);
-
-	raddr = ::narrow<u32>(ar.pop<u64>());
-
-	if (raddr)
-	{
-		// Acquire reservation
-		if (!vm::check_addr(raddr))
-		{
-			fmt::throw_exception("SPU Serialization: Reservation address is not accessible! (addr=0x%x)", raddr);
-		}
-
-		rtime = vm::reservation_acquire(raddr);
-		mov_rdata(rdata, *vm::get_super_ptr<spu_rdata_t>(raddr));
-	}
-
-	status_npc.raw().npc = pc | u8{interrupts_enabled};
-
-	if (get_type() == spu_type::threaded)
-	{
-		for (auto& pair : spuq)
-		{
-			ar(pair.first);
-			pair.second = idm::get_unlocked<lv2_obj, lv2_event_queue>(ar.pop<u32>());
-		}
-
-		for (auto& q : spup)
-		{
-			q = idm::get_unlocked<lv2_obj, lv2_event_queue>(ar.pop<u32>());
-		}
-	}
-	else
-	{
-		for (spu_int_ctrl_t& ctrl : int_ctrl)
-		{
-			ar(ctrl.mask, ctrl.stat);
-			ctrl.tag = idm::get_unlocked<lv2_obj, lv2_int_tag>(ar.pop<u32>());
-		}
-
-		g_raw_spu_ctr++;
-		g_raw_spu_id[index] = id;
-	}
-
-	ar(stop_flag_removal_protection);
-}
-
-void spu_thread::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(spu);
-
-	if (raddr)
-	{
-		// Last check for reservation-lost event
-		get_events(SPU_EVENT_LR);
-	}
-
-	ar(index);
-
-	if (get_type() != spu_type::threaded)
-	{
-		ar(u8{get_type() == spu_type::isolated});
-	}
-
-	ar(option, lv2_id, *spu_tname.load());
-
-	serialize_common(ar);
-
-	// Let's save it as u64 for future proofing
-	ar(u64{raddr});
-
-	if (get_type() == spu_type::threaded)
-	{
-		for (const auto& [key, q] : spuq)
-		{
-			ar(key);
-			ar(lv2_obj::check(q) ? q->id : 0);
-		}
-
-		for (auto& p : spup)
-		{
-			ar(lv2_obj::check(p) ? p->id : 0);
-		}
-	}
-	else
-	{
-		for (const spu_int_ctrl_t& ctrl : int_ctrl)
-		{
-			ar(ctrl.mask, ctrl.stat, lv2_obj::check(ctrl.tag) ? ctrl.tag->id : 0);
-		}
-	}
-
-	ar(!!(state & cpu_flag::stop));
 }
 
 void spu_thread::push_snr(u32 number, u32 value)
@@ -2357,26 +1796,20 @@ void spu_thread::push_snr(u32 number, u32 value)
 
 	// Prepare some data
 	const u32 event_bit = SPU_EVENT_S1 >> (number & 1);
-	const bool bitor_bit = !!((snr_config >> number) & 1);
+	const u32 bitor_bit = (snr_config >> number) & 1;
 
 	// Redundant, g_use_rtm is checked inside tx_start now.
-	if (g_use_rtm && false)
+	if (g_use_rtm)
 	{
 		bool channel_notify = false;
 		bool thread_notify = false;
 
 		const bool ok = utils::tx_start([&]
 		{
-			channel_notify = (channel->data.raw() == spu_channel::bit_wait);
+			channel_notify = (channel->data.raw() & spu_channel::bit_wait) != 0;
 			thread_notify = (channel->data.raw() & spu_channel::bit_count) == 0;
 
-			if (channel_notify)
-			{
-				ensure(channel->jostling_value.raw() == spu_channel::bit_wait);
-				channel->jostling_value.raw() = value;
-				channel->data.raw() = 0;
-			}
-			else if (bitor_bit)
+			if (bitor_bit)
 			{
 				channel->data.raw() &= ~spu_channel::bit_wait;
 				channel->data.raw() |= spu_channel::bit_count | value;
@@ -2420,20 +1853,15 @@ void spu_thread::push_snr(u32 number, u32 value)
 	});
 
 	// Check corresponding SNR register settings
-	auto push_state = channel->push(value, bitor_bit);
-
-	if (push_state.old_count < push_state.count)
+	if (bitor_bit)
 	{
-		set_events(event_bit);
+		if (channel->push_or(value))
+			set_events(event_bit);
 	}
-	else if (!push_state.op_done)
+	else
 	{
-		ensure(is_stopped());
-
-		if (auto cpu = cpu_thread::get_current())
-		{
-			cpu->state += cpu_flag::again;
-		}
+		if (channel->push(value))
+			set_events(event_bit);
 	}
 
 	ch_events.atomic_op([](ch_events_t& ev)
@@ -2482,7 +1910,7 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8*
 		if (eal < SYS_SPU_THREAD_BASE_LOW)
 		{
 			// RawSPU MMIO
-			auto thread = idm::get_unlocked<named_thread<spu_thread>>(find_raw_spu((eal - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET));
+			auto thread = idm::get<named_thread<spu_thread>>(find_raw_spu((eal - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET));
 
 			if (!thread)
 			{
@@ -2551,8 +1979,6 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8*
 		src = zero_buf;
 	}
 
-	rsx::reservation_lock<false, 1> rsx_lock(eal, args.size, !is_get && (g_cfg.video.strict_rendering_mode || (g_cfg.core.rsx_fifo_accuracy && !g_cfg.core.spu_accurate_dma && eal < rsx::constants::local_mem_base)));
-
 	if ((!g_use_rtm && !is_get) || g_cfg.core.spu_accurate_dma)  [[unlikely]]
 	{
 		perf_meter<"ADMA_GET"_u64> perf_get = perf_;
@@ -2564,7 +1990,7 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8*
 
 		if (!_this) [[unlikely]]
 		{
-			if (_cpu->get_class() == thread_class::spu)
+			if (_cpu->id_type() == 2)
 			{
 				// Use range_lock of current SPU thread for range locks
 				range_lock = static_cast<spu_thread*>(_cpu)->range_lock;
@@ -2696,7 +2122,6 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8*
 					auto& dump = _this->mfc_history[_this->mfc_dump_idx++ % spu_thread::max_mfc_dump_idx];
 					dump.cmd = args;
 					dump.cmd.eah = _this->pc;
-					dump.block_hash = _this->block_hash;
 					std::memcpy(dump.data, is_get ? dst : src, std::min<u32>(args.size, 128));
 				}
 
@@ -2756,7 +2181,7 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8*
 						}
 					}
 
-					if (true || ++i < 10)
+					if (++i < 10)
 					{
 						busy_wait(500);
 					}
@@ -2764,7 +2189,7 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8*
 					{
 						// Wait
 						_cpu->state += cpu_flag::wait + cpu_flag::temp;
-						// bits->wait(old, wmask);
+						bits->wait(old, wmask);
 						_cpu->check_state();
 					}
 				}())
@@ -2777,7 +2202,7 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8*
 
 					bool ok = false;
 
-					std::tie(old, ok) = bits->fetch_op([&](u128& v)
+					std::tie(old, ok) = bits->fetch_op([&](auto& v)
 					{
 						if (v & wmask)
 						{
@@ -2875,12 +2300,12 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8*
 				res += 127;
 
 				// Release bits and notify
-				bits->atomic_op([&](u128& v)
+				bits->atomic_op([&](auto& v)
 				{
 					v &= ~wmask;
 				});
 
-				// bits->notify_all(wmask);
+				bits->notify_all(wmask);
 
 				if (size == size0)
 				{
@@ -2895,7 +2320,6 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8*
 				auto& dump = _this->mfc_history[_this->mfc_dump_idx++ % spu_thread::max_mfc_dump_idx];
 				dump.cmd = args;
 				dump.cmd.eah = _this->pc;
-				dump.block_hash = _this->block_hash;
 				std::memcpy(dump.data, is_get ? dst : src, std::min<u32>(args.size, 128));
 			}
 
@@ -2941,46 +2365,6 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8*
 		}
 		default:
 		{
-			if (eal >> 28 == rsx::constants::local_mem_base >> 28)
-			{
-				if (size > s_rep_movsb_threshold)
-				{
-					__movsb(dst, src, size);
-				}
-				else
-				{
-					// Avoid unaligned stores in mov_rdata_avx
-					if (reinterpret_cast<u64>(dst) & 0x10)
-					{
-						*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
-
-						dst += 16;
-						src += 16;
-						size -= 16;
-					}
-
-					while (size >= 128)
-					{
-						mov_rdata(*reinterpret_cast<spu_rdata_t*>(dst), *reinterpret_cast<const spu_rdata_t*>(src));
-
-						dst += 128;
-						src += 128;
-						size -= 128;
-					}
-
-					while (size)
-					{
-						*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
-
-						dst += 16;
-						src += 16;
-						size -= 16;
-					}
-				}
-
-				break;
-			}
-
 			if (((eal & 127) + size) <= 128)
 			{
 				vm::range_lock(range_lock, eal, size);
@@ -3011,41 +2395,32 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8*
 				// Split locking + transfer in two parts (before 64K border, and after it)
 				vm::range_lock(range_lock, range_addr, size0);
 
-				if (size > s_rep_movsb_threshold)
+				// Avoid unaligned stores in mov_rdata_avx
+				if (reinterpret_cast<u64>(dst) & 0x10)
 				{
-					__movsb(dst, src, size0);
-					dst += size0;
-					src += size0;
+					*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
+
+					dst += 16;
+					src += 16;
+					size0 -= 16;
 				}
-				else
+
+				while (size0 >= 128)
 				{
-					// Avoid unaligned stores in mov_rdata_avx
-					if (reinterpret_cast<u64>(dst) & 0x10)
-					{
-						*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
+					mov_rdata(*reinterpret_cast<spu_rdata_t*>(dst), *reinterpret_cast<const spu_rdata_t*>(src));
 
-						dst += 16;
-						src += 16;
-						size0 -= 16;
-					}
+					dst += 128;
+					src += 128;
+					size0 -= 128;
+				}
 
-					while (size0 >= 128)
-					{
-						mov_rdata(*reinterpret_cast<spu_rdata_t*>(dst), *reinterpret_cast<const spu_rdata_t*>(src));
+				while (size0)
+				{
+					*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
 
-						dst += 128;
-						src += 128;
-						size0 -= 128;
-					}
-
-					while (size0)
-					{
-						*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
-
-						dst += 16;
-						src += 16;
-						size0 -= 16;
-					}
+					dst += 16;
+					src += 16;
+					size0 -= 16;
 				}
 
 				range_lock->release(0);
@@ -3054,39 +2429,32 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8*
 
 			vm::range_lock(range_lock, range_addr, range_end - range_addr);
 
-			if (size > s_rep_movsb_threshold)
+			// Avoid unaligned stores in mov_rdata_avx
+			if (reinterpret_cast<u64>(dst) & 0x10)
 			{
-				__movsb(dst, src, size);
+				*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
+
+				dst += 16;
+				src += 16;
+				size -= 16;
 			}
-			else
+
+			while (size >= 128)
 			{
-				// Avoid unaligned stores in mov_rdata_avx
-				if (reinterpret_cast<u64>(dst) & 0x10)
-				{
-					*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
+				mov_rdata(*reinterpret_cast<spu_rdata_t*>(dst), *reinterpret_cast<const spu_rdata_t*>(src));
 
-					dst += 16;
-					src += 16;
-					size -= 16;
-				}
+				dst += 128;
+				src += 128;
+				size -= 128;
+			}
 
-				while (size >= 128)
-				{
-					mov_rdata(*reinterpret_cast<spu_rdata_t*>(dst), *reinterpret_cast<const spu_rdata_t*>(src));
+			while (size)
+			{
+				*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
 
-					dst += 128;
-					src += 128;
-					size -= 128;
-				}
-
-				while (size)
-				{
-					*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
-
-					dst += 16;
-					src += 16;
-					size -= 16;
-				}
+				dst += 16;
+				src += 16;
+				size -= 16;
 			}
 
 			range_lock->release(0);
@@ -3099,7 +2467,6 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8*
 			auto& dump = _this->mfc_history[_this->mfc_dump_idx++ % spu_thread::max_mfc_dump_idx];
 			dump.cmd = args;
 			dump.cmd.eah = _this->pc;
-			dump.block_hash = _this->block_hash;
 			std::memcpy(dump.data, is_get ? dst : src, std::min<u32>(args.size, 128));
 		}
 
@@ -3132,39 +2499,32 @@ plain_access:
 	}
 	default:
 	{
-		if (size > s_rep_movsb_threshold)
+		// Avoid unaligned stores in mov_rdata_avx
+		if (reinterpret_cast<u64>(dst) & 0x10)
 		{
-			__movsb(dst, src, size);
+			*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
+
+			dst += 16;
+			src += 16;
+			size -= 16;
 		}
-		else
+
+		while (size >= 128)
 		{
-			// Avoid unaligned stores in mov_rdata_avx
-			if (reinterpret_cast<u64>(dst) & 0x10)
-			{
-				*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
+			mov_rdata(*reinterpret_cast<spu_rdata_t*>(dst), *reinterpret_cast<const spu_rdata_t*>(src));
 
-				dst += 16;
-				src += 16;
-				size -= 16;
-			}
+			dst += 128;
+			src += 128;
+			size -= 128;
+		}
 
-			while (size >= 128)
-			{
-				mov_rdata(*reinterpret_cast<spu_rdata_t*>(dst), *reinterpret_cast<const spu_rdata_t*>(src));
+		while (size)
+		{
+			*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
 
-				dst += 128;
-				src += 128;
-				size -= 128;
-			}
-
-			while (size)
-			{
-				*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
-
-				dst += 16;
-				src += 16;
-				size -= 16;
-			}
+			dst += 16;
+			src += 16;
+			size -= 16;
 		}
 
 		break;
@@ -3176,7 +2536,6 @@ plain_access:
 		auto& dump = _this->mfc_history[_this->mfc_dump_idx++ % spu_thread::max_mfc_dump_idx];
 		dump.cmd = args;
 		dump.cmd.eah = _this->pc;
-		dump.block_hash = _this->block_hash;
 		std::memcpy(dump.data, is_get ? dst : src, std::min<u32>(args.size, 128));
 	}
 }
@@ -3234,540 +2593,79 @@ bool spu_thread::do_dma_check(const spu_mfc_cmd& args)
 
 bool spu_thread::do_list_transfer(spu_mfc_cmd& args)
 {
-	perf_meter<"MFC_LIST"_u64> perf0;
-
 	// Amount of elements to fetch in one go
 	constexpr u32 fetch_size = 6;
 
 	struct alignas(8) list_element
 	{
-		u8 sb; // Stall-and-Notify bit (0x80)
-		u8 pad;
+		be_t<u16> sb; // Stall-and-Notify bit (0x8000)
 		be_t<u16> ts; // List Transfer Size
 		be_t<u32> ea; // External Address Low
 	};
 
-	alignas(16) list_element items[fetch_size];
-	static_assert(sizeof(v128) % sizeof(list_element) == 0);
+	union
+	{
+		list_element items[fetch_size];
+		alignas(v128) char bufitems[sizeof(items)];
+	};
 
 	spu_mfc_cmd transfer;
 	transfer.eah  = 0;
 	transfer.tag  = args.tag;
-	transfer.cmd  = MFC{static_cast<u8>(args.cmd & ~0xf)};
+	transfer.cmd  = MFC(args.cmd & ~MFC_LIST_MASK);
+
+	args.lsa &= 0x3fff0;
+	args.eal &= 0x3fff8;
 
 	u32 index = fetch_size;
 
-	auto item_ptr = _ptr<const list_element>(args.eal & 0x3fff8);
-	u32 arg_lsa = args.lsa & 0x3fff0;
-	u32 arg_size = args.size;
-
-	u8 optimization_compatible = transfer.cmd & (MFC_GET_CMD | MFC_PUT_CMD);
-
-	if (spu_log.trace || g_cfg.core.spu_accurate_dma || g_cfg.core.mfc_debug)
-	{
-		optimization_compatible = 0;
-	}
-
-	rsx::reservation_lock<false, 1> rsx_lock(0, 128, optimization_compatible == MFC_PUT_CMD && (g_cfg.video.strict_rendering_mode || (g_cfg.core.rsx_fifo_accuracy && !g_cfg.core.spu_accurate_dma)));
-
-	constexpr u32 ts_mask = 0x7fff;
-
 	// Assume called with size greater than 0
 	while (true)
 	{
 		// Check if fetching is needed
 		if (index == fetch_size)
 		{
-			const v128 data0 = v128::loadu(item_ptr, 0);
-			const v128 data1 = v128::loadu(item_ptr, 1);
-			const v128 data2 = v128::loadu(item_ptr, 2);
-
-			// In a perfect world this would not be needed until after the if but relying on the compiler to keep the elements in SSE registers through it all is unrealistic
-			std::memcpy(&items[sizeof(v128) / sizeof(list_element) * 0], &data0, sizeof(v128));
-			std::memcpy(&items[sizeof(v128) / sizeof(list_element) * 1], &data1, sizeof(v128));
-			std::memcpy(&items[sizeof(v128) / sizeof(list_element) * 2], &data2, sizeof(v128));
-
-			u32 s_size = data0._u32[0];
-
-			// We need to verify matching between odd and even elements (vector test is position independent)
-			// 0-5 is the most unlikely couple match for many reasons so it skips the entire check very efficiently in most cases
-			// Assumes padding bits should match
-			if (optimization_compatible == MFC_GET_CMD && s_size == data0._u32[2] && arg_size >= fetch_size * 8)
-			{
-				const v128 ored = (data0 | data1 | data2) & v128::from64p(std::bit_cast<be_t<u64>>(1ull << 63 | (u64{ts_mask} << 32) | 0xe000'0000));
-				const v128 anded = (data0 & data1 & data2) & v128::from64p(std::bit_cast<be_t<u64>>(0xe000'0000 | (u64{ts_mask} << 32)));
-
-				// Tests:
-				// 1. Unset stall-and-notify bit on all 6 elements
-				// 2. Equality of transfer size across all 6 elements
-				// 3. Be in the same 512mb region, this is because this case is not expected to be broken usually and we need to ensure MMIO is not involved in any of the transfers (assumes MMIO to be so rare that this is the last check)
-				if (ored == anded && items[0].ea < RAW_SPU_BASE_ADDR && items[1].ea < RAW_SPU_BASE_ADDR)
-				{
-					// Execute the postponed byteswapping and masking
-					s_size = std::bit_cast<be_t<u32>>(s_size) & ts_mask;
-
-					u8* src = vm::_ptr<u8>(0);
-					u8* dst = this->ls + arg_lsa;
-
-					// Assume success, prepare the next elements
-					arg_lsa += fetch_size * utils::align<u32>(s_size, 16);
-					item_ptr += fetch_size;
-					arg_size -= fetch_size * 8;
-
-					// Type which is friendly for fused address calculations
-					constexpr usz _128 = 128;
-
-					// This whole function relies on many constraints to be met (crashes real MFC), we can a have minor optimization assuming EA alignment to be +16 with +16 byte transfers
-#define MOV_T(type, index, _ea) { const usz ea = _ea; *reinterpret_cast<type*>(dst + index * utils::align<u32>(sizeof(type), 16) + ea % (sizeof(type) < 16 ? 16 : 1)) = *reinterpret_cast<const type*>(src + ea); } void()
-#define MOV_128(index, ea) mov_rdata(*reinterpret_cast<decltype(rdata)*>(dst + index * _128), *reinterpret_cast<const decltype(rdata)*>(src + (ea)))
-
-					switch (s_size)
-					{
-					case 0:
-					{
-						if (!arg_size)
-						{
-							return true;
-						}
-
-						continue;
-					}
-					case 1:
-					{
-						MOV_T(u8, 0, items[0].ea);
-						MOV_T(u8, 1, items[1].ea);
-						MOV_T(u8, 2, items[2].ea);
-						MOV_T(u8, 3, items[3].ea);
-						MOV_T(u8, 4, items[4].ea);
-						MOV_T(u8, 5, items[5].ea);
-
-						if (!arg_size)
-						{
-							return true;
-						}
-
-						continue;
-					}
-					case 2:
-					{
-						MOV_T(u16, 0, items[0].ea);
-						MOV_T(u16, 1, items[1].ea);
-						MOV_T(u16, 2, items[2].ea);
-						MOV_T(u16, 3, items[3].ea);
-						MOV_T(u16, 4, items[4].ea);
-						MOV_T(u16, 5, items[5].ea);
-
-						if (!arg_size)
-						{
-							return true;
-						}
-
-						continue;
-					}
-					case 4:
-					{
-						MOV_T(u32, 0, items[0].ea);
-						MOV_T(u32, 1, items[1].ea);
-						MOV_T(u32, 2, items[2].ea);
-						MOV_T(u32, 3, items[3].ea);
-						MOV_T(u32, 4, items[4].ea);
-						MOV_T(u32, 5, items[5].ea);
-
-						if (!arg_size)
-						{
-							return true;
-						}
-
-						continue;
-					}
-					case 8:
-					{
-						MOV_T(u64, 0, items[0].ea);
-						MOV_T(u64, 1, items[1].ea);
-						MOV_T(u64, 2, items[2].ea);
-						MOV_T(u64, 3, items[3].ea);
-						MOV_T(u64, 4, items[4].ea);
-						MOV_T(u64, 5, items[5].ea);
-
-						if (!arg_size)
-						{
-							return true;
-						}
-
-						continue;
-					}
-					case 16:
-					{
-						MOV_T(v128, 0, items[0].ea);
-						MOV_T(v128, 1, items[1].ea);
-						MOV_T(v128, 2, items[2].ea);
-						MOV_T(v128, 3, items[3].ea);
-						MOV_T(v128, 4, items[4].ea);
-						MOV_T(v128, 5, items[5].ea);
-
-						if (!arg_size)
-						{
-							return true;
-						}
-
-						continue;
-					}
-					case 32:
-					{
-						struct mem
-						{
-							v128 a[2];
-						};
-
-						MOV_T(mem, 0, items[0].ea);
-						MOV_T(mem, 1, items[1].ea);
-						MOV_T(mem, 2, items[2].ea);
-						MOV_T(mem, 3, items[3].ea);
-						MOV_T(mem, 4, items[4].ea);
-						MOV_T(mem, 5, items[5].ea);
-
-						if (!arg_size)
-						{
-							return true;
-						}
-
-						continue;
-					}
-					case 48:
-					{
-						struct mem
-						{
-							v128 a[3];
-						};
-
-						MOV_T(mem, 0, items[0].ea);
-						MOV_T(mem, 1, items[1].ea);
-						MOV_T(mem, 2, items[2].ea);
-						MOV_T(mem, 3, items[3].ea);
-						MOV_T(mem, 4, items[4].ea);
-						MOV_T(mem, 5, items[5].ea);
-
-						if (!arg_size)
-						{
-							return true;
-						}
-
-						continue;
-					}
-					case 64:
-					{
-						struct mem
-						{
-							v128 a[4];
-						};
-
-						// TODO: Optimize (4 16-bytes movings is bad)
-						MOV_T(mem, 0, items[0].ea);
-						MOV_T(mem, 1, items[1].ea);
-						MOV_T(mem, 2, items[2].ea);
-						MOV_T(mem, 3, items[3].ea);
-						MOV_T(mem, 4, items[4].ea);
-						MOV_T(mem, 5, items[5].ea);
-
-						if (!arg_size)
-						{
-							return true;
-						}
-
-						continue;
-					}
-					case 128:
-					{
-						MOV_128(0, items[0].ea);
-						MOV_128(1, items[1].ea);
-						MOV_128(2, items[2].ea);
-						MOV_128(3, items[3].ea);
-						MOV_128(4, items[4].ea);
-						MOV_128(5, items[5].ea);
-
-						if (!arg_size)
-						{
-							return true;
-						}
-
-						continue;
-					}
-					case 256:
-					{
-						const usz ea0 = items[0].ea;
-						MOV_128(0, ea0 + 0);
-						MOV_128(1, ea0 + _128);
-						const usz ea1 = items[1].ea;
-						MOV_128(2, ea1 + 0);
-						MOV_128(3, ea1 + _128);
-						const usz ea2 = items[2].ea;
-						MOV_128(4, ea2 + 0);
-						MOV_128(5, ea2 + _128);
-						const usz ea3 = items[3].ea;
-						MOV_128(6, ea3 + 0);
-						MOV_128(7, ea3 + _128);
-						const usz ea4 = items[4].ea;
-						MOV_128(8, ea4 + 0);
-						MOV_128(9, ea4 + _128);
-						const usz ea5 = items[5].ea;
-						MOV_128(10, ea5 + 0);
-						MOV_128(11, ea5 + _128);
-
-						if (!arg_size)
-						{
-							return true;
-						}
-
-						continue;
-					}
-					case 512:
-					{
-						const usz ea0 = items[0].ea;
-						MOV_128(0 , ea0 + _128 * 0);
-						MOV_128(1 , ea0 + _128 * 1);
-						MOV_128(2 , ea0 + _128 * 2);
-						MOV_128(3 , ea0 + _128 * 3);
-						const usz ea1 = items[1].ea;
-						MOV_128(4 , ea1 + _128 * 0);
-						MOV_128(5 , ea1 + _128 * 1);
-						MOV_128(6 , ea1 + _128 * 2);
-						MOV_128(7 , ea1 + _128 * 3);
-						const usz ea2 = items[2].ea;
-						MOV_128(8 , ea2 + _128 * 0);
-						MOV_128(9 , ea2 + _128 * 1);
-						MOV_128(10, ea2 + _128 * 2);
-						MOV_128(11, ea2 + _128 * 3);
-						const usz ea3 = items[3].ea;
-						MOV_128(12, ea3 + _128 * 0);
-						MOV_128(13, ea3 + _128 * 1);
-						MOV_128(14, ea3 + _128 * 2);
-						MOV_128(15, ea3 + _128 * 3);
-						const usz ea4 = items[4].ea;
-						MOV_128(16, ea4 + _128 * 0);
-						MOV_128(17, ea4 + _128 * 1);
-						MOV_128(18, ea4 + _128 * 2);
-						MOV_128(19, ea4 + _128 * 3);
-						const usz ea5 = items[5].ea;
-						MOV_128(20, ea5 + _128 * 0);
-						MOV_128(21, ea5 + _128 * 1);
-						MOV_128(22, ea5 + _128 * 2);
-						MOV_128(23, ea5 + _128 * 3);
-
-						if (!arg_size)
-						{
-							return true;
-						}
-
-						continue;
-					}
-					default:
-					{
-						// TODO: Are more cases common enough? (in the range of less than 512 bytes because for more than that the optimization is doubtful)
-						break;
-					}
-					}
-#undef MOV_T
-#undef MOV_128
-					// Optimization miss, revert changes
-					arg_lsa -= fetch_size * utils::align<u32>(s_size, 16);
-					item_ptr -= fetch_size;
-					arg_size += fetch_size * 8;
-				}
-			}
-
 			// Reset to elements array head
 			index = 0;
+
+			const auto src = _ptr<const void>(args.eal);
+			const v128 data0 = v128::loadu(src, 0);
+			const v128 data1 = v128::loadu(src, 1);
+			const v128 data2 = v128::loadu(src, 2);
+
+			reinterpret_cast<v128*>(bufitems)[0] = data0;
+			reinterpret_cast<v128*>(bufitems)[1] = data1;
+			reinterpret_cast<v128*>(bufitems)[2] = data2;
 		}
 
-		const u32 size = items[index].ts & ts_mask;
+		const u32 size = items[index].ts & 0x7fff;
 		const u32 addr = items[index].ea;
 
-		// Try to inline the transfer
-		if (addr < RAW_SPU_BASE_ADDR && size && optimization_compatible == MFC_GET_CMD)
+		spu_log.trace("LIST: item=0x%016x, lsa=0x%05x", std::bit_cast<be_t<u64>>(items[index]), args.lsa | (addr & 0xf));
+
+		if (size)
 		{
-			const u8* src = vm::_ptr<u8>(addr);
-			u8* dst = this->ls + arg_lsa + (addr & 0xf);
-
-			switch (u32 _size = size)
-			{
-			case 1:
-			{
-				*reinterpret_cast<u8*>(dst) = *reinterpret_cast<const u8*>(src);
-				break;
-			}
-			case 2:
-			{
-				*reinterpret_cast<u16*>(dst) = *reinterpret_cast<const u16*>(src);
-				break;
-			}
-			case 4:
-			{
-				*reinterpret_cast<u32*>(dst) = *reinterpret_cast<const u32*>(src);
-				break;
-			}
-			case 8:
-			{
-				*reinterpret_cast<u64*>(dst) = *reinterpret_cast<const u64*>(src);
-				break;
-			}
-			default:
-			{
-				if (_size > s_rep_movsb_threshold)
-				{
-					__movsb(dst, src, _size);
-				}
-				else
-				{
-					// Avoid unaligned stores in mov_rdata_avx
-					if (reinterpret_cast<u64>(dst) & 0x10)
-					{
-						*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
-
-						dst += 16;
-						src += 16;
-						_size -= 16;
-					}
-
-					while (_size >= 128)
-					{
-						mov_rdata(*reinterpret_cast<spu_rdata_t*>(dst), *reinterpret_cast<const spu_rdata_t*>(src));
-
-						dst += 128;
-						src += 128;
-						_size -= 128;
-					}
-
-					while (_size)
-					{
-						*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
-
-						dst += 16;
-						src += 16;
-						_size -= 16;
-					}
-				}
-
-				break;
-			}
-			}
-
-			arg_lsa += utils::align<u32>(size, 16);
-		}
-		// Avoid inlining huge transfers because it intentionally drops range lock unlock
-		else if (optimization_compatible == MFC_PUT_CMD && ((addr >> 28 == rsx::constants::local_mem_base >> 28) || (addr < RAW_SPU_BASE_ADDR && size - 1 <= 0x400 - 1 && (addr % 0x10000 + (size - 1)) < 0x10000)))
-		{
-			if (addr >> 28 != rsx::constants::local_mem_base >> 28)
-			{
-				rsx_lock.update_if_enabled(addr, size, range_lock);
-
-				if (!g_use_rtm)
-				{
-					vm::range_lock(range_lock, addr & -128, utils::align<u32>(addr + size, 128) - (addr & -128));
-				}
-			}
-			else
-			{
-				range_lock->release(0);
-				rsx_lock.unlock();
-			}
-
-			u8* dst = vm::_ptr<u8>(addr);
-			const u8* src = this->ls + arg_lsa + (addr & 0xf);
-
-			switch (u32 _size = size)
-			{
-			case 1:
-			{
-				*reinterpret_cast<u8*>(dst) = *reinterpret_cast<const u8*>(src);
-				break;
-			}
-			case 2:
-			{
-				*reinterpret_cast<u16*>(dst) = *reinterpret_cast<const u16*>(src);
-				break;
-			}
-			case 4:
-			{
-				*reinterpret_cast<u32*>(dst) = *reinterpret_cast<const u32*>(src);
-				break;
-			}
-			case 8:
-			{
-				*reinterpret_cast<u64*>(dst) = *reinterpret_cast<const u64*>(src);
-				break;
-			}
-			default:
-			{
-				if (_size > s_rep_movsb_threshold)
-				{
-					__movsb(dst, src, _size);
-				}
-				else
-				{
-					// Avoid unaligned stores in mov_rdata_avx
-					if (reinterpret_cast<u64>(dst) & 0x10)
-					{
-						*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
-
-						dst += 16;
-						src += 16;
-						_size -= 16;
-					}
-
-					while (_size >= 128)
-					{
-						mov_rdata(*reinterpret_cast<spu_rdata_t*>(dst), *reinterpret_cast<const spu_rdata_t*>(src));
-
-						dst += 128;
-						src += 128;
-						_size -= 128;
-					}
-
-					while (_size)
-					{
-						*reinterpret_cast<v128*>(dst) = *reinterpret_cast<const v128*>(src);
-
-						dst += 16;
-						src += 16;
-						_size -= 16;
-					}
-				}
-
-				break;
-			}
-			}
-
-			arg_lsa += utils::align<u32>(size, 16);
-		}
-		else if (size)
-		{
-			range_lock->release(0);
-			rsx_lock.unlock();
-
-			spu_log.trace("LIST: item=0x%016x, lsa=0x%05x", std::bit_cast<be_t<u64>>(items[index]), arg_lsa | (addr & 0xf));
-
 			transfer.eal  = addr;
-			transfer.lsa  = arg_lsa | (addr & 0xf);
+			transfer.lsa  = args.lsa | (addr & 0xf);
 			transfer.size = size;
 
-			arg_lsa += utils::align<u32>(size, 16);
 			do_dma_transfer(this, transfer, ls);
+			const u32 add_size = std::max<u32>(size, 16);
+			args.lsa += add_size;
 		}
 
-		arg_size -= 8;
+		args.size -= 8;
 
-		if (!arg_size)
+		if (!args.size)
 		{
 			// No more elements
 			break;
 		}
 
-		item_ptr++;
+		args.eal += 8;
 
-		if (items[index].sb & 0x80) [[unlikely]]
+		if (items[index].sb & 0x8000) [[unlikely]]
 		{
-			range_lock->release(0);
-
 			ch_stall_mask |= utils::rol32(1, args.tag);
 
 			if (!ch_stall_stat.get_count())
@@ -3778,16 +2676,12 @@ bool spu_thread::do_list_transfer(spu_mfc_cmd& args)
 			ch_stall_stat.set_value(utils::rol32(1, args.tag) | ch_stall_stat.get_value());
 
 			args.tag |= 0x80; // Set stalled status
-			args.eal = ::narrow<u32>(reinterpret_cast<const u8*>(item_ptr) - this->ls);
-			args.lsa = arg_lsa;
-			args.size = arg_size;
 			return false;
 		}
 
 		index++;
 	}
 
-	range_lock->release(0);
 	return true;
 }
 
@@ -3814,64 +2708,15 @@ bool spu_thread::do_putllc(const spu_mfc_cmd& args)
 		// TODO: Limit scope!!
 		rsx::reservation_lock rsx_lock(addr, 128);
 
-		if (rtime != res)
+		if (!g_use_rtm && rtime != res)
 		{
-			if (!g_cfg.core.spu_accurate_reservations && cmp_rdata(to_write, rdata))
-			{
-				raddr = 0;
-				return true;
-			}
-
 			return false;
 		}
 
-		if (cmp_rdata(to_write, rdata))
+		if (!g_use_rtm && cmp_rdata(to_write, rdata))
 		{
-			if (!g_cfg.core.spu_accurate_reservations)
-			{
-				raddr = 0;
-				return true;
-			}
-
 			// Writeback of unchanged data. Only check memory change
-			if (cmp_rdata(rdata, vm::_ref<spu_rdata_t>(addr)) && res.compare_and_swap_test(rtime, rtime + 128))
-			{
-				raddr = 0; // Disable notification
-				return true;
-			}
-
-			return false;
-		}
-
-		auto [_oldd, _ok] = res.fetch_op([&](u64& r)
-		{
-			if ((r & -128) != rtime || (r & 127))
-			{
-				return false;
-			}
-
-			r += vm::rsrv_unique_lock;
-			return true;
-		});
-
-		if (!_ok)
-		{
-			// Already locked or updated: give up
-			return false;
-		}
-
-		if (!g_cfg.core.spu_accurate_reservations)
-		{
-			if (addr - spurs_addr <= 0x80)
-			{
-				mov_rdata(*vm::_ptr<spu_rdata_t>(addr), to_write);
-				res += 64;
-				return true;
-			}
-		}
-		else if (!g_use_rtm)
-		{
-			*vm::_ptr<atomic_t<u32>>(addr) += 0;
+			return cmp_rdata(rdata, vm::_ref<spu_rdata_t>(addr)) && res.compare_and_swap_test(rtime, rtime + 128);
 		}
 
 		if (g_use_rtm) [[likely]]
@@ -3889,22 +2734,22 @@ bool spu_thread::do_putllc(const spu_mfc_cmd& args)
 						if (cmp_rdata(rdata, data))
 						{
 							mov_rdata(data, to_write);
-							res += 64;
+							res += 127;
 							return true;
 						}
 					}
 
 					// Save previous data
 					mov_rdata_nt(rdata, data);
-					res -= 64;
+					res -= 1;
 					return false;
 				});
 
-				const u64 count2 = utils::get_tsc() - perf2.get();
+				const u64 count2 = __rdtsc() - perf2.get();
 
 				if (count2 > 20000 && g_cfg.core.perf_report) [[unlikely]]
 				{
-					perf_log.warning("PUTLLC: took too long: %.3fus (%u c) (addr=0x%x) (S)", count2 / (utils::get_tsc_freq() / 1000'000.), count2, addr);
+					perf_log.warning(u8"PUTLLC: took too long: %.3fµs (%u c) (addr=0x%x) (S)", count2 / (utils::get_tsc_freq() / 1000'000.), count2, addr);
 				}
 
 				if (ok)
@@ -3932,14 +2777,14 @@ bool spu_thread::do_putllc(const spu_mfc_cmd& args)
 				utils::prefetch_read(rdata + 64);
 				last_faddr = addr;
 				last_ftime = res.load() & -128;
-				last_ftsc = utils::get_tsc();
+				last_ftsc = __rdtsc();
 				return false;
 			}
 			default:
 			{
 				if (count > 20000 && g_cfg.core.perf_report) [[unlikely]]
 				{
-					perf_log.warning("PUTLLC: took too long: %.3fus (%u c) (addr = 0x%x)", count / (utils::get_tsc_freq() / 1000'000.), count, addr);
+					perf_log.warning(u8"PUTLLC: took too long: %.3fµs (%u c) (addr = 0x%x)", count / (utils::get_tsc_freq() / 1000'000.), count, addr);
 				}
 
 				break;
@@ -3955,48 +2800,48 @@ bool spu_thread::do_putllc(const spu_mfc_cmd& args)
 			return true;
 		}
 
+		auto [_oldd, _ok] = res.fetch_op([&](u64& r)
+		{
+			if ((r & -128) != rtime || (r & 127))
+			{
+				return false;
+			}
+
+			r += vm::rsrv_unique_lock;
+			return true;
+		});
+
+		if (!_ok)
+		{
+			// Already locked or updated: give up
+			return false;
+		}
+
+		vm::_ref<atomic_t<u32>>(addr) += 0;
+
 		auto& super_data = *vm::get_super_ptr<spu_rdata_t>(addr);
 		const bool success = [&]()
 		{
 			// Full lock (heavyweight)
 			// TODO: vm::check_addr
-			vm::writer_lock lock(addr, range_lock);
+			vm::writer_lock lock(addr);
 
 			if (cmp_rdata(rdata, super_data))
 			{
 				mov_rdata(super_data, to_write);
+				res += 64;
 				return true;
 			}
 
+			res -= 64;
 			return false;
 		}();
 
-		res += success ? 64 : 0 - 64;
 		return success;
 	}())
 	{
-		if (raddr)
-		{
-			if (raddr != spurs_addr || pc != 0x11e4)
-			{
-				vm::reservation_notifier_notify(addr);
-			}
-			else
-			{
-				const u32 thread_bit_mask = (1u << index);
-				constexpr usz SPU_IDLE = 0x73;
-
-				const bool switched_from_running_to_idle = (static_cast<u8>(rdata[SPU_IDLE]) & thread_bit_mask) == 0 && (_ref<u8>(0x100 + SPU_IDLE) & thread_bit_mask) != 0;
-
-				if (switched_from_running_to_idle)
-				{
-					vm::reservation_notifier_notify(addr);
-				}
-			}
-
-			raddr = 0;
-		}
-
+		vm::reservation_notifier(addr).notify_all(-128);
+		raddr = 0;
 		perf0.reset();
 		return true;
 	}
@@ -4005,22 +2850,19 @@ bool spu_thread::do_putllc(const spu_mfc_cmd& args)
 		if (raddr)
 		{
 			// Last check for event before we clear the reservation
-			if (~ch_events.load().events & SPU_EVENT_LR)
+			if (raddr == addr)
 			{
-				if (raddr == addr)
-				{
-					set_events(SPU_EVENT_LR);
-				}
-				else
-				{
-					get_events(SPU_EVENT_LR);
-				}
+				set_events(SPU_EVENT_LR);
+			}
+			else
+			{
+				get_events(SPU_EVENT_LR);
 			}
 		}
 
 		if (!vm::check_addr(addr, vm::page_writable))
 		{
-			utils::trigger_write_page_fault(vm::base(addr));
+			vm::_ref<atomic_t<u8>>(addr) += 0; // Access violate
 		}
 
 		raddr = 0;
@@ -4036,145 +2878,50 @@ void do_cell_atomic_128_store(u32 addr, const void* to_write)
 	const auto cpu = get_current_cpu_thread();
 	rsx::reservation_lock rsx_lock(addr, 128);
 
-	u64 shared_mem = vm::g_shmem[addr >> 16];
-
-	if (!shared_mem)
+	if (g_use_rtm) [[likely]]
 	{
-		shared_mem = addr;
-	}
-
-	{
-		auto& sdata = *vm::get_super_ptr<spu_rdata_t>(addr);
-		auto& res = *utils::bless<atomic_t<u128>>(vm::g_reservations + (addr & 0xff80) / 2);
-
-		if (std::memcmp(static_cast<const u8*>(to_write), &sdata, 16) == 0 && std::memcmp(static_cast<const u8*>(to_write) + 64, &sdata[64], 16) == 0)
-		{
-			const auto& write_data = *static_cast<const spu_rdata_t*>(to_write);
-			const u64 at_read_time = vm::reservation_acquire(addr);
-
-			if (!(at_read_time & 127))
-			{
-				if (cmp_rdata(sdata, write_data) && at_read_time ==  vm::reservation_acquire(addr) && cmp_rdata(sdata, write_data))
-				{
-					// Write of the same data (verified atomically)
-					vm::try_reservation_update(addr);
-					return;
-				}
-			}
-		}
-
-		for (u64 j = 0;; j++)
-		{
-			auto [_oldd, _ok] = res.fetch_op([&](u128& r)
-			{
-				if (r & 127)
-				{
-					return false;
-				}
-
-				r &= static_cast<u64>(r);
-				r |= u128{shared_mem} << 64;
-				r |= u128{vm::rsrv_unique_lock | vm::rsrv_putunc_flag};
-				return true;
-			});
-
-			if (_ok)
-			{
-				break;
-			}
-
-			if (static_cast<u64>(_oldd) & vm::rsrv_putunc_flag && static_cast<u64>(_oldd >> 64) == shared_mem)
-			{
-				// Abandon store
-				for (u64 k = 0;; k++)
-				{
-					if (res ^ _oldd)
-					{
-						break;
-					}
-
-					if (auto cpu = get_current_cpu_thread(); cpu && cpu->state)
-					{
-						cpu->check_state();
-					}
-					else if (k < 15)
-					{
-						busy_wait(500);
-					}
-					else
-					{
-						std::this_thread::yield();
-					}
-				}
-
-				return static_cast<void>(cpu->test_stopped());
-			}
-
-			if (auto cpu = get_current_cpu_thread(); cpu && cpu->state)
-			{
-				cpu->check_state();
-			}
-			else if (j < 15)
-			{
-				busy_wait(500);
-			}
-			else
-			{
-				std::this_thread::yield();
-			}
-		}
-
-		u64 result = 1;
-
-		if (!g_cfg.core.spu_accurate_reservations)
-		{
-			mov_rdata(sdata, *static_cast<const spu_rdata_t*>(to_write));
-			vm::reservation_acquire(addr) += 32;
-		}
-		else if (cpu->state & cpu_flag::pause)
-		{
-			result = 0;
-		}
-		else if (!g_use_rtm)
-		{
-			// Provoke page fault
-			utils::trigger_write_page_fault(vm::base(addr));
-
-			// Hard lock
-			auto spu = cpu ? cpu->try_get<spu_thread>() : nullptr;
-			vm::writer_lock lock(addr, spu ? spu->range_lock : nullptr);
-			mov_rdata(sdata, *static_cast<const spu_rdata_t*>(to_write));
-			vm::reservation_acquire(addr) += 32;
-		}
-		else if (cpu->get_class() != thread_class::spu)
-		{
-			u64 stx, ftx;
-			result = spu_putlluc_tx(addr, to_write, &stx, &ftx);
-		}
-		else
-		{
-			auto _spu = static_cast<spu_thread*>(cpu);
-			result = spu_putlluc_tx(addr, to_write, &_spu->stx, &_spu->ftx);
-		}
+		u64 result = spu_putlluc_tx(addr, to_write, cpu);
 
 		if (result == 0)
 		{
-			cpu_thread::suspend_all<+2>(cpu, {}, [&]
-			{
-				mov_rdata(sdata, *static_cast<const spu_rdata_t*>(to_write));
-			});
+			auto& sdata = *vm::get_super_ptr<spu_rdata_t>(addr);
+			auto& res = vm::reservation_acquire(addr);
 
-			vm::reservation_acquire(addr) += 32;
-			result = utils::get_tsc() - perf0.get();
+			cpu_thread::suspend_all<+2>(cpu, {&res}, [&]
+			{
+				mov_rdata_nt(sdata, *static_cast<const spu_rdata_t*>(to_write));
+				res += 127;
+			});
+		}
+
+		if (!result)
+		{
+			result = __rdtsc() - perf0.get();
 		}
 
 		if (result > 20000 && g_cfg.core.perf_report) [[unlikely]]
 		{
-			perf_log.warning("STORE128: took too long: %.3fus (%u c) (addr=0x%x)", result / (utils::get_tsc_freq() / 1000'000.), result, addr);
+			perf_log.warning(u8"STORE128: took too long: %.3fµs (%u c) (addr=0x%x)", result / (utils::get_tsc_freq() / 1000'000.), result, addr);
 		}
 
 		static_cast<void>(cpu->test_stopped());
 	}
+	else
+	{
+		auto& data = vm::_ref<spu_rdata_t>(addr);
+		auto [res, time0] = vm::reservation_lock(addr);
+
+		*reinterpret_cast<atomic_t<u32>*>(&data) += 0;
+
+		auto& super_data = *vm::get_super_ptr<spu_rdata_t>(addr);
+		{
+			// Full lock (heavyweight)
+			// TODO: vm::check_addr
+			vm::writer_lock lock(addr);
+			mov_rdata(super_data, *static_cast<const spu_rdata_t*>(to_write));
+			res += 64;
+		}
+	}
 }
 
 void spu_thread::do_putlluc(const spu_mfc_cmd& args)
@@ -4183,34 +2930,32 @@ void spu_thread::do_putlluc(const spu_mfc_cmd& args)
 
 	const u32 addr = args.eal & -128;
 
-	if (raddr && addr == raddr && g_cfg.core.spu_accurate_reservations)
+	if (raddr && addr == raddr)
 	{
 		// Try to process PUTLLUC using PUTLLC when a reservation is active:
 		// If it fails the reservation is cleared, LR event is set and we fallback to the main implementation
 		// All of this is done atomically in PUTLLC
-		if (!(ch_events.load().events & SPU_EVENT_LR) && do_putllc(args))
+		if (do_putllc(args))
 		{
 			// Success, return as our job was done here
 			return;
 		}
 
 		// Failure, fallback to the main implementation
-		raddr = 0;
 	}
 
 	do_cell_atomic_128_store(addr, _ptr<spu_rdata_t>(args.lsa & 0x3ff80));
-	vm::reservation_notifier_notify(addr);
+	vm::reservation_notifier(addr).notify_all(-128);
 }
 
-bool spu_thread::do_mfc(bool can_escape, bool must_finish)
+void spu_thread::do_mfc(bool /*wait*/)
 {
 	u32 removed = 0;
 	u32 barrier = 0;
 	u32 fence = 0;
-	u16 exec_mask = 0;
-	bool pending = false;
 
-	auto process_command = [&](spu_mfc_cmd& args)
+	// Process enqueued commands
+	static_cast<void>(std::remove_if(mfc_queue + 0, mfc_queue + mfc_size, [&](spu_mfc_cmd& args)
 	{
 		// Select tag bit in the tag mask or the stall mask
 		const u32 mask = utils::rol32(1, args.tag);
@@ -4247,20 +2992,6 @@ bool spu_thread::do_mfc(bool can_escape, bool must_finish)
 			return false;
 		}
 
-		// If command is not enabled in execution mask, execute it later
-		if (!(exec_mask & (1u << (&args - mfc_queue))))
-		{
-			if (args.cmd & MFC_BARRIER_MASK)
-			{
-				barrier |= mask;
-			}
-
-			// Fence is set for any command
-			fence |= mask;
-			pending = true;
-			return false;
-		}
-
 		if (args.cmd & MFC_LIST_MASK)
 		{
 			if (!(args.tag & 0x80))
@@ -4297,68 +3028,32 @@ bool spu_thread::do_mfc(bool can_escape, bool must_finish)
 
 		removed++;
 		return true;
-	};
+	}));
 
-	auto get_exec_mask = [&size = mfc_size]
+	mfc_size -= removed;
+	mfc_barrier = barrier;
+	mfc_fence = fence;
+
+	if (removed && ch_tag_upd)
 	{
-		// Get commands' execution mask
-		// Mask bits are always set when mfc_transfers_shuffling is 0
-		return static_cast<u16>((0 - (1u << std::min<u32>(g_cfg.core.mfc_transfers_shuffling, size))) | utils::get_tsc());
-	};
+		const u32 completed = get_mfc_completed();
 
-	// Process enqueued commands
-	while (true)
-	{
-		removed = 0;
-		barrier = 0;
-		fence = 0;
-
-		// Shuffle commands execution (if enabled), explicit barriers are obeyed
-		pending = false;
-		exec_mask = get_exec_mask();
-
-		static_cast<void>(std::remove_if(mfc_queue + 0, mfc_queue + mfc_size, process_command));
-
-		mfc_size -= removed;
-		mfc_barrier = barrier;
-		mfc_fence = fence;
-
-		if (removed && ch_tag_upd)
+		if (completed && ch_tag_upd == MFC_TAG_UPDATE_ANY)
 		{
-			const u32 completed = get_mfc_completed();
-
-			if (completed && ch_tag_upd == MFC_TAG_UPDATE_ANY)
-			{
-				ch_tag_stat.set_value(completed);
-				ch_tag_upd = MFC_TAG_UPDATE_IMMEDIATE;
-			}
-			else if (completed == ch_tag_mask && ch_tag_upd == MFC_TAG_UPDATE_ALL)
-			{
-				ch_tag_stat.set_value(completed);
-				ch_tag_upd = MFC_TAG_UPDATE_IMMEDIATE;
-			}
+			ch_tag_stat.set_value(completed);
+			ch_tag_upd = MFC_TAG_UPDATE_IMMEDIATE;
 		}
-
-		if (can_escape && check_mfc_interrupts(pc + 4))
+		else if (completed == ch_tag_mask && ch_tag_upd == MFC_TAG_UPDATE_ALL)
 		{
-			spu_runtime::g_escape(this);
-		}
-
-		if (!pending)
-		{
-			break;
-		}
-
-		if (!must_finish && g_cfg.core.mfc_shuffling_in_steps)
-		{
-			// Exit early, not all pending commands have to be executed at a single iteration
-			// Update last timestamp so the next MFC timeout check will use the current time
-			mfc_last_timestamp = get_system_time();
-			return true;
+			ch_tag_stat.set_value(completed);
+			ch_tag_upd = MFC_TAG_UPDATE_IMMEDIATE;
 		}
 	}
 
-	return false;
+	if (check_mfc_interrupts(pc + 4))
+	{
+		spu_runtime::g_escape(this);
+	}
 }
 
 bool spu_thread::check_mfc_interrupts(u32 next_pc)
@@ -4376,185 +3071,29 @@ bool spu_thread::check_mfc_interrupts(u32 next_pc)
 	return false;
 }
 
-bool spu_thread::is_exec_code(u32 addr, std::span<const u8> ls_ptr, u32 base_addr, bool avoid_dead_code, bool is_range_limited)
+bool spu_thread::is_exec_code(u32 addr) const
 {
-	bool had_conditional = false;
-
-	for (u32 i = 0; i < 40; i++)
+	if (addr & ~0x3FFFC)
 	{
-		if (addr & ~0x3FFFC)
-		{
-			return is_range_limited;
-		}
+		return false;
+	}
 
-		if (addr < base_addr || addr >= base_addr + ls_ptr.size())
-		{
-			return is_range_limited;
-		}
+	for (u32 i = 0; i < 30; i++)
+	{
+		const u32 addr0 = addr + (i * 4);
+		const u32 op = _ref<u32>(addr0);
+		const auto type = s_spu_itype.decode(op);
 
-		const u32 addr0 = spu_branch_target(addr);
-		const spu_opcode_t op{read_from_ptr<be_t<u32>>(ls_ptr, addr0 - base_addr)};
-		const auto type = s_spu_itype.decode(op.opcode);
-
-		if (type == spu_itype::UNK || !op.opcode)
+		if (type == spu_itype::UNK || !op)
 		{
 			return false;
 		}
 
-		if (type == spu_itype::STOP)
-		{
-			if (op.rb)
-			{
-				return false;
-			}
-
-			if (avoid_dead_code)
-			{
-				switch (op.opcode)
-				{
-				case SYS_SPU_THREAD_STOP_YIELD:
-				case SYS_SPU_THREAD_STOP_GROUP_EXIT:
-				case SYS_SPU_THREAD_STOP_THREAD_EXIT:
-				case SYS_SPU_THREAD_STOP_RECEIVE_EVENT:
-				case SYS_SPU_THREAD_STOP_TRY_RECEIVE_EVENT:
-				case SYS_SPU_THREAD_STOP_SWITCH_SYSTEM_MODULE:
-				{
-					break;
-				}
-				default:
-				{
-					return false;
-				}
-				}
-			}
-		}
-
-		if (type == spu_itype::STOPD && !had_conditional)
-		{
-			return !avoid_dead_code;
-		}
-
-		if (i != 0 && type == spu_itype::STOPD)
-		{
-			return true;
-		}
 		if (type & spu_itype::branch)
 		{
-			if (type == spu_itype::BR && op.rt && op.rt != 127u)
-			{
-				return false;
-			}
-
-			auto results = op_branch_targets(addr, op);
-
-			if (results[0] == umax)
-			{
-				switch (type)
-				{
-				case spu_itype::BIZ:
-				case spu_itype::BINZ:
-				case spu_itype::BIHZ:
-				case spu_itype::BIHNZ:
-				{
-					results[0] = addr + 4;
-					break;
-				}
-				default:
-				{
-					break;
-				}
-				}
-
-				if (results[0] == umax)
-				{
-					break;
-				}
-			}
-			else
-			{
-				switch (type)
-				{
-				case spu_itype::BR:
-				case spu_itype::BRNZ:
-				case spu_itype::BRZ:
-				case spu_itype::BRHNZ:
-				case spu_itype::BRHZ:
-				case spu_itype::BRSL:
-				{
-					const s32 rel = bf_t<s32, 0, 18>::extract(static_cast<s32>(u32{op.i16} << 2));
-
-					if (rel == 0 && !had_conditional && avoid_dead_code)
-					{
-						// Infinite loop 100%, detect that as invalid code
-						return false;
-					}
-
-					// Detect "invalid" relative branches
-					// Branch offsets that, although are the only way to get X code address using relative address
-					// Rely on overflow/underflow of SPU memory bounds
-					// Thus they would behave differently if SPU LS memory size was to increase (evolving the CELL architecture was the original plan)
-					// Making them highly unlikely to be valid code
-
-					if (rel < 0)
-					{
-						if (addr < 0u - rel)
-						{
-							return is_range_limited;
-						}
-					}
-					else if (SPU_LS_SIZE - addr <= rel + 0u)
-					{
-						return is_range_limited;
-					}
-
-					if (type == spu_itype::BRSL)
-					{
-						// Insert a virtual return-to-next, because it is usually a call
-						results[1] = addr + 4;
-						std::swap(results[1], results[0]);
-					}
-
-					break;
-				}
-				default:
-				{
-					break;
-				}
-				}
-			}
-
-			for (usz res_i = 1; res_i < results.size(); res_i++)
-			{
-				const u32 route_pc = results[res_i];
-
-				if (route_pc >= SPU_LS_SIZE)
-				{
-					continue;
-				}
-
-				if (route_pc < base_addr || route_pc >= base_addr + ls_ptr.size())
-				{
-					return is_range_limited;
-				}
-
-				// Test the validity of a single instruction of the optional target
-				// This function can't be too slow and is unlikely to improve results by a great deal
-				const u32 op0 = read_from_ptr<be_t<u32>>(ls_ptr, route_pc - base_addr);
-				const spu_itype::type type0 = s_spu_itype.decode(op0);
-
-				if (type0 == spu_itype::UNK || !op0)
-				{
-					return false;
-				}
-
-				had_conditional = true;
-			}
-
-			addr = spu_branch_target(results[0]);
-			continue;
+			// TODO
+			break;
 		}
-
-		addr += 4;
 	}
 
 	return true;
@@ -4565,147 +3104,11 @@ u32 spu_thread::get_mfc_completed() const
 	return ch_tag_mask & ~mfc_fence;
 }
 
-u32 evaluate_spin_optimization(std::span<u8> stats, u64 evaluate_time, const cfg::uint<0, 100>& wait_percent, bool inclined_for_responsiveness = false)
-{
-	ensure(stats.size() >= 2 && stats.size() <= 16);
-
-	const u32 percent = wait_percent;
-
-	// Predict whether or not to use operating system sleep based on history
-
-	std::array<u8, 16> old_stats{};
-	std::copy_n(stats.data(), stats.size(), old_stats.data());
-
-	// Rotate history (prepare newest entry)
-	stats[0] = 0;
-	std::copy_n(old_stats.data(), stats.size() - 1, stats.data() + 1);
-
-	u32 total_wait = 0;
-	u32 zero_count = 0; // Try to ignore major inconsistencies
-	u32 consecutive_zero = 0;
-	u32 consecutive_zero_or_one = 0;
-	u32 consecutive_zero_or_one_tally = 0;
-
-	usz index = umax;
-
-	for (u8 val : old_stats)
-	{
-		index++;
-
-		if (index == stats.size())
-		{
-			break;
-		}
-
-		total_wait += val;
-
-		if (val == 0)
-		{
-			if (consecutive_zero == index)
-			{
-				consecutive_zero++;
-				consecutive_zero_or_one++;
-				//consecutive_zero_or_one_tally += 0;
-			}
-
-			++zero_count;
-		}
-
-		if (val == 1)
-		{
-			if (consecutive_zero_or_one == index)
-			{
-				consecutive_zero_or_one++;
-				consecutive_zero_or_one_tally++;
-			}
-		}
-	}
-
-	if (inclined_for_responsiveness)
-	{
-		total_wait /= 2;
-	}
-
-	// Add to chance if previous wait was long enough
-	u32 add_count = 0;
-
-	if (stats.size() == 4)
-	{
-		add_count = zero_count == 3 && total_wait >= 9 ? (total_wait - 8) * 40
-			: zero_count == 2 && total_wait >= 8 ? (total_wait - 7) * 40 
-			: zero_count == 1 && total_wait >= 7 ? (total_wait - 6) * 40
-			: zero_count == 0 && total_wait >= 4 ? (total_wait - 3) * 40
-			: 0;
-	}
-	else
-	{
-		add_count = zero_count >= 12 && total_wait >= 80 ? (total_wait - 80) * 30
-			: zero_count >= 7 && total_wait >= 30 ? (total_wait - 30) * 10 
-			: zero_count >= 4 && total_wait >= 20 ? (total_wait - 20) * 10
-			: zero_count >= 0 && total_wait >= 10 ? (total_wait - 10) * 10
-			: 0;
-	}
-
-	if (stats.size() == 16 && (consecutive_zero >= 2 || (consecutive_zero_or_one >= 3 && consecutive_zero_or_one_tally < consecutive_zero_or_one * 2 / 3)))
-	{
-		// Thread is back to action after some sleep
-		add_count = 0;
-	}
-
-	if (inclined_for_responsiveness && std::count(old_stats.data(), old_stats.data() + 3, 0) >= 2)
-	{
-		add_count = 0;
-	}
-
-	// Evalute its value (shift-right to ensure its randomness with different CPUs)
-	const u32 busy_waiting_switch = ((evaluate_time >> 8) % 100 + add_count < percent) ? 1 : 0;
-
-	thread_local usz g_system_wait = 0, g_busy_wait = 0;
-
-	if (busy_waiting_switch)
-	{
-		g_busy_wait++;
-	}
-	else
-	{
-		g_system_wait++;
-	}
-
-	if ((g_system_wait + g_busy_wait) && (g_system_wait + g_busy_wait) % 200 == 0)
-	{
-		spu_log.trace("SPU wait: count=%d. switch=%d, spin=%d, busy=%d, system=%d, {%d, %d, %d, %d}", total_wait, busy_waiting_switch, !"TODO: Spin", +g_busy_wait, +g_system_wait, old_stats[0], old_stats[1], old_stats[2], old_stats[3]);
-	}
-
-	if ((g_system_wait + g_busy_wait) % 5000 == 0)
-	{
-		g_system_wait = 0;
-		g_busy_wait = 0;
-	}
-
-	return busy_waiting_switch;
-}
-
 bool spu_thread::process_mfc_cmd()
 {
 	// Stall infinitely if MFC queue is full
 	while (mfc_size >= 16) [[unlikely]]
 	{
-		// Reset MFC timestamp in the case of full queue
-		mfc_last_timestamp = 0;
-
-		if (test_stopped())
-		{
-			return false;
-		}
-
-		// Process MFC commands
-		do_mfc();
-
-		if (mfc_size < 16)
-		{
-			break;
-		}
-
 		auto old = state.add_fetch(cpu_flag::wait);
 
 		if (is_stopped(old))
@@ -4753,262 +3156,25 @@ bool spu_thread::process_mfc_cmd()
 			last_faddr = 0;
 		}
 
-		if (raddr)
+		if (addr == raddr && !g_use_rtm && g_cfg.core.spu_getllar_polling_detection && rtime == vm::reservation_acquire(addr) && cmp_rdata(rdata, data))
 		{
-			if (raddr != addr)
-			{
-				// Last check for event before we replace the reservation with a new one
-				if (reservation_check(raddr, rdata))
-				{
-					set_events(SPU_EVENT_LR);
-				}
-			}
-			else
-			{
-				// Check if we can reuse our existing reservation
-				auto& res = vm::reservation_acquire(addr);
-				const u64 this_time = res;
+			// Spinning, might as well yield cpu resources
+			std::this_thread::yield();
 
-				if (this_time % 128 == 0 && cmp_rdata(rdata, data))
-				{
-					mov_rdata(_ref<spu_rdata_t>(ch_mfc_cmd.lsa & 0x3ff80), rdata);
-					ch_atomic_stat.set_value(MFC_GETLLAR_SUCCESS);
-
-					// Need to check twice for it to be accurate, the code is before and not after this check for:
-					// 1. Reduce time between reservation accesses so TSX panelty would be lowered
-					// 2. Increase the chance of change detection: if GETLLAR has been called again new data is probably wanted
-					if (this_time == res && cmp_rdata(rdata, data))
-					{
-						if (this_time != rtime)
-						{
-							// Reservation was lost but the data itself remains unchanged so try to ignore it
-							set_events(SPU_EVENT_LR);
-							rtime = this_time;
-						}
-
-						if ([&]() -> bool
-						{
-							// Validation that it is indeed GETLLAR spinning (large time window is intentional)
-							if (last_getllar_addr != addr || last_getllar_gpr1 != gpr[1]._u32[3] || perf0.get() - last_gtsc >= 5'000 || (interrupts_enabled && ch_events.load().mask))
-							{
-								// Seemingly not
-								getllar_busy_waiting_switch = umax;
-								getllar_spin_count = 0;
-								return true;
-							}
-
-							if (last_getllar != pc || last_getllar_lsa != ch_mfc_cmd.lsa)
-							{
-								getllar_busy_waiting_switch = umax;
-								getllar_spin_count = 0;
-								return true;
-							}
-
-							// Check if LSA points to an OUT buffer on the stack from a caller - unlikely to be a loop
-							if (last_getllar_lsa >= SPU_LS_SIZE - 0x10000 && last_getllar_lsa > last_getllar_gpr1)
-							{
-								auto cs = dump_callstack_list();
-
-								if (!cs.empty() && last_getllar_lsa > cs[0].second)
-								{
-									getllar_busy_waiting_switch = umax;
-									getllar_spin_count = 0;
-									return true;
-								}
-							}
-
-							getllar_spin_count = std::min<u32>(getllar_spin_count + 1, u16{umax});
-
-							if (getllar_busy_waiting_switch == umax && getllar_spin_count == 4)
-							{
-								// Hidden value to force busy waiting (100 to 1 are dynamically adjusted, 0 is not)
-								if (!g_cfg.core.spu_getllar_spin_optimization_disabled)
-								{
-									getllar_evaluate_time = perf0.get();
-									auto& history = getllar_wait_time[(addr % SPU_LS_SIZE) / 128];
-
-									getllar_busy_waiting_switch =
-										evaluate_spin_optimization({ history.data(), history.size() }, getllar_evaluate_time, g_cfg.core.spu_getllar_busy_waiting_percentage);
-								}
-								else
-								{
-									getllar_busy_waiting_switch = 1;
-								}
-							}
-							// Don't be stubborn, force operating sleep if too much time has passed
-							else if (getllar_busy_waiting_switch == 1 && perf0.get() > getllar_evaluate_time && perf0.get() - getllar_evaluate_time >= 400'000)
-							{
-								// Hidden value to force busy waiting
-								if (!g_cfg.core.spu_getllar_spin_optimization_disabled)
-								{
-									spu_log.trace("SPU wait for 0x%x", addr);
-									getllar_wait_time[(addr % SPU_LS_SIZE) / 128].front() = 1;
-									getllar_busy_waiting_switch = 0;
-								}
-							}
-
-							// Either 1 or umax
-							return getllar_busy_waiting_switch != 0;
-						}())
-						{
-							if (g_cfg.core.mfc_debug)
-							{
-								auto& dump = mfc_history[mfc_dump_idx++ % spu_thread::max_mfc_dump_idx];
-								dump.cmd = ch_mfc_cmd;
-								dump.cmd.eah = pc;
-								dump.block_hash = block_hash;
-								std::memcpy(dump.data, rdata, 128);
-							}
-
-							last_getllar = pc;
-							last_getllar_gpr1 = gpr[1]._u32[3];
-							last_getllar_lsa = ch_mfc_cmd.lsa;
-
-							if (getllar_busy_waiting_switch == 1)
-							{
-								getllar_wait_time[(addr % SPU_LS_SIZE) / 128].front() = 0;
-
-#if defined(ARCH_X64)
-								if (utils::has_um_wait())
-								{
-									if (utils::has_waitpkg())
-									{
-										__tpause(std::min<u32>(getllar_spin_count, 10) * 500, 0x1);
-									}
-									else
-									{
-										struct check_wait_t
-										{
-											static FORCE_INLINE bool needs_wait(u64 rtime, const atomic_t<u64>& mem_rtime) noexcept
-											{
-												return rtime == mem_rtime;
-											}
-										};
-
-										// Provide the first X64 cache line of the reservation to be tracked
-										__mwaitx<check_wait_t>(std::min<u32>(getllar_spin_count, 17) * 500, 0xf0, std::addressof(data), +rtime, vm::reservation_acquire(addr));
-									}
-								}
-								else
-#endif
-								{
-									busy_wait(300);
-								}
-
-								if (getllar_spin_count == 3)
-								{
-									// Check other reservations in other threads
-									lv2_obj::notify_all();
-								}
-
-								// Reset perf
-								perf0.restart();
-							}
-
-							last_gtsc = perf0.get();
-							return true;
-						}
-
-						// Spinning, might as well yield cpu resources
-						state += cpu_flag::wait;
-
-						usz cache_line_waiter_index = umax;
-
-						if (auto wait_var = vm::reservation_notifier_begin_wait(addr, rtime))
-						{
-							cache_line_waiter_index = register_cache_line_waiter(addr);
-							utils::bless<atomic_t<u32>>(&wait_var->raw().wait_flag)->wait(1, atomic_wait_timeout{100'000});
-							vm::reservation_notifier_end_wait(*wait_var);
-						}
-
-						deregister_cache_line_waiter(cache_line_waiter_index);
-
-						static_cast<void>(test_stopped());
-
-						// Quick check if there were reservation changes
-						const u64 new_time = res;
-
-						if (new_time % 128 == 0 && cmp_rdata(rdata, data) && res == new_time && cmp_rdata(rdata, data))
-						{
-							if (g_cfg.core.mfc_debug)
-							{
-								auto& dump = mfc_history[mfc_dump_idx++ % spu_thread::max_mfc_dump_idx];
-								dump.cmd = ch_mfc_cmd;
-								dump.cmd.eah = pc;
-								dump.block_hash = block_hash;
-								std::memcpy(dump.data, rdata, 128);
-							}
-
-							if (new_time != rtime)
-							{
-								// Reservation was lost but the data itself remains unchanged so try to ignore it
-								set_events(SPU_EVENT_LR);
-								rtime = new_time;
-							}
-
-							u8& val = getllar_wait_time[(addr % SPU_LS_SIZE) / 128].front();
-							val = static_cast<u8>(std::min<u32>(val + 1, u8{umax}));
-
-							// Reset perf
-							perf0.restart();
-							last_gtsc = perf0.get();
-							return true;
-						}
-
-						static atomic_t<u32> g_changed, g_unchanged;
-
-						if (new_time == this_time && res == this_time)
-						{
-							spu_log.trace("RTIME unchanged on address 0x%x", addr);
-
-							g_unchanged++;
-
-							// Notify threads manually, memory data has likely changed and broke the reservation for others
-							if (vm::reservation_notifier_count(addr) && res == new_time)
-							{
-								vm::reservation_notifier_notify(addr);
-							}
-						}
-						else
-						{
-							g_changed++;
-						}
-
-						if ((g_changed + g_unchanged) % 200 == 0)
-						{
-							spu_log.trace("SPU GETLLAR wait on RTIME stats: unchanged=%d, changed=%d", +g_unchanged, +g_changed);
-						}
-					}
-				}
-
-				if (this_time == rtime)
-				{
-					// Notify threads manually, memory data has likely changed and broke the reservation for others
-					if (vm::reservation_notifier_count(addr) && res == this_time)
-					{
-						vm::reservation_notifier_notify(addr);
-					}
-				}
-
-				// We can't, LR needs to be set now
-				set_events(SPU_EVENT_LR);
-				static_cast<void>(test_stopped());
-
-				// Reset perf
-				perf0.restart();
-			}
-
-			last_getllar = pc;
-			last_gtsc = perf0.get();
+			// Reset perf
+			perf0.restart();
 		}
 
-		last_getllar_addr = addr;
-		getllar_spin_count = 0;
-		getllar_busy_waiting_switch = umax;
-
-		u64 ntime = 0;
+		alignas(64) spu_rdata_t temp;
+		u64 ntime;
 		rsx::reservation_lock rsx_lock(addr, 128);
 
+		if (raddr)
+		{
+			// Save rdata from previous reservation
+			mov_rdata(temp, rdata);
+		}
+
 		for (u64 i = 0; i != umax; [&]()
 		{
 			if (state & cpu_flag::pause)
@@ -5031,16 +3197,15 @@ bool spu_thread::process_mfc_cmd()
 				}
 			}
 
-			if (i < 24) [[likely]]
+			if (++i < 25) [[likely]]
 			{
-				i++;
 				busy_wait(300);
 			}
 			else
 			{
 				state += cpu_flag::wait + cpu_flag::temp;
 				std::this_thread::yield();
-				static_cast<void>(check_state());
+				!check_state();
 			}
 		}())
 		{
@@ -5062,6 +3227,11 @@ bool spu_thread::process_mfc_cmd()
 					// See previous ntime check.
 					continue;
 				}
+				else
+				{
+					// If succeeded, only need to check unique lock bit
+					test_mask = ~vm::rsrv_shared_mask;
+				}
 			}
 			else
 			{
@@ -5075,7 +3245,7 @@ bool spu_thread::process_mfc_cmd()
 				continue;
 			}
 
-			if (!cmp_rdata(rdata, data))
+			if (g_cfg.core.spu_accurate_getllar && !cmp_rdata(rdata, data))
 			{
 				i += 2;
 				continue;
@@ -5089,6 +3259,23 @@ bool spu_thread::process_mfc_cmd()
 			break;
 		}
 
+		if (raddr && raddr != addr)
+		{
+			// Last check for event before we replace the reservation with a new one
+			if (reservation_check(raddr, temp))
+			{
+				set_events(SPU_EVENT_LR);
+			}
+		}
+		else if (raddr == addr)
+		{
+			// Lost previous reservation on polling
+			if (ntime != rtime || !cmp_rdata(rdata, temp))
+			{
+				set_events(SPU_EVENT_LR);
+			}
+		}
+
 		raddr = addr;
 		rtime = ntime;
 		mov_rdata(_ref<spu_rdata_t>(ch_mfc_cmd.lsa & 0x3ff80), rdata);
@@ -5100,7 +3287,6 @@ bool spu_thread::process_mfc_cmd()
 			auto& dump = mfc_history[mfc_dump_idx++ % spu_thread::max_mfc_dump_idx];
 			dump.cmd = ch_mfc_cmd;
 			dump.cmd.eah = pc;
-			dump.block_hash = block_hash;
 			std::memcpy(dump.data, rdata, 128);
 		}
 
@@ -5112,163 +3298,9 @@ bool spu_thread::process_mfc_cmd()
 		// Avoid logging useless commands if there is no reservation
 		const bool dump = g_cfg.core.mfc_debug && raddr;
 
-		const bool is_spurs_task_wait = pc == 0x11e4 && spurs_addr != 0u - 0x80u;
-
-		if (!is_spurs_task_wait || spurs_addr != raddr || spurs_waited)
-		{
-			//
-		}
-		else if ((_ref<u8>(0x100 + 0x73) & (1u << index)) == 0 && (static_cast<u8>(rdata[0x73]) & (1u << index)) != 0)
-		{
-			// Wait for other threads to complete their tasks (temporarily)
-			u32 max_run = group->max_run;
-
-			auto [prev_running, ok] = spurs_entered_wait ? std::make_pair(+group->spurs_running, false) :
-				group->spurs_running.fetch_op([max_run, num = group->max_num](u32& x)
-			{
-				if (x >= max_run && max_run < num)
-				{
-					x--;
-					return true;
-				}
-
-				return false;
-			});
-
-			if (ok || spurs_entered_wait)
-			{
-				lv2_obj::prepare_for_sleep(*this);
-
-				if (ok)
-				{
-					if (prev_running == max_run)
-					{
-						group->spurs_running.notify_one();
-
-						if (group->spurs_running == max_run - 1)
-						{
-							// Try to let another thread slip in and take over execution
-							thread_ctrl::wait_for(300);
-
-							// Update value
-							prev_running = group->spurs_running + 1;
-						}
-					}
-
-					// Restore state
-					prev_running--;
-				}
-
-				const u64 before = get_system_time();
-				u64 current = before;
-
-				spurs_waited = true;
-				spurs_entered_wait = true;
-
-				// Wait the duration of one and a half tasks
-				const u64 spurs_wait_time = std::clamp<u64>(spurs_average_task_duration / spurs_task_count_to_calculate * 3 / 2, 10'000, 100'000);
-				spurs_wait_duration_last = spurs_wait_time;
-
-				if (spurs_last_task_timestamp)
-				{
-					const u64 avg_entry = spurs_average_task_duration / spurs_task_count_to_calculate;
-					spurs_average_task_duration -= avg_entry;
-					spurs_average_task_duration += std::min<u64>(45'000, current - spurs_last_task_timestamp);
-					spu_log.trace("duration: %d, avg=%d", current - spurs_last_task_timestamp, spurs_average_task_duration / spurs_task_count_to_calculate);
-					spurs_last_task_timestamp = 0;
-				}
-
-				while (true)
-				{
-					if (is_stopped() || current - before >= spurs_wait_time)
-					{
-						// Timed-out
-						group->spurs_running++;
-						break;
-					}
-
-					if (prev_running >= max_run)
-					{
-						thread_ctrl::wait_on(group->spurs_running, prev_running, spurs_wait_time - (current - before));
-					}
-
-					max_run = group->max_run;
-
-					prev_running = group->spurs_running.fetch_op([max_run](u32& x)
-					{
-						if (x < max_run)
-						{
-							x++;
-							return true;
-						}
-
-						return false;
-					}).first;
-
-					if (prev_running < max_run)
-					{
-						break;
-					}
-
-					current = get_system_time();
-				}
-
-				state += cpu_flag::temp;
-				static_cast<void>(test_stopped());
-			}
-		}
-
 		if (do_putllc(ch_mfc_cmd))
 		{
 			ch_atomic_stat.set_value(MFC_PUTLLC_SUCCESS);
-
-			if (is_spurs_task_wait)
-			{
-				const bool is_idle = (_ref<u8>(0x100 + 0x73) & (1u << index)) != 0;
-				const bool was_idle = (static_cast<u8>(rdata[0x73]) & (1u << index)) != 0;
-
-				if (!was_idle && is_idle)
-				{
-					const u32 prev_running = group->spurs_running.fetch_op([](u32& x)
-					{
-						if (x)
-						{
-							x--;
-							return true;
-						}
-
-						return false;
-					}).first;
-
-					if (prev_running)
-					{
-						spurs_entered_wait = true;
-					}
-
-					if (prev_running == group->max_run && prev_running < group->max_num)
-					{
-						group->spurs_running.notify_one();
-					}
-				}
-				else if (was_idle && !is_idle)
-				{
-					// Cleanup
-					const u64 current = get_system_time();
-
-					if (spurs_last_task_timestamp)
-					{
-						const u64 avg_entry = spurs_average_task_duration / spurs_task_count_to_calculate;
-						spurs_average_task_duration -= avg_entry;
-						spurs_average_task_duration += std::min<u64>(45'000, current - spurs_last_task_timestamp);
-						spu_log.trace("duration: %d, avg=%d", current - spurs_last_task_timestamp, spurs_average_task_duration / spurs_task_count_to_calculate);
-						spurs_last_task_timestamp = 0;
-					}
-
-					spurs_last_task_timestamp = current;
-					spurs_waited = false;
-					spurs_entered_wait = false;
-				}
-			}
 		}
 		else
 		{
@@ -5281,12 +3313,10 @@ bool spu_thread::process_mfc_cmd()
 			dump.cmd = ch_mfc_cmd;
 			dump.cmd.eah = pc;
 			dump.cmd.tag = static_cast<u32>(ch_atomic_stat.get_value()); // Use tag as atomic status
-			dump.block_hash = block_hash;
 			std::memcpy(dump.data, _ptr<u8>(ch_mfc_cmd.lsa & 0x3ff80), 128);
 		}
 
-		static_cast<void>(test_stopped());
-		return true;
+		return !test_stopped();
 	}
 	case MFC_PUTLLUC_CMD:
 	{
@@ -5295,14 +3325,12 @@ bool spu_thread::process_mfc_cmd()
 			auto& dump = mfc_history[mfc_dump_idx++ % max_mfc_dump_idx];
 			dump.cmd = ch_mfc_cmd;
 			dump.cmd.eah = pc;
-			dump.block_hash = block_hash;
 			std::memcpy(dump.data, _ptr<u8>(ch_mfc_cmd.lsa & 0x3ff80), 128);
 		}
 
 		do_putlluc(ch_mfc_cmd);
 		ch_atomic_stat.set_value(MFC_PUTLLUC_SUCCESS);
-		static_cast<void>(test_stopped());
-		return true;
+		return !test_stopped();
 	}
 	case MFC_PUTQLLUC_CMD:
 	{
@@ -5311,7 +3339,6 @@ bool spu_thread::process_mfc_cmd()
 			auto& dump = mfc_history[mfc_dump_idx++ % max_mfc_dump_idx];
 			dump.cmd = ch_mfc_cmd;
 			dump.cmd.eah = pc;
-			dump.block_hash = block_hash;
 			std::memcpy(dump.data, _ptr<u8>(ch_mfc_cmd.lsa & 0x3ff80), 128);
 		}
 
@@ -5355,18 +3382,12 @@ bool spu_thread::process_mfc_cmd()
 		{
 			if (do_dma_check(ch_mfc_cmd)) [[likely]]
 			{
-				if (!g_cfg.core.mfc_transfers_shuffling)
+				if (ch_mfc_cmd.size)
 				{
-					if (ch_mfc_cmd.size)
-					{
-						do_dma_transfer(this, ch_mfc_cmd, ls);
-					}
-
-					return true;
+					do_dma_transfer(this, ch_mfc_cmd, ls);
 				}
 
-				if (!state.test_and_set(cpu_flag::pending))
-					mfc_last_timestamp = get_system_time();
+				return true;
 			}
 
 			mfc_queue[mfc_size++] = ch_mfc_cmd;
@@ -5408,17 +3429,9 @@ bool spu_thread::process_mfc_cmd()
 
 			if (do_dma_check(cmd)) [[likely]]
 			{
-				if (!g_cfg.core.mfc_transfers_shuffling)
+				if (!cmd.size || do_list_transfer(cmd)) [[likely]]
 				{
-					if (!cmd.size || do_list_transfer(cmd)) [[likely]]
-					{
-						return true;
-					}
-				}
-				else
-				{
-					if (!state.test_and_set(cpu_flag::pending))
-						mfc_last_timestamp = get_system_time();
+					return true;
 				}
 			}
 
@@ -5432,7 +3445,6 @@ bool spu_thread::process_mfc_cmd()
 
 			if (check_mfc_interrupts(pc + 4))
 			{
-				do_mfc(false);
 				spu_runtime::g_escape(this);
 			}
 
@@ -5481,17 +3493,11 @@ bool spu_thread::reservation_check(u32 addr, const decltype(rdata)& data) const
 		return true;
 	}
 
-	if ((addr >> 28) < 2 || (addr >> 28) == 0xd)
-	{
-		// Always-allocated memory does not need strict checking (vm::main or vm::stack)
-		return !cmp_rdata(data, *vm::get_super_ptr<decltype(rdata)>(addr));
-	}
-
 	// Ensure data is allocated (HACK: would raise LR event if not)
 	// Set range_lock first optimistically
 	range_lock->store(u64{128} << 32 | addr);
 
-	u64 lock_val = *std::prev(std::end(vm::g_range_lock_set));
+	u64 lock_val = vm::g_range_lock;
 	u64 old_lock = 0;
 
 	while (lock_val != old_lock)
@@ -5546,7 +3552,7 @@ bool spu_thread::reservation_check(u32 addr, const decltype(rdata)& data) const
 			break;
 		}
 
-		old_lock = std::exchange(lock_val, *std::prev(std::end(vm::g_range_lock_set)));
+		old_lock = std::exchange(lock_val, vm::g_range_lock);
 	}
 
 	if (!range_lock->load()) [[unlikely]]
@@ -5560,147 +3566,7 @@ bool spu_thread::reservation_check(u32 addr, const decltype(rdata)& data) const
 	return !res;
 }
 
-bool spu_thread::reservation_check(u32 addr, u32 hash, atomic_t<u64, 64>* range_lock)
-{
-	if ((addr >> 28) < 2 || (addr >> 28) == 0xd)
-	{
-		// Always-allocated memory does not need strict checking (vm::main or vm::stack)
-		return compute_rdata_hash32(*vm::get_super_ptr<decltype(rdata)>(addr)) == hash;
-	}
-
-	// Ensure data is allocated (HACK: would raise LR event if not)
-	// Set range_lock first optimistically
-	range_lock->store(u64{128} << 32 | addr);
-
-	u64 lock_val = *std::prev(std::end(vm::g_range_lock_set));
-	u64 old_lock = 0;
-
-	while (lock_val != old_lock)
-	{
-		// Since we want to read data, let's check readability first
-		if (!(lock_val & vm::range_readable))
-		{
-			// Only one abnormal operation is "unreadable"
-			if ((lock_val >> vm::range_pos) == (vm::range_locked >> vm::range_pos))
-			{
-				// All page flags are untouched and can be read safely
-				if (!vm::check_addr(addr))
-				{
-					// Assume our memory is being (de)allocated
-					range_lock->release(0);
-					break;
-				}
-
-				// g_shmem values are unchanged too
-				const u64 is_shmem = vm::g_shmem[addr >> 16];
-
-				const u64 test_addr = is_shmem ? (is_shmem | static_cast<u16>(addr)) / 128 : u64{addr} / 128;
-				const u64 lock_addr = lock_val / 128;
-
-				if (test_addr == lock_addr)
-				{
-					// Our reservation is locked
-					range_lock->release(0);
-					break;
-				}
-
-				break;
-			}
-		}
-
-		// Fallback to normal range check
-		const u64 lock_addr = static_cast<u32>(lock_val);
-		const u32 lock_size = static_cast<u32>(lock_val << 3 >> 35);
-
-		if (lock_addr + lock_size <= addr || lock_addr >= addr + 128)
-		{
-			// We are outside locked range, so page flags are unaffected
-			if (!vm::check_addr(addr))
-			{
-				range_lock->release(0);
-				break;
-			}
-		}
-		else if (!(lock_val & vm::range_readable))
-		{
-			range_lock->release(0);
-			break;
-		}
-
-		old_lock = std::exchange(lock_val, *std::prev(std::end(vm::g_range_lock_set)));
-	}
-
-	if (!range_lock->load()) [[unlikely]]
-	{
-		return true;
-	}
-
-	const bool res = compute_rdata_hash32(*vm::get_super_ptr<decltype(rdata)>(addr)) == hash;
-
-	range_lock->release(0);
-	return !res;
-}
-
-usz spu_thread::register_cache_line_waiter(u32 addr)
-{
-	const u64 value = u64{compute_rdata_hash32(rdata)} << 32 | addr;
-
-	for (usz i = 0; i < std::size(g_spu_waiters_by_value); i++)
-	{
-		auto [old, ok] = g_spu_waiters_by_value[i].fetch_op([value](u64& x)
-		{
-			if (x == 0)
-			{
-				x = value + 1;
-				return true;
-			}
-
-			if ((x & -128) == value)
-			{
-				x++;
-				return true;
-			}
-
-			return false;
-		});
-
-		if (ok)
-		{
-			return i;
-		}
-	}
-
-	return umax;
-}
-
-
-void spu_thread::deregister_cache_line_waiter(usz index)
-{
-	if (index == umax)
-	{
-		return;
-	}
-
-	g_spu_waiters_by_value[index].fetch_op([](u64& x)
-	{
-		x--;
-
-		if ((x & 127) == 0)
-		{
-			x = 0;
-		}
-
-		return false;
-	});
-}
-
-std::pair<u32, u32> spu_thread::read_dec() const
-{
-	const u64 res = ch_dec_value - (is_dec_frozen ? 0 : (get_timebased_time() - ch_dec_start_timestamp));
-	return {static_cast<u32>(res), static_cast<u32>(res >> 32)};
-}
-
-spu_thread::ch_events_t spu_thread::get_events(u64 mask_hint, bool waiting, bool reading)
+spu_thread::ch_events_t spu_thread::get_events(u32 mask_hint, bool waiting, bool reading)
 {
 	if (auto mask1 = ch_events.load().mask; mask1 & ~SPU_EVENT_IMPLEMENTED)
 	{
@@ -5723,7 +3589,7 @@ retry:
 	// SPU Decrementer Event on underflow (use the upper 32-bits to determine it)
 	if (mask_hint & SPU_EVENT_TM)
 	{
-		if (const u64 res = read_dec().second)
+		if (const u64 res = (ch_dec_value - (get_timebased_time() - ch_dec_start_timestamp)) >> 32)
 		{
 			// Set next event to the next time the decrementer underflows
 			ch_dec_start_timestamp -= res << 32;
@@ -5766,7 +3632,7 @@ void spu_thread::set_events(u32 bits)
 		if (events.mask & bits)
 		{
 			events.count = true;
-			return !!events.waiting && (bits & (SPU_EVENT_S1 | SPU_EVENT_S2));
+			return !!events.waiting;
 		}
 
 		return false;
@@ -5781,20 +3647,9 @@ void spu_thread::set_interrupt_status(bool enable)
 	if (enable)
 	{
 		// Detect enabling interrupts with events masked
-		if (auto mask = ch_events.load().mask; mask & SPU_EVENT_INTR_BUSY_CHECK)
+		if (auto mask = ch_events.load().mask; mask & ~SPU_EVENT_INTR_IMPLEMENTED)
 		{
-			if (g_cfg.core.spu_decoder != spu_decoder_type::_static && g_cfg.core.spu_decoder != spu_decoder_type::dynamic)
-			{
-				fmt::throw_exception("SPU Interrupts not implemented (mask=0x%x): Use [%s] SPU decoder", mask, spu_decoder_type::dynamic);
-			}
-
-			spu_log.trace("SPU Interrupts (mask=0x%x) are using CPU busy checking mode", mask);
-
-			// Process interrupts in cpu_work()
-			if (state.none_of(cpu_flag::pending))
-			{
-				state += cpu_flag::pending;
-			}
+			fmt::throw_exception("SPU Interrupts not implemented (mask=0x%x)", mask);
 		}
 	}
 
@@ -5816,7 +3671,7 @@ u32 spu_thread::get_ch_count(u32 ch)
 	case SPU_RdSigNotify1:    return ch_snr1.get_count();
 	case SPU_RdSigNotify2:    return ch_snr2.get_count();
 	case MFC_RdAtomicStat:    return ch_atomic_stat.get_count();
-	case SPU_RdEventStat:     return static_cast<u32>(get_events().count);
+	case SPU_RdEventStat:     return get_events().count;
 	case MFC_Cmd:             return 16 - mfc_size;
 
 	// Channels with a constant count of 1:
@@ -5859,21 +3714,12 @@ s64 spu_thread::get_ch_value(u32 ch)
 			state += cpu_flag::wait + cpu_flag::temp;
 		}
 
-		if (state & cpu_flag::pending)
+		for (int i = 0; i < 10 && channel.get_count() == 0; i++)
 		{
-			do_mfc();
+			busy_wait();
 		}
 
-		// Reset GETLLAR metadata
-		last_getllar_addr = umax;
-
 		const s64 out = channel.pop_wait(*this);
-
-		if (state & cpu_flag::wait)
-		{
-			wakeup_delay();
-		}
-
 		static_cast<void>(test_stopped());
 		return out;
 	};
@@ -5893,14 +3739,14 @@ s64 spu_thread::get_ch_value(u32 ch)
 
 		while (true)
 		{
-			if (state & cpu_flag::pending)
+			for (int i = 0; i < 10 && ch_in_mbox.get_count() == 0; i++)
 			{
-				do_mfc();
+				busy_wait();
 			}
 
-			const auto [old_count, out] = ch_in_mbox.pop_wait(*this);
+			u32 out = 0;
 
-			if (old_count)
+			if (const uint old_count = ch_in_mbox.try_pop(out))
 			{
 				if (old_count == 4 /* SPU_IN_MBOX_THRESHOLD */) // TODO: check this
 				{
@@ -5920,23 +3766,17 @@ s64 spu_thread::get_ch_value(u32 ch)
 
 			thread_ctrl::wait_on(state, old);
 		}
-
-		fmt::throw_exception("Unreachable"); // Fix unannotated fallthrough warning
 	}
 
 	case MFC_RdTagStat:
 	{
-		if (state & cpu_flag::pending)
-		{
-			do_mfc();
-		}
-
 		if (u32 out; ch_tag_stat.try_read(out))
 		{
 			ch_tag_stat.set_value(0, false);
 			return out;
 		}
 
+		// Will stall infinitely
 		return read_channel(ch_tag_stat);
 	}
 
@@ -5981,7 +3821,7 @@ s64 spu_thread::get_ch_value(u32 ch)
 
 	case SPU_RdDec:
 	{
-		u32 out = read_dec().first;
+		u32 out = ch_dec_value - static_cast<u32>(get_timebased_time() - ch_dec_start_timestamp);
 
 		//Polling: We might as well hint to the scheduler to slot in another thread since this one is counting down
 		if (g_cfg.core.spu_loop_detection && out > spu::scheduler::native_jiffy_duration_us)
@@ -6001,7 +3841,6 @@ s64 spu_thread::get_ch_value(u32 ch)
 	case SPU_RdEventStat:
 	{
 		const u32 mask1 = ch_events.load().mask;
-
 		auto events = get_events(mask1, false, true);
 
 		if (events.count)
@@ -6011,395 +3850,55 @@ s64 spu_thread::get_ch_value(u32 ch)
 
 		spu_function_logger logger(*this, "MFC Events read");
 
-		lv2_obj::prepare_for_sleep(*this);
-
-		using resrv_ptr = std::add_pointer_t<const decltype(rdata)>;
-
-		resrv_mem = vm::get_super_ptr<decltype(rdata)>(raddr);
-		std::shared_ptr<utils::shm> rdata_shm;
-
-		const u32 old_raddr = raddr;
-
-		// Does not need to safe-access reservation if LR is the only event masked
-		// Because it's either an access violation or a live-lock if an invalid memory is passed
-		if (raddr && mask1 > SPU_EVENT_LR)
+		if (mask1 & SPU_EVENT_LR && raddr)
 		{
-			auto area = vm::get(vm::any, raddr);
-
-			if (area && (area->flags & vm::preallocated))
+			if (mask1 != SPU_EVENT_LR && mask1 != SPU_EVENT_LR + SPU_EVENT_TM)
 			{
-				if (!vm::check_addr(raddr))
+				// Combining LR with other flags needs another solution
+				fmt::throw_exception("Not supported: event mask 0x%x", mask1);
+			}
+
+			for (; !events.count; events = get_events(mask1, false, true))
+			{
+				const auto old = state.add_fetch(cpu_flag::wait);
+
+				if (is_stopped(old))
 				{
-					resrv_mem = nullptr;
+					return -1;
 				}
-			}
-			else if (area)
-			{
-				// Ensure possession over reservation memory so it won't be de-allocated
-				auto [base_addr, shm_] = area->peek(raddr);
 
-				if (shm_)
+				if (is_paused(old))
 				{
-					const u32 data_offs = raddr - base_addr;
-					rdata_shm = std::move(shm_);
-					resrv_mem = reinterpret_cast<resrv_ptr>(rdata_shm->get() + data_offs);
+					// Ensure reservation data won't change while paused for debugging purposes
+					check_state();
+					continue;
 				}
+
+				vm::reservation_notifier(raddr).wait(rtime, -128, atomic_wait_timeout{100'000});
 			}
 
-			if (!resrv_mem)
-			{
-				spu_log.error("A dangling reservation address has been found while reading SPU_RdEventStat channel. (addr=0x%x, events_mask=0x%x)", raddr, mask1);
-				raddr = 0;
-				set_events(SPU_EVENT_LR);
-			}
+			check_state();
+			return events.events & mask1;
 		}
 
-		const usz seed = (utils::get_tsc() >> 8) % 100;
-
-#ifdef __linux__
-		const bool reservation_busy_waiting = false;
-#else
-		const bool reservation_busy_waiting = (seed + ((raddr == spurs_addr) ? 50u : 0u)) < g_cfg.core.spu_reservation_busy_waiting_percentage;
-#endif
-		usz cache_line_waiter_index = umax;
-
-		auto check_cache_line_waiter = [&]()
+		for (; !events.count; events = get_events(mask1, true, true))
 		{
-			if (cache_line_waiter_index == umax)
-			{
-				return true;
-			}
-
-			if ((g_spu_waiters_by_value[cache_line_waiter_index] & -128) == 0)
-			{
-				deregister_cache_line_waiter(cache_line_waiter_index);
-				cache_line_waiter_index = umax;
-				return false;
-			}
-
-			return true;
-		};
-
-		const bool is_LR_wait = raddr && mask1 & SPU_EVENT_LR;
-
-		auto& history = eventstat_wait_time[(raddr % SPU_LS_SIZE) / 128];
-
-		if (is_LR_wait)
-		{
-			const u32 spu_group_restart = group ? +group->stop_count : 0;
-
-			// Check if waiting session changed
-			if (eventstat_raddr != raddr || eventstat_block_counter != block_counter || last_getllar != eventstat_getllar || eventstat_spu_group_restart != spu_group_restart)
-			{
-				eventstat_raddr = raddr;
-				eventstat_block_counter = block_counter;
-				eventstat_getllar = last_getllar;
-				eventstat_spu_group_restart = spu_group_restart;
-				eventstat_spin_count = 0;
-				eventstat_evaluate_time = get_system_time();
-				eventstat_busy_waiting_switch = umax;
-			}
-			else
-			{
-				u8& val = history.front();
-				val = static_cast<u8>(std::min<u32>(val + 1, u8{umax}));
-			}
-		}
-		else
-		{
-			eventstat_busy_waiting_switch = 0;
-			eventstat_raddr = 0;
-			eventstat_block_counter = 0;
-		}
-
-		if (eventstat_busy_waiting_switch == umax)
-		{
-			bool value = false;
-
-			if (is_LR_wait && g_cfg.core.spu_reservation_busy_waiting_enabled)
-			{
-				// Make single-threaded groups inclined for busy-waiting
-				value = evaluate_spin_optimization({ history.data(), history.size() }, eventstat_evaluate_time, g_cfg.core.spu_reservation_busy_waiting_percentage, group && group->max_num == 1) != 0;
-			}
-
-			eventstat_busy_waiting_switch = value ? 1 : 0;
-		}
-		
-		for (bool is_first = true; !events.count; events = get_events(mask1 & ~SPU_EVENT_LR, true, true), is_first = false)
-		{
-			const auto old = +state;
+			const auto old = state.add_fetch(cpu_flag::wait);
 
 			if (is_stopped(old))
 			{
-				if (cache_line_waiter_index != umax)
-				{
-					g_spu_waiters_by_value[cache_line_waiter_index].release(0);
-				}
-
 				return -1;
 			}
 
-			// Optimized check
-			if (is_LR_wait)
+			if (is_paused(old))
 			{
-				if (cache_line_waiter_index == umax)
-				{
-					cache_line_waiter_index = register_cache_line_waiter(raddr);
-				}
-
-				bool set_lr = false;
-
-				if (!vm::check_addr(raddr) || rtime != vm::reservation_acquire(raddr))
-				{
-					set_lr = true;
-				}
-				else if (!cmp_rdata(rdata, *resrv_mem))
-				{
-					// Notify threads manually, memory data has likely changed and broke the reservation for others
-					if (vm::reservation_notifier_count(raddr) && vm::reservation_acquire(raddr) == rtime)
-					{
-						vm::reservation_notifier_notify(raddr);
-					}
-
-					set_lr = true;
-					spu_log.trace("SPU Reservation Wait: Did not encounter notification (raddr=0x%x)", raddr);
-				}
-
-				if (set_lr)
-				{
-					raddr = 0;
-					set_events(SPU_EVENT_LR);
-					continue;
-				}
-
-				if (!is_first && eventstat_busy_waiting_switch != 1)
-				{
-					u8& val = history.front();
-					val = static_cast<u8>(std::min<u32>(val + 1, u8{umax}));
-				}
-			}
-
-			if (eventstat_busy_waiting_switch == 1)
-			{
-				// Don't be stubborn, force operating sleep if too much time has passed
-				const u64 time_since = get_system_time() - eventstat_evaluate_time;
-
-				if (time_since >= (utils::get_thread_count() >= 9 ? 50'000 : 3000))
-				{
-					spu_log.trace("SPU RdEventStat wait for 0x%x failed", raddr);
-					history.front() = 2;
-					eventstat_busy_waiting_switch = 0;
-					continue;
-				}
-
-#if defined(ARCH_X64)
-				if (utils::has_um_wait())
-				{
-					if (utils::has_waitpkg())
-					{
-						__tpause(static_cast<u32>(std::min<u64>(eventstat_spin_count, 10) * 500), 0x1);
-					}
-					else
-					{
-						struct check_wait_t
-						{
-							static FORCE_INLINE bool needs_wait(u64 rtime, const atomic_t<u64>& mem_rtime) noexcept
-							{
-								return rtime == mem_rtime;
-							}
-						};
-
-						// Provide the first X64 cache line of the reservation to be tracked
-						__mwaitx<check_wait_t>(static_cast<u32>(std::min<u64>(eventstat_spin_count, 17) * 500), 0xf0, std::addressof(*resrv_mem), +rtime, vm::reservation_acquire(raddr));
-					}
-				}
-				else
-#endif
-				{
-					busy_wait(300);
-				}
-
-				// Check other reservations in other threads
-				lv2_obj::notify_all();
-
-				eventstat_spin_count++;
-				continue;
-			}
-
-			if (raddr && (mask1 & ~SPU_EVENT_TM) == SPU_EVENT_LR)
-			{
-				if (u32 max_threads = std::min<u32>(g_cfg.core.max_spurs_threads, group ? group->max_num : u32{umax}); group && group->max_run != max_threads)
-				{
-					constexpr std::string_view spurs_suffix = "CellSpursKernelGroup"sv;
-
-					if (group->name.ends_with(spurs_suffix) && !group->name.substr(0, group->name.size() - spurs_suffix.size()).ends_with("_libsail"))
-					{
-						// Hack: don't run more SPURS threads than specified.
-						if (u32 old = atomic_storage<u32>::exchange(group->max_run, max_threads); old > max_threads)
-						{
-							spu_log.success("HACK: '%s' (0x%x) limited to %u threads.", group->name, group->id, max_threads);
-						}
-						else if (u32 running = group->spurs_running; old < max_threads && running >= old && running < max_threads)
-						{
-							group->spurs_running.notify_all();
-						}
-					}
-				}
-
-				// Don't busy-wait with TSX - memory is sensitive
-				if (g_use_rtm || !reservation_busy_waiting)
-				{
-					if (u32 work_count = g_spu_work_count)
-					{
-						const u32 true_free = utils::sub_saturate<u32>(utils::get_thread_count(), 10);
-
-						if (work_count > true_free)
-						{
-							// SPU thread count estimation
-							const u32 thread_count = (group ? g_raw_spu_ctr + group->max_num : g_raw_spu_ctr + 3);
-
-							if (thread_count && seed % thread_count < work_count - true_free)
-							{
-								// Make the SPU wait longer for other threads to do the work
-								thread_ctrl::wait_for(200);
-								continue;
-							}
-						}
-					}
-
-					// Check other reservations in other threads
-					lv2_obj::notify_all();
-
-					if (raddr - spurs_addr <= 0x80 && !g_cfg.core.spu_accurate_reservations && mask1 == SPU_EVENT_LR)
-					{
-						// Wait with extended timeout, in this situation we have notifications for nearly all writes making it possible
-						// Abort notifications are handled specially for performance reasons
-						if (auto wait_var = vm::reservation_notifier_begin_wait(raddr, rtime))
-						{
-							if (check_cache_line_waiter())
-							{
-								utils::bless<atomic_t<u32>>(&wait_var->raw().wait_flag)->wait(1, atomic_wait_timeout{300'000});
-							}
-
-							vm::reservation_notifier_end_wait(*wait_var);
-						}
-
-						continue;
-					}
-
-					const u32 _raddr = this->raddr;
-#ifdef __linux__
-
-					if (auto wait_var = vm::reservation_notifier_begin_wait(_raddr, rtime))
-					{
-						if (check_cache_line_waiter())
-						{
-							utils::bless<atomic_t<u32>>(&wait_var->raw().wait_flag)->wait(1, atomic_wait_timeout{50'000});
-						}
-
-						vm::reservation_notifier_end_wait(*wait_var);
-					}
-#else
-					static thread_local bool s_tls_try_notify = false;
-					s_tls_try_notify = false;
-
-					const auto wait_cb = mask1 != SPU_EVENT_LR ? nullptr : +[](u64 attempts) -> bool
-					{
-						const auto _this = static_cast<spu_thread*>(cpu_thread::get_current());
-						AUDIT(_this->get_class() == thread_class::spu);
-
-						const auto old = +_this->state;
-
-						if (is_stopped(old))
-						{
-							return false;
-						}
-
-						if (!attempts)
-						{
-							// Skip checks which have been done already
-							return true;
-						}
-
-						bool set_lr = false;
-						const u32 raddr = _this->raddr;
-
-						if (!raddr)
-						{
-							return true;
-						}
-
-						if (!vm::check_addr(raddr))
-						{
-							set_lr = true;
-						}
-						else if (!cmp_rdata(_this->rdata, *_this->resrv_mem))
-						{
-							// Notify threads manually, memory data has likely changed and broke the reservation for others
-							if (vm::reservation_notifier_count(raddr) >= 2 && vm::reservation_acquire(raddr) == _this->rtime)
-							{
-								s_tls_try_notify = true;
-							}
-
-							set_lr = true;
-						}
-
-						if (set_lr)
-						{
-							_this->raddr = 0;
-							_this->set_events(SPU_EVENT_LR);
-							return false;
-						}
-
-						// Check other reservations in other threads
-						lv2_obj::notify_all();
-
-						return true;
-					};
-
-					if (auto wait_var = vm::reservation_notifier_begin_wait(_raddr, rtime))
-					{
-						if (check_cache_line_waiter())
-						{
-							atomic_wait_engine::set_one_time_use_wait_callback(wait_cb);
-							utils::bless<atomic_t<u32>>(&wait_var->raw().wait_flag)->wait(1, atomic_wait_timeout{80'000});
-						}
-
-						vm::reservation_notifier_end_wait(*wait_var);
-					}
-
-					if (s_tls_try_notify && vm::reservation_notifier_count(_raddr) && vm::reservation_acquire(_raddr) == rtime)
-					{
-						vm::reservation_notifier_notify(_raddr);
-					}
-#endif
-				}
-				else
-				{
-					busy_wait();
-				}
-
+				check_state();
 				continue;
 			}
 
 			thread_ctrl::wait_on(state, old, 100);
 		}
 
-		deregister_cache_line_waiter(cache_line_waiter_index);
-
-		wakeup_delay();
-
-		if (is_paused(state - cpu_flag::suspend))
-		{
-			if (!raddr && old_raddr)
-			{
-				// Restore reservation address temporarily for debugging use
-				raddr = old_raddr;
-				check_state();
-				raddr = 0;
-			}
-		}
-
 		check_state();
 		return events.events & mask1;
 	}
@@ -6428,16 +3927,8 @@ bool spu_thread::set_ch_value(u32 ch, u32 value)
 
 	case SPU_WrOutIntrMbox:
 	{
-		// Reset GETLLAR metadata
-		last_getllar_addr = umax;
-
 		if (get_type() >= spu_type::raw)
 		{
-			if (state & cpu_flag::pending)
-			{
-				do_mfc();
-			}
-
 			if (ch_out_intr_mbox.get_count())
 			{
 				state += cpu_flag::wait;
@@ -6449,15 +3940,12 @@ bool spu_thread::set_ch_value(u32 ch, u32 value)
 			}
 
 			int_ctrl[2].set(SPU_INT2_STAT_MAILBOX_INT);
-			wakeup_delay();
 			check_state();
 			return true;
 		}
 
 		state += cpu_flag::wait;
 
-		lv2_obj::notify_all_t notify;
-
 		const u32 code = value >> 24;
 		{
 			if (code < 64)
@@ -6474,42 +3962,24 @@ bool spu_thread::set_ch_value(u32 ch, u32 value)
 
 				spu_log.trace("sys_spu_thread_send_event(spup=%d, data0=0x%x, data1=0x%x)", spup, value & 0x00ffffff, data);
 
-				spu_function_logger logger(*this, "sys_spu_thread_send_event");
+				std::lock_guard lock(group->mutex);
 
-				shared_ptr<lv2_event_queue> queue;
-				{
-					std::lock_guard lock(group->mutex);
+				const auto queue = this->spup[spup].get();
 
-					if (ch_in_mbox.get_count())
-					{
-						// TODO: Check this
-						spu_log.error("sys_spu_thread_send_event(spup=%d, data0=0x%x, data1=0x%x): In_MBox is not empty (%d)", spup, (value & 0x00ffffff), data, ch_in_mbox.get_count());
-						ch_in_mbox.set_values(1, CELL_EBUSY);
-						return true;
-					}
-
-					// Reserve a place in the inbound mailbox
-					ch_in_mbox.set_values(1, CELL_OK);
-					queue = this->spup[spup];
-				}
-
-				const auto res = !queue ? CELL_ENOTCONN :
+				const auto res = ch_in_mbox.get_count() ? CELL_EBUSY :
+					!queue ? CELL_ENOTCONN :
 					queue->send(SYS_SPU_THREAD_EVENT_USER_KEY, lv2_id, (u64{spup} << 32) | (value & 0x00ffffff), data);
 
-				if (res == CELL_ENOTCONN)
+				if (ch_in_mbox.get_count())
+				{
+					spu_log.warning("sys_spu_thread_send_event(spup=%d, data0=0x%x, data1=0x%x): In_MBox is not empty (%d)", spup, (value & 0x00ffffff), data, ch_in_mbox.get_count());
+				}
+				else if (res == CELL_ENOTCONN)
 				{
 					spu_log.warning("sys_spu_thread_send_event(spup=%d, data0=0x%x, data1=0x%x): error (%s)", spup, (value & 0x00ffffff), data, res);
 				}
 
-				if (res == CELL_EAGAIN)
-				{
-					// Restore mailboxes state
-					ch_out_mbox.set_value(data);
-					ch_in_mbox.try_pop(data);
-					return false;
-				}
-
-				atomic_storage<u32>::release(ch_in_mbox.values.raw().value0, res);
+				ch_in_mbox.set_values(1, res);
 				return true;
 			}
 			else if (code < 128)
@@ -6526,23 +3996,11 @@ bool spu_thread::set_ch_value(u32 ch, u32 value)
 
 				spu_log.trace("sys_spu_thread_throw_event(spup=%d, data0=0x%x, data1=0x%x)", spup, value & 0x00ffffff, data);
 
-				spu_function_logger logger(*this, "sys_spu_thread_throw_event");
-
-				shared_ptr<lv2_event_queue> queue;
-				{
-					std::lock_guard lock{group->mutex};
-					queue = this->spup[spup];
-				}
+				const auto queue = (std::lock_guard{group->mutex}, this->spup[spup]);
 
 				// TODO: check passing spup value
 				if (auto res = queue ? queue->send(SYS_SPU_THREAD_EVENT_USER_KEY, lv2_id, (u64{spup} << 32) | (value & 0x00ffffff), data) : CELL_ENOTCONN)
 				{
-					if (res == CELL_EAGAIN)
-					{
-						ch_out_mbox.set_value(data);
-						return false;
-					}
-
 					spu_log.warning("sys_spu_thread_throw_event(spup=%d, data0=0x%x, data1=0x%x) failed (error=%s)", spup, (value & 0x00ffffff), data, res);
 				}
 
@@ -6562,35 +4020,17 @@ bool spu_thread::set_ch_value(u32 ch, u32 value)
 
 				spu_log.trace("sys_event_flag_set_bit(id=%d, value=0x%x (flag=%d))", data, value, flag);
 
-				spu_function_logger logger(*this, "sys_event_flag_set_bit");
-
-				{
-					std::lock_guard lock(group->mutex);
-
-					if (ch_in_mbox.get_count())
-					{
-						// TODO: Check this
-						spu_log.error("sys_event_flag_set_bit(value=0x%x (flag=%d)): In_MBox is not empty (%d)", value, flag, ch_in_mbox.get_count());
-						ch_in_mbox.set_values(1, CELL_EBUSY);
-						return true;
-					}
-
-					// Reserve a place in the inbound mailbox
-					ch_in_mbox.set_values(1, CELL_OK);
-				}
+				std::lock_guard lock(group->mutex);
 
 				// Use the syscall to set flag
-				const auto res = 0u + sys_event_flag_set(*this, data, 1ull << flag);
+				const auto res = ch_in_mbox.get_count() ? CELL_EBUSY : 0u + sys_event_flag_set(*this, data, 1ull << flag);
 
-				if (res == CELL_EAGAIN)
+				if (res == CELL_EBUSY)
 				{
-					// Restore mailboxes state
-					ch_out_mbox.set_value(data);
-					ch_in_mbox.try_pop(data);
-					return false;
+					spu_log.warning("sys_event_flag_set_bit(value=0x%x (flag=%d)): In_MBox is not empty (%d)", value, flag, ch_in_mbox.get_count());
 				}
 
-				atomic_storage<u32>::release(ch_in_mbox.values.raw().value0, res);
+				ch_in_mbox.set_values(1, res);
 				return true;
 			}
 			else if (code == 192)
@@ -6607,15 +4047,8 @@ bool spu_thread::set_ch_value(u32 ch, u32 value)
 
 				spu_log.trace("sys_event_flag_set_bit_impatient(id=%d, value=0x%x (flag=%d))", data, value, flag);
 
-				spu_function_logger logger(*this, "sys_event_flag_set_bit_impatient");
-
 				// Use the syscall to set flag
-				if (sys_event_flag_set(*this, data, 1ull << flag) + 0u == CELL_EAGAIN)
-				{
-					ch_out_mbox.set_value(data);
-					return false;
-				}
-
+				sys_event_flag_set(*this, data, 1ull << flag);
 				return true;
 			}
 			else
@@ -6627,11 +4060,6 @@ bool spu_thread::set_ch_value(u32 ch, u32 value)
 
 	case SPU_WrOutMbox:
 	{
-		if (state & cpu_flag::pending)
-		{
-			do_mfc();
-		}
-
 		if (ch_out_mbox.get_count())
 		{
 			state += cpu_flag::wait;
@@ -6721,7 +4149,7 @@ bool spu_thread::set_ch_value(u32 ch, u32 value)
 
 	case MFC_Size:
 	{
-		ch_mfc_cmd.size = static_cast<u16>(std::min<u32>(value, 0xffff));
+		ch_mfc_cmd.size = value & 0x7fff;
 		return true;
 	}
 
@@ -6768,13 +4196,12 @@ bool spu_thread::set_ch_value(u32 ch, u32 value)
 		get_events(SPU_EVENT_TM); // Don't discard possibly occured old event
 		ch_dec_start_timestamp = get_timebased_time();
 		ch_dec_value = value;
-		is_dec_frozen = false;
 		return true;
 	}
 
 	case SPU_WrEventMask:
 	{
-		get_events(value | static_cast<u32>(ch_events.load().mask));
+		get_events(value);
 
 		if (ch_events.atomic_op([&](ch_events_t& events)
 		{
@@ -6786,7 +4213,7 @@ bool spu_thread::set_ch_value(u32 ch, u32 value)
 				return true;
 			}
 
-			return !!events.count;
+			return false;
 		}))
 		{
 			// Check interrupts in case count is 1
@@ -6802,33 +4229,20 @@ bool spu_thread::set_ch_value(u32 ch, u32 value)
 	case SPU_WrEventAck:
 	{
 		// "Collect" events before final acknowledgment
-		get_events(value | static_cast<u32>(ch_events.load().mask));
+		get_events(value);
 
-		bool freeze_dec = false;
-
-		const bool check_intr = ch_events.atomic_op([&](ch_events_t& events)
+		if (ch_events.atomic_op([&](ch_events_t& events)
 		{
 			events.events &= ~value;
 
-			freeze_dec = !!((value & SPU_EVENT_TM) & ~events.mask);
-
 			if (events.events & events.mask)
 			{
 				events.count = true;
 				return true;
 			}
 
-			return !!events.count;
-		});
-
-		if (!is_dec_frozen && freeze_dec)
-		{
-			// Save current time, this will be the reported value until the decrementer resumes
-			ch_dec_value = read_dec().first;
-			is_dec_frozen = true;
-		}
-
-		if (check_intr)
+			return false;
+		}))
 		{
 			// Check interrupts in case count is 1
 			if (check_mfc_interrupts(pc + 4))
@@ -6865,7 +4279,7 @@ extern void resume_spu_thread_group_from_waiting(spu_thread& spu)
 	{
 		group->run_state = SPU_THREAD_GROUP_STATUS_SUSPENDED;
 		spu.state += cpu_flag::signal;
-		spu.state.notify_one();
+		spu.state.notify_one(cpu_flag::signal);
 		return;
 	}
 
@@ -6883,7 +4297,7 @@ extern void resume_spu_thread_group_from_waiting(spu_thread& spu)
 				thread->state -= cpu_flag::suspend;
 			}
 
-			thread->state.notify_one();
+			thread->state.notify_one(cpu_flag::suspend + cpu_flag::signal);
 		}
 	}
 }
@@ -6916,7 +4330,7 @@ bool spu_thread::stop_and_signal(u32 code)
 		return true;
 	}
 
-	auto get_queue = [this](u32 spuq) -> const shared_ptr<lv2_event_queue>&
+	auto get_queue = [this](u32 spuq) -> const std::shared_ptr<lv2_event_queue>&
 	{
 		for (auto& v : this->spuq)
 		{
@@ -6929,7 +4343,7 @@ bool spu_thread::stop_and_signal(u32 code)
 			}
 		}
 
-		static const shared_ptr<lv2_event_queue> empty;
+		static const std::shared_ptr<lv2_event_queue> empty;
 		return empty;
 	};
 
@@ -6955,7 +4369,7 @@ bool spu_thread::stop_and_signal(u32 code)
 
 		u32 spuq = 0;
 
-		if (!ch_out_mbox.try_read(spuq))
+		if (!ch_out_mbox.try_pop(spuq))
 		{
 			fmt::throw_exception("sys_spu_thread_receive_event(): Out_MBox is empty");
 		}
@@ -6966,20 +4380,6 @@ bool spu_thread::stop_and_signal(u32 code)
 			return ch_in_mbox.set_values(1, CELL_EBUSY), true;
 		}
 
-		struct clear_mbox
-		{
-			spu_thread& _this;
-
-			~clear_mbox() noexcept
-			{
-				if (cpu_flag::again - _this.state)
-				{
-					u32 val = 0;
-					_this.ch_out_mbox.try_pop(val);
-				}
-			}
-		} clear{*this};
-
 		spu_log.trace("sys_spu_thread_receive_event(spuq=0x%x)", spuq);
 
 		if (!group->has_scheduler_context /*|| group->type & 0xf00*/)
@@ -6988,32 +4388,27 @@ bool spu_thread::stop_and_signal(u32 code)
 			return ch_in_mbox.set_values(1, CELL_EINVAL), true;
 		}
 
-		lv2_obj::prepare_for_sleep(*this);
+		state += cpu_flag::wait;
 
 		spu_function_logger logger(*this, "sys_spu_thread_receive_event");
 
-		shared_ptr<lv2_event_queue> queue;
-
+		std::shared_ptr<lv2_event_queue> queue;
+	
 		while (true)
 		{
-			// Check group status (by actually checking thread status), wait if necessary
-			while (true)
+			// Check group status, wait if necessary
+			for (auto _state = +group->run_state;
+				_state >= SPU_THREAD_GROUP_STATUS_WAITING && _state <= SPU_THREAD_GROUP_STATUS_WAITING_AND_SUSPENDED;
+				_state = group->run_state)
 			{
-				const auto old = +state;
+				const auto old = state.load();
 
 				if (is_stopped(old))
 				{
-					state += cpu_flag::again;
 					return false;
 				}
 
-				if (!is_paused(old))
-				{
-					// The group is not suspended (anymore)
-					break;
-				}
-
-				thread_ctrl::wait_on(state, old);
+				thread_ctrl::wait_on(state, old);;
 			}
 
 			reader_lock{group->mutex}, queue = get_queue(spuq);
@@ -7028,20 +4423,12 @@ bool spu_thread::stop_and_signal(u32 code)
 
 			if (is_stopped())
 			{
-				state += cpu_flag::again;
 				return false;
 			}
 
-			if (Emu.IsStarting())
-			{
-				// Deregister lv2_obj::g_to_sleep entry (savestates related)
-				lv2_obj::sleep(*this);
-			}
-
 			if (group->run_state >= SPU_THREAD_GROUP_STATUS_WAITING && group->run_state <= SPU_THREAD_GROUP_STATUS_WAITING_AND_SUSPENDED)
 			{
 				// Try again
-				ensure(state & cpu_flag::suspend);
 				continue;
 			}
 
@@ -7058,9 +4445,8 @@ bool spu_thread::stop_and_signal(u32 code)
 
 			if (queue->events.empty())
 			{
-				lv2_obj::emplace(queue->sq, this);
+				queue->sq.emplace_back(this);
 				group->run_state = SPU_THREAD_GROUP_STATUS_WAITING;
-				group->waiter_spu_index = index;
 
 				for (auto& thread : group->threads)
 				{
@@ -7086,34 +4472,21 @@ bool spu_thread::stop_and_signal(u32 code)
 			}
 		}
 
-		lv2_obj::notify_all();
-
-		while (auto old = +state)
+		while (auto old = state.fetch_sub(cpu_flag::signal))
 		{
-			if (old & cpu_flag::signal && state.test_and_reset(cpu_flag::signal))
-			{
-				break;
-			}
-
 			if (is_stopped(old))
 			{
-				std::lock_guard qlock(queue->mutex);
-
-				old = state.fetch_sub(cpu_flag::signal);
-
-				if (old & cpu_flag::signal)
-				{
-					break;
-				}
-
-				state += cpu_flag::again;
 				return false;
 			}
 
+			if (old & cpu_flag::signal)
+			{
+				break;
+			}
+
 			thread_ctrl::wait_on(state, old);
 		}
 
-		wakeup_delay();
 		return true;
 	}
 
@@ -7136,7 +4509,7 @@ bool spu_thread::stop_and_signal(u32 code)
 
 		spu_log.trace("sys_spu_thread_tryreceive_event(spuq=0x%x)", spuq);
 
-		shared_ptr<lv2_event_queue> queue;
+		std::shared_ptr<lv2_event_queue> queue;
 
 		reader_lock{group->mutex}, queue = get_queue(spuq);
 
@@ -7185,12 +4558,6 @@ bool spu_thread::stop_and_signal(u32 code)
 		return true;
 	}
 
-	case SYS_SPU_THREAD_STOP_SWITCH_SYSTEM_MODULE:
-	{
-		fmt::throw_exception("SYS_SPU_THREAD_STOP_SWITCH_SYSTEM_MODULE (op=0x%x, Out_MBox=%s)", code, _ref<u32>(pc), ch_out_mbox);
-		return true;
-	}
-
 	case SYS_SPU_THREAD_STOP_YIELD:
 	{
 		// SPU thread group yield (TODO)
@@ -7218,29 +4585,20 @@ bool spu_thread::stop_and_signal(u32 code)
 
 		spu_log.trace("sys_spu_thread_group_exit(status=0x%x)", value);
 
-		spu_function_logger logger(*this, "sys_spu_thread_group_exit");
-
 		while (true)
 		{
-			// Check group status (by actually checking thread status), wait if necessary
-			while (true)
+			for (auto _state = +group->run_state;
+				_state >= SPU_THREAD_GROUP_STATUS_WAITING && _state <= SPU_THREAD_GROUP_STATUS_WAITING_AND_SUSPENDED;
+				_state = group->run_state)
 			{
 				const auto old = +state;
 
 				if (is_stopped(old))
 				{
-					ch_out_mbox.set_value(value);
-					state += cpu_flag::again;
 					return false;
 				}
 
-				if (!is_paused(old))
-				{
-					// The group is not suspended (anymore)
-					break;
-				}
-
-				thread_ctrl::wait_on(state, old);
+				thread_ctrl::wait_on(state, old);;
 			}
 
 			std::lock_guard lock(group->mutex);
@@ -7273,6 +4631,9 @@ bool spu_thread::stop_and_signal(u32 code)
 						flags += cpu_flag::stop + cpu_flag::ret;
 						return true;
 					});
+
+					if (thread.get() != this)
+						thread_ctrl::notify(*thread);
 				}
 			}
 
@@ -7282,36 +4643,6 @@ bool spu_thread::stop_and_signal(u32 code)
 			break;
 		}
 
-		u32 prev_resv = 0;
-
-		for (auto& thread : group->threads)
-		{
-			if (thread)
-			{
-				// Notify threads, guess which threads need a notification by checking cpu_flag::ret (redundant notification can only occur if thread has called an exit syscall itself as well)
-				if (thread.get() != this && thread->state & cpu_flag::ret)
-				{
-					thread_ctrl::notify(*thread);
-
-					if (u32 resv = atomic_storage<u32>::load(thread->raddr))
-					{
-						if (prev_resv && prev_resv != resv)
-						{
-							// Batch reservation notifications if possible
-							vm::reservation_notifier_notify(prev_resv);
-						}
-
-						prev_resv = resv;
-					}
-				}
-			}
-		}
-
-		if (prev_resv)
-		{
-			vm::reservation_notifier_notify(prev_resv);
-		}
-
 		check_state();
 		return true;
 	}
@@ -7329,8 +4660,6 @@ bool spu_thread::stop_and_signal(u32 code)
 			fmt::throw_exception("sys_spu_thread_exit(): Out_MBox is empty");
 		}
 
-		spu_function_logger logger(*this, "sys_spu_thread_exit");
-
 		spu_log.trace("sys_spu_thread_exit(status=0x%x)", value);
 		last_exit_status.release(value);
 		set_status_npc();
@@ -7390,82 +4719,18 @@ void spu_thread::fast_call(u32 ls_addr)
 	gpr[1]._u32[3] = old_stack;
 }
 
-spu_exec_object spu_thread::capture_memory_as_elf(std::span<spu_memory_segment_dump_data> segs, u32 pc_hint)
+bool spu_thread::capture_local_storage() const
 {
 	spu_exec_object spu_exec;
-	spu_exec.set_error(elf_error::ok);
-
-	std::vector<u8> all_data(SPU_LS_SIZE);
-
-	for (auto& seg : segs)
-	{
-		std::vector<uchar> data(seg.segment_size);
-
-		if (auto [vm_addr, ok] = vm::try_get_addr(seg.src_addr); ok)
-		{
-			if (!vm::try_access(vm_addr, data.data(), seg.segment_size, false))
-			{
-				spu_log.error("capture_memory_as_elf(): Failed to read {0x%x..0x%x}, aborting capture.", +vm_addr, vm_addr + seg.segment_size - 1);
-				spu_exec.set_error(elf_error::stream_data);
-				return spu_exec;
-			}
-		}
-		else
-		{
-			std::memcpy(data.data(), seg.src_addr, data.size());
-		}
-
-		std::memcpy(all_data.data() + seg.ls_addr, data.data(), data.size());
-
-		auto& prog = spu_exec.progs.emplace_back(SYS_SPU_SEGMENT_TYPE_COPY, seg.flags & 0x7, seg.ls_addr, seg.segment_size, 8, std::move(data));
-
-		prog.p_paddr = prog.p_vaddr;
-
-		spu_log.success("Segment: p_type=0x%x, p_vaddr=0x%x, p_filesz=0x%x, p_memsz=0x%x", prog.p_type, prog.p_vaddr, prog.p_filesz, prog.p_memsz);
-	}
-
-
-	u32 pc0 = pc_hint;
-
-	if (pc_hint != umax)
-	{
-		for (pc0 = pc_hint; pc0; pc0 -= 4)
-		{
-			const u32 op = read_from_ptr<be_t<u32>>(all_data, pc0 - 4);
-
-			// Try to find function entry (if they are placed sequentially search for BI $LR of previous function)
-			if (!op || op == 0x35000000u || s_spu_itype.decode(op) == spu_itype::UNK)
-			{
-				if (is_exec_code(pc0, { all_data.data(), SPU_LS_SIZE }))
-					break;
-			}
-		}
-	}
-	else
-	{
-		for (pc0 = 0; pc0 < SPU_LS_SIZE; pc0 += 4)
-		{
-			// Try to find a function entry (very basic)
-			if (is_exec_code(pc0, { all_data.data(), SPU_LS_SIZE }))
-				break;
-		}
-	}
-
-	spu_exec.header.e_entry = pc0;
-
-	return spu_exec;
-}
-
-bool spu_thread::capture_state()
-{
-	ensure(state & cpu_flag::wait);
 
 	// Save data as an executable segment, even the SPU stack
 	// In the past, an optimization was made here to save only non-zero chunks of data
 	// But Ghidra didn't like accessing memory out of chunks (pretty common)
 	// So it has been reverted
-	spu_memory_segment_dump_data single_seg{.ls_addr = 0, .src_addr = ls, .segment_size = SPU_LS_SIZE};
-	spu_exec_object spu_exec = capture_memory_as_elf({&single_seg, 1}, pc);
+	auto& prog = spu_exec.progs.emplace_back(SYS_SPU_SEGMENT_TYPE_COPY, 0x7, 0, SPU_LS_SIZE, 8, std::vector<uchar>(ls, ls + SPU_LS_SIZE));
+
+	prog.p_paddr = prog.p_vaddr;
+	spu_log.success("Segment: p_type=0x%x, p_vaddr=0x%x, p_filesz=0x%x, p_memsz=0x%x", prog.p_type, prog.p_vaddr, prog.p_filesz, prog.p_memsz);
 
 	std::string name;
 
@@ -7484,6 +4749,22 @@ bool spu_thread::capture_state()
 		fmt::append(name, "RawSPU.%u", lv2_id);
 	}
 
+	u32 pc0 = pc;
+
+	for (; pc0; pc0 -= 4)
+	{
+		be_t<u32> op;
+		std::memcpy(&op, prog.bin.data() + pc0 - 4, 4);
+
+		// Try to find function entry (if they are placed sequentially search for BI $LR of previous function)
+		if (!op || op == 0x35000000u || s_spu_itype.decode(op) == spu_itype::UNK)
+		{
+			break;
+		}
+	}
+
+	spu_exec.header.e_entry = pc0;
+
 	name = vfs::escape(name, true);
 	std::replace(name.begin(), name.end(), ' ', '_');
 
@@ -7506,77 +4787,27 @@ bool spu_thread::capture_state()
 		}
 	}
 
-	fs::file temp(elf_path, fs::rewrite);
+	fs::pending_file temp(elf_path);
 
-	if (!temp)
+	if (!temp.file)
 	{
-		spu_log.error("Failed to create file '%s' (error=%s)", elf_path, fs::g_tls_error);
+		spu_log.error("Failed to create temporary file for '%s' (error=%s)", elf_path, fs::g_tls_error);
 		return false;
 	}
 
-	auto data = spu_exec.save();
+	temp.file.write(spu_exec.save());
 
-	if (temp.write(data.data(), data.size()) != data.size())
+	if (!temp.commit(false))
 	{
-		spu_log.error("Failed to write file '%s' (error=%s)", elf_path, fs::g_tls_error);
+		spu_log.error("Failed to create rename temporary file to '%s' (error=%s)", elf_path, fs::g_tls_error);
 		return false;
 	}
 
 	spu_log.success("SPU Local Storage image saved to '%s'", elf_path);
-
-	if (g_cfg.core.spu_decoder == spu_decoder_type::asmjit || g_cfg.core.spu_decoder == spu_decoder_type::llvm)
-	{
-		return true;
-	}
-
-	auto& rewind = rewind_captures[current_rewind_capture_idx++ % rewind_captures.size()];
-
-	if (rewind)
-	{
-		spu_log.error("Due to resource limits the 16th SPU rewind capture is being overwritten with a new one. (free the most recent by loading it)");
-		rewind.reset();
-	}
-
-	rewind = std::make_shared<utils::serial>();
-	(*rewind)(std::span(spu_exec.progs[0].bin.data(), spu_exec.progs[0].bin.size())); // span serialization doesn't remember size which is what we need
-	serialize_common(*rewind);
-
-	// TODO: Save and restore decrementer state properly
-
-	spu_log.success("SPU rewind image has been saved in memory. (%d free slots left)", std::count_if(rewind_captures.begin(), rewind_captures.end(), FN(!x.operator bool())));
 	return true;
 }
 
-bool spu_thread::try_load_debug_capture()
-{
-	if (cpu_flag::wait - state)
-	{
-		return false;
-	}
-
-	auto rewind = std::move(rewind_captures[(current_rewind_capture_idx - 1) % rewind_captures.size()]);
-
-	if (!rewind)
-	{
-		return false;
-	}
-
-	rewind->set_reading_state();
-	(*rewind)(std::span(ls, SPU_LS_SIZE)); // span serialization doesn't remember size which is what we need
-	serialize_common(*rewind);
-	current_rewind_capture_idx--;
-
-	spu_log.success("Last SPU rewind image has been loaded.");
-	return true;
-}
-
-void spu_thread::wakeup_delay(u32 div) const
-{
-	if (g_cfg.core.spu_wakeup_delay_mask & (1u << index))
-		thread_ctrl::wait_for_accurate(utils::aligned_div(+g_cfg.core.spu_wakeup_delay, div));
-}
-
-spu_function_logger::spu_function_logger(spu_thread& spu, const char* func) noexcept
+spu_function_logger::spu_function_logger(spu_thread& spu, const char* func)
 	: spu(spu)
 {
 	spu.current_func = func;
@@ -7604,279 +4835,16 @@ spu_thread::thread_name_t::operator std::string() const
 	return full_name;
 }
 
-spu_thread::spu_prio_t spu_thread::priority_t::load() const
+spu_thread::priority_t::operator s32() const
 {
 	if (_this->get_type() != spu_type::threaded || !_this->group->has_scheduler_context)
 	{
-		spu_thread::spu_prio_t prio{};
-		prio.prio = s32{smax};
-		return prio;
+		return s32{smax};
 	}
 
 	return _this->group->prio;
 }
 
-s64 spu_channel::pop_wait(cpu_thread& spu, bool pop)
-{
-	u64 old = data.fetch_op([&](u64& data)
-	{
-		if (data & bit_count) [[likely]]
-		{
-			if (pop)
-			{
-				data = 0;
-				return true;
-			}
-
-			return false;
-		}
-
-		data = (pop ? bit_occupy : 0) | bit_wait;
-
-		if (pop)
-		{
-			jostling_value.release(bit_occupy);
-		}
-
-		return true;
-	}).first;
-
-	if (old & bit_count)
-	{
-		return static_cast<u32>(old);
-	}
-
-	for (int i = 0; i < 10; i++)
-	{
-		busy_wait();
-
-		if (!(data & bit_wait))
-		{
-			return static_cast<u32>(pop ? jostling_value.exchange(0) : +data);
-		}
-	}
-
-	lv2_obj::notify_all();
-
-	const u32 wait_on_val = static_cast<u32>(((pop ? bit_occupy : 0) | bit_wait) >> 32);
-
-	while (true)
-	{
-		thread_ctrl::wait_on(utils::bless<atomic_t<u32>>(&data)[1], wait_on_val);
-		old = data;
-
-		if (!(old & bit_wait))
-		{
-			return static_cast<u32>(pop ? jostling_value.exchange(0) : +data);
-		}
-
-		if (spu.is_stopped())
-		{
-			// Abort waiting and test if a value has been received
-			if (pop)
-			{
-				if (u64 v = jostling_value.exchange(0); !(v & bit_occupy))
-				{
-					return static_cast<u32>(v);
-				}
-
-				ensure(data.fetch_and(~(bit_wait | bit_occupy)) & bit_wait);
-			}
-			else
-			{
-				data.bit_test_reset(off_wait);
-			}
-
-			return -1;
-		}
-	}
-}
-
-// Waiting for channel push state availability, actually pushing if specified
-bool spu_channel::push_wait(cpu_thread& spu, u32 value, bool push)
-{
-	u64 state{};
-	data.fetch_op([&](u64& data)
-	{
-		if (data & bit_count) [[unlikely]]
-		{
-			jostling_value.release(push ? (bit_occupy | value) : static_cast<u32>(data));
-			data |= (push ? bit_occupy : 0) | bit_wait;
-		}
-		else if (push)
-		{
-			data = bit_count | value;
-		}
-		else
-		{
-			state = data;
-			return false;
-		}
-
-		state = data;
-		return true;
-	});
-
-	for (int i = 0; i < 10; i++)
-	{
-		if (!(state & bit_wait))
-		{
-			return true;
-		}
-
-		busy_wait();
-		state = data;
-	}
-
-	while (true)
-	{
-		if (!(state & bit_wait))
-		{
-			return true;
-		}
-
-		if (spu.is_stopped())
-		{
-			return !data.bit_test_reset(off_wait);
-		}
-
-		thread_ctrl::wait_on(utils::bless<atomic_t<u32>>(&data)[1], u32(state >> 32));
-		state = data;
-	}
-}
-
-std::pair<u32, u32> spu_channel_4_t::pop_wait(cpu_thread& spu, bool pop_value)
-{
-	auto old = values.fetch_op([&](sync_var_t& data)
-	{
-		if (data.count != 0)
-		{
-			if (!pop_value)
-			{
-				return;
-			}
-
-			data.waiting = 0;
-			data.count--;
-
-			data.value0 = data.value1;
-			data.value1 = data.value2;
-			data.value2 = this->value3;
-		}
-		else
-		{
-			data.waiting = (pop_value ? bit_occupy : 0) | bit_wait;
-			jostling_value.release(pop_value ? jostling_flag : 0);
-		}
-	});
-
-	if (old.count)
-	{
-		return {old.count, old.value0};
-	}
-
-	old.waiting = (pop_value ? bit_occupy : 0) | bit_wait;
-
-	for (int i = 0; i < 10; i++)
-	{
-		busy_wait();
-
-		if (!atomic_storage<u8>::load(values.raw().waiting))
-		{
-			return {1, static_cast<u32>(pop_value ? jostling_value.exchange(0) : 0)};
-		}
-	}
-
-	while (true)
-	{
-		thread_ctrl::wait_on(utils::bless<atomic_t<u32>>(&values)[0], u32(u64(std::bit_cast<u128>(old))));
-		old = values;
-
-		if (~old.waiting & bit_wait)
-		{
-			// Count of 1 because a value has been inserted and popped in the same step.
-			return {1, static_cast<u32>(pop_value ? jostling_value.exchange(0) : 0)};
-		}
-
-		if (spu.is_stopped())
-		{
-			if (pop_value)
-			{
-				// Abort waiting and test if a value has been received
-				if (u64 v = jostling_value.exchange(0); !(v & jostling_flag))
-				{
-					return {1, static_cast<u32>(v)};
-				}
-			}
-
-			if (~atomic_storage<u8>::exchange(values.raw().waiting, 0) & bit_wait)
-			{
-				// Count of 1 because a value has been inserted and popped in the same step.
-				return {1, static_cast<u32>(pop_value ? jostling_value.exchange(0) : 0)};
-			}
-
-			return {};
-		}
-	}
-}
-
-spu_channel_op_state spu_channel_4_t::push(u32 value, bool postpone_notify)
-{
-	while (true)
-	{
-		value3.release(value);
-		const auto [old, pushed_to_data] = values.fetch_op([&](sync_var_t& data)
-		{
-			if (data.waiting & bit_occupy)
-			{
-				return false;
-			}
-
-			switch (data.count++)
-			{
-			case 0: data.value0 = value; break;
-			case 1: data.value1 = value; break;
-			case 2: data.value2 = value; break;
-			default:
-			{
-				data.count = 4;
-				data.value3_inval++; // Ensure the SPU reads the most recent value3 write in try_pop by re-loading
-				break;
-			}
-			}
-
-			return true;
-		});
-
-		if (!pushed_to_data)
-		{
-			// Insert the pending value in special storage for waiting SPUs, leave no time in which the channel has data
-			if (!jostling_value.compare_and_swap_test(jostling_flag, value))
-			{
-				// Other thread has inserted a value through jostling_value, retry
-				continue;
-			}
-		}
-
-		if (old.waiting & bit_wait)
-		{
-			// Turn off waiting bit manually (must succeed because waiting bit can only be resetted by the thread pushing to jostling_value)
-			if (~atomic_storage<u8>::exchange(values.raw().waiting, 0) & bit_wait)
-			{
-				// Could be fatal or at emulation stopping, to be checked by the caller
-				return { old.count, old.count, false, false };
-			}
-
-			if (!postpone_notify)
-			{
-				utils::bless<atomic_t<u32>>(&values)[0].notify_one();
-			}
-		}
-
-		return { old.count, std::min<u8>(static_cast<u8>(old.count + 1), 4), !!(old.waiting & bit_wait), true };
-	}
-}
-
 template <>
 void fmt_class_string<spu_channel>::format(std::string& out, u64 arg)
 {
@@ -7899,48 +4867,9 @@ void fmt_class_string<spu_channel_4_t>::format(std::string& out, u64 arg)
 {
 	const auto& ch = get_object(arg);
 
-	u32 vals[4]{};
-	const uint count = ch.try_read(vals);
-
-	if (count == 0u)
-	{
-		out += "empty\n\n";
-		return;
-	}
-
-	fmt::append(out, "data:");
-
-	if (count > 1u)
-	{
-		out += '\n';
-	}
-	else
-	{
-		out += ' ';
-	}
-
-	out += "{ ";
-
-	for (u32 i = 0; i < count;)
-	{
-		fmt::append(out, "0x%x", vals[i]);
-
-		if (++i != count)
-		{
-			out += ", ";
-		}
-	}
-
-	out += " }\n";
-
-	if (count <= 1u)
-	{
-		// Keep the amount of lines consistent
-		out += '\n';
-	}
+	// TODO (use try_read)
+	fmt::append(out, "count = %d", ch.get_count());
 }
 
 DECLARE(spu_thread::g_raw_spu_ctr){};
 DECLARE(spu_thread::g_raw_spu_id){};
-DECLARE(spu_thread::g_spu_work_count){};
-DECLARE(spu_thread::g_spu_waiters_by_value){};
diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h
index 5a0d9bab31..d104626cbe 100644
--- a/rpcs3/Emu/Cell/SPUThread.h
+++ b/rpcs3/Emu/Cell/SPUThread.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "Emu/CPU/CPUThread.h"
-#include "Emu/CPU/Hypervisor.h"
 #include "Emu/Cell/SPUInterpreter.h"
 #include "Emu/Memory/vm.h"
 #include "MFC.h"
@@ -10,12 +9,6 @@
 #include "util/logs.hpp"
 #include "util/to_endian.hpp"
 
-#include "Utilities/mutex.h"
-
-#include "Loader/ELF.h"
-
-#include <span>
-
 LOG_CHANNEL(spu_log, "SPU");
 
 struct lv2_event_queue;
@@ -27,12 +20,6 @@ namespace utils
 	class shm;
 }
 
-// LUTs for SPU
-extern const u32 spu_frest_fraction_lut[32];
-extern const u32 spu_frest_exponent_lut[256];
-extern const u32 spu_frsqest_fraction_lut[64];
-extern const u32 spu_frsqest_exponent_lut[256];
-
 // JIT Block
 using spu_function_t = void(*)(spu_thread&, void*, u8*);
 
@@ -95,7 +82,8 @@ enum : u32
 
 	SPU_EVENT_IMPLEMENTED  = SPU_EVENT_LR | SPU_EVENT_TM | SPU_EVENT_SN | SPU_EVENT_S1 | SPU_EVENT_S2, // Mask of implemented events
 	SPU_EVENT_INTR_IMPLEMENTED = SPU_EVENT_SN,
-	SPU_EVENT_INTR_BUSY_CHECK = SPU_EVENT_IMPLEMENTED & ~SPU_EVENT_INTR_IMPLEMENTED,
+
+	SPU_EVENT_INTR_TEST = SPU_EVENT_INTR_IMPLEMENTED,
 };
 
 // SPU Class 0 Interrupts
@@ -179,29 +167,16 @@ enum : u32
 	SPU_FAKE_BASE_ADDR  = 0xE8000000,
 };
 
-struct spu_channel_op_state
-{
-	u8 old_count;
-	u8 count;
-	bool notify;
-	bool op_done;
-};
-
-struct alignas(16) spu_channel
+struct spu_channel
 {
 	// Low 32 bits contain value
-	atomic_t<u64> data{};
-
-	// Pending value to be inserted when it is possible in pop() or pop_wait()
-	atomic_t<u64> jostling_value{};
+	atomic_t<u64> data;
 
 public:
-	static constexpr u32 off_wait  = 32;
-	static constexpr u32 off_occupy = 32;
-	static constexpr u32 off_count = 63;
-	static constexpr u64 bit_wait  = 1ull << off_wait;
-	static constexpr u64 bit_occupy = 1ull << off_occupy;
-	static constexpr u64 bit_count = 1ull << off_count;
+	static const u32 off_wait = 32;
+	static const u32 off_count = 63;
+	static const u64 bit_wait = 1ull << off_wait;
+	static const u64 bit_count = 1ull << off_count;
 
 	// Returns true on success
 	bool try_push(u32 value)
@@ -218,71 +193,45 @@ public:
 		}).second;
 	}
 
-	// Push unconditionally, may require notification
-	// Performing bitwise OR with previous value if specified, otherwise overwiting it
-	// Returns old count and new count
-	spu_channel_op_state push(u32 value, bool to_or = false, bool postpone_notify = false)
+	// Push performing bitwise OR with previous value, may require notification
+	bool push_or(u32 value)
 	{
-		while (true)
+		const u64 old = data.fetch_op([value](u64& data)
 		{
-			const auto [old, pushed_to_data] = data.fetch_op([&](u64& data)
-			{
-				if (data & bit_occupy)
-				{
-					return false;
-				}
+			data &= ~bit_wait;
+			data |= bit_count | value;
+		});
 
-				if (to_or)
-				{
-					data = bit_count | (static_cast<u32>(data) | value);
-				}
-				else
-				{
-					data = bit_count | value;
-				}
-
-				return true;
-			});
-
-			if (!pushed_to_data)
-			{
-				// Insert the pending value in special storage for waiting SPUs, leave no time in which the channel has data
-				if (!jostling_value.compare_and_swap_test(bit_occupy, value))
-				{
-					// Other thread has inserted a value through jostling_value, retry
-					continue;
-				}
-			}
-
-			if (old & bit_wait)
-			{
-				// Turn off waiting bit manually (must succeed because waiting bit can only be resetted by the thread pushed to jostling_value)
-				if (!this->data.bit_test_reset(off_wait))
-				{
-					// Could be fatal or at emulation stopping, to be checked by the caller
-					return { (old & bit_count) == 0, 0, false, false };
-				}
-
-				if (!postpone_notify)
-				{
-					utils::bless<atomic_t<u32>>(&data)[1].notify_one();
-				}
-			}
-
-			// Return true if count has changed from 0 to 1, this condition is considered satisfied even if we pushed a value directly to the special storage for waiting SPUs
-			return { (old & bit_count) == 0, 1, (old & bit_wait) != 0, true };
+		if (old & bit_wait)
+		{
+			data.notify_one();
 		}
+
+		return (old & bit_count) == 0;
 	}
 
-	void notify()
+	bool push_and(u32 value)
 	{
-		utils::bless<atomic_t<u32>>(&data)[1].notify_one();
+		return (data.fetch_and(~u64{value}) & value) != 0;
+	}
+
+	// Push unconditionally (overwriting previous value), may require notification
+	bool push(u32 value)
+	{
+		const u64 old = data.exchange(bit_count | value);
+
+		if (old & bit_wait)
+		{
+			data.notify_one();
+		}
+
+		return (old & bit_count) == 0;
 	}
 
 	// Returns true on success
 	bool try_pop(u32& out)
 	{
-		return data.fetch_op([&out](u64& data)
+		return data.fetch_op([&](u64& data)
 		{
 			if (data & bit_count) [[likely]]
 			{
@@ -299,10 +248,10 @@ public:
 	bool try_read(u32& out) const
 	{
 		const u64 old = data.load();
-		out = static_cast<u32>(old);
 
 		if (old & bit_count) [[likely]]
 		{
+			out = static_cast<u32>(old);
 			return true;
 		}
 
@@ -310,37 +259,94 @@ public:
 	}
 
 	// Pop unconditionally (loading last value), may require notification
-	// If the SPU tries to insert a value, do it instead the SPU
 	u32 pop()
 	{
 		// Value is not cleared and may be read again
-		constexpr u64 mask = bit_count | bit_occupy;
-
-		const u64 old = data.fetch_op([&](u64& data)
-		{
-			if ((data & mask) == mask)
-			{
-				// Insert the pending value, leave no time in which the channel has no data
-				data = bit_count | static_cast<u32>(jostling_value);
-				return;
-			}
-
-			data &= ~(mask | bit_wait);
-		});
+		const u64 old = data.fetch_and(~(bit_count | bit_wait));
 
 		if (old & bit_wait)
 		{
-			utils::bless<atomic_t<u32>>(&data)[1].notify_one();
+			data.notify_one();
 		}
 
 		return static_cast<u32>(old);
 	}
 
 	// Waiting for channel pop state availability, actually popping if specified
-	s64 pop_wait(cpu_thread& spu, bool pop = true);
+	s64 pop_wait(cpu_thread& spu, bool pop = true)
+	{
+		while (true)
+		{
+			const u64 old = data.fetch_op([&](u64& data)
+			{
+				if (data & bit_count) [[likely]]
+				{
+					if (pop)
+					{
+						data = 0;
+						return true;
+					}
+
+					return false;
+				}
+
+				data = bit_wait;
+				return true;
+			}).first;
+
+			if (old & bit_count)
+			{
+				return static_cast<u32>(old);
+			}
+
+			if (spu.is_stopped())
+			{
+				return -1;
+			}
+
+			thread_ctrl::wait_on(data, bit_wait);
+		}
+	}
 
 	// Waiting for channel push state availability, actually pushing if specified
-	bool push_wait(cpu_thread& spu, u32 value, bool push = true);
+	bool push_wait(cpu_thread& spu, u32 value, bool push = true)
+	{
+		while (true)
+		{
+			u64 state;
+			data.fetch_op([&](u64& data)
+			{
+				if (data & bit_count) [[unlikely]]
+				{
+					data |= bit_wait;
+				}
+				else if (push)
+				{
+					data = bit_count | value;
+				}
+				else
+				{
+					state = data;
+					return false;
+				}
+
+				state = data;
+				return true;
+			});
+
+			if (!(state & bit_wait))
+			{
+				return true;
+			}
+
+			if (spu.is_stopped())
+			{
+				return false;
+			}
+
+			thread_ctrl::wait_on(data, state);
+		}
+	}
 
 	void set_value(u32 value, bool count = true)
 	{
@@ -354,7 +360,7 @@ public:
 
 	u32 get_count() const
 	{
-		return (data & bit_count) ? 1 : 0;
+		return static_cast<u32>(data >> off_count);
 	}
 };
 
@@ -364,36 +370,48 @@ struct spu_channel_4_t
 	{
 		u8 waiting;
 		u8 count;
-		u16 value3_inval;
+		u8 _pad[2];
 		u32 value0;
 		u32 value1;
 		u32 value2;
 	};
 
 	atomic_t<sync_var_t> values;
-	atomic_t<u64> jostling_value;
 	atomic_t<u32> value3;
 
-	static constexpr u32 off_wait  = 0;
-	static constexpr u32 off_occupy = 7;
-	static constexpr u64 bit_wait  = 1ull << off_wait;
-	static constexpr u64 bit_occupy = 1ull << off_occupy;
-	static constexpr u64 jostling_flag = 1ull << 63;
-
+public:
 	void clear()
 	{
 		values.release({});
-		jostling_value.release(0);
-		value3.release(0);
 	}
 
 	// push unconditionally (overwriting latest value), returns true if needs signaling
-	// returning if could be aborted (operation failed unexpectedly)
-	spu_channel_op_state push(u32 value, bool postpone_notify = false);
-
-	void notify()
+	void push(cpu_thread& spu, u32 value)
 	{
-		utils::bless<atomic_t<u32>>(&values)[0].notify_one();
+		value3.release(value);
+
+		if (values.atomic_op([value](sync_var_t& data) -> bool
+		{
+			switch (data.count++)
+			{
+			case 0: data.value0 = value; break;
+			case 1: data.value1 = value; break;
+			case 2: data.value2 = value; break;
+			default: data.count = 4;
+			}
+
+			if (data.waiting)
+			{
+				data.waiting = 0;
+
+				return true;
+			}
+
+			return false;
+		}))
+		{
+			spu.notify();
+		}
 	}
 
 	// returns non-zero value on success: queue size before removal
@@ -413,14 +431,15 @@ struct spu_channel_4_t
 				data.value1 = data.value2;
 				data.value2 = this->value3;
 			}
+			else
+			{
+				data.waiting = 1;
+			}
 
 			return result;
 		});
 	}
 
-	// Returns [previous count, value] (if aborted 0 count is returned)
-	std::pair<u32, u32> pop_wait(cpu_thread& spu, bool pop_value = true);
-
 	// returns current queue size without modification
 	uint try_read(u32 (&out)[4]) const
 	{
@@ -440,7 +459,7 @@ struct spu_channel_4_t
 
 	u32 get_count() const
 	{
-		return atomic_storage<u8>::load(std::as_const(values).raw().count);
+		return std::as_const(values).raw().count;
 	}
 
 	void set_values(u32 count, u32 value0, u32 value1 = 0, u32 value2 = 0, u32 value3 = 0)
@@ -455,7 +474,7 @@ struct spu_int_ctrl_t
 	atomic_t<u64> mask;
 	atomic_t<u64> stat;
 
-	shared_ptr<struct lv2_int_tag> tag;
+	std::shared_ptr<struct lv2_int_tag> tag;
 
 	void set(u64 ints);
 
@@ -485,9 +504,9 @@ struct spu_imm_table_t
 	public:
 		scale_table_t();
 
-		FORCE_INLINE const v128& operator [](s32 scale) const
+		FORCE_INLINE const auto& operator [](s32 scale) const
 		{
-			return m_data[scale + 155];
+			return m_data[scale + 155].vf;
 		}
 	}
 	const scale;
@@ -516,7 +535,7 @@ enum FPSCR_EX
 class SPU_FPSCR
 {
 public:
-	u32 _u32[4]{};
+	u32 _u32[4];
 
 	SPU_FPSCR() {}
 
@@ -529,7 +548,6 @@ public:
 	{
 		memset(this, 0, sizeof(*this));
 	}
-
 	//slice -> 0 - 1 (double-precision slice index)
 	//NOTE: slices follow v128 indexing, i.e. slice 0 is RIGHT end of register!
 	//roundTo -> FPSCR_RN_*
@@ -539,7 +557,6 @@ public:
 		//rounding is located in the left end of the FPSCR
 		this->_u32[3] = (this->_u32[3] & ~(3 << shift)) | (roundTo << shift);
 	}
-
 	//Slice 0 or 1
 	u8 checkSliceRounding(u8 slice) const
 	{
@@ -576,11 +593,11 @@ public:
 	//exception: FPSCR_D* bitmask
 	void setDoublePrecisionExceptionFlags(u8 slice, u32 exceptions)
 	{
-		_u32[1 + slice] |= exceptions;
+		_u32[1+slice] |= exceptions;
 	}
 
 	// Write the FPSCR
-	void Write(const v128& r)
+	void Write(const v128 & r)
 	{
 		_u32[3] = r._u32[3] & 0x00000F07;
 		_u32[2] = r._u32[2] & 0x00003F07;
@@ -589,7 +606,7 @@ public:
 	}
 
 	// Read the FPSCR
-	void Read(v128& r) const
+	void Read(v128 & r)
 	{
 		r._u32[3] = _u32[3];
 		r._u32[2] = _u32[2];
@@ -605,40 +622,18 @@ enum class spu_type : u32
 	isolated,
 };
 
-struct spu_memory_segment_dump_data
-{
-	u32 ls_addr;
-	const u8* src_addr;
-	u32 segment_size;
-	u32 flags = umax;
-};
-
-enum class spu_debugger_mode : u32
-{
-	_default,
-	is_float,
-	is_decimal,
-
-	max_mode,
-};
-
-enum class spu_block_hash : u64 {};
-
 class spu_thread : public cpu_thread
 {
 public:
-	virtual void dump_regs(std::string&, std::any& custom_data) const override;
+	virtual std::string dump_regs() const override;
 	virtual std::string dump_callstack() const override;
 	virtual std::vector<std::pair<u32, u32>> dump_callstack_list() const override;
 	virtual std::string dump_misc() const override;
 	virtual void cpu_task() override final;
-	virtual void cpu_on_stop() override;
 	virtual void cpu_return() override;
-	virtual void cpu_work() override;
 	virtual ~spu_thread() override;
 	void cleanup();
 	void cpu_init();
-	void init_spu_decoder();
 
 	static const u32 id_base = 0x02000000; // TODO (used to determine thread type)
 	static const u32 id_step = 1;
@@ -651,13 +646,6 @@ public:
 
 	using cpu_thread::operator=;
 
-	SAVESTATE_INIT_POS(5);
-
-	spu_thread(utils::serial& ar, lv2_spu_group* group = nullptr);
-	void serialize_common(utils::serial& ar);
-	void save(utils::serial& ar);
-	bool savable() const { return get_type() != spu_type::threaded; } // Threaded SPUs are saved as part of the SPU group
-
 	u32 pc = 0;
 	u32 dbg_step_pc = 0;
 
@@ -666,15 +654,13 @@ public:
 
 	// May be used by recompilers.
 	u8* memory_base_addr = vm::g_base_addr;
-	u8* memory_sudo_addr = vm::g_sudo_addr;
-	u8* reserv_base_addr = vm::g_reservations;
 
 	// General-Purpose Registers
-	std::array<v128, 128> gpr{};
-	SPU_FPSCR fpscr{};
+	std::array<v128, 128> gpr;
+	SPU_FPSCR fpscr;
 
 	// MFC command data
-	spu_mfc_cmd ch_mfc_cmd{};
+	spu_mfc_cmd ch_mfc_cmd;
 
 	// MFC command queue
 	spu_mfc_cmd mfc_queue[16]{};
@@ -682,13 +668,10 @@ public:
 	u32 mfc_barrier = -1;
 	u32 mfc_fence = -1;
 
-	// Timestamp of the first postponed command (transfers shuffling related)
-	u64 mfc_last_timestamp = 0;
-
 	// MFC proxy command data
-	spu_mfc_cmd mfc_prxy_cmd{};
+	spu_mfc_cmd mfc_prxy_cmd;
 	shared_mutex mfc_prxy_mtx;
-	atomic_t<u32> mfc_prxy_mask = 0;
+	atomic_t<u32> mfc_prxy_mask;
 
 	// Tracks writes to MFC proxy command data
 	union
@@ -705,16 +688,15 @@ public:
 	u64 rtime = 0;
 	alignas(64) std::byte rdata[128]{};
 	u32 raddr = 0;
-	const decltype(rdata)* resrv_mem{};
 
 	// Range Lock pointer
 	atomic_t<u64, 64>* range_lock{};
 
-	u32 srr0 = 0;
-	u32 ch_tag_upd = 0;
-	u32 ch_tag_mask = 0;
+	u32 srr0;
+	u32 ch_tag_upd;
+	u32 ch_tag_mask;
 	spu_channel ch_tag_stat;
-	u32 ch_stall_mask = 0;
+	u32 ch_stall_mask;
 	spu_channel ch_stall_stat;
 	spu_channel ch_atomic_stat;
 
@@ -739,14 +721,12 @@ public:
 	};
 
 	atomic_t<ch_events_t> ch_events;
-	bool interrupts_enabled = false;
+	bool interrupts_enabled;
 
-	u64 ch_dec_start_timestamp = 0; // timestamp of writing decrementer value
-	u32 ch_dec_value = 0; // written decrementer value
-	bool is_dec_frozen = false;
-	std::pair<u32, u32> read_dec() const; // Read decrementer
+	u64 ch_dec_start_timestamp; // timestamp of writing decrementer value
+	u32 ch_dec_value; // written decrementer value
 
-	atomic_t<u32> run_ctrl = 0; // SPU Run Control register (only provided to get latest data written)
+	atomic_t<u32> run_ctrl; // SPU Run Control register (only provided to get latest data written)
 	shared_mutex run_ctrl_mtx;
 
 	struct alignas(8) status_npc_sync_var
@@ -755,29 +735,20 @@ public:
 		u32 npc; // SPU Next Program Counter register
 	};
 
-	atomic_t<status_npc_sync_var> status_npc{};
-	std::array<spu_int_ctrl_t, 3> int_ctrl{}; // SPU Class 0, 1, 2 Interrupt Management
+	atomic_t<status_npc_sync_var> status_npc;
+	std::array<spu_int_ctrl_t, 3> int_ctrl; // SPU Class 0, 1, 2 Interrupt Management
 
-	std::array<std::pair<u32, shared_ptr<lv2_event_queue>>, 32> spuq{}; // Event Queue Keys for SPU Thread
-	shared_ptr<lv2_event_queue> spup[64]; // SPU Ports
+	std::array<std::pair<u32, std::shared_ptr<lv2_event_queue>>, 32> spuq; // Event Queue Keys for SPU Thread
+	std::shared_ptr<lv2_event_queue> spup[64]; // SPU Ports
 	spu_channel exit_status{}; // Threaded SPU exit status (not a channel, but the interface fits)
 	atomic_t<u32> last_exit_status; // Value to be written in exit_status after checking group termination
 	lv2_spu_group* const group; // SPU Thread Group (access by the spu threads in the group only! From other threads obtain a shared pointer to group using group ID)
 	const u32 index; // SPU index
-	const spu_type thread_type;
 	std::shared_ptr<utils::shm> shm; // SPU memory
 	const std::add_pointer_t<u8> ls; // SPU LS pointer
+	const spu_type thread_type;
 	const u32 option; // sys_spu_thread_initialize option
 	const u32 lv2_id; // The actual id that is used by syscalls
-	u32 spurs_addr = 0;
-	bool spurs_waited = false;
-	bool spurs_entered_wait = false;
-	u64 spurs_wait_duration_last = 0;
-	u64 spurs_average_task_duration = 0;
-	u64 spurs_last_task_timestamp = 0;
-	static constexpr u64 spurs_task_count_to_calculate = 10;
-
-	spu_thread* next_cpu{}; // LV2 thread queues' node link
 
 	// Thread name
 	atomic_ptr<std::string> spu_tname;
@@ -788,7 +759,7 @@ public:
 	u64 block_recover = 0;
 	u64 block_failure = 0;
 
-	rpcs3::hypervisor_context_t hv_ctx; // NOTE: The offset within the class must be within the first 1MiB
+	u64 saved_native_sp = 0; // Host thread's stack pointer for emulated longjmp
 
 	u64 ftx = 0; // Failed transactions
 	u64 stx = 0; // Succeeded transactions (pure counters)
@@ -798,64 +769,33 @@ public:
 	u32 last_faddr = 0;
 	u64 last_fail = 0;
 	u64 last_succ = 0;
-	u64 last_gtsc = 0;
-	u32 last_getllar = umax; // LS address of last GETLLAR (if matches current GETLLAR we can let the thread rest)
-	u32 last_getllar_gpr1 = umax;
-	u32 last_getllar_addr = umax;
-	u32 last_getllar_lsa = umax;
-	u32 getllar_spin_count = 0;
-	u32 getllar_busy_waiting_switch = umax; // umax means the test needs evaluation, otherwise it's a boolean
-	u64 getllar_evaluate_time = 0;
-
-	u32 eventstat_raddr = 0;
-	u32 eventstat_getllar = 0;
-	u64 eventstat_block_counter = 0;
-	u64 eventstat_spu_group_restart = 0;
-	u64 eventstat_spin_count = 0;
-	u64 eventstat_evaluate_time = 0;
-	u32 eventstat_busy_waiting_switch = 0;
 
 	std::vector<mfc_cmd_dump> mfc_history;
 	u64 mfc_dump_idx = 0;
-	static constexpr u32 max_mfc_dump_idx = 4096;
-
-	bool in_cpu_work = false;
-	bool allow_interrupts_in_cpu_work = false;
-	u8 cpu_work_iteration_count = 0;
+	static constexpr u32 max_mfc_dump_idx = 2048;
 
 	std::array<v128, 0x4000> stack_mirror; // Return address information
 
 	const char* current_func{}; // Current STOP or RDCH blocking function
 	u64 start_time{}; // Starting time of STOP or RDCH bloking function
-	bool unsavable = false; // Flag indicating whether saving the spu thread state is currently unsafe
 
-	atomic_t<spu_debugger_mode> debugger_mode{};
+	atomic_t<u8> debugger_float_mode = 0;
 
-	// PC-based breakpoint list
-	std::array<atomic_t<u8>, SPU_LS_SIZE / 4 / 8> local_breakpoints{};
-	atomic_t<bool> has_active_local_bps = false;
-	u32 current_bp_pc = umax;
-	bool stop_flag_removal_protection = false;
-
-	std::array<std::array<u8, 4>, SPU_LS_SIZE / 128> getllar_wait_time{};
-	std::array<std::array<u8, 16>, SPU_LS_SIZE / 128> eventstat_wait_time{};
- 
 	void push_snr(u32 number, u32 value);
 	static void do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8* ls);
 	bool do_dma_check(const spu_mfc_cmd& args);
 	bool do_list_transfer(spu_mfc_cmd& args);
 	void do_putlluc(const spu_mfc_cmd& args);
 	bool do_putllc(const spu_mfc_cmd& args);
-	bool do_mfc(bool can_escape = true, bool must_finish = true);
+	void do_mfc(bool wait = true);
 	u32 get_mfc_completed() const;
 
 	bool process_mfc_cmd();
-	ch_events_t get_events(u64 mask_hint = umax, bool waiting = false, bool reading = false);
+	ch_events_t get_events(u32 mask_hint = -1, bool waiting = false, bool reading = false);
 	void set_events(u32 bits);
 	void set_interrupt_status(bool enable);
 	bool check_mfc_interrupts(u32 next_pc);
-	static bool is_exec_code(u32 addr, std::span<const u8> ls_ptr, u32 base_addr = 0, bool avoid_dead_code = false, bool is_range_limited = false); // A hint, do not rely on it for true execution compatibility
-	static std::vector<u32> discover_functions(u32 base_addr, std::span<const u8> ls, bool is_known_addr, u32 /*entry*/);
+	bool is_exec_code(u32 addr) const; // Only a hint, do not rely on it other than debugging purposes
 	u32 get_ch_count(u32 ch);
 	s64 get_ch_value(u32 ch);
 	bool set_ch_value(u32 ch, u32 value);
@@ -864,13 +804,7 @@ public:
 
 	void fast_call(u32 ls_addr);
 
-	std::array<std::shared_ptr<utils::serial>, 32> rewind_captures; // shared_ptr to avoid header inclusion
-	u8 current_rewind_capture_idx = 0;
-
-	static spu_exec_object capture_memory_as_elf(std::span<spu_memory_segment_dump_data> segs, u32 pc_hint = umax);
-	bool capture_state();
-	bool try_load_debug_capture();
-	void wakeup_delay(u32 div = 1) const;
+	bool capture_local_storage() const;
 
 	// Convert specified SPU LS address to a pointer of specified (possibly converted to BE) type
 	template<typename T>
@@ -896,24 +830,15 @@ public:
 		return group ? SPU_FAKE_BASE_ADDR + SPU_LS_SIZE * (id & 0xffffff) : RAW_SPU_BASE_ADDR + RAW_SPU_OFFSET * index;
 	}
 
-	static u8* map_ls(utils::shm& shm, void* ptr = nullptr);
-
 	// Returns true if reservation existed but was just discovered to be lost
 	// It is safe to use on any address, even if not directly accessed by SPU (so it's slower)
 	bool reservation_check(u32 addr, const decltype(rdata)& data) const;
-	static bool reservation_check(u32 addr, u32 hash, atomic_t<u64, 64>* range_lock);
-	usz register_cache_line_waiter(u32 addr);
-	void deregister_cache_line_waiter(usz index);
 
 	bool read_reg(const u32 addr, u32& value);
 	bool write_reg(const u32 addr, const u32 value);
-	static bool test_is_problem_state_register_offset(u32 offset, bool for_read, bool for_write) noexcept;
 
 	static atomic_t<u32> g_raw_spu_ctr;
 	static atomic_t<u32> g_raw_spu_id[5];
-	static atomic_t<u32> g_spu_work_count;
-
-	static atomic_t<u64> g_spu_waiters_by_value[6];
 
 	static u32 find_raw_spu(u32 id)
 	{
@@ -933,25 +858,12 @@ public:
 		operator std::string() const;
 	} thread_name{ this };
 
-	union spu_prio_t
-	{
-		u64 all;
-		bf_t<s64, 0, 9> prio; // Thread priority (0..3071) (firs 9-bits)
-		bf_t<s64, 9, 55> order; // Thread enqueue order (TODO, last 52-bits)
-	};
-
 	// For lv2_obj::schedule<spu_thread>
-	struct priority_t
+	const struct priority_t
 	{
 		const spu_thread* _this;
 
-		spu_prio_t load() const;
-
-		template <typename Func>
-		auto atomic_op(Func&& func)
-		{
-			return static_cast<std::conditional_t<std::is_void_v<Func>, Func, decltype(_this->group)>>(_this->group)->prio.atomic_op(std::move(func));
-		}
+		operator s32() const;
 	} prio{ this };
 };
 
@@ -960,13 +872,10 @@ class spu_function_logger
 	spu_thread& spu;
 
 public:
-	spu_function_logger(spu_thread& spu, const char* func) noexcept;
+	spu_function_logger(spu_thread& spu, const char* func);
 
-	~spu_function_logger() noexcept
+	~spu_function_logger()
 	{
-		if (!spu.is_stopped())
-		{
-			spu.start_time = 0;
-		}
+		spu.start_time = 0;
 	}
 };
diff --git a/rpcs3/Emu/Cell/lv2/lv2.cpp b/rpcs3/Emu/Cell/lv2/lv2.cpp
index 8d4db2bc91..fef4509ea4 100644
--- a/rpcs3/Emu/Cell/lv2/lv2.cpp
+++ b/rpcs3/Emu/Cell/lv2/lv2.cpp
@@ -1,14 +1,11 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/system_config.h"
 #include "Emu/Memory/vm_ptr.h"
-#include "Emu/Memory/vm_reservation.h"
 #include "Emu/Memory/vm_locking.h"
 
 #include "Emu/Cell/PPUFunction.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/Cell/SPUThread.h"
 #include "Emu/Cell/ErrorCodes.h"
+#include "Emu/Cell/MFC.h"
 #include "sys_sync.h"
 #include "sys_lwmutex.h"
 #include "sys_lwcond.h"
@@ -16,7 +13,6 @@
 #include "sys_cond.h"
 #include "sys_event.h"
 #include "sys_event_flag.h"
-#include "sys_game.h"
 #include "sys_interrupt.h"
 #include "sys_memory.h"
 #include "sys_mmapper.h"
@@ -52,34 +48,10 @@
 #include "sys_uart.h"
 #include "sys_crypto_engine.h"
 
-#include <algorithm>
 #include <optional>
-#include <deque>
-#include <thread>
-#include "util/tsc.hpp"
-#include "util/sysinfo.hpp"
-#include "util/init_mutex.hpp"
-
-#if defined(ARCH_X64)
-#ifdef _MSC_VER
-#include <intrin.h>
-#include <immintrin.h>
-#else
-#include <x86intrin.h>
-#endif
-#endif
-
 
 extern std::string ppu_get_syscall_name(u64 code);
 
-namespace rsx
-{
-	void set_rsx_yield_flag() noexcept;
-}
-
-using spu_rdata_t = decltype(spu_thread::rdata);
-extern u32 compute_rdata_hash32(const spu_rdata_t& _src);
-
 template <>
 void fmt_class_string<ppu_syscall_code>::format(std::string& out, u64 arg)
 {
@@ -103,34 +75,30 @@ void fmt_class_string<lv2_protocol>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
-void fmt_class_string<lv2_obj::name_64>::format(std::string& out, u64 arg)
-{
-	out += lv2_obj::name64(get_object(arg).data);
-}
-
-static void null_func_(ppu_thread& ppu, ppu_opcode_t, be_t<u32>* this_op, ppu_intrp_func*)
+static bool null_func_(ppu_thread& ppu)
 {
 	ppu_log.todo("Unimplemented syscall %s -> CELL_OK (r3=0x%llx, r4=0x%llx, r5=0x%llx, r6=0x%llx, r7=0x%llx, r8=0x%llx, r9=0x%llx, r10=0x%llx)", ppu_syscall_code(ppu.gpr[11]),
 		ppu.gpr[3], ppu.gpr[4], ppu.gpr[5], ppu.gpr[6], ppu.gpr[7], ppu.gpr[8], ppu.gpr[9], ppu.gpr[10]);
 
 	ppu.gpr[3] = 0;
-	ppu.cia = vm::get_addr(this_op) + 4;
+	ppu.cia += 4;
+	return false;
 }
 
-static void uns_func_(ppu_thread& ppu, ppu_opcode_t, be_t<u32>* this_op, ppu_intrp_func*)
+static bool uns_func_(ppu_thread& ppu)
 {
 	ppu_log.trace("Unused syscall %d -> ENOSYS", ppu.gpr[11]);
 	ppu.gpr[3] = CELL_ENOSYS;
-	ppu.cia = vm::get_addr(this_op) + 4;
+	ppu.cia += 4;
+	return false;
 }
 
 // Bind Syscall
 #define BIND_SYSC(func) {BIND_FUNC(func), #func}
 #define NULL_FUNC(name) {null_func_, #name}
 
-constexpr std::pair<ppu_intrp_func_t, std::string_view> null_func{null_func_, ""};
-constexpr std::pair<ppu_intrp_func_t, std::string_view> uns_func{uns_func_, ""};
+constexpr std::pair<ppu_function_t, std::string_view> null_func{null_func_, ""};
+constexpr std::pair<ppu_function_t, std::string_view> uns_func{uns_func_, ""};
 
 // UNS = Unused
 // ROOT = Root
@@ -138,12 +106,12 @@ constexpr std::pair<ppu_intrp_func_t, std::string_view> uns_func{uns_func_, ""};
 // DEX..DECR = Unavailable on retail consoles
 // PM = Product Mode
 // AuthID = Authentication ID
-const std::array<std::pair<ppu_intrp_func_t, std::string_view>, 1024> g_ppu_syscall_table
+const std::array<std::pair<ppu_function_t, std::string_view>, 1024> g_ppu_syscall_table
 {
 	null_func,
 	BIND_SYSC(sys_process_getpid),                          //1   (0x001)
 	BIND_SYSC(sys_process_wait_for_child),                  //2   (0x002)  ROOT
-	BIND_SYSC(sys_process_exit3),                           //3   (0x003)
+	null_func,                                              //3   (0x003)
 	BIND_SYSC(sys_process_get_status),                      //4   (0x004)  DBG
 	BIND_SYSC(sys_process_detach_child),                    //5   (0x005)  DBG
 
@@ -274,13 +242,13 @@ const std::array<std::pair<ppu_intrp_func_t, std::string_view>, 1024> g_ppu_sysc
 	BIND_SYSC(sys_event_port_connect_ipc),                  //140 (0x08C)
 	BIND_SYSC(sys_timer_usleep),                            //141 (0x08D)
 	BIND_SYSC(sys_timer_sleep),                             //142 (0x08E)
-	BIND_SYSC(sys_time_set_timezone),                       //143 (0x08F)  ROOT
+	NULL_FUNC(sys_time_set_timezone),                       //143 (0x08F)  ROOT
 	BIND_SYSC(sys_time_get_timezone),                       //144 (0x090)
 	BIND_SYSC(sys_time_get_current_time),                   //145 (0x091)
-	BIND_SYSC(sys_time_set_current_time),                   //146 (0x092)  ROOT
+	NULL_FUNC(sys_time_get_system_time),                    //146 (0x092)  ROOT
 	BIND_SYSC(sys_time_get_timebase_frequency),             //147 (0x093)
 	BIND_SYSC(_sys_rwlock_trywlock),                        //148 (0x094)
-	NULL_FUNC(sys_time_get_system_time),                    //149 (0x095)
+	uns_func,                                               //149 (0x095)  UNS
 	BIND_SYSC(sys_raw_spu_create_interrupt_tag),            //150 (0x096)
 	BIND_SYSC(sys_raw_spu_set_int_mask),                    //151 (0x097)
 	BIND_SYSC(sys_raw_spu_get_int_mask),                    //152 (0x098)
@@ -373,7 +341,7 @@ const std::array<std::pair<ppu_intrp_func_t, std::string_view>, 1024> g_ppu_sysc
 
 	uns_func, uns_func, uns_func, uns_func, uns_func,       //255-259  UNS
 
-	BIND_SYSC(sys_spu_image_open_by_fd),                    //260 (0x104)
+	NULL_FUNC(sys_spu_image_open_by_fd),                    //260 (0x104)
 
 	uns_func, uns_func, uns_func, uns_func, uns_func, uns_func, uns_func, uns_func, uns_func, //261-269  UNS
 	uns_func, uns_func, uns_func, uns_func, uns_func, uns_func, uns_func, uns_func, uns_func, uns_func, //270-279  UNS
@@ -420,7 +388,7 @@ const std::array<std::pair<ppu_intrp_func_t, std::string_view>, 1024> g_ppu_sysc
 	BIND_SYSC(sys_memory_container_destroy),                //342 (0x156)
 	BIND_SYSC(sys_memory_container_get_size),               //343 (0x157)
 	NULL_FUNC(sys_memory_budget_set),                       //344 (0x158)
-	BIND_SYSC(sys_memory_container_destroy_parent_with_childs), //345 (0x159)
+	null_func,//BIND_SYSC(sys_memory_...),                  //345 (0x159)
 	null_func,//BIND_SYSC(sys_memory_...),                  //346 (0x15A)
 	uns_func,                                               //347 (0x15B)  UNS
 	BIND_SYSC(sys_memory_allocate),                         //348 (0x15C)
@@ -446,12 +414,12 @@ const std::array<std::pair<ppu_intrp_func_t, std::string_view>, 1024> g_ppu_sysc
 	BIND_SYSC(sys_uart_send),                               //369 (0x171)  ROOT
 	BIND_SYSC(sys_uart_get_params),                         //370 (0x172)  ROOT
 	uns_func,                                               //371 (0x173)  UNS
-	BIND_SYSC(_sys_game_watchdog_start),                    //372 (0x174)
-	BIND_SYSC(_sys_game_watchdog_stop),                     //373 (0x175)
-	BIND_SYSC(_sys_game_watchdog_clear),                    //374 (0x176)
-	BIND_SYSC(_sys_game_set_system_sw_version),             //375 (0x177)  ROOT
-	BIND_SYSC(_sys_game_get_system_sw_version),             //376 (0x178)  ROOT
-	BIND_SYSC(sys_sm_set_shop_mode),                        //377 (0x179)  ROOT
+	NULL_FUNC(sys_game_watchdog_start),                     //372 (0x174)
+	NULL_FUNC(sys_game_watchdog_stop),                      //373 (0x175)
+	NULL_FUNC(sys_game_watchdog_clear),                     //374 (0x176)
+	NULL_FUNC(sys_game_set_system_sw_version),              //375 (0x177)  ROOT
+	NULL_FUNC(sys_game_get_system_sw_version),              //376 (0x178)  ROOT
+	NULL_FUNC(sys_sm_set_shop_mode),                        //377 (0x179)  ROOT
 	BIND_SYSC(sys_sm_get_ext_event2),                       //378 (0x17A)  ROOT
 	BIND_SYSC(sys_sm_shutdown),                             //379 (0x17B)  ROOT
 	BIND_SYSC(sys_sm_get_params),                           //380 (0x17C)  DBG
@@ -484,9 +452,9 @@ const std::array<std::pair<ppu_intrp_func_t, std::string_view>, 1024> g_ppu_sysc
 	null_func,//BIND_SYSC(sys_...),                         //407 (0x197)  PM
 	NULL_FUNC(sys_sm_get_tzpb),                             //408 (0x198)  PM
 	NULL_FUNC(sys_sm_get_fan_policy),                       //409 (0x199)  PM
-	BIND_SYSC(_sys_game_board_storage_read),                //410 (0x19A)
-	BIND_SYSC(_sys_game_board_storage_write),               //411 (0x19B)
-	BIND_SYSC(_sys_game_get_rtc_status),                    //412 (0x19C)
+	NULL_FUNC(sys_game_board_storage_read),                 //410 (0x19A)
+	NULL_FUNC(sys_game_board_storage_write),                //411 (0x19B)
+	NULL_FUNC(sys_game_get_rtc_status),                     //412 (0x19C)
 	null_func,//BIND_SYSC(sys_...),                         //413 (0x19D)  ROOT
 	null_func,//BIND_SYSC(sys_...),                         //414 (0x19E)  ROOT
 	null_func,//BIND_SYSC(sys_...),                         //415 (0x19F)  ROOT
@@ -601,7 +569,7 @@ const std::array<std::pair<ppu_intrp_func_t, std::string_view>, 1024> g_ppu_sysc
 	null_func,//BIND_SYSC(sys_usbd_...),                    //555 (0x22B)
 	BIND_SYSC(sys_usbd_get_device_speed),                   //556 (0x22C)
 	null_func,//BIND_SYSC(sys_usbd_...),                    //557 (0x22D)
-	BIND_SYSC(sys_usbd_unregister_extra_ldd),               //558 (0x22E)
+	null_func,//BIND_SYSC(sys_usbd_...),                    //558 (0x22E)
 	BIND_SYSC(sys_usbd_register_extra_ldd),                 //559 (0x22F)
 	null_func,//BIND_SYSC(sys_...),                         //560 (0x230)  ROOT
 	null_func,//BIND_SYSC(sys_...),                         //561 (0x231)  ROOT
@@ -698,12 +666,12 @@ const std::array<std::pair<ppu_intrp_func_t, std::string_view>, 1024> g_ppu_sysc
 	BIND_SYSC(sys_rsxaudio_finalize),                       //651 (0x28B)
 	BIND_SYSC(sys_rsxaudio_import_shared_memory),           //652 (0x28C)
 	BIND_SYSC(sys_rsxaudio_unimport_shared_memory),         //653 (0x28D)
-	BIND_SYSC(sys_rsxaudio_create_connection),              //654 (0x28E)
-	BIND_SYSC(sys_rsxaudio_close_connection),               //655 (0x28F)
-	BIND_SYSC(sys_rsxaudio_prepare_process),                //656 (0x290)
-	BIND_SYSC(sys_rsxaudio_start_process),                  //657 (0x291)
-	BIND_SYSC(sys_rsxaudio_stop_process),                   //658 (0x292)
-	BIND_SYSC(sys_rsxaudio_get_dma_param),                  //659 (0x293)
+	NULL_FUNC(sys_rsxaudio_create_connection),              //654 (0x28E)
+	NULL_FUNC(sys_rsxaudio_close_connection),               //655 (0x28F)
+	NULL_FUNC(sys_rsxaudio_prepare_process),                //656 (0x290)
+	NULL_FUNC(sys_rsxaudio_start_process),                  //657 (0x291)
+	NULL_FUNC(sys_rsxaudio_stop_process),                   //658 (0x292)
+	null_func, //BIND_SYSC(sys_rsxaudio_...),               //659 (0x293)
 
 	uns_func, uns_func, uns_func, uns_func, uns_func, uns_func, //660-665  UNS
 
@@ -814,9 +782,9 @@ const std::array<std::pair<ppu_intrp_func_t, std::string_view>, 1024> g_ppu_sysc
 	BIND_SYSC(sys_fs_symbolic_link),                        //833 (0x341)
 	BIND_SYSC(sys_fs_chmod),                                //834 (0x342)
 	BIND_SYSC(sys_fs_chown),                                //835 (0x343)
-	BIND_SYSC(sys_fs_newfs),                                //836 (0x344)
+	NULL_FUNC(sys_fs_newfs),                                //836 (0x344)
 	BIND_SYSC(sys_fs_mount),                                //837 (0x345)
-	BIND_SYSC(sys_fs_unmount),                              //838 (0x346)
+	NULL_FUNC(sys_fs_unmount),                              //838 (0x346)
 	NULL_FUNC(sys_fs_sync),                                 //839 (0x347)
 	BIND_SYSC(sys_fs_disk_free),                            //840 (0x348)
 	BIND_SYSC(sys_fs_get_mount_info_size),                  //841 (0x349)
@@ -968,83 +936,9 @@ const std::array<std::pair<ppu_intrp_func_t, std::string_view>, 1024> g_ppu_sysc
 #undef BIND_SYSC
 #undef NULL_FUNC
 
-// TODO: more enums
-enum CellAdecError : u32;
-enum CellAtracError : u32;
-enum CellAtracMultiError : u32;
-enum CellAudioError : u32;
-enum CellAudioOutError : u32;
-enum CellAudioInError : u32;
-
-enum CellVideoOutError : u32;
-
-enum CellSpursCoreError : u32;
-enum CellSpursPolicyModuleError : u32;
-enum CellSpursTaskError : u32;
-enum CellSpursJobError : u32;
-enum CellSyncError : u32;
-
-enum CellGameError : u32;
-enum CellGameDataError : u32;
-enum CellDiscGameError : u32;
-enum CellHddGameError : u32;
-
-enum SceNpTrophyError : u32;
-enum SceNpError : u32;
-
-template <u64 EnumMin, typename E>
-constexpr auto formatter_of = std::make_pair(EnumMin, &fmt_class_string<E>::format);
-
-const std::map<u64, void(*)(std::string&, u64)> s_error_codes_formatting_by_type
-{
-	formatter_of<0x80610000, CellAdecError>,
-	formatter_of<0x80612100, CellAdecError>,
-	formatter_of<0x80610300, CellAtracError>,
-	formatter_of<0x80610b00, CellAtracMultiError>,
-	formatter_of<0x80310700, CellAudioError>,
-	formatter_of<0x8002b240, CellAudioOutError>,
-	formatter_of<0x8002b260, CellAudioInError>,
-	formatter_of<0x8002b220, CellVideoOutError>,
-
-	formatter_of<0x80410100, CellSyncError>,
-	formatter_of<0x80410700, CellSpursCoreError>,
-	formatter_of<0x80410800, CellSpursPolicyModuleError>,
-	formatter_of<0x80410900, CellSpursTaskError>,
-	formatter_of<0x80410A00, CellSpursJobError>,
-
-	formatter_of<0x8002cb00, CellGameError>,
-	formatter_of<0x8002b600, CellGameDataError>,
-	formatter_of<0x8002bd00, CellDiscGameError>,
-	formatter_of<0x8002ba00, CellHddGameError>,
-
-	formatter_of<0x80022900, SceNpTrophyError>,
-	formatter_of<0x80029500, SceNpError>,
-};
-
 template<>
 void fmt_class_string<CellError>::format(std::string& out, u64 arg)
 {
-	// Test if can be formatted by this formatter
-	const bool lv2_cell_error = (arg >> 8) == 0x800100u;
-
-	if (!lv2_cell_error)
-	{
-		// Format by external enum formatters
-		auto upper = s_error_codes_formatting_by_type.upper_bound(arg);
-
-		if (upper == s_error_codes_formatting_by_type.begin())
-		{
-			// Format as unknown by another enum formatter
-			upper->second(out, arg);
-			return;
-		}
-
-		// Find the formatter whose base is the highest that is not more than arg
-		const auto found = std::prev(upper);
-		found->second(out, arg);
-		return;
-	}
-
 	format_enum(out, arg, [](auto error)
 	{
 		switch (error)
@@ -1117,82 +1011,25 @@ void fmt_class_string<CellError>::format(std::string& out, u64 arg)
 	});
 }
 
-stx::init_lock acquire_lock(stx::init_mutex& mtx, ppu_thread* ppu)
-{
-	if (!ppu)
-	{
-		ppu = ensure(cpu_thread::get_current<ppu_thread>());
-	}
-
-	return mtx.init([](int invoke_count, const stx::init_lock&, ppu_thread* ppu)
-	{
-		if (!invoke_count)
-		{
-			// Sleep before waiting on lock
-			lv2_obj::sleep(*ppu);
-		}
-		else
-		{
-			// Wake up after acquistion or failure to acquire
-			ppu->check_state();
-		}
-	}, ppu);
-}
-
-stx::access_lock acquire_access_lock(stx::init_mutex& mtx, ppu_thread* ppu)
-{
-	if (!ppu)
-	{
-		ppu = ensure(cpu_thread::get_current<ppu_thread>());
-	}
-
-	// TODO: Check if needs to wait
-	return mtx.access();
-}
-
-stx::reset_lock acquire_reset_lock(stx::init_mutex& mtx, ppu_thread* ppu)
-{
-	if (!ppu)
-	{
-		ppu = ensure(cpu_thread::get_current<ppu_thread>());
-	}
-
-	return mtx.reset([](int invoke_count, const stx::init_lock&, ppu_thread* ppu)
-	{
-		if (!invoke_count)
-		{
-			// Sleep before waiting on lock
-			lv2_obj::sleep(*ppu);
-		}
-		else
-		{
-			// Wake up after acquistion or failure to acquire
-			ppu->check_state();
-		}
-	}, ppu);
-}
-
 class ppu_syscall_usage
 {
 	// Internal buffer
 	std::string m_stats;
-	u64 m_old_stat[1024]{};
 
 public:
 	// Public info collection buffers
 	atomic_t<u64> stat[1024]{};
 
-	void print_stats(bool force_print) noexcept
+	void print_stats() noexcept
 	{
 		std::multimap<u64, u64, std::greater<u64>> usage;
 
 		for (u32 i = 0; i < 1024; i++)
 		{
-			if (u64 v = stat[i]; m_old_stat[i] != v || (force_print && v))
+			if (u64 v = stat[i])
 			{
-				// Only add syscalls with non-zero usage counter and only if caught new calls since last print
+				// Only add syscalls with non-zero usage counter
 				usage.emplace(v, i);
-				m_old_stat[i] = v;
 			}
 		}
 
@@ -1203,37 +1040,27 @@ public:
 			fmt::append(m_stats, u8"\n\t⁂ %s [%u]", ppu_get_syscall_name(pair.second), pair.first);
 		}
 
-		if (!m_stats.empty())
-		{
-			ppu_log.notice("PPU Syscall Usage Stats:%s", m_stats);
-		}
+		ppu_log.notice("PPU Syscall Usage Stats: %s", m_stats);
 	}
 
 	void operator()()
 	{
-		bool was_paused = false;
-		u64 sleep_until = get_system_time();
-
-		for (u32 i = 1; thread_ctrl::state() != thread_state::aborting; i++)
+		while (thread_ctrl::state() != thread_state::aborting)
 		{
-			thread_ctrl::wait_until(&sleep_until, 1'000'000);
+			thread_ctrl::wait_for(10000'000);
 
-			const bool is_paused = Emu.IsPaused();
-
-			// Force-print all if paused
-			const bool force_print = is_paused && !was_paused;
-
-			if (force_print || i % 10 == 0)
+			if (Emu.IsPaused())
 			{
-				was_paused = is_paused;
-				print_stats(force_print);
+				continue;
 			}
+
+			print_stats();
 		}
 	}
 
 	~ppu_syscall_usage()
 	{
-		print_stats(true);
+		print_stats();
 	}
 
 	static constexpr auto thread_name = "PPU Syscall Usage Thread"sv;
@@ -1252,16 +1079,8 @@ extern void ppu_execute_syscall(ppu_thread& ppu, u64 code)
 
 		if (const auto func = g_ppu_syscall_table[code].first)
 		{
-#ifdef __APPLE__
-			pthread_jit_write_protect_np(false);
-#endif
-			func(ppu, {}, vm::_ptr<u32>(ppu.cia), nullptr);
+			func(ppu);
 			ppu_log.trace("Syscall '%s' (%llu) finished, r3=0x%llx", ppu_syscall_code(code), code, ppu.gpr[3]);
-
-#ifdef __APPLE__
-			pthread_jit_write_protect_np(true);
-			// No need to flush cache lines after a syscall, since we didn't generate any code.
-#endif
 			return;
 		}
 	}
@@ -1269,7 +1088,7 @@ extern void ppu_execute_syscall(ppu_thread& ppu, u64 code)
 	fmt::throw_exception("Invalid syscall number (%llu)", code);
 }
 
-extern ppu_intrp_func_t ppu_get_syscall(u64 code)
+extern ppu_function_t ppu_get_syscall(u64 code)
 {
 	if (code < g_ppu_syscall_table.size())
 	{
@@ -1290,235 +1109,51 @@ std::string ppu_get_syscall_name(u64 code)
 }
 
 DECLARE(lv2_obj::g_mutex);
-DECLARE(lv2_obj::g_ppu){};
-DECLARE(lv2_obj::g_pending){};
-DECLARE(lv2_obj::g_priority_order_tag){};
+DECLARE(lv2_obj::g_ppu);
+DECLARE(lv2_obj::g_pending);
+DECLARE(lv2_obj::g_waiting);
 
-thread_local DECLARE(lv2_obj::g_to_notify){};
-thread_local DECLARE(lv2_obj::g_postpone_notify_barrier){};
 thread_local DECLARE(lv2_obj::g_to_awake);
 
-// Scheduler queue for timeouts (wait until -> thread)
-static std::deque<std::pair<u64, class cpu_thread*>> g_waiting;
-
-// Threads which must call lv2_obj::sleep before the scheduler starts
-static std::deque<class cpu_thread*> g_to_sleep;
-static atomic_t<bool> g_scheduler_ready = false;
-static atomic_t<u64> s_yield_frequency = 0;
-static atomic_t<u64> s_max_allowed_yield_tsc = 0;
-static u64 s_last_yield_tsc = 0;
-atomic_t<u32> g_lv2_preempts_taken = 0;
-
 namespace cpu_counter
 {
 	void remove(cpu_thread*) noexcept;
 }
 
-std::string lv2_obj::name64(u64 name_u64)
+void lv2_obj::sleep(cpu_thread& cpu, const u64 timeout)
 {
-	const auto ptr = reinterpret_cast<const char*>(&name_u64);
-
-	// NTS string, ignore invalid/newline characters
-	// Example: "lv2\n\0tx" will be printed as "lv2"
-	std::string str{ptr, std::find(ptr, ptr + 7, '\0')};
-	str.erase(std::remove_if(str.begin(), str.end(), [](uchar c){ return !std::isprint(c); }), str.end());
-
-	return str;
-}
-
-bool lv2_obj::sleep(cpu_thread& cpu, const u64 timeout)
-{
-	// Should already be performed when using this flag
-	if (!g_postpone_notify_barrier)
-	{
-		prepare_for_sleep(cpu);
-	}
-
-	if (cpu.get_class() == thread_class::ppu)
-	{
-		if (u32 addr = static_cast<ppu_thread&>(cpu).res_notify)
-		{
-			static_cast<ppu_thread&>(cpu).res_notify = 0;
-
-			if (static_cast<ppu_thread&>(cpu).res_notify_time != vm::reservation_notifier_count_index(addr).second)
-			{
-				// Ignore outdated notification request
-			}
-			else if (auto it = std::find(g_to_notify, std::end(g_to_notify), std::add_pointer_t<const void>{}); it != std::end(g_to_notify))
-			{
-				*it++ = vm::reservation_notifier_notify(addr, true);
-
-				if (it < std::end(g_to_notify))
-				{
-					// Null-terminate the list if it ends before last slot
-					*it = nullptr;
-				}
-			}
-			else
-			{
-				vm::reservation_notifier_notify(addr);
-			}
-		}
-	}
-
-	bool result = false;
-	const u64 current_time = get_guest_system_time();
-	{
-		std::lock_guard lock{g_mutex};
-		result = sleep_unlocked(cpu, timeout, current_time);
-
-		if (!g_to_awake.empty())
-		{
-			// Schedule pending entries
-			awake_unlocked({});
-		}
-
-		schedule_all(current_time);
-	}
-
-	if (!g_postpone_notify_barrier)
-	{
-		notify_all();
-	}
-
+	vm::temporary_unlock(cpu);
+	cpu_counter::remove(&cpu);
+	std::lock_guard{g_mutex}, sleep_unlocked(cpu, timeout);
 	g_to_awake.clear();
-	return result;
 }
 
-bool lv2_obj::awake(cpu_thread* thread, s32 prio)
+bool lv2_obj::awake(cpu_thread* const thread, s32 prio)
 {
-	if (ppu_thread* ppu = cpu_thread::get_current<ppu_thread>())
-	{
-		if (u32 addr = ppu->res_notify)
-		{
-			ppu->res_notify = 0;
-
-			if (ppu->res_notify_time != vm::reservation_notifier_count_index(addr).second)
-			{
-				// Ignore outdated notification request
-			}
-			else if (auto it = std::find(g_to_notify, std::end(g_to_notify), std::add_pointer_t<const void>{}); it != std::end(g_to_notify))
-			{
-				*it++ = vm::reservation_notifier_notify(addr, true);
-
-				if (it < std::end(g_to_notify))
-				{
-					// Null-terminate the list if it ends before last slot
-					*it = nullptr;
-				}
-			}
-			else
-			{
-				vm::reservation_notifier_notify(addr);
-			}
-		}
-	}
-
-	bool result = false;
-	{
-		std::lock_guard lock(g_mutex);
-		result = awake_unlocked(thread, prio);
-		schedule_all();
-	}
-
-	if (result)
-	{
-		if (auto cpu = cpu_thread::get_current(); cpu && cpu->is_paused())
-		{
-			vm::temporary_unlock();
-		}
-	}
-
-	if (!g_postpone_notify_barrier)
-	{
-		notify_all();
-	}
-
-	return result;
+	vm::temporary_unlock();
+	std::lock_guard lock(g_mutex);
+	return awake_unlocked(thread, prio);
 }
 
 bool lv2_obj::yield(cpu_thread& thread)
 {
-	if (auto ppu = thread.try_get<ppu_thread>())
-	{
-		ppu->raddr = 0; // Clear reservation
-
-		if (!atomic_storage<ppu_thread*>::load(ppu->next_ppu))
-		{
-			// Nothing to do
-			return false;
-		}
-	}
-
+	vm::temporary_unlock(thread);
 	return awake(&thread, yield_cmd);
 }
 
-bool lv2_obj::sleep_unlocked(cpu_thread& thread, u64 timeout, u64 current_time)
+void lv2_obj::sleep_unlocked(cpu_thread& thread, u64 timeout)
 {
-	const u64 start_time = current_time;
-
-	auto on_to_sleep_update = [&]()
-	{
-		if (g_to_sleep.size() > 5u)
-		{
-			ppu_log.warning("Threads (%d)", g_to_sleep.size());
-		}
-		else if (!g_to_sleep.empty())
-		{
-			// In case there is a deadlock (PPU threads not sleeping)
-			// Print-out their IDs for further inspection (focus at 5 at max for now to avoid log spam)
-			std::string out = fmt::format("Threads (%d):", g_to_sleep.size());
-			for (auto thread : g_to_sleep)
-			{
-				fmt::append(out, " 0x%x,", thread->id);
-			}
-
-			out.resize(out.size() - 1);
-
-			ppu_log.warning("%s", out);
-		}
-		else
-		{
-			ppu_log.warning("Final Thread");
-
-			// All threads are ready, wake threads
-			Emu.CallFromMainThread([]
-			{
-				if (Emu.IsStarting())
-				{
-					// It uses lv2_obj::g_mutex, run it on main thread
-					Emu.FinalizeRunRequest();
-				}
-			});
-		}
-	};
-
-	bool return_val = true;
+	const u64 start_time = get_guest_system_time();
 
 	if (auto ppu = thread.try_get<ppu_thread>())
 	{
-		ppu_log.trace("sleep() - waiting (%zu)", g_pending);
-
-		if (ppu->ack_suspend)
-		{
-			ppu->ack_suspend = false;
-			g_pending--;
-		}
-
-		if (std::exchange(ppu->cancel_sleep, 0) == 2)
-		{
-			// Signal that the underlying LV2 operation has been cancelled and replaced with a short yield
-			return_val = false;
-		}
+		ppu_log.trace("sleep() - waiting (%zu)", g_pending.size());
 
 		const auto [_, ok] = ppu->state.fetch_op([&](bs_t<cpu_flag>& val)
 		{
 			if (!(val & cpu_flag::signal))
 			{
 				val += cpu_flag::suspend;
-
-				// Flag used for forced timeout notification
-				ensure(!timeout || !(val & cpu_flag::notify));
 				return true;
 			}
 
@@ -1528,44 +1163,26 @@ bool lv2_obj::sleep_unlocked(cpu_thread& thread, u64 timeout, u64 current_time)
 		if (!ok)
 		{
 			ppu_log.fatal("sleep() failed (signaled) (%s)", ppu->current_function);
-			return false;
+			return;
 		}
 
 		// Find and remove the thread
-		if (!unqueue(g_ppu, ppu, &ppu_thread::next_ppu))
+		if (!unqueue(g_ppu, ppu))
 		{
-			if (auto it = std::find(g_to_sleep.begin(), g_to_sleep.end(), ppu); it != g_to_sleep.end())
-			{
-				g_to_sleep.erase(it);
-				ppu->start_time = start_time;
-				on_to_sleep_update();
-				return true;
-			}
-
 			// Already sleeping
 			ppu_log.trace("sleep(): called on already sleeping thread.");
-			return false;
+			return;
 		}
 
+		unqueue(g_pending, ppu);
+
 		ppu->raddr = 0; // Clear reservation
 		ppu->start_time = start_time;
-		ppu->end_time = timeout ? start_time + std::min<u64>(timeout, ~start_time) : u64{umax};
-	}
-	else if (auto spu = thread.try_get<spu_thread>())
-	{
-		if (auto it = std::find(g_to_sleep.begin(), g_to_sleep.end(), spu); it != g_to_sleep.end())
-		{
-			g_to_sleep.erase(it);
-			on_to_sleep_update();
-			return true;
-		}
-
-		return false;
 	}
 
 	if (timeout)
 	{
-		const u64 wait_until = start_time + std::min<u64>(timeout, ~start_time);
+		const u64 wait_until = start_time + timeout;
 
 		// Register timeout if necessary
 		for (auto it = g_waiting.cbegin(), end = g_waiting.cend();; it++)
@@ -1578,116 +1195,76 @@ bool lv2_obj::sleep_unlocked(cpu_thread& thread, u64 timeout, u64 current_time)
 		}
 	}
 
-	return return_val;
+	if (!g_to_awake.empty())
+	{
+		// Schedule pending entries
+		awake_unlocked({});
+	}
+	else
+	{
+		schedule_all();
+	}
 }
 
 bool lv2_obj::awake_unlocked(cpu_thread* cpu, s32 prio)
 {
 	// Check thread type
-	AUDIT(!cpu || cpu->get_class() == thread_class::ppu);
-
-	bool push_first = false;
+	AUDIT(!cpu || cpu->id_type() == 1);
 
 	switch (prio)
 	{
 	default:
 	{
 		// Priority set
-		auto set_prio = [](atomic_t<ppu_thread::ppu_prio_t>& prio, s32 value, bool increment_order_last, bool increment_order_first)
+		if (static_cast<ppu_thread*>(cpu)->prio.exchange(prio) == prio || !unqueue(g_ppu, cpu))
 		{
-			s64 tag = 0;
-
-			if (increment_order_first || increment_order_last)
-			{
-				tag = ++g_priority_order_tag;
-			}
-
-			prio.atomic_op([&](ppu_thread::ppu_prio_t& prio)
-			{
-				prio.prio = value;
-
-				if (increment_order_first)
-				{
-					prio.order = ~tag;
-				}
-				else if (increment_order_last)
-				{
-					prio.order = tag;
-				}
-			});
-		};
-
-		const s64 old_prio = static_cast<ppu_thread*>(cpu)->prio.load().prio;
-
-		// If priority is the same, push ONPROC/RUNNABLE thread to the back of the priority list if it is not the current thread
-		if (old_prio == prio && cpu == cpu_thread::get_current())
-		{
-			set_prio(static_cast<ppu_thread*>(cpu)->prio, prio, false, false);
 			return true;
 		}
 
-		if (!unqueue(g_ppu, static_cast<ppu_thread*>(cpu), &ppu_thread::next_ppu))
-		{
-			set_prio(static_cast<ppu_thread*>(cpu)->prio, prio, old_prio > prio, old_prio < prio);
-			return true;
-		}
-
-		set_prio(static_cast<ppu_thread*>(cpu)->prio, prio, false, false);
 		break;
 	}
 	case yield_cmd:
 	{
-		usz i = 0;
-
 		// Yield command
-		for (auto ppu_next = &g_ppu;; i++)
+		for (usz i = 0;; i++)
 		{
-			const auto ppu = +*ppu_next;
-
-			if (!ppu)
+			if (i + 1 >= g_ppu.size())
 			{
 				return false;
 			}
 
-			if (ppu == cpu)
+			if (const auto ppu = g_ppu[i]; ppu == cpu)
 			{
-				auto ppu2 = ppu->next_ppu;
+				usz j = i + 1;
 
-				if (!ppu2 || ppu2->prio.load().prio != ppu->prio.load().prio)
+				for (; j < g_ppu.size(); j++)
+				{
+					if (g_ppu[j]->prio != ppu->prio)
+					{
+						break;
+					}
+				}
+
+				if (j == i + 1)
 				{
 					// Empty 'same prio' threads list
 					return false;
 				}
 
-				for (i++;; i++)
-				{
-					const auto next = ppu2->next_ppu;
-
-					if (!next || next->prio.load().prio != ppu->prio.load().prio)
-					{
-						break;
-					}
-
-					ppu2 = next;
-				}
-
 				// Rotate current thread to the last position of the 'same prio' threads list
-				// Exchange forward pointers
-				*ppu_next = std::exchange(ppu->next_ppu, std::exchange(ppu2->next_ppu, ppu));
+				std::rotate(g_ppu.begin() + i, g_ppu.begin() + i + 1, g_ppu.begin() + j);
 
-				if (i < g_cfg.core.ppu_threads + 0u)
+				if (j <= g_cfg.core.ppu_threads + 0u)
 				{
 					// Threads were rotated, but no context switch was made
 					return false;
 				}
 
 				ppu->start_time = get_guest_system_time();
+				cpu = nullptr; // Disable current thread enqueing, also enable threads list enqueing
 				break;
 			}
-
-			ppu_next = &ppu->next_ppu;
 		}
-
 		break;
 	}
 	case enqueue_cmd:
@@ -1696,34 +1273,22 @@ bool lv2_obj::awake_unlocked(cpu_thread* cpu, s32 prio)
 	}
 	}
 
-	const auto emplace_thread = [push_first](cpu_thread* const cpu)
+	const auto emplace_thread = [](cpu_thread* const cpu)
 	{
-		for (auto it = &g_ppu;;)
+		for (auto it = g_ppu.cbegin(), end = g_ppu.cend();; it++)
 		{
-			const auto next = +*it;
-
-			if (next == cpu)
+			if (it != end && *it == cpu)
 			{
-				ppu_log.trace("sleep() - suspended (p=%zu)", g_pending);
-
-				if (static_cast<ppu_thread*>(cpu)->cancel_sleep == 1)
-				{
-					// The next sleep call of the thread is cancelled
-					static_cast<ppu_thread*>(cpu)->cancel_sleep = 2;
-				}
-
+				ppu_log.trace("sleep() - suspended (p=%zu)", g_pending.size());
 				return false;
 			}
 
 			// Use priority, also preserve FIFO order
-			if (!next || (push_first ? next->prio.load().prio >= static_cast<ppu_thread*>(cpu)->prio.load().prio : next->prio.load().prio > static_cast<ppu_thread*>(cpu)->prio.load().prio))
+			if (it == end || (*it)->prio > static_cast<ppu_thread*>(cpu)->prio)
 			{
-				atomic_storage<ppu_thread*>::release(static_cast<ppu_thread*>(cpu)->next_ppu, next);
-				atomic_storage<ppu_thread*>::release(*it, static_cast<ppu_thread*>(cpu));
+				g_ppu.insert(it, static_cast<ppu_thread*>(cpu));
 				break;
 			}
-
-			it = &next->next_ppu;
 		}
 
 		// Unregister timeout if necessary
@@ -1743,133 +1308,66 @@ bool lv2_obj::awake_unlocked(cpu_thread* cpu, s32 prio)
 	// Yield changed the queue before
 	bool changed_queue = prio == yield_cmd;
 
-	s32 lowest_new_priority = smax;
-	const bool has_free_hw_thread_space = count_non_sleeping_threads().onproc_count < g_cfg.core.ppu_threads + 0u;
-
-	if (cpu && prio != yield_cmd)
+	if (cpu)
 	{
 		// Emplace current thread
-		if (emplace_thread(cpu))
-		{
-			changed_queue = true;
-			lowest_new_priority = std::min<s32>(static_cast<ppu_thread*>(cpu)->prio.load().prio, lowest_new_priority);
-		}
+		changed_queue = emplace_thread(cpu);
 	}
 	else for (const auto _cpu : g_to_awake)
 	{
 		// Emplace threads from list
-		if (emplace_thread(_cpu))
-		{
-			changed_queue = true;
-			lowest_new_priority = std::min<s32>(static_cast<ppu_thread*>(_cpu)->prio.load().prio, lowest_new_priority);
-		}
+		changed_queue |= emplace_thread(_cpu);
 	}
 
-	auto target = +g_ppu;
-	usz i = 0;
+	// Remove pending if necessary
+	if (!g_pending.empty() && ((cpu && cpu == get_current_cpu_thread()) || prio == yield_cmd))
+	{
+		unqueue(g_pending, get_current_cpu_thread());
+	}
 
 	// Suspend threads if necessary
-	for (usz thread_count = g_cfg.core.ppu_threads; target; target = target->next_ppu, i++)
+	for (usz i = g_cfg.core.ppu_threads; changed_queue && i < g_ppu.size(); i++)
 	{
-		if (i >= thread_count && cpu_flag::suspend - target->state)
+		const auto target = g_ppu[i];
+
+		if (!target->state.test_and_set(cpu_flag::suspend))
 		{
 			ppu_log.trace("suspend(): %s", target->id);
-			target->ack_suspend = true;
-			g_pending++;
-			ensure(!target->state.test_and_set(cpu_flag::suspend));
+			g_pending.emplace_back(target);
 
 			if (is_paused(target->state - cpu_flag::suspend))
 			{
-				target->state.notify_one();
-			}
-		}
-	}
-
-	const auto current_ppu = cpu_thread::get_current<ppu_thread>();
-
-	// Remove pending if necessary
-	if (current_ppu)
-	{
-		if (std::exchange(current_ppu->ack_suspend, false))
-		{
-			ensure(g_pending)--;
-		}
-	}
-
-	// In real PS3 (it seems), when a thread with a higher priority than the caller is signaled and -
-	// - that there is available space on the running queue for the other hardware thread to start
-	// It prioritizes signaled thread - caller's hardware thread switches instantly to the new thread code
-	// While signaling to the other hardware thread to execute the caller's code.
-	// Resulting in a delay to the caller after such thread is signaled
-
-	if (current_ppu && changed_queue && has_free_hw_thread_space)
-	{
-		if (current_ppu->prio.load().prio > lowest_new_priority)
-		{
-			const bool is_create_thread = current_ppu->gpr[11] == 0x35;
-
-			// When not being set to All timers - activate only for sys_ppu_thread_start
-			if (is_create_thread || g_cfg.core.sleep_timers_accuracy == sleep_timers_accuracy_level::_all_timers)
-			{
-				if (!current_ppu->state.test_and_set(cpu_flag::yield) || current_ppu->hw_sleep_time != 0)
-				{
-					current_ppu->hw_sleep_time += (is_create_thread ? 51 : 35);
-				}
-				else
-				{
-					current_ppu->hw_sleep_time = 30000; // In addition to another flag's use (TODO: Refactor and clean this)
-				}
+				target->state.notify_one(cpu_flag::suspend);
 			}
 		}
 	}
 
+	schedule_all();
 	return changed_queue;
 }
 
 void lv2_obj::cleanup()
 {
-	g_ppu = nullptr;
-	g_scheduler_ready = false;
-	g_to_sleep.clear();
+	g_ppu.clear();
+	g_pending.clear();
 	g_waiting.clear();
-	g_pending = 0;
-	s_yield_frequency = 0;
 }
 
-void lv2_obj::schedule_all(u64 current_time)
+void lv2_obj::schedule_all()
 {
-	auto it = std::find(g_to_notify, std::end(g_to_notify), std::add_pointer_t<const void>{});
-
-	if (!g_pending && g_scheduler_ready)
+	if (g_pending.empty())
 	{
-		auto target = +g_ppu;
-
 		// Wake up threads
-		for (usz x = g_cfg.core.ppu_threads; target && x; target = target->next_ppu, x--)
+		for (usz i = 0, x = std::min<usz>(g_cfg.core.ppu_threads, g_ppu.size()); i < x; i++)
 		{
+			const auto target = g_ppu[i];
+
 			if (target->state & cpu_flag::suspend)
 			{
 				ppu_log.trace("schedule(): %s", target->id);
-
-				// Remove yield if it was sleeping until now
-				const bs_t<cpu_flag> remove_yield = target->start_time == 0 ? +cpu_flag::suspend : (cpu_flag::yield + cpu_flag::preempt);
-
+				target->state ^= (cpu_flag::signal + cpu_flag::suspend);
 				target->start_time = 0;
-
-				if ((target->state.fetch_op(AOFN(x += cpu_flag::signal, x -= cpu_flag::suspend, x-= remove_yield, void())) & (cpu_flag::wait + cpu_flag::signal)) != cpu_flag::wait)
-				{
-					continue;
-				}
-
-				if (it == std::end(g_to_notify))
-				{
-					// Out of notification slots, notify locally (resizable container is not worth it)
-					target->state.notify_one();
-				}
-				else
-				{
-					*it++ = &target->state;
-				}
+				target->state.notify_one(cpu_flag::signal + cpu_flag::suspend);
 			}
 		}
 	}
@@ -1877,34 +1375,12 @@ void lv2_obj::schedule_all(u64 current_time)
 	// Check registered timeouts
 	while (!g_waiting.empty())
 	{
-		const auto pair = &g_waiting.front();
+		auto& pair = g_waiting.front();
 
-		if (!current_time)
+		if (pair.first <= get_guest_system_time())
 		{
-			current_time = get_guest_system_time();
-		}
-
-		if (pair->first <= current_time)
-		{
-			const auto target = pair->second;
+			pair.second->notify();
 			g_waiting.pop_front();
-
-			if (target != cpu_thread::get_current())
-			{
-				// Change cpu_thread::state for the lightweight notification to work
-				ensure(!target->state.test_and_set(cpu_flag::notify));
-
-				// Otherwise notify it to wake itself
-				if (it == std::end(g_to_notify))
-				{
-					// Out of notification slots, notify locally (resizable container is not worth it)
-					target->state.notify_one();
-				}
-				else
-				{
-					*it++ = &target->state;
-				}
-			}
 		}
 		else
 		{
@@ -1912,66 +1388,9 @@ void lv2_obj::schedule_all(u64 current_time)
 			break;
 		}
 	}
-
-	if (it < std::end(g_to_notify))
-	{
-		// Null-terminate the list if it ends before last slot
-		*it = nullptr;
-	}
-
-	if (const u64 freq = s_yield_frequency)
-	{
-		const u64 tsc = utils::get_tsc();
-		const u64 last_tsc = s_last_yield_tsc;
-
-		if (tsc >= last_tsc && tsc <= s_max_allowed_yield_tsc && tsc - last_tsc >= freq)
-		{
-			auto target = +g_ppu;
-			cpu_thread* cpu = nullptr;
-
-			for (usz x = g_cfg.core.ppu_threads;; target = target->next_ppu, x--)
-			{
-				if (!target || !x)
-				{
-					if (g_ppu && cpu_flag::preempt - g_ppu->state)
-					{
-						// Don't be picky, pick up any running PPU thread even it has a wait flag
-						cpu = g_ppu;
-					}
-					// TODO: If this case is common enough it may be valuable to iterate over all CPU threads to find a perfect candidate (one without a wait or suspend flag)
-					else if (auto current = cpu_thread::get_current(); current && cpu_flag::suspend - current->state)
-					{
-						// May be an SPU or RSX thread, use them as a last resort
-						cpu = current;
-					}
-
-					break;
-				}
-
-				if (target->state.none_of(cpu_flag::preempt + cpu_flag::wait))
-				{
-					cpu = target;
-					break;
-				}
-			}
-
-			if (cpu && cpu_flag::preempt - cpu->state && !cpu->state.test_and_set(cpu_flag::preempt))
-			{
-				s_last_yield_tsc = tsc;
-				g_lv2_preempts_taken.release(g_lv2_preempts_taken.load() + 1); // Has a minor race but performance is more important
-				rsx::set_rsx_yield_flag();
-			}
-		}
-	}
 }
 
-void lv2_obj::make_scheduler_ready()
-{
-	g_scheduler_ready.release(true);
-	lv2_obj::awake_all();
-}
-
-std::pair<ppu_thread_status, u32> lv2_obj::ppu_state(ppu_thread* ppu, bool lock_idm, bool lock_lv2)
+ppu_thread_status lv2_obj::ppu_state(ppu_thread* ppu, bool lock_idm, bool lock_lv2)
 {
 	std::optional<reader_lock> opt_lock[2];
 
@@ -1980,15 +1399,15 @@ std::pair<ppu_thread_status, u32> lv2_obj::ppu_state(ppu_thread* ppu, bool lock_
 		opt_lock[0].emplace(id_manager::g_mutex);
 	}
 
-	if (!Emu.IsReady() ? ppu->state.all_of(cpu_flag::stop) : ppu->stop_flag_removal_protection)
+	if (ppu->state & cpu_flag::stop)
 	{
-		return { PPU_THREAD_STATUS_IDLE, 0};
+		return PPU_THREAD_STATUS_IDLE;
 	}
 
 	switch (ppu->joiner)
 	{
-	case ppu_join_status::zombie: return { PPU_THREAD_STATUS_ZOMBIE, 0};
-	case ppu_join_status::exited: return { PPU_THREAD_STATUS_DELETED, 0};
+	case ppu_join_status::zombie: return PPU_THREAD_STATUS_ZOMBIE;
+	case ppu_join_status::exited: return PPU_THREAD_STATUS_DELETED;
 	default: break;
 	}
 
@@ -1997,352 +1416,17 @@ std::pair<ppu_thread_status, u32> lv2_obj::ppu_state(ppu_thread* ppu, bool lock_
 		opt_lock[1].emplace(lv2_obj::g_mutex);
 	}
 
-	u32 pos = umax;
-	u32 i = 0;
+	const auto it = std::find(g_ppu.begin(), g_ppu.end(), ppu);
 
-	for (auto target = +g_ppu; target; target = target->next_ppu, i++)
+	if (it == g_ppu.end())
 	{
-		if (target == ppu)
-		{
-			pos = i;
-			break;
-		}
+		return PPU_THREAD_STATUS_SLEEP;
 	}
 
-	if (pos == umax)
+	if (it - g_ppu.begin() >= g_cfg.core.ppu_threads)
 	{
-		if (!ppu->interrupt_thread_executing)
-		{
-			return { PPU_THREAD_STATUS_STOP, 0};
-		}
-
-		return { PPU_THREAD_STATUS_SLEEP, 0 };
+		return PPU_THREAD_STATUS_RUNNABLE;
 	}
 
-	if (pos >= g_cfg.core.ppu_threads + 0u)
-	{
-		return { PPU_THREAD_STATUS_RUNNABLE, pos };
-	}
-
-	return { PPU_THREAD_STATUS_ONPROC, pos};
-}
-
-void lv2_obj::set_future_sleep(cpu_thread* cpu)
-{
-	g_to_sleep.emplace_back(cpu);
-}
-
-bool lv2_obj::is_scheduler_ready()
-{
-	reader_lock lock(g_mutex);
-	return g_to_sleep.empty();
-}
-
-ppu_non_sleeping_count_t lv2_obj::count_non_sleeping_threads()
-{
-	ppu_non_sleeping_count_t total{};
-
-	auto target = atomic_storage<ppu_thread*>::load(g_ppu);
-
-	for (usz thread_count = g_cfg.core.ppu_threads; target; target = atomic_storage<ppu_thread*>::load(target->next_ppu))
-	{
-		if (total.onproc_count == thread_count)
-		{
-			total.has_running = true;
-			break;
-		}
-
-		total.onproc_count++;
-	}
-
-	return total;
-}
-
-void lv2_obj::set_yield_frequency(u64 freq, u64 max_allowed_tsc)
-{
-	s_yield_frequency.release(freq);
-	s_max_allowed_yield_tsc.release(max_allowed_tsc);
-	g_lv2_preempts_taken.release(0);
-}
-
-#if defined(_MSC_VER)
-#define mwaitx_func
-#define waitpkg_func
-#else
-#define mwaitx_func __attribute__((__target__("mwaitx")))
-#define waitpkg_func __attribute__((__target__("waitpkg")))
-#endif
-
-#if defined(ARCH_X64)
-// Waits for a number of TSC clock cycles in power optimized state
-// Cstate is represented in bits [7:4]+1 cstate. So C0 requires bits [7:4] to be set to 0xf, C1 requires bits [7:4] to be set to 0.
-mwaitx_func static void __mwaitx(u32 cycles, u32 cstate)
-{
-	constexpr u32 timer_enable = 0x2;
-
-	// monitorx will wake if the cache line is written to. We don't want this, so place the monitor value on it's own cache line.
-	alignas(64) u64 monitor_var{};
-	_mm_monitorx(&monitor_var, 0, 0);
-	_mm_mwaitx(timer_enable, cstate, cycles);
-}
-
-// First bit indicates cstate, 0x0 for C.02 state (lower power) or 0x1 for C.01 state (higher power)
-waitpkg_func static void __tpause(u32 cycles, u32 cstate)
-{
-	const u64 tsc = utils::get_tsc() + cycles;
-	_tpause(cstate, tsc);
-}
-#endif
-
-bool lv2_obj::wait_timeout(u64 usec, ppu_thread* cpu, bool scale, bool is_usleep)
-{
-	static_assert(u64{umax} / max_timeout >= 100, "max timeout is not valid for scaling");
-
-	const u64 start_time = get_system_time();
-
-	if (cpu)
-	{
-		if (u64 end_time = cpu->end_time; end_time != umax)
-		{
-			const u64 guest_start = get_guest_system_time(start_time);
-
-			if (end_time <= guest_start)
-			{
-				return true;
-			}
-
-			usec = end_time - guest_start;
-			scale = true;
-		}
-	}
-
-	if (scale)
-	{
-		// Scale time
-		usec = std::min<u64>(usec, u64{umax} / 100) * 100 / g_cfg.core.clocks_scale;
-	}
-
-	// Clamp
-	usec = std::min<u64>(usec, max_timeout);
-
-	u64 passed = 0;
-
-	atomic_bs_t<cpu_flag> dummy{};
-	const auto& state = cpu ? cpu->state : dummy;
-	auto old_state = +state;
-
-	auto wait_for = [&](u64 timeout)
-	{
-		thread_ctrl::wait_on(state, old_state, timeout);
-	};
-
-	for (;; old_state = state)
-	{
-		if (old_state & cpu_flag::notify)
-		{
-			// Timeout notification has been forced
-			break;
-		}
-
-		if (old_state & cpu_flag::signal)
-		{
-			return false;
-		}
-
-		if (::is_stopped(old_state) || thread_ctrl::state() == thread_state::aborting)
-		{
-			return passed >= usec;
-		}
-
-		if (passed >= usec)
-		{
-			break;
-		}
-
-		u64 remaining = usec - passed;
-#ifdef __linux__
-		// NOTE: Assumption that timer initialization has succeeded
-		constexpr u64 host_min_quantum = 10;
-#else
-		// Host scheduler quantum for windows (worst case)
-		// NOTE: On ps3 this function has very high accuracy
-		constexpr u64 host_min_quantum = 500;
-#endif
-		// TODO: Tune for other non windows operating sytems
-
-		if (g_cfg.core.sleep_timers_accuracy < (is_usleep ? sleep_timers_accuracy_level::_usleep : sleep_timers_accuracy_level::_all_timers))
-		{
-			wait_for(remaining);
-		}
-		else
-		{
-			if (remaining > host_min_quantum)
-			{
-#ifdef __linux__
-				// With timerslack set low, Linux is precise for all values above
-				wait_for(remaining);
-#else
-				// Wait on multiple of min quantum for large durations to avoid overloading low thread cpus
-				wait_for(remaining - (remaining % host_min_quantum));
-#endif
-			}
-			// TODO: Determine best value for yield delay
-#if defined(ARCH_X64)
-			else if (utils::has_appropriate_um_wait())
-			{
-				const u32 us_in_tsc_clocks = ::narrow<u32>(remaining * (utils::get_tsc_freq() / 1000000ULL));
-
-				if (utils::has_waitpkg())
-				{
-					__tpause(us_in_tsc_clocks, 0x1);
-				}
-				else
-				{
-					__mwaitx(us_in_tsc_clocks, 0xf0);
-				}
-			}
-#endif
-			else
-			{
-				// Try yielding. May cause long wake latency but helps weaker CPUs a lot by alleviating resource pressure
-				std::this_thread::yield();
-			}
-		}
-
-		passed = get_system_time() - start_time;
-	}
-
-	return true;
-}
-
-void lv2_obj::prepare_for_sleep(cpu_thread& cpu)
-{
-	vm::temporary_unlock(cpu);
-	cpu_counter::remove(&cpu);
-}
-
-void lv2_obj::notify_all() noexcept
-{
-	for (auto cpu : g_to_notify)
-	{
-		if (!cpu)
-		{
-			break;
-		}
-
-		if (cpu != &g_to_notify)
-		{
-			const auto res_start = vm::reservation_notifier(0).second;
-			const auto res_end = vm::reservation_notifier(umax).second;
-
-			if (cpu >= res_start && cpu <= res_end)
-			{
-				atomic_wait_engine::notify_all(cpu);
-			}
-			else
-			{
-				// Note: by the time of notification the thread could have been deallocated which is why the direct function is used
-				atomic_wait_engine::notify_one(cpu);
-			}
-		}
-	}
-
-	g_to_notify[0] = nullptr;
-	g_postpone_notify_barrier = false;
-
-	const auto cpu = cpu_thread::get_current();
-
-	if (!cpu)
-	{
-		return;
-	}
-
-	if (cpu->get_class() != thread_class::spu && cpu->state.none_of(cpu_flag::suspend))
-	{
-		return;
-	}
-
-	std::optional<vm::writer_lock> lock;
-
-	constexpr usz total_waiters = std::size(spu_thread::g_spu_waiters_by_value);
-
-	u32 notifies[total_waiters]{};
-
-	// There may be 6 waiters, but checking them all may be performance expensive 
-	// Instead, check 2 at max, but use the CPU ID index to tell which index to start checking so the work would be distributed across all threads
-
-	atomic_t<u64, 64>* range_lock = nullptr;
-
-	for (usz i = 0, checked = 0; checked < 3 && i < total_waiters; i++)
-	{
-		auto& waiter = spu_thread::g_spu_waiters_by_value[(i + cpu->id) % total_waiters];
-		const u64 value = waiter.load();
-		u32 raddr = static_cast<u32>(value) & -128;
-
-		if (vm::check_addr(raddr))
-		{
-			if (((raddr >> 28) < 2 || (raddr >> 28) == 0xd))
-			{
-				checked++;
-
-				if (compute_rdata_hash32(*vm::get_super_ptr<spu_rdata_t>(raddr)) != static_cast<u32>(value >> 32))
-				{
-					// Clear address to avoid a race, keep waiter counter
-					if (waiter.fetch_op([&](u64& x)
-					{
-						if ((x & -128) == (value & -128))
-						{
-							x &= 127;
-							return true;
-						}
-
-						return false;
-					}).second)
-					{
-						notifies[i] = raddr;
-					}
-				}
-
-				continue;
-			}
-
-			if (!range_lock)
-			{
-				range_lock = vm::alloc_range_lock();
-			}
-
-			checked++;
-
-			if (spu_thread::reservation_check(raddr, static_cast<u32>(value >> 32), range_lock))
-			{
-				// Clear address to avoid a race, keep waiter counter
-				if (waiter.fetch_op([&](u64& x)
-				{
-					if ((x & -128) == (value & -128))
-					{
-						x &= 127;
-						return true;
-					}
-
-					return false;
-				}).second)
-				{
-					notifies[i] = raddr;
-				}
-			}
-		}
-	}
-
-	if (range_lock)
-	{
-		vm::free_range_lock(range_lock);
-	}
-
-	for (u32 addr : notifies)
-	{
-		if (addr)
-		{
-			vm::reservation_notifier_notify(addr);
-		}
-	}
+	return PPU_THREAD_STATUS_ONPROC;
 }
diff --git a/rpcs3/Emu/Cell/lv2/sys_bdemu.cpp b/rpcs3/Emu/Cell/lv2/sys_bdemu.cpp
index 51d8e48842..4dfc6eb3fa 100644
--- a/rpcs3/Emu/Cell/lv2/sys_bdemu.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_bdemu.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include "Emu/Memory/vm.h"
 
 #include "Emu/Cell/ErrorCodes.h"
 
diff --git a/rpcs3/Emu/Cell/lv2/sys_cond.cpp b/rpcs3/Emu/Cell/lv2/sys_cond.cpp
index 401ed3bd66..d148436767 100644
--- a/rpcs3/Emu/Cell/lv2/sys_cond.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_cond.cpp
@@ -1,90 +1,21 @@
 #include "stdafx.h"
+#include "sys_cond.h"
 
-#include "util/serialization.hpp"
 #include "Emu/IdManager.h"
-#include "Emu/System.h"
+#include "Emu/IPC.h"
 
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
 
-#include "sys_cond.h"
-
-#include "util/asm.hpp"
-
 LOG_CHANNEL(sys_cond);
 
-lv2_cond::lv2_cond(utils::serial& ar) noexcept
-	: key(ar)
-	, name(ar)
-	, mtx_id(ar)
-	, mutex(idm::check_unlocked<lv2_obj, lv2_mutex>(mtx_id))
-	, _mutex(idm::get_unlocked<lv2_obj, lv2_mutex>(mtx_id)) // May be nullptr
-{
-}
-
-lv2_cond::lv2_cond(u64 key, u64 name, u32 mtx_id, shared_ptr<lv2_obj> mutex0) noexcept
-	: key(key)
-	, name(name)
-	, mtx_id(mtx_id)
-	, mutex(static_cast<lv2_mutex*>(mutex0.get()))
-	, _mutex(mutex0)
-{
-}
-
-CellError lv2_cond::on_id_create()
-{
-	exists++;
-
-	static auto do_it = [](lv2_cond* _this) -> CellError
-	{
-		if (lv2_obj::check(_this->mutex))
-		{
-			_this->mutex->cond_count++;
-			return {};
-		}
-
-		// Mutex has been destroyed, cannot create conditional variable
-		return CELL_ESRCH;
-	};
-
-	if (mutex)
-	{
-		return do_it(this);
-	}
-
-	ensure(!!Emu.DeserialManager());
-
-	Emu.PostponeInitCode([this]()
-	{
-		if (!mutex)
-		{
-			_mutex = static_cast<shared_ptr<lv2_obj>>(ensure(idm::get_unlocked<lv2_obj, lv2_mutex>(mtx_id)));
-		}
-
-		// Defer function
-		ensure(CellError{} == do_it(this));
-	});
-
-	return {};
-}
-
-std::function<void(void*)> lv2_cond::load(utils::serial& ar)
-{
-	return load_func(make_shared<lv2_cond>(stx::exact_t<utils::serial&>(ar)));
-}
-
-void lv2_cond::save(utils::serial& ar)
-{
-	ar(key, name, mtx_id);
-}
-
 error_code sys_cond_create(ppu_thread& ppu, vm::ptr<u32> cond_id, u32 mutex_id, vm::ptr<sys_cond_attribute_t> attr)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_cond.trace("sys_cond_create(cond_id=*0x%x, mutex_id=0x%x, attr=*0x%x)", cond_id, mutex_id, attr);
+	sys_cond.warning("sys_cond_create(cond_id=*0x%x, mutex_id=0x%x, attr=*0x%x)", cond_id, mutex_id, attr);
 
-	auto mutex = idm::get_unlocked<lv2_obj, lv2_mutex>(mutex_id);
+	auto mutex = idm::get<lv2_obj, lv2_mutex>(mutex_id);
 
 	if (!mutex)
 	{
@@ -95,14 +26,9 @@ error_code sys_cond_create(ppu_thread& ppu, vm::ptr<u32> cond_id, u32 mutex_id,
 
 	const u64 ipc_key = lv2_obj::get_key(_attr);
 
-	if (ipc_key)
-	{
-		sys_cond.warning("sys_cond_create(cond_id=*0x%x, attr=*0x%x): IPC=0x%016x", cond_id, attr, ipc_key);
-	}
-
 	if (const auto error = lv2_obj::create<lv2_cond>(_attr.pshared, ipc_key, _attr.flags, [&]
 	{
-		return make_single<lv2_cond>(
+		return std::make_shared<lv2_cond>(
 			ipc_key,
 			_attr.name_u64,
 			mutex_id,
@@ -112,7 +38,6 @@ error_code sys_cond_create(ppu_thread& ppu, vm::ptr<u32> cond_id, u32 mutex_id,
 		return error;
 	}
 
-	ppu.check_state();
 	*cond_id = idm::last_id();
 	return CELL_OK;
 }
@@ -121,13 +46,13 @@ error_code sys_cond_destroy(ppu_thread& ppu, u32 cond_id)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_cond.trace("sys_cond_destroy(cond_id=0x%x)", cond_id);
+	sys_cond.warning("sys_cond_destroy(cond_id=0x%x)", cond_id);
 
 	const auto cond = idm::withdraw<lv2_obj, lv2_cond>(cond_id, [&](lv2_cond& cond) -> CellError
 	{
 		std::lock_guard lock(cond.mutex->mutex);
 
-		if (atomic_storage<ppu_thread*>::load(cond.sq))
+		if (cond.waiters)
 		{
 			return CELL_EBUSY;
 		}
@@ -142,11 +67,6 @@ error_code sys_cond_destroy(ppu_thread& ppu, u32 cond_id)
 		return CELL_ESRCH;
 	}
 
-	if (cond->key)
-	{
-		sys_cond.warning("sys_cond_destroy(cond_id=0x%x): IPC=0x%016x", cond_id, cond->key);
-	}
-
 	if (cond.ret)
 	{
 		return cond.ret;
@@ -161,70 +81,31 @@ error_code sys_cond_signal(ppu_thread& ppu, u32 cond_id)
 
 	sys_cond.trace("sys_cond_signal(cond_id=0x%x)", cond_id);
 
-	while (true)
+	const auto cond = idm::check<lv2_obj, lv2_cond>(cond_id, [](lv2_cond& cond)
 	{
-		if (ppu.test_stopped())
+		if (cond.waiters)
 		{
-			ppu.state += cpu_flag::again;
-			return {};
-		}
+			std::lock_guard lock(cond.mutex->mutex);
 
-		bool finished = true;
-
-		ppu.state += cpu_flag::wait;
-
-		const auto cond = idm::check<lv2_obj, lv2_cond>(cond_id, [&, notify = lv2_obj::notify_all_t()](lv2_cond& cond)
-		{
-			if (atomic_storage<ppu_thread*>::load(cond.sq))
+			if (const auto cpu = cond.schedule<ppu_thread>(cond.sq, cond.mutex->protocol))
 			{
-				std::lock_guard lock(cond.mutex->mutex);
+				// TODO: Is EBUSY returned after reqeueing, on sys_cond_destroy?
+				cond.waiters--;
 
-				if (ppu.state & cpu_flag::suspend)
+				if (cond.mutex->try_own(*cpu, cpu->id))
 				{
-					// Test if another signal caused the current thread to be suspended, in which case it needs to wait until the thread wakes up (otherwise the signal may cause unexpected results)
-					finished = false;
-					return;
-				}
-
-				if (const auto cpu = cond.schedule<ppu_thread>(cond.sq, cond.mutex->protocol))
-				{
-					if (static_cast<ppu_thread*>(cpu)->state & cpu_flag::again)
-					{
-						ppu.state += cpu_flag::again;
-						return;
-					}
-
-					// TODO: Is EBUSY returned after reqeueing, on sys_cond_destroy?
-
-					if (cond.mutex->try_own(*cpu))
-					{
-						cond.awake(cpu);
-					}
+					cond.awake(cpu);
 				}
 			}
-			else
-			{
-				cond.mutex->mutex.lock_unlock();
-
-				if (ppu.state & cpu_flag::suspend)
-				{
-					finished = false;
-				}
-			}
-		});
-
-		if (!finished)
-		{
-			continue;
 		}
+	});
 
-		if (!cond)
-		{
-			return CELL_ESRCH;
-		}
-
-		return CELL_OK;
+	if (!cond)
+	{
+		return CELL_ESRCH;
 	}
+
+	return CELL_OK;
 }
 
 error_code sys_cond_signal_all(ppu_thread& ppu, u32 cond_id)
@@ -233,80 +114,36 @@ error_code sys_cond_signal_all(ppu_thread& ppu, u32 cond_id)
 
 	sys_cond.trace("sys_cond_signal_all(cond_id=0x%x)", cond_id);
 
-	while (true)
+	const auto cond = idm::check<lv2_obj, lv2_cond>(cond_id, [](lv2_cond& cond)
 	{
-		if (ppu.test_stopped())
+		if (cond.waiters)
 		{
-			ppu.state += cpu_flag::again;
-			return {};
-		}
+			std::lock_guard lock(cond.mutex->mutex);
 
-		bool finished = true;
+			cpu_thread* result = nullptr;
+			cond.waiters -= ::size32(cond.sq);
 
-		ppu.state += cpu_flag::wait;
-
-		const auto cond = idm::check<lv2_obj, lv2_cond>(cond_id, [&, notify = lv2_obj::notify_all_t()](lv2_cond& cond)
-		{
-			if (atomic_storage<ppu_thread*>::load(cond.sq))
+			while (const auto cpu = cond.schedule<ppu_thread>(cond.sq, SYS_SYNC_PRIORITY))
 			{
-				std::lock_guard lock(cond.mutex->mutex);
-
-				if (ppu.state & cpu_flag::suspend)
+				if (cond.mutex->try_own(*cpu, cpu->id))
 				{
-					// Test if another signal caused the current thread to be suspended, in which case it needs to wait until the thread wakes up (otherwise the signal may cause unexpected results)
-					finished = false;
-					return;
-				}
-
-				for (auto cpu = +cond.sq; cpu; cpu = cpu->next_cpu)
-				{
-					if (cpu->state & cpu_flag::again)
-					{
-						ppu.state += cpu_flag::again;
-						return;
-					}
-				}
-
-				cpu_thread* result = nullptr;
-				auto sq = cond.sq;
-				atomic_storage<ppu_thread*>::release(cond.sq, nullptr);
-
-				while (const auto cpu = cond.schedule<ppu_thread>(sq, SYS_SYNC_PRIORITY))
-				{
-					if (cond.mutex->try_own(*cpu))
-					{
-						ensure(!std::exchange(result, cpu));
-					}
-				}
-
-				if (result)
-				{
-					cond.awake(result);
+					ensure(!std::exchange(result, cpu));
 				}
 			}
-			else
+
+			if (result)
 			{
-				cond.mutex->mutex.lock_unlock();
-
-				if (ppu.state & cpu_flag::suspend)
-				{
-					finished = false;
-				}
+				lv2_obj::awake(result);
 			}
-		});
-
-		if (!finished)
-		{
-			continue;
 		}
+	});
 
-		if (!cond)
-		{
-			return CELL_ESRCH;
-		}
-
-		return CELL_OK;
+	if (!cond)
+	{
+		return CELL_ESRCH;
 	}
+
+	return CELL_OK;
 }
 
 error_code sys_cond_signal_to(ppu_thread& ppu, u32 cond_id, u32 thread_id)
@@ -315,88 +152,49 @@ error_code sys_cond_signal_to(ppu_thread& ppu, u32 cond_id, u32 thread_id)
 
 	sys_cond.trace("sys_cond_signal_to(cond_id=0x%x, thread_id=0x%x)", cond_id, thread_id);
 
-	while (true)
+	const auto cond = idm::check<lv2_obj, lv2_cond>(cond_id, [&](lv2_cond& cond) -> int
 	{
-		if (ppu.test_stopped())
+		if (!idm::check_unlocked<named_thread<ppu_thread>>(thread_id))
 		{
-			ppu.state += cpu_flag::again;
-			return {};
+			return -1;
 		}
 
-		bool finished = true;
-
-		ppu.state += cpu_flag::wait;
-
-		const auto cond = idm::check<lv2_obj, lv2_cond>(cond_id, [&, notify = lv2_obj::notify_all_t()](lv2_cond& cond)
+		if (cond.waiters)
 		{
-			if (!idm::check_unlocked<named_thread<ppu_thread>>(thread_id))
+			std::lock_guard lock(cond.mutex->mutex);
+
+			for (auto cpu : cond.sq)
 			{
-				return -1;
-			}
-
-			if (atomic_storage<ppu_thread*>::load(cond.sq))
-			{
-				std::lock_guard lock(cond.mutex->mutex);
-
-				if (ppu.state & cpu_flag::suspend)
+				if (cpu->id == thread_id)
 				{
-					// Test if another signal caused the current thread to be suspended, in which case it needs to wait until the thread wakes up (otherwise the signal may cause unexpected results)
-					finished = false;
-					return 0;
-				}
+					ensure(cond.unqueue(cond.sq, cpu));
 
-				for (auto cpu = +cond.sq; cpu; cpu = cpu->next_cpu)
-				{
-					if (cpu->id == thread_id)
+					cond.waiters--;
+
+					if (cond.mutex->try_own(*cpu, cpu->id))
 					{
-						if (static_cast<ppu_thread*>(cpu)->state & cpu_flag::again)
-						{
-							ppu.state += cpu_flag::again;
-							return 0;
-						}
-
-						ensure(cond.unqueue(cond.sq, cpu));
-
-						if (cond.mutex->try_own(*cpu))
-						{
-							cond.awake(cpu);
-						}
-
-						return 1;
+						cond.awake(cpu);
 					}
+
+					return 1;
 				}
 			}
-			else
-			{
-				cond.mutex->mutex.lock_unlock();
-
-				if (ppu.state & cpu_flag::suspend)
-				{
-					finished = false;
-					return 0;
-				}
-			}
-
-			return 0;
-		});
-
-		if (!finished)
-		{
-			continue;
 		}
 
-		if (!cond || cond.ret == -1)
-		{
-			return CELL_ESRCH;
-		}
+		return 0;
+	});
 
-		if (!cond.ret)
-		{
-			return not_an_error(CELL_EPERM);
-		}
-
-		return CELL_OK;
+	if (!cond || cond.ret == -1)
+	{
+		return CELL_ESRCH;
 	}
+
+	if (!cond.ret)
+	{
+		return not_an_error(CELL_EPERM);
+	}
+
+	return CELL_OK;
 }
 
 error_code sys_cond_wait(ppu_thread& ppu, u32 cond_id, u64 timeout)
@@ -408,53 +206,24 @@ error_code sys_cond_wait(ppu_thread& ppu, u32 cond_id, u64 timeout)
 	// Further function result
 	ppu.gpr[3] = CELL_OK;
 
-	auto& sstate = *ppu.optional_savestate_state;
-
-	const auto cond = idm::get<lv2_obj, lv2_cond>(cond_id, [&, notify = lv2_obj::notify_all_t()](lv2_cond& cond) -> s64
+	const auto cond = idm::get<lv2_obj, lv2_cond>(cond_id, [&](lv2_cond& cond) -> s64
 	{
-		if (!ppu.loaded_from_savestate && atomic_storage<u32>::load(cond.mutex->control.raw().owner) != ppu.id)
+		if (cond.mutex->owner >> 1 != ppu.id)
 		{
 			return -1;
 		}
 
-		lv2_obj::prepare_for_sleep(ppu);
-
 		std::lock_guard lock(cond.mutex->mutex);
 
-		const u64 syscall_state = sstate.try_read<u64>().second;
-		sstate.clear();
-
-		if (ppu.loaded_from_savestate)
-		{
-			if (syscall_state & 1)
-			{
-				// Mutex sleep
-				ensure(!cond.mutex->try_own(ppu));
-			}
-			else
-			{
-				lv2_obj::emplace(cond.sq, &ppu);
-			}
-
-			cond.sleep(ppu, timeout);
-			return static_cast<u32>(syscall_state >> 32);
-		}
-
 		// Register waiter
-		lv2_obj::emplace(cond.sq, &ppu);
+		cond.sq.emplace_back(&ppu);
+		cond.waiters++;
 
 		// Unlock the mutex
-		const u32 count = cond.mutex->lock_count.exchange(0);
+		const auto count = cond.mutex->lock_count.exchange(0);
 
 		if (const auto cpu = cond.mutex->reown<ppu_thread>())
 		{
-			if (cpu->state & cpu_flag::again)
-			{
-				ensure(cond.unqueue(cond.sq, &ppu));
-				ppu.state += cpu_flag::again;
-				return 0;
-			}
-
 			cond.mutex->append(cpu);
 		}
 
@@ -470,117 +239,67 @@ error_code sys_cond_wait(ppu_thread& ppu, u32 cond_id, u64 timeout)
 		return CELL_ESRCH;
 	}
 
-	if (ppu.state & cpu_flag::again)
-	{
-		return {};
-	}
-
 	if (cond.ret < 0)
 	{
 		return CELL_EPERM;
 	}
 
-	while (auto state = +ppu.state)
+	while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
 	{
-		if (state & cpu_flag::signal && ppu.state.test_and_reset(cpu_flag::signal))
-		{
-			break;
-		}
-
 		if (is_stopped(state))
 		{
-			std::lock_guard lock(cond->mutex->mutex);
-
-			bool mutex_sleep = false;
-			bool cond_sleep = false;
-
-			for (auto cpu = atomic_storage<ppu_thread*>::load(cond->sq); cpu; cpu = cpu->next_cpu)
-			{
-				if (cpu == &ppu)
-				{
-					cond_sleep = true;
-					break;
-				}
-			}
-
-			for (auto cpu = atomic_storage<ppu_thread*>::load(cond->mutex->control.raw().sq); cpu; cpu = cpu->next_cpu)
-			{
-				if (cpu == &ppu)
-				{
-					mutex_sleep = true;
-					break;
-				}
-			}
-
-			if (!cond_sleep && !mutex_sleep)
-			{
-				break;
-			}
-
-			const u64 optional_syscall_state = u32{mutex_sleep} | (u64{static_cast<u32>(cond.ret)} << 32);
-			sstate(optional_syscall_state);
-
-			ppu.state += cpu_flag::again;
 			return {};
 		}
 
-		for (usz i = 0; cpu_flag::signal - ppu.state && i < 50; i++)
+		if (state & cpu_flag::signal)
 		{
-			busy_wait(500);
-		}
-
-		if (ppu.state & cpu_flag::signal)
- 		{
-			continue;
+			break;
 		}
 
 		if (timeout)
 		{
 			if (lv2_obj::wait_timeout(timeout, &ppu))
 			{
-				const u64 start_time = ppu.start_time;
-
 				// Wait for rescheduling
 				if (ppu.check_state())
 				{
-					continue;
+					return {};
 				}
 
-				ppu.state += cpu_flag::wait;
-
 				std::lock_guard lock(cond->mutex->mutex);
 
 				// Try to cancel the waiting
 				if (cond->unqueue(cond->sq, &ppu))
 				{
 					// TODO: Is EBUSY returned after reqeueing, on sys_cond_destroy?
+					cond->waiters--;
+
 					ppu.gpr[3] = CELL_ETIMEDOUT;
 
 					// Own or requeue
-					if (cond->mutex->try_own(ppu))
+					if (cond->mutex->try_own(ppu, ppu.id))
 					{
 						break;
 					}
 				}
-				else if (atomic_storage<u32>::load(cond->mutex->control.raw().owner) == ppu.id)
+				else if (cond->mutex->owner >> 1 == ppu.id)
 				{
 					break;
 				}
 
 				cond->mutex->sleep(ppu);
-				ppu.start_time = start_time; // Restore start time because awake has been called
 				timeout = 0;
 				continue;
 			}
 		}
 		else
 		{
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
 		}
 	}
 
 	// Verify ownership
-	ensure(atomic_storage<u32>::load(cond->mutex->control.raw().owner) == ppu.id);
+	ensure(cond->mutex->owner >> 1 == ppu.id);
 
 	// Restore the recursive value
 	cond->mutex->lock_count.release(static_cast<u32>(cond.ret));
diff --git a/rpcs3/Emu/Cell/lv2/sys_cond.h b/rpcs3/Emu/Cell/lv2/sys_cond.h
index 60e7c24e61..7baef27841 100644
--- a/rpcs3/Emu/Cell/lv2/sys_cond.h
+++ b/rpcs3/Emu/Cell/lv2/sys_cond.h
@@ -26,17 +26,30 @@ struct lv2_cond final : lv2_obj
 	const u64 name;
 	const u32 mtx_id;
 
-	lv2_mutex* mutex; // Associated Mutex
-	shared_ptr<lv2_obj> _mutex;
-	ppu_thread* sq{};
+	std::shared_ptr<lv2_mutex> mutex; // Associated Mutex
+	atomic_t<u32> waiters{0};
+	std::deque<cpu_thread*> sq;
 
-	lv2_cond(u64 key, u64 name, u32 mtx_id, shared_ptr<lv2_obj> mutex0) noexcept;
+	lv2_cond(u64 key, u64 name, u32 mtx_id, std::shared_ptr<lv2_mutex> mutex)
+		: key(key)
+		, name(name)
+		, mtx_id(mtx_id)
+		, mutex(std::move(mutex))
+	{
+	}
 
-	lv2_cond(utils::serial& ar) noexcept;
-	static std::function<void(void*)> load(utils::serial& ar);
-	void save(utils::serial& ar);
+	CellError on_id_create()
+	{
+		if (mutex->exists)
+		{
+			mutex->cond_count++;
+			exists++;
+			return {};
+		}
 
-	CellError on_id_create();
+		// Mutex has been destroyed, cannot create conditional variable
+		return CELL_ESRCH;
+	}
 };
 
 class ppu_thread;
diff --git a/rpcs3/Emu/Cell/lv2/sys_config.cpp b/rpcs3/Emu/Cell/lv2/sys_config.cpp
index 0179a6b7f2..f3fa0bbe21 100644
--- a/rpcs3/Emu/Cell/lv2/sys_config.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_config.cpp
@@ -1,4 +1,6 @@
 #include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/Memory/vm.h"
 #include "Emu/IdManager.h"
 
 #include "Emu/Cell/lv2/sys_event.h"
@@ -99,54 +101,18 @@ void lv2_config::initialize()
 	lv2_config_service::create(SYS_CONFIG_SERVICE_PADMANAGER2, 0, 1, 0, hid_info, 0x1a)->notify();
 }
 
-void lv2_config::add_service_event(shared_ptr<lv2_config_service_event> event)
+void lv2_config::add_service_event(const std::shared_ptr<lv2_config_service_event>& event)
 {
 	std::lock_guard lock(m_mutex);
-	events.emplace(event->id, std::move(event));
+	events.emplace(event->id, event);
 }
 
 void lv2_config::remove_service_event(u32 id)
 {
-	shared_ptr<lv2_config_service_event> ptr;
-
 	std::lock_guard lock(m_mutex);
-
-	if (auto it = events.find(id); it != events.end())
-	{
-		ptr = std::move(it->second);
-		events.erase(it);
-	}
+	events.erase(id);
 }
 
-lv2_config_service_event& lv2_config_service_event::operator=(thread_state s) noexcept
-{
-	if (s == thread_state::destroying_context && !m_destroyed.exchange(true))
-	{
-		if (auto global = g_fxo->try_get<lv2_config>())
-		{
-			global->remove_service_event(id);
-		}
-	}
-
-	return *this;
-}
-
-lv2_config_service_event::~lv2_config_service_event() noexcept
-{
-	operator=(thread_state::destroying_context);
-}
-
-lv2_config::~lv2_config() noexcept
-{
-	for (auto& [key, event] : events)
-	{
-		if (event)
-		{
-			// Avoid collision with lv2_config_service_event destructor
-			event->m_destroyed = true;
-		}
-	}
-}
 
 // LV2 Config Service Listener
 bool lv2_config_service_listener::check_service(const lv2_config_service& service) const
@@ -174,13 +140,13 @@ bool lv2_config_service_listener::check_service(const lv2_config_service& servic
 	return true;
 }
 
-bool lv2_config_service_listener::notify(const shared_ptr<lv2_config_service_event>& event)
+bool lv2_config_service_listener::notify(const std::shared_ptr<lv2_config_service_event>& event)
 {
 	service_events.emplace_back(event);
 	return event->notify();
 }
 
-bool lv2_config_service_listener::notify(const shared_ptr<lv2_config_service>& service)
+bool lv2_config_service_listener::notify(const std::shared_ptr<lv2_config_service>& service)
 {
 	if (!check_service(*service))
 		return false;
@@ -192,7 +158,7 @@ bool lv2_config_service_listener::notify(const shared_ptr<lv2_config_service>& s
 
 void lv2_config_service_listener::notify_all()
 {
-	std::vector<shared_ptr<lv2_config_service>> services;
+	std::vector<std::shared_ptr<lv2_config_service>> services;
 
 	// Grab all events
 	idm::select<lv2_config_service>([&](u32 /*id*/, lv2_config_service& service)
@@ -201,10 +167,10 @@ void lv2_config_service_listener::notify_all()
 		{
 			services.push_back(service.get_shared_ptr());
 		}
-	});
+	}, 0);
 
 	// Sort services by timestamp
-	sort(services.begin(), services.end(), [](const shared_ptr<lv2_config_service>& s1, const shared_ptr<lv2_config_service>& s2)
+	sort(services.begin(), services.end(), [](const std::shared_ptr<lv2_config_service>& s1, const std::shared_ptr<lv2_config_service>& s2)
 	{
 		return s1->timestamp < s2->timestamp;
 	});
@@ -232,9 +198,9 @@ void lv2_config_service::unregister()
 
 void lv2_config_service::notify() const
 {
-	std::vector<shared_ptr<lv2_config_service_listener>> listeners;
+	std::vector<std::shared_ptr<lv2_config_service_listener>> listeners;
 
-	const shared_ptr<lv2_config_service> sptr = get_shared_ptr();
+	auto sptr = wkptr.lock();
 
 	idm::select<lv2_config_service_listener>([&](u32 /*id*/, lv2_config_service_listener& listener)
 	{
@@ -244,14 +210,13 @@ void lv2_config_service::notify() const
 
 	for (auto& listener : listeners)
 	{
-		listener->notify(sptr);
+		listener->notify(this->get_shared_ptr());
 	}
 }
 
 bool lv2_config_service_event::notify() const
 {
-	const auto _handle = handle;
-
+	const auto _handle = handle.lock();
 	if (!_handle)
 	{
 		return false;
@@ -294,7 +259,7 @@ error_code sys_config_open(u32 equeue_hdl, vm::ptr<u32> out_config_hdl)
 	sys_config.trace("sys_config_open(equeue_hdl=0x%x, out_config_hdl=*0x%x)", equeue_hdl, out_config_hdl);
 
 	// Find queue with the given ID
-	const auto queue = idm::get_unlocked<lv2_obj, lv2_event_queue>(equeue_hdl);
+	const auto queue = idm::get<lv2_obj, lv2_event_queue>(equeue_hdl);
 	if (!queue)
 	{
 		return CELL_ESRCH;
@@ -338,7 +303,7 @@ error_code sys_config_get_service_event(u32 config_hdl, u32 event_id, vm::ptr<sy
 	sys_config.trace("sys_config_get_service_event(config_hdl=0x%x, event_id=0x%llx, dst=*0x%llx, size=0x%llx)", config_hdl, event_id, dst, size);
 
 	// Find sys_config handle object with the given ID
-	const auto cfg = idm::get_unlocked<lv2_config_handle>(config_hdl);
+	const auto cfg = idm::get<lv2_config_handle>(config_hdl);
 	if (!cfg)
 	{
 		return CELL_ESRCH;
@@ -370,7 +335,7 @@ error_code sys_config_add_service_listener(u32 config_hdl, sys_config_service_id
 	sys_config.trace("sys_config_add_service_listener(config_hdl=0x%x, service_id=0x%llx, min_verbosity=0x%llx, in=*0x%x, size=%lld, type=0x%llx, out_listener_hdl=*0x%x)", config_hdl, service_id, min_verbosity, in, size, type, out_listener_hdl);
 
 	// Find sys_config handle object with the given ID
-	auto cfg = idm::get_unlocked<lv2_config_handle>(config_hdl);
+	auto cfg = idm::get<lv2_config_handle>(config_hdl);
 	if (!cfg)
 	{
 		return CELL_ESRCH;
@@ -418,7 +383,7 @@ error_code sys_config_register_service(u32 config_hdl, sys_config_service_id ser
 	sys_config.trace("sys_config_register_service(config_hdl=0x%x, service_id=0x%llx, user_id=0x%llx, verbosity=0x%llx, data_but=*0x%llx, size=%lld, out_service_hdl=*0x%llx)", config_hdl, service_id, user_id, verbosity, data_buf, size, out_service_hdl);
 
 	// Find sys_config handle object with the given ID
-	const auto cfg = idm::get_unlocked<lv2_config_handle>(config_hdl);
+	const auto cfg = idm::get<lv2_config_handle>(config_hdl);
 	if (!cfg)
 	{
 		return CELL_ESRCH;
diff --git a/rpcs3/Emu/Cell/lv2/sys_config.h b/rpcs3/Emu/Cell/lv2/sys_config.h
index 0804671141..8c3027c4bf 100644
--- a/rpcs3/Emu/Cell/lv2/sys_config.h
+++ b/rpcs3/Emu/Cell/lv2/sys_config.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "util/atomic.hpp"
-#include "util/shared_ptr.hpp"
-#include "Emu/Cell/timers.hpp"
+#include <map>
+#include <list>
+
 
 /*
  * sys_config is a "subscription-based data storage API"
@@ -133,33 +133,31 @@ class lv2_config
 	shared_mutex m_mutex;
 
 	// Map of LV2 Service Events
-	std::unordered_map<u32, shared_ptr<lv2_config_service_event>> events;
+	std::unordered_map<u32, std::weak_ptr<lv2_config_service_event>> events;
 
 public:
 	void initialize();
 
 	// Service Events
-	void add_service_event(shared_ptr<lv2_config_service_event> event);
+	void add_service_event(const std::shared_ptr<lv2_config_service_event>& event);
 	void remove_service_event(u32 id);
 
-	shared_ptr<lv2_config_service_event> find_event(u32 id)
+	std::shared_ptr<lv2_config_service_event> find_event(u32 id)
 	{
 		reader_lock lock(m_mutex);
 
 		const auto it = events.find(id);
 
 		if (it == events.cend())
-			return null_ptr;
+			return nullptr;
 
-		if (it->second)
+		if (auto event = it->second.lock())
 		{
-			return it->second;
+			return event;
 		}
 
-		return null_ptr;
+		return nullptr;
 	}
-
-	~lv2_config() noexcept;
 };
 
 /*
@@ -171,41 +169,38 @@ public:
 	static const u32 id_base = 0x41000000;
 	static const u32 id_step = 0x100;
 	static const u32 id_count = 2048;
-	SAVESTATE_INIT_POS(37);
 
 private:
 	u32 idm_id;
 
 	// queue for service/io event notifications
-	const shared_ptr<lv2_event_queue> queue;
+	const std::weak_ptr<lv2_event_queue> queue;
 
 	bool send_queue_event(u64 source, u64 d1, u64 d2, u64 d3) const
 	{
-		if (auto sptr = queue)
+		if (auto sptr = queue.lock())
 		{
 			return sptr->send(source, d1, d2, d3) == 0;
 		}
-
 		return false;
 	}
 
 public:
 	// Constructors (should not be used directly)
-	lv2_config_handle(shared_ptr<lv2_event_queue> _queue) noexcept
+	lv2_config_handle(std::weak_ptr<lv2_event_queue>&& _queue)
 		: queue(std::move(_queue))
-	{
-	}
+	{}
 
 	// Factory
 	template <typename... Args>
-	static shared_ptr<lv2_config_handle> create(Args&&... args)
+	static std::shared_ptr<lv2_config_handle> create(Args&&... args)
 	{
 		if (auto cfg = idm::make_ptr<lv2_config_handle>(std::forward<Args>(args)...))
 		{
 			cfg->idm_id = idm::last_id();
 			return cfg;
 		}
-		return null_ptr;
+		return nullptr;
 	}
 
 	// Notify event queue for this handle
@@ -224,11 +219,11 @@ public:
 	static const u32 id_base = 0x43000000;
 	static const u32 id_step = 0x100;
 	static const u32 id_count = 2048;
-	SAVESTATE_INIT_POS(38);
 
 private:
 	// IDM data
 	u32 idm_id;
+	std::weak_ptr<lv2_config_service> wkptr;
 
 	// Whether this service is currently registered or not
 	bool registered = true;
@@ -243,27 +238,27 @@ public:
 	const std::vector<u8> data;
 
 	// Constructors (should not be used directly)
-	lv2_config_service(sys_config_service_id _id, u64 _user_id, u64 _verbosity, u32 _padding, const u8* _data, usz size) noexcept
+	lv2_config_service(sys_config_service_id _id, u64 _user_id, u64 _verbosity, u32 _padding, const u8 _data[], usz size)
 		: timestamp(get_system_time())
 		, id(_id)
 		, user_id(_user_id)
 		, verbosity(_verbosity)
 		, padding(_padding)
 		, data(&_data[0], &_data[size])
-	{
-	}
+	{}
 
 	// Factory
 	template <typename... Args>
-	static shared_ptr<lv2_config_service> create(Args&&... args)
+	static std::shared_ptr<lv2_config_service> create(Args&&... args)
 	{
 		if (auto service = idm::make_ptr<lv2_config_service>(std::forward<Args>(args)...))
 		{
+			service->wkptr = service;
 			service->idm_id = idm::last_id();
 			return service;
 		}
 
-		return null_ptr;
+		return nullptr;
 	}
 
 	// Registration
@@ -275,7 +270,7 @@ public:
 
 	// Utilities
 	usz get_size() const { return sizeof(sys_config_service_event_t)-1 + data.size(); }
-	shared_ptr<lv2_config_service> get_shared_ptr () const { return stx::make_shared_from_this<lv2_config_service>(this); }
+	std::shared_ptr<lv2_config_service> get_shared_ptr () const { return wkptr.lock(); }
 	u32 get_id() const { return idm_id; }
 };
 
@@ -288,18 +283,18 @@ public:
 	static const u32 id_base = 0x42000000;
 	static const u32 id_step = 0x100;
 	static const u32 id_count = 2048;
-	SAVESTATE_INIT_POS(39);
 
 private:
 	// IDM data
 	u32 idm_id;
+	std::weak_ptr<lv2_config_service_listener> wkptr;
 
 	// The service listener owns the service events - service events will not be freed as long as their corresponding listener exists
 	// This has been confirmed to be the case in realhw
-	std::vector<shared_ptr<lv2_config_service_event>> service_events;
-	shared_ptr<lv2_config_handle> handle;
+	std::vector<std::shared_ptr<lv2_config_service_event>> service_events;
+	std::weak_ptr<lv2_config_handle> handle;
 
-	bool notify(const shared_ptr<lv2_config_service_event>& event);
+	bool notify(const std::shared_ptr<lv2_config_service_event>& event);
 
 public:
 	const sys_config_service_id service_id;
@@ -309,8 +304,8 @@ public:
 	const std::vector<u8> data;
 
 	// Constructors (should not be used directly)
-	lv2_config_service_listener(shared_ptr<lv2_config_handle> _handle, sys_config_service_id _service_id, u64 _min_verbosity, sys_config_service_listener_type _type, const u8* _data, usz size) noexcept
-		: handle(std::move(_handle))
+	lv2_config_service_listener(std::shared_ptr<lv2_config_handle>& _handle, sys_config_service_id _service_id, u64 _min_verbosity, sys_config_service_listener_type _type, const u8 _data[], usz size)
+		: handle(_handle)
 		, service_id(_service_id)
 		, min_verbosity(_min_verbosity)
 		, type(_type)
@@ -319,29 +314,30 @@ public:
 
 	// Factory
 	template <typename... Args>
-	static shared_ptr<lv2_config_service_listener> create(Args&&... args)
+	static std::shared_ptr<lv2_config_service_listener> create(Args&&... args)
 	{
 		if (auto listener = idm::make_ptr<lv2_config_service_listener>(std::forward<Args>(args)...))
 		{
+			listener->wkptr = listener;
 			listener->idm_id = idm::last_id();
 			return listener;
 		}
 
-		return null_ptr;
+		return nullptr;
 	}
 
 	// Check whether service matches
 	bool check_service(const lv2_config_service& service) const;
 
 	// Register new event, and notify queue
-	bool notify(const shared_ptr<lv2_config_service>& service);
+	bool notify(const std::shared_ptr<lv2_config_service>& service);
 
 	// (Re-)notify about all still-registered past events
 	void notify_all();
 
 	// Utilities
 	u32 get_id() const { return idm_id; }
-	shared_ptr<lv2_config_service_listener> get_shared_ptr() const { return stx::make_shared_from_this<lv2_config_service_listener>(this); }
+	std::shared_ptr<lv2_config_service_listener> get_shared_ptr() const { return wkptr.lock(); }
 };
 
 /*
@@ -359,33 +355,35 @@ class lv2_config_service_event
 		return g_fxo->get<service_event_id>().next_id++;
 	}
 
-	atomic_t<bool> m_destroyed = false;
-
-	friend class lv2_config;
-
 public:
 	const u32 id;
 
 	// Note: Events hold a shared_ptr to their corresponding service - services only get freed once there are no more pending service events
 	// This has been confirmed to be the case in realhw
-	const shared_ptr<lv2_config_handle> handle;
-	const shared_ptr<lv2_config_service> service;
+	const std::weak_ptr<lv2_config_handle> handle;
+	const std::shared_ptr<lv2_config_service> service;
 	const lv2_config_service_listener& listener;
 
 	// Constructors (should not be used directly)
-	lv2_config_service_event(shared_ptr<lv2_config_handle> _handle, shared_ptr<lv2_config_service> _service, const lv2_config_service_listener& _listener) noexcept
+	lv2_config_service_event(const std::weak_ptr<lv2_config_handle>& _handle, const std::shared_ptr<lv2_config_service>& _service, const lv2_config_service_listener& _listener)
+		: id(get_next_id())
+		, handle(_handle)
+		, service(_service)
+		, listener(_listener)
+	{}
+
+	lv2_config_service_event(const std::weak_ptr<lv2_config_handle>&& _handle, const std::shared_ptr<lv2_config_service>&& _service, const lv2_config_service_listener& _listener)
 		: id(get_next_id())
 		, handle(std::move(_handle))
 		, service(std::move(_service))
 		, listener(_listener)
-	{
-	}
+	{}
 
 	// Factory
 	template <typename... Args>
-	static shared_ptr<lv2_config_service_event> create(Args&&... args)
+	static std::shared_ptr<lv2_config_service_event> create(Args&&... args)
 	{
-		auto ev = make_shared<lv2_config_service_event>(std::forward<Args>(args)...);
+		auto ev = std::make_shared<lv2_config_service_event>(std::forward<Args>(args)...);
 
 		g_fxo->get<lv2_config>().add_service_event(ev);
 
@@ -393,8 +391,13 @@ public:
 	}
 
 	// Destructor
-	lv2_config_service_event& operator=(thread_state s) noexcept;
-	~lv2_config_service_event() noexcept;
+	~lv2_config_service_event()
+	{
+		if (auto& global = g_fxo->get<lv2_config>(); !Emu.IsStopped())
+		{
+			global.remove_service_event(id);
+		}
+	}
 
 	// Notify queue that this event exists
 	bool notify() const;
diff --git a/rpcs3/Emu/Cell/lv2/sys_console.h b/rpcs3/Emu/Cell/lv2/sys_console.h
index 2ba3189e88..202f238232 100644
--- a/rpcs3/Emu/Cell/lv2/sys_console.h
+++ b/rpcs3/Emu/Cell/lv2/sys_console.h
@@ -5,4 +5,4 @@
 // SysCalls
 
 error_code sys_console_write(vm::cptr<char> buf, u32 len);
-constexpr auto sys_console_write2 = sys_console_write;
+constexpr auto sys_console_write2 = sys_console_write; 
diff --git a/rpcs3/Emu/Cell/lv2/sys_dbg.cpp b/rpcs3/Emu/Cell/lv2/sys_dbg.cpp
index 27fa51b148..8375a06c9f 100644
--- a/rpcs3/Emu/Cell/lv2/sys_dbg.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_dbg.cpp
@@ -2,14 +2,7 @@
 #include "sys_dbg.h"
 
 #include "Emu/Cell/ErrorCodes.h"
-
-#include "Emu/Cell/PPUInterpreter.h"
 #include "Emu/Cell/Modules/sys_lv2dbg.h"
-#include "Emu/Memory/vm_locking.h"
-
-#include "util/asm.hpp"
-
-void ppu_register_function_at(u32 addr, u32 size, ppu_intrp_func_t ptr = nullptr);
 
 LOG_CHANNEL(sys_dbg);
 
@@ -28,21 +21,13 @@ error_code sys_dbg_read_process_memory(s32 pid, u32 address, u32 size, vm::ptr<v
 		return CELL_LV2DBG_ERROR_DEINVALIDARGUMENTS;
 	}
 
-	vm::writer_lock lock;
-
 	// Check if data destination is writable
 	if (!vm::check_addr(data.addr(), vm::page_writable, size))
 	{
 		return CELL_EFAULT;
 	}
 
-	// Check if the source is readable
-	if (!vm::check_addr(address, vm::page_readable, size))
-	{
-		return CELL_EFAULT;
-	}
-
-	std::memmove(data.get_ptr(), vm::base(address), size);
+	std::memcpy(data.get_ptr(), vm::get_super_ptr(address), size);
 
 	return CELL_OK;
 }
@@ -68,64 +53,7 @@ error_code sys_dbg_write_process_memory(s32 pid, u32 address, u32 size, vm::cptr
 		return CELL_EFAULT;
 	}
 
-	// Check destination (can be read-only actually)
-	if (!vm::check_addr(address, vm::page_readable, size))
-	{
-		return CELL_EFAULT;
-	}
-
-	vm::writer_lock lock;
-
-	// Again
-	if (!vm::check_addr(data.addr(), vm::page_readable, size) || !vm::check_addr(address, vm::page_readable, size))
-	{
-		return CELL_EFAULT;
-	}
-
-	const u8* data_ptr = static_cast<const u8*>(data.get_ptr());
-
-	if ((address >> 28) == 0xDu)
-	{
-		// Stack pages (4k pages is the exception here)
-		std::memmove(vm::base(address), data_ptr, size);
-		return CELL_OK;
-	}
-
-	const u32 end = address + size;
-
-	for (u32 i = address, exec_update_size = 0; i < end;)
-	{
-		const u32 op_size = std::min<u32>(utils::align<u32>(i + 1, 0x10000), end) - i;
-
-		const bool is_exec = vm::check_addr(i, vm::page_executable | vm::page_readable);
-
-		if (is_exec)
-		{
-			exec_update_size += op_size;
-			i += op_size;
-		}
-
-		if (!is_exec || i >= end)
-		{
-			// Commit executable data update
-			// The read memory is also super ptr so memmove can work correctly on all implementations
-			const u32 before_addr = i - exec_update_size;
-			std::memmove(vm::get_super_ptr(before_addr), vm::get_super_ptr(data.addr() + (before_addr - address)), exec_update_size);
-			ppu_register_function_at(before_addr, exec_update_size);
-			exec_update_size = 0;
-
-			if (i >= end)
-			{
-				break;
-			}
-		}
-
-		if (!is_exec)
-		{
-			std::memmove(vm::base(i), data_ptr + (i - address), op_size);
-			i += op_size;
-		}
-	}
+	std::memcpy(vm::get_super_ptr(address), data.get_ptr(), size);
 
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/Cell/lv2/sys_event.cpp b/rpcs3/Emu/Cell/lv2/sys_event.cpp
index db72972b91..21727ec559 100644
--- a/rpcs3/Emu/Cell/lv2/sys_event.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_event.cpp
@@ -3,15 +3,12 @@
 
 #include "Emu/IdManager.h"
 #include "Emu/IPC.h"
-#include "Emu/System.h"
 
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/SPUThread.h"
 #include "sys_process.h"
 
-#include "util/asm.hpp"
-
 LOG_CHANNEL(sys_event);
 
 lv2_event_queue::lv2_event_queue(u32 protocol, s32 type, s32 size, u64 name, u64 ipc_key) noexcept
@@ -24,89 +21,7 @@ lv2_event_queue::lv2_event_queue(u32 protocol, s32 type, s32 size, u64 name, u64
 {
 }
 
-lv2_event_queue::lv2_event_queue(utils::serial& ar) noexcept
-	: id(idm::last_id())
-	, protocol(ar)
-	, type(ar)
-	, size(ar)
-	, name(ar)
-	, key(ar)
-{
-	ar(events);
-}
-
-std::function<void(void*)> lv2_event_queue::load(utils::serial& ar)
-{
-	auto queue = make_shared<lv2_event_queue>(stx::exact_t<utils::serial&>(ar));
-	return [ptr = lv2_obj::load(queue->key, queue)](void* storage) { *static_cast<atomic_ptr<lv2_obj>*>(storage) = ptr; };
-}
-
-void lv2_event_queue::save(utils::serial& ar)
-{
-	ar(protocol, type, size, name, key, events);
-}
-
-void lv2_event_queue::save_ptr(utils::serial& ar, lv2_event_queue* q)
-{
-	if (!lv2_obj::check(q))
-	{
-		ar(u32{0});
-		return;
-	}
-
-	ar(q->id);
-}
-
-shared_ptr<lv2_event_queue> lv2_event_queue::load_ptr(utils::serial& ar, shared_ptr<lv2_event_queue>& queue, std::string_view msg)
-{
-	const u32 id = ar.pop<u32>();
-
-	if (!id)
-	{
-		return {};
-	}
-
-	if (auto q = idm::get_unlocked<lv2_obj, lv2_event_queue>(id))
-	{
-		// Already initialized
-		return q;
-	}
-
-	if (id >> 24 != id_base >> 24)
-	{
-		fmt::throw_exception("Failed in event queue pointer deserialization (invalid ID): location: %s, id=0x%x", msg, id);
-	}
-
-	Emu.PostponeInitCode([id, &queue, msg_str = std::string{msg}]()
-	{
-		// Defer resolving
-		queue = idm::get_unlocked<lv2_obj, lv2_event_queue>(id);
-
-		if (!queue)
-		{
-			fmt::throw_exception("Failed in event queue pointer deserialization (not found): location: %s, id=0x%x", msg_str, id);
-		}
-	});
-
-	// Null until resolved
-	return {};
-}
-
-lv2_event_port::lv2_event_port(utils::serial& ar)
-	: type(ar)
-	, name(ar)
-	, queue(lv2_event_queue::load_ptr(ar, queue, "eventport"))
-{
-}
-
-void lv2_event_port::save(utils::serial& ar)
-{
-	ar(type, name);
-
-	lv2_event_queue::save_ptr(ar, queue.get());
-}
-
-shared_ptr<lv2_event_queue> lv2_event_queue::find(u64 ipc_key)
+std::shared_ptr<lv2_event_queue> lv2_event_queue::find(u64 ipc_key)
 {
 	if (ipc_key == SYS_EVENT_QUEUE_LOCAL)
 	{
@@ -119,13 +34,8 @@ shared_ptr<lv2_event_queue> lv2_event_queue::find(u64 ipc_key)
 
 extern void resume_spu_thread_group_from_waiting(spu_thread& spu);
 
-CellError lv2_event_queue::send(lv2_event event, bool* notified_thread, lv2_event_port* port)
+CellError lv2_event_queue::send(lv2_event event)
 {
-	if (notified_thread)
-	{
-		*notified_thread = false;
-	}
-
 	std::lock_guard lock(mutex);
 
 	if (!exists)
@@ -133,7 +43,7 @@ CellError lv2_event_queue::send(lv2_event event, bool* notified_thread, lv2_even
 		return CELL_ENOTCONN;
 	}
 
-	if (!pq && !sq)
+	if (sq.empty())
 	{
 		if (events.size() < this->size + 0u)
 		{
@@ -148,53 +58,17 @@ CellError lv2_event_queue::send(lv2_event event, bool* notified_thread, lv2_even
 	if (type == SYS_PPU_QUEUE)
 	{
 		// Store event in registers
-		auto& ppu = static_cast<ppu_thread&>(*schedule<ppu_thread>(pq, protocol));
-
-		if (ppu.state & cpu_flag::again)
-		{
-			if (auto cpu = get_current_cpu_thread())
-			{
-				cpu->state += cpu_flag::again;
-				cpu->state += cpu_flag::exit;
-			}
-
-			sys_event.warning("Ignored event!");
-
-			// Fake error for abort
-			return CELL_EAGAIN;
-		}
+		auto& ppu = static_cast<ppu_thread&>(*schedule<ppu_thread>(sq, protocol));
 
 		std::tie(ppu.gpr[4], ppu.gpr[5], ppu.gpr[6], ppu.gpr[7]) = event;
 
 		awake(&ppu);
-
-		if (port && ppu.prio.load().prio < ensure(cpu_thread::get_current<ppu_thread>())->prio.load().prio)
-		{
-			// Block event port disconnection for the time being of sending events
-			// PPU -> lower prio PPU is the only case that can cause thread blocking 
-			port->is_busy++;
-			ensure(notified_thread);
-			*notified_thread = true;
-		}
 	}
 	else
 	{
 		// Store event in In_MBox
 		auto& spu = static_cast<spu_thread&>(*schedule<spu_thread>(sq, protocol));
 
-		if (spu.state & cpu_flag::again)
-		{
-			if (auto cpu = get_current_cpu_thread())
-			{
-				cpu->state += cpu_flag::exit + cpu_flag::again;
-			}
-
-			sys_event.warning("Ignored event!");
-
-			// Fake error for abort
-			return CELL_EAGAIN;
-		}
-
 		const u32 data1 = static_cast<u32>(std::get<1>(event));
 		const u32 data2 = static_cast<u32>(std::get<2>(event));
 		const u32 data3 = static_cast<u32>(std::get<3>(event));
@@ -238,13 +112,12 @@ error_code sys_event_queue_create(cpu_thread& cpu, vm::ptr<u32> equeue_id, vm::p
 
 	if (const auto error = lv2_obj::create<lv2_event_queue>(pshared, ipc_key, flags, [&]()
 	{
-		return make_shared<lv2_event_queue>(protocol, type, size, name, ipc_key);
+		return std::make_shared<lv2_event_queue>(protocol, type, size, name, ipc_key);
 	}))
 	{
 		return error;
 	}
 
-	cpu.check_state();
 	*equeue_id = idm::last_id();
 	return CELL_OK;
 }
@@ -260,47 +133,16 @@ error_code sys_event_queue_destroy(ppu_thread& ppu, u32 equeue_id, s32 mode)
 		return CELL_EINVAL;
 	}
 
-	std::vector<lv2_event> events;
-
-	std::unique_lock<shared_mutex> qlock;
-
-	cpu_thread* head{};
-
 	const auto queue = idm::withdraw<lv2_obj, lv2_event_queue>(equeue_id, [&](lv2_event_queue& queue) -> CellError
 	{
-		qlock = std::unique_lock{queue.mutex};
+		std::lock_guard lock(queue.mutex);
 
-		head = queue.type == SYS_PPU_QUEUE ? static_cast<cpu_thread*>(+queue.pq) : +queue.sq;
-
-		if (!mode && head)
+		if (!mode && !queue.sq.empty())
 		{
 			return CELL_EBUSY;
 		}
 
-		if (!queue.events.empty())
-		{
-			// Copy events for logging, does not empty
-			events.insert(events.begin(), queue.events.begin(), queue.events.end());
-		}
-
 		lv2_obj::on_id_destroy(queue, queue.key);
-
-		if (!head)
-		{
-			qlock.unlock();
-		}
-		else
-		{
-			for (auto cpu = head; cpu; cpu = cpu->get_next_cpu())
-			{
-				if (cpu->state & cpu_flag::again)
-				{
-					ppu.state += cpu_flag::again;
-					return CELL_EAGAIN;
-				}
-			}
-		}
-
 		return {};
 	});
 
@@ -309,79 +151,39 @@ error_code sys_event_queue_destroy(ppu_thread& ppu, u32 equeue_id, s32 mode)
 		return CELL_ESRCH;
 	}
 
-	if (ppu.state & cpu_flag::again)
-	{
-		return {};
-	}
-
 	if (queue.ret)
 	{
 		return queue.ret;
 	}
 
-	std::string lost_data;
-
-	if (qlock.owns_lock())
+	if (mode == SYS_EVENT_QUEUE_DESTROY_FORCE)
 	{
-		if (sys_event.warning)
-		{
-			u32 size = 0;
+		std::deque<cpu_thread*> sq;
 
-			for (auto cpu = head; cpu; cpu = cpu->get_next_cpu())
-			{
-				size++;
-			}
-
-			fmt::append(lost_data, "Forcefully awaken waiters (%u):\n", size);
-
-			for (auto cpu = head; cpu; cpu = cpu->get_next_cpu())
-			{
-				lost_data += cpu->get_name();
-				lost_data += '\n';
-			}
-		}
+		std::lock_guard lock(queue->mutex);
 
+		sq = std::move(queue->sq);
+	
 		if (queue->type == SYS_PPU_QUEUE)
 		{
-			for (auto cpu = +queue->pq; cpu; cpu = cpu->next_cpu)
+			for (auto cpu : sq)
 			{
-				cpu->gpr[3] = CELL_ECANCELED;
+				static_cast<ppu_thread&>(*cpu).gpr[3] = CELL_ECANCELED;
 				queue->append(cpu);
 			}
 
-			atomic_storage<ppu_thread*>::release(queue->pq, nullptr);
-			lv2_obj::awake_all();
+			if (!queue->sq.empty())
+			{
+				lv2_obj::awake_all();
+			}
 		}
 		else
 		{
-			for (auto cpu = +queue->sq; cpu; cpu = cpu->next_cpu)
+			for (auto cpu : sq)
 			{
-				cpu->ch_in_mbox.set_values(1, CELL_ECANCELED);
-				resume_spu_thread_group_from_waiting(*cpu);
+				static_cast<spu_thread&>(*cpu).ch_in_mbox.set_values(1, CELL_ECANCELED);
+				resume_spu_thread_group_from_waiting(static_cast<spu_thread&>(*cpu));
 			}
-
-			atomic_storage<spu_thread*>::release(queue->sq, nullptr);
-		}
-
-		qlock.unlock();
-	}
-
-	if (sys_event.warning)
-	{
-		if (!events.empty())
-		{
-			fmt::append(lost_data, "Unread queue events (%u):\n", events.size());
-		}
-
-		for (const lv2_event& evt : events)
-		{
-			fmt::append(lost_data, "data0=0x%x, data1=0x%x, data2=0x%x, data3=0x%x\n"
-				, std::get<0>(evt), std::get<1>(evt), std::get<2>(evt), std::get<3>(evt));
-		}
-
-		if (!lost_data.empty())
-		{
-			sys_event.warning("sys_event_queue_destroy(): %s", lost_data);
 		}
 	}
 
@@ -394,7 +196,7 @@ error_code sys_event_queue_tryreceive(ppu_thread& ppu, u32 equeue_id, vm::ptr<sy
 
 	sys_event.trace("sys_event_queue_tryreceive(equeue_id=0x%x, event_array=*0x%x, size=%d, number=*0x%x)", equeue_id, event_array, size, number);
 
-	const auto queue = idm::get_unlocked<lv2_obj, lv2_event_queue>(equeue_id);
+	const auto queue = idm::get<lv2_obj, lv2_event_queue>(equeue_id);
 
 	if (!queue)
 	{
@@ -406,28 +208,19 @@ error_code sys_event_queue_tryreceive(ppu_thread& ppu, u32 equeue_id, vm::ptr<sy
 		return CELL_EINVAL;
 	}
 
-	std::array<sys_event_t, 127> events;
-
-	std::unique_lock lock(queue->mutex);
-
-	if (!queue->exists)
-	{
-		return CELL_ESRCH;
-	}
+	std::lock_guard lock(queue->mutex);
 
 	s32 count = 0;
 
-	while (count < size && !queue->events.empty())
+	while (queue->sq.empty() && count < size && !queue->events.empty())
 	{
-		auto& dest = events[count++];
-		std::tie(dest.source, dest.data1, dest.data2, dest.data3) = queue->events.front();
+		auto& dest = event_array[count++];
+		const auto event = queue->events.front();
 		queue->events.pop_front();
+
+		std::tie(dest.source, dest.data1, dest.data2, dest.data3) = event;
 	}
 
-	lock.unlock();
-	ppu.check_state();
-
-	std::copy_n(events.begin(), count, event_array.get_ptr());
 	*number = count;
 
 	return CELL_OK;
@@ -441,20 +234,18 @@ error_code sys_event_queue_receive(ppu_thread& ppu, u32 equeue_id, vm::ptr<sys_e
 
 	ppu.gpr[3] = CELL_OK;
 
-	const auto queue = idm::get<lv2_obj, lv2_event_queue>(equeue_id, [&, notify = lv2_obj::notify_all_t()](lv2_event_queue& queue) -> CellError
+	const auto queue = idm::get<lv2_obj, lv2_event_queue>(equeue_id, [&](lv2_event_queue& queue) -> CellError
 	{
 		if (queue.type != SYS_PPU_QUEUE)
 		{
 			return CELL_EINVAL;
 		}
 
-		lv2_obj::prepare_for_sleep(ppu);
-
 		std::lock_guard lock(queue.mutex);
 
 		// "/dev_flash/vsh/module/msmw2.sprx" seems to rely on some cryptic shared memory behaviour that we don't emulate correctly
 		// This is a hack to avoid waiting for 1m40s every time we boot vsh
-		if (queue.key == 0x8005911000000012 && Emu.IsVsh())
+		if (queue.key == 0x8005911000000012 && g_ps3_process_info.get_cellos_appname() == "vsh.self"sv)
 		{
 			sys_event.todo("sys_event_queue_receive(equeue_id=0x%x, *0x%x, timeout=0x%llx) Bypassing timeout for msmw2.sprx", equeue_id, dummy_event, timeout);
 			timeout = 1;
@@ -462,8 +253,8 @@ error_code sys_event_queue_receive(ppu_thread& ppu, u32 equeue_id, vm::ptr<sys_e
 
 		if (queue.events.empty())
 		{
+			queue.sq.emplace_back(&ppu);
 			queue.sleep(ppu, timeout);
-			lv2_obj::emplace(queue.pq, &ppu);
 			return CELL_EBUSY;
 		}
 
@@ -490,39 +281,13 @@ error_code sys_event_queue_receive(ppu_thread& ppu, u32 equeue_id, vm::ptr<sys_e
 	}
 
 	// If cancelled, gpr[3] will be non-zero. Other registers must contain event data.
-	while (auto state = +ppu.state)
+	while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
 	{
-		if (state & cpu_flag::signal && ppu.state.test_and_reset(cpu_flag::signal))
+		if (is_stopped(state) || state & cpu_flag::signal)
 		{
 			break;
 		}
 
-		if (is_stopped(state))
-		{
-			std::lock_guard lock_rsx(queue->mutex);
-
-			for (auto cpu = +queue->pq; cpu; cpu = cpu->next_cpu)
-			{
-				if (cpu == &ppu)
-				{
-					ppu.state += cpu_flag::again;
-					return {};
-				}
-			}
-
-			break;
-		}
-
-		for (usz i = 0; cpu_flag::signal - ppu.state && i < 50; i++)
-		{
-			busy_wait(500);
-		}
-
-		if (ppu.state & cpu_flag::signal)
- 		{
-			continue;
-		}
-
 		if (timeout)
 		{
 			if (lv2_obj::wait_timeout(timeout, &ppu))
@@ -530,21 +295,12 @@ error_code sys_event_queue_receive(ppu_thread& ppu, u32 equeue_id, vm::ptr<sys_e
 				// Wait for rescheduling
 				if (ppu.check_state())
 				{
-					continue;
-				}
-
-				ppu.state += cpu_flag::wait;
-
-				if (!atomic_storage<ppu_thread*>::load(queue->pq))
-				{
-					// Waiters queue is empty, so the thread must have been signaled
-					queue->mutex.lock_unlock();
-					break;
+					return {};
 				}
 
 				std::lock_guard lock(queue->mutex);
 
-				if (!queue->unqueue(queue->pq, &ppu))
+				if (!queue->unqueue(queue->sq, &ppu))
 				{
 					break;
 				}
@@ -555,7 +311,7 @@ error_code sys_event_queue_receive(ppu_thread& ppu, u32 equeue_id, vm::ptr<sys_e
 		}
 		else
 		{
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
 		}
 	}
 
@@ -597,7 +353,6 @@ error_code sys_event_port_create(cpu_thread& cpu, vm::ptr<u32> eport_id, s32 por
 
 	if (const u32 id = idm::make<lv2_obj, lv2_event_port>(port_type, name))
 	{
-		cpu.check_state();
 		*eport_id = id;
 		return CELL_OK;
 	}
@@ -721,10 +476,7 @@ error_code sys_event_port_disconnect(ppu_thread& ppu, u32 eport_id)
 		return CELL_ENOTCONN;
 	}
 
-	if (port->is_busy)
-	{
-		return CELL_EBUSY;
-	}
+	// TODO: return CELL_EBUSY if necessary (can't detect the condition)
 
 	port->queue.reset();
 
@@ -733,32 +485,20 @@ error_code sys_event_port_disconnect(ppu_thread& ppu, u32 eport_id)
 
 error_code sys_event_port_send(u32 eport_id, u64 data1, u64 data2, u64 data3)
 {
-	const auto cpu = cpu_thread::get_current();
-	const auto ppu = cpu ? cpu->try_get<ppu_thread>() : nullptr;
-
-	if (cpu)
+	if (auto cpu = get_current_cpu_thread())
 	{
 		cpu->state += cpu_flag::wait;
 	}
 
 	sys_event.trace("sys_event_port_send(eport_id=0x%x, data1=0x%llx, data2=0x%llx, data3=0x%llx)", eport_id, data1, data2, data3);
 
-	bool notified_thread = false;
-
-	const auto port = idm::check<lv2_obj, lv2_event_port>(eport_id, [&, notify = lv2_obj::notify_all_t()](lv2_event_port& port) -> CellError
+	const auto port = idm::get<lv2_obj, lv2_event_port>(eport_id, [&](lv2_event_port& port) -> CellError
 	{
-		if (ppu && ppu->loaded_from_savestate)
-		{
-			port.is_busy++;
-			notified_thread = true;
-			return {};
-		}
-
 		if (lv2_obj::check(port.queue))
 		{
-			const u64 source = port.name ? port.name : (u64{process_getpid() + 0u} << 32) | u64{eport_id};
+			const u64 source = port.name ? port.name : (s64{process_getpid()} << 32) | u64{eport_id};
 
-			return port.queue->send(source, data1, data2, data3, &notified_thread, ppu && port.queue->type == SYS_PPU_QUEUE ? &port : nullptr);
+			return port.queue->send(source, data1, data2, data3);
 		}
 
 		return CELL_ENOTCONN;
@@ -769,27 +509,8 @@ error_code sys_event_port_send(u32 eport_id, u64 data1, u64 data2, u64 data3)
 		return CELL_ESRCH;
 	}
 
-	if (ppu && notified_thread)
-	{
-		// Wait to be requeued
-		if (ppu->test_stopped())
-		{
-			// Wait again on savestate load
-			ppu->state += cpu_flag::again;
-		}
-
-		port->is_busy--;
-		return CELL_OK;
-	}
-
 	if (port.ret)
 	{
-		if (port.ret == CELL_EAGAIN)
-		{
-			// Not really an error code exposed to games (thread has raised cpu_flag::again)
-			return not_an_error(CELL_EAGAIN);
-		}
-
 		if (port.ret == CELL_EBUSY)
 		{
 			return not_an_error(CELL_EBUSY);
diff --git a/rpcs3/Emu/Cell/lv2/sys_event.h b/rpcs3/Emu/Cell/lv2/sys_event.h
index 6c43798a30..edab584cec 100644
--- a/rpcs3/Emu/Cell/lv2/sys_event.h
+++ b/rpcs3/Emu/Cell/lv2/sys_event.h
@@ -4,10 +4,7 @@
 
 #include "Emu/Memory/vm_ptr.h"
 
-#include <deque>
-
 class cpu_thread;
-class spu_thrread;
 
 // Event Queue Type
 enum : u32
@@ -79,8 +76,6 @@ struct sys_event_t
 // Source, data1, data2, data3
 using lv2_event = std::tuple<u64, u64, u64, u64>;
 
-struct lv2_event_port;
-
 struct lv2_event_queue final : public lv2_obj
 {
 	static const u32 id_base = 0x8d000000;
@@ -94,26 +89,23 @@ struct lv2_event_queue final : public lv2_obj
 
 	shared_mutex mutex;
 	std::deque<lv2_event> events;
-	spu_thread* sq{};
-	ppu_thread* pq{};
+	std::deque<cpu_thread*> sq;
 
 	lv2_event_queue(u32 protocol, s32 type, s32 size, u64 name, u64 ipc_key) noexcept;
 
-	lv2_event_queue(utils::serial& ar) noexcept;
-	static std::function<void(void*)> load(utils::serial& ar);
-	void save(utils::serial& ar);
-	static void save_ptr(utils::serial&, lv2_event_queue*);
-	static shared_ptr<lv2_event_queue> load_ptr(utils::serial& ar, shared_ptr<lv2_event_queue>& queue, std::string_view msg = {});
+	CellError send(lv2_event);
 
-	CellError send(lv2_event event, bool* notified_thread = nullptr, lv2_event_port* port = nullptr);
-
-	CellError send(u64 source, u64 d1, u64 d2, u64 d3, bool* notified_thread = nullptr, lv2_event_port* port = nullptr)
+	CellError send(u64 source, u64 d1, u64 d2, u64 d3)
 	{
-		return send(std::make_tuple(source, d1, d2, d3), notified_thread, port);
+		return send(std::make_tuple(source, d1, d2, d3));
 	}
 
 	// Get event queue by its global key
-	static shared_ptr<lv2_event_queue> find(u64 ipc_key);
+	static std::shared_ptr<lv2_event_queue> find(u64 ipc_key);
+
+	// Check queue ptr validity (use 'exists' member)
+	static bool check(const std::weak_ptr<lv2_event_queue>&);
+	static bool check(const std::shared_ptr<lv2_event_queue>&);
 };
 
 struct lv2_event_port final : lv2_obj
@@ -123,17 +115,13 @@ struct lv2_event_port final : lv2_obj
 	const s32 type; // Port type, either IPC or local
 	const u64 name; // Event source (generated from id and process id if not set)
 
-	atomic_t<usz> is_busy = 0; // Counts threads waiting on event sending
-	shared_ptr<lv2_event_queue> queue; // Event queue this port is connected to
+	std::shared_ptr<lv2_event_queue> queue; // Event queue this port is connected to
 
 	lv2_event_port(s32 type, u64 name)
 		: type(type)
 		, name(name)
 	{
 	}
-
-	lv2_event_port(utils::serial& ar);
-	void save(utils::serial& ar);
 };
 
 class ppu_thread;
diff --git a/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp b/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp
index c28efaf711..aaca1761e0 100644
--- a/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp
@@ -2,33 +2,15 @@
 #include "sys_event_flag.h"
 
 #include "Emu/IdManager.h"
+#include "Emu/IPC.h"
 
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
 
-#include "util/asm.hpp"
+#include <algorithm>
 
 LOG_CHANNEL(sys_event_flag);
 
-lv2_event_flag::lv2_event_flag(utils::serial& ar)
-	: protocol(ar)
-	, key(ar)
-	, type(ar)
-	, name(ar)
-{
-	ar(pattern);
-}
-
-std::function<void(void*)> lv2_event_flag::load(utils::serial& ar)
-{
-	return load_func(make_shared<lv2_event_flag>(stx::exact_t<utils::serial&>(ar)));
-}
-
-void lv2_event_flag::save(utils::serial& ar)
-{
-	ar(protocol, key, type, name, pattern);
-}
-
 error_code sys_event_flag_create(ppu_thread& ppu, vm::ptr<u32> id, vm::ptr<sys_event_flag_attribute_t> attr, u64 init)
 {
 	ppu.state += cpu_flag::wait;
@@ -62,7 +44,7 @@ error_code sys_event_flag_create(ppu_thread& ppu, vm::ptr<u32> id, vm::ptr<sys_e
 
 	if (const auto error = lv2_obj::create<lv2_event_flag>(_attr.pshared, ipc_key, _attr.flags, [&]
 	{
-		return make_shared<lv2_event_flag>(
+		return std::make_shared<lv2_event_flag>(
 			_attr.protocol,
 			ipc_key,
 			_attr.type,
@@ -73,7 +55,6 @@ error_code sys_event_flag_create(ppu_thread& ppu, vm::ptr<u32> id, vm::ptr<sys_e
 		return error;
 	}
 
-	ppu.check_state();
 	*id = idm::last_id();
 	return CELL_OK;
 }
@@ -86,7 +67,7 @@ error_code sys_event_flag_destroy(ppu_thread& ppu, u32 id)
 
 	const auto flag = idm::withdraw<lv2_obj, lv2_event_flag>(id, [&](lv2_event_flag& flag) -> CellError
 	{
-		if (flag.sq)
+		if (flag.waiters)
 		{
 			return CELL_EBUSY;
 		}
@@ -128,11 +109,7 @@ error_code sys_event_flag_wait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode, vm
 
 		~store_result() noexcept
 		{
-			if (ptr)
-			{
-				cpu_thread::get_current()->check_state();
-				*ptr = val;
-			}
+			if (ptr) *ptr = val;
 		}
 	} store{result};
 
@@ -142,7 +119,7 @@ error_code sys_event_flag_wait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode, vm
 		return CELL_EINVAL;
 	}
 
-	const auto flag = idm::get<lv2_obj, lv2_event_flag>(id, [&, notify = lv2_obj::notify_all_t()](lv2_event_flag& flag) -> CellError
+	const auto flag = idm::get<lv2_obj, lv2_event_flag>(id, [&](lv2_event_flag& flag) -> CellError
 	{
 		if (flag.pattern.fetch_op([&](u64& pat)
 		{
@@ -153,8 +130,6 @@ error_code sys_event_flag_wait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode, vm
 			return {};
 		}
 
-		lv2_obj::prepare_for_sleep(ppu);
-
 		std::lock_guard lock(flag.mutex);
 
 		if (flag.pattern.fetch_op([&](u64& pat)
@@ -165,13 +140,14 @@ error_code sys_event_flag_wait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode, vm
 			return {};
 		}
 
-		if (flag.type == SYS_SYNC_WAITER_SINGLE && flag.sq)
+		if (flag.type == SYS_SYNC_WAITER_SINGLE && !flag.sq.empty())
 		{
 			return CELL_EPERM;
 		}
 
+		flag.waiters++;
+		flag.sq.emplace_back(&ppu);
 		flag.sleep(ppu, timeout);
-		lv2_obj::emplace(flag.sq, &ppu);
 		return CELL_EBUSY;
 	});
 
@@ -193,37 +169,16 @@ error_code sys_event_flag_wait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode, vm
 		return CELL_OK;
 	}
 
-	while (auto state = +ppu.state)
+	while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
 	{
-		if (state & cpu_flag::signal && ppu.state.test_and_reset(cpu_flag::signal))
-		{
-			break;
-		}
-
 		if (is_stopped(state))
 		{
-			std::lock_guard lock(flag->mutex);
-
-			for (auto cpu = +flag->sq; cpu; cpu = cpu->next_cpu)
-			{
-				if (cpu == &ppu)
-				{
-					ppu.state += cpu_flag::again;
-					return {};
-				}
-			}
-
-			break;
+			return {};
 		}
 
-		for (usz i = 0; cpu_flag::signal - ppu.state && i < 50; i++)
+		if (state & cpu_flag::signal)
 		{
-			busy_wait(500);
-		}
-
-		if (ppu.state & cpu_flag::signal)
- 		{
-			continue;
+			break;
 		}
 
 		if (timeout)
@@ -233,16 +188,7 @@ error_code sys_event_flag_wait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode, vm
 				// Wait for rescheduling
 				if (ppu.check_state())
 				{
-					continue;
-				}
-
-				ppu.state += cpu_flag::wait;
-
-				if (!atomic_storage<ppu_thread*>::load(flag->sq))
-				{
-					// Waiters queue is empty, so the thread must have been signaled
-					flag->mutex.lock_unlock();
-					break;
+					return {};
 				}
 
 				std::lock_guard lock(flag->mutex);
@@ -252,6 +198,7 @@ error_code sys_event_flag_wait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode, vm
 					break;
 				}
 
+				flag->waiters--;
 				ppu.gpr[3] = CELL_ETIMEDOUT;
 				ppu.gpr[6] = flag->pattern;
 				break;
@@ -259,7 +206,7 @@ error_code sys_event_flag_wait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode, vm
 		}
 		else
 		{
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
 		}
 	}
 
@@ -273,21 +220,7 @@ error_code sys_event_flag_trywait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode,
 
 	sys_event_flag.trace("sys_event_flag_trywait(id=0x%x, bitptn=0x%llx, mode=0x%x, result=*0x%x)", id, bitptn, mode, result);
 
-	// Always set result
-	struct store_result
-	{
-		vm::ptr<u64> ptr;
-		u64 val = 0;
-
-		~store_result() noexcept
-		{
-			if (ptr)
-			{
-				cpu_thread::get_current()->check_state();
-				*ptr = val;
-			}
-		}
-	} store{result};
+	if (result) *result = 0;
 
 	if (!lv2_event_flag::check_mode(mode))
 	{
@@ -295,7 +228,7 @@ error_code sys_event_flag_trywait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode,
 		return CELL_EINVAL;
 	}
 
-	u64 pattern{};
+	u64 pattern;
 
 	const auto flag = idm::check<lv2_obj, lv2_event_flag>(id, [&](lv2_event_flag& flag)
 	{
@@ -315,7 +248,7 @@ error_code sys_event_flag_trywait(ppu_thread& ppu, u32 id, u64 bitptn, u32 mode,
 		return not_an_error(CELL_EBUSY);
 	}
 
-	store.val = pattern;
+	if (result) *result = pattern;
 	return CELL_OK;
 }
 
@@ -326,7 +259,7 @@ error_code sys_event_flag_set(cpu_thread& cpu, u32 id, u64 bitptn)
 	// Warning: may be called from SPU thread.
 	sys_event_flag.trace("sys_event_flag_set(id=0x%x, bitptn=0x%llx)", id, bitptn);
 
-	const auto flag = idm::get_unlocked<lv2_obj, lv2_event_flag>(id);
+	const auto flag = idm::get<lv2_obj, lv2_event_flag>(id);
 
 	if (!flag)
 	{
@@ -338,81 +271,36 @@ error_code sys_event_flag_set(cpu_thread& cpu, u32 id, u64 bitptn)
 		return CELL_OK;
 	}
 
-	if (lv2_obj::notify_all_t notify; true)
+	if (true)
 	{
 		std::lock_guard lock(flag->mutex);
 
-		for (auto ppu = +flag->sq; ppu; ppu = ppu->next_cpu)
+		// Sort sleep queue in required order
+		if (flag->protocol != SYS_SYNC_FIFO)
 		{
-			if (ppu->state & cpu_flag::again)
+			std::stable_sort(flag->sq.begin(), flag->sq.end(), [](cpu_thread* a, cpu_thread* b)
 			{
-				cpu.state += cpu_flag::again;
-
-				// Fake error for abort
-				return not_an_error(CELL_EAGAIN);
-			}
+				return static_cast<ppu_thread*>(a)->prio < static_cast<ppu_thread*>(b)->prio;
+			});
 		}
 
-		u32 count = 0;
-
 		// Process all waiters in single atomic op
-		for (u64 pattern = flag->pattern, to_write = pattern, dependant_mask = 0;; to_write = pattern, dependant_mask = 0)
+		const u32 count = flag->pattern.atomic_op([&](u64& value)
 		{
-			count = 0;
-			to_write |= bitptn;
-			dependant_mask = 0;
+			value |= bitptn;
+			u32 count = 0;
 
-			for (auto ppu = +flag->sq; ppu; ppu = ppu->next_cpu)
+			for (auto cpu : flag->sq)
 			{
-				ppu->gpr[7] = 0;
-			}
-
-			auto first = +flag->sq;
-
-			auto get_next = [&]() -> ppu_thread*
-			{
-				s32 prio = smax;
-				ppu_thread* it{};
-
-				for (auto ppu = first; ppu; ppu = ppu->next_cpu)
-				{
-					if (!ppu->gpr[7] && (flag->protocol != SYS_SYNC_PRIORITY || ppu->prio.load().prio <= prio))
-					{
-						it = ppu;
-						prio = ppu->prio.load().prio;
-					}
-				}
-
-				if (it)
-				{
-					// Mark it so it won't reappear
-					it->gpr[7] = 1;
-				}
-
-				return it;
-			};
-
-			while (auto it = get_next())
-			{
-				auto& ppu = *it;
+				auto& ppu = static_cast<ppu_thread&>(*cpu);
 
 				const u64 pattern = ppu.gpr[4];
 				const u64 mode = ppu.gpr[5];
 
-				// If it's OR mode, set bits must have waken up the thread therefore no
-				// dependency on old value
-				const u64 dependant_mask_or = ((mode & 0xf) == SYS_EVENT_FLAG_WAIT_OR || (bitptn & pattern & to_write) == pattern ? 0 : pattern);
-
-				if (lv2_event_flag::check_pattern(to_write, pattern, mode, &ppu.gpr[6]))
+				if (lv2_event_flag::check_pattern(value, pattern, mode, &ppu.gpr[6]))
 				{
-					dependant_mask |= dependant_mask_or;
 					ppu.gpr[3] = CELL_OK;
 					count++;
-
-					if (!to_write)
-					{
-						break;
-					}
 				}
 				else
 				{
@@ -420,29 +308,8 @@ error_code sys_event_flag_set(cpu_thread& cpu, u32 id, u64 bitptn)
 				}
 			}
 
-			dependant_mask &= ~bitptn;
-
-			auto [new_val, ok] = flag->pattern.fetch_op([&](u64& x)
-			{
-				if ((x ^ pattern) & dependant_mask)
-				{
-					return false;
-				}
-
-				x |= bitptn;
-
-				// Clear the bit-wise difference
-				x &= ~((pattern | bitptn) & ~to_write);
-				return true;
-			});
-
-			if (ok)
-			{
-				break;
-			}
-
-			pattern = new_val;
-		}
+			return count;
+		});
 
 		if (!count)
 		{
@@ -450,22 +317,25 @@ error_code sys_event_flag_set(cpu_thread& cpu, u32 id, u64 bitptn)
 		}
 
 		// Remove waiters
-		for (auto next_cpu = &flag->sq; *next_cpu;)
+		const auto tail = std::remove_if(flag->sq.begin(), flag->sq.end(), [&](cpu_thread* cpu)
 		{
-			auto& ppu = **next_cpu;
+			auto& ppu = static_cast<ppu_thread&>(*cpu);
 
 			if (ppu.gpr[3] == CELL_OK)
 			{
-				atomic_storage<ppu_thread*>::release(*next_cpu, ppu.next_cpu);
-				ppu.next_cpu = nullptr;
-				flag->append(&ppu);
-				continue;
+				flag->waiters--;
+				flag->append(cpu);
+				return true;
 			}
 
-			next_cpu = &ppu.next_cpu;
-		};
+			return false;
+		});
 
-		lv2_obj::awake_all();
+		if (tail != flag->sq.end())
+		{
+			flag->sq.erase(tail, flag->sq.end());
+			lv2_obj::awake_all();
+		}
 	}
 
 	return CELL_OK;
@@ -498,7 +368,7 @@ error_code sys_event_flag_cancel(ppu_thread& ppu, u32 id, vm::ptr<u32> num)
 
 	if (num) *num = 0;
 
-	const auto flag = idm::get_unlocked<lv2_obj, lv2_event_flag>(id);
+	const auto flag = idm::get<lv2_obj, lv2_event_flag>(id);
 
 	if (!flag)
 	{
@@ -507,30 +377,24 @@ error_code sys_event_flag_cancel(ppu_thread& ppu, u32 id, vm::ptr<u32> num)
 
 	u32 value = 0;
 	{
-		lv2_obj::notify_all_t notify;
-
 		std::lock_guard lock(flag->mutex);
 
-		for (auto cpu = +flag->sq; cpu; cpu = cpu->next_cpu)
-		{
-			if (cpu->state & cpu_flag::again)
-			{
-				ppu.state += cpu_flag::again;
-				return {};
-			}
-		}
-
 		// Get current pattern
 		const u64 pattern = flag->pattern;
 
-		// Signal all threads to return CELL_ECANCELED (protocol does not matter)
-		while (auto ppu = flag->schedule<ppu_thread>(flag->sq, SYS_SYNC_FIFO))
-		{
-			ppu->gpr[3] = CELL_ECANCELED;
-			ppu->gpr[6] = pattern;
+		// Set count
+		value = ::size32(flag->sq);
 
-			value++;
-			flag->append(ppu);
+		// Signal all threads to return CELL_ECANCELED (protocol does not matter)
+		for (auto thread : ::as_rvalue(std::move(flag->sq)))
+		{
+			auto& ppu = static_cast<ppu_thread&>(*thread);
+
+			ppu.gpr[3] = CELL_ECANCELED;
+			ppu.gpr[6] = pattern;
+
+			flag->waiters--;
+			flag->append(thread);
 		}
 
 		if (value)
@@ -539,7 +403,10 @@ error_code sys_event_flag_cancel(ppu_thread& ppu, u32 id, vm::ptr<u32> num)
 		}
 	}
 
-	static_cast<void>(ppu.test_stopped());
+	if (ppu.test_stopped())
+	{
+		return 0;
+	}
 
 	if (num) *num = value;
 	return CELL_OK;
@@ -556,8 +423,6 @@ error_code sys_event_flag_get(ppu_thread& ppu, u32 id, vm::ptr<u64> flags)
 		return +flag.pattern;
 	});
 
-	ppu.check_state();
-
 	if (!flag)
 	{
 		if (flags) *flags = 0;
diff --git a/rpcs3/Emu/Cell/lv2/sys_event_flag.h b/rpcs3/Emu/Cell/lv2/sys_event_flag.h
index 652ae95947..2fccc61f43 100644
--- a/rpcs3/Emu/Cell/lv2/sys_event_flag.h
+++ b/rpcs3/Emu/Cell/lv2/sys_event_flag.h
@@ -41,8 +41,9 @@ struct lv2_event_flag final : lv2_obj
 	const u64 name;
 
 	shared_mutex mutex;
+	atomic_t<u32> waiters{0};
 	atomic_t<u64> pattern;
-	ppu_thread* sq{};
+	std::deque<cpu_thread*> sq;
 
 	lv2_event_flag(u32 protocol, u64 key, s32 type, u64 name, u64 pattern) noexcept
 		: protocol{static_cast<u8>(protocol)}
@@ -53,10 +54,6 @@ struct lv2_event_flag final : lv2_obj
 	{
 	}
 
-	lv2_event_flag(utils::serial& ar);
-	static std::function<void(void*)> load(utils::serial& ar);
-	void save(utils::serial& ar);
-
 	// Check mode arg
 	static bool check_mode(u32 mode)
 	{
diff --git a/rpcs3/Emu/Cell/lv2/sys_fs.cpp b/rpcs3/Emu/Cell/lv2/sys_fs.cpp
index 1f76bb7090..baeefd5a4f 100644
--- a/rpcs3/Emu/Cell/lv2/sys_fs.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_fs.cpp
@@ -1,60 +1,41 @@
 #include "stdafx.h"
 #include "sys_sync.h"
 #include "sys_fs.h"
-#include "sys_memory.h"
-#include "util/asm.hpp"
 
+#include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Crypto/unedat.h"
 #include "Emu/System.h"
-#include "Emu/system_config.h"
 #include "Emu/VFS.h"
-#include "Emu/vfs_config.h"
 #include "Emu/IdManager.h"
-#include "Emu/system_utils.hpp"
-#include "Emu/Cell/lv2/sys_process.h"
-
-#include <filesystem>
-#include <span>
-#include <shared_mutex>
+#include "Utilities/StrUtil.h"
 
 LOG_CHANNEL(sys_fs);
 
-lv2_fs_mount_point g_mp_sys_dev_usb{"/dev_usb", "CELL_FS_FAT", "CELL_FS_IOS:USB_MASS_STORAGE", 512, 0x100, 4096, lv2_mp_flag::no_uid_gid};
-lv2_fs_mount_point g_mp_sys_dev_dvd{"/dev_ps2disc", "CELL_FS_ISO9660", "CELL_FS_IOS:PATA1_BDVD_DRIVE", 2048, 0x100, 32768, lv2_mp_flag::read_only + lv2_mp_flag::no_uid_gid, &g_mp_sys_dev_usb};
-lv2_fs_mount_point g_mp_sys_dev_bdvd{"/dev_bdvd", "CELL_FS_ISO9660", "CELL_FS_IOS:PATA0_BDVD_DRIVE", 2048, 0x4D955, 2048, lv2_mp_flag::read_only + lv2_mp_flag::no_uid_gid, &g_mp_sys_dev_dvd};
-lv2_fs_mount_point g_mp_sys_dev_hdd1{"/dev_hdd1", "CELL_FS_FAT", "CELL_FS_UTILITY:HDD1", 512, 0x3FFFF8, 32768, lv2_mp_flag::no_uid_gid + lv2_mp_flag::cache, &g_mp_sys_dev_bdvd};
-lv2_fs_mount_point g_mp_sys_dev_hdd0{"/dev_hdd0", "CELL_FS_UFS", "CELL_FS_UTILITY:HDD0", 512, 0x24FAEA98, 4096, {}, &g_mp_sys_dev_hdd1};
-lv2_fs_mount_point g_mp_sys_dev_flash3{"/dev_flash3", "CELL_FS_FAT", "CELL_FS_IOS:BUILTIN_FLSH3", 512, 0x400, 8192, lv2_mp_flag::no_uid_gid, &g_mp_sys_dev_hdd0}; // TODO confirm
-lv2_fs_mount_point g_mp_sys_dev_flash2{"/dev_flash2", "CELL_FS_FAT", "CELL_FS_IOS:BUILTIN_FLSH2", 512, 0x8000, 8192, lv2_mp_flag::no_uid_gid, &g_mp_sys_dev_flash3}; // TODO confirm
-lv2_fs_mount_point g_mp_sys_dev_flash{"/dev_flash", "CELL_FS_FAT", "CELL_FS_IOS:BUILTIN_FLSH1", 512, 0x63E00, 8192, lv2_mp_flag::no_uid_gid, &g_mp_sys_dev_flash2};
-lv2_fs_mount_point g_mp_sys_host_root{"/host_root", "CELL_FS_DUMMYFS", "CELL_FS_DUMMY:/", 512, 0x100, 512, lv2_mp_flag::strict_get_block_size + lv2_mp_flag::no_uid_gid, &g_mp_sys_dev_flash};
-lv2_fs_mount_point g_mp_sys_app_home{"/app_home", "CELL_FS_DUMMYFS", "CELL_FS_DUMMY:", 512, 0x100, 512, lv2_mp_flag::strict_get_block_size + lv2_mp_flag::no_uid_gid, &g_mp_sys_host_root};
-lv2_fs_mount_point g_mp_sys_dev_root{"/", "CELL_FS_ADMINFS", "CELL_FS_ADMINFS:", 512, 0x100, 512, lv2_mp_flag::read_only + lv2_mp_flag::strict_get_block_size + lv2_mp_flag::no_uid_gid, &g_mp_sys_app_home};
-lv2_fs_mount_point g_mp_sys_no_device{};
-lv2_fs_mount_info  g_mi_sys_not_found{}; // wrapper for &g_mp_sys_no_device
-
-template<>
-void fmt_class_string<lv2_file_type>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](lv2_file_type type)
-	{
-		switch (type)
-		{
-		case lv2_file_type::regular: return "Regular file";
-		case lv2_file_type::sdata: return "SDATA";
-		case lv2_file_type::edata: return "EDATA";
-		}
-
-		return unknown;
-	});
-}
+lv2_fs_mount_point g_mp_sys_dev_root;
+lv2_fs_mount_point g_mp_sys_no_device;
+lv2_fs_mount_point g_mp_sys_dev_hdd0{"/dev_hdd0"};
+lv2_fs_mount_point g_mp_sys_dev_hdd1{"/dev_hdd1", 512, 32768, lv2_mp_flag::no_uid_gid + lv2_mp_flag::cache};
+lv2_fs_mount_point g_mp_sys_dev_usb{"", 512, 4096, lv2_mp_flag::no_uid_gid};
+lv2_fs_mount_point g_mp_sys_dev_bdvd{"", 2048, 65536, lv2_mp_flag::read_only + lv2_mp_flag::no_uid_gid};
+lv2_fs_mount_point g_mp_sys_host_root{"", 512, 512, lv2_mp_flag::strict_get_block_size + lv2_mp_flag::no_uid_gid};
+lv2_fs_mount_point g_mp_sys_dev_flash{"", 512, 8192, lv2_mp_flag::read_only + lv2_mp_flag::no_uid_gid};
+lv2_fs_mount_point g_mp_sys_dev_flash2{ "", 512, 8192, lv2_mp_flag::no_uid_gid }; // TODO confirm
+lv2_fs_mount_point g_mp_sys_dev_flash3{ "", 512, 8192, lv2_mp_flag::read_only + lv2_mp_flag::no_uid_gid }; // TODO confirm
 
 template<>
 void fmt_class_string<lv2_file>::format(std::string& out, u64 arg)
 {
 	const auto& file = get_object(arg);
 
+	std::string_view type_s;
+	switch (file.type)
+	{
+	case lv2_file_type::regular: type_s = "Regular file"; break;
+	case lv2_file_type::sdata: type_s = "SDATA"; break;
+	case lv2_file_type::edata: type_s = "EDATA"; break;
+	}
+
 	auto get_size = [](u64 size) -> std::string
 	{
 		if (size == umax)
@@ -62,24 +43,25 @@ void fmt_class_string<lv2_file>::format(std::string& out, u64 arg)
 			return "N/A";
 		}
 
-		std::string size_str;
+		std::string size_str = fmt::format("0x%05x ", size);
 		switch (std::bit_width(size) / 10 * 10)
 		{
-		case 0: fmt::append(size_str, "%u", size); break;
-		case 10: fmt::append(size_str, "%gKB", size / 1024.); break;
-		case 20: fmt::append(size_str, "%gMB", size / (1024. * 1024)); break;
+		case 64: size_str = "0"s; break;
+		case 0: fmt::append(size_str, "(%u)", size); break;
+		case 10: fmt::append(size_str, "(%gKB)", size / 1024.); break;
+		case 20: fmt::append(size_str, "(%gMB)", size / (1024. * 1024)); break;
 
 		default:
-		case 30: fmt::append(size_str, "%gGB", size / (1024. * 1024 * 1024)); break;
+		case 30: fmt::append(size_str, "(%gGB)", size / (1024. * 1024 * 1024)); break;
 		}
-
+	
 		return size_str;
 	};
 
 	const usz pos = file.file ? file.file.pos() : umax;
 	const usz size = file.file ? file.file.size() : umax;
 
-	fmt::append(out, u8"%s, '%s', Mode: 0x%x, Flags: 0x%x, Pos/Size: %s/%s (0x%x/0x%x)", file.type, file.name.data(), file.mode, file.flags, get_size(pos), get_size(size), pos, size);
+	fmt::append(out, u8"%s, “%s”, Mode: 0x%x, Flags: 0x%x, Pos: %s, Size: %s", type_s, file.name.data(), file.mode, file.flags, get_size(pos), get_size(size));
 }
 
 template<>
@@ -87,24 +69,7 @@ void fmt_class_string<lv2_dir>::format(std::string& out, u64 arg)
 {
 	const auto& dir = get_object(arg);
 
-	fmt::append(out, u8"Directory, '%s', Entries: %u/%u", dir.name.data(), std::min<u64>(dir.pos, dir.entries.size()), dir.entries.size());
-}
-
-bool has_fs_write_rights(std::string_view vpath)
-{
-	// VSH has access to everything
-	if (g_ps3_process_info.has_root_perm())
-		return true;
-
-	const auto norm_vpath = lv2_fs_object::get_normalized_path(vpath);
-	const auto parent_dir = fs::get_parent_dir_view(norm_vpath);
-
-	// This is not exhaustive, PS3 has a unix filesystem with rights for each directory and files
-	// This is mostly meant to protect against games doing insane things(ie NPUB30003 => NPUB30008)
-	if (parent_dir == "/dev_hdd0" || parent_dir == "/dev_hdd0/game")
-		return false;
-
-	return true;
+	fmt::append(out, u8"Directory, “%s”, Entries: %u/%u", dir.name.data(), std::min<u64>(dir.pos, dir.entries.size()), dir.entries.size());
 }
 
 bool verify_mself(const fs::file& mself_file)
@@ -140,265 +105,98 @@ bool verify_mself(const fs::file& mself_file)
 	return true;
 }
 
-lv2_fs_mount_info_map::lv2_fs_mount_info_map()
+lv2_fs_mount_point* lv2_fs_object::get_mp(std::string_view filename)
 {
-	for (auto mp = &g_mp_sys_dev_root; mp; mp = mp->next) // Scan and keep track of pre-mounted devices
+	std::string_view mp_name, vpath = filename;
+
+	for (usz depth = 0;;)
 	{
-		if (mp == &g_mp_sys_dev_usb)
+		// Skip one or more '/'
+		const auto pos = vpath.find_first_not_of('/');
+
+		if (pos == 0)
 		{
-			for (int i = 0; i < 8; i++)
-			{
-				if (!vfs::get(fmt::format("%s%03d", mp->root, i)).empty())
-				{
-					add(fmt::format("%s%03d", mp->root, i), mp, fmt::format("%s%03d", mp->device, i), mp->file_system, false);
-				}
-			}
+			// Relative path (TODO)
+			return &g_mp_sys_no_device;
 		}
-		else if (mp == &g_mp_sys_dev_root || !vfs::get(mp->root).empty())
+
+		if (pos == umax)
 		{
-			add(std::string(mp->root), mp, mp->device, mp->file_system, mp == &g_mp_sys_dev_flash); // /dev_flash is mounted in read only mode initially
-		}
-	}
-}
-
-lv2_fs_mount_info_map::~lv2_fs_mount_info_map()
-{
-	for (const auto& [path, info] : map)
-		vfs_unmount(path, false); // Do not remove the value from the map we are iterating over.
-}
-
-bool lv2_fs_mount_info_map::remove(std::string_view path)
-{
-	if (const auto iterator = map.find(path); iterator != map.end())
-	{
-		map.erase(iterator);
-		return true;
-	}
-	return false;
-}
-
-const lv2_fs_mount_info& lv2_fs_mount_info_map::lookup(std::string_view path, bool no_cell_fs_path, std::string* mount_path) const
-{
-	if (path.starts_with("/"sv))
-	{
-		constexpr std::string_view cell_fs_path = "CELL_FS_PATH:"sv;
-		const std::string normalized_path = lv2_fs_object::get_normalized_path(path);
-		std::string_view parent_dir;
-		u32 parent_level = 0;
-
-		do
-		{
-			parent_dir = fs::get_parent_dir_view(normalized_path, parent_level++);
-			if (const auto iterator = map.find(parent_dir); iterator != map.end())
-			{
-				if (iterator->second == &g_mp_sys_dev_root && parent_level > 1)
-					break;
-				if (no_cell_fs_path && iterator->second.device.starts_with(cell_fs_path))
-					return lookup(iterator->second.device.substr(cell_fs_path.size()), no_cell_fs_path, mount_path); // Recursively look up the parent mount info
-				if (mount_path)
-					*mount_path = iterator->first;
-				return iterator->second;
-			}
-		} while (parent_dir.length() > 1); // Exit the loop when parent_dir == "/" or empty
-	}
-
-	return g_mi_sys_not_found;
-}
-
-u64 lv2_fs_mount_info_map::get_all(CellFsMountInfo* info, u64 len) const
-{
-	if (!info)
-		return map.size();
-
-	u64 count = 0;
-
-	for (const auto& [path, mount_info] : map)
-	{
-		if (count >= len)
 			break;
-
-		strcpy_trunc(info[count].mount_path, path);
-		strcpy_trunc(info[count].filesystem, mount_info.file_system);
-		strcpy_trunc(info[count].dev_name, mount_info.device);
-		if (mount_info.read_only)
-			info[count].unk[4] |= 0x10000000;
-
-		count++;
-	}
-
-	return count;
-}
-
-bool lv2_fs_mount_info_map::is_device_mounted(std::string_view device_name) const
-{
-	return std::any_of(map.begin(), map.end(), [&](const decltype(map)::value_type& info) { return info.second.device == device_name; });
-}
-
-bool lv2_fs_mount_info_map::vfs_unmount(std::string_view vpath, bool remove_from_map)
-{
-	const std::string local_path = vfs::get(vpath);
-
-	if (local_path.empty())
-		return false;
-
-	if (fs::is_file(local_path))
-	{
-		if (fs::remove_file(local_path))
-		{
-			sys_fs.notice("Removed simplefs file \"%s\"", local_path);
 		}
-		else
+
+		// Get fragment name
+		const auto name = vpath.substr(pos, vpath.find_first_of('/', pos) - pos);
+		vpath.remove_prefix(name.size() + pos);
+
+		// Process special directories
+		if (name == "."sv)
 		{
-			sys_fs.error("Failed to remove simplefs file \"%s\"", local_path);
+			// Keep current
+			continue;
 		}
-	}
 
-	const bool result = vfs::unmount(vpath);
-
-	if (result && remove_from_map)
-		g_fxo->get<lv2_fs_mount_info_map>().remove(vpath);
-
-	return result;
-}
-
-std::string lv2_fs_object::get_normalized_path(std::string_view path)
-{
-	std::string normalized_path = std::filesystem::path(path).lexically_normal().string();
-
-#ifdef _WIN32
-	std::replace(normalized_path.begin(), normalized_path.end(), '\\', '/');
-#endif
-
-	if (normalized_path.ends_with('/'))
-		normalized_path.pop_back();
-
-	return normalized_path.empty() ? "/" : normalized_path;
-}
-
-std::string lv2_fs_object::get_device_root(std::string_view filename)
-{
-	std::string path = get_normalized_path(filename); // Prevent getting fooled by ".." trick such as "/dev_usb000/../dev_flash"
-
-	if (const auto first = path.find_first_not_of("/"sv); first != umax)
-	{
-		if (const auto pos = path.substr(first).find_first_of("/"sv); pos != umax)
-			path = path.substr(0, first + pos);
-		path = path.substr(std::max<std::make_signed_t<usz>>(0, first - 1)); // Remove duplicate leading '/' while keeping only one
-	}
-	else
-	{
-		path = path.substr(0, 1);
-	}
-
-	return path;
-}
-
-lv2_fs_mount_point* lv2_fs_object::get_mp(std::string_view filename, std::string* vfs_path)
-{
-	constexpr std::string_view cell_fs_path = "CELL_FS_PATH:"sv;
-	const bool is_cell_fs_path = filename.starts_with(cell_fs_path);
-
-	if (is_cell_fs_path)
-		filename.remove_prefix(cell_fs_path.size());
-
-	const bool is_path = filename.starts_with("/"sv);
-	std::string mp_name = is_path ? get_device_root(filename) : std::string(filename);
-
-	const auto check_mp = [&]()
-	{
-		for (auto mp = &g_mp_sys_dev_root; mp; mp = mp->next)
+		if (name == ".."sv)
 		{
-			const auto& device_alias_check = !is_path && (
-				(mp == &g_mp_sys_dev_hdd0 && mp_name == "CELL_FS_IOS:PATA0_HDD_DRIVE"sv) ||
-				(mp == &g_mp_sys_dev_hdd1 && mp_name == "CELL_FS_IOS:PATA1_HDD_DRIVE"sv) ||
-				(mp == &g_mp_sys_dev_flash2 && mp_name == "CELL_FS_IOS:BUILTIN_FLASH"sv)); // TODO confirm
-
-			if (mp == &g_mp_sys_dev_usb)
+			// Root parent is root
+			if (depth == 0)
 			{
-				if (mp_name.starts_with(is_path ? mp->root : mp->device))
-				{
-					if (!is_path)
-						mp_name = fmt::format("%s%s", mp->root, mp_name.substr(mp->device.size()));
-					return mp;
-				}
-			}
-			else if ((is_path ? mp->root : mp->device) == mp_name || device_alias_check)
-			{
-				if (!is_path)
-					mp_name = mp->root;
-				return mp;
+				continue;
 			}
+
+			depth--;
+			continue;
 		}
-		return &g_mp_sys_no_device; // Default fallback
-	};
 
-	const auto result = check_mp();
-
-	if (vfs_path)
-	{
-		if (is_cell_fs_path)
-			*vfs_path = vfs::get(filename);
-		else if (result == &g_mp_sys_dev_hdd0)
-			*vfs_path = g_cfg_vfs.get(g_cfg_vfs.dev_hdd0, rpcs3::utils::get_emu_dir());
-		else if (result == &g_mp_sys_dev_hdd1)
-			*vfs_path = g_cfg_vfs.get(g_cfg_vfs.dev_hdd1, rpcs3::utils::get_emu_dir());
-		else if (result == &g_mp_sys_dev_usb)
-			*vfs_path = g_cfg_vfs.get_device(g_cfg_vfs.dev_usb, mp_name, rpcs3::utils::get_emu_dir()).path;
-		else if (result == &g_mp_sys_dev_bdvd)
-			*vfs_path = g_cfg_vfs.get(g_cfg_vfs.dev_bdvd, rpcs3::utils::get_emu_dir());
-		else if (result == &g_mp_sys_dev_dvd)
-			*vfs_path = g_cfg_vfs.get(g_cfg_vfs.dev_bdvd, rpcs3::utils::get_emu_dir()); // For compatibility
-		else if (result == &g_mp_sys_app_home)
-			*vfs_path = g_cfg_vfs.get(g_cfg_vfs.app_home, rpcs3::utils::get_emu_dir());
-		else if (result == &g_mp_sys_host_root && g_cfg.vfs.host_root)
-			*vfs_path = "/";
-		else if (result == &g_mp_sys_dev_flash)
-			*vfs_path = g_cfg_vfs.get_dev_flash();
-		else if (result == &g_mp_sys_dev_flash2)
-			*vfs_path = g_cfg_vfs.get_dev_flash2();
-		else if (result == &g_mp_sys_dev_flash3)
-			*vfs_path = g_cfg_vfs.get_dev_flash3();
-		else
-			*vfs_path = {};
-
-		if (is_path && !is_cell_fs_path && !vfs_path->empty())
-			vfs_path->append(filename.substr(mp_name.size()));
+		if (depth++ == 0)
+		{
+			// Save mountpoint name
+			mp_name = name;
+		}
 	}
 
-	return result;
-}
-
-lv2_fs_object::lv2_fs_object(std::string_view filename)
-	: name(get_name(filename))
-	, mp(g_fxo->get<lv2_fs_mount_info_map>().lookup(name.data()))
-{
-}
-
-lv2_fs_object::lv2_fs_object(utils::serial& ar, bool)
-	: name(ar)
-	, mp(g_fxo->get<lv2_fs_mount_info_map>().lookup(name.data()))
-{
-}
-
-u64 lv2_file::op_read(const fs::file& file, vm::ptr<void> buf, u64 size, u64 opt_pos)
-{
-	if (u64 region = buf.addr() >> 28, region_end = (buf.addr() & 0xfff'ffff) + (size & 0xfff'ffff); region == region_end && ((region >> 28) == 0 || region >= 0xC))
+	if (!mp_name.empty())
 	{
-		// Optimize reads from safe memory
-		return (opt_pos == umax ? file.read(buf.get_ptr(), size) : file.read_at(opt_pos, buf.get_ptr(), size));
+		if (mp_name == "dev_hdd0"sv)
+			return &g_mp_sys_dev_hdd0;
+		if (mp_name == "dev_hdd1"sv)
+			return &g_mp_sys_dev_hdd1;
+		if (mp_name.starts_with("dev_usb"sv))
+			return &g_mp_sys_dev_usb;
+		if (mp_name == "dev_bdvd"sv)
+			return &g_mp_sys_dev_bdvd;
+		if (mp_name == "app_home"sv && filename.data() != Emu.argv[0].data())
+			return lv2_fs_object::get_mp(Emu.argv[0]);
+		if (mp_name == "host_root"sv)
+			return &g_mp_sys_host_root;
+		if (mp_name == "dev_flash"sv)
+			return &g_mp_sys_dev_flash;
+		if (mp_name == "dev_flash2"sv)
+			return &g_mp_sys_dev_flash2;
+		if (mp_name == "dev_flash3"sv)
+			return &g_mp_sys_dev_flash3;
+
+		// Default
+		return &g_mp_sys_dev_hdd0;
 	}
 
+	// Default fallback
+	return &g_mp_sys_dev_root;
+}
+
+u64 lv2_file::op_read(const fs::file& file, vm::ptr<void> buf, u64 size)
+{
 	// Copy data from intermediate buffer (avoid passing vm pointer to a native API)
-	std::vector<uchar> local_buf(std::min<u64>(size, 65536));
+	uchar local_buf[65536];
 
 	u64 result = 0;
 
 	while (result < size)
 	{
-		const u64 block = std::min<u64>(size - result, local_buf.size());
-		const u64 nread = (opt_pos == umax ? file.read(local_buf.data(), block) : file.read_at(opt_pos + result, local_buf.data(), block));
+		const u64 block = std::min<u64>(size - result, sizeof(local_buf));
+		const u64 nread = file.read(+local_buf, block);
 
-		std::memcpy(static_cast<uchar*>(buf.get_ptr()) + result, local_buf.data(), nread);
+		std::memcpy(static_cast<uchar*>(buf.get_ptr()) + result, local_buf, nread);
 		result += nread;
 
 		if (nread < block)
@@ -413,15 +211,15 @@ u64 lv2_file::op_read(const fs::file& file, vm::ptr<void> buf, u64 size, u64 opt
 u64 lv2_file::op_write(const fs::file& file, vm::cptr<void> buf, u64 size)
 {
 	// Copy data to intermediate buffer (avoid passing vm pointer to a native API)
-	std::vector<uchar> local_buf(std::min<u64>(size, 65536));
+	uchar local_buf[65536];
 
 	u64 result = 0;
 
 	while (result < size)
 	{
-		const u64 block = std::min<u64>(size - result, local_buf.size());
-		std::memcpy(local_buf.data(), static_cast<const uchar*>(buf.get_ptr()) + result, block);
-		const u64 nwrite = file.write(+local_buf.data(), block);
+		const u64 block = std::min<u64>(size - result, sizeof(local_buf));
+		std::memcpy(local_buf, static_cast<const uchar*>(buf.get_ptr()) + result, block);
+		const u64 nwrite = file.write(+local_buf, block);
 		result += nwrite;
 
 		if (nwrite < block)
@@ -433,193 +231,13 @@ u64 lv2_file::op_write(const fs::file& file, vm::cptr<void> buf, u64 size)
 	return result;
 }
 
-lv2_file::lv2_file(utils::serial& ar)
-	: lv2_fs_object(ar, false)
-	, mode(ar)
-	, flags(ar)
-	, type(ar)
-{
-	[[maybe_unused]] const s32 version = GET_SERIALIZATION_VERSION(lv2_fs);
-
-	ar(lock);
-
-	be_t<u64> arg = 0;
-	u64 size = 0;
-
-	switch (type)
-	{
-	case lv2_file_type::regular: break;
-	case lv2_file_type::sdata: arg = 0x18000000010, size = 8; break; // TODO: Fix
-	case lv2_file_type::edata: arg = 0x2, size = 8; break;
-	}
-
-	const std::string retrieve_real = ar.pop<std::string>();
-
-	if (type == lv2_file_type::edata && version >= 2)
-	{
-		ar(g_fxo->get<loaded_npdrm_keys>().one_time_key);
-	}
-
-	open_result_t res = lv2_file::open(retrieve_real, flags & CELL_FS_O_ACCMODE, mode, size ? &arg : nullptr, size);
-	file = std::move(res.file);
-	real_path = std::move(res.real_path);
-
-	g_fxo->get<loaded_npdrm_keys>().npdrm_fds.raw() += type != lv2_file_type::regular;
-	g_fxo->get<loaded_npdrm_keys>().one_time_key = {};
-
-	if (ar.pop<bool>()) // see lv2_file::save in_mem
-	{
-		const fs::stat_t stat = ar;
-
-		std::vector<u8> buf(stat.size);
-		ar(std::span<u8>(buf.data(), buf.size()));
-
-		file = fs::make_stream<std::vector<u8>>(std::move(buf), stat);
-	}
-
-	if (!file)
-	{
-		sys_fs.error("Failed to load \'%s\' file for savestates (res=%s, vpath=\'%s\', real-path=\'%s\', type=%s, flags=0x%x)", name.data(), res.error, retrieve_real, real_path, type, flags);
-		ar.pos += sizeof(u64);
-		ensure(!!g_cfg.savestate.state_inspection_mode);
-		return;
-	}
-	else
-	{
-		sys_fs.success("Loaded file descriptor \'%s\' file for savestates (vpath=\'%s\', type=%s, flags=0x%x, id=%d)", name.data(), retrieve_real, type, flags, idm::last_id());
-	}
-
-	file.seek(ar);
-}
-
-void lv2_file::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(lv2_fs);
-	ar(name, mode, flags, type, lock, ensure(vfs::retrieve(real_path), FN(!x.empty())));
-
-	if (type == lv2_file_type::edata)
-	{
-		auto file_ptr = file.release();
-		ar(static_cast<EDATADecrypter*>(file_ptr.get())->get_key());
-		file.reset(std::move(file_ptr));
-	}
-
-	if (!mp.read_only && flags & CELL_FS_O_ACCMODE)
-	{
-		// Ensure accurate timestamps and content on disk
-		file.sync();
-	}
-
-	// UNIX allows deletion of files while descriptors are still opened
-	// descriptors shall keep the data in memory in this case
-	const bool in_mem = [&]()
-	{
-		if (mp.read_only)
-		{
-			return false;
-		}
-
-		fs::file test{real_path};
-
-		if (!test)
-		{
-			if (fs::is_file(real_path + ".66600"))
-			{
-				// May be a split-files descriptor, don't even bother
-				return false;
-			}
-
-			return true;
-		}
-
-		fs::file_id test_s = test.get_id();
-		fs::file_id file_s = file.get_id();
-
-		return !test_s.is_coherent_with(file_s);
-	}();
-
-	ar(in_mem);
-
-	if (in_mem)
-	{
-		fs::stat_t stats = file.get_stat();
-
-		sys_fs.error("Saving \'%s\' LV2 file descriptor in memory! (exists=%s, type=%s, flags=0x%x, size=0x%x)", name.data(), fs::is_file(real_path), type, flags, stats.size);
-
-		const usz patch_stats_pos = ar.seek_end();
-
-		ar(stats);
-
-		const usz old_end = ar.pad_from_end(stats.size);
-
-		if (usz read_size = file.read_at(0, &ar.data[old_end], stats.size); read_size != stats.size)
-		{
-			ensure(read_size < stats.size);
-			sys_fs.error("Read less than expected! (new-size=0x%x)", read_size);
-			stats.size = read_size;
-			ar.data.resize(old_end + stats.size);
-			write_to_ptr<fs::stat_t>(&ar.data[patch_stats_pos], stats);
-		}
-	}
-
-	ar(file.pos());
-}
-
-lv2_dir::lv2_dir(utils::serial& ar)
-	: lv2_fs_object(ar, false)
-	, entries([&]
-	{
-		std::vector<fs::dir_entry> entries;
-
-		u64 size = 0;
-		ar.deserialize_vle(size);
-		entries.resize(size);
-
-		for (auto& entry : entries)
-		{
-			ar(entry.name, static_cast<fs::stat_t&>(entry));
-		}
-
-		return entries;
-	}())
-	, pos(ar)
-{
-}
-
-void lv2_dir::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(lv2_fs);
-
-	ar(name);
-
-	ar.serialize_vle(entries.size());
-
-	for (auto& entry : entries)
-	{
-		ar(entry.name, static_cast<const fs::stat_t&>(entry));
-	}
-
-	ar(pos);
-}
-
-loaded_npdrm_keys::loaded_npdrm_keys(utils::serial& ar)
-{
-	save(ar);
-}
-
-void loaded_npdrm_keys::save(utils::serial& ar)
-{
-	ar(dec_keys_pos);
-	ar(std::span(dec_keys, std::min<usz>(std::size(dec_keys), dec_keys_pos)));
-}
-
 struct lv2_file::file_view : fs::file_base
 {
-	const shared_ptr<lv2_file> m_file;
+	const std::shared_ptr<lv2_file> m_file;
 	const u64 m_off;
 	u64 m_pos;
 
-	explicit file_view(const shared_ptr<lv2_file>& _file, u64 offset)
+	explicit file_view(const std::shared_ptr<lv2_file>& _file, u64 offset)
 		: m_file(_file)
 		, m_off(offset)
 		, m_pos(0)
@@ -630,15 +248,9 @@ struct lv2_file::file_view : fs::file_base
 	{
 	}
 
-	fs::stat_t get_stat() override
+	fs::stat_t stat() override
 	{
-		fs::stat_t stat = m_file->file.get_stat();
-
-		// TODO: Check this on realhw
-		//stat.size = utils::sub_saturate<u64>(stat.size, m_off);
-
-		stat.is_writable = false;
-		return stat;
+		return m_file->file.stat();
 	}
 
 	bool trunc(u64) override
@@ -648,17 +260,15 @@ struct lv2_file::file_view : fs::file_base
 
 	u64 read(void* buffer, u64 size) override
 	{
-		const u64 result = file_view::read_at(m_pos, buffer, size);
+		const u64 old_pos = m_file->file.pos();
+		m_file->file.seek(m_off + m_pos);
+		const u64 result = m_file->file.read(buffer, size);
+		ensure(old_pos == m_file->file.seek(old_pos));
 
 		m_pos += result;
 		return result;
 	}
 
-	u64 read_at(u64 offset, void* buffer, u64 size) override
-	{
-		return m_file->file.read_at(m_off + offset, buffer, size);
-	}
-
 	u64 write(const void*, u64) override
 	{
 		return 0;
@@ -683,54 +293,17 @@ struct lv2_file::file_view : fs::file_base
 
 	u64 size() override
 	{
-		return utils::sub_saturate<u64>(m_file->file.size(), m_off);
-	}
-
-	fs::file_id get_id() override
-	{
-		fs::file_id id = m_file->file.get_id();
-
-		be_t<u64> off = m_off;
-		const auto ptr = reinterpret_cast<u8*>(&off);
-
-		id.data.insert(id.data.end(), ptr, ptr + sizeof(off));
-		id.type.insert(0, "lv2_file::file_view: "sv);
-		return id;
+		return m_file->file.size();
 	}
 };
 
-fs::file lv2_file::make_view(const shared_ptr<lv2_file>& _file, u64 offset)
+fs::file lv2_file::make_view(const std::shared_ptr<lv2_file>& _file, u64 offset)
 {
 	fs::file result;
 	result.reset(std::make_unique<lv2_file::file_view>(_file, offset));
 	return result;
 }
 
-std::pair<CellError, std::string> translate_to_str(vm::cptr<char> ptr, bool is_path = true)
-{
-	constexpr usz max_length = CELL_FS_MAX_FS_PATH_LENGTH + 1;
-
-	std::string path;
-
-	if (!vm::read_string(ptr.addr(), max_length, path, true))
-	{
-		// Null character lookup has ended whilst pointing at invalid memory
-		return {CELL_EFAULT, std::move(path)};
-	}
-
-	if (path.size() == max_length)
-	{
-		return {CELL_ENAMETOOLONG, {}};
-	}
-
-	if (is_path && !path.starts_with("/"sv))
-	{
-		return {CELL_ENOENT, std::move(path)};
-	}
-
-	return {{}, std::move(path)};
-}
-
 error_code sys_fs_test(ppu_thread&, u32 arg1, u32 arg2, vm::ptr<u32> arg3, u32 arg4, vm::ptr<char> buf, u32 buf_size)
 {
 	sys_fs.trace("sys_fs_test(arg1=0x%x, arg2=0x%x, arg3=*0x%x, arg4=0x%x, buf=*0x%x, buf_size=0x%x)", arg1, arg2, arg3, arg4, buf, buf_size);
@@ -745,7 +318,7 @@ error_code sys_fs_test(ppu_thread&, u32 arg1, u32 arg2, vm::ptr<u32> arg3, u32 a
 		return CELL_EFAULT;
 	}
 
-	const auto file = idm::get_unlocked<lv2_fs_object>(*arg3);
+	const auto file = idm::get<lv2_fs_object>(*arg3);
 
 	if (!file)
 	{
@@ -764,7 +337,7 @@ error_code sys_fs_test(ppu_thread&, u32 arg1, u32 arg2, vm::ptr<u32> arg3, u32 a
 	return CELL_OK;
 }
 
-lv2_file::open_raw_result_t lv2_file::open_raw(const std::string& local_path, s32 flags, s32 /*mode*/, lv2_file_type type, const lv2_fs_mount_info& mp)
+lv2_file::open_raw_result_t lv2_file::open_raw(const std::string& local_path, s32 flags, s32 /*mode*/, lv2_file_type type, const lv2_fs_mount_point* mp)
 {
 	// TODO: other checks for path
 
@@ -783,7 +356,7 @@ lv2_file::open_raw_result_t lv2_file::open_raw(const std::string& local_path, s3
 	default: break;
 	}
 
-	if (mp.read_only)
+	if (mp->flags & lv2_mp_flag::read_only)
 	{
 		if ((flags & CELL_FS_O_ACCMODE) != CELL_FS_O_RDONLY && fs::is_file(local_path))
 		{
@@ -821,7 +394,7 @@ lv2_file::open_raw_result_t lv2_file::open_raw(const std::string& local_path, s3
 		sys_fs.warning("lv2_file::open() called with CELL_FS_O_UNK flag enabled. FLAGS: %#o", flags);
 	}
 
-	if (mp.read_only)
+	if (mp->flags & lv2_mp_flag::read_only)
 	{
 		// Deactivate mutating flags on read-only FS
 		open_mode = fs::read;
@@ -873,7 +446,7 @@ lv2_file::open_raw_result_t lv2_file::open_raw(const std::string& local_path, s3
 
 	if (!file)
 	{
-		if (mp.read_only)
+		if (mp->flags & lv2_mp_flag::read_only)
 		{
 			// Failed to create file on read-only FS (file doesn't exist)
 			if (flags & CELL_FS_O_ACCMODE && flags & CELL_FS_O_CREAT)
@@ -935,47 +508,13 @@ lv2_file::open_raw_result_t lv2_file::open_raw(const std::string& local_path, s3
 			if (magic == "NPD\0"_u32)
 			{
 				auto& edatkeys = g_fxo->get<loaded_npdrm_keys>();
-
-				const u64 init_pos = edatkeys.dec_keys_pos;
-				const auto& dec_keys = edatkeys.dec_keys;
-				const u64 max_i = std::min<u64>(std::size(dec_keys), init_pos);
-
-				if (edatkeys.one_time_key)
+				auto sdata_file = std::make_unique<EDATADecrypter>(std::move(file), edatkeys.devKlic.load(), edatkeys.rifKey.load());
+				if (!sdata_file->ReadHeader())
 				{
-					auto edata_file = std::make_unique<EDATADecrypter>(std::move(file), edatkeys.one_time_key);
-					edatkeys.one_time_key = {};
-
-					if (!edata_file->ReadHeader())
-					{
-						// Read failure
-						return {CELL_EFSSPECIFIC};
-					}
-
-					file.reset(std::move(edata_file));
-					break;
+					return {CELL_EFSSPECIFIC};
 				}
 
-				for (u64 i = 0;; i++)
-				{
-					if (i == max_i)
-					{
-						// Run out of keys to try
-						return {CELL_EFSSPECIFIC};
-					}
-
-					// Try all registered keys
-					auto edata_file = std::make_unique<EDATADecrypter>(std::move(file), dec_keys[(init_pos - i - 1) % std::size(dec_keys)].load());
-					if (!edata_file->ReadHeader())
-					{
-						// Prepare file for the next iteration
-						file = std::move(edata_file->m_edata_file);
-						continue;
-					}
-
-					file.reset(std::move(edata_file));
-					break;
-
-				}
+				file.reset(std::move(sdata_file));
 			}
 
 			break;
@@ -995,9 +534,9 @@ lv2_file::open_result_t lv2_file::open(std::string_view vpath, s32 flags, s32 mo
 	}
 
 	std::string path;
-	std::string local_path = vfs::get(vpath, nullptr, &path);
+	const std::string local_path = vfs::get(vpath, nullptr, &path);
 
-	const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath);
+	const auto mp = lv2_fs_object::get_mp(vpath);
 
 	if (mp == &g_mp_sys_dev_root)
 	{
@@ -1009,17 +548,12 @@ lv2_file::open_result_t lv2_file::open(std::string_view vpath, s32 flags, s32 mo
 		return {CELL_ENOTMOUNTED, path};
 	}
 
-	if (flags & CELL_FS_O_CREAT && !has_fs_write_rights(vpath) && !fs::is_dir(local_path))
-	{
-		return {CELL_EACCES};
-	}
-
 	lv2_file_type type = lv2_file_type::regular;
 
 	if (size == 8)
 	{
 		// see lv2_file::open_raw
-		switch (*static_cast<const be_t<u64, 1>*>(arg))
+		switch (*static_cast<const be_t<u64>*>(arg))
 		{
 		case 0x18000000010: type = lv2_file_type::sdata; break;
 		case 0x2: type = lv2_file_type::edata; break;
@@ -1040,14 +574,10 @@ error_code sys_fs_open(ppu_thread& ppu, vm::cptr<char> path, s32 flags, vm::ptr<
 
 	sys_fs.warning("sys_fs_open(path=%s, flags=%#o, fd=*0x%x, mode=%#o, arg=*0x%x, size=0x%llx)", path, flags, fd, mode, arg, size);
 
-	const auto [path_error, vpath] = translate_to_str(path);
+	if (!path)
+		return CELL_EFAULT;
 
-	if (path_error)
-	{
-		return {path_error, vpath};
-	}
-
-	auto [error, ppath, real, file, type] = lv2_file::open(vpath, flags, mode, arg.get_ptr(), size);
+	auto [error, ppath, real, file, type] = lv2_file::open(path.get_ptr(), flags, mode, arg.get_ptr(), size);
 
 	if (error)
 	{
@@ -1056,24 +586,29 @@ error_code sys_fs_open(ppu_thread& ppu, vm::cptr<char> path, s32 flags, vm::ptr<
 			return not_an_error(CELL_EEXIST);
 		}
 
-		return {g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath) == &g_mp_sys_dev_hdd1 ? sys_fs.warning : sys_fs.error, error, path};
+		return {error, path};
 	}
 
-	if (const u32 id = idm::import<lv2_fs_object, lv2_file>([&ppath = ppath, &file = file, mode, flags, &real = real, &type = type]() -> shared_ptr<lv2_file>
+	if (type >= lv2_file_type::sdata)
 	{
-		shared_ptr<lv2_file> result;
+		sys_fs.warning("sys_fs_open(): NPDRM detected");
 
-		if (type >= lv2_file_type::sdata && !g_fxo->get<loaded_npdrm_keys>().npdrm_fds.try_inc(16))
+		if (const u32 id = idm::import<lv2_fs_object, lv2_file>([&ppath = ppath, &file = file, mode, flags, &real = real, &type = type]() -> std::shared_ptr<lv2_file>
 		{
-			return result;
-		}
+			if (!g_fxo->get<loaded_npdrm_keys>().npdrm_fds.try_inc(16))
+			{
+				return nullptr;
+			}
 
-		result = stx::make_shared<lv2_file>(ppath, std::move(file), mode, flags, real, type);
-		sys_fs.warning("sys_fs_open(): fd=%u, %s", idm::last_id(), *result);
-		return result;
-	}))
+			return std::make_shared<lv2_file>(ppath, std::move(file), mode, flags, real, type);
+		}))
+		{
+			*fd = id;
+			return CELL_OK;
+		}
+	}
+	else if (const u32 id = idm::make<lv2_fs_object, lv2_file>(ppath, std::move(file), mode, flags, real))
 	{
-		ppu.check_state();
 		*fd = id;
 		return CELL_OK;
 	}
@@ -1100,29 +635,15 @@ error_code sys_fs_read(ppu_thread& ppu, u32 fd, vm::ptr<void> buf, u64 nbytes, v
 		return CELL_EFAULT;
 	}
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
-	if (!file || (nbytes && file->flags & CELL_FS_O_WRONLY))
+	if (!file || file->flags & CELL_FS_O_WRONLY)
 	{
 		nread.try_write(0); // nread writing is allowed to fail, error code is unchanged
 		return CELL_EBADF;
 	}
 
-	if (!nbytes)
-	{
-		// Whole function is skipped, only EBADF and EBUSY are checked
-		if (file->lock == 1)
-		{
-			nread.try_write(0);
-			return CELL_EBUSY;
-		}
-
-		ppu.check_state();
-		*nread = 0;
-		return CELL_OK;
-	}
-
-	std::unique_lock lock(file->mp->mutex);
+	std::lock_guard lock(file->mp->mutex);
 
 	if (!file->file)
 	{
@@ -1135,18 +656,7 @@ error_code sys_fs_read(ppu_thread& ppu, u32 fd, vm::ptr<void> buf, u64 nbytes, v
 		return CELL_EIO;
 	}
 
-	const u64 read_bytes = file->op_read(buf, nbytes);
-	const bool failure = !read_bytes && file->file.pos() < file->file.size();
-	lock.unlock();
-	ppu.check_state();
-
-	*nread = read_bytes;
-
-	if (failure)
-	{
-		// EDATA corruption perhaps
-		return CELL_EFSSPECIFIC;
-	}
+	*nread = file->op_read(buf, nbytes);
 
 	return CELL_OK;
 }
@@ -1169,40 +679,21 @@ error_code sys_fs_write(ppu_thread& ppu, u32 fd, vm::cptr<void> buf, u64 nbytes,
 		return CELL_EFAULT;
 	}
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
-	if (!file || (nbytes && !(file->flags & CELL_FS_O_ACCMODE)))
+	if (!file || !(file->flags & CELL_FS_O_ACCMODE))
 	{
 		nwrite.try_write(0); // nwrite writing is allowed to fail, error code is unchanged
 		return CELL_EBADF;
 	}
 
-	if (!nbytes)
-	{
-		// Whole function is skipped, only EBADF and EBUSY are checked
-		if (file->lock == 1)
-		{
-			nwrite.try_write(0);
-			return CELL_EBUSY;
-		}
-
-		ppu.check_state();
-		*nwrite = 0;
-		return CELL_OK;
-	}
-
-	if (file->type != lv2_file_type::regular)
-	{
-		sys_fs.error("%s type: Writing %u bytes to FD=%d (path=%s)", file->type, nbytes, file->name.data());
-	}
-
-	if (file->mp.read_only)
+	if (file->mp->flags & lv2_mp_flag::read_only)
 	{
 		nwrite.try_write(0);
 		return CELL_EROFS;
 	}
 
-	std::unique_lock lock(file->mp->mutex);
+	std::lock_guard lock(file->mp->mutex);
 
 	if (!file->file)
 	{
@@ -1226,11 +717,8 @@ error_code sys_fs_write(ppu_thread& ppu, u32 fd, vm::cptr<void> buf, u64 nbytes,
 		file->file.seek(0, fs::seek_end);
 	}
 
-	const u64 written = file->op_write(buf, nbytes);
-	lock.unlock();
-	ppu.check_state();
+	*nwrite = file->op_write(buf, nbytes);
 
-	*nwrite = written;
 	return CELL_OK;
 }
 
@@ -1239,18 +727,13 @@ error_code sys_fs_close(ppu_thread& ppu, u32 fd)
 	ppu.state += cpu_flag::wait;
 	lv2_obj::sleep(ppu);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	sys_fs.trace("sys_fs_close(fd=%d)", fd);
+
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
-		return {CELL_EBADF, fd};
-	}
-
-	std::string FD_state_log;
-
-	if (sys_fs.warning)
-	{
-		FD_state_log = fmt::format("sys_fs_close(fd=%u)", fd);
+		return CELL_EBADF;
 	}
 
 	{
@@ -1258,54 +741,43 @@ error_code sys_fs_close(ppu_thread& ppu, u32 fd)
 
 		if (!file->file)
 		{
-			sys_fs.warning("%s", FD_state_log);
-			return {CELL_EBADF, fd};
+			return CELL_EBADF;
 		}
 
-		if (!(file->mp.read_only && file->mp->flags & lv2_mp_flag::cache) && file->flags & CELL_FS_O_ACCMODE)
+		if (!(file->mp->flags & (lv2_mp_flag::read_only + lv2_mp_flag::cache)) && file->flags & CELL_FS_O_ACCMODE)
 		{
 			// Special: Ensure temporary directory for gamedata writes will remain on disk before final gamedata commitment
 			file->file.sync(); // For cellGameContentPermit atomicity
 		}
 
-		if (!FD_state_log.empty())
-		{
-			sys_fs.warning("%s: %s", FD_state_log, *file);
-		}
-
-		// Free memory associated with fd if any
-		if (file->ct_id && file->ct_used)
-		{
-			auto& default_container = g_fxo->get<default_sys_fs_container>();
-			std::lock_guard lock(default_container.mutex);
-
-			if (auto ct = idm::get_unlocked<lv2_memory_container>(file->ct_id))
-			{
-				ct->free(file->ct_used);
-				if (default_container.id == file->ct_id)
-				{
-					default_container.used -= file->ct_used;
-				}
-			}
-		}
-
 		// Ensure Host file handle won't be kept open after this syscall
 		file->file.close();
 	}
 
-	ensure(idm::withdraw<lv2_fs_object, lv2_file>(fd, [&](lv2_file& _file) -> CellError
+	const auto ret = idm::withdraw<lv2_fs_object, lv2_file>(fd, [&](lv2_file& _file) -> CellError
 	{
+		if (file.get() != std::addressof(_file))
+		{
+			// Other thread destroyed the object inbetween
+			return CELL_EBADF;
+		}
+
 		if (_file.type >= lv2_file_type::sdata)
 		{
 			g_fxo->get<loaded_npdrm_keys>().npdrm_fds--;
 		}
 
 		return {};
-	}));
+	});
+
+	if (!ret || ret.ret == CELL_EBADF)
+	{
+		return CELL_EBADF;
+	}
 
 	if (file->lock == 1)
 	{
-		return {CELL_EBUSY, fd};
+		return CELL_EBUSY;
 	}
 
 	return CELL_OK;
@@ -1318,20 +790,20 @@ error_code sys_fs_opendir(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<u32> fd)
 
 	sys_fs.warning("sys_fs_opendir(path=%s, fd=*0x%x)", path, fd);
 
-	const auto [path_error, vpath] = translate_to_str(path);
+	if (!path)
+		return CELL_EFAULT;
 
-	if (path_error)
-	{
-		return {path_error, vpath};
-	}
+	if (!path[0])
+		return CELL_ENOENT;
 
 	std::string processed_path;
 	std::vector<std::string> ext;
+	const std::string_view vpath = path.get_ptr();
 	const std::string local_path = vfs::get(vpath, &ext, &processed_path);
 
 	processed_path += "/";
 
-	const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath);
+	const auto mp = lv2_fs_object::get_mp(vpath);
 
 	if (local_path.empty() && ext.empty())
 	{
@@ -1345,7 +817,7 @@ error_code sys_fs_opendir(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<u32> fd)
 		return {CELL_ENOTDIR, path};
 	}
 
-	std::unique_lock lock(mp->mutex);
+	std::lock_guard lock(mp->mutex);
 
 	const fs::dir dir(local_path);
 
@@ -1357,7 +829,7 @@ error_code sys_fs_opendir(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<u32> fd)
 		{
 			if (ext.empty())
 			{
-				return {mp == &g_mp_sys_dev_hdd1 ? sys_fs.warning : sys_fs.error, CELL_ENOENT, path};
+				return {CELL_ENOENT, path};
 			}
 
 			break;
@@ -1399,7 +871,7 @@ error_code sys_fs_opendir(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<u32> fd)
 	}
 	else
 	{
-		data.emplace_back().name += '.';
+		data.emplace_back().name = ".";
 		data.back().is_directory = true;
 		data.emplace_back().name = "..";
 		data.back().is_directory = true;
@@ -1413,16 +885,21 @@ error_code sys_fs_opendir(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<u32> fd)
 	}
 
 	// Sort files, keeping . and ..
-	std::stable_sort(data.begin() + 2, data.end(), FN(x.name < y.name));
+	std::stable_sort(data.begin() + 2, data.end(), [](const fs::dir_entry& a, const fs::dir_entry& b)
+	{
+		return a.name < b.name;
+	});
 
 	// Remove duplicates
-	data.erase(std::unique(data.begin(), data.end(), FN(x.name == y.name)), data.end());
+	const auto last = std::unique(data.begin(), data.end(), [](const fs::dir_entry& a, const fs::dir_entry& b)
+	{
+		return a.name == b.name;
+	});
+
+	data.erase(last, data.end());
 
 	if (const u32 id = idm::make<lv2_fs_object, lv2_dir>(processed_path, std::move(data)))
 	{
-		lock.unlock();
-		ppu.check_state();
-
 		*fd = id;
 		return CELL_OK;
 	}
@@ -1434,57 +911,29 @@ error_code sys_fs_opendir(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<u32> fd)
 error_code sys_fs_readdir(ppu_thread& ppu, u32 fd, vm::ptr<CellFsDirent> dir, vm::ptr<u64> nread)
 {
 	ppu.state += cpu_flag::wait;
+	lv2_obj::sleep(ppu);
 
 	sys_fs.warning("sys_fs_readdir(fd=%d, dir=*0x%x, nread=*0x%x)", fd, dir, nread);
 
-	if (!dir || !nread)
-	{
-		return CELL_EFAULT;
-	}
-
-	const auto directory = idm::get_unlocked<lv2_fs_object, lv2_dir>(fd);
+	const auto directory = idm::get<lv2_fs_object, lv2_dir>(fd);
 
 	if (!directory)
 	{
 		return CELL_EBADF;
 	}
 
-	ppu.check_state();
-
-	auto* info = directory->dir_read();
-
-	u64 nread_to_write = 0;
-
-	if (info)
+	if (auto* info = directory->dir_read())
 	{
-		nread_to_write = sizeof(CellFsDirent);
+		dir->d_type = info->is_directory ? CELL_FS_TYPE_DIRECTORY : CELL_FS_TYPE_REGULAR;
+		dir->d_namlen = u8(std::min<usz>(info->name.size(), CELL_FS_MAX_FS_FILE_NAME_LENGTH));
+		strcpy_trunc(dir->d_name, info->name);
+		*nread = sizeof(CellFsDirent);
 	}
 	else
 	{
-		// It does actually write polling the last entry. Seems consistent across HDD0 and HDD1 (TODO: check more partitions)
-		info = &directory->entries.back();
-		nread_to_write = 0;
+		*nread = 0;
 	}
 
-	CellFsDirent dir_write{};
-
-	dir_write.d_type = info->is_directory ? CELL_FS_TYPE_DIRECTORY : CELL_FS_TYPE_REGULAR;
-	dir_write.d_namlen = u8(std::min<usz>(info->name.size(), CELL_FS_MAX_FS_FILE_NAME_LENGTH));
-	strcpy_trunc(dir_write.d_name, info->name);
-
-	// TODO: Check more partitions (HDD1 is known to differ in actual filesystem implementation)
-	if (directory->mp != &g_mp_sys_dev_hdd1 && nread_to_write == 0)
-	{
-		// First 3 bytes are being set to 0 here
-		dir_write.d_type = 0;
-		dir_write.d_namlen = 0;
-		dir_write.d_name[0] = '\0';
-	}
-
-	*dir = dir_write;
-
-	// Write after dir
-	*nread = nread_to_write;
 	return CELL_OK;
 }
 
@@ -1510,16 +959,16 @@ error_code sys_fs_stat(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<CellFsStat>
 
 	sys_fs.warning("sys_fs_stat(path=%s, sb=*0x%x)", path, sb);
 
-	const auto [path_error, vpath] = translate_to_str(path);
+	if (!path)
+		return CELL_EFAULT;
 
-	if (path_error)
-	{
-		return {path_error, vpath};
-	}
+	if (!path[0])
+		return CELL_ENOENT;
 
+	const std::string_view vpath = path.get_ptr();
 	const std::string local_path = vfs::get(vpath);
 
-	const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath);
+	const auto mp = lv2_fs_object::get_mp(vpath);
 
 	if (mp == &g_mp_sys_dev_root)
 	{
@@ -1536,16 +985,14 @@ error_code sys_fs_stat(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<CellFsStat>
 
 	if (local_path.empty())
 	{
-		// This syscall can be used by games and VSH to test the presence of dev_usb000 ~ dev_usb127
-		// Thus there is no need to fuss about CELL_ENOTMOUNTED in this case
-		return {sys_fs.warning, CELL_ENOTMOUNTED, path};
+		return {CELL_ENOTMOUNTED, path};
 	}
 
-	std::unique_lock lock(mp->mutex);
+	std::lock_guard lock(mp->mutex);
 
 	fs::stat_t info{};
 
-	if (!fs::get_stat(local_path, info))
+	if (!fs::stat(local_path, info))
 	{
 		switch (auto error = fs::g_tls_error)
 		{
@@ -1556,7 +1003,7 @@ error_code sys_fs_stat(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<CellFsStat>
 
 			for (u32 i = 66601; i <= 66699; i++)
 			{
-				if (fs::get_stat(fmt::format("%s.%u", local_path, i), info) && !info.is_directory)
+				if (fs::stat(fmt::format("%s.%u", local_path, i), info) && !info.is_directory)
 				{
 					total_size += info.size;
 				}
@@ -1567,14 +1014,14 @@ error_code sys_fs_stat(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<CellFsStat>
 			}
 
 			// Use attributes from the first fragment (consistently with sys_fs_open+fstat)
-			if (fs::get_stat(local_path + ".66600", info) && !info.is_directory)
+			if (fs::stat(local_path + ".66600", info) && !info.is_directory)
 			{
 				// Success
 				info.size += total_size;
 				break;
 			}
 
-			return {mp == &g_mp_sys_dev_hdd1 ? sys_fs.warning : sys_fs.error, CELL_ENOENT, path};
+			return {CELL_ENOENT, path};
 		}
 		default:
 		{
@@ -1584,18 +1031,7 @@ error_code sys_fs_stat(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<CellFsStat>
 		}
 	}
 
-	lock.unlock();
-	ppu.check_state();
-
-	s32 mode = info.is_directory ? CELL_FS_S_IFDIR | 0777 : CELL_FS_S_IFREG | 0666;
-
-	if (mp.read_only)
-	{
-		// Remove write permissions
-		mode &= ~0222;
-	}
-
-	sb->mode = mode;
+	sb->mode = info.is_directory ? CELL_FS_S_IFDIR | 0777 : CELL_FS_S_IFREG | 0666;
 	sb->uid = mp->flags & lv2_mp_flag::no_uid_gid ? -1 : 0;
 	sb->gid = mp->flags & lv2_mp_flag::no_uid_gid ? -1 : 0;
 	sb->atime = info.atime;
@@ -1604,6 +1040,12 @@ error_code sys_fs_stat(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<CellFsStat>
 	sb->size = info.is_directory ? mp->block_size : info.size;
 	sb->blksize = mp->block_size;
 
+	if (mp->flags & lv2_mp_flag::read_only)
+	{
+		// Remove write permissions
+		sb->mode &= ~0222;
+	}
+
 	return CELL_OK;
 }
 
@@ -1614,14 +1056,14 @@ error_code sys_fs_fstat(ppu_thread& ppu, u32 fd, vm::ptr<CellFsStat> sb)
 
 	sys_fs.warning("sys_fs_fstat(fd=%d, sb=*0x%x)", fd, sb);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
 		return CELL_EBADF;
 	}
 
-	std::unique_lock lock(file->mp->mutex);
+	std::lock_guard lock(file->mp->mutex);
 
 	if (!file->file)
 	{
@@ -1633,19 +1075,9 @@ error_code sys_fs_fstat(ppu_thread& ppu, u32 fd, vm::ptr<CellFsStat> sb)
 		return CELL_EIO;
 	}
 
-	const fs::stat_t info = file->file.get_stat();
-	lock.unlock();
-	ppu.check_state();
+	const fs::stat_t& info = file->file.stat();
 
-	s32 mode = info.is_directory ? CELL_FS_S_IFDIR | 0777 : CELL_FS_S_IFREG | 0666;
-
-	if (file->mp.read_only)
-	{
-		// Remove write permissions
-		mode &= ~0222;
-	}
-
-	sb->mode = mode;
+	sb->mode = info.is_directory ? CELL_FS_S_IFDIR | 0777 : CELL_FS_S_IFREG | 0666;
 	sb->uid = file->mp->flags & lv2_mp_flag::no_uid_gid ? -1 : 0;
 	sb->gid = file->mp->flags & lv2_mp_flag::no_uid_gid ? -1 : 0;
 	sb->atime = info.atime;
@@ -1653,6 +1085,13 @@ error_code sys_fs_fstat(ppu_thread& ppu, u32 fd, vm::ptr<CellFsStat> sb)
 	sb->ctime = info.ctime; // ctime may be incorrect
 	sb->size = info.size;
 	sb->blksize = file->mp->block_size;
+
+	if (file->mp->flags & lv2_mp_flag::read_only)
+	{
+		// Remove write permissions
+		sb->mode &= ~0222;
+	}
+
 	return CELL_OK;
 }
 
@@ -1670,16 +1109,16 @@ error_code sys_fs_mkdir(ppu_thread& ppu, vm::cptr<char> path, s32 mode)
 
 	sys_fs.warning("sys_fs_mkdir(path=%s, mode=%#o)", path, mode);
 
-	const auto [path_error, vpath] = translate_to_str(path);
+	if (!path)
+		return CELL_EFAULT;
 
-	if (path_error)
-	{
-		return {path_error, vpath};
-	}
+	if (!path[0])
+		return CELL_ENOENT;
 
+	const std::string_view vpath = path.get_ptr();
 	const std::string local_path = vfs::get(vpath);
 
-	const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath);
+	const auto mp = lv2_fs_object::get_mp(vpath);
 
 	if (mp == &g_mp_sys_dev_root)
 	{
@@ -1691,30 +1130,19 @@ error_code sys_fs_mkdir(ppu_thread& ppu, vm::cptr<char> path, s32 mode)
 		return {CELL_ENOTMOUNTED, path};
 	}
 
-	if (mp.read_only)
+	if (mp->flags & lv2_mp_flag::read_only)
 	{
 		return {CELL_EROFS, path};
 	}
 
-	if (!fs::exists(local_path) && !has_fs_write_rights(path.get_ptr()))
-	{
-		return {CELL_EACCES, path};
-	}
-
 	std::lock_guard lock(mp->mutex);
 
 	if (!fs::create_dir(local_path))
 	{
 		switch (auto error = fs::g_tls_error)
 		{
-		case fs::error::noent:
-		{
-			return {mp == &g_mp_sys_dev_hdd1 ? sys_fs.warning : sys_fs.error, CELL_ENOENT, path};
-		}
-		case fs::error::exist:
-		{
-			return {sys_fs.warning, CELL_EEXIST, path};
-		}
+		case fs::error::noent: return {CELL_ENOENT, path};
+		case fs::error::exist: return {CELL_EEXIST, path};
 		default: sys_fs.error("sys_fs_mkdir(): unknown error %s", error);
 		}
 
@@ -1732,25 +1160,14 @@ error_code sys_fs_rename(ppu_thread& ppu, vm::cptr<char> from, vm::cptr<char> to
 
 	sys_fs.warning("sys_fs_rename(from=%s, to=%s)", from, to);
 
-	const auto [from_error, vfrom] = translate_to_str(from);
-
-	if (from_error)
-	{
-		return {from_error, vfrom};
-	}
-
-	const auto [to_error, vto] = translate_to_str(to);
-
-	if (to_error)
-	{
-		return {to_error, vto};
-	}
-
+	const std::string_view vfrom = from.get_ptr();
 	const std::string local_from = vfs::get(vfrom);
+
+	const std::string_view vto = to.get_ptr();
 	const std::string local_to = vfs::get(vto);
 
-	const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup(vfrom);
-	const auto& mp_to = g_fxo->get<lv2_fs_mount_info_map>().lookup(vto);
+	const auto mp = lv2_fs_object::get_mp(vfrom);
+	const auto mp_to = lv2_fs_object::get_mp(vto);
 
 	if (mp == &g_mp_sys_dev_root || mp_to == &g_mp_sys_dev_root)
 	{
@@ -1767,7 +1184,7 @@ error_code sys_fs_rename(ppu_thread& ppu, vm::cptr<char> from, vm::cptr<char> to
 		return CELL_EXDEV;
 	}
 
-	if (mp.read_only)
+	if (mp->flags & lv2_mp_flag::read_only)
 	{
 		return CELL_EROFS;
 	}
@@ -1775,7 +1192,7 @@ error_code sys_fs_rename(ppu_thread& ppu, vm::cptr<char> from, vm::cptr<char> to
 	// Done in vfs::host::rename
 	//std::lock_guard lock(mp->mutex);
 
-	if (!vfs::host::rename(local_from, local_to, mp.mp, false))
+	if (!vfs::host::rename(local_from, local_to, mp, false))
 	{
 		switch (auto error = fs::g_tls_error)
 		{
@@ -1798,16 +1215,16 @@ error_code sys_fs_rmdir(ppu_thread& ppu, vm::cptr<char> path)
 
 	sys_fs.warning("sys_fs_rmdir(path=%s)", path);
 
-	const auto [path_error, vpath] = translate_to_str(path);
+	if (!path)
+		return CELL_EFAULT;
 
-	if (path_error)
-	{
-		return {path_error, vpath};
-	}
+	if (!path[0])
+		return CELL_ENOENT;
 
+	const std::string_view vpath = path.get_ptr();
 	const std::string local_path = vfs::get(vpath);
 
-	const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath);
+	const auto mp = lv2_fs_object::get_mp(vpath);
 
 	if (mp == &g_mp_sys_dev_root)
 	{
@@ -1819,16 +1236,11 @@ error_code sys_fs_rmdir(ppu_thread& ppu, vm::cptr<char> path)
 		return {CELL_ENOTMOUNTED, path};
 	}
 
-	if (mp.read_only)
+	if (mp->flags & lv2_mp_flag::read_only)
 	{
 		return {CELL_EROFS, path};
 	}
 
-	if (fs::is_dir(local_path) && !has_fs_write_rights(path.get_ptr()))
-	{
-		return {CELL_EACCES};
-	}
-
 	std::lock_guard lock(mp->mutex);
 
 	if (!fs::remove_dir(local_path))
@@ -1854,17 +1266,16 @@ error_code sys_fs_unlink(ppu_thread& ppu, vm::cptr<char> path)
 
 	sys_fs.warning("sys_fs_unlink(path=%s)", path);
 
-	const auto [path_error, vpath] = translate_to_str(path);
+	if (!path)
+		return CELL_EFAULT;
 
-	if (path_error)
-	{
-		return {path_error, vpath};
-	}
+	if (!path[0])
+		return CELL_ENOENT;
 
+	const std::string_view vpath = path.get_ptr();
 	const std::string local_path = vfs::get(vpath);
 
-	std::string mount_path = fs::get_parent_dir(vpath); // Use its parent directory as fallback
-	const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath, true, &mount_path);
+	const auto mp = lv2_fs_object::get_mp(vpath);
 
 	if (mp == &g_mp_sys_dev_root)
 	{
@@ -1881,21 +1292,19 @@ error_code sys_fs_unlink(ppu_thread& ppu, vm::cptr<char> path)
 		return {CELL_EISDIR, path};
 	}
 
-	if (mp.read_only)
+	if (mp->flags & lv2_mp_flag::read_only)
 	{
 		return {CELL_EROFS, path};
 	}
 
 	std::lock_guard lock(mp->mutex);
 
-	if (!vfs::host::unlink(local_path, vfs::get(mount_path)))
+	// Provide default mp root or use parent directory if not available (such as host_root)
+	if (!vfs::host::unlink(local_path, vfs::get(mp->root.empty() ? vpath.substr(0, vpath.find_last_of('/')) : mp->root)))
 	{
 		switch (auto error = fs::g_tls_error)
 		{
-		case fs::error::noent:
-		{
-			return {mp == &g_mp_sys_dev_hdd1 ? sys_fs.warning : sys_fs.error, CELL_ENOENT, path};
-		}
+		case fs::error::noent: return {CELL_ENOENT, path};
 		default: sys_fs.error("sys_fs_unlink(): unknown error %s", error);
 		}
 
@@ -1960,7 +1369,7 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
 			return CELL_EINVAL;
 		}
 
-		const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+		const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 		if (!file)
 		{
@@ -1982,29 +1391,12 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
 			return CELL_EBADF;
 		}
 
-		if (op == 0x8000000b && file->mp.read_only)
+		if (op == 0x8000000b && file->mp->flags & lv2_mp_flag::read_only)
 		{
 			return CELL_EROFS;
 		}
 
-		if (op == 0x8000000b && file->type != lv2_file_type::regular && arg->size)
-		{
-			sys_fs.error("%s type: Writing %u bytes to FD=%d (path=%s)", file->type, arg->size, file->name.data());
-		}
-
-		std::unique_lock wlock(file->mp->mutex, std::defer_lock);
-		std::shared_lock rlock(file->mp->mutex, std::defer_lock);
-
-		if (op == 0x8000000b)
-		{
-			// Writer lock
-			wlock.lock();
-		}
-		else
-		{
-			// Reader lock (not needing exclusivity in this special case because the state should not change)
-			rlock.lock();
-		}
+		std::lock_guard lock(file->mp->mutex);
 
 		if (!file->file)
 		{
@@ -2021,25 +1413,14 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
 			return CELL_EBUSY;
 		}
 
-		u64 old_pos = umax;
-		const u64 op_pos = arg->offset;
-
-		if (op == 0x8000000b)
-		{
-			old_pos = file->file.pos();
-			file->file.seek(op_pos);
-		}
+		const u64 old_pos = file->file.pos();
+		file->file.seek(arg->offset);
 
 		arg->out_size = op == 0x8000000a
-			? file->op_read(arg->buf, arg->size, op_pos)
+			? file->op_read(arg->buf, arg->size)
 			: file->op_write(arg->buf, arg->size);
 
-		if (op == 0x8000000b)
-		{
-			ensure(old_pos == file->file.seek(old_pos));
-		}
-
-		// TODO: EDATA corruption detection
+		ensure(old_pos == file->file.seek(old_pos));
 
 		arg->out_code = CELL_OK;
 		return CELL_OK;
@@ -2056,39 +1437,37 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
 			return CELL_EINVAL;
 		}
 
-		const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+		const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 		if (!file)
 		{
-			return {CELL_EBADF, "fd=%u", fd};
+			return CELL_EBADF;
 		}
 
-		sys_fs.warning("sys_fs_fcntl(0x80000009): fd=%d, arg->offset=0x%x, size=0x%x (file: %s)", fd, arg->offset, _size, *file);
-
 		std::lock_guard lock(file->mp->mutex);
 
 		if (!file->file)
 		{
-			return {CELL_EBADF, "fd=%u", fd};
+			return CELL_EBADF;
 		}
 
 		auto sdata_file = std::make_unique<EDATADecrypter>(lv2_file::make_view(file, arg->offset));
 
 		if (!sdata_file->ReadHeader())
 		{
-			return {CELL_EFSSPECIFIC, "fd=%u", fd};
+			return CELL_EFSSPECIFIC;
 		}
 
 		fs::file stream;
 		stream.reset(std::move(sdata_file));
-		if (const u32 id = idm::import<lv2_fs_object, lv2_file>([&file = *file, &stream = stream]() -> shared_ptr<lv2_file>
+		if (const u32 id = idm::import<lv2_fs_object, lv2_file>([&file = *file, &stream = stream]() -> std::shared_ptr<lv2_file>
 		{
 			if (!g_fxo->get<loaded_npdrm_keys>().npdrm_fds.try_inc(16))
 			{
-				return null_ptr;
+				return nullptr;
 			}
 
-			return stx::make_shared<lv2_file>(file, std::move(stream), file.mode, CELL_FS_O_RDONLY, file.real_path, lv2_file_type::sdata);
+			return std::make_shared<lv2_file>(file, std::move(stream), file.mode, file.flags, file.real_path, lv2_file_type::sdata);
 		}))
 		{
 			arg->out_code = CELL_OK;
@@ -2106,23 +1485,13 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
 
 		const auto arg = vm::static_ptr_cast<lv2_file_c0000002>(_arg);
 
-		const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup("/dev_hdd0");
+		const auto mp = lv2_fs_object::get_mp("/dev_hdd0");
 
 		arg->out_block_size = mp->block_size;
 		arg->out_block_count = (40ull * 1024 * 1024 * 1024 - 1) / mp->block_size; // Read explanation in cellHddGameCheck
 		return CELL_OK;
 	}
 
-	case 0xc0000003: // cellFsUtilitySetFakeSize
-	{
-		break;
-	}
-
-	case 0xc0000004: // cellFsUtilityGetFakeSize
-	{
-		break;
-	}
-
 	case 0xc0000006: // Unknown
 	{
 		const auto arg = vm::static_ptr_cast<lv2_file_c0000006>(_arg);
@@ -2162,157 +1531,17 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
 
 	case 0xc0000007: // cellFsArcadeHddSerialNumber
 	{
-		const auto arg = vm::static_ptr_cast<lv2_file_c0000007>(_arg);
-
-		arg->out_code = CELL_OK;
-
-		if (const auto size = arg->model_size; size > 0)
-			strcpy_trunc(std::span(arg->model.get_ptr(), size),
-				fmt::format("%-*s", size - 1, g_cfg.sys.hdd_model.to_string())); // Example: "TOSHIBA MK3265GSX H                     "
-
-		if (const auto size = arg->serial_size; size > 0)
-			strcpy_trunc(std::span(arg->serial.get_ptr(), size),
-				fmt::format("%*s", size - 1, g_cfg.sys.hdd_serial.to_string())); // Example: "           0A1B2C3D4"
-		else
-			return CELL_EFAULT; // CELL_EFAULT is returned only when arg->serial_size == 0
-
-		return CELL_OK;
+		break;
 	}
 
 	case 0xc0000008: // cellFsSetDefaultContainer, cellFsSetIoBuffer, cellFsSetIoBufferFromDefaultContainer
 	{
-		// Allocates memory from a container/default container to a specific fd or default IO processing
-		const auto arg          = vm::static_ptr_cast<lv2_file_c0000008>(_arg);
-		auto& default_container = g_fxo->get<default_sys_fs_container>();
-
-		std::lock_guard def_container_lock(default_container.mutex);
-
-		if (fd == 0xFFFFFFFF)
-		{
-			// No check on container is done when setting default container
-			default_container.id   = arg->size ? ::narrow<u32>(arg->container_id) : 0u;
-			default_container.cap  = arg->size;
-			default_container.used = 0;
-
-			arg->out_code = CELL_OK;
-			return CELL_OK;
-		}
-
-		auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
-		if (!file)
-		{
-			return CELL_EBADF;
-		}
-
-		if (auto ct = idm::get_unlocked<lv2_memory_container>(file->ct_id))
-		{
-			ct->free(file->ct_used);
-			if (default_container.id == file->ct_id)
-			{
-				default_container.used -= file->ct_used;
-			}
-		}
-
-		file->ct_id   = 0;
-		file->ct_used = 0;
-
-		// Aligns on lower bound
-		u32 actual_size = arg->size - (arg->size % ((arg->page_type & CELL_FS_IO_BUFFER_PAGE_SIZE_64KB) ? 0x10000 : 0x100000));
-
-		if (!actual_size)
-		{
-			arg->out_code = CELL_OK;
-			return CELL_OK;
-		}
-
-		u32 new_container_id = arg->container_id == 0xFFFFFFFF ? default_container.id : ::narrow<u32>(arg->container_id);
-		if (default_container.id == new_container_id && (default_container.used + actual_size) > default_container.cap)
-		{
-			return CELL_ENOMEM;
-		}
-
-		const auto ct = idm::get<lv2_memory_container>(new_container_id, [&](lv2_memory_container& ct) -> CellError
-			{
-				if (!ct.take(actual_size))
-				{
-					return CELL_ENOMEM;
-				}
-
-				return {};
-			});
-
-		if (!ct)
-		{
-			return CELL_ESRCH;
-		}
-
-		if (ct.ret)
-		{
-			return ct.ret;
-		}
-
-		if (default_container.id == new_container_id)
-		{
-			default_container.used += actual_size;
-		}
-
-		file->ct_id   = new_container_id;
-		file->ct_used = actual_size;
-
-		arg->out_code = CELL_OK;
-		return CELL_OK;
+		break;
 	}
 
-	case 0xc0000015: // USB Vid/Pid query
-	case 0xc000001c: // USB Vid/Pid/Serial query
+	case 0xc0000015: // Unknown
 	{
-		const auto arg = vm::static_ptr_cast<lv2_file_c0000015>(_arg);
-		const bool with_serial = op == 0xc000001c;
-
-		if (arg->size != (with_serial ? sizeof(lv2_file_c000001c) : sizeof(lv2_file_c0000015)))
-		{
-			sys_fs.error("sys_fs_fcntl(0x%08x): invalid size (0x%x)", op, arg->size);
-			break;
-		}
-
-		if (arg->_x4 != 0x10u || arg->_x8 != 0x18u)
-		{
-			sys_fs.error("sys_fs_fcntl(0x%08x): invalid args (0x%x, 0x%x)", op, arg->_x4, arg->_x8);
-			break;
-		}
-
-		std::string_view vpath{arg->path.get_ptr(), arg->path_size};
-
-		if (vpath.size() == 0)
-			return CELL_ENOMEM;
-
-		// Trim trailing '\0'
-		if (const auto trim_pos = vpath.find('\0'); trim_pos != umax)
-			vpath.remove_suffix(vpath.size() - trim_pos);
-
-		arg->out_code = CELL_ENOTMOUNTED; // arg->out_code is set to CELL_ENOTMOUNTED on real hardware when the device doesn't exist or when the device isn't USB
-
-		if (!vfs::get(vpath).empty())
-		{
-			if (const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath, true); mp == &g_mp_sys_dev_usb)
-			{
-				const cfg::device_info device = g_cfg_vfs.get_device(g_cfg_vfs.dev_usb, fmt::format("%s%s", mp->root, mp.device.substr(mp->device.size())));
-				const auto usb_ids = device.get_usb_ids();
-				std::tie(arg->vendorID, arg->productID) = usb_ids;
-
-				if (with_serial)
-				{
-					const auto arg_c000001c = vm::static_ptr_cast<lv2_file_c000001c>(_arg);
-					const std::u16string serial = utf8_to_utf16(device.serial); // Serial needs to be encoded to utf-16 BE
-					std::copy_n(serial.begin(), std::min(serial.size(), sizeof(arg_c000001c->serial) / sizeof(u16)), arg_c000001c->serial);
-				}
-
-				arg->out_code = CELL_OK;
-				sys_fs.trace("sys_fs_fcntl(0x%08x): found device \"%s\" (vid=0x%04x, pid=0x%04x, serial=\"%s\")", op, mp.device, usb_ids.first, usb_ids.second, device.serial);
-			}
-		}
-
-		return CELL_OK;
+		break;
 	}
 
 	case 0xc0000016: // ps2disc_8160A811
@@ -2322,8 +1551,7 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
 
 	case 0xc000001a: // cellFsSetDiscReadRetrySetting, 5731DF45
 	{
-		[[maybe_unused]] const auto arg = vm::static_ptr_cast<lv2_file_c000001a>(_arg);
-		return CELL_OK;
+		break;
 	}
 
 	case 0xc0000021: // 9FDBBA89
@@ -2427,35 +1655,25 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
 			return CELL_EINVAL;
 		}
 
-		const auto directory = idm::get_unlocked<lv2_fs_object, lv2_dir>(fd);
+		const auto directory = idm::get<lv2_fs_object, lv2_dir>(fd);
 
 		if (!directory)
 		{
 			return CELL_EBADF;
 		}
 
-		ppu.check_state();
-
-		u32 read_count = 0;
+		arg->_size = 0; // This write is not really useful for cellFs but do it anyways
 
 		// NOTE: This function is actually capable of reading only one entry at a time
-		if (const u32 max = arg->max)
+		if (arg->max)
 		{
-			const auto arg_ptr = +arg->ptr;
+			std::memset(arg->ptr.get_ptr(), 0, arg->max * arg->ptr.size());
 
 			if (auto* info = directory->dir_read())
 			{
-				auto& entry = arg_ptr[read_count++];
+				auto& entry = arg->ptr[arg->_size++];
 
-				s32 mode = info->is_directory ? CELL_FS_S_IFDIR | 0777 : CELL_FS_S_IFREG | 0666;
-
-				if (directory->mp.read_only)
-				{
-					// Remove write permissions
-					mode &= ~0222;
-				}
-
-				entry.attribute.mode = mode;
+				entry.attribute.mode = info->is_directory ? CELL_FS_S_IFDIR | 0777 : CELL_FS_S_IFREG | 0666;
 				entry.attribute.uid = directory->mp->flags & lv2_mp_flag::no_uid_gid ? -1 : 0;
 				entry.attribute.gid = directory->mp->flags & lv2_mp_flag::no_uid_gid ? -1 : 0;
 				entry.attribute.atime = info->atime;
@@ -2464,16 +1682,18 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
 				entry.attribute.size = info->size;
 				entry.attribute.blksize = directory->mp->block_size;
 
+				if (directory->mp->flags & lv2_mp_flag::read_only)
+				{
+					// Remove write permissions
+					entry.attribute.mode &= ~0222;
+				}
+
 				entry.entry_name.d_type = info->is_directory ? CELL_FS_TYPE_DIRECTORY : CELL_FS_TYPE_REGULAR;
 				entry.entry_name.d_namlen = u8(std::min<usz>(info->name.size(), CELL_FS_MAX_FS_FILE_NAME_LENGTH));
 				strcpy_trunc(entry.entry_name.d_name, info->name);
 			}
-
-			// Apparently all this function does to additional buffer elements is to zeroize them
-			std::memset(arg_ptr.get_ptr() + read_count, 0, (max - read_count) * arg->ptr.size());
 		}
 
-		arg->_size = read_count;
 		arg->_code = CELL_OK;
 		return CELL_OK;
 	}
@@ -2566,14 +1786,14 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
 			return result.error;
 		}
 
-		if (const u32 id = idm::import<lv2_fs_object, lv2_file>([&]() -> shared_ptr<lv2_file>
+		if (const u32 id = idm::import<lv2_fs_object, lv2_file>([&]() -> std::shared_ptr<lv2_file>
 		{
 			if (!g_fxo->get<loaded_npdrm_keys>().npdrm_fds.try_inc(16))
 			{
-				return null_ptr;
+				return nullptr;
 			}
 
-			return stx::make_shared<lv2_file>(result.ppath, std::move(result.file), 0,  0, std::move(result.real_path), lv2_file_type::sdata);
+			return std::make_shared<lv2_file>(result.ppath, std::move(result.file), 0,  0, std::move(result.real_path), lv2_file_type::sdata);
 		}))
 		{
 			arg->out_code = CELL_OK;
@@ -2597,14 +1817,14 @@ error_code sys_fs_lseek(ppu_thread& ppu, u32 fd, s64 offset, s32 whence, vm::ptr
 
 	sys_fs.trace("sys_fs_lseek(fd=%d, offset=0x%llx, whence=0x%x, pos=*0x%x)", fd, offset, whence, pos);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
 		return CELL_EBADF;
 	}
 
-	std::unique_lock lock(file->mp->mutex);
+	std::lock_guard lock(file->mp->mutex);
 
 	if (!file->file)
 	{
@@ -2622,16 +1842,13 @@ error_code sys_fs_lseek(ppu_thread& ppu, u32 fd, s64 offset, s32 whence, vm::ptr
 	{
 		switch (auto error = fs::g_tls_error)
 		{
-		case fs::error::inval: return {CELL_EINVAL, "fd=%u, offset=0x%x, whence=%d", fd, offset, whence};
+		case fs::error::inval: return CELL_EINVAL;
 		default: sys_fs.error("sys_fs_lseek(): unknown error %s", error);
 		}
 
 		return CELL_EIO; // ???
 	}
 
-	lock.unlock();
-	ppu.check_state();
-
 	*pos = result;
 	return CELL_OK;
 }
@@ -2643,7 +1860,7 @@ error_code sys_fs_fdatasync(ppu_thread& ppu, u32 fd)
 
 	sys_fs.trace("sys_fs_fdadasync(fd=%d)", fd);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file || !(file->flags & CELL_FS_O_ACCMODE))
 	{
@@ -2668,7 +1885,7 @@ error_code sys_fs_fsync(ppu_thread& ppu, u32 fd)
 
 	sys_fs.trace("sys_fs_fsync(fd=%d)", fd);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file || !(file->flags & CELL_FS_O_ACCMODE))
 	{
@@ -2692,14 +1909,17 @@ error_code sys_fs_fget_block_size(ppu_thread& ppu, u32 fd, vm::ptr<u64> sector_s
 
 	sys_fs.warning("sys_fs_fget_block_size(fd=%d, sector_size=*0x%x, block_size=*0x%x, arg4=*0x%x, out_flags=*0x%x)", fd, sector_size, block_size, arg4, out_flags);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
 		return CELL_EBADF;
 	}
 
-	static_cast<void>(ppu.test_stopped());
+	if (ppu.is_stopped())
+	{
+		return {};
+	}
 
 	// TODO
 	*sector_size = file->mp->sector_size;
@@ -2716,13 +1936,13 @@ error_code sys_fs_get_block_size(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<u
 
 	sys_fs.warning("sys_fs_get_block_size(path=%s, sector_size=*0x%x, block_size=*0x%x, arg4=*0x%x)", path, sector_size, block_size, arg4);
 
-	const auto [path_error, vpath] = translate_to_str(path);
+	if (!path)
+		return CELL_EFAULT;
 
-	if (path_error)
-	{
-		return {path_error, vpath};
-	}
+	if (!path[0])
+		return CELL_ENOENT;
 
+	const std::string_view vpath = path.get_ptr();
 	const std::string local_path = vfs::get(vpath);
 
 	if (vpath.find_first_not_of('/') == umax)
@@ -2735,7 +1955,7 @@ error_code sys_fs_get_block_size(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<u
 		return {CELL_ENOTMOUNTED, path};
 	}
 
-	const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath);
+	const auto mp = lv2_fs_object::get_mp(vpath);
 
 	// It appears that /dev_hdd0 mount point is special in this function
 	if (mp != &g_mp_sys_dev_hdd0 && (mp->flags & lv2_mp_flag::strict_get_block_size ? !fs::is_file(local_path) : !fs::exists(local_path)))
@@ -2750,7 +1970,10 @@ error_code sys_fs_get_block_size(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<u
 		return {CELL_EIO, path}; // ???
 	}
 
-	static_cast<void>(ppu.test_stopped());
+	if (ppu.is_stopped())
+	{
+		return {};
+	}
 
 	// TODO
 	*sector_size = mp->sector_size;
@@ -2767,16 +1990,16 @@ error_code sys_fs_truncate(ppu_thread& ppu, vm::cptr<char> path, u64 size)
 
 	sys_fs.warning("sys_fs_truncate(path=%s, size=0x%llx)", path, size);
 
-	const auto [path_error, vpath] = translate_to_str(path);
+	if (!path)
+		return CELL_EFAULT;
 
-	if (path_error)
-	{
-		return {path_error, vpath};
-	}
+	if (!path[0])
+		return CELL_ENOENT;
 
+	const std::string_view vpath = path.get_ptr();
 	const std::string local_path = vfs::get(vpath);
 
-	const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath);
+	const auto mp = lv2_fs_object::get_mp(vpath);
 
 	if (mp == &g_mp_sys_dev_root)
 	{
@@ -2788,7 +2011,7 @@ error_code sys_fs_truncate(ppu_thread& ppu, vm::cptr<char> path, u64 size)
 		return {CELL_ENOTMOUNTED, path};
 	}
 
-	if (mp.read_only)
+	if (mp->flags & lv2_mp_flag::read_only)
 	{
 		return {CELL_EROFS, path};
 	}
@@ -2799,10 +2022,7 @@ error_code sys_fs_truncate(ppu_thread& ppu, vm::cptr<char> path, u64 size)
 	{
 		switch (auto error = fs::g_tls_error)
 		{
-		case fs::error::noent:
-		{
-			return {mp == &g_mp_sys_dev_hdd1 ? sys_fs.warning : sys_fs.error, CELL_ENOENT, path};
-		}
+		case fs::error::noent: return {CELL_ENOENT, path};
 		default: sys_fs.error("sys_fs_truncate(): unknown error %s", error);
 		}
 
@@ -2819,14 +2039,14 @@ error_code sys_fs_ftruncate(ppu_thread& ppu, u32 fd, u64 size)
 
 	sys_fs.warning("sys_fs_ftruncate(fd=%d, size=0x%llx)", fd, size);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file || !(file->flags & CELL_FS_O_ACCMODE))
 	{
 		return CELL_EBADF;
 	}
 
-	if (file->mp.read_only)
+	if (file->mp->flags & lv2_mp_flag::read_only)
 	{
 		return CELL_EROFS;
 	}
@@ -2873,62 +2093,6 @@ error_code sys_fs_chmod(ppu_thread&, vm::cptr<char> path, s32 mode)
 {
 	sys_fs.todo("sys_fs_chmod(path=%s, mode=%#o)", path, mode);
 
-	const auto [path_error, vpath] = translate_to_str(path);
-
-	if (path_error)
-	{
-		return {path_error, vpath};
-	}
-
-	const std::string local_path = vfs::get(vpath);
-
-	const auto mp = lv2_fs_object::get_mp(vpath);
-
-	if (local_path.empty())
-	{
-		return {CELL_ENOTMOUNTED, path};
-	}
-
-	if (mp->flags & lv2_mp_flag::read_only)
-	{
-		return {CELL_EROFS, path};
-	}
-
-	std::unique_lock lock(mp->mutex);
-
-	fs::stat_t info{};
-
-	if (!fs::get_stat(local_path, info))
-	{
-		switch (auto error = fs::g_tls_error)
-		{
-		case fs::error::noent:
-		{
-			// Try to locate split files
-
-			for (u32 i = 66601; i <= 66699; i++)
-			{
-				if (!fs::get_stat(fmt::format("%s.%u", local_path, i), info) && !info.is_directory)
-				{
-					break;
-				}
-			}
-
-			if (fs::get_stat(local_path + ".66600", info) && !info.is_directory)
-			{
-				break;
-			}
-
-			return {CELL_ENOENT, path};
-		}
-		default:
-		{
-			sys_fs.error("sys_fs_chmod(): unknown error %s", error);
-			return {CELL_EIO, path};
-		}
-		}
-	}
-
 	return CELL_OK;
 }
 
@@ -2978,7 +2142,7 @@ error_code sys_fs_disk_free(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<u64> t
 		return {CELL_EINVAL, path};
 	}
 
-	const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath);
+	const auto mp = lv2_fs_object::get_mp(vpath);
 
 	if (mp->flags & lv2_mp_flag::strict_get_block_size)
 	{
@@ -2986,34 +2150,27 @@ error_code sys_fs_disk_free(ppu_thread& ppu, vm::cptr<char> path, vm::ptr<u64> t
 		return {CELL_ENOTSUP, path};
 	}
 
-	if (mp.read_only)
+	if (mp->flags & lv2_mp_flag::read_only)
 	{
 		// TODO: check /dev_bdvd
-		ppu.check_state();
 		*total_free = 0;
 		*avail_free = 0;
 		return CELL_OK;
 	}
 
-	u64 available = 0;
-
 	// avail_free is the only value used by cellFsGetFreeSize
 	if (mp == &g_mp_sys_dev_hdd1)
 	{
-		available = (1u << 31) - mp->sector_size; // 2GB (TODO: Should be the total size)
+		*avail_free = (1u << 31) - mp->sector_size; // 2GB (TODO: Should be the total size)
 	}
 	else //if (mp == &g_mp_sys_dev_hdd0)
 	{
-		available = (40ull * 1024 * 1024 * 1024 - mp->sector_size); // Read explanation in cellHddGameCheck
+		*avail_free = (40ull * 1024 * 1024 * 1024 - mp->sector_size); // Read explanation in cellHddGameCheck
 	}
 
 	// HACK: Hopefully nothing uses this value or once at max because its hacked here:
 	// The total size can change based on the size of the directory
-	const u64 total = available + fs::get_dir_size(local_path, mp->sector_size);
-
-	ppu.check_state();
-	*total_free = total;
-	*avail_free = available;
+	*total_free = *avail_free + fs::get_dir_size(local_path, mp->sector_size);
 
 	return CELL_OK;
 }
@@ -3026,16 +2183,16 @@ error_code sys_fs_utime(ppu_thread& ppu, vm::cptr<char> path, vm::cptr<CellFsUti
 	sys_fs.warning("sys_fs_utime(path=%s, timep=*0x%x)", path, timep);
 	sys_fs.warning("** actime=%u, modtime=%u", timep->actime, timep->modtime);
 
-	const auto [path_error, vpath] = translate_to_str(path);
+	if (!path)
+		return CELL_EFAULT;
 
-	if (path_error)
-	{
-		return {path_error, vpath};
-	}
+	if (!path[0])
+		return CELL_ENOENT;
 
+	const std::string_view vpath = path.get_ptr();
 	const std::string local_path = vfs::get(vpath);
 
-	const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath);
+	const auto mp = lv2_fs_object::get_mp(vpath);
 
 	if (mp == &g_mp_sys_dev_root)
 	{
@@ -3047,7 +2204,7 @@ error_code sys_fs_utime(ppu_thread& ppu, vm::cptr<char> path, vm::cptr<CellFsUti
 		return {CELL_ENOTMOUNTED, path};
 	}
 
-	if (mp.read_only)
+	if (mp->flags & lv2_mp_flag::read_only)
 	{
 		return {CELL_EROFS, path};
 	}
@@ -3058,10 +2215,7 @@ error_code sys_fs_utime(ppu_thread& ppu, vm::cptr<char> path, vm::cptr<CellFsUti
 	{
 		switch (auto error = fs::g_tls_error)
 		{
-		case fs::error::noent:
-		{
-			return {mp == &g_mp_sys_dev_hdd1 ? sys_fs.warning : sys_fs.error, CELL_ENOENT, path};
-		}
+		case fs::error::noent: return {CELL_ENOENT, path};
 		default: sys_fs.error("sys_fs_utime(): unknown error %s", error);
 		}
 
@@ -3089,7 +2243,7 @@ error_code sys_fs_lsn_get_cda_size(ppu_thread&, u32 fd, vm::ptr<u64> ptr)
 {
 	sys_fs.warning("sys_fs_lsn_get_cda_size(fd=%d, ptr=*0x%x)", fd, ptr);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -3112,7 +2266,7 @@ error_code sys_fs_lsn_lock(ppu_thread&, u32 fd)
 {
 	sys_fs.trace("sys_fs_lsn_lock(fd=%d)", fd);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -3125,7 +2279,6 @@ error_code sys_fs_lsn_lock(ppu_thread&, u32 fd)
 		return CELL_OK;
 	}
 
-	std::lock_guard lock(file->mp->mutex);
 	file->lock.compare_and_swap(0, 1);
 	return CELL_OK;
 }
@@ -3134,21 +2287,14 @@ error_code sys_fs_lsn_unlock(ppu_thread&, u32 fd)
 {
 	sys_fs.trace("sys_fs_lsn_unlock(fd=%d)", fd);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
 		return CELL_EBADF;
 	}
 
-	// See sys_fs_lsn_lock
-	if (file->mp == &g_mp_sys_dev_hdd0 || file->mp->flags & lv2_mp_flag::strict_get_block_size)
-	{
-		return CELL_OK;
-	}
-
 	// Unlock unconditionally
-	std::lock_guard lock(file->mp->mutex);
 	file->lock.compare_and_swap(1, 0);
 	return CELL_OK;
 }
@@ -3190,210 +2336,68 @@ error_code sys_fs_truncate2(ppu_thread&, u32 fd, u64 size)
 
 error_code sys_fs_get_mount_info_size(ppu_thread&, vm::ptr<u64> len)
 {
-	sys_fs.warning("sys_fs_get_mount_info_size(len=*0x%x)", len);
+	sys_fs.todo("sys_fs_get_mount_info_size(len=*0x%x)", len);
 
 	if (!len)
 	{
 		return CELL_EFAULT;
 	}
 
-	*len = g_fxo->get<lv2_fs_mount_info_map>().get_all();
+	*len = 0x8;
 
 	return CELL_OK;
 }
 
-error_code sys_fs_get_mount_info(ppu_thread&, vm::ptr<CellFsMountInfo> info, u64 len, vm::ptr<u64> out_len)
+error_code sys_fs_get_mount_info(ppu_thread&, vm::ptr<CellFsMountInfo> info, u32 len, vm::ptr<u64> out_len)
 {
-	sys_fs.warning("sys_fs_get_mount_info(info=*0x%x, len=0x%x, out_len=*0x%x)", info, len, out_len);
+	sys_fs.todo("sys_fs_get_mount_info(info=*0x%x, len=0x%x, out_len=*0x%x)", info, len, out_len);
 
-	if (!info || !out_len)
+	if (!out_len)
 	{
 		return CELL_EFAULT;
 	}
 
-	*out_len = g_fxo->get<lv2_fs_mount_info_map>().get_all(info.get_ptr(), len);
+	// TODO there is a case where 'something' happens if !info or len == 0
+	if (!info || len == 0)
+	{
+		sys_fs.todo("sys_fs_get_mount_info special case TODO");
+	}
+
+	const u32 max_len = std::min<u32>(len, 8);
+	*out_len = max_len;
+
+	struct mount_info
+	{
+		std::string_view path, filesystem, dev_name;
+		be_t<u32> unk1 = 0, unk2 = 0, unk3 = 0, unk4 = 0, unk5 = 0;
+	};
+
+	static constexpr std::array<mount_info, 8> data
+	{
+		mount_info{.path = "/", .filesystem = "CELL_FS_ADMINFS", .dev_name = "CELL_FS_ADMINFS:", .unk5 = 0x10000000},
+		mount_info{.path = "/app_home", .filesystem = "CELL_FS_DUMMY", .dev_name = "CELL_FS_DUMMY:"},
+		mount_info{.path = "/host_root", .filesystem = "CELL_FS_DUMMY", .dev_name = "CELL_FS_DUMMY:"},
+		mount_info{.path = "/dev_flash", .filesystem = "CELL_FS_FAT", .dev_name = "CELL_FS_IOS:BUILTIN_FLSH1:", .unk5 = 0x10000000},
+		mount_info{.path = "/dev_flash2", .filesystem = "CELL_FS_FAT", .dev_name = "CELL_FS_IOS:BUILTIN_FLSH2:"},
+		mount_info{.path = "/dev_flash3", .filesystem = "CELL_FS_FAT", .dev_name = "CELL_FS_IOS:BUILTIN_FLSH3:"},
+		mount_info{.path = "/dev_hdd0", .filesystem = "CELL_FS_UFS", .dev_name = "CELL_FS_UTILITY:HDD0:"},
+		mount_info{.path = "/dev_bdvd", .filesystem = "CELL_FS_ISO9660", .dev_name = "CELL_FS_IOS:PATA0_BDVD_DRIVE"},
+	};
+
+	for (u32 i = 0; i < max_len; info++, i++)
+	{
+		strcpy_trunc(info->mount_path, data[i].path);
+		strcpy_trunc(info->filesystem, data[i].filesystem);
+		strcpy_trunc(info->dev_name, data[i].dev_name);
+		std::memcpy(&info->unk1, &data[i].unk1, sizeof(be_t<u32>) * 5);
+	}
 
 	return CELL_OK;
 }
 
-error_code sys_fs_newfs(ppu_thread& ppu, vm::cptr<char> dev_name, vm::cptr<char> file_system, s32 unk1, vm::cptr<char> str1)
+error_code sys_fs_mount(ppu_thread&, vm::cptr<char> dev_name, vm::cptr<char> file_system, vm::cptr<char> path, s32 unk1, s32 prot, s32 unk3, vm::cptr<char> str1, u32 str_len)
 {
-	ppu.state += cpu_flag::wait;
-
-	sys_fs.warning("sys_fs_newfs(dev_name=%s, file_system=%s, unk1=0x%x, str1=%s)", dev_name, file_system, unk1, str1);
-
-	const auto [dev_error, device_name] = translate_to_str(dev_name, false);
-
-	if (dev_error)
-	{
-		return {dev_error, device_name};
-	}
-
-	std::string vfs_path;
-	const auto mp = lv2_fs_object::get_mp(device_name, &vfs_path);
-	std::unique_lock lock(mp->mutex, std::defer_lock);
-
-	if (!g_ps3_process_info.has_root_perm() && mp != &g_mp_sys_dev_usb)
-		return {CELL_EPERM, device_name};
-
-	if (mp == &g_mp_sys_no_device)
-		return {CELL_ENXIO, device_name};
-
-	if (g_fxo->get<lv2_fs_mount_info_map>().is_device_mounted(device_name) || !lock.try_lock())
-		return {CELL_EBUSY, device_name};
-
-	if (vfs_path.empty())
-		return {CELL_ENOTSUP, device_name};
-
-	if (mp->flags & lv2_mp_flag::read_only)
-		return {CELL_EROFS, device_name};
-
-	if (mp == &g_mp_sys_dev_hdd1)
-	{
-		const std::string_view appname = g_ps3_process_info.get_cellos_appname();
-		vfs_path = fmt::format("%s/caches/%s", vfs_path, appname.substr(0, appname.find_last_of('.')));
-	}
-
-	if (!fs::remove_all(vfs_path, false))
-	{
-		sys_fs.error("sys_fs_newfs(): Failed to clear \"%s\" at \"%s\"", device_name, vfs_path);
-		return {CELL_EIO, vfs_path};
-	}
-
-	sys_fs.success("sys_fs_newfs(): Successfully cleared \"%s\" at \"%s\"", device_name, vfs_path);
-	return CELL_OK;
-}
-
-error_code sys_fs_mount(ppu_thread& ppu, vm::cptr<char> dev_name, vm::cptr<char> file_system, vm::cptr<char> path, s32 unk1, s32 prot, s32 unk2, vm::cptr<char> str1, u32 str_len)
-{
-	ppu.state += cpu_flag::wait;
-
-	sys_fs.warning("sys_fs_mount(dev_name=%s, file_system=%s, path=%s, unk1=0x%x, prot=%d, unk3=0x%x, str1=%s, str_len=%d)", dev_name, file_system, path, unk1, prot, unk2, str1, str_len);
-
-	const auto [dev_error, device_name] = translate_to_str(dev_name, false);
-
-	if (dev_error)
-	{
-		return {dev_error, device_name};
-	}
-
-	const auto [fs_error, filesystem] = translate_to_str(file_system, false);
-
-	if (fs_error)
-	{
-		return {fs_error, filesystem};
-	}
-
-	const auto [path_error, path_sv] = translate_to_str(path);
-
-	if (path_error)
-	{
-		return {path_error, path_sv};
-	}
-
-	const std::string vpath = lv2_fs_object::get_normalized_path(path_sv);
-
-	std::string vfs_path;
-	const auto mp = lv2_fs_object::get_mp(device_name, &vfs_path);
-	std::unique_lock lock(mp->mutex, std::defer_lock);
-
-	if (!g_ps3_process_info.has_root_perm() && mp != &g_mp_sys_dev_usb)
-		return {CELL_EPERM, device_name};
-
-	if (mp == &g_mp_sys_no_device)
-		return {CELL_ENXIO, device_name};
-
-	if (g_fxo->get<lv2_fs_mount_info_map>().is_device_mounted(device_name) || !lock.try_lock())
-		return {CELL_EBUSY, device_name};
-
-	if (vfs_path.empty())
-		return {CELL_ENOTSUP, device_name};
-
-	if (vpath.find_first_not_of('/') == umax || !vfs::get(vpath).empty())
-		return {CELL_EEXIST, vpath};
-
-	if (mp == &g_mp_sys_dev_hdd1)
-	{
-		const std::string_view appname = g_ps3_process_info.get_cellos_appname();
-		vfs_path = fmt::format("%s/caches/%s", vfs_path, appname.substr(0, appname.find_last_of('.')));
-	}
-
-	if (!vfs_path.ends_with('/'))
-		vfs_path += '/';
-
-	if (!fs::is_dir(vfs_path) && !fs::create_dir(vfs_path))
-	{
-		sys_fs.error("Failed to create directory \"%s\"", vfs_path);
-		return {CELL_EIO, vfs_path};
-	}
-
-	const bool is_simplefs = filesystem == "CELL_FS_SIMPLEFS"sv;
-
-	if (is_simplefs)
-	{
-		vfs_path += "simplefs.tmp";
-		if (fs::file simplefs_file; simplefs_file.open(vfs_path, fs::create + fs::read + fs::write + fs::trunc + fs::lock))
-		{
-			const u64 file_size = mp->sector_size; // One sector's size is enough for VSH's simplefs check
-			simplefs_file.trunc(file_size);
-			sys_fs.notice("Created a simplefs file at \"%s\"", vfs_path);
-		}
-		else
-		{
-			sys_fs.error("Failed to create simplefs file \"%s\"", vfs_path);
-			return {CELL_EIO, vfs_path};
-		}
-	}
-
-	if (!vfs::mount(vpath, vfs_path, !is_simplefs))
-	{
-		if (is_simplefs)
-		{
-			if (fs::remove_file(vfs_path))
-			{
-				sys_fs.notice("Removed simplefs file \"%s\"", vfs_path);
-			}
-			else
-			{
-				sys_fs.error("Failed to remove simplefs file \"%s\"", vfs_path);
-			}
-		}
-
-		return CELL_EIO;
-	}
-
-	g_fxo->get<lv2_fs_mount_info_map>().add(vpath, mp, device_name, filesystem, prot);
-
-	return CELL_OK;
-}
-
-error_code sys_fs_unmount(ppu_thread& ppu, vm::cptr<char> path, s32 unk1, s32 force)
-{
-	ppu.state += cpu_flag::wait;
-
-	sys_fs.warning("sys_fs_unmount(path=%s, unk1=0x%x, force=%d)", path, unk1, force);
-
-	const auto [path_error, vpath] = translate_to_str(path);
-
-	if (path_error)
-	{
-		return {path_error, vpath};
-	}
-
-	const auto& mp = g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath);
-	std::unique_lock lock(mp->mutex, std::defer_lock);
-
-	if (!g_ps3_process_info.has_root_perm() && mp != &g_mp_sys_dev_usb)
-		return {CELL_EPERM, vpath};
-
-	if (mp == &g_mp_sys_no_device)
-		return {CELL_EINVAL, vpath};
-
-	if (mp == &g_mp_sys_dev_root || (!lock.try_lock() && !force))
-		return {CELL_EBUSY, vpath};
-
-	if (!lv2_fs_mount_info_map::vfs_unmount(vpath))
-		return {CELL_EIO, vpath};
+	sys_fs.todo("sys_fs_mount(dev_name=%s, file_system=%s, path=%s, unk1=0x%x, prot=0x%x, unk3=0x%x, str1=%s, str_len=%d)", dev_name, file_system, path, unk1, prot, unk3, str1, str_len);
 
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/Cell/lv2/sys_fs.h b/rpcs3/Emu/Cell/lv2/sys_fs.h
index e64a2b4edb..7399725ad3 100644
--- a/rpcs3/Emu/Cell/lv2/sys_fs.h
+++ b/rpcs3/Emu/Cell/lv2/sys_fs.h
@@ -3,9 +3,9 @@
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/ErrorCodes.h"
 #include "Utilities/File.h"
-#include "Utilities/StrUtil.h"
 
 #include <string>
+#include <mutex>
 
 // Open Flags
 enum : s32
@@ -67,12 +67,6 @@ enum : u8
 	CELL_FS_TYPE_SYMLINK   = 3,
 };
 
-enum : u32
-{
-	CELL_FS_IO_BUFFER_PAGE_SIZE_64KB = 0x0002,
-	CELL_FS_IO_BUFFER_PAGE_SIZE_1MB  = 0x0004,
-};
-
 struct CellFsDirent
 {
 	u8 d_type;
@@ -148,113 +142,43 @@ enum class lv2_file_type
 struct lv2_fs_mount_point
 {
 	const std::string_view root;
-	const std::string_view file_system;
-	const std::string_view device;
 	const u32 sector_size = 512;
-	const u64 sector_count = 256;
 	const u32 block_size = 4096;
 	const bs_t<lv2_mp_flag> flags{};
-	lv2_fs_mount_point* const next = nullptr;
 
-	mutable shared_mutex mutex;
+	mutable std::recursive_mutex mutex;
 };
 
 extern lv2_fs_mount_point g_mp_sys_dev_hdd0;
-extern lv2_fs_mount_point g_mp_sys_no_device;
-
-struct lv2_fs_mount_info
-{
-	lv2_fs_mount_point* const mp;
-	const std::string device;
-	const std::string file_system;
-	const bool read_only;
-
-	lv2_fs_mount_info(lv2_fs_mount_point* mp = nullptr, std::string_view device = {}, std::string_view file_system = {}, bool read_only = false)
-		: mp(mp ? mp : &g_mp_sys_no_device)
-		, device(device.empty() ? this->mp->device : device)
-		, file_system(file_system.empty() ? this->mp->file_system : file_system)
-		, read_only((this->mp->flags & lv2_mp_flag::read_only) || read_only) // respect the original flags of the mount point as well
-	{
-	}
-
-	constexpr bool operator==(const lv2_fs_mount_info& rhs) const noexcept
-	{
-		return this == &rhs;
-	}
-	constexpr bool operator==(const lv2_fs_mount_point* const& rhs) const noexcept
-	{
-		return mp == rhs;
-	}
-	constexpr lv2_fs_mount_point* operator->() const noexcept
-	{
-		return mp;
-	}
-};
-
-extern lv2_fs_mount_info g_mi_sys_not_found;
-
-struct CellFsMountInfo; // Forward Declaration
-
-struct lv2_fs_mount_info_map
-{
-public:
-	SAVESTATE_INIT_POS(40);
-
-	lv2_fs_mount_info_map();
-	lv2_fs_mount_info_map(const lv2_fs_mount_info_map&) = delete;
-	lv2_fs_mount_info_map& operator=(const lv2_fs_mount_info_map&) = delete;
-	~lv2_fs_mount_info_map();
-
-	// Forwarding arguments to map.try_emplace(): refer to the constructor of lv2_fs_mount_info
-	template <typename... Args>
-	bool add(Args&&... args)
-	{
-		return map.try_emplace(std::forward<Args>(args)...).second;
-	}
-	bool remove(std::string_view path);
-	const lv2_fs_mount_info& lookup(std::string_view path, bool no_cell_fs_path = false, std::string* mount_path = nullptr) const;
-	u64 get_all(CellFsMountInfo* info = nullptr, u64 len = 0) const;
-	bool is_device_mounted(std::string_view device_name) const;
-
-	static bool vfs_unmount(std::string_view vpath, bool remove_from_map = true);
-
-private:
-	std::unordered_map<std::string, lv2_fs_mount_info, fmt::string_hash, std::equal_to<>> map;
-};
+extern lv2_fs_mount_point g_mp_sys_dev_hdd1;
 
 struct lv2_fs_object
 {
-	static constexpr u32 id_base = 3;
-	static constexpr u32 id_step = 1;
-	static constexpr u32 id_count = 255 - id_base;
-	static constexpr bool id_lowest = true;
-	SAVESTATE_INIT_POS(49);
+	using id_type = lv2_fs_object;
+
+	static const u32 id_base = 3;
+	static const u32 id_step = 1;
+	static const u32 id_count = 255 - id_base;
+
+	// Mount Point
+	const std::add_pointer_t<lv2_fs_mount_point> mp;
 
 	// File Name (max 1055)
 	const std::array<char, 0x420> name;
 
-	// Mount Info
-	const lv2_fs_mount_info& mp;
-
 protected:
-	lv2_fs_object(std::string_view filename);
-	lv2_fs_object(utils::serial& ar, bool dummy);
+	lv2_fs_object(lv2_fs_mount_point* mp, std::string_view filename)
+		: mp(mp)
+		, name(get_name(filename))
+	{
+	}
 
 public:
 	lv2_fs_object(const lv2_fs_object&) = delete;
 
 	lv2_fs_object& operator=(const lv2_fs_object&) = delete;
 
-	// Normalize a virtual path
-	static std::string get_normalized_path(std::string_view path);
-
-	// Get the device's root path (e.g. "/dev_hdd0") from a given path
-	static std::string get_device_root(std::string_view filename);
-
-	// Filename can be either a path starting with '/' or a CELL_FS device name
-	// This should be used only when handling devices that are not mounted
-	// Otherwise, use g_fxo->get<lv2_fs_mount_info_map>().lookup() to look up mounted devices accurately
-	static lv2_fs_mount_point* get_mp(std::string_view filename, std::string* vfs_path = nullptr);
+	static lv2_fs_mount_point* get_mp(std::string_view filename);
 
 	static std::array<char, 0x420> get_name(std::string_view filename)
 	{
@@ -269,27 +193,20 @@ public:
 		name[filename.size()] = 0;
 		return name;
 	}
-
-	void save(utils::serial&) {}
 };
 
 struct lv2_file final : lv2_fs_object
 {
-	static constexpr u32 id_type = 1;
-
 	fs::file file;
 	const s32 mode;
 	const s32 flags;
 	std::string real_path;
 	const lv2_file_type type;
 
-	// IO Container
-	u32 ct_id{}, ct_used{};
-
 	// Stream lock
 	atomic_t<u32> lock{0};
 
-	// Some variables for convenience of data restoration
+	// Some variables for convinience of data restoration
 	struct save_restore_t
 	{
 		u64 seek_pos;
@@ -298,7 +215,7 @@ struct lv2_file final : lv2_fs_object
 	} restore_data{};
 
 	lv2_file(std::string_view filename, fs::file&& file, s32 mode, s32 flags, const std::string& real_path, lv2_file_type type = {})
-		: lv2_fs_object(filename)
+		: lv2_fs_object(lv2_fs_object::get_mp(filename), filename)
 		, file(std::move(file))
 		, mode(mode)
 		, flags(flags)
@@ -308,7 +225,7 @@ struct lv2_file final : lv2_fs_object
 	}
 
 	lv2_file(const lv2_file& host, fs::file&& file, s32 mode, s32 flags, const std::string& real_path, lv2_file_type type = {})
-		: lv2_fs_object(host.name.data())
+		: lv2_fs_object(host.mp, host.name.data())
 		, file(std::move(file))
 		, mode(mode)
 		, flags(flags)
@@ -317,9 +234,6 @@ struct lv2_file final : lv2_fs_object
 	{
 	}
 
-	lv2_file(utils::serial& ar);
-	void save(utils::serial& ar);
-
 	struct open_raw_result_t
 	{
 		CellError error;
@@ -336,15 +250,15 @@ struct lv2_file final : lv2_fs_object
 	};
 
 	// Open a file with wrapped logic of sys_fs_open
-	static open_raw_result_t open_raw(const std::string& path, s32 flags, s32 mode, lv2_file_type type = lv2_file_type::regular, const lv2_fs_mount_info& mp = g_mi_sys_not_found);
+	static open_raw_result_t open_raw(const std::string& path, s32 flags, s32 mode, lv2_file_type type = lv2_file_type::regular, const lv2_fs_mount_point* mp = nullptr);
 	static open_result_t open(std::string_view vpath, s32 flags, s32 mode, const void* arg = {}, u64 size = 0);
 
 	// File reading with intermediate buffer
-	static u64 op_read(const fs::file& file, vm::ptr<void> buf, u64 size, u64 opt_pos = umax);
+	static u64 op_read(const fs::file& file, vm::ptr<void> buf, u64 size);
 
-	u64 op_read(vm::ptr<void> buf, u64 size, u64 opt_pos = umax) const
+	u64 op_read(vm::ptr<void> buf, u64 size) const
 	{
-		return op_read(file, buf, size, opt_pos);
+		return op_read(file, buf, size);
 	}
 
 	// File writing with intermediate buffer
@@ -359,33 +273,26 @@ struct lv2_file final : lv2_fs_object
 	struct file_view;
 
 	// Make file view from lv2_file object (for MSELF support)
-	static fs::file make_view(const shared_ptr<lv2_file>& _file, u64 offset);
+	static fs::file make_view(const std::shared_ptr<lv2_file>& _file, u64 offset);
 };
 
 struct lv2_dir final : lv2_fs_object
 {
-	static constexpr u32 id_type = 2;
-
 	const std::vector<fs::dir_entry> entries;
 
 	// Current reading position
 	atomic_t<u64> pos{0};
 
 	lv2_dir(std::string_view filename, std::vector<fs::dir_entry>&& entries)
-		: lv2_fs_object(filename)
+		: lv2_fs_object(lv2_fs_object::get_mp(filename), filename)
 		, entries(std::move(entries))
 	{
 	}
 
-	lv2_dir(utils::serial& ar);
-	void save(utils::serial& ar);
-
 	// Read next
 	const fs::dir_entry* dir_read()
 	{
-		const u64 old_pos = pos;
-
-		if (const u64 cur = (old_pos < entries.size() ? pos++ : old_pos); cur < entries.size())
+		if (const u64 cur = pos++; cur < entries.size())
 		{
 			return &entries[cur];
 		}
@@ -528,81 +435,6 @@ struct lv2_file_c0000006 : lv2_file_op
 
 CHECK_SIZE(lv2_file_c0000006, 0x20);
 
-// sys_fs_fcntl: cellFsArcadeHddSerialNumber
-struct lv2_file_c0000007 : lv2_file_op
-{
-	be_t<u32> out_code; // set to 0
-	vm::bcptr<char> device; // CELL_FS_IOS:ATA_HDD
-	be_t<u32> device_size;  // 0x14
-	vm::bptr<char> model;
-	be_t<u32> model_size; // 0x29
-	vm::bptr<char> serial;
-	be_t<u32> serial_size; // 0x15
-};
-
-CHECK_SIZE(lv2_file_c0000007, 0x1c);
-
-struct lv2_file_c0000008 : lv2_file_op
-{
-	u8 _x0[4];
-	be_t<u32> op; // 0xC0000008
-	u8 _x8[8];
-	be_t<u64> container_id;
-	be_t<u32> size;
-	be_t<u32> page_type;  // 0x4000 for cellFsSetDefaultContainer
-	                      // 0x4000 | page_type given by user, valid values seem to be:
-	                      // CELL_FS_IO_BUFFER_PAGE_SIZE_64KB 0x0002
-	                      // CELL_FS_IO_BUFFER_PAGE_SIZE_1MB  0x0004
-	be_t<u32> out_code;
-	u8 _x24[4];
-};
-
-CHECK_SIZE(lv2_file_c0000008, 0x28);
-
-struct lv2_file_c0000015 : lv2_file_op
-{
-	be_t<u32> size; // 0x20
-	be_t<u32> _x4;  // 0x10
-	be_t<u32> _x8;  // 0x18 - offset of out_code
-	be_t<u32> path_size;
-	vm::bcptr<char> path;
-	be_t<u32> _x14; //
-	be_t<u16> vendorID;
-	be_t<u16> productID;
-	be_t<u32> out_code; // set to 0
-};
-
-CHECK_SIZE(lv2_file_c0000015, 0x20);
-
-struct lv2_file_c000001a : lv2_file_op
-{
-	be_t<u32> disc_retry_type; // CELL_FS_DISC_READ_RETRY_NONE results in a 0 here
-	                           // CELL_FS_DISC_READ_RETRY_DEFAULT results in a 0x63 here
-	be_t<u32> _x4;             // 0
-	be_t<u32> _x8;             // 0x000186A0
-	be_t<u32> _xC;             // 0
-	be_t<u32> _x10;            // 0
-	be_t<u32> _x14;            // 0
-};
-
-CHECK_SIZE(lv2_file_c000001a, 0x18);
-
-struct lv2_file_c000001c : lv2_file_op
-{
-	be_t<u32> size; // 0x60
-	be_t<u32> _x4;  // 0x10
-	be_t<u32> _x8;  // 0x18 - offset of out_code
-	be_t<u32> path_size;
-	vm::bcptr<char> path;
-	be_t<u32> unk1;
-	be_t<u16> vendorID;
-	be_t<u16> productID;
-	be_t<u32> out_code; // set to 0
-	be_t<u16> serial[32];
-};
-
-CHECK_SIZE(lv2_file_c000001c, 0x60);
-
 // sys_fs_fcntl: cellFsAllocateFileAreaWithoutZeroFill
 struct lv2_file_e0000017 : lv2_file_op
 {
@@ -622,20 +454,15 @@ struct CellFsMountInfo
 	char mount_path[0x20]; // 0x0
 	char filesystem[0x20]; // 0x20
 	char dev_name[0x40];   // 0x40
-	be_t<u32> unk[5];      // 0x80, probably attributes
+	be_t<u32> unk1;        // 0x80
+	be_t<u32> unk2;        // 0x84
+	be_t<u32> unk3;        // 0x88
+	be_t<u32> unk4;        // 0x8C
+	be_t<u32> unk5;        // 0x90
 };
 
 CHECK_SIZE(CellFsMountInfo, 0x94);
 
-// Default IO container
-struct default_sys_fs_container
-{
-	shared_mutex mutex;
-	u32 id   = 0;
-	u32 cap  = 0;
-	u32 used = 0;
-};
-
 // Syscalls
 
 error_code sys_fs_test(ppu_thread& ppu, u32 arg1, u32 arg2, vm::ptr<u32> arg3, u32 arg4, vm::ptr<char> buf, u32 buf_size);
@@ -678,8 +505,6 @@ error_code sys_fs_lsn_write(ppu_thread& ppu, u32 fd, vm::cptr<void>, u64);
 error_code sys_fs_mapped_allocate(ppu_thread& ppu, u32 fd, u64, vm::pptr<void> out_ptr);
 error_code sys_fs_mapped_free(ppu_thread& ppu, u32 fd, vm::ptr<void> ptr);
 error_code sys_fs_truncate2(ppu_thread& ppu, u32 fd, u64 size);
-error_code sys_fs_newfs(ppu_thread& ppu, vm::cptr<char> dev_name, vm::cptr<char> file_system, s32 unk1, vm::cptr<char> str1);
-error_code sys_fs_mount(ppu_thread& ppu, vm::cptr<char> dev_name, vm::cptr<char> file_system, vm::cptr<char> path, s32 unk1, s32 prot, s32 unk2, vm::cptr<char> str1, u32 str_len);
-error_code sys_fs_unmount(ppu_thread& ppu, vm::cptr<char> path, s32 unk1, s32 force);
+error_code sys_fs_mount(ppu_thread& ppu, vm::cptr<char> dev_name, vm::cptr<char> file_system, vm::cptr<char> path, s32 unk1, s32 prot, s32 unk3, vm::cptr<char> str1, u32 str_len);
 error_code sys_fs_get_mount_info_size(ppu_thread& ppu, vm::ptr<u64> len);
-error_code sys_fs_get_mount_info(ppu_thread& ppu, vm::ptr<CellFsMountInfo> info, u64 len, vm::ptr<u64> out_len);
+error_code sys_fs_get_mount_info(ppu_thread& ppu, vm::ptr<CellFsMountInfo> info, u32 len, vm::ptr<u64> out_len);
diff --git a/rpcs3/Emu/Cell/lv2/sys_game.cpp b/rpcs3/Emu/Cell/lv2/sys_game.cpp
deleted file mode 100644
index 1164dbd216..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_game.cpp
+++ /dev/null
@@ -1,293 +0,0 @@
-#include "stdafx.h"
-#include "util/sysinfo.hpp"
-#include "util/v128.hpp"
-#include "Emu/Cell/lv2/sys_process.h"
-#include "Emu/Memory/vm_ptr.h"
-#include "Emu/Cell/ErrorCodes.h"
-#include "Emu/System.h"
-#include "Emu/system_utils.hpp"
-#include "Emu/IdManager.h"
-#include "Utilities/StrUtil.h"
-#include "Utilities/Thread.h"
-
-#include "Emu/Cell/timers.hpp"
-#include "sys_game.h"
-
-LOG_CHANNEL(sys_game);
-
-struct system_sw_version
-{
-	system_sw_version()
-	{
-		f64 version_f = 0;
-		if (!try_to_float(&version_f, utils::get_firmware_version(), 0.0f, 99.9999f))
-			sys_game.error("Error parsing firmware version");
-		version = static_cast<usz>(version_f * 10000);
-	}
-
-	system_sw_version(const system_sw_version&) = delete;
-
-	system_sw_version& operator=(const system_sw_version&) = delete;
-
-	~system_sw_version() = default;
-
-	atomic_t<u64> version;
-};
-
-struct board_storage
-{
-public:
-	bool read(u8* buffer)
-	{
-		if (!buffer)
-			return false;
-
-		const auto data = storage.load();
-		memcpy(buffer, &data, size);
-
-		return true;
-	}
-
-	bool write(u8* buffer)
-	{
-		if (!buffer)
-			return false;
-
-		storage.store(read_from_ptr<be_t<v128>>(buffer));
-		written = true;
-
-		return true;
-	}
-
-	board_storage()
-	{
-		memset(&storage.raw(), -1, size);
-		if (fs::file file; file.open(file_path, fs::read))
-			file.read(&storage.raw(), std::min(file.size(), size));
-	}
-
-	board_storage(const board_storage&) = delete;
-
-	board_storage& operator=(const board_storage&) = delete;
-
-	~board_storage()
-	{
-		if (written)
-		{
-			if (fs::file file; file.open(file_path, fs::create + fs::write + fs::lock))
-			{
-				file.write(&storage.raw(), size);
-				file.trunc(size);
-			}
-		}
-	}
-
-private:
-	atomic_be_t<v128> storage;
-	bool written = false;
-	const std::string file_path = rpcs3::utils::get_hdd1_dir() + "/caches/board_storage.bin";
-	static constexpr u64 size = sizeof(v128);
-};
-
-struct watchdog_t
-{
-	struct alignas(8) control_t
-	{
-		bool needs_restart = false;
-		bool active = false;
-		char pad[sizeof(u32) - sizeof(bool) * 2]{};
-		u32 timeout = 0;
-	};
-
-	atomic_t<control_t> control;
-
-	void operator()()
-	{
-		u64 start_time = get_system_time();
-		u64 old_time = start_time;
-		u64 current_time = old_time;
-
-		constexpr u64 sleep_time = 50'000;
-
-		while (thread_ctrl::state() != thread_state::aborting)
-		{
-			if (Emu.GetStatus(false) == system_state::paused)
-			{
-				start_time += current_time - old_time;
-				old_time = current_time;
-				thread_ctrl::wait_for(sleep_time);
-				current_time = get_system_time();
-				continue;
-			}
-
-			old_time = std::exchange(current_time, get_system_time());
-
-			const auto old = control.fetch_op([&](control_t& data)
-			{
-				if (data.needs_restart)
-				{
-					data.needs_restart = false;
-					return true;
-				}
-
-				return false;
-			}).first;
-
-			if (old.active && old.needs_restart)
-			{
-				start_time = current_time;
-				old_time = current_time;
-				continue;
-			}
-
-			if (old.active && current_time - start_time >= old.timeout)
-			{
-				sys_game.success("Watchdog timeout! Restarting the game...");
-
-				Emu.CallFromMainThread([]()
-				{
-					Emu.Restart(false);
-				});
-
-				return;
-			}
-
-			thread_ctrl::wait_for(sleep_time);
-		}
-	}
-
-	static constexpr auto thread_name = "LV2 Watchdog Thread"sv;
-};
-
-void abort_lv2_watchdog()
-{
-	if (auto thr = g_fxo->try_get<named_thread<watchdog_t>>())
-	{
-		sys_game.notice("Aborting %s...", thr->thread_name);
-		*thr = thread_state::aborting;
-	}
-}
-
-error_code _sys_game_watchdog_start(u32 timeout)
-{
-	sys_game.trace("sys_game_watchdog_start(timeout=%d)", timeout);
-
-	// According to disassembly
-	timeout *= 1'000'000;
-	timeout &= -64;
-
-	if (!g_fxo->get<named_thread<watchdog_t>>().control.fetch_op([&](watchdog_t::control_t& data)
-	{
-		if (data.active)
-		{
-			return false;
-		}
-
-		data.needs_restart = true;
-		data.active = true;
-		data.timeout = timeout;
-		return true;
-	}).second)
-	{
-		return CELL_EABORT;
-	}
-
-	return CELL_OK;
-}
-
-error_code _sys_game_watchdog_stop()
-{
-	sys_game.trace("sys_game_watchdog_stop()");
-
-	g_fxo->get<named_thread<watchdog_t>>().control.fetch_op([](watchdog_t::control_t& data)
-	{
-		if (!data.active)
-		{
-			return false;
-		}
-
-		data.active = false;
-		return true;
-	});
-
-	return CELL_OK;
-}
-
-error_code _sys_game_watchdog_clear()
-{
-	sys_game.trace("sys_game_watchdog_clear()");
-
-	g_fxo->get<named_thread<watchdog_t>>().control.fetch_op([](watchdog_t::control_t& data)
-	{
-		if (!data.active || data.needs_restart)
-		{
-			return false;
-		}
-
-		data.needs_restart = true;
-		return true;
-	});
-
-	return CELL_OK;
-}
-
-error_code _sys_game_set_system_sw_version(u64 version)
-{
-	sys_game.trace("sys_game_set_system_sw_version(version=%d)", version);
-
-	if (!g_ps3_process_info.has_root_perm())
-		return CELL_ENOSYS;
-
-	g_fxo->get<system_sw_version>().version = version;
-
-	return CELL_OK;
-}
-
-u64 _sys_game_get_system_sw_version()
-{
-	sys_game.trace("sys_game_get_system_sw_version()");
-
-	return g_fxo->get<system_sw_version>().version;
-}
-
-error_code _sys_game_board_storage_read(vm::ptr<u8> buffer, vm::ptr<u8> status)
-{
-	sys_game.trace("sys_game_board_storage_read(buffer=*0x%x, status=*0x%x)", buffer, status);
-
-	if (!buffer || !status)
-	{
-		return CELL_EFAULT;
-	}
-
-	*status = g_fxo->get<board_storage>().read(buffer.get_ptr()) ? 0x00 : 0xFF;
-
-	return CELL_OK;
-}
-
-error_code _sys_game_board_storage_write(vm::ptr<u8> buffer, vm::ptr<u8> status)
-{
-	sys_game.trace("sys_game_board_storage_write(buffer=*0x%x, status=*0x%x)", buffer, status);
-
-	if (!buffer || !status)
-	{
-		return CELL_EFAULT;
-	}
-
-	*status = g_fxo->get<board_storage>().write(buffer.get_ptr()) ? 0x00 : 0xFF;
-
-	return CELL_OK;
-}
-
-error_code _sys_game_get_rtc_status(vm::ptr<s32> status)
-{
-	sys_game.trace("sys_game_get_rtc_status(status=*0x%x)", status);
-
-	if (!status)
-	{
-		return CELL_EFAULT;
-	}
-
-	*status = 0;
-
-	return CELL_OK;
-}
diff --git a/rpcs3/Emu/Cell/lv2/sys_game.h b/rpcs3/Emu/Cell/lv2/sys_game.h
deleted file mode 100644
index a3c0237900..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_game.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-void abort_lv2_watchdog();
-
-error_code _sys_game_watchdog_start(u32 timeout);
-error_code _sys_game_watchdog_stop();
-error_code _sys_game_watchdog_clear();
-error_code _sys_game_set_system_sw_version(u64 version);
-u64 _sys_game_get_system_sw_version();
-error_code _sys_game_board_storage_read(vm::ptr<u8> buffer, vm::ptr<u8> status);
-error_code _sys_game_board_storage_write(vm::ptr<u8> buffer, vm::ptr<u8> status);
-error_code _sys_game_get_rtc_status(vm::ptr<s32> status);
diff --git a/rpcs3/Emu/Cell/lv2/sys_hid.cpp b/rpcs3/Emu/Cell/lv2/sys_hid.cpp
index 05f87895ad..7743984a4d 100644
--- a/rpcs3/Emu/Cell/lv2/sys_hid.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_hid.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "sys_hid.h"
 
+#include "Emu/Memory/vm.h"
 #include "Emu/Memory/vm_var.h"
 
 #include "Emu/Cell/PPUThread.h"
@@ -11,7 +12,7 @@
 
 LOG_CHANNEL(sys_hid);
 
-error_code sys_hid_manager_open(ppu_thread& ppu, u64 device_type, u64 port_no, vm::ptr<u32> handle)
+error_code sys_hid_manager_open(u64 device_type, u64 port_no, vm::ptr<u32> handle)
 {
 	sys_hid.todo("sys_hid_manager_open(device_type=0x%llx, port_no=0x%llx, handle=*0x%llx)", device_type, port_no, handle);
 
@@ -33,8 +34,8 @@ error_code sys_hid_manager_open(ppu_thread& ppu, u64 device_type, u64 port_no, v
 
 	if (device_type == 1)
 	{
-		cellPadInit(ppu, 7);
-		cellPadSetPortSetting(::narrow<u32>(port_no) /* 0 */, CELL_PAD_SETTING_LDD | CELL_PAD_SETTING_PRESS_ON | CELL_PAD_SETTING_SENSOR_ON);
+		cellPadInit(7);
+		cellPadSetPortSetting(port_no /* 0 */, CELL_PAD_SETTING_LDD | CELL_PAD_SETTING_PRESS_ON);
 	}
 
 	return CELL_OK;
@@ -109,6 +110,8 @@ error_code sys_hid_manager_513(u64 a1, u64 a2, vm::ptr<void> buf, u64 buf_size)
 
 error_code sys_hid_manager_514(u32 pkg_id, vm::ptr<void> buf, u64 buf_size)
 {
+	sys_hid.todo("sys_hid_manager_514(pkg_id=0x%x, buf=*0x%x, buf_size=0x%llx)", pkg_id, buf, buf_size);
+
 	if (pkg_id == 0xE)
 	{
 		sys_hid.trace("sys_hid_manager_514(pkg_id=0x%x, buf=*0x%x, buf_size=0x%llx)", pkg_id, buf, buf_size);
@@ -158,11 +161,10 @@ error_code sys_hid_manager_read(u32 handle, u32 pkg_id, vm::ptr<void> buf, u64 b
 		return CELL_EFAULT;
 	}
 
-	(pkg_id == 2 || pkg_id == 0x81 ? sys_hid.trace : sys_hid.todo)
-		("sys_hid_manager_read(handle=0x%x, pkg_id=0x%x, buf=*0x%x, buf_size=0x%llx)", handle, pkg_id, buf, buf_size);
-
 	if (pkg_id == 2)
 	{
+		sys_hid.trace("sys_hid_manager_read(handle=0x%x, pkg_id=0x%x, buf=*0x%x, buf_size=0x%llx)", handle, pkg_id, buf, buf_size);
+
 		// cellPadGetData
 		// it returns just button array from 'CellPadData'
 		//auto data = vm::static_ptr_cast<u16[64]>(buf);
@@ -177,6 +179,8 @@ error_code sys_hid_manager_read(u32 handle, u32 pkg_id, vm::ptr<void> buf, u64 b
 	}
 	else if (pkg_id == 0x81)
 	{
+		sys_hid.trace("sys_hid_manager_read(handle=0x%x, pkg_id=0x%x, buf=*0x%x, buf_size=0x%llx)", handle, pkg_id, buf, buf_size);
+
 		// cellPadGetDataExtra?
 		vm::var<CellPadData> tmpData;
 		if ((cellPadGetData(0, +tmpData) == CELL_OK) && tmpData->len > 0)
@@ -187,5 +191,7 @@ error_code sys_hid_manager_read(u32 handle, u32 pkg_id, vm::ptr<void> buf, u64 b
 		}
 	}
 
+	sys_hid.todo("sys_hid_manager_read(handle=0x%x, pkg_id=0x%x, buf=*0x%x, buf_size=0x%llx)", handle, pkg_id, buf, buf_size);
+
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/Cell/lv2/sys_hid.h b/rpcs3/Emu/Cell/lv2/sys_hid.h
index 66acb78006..c1c6754a94 100644
--- a/rpcs3/Emu/Cell/lv2/sys_hid.h
+++ b/rpcs3/Emu/Cell/lv2/sys_hid.h
@@ -34,7 +34,7 @@ struct sys_hid_manager_514_pkg_d
 
 // SysCalls
 
-error_code sys_hid_manager_open(ppu_thread& ppu, u64 device_type, u64 port_no, vm::ptr<u32> handle);
+error_code sys_hid_manager_open(u64 device_type, u64 port_no, vm::ptr<u32> handle);
 error_code sys_hid_manager_ioctl(u32 hid_handle, u32 pkg_id, vm::ptr<void> buf, u64 buf_size);
 error_code sys_hid_manager_add_hot_key_observer(u32 event_queue, vm::ptr<u32> unk);
 error_code sys_hid_manager_check_focus();
diff --git a/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp b/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp
index 3109f042f9..36ed8e517d 100644
--- a/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp
@@ -2,87 +2,43 @@
 #include "sys_interrupt.h"
 
 #include "Emu/IdManager.h"
-#include "Emu/System.h"
 
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
-#include "Emu/Cell/SPUThread.h"
 #include "Emu/Cell/PPUOpcodes.h"
 
 LOG_CHANNEL(sys_interrupt);
 
 lv2_int_tag::lv2_int_tag() noexcept
-	: lv2_obj(1)
-	, id(idm::last_id())
+	: id(idm::last_id())
 {
+	exists.release(1);
 }
 
-lv2_int_tag::lv2_int_tag(utils::serial& ar) noexcept
-	: lv2_obj(1)
-	, id(idm::last_id())
-	, handler([&]()
-	{
-		const u32 id = ar;
-
-		auto ptr = idm::get_unlocked<lv2_obj, lv2_int_serv>(id);
-
-		if (!ptr && id)
-		{
-			Emu.PostponeInitCode([id, &handler = this->handler]()
-			{
-				handler = ensure(idm::get_unlocked<lv2_obj, lv2_int_serv>(id));
-			});
-		}
-
-		return ptr;
-	}())
-{
-}
-
-void lv2_int_tag::save(utils::serial& ar)
-{
-	ar(lv2_obj::check(handler) ? handler->id : 0);
-}
-
-lv2_int_serv::lv2_int_serv(shared_ptr<named_thread<ppu_thread>> thread, u64 arg1, u64 arg2) noexcept
-	: lv2_obj(1)
-	, id(idm::last_id())
+lv2_int_serv::lv2_int_serv(const std::shared_ptr<named_thread<ppu_thread>>& thread, u64 arg1, u64 arg2) noexcept
+	: id(idm::last_id())
 	, thread(thread)
 	, arg1(arg1)
 	, arg2(arg2)
 {
+	exists.release(1);
 }
 
-lv2_int_serv::lv2_int_serv(utils::serial& ar) noexcept
-	: lv2_obj(1)
-	, id(idm::last_id())
-	, thread(idm::get_unlocked<named_thread<ppu_thread>>(ar))
-	, arg1(ar)
-	, arg2(ar)
-{
-}
-
-void lv2_int_serv::save(utils::serial& ar)
-{
-	ar(thread && idm::check_unlocked<named_thread<ppu_thread>>(thread->id) ? thread->id : 0, arg1, arg2);
-}
-
-void ppu_interrupt_thread_entry(ppu_thread&, ppu_opcode_t, be_t<u32>*, struct ppu_intrp_func*);
-
 void lv2_int_serv::exec() const
 {
 	thread->cmd_list
 	({
 		{ ppu_cmd::reset_stack, 0 },
 		{ ppu_cmd::set_args, 2 }, arg1, arg2,
-		{ ppu_cmd::entry_call, 0 },
-		{ ppu_cmd::sleep, 0 },
-		{ ppu_cmd::ptr_call, 0 },
-		std::bit_cast<u64>(&ppu_interrupt_thread_entry)
+		{ ppu_cmd::opd_call, 0 }, thread->entry_func,
+		{ ppu_cmd::sleep, 0 }
 	});
+
+	thread->cmd_notify++;
+	thread->cmd_notify.notify_one();
 }
 
-void ppu_thread_exit(ppu_thread&, ppu_opcode_t, be_t<u32>*, struct ppu_intrp_func*);
+bool ppu_thread_exit(ppu_thread& ppu);
 
 void lv2_int_serv::join() const
 {
@@ -92,11 +48,11 @@ void lv2_int_serv::join() const
 		std::bit_cast<u64>(&ppu_thread_exit)
 	});
 
-	thread->cmd_notify.store(1);
+	thread->cmd_notify++;
 	thread->cmd_notify.notify_one();
 	(*thread)();
 
-	idm::remove_verify<named_thread<ppu_thread>>(thread->id, thread);
+	idm::remove_verify<named_thread<ppu_thread>>(thread->id, static_cast<std::weak_ptr<named_thread<ppu_thread>>>(thread));
 }
 
 error_code sys_interrupt_tag_destroy(ppu_thread& ppu, u32 intrtag)
@@ -139,7 +95,7 @@ error_code _sys_interrupt_thread_establish(ppu_thread& ppu, vm::ptr<u32> ih, u32
 
 	const u32 id = idm::import<lv2_obj, lv2_int_serv>([&]()
 	{
-		shared_ptr<lv2_int_serv> result;
+		std::shared_ptr<lv2_int_serv> result;
 
 		// Get interrupt tag
 		const auto tag = idm::check_unlocked<lv2_obj, lv2_int_tag>(intrtag);
@@ -173,24 +129,15 @@ error_code _sys_interrupt_thread_establish(ppu_thread& ppu, vm::ptr<u32> ih, u32
 			return result;
 		}
 
-		result = make_shared<lv2_int_serv>(it, arg1, arg2);
+		result = std::make_shared<lv2_int_serv>(it, arg1, arg2);
 		tag->handler = result;
-
-		it->cmd_list
-		({
-			{ ppu_cmd::ptr_call, 0 },
-			std::bit_cast<u64>(&ppu_interrupt_thread_entry)
-		});
-
 		it->state -= cpu_flag::stop;
-		it->state.notify_one();
-
+		it->state.notify_one(cpu_flag::stop);
 		return result;
 	});
 
 	if (id)
 	{
-		ppu.check_state();
 		*ih = id;
 		return CELL_OK;
 	}
@@ -214,9 +161,6 @@ error_code _sys_interrupt_thread_disestablish(ppu_thread& ppu, u32 ih, vm::ptr<u
 		if (const auto thread = idm::withdraw<named_thread<ppu_thread>>(ih))
 		{
 			*r13 = thread->gpr[13];
-
-			// It is detached from IDM now so join must be done explicitly now
-			*thread = thread_state::finished;
 			return CELL_OK;
 		}
 
@@ -241,63 +185,4 @@ void sys_interrupt_thread_eoi(ppu_thread& ppu)
 	sys_interrupt.trace("sys_interrupt_thread_eoi()");
 
 	ppu.state += cpu_flag::ret;
-
-	lv2_obj::sleep(ppu);
-
-	ppu.interrupt_thread_executing = false;
-}
-
-void ppu_interrupt_thread_entry(ppu_thread& ppu, ppu_opcode_t, be_t<u32>*, struct ppu_intrp_func*)
-{
-	while (true)
-	{
-		shared_ptr<lv2_int_serv> serv = null_ptr;
-
-		// Loop endlessly trying to invoke an interrupt if required
-		idm::select<named_thread<spu_thread>>([&](u32, spu_thread& spu)
-		{
-			if (spu.get_type() != spu_type::threaded)
-			{
-				auto& ctrl = spu.int_ctrl[2];
-
-				if (lv2_obj::check(ctrl.tag))
-				{
-					auto& handler = ctrl.tag->handler;
-
-					if (lv2_obj::check(handler))
-					{
-						if (handler->thread.get() == &ppu)
-						{
-							if (spu.ch_out_intr_mbox.get_count() && ctrl.mask & SPU_INT2_STAT_MAILBOX_INT)
-							{
-								ctrl.stat |= SPU_INT2_STAT_MAILBOX_INT;
-							}
-
-							if (ctrl.mask & ctrl.stat)
-							{
-								ensure(!serv);
-								serv = handler;
-							}
-						}
-					}
-				}
-			}
-		});
-
-		if (serv)
-		{
-			// Queue interrupt, after the interrupt has finished the PPU returns to this loop
-			serv->exec();
-			return;
-		}
-
-		const auto state = +ppu.state;
-
-		if (::is_stopped(state) || ppu.cmd_notify.exchange(0))
-		{
-			return;
-		}
-
-		thread_ctrl::wait_on(ppu.cmd_notify, 0);
-	}
 }
diff --git a/rpcs3/Emu/Cell/lv2/sys_interrupt.h b/rpcs3/Emu/Cell/lv2/sys_interrupt.h
index f32517e9a4..f28af0b6e5 100644
--- a/rpcs3/Emu/Cell/lv2/sys_interrupt.h
+++ b/rpcs3/Emu/Cell/lv2/sys_interrupt.h
@@ -6,30 +6,26 @@
 
 class ppu_thread;
 
-struct lv2_int_tag final : public lv2_obj
+struct lv2_int_tag final : lv2_obj
 {
 	static const u32 id_base = 0x0a000000;
 
 	const u32 id;
-	shared_ptr<struct lv2_int_serv> handler;
+	std::shared_ptr<struct lv2_int_serv> handler;
 
 	lv2_int_tag() noexcept;
-	lv2_int_tag(utils::serial& ar) noexcept;
-	void save(utils::serial& ar);
 };
 
-struct lv2_int_serv final : public lv2_obj
+struct lv2_int_serv final : lv2_obj
 {
 	static const u32 id_base = 0x0b000000;
 
 	const u32 id;
-	const shared_ptr<named_thread<ppu_thread>> thread;
+	const std::shared_ptr<named_thread<ppu_thread>> thread;
 	const u64 arg1;
 	const u64 arg2;
 
-	lv2_int_serv(shared_ptr<named_thread<ppu_thread>> thread, u64 arg1, u64 arg2) noexcept;
-	lv2_int_serv(utils::serial& ar) noexcept;
-	void save(utils::serial& ar);
+	lv2_int_serv(const std::shared_ptr<named_thread<ppu_thread>>& thread, u64 arg1, u64 arg2) noexcept;
 
 	void exec() const;
 	void join() const;
diff --git a/rpcs3/Emu/Cell/lv2/sys_io.cpp b/rpcs3/Emu/Cell/lv2/sys_io.cpp
index b1cec87a47..5a11bb261f 100644
--- a/rpcs3/Emu/Cell/lv2/sys_io.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_io.cpp
@@ -43,7 +43,7 @@ error_code sys_io_buffer_allocate(u32 handle, vm::ptr<u32> block)
 		return CELL_EFAULT;
 	}
 
-	if (auto io = idm::get_unlocked<lv2_io_buf>(handle))
+	if (auto io = idm::get<lv2_io_buf>(handle))
 	{
 		// no idea what we actually need to allocate
 		if (u32 addr = vm::alloc(io->block_count * io->block_size, vm::main))
@@ -62,7 +62,7 @@ error_code sys_io_buffer_free(u32 handle, u32 block)
 {
 	sys_io.todo("sys_io_buffer_free(handle=0x%x, block=0x%x)", handle, block);
 
-	const auto io = idm::get_unlocked<lv2_io_buf>(handle);
+	const auto io = idm::get<lv2_io_buf>(handle);
 
 	if (!io)
 	{
diff --git a/rpcs3/Emu/Cell/lv2/sys_io.h b/rpcs3/Emu/Cell/lv2/sys_io.h
index 27c8b99857..1d2491c53a 100644
--- a/rpcs3/Emu/Cell/lv2/sys_io.h
+++ b/rpcs3/Emu/Cell/lv2/sys_io.h
@@ -4,10 +4,10 @@
 
 struct lv2_io_buf
 {
+	using id_type = lv2_io_buf;
 	static const u32 id_base = 0x44000000;
 	static const u32 id_step = 1;
 	static const u32 id_count = 2048;
-	SAVESTATE_INIT_POS(41);
 
 	const u32 block_count;
 	const u32 block_size;
diff --git a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp b/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp
index 43bfb308ba..ab1da88567 100644
--- a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp
@@ -7,29 +7,13 @@
 #include "Emu/Cell/PPUThread.h"
 #include "sys_lwmutex.h"
 
-#include "util/asm.hpp"
-
 LOG_CHANNEL(sys_lwcond);
 
-lv2_lwcond::lv2_lwcond(utils::serial& ar)
-	: name(ar.pop<be_t<u64>>())
-	, lwid(ar)
-	, protocol(ar)
-	, control(ar.pop<decltype(control)>())
-{
-}
-
-void lv2_lwcond::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(lv2_sync);
-	ar(name, lwid, protocol, control);
-}
-
 error_code _sys_lwcond_create(ppu_thread& ppu, vm::ptr<u32> lwcond_id, u32 lwmutex_id, vm::ptr<sys_lwcond_t> control, u64 name)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_lwcond.trace(u8"_sys_lwcond_create(lwcond_id=*0x%x, lwmutex_id=0x%x, control=*0x%x, name=0x%llx (“%s”))", lwcond_id, lwmutex_id, control, name, lv2_obj::name_64{std::bit_cast<be_t<u64>>(name)});
+	sys_lwcond.warning(u8"_sys_lwcond_create(lwcond_id=*0x%x, lwmutex_id=0x%x, control=*0x%x, name=0x%llx (“%s”))", lwcond_id, lwmutex_id, control, name, lv2_obj::name64(std::bit_cast<be_t<u64>>(name)));
 
 	u32 protocol;
 
@@ -50,7 +34,6 @@ error_code _sys_lwcond_create(ppu_thread& ppu, vm::ptr<u32> lwcond_id, u32 lwmut
 
 	if (const u32 id = idm::make<lv2_obj, lv2_lwcond>(name, lwmutex_id, protocol, control))
 	{
-		ppu.check_state();
 		*lwcond_id = id;
 		return CELL_OK;
 	}
@@ -62,79 +45,26 @@ error_code _sys_lwcond_destroy(ppu_thread& ppu, u32 lwcond_id)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_lwcond.trace("_sys_lwcond_destroy(lwcond_id=0x%x)", lwcond_id);
+	sys_lwcond.warning("_sys_lwcond_destroy(lwcond_id=0x%x)", lwcond_id);
 
-	shared_ptr<lv2_lwcond> _cond;
-
-	while (true)
+	const auto cond = idm::withdraw<lv2_obj, lv2_lwcond>(lwcond_id, [&](lv2_lwcond& cond) -> CellError
 	{
-		s32 old_val = 0;
-
-		auto [ptr, ret] = idm::withdraw<lv2_obj, lv2_lwcond>(lwcond_id, [&](lv2_lwcond& cond) -> CellError
+		if (cond.waiters)
 		{
-			// Ignore check on first iteration
-			if (_cond && std::addressof(cond) != _cond.get())
-			{
-				// Other thread has destroyed the lwcond earlier
-				return CELL_ESRCH;
-			}
-
-			std::lock_guard lock(cond.mutex);
-
-			if (atomic_storage<ppu_thread*>::load(cond.sq))
-			{
-				return CELL_EBUSY;
-			}
-
-			old_val = cond.lwmutex_waiters.or_fetch(smin);
-
-			if (old_val != smin)
-			{
-				// De-schedule if waiters were found
-				lv2_obj::sleep(ppu);
-
-				// Repeat loop: there are lwmutex waiters inside _sys_lwcond_queue_wait
-				return CELL_EAGAIN;
-			}
-
-			return {};
-		});
-
-		if (!ptr)
-		{
-			return CELL_ESRCH;
+			return CELL_EBUSY;
 		}
 
-		if (ret)
-		{
-			if (ret != CELL_EAGAIN)
-			{
-				return ret;
-			}
-		}
-		else
-		{
-			break;
-		}
+		return {};
+	});
 
-		_cond = std::move(ptr);
+	if (!cond)
+	{
+		return CELL_ESRCH;
+	}
 
-		// Wait for all lwcond waiters to quit
-		while (old_val + 0u > 1u << 31)
-		{
-			thread_ctrl::wait_on(_cond->lwmutex_waiters, old_val);
-
-			if (ppu.is_stopped())
-			{
-				ppu.state += cpu_flag::again;
-				return {};
-			}
-
-			old_val = _cond->lwmutex_waiters;
-		}
-
-		// Wake up from sleep
-		ppu.check_state();
+	if (cond.ret)
+	{
+		return cond.ret;
 	}
 
 	return CELL_OK;
@@ -155,156 +85,101 @@ error_code _sys_lwcond_signal(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id, u6
 		fmt::throw_exception("Unknown mode (%d)", mode);
 	}
 
-	while (true)
+	const auto cond = idm::check<lv2_obj, lv2_lwcond>(lwcond_id, [&](lv2_lwcond& cond) -> int
 	{
-		if (ppu.test_stopped())
+		ppu_thread* cpu = nullptr;
+
+		if (ppu_thread_id != u32{umax})
 		{
-			ppu.state += cpu_flag::again;
-			return {};
+			cpu = idm::check_unlocked<named_thread<ppu_thread>>(static_cast<u32>(ppu_thread_id));
+
+			if (!cpu)
+			{
+				return -1;
+			}
 		}
 
-		bool finished = true;
+		lv2_lwmutex* mutex = nullptr;
 
-		ppu.state += cpu_flag::wait;
-
-		const auto cond = idm::check<lv2_obj, lv2_lwcond>(lwcond_id, [&, notify = lv2_obj::notify_all_t()](lv2_lwcond& cond) -> int
+		if (mode != 2)
 		{
-			ppu_thread* cpu = nullptr;
+			mutex = idm::check_unlocked<lv2_obj, lv2_lwmutex>(lwmutex_id);
 
-			if (ppu_thread_id != u32{umax})
+			if (!mutex)
 			{
-				cpu = idm::check_unlocked<named_thread<ppu_thread>>(static_cast<u32>(ppu_thread_id));
-
-				if (!cpu)
-				{
-					return -1;
-				}
+				return -1;
 			}
+		}
 
-			lv2_lwmutex* mutex = nullptr;
+		if (cond.waiters)
+		{
+			std::lock_guard lock(cond.mutex);
 
-			if (mode != 2)
+			auto result = cpu ? cond.unqueue(cond.sq, cpu) :
+				cond.schedule<ppu_thread>(cond.sq, cond.protocol);
+
+			if (result)
 			{
-				mutex = idm::check_unlocked<lv2_obj, lv2_lwmutex>(lwmutex_id);
+				cond.waiters--;
 
-				if (!mutex)
+				if (mode == 2)
 				{
-					return -1;
-				}
-			}
-
-			if (atomic_storage<ppu_thread*>::load(cond.sq))
-			{
-				std::lock_guard lock(cond.mutex);
-
-				if (ppu.state & cpu_flag::suspend)
-				{
-					// Test if another signal caused the current thread to be suspended, in which case it needs to wait until the thread wakes up (otherwise the signal may cause unexpected results)
-					finished = false;
-					return 0;
+					static_cast<ppu_thread*>(result)->gpr[3] = CELL_EBUSY;
 				}
 
-				if (cpu)
+				if (mode != 2)
 				{
-					if (static_cast<ppu_thread*>(cpu)->state & cpu_flag::again)
-					{
-						ppu.state += cpu_flag::again;
-						return 0;
-					}
-				}
+					ensure(!mutex->signaled);
+					std::lock_guard lock(mutex->mutex);
 
-				auto result = cpu ? cond.unqueue(cond.sq, cpu) :
-					cond.schedule<ppu_thread>(cond.sq, cond.protocol);
-
-				if (result)
-				{
-					if (static_cast<ppu_thread*>(result)->state & cpu_flag::again)
+					if (mode == 3 && !mutex->sq.empty()) [[unlikely]]
 					{
-						ppu.state += cpu_flag::again;
-						return 0;
-					}
-
-					if (mode == 2)
-					{
-						static_cast<ppu_thread*>(result)->gpr[3] = CELL_EBUSY;
-					}
-					else if (mode == 3 && mutex->load_sq()) [[unlikely]]
-					{
-						std::lock_guard lock(mutex->mutex);
-
 						// Respect ordering of the sleep queue
-						mutex->try_own(result, true);
-						auto result2 = mutex->reown<ppu_thread>();
-
-						if (result2->state & cpu_flag::again)
-						{
-							ppu.state += cpu_flag::again;
-							return 0;
-						}
-
-						if (result2 != result)
-						{
-							cond.awake(result2);
-							result = nullptr;
-						}
+						mutex->sq.emplace_back(result);
+						result = mutex->schedule<ppu_thread>(mutex->sq, mutex->protocol);
 					}
 					else if (mode == 1)
 					{
-						mutex->try_own(result, true);
+						mutex->add_waiter(result);
 						result = nullptr;
 					}
-
-					if (result)
-					{
-						cond.awake(result);
-					}
-
-					return 1;
 				}
-			}
-			else
-			{
-				cond.mutex.lock_unlock();
 
-				if (ppu.state & cpu_flag::suspend)
+				if (result)
 				{
-					finished = false;
-					return 0;
+					cond.awake(result);
 				}
+
+				return 1;
 			}
-
-			return 0;
-		});
-
-		if (!finished)
-		{
-			continue;
 		}
 
-		if (!cond || cond.ret == -1)
-		{
-			return CELL_ESRCH;
-		}
+		return 0;
+	});
 
-		if (!cond.ret)
-		{
-			if (ppu_thread_id == u32{umax})
-			{
-				if (mode == 3)
-				{
-					return not_an_error(CELL_ENOENT);
-				}
-				else if (mode == 2)
-				{
-					return CELL_OK;
-				}
-			}
-
-			return not_an_error(CELL_EPERM);
-		}
-
-		return CELL_OK;
+	if (!cond || cond.ret == -1)
+	{
+		return CELL_ESRCH;
 	}
+
+	if (!cond.ret)
+	{
+		if (ppu_thread_id == u32{umax})
+		{
+			if (mode == 3)
+			{
+				return not_an_error(CELL_ENOENT);
+			}
+			else if (mode == 2)
+			{
+				return CELL_OK;
+			}
+		}
+
+		return not_an_error(CELL_EPERM);
+	}
+
+	return CELL_OK;
 }
 
 error_code _sys_lwcond_signal_all(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id, u32 mode)
@@ -321,115 +196,75 @@ error_code _sys_lwcond_signal_all(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id
 		fmt::throw_exception("Unknown mode (%d)", mode);
 	}
 
-	while (true)
+	bool need_awake = false;
+
+	const auto cond = idm::check<lv2_obj, lv2_lwcond>(lwcond_id, [&](lv2_lwcond& cond) -> s32
 	{
-		if (ppu.test_stopped())
+		lv2_lwmutex* mutex{};
+
+		if (mode != 2)
 		{
-			ppu.state += cpu_flag::again;
-			return {};
+			mutex = idm::check_unlocked<lv2_obj, lv2_lwmutex>(lwmutex_id);
+
+			if (!mutex)
+			{
+				return -1;
+			}
 		}
 
-		bool finished = true;
-
-		ppu.state += cpu_flag::wait;
-
-		const auto cond = idm::check<lv2_obj, lv2_lwcond>(lwcond_id, [&, notify = lv2_obj::notify_all_t()](lv2_lwcond& cond) -> int
+		if (cond.waiters)
 		{
-			lv2_lwmutex* mutex{};
+			std::lock_guard lock(cond.mutex);
 
-			if (mode != 2)
+			u32 result = 0;
+
+			while (const auto cpu = cond.schedule<ppu_thread>(cond.sq, cond.protocol))
 			{
-				mutex = idm::check_unlocked<lv2_obj, lv2_lwmutex>(lwmutex_id);
+				cond.waiters--;
 
-				if (!mutex)
+				if (mode == 2)
 				{
-					return -1;
+					static_cast<ppu_thread*>(cpu)->gpr[3] = CELL_EBUSY;
 				}
+
+				if (mode == 1)
+				{
+					ensure(!mutex->signaled);
+					std::lock_guard lock(mutex->mutex);
+					mutex->add_waiter(cpu);
+				}
+				else
+				{
+					lv2_obj::append(cpu);
+					need_awake = true;
+				}
+
+				result++;
 			}
 
-			if (atomic_storage<ppu_thread*>::load(cond.sq))
+			if (need_awake)
 			{
-				std::lock_guard lock(cond.mutex);
-
-				if (ppu.state & cpu_flag::suspend)
-				{
-					// Test if another signal caused the current thread to be suspended, in which case it needs to wait until the thread wakes up (otherwise the signal may cause unexpected results)
-					finished = false;
-					return 0;
-				}
-
-				u32 result = 0;
-
-				for (auto cpu = +cond.sq; cpu; cpu = cpu->next_cpu)
-				{
-					if (cpu->state & cpu_flag::again)
-					{
-						ppu.state += cpu_flag::again;
-						return 0;
-					}
-				}
-
-				auto sq = cond.sq;
-				atomic_storage<ppu_thread*>::release(cond.sq, nullptr);
-
-				while (const auto cpu = cond.schedule<ppu_thread>(sq, cond.protocol))
-				{
-					if (mode == 2)
-					{
-						static_cast<ppu_thread*>(cpu)->gpr[3] = CELL_EBUSY;
-					}
-
-					if (mode == 1)
-					{
-						mutex->try_own(cpu, true);
-					}
-					else
-					{
-						lv2_obj::append(cpu);
-					}
-
-					result++;
-				}
-
-				if (result && mode == 2)
-				{
-					lv2_obj::awake_all();
-				}
-
-				return result;
-			}
-			else
-			{
-				cond.mutex.lock_unlock();
-
-				if (ppu.state & cpu_flag::suspend)
-				{
-					finished = false;
-					return 0;
-				}
+				lv2_obj::awake_all();
 			}
 
-			return 0;
-		});
-
-		if (!finished)
-		{
-			continue;
+			return result;
 		}
 
-		if (!cond || cond.ret == -1)
-		{
-			return CELL_ESRCH;
-		}
+		return 0;
+	});
 
-		if (mode == 1)
-		{
-			// Mode 1: return the amount of threads (TODO)
-			return not_an_error(cond.ret);
-		}
-
-		return CELL_OK;
+	if (!cond || cond.ret == -1)
+	{
+		return CELL_ESRCH;
 	}
+
+	if (mode == 1)
+	{
+		// Mode 1: return the amount of threads (TODO)
+		return not_an_error(cond.ret);
+	}
+
+	return CELL_OK;
 }
 
 error_code _sys_lwcond_queue_wait(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id, u64 timeout)
@@ -440,11 +275,9 @@ error_code _sys_lwcond_queue_wait(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id
 
 	ppu.gpr[3] = CELL_OK;
 
-	shared_ptr<lv2_lwmutex> mutex;
+	std::shared_ptr<lv2_lwmutex> mutex;
 
-	auto& sstate = *ppu.optional_savestate_state;
-
-	const auto cond = idm::get<lv2_obj, lv2_lwcond>(lwcond_id, [&, notify = lv2_obj::notify_all_t()](lv2_lwcond& cond)
+	const auto cond = idm::get<lv2_obj, lv2_lwcond>(lwcond_id, [&](lv2_lwcond& cond)
 	{
 		mutex = idm::get_unlocked<lv2_obj, lv2_lwmutex>(lwmutex_id);
 
@@ -456,110 +289,45 @@ error_code _sys_lwcond_queue_wait(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id
 		// Increment lwmutex's lwcond's waiters count
 		mutex->lwcond_waiters++;
 
-		lv2_obj::prepare_for_sleep(ppu);
-
 		std::lock_guard lock(cond.mutex);
 
-		cond.lwmutex_waiters++;
+		// Add a waiter
+		cond.waiters++;
+		cond.sq.emplace_back(&ppu);
 
-		const bool mutex_sleep = sstate.try_read<bool>().second;
-		sstate.clear();
-
-		if (mutex_sleep)
-		{
-			// Special: loading state from the point of waiting on lwmutex sleep queue
-			mutex->try_own(&ppu, true);
-		}
-		else
-		{
-			// Add a waiter
-			lv2_obj::emplace(cond.sq, &ppu);
-		}
-
-		if (!ppu.loaded_from_savestate && !mutex->try_unlock(false))
 		{
 			std::lock_guard lock2(mutex->mutex);
 
 			// Process lwmutex sleep queue
-			if (const auto cpu = mutex->reown<ppu_thread>())
+			if (const auto cpu = mutex->schedule<ppu_thread>(mutex->sq, mutex->protocol))
 			{
-				if (static_cast<ppu_thread*>(cpu)->state & cpu_flag::again)
-				{
-					ensure(cond.unqueue(cond.sq, &ppu));
-					ppu.state += cpu_flag::again;
-					return;
-				}
-
-				// Put the current thread to sleep and schedule lwmutex waiter atomically
 				cond.append(cpu);
-				cond.sleep(ppu, timeout);
-				return;
+			}
+			else
+			{
+				mutex->signaled |= 1;
 			}
 		}
 
+		// Sleep current thread and schedule lwmutex waiter
 		cond.sleep(ppu, timeout);
 	});
 
 	if (!cond || !mutex)
 	{
-		return { CELL_ESRCH, fmt::format("lwmutex_id: 0x%x, lwcond_id: 0x%x", lwmutex_id, lwcond_id) };
+		return CELL_ESRCH;
 	}
 
-	if (ppu.state & cpu_flag::again)
+	while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
 	{
-		return CELL_OK;
-	}
-
-	while (auto state = +ppu.state)
-	{
-		if (state & cpu_flag::signal && ppu.state.test_and_reset(cpu_flag::signal))
-		{
-			break;
-		}
-
 		if (is_stopped(state))
 		{
-			std::scoped_lock lock(cond->mutex, mutex->mutex);
-
-			bool mutex_sleep = false;
-			bool cond_sleep = false;
-
-			for (auto cpu = mutex->load_sq(); cpu; cpu = cpu->next_cpu)
-			{
-				if (cpu == &ppu)
-				{
-					mutex_sleep = true;
-					break;
-				}
-			}
-
-			for (auto cpu = atomic_storage<ppu_thread*>::load(cond->sq); cpu; cpu = cpu->next_cpu)
-			{
-				if (cpu == &ppu)
-				{
-					cond_sleep = true;
-					break;
-				}
-			}
-
-			if (!cond_sleep && !mutex_sleep)
-			{
-				break;
-			}
-
-			sstate(mutex_sleep);
-			ppu.state += cpu_flag::again;
-			break;
+			return {};
 		}
 
-		for (usz i = 0; cpu_flag::signal - ppu.state && i < 50; i++)
+		if (state & cpu_flag::signal)
 		{
-			busy_wait(500);
-		}
-
-		if (ppu.state & cpu_flag::signal)
- 		{
-			continue;
+			break;
 		}
 
 		if (timeout)
@@ -569,59 +337,33 @@ error_code _sys_lwcond_queue_wait(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id
 				// Wait for rescheduling
 				if (ppu.check_state())
 				{
-					continue;
+					return {};
 				}
 
-				ppu.state += cpu_flag::wait;
-
 				std::lock_guard lock(cond->mutex);
 
 				if (cond->unqueue(cond->sq, &ppu))
 				{
+					cond->waiters--;
 					ppu.gpr[3] = CELL_ETIMEDOUT;
 					break;
 				}
 
-				std::lock_guard lock2(mutex->mutex);
+				reader_lock lock2(mutex->mutex);
 
-				bool success = false;
-
-				mutex->lv2_control.fetch_op([&](lv2_lwmutex::control_data_t& data)
+				if (std::find(mutex->sq.cbegin(), mutex->sq.cend(), &ppu) == mutex->sq.cend())
 				{
-					success = false;
-
-					ppu_thread* sq = static_cast<ppu_thread*>(data.sq);
-
-					const bool retval = &ppu == sq;
-
-					if (!mutex->unqueue<false>(sq, &ppu))
-					{
-						return false;
-					}
-
-					success = true;
-
-					if (!retval)
-					{
-						return false;
-					}
-
-					data.sq = sq;
-					return true;
-				});
-
-				if (success)
-				{
-					ppu.next_cpu = nullptr;
-					ppu.gpr[3] = CELL_ETIMEDOUT;
+					break;
 				}
 
-				break;
+				mutex->sleep(ppu);
+				timeout = 0;
+				continue;
 			}
 		}
 		else
 		{
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
 		}
 	}
 
@@ -631,12 +373,6 @@ error_code _sys_lwcond_queue_wait(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id
 		mutex->lwcond_waiters.notify_all();
 	}
 
-	if (--cond->lwmutex_waiters == smin)
-	{
-		// Notify the thread destroying lwcond on last waiter
-		cond->lwmutex_waiters.notify_all();
-	}
-
 	// Return cause
 	return not_an_error(ppu.gpr[3]);
 }
diff --git a/rpcs3/Emu/Cell/lv2/sys_lwcond.h b/rpcs3/Emu/Cell/lv2/sys_lwcond.h
index 1a841b08c3..d4cf18755e 100644
--- a/rpcs3/Emu/Cell/lv2/sys_lwcond.h
+++ b/rpcs3/Emu/Cell/lv2/sys_lwcond.h
@@ -31,9 +31,8 @@ struct lv2_lwcond final : lv2_obj
 	vm::ptr<sys_lwcond_t> control;
 
 	shared_mutex mutex;
-	ppu_thread* sq{};
-
-	atomic_t<s32> lwmutex_waiters = 0;
+	atomic_t<u32> waiters{0};
+	std::deque<cpu_thread*> sq;
 
 	lv2_lwcond(u64 name, u32 lwid, u32 protocol, vm::ptr<sys_lwcond_t> control) noexcept
 		: name(std::bit_cast<be_t<u64>>(name))
@@ -42,9 +41,6 @@ struct lv2_lwcond final : lv2_obj
 		, control(control)
 	{
 	}
-
-	lv2_lwcond(utils::serial& ar);
-	void save(utils::serial& ar);
 };
 
 // Aux
diff --git a/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp b/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp
index ca8d7f1260..68f9e52c4c 100644
--- a/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp
@@ -6,28 +6,13 @@
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
 
-#include "util/asm.hpp"
-
 LOG_CHANNEL(sys_lwmutex);
 
-lv2_lwmutex::lv2_lwmutex(utils::serial& ar)
-	: protocol(ar)
-	, control(ar.pop<decltype(control)>())
-	, name(ar.pop<be_t<u64>>())
-{
-	ar(lv2_control.raw().signaled);
-}
-
-void lv2_lwmutex::save(utils::serial& ar)
-{
-	ar(protocol, control, name, lv2_control.raw().signaled);
-}
-
 error_code _sys_lwmutex_create(ppu_thread& ppu, vm::ptr<u32> lwmutex_id, u32 protocol, vm::ptr<sys_lwmutex_t> control, s32 has_name, u64 name)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_lwmutex.trace(u8"_sys_lwmutex_create(lwmutex_id=*0x%x, protocol=0x%x, control=*0x%x, has_name=0x%x, name=0x%llx (“%s”))", lwmutex_id, protocol, control, has_name, name, lv2_obj::name_64{std::bit_cast<be_t<u64>>(name)});
+	sys_lwmutex.warning(u8"_sys_lwmutex_create(lwmutex_id=*0x%x, protocol=0x%x, control=*0x%x, has_name=0x%x, name=0x%llx (“%s”))", lwmutex_id, protocol, control, has_name, name, lv2_obj::name64(std::bit_cast<be_t<u64>>(name)));
 
 	if (protocol != SYS_SYNC_FIFO && protocol != SYS_SYNC_RETRY && protocol != SYS_SYNC_PRIORITY)
 	{
@@ -42,7 +27,6 @@ error_code _sys_lwmutex_create(ppu_thread& ppu, vm::ptr<u32> lwmutex_id, u32 pro
 
 	if (const u32 id = idm::make<lv2_obj, lv2_lwmutex>(protocol, control, name))
 	{
-		ppu.check_state();
 		*lwmutex_id = id;
 		return CELL_OK;
 	}
@@ -54,9 +38,9 @@ error_code _sys_lwmutex_destroy(ppu_thread& ppu, u32 lwmutex_id)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_lwmutex.trace("_sys_lwmutex_destroy(lwmutex_id=0x%x)", lwmutex_id);
+	sys_lwmutex.warning("_sys_lwmutex_destroy(lwmutex_id=0x%x)", lwmutex_id);
 
-	shared_ptr<lv2_lwmutex> _mutex;
+	std::shared_ptr<lv2_lwmutex> _mutex;
 
 	while (true)
 	{
@@ -73,7 +57,7 @@ error_code _sys_lwmutex_destroy(ppu_thread& ppu, u32 lwmutex_id)
 
 			std::lock_guard lock(mutex.mutex);
 
-			if (mutex.load_sq())
+			if (!mutex.sq.empty())
 			{
 				return CELL_EBUSY;
 			}
@@ -118,7 +102,6 @@ error_code _sys_lwmutex_destroy(ppu_thread& ppu, u32 lwmutex_id)
 
 			if (ppu.is_stopped())
 			{
-				ppu.state += cpu_flag::again;
 				return {};
 			}
 
@@ -140,20 +123,29 @@ error_code _sys_lwmutex_lock(ppu_thread& ppu, u32 lwmutex_id, u64 timeout)
 
 	ppu.gpr[3] = CELL_OK;
 
-	const auto mutex = idm::get<lv2_obj, lv2_lwmutex>(lwmutex_id, [&, notify = lv2_obj::notify_all_t()](lv2_lwmutex& mutex)
+	const auto mutex = idm::get<lv2_obj, lv2_lwmutex>(lwmutex_id, [&](lv2_lwmutex& mutex)
 	{
-		if (s32 signal = mutex.lv2_control.fetch_op([](lv2_lwmutex::control_data_t& data)
+		if (mutex.signaled.try_dec(0))
 		{
-			if (data.signaled)
+			return true;
+		}
+
+		std::lock_guard lock(mutex.mutex);
+
+		auto [old, _] = mutex.signaled.fetch_op([](s32& value)
+		{
+			if (value)
 			{
-				data.signaled = 0;
+				value = 0;
 				return true;
 			}
 
 			return false;
-		}).first.signaled)
+		});
+
+		if (old)
 		{
-			if (~signal & 1)
+			if (old == smin)
 			{
 				ppu.gpr[3] = CELL_EBUSY;
 			}
@@ -161,34 +153,14 @@ error_code _sys_lwmutex_lock(ppu_thread& ppu, u32 lwmutex_id, u64 timeout)
 			return true;
 		}
 
-		lv2_obj::prepare_for_sleep(ppu);
-
-		ppu.cancel_sleep = 1;
-
-		if (s32 signal = mutex.try_own(&ppu))
-		{
-			if (~signal & 1)
-			{
-				ppu.gpr[3] = CELL_EBUSY;
-			}
-
-			ppu.cancel_sleep = 0;
-			return true;
-		}
-
-		const bool finished = !mutex.sleep(ppu, timeout);
-		notify.cleanup();
-		return finished;
+		mutex.add_waiter(&ppu);
+		mutex.sleep(ppu, timeout);
+		return false;
 	});
 
 	if (!mutex)
 	{
-		if (lwmutex_id >> 24 == lv2_lwmutex::id_base >> 24)
-		{
-			return { CELL_ESRCH, lwmutex_id };
-		}
-
-		return { CELL_ESRCH, "Invalid ID" };
+		return CELL_ESRCH;
 	}
 
 	if (mutex.ret)
@@ -196,37 +168,16 @@ error_code _sys_lwmutex_lock(ppu_thread& ppu, u32 lwmutex_id, u64 timeout)
 		return not_an_error(ppu.gpr[3]);
 	}
 
-	while (auto state = +ppu.state)
+	while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
 	{
-		if (state & cpu_flag::signal && ppu.state.test_and_reset(cpu_flag::signal))
-		{
-			break;
-		}
-
 		if (is_stopped(state))
 		{
-			std::lock_guard lock(mutex->mutex);
-
-			for (auto cpu = mutex->load_sq(); cpu; cpu = cpu->next_cpu)
-			{
-				if (cpu == &ppu)
-				{
-					ppu.state += cpu_flag::again;
-					return {};
-				}
-			}
-
-			break;
+			return {};
 		}
 
-		for (usz i = 0; cpu_flag::signal - ppu.state && i < 50; i++)
+		if (state & cpu_flag::signal)
 		{
-			busy_wait(500);
-		}
-
-		if (ppu.state & cpu_flag::signal)
- 		{
-			continue;
+			break;
 		}
 
 		if (timeout)
@@ -236,58 +187,23 @@ error_code _sys_lwmutex_lock(ppu_thread& ppu, u32 lwmutex_id, u64 timeout)
 				// Wait for rescheduling
 				if (ppu.check_state())
 				{
-					continue;
-				}
-
-				ppu.state += cpu_flag::wait;
-
-				if (!mutex->load_sq())
-				{
-					// Sleep queue is empty, so the thread must have been signaled
-					mutex->mutex.lock_unlock();
-					break;
+					return {};
 				}
 
 				std::lock_guard lock(mutex->mutex);
 
-				bool success = false;
-
-				mutex->lv2_control.fetch_op([&](lv2_lwmutex::control_data_t& data)
+				if (!mutex->unqueue(mutex->sq, &ppu))
 				{
-					success = false;
-
-					ppu_thread* sq = static_cast<ppu_thread*>(data.sq);
-
-					const bool retval = &ppu == sq;
-
-					if (!mutex->unqueue<false>(sq, &ppu))
-					{
-						return false;
-					}
-
-					success = true;
-
-					if (!retval)
-					{
-						return false;
-					}
-
-					data.sq = sq;
-					return true;
-				});
-
-				if (success)
-				{
-					ppu.next_cpu = nullptr;
-					ppu.gpr[3] = CELL_ETIMEDOUT;
+					break;
 				}
 
+				ppu.gpr[3] = CELL_ETIMEDOUT;
 				break;
 			}
 		}
 		else
 		{
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
 		}
 	}
 
@@ -302,11 +218,11 @@ error_code _sys_lwmutex_trylock(ppu_thread& ppu, u32 lwmutex_id)
 
 	const auto mutex = idm::check<lv2_obj, lv2_lwmutex>(lwmutex_id, [&](lv2_lwmutex& mutex)
 	{
-		auto [_, ok] = mutex.lv2_control.fetch_op([](lv2_lwmutex::control_data_t& data)
+		auto [_, ok] = mutex.signaled.fetch_op([](s32& value)
 		{
-			if (data.signaled & 1)
+			if (value & 1)
 			{
-				data.signaled = 0;
+				value = 0;
 				return true;
 			}
 
@@ -318,12 +234,7 @@ error_code _sys_lwmutex_trylock(ppu_thread& ppu, u32 lwmutex_id)
 
 	if (!mutex)
 	{
-		if (lwmutex_id >> 24 == lv2_lwmutex::id_base >> 24)
-		{
-			return { CELL_ESRCH, lwmutex_id };
-		}
-
-		return { CELL_ESRCH, "Invalid ID" };
+		return CELL_ESRCH;
 	}
 
 	if (!mutex.ret)
@@ -340,26 +251,17 @@ error_code _sys_lwmutex_unlock(ppu_thread& ppu, u32 lwmutex_id)
 
 	sys_lwmutex.trace("_sys_lwmutex_unlock(lwmutex_id=0x%x)", lwmutex_id);
 
-	const auto mutex = idm::check<lv2_obj, lv2_lwmutex>(lwmutex_id, [&, notify = lv2_obj::notify_all_t()](lv2_lwmutex& mutex)
+	const auto mutex = idm::check<lv2_obj, lv2_lwmutex>(lwmutex_id, [&](lv2_lwmutex& mutex)
 	{
-		if (mutex.try_unlock(false))
+		std::lock_guard lock(mutex.mutex);
+
+		if (const auto cpu = mutex.schedule<ppu_thread>(mutex.sq, mutex.protocol))
 		{
+			mutex.awake(cpu);
 			return;
 		}
 
-		std::lock_guard lock(mutex.mutex);
-
-		if (const auto cpu = mutex.reown<ppu_thread>())
-		{
-			if (static_cast<ppu_thread*>(cpu)->state & cpu_flag::again)
-			{
-				ppu.state += cpu_flag::again;
-				return;
-			}
-
-			mutex.awake(cpu);
-			notify.cleanup(); // lv2_lwmutex::mutex is not really active 99% of the time, can be ignored
-		}
+		mutex.signaled |= 1;
 	});
 
 	if (!mutex)
@@ -376,27 +278,18 @@ error_code _sys_lwmutex_unlock2(ppu_thread& ppu, u32 lwmutex_id)
 
 	sys_lwmutex.warning("_sys_lwmutex_unlock2(lwmutex_id=0x%x)", lwmutex_id);
 
-	const auto mutex = idm::check<lv2_obj, lv2_lwmutex>(lwmutex_id, [&, notify = lv2_obj::notify_all_t()](lv2_lwmutex& mutex)
+	const auto mutex = idm::check<lv2_obj, lv2_lwmutex>(lwmutex_id, [&](lv2_lwmutex& mutex)
 	{
-		if (mutex.try_unlock(true))
+		std::lock_guard lock(mutex.mutex);
+
+		if (const auto cpu = mutex.schedule<ppu_thread>(mutex.sq, mutex.protocol))
 		{
+			static_cast<ppu_thread*>(cpu)->gpr[3] = CELL_EBUSY;
+			mutex.awake(cpu);
 			return;
 		}
 
-		std::lock_guard lock(mutex.mutex);
-
-		if (const auto cpu = mutex.reown<ppu_thread>(true))
-		{
-			if (static_cast<ppu_thread*>(cpu)->state & cpu_flag::again)
-			{
-				ppu.state += cpu_flag::again;
-				return;
-			}
-
-			static_cast<ppu_thread*>(cpu)->gpr[3] = CELL_EBUSY;
-			mutex.awake(cpu);
-			notify.cleanup(); // lv2_lwmutex::mutex is not really active 99% of the time, can be ignored
-		}
+		mutex.signaled |= smin;
 	});
 
 	if (!mutex)
diff --git a/rpcs3/Emu/Cell/lv2/sys_lwmutex.h b/rpcs3/Emu/Cell/lv2/sys_lwmutex.h
index 5a97fbae1b..cf853eb00e 100644
--- a/rpcs3/Emu/Cell/lv2/sys_lwmutex.h
+++ b/rpcs3/Emu/Cell/lv2/sys_lwmutex.h
@@ -60,17 +60,10 @@ struct lv2_lwmutex final : lv2_obj
 	const be_t<u64> name;
 
 	shared_mutex mutex;
+	atomic_t<s32> signaled{0};
+	std::deque<cpu_thread*> sq;
 	atomic_t<s32> lwcond_waiters{0};
 
-	struct alignas(16) control_data_t
-	{
-		s32 signaled{0};
-		u32 reserved{};
-		ppu_thread* sq{};
-	};
-
-	atomic_t<control_data_t> lv2_control{};
-
 	lv2_lwmutex(u32 protocol, vm::ptr<sys_lwmutex_t> control, u64 name) noexcept
 		: protocol{static_cast<u8>(protocol)}
 		, control(control)
@@ -78,118 +71,30 @@ struct lv2_lwmutex final : lv2_obj
 	{
 	}
 
-	lv2_lwmutex(utils::serial& ar);
-	void save(utils::serial& ar);
-
-	ppu_thread* load_sq() const
+	// Add a waiter
+	void add_waiter(cpu_thread* cpu)
 	{
-		return atomic_storage<ppu_thread*>::load(lv2_control.raw().sq);
-	}
-
-	template <typename T>
-	s32 try_own(T* cpu, bool wait_only = false)
-	{
-		const s32 signal = lv2_control.fetch_op([&](control_data_t& data)
+		const bool notify = lwcond_waiters.fetch_op([](s32& val)
 		{
-			if (!data.signaled)
+			if (val + 0u <= 1u << 31)
 			{
-				cpu->prio.atomic_op([tag = ++g_priority_order_tag](std::common_type_t<decltype(T::prio)>& prio)
-				{
-					prio.order = tag;
-				});
-
-				cpu->next_cpu = data.sq;
-				data.sq = cpu;
+				// Value was either positive or INT32_MIN
+				return false;
 			}
-			else
-			{
-				ensure(!wait_only);
-				data.signaled = 0;
-			}
-		}).signaled;
 
-		if (signal)
+			// lwmutex was set to be destroyed, but there are lwcond waiters
+			// Turn off the "lwcond_waiters notification" bit as we are adding an lwmutex waiter
+			val &= 0x7fff'ffff;
+			return true;
+		}).second;
+
+		sq.emplace_back(cpu);
+
+		if (notify)
 		{
-			cpu->next_cpu = nullptr;
+			// Notify lwmutex destroyer (may cause EBUSY to be returned for it)
+			lwcond_waiters.notify_all();
 		}
-		else
-		{
-			const bool notify = lwcond_waiters.fetch_op([](s32& val)
-			{
-				if (val + 0u <= 1u << 31)
-				{
-					// Value was either positive or INT32_MIN
-					return false;
-				}
-
-				// lwmutex was set to be destroyed, but there are lwcond waiters
-				// Turn off the "lwcond_waiters notification" bit as we are adding an lwmutex waiter
-				val &= 0x7fff'ffff;
-				return true;
-			}).second;
-
-			if (notify)
-			{
-				// Notify lwmutex destroyer (may cause EBUSY to be returned for it)
-				lwcond_waiters.notify_all();
-			}
-		}
-
-		return signal;
-	}
-
-	bool try_unlock(bool unlock2)
-	{
-		if (!load_sq())
-		{
-			control_data_t old{};
-			old.signaled = atomic_storage<s32>::load(lv2_control.raw().signaled);
-			control_data_t store = old;
-			store.signaled |= (unlock2 ? s32{smin} : 1);
-
-			if (lv2_control.compare_exchange(old, store))
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	template <typename T>
-	T* reown(bool unlock2 = false)
-	{
-		T* res = nullptr;
-
-		lv2_control.fetch_op([&](control_data_t& data)
-		{
-			res = nullptr;
-
-			if (auto sq = static_cast<T*>(data.sq))
-			{
-				res = schedule<T>(data.sq, protocol, false);
-
-				if (sq == data.sq)
-				{
-					return false;
-				}
-
-				return true;
-			}
-			else
-			{
-				data.signaled |= (unlock2 ? s32{smin} : 1);
-				return true;
-			}
-		});
-
-		if (res && cpu_flag::again - res->state)
-		{
-			// Detach manually (fetch_op can fail, so avoid side-effects on the first node in this case)
-			res->next_cpu = nullptr;
-		}
-
-		return res;
 	}
 };
 
diff --git a/rpcs3/Emu/Cell/lv2/sys_memory.cpp b/rpcs3/Emu/Cell/lv2/sys_memory.cpp
index 9f726e994d..a4aa6ca254 100644
--- a/rpcs3/Emu/Cell/lv2/sys_memory.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_memory.cpp
@@ -7,95 +7,28 @@
 #include "Emu/Cell/SPUThread.h"
 #include "Emu/IdManager.h"
 
+#include "util/vm.hpp"
 #include "util/asm.hpp"
 
 LOG_CHANNEL(sys_memory);
 
-//
-static shared_mutex s_memstats_mtx;
-
 lv2_memory_container::lv2_memory_container(u32 size, bool from_idm) noexcept
 	: size(size)
 	, id{from_idm ? idm::last_id() : SYS_MEMORY_CONTAINER_ID_INVALID}
 {
 }
 
-lv2_memory_container::lv2_memory_container(utils::serial& ar, bool from_idm) noexcept
-	: size(ar)
-	, id{from_idm ? idm::last_id() : SYS_MEMORY_CONTAINER_ID_INVALID}
-	, used(ar)
-{
-}
-
-std::function<void(void*)> lv2_memory_container::load(utils::serial& ar)
-{
-	// Use idm::last_id() only for the instances at IDM
-	return [ptr = make_shared<lv2_memory_container>(stx::exact_t<utils::serial&>(ar), true)](void* storage)
-	{
-		*static_cast<atomic_ptr<lv2_memory_container>*>(storage) = ptr;
-	};
-}
-
-void lv2_memory_container::save(utils::serial& ar)
-{
-	ar(size, used);
-}
-
-lv2_memory_container* lv2_memory_container::search(u32 id)
-{
-	if (id != SYS_MEMORY_CONTAINER_ID_INVALID)
-	{
-		return idm::check_unlocked<lv2_memory_container>(id);
-	}
-
-	return &g_fxo->get<lv2_memory_container>();
-}
+//
+static shared_mutex s_memstats_mtx;
 
 struct sys_memory_address_table
 {
 	atomic_t<lv2_memory_container*> addrs[65536]{};
-
-	sys_memory_address_table() = default;
-
-	SAVESTATE_INIT_POS(id_manager::id_map<lv2_memory_container>::savestate_init_pos + 0.1);
-
-	sys_memory_address_table(utils::serial& ar)
-	{
-		// First: address, second: conatiner ID (SYS_MEMORY_CONTAINER_ID_INVALID for global FXO memory container)
-		std::unordered_map<u16, u32> mm;
-		ar(mm);
-
-		for (const auto& [addr, id] : mm)
-		{
-			addrs[addr] = ensure(lv2_memory_container::search(id));
-		}
-	}
-
-	void save(utils::serial& ar)
-	{
-		std::unordered_map<u16, u32> mm;
-
-		for (auto& ctr : addrs)
-		{
-			if (const auto ptr = +ctr)
-			{
-				mm[static_cast<u16>(&ctr - addrs)] = ptr->id;
-			}
-		}
-
-		ar(mm);
-	}
 };
 
-std::shared_ptr<vm::block_t> reserve_map(u32 alloc_size, u32 align)
-{
-	return vm::reserve_map(align == 0x10000 ? vm::user64k : vm::user1m, 0, align == 0x10000 ? 0x20000000 : utils::align(alloc_size, 0x10000000)
-		, align == 0x10000 ? (vm::page_size_64k | vm::bf0_0x1) : (vm::page_size_1m | vm::bf0_0x1));
-}
-
 // Todo: fix order of error checks
 
-error_code sys_memory_allocate(cpu_thread& cpu, u64 size, u64 flags, vm::ptr<u32> alloc_addr)
+error_code sys_memory_allocate(cpu_thread& cpu, u32 size, u64 flags, vm::ptr<u32> alloc_addr)
 {
 	cpu.state += cpu_flag::wait;
 
@@ -128,21 +61,18 @@ error_code sys_memory_allocate(cpu_thread& cpu, u64 size, u64 flags, vm::ptr<u32
 	// Try to get "physical memory"
 	if (!dct.take(size))
 	{
-		return {CELL_ENOMEM, dct.size - dct.used};
+		return CELL_ENOMEM;
 	}
 
-	if (const auto area = reserve_map(static_cast<u32>(size), align))
+	if (const auto area = vm::reserve_map(align == 0x10000 ? vm::user64k : vm::user1m, 0, utils::align(size, 0x10000000), 0x401))
 	{
-		if (const u32 addr = area->alloc(static_cast<u32>(size), nullptr, align))
+		if (const u32 addr = area->alloc(size, nullptr, align))
 		{
 			ensure(!g_fxo->get<sys_memory_address_table>().addrs[addr >> 16].exchange(&dct));
 
 			if (alloc_addr)
 			{
-				sys_memory.notice("sys_memory_allocate(): Allocated 0x%x address (size=0x%x)", addr, size);
-
-				vm::lock_sudo(addr, static_cast<u32>(size));
-				cpu.check_state();
+				vm::lock_sudo(addr, size);
 				*alloc_addr = addr;
 				return CELL_OK;
 			}
@@ -153,11 +83,11 @@ error_code sys_memory_allocate(cpu_thread& cpu, u64 size, u64 flags, vm::ptr<u32
 		}
 	}
 
-	dct.free(size);
+	dct.used -= size;
 	return CELL_ENOMEM;
 }
 
-error_code sys_memory_allocate_from_container(cpu_thread& cpu, u64 size, u32 cid, u64 flags, vm::ptr<u32> alloc_addr)
+error_code sys_memory_allocate_from_container(cpu_thread& cpu, u32 size, u32 cid, u64 flags, vm::ptr<u32> alloc_addr)
 {
 	cpu.state += cpu_flag::wait;
 
@@ -202,19 +132,18 @@ error_code sys_memory_allocate_from_container(cpu_thread& cpu, u64 size, u32 cid
 
 	if (ct.ret)
 	{
-		return {ct.ret, ct->size - ct->used};
+		return ct.ret;
 	}
 
-	if (const auto area = reserve_map(static_cast<u32>(size), align))
+	if (const auto area = vm::reserve_map(align == 0x10000 ? vm::user64k : vm::user1m, 0, utils::align(size, 0x10000000), 0x401))
 	{
-		if (const u32 addr = area->alloc(static_cast<u32>(size)))
+		if (const u32 addr = area->alloc(size))
 		{
 			ensure(!g_fxo->get<sys_memory_address_table>().addrs[addr >> 16].exchange(ct.ptr.get()));
 
 			if (alloc_addr)
 			{
-				vm::lock_sudo(addr, static_cast<u32>(size));
-				cpu.check_state();
+				vm::lock_sudo(addr, size);
 				*alloc_addr = addr;
 				return CELL_OK;
 			}
@@ -225,7 +154,7 @@ error_code sys_memory_allocate_from_container(cpu_thread& cpu, u64 size, u32 cid
 		}
 	}
 
-	ct->free(size);
+	ct->used -= size;
 	return CELL_ENOMEM;
 }
 
@@ -243,7 +172,7 @@ error_code sys_memory_free(cpu_thread& cpu, u32 addr)
 	}
 
 	const auto size = (ensure(vm::dealloc(addr)));
-	reader_lock{id_manager::g_mutex}, ct->free(size);
+	reader_lock{id_manager::g_mutex}, ct->used -= size;
 	return CELL_OK;
 }
 
@@ -253,7 +182,7 @@ error_code sys_memory_get_page_attribute(cpu_thread& cpu, u32 addr, vm::ptr<sys_
 
 	sys_memory.trace("sys_memory_get_page_attribute(addr=0x%x, attr=*0x%x)", addr, attr);
 
-	vm::writer_lock rlock;
+	vm::reader_lock rlock;
 
 	if (!vm::check_addr(addr) || addr >= SPU_FAKE_BASE_ADDR)
 	{
@@ -294,22 +223,17 @@ error_code sys_memory_get_user_memory_size(cpu_thread& cpu, vm::ptr<sys_memory_i
 	// Get "default" memory container
 	auto& dct = g_fxo->get<lv2_memory_container>();
 
-	sys_memory_info_t out{};
+	::reader_lock lock(s_memstats_mtx);
+
+	mem_info->total_user_memory = dct.size;
+	mem_info->available_user_memory = dct.size - dct.used;
+
+	// Scan other memory containers
+	idm::select<lv2_memory_container>([&](u32, lv2_memory_container& ct)
 	{
-		::reader_lock lock(s_memstats_mtx);
+		mem_info->total_user_memory -= ct.size;
+	});
 
-		out.total_user_memory = dct.size;
-		out.available_user_memory = dct.size - dct.used;
-
-		// Scan other memory containers
-		idm::select<lv2_memory_container>([&](u32, lv2_memory_container& ct)
-		{
-			out.total_user_memory -= ct.size;
-		});
-	}
-
-	cpu.check_state();
-	*mem_info = out;
 	return CELL_OK;
 }
 
@@ -322,7 +246,7 @@ error_code sys_memory_get_user_memory_stat(cpu_thread& cpu, vm::ptr<sys_memory_u
 	return CELL_OK;
 }
 
-error_code sys_memory_container_create(cpu_thread& cpu, vm::ptr<u32> cid, u64 size)
+error_code sys_memory_container_create(cpu_thread& cpu, vm::ptr<u32> cid, u32 size)
 {
 	cpu.state += cpu_flag::wait;
 
@@ -347,14 +271,13 @@ error_code sys_memory_container_create(cpu_thread& cpu, vm::ptr<u32> cid, u64 si
 	}
 
 	// Create the memory container
-	if (const u32 id = idm::make<lv2_memory_container>(static_cast<u32>(size), true))
+	if (const u32 id = idm::make<lv2_memory_container>(size, true))
 	{
-		cpu.check_state();
 		*cid = id;
 		return CELL_OK;
 	}
 
-	dct.free(size);
+	dct.used -= size;
 	return CELL_EAGAIN;
 }
 
@@ -388,7 +311,7 @@ error_code sys_memory_container_destroy(cpu_thread& cpu, u32 cid)
 	}
 
 	// Return "physical memory" to the default container
-	g_fxo->get<lv2_memory_container>().free(ct->size);
+	g_fxo->get<lv2_memory_container>().used -= ct->size;
 
 	return CELL_OK;
 }
@@ -399,30 +322,15 @@ error_code sys_memory_container_get_size(cpu_thread& cpu, vm::ptr<sys_memory_inf
 
 	sys_memory.warning("sys_memory_container_get_size(mem_info=*0x%x, cid=0x%x)", mem_info, cid);
 
-	const auto ct = idm::get_unlocked<lv2_memory_container>(cid);
+	const auto ct = idm::get<lv2_memory_container>(cid);
 
 	if (!ct)
 	{
 		return CELL_ESRCH;
 	}
 
-	cpu.check_state();
 	mem_info->total_user_memory = ct->size; // Total container memory
 	mem_info->available_user_memory = ct->size - ct->used; // Available container memory
 
 	return CELL_OK;
 }
-
-error_code sys_memory_container_destroy_parent_with_childs(cpu_thread& cpu, u32 cid, u32 must_0, vm::ptr<u32> mc_child)
-{
-	sys_memory.warning("sys_memory_container_destroy_parent_with_childs(cid=0x%x, must_0=%d, mc_child=*0x%x)", cid, must_0, mc_child);
-
-	if (must_0)
-	{
-		return CELL_EINVAL;
-	}
-
-	// Multi-process is not supported yet so child containers mean nothing at the moment
-	// Simply destroy parent
-	return sys_memory_container_destroy(cpu, cid);
-}
diff --git a/rpcs3/Emu/Cell/lv2/sys_memory.h b/rpcs3/Emu/Cell/lv2/sys_memory.h
index c2ca046bcc..dadffe9da8 100644
--- a/rpcs3/Emu/Cell/lv2/sys_memory.h
+++ b/rpcs3/Emu/Cell/lv2/sys_memory.h
@@ -70,13 +70,7 @@ struct lv2_memory_container
 	const lv2_mem_container_id id; // ID of the container in if placed at IDM, otherwise SYS_MEMORY_CONTAINER_ID_INVALID
 	atomic_t<u32> used{}; // Amount of "physical" memory currently used
 
-	SAVESTATE_INIT_POS(1);
-
 	lv2_memory_container(u32 size, bool from_idm = false) noexcept;
-	lv2_memory_container(utils::serial& ar, bool from_idm = false) noexcept;
-	static std::function<void(void*)> load(utils::serial& ar);
-	void save(utils::serial& ar);
-	static lv2_memory_container* search(u32 id);
 
 	// Try to get specified amount of "physical" memory
 	// Values greater than UINT32_MAX will fail
@@ -95,25 +89,6 @@ struct lv2_memory_container
 
 		return result;
 	}
-
-	u32 free(u64 amount)
-	{
-		auto [_, result] = used.fetch_op([&](u32& value) -> u32
-		{
-			if (value >= amount)
-			{
-				value -= static_cast<u32>(amount);
-				return static_cast<u32>(amount);
-			}
-
-			return 0;
-		});
-
-		// Sanity check
-		ensure(result == amount);
-
-		return result;
-	}
 };
 
 struct sys_memory_user_memory_stat_t
@@ -128,13 +103,12 @@ struct sys_memory_user_memory_stat_t
 };
 
 // SysCalls
-error_code sys_memory_allocate(cpu_thread& cpu, u64 size, u64 flags, vm::ptr<u32> alloc_addr);
-error_code sys_memory_allocate_from_container(cpu_thread& cpu, u64 size, u32 cid, u64 flags, vm::ptr<u32> alloc_addr);
+error_code sys_memory_allocate(cpu_thread& cpu, u32 size, u64 flags, vm::ptr<u32> alloc_addr);
+error_code sys_memory_allocate_from_container(cpu_thread& cpu, u32 size, u32 cid, u64 flags, vm::ptr<u32> alloc_addr);
 error_code sys_memory_free(cpu_thread& cpu, u32 start_addr);
 error_code sys_memory_get_page_attribute(cpu_thread& cpu, u32 addr, vm::ptr<sys_page_attr_t> attr);
 error_code sys_memory_get_user_memory_size(cpu_thread& cpu, vm::ptr<sys_memory_info_t> mem_info);
 error_code sys_memory_get_user_memory_stat(cpu_thread& cpu, vm::ptr<sys_memory_user_memory_stat_t> mem_stat);
-error_code sys_memory_container_create(cpu_thread& cpu, vm::ptr<u32> cid, u64 size);
+error_code sys_memory_container_create(cpu_thread& cpu, vm::ptr<u32> cid, u32 size);
 error_code sys_memory_container_destroy(cpu_thread& cpu, u32 cid);
 error_code sys_memory_container_get_size(cpu_thread& cpu, vm::ptr<sys_memory_info_t> mem_info, u32 cid);
-error_code sys_memory_container_destroy_parent_with_childs(cpu_thread& cpu, u32 cid, u32 must_0, vm::ptr<u32> mc_child);
diff --git a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp
index d7b66adfd8..b1f375f7f0 100644
--- a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp
@@ -8,8 +8,6 @@
 #include "sys_sync.h"
 #include "sys_process.h"
 
-#include <span>
-
 #include "util/vm.hpp"
 
 LOG_CHANNEL(sys_mmapper);
@@ -36,35 +34,18 @@ lv2_memory::lv2_memory(u32 size, u32 align, u64 flags, u64 key, bool pshared, lv
 	, key(key)
 	, pshared(pshared)
 	, ct(ct)
-	, shm(null_ptr)
-{
-}
-
-lv2_memory::lv2_memory(utils::serial& ar)
-	: size(ar)
-	, align(ar)
-	, flags(ar)
-	, key(ar)
-	, pshared(ar)
-	, ct(lv2_memory_container::search(ar.pop<u32>()))
-	, shm([&](u32 addr) -> shared_ptr<std::shared_ptr<utils::shm>>
-	{
-		if (addr)
-		{
-			return make_single_value(ensure(vm::get(vm::any, addr)->peek(addr).second));
-		}
-
-		return null_ptr;
-	}(ar.pop<u32>()))
-	, counter(ar)
+	, shm(std::make_shared<utils::shm>(size, 1 /* shareable flag */))
 {
+#ifndef _WIN32
+	// Optimization that's useless on Windows :puke:
+	utils::memory_lock(shm->map_self(), size);
+#endif
 }
 
 CellError lv2_memory::on_id_create()
 {
 	if (!exists && !ct->take(size))
 	{
-		sys_mmapper.error("lv2_memory::on_id_create(): Cannot allocate 0x%x bytes (0x%x available)", size, ct->size - ct->used);
 		return CELL_ENOMEM;
 	}
 
@@ -72,34 +53,6 @@ CellError lv2_memory::on_id_create()
 	return {};
 }
 
-std::function<void(void*)> lv2_memory::load(utils::serial& ar)
-{
-	auto mem = make_shared<lv2_memory>(stx::exact_t<utils::serial&>(ar));
-	mem->exists++; // Disable on_id_create()
-	auto func = load_func(mem, +mem->pshared);
-	mem->exists--;
-	return func;
-}
-
-void lv2_memory::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(lv2_memory);
-
-	ar(size, align, flags, key, pshared, ct->id);
-	ar(counter ? vm::get_shm_addr(*shm.load()) : 0);
-	ar(counter);
-}
-
-page_fault_notification_entries::page_fault_notification_entries(utils::serial& ar)
-{
-	ar(entries);
-}
-
-void page_fault_notification_entries::save(utils::serial& ar)
-{
-	ar(entries);
-}
-
 template <bool exclusive = false>
 error_code create_lv2_shm(bool pshared, u64 ipc_key, u64 size, u32 align, u64 flags, lv2_memory_container* ct)
 {
@@ -112,7 +65,7 @@ error_code create_lv2_shm(bool pshared, u64 ipc_key, u64 size, u32 align, u64 fl
 
 	if (auto error = lv2_obj::create<lv2_memory>(_pshared, ipc_key, exclusive ? SYS_SYNC_NEWLY_CREATED : SYS_SYNC_NOT_CARE, [&]()
 	{
-		return make_shared<lv2_memory>(
+		return std::make_shared<lv2_memory>(
 			static_cast<u32>(size),
 			align,
 			flags,
@@ -159,9 +112,6 @@ error_code sys_mmapper_allocate_address(ppu_thread& ppu, u64 size, u64 flags, u6
 	{
 		if (const auto area = vm::find_map(static_cast<u32>(size), static_cast<u32>(alignment), flags & SYS_MEMORY_PAGE_SIZE_MASK))
 		{
-			sys_mmapper.warning("sys_mmapper_allocate_address(): Found VM 0x%x area (vsize=0x%x)", area->addr, size);
-
-			ppu.check_state();
 			*alloc_addr = area->addr;
 			return CELL_OK;
 		}
@@ -234,7 +184,6 @@ error_code sys_mmapper_allocate_shared_memory(ppu_thread& ppu, u64 ipc_key, u64
 		return error;
 	}
 
-	ppu.check_state();
 	*mem_id = idm::last_id();
 	return CELL_OK;
 }
@@ -278,7 +227,7 @@ error_code sys_mmapper_allocate_shared_memory_from_container(ppu_thread& ppu, u6
 	}
 	}
 
-	const auto ct = idm::get_unlocked<lv2_memory_container>(cid);
+	const auto ct = idm::get<lv2_memory_container>(cid);
 
 	if (!ct)
 	{
@@ -290,7 +239,6 @@ error_code sys_mmapper_allocate_shared_memory_from_container(ppu_thread& ppu, u6
 		return error;
 	}
 
-	ppu.check_state();
 	*mem_id = idm::last_id();
 	return CELL_OK;
 }
@@ -389,7 +337,6 @@ error_code sys_mmapper_allocate_shared_memory_ext(ppu_thread& ppu, u64 ipc_key,
 		return error;
 	}
 
-	ppu.check_state();
 	*mem_id = idm::last_id();
 	return CELL_OK;
 }
@@ -475,7 +422,7 @@ error_code sys_mmapper_allocate_shared_memory_from_container_ext(ppu_thread& ppu
 		}
 	}
 
-	const auto ct = idm::get_unlocked<lv2_memory_container>(cid);
+	const auto ct = idm::get<lv2_memory_container>(cid);
 
 	if (!ct)
 	{
@@ -487,7 +434,6 @@ error_code sys_mmapper_allocate_shared_memory_from_container_ext(ppu_thread& ppu
 		return error;
 	}
 
-	ppu.check_state();
 	*mem_id = idm::last_id();
 	return CELL_OK;
 }
@@ -516,30 +462,24 @@ error_code sys_mmapper_free_address(ppu_thread& ppu, u32 addr)
 	auto& pf_events = g_fxo->get<page_fault_event_entries>();
 	std::lock_guard pf_lock(pf_events.pf_mutex);
 
-	const auto mem = vm::get(vm::any, addr);
-
-	if (!mem || mem->addr != addr)
-	{
-		return {CELL_EINVAL, addr};
-	}
-
 	for (const auto& ev : pf_events.events)
 	{
-		if (addr <= ev.second && ev.second <= addr + mem->size - 1)
+		auto mem = vm::get(vm::any, addr);
+		if (mem && addr <= ev.second && ev.second <= addr + mem->size - 1)
 		{
 			return CELL_EBUSY;
 		}
 	}
 
 	// Try to unmap area
-	const auto [area, success] = vm::unmap(addr, true, &mem);
+	const auto area = vm::unmap(addr, true);
 
 	if (!area)
 	{
 		return {CELL_EINVAL, addr};
 	}
 
-	if (!success)
+	if (area.use_count() != 1)
 	{
 		return CELL_EBUSY;
 	}
@@ -583,7 +523,7 @@ error_code sys_mmapper_free_shared_memory(ppu_thread& ppu, u32 mem_id)
 		if (!mem.exists)
 		{
 			// Return "physical memory" to the memory container
-			mem.ct->free(mem.size);
+			mem.ct->used -= mem.size;
 		}
 
 		return {};
@@ -629,22 +569,6 @@ error_code sys_mmapper_map_shared_memory(ppu_thread& ppu, u32 addr, u32 mem_id,
 			return CELL_EALIGN;
 		}
 
-		for (stx::shared_ptr<std::shared_ptr<utils::shm>> to_insert, null; !mem.shm;)
-		{
-			// Insert atomically the memory handle (laziliy allocated)
-			if (!to_insert)
-			{
-				to_insert = make_single_value(std::make_shared<utils::shm>(mem.size, 1 /* shareable flag */));
-			}
-
-			null.reset();
-
-			if (mem.shm.compare_exchange(null, to_insert))
-			{
-				break;
-			}
-		}
-
 		mem.counter++;
 		return {};
 	});
@@ -659,17 +583,9 @@ error_code sys_mmapper_map_shared_memory(ppu_thread& ppu, u32 addr, u32 mem_id,
 		return mem.ret;
 	}
 
-	auto shm_ptr = *mem->shm.load();
-
-	if (!area->falloc(addr, mem->size, &shm_ptr, mem->align == 0x10000 ? SYS_MEMORY_PAGE_SIZE_64K : SYS_MEMORY_PAGE_SIZE_1M))
+	if (!area->falloc(addr, mem->size, &mem->shm, mem->align == 0x10000 ? SYS_MEMORY_PAGE_SIZE_64K : SYS_MEMORY_PAGE_SIZE_1M))
 	{
 		mem->counter--;
-
-		if (!area->is_valid())
-		{
-			return {CELL_EINVAL, addr};
-		}
-
 		return CELL_EBUSY;
 	}
 
@@ -699,22 +615,6 @@ error_code sys_mmapper_search_and_map(ppu_thread& ppu, u32 start_addr, u32 mem_i
 			return CELL_EALIGN;
 		}
 
-		for (stx::shared_ptr<std::shared_ptr<utils::shm>> to_insert, null; !mem.shm;)
-		{
-			// Insert atomically the memory handle (laziliy allocated)
-			if (!to_insert)
-			{
-				to_insert = make_single_value(std::make_shared<utils::shm>(mem.size, 1 /* shareable flag */));
-			}
-
-			null.reset();
-
-			if (mem.shm.compare_exchange(null, to_insert))
-			{
-				break;
-			}
-		}
-
 		mem.counter++;
 		return {};
 	});
@@ -729,26 +629,15 @@ error_code sys_mmapper_search_and_map(ppu_thread& ppu, u32 start_addr, u32 mem_i
 		return mem.ret;
 	}
 
-	auto shm_ptr = *mem->shm.load();
-
-	const u32 addr = area->alloc(mem->size, &shm_ptr, mem->align, mem->align == 0x10000 ? SYS_MEMORY_PAGE_SIZE_64K : SYS_MEMORY_PAGE_SIZE_1M);
+	const u32 addr = area->alloc(mem->size, &mem->shm, mem->align, mem->align == 0x10000 ? SYS_MEMORY_PAGE_SIZE_64K : SYS_MEMORY_PAGE_SIZE_1M);
 
 	if (!addr)
 	{
 		mem->counter--;
-
-		if (!area->is_valid())
-		{
-			return {CELL_EINVAL, start_addr};
-		}
-
 		return CELL_ENOMEM;
 	}
 
-	sys_mmapper.notice("sys_mmapper_search_and_map(): Found 0x%x address", addr);
-
 	vm::lock_sudo(addr, mem->size);
-	ppu.check_state();
 	*alloc_addr = addr;
 	return CELL_OK;
 }
@@ -775,7 +664,7 @@ error_code sys_mmapper_unmap_shared_memory(ppu_thread& ppu, u32 addr, vm::ptr<u3
 
 	const auto mem = idm::select<lv2_obj, lv2_memory>([&](u32 id, lv2_memory& mem) -> u32
 	{
-		if (auto shm0 = mem.shm.load(); shm0 && shm0->get() == shm.second.get())
+		if (mem.shm.get() == shm.second.get())
 		{
 			return id;
 		}
@@ -794,7 +683,6 @@ error_code sys_mmapper_unmap_shared_memory(ppu_thread& ppu, u32 addr, vm::ptr<u3
 	}
 
 	// Write out the ID
-	ppu.check_state();
 	*mem_id = mem.ret;
 
 	// Acknowledge
@@ -817,7 +705,7 @@ error_code sys_mmapper_enable_page_fault_notification(ppu_thread& ppu, u32 start
 
 	// TODO: Check memory region's flags to make sure the memory can be used for page faults.
 
-	auto queue = idm::get_unlocked<lv2_obj, lv2_event_queue>(event_queue_id);
+	auto queue = idm::get<lv2_obj, lv2_event_queue>(event_queue_id);
 
 	if (!queue)
 	{ // Can't connect the queue if it doesn't exist.
@@ -870,20 +758,16 @@ error_code mmapper_thread_recover_page_fault(cpu_thread* cpu)
 		}
 
 		pf_events.events.erase(pf_event_ind);
-
-		if (cpu->get_class() == thread_class::ppu)
-		{
-			lv2_obj::awake(cpu);
-		}
-		else
-		{
-			cpu->state += cpu_flag::signal;
-		}
 	}
 
-	if (cpu->state & cpu_flag::signal)
+	if (cpu->id_type() == 1u)
 	{
-		cpu->state.notify_one();
+		lv2_obj::awake(cpu);
+	}
+	else
+	{
+		cpu->state += cpu_flag::signal;
+		cpu->state.notify_one(cpu_flag::signal);
 	}
 
 	return CELL_OK;
diff --git a/rpcs3/Emu/Cell/lv2/sys_mmapper.h b/rpcs3/Emu/Cell/lv2/sys_mmapper.h
index aec727840f..a34119f784 100644
--- a/rpcs3/Emu/Cell/lv2/sys_mmapper.h
+++ b/rpcs3/Emu/Cell/lv2/sys_mmapper.h
@@ -5,8 +5,6 @@
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/ErrorCodes.h"
 
-#include "util/shared_ptr.hpp"
-
 #include <vector>
 
 struct lv2_memory_container;
@@ -26,16 +24,12 @@ struct lv2_memory : lv2_obj
 	const u64 key; // IPC key
 	const bool pshared; // Process shared flag
 	lv2_memory_container* const ct; // Associated memory container
-	atomic_ptr<std::shared_ptr<utils::shm>> shm;
+	const std::shared_ptr<utils::shm> shm;
 
 	atomic_t<u32> counter{0};
 
 	lv2_memory(u32 size, u32 align, u64 flags, u64 key, bool pshared, lv2_memory_container* ct);
 
-	lv2_memory(utils::serial& ar);
-	static std::function<void(void*)> load(utils::serial& ar);
-	void save(utils::serial& ar);
-
 	CellError on_id_create();
 };
 
@@ -60,8 +54,6 @@ enum : u64
 
 struct page_fault_notification_entry
 {
-	ENABLE_BITWISE_SERIALIZATION;
-
 	u32 start_addr; // Starting address of region to monitor.
 	u32 event_queue_id; // Queue to be notified.
 	u32 port_id; // Port used to notify the queue.
@@ -72,12 +64,6 @@ struct page_fault_notification_entries
 {
 	std::vector<page_fault_notification_entry> entries;
 	shared_mutex mutex;
-
-	SAVESTATE_INIT_POS(44);
-
-	page_fault_notification_entries() = default;
-	page_fault_notification_entries(utils::serial& ar);
-	void save(utils::serial& ar);
 };
 
 struct page_fault_event_entries
diff --git a/rpcs3/Emu/Cell/lv2/sys_mutex.cpp b/rpcs3/Emu/Cell/lv2/sys_mutex.cpp
index 92bf877a8a..f4dfd002ac 100644
--- a/rpcs3/Emu/Cell/lv2/sys_mutex.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_mutex.cpp
@@ -1,44 +1,19 @@
 #include "stdafx.h"
+#include "sys_mutex.h"
 
 #include "Emu/IdManager.h"
+#include "Emu/IPC.h"
 
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
 
-#include "util/asm.hpp"
-
-#include "sys_mutex.h"
-
 LOG_CHANNEL(sys_mutex);
 
-lv2_mutex::lv2_mutex(utils::serial& ar)
-	: protocol(ar)
-	, recursive(ar)
-	, adaptive(ar)
-	, key(ar)
-	, name(ar)
-{
-	ar(lock_count, control.raw().owner);
-
-	// For backwards compatibility
-	control.raw().owner >>= 1;
-}
-
-std::function<void(void*)> lv2_mutex::load(utils::serial& ar)
-{
-	return load_func(make_shared<lv2_mutex>(stx::exact_t<utils::serial&>(ar)));
-}
-
-void lv2_mutex::save(utils::serial& ar)
-{
-	ar(protocol, recursive, adaptive, key, name, lock_count, control.raw().owner << 1);
-}
-
 error_code sys_mutex_create(ppu_thread& ppu, vm::ptr<u32> mutex_id, vm::ptr<sys_mutex_attribute_t> attr)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_mutex.trace("sys_mutex_create(mutex_id=*0x%x, attr=*0x%x)", mutex_id, attr);
+	sys_mutex.warning("sys_mutex_create(mutex_id=*0x%x, attr=*0x%x)", mutex_id, attr);
 
 	if (!mutex_id || !attr)
 	{
@@ -47,13 +22,6 @@ error_code sys_mutex_create(ppu_thread& ppu, vm::ptr<u32> mutex_id, vm::ptr<sys_
 
 	const auto _attr = *attr;
 
-	const u64 ipc_key = lv2_obj::get_key(_attr);
-
-	if (ipc_key)
-	{
-		sys_mutex.warning("sys_mutex_create(mutex_id=*0x%x, attr=*0x%x): IPC=0x%016x", mutex_id, attr, ipc_key);
-	}
-
 	switch (_attr.protocol)
 	{
 	case SYS_SYNC_FIFO: break;
@@ -86,18 +54,17 @@ error_code sys_mutex_create(ppu_thread& ppu, vm::ptr<u32> mutex_id, vm::ptr<sys_
 
 	if (auto error = lv2_obj::create<lv2_mutex>(_attr.pshared, _attr.ipc_key, _attr.flags, [&]()
 	{
-		return make_shared<lv2_mutex>(
+		return std::make_shared<lv2_mutex>(
 			_attr.protocol,
 			_attr.recursive,
 			_attr.adaptive,
-			ipc_key,
+			_attr.ipc_key,
 			_attr.name_u64);
 	}))
 	{
 		return error;
 	}
 
-	ppu.check_state();
 	*mutex_id = idm::last_id();
 	return CELL_OK;
 }
@@ -106,13 +73,13 @@ error_code sys_mutex_destroy(ppu_thread& ppu, u32 mutex_id)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_mutex.trace("sys_mutex_destroy(mutex_id=0x%x)", mutex_id);
+	sys_mutex.warning("sys_mutex_destroy(mutex_id=0x%x)", mutex_id);
 
 	const auto mutex = idm::withdraw<lv2_obj, lv2_mutex>(mutex_id, [](lv2_mutex& mutex) -> CellError
 	{
 		std::lock_guard lock(mutex.mutex);
 
-		if (atomic_storage<u32>::load(mutex.control.raw().owner))
+		if (mutex.owner || mutex.lock_count)
 		{
 			return CELL_EBUSY;
 		}
@@ -131,11 +98,6 @@ error_code sys_mutex_destroy(ppu_thread& ppu, u32 mutex_id)
 		return CELL_ESRCH;
 	}
 
-	if (mutex->key)
-	{
-		sys_mutex.warning("sys_mutex_destroy(mutex_id=0x%x): IPC=0x%016x", mutex_id, mutex->key);
-	}
-
 	if (mutex.ret)
 	{
 		return mutex.ret;
@@ -150,42 +112,22 @@ error_code sys_mutex_lock(ppu_thread& ppu, u32 mutex_id, u64 timeout)
 
 	sys_mutex.trace("sys_mutex_lock(mutex_id=0x%x, timeout=0x%llx)", mutex_id, timeout);
 
-	const auto mutex = idm::get<lv2_obj, lv2_mutex>(mutex_id, [&, notify = lv2_obj::notify_all_t()](lv2_mutex& mutex)
+	const auto mutex = idm::get<lv2_obj, lv2_mutex>(mutex_id, [&](lv2_mutex& mutex)
 	{
-		CellError result = mutex.try_lock(ppu);
-
-		if (result == CELL_EBUSY && !atomic_storage<ppu_thread*>::load(mutex.control.raw().sq))
-		{
-			// Try busy waiting a bit if advantageous
-			for (u32 i = 0, end = lv2_obj::has_ppus_in_running_state() ? 3 : 10; id_manager::g_mutex.is_lockable() && i < end; i++)
-			{
-				busy_wait(300);
-				result = mutex.try_lock(ppu);
-
-				if (!result || atomic_storage<ppu_thread*>::load(mutex.control.raw().sq))
-				{
-					break;
-				}
-			}
-		}
+		CellError result = mutex.try_lock(ppu.id);
 
 		if (result == CELL_EBUSY)
 		{
-			lv2_obj::prepare_for_sleep(ppu);
+			std::lock_guard lock(mutex.mutex);
 
-			ppu.cancel_sleep = 1;
-
-			if (mutex.try_own(ppu) || !mutex.sleep(ppu, timeout))
+			if (mutex.try_own(ppu, ppu.id))
 			{
 				result = {};
 			}
-
-			if (ppu.cancel_sleep != 1)
+			else
 			{
-				notify.cleanup();
+				mutex.sleep(ppu, timeout);
 			}
-
-			ppu.cancel_sleep = 0;
 		}
 
 		return result;
@@ -210,39 +152,13 @@ error_code sys_mutex_lock(ppu_thread& ppu, u32 mutex_id, u64 timeout)
 
 	ppu.gpr[3] = CELL_OK;
 
-	while (auto state = +ppu.state)
+	while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
 	{
-		if (state & cpu_flag::signal && ppu.state.test_and_reset(cpu_flag::signal))
+		if (is_stopped(state) || state & cpu_flag::signal)
 		{
 			break;
 		}
 
-		if (is_stopped(state))
-		{
-			std::lock_guard lock(mutex->mutex);
-
-			for (auto cpu = atomic_storage<ppu_thread*>::load(mutex->control.raw().sq); cpu; cpu = cpu->next_cpu)
-			{
-				if (cpu == &ppu)
-				{
-					ppu.state += cpu_flag::again;
-					return {};
-				}
-			}
-
-			break;
-		}
-
-		for (usz i = 0; cpu_flag::signal - ppu.state && i < 40; i++)
-		{
-			busy_wait(500);
-		}
-
-		if (ppu.state & cpu_flag::signal)
- 		{
-			continue;
-		}
-
 		if (timeout)
 		{
 			if (lv2_obj::wait_timeout(timeout, &ppu))
@@ -250,58 +166,23 @@ error_code sys_mutex_lock(ppu_thread& ppu, u32 mutex_id, u64 timeout)
 				// Wait for rescheduling
 				if (ppu.check_state())
 				{
-					continue;
-				}
-
-				ppu.state += cpu_flag::wait;
-
-				if (!atomic_storage<ppu_thread*>::load(mutex->control.raw().sq))
-				{
-					// Waiters queue is empty, so the thread must have been signaled
-					mutex->mutex.lock_unlock();
-					break;
+					return {};
 				}
 
 				std::lock_guard lock(mutex->mutex);
 
-				bool success = false;
-
-				mutex->control.fetch_op([&](lv2_mutex::control_data_t& data)
+				if (!mutex->unqueue(mutex->sq, &ppu))
 				{
-					success = false;
-
-					ppu_thread* sq = static_cast<ppu_thread*>(data.sq);
-
-					const bool retval = &ppu == sq;
-
-					if (!mutex->unqueue<false>(sq, &ppu))
-					{
-						return false;
-					}
-
-					success = true;
-
-					if (!retval)
-					{
-						return false;
-					}
-
-					data.sq = sq;
-					return true;
-				});
-
-				if (success)
-				{
-					ppu.next_cpu = nullptr;
-					ppu.gpr[3] = CELL_ETIMEDOUT;
+					break;
 				}
 
+				ppu.gpr[3] = CELL_ETIMEDOUT;
 				break;
 			}
 		}
 		else
 		{
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
 		}
 	}
 
@@ -316,7 +197,7 @@ error_code sys_mutex_trylock(ppu_thread& ppu, u32 mutex_id)
 
 	const auto mutex = idm::check<lv2_obj, lv2_mutex>(mutex_id, [&](lv2_mutex& mutex)
 	{
-		return mutex.try_lock(ppu);
+		return mutex.try_lock(ppu.id);
 	});
 
 	if (!mutex)
@@ -343,30 +224,9 @@ error_code sys_mutex_unlock(ppu_thread& ppu, u32 mutex_id)
 
 	sys_mutex.trace("sys_mutex_unlock(mutex_id=0x%x)", mutex_id);
 
-	const auto mutex = idm::check<lv2_obj, lv2_mutex>(mutex_id, [&, notify = lv2_obj::notify_all_t()](lv2_mutex& mutex) -> CellError
+	const auto mutex = idm::check<lv2_obj, lv2_mutex>(mutex_id, [&](lv2_mutex& mutex)
 	{
-		auto result = mutex.try_unlock(ppu);
-
-		if (result == CELL_EBUSY)
-		{
-			std::lock_guard lock(mutex.mutex);
-
-			if (auto cpu = mutex.reown<ppu_thread>())
-			{
-				if (cpu->state & cpu_flag::again)
-				{
-					ppu.state += cpu_flag::again;
-					return {};
-				}
-
-				mutex.awake(cpu);
-			}
-
-			result = {};
-		}
-
-		notify.cleanup();
-		return result;
+		return mutex.try_unlock(ppu.id);
 	});
 
 	if (!mutex)
@@ -374,7 +234,16 @@ error_code sys_mutex_unlock(ppu_thread& ppu, u32 mutex_id)
 		return CELL_ESRCH;
 	}
 
-	if (mutex.ret)
+	if (mutex.ret == CELL_EBUSY)
+	{
+		std::lock_guard lock(mutex->mutex);
+
+		if (auto cpu = mutex->reown<ppu_thread>())
+		{
+			mutex->awake(cpu);
+		}
+	}
+	else if (mutex.ret)
 	{
 		return mutex.ret;
 	}
diff --git a/rpcs3/Emu/Cell/lv2/sys_mutex.h b/rpcs3/Emu/Cell/lv2/sys_mutex.h
index f82f913399..d7b9e5a06a 100644
--- a/rpcs3/Emu/Cell/lv2/sys_mutex.h
+++ b/rpcs3/Emu/Cell/lv2/sys_mutex.h
@@ -4,8 +4,6 @@
 
 #include "Emu/Memory/vm_ptr.h"
 
-#include "Emu/Cell/PPUThread.h"
-
 struct sys_mutex_attribute_t
 {
 	be_t<u32> protocol; // SYS_SYNC_FIFO, SYS_SYNC_PRIORITY or SYS_SYNC_PRIORITY_INHERIT
@@ -23,8 +21,6 @@ struct sys_mutex_attribute_t
 	};
 };
 
-class ppu_thread;
-
 struct lv2_mutex final : lv2_obj
 {
 	static const u32 id_base = 0x85000000;
@@ -37,16 +33,9 @@ struct lv2_mutex final : lv2_obj
 
 	u32 cond_count = 0; // Condition Variables
 	shared_mutex mutex;
+	atomic_t<u32> owner{0};
 	atomic_t<u32> lock_count{0}; // Recursive Locks
-
-	struct alignas(16) control_data_t
-	{
-		u32 owner{};
-		u32 reserved{};
-		ppu_thread* sq{};
-	};
-
-	atomic_t<control_data_t> control{};
+	std::deque<cpu_thread*> sq;
 
 	lv2_mutex(u32 protocol, u32 recursive,u32 adaptive, u64 key, u64 name) noexcept
 		: protocol{static_cast<u8>(protocol)}
@@ -57,28 +46,11 @@ struct lv2_mutex final : lv2_obj
 	{
 	}
 
-	lv2_mutex(utils::serial& ar);
-	static std::function<void(void*)> load(utils::serial& ar);
-	void save(utils::serial& ar);
-
-	template <typename T>
-	CellError try_lock(T& cpu)
+	CellError try_lock(u32 id)
 	{
-		auto it = control.load();
+		const u32 value = owner;
 
-		if (!it.owner)
-		{
-			auto store = it;
-			store.owner = cpu.id;
-			if (!control.compare_and_swap_test(it, store))
-			{
-				return CELL_EBUSY;
-			}
-
-			return {};
-		}
-
-		if (it.owner == cpu.id)
+		if (value >> 1 == id)
 		{
 			// Recursive locking
 			if (recursive == SYS_SYNC_RECURSIVE)
@@ -95,45 +67,43 @@ struct lv2_mutex final : lv2_obj
 			return CELL_EDEADLK;
 		}
 
+		if (value == 0)
+		{
+			if (owner.compare_and_swap_test(0, id << 1))
+			{
+				return {};
+			}
+		}
+
 		return CELL_EBUSY;
 	}
 
-	template <typename T>
-	bool try_own(T& cpu)
+	bool try_own(cpu_thread& cpu, u32 id)
 	{
-		if (control.atomic_op([&](control_data_t& data)
+		if (owner.fetch_op([&](u32& val)
 		{
-			if (data.owner)
+			if (val == 0)
 			{
-				cpu.prio.atomic_op([tag = ++g_priority_order_tag](std::common_type_t<decltype(T::prio)>& prio)
-				{
-					prio.order = tag;
-				});
-
-				cpu.next_cpu = data.sq;
-				data.sq = &cpu;
-				return false;
+				val = id << 1;
 			}
 			else
 			{
-				data.owner = cpu.id;
-				return true;
+				val |= 1;
 			}
 		}))
 		{
-			cpu.next_cpu = nullptr;
-			return true;
+			sq.emplace_back(&cpu);
+			return false;
 		}
 
-		return false;
+		return true;
 	}
 
-	template <typename T>
-	CellError try_unlock(T& cpu)
+	CellError try_unlock(u32 id)
 	{
-		auto it = control.load();
+		const u32 value = owner;
 
-		if (it.owner != cpu.id)
+		if (value >> 1 != id)
 		{
 			return CELL_EPERM;
 		}
@@ -144,12 +114,9 @@ struct lv2_mutex final : lv2_obj
 			return {};
 		}
 
-		if (!it.sq)
+		if (value == id << 1)
 		{
-			auto store = it;
-			store.owner = 0;
-
-			if (control.compare_and_swap_test(it, store))
+			if (owner.compare_and_swap_test(value, 0))
 			{
 				return {};
 			}
@@ -161,42 +128,20 @@ struct lv2_mutex final : lv2_obj
 	template <typename T>
 	T* reown()
 	{
-		T* res{};
-
-		control.fetch_op([&](control_data_t& data)
+		if (auto cpu = schedule<T>(sq, protocol))
 		{
-			res = nullptr;
-
-			if (auto sq = static_cast<T*>(data.sq))
-			{
-				res = schedule<T>(data.sq, protocol, false);
-
-				if (sq == data.sq)
-				{
-					atomic_storage<u32>::release(control.raw().owner, res->id);
-					return false;
-				}
-
-				data.owner = res->id;
-				return true;
-			}
-			else
-			{
-				data.owner = 0;
-				return true;
-			}
-		});
-
-		if (res && cpu_flag::again - res->state)
-		{
-			// Detach manually (fetch_op can fail, so avoid side-effects  on the first node in this case)
-			res->next_cpu = nullptr;
+			owner = cpu->id << 1 | !sq.empty();
+			return static_cast<T*>(cpu);
+		}
+		else
+		{
+			owner = 0;
+			return nullptr;
 		}
-
-		return res;
 	}
 };
 
+class ppu_thread;
 
 // Syscalls
 
diff --git a/rpcs3/Emu/Cell/lv2/sys_net.cpp b/rpcs3/Emu/Cell/lv2/sys_net.cpp
index 827a4c98f2..49f464e32f 100644
--- a/rpcs3/Emu/Cell/lv2/sys_net.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_net.cpp
@@ -11,328 +11,1238 @@
 #include <winsock2.h>
 #include <WS2tcpip.h>
 #else
-#ifdef __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
+#include <errno.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <poll.h>
-#ifdef __clang__
-#pragma GCC diagnostic pop
-#endif
 #endif
 
 #include "Emu/NP/np_handler.h"
-#include "Emu/NP/np_helpers.h"
-#include "Emu/Cell/timers.hpp"
-#include <shared_mutex>
 
-#include "sys_net/network_context.h"
-#include "sys_net/lv2_socket.h"
-#include "sys_net/lv2_socket_native.h"
-#include "sys_net/lv2_socket_raw.h"
-#include "sys_net/lv2_socket_p2p.h"
-#include "sys_net/lv2_socket_p2ps.h"
-#include "sys_net/sys_net_helpers.h"
+#include <chrono>
+#include <shared_mutex>
 
 LOG_CHANNEL(sys_net);
 LOG_CHANNEL(sys_net_dump);
 
-template <>
+template<>
 void fmt_class_string<sys_net_error>::format(std::string& out, u64 arg)
 {
 	format_enum(out, arg, [](auto error)
+	{
+		switch (s32 _error = error)
 		{
-			switch (static_cast<s32>(error))
-			{
-#define SYS_NET_ERROR_CASE(x) \
-	case -x: return "-" #x;   \
-	case x:                   \
-		return #x
-				SYS_NET_ERROR_CASE(SYS_NET_ENOENT);
-				SYS_NET_ERROR_CASE(SYS_NET_EINTR);
-				SYS_NET_ERROR_CASE(SYS_NET_EBADF);
-				SYS_NET_ERROR_CASE(SYS_NET_ENOMEM);
-				SYS_NET_ERROR_CASE(SYS_NET_EACCES);
-				SYS_NET_ERROR_CASE(SYS_NET_EFAULT);
-				SYS_NET_ERROR_CASE(SYS_NET_EBUSY);
-				SYS_NET_ERROR_CASE(SYS_NET_EINVAL);
-				SYS_NET_ERROR_CASE(SYS_NET_EMFILE);
-				SYS_NET_ERROR_CASE(SYS_NET_ENOSPC);
-				SYS_NET_ERROR_CASE(SYS_NET_EPIPE);
-				SYS_NET_ERROR_CASE(SYS_NET_EAGAIN);
-				static_assert(SYS_NET_EWOULDBLOCK == SYS_NET_EAGAIN);
-				SYS_NET_ERROR_CASE(SYS_NET_EINPROGRESS);
-				SYS_NET_ERROR_CASE(SYS_NET_EALREADY);
-				SYS_NET_ERROR_CASE(SYS_NET_EDESTADDRREQ);
-				SYS_NET_ERROR_CASE(SYS_NET_EMSGSIZE);
-				SYS_NET_ERROR_CASE(SYS_NET_EPROTOTYPE);
-				SYS_NET_ERROR_CASE(SYS_NET_ENOPROTOOPT);
-				SYS_NET_ERROR_CASE(SYS_NET_EPROTONOSUPPORT);
-				SYS_NET_ERROR_CASE(SYS_NET_EOPNOTSUPP);
-				SYS_NET_ERROR_CASE(SYS_NET_EPFNOSUPPORT);
-				SYS_NET_ERROR_CASE(SYS_NET_EAFNOSUPPORT);
-				SYS_NET_ERROR_CASE(SYS_NET_EADDRINUSE);
-				SYS_NET_ERROR_CASE(SYS_NET_EADDRNOTAVAIL);
-				SYS_NET_ERROR_CASE(SYS_NET_ENETDOWN);
-				SYS_NET_ERROR_CASE(SYS_NET_ENETUNREACH);
-				SYS_NET_ERROR_CASE(SYS_NET_ECONNABORTED);
-				SYS_NET_ERROR_CASE(SYS_NET_ECONNRESET);
-				SYS_NET_ERROR_CASE(SYS_NET_ENOBUFS);
-				SYS_NET_ERROR_CASE(SYS_NET_EISCONN);
-				SYS_NET_ERROR_CASE(SYS_NET_ENOTCONN);
-				SYS_NET_ERROR_CASE(SYS_NET_ESHUTDOWN);
-				SYS_NET_ERROR_CASE(SYS_NET_ETOOMANYREFS);
-				SYS_NET_ERROR_CASE(SYS_NET_ETIMEDOUT);
-				SYS_NET_ERROR_CASE(SYS_NET_ECONNREFUSED);
-				SYS_NET_ERROR_CASE(SYS_NET_EHOSTDOWN);
-				SYS_NET_ERROR_CASE(SYS_NET_EHOSTUNREACH);
+#define SYS_NET_ERROR_CASE(x) case -x: return "-" #x; case x: return #x
+		SYS_NET_ERROR_CASE(SYS_NET_ENOENT);
+		SYS_NET_ERROR_CASE(SYS_NET_EINTR);
+		SYS_NET_ERROR_CASE(SYS_NET_EBADF);
+		SYS_NET_ERROR_CASE(SYS_NET_ENOMEM);
+		SYS_NET_ERROR_CASE(SYS_NET_EACCES);
+		SYS_NET_ERROR_CASE(SYS_NET_EFAULT);
+		SYS_NET_ERROR_CASE(SYS_NET_EBUSY);
+		SYS_NET_ERROR_CASE(SYS_NET_EINVAL);
+		SYS_NET_ERROR_CASE(SYS_NET_EMFILE);
+		SYS_NET_ERROR_CASE(SYS_NET_ENOSPC);
+		SYS_NET_ERROR_CASE(SYS_NET_EPIPE);
+		SYS_NET_ERROR_CASE(SYS_NET_EAGAIN);
+			static_assert(SYS_NET_EWOULDBLOCK == SYS_NET_EAGAIN);
+		SYS_NET_ERROR_CASE(SYS_NET_EINPROGRESS);
+		SYS_NET_ERROR_CASE(SYS_NET_EALREADY);
+		SYS_NET_ERROR_CASE(SYS_NET_EDESTADDRREQ);
+		SYS_NET_ERROR_CASE(SYS_NET_EMSGSIZE);
+		SYS_NET_ERROR_CASE(SYS_NET_EPROTOTYPE);
+		SYS_NET_ERROR_CASE(SYS_NET_ENOPROTOOPT);
+		SYS_NET_ERROR_CASE(SYS_NET_EPROTONOSUPPORT);
+		SYS_NET_ERROR_CASE(SYS_NET_EOPNOTSUPP);
+		SYS_NET_ERROR_CASE(SYS_NET_EPFNOSUPPORT);
+		SYS_NET_ERROR_CASE(SYS_NET_EAFNOSUPPORT);
+		SYS_NET_ERROR_CASE(SYS_NET_EADDRINUSE);
+		SYS_NET_ERROR_CASE(SYS_NET_EADDRNOTAVAIL);
+		SYS_NET_ERROR_CASE(SYS_NET_ENETDOWN);
+		SYS_NET_ERROR_CASE(SYS_NET_ENETUNREACH);
+		SYS_NET_ERROR_CASE(SYS_NET_ECONNABORTED);
+		SYS_NET_ERROR_CASE(SYS_NET_ECONNRESET);
+		SYS_NET_ERROR_CASE(SYS_NET_ENOBUFS);
+		SYS_NET_ERROR_CASE(SYS_NET_EISCONN);
+		SYS_NET_ERROR_CASE(SYS_NET_ENOTCONN);
+		SYS_NET_ERROR_CASE(SYS_NET_ESHUTDOWN);
+		SYS_NET_ERROR_CASE(SYS_NET_ETOOMANYREFS);
+		SYS_NET_ERROR_CASE(SYS_NET_ETIMEDOUT);
+		SYS_NET_ERROR_CASE(SYS_NET_ECONNREFUSED);
+		SYS_NET_ERROR_CASE(SYS_NET_EHOSTDOWN);
+		SYS_NET_ERROR_CASE(SYS_NET_EHOSTUNREACH);
 #undef SYS_NET_ERROR_CASE
-			}
+		}
 
-			return unknown;
-		});
+		return unknown;
+	});
 }
 
 template <>
 void fmt_class_string<lv2_socket_type>::format(std::string& out, u64 arg)
 {
 	format_enum(out, arg, [](auto value)
+	{
+		switch (value)
 		{
-			switch (value)
-			{
-			case SYS_NET_SOCK_STREAM: return "STREAM";
-			case SYS_NET_SOCK_DGRAM: return "DGRAM";
-			case SYS_NET_SOCK_RAW: return "RAW";
-			case SYS_NET_SOCK_DGRAM_P2P: return "DGRAM-P2P";
-			case SYS_NET_SOCK_STREAM_P2P: return "STREAM-P2P";
-			}
+		case SYS_NET_SOCK_STREAM: return "STREAM";
+		case SYS_NET_SOCK_DGRAM: return "DGRAM";
+		case SYS_NET_SOCK_RAW: return "RAW";
+		case SYS_NET_SOCK_DGRAM_P2P: return "DGRAM-P2P";
+		case SYS_NET_SOCK_STREAM_P2P: return "STREAM-P2P";
+		}
 
-			return unknown;
-		});
+		return unknown;
+	});
 }
 
 template <>
 void fmt_class_string<lv2_socket_family>::format(std::string& out, u64 arg)
 {
 	format_enum(out, arg, [](auto value)
+	{
+		switch (value)
 		{
-			switch (value)
-			{
-			case SYS_NET_AF_UNSPEC: return "UNSPEC";
-			case SYS_NET_AF_LOCAL: return "LOCAL";
-			case SYS_NET_AF_INET: return "INET";
-			case SYS_NET_AF_INET6: return "INET6";
-			}
+		case SYS_NET_AF_UNSPEC: return "UNSPEC";
+		case SYS_NET_AF_LOCAL: return "LOCAL";
+		case SYS_NET_AF_INET: return "INET";
+		case SYS_NET_AF_INET6: return "INET6";
+		}
 
-			return unknown;
-		});
+		return unknown;
+	});
 }
 
-template <>
-void fmt_class_string<lv2_ip_protocol>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-		{
-			switch (value)
-			{
-			case SYS_NET_IPPROTO_IP: return "IPPROTO_IP";
-			case SYS_NET_IPPROTO_ICMP: return "IPPROTO_ICMP";
-			case SYS_NET_IPPROTO_IGMP: return "IPPROTO_IGMP";
-			case SYS_NET_IPPROTO_TCP: return "IPPROTO_TCP";
-			case SYS_NET_IPPROTO_UDP: return "IPPROTO_UDP";
-			case SYS_NET_IPPROTO_ICMPV6: return "IPPROTO_ICMPV6";
-			}
-
-			return unknown;
-		});
-}
-
-template <>
-void fmt_class_string<lv2_tcp_option>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-		{
-			switch (value)
-			{
-			case SYS_NET_TCP_NODELAY: return "TCP_NODELAY";
-			case SYS_NET_TCP_MAXSEG: return "TCP_MAXSEG";
-			case SYS_NET_TCP_MSS_TO_ADVERTISE: return "TCP_MSS_TO_ADVERTISE";
-			}
-
-			return unknown;
-		});
-}
-
-template <>
-void fmt_class_string<lv2_socket_option>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-		{
-			switch (value)
-			{
-			case SYS_NET_SO_SNDBUF: return "SO_SNDBUF";
-			case SYS_NET_SO_RCVBUF: return "SO_RCVBUF";
-			case SYS_NET_SO_SNDLOWAT: return "SO_SNDLOWAT";
-			case SYS_NET_SO_RCVLOWAT: return "SO_RCVLOWAT";
-			case SYS_NET_SO_SNDTIMEO: return "SO_SNDTIMEO";
-			case SYS_NET_SO_RCVTIMEO: return "SO_RCVTIMEO";
-			case SYS_NET_SO_ERROR: return "SO_ERROR";
-			case SYS_NET_SO_TYPE: return "SO_TYPE";
-			case SYS_NET_SO_NBIO: return "SO_NBIO";
-			case SYS_NET_SO_TPPOLICY: return "SO_TPPOLICY";
-			case SYS_NET_SO_REUSEADDR: return "SO_REUSEADDR";
-			case SYS_NET_SO_KEEPALIVE: return "SO_KEEPALIVE";
-			case SYS_NET_SO_BROADCAST: return "SO_BROADCAST";
-			case SYS_NET_SO_LINGER: return "SO_LINGER";
-			case SYS_NET_SO_OOBINLINE: return "SO_OOBINLINE";
-			case SYS_NET_SO_REUSEPORT: return "SO_REUSEPORT";
-			case SYS_NET_SO_ONESBCAST: return "SO_ONESBCAST";
-			case SYS_NET_SO_USECRYPTO: return "SO_USECRYPTO";
-			case SYS_NET_SO_USESIGNATURE: return "SO_USESIGNATURE";
-			case SYS_NET_SOL_SOCKET: return "SOL_SOCKET";
-			}
-
-			return unknown;
-		});
-}
-
-template <>
-void fmt_class_string<lv2_ip_option>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-		{
-			switch (value)
-			{
-			case SYS_NET_IP_HDRINCL: return "IP_HDRINCL";
-			case SYS_NET_IP_TOS: return "IP_TOS";
-			case SYS_NET_IP_TTL: return "IP_TTL";
-			case SYS_NET_IP_MULTICAST_IF: return "IP_MULTICAST_IF";
-			case SYS_NET_IP_MULTICAST_TTL: return "IP_MULTICAST_TTL";
-			case SYS_NET_IP_MULTICAST_LOOP: return "IP_MULTICAST_LOOP";
-			case SYS_NET_IP_ADD_MEMBERSHIP: return "IP_ADD_MEMBERSHIP";
-			case SYS_NET_IP_DROP_MEMBERSHIP: return "IP_DROP_MEMBERSHIP";
-			case SYS_NET_IP_TTLCHK: return "IP_TTLCHK";
-			case SYS_NET_IP_MAXTTL: return "IP_MAXTTL";
-			case SYS_NET_IP_DONTFRAG: return "IP_DONTFRAG";
-			}
-
-			return unknown;
-		});
-}
 
 template <>
 void fmt_class_string<struct in_addr>::format(std::string& out, u64 arg)
 {
-	const u8* data = reinterpret_cast<const u8*>(&get_object(arg));
+	const uchar* data = reinterpret_cast<const uchar*>(&get_object(arg));
 
 	fmt::append(out, "%u.%u.%u.%u", data[0], data[1], data[2], data[3]);
 }
 
-lv2_socket::lv2_socket(utils::serial& ar, lv2_socket_type _type)
-	: family(ar)
-	, type(_type)
-	, protocol(ar)
-	, so_nbio(ar)
-	, so_error(ar)
-	, so_tcp_maxseg(ar)
 #ifdef _WIN32
-	, so_reuseaddr(ar)
-	, so_reuseport(ar)
+// Workaround function for WSAPoll not reporting failed connections
+void windows_poll(pollfd* fds, unsigned long nfds, int timeout, bool* connecting)
 {
-#else
-{
-	// Try to match structure between different platforms
-	ar.pos += 8;
-#endif
-
-	[[maybe_unused]] const s32 version = GET_SERIALIZATION_VERSION(lv2_net);
-
-	ar(so_rcvtimeo, so_sendtimeo);
-
-	lv2_id = idm::last_id();
-
-	ar(last_bound_addr);
-}
-
-std::function<void(void*)> lv2_socket::load(utils::serial& ar)
-{
-	const lv2_socket_type type{ar};
-
-	shared_ptr<lv2_socket> sock_lv2;
-
-	switch (type)
+	// Don't call WSAPoll with zero nfds (errors 10022 or 10038)
+	if (std::none_of(fds, fds + nfds, [](pollfd& pfd) { return pfd.fd != INVALID_SOCKET; }))
 	{
-	case SYS_NET_SOCK_STREAM:
-	case SYS_NET_SOCK_DGRAM:
-	{
-		auto lv2_native = make_shared<lv2_socket_native>(ar, type);
-		ensure(lv2_native->create_socket() >= 0);
-		sock_lv2 = std::move(lv2_native);
-		break;
-	}
-	case SYS_NET_SOCK_RAW: sock_lv2 = make_shared<lv2_socket_raw>(ar, type); break;
-	case SYS_NET_SOCK_DGRAM_P2P: sock_lv2 = make_shared<lv2_socket_p2p>(ar, type); break;
-	case SYS_NET_SOCK_STREAM_P2P: sock_lv2 = make_shared<lv2_socket_p2ps>(ar, type); break;
-	}
+		if (timeout > 0)
+		{
+			Sleep(timeout);
+		}
 
-	if (std::memcmp(&sock_lv2->last_bound_addr, std::array<u8, 16>{}.data(), 16))
-	{
-		// NOTE: It is allowed fail
-		sock_lv2->bind(sock_lv2->last_bound_addr);
-	}
-
-	return [ptr = sock_lv2](void* storage) { *static_cast<atomic_ptr<lv2_socket>*>(storage) = ptr; };;
-}
-
-void lv2_socket::save(utils::serial& ar, bool save_only_this_class)
-{
-	USING_SERIALIZATION_VERSION(lv2_net);
-
-	if (save_only_this_class)
-	{
-		ar(family, protocol, so_nbio, so_error, so_tcp_maxseg);
-#ifdef _WIN32
-		ar(so_reuseaddr, so_reuseport);
-#else
-		ar(std::array<char, 8>{});
-#endif
-		ar(so_rcvtimeo, so_sendtimeo);
-		ar(last_bound_addr);
 		return;
 	}
 
-	ar(type);
+	int r = ::WSAPoll(fds, nfds, timeout);
 
-	switch (type)
+	if (r == SOCKET_ERROR)
 	{
-	case SYS_NET_SOCK_STREAM:
-	case SYS_NET_SOCK_DGRAM:
-	{
-		static_cast<lv2_socket_native*>(this)->save(ar);
-		break;
+		sys_net.error("WSAPoll failed: %u", WSAGetLastError());
+		return;
 	}
-	case SYS_NET_SOCK_RAW: static_cast<lv2_socket_raw*>(this)->save(ar); break;
-	case SYS_NET_SOCK_DGRAM_P2P: static_cast<lv2_socket_p2p*>(this)->save(ar); break;
-	case SYS_NET_SOCK_STREAM_P2P: static_cast<lv2_socket_p2ps*>(this)->save(ar); break;
+
+	for (unsigned long i = 0; i < nfds; i++)
+	{
+		if (connecting[i])
+		{
+			if (!fds[i].revents)
+			{
+				int error = 0;
+				socklen_t intlen = sizeof(error);
+				if (getsockopt(fds[i].fd, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&error), &intlen) == -1 || error != 0)
+				{
+					// Connection silently failed
+					connecting[i] = false;
+					fds[i].revents = POLLERR | POLLHUP | (fds[i].events & (POLLIN | POLLOUT));
+				}
+			}
+			else
+			{
+				connecting[i] = false;
+			}
+		}
+	}
+}
+#endif
+
+// Error helper functions
+static int get_native_error()
+{
+	int native_error;
+#ifdef _WIN32
+	native_error = WSAGetLastError();
+#else
+	native_error = errno;
+#endif
+
+	return native_error;
+}
+
+static sys_net_error get_last_error(bool is_blocking, int native_error = 0)
+{
+	// Convert the error code for socket functions to a one for sys_net
+	sys_net_error result{};
+	const char* name{};
+
+	if (!native_error)
+	{
+		native_error = get_native_error();
+	}
+
+#ifdef _WIN32
+#define ERROR_CASE(error) case WSA ## error: result = SYS_NET_ ## error; name = #error; break;
+#else
+#define ERROR_CASE(error) case error: result = SYS_NET_ ## error; name = #error; break;
+#endif
+	switch (native_error)
+	{
+#ifndef _WIN32
+		ERROR_CASE(ENOENT);
+		ERROR_CASE(ENOMEM);
+		ERROR_CASE(EBUSY);
+		ERROR_CASE(ENOSPC);
+#endif
+
+		// TODO: We don't currently support EFAULT or EINTR
+		//ERROR_CASE(EFAULT);
+		//ERROR_CASE(EINTR);
+
+		ERROR_CASE(EBADF);
+		ERROR_CASE(EACCES);
+		ERROR_CASE(EINVAL);
+		ERROR_CASE(EMFILE);
+		ERROR_CASE(EPIPE);
+		ERROR_CASE(EWOULDBLOCK);
+		ERROR_CASE(EINPROGRESS);
+		ERROR_CASE(EALREADY);
+		ERROR_CASE(EDESTADDRREQ);
+		ERROR_CASE(EMSGSIZE);
+		ERROR_CASE(EPROTOTYPE);
+		ERROR_CASE(ENOPROTOOPT);
+		ERROR_CASE(EPROTONOSUPPORT);
+		ERROR_CASE(EOPNOTSUPP);
+		ERROR_CASE(EPFNOSUPPORT);
+		ERROR_CASE(EAFNOSUPPORT);
+		ERROR_CASE(EADDRINUSE);
+		ERROR_CASE(EADDRNOTAVAIL);
+		ERROR_CASE(ENETDOWN);
+		ERROR_CASE(ENETUNREACH);
+		ERROR_CASE(ECONNABORTED);
+		ERROR_CASE(ECONNRESET);
+		ERROR_CASE(ENOBUFS);
+		ERROR_CASE(EISCONN);
+		ERROR_CASE(ENOTCONN);
+		ERROR_CASE(ESHUTDOWN);
+		ERROR_CASE(ETOOMANYREFS);
+		ERROR_CASE(ETIMEDOUT);
+		ERROR_CASE(ECONNREFUSED);
+		ERROR_CASE(EHOSTDOWN);
+		ERROR_CASE(EHOSTUNREACH);
+	default:
+		fmt::throw_exception("sys_net get_last_error(is_blocking=%d, native_error=%d): Unknown/illegal socket error", is_blocking, native_error);
+	}
+
+	if (name && result != SYS_NET_EWOULDBLOCK && result != SYS_NET_EINPROGRESS)
+	{
+		sys_net.error("Socket error %s", name);
+	}
+
+	if (is_blocking && result == SYS_NET_EWOULDBLOCK)
+	{
+		return {};
+	}
+
+	if (is_blocking && result == SYS_NET_EINPROGRESS)
+	{
+		return {};
+	}
+
+	return result;
+#undef ERROR_CASE
+}
+
+static void network_clear_queue(ppu_thread& ppu)
+{
+	idm::select<lv2_socket>([&](u32, lv2_socket& sock)
+	{
+		std::lock_guard lock(sock.mutex);
+
+		for (auto it = sock.queue.begin(); it != sock.queue.end();)
+		{
+			if (it->first == ppu.id)
+			{
+				it = sock.queue.erase(it);
+				continue;
+			}
+
+			it++;
+		}
+
+		if (sock.queue.empty())
+		{
+			sock.events.store({});
+		}
+	});
+}
+
+// Object in charge of retransmiting packets for STREAM_P2P sockets
+class tcp_timeout_monitor
+{
+public:
+	void add_message(s32 sock_id, const sockaddr_in *dst, std::vector<u8> data, u64 seq)
+	{
+		{
+			std::lock_guard lock(data_mutex);
+
+			const auto now = steady_clock::now();
+
+			message msg;
+			msg.dst_addr = *dst;
+			msg.sock_id = sock_id;
+			msg.data = std::move(data);
+			msg.seq = seq;
+			msg.initial_sendtime = now;
+
+			rtt_info rtt = rtts[sock_id];
+
+			const auto expected_time = now + rtt.rtt_time;
+
+			msgs.insert(std::make_pair(expected_time, std::move(msg)));
+		}
+		wakey.notify_one(); // TODO: Should be improved to only wake if new timeout < old timeout
+	}
+
+	void confirm_data_received(s32 sock_id, u64 ack)
+	{
+		std::lock_guard lock(data_mutex);
+		rtts[sock_id].num_retries = 0;
+
+		const auto now = steady_clock::now();
+
+		for (auto it = msgs.begin(); it != msgs.end();)
+		{
+			auto& msg = it->second;
+			if (msg.sock_id == sock_id && msg.seq < ack)
+			{
+				// Decreases RTT if msg is early
+				if (now < it->first)
+				{
+					const auto actual_rtt = std::chrono::duration_cast<std::chrono::milliseconds>(now - it->second.initial_sendtime);
+					const auto cur_rtt = rtts[sock_id].rtt_time;
+					if (cur_rtt > actual_rtt)
+					{
+						rtts[sock_id].rtt_time = (actual_rtt + cur_rtt) / 2;
+					}
+
+				}
+				it = msgs.erase(it);
+				continue;
+			}
+			it++;
+		}
+	}
+
+	void operator()()
+	{
+		while (thread_ctrl::state() != thread_state::aborting)
+		{
+			std::unique_lock<std::mutex> lock(data_mutex);
+			if (msgs.size())
+				wakey.wait_until(lock, msgs.begin()->first);
+			else
+				wakey.wait(lock);
+
+			if (thread_ctrl::state() == thread_state::aborting)
+				return;
+
+			const auto now = steady_clock::now();
+			// Check for messages that haven't been acked
+			std::set<s32> rtt_increased;
+			for (auto it = msgs.begin(); it != msgs.end();)
+			{
+				if (it->first > now)
+					break;
+
+				// reply is late, increases rtt
+				auto& msg       = it->second;
+				const auto addr = msg.dst_addr.sin_addr.s_addr;
+				rtt_info rtt    = rtts[msg.sock_id];
+				// Only increases rtt once per loop(in case a big number of packets are sent at once)
+				if (!rtt_increased.count(msg.sock_id))
+				{
+					rtt.num_retries += 1;
+					// Increases current rtt by 10%
+					rtt.rtt_time += (rtt.rtt_time / 10);
+					rtts[addr] = rtt;
+
+					rtt_increased.emplace(msg.sock_id);
+				}
+
+				if (rtt.num_retries >= 10)
+				{
+					// Too many retries, need to notify the socket that the connection is dead
+					idm::check<lv2_socket>(msg.sock_id, [&](lv2_socket& sock)
+					{
+						sock.p2ps.status = lv2_socket::p2ps_i::stream_status::stream_closed;
+					});
+					it = msgs.erase(it);
+					continue;
+				}
+
+				// resend the message
+				const auto res = idm::check<lv2_socket>(msg.sock_id, [&](lv2_socket& sock) -> bool
+				{
+					if (sendto(sock.socket, reinterpret_cast<char*>(msg.data.data()), msg.data.size(), 0, reinterpret_cast<const sockaddr*>(&msg.dst_addr), sizeof(msg.dst_addr)) == -1)
+					{
+						sock.p2ps.status = lv2_socket::p2ps_i::stream_status::stream_closed;
+						return false;
+					}
+					return true;
+				});
+
+				if (!res || !res.ret)
+				{
+					it = msgs.erase(it);
+					continue;
+				}
+
+				// Update key timeout
+				msgs.insert(std::make_pair(now + rtt.rtt_time, std::move(msg)));
+				it = msgs.erase(it);
+			}
+		}
+	}
+
+	tcp_timeout_monitor& operator=(thread_state)
+	{
+		wakey.notify_one();
+		return *this;
+	}
+
+	public:
+		static constexpr auto thread_name = "Tcp Over Udp Timeout Manager Thread"sv;
+
+	private:
+		std::condition_variable wakey;
+		std::mutex data_mutex;
+		// List of outgoing messages
+		struct message
+		{
+			s32 sock_id;
+			::sockaddr_in dst_addr;
+			std::vector<u8> data;
+			u64 seq;
+			steady_clock::time_point initial_sendtime;
+		};
+		std::map<steady_clock::time_point, message> msgs; // (wakeup time, msg)
+		// List of rtts
+		struct rtt_info
+		{
+			unsigned long num_retries          = 0;
+			std::chrono::milliseconds rtt_time = 50ms;
+		};
+		std::unordered_map<s32, rtt_info> rtts; // (sock_id, rtt)
+	};
+
+struct nt_p2p_port
+{
+	// Real socket where P2P packets are received/sent
+	lv2_socket::socket_type p2p_socket = 0;
+	u16 port;
+
+	shared_mutex bound_p2p_vports_mutex;
+	// For DGRAM_P2P sockets(vport, sock_id)
+	std::map<u16, s32> bound_p2p_vports{};
+	// For STREAM_P2P sockets(key, sock_id)
+	// key is ( (src_vport) << 48 | (dst_vport) << 32 | addr ) with src_vport and addr being 0 for listening sockets
+	std::map<u64, s32> bound_p2p_streams{};
+
+	// Queued messages from RPCN
+	shared_mutex s_rpcn_mutex;
+	std::vector<std::vector<u8>> rpcn_msgs{};
+	// Queued signaling messages
+	shared_mutex s_sign_mutex;
+	std::vector<std::pair<std::pair<u32, u16>, std::vector<u8>>> sign_msgs{};
+
+	std::array<u8, 65535> p2p_recv_data{};
+
+	nt_p2p_port(u16 port) : port(port)
+	{
+		// Creates and bind P2P Socket
+		p2p_socket = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
+
+		if (p2p_socket == -1)
+			sys_net.fatal("Failed to create DGRAM socket for P2P socket!");
+
+#ifdef _WIN32
+		u_long _true = 1;
+		::ioctlsocket(p2p_socket, FIONBIO, &_true);
+#else
+		::fcntl(p2p_socket, F_SETFL, ::fcntl(p2p_socket, F_GETFL, 0) | O_NONBLOCK);
+#endif
+
+		u32 optval = 131072;
+		if (setsockopt(p2p_socket, SOL_SOCKET, SO_RCVBUF, reinterpret_cast<const char*>(&optval), sizeof(optval)) != 0)
+			sys_net.fatal("Error setsockopt SO_RCVBUF on P2P socket");
+
+		::sockaddr_in p2p_saddr{};
+		p2p_saddr.sin_family      = AF_INET;
+		p2p_saddr.sin_port        = std::bit_cast<u16, be_t<u16>>(port); // htons(port);
+		p2p_saddr.sin_addr.s_addr = 0; // binds to 0.0.0.0
+		const auto ret_bind       = ::bind(p2p_socket, reinterpret_cast<sockaddr*>(&p2p_saddr), sizeof(p2p_saddr));
+
+		if (ret_bind == -1)
+			sys_net.fatal("Failed to bind DGRAM socket to %d for P2P!", port);
+
+		sys_net.notice("P2P port %d was bound!", port);
+	}
+
+	~nt_p2p_port()
+	{
+		if (p2p_socket)
+		{
+#ifdef _WIN32
+			::closesocket(p2p_socket);
+#else
+			::close(p2p_socket);
+#endif
+		}
+	}
+
+	static u16 tcp_checksum(const u16* buffer, usz size)
+	{
+		u32 cksum = 0;
+		while (size > 1)
+		{
+			cksum += *buffer++;
+			size -= sizeof(u16);
+		}
+		if (size)
+			cksum += *reinterpret_cast<const u8 *>(buffer);
+
+		cksum = (cksum >> 16) + (cksum & 0xffff);
+		cksum += (cksum >> 16);
+		return static_cast<u16>(~cksum);
+	}
+
+	static std::vector<u8> generate_u2s_packet(const lv2_socket::p2ps_i::encapsulated_tcp& header, const u8 *data, const u32 datasize)
+	{
+		const u32 packet_size = (sizeof(u16) + sizeof(lv2_socket::p2ps_i::encapsulated_tcp) + datasize);
+		ensure(packet_size < 65535); // packet size shouldn't be bigger than possible UDP payload
+		std::vector<u8> packet(packet_size);
+		u8 *packet_data = packet.data();
+
+		*reinterpret_cast<le_t<u16> *>(packet_data) = header.dst_port;
+		memcpy(packet_data+sizeof(u16), &header, sizeof(lv2_socket::p2ps_i::encapsulated_tcp));
+		if(datasize)
+			memcpy(packet_data+sizeof(u16)+sizeof(lv2_socket::p2ps_i::encapsulated_tcp), data, datasize);
+
+		auto* hdr_ptr = reinterpret_cast<lv2_socket::p2ps_i::encapsulated_tcp *>(packet_data+sizeof(u16));
+		hdr_ptr->checksum = 0;
+		hdr_ptr->checksum = tcp_checksum(utils::bless<u16>(hdr_ptr), sizeof(lv2_socket::p2ps_i::encapsulated_tcp) + datasize);
+
+		return packet;
+	}
+
+	static void send_u2s_packet(lv2_socket &sock, s32 sock_id, std::vector<u8> data, const ::sockaddr_in* dst, u32 seq = 0, bool require_ack = true)
+	{
+		char ip_str[16];
+		inet_ntop(AF_INET, &dst->sin_addr, ip_str, sizeof(ip_str));
+		sys_net.trace("Sending U2S packet on socket %d(id:%d): data(%d, seq %d, require_ack %d) to %s:%d", sock.socket, sock_id, data.size(), seq, require_ack, ip_str, std::bit_cast<u16, be_t<u16>>(dst->sin_port));
+		if (sendto(sock.socket, reinterpret_cast<char *>(data.data()), data.size(), 0, reinterpret_cast<const sockaddr*>(dst), sizeof(sockaddr_in)) == -1)
+		{
+			sys_net.error("Attempting to send a u2s packet failed(%s), closing socket!", get_last_error(false));
+			sock.p2ps.status = lv2_socket::p2ps_i::stream_status::stream_closed;
+			return;
+		}
+
+		// Adds to tcp timeout monitor to resend the message until an ack is received
+		if (require_ack)
+		{
+			auto& tcpm = g_fxo->get<named_thread<tcp_timeout_monitor>>();
+			tcpm.add_message(sock_id, dst, std::move(data), seq);
+		}
+	}
+
+	static void dump_packet(lv2_socket::p2ps_i::encapsulated_tcp* tcph)
+	{
+		const std::string result = fmt::format("src_port: %d\ndst_port: %d\nflags: %d\nseq: %d\nack: %d\nlen: %d", tcph->src_port, tcph->dst_port, tcph->flags, tcph->seq, tcph->ack, tcph->length);
+		sys_net.trace("PACKET DUMP:\n%s", result);
+	}
+
+	bool handle_connected(s32 sock_id, lv2_socket::p2ps_i::encapsulated_tcp* tcp_header, u8* data, ::sockaddr_storage* op_addr)
+	{
+		const auto sock = idm::check<lv2_socket>(sock_id, [&](lv2_socket& sock) -> bool
+		{
+			std::lock_guard lock(sock.mutex);
+
+			if (sock.p2ps.status != lv2_socket::p2ps_i::stream_status::stream_connected && sock.p2ps.status != lv2_socket::p2ps_i::stream_status::stream_handshaking)
+				return false;
+
+			dump_packet(tcp_header);
+
+			if (tcp_header->flags == lv2_socket::p2ps_i::ACK)
+			{
+				auto& tcpm = g_fxo->get<named_thread<tcp_timeout_monitor>>();
+				tcpm.confirm_data_received(sock_id, tcp_header->ack);
+			}
+
+			auto send_ack = [&]()
+			{
+				auto final_ack = sock.p2ps.data_beg_seq;
+				while (sock.p2ps.received_data.contains(final_ack))
+				{
+					final_ack += sock.p2ps.received_data.at(final_ack).size();
+				}
+				sock.p2ps.data_available = final_ack - sock.p2ps.data_beg_seq;
+
+				lv2_socket::p2ps_i::encapsulated_tcp send_hdr;
+				send_hdr.src_port = tcp_header->dst_port;
+				send_hdr.dst_port = tcp_header->src_port;
+				send_hdr.flags    = lv2_socket::p2ps_i::ACK;
+				send_hdr.ack      = final_ack;
+				auto packet       = generate_u2s_packet(send_hdr, nullptr, 0);
+				sys_net.trace("Sent ack %d", final_ack);
+				send_u2s_packet(sock, sock_id, std::move(packet), reinterpret_cast<::sockaddr_in*>(op_addr), 0, false);
+
+				// check if polling is happening
+				if (sock.p2ps.data_available && sock.events.test_and_reset(lv2_socket::poll::read))
+				{
+					bs_t<lv2_socket::poll> events = lv2_socket::poll::read;
+					for (auto it = sock.queue.begin(); events && it != sock.queue.end();)
+					{
+						if (it->second(events))
+						{
+							it = sock.queue.erase(it);
+							continue;
+						}
+						it++;
+					}
+
+					if (sock.queue.empty())
+					{
+						sock.events.store({});
+					}
+				}
+
+			};
+
+			if (sock.p2ps.status == lv2_socket::p2ps_i::stream_status::stream_handshaking)
+			{
+				// Only expect SYN|ACK
+				if (tcp_header->flags == (lv2_socket::p2ps_i::SYN | lv2_socket::p2ps_i::ACK))
+				{
+					sys_net.trace("Received SYN|ACK, status is now connected");
+					sock.p2ps.data_beg_seq = tcp_header->seq + 1;
+					sock.p2ps.status       = lv2_socket::p2ps_i::stream_status::stream_connected;
+					send_ack();
+				}
+
+				return true;
+			}
+			else if (sock.p2ps.status == lv2_socket::p2ps_i::stream_status::stream_connected)
+			{
+				if (tcp_header->seq < sock.p2ps.data_beg_seq)
+				{
+					// Data has already been processed
+					sys_net.trace("Data has already been processed");
+					if (tcp_header->flags != lv2_socket::p2ps_i::ACK && tcp_header->flags != lv2_socket::p2ps_i::RST)
+						send_ack();
+					return true;
+				}
+
+				switch (tcp_header->flags)
+				{
+				case lv2_socket::p2ps_i::PSH:
+				case 0:
+				{
+					if (!sock.p2ps.received_data.count(tcp_header->seq))
+					{
+						// New data
+						sock.p2ps.received_data.emplace(tcp_header->seq, std::vector<u8>(data, data + tcp_header->length));
+					}
+					else
+					{
+						sys_net.trace("Data was not new!");
+					}
+
+					send_ack();
+					return true;
+				}
+				case lv2_socket::p2ps_i::RST:
+				case lv2_socket::p2ps_i::FIN:
+				{
+					sock.p2ps.status = lv2_socket::p2ps_i::stream_status::stream_closed;
+					return false;
+				}
+				default:
+				{
+					sys_net.error("Unknown U2S TCP flag received");
+					return true;
+				}
+				}
+			}
+
+			return true;
+		});
+
+		if (!sock || !sock.ret)
+			return false;
+
+		return true;
+	}
+
+	bool handle_listening(s32 sock_id, lv2_socket::p2ps_i::encapsulated_tcp* tcp_header, u8* /*data*/, ::sockaddr_storage* op_addr)
+	{
+		auto sock = idm::get<lv2_socket>(sock_id);
+		if (!sock)
+			return false;
+
+		std::lock_guard lock(sock->mutex);
+
+		if (sock->p2ps.status != lv2_socket::p2ps_i::stream_status::stream_listening)
+			return false;
+
+		// Only valid packet
+		if (tcp_header->flags == lv2_socket::p2ps_i::SYN && sock->p2ps.backlog.size() < sock->p2ps.max_backlog)
+		{
+			// Yes, new connection and a backlog is available, create a new lv2_socket for it and send SYN|ACK
+			// Prepare reply packet
+			sys_net.notice("Received connection on listening STREAM-P2P socket!");
+			lv2_socket::p2ps_i::encapsulated_tcp send_hdr;
+			send_hdr.src_port = tcp_header->dst_port;
+			send_hdr.dst_port = tcp_header->src_port;
+			send_hdr.flags    = lv2_socket::p2ps_i::SYN | lv2_socket::p2ps_i::ACK;
+			send_hdr.ack      = tcp_header->seq + 1;
+			// Generates random starting SEQ
+			send_hdr.seq      = rand();
+
+			// Create new socket
+			auto sock_lv2               = std::make_shared<lv2_socket>(0, SYS_NET_SOCK_STREAM_P2P, SYS_NET_AF_INET);
+			sock_lv2->socket            = sock->socket;
+			sock_lv2->p2p.port          = sock->p2p.port;
+			sock_lv2->p2p.vport         = sock->p2p.vport;
+			sock_lv2->p2ps.op_addr      = reinterpret_cast<struct sockaddr_in*>(op_addr)->sin_addr.s_addr;
+			sock_lv2->p2ps.op_port      = std::bit_cast<u16, be_t<u16>>((reinterpret_cast<struct sockaddr_in*>(op_addr)->sin_port));
+			sock_lv2->p2ps.op_vport     = tcp_header->src_port;
+			sock_lv2->p2ps.cur_seq      = send_hdr.seq + 1;
+			sock_lv2->p2ps.data_beg_seq = send_hdr.ack;
+			sock_lv2->p2ps.status       = lv2_socket::p2ps_i::stream_status::stream_connected;
+			const s32 new_sock_id       = idm::import_existing<lv2_socket>(sock_lv2);
+			const u64 key_connected     = (reinterpret_cast<struct sockaddr_in*>(op_addr)->sin_addr.s_addr) | (static_cast<u64>(tcp_header->src_port) << 48) | (static_cast<u64>(tcp_header->dst_port) << 32);
+			bound_p2p_streams.emplace(key_connected, new_sock_id);
+
+			auto packet = generate_u2s_packet(send_hdr, nullptr, 0);
+			{
+				std::lock_guard lock(sock_lv2->mutex);
+				send_u2s_packet(*sock_lv2, new_sock_id, std::move(packet), reinterpret_cast<::sockaddr_in*>(op_addr), send_hdr.seq);
+			}
+
+			sock->p2ps.backlog.push(new_sock_id);
+			if (sock->events.test_and_reset(lv2_socket::poll::read))
+			{
+				bs_t<lv2_socket::poll> events = lv2_socket::poll::read;
+				for (auto it = sock->queue.begin(); events && it != sock->queue.end();)
+				{
+					if (it->second(events))
+					{
+						it = sock->queue.erase(it);
+						continue;
+					}
+					it++;
+				}
+
+				if (sock->queue.empty())
+				{
+					sock->events.store({});
+				}
+			}
+
+		}
+		else if (tcp_header->flags == lv2_socket::p2ps_i::SYN)
+		{
+			// Send a RST packet on backlog full
+			sys_net.trace("Backlog was full, sent a RST packet");
+			lv2_socket::p2ps_i::encapsulated_tcp send_hdr;
+			send_hdr.src_port = tcp_header->dst_port;
+			send_hdr.dst_port = tcp_header->src_port;
+			send_hdr.flags    = lv2_socket::p2ps_i::RST;
+			auto packet       = generate_u2s_packet(send_hdr, nullptr, 0);
+			send_u2s_packet(*sock, sock_id, std::move(packet), reinterpret_cast<::sockaddr_in*>(op_addr), 0, false);
+		}
+
+		// Ignore other packets?
+
+		return true;
+	}
+
+	bool recv_data()
+	{
+		::sockaddr_storage native_addr;
+		::socklen_t native_addrlen = sizeof(native_addr);
+		const auto recv_res        = ::recvfrom(p2p_socket, reinterpret_cast<char*>(p2p_recv_data.data()), p2p_recv_data.size(), 0, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen);
+
+		if (recv_res == -1)
+		{
+			auto lerr = get_last_error(false);
+			if (lerr != SYS_NET_EINPROGRESS && lerr != SYS_NET_EWOULDBLOCK)
+				sys_net.error("Error recvfrom on P2P socket: %d", lerr);
+
+			return false;
+		}
+
+		if (recv_res < static_cast<s32>(sizeof(u16)))
+		{
+			sys_net.error("Received badly formed packet on P2P port(no vport)!");
+			return true;
+		}
+
+		u16 dst_vport = reinterpret_cast<le_t<u16>&>(p2p_recv_data[0]);
+
+		if (dst_vport == 0) // Reserved for messages from RPCN server
+		{
+			std::vector<u8> rpcn_msg(recv_res - sizeof(u16));
+			memcpy(rpcn_msg.data(), p2p_recv_data.data() + sizeof(u16), recv_res - sizeof(u16));
+
+			std::lock_guard lock(s_rpcn_mutex);
+			rpcn_msgs.push_back(std::move(rpcn_msg));
+			return true;
+		}
+
+		if (dst_vport == 65535) // Reserved for signaling
+		{
+			std::vector<u8> sign_msg(recv_res - sizeof(u16));
+			memcpy(sign_msg.data(), p2p_recv_data.data() + sizeof(u16), recv_res - sizeof(u16));
+
+			std::pair<std::pair<u32, u16>, std::vector<u8>> msg;
+			msg.first.first = reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr;
+			msg.first.second = std::bit_cast<u16, be_t<u16>>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
+			msg.second = std::move(sign_msg);
+
+			{
+				std::lock_guard lock(s_sign_mutex);
+				sign_msgs.push_back(std::move(msg));
+			}
+
+			auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
+			sigh.wake_up();
+
+			return true;
+		}
+
+		{
+			std::lock_guard lock(bound_p2p_vports_mutex);
+			if (bound_p2p_vports.contains(dst_vport))
+			{
+				sys_net_sockaddr_in_p2p p2p_addr{};
+
+				p2p_addr.sin_len    = sizeof(sys_net_sockaddr_in);
+				p2p_addr.sin_family = SYS_NET_AF_INET;
+				p2p_addr.sin_addr   = std::bit_cast<be_t<u32>, u32>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr);
+				p2p_addr.sin_vport  = dst_vport;
+				p2p_addr.sin_port = std::bit_cast<be_t<u16>, u16>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
+
+				std::vector<u8> p2p_data(recv_res - sizeof(u16));
+				memcpy(p2p_data.data(), p2p_recv_data.data() + sizeof(u16), recv_res - sizeof(u16));
+
+				const auto sock = idm::check<lv2_socket>(bound_p2p_vports.at(dst_vport), [&](lv2_socket& sock)
+				{
+					std::lock_guard lock(sock.mutex);
+					ensure(sock.type == SYS_NET_SOCK_DGRAM_P2P);
+
+					sock.p2p.data.push(std::make_pair(std::move(p2p_addr), std::move(p2p_data)));
+					sys_net.trace("Received a P2P packet for vport %d and saved it", dst_vport);
+
+					// Check if poll is happening
+					if (sock.events.test_and_reset(lv2_socket::poll::read))
+					{
+						bs_t<lv2_socket::poll> events = lv2_socket::poll::read;
+						for (auto it = sock.queue.begin(); events && it != sock.queue.end();)
+						{
+							if (it->second(events))
+							{
+								it = sock.queue.erase(it);
+								continue;
+							}
+							it++;
+						}
+
+						if (sock.queue.empty())
+						{
+							sock.events.store({});
+						}
+					}
+				});
+
+				// Should not happen in theory
+				if (!sock)
+					bound_p2p_vports.erase(dst_vport);
+
+				return true;
+			}
+		}
+
+		// Not directed at a bound DGRAM_P2P vport so check if the packet is a STREAM-P2P packet
+
+		const auto sp_size = recv_res - sizeof(u16);
+		u8 *sp_data = p2p_recv_data.data() + sizeof(u16);
+
+		if (sp_size < sizeof(lv2_socket::p2ps_i::encapsulated_tcp))
+		{
+			sys_net.trace("Received P2P packet targeted at unbound vport(likely) or invalid(vport=%d)", dst_vport);
+			return true;
+		}
+
+		auto* tcp_header = reinterpret_cast<lv2_socket::p2ps_i::encapsulated_tcp*>(sp_data);
+
+		// Validate signature & length
+		if (tcp_header->signature != lv2_socket::p2ps_i::U2S_sig)
+		{
+			sys_net.trace("Received P2P packet targeted at unbound vport(vport=%d)", dst_vport);
+			return true;
+		}
+
+		if (tcp_header->length != (sp_size - sizeof(lv2_socket::p2ps_i::encapsulated_tcp)))
+		{
+			sys_net.error("Received STREAM-P2P packet tcp length didn't match packet length");
+			return true;
+		}
+
+		// Sanity check
+		if (tcp_header->dst_port != dst_vport)
+		{
+			sys_net.error("Received STREAM-P2P packet with dst_port != vport");
+			return true;
+		}
+
+		// Validate checksum
+		u16 given_checksum   = tcp_header->checksum;
+		tcp_header->checksum = 0;
+		if (given_checksum != nt_p2p_port::tcp_checksum(reinterpret_cast<const u16*>(sp_data), sp_size))
+		{
+			sys_net.error("Checksum is invalid, dropping packet!");
+			return true;
+		}
+
+		// The packet is valid, check if it's bound
+		const u64 key_connected = (reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr) | (static_cast<u64>(tcp_header->src_port) << 48) | (static_cast<u64>(tcp_header->dst_port) << 32);
+		const u64 key_listening = (static_cast<u64>(tcp_header->dst_port) << 32);
+
+		{
+			std::lock_guard lock(bound_p2p_vports_mutex);
+			if (bound_p2p_streams.contains(key_connected))
+			{
+				const auto sock_id = bound_p2p_streams.at(key_connected);
+				sys_net.trace("Received packet for connected STREAM-P2P socket(s=%d)", sock_id);
+				handle_connected(sock_id, tcp_header, sp_data + sizeof(lv2_socket::p2ps_i::encapsulated_tcp), &native_addr);
+				return true;
+			}
+
+			if (bound_p2p_streams.contains(key_listening))
+			{
+				const auto sock_id = bound_p2p_streams.at(key_listening);
+				sys_net.trace("Received packet for listening STREAM-P2P socket(s=%d)", sock_id);
+				handle_listening(sock_id, tcp_header, sp_data + sizeof(lv2_socket::p2ps_i::encapsulated_tcp), &native_addr);
+				return true;
+			}
+		}
+
+		sys_net.trace("Received a STREAM-P2P packet with no bound target");
+		return true;
+	}
+};
+
+struct network_thread
+{
+	std::vector<ppu_thread*> s_to_awake;
+	shared_mutex s_nw_mutex;
+
+	shared_mutex list_p2p_ports_mutex;
+	std::map<u16, nt_p2p_port> list_p2p_ports{};
+
+	static constexpr auto thread_name = "Network Thread";
+
+	network_thread() noexcept
+	{
+#ifdef _WIN32
+		WSADATA wsa_data;
+		WSAStartup(MAKEWORD(2, 2), &wsa_data);
+#endif
+		if (g_cfg.net.psn_status == np_psn_status::rpcn)
+			list_p2p_ports.emplace(std::piecewise_construct, std::forward_as_tuple(3658), std::forward_as_tuple(3658));
+	}
+
+	~network_thread()
+	{
+#ifdef _WIN32
+		WSACleanup();
+#endif
+	}
+
+	void operator()()
+	{
+		std::vector<std::shared_ptr<lv2_socket>> socklist;
+		socklist.reserve(lv2_socket::id_count);
+
+		s_to_awake.clear();
+
+		::pollfd fds[lv2_socket::id_count]{};
+#ifdef _WIN32
+		bool connecting[lv2_socket::id_count]{};
+		bool was_connecting[lv2_socket::id_count]{};
+#endif
+
+		::pollfd p2p_fd[lv2_socket::id_count]{};
+
+		while (thread_ctrl::state() != thread_state::aborting)
+		{
+			// Wait with 1ms timeout
+#ifdef _WIN32
+			windows_poll(fds, ::size32(socklist), 1, connecting);
+#else
+			::poll(fds, socklist.size(), 1);
+#endif
+
+			// Check P2P sockets for incoming packets(timeout could probably be set at 0)
+			{
+				std::lock_guard lock(list_p2p_ports_mutex);
+				std::memset(p2p_fd, 0, sizeof(p2p_fd));
+				auto num_p2p_sockets = 0;
+				for (const auto& p2p_port : list_p2p_ports)
+				{
+					p2p_fd[num_p2p_sockets].events  = POLLIN;
+					p2p_fd[num_p2p_sockets].revents = 0;
+					p2p_fd[num_p2p_sockets].fd      = p2p_port.second.p2p_socket;
+					num_p2p_sockets++;
+				}
+
+				if (num_p2p_sockets)
+				{
+#ifdef _WIN32
+					const auto ret_p2p = WSAPoll(p2p_fd, num_p2p_sockets, 1);
+#else
+					const auto ret_p2p = ::poll(p2p_fd, num_p2p_sockets, 1);
+#endif
+					if (ret_p2p > 0)
+					{
+						auto fd_index = 0;
+						for (auto& p2p_port : list_p2p_ports)
+						{
+							if ((p2p_fd[fd_index].revents & POLLIN) == POLLIN || (p2p_fd[fd_index].revents & POLLRDNORM) == POLLRDNORM)
+							{
+								while(p2p_port.second.recv_data());
+							}
+							fd_index++;
+						}
+					}
+					else if (ret_p2p < 0)
+					{
+						sys_net.error("[P2P] Error poll on master P2P socket: %d", get_last_error(false));
+					}
+				}
+			}
+
+			std::lock_guard lock(s_nw_mutex);
+
+			for (usz i = 0; i < socklist.size(); i++)
+			{
+				bs_t<lv2_socket::poll> events{};
+
+				[[maybe_unused]] lv2_socket& sock = *socklist[i];
+
+				if (fds[i].revents & (POLLIN | POLLHUP) && socklist[i]->events.test_and_reset(lv2_socket::poll::read))
+					events += lv2_socket::poll::read;
+				if (fds[i].revents & POLLOUT && socklist[i]->events.test_and_reset(lv2_socket::poll::write))
+					events += lv2_socket::poll::write;
+				if (fds[i].revents & POLLERR && socklist[i]->events.test_and_reset(lv2_socket::poll::error))
+					events += lv2_socket::poll::error;
+
+				if (events)
+				{
+					std::lock_guard lock(socklist[i]->mutex);
+
+#ifdef _WIN32
+					if (was_connecting[i] && !connecting[i])
+						sock.is_connecting = false;
+#endif
+
+					for (auto it = socklist[i]->queue.begin(); events && it != socklist[i]->queue.end();)
+					{
+						if (it->second(events))
+						{
+							it = socklist[i]->queue.erase(it);
+							continue;
+						}
+
+						it++;
+					}
+
+					if (socklist[i]->queue.empty())
+					{
+						socklist[i]->events.store({});
+					}
+				}
+			}
+
+			s_to_awake.erase(std::unique(s_to_awake.begin(), s_to_awake.end()), s_to_awake.end());
+
+			for (ppu_thread* ppu : s_to_awake)
+			{
+				network_clear_queue(*ppu);
+				lv2_obj::append(ppu);
+			}
+
+			if (!s_to_awake.empty())
+			{
+				lv2_obj::awake_all();
+			}
+
+			s_to_awake.clear();
+			socklist.clear();
+
+			// Obtain all non P2P active sockets
+			idm::select<lv2_socket>([&](u32 id, lv2_socket& s)
+			{
+				if(s.type != SYS_NET_SOCK_DGRAM_P2P && s.type != SYS_NET_SOCK_STREAM_P2P)
+					socklist.emplace_back(idm::get_unlocked<lv2_socket>(id));
+			});
+
+			for (usz i = 0; i < socklist.size(); i++)
+			{
+#ifdef _WIN32
+				std::lock_guard lock(socklist[i]->mutex);
+#endif
+
+				auto events = socklist[i]->events.load();
+
+				fds[i].fd = events ? socklist[i]->socket : -1;
+				fds[i].events =
+					(events & lv2_socket::poll::read ? POLLIN : 0) |
+					(events & lv2_socket::poll::write ? POLLOUT : 0) |
+					0;
+				fds[i].revents = 0;
+#ifdef _WIN32
+				was_connecting[i] = socklist[i]->is_connecting;
+				connecting[i] = socklist[i]->is_connecting;
+#endif
+			}
+		}
+	}
+};
+
+using network_context = named_thread<network_thread>;
+
+// Used by RPCN to send signaling packets to RPCN server(for UDP hole punching)
+s32 send_packet_from_p2p_port(const std::vector<u8>& data, const sockaddr_in& addr)
+{
+	s32 res{};
+	auto& nc = g_fxo->get<network_context>();
+	{
+		std::lock_guard list_lock(nc.list_p2p_ports_mutex);
+		if (nc.list_p2p_ports.contains(3658))
+		{
+			auto& def_port = nc.list_p2p_ports.at(3658);
+			res = ::sendto(def_port.p2p_socket, reinterpret_cast<const char*>(data.data()), data.size(), 0, reinterpret_cast<const sockaddr*>(&addr), sizeof(sockaddr_in));
+		}
+		else
+		{
+			sys_net.error("send_packet_from_p2p_port: port %d not present", 3658);
+		}
+	}
+
+	return res;
+}
+
+std::vector<std::vector<u8>> get_rpcn_msgs()
+{
+	std::vector<std::vector<u8>> msgs;
+	auto& nc = g_fxo->get<network_context>();
+	{
+		std::lock_guard list_lock(nc.list_p2p_ports_mutex);
+		if (nc.list_p2p_ports.contains(3658))
+		{
+			auto& def_port = nc.list_p2p_ports.at(3658);
+			{
+				std::lock_guard lock(def_port.s_rpcn_mutex);
+				msgs = std::move(def_port.rpcn_msgs);
+				def_port.rpcn_msgs.clear();
+			}
+		}
+		else
+		{
+			sys_net.error("get_rpcn_msgs: port %d not present", 3658);
+		}
+	}
+
+	return msgs;
+}
+
+std::vector<std::pair<std::pair<u32, u16>, std::vector<u8>>> get_sign_msgs()
+{
+	std::vector<std::pair<std::pair<u32, u16>, std::vector<u8>>> msgs;
+	auto& nc = g_fxo->get<network_context>();
+	{
+		std::lock_guard list_lock(nc.list_p2p_ports_mutex);
+		if (nc.list_p2p_ports.contains(3658))
+		{
+			auto& def_port = nc.list_p2p_ports.at(3658);
+			{
+				std::lock_guard lock(def_port.s_sign_mutex);
+				msgs = std::move(def_port.sign_msgs);
+				def_port.sign_msgs.clear();
+			}
+		}
+		else
+		{
+			sys_net.error("get_sign_msgs: port %d not present", 3658);
+		}
+	}
+
+	return msgs;
+}
+
+
+lv2_socket::lv2_socket(lv2_socket::socket_type s, s32 s_type, s32 family)
+	: socket(s), type{s_type}, family{family}
+{
+	if (socket)
+	{
+		// Set non-blocking
+#ifdef _WIN32
+		u_long _true = 1;
+		::ioctlsocket(socket, FIONBIO, &_true);
+#else
+		::fcntl(socket, F_SETFL, ::fcntl(socket, F_GETFL, 0) | O_NONBLOCK);
+#endif
 	}
 }
 
-void sys_net_dump_data(std::string_view desc, const u8* data, s32 len, const void* addr)
+lv2_socket::~lv2_socket()
 {
-	const sys_net_sockaddr_in_p2p* p2p_addr = reinterpret_cast<const sys_net_sockaddr_in_p2p*>(addr);
+	if (type != SYS_NET_SOCK_DGRAM_P2P && type != SYS_NET_SOCK_STREAM_P2P)
+	{
+#ifdef _WIN32
+		::closesocket(socket);
+#else
+		::close(socket);
+#endif
+	}
+}
 
-	if (p2p_addr)
-		sys_net_dump.trace("%s(%s:%d:%d): %s", desc, np::ip_to_string(std::bit_cast<u32>(p2p_addr->sin_addr)), p2p_addr->sin_port, p2p_addr->sin_vport, fmt::buf_to_hexstring(data, len));
-	else
-		sys_net_dump.trace("%s: %s", desc, fmt::buf_to_hexstring(data, len));
+extern void need_network()
+{
+	g_fxo->need<network_context>();
+	g_fxo->need<named_thread<tcp_timeout_monitor>>();
 }
 
 error_code sys_net_bnet_accept(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr> addr, vm::ptr<u32> paddrlen)
@@ -346,53 +1256,126 @@ error_code sys_net_bnet_accept(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr>
 		return -SYS_NET_EINVAL;
 	}
 
+	lv2_socket::socket_type native_socket = -1;
+	::sockaddr_storage native_addr;
+	::socklen_t native_addrlen = sizeof(native_addr);
 	s32 result = 0;
-	sys_net_sockaddr sn_addr{};
-	shared_ptr<lv2_socket> new_socket{};
+	bool p2ps = false;
+	s32 p2ps_result = 0;
 
-	const auto sock = idm::check<lv2_socket>(s, [&, notify = lv2_obj::notify_all_t()](lv2_socket& sock)
+	const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock)
+	{
+		std::lock_guard lock(sock.mutex);
+
+		if (sock.type == SYS_NET_SOCK_STREAM_P2P)
 		{
-			auto [success, res, res_socket, res_addr] = sock.accept();
-
-			if (success)
+			const auto accept_success = [&]()
 			{
-				result  = res;
-				sn_addr = res_addr;
-				new_socket = std::move(res_socket);
-				return true;
-			}
+				p2ps_result = sock.p2ps.backlog.front();
+				sock.p2ps.backlog.pop();
 
-			auto lock = sock.lock();
-
-			sock.poll_queue(idm::get_unlocked<named_thread<ppu_thread>>(ppu.id), lv2_socket::poll_t::read, [&](bs_t<lv2_socket::poll_t> events) -> bool
+				if (addr)
 				{
-					if (events & lv2_socket::poll_t::read)
+					auto* sock_client = idm::check_unlocked<lv2_socket>(p2ps_result);
+					std::lock_guard slock(sock_client->mutex);
+					sys_net_sockaddr_in_p2p* addr_p2p = reinterpret_cast<sys_net_sockaddr_in_p2p*>(addr.get_ptr());
+					addr_p2p->sin_family              = AF_INET;
+					addr_p2p->sin_addr                = std::bit_cast<be_t<u32>, u32>(sock_client->p2ps.op_addr);
+					addr_p2p->sin_port                = sock_client->p2ps.op_vport;
+					addr_p2p->sin_vport               = sock_client->p2ps.op_port;
+					addr_p2p->sin_len                 = sizeof(sys_net_sockaddr_in_p2p);
+				}
+			};
+
+			p2ps = true;
+			if (sock.p2ps.backlog.size() == 0)
+			{
+				if (sock.so_nbio)
+				{
+					result = SYS_NET_EWOULDBLOCK;
+					return false;
+				}
+
+				sock.events += lv2_socket::poll::read;
+				sock.queue.emplace_back(ppu.id, [&](bs_t<lv2_socket::poll> events) -> bool
+				{
+					if ((events & lv2_socket::poll::read) && sock.p2ps.backlog.size())
 					{
-						auto [success, res, res_socket, res_addr] = sock.accept(false);
-						if (success)
-						{
-							result  = res;
-							sn_addr = res_addr;
-							new_socket = std::move(res_socket);
-							lv2_obj::awake(&ppu);
-							return success;
-						}
+						sys_net.trace("Now found a socket in backlog!");
+						accept_success();
+						lv2_obj::awake(&ppu);
+						return true;
 					}
 
-					sock.set_poll_event(lv2_socket::poll_t::read);
+					sock.events += lv2_socket::poll::read;
 					return false;
 				});
 
-			lv2_obj::prepare_for_sleep(ppu);
-			lv2_obj::sleep(ppu);
+				lv2_obj::sleep(ppu);
+				return false;
+			}
+
+			sys_net.trace("Found a socket in backlog!");
+			accept_success();
+
+			return true;
+		}
+
+		//if (!(sock.events & lv2_socket::poll::read))
+		{
+			native_socket = ::accept(sock.socket, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen);
+
+			if (native_socket != -1)
+			{
+				return true;
+			}
+
+			result = get_last_error(!sock.so_nbio);
+
+			if (result)
+			{
+				return false;
+			}
+		}
+
+		// Enable read event
+		sock.events += lv2_socket::poll::read;
+		sock.queue.emplace_back(ppu.id, [&](bs_t<lv2_socket::poll> events) -> bool
+		{
+			if (events & lv2_socket::poll::read)
+			{
+				native_socket = ::accept(sock.socket, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen);
+
+				if (native_socket != -1 || (result = get_last_error(!sock.so_nbio)))
+				{
+					lv2_obj::awake(&ppu);
+					return true;
+				}
+			}
+
+			sock.events += lv2_socket::poll::read;
 			return false;
 		});
 
+		lv2_obj::sleep(ppu);
+		return false;
+	});
+
 	if (!sock)
 	{
 		return -SYS_NET_EBADF;
 	}
 
+	if (!sock.ret && result)
+	{
+		if (result == SYS_NET_EWOULDBLOCK)
+		{
+			return not_an_error(-result);
+		}
+
+		return -sys_net_error{result};
+	}
+
 	if (!sock.ret)
 	{
 		while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
@@ -407,47 +1390,56 @@ error_code sys_net_bnet_accept(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr>
 				break;
 			}
 
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
+		}
+
+		if (result)
+		{
+			return -sys_net_error{result};
 		}
 
 		if (ppu.gpr[3] == static_cast<u64>(-SYS_NET_EINTR))
 		{
 			return -SYS_NET_EINTR;
 		}
-
-		if (result < 0)
-		{
-			return sys_net_error{result};
-		}
 	}
 
-	if (result < 0)
+	if (p2ps)
 	{
-		return sys_net_error{result};
+		return not_an_error(p2ps_result);
 	}
 
-	s32 id_ps3 = result;
-
-	if (!id_ps3)
+	if (ppu.is_stopped())
 	{
-		ensure(new_socket);
-		id_ps3 = idm::import_existing<lv2_socket>(new_socket);
-		if (id_ps3 == id_manager::id_traits<lv2_socket>::invalid)
-		{
-			return -SYS_NET_EMFILE;
-		}
+		return {};
 	}
 
-	static_cast<void>(ppu.test_stopped());
+	auto newsock = std::make_shared<lv2_socket>(native_socket, 0, 0);
+
+	result = idm::import_existing<lv2_socket>(newsock);
+
+	if (result == id_manager::id_traits<lv2_socket>::invalid)
+	{
+		return -SYS_NET_EMFILE;
+	}
 
 	if (addr)
 	{
-		*paddrlen = sizeof(sys_net_sockaddr_in);
-		*addr     = sn_addr;
+		ensure(native_addr.ss_family == AF_INET);
+
+		vm::ptr<sys_net_sockaddr_in> paddr = vm::cast(addr.addr());
+
+		*paddrlen         = sizeof(sys_net_sockaddr_in);
+
+		paddr->sin_len    = sizeof(sys_net_sockaddr_in);
+		paddr->sin_family = SYS_NET_AF_INET;
+		paddr->sin_port   = std::bit_cast<be_t<u16>, u16>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
+		paddr->sin_addr   = std::bit_cast<be_t<u32>, u32>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr);
+		paddr->sin_zero   = 0;
 	}
 
-	// Socket ID
-	return not_an_error(id_ps3);
+	// Socket id
+	return not_an_error(result);
 }
 
 error_code sys_net_bnet_bind(ppu_thread& ppu, s32 s, vm::cptr<sys_net_sockaddr> addr, u32 addrlen)
@@ -461,24 +1453,114 @@ error_code sys_net_bnet_bind(ppu_thread& ppu, s32 s, vm::cptr<sys_net_sockaddr>
 		return -SYS_NET_EINVAL;
 	}
 
-	if (!idm::check_unlocked<lv2_socket>(s))
+	alignas(16) char addr_buf[sizeof(sys_net_sockaddr)];
+
+	if (idm::check<lv2_socket>(s))
+	{
+		std::memcpy(addr_buf, addr.get_ptr(), addr.size());
+	}
+	else
 	{
 		return -SYS_NET_EBADF;
 	}
 
-	const sys_net_sockaddr sn_addr = *addr;
+	const auto psa_in = reinterpret_cast<sys_net_sockaddr_in*>(addr_buf);
+	const auto _addr = reinterpret_cast<sys_net_sockaddr*>(addr_buf);
 
-	// 0 presumably defaults to AF_INET(to check?)
-	if (sn_addr.sa_family != SYS_NET_AF_INET && sn_addr.sa_family != SYS_NET_AF_UNSPEC)
+	::sockaddr_in name{};
+	name.sin_family      = AF_INET;
+	name.sin_port        = std::bit_cast<u16>(psa_in->sin_port);
+	name.sin_addr.s_addr = std::bit_cast<u32>(psa_in->sin_addr);
+	::socklen_t namelen  = sizeof(name);
+
+	const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock) -> sys_net_error
 	{
-		sys_net.error("sys_net_bnet_bind: unsupported sa_family (%d)", sn_addr.sa_family);
-		return -SYS_NET_EAFNOSUPPORT;
-	}
-
-	const auto sock = idm::check<lv2_socket>(s, [&, notify = lv2_obj::notify_all_t()](lv2_socket& sock) -> s32
+		// 0 presumably defaults to AF_INET(to check?)
+		if (_addr->sa_family != SYS_NET_AF_INET && _addr->sa_family != 0)
 		{
-			return sock.bind(sn_addr);
-		});
+			sys_net.error("sys_net_bnet_bind(s=%d): unsupported sa_family (%d)", s, addr->sa_family);
+			return SYS_NET_EAFNOSUPPORT;
+		}
+
+		if (sock.type == SYS_NET_SOCK_DGRAM_P2P || sock.type == SYS_NET_SOCK_STREAM_P2P)
+		{
+			auto psa_in_p2p = reinterpret_cast<const sys_net_sockaddr_in_p2p*>(psa_in);
+			u16 p2p_port, p2p_vport;
+			if (sock.type == SYS_NET_SOCK_DGRAM_P2P)
+			{
+				p2p_port  = psa_in_p2p->sin_port;
+				p2p_vport = psa_in_p2p->sin_vport;
+			}
+			else
+			{
+				// For SYS_NET_SOCK_STREAM_P2P sockets, the port is the "fake" tcp port and the vport is the udp port it's bound to
+				p2p_port  = psa_in_p2p->sin_vport;
+				p2p_vport = psa_in_p2p->sin_port;
+			}
+
+			char ip_str[16];
+			inet_ntop(AF_INET, &name.sin_addr, ip_str, sizeof(ip_str));
+			sys_net.notice("[P2P] %s, Socket bind to %s:%d:%d", sock.type, ip_str, p2p_port, p2p_vport);
+
+			if (p2p_port != 3658)
+			{
+				sys_net.warning("[P2P] Attempting to bind a socket to a port != 3658");
+			}
+			ensure(p2p_vport != 0);
+
+			lv2_socket::socket_type real_socket{};
+
+			auto& nc = g_fxo->get<network_context>();
+			{
+				std::lock_guard list_lock(nc.list_p2p_ports_mutex);
+				if (!nc.list_p2p_ports.contains(p2p_port))
+				{
+					nc.list_p2p_ports.emplace(std::piecewise_construct, std::forward_as_tuple(p2p_port), std::forward_as_tuple(p2p_port));
+				}
+
+				auto& pport = nc.list_p2p_ports.at(p2p_port);
+				real_socket = pport.p2p_socket;
+				{
+					std::lock_guard lock(pport.bound_p2p_vports_mutex);
+					if (sock.type == SYS_NET_SOCK_DGRAM_P2P)
+					{
+						if (pport.bound_p2p_vports.count(p2p_vport) != 0)
+						{
+							return sys_net_error::SYS_NET_EADDRINUSE;
+						}
+						pport.bound_p2p_vports.insert(std::make_pair(p2p_vport, s));
+					}
+					else
+					{
+						const u64 key = (static_cast<u64>(p2p_vport) << 32);
+						pport.bound_p2p_streams.emplace(key, s);
+					}
+				}
+			}
+
+			{
+				std::lock_guard lock(sock.mutex);
+				sock.p2p.port  = p2p_port;
+				sock.p2p.vport = p2p_vport;
+				sock.socket    = real_socket;
+			}
+
+			return {};
+		}
+		else
+		{
+			sys_net.warning("Trying to bind %s:%d", name.sin_addr, std::bit_cast<be_t<u16>, u16>(name.sin_port)); // ntohs(name.sin_port)
+		}
+
+		std::lock_guard lock(sock.mutex);
+
+		if (::bind(sock.socket, reinterpret_cast<struct sockaddr*>(&name), namelen) == 0)
+		{
+			return {};
+		}
+
+		return get_last_error(false);
+	});
 
 	if (!sock)
 	{
@@ -487,7 +1569,7 @@ error_code sys_net_bnet_bind(ppu_thread& ppu, s32 s, vm::cptr<sys_net_sockaddr>
 
 	if (sock.ret)
 	{
-		return sys_net_error{sock.ret};
+		return -sock.ret;
 	}
 
 	return CELL_OK;
@@ -504,63 +1586,217 @@ error_code sys_net_bnet_connect(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr
 		return -SYS_NET_EINVAL;
 	}
 
-	if (addr->sa_family != SYS_NET_AF_INET)
+	struct
 	{
-		sys_net.error("sys_net_bnet_connect(s=%d): unsupported sa_family (%d)", s, addr->sa_family);
-		return -SYS_NET_EAFNOSUPPORT;
-	}
+		alignas(16) char buf[sizeof(sys_net_sockaddr)];
+	} addr_buf;
 
-	if (!idm::check_unlocked<lv2_socket>(s))
+	const auto psa_in = reinterpret_cast<sys_net_sockaddr_in*>(addr_buf.buf);
+	const auto _addr = reinterpret_cast<sys_net_sockaddr*>(addr_buf.buf);
+
+	s32 result = 0;
+	::sockaddr_in name{};
+	name.sin_family      = AF_INET;
+
+	if (idm::check<lv2_socket>(s))
+	{
+		std::memcpy(addr_buf.buf, addr.get_ptr(), 16);
+		name.sin_port        = std::bit_cast<u16>(psa_in->sin_port);
+		name.sin_addr.s_addr = std::bit_cast<u32>(psa_in->sin_addr);
+	}
+	else
 	{
 		return -SYS_NET_EBADF;
 	}
 
-	s32 result               = 0;
-	sys_net_sockaddr sn_addr = *addr;
+	::socklen_t namelen  = sizeof(name);
 
-	const auto sock = idm::check<lv2_socket>(s, [&, notify = lv2_obj::notify_all_t()](lv2_socket& sock)
+	sys_net.notice("Attempting to connect on %s:%d", name.sin_addr, std::bit_cast<be_t<u16>, u16>(name.sin_port)); // ntohs(name.sin_port)
+
+	const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock)
+	{
+		if (sock.type == SYS_NET_SOCK_STREAM_P2P)
 		{
-			const auto success = sock.connect(sn_addr);
-
-			if (success)
+			lv2_socket::p2ps_i::encapsulated_tcp send_hdr;
+			const auto psa_in_p2p = reinterpret_cast<sys_net_sockaddr_in_p2p*>(addr_buf.buf);
 			{
-				result = *success;
+				std::lock_guard lock(sock.mutex);
+				// This is purposefully inverted, not a bug
+				const u16 dst_vport = psa_in_p2p->sin_port;
+				const u16 dst_port  = psa_in_p2p->sin_vport;
+
+				lv2_socket::socket_type real_socket{};
+
+				auto& nc = g_fxo->get<network_context>();
+				{
+					std::lock_guard list_lock(nc.list_p2p_ports_mutex);
+					if (!nc.list_p2p_ports.contains(sock.p2p.port))
+						nc.list_p2p_ports.emplace(std::piecewise_construct, std::forward_as_tuple(sock.p2p.port), std::forward_as_tuple(sock.p2p.port));
+
+					auto& pport = nc.list_p2p_ports.at(sock.p2p.port);
+					real_socket = pport.p2p_socket;
+					{
+						std::lock_guard lock(pport.bound_p2p_vports_mutex);
+						if (sock.p2p.vport == 0)
+						{
+							// Unassigned vport, assigns one
+							sys_net.warning("vport was unassigned before connect!");
+							u16 found_vport = 30000;
+							while (true)
+							{
+								found_vport++;
+								if (pport.bound_p2p_vports.count(found_vport))
+									continue;
+								if (pport.bound_p2p_streams.count(static_cast<u64>(found_vport) << 32))
+									continue;
+
+								break;
+							}
+							sock.p2p.vport = found_vport;
+						}
+						const u64 key = name.sin_addr.s_addr | (static_cast<u64>(sock.p2p.vport) << 32) | (static_cast<u64>(dst_vport) << 48);
+						pport.bound_p2p_streams.emplace(key, s);
+					}
+				}
+
+				sock.socket = real_socket;
+
+				send_hdr.src_port = sock.p2p.vport;
+				send_hdr.dst_port = dst_vport;
+				send_hdr.flags    = lv2_socket::p2ps_i::SYN;
+				send_hdr.seq      = rand();
+
+				// sock.socket            = p2p_socket;
+				sock.p2ps.op_addr      = name.sin_addr.s_addr;
+				sock.p2ps.op_port      = dst_port;
+				sock.p2ps.op_vport     = dst_vport;
+				sock.p2ps.cur_seq      = send_hdr.seq + 1;
+				sock.p2ps.data_beg_seq = 0;
+				sock.p2ps.data_available = 0;
+				sock.p2ps.received_data.clear();
+				sock.p2ps.status       = lv2_socket::p2ps_i::stream_status::stream_handshaking;
+
+				std::vector<u8> packet = nt_p2p_port::generate_u2s_packet(send_hdr, nullptr, 0);
+				name.sin_port = std::bit_cast<u16>(psa_in_p2p->sin_vport); // not a bug
+				nt_p2p_port::send_u2s_packet(sock, s, std::move(packet), reinterpret_cast<::sockaddr_in*>(&name), send_hdr.seq);
+			}
+
+			return true;
+		}
+
+		std::lock_guard lock(sock.mutex);
+
+		if (psa_in->sin_port == 53)
+		{
+			auto& nph = g_fxo->get<named_thread<np_handler>>();
+
+			// Hack for DNS
+			name.sin_port        = std::bit_cast<u16, be_t<u16>>(53);
+			name.sin_addr.s_addr = nph.get_dns_ip();
+
+			sys_net.notice("sys_net_bnet_connect: using DNS...");
+
+			nph.add_dns_spy(s);
+		}
+		else if (_addr->sa_family != SYS_NET_AF_INET)
+		{
+			sys_net.error("sys_net_bnet_connect(s=%d): unsupported sa_family (%d)", s, _addr->sa_family);
+		}
+
+		if (::connect(sock.socket, reinterpret_cast<struct sockaddr*>(&name), namelen) == 0)
+		{
+			return true;
+		}
+
+		const bool is_blocking = !sock.so_nbio;
+
+		result = get_last_error(is_blocking);
+
+		if (result)
+		{
+			if (result == SYS_NET_EWOULDBLOCK)
+			{
+				result = SYS_NET_EINPROGRESS;
+			}
+
+			if (result == SYS_NET_EINPROGRESS)
+			{
+#ifdef _WIN32
+				sock.is_connecting = true;
+#endif
+				sock.events += lv2_socket::poll::write;
+				sock.queue.emplace_back(u32{0}, [&sock](bs_t<lv2_socket::poll> events) -> bool
+				{
+					if (events & lv2_socket::poll::write)
+					{
+						int native_error;
+						::socklen_t size = sizeof(native_error);
+						if (::getsockopt(sock.socket, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&native_error), &size) != 0 || size != sizeof(int))
+						{
+							sock.so_error = 1;
+						}
+						else
+						{
+							// TODO: check error formats (both native and translated)
+							sock.so_error = native_error ? get_last_error(false, native_error) : 0;
+						}
+
+						return true;
+					}
+
+					sock.events += lv2_socket::poll::write;
+					return false;
+				});
+			}
+
+			return false;
+		}
+
+#ifdef _WIN32
+		sock.is_connecting = true;
+#endif
+		sock.events += lv2_socket::poll::write;
+		sock.queue.emplace_back(ppu.id, [&](bs_t<lv2_socket::poll> events) -> bool
+		{
+			if (events & lv2_socket::poll::write)
+			{
+				int native_error;
+				::socklen_t size = sizeof(native_error);
+				if (::getsockopt(sock.socket, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&native_error), &size) != 0 || size != sizeof(int))
+				{
+					result = 1;
+				}
+				else
+				{
+					// TODO: check error formats (both native and translated)
+					result = native_error ? get_last_error(false, native_error) : 0;
+				}
+
+				lv2_obj::awake(&ppu);
 				return true;
 			}
 
-			auto lock = sock.lock();
-
-			sock.poll_queue(idm::get_unlocked<named_thread<ppu_thread>>(ppu.id), lv2_socket::poll_t::write, [&](bs_t<lv2_socket::poll_t> events) -> bool
-				{
-					if (events & lv2_socket::poll_t::write)
-					{
-						result = sock.connect_followup();
-
-						lv2_obj::awake(&ppu);
-						return true;
-					}
-					sock.set_poll_event(lv2_socket::poll_t::write);
-					return false;
-				});
-
-			lv2_obj::prepare_for_sleep(ppu);
-			lv2_obj::sleep(ppu);
+			sock.events += lv2_socket::poll::write;
 			return false;
 		});
 
+		lv2_obj::sleep(ppu);
+		return false;
+	});
+
 	if (!sock)
 	{
 		return -SYS_NET_EBADF;
 	}
 
-	if (sock.ret)
+	if (!sock.ret && result)
 	{
-		if (result < 0)
+		if (result == SYS_NET_EWOULDBLOCK || result == SYS_NET_EINPROGRESS)
 		{
-			return sys_net_error{result};
+			return not_an_error(-result);
 		}
 
-		return not_an_error(result);
+		return -sys_net_error{result};
 	}
 
 	if (!sock.ret)
@@ -577,23 +1813,18 @@ error_code sys_net_bnet_connect(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr
 				break;
 			}
 
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
+		}
+
+		if (result)
+		{
+			return -sys_net_error{result};
 		}
 
 		if (ppu.gpr[3] == static_cast<u64>(-SYS_NET_EINTR))
 		{
 			return -SYS_NET_EINTR;
 		}
-
-		if (result)
-		{
-			if (result < 0)
-			{
-				return sys_net_error{result};
-			}
-
-			return not_an_error(result);
-		}
 	}
 
 	return CELL_OK;
@@ -611,29 +1842,45 @@ error_code sys_net_bnet_getpeername(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sock
 		return -SYS_NET_EINVAL;
 	}
 
-	const auto sock = idm::check<lv2_socket>(s, [&, notify = lv2_obj::notify_all_t()](lv2_socket& sock) -> s32
+	::sockaddr_storage native_addr;
+	::socklen_t native_addrlen = sizeof(native_addr);
+
+	const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock) -> sys_net_error
+	{
+		std::lock_guard lock(sock.mutex);
+
+		ensure(sock.type != SYS_NET_SOCK_DGRAM_P2P);
+
+		if (::getpeername(sock.socket, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen) == 0)
 		{
-			auto [res, sn_addr] = sock.getpeername();
+			ensure(native_addr.ss_family == AF_INET);
 
-			if (res == CELL_OK)
-			{
-				*paddrlen = sizeof(sys_net_sockaddr);
-				*addr     = sn_addr;
-			}
+			return {};
+		}
 
-			return res;
-		});
+		return get_last_error(false);
+	});
 
 	if (!sock)
 	{
 		return -SYS_NET_EBADF;
 	}
 
-	if (sock.ret < 0)
+	if (sock.ret)
 	{
-		return sys_net_error{sock.ret};
+		return -sock.ret;
 	}
 
+	*paddrlen = sizeof(sys_net_sockaddr_in);
+
+	vm::ptr<sys_net_sockaddr_in> paddr = vm::cast(addr.addr());
+
+	paddr->sin_len    = sizeof(sys_net_sockaddr_in);
+	paddr->sin_family = SYS_NET_AF_INET;
+	paddr->sin_port   = std::bit_cast<be_t<u16>, u16>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
+	paddr->sin_addr   = std::bit_cast<be_t<u32>, u32>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr);
+	paddr->sin_zero   = 0;
+
 	return CELL_OK;
 }
 
@@ -649,27 +1896,67 @@ error_code sys_net_bnet_getsockname(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sock
 		return -SYS_NET_EINVAL;
 	}
 
-	const auto sock = idm::check<lv2_socket>(s, [&, notify = lv2_obj::notify_all_t()](lv2_socket& sock) -> s32
+	::sockaddr_storage native_addr;
+	::socklen_t native_addrlen = sizeof(native_addr);
+
+	lv2_socket_type type;
+	u16 p2p_vport;
+
+	const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock) -> sys_net_error
+	{
+		std::lock_guard lock(sock.mutex);
+
+		type = sock.type;
+		p2p_vport = sock.p2p.vport;
+
+		if (::getsockname(sock.socket, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen) == 0)
 		{
-			auto [res, sn_addr] = sock.getsockname();
+			ensure(native_addr.ss_family == AF_INET);
 
-			if (res == CELL_OK)
+			return {};
+		}
+		#ifdef _WIN32
+		else
+		{
+			// windows doesn't support getsockname for sockets that are not bound
+			if (get_native_error() == WSAEINVAL)
 			{
-				*paddrlen = sizeof(sys_net_sockaddr);
-				*addr     = sn_addr;
+				memset(&native_addr, 0, native_addrlen);
+				native_addr.ss_family = AF_INET;
+				return {};
 			}
+		}
+		#endif
 
-			return res;
-		});
+		return get_last_error(false);
+	});
 
 	if (!sock)
 	{
 		return -SYS_NET_EBADF;
 	}
 
-	if (sock.ret < 0)
+	if (sock.ret)
 	{
-		return sys_net_error{sock.ret};
+		return -sock.ret;
+	}
+
+	*paddrlen         = sizeof(sys_net_sockaddr_in);
+
+	vm::ptr<sys_net_sockaddr_in> paddr = vm::cast(addr.addr());
+	paddr->sin_len    = sizeof(sys_net_sockaddr_in);
+	paddr->sin_family = SYS_NET_AF_INET;
+	paddr->sin_port   = std::bit_cast<be_t<u16>, u16>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
+	paddr->sin_addr   = std::bit_cast<be_t<u32>, u32>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr);
+	paddr->sin_zero   = 0;
+
+	if (type == SYS_NET_SOCK_DGRAM_P2P)
+	{
+		vm::ptr<sys_net_sockaddr_in_p2p> paddr_p2p = vm::cast(addr.addr());
+		paddr_p2p->sin_vport                       = p2p_vport;
+		struct in_addr rep;
+		rep.s_addr = htonl(paddr->sin_addr);
+		sys_net.trace("[P2P] Reporting socket address as %s:%d:%d", rep, paddr_p2p->sin_port, paddr_p2p->sin_vport);
 	}
 
 	return CELL_OK;
@@ -679,21 +1966,7 @@ error_code sys_net_bnet_getsockopt(ppu_thread& ppu, s32 s, s32 level, s32 optnam
 {
 	ppu.state += cpu_flag::wait;
 
-	switch (level)
-	{
-	case SYS_NET_SOL_SOCKET:
-		sys_net.warning("sys_net_bnet_getsockopt(s=%d, level=SYS_NET_SOL_SOCKET, optname=%s, optval=*0x%x, optlen=%u)", s, static_cast<lv2_socket_option>(optname), optval, optlen);
-		break;
-	case SYS_NET_IPPROTO_TCP:
-		sys_net.warning("sys_net_bnet_getsockopt(s=%d, level=SYS_NET_IPPROTO_TCP, optname=%s, optval=*0x%x, optlen=%u)", s, static_cast<lv2_tcp_option>(optname), optval, optlen);
-		break;
-	case SYS_NET_IPPROTO_IP:
-		sys_net.warning("sys_net_bnet_getsockopt(s=%d, level=SYS_NET_IPPROTO_IP, optname=%s, optval=*0x%x, optlen=%u)", s, static_cast<lv2_ip_option>(optname), optval, optlen);
-		break;
-	default:
-		sys_net.warning("sys_net_bnet_getsockopt(s=%d, level=0x%x, optname=0x%x, optval=*0x%x, optlen=%u)", s, level, optname, optval, optlen);
-		break;
-	}
+	sys_net.warning("sys_net_bnet_getsockopt(s=%d, level=0x%x, optname=0x%x, optval=*0x%x, optlen=*0x%x)", s, level, optname, optval, optlen);
 
 	if (!optval || !optlen)
 	{
@@ -707,34 +1980,211 @@ error_code sys_net_bnet_getsockopt(ppu_thread& ppu, s32 s, s32 level, s32 optnam
 		return -SYS_NET_EINVAL;
 	}
 
-	const auto sock = idm::check<lv2_socket>(s, [&, notify = lv2_obj::notify_all_t()](lv2_socket& sock) -> s32
+	int native_level = -1;
+	int native_opt = -1;
+
+	union
+	{
+		char ch[128];
+		int _int = 0;
+		::timeval timeo;
+		::linger linger;
+	} native_val;
+	::socklen_t native_len = sizeof(native_val);
+
+	union
+	{
+		char ch[128];
+		be_t<s32> _int = 0;
+		sys_net_timeval timeo;
+		sys_net_linger linger;
+	} out_val;
+	u32 out_len = sizeof(out_val);
+
+	const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock) -> sys_net_error
+	{
+		std::lock_guard lock(sock.mutex);
+
+		if (len < sizeof(s32))
 		{
-			if (len < sizeof(s32))
+			return SYS_NET_EINVAL;
+		}
+
+		if (level == SYS_NET_SOL_SOCKET)
+		{
+			native_level = SOL_SOCKET;
+
+			switch (optname)
 			{
-				return -SYS_NET_EINVAL;
-			}
-
-			const auto& [res, out_val, out_len] = sock.getsockopt(level, optname, *optlen);
-
-			if (res == CELL_OK)
+			case SYS_NET_SO_NBIO:
 			{
-				std::memcpy(optval.get_ptr(), out_val.ch, out_len);
-				*optlen = out_len;
+				// Special
+				out_val._int = sock.so_nbio;
+				out_len = sizeof(s32);
+				return {};
 			}
+			case SYS_NET_SO_ERROR:
+			{
+				// Special
+				out_val._int = std::exchange(sock.so_error, 0);
+				out_len = sizeof(s32);
+				return {};
+			}
+			case SYS_NET_SO_KEEPALIVE:
+			{
+				native_opt = SO_KEEPALIVE;
+				break;
+			}
+			case SYS_NET_SO_SNDBUF:
+			{
+				native_opt = SO_SNDBUF;
+				break;
+			}
+			case SYS_NET_SO_RCVBUF:
+			{
+				native_opt = SO_RCVBUF;
+				break;
+			}
+			case SYS_NET_SO_SNDLOWAT:
+			{
+				native_opt = SO_SNDLOWAT;
+				break;
+			}
+			case SYS_NET_SO_RCVLOWAT:
+			{
+				native_opt = SO_RCVLOWAT;
+				break;
+			}
+			case SYS_NET_SO_BROADCAST:
+			{
+				native_opt = SO_BROADCAST;
+				break;
+			}
+#ifdef _WIN32
+			case SYS_NET_SO_REUSEADDR:
+			{
+				out_val._int = sock.so_reuseaddr;
+				out_len = sizeof(s32);
+				return {};
+			}
+			case SYS_NET_SO_REUSEPORT:
+			{
+				out_val._int = sock.so_reuseport;
+				out_len = sizeof(s32);
+				return {};
+			}
+#else
+			case SYS_NET_SO_REUSEADDR:
+			{
+				native_opt = SO_REUSEADDR;
+				break;
+			}
+			case SYS_NET_SO_REUSEPORT:
+			{
+				native_opt = SO_REUSEPORT;
+				break;
+			}
+#endif
+			case SYS_NET_SO_SNDTIMEO:
+			case SYS_NET_SO_RCVTIMEO:
+			{
+				if (len < sizeof(sys_net_timeval))
+					return SYS_NET_EINVAL;
 
-			return res;
-		});
+				native_opt = optname == SYS_NET_SO_SNDTIMEO ? SO_SNDTIMEO : SO_RCVTIMEO;
+				break;
+			}
+			case SYS_NET_SO_LINGER:
+			{
+				if (len < sizeof(sys_net_linger))
+					return SYS_NET_EINVAL;
+
+				native_opt = SO_LINGER;
+				break;
+			}
+			default:
+			{
+				sys_net.error("sys_net_bnet_getsockopt(s=%d, SOL_SOCKET): unknown option (0x%x)", s, optname);
+				return SYS_NET_EINVAL;
+			}
+			}
+		}
+		else if (level == SYS_NET_IPPROTO_TCP)
+		{
+			native_level = IPPROTO_TCP;
+
+			switch (optname)
+			{
+			case SYS_NET_TCP_MAXSEG:
+			{
+				// Special (no effect)
+				out_val._int = sock.so_tcp_maxseg;
+				out_len = sizeof(s32);
+				return {};
+			}
+			case SYS_NET_TCP_NODELAY:
+			{
+				native_opt = TCP_NODELAY;
+				break;
+			}
+			default:
+			{
+				sys_net.error("sys_net_bnet_getsockopt(s=%d, IPPROTO_TCP): unknown option (0x%x)", s, optname);
+				return SYS_NET_EINVAL;
+			}
+			}
+		}
+		else
+		{
+			sys_net.error("sys_net_bnet_getsockopt(s=%d): unknown level (0x%x)", s, level);
+			return SYS_NET_EINVAL;
+		}
+
+		if (::getsockopt(sock.socket, native_level, native_opt, native_val.ch, &native_len) != 0)
+		{
+			return get_last_error(false);
+		}
+
+		if (level == SYS_NET_SOL_SOCKET)
+		{
+			switch (optname)
+			{
+			case SYS_NET_SO_SNDTIMEO:
+			case SYS_NET_SO_RCVTIMEO:
+			{
+				// TODO
+				out_val.timeo = { ::narrow<s64>(native_val.timeo.tv_sec), ::narrow<s64>(native_val.timeo.tv_usec) };
+				out_len = sizeof(sys_net_timeval);
+				return {};
+			}
+			case SYS_NET_SO_LINGER:
+			{
+				// TODO
+				out_val.linger = { ::narrow<s32>(native_val.linger.l_onoff), ::narrow<s32>(native_val.linger.l_linger) };
+				out_len = sizeof(sys_net_linger);
+				return {};
+			}
+			}
+		}
+
+		// Fallback to int
+		out_val._int = native_val._int;
+		out_len = sizeof(s32);
+		return {};
+	});
 
 	if (!sock)
 	{
 		return -SYS_NET_EBADF;
 	}
 
-	if (sock.ret < 0)
+	if (sock.ret)
 	{
-		return sys_net_error{sock.ret};
+		return -sock.ret;
 	}
 
+	std::memcpy(optval.get_ptr(), out_val.ch, out_len);
+	*optlen = out_len;
 	return CELL_OK;
 }
 
@@ -749,19 +2199,34 @@ error_code sys_net_bnet_listen(ppu_thread& ppu, s32 s, s32 backlog)
 		return -SYS_NET_EINVAL;
 	}
 
-	const auto sock = idm::check<lv2_socket>(s, [&, notify = lv2_obj::notify_all_t()](lv2_socket& sock) -> s32
+	const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock) -> sys_net_error
+	{
+		std::lock_guard lock(sock.mutex);
+
+		ensure(sock.type == SYS_NET_SOCK_STREAM_P2P || sock.type == SYS_NET_SOCK_STREAM);
+
+		if (sock.type == SYS_NET_SOCK_STREAM_P2P)
 		{
-			return sock.listen(backlog);
-		});
+			sock.p2ps.status = lv2_socket::p2ps_i::stream_status::stream_listening;
+			sock.p2ps.max_backlog = backlog;
+			return {};
+		}
+		else if (::listen(sock.socket, backlog) == 0)
+		{
+			return {};
+		}
+
+		return get_last_error(false);
+	});
 
 	if (!sock)
 	{
 		return -SYS_NET_EBADF;
 	}
 
-	if (sock.ret < 0)
+	if (sock.ret)
 	{
-		return sys_net_error{sock.ret};
+		return -sock.ret;
 	}
 
 	return CELL_OK;
@@ -771,7 +2236,7 @@ error_code sys_net_bnet_recvfrom(ppu_thread& ppu, s32 s, vm::ptr<void> buf, u32
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_net.trace("sys_net_bnet_recvfrom(s=%d, buf=*0x%x, len=%u, flags=0x%x, addr=*0x%x, paddrlen=*0x%x)", s, buf, len, flags, addr, paddrlen);
+	sys_net.warning("sys_net_bnet_recvfrom(s=%d, buf=*0x%x, len=%u, flags=0x%x, addr=*0x%x, paddrlen=*0x%x)", s, buf, len, flags, addr, paddrlen);
 
 	// If addr is null, paddrlen must be null as well
 	if (!buf || !len || addr.operator bool() != paddrlen.operator bool())
@@ -779,79 +2244,249 @@ error_code sys_net_bnet_recvfrom(ppu_thread& ppu, s32 s, vm::ptr<void> buf, u32
 		return -SYS_NET_EINVAL;
 	}
 
-	if (flags & ~(SYS_NET_MSG_PEEK | SYS_NET_MSG_DONTWAIT | SYS_NET_MSG_WAITALL | SYS_NET_MSG_USECRYPTO | SYS_NET_MSG_USESIGNATURE))
+	if (flags & ~(SYS_NET_MSG_PEEK | SYS_NET_MSG_DONTWAIT | SYS_NET_MSG_WAITALL))
 	{
 		fmt::throw_exception("sys_net_bnet_recvfrom(s=%d): unknown flags (0x%x)", flags);
 	}
 
-	s32 result = 0;
-	sys_net_sockaddr sn_addr{};
+	int native_flags = 0;
+	int native_result = -1;
+	::sockaddr_storage native_addr;
+	::socklen_t native_addrlen = sizeof(native_addr);
+	sys_net_error result{};
+	std::vector<u8> _buf(len);
 
-	const auto sock = idm::check<lv2_socket>(s, [&, notify = lv2_obj::notify_all_t()](lv2_socket& sock)
+	if (flags & SYS_NET_MSG_PEEK)
+	{
+		native_flags |= MSG_PEEK;
+	}
+
+	if (flags & SYS_NET_MSG_WAITALL)
+	{
+		native_flags |= MSG_WAITALL;
+	}
+
+	s32 type = 0;
+
+	const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock)
+	{
+		type = sock.type;
+		std::lock_guard lock(sock.mutex);
+
+		//if (!(sock.events & lv2_socket::poll::read))
 		{
-			const auto success = sock.recvfrom(flags, len);
-
-			if (success)
+			auto& nph = g_fxo->get<named_thread<np_handler>>();
+			if (nph.is_dns(s) && nph.is_dns_queue(s))
 			{
-				const auto& [res, vec, res_addr] = *success;
-				if (res > 0)
-				{
-					sn_addr = res_addr;
-					std::memcpy(buf.get_ptr(), vec.data(), res);
-					sys_net_dump_data("recvfrom", vec.data(), res, &res_addr);
-				}
+				const auto packet = nph.get_dns_packet(s);
+				ensure(packet.size() < len);
+
+				memcpy(buf.get_ptr(), packet.data(), packet.size());
+				native_result = ::narrow<int>(packet.size());
+
+				native_addr.ss_family = AF_INET;
+				(reinterpret_cast<::sockaddr_in*>(&native_addr))->sin_port = std::bit_cast<u16, be_t<u16>>(53); // htons(53)
+				(reinterpret_cast<::sockaddr_in*>(&native_addr))->sin_addr.s_addr = nph.get_dns_ip();
 
-				result = res;
 				return true;
 			}
 
-			auto lock = sock.lock();
+			if (sock.type == SYS_NET_SOCK_DGRAM_P2P)
+			{
+				sys_net.trace("[P2P] p2p_data for vport %d contains %d elements", sock.p2p.vport, sock.p2p.data.size());
 
-			sock.poll_queue(idm::get_unlocked<named_thread<ppu_thread>>(ppu.id), lv2_socket::poll_t::read, [&](bs_t<lv2_socket::poll_t> events) -> bool
+				if (sock.p2p.data.empty())
 				{
-					if (events & lv2_socket::poll_t::read)
-					{
-						const auto success = sock.recvfrom(flags, len, false);
-
-						if (success)
-						{
-							const auto& [res, vec, res_addr] = *success;
-							if (res > 0)
-							{
-								sn_addr = res_addr;
-								std::memcpy(buf.get_ptr(), vec.data(), res);
-								sys_net_dump_data("recvfrom", vec.data(), res, &res_addr);
-							}
-							result = res;
-							lv2_obj::awake(&ppu);
-							return true;
-						}
-					}
-
-					if (sock.so_rcvtimeo && get_guest_system_time() - ppu.start_time > sock.so_rcvtimeo)
-					{
-						result = -SYS_NET_EWOULDBLOCK;
-						lv2_obj::awake(&ppu);
-						return true;
-					}
-
-					sock.set_poll_event(lv2_socket::poll_t::read);
+					result = SYS_NET_EWOULDBLOCK;
 					return false;
-				});
+				}
 
-			lv2_obj::prepare_for_sleep(ppu);
-			lv2_obj::sleep(ppu);
+				const auto& p2p_data = sock.p2p.data.front();
+				native_result = std::min(len, static_cast<u32>(p2p_data.second.size()));
+				memcpy(buf.get_ptr(), p2p_data.second.data(), native_result);
+
+				if (addr)
+				{
+					*paddrlen = sizeof(sys_net_sockaddr_in);
+					memcpy(addr.get_ptr(), &p2p_data.first, addr.size());
+				}
+
+				sock.p2p.data.pop();
+
+				return true;
+			}
+
+			if (sock.type == SYS_NET_SOCK_STREAM_P2P)
+			{
+				const auto get_data = [&](unsigned char *dest_buf)
+				{
+					const u32 to_give = std::min(sock.p2ps.data_available, len);
+					sys_net.trace("STREAM-P2P socket had %d available, given %d", sock.p2ps.data_available, to_give);
+
+					u32 left_to_give = to_give;
+					while (left_to_give)
+					{
+						auto& cur_data               = sock.p2ps.received_data.begin()->second;
+						auto to_give_for_this_packet = std::min(static_cast<u32>(cur_data.size()), left_to_give);
+						memcpy(reinterpret_cast<u8*>(dest_buf) + (to_give - left_to_give), cur_data.data(), to_give_for_this_packet);
+						if (cur_data.size() != to_give_for_this_packet)
+						{
+							auto amount_left = cur_data.size() - to_give_for_this_packet;
+							std::vector<u8> new_vec(amount_left);
+							memcpy(new_vec.data(), cur_data.data() + to_give_for_this_packet, amount_left);
+							auto new_key = (sock.p2ps.received_data.begin()->first) + to_give_for_this_packet;
+							sock.p2ps.received_data.emplace(new_key, std::move(new_vec));
+						}
+
+						sock.p2ps.received_data.erase(sock.p2ps.received_data.begin());
+
+						left_to_give -= to_give_for_this_packet;
+					}
+
+					sock.p2ps.data_available -= to_give;
+					sock.p2ps.data_beg_seq += to_give;
+					native_result = to_give;
+
+					if (addr)
+					{
+						sys_net_sockaddr_in_p2p* addr_p2p = reinterpret_cast<sys_net_sockaddr_in_p2p*>(addr.get_ptr());
+						addr_p2p->sin_family              = AF_INET;
+						addr_p2p->sin_addr                = std::bit_cast<be_t<u32>, u32>(sock.p2ps.op_addr);
+						addr_p2p->sin_port                = sock.p2ps.op_vport;
+						addr_p2p->sin_vport               = sock.p2ps.op_port;
+						addr_p2p->sin_len                 = sizeof(sys_net_sockaddr_in_p2p);
+					}
+				};
+
+				if (!sock.p2ps.data_available)
+				{
+					if (sock.so_nbio)
+					{
+						result = SYS_NET_EWOULDBLOCK;
+						return false;
+					}
+
+					sock.events += lv2_socket::poll::read;
+					sock.queue.emplace_back(ppu.id, [&](bs_t<lv2_socket::poll> events) -> bool
+					{
+						if (events & lv2_socket::poll::read)
+						{
+							if (sock.p2ps.data_available)
+							{
+								get_data(_buf.data());
+								lv2_obj::awake(&ppu);
+								return true;
+							}
+						}
+
+						sock.events += lv2_socket::poll::read;
+						return false;
+					});
+
+					lv2_obj::sleep(ppu);
+					return false;
+				}
+
+				get_data(static_cast<unsigned char *>(buf.get_ptr()));
+				return true;
+			}
+
+			native_result = ::recvfrom(sock.socket, static_cast<char*>(buf.get_ptr()), len, native_flags, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen);
+
+			if (native_result >= 0)
+			{
+				if (sys_net_dump.enabled == logs::level::trace)
+				{
+					std::string datrace;
+					const char hex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+					u8* dabuf = static_cast<u8 *>(buf.get_ptr());
+
+					for (s32 index = 0; index < native_result; index++)
+					{
+						if ((index % 16) == 0)
+							datrace += '\n';
+
+						datrace += hex[(dabuf[index] >> 4) & 15];
+						datrace += hex[(dabuf[index]) & 15];
+						datrace += ' ';
+					}
+					sys_net.trace("recvfrom dump: %s", datrace);
+				}
+
+				return true;
+			}
+#ifdef _WIN32
+			else
+			{
+				// Windows returns an error when trying to peek at a message and buffer not long enough to contain the whole message, should be ignored
+				if ((native_flags & MSG_PEEK) && get_native_error() == WSAEMSGSIZE)
+				{
+					native_result = len;
+					return true;
+				}
+				// Windows will return WSASHUTDOWN when the connection is shutdown, POSIX just returns EOF (0) in this situation.
+				if( get_native_error() == WSAESHUTDOWN)
+				{
+					native_result = 0;
+					return true;
+				}
+			}
+#endif
+
+			result = get_last_error(!sock.so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0);
+
+			if (result)
+			{
+				return false;
+			}
+		}
+
+		// Enable read event
+		sock.events += lv2_socket::poll::read;
+		sock.queue.emplace_back(ppu.id, [&](bs_t<lv2_socket::poll> events) -> bool
+		{
+			if (events & lv2_socket::poll::read)
+			{
+				native_result = ::recvfrom(sock.socket, reinterpret_cast<char *>(_buf.data()), len, native_flags, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen);
+
+				if (native_result >= 0 || (result = get_last_error(!sock.so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0)))
+				{
+					lv2_obj::awake(&ppu);
+					return true;
+				}
+			}
+
+			sock.events += lv2_socket::poll::read;
 			return false;
 		});
 
+		lv2_obj::sleep(ppu);
+		return false;
+	});
+
 	if (!sock)
 	{
+		if (type == SYS_NET_SOCK_DGRAM_P2P)
+			sys_net.error("[P2P] Error recvfrom(bad socket)");
 		return -SYS_NET_EBADF;
 	}
 
+	if (!sock.ret && result)
+	{
+		if (result == SYS_NET_EWOULDBLOCK)
+		{
+			return not_an_error(-result);
+		}
+
+		if (type == SYS_NET_SOCK_DGRAM_P2P)
+			sys_net.error("[P2P] Error recvfrom(result early): %d", result);
+
+		return -result;
+	}
+
 	if (!sock.ret)
 	{
-
 		while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
 		{
 			if (is_stopped(state))
@@ -864,34 +2499,52 @@ error_code sys_net_bnet_recvfrom(ppu_thread& ppu, s32 s, vm::ptr<void> buf, u32
 				break;
 			}
 
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
+		}
+
+		if (result)
+		{
+			if (type == SYS_NET_SOCK_DGRAM_P2P)
+				sys_net.error("[P2P] Error recvfrom(result): %d", result);
+			return -result;
 		}
 
 		if (ppu.gpr[3] == static_cast<u64>(-SYS_NET_EINTR))
 		{
+			if (type == SYS_NET_SOCK_DGRAM_P2P)
+				sys_net.error("[P2P] Error recvfrom(interrupted)");
 			return -SYS_NET_EINTR;
 		}
+
+		std::memcpy(buf.get_ptr(), _buf.data(), len);
 	}
 
-	static_cast<void>(ppu.test_stopped());
-
-	if (result == -SYS_NET_EWOULDBLOCK)
+	if (ppu.is_stopped())
 	{
-		return not_an_error(result);
+		return {};
 	}
 
-	if (result >= 0)
+	// addr is set earlier for P2P socket
+	if (addr && type != SYS_NET_SOCK_DGRAM_P2P && type != SYS_NET_SOCK_STREAM_P2P)
 	{
-		if (addr)
-		{
-			*paddrlen = sizeof(sys_net_sockaddr_in);
-			*addr     = sn_addr;
-		}
+		ensure(native_addr.ss_family == AF_INET);
 
-		return not_an_error(result);
+		vm::ptr<sys_net_sockaddr_in> paddr = vm::cast(addr.addr());
+
+		*paddrlen         = sizeof(sys_net_sockaddr_in);
+
+		paddr->sin_len    = sizeof(sys_net_sockaddr_in);
+		paddr->sin_family = SYS_NET_AF_INET;
+		paddr->sin_port   = std::bit_cast<be_t<u16>, u16>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
+		paddr->sin_addr   = std::bit_cast<be_t<u32>, u32>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr);
+		paddr->sin_zero   = 0;
 	}
 
-	return sys_net_error{result};
+	// Length
+	if (type == SYS_NET_SOCK_DGRAM_P2P || type == SYS_NET_SOCK_STREAM_P2P)
+		sys_net.trace("[P2P] %s Ok recvfrom: %d", type, native_result);
+
+	return not_an_error(native_result);
 }
 
 error_code sys_net_bnet_recvmsg(ppu_thread& ppu, s32 s, vm::ptr<sys_net_msghdr> msg, s32 flags)
@@ -906,88 +2559,17 @@ error_code sys_net_bnet_sendmsg(ppu_thread& ppu, s32 s, vm::cptr<sys_net_msghdr>
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_net.warning("sys_net_bnet_sendmsg(s=%d, msg=*0x%x, flags=0x%x)", s, msg, flags);
-
-	if (flags & ~(SYS_NET_MSG_DONTWAIT | SYS_NET_MSG_WAITALL | SYS_NET_MSG_USECRYPTO | SYS_NET_MSG_USESIGNATURE))
-	{
-		fmt::throw_exception("sys_net_bnet_sendmsg(s=%d): unknown flags (0x%x)", flags);
-	}
-
-	s32 result{};
-
-	const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock)
-		{
-			auto netmsg = msg.get_ptr();
-			const auto success = sock.sendmsg(flags, *netmsg);
-
-			if (success)
-			{
-				result = *success;
-
-				return true;
-			}
-
-			sock.poll_queue(idm::get_unlocked<named_thread<ppu_thread>>(ppu.id), lv2_socket::poll_t::write, [&](bs_t<lv2_socket::poll_t> events) -> bool
-				{
-					if (events & lv2_socket::poll_t::write)
-					{
-						const auto success = sock.sendmsg(flags, *netmsg, false);
-
-						if (success)
-						{
-							result = *success;
-							lv2_obj::awake(&ppu);
-							return true;
-						}
-					}
-
-					sock.set_poll_event(lv2_socket::poll_t::write);
-					return false;
-				});
-
-			lv2_obj::sleep(ppu);
-			return false;
-		});
-
-	if (!sock)
-	{
-		return -SYS_NET_EBADF;
-	}
-
-	if (!sock.ret)
-	{
-		while (true)
-		{
-			const auto state = ppu.state.fetch_sub(cpu_flag::signal);
-			if (is_stopped(state) || state & cpu_flag::signal)
-			{
-				break;
-			}
-			thread_ctrl::wait_on(ppu.state, state);
-		}
-
-		if (ppu.gpr[3] == static_cast<u64>(-SYS_NET_EINTR))
-		{
-			return -SYS_NET_EINTR;
-		}
-	}
-
-	if (result >= 0 || result == -SYS_NET_EWOULDBLOCK)
-	{
-		return not_an_error(result);
-	}
-
-
-	return sys_net_error{result};
+	sys_net.todo("sys_net_bnet_sendmsg(s=%d, msg=*0x%x, flags=0x%x)", s, msg, flags);
+	return CELL_OK;
 }
 
 error_code sys_net_bnet_sendto(ppu_thread& ppu, s32 s, vm::cptr<void> buf, u32 len, s32 flags, vm::cptr<sys_net_sockaddr> addr, u32 addrlen)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_net.trace("sys_net_bnet_sendto(s=%d, buf=*0x%x, len=%u, flags=0x%x, addr=*0x%x, addrlen=%u)", s, buf, len, flags, addr, addrlen);
+	sys_net.warning("sys_net_bnet_sendto(s=%d, buf=*0x%x, len=%u, flags=0x%x, addr=*0x%x, addrlen=%u)", s, buf, len, flags, addr, addrlen);
 
-	if (flags & ~(SYS_NET_MSG_DONTWAIT | SYS_NET_MSG_WAITALL | SYS_NET_MSG_USECRYPTO | SYS_NET_MSG_USESIGNATURE))
+	if (flags & ~(SYS_NET_MSG_DONTWAIT | SYS_NET_MSG_WAITALL))
 	{
 		fmt::throw_exception("sys_net_bnet_sendto(s=%d): unknown flags (0x%x)", flags);
 	}
@@ -1004,69 +2586,207 @@ error_code sys_net_bnet_sendto(ppu_thread& ppu, s32 s, vm::cptr<void> buf, u32 l
 		return -SYS_NET_EAFNOSUPPORT;
 	}
 
-	sys_net_dump_data("sendto", static_cast<const u8*>(buf.get_ptr()), len, addr ? addr.get_ptr() : nullptr);
+	const auto psa_in = vm::_ptr<const sys_net_sockaddr_in>(addr.addr());
 
-	const std::optional<sys_net_sockaddr> sn_addr = addr ? std::optional<sys_net_sockaddr>(*addr) : std::nullopt;
-	const std::vector<u8> buf_copy(vm::_ptr<const char>(buf.addr()), vm::_ptr<const char>(buf.addr()) + len);
-	s32 result{};
+	int native_flags = 0;
+	int native_result = -1;
+	::sockaddr_in name{};
+	std::vector<u8> _buf;
 
-	const auto sock = idm::check<lv2_socket>(s, [&, notify = lv2_obj::notify_all_t()](lv2_socket& sock)
+	if (idm::check<lv2_socket>(s))
+	{
+		_buf.assign(vm::_ptr<const char>(buf.addr()), vm::_ptr<const char>(buf.addr()) + len);
+	}
+	else
+	{
+		return -SYS_NET_EBADF;
+	}
+
+	if (addr)
+	{
+		name.sin_family      = AF_INET;
+		name.sin_port        = std::bit_cast<u16>(psa_in->sin_port);
+		name.sin_addr.s_addr = std::bit_cast<u32>(psa_in->sin_addr);
+
+		char ip_str[16];
+		inet_ntop(AF_INET, &name.sin_addr, ip_str, sizeof(ip_str));
+		sys_net.trace("Sending to %s:%d", ip_str, psa_in->sin_port);
+	}
+
+	::socklen_t namelen = sizeof(name);
+	sys_net_error result{};
+
+	if (flags & SYS_NET_MSG_WAITALL)
+	{
+		native_flags |= MSG_WAITALL;
+	}
+
+	std::vector<u8> p2p_data;
+	char *data = reinterpret_cast<char *>(_buf.data());
+	u32 data_len = len;
+
+	s32 type        = 0;
+	const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock)
+	{
+		std::lock_guard lock(sock.mutex);
+		type = sock.type;
+
+		if (type == SYS_NET_SOCK_DGRAM_P2P)
 		{
-			auto success = sock.sendto(flags, buf_copy, sn_addr);
+			ensure(addr);
+			ensure(sock.socket); // ensures it has been bound
+			ensure(len <= (65535 - sizeof(u16))); // catch games using full payload for future fragmentation implementation if necessary
+			const u16 p2p_port  = reinterpret_cast<const sys_net_sockaddr_in*>(addr.get_ptr())->sin_port;
+			const u16 p2p_vport = reinterpret_cast<const sys_net_sockaddr_in_p2p*>(addr.get_ptr())->sin_vport;
 
-			if (success)
+			char ip_str[16];
+			inet_ntop(AF_INET, &name.sin_addr, ip_str, sizeof(ip_str));
+			sys_net.trace("[P2P] Sending a packet to %s:%d:%d", ip_str, p2p_port, p2p_vport);
+
+			p2p_data.resize(len + sizeof(u16));
+			reinterpret_cast<le_t<u16>&>(p2p_data[0]) = p2p_vport;
+			memcpy(p2p_data.data()+sizeof(u16), _buf.data(), len);
+
+			data = reinterpret_cast<char *>(p2p_data.data());
+			data_len = len + sizeof(u16);
+		}
+		else if (type == SYS_NET_SOCK_STREAM_P2P)
+		{
+			constexpr s64 max_data_len = (65535 - (sizeof(u16) + sizeof(lv2_socket::p2ps_i::encapsulated_tcp)));
+
+			// Prepare address
+			name.sin_family = AF_INET;
+			name.sin_port        = std::bit_cast<u16, be_t<u16>>(sock.p2ps.op_port);
+			name.sin_addr.s_addr = sock.p2ps.op_addr;
+			// Prepares encapsulated tcp
+			lv2_socket::p2ps_i::encapsulated_tcp tcp_header;
+			tcp_header.src_port = sock.p2p.vport;
+			tcp_header.dst_port = sock.p2ps.op_vport;
+			// chop it up
+			std::vector<std::vector<u8>> stream_packets;
+			s64 cur_total_len = len;
+			while(cur_total_len > 0)
 			{
-				result = *success;
+				s64 cur_data_len;
+				if (cur_total_len >= max_data_len)
+					cur_data_len = max_data_len;
+				else
+					cur_data_len = cur_total_len;
+
+				tcp_header.length = cur_data_len;
+				tcp_header.seq = sock.p2ps.cur_seq;
+
+				auto packet       = nt_p2p_port::generate_u2s_packet(tcp_header, &_buf[len - cur_total_len], cur_data_len);
+				nt_p2p_port::send_u2s_packet(sock, s, std::move(packet), &name, tcp_header.seq);
+
+				cur_total_len -= cur_data_len;
+				sock.p2ps.cur_seq += cur_data_len;
+			}
+
+			native_result = len;
+			return true;
+		}
+
+		//if (!(sock.events & lv2_socket::poll::write))
+		{
+			auto& nph = g_fxo->get<named_thread<np_handler>>();
+			if (addr && type == SYS_NET_SOCK_DGRAM && psa_in->sin_port == 53)
+			{
+				nph.add_dns_spy(s);
+			}
+
+			if (nph.is_dns(s))
+			{
+				const s32 ret_analyzer = nph.analyze_dns_packet(s, reinterpret_cast<const u8*>(_buf.data()), len);
+
+				// If we're not connected just never send the packet and pretend we did
+				if (!nph.get_net_status())
+				{
+					native_result = data_len;
+					return true;
+				}
+
+				// Check if the packet is intercepted
+				if (ret_analyzer >= 0)
+				{
+					native_result = ret_analyzer;
+					return true;
+				}
+			}
+
+			native_result = ::sendto(sock.socket, data, data_len, native_flags, addr ? reinterpret_cast<struct sockaddr*>(&name) : nullptr, addr ? namelen : 0);
+
+			if (native_result >= 0)
+			{
+				if (sock.type == SYS_NET_SOCK_DGRAM_P2P)
+				{
+					native_result -= sizeof(u16);
+				}
 				return true;
 			}
 
-			auto lock = sock.lock();
+			result = get_last_error(!sock.so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0);
 
-			// Enable write event
-			sock.poll_queue(idm::get_unlocked<named_thread<ppu_thread>>(ppu.id), lv2_socket::poll_t::write, [&](bs_t<lv2_socket::poll_t> events) -> bool
+			if (result)
+			{
+				return false;
+			}
+		}
+
+		// Enable write event
+		sock.events += lv2_socket::poll::write;
+		sock.queue.emplace_back(ppu.id, [&](bs_t<lv2_socket::poll> events) -> bool
+		{
+			if (events & lv2_socket::poll::write)
+			{
+				native_result = ::sendto(sock.socket, data, data_len, native_flags, addr ? reinterpret_cast<struct sockaddr*>(&name) : nullptr, addr ? namelen : 0);
+
+				if (native_result >= 0 || (result = get_last_error(!sock.so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0)))
 				{
-					if (events & lv2_socket::poll_t::write)
-					{
-						auto success = sock.sendto(flags, buf_copy, sn_addr, false);
-						if (success)
-						{
-							result = *success;
-							lv2_obj::awake(&ppu);
-							return true;
-						}
-					}
+					lv2_obj::awake(&ppu);
+					return true;
+				}
+			}
 
-					if (sock.so_sendtimeo && get_guest_system_time() - ppu.start_time > sock.so_sendtimeo)
-					{
-						result = -SYS_NET_EWOULDBLOCK;
-						lv2_obj::awake(&ppu);
-						return true;
-					}
-
-					sock.set_poll_event(lv2_socket::poll_t::write);
-					return false;
-				});
-
-			lv2_obj::prepare_for_sleep(ppu);
-			lv2_obj::sleep(ppu);
+			sock.events += lv2_socket::poll::write;
 			return false;
 		});
 
+		lv2_obj::sleep(ppu);
+		return false;
+	});
+
 	if (!sock)
 	{
 		return -SYS_NET_EBADF;
 	}
 
+	if (!sock.ret && result)
+	{
+		if (result == SYS_NET_EWOULDBLOCK)
+		{
+			return not_an_error(-result);
+		}
+		return -result;
+	}
+
 	if (!sock.ret)
 	{
 		while (true)
 		{
 			const auto state = ppu.state.fetch_sub(cpu_flag::signal);
+
 			if (is_stopped(state) || state & cpu_flag::signal)
 			{
 				break;
 			}
-			ppu.state.wait(state);
+
+			thread_ctrl::wait_on(ppu.state, state);
+		}
+
+		if (result)
+		{
+			return -result;
 		}
 
 		if (ppu.gpr[3] == static_cast<u64>(-SYS_NET_EINTR))
@@ -1075,73 +2795,236 @@ error_code sys_net_bnet_sendto(ppu_thread& ppu, s32 s, vm::cptr<void> buf, u32 l
 		}
 	}
 
-	if (result >= 0 || result == -SYS_NET_EWOULDBLOCK)
-	{
-		return not_an_error(result);
-	}
-
-	return sys_net_error{result};
+	return not_an_error(native_result);
 }
 
 error_code sys_net_bnet_setsockopt(ppu_thread& ppu, s32 s, s32 level, s32 optname, vm::cptr<void> optval, u32 optlen)
 {
 	ppu.state += cpu_flag::wait;
 
-	switch (level)
+	sys_net.warning("sys_net_bnet_setsockopt(s=%d, level=0x%x, optname=0x%x, optval=*0x%x, optlen=%u)", s, level, optname, optval, optlen);
+	switch(optlen)
 	{
-	case SYS_NET_SOL_SOCKET:
-		sys_net.warning("sys_net_bnet_setsockopt(s=%d, level=SYS_NET_SOL_SOCKET, optname=%s, optval=*0x%x, optlen=%u)", s, static_cast<lv2_socket_option>(optname), optval, optlen);
-		break;
-	case SYS_NET_IPPROTO_TCP:
-		sys_net.warning("sys_net_bnet_setsockopt(s=%d, level=SYS_NET_IPPROTO_TCP, optname=%s, optval=*0x%x, optlen=%u)", s, static_cast<lv2_tcp_option>(optname), optval, optlen);
-		break;
-	case SYS_NET_IPPROTO_IP:
-		sys_net.warning("sys_net_bnet_setsockopt(s=%d, level=SYS_NET_IPPROTO_IP, optname=%s, optval=*0x%x, optlen=%u)", s, static_cast<lv2_ip_option>(optname), optval, optlen);
-		break;
-	default:
-		sys_net.warning("sys_net_bnet_setsockopt(s=%d, level=0x%x, optname=0x%x, optval=*0x%x, optlen=%u)", s, level, optname, optval, optlen);
-		break;
+		case 1:
+			sys_net.warning("optval: 0x%02X", *static_cast<const u8 *>(optval.get_ptr()));
+			break;
+		case 2:
+			sys_net.warning("optval: 0x%04X", *static_cast<const be_t<u16> *>(optval.get_ptr()));
+			break;
+		case 4:
+			sys_net.warning("optval: 0x%08X", *static_cast<const be_t<u32> *>(optval.get_ptr()));
+			break;
+		case 8:
+			sys_net.warning("optval: 0x%016X", *static_cast<const be_t<u64> *>(optval.get_ptr()));
+			break;
 	}
 
-	switch (optlen)
+	int native_int = 0;
+	int native_level = -1;
+	int native_opt = -1;
+	const void* native_val = &native_int;
+	::socklen_t native_len = sizeof(int);
+	::linger native_linger;
+
+#ifdef _WIN32
+	u32 native_timeo;
+#else
+	::timeval native_timeo;
+#endif
+
+	std::vector<char> optval_buf(vm::_ptr<char>(optval.addr()), vm::_ptr<char>(optval.addr() + optlen));
+
+	const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock) -> sys_net_error
 	{
-	case 1:
-		sys_net.warning("optval: 0x%02X", *static_cast<const u8*>(optval.get_ptr()));
-		break;
-	case 2:
-		sys_net.warning("optval: 0x%04X", *static_cast<const be_t<u16>*>(optval.get_ptr()));
-		break;
-	case 4:
-		sys_net.warning("optval: 0x%08X", *static_cast<const be_t<u32>*>(optval.get_ptr()));
-		break;
-	case 8:
-		sys_net.warning("optval: 0x%016X", *static_cast<const be_t<u64>*>(optval.get_ptr()));
-		break;
-	}
+		std::lock_guard lock(sock.mutex);
 
-	if (optlen < sizeof(s32))
-	{
-		return -SYS_NET_EINVAL;
-	}
-
-	std::vector<u8> optval_copy(vm::_ptr<u8>(optval.addr()), vm::_ptr<u8>(optval.addr() + optlen));
-
-	const auto sock = idm::check<lv2_socket>(s, [&, notify = lv2_obj::notify_all_t()](lv2_socket& sock) -> s32
+		if (optlen >= sizeof(s32))
 		{
-			return sock.setsockopt(level, optname, optval_copy);
-		});
+			native_int = *reinterpret_cast<be_t<s32> *>(optval_buf.data());
+		}
+		else
+		{
+			return SYS_NET_EINVAL;
+		}
+
+		if (sock.type == SYS_NET_SOCK_DGRAM_P2P || sock.type == SYS_NET_SOCK_STREAM_P2P)
+		{
+			if (level == SYS_NET_SOL_SOCKET && optname == SYS_NET_SO_NBIO)
+			{
+				sock.so_nbio = native_int;
+			}
+
+			return {};
+		}
+
+		if (level == SYS_NET_SOL_SOCKET)
+		{
+			native_level = SOL_SOCKET;
+
+			switch (optname)
+			{
+			case SYS_NET_SO_NBIO:
+			{
+				// Special
+				sock.so_nbio = native_int;
+				return {};
+			}
+			case SYS_NET_SO_KEEPALIVE:
+			{
+				native_opt = SO_KEEPALIVE;
+				break;
+			}
+			case SYS_NET_SO_SNDBUF:
+			{
+				native_opt = SO_SNDBUF;
+				break;
+			}
+			case SYS_NET_SO_RCVBUF:
+			{
+				native_opt = SO_RCVBUF;
+				break;
+			}
+			case SYS_NET_SO_SNDLOWAT:
+			{
+				native_opt = SO_SNDLOWAT;
+				break;
+			}
+			case SYS_NET_SO_RCVLOWAT:
+			{
+				native_opt = SO_RCVLOWAT;
+				break;
+			}
+			case SYS_NET_SO_BROADCAST:
+			{
+				native_opt = SO_BROADCAST;
+				break;
+			}
+#ifdef _WIN32
+			case SYS_NET_SO_REUSEADDR:
+			{
+				native_opt = SO_REUSEADDR;
+				sock.so_reuseaddr = native_int;
+				native_int = sock.so_reuseaddr || sock.so_reuseport ? 1 : 0;
+				break;
+			}
+			case SYS_NET_SO_REUSEPORT:
+			{
+				native_opt = SO_REUSEADDR;
+				sock.so_reuseport = native_int;
+				native_int = sock.so_reuseaddr || sock.so_reuseport ? 1 : 0;
+				break;
+			}
+#else
+			case SYS_NET_SO_REUSEADDR:
+			{
+				native_opt = SO_REUSEADDR;
+				break;
+			}
+			case SYS_NET_SO_REUSEPORT:
+			{
+				native_opt = SO_REUSEPORT;
+				break;
+			}
+#endif
+			case SYS_NET_SO_SNDTIMEO:
+			case SYS_NET_SO_RCVTIMEO:
+			{
+				if (optlen < sizeof(sys_net_timeval))
+					return SYS_NET_EINVAL;
+
+				native_opt = optname == SYS_NET_SO_SNDTIMEO ? SO_SNDTIMEO : SO_RCVTIMEO;
+				native_val = &native_timeo;
+				native_len = sizeof(native_timeo);
+#ifdef _WIN32
+				native_timeo = ::narrow<int>(reinterpret_cast<sys_net_timeval*>(optval_buf.data())->tv_sec) * 1000;
+				native_timeo += ::narrow<int>(reinterpret_cast<sys_net_timeval*>(optval_buf.data())->tv_usec) / 1000;
+#else
+				native_timeo.tv_sec = ::narrow<int>(reinterpret_cast<sys_net_timeval*>(optval_buf.data())->tv_sec);
+				native_timeo.tv_usec = ::narrow<int>(reinterpret_cast<sys_net_timeval*>(optval_buf.data())->tv_usec);
+#endif
+				break;
+			}
+			case SYS_NET_SO_LINGER:
+			{
+				if (optlen < sizeof(sys_net_linger))
+					return SYS_NET_EINVAL;
+
+				// TODO
+				native_opt = SO_LINGER;
+				native_val = &native_linger;
+				native_len = sizeof(native_linger);
+				native_linger.l_onoff = reinterpret_cast<sys_net_linger*>(optval_buf.data())->l_onoff;
+				native_linger.l_linger = reinterpret_cast<sys_net_linger*>(optval_buf.data())->l_linger;
+				break;
+			}
+			case SYS_NET_SO_USECRYPTO:
+			{
+				//TODO
+				sys_net.error("sys_net_bnet_setsockopt(s=%d, SOL_SOCKET): Stubbed option (0x%x) (SYS_NET_SO_USECRYPTO)", s, optname);
+				return {};
+			}
+			case SYS_NET_SO_USESIGNATURE:
+			{
+				//TODO
+				sys_net.error("sys_net_bnet_setsockopt(s=%d, SOL_SOCKET): Stubbed option (0x%x) (SYS_NET_SO_USESIGNATURE)", s, optname);
+				return {};
+			}
+			default:
+			{
+				sys_net.error("sys_net_bnet_setsockopt(s=%d, SOL_SOCKET): unknown option (0x%x)", s, optname);
+				return SYS_NET_EINVAL;
+			}
+			}
+		}
+		else if (level == SYS_NET_IPPROTO_TCP)
+		{
+			native_level = IPPROTO_TCP;
+
+			switch (optname)
+			{
+			case SYS_NET_TCP_MAXSEG:
+			{
+				// Special (no effect)
+				sock.so_tcp_maxseg = native_int;
+				return {};
+			}
+			case SYS_NET_TCP_NODELAY:
+			{
+				native_opt = TCP_NODELAY;
+				break;
+			}
+			default:
+			{
+				sys_net.error("sys_net_bnet_setsockopt(s=%d, IPPROTO_TCP): unknown option (0x%x)", s, optname);
+				return SYS_NET_EINVAL;
+			}
+			}
+		}
+		else
+		{
+			sys_net.error("sys_net_bnet_setsockopt(s=%d): unknown level (0x%x)", s, level);
+			return SYS_NET_EINVAL;
+		}
+
+		if (::setsockopt(sock.socket, native_level, native_opt, static_cast<const char*>(native_val), native_len) == 0)
+		{
+			return {};
+		}
+
+		return get_last_error(false);
+	});
 
 	if (!sock)
 	{
 		return -SYS_NET_EBADF;
 	}
 
-	if (sock.ret < 0)
+	if (sock.ret)
 	{
-		return sys_net_error{sock.ret};
+		return -sock.ret;
 	}
 
-	return not_an_error(sock.ret);
+	return CELL_OK;
 }
 
 error_code sys_net_bnet_shutdown(ppu_thread& ppu, s32 s, s32 how)
@@ -1155,72 +3038,116 @@ error_code sys_net_bnet_shutdown(ppu_thread& ppu, s32 s, s32 how)
 		return -SYS_NET_EINVAL;
 	}
 
-	const auto sock = idm::check<lv2_socket>(s, [&, notify = lv2_obj::notify_all_t()](lv2_socket& sock) -> s32
+	const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock) -> sys_net_error
+	{
+		std::lock_guard lock(sock.mutex);
+
+		// Shutdown of P2P socket is always successful
+		if (sock.type == SYS_NET_SOCK_DGRAM_P2P || sock.type == SYS_NET_SOCK_STREAM_P2P)
 		{
-			return sock.shutdown(how);
-		});
+			return {};
+		}
+
+#ifdef _WIN32
+		const int native_how =
+			how == SYS_NET_SHUT_RD ? SD_RECEIVE :
+			how == SYS_NET_SHUT_WR ? SD_SEND : SD_BOTH;
+#else
+		const int native_how =
+			how == SYS_NET_SHUT_RD ? SHUT_RD :
+			how == SYS_NET_SHUT_WR ? SHUT_WR : SHUT_RDWR;
+#endif
+
+		if (::shutdown(sock.socket, native_how) == 0)
+		{
+			return {};
+		}
+
+		return get_last_error(false);
+	});
 
 	if (!sock)
 	{
 		return -SYS_NET_EBADF;
 	}
 
-	if (sock.ret < 0)
+	if (sock.ret)
 	{
-		return sys_net_error{sock.ret};
+		return -sock.ret;
 	}
 
 	return CELL_OK;
 }
 
-error_code sys_net_bnet_socket(ppu_thread& ppu, lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol)
+error_code sys_net_bnet_socket(ppu_thread& ppu, s32 family, s32 type, s32 protocol)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_net.warning("sys_net_bnet_socket(family=%s, type=%s, protocol=%s)", family, type, protocol);
+	sys_net.warning("sys_net_bnet_socket(family=%d, type=%d, protocol=%d)", family, type, protocol);
 
-	if (family != SYS_NET_AF_INET)
+	if (family != SYS_NET_AF_INET && family != SYS_NET_AF_UNSPEC)
 	{
 		sys_net.error("sys_net_bnet_socket(): unknown family (%d)", family);
 	}
 
-	if (type != SYS_NET_SOCK_STREAM && type != SYS_NET_SOCK_DGRAM && type != SYS_NET_SOCK_RAW && type != SYS_NET_SOCK_DGRAM_P2P && type != SYS_NET_SOCK_STREAM_P2P)
+	if (type != SYS_NET_SOCK_STREAM && type != SYS_NET_SOCK_DGRAM && type != SYS_NET_SOCK_DGRAM_P2P && type != SYS_NET_SOCK_STREAM_P2P)
 	{
 		sys_net.error("sys_net_bnet_socket(): unsupported type (%d)", type);
 		return -SYS_NET_EPROTONOSUPPORT;
 	}
 
-	shared_ptr<lv2_socket> sock_lv2;
+	lv2_socket::socket_type native_socket = 0;
 
-	switch (type)
+	if (type != SYS_NET_SOCK_DGRAM_P2P && type != SYS_NET_SOCK_STREAM_P2P)
 	{
-	case SYS_NET_SOCK_STREAM:
-	case SYS_NET_SOCK_DGRAM:
-	{
-		auto lv2_native = make_shared<lv2_socket_native>(family, type, protocol);
-		if (s32 result = lv2_native->create_socket(); result < 0)
+		const int native_domain = AF_INET;
+
+		const int native_type =
+			type == SYS_NET_SOCK_STREAM ? SOCK_STREAM :
+			type == SYS_NET_SOCK_DGRAM ? SOCK_DGRAM : SOCK_RAW;
+
+		int native_proto =
+			protocol == SYS_NET_IPPROTO_IP ? IPPROTO_IP :
+			protocol == SYS_NET_IPPROTO_ICMP ? IPPROTO_ICMP :
+			protocol == SYS_NET_IPPROTO_IGMP ? IPPROTO_IGMP :
+			protocol == SYS_NET_IPPROTO_TCP ? IPPROTO_TCP :
+			protocol == SYS_NET_IPPROTO_UDP ? IPPROTO_UDP :
+			protocol == SYS_NET_IPPROTO_ICMPV6 ? IPPROTO_ICMPV6 : 0;
+
+		// TODO: native_domain is always AF_INET
+		if (native_domain == AF_UNSPEC && type == SYS_NET_SOCK_DGRAM)
 		{
-			return sys_net_error{result};
+			// Windows gets all errory if you try a unspec socket with protocol 0
+			native_proto = IPPROTO_UDP;
 		}
 
-		sock_lv2 = std::move(lv2_native);
-		break;
+		native_socket = ::socket(native_domain, native_type, native_proto);
+
+		if (native_socket == -1)
+		{
+			return -get_last_error(false);
+		}
+		u32 default_RCVBUF = (type==SYS_NET_SOCK_STREAM) ? 65535 : 9216;
+		if (setsockopt(native_socket, SOL_SOCKET, SO_RCVBUF, reinterpret_cast<const char*>(&default_RCVBUF), sizeof(default_RCVBUF)) != 0)
+			sys_net.error("Error setting defalult SO_RCVBUF on sys_net_bnet_socket socket");
+		u32 default_SNDBUF = 131072;
+		if (setsockopt(native_socket, SOL_SOCKET, SO_SNDBUF, reinterpret_cast<const char*>(&default_SNDBUF), sizeof(default_SNDBUF)) != 0)
+			sys_net.error("Error setting default SO_SNDBUF on sys_net_bnet_socket socket");
 	}
-	case SYS_NET_SOCK_RAW: sock_lv2 = make_shared<lv2_socket_raw>(family, type, protocol); break;
-	case SYS_NET_SOCK_DGRAM_P2P: sock_lv2 = make_shared<lv2_socket_p2p>(family, type, protocol); break;
-	case SYS_NET_SOCK_STREAM_P2P: sock_lv2 = make_shared<lv2_socket_p2ps>(family, type, protocol); break;
+
+	const auto sock_lv2 = std::make_shared<lv2_socket>(native_socket, type, family);
+	if (type == SYS_NET_SOCK_STREAM_P2P)
+	{
+		sock_lv2->p2p.port = 3658; // Default value if unspecified later
 	}
 
 	const s32 s = idm::import_existing<lv2_socket>(sock_lv2);
 
-	// Can't allocate more than 1000 sockets
 	if (s == id_manager::id_traits<lv2_socket>::invalid)
 	{
 		return -SYS_NET_EMFILE;
 	}
 
-	sock_lv2->set_lv2_id(s);
-
 	return not_an_error(s);
 }
 
@@ -1230,25 +3157,49 @@ error_code sys_net_bnet_close(ppu_thread& ppu, s32 s)
 
 	sys_net.warning("sys_net_bnet_close(s=%d)", s);
 
-	auto sock = idm::withdraw<lv2_socket>(s);
+	const auto sock = idm::withdraw<lv2_socket>(s);
 
 	if (!sock)
 	{
 		return -SYS_NET_EBADF;
 	}
 
-	if (sock->get_queue_size())
+	if (!sock->queue.empty())
+		sys_net.error("CLOSE");
+
+	// If it's a bound socket we "close" the vport
+	if ((sock->type == SYS_NET_SOCK_DGRAM_P2P || sock->type == SYS_NET_SOCK_STREAM_P2P) && sock->p2p.port && sock->p2p.vport)
 	{
-		sock->abort_socket(0);
+		auto& nc = g_fxo->get<network_context>();
+		{
+			std::lock_guard lock(nc.list_p2p_ports_mutex);
+			ensure(nc.list_p2p_ports.contains(sock->p2p.port));
+			auto& p2p_port = nc.list_p2p_ports.at(sock->p2p.port);
+			{
+				std::lock_guard lock(p2p_port.bound_p2p_vports_mutex);
+				if (sock->type == SYS_NET_SOCK_DGRAM_P2P)
+				{
+					p2p_port.bound_p2p_vports.erase(sock->p2p.vport);
+				}
+				else
+				{
+					for (auto it = p2p_port.bound_p2p_streams.begin(); it != p2p_port.bound_p2p_streams.end();)
+					{
+						if (it->second == s)
+						{
+							it = p2p_port.bound_p2p_streams.erase(it);
+							continue;
+						}
+						it++;
+					}
+
+				}
+			}
+		}
 	}
 
-	sock->close();
-
-	{
-		// Ensures the socket has no lingering copy from the network thread
-		std::lock_guard nw_lock(g_fxo->get<network_context>().mutex_thread_loop);
-		sock.reset();
-	}
+	auto& nph = g_fxo->get<named_thread<np_handler>>();
+	nph.remove_dns_spy(s);
 
 	return CELL_OK;
 }
@@ -1257,7 +3208,7 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_net.trace("sys_net_bnet_poll(fds=*0x%x, nfds=%d, ms=%d)", fds, nfds, ms);
+	sys_net.warning("sys_net_bnet_poll(fds=*0x%x, nfds=%d, ms=%d)", fds, nfds, ms);
 
 	if (nfds <= 0)
 	{
@@ -1270,22 +3221,22 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
 
 	std::vector<sys_net_pollfd> fds_buf;
 
+	if (true)
 	{
 		fds_buf.assign(fds.get_ptr(), fds.get_ptr() + nfds);
 
-		lv2_obj::prepare_for_sleep(ppu);
+		std::unique_lock nw_lock(g_fxo->get<network_context>().s_nw_mutex);
 
-		std::unique_lock nw_lock(g_fxo->get<network_context>().mutex_thread_loop);
 		std::shared_lock lock(id_manager::g_mutex);
 
-		std::vector<::pollfd> _fds(nfds);
+		::pollfd _fds[1024]{};
 #ifdef _WIN32
-		std::vector<bool> connecting(nfds);
+		bool connecting[1024]{};
 #endif
 
 		for (s32 i = 0; i < nfds; i++)
 		{
-			_fds[i].fd         = -1;
+			_fds[i].fd = -1;
 			fds_buf[i].revents = 0;
 
 			if (fds_buf[i].fd < 0)
@@ -1295,9 +3246,64 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
 
 			if (auto sock = idm::check_unlocked<lv2_socket>(fds_buf[i].fd))
 			{
-				signaled += sock->poll(fds_buf[i], _fds[i]);
+				if (sock->type == SYS_NET_SOCK_DGRAM_P2P)
+				{
+					std::lock_guard lock(sock->mutex);
+					ensure(sock->p2p.vport);
+					sys_net.trace("[P2P] poll checking for 0x%X", fds[i].events);
+					// Check if it's a bound P2P socket
+					if ((fds[i].events & SYS_NET_POLLIN) && !sock->p2p.data.empty())
+					{
+						sys_net.trace("[P2P] p2p_data for vport %d contains %d elements", sock->p2p.vport, sock->p2p.data.size());
+						fds_buf[i].revents |= SYS_NET_POLLIN;
+					}
+
+					// Data can always be written on a dgram socket
+					if (fds[i].events & SYS_NET_POLLOUT)
+						fds_buf[i].revents |= SYS_NET_POLLOUT;
+
+					if (fds_buf[i].revents)
+						signaled++;
+				}
+				else if (sock->type == SYS_NET_SOCK_STREAM_P2P)
+				{
+					std::lock_guard lock(sock->mutex);
+					sys_net.trace("[P2PS] poll checking for 0x%X", fds[i].events);
+					if (sock->p2ps.status == lv2_socket::p2ps_i::stream_status::stream_connected)
+					{
+						if ((fds[i].events & SYS_NET_POLLIN) && sock->p2ps.data_available)
+						{
+							sys_net.trace("[P2PS] p2ps has %d bytes available", sock->p2ps.data_available);
+							fds_buf[i].revents |= SYS_NET_POLLIN;
+						}
+
+						// Data can only be written if the socket is connected
+						if (fds[i].events & SYS_NET_POLLOUT && sock->p2ps.status == lv2_socket::p2ps_i::stream_status::stream_connected)
+						{
+							fds_buf[i].revents |= SYS_NET_POLLOUT;
+						}
+
+						if (fds_buf[i].revents)
+							signaled++;
+					}
+				}
+				else
+				{
+					// Check for fake packet for dns interceptions
+					auto& nph = g_fxo->get<named_thread<np_handler>>();
+					if (fds_buf[i].events & SYS_NET_POLLIN && nph.is_dns(fds_buf[i].fd) && nph.is_dns_queue(fds_buf[i].fd))
+						fds_buf[i].revents |= SYS_NET_POLLIN;
+
+					if (fds_buf[i].events & ~(SYS_NET_POLLIN | SYS_NET_POLLOUT | SYS_NET_POLLERR))
+						sys_net.warning("sys_net_bnet_poll(fd=%d): events=0x%x", fds[i].fd, fds[i].events);
+					_fds[i].fd = sock->socket;
+					if (fds_buf[i].events & SYS_NET_POLLIN)
+						_fds[i].events |= POLLIN;
+					if (fds_buf[i].events & SYS_NET_POLLOUT)
+						_fds[i].events |= POLLOUT;
+				}
 #ifdef _WIN32
-				connecting[i] = sock->is_connecting();
+				connecting[i] = sock->is_connecting;
 #endif
 			}
 			else
@@ -1310,7 +3316,7 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
 #ifdef _WIN32
 		windows_poll(_fds, nfds, 0, connecting);
 #else
-		::poll(_fds.data(), nfds, 0);
+		::poll(_fds, nfds, 0);
 #endif
 		for (s32 i = 0; i < nfds; i++)
 		{
@@ -1331,7 +3337,7 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
 		{
 			lock.unlock();
 			nw_lock.unlock();
-			std::memcpy(fds.get_ptr(), fds_buf.data(), nfds * sizeof(sys_net_pollfd));
+			std::memcpy(fds.get_ptr(), fds_buf.data(), nfds * sizeof(fds[0]));
 			return not_an_error(signaled);
 		}
 
@@ -1344,48 +3350,47 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
 
 			if (auto sock = idm::check_unlocked<lv2_socket>(fds_buf[i].fd))
 			{
-				auto lock = sock->lock();
+				std::lock_guard lock(sock->mutex);
 
 #ifdef _WIN32
-				sock->set_connecting(connecting[i]);
+				sock->is_connecting = connecting[i];
 #endif
 
-				bs_t<lv2_socket::poll_t> selected = +lv2_socket::poll_t::error;
+				bs_t<lv2_socket::poll> selected = +lv2_socket::poll::error;
 
 				if (fds_buf[i].events & SYS_NET_POLLIN)
-					selected += lv2_socket::poll_t::read;
+					selected += lv2_socket::poll::read;
 				if (fds_buf[i].events & SYS_NET_POLLOUT)
-					selected += lv2_socket::poll_t::write;
-				// if (fds_buf[i].events & SYS_NET_POLLPRI) // Unimplemented
+					selected += lv2_socket::poll::write;
+				//if (fds_buf[i].events & SYS_NET_POLLPRI) // Unimplemented
 				//	selected += lv2_socket::poll::error;
 
-				sock->poll_queue(idm::get_unlocked<named_thread<ppu_thread>>(ppu.id), selected, [sock, selected, &fds_buf, i, &signaled, &ppu](bs_t<lv2_socket::poll_t> events)
+				sock->events += selected;
+				sock->queue.emplace_back(ppu.id, [sock, selected, &fds_buf, i, &signaled, &ppu](bs_t<lv2_socket::poll> events)
+				{
+					if (events & selected)
 					{
-						if (events & selected)
-						{
-							if (events & selected & lv2_socket::poll_t::read)
-								fds_buf[i].revents |= SYS_NET_POLLIN;
-							if (events & selected & lv2_socket::poll_t::write)
-								fds_buf[i].revents |= SYS_NET_POLLOUT;
-							if (events & selected & lv2_socket::poll_t::error)
-								fds_buf[i].revents |= SYS_NET_POLLERR;
+						if (events & selected & lv2_socket::poll::read)
+							fds_buf[i].revents |= SYS_NET_POLLIN;
+						if (events & selected & lv2_socket::poll::write)
+							fds_buf[i].revents |= SYS_NET_POLLOUT;
+						if (events & selected & lv2_socket::poll::error)
+							fds_buf[i].revents |= SYS_NET_POLLERR;
 
-							signaled++;
-							sock->queue_wake(&ppu);
-							return true;
-						}
+						signaled++;
+						g_fxo->get<network_context>().s_to_awake.emplace_back(&ppu);
+						return true;
+					}
 
-						sock->set_poll_event(selected);
-						return false;
-					});
+					sock->events += selected;
+					return false;
+				});
 			}
 		}
 
 		lv2_obj::sleep(ppu, timeout);
 	}
 
-	bool has_timedout = false;
-
 	while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
 	{
 		if (is_stopped(state))
@@ -1408,25 +3413,24 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
 					return {};
 				}
 
-				has_timedout = network_clear_queue(ppu);
-				clear_ppu_to_awake(ppu);
-				ppu.state -= cpu_flag::signal;
+				std::lock_guard nw_lock(g_fxo->get<network_context>().s_nw_mutex);
+
+				if (signaled)
+				{
+					break;
+				}
+
+				network_clear_queue(ppu);
 				break;
 			}
 		}
 		else
 		{
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
 		}
 	}
 
-	if (!has_timedout && !signaled)
-	{
-		return -SYS_NET_EINTR;
-	}
-
 	std::memcpy(fds.get_ptr(), fds_buf.data(), nfds * sizeof(fds[0]));
-
 	return not_an_error(signaled);
 }
 
@@ -1434,21 +3438,13 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_net.trace("sys_net_bnet_select(nfds=%d, readfds=*0x%x, writefds=*0x%x, exceptfds=*0x%x, timeout=*0x%x(%d:%d))", nfds, readfds, writefds, exceptfds, _timeout, _timeout ? _timeout->tv_sec.value() : 0, _timeout ? _timeout->tv_usec.value() : 0);
+	sys_net.warning("sys_net_bnet_select(nfds=%d, readfds=*0x%x, writefds=*0x%x, exceptfds=*0x%x, timeout=*0x%x)", nfds, readfds, writefds, exceptfds, _timeout);
 
 	atomic_t<s32> signaled{0};
 
 	if (exceptfds)
 	{
-		struct log_t
-		{
-			atomic_t<bool> logged = false;
-		};
-
-		if (!g_fxo->get<log_t>().logged.exchange(true))
-		{
-			sys_net.error("sys_net_bnet_select(): exceptfds not implemented");
-		}
+		sys_net.error("sys_net_bnet_select(): exceptfds not implemented");
 	}
 
 	sys_net_fd_set rread{}, _readfds{};
@@ -1465,29 +3461,30 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
 		if (exceptfds)
 			_exceptfds = *exceptfds;
 
-		std::lock_guard nw_lock(g_fxo->get<network_context>().mutex_thread_loop);
+		std::lock_guard nw_lock(g_fxo->get<network_context>().s_nw_mutex);
+
 		reader_lock lock(id_manager::g_mutex);
 
-		std::vector<::pollfd> _fds(nfds);
+		::pollfd _fds[1024]{};
 #ifdef _WIN32
-		std::vector<bool> connecting(nfds);
+		bool connecting[1024]{};
 #endif
 
 		for (s32 i = 0; i < nfds; i++)
 		{
 			_fds[i].fd = -1;
-			bs_t<lv2_socket::poll_t> selected{};
+			bs_t<lv2_socket::poll> selected{};
 
 			if (readfds && _readfds.bit(i))
-				selected += lv2_socket::poll_t::read;
+				selected += lv2_socket::poll::read;
 			if (writefds && _writefds.bit(i))
-				selected += lv2_socket::poll_t::write;
-			// if (exceptfds && _exceptfds.bit(i))
+				selected += lv2_socket::poll::write;
+			//if (exceptfds && _exceptfds.bit(i))
 			//	selected += lv2_socket::poll::error;
 
 			if (selected)
 			{
-				selected += lv2_socket::poll_t::error;
+				selected += lv2_socket::poll::error;
 			}
 			else
 			{
@@ -1496,30 +3493,28 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
 
 			if (auto sock = idm::check_unlocked<lv2_socket>((lv2_socket::id_base & -1024) + i))
 			{
-				auto [read_set, write_set, except_set] = sock->select(selected, _fds[i]);
 
-				if (read_set || write_set || except_set)
+				if (sock->type != SYS_NET_SOCK_DGRAM_P2P)
 				{
-					signaled++;
+					_fds[i].fd = sock->socket;
+					if (selected & lv2_socket::poll::read)
+						_fds[i].events |= POLLIN;
+					if (selected & lv2_socket::poll::write)
+						_fds[i].events |= POLLOUT;
 				}
-
-				if (read_set)
+				else
 				{
-					rread.set(i);
+					std::lock_guard lock(sock->mutex);
+					// Check if it's a bound P2P socket
+					if ((selected & lv2_socket::poll::read) && sock->p2p.vport && !sock->p2p.data.empty())
+					{
+						sys_net.trace("[P2P] p2p_data for vport %d contains %d elements", sock->p2p.vport, sock->p2p.data.size());
+						rread.set(i);
+						signaled++;
+					}
 				}
-
-				if (write_set)
-				{
-					rwrite.set(i);
-				}
-
-				if (except_set)
-				{
-					rexcept.set(i);
-				}
-
 #ifdef _WIN32
-				connecting[i] = sock->is_connecting();
+				connecting[i] = sock->is_connecting;
 #endif
 			}
 			else
@@ -1531,7 +3526,7 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
 #ifdef _WIN32
 		windows_poll(_fds, nfds, 0, connecting);
 #else
-		::poll(_fds.data(), nfds, 0);
+		::poll(_fds, nfds, 0);
 #endif
 		for (s32 i = 0; i < nfds; i++)
 		{
@@ -1560,18 +3555,18 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
 
 		for (s32 i = 0; i < nfds; i++)
 		{
-			bs_t<lv2_socket::poll_t> selected{};
+			bs_t<lv2_socket::poll> selected{};
 
 			if (readfds && _readfds.bit(i))
-				selected += lv2_socket::poll_t::read;
+				selected += lv2_socket::poll::read;
 			if (writefds && _writefds.bit(i))
-				selected += lv2_socket::poll_t::write;
-			// if (exceptfds && _exceptfds.bit(i))
-			//	selected += lv2_socket::poll_t::error;
+				selected += lv2_socket::poll::write;
+			//if (exceptfds && _exceptfds.bit(i))
+			//	selected += lv2_socket::poll::error;
 
 			if (selected)
 			{
-				selected += lv2_socket::poll_t::error;
+				selected += lv2_socket::poll::error;
 			}
 			else
 			{
@@ -1580,30 +3575,32 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
 
 			if (auto sock = idm::check_unlocked<lv2_socket>((lv2_socket::id_base & -1024) + i))
 			{
-				auto lock = sock->lock();
+				std::lock_guard lock(sock->mutex);
+
 #ifdef _WIN32
-				sock->set_connecting(connecting[i]);
+				sock->is_connecting = connecting[i];
 #endif
 
-				sock->poll_queue(idm::get_unlocked<named_thread<ppu_thread>>(ppu.id), selected, [sock, selected, i, &rread, &rwrite, &rexcept, &signaled, &ppu](bs_t<lv2_socket::poll_t> events)
+				sock->events += selected;
+				sock->queue.emplace_back(ppu.id, [sock, selected, i, &rread, &rwrite, &rexcept, &signaled, &ppu](bs_t<lv2_socket::poll> events)
+				{
+					if (events & selected)
 					{
-						if (events & selected)
-						{
-							if (selected & lv2_socket::poll_t::read && events & (lv2_socket::poll_t::read + lv2_socket::poll_t::error))
-								rread.set(i);
-							if (selected & lv2_socket::poll_t::write && events & (lv2_socket::poll_t::write + lv2_socket::poll_t::error))
-								rwrite.set(i);
-							// if (events & (selected & lv2_socket::poll::error))
-						    //	rexcept.set(i);
+						if (selected & lv2_socket::poll::read && events & (lv2_socket::poll::read + lv2_socket::poll::error))
+							rread.set(i);
+						if (selected & lv2_socket::poll::write && events & (lv2_socket::poll::write + lv2_socket::poll::error))
+							rwrite.set(i);
+						//if (events & (selected & lv2_socket::poll::error))
+						//	rexcept.set(i);
 
-							signaled++;
-							sock->queue_wake(&ppu);
-							return true;
-						}
+						signaled++;
+						g_fxo->get<network_context>().s_to_awake.emplace_back(&ppu);
+						return true;
+					}
 
-						sock->set_poll_event(selected);
-						return false;
-					});
+					sock->events += selected;
+					return false;
+				});
 			}
 			else
 			{
@@ -1618,8 +3615,6 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
 		return -SYS_NET_EINVAL;
 	}
 
-	bool has_timedout = false;
-
 	while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
 	{
 		if (is_stopped(state))
@@ -1642,23 +3637,23 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
 					return {};
 				}
 
-				has_timedout = network_clear_queue(ppu);
-				clear_ppu_to_awake(ppu);
-				ppu.state -= cpu_flag::signal;
+				std::lock_guard nw_lock(g_fxo->get<network_context>().s_nw_mutex);
+
+				if (signaled)
+				{
+					break;
+				}
+
+				network_clear_queue(ppu);
 				break;
 			}
 		}
 		else
 		{
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
 		}
 	}
 
-	if (!has_timedout && !signaled)
-	{
-		return -SYS_NET_EINTR;
-	}
-
 	if (readfds)
 		*readfds = rread;
 	if (writefds)
@@ -1701,128 +3696,11 @@ error_code _sys_net_write_dump(ppu_thread& ppu, s32 id, vm::cptr<void> buf, s32
 	return CELL_OK;
 }
 
-error_code lv2_socket::abort_socket(s32 flags)
-{
-	decltype(queue) qcopy;
-	{
-		std::lock_guard lock(mutex);
-
-		if (queue.empty())
-		{
-			if (flags & SYS_NET_ABORT_STRICT_CHECK)
-			{
-				// Strict error checking: ENOENT if nothing happened
-				return -SYS_NET_ENOENT;
-			}
-
-			// TODO: Abort the subsequent function called on this socket (need to investigate correct behaviour)
-			return CELL_OK;
-		}
-
-		qcopy = std::move(queue);
-		queue = {};
-		events.store({});
-	}
-
-	for (auto& [ppu, _] : qcopy)
-	{
-		if (!ppu)
-			continue;
-
-		// Avoid possible double signaling
-		network_clear_queue(*ppu);
-		clear_ppu_to_awake(*ppu);
-
-		sys_net.warning("lv2_socket::abort_socket(): waking up \"%s\": (func: %s, r3=0x%x, r4=0x%x, r5=0x%x, r6=0x%x)", ppu->get_name(), ppu->current_function, ppu->gpr[3], ppu->gpr[4], ppu->gpr[5], ppu->gpr[6]);
-		ppu->gpr[3] = static_cast<u64>(-SYS_NET_EINTR);
-		lv2_obj::append(ppu.get());
-	}
-
-	const u32 num_waiters = ::size32(qcopy);
-	if (num_waiters && (type == SYS_NET_SOCK_STREAM || type == SYS_NET_SOCK_DGRAM))
-	{
-		auto& nc = g_fxo->get<network_context>();
-		const u32 prev_value = nc.num_polls.fetch_sub(num_waiters);
-		ensure(prev_value >= num_waiters);
-	}
-
-	lv2_obj::awake_all();
-	return CELL_OK;
-}
-
 error_code sys_net_abort(ppu_thread& ppu, s32 type, u64 arg, s32 flags)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_net.warning("sys_net_abort(type=%d, arg=0x%x, flags=0x%x)", type, arg, flags);
-
-	enum abort_type : s32
-	{
-		_socket,
-		resolver,
-		type_2, // ??
-		type_3, // ??
-		all,
-	};
-
-	switch (type)
-	{
-	case _socket:
-	{
-		std::lock_guard nw_lock(g_fxo->get<network_context>().mutex_thread_loop);
-
-		const auto sock = idm::get_unlocked<lv2_socket>(static_cast<u32>(arg));
-
-		if (!sock)
-		{
-			return -SYS_NET_EBADF;
-		}
-
-		return sock->abort_socket(flags);
-	}
-	case all:
-	{
-		std::vector<u32> sockets;
-
-		idm::select<lv2_socket>([&](u32 id, lv2_socket&)
-		{
-			sockets.emplace_back(id);
-		});
-
-		s32 failed = 0;
-
-		for (u32 id : sockets)
-		{
-			const auto sock = idm::withdraw<lv2_socket>(id);
-
-			if (!sock)
-			{
-				failed++;
-				continue;
-			}
-
-			if (sock->get_queue_size())
-				sys_net.error("ABORT 4");
-
-			sock->close();
-
-			sys_net.success("lv2_socket::handle_abort(): Closed socket %d", id);
-		}
-
-		// Ensures the socket has no lingering copy from the network thread
-		g_fxo->get<network_context>().mutex_thread_loop.lock_unlock();
-
-		return not_an_error(::narrow<s32>(sockets.size()) - failed);
-	}
-	case resolver:
-	case type_2:
-	case type_3:
-	{
-		break;
-	}
-	default: return -SYS_NET_EINVAL;
-	}
-
+	sys_net.todo("sys_net_abort(type=%d, arg=0x%x, flags=0x%x)", type, arg, flags);
 	return CELL_OK;
 }
 
@@ -1849,8 +3727,8 @@ error_code sys_net_infoctl(ppu_thread& ppu, s32 cmd, vm::ptr<void> arg)
 		char buffer[nameserver.size() + 80]{};
 		std::memcpy(buffer, nameserver.data(), nameserver.size());
 
-		auto& nph          = g_fxo->get<named_thread<np::np_handler>>();
-		const auto dns_str = np::ip_to_string(nph.get_dns_ip());
+		auto& nph = g_fxo->get<named_thread<np_handler>>();
+		const auto dns_str = np_handler::ip_to_string(nph.get_dns_ip());
 		std::memcpy(buffer + nameserver.size() - 1, dns_str.data(), dns_str.size());
 
 		std::string_view name{buffer};
diff --git a/rpcs3/Emu/Cell/lv2/sys_net.h b/rpcs3/Emu/Cell/lv2/sys_net.h
index b1f9ef7268..006827d344 100644
--- a/rpcs3/Emu/Cell/lv2/sys_net.h
+++ b/rpcs3/Emu/Cell/lv2/sys_net.h
@@ -70,7 +70,7 @@ enum lv2_socket_type : s32
 };
 
 // Socket options (prefixed with SYS_NET_)
-enum lv2_socket_option : s32
+enum
 {
 	SYS_NET_SO_SNDBUF       = 0x1001,
 	SYS_NET_SO_RCVBUF       = 0x1002,
@@ -96,22 +96,6 @@ enum lv2_socket_option : s32
 	SYS_NET_SOL_SOCKET      = 0xffff,
 };
 
-// IP options (prefixed with SYS_NET_)
-enum lv2_ip_option : s32
-{
-	SYS_NET_IP_HDRINCL         = 2,
-	SYS_NET_IP_TOS             = 3,
-	SYS_NET_IP_TTL             = 4,
-	SYS_NET_IP_MULTICAST_IF    = 9,
-	SYS_NET_IP_MULTICAST_TTL   = 10,
-	SYS_NET_IP_MULTICAST_LOOP  = 11,
-	SYS_NET_IP_ADD_MEMBERSHIP  = 12,
-	SYS_NET_IP_DROP_MEMBERSHIP = 13,
-	SYS_NET_IP_TTLCHK          = 23,
-	SYS_NET_IP_MAXTTL          = 24,
-	SYS_NET_IP_DONTFRAG        = 26
-};
-
 // Family (prefixed with SYS_NET_)
 enum lv2_socket_family : s32
 {
@@ -148,7 +132,7 @@ enum
 };
 
 // TCP options (prefixed with SYS_NET_)
-enum lv2_tcp_option : s32
+enum
 {
 	SYS_NET_TCP_NODELAY          = 1,
 	SYS_NET_TCP_MAXSEG           = 2,
@@ -156,7 +140,7 @@ enum lv2_tcp_option : s32
 };
 
 // IP protocols (prefixed with SYS_NET_)
-enum lv2_ip_protocol : s32
+enum
 {
 	SYS_NET_IPPROTO_IP     = 0,
 	SYS_NET_IPPROTO_ICMP   = 1,
@@ -181,11 +165,6 @@ enum
 	SYS_NET_POLLWRBAND     = 0x0100,
 };
 
-enum lv2_socket_abort_flags : s32
-{
-	SYS_NET_ABORT_STRICT_CHECK = 1,
-};
-
 // in_addr_t type prefixed with sys_net_
 using sys_net_in_addr_t    = u32;
 
@@ -274,8 +253,6 @@ struct sys_net_pollfd
 // sockaddr prefixed with sys_net_
 struct sys_net_sockaddr
 {
-	ENABLE_BITWISE_SERIALIZATION;
-
 	u8 sa_len;
 	u8 sa_family;
 	char sa_data[14];
@@ -284,8 +261,6 @@ struct sys_net_sockaddr
 // sockaddr_dl prefixed with sys_net_
 struct sys_net_sockaddr_dl
 {
-	ENABLE_BITWISE_SERIALIZATION;
-
 	u8 sdl_len;
 	u8 sdl_family;
 	be_t<u16> sdl_index;
@@ -299,8 +274,6 @@ struct sys_net_sockaddr_dl
 // sockaddr_in prefixed with sys_net_
 struct sys_net_sockaddr_in
 {
-	ENABLE_BITWISE_SERIALIZATION;
-
 	u8 sin_len;
 	u8 sin_family;
 	be_t<u16> sin_port;
@@ -311,8 +284,6 @@ struct sys_net_sockaddr_in
 // sockaddr_in_p2p prefixed with sys_net_
 struct sys_net_sockaddr_in_p2p
 {
-	ENABLE_BITWISE_SERIALIZATION;
-
 	u8 sin_len;
 	u8 sin_family;
 	be_t<u16> sin_port;
@@ -335,6 +306,130 @@ struct sys_net_linger
 	be_t<s32> l_linger;
 };
 
+// Custom structure for sockets
+// We map host sockets to sequential IDs to return as descriptors because syscalls expect socket IDs to be under 1024.
+struct lv2_socket final
+{
+#ifdef _WIN32
+	using socket_type = uptr;
+#else
+	using socket_type = int;
+#endif
+
+	static const u32 id_base = 24;
+	static const u32 id_step = 1;
+	static const u32 id_count = 1000;
+
+	// Poll events
+	enum class poll
+	{
+		read,
+		write,
+		error,
+
+		__bitset_enum_max
+	};
+
+	lv2_socket(socket_type s, s32 s_type, s32 family);
+	~lv2_socket();
+
+	shared_mutex mutex;
+
+#ifdef _WIN32
+	// Tracks connect for WSAPoll workaround
+	bool is_connecting = false;
+#endif
+
+	// Native socket (must be non-blocking)
+	socket_type socket;
+
+	// Events selected for polling
+	atomic_bs_t<poll> events{};
+
+	// Non-blocking IO option
+	s32 so_nbio = 0;
+
+	// Connection result
+	s32 so_error = 0;
+
+	// Unsupported option
+	s32 so_tcp_maxseg = 1500;
+
+	const lv2_socket_type type;
+	const lv2_socket_family family;
+
+	// SYS_NET_SOCK_DGRAM_P2P and SYS_NET_SOCK_STREAM_P2P socket specific information
+	struct p2p_i
+	{
+		// Port(actual bound port) and Virtual Port(indicated by u16 at the start of the packet)
+		u16 port = 0, vport = 0;
+		// Queue containing received packets from network_thread for SYS_NET_SOCK_DGRAM_P2P sockets
+		std::queue<std::pair<sys_net_sockaddr_in_p2p, std::vector<u8>>> data{};
+	} p2p;
+
+	struct p2ps_i
+	{
+		enum tcp_flags : u8
+		{
+			FIN = (1 << 0),
+			SYN = (1 << 1),
+			RST = (1 << 2),
+			PSH = (1 << 3),
+			ACK = (1 << 4),
+			URG = (1 << 5),
+			ECE = (1 << 6),
+			CWR = (1 << 7),
+		};
+
+		static constexpr be_t<u32> U2S_sig = (static_cast<u32>('U') << 24 | static_cast<u32>('2') << 16 | static_cast<u32>('S') << 8 | static_cast<u32>('0'));
+		static constexpr usz MAX_RECEIVED_BUFFER = (1024*1024*10);
+
+		// P2P stream socket specific
+		struct encapsulated_tcp
+		{
+			be_t<u32> signature = lv2_socket::p2ps_i::U2S_sig; // Signature to verify it's P2P Stream data
+			be_t<u32> length = 0; // Length of data
+			be_t<u64> seq = 0; // This should be u32 but changed to u64 for simplicity
+			be_t<u64> ack = 0;
+			be_t<u16> src_port = 0; // fake source tcp port
+			be_t<u16> dst_port = 0; // fake dest tcp port(should be == vport)
+			be_t<u16> checksum = 0;
+			u8 flags = 0;
+		};
+
+		enum stream_status
+		{
+			stream_closed, // Default when port is not listening nor connected
+			stream_listening, // Stream is listening, accepting SYN packets
+			stream_handshaking, // Currently handshaking
+			stream_connected, // This is an established connection(after tcp handshake)
+		};
+
+		stream_status status = stream_status::stream_closed;
+
+		usz max_backlog = 0; // set on listen
+		std::queue<s32> backlog;
+
+		u16 op_port = 0, op_vport = 0;
+		u32 op_addr = 0;
+
+		u64 data_beg_seq = 0; // Seq of first byte of received_data
+		u32 data_available = 0; // Amount of continuous data available(calculated on ACK send)
+		std::map<u64, std::vector<u8>> received_data; // holds seq/data of data received
+
+		u32 cur_seq = 0; // SEQ of next packet to be sent
+	} p2ps;
+
+	// Value keepers
+#ifdef _WIN32
+	s32 so_reuseaddr = 0;
+	s32 so_reuseport = 0;
+#endif
+
+	// Event processing workload (pair of thread id and the processing function)
+	std::vector<std::pair<u32, std::function<bool(bs_t<lv2_socket::poll>)>>> queue;
+};
+
 class ppu_thread;
 
 // Syscalls
@@ -352,7 +447,7 @@ error_code sys_net_bnet_sendmsg(ppu_thread&, s32 s, vm::cptr<sys_net_msghdr> msg
 error_code sys_net_bnet_sendto(ppu_thread&, s32 s, vm::cptr<void> buf, u32 len, s32 flags, vm::cptr<sys_net_sockaddr> addr, u32 addrlen);
 error_code sys_net_bnet_setsockopt(ppu_thread&, s32 s, s32 level, s32 optname, vm::cptr<void> optval, u32 optlen);
 error_code sys_net_bnet_shutdown(ppu_thread&, s32 s, s32 how);
-error_code sys_net_bnet_socket(ppu_thread&, lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol);
+error_code sys_net_bnet_socket(ppu_thread&, s32 family, s32 type, s32 protocol);
 error_code sys_net_bnet_close(ppu_thread&, s32 s);
 error_code sys_net_bnet_poll(ppu_thread&, vm::ptr<sys_net_pollfd> fds, s32 nfds, s32 ms);
 error_code sys_net_bnet_select(ppu_thread&, s32 nfds, vm::ptr<sys_net_fd_set> readfds, vm::ptr<sys_net_fd_set> writefds, vm::ptr<sys_net_fd_set> exceptfds, vm::ptr<sys_net_timeval> timeout);
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.cpp b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.cpp
deleted file mode 100644
index 0d2a598214..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-#include "stdafx.h"
-#include "lv2_socket.h"
-#include "network_context.h"
-
-LOG_CHANNEL(sys_net);
-
-lv2_socket::lv2_socket(lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol)
-{
-	this->family   = family;
-	this->type     = type;
-	this->protocol = protocol;
-}
-
-std::unique_lock<shared_mutex> lv2_socket::lock()
-{
-	return std::unique_lock(mutex);
-}
-
-lv2_socket_family lv2_socket::get_family() const
-{
-	return family;
-}
-
-lv2_socket_type lv2_socket::get_type() const
-{
-	return type;
-}
-lv2_ip_protocol lv2_socket::get_protocol() const
-{
-	return protocol;
-}
-std::size_t lv2_socket::get_queue_size() const
-{
-	return queue.size();
-}
-socket_type lv2_socket::get_socket() const
-{
-	return native_socket;
-}
-
-#ifdef _WIN32
-bool lv2_socket::is_connecting() const
-{
-	return connecting;
-}
-void lv2_socket::set_connecting(bool connecting)
-{
-	this->connecting = connecting;
-}
-#endif
-
-void lv2_socket::set_lv2_id(u32 id)
-{
-	lv2_id = id;
-}
-
-bs_t<lv2_socket::poll_t> lv2_socket::get_events() const
-{
-	return events.load();
-}
-
-void lv2_socket::set_poll_event(bs_t<lv2_socket::poll_t> event)
-{
-	events += event;
-}
-
-void lv2_socket::poll_queue(shared_ptr<ppu_thread> ppu, bs_t<lv2_socket::poll_t> event, std::function<bool(bs_t<lv2_socket::poll_t>)> poll_cb)
-{
-	set_poll_event(event);
-	queue.emplace_back(std::move(ppu), poll_cb);
-
-	// Makes sure network_context thread is awaken
-	if (type == SYS_NET_SOCK_STREAM || type == SYS_NET_SOCK_DGRAM)
-	{
-		auto& nc = g_fxo->get<network_context>();
-		const u32 prev_value = nc.num_polls.fetch_add(1);
-		if (!prev_value)
-		{
-			nc.num_polls.notify_one();
-		}
-	}
-}
-
-u32 lv2_socket::clear_queue(ppu_thread* ppu)
-{
-	std::lock_guard lock(mutex);
-
-	u32 cleared = 0;
-
-	for (auto it = queue.begin(); it != queue.end();)
-	{
-		if (it->first.get() == ppu)
-		{
-			it = queue.erase(it);
-			cleared++;
-			continue;
-		}
-
-		it++;
-	}
-
-	if (queue.empty())
-	{
-		events.store({});
-	}
-
-	if (cleared && (type == SYS_NET_SOCK_STREAM || type == SYS_NET_SOCK_DGRAM))
-	{
-		// Makes sure network_context thread can go back to sleep if there is no active polling
-		const u32 prev_value = g_fxo->get<network_context>().num_polls.fetch_sub(cleared);
-		ensure(prev_value >= cleared);
-	}
-
-	return cleared;
-}
-
-void lv2_socket::handle_events(const pollfd& native_pfd, [[maybe_unused]] bool unset_connecting)
-{
-	bs_t<lv2_socket::poll_t> events_happening{};
-
-	if (native_pfd.revents & (POLLIN | POLLHUP) && events.test_and_reset(lv2_socket::poll_t::read))
-		events_happening += lv2_socket::poll_t::read;
-	if (native_pfd.revents & POLLOUT && events.test_and_reset(lv2_socket::poll_t::write))
-		events_happening += lv2_socket::poll_t::write;
-	if (native_pfd.revents & POLLERR && events.test_and_reset(lv2_socket::poll_t::error))
-		events_happening += lv2_socket::poll_t::error;
-
-	if (events_happening || (!queue.empty() && (so_rcvtimeo || so_sendtimeo)))
-	{
-		std::lock_guard lock(mutex);
-#ifdef _WIN32
-		if (unset_connecting)
-			set_connecting(false);
-#endif
-		u32 handled = 0;
-
-		for (auto it = queue.begin(); it != queue.end();)
-		{
-			if (it->second(events_happening))
-			{
-				it = queue.erase(it);
-				handled++;
-				continue;
-			}
-
-			it++;
-		}
-
-		if (handled && (type == SYS_NET_SOCK_STREAM || type == SYS_NET_SOCK_DGRAM))
-		{
-			const u32 prev_value = g_fxo->get<network_context>().num_polls.fetch_sub(handled);
-			ensure(prev_value >= handled);
-		}
-
-		if (queue.empty())
-		{
-			events.store({});
-		}
-	}
-}
-
-void lv2_socket::queue_wake(ppu_thread* ppu)
-{
-	switch (type)
-	{
-	case SYS_NET_SOCK_STREAM:
-	case SYS_NET_SOCK_DGRAM:
-		g_fxo->get<network_context>().add_ppu_to_awake(ppu);
-		break;
-	case SYS_NET_SOCK_DGRAM_P2P:
-	case SYS_NET_SOCK_STREAM_P2P:
-		g_fxo->get<p2p_context>().add_ppu_to_awake(ppu);
-		break;
-	default:
-		break;
-	}
-}
-
-lv2_socket& lv2_socket::operator=(thread_state s) noexcept
-{
-	if (s == thread_state::destroying_context)
-	{
-		close();
-	}
-
-	return *this;
-}
-
-lv2_socket::~lv2_socket() noexcept
-{
-}
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.h b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.h
deleted file mode 100644
index 314840f245..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.h
+++ /dev/null
@@ -1,156 +0,0 @@
-#pragma once
-
-#include <functional>
-#include <optional>
-
-#include "Utilities/mutex.h"
-#include "Emu/IdManager.h"
-#include "Emu/Cell/lv2/sys_net.h"
-#include "Emu/NP/ip_address.h"
-
-#ifdef _WIN32
-#include <winsock2.h>
-#include <WS2tcpip.h>
-#else
-#ifdef __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include <poll.h>
-#ifdef __clang__
-#pragma GCC diagnostic pop
-#endif
-#endif
-
-enum class thread_state : u32;
-
-class lv2_socket
-{
-public:
-	// Poll events
-	enum class poll_t
-	{
-		read,
-		write,
-		error,
-
-		__bitset_enum_max
-	};
-
-	union sockopt_data
-	{
-		char ch[128];
-		be_t<s32> _int = 0;
-		sys_net_timeval timeo;
-		sys_net_linger linger;
-	};
-
-	struct sockopt_cache
-	{
-		sockopt_data data{};
-		s32 len = 0;
-	};
-
-public:
-	SAVESTATE_INIT_POS(7); // Dependency on RPCN
-
-	lv2_socket(lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol);
-	lv2_socket(utils::serial&) {}
-	lv2_socket(utils::serial&, lv2_socket_type type);
-	static std::function<void(void*)> load(utils::serial& ar);
-	void save(utils::serial&, bool save_only_this_class = false);
-	virtual ~lv2_socket() noexcept;
-	lv2_socket& operator=(thread_state s) noexcept;
-
-	std::unique_lock<shared_mutex> lock();
-
-	void set_lv2_id(u32 id);
-	bs_t<poll_t> get_events() const;
-	void set_poll_event(bs_t<poll_t> event);
-	void poll_queue(shared_ptr<ppu_thread> ppu, bs_t<poll_t> event, std::function<bool(bs_t<poll_t>)> poll_cb);
-	u32 clear_queue(ppu_thread*);
-	void handle_events(const pollfd& native_fd, bool unset_connecting = false);
-	void queue_wake(ppu_thread* ppu);
-
-	lv2_socket_family get_family() const;
-	lv2_socket_type get_type() const;
-	lv2_ip_protocol get_protocol() const;
-	std::size_t get_queue_size() const;
-	socket_type get_socket() const;
-#ifdef _WIN32
-	bool is_connecting() const;
-	void set_connecting(bool is_connecting);
-#endif
-
-public:
-	virtual std::tuple<bool, s32, shared_ptr<lv2_socket>, sys_net_sockaddr> accept(bool is_lock = true) = 0;
-	virtual s32 bind(const sys_net_sockaddr& addr) = 0;
-
-	virtual std::optional<s32> connect(const sys_net_sockaddr& addr) = 0;
-	virtual s32 connect_followup()                                   = 0;
-
-	virtual std::pair<s32, sys_net_sockaddr> getpeername() = 0;
-	virtual std::pair<s32, sys_net_sockaddr> getsockname() = 0;
-
-	virtual std::tuple<s32, sockopt_data, u32> getsockopt(s32 level, s32 optname, u32 len) = 0;
-	virtual s32 setsockopt(s32 level, s32 optname, const std::vector<u8>& optval)          = 0;
-
-	virtual s32 listen(s32 backlog) = 0;
-
-	virtual std::optional<std::tuple<s32, std::vector<u8>, sys_net_sockaddr>> recvfrom(s32 flags, u32 len, bool is_lock = true)                = 0;
-	virtual std::optional<s32> sendto(s32 flags, const std::vector<u8>& buf, std::optional<sys_net_sockaddr> opt_sn_addr, bool is_lock = true) = 0;
-	virtual std::optional<s32> sendmsg(s32 flags, const sys_net_msghdr& msg, bool is_lock = true)                                              = 0;
-
-	virtual void close()          = 0;
-	virtual s32 shutdown(s32 how) = 0;
-
-	virtual s32 poll(sys_net_pollfd& sn_pfd, pollfd& native_pfd)                           = 0;
-	virtual std::tuple<bool, bool, bool> select(bs_t<poll_t> selected, pollfd& native_pfd) = 0;
-
-	error_code abort_socket(s32 flags);
-
-public:
-	// IDM data
-	static const u32 id_base  = 24;
-	static const u32 id_step  = 1;
-	static const u32 id_count = 1000;
-
-protected:
-	lv2_socket(utils::serial&, bool);
-
-	shared_mutex mutex;
-	s32 lv2_id = 0;
-
-	socket_type native_socket = 0;
-
-	lv2_socket_family family{};
-	lv2_socket_type type{};
-	lv2_ip_protocol protocol{};
-
-	// Events selected for polling
-	atomic_bs_t<poll_t> events{};
-
-	// Event processing workload (pair of thread id and the processing function)
-	std::vector<std::pair<shared_ptr<ppu_thread>, std::function<bool(bs_t<poll_t>)>>> queue;
-
-	// Socket options value keepers
-	// Non-blocking IO option
-	s32 so_nbio = 0;
-	// Error, only used for connection result for non blocking stream sockets
-	s32 so_error = 0;
-	// Unsupported option
-	s32 so_tcp_maxseg = 1500;
-#ifdef _WIN32
-	s32 so_reuseaddr = 0;
-	s32 so_reuseport = 0;
-
-	// Tracks connect for WSAPoll workaround
-	bool connecting = false;
-#endif
-
-	sys_net_sockaddr last_bound_addr{};
-
-public:
-	u64 so_rcvtimeo = 0;
-	u64 so_sendtimeo = 0;
-};
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.cpp b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.cpp
deleted file mode 100644
index d420f23cc8..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.cpp
+++ /dev/null
@@ -1,1254 +0,0 @@
-#include "stdafx.h"
-
-#include "Emu/Cell/lv2/sys_net.h"
-#include "Emu/NP/np_dnshook.h"
-#include "Emu/NP/np_handler.h"
-#include "lv2_socket_native.h"
-#include "sys_net_helpers.h"
-
-#ifdef _WIN32
-constexpr SOCKET invalid_socket = INVALID_SOCKET;
-#else
-constexpr int invalid_socket = -1;
-#endif
-
-LOG_CHANNEL(sys_net);
-
-lv2_socket_native::lv2_socket_native(lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol)
-	: lv2_socket(family, type, protocol)
-{
-}
-
-lv2_socket_native::lv2_socket_native(utils::serial& ar, lv2_socket_type type)
-	: lv2_socket(stx::make_exact(ar), type)
-{
-	[[maybe_unused]] const s32 version = GET_SERIALIZATION_VERSION(lv2_net);
-
-#ifdef _WIN32
-	ar(so_reuseaddr, so_reuseport);
-#else
-	std::array<char, 8> dummy{};
-	ar(dummy);
-
-	if (dummy != std::array<char, 8>{})
-	{
-		sys_net.error("[Native] Savestate tried to load Win32 specific data, compatibility may be affected");
-	}
-#endif
-
-	if (version >= 2)
-	{
-		// Flag to signal failure of TCP connection on socket start
-		ar(feign_tcp_conn_failure);
-	}
-}
-
-void lv2_socket_native::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(lv2_net);
-
-	lv2_socket::save(ar, true);
-#ifdef _WIN32
-	ar(so_reuseaddr, so_reuseport);
-#else
-	ar(std::array<char, 8>{});
-#endif
-
-	ar(is_socket_connected());
-}
-
-lv2_socket_native::~lv2_socket_native() noexcept
-{
-	lv2_socket_native::close();
-}
-
-s32 lv2_socket_native::create_socket()
-{
-	ensure(family == SYS_NET_AF_INET);
-	ensure(type == SYS_NET_SOCK_STREAM || type == SYS_NET_SOCK_DGRAM);
-	ensure(protocol == SYS_NET_IPPROTO_IP || protocol == SYS_NET_IPPROTO_TCP || protocol == SYS_NET_IPPROTO_UDP);
-
-	const int native_domain = AF_INET;
-
-	const int native_type = type == SYS_NET_SOCK_STREAM ? SOCK_STREAM : SOCK_DGRAM;
-
-	int native_proto = protocol == SYS_NET_IPPROTO_TCP ? IPPROTO_TCP :
-	                   protocol == SYS_NET_IPPROTO_UDP ? IPPROTO_UDP :
-                                                         IPPROTO_IP;
-
-	auto socket_res = ::socket(native_domain, native_type, native_proto);
-
-	if (socket_res == invalid_socket)
-	{
-		return -get_last_error(false);
-	}
-
-	set_socket(socket_res, family, type, protocol);
-	return CELL_OK;
-}
-
-void lv2_socket_native::set_socket(socket_type native_socket, lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol)
-{
-	this->native_socket = native_socket;
-	this->family   = family;
-	this->type     = type;
-	this->protocol = protocol;
-
-	set_default_buffers();
-	set_non_blocking();
-}
-
-std::tuple<bool, s32, shared_ptr<lv2_socket>, sys_net_sockaddr> lv2_socket_native::accept(bool is_lock)
-{
-	std::unique_lock<shared_mutex> lock(mutex, std::defer_lock);
-
-	if (is_lock)
-	{
-		lock.lock();
-	}
-
-	::sockaddr_storage native_addr;
-	::socklen_t native_addrlen = sizeof(native_addr);
-
-	if (feign_tcp_conn_failure)
-	{
-		sys_net.error("Calling socket::accept() from a previously connected socket!");
-	}
-
-	socket_type client_socket = ::accept(native_socket, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen);
-
-	if (client_socket != invalid_socket)
-	{
-		auto newsock = make_single<lv2_socket_native>(family, type, protocol);
-		newsock->set_socket(client_socket, family, type, protocol);
-
-		// Sockets inherit non blocking behaviour from their parent
-		newsock->so_nbio = so_nbio;
-
-		sys_net_sockaddr ps3_addr = native_addr_to_sys_net_addr(native_addr);
-
-		return {true, 0, std::move(newsock), ps3_addr};
-	}
-
-	if (auto result = get_last_error(!so_nbio); result)
-	{
-		return {true, -result, {}, {}};
-	}
-
-	return {false, {}, {}, {}};
-}
-
-s32 lv2_socket_native::bind(const sys_net_sockaddr& addr)
-{
-	std::lock_guard lock(mutex);
-
-	const auto* psa_in = reinterpret_cast<const sys_net_sockaddr_in*>(&addr);
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	u32 saddr = nph.get_bind_ip();
-	if (saddr == 0)
-	{
-		// If zero use the supplied address
-		saddr = std::bit_cast<u32>(psa_in->sin_addr);
-	}
-
-	if (feign_tcp_conn_failure)
-	{
-		sys_net.error("Calling socket::bind() from a previously connected socket!");
-	}
-
-	::sockaddr_in native_addr{};
-	native_addr.sin_family      = AF_INET;
-	native_addr.sin_port        = std::bit_cast<u16>(psa_in->sin_port);
-	native_addr.sin_addr.s_addr = saddr;
-	::socklen_t native_addr_len = sizeof(native_addr);
-
-	// Note that this is a hack(TODO)
-	// ATM we don't support binding 3658 udp because we use it for the p2ps main socket
-	// Only Fat Princess is known to do this to my knowledge
-	if (psa_in->sin_port == 3658 && type == SYS_NET_SOCK_DGRAM)
-	{
-		native_addr.sin_port = std::bit_cast<u16, be_t<u16>>(3659);
-	}
-
-	sys_net.warning("[Native] Trying to bind %s:%d", native_addr.sin_addr, std::bit_cast<be_t<u16>, u16>(native_addr.sin_port));
-
-	if (::bind(native_socket, reinterpret_cast<struct sockaddr*>(&native_addr), native_addr_len) == 0)
-	{
-		// Only UPNP port forward binds to 0.0.0.0
-		if (saddr == 0)
-		{
-			if (native_addr.sin_port == 0)
-			{
-				sockaddr_in client_addr;
-				socklen_t client_addr_size = sizeof(client_addr);
-				ensure(::getsockname(native_socket, reinterpret_cast<struct sockaddr*>(&client_addr), &client_addr_size) == 0);
-				bound_port = std::bit_cast<u16, be_t<u16>>(client_addr.sin_port);
-			}
-			else
-			{
-				bound_port = std::bit_cast<u16, be_t<u16>>(native_addr.sin_port);
-			}
-
-			nph.upnp_add_port_mapping(bound_port, type == SYS_NET_SOCK_STREAM ? "TCP" : "UDP");
-		}
-
-		last_bound_addr = addr;
-		return CELL_OK;
-	}
-
-	auto error = get_last_error(false);
-
-#ifdef __linux__
-	if (error == SYS_NET_EACCES && std::bit_cast<be_t<u16>, u16>(native_addr.sin_port) < 1024)
-	{
-		sys_net.error("The game tried to bind a port < 1024 which is privileged on Linux\n"
-					  "Consider setting rpcs3 privileges for it with: setcap 'cap_net_bind_service=+ep' /path/to/rpcs3");
-	}
-#endif
-
-	return -error;
-}
-
-std::optional<s32> lv2_socket_native::connect(const sys_net_sockaddr& addr)
-{
-	std::lock_guard lock(mutex);
-
-	const auto* psa_in = reinterpret_cast<const sys_net_sockaddr_in*>(&addr);
-
-	::sockaddr_in native_addr   = sys_net_addr_to_native_addr(addr);
-	::socklen_t native_addr_len = sizeof(native_addr);
-
-	sys_net.notice("[Native] Attempting to connect on %s:%d", native_addr.sin_addr, std::bit_cast<be_t<u16>, u16>(native_addr.sin_port));
-
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-	if (!nph.get_net_status() && is_ip_public_address(native_addr))
-	{
-		return -SYS_NET_EADDRNOTAVAIL;
-	}
-
-	if (psa_in->sin_port == 53)
-	{
-		// Add socket to the dns hook list
-		sys_net.notice("[Native] sys_net_bnet_connect: using DNS...");
-		auto& dnshook = g_fxo->get<np::dnshook>();
-		dnshook.add_dns_spy(lv2_id);
-	}
-
-#ifdef _WIN32
-	bool was_connecting = connecting;
-#endif
-
-	if (feign_tcp_conn_failure)
-	{
-		// As if still connected
-		return -SYS_NET_EALREADY;
-	}
-
-	if (::connect(native_socket, reinterpret_cast<struct sockaddr*>(&native_addr), native_addr_len) == 0)
-	{
-		return CELL_OK;
-	}
-
-	sys_net_error result = get_last_error(!so_nbio);
-
-#ifdef _WIN32
-	// See https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect
-	if (was_connecting && (result == SYS_NET_EINVAL || result == SYS_NET_EWOULDBLOCK))
-		return -SYS_NET_EALREADY;
-#endif
-
-	if (result)
-	{
-		if (result == SYS_NET_EWOULDBLOCK || result == SYS_NET_EINPROGRESS)
-		{
-			result = SYS_NET_EINPROGRESS;
-#ifdef _WIN32
-			connecting = true;
-#endif
-			this->poll_queue(null_ptr, lv2_socket::poll_t::write, [this](bs_t<lv2_socket::poll_t> events) -> bool
-				{
-					if (events & lv2_socket::poll_t::write)
-					{
-						int native_error;
-						::socklen_t size = sizeof(native_error);
-						if (::getsockopt(native_socket, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&native_error), &size) != 0 || size != sizeof(int))
-						{
-							so_error = 1;
-						}
-						else
-						{
-							// TODO: check error formats (both native and translated)
-							so_error = native_error ? convert_error(false, native_error) : 0;
-						}
-
-						return true;
-					}
-
-					events += lv2_socket::poll_t::write;
-					return false;
-				});
-		}
-
-		return -result;
-	}
-
-#ifdef _WIN32
-	connecting = true;
-#endif
-
-	return std::nullopt;
-}
-
-s32 lv2_socket_native::connect_followup()
-{
-	int native_error;
-	::socklen_t size = sizeof(native_error);
-	if (::getsockopt(native_socket, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&native_error), &size) != 0 || size != sizeof(int))
-	{
-		return -1;
-	}
-
-	// TODO: check error formats (both native and translated)
-	return native_error ? -convert_error(false, native_error) : 0;
-}
-
-std::pair<s32, sys_net_sockaddr> lv2_socket_native::getpeername()
-{
-	std::lock_guard lock(mutex);
-
-	::sockaddr_storage native_addr;
-	::socklen_t native_addrlen = sizeof(native_addr);
-
-	if (::getpeername(native_socket, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen) == 0)
-	{
-		ensure(native_addr.ss_family == AF_INET);
-
-		sys_net_sockaddr sn_addr = native_addr_to_sys_net_addr(native_addr);
-
-		return {CELL_OK, sn_addr};
-	}
-
-	return {-get_last_error(false), {}};
-}
-
-std::pair<s32, sys_net_sockaddr> lv2_socket_native::getsockname()
-{
-	std::lock_guard lock(mutex);
-
-	::sockaddr_storage native_addr;
-	::socklen_t native_addrlen = sizeof(native_addr);
-
-	if (::getsockname(native_socket, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen) == 0)
-	{
-		ensure(native_addr.ss_family == AF_INET);
-
-		sys_net_sockaddr sn_addr = native_addr_to_sys_net_addr(native_addr);
-
-		return {CELL_OK, sn_addr};
-	}
-#ifdef _WIN32
-	else
-	{
-		// windows doesn't support getsockname for sockets that are not bound
-		if (get_native_error() == WSAEINVAL)
-		{
-			return {CELL_OK, {}};
-		}
-	}
-#endif
-
-	return {-get_last_error(false), {}};
-}
-
-std::tuple<s32, lv2_socket::sockopt_data, u32> lv2_socket_native::getsockopt(s32 level, s32 optname, u32 len)
-{
-	std::lock_guard lock(mutex);
-
-	sockopt_data out_val;
-	u32 out_len = sizeof(out_val);
-
-	int native_level = -1;
-	int native_opt   = -1;
-
-	union
-	{
-		char ch[128];
-		int _int = 0;
-		::timeval timeo;
-		::linger linger;
-	} native_val;
-	::socklen_t native_len = sizeof(native_val);
-
-	if (level == SYS_NET_SOL_SOCKET)
-	{
-		native_level = SOL_SOCKET;
-
-		switch (optname)
-		{
-		case SYS_NET_SO_NBIO:
-		{
-			// Special
-			out_val._int = so_nbio;
-			out_len      = sizeof(s32);
-			return {CELL_OK, out_val, out_len};
-		}
-		case SYS_NET_SO_ERROR:
-		{
-			// Special
-			out_val._int = std::exchange(so_error, 0);
-			out_len      = sizeof(s32);
-			return {CELL_OK, out_val, out_len};
-		}
-		case SYS_NET_SO_KEEPALIVE:
-		{
-			native_opt = SO_KEEPALIVE;
-			break;
-		}
-		case SYS_NET_SO_SNDBUF:
-		{
-			native_opt = SO_SNDBUF;
-			break;
-		}
-		case SYS_NET_SO_RCVBUF:
-		{
-			native_opt = SO_RCVBUF;
-			break;
-		}
-		case SYS_NET_SO_SNDLOWAT:
-		{
-			native_opt = SO_SNDLOWAT;
-			break;
-		}
-		case SYS_NET_SO_RCVLOWAT:
-		{
-			native_opt = SO_RCVLOWAT;
-			break;
-		}
-		case SYS_NET_SO_BROADCAST:
-		{
-			native_opt = SO_BROADCAST;
-			break;
-		}
-#ifdef _WIN32
-		case SYS_NET_SO_REUSEADDR:
-		{
-			out_val._int = so_reuseaddr;
-			out_len      = sizeof(s32);
-			return {CELL_OK, out_val, out_len};
-		}
-		case SYS_NET_SO_REUSEPORT:
-		{
-			out_val._int = so_reuseport;
-			out_len      = sizeof(s32);
-			return {CELL_OK, out_val, out_len};
-		}
-#else
-		case SYS_NET_SO_REUSEADDR:
-		{
-			native_opt = SO_REUSEADDR;
-			break;
-		}
-		case SYS_NET_SO_REUSEPORT:
-		{
-			native_opt = SO_REUSEPORT;
-			break;
-		}
-#endif
-		case SYS_NET_SO_SNDTIMEO:
-		case SYS_NET_SO_RCVTIMEO:
-		{
-			if (len < sizeof(sys_net_timeval))
-				return {-SYS_NET_EINVAL, {}, {}};
-
-			native_opt = optname == SYS_NET_SO_SNDTIMEO ? SO_SNDTIMEO : SO_RCVTIMEO;
-			break;
-		}
-		case SYS_NET_SO_LINGER:
-		{
-			if (len < sizeof(sys_net_linger))
-				return {-SYS_NET_EINVAL, {}, {}};
-
-			native_opt = SO_LINGER;
-			break;
-		}
-		default:
-		{
-			sys_net.error("sys_net_bnet_getsockopt(s=%d, SOL_SOCKET): unknown option (0x%x)", lv2_id, optname);
-			return {-SYS_NET_EINVAL, {}, {}};
-		}
-		}
-	}
-	else if (level == SYS_NET_IPPROTO_TCP)
-	{
-		native_level = IPPROTO_TCP;
-
-		switch (optname)
-		{
-		case SYS_NET_TCP_MAXSEG:
-		{
-			// Special (no effect)
-			out_val._int = so_tcp_maxseg;
-			out_len      = sizeof(s32);
-			return {CELL_OK, out_val, out_len};
-		}
-		case SYS_NET_TCP_NODELAY:
-		{
-			native_opt = TCP_NODELAY;
-			break;
-		}
-		default:
-		{
-			sys_net.error("sys_net_bnet_getsockopt(s=%d, IPPROTO_TCP): unknown option (0x%x)", lv2_id, optname);
-			return {-SYS_NET_EINVAL, {}, {}};
-		}
-		}
-	}
-	else if (level == SYS_NET_IPPROTO_IP)
-	{
-		native_level = IPPROTO_IP;
-		switch (optname)
-		{
-		case SYS_NET_IP_HDRINCL:
-		{
-			native_opt = IP_HDRINCL;
-			break;
-		}
-		case SYS_NET_IP_TOS:
-		{
-			native_opt = IP_TOS;
-			break;
-		}
-		case SYS_NET_IP_TTL:
-		{
-			native_opt = IP_TTL;
-			break;
-		}
-		case SYS_NET_IP_MULTICAST_IF:
-		{
-			native_opt = IP_MULTICAST_IF;
-			break;
-		}
-		case SYS_NET_IP_MULTICAST_TTL:
-		{
-			native_opt = IP_MULTICAST_TTL;
-			break;
-		}
-		case SYS_NET_IP_MULTICAST_LOOP:
-		{
-			native_opt = IP_MULTICAST_LOOP;
-			break;
-		}
-		case SYS_NET_IP_ADD_MEMBERSHIP:
-		{
-			native_opt = IP_ADD_MEMBERSHIP;
-			break;
-		}
-		case SYS_NET_IP_DROP_MEMBERSHIP:
-		{
-			native_opt = IP_DROP_MEMBERSHIP;
-			break;
-		}
-		case SYS_NET_IP_TTLCHK:
-		{
-			sys_net.error("sys_net_bnet_getsockopt(IPPROTO_IP, SYS_NET_IP_TTLCHK): stubbed option");
-			return {CELL_OK, out_val, out_len};
-		}
-		case SYS_NET_IP_MAXTTL:
-		{
-			sys_net.error("sys_net_bnet_getsockopt(IPPROTO_IP, SYS_NET_IP_MAXTTL): stubbed option");
-			return {CELL_OK, out_val, out_len};
-		}
-		case SYS_NET_IP_DONTFRAG:
-		{
-#ifdef _WIN32
-			native_opt = IP_DONTFRAGMENT;
-#else
-			native_opt = IP_DF;
-#endif
-			break;
-		}
-		default:
-		{
-			sys_net.error("sys_net_bnet_getsockopt(s=%d, IPPROTO_IP): unknown option (0x%x)", lv2_id, optname);
-			return {-SYS_NET_EINVAL, {}, {}};
-		}
-		}
-	}
-	else
-	{
-		sys_net.error("sys_net_bnet_getsockopt(s=%d): unknown level (0x%x)", lv2_id, level);
-		return {-SYS_NET_EINVAL, {}, {}};
-	}
-
-	if (::getsockopt(native_socket, native_level, native_opt, native_val.ch, &native_len) != 0)
-	{
-		return {-get_last_error(false), {}, {}};
-	}
-
-	if (level == SYS_NET_SOL_SOCKET)
-	{
-		switch (optname)
-		{
-		case SYS_NET_SO_SNDTIMEO:
-		case SYS_NET_SO_RCVTIMEO:
-		{
-			// TODO
-			out_val.timeo = {::narrow<s64>(native_val.timeo.tv_sec), ::narrow<s64>(native_val.timeo.tv_usec)};
-			out_len       = sizeof(sys_net_timeval);
-			return {CELL_OK, out_val, out_len};
-		}
-		case SYS_NET_SO_LINGER:
-		{
-			// TODO
-			out_val.linger = {::narrow<s32>(native_val.linger.l_onoff), ::narrow<s32>(native_val.linger.l_linger)};
-			out_len        = sizeof(sys_net_linger);
-			return {CELL_OK, out_val, out_len};
-		}
-		default: break;
-		}
-	}
-
-	// Fallback to int
-	out_val._int = native_val._int;
-	out_len      = sizeof(s32);
-	return {CELL_OK, out_val, out_len};
-}
-
-s32 lv2_socket_native::setsockopt(s32 level, s32 optname, const std::vector<u8>& optval)
-{
-	std::lock_guard lock(mutex);
-
-	int native_int         = 0;
-	int native_level       = -1;
-	int native_opt         = -1;
-	const void* native_val = &native_int;
-	::socklen_t native_len = sizeof(int);
-	::linger native_linger;
-	::ip_mreq native_mreq;
-
-#ifdef _WIN32
-	u32 native_timeo;
-#else
-	::timeval native_timeo;
-#endif
-
-	native_int = *reinterpret_cast<const be_t<s32>*>(optval.data());
-
-	if (level == SYS_NET_SOL_SOCKET)
-	{
-		native_level = SOL_SOCKET;
-
-		switch (optname)
-		{
-		case SYS_NET_SO_NBIO:
-		{
-			// Special
-			so_nbio = native_int;
-			return {};
-		}
-		case SYS_NET_SO_KEEPALIVE:
-		{
-			native_opt = SO_KEEPALIVE;
-			break;
-		}
-		case SYS_NET_SO_SNDBUF:
-		{
-			native_opt = SO_SNDBUF;
-			break;
-		}
-		case SYS_NET_SO_RCVBUF:
-		{
-			native_opt = SO_RCVBUF;
-			break;
-		}
-		case SYS_NET_SO_SNDLOWAT:
-		{
-			native_opt = SO_SNDLOWAT;
-			break;
-		}
-		case SYS_NET_SO_RCVLOWAT:
-		{
-			native_opt = SO_RCVLOWAT;
-			break;
-		}
-		case SYS_NET_SO_BROADCAST:
-		{
-			native_opt = SO_BROADCAST;
-			break;
-		}
-#ifdef _WIN32
-		case SYS_NET_SO_REUSEADDR:
-		{
-			native_opt   = SO_REUSEADDR;
-			so_reuseaddr = native_int;
-			native_int   = so_reuseaddr || so_reuseport ? 1 : 0;
-			break;
-		}
-		case SYS_NET_SO_REUSEPORT:
-		{
-			native_opt   = SO_REUSEADDR;
-			so_reuseport = native_int;
-			native_int   = so_reuseaddr || so_reuseport ? 1 : 0;
-			break;
-		}
-#else
-		case SYS_NET_SO_REUSEADDR:
-		{
-			native_opt = SO_REUSEADDR;
-			break;
-		}
-		case SYS_NET_SO_REUSEPORT:
-		{
-			native_opt = SO_REUSEPORT;
-			break;
-		}
-#endif
-		case SYS_NET_SO_SNDTIMEO:
-		case SYS_NET_SO_RCVTIMEO:
-		{
-			if (optval.size() < sizeof(sys_net_timeval))
-				return -SYS_NET_EINVAL;
-
-			native_opt = optname == SYS_NET_SO_SNDTIMEO ? SO_SNDTIMEO : SO_RCVTIMEO;
-			native_val = &native_timeo;
-			native_len = sizeof(native_timeo);
-
-			const int tv_sec = ::narrow<int>(reinterpret_cast<const sys_net_timeval*>(optval.data())->tv_sec);
-			const int tv_usec = ::narrow<int>(reinterpret_cast<const sys_net_timeval*>(optval.data())->tv_usec);
-#ifdef _WIN32
-			native_timeo = tv_sec * 1000;
-			native_timeo += tv_usec / 1000;
-#else
-			native_timeo.tv_sec = tv_sec;
-			native_timeo.tv_usec = tv_usec;
-#endif
-			// TODO: Overflow detection?
-			(optname == SYS_NET_SO_SNDTIMEO ? so_sendtimeo : so_rcvtimeo) = tv_usec + tv_sec * 1000000;
-			break;
-		}
-		case SYS_NET_SO_LINGER:
-		{
-			if (optval.size() < sizeof(sys_net_linger))
-				return -SYS_NET_EINVAL;
-
-			// TODO
-			native_opt             = SO_LINGER;
-			native_val             = &native_linger;
-			native_len             = sizeof(native_linger);
-			native_linger.l_onoff  = reinterpret_cast<const sys_net_linger*>(optval.data())->l_onoff;
-			native_linger.l_linger = reinterpret_cast<const sys_net_linger*>(optval.data())->l_linger;
-			break;
-		}
-		case SYS_NET_SO_USECRYPTO:
-		{
-			// TODO
-			sys_net.error("sys_net_bnet_setsockopt(s=%d, SOL_SOCKET): Stubbed option (0x%x) (SYS_NET_SO_USECRYPTO)", lv2_id, optname);
-			return {};
-		}
-		case SYS_NET_SO_USESIGNATURE:
-		{
-			// TODO
-			sys_net.error("sys_net_bnet_setsockopt(s=%d, SOL_SOCKET): Stubbed option (0x%x) (SYS_NET_SO_USESIGNATURE)", lv2_id, optname);
-			return {};
-		}
-		default:
-		{
-			sys_net.error("sys_net_bnet_setsockopt(s=%d, SOL_SOCKET): unknown option (0x%x)", lv2_id, optname);
-			return -SYS_NET_EINVAL;
-		}
-		}
-	}
-	else if (level == SYS_NET_IPPROTO_TCP)
-	{
-		native_level = IPPROTO_TCP;
-
-		switch (optname)
-		{
-		case SYS_NET_TCP_MAXSEG:
-		{
-			// Special (no effect)
-			so_tcp_maxseg = native_int;
-			return {};
-		}
-		case SYS_NET_TCP_NODELAY:
-		{
-			native_opt = TCP_NODELAY;
-			break;
-		}
-		default:
-		{
-			sys_net.error("sys_net_bnet_setsockopt(s=%d, IPPROTO_TCP): unknown option (0x%x)", lv2_id, optname);
-			return -SYS_NET_EINVAL;
-		}
-		}
-	}
-	else if (level == SYS_NET_IPPROTO_IP)
-	{
-		native_level = IPPROTO_IP;
-
-		switch (optname)
-		{
-		case SYS_NET_IP_HDRINCL:
-		{
-			native_opt = IP_HDRINCL;
-			break;
-		}
-		case SYS_NET_IP_TOS:
-		{
-			native_opt = IP_TOS;
-			break;
-		}
-		case SYS_NET_IP_TTL:
-		{
-			native_opt = IP_TTL;
-			break;
-		}
-		case SYS_NET_IP_MULTICAST_IF:
-		{
-			native_opt = IP_MULTICAST_IF;
-			break;
-		}
-		case SYS_NET_IP_MULTICAST_TTL:
-		{
-			native_opt = IP_MULTICAST_TTL;
-			break;
-		}
-		case SYS_NET_IP_MULTICAST_LOOP:
-		{
-			native_opt = IP_MULTICAST_LOOP;
-			break;
-		}
-		case SYS_NET_IP_ADD_MEMBERSHIP:
-		case SYS_NET_IP_DROP_MEMBERSHIP:
-		{
-			if (optval.size() < sizeof(sys_net_ip_mreq))
-				return -SYS_NET_EINVAL;
-
-			native_opt                       = optname == SYS_NET_IP_ADD_MEMBERSHIP ? IP_ADD_MEMBERSHIP : IP_DROP_MEMBERSHIP;
-			native_val                       = &native_mreq;
-			native_len                       = sizeof(::ip_mreq);
-			native_mreq.imr_interface.s_addr = std::bit_cast<u32>(reinterpret_cast<const sys_net_ip_mreq*>(optval.data())->imr_interface);
-			native_mreq.imr_multiaddr.s_addr = std::bit_cast<u32>(reinterpret_cast<const sys_net_ip_mreq*>(optval.data())->imr_multiaddr);
-			break;
-		}
-		case SYS_NET_IP_TTLCHK:
-		{
-			sys_net.error("sys_net_bnet_setsockopt(s=%d, IPPROTO_IP): Stubbed option (0x%x) (SYS_NET_IP_TTLCHK)", lv2_id, optname);
-			break;
-		}
-		case SYS_NET_IP_MAXTTL:
-		{
-			sys_net.error("sys_net_bnet_setsockopt(s=%d, IPPROTO_IP): Stubbed option (0x%x) (SYS_NET_IP_MAXTTL)", lv2_id, optname);
-			break;
-		}
-		case SYS_NET_IP_DONTFRAG:
-		{
-#ifdef _WIN32
-			native_opt = IP_DONTFRAGMENT;
-#else
-			native_opt = IP_DF;
-#endif
-			break;
-		}
-		default:
-		{
-			sys_net.error("sys_net_bnet_setsockopt(s=%d, IPPROTO_IP): unknown option (0x%x)", lv2_id, optname);
-			return -SYS_NET_EINVAL;
-		}
-		}
-	}
-	else
-	{
-		sys_net.error("sys_net_bnet_setsockopt(s=%d): unknown level (0x%x)", lv2_id, level);
-		return -SYS_NET_EINVAL;
-	}
-
-	if (::setsockopt(native_socket, native_level, native_opt, static_cast<const char*>(native_val), native_len) == 0)
-	{
-		return {};
-	}
-
-	return -get_last_error(false);
-}
-
-s32 lv2_socket_native::listen(s32 backlog)
-{
-	std::lock_guard lock(mutex);
-
-	if (::listen(native_socket, backlog) == 0)
-	{
-		return CELL_OK;
-	}
-
-	return -get_last_error(false);
-}
-
-std::optional<std::tuple<s32, std::vector<u8>, sys_net_sockaddr>> lv2_socket_native::recvfrom(s32 flags, u32 len, bool is_lock)
-{
-	std::unique_lock<shared_mutex> lock(mutex, std::defer_lock);
-
-	if (is_lock)
-	{
-		lock.lock();
-	}
-
-	if (feign_tcp_conn_failure)
-	{
-		// As if just lost the connection
-		feign_tcp_conn_failure = false;
-		return {{-SYS_NET_ECONNRESET, {},{}}};
-	}
-
-	int native_flags = 0;
-	::sockaddr_storage native_addr{};
-	::socklen_t native_addrlen = sizeof(native_addr);
-	std::vector<u8> res_buf(len);
-
-	auto& dnshook = g_fxo->get<np::dnshook>();
-	if (dnshook.is_dns(lv2_id) && dnshook.is_dns_queue(lv2_id))
-	{
-		auto& nph         = g_fxo->get<named_thread<np::np_handler>>();
-		const auto packet = dnshook.get_dns_packet(lv2_id);
-		ensure(packet.size() < len);
-		memcpy(res_buf.data(), packet.data(), packet.size());
-		native_addr.ss_family                                             = AF_INET;
-		(reinterpret_cast<::sockaddr_in*>(&native_addr))->sin_port        = std::bit_cast<u16, be_t<u16>>(53); // htons(53)
-		(reinterpret_cast<::sockaddr_in*>(&native_addr))->sin_addr.s_addr = nph.get_dns_ip();
-		const auto sn_addr                                                = native_addr_to_sys_net_addr(native_addr);
-
-		return {{::narrow<s32>(packet.size()), res_buf, sn_addr}};
-	}
-
-	if (flags & SYS_NET_MSG_PEEK)
-	{
-		native_flags |= MSG_PEEK;
-	}
-
-	if (flags & SYS_NET_MSG_WAITALL)
-	{
-		native_flags |= MSG_WAITALL;
-	}
-
-	auto native_result = ::recvfrom(native_socket, reinterpret_cast<char*>(res_buf.data()), len, native_flags, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen);
-
-	if (native_result >= 0)
-	{
-		const auto sn_addr = native_addr_to_sys_net_addr(native_addr);
-		return {{::narrow<s32>(native_result), res_buf, sn_addr}};
-	}
-#ifdef _WIN32
-	else
-	{
-		// Windows returns an error when trying to peek at a message and buffer not long enough to contain the whole message, should be ignored
-		if ((native_flags & MSG_PEEK) && get_native_error() == WSAEMSGSIZE)
-		{
-			const auto sn_addr = native_addr_to_sys_net_addr(native_addr);
-			return {{len, res_buf, sn_addr}};
-		}
-		// Windows will return WSASHUTDOWN when the connection is shutdown, POSIX just returns EOF (0) in this situation.
-		if (get_native_error() == WSAESHUTDOWN)
-		{
-			const auto sn_addr = native_addr_to_sys_net_addr(native_addr);
-			return {{0, {}, sn_addr}};
-		}
-	}
-	const auto result = get_last_error(!so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0, connecting);
-#else
-	const auto result = get_last_error(!so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0);
-#endif
-
-	if (result)
-	{
-		return {{-result, {}, {}}};
-	}
-
-	return std::nullopt;
-}
-
-std::optional<s32> lv2_socket_native::sendto(s32 flags, const std::vector<u8>& buf, std::optional<sys_net_sockaddr> opt_sn_addr, bool is_lock)
-{
-	std::unique_lock<shared_mutex> lock(mutex, std::defer_lock);
-
-	if (is_lock)
-	{
-		lock.lock();
-	}
-
-	int native_flags                       = 0;
-	int native_result                      = -1;
-	std::optional<sockaddr_in> native_addr = std::nullopt;
-
-	if (opt_sn_addr)
-	{
-		native_addr = sys_net_addr_to_native_addr(*opt_sn_addr);
-		sys_net.trace("[Native] Attempting to send to %s:%d", (*native_addr).sin_addr, std::bit_cast<be_t<u16>, u16>((*native_addr).sin_port));
-
-		auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-		if (!nph.get_net_status() && is_ip_public_address(*native_addr))
-		{
-			return -SYS_NET_EADDRNOTAVAIL;
-		}
-	}
-	else if (feign_tcp_conn_failure)
-	{
-		// As if just lost the connection
-		feign_tcp_conn_failure = false;
-		return -SYS_NET_ECONNRESET;
-	}
-
-	sys_net_error result{};
-
-	if (flags & SYS_NET_MSG_WAITALL)
-	{
-		native_flags |= MSG_WAITALL;
-	}
-
-	auto& dnshook = g_fxo->get<np::dnshook>();
-	if (opt_sn_addr && type == SYS_NET_SOCK_DGRAM && reinterpret_cast<const sys_net_sockaddr_in*>(&*opt_sn_addr)->sin_port == 53)
-	{
-		dnshook.add_dns_spy(lv2_id);
-	}
-
-	if (dnshook.is_dns(lv2_id))
-	{
-		const s32 ret_analyzer = dnshook.analyze_dns_packet(lv2_id, reinterpret_cast<const u8*>(buf.data()), ::size32(buf));
-
-		// Check if the packet is intercepted
-		if (ret_analyzer >= 0)
-		{
-			return {ret_analyzer};
-		}
-	}
-
-	native_result = ::sendto(native_socket, reinterpret_cast<const char*>(buf.data()), ::narrow<int>(buf.size()), native_flags, native_addr ? reinterpret_cast<struct sockaddr*>(&native_addr.value()) : nullptr, native_addr ? sizeof(sockaddr_in) : 0);
-
-	if (native_result >= 0)
-	{
-		return {native_result};
-	}
-
-#ifdef _WIN32
-	result = get_last_error(!so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0, connecting);
-#else
-	result = get_last_error(!so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0);
-#endif
-
-	if (result)
-	{
-		return {-result};
-	}
-
-	// Note that this can only happen if the send buffer is full
-	return std::nullopt;
-}
-
-std::optional<s32> lv2_socket_native::sendmsg(s32 flags, const sys_net_msghdr& msg, bool is_lock)
-{
-	std::unique_lock<shared_mutex> lock(mutex, std::defer_lock);
-
-	if (is_lock)
-	{
-		lock.lock();
-	}
-
-	int native_flags                       = 0;
-	int native_result                      = -1;
-
-	sys_net_error result{};
-
-	if (flags & SYS_NET_MSG_WAITALL)
-	{
-		native_flags |= MSG_WAITALL;
-	}
-
-	if (feign_tcp_conn_failure)
-	{
-		// As if just lost the connection
-		feign_tcp_conn_failure = false;
-		return {-SYS_NET_ECONNRESET};
-	}
-
-	for (int i = 0; i < msg.msg_iovlen; i++)
-	{
-		auto iov_base = msg.msg_iov[i].iov_base;
-		const u32 len = msg.msg_iov[i].iov_len;
-		const std::vector<u8> buf_copy(vm::_ptr<const char>(iov_base.addr()), vm::_ptr<const char>(iov_base.addr()) + len);
-
-		native_result = ::send(native_socket, reinterpret_cast<const char*>(buf_copy.data()), ::narrow<int>(buf_copy.size()), native_flags);
-
-		if (native_result >= 0)
-		{
-			return {native_result};
-		}
-	}
-
-	result = get_last_error(!so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0);
-
-	if (result)
-	{
-		return {-result};
-	}
-
-	return std::nullopt;
-}
-
-void lv2_socket_native::close()
-{
-	std::lock_guard lock(mutex);
-
-	np::close_socket(native_socket);
-	native_socket = {};
-
-	if (auto dnshook = g_fxo->try_get<np::dnshook>())
-	{
-		dnshook->remove_dns_spy(lv2_id);
-	}
-
-	if (bound_port && g_fxo->is_init<named_thread<np::np_handler>>())
-	{
-		auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-		nph.upnp_remove_port_mapping(bound_port, type == SYS_NET_SOCK_STREAM ? "TCP" : "UDP");
-		bound_port = 0;
-	}
-}
-
-s32 lv2_socket_native::shutdown(s32 how)
-{
-	std::lock_guard lock(mutex);
-
-	if (feign_tcp_conn_failure)
-	{
-		// As if still connected
-		return CELL_OK;
-	}
-
-#ifdef _WIN32
-	const int native_how =
-		how == SYS_NET_SHUT_RD ? SD_RECEIVE :
-		how == SYS_NET_SHUT_WR ? SD_SEND :
-                                 SD_BOTH;
-#else
-	const int native_how =
-		how == SYS_NET_SHUT_RD ? SHUT_RD :
-		how == SYS_NET_SHUT_WR ? SHUT_WR :
-                                 SHUT_RDWR;
-#endif
-
-	if (::shutdown(native_socket, native_how) == 0)
-	{
-		return CELL_OK;
-	}
-
-	return -get_last_error(false);
-}
-
-s32 lv2_socket_native::poll(sys_net_pollfd& sn_pfd, pollfd& native_pfd)
-{
-	// Check for fake packet for dns interceptions
-	auto& dnshook = g_fxo->get<np::dnshook>();
-	if (sn_pfd.events & SYS_NET_POLLIN && dnshook.is_dns(sn_pfd.fd) && dnshook.is_dns_queue(sn_pfd.fd))
-	{
-		sn_pfd.revents |= SYS_NET_POLLIN;
-		return 1;
-	}
-	if (sn_pfd.events & ~(SYS_NET_POLLIN | SYS_NET_POLLOUT | SYS_NET_POLLERR))
-	{
-		sys_net.warning("sys_net_bnet_poll(fd=%d): events=0x%x", sn_pfd.fd, sn_pfd.events);
-	}
-
-	native_pfd.fd = native_socket;
-
-	if (sn_pfd.events & SYS_NET_POLLIN)
-	{
-		native_pfd.events |= POLLIN;
-	}
-	if (sn_pfd.events & SYS_NET_POLLOUT)
-	{
-		native_pfd.events |= POLLOUT;
-	}
-
-	return 0;
-}
-
-std::tuple<bool, bool, bool> lv2_socket_native::select(bs_t<lv2_socket::poll_t> selected, pollfd& native_pfd)
-{
-	native_pfd.fd = native_socket;
-	if (selected & lv2_socket::poll_t::read)
-	{
-		native_pfd.events |= POLLIN;
-	}
-	if (selected & lv2_socket::poll_t::write)
-	{
-		native_pfd.events |= POLLOUT;
-	}
-
-	return {};
-}
-
-void lv2_socket_native::set_default_buffers()
-{
-	// Those are the default PS3 values
-	u32 default_RCVBUF = (type == SYS_NET_SOCK_STREAM) ? 65535 : 9216;
-	if (::setsockopt(native_socket, SOL_SOCKET, SO_RCVBUF, reinterpret_cast<const char*>(&default_RCVBUF), sizeof(default_RCVBUF)) != 0)
-	{
-		sys_net.error("Error setting default SO_RCVBUF on sys_net_bnet_socket socket");
-	}
-	u32 default_SNDBUF = 131072;
-	if (::setsockopt(native_socket, SOL_SOCKET, SO_SNDBUF, reinterpret_cast<const char*>(&default_SNDBUF), sizeof(default_SNDBUF)) != 0)
-	{
-		sys_net.error("Error setting default SO_SNDBUF on sys_net_bnet_socket socket");
-	}
-}
-
-void lv2_socket_native::set_non_blocking()
-{
-	// Set non-blocking
-	// This is done to avoid having threads stuck on blocking socket functions
-	// Blocking functions just put the thread to sleep and delegate the waking up to network_thread which polls the sockets
-	np::set_socket_non_blocking(native_socket);
-}
-
-bool lv2_socket_native::is_socket_connected()
-{
-	if (type != SYS_NET_SOCK_STREAM)
-	{
-		return false;
-	}
-
-	std::lock_guard lock(mutex);
-
-	int listening = 0;
-	socklen_t len = sizeof(listening);
-
-	if (::getsockopt(native_socket, SOL_SOCKET, SO_ACCEPTCONN, reinterpret_cast<char*>(&listening), &len) == -1)
-	{
-		return false;
-	}
-
-	if (listening)
-	{
-		// Would be handled in other ways
-		return false;
-	}
-
-	fd_set readfds, writefds;
-	struct timeval timeout{0, 0}; // Zero timeout
-
-	FD_ZERO(&readfds);
-	FD_ZERO(&writefds);
-	FD_SET(native_socket, &readfds);
-	FD_SET(native_socket, &writefds);
-
-	// Use select to check for readability and writability
-	const int result = ::select(1, &readfds, &writefds, NULL, &timeout);
-
-	if (result < 0)
-	{
-		// Error occurred
-		return false;
-	}
-
-	// Socket is connected if it's readable or writable
-	return FD_ISSET(native_socket, &readfds) || FD_ISSET(native_socket, &writefds);
-}
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.h b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.h
deleted file mode 100644
index cf07dfcb76..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-#pragma once
-
-#ifdef _WIN32
-#include <winsock2.h>
-#include <WS2tcpip.h>
-#else
-#ifdef __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <poll.h>
-#ifdef __clang__
-#pragma GCC diagnostic pop
-#endif
-#endif
-
-#include "lv2_socket.h"
-
-class lv2_socket_native final : public lv2_socket
-{
-public:
-	static constexpr u32 id_type = 1;
-
-	lv2_socket_native(lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol);
-	lv2_socket_native(utils::serial& ar, lv2_socket_type type);
-	~lv2_socket_native() noexcept override;
-	void save(utils::serial& ar);
-	s32 create_socket();
-
-	std::tuple<bool, s32, shared_ptr<lv2_socket>, sys_net_sockaddr> accept(bool is_lock = true) override;
-	s32 bind(const sys_net_sockaddr& addr) override;
-
-	std::optional<s32> connect(const sys_net_sockaddr& addr) override;
-	s32 connect_followup() override;
-
-	std::pair<s32, sys_net_sockaddr> getpeername() override;
-	std::pair<s32, sys_net_sockaddr> getsockname() override;
-	std::tuple<s32, sockopt_data, u32> getsockopt(s32 level, s32 optname, u32 len) override;
-	s32 setsockopt(s32 level, s32 optname, const std::vector<u8>& optval) override;
-	std::optional<std::tuple<s32, std::vector<u8>, sys_net_sockaddr>> recvfrom(s32 flags, u32 len, bool is_lock = true) override;
-	std::optional<s32> sendto(s32 flags, const std::vector<u8>& buf, std::optional<sys_net_sockaddr> opt_sn_addr, bool is_lock = true) override;
-	std::optional<s32> sendmsg(s32 flags, const sys_net_msghdr& msg, bool is_lock = true) override;
-
-	s32 poll(sys_net_pollfd& sn_pfd, pollfd& native_pfd) override;
-	std::tuple<bool, bool, bool> select(bs_t<poll_t> selected, pollfd& native_pfd) override;
-
-	bool is_socket_connected();
-
-	s32 listen(s32 backlog) override;
-	void close() override;
-	s32 shutdown(s32 how) override;
-
-private:
-	void set_socket(socket_type native_socket, lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol);
-	void set_default_buffers();
-	void set_non_blocking();
-
-private:
-	// Value keepers
-#ifdef _WIN32
-	s32 so_reuseaddr = 0;
-	s32 so_reuseport = 0;
-#endif
-	u16 bound_port = 0;
-	bool feign_tcp_conn_failure = false; // Savestate load related
-};
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.cpp b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.cpp
deleted file mode 100644
index 67cefe3e3e..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-#include "stdafx.h"
-#include "lv2_socket_p2p.h"
-#include "Emu/NP/np_helpers.h"
-#include "network_context.h"
-#include "sys_net_helpers.h"
-
-LOG_CHANNEL(sys_net);
-
-lv2_socket_p2p::lv2_socket_p2p(lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol)
-	: lv2_socket(family, type, protocol)
-{
-	sockopt_cache cache_type;
-	cache_type.data._int = SYS_NET_SOCK_DGRAM_P2P;
-	cache_type.len = 4;
-
-	sockopts[(static_cast<u64>(SYS_NET_SOL_SOCKET) << 32ull) | SYS_NET_SO_TYPE] = cache_type;
-}
-
-lv2_socket_p2p::lv2_socket_p2p(utils::serial& ar, lv2_socket_type type)
-	: lv2_socket(stx::make_exact(ar), type)
-{
-	ar(port, vport, bound_addr);
-
-	auto data_dequeue = ar.pop<std::deque<std::pair<sys_net_sockaddr_in_p2p, std::vector<u8>>>>();
-
-	for (; !data_dequeue.empty(); data_dequeue.pop_front())
-	{
-		data.push(std::move(data_dequeue.front()));
-	}
-}
-
-void lv2_socket_p2p::save(utils::serial& ar)
-{
-	lv2_socket::save(ar, true);
-	ar(port, vport, bound_addr);
-
-	std::deque<std::pair<sys_net_sockaddr_in_p2p, std::vector<u8>>> data_dequeue;
-
-	for (auto save_data = ::as_rvalue(data); !save_data.empty(); save_data.pop())
-	{
-		data_dequeue.push_back(std::move(save_data.front()));
-	}
-
-	ar(data_dequeue);
-}
-
-void lv2_socket_p2p::handle_new_data(sys_net_sockaddr_in_p2p p2p_addr, std::vector<u8> p2p_data)
-{
-	std::lock_guard lock(mutex);
-
-	sys_net.trace("Received a P2P packet for vport %d and saved it", p2p_addr.sin_vport);
-	data.push(std::make_pair(std::move(p2p_addr), std::move(p2p_data)));
-
-	// Check if poll is happening
-	if (events.test_and_reset(lv2_socket::poll_t::read))
-	{
-		bs_t<lv2_socket::poll_t> read_event = lv2_socket::poll_t::read;
-		for (auto it = queue.begin(); it != queue.end();)
-		{
-			if (it->second(read_event))
-			{
-				it = queue.erase(it);
-				continue;
-			}
-			it++;
-		}
-
-		if (queue.empty())
-		{
-			events.store({});
-		}
-	}
-}
-
-std::tuple<bool, s32, shared_ptr<lv2_socket>, sys_net_sockaddr> lv2_socket_p2p::accept([[maybe_unused]] bool is_lock)
-{
-	sys_net.fatal("[P2P] accept() called on a P2P socket");
-	return {};
-}
-
-std::optional<s32> lv2_socket_p2p::connect([[maybe_unused]] const sys_net_sockaddr& addr)
-{
-	sys_net.fatal("[P2P] connect() called on a P2P socket");
-	return {};
-}
-
-s32 lv2_socket_p2p::connect_followup()
-{
-	sys_net.fatal("[P2P] connect_followup() called on a P2P socket");
-	return {};
-}
-
-std::pair<s32, sys_net_sockaddr> lv2_socket_p2p::getpeername()
-{
-	sys_net.fatal("[P2P] getpeername() called on a P2P socket");
-	return {};
-}
-
-s32 lv2_socket_p2p::listen([[maybe_unused]] s32 backlog)
-{
-	sys_net.fatal("[P2P] listen() called on a P2P socket");
-	return {};
-}
-
-s32 lv2_socket_p2p::bind(const sys_net_sockaddr& addr)
-{
-	const auto* psa_in_p2p = reinterpret_cast<const sys_net_sockaddr_in_p2p*>(&addr);
-	u16 p2p_port           = psa_in_p2p->sin_port;
-	u16 p2p_vport          = psa_in_p2p->sin_vport;
-
-	sys_net.notice("[P2P] Trying to bind %s:%d:%d", np::ip_to_string(std::bit_cast<u32>(psa_in_p2p->sin_addr)), p2p_port, p2p_vport);
-
-	if (p2p_port != SCE_NP_PORT)
-	{
-		if (p2p_port == 0)
-		{
-			return -SYS_NET_EINVAL;
-		}
-		sys_net.warning("[P2P] Attempting to bind a socket to a port != %d", +SCE_NP_PORT);
-	}
-
-	socket_type real_socket{};
-
-	auto& nc = g_fxo->get<p2p_context>();
-	{
-		std::lock_guard list_lock(nc.list_p2p_ports_mutex);
-
-		nc.create_p2p_port(p2p_port);
-		auto& pport = ::at32(nc.list_p2p_ports, p2p_port);
-		real_socket = pport.p2p_socket;
-
-		{
-			std::lock_guard lock(pport.bound_p2p_vports_mutex);
-
-			if (p2p_vport == 0)
-			{
-				// Find a free vport starting at 30000
-				p2p_vport = 30000;
-				while (pport.bound_p2p_vports.contains(p2p_vport))
-				{
-					p2p_vport++;
-				}
-			}
-			
-			if (pport.bound_p2p_vports.contains(p2p_vport))
-			{
-				// Check that all other sockets are SO_REUSEADDR or SO_REUSEPORT
-				auto& bound_sockets = ::at32(pport.bound_p2p_vports, p2p_vport);
-				if (!sys_net_helpers::all_reusable(bound_sockets))
-				{
-					return -SYS_NET_EADDRINUSE;
-				}
-
-				bound_sockets.insert(lv2_id);
-			}
-			else
-			{
-				std::set<s32> bound_ports{lv2_id};
-				pport.bound_p2p_vports.insert(std::make_pair(p2p_vport, std::move(bound_ports)));
-			}
-		}
-	}
-
-	{
-		std::lock_guard lock(mutex);
-		port       = p2p_port;
-		vport      = p2p_vport;
-		native_socket = real_socket;
-		bound_addr = psa_in_p2p->sin_addr;
-	}
-
-	return CELL_OK;
-}
-
-std::pair<s32, sys_net_sockaddr> lv2_socket_p2p::getsockname()
-{
-	std::lock_guard lock(mutex);
-
-	// Unbound socket
-	if (!native_socket)
-	{
-		return {CELL_OK, {}};
-	}
-
-	sys_net_sockaddr sn_addr{};
-	sys_net_sockaddr_in_p2p* paddr = reinterpret_cast<sys_net_sockaddr_in_p2p*>(&sn_addr);
-
-	paddr->sin_len    = sizeof(sys_net_sockaddr_in);
-	paddr->sin_family = SYS_NET_AF_INET;
-	paddr->sin_port   = port;
-	paddr->sin_vport  = vport;
-	paddr->sin_addr   = bound_addr;
-
-	return {CELL_OK, sn_addr};
-}
-
-std::tuple<s32, lv2_socket::sockopt_data, u32> lv2_socket_p2p::getsockopt(s32 level, s32 optname, u32 len)
-{
-	std::lock_guard lock(mutex);
-
-	const u64 key = (static_cast<u64>(level) << 32) | static_cast<u64>(optname);
-
-	if (!sockopts.contains(key))
-	{
-		sys_net.error("Unhandled getsockopt(level=%d, optname=%d, len=%d)", level, optname, len);
-		return {};
-	}
-
-	const auto& cache = ::at32(sockopts, key);
-	return {CELL_OK, cache.data, cache.len};
-}
-
-s32 lv2_socket_p2p::setsockopt(s32 level, s32 optname, const std::vector<u8>& optval)
-{
-	std::lock_guard lock(mutex);
-
-	int native_int = *reinterpret_cast<const be_t<s32>*>(optval.data());
-
-	if (level == SYS_NET_SOL_SOCKET && optname == SYS_NET_SO_NBIO)
-	{
-		so_nbio = native_int;
-	}
-
-	const u64 key = (static_cast<u64>(level) << 32) | static_cast<u64>(optname);
-	sockopt_cache cache{};
-	memcpy(&cache.data._int, optval.data(), optval.size());
-	cache.len = ::size32(optval);
-
-	sockopts[key] = std::move(cache);
-
-	return CELL_OK;
-}
-
-std::optional<std::tuple<s32, std::vector<u8>, sys_net_sockaddr>> lv2_socket_p2p::recvfrom(s32 flags, u32 len, bool is_lock)
-{
-	std::unique_lock<shared_mutex> lock(mutex, std::defer_lock);
-
-	if (is_lock)
-	{
-		lock.lock();
-	}
-
-	if (data.empty())
-	{
-		if (so_nbio || (flags & SYS_NET_MSG_DONTWAIT))
-			return {{-SYS_NET_EWOULDBLOCK, {}, {}}};
-
-		return std::nullopt;
-	}
-
-	sys_net.trace("[P2P] p2p_data for vport %d contains %d elements", vport, data.size());
-
-	std::vector<u8> res_buf(len);
-
-	const auto& p2p_data = data.front();
-	s32 native_result    = std::min(len, static_cast<u32>(p2p_data.second.size()));
-	memcpy(res_buf.data(), p2p_data.second.data(), native_result);
-
-	sys_net_sockaddr sn_addr;
-	memcpy(&sn_addr, &p2p_data.first, sizeof(sn_addr));
-
-	data.pop();
-
-	return {{native_result, res_buf, sn_addr}};
-}
-
-std::optional<s32> lv2_socket_p2p::sendto(s32 flags, const std::vector<u8>& buf, std::optional<sys_net_sockaddr> opt_sn_addr, bool is_lock)
-{
-	std::unique_lock<shared_mutex> lock(mutex, std::defer_lock);
-
-	if (is_lock)
-	{
-		lock.lock();
-	}
-
-	ensure(opt_sn_addr);
-	ensure(native_socket); // ensures it has been bound
-	ensure(buf.size() <= static_cast<usz>(65535 - VPORT_P2P_HEADER_SIZE)); // catch games using full payload for future fragmentation implementation if necessary
-	const u16 p2p_port  = reinterpret_cast<const sys_net_sockaddr_in*>(&*opt_sn_addr)->sin_port;
-	const u16 p2p_vport = reinterpret_cast<const sys_net_sockaddr_in_p2p*>(&*opt_sn_addr)->sin_vport;
-
-	auto native_addr = sys_net_addr_to_native_addr(*opt_sn_addr);
-
-	char ip_str[16];
-	inet_ntop(AF_INET, &native_addr.sin_addr, ip_str, sizeof(ip_str));
-	sys_net.trace("[P2P] Sending a packet to %s:%d:%d", ip_str, p2p_port, p2p_vport);
-
-	std::vector<u8> p2p_data(buf.size() + VPORT_P2P_HEADER_SIZE);
-	const le_t<u16> p2p_vport_le = p2p_vport;
-	const le_t<u16> src_vport_le = vport;
-	const le_t<u16> p2p_flags_le = P2P_FLAG_P2P;
-	memcpy(p2p_data.data(), &p2p_vport_le, sizeof(u16));
-	memcpy(p2p_data.data() + sizeof(u16), &src_vport_le, sizeof(u16));
-	memcpy(p2p_data.data() + sizeof(u16) + sizeof(u16), &p2p_flags_le, sizeof(u16));
-	memcpy(p2p_data.data() + VPORT_P2P_HEADER_SIZE, buf.data(), buf.size());
-
-	int native_flags = 0;
-	if (flags & SYS_NET_MSG_WAITALL)
-	{
-		native_flags |= MSG_WAITALL;
-	}
-
-	auto native_result = np::sendto_possibly_ipv6(native_socket, reinterpret_cast<const char*>(p2p_data.data()), ::size32(p2p_data), &native_addr, native_flags);
-
-	if (native_result >= 0)
-	{
-		return {std::max<s32>(native_result - VPORT_P2P_HEADER_SIZE, 0l)};
-	}
-
-	s32 result = get_last_error(!so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0);
-
-	if (result)
-	{
-		return {-result};
-	}
-
-	// Note that this can only happen if the send buffer is full
-	return std::nullopt;
-}
-
-std::optional<s32> lv2_socket_p2p::sendmsg([[maybe_unused]] s32 flags, [[maybe_unused]] const sys_net_msghdr& msg, [[maybe_unused]] bool is_lock)
-{
-	sys_net.todo("lv2_socket_p2p::sendmsg");
-	return {};
-}
-
-void lv2_socket_p2p::close()
-{
-	if (!port || !vport)
-	{
-		return;
-	}
-
-	if (g_fxo->is_init<p2p_context>())
-	{
-		auto& nc = g_fxo->get<p2p_context>();
-		std::lock_guard lock(nc.list_p2p_ports_mutex);
-
-		if (!nc.list_p2p_ports.contains(port))
-			return;
-
-		auto& p2p_port = ::at32(nc.list_p2p_ports, port);
-		{
-			std::lock_guard lock(p2p_port.bound_p2p_vports_mutex);
-			if (!p2p_port.bound_p2p_vports.contains(vport))
-			{
-				return;
-			}
-
-			auto& bound_sockets = ::at32(p2p_port.bound_p2p_vports, vport);
-			bound_sockets.erase(lv2_id);
-
-			if (bound_sockets.empty())
-			{
-				p2p_port.bound_p2p_vports.erase(vport);
-			}
-		}
-	}
-}
-
-s32 lv2_socket_p2p::shutdown([[maybe_unused]] s32 how)
-{
-	sys_net.todo("[P2P] shutdown");
-	return CELL_OK;
-}
-
-s32 lv2_socket_p2p::poll(sys_net_pollfd& sn_pfd, [[maybe_unused]] pollfd& native_pfd)
-{
-	std::lock_guard lock(mutex);
-	ensure(vport);
-
-	// Check if it's a bound P2P socket
-	if ((sn_pfd.events & SYS_NET_POLLIN) && !data.empty())
-	{
-		sys_net.trace("[P2P] p2p_data for vport %d contains %d elements", vport, data.size());
-		sn_pfd.revents |= SYS_NET_POLLIN;
-	}
-
-	// Data can always be written on a dgram socket
-	if (sn_pfd.events & SYS_NET_POLLOUT)
-	{
-		sn_pfd.revents |= SYS_NET_POLLOUT;
-	}
-
-	return sn_pfd.revents ? 1 : 0;
-}
-
-std::tuple<bool, bool, bool> lv2_socket_p2p::select(bs_t<lv2_socket::poll_t> selected, [[maybe_unused]] pollfd& native_pfd)
-{
-	std::lock_guard lock(mutex);
-
-	bool read_set  = false;
-	bool write_set = false;
-
-	// Check if it's a bound P2P socket
-	if ((selected & lv2_socket::poll_t::read) && vport && !data.empty())
-	{
-		sys_net.trace("[P2P] p2p_data for vport %d contains %d elements", vport, data.size());
-		read_set = true;
-	}
-
-	if (selected & lv2_socket::poll_t::write)
-	{
-		write_set = true;
-	}
-
-	return {read_set, write_set, false};
-}
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.h b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.h
deleted file mode 100644
index b8fadb3d53..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#include "lv2_socket.h"
-
-class lv2_socket_p2p : public lv2_socket
-{
-public:
-	lv2_socket_p2p(lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol);
-	lv2_socket_p2p(utils::serial& ar, lv2_socket_type type);
-	void save(utils::serial& ar);
-
-	std::tuple<bool, s32, shared_ptr<lv2_socket>, sys_net_sockaddr> accept(bool is_lock = true) override;
-	s32 bind(const sys_net_sockaddr& addr) override;
-
-	std::optional<s32> connect(const sys_net_sockaddr& addr) override;
-	s32 connect_followup() override;
-
-	std::pair<s32, sys_net_sockaddr> getpeername() override;
-	std::pair<s32, sys_net_sockaddr> getsockname() override;
-
-	std::tuple<s32, sockopt_data, u32> getsockopt(s32 level, s32 optname, u32 len) override;
-	s32 setsockopt(s32 level, s32 optname, const std::vector<u8>& optval) override;
-
-	s32 listen(s32 backlog) override;
-
-	std::optional<std::tuple<s32, std::vector<u8>, sys_net_sockaddr>> recvfrom(s32 flags, u32 len, bool is_lock = true) override;
-	std::optional<s32> sendto(s32 flags, const std::vector<u8>& buf, std::optional<sys_net_sockaddr> opt_sn_addr, bool is_lock = true) override;
-	std::optional<s32> sendmsg(s32 flags, const sys_net_msghdr& msg, bool is_lock = true) override;
-
-	void close() override;
-	s32 shutdown(s32 how) override;
-
-	s32 poll(sys_net_pollfd& sn_pfd, pollfd& native_pfd) override;
-	std::tuple<bool, bool, bool> select(bs_t<poll_t> selected, pollfd& native_pfd) override;
-
-	void handle_new_data(sys_net_sockaddr_in_p2p p2p_addr, std::vector<u8> p2p_data);
-
-protected:
-	// Port(actual bound port) and Virtual Port(indicated by u16 at the start of the packet)
-	u16 port = 3658, vport = 0;
-	u32 bound_addr = 0;
-	// Queue containing received packets from network_thread for SYS_NET_SOCK_DGRAM_P2P sockets
-	std::queue<std::pair<sys_net_sockaddr_in_p2p, std::vector<u8>>> data{};
-	// List of sock options
-	std::map<u64, sockopt_cache> sockopts;
-};
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.cpp b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.cpp
deleted file mode 100644
index c0790a2e33..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.cpp
+++ /dev/null
@@ -1,1048 +0,0 @@
-#include "stdafx.h"
-
-#include "Utilities/Thread.h"
-#include "util/atomic.hpp"
-#include "lv2_socket_p2ps.h"
-#include "Emu/NP/np_helpers.h"
-#include "nt_p2p_port.h"
-#include "network_context.h"
-#include "sys_net_helpers.h"
-
-LOG_CHANNEL(sys_net);
-
-// Object in charge of retransmiting packets for STREAM_P2P sockets
-class tcp_timeout_monitor
-{
-public:
-	void add_message(s32 sock_id, const sockaddr_in* dst, std::vector<u8> data, u64 seq)
-	{
-		{
-			std::lock_guard lock(data_mutex);
-
-			const auto now = steady_clock::now();
-
-			message msg;
-			msg.dst_addr         = *dst;
-			msg.sock_id          = sock_id;
-			msg.data             = std::move(data);
-			msg.seq              = seq;
-			msg.initial_sendtime = now;
-
-			rtt_info rtt = rtts[sock_id];
-
-			const auto expected_time = now + rtt.rtt_time;
-
-			msgs.insert(std::make_pair(expected_time, std::move(msg)));
-		}
-		wakey.release(1);
-		wakey.notify_one(); // TODO: Should be improved to only wake if new timeout < old timeout
-	}
-
-	void confirm_data_received(s32 sock_id, u64 ack)
-	{
-		std::lock_guard lock(data_mutex);
-		rtts[sock_id].num_retries = 0;
-
-		const auto now = steady_clock::now();
-
-		for (auto it = msgs.begin(); it != msgs.end();)
-		{
-			auto& msg = it->second;
-			if (msg.sock_id == sock_id && msg.seq < ack)
-			{
-				// Decreases RTT if msg is early
-				if (now < it->first)
-				{
-					const auto actual_rtt = std::chrono::duration_cast<std::chrono::milliseconds>(now - it->second.initial_sendtime);
-					const auto cur_rtt    = rtts[sock_id].rtt_time;
-					if (cur_rtt > actual_rtt)
-					{
-						rtts[sock_id].rtt_time = (actual_rtt + cur_rtt) / 2;
-					}
-				}
-				it = msgs.erase(it);
-				continue;
-			}
-			it++;
-		}
-	}
-
-	void clear_all_messages(s32 sock_id)
-	{
-		std::lock_guard lock(data_mutex);
-
-		for (auto it = msgs.begin(); it != msgs.end();)
-		{
-			auto& msg = it->second;
-
-			if (msg.sock_id == sock_id)
-			{
-				it = msgs.erase(it);
-				continue;
-			}
-			it++;
-		}
-	}
-
-	void operator()()
-	{
-		atomic_wait_timeout timeout = atomic_wait_timeout::inf;
-
-		while (thread_ctrl::state() != thread_state::aborting)
-		{
-			if (!wakey)
-			{
-				wakey.wait(0, timeout);
-			}
-
-			wakey = 0;
-
-			if (thread_ctrl::state() == thread_state::aborting)
-				return;
-
-			std::lock_guard lock(data_mutex);
-
-			const auto now = steady_clock::now();
-			// Check for messages that haven't been acked
-			std::set<s32> rtt_increased;
-			for (auto it = msgs.begin(); it != msgs.end();)
-			{
-				if (it->first > now)
-					break;
-
-				// reply is late, increases rtt
-				auto& msg       = it->second;
-				const auto addr = msg.dst_addr.sin_addr.s_addr;
-				rtt_info rtt    = rtts[msg.sock_id];
-				// Only increases rtt once per loop(in case a big number of packets are sent at once)
-				if (!rtt_increased.count(msg.sock_id))
-				{
-					rtt.num_retries += 1;
-					// Increases current rtt by 10%
-					rtt.rtt_time += (rtt.rtt_time / 10);
-					rtts[addr] = rtt;
-
-					rtt_increased.emplace(msg.sock_id);
-				}
-
-				if (rtt.num_retries >= 10)
-				{
-					// Too many retries, need to notify the socket that the connection is dead
-					idm::check<lv2_socket>(msg.sock_id, [&](lv2_socket& sock)
-						{
-							sys_net.error("[P2PS] Too many retries, closing the stream");
-							ensure(sock.get_type() == SYS_NET_SOCK_STREAM_P2P);
-							auto& sock_p2ps = reinterpret_cast<lv2_socket_p2ps&>(sock);
-							sock_p2ps.close_stream();
-						});
-					it = msgs.erase(it);
-					continue;
-				}
-
-				// resend the message
-				const auto res = idm::check<lv2_socket>(msg.sock_id, [&](lv2_socket& sock) -> bool
-					{
-						ensure(sock.get_type() == SYS_NET_SOCK_STREAM_P2P);
-						auto& sock_p2ps = reinterpret_cast<lv2_socket_p2ps&>(sock);
-
-						while (np::sendto_possibly_ipv6(sock_p2ps.get_socket(), reinterpret_cast<const char*>(msg.data.data()), ::size32(msg.data), &msg.dst_addr, 0) == -1)
-						{
-							const sys_net_error err = get_last_error(false);
-							// concurrency on the socket(from a sendto for example) can result in EAGAIN error in which case we try again
-							if (err == SYS_NET_EAGAIN)
-							{
-								continue;
-							}
-
-							sys_net.error("[P2PS] Resending the packet failed(%s), closing the stream", err);
-							sock_p2ps.close_stream();
-							return false;
-						}
-						return true;
-					});
-
-				if (!res || !res.ret)
-				{
-					it = msgs.erase(it);
-					continue;
-				}
-
-				// Update key timeout
-				msgs.insert(std::make_pair(now + rtt.rtt_time, std::move(msg)));
-				it = msgs.erase(it);
-			}
-
-			if (!msgs.empty())
-			{
-				const auto current_timepoint = steady_clock::now();
-				const auto expected_timepoint = msgs.begin()->first;
-				if (current_timepoint > expected_timepoint)
-				{
-					wakey = 1;
-				}
-				else
-				{
-					timeout = static_cast<atomic_wait_timeout>(std::chrono::duration_cast<std::chrono::nanoseconds>(expected_timepoint - current_timepoint).count());
-				}
-			}
-			else
-			{
-				timeout = atomic_wait_timeout::inf;
-			}
-		}
-	}
-
-	tcp_timeout_monitor& operator=(thread_state)
-	{
-		wakey.release(1);
-		wakey.notify_one();
-		return *this;
-	}
-
-public:
-	static constexpr auto thread_name = "Tcp Over Udp Timeout Manager Thread"sv;
-
-private:
-	atomic_t<u32> wakey = 0;
-	shared_mutex data_mutex;
-	// List of outgoing messages
-	struct message
-	{
-		s32 sock_id = 0;
-		::sockaddr_in dst_addr{};
-		std::vector<u8> data;
-		u64 seq = 0;
-		steady_clock::time_point initial_sendtime{};
-	};
-	std::map<steady_clock::time_point, message> msgs; // (wakeup time, msg)
-	// List of rtts
-	struct rtt_info
-	{
-		unsigned long num_retries          = 0;
-		std::chrono::milliseconds rtt_time = 50ms;
-	};
-	std::unordered_map<s32, rtt_info> rtts; // (sock_id, rtt)
-};
-
-u16 u2s_tcp_checksum(const le_t<u16>* buffer, usz size)
-{
-	u32 cksum = 0;
-	while (size > 1)
-	{
-		cksum += *buffer++;
-		size -= sizeof(u16);
-	}
-	if (size)
-		cksum += *reinterpret_cast<const u8*>(buffer);
-
-	cksum = (cksum >> 16) + (cksum & 0xffff);
-	cksum += (cksum >> 16);
-	return static_cast<u16>(~cksum);
-}
-
-std::vector<u8> generate_u2s_packet(const p2ps_encapsulated_tcp& header, const u8* data, const u32 datasize)
-{
-	const u32 packet_size = (VPORT_P2P_HEADER_SIZE + sizeof(p2ps_encapsulated_tcp) + datasize);
-	ensure(packet_size < 65535); // packet size shouldn't be bigger than possible UDP payload
-	std::vector<u8> packet(packet_size);
-	u8* packet_data        = packet.data();
-	le_t<u16> dst_port_le  = +header.dst_port;
-	le_t<u16> src_port_le  = +header.src_port;
-	le_t<u16> p2p_flags_le = P2P_FLAG_P2PS;
-
-	memcpy(packet_data, &dst_port_le, sizeof(u16));
-	memcpy(packet_data + sizeof(u16), &src_port_le, sizeof(u16));
-	memcpy(packet_data + sizeof(u16) + sizeof(u16), &p2p_flags_le, sizeof(u16));
-	memcpy(packet_data + VPORT_P2P_HEADER_SIZE, &header, sizeof(p2ps_encapsulated_tcp));
-	if (datasize)
-		memcpy(packet_data + VPORT_P2P_HEADER_SIZE + sizeof(p2ps_encapsulated_tcp), data, datasize);
-
-	auto* hdr_ptr     = reinterpret_cast<p2ps_encapsulated_tcp*>(packet_data + VPORT_P2P_HEADER_SIZE);
-	hdr_ptr->checksum = 0;
-	hdr_ptr->checksum = u2s_tcp_checksum(utils::bless<le_t<u16>>(hdr_ptr), sizeof(p2ps_encapsulated_tcp) + datasize);
-
-	return packet;
-}
-
-lv2_socket_p2ps::lv2_socket_p2ps(lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol)
-	: lv2_socket_p2p(family, type, protocol)
-{
-	sockopt_cache cache_type;
-	cache_type.data._int = SYS_NET_SOCK_STREAM_P2P;
-	cache_type.len = 4;
-
-	sockopts[(static_cast<u64>(SYS_NET_SOL_SOCKET) << 32ull) | SYS_NET_SO_TYPE] = cache_type;
-}
-
-lv2_socket_p2ps::lv2_socket_p2ps(socket_type native_socket, u16 port, u16 vport, u32 op_addr, u16 op_port, u16 op_vport, u64 cur_seq, u64 data_beg_seq, s32 so_nbio)
-	: lv2_socket_p2p(SYS_NET_AF_INET, SYS_NET_SOCK_STREAM_P2P, SYS_NET_IPPROTO_IP)
-{
-	this->native_socket = native_socket;
-	this->port         = port;
-	this->vport        = vport;
-	this->op_addr      = op_addr;
-	this->op_port      = op_port;
-	this->op_vport     = op_vport;
-	this->cur_seq      = cur_seq;
-	this->data_beg_seq = data_beg_seq;
-	this->so_nbio      = so_nbio;
-	status             = p2ps_stream_status::stream_connected;
-}
-
-lv2_socket_p2ps::lv2_socket_p2ps(utils::serial& ar, lv2_socket_type type)
-	: lv2_socket_p2p(ar, type)
-{
-	ar(status, max_backlog, backlog, op_port, op_vport, op_addr, data_beg_seq, received_data, cur_seq);
-}
-
-void lv2_socket_p2ps::save(utils::serial& ar)
-{
-	static_cast<lv2_socket_p2p*>(this)->save(ar);
-	ar(status, max_backlog, backlog, op_port, op_vport, op_addr, data_beg_seq, received_data, cur_seq);
-}
-
-bool lv2_socket_p2ps::handle_connected(p2ps_encapsulated_tcp* tcp_header, u8* data, ::sockaddr_storage* op_addr, nt_p2p_port* p2p_port)
-{
-	std::lock_guard lock(mutex);
-
-	if (status != p2ps_stream_status::stream_connected && status != p2ps_stream_status::stream_handshaking)
-	{
-		sys_net.error("[P2PS] lv2_socket_p2ps::handle_connected() called on a non connected/handshaking socket(%d)!", static_cast<u8>(status));
-		return false;
-	}
-
-	if (tcp_header->flags & static_cast<u8>(p2ps_tcp_flags::ACK))
-	{
-		auto& tcpm = g_fxo->get<named_thread<tcp_timeout_monitor>>();
-		tcpm.confirm_data_received(lv2_id, tcp_header->ack);
-	}
-
-	auto send_ack = [&]()
-	{
-		auto final_ack = data_beg_seq;
-		while (received_data.contains(final_ack))
-		{
-			final_ack += ::at32(received_data, final_ack).size();
-		}
-		data_available = final_ack - data_beg_seq;
-
-		p2ps_encapsulated_tcp send_hdr;
-		send_hdr.src_port = tcp_header->dst_port;
-		send_hdr.dst_port = tcp_header->src_port;
-		send_hdr.flags    = p2ps_tcp_flags::ACK;
-		send_hdr.ack      = final_ack;
-		auto packet       = generate_u2s_packet(send_hdr, nullptr, 0);
-		sys_net.trace("[P2PS] Sent ack %d", final_ack);
-		send_u2s_packet(std::move(packet), reinterpret_cast<::sockaddr_in*>(op_addr), 0, false);
-
-		// check if polling is happening
-		if (data_available && events.test_and_reset(lv2_socket::poll_t::read))
-		{
-			bs_t<lv2_socket::poll_t> read_event = lv2_socket::poll_t::read;
-			for (auto it = queue.begin(); it != queue.end();)
-			{
-				if (it->second(read_event))
-				{
-					it = queue.erase(it);
-					continue;
-				}
-				it++;
-			}
-
-			if (queue.empty())
-			{
-				events.store({});
-			}
-		}
-	};
-
-	if (status == p2ps_stream_status::stream_handshaking)
-	{
-		// Only expect SYN|ACK
-		if (tcp_header->flags == (p2ps_tcp_flags::SYN | p2ps_tcp_flags::ACK))
-		{
-			sys_net.trace("[P2PS] Received SYN|ACK, status is now connected");
-			data_beg_seq = tcp_header->seq + 1;
-			status       = p2ps_stream_status::stream_connected;
-			send_ack();
-		}
-		else
-		{
-			sys_net.error("[P2PS] Unexpected U2S TCP flag received with handshaking state: 0x%02X", tcp_header->flags);
-		}
-
-		return true;
-	}
-	else if (status == p2ps_stream_status::stream_connected)
-	{
-		switch (tcp_header->flags)
-		{
-		case 0:
-		case p2ps_tcp_flags::PSH:
-		case p2ps_tcp_flags::ACK:
-		case p2ps_tcp_flags::SYN:
-		case p2ps_tcp_flags::SYN | p2ps_tcp_flags::ACK:
-		{
-			if (tcp_header->seq < data_beg_seq)
-			{
-				// Data has already been processed
-				sys_net.trace("[P2PS] Data has already been processed");
-				if (tcp_header->flags != p2ps_tcp_flags::ACK)
-					send_ack();
-				return true;
-			}
-
-			if (!received_data.count(tcp_header->seq))
-			{
-				// New data
-				received_data.emplace(tcp_header->seq, std::vector<u8>(data, data + tcp_header->length));
-			}
-			else
-			{
-				sys_net.trace("[P2PS] Data was not new!");
-			}
-
-			send_ack();
-			return true;
-		}
-		case p2ps_tcp_flags::RST:
-		case p2ps_tcp_flags::FIN:
-		{
-			sys_net.error("[P2PS] Received RST/FIN packet(%d), closing the stream", tcp_header->flags);
-			close_stream_nl(p2p_port);
-			return false;
-		}
-		default:
-		{
-			sys_net.error("[P2PS] Unexpected U2S TCP flag received with connected state: 0x%02X", tcp_header->flags);
-			return true;
-		}
-		}
-	}
-
-	return true;
-}
-
-bool lv2_socket_p2ps::handle_listening(p2ps_encapsulated_tcp* tcp_header, [[maybe_unused]] u8* data, ::sockaddr_storage* op_addr)
-{
-	std::lock_guard lock(mutex);
-
-	if (status != p2ps_stream_status::stream_listening)
-	{
-		sys_net.error("[P2PS] lv2_socket_p2ps::handle_listening() called on a non listening socket(%d)!", static_cast<u8>(status));
-		return false;
-	}
-
-	// Only valid packet
-	if (tcp_header->flags == static_cast<u8>(p2ps_tcp_flags::SYN))
-	{
-		if (backlog.size() >= max_backlog)
-		{
-			// Send a RST packet on backlog full
-			sys_net.trace("[P2PS] Backlog was full, sent a RST packet");
-			p2ps_encapsulated_tcp send_hdr;
-			send_hdr.src_port = tcp_header->dst_port;
-			send_hdr.dst_port = tcp_header->src_port;
-			send_hdr.flags    = p2ps_tcp_flags::RST;
-			auto packet       = generate_u2s_packet(send_hdr, nullptr, 0);
-			send_u2s_packet(std::move(packet), reinterpret_cast<::sockaddr_in*>(op_addr), 0, false);
-			return true;
-		}
-
-		// Yes, new connection and a backlog is available, create a new lv2_socket for it and send SYN|ACK
-		// Prepare reply packet
-		sys_net.notice("[P2PS] Received connection on listening STREAM-P2P socket!");
-		p2ps_encapsulated_tcp send_hdr;
-		send_hdr.src_port = tcp_header->dst_port;
-		send_hdr.dst_port = tcp_header->src_port;
-		send_hdr.flags    = p2ps_tcp_flags::SYN | p2ps_tcp_flags::ACK;
-		send_hdr.ack      = tcp_header->seq + 1;
-		// Generates random starting SEQ
-		send_hdr.seq = rand();
-
-		// Create new socket
-		const u32 new_op_addr      = reinterpret_cast<struct sockaddr_in*>(op_addr)->sin_addr.s_addr;
-		const u16 new_op_port      = std::bit_cast<u16, be_t<u16>>((reinterpret_cast<struct sockaddr_in*>(op_addr)->sin_port));
-		const u16 new_op_vport     = tcp_header->src_port;
-		const u64 new_cur_seq      = send_hdr.seq + 1;
-		const u64 new_data_beg_seq = send_hdr.ack;
-		auto sock_lv2 = make_shared<lv2_socket_p2ps>(native_socket, port, vport, new_op_addr, new_op_port, new_op_vport, new_cur_seq, new_data_beg_seq, so_nbio);
-		const s32 new_sock_id      = idm::import_existing<lv2_socket>(sock_lv2);
-		sock_lv2->set_lv2_id(new_sock_id);
-		const u64 key_connected = (reinterpret_cast<struct sockaddr_in*>(op_addr)->sin_addr.s_addr) | (static_cast<u64>(tcp_header->src_port) << 48) | (static_cast<u64>(tcp_header->dst_port) << 32);
-
-		{
-			auto& nc = g_fxo->get<p2p_context>();
-			auto& pport = ::at32(nc.list_p2p_ports, port);
-			pport.bound_p2p_streams.emplace(key_connected, new_sock_id);
-		}
-
-		auto packet = generate_u2s_packet(send_hdr, nullptr, 0);
-		{
-			std::lock_guard lock(sock_lv2->mutex);
-			sock_lv2->send_u2s_packet(std::move(packet), reinterpret_cast<::sockaddr_in*>(op_addr), send_hdr.seq, true);
-		}
-
-		backlog.push_back(new_sock_id);
-		if (events.test_and_reset(lv2_socket::poll_t::read))
-		{
-			bs_t<lv2_socket::poll_t> read_event = lv2_socket::poll_t::read;
-			for (auto it = queue.begin(); it != queue.end();)
-			{
-				if (it->second(read_event))
-				{
-					it = queue.erase(it);
-					continue;
-				}
-				it++;
-			}
-
-			if (queue.empty())
-			{
-				events.store({});
-			}
-		}
-	}
-	else
-	{
-		sys_net.error("[P2PS] Unexpected U2S TCP flag received on listening socket: 0x%02X", tcp_header->flags);
-	}
-
-	// Ignore other packets?
-
-	return true;
-}
-
-void lv2_socket_p2ps::send_u2s_packet(std::vector<u8> data, const ::sockaddr_in* dst, u64 seq, bool require_ack)
-{
-	char ip_str[16];
-	inet_ntop(AF_INET, &dst->sin_addr, ip_str, sizeof(ip_str));
-	sys_net.trace("[P2PS] Sending U2S packet on socket %d(id:%d): data(%d, seq %d, require_ack %d) to %s:%d", native_socket, lv2_id, data.size(), seq, require_ack, ip_str, std::bit_cast<u16, be_t<u16>>(dst->sin_port));
-
-	while (np::sendto_possibly_ipv6(native_socket, reinterpret_cast<char*>(data.data()), ::size32(data), dst, 0) == -1)
-	{
-		const sys_net_error err = get_last_error(false);
-		// concurrency on the socket can result in EAGAIN error in which case we try again
-		if (err == SYS_NET_EAGAIN)
-		{
-			continue;
-		}
-
-		sys_net.error("[P2PS] Attempting to send a u2s packet failed(%s)!", err);
-		return;
-	}
-
-	// Adds to tcp timeout monitor to resend the message until an ack is received
-	if (require_ack)
-	{
-		auto& tcpm = g_fxo->get<named_thread<tcp_timeout_monitor>>();
-		tcpm.add_message(lv2_id, dst, std::move(data), seq);
-	}
-}
-
-void lv2_socket_p2ps::close_stream_nl(nt_p2p_port* p2p_port)
-{
-	status = p2ps_stream_status::stream_closed;
-
-	for (auto it = p2p_port->bound_p2p_streams.begin(); it != p2p_port->bound_p2p_streams.end();)
-	{
-		if (it->second == lv2_id)
-		{
-			it = p2p_port->bound_p2p_streams.erase(it);
-			continue;
-		}
-		it++;
-	}
-
-	auto& tcpm = g_fxo->get<named_thread<tcp_timeout_monitor>>();
-	tcpm.clear_all_messages(lv2_id);
-}
-
-void lv2_socket_p2ps::close_stream()
-{
-	auto& nc = g_fxo->get<p2p_context>();
-
-	std::lock_guard lock(nc.list_p2p_ports_mutex);
-	auto& p2p_port = ::at32(nc.list_p2p_ports, port);
-
-	std::scoped_lock more_lock(p2p_port.bound_p2p_vports_mutex, mutex);
-	close_stream_nl(&p2p_port);
-}
-
-p2ps_stream_status lv2_socket_p2ps::get_status() const
-{
-	return status;
-}
-
-void lv2_socket_p2ps::set_status(p2ps_stream_status new_status)
-{
-	status = new_status;
-}
-
-std::pair<s32, sys_net_sockaddr> lv2_socket_p2ps::getpeername()
-{
-	std::lock_guard lock(mutex);
-
-	if (!op_addr || !op_port || !op_vport)
-	{
-		return {-SYS_NET_ENOTCONN, {}};
-	}
-
-	sys_net_sockaddr res{};
-	sys_net_sockaddr_in_p2p* p2p_addr = reinterpret_cast<sys_net_sockaddr_in_p2p*>(&res);
-
-	p2p_addr->sin_len = sizeof(sys_net_sockaddr_in_p2p);
-	p2p_addr->sin_family = SYS_NET_AF_INET;
-	p2p_addr->sin_addr = std::bit_cast<be_t<u32>, u32>(op_addr);
-	p2p_addr->sin_port = op_vport;
-	p2p_addr->sin_vport = op_port;
-
-	return {CELL_OK, res};
-}
-
-std::tuple<bool, s32, shared_ptr<lv2_socket>, sys_net_sockaddr> lv2_socket_p2ps::accept(bool is_lock)
-{
-	std::unique_lock<shared_mutex> lock(mutex, std::defer_lock);
-
-	if (is_lock)
-	{
-		lock.lock();
-	}
-
-	if (backlog.size() == 0)
-	{
-		if (so_nbio)
-		{
-			return {true, -SYS_NET_EWOULDBLOCK, {}, {}};
-		}
-
-		return {false, {}, {}, {}};
-	}
-
-	auto p2ps_client = backlog.front();
-	backlog.pop_front();
-
-	sys_net_sockaddr ps3_addr{};
-	auto* paddr = reinterpret_cast<sys_net_sockaddr_in_p2p*>(&ps3_addr);
-
-	lv2_socket_p2ps* sock_client = reinterpret_cast<lv2_socket_p2ps*>(idm::check_unlocked<lv2_socket>(p2ps_client));
-	{
-		std::lock_guard lock(sock_client->mutex);
-		paddr->sin_family = SYS_NET_AF_INET;
-		paddr->sin_addr   = std::bit_cast<be_t<u32>, u32>(sock_client->op_addr);
-		paddr->sin_port   = sock_client->op_vport;
-		paddr->sin_vport  = sock_client->op_port;
-		paddr->sin_len    = sizeof(sys_net_sockaddr_in_p2p);
-	}
-
-	return {true, p2ps_client, {}, ps3_addr};
-}
-
-s32 lv2_socket_p2ps::bind(const sys_net_sockaddr& addr)
-{
-	const auto* psa_in_p2p = reinterpret_cast<const sys_net_sockaddr_in_p2p*>(&addr);
-
-	// For SYS_NET_SOCK_STREAM_P2P sockets, the port is the "fake" tcp port and the vport is the udp port it's bound to
-	u16 p2p_port  = psa_in_p2p->sin_vport;
-	u16 p2p_vport = psa_in_p2p->sin_port;
-
-	sys_net.notice("[P2PS] Trying to bind %s:%d:%d", np::ip_to_string(std::bit_cast<u32>(psa_in_p2p->sin_addr)), p2p_port, p2p_vport);
-
-	if (p2p_port == 0)
-	{
-		p2p_port = SCE_NP_PORT;
-	}
-
-	if (p2p_port != SCE_NP_PORT)
-	{
-		sys_net.warning("[P2PS] Attempting to bind a socket to a port != %d", +SCE_NP_PORT);
-	}
-
-	socket_type real_socket{};
-
-	auto& nc = g_fxo->get<p2p_context>();
-	{
-		std::lock_guard list_lock(nc.list_p2p_ports_mutex);
-
-		nc.create_p2p_port(p2p_port);
-		auto& pport = ::at32(nc.list_p2p_ports, p2p_port);
-		real_socket = pport.p2p_socket;
-
-		{
-			// Ensures the socket & the bound list are updated at the same time to avoid races
-			std::lock_guard vport_lock(pport.bound_p2p_vports_mutex);
-			std::lock_guard sock_lock(mutex);
-
-			if (p2p_vport == 0)
-			{
-				sys_net.warning("[P2PS] vport was unassigned in bind!");
-				p2p_vport = pport.get_port();
-
-				while (pport.bound_p2ps_vports.contains(p2p_vport))
-				{
-					p2p_vport = pport.get_port();
-				}
-
-				std::set<s32> bound_ports{lv2_id};
-				pport.bound_p2ps_vports.insert(std::make_pair(p2p_vport, std::move(bound_ports)));
-			}
-			else
-			{
-				if (pport.bound_p2ps_vports.contains(p2p_vport))
-				{
-					auto& bound_sockets = ::at32(pport.bound_p2ps_vports, p2p_vport);
-					if (!sys_net_helpers::all_reusable(bound_sockets))
-					{
-						return -SYS_NET_EADDRINUSE;
-					}
-
-					bound_sockets.insert(lv2_id);
-				}
-				else
-				{
-					std::set<s32> bound_ports{lv2_id};
-					pport.bound_p2ps_vports.insert(std::make_pair(p2p_vport, std::move(bound_ports)));
-				}
-			}
-
-			port       = p2p_port;
-			vport      = p2p_vport;
-			native_socket = real_socket;
-			bound_addr = psa_in_p2p->sin_addr;
-		}
-	}
-
-	return CELL_OK;
-}
-
-std::pair<s32, sys_net_sockaddr> lv2_socket_p2ps::getsockname()
-{
-	std::lock_guard lock(mutex);
-
-	// Unbound socket
-	if (!native_socket)
-	{
-		return {CELL_OK, {}};
-	}
-
-	sys_net_sockaddr sn_addr{};
-	sys_net_sockaddr_in_p2p* paddr = reinterpret_cast<sys_net_sockaddr_in_p2p*>(&sn_addr);
-
-	paddr->sin_len    = sizeof(sys_net_sockaddr_in);
-	paddr->sin_family = SYS_NET_AF_INET;
-	paddr->sin_port   = vport;
-	paddr->sin_vport  = port;
-	paddr->sin_addr   = bound_addr;
-
-	return {CELL_OK, sn_addr};
-}
-
-std::optional<s32> lv2_socket_p2ps::connect(const sys_net_sockaddr& addr)
-{
-	std::lock_guard lock(mutex);
-
-	if (status != p2ps_stream_status::stream_closed)
-	{
-		sys_net.error("[P2PS] Called connect on a socket that is not closed!");
-		return -SYS_NET_EALREADY;
-	}
-
-	p2ps_encapsulated_tcp send_hdr;
-	const auto psa_in_p2p = reinterpret_cast<const sys_net_sockaddr_in_p2p*>(&addr);
-	auto name             = sys_net_addr_to_native_addr(addr);
-
-	// This is purposefully inverted, not a bug
-	const u16 dst_vport = psa_in_p2p->sin_port;
-	const u16 dst_port  = psa_in_p2p->sin_vport;
-
-	socket_type real_socket{};
-
-	auto& nc = g_fxo->get<p2p_context>();
-	{
-		std::lock_guard list_lock(nc.list_p2p_ports_mutex);
-
-		nc.create_p2p_port(port);
-		auto& pport = ::at32(nc.list_p2p_ports, port);
-		real_socket = pport.p2p_socket;
-
-		{
-			std::lock_guard lock(pport.bound_p2p_vports_mutex);
-			if (vport == 0)
-			{
-				// Unassigned vport, assigns one
-				sys_net.warning("[P2PS] vport was unassigned before connect!");
-				vport = pport.get_port();
-
-				while (pport.bound_p2p_vports.count(vport) || pport.bound_p2p_streams.count(static_cast<u64>(vport) << 32))
-				{
-					vport = pport.get_port();
-				}
-			}
-			const u64 key = name.sin_addr.s_addr | (static_cast<u64>(vport) << 32) | (static_cast<u64>(dst_vport) << 48);
-			pport.bound_p2p_streams.emplace(key, lv2_id);
-		}
-	}
-
-	native_socket = real_socket;
-
-	send_hdr.src_port = vport;
-	send_hdr.dst_port = dst_vport;
-	send_hdr.flags    = p2ps_tcp_flags::SYN;
-	send_hdr.seq      = rand();
-
-	op_addr        = name.sin_addr.s_addr;
-	op_port        = dst_port;
-	op_vport       = dst_vport;
-	cur_seq        = send_hdr.seq + 1;
-	data_beg_seq   = 0;
-	data_available = 0u;
-	received_data.clear();
-	status = p2ps_stream_status::stream_handshaking;
-
-	std::vector<u8> packet = generate_u2s_packet(send_hdr, nullptr, 0);
-	name.sin_port          = std::bit_cast<u16, be_t<u16>>(dst_port); // not a bug
-	send_u2s_packet(std::move(packet), reinterpret_cast<::sockaddr_in*>(&name), send_hdr.seq, true);
-
-	return CELL_OK;
-}
-
-s32 lv2_socket_p2ps::listen(s32 backlog)
-{
-	std::lock_guard lock(mutex);
-
-	status      = p2ps_stream_status::stream_listening;
-	max_backlog = backlog;
-
-	return CELL_OK;
-}
-
-std::optional<std::tuple<s32, std::vector<u8>, sys_net_sockaddr>> lv2_socket_p2ps::recvfrom([[maybe_unused]] s32 flags, u32 len, bool is_lock)
-{
-	std::unique_lock<shared_mutex> lock(mutex, std::defer_lock);
-
-	if (is_lock)
-	{
-		lock.lock();
-	}
-
-	if (!data_available)
-	{
-		if (status == p2ps_stream_status::stream_closed)
-		{
-			sys_net.error("[P2PS] Called recvfrom on closed socket!");
-			return {{0, {}, {}}};
-		}
-
-		if (so_nbio || (flags & SYS_NET_MSG_DONTWAIT))
-		{
-			return {{-SYS_NET_EWOULDBLOCK, {}, {}}};
-		}
-
-		return std::nullopt;
-	}
-
-	const u32 to_give = static_cast<u32>(std::min<u64>(data_available, len));
-	sys_net_sockaddr addr{};
-	std::vector<u8> dest_buf(to_give);
-
-	sys_net.trace("[P2PS] STREAM-P2P socket had %u available, given %u", data_available, to_give);
-
-	u32 left_to_give = to_give;
-	while (left_to_give)
-	{
-		auto& cur_data               = received_data.begin()->second;
-		auto to_give_for_this_packet = std::min(static_cast<u32>(cur_data.size()), left_to_give);
-		memcpy(dest_buf.data() + (to_give - left_to_give), cur_data.data(), to_give_for_this_packet);
-		if (cur_data.size() != to_give_for_this_packet)
-		{
-			auto amount_left = cur_data.size() - to_give_for_this_packet;
-			std::vector<u8> new_vec(amount_left);
-			memcpy(new_vec.data(), cur_data.data() + to_give_for_this_packet, amount_left);
-			auto new_key = (received_data.begin()->first) + to_give_for_this_packet;
-			received_data.emplace(new_key, std::move(new_vec));
-		}
-
-		received_data.erase(received_data.begin());
-
-		left_to_give -= to_give_for_this_packet;
-	}
-
-	data_available -= to_give;
-	data_beg_seq += to_give;
-
-	sys_net_sockaddr_in_p2p* addr_p2p = reinterpret_cast<sys_net_sockaddr_in_p2p*>(&addr);
-	addr_p2p->sin_family              = AF_INET;
-	addr_p2p->sin_addr                = std::bit_cast<be_t<u32>, u32>(op_addr);
-	addr_p2p->sin_port                = op_vport;
-	addr_p2p->sin_vport               = op_port;
-	addr_p2p->sin_len                 = sizeof(sys_net_sockaddr_in_p2p);
-
-	return {{to_give, dest_buf, addr}};
-}
-
-std::optional<s32> lv2_socket_p2ps::sendto([[maybe_unused]] s32 flags, const std::vector<u8>& buf, std::optional<sys_net_sockaddr> opt_sn_addr, bool is_lock)
-{
-	std::unique_lock<shared_mutex> lock(mutex, std::defer_lock);
-
-	if (is_lock)
-	{
-		lock.lock();
-	}
-
-	if (status == p2ps_stream_status::stream_closed)
-	{
-		sys_net.error("[P2PS] Called sendto on a closed socket!");
-		return -SYS_NET_ECONNRESET;
-	}
-
-	constexpr u32 max_data_len = (65535 - (VPORT_P2P_HEADER_SIZE + sizeof(p2ps_encapsulated_tcp)));
-
-	::sockaddr_in name{};
-	if (opt_sn_addr)
-	{
-		name = sys_net_addr_to_native_addr(*opt_sn_addr);
-	}
-
-	// Prepare address
-	name.sin_family      = AF_INET;
-	name.sin_port        = std::bit_cast<u16, be_t<u16>>(op_port);
-	name.sin_addr.s_addr = op_addr;
-	// Prepares encapsulated tcp
-	p2ps_encapsulated_tcp tcp_header;
-	tcp_header.src_port = vport;
-	tcp_header.dst_port = op_vport;
-	// chop it up
-	std::vector<std::vector<u8>> stream_packets;
-	u32 cur_total_len = ::size32(buf);
-	while (cur_total_len > 0)
-	{
-		u32 cur_data_len = std::min(cur_total_len, max_data_len);
-
-		tcp_header.length = cur_data_len;
-		tcp_header.seq    = cur_seq;
-
-		auto packet = generate_u2s_packet(tcp_header, &buf[buf.size() - cur_total_len], cur_data_len);
-		send_u2s_packet(std::move(packet), &name, tcp_header.seq, true);
-
-		cur_total_len -= cur_data_len;
-		cur_seq += cur_data_len;
-	}
-
-	return {::size32(buf)};
-}
-
-std::optional<s32> lv2_socket_p2ps::sendmsg([[maybe_unused]] s32 flags, [[maybe_unused]] const sys_net_msghdr& msg, [[maybe_unused]] bool is_lock)
-{
-	sys_net.todo("lv2_socket_p2ps::sendmsg");
-	return {};
-}
-
-void lv2_socket_p2ps::close()
-{
-	if (!port || !vport)
-	{
-		return;
-	}
-
-	if (g_fxo->is_init<p2p_context>())
-	{
-		auto& nc = g_fxo->get<p2p_context>();
-		std::lock_guard lock(nc.list_p2p_ports_mutex);
-		auto& p2p_port = ::at32(nc.list_p2p_ports, port);
-		{
-			std::lock_guard lock(p2p_port.bound_p2p_vports_mutex);
-			for (auto it = p2p_port.bound_p2p_streams.begin(); it != p2p_port.bound_p2p_streams.end();)
-			{
-				if (it->second == lv2_id)
-				{
-					it = p2p_port.bound_p2p_streams.erase(it);
-					continue;
-				}
-				it++;
-			}
-
-			if (p2p_port.bound_p2ps_vports.contains(vport))
-			{
-				auto& bound_ports = ::at32(p2p_port.bound_p2ps_vports, vport);
-				bound_ports.erase(lv2_id);
-
-				if (bound_ports.empty())
-				{
-					p2p_port.bound_p2ps_vports.erase(vport);
-				}
-			}
-		}
-	}
-
-	if (const auto tcpm = g_fxo->try_get<named_thread<tcp_timeout_monitor>>())
-	{
-		tcpm->clear_all_messages(lv2_id);
-	}
-}
-
-s32 lv2_socket_p2ps::shutdown([[maybe_unused]] s32 how)
-{
-	sys_net.todo("[P2PS] shutdown");
-	return CELL_OK;
-}
-
-s32 lv2_socket_p2ps::poll(sys_net_pollfd& sn_pfd, [[maybe_unused]] pollfd& native_pfd)
-{
-	std::lock_guard lock(mutex);
-	sys_net.trace("[P2PS] poll checking for 0x%X", sn_pfd.events);
-	if (status == p2ps_stream_status::stream_connected)
-	{
-		if ((sn_pfd.events & SYS_NET_POLLIN) && data_available)
-		{
-			sys_net.trace("[P2PS] p2ps has %u bytes available", data_available);
-			sn_pfd.revents |= SYS_NET_POLLIN;
-		}
-
-		// Data can only be written if the socket is connected
-		if (sn_pfd.events & SYS_NET_POLLOUT && status == p2ps_stream_status::stream_connected)
-		{
-			sn_pfd.revents |= SYS_NET_POLLOUT;
-		}
-
-		if (sn_pfd.revents)
-		{
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-std::tuple<bool, bool, bool> lv2_socket_p2ps::select(bs_t<lv2_socket::poll_t> selected, [[maybe_unused]] pollfd& native_pfd)
-{
-	std::lock_guard lock(mutex);
-
-	bool read_set  = false;
-	bool write_set = false;
-
-	if (status == p2ps_stream_status::stream_connected)
-	{
-		if ((selected & lv2_socket::poll_t::read) && data_available)
-		{
-			sys_net.trace("[P2PS] socket has %d bytes available", data_available);
-			read_set = true;
-		}
-
-		if (selected & lv2_socket::poll_t::write)
-		{
-			sys_net.trace("[P2PS] socket is writeable");
-			write_set = true;
-		}
-	}
-	else if (status == p2ps_stream_status::stream_listening)
-	{
-		const auto bsize = backlog.size();
-		if ((selected & lv2_socket::poll_t::read) && bsize)
-		{
-			sys_net.trace("[P2PS] socket has %d clients available", bsize);
-			read_set = true;
-		}
-	}
-
-	return {read_set, write_set, false};
-}
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.h b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.h
deleted file mode 100644
index 8158138936..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#pragma once
-
-#ifdef _WIN32
-#include <winsock2.h>
-#include <WS2tcpip.h>
-#else
-#ifdef __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include <netinet/in.h>
-#ifdef __clang__
-#pragma GCC diagnostic pop
-#endif
-#endif
-
-#include "lv2_socket_p2p.h"
-
-struct nt_p2p_port;
-
-constexpr be_t<u32> P2PS_U2S_SIG = (static_cast<u32>('U') << 24 | static_cast<u32>('2') << 16 | static_cast<u32>('S') << 8 | static_cast<u32>('0'));
-
-struct p2ps_encapsulated_tcp
-{
-	be_t<u32> signature = P2PS_U2S_SIG; // Signature to verify it's P2P Stream data
-	be_t<u32> length    = 0;            // Length of data
-	be_t<u64> seq       = 0;            // This should be u32 but changed to u64 for simplicity
-	be_t<u64> ack       = 0;
-	be_t<u16> src_port  = 0; // fake source tcp port
-	be_t<u16> dst_port  = 0; // fake dest tcp port(should be == vport)
-	be_t<u16> checksum  = 0;
-	u8 flags            = 0;
-};
-
-enum p2ps_stream_status
-{
-	stream_closed,      // Default when port is not listening nor connected
-	stream_listening,   // Stream is listening, accepting SYN packets
-	stream_handshaking, // Currently handshaking
-	stream_connected,   // This is an established connection(after tcp handshake)
-};
-
-enum p2ps_tcp_flags : u8
-{
-	FIN = (1 << 0),
-	SYN = (1 << 1),
-	RST = (1 << 2),
-	PSH = (1 << 3),
-	ACK = (1 << 4),
-	URG = (1 << 5),
-	ECE = (1 << 6),
-	CWR = (1 << 7),
-};
-
-u16 u2s_tcp_checksum(const le_t<u16>* buffer, usz size);
-std::vector<u8> generate_u2s_packet(const p2ps_encapsulated_tcp& header, const u8* data, const u32 datasize);
-
-class lv2_socket_p2ps final : public lv2_socket_p2p
-{
-public:
-	static constexpr u32 id_type = 2;
-
-	lv2_socket_p2ps(lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol);
-	lv2_socket_p2ps(socket_type socket, u16 port, u16 vport, u32 op_addr, u16 op_port, u16 op_vport, u64 cur_seq, u64 data_beg_seq, s32 so_nbio);
-	lv2_socket_p2ps(utils::serial& ar, lv2_socket_type type);
-	void save(utils::serial& ar);
-
-	p2ps_stream_status get_status() const;
-	void set_status(p2ps_stream_status new_status);
-	bool handle_connected(p2ps_encapsulated_tcp* tcp_header, u8* data, ::sockaddr_storage* op_addr, nt_p2p_port* p2p_port);
-	bool handle_listening(p2ps_encapsulated_tcp* tcp_header, u8* data, ::sockaddr_storage* op_addr);
-	void send_u2s_packet(std::vector<u8> data, const ::sockaddr_in* dst, u64 seq, bool require_ack);
-	void close_stream();
-
-	std::tuple<bool, s32, shared_ptr<lv2_socket>, sys_net_sockaddr> accept(bool is_lock = true) override;
-	s32 bind(const sys_net_sockaddr& addr) override;
-
-	std::optional<s32> connect(const sys_net_sockaddr& addr) override;
-
-	std::pair<s32, sys_net_sockaddr> getpeername() override;
-	std::pair<s32, sys_net_sockaddr> getsockname() override;
-
-	s32 listen(s32 backlog) override;
-
-	std::optional<std::tuple<s32, std::vector<u8>, sys_net_sockaddr>> recvfrom(s32 flags, u32 len, bool is_lock = true) override;
-	std::optional<s32> sendto(s32 flags, const std::vector<u8>& buf, std::optional<sys_net_sockaddr> opt_sn_addr, bool is_lock = true) override;
-	std::optional<s32> sendmsg(s32 flags, const sys_net_msghdr& msg, bool is_lock = true) override;
-
-	void close() override;
-	s32 shutdown(s32 how) override;
-
-	s32 poll(sys_net_pollfd& sn_pfd, pollfd& native_pfd) override;
-	std::tuple<bool, bool, bool> select(bs_t<poll_t> selected, pollfd& native_pfd) override;
-
-private:
-	void close_stream_nl(nt_p2p_port* p2p_port);
-
-private:
-	static constexpr usz MAX_RECEIVED_BUFFER = (1024 * 1024 * 10);
-
-	p2ps_stream_status status = p2ps_stream_status::stream_closed;
-
-	usz max_backlog = 0; // set on listen
-	std::deque<s32> backlog;
-
-	u16 op_port = 0, op_vport = 0;
-	u32 op_addr = 0;
-
-	u64 data_beg_seq   = 0;                       // Seq of first byte of received_data
-	u64 data_available = 0;                       // Amount of continuous data available(calculated on ACK send)
-	std::map<u64, std::vector<u8>> received_data; // holds seq/data of data received
-
-	u64 cur_seq = 0; // SEQ of next packet to be sent
-};
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.cpp b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.cpp
deleted file mode 100644
index 6e74bd512f..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-#include "stdafx.h"
-#include "lv2_socket_raw.h"
-#include "Emu/NP/vport0.h"
-
-LOG_CHANNEL(sys_net);
-
-template <typename T>
-struct socket_raw_logging
-{
-	socket_raw_logging() = default;
-
-	socket_raw_logging(const socket_raw_logging&) = delete;
-	socket_raw_logging& operator=(const socket_raw_logging&) = delete;
-
-	atomic_t<bool> logged = false;
-};
-
-#define LOG_ONCE(raw_var, message)                                              \
-	if (!g_fxo->get<socket_raw_logging<class raw_var>>().logged.exchange(true)) \
-	{                                                                           \
-		sys_net.todo(message);                                                  \
-	}
-
-lv2_socket_raw::lv2_socket_raw(lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol)
-	: lv2_socket(family, type, protocol)
-{
-}
-
-lv2_socket_raw::lv2_socket_raw(utils::serial& ar, lv2_socket_type type)
-	: lv2_socket(stx::make_exact(ar), type)
-{
-}
-
-void lv2_socket_raw::save(utils::serial& ar)
-{
-	lv2_socket::save(ar, true);
-}
-
-std::tuple<bool, s32, shared_ptr<lv2_socket>, sys_net_sockaddr> lv2_socket_raw::accept([[maybe_unused]] bool is_lock)
-{
-	sys_net.fatal("[RAW] accept() called on a RAW socket");
-	return {};
-}
-
-std::optional<s32> lv2_socket_raw::connect([[maybe_unused]] const sys_net_sockaddr& addr)
-{
-	sys_net.fatal("[RAW] connect() called on a RAW socket");
-	return CELL_OK;
-}
-
-s32 lv2_socket_raw::connect_followup()
-{
-	sys_net.fatal("[RAW] connect_followup() called on a RAW socket");
-	return CELL_OK;
-}
-
-std::pair<s32, sys_net_sockaddr> lv2_socket_raw::getpeername()
-{
-	LOG_ONCE(raw_getpeername, "[RAW] getpeername() called on a RAW socket");
-	return {};
-}
-
-s32 lv2_socket_raw::listen([[maybe_unused]] s32 backlog)
-{
-	LOG_ONCE(raw_listen, "[RAW] listen() called on a RAW socket");
-	return {};
-}
-
-s32 lv2_socket_raw::bind([[maybe_unused]] const sys_net_sockaddr& addr)
-{
-	LOG_ONCE(raw_bind, "lv2_socket_raw::bind");
-	return {};
-}
-
-std::pair<s32, sys_net_sockaddr> lv2_socket_raw::getsockname()
-{
-	LOG_ONCE(raw_getsockname, "lv2_socket_raw::getsockname");
-	return {};
-}
-
-std::tuple<s32, lv2_socket::sockopt_data, u32> lv2_socket_raw::getsockopt([[maybe_unused]] s32 level, [[maybe_unused]] s32 optname, [[maybe_unused]] u32 len)
-{
-	LOG_ONCE(raw_getsockopt, "lv2_socket_raw::getsockopt");
-	return {};
-}
-
-s32 lv2_socket_raw::setsockopt(s32 level, s32 optname, const std::vector<u8>& optval)
-{
-	LOG_ONCE(raw_setsockopt, "lv2_socket_raw::setsockopt");
-
-	// TODO
-	int native_int = *reinterpret_cast<const be_t<s32>*>(optval.data());
-
-	if (level == SYS_NET_SOL_SOCKET && optname == SYS_NET_SO_NBIO)
-	{
-		so_nbio = native_int;
-	}
-
-	return {};
-}
-
-std::optional<std::tuple<s32, std::vector<u8>, sys_net_sockaddr>> lv2_socket_raw::recvfrom(s32 flags, [[maybe_unused]] u32 len, [[maybe_unused]] bool is_lock)
-{
-	LOG_ONCE(raw_recvfrom, "lv2_socket_raw::recvfrom");
-
-	if (so_nbio || (flags & SYS_NET_MSG_DONTWAIT))
-	{
-		return {{-SYS_NET_EWOULDBLOCK, {}, {}}};
-	}
-
-	return {};
-}
-
-std::optional<s32> lv2_socket_raw::sendto([[maybe_unused]] s32 flags, [[maybe_unused]] const std::vector<u8>& buf, [[maybe_unused]] std::optional<sys_net_sockaddr> opt_sn_addr, [[maybe_unused]] bool is_lock)
-{
-	LOG_ONCE(raw_sendto, "lv2_socket_raw::sendto");
-	return ::size32(buf);
-}
-
-std::optional<s32> lv2_socket_raw::sendmsg([[maybe_unused]] s32 flags, [[maybe_unused]] const sys_net_msghdr& msg, [[maybe_unused]] bool is_lock)
-{
-	LOG_ONCE(raw_sendmsg, "lv2_socket_raw::sendmsg");
-	return {};
-}
-
-void lv2_socket_raw::close()
-{
-	LOG_ONCE(raw_close, "lv2_socket_raw::close");
-}
-
-s32 lv2_socket_raw::shutdown([[maybe_unused]] s32 how)
-{
-	LOG_ONCE(raw_shutdown, "lv2_socket_raw::shutdown");
-	return {};
-}
-
-s32 lv2_socket_raw::poll([[maybe_unused]] sys_net_pollfd& sn_pfd, [[maybe_unused]] pollfd& native_pfd)
-{
-	LOG_ONCE(raw_poll, "lv2_socket_raw::poll");
-	return {};
-}
-
-std::tuple<bool, bool, bool> lv2_socket_raw::select([[maybe_unused]] bs_t<lv2_socket::poll_t> selected, [[maybe_unused]] pollfd& native_pfd)
-{
-	LOG_ONCE(raw_select, "lv2_socket_raw::select");
-	return {};
-}
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.h b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.h
deleted file mode 100644
index 01b7255884..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include "lv2_socket.h"
-
-class lv2_socket_raw final : public lv2_socket
-{
-public:
-	static constexpr u32 id_type = 1;
-
-	lv2_socket_raw(lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol);
-	lv2_socket_raw(utils::serial& ar, lv2_socket_type type);
-	void save(utils::serial& ar);
-
-	std::tuple<bool, s32, shared_ptr<lv2_socket>, sys_net_sockaddr> accept(bool is_lock = true) override;
-	s32 bind(const sys_net_sockaddr& addr) override;
-
-	std::optional<s32> connect(const sys_net_sockaddr& addr) override;
-	s32 connect_followup() override;
-
-	std::pair<s32, sys_net_sockaddr> getpeername() override;
-	std::pair<s32, sys_net_sockaddr> getsockname() override;
-
-	std::tuple<s32, sockopt_data, u32> getsockopt(s32 level, s32 optname, u32 len) override;
-	s32 setsockopt(s32 level, s32 optname, const std::vector<u8>& optval) override;
-
-	s32 listen(s32 backlog) override;
-
-	std::optional<std::tuple<s32, std::vector<u8>, sys_net_sockaddr>> recvfrom(s32 flags, u32 len, bool is_lock = true) override;
-	std::optional<s32> sendto(s32 flags, const std::vector<u8>& buf, std::optional<sys_net_sockaddr> opt_sn_addr, bool is_lock = true) override;
-	std::optional<s32> sendmsg(s32 flags, const sys_net_msghdr& msg, bool is_lock = true) override;
-
-	void close() override;
-	s32 shutdown(s32 how) override;
-
-	s32 poll(sys_net_pollfd& sn_pfd, pollfd& native_pfd) override;
-	std::tuple<bool, bool, bool> select(bs_t<poll_t> selected, pollfd& native_pfd) override;
-};
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/network_context.cpp b/rpcs3/Emu/Cell/lv2/sys_net/network_context.cpp
deleted file mode 100644
index 377da5bf31..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/network_context.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-#include "Emu/NP/ip_address.h"
-#include "stdafx.h"
-#include "Emu/Cell/lv2/sys_sync.h"
-#include "Emu/Cell/Modules/sceNp.h" // for SCE_NP_PORT
-
-#include "network_context.h"
-#include "sys_net_helpers.h"
-
-LOG_CHANNEL(sys_net);
-
-// Used by RPCN to send signaling packets to RPCN server(for UDP hole punching)
-bool send_packet_from_p2p_port_ipv4(const std::vector<u8>& data, const sockaddr_in& addr)
-{
-	auto& nc = g_fxo->get<p2p_context>();
-	{
-		std::lock_guard list_lock(nc.list_p2p_ports_mutex);
-		if (nc.list_p2p_ports.contains(SCE_NP_PORT))
-		{
-			auto& def_port = ::at32(nc.list_p2p_ports, SCE_NP_PORT);
-
-			if (np::is_ipv6_supported())
-			{
-				const auto addr6 = np::sockaddr_to_sockaddr6(addr);
-
-				if (::sendto(def_port.p2p_socket, reinterpret_cast<const char*>(data.data()), ::size32(data), 0, reinterpret_cast<const sockaddr*>(&addr6), sizeof(sockaddr_in6)) == -1)
-				{
-					sys_net.error("Failed to send IPv4 signaling packet on IPv6 socket: %s", get_last_error(false, false));
-					return false;
-				}
-			}
-			else if (::sendto(def_port.p2p_socket, reinterpret_cast<const char*>(data.data()), ::size32(data), 0, reinterpret_cast<const sockaddr*>(&addr), sizeof(sockaddr_in)) == -1)
-			{
-				sys_net.error("Failed to send signaling packet on IPv4 socket: %s", get_last_error(false, false));
-				return false;
-			}
-		}
-		else
-		{
-			sys_net.error("send_packet_from_p2p_port_ipv4: port %d not present", +SCE_NP_PORT);
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool send_packet_from_p2p_port_ipv6(const std::vector<u8>& data, const sockaddr_in6& addr)
-{
-	auto& nc = g_fxo->get<p2p_context>();
-	{
-		std::lock_guard list_lock(nc.list_p2p_ports_mutex);
-		if (nc.list_p2p_ports.contains(SCE_NP_PORT))
-		{
-			auto& def_port = ::at32(nc.list_p2p_ports, SCE_NP_PORT);
-			ensure(np::is_ipv6_supported());
-
-			if (::sendto(def_port.p2p_socket, reinterpret_cast<const char*>(data.data()), ::size32(data), 0, reinterpret_cast<const sockaddr*>(&addr), sizeof(sockaddr_in6)) == -1)
-			{
-				sys_net.error("Failed to send signaling packet on IPv6 socket: %s", get_last_error(false, false));
-				return false;
-			}
-		}
-		else
-		{
-			sys_net.error("send_packet_from_p2p_port_ipv6: port %d not present", +SCE_NP_PORT);
-			return false;
-		}
-	}
-
-	return true;
-}
-
-std::vector<std::vector<u8>> get_rpcn_msgs()
-{
-	std::vector<std::vector<u8>> msgs;
-	auto& nc = g_fxo->get<p2p_context>();
-	{
-		std::lock_guard list_lock(nc.list_p2p_ports_mutex);
-		if (nc.list_p2p_ports.contains(SCE_NP_PORT))
-		{
-			auto& def_port = ::at32(nc.list_p2p_ports, SCE_NP_PORT);
-			{
-				std::lock_guard lock(def_port.s_rpcn_mutex);
-				msgs = std::move(def_port.rpcn_msgs);
-				def_port.rpcn_msgs.clear();
-			}
-		}
-		else
-		{
-			sys_net.error("get_rpcn_msgs: port %d not present", +SCE_NP_PORT);
-		}
-	}
-
-	return msgs;
-}
-
-std::vector<signaling_message> get_sign_msgs()
-{
-	std::vector<signaling_message> msgs;
-	auto& nc = g_fxo->get<p2p_context>();
-	{
-		std::lock_guard list_lock(nc.list_p2p_ports_mutex);
-		if (nc.list_p2p_ports.contains(SCE_NP_PORT))
-		{
-			auto& def_port = ::at32(nc.list_p2p_ports, SCE_NP_PORT);
-			{
-				std::lock_guard lock(def_port.s_sign_mutex);
-				msgs = std::move(def_port.sign_msgs);
-				def_port.sign_msgs.clear();
-			}
-		}
-		else
-		{
-			sys_net.error("get_sign_msgs: port %d not present", +SCE_NP_PORT);
-		}
-	}
-
-	return msgs;
-}
-
-namespace np
-{
-	void init_np_handler_dependencies();
-}
-
-void base_network_thread::add_ppu_to_awake(ppu_thread* ppu)
-{
-	std::lock_guard lock(mutex_ppu_to_awake);
-	ppu_to_awake.emplace_back(ppu);
-}
-
-void base_network_thread::del_ppu_to_awake(ppu_thread* ppu)
-{
-	std::lock_guard lock(mutex_ppu_to_awake);
-
-	for (auto it = ppu_to_awake.begin(); it != ppu_to_awake.end();)
-	{
-		if (*it == ppu)
-		{
-			it = ppu_to_awake.erase(it);
-			continue;
-		}
-
-		it++;
-	}
-}
-
-void base_network_thread::wake_threads()
-{
-	std::lock_guard lock(mutex_ppu_to_awake);
-
-	ppu_to_awake.erase(std::unique(ppu_to_awake.begin(), ppu_to_awake.end()), ppu_to_awake.end());
-	for (ppu_thread* ppu : ppu_to_awake)
-	{
-		network_clear_queue(*ppu);
-		lv2_obj::append(ppu);
-	}
-
-	if (!ppu_to_awake.empty())
-	{
-		ppu_to_awake.clear();
-		lv2_obj::awake_all();
-	}
-}
-
-p2p_thread::p2p_thread()
-{
-	np::init_np_handler_dependencies();
-}
-
-void p2p_thread::bind_sce_np_port()
-{
-	std::lock_guard list_lock(list_p2p_ports_mutex);
-	create_p2p_port(SCE_NP_PORT);
-}
-
-void network_thread::operator()()
-{
-	std::vector<shared_ptr<lv2_socket>> socklist;
-	socklist.reserve(lv2_socket::id_count);
-
-	{
-		std::lock_guard lock(mutex_ppu_to_awake);
-		ppu_to_awake.clear();
-	}
-
-	std::vector<::pollfd> fds(lv2_socket::id_count);
-#ifdef _WIN32
-	std::vector<bool> connecting(lv2_socket::id_count);
-	std::vector<bool> was_connecting(lv2_socket::id_count);
-#endif
-
-	while (thread_ctrl::state() != thread_state::aborting)
-	{
-		if (!num_polls)
-		{
-			thread_ctrl::wait_on(num_polls, 0);
-			continue;
-		}
-
-		ensure(socklist.size() <= lv2_socket::id_count);
-
-		// Wait with 1ms timeout
-#ifdef _WIN32
-		windows_poll(fds, ::size32(socklist), 1, connecting);
-#else
-		::poll(fds.data(), socklist.size(), 1);
-#endif
-
-		std::lock_guard lock(mutex_thread_loop);
-
-		for (usz i = 0; i < socklist.size(); i++)
-		{
-#ifdef _WIN32
-			socklist[i]->handle_events(fds[i], was_connecting[i] && !connecting[i]);
-#else
-			socklist[i]->handle_events(fds[i]);
-#endif
-		}
-
-		wake_threads();
-		socklist.clear();
-
-		// Obtain all native active sockets
-		idm::select<lv2_socket>([&](u32 id, lv2_socket& s)
-			{
-				if (s.get_type() == SYS_NET_SOCK_DGRAM || s.get_type() == SYS_NET_SOCK_STREAM)
-				{
-					socklist.emplace_back(idm::get_unlocked<lv2_socket>(id));
-				}
-			});
-
-		for (usz i = 0; i < socklist.size(); i++)
-		{
-			auto events = socklist[i]->get_events();
-
-			fds[i].fd = events ? socklist[i]->get_socket() : -1;
-			fds[i].events =
-				(events & lv2_socket::poll_t::read ? POLLIN : 0) |
-				(events & lv2_socket::poll_t::write ? POLLOUT : 0) |
-				0;
-			fds[i].revents = 0;
-#ifdef _WIN32
-			const auto cur_connecting = socklist[i]->is_connecting();
-			was_connecting[i] = cur_connecting;
-			connecting[i] = cur_connecting;
-#endif
-		}
-	}
-}
-
-// Must be used under list_p2p_ports_mutex lock!
-void p2p_thread::create_p2p_port(u16 p2p_port)
-{
-	if (!list_p2p_ports.contains(p2p_port))
-	{
-		list_p2p_ports.emplace(std::piecewise_construct, std::forward_as_tuple(p2p_port), std::forward_as_tuple(p2p_port));
-		const u32 prev_value = num_p2p_ports.fetch_add(1);
-		if (!prev_value)
-		{
-			num_p2p_ports.notify_one();
-		}
-	}
-}
-
-void p2p_thread::operator()()
-{
-	std::vector<::pollfd> p2p_fd(lv2_socket::id_count);
-
-	while (thread_ctrl::state() != thread_state::aborting)
-	{
-		if (!num_p2p_ports)
-		{
-			thread_ctrl::wait_on(num_p2p_ports, 0);
-			continue;
-		}
-
-		// Check P2P sockets for incoming packets
-		auto num_p2p_sockets = 0;
-		std::memset(p2p_fd.data(), 0, p2p_fd.size() * sizeof(::pollfd));
-		{
-			auto set_fd = [&](socket_type socket)
-			{
-				p2p_fd[num_p2p_sockets].events = POLLIN;
-				p2p_fd[num_p2p_sockets].revents = 0;
-				p2p_fd[num_p2p_sockets].fd = socket;
-				num_p2p_sockets++;
-			};
-
-			std::lock_guard lock(list_p2p_ports_mutex);
-			for (const auto& [_, p2p_port] : list_p2p_ports)
-			{
-				set_fd(p2p_port.p2p_socket);
-			}
-		}
-
-#ifdef _WIN32
-		const auto ret_p2p = WSAPoll(p2p_fd.data(), num_p2p_sockets, 1);
-#else
-		const auto ret_p2p = ::poll(p2p_fd.data(), num_p2p_sockets, 1);
-#endif
-		if (ret_p2p > 0)
-		{
-			std::lock_guard lock(list_p2p_ports_mutex);
-			auto fd_index = 0;
-
-			auto process_fd = [&](nt_p2p_port& p2p_port)
-			{
-				if ((p2p_fd[fd_index].revents & POLLIN) == POLLIN || (p2p_fd[fd_index].revents & POLLRDNORM) == POLLRDNORM)
-				{
-					while (p2p_port.recv_data())
-						;
-				}
-				fd_index++;
-			};
-
-			for (auto& [_, p2p_port] : list_p2p_ports)
-			{
-				process_fd(p2p_port);
-			}
-
-			wake_threads();
-		}
-		else if (ret_p2p < 0)
-		{
-			sys_net.error("[P2P] Error poll on master P2P socket: %d", get_last_error(false));
-		}
-	}
-}
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/network_context.h b/rpcs3/Emu/Cell/lv2/sys_net/network_context.h
deleted file mode 100644
index 658196c4b4..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/network_context.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <map>
-#include "Utilities/mutex.h"
-#include "Emu/Cell/PPUThread.h"
-
-#include "nt_p2p_port.h"
-
-struct base_network_thread
-{
-	void add_ppu_to_awake(ppu_thread* ppu);
-	void del_ppu_to_awake(ppu_thread* ppu);
-
-	shared_mutex mutex_ppu_to_awake;
-	std::vector<ppu_thread*> ppu_to_awake;
-
-	void wake_threads();
-};
-
-struct network_thread : base_network_thread
-{
-	shared_mutex mutex_thread_loop;
-	atomic_t<u32> num_polls = 0;
-
-	static constexpr auto thread_name = "Network Thread";
-
-	void operator()();
-};
-
-struct p2p_thread : base_network_thread
-{
-	shared_mutex list_p2p_ports_mutex;
-	std::map<u16, nt_p2p_port> list_p2p_ports;
-	atomic_t<u32> num_p2p_ports = 0;
-
-	static constexpr auto thread_name = "Network P2P Thread";
-
-	p2p_thread();
-
-	void create_p2p_port(u16 p2p_port);
-
-	void bind_sce_np_port();
-	void operator()();
-};
-
-using network_context = named_thread<network_thread>;
-using p2p_context = named_thread<p2p_thread>;
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.cpp b/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.cpp
deleted file mode 100644
index 61039c7856..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-#include "stdafx.h"
-#include "Emu/NP/ip_address.h"
-#include "nt_p2p_port.h"
-#include "lv2_socket_p2ps.h"
-#include "sys_net_helpers.h"
-#include "Emu/NP/signaling_handler.h"
-#include "sys_net_helpers.h"
-#include "Emu/NP/vport0.h"
-#include "Emu/NP/np_handler.h"
-#include "Emu/NP/np_helpers.h"
-
-LOG_CHANNEL(sys_net);
-
-namespace sys_net_helpers
-{
-	bool all_reusable(const std::set<s32>& sock_ids)
-	{
-		for (const s32 sock_id : sock_ids)
-		{
-			const auto [_, reusable] = idm::check<lv2_socket>(sock_id, [&](lv2_socket& sock) -> bool
-				{
-					auto [res_reuseaddr, optval_reuseaddr, optlen_reuseaddr] = sock.getsockopt(SYS_NET_SOL_SOCKET, SYS_NET_SO_REUSEADDR, sizeof(s32));
-					auto [res_reuseport, optval_reuseport, optlen_reuseport] = sock.getsockopt(SYS_NET_SOL_SOCKET, SYS_NET_SO_REUSEPORT, sizeof(s32));
-
-					const bool reuse_addr = optlen_reuseaddr == 4 && !!optval_reuseaddr._int;
-					const bool reuse_port = optlen_reuseport == 4 && !!optval_reuseport._int;
-
-					return (reuse_addr || reuse_port);
-				});
-
-			if (!reusable)
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-} // namespace sys_net_helpers
-
-nt_p2p_port::nt_p2p_port(u16 port)
-	: port(port)
-{
-	const bool is_ipv6 = np::is_ipv6_supported();
-
-	// Creates and bind P2P Socket
-	p2p_socket = ::socket(is_ipv6 ? AF_INET6 : AF_INET, SOCK_DGRAM, 0);
-#ifdef _WIN32
-	if (p2p_socket == INVALID_SOCKET)
-#else
-	if (p2p_socket == -1)
-#endif
-		fmt::throw_exception("Failed to create DGRAM socket for P2P socket: %s!", get_last_error(true));
-
-	np::set_socket_non_blocking(p2p_socket);
-
-	u32 optval = 131072; // value obtained from DECR for a SOCK_DGRAM_P2P socket(should maybe be bigger for actual socket?)
-	if (setsockopt(p2p_socket, SOL_SOCKET, SO_RCVBUF, reinterpret_cast<const char*>(&optval), sizeof(optval)) != 0)
-		fmt::throw_exception("Error setsockopt SO_RCVBUF on P2P socket: %s", get_last_error(true));
-
-	int ret_bind = 0;
-	const u16 be_port = std::bit_cast<u16, be_t<u16>>(port);
-	auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-
-	if (is_ipv6)
-	{
-		// Some OS(Windows, maybe more) will only support IPv6 adressing by default and we need IPv4 over IPv6
-		optval = 0;
-		if (setsockopt(p2p_socket, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<const char*>(&optval), sizeof(optval)) != 0)
-			fmt::throw_exception("Error setsockopt IPV6_V6ONLY on P2P socket: %s", get_last_error(true));
-
-		::sockaddr_in6 p2p_ipv6_addr{.sin6_family = AF_INET6, .sin6_port = be_port};
-		ret_bind = ::bind(p2p_socket, reinterpret_cast<sockaddr*>(&p2p_ipv6_addr), sizeof(p2p_ipv6_addr));
-	}
-	else
-	{
-		::sockaddr_in p2p_ipv4_addr{.sin_family = AF_INET, .sin_port = be_port};
-		const u32 bind_ip = nph.get_bind_ip();
-		p2p_ipv4_addr.sin_addr.s_addr = bind_ip;
-
-		if (ret_bind = ::bind(p2p_socket, reinterpret_cast<const sockaddr*>(&p2p_ipv4_addr), sizeof(p2p_ipv4_addr)); ret_bind == -1 && bind_ip)
-		{
-			sys_net.error("Failed to bind to %s:%d, falling back to 0.0.0.0:%d", np::ip_to_string(bind_ip), port, port);
-			p2p_ipv4_addr.sin_addr.s_addr = 0;
-			ret_bind = ::bind(p2p_socket, reinterpret_cast<const sockaddr*>(&p2p_ipv4_addr), sizeof(p2p_ipv4_addr));
-		}
-	}
-
-	if (ret_bind == -1)
-		fmt::throw_exception("Failed to bind DGRAM socket to %d for P2P: %s!", port, get_last_error(true));
-
-	nph.upnp_add_port_mapping(port, "UDP");
-	sys_net.notice("P2P port %d was bound!", port);
-}
-
-nt_p2p_port::~nt_p2p_port()
-{
-	np::close_socket(p2p_socket);
-}
-
-void nt_p2p_port::dump_packet(p2ps_encapsulated_tcp* tcph)
-{
-	sys_net.trace("PACKET DUMP:\nsrc_port: %d\ndst_port: %d\nflags: %d\nseq: %d\nack: %d\nlen: %d", tcph->src_port, tcph->dst_port, tcph->flags, tcph->seq, tcph->ack, tcph->length);
-}
-
-// Must be used under bound_p2p_vports_mutex lock
-u16 nt_p2p_port::get_port()
-{
-	if (binding_port == 0)
-	{
-		binding_port = 30000;
-	}
-
-	return binding_port++;
-}
-
-bool nt_p2p_port::handle_connected(s32 sock_id, p2ps_encapsulated_tcp* tcp_header, u8* data, ::sockaddr_storage* op_addr)
-{
-	const auto sock = idm::check<lv2_socket>(sock_id, [&](lv2_socket& sock) -> bool
-		{
-			ensure(sock.get_type() == SYS_NET_SOCK_STREAM_P2P);
-			auto& sock_p2ps = reinterpret_cast<lv2_socket_p2ps&>(sock);
-
-			return sock_p2ps.handle_connected(tcp_header, data, op_addr, this);
-		});
-
-	if (!sock)
-	{
-		sys_net.error("[P2PS] Couldn't find the socket!");
-		return false;
-	}
-
-	if (!sock.ret)
-	{
-		sys_net.error("[P2PS] handle_connected() failed!");
-		return false;
-	}
-
-	return true;
-}
-
-bool nt_p2p_port::handle_listening(s32 sock_id, p2ps_encapsulated_tcp* tcp_header, u8* data, ::sockaddr_storage* op_addr)
-{
-	auto sock = idm::get_unlocked<lv2_socket>(sock_id);
-	if (!sock)
-		return false;
-
-	auto& sock_p2ps = reinterpret_cast<lv2_socket_p2ps&>(*sock);
-	return sock_p2ps.handle_listening(tcp_header, data, op_addr);
-}
-
-bool nt_p2p_port::recv_data()
-{
-	::sockaddr_storage native_addr{};
-	::socklen_t native_addrlen = sizeof(native_addr);
-	const auto recv_res = ::recvfrom(p2p_socket, reinterpret_cast<char*>(p2p_recv_data.data()), ::size32(p2p_recv_data), 0, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen);
-
-	if (recv_res == -1)
-	{
-		auto lerr = get_last_error(false);
-		if (lerr != SYS_NET_EINPROGRESS && lerr != SYS_NET_EWOULDBLOCK)
-			sys_net.error("Error recvfrom on %s P2P socket: %d", np::is_ipv6_supported() ? "IPv6" : "IPv4", lerr);
-
-		return false;
-	}
-
-	if (recv_res < static_cast<s32>(sizeof(u16)))
-	{
-		sys_net.error("Received badly formed packet on P2P port(no vport)!");
-		return true;
-	}
-
-	u16 dst_vport = reinterpret_cast<le_t<u16>&>(p2p_recv_data[0]);
-
-	if (np::is_ipv6_supported())
-	{
-		const auto* addr_ipv6 = reinterpret_cast<sockaddr_in6*>(&native_addr);
-		const auto addr_ipv4 = np::sockaddr6_to_sockaddr(*addr_ipv6);
-		native_addr = {};
-		std::memcpy(&native_addr, &addr_ipv4, sizeof(addr_ipv4));
-	}
-
-	if (dst_vport == 0)
-	{
-		if (recv_res < VPORT_0_HEADER_SIZE)
-		{
-			sys_net.error("Bad vport 0 packet(no subset)!");
-			return true;
-		}
-
-		const u8 subset      = p2p_recv_data[2];
-		const auto data_size = recv_res - VPORT_0_HEADER_SIZE;
-		std::vector<u8> vport_0_data(p2p_recv_data.data() + VPORT_0_HEADER_SIZE, p2p_recv_data.data() + VPORT_0_HEADER_SIZE + data_size);
-
-		switch (subset)
-		{
-		case SUBSET_RPCN:
-		{
-			std::lock_guard lock(s_rpcn_mutex);
-			rpcn_msgs.push_back(std::move(vport_0_data));
-			return true;
-		}
-		case SUBSET_SIGNALING:
-		{
-			signaling_message msg;
-			msg.src_addr = reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr;
-			msg.src_port = std::bit_cast<u16, be_t<u16>>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
-			msg.data     = std::move(vport_0_data);
-
-			{
-				std::lock_guard lock(s_sign_mutex);
-				sign_msgs.push_back(std::move(msg));
-			}
-
-			auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-			sigh.wake_up();
-			return true;
-		}
-		default:
-		{
-			sys_net.error("Invalid vport 0 subset!");
-			return true;
-		}
-		}
-	}
-
-	if (recv_res < VPORT_P2P_HEADER_SIZE)
-	{
-		return true;
-	}
-
-	const u16 src_vport = *reinterpret_cast<le_t<u16>*>(p2p_recv_data.data() + sizeof(u16));
-	const u16 vport_flags = *reinterpret_cast<le_t<u16>*>(p2p_recv_data.data() + sizeof(u16) + sizeof(u16));
-	std::vector<u8> p2p_data(recv_res - VPORT_P2P_HEADER_SIZE);
-	memcpy(p2p_data.data(), p2p_recv_data.data() + VPORT_P2P_HEADER_SIZE, p2p_data.size());
-
-	if (vport_flags & P2P_FLAG_P2P)
-	{
-		std::lock_guard lock(bound_p2p_vports_mutex);
-		if (bound_p2p_vports.contains(dst_vport))
-		{
-			sys_net_sockaddr_in_p2p p2p_addr{};
-
-			p2p_addr.sin_len    = sizeof(sys_net_sockaddr_in);
-			p2p_addr.sin_family = SYS_NET_AF_INET;
-			p2p_addr.sin_addr   = std::bit_cast<be_t<u32>, u32>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr);
-			p2p_addr.sin_vport  = src_vport;
-			p2p_addr.sin_port   = std::bit_cast<be_t<u16>, u16>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
-
-			auto& bound_sockets = ::at32(bound_p2p_vports, dst_vport);
-
-			for (const auto sock_id : bound_sockets)
-			{
-				const auto sock = idm::check<lv2_socket>(sock_id, [&](lv2_socket& sock)
-					{
-						ensure(sock.get_type() == SYS_NET_SOCK_DGRAM_P2P);
-						auto& sock_p2p = reinterpret_cast<lv2_socket_p2p&>(sock);
-
-						sock_p2p.handle_new_data(p2p_addr, p2p_data);
-					});
-
-				if (!sock)
-				{
-					sys_net.error("Socket %d found in bound_p2p_vports didn't exist!", sock_id);
-					bound_sockets.erase(sock_id);
-					if (bound_sockets.empty())
-					{
-						bound_p2p_vports.erase(dst_vport);
-					}
-				}
-			}
-
-			return true;
-		}
-	}
-	else if (vport_flags & P2P_FLAG_P2PS)
-	{
-		if (p2p_data.size() < sizeof(p2ps_encapsulated_tcp))
-		{
-			sys_net.notice("Received P2P packet targeted at unbound vport(likely) or invalid(vport=%d)", dst_vport);
-			return true;
-		}
-
-		auto* tcp_header = reinterpret_cast<p2ps_encapsulated_tcp*>(p2p_data.data());
-
-		// Validate signature & length
-		if (tcp_header->signature != P2PS_U2S_SIG)
-		{
-			sys_net.notice("Received P2P packet targeted at unbound vport(vport=%d)", dst_vport);
-			return true;
-		}
-
-		if (tcp_header->length != (p2p_data.size() - sizeof(p2ps_encapsulated_tcp)))
-		{
-			sys_net.error("Received STREAM-P2P packet tcp length didn't match packet length");
-			return true;
-		}
-
-		// Sanity check
-		if (tcp_header->dst_port != dst_vport)
-		{
-			sys_net.error("Received STREAM-P2P packet with dst_port != vport");
-			return true;
-		}
-
-		// Validate checksum
-		u16 given_checksum   = tcp_header->checksum;
-		tcp_header->checksum = 0;
-		if (given_checksum != u2s_tcp_checksum(reinterpret_cast<const le_t<u16>*>(p2p_data.data()), p2p_data.size()))
-		{
-			sys_net.error("Checksum is invalid, dropping packet!");
-			return true;
-		}
-
-		// The packet is valid
-		dump_packet(tcp_header);
-
-		// Check if it's bound
-		const u64 key_connected = (reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr) | (static_cast<u64>(tcp_header->src_port) << 48) | (static_cast<u64>(tcp_header->dst_port) << 32);
-
-		{
-			std::lock_guard lock(bound_p2p_vports_mutex);
-			if (bound_p2p_streams.contains(key_connected))
-			{
-				const auto sock_id = ::at32(bound_p2p_streams, key_connected);
-				sys_net.trace("Received packet for connected STREAM-P2P socket(s=%d)", sock_id);
-				handle_connected(sock_id, tcp_header, p2p_data.data() + sizeof(p2ps_encapsulated_tcp), &native_addr);
-				return true;
-			}
-
-			if (bound_p2ps_vports.contains(tcp_header->dst_port))
-			{
-				const auto& bound_sockets = ::at32(bound_p2ps_vports, tcp_header->dst_port);
-
-				for (const auto sock_id : bound_sockets)
-				{
-					sys_net.trace("Received packet for listening STREAM-P2P socket(s=%d)", sock_id);
-					handle_listening(sock_id, tcp_header, p2p_data.data() + sizeof(p2ps_encapsulated_tcp), &native_addr);
-				}
-				return true;
-			}
-
-			if (tcp_header->flags == p2ps_tcp_flags::RST)
-			{
-				sys_net.trace("[P2PS] Received RST on unbound P2PS");
-				return true;
-			}
-
-			// The P2PS packet was sent to an unbound vport, send a RST packet
-			p2ps_encapsulated_tcp send_hdr;
-			send_hdr.src_port = tcp_header->dst_port;
-			send_hdr.dst_port = tcp_header->src_port;
-			send_hdr.flags = p2ps_tcp_flags::RST;
-			auto packet = generate_u2s_packet(send_hdr, nullptr, 0);
-
-			if (np::sendto_possibly_ipv6(p2p_socket, reinterpret_cast<char*>(packet.data()), ::size32(packet), reinterpret_cast<const sockaddr_in*>(&native_addr), 0) == -1)
-			{
-				sys_net.error("[P2PS] Error sending RST to sender to unbound P2PS: %s", get_last_error(false));
-				return true;
-			}
-
-			sys_net.trace("[P2PS] Sent RST to sender to unbound P2PS");
-			return true;
-		}
-	}
-
-	sys_net.notice("Received a P2P packet with no bound target(dst_vport = %d)", dst_vport);
-	return true;
-}
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.h b/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.h
deleted file mode 100644
index 2d57bc8461..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#pragma once
-
-#include <set>
-
-#include "lv2_socket_p2ps.h"
-
-#ifdef _WIN32
-#include <winsock2.h>
-#include <WS2tcpip.h>
-#else
-#ifdef __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#ifdef __clang__
-#pragma GCC diagnostic pop
-#endif
-#endif
-
-// dst_vport src_vport flags
-constexpr s32 VPORT_P2P_HEADER_SIZE = sizeof(u16) + sizeof(u16) + sizeof(u16);
-
-enum VPORT_P2P_FLAGS
-{
-	P2P_FLAG_P2P  = 1,
-	P2P_FLAG_P2PS = 1 << 1,
-};
-
-struct signaling_message
-{
-	u32 src_addr = 0;
-	u16 src_port = 0;
-
-	std::vector<u8> data;
-};
-
-namespace sys_net_helpers
-{
-	bool all_reusable(const std::set<s32>& sock_ids);
-}
-
-struct nt_p2p_port
-{
-	// Real socket where P2P packets are received/sent
-	socket_type p2p_socket = 0;
-	u16 port               = 0;
-
-	shared_mutex bound_p2p_vports_mutex;
-	// For DGRAM_P2P sockets (vport, sock_ids)
-	std::map<u16, std::set<s32>> bound_p2p_vports{};
-	// For STREAM_P2P sockets (vport, sock_ids)
-	std::map<u16, std::set<s32>> bound_p2ps_vports{};
-	// List of active(either from a connect or an accept) P2PS sockets (key, sock_id)
-	// key is ( (src_vport) << 48 | (dst_vport) << 32 | addr ) with src_vport and addr being 0 for listening sockets
-	std::map<u64, s32> bound_p2p_streams{};
-	// Current free port index
-	u16 binding_port = 30000;
-
-	// Queued messages from RPCN
-	shared_mutex s_rpcn_mutex;
-	std::vector<std::vector<u8>> rpcn_msgs{};
-	// Queued signaling messages
-	shared_mutex s_sign_mutex;
-	std::vector<signaling_message> sign_msgs{};
-
-	std::array<u8, 65535> p2p_recv_data{};
-
-	nt_p2p_port(u16 port);
-	~nt_p2p_port();
-
-	static void dump_packet(p2ps_encapsulated_tcp* tcph);
-
-	u16 get_port();
-
-	bool handle_connected(s32 sock_id, p2ps_encapsulated_tcp* tcp_header, u8* data, ::sockaddr_storage* op_addr);
-	bool handle_listening(s32 sock_id, p2ps_encapsulated_tcp* tcp_header, u8* data, ::sockaddr_storage* op_addr);
-	bool recv_data();
-};
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp b/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp
deleted file mode 100644
index 6bc03320cd..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-#include "stdafx.h"
-#include "Emu/IdManager.h"
-#include "Emu/system_config.h"
-#include "Emu/Cell/PPUThread.h"
-#include "lv2_socket.h"
-#include "sys_net_helpers.h"
-#include "network_context.h"
-
-#ifdef _WIN32
-#include "Emu/NP/np_handler.h"
-#include "Emu/NP/np_helpers.h"
-#endif
-
-LOG_CHANNEL(sys_net);
-
-int get_native_error()
-{
-	int native_error;
-#ifdef _WIN32
-	native_error = WSAGetLastError();
-#else
-	native_error = errno;
-#endif
-
-	return native_error;
-}
-
-sys_net_error convert_error(bool is_blocking, int native_error, [[maybe_unused]] bool is_connecting)
-{
-	// Convert the error code for socket functions to a one for sys_net
-	sys_net_error result{};
-	const char* name{};
-
-#ifdef _WIN32
-#define ERROR_CASE(error)         \
-	case WSA##error:              \
-		result = SYS_NET_##error; \
-		name = #error;            \
-		break;
-#else
-#define ERROR_CASE(error)         \
-	case error:                   \
-		result = SYS_NET_##error; \
-		name = #error;            \
-		break;
-#endif
-	switch (native_error)
-	{
-#ifndef _WIN32
-		ERROR_CASE(ENOENT);
-		ERROR_CASE(ENOMEM);
-		ERROR_CASE(EBUSY);
-		ERROR_CASE(ENOSPC);
-		ERROR_CASE(EPIPE);
-#endif
-
-		// TODO: We don't currently support EFAULT or EINTR
-		// ERROR_CASE(EFAULT);
-		// ERROR_CASE(EINTR);
-
-		ERROR_CASE(EBADF);
-		ERROR_CASE(EACCES);
-		ERROR_CASE(EINVAL);
-		ERROR_CASE(EMFILE);
-		ERROR_CASE(EWOULDBLOCK);
-		ERROR_CASE(EINPROGRESS);
-		ERROR_CASE(EALREADY);
-		ERROR_CASE(EDESTADDRREQ);
-		ERROR_CASE(EMSGSIZE);
-		ERROR_CASE(EPROTOTYPE);
-		ERROR_CASE(ENOPROTOOPT);
-		ERROR_CASE(EPROTONOSUPPORT);
-		ERROR_CASE(EOPNOTSUPP);
-		ERROR_CASE(EPFNOSUPPORT);
-		ERROR_CASE(EAFNOSUPPORT);
-		ERROR_CASE(EADDRINUSE);
-		ERROR_CASE(EADDRNOTAVAIL);
-		ERROR_CASE(ENETDOWN);
-		ERROR_CASE(ENETUNREACH);
-		ERROR_CASE(ECONNABORTED);
-		ERROR_CASE(ECONNRESET);
-		ERROR_CASE(ENOBUFS);
-		ERROR_CASE(EISCONN);
-		ERROR_CASE(ENOTCONN);
-		ERROR_CASE(ESHUTDOWN);
-		ERROR_CASE(ETOOMANYREFS);
-		ERROR_CASE(ETIMEDOUT);
-		ERROR_CASE(ECONNREFUSED);
-		ERROR_CASE(EHOSTDOWN);
-		ERROR_CASE(EHOSTUNREACH);
-#ifdef _WIN32
-	// Windows likes to be special with unique errors
-	case WSAENETRESET:
-		result = SYS_NET_ECONNRESET;
-		name = "WSAENETRESET";
-		break;
-#endif
-	default:
-		fmt::throw_exception("sys_net get_last_error(is_blocking=%d, native_error=%d): Unknown/illegal socket error", is_blocking, native_error);
-	}
-
-#ifdef _WIN32
-	if (is_connecting)
-	{
-		// Windows will return SYS_NET_ENOTCONN when recvfrom/sendto is called on a socket that is connecting but not yet connected
-		if (result == SYS_NET_ENOTCONN)
-			return SYS_NET_EAGAIN;
-	}
-#endif
-
-	if (name && result != SYS_NET_EWOULDBLOCK && result != SYS_NET_EINPROGRESS)
-	{
-		sys_net.error("Socket error %s", name);
-	}
-
-	if (is_blocking && result == SYS_NET_EWOULDBLOCK)
-	{
-		return {};
-	}
-
-	if (is_blocking && result == SYS_NET_EINPROGRESS)
-	{
-		return {};
-	}
-
-	return result;
-#undef ERROR_CASE
-}
-
-sys_net_error get_last_error(bool is_blocking, bool is_connecting)
-{
-	return convert_error(is_blocking, get_native_error(), is_connecting);
-}
-
-sys_net_sockaddr native_addr_to_sys_net_addr(const ::sockaddr_storage& native_addr)
-{
-	ensure(native_addr.ss_family == AF_INET || native_addr.ss_family == AF_UNSPEC);
-
-	sys_net_sockaddr sn_addr;
-
-	sys_net_sockaddr_in* paddr = reinterpret_cast<sys_net_sockaddr_in*>(&sn_addr);
-	*paddr = {};
-
-	paddr->sin_len = sizeof(sys_net_sockaddr_in);
-	paddr->sin_family = SYS_NET_AF_INET;
-	paddr->sin_port = std::bit_cast<be_t<u16>, u16>(reinterpret_cast<const sockaddr_in*>(&native_addr)->sin_port);
-	paddr->sin_addr = std::bit_cast<be_t<u32>, u32>(reinterpret_cast<const sockaddr_in*>(&native_addr)->sin_addr.s_addr);
-
-	return sn_addr;
-}
-
-::sockaddr_in sys_net_addr_to_native_addr(const sys_net_sockaddr& sn_addr)
-{
-	ensure(sn_addr.sa_family == SYS_NET_AF_INET);
-
-	const sys_net_sockaddr_in* psa_in = reinterpret_cast<const sys_net_sockaddr_in*>(&sn_addr);
-
-	::sockaddr_in native_addr{};
-	native_addr.sin_family = AF_INET;
-	native_addr.sin_port = std::bit_cast<u16>(psa_in->sin_port);
-	native_addr.sin_addr.s_addr = std::bit_cast<u32>(psa_in->sin_addr);
-
-#ifdef _WIN32
-	// Windows doesn't support sending packets to 0.0.0.0 but it works on unixes, send to 127.0.0.1 instead
-	if (native_addr.sin_addr.s_addr == 0x00000000)
-	{
-		auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-		if (const u32 bind_addr = nph.get_bind_ip(); bind_addr != 0)
-		{
-			// If bind IP is set 0.0.0.0 was bound to binding_ip so we need to connect to that ip
-			sys_net.warning("[Native] Redirected 0.0.0.0 to %s", np::ip_to_string(bind_addr));
-			native_addr.sin_addr.s_addr = bind_addr;
-		}
-		else
-		{
-			// Otherwise we connect to localhost which should be bound
-			sys_net.warning("[Native] Redirected 0.0.0.0 to 127.0.0.1");
-			native_addr.sin_addr.s_addr = std::bit_cast<u32, be_t<u32>>(0x7F000001);
-		}
-	}
-#endif
-
-	return native_addr;
-}
-
-bool is_ip_public_address(const ::sockaddr_in& addr)
-{
-	const u8* ip = reinterpret_cast<const u8*>(&addr.sin_addr.s_addr);
-
-	if ((ip[0] == 10) ||
-		(ip[0] == 127) ||
-		(ip[0] == 172 && (ip[1] >= 16 && ip[1] <= 31)) ||
-		(ip[0] == 192 && ip[1] == 168))
-	{
-		return false;
-	}
-
-	return true;
-}
-
-u32 network_clear_queue(ppu_thread& ppu)
-{
-	u32 cleared = 0;
-
-	idm::select<lv2_socket>([&](u32, lv2_socket& sock)
-		{
-			cleared += sock.clear_queue(&ppu);
-		});
-
-	return cleared;
-}
-
-void clear_ppu_to_awake(ppu_thread& ppu)
-{
-	g_fxo->get<network_context>().del_ppu_to_awake(&ppu);
-	g_fxo->get<p2p_context>().del_ppu_to_awake(&ppu);
-}
-
-be_t<u32> resolve_binding_ip()
-{
-	in_addr conv{};
-	const std::string cfg_bind_addr = g_cfg.net.bind_address.to_string();
-
-	if (cfg_bind_addr == "0.0.0.0" || cfg_bind_addr == "")
-	{
-		return 0;
-	}
-
-	if (!inet_pton(AF_INET, cfg_bind_addr.c_str(), &conv))
-	{
-		// Do not set to disconnected on invalid IP just error and continue using default (0.0.0.0)
-		sys_net.error("Provided IP(%s) address for bind is invalid!", g_cfg.net.bind_address.to_string());
-		return 0;
-	}
-
-	return conv.s_addr;
-}
-
-#ifdef _WIN32
-// Workaround function for WSAPoll not reporting failed connections
-// Note that this was fixed in Windows 10 version 2004 (after more than 10 years lol)
-void windows_poll(std::vector<pollfd>& fds, unsigned long nfds, int timeout, std::vector<bool>& connecting)
-{
-	ensure(fds.size() >= nfds);
-	ensure(connecting.size() >= nfds);
-
-	// Don't call WSAPoll with zero nfds (errors 10022 or 10038)
-	if (std::none_of(fds.begin(), fds.begin() + nfds, [](pollfd& pfd)
-			{
-				return pfd.fd != INVALID_SOCKET;
-			}))
-	{
-		if (timeout > 0)
-		{
-			Sleep(timeout);
-		}
-
-		return;
-	}
-
-	int r = ::WSAPoll(fds.data(), nfds, timeout);
-
-	if (r == SOCKET_ERROR)
-	{
-		sys_net.error("WSAPoll failed: %s", fmt::win_error{static_cast<unsigned long>(WSAGetLastError()), nullptr});
-		return;
-	}
-
-	for (unsigned long i = 0; i < nfds; i++)
-	{
-		if (connecting[i])
-		{
-			if (!fds[i].revents)
-			{
-				int error = 0;
-				socklen_t intlen = sizeof(error);
-				if (getsockopt(fds[i].fd, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&error), &intlen) == -1 || error != 0)
-				{
-					// Connection silently failed
-					connecting[i] = false;
-					fds[i].revents = POLLERR | POLLHUP | (fds[i].events & (POLLIN | POLLOUT));
-				}
-			}
-			else
-			{
-				connecting[i] = false;
-			}
-		}
-	}
-}
-#endif
diff --git a/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.h b/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.h
deleted file mode 100644
index b93d00bdd4..0000000000
--- a/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#ifdef _WIN32
-#include <winsock2.h>
-#include <WS2tcpip.h>
-#else
-#ifdef __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include <sys/socket.h>
-#include <netinet/in.h>
-#ifdef __clang__
-#pragma GCC diagnostic pop
-#endif
-#endif
-
-#include "Emu/Cell/lv2/sys_net.h"
-
-int get_native_error();
-sys_net_error convert_error(bool is_blocking, int native_error, bool is_connecting = false);
-sys_net_error get_last_error(bool is_blocking, bool is_connecting = false);
-sys_net_sockaddr native_addr_to_sys_net_addr(const ::sockaddr_storage& native_addr);
-::sockaddr_in sys_net_addr_to_native_addr(const sys_net_sockaddr& sn_addr);
-bool is_ip_public_address(const ::sockaddr_in& addr);
-u32 network_clear_queue(ppu_thread& ppu);
-void clear_ppu_to_awake(ppu_thread& ppu);
-be_t<u32> resolve_binding_ip();
-
-#ifdef _WIN32
-void windows_poll(std::vector<pollfd>& fds, unsigned long nfds, int timeout, std::vector<bool>& connecting);
-#endif
diff --git a/rpcs3/Emu/Cell/lv2/sys_overlay.cpp b/rpcs3/Emu/Cell/lv2/sys_overlay.cpp
index 33475a8553..d5979a0df4 100644
--- a/rpcs3/Emu/Cell/lv2/sys_overlay.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_overlay.cpp
@@ -4,7 +4,6 @@
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/VFS.h"
 #include "Emu/IdManager.h"
-#include "Emu/system_config.h"
 #include "Crypto/unself.h"
 #include "Crypto/unedat.h"
 #include "Loader/ELF.h"
@@ -13,10 +12,10 @@
 #include "sys_overlay.h"
 #include "sys_fs.h"
 
-extern std::pair<shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_object&, bool virtual_load, const std::string& path, s64 file_offset, utils::serial* ar = nullptr);
+extern std::pair<std::shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_object&, const std::string& path, s64 file_offset);
 
-extern bool ppu_initialize(const ppu_module<lv2_obj>&, bool check_only = false, u64 file_size = 0);
-extern void ppu_finalize(const ppu_module<lv2_obj>& info, bool force_mem_release = false);
+extern bool ppu_initialize(const ppu_module&, bool = false);
+extern void ppu_finalize(const ppu_module&);
 
 LOG_CHANNEL(sys_overlay);
 
@@ -34,41 +33,27 @@ static error_code overlay_load_module(vm::ptr<u32> ovlmid, const std::string& vp
 		src = std::move(lv2_file);
 	}
 
-	u128 klic = g_fxo->get<loaded_npdrm_keys>().last_key();
+	u128 klic = g_fxo->get<loaded_npdrm_keys>().devKlic.load();
 
-	src = decrypt_self(std::move(src), reinterpret_cast<u8*>(&klic));
-
-	if (!src)
-	{
-		return {CELL_ENOEXEC, +"Failed to decrypt file"};
-	}
-
-	ppu_exec_object obj = std::move(src);
-	src.close();
+	ppu_exec_object obj = decrypt_self(std::move(src), reinterpret_cast<u8*>(&klic));
 
 	if (obj != elf_error::ok)
 	{
 		return {CELL_ENOEXEC, obj.operator elf_error()};
 	}
 
-	const auto [ovlm, error] = ppu_load_overlay(obj, false, vfs::get(vpath), file_offset);
+	const auto [ovlm, error] = ppu_load_overlay(obj, vfs::get(vpath), file_offset);
 
 	obj.clear();
 
 	if (error)
 	{
-		if (error == CELL_CANCEL + 0u)
-		{
-			// Emulation stopped
-			return {};
-		}
-
 		return error;
 	}
 
 	ppu_initialize(*ovlm);
 
-	sys_overlay.success("Loaded overlay: \"%s\" (id=0x%x)", vpath, idm::last_id());
+	sys_overlay.success(u8"Loaded overlay: “%s” (id=0x%x)", vpath, idm::last_id());
 
 	*ovlmid = idm::last_id();
 	*entry  = ovlm->entry;
@@ -76,56 +61,6 @@ static error_code overlay_load_module(vm::ptr<u32> ovlmid, const std::string& vp
 	return CELL_OK;
 }
 
-fs::file make_file_view(fs::file&& file, u64 offset, u64 size);
-
-std::function<void(void*)> lv2_overlay::load(utils::serial& ar)
-{
-	const std::string vpath = ar.pop<std::string>();
-	const std::string path = vfs::get(vpath);
-	const s64 offset = ar.pop<s64>();
-
-	sys_overlay.success("lv2_overlay::load(): vpath='%s', path='%s', offset=0x%x", vpath, path, offset);
-
-	shared_ptr<lv2_overlay> ovlm;
-
-	fs::file file{path.substr(0, path.size() - (offset ? fmt::format("_x%x", offset).size() : 0))};
-
-	if (file)
-	{
-		u128 klic = g_fxo->get<loaded_npdrm_keys>().last_key();
-		file = make_file_view(std::move(file), offset, umax);
-		ovlm = ppu_load_overlay(ppu_exec_object{ decrypt_self(std::move(file), reinterpret_cast<u8*>(&klic)) }, false, path, 0, &ar).first;
-
-		if (!ovlm)
-		{
-			fmt::throw_exception("lv2_overlay::load(): ppu_load_overlay() failed. (vpath='%s', offset=0x%x)", vpath, offset);
-		}
-	}
-	else if (!g_cfg.savestate.state_inspection_mode.get())
-	{
-		fmt::throw_exception("lv2_overlay::load(): Failed to find file. (vpath='%s', offset=0x%x)", vpath, offset);
-	}
-	else
-	{
-		sys_overlay.error("lv2_overlay::load(): Failed to find file. (vpath='%s', offset=0x%x)", vpath, offset);
-	}
-
-	return [ovlm](void* storage)
-	{
-		*static_cast<atomic_ptr<lv2_obj>*>(storage) = ovlm;
-	};
-}
-
-void lv2_overlay::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(lv2_prx_overlay);
-
-	const std::string vpath = vfs::retrieve(path);
-	(vpath.empty() ? sys_overlay.error : sys_overlay.success)("lv2_overlay::save(): vpath='%s', offset=0x%x", vpath, offset);
-
-	ar(vpath, offset);
-}
-
 error_code sys_overlay_load_module(vm::ptr<u32> ovlmid, vm::cptr<char> path, u64 flags, vm::ptr<u32> entry)
 {
 	sys_overlay.warning("sys_overlay_load_module(ovlmid=*0x%x, path=%s, flags=0x%x, entry=*0x%x)", ovlmid, path, flags, entry);
@@ -159,7 +94,7 @@ error_code sys_overlay_load_module_by_fd(vm::ptr<u32> ovlmid, u32 fd, u64 offset
 		return CELL_EINVAL;
 	}
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
diff --git a/rpcs3/Emu/Cell/lv2/sys_overlay.h b/rpcs3/Emu/Cell/lv2/sys_overlay.h
index 1a204ba9eb..c7f133c367 100644
--- a/rpcs3/Emu/Cell/lv2/sys_overlay.h
+++ b/rpcs3/Emu/Cell/lv2/sys_overlay.h
@@ -1,20 +1,13 @@
 #pragma once
 
 #include "Emu/Cell/PPUAnalyser.h"
-#include "Emu/Memory/vm_ptr.h"
 #include "sys_sync.h"
 
-struct lv2_overlay final : ppu_module<lv2_obj>
+struct lv2_overlay final : lv2_obj, ppu_module
 {
 	static const u32 id_base = 0x25000000;
 
-	u32 entry{};
-	u32 seg0_code_end{};
-
-	lv2_overlay() = default;
-	lv2_overlay(utils::serial&){}
-	static std::function<void(void*)> load(utils::serial& ar);
-	void save(utils::serial& ar);
+	u32 entry;
 };
 
 error_code sys_overlay_load_module(vm::ptr<u32> ovlmid, vm::cptr<char> path, u64 flags, vm::ptr<u32> entry);
diff --git a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp b/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp
index 1aa9409f46..db6ecc80dc 100644
--- a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp
@@ -1,13 +1,13 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "sys_ppu_thread.h"
 
 #include "Emu/System.h"
 #include "Emu/IdManager.h"
+#include "Emu/perf_meter.hpp"
 
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/PPUCallback.h"
-#include "Emu/Cell/PPUOpcodes.h"
 #include "Emu/Memory/vm_locking.h"
 #include "sys_event.h"
 #include "sys_process.h"
@@ -16,16 +16,14 @@
 
 #include "util/asm.hpp"
 
-#include <thread>
-
 LOG_CHANNEL(sys_ppu_thread);
 
 // Simple structure to cleanup previous thread, because can't remove its own thread
 struct ppu_thread_cleaner
 {
-	shared_ptr<named_thread<ppu_thread>> old;
+	std::shared_ptr<void> old;
 
-	shared_ptr<named_thread<ppu_thread>> clean(shared_ptr<named_thread<ppu_thread>> ptr)
+	std::shared_ptr<void> clean(std::shared_ptr<void> ptr)
 	{
 		return std::exchange(old, std::move(ptr));
 	}
@@ -35,62 +33,43 @@ struct ppu_thread_cleaner
 	ppu_thread_cleaner(const ppu_thread_cleaner&) = delete;
 
 	ppu_thread_cleaner& operator=(const ppu_thread_cleaner&) = delete;
-
-	ppu_thread_cleaner& operator=(thread_state state) noexcept
-	{
-		reader_lock lock(id_manager::g_mutex);
-
-		if (old)
-		{
-			// It is detached from IDM now so join must be done explicitly now
-			*static_cast<named_thread<ppu_thread>*>(old.get()) = state;
-		}
-
-		return *this;
-	}
 };
 
-void ppu_thread_exit(ppu_thread& ppu, ppu_opcode_t, be_t<u32>*, struct ppu_intrp_func*)
+bool ppu_thread_exit(ppu_thread& ppu)
 {
 	ppu.state += cpu_flag::exit + cpu_flag::wait;
 
 	// Deallocate Stack Area
 	ensure(vm::dealloc(ppu.stack_addr, vm::stack) == ppu.stack_size);
 
-	if (auto dct = g_fxo->try_get<lv2_memory_container>())
+	if (auto& dct = g_fxo->get<lv2_memory_container>(); !Emu.IsStopped())
 	{
-		dct->free(ppu.stack_size);
+		dct.used -= ppu.stack_size;
 	}
 
 	if (ppu.call_history.index)
 	{
-		ppu_log.notice("Calling history: %s", ppu.call_history);
+		std::string str = fmt::format("%s", ppu.call_history);
 		ppu.call_history.index = 0;
+		ppu_log.notice("Calling history: %s", str);
 	}
 
-	if (ppu.syscall_history.index)
-	{
-		ppu_log.notice("HLE/LV2 history: %s", ppu.syscall_history);
-		ppu.syscall_history.index = 0;
-	}
+	return false;
 }
 
-constexpr u32 c_max_ppu_name_size = 28;
-
 void _sys_ppu_thread_exit(ppu_thread& ppu, u64 errorcode)
 {
 	ppu.state += cpu_flag::wait;
-	u64 writer_mask = 0;
+
+	// Need to wait until the current writer finish
+	if (ppu.state & cpu_flag::memory) vm::g_mutex.lock_unlock();
 
 	sys_ppu_thread.trace("_sys_ppu_thread_exit(errorcode=0x%llx)", errorcode);
 
 	ppu_join_status old_status;
-
-	// Avoid cases where cleaning causes the destructor to be called inside IDM lock scope (for performance)
-	shared_ptr<named_thread<ppu_thread>> old_ppu;
 	{
-		lv2_obj::notify_all_t notify;
-		lv2_obj::prepare_for_sleep(ppu);
+		// Avoid cases where cleaning causes the destructor to be called inside IDM lock scope (for performance)
+		std::shared_ptr<void> old_ppu;
 
 		std::lock_guard lock(id_manager::g_mutex);
 
@@ -116,49 +95,23 @@ void _sys_ppu_thread_exit(ppu_thread& ppu, u64 errorcode)
 		if (old_status != ppu_join_status::joinable)
 		{
 			// Remove self ID from IDM, move owning ptr
-			old_ppu = g_fxo->get<ppu_thread_cleaner>().clean(idm::withdraw<named_thread<ppu_thread>>(ppu.id, 0, std::false_type{}));
+			old_ppu = g_fxo->get<ppu_thread_cleaner>().clean(std::move(idm::find_unlocked<named_thread<ppu_thread>>(ppu.id)->second));
 		}
 
-		// Get writers mask (wait for all current writers to quit)
-		writer_mask = vm::g_range_lock_bits[1];
-
 		// Unqueue
 		lv2_obj::sleep(ppu);
-		notify.cleanup();
 
 		// Remove suspend state (TODO)
 		ppu.state -= cpu_flag::suspend;
 	}
 
-	while (ppu.joiner == ppu_join_status::zombie)
+	while (ppu.joiner == ppu_join_status::zombie && !ppu.is_stopped())
 	{
-		if (ppu.is_stopped() && ppu.joiner.compare_and_swap_test(ppu_join_status::zombie, ppu_join_status::joinable))
-		{
-			// Abort
-			ppu.state += cpu_flag::again;
-			return;
-		}
-
 		// Wait for termination
 		thread_ctrl::wait_on(ppu.joiner, ppu_join_status::zombie);
 	}
 
-	ppu_thread_exit(ppu, {}, nullptr, nullptr);
-
-	if (old_ppu)
-	{
-		// It is detached from IDM now so join must be done explicitly now
-		*old_ppu = thread_state::finished;
-	}
-
-	// Need to wait until the current writers finish
-	if (ppu.state & cpu_flag::memory)
-	{
-		for (; writer_mask; writer_mask &= vm::g_range_lock_bits[1])
-		{
-			busy_wait(200);
-		}
-	}
+	ppu_thread_exit(ppu);
 }
 
 s32 sys_ppu_thread_yield(ppu_thread& ppu)
@@ -167,56 +120,54 @@ s32 sys_ppu_thread_yield(ppu_thread& ppu)
 
 	sys_ppu_thread.trace("sys_ppu_thread_yield()");
 
-	const s32 success = lv2_obj::yield(ppu) ? CELL_OK : CELL_CANCEL;
-
-	if (success == CELL_CANCEL)
-	{
-		// Do other work in the meantime
-		lv2_obj::notify_all();
-	}
-
 	// Return 0 on successful context switch, 1 otherwise
-	return success;
+	return +!lv2_obj::yield(ppu);
 }
 
 error_code sys_ppu_thread_join(ppu_thread& ppu, u32 thread_id, vm::ptr<u64> vptr)
 {
-	lv2_obj::prepare_for_sleep(ppu);
+	ppu.state += cpu_flag::wait;
 
 	sys_ppu_thread.trace("sys_ppu_thread_join(thread_id=0x%x, vptr=*0x%x)", thread_id, vptr);
 
-	if (thread_id == ppu.id)
+	auto thread = idm::get<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread) -> CellError
 	{
-		return CELL_EDEADLK;
-	}
+		if (&ppu == &thread)
+		{
+			return CELL_EDEADLK;
+		}
 
-	auto thread = idm::get<named_thread<ppu_thread>>(thread_id, [&, notify = lv2_obj::notify_all_t()](ppu_thread& thread) -> CellError
-	{
 		CellError result = thread.joiner.atomic_op([&](ppu_join_status& value) -> CellError
 		{
-			switch (value)
+			if (value == ppu_join_status::zombie)
 			{
-			case ppu_join_status::joinable:
-				value = ppu_join_status{ppu.id};
-				return {};
-			case ppu_join_status::zombie:
 				value = ppu_join_status::exited;
 				return CELL_EAGAIN;
-			case ppu_join_status::exited:
+			}
+
+			if (value == ppu_join_status::exited)
+			{
 				return CELL_ESRCH;
-			case ppu_join_status::detached:
-			default:
+			}
+
+			if (value >= ppu_join_status::max)
+			{
 				return CELL_EINVAL;
 			}
+
+			value = ppu_join_status{ppu.id};
+			return {};
 		});
 
 		if (!result)
 		{
-			lv2_obj::prepare_for_sleep(ppu);
 			lv2_obj::sleep(ppu);
 		}
+		else if (result == CELL_EAGAIN)
+		{
+			thread.joiner.notify_one();
+		}
 
-		notify.cleanup();
 		return result;
 	});
 
@@ -230,24 +181,16 @@ error_code sys_ppu_thread_join(ppu_thread& ppu, u32 thread_id, vm::ptr<u64> vptr
 		return thread.ret;
 	}
 
-	if (thread.ret == CELL_EAGAIN)
-	{
-		// Notify thread if waiting for a joiner
-		thread->joiner.notify_one();
-	}
-
 	// Wait for cleanup
 	(*thread.ptr)();
 
 	if (thread->joiner != ppu_join_status::exited)
 	{
 		// Thread aborted, log it later
-		ppu.state += cpu_flag::again;
+		ppu.state += cpu_flag::exit;
 		return {};
 	}
 
-	static_cast<void>(ppu.test_stopped());
-
 	// Get the exit status from the register
 	const u64 vret = thread->gpr[3];
 
@@ -274,39 +217,46 @@ error_code sys_ppu_thread_detach(ppu_thread& ppu, u32 thread_id)
 
 	CellError result = CELL_ESRCH;
 
-	auto [ptr, _] = idm::withdraw<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread)
+	idm::withdraw<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread)
 	{
 		result = thread.joiner.atomic_op([](ppu_join_status& value) -> CellError
 		{
-			switch (value)
+			if (value == ppu_join_status::zombie)
 			{
-			case ppu_join_status::joinable:
-				value = ppu_join_status::detached;
-				return {};
-			case ppu_join_status::detached:
-				return CELL_EINVAL;
-			case ppu_join_status::zombie:
 				value = ppu_join_status::exited;
 				return CELL_EAGAIN;
-			case ppu_join_status::exited:
+			}
+
+			if (value == ppu_join_status::exited)
+			{
 				return CELL_ESRCH;
-			default:
+			}
+
+			if (value == ppu_join_status::detached)
+			{
+				return CELL_EINVAL;
+			}
+
+			if (value >= ppu_join_status::max)
+			{
 				return CELL_EBUSY;
 			}
+
+			value = ppu_join_status::detached;
+			return {};
 		});
 
+		if (result == CELL_EAGAIN)
+		{
+			thread.joiner.notify_one();
+		}
+
 		// Remove ID on EAGAIN
 		return result != CELL_EAGAIN;
-	});
+	}).ptr;
 
 	if (result)
 	{
-		if (result == CELL_EAGAIN)
-		{
-			// Join and notify thread (it is detached from IDM now so it must be done explicitly now)
-			*ptr = thread_state::finished;
-		}
-
 		return result;
 	}
 
@@ -337,20 +287,12 @@ error_code sys_ppu_thread_set_priority(ppu_thread& ppu, u32 thread_id, s32 prio)
 		return CELL_EINVAL;
 	}
 
-	if (thread_id == ppu.id)
+	const auto thread = idm::check<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread)
 	{
-		// Fast path for self
-		if (ppu.prio.load().prio != prio)
+		if (thread.prio != prio)
 		{
-			lv2_obj::set_priority(ppu, prio);
+			lv2_obj::set_priority(thread, prio);
 		}
-
-		return CELL_OK;
-	}
-
-	const auto thread = idm::check<named_thread<ppu_thread>>(thread_id, [&, notify = lv2_obj::notify_all_t()](ppu_thread& thread)
-	{
-		lv2_obj::set_priority(thread, prio);
 	});
 
 	if (!thread)
@@ -366,60 +308,20 @@ error_code sys_ppu_thread_get_priority(ppu_thread& ppu, u32 thread_id, vm::ptr<s
 	ppu.state += cpu_flag::wait;
 
 	sys_ppu_thread.trace("sys_ppu_thread_get_priority(thread_id=0x%x, priop=*0x%x)", thread_id, priop);
-	u32 prio{};
 
-	if (thread_id == ppu.id)
+	u32 prio;
+
+	const auto thread = idm::check<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread)
 	{
-		// Fast path for self
-		for (; !ppu.is_stopped(); std::this_thread::yield())
-		{
-			if (reader_lock lock(lv2_obj::g_mutex); cpu_flag::suspend - ppu.state)
-			{
-				prio = ppu.prio.load().prio;
-				break;
-			}
+		prio = thread.prio;
+	});
 
-			ppu.check_state();
-			ppu.state += cpu_flag::wait;
-		}
-
-		ppu.check_state();
-		*priop = prio;
-		return CELL_OK;
-	}
-
-	for (; !ppu.is_stopped(); std::this_thread::yield())
-	{
-		bool check_state = false;
-		const auto thread = idm::check<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread)
-		{
-			if (reader_lock lock(lv2_obj::g_mutex); cpu_flag::suspend - ppu.state)
-			{
-				prio = thread.prio.load().prio;
-			}
-			else
-			{
-				check_state = true;
-			}
-		});
-
-		if (check_state)
-		{
-			ppu.check_state();
-			ppu.state += cpu_flag::wait;
-			continue;
-		}
-
-		if (!thread)
-		{
-			return CELL_ESRCH;
-		}
-
-		ppu.check_state();
-		*priop = prio;
-		break;
+	if (!thread)
+	{
+		return CELL_ESRCH;
 	}
 
+	*priop = prio;
 	return CELL_OK;
 }
 
@@ -444,7 +346,7 @@ error_code sys_ppu_thread_stop(ppu_thread& ppu, u32 thread_id)
 		return CELL_ENOSYS;
 	}
 
-	const auto thread = idm::check<named_thread<ppu_thread>>(thread_id, [](named_thread<ppu_thread>&) {});
+	const auto thread = idm::check<named_thread<ppu_thread>>(thread_id);
 
 	if (!thread)
 	{
@@ -504,14 +406,14 @@ error_code _sys_ppu_thread_create(ppu_thread& ppu, vm::ptr<u64> thread_id, vm::p
 	// Try to obtain "physical memory" from the default container
 	if (!dct.take(stack_size))
 	{
-		return {CELL_ENOMEM, dct.size - dct.used};
+		return CELL_ENOMEM;
 	}
 
 	const vm::addr_t stack_base{vm::alloc(stack_size, vm::stack, 4096)};
 
 	if (!stack_base)
 	{
-		dct.free(stack_size);
+		dct.used -= stack_size;
 		return CELL_ENOMEM;
 	}
 
@@ -519,13 +421,9 @@ error_code _sys_ppu_thread_create(ppu_thread& ppu, vm::ptr<u64> thread_id, vm::p
 
 	if (threadname)
 	{
-		constexpr u32 max_size = c_max_ppu_name_size - 1; // max size excluding null terminator
-
-		if (!vm::read_string(threadname.addr(), max_size, ppu_name, true))
-		{
-			dct.free(stack_size);
-			return CELL_EFAULT;
-		}
+		constexpr u32 max_size = 27; // max size including null terminator
+		const auto pname = threadname.get_ptr();
+		ppu_name.assign(pname, std::find(pname, pname + max_size, '\0'));
 	}
 
 	const u32 tid = idm::import<named_thread<ppu_thread>>([&]()
@@ -538,20 +436,18 @@ error_code _sys_ppu_thread_create(ppu_thread& ppu, vm::ptr<u64> thread_id, vm::p
 		p.arg0 = arg;
 		p.arg1 = unk;
 
-		return stx::make_shared<named_thread<ppu_thread>>(p, ppu_name, prio, 1 - static_cast<int>(flags & 3));
+		return std::make_shared<named_thread<ppu_thread>>(p, ppu_name, prio, 1 - static_cast<int>(flags & 3));
 	});
 
 	if (!tid)
 	{
 		vm::dealloc(stack_base);
-		dct.free(stack_size);
+		dct.used -= stack_size;
 		return CELL_EAGAIN;
 	}
 
-	sys_ppu_thread.warning("_sys_ppu_thread_create(): Thread \"%s\" created (id=0x%x, func=*0x%x, rtoc=0x%x, user-tls=0x%x)", ppu_name, tid, entry.addr, entry.rtoc, tls);
-
-	ppu.check_state();
 	*thread_id = tid;
+	sys_ppu_thread.warning(u8"_sys_ppu_thread_create(): Thread “%s” created (id=0x%x, func=*0x%x, rtoc=0x%x, user-tls=0x%x)", ppu_name, tid, entry.addr, entry.rtoc, tls);
 	return CELL_OK;
 }
 
@@ -561,7 +457,7 @@ error_code sys_ppu_thread_start(ppu_thread& ppu, u32 thread_id)
 
 	sys_ppu_thread.trace("sys_ppu_thread_start(thread_id=0x%x)", thread_id);
 
-	const auto thread = idm::get<named_thread<ppu_thread>>(thread_id, [&, notify = lv2_obj::notify_all_t()](ppu_thread& thread) -> CellError
+	const auto thread = idm::get<named_thread<ppu_thread>>(thread_id, [&](ppu_thread& thread) -> CellError
 	{
 		if (!thread.state.test_and_reset(cpu_flag::stop))
 		{
@@ -569,11 +465,11 @@ error_code sys_ppu_thread_start(ppu_thread& ppu, u32 thread_id)
 			return CELL_EBUSY;
 		}
 
-		ensure(lv2_obj::awake(&thread));
+		lv2_obj::awake(&thread);
 
 		thread.cmd_list
 		({
-			{ppu_cmd::entry_call, 0},
+			{ppu_cmd::opd_call, 0}, thread.entry_func
 		});
 
 		return {};
@@ -590,8 +486,33 @@ error_code sys_ppu_thread_start(ppu_thread& ppu, u32 thread_id)
 	}
 	else
 	{
-		thread->cmd_notify.store(1);
+		thread->cmd_notify++;
 		thread->cmd_notify.notify_one();
+
+		// Dirty hack for sound: confirm the creation of _mxr000 event queue
+		if (*thread->ppu_tname.load() == "_cellsurMixerMain"sv)
+		{
+			lv2_obj::sleep(ppu);
+
+			while (!idm::select<lv2_obj, lv2_event_queue>([](u32, lv2_event_queue& eq)
+			{
+				//some games do not set event queue name, though key seems constant for them
+				return (eq.name == "_mxr000\0"_u64) || (eq.key == 0x8000cafe02460300);
+			}))
+			{
+				if (ppu.is_stopped())
+				{
+					return {};
+				}
+
+				thread_ctrl::wait_for(50000);
+			}
+
+			if (ppu.test_stopped())
+			{
+				return 0;
+			}
+		}
 	}
 
 	return CELL_OK;
@@ -603,7 +524,7 @@ error_code sys_ppu_thread_rename(ppu_thread& ppu, u32 thread_id, vm::cptr<char>
 
 	sys_ppu_thread.warning("sys_ppu_thread_rename(thread_id=0x%x, name=*0x%x)", thread_id, name);
 
-	const auto thread = idm::get_unlocked<named_thread<ppu_thread>>(thread_id);
+	const auto thread = idm::get<named_thread<ppu_thread>>(thread_id);
 
 	if (!thread)
 	{
@@ -615,19 +536,14 @@ error_code sys_ppu_thread_rename(ppu_thread& ppu, u32 thread_id, vm::cptr<char>
 		return CELL_EFAULT;
 	}
 
-	constexpr u32 max_size = c_max_ppu_name_size - 1; // max size excluding null terminator
+	constexpr u32 max_size = 27; // max size including null terminator
+	const auto pname = name.get_ptr();
 
 	// Make valid name
-	std::string out_str;
-	if (!vm::read_string(name.addr(), max_size, out_str, true))
-	{
-		return CELL_EFAULT;
-	}
-
-	auto _name = make_single<std::string>(std::move(out_str));
+	auto _name = make_single<std::string>(pname, std::find(pname, pname + max_size, '\0'));
 
 	// thread_ctrl name is not changed (TODO)
-	sys_ppu_thread.warning("sys_ppu_thread_rename(): Thread renamed to \"%s\"", *_name);
+	sys_ppu_thread.warning(u8"sys_ppu_thread_rename(): Thread renamed to “%s”", *_name);
 	thread->ppu_tname.store(std::move(_name));
 	thread_ctrl::set_name(*thread, thread->thread_name); // TODO: Currently sets debugger thread name only for local thread
 
@@ -640,7 +556,7 @@ error_code sys_ppu_thread_recover_page_fault(ppu_thread& ppu, u32 thread_id)
 
 	sys_ppu_thread.warning("sys_ppu_thread_recover_page_fault(thread_id=0x%x)", thread_id);
 
-	const auto thread = idm::get_unlocked<named_thread<ppu_thread>>(thread_id);
+	const auto thread = idm::get<named_thread<ppu_thread>>(thread_id);
 
 	if (!thread)
 	{
@@ -656,7 +572,7 @@ error_code sys_ppu_thread_get_page_fault_context(ppu_thread& ppu, u32 thread_id,
 
 	sys_ppu_thread.todo("sys_ppu_thread_get_page_fault_context(thread_id=0x%x, ctxt=*0x%x)", thread_id, ctxt);
 
-	const auto thread = idm::get_unlocked<named_thread<ppu_thread>>(thread_id);
+	const auto thread = idm::get<named_thread<ppu_thread>>(thread_id);
 
 	if (!thread)
 	{
diff --git a/rpcs3/Emu/Cell/lv2/sys_process.cpp b/rpcs3/Emu/Cell/lv2/sys_process.cpp
index b914408ec9..42570d9dcc 100644
--- a/rpcs3/Emu/Cell/lv2/sys_process.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_process.cpp
@@ -44,7 +44,7 @@ bool ps3_process_info_t::has_debug_perm() const
 	return (ctrl_flags1 & (0xa << 28)) != 0;
 }
 
-// If a SELF file is of CellOS return its filename, otheriwse return an empty string
+// If a SELF file is of CellOS return its filename, otheriwse return an empty string 
 std::string_view ps3_process_info_t::get_cellos_appname() const
 {
 	if (!has_root_perm() || !Emu.GetTitleID().empty())
@@ -231,7 +231,7 @@ CellError process_is_spu_lock_line_reservation_address(u32 addr, u64 flags)
 		return CELL_EPERM;
 	default:
 	{
-		if (auto vm0 = idm::get_unlocked<sys_vm_t>(sys_vm_t::find_id(addr)))
+		if (auto vm0 = idm::get<sys_vm_t>(sys_vm_t::find_id(addr & -0x1000'0000)))
 		{
 			// sys_vm area was not covering the address specified but made a reservation on the entire 256mb region
 			if (vm0->addr + vm0->size - 1 < addr)
@@ -271,7 +271,7 @@ error_code _sys_process_get_paramsfo(vm::ptr<char> buffer)
 {
 	sys_process.warning("_sys_process_get_paramsfo(buffer=0x%x)", buffer);
 
-	if (Emu.GetTitleID().empty())
+	if (!Emu.GetTitleID().length())
 	{
 		return CELL_ENOENT;
 	}
@@ -340,19 +340,16 @@ error_code sys_process_detach_child(u64 unk)
 	return CELL_OK;
 }
 
-extern void signal_system_cache_can_stay();
-
 void _sys_process_exit(ppu_thread& ppu, s32 status, u32 arg2, u32 arg3)
 {
 	ppu.state += cpu_flag::wait;
 
 	sys_process.warning("_sys_process_exit(status=%d, arg2=0x%x, arg3=0x%x)", status, arg2, arg3);
 
-	Emu.CallFromMainThread([]()
+	Emu.CallAfter([]()
 	{
 		sys_process.success("Process finished");
-		signal_system_cache_can_stay();
-		Emu.Kill();
+		Emu.Stop();
 	});
 
 	// Wait for GUI thread
@@ -363,7 +360,7 @@ void _sys_process_exit(ppu_thread& ppu, s32 status, u32 arg2, u32 arg3)
 			break;
 		}
 
-		ppu.state.wait(state);
+		thread_ctrl::wait_on(ppu.state, state);
 	}
 }
 
@@ -405,103 +402,40 @@ void _sys_process_exit2(ppu_thread& ppu, s32 status, vm::ptr<sys_exit2_param> ar
 
 	// TODO: set prio, flags
 
-	lv2_exitspawn(ppu, argv, envp, data);
-}
+	std::string path = vfs::get(argv[0]);
+	std::string hdd1 = vfs::get("/dev_hdd1/");
+	std::string disc;
 
-void lv2_exitspawn(ppu_thread& ppu, std::vector<std::string>& argv, std::vector<std::string>& envp, std::vector<u8>& data)
-{
-	ppu.state += cpu_flag::wait;
+	if (Emu.GetCat() == "DG" || Emu.GetCat() == "GD")
+		disc = vfs::get("/dev_bdvd/");
+	if (disc.empty() && !Emu.GetTitleID().empty())
+		disc = vfs::get(Emu.GetDir());
 
-	// sys_sm_shutdown
-	const bool is_real_reboot = (ppu.gpr[11] == 379);
-
-	Emu.CallFromMainThread([is_real_reboot, argv = std::move(argv), envp = std::move(envp), data = std::move(data)]() mutable
+	Emu.CallAfter([path = std::move(path), argv = std::move(argv), envp = std::move(envp), data = std::move(data), disc = std::move(disc), hdd1 = std::move(hdd1), klic = g_fxo->get<loaded_npdrm_keys>().devKlic.load()]() mutable
 	{
 		sys_process.success("Process finished -> %s", argv[0]);
+		Emu.SetForceBoot(true);
+		Emu.Stop();
+		Emu.argv = std::move(argv);
+		Emu.envp = std::move(envp);
+		Emu.data = std::move(data);
+		Emu.disc = std::move(disc);
+		Emu.hdd1 = std::move(hdd1);
 
-		std::string disc;
-
-		if (Emu.GetCat() == "DG" || Emu.GetCat() == "GD")
-			disc = vfs::get("/dev_bdvd/");
-		if (disc.empty() && !Emu.GetTitleID().empty())
-			disc = vfs::get(Emu.GetDir());
-
-		std::string path = vfs::get(argv[0]);
-		std::string hdd1 = vfs::get("/dev_hdd1/");
-
-		const u128 klic = g_fxo->get<loaded_npdrm_keys>().last_key();
-
-		using namespace id_manager;
-
-		shared_ptr<utils::serial> idm_capture = make_shared<utils::serial>();
-
-		if (!is_real_reboot)
+		if (klic)
 		{
-			reader_lock rlock{id_manager::g_mutex};
-			g_fxo->get<id_map<lv2_memory_container>>().save(*idm_capture);
-			stx::serial_breathe_and_tag(*idm_capture, "id_map<lv2_memory_container>", false);
+			Emu.klic.emplace_back(klic);
 		}
 
-		idm_capture->set_reading_state();
+		Emu.SetForceBoot(true);
 
-		auto func = [is_real_reboot, old_size = g_fxo->get<lv2_memory_container>().size, idm_capture](u32 sdk_suggested_mem) mutable
+		auto res = Emu.BootGame(path, "", true);
+
+		if (res != game_boot_result::no_errors)
 		{
-			if (is_real_reboot)
-			{
-				// Do not save containers on actual reboot
-				ensure(g_fxo->init<id_map<lv2_memory_container>>());
-			}
-			else
-			{
-				// Save LV2 memory containers
-				ensure(g_fxo->init<id_map<lv2_memory_container>>(*idm_capture));
-			}
-
-			// Empty the containers, accumulate their total size
-			u32 total_size = 0;
-			idm::select<lv2_memory_container>([&](u32, lv2_memory_container& ctr)
-			{
-				ctr.used = 0;
-				total_size += ctr.size;
-			});
-
-			// The default memory container capacity can only decrease after exitspawn
-			// 1. If newer SDK version suggests higher memory capacity - it is ignored
-			// 2. If newer SDK version suggests lower memory capacity - it is lowered
-			// And if 2. happens while user memory containers exist, the left space can be spent on user memory containers
-			ensure(g_fxo->init<lv2_memory_container>(std::min(old_size - total_size, sdk_suggested_mem) + total_size));
-		};
-
-		Emu.after_kill_callback = [func = std::move(func), argv = std::move(argv), envp = std::move(envp), data = std::move(data),
-			disc = std::move(disc), path = std::move(path), hdd1 = std::move(hdd1), old_config = Emu.GetUsedConfig(), klic]() mutable
-		{
-			Emu.argv = std::move(argv);
-			Emu.envp = std::move(envp);
-			Emu.data = std::move(data);
-			Emu.disc = std::move(disc);
-			Emu.hdd1 = std::move(hdd1);
-			Emu.init_mem_containers = std::move(func);
-
-			if (klic)
-			{
-				Emu.klic.emplace_back(klic);
-			}
-
-			Emu.SetForceBoot(true);
-
-			auto res = Emu.BootGame(path, "", true, cfg_mode::continuous, old_config);
-
-			if (res != game_boot_result::no_errors)
-			{
-				sys_process.fatal("Failed to boot from exitspawn! (path=\"%s\", error=%s)", path, res);
-			}
-		};
-
-		signal_system_cache_can_stay();
-
-		// Make sure we keep the game window opened
-		Emu.SetContinuousMode(true);
-		Emu.Kill(false);
+			sys_process.fatal("Failed to boot from exitspawn! (path=\"%s\", error=%s)", path, res);
+			Emu.Stop();
+		}
 	});
 
 	// Wait for GUI thread
@@ -512,19 +446,10 @@ void lv2_exitspawn(ppu_thread& ppu, std::vector<std::string>& argv, std::vector<
 			break;
 		}
 
-		ppu.state.wait(state);
+		thread_ctrl::wait_on(ppu.state, state);
 	}
 }
 
-void sys_process_exit3(ppu_thread& ppu, s32 status)
-{
-	ppu.state += cpu_flag::wait;
-
-	sys_process.warning("_sys_process_exit3(status=%d)", status);
-
-	return _sys_process_exit(ppu, status, 0, 0);
-}
-
 error_code sys_process_spawns_a_self2(vm::ptr<u32> pid, u32 primary_prio, u64 flags, vm::ptr<void> stack, u32 stack_size, u32 mem_id, vm::ptr<void> param_sfo, vm::ptr<void> dbg_data)
 {
 	sys_process.todo("sys_process_spawns_a_self2(pid=*0x%x, primary_prio=0x%x, flags=0x%llx, stack=*0x%x, stack_size=0x%x, mem_id=0x%x, param_sfo=*0x%x, dbg_data=*0x%x"
diff --git a/rpcs3/Emu/Cell/lv2/sys_process.h b/rpcs3/Emu/Cell/lv2/sys_process.h
index 774384567b..9624c57510 100644
--- a/rpcs3/Emu/Cell/lv2/sys_process.h
+++ b/rpcs3/Emu/Cell/lv2/sys_process.h
@@ -26,7 +26,6 @@ enum : u32
 	SYS_FS_FD_OBJECT                 = 0x73,
 	SYS_LWCOND_OBJECT                = 0x97,
 	SYS_EVENT_FLAG_OBJECT            = 0x98,
-	SYS_RSXAUDIO_OBJECT              = 0x60,
 };
 
 enum : u64
@@ -101,7 +100,6 @@ extern ps3_process_info_t  g_ps3_process_info;
 // Auxiliary functions
 s32 process_getpid();
 s32 process_get_sdk_version(u32 pid, s32& ver);
-void lv2_exitspawn(ppu_thread& ppu, std::vector<std::string>& argv, std::vector<std::string>& envp, std::vector<u8>& data);
 
 enum CellError : u32;
 CellError process_is_spu_lock_line_reservation_address(u32 addr, u64 flags);
@@ -122,5 +120,4 @@ error_code sys_process_wait_for_child2(u64 unk1, u64 unk2, u64 unk3, u64 unk4, u
 error_code sys_process_detach_child(u64 unk);
 void _sys_process_exit(ppu_thread& ppu, s32 status, u32 arg2, u32 arg3);
 void _sys_process_exit2(ppu_thread& ppu, s32 status, vm::ptr<sys_exit2_param> arg, u32 arg_size, u32 arg4);
-void sys_process_exit3(ppu_thread& ppu, s32 status);
 error_code sys_process_spawns_a_self2(vm::ptr<u32> pid, u32 primary_prio, u64 flags, vm::ptr<void> stack, u32 stack_size, u32 mem_id, vm::ptr<void> param_sfo, vm::ptr<void> dbg_data);
diff --git a/rpcs3/Emu/Cell/lv2/sys_prx.cpp b/rpcs3/Emu/Cell/lv2/sys_prx.cpp
index 046d19c48e..fee8494cde 100644
--- a/rpcs3/Emu/Cell/lv2/sys_prx.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_prx.cpp
@@ -1,14 +1,12 @@
 #include "stdafx.h"
 #include "sys_prx.h"
 
-#include "Emu/System.h"
-#include "Emu/system_config.h"
 #include "Emu/VFS.h"
 #include "Emu/IdManager.h"
 #include "Crypto/unself.h"
 #include "Loader/ELF.h"
 
-#include "Emu/Cell/PPUThread.h"
+#include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/ErrorCodes.h"
 #include "Crypto/unedat.h"
 #include "Utilities/StrUtil.h"
@@ -17,13 +15,10 @@
 #include "sys_memory.h"
 #include <span>
 
-extern void dump_executable(std::span<const u8> data, const ppu_module<lv2_obj>* _module, std::string_view title_id);
-
-extern shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object&, bool virtual_load, const std::string&, s64, utils::serial* = nullptr);
+extern std::shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object&, const std::string&, s64);
 extern void ppu_unload_prx(const lv2_prx& prx);
-extern bool ppu_initialize(const ppu_module<lv2_obj>&, bool check_only = false, u64 file_size = 0);
-extern void ppu_finalize(const ppu_module<lv2_obj>& info, bool force_mem_release = false);
-extern void ppu_manual_load_imports_exports(u32 imports_start, u32 imports_size, u32 exports_start, u32 exports_size, std::basic_string<char>& loaded_flags);
+extern bool ppu_initialize(const ppu_module&, bool = false);
+extern void ppu_finalize(const ppu_module&);
 
 LOG_CHANNEL(sys_prx);
 
@@ -35,7 +30,7 @@ extern const std::map<std::string_view, int> g_prx_list
 	{ "libaacenc_spurs.sprx", 0 },
 	{ "libac3dec.sprx", 0 },
 	{ "libac3dec2.sprx", 0 },
-	{ "libadec.sprx", 1 },
+	{ "libadec.sprx", 0 },
 	{ "libadec2.sprx", 0 },
 	{ "libadec_internal.sprx", 0 },
 	{ "libad_async.sprx", 0 },
@@ -47,7 +42,7 @@ extern const std::map<std::string_view, int> g_prx_list
 	{ "libat3multidec.sprx", 0 },
 	{ "libatrac3multi.sprx", 0 },
 	{ "libatrac3plus.sprx", 0 },
-	{ "libatxdec.sprx", 1 },
+	{ "libatxdec.sprx", 0 },
 	{ "libatxdec2.sprx", 0 },
 	{ "libaudio.sprx", 1 },
 	{ "libavcdec.sprx", 0 },
@@ -98,11 +93,11 @@ extern const std::map<std::string_view, int> g_prx_list
 	{ "libmvcdec.sprx", 0 },
 	{ "libnet.sprx", 0 },
 	{ "libnetctl.sprx", 1 },
-	{ "libpamf.sprx", 1 },
+	{ "libpamf.sprx", 0 },
 	{ "libpngdec.sprx", 0 },
 	{ "libpngenc.sprx", 0 },
 	{ "libresc.sprx", 0 },
-	{ "librtc.sprx", 1 },
+	{ "librtc.sprx", 0 },
 	{ "librudp.sprx", 0 },
 	{ "libsail.sprx", 0 },
 	{ "libsail_avi.sprx", 0 },
@@ -175,8 +170,6 @@ extern const std::map<std::string_view, int> g_prx_list
 	{ "libwmadec.sprx", 0 },
 };
 
-bool ppu_register_library_lock(std::string_view libname, bool lock_lib);
-
 static error_code prx_load_module(const std::string& vpath, u64 flags, vm::ptr<sys_prx_load_module_option_t> /*pOpt*/, fs::file src = {}, s64 file_offset = 0)
 {
 	if (flags != 0)
@@ -195,8 +188,18 @@ static error_code prx_load_module(const std::string& vpath, u64 flags, vm::ptr<s
 	}
 
 	std::string vpath0;
-	std::string path = vfs::get(vpath, nullptr, &vpath0);
-	std::string name = vpath0.substr(vpath0.find_last_of('/') + 1);
+	const std::string path = vfs::get(vpath, nullptr, &vpath0);
+	const std::string name = vpath0.substr(vpath0.find_last_of('/') + 1);
+
+	const auto existing = idm::select<lv2_obj, lv2_prx>([&](u32, lv2_prx& prx)
+	{
+		return prx.path == path && prx.offset == file_offset;
+	});
+
+	if (existing)
+	{
+		return CELL_PRX_ERROR_LIBRARY_FOUND;
+	}
 
 	bool ignore = false;
 
@@ -218,14 +221,14 @@ static error_code prx_load_module(const std::string& vpath, u64 flags, vm::ptr<s
 		else
 		{
 			// Use list
-			ignore = ::at32(g_prx_list, name) != 0;
+			ignore = g_prx_list.at(name) != 0;
 		}
 	}
 	else if (vpath0.starts_with("/"))
 	{
 		// Special case : HLE for files outside of "/dev_flash/sys/external/"
 		// Have to specify full path for them
-		ignore = g_prx_list.count(vpath0) && ::at32(g_prx_list, vpath0);
+		ignore = g_prx_list.count(vpath0) && g_prx_list.at(vpath0);
 	}
 
 	auto hle_load = [&]()
@@ -235,7 +238,7 @@ static error_code prx_load_module(const std::string& vpath, u64 flags, vm::ptr<s
 		prx->name = std::move(name);
 		prx->path = std::move(path);
 
-		sys_prx.warning("Ignored module: \"%s\" (id=0x%x)", vpath, idm::last_id());
+		sys_prx.warning(u8"Ignored module: “%s” (id=0x%x)", vpath, idm::last_id());
 
 		return not_an_error(idm::last_id());
 	};
@@ -253,7 +256,7 @@ static error_code prx_load_module(const std::string& vpath, u64 flags, vm::ptr<s
 		{
 			if (fs_error + 0u == CELL_ENOENT && is_firmware_sprx)
 			{
-				sys_prx.error("firmware SPRX not found: \"%s\" (forcing HLE implementation)", vpath, idm::last_id());
+				sys_prx.error(u8"firmware SPRX not found: “%s” (forcing HLE implementation)", vpath, idm::last_id());
 				return hle_load();
 			}
 
@@ -263,31 +266,16 @@ static error_code prx_load_module(const std::string& vpath, u64 flags, vm::ptr<s
 		src = std::move(lv2_file);
 	}
 
-	u128 klic = g_fxo->get<loaded_npdrm_keys>().last_key();
+	u128 klic = g_fxo->get<loaded_npdrm_keys>().devKlic.load();
 
-	src = decrypt_self(std::move(src), reinterpret_cast<u8*>(&klic));
-
-	if (!src)
-	{
-		return {CELL_PRX_ERROR_UNSUPPORTED_PRX_TYPE, +"Failed to decrypt file"};
-	}
-
-	const auto src_data = g_cfg.core.ppu_debug ? src.to_vector<u8>() : std::vector<u8>{};
-
-	ppu_prx_object obj = std::move(src);
-	src.close();
+	ppu_prx_object obj = decrypt_self(std::move(src), reinterpret_cast<u8*>(&klic));
 
 	if (obj != elf_error::ok)
 	{
-		return {CELL_PRX_ERROR_UNSUPPORTED_PRX_TYPE, obj.get_error()};
+		return CELL_PRX_ERROR_ILLEGAL_LIBRARY;
 	}
 
-	const auto prx = ppu_load_prx(obj, false, path, file_offset);
-
-	if (g_cfg.core.ppu_debug)
-	{
-		dump_executable({src_data.data(), src_data.size()}, prx.get(), Emu.GetTitleID());
-	}
+	const auto prx = ppu_load_prx(obj, path, file_offset);
 
 	obj.clear();
 
@@ -298,105 +286,11 @@ static error_code prx_load_module(const std::string& vpath, u64 flags, vm::ptr<s
 
 	ppu_initialize(*prx);
 
-	sys_prx.success("Loaded module: \"%s\" (id=0x%x)", vpath, idm::last_id());
+	sys_prx.success(u8"Loaded module: “%s” (id=0x%x)", vpath, idm::last_id());
 
 	return not_an_error(idm::last_id());
 }
 
-fs::file make_file_view(fs::file&& file, u64 offset, u64 size);
-
-std::function<void(void*)> lv2_prx::load(utils::serial& ar)
-{
-	[[maybe_unused]] const s32 version = GET_SERIALIZATION_VERSION(lv2_prx_overlay);
-
-	const std::string path = vfs::get(ar.pop<std::string>());
-	const s64 offset = ar;
-	const u32 state = ar;
-
-	usz seg_count = 0;
-	ar.deserialize_vle(seg_count);
-
-	shared_ptr<lv2_prx> prx;
-
-	auto hle_load = [&]()
-	{
-		prx = make_shared<lv2_prx>();
-		prx->path = path;
-		prx->name = path.substr(path.find_last_of(fs::delim) + 1);
-	};
-
-	if (seg_count)
-	{
-		std::basic_string<char> loaded_flags, external_flags;
-
-		ar(loaded_flags, external_flags);
-
-		fs::file file{path.substr(0, path.size() - (offset ? fmt::format("_x%x", offset).size() : 0))};
-
-		if (file)
-		{
-			u128 klic = g_fxo->get<loaded_npdrm_keys>().last_key();
-			file = make_file_view(std::move(file), offset, umax);
-			prx = ppu_load_prx(ppu_prx_object{decrypt_self(std::move(file), reinterpret_cast<u8*>(&klic))}, false, path, 0, &ar);
-			prx->m_loaded_flags = std::move(loaded_flags);
-			prx->m_external_loaded_flags = std::move(external_flags);
-
-			if (state <= PRX_STATE_STARTED)
-			{
-				prx->restore_exports();
-			}
-
-			ensure(prx);
-		}
-		else
-		{
-			ensure(g_cfg.savestate.state_inspection_mode.get());
-
-			hle_load();
-
-			// Partially recover information
-			for (usz i = 0; i < seg_count; i++)
-			{
-				auto& seg = prx->segs.emplace_back();
-				seg.addr = ar;
-				seg.size = 1; // TODO
-			}
-		}
-	}
-	else
-	{
-		hle_load();
-	}
-
-	prx->state = state;
-
-	return [prx](void* storage)
-	{
-		*static_cast<atomic_ptr<lv2_obj>*>(storage) = prx;
-	};
-}
-
-void lv2_prx::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(lv2_prx_overlay);
-
-	ar(vfs::retrieve(path), offset, state);
-
-	// Save segments count
-	ar.serialize_vle(segs.size());
-
-	if (!segs.empty())
-	{
-		ar(m_loaded_flags);
-		ar(m_external_loaded_flags);
-	}
-
-	for (const ppu_segment& seg : segs)
-	{
-		if (seg.type == 0x1u && seg.size) ar(seg.addr);
-	}
-}
-
 error_code sys_prx_get_ppu_guid(ppu_thread& ppu)
 {
 	ppu.state += cpu_flag::wait;
@@ -411,7 +305,7 @@ error_code _sys_prx_load_module_by_fd(ppu_thread& ppu, s32 fd, u64 offset, u64 f
 
 	sys_prx.warning("_sys_prx_load_module_by_fd(fd=%d, offset=0x%x, flags=0x%x, pOpt=*0x%x)", fd, offset, flags, pOpt);
 
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
+	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
 
 	if (!file)
 	{
@@ -523,7 +417,7 @@ error_code _sys_prx_start_module(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<sys
 		return CELL_EINVAL;
 	}
 
-	const auto prx = idm::get_unlocked<lv2_obj, lv2_prx>(id);
+	const auto prx = idm::get<lv2_obj, lv2_prx>(id);
 
 	if (!prx)
 	{
@@ -534,19 +428,12 @@ error_code _sys_prx_start_module(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<sys
 	{
 	case 1:
 	{
-		std::lock_guard lock(prx->mutex);
-
 		if (!prx->state.compare_and_swap_test(PRX_STATE_INITIALIZED, PRX_STATE_STARTING))
 		{
-			if (prx->state == PRX_STATE_DESTROYED)
-			{
-				return CELL_ESRCH;
-			}
-
+			// The only error code here
 			return CELL_PRX_ERROR_ERROR;
 		}
 
-		prx->load_exports();
 		break;
 	}
 	case 2:
@@ -568,7 +455,6 @@ error_code _sys_prx_start_module(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<sys
 
 				// Thread-safe if called from liblv2.sprx, due to internal lwmutex lock before it
 				prx->state = PRX_STATE_STOPPED;
-				prx->unload_exports();
 				_sys_prx_unload_module(ppu, id, 0, vm::null);
 
 				// Return the exact value returned by the start function (as an error)
@@ -586,15 +472,8 @@ error_code _sys_prx_start_module(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<sys
 		return CELL_PRX_ERROR_ERROR;
 	}
 
-	ppu.check_state();
 	pOpt->entry.set(prx->start ? prx->start.addr() : ~0ull);
-
-	// This check is probably for older fw
-	if (pOpt->size != 0x20u)
-	{
-		pOpt->entry2.set(prx->prologue ? prx->prologue.addr() : ~0ull);
-	}
-
+	pOpt->entry2.set(prx->prologue ? prx->prologue.addr() : ~0ull);
 	return CELL_OK;
 }
 
@@ -604,7 +483,7 @@ error_code _sys_prx_stop_module(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<sys_
 
 	sys_prx.warning("_sys_prx_stop_module(id=0x%x, flags=0x%x, pOpt=*0x%x)", id, flags, pOpt);
 
-	const auto prx = idm::get_unlocked<lv2_obj, lv2_prx>(id);
+	const auto prx = idm::get<lv2_obj, lv2_prx>(id);
 
 	if (!prx)
 	{
@@ -616,14 +495,6 @@ error_code _sys_prx_stop_module(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<sys_
 		return CELL_EINVAL;
 	}
 
-	auto set_entry2 = [&](u64 addr)
-	{
-		if (pOpt->size != 0x20u)
-		{
-			pOpt->entry2.set(addr);
-		}
-	};
-
 	switch (pOpt->cmd & 0xf)
 	{
 	case 1:
@@ -634,15 +505,13 @@ error_code _sys_prx_stop_module(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<sys_
 		case PRX_STATE_STOPPED: return CELL_PRX_ERROR_ALREADY_STOPPED;
 		case PRX_STATE_STOPPING: return CELL_PRX_ERROR_ALREADY_STOPPING; // Internal error
 		case PRX_STATE_STARTING: return CELL_PRX_ERROR_ERROR; // Internal error
-		case PRX_STATE_DESTROYED: return CELL_ESRCH;
 		case PRX_STATE_STARTED: break;
 		default:
 			fmt::throw_exception("Invalid prx state (%d)", old);
 		}
 
-		ppu.check_state();
 		pOpt->entry.set(prx->stop ? prx->stop.addr() : ~0ull);
-		set_entry2(prx->epilogue ? prx->epilogue.addr() : ~0ull);
+		pOpt->entry2.set(prx->epilogue ? prx->epilogue.addr() : ~0ull);
 		return CELL_OK;
 	}
 	case 2:
@@ -652,11 +521,6 @@ error_code _sys_prx_stop_module(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<sys_
 		case 0:
 		{
 			// No error code on invalid state, so throw on unexpected state
-			std::lock_guard lock(prx->mutex);
-			ensure(prx->exports_end <= prx->exports_start || (prx->state == PRX_STATE_STOPPING));
-
-			prx->unload_exports();
-
 			ensure(prx->state.compare_and_swap_test(PRX_STATE_STOPPING, PRX_STATE_STOPPED));
 			return CELL_OK;
 		}
@@ -678,7 +542,6 @@ error_code _sys_prx_stop_module(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<sys_
 		case PRX_STATE_STOPPED: return CELL_PRX_ERROR_ALREADY_STOPPED;
 		case PRX_STATE_STOPPING: return CELL_PRX_ERROR_ALREADY_STOPPING; // Internal error
 		case PRX_STATE_STARTING: return CELL_PRX_ERROR_ERROR; // Internal error
-		case PRX_STATE_DESTROYED: return CELL_ESRCH;
 		case PRX_STATE_STARTED: break;
 		default:
 			fmt::throw_exception("Invalid prx state (%d)", old);
@@ -686,9 +549,8 @@ error_code _sys_prx_stop_module(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<sys_
 
 		if (pOpt->cmd == 4u)
 		{
-			ppu.check_state();
 			pOpt->entry.set(prx->stop ? prx->stop.addr() : ~0ull);
-			set_entry2(prx->epilogue ? prx->epilogue.addr() : ~0ull);
+			pOpt->entry2.set(prx->epilogue ? prx->epilogue.addr() : ~0ull);
 		}
 		else
 		{
@@ -711,16 +573,7 @@ error_code _sys_prx_unload_module(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<sy
 	// Get the PRX, free the used memory and delete the object and its ID
 	const auto prx = idm::withdraw<lv2_obj, lv2_prx>(id, [](lv2_prx& prx) -> CellPrxError
 	{
-		switch (prx.state.fetch_op([](u32& value)
-		{
-			if (value == PRX_STATE_INITIALIZED || value == PRX_STATE_STOPPED)
-			{
-				value = PRX_STATE_DESTROYED;
-				return true;
-			}
-
-			return false;
-		}).first)
+		switch (prx.state)
 		{
 		case PRX_STATE_INITIALIZED:
 		case PRX_STATE_STOPPED:
@@ -743,8 +596,6 @@ error_code _sys_prx_unload_module(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<sy
 
 	sys_prx.success("_sys_prx_unload_module(id=0x%x, flags=0x%x, pOpt=*0x%x): name='%s'", id, flags, pOpt, prx->name);
 
-	prx->mutex.lock_unlock();
-
 	ppu_unload_prx(*prx);
 
 	ppu_finalize(*prx);
@@ -754,56 +605,7 @@ error_code _sys_prx_unload_module(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<sy
 	return CELL_OK;
 }
 
-void lv2_prx::load_exports()
-{
-	if (exports_end <= exports_start)
-	{
-		// Nothing to load
-		return;
-	}
-
-	if (!m_loaded_flags.empty())
-	{
-		// Already loaded
-		return;
-	}
-
-	ppu_manual_load_imports_exports(0, 0, exports_start, exports_end - exports_start, m_loaded_flags);
-}
-
-void lv2_prx::restore_exports()
-{
-	constexpr usz sizeof_export_data = 0x1C;
-
-	std::basic_string<char> loaded_flags_empty;
-
-	for (u32 start = exports_start, i = 0; start < exports_end; i++, start += vm::read8(start) ? vm::read8(start) : sizeof_export_data)
-	{
-		if (::at32(m_external_loaded_flags, i) || (!m_loaded_flags.empty() && ::at32(m_loaded_flags, i)))
-		{
-			loaded_flags_empty.clear();
-			ppu_manual_load_imports_exports(0, 0, start, sizeof_export_data, loaded_flags_empty);
-		}
-	}
-}
-
-void lv2_prx::unload_exports()
-{
-	if (m_loaded_flags.empty())
-	{
-		// Not loaded
-		return;
-	}
-
-	std::basic_string<char> merged = m_loaded_flags;
-
-	for (usz i = 0; i < merged.size(); i++)
-	{
-		merged[i] |= ::at32(m_external_loaded_flags, i);
-	}
-
-	ppu_manual_load_imports_exports(0, 0, exports_start, exports_end - exports_start, merged);
-}
+void ppu_manual_load_imports_exports(u32 imports_start, u32 imports_size, u32 exports_start, u32 exports_size);
 
 error_code _sys_prx_register_module(ppu_thread& ppu, vm::cptr<char> name, vm::ptr<void> opt)
 {
@@ -850,9 +652,9 @@ error_code _sys_prx_register_module(ppu_thread& ppu, vm::cptr<char> name, vm::pt
 
 	if (info.type & 0x1)
 	{
-		if (Emu.IsVsh())
+		if (g_ps3_process_info.get_cellos_appname() == "vsh.self"sv)
 		{
-			ppu_manual_load_imports_exports(info.lib_stub_ea.addr(), info.lib_stub_size, info.lib_entries_ea.addr(), info.lib_entries_size, *std::make_unique<std::basic_string<char>>());
+			ppu_manual_load_imports_exports(info.lib_stub_ea.addr(), info.lib_stub_size, info.lib_entries_ea.addr(), info.lib_entries_size);
 		}
 		else
 		{
@@ -876,46 +678,7 @@ error_code _sys_prx_register_library(ppu_thread& ppu, vm::ptr<void> library)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_prx.notice("_sys_prx_register_library(library=*0x%x)", library);
-
-	if (!vm::check_addr(library.addr()))
-	{
-		return CELL_EFAULT;
-	}
-
-	constexpr u32 sizeof_lib = 0x1c;
-
-	std::array<char, sizeof_lib> mem_copy{};
-	std::memcpy(mem_copy.data(), library.get_ptr(), sizeof_lib);
-
-	std::basic_string<char> flags;
-	ppu_manual_load_imports_exports(0, 0, library.addr(), sizeof_lib, flags);
-
-	if (flags.front())
-	{
-		const bool success = idm::select<lv2_obj, lv2_prx>([&](u32 /*id*/, lv2_prx& prx)
-		{
-			if (prx.state == PRX_STATE_INITIALIZED)
-			{
-				for (u32 lib_addr = prx.exports_start, index = 0; lib_addr < prx.exports_end; index++, lib_addr += vm::read8(lib_addr) ? vm::read8(lib_addr) : sizeof_lib)
-				{
-					if (std::memcpy(vm::base(lib_addr), mem_copy.data(), sizeof_lib) == 0)
-					{
-						atomic_storage<char>::release(prx.m_external_loaded_flags[index], true);
-						return true;
-					}
-				}
-			}
-
-			return false;
-		}).ret;
-
-		if (!success)
-		{
-			sys_prx.error("_sys_prx_register_library(): Failed to associate library to PRX!");
-		}
-	}
-
+	sys_prx.todo("_sys_prx_register_library(library=*0x%x)", library);
 	return CELL_OK;
 }
 
@@ -1017,24 +780,14 @@ error_code _sys_prx_get_module_info(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<
 
 	sys_prx.warning("_sys_prx_get_module_info(id=0x%x, flags=%d, pOpt=*0x%x)", id, flags, pOpt);
 
-	const auto prx = idm::get_unlocked<lv2_obj, lv2_prx>(id);
+	const auto prx = idm::get<lv2_obj, lv2_prx>(id);
 
 	if (!pOpt)
 	{
 		return CELL_EFAULT;
 	}
 
-	if (pOpt->size != pOpt.size())
-	{
-		return CELL_EINVAL;
-	}
-
-	if (!pOpt->info)
-	{
-		return CELL_EFAULT;
-	}
-
-	if (pOpt->info->size != pOpt->info.size() && pOpt->info_v2->size != pOpt->info_v2.size())
+	if (pOpt->size != pOpt.size() || !pOpt->info)
 	{
 		return CELL_EINVAL;
 	}
@@ -1054,7 +807,7 @@ error_code _sys_prx_get_module_info(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<
 	if (pOpt->info->filename)
 	{
 		std::span dst(pOpt->info->filename.get_ptr(), pOpt->info->filename_size);
-		strcpy_trunc(dst, vfs::retrieve(prx->path));
+		strcpy_trunc(dst, prx->name);
 	}
 
 	if (pOpt->info->segments)
@@ -1072,14 +825,6 @@ error_code _sys_prx_get_module_info(ppu_thread& ppu, u32 id, u64 flags, vm::ptr<
 		pOpt->info->segments_num = i;
 	}
 
-	if (pOpt->info_v2->size == pOpt->info_v2.size())
-	{
-		pOpt->info_v2->exports_addr = prx->exports_start;
-		pOpt->info_v2->exports_size = prx->exports_end - prx->exports_start;
-		pOpt->info_v2->imports_addr = prx->imports_start;
-		pOpt->info_v2->imports_size = prx->imports_end - prx->imports_start;
-	}
-
 	return CELL_OK;
 }
 
@@ -1087,63 +832,19 @@ error_code _sys_prx_get_module_id_by_name(ppu_thread& ppu, vm::cptr<char> name,
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_prx.warning("_sys_prx_get_module_id_by_name(name=%s, flags=%d, pOpt=*0x%x)", name, flags, pOpt);
+	sys_prx.todo("_sys_prx_get_module_id_by_name(name=%s, flags=%d, pOpt=*0x%x)", name, flags, pOpt);
 
-	std::string module_name;
-	if (!vm::read_string(name.addr(), 28, module_name))
-	{
-		return CELL_EINVAL;
-	}
+	//if (realName == "?") ...
 
-	const auto [prx, id] = idm::select<lv2_obj, lv2_prx>([&](u32 id, lv2_prx& prx) -> u32
-	{
-		if (strncmp(module_name.c_str(), prx.module_info_name, sizeof(prx.module_info_name)) == 0)
-		{
-			return id;
-		}
-
-		return 0;
-	});
-
-	if (!id)
-	{
-		return CELL_PRX_ERROR_UNKNOWN_MODULE;
-	}
-
-	return not_an_error(id);
+	return not_an_error(CELL_PRX_ERROR_UNKNOWN_MODULE);
 }
 
 error_code _sys_prx_get_module_id_by_address(ppu_thread& ppu, u32 addr)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_prx.warning("_sys_prx_get_module_id_by_address(addr=0x%x)", addr);
-
-	if (!vm::check_addr(addr))
-	{
-		// Fast check for an invalid argument
-		return {CELL_PRX_ERROR_UNKNOWN_MODULE, addr};
-	}
-
-	const auto [prx, id] = idm::select<lv2_obj, lv2_prx>([&](u32 id, lv2_prx& prx) -> u32
-	{
-		for (const ppu_segment& seg : prx.segs)
-		{
-			if (seg.size && addr >= seg.addr && addr < seg.addr + seg.size)
-			{
-				return id;
-			}
-		}
-
-		return 0;
-	});
-
-	if (!id)
-	{
-		return {CELL_PRX_ERROR_UNKNOWN_MODULE, addr};
-	}
-
-	return not_an_error(id);
+	sys_prx.todo("_sys_prx_get_module_id_by_address(addr=0x%x)", addr);
+	return CELL_OK;
 }
 
 error_code _sys_prx_start(ppu_thread& ppu)
diff --git a/rpcs3/Emu/Cell/lv2/sys_prx.h b/rpcs3/Emu/Cell/lv2/sys_prx.h
index a78542dcbd..cedfda76ed 100644
--- a/rpcs3/Emu/Cell/lv2/sys_prx.h
+++ b/rpcs3/Emu/Cell/lv2/sys_prx.h
@@ -63,35 +63,23 @@ struct sys_prx_segment_info_t
 
 struct sys_prx_module_info_t
 {
-	be_t<u64> size; // 0
-	char name[30]; // 8
-	char version[2]; // 0x26
-	be_t<u32> modattribute; // 0x28
-	be_t<u32> start_entry; // 0x2c
-	be_t<u32> stop_entry; // 0x30
-	be_t<u32> all_segments_num; // 0x34
-	vm::bptr<char> filename; // 0x38
-	be_t<u32> filename_size; // 0x3c
-	vm::bptr<sys_prx_segment_info_t> segments; // 0x40
-	be_t<u32> segments_num; // 0x44
-};
-
-struct sys_prx_module_info_v2_t : sys_prx_module_info_t
-{
-	be_t<u32> exports_addr; // 0x48
-	be_t<u32> exports_size; // 0x4C
-	be_t<u32> imports_addr; // 0x50
-	be_t<u32> imports_size; // 0x54
+	be_t<u64> size;
+	char name[30];
+	char version[2];
+	be_t<u32> modattribute;
+	be_t<u32> start_entry;
+	be_t<u32> stop_entry;
+	be_t<u32> all_segments_num;
+	vm::bptr<char> filename;
+	be_t<u32> filename_size;
+	vm::bptr<sys_prx_segment_info_t> segments;
+	be_t<u32> segments_num;
 };
 
 struct sys_prx_module_info_option_t
 {
 	be_t<u64> size; // 0x10
-	union
-	{
-		vm::bptr<sys_prx_module_info_t> info;
-		vm::bptr<sys_prx_module_info_v2_t> info_v2;
-	};
+	vm::bptr<sys_prx_module_info_t> info;
 };
 
 struct sys_prx_start_module_option_t
@@ -181,17 +169,16 @@ enum : u32
 	PRX_STATE_STARTED,
 	PRX_STATE_STOPPING, // In-between state between started and stopped (internal)
 	PRX_STATE_STOPPED, // Last state, the module cannot be restarted
-	PRX_STATE_DESTROYED, // Last state, the module cannot be restarted
 };
 
-struct lv2_prx final : ppu_module<lv2_obj>
+struct lv2_prx final : lv2_obj, ppu_module
 {
 	static const u32 id_base = 0x23000000;
 
 	atomic_t<u32> state = PRX_STATE_INITIALIZED;
-	shared_mutex mutex;
 
 	std::unordered_map<u32, u32> specials;
+	std::unordered_map<u32, void*> imports;
 
 	vm::ptr<s32(u32 argc, vm::ptr<void> argv)> start = vm::null;
 	vm::ptr<s32(u32 argc, vm::ptr<void> argv)> stop = vm::null;
@@ -199,27 +186,9 @@ struct lv2_prx final : ppu_module<lv2_obj>
 	vm::ptr<s32(u64 callback, u64 argc, vm::ptr<void, u64> argv)> epilogue = vm::null;
 	vm::ptr<s32()> exit = vm::null;
 
-	char module_info_name[28]{};
-	u8 module_info_version[2]{};
-	be_t<u16> module_info_attributes{};
-
-	u32 imports_start = umax;
-	u32 imports_end = 0;
-
-	u32 exports_start = umax;
-	u32 exports_end = 0;
-
-	std::basic_string<char> m_loaded_flags;
-	std::basic_string<char> m_external_loaded_flags;
-
-	void load_exports(); // (Re)load exports
-	void restore_exports(); // For savestates
-	void unload_exports();
-
-	lv2_prx() noexcept = default;
-	lv2_prx(utils::serial&) {}
-	static std::function<void(void*)> load(utils::serial&);
-	void save(utils::serial& ar);
+	char module_info_name[28];
+	u8 module_info_version[2];
+	be_t<u16> module_info_attributes;
 };
 
 enum : u64
diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp
index 4ef4e04d85..c8b569fa6a 100644
--- a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp
@@ -1,17 +1,12 @@
 #include "stdafx.h"
 #include "sys_rsx.h"
 
-#include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/timers.hpp"
 #include "Emu/Memory/vm_locking.h"
-#include "Emu/RSX/Core/RSXEngLock.hpp"
-#include "Emu/RSX/Core/RSXReservationLock.hpp"
 #include "Emu/RSX/RSXThread.h"
-#include "util/asm.hpp"
 #include "sys_event.h"
-#include "sys_vm.h"
 
 LOG_CHANNEL(sys_rsx);
 
@@ -35,59 +30,12 @@ void fmt_class_string<sys_rsx_error>::format(std::string& out, u64 arg)
 	});
 }
 
-static u64 rsx_timeStamp()
+u64 rsxTimeStamp()
 {
 	return get_timebased_time();
 }
 
-static void set_rsx_dmactl(rsx::thread* render, u64 get_put)
-{
-	{
-		rsx::eng_lock rlock(render);
-		render->fifo_ctrl->abort();
-
-		// Unconditional set
-		while (!render->new_get_put.compare_and_swap_test(u64{umax}, get_put))
-		{
-			// Wait for the first store to complete (or be aborted)
-			if (auto cpu = cpu_thread::get_current())
-			{
-				if (cpu->state & cpu_flag::exit)
-				{
-					// Retry
-					cpu->state += cpu_flag::again;
-					return;
-				}
-			}
-
-			utils::pause();
-		}
-
-		// Schedule FIFO interrupt to deal with this immediately
-		render->m_eng_interrupt_mask |= rsx::dma_control_interrupt;
-	}
-
-	if (auto cpu = cpu_thread::get_current())
-	{
-		// Wait for the first store to complete (or be aborted)
-		while (render->new_get_put != usz{umax})
-		{
-			if (cpu->state & cpu_flag::exit)
-			{
-				if (render->new_get_put.compare_and_swap_test(get_put, umax))
-				{
-					// Retry
-					cpu->state += cpu_flag::again;
-					return;
-				}
-			}
-
-			thread_ctrl::wait_for(1000);
-		}
-	}
-}
-
-bool rsx::thread::send_event(u64 data1, u64 event_flags, u64 data3)
+void rsx::thread::send_event(u64 data1, u64 event_flags, u64 data3) const
 {
 	// Filter event bits, send them only if they are masked by gcm
 	// Except the upper 32-bits, they are reserved for unmapped io events and execute unconditionally
@@ -96,7 +44,7 @@ bool rsx::thread::send_event(u64 data1, u64 event_flags, u64 data3)
 	if (!event_flags)
 	{
 		// Nothing to do
-		return true;
+		return;
 	}
 
 	auto error = sys_event_port_send(rsx_event_port, data1, event_flags, data3);
@@ -105,7 +53,7 @@ bool rsx::thread::send_event(u64 data1, u64 event_flags, u64 data3)
 	{
 		auto cpu = get_current_cpu_thread();
 
-		if (cpu && cpu->get_class() == thread_class::ppu)
+		if (cpu && cpu->id_type() == 1)
 		{
 			// Deschedule
 			lv2_obj::sleep(*cpu, 100);
@@ -114,7 +62,7 @@ bool rsx::thread::send_event(u64 data1, u64 event_flags, u64 data3)
 		// Wait a bit before resending event
 		thread_ctrl::wait_for(100);
 
-		if (cpu && cpu->get_class() == thread_class::rsx)
+		if (cpu && cpu->id_type() == 0x55)
 			cpu->cpu_wait({});
 
 		if (Emu.IsStopped() || (cpu && cpu->check_state()))
@@ -126,19 +74,10 @@ bool rsx::thread::send_event(u64 data1, u64 event_flags, u64 data3)
 		error = sys_event_port_send(rsx_event_port, data1, event_flags, data3);
 	}
 
-	if (error + 0u == CELL_EAGAIN)
-	{
-		// Thread has aborted when sending event (VBLANK duplicates are allowed)
-		ensure((unsent_gcm_events.fetch_or(event_flags) & event_flags & ~(SYS_RSX_EVENT_VBLANK | SYS_RSX_EVENT_SECOND_VBLANK_BASE | SYS_RSX_EVENT_SECOND_VBLANK_BASE * 2)) == 0);
-		return false;
-	}
-
 	if (error && error + 0u != CELL_ENOTCONN)
 	{
 		fmt::throw_exception("rsx::thread::send_event() Failed to send event! (error=%x)", +error);
 	}
-
-	return true;
 }
 
 error_code sys_rsx_device_open(cpu_thread& cpu)
@@ -175,16 +114,10 @@ error_code sys_rsx_memory_allocate(cpu_thread& cpu, vm::ptr<u32> mem_handle, vm:
 
 	sys_rsx.warning("sys_rsx_memory_allocate(mem_handle=*0x%x, mem_addr=*0x%x, size=0x%x, flags=0x%llx, a5=0x%llx, a6=0x%llx, a7=0x%llx)", mem_handle, mem_addr, size, flags, a5, a6, a7);
 
-	if (vm::falloc(rsx::constants::local_mem_base, size, vm::video))
+	if (u32 addr = vm::falloc(rsx::constants::local_mem_base, size, vm::video))
 	{
 		rsx::get_current_renderer()->local_mem_size = size;
-
-		if (u32 addr = rsx::get_current_renderer()->driver_info)
-		{
-			vm::_ptr<RsxDriverInfo>(addr)->memory_size = size;
-		}
-
-		*mem_addr = rsx::constants::local_mem_base;
+		*mem_addr = addr;
 		*mem_handle = 0x5a5a5a5b;
 		return CELL_OK;
 	}
@@ -259,13 +192,11 @@ error_code sys_rsx_context_allocate(cpu_thread& cpu, vm::ptr<u32> context_id, vm
 		return CELL_ENOMEM;
 	}
 
-	sys_rsx.warning("sys_rsx_context_allocate(): Mapped address 0x%x", dma_address);
-
 	*lpar_dma_control = dma_address;
 	*lpar_driver_info = dma_address + 0x100000;
 	*lpar_reports = dma_address + 0x200000;
 
-	auto &reports = *vm::_ptr<RsxReports>(vm::cast(*lpar_reports));
+	auto &reports = vm::_ref<RsxReports>(vm::cast(*lpar_reports));
 	std::memset(&reports, 0, sizeof(RsxReports));
 
 	for (usz i = 0; i < std::size(reports.notify); ++i)
@@ -273,10 +204,10 @@ error_code sys_rsx_context_allocate(cpu_thread& cpu, vm::ptr<u32> context_id, vm
 
 	for (usz i = 0; i < std::size(reports.semaphore); i += 4)
 	{
-		reports.semaphore[i + 0] = 0x1337C0D3;
-		reports.semaphore[i + 1] = 0x1337BABE;
-		reports.semaphore[i + 2] = 0x1337BEEF;
-		reports.semaphore[i + 3] = 0x1337F001;
+		reports.semaphore[i + 0].val.raw() = 0x1337C0D3;
+		reports.semaphore[i + 1].val.raw() = 0x1337BABE;
+		reports.semaphore[i + 2].val.raw() = 0x1337BEEF;
+		reports.semaphore[i + 3].val.raw() = 0x1337F001;
 	}
 
 	for (usz i = 0; i < std::size(reports.report); ++i)
@@ -286,13 +217,12 @@ error_code sys_rsx_context_allocate(cpu_thread& cpu, vm::ptr<u32> context_id, vm
 		reports.report[i].pad = -1;
 	}
 
-	auto &driverInfo = *vm::_ptr<RsxDriverInfo>(vm::cast(*lpar_driver_info));
+	auto &driverInfo = vm::_ref<RsxDriverInfo>(vm::cast(*lpar_driver_info));
 
 	std::memset(&driverInfo, 0, sizeof(RsxDriverInfo));
 
 	driverInfo.version_driver = 0x211;
 	driverInfo.version_gpu = 0x5c;
-	driverInfo.memory_size = render->local_mem_size;
 	driverInfo.nvcore_frequency = 500000000; // 0x1DCD6500
 	driverInfo.memory_frequency = 650000000; // 0x26BE3680
 	driverInfo.reportsNotifyOffset = 0x1000;
@@ -303,7 +233,7 @@ error_code sys_rsx_context_allocate(cpu_thread& cpu, vm::ptr<u32> context_id, vm
 
 	render->driver_info = vm::cast(*lpar_driver_info);
 
-	auto &dmaControl = *vm::_ptr<RsxDmaControl>(vm::cast(*lpar_dma_control));
+	auto &dmaControl = vm::_ref<RsxDmaControl>(vm::cast(*lpar_dma_control));
 	dmaControl.get = 0;
 	dmaControl.put = 0;
 	dmaControl.ref = 0; // Set later to -1 by cellGcmSys
@@ -338,52 +268,21 @@ error_code sys_rsx_context_allocate(cpu_thread& cpu, vm::ptr<u32> context_id, vm
  * lv2 SysCall 671 (0x29F): sys_rsx_context_free
  * @param context_id (IN): RSX context generated by sys_rsx_context_allocate to free the context.
  */
-error_code sys_rsx_context_free(ppu_thread& ppu, u32 context_id)
+error_code sys_rsx_context_free(cpu_thread& cpu, u32 context_id)
 {
-	ppu.state += cpu_flag::wait;
+	cpu.state += cpu_flag::wait;
 
 	sys_rsx.todo("sys_rsx_context_free(context_id=0x%x)", context_id);
 
 	const auto render = rsx::get_current_renderer();
 
-	rsx::eng_lock fifo_lock(render);
 	std::scoped_lock lock(render->sys_rsx_mtx);
 
-	const u32 dma_address = render->dma_address;
-	render->dma_address = 0;
-
-	if (context_id != 0x55555555 || !dma_address || render->state & cpu_flag::ret)
+	if (context_id != 0x55555555 || !render->dma_address)
 	{
 		return CELL_EINVAL;
 	}
 
-	g_fxo->get<rsx::vblank_thread>() = thread_state::finished;
-
-	const u32 queue_id = vm::_ptr<RsxDriverInfo>(render->driver_info)->handler_queue;
-
-	render->state += cpu_flag::ret;
-
-	while (render->state & cpu_flag::ret)
-	{
-		thread_ctrl::wait_for(1000);
-	}
-
-	sys_event_port_disconnect(ppu, render->rsx_event_port);
-	sys_event_port_destroy(ppu, render->rsx_event_port);
-	sys_event_queue_destroy(ppu, queue_id, SYS_EVENT_QUEUE_DESTROY_FORCE);
-
-	render->label_addr = 0;
-	render->driver_info = 0;
-	render->main_mem_size = 0;
-	render->rsx_event_port = 0;
-	render->display_buffers_count = 0;
-	render->current_display_buffer = 0;
-	render->ctrl = nullptr;
-	render->rsx_thread_running = false;
-	render->serialized = false;
-
-	ensure(vm::get(vm::rsx_context)->dealloc(dma_address));
-
 	return CELL_OK;
 }
 
@@ -417,7 +316,7 @@ error_code sys_rsx_context_iomap(cpu_thread& cpu, u32 context_id, u32 io, u32 ea
 	// Wait until we have no active RSX locks and reserve iomap for use. Must do so before acquiring vm lock to avoid deadlocks
 	rsx::reservation_lock<true> rsx_lock(ea, size);
 
-	vm::writer_lock rlock;
+	vm::reader_lock rlock;
 
 	for (u32 addr = ea, end = ea + size; addr < end; addr += 0x100000)
 	{
@@ -425,17 +324,11 @@ error_code sys_rsx_context_iomap(cpu_thread& cpu, u32 context_id, u32 io, u32 ea
 		{
 			return CELL_EINVAL;
 		}
-
-		if ((addr == ea || !(addr % 0x1000'0000)) && idm::check_unlocked<sys_vm_t>(sys_vm_t::find_id(addr)))
-		{
-			// Virtual memory is disallowed
-			return CELL_EINVAL;
-		}
 	}
 
 	io >>= 20, ea >>= 20, size >>= 20;
 
-	rsx::eng_lock fifo_lock(render);
+	render->pause();
 	std::scoped_lock lock(render->sys_rsx_mtx);
 
 	for (u32 i = 0; i < size; i++)
@@ -449,6 +342,7 @@ error_code sys_rsx_context_iomap(cpu_thread& cpu, u32 context_id, u32 io, u32 ea
 		table.io[ea + i].release((io + i) << 20);
 	}
 
+	render->unpause();
 	return CELL_OK;
 }
 
@@ -477,7 +371,7 @@ error_code sys_rsx_context_iounmap(cpu_thread& cpu, u32 context_id, u32 io, u32
 		sys_rsx.warning("sys_rsx_context_iounmap(): RSX is not idle while unmapping io");
 	}
 
-	vm::writer_lock rlock;
+	vm::reader_lock rlock;
 
 	std::scoped_lock lock(render->sys_rsx_mtx);
 
@@ -517,29 +411,25 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 
 	const auto render = rsx::get_current_renderer();
 
-	if (!render->dma_address)
+	if (!render->dma_address || context_id != 0x55555555)
 	{
-		return { CELL_EINVAL, "dma_address is 0" };
+		return CELL_EINVAL;
 	}
 
-	if (context_id != 0x55555555)
-	{
-		return { CELL_EINVAL, "context_id is 0x%x", context_id };
-	}
-
-	auto &driverInfo = *vm::_ptr<RsxDriverInfo>(render->driver_info);
+	auto &driverInfo = vm::_ref<RsxDriverInfo>(render->driver_info);
 	switch (package_id)
 	{
 	case 0x001: // FIFO
 	{
+		render->pause();
 		const u64 get = static_cast<u32>(a3);
 		const u64 put = static_cast<u32>(a4);
-		const u64 get_put = put << 32 | get;
-
-		std::lock_guard lock(render->sys_rsx_mtx);
-		set_rsx_dmactl(render, get_put);
+		vm::_ref<atomic_be_t<u64>>(render->dma_address + ::offset32(&RsxDmaControl::put)).release(put << 32 | get);
+		render->sync_point_request.release(true);
+		render->unpause();
 		break;
 	}
+
 	case 0x100: // Display mode set
 		break;
 	case 0x101: // Display sync set, cellGcmSetFlipMode
@@ -589,18 +479,10 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 			}
 		}
 
-		if (!render->request_emu_flip(flip_idx))
-		{
-			if (auto cpu = get_current_cpu_thread())
-			{
-				cpu->state += cpu_flag::exit;
-				cpu->state += cpu_flag::again;
-			}
-
-			return {};
-		}
-		break;
+		render->request_emu_flip(flip_idx);
 	}
+	break;
+
 	case 0x103: // Display Queue
 	{
 		// NOTE: There currently seem to only be 2 active heads on PS3
@@ -609,18 +491,12 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 		driverInfo.head[a3].lastQueuedBufferId = static_cast<u32>(a4);
 		driverInfo.head[a3].flipFlags |= 0x40000000 | (1 << a4);
 
-		render->on_frame_end(static_cast<u32>(a4));
-		if (!render->send_event(0, SYS_RSX_EVENT_QUEUE_BASE << a3, 0))
-		{
-			break;
-		}
+		render->send_event(0, SYS_RSX_EVENT_QUEUE_BASE << a3, 0);
 
-		if (g_cfg.video.frame_limit == frame_limit_type::infinite)
-		{
-			render->post_vblank_event(get_system_time());
-		}
-		break;
+		render->on_frame_end(static_cast<u32>(a4));
 	}
+	break;
+
 	case 0x104: // Display buffer
 	{
 		const u8 id = a3 & 0xFF;
@@ -644,32 +520,21 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 		render->display_buffers[id].offset = offset;
 
 		render->display_buffers_count = std::max<u32>(id + 1, render->display_buffers_count);
-		break;
 	}
+	break;
+
 	case 0x105: // destroy buffer?
 		break;
 
 	case 0x106: // ? (Used by cellGcmInitPerfMon)
 		break;
 
-	case 0x108: // cellGcmSetVBlankFrequency, cellGcmSetSecondVFrequency
+	case 0x108: // cellGcmSetSecondVFrequency
 		// a4 == 3, CELL_GCM_DISPLAY_FREQUENCY_59_94HZ
 		// a4 == 2, CELL_GCM_DISPLAY_FREQUENCY_SCANOUT
 		// a4 == 4, CELL_GCM_DISPLAY_FREQUENCY_DISABLE
-
-		if (a5 == 1u)
-		{
-			// This function resets vsync state to enabled
-			render->requested_vsync = true;
-
-			// TODO: Set vblank frequency
-		}
-		else if (ensure(a5 == 2u))
-		{
-			// TODO: Implement its frequency as well
-			render->enable_second_vhandler.store(a4 != 4);
-		}
-
+		// Note: Scanout/59_94 is ignored currently as we report refresh rate of 59_94hz as it is, so the difference doesnt matter
+		render->enable_second_vhandler.store(a4 != 4);
 		break;
 
 	case 0x10a: // ? Involved in managing flip status through cellGcmResetFlipStatus
@@ -686,8 +551,9 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 		{
 			flipStatus = (flipStatus & static_cast<u32>(a4)) | static_cast<u32>(a5);
 		});
-		break;
 	}
+	break;
+
 	case 0x10D: // Called by cellGcmInitCursor
 		break;
 
@@ -716,13 +582,13 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 		//const u32 bank = (((a4 >> 32) & 0xFFFFFFFF) >> 4) & 0xF;
 		const bool bound = ((a4 >> 32) & 0x3) != 0;
 
-		const auto range = utils::address_range32::start_length(offset, size);
+		const auto range = utils::address_range::start_length(offset, size);
 
 		if (bound)
 		{
 			if (!size || !pitch)
 			{
-				return { CELL_EINVAL, "size or pitch are 0 (size=%d, pitch=%d)", size, pitch };
+				return CELL_EINVAL;
 			}
 
 			u32 limit = -1;
@@ -736,7 +602,7 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 
 			if (!range.valid() || range.end >= limit)
 			{
-				return { CELL_EINVAL, "range invalid (valid=%d, end=%d, limit=%d)", range.valid(), range.end, limit };
+				return CELL_EINVAL;
 			}
 
 			// Hardcoded value in gcm
@@ -752,13 +618,13 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 
 		if (location == CELL_GCM_LOCATION_MAIN && bound)
 		{
-			vm::writer_lock rlock;
+			vm::reader_lock rlock;
 
 			for (u32 io = (offset >> 20), end = (range.end >> 20); io <= end; io++)
 			{
 				if (render->iomap_table.ea[io] == umax)
 				{
-					return { CELL_EINVAL, "iomap_table ea is umax" };
+					return CELL_EINVAL;
 				}
 			}
 		}
@@ -771,8 +637,9 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 		tile.base = base;
 		tile.bank = base;
 		tile.bound = bound;
-		break;
 	}
+	break;
+
 	case 0x301: // Depth-buffer (Z-cull)
 	{
 		//a4 high = region = (1 << 0) | (zFormat << 4) | (aaFormat << 8);
@@ -782,10 +649,7 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 		//a6 high = status0 = (zcullDir << 1) | (zcullFormat << 2) | ((sFunc & 0xF) << 12) | (sRef << 16) | (sMask << 24);
 		//a6 low = status1 = (0x2000 << 0) | (0x20 << 16);
 
-		if (a3 >= std::size(render->zculls))
-		{
-			return SYS_RSX_CONTEXT_ATTRIBUTE_ERROR;
-		}
+		ensure(a3 < std::size(render->zculls));
 
 		if (!render->is_fifo_idle())
 		{
@@ -800,13 +664,13 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 
 		if (bound)
 		{
-			const auto cull_range = utils::address_range32::start_length(cullStart, width * height);
+			const auto cull_range = utils::address_range::start_length(cullStart, width * height);
 
 			// cullStart is an offset inside ZCULL RAM which is 3MB long, check bounds
 			// width and height are not allowed to be zero (checked by range.valid())
 			if (!cull_range.valid() || cull_range.end >= 3u << 20 || offset >= render->local_mem_size)
 			{
-				return { CELL_EINVAL, "cull_range invalid (valid=%d, end=%d, offset=%d, local_mem_size=%d)", cull_range.valid(), cull_range.end, offset, render->local_mem_size };
+				return CELL_EINVAL;
 			}
 
 			if (a5 & 0xF0000000)
@@ -835,8 +699,8 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 		zcull.sRef = ((a6 >> 32) >> 16) & 0xFF;
 		zcull.sMask = ((a6 >> 32) >> 24) & 0xFF;
 		zcull.bound = bound;
-		break;
 	}
+	break;
 
 	case 0x302: // something with zcull
 		break;
@@ -854,40 +718,29 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 		break;
 
 	case 0xFEC: // hack: flip event notification
-	{
+
 		// we only ever use head 1 for now
 		driverInfo.head[1].flipFlags |= 0x80000000;
-		driverInfo.head[1].lastFlipTime = rsx_timeStamp(); // should rsxthread set this?
+		driverInfo.head[1].lastFlipTime = rsxTimeStamp(); // should rsxthread set this?
 		driverInfo.head[1].flipBufferId = static_cast<u32>(a3);
 
 		// seems gcmSysWaitLabel uses this offset, so lets set it to 0 every flip
-		// NOTE: Realhw resets 16 bytes of this semaphore for some reason
-		vm::_ptr<atomic_t<u128>>(render->label_addr + 0x10)->store(u128{});
+		vm::_ref<u32>(render->label_addr + 0x10) = 0;
 
 		render->send_event(0, SYS_RSX_EVENT_FLIP_BASE << 1, 0);
 		break;
-	}
+
 	case 0xFED: // hack: vblank command
 	{
-		if (cpu_thread::get_current<ppu_thread>())
-		{
-			// VBLANK/RSX thread only
-			return { CELL_EINVAL, "wrong thread" };
-		}
-
 		// NOTE: There currently seem to only be 2 active heads on PS3
 		ensure(a3 < 2);
 
 		// todo: this is wrong and should be 'second' vblank handler and freq, but since currently everything is reported as being 59.94, this should be fine
-		driverInfo.head[a3].lastSecondVTime.atomic_op([&](be_t<u64>& time)
-		{
-			a4 = std::max<u64>(a4, time + 1);
-			time = a4;
-		});
+		vm::_ref<u32>(render->device_addr + 0x30) = 1;
 
-		// Time point is supplied in argument 4 (todo: convert it to MFTB rate and use it)
-		const u64 current_time = rsx_timeStamp();
+		const u64 current_time = rsxTimeStamp();
 
+		driverInfo.head[a3].lastSecondVTime = current_time;
 
 		// Note: not atomic
 		driverInfo.head[a3].lastVTimeLow = static_cast<u32>(current_time);
@@ -905,17 +758,15 @@ error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64
 	}
 
 	case 0xFEF: // hack: user command
-	{
 		// 'custom' invalid package id for now
 		// as i think we need custom lv1 interrupts to handle this accurately
 		// this also should probly be set by rsxthread
 		driverInfo.userCmdParam = static_cast<u32>(a4);
 		render->send_event(0, SYS_RSX_EVENT_USER_CMD, 0);
 		break;
-	}
 
 	default:
-		return { CELL_EINVAL, "unsupported package id %d", package_id };
+		return CELL_EINVAL;
 	}
 
 	return CELL_OK;
@@ -933,8 +784,7 @@ error_code sys_rsx_device_map(cpu_thread& cpu, vm::ptr<u64> dev_addr, vm::ptr<u6
 
 	sys_rsx.warning("sys_rsx_device_map(dev_addr=*0x%x, a2=*0x%x, dev_id=0x%x)", dev_addr, a2, dev_id);
 
-	if (dev_id != 8)
-	{
+	if (dev_id != 8) {
 		// TODO: lv1 related
 		fmt::throw_exception("sys_rsx_device_map: Invalid dev_id %d", dev_id);
 	}
@@ -953,8 +803,6 @@ error_code sys_rsx_device_map(cpu_thread& cpu, vm::ptr<u64> dev_addr, vm::ptr<u6
 			return CELL_ENOMEM;
 		}
 
-		sys_rsx.warning("sys_rsx_device_map(): Mapped address 0x%x", addr);
-
 		*dev_addr = addr;
 		render->device_addr = addr;
 		return CELL_OK;
diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.h b/rpcs3/Emu/Cell/lv2/sys_rsx.h
index 44f02a697d..69d48aabdd 100644
--- a/rpcs3/Emu/Cell/lv2/sys_rsx.h
+++ b/rpcs3/Emu/Cell/lv2/sys_rsx.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Utilities/mutex.h"
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/ErrorCodes.h"
 
@@ -31,7 +32,7 @@ struct RsxDriverInfo
 		be_t<u32> lastQueuedBufferId; // 0x14 todo: this is definately not this variable but its 'unused' so im using it for queueId to pass to flip handler
 		be_t<u32> unk3;            // 0x18
 		be_t<u32> lastVTimeLow;    // 0x1C last time for first vhandler freq (low 32-bits)
-		atomic_be_t<u64> lastSecondVTime; // 0x20 last time for second vhandler freq
+		be_t<u64> lastSecondVTime; // 0x20 last time for second vhandler freq
 		be_t<u64> unk4;            // 0x28
 		atomic_be_t<u64> vBlankCount; // 0x30
 		be_t<u32> unk;             // 0x38 possible u32, 'flip field', top/bottom for interlaced
@@ -87,7 +88,10 @@ struct RsxDmaControl
 	be_t<u32> unk1;
 };
 
-using RsxSemaphore = be_t<u32>;
+struct RsxSemaphore
+{
+	atomic_be_t<u32> val;
+};
 
 struct alignas(16) RsxNotify
 {
@@ -104,19 +108,17 @@ struct alignas(16) RsxReport
 
 struct RsxReports
 {
-	RsxSemaphore semaphore[1024];
+	RsxSemaphore semaphore[0x400];
 	RsxNotify notify[64];
 	RsxReport report[2048];
 };
 
 struct RsxDisplayInfo
 {
-	be_t<u32> offset{0};
-	be_t<u32> pitch{0};
-	be_t<u32> width{0};
-	be_t<u32> height{0};
-
-	ENABLE_BITWISE_SERIALIZATION;
+	be_t<u32> offset;
+	be_t<u32> pitch;
+	be_t<u32> width;
+	be_t<u32> height;
 
 	bool valid() const
 	{
@@ -130,7 +132,7 @@ error_code sys_rsx_device_close(cpu_thread& cpu);
 error_code sys_rsx_memory_allocate(cpu_thread& cpu, vm::ptr<u32> mem_handle, vm::ptr<u64> mem_addr, u32 size, u64 flags, u64 a5, u64 a6, u64 a7);
 error_code sys_rsx_memory_free(cpu_thread& cpu, u32 mem_handle);
 error_code sys_rsx_context_allocate(cpu_thread& cpu, vm::ptr<u32> context_id, vm::ptr<u64> lpar_dma_control, vm::ptr<u64> lpar_driver_info, vm::ptr<u64> lpar_reports, u64 mem_ctx, u64 system_mode);
-error_code sys_rsx_context_free(ppu_thread& ppu, u32 context_id);
+error_code sys_rsx_context_free(cpu_thread& cpu, u32 context_id);
 error_code sys_rsx_context_iomap(cpu_thread& cpu, u32 context_id, u32 io, u32 ea, u32 size, u64 flags);
 error_code sys_rsx_context_iounmap(cpu_thread& cpu, u32 context_id, u32 io, u32 size);
 error_code sys_rsx_context_attribute(u32 context_id, u32 package_id, u64 a3, u64 a4, u64 a5, u64 a6);
diff --git a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp
index 2ba15b1146..dcb071e908 100644
--- a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp
@@ -1,2361 +1,39 @@
 #include "stdafx.h"
 #include "Emu/Memory/vm.h"
-#include "Emu/IdManager.h"
-#include "Emu/System.h"
-#include "Emu/system_config.h"
-#include "Emu//Audio/audio_utils.h"
-#include "util/video_provider.h"
+#include "Emu/Cell/ErrorCodes.h"
 
 #include "sys_rsxaudio.h"
 
-#include <cmath>
-#include <bitset>
-#include <optional>
-
-#ifdef __linux__
-#include <sys/epoll.h>
-#include <sys/timerfd.h>
-#include <sys/eventfd.h>
-#include <unistd.h>
-#elif defined(BSD) || defined(__APPLE__)
-#include <unistd.h>
-#endif
-
 LOG_CHANNEL(sys_rsxaudio);
 
-extern atomic_t<recording_mode> g_recording_mode;
-
-namespace rsxaudio_ringbuf_reader
-{
-	static constexpr void clean_buf(rsxaudio_shmem::ringbuf_t& ring_buf)
-	{
-		ring_buf.unk2             = 100;
-		ring_buf.read_idx         = 0;
-		ring_buf.write_idx        = 0;
-		ring_buf.queue_notify_idx = 0;
-		ring_buf.next_blk_idx     = 0;
-
-		for (auto& ring_entry : ring_buf.entries)
-		{
-			ring_entry.valid         = 0;
-			ring_entry.audio_blk_idx = 0;
-			ring_entry.timestamp     = 0;
-		}
-	}
-
-	static void set_timestamp(rsxaudio_shmem::ringbuf_t& ring_buf, u64 timestamp)
-	{
-		const s32 entry_idx_raw = (ring_buf.read_idx + ring_buf.rw_max_idx - (ring_buf.rw_max_idx > 2) - 1) % ring_buf.rw_max_idx;
-		const s32 entry_idx = std::clamp<s32>(entry_idx_raw, 0, SYS_RSXAUDIO_RINGBUF_SZ);
-
-		ring_buf.entries[entry_idx].timestamp = convert_to_timebased_time(timestamp);
-	}
-
-	static std::tuple<bool /*notify*/, u64 /*blk_idx*/, u64 /*timestamp*/> update_status(rsxaudio_shmem::ringbuf_t& ring_buf)
-	{
-		const s32 read_idx = std::clamp<s32>(ring_buf.read_idx, 0, SYS_RSXAUDIO_RINGBUF_SZ);
-
-		if ((ring_buf.entries[read_idx].valid & 1) == 0U)
-		{
-			return {};
-		}
-
-		const s32 entry_idx_raw = (ring_buf.read_idx + ring_buf.rw_max_idx - (ring_buf.rw_max_idx > 2)) % ring_buf.rw_max_idx;
-		const s32 entry_idx = std::clamp<s32>(entry_idx_raw, 0, SYS_RSXAUDIO_RINGBUF_SZ);
-
-		ring_buf.entries[read_idx].valid = 0;
-		ring_buf.queue_notify_idx = (ring_buf.queue_notify_idx + 1) % ring_buf.queue_notify_step;
-		ring_buf.read_idx         = (ring_buf.read_idx + 1) % ring_buf.rw_max_idx;
-
-		return std::make_tuple(((ring_buf.rw_max_idx > 2) ^ ring_buf.queue_notify_idx) == 0, ring_buf.entries[entry_idx].audio_blk_idx, ring_buf.entries[entry_idx].timestamp);
-	}
-
-	static std::pair<bool /*entry_valid*/, u32 /*addr*/> get_addr(const rsxaudio_shmem::ringbuf_t& ring_buf)
-	{
-		const s32 read_idx = std::clamp<s32>(ring_buf.read_idx, 0, SYS_RSXAUDIO_RINGBUF_SZ);
-
-		if (ring_buf.entries[read_idx].valid & 1)
-		{
-			return std::make_pair(true, ring_buf.entries[read_idx].dma_addr);
-		}
-
-		return std::make_pair(false, ring_buf.dma_silence_addr);
-	}
-
-	[[maybe_unused]]
-	static std::optional<u64> get_spdif_channel_data(RsxaudioPort dst, rsxaudio_shmem& shmem)
-	{
-		if (dst == RsxaudioPort::SPDIF_0)
-		{
-			if (shmem.ctrl.spdif_ch0_channel_data_tx_cycles)
-			{
-				shmem.ctrl.spdif_ch0_channel_data_tx_cycles--;
-				return static_cast<u64>(shmem.ctrl.spdif_ch0_channel_data_hi) << 32 | shmem.ctrl.spdif_ch0_channel_data_lo;
-			}
-		}
-		else
-		{
-			if (shmem.ctrl.spdif_ch1_channel_data_tx_cycles)
-			{
-				shmem.ctrl.spdif_ch1_channel_data_tx_cycles--;
-				return static_cast<u64>(shmem.ctrl.spdif_ch1_channel_data_hi) << 32 | shmem.ctrl.spdif_ch1_channel_data_lo;
-			}
-		}
-
-		return std::nullopt;
-	}
-}
-
-lv2_rsxaudio::lv2_rsxaudio(utils::serial& ar) noexcept
-	: lv2_obj{1}
-	, init(ar)
-{
-	if (init)
-	{
-		ar(shmem);
-
-		for (auto& port : event_queue)
-		{
-			port = lv2_event_queue::load_ptr(ar, port, "rsxaudio");
-		}
-	}
-}
-
-void lv2_rsxaudio::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(LLE);
-
-	ar(init);
-
-	if (init)
-	{
-		ar(shmem);
-
-		for (const auto& port : event_queue)
-		{
-			lv2_event_queue::save_ptr(ar, port.get());
-		}
-	}
-}
-
 error_code sys_rsxaudio_initialize(vm::ptr<u32> handle)
 {
-	sys_rsxaudio.trace("sys_rsxaudio_initialize(handle=*0x%x)", handle);
-
-	auto& rsxaudio_thread = g_fxo->get<rsx_audio_data>();
-
-	if (rsxaudio_thread.rsxaudio_ctx_allocated.test_and_set())
-	{
-		return CELL_EINVAL;
-	}
-
-	if (!vm::check_addr(handle.addr(), vm::page_writable, sizeof(u32)))
-	{
-		rsxaudio_thread.rsxaudio_ctx_allocated = false;
-		return CELL_EFAULT;
-	}
-
-	const u32 id = idm::make<lv2_obj, lv2_rsxaudio>();
-
-	if (!id)
-	{
-		rsxaudio_thread.rsxaudio_ctx_allocated = false;
-		return CELL_ENOMEM;
-	}
-
-	const auto rsxaudio_obj = idm::get_unlocked<lv2_obj, lv2_rsxaudio>(id);
-	std::lock_guard lock(rsxaudio_obj->mutex);
-
-	rsxaudio_obj->shmem = vm::addr_t{vm::alloc(sizeof(rsxaudio_shmem), vm::main)};
-
-	if (!rsxaudio_obj->shmem)
-	{
-		idm::remove<lv2_obj, lv2_rsxaudio>(id);
-		rsxaudio_thread.rsxaudio_ctx_allocated = false;
-		return CELL_ENOMEM;
-	}
-
-	rsxaudio_obj->page_lock();
-
-	rsxaudio_shmem* sh_page = rsxaudio_obj->get_rw_shared_page();
-	sh_page->ctrl = {};
-
-	for (auto& uf : sh_page->ctrl.channel_uf)
-	{
-		uf.uf_event_cnt = 0;
-		uf.unk1         = 0;
-	}
-
-	sh_page->ctrl.unk4             = 0x8000;
-	sh_page->ctrl.intr_thread_prio = 0xDEADBEEF;
-	sh_page->ctrl.unk5             = 0;
-
-	rsxaudio_obj->init = true;
-	*handle = id;
+	// Creates a lv2 object for rsxaudio, returns handle
+	sys_rsxaudio.todo("sys_rsxaudio_initialize(handle=*0x%x)", handle);
+	*handle = 0xcacad0d0;
 
 	return CELL_OK;
 }
 
 error_code sys_rsxaudio_finalize(u32 handle)
 {
-	sys_rsxaudio.trace("sys_rsxaudio_finalize(handle=0x%x)", handle);
-
-	const auto rsxaudio_obj = idm::get_unlocked<lv2_obj, lv2_rsxaudio>(handle);
-
-	if (!rsxaudio_obj)
-	{
-		return CELL_ESRCH;
-	}
-
-	std::lock_guard lock(rsxaudio_obj->mutex);
-
-	if (!rsxaudio_obj->init)
-	{
-		return CELL_ESRCH;
-	}
-
-	auto& rsxaudio_thread = g_fxo->get<rsx_audio_data>();
-
-	{
-		std::lock_guard ra_obj_lock{rsxaudio_thread.rsxaudio_obj_upd_m};
-		rsxaudio_thread.rsxaudio_obj_ptr = null_ptr;
-	}
-
-	rsxaudio_obj->init = false;
-	vm::dealloc(rsxaudio_obj->shmem, vm::main);
-
-	idm::remove<lv2_obj, lv2_rsxaudio>(handle);
-	rsxaudio_thread.rsxaudio_ctx_allocated = false;
+	sys_rsxaudio.todo("sys_rsxaudio_finalize(handle=0x%x)", handle);
 
 	return CELL_OK;
 }
 
 error_code sys_rsxaudio_import_shared_memory(u32 handle, vm::ptr<u64> addr)
 {
-	sys_rsxaudio.trace("sys_rsxaudio_import_shared_memory(handle=0x%x, addr=*0x%x)", handle, addr);
+	sys_rsxaudio.todo("sys_rsxaudio_import_shared_memory(handle=0x%x, addr=*0x%x)", handle, addr);
 
-	const auto rsxaudio_obj = idm::get_unlocked<lv2_obj, lv2_rsxaudio>(handle);
-
-	if (!rsxaudio_obj)
-	{
-		return CELL_ESRCH;
-	}
-
-	std::lock_guard<shared_mutex> lock(rsxaudio_obj->mutex);
-
-	if (!rsxaudio_obj->init)
-	{
-		return CELL_ESRCH;
-	}
-
-	if (!vm::check_addr(addr.addr(), vm::page_writable, sizeof(u64)))
-	{
-		return CELL_EFAULT;
-	}
-
-	*addr = rsxaudio_obj->shmem;
-	rsxaudio_obj->page_unlock();
+	*addr = vm::alloc(0x40000, vm::main);
 
 	return CELL_OK;
 }
 
-error_code sys_rsxaudio_unimport_shared_memory(u32 handle, vm::ptr<u64> addr /* unused */)
+error_code sys_rsxaudio_unimport_shared_memory(u32 handle, vm::ptr<u64> addr)
 {
-	sys_rsxaudio.trace("sys_rsxaudio_unimport_shared_memory(handle=0x%x, addr=*0x%x)", handle, addr);
-
-	const auto rsxaudio_obj = idm::get_unlocked<lv2_obj, lv2_rsxaudio>(handle);
-
-	if (!rsxaudio_obj)
-	{
-		return CELL_ESRCH;
-	}
-
-	std::lock_guard<shared_mutex> lock(rsxaudio_obj->mutex);
-
-	if (!rsxaudio_obj->init)
-	{
-		return CELL_ESRCH;
-	}
-
-	rsxaudio_obj->page_lock();
+	sys_rsxaudio.todo("sys_rsxaudio_unimport_shared_memory(handle=0x%x, addr=*0x%x)", handle, addr);
 
 	return CELL_OK;
 }
-
-error_code sys_rsxaudio_create_connection(u32 handle)
-{
-	sys_rsxaudio.trace("sys_rsxaudio_create_connection(handle=0x%x)", handle);
-
-	const auto rsxaudio_obj = idm::get_unlocked<lv2_obj, lv2_rsxaudio>(handle);
-
-	if (!rsxaudio_obj)
-	{
-		return CELL_ESRCH;
-	}
-
-	std::lock_guard<shared_mutex> lock(rsxaudio_obj->mutex);
-
-	if (!rsxaudio_obj->init)
-	{
-		return CELL_ESRCH;
-	}
-
-	rsxaudio_shmem* sh_page = rsxaudio_obj->get_rw_shared_page();
-
-	const error_code port_create_status = [&]() -> error_code
-	{
-		if (auto queue1 = idm::get_unlocked<lv2_obj, lv2_event_queue>(sh_page->ctrl.event_queue_1_id))
-		{
-			rsxaudio_obj->event_queue[0] = queue1;
-
-			if (auto queue2 = idm::get_unlocked<lv2_obj, lv2_event_queue>(sh_page->ctrl.event_queue_2_id))
-			{
-				rsxaudio_obj->event_queue[1] = queue2;
-
-				if (auto queue3 = idm::get_unlocked<lv2_obj, lv2_event_queue>(sh_page->ctrl.event_queue_3_id))
-				{
-					rsxaudio_obj->event_queue[2] = queue3;
-
-					return CELL_OK;
-				}
-			}
-		}
-
-		return CELL_ESRCH;
-	}();
-
-	if (port_create_status != CELL_OK)
-	{
-		return port_create_status;
-	}
-
-	for (auto& rb : sh_page->ctrl.ringbuf)
-	{
-		rb.dma_silence_addr = rsxaudio_obj->dma_io_base + offsetof(rsxaudio_shmem, dma_silence_region);
-		rb.unk2             = 100;
-	}
-
-	for (u32 entry_idx = 0; entry_idx < SYS_RSXAUDIO_RINGBUF_SZ; entry_idx++)
-	{
-		sh_page->ctrl.ringbuf[static_cast<u32>(RsxaudioPort::SERIAL)].entries[entry_idx].dma_addr  = rsxaudio_obj->dma_io_base + u32{offsetof(rsxaudio_shmem, dma_serial_region)} + SYS_RSXAUDIO_RINGBUF_BLK_SZ_SERIAL * entry_idx;
-		sh_page->ctrl.ringbuf[static_cast<u32>(RsxaudioPort::SPDIF_0)].entries[entry_idx].dma_addr = rsxaudio_obj->dma_io_base + u32{offsetof(rsxaudio_shmem, dma_spdif_0_region)} + SYS_RSXAUDIO_RINGBUF_BLK_SZ_SPDIF * entry_idx;
-		sh_page->ctrl.ringbuf[static_cast<u32>(RsxaudioPort::SPDIF_1)].entries[entry_idx].dma_addr = rsxaudio_obj->dma_io_base + u32{offsetof(rsxaudio_shmem, dma_spdif_1_region)} + SYS_RSXAUDIO_RINGBUF_BLK_SZ_SPDIF * entry_idx;
-	}
-
-	return CELL_OK;
-}
-
-error_code sys_rsxaudio_close_connection(u32 handle)
-{
-	sys_rsxaudio.trace("sys_rsxaudio_close_connection(handle=0x%x)", handle);
-
-	const auto rsxaudio_obj = idm::get_unlocked<lv2_obj, lv2_rsxaudio>(handle);
-
-	if (!rsxaudio_obj)
-	{
-		return CELL_ESRCH;
-	}
-
-	std::lock_guard<shared_mutex> lock(rsxaudio_obj->mutex);
-
-	if (!rsxaudio_obj->init)
-	{
-		return CELL_ESRCH;
-	}
-
-	{
-		auto& rsxaudio_thread = g_fxo->get<rsx_audio_data>();
-		std::lock_guard ra_obj_lock{rsxaudio_thread.rsxaudio_obj_upd_m};
-		rsxaudio_thread.rsxaudio_obj_ptr = null_ptr;
-	}
-
-	for (u32 q_idx = 0; q_idx < SYS_RSXAUDIO_PORT_CNT; q_idx++)
-	{
-		rsxaudio_obj->event_queue[q_idx].reset();
-	}
-
-	return CELL_OK;
-}
-
-error_code sys_rsxaudio_prepare_process(u32 handle)
-{
-	sys_rsxaudio.trace("sys_rsxaudio_prepare_process(handle=0x%x)", handle);
-
-	const auto rsxaudio_obj = idm::get_unlocked<lv2_obj, lv2_rsxaudio>(handle);
-
-	if (!rsxaudio_obj)
-	{
-		return CELL_ESRCH;
-	}
-
-	std::lock_guard<shared_mutex> lock(rsxaudio_obj->mutex);
-
-	if (!rsxaudio_obj->init)
-	{
-		return CELL_ESRCH;
-	}
-
-	auto& rsxaudio_thread = g_fxo->get<rsx_audio_data>();
-	std::lock_guard ra_obj_lock{rsxaudio_thread.rsxaudio_obj_upd_m};
-
-	if (rsxaudio_thread.rsxaudio_obj_ptr)
-	{
-		return -1;
-	}
-
-	rsxaudio_thread.rsxaudio_obj_ptr = rsxaudio_obj;
-
-	return CELL_OK;
-}
-
-error_code sys_rsxaudio_start_process(u32 handle)
-{
-	sys_rsxaudio.trace("sys_rsxaudio_start_process(handle=0x%x)", handle);
-
-	const auto rsxaudio_obj = idm::get_unlocked<lv2_obj, lv2_rsxaudio>(handle);
-
-	if (!rsxaudio_obj)
-	{
-		return CELL_ESRCH;
-	}
-
-	std::lock_guard<shared_mutex> lock(rsxaudio_obj->mutex);
-
-	if (!rsxaudio_obj->init)
-	{
-		return CELL_ESRCH;
-	}
-
-	rsxaudio_shmem* sh_page = rsxaudio_obj->get_rw_shared_page();
-
-	for (auto& rb : sh_page->ctrl.ringbuf)
-	{
-		if (rb.active) rsxaudio_ringbuf_reader::clean_buf(rb);
-	}
-
-	for (auto& uf : sh_page->ctrl.channel_uf)
-	{
-		uf.uf_event_cnt = 0;
-		uf.unk1         = 0;
-	}
-
-	auto& rsxaudio_thread = g_fxo->get<rsx_audio_data>();
-	rsxaudio_thread.update_hw_param([&](auto& param)
-	{
-		if (sh_page->ctrl.ringbuf[static_cast<u32>(RsxaudioPort::SERIAL)].active)  param.serial.dma_en   = true;
-		if (sh_page->ctrl.ringbuf[static_cast<u32>(RsxaudioPort::SPDIF_0)].active) param.spdif[0].dma_en = true;
-		if (sh_page->ctrl.ringbuf[static_cast<u32>(RsxaudioPort::SPDIF_1)].active) param.spdif[1].dma_en = true;
-	});
-
-	for (u32 q_idx = 0; q_idx < SYS_RSXAUDIO_PORT_CNT; q_idx++)
-	{
-		if (const auto& queue = rsxaudio_obj->event_queue[q_idx]; queue && sh_page->ctrl.ringbuf[q_idx].active)
-		{
-			queue->send(rsxaudio_obj->event_port_name[q_idx], q_idx, 0, 0);
-		}
-	}
-
-	return CELL_OK;
-}
-
-error_code sys_rsxaudio_stop_process(u32 handle)
-{
-	sys_rsxaudio.trace("sys_rsxaudio_stop_process(handle=0x%x)", handle);
-
-	const auto rsxaudio_obj = idm::get_unlocked<lv2_obj, lv2_rsxaudio>(handle);
-
-	if (!rsxaudio_obj)
-	{
-		return CELL_ESRCH;
-	}
-
-	std::lock_guard<shared_mutex> lock(rsxaudio_obj->mutex);
-
-	if (!rsxaudio_obj->init)
-	{
-		return CELL_ESRCH;
-	}
-
-	auto& rsxaudio_thread = g_fxo->get<rsx_audio_data>();
-
-	rsxaudio_thread.update_hw_param([&](auto& param)
-	{
-		param.serial.dma_en  = false;
-		param.serial.muted   = true;
-		param.serial.en      = false;
-
-		for (auto& spdif : param.spdif)
-		{
-			spdif.dma_en = false;
-			if (!spdif.use_serial_buf)
-			{
-				spdif.en = false;
-			}
-		}
-
-		param.spdif[1].muted  = true;
-	});
-
-	rsxaudio_shmem* sh_page = rsxaudio_obj->get_rw_shared_page();
-
-	for (auto& rb : sh_page->ctrl.ringbuf)
-	{
-		if (rb.active) rsxaudio_ringbuf_reader::clean_buf(rb);
-	}
-
-	return CELL_OK;
-}
-
-error_code sys_rsxaudio_get_dma_param(u32 handle, u32 flag, vm::ptr<u64> out)
-{
-	sys_rsxaudio.trace("sys_rsxaudio_get_dma_param(handle=0x%x, flag=0x%x, out=0x%x)", handle, flag, out);
-
-	const auto rsxaudio_obj = idm::get_unlocked<lv2_obj, lv2_rsxaudio>(handle);
-
-	if (!rsxaudio_obj)
-	{
-		return CELL_ESRCH;
-	}
-
-	std::lock_guard lock(rsxaudio_obj->mutex);
-
-	if (!rsxaudio_obj->init)
-	{
-		return CELL_ESRCH;
-	}
-
-	if (!vm::check_addr(out.addr(), vm::page_writable, sizeof(u64)))
-	{
-		return CELL_EFAULT;
-	}
-
-	if (flag == rsxaudio_dma_flag::IO_ID)
-	{
-		*out = rsxaudio_obj->dma_io_id;
-	}
-	else if (flag == rsxaudio_dma_flag::IO_BASE)
-	{
-		*out = rsxaudio_obj->dma_io_base;
-	}
-
-	return CELL_OK;
-}
-
-rsxaudio_data_container::rsxaudio_data_container(const rsxaudio_hw_param_t& hw_param, const buf_t& buf, bool serial_rdy, bool spdif_0_rdy, bool spdif_1_rdy) : hwp(hw_param), out_buf(buf)
-{
-	if (serial_rdy)
-	{
-		avport_data_avail[static_cast<u8>(RsxaudioAvportIdx::AVMULTI)] = true;
-
-		if (hwp.spdif[0].use_serial_buf)
-		{
-			avport_data_avail[static_cast<u8>(RsxaudioAvportIdx::SPDIF_0)] = true;
-		}
-
-		if (hwp.spdif[1].use_serial_buf)
-		{
-			avport_data_avail[static_cast<u8>(RsxaudioAvportIdx::SPDIF_1)] = true;
-		}
-	}
-
-	if (spdif_0_rdy && !hwp.spdif[0].use_serial_buf)
-	{
-		avport_data_avail[static_cast<u8>(RsxaudioAvportIdx::SPDIF_0)] = true;
-	}
-
-	if (spdif_1_rdy && !hwp.spdif[1].use_serial_buf)
-	{
-		avport_data_avail[static_cast<u8>(RsxaudioAvportIdx::SPDIF_1)] = true;
-	}
-
-	if (hwp.hdmi[0].init)
-	{
-		if (hwp.hdmi[0].use_spdif_1)
-		{
-			avport_data_avail[static_cast<u8>(RsxaudioAvportIdx::HDMI_0)] = avport_data_avail[static_cast<u8>(RsxaudioAvportIdx::SPDIF_1)];
-		}
-		else
-		{
-			avport_data_avail[static_cast<u8>(RsxaudioAvportIdx::HDMI_0)] = serial_rdy;
-		}
-
-		hdmi_stream_cnt[0] = static_cast<u8>(hwp.hdmi[0].ch_cfg.total_ch_cnt) / SYS_RSXAUDIO_CH_PER_STREAM;
-	}
-
-	if (hwp.hdmi[1].init)
-	{
-		if (hwp.hdmi[1].use_spdif_1)
-		{
-			avport_data_avail[static_cast<u8>(RsxaudioAvportIdx::HDMI_1)] = avport_data_avail[static_cast<u8>(RsxaudioAvportIdx::SPDIF_1)];
-		}
-		else
-		{
-			avport_data_avail[static_cast<u8>(RsxaudioAvportIdx::HDMI_1)] = serial_rdy;
-		}
-
-		hdmi_stream_cnt[1] = static_cast<u8>(hwp.hdmi[1].ch_cfg.total_ch_cnt) / SYS_RSXAUDIO_CH_PER_STREAM;
-	}
-}
-
-u32 rsxaudio_data_container::get_data_size(RsxaudioAvportIdx avport)
-{
-	if (!avport_data_avail[static_cast<u8>(avport)])
-	{
-		return 0;
-	}
-
-	switch (avport)
-	{
-	case RsxaudioAvportIdx::HDMI_0:
-	{
-		const RsxaudioSampleSize depth = hwp.hdmi[0].use_spdif_1 ? hwp.spdif[1].depth : hwp.serial.depth;
-
-		return (depth == RsxaudioSampleSize::_16BIT ? SYS_RSXAUDIO_STREAM_SIZE * 2 : SYS_RSXAUDIO_STREAM_SIZE) * hdmi_stream_cnt[0];
-	}
-	case RsxaudioAvportIdx::HDMI_1:
-	{
-		const RsxaudioSampleSize depth = hwp.hdmi[1].use_spdif_1 ? hwp.spdif[1].depth : hwp.serial.depth;
-
-		return (depth == RsxaudioSampleSize::_16BIT ? SYS_RSXAUDIO_STREAM_SIZE * 2 : SYS_RSXAUDIO_STREAM_SIZE) * hdmi_stream_cnt[1];
-	}
-	case RsxaudioAvportIdx::AVMULTI:
-	{
-		return hwp.serial.depth == RsxaudioSampleSize::_16BIT ? SYS_RSXAUDIO_STREAM_SIZE * 2 : SYS_RSXAUDIO_STREAM_SIZE;
-	}
-	case RsxaudioAvportIdx::SPDIF_0:
-	{
-		const RsxaudioSampleSize depth = hwp.spdif[0].use_serial_buf ? hwp.serial.depth : hwp.spdif[0].depth;
-
-		return depth == RsxaudioSampleSize::_16BIT ? SYS_RSXAUDIO_STREAM_SIZE * 2 : SYS_RSXAUDIO_STREAM_SIZE;
-	}
-	case RsxaudioAvportIdx::SPDIF_1:
-	{
-		const RsxaudioSampleSize depth = hwp.spdif[1].use_serial_buf ? hwp.serial.depth : hwp.spdif[1].depth;
-
-		return depth == RsxaudioSampleSize::_16BIT ? SYS_RSXAUDIO_STREAM_SIZE * 2 : SYS_RSXAUDIO_STREAM_SIZE;
-	}
-	default:
-	{
-		return 0;
-	}
-	}
-}
-
-void rsxaudio_data_container::get_data(RsxaudioAvportIdx avport, data_blk_t& data_out)
-{
-	if (!avport_data_avail[static_cast<u8>(avport)])
-	{
-		return;
-	}
-
-	data_was_written = true;
-
-	auto spdif_filter_map = [&](u8 hdmi_idx)
-	{
-		std::array<u8, SYS_RSXAUDIO_SERIAL_MAX_CH> result;
-
-		for (u64 i = 0; i < SYS_RSXAUDIO_SERIAL_MAX_CH; i++)
-		{
-			const u8 old_val = hwp.hdmi[hdmi_idx].ch_cfg.map[i];
-			result[i] = old_val >= SYS_RSXAUDIO_SPDIF_MAX_CH ? rsxaudio_hw_param_t::hdmi_param_t::MAP_SILENT_CH : old_val;
-		}
-
-		return result;
-	};
-
-	switch (avport)
-	{
-	case RsxaudioAvportIdx::HDMI_0:
-	case RsxaudioAvportIdx::HDMI_1:
-	{
-		const u8 hdmi_idx = avport == RsxaudioAvportIdx::HDMI_1;
-
-		switch (hdmi_stream_cnt[hdmi_idx])
-		{
-		default:
-		case 0:
-		{
-			return;
-		}
-		case 1:
-		{
-			if (hwp.hdmi[hdmi_idx].use_spdif_1)
-			{
-				if (hwp.spdif[1].use_serial_buf)
-				{
-					mix<2>(spdif_filter_map(hdmi_idx), hwp.serial.depth, out_buf.serial, data_out);
-				}
-				else
-				{
-					mix<2>(hwp.hdmi[hdmi_idx].ch_cfg.map, hwp.spdif[1].depth, out_buf.spdif[1], data_out);
-				}
-			}
-			else
-			{
-				mix<2>(hwp.hdmi[hdmi_idx].ch_cfg.map, hwp.serial.depth, out_buf.serial, data_out);
-			}
-			break;
-		}
-		case 3:
-		{
-			if (hwp.hdmi[hdmi_idx].use_spdif_1)
-			{
-				if (hwp.spdif[1].use_serial_buf)
-				{
-					mix<6>(spdif_filter_map(hdmi_idx), hwp.serial.depth, out_buf.serial, data_out);
-				}
-				else
-				{
-					mix<6>(hwp.hdmi[hdmi_idx].ch_cfg.map, hwp.spdif[1].depth, out_buf.spdif[1], data_out);
-				}
-			}
-			else
-			{
-				mix<6>(hwp.hdmi[hdmi_idx].ch_cfg.map, hwp.serial.depth, out_buf.serial, data_out);
-			}
-			break;
-		}
-		case 4:
-		{
-			if (hwp.hdmi[hdmi_idx].use_spdif_1)
-			{
-				if (hwp.spdif[1].use_serial_buf)
-				{
-					mix<8>(spdif_filter_map(hdmi_idx), hwp.serial.depth, out_buf.serial, data_out);
-				}
-				else
-				{
-					mix<8>(hwp.hdmi[hdmi_idx].ch_cfg.map, hwp.spdif[1].depth, out_buf.spdif[1], data_out);
-				}
-			}
-			else
-			{
-				mix<8>(hwp.hdmi[hdmi_idx].ch_cfg.map, hwp.serial.depth, out_buf.serial, data_out);
-			}
-			break;
-		}
-		}
-
-		break;
-	}
-	case RsxaudioAvportIdx::AVMULTI:
-	{
-		mix<2>({2, 3}, hwp.serial.depth, out_buf.serial, data_out);
-		break;
-	}
-	case RsxaudioAvportIdx::SPDIF_0:
-	case RsxaudioAvportIdx::SPDIF_1:
-	{
-		const u8 spdif_idx = avport == RsxaudioAvportIdx::SPDIF_1;
-
-		if (hwp.spdif[spdif_idx].use_serial_buf)
-		{
-			mix<2>({0, 1}, hwp.serial.depth, out_buf.serial, data_out);
-		}
-		else
-		{
-			mix<2>({0, 1}, hwp.spdif[spdif_idx].depth, out_buf.spdif[spdif_idx], data_out);
-		}
-		break;
-	}
-	default:
-	{
-		return;
-	}
-	}
-}
-
-bool rsxaudio_data_container::data_was_used()
-{
-	return data_was_written;
-}
-
-rsxaudio_data_thread::rsxaudio_data_thread() {}
-
-void rsxaudio_data_thread::operator()()
-{
-	thread_ctrl::scoped_priority high_prio(+1);
-
-	while (thread_ctrl::state() != thread_state::aborting)
-	{
-		static const std::function<void()> tmr_callback = [this]() { extract_audio_data(); };
-
-		switch (timer.wait(tmr_callback))
-		{
-		case rsxaudio_periodic_tmr::wait_result::SUCCESS:
-		case rsxaudio_periodic_tmr::wait_result::TIMEOUT:
-		case rsxaudio_periodic_tmr::wait_result::TIMER_CANCELED:
-		{
-			continue;
-		}
-		case rsxaudio_periodic_tmr::wait_result::INVALID_PARAM:
-		case rsxaudio_periodic_tmr::wait_result::TIMER_ERROR:
-		default:
-		{
-			fmt::throw_exception("rsxaudio_periodic_tmr::wait() failed");
-		}
-		}
-	}
-}
-
-rsxaudio_data_thread& rsxaudio_data_thread::operator=(thread_state /* state */)
-{
-	timer.cancel_wait();
-	return *this;
-}
-
-void rsxaudio_data_thread::advance_all_timers()
-{
-	const u64 crnt_time = get_system_time();
-
-	timer.vtimer_skip_periods(static_cast<u32>(RsxaudioPort::SERIAL), crnt_time);
-	timer.vtimer_skip_periods(static_cast<u32>(RsxaudioPort::SPDIF_0), crnt_time);
-	timer.vtimer_skip_periods(static_cast<u32>(RsxaudioPort::SPDIF_1), crnt_time);
-}
-
-void rsxaudio_data_thread::extract_audio_data()
-{
-	// Accessing timer state is safe here, since we're in timer::wait()
-
-	const auto rsxaudio_obj = [&]()
-	{
-		std::lock_guard ra_obj_lock{rsxaudio_obj_upd_m};
-		return rsxaudio_obj_ptr;
-	}();
-
-	if (Emu.IsPausedOrReady() || !rsxaudio_obj)
-	{
-		advance_all_timers();
-		return;
-	}
-
-	std::lock_guard<shared_mutex> rsxaudio_lock(rsxaudio_obj->mutex);
-
-	if (!rsxaudio_obj->init)
-	{
-		advance_all_timers();
-		return;
-	}
-
-	rsxaudio_shmem* sh_page = rsxaudio_obj->get_rw_shared_page();
-	const auto hw_cfg       = hw_param_ts.get_current();
-	const u64 crnt_time     = get_system_time();
-
-	auto process_rb = [&](RsxaudioPort dst, bool dma_en)
-	{
-		// SPDIF channel data and underflow events are always disabled by lv1
-
-		const u32 dst_raw = static_cast<u32>(dst);
-		rsxaudio_ringbuf_reader::set_timestamp(sh_page->ctrl.ringbuf[dst_raw], timer.vtimer_get_sched_time(dst_raw));
-
-		const auto [data_present, rb_addr] = get_ringbuf_addr(dst, *rsxaudio_obj);
-		bool reset_periods = !enqueue_data(dst, rb_addr == nullptr, rb_addr, *hw_cfg);
-
-		if (dma_en)
-		{
-			if (const auto [notify, blk_idx, timestamp] = rsxaudio_ringbuf_reader::update_status(sh_page->ctrl.ringbuf[dst_raw]); notify)
-			{
-				// Too late to recover
-				reset_periods = true;
-
-				if (const auto& queue = rsxaudio_obj->event_queue[dst_raw])
-				{
-					queue->send(rsxaudio_obj->event_port_name[dst_raw], dst_raw, blk_idx, timestamp);
-				}
-			}
-		}
-
-		if (reset_periods)
-		{
-			timer.vtimer_skip_periods(dst_raw, crnt_time);
-		}
-		else
-		{
-			timer.vtimer_incr(dst_raw, crnt_time);
-		}
-	};
-
-	if (timer.is_vtimer_behind(static_cast<u32>(RsxaudioPort::SERIAL), crnt_time))
-	{
-		process_rb(RsxaudioPort::SERIAL, hw_cfg->serial.dma_en);
-	}
-
-	if (timer.is_vtimer_behind(static_cast<u32>(RsxaudioPort::SPDIF_0), crnt_time))
-	{
-		process_rb(RsxaudioPort::SPDIF_0, hw_cfg->spdif[0].dma_en);
-	}
-
-	if (timer.is_vtimer_behind(static_cast<u32>(RsxaudioPort::SPDIF_1), crnt_time))
-	{
-		process_rb(RsxaudioPort::SPDIF_1, hw_cfg->spdif[1].dma_en);
-	}
-}
-
-std::pair<bool, void*> rsxaudio_data_thread::get_ringbuf_addr(RsxaudioPort dst, const lv2_rsxaudio& rsxaudio_obj)
-{
-	ensure(dst <= RsxaudioPort::SPDIF_1);
-
-	rsxaudio_shmem* sh_page = rsxaudio_obj.get_rw_shared_page();
-	const auto [data_present, addr] = rsxaudio_ringbuf_reader::get_addr(sh_page->ctrl.ringbuf[static_cast<u32>(dst)]);
-	const u32 buf_size = dst == RsxaudioPort::SERIAL ? SYS_RSXAUDIO_RINGBUF_BLK_SZ_SERIAL : SYS_RSXAUDIO_RINGBUF_BLK_SZ_SPDIF;
-
-	if (addr >= rsxaudio_obj.dma_io_base && addr < rsxaudio_obj.dma_io_base + sizeof(rsxaudio_shmem) - buf_size)
-	{
-		return std::make_pair(data_present, reinterpret_cast<u8*>(rsxaudio_obj.get_rw_shared_page()) + addr - rsxaudio_obj.dma_io_base);
-	}
-
-	// Buffer address is invalid
-	return std::make_pair(false, nullptr);
-}
-
-void rsxaudio_data_thread::reset_hw()
-{
-	update_hw_param([&](rsxaudio_hw_param_t& current)
-	{
-		const bool serial_dma_en = current.serial.dma_en;
-		current.serial = {};
-		current.serial.dma_en = serial_dma_en;
-
-		for (auto& spdif : current.spdif)
-		{
-			const bool spdif_dma_en = spdif.dma_en;
-			spdif = {};
-			spdif.dma_en = spdif_dma_en;
-		}
-
-		current.serial_freq_base = SYS_RSXAUDIO_FREQ_BASE_384K;
-		current.spdif_freq_base = SYS_RSXAUDIO_FREQ_BASE_352K;
-		current.avport_src.fill(RsxaudioPort::INVALID);
-	});
-}
-
-void rsxaudio_data_thread::update_hw_param(std::function<void(rsxaudio_hw_param_t&)> update_callback)
-{
-	ensure(update_callback);
-
-	hw_param_ts.add_op([&]()
-	{
-		auto new_hw_param = std::make_shared<rsxaudio_hw_param_t>(*hw_param_ts.get_current());
-
-		update_callback(*new_hw_param);
-
-		const bool serial_active = calc_port_active_state(RsxaudioPort::SERIAL, *new_hw_param);
-		const bool spdif_active[SYS_RSXAUDIO_SPDIF_CNT] =
-		{
-			calc_port_active_state(RsxaudioPort::SPDIF_0, *new_hw_param),
-			calc_port_active_state(RsxaudioPort::SPDIF_1, *new_hw_param)
-		};
-
-		std::array<rsxaudio_backend_thread::port_config, SYS_RSXAUDIO_AVPORT_CNT> port_cfg{};
-		port_cfg[static_cast<u8>(RsxaudioAvportIdx::AVMULTI)] = {static_cast<AudioFreq>(new_hw_param->serial_freq_base / new_hw_param->serial.freq_div), AudioChannelCnt::STEREO};
-
-		auto gen_spdif_port_cfg = [&](u8 spdif_idx)
-		{
-			if (new_hw_param->spdif[spdif_idx].use_serial_buf)
-			{
-				return port_cfg[static_cast<u8>(RsxaudioAvportIdx::AVMULTI)];
-			}
-
-			return rsxaudio_backend_thread::port_config{static_cast<AudioFreq>(new_hw_param->spdif_freq_base / new_hw_param->spdif[spdif_idx].freq_div), AudioChannelCnt::STEREO};
-		};
-
-		port_cfg[static_cast<u8>(RsxaudioAvportIdx::SPDIF_0)] = gen_spdif_port_cfg(0);
-		port_cfg[static_cast<u8>(RsxaudioAvportIdx::SPDIF_1)] = gen_spdif_port_cfg(1);
-
-		auto gen_hdmi_port_cfg = [&](u8 hdmi_idx)
-		{
-			if (new_hw_param->hdmi[hdmi_idx].use_spdif_1)
-			{
-				return rsxaudio_backend_thread::port_config{port_cfg[static_cast<u8>(RsxaudioAvportIdx::SPDIF_1)].freq, new_hw_param->hdmi[hdmi_idx].ch_cfg.total_ch_cnt};
-			}
-
-			return rsxaudio_backend_thread::port_config{port_cfg[static_cast<u8>(RsxaudioAvportIdx::AVMULTI)].freq, new_hw_param->hdmi[hdmi_idx].ch_cfg.total_ch_cnt};
-		};
-
-		port_cfg[static_cast<u8>(RsxaudioAvportIdx::HDMI_0)] = gen_hdmi_port_cfg(0);
-		port_cfg[static_cast<u8>(RsxaudioAvportIdx::HDMI_1)] = gen_hdmi_port_cfg(1);
-		// TODO: ideally, old data must be flushed from backend buffers if channel became inactive or its src changed
-		g_fxo->get<rsx_audio_backend>().set_new_stream_param(port_cfg, calc_avport_mute_state(*new_hw_param));
-
-		timer.vtimer_access_sec([&]()
-		{
-			const u64 crnt_time = get_system_time();
-
-			if (serial_active)
-			{
-				// 2 channels per stream, streams go in parallel
-				const u32 new_timer_rate = static_cast<u32>(port_cfg[static_cast<u8>(RsxaudioAvportIdx::AVMULTI)].freq) *
-											static_cast<u8>(new_hw_param->serial.depth) *
-											SYS_RSXAUDIO_CH_PER_STREAM;
-
-				timer.enable_vtimer(static_cast<u32>(RsxaudioPort::SERIAL), new_timer_rate, crnt_time);
-			}
-			else
-			{
-				timer.disable_vtimer(static_cast<u32>(RsxaudioPort::SERIAL));
-			}
-
-			for (u8 spdif_idx = 0; spdif_idx < SYS_RSXAUDIO_SPDIF_CNT; spdif_idx++)
-			{
-				const u32 vtimer_id = static_cast<u32>(RsxaudioPort::SPDIF_0) + spdif_idx;
-
-				if (spdif_active[spdif_idx] && !new_hw_param->spdif[spdif_idx].use_serial_buf)
-				{
-					// 2 channels per stream, single stream
-					const u32 new_timer_rate = static_cast<u32>(port_cfg[static_cast<u8>(RsxaudioAvportIdx::SPDIF_0) + spdif_idx].freq) *
-												static_cast<u8>(new_hw_param->spdif[spdif_idx].depth) *
-												SYS_RSXAUDIO_CH_PER_STREAM;
-
-					timer.enable_vtimer(vtimer_id, new_timer_rate, crnt_time);
-				}
-				else
-				{
-					timer.disable_vtimer(vtimer_id);
-				}
-			}
-		});
-
-		return new_hw_param;
-	});
-}
-
-void rsxaudio_data_thread::update_mute_state(RsxaudioPort port, bool muted)
-{
-	hw_param_ts.add_op([&]()
-	{
-		auto new_hw_param = std::make_shared<rsxaudio_hw_param_t>(*hw_param_ts.get_current());
-
-		switch (port)
-		{
-		case RsxaudioPort::SERIAL:
-		{
-			new_hw_param->serial.muted = muted;
-			break;
-		}
-		case RsxaudioPort::SPDIF_0:
-		{
-			new_hw_param->spdif[0].muted = muted;
-			break;
-		}
-		case RsxaudioPort::SPDIF_1:
-		{
-			new_hw_param->spdif[1].muted = muted;
-			break;
-		}
-		default:
-		{
-			fmt::throw_exception("Invalid RSXAudio port: %u", static_cast<u8>(port));
-		}
-		}
-
-		g_fxo->get<rsx_audio_backend>().set_mute_state(calc_avport_mute_state(*new_hw_param));
-
-		return new_hw_param;
-	});
-}
-
-void rsxaudio_data_thread::update_av_mute_state(RsxaudioAvportIdx avport, bool muted, bool force_mute, bool set)
-{
-	hw_param_ts.add_op([&]()
-	{
-		auto new_hw_param = std::make_shared<rsxaudio_hw_param_t>(*hw_param_ts.get_current());
-
-		switch (avport)
-		{
-		case RsxaudioAvportIdx::HDMI_0:
-		case RsxaudioAvportIdx::HDMI_1:
-		{
-			const u32 hdmi_idx = avport == RsxaudioAvportIdx::HDMI_1;
-
-			if (muted)
-			{
-				new_hw_param->hdmi[hdmi_idx].muted = set;
-			}
-
-			if (force_mute)
-			{
-				new_hw_param->hdmi[hdmi_idx].force_mute = set;
-			}
-			break;
-		}
-		case RsxaudioAvportIdx::AVMULTI:
-		{
-			if (muted)
-			{
-				new_hw_param->avmulti_av_muted = set;
-			}
-			break;
-		}
-		default:
-		{
-			fmt::throw_exception("Invalid RSXAudio avport: %u", static_cast<u8>(avport));
-		}
-		}
-
-		g_fxo->get<rsx_audio_backend>().set_mute_state(calc_avport_mute_state(*new_hw_param));
-
-		return new_hw_param;
-	});
-}
-
-rsxaudio_backend_thread::avport_bit rsxaudio_data_thread::calc_avport_mute_state(const rsxaudio_hw_param_t& hwp)
-{
-	const bool serial_active = calc_port_active_state(RsxaudioPort::SERIAL, hwp);
-
-	const bool spdif_active[SYS_RSXAUDIO_SPDIF_CNT] =
-	{
-		calc_port_active_state(RsxaudioPort::SPDIF_0, hwp),
-		calc_port_active_state(RsxaudioPort::SPDIF_1, hwp)
-	};
-
-	const bool avmulti = !serial_active || hwp.serial.muted || hwp.avmulti_av_muted;
-
-	auto spdif_muted = [&](u8 spdif_idx)
-	{
-		const u8 spdif_port = spdif_idx == 1;
-
-		if (hwp.spdif[spdif_port].use_serial_buf)
-		{
-			// TODO: HW test if both serial and spdif mutes are used in serial mode for spdif
-			return !serial_active || hwp.spdif[spdif_port].freq_div != hwp.serial.freq_div || hwp.serial.muted || hwp.spdif[spdif_port].muted;
-		}
-
-		return !spdif_active[spdif_port] || hwp.spdif[spdif_port].muted;
-	};
-
-	auto hdmi_muted  = [&](u8 hdmi_idx)
-	{
-		const u8 hdmi_port = hdmi_idx == 1;
-
-		if (hwp.hdmi[hdmi_idx].use_spdif_1)
-		{
-			return spdif_muted(1) || hwp.hdmi[hdmi_port].muted || hwp.hdmi[hdmi_port].force_mute || !hwp.hdmi[hdmi_port].init;
-		}
-
-		return !serial_active || hwp.serial.muted || hwp.hdmi[hdmi_port].muted || hwp.hdmi[hdmi_port].force_mute || !hwp.hdmi[hdmi_port].init;
-	};
-
-	return { hdmi_muted(0), hdmi_muted(1), avmulti, spdif_muted(0), spdif_muted(1) };
-}
-
-bool rsxaudio_data_thread::calc_port_active_state(RsxaudioPort port, const rsxaudio_hw_param_t& hwp)
-{
-	auto gen_serial_active = [&]()
-	{
-		return hwp.serial.dma_en && hwp.serial.buf_empty_en && hwp.serial.en;
-	};
-
-	auto gen_spdif_active = [&](u8 spdif_idx)
-	{
-		if (hwp.spdif[spdif_idx].use_serial_buf)
-		{
-			return gen_serial_active() && (hwp.spdif[spdif_idx].freq_div == hwp.serial.freq_div);
-		}
-
-		return hwp.spdif[spdif_idx].dma_en && hwp.spdif[spdif_idx].buf_empty_en && hwp.spdif[spdif_idx].en;
-	};
-
-	switch (port)
-	{
-	case RsxaudioPort::SERIAL:
-	{
-		return gen_serial_active();
-	}
-	case RsxaudioPort::SPDIF_0:
-	{
-		return gen_spdif_active(0);
-	}
-	case RsxaudioPort::SPDIF_1:
-	{
-		return gen_spdif_active(1);
-	}
-	default:
-	{
-		return false;
-	}
-	}
-}
-
-f32 rsxaudio_data_thread::pcm_to_float(s32 sample)
-{
-	return sample * (1.0f / 2147483648.0f);
-}
-
-f32 rsxaudio_data_thread::pcm_to_float(s16 sample)
-{
-	return sample * (1.0f / 32768.0f);
-}
-
-void rsxaudio_data_thread::pcm_serial_process_channel(RsxaudioSampleSize word_bits, ra_stream_blk_t& buf_out_l, ra_stream_blk_t& buf_out_r, const void* buf_in, u8 src_stream)
-{
-	const u8 input_word_sz = static_cast<u8>(word_bits);
-	u64 ch_dst = 0;
-
-	for (u64 blk_idx = 0; blk_idx < SYS_RSXAUDIO_STREAM_DATA_BLK_CNT; blk_idx++)
-	{
-		for (u64 offset = 0; offset < SYS_RSXAUDIO_DATA_BLK_SIZE / 2; offset += input_word_sz, ch_dst++)
-		{
-			const u64 left_ch_src = (blk_idx * SYS_RSXAUDIO_STREAM_SIZE + src_stream * SYS_RSXAUDIO_DATA_BLK_SIZE + offset) / input_word_sz;
-			const u64 right_ch_src = left_ch_src + (SYS_RSXAUDIO_DATA_BLK_SIZE / 2) / input_word_sz;
-
-			if (word_bits == RsxaudioSampleSize::_16BIT)
-			{
-				buf_out_l[ch_dst] = pcm_to_float(static_cast<const be_t<s16>*>(buf_in)[left_ch_src]);
-				buf_out_r[ch_dst] = pcm_to_float(static_cast<const be_t<s16>*>(buf_in)[right_ch_src]);
-			}
-			else
-			{
-				// Looks like rsx treats 20bit/24bit samples as 32bit ones
-				buf_out_l[ch_dst] = pcm_to_float(static_cast<const be_t<s32>*>(buf_in)[left_ch_src]);
-				buf_out_r[ch_dst] = pcm_to_float(static_cast<const be_t<s32>*>(buf_in)[right_ch_src]);
-			}
-		}
-	}
-}
-
-void rsxaudio_data_thread::pcm_spdif_process_channel(RsxaudioSampleSize word_bits, ra_stream_blk_t& buf_out_l, ra_stream_blk_t& buf_out_r, const void* buf_in)
-{
-	const u8 input_word_sz = static_cast<u8>(word_bits);
-
-	for (u64 offset = 0; offset < SYS_RSXAUDIO_RINGBUF_BLK_SZ_SPDIF / (input_word_sz * SYS_RSXAUDIO_SPDIF_MAX_CH); offset++)
-	{
-		const u64 left_ch_src = offset * SYS_RSXAUDIO_SPDIF_MAX_CH;
-		const u64 right_ch_src = left_ch_src + 1;
-
-		if (word_bits == RsxaudioSampleSize::_16BIT)
-		{
-			buf_out_l[offset] = pcm_to_float(static_cast<const be_t<s16>*>(buf_in)[left_ch_src]);
-			buf_out_r[offset] = pcm_to_float(static_cast<const be_t<s16>*>(buf_in)[right_ch_src]);
-		}
-		else
-		{
-			// Looks like rsx treats 20bit/24bit samples as 32bit ones
-			buf_out_l[offset] = pcm_to_float(static_cast<const be_t<s32>*>(buf_in)[left_ch_src]);
-			buf_out_r[offset] = pcm_to_float(static_cast<const be_t<s32>*>(buf_in)[right_ch_src]);
-		}
-	}
-}
-
-bool rsxaudio_data_thread::enqueue_data(RsxaudioPort dst, bool silence, const void* src_addr, const rsxaudio_hw_param_t& hwp)
-{
-	auto& backend_thread = g_fxo->get<rsx_audio_backend>();
-
-	if (dst == RsxaudioPort::SERIAL)
-	{
-		if (!silence)
-		{
-			for (u8 stream_idx = 0; stream_idx < SYS_RSXAUDIO_SERIAL_STREAM_CNT; stream_idx++)
-			{
-				pcm_serial_process_channel(hwp.serial.depth, output_buf.serial[stream_idx * 2], output_buf.serial[stream_idx * 2 + 1], src_addr, stream_idx);
-			}
-		}
-		else
-		{
-			output_buf.serial.fill({});
-		}
-
-		rsxaudio_data_container cont{hwp, output_buf, true, false, false};
-		backend_thread.add_data(cont);
-		return cont.data_was_used();
-	}
-	else if (dst == RsxaudioPort::SPDIF_0)
-	{
-		if (!silence)
-		{
-			pcm_spdif_process_channel(hwp.spdif[0].depth, output_buf.spdif[0][0], output_buf.spdif[0][1], src_addr);
-		}
-		else
-		{
-			output_buf.spdif[0].fill({});
-		}
-
-		rsxaudio_data_container cont{hwp, output_buf, false, true, false};
-		backend_thread.add_data(cont);
-		return cont.data_was_used();
-	}
-	else if (dst == RsxaudioPort::SPDIF_1)
-	{
-		if (!silence)
-		{
-			pcm_spdif_process_channel(hwp.spdif[1].depth, output_buf.spdif[1][0], output_buf.spdif[1][1], src_addr);
-		}
-		else
-		{
-			output_buf.spdif[1].fill({});
-		}
-
-		rsxaudio_data_container cont{hwp, output_buf, false, false, true};
-		backend_thread.add_data(cont);
-		return cont.data_was_used();
-	}
-
-	return false;
-}
-
-namespace audio
-{
-	extern void configure_rsxaudio()
-	{
-		if (g_cfg.audio.provider == audio_provider::rsxaudio && g_fxo->is_init<rsx_audio_backend>())
-		{
-			g_fxo->get<rsx_audio_backend>().update_emu_cfg();
-		}
-	}
-}
-
-rsxaudio_backend_thread::rsxaudio_backend_thread()
-{
-	new_emu_cfg = get_emu_cfg();
-
-	const f32 new_vol = audio::get_volume();
-
-	callback_cfg.atomic_op([&](callback_config& val)
-	{
-		val.target_volume = static_cast<u16>(new_vol * callback_config::VOL_NOMINAL);
-		val.initial_volume = val.current_volume;
-	});
-}
-
-rsxaudio_backend_thread::~rsxaudio_backend_thread()
-{
-	if (backend)
-	{
-		backend->Close();
-		backend->SetWriteCallback(nullptr);
-		backend->SetStateCallback(nullptr);
-		backend = nullptr;
-	}
-}
-
-void rsxaudio_backend_thread::update_emu_cfg()
-{
-	std::unique_lock lock(state_update_m);
-	const emu_audio_cfg _new_emu_cfg = get_emu_cfg();
-	const f32 new_vol = audio::get_volume();
-
-	callback_cfg.atomic_op([&](callback_config& val)
-	{
-		val.target_volume = static_cast<u16>(new_vol * callback_config::VOL_NOMINAL);
-		val.initial_volume = val.current_volume;
-	});
-
-	if (new_emu_cfg != _new_emu_cfg)
-	{
-		new_emu_cfg = _new_emu_cfg;
-		emu_cfg_changed = true;
-		lock.unlock();
-		state_update_c.notify_all();
-	}
-}
-
-u32 rsxaudio_backend_thread::get_sample_rate() const
-{
-	return callback_cfg.load().freq;
-}
-
-u8 rsxaudio_backend_thread::get_channel_count() const
-{
-	return callback_cfg.load().input_ch_cnt;
-}
-
-rsxaudio_backend_thread::emu_audio_cfg rsxaudio_backend_thread::get_emu_cfg()
-{
-	// Get max supported channel count
-	AudioChannelCnt out_ch_cnt = AudioBackend::get_max_channel_count(0); // CELL_AUDIO_OUT_PRIMARY
-
-	emu_audio_cfg cfg =
-	{
-		.audio_device = g_cfg.audio.audio_device,
-		.desired_buffer_duration = g_cfg.audio.desired_buffer_duration,
-		.time_stretching_threshold = g_cfg.audio.time_stretching_threshold / 100.0,
-		.buffering_enabled = static_cast<bool>(g_cfg.audio.enable_buffering),
-		.convert_to_s16 = static_cast<bool>(g_cfg.audio.convert_to_s16),
-		.enable_time_stretching = static_cast<bool>(g_cfg.audio.enable_time_stretching),
-		.dump_to_file = static_cast<bool>(g_cfg.audio.dump_to_file),
-		.channels = out_ch_cnt,
-		.channel_layout = g_cfg.audio.channel_layout,
-		.renderer = g_cfg.audio.renderer,
-		.provider = g_cfg.audio.provider,
-		.avport = convert_avport(g_cfg.audio.rsxaudio_port)
-	};
-
-	cfg.buffering_enabled = cfg.buffering_enabled && cfg.renderer != audio_renderer::null;
-	cfg.enable_time_stretching = cfg.buffering_enabled && cfg.enable_time_stretching && cfg.time_stretching_threshold > 0.0;
-
-	return cfg;
-}
-
-void rsxaudio_backend_thread::operator()()
-{
-	if (g_cfg.audio.provider != audio_provider::rsxaudio)
-	{
-		return;
-	}
-
-	static rsxaudio_state ra_state{};
-	static emu_audio_cfg emu_cfg{};
-	static bool backend_failed = false;
-
-	for (;;)
-	{
-		bool should_update_backend = false;
-		bool reset_backend = false;
-		bool checkDefaultDevice = false;
-		bool should_service_stream = false;
-
-		{
-			std::unique_lock lock(state_update_m);
-			for (;;)
-			{
-				// Unsafe to access backend under lock (state_changed_callback uses state_update_m -> possible deadlock)
-
-				if (thread_ctrl::state() == thread_state::aborting)
-				{
-					lock.unlock();
-					backend_stop();
-					return;
-				}
-
-				if (backend_device_changed)
-				{
-					should_update_backend = true;
-					checkDefaultDevice = true;
-					backend_device_changed = false;
-				}
-
-				// Emulated state changed
-				if (ra_state_changed)
-				{
-					const callback_config cb_cfg = callback_cfg.observe();
-					ra_state_changed = false;
-					ra_state = new_ra_state;
-
-					if (cb_cfg.cfg_changed)
-					{
-						should_update_backend = true;
-						checkDefaultDevice = false;
-						callback_cfg.atomic_op([&](callback_config& val)
-						{
-							val.cfg_changed = false; // Acknowledge cfg update
-						});
-					}
-				}
-
-				// Update emu config
-				if (emu_cfg_changed)
-				{
-					reset_backend |= emu_cfg.renderer != new_emu_cfg.renderer;
-					emu_cfg_changed = false;
-					emu_cfg = new_emu_cfg;
-					should_update_backend = true;
-					checkDefaultDevice = false;
-				}
-
-				// Handle backend error notification
-				if (backend_error_occured)
-				{
-					reset_backend = true;
-					should_update_backend = true;
-					checkDefaultDevice = false;
-					backend_error_occured = false;
-				}
-
-				if (should_update_backend)
-				{
-					backend_current_cfg.cfg = ra_state.port[static_cast<u8>(emu_cfg.avport)];
-					backend_current_cfg.avport = emu_cfg.avport;
-					break;
-				}
-
-				if (backend_failed)
-				{
-					state_update_c.wait(state_update_m, ERROR_SERVICE_PERIOD);
-					break;
-				}
-
-				if (use_aux_ringbuf)
-				{
-					const u64 next_period_time = get_time_until_service();
-					should_service_stream = next_period_time <= SERVICE_THRESHOLD;
-
-					if (should_service_stream)
-					{
-						break;
-					}
-
-					state_update_c.wait(state_update_m, next_period_time);
-				}
-				else
-				{
-					// Nothing to do - wait for events
-					state_update_c.wait(state_update_m, umax);
-				}
-			}
-		}
-
-		if (should_update_backend && (!checkDefaultDevice || backend->DefaultDeviceChanged()))
-		{
-			backend_init(ra_state, emu_cfg, reset_backend);
-
-			if (emu_cfg.enable_time_stretching)
-			{
-				resampler.set_params(backend_current_cfg.cfg.ch_cnt, backend_current_cfg.cfg.freq);
-				resampler.set_tempo(RESAMPLER_MAX_FREQ_VAL);
-			}
-
-			if (emu_cfg.dump_to_file)
-			{
-				dumper.Open(backend_current_cfg.cfg.ch_cnt, backend_current_cfg.cfg.freq, AudioSampleSize::FLOAT);
-			}
-			else
-			{
-				dumper.Close();
-			}
-		}
-
-		if (!backend->Operational())
-		{
-			if (!backend_failed)
-			{
-				sys_rsxaudio.warning("Backend stopped unexpectedly (likely device change). Attempting to recover...");
-			}
-
-			backend_init(ra_state, emu_cfg);
-			backend_failed = true;
-			continue;
-		}
-
-		if (backend_failed)
-		{
-			sys_rsxaudio.warning("Backend recovered");
-			backend_failed = false;
-		}
-
-		if (!Emu.IsPausedOrReady() || !use_aux_ringbuf) // Don't pause if thread is in direct mode
-		{
-			if (!backend_playing())
-			{
-				backend_start();
-				reset_service_time();
-				continue;
-			}
-
-			if (should_service_stream)
-			{
-				void* crnt_buf = thread_tmp_buf.data();
-
-				const u64 bytes_req = ringbuf.get_free_size();
-				const u64 bytes_read = aux_ringbuf.pop(crnt_buf, bytes_req, true);
-				u64 crnt_buf_size = bytes_read;
-
-				if (emu_cfg.enable_time_stretching)
-				{
-					const u64 input_ch_cnt = static_cast<u64>(ra_state.port[static_cast<u8>(emu_cfg.avport)].ch_cnt);
-					const u64 bytes_per_sample = static_cast<u32>(AudioSampleSize::FLOAT) * input_ch_cnt;
-					const u64 samples_req = bytes_req / bytes_per_sample;
-					const u64 samples_avail = crnt_buf_size / bytes_per_sample;
-					const f64 resampler_ratio = resampler.get_resample_ratio();
-					f64 fullness_ratio = static_cast<f64>(samples_avail + resampler.samples_available()) / samples_req;
-
-					if (fullness_ratio < emu_cfg.time_stretching_threshold)
-					{
-						fullness_ratio /= emu_cfg.time_stretching_threshold;
-						const f64 new_resampler_ratio = (resampler_ratio + fullness_ratio) / 2.0;
-						if (std::abs(new_resampler_ratio - resampler_ratio) >= TIME_STRETCHING_STEP)
-						{
-							resampler.set_tempo(new_resampler_ratio);
-						}
-					}
-					else if (resampler_ratio != RESAMPLER_MAX_FREQ_VAL)
-					{
-						resampler.set_tempo(RESAMPLER_MAX_FREQ_VAL);
-					}
-
-					resampler.put_samples(static_cast<f32*>(crnt_buf), static_cast<u32>(samples_avail));
-					const auto [resampled_data, sample_cnt] = resampler.get_samples(static_cast<u32>(samples_req));
-					crnt_buf = resampled_data;
-					crnt_buf_size = sample_cnt * bytes_per_sample;
-				}
-
-				// Dump audio if enabled
-				if (emu_cfg.dump_to_file)
-				{
-					dumper.WriteData(crnt_buf, static_cast<u32>(crnt_buf_size));
-				}
-
-				ringbuf.push(crnt_buf, crnt_buf_size);
-
-				update_service_time();
-			}
-		}
-		else
-		{
-			if (backend_playing())
-			{
-				backend_stop();
-			}
-
-			if (should_service_stream)
-			{
-				update_service_time();
-			}
-		}
-	}
-}
-
-rsxaudio_backend_thread& rsxaudio_backend_thread::operator=(thread_state /* state */)
-{
-	{
-		std::lock_guard lock(state_update_m);
-	}
-	state_update_c.notify_all();
-	return *this;
-}
-
-void rsxaudio_backend_thread::set_new_stream_param(const std::array<port_config, SYS_RSXAUDIO_AVPORT_CNT> &cfg, avport_bit muted_avports)
-{
-	std::unique_lock lock(state_update_m);
-
-	const auto new_mute_state = gen_mute_state(muted_avports);
-	const bool should_update = backend_current_cfg.cfg != cfg[static_cast<u8>(backend_current_cfg.avport)];
-
-	callback_cfg.atomic_op([&](callback_config& val)
-	{
-		val.mute_state = new_mute_state;
-
-		if (should_update)
-		{
-			val.ready = false; // Prevent audio playback until backend is reconfigured
-			val.cfg_changed = true;
-		}
-	});
-
-	if (new_ra_state.port != cfg)
-	{
-		new_ra_state.port = cfg;
-		ra_state_changed = true;
-		lock.unlock();
-		state_update_c.notify_all();
-	}
-}
-
-void rsxaudio_backend_thread::set_mute_state(avport_bit muted_avports)
-{
-	const auto new_mute_state = gen_mute_state(muted_avports);
-
-	callback_cfg.atomic_op([&](callback_config& val)
-	{
-		val.mute_state = new_mute_state;
-	});
-}
-
-u8 rsxaudio_backend_thread::gen_mute_state(avport_bit avports)
-{
-	std::bitset<SYS_RSXAUDIO_AVPORT_CNT> mute_state{0};
-
-	if (avports.hdmi_0)  mute_state[static_cast<u8>(RsxaudioAvportIdx::HDMI_0)]  = true;
-	if (avports.hdmi_1)  mute_state[static_cast<u8>(RsxaudioAvportIdx::HDMI_1)]  = true;
-	if (avports.avmulti) mute_state[static_cast<u8>(RsxaudioAvportIdx::AVMULTI)] = true;
-	if (avports.spdif_0) mute_state[static_cast<u8>(RsxaudioAvportIdx::SPDIF_0)] = true;
-	if (avports.spdif_1) mute_state[static_cast<u8>(RsxaudioAvportIdx::SPDIF_1)] = true;
-
-	return static_cast<u8>(mute_state.to_ulong());
-}
-
-void rsxaudio_backend_thread::add_data(rsxaudio_data_container& cont)
-{
-	std::unique_lock lock(ringbuf_mutex, std::try_to_lock);
-	if (!lock.owns_lock())
-	{
-		return;
-	}
-
-	const callback_config cb_cfg = callback_cfg.observe();
-	if (!cb_cfg.ready || !cb_cfg.callback_active)
-	{
-		return;
-	}
-
-	static rsxaudio_data_container::data_blk_t in_data_blk{};
-
-	if (u32 len = cont.get_data_size(cb_cfg.avport_idx))
-	{
-		if (use_aux_ringbuf)
-		{
-			if (aux_ringbuf.get_free_size() >= len)
-			{
-				cont.get_data(cb_cfg.avport_idx, in_data_blk);
-				aux_ringbuf.push(in_data_blk.data(), len);
-			}
-		}
-		else
-		{
-			if (ringbuf.get_free_size() >= len)
-			{
-				cont.get_data(cb_cfg.avport_idx, in_data_blk);
-				ringbuf.push(in_data_blk.data(), len);
-			}
-		}
-	}
-}
-
-RsxaudioAvportIdx rsxaudio_backend_thread::convert_avport(audio_avport avport)
-{
-	switch (avport)
-	{
-	case audio_avport::hdmi_0:  return RsxaudioAvportIdx::HDMI_0;
-	case audio_avport::hdmi_1:  return RsxaudioAvportIdx::HDMI_1;
-	case audio_avport::avmulti: return RsxaudioAvportIdx::AVMULTI;
-	case audio_avport::spdif_0: return RsxaudioAvportIdx::SPDIF_0;
-	case audio_avport::spdif_1: return RsxaudioAvportIdx::SPDIF_1;
-	default:
-	{
-		fmt::throw_exception("Invalid RSXAudio avport: %u", static_cast<u8>(avport));
-	}
-	}
-}
-
-void rsxaudio_backend_thread::backend_init(const rsxaudio_state& ra_state, const emu_audio_cfg& emu_cfg, bool reset_backend)
-{
-	if (reset_backend || !backend)
-	{
-		backend = nullptr;
-		backend = Emu.GetCallbacks().get_audio();
-		backend->SetWriteCallback(std::bind(&rsxaudio_backend_thread::write_data_callback, this, std::placeholders::_1, std::placeholders::_2));
-		backend->SetStateCallback(std::bind(&rsxaudio_backend_thread::state_changed_callback, this, std::placeholders::_1));
-	}
-
-	const port_config& port_cfg = ra_state.port[static_cast<u8>(emu_cfg.avport)];
-	const AudioSampleSize sample_size = emu_cfg.convert_to_s16 ? AudioSampleSize::S16 : AudioSampleSize::FLOAT;
-	const AudioChannelCnt ch_cnt = static_cast<AudioChannelCnt>(std::min<u32>(static_cast<u32>(port_cfg.ch_cnt), static_cast<u32>(emu_cfg.channels)));
-
-	f64 cb_frame_len = 0.0;
-	audio_channel_layout backend_channel_layout = audio_channel_layout::stereo;
-
-	if (backend->Open(emu_cfg.audio_device, port_cfg.freq, sample_size, ch_cnt, emu_cfg.channel_layout))
-	{
-		cb_frame_len = backend->GetCallbackFrameLen();
-		backend_channel_layout = backend->get_channel_layout();
-		sys_rsxaudio.notice("Opened audio backend (sampling_rate=%d, sample_size=%d, channels=%d, layout=%s)", backend->get_sampling_rate(), backend->get_sample_size(), backend->get_channels(), backend->get_channel_layout());
-	}
-	else
-	{
-		sys_rsxaudio.error("Failed to open audio backend. Make sure that no other application is running that might block audio access (e.g. Netflix).");
-	}
-
-	static constexpr f64 _10ms = 512.0 / 48000.0;
-	const f64 buffering_len = emu_cfg.buffering_enabled ? (emu_cfg.desired_buffer_duration / 1000.0) : 0.0;
-	const u64 bytes_per_sec = static_cast<u32>(AudioSampleSize::FLOAT) * static_cast<u32>(port_cfg.ch_cnt) * static_cast<u32>(port_cfg.freq);
-
-	{
-		std::lock_guard lock(ringbuf_mutex);
-		use_aux_ringbuf = emu_cfg.enable_time_stretching || emu_cfg.dump_to_file;
-
-		if (use_aux_ringbuf)
-		{
-			const f64 frame_len = std::max<f64>(buffering_len * 0.5, SERVICE_PERIOD_SEC) + cb_frame_len + _10ms;
-			const u64 frame_len_bytes = static_cast<u64>(std::round(frame_len * bytes_per_sec));
-			aux_ringbuf.set_buf_size(frame_len_bytes);
-			ringbuf.set_buf_size(frame_len_bytes);
-			thread_tmp_buf.resize(frame_len_bytes);
-		}
-		else
-		{
-			const f64 frame_len = std::max<f64>(buffering_len, cb_frame_len) + _10ms;
-			ringbuf.set_buf_size(static_cast<u64>(std::round(frame_len * bytes_per_sec)));
-			thread_tmp_buf.resize(0);
-		}
-
-		callback_tmp_buf.resize(static_cast<usz>((cb_frame_len + _10ms) * static_cast<u32>(AudioSampleSize::FLOAT) * static_cast<u32>(port_cfg.ch_cnt) * static_cast<u32>(port_cfg.freq)));
-	}
-
-	callback_cfg.atomic_op([&](callback_config& val)
-	{
-		val.callback_active = false; // Backend may take some time to activate. This prevents overflows on input side.
-
-		if (!val.cfg_changed)
-		{
-			val.freq = static_cast<u32>(port_cfg.freq);
-			val.input_ch_cnt = static_cast<u32>(port_cfg.ch_cnt);
-			val.output_channel_layout = static_cast<u8>(backend_channel_layout);
-			val.convert_to_s16 = emu_cfg.convert_to_s16;
-			val.avport_idx = emu_cfg.avport;
-			val.ready = true;
-		}
-	});
-}
-
-void rsxaudio_backend_thread::backend_start()
-{
-	ensure(backend != nullptr);
-
-	if (use_aux_ringbuf)
-	{
-		resampler.set_tempo(RESAMPLER_MAX_FREQ_VAL);
-		resampler.flush();
-		aux_ringbuf.reader_flush();
-	}
-
-	ringbuf.reader_flush();
-	backend->Play();
-}
-
-void rsxaudio_backend_thread::backend_stop()
-{
-	if (backend == nullptr)
-	{
-		return;
-	}
-
-	backend->Pause();
-	callback_cfg.atomic_op([&](callback_config& val)
-	{
-		val.callback_active = false;
-	});
-}
-
-bool rsxaudio_backend_thread::backend_playing()
-{
-	if (backend == nullptr)
-	{
-		return false;
-	}
-
-	return backend->IsPlaying();
-}
-
-u32 rsxaudio_backend_thread::write_data_callback(u32 bytes, void* buf)
-{
-	const callback_config cb_cfg = callback_cfg.atomic_op([&](callback_config& val)
-	{
-		val.callback_active = true;
-		return val;
-	});
-
-	const std::bitset<SYS_RSXAUDIO_AVPORT_CNT> mute_state{cb_cfg.mute_state};
-
-	if (cb_cfg.ready && !mute_state[static_cast<u8>(cb_cfg.avport_idx)] && Emu.IsRunning())
-	{
-		const audio_channel_layout output_channel_layout = static_cast<audio_channel_layout>(cb_cfg.output_channel_layout);
-		const u32 output_ch_cnt = AudioBackend::default_layout_channel_count(output_channel_layout);
-		const u32 bytes_ch_adjusted = bytes / output_ch_cnt * cb_cfg.input_ch_cnt;
-		const u32 bytes_from_rb = cb_cfg.convert_to_s16 ? bytes_ch_adjusted / static_cast<u32>(AudioSampleSize::S16) * static_cast<u32>(AudioSampleSize::FLOAT) : bytes_ch_adjusted;
-
-		ensure(callback_tmp_buf.size() * static_cast<u32>(AudioSampleSize::FLOAT) >= bytes_from_rb);
-
-		const u32 byte_cnt = static_cast<u32>(ringbuf.pop(callback_tmp_buf.data(), bytes_from_rb, true));
-		const u32 sample_cnt = byte_cnt / static_cast<u32>(AudioSampleSize::FLOAT);
-		const u32 sample_cnt_out = sample_cnt / cb_cfg.input_ch_cnt * output_ch_cnt;
-
-		// Buffer is in weird state - drop acquired data
-		if (sample_cnt == 0 || sample_cnt % cb_cfg.input_ch_cnt != 0)
-		{
-			memset(buf, 0, bytes);
-			return bytes;
-		}
-
-		// Record audio if enabled
-		if (g_recording_mode != recording_mode::stopped)
-		{
-			utils::video_provider& provider = g_fxo->get<utils::video_provider>();
-			provider.present_samples(reinterpret_cast<const u8*>(callback_tmp_buf.data()), sample_cnt / cb_cfg.input_ch_cnt, cb_cfg.input_ch_cnt);
-		}
-
-		// Downmix if necessary
-		AudioBackend::downmix(sample_cnt, cb_cfg.input_ch_cnt, output_channel_layout, callback_tmp_buf.data(), callback_tmp_buf.data());
-
-		if (cb_cfg.target_volume != cb_cfg.current_volume)
-		{
-			const AudioBackend::VolumeParam param =
-			{
-				.initial_volume = cb_cfg.initial_volume * callback_config::VOL_NOMINAL_INV,
-				.current_volume = cb_cfg.current_volume * callback_config::VOL_NOMINAL_INV,
-				.target_volume = cb_cfg.target_volume * callback_config::VOL_NOMINAL_INV,
-				.freq = cb_cfg.freq,
-				.ch_cnt = cb_cfg.input_ch_cnt
-			};
-
-			const u16 new_vol = static_cast<u16>(std::round(AudioBackend::apply_volume(param, sample_cnt_out, callback_tmp_buf.data(), callback_tmp_buf.data()) * callback_config::VOL_NOMINAL));
-			callback_cfg.atomic_op([&](callback_config& val)
-			{
-				if (val.target_volume != cb_cfg.target_volume)
-				{
-					val.initial_volume = new_vol;
-				}
-
-				// We don't care about proper volume adjustment if underflow has occured
-				val.current_volume = bytes_from_rb != byte_cnt ? val.target_volume : new_vol;
-			});
-		}
-		else if (cb_cfg.current_volume != callback_config::VOL_NOMINAL)
-		{
-			AudioBackend::apply_volume_static(cb_cfg.current_volume * callback_config::VOL_NOMINAL_INV, sample_cnt_out, callback_tmp_buf.data(), callback_tmp_buf.data());
-		}
-
-		if (cb_cfg.convert_to_s16)
-		{
-			AudioBackend::convert_to_s16(sample_cnt_out, callback_tmp_buf.data(), buf);
-			return sample_cnt_out * static_cast<u32>(AudioSampleSize::S16);
-		}
-
-		AudioBackend::normalize(sample_cnt_out, callback_tmp_buf.data(), static_cast<f32*>(buf));
-		return sample_cnt_out * static_cast<u32>(AudioSampleSize::FLOAT);
-	}
-
-	ringbuf.reader_flush();
-	memset(buf, 0, bytes);
-	return bytes;
-}
-
-void rsxaudio_backend_thread::state_changed_callback(AudioStateEvent event)
-{
-	{
-		std::lock_guard lock(state_update_m);
-		switch (event)
-		{
-		case AudioStateEvent::UNSPECIFIED_ERROR:
-		{
-			backend_error_occured = true;
-			break;
-		}
-		case AudioStateEvent::DEFAULT_DEVICE_MAYBE_CHANGED:
-		{
-			backend_device_changed = true;
-			break;
-		}
-		default:
-		{
-			fmt::throw_exception("Unknown audio state event");
-		}
-		}
-	}
-	state_update_c.notify_all();
-}
-
-u64 rsxaudio_backend_thread::get_time_until_service()
-{
-	const u64 next_service_time = start_time + time_period_idx * SERVICE_PERIOD;
-	const u64 current_time = get_system_time();
-
-	return next_service_time >= current_time ? next_service_time - current_time : 0;
-}
-
-void rsxaudio_backend_thread::update_service_time()
-{
-	if (get_time_until_service() <= SERVICE_THRESHOLD) time_period_idx++;
-}
-
-void rsxaudio_backend_thread::reset_service_time()
-{
-	start_time = get_system_time();
-	time_period_idx = 1;
-}
-
-void rsxaudio_periodic_tmr::sched_timer()
-{
-	u64 interval = get_rel_next_time();
-
-	if (interval == 0)
-	{
-		zero_period = true;
-	}
-	else if (interval == UINT64_MAX)
-	{
-		interval = 0;
-		zero_period = false;
-	}
-	else
-	{
-		zero_period = false;
-	}
-
-#if defined(_WIN32)
-	if (interval)
-	{
-		LARGE_INTEGER due_time{};
-		due_time.QuadPart = -static_cast<s64>(interval * 10);
-		ensure(SetWaitableTimerEx(timer_handle, &due_time, 0, nullptr, nullptr, nullptr, 0));
-	}
-	else
-	{
-		ensure(CancelWaitableTimer(timer_handle));
-	}
-#elif defined(__linux__)
-	const time_t secs = interval / 1'000'000;
-	const long nsecs = (interval - secs * 1'000'000) * 1000;
-	const itimerspec tspec = {{}, { secs, nsecs }};
-	ensure(timerfd_settime(timer_handle, 0, &tspec, nullptr) == 0);
-#elif defined(BSD) || defined(__APPLE__)
-	handle[TIMER_ID].data = interval * 1000;
-	if (interval)
-	{
-		handle[TIMER_ID].flags = (handle[TIMER_ID].flags & ~EV_DISABLE) | EV_ENABLE;
-	}
-	else
-	{
-		handle[TIMER_ID].flags = (handle[TIMER_ID].flags & ~EV_ENABLE) | EV_DISABLE;
-	}
-	ensure(kevent(kq, &handle[TIMER_ID], 1, nullptr, 0, nullptr) >= 0);
-#else
-#error "Implement"
-#endif
-}
-
-void rsxaudio_periodic_tmr::cancel_timer_unlocked()
-{
-	zero_period = false;
-
-#if defined(_WIN32)
-	ensure(CancelWaitableTimer(timer_handle));
-	if (in_wait)
-	{
-		ensure(SetEvent(cancel_event));
-	}
-#elif defined(__linux__)
-	const itimerspec tspec{};
-	ensure(timerfd_settime(timer_handle, 0, &tspec, nullptr) == 0);
-	if (in_wait)
-	{
-		const u64 flag = 1;
-		const auto wr_res = write(cancel_event, &flag, sizeof(flag));
-		ensure(wr_res == sizeof(flag) || wr_res == -EAGAIN);
-	}
-#elif defined(BSD) || defined(__APPLE__)
-	handle[TIMER_ID].flags = (handle[TIMER_ID].flags & ~EV_ENABLE) | EV_DISABLE;
-	handle[TIMER_ID].data = 0;
-	if (in_wait)
-	{
-		ensure(kevent(kq, handle, 2, nullptr, 0, nullptr) >= 0);
-	}
-	else
-	{
-		ensure(kevent(kq, &handle[TIMER_ID], 1, nullptr, 0, nullptr) >= 0);
-	}
-#else
-#error "Implement"
-#endif
-}
-
-void rsxaudio_periodic_tmr::reset_cancel_flag()
-{
-#if defined(_WIN32)
-	ensure(ResetEvent(cancel_event));
-#elif defined(__linux__)
-	u64 tmp_buf{};
-	[[maybe_unused]] const auto nread = read(cancel_event, &tmp_buf, sizeof(tmp_buf));
-#elif defined(BSD) || defined(__APPLE__)
-	// Cancel event is reset automatically
-#else
-#error "Implement"
-#endif
-}
-
-rsxaudio_periodic_tmr::rsxaudio_periodic_tmr()
-{
-#if defined(_WIN32)
-	ensure(cancel_event = CreateEvent(nullptr, false, false, nullptr));
-	ensure(timer_handle = CreateWaitableTimer(nullptr, false, nullptr));
-#elif defined(__linux__)
-	timer_handle = timerfd_create(CLOCK_MONOTONIC, 0);
-	ensure((epoll_fd = epoll_create(2)) >= 0);
-	epoll_event evnt{ EPOLLIN, {} };
-	evnt.data.fd = timer_handle;
-	ensure(timer_handle >= 0 && epoll_ctl(epoll_fd, EPOLL_CTL_ADD, timer_handle, &evnt) == 0);
-	cancel_event = eventfd(0, EFD_NONBLOCK);
-	evnt.data.fd = cancel_event;
-	ensure(cancel_event >= 0 && epoll_ctl(epoll_fd, EPOLL_CTL_ADD, cancel_event, &evnt) == 0);
-#elif defined(BSD) || defined(__APPLE__)
-
-#if defined(__APPLE__)
-	static constexpr unsigned int TMR_CFG = NOTE_NSECONDS | NOTE_CRITICAL;
-#else
-	static constexpr unsigned int TMR_CFG = NOTE_NSECONDS;
-#endif
-
-	ensure((kq = kqueue()) >= 0);
-	EV_SET(&handle[TIMER_ID], TIMER_ID, EVFILT_TIMER, EV_ADD | EV_ENABLE | EV_ONESHOT, TMR_CFG, 0, nullptr);
-	EV_SET(&handle[CANCEL_ID], CANCEL_ID, EVFILT_USER, EV_ADD | EV_ENABLE | EV_CLEAR, NOTE_FFNOP, 0, nullptr);
-	ensure(kevent(kq, &handle[CANCEL_ID], 1, nullptr, 0, nullptr) >= 0);
-	handle[CANCEL_ID].fflags |= NOTE_TRIGGER;
-#else
-#error "Implement"
-#endif
-}
-
-rsxaudio_periodic_tmr::~rsxaudio_periodic_tmr()
-{
-#if defined(_WIN32)
-	CloseHandle(timer_handle);
-	CloseHandle(cancel_event);
-#elif defined(__linux__)
-	close(epoll_fd);
-	close(timer_handle);
-	close(cancel_event);
-#elif defined(BSD) || defined(__APPLE__)
-	close(kq);
-#else
-#error "Implement"
-#endif
-}
-
-rsxaudio_periodic_tmr::wait_result rsxaudio_periodic_tmr::wait(const std::function<void()> &callback)
-{
-	std::unique_lock lock(mutex);
-
-	if (in_wait || !callback)
-	{
-		return wait_result::INVALID_PARAM;
-	}
-
-	in_wait = true;
-
-	bool tmr_error     = false;
-	bool timeout       = false;
-	bool wait_canceled = false;
-
-	if (!zero_period)
-	{
-		lock.unlock();
-		constexpr u8 obj_wait_cnt = 2;
-
-#if defined(_WIN32)
-		const HANDLE wait_arr[obj_wait_cnt] = { timer_handle, cancel_event };
-		const auto wait_status = WaitForMultipleObjects(obj_wait_cnt, wait_arr, false, INFINITE);
-
-		if (wait_status == WAIT_FAILED || (wait_status >= WAIT_ABANDONED_0 && wait_status < WAIT_ABANDONED_0 + obj_wait_cnt))
-		{
-			tmr_error = true;
-		}
-		else if (wait_status == WAIT_TIMEOUT)
-		{
-			timeout = true;
-		}
-		else if (wait_status == WAIT_OBJECT_0 + 1)
-		{
-			wait_canceled = true;
-		}
-#elif defined(__linux__)
-		epoll_event event[obj_wait_cnt]{};
-		int wait_status = 0;
-		do
-		{
-			wait_status = epoll_wait(epoll_fd, event, obj_wait_cnt, -1);
-		}
-		while (wait_status == -1 && errno == EINTR);
-
-		if (wait_status < 0 || wait_status > obj_wait_cnt)
-		{
-			tmr_error = true;
-		}
-		else if (wait_status == 0)
-		{
-			timeout = true;
-		}
-		else
-		{
-			for (int i = 0; i < wait_status; i++)
-			{
-				if (event[i].data.fd == cancel_event)
-				{
-					wait_canceled = true;
-					break;
-				}
-			}
-		}
-#elif defined(BSD) || defined(__APPLE__)
-		struct kevent event[obj_wait_cnt]{};
-		int wait_status = 0;
-		do
-		{
-			wait_status = kevent(kq, nullptr, 0, event, obj_wait_cnt, nullptr);
-		}
-		while (wait_status == -1 && errno == EINTR);
-
-		if (wait_status < 0 || wait_status > obj_wait_cnt)
-		{
-			tmr_error = true;
-		}
-		else if (wait_status == 0)
-		{
-			timeout = true;
-		}
-		else
-		{
-			for (int i = 0; i < wait_status; i++)
-			{
-				if (event[i].ident == CANCEL_ID)
-				{
-					wait_canceled = true;
-					break;
-				}
-			}
-		}
-#else
-#error "Implement"
-#endif
-		lock.lock();
-	}
-	else
-	{
-		zero_period = false;
-	}
-
-	in_wait = false;
-
-	if (wait_canceled)
-	{
-		reset_cancel_flag();
-	}
-
-	if (tmr_error)
-	{
-		return wait_result::TIMER_ERROR;
-	}
-
-	if (timeout)
-	{
-		return wait_result::TIMEOUT;
-	}
-
-	if (wait_canceled)
-	{
-		sched_timer();
-		return wait_result::TIMER_CANCELED;
-	}
-
-	callback();
-	sched_timer();
-	return wait_result::SUCCESS;
-}
-
-u64 rsxaudio_periodic_tmr::get_rel_next_time()
-{
-	const u64 crnt_time = get_system_time();
-	u64 next_time = UINT64_MAX;
-
-	for (vtimer& vtimer : vtmr_pool)
-	{
-		if (!vtimer.active) continue;
-
-		u64 next_blk_time = static_cast<u64>(vtimer.blk_cnt * vtimer.blk_time);
-
-		if (crnt_time >= next_blk_time)
-		{
-			const u64 crnt_blk = get_crnt_blk(crnt_time, vtimer.blk_time);
-
-			if (crnt_blk > vtimer.blk_cnt + MAX_BURST_PERIODS)
-			{
-				vtimer.blk_cnt = std::max(vtimer.blk_cnt, crnt_blk - MAX_BURST_PERIODS);
-				next_blk_time = static_cast<u64>(vtimer.blk_cnt * vtimer.blk_time);
-			}
-		}
-
-		if (crnt_time >= next_blk_time)
-		{
-			next_time = 0;
-		}
-		else
-		{
-			next_time = std::min(next_time, next_blk_time - crnt_time);
-		}
-	}
-
-	return next_time;
-}
-
-void rsxaudio_periodic_tmr::cancel_wait()
-{
-	std::lock_guard lock(mutex);
-	cancel_timer_unlocked();
-}
-
-void rsxaudio_periodic_tmr::enable_vtimer(u32 vtimer_id, u32 rate, u64 crnt_time)
-{
-	ensure(vtimer_id < VTIMER_MAX && rate);
-
-	vtimer& vtimer = vtmr_pool[vtimer_id];
-	const f64 new_blk_time = get_blk_time(rate);
-
-	// Avoid timer reset when possible
-	if (!vtimer.active || new_blk_time != vtimer.blk_time)
-	{
-		vtimer.blk_cnt = get_crnt_blk(crnt_time, new_blk_time);
-	}
-
-	vtimer.blk_time = new_blk_time;
-	vtimer.active = true;
-}
-
-void rsxaudio_periodic_tmr::disable_vtimer(u32 vtimer_id)
-{
-	ensure(vtimer_id < VTIMER_MAX);
-
-	vtimer& vtimer = vtmr_pool[vtimer_id];
-	vtimer.active = false;
-}
-
-bool rsxaudio_periodic_tmr::is_vtimer_behind(u32 vtimer_id, u64 crnt_time) const
-{
-	ensure(vtimer_id < VTIMER_MAX);
-
-	const vtimer& vtimer = vtmr_pool[vtimer_id];
-
-	return is_vtimer_behind(vtimer, crnt_time);
-}
-
-void rsxaudio_periodic_tmr::vtimer_skip_periods(u32 vtimer_id, u64 crnt_time)
-{
-	ensure(vtimer_id < VTIMER_MAX);
-
-	vtimer& vtimer = vtmr_pool[vtimer_id];
-
-	if (is_vtimer_behind(vtimer, crnt_time))
-	{
-		vtimer.blk_cnt = get_crnt_blk(crnt_time, vtimer.blk_time);
-	}
-}
-
-void rsxaudio_periodic_tmr::vtimer_incr(u32 vtimer_id, u64 crnt_time)
-{
-	ensure(vtimer_id < VTIMER_MAX);
-
-	vtimer& vtimer = vtmr_pool[vtimer_id];
-
-	if (is_vtimer_behind(vtimer, crnt_time))
-	{
-		vtimer.blk_cnt++;
-	}
-}
-
-bool rsxaudio_periodic_tmr::is_vtimer_active(u32 vtimer_id) const
-{
-	ensure(vtimer_id < VTIMER_MAX);
-
-	const vtimer& vtimer = vtmr_pool[vtimer_id];
-
-	return vtimer.active;
-}
-
-u64 rsxaudio_periodic_tmr::vtimer_get_sched_time(u32 vtimer_id) const
-{
-	ensure(vtimer_id < VTIMER_MAX);
-
-	const vtimer& vtimer = vtmr_pool[vtimer_id];
-
-	return static_cast<u64>(vtimer.blk_cnt * vtimer.blk_time);
-}
-
-bool rsxaudio_periodic_tmr::is_vtimer_behind(const vtimer& vtimer, u64 crnt_time) const
-{
-	return vtimer.active && vtimer.blk_cnt < get_crnt_blk(crnt_time, vtimer.blk_time);
-}
-
-u64 rsxaudio_periodic_tmr::get_crnt_blk(u64 crnt_time, f64 blk_time) const
-{
-	return static_cast<u64>(std::floor(static_cast<f64>(crnt_time) / blk_time)) + 1;
-}
-
-f64 rsxaudio_periodic_tmr::get_blk_time(u32 data_rate) const
-{
-	return static_cast<f64>(SYS_RSXAUDIO_STREAM_SIZE * 1'000'000) / data_rate;
-}
diff --git a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h
index e13b33816d..445080c2f4 100644
--- a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h
+++ b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h
@@ -1,625 +1,7 @@
 #pragma once
 
-#include "sys_sync.h"
-#include "sys_event.h"
-#include "Utilities/simple_ringbuf.h"
-#include "Utilities/transactional_storage.h"
-#include "Utilities/cond.h"
-#include "Emu/system_config_types.h"
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/ErrorCodes.h"
-#include "Emu/Audio/AudioDumper.h"
-#include "Emu/Audio/AudioBackend.h"
-#include "Emu/Audio/audio_resampler.h"
-
-#if defined(unix) || defined(__unix) || defined(__unix__)
-// For BSD detection
-#include <sys/param.h>
-#endif
-
-#ifdef _WIN32
-#include <windows.h>
-#elif defined(BSD) || defined(__APPLE__)
-#include <sys/event.h>
-#endif
-
-enum : u32
-{
-	SYS_RSXAUDIO_SERIAL_STREAM_CNT        = 4,
-	SYS_RSXAUDIO_STREAM_DATA_BLK_CNT      = 4,
-	SYS_RSXAUDIO_DATA_BLK_SIZE            = 256,
-	SYS_RSXAUDIO_STREAM_SIZE              = SYS_RSXAUDIO_DATA_BLK_SIZE * SYS_RSXAUDIO_STREAM_DATA_BLK_CNT,
-	SYS_RSXAUDIO_CH_PER_STREAM            = 2,
-	SYS_RSXAUDIO_SERIAL_MAX_CH            = 8,
-	SYS_RSXAUDIO_SPDIF_MAX_CH             = 2,
-	SYS_RSXAUDIO_STREAM_SAMPLE_CNT        = SYS_RSXAUDIO_STREAM_SIZE / SYS_RSXAUDIO_CH_PER_STREAM / sizeof(f32),
-
-	SYS_RSXAUDIO_RINGBUF_BLK_SZ_SERIAL    = SYS_RSXAUDIO_STREAM_SIZE * SYS_RSXAUDIO_SERIAL_STREAM_CNT,
-	SYS_RSXAUDIO_RINGBUF_BLK_SZ_SPDIF     = SYS_RSXAUDIO_STREAM_SIZE,
-
-	SYS_RSXAUDIO_RINGBUF_SZ	              = 16,
-
-	SYS_RSXAUDIO_AVPORT_CNT               = 5,
-
-	SYS_RSXAUDIO_FREQ_BASE_384K           = 384000,
-	SYS_RSXAUDIO_FREQ_BASE_352K           = 352800,
-
-	SYS_RSXAUDIO_PORT_CNT                 = 3,
-
-	SYS_RSXAUDIO_SPDIF_CNT                = 2,
-};
-
-enum class RsxaudioAvportIdx : u8
-{
-	HDMI_0  = 0,
-	HDMI_1  = 1,
-	AVMULTI = 2,
-	SPDIF_0 = 3,
-	SPDIF_1 = 4,
-};
-
-enum class RsxaudioPort : u8
-{
-	SERIAL  = 0,
-	SPDIF_0 = 1,
-	SPDIF_1 = 2,
-	INVALID = 0xFF,
-};
-
-enum class RsxaudioSampleSize : u8
-{
-	_16BIT = 2,
-	_32BIT = 4,
-};
-
-struct rsxaudio_shmem
-{
-	struct ringbuf_t
-	{
-		struct entry_t
-		{
-			be_t<u32> valid{};
-			be_t<u32> unk1{};
-			be_t<u64> audio_blk_idx{};
-			be_t<u64> timestamp{};
-			be_t<u32> buf_addr{};
-			be_t<u32> dma_addr{};
-		};
-
-		be_t<u32> active{};
-		be_t<u32> unk2{};
-		be_t<s32> read_idx{};
-		be_t<u32> write_idx{};
-		be_t<s32> rw_max_idx{};
-		be_t<s32> queue_notify_idx{};
-		be_t<s32> queue_notify_step{};
-		be_t<u32> unk6{};
-		be_t<u32> dma_silence_addr{};
-		be_t<u32> unk7{};
-		be_t<u64> next_blk_idx{};
-
-		entry_t entries[16]{};
-	};
-
-	struct uf_event_t
-	{
-		be_t<u64> unk1{};
-		be_t<u32> uf_event_cnt{};
-		u8 unk2[244]{};
-	};
-
-	struct ctrl_t
-	{
-		ringbuf_t ringbuf[SYS_RSXAUDIO_PORT_CNT]{};
-
-		be_t<u32> unk1{};
-		be_t<u32> event_queue_1_id{};
-		u8 unk2[16]{};
-		be_t<u32> event_queue_2_id{};
-		be_t<u32> spdif_ch0_channel_data_lo{};
-		be_t<u32> spdif_ch0_channel_data_hi{};
-		be_t<u32> spdif_ch0_channel_data_tx_cycles{};
-		be_t<u32> unk3{};
-		be_t<u32> event_queue_3_id{};
-		be_t<u32> spdif_ch1_channel_data_lo{};
-		be_t<u32> spdif_ch1_channel_data_hi{};
-		be_t<u32> spdif_ch1_channel_data_tx_cycles{};
-		be_t<u32> unk4{};
-		be_t<u32> intr_thread_prio{};
-		be_t<u32> unk5{};
-		u8 unk6[248]{};
-		uf_event_t channel_uf[SYS_RSXAUDIO_PORT_CNT]{};
-		u8 pad[0x3530]{};
-	};
-
-	u8 dma_serial_region[0x10000]{};
-	u8 dma_spdif_0_region[0x4000]{};
-	u8 dma_spdif_1_region[0x4000]{};
-	u8 dma_silence_region[0x4000]{};
-	ctrl_t ctrl{};
-};
-
-static_assert(sizeof(rsxaudio_shmem::ringbuf_t) == 0x230U, "rsxAudioRingBufSizeTest");
-static_assert(sizeof(rsxaudio_shmem::uf_event_t) == 0x100U, "rsxAudioUfEventTest");
-static_assert(sizeof(rsxaudio_shmem::ctrl_t) == 0x4000U, "rsxAudioCtrlSizeTest");
-static_assert(sizeof(rsxaudio_shmem) == 0x20000U, "rsxAudioShmemSizeTest");
-
-enum rsxaudio_dma_flag : u32
-{
-	IO_BASE = 0,
-	IO_ID = 1
-};
-
-struct lv2_rsxaudio final : lv2_obj
-{
-	static constexpr u32 id_base   = 0x60000000;
-	static constexpr u64 dma_io_id = 1;
-	static constexpr u32 dma_io_base = 0x30000000;
-
-	shared_mutex mutex{};
-	bool init = false;
-
-	vm::addr_t shmem{};
-
-	std::array<shared_ptr<lv2_event_queue>, SYS_RSXAUDIO_PORT_CNT> event_queue{};
-
-	// lv2 uses port memory addresses for their names
-	static constexpr std::array<u64, SYS_RSXAUDIO_PORT_CNT> event_port_name{ 0x8000000000400100, 0x8000000000400200, 0x8000000000400300 };
-
-	lv2_rsxaudio() noexcept = default;
-	lv2_rsxaudio(utils::serial& ar) noexcept;	void save(utils::serial& ar);
-
-	void page_lock()
-	{
-		ensure(shmem && vm::page_protect(shmem, sizeof(rsxaudio_shmem), 0, 0, vm::page_readable | vm::page_writable | vm::page_executable));
-	}
-
-	void page_unlock()
-	{
-		ensure(shmem && vm::page_protect(shmem, sizeof(rsxaudio_shmem), 0, vm::page_readable | vm::page_writable));
-	}
-
-	rsxaudio_shmem* get_rw_shared_page() const
-	{
-		return reinterpret_cast<rsxaudio_shmem*>(vm::g_sudo_addr + u32{shmem});
-	}
-};
-
-class rsxaudio_periodic_tmr
-{
-public:
-
-	enum class wait_result
-	{
-		SUCCESS,
-		INVALID_PARAM,
-		TIMEOUT,
-		TIMER_ERROR,
-		TIMER_CANCELED,
-	};
-
-	rsxaudio_periodic_tmr();
-	~rsxaudio_periodic_tmr();
-
-	rsxaudio_periodic_tmr(const rsxaudio_periodic_tmr&) = delete;
-	rsxaudio_periodic_tmr& operator=(const rsxaudio_periodic_tmr&) = delete;
-
-	// Wait until timer fires and calls callback.
-	wait_result wait(const std::function<void()> &callback);
-
-	// Cancel wait() call
-	void cancel_wait();
-
-	// VTimer funtions
-
-	void vtimer_access_sec(std::invocable<> auto func)
-	{
-		std::lock_guard lock(mutex);
-		std::invoke(func);
-
-		// Adjust timer expiration
-		cancel_timer_unlocked();
-		sched_timer();
-	}
-
-	void enable_vtimer(u32 vtimer_id, u32 rate, u64 crnt_time);
-
-	void disable_vtimer(u32 vtimer_id);
-
-	bool is_vtimer_behind(u32 vtimer_id, u64 crnt_time) const;
-
-	void vtimer_skip_periods(u32 vtimer_id, u64 crnt_time);
-
-	void vtimer_incr(u32 vtimer_id, u64 crnt_time);
-
-	bool is_vtimer_active(u32 vtimer_id) const;
-
-	u64 vtimer_get_sched_time(u32 vtimer_id) const;
-
-private:
-
-	static constexpr u64 MAX_BURST_PERIODS = SYS_RSXAUDIO_RINGBUF_SZ;
-	static constexpr u32 VTIMER_MAX = 4;
-
-	struct vtimer
-	{
-		u64 blk_cnt = 0;
-		f64 blk_time = 0.0;
-		bool active = false;
-	};
-
-	std::array<vtimer, VTIMER_MAX> vtmr_pool{};
-
-	shared_mutex mutex{};
-	bool in_wait = false;
-	bool zero_period = false;
-
-#if defined(_WIN32)
-	HANDLE cancel_event{};
-	HANDLE timer_handle{};
-#elif defined(__linux__)
-	int cancel_event{};
-	int timer_handle{};
-	int epoll_fd{};
-#elif defined(BSD) || defined(__APPLE__)
-	static constexpr u64 TIMER_ID = 0;
-	static constexpr u64 CANCEL_ID = 1;
-
-	int kq{};
-	struct kevent handle[2]{};
-#else
-#error "Implement"
-#endif
-
-	void sched_timer();
-	void cancel_timer_unlocked();
-	void reset_cancel_flag();
-
-	bool is_vtimer_behind(const vtimer& vtimer, u64 crnt_time) const;
-
-	u64 get_crnt_blk(u64 crnt_time, f64 blk_time) const;
-	f64 get_blk_time(u32 data_rate) const;
-
-	u64 get_rel_next_time();
-};
-
-struct rsxaudio_hw_param_t
-{
-	struct serial_param_t
-	{
-		bool dma_en = false;
-		bool buf_empty_en = false;
-		bool muted = true;
-		bool en = false;
-		u8   freq_div = 8;
-		RsxaudioSampleSize depth = RsxaudioSampleSize::_16BIT;
-	};
-
-	struct spdif_param_t
-	{
-		bool dma_en = false;
-		bool buf_empty_en = false;
-		bool muted = true;
-		bool en = false;
-		bool use_serial_buf = true;
-		u8   freq_div = 8;
-		RsxaudioSampleSize depth = RsxaudioSampleSize::_16BIT;
-		std::array<u8, 6> cs_data = { 0x00, 0x90, 0x00, 0x40, 0x80, 0x00 }; // HW supports only 6 bytes (uart pkt has 8)
-	};
-
-	struct hdmi_param_t
-	{
-		struct hdmi_ch_cfg_t
-		{
-			std::array<u8, SYS_RSXAUDIO_SERIAL_MAX_CH> map{};
-			AudioChannelCnt total_ch_cnt = AudioChannelCnt::STEREO;
-		};
-
-		static constexpr u8 MAP_SILENT_CH = umax;
-
-		bool                init = false;
-		hdmi_ch_cfg_t       ch_cfg{};
-		std::array<u8, 5>   info_frame{}; // TODO: check chstat and info_frame for info on audio layout, add default values
-		std::array<u8, 5>   chstat{};
-
-		bool                muted = true;
-		bool                force_mute = true;
-		bool                use_spdif_1 = false; // TODO: unused for now
-	};
-
-	u32 serial_freq_base = SYS_RSXAUDIO_FREQ_BASE_384K;
-	u32 spdif_freq_base = SYS_RSXAUDIO_FREQ_BASE_352K;
-
-	bool avmulti_av_muted = true;
-
-	serial_param_t serial{};
-	spdif_param_t spdif[2]{};
-	hdmi_param_t hdmi[2]{};
-
-	std::array<RsxaudioPort, SYS_RSXAUDIO_AVPORT_CNT> avport_src =
-	{
-		RsxaudioPort::INVALID,
-		RsxaudioPort::INVALID,
-		RsxaudioPort::INVALID,
-		RsxaudioPort::INVALID,
-		RsxaudioPort::INVALID
-	};
-};
-
-// 16-bit PCM converted into float, so buffer must be twice as big
-using ra_stream_blk_t = std::array<f32, SYS_RSXAUDIO_STREAM_SAMPLE_CNT * 2>;
-
-class rsxaudio_data_container
-{
-public:
-
-	struct buf_t
-	{
-		std::array<ra_stream_blk_t, SYS_RSXAUDIO_SERIAL_MAX_CH> serial{};
-		std::array<ra_stream_blk_t, SYS_RSXAUDIO_SPDIF_MAX_CH> spdif[SYS_RSXAUDIO_SPDIF_CNT]{};
-	};
-
-	using data_blk_t = std::array<f32, SYS_RSXAUDIO_STREAM_SAMPLE_CNT * SYS_RSXAUDIO_SERIAL_MAX_CH * 2>;
-
-	rsxaudio_data_container(const rsxaudio_hw_param_t& hw_param, const buf_t& buf, bool serial_rdy, bool spdif_0_rdy, bool spdif_1_rdy);
-	u32 get_data_size(RsxaudioAvportIdx avport);
-	void get_data(RsxaudioAvportIdx avport, data_blk_t& data_out);
-	bool data_was_used();
-
-private:
-
-	const rsxaudio_hw_param_t& hwp;
-	const buf_t& out_buf;
-
-	std::array<bool, 5> avport_data_avail{};
-	u8 hdmi_stream_cnt[2]{};
-	bool data_was_written = false;
-
-	rsxaudio_data_container(const rsxaudio_data_container&) = delete;
-	rsxaudio_data_container& operator=(const rsxaudio_data_container&) = delete;
-
-	rsxaudio_data_container(rsxaudio_data_container&&) = delete;
-	rsxaudio_data_container& operator=(rsxaudio_data_container&&) = delete;
-
-	// Mix individual channels into final PCM stream. Channels in channel map that are > input_ch_cnt treated as silent.
-	template<usz output_ch_cnt, usz input_ch_cnt>
-	requires (output_ch_cnt > 0 && output_ch_cnt <= 8 && input_ch_cnt > 0)
-	constexpr void mix(const std::array<u8, 8> &ch_map, RsxaudioSampleSize sample_size, const std::array<ra_stream_blk_t, input_ch_cnt> &input_channels, data_blk_t& data_out)
-	{
-		const ra_stream_blk_t silent_channel{};
-
-		// Build final map
-		std::array<const ra_stream_blk_t*, output_ch_cnt> real_input_ch = {};
-		for (u64 ch_idx = 0; ch_idx < output_ch_cnt; ch_idx++)
-		{
-			if (ch_map[ch_idx] >= input_ch_cnt)
-			{
-				real_input_ch[ch_idx] = &silent_channel;
-			}
-			else
-			{
-				real_input_ch[ch_idx] = &input_channels[ch_map[ch_idx]];
-			}
-		}
-
-		const u32 samples_in_buf = sample_size == RsxaudioSampleSize::_16BIT ? SYS_RSXAUDIO_STREAM_SAMPLE_CNT * 2 : SYS_RSXAUDIO_STREAM_SAMPLE_CNT;
-
-		for (u32 sample_idx = 0; sample_idx < samples_in_buf * output_ch_cnt; sample_idx += output_ch_cnt)
-		{
-			const u32 src_sample_idx = sample_idx / output_ch_cnt;
-
-			if constexpr (output_ch_cnt >= 1) data_out[sample_idx + 0] = (*real_input_ch[0])[src_sample_idx];
-			if constexpr (output_ch_cnt >= 2) data_out[sample_idx + 1] = (*real_input_ch[1])[src_sample_idx];
-			if constexpr (output_ch_cnt >= 3) data_out[sample_idx + 2] = (*real_input_ch[2])[src_sample_idx];
-			if constexpr (output_ch_cnt >= 4) data_out[sample_idx + 3] = (*real_input_ch[3])[src_sample_idx];
-			if constexpr (output_ch_cnt >= 5) data_out[sample_idx + 4] = (*real_input_ch[4])[src_sample_idx];
-			if constexpr (output_ch_cnt >= 6) data_out[sample_idx + 5] = (*real_input_ch[5])[src_sample_idx];
-			if constexpr (output_ch_cnt >= 7) data_out[sample_idx + 6] = (*real_input_ch[6])[src_sample_idx];
-			if constexpr (output_ch_cnt >= 8) data_out[sample_idx + 7] = (*real_input_ch[7])[src_sample_idx];
-		}
-	}
-};
-
-namespace audio
-{
-	void configure_rsxaudio();
-}
-
-class rsxaudio_backend_thread
-{
-public:
-
-	struct port_config
-	{
-		AudioFreq freq = AudioFreq::FREQ_48K;
-		AudioChannelCnt ch_cnt = AudioChannelCnt::STEREO;
-
-		auto operator<=>(const port_config&) const = default;
-	};
-
-	struct avport_bit
-	{
-		bool hdmi_0  : 1;
-		bool hdmi_1  : 1;
-		bool avmulti : 1;
-		bool spdif_0 : 1;
-		bool spdif_1 : 1;
-	};
-
-	rsxaudio_backend_thread();
-	~rsxaudio_backend_thread();
-
-	void operator()();
-	rsxaudio_backend_thread& operator=(thread_state state);
-
-	void set_new_stream_param(const std::array<port_config, SYS_RSXAUDIO_AVPORT_CNT> &cfg, avport_bit muted_avports);
-	void set_mute_state(avport_bit muted_avports);
-	void add_data(rsxaudio_data_container& cont);
-
-	void update_emu_cfg();
-
-	u32 get_sample_rate() const;
-	u8 get_channel_count() const;
-
-	static constexpr auto thread_name = "RsxAudio Backend Thread"sv;
-
-	SAVESTATE_INIT_POS(8.91); // Depends on audio_out_configuration
-
-private:
-
-	struct emu_audio_cfg
-	{
-		std::string audio_device{};
-		s64 desired_buffer_duration = 0;
-		f64 time_stretching_threshold = 0;
-		bool buffering_enabled = false;
-		bool convert_to_s16 = false;
-		bool enable_time_stretching = false;
-		bool dump_to_file = false;
-		AudioChannelCnt channels = AudioChannelCnt::STEREO;
-		audio_channel_layout channel_layout = audio_channel_layout::automatic;
-		audio_renderer renderer = audio_renderer::null;
-		audio_provider provider = audio_provider::none;
-		RsxaudioAvportIdx avport = RsxaudioAvportIdx::HDMI_0;
-
-		auto operator<=>(const emu_audio_cfg&) const = default;
-	};
-
-	struct rsxaudio_state
-	{
-		std::array<port_config, SYS_RSXAUDIO_AVPORT_CNT> port{};
-	};
-
-	struct alignas(16) callback_config
-	{
-		static constexpr u16 VOL_NOMINAL = 10000;
-		static constexpr f32 VOL_NOMINAL_INV = 1.0f / VOL_NOMINAL;
-
-		u32 freq : 20            = 48000;
-
-		u16 target_volume        = 10000;
-		u16 initial_volume       = 10000;
-		u16 current_volume       = 10000;
-
-		RsxaudioAvportIdx avport_idx = RsxaudioAvportIdx::HDMI_0;
-		u8 mute_state : SYS_RSXAUDIO_AVPORT_CNT = 0b11111;
-
-		u8 input_ch_cnt          : 4 = 2;
-		u8 output_channel_layout : 4 = static_cast<u8>(audio_channel_layout::stereo);
-
-		bool ready : 1           = false;
-		bool convert_to_s16 : 1  = false;
-		bool cfg_changed : 1     = false;
-		bool callback_active : 1 = false;
-	};
-
-	static_assert(sizeof(callback_config) <= 16);
-
-	struct backend_config
-	{
-		port_config cfg{};
-		RsxaudioAvportIdx avport = RsxaudioAvportIdx::HDMI_0;
-	};
-
-	static constexpr u64 ERROR_SERVICE_PERIOD = 500'000;
-	static constexpr u64 SERVICE_PERIOD = 10'000;
-	static constexpr f64 SERVICE_PERIOD_SEC = SERVICE_PERIOD / 1'000'000.0;
-	static constexpr u64 SERVICE_THRESHOLD = 1'500;
-
-	static constexpr f64 TIME_STRETCHING_STEP = 0.1f;
-
-	u64 start_time = get_system_time();
-	u64 time_period_idx = 1;
-
-	emu_audio_cfg new_emu_cfg{};
-	bool emu_cfg_changed = true;
-
-	rsxaudio_state new_ra_state{};
-	bool ra_state_changed = true;
-
-	shared_mutex  state_update_m{};
-	cond_variable state_update_c{};
-
-	simple_ringbuf ringbuf{};
-	simple_ringbuf aux_ringbuf{};
-	std::vector<u8> thread_tmp_buf{};
-	std::vector<f32> callback_tmp_buf{};
-	bool use_aux_ringbuf = false;
-	shared_mutex ringbuf_mutex{};
-
-	std::shared_ptr<AudioBackend> backend{};
-	backend_config backend_current_cfg{ {}, new_emu_cfg.avport };
-	atomic_t<callback_config> callback_cfg{};
-	bool backend_error_occured = false;
-	bool backend_device_changed = false;
-
-	AudioDumper dumper{};
-	audio_resampler resampler{};
-
-	// Backend
-	void backend_init(const rsxaudio_state& ra_state, const emu_audio_cfg& emu_cfg, bool reset_backend = true);
-	void backend_start();
-	void backend_stop();
-	bool backend_playing();
-	u32 write_data_callback(u32 bytes, void* buf);
-	void state_changed_callback(AudioStateEvent event);
-
-	// Time management
-	u64 get_time_until_service();
-	void update_service_time();
-	void reset_service_time();
-
-	// Helpers
-	static emu_audio_cfg get_emu_cfg();
-	static u8 gen_mute_state(avport_bit avports);
-	static RsxaudioAvportIdx convert_avport(audio_avport avport);
-};
-
-class rsxaudio_data_thread
-{
-public:
-
-	// Prevent creation of multiple rsxaudio contexts
-	atomic_t<bool> rsxaudio_ctx_allocated = false;
-
-	shared_mutex rsxaudio_obj_upd_m{};
-	shared_ptr<lv2_rsxaudio> rsxaudio_obj_ptr{};
-
-	void operator()();
-	rsxaudio_data_thread& operator=(thread_state state);
-
-	rsxaudio_data_thread();
-
-	void update_hw_param(std::function<void(rsxaudio_hw_param_t&)> update_callback);
-	void update_mute_state(RsxaudioPort port, bool muted);
-	void update_av_mute_state(RsxaudioAvportIdx avport, bool muted, bool force_mute, bool set = true);
-	void reset_hw();
-
-	static constexpr auto thread_name = "RsxAudioData Thread"sv;
-
-private:
-
-	rsxaudio_data_container::buf_t output_buf{};
-
-	transactional_storage<rsxaudio_hw_param_t> hw_param_ts{std::make_shared<universal_pool>(), std::make_shared<rsxaudio_hw_param_t>()};
-	rsxaudio_periodic_tmr timer{};
-
-	void advance_all_timers();
-	void extract_audio_data();
-	static std::pair<bool /*data_present*/, void* /*addr*/> get_ringbuf_addr(RsxaudioPort dst, const lv2_rsxaudio& rsxaudio_obj);
-
-	static f32 pcm_to_float(s32 sample);
-	static f32 pcm_to_float(s16 sample);
-	static void pcm_serial_process_channel(RsxaudioSampleSize word_bits, ra_stream_blk_t& buf_out_l, ra_stream_blk_t& buf_out_r, const void* buf_in, u8 src_stream);
-	static void pcm_spdif_process_channel(RsxaudioSampleSize word_bits, ra_stream_blk_t& buf_out_l, ra_stream_blk_t& buf_out_r, const void* buf_in);
-	bool enqueue_data(RsxaudioPort dst, bool silence, const void* src_addr, const rsxaudio_hw_param_t& hwp);
-
-	static rsxaudio_backend_thread::avport_bit calc_avport_mute_state(const rsxaudio_hw_param_t& hwp);
-	static bool calc_port_active_state(RsxaudioPort port, const rsxaudio_hw_param_t& hwp);
-};
-
-using rsx_audio_backend = named_thread<rsxaudio_backend_thread>;
-using rsx_audio_data = named_thread<rsxaudio_data_thread>;
 
 // SysCalls
 
@@ -627,9 +9,3 @@ error_code sys_rsxaudio_initialize(vm::ptr<u32> handle);
 error_code sys_rsxaudio_finalize(u32 handle);
 error_code sys_rsxaudio_import_shared_memory(u32 handle, vm::ptr<u64> addr);
 error_code sys_rsxaudio_unimport_shared_memory(u32 handle, vm::ptr<u64> addr);
-error_code sys_rsxaudio_create_connection(u32 handle);
-error_code sys_rsxaudio_close_connection(u32 handle);
-error_code sys_rsxaudio_prepare_process(u32 handle);
-error_code sys_rsxaudio_start_process(u32 handle);
-error_code sys_rsxaudio_stop_process(u32 handle);
-error_code sys_rsxaudio_get_dma_param(u32 handle, u32 flag, vm::ptr<u64> out);
diff --git a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp b/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp
index c2abd40284..9bf8c1d61e 100644
--- a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp
@@ -2,33 +2,13 @@
 #include "sys_rwlock.h"
 
 #include "Emu/IdManager.h"
+#include "Emu/IPC.h"
 
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
 
-#include "util/asm.hpp"
-
 LOG_CHANNEL(sys_rwlock);
 
-lv2_rwlock::lv2_rwlock(utils::serial& ar)
-	: protocol(ar)
-	, key(ar)
-	, name(ar)
-{
-	ar(owner);
-}
-
-std::function<void(void*)> lv2_rwlock::load(utils::serial& ar)
-{
-	return load_func(make_shared<lv2_rwlock>(stx::exact_t<utils::serial&>(ar)));
-}
-
-void lv2_rwlock::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(lv2_sync);
-	ar(protocol, key, name, owner);
-}
-
 error_code sys_rwlock_create(ppu_thread& ppu, vm::ptr<u32> rw_lock_id, vm::ptr<sys_rwlock_attribute_t> attr)
 {
 	ppu.state += cpu_flag::wait;
@@ -54,13 +34,12 @@ error_code sys_rwlock_create(ppu_thread& ppu, vm::ptr<u32> rw_lock_id, vm::ptr<s
 
 	if (auto error = lv2_obj::create<lv2_rwlock>(_attr.pshared, ipc_key, _attr.flags, [&]
 	{
-		return make_shared<lv2_rwlock>(protocol, ipc_key, _attr.name_u64);
+		return std::make_shared<lv2_rwlock>(protocol, ipc_key, _attr.name_u64);
 	}))
 	{
 		return error;
 	}
 
-	ppu.check_state();
 	*rw_lock_id = idm::last_id();
 	return CELL_OK;
 }
@@ -101,7 +80,7 @@ error_code sys_rwlock_rlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
 
 	sys_rwlock.trace("sys_rwlock_rlock(rw_lock_id=0x%x, timeout=0x%llx)", rw_lock_id, timeout);
 
-	const auto rwlock = idm::get<lv2_obj, lv2_rwlock>(rw_lock_id, [&, notify = lv2_obj::notify_all_t()](lv2_rwlock& rwlock)
+	const auto rwlock = idm::get<lv2_obj, lv2_rwlock>(rw_lock_id, [&](lv2_rwlock& rwlock)
 	{
 		const s64 val = rwlock.owner;
 
@@ -113,8 +92,6 @@ error_code sys_rwlock_rlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
 			}
 		}
 
-		lv2_obj::prepare_for_sleep(ppu);
-
 		std::lock_guard lock(rwlock.mutex);
 
 		const s64 _old = rwlock.owner.fetch_op([&](s64& val)
@@ -131,8 +108,8 @@ error_code sys_rwlock_rlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
 
 		if (_old > 0 || _old & 1)
 		{
+			rwlock.rq.emplace_back(&ppu);
 			rwlock.sleep(ppu, timeout);
-			lv2_obj::emplace(rwlock.rq, &ppu);
 			return false;
 		}
 
@@ -151,37 +128,16 @@ error_code sys_rwlock_rlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
 
 	ppu.gpr[3] = CELL_OK;
 
-	while (auto state = +ppu.state)
+	while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
 	{
-		if (state & cpu_flag::signal && ppu.state.test_and_reset(cpu_flag::signal))
-		{
-			break;
-		}
-
 		if (is_stopped(state))
 		{
-			std::lock_guard lock(rwlock->mutex);
-
-			for (auto cpu = +rwlock->rq; cpu; cpu = cpu->next_cpu)
-			{
-				if (cpu == &ppu)
-				{
-					ppu.state += cpu_flag::again;
-					return {};
-				}
-			}
-
-			break;
+			return {};
 		}
 
-		for (usz i = 0; cpu_flag::signal - ppu.state && i < 50; i++)
+		if (state & cpu_flag::signal)
 		{
-			busy_wait(500);
-		}
-
-		if (ppu.state & cpu_flag::signal)
- 		{
-			continue;
+			break;
 		}
 
 		if (timeout)
@@ -191,16 +147,7 @@ error_code sys_rwlock_rlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
 				// Wait for rescheduling
 				if (ppu.check_state())
 				{
-					continue;
-				}
-
-				ppu.state += cpu_flag::wait;
-
-				if (!atomic_storage<ppu_thread*>::load(rwlock->rq))
-				{
-					// Waiters queue is empty, so the thread must have been signaled
-					rwlock->mutex.lock_unlock();
-					break;
+					return {};
 				}
 
 				std::lock_guard lock(rwlock->mutex);
@@ -216,7 +163,7 @@ error_code sys_rwlock_rlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
 		}
 		else
 		{
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
 		}
 	}
 
@@ -284,8 +231,6 @@ error_code sys_rwlock_runlock(ppu_thread& ppu, u32 rw_lock_id)
 		return CELL_ESRCH;
 	}
 
-	lv2_obj::notify_all_t notify;
-
 	if (rwlock.ret)
 	{
 		return CELL_OK;
@@ -312,13 +257,7 @@ error_code sys_rwlock_runlock(ppu_thread& ppu, u32 rw_lock_id)
 		{
 			if (const auto cpu = rwlock->schedule<ppu_thread>(rwlock->wq, rwlock->protocol))
 			{
-				if (static_cast<ppu_thread*>(cpu)->state & cpu_flag::again)
-				{
-					ppu.state += cpu_flag::again;
-					return {};
-				}
-
-				rwlock->owner = cpu->id << 1 | !!rwlock->wq | !!rwlock->rq;
+				rwlock->owner = cpu->id << 1 | !rwlock->wq.empty() | !rwlock->rq.empty();
 
 				rwlock->awake(cpu);
 			}
@@ -326,7 +265,7 @@ error_code sys_rwlock_runlock(ppu_thread& ppu, u32 rw_lock_id)
 			{
 				rwlock->owner = 0;
 
-				ensure(!rwlock->rq);
+				ensure(rwlock->rq.empty());
 			}
 		}
 	}
@@ -340,7 +279,7 @@ error_code sys_rwlock_wlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
 
 	sys_rwlock.trace("sys_rwlock_wlock(rw_lock_id=0x%x, timeout=0x%llx)", rw_lock_id, timeout);
 
-	const auto rwlock = idm::get<lv2_obj, lv2_rwlock>(rw_lock_id, [&, notify = lv2_obj::notify_all_t()](lv2_rwlock& rwlock) -> s64
+	const auto rwlock = idm::get<lv2_obj, lv2_rwlock>(rw_lock_id, [&](lv2_rwlock& rwlock) -> s64
 	{
 		const s64 val = rwlock.owner;
 
@@ -356,8 +295,6 @@ error_code sys_rwlock_wlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
 			return val;
 		}
 
-		lv2_obj::prepare_for_sleep(ppu);
-
 		std::lock_guard lock(rwlock.mutex);
 
 		const s64 _old = rwlock.owner.fetch_op([&](s64& val)
@@ -374,8 +311,8 @@ error_code sys_rwlock_wlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
 
 		if (_old != 0)
 		{
+			rwlock.wq.emplace_back(&ppu);
 			rwlock.sleep(ppu, timeout);
-			lv2_obj::emplace(rwlock.wq, &ppu);
 		}
 
 		return _old;
@@ -398,37 +335,16 @@ error_code sys_rwlock_wlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
 
 	ppu.gpr[3] = CELL_OK;
 
-	while (auto state = +ppu.state)
+	while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
 	{
-		if (state & cpu_flag::signal && ppu.state.test_and_reset(cpu_flag::signal))
-		{
-			break;
-		}
-
 		if (is_stopped(state))
 		{
-			std::lock_guard lock(rwlock->mutex);
-
-			for (auto cpu = +rwlock->wq; cpu; cpu = cpu->next_cpu)
-			{
-				if (cpu == &ppu)
-				{
-					ppu.state += cpu_flag::again;
-					return {};
-				}
-			}
-
-			break;
+			return {};
 		}
 
-		for (usz i = 0; cpu_flag::signal - ppu.state && i < 50; i++)
+		if (state & cpu_flag::signal)
 		{
-			busy_wait(500);
-		}
-
-		if (ppu.state & cpu_flag::signal)
- 		{
-			continue;
+			break;
 		}
 
 		if (timeout)
@@ -438,7 +354,7 @@ error_code sys_rwlock_wlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
 				// Wait for rescheduling
 				if (ppu.check_state())
 				{
-					continue;
+					return {};
 				}
 
 				std::lock_guard lock(rwlock->mutex);
@@ -449,26 +365,23 @@ error_code sys_rwlock_wlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
 				}
 
 				// If the last waiter quit the writer sleep queue, wake blocked readers
-				if (rwlock->rq && !rwlock->wq && rwlock->owner < 0)
+				if (!rwlock->rq.empty() && rwlock->wq.empty() && rwlock->owner < 0)
 				{
-					s64 size = 0;
-
-					// Protocol doesn't matter here since they are all enqueued anyways
-					while (auto cpu = rwlock->schedule<ppu_thread>(rwlock->rq, SYS_SYNC_FIFO))
-					{
-						size++;
-						rwlock->append(cpu);
-					}
-
 					rwlock->owner.atomic_op([&](s64& owner)
 					{
-						owner -= 2 * size; // Add readers to value
+						owner -= 2 * static_cast<s64>(rwlock->rq.size()); // Add readers to value
 						owner &= -2; // Clear wait bit
 					});
 
+					// Protocol doesn't matter here since they are all enqueued anyways
+					for (auto cpu : ::as_rvalue(std::move(rwlock->rq)))
+					{
+						rwlock->append(cpu);
+					}
+
 					lv2_obj::awake_all();
 				}
-				else if (!rwlock->rq && !rwlock->wq)
+				else if (rwlock->rq.empty() && rwlock->wq.empty())
 				{
 					rwlock->owner &= -2;
 				}
@@ -479,7 +392,7 @@ error_code sys_rwlock_wlock(ppu_thread& ppu, u32 rw_lock_id, u64 timeout)
 		}
 		else
 		{
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
 		}
 	}
 
@@ -542,43 +455,24 @@ error_code sys_rwlock_wunlock(ppu_thread& ppu, u32 rw_lock_id)
 		return CELL_EPERM;
 	}
 
-	if (lv2_obj::notify_all_t notify; rwlock.ret & 1)
+	if (rwlock.ret & 1)
 	{
 		std::lock_guard lock(rwlock->mutex);
 
 		if (auto cpu = rwlock->schedule<ppu_thread>(rwlock->wq, rwlock->protocol))
 		{
-			if (static_cast<ppu_thread*>(cpu)->state & cpu_flag::again)
-			{
-				ppu.state += cpu_flag::again;
-				return {};
-			}
-
-			rwlock->owner = cpu->id << 1 | !!rwlock->wq | !!rwlock->rq;
+			rwlock->owner = cpu->id << 1 | !rwlock->wq.empty() | !rwlock->rq.empty();
 
 			rwlock->awake(cpu);
 		}
-		else if (rwlock->rq)
+		else if (auto readers = rwlock->rq.size())
 		{
-			for (auto cpu = +rwlock->rq; cpu; cpu = cpu->next_cpu)
+			for (auto cpu : ::as_rvalue(std::move(rwlock->rq)))
 			{
-				if (cpu->state & cpu_flag::again)
-				{
-					ppu.state += cpu_flag::again;
-					return {};
-				}
-			}
-
-			s64 size = 0;
-
-			// Protocol doesn't matter here since they are all enqueued anyways
-			while (auto cpu = rwlock->schedule<ppu_thread>(rwlock->rq, SYS_SYNC_FIFO))
-			{
-				size++;
 				rwlock->append(cpu);
 			}
 
-			rwlock->owner.release(-2 * static_cast<s64>(size));
+			rwlock->owner.release(-2 * static_cast<s64>(readers));
 			lv2_obj::awake_all();
 		}
 		else
diff --git a/rpcs3/Emu/Cell/lv2/sys_rwlock.h b/rpcs3/Emu/Cell/lv2/sys_rwlock.h
index 9bfcac0008..97f762c01c 100644
--- a/rpcs3/Emu/Cell/lv2/sys_rwlock.h
+++ b/rpcs3/Emu/Cell/lv2/sys_rwlock.h
@@ -29,8 +29,8 @@ struct lv2_rwlock final : lv2_obj
 
 	shared_mutex mutex;
 	atomic_t<s64> owner{0};
-	ppu_thread* rq{};
-	ppu_thread* wq{};
+	std::deque<cpu_thread*> rq;
+	std::deque<cpu_thread*> wq;
 
 	lv2_rwlock(u32 protocol, u64 key, u64 name) noexcept
 		: protocol{static_cast<u8>(protocol)}
@@ -38,10 +38,6 @@ struct lv2_rwlock final : lv2_obj
 		, name(name)
 	{
 	}
-
-	lv2_rwlock(utils::serial& ar);
-	static std::function<void(void*)> load(utils::serial& ar);
-	void save(utils::serial& ar);
 };
 
 // Aux
diff --git a/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp b/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp
index 7440cf2def..4a3e291547 100644
--- a/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp
@@ -2,39 +2,18 @@
 #include "sys_semaphore.h"
 
 #include "Emu/IdManager.h"
+#include "Emu/IPC.h"
 
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
 
-#include "util/asm.hpp"
-
 LOG_CHANNEL(sys_semaphore);
 
-lv2_sema::lv2_sema(utils::serial& ar)
-	: protocol(ar)
-	, key(ar)
-	, name(ar)
-	, max(ar)
-{
-	ar(val);
-}
-
-std::function<void(void*)> lv2_sema::load(utils::serial& ar)
-{
-	return load_func(make_shared<lv2_sema>(stx::exact_t<utils::serial&>(ar)));
-}
-
-void lv2_sema::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(lv2_sync);
-	ar(protocol, key, name, max, std::max<s32>(+val, 0));
-}
-
 error_code sys_semaphore_create(ppu_thread& ppu, vm::ptr<u32> sem_id, vm::ptr<sys_semaphore_attribute_t> attr, s32 initial_val, s32 max_val)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_semaphore.trace("sys_semaphore_create(sem_id=*0x%x, attr=*0x%x, initial_val=%d, max_val=%d)", sem_id, attr, initial_val, max_val);
+	sys_semaphore.warning("sys_semaphore_create(sem_id=*0x%x, attr=*0x%x, initial_val=%d, max_val=%d)", sem_id, attr, initial_val, max_val);
 
 	if (!sem_id || !attr)
 	{
@@ -59,20 +38,18 @@ error_code sys_semaphore_create(ppu_thread& ppu, vm::ptr<u32> sem_id, vm::ptr<sy
 
 	const u64 ipc_key = lv2_obj::get_key(_attr);
 
-	if (ipc_key)
-	{
-		sys_semaphore.warning("sys_semaphore_create(sem_id=*0x%x, attr=*0x%x, initial_val=%d, max_val=%d): IPC=0x%016x", sem_id, attr, initial_val, max_val, ipc_key);
-	}
-
 	if (auto error = lv2_obj::create<lv2_sema>(_attr.pshared, ipc_key, _attr.flags, [&]
 	{
-		return make_shared<lv2_sema>(protocol, ipc_key, _attr.name_u64, max_val, initial_val);
+		return std::make_shared<lv2_sema>(protocol, ipc_key, _attr.name_u64, max_val, initial_val);
 	}))
 	{
 		return error;
 	}
 
-	static_cast<void>(ppu.test_stopped());
+	if (ppu.test_stopped())
+	{
+		return {};
+	}
 
 	*sem_id = idm::last_id();
 	return CELL_OK;
@@ -82,7 +59,7 @@ error_code sys_semaphore_destroy(ppu_thread& ppu, u32 sem_id)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_semaphore.trace("sys_semaphore_destroy(sem_id=0x%x)", sem_id);
+	sys_semaphore.warning("sys_semaphore_destroy(sem_id=0x%x)", sem_id);
 
 	const auto sem = idm::withdraw<lv2_obj, lv2_sema>(sem_id, [](lv2_sema& sema) -> CellError
 	{
@@ -100,11 +77,6 @@ error_code sys_semaphore_destroy(ppu_thread& ppu, u32 sem_id)
 		return CELL_ESRCH;
 	}
 
-	if (sem->key)
-	{
-		sys_semaphore.warning("sys_semaphore_destroy(sem_id=0x%x): IPC=0x%016x", sem_id, sem->key);
-	}
-
 	if (sem.ret)
 	{
 		return sem.ret;
@@ -119,7 +91,7 @@ error_code sys_semaphore_wait(ppu_thread& ppu, u32 sem_id, u64 timeout)
 
 	sys_semaphore.trace("sys_semaphore_wait(sem_id=0x%x, timeout=0x%llx)", sem_id, timeout);
 
-	const auto sem = idm::get<lv2_obj, lv2_sema>(sem_id, [&, notify = lv2_obj::notify_all_t()](lv2_sema& sema)
+	const auto sem = idm::get<lv2_obj, lv2_sema>(sem_id, [&](lv2_sema& sema)
 	{
 		const s32 val = sema.val;
 
@@ -131,14 +103,12 @@ error_code sys_semaphore_wait(ppu_thread& ppu, u32 sem_id, u64 timeout)
 			}
 		}
 
-		lv2_obj::prepare_for_sleep(ppu);
-
 		std::lock_guard lock(sema.mutex);
 
 		if (sema.val-- <= 0)
 		{
+			sema.sq.emplace_back(&ppu);
 			sema.sleep(ppu, timeout);
-			lv2_obj::emplace(sema.sq, &ppu);
 			return false;
 		}
 
@@ -157,37 +127,16 @@ error_code sys_semaphore_wait(ppu_thread& ppu, u32 sem_id, u64 timeout)
 
 	ppu.gpr[3] = CELL_OK;
 
-	while (auto state = +ppu.state)
+	while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
 	{
-		if (state & cpu_flag::signal && ppu.state.test_and_reset(cpu_flag::signal))
-		{
-			break;
-		}
-
 		if (is_stopped(state))
 		{
-			std::lock_guard lock(sem->mutex);
-
-			for (auto cpu = +sem->sq; cpu; cpu = cpu->next_cpu)
-			{
-				if (cpu == &ppu)
-				{
-					ppu.state += cpu_flag::again;
-					return {};
-				}
-			}
-
-			break;
+			return {};
 		}
 
-		for (usz i = 0; cpu_flag::signal - ppu.state && i < 50; i++)
+		if (state & cpu_flag::signal)
 		{
-			busy_wait(500);
-		}
-
-		if (ppu.state & cpu_flag::signal)
- 		{
-			continue;
+			break;
 		}
 
 		if (timeout)
@@ -197,11 +146,9 @@ error_code sys_semaphore_wait(ppu_thread& ppu, u32 sem_id, u64 timeout)
 				// Wait for rescheduling
 				if (ppu.check_state())
 				{
-					continue;
+					return {};
 				}
 
-				ppu.state += cpu_flag::wait;
-
 				std::lock_guard lock(sem->mutex);
 
 				if (!sem->unqueue(sem->sq, &ppu))
@@ -223,7 +170,7 @@ error_code sys_semaphore_wait(ppu_thread& ppu, u32 sem_id, u64 timeout)
 		}
 		else
 		{
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
 		}
 	}
 
@@ -285,8 +232,6 @@ error_code sys_semaphore_post(ppu_thread& ppu, u32 sem_id, s32 count)
 		return CELL_EINVAL;
 	}
 
-	lv2_obj::notify_all_t notify;
-
 	if (sem.ret)
 	{
 		return CELL_OK;
@@ -295,15 +240,6 @@ error_code sys_semaphore_post(ppu_thread& ppu, u32 sem_id, s32 count)
 	{
 		std::lock_guard lock(sem->mutex);
 
-		for (auto cpu = +sem->sq; cpu; cpu = cpu->next_cpu)
-		{
-			if (static_cast<ppu_thread*>(cpu)->state & cpu_flag::again)
-			{
-				ppu.state += cpu_flag::again;
-				return {};
-			}
-		}
-
 		const auto [val, ok] = sem->val.fetch_op([&](s32& val)
 		{
 			if (count + 0u <= sem->max + 0u - val)
@@ -358,7 +294,10 @@ error_code sys_semaphore_get_value(ppu_thread& ppu, u32 sem_id, vm::ptr<s32> cou
 		return CELL_EFAULT;
 	}
 
-	static_cast<void>(ppu.test_stopped());
+	if (ppu.test_stopped())
+	{
+		return {};
+	}
 
 	*count = sema.ret;
 	return CELL_OK;
diff --git a/rpcs3/Emu/Cell/lv2/sys_semaphore.h b/rpcs3/Emu/Cell/lv2/sys_semaphore.h
index 737d2b0e69..78dc0643a5 100644
--- a/rpcs3/Emu/Cell/lv2/sys_semaphore.h
+++ b/rpcs3/Emu/Cell/lv2/sys_semaphore.h
@@ -30,7 +30,7 @@ struct lv2_sema final : lv2_obj
 
 	shared_mutex mutex;
 	atomic_t<s32> val;
-	ppu_thread* sq{};
+	std::deque<cpu_thread*> sq;
 
 	lv2_sema(u32 protocol, u64 key, u64 name, s32 max, s32 value) noexcept
 		: protocol{static_cast<u8>(protocol)}
@@ -40,10 +40,6 @@ struct lv2_sema final : lv2_obj
 		, val(value)
 	{
 	}
-
-	lv2_sema(utils::serial& ar);
-	static std::function<void(void*)> load(utils::serial& ar);
-	void save(utils::serial& ar);
 };
 
 // Aux
diff --git a/rpcs3/Emu/Cell/lv2/sys_sm.cpp b/rpcs3/Emu/Cell/lv2/sys_sm.cpp
index 50a9b1c679..32cf796aff 100644
--- a/rpcs3/Emu/Cell/lv2/sys_sm.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_sm.cpp
@@ -1,9 +1,7 @@
 #include "stdafx.h"
-#include "Emu/System.h"
+#include "Emu/Memory/vm.h"
 
 #include "Emu/Cell/ErrorCodes.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/Cell/lv2/sys_process.h"
 
 #include "sys_sm.h"
 
@@ -43,49 +41,9 @@ error_code sys_sm_get_ext_event2(vm::ptr<u64> a1, vm::ptr<u64> a2, vm::ptr<u64>
 	return not_an_error(CELL_EAGAIN);
 }
 
-error_code sys_sm_shutdown(ppu_thread& ppu, u16 op, vm::ptr<void> param, u64 size)
+error_code sys_sm_shutdown(u16 op, vm::ptr<void> param, u64 size)
 {
-	ppu.state += cpu_flag::wait;
-
-	sys_sm.success("sys_sm_shutdown(op=0x%x, param=*0x%x, size=0x%x)", op, param, size);
-
-	if (!g_ps3_process_info.has_root_perm())
-	{
-		return CELL_ENOSYS;
-	}
-
-	switch (op)
-	{
-	case 0x100:
-	case 0x1100:
-	{
-		sys_sm.success("Received shutdown request from application");
-		_sys_process_exit(ppu, 0, 0, 0);
-		break;
-	}
-	case 0x200:
-	case 0x1200:
-	{
-		sys_sm.success("Received reboot request from application");
-		lv2_exitspawn(ppu, Emu.argv, Emu.envp, Emu.data);
-		break;
-	}
-	case 0x8201:
-	case 0x8202:
-	case 0x8204:
-	{
-		sys_sm.warning("Unsupported LPAR operation: 0x%x", op);
-		return CELL_ENOTSUP;
-	}
-	default: return CELL_EINVAL;
-	}
-
-	return CELL_OK;
-}
-
-error_code sys_sm_set_shop_mode(s32 mode)
-{
-	sys_sm.todo("sys_sm_set_shop_mode(mode=0x%x)", mode);
+	sys_sm.todo("sys_sm_shutdown(op=0x%x, param=*0x%x, size=0x%x", op, param, size);
 
 	return CELL_OK;
 }
diff --git a/rpcs3/Emu/Cell/lv2/sys_sm.h b/rpcs3/Emu/Cell/lv2/sys_sm.h
index 9e42e8f379..bcf43d2e82 100644
--- a/rpcs3/Emu/Cell/lv2/sys_sm.h
+++ b/rpcs3/Emu/Cell/lv2/sys_sm.h
@@ -6,9 +6,8 @@
 // SysCalls
 
 error_code sys_sm_get_ext_event2(vm::ptr<u64> a1, vm::ptr<u64> a2, vm::ptr<u64> a3, u64 a4);
-error_code sys_sm_shutdown(ppu_thread& ppu, u16 op, vm::ptr<void> param, u64 size);
+error_code sys_sm_shutdown(u16 op, vm::ptr<void> param, u64 size);
 error_code sys_sm_get_params(vm::ptr<u8> a, vm::ptr<u8> b, vm::ptr<u32> c, vm::ptr<u64> d);
-error_code sys_sm_set_shop_mode(s32 mode);
 error_code sys_sm_control_led(u8 led, u8 action);
 error_code sys_sm_ring_buzzer(u64 packet, u64 a1, u64 a2);
 constexpr auto sys_sm_ring_buzzer2 = sys_sm_ring_buzzer;
diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.cpp b/rpcs3/Emu/Cell/lv2/sys_spu.cpp
index 77fbcb8505..f258ce4221 100644
--- a/rpcs3/Emu/Cell/lv2/sys_spu.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_spu.cpp
@@ -2,6 +2,7 @@
 #include "sys_spu.h"
 
 #include "Emu/System.h"
+#include "Emu/VFS.h"
 #include "Emu/IdManager.h"
 #include "Crypto/unself.h"
 #include "Crypto/unedat.h"
@@ -11,8 +12,8 @@
 
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
+#include "Emu/Cell/RawSPUThread.h"
 #include "Emu/Cell/timers.hpp"
-#include "Emu/Memory/vm_reservation.h"
 #include "sys_interrupt.h"
 #include "sys_process.h"
 #include "sys_memory.h"
@@ -47,38 +48,18 @@ void fmt_class_string<spu_group_status>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
-void fmt_class_string<spu_stop_syscall>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](spu_stop_syscall value)
-	{
-		switch (value)
-		{
-		case SYS_SPU_THREAD_STOP_YIELD: return "sys_spu_thread_yield";
-		case SYS_SPU_THREAD_STOP_GROUP_EXIT: return "sys_spu_thread_group_exit";
-		case SYS_SPU_THREAD_STOP_THREAD_EXIT: return "sys_spu_thread_thread_exit";
-		case SYS_SPU_THREAD_STOP_RECEIVE_EVENT: return "sys_spu_thread_receive_event";
-		case SYS_SPU_THREAD_STOP_TRY_RECEIVE_EVENT: return "sys_spu_thread_tryreceive_event";
-		case SYS_SPU_THREAD_STOP_SWITCH_SYSTEM_MODULE: return "sys_spu_thread_switch_system_module";
-		}
-
-		return unknown;
-	});
-}
-
-bool sys_spu_image::load(const fs::file& stream)
+void sys_spu_image::load(const fs::file& stream)
 {
 	const spu_exec_object obj{stream, 0, elf_opt::no_sections + elf_opt::no_data};
 
 	if (obj != elf_error::ok)
 	{
-		sys_spu.error("Failed to load SPU image: %s", obj.get_error());
-		return false;
+		fmt::throw_exception("Failed to load SPU image: %s", obj.get_error());
 	}
 
 	for (const auto& shdr : obj.shdrs)
 	{
-		spu_log.notice("** Section: sh_type=0x%x, addr=0x%llx, size=0x%llx, flags=0x%x", std::bit_cast<u32>(shdr.sh_type), shdr.sh_addr, shdr.sh_size, shdr._sh_flags);
+		spu_log.notice("** Section: sh_type=0x%x, addr=0x%llx, size=0x%llx, flags=0x%x", shdr.sh_type, shdr.sh_addr, shdr.sh_size, shdr.sh_flags);
 	}
 
 	for (const auto& prog : obj.progs)
@@ -95,7 +76,7 @@ bool sys_spu_image::load(const fs::file& stream)
 	const s32 nsegs = sys_spu_image::get_nsegs(obj.progs);
 
 	const u32 mem_size = nsegs * sizeof(sys_spu_segment) + ::size32(stream);
-	const vm::ptr<sys_spu_segment> segs = vm::cast(vm::reserve_map(vm::user64k, 0, 0x10000000)->alloc(mem_size));
+	const vm::ptr<sys_spu_segment> segs = vm::cast(vm::alloc(mem_size, vm::main));
 
 	//const u32 entry = obj.header.e_entry;
 
@@ -117,7 +98,6 @@ bool sys_spu_image::load(const fs::file& stream)
 	this->segs = vm::null;
 
 	vm::page_protect(segs.addr(), utils::align(mem_size, 4096), 0, 0, vm::page_writable);
-	return true;
 }
 
 void sys_spu_image::free() const
@@ -129,7 +109,7 @@ void sys_spu_image::free() const
 	}
 }
 
-void sys_spu_image::deploy(u8* loc, std::span<const sys_spu_segment> segs, bool is_verbose)
+void sys_spu_image::deploy(u8* loc, std::span<const sys_spu_segment> segs)
 {
 	// Segment info dump
 	std::string dump;
@@ -183,163 +163,20 @@ void sys_spu_image::deploy(u8* loc, std::span<const sys_spu_segment> segs, bool
 		hash[5 + i * 2] = pal[sha1_hash[i] & 15];
 	}
 
-	auto mem_translate = [loc](u32 addr, u32 size)
-	{
-		return utils::add_saturate<u32>(addr, size) <= SPU_LS_SIZE ? loc + addr : nullptr;
-	};
-
 	// Apply the patch
-	std::vector<u32> applied;
-	g_fxo->get<patch_engine>().apply(applied, hash, mem_translate);
+	auto applied = g_fxo->get<patch_engine>().apply(hash, loc);
 
 	if (!Emu.GetTitleID().empty())
 	{
 		// Alternative patch
-		g_fxo->get<patch_engine>().apply(applied, Emu.GetTitleID() + '-' + hash, mem_translate);
+		applied += g_fxo->get<patch_engine>().apply(Emu.GetTitleID() + '-' + hash, loc);
 	}
 
-	(is_verbose ? spu_log.notice : sys_spu.trace)("Loaded SPU image: %s (<- %u)%s", hash, applied.size(), dump);
-}
-
-lv2_spu_group::lv2_spu_group(utils::serial& ar) noexcept
-	: name(ar.pop<std::string>())
-	, id(idm::last_id())
-	, max_num(ar)
-	, mem_size(ar)
-	, type(ar) // SPU Thread Group Type
-	, ct(lv2_memory_container::search(ar))
-	, has_scheduler_context(ar.pop<u8>())
-	, max_run(ar)
-	, init(ar)
-	, prio([&ar]()
-	{
-		std::common_type_t<decltype(lv2_spu_group::prio)> prio{};
-
-		ar(prio.all);
-
-		return prio;
-	}())
-	, run_state(ar.pop<spu_group_status>())
-	, exit_status(ar)
-{
-	for (auto& thread : threads)
-	{
-		if (ar.pop<bool>())
-		{
-			ar(id_manager::g_id);
-			thread = stx::make_shared<named_thread<spu_thread>>(stx::launch_retainer{}, ar, this);
-			ensure(idm::import_existing<named_thread<spu_thread>>(thread, idm::last_id()));
-			running += !thread->stop_flag_removal_protection;
-		}
-	}
-
-	ar(threads_map);
-	ar(imgs);
-	ar(args);
-
-	for (auto ep : {&ep_run, &ep_exception, &ep_sysmodule})
-	{
-		*ep = idm::get_unlocked<lv2_obj, lv2_event_queue>(ar.pop<u32>());
-	}
-
-	waiter_spu_index = -1;
-
-	switch (run_state)
-	{
-	// Commented stuff are handled by different means currently
-	//case SPU_THREAD_GROUP_STATUS_NOT_INITIALIZED:
-	//case SPU_THREAD_GROUP_STATUS_INITIALIZED:
-	//case SPU_THREAD_GROUP_STATUS_READY:
-	case SPU_THREAD_GROUP_STATUS_WAITING:
-	{
-		run_state = SPU_THREAD_GROUP_STATUS_RUNNING;
-		ar(waiter_spu_index);
-		[[fallthrough]];
-	}
-	case SPU_THREAD_GROUP_STATUS_WAITING_AND_SUSPENDED:
-	{
-		if (run_state == SPU_THREAD_GROUP_STATUS_WAITING_AND_SUSPENDED)
-		{
-			run_state = SPU_THREAD_GROUP_STATUS_SUSPENDED;
-		}
-
-		[[fallthrough]];
-	}
-	case SPU_THREAD_GROUP_STATUS_SUSPENDED:
-	{
-		// Suspend all SPU threads except a thread that waits on sys_spu_thread_receive_event
-		for (const auto& thread : threads)
-		{
-			if (thread)
-			{
-				if (thread->index == waiter_spu_index)
-				{
-					lv2_obj::set_future_sleep(thread.get());
-					continue;
-				}
-
-				thread->state += cpu_flag::suspend;
-			}
-		}
-
-		break;
-	}
-	//case SPU_THREAD_GROUP_STATUS_RUNNING:
-	//case SPU_THREAD_GROUP_STATUS_STOPPED:
-	//case SPU_THREAD_GROUP_STATUS_UNKNOWN:
-	default:
-	{
-		break;
-	}
-	}
-}
-
-void lv2_spu_group::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(spu);
-
-	ar(name, max_num, mem_size, type, ct->id, has_scheduler_context, max_run, init, prio.load().all, run_state, exit_status);
-
-	for (const auto& thread : threads)
-	{
-		ar(u8{thread.operator bool()});
-
-		if (thread)
-		{
-			ar(thread->id);
-			thread->save(ar);
-		}
-	}
-
-	ar(threads_map);
-	ar(imgs);
-	ar(args);
-
-	for (auto ep : {&ep_run, &ep_exception, &ep_sysmodule})
-	{
-		ar(lv2_obj::check(*ep) ? (*ep)->id : 0);
-	}
-
-	if (run_state == SPU_THREAD_GROUP_STATUS_WAITING)
-	{
-		ar(waiter_spu_index);
-	}
-}
-
-lv2_spu_image::lv2_spu_image(utils::serial& ar)
-	: e_entry(ar)
-	, segs(ar.pop<decltype(segs)>())
-	, nsegs(ar)
-{
-}
-
-void lv2_spu_image::save(utils::serial& ar)
-{
-	ar(e_entry, segs, nsegs);
+	spu_log.notice("Loaded SPU image: %s (<- %u)%s", hash, applied.size(), dump);
 }
 
 // Get spu thread ptr, returns group ptr as well for refcounting
-std::pair<named_thread<spu_thread>*, shared_ptr<lv2_spu_group>> lv2_spu_group::get_thread(u32 id)
+std::pair<named_thread<spu_thread>*, std::shared_ptr<lv2_spu_group>> lv2_spu_group::get_thread(u32 id)
 {
 	if (id >= 0x06000000)
 	{
@@ -348,7 +185,7 @@ std::pair<named_thread<spu_thread>*, shared_ptr<lv2_spu_group>> lv2_spu_group::g
 	}
 
 	// Bits 0-23 contain group id (without id base)
-	decltype(get_thread(0)) res{nullptr, idm::get_unlocked<lv2_spu_group>((id & 0xFFFFFF) | (lv2_spu_group::id_base & ~0xFFFFFF))};
+	decltype(get_thread(0)) res{nullptr, idm::get<lv2_spu_group>((id & 0xFFFFFF) | (lv2_spu_group::id_base & ~0xFFFFFF))};
 
 	// Bits 24-31 contain thread index within the group
 	const u32 index = id >> 24;
@@ -361,6 +198,9 @@ std::pair<named_thread<spu_thread>*, shared_ptr<lv2_spu_group>> lv2_spu_group::g
 	return res;
 }
 
+namespace
+{
+
 struct limits_data
 {
 	u32 physical = 0;
@@ -376,57 +216,19 @@ struct spu_limits_t
 	u32 max_spu = 6;
 	shared_mutex mutex;
 
-	spu_limits_t() = default;
-
-	spu_limits_t(utils::serial& ar) noexcept
-	{
-		ar(max_raw, max_spu);
-	}
-
-	void save(utils::serial& ar)
-	{
-		ar(max_raw, max_spu);
-	}
-
-	SAVESTATE_INIT_POS(47);
-
-	bool check_valid(const limits_data& init) const
-	{
-		const u32 physical_spus_count = init.physical;
-		const u32 controllable_spu_count = init.controllable;
-
-		const u32 spu_limit = init.spu_limit != umax ? init.spu_limit : max_spu;
-		const u32 raw_limit = init.raw_limit != umax ? init.raw_limit : max_raw;
-
-		if (spu_limit + raw_limit > 6 || physical_spus_count > spu_limit || controllable_spu_count > spu_limit)
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	bool check_busy(const limits_data& init) const
+	bool check(const limits_data& init) const
 	{
 		u32 physical_spus_count = init.physical;
 		u32 raw_spu_count = init.raw_spu;
 		u32 controllable_spu_count = init.controllable;
-		u32 system_coop = init.controllable != 0 && init.physical != 0 ? 1 : 0;
-
 		const u32 spu_limit = init.spu_limit != umax ? init.spu_limit : max_spu;
 		const u32 raw_limit = init.raw_limit != umax ? init.raw_limit : max_raw;
 
 		idm::select<lv2_spu_group>([&](u32, lv2_spu_group& group)
 		{
-			if (group.type & SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM)
+			if (group.has_scheduler_context)
 			{
-				system_coop++;
-				controllable_spu_count = std::max<u32>(controllable_spu_count, 1);
-				physical_spus_count += group.max_num - 1;
-			}
-			else if (group.has_scheduler_context)
-			{
-				controllable_spu_count = std::max<u32>(controllable_spu_count, group.max_num);
+				controllable_spu_count = std::max(controllable_spu_count, group.max_num);
 			}
 			else
 			{
@@ -436,22 +238,17 @@ struct spu_limits_t
 
 		raw_spu_count += spu_thread::g_raw_spu_ctr;
 
-		// physical_spus_count >= spu_limit returns EBUSY, not EINVAL!
-		if (spu_limit + raw_limit > 6 || raw_spu_count > raw_limit || physical_spus_count >= spu_limit || physical_spus_count > spu_limit || controllable_spu_count > spu_limit)
+		if (spu_limit + raw_limit > 6 || raw_spu_count > raw_limit || physical_spus_count >= spu_limit || physical_spus_count + controllable_spu_count > spu_limit)
 		{
 			return false;
 		}
 
-		if (system_coop > 1)
-		{
-			// Cannot have more than one SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM group at a time
-			return false;
-		}
-
 		return true;
 	}
 };
 
+} // annonymous namespace
+
 error_code sys_spu_initialize(ppu_thread& ppu, u32 max_usable_spu, u32 max_raw_spu)
 {
 	ppu.state += cpu_flag::wait;
@@ -470,7 +267,7 @@ error_code sys_spu_initialize(ppu_thread& ppu, u32 max_usable_spu, u32 max_raw_s
 
 	std::lock_guard lock(limits.mutex);
 
-	if (!limits.check_busy(limits_data{.spu_limit = max_usable_spu - max_raw_spu, .raw_limit = max_raw_spu}))
+	if (!limits.check(limits_data{.spu_limit = max_usable_spu - max_raw_spu, .raw_limit = max_raw_spu}))
 	{
 		return CELL_EBUSY;
 	}
@@ -491,14 +288,13 @@ error_code _sys_spu_image_get_information(ppu_thread& ppu, vm::ptr<sys_spu_image
 		return CELL_EINVAL;
 	}
 
-	const auto image = idm::get_unlocked<lv2_obj, lv2_spu_image>(img->entry_point);
+	const auto image = idm::get<lv2_obj, lv2_spu_image>(img->entry_point);
 
 	if (!image)
 	{
 		return CELL_ESRCH;
 	}
 
-	ppu.check_state();
 	*entry_point = image->e_entry;
 	*nsegs       = image->nsegs;
 	return CELL_OK;
@@ -517,54 +313,17 @@ error_code sys_spu_image_open(ppu_thread& ppu, vm::ptr<sys_spu_image> img, vm::c
 		return {fs_error, path};
 	}
 
-	u128 klic = g_fxo->get<loaded_npdrm_keys>().last_key();
+	u128 klic = g_fxo->get<loaded_npdrm_keys>().devKlic.load();
 
-	const fs::file elf_file = decrypt_self(file, reinterpret_cast<const u8*>(&klic));
+	const fs::file elf_file = decrypt_self(std::move(file), reinterpret_cast<u8*>(&klic));
 
-	if (!elf_file || !img->load(elf_file))
+	if (!elf_file)
 	{
 		sys_spu.error("sys_spu_image_open(): file %s is illegal for SPU image!", path);
 		return {CELL_ENOEXEC, path};
 	}
 
-	return CELL_OK;
-}
-
-error_code sys_spu_image_open_by_fd(ppu_thread& ppu, vm::ptr<sys_spu_image> img, s32 fd, s64 offset)
-{
-	ppu.state += cpu_flag::wait;
-
-	sys_spu.warning("sys_spu_image_open_by_fd(img=*0x%x, fd=%d, offset=0x%x)", img, fd, offset);
-
-	const auto file = idm::get_unlocked<lv2_fs_object, lv2_file>(fd);
-
-	if (!file)
-	{
-		return CELL_EBADF;
-	}
-
-	if (offset < 0)
-	{
-		return CELL_ENOEXEC;
-	}
-
-	std::lock_guard lock(file->mp->mutex);
-
-	if (!file->file)
-	{
-		return CELL_EBADF;
-	}
-
-	u128 klic = g_fxo->get<loaded_npdrm_keys>().last_key();
-
-	const fs::file elf_file = decrypt_self(lv2_file::make_view(file, offset), reinterpret_cast<const u8*>(&klic));
-
-	if (!img->load(elf_file))
-	{
-		sys_spu.error("sys_spu_image_open(): file %s is illegal for SPU image!", file->name.data());
-		return {CELL_ENOEXEC, file->name.data()};
-	}
-
+	img->load(elf_file);
 	return CELL_OK;
 }
 
@@ -596,7 +355,7 @@ error_code _sys_spu_image_close(ppu_thread& ppu, vm::ptr<sys_spu_image> img)
 		return CELL_ESRCH;
 	}
 
-	ensure(vm::dealloc(handle->segs.addr(), vm::user64k));
+	ensure(vm::dealloc(handle->segs.addr(), vm::main));
 	return CELL_OK;
 }
 
@@ -611,7 +370,7 @@ error_code _sys_spu_image_get_segments(ppu_thread& ppu, vm::ptr<sys_spu_image> i
 		return CELL_EINVAL;
 	}
 
-	const auto handle = idm::get_unlocked<lv2_obj, lv2_spu_image>(img->entry_point);
+	const auto handle = idm::get<lv2_obj, lv2_spu_image>(img->entry_point);
 
 	if (!handle)
 	{
@@ -619,7 +378,6 @@ error_code _sys_spu_image_get_segments(ppu_thread& ppu, vm::ptr<sys_spu_image> i
 	}
 
 	// TODO: apply SPU patches
-	ppu.check_state();
 	std::memcpy(segments.get_ptr(), handle->segs.get_ptr(), sizeof(sys_spu_segment) * std::min<s32>(nseg, handle->nsegs));
 	return CELL_OK;
 }
@@ -630,48 +388,20 @@ error_code sys_spu_thread_initialize(ppu_thread& ppu, vm::ptr<u32> thread, u32 g
 
 	sys_spu.warning("sys_spu_thread_initialize(thread=*0x%x, group=0x%x, spu_num=%d, img=*0x%x, attr=*0x%x, arg=*0x%x)", thread, group_id, spu_num, img, attr, arg);
 
-	if (spu_num >= std::size(decltype(lv2_spu_group::threads_map){}))
+	const u32 option = attr->option;
+
+	if (attr->name_len > 0x80 || option & ~(SYS_SPU_THREAD_OPTION_DEC_SYNC_TB_ENABLE | SYS_SPU_THREAD_OPTION_ASYNC_INTR_ENABLE))
 	{
 		return CELL_EINVAL;
 	}
 
-	if (!attr)
-	{
-		return CELL_EFAULT;
-	}
+	sys_spu_image image;
 
-	const sys_spu_thread_attribute attr_data = *attr;
-
-	if (attr_data.name_len > 0x80)
-	{
-		return CELL_EINVAL;
-	}
-
-	if (!arg)
-	{
-		return CELL_EFAULT;
-	}
-
-	const sys_spu_thread_argument args = *arg;
-	const u32 option = attr_data.option;
-
-	if (option & ~(SYS_SPU_THREAD_OPTION_DEC_SYNC_TB_ENABLE | SYS_SPU_THREAD_OPTION_ASYNC_INTR_ENABLE))
-	{
-		return CELL_EINVAL;
-	}
-
-	if (!img)
-	{
-		return CELL_EFAULT;
-	}
-
-	sys_spu_image image = *img;
-
-	switch (image.type)
+	switch (img->type)
 	{
 	case SYS_SPU_IMAGE_TYPE_KERNEL:
 	{
-		const auto handle = idm::get_unlocked<lv2_obj, lv2_spu_image>(image.entry_point);
+		const auto handle = idm::get<lv2_obj, lv2_spu_image>(img->entry_point);
 
 		if (!handle)
 		{
@@ -687,96 +417,33 @@ error_code sys_spu_thread_initialize(ppu_thread& ppu, vm::ptr<u32> thread, u32 g
 	}
 	case SYS_SPU_IMAGE_TYPE_USER:
 	{
-		if (image.entry_point > 0x3fffc || image.nsegs <= 0 || image.nsegs > 0x20)
+		if (img->entry_point > 0x3fffc || img->nsegs <= 0 || img->nsegs > 0x20)
 		{
 			return CELL_EINVAL;
 		}
 
+		image = *img;
 		break;
 	}
 	default: return CELL_EINVAL;
 	}
 
-	std::vector<sys_spu_segment> spu_segs(image.segs.get_ptr(), image.segs.get_ptr() + image.nsegs);
-
-	bool found_info_segment = false;
-	bool found_copy_segment = false;
-
-	for (const auto& seg : spu_segs)
-	{
-		if (image.type == SYS_SPU_IMAGE_TYPE_KERNEL)
-		{
-			// Assume valid, values are coming from LV2
-			found_copy_segment = true;
-			break;
-		}
-
-		switch (seg.type)
-		{
-		case SYS_SPU_SEGMENT_TYPE_COPY:
-		{
-			if (seg.addr % 4)
-			{
-				// 4-bytes unaligned address is not valid
-				return CELL_EINVAL;
-			}
-
-			found_copy_segment = true;
-			break;
-		}
-		case SYS_SPU_SEGMENT_TYPE_FILL:
-		{
-			break;
-		}
-		case SYS_SPU_SEGMENT_TYPE_INFO:
-		{
-			// There can only be one INFO segment at max
-			if (seg.size > 256u || found_info_segment)
-			{
-				return CELL_EINVAL;
-			}
-
-			found_info_segment = true;
-			continue;
-		}
-		default: return CELL_EINVAL;
-		}
-
-		if (!seg.size || (seg.ls | seg.size) % 0x10 || seg.ls >= SPU_LS_SIZE || seg.size > SPU_LS_SIZE)
-		{
-			return CELL_EINVAL;
-		}
-
-		for (auto it = spu_segs.data(); it != &seg; it++)
-		{
-			if (it->type != SYS_SPU_SEGMENT_TYPE_INFO)
-			{
-				if (seg.ls + seg.size > it->ls && it->ls + it->size > seg.ls)
-				{
-					// Overlapping segments are not allowed
-					return CELL_EINVAL;
-				}
-			}
-		}
-	}
-
-	// There must be at least one COPY segment
-	if (!found_copy_segment)
-	{
-		return CELL_EINVAL;
-	}
-
 	// Read thread name
-	const std::string thread_name(attr_data.name.get_ptr(), std::max<u32>(attr_data.name_len, 1) - 1);
+	const std::string thread_name(attr->name.get_ptr(), std::max<u32>(attr->name_len, 1) - 1);
 
-	const auto group = idm::get_unlocked<lv2_spu_group>(group_id);
+	const auto group = idm::get<lv2_spu_group>(group_id);
 
 	if (!group)
 	{
 		return CELL_ESRCH;
 	}
 
-	std::unique_lock lock(group->mutex);
+	if (spu_num >= group->threads_map.size())
+	{
+		return CELL_EINVAL;
+	}
+
+	std::lock_guard lock(group->mutex);
 
 	if (auto state = +group->run_state; state != SPU_THREAD_GROUP_STATUS_NOT_INITIALIZED)
 	{
@@ -804,23 +471,31 @@ error_code sys_spu_thread_initialize(ppu_thread& ppu, vm::ptr<u32> thread, u32 g
 
 	ensure(idm::import<named_thread<spu_thread>>([&]()
 	{
-		const auto spu = stx::make_shared<named_thread<spu_thread>>(group.get(), spu_num, thread_name, tid, false, option);
+		const auto spu = std::make_shared<named_thread<spu_thread>>(group.get(), spu_num, thread_name, tid, false, option);
 		group->threads[inited] = spu;
 		group->threads_map[spu_num] = static_cast<s8>(inited);
 		return spu;
 	}));
 
-	// alloc_hidden indicates falloc to allocate page with no access rights in base memory
-	auto& spu = group->threads[inited];
-	ensure(vm::get(vm::spu)->falloc(spu->vm_offset(), SPU_LS_SIZE, &spu->shm, static_cast<u64>(vm::page_size_64k) | static_cast<u64>(vm::alloc_hidden)));
-	spu->map_ls(*spu->shm, spu->ls);
+	*thread = tid;
 
-	group->args[inited] = {args.arg1, args.arg2, args.arg3, args.arg4};
+	group->args[inited] = {arg->arg1, arg->arg2, arg->arg3, arg->arg4};
 	group->imgs[inited].first = image.entry_point;
-	group->imgs[inited].second = std::move(spu_segs);
+	group->imgs[inited].second.assign(image.segs.get_ptr(), image.segs.get_ptr() + image.nsegs);
 
 	if (++group->init == group->max_num)
 	{
+		if (g_cfg.core.max_spurs_threads < 6 && group->max_num > 0u + g_cfg.core.max_spurs_threads)
+		{
+			if (group->name.ends_with("CellSpursKernelGroup"))
+			{
+				// Hack: don't run more SPURS threads than specified.
+				group->max_run = g_cfg.core.max_spurs_threads;
+
+				spu_log.success("HACK: '%s' (0x%x) limited to %u threads.", group->name, group_id, +g_cfg.core.max_spurs_threads);
+			}
+		}
+
 		const auto old = group->run_state.compare_and_swap(SPU_THREAD_GROUP_STATUS_NOT_INITIALIZED, SPU_THREAD_GROUP_STATUS_INITIALIZED);
 
 		if (old == SPU_THREAD_GROUP_STATUS_DESTROYED)
@@ -829,11 +504,7 @@ error_code sys_spu_thread_initialize(ppu_thread& ppu, vm::ptr<u32> thread, u32 g
 		}
 	}
 
-	lock.unlock();
-	sys_spu.warning("sys_spu_thread_initialize(): Thread \"%s\" created (id=0x%x)", thread_name, tid);
-
-	ppu.check_state();
-	*thread = tid;
+	sys_spu.warning(u8"sys_spu_thread_initialize(): Thread “%s” created (id=0x%x)", thread_name, tid);
 	return CELL_OK;
 }
 
@@ -874,7 +545,6 @@ error_code sys_spu_thread_get_exit_status(ppu_thread& ppu, u32 id, vm::ptr<s32>
 
 	if (thread->exit_status.try_read(data))
 	{
-		ppu.check_state();
 		*status = static_cast<s32>(data);
 		return CELL_OK;
 	}
@@ -890,14 +560,12 @@ error_code sys_spu_thread_group_create(ppu_thread& ppu, vm::ptr<u32> id, u32 num
 
 	const s32 min_prio = g_ps3_process_info.has_root_perm() ? 0 : 16;
 
-	const sys_spu_thread_group_attribute attr_data = *attr;
-
-	if (attr_data.nsize > 0x80 || !num)
+	if (attr->nsize > 0x80 || !num)
 	{
 		return CELL_EINVAL;
 	}
 
-	const s32 type = attr_data.type;
+	const s32 type = attr->type;
 
 	bool use_scheduler = true;
 	bool use_memct = !!(type & SYS_SPU_THREAD_GROUP_TYPE_MEMORY_FROM_CONTAINER);
@@ -915,24 +583,23 @@ error_code sys_spu_thread_group_create(ppu_thread& ppu, vm::ptr<u32> id, u32 num
 	switch (type)
 	{
 	case 0x0:
-	case SYS_SPU_THREAD_GROUP_TYPE_MEMORY_FROM_CONTAINER:
-	case SYS_SPU_THREAD_GROUP_TYPE_EXCLUSIVE_NON_CONTEXT:
+	case 0x4:
+	case 0x18:
 	{
 		break;
 	}
 
-	case SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM:
-	case (SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM | 0x2):
-	case (SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM | 0x4):
-	case (SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM | 0x6):
+	case 0x20:
+	case 0x22:
+	case 0x24:
+	case 0x26:
 	{
 		if (type == 0x22 || type == 0x26)
 		{
 			needs_root = true;
 		}
 
-		// For a single thread that is being shared with system (the cooperative victim)
-		min_threads = 2;
+		min_threads = 2; // That's what appears from reversing
 		break;
 	}
 
@@ -972,7 +639,7 @@ error_code sys_spu_thread_group_create(ppu_thread& ppu, vm::ptr<u32> id, u32 num
 
 	if (is_system_coop)
 	{
-		// For a single thread that is being shared with system (the cooperative victim)
+		// Constant size, unknown what it means
 		mem_size = SPU_LS_SIZE;
 	}
 	else if (type & SYS_SPU_THREAD_GROUP_TYPE_NON_CONTEXT)
@@ -995,7 +662,7 @@ error_code sys_spu_thread_group_create(ppu_thread& ppu, vm::ptr<u32> id, u32 num
 
 	if (use_memct && mem_size)
 	{
-		const auto sct = idm::get_unlocked<lv2_memory_container>(attr_data.ct);
+		const auto sct = idm::get<lv2_memory_container>(attr->ct);
 
 		if (!sct)
 		{
@@ -1021,49 +688,24 @@ error_code sys_spu_thread_group_create(ppu_thread& ppu, vm::ptr<u32> id, u32 num
 
 	auto& limits = g_fxo->get<spu_limits_t>();
 
-	std::unique_lock lock(limits.mutex);
+	std::lock_guard lock(limits.mutex);
 
-	limits_data group_limits{};
-
-	if (is_system_coop)
+	if (!limits.check(use_scheduler ? limits_data{.controllable = num} : limits_data{.physical = num}))
 	{
-		group_limits.controllable = 1;
-		group_limits.physical = num - 1;
-	}
-	else if (use_scheduler)
-	{
-		group_limits.controllable = num;
-	}
-	else
-	{
-		group_limits.physical = num;
-	}
-
-	if (!limits.check_valid(group_limits))
-	{
-		ct->free(mem_size);
-		return CELL_EINVAL;
-	}
-
-	if (!limits.check_busy(group_limits))
-	{
-		ct->free(mem_size);
+		ct->used -= mem_size;
 		return CELL_EBUSY;
 	}
 
-	const auto group = idm::make_ptr<lv2_spu_group>(std::string(attr_data.name.get_ptr(), std::max<u32>(attr_data.nsize, 1) - 1), num, prio, type, ct, use_scheduler, mem_size);
+	const auto group = idm::make_ptr<lv2_spu_group>(std::string(attr->name.get_ptr(), std::max<u32>(attr->nsize, 1) - 1), num, prio, type, ct, use_scheduler, mem_size);
 
 	if (!group)
 	{
-		ct->free(mem_size);
+		ct->used -= mem_size;
 		return CELL_EAGAIN;
 	}
 
-	lock.unlock();
-	sys_spu.warning("sys_spu_thread_group_create(): Thread group \"%s\" created (id=0x%x)", group->name, idm::last_id());
-
-	ppu.check_state();
 	*id = idm::last_id();
+	sys_spu.warning(u8"sys_spu_thread_group_create(): Thread group “%s” created (id=0x%x)", group->name, idm::last_id());
 	return CELL_OK;
 }
 
@@ -1093,7 +735,7 @@ error_code sys_spu_thread_group_destroy(ppu_thread& ppu, u32 id)
 			return CELL_EBUSY;
 		}
 
-		group.ct->free(group.mem_size);
+		group.ct->used -= group.mem_size;
 		return {};
 	});
 
@@ -1130,27 +772,13 @@ error_code sys_spu_thread_group_start(ppu_thread& ppu, u32 id)
 
 	sys_spu.trace("sys_spu_thread_group_start(id=0x%x)", id);
 
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
+	const auto group = idm::get<lv2_spu_group>(id);
 
 	if (!group)
 	{
 		return CELL_ESRCH;
 	}
 
-	struct notify_on_exit
-	{
-		usz index = umax;
-		std::array<spu_thread*, 8> threads; // Raw pointer suffices, as long as group is referenced its SPUs exist
-
-		~notify_on_exit() noexcept
-		{
-			for (; index != umax; index--)
-			{
-				threads[index]->state.notify_one();
-			}
-		}
-	} notify_threads;
-
 	std::lock_guard lock(group->mutex);
 
 	// SPU_THREAD_GROUP_STATUS_READY state is not used
@@ -1161,7 +789,7 @@ error_code sys_spu_thread_group_start(ppu_thread& ppu, u32 id)
 	default: return CELL_ESTAT;
 	}
 
-	const u32 max_threads = group->max_num;
+	const u32 max_threads = group->max_run;
 
 	group->join_state = 0;
 	group->exit_status = 0;
@@ -1175,7 +803,7 @@ error_code sys_spu_thread_group_start(ppu_thread& ppu, u32 id)
 			auto& args = group->args[thread->lv2_id >> 24];
 			auto& img = group->imgs[thread->lv2_id >> 24];
 
-			sys_spu_image::deploy(thread->ls, std::span(img.second.data(), img.second.size()), group->stop_count < 5);
+			sys_spu_image::deploy(thread->ls, std::span(img.second.data(), img.second.size()));
 
 			thread->cpu_init();
 			thread->gpr[3] = v128::from64(0, args[0]);
@@ -1203,7 +831,7 @@ error_code sys_spu_thread_group_start(ppu_thread& ppu, u32 id)
 		if (thread && ran_threads--)
 		{
 			thread->state -= cpu_flag::stop;
-			notify_threads.threads[++notify_threads.index] = thread.get();
+			thread->state.notify_one(cpu_flag::stop);
 		}
 	}
 
@@ -1216,7 +844,7 @@ error_code sys_spu_thread_group_suspend(ppu_thread& ppu, u32 id)
 
 	sys_spu.trace("sys_spu_thread_group_suspend(id=0x%x)", id);
 
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
+	const auto group = idm::get<lv2_spu_group>(id);
 
 	if (!group)
 	{
@@ -1228,11 +856,6 @@ error_code sys_spu_thread_group_suspend(ppu_thread& ppu, u32 id)
 		return CELL_EINVAL;
 	}
 
-	if (group->type & SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM)
-	{
-		return CELL_EINVAL;
-	}
-
 	std::lock_guard lock(group->mutex);
 
 	CellError error;
@@ -1304,7 +927,7 @@ error_code sys_spu_thread_group_resume(ppu_thread& ppu, u32 id)
 
 	sys_spu.trace("sys_spu_thread_group_resume(id=0x%x)", id);
 
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
+	const auto group = idm::get<lv2_spu_group>(id);
 
 	if (!group)
 	{
@@ -1316,25 +939,6 @@ error_code sys_spu_thread_group_resume(ppu_thread& ppu, u32 id)
 		return CELL_EINVAL;
 	}
 
-	if (group->type & SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM)
-	{
-		return CELL_EINVAL;
-	}
-
-	struct notify_on_exit
-	{
-		usz index = umax;
-		std::array<spu_thread*, 8> threads; // Raw pointer suffices, as long as group is referenced its SPUs exist
-
-		~notify_on_exit() noexcept
-		{
-			for (; index != umax; index--)
-			{
-				threads[index]->state.notify_one();
-			}
-		}
-	} notify_threads;
-
 	std::lock_guard lock(group->mutex);
 
 	CellError error;
@@ -1384,7 +988,7 @@ error_code sys_spu_thread_group_resume(ppu_thread& ppu, u32 id)
 		if (thread)
 		{
 			thread->state -= cpu_flag::suspend;
-			notify_threads.threads[++notify_threads.index] = thread.get();
+			thread->state.notify_one(cpu_flag::suspend);
 		}
 	}
 
@@ -1397,7 +1001,7 @@ error_code sys_spu_thread_group_yield(ppu_thread& ppu, u32 id)
 
 	sys_spu.trace("sys_spu_thread_group_yield(id=0x%x)", id);
 
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
+	const auto group = idm::get<lv2_spu_group>(id);
 
 	if (!group)
 	{
@@ -1431,7 +1035,7 @@ error_code sys_spu_thread_group_terminate(ppu_thread& ppu, u32 id, s32 value)
 
 	sys_spu.trace("sys_spu_thread_group_terminate(id=0x%x, value=0x%x)", id, value);
 
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
+	const auto group = idm::get<lv2_spu_group>(id);
 
 	if (!group)
 	{
@@ -1446,7 +1050,6 @@ error_code sys_spu_thread_group_terminate(ppu_thread& ppu, u32 id, s32 value)
 		lv2_obj::sleep(ppu);
 		busy_wait(3000);
 		ppu.check_state();
-		ppu.state += cpu_flag::wait;
 	};
 
 	if (auto state = +group->run_state;
@@ -1466,8 +1069,7 @@ error_code sys_spu_thread_group_terminate(ppu_thread& ppu, u32 id, s32 value)
 	if (group->set_terminate)
 	{
 		// Wait for termination, only then return error code
-		const u32 last_stop = group->stop_count;
-		group->wait_term_count++;
+		const u64 last_stop = group->stop_count;
 		lock.unlock();
 		short_sleep(ppu);
 
@@ -1476,7 +1078,6 @@ error_code sys_spu_thread_group_terminate(ppu_thread& ppu, u32 id, s32 value)
 			group->stop_count.wait(last_stop);
 		}
 
-		group->wait_term_count--;
 		return CELL_ESTAT;
 	}
 
@@ -1500,38 +1101,19 @@ error_code sys_spu_thread_group_terminate(ppu_thread& ppu, u32 id, s32 value)
 		}
 	}
 
-	u32 prev_resv = 0;
-
 	for (auto& thread : group->threads)
 	{
 		while (thread && group->running && thread->state & cpu_flag::wait)
 		{
 			thread_ctrl::notify(*thread);
-
-			if (u32 resv = atomic_storage<u32>::load(thread->raddr))
-			{
-				if (prev_resv && prev_resv != resv)
-				{
-					// Batch reservation notifications if possible
-					vm::reservation_notifier_notify(prev_resv);
-				}
-
-				prev_resv = resv;
-			}
 		}
 	}
 
-	if (prev_resv)
-	{
-		vm::reservation_notifier_notify(prev_resv);
-	}
-
 	group->exit_status = value;
 	group->join_state = SYS_SPU_THREAD_GROUP_JOIN_TERMINATED;
 
 	// Wait until the threads are actually stopped
-	const u32 last_stop = group->stop_count;
-	group->wait_term_count++;
+	const u64 last_stop = group->stop_count;
 	lock.unlock();
 	short_sleep(ppu);
 
@@ -1540,7 +1122,6 @@ error_code sys_spu_thread_group_terminate(ppu_thread& ppu, u32 id, s32 value)
 		group->stop_count.wait(last_stop);
 	}
 
-	group->wait_term_count--;
 	return CELL_OK;
 }
 
@@ -1550,7 +1131,7 @@ error_code sys_spu_thread_group_join(ppu_thread& ppu, u32 id, vm::ptr<u32> cause
 
 	sys_spu.trace("sys_spu_thread_group_join(id=0x%x, cause=*0x%x, status=*0x%x)", id, cause, status);
 
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
+	const auto group = idm::get<lv2_spu_group>(id);
 
 	if (!group)
 	{
@@ -1559,8 +1140,6 @@ error_code sys_spu_thread_group_join(ppu_thread& ppu, u32 id, vm::ptr<u32> cause
 
 	do
 	{
-		lv2_obj::prepare_for_sleep(ppu);
-
 		std::unique_lock lock(group->mutex);
 
 		const auto state = +group->run_state;
@@ -1595,39 +1174,23 @@ error_code sys_spu_thread_group_join(ppu_thread& ppu, u32 id, vm::ptr<u32> cause
 			group->waiter = &ppu;
 		}
 
-		{
-			lv2_obj::notify_all_t notify;
-			lv2_obj::sleep(ppu);
-			lock.unlock();
-		}
+		lv2_obj::sleep(ppu);
+		lock.unlock();
 
-		while (auto state = +ppu.state)
+		while (true)
 		{
-			if (state & cpu_flag::signal && ppu.state.test_and_reset(cpu_flag::signal))
+			const auto state = ppu.state.fetch_sub(cpu_flag::signal);
+
+			if (is_stopped(state) || state & cpu_flag::signal)
 			{
 				break;
 			}
 
-			if (is_stopped(state))
-			{
-				std::lock_guard lock(group->mutex);
-
-				if (group->waiter != &ppu)
-				{
-					break;
-				}
-
-				ppu.state += cpu_flag::again;
-				break;
-			}
-
-			ppu.state.wait(state);
+			thread_ctrl::wait_on(ppu.state, state);
 		}
 	}
 	while (false);
 
-	ppu.check_state();
-
 	if (!cause)
 	{
 		if (status)
@@ -1656,7 +1219,7 @@ error_code sys_spu_thread_group_set_priority(ppu_thread& ppu, u32 id, s32 priori
 
 	sys_spu.trace("sys_spu_thread_group_set_priority(id=0x%x, priority=%d)", id, priority);
 
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
+	const auto group = idm::get<lv2_spu_group>(id);
 
 	if (!group)
 	{
@@ -1668,15 +1231,7 @@ error_code sys_spu_thread_group_set_priority(ppu_thread& ppu, u32 id, s32 priori
 		return CELL_EINVAL;
 	}
 
-	if (group->type & SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM)
-	{
-		return CELL_EINVAL;
-	}
-
-	group->prio.atomic_op([&](std::common_type_t<decltype(lv2_spu_group::prio)>& prio)
-	{
-		prio.prio = priority;
-	});
+	group->prio = priority;
 
 	return CELL_OK;
 }
@@ -1687,27 +1242,20 @@ error_code sys_spu_thread_group_get_priority(ppu_thread& ppu, u32 id, vm::ptr<s3
 
 	sys_spu.trace("sys_spu_thread_group_get_priority(id=0x%x, priority=*0x%x)", id, priority);
 
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
+	const auto group = idm::get<lv2_spu_group>(id);
 
 	if (!group)
 	{
 		return CELL_ESRCH;
 	}
 
-	ppu.check_state();
-
 	if (!group->has_scheduler_context)
 	{
 		*priority = 0;
 	}
-	else if (group->type & SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM)
-	{
-		// Regardless of the value being set in group creation
-		*priority = 15;
-	}
 	else
 	{
-		*priority = group->prio.load().prio;
+		*priority = group->prio;
 	}
 
 	return CELL_OK;
@@ -1719,7 +1267,7 @@ error_code sys_spu_thread_group_set_cooperative_victims(ppu_thread& ppu, u32 id,
 
 	sys_spu.warning("sys_spu_thread_group_set_cooperative_victims(id=0x%x, threads_mask=0x%x)", id, threads_mask);
 
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
+	const auto group = idm::get<lv2_spu_group>(id);
 
 	if (!group)
 	{
@@ -1747,7 +1295,7 @@ error_code sys_spu_thread_group_syscall_253(ppu_thread& ppu, u32 id, vm::ptr<sys
 
 	sys_spu.warning("sys_spu_thread_group_syscall_253(id=0x%x, info=*0x%x)", id, info);
 
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
+	const auto group = idm::get<lv2_spu_group>(id);
 
 	if (!group)
 	{
@@ -1761,7 +1309,6 @@ error_code sys_spu_thread_group_syscall_253(ppu_thread& ppu, u32 id, vm::ptr<sys
 
 	// TODO
 
-	ppu.check_state();
 	info->deadlineMissCounter = 0;
 	info->deadlineMeetCounter = 0;
 	info->timestamp = get_timebased_time();
@@ -1829,7 +1376,7 @@ error_code sys_spu_thread_read_ls(ppu_thread& ppu, u32 id, u32 lsa, vm::ptr<u64>
 		return CELL_ESRCH;
 	}
 
-	std::unique_lock lock(group->mutex);
+	std::lock_guard lock(group->mutex);
 
 	if (auto state = +group->run_state;
 		state < SPU_THREAD_GROUP_STATUS_WAITING || state > SPU_THREAD_GROUP_STATUS_RUNNING)
@@ -1842,21 +1389,15 @@ error_code sys_spu_thread_read_ls(ppu_thread& ppu, u32 id, u32 lsa, vm::ptr<u64>
 		return CELL_ESTAT;
 	}
 
-	u64 _value{};
-
 	switch (type)
 	{
-	case 1: _value = thread->_ref<u8>(lsa); break;
-	case 2: _value = thread->_ref<u16>(lsa); break;
-	case 4: _value = thread->_ref<u32>(lsa); break;
-	case 8: _value = thread->_ref<u64>(lsa); break;
+	case 1: *value = thread->_ref<u8>(lsa); break;
+	case 2: *value = thread->_ref<u16>(lsa); break;
+	case 4: *value = thread->_ref<u32>(lsa); break;
+	case 8: *value = thread->_ref<u64>(lsa); break;
 	default: fmt::throw_exception("Unreachable");
 	}
 
-	lock.unlock();
-	ppu.check_state();
-
-	*value = _value;
 	return CELL_OK;
 }
 
@@ -1864,7 +1405,7 @@ error_code sys_spu_thread_write_spu_mb(ppu_thread& ppu, u32 id, u32 value)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_spu.trace("sys_spu_thread_write_spu_mb(id=0x%x, value=0x%x)", id, value);
+	sys_spu.warning("sys_spu_thread_write_spu_mb(id=0x%x, value=0x%x)", id, value);
 
 	const auto [thread, group] = lv2_spu_group::get_thread(id);
 
@@ -1873,23 +1414,9 @@ error_code sys_spu_thread_write_spu_mb(ppu_thread& ppu, u32 id, u32 value)
 		return CELL_ESRCH;
 	}
 
-	spu_channel_op_state state{};
-	{
-		std::lock_guard lock(group->mutex);
+	std::lock_guard lock(group->mutex);
 
-		state = thread->ch_in_mbox.push(value, true);
-	}
-
-	if (!state.op_done)
-	{
-		ppu.state += cpu_flag::again;
-		return {};
-	}
-
-	if (state.notify)
-	{
-		thread->ch_in_mbox.notify();
-	}
+	thread->ch_in_mbox.push(*thread, value);
 
 	return CELL_OK;
 }
@@ -1930,7 +1457,6 @@ error_code sys_spu_thread_get_spu_cfg(ppu_thread& ppu, u32 id, vm::ptr<u64> valu
 		return CELL_ESRCH;
 	}
 
-	ppu.check_state();
 	*value = thread->snr_config;
 
 	return CELL_OK;
@@ -1942,11 +1468,6 @@ error_code sys_spu_thread_write_snr(ppu_thread& ppu, u32 id, u32 number, u32 val
 
 	sys_spu.trace("sys_spu_thread_write_snr(id=0x%x, number=%d, value=0x%x)", id, number, value);
 
-	if (number > 1)
-	{
-		return CELL_EINVAL;
-	}
-
 	const auto [thread, group] = lv2_spu_group::get_thread(id);
 
 	if (!thread) [[unlikely]]
@@ -1954,6 +1475,11 @@ error_code sys_spu_thread_write_snr(ppu_thread& ppu, u32 id, u32 number, u32 val
 		return CELL_ESRCH;
 	}
 
+	if (number > 1)
+	{
+		return CELL_EINVAL;
+	}
+
 	thread->push_snr(number, value);
 
 	return CELL_OK;
@@ -1965,7 +1491,7 @@ error_code sys_spu_thread_group_connect_event(ppu_thread& ppu, u32 id, u32 eq, u
 
 	sys_spu.warning("sys_spu_thread_group_connect_event(id=0x%x, eq=0x%x, et=%d)", id, eq, et);
 
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
+	const auto group = idm::get<lv2_spu_group>(id);
 
 	if (!group)
 	{
@@ -1989,7 +1515,7 @@ error_code sys_spu_thread_group_connect_event(ppu_thread& ppu, u32 id, u32 eq, u
 		return CELL_EINVAL;
 	}
 
-	auto queue = idm::get_unlocked<lv2_obj, lv2_event_queue>(eq);
+	auto queue = idm::get<lv2_obj, lv2_event_queue>(eq);
 
 	std::lock_guard lock(group->mutex);
 
@@ -2014,7 +1540,7 @@ error_code sys_spu_thread_group_disconnect_event(ppu_thread& ppu, u32 id, u32 et
 
 	sys_spu.warning("sys_spu_thread_group_disconnect_event(id=0x%x, et=%d)", id, et);
 
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
+	const auto group = idm::get<lv2_spu_group>(id);
 
 	if (!group)
 	{
@@ -2030,26 +1556,28 @@ error_code sys_spu_thread_group_disconnect_event(ppu_thread& ppu, u32 id, u32 et
 	if (!ep)
 	{
 		sys_spu.error("sys_spu_thread_group_disconnect_event(): unknown event type (%d)", et);
-		return CELL_OK;
+		return CELL_EINVAL;
 	}
 
-	// No error checking is performed
-
 	std::lock_guard lock(group->mutex);
 
-	ep->reset();
+	if (!lv2_obj::check(*ep))
+	{
+		return CELL_EINVAL;
+	}
 
+	ep->reset();
 	return CELL_OK;
 }
 
-error_code sys_spu_thread_connect_event(ppu_thread& ppu, u32 id, u32 eq, u32 et, u32 spup)
+error_code sys_spu_thread_connect_event(ppu_thread& ppu, u32 id, u32 eq, u32 et, u8 spup)
 {
 	ppu.state += cpu_flag::wait;
 
 	sys_spu.warning("sys_spu_thread_connect_event(id=0x%x, eq=0x%x, et=%d, spup=%d)", id, eq, et, spup);
 
 	const auto [thread, group] = lv2_spu_group::get_thread(id);
-	auto queue = idm::get_unlocked<lv2_obj, lv2_event_queue>(eq);
+	auto queue = idm::get<lv2_obj, lv2_event_queue>(eq);
 
 	if (!queue || !thread) [[unlikely]]
 	{
@@ -2076,7 +1604,7 @@ error_code sys_spu_thread_connect_event(ppu_thread& ppu, u32 id, u32 eq, u32 et,
 	return CELL_OK;
 }
 
-error_code sys_spu_thread_disconnect_event(ppu_thread& ppu, u32 id, u32 et, u32 spup)
+error_code sys_spu_thread_disconnect_event(ppu_thread& ppu, u32 id, u32 et, u8 spup)
 {
 	ppu.state += cpu_flag::wait;
 
@@ -2116,7 +1644,7 @@ error_code sys_spu_thread_bind_queue(ppu_thread& ppu, u32 id, u32 spuq, u32 spuq
 	sys_spu.warning("sys_spu_thread_bind_queue(id=0x%x, spuq=0x%x, spuq_num=0x%x)", id, spuq, spuq_num);
 
 	const auto [thread, group] = lv2_spu_group::get_thread(id);
-	auto queue = idm::get_unlocked<lv2_obj, lv2_event_queue>(spuq);;
+	auto queue = idm::get<lv2_obj, lv2_event_queue>(spuq);
 
 	if (!queue || !thread) [[unlikely]]
 	{
@@ -2201,20 +1729,20 @@ error_code sys_spu_thread_group_connect_event_all_threads(ppu_thread& ppu, u32 i
 
 	sys_spu.warning("sys_spu_thread_group_connect_event_all_threads(id=0x%x, eq=0x%x, req=0x%llx, spup=*0x%x)", id, eq, req, spup);
 
-	if (!req)
-	{
-		return CELL_EINVAL;
-	}
-
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
-	const auto queue = idm::get_unlocked<lv2_obj, lv2_event_queue>(eq);
+	const auto group = idm::get<lv2_spu_group>(id);
+	const auto queue = idm::get<lv2_obj, lv2_event_queue>(eq);
 
 	if (!group || !queue)
 	{
 		return CELL_ESRCH;
 	}
 
-	std::unique_lock lock(group->mutex);
+	if (!req)
+	{
+		return CELL_EINVAL;
+	}
+
+	std::lock_guard lock(group->mutex);
 
 	if (auto state = +group->run_state;
 		state < SPU_THREAD_GROUP_STATUS_INITIALIZED || state == SPU_THREAD_GROUP_STATUS_DESTROYED)
@@ -2269,32 +1797,29 @@ error_code sys_spu_thread_group_connect_event_all_threads(ppu_thread& ppu, u32 i
 		}
 	}
 
-	lock.unlock();
-	ppu.check_state();
-
 	*spup = port;
 
 	return CELL_OK;
 }
 
-error_code sys_spu_thread_group_disconnect_event_all_threads(ppu_thread& ppu, u32 id, u32 spup)
+error_code sys_spu_thread_group_disconnect_event_all_threads(ppu_thread& ppu, u32 id, u8 spup)
 {
 	ppu.state += cpu_flag::wait;
 
 	sys_spu.warning("sys_spu_thread_group_disconnect_event_all_threads(id=0x%x, spup=%d)", id, spup);
 
-	if (spup > 63)
-	{
-		return CELL_EINVAL;
-	}
-
-	const auto group = idm::get_unlocked<lv2_spu_group>(id);
+	const auto group = idm::get<lv2_spu_group>(id);
 
 	if (!group)
 	{
 		return CELL_ESRCH;
 	}
 
+	if (spup > 63)
+	{
+		return CELL_EINVAL;
+	}
+
 	std::lock_guard lock(group->mutex);
 
 	for (auto& t : group->threads)
@@ -2330,7 +1855,6 @@ error_code sys_spu_thread_group_log(ppu_thread& ppu, s32 command, vm::ptr<s32> s
 			return CELL_EFAULT;
 		}
 
-		ppu.check_state();
 		*stat = state.state;
 		break;
 	}
@@ -2368,7 +1892,7 @@ error_code sys_raw_spu_recover_page_fault(ppu_thread& ppu, u32 id)
 
 	sys_spu.warning("sys_raw_spu_recover_page_fault(id=0x%x)", id);
 
-	const auto thread = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
+	const auto thread = idm::get<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
 
 	if (!thread) [[unlikely]]
 	{
@@ -2388,7 +1912,7 @@ error_code sys_raw_spu_create(ppu_thread& ppu, vm::ptr<u32> id, vm::ptr<void> at
 
 	std::lock_guard lock(limits.mutex);
 
-	if (!limits.check_busy(limits_data{.raw_spu = 1}))
+	if (!limits.check(limits_data{.raw_spu = 1}))
 	{
 		return CELL_EAGAIN;
 	}
@@ -2407,13 +1931,10 @@ error_code sys_raw_spu_create(ppu_thread& ppu, vm::ptr<u32> id, vm::ptr<void> at
 			index = 0;
 	}
 
-	const auto spu = idm::make_ptr<named_thread<spu_thread>>(nullptr, index, "", index);
-	ensure(vm::get(vm::spu)->falloc(spu->vm_offset(), SPU_LS_SIZE, &spu->shm, vm::page_size_64k));
-	spu->map_ls(*spu->shm, spu->ls);
+	const u32 tid = idm::make<named_thread<spu_thread>>(nullptr, index, "", index);
 
-	spu_thread::g_raw_spu_id[index] = idm::last_id();
+	spu_thread::g_raw_spu_id[index] = (ensure(tid));
 
-	ppu.check_state();
 	*id = index;
 
 	return CELL_OK;
@@ -2444,7 +1965,7 @@ error_code sys_isolated_spu_create(ppu_thread& ppu, vm::ptr<u32> id, vm::ptr<voi
 
 	std::lock_guard lock(limits.mutex);
 
-	if (!limits.check_busy(limits_data{.raw_spu = 1}))
+	if (!limits.check(limits_data{.raw_spu = 1}))
 	{
 		return CELL_EAGAIN;
 	}
@@ -2477,7 +1998,7 @@ error_code sys_isolated_spu_create(ppu_thread& ppu, vm::ptr<u32> id, vm::ptr<voi
 	sys_spu_image img;
 	img.load(obj);
 
-	auto image_info = idm::get_unlocked<lv2_obj, lv2_spu_image>(img.entry_point);
+	auto image_info = idm::get<lv2_obj, lv2_spu_image>(img.entry_point);
 	img.deploy(thread->ls, std::span(image_info->segs.get_ptr(), image_info->nsegs));
 
 	thread->write_reg(ls_addr + RAW_SPU_PROB_OFFSET + SPU_NPC_offs, image_info->e_entry);
@@ -2500,6 +2021,7 @@ error_code raw_spu_destroy(ppu_thread& ppu, u32 id)
 		}
 
 		// Stop thread
+		thread.state += cpu_flag::exit;
 		thread = thread_state::aborting;
 		return true;
 	});
@@ -2512,7 +2034,7 @@ error_code raw_spu_destroy(ppu_thread& ppu, u32 id)
 	// TODO: CELL_EBUSY is not returned
 
 	// Kernel objects which must be removed
-	std::vector<std::pair<shared_ptr<lv2_obj>, u32>> to_remove;
+	std::vector<std::pair<std::shared_ptr<lv2_obj>, u32>> to_remove;
 
 	// Clear interrupt handlers
 	for (auto& intr : thread->int_ctrl)
@@ -2594,7 +2116,7 @@ error_code raw_spu_create_interrupt_tag(u32 id, u32 class_id, u32 /*hwthread*/,
 
 	const auto tag = idm::import<lv2_obj, lv2_int_tag>([&]()
 	{
-		shared_ptr<lv2_int_tag> result;
+		std::shared_ptr<lv2_int_tag> result;
 
 		auto thread = idm::check_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
 
@@ -2612,14 +2134,13 @@ error_code raw_spu_create_interrupt_tag(u32 id, u32 class_id, u32 /*hwthread*/,
 			return result;
 		}
 
-		result = make_single<lv2_int_tag>();
+		result = std::make_shared<lv2_int_tag>();
 		int_ctrl.tag = result;
 		return result;
 	});
 
 	if (tag)
 	{
-		cpu_thread::get_current()->check_state();
 		*intrtag = tag;
 		return CELL_OK;
 	}
@@ -2653,7 +2174,7 @@ error_code raw_spu_set_int_mask(u32 id, u32 class_id, u64 mask)
 		return CELL_EINVAL;
 	}
 
-	const auto thread = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
+	const auto thread = idm::get<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
 
 	if (!thread || thread->get_type() != (isolated ? spu_type::isolated : spu_type::raw)) [[unlikely]]
 	{
@@ -2692,7 +2213,7 @@ error_code raw_spu_set_int_stat(u32 id, u32 class_id, u64 stat)
 		return CELL_EINVAL;
 	}
 
-	const auto thread = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
+	const auto thread = idm::get<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
 
 	if (!thread || thread->get_type() != (isolated ? spu_type::isolated : spu_type::raw)) [[unlikely]]
 	{
@@ -2730,14 +2251,13 @@ error_code raw_spu_get_int_control(u32 id, u32 class_id, vm::ptr<u64> value, ato
 		return CELL_EINVAL;
 	}
 
-	const auto thread = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
+	const auto thread = idm::get<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
 
 	if (!thread || thread->get_type() != (isolated ? spu_type::isolated : spu_type::raw)) [[unlikely]]
 	{
 		return CELL_ESRCH;
 	}
 
-	cpu_thread::get_current()->check_state();
 	*value = thread->int_ctrl[class_id].*control;
 
 	return CELL_OK;
@@ -2782,14 +2302,13 @@ error_code sys_isolated_spu_get_int_stat(ppu_thread& ppu, u32 id, u32 class_id,
 template <bool isolated = false>
 error_code raw_spu_read_puint_mb(u32 id, vm::ptr<u32> value)
 {
-	const auto thread = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
+	const auto thread = idm::get<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
 
 	if (!thread || thread->get_type() != (isolated ? spu_type::isolated : spu_type::raw)) [[unlikely]]
 	{
 		return CELL_ESRCH;
 	}
 
-	cpu_thread::get_current()->check_state();
 	*value = thread->ch_out_intr_mbox.pop();
 
 	return CELL_OK;
@@ -2821,7 +2340,7 @@ error_code raw_spu_set_spu_cfg(u32 id, u32 value)
 		fmt::throw_exception("Unexpected value (0x%x)", value);
 	}
 
-	const auto thread = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
+	const auto thread = idm::get<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
 
 	if (!thread || thread->get_type() != (isolated ? spu_type::isolated : spu_type::raw)) [[unlikely]]
 	{
@@ -2854,14 +2373,13 @@ error_code sys_isolated_spu_set_spu_cfg(ppu_thread& ppu, u32 id, u32 value)
 template <bool isolated = false>
 error_code raw_spu_get_spu_cfg(u32 id, vm::ptr<u32> value)
 {
-	const auto thread = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
+	const auto thread = idm::get<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
 
 	if (!thread || thread->get_type() != (isolated ? spu_type::isolated : spu_type::raw)) [[unlikely]]
 	{
 		return CELL_ESRCH;
 	}
 
-	cpu_thread::get_current()->check_state();
 	*value = static_cast<u32>(thread->snr_config);
 
 	return CELL_OK;
@@ -2891,7 +2409,7 @@ error_code sys_isolated_spu_start(ppu_thread& ppu, u32 id)
 
 	sys_spu.todo("sys_isolated_spu_start(id=%d)", id);
 
-	const auto thread = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
+	const auto thread = idm::get<named_thread<spu_thread>>(spu_thread::find_raw_spu(id));
 
 	if (!thread) [[unlikely]]
 	{
diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.h b/rpcs3/Emu/Cell/lv2/sys_spu.h
index 06e21e067b..a56db12d6c 100644
--- a/rpcs3/Emu/Cell/lv2/sys_spu.h
+++ b/rpcs3/Emu/Cell/lv2/sys_spu.h
@@ -72,7 +72,7 @@ enum : s32
 	SYS_SPU_SEGMENT_TYPE_INFO = 4,
 };
 
-enum spu_stop_syscall : u32
+enum : u32
 {
 	SYS_SPU_THREAD_STOP_YIELD                = 0x0100,
 	SYS_SPU_THREAD_STOP_GROUP_EXIT           = 0x0101,
@@ -114,8 +114,6 @@ struct sys_spu_thread_argument
 
 struct sys_spu_segment
 {
-	ENABLE_BITWISE_SERIALIZATION;
-
 	be_t<s32> type; // copy, fill, info
 	be_t<u32> ls; // local storage address
 	be_t<u32> size;
@@ -225,9 +223,9 @@ struct sys_spu_image
 		return num_segs;
 	}
 
-	bool load(const fs::file& stream);
+	void load(const fs::file& stream);
 	void free() const;
-	static void deploy(u8* loc, std::span<const sys_spu_segment> segs, bool is_verbose = true);
+	static void deploy(u8* loc, std::span<const sys_spu_segment> segs);
 };
 
 enum : u32
@@ -250,9 +248,6 @@ struct lv2_spu_image : lv2_obj
 		, nsegs(nsegs)
 	{
 	}
-
-	lv2_spu_image(utils::serial& ar);
-	void save(utils::serial& ar);
 };
 
 struct sys_spu_thread_group_syscall_253_info
@@ -284,28 +279,25 @@ struct lv2_spu_group
 	shared_mutex mutex;
 
 	atomic_t<u32> init; // Initialization Counter
-	atomic_t<typename spu_thread::spu_prio_t> prio{}; // SPU Thread Group Priority
+	atomic_t<s32> prio; // SPU Thread Group Priority
 	atomic_t<spu_group_status> run_state; // SPU Thread Group State
 	atomic_t<s32> exit_status; // SPU Thread Group Exit Status
 	atomic_t<u32> join_state; // flags used to detect exit cause and signal
-	atomic_t<u32> running = 0; // Number of running threads
-	atomic_t<u32> spurs_running = 0;
-	atomic_t<u32> stop_count = 0;
-	atomic_t<u32> wait_term_count = 0; 
-	u32 waiter_spu_index = -1; // Index of SPU executing a waiting syscall
+	atomic_t<u32> running; // Number of running threads
+	atomic_t<u64> stop_count;
 	class ppu_thread* waiter = nullptr;
 	bool set_terminate = false;
 
-	std::array<shared_ptr<named_thread<spu_thread>>, 8> threads; // SPU Threads
+	std::array<std::shared_ptr<named_thread<spu_thread>>, 8> threads; // SPU Threads
 	std::array<s8, 256> threads_map; // SPU Threads map based number
 	std::array<std::pair<u32, std::vector<sys_spu_segment>>, 8> imgs; // Entry points, SPU image segments
 	std::array<std::array<u64, 4>, 8> args; // SPU Thread Arguments
 
-	shared_ptr<lv2_event_queue> ep_run; // port for SYS_SPU_THREAD_GROUP_EVENT_RUN events
-	shared_ptr<lv2_event_queue> ep_exception; // TODO: SYS_SPU_THREAD_GROUP_EVENT_EXCEPTION
-	shared_ptr<lv2_event_queue> ep_sysmodule; // TODO: SYS_SPU_THREAD_GROUP_EVENT_SYSTEM_MODULE
+	std::shared_ptr<lv2_event_queue> ep_run; // port for SYS_SPU_THREAD_GROUP_EVENT_RUN events
+	std::shared_ptr<lv2_event_queue> ep_exception; // TODO: SYS_SPU_THREAD_GROUP_EVENT_EXCEPTION
+	std::shared_ptr<lv2_event_queue> ep_sysmodule; // TODO: SYS_SPU_THREAD_GROUP_EVENT_SYSTEM_MODULE
 
-	lv2_spu_group(std::string name, u32 num, s32 _prio, s32 type, lv2_memory_container* ct, bool uses_scheduler, u32 mem_size) noexcept
+	lv2_spu_group(std::string name, u32 num, s32 prio, s32 type, lv2_memory_container* ct, bool uses_scheduler, u32 mem_size)
 		: name(std::move(name))
 		, id(idm::last_id())
 		, max_num(num)
@@ -315,20 +307,17 @@ struct lv2_spu_group
 		, has_scheduler_context(uses_scheduler)
 		, max_run(num)
 		, init(0)
+		, prio(prio)
 		, run_state(SPU_THREAD_GROUP_STATUS_NOT_INITIALIZED)
 		, exit_status(0)
 		, join_state(0)
-		, args({})
+		, running(0)
+		, stop_count(0)
+		// TODO: args()
 	{
 		threads_map.fill(-1);
-		prio.raw().prio = _prio;
 	}
 
-	SAVESTATE_INIT_POS(8); // Dependency on SPUs
-
-	lv2_spu_group(utils::serial& ar) noexcept;
-	void save(utils::serial& ar);
-
 	CellError send_run_event(u64 data1, u64 data2, u64 data3) const
 	{
 		return ep_run ? ep_run->send(SYS_SPU_THREAD_GROUP_EVENT_RUN_KEY, data1, data2, data3) : CELL_ENOTCONN;
@@ -344,7 +333,7 @@ struct lv2_spu_group
 		return ep_sysmodule ? ep_sysmodule->send(SYS_SPU_THREAD_GROUP_EVENT_SYSTEM_MODULE_KEY, data1, data2, data3) : CELL_ENOTCONN;
 	}
 
-	static std::pair<named_thread<spu_thread>*, shared_ptr<lv2_spu_group>> get_thread(u32 id);
+	static std::pair<named_thread<spu_thread>*, std::shared_ptr<lv2_spu_group>> get_thread(u32 id);
 };
 
 class ppu_thread;
@@ -354,7 +343,6 @@ class ppu_thread;
 error_code sys_spu_initialize(ppu_thread&, u32 max_usable_spu, u32 max_raw_spu);
 error_code _sys_spu_image_get_information(ppu_thread&, vm::ptr<sys_spu_image> img, vm::ptr<u32> entry_point, vm::ptr<s32> nsegs);
 error_code sys_spu_image_open(ppu_thread&, vm::ptr<sys_spu_image> img, vm::cptr<char> path);
-error_code sys_spu_image_open_by_fd(ppu_thread&, vm::ptr<sys_spu_image> img, s32 fd, s64 offset);
 error_code _sys_spu_image_import(ppu_thread&, vm::ptr<sys_spu_image> img, u32 src, u32 size, u32 arg4);
 error_code _sys_spu_image_close(ppu_thread&, vm::ptr<sys_spu_image> img);
 error_code _sys_spu_image_get_segments(ppu_thread&, vm::ptr<sys_spu_image> img, vm::ptr<sys_spu_segment> segments, s32 nseg);
@@ -373,7 +361,7 @@ error_code sys_spu_thread_group_get_priority(ppu_thread&, u32 id, vm::ptr<s32> p
 error_code sys_spu_thread_group_connect_event(ppu_thread&, u32 id, u32 eq, u32 et);
 error_code sys_spu_thread_group_disconnect_event(ppu_thread&, u32 id, u32 et);
 error_code sys_spu_thread_group_connect_event_all_threads(ppu_thread&, u32 id, u32 eq_id, u64 req, vm::ptr<u8> spup);
-error_code sys_spu_thread_group_disconnect_event_all_threads(ppu_thread&, u32 id, u32 spup);
+error_code sys_spu_thread_group_disconnect_event_all_threads(ppu_thread&, u32 id, u8 spup);
 error_code sys_spu_thread_group_set_cooperative_victims(ppu_thread&, u32 id, u32 threads_mask);
 error_code sys_spu_thread_group_syscall_253(ppu_thread& ppu, u32 id, vm::ptr<sys_spu_thread_group_syscall_253_info> info);
 error_code sys_spu_thread_group_log(ppu_thread&, s32 command, vm::ptr<s32> stat);
@@ -383,8 +371,8 @@ error_code sys_spu_thread_write_spu_mb(ppu_thread&, u32 id, u32 value);
 error_code sys_spu_thread_set_spu_cfg(ppu_thread&, u32 id, u64 value);
 error_code sys_spu_thread_get_spu_cfg(ppu_thread&, u32 id, vm::ptr<u64> value);
 error_code sys_spu_thread_write_snr(ppu_thread&, u32 id, u32 number, u32 value);
-error_code sys_spu_thread_connect_event(ppu_thread&, u32 id, u32 eq, u32 et, u32 spup);
-error_code sys_spu_thread_disconnect_event(ppu_thread&, u32 id, u32 et, u32 spup);
+error_code sys_spu_thread_connect_event(ppu_thread&, u32 id, u32 eq, u32 et, u8 spup);
+error_code sys_spu_thread_disconnect_event(ppu_thread&, u32 id, u32 et, u8 spup);
 error_code sys_spu_thread_bind_queue(ppu_thread&, u32 id, u32 spuq, u32 spuq_num);
 error_code sys_spu_thread_unbind_queue(ppu_thread&, u32 id, u32 spuq_num);
 error_code sys_spu_thread_get_exit_status(ppu_thread&, u32 id, vm::ptr<s32> status);
diff --git a/rpcs3/Emu/Cell/lv2/sys_ss.cpp b/rpcs3/Emu/Cell/lv2/sys_ss.cpp
index 0315c3f152..a073fca9f7 100644
--- a/rpcs3/Emu/Cell/lv2/sys_ss.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_ss.cpp
@@ -3,89 +3,14 @@
 
 #include "sys_process.h"
 #include "Emu/IdManager.h"
+#include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/timers.hpp"
-#include "Emu/system_config.h"
-#include "util/sysinfo.hpp"
-
-#include <charconv>
-#include <shared_mutex>
-#include <unordered_set>
 
 #ifdef _WIN32
 #include <Windows.h>
 #include <bcrypt.h>
 #endif
 
-struct lv2_update_manager
-{
-	lv2_update_manager()
-	{
-		std::string version_str = utils::get_firmware_version();
-
-		// For example, 4.90 should be converted to 0x4900000000000
-		std::erase(version_str, '.');
-		if (std::from_chars(version_str.data(), version_str.data() + version_str.size(), system_sw_version, 16).ec != std::errc{})
-			system_sw_version <<= 40;
-		else
-			system_sw_version = 0;
-	}
-
-	lv2_update_manager(const lv2_update_manager&) = delete;
-	lv2_update_manager& operator=(const lv2_update_manager&) = delete;
-	~lv2_update_manager() = default;
-
-	u64 system_sw_version;
-
-	std::unordered_map<u32, u8> eeprom_map // offset, value
-	{
-		// system language
-		// *i think* this gives english
-		{0x48C18, 0x00},
-		{0x48C19, 0x00},
-		{0x48C1A, 0x00},
-		{0x48C1B, 0x01},
-		// system language end
-
-		// vsh target (seems it can be 0xFFFFFFFE, 0xFFFFFFFF, 0x00000001 default: 0x00000000 / vsh sets it to 0x00000000 on boot if it isn't 0x00000000)
-		{0x48C1C, 0x00},
-		{0x48C1D, 0x00},
-		{0x48C1E, 0x00},
-		{0x48C1F, 0x00}
-		// vsh target end
-	};
-	mutable std::shared_mutex eeprom_mutex;
-
-	std::unordered_set<u32> malloc_set;
-	mutable std::shared_mutex malloc_mutex;
-
-	// return address
-	u32 allocate(u32 size)
-	{
-		std::unique_lock unique_lock(malloc_mutex);
-
-		if (const auto addr = vm::alloc(size, vm::main); addr)
-		{
-			malloc_set.emplace(addr);
-			return addr;
-		}
-
-		return 0;
-	}
-
-	// return size
-	u32 deallocate(u32 addr)
-	{
-		std::unique_lock unique_lock(malloc_mutex);
-
-		if (malloc_set.count(addr))
-		{
-			return vm::dealloc(addr, vm::main);
-		}
-
-		return 0;
-	}
-};
-
 template<>
 void fmt_class_string<sys_ss_rng_error>::format(std::string& out, u64 arg)
 {
@@ -97,7 +22,6 @@ void fmt_class_string<sys_ss_rng_error>::format(std::string& out, u64 arg)
 		STR_CASE(SYS_SS_RNG_ERROR_ENOMEM);
 		STR_CASE(SYS_SS_RNG_ERROR_EAGAIN);
 		STR_CASE(SYS_SS_RNG_ERROR_EFAULT);
-		STR_CASE(SYS_SS_RTC_ERROR_UNK);
 		}
 
 		return unknown;
@@ -155,10 +79,10 @@ error_code sys_ss_random_number_generator(u64 pkg_id, vm::ptr<void> buf, u64 siz
 
 error_code sys_ss_access_control_engine(u64 pkg_id, u64 a2, u64 a3)
 {
-	sys_ss.success("sys_ss_access_control_engine(pkg_id=0x%llx, a2=0x%llx, a3=0x%llx)", pkg_id, a2, a3);
+	sys_ss.todo("sys_ss_access_control_engine(pkg_id=0x%llx, a2=0x%llx, a3=0x%llx)", pkg_id, a2, a3);
 
 	const u64 authid = g_ps3_process_info.self_info.valid ?
-		g_ps3_process_info.self_info.prog_id_hdr.program_authority_id : 0;
+		g_ps3_process_info.self_info.app_info.authid : 0;
 
 	switch (pkg_id)
 	{
@@ -166,7 +90,7 @@ error_code sys_ss_access_control_engine(u64 pkg_id, u64 a2, u64 a3)
 	{
 		if (!g_ps3_process_info.debug_or_root())
 		{
-			return not_an_error(CELL_ENOSYS);
+			return CELL_ENOSYS;
 		}
 
 		if (!a2)
@@ -199,54 +123,46 @@ error_code sys_ss_access_control_engine(u64 pkg_id, u64 a2, u64 a3)
 	return CELL_OK;
 }
 
-error_code sys_ss_get_console_id(vm::ptr<u8> buf)
+s32 sys_ss_get_console_id(vm::ptr<u8> buf)
 {
-	sys_ss.notice("sys_ss_get_console_id(buf=*0x%x)", buf);
+	sys_ss.todo("sys_ss_get_console_id(buf=*0x%x)", buf);
 
-	return sys_ss_appliance_info_manager(0x19003, buf);
+	// TODO: Return some actual IDPS?
+	*buf = 0;
+
+	return CELL_OK;
 }
 
-error_code sys_ss_get_open_psid(vm::ptr<CellSsOpenPSID> psid)
+s32 sys_ss_get_open_psid(vm::ptr<CellSsOpenPSID> psid)
 {
-	sys_ss.notice("sys_ss_get_open_psid(psid=*0x%x)", psid);
+	sys_ss.warning("sys_ss_get_open_psid(psid=*0x%x)", psid);
 
-	psid->high = g_cfg.sys.console_psid_high;
-	psid->low = g_cfg.sys.console_psid_low;
+	psid->high = 0;
+	psid->low = 0;
 
 	return CELL_OK;
 }
 
 error_code sys_ss_appliance_info_manager(u32 code, vm::ptr<u8> buffer)
 {
-	sys_ss.notice("sys_ss_appliance_info_manager(code=0x%x, buffer=*0x%x)", code, buffer);
-
-	if (!g_ps3_process_info.has_root_perm())
-		return CELL_ENOSYS;
+	sys_ss.warning("sys_ss_appliance_info_manager(code=0x%x, buffer=*0x%x)", code, buffer);
 
 	if (!buffer)
+	{
 		return CELL_EFAULT;
+	}
 
 	switch (code)
 	{
 	case 0x19002:
 	{
 		// AIM_get_device_type
-		constexpr u8 product_code[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89 };
-		std::memcpy(buffer.get_ptr(), product_code, 16);
-		if (g_cfg.core.debug_console_mode)
-			buffer[15] = 0x81; // DECR
-		break;
 	}
 	case 0x19003:
 	{
 		// AIM_get_device_id
 		constexpr u8 idps[] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x00, 0x0B, 0x14, 0x00, 0xEF, 0xDD, 0xCA, 0x25, 0x52, 0x66 };
 		std::memcpy(buffer.get_ptr(), idps, 16);
-		if (g_cfg.core.debug_console_mode)
-		{
-			buffer[5] = 0x81; // DECR
-			buffer[7] = 0x09; // DECR-1400
-		}
 		break;
 	}
 	case 0x19004:
@@ -259,14 +175,10 @@ error_code sys_ss_appliance_info_manager(u32 code, vm::ptr<u8> buffer)
 	case 0x19005:
 	{
 		// AIM_get_open_ps_id
-		be_t<u64> psid[2] = { +g_cfg.sys.console_psid_high, +g_cfg.sys.console_psid_low };
-		std::memcpy(buffer.get_ptr(), psid, 16);
-		break;
 	}
 	case 0x19006:
 	{
 		// qa values (dex only) ??
-		[[fallthrough]];
 	}
 	default: sys_ss.todo("sys_ss_appliance_info_manager(code=0x%x, buffer=*0x%x)", code, buffer);
 	}
@@ -309,9 +221,9 @@ error_code sys_ss_secure_rtc(u64 cmd, u64 a2, u64 a3, u64 a4)
 			return 0x80010500; // bad packet id
 
 		// a3 is actual output, not 100% sure, but best guess is its tb val
-		vm::write64(::narrow<u32>(a3), get_timebased_time());
+		vm::write64(a3, get_timebased_time());
 		// a4 is a pointer to status, non 0 on error
-		vm::write64(::narrow<u32>(a4), 0);
+		vm::write64(a4, 0);
 		return CELL_OK;
 	}
 	else if (cmd == 0x3003)
@@ -352,185 +264,46 @@ error_code sys_ss_get_boot_device(vm::ptr<u64> dev)
 
 error_code sys_ss_update_manager(u64 pkg_id, u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6)
 {
-	sys_ss.notice("sys_ss_update_manager(pkg=0x%x, a1=0x%x, a2=0x%x, a3=0x%x, a4=0x%x, a5=0x%x, a6=0x%x)", pkg_id, a1, a2, a3, a4, a5, a6);
+	sys_ss.todo("sys_ss_update_manager(pkg=0x%x, a1=0x%x, a2=0x%x, a3=0x%x, a4=0x%x, a5=0x%x, a6=0x%x)", pkg_id, a1, a2, a3, a4, a5, a6);
 
-	if (!g_ps3_process_info.has_root_perm())
-		return CELL_ENOSYS;
-
-	auto& update_manager = g_fxo->get<lv2_update_manager>();
-
-	switch (pkg_id)
-	{
-	case 0x6001:
-	{
-		// update package async
-		break;
-	}
-	case 0x6002:
-	{
-		// inspect package async
-		break;
-	}
-	case 0x6003:
-	{
-		// get installed package info
-		[[maybe_unused]] const auto type = ::narrow<u32>(a1);
-		const auto info_ptr = ::narrow<u32>(a2);
-
-		if (!info_ptr)
-			return CELL_EFAULT;
-
-		vm::write64(info_ptr, update_manager.system_sw_version);
-
-		break;
-	}
-	case 0x6004:
-	{
-		// get fix instruction
-		break;
-	}
-	case 0x6005:
-	{
-		// extract package async
-		break;
-	}
-	case 0x6006:
-	{
-		// get extract package
-		break;
-	}
-	case 0x6007:
-	{
-		// get flash initialized
-		break;
-	}
-	case 0x6008:
-	{
-		// set flash initialized
-		break;
-	}
-	case 0x6009:
-	{
-		// get seed token
-		break;
-	}
-	case 0x600A:
-	{
-		// set seed token
-		break;
-	}
-	case 0x600B:
+	if (pkg_id == 0x600B)
 	{
 		// read eeprom
-		const auto offset = ::narrow<u32>(a1);
-		const auto value_ptr = ::narrow<u32>(a2);
-
-		if (!value_ptr)
-			return CELL_EFAULT;
-
-		std::shared_lock shared_lock(update_manager.eeprom_mutex);
-
-		if (const auto iterator = update_manager.eeprom_map.find(offset); iterator != update_manager.eeprom_map.end())
-			vm::write8(value_ptr, iterator->second);
-		else
-			vm::write8(value_ptr, 0xFF); // 0xFF if not set
-
-		break;
+		// a1 == offset
+		// a2 == *value
+		if (a1 == 0x48C06)
+		{
+			// fself ctrl?
+			vm::write8(a2, 0xFF);
+		}
+		else if (a1 == 0x48C42)
+		{
+			// hddcopymode
+			vm::write8(a2, 0xFF);
+		}
+		else if (a1 >= 0x48C1C && a1 <= 0x48C1F)
+		{
+			// vsh target? (seems it can be 0xFFFFFFFE, 0xFFFFFFFF, 0x00000001 default: 0x00000000 /maybe QA,Debug,Retail,Kiosk?)
+			vm::write8(a2, a1 == 0x48C1F ? 0x1 : 0);
+		}
+		else if (a1 >= 0x48C18 && a1 <= 0x48C1B)
+		{
+			// system language
+			// *i think* this gives english
+			vm::write8(a2, a1 == 0x48C1B ? 0x1 : 0);
+		}
 	}
-	case 0x600C:
+	else if (pkg_id == 0x600C)
 	{
 		// write eeprom
-		const auto offset = ::narrow<u32>(a1);
-		const auto value = ::narrow<u8>(a2);
-
-		std::unique_lock unique_lock(update_manager.eeprom_mutex);
-
-		if (value != 0xFF)
-			update_manager.eeprom_map[offset] = value;
-		else
-			update_manager.eeprom_map.erase(offset); // 0xFF: unset
-
-		break;
 	}
-	case 0x600D:
+	else if (pkg_id == 0x6009)
 	{
-		// get async status
-		break;
+		// get seed token
 	}
-	case 0x600E:
+	else if (pkg_id == 0x600A)
 	{
-		// allocate buffer
-		const auto size = ::narrow<u32>(a1);
-		const auto addr_ptr = ::narrow<u32>(a2);
-
-		if (!addr_ptr)
-			return CELL_EFAULT;
-
-		const auto addr = update_manager.allocate(size);
-
-		if (!addr)
-			return CELL_ENOMEM;
-
-		vm::write32(addr_ptr, addr);
-
-		break;
-	}
-	case 0x600F:
-	{
-		// release buffer
-		const auto addr = ::narrow<u32>(a1);
-
-		if (!update_manager.deallocate(addr))
-			return CELL_ENOMEM;
-
-		break;
-	}
-	case 0x6010:
-	{
-		// check integrity
-		break;
-	}
-	case 0x6011:
-	{
-		// get applicable version
-		const auto addr_ptr = ::narrow<u32>(a2);
-
-		if (!addr_ptr)
-			return CELL_EFAULT;
-
-		vm::write64(addr_ptr, 0x30040ULL << 32); // 3.40
-
-		break;
-	}
-	case 0x6012:
-	{
-		// allocate buffer from memory container
-		[[maybe_unused]] const auto mem_ct = ::narrow<u32>(a1);
-		const auto size = ::narrow<u32>(a2);
-		const auto addr_ptr = ::narrow<u32>(a3);
-
-		if (!addr_ptr)
-			return CELL_EFAULT;
-
-		const auto addr = update_manager.allocate(size);
-
-		if (!addr)
-			return CELL_ENOMEM;
-
-		vm::write32(addr_ptr, addr);
-
-		break;
-	}
-	case 0x6013:
-	{
-		// unknown
-		break;
-	}
-	default:
-	{
-		sys_ss.error("sys_ss_update_manager(): invalid packet id 0x%x ", pkg_id);
-		return CELL_EINVAL;
-	}
+		// set seed token
 	}
 
 	return CELL_OK;
@@ -553,7 +326,7 @@ error_code sys_ss_individual_info_manager(u64 pkg_id, u64 a2, vm::ptr<u64> out_s
 	case 0x17002:
 	{
 		// TODO
-		vm::write<u64>(static_cast<u32>(a5), a4); // Write back size of buffer
+		vm::_ref<u64>(a5) = a4; // Write back size of buffer
 		break;
 	}
 	// Get EID size
@@ -562,4 +335,4 @@ error_code sys_ss_individual_info_manager(u64 pkg_id, u64 a2, vm::ptr<u64> out_s
 	}
 
 	return CELL_OK;
-}
+}
\ No newline at end of file
diff --git a/rpcs3/Emu/Cell/lv2/sys_ss.h b/rpcs3/Emu/Cell/lv2/sys_ss.h
index 0925cacc03..99fcba19e4 100644
--- a/rpcs3/Emu/Cell/lv2/sys_ss.h
+++ b/rpcs3/Emu/Cell/lv2/sys_ss.h
@@ -10,7 +10,6 @@ enum sys_ss_rng_error : u32
 	SYS_SS_RNG_ERROR_ENOMEM = 0x80010501,
 	SYS_SS_RNG_ERROR_EAGAIN = 0x80010503,
 	SYS_SS_RNG_ERROR_EFAULT = 0x80010509,
-	SYS_SS_RTC_ERROR_UNK = 0x8001050f,
 };
 
 struct CellSsOpenPSID
@@ -21,8 +20,8 @@ struct CellSsOpenPSID
 
 error_code sys_ss_random_number_generator(u64 pkg_id, vm::ptr<void> buf, u64 size);
 error_code sys_ss_access_control_engine(u64 pkg_id, u64 a2, u64 a3);
-error_code sys_ss_get_console_id(vm::ptr<u8> buf);
-error_code sys_ss_get_open_psid(vm::ptr<CellSsOpenPSID> psid);
+s32 sys_ss_get_console_id(vm::ptr<u8> buf);
+s32 sys_ss_get_open_psid(vm::ptr<CellSsOpenPSID> psid);
 error_code sys_ss_appliance_info_manager(u32 code, vm::ptr<u8> buffer);
 error_code sys_ss_get_cache_of_product_mode(vm::ptr<u8> ptr);
 error_code sys_ss_secure_rtc(u64 cmd, u64 a2, u64 a3, u64 a4);
diff --git a/rpcs3/Emu/Cell/lv2/sys_storage.cpp b/rpcs3/Emu/Cell/lv2/sys_storage.cpp
index d5ee3bbdae..d420e3aa80 100644
--- a/rpcs3/Emu/Cell/lv2/sys_storage.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_storage.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include "Emu/Memory/vm.h"
 #include "Emu/IdManager.h"
 
 #include "Emu/Cell/ErrorCodes.h"
@@ -15,7 +16,7 @@ namespace
 	struct storage_manager
 	{
 		// This is probably wrong and should be assigned per fd or something
-		atomic_ptr<lv2_event_queue> asyncequeue;
+		atomic_ptr<std::shared_ptr<lv2_event_queue>> asyncequeue;
 	};
 }
 
@@ -64,7 +65,7 @@ error_code sys_storage_read(u32 fd, u32 mode, u32 start_sector, u32 num_sectors,
 	}
 
 	std::memset(bounce_buf.get_ptr(), 0, num_sectors * 0x200ull);
-	const auto handle = idm::get_unlocked<lv2_storage>(fd);
+	const auto handle = idm::get<lv2_storage>(fd);
 
 	if (!handle)
 	{
@@ -76,7 +77,7 @@ error_code sys_storage_read(u32 fd, u32 mode, u32 start_sector, u32 num_sectors,
 		handle->file.seek(start_sector * 0x200ull);
 		const u64 size = num_sectors * 0x200ull;
 		const u64 result = lv2_file::op_read(handle->file, bounce_buf, size);
-		num_sectors = ::narrow<u32>(result / 0x200ull);
+		num_sectors = result / 0x200;
 	}
 
 	*sectors_read = num_sectors;
@@ -93,7 +94,7 @@ error_code sys_storage_write(u32 fd, u32 mode, u32 start_sector, u32 num_sectors
 		return CELL_EFAULT;
 	}
 
-	const auto handle = idm::get_unlocked<lv2_storage>(fd);
+	const auto handle = idm::get<lv2_storage>(fd);
 
 	if (!handle)
 	{
@@ -118,7 +119,7 @@ error_code sys_storage_async_configure(u32 fd, u32 io_buf, u32 equeue_id, u32 un
 
 	auto& manager = g_fxo->get<storage_manager>();
 
-	if (auto queue = idm::get_unlocked<lv2_obj, lv2_event_queue>(equeue_id))
+	if (auto queue = idm::get<lv2_obj, lv2_event_queue>(equeue_id))
 	{
 		manager.asyncequeue.store(queue);
 	}
@@ -136,7 +137,7 @@ error_code sys_storage_async_send_device_command(u32 dev_handle, u64 cmd, vm::pt
 
 	auto& manager = g_fxo->get<storage_manager>();
 
-	if (auto q = manager.asyncequeue.load())
+	if (auto q = *manager.asyncequeue.load())
 	{
 		q->send(0, unk, unk, unk);
 	}
diff --git a/rpcs3/Emu/Cell/lv2/sys_storage.h b/rpcs3/Emu/Cell/lv2/sys_storage.h
index 9916f2e58a..5177247933 100644
--- a/rpcs3/Emu/Cell/lv2/sys_storage.h
+++ b/rpcs3/Emu/Cell/lv2/sys_storage.h
@@ -26,7 +26,6 @@ struct lv2_storage
 	static const u32 id_base = 0x45000000;
 	static const u32 id_step = 1;
 	static const u32 id_count = 2048;
-	SAVESTATE_INIT_POS(45);
 
 	const u64 device_id;
 	const fs::file file;
diff --git a/rpcs3/Emu/Cell/lv2/sys_sync.h b/rpcs3/Emu/Cell/lv2/sys_sync.h
index bf99bcb056..a96fd236ce 100644
--- a/rpcs3/Emu/Cell/lv2/sys_sync.h
+++ b/rpcs3/Emu/Cell/lv2/sys_sync.h
@@ -1,13 +1,17 @@
 #pragma once
 
 #include "Utilities/mutex.h"
+#include "Utilities/sema.h"
 
 #include "Emu/CPU/CPUThread.h"
 #include "Emu/Cell/ErrorCodes.h"
+#include "Emu/Cell/timers.hpp"
 #include "Emu/IdManager.h"
 #include "Emu/IPC.h"
+#include "Emu/system_config.h"
 
-#include "util/shared_ptr.hpp"
+#include <deque>
+#include <thread>
 
 // attr_protocol (waiting scheduling policy)
 enum lv2_protocol : u8
@@ -58,15 +62,11 @@ enum
 
 enum ppu_thread_status : u32;
 
-struct ppu_non_sleeping_count_t
-{
-	bool has_running; // no actual count for optimization sake
-	u32 onproc_count;
-};
-
 // Base class for some kernel objects (shared set of 8192 objects).
 struct lv2_obj
 {
+	using id_type = lv2_obj;
+
 	static const u32 id_step = 0x100;
 	static const u32 id_count = 8192;
 	static constexpr std::pair<u32, u32> id_invl_range = {0, 8};
@@ -86,14 +86,6 @@ private:
 	}
 
 public:
-	SAVESTATE_INIT_POS(4); // Dependency on PPUs
-
-	lv2_obj() noexcept = default;
-	lv2_obj(u32 i) noexcept : exists{ i } {}
-	lv2_obj(lv2_obj&& rhs) noexcept : exists{ +rhs.exists } {}
-	lv2_obj(utils::serial&) noexcept {}
-	lv2_obj& operator=(lv2_obj&& rhs) noexcept { exists = +rhs.exists; return *this; }
-	void save(utils::serial&) {}
 
 	// Existence validation (workaround for shared-ptr ref-counting)
 	atomic_t<u32> exists = 0;
@@ -104,153 +96,71 @@ public:
 		return ptr && ptr->exists;
 	}
 
-	// wrapper for name64 string formatting
-	struct name_64
+	static std::string name64(u64 name_u64)
 	{
-		u64 data;
-	};
+		const auto ptr = reinterpret_cast<const char*>(&name_u64);
 
-	static std::string name64(u64 name_u64);
+		// NTS string, ignore invalid/newline characters
+		// Example: "lv2\n\0tx" will be printed as "lv2"
+		std::string str{ptr, std::find(ptr, ptr + 7, '\0')};
+		str.erase(std::remove_if(str.begin(), str.end(), [](uchar c){ return !std::isprint(c); }), str.end());
 
-	// Find and remove the object from the linked list
-	template <bool ModifyNode = true, typename T>
-	static T* unqueue(T*& first, T* object, T* T::* mem_ptr = &T::next_cpu)
+		return str;
+	}
+
+	// Find and remove the object from the deque container
+	template <typename T, typename E>
+	static T unqueue(std::deque<T>& queue, E object)
 	{
-		auto it = +first;
-
-		if (it == object)
+		for (auto found = queue.cbegin(), end = queue.cend(); found != end; found++)
 		{
-			atomic_storage<T*>::release(first, it->*mem_ptr);
-
-			if constexpr (ModifyNode)
+			if (*found == object)
 			{
-				atomic_storage<T*>::release(it->*mem_ptr, nullptr);
+				queue.erase(found);
+				return static_cast<T>(object);
 			}
-
-			return it;
-		}
-
-		for (; it;)
-		{
-			const auto next = it->*mem_ptr + 0;
-
-			if (next == object)
-			{
-				atomic_storage<T*>::release(it->*mem_ptr, next->*mem_ptr);
-
-				if constexpr (ModifyNode)
-				{
-					atomic_storage<T*>::release(next->*mem_ptr, nullptr);
-				}
-
-				return next;
-			}
-
-			it = next;
 		}
 
 		return {};
 	}
 
-	// Remove an object from the linked set according to the protocol
 	template <typename E, typename T>
-	static E* schedule(T& first, u32 protocol, bool modify_node = true)
+	static T* schedule(std::deque<T*>& queue, u32 protocol)
 	{
-		auto it = static_cast<E*>(first);
-
-		if (!it)
+		if (queue.empty())
 		{
-			return it;
+			return nullptr;
 		}
 
-		auto parent_found = &first;
-
 		if (protocol == SYS_SYNC_FIFO)
 		{
-			while (true)
-			{
-				const auto next = +it->next_cpu;
-
-				if (next)
-				{
-					parent_found = &it->next_cpu;
-					it = next;
-					continue;
-				}
-
-				if (cpu_flag::again - it->state)
-				{
-					atomic_storage<T>::release(*parent_found, nullptr);
-				}
-
-				return it;
-			}
+			const auto res = queue.front();
+			queue.pop_front();
+			return res;
 		}
 
-		auto prio = it->prio.load();
-		auto found = it;
+		s32 prio = 3071;
+		auto it = queue.cbegin();
 
-		while (true)
+		for (auto found = it, end = queue.cend(); found != end; found++)
 		{
-			auto& node = it->next_cpu;
-			const auto next = static_cast<E*>(node);
+			const s32 _prio = static_cast<E*>(*found)->prio;
 
-			if (!next)
+			if (_prio < prio)
 			{
-				break;
-			}
-
-			const auto _prio = static_cast<E*>(next)->prio.load();
-
-			// This condition tests for equality as well so the earliest element to be pushed is popped
-			if (_prio.prio < prio.prio || (_prio.prio == prio.prio && _prio.order < prio.order))
-			{
-				found = next;
-				parent_found = &node;
+				it = found;
 				prio = _prio;
 			}
-
-			it = next;
 		}
 
-		if (cpu_flag::again - found->state)
-		{
-			atomic_storage<T>::release(*parent_found, found->next_cpu);
-
-			if (modify_node)
-			{
-				atomic_storage<T>::release(found->next_cpu, nullptr);
-			}
-		}
-
-		return found;
-	}
-
-	template <typename T>
-	static void emplace(T& first, T object)
-	{
-		atomic_storage<T>::release(object->next_cpu, first);
-		atomic_storage<T>::release(first, object);
-
-		object->prio.atomic_op([order = ++g_priority_order_tag](std::common_type_t<decltype(std::declval<T>()->prio.load())>& prio)
-		{
-			if constexpr (requires { +std::declval<decltype(prio)>().preserve_bit; } )
-			{
-				if (prio.preserve_bit)
-				{
-					// Restoring state on load
-					prio.preserve_bit = 0;
-					return;
-				}
-			}
-
-			prio.order = order;
-		});
+		const auto res = *it;
+		queue.erase(it);
+		return res;
 	}
 
 private:
 	// Remove the current thread from the scheduling queue, register timeout
-	static bool sleep_unlocked(cpu_thread&, u64 timeout, u64 current_time);
+	static void sleep_unlocked(cpu_thread&, u64 timeout);
 
 	// Schedule the thread
 	static bool awake_unlocked(cpu_thread*, s32 prio = enqueue_cmd);
@@ -258,9 +168,9 @@ private:
 public:
 	static constexpr u64 max_timeout = u64{umax} / 1000;
 
-	static bool sleep(cpu_thread& cpu, const u64 timeout = 0);
+	static void sleep(cpu_thread& cpu, const u64 timeout = 0);
 
-	static bool awake(cpu_thread* thread, s32 prio = enqueue_cmd);
+	static bool awake(cpu_thread* const thread, s32 prio = enqueue_cmd);
 
 	// Returns true on successful context switch, false otherwise
 	static bool yield(cpu_thread& thread);
@@ -277,29 +187,13 @@ public:
 		g_to_awake.clear();
 	}
 
-	static void make_scheduler_ready();
-
-	static std::pair<ppu_thread_status, u32> ppu_state(ppu_thread* ppu, bool lock_idm = true, bool lock_lv2 = true);
+	static ppu_thread_status ppu_state(ppu_thread* ppu, bool lock_idm = true, bool lock_lv2 = true);
 
 	static inline void append(cpu_thread* const thread)
 	{
 		g_to_awake.emplace_back(thread);
 	}
 
-	// Serialization related
-	static void set_future_sleep(cpu_thread* cpu);
-	static bool is_scheduler_ready();
-
-	// Must be called under IDM lock
-	static ppu_non_sleeping_count_t count_non_sleeping_threads();
-
-	static inline bool has_ppus_in_running_state() noexcept
-	{
-		return count_non_sleeping_threads().has_running != 0;
-	}
-
-	static void set_yield_frequency(u64 freq, u64 max_allowed_tsx);
-
 	static void cleanup();
 
 	template <typename T>
@@ -343,11 +237,11 @@ public:
 		// EAGAIN for IDM IDs shortage
 		CellError error = CELL_EAGAIN;
 
-		if (!idm::import<lv2_obj, T>([&]() -> shared_ptr<T>
+		if (!idm::import<lv2_obj, T>([&]() -> std::shared_ptr<T>
 		{
-			shared_ptr<T> result = make();
+			std::shared_ptr<T> result = make();
 
-			auto finalize_construct = [&]() -> shared_ptr<T>
+			auto finalize_construct = [&]() -> std::shared_ptr<T>
 			{
 				if ((error = result->on_id_create()))
 				{
@@ -408,7 +302,7 @@ public:
 	}
 
 	template <typename T>
-	static void on_id_destroy(T& obj, u64 ipc_key, u64 pshared = umax)
+	static void on_id_destroy(T& obj, u64 ipc_key, u64 pshared = -1)
 	{
 		if (pshared == umax)
 		{
@@ -422,94 +316,111 @@ public:
 		}
 	}
 
-	template <typename T>
-	static shared_ptr<T> load(u64 ipc_key, shared_ptr<T> make, u64 pshared = umax)
+	template <bool IsUsleep = false, bool Scale = true>
+	static bool wait_timeout(u64 usec, cpu_thread* const cpu = {})
 	{
-		if (pshared == umax ? ipc_key != 0 : pshared != 0)
-		{
-			g_fxo->need<ipc_manager<T, u64>>();
+		static_assert(u64{umax} / max_timeout >= 100, "max timeout is not valid for scaling");
 
-			g_fxo->get<ipc_manager<T, u64>>().add(ipc_key, [&]()
-			{
-				return make;
-			});
+		if constexpr (Scale)
+		{
+			// Scale time
+			usec = std::min<u64>(usec, u64{umax} / 100) * 100 / g_cfg.core.clocks_scale;
 		}
 
-		// Ensure no error
-		ensure(!make->on_id_create());
-		return make;
-	}
+		// Clamp
+		usec = std::min<u64>(usec, max_timeout);
 
-	template <typename T, typename Storage = lv2_obj>
-	static std::function<void(void*)> load_func(shared_ptr<T> make, u64 pshared = umax)
-	{
-		const u64 key = make->key;
-		return [ptr = load<T>(key, make, pshared)](void* storage) { *static_cast<atomic_ptr<Storage>*>(storage) = ptr; };
-	}
+		u64 passed = 0;
 
-	static bool wait_timeout(u64 usec, ppu_thread* cpu = {}, bool scale = true, bool is_usleep = false);
+		const u64 start_time = get_system_time();
 
-	static void notify_all() noexcept;
-
-	// Can be called before the actual sleep call in order to move it out of mutex scope
-	static void prepare_for_sleep(cpu_thread& cpu);
-
-	struct notify_all_t
-	{
-		notify_all_t() noexcept
+		auto wait_for = [cpu](u64 timeout)
 		{
-			g_postpone_notify_barrier = true;
-		}
+			atomic_bs_t<cpu_flag> dummy{};
+			auto& state = cpu ? cpu->state : dummy;
+			const auto old = +state;
 
-		notify_all_t(const notify_all_t&) = delete;
-
-		static void cleanup()
-		{
-			for (auto& cpu : g_to_notify)
+			if (old & cpu_flag::signal)
 			{
-				if (!cpu)
+				return true;
+			}
+
+			thread_ctrl::wait_on(state, old, timeout);
+			return false;
+		};
+
+		while (usec >= passed)
+		{
+			u64 remaining = usec - passed;
+#ifdef __linux__
+			// NOTE: Assumption that timer initialization has succeeded
+			u64 host_min_quantum = IsUsleep && remaining <= 1000 ? 10 : 50;
+#else
+			// Host scheduler quantum for windows (worst case)
+			// NOTE: On ps3 this function has very high accuracy
+			constexpr u64 host_min_quantum = 500;
+#endif
+			// TODO: Tune for other non windows operating sytems
+			bool escape = false;
+			if (g_cfg.core.sleep_timers_accuracy < (IsUsleep ? sleep_timers_accuracy_level::_usleep : sleep_timers_accuracy_level::_all_timers))
+			{
+				escape = wait_for(remaining);
+			}
+			else
+			{
+				if (remaining > host_min_quantum)
 				{
-					return;
+#ifdef __linux__
+					// Do not wait for the last quantum to avoid loss of accuracy
+					escape = wait_for(remaining - ((remaining % host_min_quantum) + host_min_quantum));
+#else
+					// Wait on multiple of min quantum for large durations to avoid overloading low thread cpus
+					escape = wait_for(remaining - (remaining % host_min_quantum));
+#endif
 				}
-
-				// While IDM mutex is still locked (this function assumes so) check if the notification is still needed
-				// Pending flag is meant for forced notification (if the CPU really has pending work it can restore the flag in theory)
-				// Disabled to allow reservation notifications from here
-				if (false && cpu != &g_to_notify && static_cast<const decltype(cpu_thread::state)*>(cpu)->none_of(cpu_flag::signal + cpu_flag::pending))
+				else
 				{
-					// Omit it (this is a void pointer, it can hold anything)
-					cpu = &g_to_notify;
+					// Try yielding. May cause long wake latency but helps weaker CPUs a lot by alleviating resource pressure
+					std::this_thread::yield();
 				}
 			}
+
+			if (auto cpu0 = get_current_cpu_thread(); cpu0 && cpu0->is_stopped())
+			{
+				return false;
+			}
+
+			if (thread_ctrl::state() == thread_state::aborting)
+			{
+				return false;
+			}
+
+			if (escape)
+			{
+				return false;
+			}
+
+			passed = get_system_time() - start_time;
 		}
 
-		~notify_all_t() noexcept
-		{
-			lv2_obj::notify_all();
-		}
-	};
+		return true;
+	}
 
 	// Scheduler mutex
 	static shared_mutex g_mutex;
 
-	// Proirity tags
-	static atomic_t<u64> g_priority_order_tag;
-
 private:
 	// Pending list of threads to run
 	static thread_local std::vector<class cpu_thread*> g_to_awake;
 
 	// Scheduler queue for active PPU threads
-	static class ppu_thread* g_ppu;
+	static std::deque<class ppu_thread*> g_ppu;
 
 	// Waiting for the response from
-	static u32 g_pending;
+	static std::deque<class cpu_thread*> g_pending;
 
-	// Pending list of threads to notify (cpu_thread::state ptr)
-	static thread_local std::add_pointer_t<const void> g_to_notify[4];
+	// Scheduler queue for timeouts (wait until -> thread)
+	static std::deque<std::pair<u64, class cpu_thread*>> g_waiting;
 
-	// If a notify_all_t object exists locally, postpone notifications to the destructor of it (not recursive, notifies on the first destructor for safety)
-	static thread_local bool g_postpone_notify_barrier;
-
-	static void schedule_all(u64 current_time = 0);
+	static void schedule_all();
 };
diff --git a/rpcs3/Emu/Cell/lv2/sys_time.cpp b/rpcs3/Emu/Cell/lv2/sys_time.cpp
index 539bb9dedf..178aaa429a 100644
--- a/rpcs3/Emu/Cell/lv2/sys_time.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_time.cpp
@@ -1,20 +1,12 @@
 #include "stdafx.h"
 #include "sys_time.h"
 
-#include "sys_process.h"
 #include "Emu/system_config.h"
 #include "Emu/Cell/ErrorCodes.h"
-#include "Emu/Cell/timers.hpp"
-#include "util/tsc.hpp"
 
-#include "util/sysinfo.hpp"
-
-u64 g_timebase_offs{};
-static u64 systemtime_offset;
-
-#ifndef __linux__
 #include "util/asm.hpp"
-#endif
+
+u64 timebase_offset;
 
 #ifdef _WIN32
 
@@ -46,7 +38,7 @@ const auto s_time_aux_info = []() -> time_aux_info_t
 	time_aux_info_t result;
 	result.perf_freq   = freq.QuadPart;
 	result.start_time  = start.QuadPart;
-	result.start_ftime = (ftime.dwLowDateTime | static_cast<u64>(ftime.dwHighDateTime) << 32) - 116444736000000000;
+	result.start_ftime = (ftime.dwLowDateTime | (u64)ftime.dwHighDateTime << 32) - 116444736000000000;
 
 	return result;
 }();
@@ -141,88 +133,35 @@ LOG_CHANNEL(sys_time);
 
 static constexpr u64 g_timebase_freq = /*79800000*/ 80000000ull; // 80 Mhz
 
-// Convert time is microseconds to timebased time
-u64 convert_to_timebased_time(u64 time)
-{
-	const u64 result = time * (g_timebase_freq / 1000000ull) * g_cfg.core.clocks_scale / 100u;
-	ensure(result >= g_timebase_offs);
-	return result - g_timebase_offs;
-}
-
+// Auxiliary functions
 u64 get_timebased_time()
 {
-	if (u64 freq = utils::get_tsc_freq())
-	{
-		const u64 tsc = utils::get_tsc();
-
-#if _MSC_VER
-		const u64 result = static_cast<u64>(u128_from_mul(tsc, g_timebase_freq) / freq) * g_cfg.core.clocks_scale / 100u;
-#else
-		const u64 result = (tsc / freq * g_timebase_freq + tsc % freq * g_timebase_freq / freq) * g_cfg.core.clocks_scale / 100u;
-#endif
-		return result - g_timebase_offs;
-	}
-
-	while (true)
-	{
 #ifdef _WIN32
-		LARGE_INTEGER count;
-		ensure(QueryPerformanceCounter(&count));
+	LARGE_INTEGER count;
+	ensure(QueryPerformanceCounter(&count));
 
-		const u64 time = count.QuadPart;
-		const u64 freq = s_time_aux_info.perf_freq;
+	const u64 time = count.QuadPart;
+	const u64 freq = s_time_aux_info.perf_freq;
 
-#if _MSC_VER
-		const u64 result = static_cast<u64>(u128_from_mul(time * g_cfg.core.clocks_scale, g_timebase_freq) / freq / 100u);
+	return ((time / freq * g_timebase_freq + time % freq * g_timebase_freq / freq) * g_cfg.core.clocks_scale / 100u) - timebase_offset;
 #else
-		const u64 result = (time / freq * g_timebase_freq + time % freq * g_timebase_freq / freq) * g_cfg.core.clocks_scale / 100u;
-#endif
-#else
-		struct timespec ts;
-		ensure(::clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
+	struct timespec ts;
+	ensure(::clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
 
-		const u64 result = (static_cast<u64>(ts.tv_sec) * g_timebase_freq + static_cast<u64>(ts.tv_nsec) * g_timebase_freq / 1000000000ull) * g_cfg.core.clocks_scale / 100u;
+	return ((static_cast<u64>(ts.tv_sec) * g_timebase_freq + static_cast<u64>(ts.tv_nsec) * g_timebase_freq / 1000000000ull) * g_cfg.core.clocks_scale / 100u) - timebase_offset;
 #endif
-		if (result) return result - g_timebase_offs;
-	}
 }
 
 // Add an offset to get_timebased_time to avoid leaking PC's uptime into the game
-// As if PS3 starts at value 0 (base time) when the game boots
-// If none-zero arg is specified it will become the base time (for savestates)
-void initialize_timebased_time(u64 timebased_init, bool reset)
+void initalize_timebased_time()
 {
-	g_timebase_offs = 0;
-
-	if (reset)
-	{
-		// We simply want to zero-out these values
-		systemtime_offset = 0;
-		return;
-	}
-
-	const u64 current = get_timebased_time();
-	timebased_init = current - timebased_init;
-
-	g_timebase_offs = timebased_init;
-	systemtime_offset = timebased_init / (g_timebase_freq / 1000000);
+	timebase_offset = 0;
+	timebase_offset = get_timebased_time();
 }
 
 // Returns some relative time in microseconds, don't change this fact
 u64 get_system_time()
 {
-	if (u64 freq = utils::get_tsc_freq())
-	{
-		const u64 tsc = utils::get_tsc();
-
-#if _MSC_VER
-		const u64 result = static_cast<u64>(u128_from_mul(tsc, 1000000ull) / freq);
-#else
-		const u64 result = (tsc / freq * 1000000ull + tsc % freq * 1000000ull / freq);
-#endif
-		return result;
-	}
-
 	while (true)
 	{
 #ifdef _WIN32
@@ -232,11 +171,7 @@ u64 get_system_time()
 		const u64 time = count.QuadPart;
 		const u64 freq = s_time_aux_info.perf_freq;
 
-#if _MSC_VER
-		const u64 result = static_cast<u64>(u128_from_mul(time, 1000000ull) / freq);
-#else
 		const u64 result = time / freq * 1000000ull + (time % freq) * 1000000ull / freq;
-#endif
 #else
 		struct timespec ts;
 		ensure(::clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
@@ -249,28 +184,15 @@ u64 get_system_time()
 }
 
 // As get_system_time but obeys Clocks scaling setting
-u64 get_guest_system_time(u64 time)
+u64 get_guest_system_time()
 {
-	const u64 result = (time != umax ? time : get_system_time()) * g_cfg.core.clocks_scale / 100;
-	return result - systemtime_offset;
+	return get_system_time() * g_cfg.core.clocks_scale / 100;
 }
 
 // Functions
-error_code sys_time_set_timezone(s32 timezone, s32 summertime)
-{
-	sys_time.trace("sys_time_set_timezone(timezone=0x%x, summertime=0x%x)", timezone, summertime);
-
-	if (!g_ps3_process_info.has_root_perm())
-	{
-		return CELL_ENOSYS;
-	}
-
-	return CELL_OK;
-}
-
 error_code sys_time_get_timezone(vm::ptr<s32> timezone, vm::ptr<s32> summertime)
 {
-	sys_time.trace("sys_time_get_timezone(timezone=*0x%x, summertime=*0x%x)", timezone, summertime);
+	sys_time.notice("sys_time_get_timezone(timezone=*0x%x, summertime=*0x%x)", timezone, summertime);
 
 #ifdef _WIN32
 	TIME_ZONE_INFORMATION tz{};
@@ -424,18 +346,6 @@ error_code sys_time_get_current_time(vm::ptr<s64> sec, vm::ptr<s64> nsec)
 	return CELL_OK;
 }
 
-error_code sys_time_set_current_time(s64 sec, s64 nsec)
-{
-	sys_time.trace("sys_time_set_current_time(sec=0x%x, nsec=0x%x)", sec, nsec);
-
-	if (!g_ps3_process_info.has_root_perm())
-	{
-		return CELL_ENOSYS;
-	}
-
-	return CELL_OK;
-}
-
 u64 sys_time_get_timebase_frequency()
 {
 	sys_time.trace("sys_time_get_timebase_frequency()");
diff --git a/rpcs3/Emu/Cell/lv2/sys_time.h b/rpcs3/Emu/Cell/lv2/sys_time.h
index fd8c729ab3..3e72ee1aae 100644
--- a/rpcs3/Emu/Cell/lv2/sys_time.h
+++ b/rpcs3/Emu/Cell/lv2/sys_time.h
@@ -5,11 +5,7 @@
 
 // SysCalls
 
-error_code sys_time_set_timezone(s32 timezone, s32 summertime);
 error_code sys_time_get_timezone(vm::ptr<s32> timezone, vm::ptr<s32> summertime);
 error_code sys_time_get_current_time(vm::ptr<s64> sec, vm::ptr<s64> nsec);
-error_code sys_time_set_current_time(s64 sec, s64 nsec);
 u64 sys_time_get_timebase_frequency();
 error_code sys_time_get_rtc(vm::ptr<u64> rtc);
-
-extern u64 g_timebase_offs;
diff --git a/rpcs3/Emu/Cell/lv2/sys_timer.cpp b/rpcs3/Emu/Cell/lv2/sys_timer.cpp
index 5e6c3d20cb..20a1496998 100644
--- a/rpcs3/Emu/Cell/lv2/sys_timer.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_timer.cpp
@@ -2,69 +2,64 @@
 #include "sys_timer.h"
 
 #include "Emu/IdManager.h"
+
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/timers.hpp"
-
-#include "util/asm.hpp"
-#include "Emu/System.h"
-#include "Emu/system_config.h"
 #include "sys_event.h"
 #include "sys_process.h"
 
 #include <thread>
-#include <deque>
 
 LOG_CHANNEL(sys_timer);
 
 struct lv2_timer_thread
 {
 	shared_mutex mutex;
-	std::deque<shared_ptr<lv2_timer>> timers;
+	std::deque<std::shared_ptr<lv2_timer>> timers;
 
-	lv2_timer_thread();
 	void operator()();
 
-	//SAVESTATE_INIT_POS(46); // FREE SAVESTATE_INIT_POS number
-
 	static constexpr auto thread_name = "Timer Thread"sv;
 };
 
-lv2_timer::lv2_timer(utils::serial& ar)
-	: lv2_obj(1)
-	, state(ar)
-	, port(lv2_event_queue::load_ptr(ar, port, "timer"))
-	, source(ar)
-	, data1(ar)
-	, data2(ar)
-	, expire(ar)
-	, period(ar)
+u64 lv2_timer::check()
 {
-}
-
-void lv2_timer::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(lv2_sync);
-	ar(state), lv2_event_queue::save_ptr(ar, port.get()), ar(source, data1, data2, expire, period);
-}
-
-u64 lv2_timer::check(u64 _now) noexcept
-{
-	while (true)
+	while (thread_ctrl::state() != thread_state::aborting)
 	{
 		const u32 _state = +state;
 
 		if (_state == SYS_TIMER_STATE_RUN)
 		{
+			const u64 _now = get_guest_system_time();
 			u64 next = expire;
 
-			// If aborting, perform the last accurate check for event
 			if (_now >= next)
 			{
-				lv2_obj::notify_all_t notify;
-
 				std::lock_guard lock(mutex);
-				return check_unlocked(_now);
+
+				if (next = expire; _now < next)
+				{
+					// expire was updated in the middle, don't send an event
+					continue;
+				}
+
+				if (port)
+				{
+					port->send(source, data1, data2, next);
+				}
+
+				if (period)
+				{
+					// Set next expiration time and check again
+					const u64 _next = next + period;
+					expire.release(_next > next ? _next : umax);
+					continue;
+				}
+
+				// Stop after oneshot
+				state.release(SYS_TIMER_STATE_STOP);
+				break;
 			}
 
 			return (next - _now);
@@ -76,49 +71,11 @@ u64 lv2_timer::check(u64 _now) noexcept
 	return umax;
 }
 
-u64 lv2_timer::check_unlocked(u64 _now) noexcept
-{
-	const u64 next = expire;
-
-	if (_now < next || state != SYS_TIMER_STATE_RUN)
-	{
-		return umax;
-	}
-
-	if (port)
-	{
-		port->send(source, data1, data2, next);
-	}
-
-	if (period)
-	{
-		// Set next expiration time and check again
-		const u64 expire0 = utils::add_saturate<u64>(next, period);
-		expire.release(expire0);
-		return utils::sub_saturate<u64>(expire0, _now);
-	}
-
-	// Stop after oneshot
-	state.release(SYS_TIMER_STATE_STOP);
-	return umax;
-}
-
-lv2_timer_thread::lv2_timer_thread()
-{
-	Emu.PostponeInitCode([this]()
-	{
-		idm::select<lv2_obj, lv2_timer>([&](u32 id, lv2_timer&)
-		{
-			timers.emplace_back(idm::get_unlocked<lv2_obj, lv2_timer>(id));
-		});
-	});
-}
-
 void lv2_timer_thread::operator()()
 {
-	u64 sleep_time = 0;
+	u64 sleep_time = umax;
 
-	while (true)
+	while (thread_ctrl::state() != thread_state::aborting)
 	{
 		if (sleep_time != umax)
 		{
@@ -128,40 +85,19 @@ void lv2_timer_thread::operator()()
 
 		thread_ctrl::wait_for(sleep_time);
 
-		if (thread_ctrl::state() == thread_state::aborting)
-		{
-			break;
-		}
-
 		sleep_time = umax;
 
-		if (Emu.IsPausedOrReady())
-		{
-			sleep_time = 10000;
-			continue;
-		}
-
-		const u64 _now = get_guest_system_time();
-
 		reader_lock lock(mutex);
 
 		for (const auto& timer : timers)
 		{
-			while (lv2_obj::check(timer))
+			if (lv2_obj::check(timer))
 			{
-				if (thread_ctrl::state() == thread_state::aborting)
-				{
-					break;
-				}
+				const u64 adviced_sleep_time = timer->check();
 
-				if (const u64 advised_sleep_time = timer->check(_now))
+				if (sleep_time > adviced_sleep_time)
 				{
-					if (sleep_time > advised_sleep_time)
-					{
-						sleep_time = advised_sleep_time;
-					}
-
-					break;
+					sleep_time = adviced_sleep_time;
 				}
 			}
 		}
@@ -179,15 +115,9 @@ error_code sys_timer_create(ppu_thread& ppu, vm::ptr<u32> timer_id)
 		auto& thread = g_fxo->get<named_thread<lv2_timer_thread>>();
 		{
 			std::lock_guard lock(thread.mutex);
-
-			// Theoretically could have been destroyed by sys_timer_destroy by now
-			if (auto it = std::find(thread.timers.begin(), thread.timers.end(), ptr); it == thread.timers.end())
-			{
-				thread.timers.emplace_back(std::move(ptr));
-			}
+			thread.timers.emplace_back(std::move(ptr));
 		}
 
-		ppu.check_state();
 		*timer_id = idm::last_id();
 		return CELL_OK;
 	}
@@ -224,12 +154,7 @@ error_code sys_timer_destroy(ppu_thread& ppu, u32 timer_id)
 
 	auto& thread = g_fxo->get<named_thread<lv2_timer_thread>>();
 	std::lock_guard lock(thread.mutex);
-
-	if (auto it = std::find(thread.timers.begin(), thread.timers.end(), timer.ptr); it != thread.timers.end())
-	{
-		thread.timers.erase(it);
-	}
-
+	lv2_obj::unqueue(thread.timers, std::move(timer.ptr));
 	return CELL_OK;
 }
 
@@ -240,13 +165,9 @@ error_code sys_timer_get_information(ppu_thread& ppu, u32 timer_id, vm::ptr<sys_
 	sys_timer.trace("sys_timer_get_information(timer_id=0x%x, info=*0x%x)", timer_id, info);
 
 	sys_timer_information_t _info{};
-	const u64 now = get_guest_system_time();
 
 	const auto timer = idm::check<lv2_obj, lv2_timer>(timer_id, [&](lv2_timer& timer)
 	{
-		std::lock_guard lock(timer.mutex);
-
-		timer.check_unlocked(now);
 		timer.get_information(_info);
 	});
 
@@ -255,7 +176,6 @@ error_code sys_timer_get_information(ppu_thread& ppu, u32 timer_id, vm::ptr<sys_
 		return CELL_ESRCH;
 	}
 
-	ppu.check_state();
 	std::memcpy(info.get_ptr(), &_info, info.size());
 	return CELL_OK;
 }
@@ -264,7 +184,7 @@ error_code _sys_timer_start(ppu_thread& ppu, u32 timer_id, u64 base_time, u64 pe
 {
 	ppu.state += cpu_flag::wait;
 
-	(period ? sys_timer.warning : sys_timer.trace)("_sys_timer_start(timer_id=0x%x, base_time=0x%llx, period=0x%llx)", timer_id, base_time, period);
+	sys_timer.trace("_sys_timer_start(timer_id=0x%x, base_time=0x%llx, period=0x%llx)", timer_id, base_time, period);
 
 	const u64 start_time = get_guest_system_time();
 
@@ -278,13 +198,11 @@ error_code _sys_timer_start(ppu_thread& ppu, u32 timer_id, u64 base_time, u64 pe
 	{
 		std::lock_guard lock(timer.mutex);
 
-		// LV2 Disassembly: Simple nullptr check (assignment test, do not use lv2_obj::check here)
-		if (!timer.port)
+		if (!lv2_obj::check(timer.port))
 		{
 			return CELL_ENOTCONN;
 		}
 
-		timer.check_unlocked(start_time);
 		if (timer.state != SYS_TIMER_STATE_STOP)
 		{
 			return CELL_EBUSY;
@@ -296,24 +214,9 @@ error_code _sys_timer_start(ppu_thread& ppu, u32 timer_id, u64 base_time, u64 pe
 			return CELL_ETIMEDOUT;
 		}
 
-		const u64 expire = period == 0 ? base_time : // oneshot
-			base_time == 0 ? utils::add_saturate(start_time, period) : // periodic timer with no base (using start time as base)
-			start_time < utils::add_saturate(base_time, period) ? utils::add_saturate(base_time, period) : // periodic with base time over start time
-			[&]() -> u64 // periodic timer base before start time (align to be at least a period over start time)
-			{
-				// Optimized from a loop in LV2:
-				// do
-				// {
-				// 	  base_time += period;
-				// }
-				// while (base_time < start_time);
-
-				const u64 start_time_with_base_time_reminder = utils::add_saturate(start_time - start_time % period, base_time % period);
-
-				return utils::add_saturate(start_time_with_base_time_reminder, start_time_with_base_time_reminder < start_time ? period : 0);
-			}();
-
-		timer.expire = expire;
+		// sys_timer_start_periodic() will use current time (TODO: is it correct?)
+		const u64 expire = base_time ? base_time : start_time + period;
+		timer.expire = expire > start_time ? expire : umax;
 		timer.period = period;
 		timer.state  = SYS_TIMER_STATE_RUN;
 		return {};
@@ -345,10 +248,10 @@ error_code sys_timer_stop(ppu_thread& ppu, u32 timer_id)
 
 	sys_timer.trace("sys_timer_stop()");
 
-	const auto timer = idm::check<lv2_obj, lv2_timer>(timer_id, [now = get_guest_system_time(), notify = lv2_obj::notify_all_t()](lv2_timer& timer)
+	const auto timer = idm::check<lv2_obj, lv2_timer>(timer_id, [](lv2_timer& timer)
 	{
 		std::lock_guard lock(timer.mutex);
-		timer.check_unlocked(now);
+
 		timer.state = SYS_TIMER_STATE_STOP;
 	});
 
@@ -368,7 +271,7 @@ error_code sys_timer_connect_event_queue(ppu_thread& ppu, u32 timer_id, u32 queu
 
 	const auto timer = idm::check<lv2_obj, lv2_timer>(timer_id, [&](lv2_timer& timer) -> CellError
 	{
-		auto found = idm::get_unlocked<lv2_obj, lv2_event_queue>(queue_id);
+		const auto found = idm::find_unlocked<lv2_obj, lv2_event_queue>(queue_id);
 
 		if (!found)
 		{
@@ -383,8 +286,8 @@ error_code sys_timer_connect_event_queue(ppu_thread& ppu, u32 timer_id, u32 queu
 		}
 
 		// Connect event queue
-		timer.port   = found;
-		timer.source = name ? name : (u64{process_getpid() + 0u} << 32) | u64{timer_id};
+		timer.port   = std::static_pointer_cast<lv2_event_queue>(found->second);
+		timer.source = name ? name : (s64{process_getpid()} << 32) | u64{timer_id};
 		timer.data1  = data1;
 		timer.data2  = data2;
 		return {};
@@ -409,11 +312,10 @@ error_code sys_timer_disconnect_event_queue(ppu_thread& ppu, u32 timer_id)
 
 	sys_timer.warning("sys_timer_disconnect_event_queue(timer_id=0x%x)", timer_id);
 
-	const auto timer = idm::check<lv2_obj, lv2_timer>(timer_id, [now = get_guest_system_time(), notify = lv2_obj::notify_all_t()](lv2_timer& timer) -> CellError
+	const auto timer = idm::check<lv2_obj, lv2_timer>(timer_id, [](lv2_timer& timer) -> CellError
 	{
 		std::lock_guard lock(timer.mutex);
 
-		timer.check_unlocked(now);
 		timer.state = SYS_TIMER_STATE_STOP;
 
 		if (!lv2_obj::check(timer.port))
@@ -442,7 +344,7 @@ error_code sys_timer_sleep(ppu_thread& ppu, u32 sleep_time)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_timer.trace("sys_timer_sleep(sleep_time=%d)", sleep_time);
+	sys_timer.trace("sys_timer_sleep(sleep_time=%d) -> sys_timer_usleep()", sleep_time);
 
 	return sys_timer_usleep(ppu, sleep_time * u64{1000000});
 }
@@ -455,24 +357,9 @@ error_code sys_timer_usleep(ppu_thread& ppu, u64 sleep_time)
 
 	if (sleep_time)
 	{
-		const s64 add_time = g_cfg.core.usleep_addend;
+		lv2_obj::sleep(ppu, sleep_time);
 
-		// Over/underflow checks
-		if (add_time >= 0)
-		{
-			sleep_time = utils::add_saturate<u64>(sleep_time, add_time);
-		}
-		else
-		{
-			sleep_time = std::max<u64>(1, utils::sub_saturate<u64>(sleep_time, -add_time));
-		}
-
-		lv2_obj::sleep(ppu, g_cfg.core.sleep_timers_accuracy < sleep_timers_accuracy_level::_usleep ? sleep_time : 0);
-
-		if (!lv2_obj::wait_timeout(sleep_time, &ppu, true, true))
-		{
-			ppu.state += cpu_flag::again;
-		}
+		lv2_obj::wait_timeout<true>(sleep_time);
 	}
 	else
 	{
diff --git a/rpcs3/Emu/Cell/lv2/sys_timer.h b/rpcs3/Emu/Cell/lv2/sys_timer.h
index 8a0b2eda82..e8a85b5dd3 100644
--- a/rpcs3/Emu/Cell/lv2/sys_timer.h
+++ b/rpcs3/Emu/Cell/lv2/sys_timer.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "sys_event.h"
+
+#include "Utilities/Thread.h"
 #include "Emu/Memory/vm_ptr.h"
 
 
@@ -13,7 +15,7 @@ enum : u32
 
 struct sys_timer_information_t
 {
-	be_t<u64> next_expire; // system_time_t
+	be_t<s64> next_expire;
 	be_t<u64> period;
 	be_t<u32> timer_state;
 	be_t<u32> pad;
@@ -26,7 +28,7 @@ struct lv2_timer : lv2_obj
 	shared_mutex mutex;
 	atomic_t<u32> state{SYS_TIMER_STATE_STOP};
 
-	shared_ptr<lv2_event_queue> port;
+	std::shared_ptr<lv2_event_queue> port;
 	u64 source;
 	u64 data1;
 	u64 data2;
@@ -34,19 +36,20 @@ struct lv2_timer : lv2_obj
 	atomic_t<u64> expire{0}; // Next expiration time
 	atomic_t<u64> period{0}; // Period (oneshot if 0)
 
-	u64 check(u64 _now) noexcept;
-	u64 check_unlocked(u64 _now) noexcept;
+	u64 check();
 
 	lv2_timer() noexcept
-		: lv2_obj(1)
+		: lv2_obj{1}
 	{
 	}
 
-	void get_information(sys_timer_information_t& info) const
+	void get_information(sys_timer_information_t& info)
 	{
+		reader_lock lock(mutex);
+
 		if (state == SYS_TIMER_STATE_RUN)
 		{
-			info.timer_state = state;
+			info.timer_state = SYS_TIMER_STATE_RUN;
 			info.next_expire = expire;
 			info.period      = period;
 		}
@@ -57,9 +60,6 @@ struct lv2_timer : lv2_obj
 			info.period      = 0;
 		}
 	}
-
-	lv2_timer(utils::serial& ar);
-	void save(utils::serial& ar);
 };
 
 class ppu_thread;
diff --git a/rpcs3/Emu/Cell/lv2/sys_tty.cpp b/rpcs3/Emu/Cell/lv2/sys_tty.cpp
index dcc142b81a..52cd126f5d 100644
--- a/rpcs3/Emu/Cell/lv2/sys_tty.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_tty.cpp
@@ -1,7 +1,5 @@
 #include "stdafx.h"
 #include "Emu/system_config.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/Cell/timers.hpp"
 
 #include "sys_tty.h"
 
@@ -88,12 +86,8 @@ error_code sys_tty_read(s32 ch, vm::ptr<char> buf, u32 len, vm::ptr<u32> preadle
 	return CELL_OK;
 }
 
-std::string dump_useful_thread_info();
-
-error_code sys_tty_write([[maybe_unused]] ppu_thread& ppu, s32 ch, vm::cptr<char> buf, u32 len, vm::ptr<u32> pwritelen)
+error_code sys_tty_write(s32 ch, vm::cptr<char> buf, u32 len, vm::ptr<u32> pwritelen)
 {
-	ppu.state += cpu_flag::wait;
-
 	sys_tty.notice("sys_tty_write(ch=%d, buf=*0x%x, len=%d, pwritelen=*0x%x)", ch, buf, len, pwritelen);
 
 	std::string msg;
@@ -108,38 +102,6 @@ error_code sys_tty_write([[maybe_unused]] ppu_thread& ppu, s32 ch, vm::cptr<char
 		}
 	}
 
-	auto find_word = [](std::string_view msg, std::string_view word) -> bool
-	{
-		// Match uppercase and lowercase starting words
-		const usz index = msg.find(word.substr(1));
-
-		if (index != umax && index >= 1u)
-		{
-			return std::tolower(static_cast<u8>(msg[index - 1])) == word[0];
-		}
-
-		return false;
-	};
-
-	std::string_view sample = std::string_view(msg).substr(0, 1024);
-
-	const bool warning = find_word(sample, "failed"sv) || find_word(sample, "abort"sv) || find_word(sample, "crash"sv)
-		|| find_word(sample, "error"sv) || find_word(sample, "unexpected"sv) || find_word(sample, "0x8001"sv);
-
-	sample = {}; // Remove reference to string
-
-	if (msg.size() >= 2u && [&]()
-	{
-		static thread_local u64 last_write = 0;
-
-		// Dump thread about every period which TTY was not being touched for about half a second
-		const u64 current = get_system_time();
-		return current - std::exchange(last_write, current) >= (warning ? 500'000 : 3'000'000);
-	}())
-	{
-		ppu_log.notice("\n%s", dump_useful_thread_info());
-	}
-
 	// Hack: write to tty even on CEX mode, but disable all error checks
 	if (ch < 0 || ch > 15)
 	{
@@ -163,24 +125,7 @@ error_code sys_tty_write([[maybe_unused]] ppu_thread& ppu, s32 ch, vm::cptr<char
 	{
 		if (!msg.empty())
 		{
-			if (msg.ends_with("\n"))
-			{
-				// Avoid logging trailing newlines, log them verbosely instead
-				const std::string_view msg_clear = std::string_view(msg).substr(0, msg.find_last_not_of('\n') + 1);
-
-				if (msg.size() - 1 == msg_clear.size())
-				{
-					(warning ? sys_tty.warning : sys_tty.notice)(u8"sys_tty_write(): “%s“ << endl", msg_clear);
-				}
-				else
-				{
-					(warning ? sys_tty.warning : sys_tty.notice)(u8"sys_tty_write(): “%s” << endl(%u)", msg_clear, msg.size() - msg_clear.size());
-				}
-			}
-			else
-			{
-				(warning ? sys_tty.warning : sys_tty.notice)(u8"sys_tty_write(): “%s”", msg);
-			}
+			sys_tty.notice(u8"sys_tty_write(): “%s”", msg);
 
 			if (g_tty)
 			{
diff --git a/rpcs3/Emu/Cell/lv2/sys_tty.h b/rpcs3/Emu/Cell/lv2/sys_tty.h
index 8b35588cdf..69a66f9b53 100644
--- a/rpcs3/Emu/Cell/lv2/sys_tty.h
+++ b/rpcs3/Emu/Cell/lv2/sys_tty.h
@@ -25,8 +25,6 @@ enum
 	SYS_TTYP_USER13      = 15,
 };
 
-class ppu_thread;
-
 // SysCalls
 error_code sys_tty_read(s32 ch, vm::ptr<char> buf, u32 len, vm::ptr<u32> preadlen);
-error_code sys_tty_write(ppu_thread& ppu, s32 ch, vm::cptr<char> buf, u32 len, vm::ptr<u32> pwritelen);
+error_code sys_tty_write(s32 ch, vm::cptr<char> buf, u32 len, vm::ptr<u32> pwritelen);
diff --git a/rpcs3/Emu/Cell/lv2/sys_uart.cpp b/rpcs3/Emu/Cell/lv2/sys_uart.cpp
index 67e91b97a0..b17b98d239 100644
--- a/rpcs3/Emu/Cell/lv2/sys_uart.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_uart.cpp
@@ -1,622 +1,63 @@
 #include "stdafx.h"
 
-#include "Emu/System.h"
-#include "Emu/system_config.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/lv2/sys_sync.h"
-#include "Emu/Cell/lv2/sys_rsxaudio.h"
-#include "Emu/Cell/lv2/sys_process.h"
 
 #include "sys_uart.h"
 
 LOG_CHANNEL(sys_uart);
 
-template <>
-void fmt_class_string<UartAudioCtrlID>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](UartAudioCtrlID value)
-	{
-		switch (value)
-		{
-		STR_CASE(UartAudioCtrlID::DAC_RESET);
-		STR_CASE(UartAudioCtrlID::DAC_DE_EMPHASIS);
-		STR_CASE(UartAudioCtrlID::AVCLK);
-		}
-
-		return unknown;
-	});
-}
-
-struct av_init_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_av_init);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_av_init *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		vuart.av_cmd_ver = pkt->hdr.version;
-		vuart.hdmi_events_bitmask |= pkt->event_bit;
-
-		if (pkt->event_bit & PS3AV_EVENT_BIT_UNK)
-		{
-			// 0 or 255, probably ps2 backwards compatibility (inverted)
-			const ps3av_pkt_av_init_reply reply = { 0 };
-
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS, &reply, sizeof(ps3av_pkt_av_init_reply));
-			return;
-		}
-
-		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct av_fini_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_header);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_header *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		vuart.hdmi_events_bitmask = 0;
-
-		vuart.write_resp(pkt->cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
 struct av_get_monitor_info_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_get_monitor_info);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_get_monitor_info *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		ps3av_get_monitor_info_reply cfg{};
-
-		if (pkt->avport == static_cast<u16>(UartAudioAvport::AVMULTI_0))
-		{
-			cfg.avport = static_cast<u8>(UartAudioAvport::AVMULTI_0);
-			cfg.monitor_type = PS3AV_MONITOR_TYPE_AVMULTI;
-			cfg.res_60.res_bits = UINT32_MAX;
-			cfg.res_50.res_bits = UINT32_MAX;
-			cfg.res_vesa.res_bits = UINT32_MAX;
-			cfg.cs.rgb = PS3AV_CS_SUPPORTED;
-			cfg.cs.yuv444 = PS3AV_CS_SUPPORTED;
-			cfg.cs.yuv422 = PS3AV_CS_SUPPORTED;
-			cfg.speaker_info = 1;
-			cfg.num_of_audio_block = 1;
-			cfg.audio_info[0].sbit = 7;
-			cfg.audio_info[0].max_num_of_ch = 2;
-			cfg.audio_info[0].type = PS3AV_MON_INFO_AUDIO_TYPE_LPCM;
-			cfg.audio_info[0].fs = 127;
-
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS, &cfg, sizeof(ps3av_get_monitor_info_reply));
-		}
-		else if (pkt->avport <= static_cast<u16>(UartAudioAvport::HDMI_1))
-		{
-			if (pkt->avport == static_cast<u16>(UartAudioAvport::HDMI_1) && !g_cfg.core.debug_console_mode)
-			{
-				vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SYSCON_COMMUNICATE_FAIL);
-				return;
-			}
-
-			set_hdmi_display_cfg(vuart, cfg, static_cast<u8>(pkt->avport));
-
-			vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SUCCESS, &cfg, sizeof(ps3av_get_monitor_info_reply) - 4); // Length is different for some reason
-		}
-		else
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_INVALID_PORT);
-		}
-	}
-
-	static void set_hdmi_display_cfg(vuart_av_thread &vuart, ps3av_get_monitor_info_reply &cfg, u8 avport)
-	{
-		if (vuart.hdmi_behavior_mode != PS3AV_HDMI_BEHAVIOR_NORMAL && (vuart.hdmi_behavior_mode & PS3AV_HDMI_BEHAVIOR_EDID_PASS))
-		{
-			cfg.monitor_type = vuart.hdmi_behavior_mode & PS3AV_HDMI_BEHAVIOR_DVI ? PS3AV_MONITOR_TYPE_DVI : PS3AV_MONITOR_TYPE_HDMI;
-			return;
-		}
-
-		// Report maximum support
-
-		static constexpr u8 mon_id[sizeof(cfg.monitor_id)] = { 0x4A, 0x13, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15 };
-		static constexpr u8 mon_name[sizeof(cfg.monitor_name)] = { 'R', 'P', 'C', 'S', '3', ' ', 'V', 'i', 'r', 't', 'M', 'o', 'n', '\0', '\0', '\0' };
-		static constexpr ps3av_info_audio audio_info[PS3AV_MON_INFO_AUDIO_BLK_MAX] =
-		{
-			{ PS3AV_MON_INFO_AUDIO_TYPE_LPCM,      8, 0x7F, 0x07 },
-			{ PS3AV_MON_INFO_AUDIO_TYPE_AC3,       8, 0x7F, 0xFF },
-			{ PS3AV_MON_INFO_AUDIO_TYPE_AAC,       8, 0x7F, 0xFF },
-			{ PS3AV_MON_INFO_AUDIO_TYPE_DTS,       8, 0x7F, 0xFF },
-			{ PS3AV_MON_INFO_AUDIO_TYPE_DDP,       8, 0x7F, 0xFF },
-			{ PS3AV_MON_INFO_AUDIO_TYPE_DTS_HD,    8, 0x7F, 0xFF },
-			{ PS3AV_MON_INFO_AUDIO_TYPE_DOLBY_THD, 8, 0x7F, 0xFF },
-		};
-
-		cfg.avport = avport;
-		memcpy(cfg.monitor_id, mon_id, sizeof(cfg.monitor_id));
-		cfg.monitor_type = PS3AV_MONITOR_TYPE_HDMI;
-		memcpy(cfg.monitor_name, mon_name, sizeof(cfg.monitor_name));
-
-		const u32 native_res = [&]()
-		{
-			switch (g_cfg.video.resolution)
-			{
-			case video_resolution::_1080p:
-				return PS3AV_RESBIT_1920x1080P;
-			case video_resolution::_1080i:
-				return PS3AV_RESBIT_1920x1080I;
-			case video_resolution::_1600x1080p:
-			case video_resolution::_1440x1080p:
-			case video_resolution::_1280x1080p:
-			case video_resolution::_720p:
-				return PS3AV_RESBIT_1280x720P;
-			case video_resolution::_576p:
-				return PS3AV_RESBIT_720x576P;
-			default:
-				return PS3AV_RESBIT_720x480P;
-			}
-		}();
-
-		cfg.res_60.res_bits = UINT32_MAX;
-		cfg.res_60.native = native_res;
-		cfg.res_50.res_bits = UINT32_MAX;
-		cfg.res_50.native = native_res;
-		cfg.res_other.res_bits = UINT32_MAX;
-		cfg.res_vesa.res_bits = 1; // Always one mode at a time
-
-		cfg.cs.rgb = PS3AV_CS_SUPPORTED | PS3AV_RGB_SELECTABLE_QAUNTIZATION_RANGE | PS3AV_12BIT_COLOR;
-		cfg.cs.yuv444 = PS3AV_CS_SUPPORTED | PS3AV_12BIT_COLOR;
-		cfg.cs.yuv422 = PS3AV_CS_SUPPORTED;
-		cfg.cs.colorimetry_data = PS3AV_COLORIMETRY_xvYCC_601 | PS3AV_COLORIMETRY_xvYCC_709 | PS3AV_COLORIMETRY_MD0 | PS3AV_COLORIMETRY_MD1 | PS3AV_COLORIMETRY_MD2;
-
-		cfg.color.red_x = 1023;
-		cfg.color.red_y = 0;
-		cfg.color.green_x = 0;
-		cfg.color.green_y = 1023;
-		cfg.color.blue_x = 0;
-		cfg.color.blue_y = 0;
-		cfg.color.white_x = 341;
-		cfg.color.white_y = 341;
-		cfg.color.gamma = 100;
-
-		cfg.supported_ai = 1;
-		cfg.speaker_info = 0x4F;
-
-		// Audio formats
-		cfg.num_of_audio_block = 7;
-		memcpy(cfg.audio_info, audio_info, sizeof(cfg.audio_info));
-
-		// 16:9 27-inch (as a default)
-		cfg.hor_screen_size = 60;
-		cfg.ver_screen_size = 34;
-
-		cfg.supported_content_types = 0b1111; // Graphics, cinema, photo, game
-
-		// 3D modes, no native formats
-		cfg.res_60_packed_3D.res_bits = UINT32_MAX;
-		cfg.res_50_packed_3D.res_bits = UINT32_MAX;
-		cfg.res_other_3D.res_bits = UINT32_MAX;
-		cfg.res_60_sbs_3D.res_bits = UINT32_MAX;
-		cfg.res_50_sbs_3D.res_bits = UINT32_MAX;
-
-		cfg.vendor_specific_flags = 0; // values from 0-3 (unk)
-	}
-};
-
-struct av_get_bksv_list_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_get_bksv);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_get_bksv *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		if (pkt->avport > static_cast<u16>(UartAudioAvport::HDMI_1))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_INVALID_PORT);
-			return;
-		}
-
-		if (pkt->avport == static_cast<u16>(UartAudioAvport::HDMI_1) && !g_cfg.core.debug_console_mode)
-		{
-			vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SYSCON_COMMUNICATE_FAIL);
-			return;
-		}
-
-		ps3av_pkt_get_bksv_reply reply{};
-		reply.avport = pkt->avport;
-		u16 pkt_size = offsetof(ps3av_pkt_get_bksv_reply, ksv_arr);
-
-		if (vuart.hdmi_behavior_mode == PS3AV_HDMI_BEHAVIOR_NORMAL || !(vuart.hdmi_behavior_mode & PS3AV_HDMI_BEHAVIOR_HDCP_OFF))
-		{
-			reply.ksv_cnt = 1;
-			memcpy(reply.ksv_arr[0], PS3AV_BKSV_VALUE, sizeof(PS3AV_BKSV_VALUE));
-			pkt_size = (pkt_size + 5 * reply.ksv_cnt + 3) & 0xFFFC;
-		}
-
-		vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SUCCESS, &reply, pkt_size);
-	}
-};
-
-struct av_enable_event_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_enable_event);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_enable_event *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		vuart.hdmi_events_bitmask |= pkt->event_bit;
-
-		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct av_disable_event_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_enable_event);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_enable_event *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		vuart.hdmi_events_bitmask &= ~pkt->event_bit;
-
-		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct av_tv_mute_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_av_audio_mute);
-	}
-
-	// Behavior is unknown, but it seems that this pkt could be ignored
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_av_audio_mute *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		if (pkt->avport < (g_cfg.core.debug_console_mode ? 2 : 1))
-		{
-			sys_uart.notice("[av_tv_mute_cmd] tv mute set to %u", pkt->mute > 0);
-		}
-
-		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct av_null_cmd : public ps3av_cmd
 {
 	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
 	{
 		return 12;
 	}
 
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
+	bool execute(vuart_av_thread &vuart, const void *pkt_buf, u32 reply_max_size) override
 	{
-		const auto pkt = static_cast<const ps3av_header *>(pkt_buf);
+		auto pkt = static_cast<const ps3av_get_monitor_info *>(pkt_buf);
 
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		vuart.write_resp(pkt->cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct av_get_aksv_list_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_header);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_header *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr) + sizeof(ps3av_pkt_get_aksv_reply))
-		{
-			vuart.write_resp(pkt->cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		ps3av_pkt_get_aksv_reply reply{};
-		memcpy(reply.ksv_arr[0], PS3AV_AKSV_VALUE, sizeof(PS3AV_AKSV_VALUE));
-
-		if (g_cfg.core.debug_console_mode)
-		{
-			memcpy(reply.ksv_arr[1], PS3AV_AKSV_VALUE, sizeof(PS3AV_AKSV_VALUE));
-			reply.ksv_size = 2 * sizeof(PS3AV_AKSV_VALUE);
-		}
-		else
-		{
-			reply.ksv_size = sizeof(PS3AV_AKSV_VALUE);
-		}
-
-		vuart.write_resp(pkt->cid, PS3AV_STATUS_SUCCESS, &reply, sizeof(ps3av_pkt_get_aksv_reply));
-	}
-};
-
-struct video_disable_signal_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_video_disable_sig);
-	}
-
-	// Cross color reduction filter setting in vsh. (AVMULTI)
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_video_disable_sig *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
+		if (reply_max_size < sizeof(ps3av_get_monitor_info))
 		{
 			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
+			return false;
 		}
 
-		if (pkt->avport <= static_cast<u16>(UartAudioAvport::HDMI_1))
-		{
-			g_fxo->get<rsx_audio_data>().update_av_mute_state(vuart.avport_to_idx(static_cast<UartAudioAvport>(pkt->avport.get())), false, true);
+		// TODO:
+		auto evnt = std::make_unique<ps3av_get_monitor_info_reply>();
+		evnt->avport = 0;
+		// evnt->monitor_id =
+		evnt->monitor_type = PS3AV_MONITOR_TYPE_HDMI;
 
-			if (pkt->avport == static_cast<u16>(UartAudioAvport::HDMI_1) && !g_cfg.core.debug_console_mode)
-			{
-				vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SYSCON_COMMUNICATE_FAIL);
-				return;
-			}
+		// evnt->monitor_name;
+		evnt->res_60.native = PS3AV_RESBIT_1280x720P;
+		evnt->res_60.res_bits = 0xf;
+		evnt->res_50.native = PS3AV_RESBIT_1280x720P;
+		evnt->res_50.res_bits = 0xf;
+		evnt->res_vesa.res_bits = 1;
 
-			vuart.hdmi_res_set[pkt->avport == static_cast<u16>(UartAudioAvport::HDMI_1)] = false;
-			vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-		}
-		else if (pkt->avport == static_cast<u16>(UartAudioAvport::AVMULTI_0))
-		{
-			if (vuart.head_b_initialized)
-			{
-				vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-			}
-		}
-		else
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-		}
-	}
-};
+		evnt->cs.rgb = 1;
+		evnt->cs.yuv444 = 1;
+		evnt->cs.yuv422 = 1;
 
-struct av_video_ytrapcontrol_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_av_video_ytrapcontrol);
-	}
+		evnt->color.blue_x = 0xFFFF;
+		evnt->color.blue_y = 0xFFFF;
+		evnt->color.green_x = 0xFFFF;
+		evnt->color.green_y = 0xFFFF;
+		evnt->color.red_x = 0xFFFF;
+		evnt->color.red_y = 0xFFFF;
+		evnt->color.white_x = 0xFFFF;
+		evnt->color.white_x = 0xFFFF;
+		evnt->color.gamma = 100;
 
-	// Cross color reduction filter setting in vsh. (AVMULTI)
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_av_video_ytrapcontrol *>(pkt_buf);
+		evnt->supported_ai = 0;
+		evnt->speaker_info = 0;
+		evnt->num_of_audio_block = 0;
 
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_get_hw_info_reply) + sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		if (pkt->unk1 && pkt->unk1 != 5U)
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-			return;
-		}
-
-		sys_uart.notice("[av_video_ytrapcontrol_cmd] unk1=0x%04x unk2=0x%04x", pkt->unk1, pkt->unk2);
-
-		vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct av_audio_mute_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_av_audio_mute);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_av_audio_mute *>(pkt_buf);
-
-		if (pkt->avport == static_cast<u16>(UartAudioAvport::AVMULTI_1))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_INVALID_PORT);
-			return;
-		}
-
-		if ((pkt->avport > static_cast<u16>(UartAudioAvport::HDMI_1) && pkt->avport != static_cast<u16>(UartAudioAvport::AVMULTI_0)) ||
-			(pkt->avport == static_cast<u16>(UartAudioAvport::HDMI_1) && !g_cfg.core.debug_console_mode))
-		{
-			vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SYSCON_COMMUNICATE_FAIL);
-			return;
-		}
-
-		g_fxo->get<rsx_audio_data>().update_av_mute_state(vuart.avport_to_idx(static_cast<UartAudioAvport>(pkt->avport.get())), true, false, pkt->mute);
-
-		vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct av_acp_ctrl_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_acp_ctrl);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_acp_ctrl *>(pkt_buf);
-
-		if (pkt->avport > static_cast<u8>(UartAudioAvport::HDMI_1) ||
-			(pkt->avport == static_cast<u8>(UartAudioAvport::HDMI_1) && !g_cfg.core.debug_console_mode))
-		{
-			vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_INVALID_PORT);
-			return;
-		}
-
-		sys_uart.notice("[av_acp_ctrl_cmd] HDMI_%u data island ctrl pkt ctrl=0x%02x", pkt->avport, pkt->packetctl);
-
-		vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct av_set_acp_packet_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_set_acp_packet);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_set_acp_packet *>(pkt_buf);
-
-		if (pkt->avport > static_cast<u8>(UartAudioAvport::HDMI_1) ||
-			(pkt->avport == static_cast<u8>(UartAudioAvport::HDMI_1) && !g_cfg.core.debug_console_mode) ||
-			(pkt->pkt_type > 0x0A && pkt->pkt_type < 0x81) ||
-			pkt->pkt_type > 0x85)
-		{
-			vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_INVALID_PORT);
-			return;
-		}
-
-		sys_uart.notice("[av_set_acp_packet_cmd] HDMI_%u data island pkt type=0x%02x", pkt->avport, pkt->pkt_type);
-
-		vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct av_add_signal_ctl_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_add_signal_ctl);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_add_signal_ctl *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		if (pkt->avport != static_cast<u16>(UartAudioAvport::AVMULTI_0))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_INVALID_PORT);
-			return;
-		}
-
-		sys_uart.notice("[av_add_signal_ctl_cmd] signal_ctl=0x%04x", pkt->signal_ctl);
-
-		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct av_set_cgms_wss_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_av_set_cgms_wss);
-	}
-
-	// Something related to copy control on AVMULTI.
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_av_set_cgms_wss *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		if (pkt->avport != static_cast<u16>(UartAudioAvport::AVMULTI_0))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_INVALID_PORT);
-			return;
-		}
-
-		sys_uart.notice("[av_set_cgms_wss_cmd] cgms_wss=0x%08x", pkt->cgms_wss);
-
-		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
+		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS, evnt.get(), sizeof(ps3av_get_monitor_info_reply));
+		return true;
 	}
 };
 
@@ -624,1022 +65,31 @@ struct av_get_hw_conf_cmd : public ps3av_cmd
 {
 	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
 	{
-		return sizeof(ps3av_header);
+		return 8;
 	}
 
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
+	bool execute(vuart_av_thread &vuart, const void *pkt_buf, u32 reply_max_size) override
 	{
-		const auto pkt = static_cast<const ps3av_header *>(pkt_buf);
+		auto pkt = static_cast<const ps3av_header *>(pkt_buf);
 
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_get_hw_info_reply) + sizeof(ps3av_pkt_reply_hdr))
+		if (reply_max_size < sizeof(ps3av_get_hw_info_reply) + sizeof(ps3av_pkt_reply_hdr))
 		{
 			vuart.write_resp(pkt->cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		ps3av_get_hw_info_reply out{};
-		out.num_of_hdmi = g_cfg.core.debug_console_mode ? 2 : 1;
-		out.num_of_avmulti = 1;
-		out.num_of_spdif = 1;
-		out.extra_bistream_support = 1;
-
-		vuart.write_resp(pkt->cid, PS3AV_STATUS_SUCCESS, &out, sizeof(ps3av_get_hw_info_reply));
-	}
-};
-
-struct av_set_hdmi_mode_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_set_hdmi_mode);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_set_hdmi_mode *>(pkt_buf);
-
-		if (pkt->mode != PS3AV_HDMI_BEHAVIOR_NORMAL)
-		{
-			if ((pkt->mode & PS3AV_HDMI_BEHAVIOR_HDCP_OFF) && !g_cfg.core.debug_console_mode)
-			{
-				vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_UNSUPPORTED_HDMI_MODE);
-				return;
-			}
-
-			if (pkt->mode & ~(PS3AV_HDMI_BEHAVIOR_HDCP_OFF | PS3AV_HDMI_BEHAVIOR_EDID_PASS | PS3AV_HDMI_BEHAVIOR_DVI))
-			{
-				sys_uart.warning("[av_set_hdmi_mode_cmd] Unknown bits in hdmi mode: 0x%02x", pkt->mode);
-			}
-		}
-
-		vuart.hdmi_behavior_mode = pkt->mode;
-
-		vuart.add_hdmi_events(UartHdmiEvent::UNPLUGGED, vuart.hdmi_res_set[0] ? UartHdmiEvent::HDCP_DONE : UartHdmiEvent::PLUGGED, true, false);
-		vuart.add_hdmi_events(UartHdmiEvent::UNPLUGGED, vuart.hdmi_res_set[1] ? UartHdmiEvent::HDCP_DONE : UartHdmiEvent::PLUGGED, false, true);
-		vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct av_get_cec_status_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_header);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_header *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_av_get_cec_config_reply) + sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		const ps3av_pkt_av_get_cec_config_reply reply{1};
-		vuart.write_resp(pkt->cid, PS3AV_STATUS_SUCCESS, &reply, sizeof(ps3av_pkt_av_get_cec_config_reply));
-	}
-};
-
-struct video_init_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_header);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_header *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		vuart.write_resp(pkt->cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct video_set_format_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_video_format);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_video_format *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		if (pkt->video_head > PS3AV_HEAD_B_ANALOG || pkt->video_order > 1 || pkt->video_format > 16)
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_INVALID_VIDEO_PARAM);
-			return;
-		}
-
-		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct video_set_route_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return 24;
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_header *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		vuart.write_resp(pkt->cid, PS3AV_STATUS_NO_SEL); // Only available in PS2_GX_LPAR
-	}
-};
-
-struct video_set_pitch_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_video_set_pitch);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_video_set_pitch *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		if (pkt->video_head > PS3AV_HEAD_B_ANALOG || (pkt->pitch & 7) != 0U || pkt->pitch > UINT16_MAX)
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_INVALID_VIDEO_PARAM);
-			return;
-		}
-
-		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct video_get_hw_cfg_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_header);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_header *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_video_get_hw_cfg_reply) + sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		ps3av_pkt_video_get_hw_cfg_reply reply{};
-		reply.gx_available = 0; // Set to 1 only in PS2_GX_LPAR
-
-		vuart.write_resp(pkt->cid, PS3AV_STATUS_SUCCESS, &reply, sizeof(ps3av_pkt_video_get_hw_cfg_reply));
-	}
-};
-
-struct audio_init_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_header);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_header *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		g_fxo->get<rsx_audio_data>().reset_hw();
-
-		vuart.write_resp(pkt->cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct audio_set_mode_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_audio_mode);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_audio_mode *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		if (!set_mode(*pkt))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_INVALID_AUDIO_PARAM);
-		}
-		else
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-		}
-	}
-
-private:
-
-	bool set_mode(const ps3av_pkt_audio_mode& pkt)
-	{
-		bool spdif_use_serial_buf = false;
-		RsxaudioPort avport_src, rsxaudio_port;
-		RsxaudioAvportIdx avport_idx;
-
-		switch (pkt.avport)
-		{
-		case UartAudioAvport::HDMI_0:
-		{
-			avport_idx = RsxaudioAvportIdx::HDMI_0;
-			if (pkt.audio_source == UartAudioSource::SPDIF)
-			{
-				avport_src = rsxaudio_port = RsxaudioPort::SPDIF_1;
-			}
-			else
-			{
-				avport_src = rsxaudio_port = RsxaudioPort::SERIAL;
-			}
-			break;
-		}
-		case UartAudioAvport::HDMI_1:
-		{
-			avport_idx = RsxaudioAvportIdx::HDMI_1;
-			if (pkt.audio_source == UartAudioSource::SPDIF)
-			{
-				avport_src = rsxaudio_port = RsxaudioPort::SPDIF_1;
-			}
-			else
-			{
-				avport_src = rsxaudio_port = RsxaudioPort::SERIAL;
-			}
-			break;
-		}
-		case UartAudioAvport::AVMULTI_0:
-		{
-			avport_idx = RsxaudioAvportIdx::AVMULTI;
-			avport_src = rsxaudio_port = RsxaudioPort::SERIAL;
-			break;
-		}
-		case UartAudioAvport::SPDIF_0:
-		{
-			avport_idx    = RsxaudioAvportIdx::SPDIF_0;
-			rsxaudio_port = RsxaudioPort::SPDIF_0;
-			if (pkt.audio_source == UartAudioSource::SERIAL)
-			{
-				spdif_use_serial_buf = true;
-				avport_src           = RsxaudioPort::SERIAL;
-			}
-			else
-			{
-				avport_src = RsxaudioPort::SPDIF_0;
-			}
-
-			break;
-		}
-		case UartAudioAvport::SPDIF_1:
-		{
-			avport_idx    = RsxaudioAvportIdx::SPDIF_1;
-			rsxaudio_port = RsxaudioPort::SPDIF_1;
-			if (pkt.audio_source == UartAudioSource::SERIAL)
-			{
-				spdif_use_serial_buf = true;
-				avport_src           = RsxaudioPort::SERIAL;
-			}
-			else
-			{
-				avport_src = RsxaudioPort::SPDIF_1;
-			}
-
-			break;
-		}
-		default:
-		{
 			return false;
 		}
-		}
 
-		if (static_cast<u32>(pkt.audio_fs.value()) > static_cast<u32>(UartAudioFreq::_192K)) return false;
-
-		const auto bit_cnt = [&]()
-		{
-			if ((rsxaudio_port != RsxaudioPort::SERIAL && pkt.audio_format != UartAudioFormat::PCM) ||
-				pkt.audio_word_bits == UartAudioSampleSize::_16BIT)
-			{
-				return UartAudioSampleSize::_16BIT;
-			}
-			else
-			{
-				return UartAudioSampleSize::_24BIT;
-			}
-		}();
-
-		return commit_param(rsxaudio_port, avport_idx, avport_src, pkt.audio_fs, bit_cnt, spdif_use_serial_buf, pkt.audio_cs_info);
-	}
-
-	bool commit_param(RsxaudioPort rsxaudio_port, RsxaudioAvportIdx avport, RsxaudioPort avport_src, UartAudioFreq freq,
-						UartAudioSampleSize bit_cnt, bool spdif_use_serial_buf, const u8 *cs_data)
-	{
-		auto& rsxaudio_thread = g_fxo->get<rsx_audio_data>();
-		const auto avport_idx = static_cast<std::underlying_type_t<decltype(avport)>>(avport);
-		const auto rsxaudio_word_depth = bit_cnt == UartAudioSampleSize::_16BIT ? RsxaudioSampleSize::_16BIT : RsxaudioSampleSize::_32BIT;
-		const auto freq_param = [&]()
-		{
-			switch (freq)
-			{
-			case UartAudioFreq::_44K:  return std::make_pair(8, SYS_RSXAUDIO_FREQ_BASE_352K);
-			default:
-			case UartAudioFreq::_48K:  return std::make_pair(8, SYS_RSXAUDIO_FREQ_BASE_384K);
-			case UartAudioFreq::_88K:  return std::make_pair(4, SYS_RSXAUDIO_FREQ_BASE_352K);
-			case UartAudioFreq::_96K:  return std::make_pair(4, SYS_RSXAUDIO_FREQ_BASE_384K);
-			case UartAudioFreq::_176K: return std::make_pair(2, SYS_RSXAUDIO_FREQ_BASE_352K);
-			case UartAudioFreq::_192K: return std::make_pair(2, SYS_RSXAUDIO_FREQ_BASE_384K);
-			}
-		}();
-
-		switch (rsxaudio_port)
-		{
-		case RsxaudioPort::SERIAL:
-		{
-			rsxaudio_thread.update_hw_param([&](auto& obj)
-			{
-				obj.serial_freq_base = freq_param.second;
-				obj.serial.freq_div = freq_param.first;
-				obj.serial.depth = rsxaudio_word_depth;
-				obj.serial.buf_empty_en = true;
-				obj.avport_src[avport_idx] = avport_src;
-			});
-			break;
-		}
-		case RsxaudioPort::SPDIF_0:
-		case RsxaudioPort::SPDIF_1:
-		{
-			const u8 spdif_idx = rsxaudio_port == RsxaudioPort::SPDIF_1;
-
-			rsxaudio_thread.update_hw_param([&](auto& obj)
-			{
-				obj.spdif_freq_base = freq_param.second;
-				obj.spdif[spdif_idx].freq_div = freq_param.first;
-				obj.spdif[spdif_idx].depth = rsxaudio_word_depth;
-				obj.spdif[spdif_idx].use_serial_buf = spdif_use_serial_buf;
-				obj.spdif[spdif_idx].buf_empty_en = true;
-				obj.avport_src[avport_idx] = avport_src;
-				memcpy(obj.spdif[spdif_idx].cs_data.data(), cs_data, sizeof(obj.spdif[spdif_idx].cs_data));
-			});
-			break;
-		}
-		default:
-		{
-			return false;
-		}
-		}
+		// TODO:
+		auto out = std::make_unique<ps3av_get_hw_info_reply>();
+		out->num_of_hdmi = 1;
+		out->num_of_avmulti = 0;
+		out->num_of_spdif = 1;
+		out->resv = 0;
 
+		vuart.write_resp(pkt->cid, PS3AV_STATUS_SUCCESS, out.get(), sizeof(ps3av_get_hw_info_reply));
 		return true;
 	}
 };
 
-struct audio_mute_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		// From RE
-		return 0;
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_audio_mute *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		switch (pkt->avport)
-		{
-		case UartAudioAvport::HDMI_0:
-		case UartAudioAvport::HDMI_1:
-		case UartAudioAvport::AVMULTI_0:
-		case UartAudioAvport::AVMULTI_1:
-			g_fxo->get<rsx_audio_data>().update_mute_state(RsxaudioPort::SERIAL, pkt->mute);
-			break;
-		case UartAudioAvport::SPDIF_0:
-			g_fxo->get<rsx_audio_data>().update_mute_state(RsxaudioPort::SPDIF_0, pkt->mute);
-			break;
-		case UartAudioAvport::SPDIF_1:
-			g_fxo->get<rsx_audio_data>().update_mute_state(RsxaudioPort::SPDIF_1, pkt->mute);
-			break;
-		default:
-			break;
-		}
-
-		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct audio_set_active_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_audio_set_active);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_audio_set_active *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		const bool requested_avports[SYS_RSXAUDIO_AVPORT_CNT] =
-		{
-			(pkt->audio_port & PS3AV_AUDIO_PORT_HDMI_0) != 0U,
-			(pkt->audio_port & PS3AV_AUDIO_PORT_HDMI_1) != 0U,
-			(pkt->audio_port & PS3AV_AUDIO_PORT_AVMULTI) != 0U,
-			(pkt->audio_port & PS3AV_AUDIO_PORT_SPDIF_0) != 0U,
-			(pkt->audio_port & PS3AV_AUDIO_PORT_SPDIF_1) != 0U
-		};
-
-		g_fxo->get<rsx_audio_data>().update_hw_param([&](auto &obj)
-		{
-			for (u8 avport_idx = 0; avport_idx < SYS_RSXAUDIO_AVPORT_CNT; avport_idx++)
-			{
-				if (requested_avports[avport_idx])
-				{
-					switch (obj.avport_src[avport_idx])
-					{
-					case RsxaudioPort::SERIAL:
-						obj.serial.en = true;
-						break;
-					case RsxaudioPort::SPDIF_0:
-					case RsxaudioPort::SPDIF_1:
-					{
-						const u8 spdif_idx = obj.avport_src[avport_idx] == RsxaudioPort::SPDIF_1;
-						if (!obj.spdif[spdif_idx].use_serial_buf)
-						{
-							obj.spdif[spdif_idx].en = true;
-						}
-						break;
-					}
-					default:
-						break;
-					}
-				}
-			}
-
-			obj.serial.muted = false;
-			obj.spdif[1].muted = false;
-		});
-
-		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct audio_set_inactive_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_audio_set_active);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_audio_set_active *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		g_fxo->get<rsx_audio_data>().update_hw_param([&](auto &obj)
-		{
-			if ((pkt->audio_port & 0x8000'0000) == 0U)
-			{
-				obj.avport_src.fill(RsxaudioPort::INVALID);
-			}
-
-			obj.serial.en = false;
-			obj.serial.muted = true;
-			obj.spdif[1].muted = true;
-			for (u8 spdif_idx = 0; spdif_idx < SYS_RSXAUDIO_SPDIF_CNT; spdif_idx++)
-			{
-				if (!obj.spdif[spdif_idx].use_serial_buf)
-				{
-					obj.spdif[spdif_idx].en = false;
-				}
-			}
-		});
-
-		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct audio_spdif_bit_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_audio_spdif_bit);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_audio_spdif_bit *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		const bool requested_avports[SYS_RSXAUDIO_AVPORT_CNT] =
-		{
-			(pkt->audio_port & PS3AV_AUDIO_PORT_HDMI_0) != 0U,
-			(pkt->audio_port & PS3AV_AUDIO_PORT_HDMI_1) != 0U,
-			(pkt->audio_port & PS3AV_AUDIO_PORT_AVMULTI) != 0U,
-			(pkt->audio_port & PS3AV_AUDIO_PORT_SPDIF_0) != 0U,
-			(pkt->audio_port & PS3AV_AUDIO_PORT_SPDIF_1) != 0U
-		};
-
-		g_fxo->get<rsx_audio_data>().update_hw_param([&](auto &obj)
-		{
-			for (u8 avport_idx = 0; avport_idx < SYS_RSXAUDIO_AVPORT_CNT; avport_idx++)
-			{
-				if (requested_avports[avport_idx] && obj.avport_src[avport_idx] == RsxaudioPort::SPDIF_0)
-				{
-					auto &b_data = pkt->spdif_bit_data;
-
-					sys_uart.notice("[audio_spdif_bit_cmd] Data 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x",
-									b_data[0], b_data[1], b_data[2], b_data[3], b_data[4], b_data[5], b_data[6], b_data[7],
-									b_data[8], b_data[9], b_data[10], b_data[11]);
-					break;
-				}
-			}
-		});
-
-		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct audio_ctrl_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
-	{
-		return sizeof(ps3av_pkt_audio_ctrl);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_audio_ctrl *>(pkt_buf);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		switch (pkt->audio_ctrl_id)
-		{
-		case UartAudioCtrlID::DAC_RESET:
-		case UartAudioCtrlID::DAC_DE_EMPHASIS:
-		case UartAudioCtrlID::AVCLK:
-			sys_uart.notice("[audio_ctrl_cmd] Option 0x%x", pkt->audio_ctrl_id);
-			break;
-		default:
-			break;
-		}
-
-		vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-	}
-};
-
-struct inc_avset_cmd : public ps3av_cmd
-{
-	u16 get_size(vuart_av_thread& /*vuart*/, const void* pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_inc_avset *>(pkt_buf);
-
-		if (pkt->num_of_video_pkt > 2 || pkt->num_of_av_video_pkt > 4 || pkt->num_of_av_audio_pkt > 4)
-		{
-			return -1;
-		}
-
-		const auto data_start = static_cast<const u8 *>(pkt_buf) + sizeof(ps3av_pkt_inc_avset);
-
-		u64 video_pkt_sec_size = 0;
-		u64 av_video_pkt_sec_size = 0;
-		u64 av_audio_pkt_sec_size = 0;
-
-		for (u16 pkt_idx = 0; pkt_idx < pkt->num_of_video_pkt; pkt_idx++)
-		{
-			video_pkt_sec_size += reinterpret_cast<const ps3av_header *>(&data_start[video_pkt_sec_size])->length + 4ULL;
-		}
-
-		for (u16 pkt_idx = 0; pkt_idx < pkt->num_of_av_video_pkt; pkt_idx++)
-		{
-			av_video_pkt_sec_size += reinterpret_cast<const ps3av_header *>(&data_start[video_pkt_sec_size + av_video_pkt_sec_size])->length + 4ULL;
-		}
-
-		for (u16 pkt_idx = 0; pkt_idx < pkt->num_of_av_audio_pkt; pkt_idx++)
-		{
-			av_audio_pkt_sec_size += reinterpret_cast<const ps3av_header *>(&data_start[video_pkt_sec_size + av_video_pkt_sec_size + av_audio_pkt_sec_size])->length + 4ULL;
-		}
-
-		return static_cast<u16>(sizeof(ps3av_pkt_inc_avset) + video_pkt_sec_size + av_video_pkt_sec_size + av_audio_pkt_sec_size);
-	}
-
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
-	{
-		const auto pkt = static_cast<const ps3av_pkt_inc_avset *>(pkt_buf);
-		auto pkt_data_addr = static_cast<const u8 *>(pkt_buf) + sizeof(ps3av_pkt_inc_avset);
-
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
-		}
-
-		bool syscon_check_passed = true;
-
-		// Video
-		u32 video_cmd_status = PS3AV_STATUS_SUCCESS;
-		for (u32 video_pkt_idx = 0; video_pkt_idx < pkt->num_of_video_pkt; ++video_pkt_idx)
-		{
-			const auto video_pkt = reinterpret_cast<const ps3av_pkt_video_mode *>(pkt_data_addr);
-			const u32 subcmd_status = video_pkt_parse(*video_pkt);
-
-			if (video_pkt->video_head == PS3AV_HEAD_B_ANALOG)
-			{
-				vuart.head_b_initialized = true;
-			}
-
-			if (subcmd_status != PS3AV_STATUS_SUCCESS)
-			{
-				video_cmd_status = subcmd_status;
-			}
-
-			pkt_data_addr += video_pkt->hdr.length + 4ULL;
-		}
-
-		if (pkt->num_of_av_video_pkt == 0U && pkt->num_of_av_audio_pkt == 0U)
-		{
-			vuart.write_resp(pkt->hdr.cid, video_cmd_status);
-			return;
-		}
-
-		bool hdcp_done[2]{};
-
-		// AV Video
-		for (u32 video_av_pkt_idx = 0; video_av_pkt_idx < pkt->num_of_av_video_pkt; video_av_pkt_idx++)
-		{
-			const auto av_video_pkt = reinterpret_cast<const ps3av_pkt_av_video_cs *>(pkt_data_addr);
-			const av_video_resp subcmd_resp = av_video_pkt_parse(*av_video_pkt, syscon_check_passed);
-
-			if (subcmd_resp.status != PS3AV_STATUS_SUCCESS)
-			{
-				vuart.write_resp(pkt->hdr.cid, subcmd_resp.status);
-				return;
-			}
-
-			if (syscon_check_passed)
-			{
-				hdcp_done[0] |= subcmd_resp.hdcp_done_event[0];
-				hdcp_done[1] |= subcmd_resp.hdcp_done_event[1];
-			}
-
-			pkt_data_addr += av_video_pkt->hdr.length + 4ULL;
-		}
-
-		vuart.hdmi_res_set[0] = hdcp_done[0];
-		vuart.hdmi_res_set[1] = hdcp_done[1];
-		vuart.add_hdmi_events(UartHdmiEvent::HDCP_DONE, vuart.hdmi_res_set[0], vuart.hdmi_res_set[1]);
-
-		if (vuart.hdmi_res_set[0])
-		{
-			g_fxo->get<rsx_audio_data>().update_av_mute_state(RsxaudioAvportIdx::HDMI_0, false, true);
-		}
-		if (vuart.hdmi_res_set[1])
-		{
-			g_fxo->get<rsx_audio_data>().update_av_mute_state(RsxaudioAvportIdx::HDMI_1, false, true);
-		}
-
-		bool valid_av_audio_pkt = false;
-
-		// AV Audio
-		for (u32 audio_av_pkt_idx = 0; audio_av_pkt_idx < pkt->num_of_av_audio_pkt; audio_av_pkt_idx++)
-		{
-			const auto av_audio_pkt = reinterpret_cast<const ps3av_pkt_av_audio_param *>(pkt_data_addr);
-
-			if (av_audio_pkt->avport <= static_cast<u16>(UartAudioAvport::HDMI_1))
-			{
-				valid_av_audio_pkt = true;
-
-				if (!syscon_check_passed || (av_audio_pkt->avport == static_cast<u16>(UartAudioAvport::HDMI_1) && !g_cfg.core.debug_console_mode))
-				{
-					syscon_check_passed = false;
-					break;
-				}
-
-				const u8 hdmi_idx = av_audio_pkt->avport == static_cast<u16>(UartAudioAvport::HDMI_1);
-
-				g_fxo->get<rsx_audio_data>().update_hw_param([&](auto &obj)
-				{
-					auto &hdmi = obj.hdmi[hdmi_idx];
-					hdmi.init = true;
-
-					const std::array<u8, SYS_RSXAUDIO_SERIAL_STREAM_CNT> fifomap =
-					{
-						static_cast<u8>((av_audio_pkt->fifomap >> 0) & 3U),
-						static_cast<u8>((av_audio_pkt->fifomap >> 2) & 3U),
-						static_cast<u8>((av_audio_pkt->fifomap >> 4) & 3U),
-						static_cast<u8>((av_audio_pkt->fifomap >> 6) & 3U)
-					};
-
-					const std::array<bool, SYS_RSXAUDIO_SERIAL_STREAM_CNT> en_streams =
-					{
-						static_cast<bool>(av_audio_pkt->enable & 0x10),
-						static_cast<bool>(av_audio_pkt->enable & 0x20),
-						static_cast<bool>(av_audio_pkt->enable & 0x40),
-						static_cast<bool>(av_audio_pkt->enable & 0x80)
-					};
-
-					// Might be wrong
-					const std::array<bool, SYS_RSXAUDIO_SERIAL_STREAM_CNT> swap_lr =
-					{
-						static_cast<bool>(av_audio_pkt->swaplr & 0x10),
-						static_cast<bool>(av_audio_pkt->swaplr & 0x20),
-						static_cast<bool>(av_audio_pkt->swaplr & 0x40),
-						static_cast<bool>(av_audio_pkt->swaplr & 0x80)
-					};
-
-					memcpy(hdmi.info_frame.data(), av_audio_pkt->info, sizeof(av_audio_pkt->info));
-					memcpy(hdmi.chstat.data(), av_audio_pkt->chstat, sizeof(av_audio_pkt->chstat));
-
-					hdmi.ch_cfg = hdmi_param_conv(fifomap, en_streams, swap_lr);
-				});
-			}
-
-			pkt_data_addr += av_audio_pkt->hdr.length + 4ULL;
-		}
-
-		if (pkt->num_of_av_video_pkt || valid_av_audio_pkt)
-		{
-			if (!syscon_check_passed)
-			{
-				vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SYSCON_COMMUNICATE_FAIL);
-				return;
-			}
-
-			vuart.write_resp<true>(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-		}
-		else
-		{
-			vuart.write_resp(pkt->hdr.cid, PS3AV_STATUS_SUCCESS);
-		}
-	}
-
-private:
-
-	struct video_sce_param
-	{
-		u32 width_div;
-		u32 width;
-		u32 height;
-	};
-
-	struct av_video_resp
-	{
-		u32 status = PS3AV_STATUS_SUCCESS;
-		bool hdcp_done_event[2]{};
-	};
-
-	u32 video_pkt_parse(const ps3av_pkt_video_mode &video_head_cfg)
-	{
-		static constexpr video_sce_param sce_param_arr[28] =
-		{
-			{ 0, 0,    0    },
-			{ 4, 2880, 480  },
-			{ 4, 2880, 480  },
-			{ 4, 2880, 576  },
-			{ 4, 2880, 576  },
-			{ 2, 1440, 480  },
-			{ 2, 1440, 576  },
-			{ 1, 1920, 1080 },
-			{ 1, 1920, 1080 },
-			{ 1, 1920, 1080 },
-			{ 1, 1280, 720  },
-			{ 1, 1280, 720  },
-			{ 1, 1920, 1080 },
-			{ 1, 1920, 1080 },
-			{ 1, 1920, 1080 },
-			{ 1, 1920, 1080 },
-			{ 1, 1280, 768  },
-			{ 1, 1280, 1024 },
-			{ 1, 1920, 1200 },
-			{ 1, 1360, 768  },
-			{ 1, 1280, 1470 },
-			{ 1, 1280, 1470 },
-			{ 1, 1920, 1080 },
-			{ 1, 1920, 2205 },
-			{ 1, 1920, 2205 },
-			{ 1, 1280, 721  },
-			{ 1, 720,  481  },
-			{ 1, 720,  577  }
-		};
-
-		const auto sce_idx = [&]() -> u8
-		{
-			switch (video_head_cfg.video_vid)
-			{
-			case 16: return 1;
-			case 1:  return 2;
-			case 3:  return 4;
-			case 17: return 4;
-			case 5:  return 5;
-			case 6:  return 6;
-			case 18: return 7;
-			case 7:  return 8;
-			case 33: return 8;
-			case 8:  return 9;
-			case 34: return 9;
-			case 9:  return 10;
-			case 31: return 10;
-			case 10: return 11;
-			case 32: return 11;
-			case 11: return 12;
-			case 35: return 12;
-			case 37: return 12;
-			case 12: return 13;
-			case 36: return 13;
-			case 38: return 13;
-			case 19: return 14;
-			case 20: return 15;
-			case 13: return 16;
-			case 14: return 17;
-			case 15: return 18;
-			case 21: return 19;
-			case 22: return 20;
-			case 27: return 20;
-			case 23: return 21;
-			case 28: return 21;
-			case 24: return 22;
-			case 25: return 23;
-			case 29: return 23;
-			case 26: return 24;
-			case 30: return 24;
-			case 39: return 25;
-			case 40: return 26;
-			case 41: return 27;
-			default: return umax;
-			}
-		}();
-
-		const video_sce_param &sce_param = sce_param_arr[sce_idx];
-		if (sce_idx == umax ||
-			video_head_cfg.video_head > PS3AV_HEAD_B_ANALOG ||
-			video_head_cfg.video_order > 1 ||
-			video_head_cfg.video_format > 16 ||
-			video_head_cfg.video_out_format > 16 ||
-			((1ULL << video_head_cfg.video_out_format) & 0x1CE07) == 0U ||
-			video_head_cfg.unk2 > 3 ||
-			video_head_cfg.pitch & 7 ||
-			video_head_cfg.pitch > UINT16_MAX ||
-			(video_head_cfg.width != 1280U && ((video_head_cfg.width & 7) != 0U || video_head_cfg.width > UINT16_MAX)) ||
-			(sce_param.width != 720 && video_head_cfg.width > sce_param.width / sce_param.width_div) ||
-			!((video_head_cfg.height == 1470U && (sce_param.height == 721 || sce_param.height == 481 || sce_param.height == 577)) || (video_head_cfg.height <= sce_param.height && video_head_cfg.height <= UINT16_MAX)))
-		{
-			return PS3AV_STATUS_INVALID_VIDEO_PARAM;
-		}
-
-		sys_uart.notice("[inc_avset_cmd] new resolution on HEAD_%c width=%u height=%u", video_head_cfg.video_head == PS3AV_HEAD_A_HDMI ? 'A' : 'B', video_head_cfg.width, video_head_cfg.height);
-
-		return PS3AV_STATUS_SUCCESS;
-	}
-
-	av_video_resp av_video_pkt_parse(const ps3av_pkt_av_video_cs &pkt, bool &syscon_pkt_valid)
-	{
-		if (pkt.avport <= static_cast<u16>(UartAudioAvport::HDMI_1))
-		{
-			if (pkt.av_vid > 23)
-			{
-				return {PS3AV_STATUS_INVALID_AV_PARAM};
-			}
-
-			if (pkt.avport == static_cast<u16>(UartAudioAvport::HDMI_1) && !g_cfg.core.debug_console_mode)
-			{
-				syscon_pkt_valid = false;
-			}
-			else if (syscon_pkt_valid)
-			{
-				// HDMI setup, code 0x80
-
-				av_video_resp resp{};
-				resp.hdcp_done_event[pkt.avport] = true;
-				return resp;
-			}
-		}
-		else
-		{
-			if ((pkt.avport != static_cast<u16>(UartAudioAvport::AVMULTI_0) && pkt.avport != static_cast<u16>(UartAudioAvport::AVMULTI_1)) ||
-				pkt.av_vid > 23 ||
-				(pkt.av_vid > 12 && pkt.av_vid != 18U))
-			{
-				return {PS3AV_STATUS_INVALID_AV_PARAM};
-			}
-
-			if (pkt.avport == static_cast<u16>(UartAudioAvport::AVMULTI_1))
-			{
-				syscon_pkt_valid = false;
-			}
-			else if (syscon_pkt_valid)
-			{
-				// AVMULTI setup
-			}
-		}
-
-		return {};
-	}
-
-	static rsxaudio_hw_param_t::hdmi_param_t::hdmi_ch_cfg_t hdmi_param_conv(const std::array<u8, SYS_RSXAUDIO_SERIAL_STREAM_CNT> &map,
-                                                                            const std::array<bool, SYS_RSXAUDIO_SERIAL_STREAM_CNT> &en,
-                                                                            const std::array<bool, SYS_RSXAUDIO_SERIAL_STREAM_CNT> &swap)
-	{
-		std::array<u8, SYS_RSXAUDIO_SERIAL_MAX_CH> result{};
-		u8 ch_cnt = 0;
-
-		for (usz stream_idx = 0; stream_idx < SYS_RSXAUDIO_SERIAL_STREAM_CNT; stream_idx++)
-		{
-			const u8 stream_pos = map[stream_idx];
-			if (en[stream_pos])
-			{
-				result[stream_idx * 2 + 0] = stream_pos * 2 + swap[stream_pos];
-				result[stream_idx * 2 + 1] = stream_pos * 2 + !swap[stream_pos];
-				ch_cnt = static_cast<u8>((stream_idx + 1) * 2);
-			}
-			else
-			{
-				result[stream_idx * 2 + 0] = rsxaudio_hw_param_t::hdmi_param_t::MAP_SILENT_CH;
-				result[stream_idx * 2 + 1] = rsxaudio_hw_param_t::hdmi_param_t::MAP_SILENT_CH;
-			}
-		}
-
-		const AudioChannelCnt ch_cnt_conv = [&]()
-		{
-			switch (ch_cnt)
-			{
-			default:
-			case 0:
-			case 2:
-				return AudioChannelCnt::STEREO;
-			case 4:
-			case 6:
-				return AudioChannelCnt::SURROUND_5_1;
-			case 8:
-				return AudioChannelCnt::SURROUND_7_1;
-			}
-		}();
-
-		return { result, ch_cnt_conv };
-	}
-};
-
 struct generic_reply_cmd : public ps3av_cmd
 {
 	u16 get_size(vuart_av_thread& /*vuart*/, const void* /*pkt_buf*/) override
@@ -1647,19 +97,18 @@ struct generic_reply_cmd : public ps3av_cmd
 		return 0;
 	}
 
-	void execute(vuart_av_thread &vuart, const void *pkt_buf) override
+	bool execute(vuart_av_thread &vuart, const void *pkt_buf, u32 reply_max_size) override
 	{
-		const auto pkt = static_cast<const ps3av_header *>(pkt_buf);
+		auto pkt = static_cast<const ps3av_header *>(pkt_buf);
 
-		if (vuart.get_reply_buf_free_size() < sizeof(ps3av_pkt_reply_hdr))
+		if (reply_max_size < sizeof(ps3av_pkt_reply_hdr))
 		{
 			vuart.write_resp(pkt->cid, PS3AV_STATUS_BUFFER_OVERFLOW);
-			return;
+			return false;
 		}
 
-		sys_uart.todo("Unimplemented cid=0x%08x", pkt->cid);
-
 		vuart.write_resp(pkt->cid, PS3AV_STATUS_SUCCESS);
+		return true;
 	}
 };
 
@@ -1669,11 +118,6 @@ error_code sys_uart_initialize(ppu_thread &ppu)
 
 	sys_uart.trace("sys_uart_initialize()");
 
-	if (!g_ps3_process_info.has_root_perm())
-	{
-		return CELL_ENOSYS;
-	}
-
 	auto &vuart_thread = g_fxo->get<vuart_av>();
 
 	if (vuart_thread.initialized.test_and_set())
@@ -1688,17 +132,12 @@ error_code sys_uart_receive(ppu_thread &ppu, vm::ptr<void> buffer, u64 size, u32
 {
 	sys_uart.trace("sys_uart_receive(buffer=*0x%x, size=0x%llx, mode=0x%x)", buffer, size, mode);
 
-	if (!g_ps3_process_info.has_root_perm())
-	{
-		return CELL_ENOSYS;
-	}
-
 	if (!size)
 	{
 		return CELL_OK;
 	}
 
-	if (mode & ~(BLOCKING_BIG_OP | NOT_BLOCKING_BIG_OP))
+	if ((mode & ~1UL) != 0)
 	{
 		return CELL_EINVAL;
 	}
@@ -1721,7 +160,7 @@ error_code sys_uart_receive(ppu_thread &ppu, vm::ptr<void> buffer, u64 size, u32
 
 	auto vuart_read = [&](u8 *buf, u32 buf_size) -> s32
 	{
-		constexpr u32 ITER_SIZE = 4096;
+		const u32 ITER_SIZE = 4096;
 		std::unique_lock lock(vuart_thread.rx_mutex, std::defer_lock);
 
 		if (!lock.try_lock())
@@ -1784,7 +223,7 @@ error_code sys_uart_receive(ppu_thread &ppu, vm::ptr<void> buffer, u64 size, u32
 		read_size = read_result;
 	}
 
-	if (!vm::check_addr(buffer.addr(), vm::page_writable, read_size))
+	if (!buffer || !vm::check_addr(buffer.addr(), vm::page_writable, read_size))
 	{
 		return CELL_EFAULT;
 	}
@@ -1797,17 +236,12 @@ error_code sys_uart_send(ppu_thread &ppu, vm::cptr<void> buffer, u64 size, u32 m
 {
 	sys_uart.trace("sys_uart_send(buffer=0x%x, size=0x%llx, mode=0x%x)", buffer, size, mode);
 
-	if (!g_ps3_process_info.has_root_perm())
-	{
-		return CELL_ENOSYS;
-	}
-
 	if (!size)
 	{
 		return CELL_OK;
 	}
 
-	if (mode & ~(BLOCKING_BIG_OP | NOT_BLOCKING_OP | NOT_BLOCKING_BIG_OP))
+	if ((mode & ~3ul) != 0)
 	{
 		return CELL_EINVAL;
 	}
@@ -1835,7 +269,7 @@ error_code sys_uart_send(ppu_thread &ppu, vm::cptr<void> buffer, u64 size, u32 m
 
 	std::unique_lock lock(vuart_thread.tx_mutex, std::defer_lock);
 
-	constexpr u32 ITER_SIZE = 4096;
+	const u32 ITER_SIZE = 4096;
 
 	if (mode & BLOCKING_BIG_OP)
 	{
@@ -1941,11 +375,6 @@ error_code sys_uart_get_params(vm::ptr<vuart_params> buffer)
 {
 	sys_uart.trace("sys_uart_get_params(buffer=0x%x)", buffer);
 
-	if (!g_ps3_process_info.has_root_perm())
-	{
-		return CELL_ENOSYS;
-	}
-
 	auto &vuart_thread = g_fxo->get<vuart_av>();
 
 	if (!vuart_thread.initialized)
@@ -1953,7 +382,7 @@ error_code sys_uart_get_params(vm::ptr<vuart_params> buffer)
 		return CELL_ESRCH;
 	}
 
-	if (!vm::check_addr(buffer.addr(), vm::page_writable, sizeof(vuart_params)))
+	if (!buffer || !vm::check_addr(buffer.addr(), vm::page_writable, sizeof(vuart_params)))
 	{
 		return CELL_EFAULT;
 	}
@@ -1968,59 +397,20 @@ void vuart_av_thread::operator()()
 {
 	while (thread_ctrl::state() != thread_state::aborting)
 	{
-		if (Emu.IsPausedOrReady())
-		{
-			thread_ctrl::wait_for(5000);
-			continue;
-		}
-
-		const u64 hdmi_event_dist[2] = { hdmi_event_handler[0].time_until_next(), hdmi_event_handler[1].time_until_next() };
-		bool update_dist = false;
-
-		if (hdmi_event_dist[0] == 0)
-		{
-			dispatch_hdmi_event(hdmi_event_handler[0].get_occured_event(), UartAudioAvport::HDMI_0);
-			update_dist |= hdmi_event_handler[0].events_available();
-		}
-
-		if (hdmi_event_dist[1] == 0)
-		{
-			dispatch_hdmi_event(hdmi_event_handler[1].get_occured_event(), UartAudioAvport::HDMI_1);
-			update_dist |= hdmi_event_handler[1].events_available();
-		}
-
-		if (update_dist)
-		{
-			continue;
-		}
-
-		const u64 wait_time = [&]()
-		{
-			if (hdmi_event_dist[0] != 0 && hdmi_event_dist[1] != 0)
-				return std::min(hdmi_event_dist[0], hdmi_event_dist[1]);
-			else
-				return std::max(hdmi_event_dist[0], hdmi_event_dist[1]);
-		}();
-
 		std::unique_lock<shared_mutex> lock(tx_wake_m);
 		if (!tx_buf.get_used_size())
 		{
-			tx_wake_c.wait_unlock(wait_time ? wait_time : -1, lock);
+			tx_wake_c.wait_unlock(-1, lock);
 		}
 		else
 		{
 			lock.unlock();
 		}
 
-		if (u32 read_size = read_tx_data(temp_tx_buf, PS3AV_TX_BUF_SIZE))
+		if (u32 read_size = read_tx_data(temp_tx_buf, sizeof(temp_tx_buf)))
 		{
 			parse_tx_buffer(read_size);
-
-			// Give vsh some time
-			thread_ctrl::wait_for(1000 * 100 / g_cfg.core.clocks_scale);
-
-			commit_rx_buf(false);
-			commit_rx_buf(true);
+			commit_rx_buf();
 		}
 	}
 }
@@ -2029,7 +419,7 @@ void vuart_av_thread::parse_tx_buffer(u32 buf_size)
 {
 	if (buf_size >= PS3AV_TX_BUF_SIZE)
 	{
-		while (read_tx_data(temp_tx_buf, PS3AV_TX_BUF_SIZE) >= PS3AV_TX_BUF_SIZE);
+		while (read_tx_data(temp_tx_buf, sizeof(temp_tx_buf)) >= PS3AV_TX_BUF_SIZE);
 		write_resp(reinterpret_cast<be_t<u16, 1>*>(temp_tx_buf)[3], PS3AV_STATUS_BUFFER_OVERFLOW);
 		return;
 	}
@@ -2051,7 +441,7 @@ void vuart_av_thread::parse_tx_buffer(u32 buf_size)
 		{
 			if (hdr->version >= 0x100 && hdr->version < PS3AV_VERSION)
 			{
-				sys_uart.todo("Unimplemented AV version: 0x%04x", hdr->version);
+				sys_uart.error("Unimplemented AV version: %x", hdr->version);
 			}
 
 			write_resp(static_cast<u16>(hdr->cid.get()), PS3AV_STATUS_INVALID_COMMAND);
@@ -2066,7 +456,7 @@ void vuart_av_thread::parse_tx_buffer(u32 buf_size)
 
 		if (!cmd.get())
 		{
-			sys_uart.error("Unknown AV cmd: 0x%08x", hdr->cid);
+			sys_uart.error("Unknown AV cmd: 0x%x", hdr->cid);
 			continue;
 		}
 
@@ -2074,20 +464,21 @@ void vuart_av_thread::parse_tx_buffer(u32 buf_size)
 
 		if (cmd_size != pkt_size && cmd_size)
 		{
-			sys_uart.error("Invalid size for cid=0x%x, expected=0x%x, got=0x%x", static_cast<const ps3av_header *>(pkt_storage)->cid, cmd_size, pkt_size);
 			write_resp(static_cast<u16>(hdr->cid.get()), PS3AV_STATUS_INVALID_SAMPLE_SIZE);
 			return;
 		}
 
-		cmd->execute(*this, pkt_storage);
+		if (!cmd->execute(*this, pkt_storage, sizeof(temp_rx_buf) - temp_rx_buf_size))
+		{
+			return;
+		}
 	}
+
+	// TODO: handle HDMI events
 }
 
 vuart_av_thread &vuart_av_thread::operator=(thread_state)
 {
-	{
-		std::lock_guard lock(tx_wake_m);
-	}
 	tx_wake_c.notify_all();
 	return *this;
 }
@@ -2095,7 +486,7 @@ vuart_av_thread &vuart_av_thread::operator=(thread_state)
 u32 vuart_av_thread::enque_tx_data(const void *data, u32 data_sz)
 {
 	std::unique_lock<shared_mutex> lock(tx_wake_m);
-	if (u32 size = static_cast<u32>(tx_buf.push(data, data_sz, true)))
+	if (auto size = tx_buf.push(data, data_sz))
 	{
 		lock.unlock();
 		tx_wake_c.notify_all();
@@ -2107,18 +498,18 @@ u32 vuart_av_thread::enque_tx_data(const void *data, u32 data_sz)
 
 u32 vuart_av_thread::get_tx_bytes()
 {
-	return static_cast<u32>(tx_buf.get_used_size());
+	return tx_buf.get_used_size();
 }
 
 u32 vuart_av_thread::read_rx_data(void *data, u32 data_sz)
 {
-	return static_cast<u32>(rx_buf.pop(data, data_sz, true));
+	return rx_buf.pop(data, data_sz);
 }
 
 u32 vuart_av_thread::read_tx_data(void *data, u32 data_sz)
 {
 	std::unique_lock<shared_mutex> lock(tx_rdy_m);
-	if (u32 size = static_cast<u32>(tx_buf.pop(data, data_sz, true)))
+	if (auto size = tx_buf.pop(data, data_sz))
 	{
 		lock.unlock();
 		tx_rdy_c.notify_all();
@@ -2127,35 +518,22 @@ u32 vuart_av_thread::read_tx_data(void *data, u32 data_sz)
 	return 0;
 }
 
-u32 vuart_av_thread::get_reply_buf_free_size()
+void vuart_av_thread::write_resp(u32 cid, u32 status, const void *data, u32 data_size)
 {
-	return sizeof(temp_rx_buf.buf) - temp_rx_buf.crnt_size;
-}
+	ps3av_pkt_reply_hdr pkt_hdr;
 
-template<bool UseScBuffer>
-void vuart_av_thread::write_resp(u32 cid, u32 status, const void *data, u16 data_size)
-{
-	const ps3av_pkt_reply_hdr pkt_hdr =
-	{
-		PS3AV_VERSION,
-		data_size + 8U,
-		cid | PS3AV_REPLY_BIT,
-		status
-	};
+	pkt_hdr.version = PS3AV_VERSION;
+	pkt_hdr.status = status;
+	pkt_hdr.length = data_size + 8;
+	pkt_hdr.cid = cid | PS3AV_REPLY_BIT;
 
-	if (status != PS3AV_STATUS_SUCCESS)
-	{
-		sys_uart.error("Packet failed cid=0x%08x status=0x%02x", cid, status);
-	}
-
-	temp_buf &buf = UseScBuffer ? temp_rx_sc_buf : temp_rx_buf;
 	const u32 total_size = sizeof(pkt_hdr) + data_size;
 
-	if (buf.crnt_size + total_size <= sizeof(buf.buf))
+	if (temp_rx_buf_size + total_size <= PS3AV_RX_BUF_SIZE)
 	{
-		memcpy(&buf.buf[buf.crnt_size], &pkt_hdr, sizeof(pkt_hdr));
-		memcpy(&buf.buf[buf.crnt_size + sizeof(pkt_hdr)], data, data_size);
-		buf.crnt_size += total_size;
+		memcpy(&temp_rx_buf[temp_rx_buf_size], &pkt_hdr, sizeof(pkt_hdr));
+		memcpy(&temp_rx_buf[temp_rx_buf_size + sizeof(pkt_hdr)], data, data_size);
+		temp_rx_buf_size += total_size;
 	}
 }
 
@@ -2163,62 +541,44 @@ std::shared_ptr<ps3av_cmd> vuart_av_thread::get_cmd(u32 cid)
 {
 	switch (cid)
 	{
-	case PS3AV_CID_AV_CEC_MESSAGE:
-	case PS3AV_CID_AV_UNK11:
-	case PS3AV_CID_AV_UNK12:
+	case PS3AV_CID_VIDEO_INIT:
+	case PS3AV_CID_AUDIO_INIT:
+	case PS3AV_CID_AV_GET_KSV_LIST_SIZE:
+	case PS3AV_CID_VIDEO_FORMAT:
+	case PS3AV_CID_VIDEO_PITCH:
+	case PS3AV_CID_VIDEO_ROUTE:
+	case PS3AV_CID_AV_VIDEO_DISABLE_SIG:
+	case PS3AV_CID_AV_TV_MUTE:
+	case PS3AV_CID_AV_UNK:
+	case PS3AV_CID_AV_UNK2:
+	case PS3AV_CID_VIDEO_GET_HW_CONF:
+	case PS3AV_CID_AV_HDMI_MODE:
+	case PS3AV_CID_AV_SET_ACP_PACKET:
+	case PS3AV_CID_AV_VIDEO_UNK4:
+	case PS3AV_CID_AV_ENABLE_EVENT:
+	case PS3AV_CID_AV_AUDIO_MUTE:
+	case PS3AV_CID_AUDIO_MUTE:
+	case PS3AV_CID_AUDIO_MODE:
+	case PS3AV_CID_AUDIO_CTRL:
+	case PS3AV_CID_AUDIO_ACTIVE:
+	case PS3AV_CID_AUDIO_INACTIVE:
+	case PS3AV_CID_AUDIO_SPDIF_BIT:
+	case PS3AV_CID_AVB_PARAM:
+	case PS3AV_CID_AV_INIT:
+	case 0xA0002:
 		return std::make_shared<generic_reply_cmd>();
 
-	// AV commands
-	case PS3AV_CID_AV_INIT:               return std::make_shared<av_init_cmd>();
-	case PS3AV_CID_AV_FIN:                return std::make_shared<av_fini_cmd>();
-	case PS3AV_CID_AV_GET_HW_CONF:        return std::make_shared<av_get_hw_conf_cmd>();
-	case PS3AV_CID_AV_GET_MONITOR_INFO:   return std::make_shared<av_get_monitor_info_cmd>();
-	case PS3AV_CID_AV_GET_BKSV_LIST:      return std::make_shared<av_get_bksv_list_cmd>();
-	case PS3AV_CID_AV_ENABLE_EVENT:       return std::make_shared<av_enable_event_cmd>();
-	case PS3AV_CID_AV_DISABLE_EVENT:      return std::make_shared<av_disable_event_cmd>();
-	case PS3AV_CID_AV_TV_MUTE:            return std::make_shared<av_tv_mute_cmd>();
-	case PS3AV_CID_AV_NULL_CMD:           return std::make_shared<av_null_cmd>();
-	case PS3AV_CID_AV_GET_AKSV:           return std::make_shared<av_get_aksv_list_cmd>();
-	case PS3AV_CID_AV_VIDEO_DISABLE_SIG:  return std::make_shared<video_disable_signal_cmd>();
-	case PS3AV_CID_AV_VIDEO_YTRAPCONTROL: return std::make_shared<av_video_ytrapcontrol_cmd>();
-	case PS3AV_CID_AV_AUDIO_MUTE:         return std::make_shared<av_audio_mute_cmd>();
-	case PS3AV_CID_AV_ACP_CTRL:           return std::make_shared<av_acp_ctrl_cmd>();
-	case PS3AV_CID_AV_SET_ACP_PACKET:     return std::make_shared<av_set_acp_packet_cmd>();
-	case PS3AV_CID_AV_ADD_SIGNAL_CTL:     return std::make_shared<av_add_signal_ctl_cmd>();
-	case PS3AV_CID_AV_SET_CGMS_WSS:       return std::make_shared<av_set_cgms_wss_cmd>();
-	case PS3AV_CID_AV_HDMI_MODE:          return std::make_shared<av_set_hdmi_mode_cmd>();
-	case PS3AV_CID_AV_GET_CEC_CONFIG:     return std::make_shared<av_get_cec_status_cmd>();
-
-	// Video commands
-	case PS3AV_CID_VIDEO_INIT:            return std::make_shared<video_init_cmd>();
-	case PS3AV_CID_VIDEO_ROUTE:           return std::make_shared<video_set_route_cmd>();
-	case PS3AV_CID_VIDEO_FORMAT:          return std::make_shared<video_set_format_cmd>();
-	case PS3AV_CID_VIDEO_PITCH:           return std::make_shared<video_set_pitch_cmd>();
-	case PS3AV_CID_VIDEO_GET_HW_CONF:     return std::make_shared<video_get_hw_cfg_cmd>();
-
-	// Audio commands
-	case PS3AV_CID_AUDIO_INIT:            return std::make_shared<audio_init_cmd>();
-	case PS3AV_CID_AUDIO_MODE:            return std::make_shared<audio_set_mode_cmd>();
-	case PS3AV_CID_AUDIO_MUTE:            return std::make_shared<audio_mute_cmd>();
-	case PS3AV_CID_AUDIO_ACTIVE:          return std::make_shared<audio_set_active_cmd>();
-	case PS3AV_CID_AUDIO_INACTIVE:        return std::make_shared<audio_set_inactive_cmd>();
-	case PS3AV_CID_AUDIO_SPDIF_BIT:       return std::make_shared<audio_spdif_bit_cmd>();
-	case PS3AV_CID_AUDIO_CTRL:            return std::make_shared<audio_ctrl_cmd>();
-
-	// Multipacket
-	case PS3AV_CID_AVB_PARAM:             return std::make_shared<inc_avset_cmd>();
-
+	case PS3AV_CID_AV_GET_HW_CONF: return std::make_shared<av_get_hw_conf_cmd>();
+	case PS3AV_CID_AV_GET_MONITOR_INFO: return std::make_shared<av_get_monitor_info_cmd>();
 	default: return {};
 	}
 }
 
-void vuart_av_thread::commit_rx_buf(bool syscon_buf)
+void vuart_av_thread::commit_rx_buf()
 {
-	temp_buf &buf = syscon_buf ? temp_rx_sc_buf : temp_rx_buf;
-
 	std::unique_lock<shared_mutex> lock(rx_wake_m);
-	rx_buf.push(buf.buf, buf.crnt_size, true);
-	buf.crnt_size = 0;
+	rx_buf.push(temp_rx_buf, temp_rx_buf_size);
+	temp_rx_buf_size = 0;
 
 	if (rx_buf.get_used_size())
 	{
@@ -2226,269 +586,3 @@ void vuart_av_thread::commit_rx_buf(bool syscon_buf)
 		rx_wake_c.notify_all();
 	}
 }
-
-void vuart_av_thread::add_hdmi_events(UartHdmiEvent first_event, UartHdmiEvent last_event, bool hdmi_0, bool hdmi_1)
-{
-	if (hdmi_0)
-	{
-		hdmi_event_handler[0].set_target_state(first_event, last_event);
-	}
-
-	if (hdmi_1 && g_cfg.core.debug_console_mode)
-	{
-		hdmi_event_handler[1].set_target_state(first_event, last_event);
-	}
-}
-
-void vuart_av_thread::add_hdmi_events(UartHdmiEvent last_event, bool hdmi_0, bool hdmi_1)
-{
-	add_hdmi_events(last_event, last_event, hdmi_0, hdmi_1);
-}
-
-void vuart_av_thread::dispatch_hdmi_event(UartHdmiEvent event, UartAudioAvport hdmi)
-{
-	const bool hdmi_0 = hdmi == UartAudioAvport::HDMI_0;
-	const bool hdmi_1 = hdmi == UartAudioAvport::HDMI_1;
-
-	switch (event)
-	{
-	case UartHdmiEvent::UNPLUGGED:
-	{
-		add_unplug_event(hdmi_0, hdmi_1);
-		break;
-	}
-	case UartHdmiEvent::PLUGGED:
-	{
-		add_plug_event(hdmi_0, hdmi_1);
-		break;
-	}
-	case UartHdmiEvent::HDCP_DONE:
-	{
-		add_hdcp_done_event(hdmi_0, hdmi_1);
-		break;
-	}
-	default: break;
-	}
-}
-
-RsxaudioAvportIdx vuart_av_thread::avport_to_idx(UartAudioAvport avport)
-{
-	switch (avport)
-	{
-	case UartAudioAvport::HDMI_0:
-		return RsxaudioAvportIdx::HDMI_0;
-	case UartAudioAvport::HDMI_1:
-		return RsxaudioAvportIdx::HDMI_1;
-	case UartAudioAvport::AVMULTI_0:
-		return RsxaudioAvportIdx::AVMULTI;
-	case UartAudioAvport::SPDIF_0:
-		return RsxaudioAvportIdx::SPDIF_0;
-	case UartAudioAvport::SPDIF_1:
-		return RsxaudioAvportIdx::SPDIF_1;
-	default:
-		ensure(false);
-		return RsxaudioAvportIdx::HDMI_0;
-	}
-}
-
-void vuart_av_thread::add_unplug_event(bool hdmi_0, bool hdmi_1)
-{
-	if ((hdmi_events_bitmask & PS3AV_EVENT_BIT_UNPLUGGED) == 0) return;
-
-	ps3av_header pkt{};
-	pkt.version = av_cmd_ver;
-	pkt.length = sizeof(ps3av_header) - 4;
-	pkt.cid = PS3AV_CID_EVENT_UNPLUGGED;
-
-	if (hdmi_0)
-	{
-		g_fxo->get<rsx_audio_data>().update_av_mute_state(RsxaudioAvportIdx::HDMI_0, false, true);
-		hdcp_first_auth[0] = true;
-		commit_event_data(&pkt, sizeof(pkt));
-	}
-
-	if (hdmi_1)
-	{
-		g_fxo->get<rsx_audio_data>().update_av_mute_state(RsxaudioAvportIdx::HDMI_1, false, true);
-		hdcp_first_auth[1] = true;
-		pkt.cid |= 0x10000;
-		commit_event_data(&pkt, sizeof(pkt));
-	}
-}
-
-void vuart_av_thread::add_plug_event(bool hdmi_0, bool hdmi_1)
-{
-	if ((hdmi_events_bitmask & PS3AV_EVENT_BIT_PLUGGED) == 0) return;
-
-	ps3av_pkt_hdmi_plugged_event pkt{};
-	pkt.hdr.version = av_cmd_ver;
-	pkt.hdr.length = sizeof(ps3av_pkt_hdmi_plugged_event) - 8;
-	pkt.hdr.cid = PS3AV_CID_EVENT_PLUGGED;
-
-	if (hdmi_0)
-	{
-		g_fxo->get<rsx_audio_data>().update_av_mute_state(RsxaudioAvportIdx::HDMI_0, false, true);
-		av_get_monitor_info_cmd::set_hdmi_display_cfg(*this, pkt.minfo, static_cast<u8>(UartAudioAvport::HDMI_0));
-		commit_event_data(&pkt, sizeof(pkt) - 4);
-	}
-
-	if (hdmi_1)
-	{
-		g_fxo->get<rsx_audio_data>().update_av_mute_state(RsxaudioAvportIdx::HDMI_1, false, true);
-		memset(&pkt.minfo, 0, sizeof(pkt.minfo));
-		pkt.hdr.cid |= 0x10000;
-		av_get_monitor_info_cmd::set_hdmi_display_cfg(*this, pkt.minfo, static_cast<u8>(UartAudioAvport::HDMI_1));
-		commit_event_data(&pkt, sizeof(pkt) - 4);
-	}
-}
-
-void vuart_av_thread::add_hdcp_done_event(bool hdmi_0, bool hdmi_1)
-{
-	u16 pkt_size = offsetof(ps3av_pkt_hdmi_hdcp_done_event, ksv_arr);
-	ps3av_pkt_hdmi_hdcp_done_event pkt{};
-	pkt.hdr.version = av_cmd_ver;
-
-	if (hdmi_behavior_mode == PS3AV_HDMI_BEHAVIOR_NORMAL || !(hdmi_behavior_mode & PS3AV_HDMI_BEHAVIOR_HDCP_OFF))
-	{
-		pkt.ksv_cnt = 1;
-		memcpy(&pkt.ksv_arr[0], PS3AV_BKSV_VALUE, sizeof(PS3AV_BKSV_VALUE));
-		pkt_size = (pkt_size + 5 * pkt.ksv_cnt + 3) & 0xFFFC;
-	}
-
-	pkt.hdr.length = pkt_size - 4;
-
-	if (hdmi_0)
-	{
-		g_fxo->get<rsx_audio_data>().update_av_mute_state(RsxaudioAvportIdx::HDMI_0, false, true, false);
-
-		if (hdcp_first_auth[0])
-		{
-			if (hdmi_events_bitmask & PS3AV_EVENT_BIT_HDCP_DONE)
-			{
-				hdcp_first_auth[0] = false;
-				pkt.hdr.cid = PS3AV_CID_EVENT_HDCP_DONE;
-				commit_event_data(&pkt, pkt_size);
-			}
-		}
-		else if (hdmi_events_bitmask & PS3AV_EVENT_BIT_HDCP_REAUTH)
-		{
-			pkt.hdr.cid = PS3AV_CID_EVENT_HDCP_REAUTH;
-			commit_event_data(&pkt, pkt_size);
-		}
-	}
-
-	if (hdmi_1)
-	{
-		g_fxo->get<rsx_audio_data>().update_av_mute_state(RsxaudioAvportIdx::HDMI_1, false, true, false);
-
-		if (hdcp_first_auth[1])
-		{
-			if (hdmi_events_bitmask & PS3AV_EVENT_BIT_HDCP_DONE)
-			{
-				hdcp_first_auth[1] = false;
-				pkt.hdr.cid = PS3AV_CID_EVENT_HDCP_DONE | 0x10000;
-				commit_event_data(&pkt, pkt_size);
-			}
-		}
-		else if (hdmi_events_bitmask & PS3AV_EVENT_BIT_HDCP_REAUTH)
-		{
-			pkt.hdr.cid = PS3AV_CID_EVENT_HDCP_REAUTH | 0x10000;
-			commit_event_data(&pkt, pkt_size);
-		}
-	}
-}
-
-void vuart_av_thread::commit_event_data(const void *data, u16 data_size)
-{
-	std::unique_lock<shared_mutex> lock(rx_wake_m);
-	rx_buf.push(data, data_size, true);
-
-	if (rx_buf.get_used_size())
-	{
-		lock.unlock();
-		rx_wake_c.notify_all();
-	}
-}
-
-vuart_hdmi_event_handler::vuart_hdmi_event_handler(u64 time_offset) : time_offset(time_offset)
-{
-}
-
-void vuart_hdmi_event_handler::set_target_state(UartHdmiEvent start_state, UartHdmiEvent end_state)
-{
-	ensure(start_state != UartHdmiEvent::NONE && static_cast<u8>(start_state) <= static_cast<u8>(end_state));
-
-	base_state = static_cast<UartHdmiEvent>(std::min<u8>(static_cast<u8>(start_state) - 1, static_cast<u8>(current_to_state)));
-	target_state = end_state;
-
-	if (!events_available())
-	{
-		advance_state();
-	}
-}
-
-bool vuart_hdmi_event_handler::events_available()
-{
-	return time_of_next_event != 0;
-}
-
-u64 vuart_hdmi_event_handler::time_until_next()
-{
-	const u64 current_time = get_system_time();
-
-	if (!events_available() || current_time + EVENT_TIME_THRESHOLD >= time_of_next_event)
-	{
-		return 0;
-	}
-
-	return time_of_next_event - current_time;
-}
-
-UartHdmiEvent vuart_hdmi_event_handler::get_occured_event()
-{
-	if (events_available() && time_until_next() == 0)
-	{
-		const UartHdmiEvent occured = current_to_state;
-		advance_state();
-
-		return occured;
-	}
-
-	return UartHdmiEvent::NONE;
-}
-
-void vuart_hdmi_event_handler::schedule_next()
-{
-	time_of_next_event = get_system_time() + (EVENT_TIME_DURATION + time_offset) * 100 / g_cfg.core.clocks_scale;
-}
-
-void vuart_hdmi_event_handler::advance_state()
-{
-	current_state = current_to_state;
-
-	while (base_state != target_state)
-	{
-		base_state = static_cast<UartHdmiEvent>(static_cast<u8>(base_state) + 1);
-
-		if (current_state == UartHdmiEvent::UNPLUGGED && base_state == UartHdmiEvent::UNPLUGGED)
-		{
-			continue;
-		}
-
-		if (current_state == UartHdmiEvent::PLUGGED && base_state == UartHdmiEvent::PLUGGED)
-		{
-			continue;
-		}
-
-		if (current_state == UartHdmiEvent::HDCP_DONE && base_state == UartHdmiEvent::PLUGGED)
-		{
-			continue;
-		}
-
-		current_to_state = base_state;
-		schedule_next();
-		return;
-	}
-
-	time_of_next_event = 0;
-}
diff --git a/rpcs3/Emu/Cell/lv2/sys_uart.h b/rpcs3/Emu/Cell/lv2/sys_uart.h
index 3618917b5c..2408c68f35 100644
--- a/rpcs3/Emu/Cell/lv2/sys_uart.h
+++ b/rpcs3/Emu/Cell/lv2/sys_uart.h
@@ -3,7 +3,6 @@
 #include "Emu/Memory/vm_ptr.h"
 #include "Utilities/mutex.h"
 #include "Utilities/cond.h"
-#include "Utilities/simple_ringbuf.h"
 
 enum : u32
 {
@@ -16,40 +15,23 @@ enum : u32
 	PS3AV_CID_AV_FIN                        = 0x00000002,
 	PS3AV_CID_AV_GET_HW_CONF                = 0x00000003,
 	PS3AV_CID_AV_GET_MONITOR_INFO           = 0x00000004,
-	PS3AV_CID_AV_GET_BKSV_LIST              = 0x00000005,
+	PS3AV_CID_AV_GET_KSV_LIST_SIZE          = 0x00000005,
 	PS3AV_CID_AV_ENABLE_EVENT               = 0x00000006,
 	PS3AV_CID_AV_DISABLE_EVENT              = 0x00000007,
-	PS3AV_CID_AV_GET_PORT_STATE             = 0x00000009,
+	PS3AV_CID_AV_GET_ALL_EDID               = 0x00000008,
 	PS3AV_CID_AV_TV_MUTE                    = 0x0000000A,
-	PS3AV_CID_AV_NULL_CMD                   = 0x0000000B,
-	PS3AV_CID_AV_GET_AKSV                   = 0x0000000C,
-	PS3AV_CID_AV_UNK4                       = 0x0000000D,
-	PS3AV_CID_AV_UNK5                       = 0x0000000E,
 
+	PS3AV_CID_AV_VIDEO_CS                   = 0x00010001,
 	PS3AV_CID_AV_VIDEO_MUTE                 = 0x00010002,
 	PS3AV_CID_AV_VIDEO_DISABLE_SIG          = 0x00010003,
-	PS3AV_CID_AV_VIDEO_YTRAPCONTROL         = 0x00010004,
-	PS3AV_CID_AV_VIDEO_UNK5                 = 0x00010005,
-	PS3AV_CID_AV_VIDEO_UNK6                 = 0x00010006,
+	PS3AV_CID_AV_VIDEO_UNK4                 = 0x00010004,
+	PS3AV_CID_AV_AUDIO_PARAM                = 0x00020001,
 	PS3AV_CID_AV_AUDIO_MUTE                 = 0x00020002,
 	PS3AV_CID_AV_ACP_CTRL                   = 0x00020003,
 	PS3AV_CID_AV_SET_ACP_PACKET             = 0x00020004,
-	PS3AV_CID_AV_ADD_SIGNAL_CTL             = 0x00030001,
-	PS3AV_CID_AV_SET_CC_CODE                = 0x00030002,
-	PS3AV_CID_AV_SET_CGMS_WSS               = 0x00030003,
-	PS3AV_CID_AV_SET_MACROVISION            = 0x00030004,
-	PS3AV_CID_AV_UNK7                       = 0x00030005,
-	PS3AV_CID_AV_UNK8                       = 0x00030006,
-	PS3AV_CID_AV_UNK9                       = 0x00030007,
+	PS3AV_CID_AV_UNK                        = 0x00030001,
+	PS3AV_CID_AV_UNK2                       = 0x00030003,
 	PS3AV_CID_AV_HDMI_MODE                  = 0x00040001,
-	PS3AV_CID_AV_UNK15                      = 0x00050001,
-
-	PS3AV_CID_AV_CEC_MESSAGE                = 0x000A0001,
-	PS3AV_CID_AV_GET_CEC_CONFIG             = 0x000A0002,
-	PS3AV_CID_AV_UNK11                      = 0x000A0003,
-	PS3AV_CID_AV_UNK12                      = 0x000A0004,
-	PS3AV_CID_AV_UNK13                      = 0x000A0005,
-	PS3AV_CID_AV_UNK14                      = 0x000A0006,
 
 	PS3AV_CID_VIDEO_INIT                    = 0x01000001,
 	PS3AV_CID_VIDEO_MODE                    = 0x01000002,
@@ -57,11 +39,7 @@ enum : u32
 	PS3AV_CID_VIDEO_FORMAT                  = 0x01000004,
 	PS3AV_CID_VIDEO_PITCH                   = 0x01000005,
 	PS3AV_CID_VIDEO_GET_HW_CONF             = 0x01000006,
-	PS3AV_CID_VIDEO_GET_REG                 = 0x01000008,
-	PS3AV_CID_VIDEO_UNK                     = 0x01000009,
-	PS3AV_CID_VIDEO_UNK1                    = 0x0100000A,
-	PS3AV_CID_VIDEO_UNK2                    = 0x0100000B,
-	PS3AV_CID_VIDEO_UNK3                    = 0x0100000C,
+	PS3AV_CID_VIDEO_REGVAL                  = 0x01000008,
 
 	PS3AV_CID_AUDIO_INIT                    = 0x02000001,
 	PS3AV_CID_AUDIO_MODE                    = 0x02000002,
@@ -71,15 +49,15 @@ enum : u32
 	PS3AV_CID_AUDIO_SPDIF_BIT               = 0x02000006,
 	PS3AV_CID_AUDIO_CTRL                    = 0x02000007,
 
-	PS3AV_CID_AVB_PARAM                     = 0x04000001,
-
 	PS3AV_CID_EVENT_UNPLUGGED               = 0x10000001,
 	PS3AV_CID_EVENT_PLUGGED                 = 0x10000002,
 	PS3AV_CID_EVENT_HDCP_DONE               = 0x10000003,
 	PS3AV_CID_EVENT_HDCP_FAIL               = 0x10000004,
-	PS3AV_CID_EVENT_HDCP_REAUTH             = 0x10000005,
+	PS3AV_CID_EVENT_HDCP_AUTH               = 0x10000005,
 	PS3AV_CID_EVENT_HDCP_ERROR              = 0x10000006,
 
+	PS3AV_CID_AVB_PARAM                     = 0x04000001,
+
 	PS3AV_REPLY_BIT                         = 0x80000000,
 
 	PS3AV_RESBIT_720x480P                   = 0x0003, /* 0x0001 | 0x0002 */
@@ -88,52 +66,8 @@ enum : u32
 	PS3AV_RESBIT_1920x1080I                 = 0x0008,
 	PS3AV_RESBIT_1920x1080P                 = 0x4000,
 
-	PS3AV_MONITOR_TYPE_NONE                 = 0,
 	PS3AV_MONITOR_TYPE_HDMI                 = 1,
 	PS3AV_MONITOR_TYPE_DVI                  = 2,
-	PS3AV_MONITOR_TYPE_AVMULTI              = 3,
-
-	PS3AV_COLORIMETRY_xvYCC_601             = 1,
-	PS3AV_COLORIMETRY_xvYCC_709             = 2,
-	PS3AV_COLORIMETRY_MD0                   = 1 << 4,
-	PS3AV_COLORIMETRY_MD1                   = 1 << 5,
-	PS3AV_COLORIMETRY_MD2                   = 1 << 6,
-
-	PS3AV_CS_SUPPORTED                      = 1,
-	PS3AV_RGB_SELECTABLE_QAUNTIZATION_RANGE = 8,
-	PS3AV_12BIT_COLOR                       = 16,
-
-	PS3AV_MON_INFO_AUDIO_BLK_MAX            = 16,
-
-	PS3AV_MON_INFO_AUDIO_TYPE_LPCM          = 1,
-	PS3AV_MON_INFO_AUDIO_TYPE_AC3           = 2,
-	PS3AV_MON_INFO_AUDIO_TYPE_AAC           = 6,
-	PS3AV_MON_INFO_AUDIO_TYPE_DTS           = 7,
-	PS3AV_MON_INFO_AUDIO_TYPE_DDP           = 10,
-	PS3AV_MON_INFO_AUDIO_TYPE_DTS_HD        = 11,
-	PS3AV_MON_INFO_AUDIO_TYPE_DOLBY_THD     = 12,
-
-	PS3AV_HDMI_BEHAVIOR_HDCP_OFF            = 0x01,
-	PS3AV_HDMI_BEHAVIOR_DVI                 = 0x40,
-	PS3AV_HDMI_BEHAVIOR_EDID_PASS           = 0x80,
-	PS3AV_HDMI_BEHAVIOR_NORMAL              = 0xFF,
-
-	PS3AV_EVENT_BIT_UNPLUGGED               = 0x01,
-	PS3AV_EVENT_BIT_PLUGGED                 = 0x02,
-	PS3AV_EVENT_BIT_HDCP_DONE               = 0x04,
-	PS3AV_EVENT_BIT_HDCP_FAIL               = 0x08,
-	PS3AV_EVENT_BIT_HDCP_REAUTH             = 0x10,
-	PS3AV_EVENT_BIT_HDCP_TOPOLOGY           = 0x20,
-	PS3AV_EVENT_BIT_UNK                     = 0x80000000,
-
-	PS3AV_HEAD_A_HDMI                       = 0,
-	PS3AV_HEAD_B_ANALOG                     = 1,
-
-	PS3AV_AUDIO_PORT_HDMI_0                 = 1 << 0,
-	PS3AV_AUDIO_PORT_HDMI_1                 = 1 << 1,
-	PS3AV_AUDIO_PORT_AVMULTI                = 1 << 10,
-	PS3AV_AUDIO_PORT_SPDIF_0                = 1 << 20,
-	PS3AV_AUDIO_PORT_SPDIF_1                = 1 << 21,
 
 	PS3AV_STATUS_SUCCESS                    = 0x00,
 	PS3AV_STATUS_RECEIVE_VUART_ERROR        = 0x01,
@@ -155,12 +89,8 @@ enum : u32
 	PS3AV_STATUS_INVALID_AUDIO_PARAM        = 0x11,
 	PS3AV_STATUS_UNSUPPORTED_HDMI_MODE      = 0x12,
 	PS3AV_STATUS_NO_SYNC_HEAD               = 0x13,
-	PS3AV_STATUS_UNK_0x14                   = 0x14,
 };
 
-const u8 PS3AV_AKSV_VALUE[5] = { 0x00, 0x00, 0x0F, 0xFF, 0xFF };
-const u8 PS3AV_BKSV_VALUE[5] = { 0xFF, 0xFF, 0xF0, 0x00, 0x00 };
-
 enum PS3_AV_OP_MODE : u32
 {
 	// BIG operation modes could send more then 4096 bytes
@@ -170,99 +100,91 @@ enum PS3_AV_OP_MODE : u32
 	NOT_BLOCKING_OP     = 2,
 };
 
-enum class UartHdmiEvent : u8
-{
-	NONE       = 0,
-	UNPLUGGED  = 1,
-	PLUGGED    = 2,
-	HDCP_DONE  = 3,
-};
-
-enum class UartAudioCtrlID : u32
-{
-	DAC_RESET       = 0,
-	DAC_DE_EMPHASIS = 1,
-	AVCLK           = 2,
-};
-
-enum class UartAudioAvport : u8
-{
-	HDMI_0    = 0x0,
-	HDMI_1    = 0x1,
-	AVMULTI_0 = 0x10,
-	AVMULTI_1 = 0x11,
-	SPDIF_0   = 0x20,
-	SPDIF_1   = 0x21,
-};
-
-enum class UartAudioSource : u32
-{
-	SERIAL = 0,
-	SPDIF  = 1,
-};
-
-enum class UartAudioFreq : u32
-{
-	_32K  = 1,
-	_44K  = 2,
-	_48K  = 3,
-	_88K  = 4,
-	_96K  = 5,
-	_176K = 6,
-	_192K = 7,
-};
-
-enum class UartAudioFormat : u32
-{
-	PCM       = 1,
-	BITSTREAM = 0xFF,
-};
-
-enum class UartAudioSampleSize : u32
-{
-	_16BIT = 1,
-	_20BIT = 2,
-	_24BIT = 3,
-};
-
-class vuart_hdmi_event_handler
-{
-public:
-
-	vuart_hdmi_event_handler(u64 time_offset = 0);
-
-	void set_target_state(UartHdmiEvent start_state, UartHdmiEvent end_state);
-	bool events_available();
-
-	u64 time_until_next();
-	UartHdmiEvent get_occured_event();
-
-private:
-
-	static constexpr u64 EVENT_TIME_DURATION = 20000;
-	static constexpr u64 EVENT_TIME_THRESHOLD = 1000;
-
-	u64 time_of_next_event = 0;
-	const u64 time_offset = 0;
-
-	// Assume that syscon initialized hdmi to plugged state
-	UartHdmiEvent current_state = UartHdmiEvent::PLUGGED;
-	UartHdmiEvent current_to_state = UartHdmiEvent::PLUGGED;
-
-	UartHdmiEvent base_state = UartHdmiEvent::NONE;
-	UartHdmiEvent target_state = UartHdmiEvent::NONE;
-
-	void schedule_next();
-	void advance_state();
-};
-
 class vuart_av_thread;
 
 struct ps3av_cmd
 {
 	virtual u16 get_size(vuart_av_thread &vuart, const void *pkt_buf) = 0;
-	virtual void execute(vuart_av_thread &vuart, const void *pkt_buf) = 0;
-	virtual ~ps3av_cmd() {};
+	virtual bool execute(vuart_av_thread &vuart, const void *pkt_buf, u32 reply_max_size) = 0;
+};
+
+template<u32 Size>
+class vuart_av_ringbuf
+{
+private:
+
+	atomic_t<u32> rd_ptr = 0;
+	atomic_t<u32> wr_ptr = 0;
+	u8 buf[Size + 1];
+
+public:
+
+	u32 get_free_size()
+	{
+		const u32 rd = rd_ptr.observe();
+		const u32 wr = wr_ptr.observe();
+
+		return wr >= rd ? Size - (wr - rd) : rd - wr - 1U;
+	}
+
+	u32 get_used_size()
+	{
+		return Size - get_free_size();
+	}
+
+	u32 push(const void *data, u32 size)
+	{
+		const u32 old     = wr_ptr.observe();
+		const u32 to_push = std::min(size, get_free_size());
+		const u8 *b_data  = static_cast<const u8*>(data);
+
+		if (!to_push || !data)
+		{
+			return 0;
+		}
+
+		if (old + to_push > sizeof(buf))
+		{
+			const u32 first_write_sz = sizeof(buf) - old;
+			memcpy(&buf[old], b_data, first_write_sz);
+			memcpy(&buf[0], b_data + first_write_sz, to_push - first_write_sz);
+		}
+		else
+		{
+			memcpy(&buf[old], b_data, to_push);
+		}
+
+		wr_ptr = (old + to_push) % sizeof(buf);
+
+		return to_push;
+	}
+
+	u32 pop(void *data, u32 size)
+	{
+		const u32 old    = rd_ptr.observe();
+		const u32 to_pop = std::min(size, get_used_size());
+		u8 *b_data       = static_cast<u8*>(data);
+
+		if (!to_pop || !data)
+		{
+			return 0;
+		}
+
+		if (old + to_pop > sizeof(buf))
+		{
+			const u32 first_read_sz = sizeof(buf) - old;
+			memcpy(b_data, &buf[old], first_read_sz);
+			memcpy(b_data + first_read_sz, &buf[0], to_pop - first_read_sz);
+		}
+		else
+		{
+			memcpy(b_data, &buf[old], to_pop);
+		}
+
+		rd_ptr = (old + to_pop) % sizeof(buf);
+
+		return to_pop;
+	}
 };
 
 class vuart_av_thread
@@ -281,12 +203,6 @@ public:
 	shared_mutex rx_wake_m{};
 	cond_variable rx_wake_c{};
 
-	bool head_b_initialized = false;
-	u8 hdmi_behavior_mode = PS3AV_HDMI_BEHAVIOR_NORMAL;
-	u16 av_cmd_ver = 0;
-	u32 hdmi_events_bitmask = 0;
-	bool hdmi_res_set[2]{ false, false };
-
 	void operator()();
 	void parse_tx_buffer(u32 buf_size);
 	vuart_av_thread &operator=(thread_state);
@@ -294,48 +210,21 @@ public:
 	u32 enque_tx_data(const void *data, u32 data_sz);
 	u32 get_tx_bytes();
 	u32 read_rx_data(void *data, u32 data_sz);
-
-	u32 get_reply_buf_free_size();
-
-	template<bool UseScBuffer = false>
-	void write_resp(u32 cid, u32 status, const void *data = nullptr, u16 data_size = 0);
-
-	void add_hdmi_events(UartHdmiEvent first_event, UartHdmiEvent last_event, bool hdmi_0, bool hdmi_1);
-	void add_hdmi_events(UartHdmiEvent last_event, bool hdmi_0, bool hdmi_1);
-
-	static RsxaudioAvportIdx avport_to_idx(UartAudioAvport avport);
+	void write_resp(u32 cid, u32 status, const void *data = nullptr, u32 data_size = 0);
 
 	static constexpr auto thread_name = "VUART AV Thread"sv;
 
 private:
 
-	struct temp_buf
-	{
-		u32 crnt_size = 0;
-		u8 buf[PS3AV_RX_BUF_SIZE]{};
-	};
-
-	simple_ringbuf tx_buf{PS3AV_TX_BUF_SIZE};
-	simple_ringbuf rx_buf{PS3AV_RX_BUF_SIZE};
-
-	// uart_mngr could sometimes read past the tx_buffer due to weird size checks in FW,
-	// but no further than size of largest packet
-	u8 temp_tx_buf[PS3AV_TX_BUF_SIZE * 2]{};
-	temp_buf temp_rx_buf{};
-	temp_buf temp_rx_sc_buf{};
-
-	vuart_hdmi_event_handler hdmi_event_handler[2]{ 0, 5000 };
-	bool hdcp_first_auth[2]{ true, true };
+	vuart_av_ringbuf<PS3AV_TX_BUF_SIZE> tx_buf{};
+	vuart_av_ringbuf<PS3AV_RX_BUF_SIZE> rx_buf{};
+	u8 temp_tx_buf[PS3AV_TX_BUF_SIZE];
+	u8 temp_rx_buf[PS3AV_TX_BUF_SIZE];
+	u32 temp_rx_buf_size = 0;
 
 	u32 read_tx_data(void *data, u32 data_sz);
 	std::shared_ptr<ps3av_cmd> get_cmd(u32 cid);
-	void commit_rx_buf(bool syscon_buf);
-
-	void add_unplug_event(bool hdmi_0, bool hdmi_1);
-	void add_plug_event(bool hdmi_0, bool hdmi_1);
-	void add_hdcp_done_event(bool hdmi_0, bool hdmi_1);
-	void commit_event_data(const void *data, u16 data_size);
-	void dispatch_hdmi_event(UartHdmiEvent event, UartAudioAvport hdmi);
+	void commit_rx_buf();
 };
 
 using vuart_av = named_thread<vuart_av_thread>;
@@ -346,8 +235,6 @@ struct vuart_params
 	be_t<u64, 1> tx_buf_size;
 };
 
-static_assert(sizeof(vuart_params) == 16);
-
 struct ps3av_pkt_reply_hdr
 {
 	be_t<u16, 1> version;
@@ -356,8 +243,6 @@ struct ps3av_pkt_reply_hdr
 	be_t<u32, 1> status;
 };
 
-static_assert(sizeof(ps3av_pkt_reply_hdr) == 12);
-
 struct ps3av_header
 {
 	be_t<u16, 1> version;
@@ -365,8 +250,6 @@ struct ps3av_header
 	be_t<u32, 1> cid;
 };
 
-static_assert(sizeof(ps3av_header) == 8);
-
 struct ps3av_info_resolution
 {
 	be_t<u32, 1> res_bits;
@@ -378,7 +261,7 @@ struct ps3av_info_cs
 	u8 rgb;
 	u8 yuv444;
 	u8 yuv422;
-	u8 colorimetry_data;
+	u8 reserved;
 };
 
 struct ps3av_info_color
@@ -417,22 +300,9 @@ struct ps3av_get_monitor_info_reply
 	u8 supported_ai;
 	u8 speaker_info;
 	be_t<u16, 1> num_of_audio_block;
-	ps3av_info_audio audio_info[PS3AV_MON_INFO_AUDIO_BLK_MAX];
-	be_t<u16, 1> hor_screen_size;
-	be_t<u16, 1> ver_screen_size;
-	u8 supported_content_types;
-	u8 reserved_1[3];
-	ps3av_info_resolution res_60_packed_3D;
-	ps3av_info_resolution res_50_packed_3D;
-	ps3av_info_resolution res_other_3D;
-	ps3av_info_resolution res_60_sbs_3D;
-	ps3av_info_resolution res_50_sbs_3D;
-	u8 vendor_specific_flags;
-	u8 reserved_2[7];
+	ps3av_info_audio audio_info[29];
 };
 
-static_assert(sizeof(ps3av_get_monitor_info_reply) == 208);
-
 struct ps3av_get_monitor_info
 {
 	ps3av_header hdr;
@@ -440,321 +310,14 @@ struct ps3av_get_monitor_info
 	be_t<u16, 1> reserved;
 };
 
-static_assert(sizeof(ps3av_get_monitor_info) == 12);
-
 struct ps3av_get_hw_info_reply
 {
 	be_t<u16, 1> num_of_hdmi;
 	be_t<u16, 1> num_of_avmulti;
 	be_t<u16, 1> num_of_spdif;
-	be_t<u16, 1> extra_bistream_support;
-};
-
-static_assert(sizeof(ps3av_get_hw_info_reply) == 8);
-
-struct ps3av_pkt_set_hdmi_mode
-{
-	ps3av_header hdr;
-	u8 mode;
-	u8 resv[3];
-};
-
-static_assert(sizeof(ps3av_pkt_set_hdmi_mode) == 12);
-
-struct ps3av_pkt_audio_mode
-{
-	ps3av_header hdr;
-	UartAudioAvport avport;
-	u8 reserved0[3];
-	be_t<u32, 1> mask;
-	be_t<u32, 1> audio_num_of_ch;
-	be_t<UartAudioFreq, 1> audio_fs;
-	be_t<UartAudioSampleSize, 1> audio_word_bits;
-	be_t<UartAudioFormat, 1> audio_format;
-	be_t<UartAudioSource, 1> audio_source;
-	u8 audio_enable[4];
-	u8 audio_swap[4];
-	u8 audio_map[4];
-	be_t<u32, 1> audio_layout;
-	be_t<u32, 1> audio_downmix;
-	be_t<u32, 1> audio_downmix_level;
-	u8 audio_cs_info[8];
-};
-
-static_assert(sizeof(ps3av_pkt_audio_mode) == 68);
-
-struct ps3av_pkt_audio_mute
-{
-	ps3av_header hdr;
-	UartAudioAvport avport;
-	u8 reserved0[3];
-	u8 mute;
-};
-
-static_assert(sizeof(ps3av_pkt_audio_mute) == 13);
-
-struct ps3av_pkt_audio_set_active
-{
-	ps3av_header hdr;
-	be_t<u32, 1> audio_port;
-};
-
-static_assert(sizeof(ps3av_pkt_audio_set_active) == 12);
-
-struct ps3av_pkt_audio_spdif_bit
-{
-	ps3av_header hdr;
-	UartAudioAvport avport;
-	u8 reserved0[3];
-	be_t<u32, 1> audio_port;
-	be_t<u32, 1> spdif_bit_data[12];
-};
-
-static_assert(sizeof(ps3av_pkt_audio_spdif_bit) == 64);
-
-struct ps3av_pkt_audio_ctrl
-{
-	ps3av_header hdr;
-	be_t<UartAudioCtrlID, 1> audio_ctrl_id;
-	be_t<u32, 1> audio_ctrl_data[4];
-};
-
-static_assert(sizeof(ps3av_pkt_audio_ctrl) == 28);
-
-struct ps3av_pkt_hdmi_plugged_event
-{
-	ps3av_header hdr;
-	ps3av_get_monitor_info_reply minfo;
-};
-
-static_assert(sizeof(ps3av_pkt_hdmi_plugged_event) == 216);
-
-struct ps3av_pkt_hdmi_hdcp_done_event
-{
-	ps3av_header hdr;
-	be_t<u32, 1> ksv_cnt;
-	u8 ksv_arr[20][5];
-};
-
-static_assert(sizeof(ps3av_pkt_hdmi_hdcp_done_event) == 112);
-
-struct ps3av_pkt_av_init
-{
-	ps3av_header hdr;
-	be_t<u32, 1> event_bit;
-};
-
-static_assert(sizeof(ps3av_pkt_av_init) == 12);
-
-struct ps3av_pkt_av_init_reply
-{
-	be_t<u32, 1> unk;
-};
-
-static_assert(sizeof(ps3av_pkt_av_init_reply) == 4);
-
-struct ps3av_pkt_enable_event
-{
-	ps3av_header hdr;
-	be_t<u32, 1> event_bit;
-};
-
-static_assert(sizeof(ps3av_pkt_enable_event) == 12);
-
-struct ps3av_pkt_get_bksv
-{
-	ps3av_header hdr;
-	be_t<u16, 1> avport;
-	u8 resv[2];
-};
-
-static_assert(sizeof(ps3av_pkt_get_bksv) == 12);
-
-struct ps3av_pkt_get_bksv_reply
-{
-	be_t<u16, 1> avport;
-	u8 resv[2];
-	be_t<u32, 1> ksv_cnt;
-	u8 ksv_arr[20][5];
-};
-
-static_assert(sizeof(ps3av_pkt_get_bksv_reply) == 108);
-
-struct ps3av_pkt_video_get_hw_cfg_reply
-{
-	be_t<u32, 1> gx_available;
-};
-
-static_assert(sizeof(ps3av_pkt_video_get_hw_cfg_reply) == 4);
-
-struct ps3av_pkt_video_set_pitch
-{
-	ps3av_header hdr;
-	be_t<u32, 1> video_head;
-	be_t<u32, 1> pitch;
-};
-
-static_assert(sizeof(ps3av_pkt_video_set_pitch) == 16);
-
-struct ps3av_pkt_get_aksv_reply
-{
-	be_t<u32, 1> ksv_size;
-	u8 ksv_arr[2][5];
-	u8 resv[2];
-};
-
-static_assert(sizeof(ps3av_pkt_get_aksv_reply) == 16);
-
-struct ps3av_pkt_inc_avset
-{
-	ps3av_header hdr;
-	be_t<u16, 1> num_of_video_pkt;
-	be_t<u16, 1> num_of_audio_pkt;
-	be_t<u16, 1> num_of_av_video_pkt;
-	be_t<u16, 1> num_of_av_audio_pkt;
-};
-
-static_assert(sizeof(ps3av_pkt_inc_avset) == 16);
-
-struct ps3av_pkt_av_audio_param
-{
-	ps3av_header hdr;
-	be_t<u16, 1> avport;
-	be_t<u16, 1> resv;
-	u8 mclk;
-	u8 ns[3];
-	u8 enable;
-	u8 swaplr;
-	u8 fifomap;
-	u8 inputctrl;
-	u8 inputlen;
-	u8 layout;
-	u8 info[5];
-	u8 chstat[5];
-};
-
-static_assert(sizeof(ps3av_pkt_av_audio_param) == 32);
-
-struct ps3av_pkt_av_video_cs
-{
-	ps3av_header hdr;
-	be_t<u16, 1> avport;
-	be_t<u16, 1> av_vid;
-	be_t<u16, 1> av_cs_out;
-	be_t<u16, 1> av_cs_in;
-	u8 dither;
-	u8 bitlen_out;
-	u8 super_white;
-	u8 aspect;
-	u8 unk1;
-	u8 unk2;
-	u8 resv[2];
-};
-
-static_assert(sizeof(ps3av_pkt_av_video_cs) == 24);
-
-struct ps3av_pkt_video_mode
-{
-	ps3av_header hdr;
-	be_t<u32, 1> video_head;
-	be_t<u16, 1> unk1;
-	be_t<u16, 1> unk2;
-	be_t<u32, 1> video_vid;
-	be_t<u32, 1> width;
-	be_t<u32, 1> height;
-	be_t<u32, 1> pitch;
-	be_t<u32, 1> video_out_format;
-	be_t<u32, 1> video_format;
-	be_t<u16, 1> unk3;
-	be_t<u16, 1> video_order;
-	be_t<u32, 1> unk4;
-};
-
-static_assert(sizeof(ps3av_pkt_video_mode) == 48);
-
-struct ps3av_pkt_av_video_ytrapcontrol
-{
-	ps3av_header hdr;
-	be_t<u16, 1> unk1;
-	be_t<u16, 1> unk2;
-};
-
-static_assert(sizeof(ps3av_pkt_av_video_ytrapcontrol) == 12);
-
-struct ps3av_pkt_av_get_cec_config_reply
-{
-	be_t<u32, 1> cec_present;
-};
-
-struct ps3av_pkt_video_format
-{
-	ps3av_header hdr;
-	be_t<u32, 1> video_head;
-	be_t<u32, 1> video_format;
-	be_t<u16, 1> unk;
-	be_t<u16, 1> video_order;
-};
-
-static_assert(sizeof(ps3av_pkt_video_format) == 20);
-
-struct ps3av_pkt_av_set_cgms_wss
-{
-	ps3av_header hdr;
-	be_t<u16, 1> avport;
-	u8 resv[2];
-	be_t<u32, 1> cgms_wss;
-};
-
-static_assert(sizeof(ps3av_pkt_av_set_cgms_wss) == 16);
-
-struct ps3av_pkt_set_acp_packet
-{
-	ps3av_header hdr;
-	u8 avport;
-	u8 pkt_type;
-	u8 resv[2];
-	u8 pkt_data[32];
-};
-
-static_assert(sizeof(ps3av_pkt_set_acp_packet) == 44);
-
-struct ps3av_pkt_acp_ctrl
-{
-	ps3av_header hdr;
-	u8 avport;
-	u8 packetctl;
-	u8 resv[2];
-};
-
-static_assert(sizeof(ps3av_pkt_acp_ctrl) == 12);
-
-struct ps3av_pkt_add_signal_ctl
-{
-	ps3av_header hdr;
-	be_t<u16, 1> avport;
-	be_t<u16, 1> signal_ctl;
-};
-
-static_assert(sizeof(ps3av_pkt_add_signal_ctl) == 12);
-
-struct ps3av_pkt_av_audio_mute
-{
-	ps3av_header hdr;
-	be_t<u16, 1> avport;
-	be_t<u16, 1> mute;
-};
-
-static_assert(sizeof(ps3av_pkt_av_audio_mute) == 12);
-
-struct ps3av_pkt_video_disable_sig
-{
-	ps3av_header hdr;
-	be_t<u16, 1> avport;
 	be_t<u16, 1> resv;
 };
 
-static_assert(sizeof(ps3av_pkt_video_disable_sig) == 12);
-
 // SysCalls
 
 error_code sys_uart_initialize(ppu_thread &ppu);
diff --git a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp
index e9f57dbec6..62d8f14b7a 100644
--- a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp
@@ -5,68 +5,46 @@
 
 #include <queue>
 #include "Emu/System.h"
-#include "Emu/system_config.h"
+#include "Emu/Memory/vm.h"
 #include "Emu/IdManager.h"
-#include "Emu/vfs_config.h"
 
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/ErrorCodes.h"
-#include "Emu/Cell/timers.hpp"
 
 #include "Emu/Io/usb_device.h"
-#include "Emu/Io/usb_vfs.h"
 #include "Emu/Io/Skylander.h"
-#include "Emu/Io/Infinity.h"
-#include "Emu/Io/Dimensions.h"
 #include "Emu/Io/GHLtar.h"
-#include "Emu/Io/ghltar_config.h"
-#include "Emu/Io/guncon3_config.h"
-#include "Emu/Io/topshotelite_config.h"
-#include "Emu/Io/topshotfearmaster_config.h"
 #include "Emu/Io/Buzz.h"
-#include "Emu/Io/buzz_config.h"
-#include "Emu/Io/GameTablet.h"
-#include "Emu/Io/GunCon3.h"
-#include "Emu/Io/TopShotElite.h"
-#include "Emu/Io/TopShotFearmaster.h"
 #include "Emu/Io/Turntable.h"
-#include "Emu/Io/turntable_config.h"
-#include "Emu/Io/RB3MidiKeyboard.h"
-#include "Emu/Io/RB3MidiGuitar.h"
-#include "Emu/Io/RB3MidiDrums.h"
-#include "Emu/Io/rb3drums_config.h"
-#include "Emu/Io/usio.h"
-#include "Emu/Io/usio_config.h"
-#include "Emu/Io/midi_config_types.h"
-#ifdef HAVE_SDL3
-#include "Emu/Io/LogitechG27.h"
-#endif
 
 #include <libusb.h>
 
 LOG_CHANNEL(sys_usbd);
 
-cfg_buzz g_cfg_buzz;
-cfg_ghltars g_cfg_ghltar;
-cfg_turntables g_cfg_turntable;
-cfg_usios g_cfg_usio;
-cfg_guncon3 g_cfg_guncon3;
-cfg_topshotelite g_cfg_topshotelite;
-cfg_topshotfearmaster g_cfg_topshotfearmaster;
-
 template <>
 void fmt_class_string<libusb_transfer>::format(std::string& out, u64 arg)
 {
 	const auto& transfer = get_object(arg);
-	const int data_start = transfer.type == LIBUSB_TRANSFER_TYPE_CONTROL ? LIBUSB_CONTROL_SETUP_SIZE : 0;
-	fmt::append(out, "TR[r:%d][sz:%d] => %s", +transfer.status, transfer.actual_length, fmt::buf_to_hexstring(&transfer.buffer[data_start], transfer.actual_length));
+
+	std::string datrace;
+	const char hex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+	for (int index = 0; index < transfer.actual_length; index++)
+	{
+		datrace += hex[transfer.buffer[index] >> 4];
+		datrace += hex[(transfer.buffer[index]) & 15];
+		datrace += ' ';
+	}
+
+	fmt::append(out, "TR[r:%d][sz:%d] => %s", +transfer.status, transfer.actual_length, datrace);
 }
 
 struct UsbLdd
 {
-	u16 id_vendor{};
-	u16 id_product_min{};
-	u16 id_product_max{};
+	std::string name;
+	u16 id_vendor;
+	u16 id_product_min;
+	u16 id_product_max;
 };
 
 struct UsbPipe
@@ -76,37 +54,12 @@ struct UsbPipe
 	u8 endpoint = 0;
 };
 
-struct usb_allow_list_entry
-{
-	u16 id_vendor;
-	u16 id_product_min;
-	u16 id_product_max;
-	std::string_view device_name;
-	u16(*max_device_count)(void);
-	std::shared_ptr<usb_device>(*make_instance)(u32, const std::array<u8, 7>&);
-	auto operator<(const usb_allow_list_entry& r) const
-	{
-		return std::tuple(id_vendor, id_product_min, id_product_max, device_name, max_device_count, make_instance) < std::tuple(r.id_vendor, r.id_product_min, r.id_product_max, device_name, max_device_count, make_instance);
-	}
-};
 class usb_handler_thread
 {
 public:
 	usb_handler_thread();
 	~usb_handler_thread();
 
-	SAVESTATE_INIT_POS(14);
-
-	usb_handler_thread(utils::serial& ar) : usb_handler_thread()
-	{
-		is_init = !!ar.pop<u8>();
-	}
-
-	void save(utils::serial& ar)
-	{
-		ar(u8{is_init.load()});
-	}
-
 	// Thread loop
 	void operator()();
 
@@ -114,8 +67,8 @@ public:
 	void transfer_complete(libusb_transfer* transfer);
 
 	// LDDs handling functions
-	bool add_ldd(std::string_view product, u16 id_vendor, u16 id_product_min, u16 id_product_max);
-	bool remove_ldd(std::string_view product);
+	u32 add_ldd(vm::ptr<char> s_product, u16 slen_product, u16 id_vendor, u16 id_product_min, u16 id_product_max);
+	void check_devices_vs_ldds();
 
 	// Pipe functions
 	u32 open_pipe(u32 device_handle, u8 endpoint);
@@ -128,37 +81,24 @@ public:
 	void add_event(u64 arg1, u64 arg2, u64 arg3);
 
 	// Transfers related functions
-	std::pair<u32, UsbTransfer&> get_free_transfer();
-	std::pair<u32, u32> get_transfer_status(u32 transfer_id);
-	std::pair<u32, UsbDeviceIsoRequest> get_isochronous_transfer_status(u32 transfer_id);
-	void push_fake_transfer(UsbTransfer* transfer);
-
-	const std::array<u8, 7>& get_new_location();
-	void connect_usb_device(std::shared_ptr<usb_device> dev, bool update_usb_devices = false);
-	void disconnect_usb_device(std::shared_ptr<usb_device> dev, bool update_usb_devices = false);
+	u32 get_free_transfer_id();
+	UsbTransfer& get_transfer(u32 transfer_id);
 
 	// Map of devices actively handled by the ps3(device_id, device)
 	std::map<u32, std::pair<UsbInternalDevice, std::shared_ptr<usb_device>>> handled_devices;
-	std::map<u8, std::pair<input::product_type, std::shared_ptr<usb_device>>> pad_to_usb;
+	// Fake transfers
+	std::vector<UsbTransfer*> fake_transfers;
 
 	shared_mutex mutex;
 	atomic_t<bool> is_init = false;
 
 	// sys_usbd_receive_event PPU Threads
-	shared_mutex mutex_sq;
-	ppu_thread* sq{};
-
-	atomic_t<u64> usb_hotplug_timeout = umax;
+	std::deque<ppu_thread*> sq;
 
 	static constexpr auto thread_name = "Usb Manager Thread"sv;
 
 private:
-	// Lock free functions for internal use(ie make sure to lock before using those)
-	UsbTransfer& get_transfer(u32 transfer_id);
-	u32 get_free_transfer_id();
-
 	void send_message(u32 message, u32 tr_id);
-	void perform_scan();
 
 private:
 	// Counters for device IDs, transfer IDs and pipe IDs
@@ -167,424 +107,165 @@ private:
 	u32 pipe_counter         = 0x10; // Start at 0x10 only for tracing purposes
 
 	// List of device drivers
-	std::unordered_map<std::string, UsbLdd, fmt::string_hash, std::equal_to<>> ldds;
-
-	const std::vector<usb_allow_list_entry> device_allow_list
-	{
-		// Portals
-		{0x1430, 0x0150, 0x0150, "Skylanders Portal", &usb_device_skylander::get_num_emu_devices, &usb_device_skylander::make_instance},
-		{0x0E6F, 0x0129, 0x0129, "Disney Infinity Base", &usb_device_infinity::get_num_emu_devices, &usb_device_infinity::make_instance},
-		{0x0E6F, 0x0241, 0x0241, "Lego Dimensions Portal", &usb_device_dimensions::get_num_emu_devices, &usb_device_dimensions::make_instance},
-		{0x0E6F, 0x200A, 0x200A, "Kamen Rider Summonride Portal", nullptr, nullptr},
-
-		// Cameras
-		// {0x1415, 0x0020, 0x2000, "Sony Playstation Eye", nullptr, nullptr}, // TODO: verifiy
-
-		// Music devices
-		{0x1415, 0x0000, 0x0000, "Singstar Microphone", nullptr, nullptr},
-		// {0x1415, 0x0020, 0x0020, "SingStar Microphone Wireless", nullptr, nullptr}, // TODO: verifiy
-
-		{0x12BA, 0x00FF, 0x00FF, "Rocksmith Guitar Adapter", nullptr, nullptr},
-		{0x12BA, 0x0100, 0x0100, "Guitar Hero Guitar", nullptr, nullptr},
-		{0x12BA, 0x0120, 0x0120, "Guitar Hero Drums", nullptr, nullptr},
-		{0x12BA, 0x074B, 0x074B, "Guitar Hero Live Guitar", &usb_device_ghltar::get_num_emu_devices, &usb_device_ghltar::make_instance},
-
-		{0x12BA, 0x0140, 0x0140, "DJ Hero Turntable", &usb_device_turntable::get_num_emu_devices, &usb_device_turntable::make_instance},
-		{0x12BA, 0x0200, 0x020F, "Harmonix Guitar", nullptr, nullptr},
-		{0x12BA, 0x0210, 0x021F, "Harmonix Drums", nullptr, nullptr},
-		{0x12BA, 0x2330, 0x233F, "Harmonix Keyboard", nullptr, nullptr},
-		{0x12BA, 0x2430, 0x243F, "Harmonix Button Guitar", nullptr, nullptr},
-		{0x12BA, 0x2530, 0x253F, "Harmonix Real Guitar", nullptr, nullptr},
-
-		{0x1BAD, 0x0004, 0x0004, "Harmonix RB1 Guitar - Wii", nullptr, nullptr},
-		{0x1BAD, 0x0005, 0x0005, "Harmonix RB1 Drums - Wii", nullptr, nullptr},
-		{0x1BAD, 0x3010, 0x301F, "Harmonix RB2 Guitar - Wii", nullptr, nullptr},
-		{0x1BAD, 0x3110, 0x313F, "Harmonix RB2 Drums - Wii", nullptr, nullptr},
-		{0x1BAD, 0x3330, 0x333F, "Harmonix Keyboard - Wii", nullptr, nullptr},
-		{0x1BAD, 0x3430, 0x343F, "Harmonix Button Guitar - Wii", nullptr, nullptr},
-		{0x1BAD, 0x3530, 0x353F, "Harmonix Real Guitar - Wii", nullptr, nullptr},
-
-		//Top Shot Elite controllers
-		{0x12BA, 0x04A0, 0x04A0, "Top Shot Elite", nullptr, nullptr},
-		{0x12BA, 0x04A1, 0x04A1, "Top Shot Fearmaster", nullptr, nullptr},
-		{0x12BA, 0x04B0, 0x04B0, "Rapala Fishing Rod", nullptr, nullptr},
-
-
-		// GT5 Wheels&co
-#ifdef HAVE_SDL3
-		{0x046D, 0xC283, 0xC29B, "lgFF_c283_c29b", &usb_device_logitech_g27::get_num_emu_devices, &usb_device_logitech_g27::make_instance},
-#else
-		{0x046D, 0xC283, 0xC29B, "lgFF_c283_c29b", nullptr, nullptr},
-#endif
-		{0x044F, 0xB653, 0xB653, "Thrustmaster RGT FFB Pro", nullptr, nullptr},
-		{0x044F, 0xB65A, 0xB65A, "Thrustmaster F430", nullptr, nullptr},
-		{0x044F, 0xB65D, 0xB65D, "Thrustmaster FFB", nullptr, nullptr},
-		{0x044F, 0xB65E, 0xB65E, "Thrustmaster TRS", nullptr, nullptr},
-		{0x044F, 0xB660, 0xB660, "Thrustmaster T500 RS Gear Shift", nullptr, nullptr},
-
-		// GT6
-		{0x2833, 0x0001, 0x0001, "Oculus", nullptr, nullptr},
-		{0x046D, 0xCA03, 0xCA03, "lgFF_ca03_ca03", nullptr, nullptr},
-
-		// Buzz controllers
-		{0x054C, 0x1000, 0x1040, "buzzer0", &usb_device_buzz::get_num_emu_devices, &usb_device_buzz::make_instance},
-		{0x054C, 0x0001, 0x0041, "buzzer1", nullptr, nullptr},
-		{0x054C, 0x0042, 0x0042, "buzzer2", nullptr, nullptr},
-		{0x046D, 0xC220, 0xC220, "buzzer9", nullptr, nullptr},
-
-		// GCon3 Gun
-		{0x0B9A, 0x0800, 0x0800, "guncon3", nullptr, nullptr},
-
-		// uDraw GameTablet
-		{0x20D6, 0xCB17, 0xCB17, "uDraw GameTablet", nullptr, nullptr},
-
-		// DVB-T
-		{0x1415, 0x0003, 0x0003, "PlayTV SCEH-0036", nullptr, nullptr},
-
-		// PSP Devices
-		{0x054C, 0x01C8, 0x01C8, "PSP Type A", nullptr, nullptr},
-		{0x054C, 0x01C9, 0x01C9, "PSP Type B", nullptr, nullptr},
-		{0x054C, 0x01CA, 0x01CA, "PSP Type C", nullptr, nullptr},
-		{0x054C, 0x01CB, 0x01CB, "PSP Type D", nullptr, nullptr},
-		{0x054C, 0x02D2, 0x02D2, "PSP Slim", nullptr, nullptr},
-
-		// 0x0900: "H050 USJ(C) PCB rev00", 0x0910: "USIO PCB rev00"
-		{0x0B9A, 0x0900, 0x0910, "PS3A-USJ", &usb_device_usio::get_num_emu_devices, &usb_device_usio::make_instance},
-
-		// Densha de GO! controller
-		{0x0AE4, 0x0004, 0x0004, "Densha de GO! Type 2 Controller", nullptr, nullptr},
-
-		// EA Active 2 dongle for connecting wristbands & legband
-		{0x21A4, 0xAC27, 0xAC27, "EA Active 2 Dongle", nullptr, nullptr},
-
-		// Tony Hawk RIDE Skateboard
-		{0x12BA, 0x0400, 0x0400, "Tony Hawk RIDE Skateboard Controller", nullptr, nullptr},
-
-		// PSP in UsbPspCm mode
-		{0x054C, 0x01CB, 0x01CB, "UsbPspcm", nullptr, nullptr},
-
-		// Sony Stereo Headsets
-		{0x12BA, 0x0032, 0x0032, "Wireless Stereo Headset", nullptr, nullptr},
-		{0x12BA, 0x0042, 0x0042, "Wireless Stereo Headset", nullptr, nullptr},
-	};
+	std::vector<UsbLdd> ldds;
 
 	// List of pipes
 	std::map<u32, UsbPipe> open_pipes;
 	// Transfers infos
-	shared_mutex mutex_transfers;
-	std::array<UsbTransfer, MAX_SYS_USBD_TRANSFERS> transfers;
-	std::vector<UsbTransfer*> fake_transfers;
+	std::array<UsbTransfer, 0x44> transfers;
 
 	// Queue of pending usbd events
 	std::queue<std::tuple<u64, u64, u64>> usbd_events;
 
 	// List of devices "connected" to the ps3
-	std::array<u8, 7> location{};
 	std::vector<std::shared_ptr<usb_device>> usb_devices;
-	std::unordered_map<uint64_t, std::shared_ptr<usb_device>> usb_passthrough_devices;
 
 	libusb_context* ctx = nullptr;
-
-#ifndef _WIN32
-#if LIBUSB_API_VERSION >= 0x01000102
-	libusb_hotplug_callback_handle callback_handle {};
-#endif
-#endif
-
-	bool hotplug_supported = false;
 };
 
 void LIBUSB_CALL callback_transfer(struct libusb_transfer* transfer)
 {
 	auto& usbh = g_fxo->get<named_thread<usb_handler_thread>>();
 
+	std::lock_guard lock(usbh.mutex);
 	if (!usbh.is_init)
 		return;
 
 	usbh.transfer_complete(transfer);
 }
 
-#ifndef _WIN32
-#if LIBUSB_API_VERSION >= 0x01000102
-static int LIBUSB_CALL hotplug_callback(libusb_context* /*ctx*/, libusb_device * /*dev*/, libusb_hotplug_event event, void * /*user_data*/)
+usb_handler_thread::usb_handler_thread()
 {
-	handle_hotplug_event(event == LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED);
-	return 0;
-}
-#endif
-#endif
-
-#if LIBUSB_API_VERSION >= 0x0100010A
-static void LIBUSB_CALL log_cb(libusb_context* /*ctx*/, enum libusb_log_level level, const char* str)
-{
-	if (!str)
+	if (libusb_init(&ctx) < 0)
 		return;
 
-	const std::string msg = fmt::trim(str, " \t\n");
-
-	switch (level)
-	{
-	case LIBUSB_LOG_LEVEL_ERROR:
-		sys_usbd.error("libusb log: %s", msg);
-		break;
-	case LIBUSB_LOG_LEVEL_WARNING:
-		sys_usbd.warning("libusb log: %s", msg);
-		break;
-	case LIBUSB_LOG_LEVEL_INFO:
-		sys_usbd.notice("libusb log: %s", msg);
-		break;
-	case LIBUSB_LOG_LEVEL_DEBUG:
-		sys_usbd.trace("libusb log: %s", msg);
-		break;
-	default:
-		break;
-	}
-}
-#endif
-
-void usb_handler_thread::perform_scan()
-{
 	// look if any device which we could be interested in is actually connected
 	libusb_device** list = nullptr;
-	const ssize_t ndev   = libusb_get_device_list(ctx, &list);
-	std::set<uint64_t> seen_usb_devices;
+	ssize_t ndev = libusb_get_device_list(ctx, &list);
 
-	if (ndev < 0)
-	{
-		sys_usbd.error("Failed to get device list: %s", libusb_error_name(static_cast<s32>(ndev)));
-		return;
-	}
+	bool found_skylander = false;
+	bool found_ghltar    = false;
+	bool found_turntable = false;
 
 	for (ssize_t index = 0; index < ndev; index++)
 	{
-		libusb_device* dev = list[index];
 		libusb_device_descriptor desc;
-		if (int res = libusb_get_device_descriptor(dev, &desc); res < 0)
-		{
-			sys_usbd.error("Failed to get device descriptor: %s", libusb_error_name(res));
-			continue;
-		}
+		libusb_get_device_descriptor(list[index], &desc);
 
-		const u8 port = libusb_get_port_number(dev);
-		const u8 address = libusb_get_device_address(dev);
-		const u64 usb_id = (static_cast<uint64_t>(desc.idVendor) << 48) | (static_cast<uint64_t>(desc.idProduct) << 32) | (static_cast<uint64_t>(port) << 8) | address;
-
-		seen_usb_devices.insert(usb_id);
-		if (usb_passthrough_devices.contains(usb_id))
+		// clang-format off
+		auto check_device = [&](const u16 id_vendor, const u16 id_product_min, const u16 id_product_max, const char* s_name) -> bool
 		{
-			continue;
-		}
-
-		for (const auto& entry : device_allow_list)
-		{
-			// attach
-			if (desc.idVendor == entry.id_vendor
-				&& desc.idProduct >= entry.id_product_min
-				&& desc.idProduct <= entry.id_product_max)
+			if (desc.idVendor == id_vendor && desc.idProduct >= id_product_min && desc.idProduct <= id_product_max)
 			{
-				sys_usbd.success("Found device: %s", std::basic_string(entry.device_name));
-				libusb_ref_device(dev);
-				std::shared_ptr<usb_device_passthrough> usb_dev = std::make_shared<usb_device_passthrough>(dev, desc, get_new_location());
-				connect_usb_device(usb_dev, true);
-				usb_passthrough_devices[usb_id] = usb_dev;
+				sys_usbd.success("Found device: %s", s_name);
+				libusb_ref_device(list[index]);
+				std::shared_ptr<usb_device_passthrough> usb_dev = std::make_shared<usb_device_passthrough>(list[index], desc);
+				usb_devices.push_back(usb_dev);
+				return true;
 			}
+			return false;
+		};
+		// clang-format on
+
+		// Portals
+		if (check_device(0x1430, 0x0150, 0x0150, "Skylanders Portal"))
+		{
+			found_skylander = true;
 		}
 
-		if (desc.idVendor == 0x1209 && desc.idProduct == 0x2882)
+		check_device(0x0E6F, 0x0241, 0x0241, "Lego Dimensions Portal");
+		check_device(0x0E6F, 0x0129, 0x0129, "Disney Infinity Portal");
+		check_device(0x0E6F, 0x200A, 0x200A, "Kamen Rider Summonride Portal");
+
+		// Cameras
+		//check_device(0x1415, 0x0020, 0x2000, "Sony Playstation Eye"); // TODO: verifiy
+
+		// Music devices
+		check_device(0x1415, 0x0000, 0x0000, "SingStar Microphone");
+		//check_device(0x1415, 0x0020, 0x0020, "SingStar Microphone Wireless"); // TODO: verifiy
+		check_device(0x12BA, 0x0100, 0x0100, "Guitar Hero Guitar");
+		check_device(0x12BA, 0x0120, 0x0120, "Guitar Hero Drums");
+		if (check_device(0x12BA, 0x074B, 0x074B, "Guitar Hero Live Guitar"))
 		{
-			sys_usbd.success("Found device: Santroller");
-			// Send the device a specific control transfer so that it jumps to a RPCS3 compatible mode
-			libusb_device_handle* lusb_handle;
-			if (libusb_open(dev, &lusb_handle) == LIBUSB_SUCCESS)
-			{
-#ifdef __linux__
-				libusb_set_auto_detach_kernel_driver(lusb_handle, true);
-				libusb_claim_interface(lusb_handle, 2);
-#endif
-				libusb_control_transfer(lusb_handle, +LIBUSB_ENDPOINT_IN | +LIBUSB_REQUEST_TYPE_CLASS | +LIBUSB_RECIPIENT_INTERFACE, 0x01, 0x03f2, 2, nullptr, 0, 5000);
-				libusb_close(lusb_handle);
-			}
-			else
-			{
-				sys_usbd.error("Unable to open Santroller device, make sure Santroller isn't open in the background.");
-			}
+			found_ghltar = true;
 		}
+
+		if (check_device(0x12BA, 0x0140, 0x0140, "DJ Hero Turntable"))
+		{
+			found_turntable = true;
+		}
+		check_device(0x12BA, 0x0200, 0x020F, "Harmonix Guitar");
+		check_device(0x12BA, 0x0210, 0x021F, "Harmonix Drums");
+		check_device(0x12BA, 0x2330, 0x233F, "Harmonix Keyboard");
+		check_device(0x12BA, 0x2430, 0x243F, "Harmonix Button Guitar");
+		check_device(0x12BA, 0x2530, 0x253F, "Harmonix Real Guitar");
+
+		// GT5 Wheels&co
+		check_device(0x046D, 0xC283, 0xC29B, "lgFF_c283_c29b");
+		check_device(0x044F, 0xB653, 0xB653, "Thrustmaster RGT FFB Pro");
+		check_device(0x044F, 0xB65A, 0xB65A, "Thrustmaster F430");
+		check_device(0x044F, 0xB65D, 0xB65D, "Thrustmaster FFB");
+		check_device(0x044F, 0xB65E, 0xB65E, "Thrustmaster TRS");
+		check_device(0x044F, 0xB660, 0xB660, "Thrustmaster T500 RS Gear Shift");
+
+		// GT6
+		check_device(0x2833, 0x0001, 0x0001, "Oculus");
+		check_device(0x046D, 0xCA03, 0xCA03, "lgFF_ca03_ca03");
+
+		// Buzz controllers
+		check_device(0x054C, 0x1000, 0x1040, "buzzer0");
+		check_device(0x054C, 0x0001, 0x0041, "buzzer1");
+		check_device(0x054C, 0x0042, 0x0042, "buzzer2");
+		check_device(0x046D, 0xC220, 0xC220, "buzzer9");
+
+		// GCon3 Gun
+		check_device(0x0B9A, 0x0800, 0x0800, "guncon3");
+
+		// uDraw GameTablet
+		check_device(0x20D6, 0xCB17, 0xCB17, "uDraw GameTablet");
+
+		// DVB-T
+		check_device(0x1415, 0x0003, 0x0003, " PlayTV SCEH-0036");
 	}
 
-	for (auto it = usb_passthrough_devices.begin(); it != usb_passthrough_devices.end();)
-	{
-		auto& dev = *it;
-		// If a device is no longer visible, disconnect it
-		if (seen_usb_devices.contains(dev.first))
-		{
-			++it;
-		}
-		else
-		{
-			disconnect_usb_device(dev.second, true);
-			it = usb_passthrough_devices.erase(it);
-		}
-
-	}
 	libusb_free_device_list(list, 1);
-}
 
-usb_handler_thread::usb_handler_thread()
-{
-#if LIBUSB_API_VERSION >= 0x0100010A
-	libusb_init_option log_lv_opt{};
-	log_lv_opt.option = LIBUSB_OPTION_LOG_LEVEL;
-	log_lv_opt.value.ival = LIBUSB_LOG_LEVEL_WARNING;// You can also set the LIBUSB_DEBUG env variable instead
-
-	libusb_init_option log_cb_opt{};
-	log_cb_opt.option = LIBUSB_OPTION_LOG_CB;
-	log_cb_opt.value.log_cbval = &log_cb;
-
-	std::vector<libusb_init_option> options = {
-		std::move(log_lv_opt),
-		std::move(log_cb_opt)
-	};
-
-	if (int res = libusb_init_context(&ctx, options.data(), static_cast<int>(options.size())); res < 0)
-#else
-	if (int res = libusb_init(&ctx); res < 0)
-#endif
+	if (!found_skylander)
 	{
-		sys_usbd.error("Failed to initialize sys_usbd: %s", libusb_error_name(res));
-		return;
+		sys_usbd.notice("Adding emulated skylander");
+		usb_devices.push_back(std::make_shared<usb_device_skylander>());
 	}
 
-#ifdef _WIN32
-	hotplug_supported = true;
-#elif LIBUSB_API_VERSION >= 0x01000102
-	if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG))
+	if (!found_ghltar)
 	{
-		if (int res = libusb_hotplug_register_callback(ctx, static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-			LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT), static_cast<libusb_hotplug_flag>(0), LIBUSB_HOTPLUG_MATCH_ANY, LIBUSB_HOTPLUG_MATCH_ANY,
-			LIBUSB_HOTPLUG_MATCH_ANY, static_cast<libusb_hotplug_callback_fn>(hotplug_callback), nullptr,
-			&callback_handle); res < 0)
-		{
-			sys_usbd.error("Failed to initialize sys_usbd hotplug: %s", libusb_error_name(res));
-		}
-		else
-		{
-			hotplug_supported = true;
-		}
+		sys_usbd.notice("Adding emulated GHLtar");
+		usb_devices.push_back(std::make_shared<usb_device_ghltar>());
+	}
+
+	if (!found_turntable)
+	{
+		sys_usbd.notice("Adding emulated turntable");
+		usb_devices.push_back(std::make_shared<usb_device_turntable>());
+	}
+
+	if (g_cfg.io.buzz == buzz_handler::one_controller || g_cfg.io.buzz == buzz_handler::two_controllers)
+	{
+		sys_usbd.notice("Adding emulated Buzz! buzzer (1-4 players)");
+		usb_devices.push_back(std::make_shared<usb_device_buzz>(0, 3));
+	}
+	if (g_cfg.io.buzz == buzz_handler::two_controllers)
+	{
+		// The current buzz emulation piggybacks on the pad input.
+		// Since there can only be 7 pads connected on a PS3 the 8th player is currently not supported
+		sys_usbd.notice("Adding emulated Buzz! buzzer (5-7 players)");
+		usb_devices.push_back(std::make_shared<usb_device_buzz>(4, 6));
 	}
-#endif
 
 	for (u32 index = 0; index < MAX_SYS_USBD_TRANSFERS; index++)
 	{
 		transfers[index].transfer    = libusb_alloc_transfer(8);
 		transfers[index].transfer_id = index;
 	}
-
-	if (!g_cfg_usio.load())
-	{
-		sys_usbd.notice("Could not load usio config. Using defaults.");
-	}
-
-	sys_usbd.notice("USIO config=\n", g_cfg_usio.to_string());
-
-	if (g_cfg.io.ghltar == ghltar_handler::one_controller || g_cfg.io.ghltar == ghltar_handler::two_controllers)
-	{
-		if (!g_cfg_ghltar.load())
-		{
-			sys_usbd.notice("Could not load ghltar config. Using defaults.");
-		}
-
-		sys_usbd.notice("Ghltar config=\n", g_cfg_ghltar.to_string());
-	}
-
-	if (g_cfg.io.turntable == turntable_handler::one_controller || g_cfg.io.turntable == turntable_handler::two_controllers)
-	{
-		if (!g_cfg_turntable.load())
-		{
-			sys_usbd.notice("Could not load turntable config. Using defaults.");
-		}
-
-		sys_usbd.notice("Turntable config=\n", g_cfg_turntable.to_string());
-	}
-
-	if (g_cfg.io.buzz == buzz_handler::one_controller || g_cfg.io.buzz == buzz_handler::two_controllers)
-	{
-		if (!g_cfg_buzz.load())
-		{
-			sys_usbd.notice("Could not load buzz config. Using defaults.");
-		}
-
-		sys_usbd.notice("Buzz config=\n", g_cfg_buzz.to_string());
-	}
-
-	perform_scan();
-
-	// Set up emulated devices for any devices that are not already being passed through
-	std::map<usb_allow_list_entry, int> passthrough_usb_device_counts;
-	for (const auto& dev : usb_devices)
-	{
-		for (const auto& entry : device_allow_list)
-		{
-			const u16 idVendor = dev->device._device.idVendor;
-			const u16 idProduct = dev->device._device.idProduct;
-			if (entry.max_device_count != nullptr && (idVendor == entry.id_vendor && idProduct >= entry.id_product_min && idProduct <= entry.id_product_max))
-			{
-				passthrough_usb_device_counts[entry]++;
-			}
-		}
-	}
-
-	for (const auto& entry : device_allow_list)
-	{
-		if (entry.max_device_count && entry.make_instance)
-		{
-			const int count = passthrough_usb_device_counts[entry];
-			for (int i = count; i < entry.max_device_count(); i++)
-			{
-				sys_usbd.success("Emulating device: %s (%d)", std::basic_string(entry.device_name), i + 1);
-				auto usb_dev = entry.make_instance(i, get_new_location());
-				connect_usb_device(usb_dev, true);
-			}
-		}
-	}
-
-	for (int i = 0; i < 8; i++) // Add VFS USB mass storage devices (/dev_usbXXX) to the USB device list
-	{
-		const auto usb_info = g_cfg_vfs.get_device(g_cfg_vfs.dev_usb, fmt::format("/dev_usb%03d", i));
-		if (fs::is_dir(usb_info.path))
-			usb_devices.push_back(std::make_shared<usb_device_vfs>(usb_info, get_new_location()));
-	}
-
-	const std::vector<std::string> devices_list = fmt::split(g_cfg.io.midi_devices.to_string(), { "@@@" });
-	for (usz index = 0; index < std::min(max_midi_devices, devices_list.size()); index++)
-	{
-		const midi_device device = midi_device::from_string(::at32(devices_list, index));
-		if (device.name.empty()) continue;
-
-		sys_usbd.notice("Adding Emulated Midi Pro Adapter (type=%s, name=%s)", device.type, device.name);
-
-		switch (device.type)
-		{
-		case midi_device_type::guitar:
-			usb_devices.push_back(std::make_shared<usb_device_rb3_midi_guitar>(get_new_location(), device.name, false));
-			break;
-		case midi_device_type::guitar_22fret:
-			usb_devices.push_back(std::make_shared<usb_device_rb3_midi_guitar>(get_new_location(), device.name, true));
-			break;
-		case midi_device_type::keyboard:
-			usb_devices.push_back(std::make_shared<usb_device_rb3_midi_keyboard>(get_new_location(), device.name));
-			break;
-		case midi_device_type::drums:
-			if (!g_cfg_rb3drums.load())
-			{
-				sys_usbd.notice("Could not load rb3drums config. Using defaults.");
-			}
-
-			usb_devices.push_back(std::make_shared<usb_device_rb3_midi_drums>(get_new_location(), device.name));
-
-			sys_usbd.notice("RB3 drums config=\n", g_cfg_rb3drums.to_string());
-			break;
-		}
-	}
 }
 
 usb_handler_thread::~usb_handler_thread()
@@ -593,43 +274,24 @@ usb_handler_thread::~usb_handler_thread()
 	handled_devices.clear();
 	open_pipes.clear();
 	usb_devices.clear();
-	usb_passthrough_devices.clear();
+
+	if (ctx)
+		libusb_exit(ctx);
 
 	for (u32 index = 0; index < MAX_SYS_USBD_TRANSFERS; index++)
 	{
 		if (transfers[index].transfer)
 			libusb_free_transfer(transfers[index].transfer);
 	}
-
-#ifndef _WIN32
-#if LIBUSB_API_VERSION >= 0x01000102
-	if (ctx && hotplug_supported)
-		libusb_hotplug_deregister_callback(ctx, callback_handle);
-#endif
-#endif
-
-	if (ctx)
-		libusb_exit(ctx);
 }
 
 void usb_handler_thread::operator()()
 {
-	timeval lusb_tv{0, 0};
-	if (!hotplug_supported)
+	timeval lusb_tv{0, 200};
+
+	while (thread_ctrl::state() != thread_state::aborting)
 	{
-		usb_hotplug_timeout = get_system_time() + 4'000'000ull;
-	}
-	while (ctx && thread_ctrl::state() != thread_state::aborting)
-	{
-		const u64 now = get_system_time();
-		if (now > usb_hotplug_timeout)
-		{
-			// If we did the hotplug scan each cycle the game performance was significantly degraded, so we only perform this scan
-			// every 4 seconds.
-			// On systems where hotplug is native, we wait a little bit for devices to settle before we start the scan
-			perform_scan();
-			usb_hotplug_timeout = hotplug_supported ? umax : get_system_time() + 4'000'000ull;
-		}
+		// Todo: Hotplug here?
 
 		// Process asynchronous requests that are pending
 		libusb_handle_events_timeout_completed(ctx, &lusb_tv, nullptr);
@@ -637,7 +299,8 @@ void usb_handler_thread::operator()()
 		// Process fake transfers
 		if (!fake_transfers.empty())
 		{
-			std::lock_guard lock_tf(mutex_transfers);
+			std::lock_guard lock(this->mutex);
+
 			u64 timestamp = get_system_time() - Emu.GetPauseTime();
 
 			for (auto it = fake_transfers.begin(); it != fake_transfers.end();)
@@ -652,6 +315,7 @@ void usb_handler_thread::operator()()
 					continue;
 				}
 
+
 				transfer->result = transfer->expected_result;
 				transfer->count  = transfer->expected_count;
 				transfer->fake   = false;
@@ -663,22 +327,19 @@ void usb_handler_thread::operator()()
 		}
 
 		// If there is no handled devices usb thread is not actively needed
-		if (handled_devices.empty())
-			thread_ctrl::wait_for(500'000);
-		else
-			thread_ctrl::wait_for(1'000);
+		thread_ctrl::wait_for(handled_devices.empty() ? 500'000 : 200);
 	}
 }
 
 void usb_handler_thread::send_message(u32 message, u32 tr_id)
 {
+	sys_usbd.trace("Sending event: arg1=0x%x arg2=0x%x arg3=0x00", message, tr_id);
+
 	add_event(message, tr_id, 0x00);
 }
 
 void usb_handler_thread::transfer_complete(struct libusb_transfer* transfer)
 {
-	std::lock_guard lock_tf(mutex_transfers);
-
 	UsbTransfer* usbd_transfer = static_cast<UsbTransfer*>(transfer->user_data);
 
 	if (transfer->status != 0)
@@ -691,23 +352,11 @@ void usb_handler_thread::transfer_complete(struct libusb_transfer* transfer)
 	case LIBUSB_TRANSFER_COMPLETED: usbd_transfer->result = HC_CC_NOERR; break;
 	case LIBUSB_TRANSFER_TIMED_OUT: usbd_transfer->result = EHCI_CC_XACT; break;
 	case LIBUSB_TRANSFER_OVERFLOW: usbd_transfer->result = EHCI_CC_BABBLE; break;
-	case LIBUSB_TRANSFER_NO_DEVICE:
-		usbd_transfer->result = EHCI_CC_HALTED;
-		for (const auto& dev : usb_devices)
-		{
-			if (dev->assigned_number == usbd_transfer->assigned_number)
-			{
-				disconnect_usb_device(dev, true);
-				break;
-			}
-		}
-		break;
 	case LIBUSB_TRANSFER_ERROR:
 	case LIBUSB_TRANSFER_CANCELLED:
 	case LIBUSB_TRANSFER_STALL:
-	default:
-		usbd_transfer->result = EHCI_CC_HALTED;
-		break;
+	case LIBUSB_TRANSFER_NO_DEVICE:
+	default: usbd_transfer->result = EHCI_CC_HALTED; break;
 	}
 
 	usbd_transfer->count = transfer->actual_length;
@@ -730,12 +379,6 @@ void usb_handler_thread::transfer_complete(struct libusb_transfer* transfer)
 		usbd_transfer->iso_request.packets[index] = ((iso_status & 0xF) << 12 | (transfer->iso_packet_desc[index].actual_length & 0xFFF));
 	}
 
-	if (transfer->type == LIBUSB_TRANSFER_TYPE_CONTROL && usbd_transfer->control_destbuf)
-	{
-		memcpy(usbd_transfer->control_destbuf, transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE, transfer->actual_length);
-		usbd_transfer->control_destbuf = nullptr;
-	}
-
 	usbd_transfer->busy = false;
 
 	send_message(SYS_USBD_TRANSFER_COMPLETE, usbd_transfer->transfer_id);
@@ -743,47 +386,17 @@ void usb_handler_thread::transfer_complete(struct libusb_transfer* transfer)
 	sys_usbd.trace("Transfer complete(0x%x): %s", usbd_transfer->transfer_id, *transfer);
 }
 
-bool usb_handler_thread::add_ldd(std::string_view product, u16 id_vendor, u16 id_product_min, u16 id_product_max)
+u32 usb_handler_thread::add_ldd(vm::ptr<char> s_product, u16 slen_product, u16 id_vendor, u16 id_product_min, u16 id_product_max)
 {
-	if (ldds.try_emplace(std::string(product), UsbLdd{id_vendor, id_product_min, id_product_max}).second)
-	{
-		for (const auto& dev : usb_devices)
-		{
-			if (dev->assigned_number)
-				continue;
+	UsbLdd new_ldd;
+	new_ldd.name.resize(slen_product);
+	memcpy(new_ldd.name.data(), s_product.get_ptr(), slen_product);
+	new_ldd.id_vendor      = id_vendor;
+	new_ldd.id_product_min = id_product_min;
+	new_ldd.id_product_max = id_product_max;
+	ldds.push_back(new_ldd);
 
-			if (dev->device._device.idVendor == id_vendor && dev->device._device.idProduct >= id_product_min && dev->device._device.idProduct <= id_product_max)
-			{
-				connect_usb_device(dev);
-			}
-		}
-
-		return true;
-	}
-
-	return false;
-}
-
-bool usb_handler_thread::remove_ldd(std::string_view product)
-{
-	if (const auto iterator = ldds.find(product); iterator != ldds.end())
-	{
-		for (const auto& dev : usb_devices)
-		{
-			if (!dev->assigned_number)
-				continue;
-
-			if (dev->device._device.idVendor == iterator->second.id_vendor && dev->device._device.idProduct >= iterator->second.id_product_min && dev->device._device.idProduct <= iterator->second.id_product_max)
-			{
-				disconnect_usb_device(dev);
-			}
-		}
-
-		ldds.erase(iterator);
-		return true;
-	}
-
-	return false;
+	return ::size32(ldds); // TODO: to check
 }
 
 u32 usb_handler_thread::open_pipe(u32 device_handle, u8 endpoint)
@@ -804,7 +417,36 @@ bool usb_handler_thread::is_pipe(u32 pipe_id) const
 
 const UsbPipe& usb_handler_thread::get_pipe(u32 pipe_id) const
 {
-	return ::at32(open_pipes, pipe_id);
+	return open_pipes.at(pipe_id);
+}
+
+void usb_handler_thread::check_devices_vs_ldds()
+{
+	for (const auto& dev : usb_devices)
+	{
+		if (dev->assigned_number)
+			continue;
+
+		for (const auto& ldd : ldds)
+		{
+			if (dev->device._device.idVendor == ldd.id_vendor && dev->device._device.idProduct >= ldd.id_product_min && dev->device._device.idProduct <= ldd.id_product_max)
+			{
+				if (!dev->open_device())
+				{
+					sys_usbd.error("Failed to open device for LDD(VID:0x%x PID:0x%x)", dev->device._device.idVendor, dev->device._device.idProduct);
+					continue;
+				}
+
+				dev->read_descriptors();
+				dev->assigned_number = dev_counter++; // assign current dev_counter, and atomically increment
+
+				sys_usbd.success("Ldd device matchup for <%s>, assigned as handled_device=0x%x", ldd.name, dev->assigned_number);
+
+				handled_devices.emplace(dev->assigned_number, std::pair(UsbInternalDevice{0x00, narrow<u8>(dev->assigned_number), 0x02, 0x40}, dev));
+				send_message(SYS_USBD_ATTACH, dev->assigned_number);
+			}
+		}
+	}
 }
 
 bool usb_handler_thread::get_event(vm::ptr<u64>& arg1, vm::ptr<u64>& arg2, vm::ptr<u64>& arg3)
@@ -826,11 +468,8 @@ bool usb_handler_thread::get_event(vm::ptr<u64>& arg1, vm::ptr<u64>& arg2, vm::p
 void usb_handler_thread::add_event(u64 arg1, u64 arg2, u64 arg3)
 {
 	// sys_usbd events use an internal event queue with SYS_SYNC_PRIORITY protocol
-	std::lock_guard lock_sq(mutex_sq);
-
 	if (const auto cpu = lv2_obj::schedule<ppu_thread>(sq, SYS_SYNC_PRIORITY))
 	{
-		sys_usbd.trace("Sending event(queue): arg1=0x%x arg2=0x%x arg3=0x%x", arg1, arg2, arg3);
 		cpu->gpr[4] = arg1;
 		cpu->gpr[5] = arg2;
 		cpu->gpr[6] = arg3;
@@ -838,28 +477,18 @@ void usb_handler_thread::add_event(u64 arg1, u64 arg2, u64 arg3)
 	}
 	else
 	{
-		sys_usbd.trace("Sending event: arg1=0x%x arg2=0x%x arg3=0x%x", arg1, arg2, arg3);
 		usbd_events.emplace(arg1, arg2, arg3);
 	}
 }
 
 u32 usb_handler_thread::get_free_transfer_id()
 {
-	u32 num_loops = 0;
 	do
 	{
-		num_loops++;
 		transfer_counter++;
 
 		if (transfer_counter >= MAX_SYS_USBD_TRANSFERS)
-		{
 			transfer_counter = 0;
-		}
-
-		if (num_loops > MAX_SYS_USBD_TRANSFERS)
-		{
-			sys_usbd.fatal("Usb transfers are saturated!");
-		}
 	} while (transfers[transfer_counter].busy);
 
 	return transfer_counter;
@@ -870,189 +499,6 @@ UsbTransfer& usb_handler_thread::get_transfer(u32 transfer_id)
 	return transfers[transfer_id];
 }
 
-std::pair<u32, UsbTransfer&> usb_handler_thread::get_free_transfer()
-{
-	std::lock_guard lock_tf(mutex_transfers);
-
-	u32 transfer_id = get_free_transfer_id();
-	auto& transfer  = get_transfer(transfer_id);
-	transfer.busy   = true;
-
-	return {transfer_id, transfer};
-}
-
-std::pair<u32, u32> usb_handler_thread::get_transfer_status(u32 transfer_id)
-{
-	std::lock_guard lock_tf(mutex_transfers);
-
-	const auto& transfer = get_transfer(transfer_id);
-
-	return {transfer.result, transfer.count};
-}
-
-std::pair<u32, UsbDeviceIsoRequest> usb_handler_thread::get_isochronous_transfer_status(u32 transfer_id)
-{
-	std::lock_guard lock_tf(mutex_transfers);
-
-	const auto& transfer = get_transfer(transfer_id);
-
-	return {transfer.result, transfer.iso_request};
-}
-
-void usb_handler_thread::push_fake_transfer(UsbTransfer* transfer)
-{
-	std::lock_guard lock_tf(mutex_transfers);
-	fake_transfers.push_back(transfer);
-}
-
-const std::array<u8, 7>& usb_handler_thread::get_new_location()
-{
-	location[0]++;
-	return location;
-}
-
-void usb_handler_thread::connect_usb_device(std::shared_ptr<usb_device> dev, bool update_usb_devices)
-{
-	if (update_usb_devices)
-		usb_devices.push_back(dev);
-
-	for (const auto& [name, ldd] : ldds)
-	{
-		if (dev->device._device.idVendor == ldd.id_vendor && dev->device._device.idProduct >= ldd.id_product_min && dev->device._device.idProduct <= ldd.id_product_max)
-		{
-			if (!dev->open_device())
-			{
-				sys_usbd.error("Failed to open USB device(VID=0x%04x, PID=0x%04x) for LDD <%s>", dev->device._device.idVendor, dev->device._device.idProduct, name);
-				disconnect_usb_device(dev);
-				return;
-			}
-
-			dev->read_descriptors();
-			dev->assigned_number = dev_counter++; // assign current dev_counter, and atomically increment0
-			handled_devices.emplace(dev->assigned_number, std::pair(UsbInternalDevice{0x00, narrow<u8>(dev->assigned_number), 0x02, 0x40}, dev));
-			send_message(SYS_USBD_ATTACH, dev->assigned_number);
-			sys_usbd.success("USB device(VID=0x%04x, PID=0x%04x) matches up with LDD <%s>, assigned as handled_device=0x%x", dev->device._device.idVendor, dev->device._device.idProduct, name, dev->assigned_number);
-			return;
-		}
-	}
-}
-
-void usb_handler_thread::disconnect_usb_device(std::shared_ptr<usb_device> dev, bool update_usb_devices)
-{
-	if (dev->assigned_number && handled_devices.erase(dev->assigned_number))
-	{
-		send_message(SYS_USBD_DETACH, dev->assigned_number);
-		sys_usbd.success("USB device(VID=0x%04x, PID=0x%04x) unassigned, handled_device=0x%x", dev->device._device.idVendor, dev->device._device.idProduct, dev->assigned_number);
-		dev->assigned_number = 0;
-		std::erase_if(open_pipes, [&](const auto& val)
-		{
-			return val.second.device == dev;
-		});
-	}
-	if (update_usb_devices)
-	{
-		std::erase_if(usb_devices, [&](const auto& val)
-		{
-			return val == dev;
-		});
-	}
-}
-
-void connect_usb_controller(u8 index, input::product_type type)
-{
-	auto usbh = g_fxo->try_get<named_thread<usb_handler_thread>>();
-	if (!usbh)
-	{
-		return;
-	}
-
-	bool already_connected = false;
-
-	if (const auto it = usbh->pad_to_usb.find(index); it != usbh->pad_to_usb.end())
-	{
-		if (it->second.first == type)
-		{
-			already_connected = true;
-		}
-		else
-		{
-			usbh->disconnect_usb_device(it->second.second, true);
-			usbh->pad_to_usb.erase(it->first);
-		}
-	}
-
-	if (!already_connected)
-	{
-		switch (type)
-		{
-		case input::product_type::guncon_3:
-		{
-			if (!g_cfg_guncon3.load())
-			{
-				sys_usbd.notice("Could not load GunCon3 config. Using defaults.");
-			}
-
-			sys_usbd.success("Adding emulated GunCon3 (controller %d)", index);
-			std::shared_ptr<usb_device> dev = std::make_shared<usb_device_guncon3>(index, usbh->get_new_location());
-			usbh->connect_usb_device(dev, true);
-			usbh->pad_to_usb.emplace(index, std::pair(type, dev));
-
-			sys_usbd.notice("GunCon3 config=\n", g_cfg_guncon3.to_string());
-			break;
-		}
-		case input::product_type::top_shot_elite:
-		{
-			if (!g_cfg_topshotelite.load())
-			{
-				sys_usbd.notice("Could not load Top Shot Elite config. Using defaults.");
-			}
-
-			sys_usbd.success("Adding emulated Top Shot Elite (controller %d)", index);
-			std::shared_ptr<usb_device> dev = std::make_shared<usb_device_topshotelite>(index, usbh->get_new_location());
-			usbh->connect_usb_device(dev, true);
-			usbh->pad_to_usb.emplace(index, std::pair(type, dev));
-
-			sys_usbd.notice("Top shot elite config=\n", g_cfg_topshotelite.to_string());
-			break;
-		}
-		case input::product_type::top_shot_fearmaster:
-		{
-			if (!g_cfg_topshotfearmaster.load())
-			{
-				sys_usbd.notice("Could not load Top Shot Fearmaster config. Using defaults.");
-			}
-
-			sys_usbd.success("Adding emulated Top Shot Fearmaster (controller %d)", index);
-			std::shared_ptr<usb_device> dev = std::make_shared<usb_device_topshotfearmaster>(index, usbh->get_new_location());
-			usbh->connect_usb_device(dev, true);
-			usbh->pad_to_usb.emplace(index, std::pair(type, dev));
-
-			sys_usbd.notice("Top shot fearmaster config=\n", g_cfg_topshotfearmaster.to_string());
-			break;
-		}
-		case input::product_type::udraw_gametablet:
-		{
-			sys_usbd.success("Adding emulated uDraw GameTablet (controller %d)", index);
-			std::shared_ptr<usb_device> dev = std::make_shared<usb_device_gametablet>(index, usbh->get_new_location());
-			usbh->connect_usb_device(dev, true);
-			usbh->pad_to_usb.emplace(index, std::pair(type, dev));
-			break;
-		}
-		default:
-			break;
-		}
-	}
-}
-
-void handle_hotplug_event(bool connected)
-{
-	if (auto usbh = g_fxo->try_get<named_thread<usb_handler_thread>>())
-	{
-		usbh->usb_hotplug_timeout = get_system_time() + (connected ? 1'000'000ull : 0);
-	}
-}
-
-
 error_code sys_usbd_initialize(ppu_thread& ppu, vm::ptr<u32> handle)
 {
 	ppu.state += cpu_flag::wait;
@@ -1061,14 +507,11 @@ error_code sys_usbd_initialize(ppu_thread& ppu, vm::ptr<u32> handle)
 
 	auto& usbh = g_fxo->get<named_thread<usb_handler_thread>>();
 
-	{
-		std::lock_guard lock(usbh.mutex);
+	std::lock_guard lock(usbh.mutex);
 
-		// Must not occur (lv2 allows multiple handles, cellUsbd does not)
-		ensure(!usbh.is_init.exchange(true));
-	}
+	// Must not occur (lv2 allows multiple handles, cellUsbd does not)
+	ensure(!usbh.is_init.exchange(true));
 
-	ppu.check_state();
 	*handle = 0x115B;
 
 	// TODO
@@ -1087,7 +530,7 @@ error_code sys_usbd_finalize(ppu_thread& ppu, u32 handle)
 	usbh.is_init = false;
 
 	// Forcefully awake all waiters
-	while (auto cpu = lv2_obj::schedule<ppu_thread>(usbh.sq, SYS_SYNC_FIFO))
+	for (auto& cpu : ::as_rvalue(std::move(usbh.sq)))
 	{
 		// Special ternimation signal value
 		cpu->gpr[4] = 4;
@@ -1123,11 +566,12 @@ error_code sys_usbd_get_device_list(ppu_thread& ppu, u32 handle, vm::ptr<UsbInte
 	return not_an_error(i_tocopy);
 }
 
-error_code sys_usbd_register_extra_ldd(ppu_thread& ppu, u32 handle, vm::cptr<char> s_product, u16 slen_product, u16 id_vendor, u16 id_product_min, u16 id_product_max)
+error_code sys_usbd_register_extra_ldd(ppu_thread& ppu, u32 handle, vm::ptr<char> s_product, u16 slen_product, u16 id_vendor, u16 id_product_min, u16 id_product_max)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_usbd.trace("sys_usbd_register_extra_ldd(handle=0x%x, s_product=%s, slen_product=%d, id_vendor=0x%04x, id_product_min=0x%04x, id_product_max=0x%04x)", handle, s_product, slen_product, id_vendor, id_product_min, id_product_max);
+	sys_usbd.warning("sys_usbd_register_extra_ldd(handle=0x%x, s_product=%s, slen_product=0x%x, id_vendor=0x%x, id_product_min=0x%x, id_product_max=0x%x)", handle, s_product, slen_product, id_vendor,
+	    id_product_min, id_product_max);
 
 	auto& usbh = g_fxo->get<named_thread<usb_handler_thread>>();
 
@@ -1135,32 +579,10 @@ error_code sys_usbd_register_extra_ldd(ppu_thread& ppu, u32 handle, vm::cptr<cha
 	if (!usbh.is_init)
 		return CELL_EINVAL;
 
-	std::string_view product{s_product.get_ptr(), slen_product};
+	s32 res = usbh.add_ldd(s_product, slen_product, id_vendor, id_product_min, id_product_max);
+	usbh.check_devices_vs_ldds();
 
-	if (usbh.add_ldd(product, id_vendor, id_product_min, id_product_max))
-		return CELL_OK;
-
-	return CELL_EEXIST;
-}
-
-error_code sys_usbd_unregister_extra_ldd(ppu_thread& ppu, u32 handle, vm::cptr<char> s_product, u16 slen_product)
-{
-	ppu.state += cpu_flag::wait;
-
-	sys_usbd.trace("sys_usbd_unregister_extra_ldd(handle=0x%x, s_product=%s, slen_product=%d)", handle, s_product, slen_product);
-
-	auto& usbh = g_fxo->get<named_thread<usb_handler_thread>>();
-
-	std::lock_guard lock(usbh.mutex);
-	if (!usbh.is_init)
-		return CELL_EINVAL;
-
-	std::string_view product{s_product.get_ptr(), slen_product};
-
-	if (usbh.remove_ldd(product))
-		return CELL_OK;
-
-	return CELL_ESRCH;
+	return not_an_error(res); // To check
 }
 
 error_code sys_usbd_get_descriptor_size(ppu_thread& ppu, u32 handle, u32 device_handle)
@@ -1187,11 +609,6 @@ error_code sys_usbd_get_descriptor(ppu_thread& ppu, u32 handle, u32 device_handl
 
 	sys_usbd.trace("sys_usbd_get_descriptor(handle=0x%x, deviceNumber=0x%x, descriptor=0x%x, desc_size=0x%x)", handle, device_handle, descriptor, desc_size);
 
-	if (!descriptor)
-	{
-		return CELL_EINVAL;
-	}
-
 	auto& usbh = g_fxo->get<named_thread<usb_handler_thread>>();
 
 	std::lock_guard lock(usbh.mutex);
@@ -1201,59 +618,45 @@ error_code sys_usbd_get_descriptor(ppu_thread& ppu, u32 handle, u32 device_handl
 		return CELL_EINVAL;
 	}
 
-	if (!desc_size)
-	{
-		return CELL_ENOMEM;
-	}
-
-	usbh.handled_devices[device_handle].second->device.write_data(reinterpret_cast<u8*>(descriptor.get_ptr()), desc_size);
+	u8* ptr = static_cast<u8*>(descriptor.get_ptr());
+	usbh.handled_devices[device_handle].second->device.write_data(ptr);
 
 	return CELL_OK;
 }
 
-// This function is used for psp(cellUsbPspcm), ps3 arcade usj io(PS3A-USJ), ps2 cam(eyetoy), generic usb camera?(sample_usb2cam)
-error_code sys_usbd_register_ldd(ppu_thread& ppu, u32 handle, vm::cptr<char> s_product, u16 slen_product)
+// This function is used for psp(cellUsbPspcm), dongles in ps3 arcade cabinets(PS3A-USJ), ps2 cam(eyetoy), generic usb camera?(sample_usb2cam)
+error_code sys_usbd_register_ldd(ppu_thread& ppu, u32 handle, vm::ptr<char> s_product, u16 slen_product)
 {
 	ppu.state += cpu_flag::wait;
 
-	std::string_view product{s_product.get_ptr(), slen_product};
-
 	// slightly hacky way of getting Namco GCon3 gun to work.
 	// The register_ldd appears to be a more promiscuous mode function, where all device 'inserts' would be presented to the cellUsbd for Probing.
-	// Unsure how many more devices might need similar treatment (i.e. just a compare and force VID/PID add), or if it's worth adding a full promiscuous capability
-	static const std::unordered_map<std::string, UsbLdd, fmt::string_hash, std::equal_to<>> predefined_ldds
+	// Unsure how many more devices might need similar treatment (i.e. just a compare and force VID/PID add), or if it's worth adding a full promiscuous
+	// capability
+	if (strcmp(s_product.get_ptr(), "guncon3") == 0)
 	{
-		{"cellUsbPspcm", {0x054C, 0x01CB, 0x01CB}},
-		{"guncon3", {0x0B9A, 0x0800, 0x0800}},
-		{"PS3A-USJ", {0x0B9A, 0x0900, 0x0910}}
-	};
-
-	if (const auto iterator = predefined_ldds.find(product); iterator != predefined_ldds.end())
-	{
-		sys_usbd.trace("sys_usbd_register_ldd(handle=0x%x, s_product=%s, slen_product=%d) -> Redirecting to sys_usbd_register_extra_ldd()", handle, s_product, slen_product);
-		return sys_usbd_register_extra_ldd(ppu, handle, s_product, slen_product, iterator->second.id_vendor, iterator->second.id_product_min, iterator->second.id_product_max);
+		sys_usbd.warning("sys_usbd_register_ldd(handle=0x%x, s_product=%s, slen_product=0x%x) -> Redirecting to sys_usbd_register_extra_ldd", handle, s_product, slen_product);
+		sys_usbd_register_extra_ldd(ppu, handle, s_product, slen_product, 0x0B9A, 0x0800, 0x0800);
+	}
+	else
+	{
+		sys_usbd.todo("sys_usbd_register_ldd(handle=0x%x, s_product=%s, slen_product=0x%x)", handle, s_product, slen_product);
 	}
-
-	sys_usbd.todo("sys_usbd_register_ldd(handle=0x%x, s_product=%s, slen_product=%d)", handle, s_product, slen_product);
 	return CELL_OK;
 }
 
-error_code sys_usbd_unregister_ldd(ppu_thread& ppu, u32 handle, vm::cptr<char> s_product, u16 slen_product)
+error_code sys_usbd_unregister_ldd(ppu_thread&)
 {
-	ppu.state += cpu_flag::wait;
-
-	sys_usbd.trace("sys_usbd_unregister_ldd(handle=0x%x, s_product=%s, slen_product=%d) -> Redirecting to sys_usbd_unregister_extra_ldd()", handle, s_product, slen_product);
-
-	return sys_usbd_unregister_extra_ldd(ppu, handle, s_product, slen_product);
+	sys_usbd.todo("sys_usbd_unregister_ldd()");
+	return CELL_OK;
 }
 
 // TODO: determine what the unknown params are
-// attributes (bmAttributes) : 2=Bulk, 3=Interrupt
-error_code sys_usbd_open_pipe(ppu_thread& ppu, u32 handle, u32 device_handle, u32 unk1, u64 unk2, u64 unk3, u32 endpoint, u64 attributes)
+error_code sys_usbd_open_pipe(ppu_thread& ppu, u32 handle, u32 device_handle, u32 unk1, u64 unk2, u64 unk3, u32 endpoint, u64 unk4)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_usbd.warning("sys_usbd_open_pipe(handle=0x%x, device_handle=0x%x, unk1=0x%x, unk2=0x%x, unk3=0x%x, endpoint=0x%x, attributes=0x%x)", handle, device_handle, unk1, unk2, unk3, endpoint, attributes);
+	sys_usbd.warning("sys_usbd_open_pipe(handle=0x%x, device_handle=0x%x, unk1=0x%x, unk2=0x%x, unk3=0x%x, endpoint=0x%x, unk4=0x%x)", handle, device_handle, unk1, unk2, unk3, endpoint, unk4);
 
 	auto& usbh = g_fxo->get<named_thread<usb_handler_thread>>();
 
@@ -1315,12 +718,12 @@ error_code sys_usbd_receive_event(ppu_thread& ppu, u32 handle, vm::ptr<u64> arg1
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_usbd.trace("sys_usbd_receive_event(handle=0x%x, arg1=*0x%x, arg2=*0x%x, arg3=*0x%x)", handle, arg1, arg2, arg3);
+	sys_usbd.trace("sys_usbd_receive_event(handle=%u, arg1=*0x%x, arg2=*0x%x, arg3=*0x%x)", handle, arg1, arg2, arg3);
 
 	auto& usbh = g_fxo->get<named_thread<usb_handler_thread>>();
 
 	{
-		std::lock_guard lock_sq(usbh.mutex_sq);
+		std::lock_guard lock(usbh.mutex);
 
 		if (!usbh.is_init)
 			return CELL_EINVAL;
@@ -1336,38 +739,24 @@ error_code sys_usbd_receive_event(ppu_thread& ppu, u32 handle, vm::ptr<u64> arg1
 		}
 
 		lv2_obj::sleep(ppu);
-		lv2_obj::emplace(usbh.sq, &ppu);
+		usbh.sq.emplace_back(&ppu);
 	}
 
-	while (auto state = +ppu.state)
+	while (auto state = ppu.state.fetch_sub(cpu_flag::signal))
 	{
-		if (state & cpu_flag::signal && ppu.state.test_and_reset(cpu_flag::signal))
-		{
-			sys_usbd.trace("Received event(queued): arg1=0x%x arg2=0x%x arg3=0x%x", ppu.gpr[4], ppu.gpr[5], ppu.gpr[6]);
-			break;
-		}
-
 		if (is_stopped(state))
 		{
-			std::lock_guard lock(usbh.mutex);
-
-			for (auto cpu = +usbh.sq; cpu; cpu = cpu->next_cpu)
-			{
-				if (cpu == &ppu)
-				{
-					ppu.state += cpu_flag::again;
-					sys_usbd.trace("sys_usbd_receive_event: aborting");
-					return {};
-				}
-			}
+			return {};
+		}
 
+		if (state & cpu_flag::signal)
+		{
 			break;
 		}
 
-		ppu.state.wait(state);
+		thread_ctrl::wait_on(ppu.state, state);
 	}
 
-	ppu.check_state();
 	*arg1 = ppu.gpr[4];
 	*arg2 = ppu.gpr[5];
 	*arg3 = ppu.gpr[6];
@@ -1386,11 +775,11 @@ error_code sys_usbd_detect_event(ppu_thread& ppu)
 	return CELL_OK;
 }
 
-error_code sys_usbd_attach(ppu_thread& ppu, u32 handle, u32 unk1, u32 unk2, u32 device_handle)
+error_code sys_usbd_attach(ppu_thread& ppu, u32 handle)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_usbd.todo("sys_usbd_attach(handle=0x%x, unk1=0x%x, unk2=0x%x, device_handle=0x%x)", handle, unk1, unk2, device_handle);
+	sys_usbd.todo("sys_usbd_attach(handle=0x%x)", handle);
 	return CELL_OK;
 }
 
@@ -1400,12 +789,23 @@ error_code sys_usbd_transfer_data(ppu_thread& ppu, u32 handle, u32 id_pipe, vm::
 
 	sys_usbd.trace("sys_usbd_transfer_data(handle=0x%x, id_pipe=0x%x, buf=*0x%x, buf_length=0x%x, request=*0x%x, type=0x%x)", handle, id_pipe, buf, buf_size, request, type_transfer);
 
-	if (sys_usbd.trace && request)
+	if (sys_usbd.enabled == logs::level::trace && request)
 	{
-		sys_usbd.trace("RequestType:0x%02x, Request:0x%02x, wValue:0x%04x, wIndex:0x%04x, wLength:0x%04x", request->bmRequestType, request->bRequest, request->wValue, request->wIndex, request->wLength);
-
+		sys_usbd.trace("RequestType:0x%x, Request:0x%x, wValue:0x%x, wIndex:0x%x, wLength:0x%x", request->bmRequestType, request->bRequest, request->wValue, request->wIndex, request->wLength);
 		if ((request->bmRequestType & 0x80) == 0 && buf && buf_size != 0)
-			sys_usbd.trace("Control sent:\n%s", fmt::buf_to_hexstring(buf.get_ptr(), buf_size));
+		{
+			std::string datrace;
+			const char hex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+			for (u32 index = 0; index < buf_size; index++)
+			{
+				datrace += hex[(buf[index] >> 4) & 15];
+				datrace += hex[(buf[index]) & 15];
+				datrace += ' ';
+			}
+
+			sys_usbd.trace("Control sent: %s", datrace);
+		}
 	}
 
 	auto& usbh = g_fxo->get<named_thread<usb_handler_thread>>();
@@ -1417,10 +817,9 @@ error_code sys_usbd_transfer_data(ppu_thread& ppu, u32 handle, u32 id_pipe, vm::
 		return CELL_EINVAL;
 	}
 
-	const auto& pipe               = usbh.get_pipe(id_pipe);
-	auto&& [transfer_id, transfer] = usbh.get_free_transfer();
-
-	transfer.assigned_number = pipe.device->assigned_number;
+	u32 id_transfer  = usbh.get_free_transfer_id();
+	const auto& pipe = usbh.get_pipe(id_pipe);
+	auto& transfer   = usbh.get_transfer(id_transfer);
 
 	// Default endpoint is control endpoint
 	if (pipe.endpoint == 0)
@@ -1432,52 +831,26 @@ error_code sys_usbd_transfer_data(ppu_thread& ppu, u32 handle, u32 id_pipe, vm::
 		}
 
 		// Claiming interface
-		switch (request->bmRequestType)
+		if (request->bmRequestType == 0 && request->bRequest == 0x09)
 		{
-		case 0U /*silences warning*/ | LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_DEVICE:
-		{
-			switch (request->bRequest)
-			{
-			case LIBUSB_REQUEST_SET_CONFIGURATION:
-			{
-				pipe.device->set_configuration(static_cast<u8>(+request->wValue));
-				pipe.device->set_interface(0);
-				break;
-			}
-			default: break;
-			}
-			break;
-		}
-		case 0U /*silences warning*/ | LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_DEVICE:
-		{
-			if (!buf)
-			{
-				sys_usbd.error("Invalid buffer for control_transfer");
-				return CELL_EFAULT;
-			}
-			break;
-		}
-		default: break;
+			pipe.device->set_configuration(static_cast<u8>(+request->wValue));
+			pipe.device->set_interface(0);
 		}
 
 		pipe.device->control_transfer(request->bmRequestType, request->bRequest, request->wValue, request->wIndex, request->wLength, buf_size, buf.get_ptr(), &transfer);
+		transfer.busy = true;
 	}
 	else
 	{
-		// If output endpoint
-		if (!(pipe.endpoint & 0x80))
-			sys_usbd.trace("Write Int(s: %d):\n%s", buf_size, fmt::buf_to_hexstring(buf.get_ptr(), buf_size));
-
 		pipe.device->interrupt_transfer(buf_size, buf.get_ptr(), pipe.endpoint, &transfer);
+		transfer.busy = true;
 	}
 
 	if (transfer.fake)
-	{
-		usbh.push_fake_transfer(&transfer);
-	}
+		usbh.fake_transfers.push_back(&transfer);
 
 	// returns an identifier specific to the transfer
-	return not_an_error(transfer_id);
+	return not_an_error(id_transfer);
 }
 
 error_code sys_usbd_isochronous_transfer_data(ppu_thread& ppu, u32 handle, u32 id_pipe, vm::ptr<UsbDeviceIsoRequest> iso_request)
@@ -1495,13 +868,15 @@ error_code sys_usbd_isochronous_transfer_data(ppu_thread& ppu, u32 handle, u32 i
 		return CELL_EINVAL;
 	}
 
-	const auto& pipe               = usbh.get_pipe(id_pipe);
-	auto&& [transfer_id, transfer] = usbh.get_free_transfer();
+	u32 id_transfer  = usbh.get_free_transfer_id();
+	const auto& pipe = usbh.get_pipe(id_pipe);
+	auto& transfer   = usbh.get_transfer(id_transfer);
 
+	memcpy(&transfer.iso_request, iso_request.get_ptr(), sizeof(UsbDeviceIsoRequest));
 	pipe.device->isochronous_transfer(&transfer);
 
 	// returns an identifier specific to the transfer
-	return not_an_error(transfer_id);
+	return not_an_error(id_transfer);
 }
 
 error_code sys_usbd_get_transfer_status(ppu_thread& ppu, u32 handle, u32 id_transfer, u32 unk1, vm::ptr<u32> result, vm::ptr<u32> count)
@@ -1517,9 +892,10 @@ error_code sys_usbd_get_transfer_status(ppu_thread& ppu, u32 handle, u32 id_tran
 	if (!usbh.is_init)
 		return CELL_EINVAL;
 
-	const auto status = usbh.get_transfer_status(id_transfer);
-	*result           = status.first;
-	*count            = status.second;
+	auto& transfer = usbh.get_transfer(id_transfer);
+
+	*result = transfer.result;
+	*count  = transfer.count;
 
 	return CELL_OK;
 }
@@ -1537,29 +913,19 @@ error_code sys_usbd_get_isochronous_transfer_status(ppu_thread& ppu, u32 handle,
 	if (!usbh.is_init)
 		return CELL_EINVAL;
 
-	const auto status = usbh.get_isochronous_transfer_status(id_transfer);
+	auto& transfer = usbh.get_transfer(id_transfer);
 
-	*result  = status.first;
-	*request = status.second;
+	*result = transfer.result;
+	memcpy(request.get_ptr(), &transfer.iso_request, sizeof(UsbDeviceIsoRequest));
 
 	return CELL_OK;
 }
 
-error_code sys_usbd_get_device_location(ppu_thread& ppu, u32 handle, u32 device_handle, vm::ptr<u8> location)
+error_code sys_usbd_get_device_location(ppu_thread& ppu)
 {
 	ppu.state += cpu_flag::wait;
 
-	sys_usbd.notice("sys_usbd_get_device_location(handle=0x%x, device_handle=0x%x, location=*0x%x)", handle, device_handle, location);
-
-	auto& usbh = g_fxo->get<named_thread<usb_handler_thread>>();
-
-	std::lock_guard lock(usbh.mutex);
-
-	if (!usbh.is_init || !usbh.handled_devices.count(device_handle))
-		return CELL_EINVAL;
-
-	usbh.handled_devices[device_handle].second->get_location(location.get_ptr());
-
+	sys_usbd.todo("sys_usbd_get_device_location()");
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/lv2/sys_usbd.h b/rpcs3/Emu/Cell/lv2/sys_usbd.h
index a2fd911e35..3f829cd900 100644
--- a/rpcs3/Emu/Cell/lv2/sys_usbd.h
+++ b/rpcs3/Emu/Cell/lv2/sys_usbd.h
@@ -2,7 +2,6 @@
 
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/ErrorCodes.h"
-#include "Input/product_info.h"
 
 class ppu_thread;
 
@@ -67,26 +66,22 @@ error_code sys_usbd_finalize(ppu_thread& ppu, u32 handle);
 error_code sys_usbd_get_device_list(ppu_thread& ppu, u32 handle, vm::ptr<UsbInternalDevice> device_list, u32 max_devices);
 error_code sys_usbd_get_descriptor_size(ppu_thread& ppu, u32 handle, u32 device_handle);
 error_code sys_usbd_get_descriptor(ppu_thread& ppu, u32 handle, u32 device_handle, vm::ptr<void> descriptor, u32 desc_size);
-error_code sys_usbd_register_ldd(ppu_thread& ppu, u32 handle, vm::cptr<char> s_product, u16 slen_product);
-error_code sys_usbd_unregister_ldd(ppu_thread& ppu, u32 handle, vm::cptr<char> s_product, u16 slen_product);
+error_code sys_usbd_register_ldd(ppu_thread& ppu, u32 handle, vm::ptr<char> s_product, u16 slen_product);
+error_code sys_usbd_unregister_ldd(ppu_thread& ppu);
 error_code sys_usbd_open_pipe(ppu_thread& ppu, u32 handle, u32 device_handle, u32 unk1, u64 unk2, u64 unk3, u32 endpoint, u64 unk4);
 error_code sys_usbd_open_default_pipe(ppu_thread& ppu, u32 handle, u32 device_handle);
 error_code sys_usbd_close_pipe(ppu_thread& ppu, u32 handle, u32 pipe_handle);
 error_code sys_usbd_receive_event(ppu_thread& ppu, u32 handle, vm::ptr<u64> arg1, vm::ptr<u64> arg2, vm::ptr<u64> arg3);
 error_code sys_usbd_detect_event(ppu_thread& ppu);
-error_code sys_usbd_attach(ppu_thread& ppu, u32 handle, u32 unk1, u32 unk2, u32 device_handle);
+error_code sys_usbd_attach(ppu_thread& ppu, u32 handle);
 error_code sys_usbd_transfer_data(ppu_thread& ppu, u32 handle, u32 id_pipe, vm::ptr<u8> buf, u32 buf_size, vm::ptr<UsbDeviceRequest> request, u32 type_transfer);
 error_code sys_usbd_isochronous_transfer_data(ppu_thread& ppu, u32 handle, u32 id_pipe, vm::ptr<UsbDeviceIsoRequest> iso_request);
 error_code sys_usbd_get_transfer_status(ppu_thread& ppu, u32 handle, u32 id_transfer, u32 unk1, vm::ptr<u32> result, vm::ptr<u32> count);
 error_code sys_usbd_get_isochronous_transfer_status(ppu_thread& ppu, u32 handle, u32 id_transfer, u32 unk1, vm::ptr<UsbDeviceIsoRequest> request, vm::ptr<u32> result);
-error_code sys_usbd_get_device_location(ppu_thread& ppu, u32 handle, u32 device_handle, vm::ptr<u8> location);
+error_code sys_usbd_get_device_location(ppu_thread& ppu);
 error_code sys_usbd_send_event(ppu_thread& ppu);
 error_code sys_usbd_event_port_send(ppu_thread& ppu, u32 handle, u64 arg1, u64 arg2, u64 arg3);
 error_code sys_usbd_allocate_memory(ppu_thread& ppu);
 error_code sys_usbd_free_memory(ppu_thread& ppu);
 error_code sys_usbd_get_device_speed(ppu_thread& ppu);
-error_code sys_usbd_register_extra_ldd(ppu_thread& ppu, u32 handle, vm::cptr<char> s_product, u16 slen_product, u16 id_vendor, u16 id_product_min, u16 id_product_max);
-error_code sys_usbd_unregister_extra_ldd(ppu_thread& ppu, u32 handle, vm::cptr<char> s_product, u16 slen_product);
-
-void connect_usb_controller(u8 index, input::product_type);
-void handle_hotplug_event(bool connected);
+error_code sys_usbd_register_extra_ldd(ppu_thread& ppu, u32 handle, vm::ptr<char> s_product, u16 slen_product, u16 id_vendor, u16 id_product_min, u16 id_product_max);
diff --git a/rpcs3/Emu/Cell/lv2/sys_vm.cpp b/rpcs3/Emu/Cell/lv2/sys_vm.cpp
index 2a224d2339..e016e90d2d 100644
--- a/rpcs3/Emu/Cell/lv2/sys_vm.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_vm.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "sys_vm.h"
-#include "sys_process.h"
 
 #include "Emu/IdManager.h"
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/timers.hpp"
+#include "Emu/Memory/vm_locking.h"
 
 sys_vm_t::sys_vm_t(u32 _addr, u32 vsize, lv2_memory_container* ct, u32 psize)
 	: ct(ct)
@@ -17,12 +17,6 @@ sys_vm_t::sys_vm_t(u32 _addr, u32 vsize, lv2_memory_container* ct, u32 psize)
 	g_ids[addr >> 28].release(idm::last_id());
 }
 
-void sys_vm_t::save(utils::serial& ar)
-{
-	USING_SERIALIZATION_VERSION(lv2_vm);
-	ar(ct->id, addr, size, psize);
-}
-
 sys_vm_t::~sys_vm_t()
 {
 	// Free ID
@@ -36,34 +30,18 @@ struct sys_vm_global_t
 	atomic_t<u32> total_vsize = 0;
 };
 
-sys_vm_t::sys_vm_t(utils::serial& ar)
-	: ct(lv2_memory_container::search(ar))
-	, addr(ar)
-	, size(ar)
-	, psize(ar)
-{
-	g_ids[addr >> 28].release(idm::last_id());
-	g_fxo->need<sys_vm_global_t>();
-	g_fxo->get<sys_vm_global_t>().total_vsize += size;
-}
-
-error_code sys_vm_memory_map(ppu_thread& ppu, u64 vsize, u64 psize, u32 cid, u64 flag, u64 policy, vm::ptr<u32> addr)
+error_code sys_vm_memory_map(ppu_thread& ppu, u32 vsize, u32 psize, u32 cid, u64 flag, u64 policy, vm::ptr<u32> addr)
 {
 	ppu.state += cpu_flag::wait;
 
 	sys_vm.warning("sys_vm_memory_map(vsize=0x%x, psize=0x%x, cid=0x%x, flags=0x%x, policy=0x%x, addr=*0x%x)", vsize, psize, cid, flag, policy, addr);
 
-	if (!vsize || !psize || vsize % 0x200'0000 || vsize > 0x1000'0000 || psize % 0x1'0000 || policy != SYS_VM_POLICY_AUTO_RECOMMENDED)
+	if (!vsize || !psize || vsize % 0x2000000 || vsize > 0x10000000 || psize > 0x10000000 || policy != SYS_VM_POLICY_AUTO_RECOMMENDED)
 	{
 		return CELL_EINVAL;
 	}
 
-	if (ppu.gpr[11] == 300 && psize < 0x10'0000)
-	{
-		return CELL_EINVAL;
-	}
-
-	const auto idm_ct = idm::get_unlocked<lv2_memory_container>(cid);
+	const auto idm_ct = idm::get<lv2_memory_container>(cid);
 
 	const auto ct = cid == SYS_MEMORY_CONTAINER_ID_INVALID ? &g_fxo->get<lv2_memory_container>() : idm_ct.get();
 
@@ -72,16 +50,15 @@ error_code sys_vm_memory_map(ppu_thread& ppu, u64 vsize, u64 psize, u32 cid, u64
 		return CELL_ESRCH;
 	}
 
-	if (!g_fxo->get<sys_vm_global_t>().total_vsize.fetch_op([vsize, has_root = g_ps3_process_info.has_root_perm()](u32& size)
+	if (!g_fxo->get<sys_vm_global_t>().total_vsize.fetch_op([vsize](u32& size)
 	{
 		// A single process can hold up to 256MB of virtual memory, even on DECR
-		// VSH can hold more
-		if ((has_root ? 0x1E000000 : 0x10000000) - size < vsize)
+		if (0x10000000 - size < vsize)
 		{
 			return false;
 		}
 
-		size += static_cast<u32>(vsize);
+		size += vsize;
 		return true;
 	}).second)
 	{
@@ -90,33 +67,30 @@ error_code sys_vm_memory_map(ppu_thread& ppu, u64 vsize, u64 psize, u32 cid, u64
 
 	if (!ct->take(psize))
 	{
-		g_fxo->get<sys_vm_global_t>().total_vsize -= static_cast<u32>(vsize);
+		g_fxo->get<sys_vm_global_t>().total_vsize -= vsize;
 		return CELL_ENOMEM;
 	}
 
 	// Look for unmapped space
 	if (const auto area = vm::find_map(0x10000000, 0x10000000, 2 | (flag & SYS_MEMORY_PAGE_SIZE_MASK)))
 	{
-		sys_vm.warning("sys_vm_memory_map(): Found VM 0x%x area (vsize=0x%x)", addr, vsize);
-
 		// Alloc all memory (shall not fail)
-		ensure(area->alloc(static_cast<u32>(vsize)));
-		vm::lock_sudo(area->addr, static_cast<u32>(vsize));
+		ensure(area->alloc(vsize));
+		vm::lock_sudo(area->addr, vsize);
 
-		idm::make<sys_vm_t>(area->addr, static_cast<u32>(vsize), ct, static_cast<u32>(psize));
+		idm::make<sys_vm_t>(area->addr, vsize, ct, psize);
 
 		// Write a pointer for the allocated memory
-		ppu.check_state();
 		*addr = area->addr;
 		return CELL_OK;
 	}
 
-	ct->free(psize);
-	g_fxo->get<sys_vm_global_t>().total_vsize -= static_cast<u32>(vsize);
+	ct->used -= psize;
+	g_fxo->get<sys_vm_global_t>().total_vsize -= vsize;
 	return CELL_ENOMEM;
 }
 
-error_code sys_vm_memory_map_different(ppu_thread& ppu, u64 vsize, u64 psize, u32 cid, u64 flag, u64 policy, vm::ptr<u32> addr)
+error_code sys_vm_memory_map_different(ppu_thread& ppu, u32 vsize, u32 psize, u32 cid, u64 flag, u64 policy, vm::ptr<u32> addr)
 {
 	ppu.state += cpu_flag::wait;
 
@@ -142,10 +116,10 @@ error_code sys_vm_unmap(ppu_thread& ppu, u32 addr)
 	const auto vmo = idm::withdraw<sys_vm_t>(sys_vm_t::find_id(addr), [&](sys_vm_t& vmo)
 	{
 		// Free block
-		ensure(vm::unmap(addr).second);
+		ensure(vm::unmap(addr));
 
 		// Return memory
-		vmo.ct->free(vmo.psize);
+		vmo.ct->used -= vmo.psize;
 		g_fxo->get<sys_vm_global_t>().total_vsize -= vmo.size;
 	});
 
@@ -157,7 +131,7 @@ error_code sys_vm_unmap(ppu_thread& ppu, u32 addr)
 	return CELL_OK;
 }
 
-error_code sys_vm_append_memory(ppu_thread& ppu, u32 addr, u64 size)
+error_code sys_vm_append_memory(ppu_thread& ppu, u32 addr, u32 size)
 {
 	ppu.state += cpu_flag::wait;
 
@@ -180,7 +154,7 @@ error_code sys_vm_append_memory(ppu_thread& ppu, u32 addr, u64 size)
 			return CELL_ENOMEM;
 		}
 
-		vmo.psize += static_cast<u32>(size);
+		vmo.psize += size;
 		return {};
 	});
 
@@ -197,7 +171,7 @@ error_code sys_vm_append_memory(ppu_thread& ppu, u32 addr, u64 size)
 	return CELL_OK;
 }
 
-error_code sys_vm_return_memory(ppu_thread& ppu, u32 addr, u64 size)
+error_code sys_vm_return_memory(ppu_thread& ppu, u32 addr, u32 size)
 {
 	ppu.state += cpu_flag::wait;
 
@@ -217,12 +191,12 @@ error_code sys_vm_return_memory(ppu_thread& ppu, u32 addr, u64 size)
 
 		auto [_, ok] = vmo.psize.fetch_op([&](u32& value)
 		{
-			if (value <= size || value - size < 0x100000ull)
+			if (value < 0x100000ull + size)
 			{
 				return false;
 			}
 
-			value -= static_cast<u32>(size);
+			value -= size;
 			return true;
 		});
 
@@ -231,7 +205,7 @@ error_code sys_vm_return_memory(ppu_thread& ppu, u32 addr, u64 size)
 			return CELL_EBUSY;
 		}
 
-		vmo.ct->free(size);
+		vmo.ct->used -= size;
 		return {};
 	});
 
@@ -259,7 +233,7 @@ error_code sys_vm_lock(ppu_thread& ppu, u32 addr, u32 size)
 		return CELL_EINVAL;
 	}
 
-	const auto block = idm::get_unlocked<sys_vm_t>(sys_vm_t::find_id(addr));
+	const auto block = idm::get<sys_vm_t>(sys_vm_t::find_id(addr));
 
 	if (!block || u64{addr} + size > u64{block->addr} + block->size)
 	{
@@ -280,7 +254,7 @@ error_code sys_vm_unlock(ppu_thread& ppu, u32 addr, u32 size)
 		return CELL_EINVAL;
 	}
 
-	const auto block = idm::get_unlocked<sys_vm_t>(sys_vm_t::find_id(addr));
+	const auto block = idm::get<sys_vm_t>(sys_vm_t::find_id(addr));
 
 	if (!block || u64{addr} + size > u64{block->addr} + block->size)
 	{
@@ -301,7 +275,7 @@ error_code sys_vm_touch(ppu_thread& ppu, u32 addr, u32 size)
 		return CELL_EINVAL;
 	}
 
-	const auto block = idm::get_unlocked<sys_vm_t>(sys_vm_t::find_id(addr));
+	const auto block = idm::get<sys_vm_t>(sys_vm_t::find_id(addr));
 
 	if (!block || u64{addr} + size > u64{block->addr} + block->size)
 	{
@@ -322,7 +296,7 @@ error_code sys_vm_flush(ppu_thread& ppu, u32 addr, u32 size)
 		return CELL_EINVAL;
 	}
 
-	const auto block = idm::get_unlocked<sys_vm_t>(sys_vm_t::find_id(addr));
+	const auto block = idm::get<sys_vm_t>(sys_vm_t::find_id(addr));
 
 	if (!block || u64{addr} + size > u64{block->addr} + block->size)
 	{
@@ -343,7 +317,7 @@ error_code sys_vm_invalidate(ppu_thread& ppu, u32 addr, u32 size)
 		return CELL_EINVAL;
 	}
 
-	const auto block = idm::get_unlocked<sys_vm_t>(sys_vm_t::find_id(addr));
+	const auto block = idm::get<sys_vm_t>(sys_vm_t::find_id(addr));
 
 	if (!block || u64{addr} + size > u64{block->addr} + block->size)
 	{
@@ -364,7 +338,7 @@ error_code sys_vm_store(ppu_thread& ppu, u32 addr, u32 size)
 		return CELL_EINVAL;
 	}
 
-	const auto block = idm::get_unlocked<sys_vm_t>(sys_vm_t::find_id(addr));
+	const auto block = idm::get<sys_vm_t>(sys_vm_t::find_id(addr));
 
 	if (!block || u64{addr} + size > u64{block->addr} + block->size)
 	{
@@ -385,7 +359,7 @@ error_code sys_vm_sync(ppu_thread& ppu, u32 addr, u32 size)
 		return CELL_EINVAL;
 	}
 
-	const auto block = idm::get_unlocked<sys_vm_t>(sys_vm_t::find_id(addr));
+	const auto block = idm::get<sys_vm_t>(sys_vm_t::find_id(addr));
 
 	if (!block || u64{addr} + size > u64{block->addr} + block->size)
 	{
@@ -401,14 +375,13 @@ error_code sys_vm_test(ppu_thread& ppu, u32 addr, u32 size, vm::ptr<u64> result)
 
 	sys_vm.warning("sys_vm_test(addr=0x%x, size=0x%x, result=*0x%x)", addr, size, result);
 
-	const auto block = idm::get_unlocked<sys_vm_t>(sys_vm_t::find_id(addr));
+	const auto block = idm::get<sys_vm_t>(sys_vm_t::find_id(addr));
 
 	if (!block || u64{addr} + size > u64{block->addr} + block->size)
 	{
 		return CELL_EINVAL;
 	}
 
-	ppu.check_state();
 	*result = SYS_VM_STATE_ON_MEMORY;
 
 	return CELL_OK;
@@ -420,14 +393,13 @@ error_code sys_vm_get_statistics(ppu_thread& ppu, u32 addr, vm::ptr<sys_vm_stati
 
 	sys_vm.warning("sys_vm_get_statistics(addr=0x%x, stat=*0x%x)", addr, stat);
 
-	const auto block = idm::get_unlocked<sys_vm_t>(sys_vm_t::find_id(addr));
+	const auto block = idm::get<sys_vm_t>(sys_vm_t::find_id(addr));
 
 	if (!block || block->addr != addr)
 	{
 		return CELL_EINVAL;
 	}
 
-	ppu.check_state();
 	stat->page_fault_ppu = 0;
 	stat->page_fault_spu = 0;
 	stat->page_in = 0;
diff --git a/rpcs3/Emu/Cell/lv2/sys_vm.h b/rpcs3/Emu/Cell/lv2/sys_vm.h
index 4d588b9200..c058baeb5d 100644
--- a/rpcs3/Emu/Cell/lv2/sys_vm.h
+++ b/rpcs3/Emu/Cell/lv2/sys_vm.h
@@ -41,11 +41,6 @@ struct sys_vm_t
 	sys_vm_t(u32 addr, u32 vsize, lv2_memory_container* ct, u32 psize);
 	~sys_vm_t();
 
-	SAVESTATE_INIT_POS(10);
-
-	sys_vm_t(utils::serial& ar);
-	void save(utils::serial& ar);
-
 	static std::array<atomic_t<u32>, id_count> g_ids;
 
 	static u32 find_id(u32 addr)
@@ -58,11 +53,11 @@ struct sys_vm_t
 class ppu_thread;
 
 // SysCalls
-error_code sys_vm_memory_map(ppu_thread& ppu, u64 vsize, u64 psize, u32 cid, u64 flag, u64 policy, vm::ptr<u32> addr);
-error_code sys_vm_memory_map_different(ppu_thread& ppu, u64 vsize, u64 psize, u32 cid, u64 flag, u64 policy, vm::ptr<u32> addr);
+error_code sys_vm_memory_map(ppu_thread& ppu, u32 vsize, u32 psize, u32 cid, u64 flag, u64 policy, vm::ptr<u32> addr);
+error_code sys_vm_memory_map_different(ppu_thread& ppu, u32 vsize, u32 psize, u32 cid, u64 flag, u64 policy, vm::ptr<u32> addr);
 error_code sys_vm_unmap(ppu_thread& ppu, u32 addr);
-error_code sys_vm_append_memory(ppu_thread& ppu, u32 addr, u64 size);
-error_code sys_vm_return_memory(ppu_thread& ppu, u32 addr, u64 size);
+error_code sys_vm_append_memory(ppu_thread& ppu, u32 addr, u32 size);
+error_code sys_vm_return_memory(ppu_thread& ppu, u32 addr, u32 size);
 error_code sys_vm_lock(ppu_thread& ppu, u32 addr, u32 size);
 error_code sys_vm_unlock(ppu_thread& ppu, u32 addr, u32 size);
 error_code sys_vm_touch(ppu_thread& ppu, u32 addr, u32 size);
diff --git a/rpcs3/Emu/Cell/timers.hpp b/rpcs3/Emu/Cell/timers.hpp
index 345bb14ceb..ee9b58bb69 100644
--- a/rpcs3/Emu/Cell/timers.hpp
+++ b/rpcs3/Emu/Cell/timers.hpp
@@ -2,11 +2,7 @@
 
 #include "util/types.hpp"
 
-u64 convert_to_timebased_time(u64 time);
 u64 get_timebased_time();
-
-// Returns some relative time in microseconds, don't change this fact
+void initalize_timebased_time();
 u64 get_system_time();
-
-// As get_system_time but obeys Clocks scaling setting. Microseconds.
-u64 get_guest_system_time(u64 time = umax);
+u64 get_guest_system_time();
diff --git a/rpcs3/Emu/GDB.cpp b/rpcs3/Emu/GDB.cpp
index 20e6c82cd4..2d46670862 100644
--- a/rpcs3/Emu/GDB.cpp
+++ b/rpcs3/Emu/GDB.cpp
@@ -15,10 +15,6 @@
 #include <WS2tcpip.h>
 #include <afunix.h> // sockaddr_un
 #else
-#ifdef __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -29,16 +25,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/un.h> // sockaddr_un
-#ifdef __clang__
-#pragma GCC diagnostic pop
-#endif
 #endif
 
-#include "Emu/Cell/timers.hpp"
-
-#include <charconv>
 #include <regex>
-#include <string_view>
+#include <charconv>
 
 extern bool ppu_breakpoint(u32 addr, bool is_adding);
 
@@ -56,6 +46,8 @@ void set_nonblocking(int s)
 }
 
 #define sscanf_s sscanf
+#define HEX_U32 "x"
+#define HEX_U64 "lx"
 #else
 
 void set_nonblocking(int s)
@@ -64,6 +56,8 @@ void set_nonblocking(int s)
 	ioctlsocket(s, FIONBIO, &mode);
 }
 
+#define HEX_U32 "lx"
+#define HEX_U64 "llx"
 #endif
 
 struct gdb_cmd
@@ -84,44 +78,42 @@ bool check_errno_again()
 #endif
 }
 
-std::string u32_to_hex(u32 i)
-{
-	return fmt::format("%x", i);
+std::string u32_to_hex(u32 i) {
+	return fmt::format("%" HEX_U32, i);
 }
 
-std::string u64_to_padded_hex(u64 value)
-{
-	return fmt::format("%.16x", value);
+std::string u64_to_padded_hex(u64 value) {
+	return fmt::format("%.16" HEX_U64, value);
 }
 
-std::string u32_to_padded_hex(u32 value)
-{
-	return fmt::format("%.8x", value);
+std::string u32_to_padded_hex(u32 value) {
+	return fmt::format("%.8" HEX_U32, value);
 }
 
-template <typename T>
-T hex_to(std::string_view val)
-{
-	T result;
-	auto [ptr, err] = std::from_chars(val.data(), val.data() + val.size(), result, 16);
-	if (err != std::errc())
-	{
-		fmt::throw_exception("Failed to read hex string: %s", std::make_error_code(err).message());
-	}
-
+u8 hex_to_u8(std::string val) {
+	u8 result;
+	sscanf_s(val.c_str(), "%02hhX", &result);
 	return result;
 }
 
-constexpr auto& hex_to_u8 = hex_to<u8>;
-constexpr auto& hex_to_u32 = hex_to<u32>;
-constexpr auto& hex_to_u64 = hex_to<u64>;
+u32 hex_to_u32(std::string val) {
+	u32 result;
+	sscanf_s(val.c_str(), "%" HEX_U32, &result);
+	return result;
+}
+
+u64 hex_to_u64(std::string val) {
+	u64 result;
+	sscanf_s(val.c_str(), "%" HEX_U64, &result);
+	return result;
+}
 
 void gdb_thread::start_server()
 {
 	// IPv4 address:port in format 127.0.0.1:2345
 	static const std::regex ipv4_regex("^([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3})\\:([0-9]{1,5})$");
 
-	auto sname = g_cfg.misc.gdb_server.to_string();
+	auto [sname, sshared] = g_cfg.misc.gdb_server.get();
 
 	if (sname[0] == '\0')
 	{
@@ -235,8 +227,7 @@ char gdb_thread::read_char()
 {
 	char result;
 	int cnt = read(&result, 1);
-	if (!cnt)
-	{
+	if (!cnt) {
 		fmt::throw_exception("Tried to read char, but no data was available");
 	}
 	return result;
@@ -254,22 +245,18 @@ bool gdb_thread::try_read_cmd(gdb_cmd& out_cmd)
 {
 	char c = read_char();
 	//interrupt
-	if (c == 0x03) [[unlikely]]
-	{
+	if (c == 0x03) [[unlikely]] {
 		out_cmd.cmd = '\x03';
 		out_cmd.data = "";
 		out_cmd.checksum = 0;
 		return true;
 	}
-	if (c != '$') [[unlikely]]
-	{
+	if (c != '$') [[unlikely]] {
 		//gdb starts conversation with + for some reason
-		if (c == '+')
-		{
+		if (c == '+') {
 			c = read_char();
 		}
-		if (c != '$')
-		{
+		if (c != '$') {
 			fmt::throw_exception("Expected start of packet character '$', got '%c' instead", c);
 		}
 	}
@@ -279,36 +266,28 @@ bool gdb_thread::try_read_cmd(gdb_cmd& out_cmd)
 	out_cmd.checksum = 0;
 	bool cmd_part = true;
 	u8 checksum = 0;
-	while (true)
-	{
+	while(true) {
 		c = read_char();
-		if (c == '#')
-		{
+		if (c == '#') {
 			break;
 		}
 		checksum = (checksum + reinterpret_cast<u8&>(c)) % 256;
 		//escaped char
-		if (c == '}')
-		{
+		if (c == '}') {
 			c = read_char() ^ 0x20;
 			checksum = (checksum + reinterpret_cast<u8&>(c)) % 256;
 		}
 		//cmd-data splitters
-		if (cmd_part && ((c == ':') || (c == '.') || (c == ';')))
-		{
+		if (cmd_part && ((c == ':') || (c == '.') || (c == ';'))) {
 			cmd_part = false;
 		}
-		if (cmd_part)
-		{
+		if (cmd_part) {
 			out_cmd.cmd += c;
 			//only q and v commands can have multi-char command
-			if ((out_cmd.cmd.length() == 1) && (c != 'q') && (c != 'v'))
-			{
+			if ((out_cmd.cmd.length() == 1) && (c != 'q') && (c != 'v')) {
 				cmd_part = false;
 			}
-		}
-		else
-		{
+		} else {
 			out_cmd.data += c;
 		}
 	}
@@ -378,14 +357,12 @@ void gdb_thread::send_cmd(const std::string& cmd)
 
 bool gdb_thread::send_cmd_ack(const std::string& cmd)
 {
-	while (true)
-	{
+	while (true) {
 		send_cmd(cmd);
 		char c = read_char();
 		if (c == '+') [[likely]]
 			return true;
-		if (c != '-') [[unlikely]]
-		{
+		if (c != '-') [[unlikely]] {
 			GDB.error("Wrong acknowledge character received: '%c'.", c);
 			return false;
 		}
@@ -396,8 +373,7 @@ bool gdb_thread::send_cmd_ack(const std::string& cmd)
 u8 gdb_thread::append_encoded_char(char c, std::string& str)
 {
 	u8 checksum = 0;
-	if ((c == '#') || (c == '$') || (c == '}')) [[unlikely]]
-	{
+	if ((c == '#') || (c == '$') || (c == '}')) [[unlikely]] {
 		str += '}';
 		c ^= 0x20;
 		checksum = '}';
@@ -438,8 +414,7 @@ std::string gdb_thread::get_reg(ppu_thread* thread, u32 rid)
 {
 	//ids from gdb/features/rs6000/powerpc-64.c
 	//pc
-	switch (rid)
-	{
+	switch (rid) {
 	case 64:
 		return u64_to_padded_hex(thread->cia);
 	//msr?
@@ -465,10 +440,9 @@ std::string gdb_thread::get_reg(ppu_thread* thread, u32 rid)
 	}
 }
 
-bool gdb_thread::set_reg(ppu_thread* thread, u32 rid, const std::string& value)
+bool gdb_thread::set_reg(ppu_thread* thread, u32 rid, std::string value)
 {
-	switch (rid)
-	{
+	switch (rid) {
 	case 64:
 		thread->cia = static_cast<u32>(hex_to_u64(value));
 		return true;
@@ -492,13 +466,10 @@ bool gdb_thread::set_reg(ppu_thread* thread, u32 rid, const std::string& value)
 		return true;
 	default:
 		if (rid > 70) return false;
-		if (rid > 31)
-		{
-			const u64 val = hex_to_u64(value);
+		if (rid > 31) {
+			u64 val = hex_to_u64(value);
 			thread->fpr[rid - 32] = std::bit_cast<f64>(val);
-		}
-		else
-		{
+		} else {
 			thread->gpr[rid] = hex_to_u64(value);
 		}
 		return true;
@@ -507,15 +478,13 @@ bool gdb_thread::set_reg(ppu_thread* thread, u32 rid, const std::string& value)
 
 u32 gdb_thread::get_reg_size(ppu_thread*, u32 rid)
 {
-	switch (rid)
-	{
+	switch (rid) {
 	case 66:
 	case 69:
 	case 70:
 		return 4;
 	default:
-		if (rid > 70)
-		{
+		if (rid > 70) {
 			return 0;
 		}
 		return 8;
@@ -544,9 +513,7 @@ void gdb_thread::wait_with_interrupts()
 
 			GDB.error("Error during socket read.");
 			fmt::throw_exception("Error during socket read");
-		}
-		else if (c == 0x03)
-		{
+		} else if (c == 0x03) {
 			paused = true;
 		}
 	}
@@ -572,8 +539,7 @@ bool gdb_thread::cmd_thread_info(gdb_cmd&)
 	std::string result;
 	const auto on_select = [&](u32, cpu_thread& cpu)
 	{
-		if (!result.empty())
-		{
+		if (!result.empty()) {
 			result += ",";
 		}
 		result += u64_to_padded_hex(static_cast<u64>(cpu.id));
@@ -589,67 +555,51 @@ bool gdb_thread::cmd_thread_info(gdb_cmd&)
 
 bool gdb_thread::cmd_current_thread(gdb_cmd&)
 {
-	return send_cmd_ack(selected_thread && selected_thread->state.none_of(cpu_flag::exit) ? ("QC" + u64_to_padded_hex(selected_thread->id)) : "");
+	return send_cmd_ack(selected_thread.expired() ? "" : ("QC" + u64_to_padded_hex(selected_thread.lock()->id)));
 }
 
 bool gdb_thread::cmd_read_register(gdb_cmd& cmd)
 {
-	if (!select_thread(general_ops_thread_id))
-	{
+	if (!select_thread(general_ops_thread_id)) {
 		return send_cmd_ack("E02");
 	}
-
-	if (!selected_thread || selected_thread->state & cpu_flag::exit)
-	{
-		return send_cmd_ack("");
-	}
-
-	if (auto ppu = selected_thread->try_get<named_thread<ppu_thread>>())
+	auto th = selected_thread.lock();
+	if (auto ppu = th->try_get<named_thread<ppu_thread>>())
 	{
 		u32 rid = hex_to_u32(cmd.data);
 		std::string result = get_reg(ppu, rid);
-		if (result.empty())
-		{
+		if (result.empty()) {
 			GDB.warning("Wrong register id %d.", rid);
 			return send_cmd_ack("E01");
 		}
 		return send_cmd_ack(result);
 	}
-
-	GDB.warning("Unimplemented thread type %d.", selected_thread->id_type());
+	GDB.warning("Unimplemented thread type %d.", th->id_type());
 	return send_cmd_ack("");
 }
 
 bool gdb_thread::cmd_write_register(gdb_cmd& cmd)
 {
-	if (!select_thread(general_ops_thread_id))
-	{
+	if (!select_thread(general_ops_thread_id)) {
 		return send_cmd_ack("E02");
 	}
-
-	if (!selected_thread || selected_thread->state & cpu_flag::exit)
-	{
-		return send_cmd_ack("");
-	}
-
-	if (auto ppu = selected_thread->try_get<named_thread<ppu_thread>>())
-	{
+	auto th = selected_thread.lock();
+	if (th->id_type() == 1) {
+		auto ppu = static_cast<named_thread<ppu_thread>*>(th.get());
 		usz eq_pos = cmd.data.find('=');
-		if (eq_pos == umax)
-		{
+		if (eq_pos == umax) {
 			GDB.warning("Wrong write_register cmd data '%s'.", cmd.data);
 			return send_cmd_ack("E02");
 		}
 		u32 rid = hex_to_u32(cmd.data.substr(0, eq_pos));
 		std::string value = cmd.data.substr(eq_pos + 1);
-		if (!set_reg(ppu, rid, value))
-		{
+		if (!set_reg(ppu, rid, value)) {
 			GDB.warning("Wrong register id %d.", rid);
 			return send_cmd_ack("E01");
 		}
 		return send_cmd_ack("OK");
 	}
-	GDB.warning("Unimplemented thread type %d.", selected_thread->id_type());
+	GDB.warning("Unimplemented thread type %d.", th->id_type());
 	return send_cmd_ack("");
 }
 
@@ -660,20 +610,15 @@ bool gdb_thread::cmd_read_memory(gdb_cmd& cmd)
 	u32 len = hex_to_u32(cmd.data.substr(s + 1));
 	std::string result;
 	result.reserve(len * 2);
-	for (u32 i = 0; i < len; ++i)
-	{
-		if (vm::check_addr(addr))
-		{
+	for (u32 i = 0; i < len; ++i) {
+		if (vm::check_addr(addr)) {
 			result += to_hexbyte(vm::read8(addr + i));
-		}
-		else
-		{
+		} else {
 			break;
 			//result += "xx";
 		}
 	}
-	if (len && result.empty())
-	{
+	if (len && result.empty()) {
 		//nothing read
 		return send_cmd_ack("E01");
 	}
@@ -684,30 +629,24 @@ bool gdb_thread::cmd_write_memory(gdb_cmd& cmd)
 {
 	usz s = cmd.data.find(',');
 	usz s2 = cmd.data.find(':');
-	if ((s == umax) || (s2 == umax))
-	{
+	if ((s == umax) || (s2 == umax)) {
 		GDB.warning("Malformed write memory request received: '%s'.", cmd.data);
 		return send_cmd_ack("E01");
 	}
 	u32 addr = hex_to_u32(cmd.data.substr(0, s));
 	u32 len = hex_to_u32(cmd.data.substr(s + 1, s2 - s - 1));
 	const char* data_ptr = (cmd.data.c_str()) + s2 + 1;
-	for (u32 i = 0; i < len; ++i)
-	{
-		if (vm::check_addr(addr + i, vm::page_writable))
-		{
+	for (u32 i = 0; i < len; ++i) {
+		if (vm::check_addr(addr + i, vm::page_writable)) {
 			u8 val;
 			int res = sscanf_s(data_ptr, "%02hhX", &val);
-			if (!res)
-			{
+			if (!res) {
 				GDB.warning("Couldn't read u8 from string '%s'.", data_ptr);
 				return send_cmd_ack("E02");
 			}
 			data_ptr += 2;
 			vm::write8(addr + i, val);
-		}
-		else
-		{
+		} else {
 			return send_cmd_ack("E03");
 		}
 	}
@@ -719,48 +658,35 @@ bool gdb_thread::cmd_read_all_registers(gdb_cmd&)
 	std::string result;
 	select_thread(general_ops_thread_id);
 
-	if (!selected_thread || selected_thread->state & cpu_flag::exit)
-	{
-		return send_cmd_ack("");
-	}
-
-	if (auto ppu = selected_thread->try_get<named_thread<ppu_thread>>())
-	{
+	auto th = selected_thread.lock();
+	if (th->id_type() == 1) {
+		auto ppu = static_cast<named_thread<ppu_thread>*>(th.get());
 		//68 64-bit registers, and 3 32-bit
 		result.reserve(68*16 + 3*8);
-		for (int i = 0; i < 71; ++i)
-		{
+		for (int i = 0; i < 71; ++i) {
 			result += get_reg(ppu, i);
 		}
 		return send_cmd_ack(result);
 	}
-
-	GDB.warning("Unimplemented thread type %d.", selected_thread->id_type());
+	GDB.warning("Unimplemented thread type %d.", th->id_type());
 	return send_cmd_ack("");
 }
 
 bool gdb_thread::cmd_write_all_registers(gdb_cmd& cmd)
 {
 	select_thread(general_ops_thread_id);
-
-	if (!selected_thread || selected_thread->state & cpu_flag::exit)
-	{
-		return send_cmd_ack("");
-	}
-
-	if (auto ppu = selected_thread->try_get<named_thread<ppu_thread>>())
-	{
+	auto th = selected_thread.lock();
+	if (th->id_type() == 1) {
+		auto ppu = static_cast<named_thread<ppu_thread>*>(th.get());
 		int ptr = 0;
-		for (int i = 0; i < 71; ++i)
-		{
+		for (int i = 0; i < 71; ++i) {
 			int sz = get_reg_size(ppu, i);
 			set_reg(ppu, i, cmd.data.substr(ptr, sz * 2));
 			ptr += sz * 2;
 		}
 		return send_cmd_ack("OK");
 	}
-
-	GDB.warning("Unimplemented thread type %d.", selected_thread->id_type());
+	GDB.warning("Unimplemented thread type %d.", th->id_type());
 	return send_cmd_ack("E01");
 }
 
@@ -769,16 +695,12 @@ bool gdb_thread::cmd_set_thread_ops(gdb_cmd& cmd)
 	char type = cmd.data[0];
 	std::string thread = cmd.data.substr(1);
 	u64 id = thread == "-1" ? ALL_THREADS : hex_to_u64(thread);
-	if (type == 'c')
-	{
+	if (type == 'c') {
 		continue_ops_thread_id = id;
-	}
-	else
-	{
+	} else {
 		general_ops_thread_id = id;
 	}
-	if (select_thread(id))
-	{
+	if (select_thread(id)) {
 		return send_cmd_ack("OK");
 	}
 	GDB.warning("Client asked to use thread 0x%x for %s, but no matching thread was found.", id, type == 'c' ? "continue ops" : "general ops");
@@ -793,8 +715,7 @@ bool gdb_thread::cmd_attached_to_what(gdb_cmd&)
 
 bool gdb_thread::cmd_kill(gdb_cmd&)
 {
-	GDB.notice("Kill command issued");
-	Emu.CallFromMainThread([](){ Emu.GracefulShutdown(); });
+	Emu.Stop();
 	return true;
 }
 
@@ -807,50 +728,31 @@ bool gdb_thread::cmd_vcont(gdb_cmd& cmd)
 {
 	//todo: handle multiple actions and thread ids
 	this->from_breakpoint = false;
-	if (cmd.data[1] == 'c' || cmd.data[1] == 's')
-	{
+	if (cmd.data[1] == 'c' || cmd.data[1] == 's') {
 		select_thread(continue_ops_thread_id);
-
-		auto ppu = !selected_thread || selected_thread->state & cpu_flag::exit ? nullptr : selected_thread->try_get<named_thread<ppu_thread>>();
-
+		auto ppu = std::static_pointer_cast<named_thread<ppu_thread>>(selected_thread.lock());
 		paused = false;
-
-		if (ppu)
-		{
-			bs_t<cpu_flag> add_flags{};
-
-			if (cmd.data[1] == 's')
-			{
-				add_flags += cpu_flag::dbg_step;
-			}
-
-			ppu->add_remove_flags(add_flags, cpu_flag::dbg_pause);
+		if (cmd.data[1] == 's') {
+			ppu->state += cpu_flag::dbg_step;
 		}
-
+		ppu->state -= cpu_flag::dbg_pause;
 		//special case if app didn't start yet (only loaded)
-		if (Emu.IsReady())
-		{
+		if (Emu.IsReady()) {
 			Emu.Run(true);
 		}
-		else if (Emu.IsPaused())
-		{
+		if (Emu.IsPaused()) {
 			Emu.Resume();
+		} else {
+			ppu->state.notify_one();
 		}
-
 		wait_with_interrupts();
 		//we are in all-stop mode
 		Emu.Pause();
 		select_thread(pausedBy);
 		// we have to remove dbg_pause from thread that paused execution, otherwise
 		// it will be paused forever (Emu.Resume only removes dbg_global_pause)
-
-		ppu = !selected_thread || selected_thread->state & cpu_flag::exit ? nullptr : selected_thread->try_get<named_thread<ppu_thread>>();
-
-		if (ppu)
-		{
-			ppu->add_remove_flags({}, cpu_flag::dbg_pause);
-		}
-
+		ppu = std::static_pointer_cast<named_thread<ppu_thread>>(selected_thread.lock());
+		ppu->state -= cpu_flag::dbg_pause;
 		return send_reason();
 	}
 	return send_cmd_ack("");
@@ -862,17 +764,14 @@ bool gdb_thread::cmd_set_breakpoint(gdb_cmd& cmd)
 {
 	char type = cmd.data[0];
 	//software breakpoint
-	if (type == '0')
-	{
+	if (type == '0') {
 		u32 addr = INVALID_PTR;
-		if (cmd.data.find(';') != umax)
-		{
+		if (cmd.data.find(';') != umax) {
 			GDB.warning("Received request to set breakpoint with condition, but they are not supported.");
 			return send_cmd_ack("E01");
 		}
 		sscanf_s(cmd.data.c_str(), "0,%x", &addr);
-		if (addr == INVALID_PTR)
-		{
+		if (addr == INVALID_PTR) {
 			GDB.warning("Can't parse breakpoint request, data: '%s'.", cmd.data);
 			return send_cmd_ack("E02");
 		}
@@ -887,12 +786,10 @@ bool gdb_thread::cmd_remove_breakpoint(gdb_cmd& cmd)
 {
 	char type = cmd.data[0];
 	//software breakpoint
-	if (type == '0')
-	{
+	if (type == '0') {
 		u32 addr = INVALID_PTR;
 		sscanf_s(cmd.data.c_str(), "0,%x", &addr);
-		if (addr == INVALID_PTR)
-		{
+		if (addr == INVALID_PTR) {
 			GDB.warning("Can't parse breakpoint remove request, data: '%s'.", cmd.data);
 			return send_cmd_ack("E01");
 		}
@@ -908,6 +805,10 @@ bool gdb_thread::cmd_remove_breakpoint(gdb_cmd& cmd)
 
 gdb_thread::gdb_thread() noexcept
 {
+#ifdef _WIN32
+	WSADATA wsa_data;
+	WSAStartup(MAKEWORD(2, 2), &wsa_data);
+#endif
 }
 
 gdb_thread::~gdb_thread()
@@ -921,13 +822,17 @@ gdb_thread::~gdb_thread()
 	{
 		closesocket(client_socket);
 	}
+
+#ifdef _WIN32
+	WSACleanup();
+#endif
 }
 
 void gdb_thread::operator()()
 {
 	start_server();
 
-	for (u64 sleep_until = get_system_time(); server_socket != -1 && thread_ctrl::state() != thread_state::aborting;)
+	while (server_socket != -1 && thread_ctrl::state() != thread_state::aborting)
 	{
 		sockaddr_in client;
 		socklen_t client_len = sizeof(client);
@@ -937,7 +842,7 @@ void gdb_thread::operator()()
 		{
 			if (check_errno_again())
 			{
-				thread_ctrl::wait_until(&sleep_until, 5000);
+				thread_ctrl::wait_for(5000);
 				continue;
 			}
 
diff --git a/rpcs3/Emu/GDB.h b/rpcs3/Emu/GDB.h
index 75d272f9d7..e67d505e7d 100644
--- a/rpcs3/Emu/GDB.h
+++ b/rpcs3/Emu/GDB.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Utilities/Thread.h"
+#include <memory>
 #include <string>
 
 struct gdb_cmd;
@@ -15,7 +16,7 @@ class gdb_thread
 
 	int server_socket = -1;
 	int client_socket = -1;
-	shared_ptr<cpu_thread> selected_thread{};
+	std::weak_ptr<cpu_thread> selected_thread{};
 	u64 continue_ops_thread_id = ANY_THREAD;
 	u64 general_ops_thread_id = ANY_THREAD;
 
@@ -57,7 +58,7 @@ class gdb_thread
 	//returns register value as hex string by register id (in gdb), in case of wrong id returns empty string
 	static std::string get_reg(ppu_thread* thread, u32 rid);
 	//sets register value to hex string by register id (in gdb), in case of wrong id returns false
-	static bool set_reg(ppu_thread* thread, u32 rid, const std::string& value);
+	static bool set_reg(ppu_thread* thread, u32 rid, std::string value);
 	//returns size of register with id rid in bytes, zero if invalid rid is provided
 	static u32 get_reg_size(ppu_thread* thread, u32 rid);
 	//send reason of stop, returns false if sending response failed
diff --git a/rpcs3/Emu/GameInfo.h b/rpcs3/Emu/GameInfo.h
index 3efca1410a..efd2819799 100644
--- a/rpcs3/Emu/GameInfo.h
+++ b/rpcs3/Emu/GameInfo.h
@@ -6,9 +6,8 @@
 struct GameInfo
 {
 	std::string path;
-	std::string icon_path;
-	std::string movie_path;
 
+	std::string icon_path;
 	std::string name;
 	std::string serial;
 	std::string app_ver;
@@ -22,5 +21,26 @@ struct GameInfo
 	u32 sound_format = 0;
 	u32 resolution = 0;
 
-	u64 size_on_disk = umax;
+	GameInfo()
+	{
+		Reset();
+	}
+
+	void Reset()
+	{
+		path.clear();
+
+		name = "Unknown";
+		serial = "Unknown";
+		app_ver = "Unknown";
+		version = "Unknown";
+		category = "Unknown";
+		fw = "Unknown";
+
+		attr = 0;
+		bootable = 0;
+		parental_lvl = 0;
+		sound_format = 0;
+		resolution = 0;
+	}
 };
diff --git a/rpcs3/Emu/IPC.h b/rpcs3/Emu/IPC.h
index 7c94458376..9df802c7bb 100644
--- a/rpcs3/Emu/IPC.h
+++ b/rpcs3/Emu/IPC.h
@@ -1,16 +1,15 @@
 #pragma once
 
+#include <memory>
 #include <unordered_map>
 
 #include "Utilities/mutex.h"
 
-#include "util/shared_ptr.hpp"
-
 // IPC manager for objects of type T and IPC keys of type K.
 template <typename T, typename K>
 class ipc_manager final
 {
-	std::unordered_map<K, shared_ptr<T>> m_map;
+	std::unordered_map<K, std::shared_ptr<T>> m_map;
 
 	mutable shared_mutex m_mutex;
 
@@ -18,12 +17,12 @@ public:
 	// Add new object if specified ipc_key is not used
 	// .first: added new object?, .second: what's at m_map[key] after this function if (peek_ptr || added new object) is true
 	template <typename F>
-	std::pair<bool, shared_ptr<T>> add(const K& ipc_key, F&& provider, bool peek_ptr = true)
+	std::pair<bool, std::shared_ptr<T>> add(const K& ipc_key, F&& provider, bool peek_ptr = true)
 	{
 		std::lock_guard lock(m_mutex);
 
 		// Get object location
-		shared_ptr<T>& ptr = m_map[ipc_key];
+		std::shared_ptr<T>& ptr = m_map[ipc_key];
 		const bool existed = ptr.operator bool();
 
 		if (!existed)
@@ -33,7 +32,7 @@ public:
 		}
 
 		const bool added = !existed && ptr;
-		return {added, (peek_ptr || added) ? ptr : null_ptr};
+		return {added, (peek_ptr || added) ? ptr : nullptr};
 	}
 
 	// Unregister specified ipc_key, may return true even if the object doesn't exist anymore
@@ -45,7 +44,7 @@ public:
 	}
 
 	// Get object with specified ipc_key
-	shared_ptr<T> get(const K& ipc_key) const
+	std::shared_ptr<T> get(const K& ipc_key) const
 	{
 		reader_lock lock(m_mutex);
 
@@ -56,7 +55,7 @@ public:
 			return found->second;
 		}
 
-		return {};
+		return nullptr;
 	}
 
 	// Check whether the object actually exists
diff --git a/rpcs3/Emu/IPC_config.cpp b/rpcs3/Emu/IPC_config.cpp
deleted file mode 100644
index 6a51e80324..0000000000
--- a/rpcs3/Emu/IPC_config.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "stdafx.h"
-#include "IPC_config.h"
-
-cfg_ipc g_cfg_ipc;
-
-LOG_CHANNEL(IPC);
-
-void cfg_ipc::load()
-{
-	const std::string path = cfg_ipc::get_path();
-
-	fs::file cfg_file(path, fs::read);
-	if (cfg_file)
-	{
-		IPC.notice("Loading IPC config. Path: %s", path);
-		from_string(cfg_file.to_string());
-	}
-	else
-	{
-		IPC.notice("IPC config missing. Using default settings. Path: %s", path);
-		from_default();
-	}
-}
-
-void cfg_ipc::save() const
-{
-#ifdef _WIN32
-	const std::string path_to_cfg = fs::get_config_dir(true);
-	if (!fs::create_path(path_to_cfg))
-	{
-		IPC.error("Could not create path: %s", path_to_cfg);
-	}
-#endif
-
-	const std::string path = cfg_ipc::get_path();
-
-	if (!cfg::node::save(path))
-	{
-		IPC.error("Could not save config: %s (error=%s)", path, fs::g_tls_error);
-	}
-}
-
-std::string cfg_ipc::get_path()
-{
-	return fs::get_config_dir(true) + "ipc.yml";
-}
-
-bool cfg_ipc::get_server_enabled() const
-{
-	return ipc_server_enabled.get();
-}
-
-int cfg_ipc::get_port() const
-{
-	return ipc_port;
-}
-
-void cfg_ipc::set_server_enabled(const bool enabled)
-{
-	this->ipc_server_enabled.set(enabled);
-}
-
-void cfg_ipc::set_port(const int port)
-{
-	this->ipc_port.set(port);
-}
diff --git a/rpcs3/Emu/IPC_config.h b/rpcs3/Emu/IPC_config.h
deleted file mode 100644
index 3209257d2d..0000000000
--- a/rpcs3/Emu/IPC_config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "Utilities/Config.h"
-
-struct cfg_ipc : cfg::node
-{
-	cfg::_bool ipc_server_enabled{ this, "IPC Server enabled", false };
-	cfg::_int<1025, 65535> ipc_port{ this, "IPC Port", 28012 };
-
-	void load();
-	void save() const;
-
-	bool get_server_enabled() const;
-	int get_port() const;
-
-	void set_server_enabled(const bool enabled);
-	void set_port(const int port);
-
-private:
-	static std::string get_path();
-};
-
-extern cfg_ipc g_cfg_ipc;
diff --git a/rpcs3/Emu/IPC_socket.cpp b/rpcs3/Emu/IPC_socket.cpp
deleted file mode 100644
index 81ff9c11c8..0000000000
--- a/rpcs3/Emu/IPC_socket.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-#include "stdafx.h"
-#include "System.h"
-#include "Emu/IPC_config.h"
-#include "IPC_socket.h"
-#include "rpcs3_version.h"
-
-
-namespace IPC_socket
-{
-	const u8& IPC_impl::read8(u32 addr)
-	{
-		return vm::read8(addr);
-	}
-
-	void IPC_impl::write8(u32 addr, u8 value)
-	{
-		vm::write8(addr, value);
-	}
-
-	const be_t<u16>& IPC_impl::read16(u32 addr)
-	{
-		return vm::read16(addr);
-	}
-
-	void IPC_impl::write16(u32 addr, be_t<u16> value)
-	{
-		vm::write16(addr, value);
-	}
-
-	const be_t<u32>& IPC_impl::read32(u32 addr)
-	{
-		return vm::read32(addr);
-	}
-
-	void IPC_impl::write32(u32 addr, be_t<u32> value)
-	{
-		vm::write32(addr, value);
-	}
-
-	const be_t<u64>& IPC_impl::read64(u32 addr)
-	{
-		return vm::read64(addr);
-	}
-
-	void IPC_impl::write64(u32 addr, be_t<u64> value)
-	{
-		vm::write64(addr, value);
-	}
-
-	int IPC_impl::get_port()
-	{
-		return g_cfg_ipc.get_port();
-	}
-
-	pine::EmuStatus IPC_impl::get_status()
-	{
-		switch (Emu.GetStatus())
-		{
-		case system_state::running:
-			return pine::EmuStatus::Running;
-		case system_state::paused:
-			return pine::EmuStatus::Paused;
-		default:
-			return pine::EmuStatus::Shutdown;
-		}
-	}
-
-	const std::string& IPC_impl::get_title()
-	{
-		return Emu.GetTitle();
-	}
-
-	const std::string& IPC_impl::get_title_ID()
-	{
-		return Emu.GetTitleID();
-	}
-
-	const std::string& IPC_impl::get_executable_hash()
-	{
-		return Emu.GetExecutableHash();
-	}
-
-	const std::string& IPC_impl::get_app_version()
-	{
-		return Emu.GetAppVersion();
-	}
-
-	std::string IPC_impl::get_version_and_branch()
-	{
-		return rpcs3::get_version_and_branch();
-	}
-
-	IPC_impl& IPC_impl::operator=(thread_state)
-	{
-		return *this;
-	}
-
-	IPC_server_manager::IPC_server_manager(bool enabled)
-	{
-		// Enable IPC if needed
-		set_server_enabled(enabled);
-	}
-
-	void IPC_server_manager::set_server_enabled(bool enabled)
-	{
-		if (enabled)
-		{
-			int port = g_cfg_ipc.get_port();
-			if (!m_ipc_server || port != m_old_port)
-			{
-				IPC.notice("Starting server with port %d", port);
-				m_ipc_server = std::make_unique<IPC_server>();
-				m_old_port = port;
-			}
-		}
-		else if (m_ipc_server)
-		{
-			IPC.notice("Stopping server");
-			m_ipc_server.reset();
-		}
-	}
-}
diff --git a/rpcs3/Emu/IPC_socket.h b/rpcs3/Emu/IPC_socket.h
deleted file mode 100644
index d973184c36..0000000000
--- a/rpcs3/Emu/IPC_socket.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-
-#include "Utilities/Thread.h"
-#include "util/logs.hpp"
-#include "Emu/Memory/vm.h"
-#include "3rdparty/pine/pine_server.h"
-
-LOG_CHANNEL(IPC);
-
-namespace IPC_socket
-{
-	class IPC_impl
-	{
-	protected:
-		template <u32 Size = 1>
-		static bool check_addr(u32 addr, u8 flags = vm::page_readable)
-		{
-			return vm::check_addr<Size>(addr, flags);
-		}
-
-		static const u8& read8(u32 addr);
-		static void write8(u32 addr, u8 value);
-		static const be_t<u16>& read16(u32 addr);
-		static void write16(u32 addr, be_t<u16> value);
-		static const be_t<u32>& read32(u32 addr);
-		static void write32(u32 addr, be_t<u32> value);
-		static const be_t<u64>& read64(u32 addr);
-		static void write64(u32 addr, be_t<u64> value);
-
-		template<typename... Args>
-		static void error(const const_str& fmt, Args&&... args)
-		{
-			IPC.error(fmt, std::forward<Args>(args)...);
-		}
-
-		static int get_port();
-		static pine::EmuStatus get_status();
-		static const std::string& get_title();
-		static const std::string& get_title_ID();
-		static const std::string& get_executable_hash();
-		static const std::string& get_app_version();
-		static std::string get_version_and_branch();
-
-	public:
-		static auto constexpr thread_name = "IPC Server"sv;
-		IPC_impl& operator=(thread_state);
-	};
-
-	class IPC_server_manager
-	{
-		using IPC_server = named_thread<pine::pine_server<IPC_socket::IPC_impl>>;
-
-		std::unique_ptr<IPC_server> m_ipc_server;
-		int m_old_port = 0;
-
-	public:
-		explicit IPC_server_manager(bool enabled);
-		void set_server_enabled(bool enabled);
-	};
-}
diff --git a/rpcs3/Emu/IdManager.cpp b/rpcs3/Emu/IdManager.cpp
index 2a8f9ffeee..54862d7716 100644
--- a/rpcs3/Emu/IdManager.cpp
+++ b/rpcs3/Emu/IdManager.cpp
@@ -1,82 +1,34 @@
 #include "stdafx.h"
 #include "IdManager.h"
+#include "Utilities/Thread.h"
 
 shared_mutex id_manager::g_mutex;
 
-namespace id_manager
+thread_local DECLARE(idm::g_id);
+
+idm::map_data* idm::allocate_id(std::vector<map_data>& vec, u32 type_id,  u32 base, u32 step, u32 count, std::pair<u32, u32> invl_range)
 {
-	thread_local u32 g_id = 0;
-}
-
-template <>
-bool serialize<std::shared_ptr<utils::serial>>(utils::serial& ar, std::shared_ptr<utils::serial>& o)
-{
-	if (!o)
-	{
-		o = std::make_shared<utils::serial>();
-	}
-
-	if (!ar.is_writing())
-	{
-		o->set_reading_state();
-	}
-
-	ar(o->data);
-	return true;
-}
-
-std::vector<std::pair<u128, id_manager::typeinfo>>& id_manager::get_typeinfo_map()
-{
-	// Magic static
-	static std::vector<std::pair<u128, id_manager::typeinfo>> s_map;
-	return s_map;
-}
-
-id_manager::id_key* idm::allocate_id(std::span<id_manager::id_key> keys, u32& highest_index, u32 type_id, u32 dst_id, u32 base, u32 step, u32 count, bool uses_lowest_id, std::pair<u32, u32> invl_range)
-{
-	if (dst_id != (base ? 0 : u32{umax}))
-	{
-		// Fixed position construction
-		const u32 index = id_manager::get_index(dst_id, base, step, count, invl_range);
-		ensure(index < count);
-
-		highest_index = std::max(highest_index, index + 1);
-
-		if (keys[index].type() != umax)
-		{
-			return nullptr;
-		}
-
-		id_manager::g_id = dst_id;
-		keys[index] = id_manager::id_key(dst_id, type_id);
-		return &keys[index];
-	}
-
-	if (uses_lowest_id)
-	{
-		// Disable the optimization below (hurts accuracy for known cases)
-		highest_index = count;
-	}
-	else if (highest_index < count)
+	if (vec.size() < count)
 	{
 		// Try to emplace back
-		const u32 _next = base + step * highest_index;
-		id_manager::g_id = _next;
-		return &(keys[highest_index++] = (id_manager::id_key(_next, type_id)));
+		const u32 _next = base + step * ::size32(vec);
+		g_id = _next;
+		vec.emplace_back(id_manager::id_key(_next, type_id), nullptr);
+		return &vec.back();
 	}
 
 	// Check all IDs starting from "next id" (TODO)
 	for (u32 i = 0, next = base; i < count; i++, next += step)
 	{
-		const auto ptr = &keys[i];
+		const auto ptr = &vec[i];
 
 		// Look for free ID
-		if (ptr->type() == umax)
+		if (!ptr->second)
 		{
 			// Incremenet ID invalidation counter
-			const u32 id = next | ((ptr->value() + (1u << invl_range.first)) & (invl_range.second ? (((1u << invl_range.second) - 1) << invl_range.first) : 0));
-			id_manager::g_id = id;
-			*ptr = id_manager::id_key(id, type_id);
+			const u32 id = next | ((ptr->first + (1u << invl_range.first)) & (invl_range.second ? (((1u << invl_range.second) - 1) << invl_range.first) : 0));
+			g_id = id;
+			ptr->first = id_manager::id_key(id, type_id);
 			return ptr;
 		}
 	}
diff --git a/rpcs3/Emu/IdManager.h b/rpcs3/Emu/IdManager.h
index b3c898c23b..1a49015ad2 100644
--- a/rpcs3/Emu/IdManager.h
+++ b/rpcs3/Emu/IdManager.h
@@ -5,10 +5,7 @@
 
 #include <memory>
 #include <vector>
-#include <span>
 
-#include "util/serialization.hpp"
-#include "util/shared_ptr.hpp"
 #include "util/fixed_typemap.hpp"
 
 extern stx::manual_typemap<void, 0x20'00000, 128> g_fixed_typemap;
@@ -17,243 +14,113 @@ constexpr auto* g_fxo = &g_fixed_typemap;
 
 enum class thread_state : u32;
 
-extern u16 serial_breathe_and_tag(utils::serial& ar, std::string_view name, bool tag_bit);
-
-template <typename T>
-concept IdmCompatible = requires () { u32{T::id_base}, u32{T::id_step}, u32{T::id_count}; };
-
-template <typename T>
-concept IdmBaseCompatible = (std::is_final_v<T> ? IdmCompatible<T> : !!(requires () { u32{T::id_step}, u32{T::id_count}; }));
-
-template <typename T>
-concept IdmSavable = IdmBaseCompatible<T> && T::savestate_init_pos != 0 && (requires(T& t, utils::serial& ar) { t.save(stx::exact_t<utils::serial&>(ar)); });
-
-// If id_base is declared in base type, than storage type must declare id_type
-template <typename Base, typename Type>
-concept IdmTypesCompatible = PtrSame<Base, Type> && IdmCompatible<Type> && IdmBaseCompatible<Base> && (std::is_same_v<Base, Type> || !IdmCompatible<Base> || !!(requires () { u32{Type::id_type}; }));
-
 // Helper namespace
 namespace id_manager
 {
-	using pointer_keeper = std::function<void(void*)>;
-
 	// Common global mutex
 	extern shared_mutex g_mutex;
 
-	template <typename T>
-	constexpr std::pair<u32, u32> get_invl_range()
-	{
-		return {0, 0};
-	}
-
-	template <typename T> requires requires () { T::id_invl_range.first + T::id_invl_range.second; }
-	constexpr std::pair<u32, u32> get_invl_range()
-	{
-		return T::id_invl_range;
-	}
-
-	template <typename T>
-	consteval bool get_force_lowest_id()
-	{
-		return false;
-	}
-
-	template <typename T> requires requires () { bool{T::id_lowest}; }
-	consteval bool get_force_lowest_id()
-	{
-		return T::id_lowest;
-	}
-
-	// Last allocated ID for constructors
-	extern thread_local u32 g_id;
-
 	// ID traits
-	template <typename T>
+	template <typename T, typename = void>
 	struct id_traits
 	{
-		static_assert(IdmCompatible<T>, "ID object must specify: id_base, id_step, id_count");
+		static_assert(sizeof(T) == 0, "ID object must specify: id_base, id_step, id_count");
 
-		static constexpr u32 base = T::id_base; // First ID (N = 0)
-		static constexpr u32 step = T::id_step; // Any ID: N * id_setp + id_base
-		static constexpr u32 count = T::id_count; // Limit: N < id_count
-		static constexpr u32 invalid = -+!base; // Invalid ID sample
+		static constexpr u32 base    = 1;     // First ID (N = 0)
+		static constexpr u32 step    = 1;     // Any ID: N * id_step + id_base
+		static constexpr u32 count   = 65535; // Limit: N < id_count
+		static constexpr u32 invalid = 0;
+		static constexpr std::pair<u32, u32> invl_range{0, 0};
+	};
 
-		static constexpr std::pair<u32, u32> invl_range = get_invl_range<T>();
-		static constexpr bool uses_lowest_id = get_force_lowest_id<T>();
+	template <typename T, typename = void>
+	struct invl_range_extract_impl
+	{
+		static constexpr std::pair<u32, u32> invl_range{0, 0};
+	};
 
-		static_assert(u32{count} && u32{step} && u64{step} * (count - 1) + base < u32{umax} + u64{base != 0 ? 1 : 0}, "ID traits: invalid object range");
+	template <typename T>
+	struct invl_range_extract_impl<T, std::void_t<decltype(&T::id_invl_range)>>
+	{
+		static constexpr std::pair<u32, u32> invl_range = T::id_invl_range;
+	};
+
+	template <typename T>
+	struct id_traits<T, std::void_t<decltype(&T::id_base), decltype(&T::id_step), decltype(&T::id_count)>>
+	{
+		static constexpr u32 base    = T::id_base;
+		static constexpr u32 step    = T::id_step;
+		static constexpr u32 count   = T::id_count;
+		static constexpr u32 invalid = -+!base;
+
+		static constexpr std::pair<u32, u32> invl_range = invl_range_extract_impl<T>::invl_range;
+
+		static_assert(count && step && u64{step} * (count - 1) + base < u32{umax} + u64{base != 0 ? 1 : 0}, "ID traits: invalid object range");
 
 		// TODO: Add more conditions
 		static_assert(!invl_range.second || (u64{invl_range.second} + invl_range.first <= 32 /*....*/ ));
 	};
 
-	static constexpr u32 get_index(u32 id, u32 base, u32 step, u32 count, std::pair<u32, u32> invl_range)
+	// Correct usage testing
+	template <typename T, typename T2, typename = void>
+	struct id_verify : std::integral_constant<bool, std::is_base_of<T, T2>::value>
 	{
-		u32 mask_out = ((1u << invl_range.second) - 1) << invl_range.first;
+		// If common case, T2 shall be derived from or equal to T
+	};
 
-		// Note: if id is lower than base, diff / step will be higher than count
-		u32 diff = (id & ~mask_out) - base;
+	template <typename T, typename T2>
+	struct id_verify<T, T2, std::void_t<typename T2::id_type>> : std::integral_constant<bool, std::is_same<T, typename T2::id_type>::value>
+	{
+		// If T2 contains id_type type, T must be equal to it
+	};
 
-		if (diff % step)
+	class typeinfo
+	{
+		// Global variable for each registered type
+		template <typename T>
+		struct registered
 		{
-			// id is invalid, return invalid index
-			return count;
+			static const u32 index;
+		};
+
+		// Increment type counter
+		static u32 add_type(u32 i)
+		{
+			static atomic_t<u32> g_next{0};
+
+			return g_next.fetch_add(i);
 		}
 
-		// Get actual index
-		return diff / step;
-	}
-
-	// ID traits
-	template <typename T>
-	struct id_traits_load_func
-	{
-		static constexpr pointer_keeper(*load)(utils::serial&) = [](utils::serial& ar) -> pointer_keeper
-		{
-			stx::shared_ptr<T> ptr;
-
-			if constexpr (std::is_constructible_v<T, stx::exact_t<const stx::launch_retainer&>, stx::exact_t<utils::serial&>>)
-			{
-				ptr = stx::make_shared<T>(stx::launch_retainer{}, stx::exact_t<utils::serial&>(ar));
-			}
-			else
-			{
-				ptr = stx::make_shared<T>(stx::exact_t<utils::serial&>(ar));
-			}
-
-			return [ptr](void* storage) { *static_cast<stx::atomic_ptr<T>*>(storage) = ptr; };
-		};
-	};
-
-	template <typename T>
-		requires requires() { &T::load; }
-	struct id_traits_load_func<T>
-	{
-		static constexpr pointer_keeper(*load)(utils::serial&) = [](utils::serial& ar) -> pointer_keeper
-		{
-			return T::load(stx::exact_t<utils::serial&>(ar));
-		};
-	};
-
-	template <typename T>
-	struct id_traits_savable_func
-	{
-		static constexpr bool(*savable)(void*) = [](void*) -> bool { return true; };
-	};
-
-	template <typename T>
-		requires requires { &T::savable; }
-	struct id_traits_savable_func<T>
-	{
-		static constexpr bool(*savable)(void* ptr) = [](void* ptr) -> bool { return static_cast<const T*>(ptr)->savable(); };
-	};
-
-	struct dummy_construct
-	{
-		dummy_construct() = default;
-		dummy_construct(utils::serial&) noexcept {}
-		void save(utils::serial&) {}
-
-		static constexpr u32 id_base = 1, id_step = 1, id_count = 1;
-		static constexpr double savestate_init_pos = 0;
-	};
-
-	struct typeinfo;
-
-	// Use a vector instead of map to reduce header dependencies in this commonly used header
-	std::vector<std::pair<u128, typeinfo>>& get_typeinfo_map();
-
-	struct typeinfo
-	{
 	public:
-		std::function<void(void*)>(*load)(utils::serial&);
-		void(*save)(utils::serial&, void*);
-		bool(*savable)(void* ptr);
-
-		u32 base;
-		u32 step;
-		u32 count;
-		bool uses_lowest_id;
-		std::pair<u32, u32> invl_range;
-
-		// Unique type ID within the same container: we use id_base if nothing else was specified
+		// Get type index
 		template <typename T>
-		static consteval u32 get_type()
+		static inline u32 get_index()
 		{
-			return T::id_base;
+			return registered<T>::index;
 		}
 
-		// Specified type ID for containers which their types may be sharing an overlapping IDs range
-		template <typename T> requires requires () { u32{T::id_type}; }
-		static consteval u32 get_type()
+		// Get type count
+		static inline u32 get_count()
 		{
-			return T::id_type;
-		}
-
-		template <typename T>
-		static typeinfo make_typeinfo()
-		{
-			typeinfo info{};
-
-			using C = std::conditional_t<IdmCompatible<T> && IdmSavable<T>, T, dummy_construct>;
-			using Type = std::conditional_t<IdmCompatible<T>, T, dummy_construct>;
-
-			if constexpr (std::is_same_v<C, T>)
-			{
-				info =
-				{
-					+id_traits_load_func<C>::load,
-					+[](utils::serial& ar, void* obj) { static_cast<C*>(obj)->save(ar); },
-					+id_traits_savable_func<C>::savable,
-					id_traits<C>::base, id_traits<C>::step, id_traits<C>::count, id_traits<C>::uses_lowest_id, id_traits<C>::invl_range,
-				};
-
-				const u128 key = u128{get_type<C>()} << 64 | std::bit_cast<u64>(C::savestate_init_pos);
-
-				for (const auto& [tkey, tinfo] : get_typeinfo_map())
-				{
-					if (!(tkey ^ key))
-					{
-						ensure(tinfo == info);
-						return info;
-					}
-				}
-
-				// id_base must be unique within all the objects with the same initialization posistion by definition of id_map with multiple types
-				get_typeinfo_map().emplace_back(key, info);
-			}
-			else
-			{
-				info =
-				{
-					nullptr,
-					nullptr,
-					nullptr,
-					id_traits<Type>::base, id_traits<Type>::step, id_traits<Type>::count, id_traits<Type>::uses_lowest_id, id_traits<Type>::invl_range,
-				};
-			}
-
-			return info;
-		}
-
-		bool operator==(const typeinfo& rhs) const noexcept
-		{
-			return base == rhs.base && invl_range == rhs.invl_range && save == rhs.save;
+			return add_type(0);
 		}
 	};
 
+	template <typename T>
+	const u32 typeinfo::registered<T>::index = typeinfo::add_type(1);
+
 	// ID value with additional type stored
 	class id_key
 	{
-		u32 m_value = 0; // ID value
-		u32 m_base = umax;  // ID base (must be unique for each type in the same container)
+		u32 m_value;           // ID value
+		u32 m_type;            // True object type
 
 	public:
-		id_key() noexcept = default;
+		id_key() = default;
 
-		id_key(u32 value, u32 type) noexcept
+		id_key(u32 value, u32 type)
 			: m_value(value)
-			, m_base(type)
+			, m_type(type)
 		{
 		}
 
@@ -264,15 +131,10 @@ namespace id_manager
 
 		u32 type() const
 		{
-			return m_base;
+			return m_type;
 		}
 
-		void clear()
-		{
-			m_base = umax;
-		}
-
-		operator u32() const noexcept
+		operator u32() const
 		{
 			return m_value;
 		}
@@ -281,120 +143,32 @@ namespace id_manager
 	template <typename T>
 	struct id_map
 	{
-		static_assert(IdmBaseCompatible<T>, "Please specify IDM compatible type.");
-
-		std::array<stx::atomic_ptr<T>, T::id_count> vec_data{};
-		std::array<stx::shared_ptr<T>, T::id_count> private_copy{};
-		std::array<id_key, T::id_count> vec_keys{};
-		u32 highest_index = 0;
-
+		std::vector<std::pair<id_key, std::shared_ptr<void>>> vec{}, private_copy{};
 		shared_mutex mutex{}; // TODO: Use this instead of global mutex
 
-		id_map() noexcept = default;
-
-		// Order it directly before the source type's position
-		static constexpr double savestate_init_pos_original = T::savestate_init_pos;
-		static constexpr double savestate_init_pos = std::bit_cast<double>(std::bit_cast<u64>(savestate_init_pos_original) - 1);
-
-		id_map(utils::serial& ar) noexcept requires IdmSavable<T>
+		id_map()
 		{
-			while (true)
-			{
-				const u16 tag = serial_breathe_and_tag(ar, g_fxo->get_name<id_map<T>>(), false);
-
-				if (tag >> 15)
-				{
-					// End
-					break;
-				}
-
-				// ID, type hash
-				const u32 id = ar.pop<u32>();
-
-				const u128 type_init_pos = u128{ar.pop<u32>()} << 64 | std::bit_cast<u64>(T::savestate_init_pos);
-				const typeinfo* info = nullptr;
-
-				// Search load functions for the one of this type (see make_typeinfo() for explenation about key composition reasoning)
-				for (const auto& typeinfo : get_typeinfo_map())
-				{
-					if (!(typeinfo.first ^ type_init_pos))
-					{
-						info = std::addressof(typeinfo.second);
-					}
-				}
-
-				ensure(info);
-
-				// Construct each object from information collected
-
-				// Simulate construction semantics (idm::last_id() value)
-				g_id = id;
-
-				const u32 object_index = get_index(id, info->base, info->step, info->count, info->invl_range);
-				auto& obj = ::at32(vec_data, object_index);
-				ensure(!obj);
-
-				highest_index = std::max(highest_index, object_index + 1);
-
-				vec_keys[object_index] = id_key(id, static_cast<u32>(static_cast<u64>(type_init_pos >> 64)));
-				info->load(ar)(&obj);
-			}
+			// Preallocate memory
+			vec.reserve(T::id_count);
 		}
 
-		void save(utils::serial& ar) requires IdmSavable<T>
+		template <bool dummy = false> requires (std::is_assignable_v<T&, thread_state>)
+		id_map& operator=(thread_state state)
 		{
-			for (const auto& p : vec_data)
-			{
-				if (!p) continue;
-
-				auto& key = vec_keys[&p - vec_data.data()];
-
-				const u128 type_init_pos = u128{key.type()} << 64 | std::bit_cast<u64>(T::savestate_init_pos);
-				const typeinfo* info = nullptr;
-
-				// Search load functions for the one of this type (see make_typeinfo() for explenation about key composition reasoning)
-				for (const auto& typeinfo : get_typeinfo_map())
-				{
-					if (!(typeinfo.first ^ type_init_pos))
-					{
-						ensure(!std::exchange(info, std::addressof(typeinfo.second)));
-					}
-				}
-
-				// Save each object with needed information
-				if (info && info->savable(p.observe()))
-				{
-					// Create a tag for each object
-					serial_breathe_and_tag(ar, g_fxo->get_name<id_map<T>>(), false);
-
-					ar(key.value(), key.type());
-					info->save(ar, p.observe());
-				}
-			}
-
-			// End sequence with tag bit set
-			serial_breathe_and_tag(ar, g_fxo->get_name<id_map<T>>(), true);
-		}
-
-		id_map& operator=(thread_state state) noexcept requires (std::is_assignable_v<T&, thread_state>)
-		{
-			if (highest_index)
+			if (private_copy.empty())
 			{
 				reader_lock lock(g_mutex);
 
 				// Save all entries
-				for (u32 i = 0; i < highest_index; i++)
-				{
-					private_copy[i] = vec_data[i].load();
-				}
+				private_copy = vec;
 			}
 
 			// Signal or join threads
-			for (const auto& ptr : private_copy)
+			for (const auto& [key, ptr] : private_copy)
 			{
 				if (ptr)
 				{
-					*ptr = state;
+					*static_cast<T*>(ptr.get()) = state;
 				}
 			}
 
@@ -406,12 +180,33 @@ namespace id_manager
 // Object manager for emulated process. Multiple objects of specified arbitrary type are given unique IDs.
 class idm
 {
+	// Last allocated ID for constructors
+	static thread_local u32 g_id;
+
+	template <typename T>
+	static inline u32 get_type()
+	{
+		return id_manager::typeinfo::get_index<T>();
+	}
+
 	template <typename T>
 	static constexpr u32 get_index(u32 id)
 	{
 		using traits = id_manager::id_traits<T>;
 
-		return id_manager::get_index(id, traits::base, traits::step, traits::count, traits::invl_range);
+		constexpr u32 mask_out = ((1u << traits::invl_range.second) - 1) << traits::invl_range.first;
+
+		// Note: if id is lower than base, diff / step will be higher than count
+		u32 diff = (id & ~mask_out) - traits::base;
+
+		if (diff % traits::step)
+		{
+			// id is invalid, return invalid index
+			return traits::count;
+		}
+
+		// Get actual index
+		return diff / traits::step;
 	}
 
 	// Helper
@@ -432,29 +227,40 @@ class idm
 		using result_type = R;
 	};
 
+	template <typename F, typename A1, typename A2>
+	struct function_traits<void (F::*)(A1, A2&) const>
+	{
+		using object_type = A2;
+		using void_type   = void;
+	};
+
+	template <typename F, typename A1, typename A2>
+	struct function_traits<void (F::*)(A1, A2&)>
+	{
+		using object_type = A2;
+		using void_type   = void;
+	};
+
 	// Helper type: pointer + return value propagated
 	template <typename T, typename RT>
-	struct return_pair;
-
-	template <typename T, typename RT>
-	struct return_pair<stx::shared_ptr<T>, RT>
+	struct return_pair
 	{
-		stx::shared_ptr<T> ptr;
+		std::shared_ptr<T> ptr;
 		RT ret;
 
-		explicit operator bool() const noexcept
+		explicit operator bool() const
 		{
 			return ptr.operator bool();
 		}
 
-		T& operator*() const noexcept
+		T& operator*() const
 		{
 			return *ptr;
 		}
 
-		T* operator->() const noexcept
+		T* operator->() const
 		{
-			return ptr.operator->();
+			return ptr.get();
 		}
 	};
 
@@ -465,105 +271,89 @@ class idm
 		T* ptr;
 		RT ret;
 
-		explicit operator bool() const noexcept
+		explicit operator bool() const
 		{
 			return ptr != nullptr;
 		}
 
-		T& operator*() const noexcept
+		T& operator*() const
 		{
 			return *ptr;
 		}
 
-		T* operator->() const noexcept
+		T* operator->() const
 		{
 			return ptr;
 		}
 	};
 
-	// Get type ID that is meant to be unique within the same container
-	template <typename T>
-	static consteval u32 get_type()
-	{
-		return id_manager::typeinfo::get_type<T>();
-	}
+	using map_data = std::pair<id_manager::id_key, std::shared_ptr<void>>;
 
 	// Prepare new ID (returns nullptr if out of resources)
-	static id_manager::id_key* allocate_id(std::span<id_manager::id_key> keys, u32& highest_index, u32 type_id, u32 dst_id, u32 base, u32 step, u32 count, bool uses_lowest_id, std::pair<u32, u32> invl_range);
+	static map_data* allocate_id(std::vector<map_data>& vec, u32 type_id, u32 base, u32 step, u32 count, std::pair<u32, u32> invl_range);
 
-	// Get object by internal index if exists (additionally check type if types are not equal)
+	// Find ID (additionally check type if types are not equal)
 	template <typename T, typename Type>
-	static std::pair<atomic_ptr<T>*, id_manager::id_key*> find_index(u32 index, u32 id)
+	static map_data* find_id(u32 id)
 	{
-		static_assert(IdmTypesCompatible<T, Type>, "Invalid ID type combination");
+		static_assert(id_manager::id_verify<T, Type>::value, "Invalid ID type combination");
 
-		auto& map = g_fxo->get<id_manager::id_map<T>>();
+		const u32 index = get_index<Type>(id);
 
-		if (index >= map.highest_index)
+		if (index >= id_manager::id_traits<Type>::count)
 		{
-			return {};
+			return nullptr;
 		}
 
-		auto& data = map.vec_data[index];
-		auto& key = map.vec_keys[index];
+		auto& vec = g_fxo->get<id_manager::id_map<T>>().vec;
 
-		if (data)
+		if (index >= vec.size())
 		{
-			if (std::is_same_v<T, Type> || key.type() == get_type<Type>())
+			return nullptr;
+		}
+
+		auto& data = vec[index];
+
+		if (data.second)
+		{
+			if (std::is_same<T, Type>::value || data.first.type() == get_type<Type>())
 			{
-				if (!id_manager::id_traits<Type>::invl_range.second || key.value() == id)
+				if (!id_manager::id_traits<Type>::invl_range.second || data.first.value() == id)
 				{
-					return { &data, &key };
+					return &data;
 				}
 			}
 		}
 
-		return {};
+		return nullptr;
 	}
 
-	// Find ID
-	template <typename T, typename Type>
-	static std::pair<atomic_ptr<T>*, id_manager::id_key*> find_id(u32 id)
-	{
-		static_assert(IdmTypesCompatible<T, Type>, "Invalid ID type combination");
-
-		const u32 index = get_index<Type>(id);
-
-		return find_index<T, Type>(index, id);
-	}
-
-	// Allocate new ID (or use fixed ID) and assign the object from the provider()
+	// Allocate new ID and assign the object from the provider()
 	template <typename T, typename Type, typename F>
-	static stx::shared_ptr<Type> create_id(F&& provider, u32 id = id_manager::id_traits<Type>::invalid)
+	static map_data* create_id(F&& provider)
 	{
-		static_assert(IdmTypesCompatible<T, Type>, "Invalid ID type combination");
+		static_assert(id_manager::id_verify<T, Type>::value, "Invalid ID type combination");
 
 		// ID traits
 		using traits = id_manager::id_traits<Type>;
 
-		// Ensure make_typeinfo() is used for this type
-		[[maybe_unused]] auto& td = stx::typedata<id_manager::typeinfo, Type>();
-
 		// Allocate new id
 		std::lock_guard lock(id_manager::g_mutex);
 
 		auto& map = g_fxo->get<id_manager::id_map<T>>();
 
-		if (auto* key_ptr = allocate_id({map.vec_keys.data(), map.vec_keys.size()}, map.highest_index, get_type<Type>(), id, traits::base, traits::step, traits::count, traits::uses_lowest_id, traits::invl_range))
+		if (auto* place = allocate_id(map.vec, get_type<Type>(), traits::base, traits::step, traits::count, traits::invl_range))
 		{
-			auto& place = map.vec_data[key_ptr - map.vec_keys.data()];
-
 			// Get object, store it
-			if (auto object = provider())
-			{
-				place = object;
-				return object;
-			}
+			place->second = provider();
 
-			*key_ptr = {};
+			if (place->second)
+			{
+				return place;
+			}
 		}
 
-		return {};
+		return nullptr;
 	}
 
 public:
@@ -573,100 +363,99 @@ public:
 	static inline void clear()
 	{
 		std::lock_guard lock(id_manager::g_mutex);
-
-		for (auto& ptr : g_fxo->get<id_manager::id_map<T>>().vec_data)
-		{
-			ptr.reset();
-		}
-
-		for (auto& key : g_fxo->get<id_manager::id_map<T>>().vec_keys)
-		{
-			key.clear();
-		}
+		g_fxo->get<id_manager::id_map<T>>().vec.clear();
 	}
 
 	// Get last ID (updated in create_id/allocate_id)
 	static inline u32 last_id()
 	{
-		return id_manager::g_id;
+		return g_id;
 	}
 
-	// Add a new ID of specified type with specified constructor arguments (returns object or null_ptr)
-	template <typename T, typename Make = T, typename... Args> requires (std::is_constructible_v<Make, Args&&...>)
-	static inline stx::shared_ptr<Make> make_ptr(Args&&... args)
+	// Add a new ID of specified type with specified constructor arguments (returns object or nullptr)
+	template <typename T, typename Make = T, typename... Args>
+	static inline std::enable_if_t<std::is_constructible<Make, Args...>::value, std::shared_ptr<Make>> make_ptr(Args&&... args)
 	{
-		if (auto pair = create_id<T, Make>([&] { return stx::make_shared<Make>(std::forward<Args>(args)...); }))
+		if (auto pair = create_id<T, Make>([&] { return std::make_shared<Make>(std::forward<Args>(args)...); }))
 		{
-			return pair;
-		}
-
-		return null_ptr;
-	}
-
-	// Add a new ID of specified type with specified constructor arguments (returns id)
-	template <typename T, typename Make = T, typename... Args> requires (std::is_constructible_v<Make, Args&&...>)
-	static inline u32 make(Args&&... args)
-	{
-		if (create_id<T, Make>([&] { return stx::make_shared<Make>(std::forward<Args>(args)...); }))
-		{
-			return last_id();
-		}
-
-		return id_manager::id_traits<Make>::invalid;
-	}
-
-	// Add a new ID for an object returned by provider()
-	template <typename T, typename Made = T, typename F>
-		requires IdmTypesCompatible<T, Made> && std::is_convertible_v<std::invoke_result_t<F&&>, stx::shared_ptr<Made>>
-	static inline u32 import(F&& provider, u32 id = id_manager::id_traits<Made>::invalid)
-	{
-		if (create_id<T, Made>(std::forward<F>(provider), id))
-		{
-			return last_id();
-		}
-
-		return id_manager::id_traits<Made>::invalid;
-	}
-
-	// Add a new ID for an existing object provided (returns new id)
-	template <typename T, typename Made = T>
-		requires IdmTypesCompatible<T, Made>
-	static inline u32 import_existing(stx::shared_ptr<Made> ptr, u32 id = id_manager::id_traits<Made>::invalid)
-	{
-		return import<T, Made>([&]() -> stx::shared_ptr<Made> { return std::move(ptr); }, id);
-	}
-
-	// Check the ID without locking (can be called from other method)
-	template <typename T, typename Get = T>
-		requires IdmTypesCompatible<T, Get>
-	static inline Get* check_unlocked(u32 id)
-	{
-		if (const auto found = find_id<T, Get>(id); found.first)
-		{
-			return static_cast<Get*>(found.first->observe());
+			return {pair->second, static_cast<Make*>(pair->second.get())};
 		}
 
 		return nullptr;
 	}
 
-	// Check the ID, access object under shared lock
-	template <typename T, typename Get = T, typename F, typename FRT = std::invoke_result_t<F, Get&>>
-		requires IdmTypesCompatible<T, Get>
-	static inline std::conditional_t<std::is_void_v<FRT>, Get*, return_pair<Get*, FRT>> check(u32 id, F&& func)
+	// Add a new ID of specified type with specified constructor arguments (returns id)
+	template <typename T, typename Make = T, typename... Args>
+	static inline std::enable_if_t<std::is_constructible<Make, Args...>::value, u32> make(Args&&... args)
 	{
-		const u32 index = get_index<Get>(id);
-
-		if (index >= id_manager::id_traits<Get>::count)
+		if (auto pair = create_id<T, Make>([&] { return std::make_shared<Make>(std::forward<Args>(args)...); }))
 		{
-			return {};
+			return pair->first;
 		}
 
+		return id_manager::id_traits<Make>::invalid;
+	}
+
+	// Add a new ID for an existing object provided (returns new id)
+	template <typename T, typename Made = T>
+	static inline u32 import_existing(const std::shared_ptr<T>& ptr)
+	{
+		if (auto pair = create_id<T, Made>([&] { return ptr; }))
+		{
+			return pair->first;
+		}
+
+		return id_manager::id_traits<Made>::invalid;
+	}
+
+	// Add a new ID for an object returned by provider()
+	template <typename T, typename Made = T, typename F, typename = std::invoke_result_t<F>>
+	static inline u32 import(F&& provider)
+	{
+		if (auto pair = create_id<T, Made>(std::forward<F>(provider)))
+		{
+			return pair->first;
+		}
+
+		return id_manager::id_traits<Made>::invalid;
+	}
+
+	// Access the ID record without locking (unsafe)
+	template <typename T, typename Get = T>
+	static inline map_data* find_unlocked(u32 id)
+	{
+		return find_id<T, Get>(id);
+	}
+
+	// Check the ID without locking (can be called from other method)
+	template <typename T, typename Get = T>
+	static inline Get* check_unlocked(u32 id)
+	{
+		if (const auto found = find_id<T, Get>(id))
+		{
+			return static_cast<Get*>(found->second.get());
+		}
+
+		return nullptr;
+	}
+
+	// Check the ID
+	template <typename T, typename Get = T>
+	static inline Get* check(u32 id)
+	{
 		reader_lock lock(id_manager::g_mutex);
 
-		if (const auto found = find_index<T, Get>(index, id); found.first)
-		{
-			const auto ptr = static_cast<Get*>(found.first->observe());
+		return check_unlocked<T, Get>(id);
+	}
 
+	// Check the ID, access object under shared lock
+	template <typename T, typename Get = T, typename F, typename FRT = std::invoke_result_t<F, Get&>>
+	static inline auto check(u32 id, F&& func)
+	{
+		reader_lock lock(id_manager::g_mutex);
+
+		if (const auto ptr = check_unlocked<T, Get>(id))
+		{
 			if constexpr (!std::is_void_v<FRT>)
 			{
 				return return_pair<Get*, FRT>{ptr, func(*ptr)};
@@ -678,102 +467,90 @@ public:
 			}
 		}
 
-		return {};
+		if constexpr (!std::is_void_v<FRT>)
+		{
+			return return_pair<Get*, FRT>{nullptr};
+		}
+		else
+		{
+			return static_cast<Get*>(nullptr);
+		}
 	}
 
 	// Get the object without locking (can be called from other method)
 	template <typename T, typename Get = T>
-		requires IdmTypesCompatible<T, Get>
-	static inline stx::shared_ptr<Get> get_unlocked(u32 id)
+	static inline std::shared_ptr<Get> get_unlocked(u32 id)
 	{
 		const auto found = find_id<T, Get>(id);
 
-		if (!found.first) [[unlikely]]
+		if (found == nullptr) [[unlikely]]
 		{
-			return null_ptr;
+			return nullptr;
 		}
 
-		return static_cast<stx::shared_ptr<Get>>(found.first->load());
+		return std::static_pointer_cast<Get>(found->second);
+	}
+
+	// Get the object
+	template <typename T, typename Get = T>
+	static inline std::shared_ptr<Get> get(u32 id)
+	{
+		reader_lock lock(id_manager::g_mutex);
+
+		const auto found = find_id<T, Get>(id);
+
+		if (found == nullptr) [[unlikely]]
+		{
+			return nullptr;
+		}
+
+		return std::static_pointer_cast<Get>(found->second);
 	}
 
 	// Get the object, access object under reader lock
 	template <typename T, typename Get = T, typename F, typename FRT = std::invoke_result_t<F, Get&>>
-		requires IdmTypesCompatible<T, Get>
-	static inline std::conditional_t<std::is_void_v<FRT>, stx::shared_ptr<Get>, return_pair<stx::shared_ptr<Get>, FRT>> get(u32 id, F&& func)
+	static inline std::conditional_t<std::is_void_v<FRT>, std::shared_ptr<Get>, return_pair<Get, FRT>> get(u32 id, F&& func)
 	{
-		const u32 index = get_index<Get>(id);
-
-		if (index >= id_manager::id_traits<Get>::count)
-		{
-			return {};
-		}
-
 		reader_lock lock(id_manager::g_mutex);
 
-		const auto found = find_index<T, Get>(index, id);
+		const auto found = find_id<T, Get>(id);
 
-		if (!found.first) [[unlikely]]
+		if (found == nullptr) [[unlikely]]
 		{
-			return {};
+			return {nullptr};
 		}
 
-		auto ptr = static_cast<stx::shared_ptr<Get>>(found.first->load());
-		Get* obj_ptr = ptr.get();
+		const auto ptr = static_cast<Get*>(found->second.get());
 
 		if constexpr (std::is_void_v<FRT>)
 		{
-			func(*obj_ptr);
-			return ptr;
+			func(*ptr);
+			return {found->second, ptr};
 		}
 		else
 		{
-			return {std::move(ptr), func(*obj_ptr)};
+			return {{found->second, ptr}, func(*ptr)};
 		}
 	}
 
-	static constexpr std::false_type unlocked{};
-
 	// Access all objects of specified type. Returns the number of objects processed.
-	// If function result evaluates to true, stop and return the object and the value.
-	template <typename T, typename... Get, typename F, typename Lock = std::true_type>
-		requires IdmBaseCompatible<T> && (IdmCompatible<Get> && ...) && (std::is_invocable_v<F, u32, Get&> && ...)
-	static inline auto select(F&& func, Lock = std::true_type{})
+	template <typename T, typename Get = T, typename F, typename FT = decltype(&std::decay_t<F>::operator()), typename FRT = typename function_traits<FT>::void_type>
+	static inline u32 select(F&& func, int = 0)
 	{
-		static_assert((IdmTypesCompatible<T, Get> && ...), "Invalid ID type combination");
+		static_assert(id_manager::id_verify<T, Get>::value, "Invalid ID type combination");
 
-		[[maybe_unused]] std::conditional_t<!!Lock(), reader_lock, const shared_mutex&> lock(id_manager::g_mutex);
+		reader_lock lock(id_manager::g_mutex);
 
-		using func_traits = function_traits<decltype(&decltype(std::function(std::declval<F>()))::operator())>;
-		using object_type = typename func_traits::object_type;
-		using result_type = typename func_traits::result_type;
+		u32 result = 0;
 
-		static_assert(PtrSame<object_type, T>, "Invalid function argument type combination");
-
-		std::conditional_t<std::is_void_v<result_type>, u32, return_pair<stx::shared_ptr<object_type>, result_type>> result{};
-
-		auto& map = g_fxo->get<id_manager::id_map<T>>();
-
-		for (auto& id : map.vec_data)
+		for (auto& id : g_fxo->get<id_manager::id_map<T>>().vec)
 		{
-			if (auto ptr = static_cast<object_type*>(id.observe()))
+			if (id.second)
 			{
-				auto& key = map.vec_keys[&id - map.vec_data.data()];
-
-				if (sizeof...(Get) == 0 || ((key.type() == get_type<Get>()) || ...))
+				if (std::is_same<T, Get>::value || id.first.type() == get_type<Get>())
 				{
-					if constexpr (std::is_void_v<result_type>)
-					{
-						func(key, *ptr);
-						result++;
-					}
-					else
-					{
-						if ((result.ret = func(key, *ptr)))
-						{
-							result.ptr = static_cast<stx::shared_ptr<object_type>>(id.load());
-							break;
-						}
-					}
+					func(id.first, *static_cast<typename function_traits<FT>::object_type*>(id.second.get()));
+					result++;
 				}
 			}
 		}
@@ -781,19 +558,45 @@ public:
 		return result;
 	}
 
+	// Access all objects of specified type. If function result evaluates to true, stop and return the object and the value.
+	template <typename T, typename Get = T, typename F, typename FT = decltype(&std::decay_t<F>::operator()), typename FRT = typename function_traits<FT>::result_type>
+	static inline auto select(F&& func)
+	{
+		static_assert(id_manager::id_verify<T, Get>::value, "Invalid ID type combination");
+
+		using object_type = typename function_traits<FT>::object_type;
+		using result_type = return_pair<object_type, FRT>;
+
+		reader_lock lock(id_manager::g_mutex);
+
+		for (auto& id : g_fxo->get<id_manager::id_map<T>>().vec)
+		{
+			if (auto ptr = static_cast<object_type*>(id.second.get()))
+			{
+				if (std::is_same<T, Get>::value || id.first.type() == get_type<Get>())
+				{
+					if (FRT result = func(id.first, *ptr))
+					{
+						return result_type{{id.second, ptr}, std::move(result)};
+					}
+				}
+			}
+		}
+
+		return result_type{nullptr};
+	}
+
 	// Remove the ID
 	template <typename T, typename Get = T>
-		requires IdmTypesCompatible<T, Get>
 	static inline bool remove(u32 id)
 	{
-		stx::shared_ptr<T> ptr;
+		std::shared_ptr<void> ptr;
 		{
 			std::lock_guard lock(id_manager::g_mutex);
 
-			if (const auto found = find_id<T, Get>(id); found.first)
+			if (const auto found = find_id<T, Get>(id))
 			{
-				ptr = found.first->exchange(null_ptr);
-				found.second->clear();
+				ptr = std::move(found->second);
 			}
 			else
 			{
@@ -801,31 +604,21 @@ public:
 			}
 		}
 
-		if constexpr (std::is_assignable_v<Get&, thread_state>)
-		{
-			if (ptr)
-			{
-				constexpr thread_state destroying_context{7};
-				*static_cast<Get*>(ptr.get()) = destroying_context;
-			}
-		}
-
 		return true;
 	}
 
 	// Remove the ID if matches the weak/shared ptr
-	template <typename T, typename Get = T, typename Ptr, typename Lock = std::true_type>
-		requires IdmTypesCompatible<T, Get> && std::is_convertible_v<Lock, bool>
-	static inline bool remove_verify(u32 id, Ptr&& sptr, Lock = std::true_type{})
+	template <typename T, typename Get = T, typename Ptr>
+	static inline bool remove_verify(u32 id, Ptr sptr)
 	{
-		stx::shared_ptr<T> ptr;
+		std::shared_ptr<void> ptr;
 		{
-			[[maybe_unused]] std::conditional_t<!!Lock(), std::lock_guard<shared_mutex>, const shared_mutex&> lock(id_manager::g_mutex);
+			std::lock_guard lock(id_manager::g_mutex);
 
-			if (const auto found = find_id<T, Get>(id); found.first && found.first->is_equal(sptr))
+			if (const auto found = find_id<T, Get>(id); found &&
+				(!found->second.owner_before(sptr) && !sptr.owner_before(found->second)))
 			{
-				ptr = found.first->exchange(null_ptr);
-				found.second->clear();
+				ptr = std::move(found->second);
 			}
 			else
 			{
@@ -833,31 +626,20 @@ public:
 			}
 		}
 
-		if constexpr (std::is_assignable_v<Get&, thread_state>)
-		{
-			if (ptr)
-			{
-				constexpr thread_state destroying_context{7};
-				*static_cast<Get*>(ptr.get()) = destroying_context;
-			}
-		}
-
 		return true;
 	}
 
 	// Remove the ID and return the object
-	template <typename T, typename Get = T, typename Lock = std::true_type>
-		requires IdmTypesCompatible<T, Get>
-	static inline stx::shared_ptr<Get> withdraw(u32 id, int = 0, Lock = std::true_type{})
+	template <typename T, typename Get = T>
+	static inline std::shared_ptr<Get> withdraw(u32 id)
 	{
-		stx::shared_ptr<Get> ptr;
+		std::shared_ptr<Get> ptr;
 		{
-			[[maybe_unused]] std::conditional_t<!!Lock(), std::lock_guard<shared_mutex>, const shared_mutex&> lock(id_manager::g_mutex);
+			std::lock_guard lock(id_manager::g_mutex);
 
-			if (const auto found = find_id<T, Get>(id); found.first)
+			if (const auto found = find_id<T, Get>(id))
 			{
-				ptr = static_cast<stx::shared_ptr<Get>>(found.first->exchange(null_ptr));
-				found.second->clear();
+				ptr = std::static_pointer_cast<Get>(::as_rvalue(std::move(found->second)));
 			}
 		}
 
@@ -866,27 +648,18 @@ public:
 
 	// Remove the ID after accessing the object under writer lock, return the object and propagate return value
 	template <typename T, typename Get = T, typename F, typename FRT = std::invoke_result_t<F, Get&>>
-		requires IdmTypesCompatible<T, Get> && std::is_invocable_v<F, Get&>
-	static inline std::conditional_t<std::is_void_v<FRT>, stx::shared_ptr<Get>, return_pair<stx::shared_ptr<Get>, FRT>> withdraw(u32 id, F&& func)
+	static inline std::conditional_t<std::is_void_v<FRT>, std::shared_ptr<Get>, return_pair<Get, FRT>> withdraw(u32 id, F&& func)
 	{
-		const u32 index = get_index<Get>(id);
-
-		if (index >= id_manager::id_traits<Get>::count)
-		{
-			return {};
-		}
-
 		std::unique_lock lock(id_manager::g_mutex);
 
-		if (const auto found = find_index<T, Get>(index, id); found.first)
+		if (const auto found = find_id<T, Get>(id))
 		{
-			const auto _ptr = static_cast<Get*>(found.first->observe());
+			const auto _ptr = static_cast<Get*>(found->second.get());
 
 			if constexpr (std::is_void_v<FRT>)
 			{
 				func(*_ptr);
-				found.second->clear();
-				return static_cast<stx::shared_ptr<Get>>(found.first->exchange(null_ptr));
+				return std::static_pointer_cast<Get>(::as_rvalue(std::move(found->second)));
 			}
 			else
 			{
@@ -895,14 +668,13 @@ public:
 				if (ret)
 				{
 					// If return value evaluates to true, don't delete the object (error code)
-					return {static_cast<stx::shared_ptr<Get>>(found.first->load()), std::move(ret)};
+					return {{found->second, _ptr}, std::move(ret)};
 				}
 
-				found.second->clear();
-				return {static_cast<stx::shared_ptr<Get>>(found.first->exchange(null_ptr)), std::move(ret)};
+				return {std::static_pointer_cast<Get>(::as_rvalue(std::move(found->second))), std::move(ret)};
 			}
 		}
 
-		return {};
+		return {nullptr};
 	}
 };
diff --git a/rpcs3/Emu/Io/Buzz.cpp b/rpcs3/Emu/Io/Buzz.cpp
index 840220b967..40bbcbd950 100644
--- a/rpcs3/Emu/Io/Buzz.cpp
+++ b/rpcs3/Emu/Io/Buzz.cpp
@@ -3,146 +3,47 @@
 #include "stdafx.h"
 #include "Buzz.h"
 #include "Emu/Cell/lv2/sys_usbd.h"
-#include "Emu/Io/buzz_config.h"
-#include "Emu/system_config.h"
 #include "Input/pad_thread.h"
 
-LOG_CHANNEL(buzz_log, "BUZZ");
+LOG_CHANNEL(buzz_log);
 
-template <>
-void fmt_class_string<buzz_btn>::format(std::string& out, u64 arg)
+usb_device_buzz::usb_device_buzz(int first_controller, int last_controller)
 {
-	format_enum(out, arg, [](buzz_btn value)
-	{
-		switch (value)
-		{
-		case buzz_btn::red: return "Red";
-		case buzz_btn::yellow: return "Yellow";
-		case buzz_btn::green: return "Green";
-		case buzz_btn::orange: return "Orange";
-		case buzz_btn::blue: return "Blue";
-		case buzz_btn::count: return "Count";
-		}
+	this->first_controller = first_controller;
+	this->last_controller  = last_controller;
 
-		return unknown;
-	});
-}
-
-usb_device_buzz::usb_device_buzz(u32 first_controller, u32 last_controller, const std::array<u8, 7>& location)
-	: usb_device_emulated(location)
-	, m_first_controller(first_controller)
-	, m_last_controller(last_controller)
-{
-	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE,
-		UsbDeviceDescriptor{
-			.bcdUSB             = 0x0200,
-			.bDeviceClass       = 0x00,
-			.bDeviceSubClass    = 0x00,
-			.bDeviceProtocol    = 0x00,
-			.bMaxPacketSize0    = 0x08,
-			.idVendor           = 0x054c,
-			.idProduct          = 0x0002,
-			.bcdDevice          = 0x05a1,
-			.iManufacturer      = 0x02,
-			.iProduct           = 0x01,
-			.iSerialNumber      = 0x00,
-			.bNumConfigurations = 0x01});
-	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG,
-		UsbDeviceConfiguration{
-			.wTotalLength        = 0x0022,
-			.bNumInterfaces      = 0x01,
-			.bConfigurationValue = 0x01,
-			.iConfiguration      = 0x00,
-			.bmAttributes        = 0x80,
-			.bMaxPower           = 0x32}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE,
-		UsbDeviceInterface{
-			.bInterfaceNumber   = 0x00,
-			.bAlternateSetting  = 0x00,
-			.bNumEndpoints      = 0x01,
-			.bInterfaceClass    = 0x03,
-			.bInterfaceSubClass = 0x00,
-			.bInterfaceProtocol = 0x00,
-			.iInterface         = 0x00}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_HID,
-		UsbDeviceHID{
-			.bcdHID            = 0x0111,
-			.bCountryCode      = 0x33,
-			.bNumDescriptors   = 0x01,
-			.bDescriptorType   = 0x22,
-			.wDescriptorLength = 0x004e}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint{
-			.bEndpointAddress = 0x81,
-			.bmAttributes     = 0x03,
-			.wMaxPacketSize   = 0x0008,
-			.bInterval        = 0x0A}));
-
-	add_string("Logitech Buzz(tm) Controller V1");
-	add_string("Logitech");
+	device        = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x0200, 0x00, 0x00, 0x00, 0x08, 0x054c, 0x0002, 0x05a1, 0x03, 0x01, 0x00, 0x01});
+	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG, UsbDeviceConfiguration{0x0022, 0x01, 0x01, 0x00, 0x80, 0x32}));
+	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE, UsbDeviceInterface{0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00}));
+	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_HID, UsbDeviceHID{0x0111, 0x33, 0x01, 0x22, 0x004e}));
+	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x81, 0x03, 0x0008, 0x0A}));
 }
 
 usb_device_buzz::~usb_device_buzz()
 {
 }
 
-std::shared_ptr<usb_device> usb_device_buzz::make_instance(u32 controller_index, const std::array<u8, 7>& location)
-{
-	if (controller_index == 0)
-	{
-		return std::make_shared<usb_device_buzz>(0, 3, location);
-	}
-
-	// The current buzz emulation piggybacks on the pad input.
-	// Since there can only be 7 pads connected on a PS3 the 8th player is currently not supported
-	return std::make_shared<usb_device_buzz>(4, 6, location);
-}
-
-u16 usb_device_buzz::get_num_emu_devices()
-{
-	return static_cast<u16>(g_cfg.io.buzz.get());
-}
-
 void usb_device_buzz::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
 {
-	transfer->fake            = true;
-	transfer->expected_count  = buf_size;
-	transfer->expected_result = HC_CC_NOERR;
-	// Control transfers are nearly instant
-	transfer->expected_time   = get_timestamp() + 100;
+	transfer->fake = true;
 
+	// Control transfers are nearly instant
 	switch (bmRequestType)
 	{
-	case 0U /*silences warning*/ | LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE: // 0x21
-		switch (bRequest)
-		{
-		case 0x09: // SET_REPORT
-			ensure(buf_size > 4);
-			buzz_log.trace("Leds: %s/%s/%s/%s",
-				buf[1] == 0xff ? "ON" : "OFF",
-				buf[2] == 0xff ? "ON" : "OFF",
-				buf[3] == 0xff ? "ON" : "OFF",
-				buf[4] == 0xff ? "ON" : "OFF"
-			);
+		case 0x01:
+		case 0x21:
+		case 0x80:
+			buzz_log.error("Unhandled Query Len: 0x%02X", buf_size);
+			buzz_log.error("Unhandled Query Type: 0x%02X", (buf_size > 0) ? buf[0] : -1);
 			break;
 		default:
-			buzz_log.error("Unhandled Request: 0x%02X/0x%02X", bmRequestType, bRequest);
+			usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
 			break;
-		}
-		break;
-	default:
-		usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
-		break;
 	}
 }
 
-extern bool is_input_allowed();
-
 void usb_device_buzz::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/, UsbTransfer* transfer)
 {
-	const u8 max_index = 2 + (4 + 5 * m_last_controller) / 8;
-	ensure(buf_size > max_index);
-
 	transfer->fake            = true;
 	transfer->expected_count  = 5;
 	transfer->expected_result = HC_CC_NOERR;
@@ -158,52 +59,47 @@ void usb_device_buzz::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/
 	buf[3] = 0x00;
 	buf[4] = 0xf0;
 
-	if (!is_input_allowed())
-	{
-		return;
-	}
-
 	std::lock_guard lock(pad::g_pad_mutex);
-	const auto handler = pad::get_pad_thread();
+	const auto handler = pad::get_current_handler();
 	const auto& pads   = handler->GetPads();
-	ensure(pads.size() > m_last_controller);
-	ensure(g_cfg_buzz.players.size() > m_last_controller);
 
-	for (u32 i = m_first_controller, index = 0; i <= m_last_controller; i++, index++)
+	for (int index = 0; index <= (last_controller - first_controller); index++)
 	{
-		const auto& pad = pads[i];
+		const auto& pad = pads[first_controller + index];
 
-		if (!pad->is_connected() || pad->is_copilot())
-		{
+		if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
 			continue;
-		}
 
-		const auto& cfg = g_cfg_buzz.players[i];
-		cfg->handle_input(pad, true, [&buf, &index](buzz_btn btn, pad_button /*pad_btn*/, u16 /*value*/, bool pressed, bool& /*abort*/)
+		for (Button& button : pad->m_buttons)
+		{
+			if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2)
 			{
-				if (!pressed)
-					return;
-
-				switch (btn)
+				switch (button.m_outKeyCode)
 				{
-				case buzz_btn::red:
-					buf[2 + (0 + 5 * index) / 8] |= 1 << ((0 + 5 * index) % 8); // Red
-					break;
-				case buzz_btn::yellow:
-					buf[2 + (1 + 5 * index) / 8] |= 1 << ((1 + 5 * index) % 8); // Yellow
-					break;
-				case buzz_btn::green:
-					buf[2 + (2 + 5 * index) / 8] |= 1 << ((2 + 5 * index) % 8); // Green
-					break;
-				case buzz_btn::orange:
-					buf[2 + (3 + 5 * index) / 8] |= 1 << ((3 + 5 * index) % 8); // Orange
-					break;
-				case buzz_btn::blue:
-					buf[2 + (4 + 5 * index) / 8] |= 1 << ((4 + 5 * index) % 8); // Blue
-					break;
-				case buzz_btn::count:
-					break;
+					case CELL_PAD_CTRL_R1:
+						if (button.m_pressed)
+							buf[2 + (0 + 5 * index) / 8] |= 1 << ((0 + 5 * index) % 8); // Red
+						break;
+					case CELL_PAD_CTRL_TRIANGLE:
+						if (button.m_pressed)
+							buf[2 + (4 + 5 * index) / 8] |= 1 << ((4 + 5 * index) % 8); // Blue
+						break;
+					case CELL_PAD_CTRL_SQUARE:
+						if (button.m_pressed)
+							buf[2 + (3 + 5 * index) / 8] |= 1 << ((3 + 5 * index) % 8); // Orange
+						break;
+					case CELL_PAD_CTRL_CIRCLE:
+						if (button.m_pressed)
+							buf[2 + (2 + 5 * index) / 8] |= 1 << ((2 + 5 * index) % 8); // Green
+						break;
+					case CELL_PAD_CTRL_CROSS:
+						if (button.m_pressed)
+							buf[2 + (1 + 5 * index) / 8] |= 1 << ((1 + 5 * index) % 8); // Yellow
+						break;
+					default:
+						break;
 				}
-			});
+			}
+		}
 	}
 }
diff --git a/rpcs3/Emu/Io/Buzz.h b/rpcs3/Emu/Io/Buzz.h
index e8aafc0e35..ef9df8d4c0 100644
--- a/rpcs3/Emu/Io/Buzz.h
+++ b/rpcs3/Emu/Io/Buzz.h
@@ -4,17 +4,13 @@
 
 class usb_device_buzz : public usb_device_emulated
 {
-public:
-	usb_device_buzz(u32 first_controller, u32 last_controller, const std::array<u8, 7>& location);
-	~usb_device_buzz();
+	int first_controller;
+	int last_controller;
 
-	static std::shared_ptr<usb_device> make_instance(u32 controller_index, const std::array<u8, 7>& location);
-	static u16 get_num_emu_devices();
+public:
+	usb_device_buzz(int first_controller, int last_controller);
+	~usb_device_buzz();
 
 	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
 	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-
-private:
-	u32 m_first_controller;
-	u32 m_last_controller;
 };
diff --git a/rpcs3/Emu/Io/Dimensions.cpp b/rpcs3/Emu/Io/Dimensions.cpp
deleted file mode 100644
index 158f310bdb..0000000000
--- a/rpcs3/Emu/Io/Dimensions.cpp
+++ /dev/null
@@ -1,711 +0,0 @@
-#include "stdafx.h"
-#include "Dimensions.h"
-
-#include <bit>
-
-#include "Emu/Cell/lv2/sys_usbd.h"
-
-LOG_CHANNEL(dimensions_log, "dimensions");
-
-dimensions_toypad g_dimensionstoypad;
-
-static constexpr std::array<u8, 16> COMMAND_KEY = {0x55, 0xFE, 0xF6, 0xB0, 0x62, 0xBF, 0x0B, 0x41,
-	0xC9, 0xB3, 0x7C, 0xB4, 0x97, 0x3E, 0x29, 0x7B};
-
-static constexpr std::array<u8, 17> CHAR_CONSTANT = {0xB7, 0xD5, 0xD7, 0xE6, 0xE7, 0xBA, 0x3C,
-	0xA8, 0xD8, 0x75, 0x47, 0x68, 0xCF, 0x23, 0xE9, 0xFE, 0xAA};
-
-static constexpr std::array<u8, 25> PWD_CONSTANT = {0x28, 0x63, 0x29, 0x20, 0x43, 0x6F, 0x70, 0x79,
-	0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x4C, 0x45, 0x47, 0x4F, 0x20, 0x32, 0x30, 0x31, 0x34, 0xAA, 0xAA};
-
-void dimensions_figure::save()
-{
-	if (!dim_file)
-	{
-		dimensions_log.error("Tried to save infinity figure to file but no infinity figure is active!");
-		return;
-	}
-	dim_file.seek(0, fs::seek_set);
-	dim_file.write(data.data(), 0x2D * 0x04);
-}
-
-u8 dimensions_toypad::generate_checksum(const std::array<u8, 32>& data, u32 num_of_bytes)
-{
-	int checksum = 0;
-	ensure(num_of_bytes <= data.size());
-	for (u8 i = 0; i < num_of_bytes; i++)
-	{
-		checksum += data[i];
-	}
-	return (checksum & 0xFF);
-}
-
-void dimensions_toypad::get_blank_response(u8 type, u8 sequence, std::array<u8, 32>& reply_buf)
-{
-	reply_buf[0] = 0x55;
-	reply_buf[1] = type;
-	reply_buf[2] = sequence;
-	reply_buf[3] = generate_checksum(reply_buf, 3);
-}
-
-void dimensions_toypad::generate_random_number(const u8* buf, u8 sequence, std::array<u8, 32>& reply_buf)
-{
-	// Decrypt payload into an 8 byte array
-	const std::array<u8, 8> value = decrypt(buf, std::nullopt);
-	// Seed is the first 4 bytes (little endian) of the decrypted payload
-	const u32 seed = read_from_ptr<le_t<u32>>(value);
-	// Confirmation is the second 4 bytes (big endian) of the decrypted payload
-	const u32 conf = read_from_ptr<be_t<u32>>(value, 4);
-	// Initialize rng using the seed from decrypted payload
-	initialize_rng(seed);
-	std::array<u8, 8> value_to_encrypt = {};
-	// Encrypt 8 bytes, first 4 bytes is the decrypted confirmation from payload, 2nd 4 bytes are blank
-	write_to_ptr<be_t<u32>>(value_to_encrypt, conf);
-	const std::array<u8, 8> encrypted = encrypt(value_to_encrypt.data(), std::nullopt);
-	reply_buf[0] = 0x55;
-	reply_buf[1] = 0x09;
-	reply_buf[2] = sequence;
-	// Copy encrypted value to response data
-	std::memcpy(&reply_buf[3], encrypted.data(), encrypted.size());
-	reply_buf[11] = generate_checksum(reply_buf, 11);
-}
-
-void dimensions_toypad::initialize_rng(u32 seed)
-{
-	m_random_a = 0xF1EA5EED;
-	m_random_b = seed;
-	m_random_c = seed;
-	m_random_d = seed;
-
-	for (int i = 0; i < 42; i++)
-	{
-		get_next();
-	}
-}
-
-u32 dimensions_toypad::get_next()
-{
-	const u32 e = m_random_a - std::rotl(m_random_b, 21);
-	m_random_a = m_random_b ^ std::rotl(m_random_c, 19);
-	m_random_b = m_random_c + std::rotl(m_random_d, 6);
-	m_random_c = m_random_d + e;
-	m_random_d = e + m_random_a;
-	return m_random_d;
-}
-
-std::array<u8, 8> dimensions_toypad::decrypt(const u8* buf, std::optional<std::array<u8, 16>> key)
-{
-	// Value to decrypt is separated in to two little endian 32 bit unsigned integers
-	u32 data_one = read_from_ptr<le_t<u32>>(buf);
-	u32 data_two = read_from_ptr<le_t<u32>>(buf, 4);
-
-	// Use the key as 4 32 bit little endian unsigned integers
-	u32 key_one;
-	u32 key_two;
-	u32 key_three;
-	u32 key_four;
-
-	if (key)
-	{
-		key_one = read_from_ptr<le_t<u32>>(key.value());
-		key_two = read_from_ptr<le_t<u32>>(key.value(), 4);
-		key_three = read_from_ptr<le_t<u32>>(key.value(), 8);
-		key_four = read_from_ptr<le_t<u32>>(key.value(), 12);
-	}
-	else
-	{
-		key_one = read_from_ptr<le_t<u32>>(COMMAND_KEY);
-		key_two = read_from_ptr<le_t<u32>>(COMMAND_KEY, 4);
-		key_three = read_from_ptr<le_t<u32>>(COMMAND_KEY, 8);
-		key_four = read_from_ptr<le_t<u32>>(COMMAND_KEY, 12);
-	}
-
-	u32 sum = 0xC6EF3720;
-	constexpr u32 delta = 0x9E3779B9;
-
-	for (int i = 0; i < 32; i++)
-	{
-		data_two -= (((data_one << 4) + key_three) ^ (data_one + sum) ^ ((data_one >> 5) + key_four));
-		data_one -= (((data_two << 4) + key_one) ^ (data_two + sum) ^ ((data_two >> 5) + key_two));
-		sum -= delta;
-	}
-
-	ensure(sum == 0, "Decryption failed, sum inequal to 0");
-
-	std::array<u8, 8> decrypted = {u8(data_one & 0xFF), u8((data_one >> 8) & 0xFF),
-		u8((data_one >> 16) & 0xFF), u8((data_one >> 24) & 0xFF),
-		u8(data_two & 0xFF), u8((data_two >> 8) & 0xFF),
-		u8((data_two >> 16) & 0xFF), u8((data_two >> 24) & 0xFF)};
-	return decrypted;
-}
-
-std::array<u8, 8> dimensions_toypad::encrypt(const u8* buf, std::optional<std::array<u8, 16>> key)
-{
-	// Value to encrypt is separated in to two little endian 32 bit unsigned integers
-
-	u32 data_one = read_from_ptr<le_t<u32>>(buf);
-	u32 data_two = read_from_ptr<le_t<u32>>(buf, 4);
-
-	// Use the key as 4 32 bit little endian unsigned integers
-	u32 key_one;
-	u32 key_two;
-	u32 key_three;
-	u32 key_four;
-
-	if (key)
-	{
-		key_one = read_from_ptr<le_t<u32>>(key.value());
-		key_two = read_from_ptr<le_t<u32>>(key.value(), 4);
-		key_three = read_from_ptr<le_t<u32>>(key.value(), 8);
-		key_four = read_from_ptr<le_t<u32>>(key.value(), 12);
-	}
-	else
-	{
-		key_one = read_from_ptr<le_t<u32>>(COMMAND_KEY);
-		key_two = read_from_ptr<le_t<u32>>(COMMAND_KEY, 4);
-		key_three = read_from_ptr<le_t<u32>>(COMMAND_KEY, 8);
-		key_four = read_from_ptr<le_t<u32>>(COMMAND_KEY, 12);
-	}
-
-	u32 sum = 0;
-	constexpr u32 delta = 0x9E3779B9;
-
-	for (int i = 0; i < 32; i++)
-	{
-		sum += delta;
-		data_one += (((data_two << 4) + key_one) ^ (data_two + sum) ^ ((data_two >> 5) + key_two));
-		data_two += (((data_one << 4) + key_three) ^ (data_one + sum) ^ ((data_one >> 5) + key_four));
-	}
-
-	ensure(sum == 0xC6EF3720, "Encryption failed, sum inequal to 0xC6EF3720");
-
-	std::array<u8, 8> encrypted = {u8(data_one & 0xFF), u8((data_one >> 8) & 0xFF),
-		u8((data_one >> 16) & 0xFF), u8((data_one >> 24) & 0xFF),
-		u8(data_two & 0xFF), u8((data_two >> 8) & 0xFF),
-		u8((data_two >> 16) & 0xFF), u8((data_two >> 24) & 0xFF)};
-	return encrypted;
-}
-
-std::array<u8, 16> dimensions_toypad::generate_figure_key(const std::array<u8, 0x2D * 0x04>& buf)
-{
-	std::array<u8, 7> uid = {buf[0], buf[1], buf[2], buf[4], buf[5], buf[6], buf[7]};
-
-	std::array<u8, 16> figure_key = {};
-
-	write_to_ptr<be_t<u32>>(figure_key, scramble(uid, 3));
-	write_to_ptr<be_t<u32>>(figure_key, 4, scramble(uid, 4));
-	write_to_ptr<be_t<u32>>(figure_key, 8, scramble(uid, 5));
-	write_to_ptr<be_t<u32>>(figure_key, 12, scramble(uid, 6));
-
-	return figure_key;
-}
-
-u32 dimensions_toypad::scramble(const std::array<u8, 7>& uid, u8 count)
-{
-	std::vector<u8> to_scramble;
-	to_scramble.reserve(uid.size() + CHAR_CONSTANT.size());
-	for (u8 x : uid)
-	{
-		to_scramble.push_back(x);
-	}
-	for (u8 c : CHAR_CONSTANT)
-	{
-		to_scramble.push_back(c);
-	}
-	::at32(to_scramble, count * 4 - 1) = 0xaa;
-
-	return read_from_ptr<be_t<u32>>(dimensions_randomize(to_scramble, count).data());
-}
-
-std::array<u8, 4> dimensions_toypad::dimensions_randomize(const std::vector<u8>& key, u8 count)
-{
-	u32 scrambled = 0;
-	for (u8 i = 0; i < count; i++)
-	{
-		const u32 v4 = std::rotr(scrambled, 25);
-		const u32 v5 = std::rotr(scrambled, 10);
-		const u32 b = read_from_ptr<le_t<u32>>(key, i * 4);
-		scrambled = b + v4 + v5 - scrambled;
-	}
-	return {u8(scrambled & 0xFF), u8(scrambled >> 8 & 0xFF), u8(scrambled >> 16 & 0xFF), u8(scrambled >> 24 & 0xFF)};
-}
-
-u32 dimensions_toypad::get_figure_id(const std::array<u8, 0x2D * 0x04>& buf)
-{
-	const std::array<u8, 16> figure_key = generate_figure_key(buf);
-
-	const std::array<u8, 8> decrypted = decrypt(&buf[36 * 4], figure_key);
-
-	const u32 fig_num = read_from_ptr<le_t<u32>>(decrypted);
-	// Characters have their model number encrypted in page 36
-	if (fig_num < 1000)
-	{
-		return fig_num;
-	}
-	// Vehicles/Gadgets have their model number written as little endian in page 36
-	return read_from_ptr<le_t<u32>>(buf, 36 * 4);
-}
-
-dimensions_figure& dimensions_toypad::get_figure_by_index(u8 index)
-{
-	return ::at32(m_figures, index);
-}
-
-void dimensions_toypad::random_uid(u8* uid_buffer)
-{
-	uid_buffer[0] = 0x04;
-	uid_buffer[7] = 0x80;
-
-	for (u8 i = 1; i < 7; i++)
-	{
-		u8 random = rand() % 255;
-		uid_buffer[i] = random;
-	}
-}
-
-void dimensions_toypad::get_challenge_response(const u8* buf, u8 sequence, std::array<u8, 32>& reply_buf)
-{
-	// Decrypt payload into an 8 byte array
-	const std::array<u8, 8> value = decrypt(buf, std::nullopt);
-	// Confirmation is the first 4 bytes of the decrypted payload
-	const u32 conf = read_from_ptr<be_t<u32>>(value);
-	// Generate next random number based on RNG
-	const u32 next_random = get_next();
-	std::array<u8, 8> value_to_encrypt = {};
-	// Encrypt an 8 byte array, first 4 bytes are the next random number (little endian)
-	// followed by the confirmation from the decrypted payload
-	write_to_ptr<le_t<u32>>(value_to_encrypt, next_random);
-	write_to_ptr<be_t<u32>>(value_to_encrypt, 4, conf);
-	const std::array<u8, 8> encrypted = encrypt(value_to_encrypt.data(), std::nullopt);
-	reply_buf[0] = 0x55;
-	reply_buf[1] = 0x09;
-	reply_buf[2] = sequence;
-	// Copy encrypted value to response data
-	std::memcpy(&reply_buf[3], encrypted.data(), encrypted.size());
-	reply_buf[11] = generate_checksum(reply_buf, 11);
-}
-
-void dimensions_toypad::query_block(u8 index, u8 page, std::array<u8, 32>& reply_buf, u8 sequence)
-{
-	std::lock_guard lock(m_dimensions_mutex);
-
-	reply_buf[0] = 0x55;
-	reply_buf[1] = 0x12;
-	reply_buf[2] = sequence;
-	reply_buf[3] = 0x00;
-
-	// Index from game begins at 1 rather than 0, so minus 1 here
-	if (const u8 figure_index = index - 1; figure_index < dimensions_figure_count)
-	{
-		const dimensions_figure& figure = get_figure_by_index(figure_index);
-
-		// Query 4 pages of 4 bytes from the figure, copy this to the response
-		if (figure.index != 255 && (4 * page) < ((0x2D * 4) - 16))
-		{
-			std::memcpy(&reply_buf[4], figure.data.data() + (4 * page), 16);
-		}
-	}
-	reply_buf[20] = generate_checksum(reply_buf, 20);
-}
-
-void dimensions_toypad::write_block(u8 index, u8 page, const u8* to_write_buf, std::array<u8, 32>& reply_buf, u8 sequence)
-{
-	std::lock_guard lock(m_dimensions_mutex);
-
-	reply_buf[0] = 0x55;
-	reply_buf[1] = 0x02;
-	reply_buf[2] = sequence;
-	reply_buf[3] = 0x00;
-
-	// Index from game begins at 1 rather than 0, so minus 1 here
-	if (const u8 figure_index = index - 1; figure_index < dimensions_figure_count)
-	{
-		dimensions_figure& figure = get_figure_by_index(figure_index);
-
-		// Copy 4 bytes to the page on the figure requested by the game
-		if (figure.index != 255 && page < 0x2D)
-		{
-			// Id is written to page 36
-			if (page == 36)
-			{
-				figure.id = read_from_ptr<le_t<u32>>(to_write_buf);
-			}
-			std::memcpy(figure.data.data() + (page * 4), to_write_buf, 4);
-			figure.save();
-		}
-	}
-	reply_buf[4] = generate_checksum(reply_buf, 4);
-}
-
-void dimensions_toypad::get_model(const u8* buf, u8 sequence, std::array<u8, 32>& reply_buf)
-{
-	// Decrypt payload to 8 byte array, byte 1 is the index, 4-7 are the confirmation
-	const std::array<u8, 8> value = decrypt(buf, std::nullopt);
-	const u8 index = value[0];
-	const u32 conf = read_from_ptr<be_t<u32>>(value, 4);
-	std::array<u8, 8> value_to_encrypt = {};
-	// Response is the figure's id (little endian) followed by the confirmation from payload
-	// Index from game begins at 1 rather than 0, so minus 1 here
-	if (const u8 figure_index = index - 1; figure_index < dimensions_figure_count)
-	{
-		const dimensions_figure& figure = get_figure_by_index(figure_index);
-		write_to_ptr<le_t<u32>>(value_to_encrypt, figure.id);
-	}
-	write_to_ptr<be_t<u32>>(value_to_encrypt, 4, conf);
-	const std::array<u8, 8> encrypted = encrypt(value_to_encrypt.data(), std::nullopt);
-	reply_buf[0] = 0x55;
-	reply_buf[1] = 0x0a;
-	reply_buf[2] = sequence;
-	reply_buf[3] = 0x00;
-	// Copy encrypted message to response
-	std::memcpy(&reply_buf[4], encrypted.data(), encrypted.size());
-	reply_buf[12] = generate_checksum(reply_buf, 12);
-}
-
-u32 dimensions_toypad::load_figure(const std::array<u8, 0x2D * 0x04>& buf, fs::file in_file, u8 pad, u8 index, bool lock)
-{
-	if (lock)
-	{
-		m_dimensions_mutex.lock();
-	}
-
-	const u32 id = get_figure_id(buf);
-
-	dimensions_figure& figure = get_figure_by_index(index);
-	figure.dim_file = std::move(in_file);
-	figure.id = id;
-	figure.pad = pad;
-	figure.index = index + 1;
-	std::memcpy(figure.data.data(), buf.data(), buf.size());
-	// When a figure is added to the toypad, respond to the game with the pad they were added to, their index,
-	// the direction (0x00 in byte 6 for added) and their UID
-	std::array<u8, 32> figure_change_response = {0x56, 0x0b, figure.pad, 0x00, figure.index, 0x00,
-		buf[0], buf[1], buf[2], buf[4], buf[5], buf[6], buf[7]};
-	figure_change_response[13] = generate_checksum(figure_change_response, 13);
-	m_figure_added_removed_responses.push(std::move(figure_change_response));
-
-	if (lock)
-	{
-		m_dimensions_mutex.unlock();
-	}
-	return id;
-}
-
-bool dimensions_toypad::remove_figure(u8 pad, u8 index, bool full_remove, bool lock)
-{
-	dimensions_figure& figure = get_figure_by_index(index);
-	if (figure.index == 255)
-	{
-		return false;
-	}
-
-	if (lock)
-	{
-		m_dimensions_mutex.lock();
-	}
-
-	// When a figure is removed from the toypad, respond to the game with the pad they were removed from, their index,
-	// the direction (0x01 in byte 6 for removed) and their UID
-	if (full_remove)
-	{
-		std::array<u8, 32> figure_change_response = {0x56, 0x0b, pad, 0x00, figure.index, 0x01,
-			figure.data[0], figure.data[1], figure.data[2],
-			figure.data[4], figure.data[5], figure.data[6], figure.data[7]};
-		figure_change_response[13] = generate_checksum(figure_change_response, 13);
-		m_figure_added_removed_responses.push(std::move(figure_change_response));
-		figure.save();
-		figure.dim_file.close();
-	}
-
-	figure.index = 255;
-	figure.pad = 255;
-	figure.id = 0;
-
-	if (lock)
-	{
-		m_dimensions_mutex.unlock();
-	}
-	return true;
-}
-
-bool dimensions_toypad::temp_remove(u8 index)
-{
-	std::lock_guard lock(m_dimensions_mutex);
-
-	const dimensions_figure& figure = get_figure_by_index(index);
-	if (figure.index == 255)
-		return false;
-
-	// Send a response to the game that the figure has been "Picked up" from existing slot,
-	// until either the movement is cancelled, or user chooses a space to move to
-	std::array<u8, 32> figure_change_response = {0x56, 0x0b, figure.pad, 0x00, figure.index, 0x01,
-		figure.data[0], figure.data[1], figure.data[2],
-		figure.data[4], figure.data[5], figure.data[6], figure.data[7]};
-
-	figure_change_response[13] = generate_checksum(figure_change_response, 13);
-	m_figure_added_removed_responses.push(std::move(figure_change_response));
-
-	return true;
-}
-
-bool dimensions_toypad::cancel_remove(u8 index)
-{
-	std::lock_guard lock(m_dimensions_mutex);
-
-	dimensions_figure& figure = get_figure_by_index(index);
-	if (figure.index == 255)
-		return false;
-
-	// Cancel the previous movement of the figure
-	std::array<u8, 32> figure_change_response = {0x56, 0x0b, figure.pad, 0x00, figure.index, 0x00,
-		figure.data[0], figure.data[1], figure.data[2],
-		figure.data[4], figure.data[5], figure.data[6], figure.data[7]};
-
-	figure_change_response[13] = generate_checksum(figure_change_response, 13);
-	m_figure_added_removed_responses.push(std::move(figure_change_response));
-
-	return true;
-}
-
-bool dimensions_toypad::move_figure(u8 pad, u8 index, u8 old_pad, u8 old_index)
-{
-	if (old_index == index)
-	{
-		// Don't bother removing and loading again, just send response to the game
-		cancel_remove(index);
-		return true;
-	}
-
-	std::lock_guard lock(m_dimensions_mutex);
-
-	// When moving figures between spaces on the toypad, remove any figure from the space they are moving to,
-	// then remove them from their current space, then load them to the space they are moving to
-	remove_figure(pad, index, true, false);
-
-	dimensions_figure& figure = get_figure_by_index(old_index);
-	const std::array<u8, 0x2D * 0x04> data = figure.data;
-	fs::file in_file = std::move(figure.dim_file);
-
-	remove_figure(old_pad, old_index, false, false);
-
-	load_figure(data, std::move(in_file), pad, index, false);
-
-	return true;
-}
-
-bool dimensions_toypad::create_blank_character(std::array<u8, 0x2D * 0x04>& buf, u16 id)
-{
-	random_uid(buf.data());
-	buf[3] = id & 0xFF;
-
-	// Only characters are created with their ID encrypted and stored in pages 36 and 37,
-	// as well as a password stored in page 43. Blank tags have their information populated
-	// by the game when it calls the write_block command.
-	if (id != 0)
-	{
-		// LEGO Dimensions figures use NTAG213 tag types, and the UID for these is stored in
-		// bytes 0, 1, 2, 4, 5, 6 and 7 (out of 180 bytes)
-		std::array<u8, 7> uid = {buf[0], buf[1], buf[2], buf[4], buf[5], buf[6], buf[7]};
-		const std::array<u8, 16> figure_key = generate_figure_key(buf);
-
-		std::array<u8, 8> value_to_encrypt = {};
-		write_to_ptr<le_t<u32>>(value_to_encrypt, id);
-		write_to_ptr<le_t<u32>>(value_to_encrypt, 4, id);
-
-		std::array<u8, 8> encrypted = encrypt(value_to_encrypt.data(), figure_key);
-
-		std::memcpy(&buf[36 * 4], &encrypted[0], 4);
-		std::memcpy(&buf[37 * 4], &encrypted[4], 4);
-
-		std::memcpy(&buf[43 * 4], pwd_generate(uid).data(), 4);
-	}
-	else
-	{
-		// Page 38 is used as verification for blank tags
-		write_to_ptr<be_t<u16>>(buf.data(), 38 * 4, 1);
-	}
-
-	return true;
-}
-
-std::array<u8, 4> dimensions_toypad::pwd_generate(const std::array<u8, 7>& uid)
-{
-	std::vector<u8> pwd_calc = {PWD_CONSTANT.begin(), PWD_CONSTANT.end() - 1};
-	for (u8 i = 0; i < uid.size(); i++)
-	{
-		pwd_calc.insert(pwd_calc.begin() + i, uid[i]);
-	}
-
-	return dimensions_randomize(pwd_calc, 8);
-}
-
-std::optional<std::array<u8, 32>> dimensions_toypad::pop_added_removed_response()
-{
-	std::lock_guard lock(m_dimensions_mutex);
-
-	if (m_figure_added_removed_responses.empty())
-	{
-		return std::nullopt;
-	}
-
-	std::array<u8, 32> response = m_figure_added_removed_responses.front();
-	m_figure_added_removed_responses.pop();
-	return response;
-}
-
-usb_device_dimensions::usb_device_dimensions(const std::array<u8, 7>& location)
-	: usb_device_emulated(location)
-{
-	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x200, 0x0, 0x0, 0x0, 0x20, 0x0E6F, 0x0241, 0x200, 0x1, 0x2, 0x3, 0x1});
-	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG, UsbDeviceConfiguration{0x29, 0x1, 0x1, 0x0, 0x80, 0xFA}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE, UsbDeviceInterface{0x0, 0x0, 0x2, 0x3, 0x0, 0x0, 0x0}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_HID, UsbDeviceHID{0x0111, 0x00, 0x01, 0x22, 0x001d}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x81, 0x03, 0x20, 0x1}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x01, 0x03, 0x20, 0x1}));
-}
-
-usb_device_dimensions::~usb_device_dimensions()
-{
-}
-
-std::shared_ptr<usb_device> usb_device_dimensions::make_instance(u32, const std::array<u8, 7>& location)
-{
-	return std::make_shared<usb_device_dimensions>(location);
-}
-
-u16 usb_device_dimensions::get_num_emu_devices()
-{
-	return 1;
-}
-
-void usb_device_dimensions::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
-{
-	usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
-}
-
-void usb_device_dimensions::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer)
-{
-	ensure(buf_size == 0x20);
-
-	transfer->fake = true;
-	transfer->expected_count = buf_size;
-	transfer->expected_result = HC_CC_NOERR;
-
-	switch (endpoint)
-	{
-	case 0x81:
-	{
-		// Read Endpoint, if a request has not been sent via the write endpoint, set expected result as
-		// EHCI_CC_HALTED so the game doesn't report the Toypad as being disconnected.
-		std::lock_guard lock(m_query_mutex);
-		std::optional<std::array<u8, 32>> response = g_dimensionstoypad.pop_added_removed_response();
-		if (response)
-		{
-			std::memcpy(buf, response.value().data(), 0x20);
-		}
-		else if (!m_queries.empty())
-		{
-			std::memcpy(buf, m_queries.front().data(), 0x20);
-			m_queries.pop();
-		}
-		else
-		{
-			transfer->expected_count = 0;
-			transfer->expected_result = EHCI_CC_HALTED;
-		}
-		break;
-	}
-	case 0x01:
-	{
-		// Write endpoint, similar structure of request to the Infinity Base with a command for byte 3,
-		// sequence for byte 4, the payload after that, then a checksum for the final byte.
-
-		const u8 command = buf[2];
-		const u8 sequence = buf[3];
-
-		transfer->expected_time = get_timestamp() + 100;
-		std::array<u8, 32> q_result{};
-
-		switch (command)
-		{
-		case 0xB0: // Wake
-		{
-			// Consistent device response to the wake command
-			q_result = {0x55, 0x0e, 0x01, 0x28, 0x63, 0x29,
-				0x20, 0x4c, 0x45, 0x47, 0x4f, 0x20,
-				0x32, 0x30, 0x31, 0x34, 0x46};
-			break;
-		}
-		case 0xB1: // Seed
-		{
-			// Initialise a random number generator using the seed provided
-			g_dimensionstoypad.generate_random_number(&buf[4], sequence, q_result);
-			break;
-		}
-		case 0xB3: // Challenge
-		{
-			// Get the next number in the sequence based on the RNG from 0xB1 command
-			g_dimensionstoypad.get_challenge_response(&buf[4], sequence, q_result);
-			break;
-		}
-		case 0xC0: // Color
-		case 0xC1: // Get Pad Color
-		case 0xC2: // Fade
-		case 0xC3: // Flash
-		case 0xC4: // Fade Random
-		case 0xC6: // Fade All
-		case 0xC7: // Flash All
-		case 0xC8: // Color All
-		{
-			// Send a blank response to acknowledge color has been sent to toypad
-			g_dimensionstoypad.get_blank_response(0x01, sequence, q_result);
-			break;
-		}
-		case 0xD2: // Read
-		{
-			// Read 4 pages from the figure at index (buf[4]), starting with page buf[5]
-			g_dimensionstoypad.query_block(buf[4], buf[5], q_result, sequence);
-			break;
-		}
-		case 0xD3: // Write
-		{
-			// Write 4 bytes to page buf[5] to the figure at index buf[4]
-			g_dimensionstoypad.write_block(buf[4], buf[5], &buf[6], q_result, sequence);
-			break;
-		}
-		case 0xD4: // Model
-		{
-			// Get the model id of the figure at index buf[4]
-			g_dimensionstoypad.get_model(&buf[4], sequence, q_result);
-			break;
-		}
-		case 0xD0: // Tag List
-		case 0xE1: // PWD
-		case 0xE5: // Active
-		case 0xFF: // LEDS Query
-		{
-			// Further investigation required
-			dimensions_log.error("Unimplemented LD Function: 0x%x", command);
-			dimensions_log.error("Request: %s", fmt::buf_to_hexstring(buf, buf_size));
-			break;
-		}
-		default:
-		{
-			dimensions_log.error("Unknown LD Function: 0x%x", command);
-			dimensions_log.error("Request: %s", fmt::buf_to_hexstring(buf, buf_size));
-			break;
-		}
-		}
-		std::lock_guard lock(m_query_mutex);
-		m_queries.push(q_result);
-		break;
-	}
-	default:
-		break;
-	}
-}
-
-void usb_device_dimensions::isochronous_transfer(UsbTransfer* transfer)
-{
-	usb_device_emulated::isochronous_transfer(transfer);
-}
diff --git a/rpcs3/Emu/Io/Dimensions.h b/rpcs3/Emu/Io/Dimensions.h
deleted file mode 100644
index e4886c11f1..0000000000
--- a/rpcs3/Emu/Io/Dimensions.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#pragma once
-
-#include "Emu/Io/usb_device.h"
-#include "Utilities/mutex.h"
-#include <array>
-#include <optional>
-#include <queue>
-
-static constexpr size_t dimensions_figure_count = 7;
-
-struct dimensions_figure
-{
-	fs::file dim_file;
-	std::array<u8, 0x2D * 0x04> data{};
-	u8 index = 255;
-	u8 pad = 255;
-	u32 id = 0;
-	void save();
-};
-
-class dimensions_toypad
-{
-public:
-	static void get_blank_response(u8 type, u8 sequence, std::array<u8, 32>& reply_buf);
-	void generate_random_number(const u8* buf, u8 sequence, std::array<u8, 32>& reply_buf);
-	void initialize_rng(u32 seed);
-	void get_challenge_response(const u8* buf, u8 sequence, std::array<u8, 32>& reply_buf);
-	void query_block(u8 index, u8 page, std::array<u8, 32>& reply_buf, u8 sequence);
-	void write_block(u8 index, u8 page, const u8* to_write_buf, std::array<u8, 32>& reply_buf, u8 sequence);
-	void get_model(const u8* buf, u8 sequence, std::array<u8, 32>& reply_buf);
-	std::optional<std::array<u8, 32>> pop_added_removed_response();
-
-	bool remove_figure(u8 pad, u8 index, bool full_remove, bool lock);
-	bool temp_remove(u8 index);
-	bool cancel_remove(u8 index);
-	u32 load_figure(const std::array<u8, 0x2D * 0x04>& buf, fs::file in_file, u8 pad, u8 index, bool lock);
-	bool move_figure(u8 pad, u8 index, u8 old_pad, u8 old_index);
-	static bool create_blank_character(std::array<u8, 0x2D * 0x04>& buf, u16 id);
-
-protected:
-	shared_mutex m_dimensions_mutex;
-	std::array<dimensions_figure, dimensions_figure_count> m_figures{};
-
-private:
-	static void random_uid(u8* uid_buffer);
-	static u8 generate_checksum(const std::array<u8, 32>& data, u32 num_of_bytes);
-	static std::array<u8, 8> decrypt(const u8* buf, std::optional<std::array<u8, 16>> key);
-	static std::array<u8, 8> encrypt(const u8* buf, std::optional<std::array<u8, 16>> key);
-	static std::array<u8, 16> generate_figure_key(const std::array<u8, 0x2D * 0x04>& buf);
-	static u32 scramble(const std::array<u8, 7>& uid, u8 count);
-	static std::array<u8, 4> pwd_generate(const std::array<u8, 7>& uid);
-	static std::array<u8, 4> dimensions_randomize(const std::vector<u8>& key, u8 count);
-	static u32 get_figure_id(const std::array<u8, 0x2D * 0x04>& buf);
-	u32 get_next();
-	dimensions_figure& get_figure_by_index(u8 index);
-
-	u32 m_random_a{};
-	u32 m_random_b{};
-	u32 m_random_c{};
-	u32 m_random_d{};
-
-	u8 m_figure_order = 0;
-	std::queue<std::array<u8, 32>> m_figure_added_removed_responses;
-};
-
-extern dimensions_toypad g_dimensionstoypad;
-
-class usb_device_dimensions : public usb_device_emulated
-{
-public:
-	usb_device_dimensions(const std::array<u8, 7>& location);
-	~usb_device_dimensions();
-
-	static std::shared_ptr<usb_device> make_instance(u32 controller_index, const std::array<u8, 7>& location);
-	static u16 get_num_emu_devices();
-
-	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
-	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-	void isochronous_transfer(UsbTransfer* transfer) override;
-
-protected:
-	shared_mutex m_query_mutex;
-	std::queue<std::array<u8, 32>> m_queries;
-};
diff --git a/rpcs3/Emu/Io/GHLtar.cpp b/rpcs3/Emu/Io/GHLtar.cpp
index 0c99c6aabf..7f921935e7 100644
--- a/rpcs3/Emu/Io/GHLtar.cpp
+++ b/rpcs3/Emu/Io/GHLtar.cpp
@@ -3,43 +3,11 @@
 #include "stdafx.h"
 #include "GHLtar.h"
 #include "Emu/Cell/lv2/sys_usbd.h"
-#include "Emu/Io/ghltar_config.h"
-#include "Emu/system_config.h"
 #include "Input/pad_thread.h"
 
-LOG_CHANNEL(ghltar_log, "GHLTAR");
+LOG_CHANNEL(ghltar_log);
 
-template <>
-void fmt_class_string<ghltar_btn>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](ghltar_btn value)
-	{
-		switch (value)
-		{
-		case ghltar_btn::w1: return "W1";
-		case ghltar_btn::w2: return "W2";
-		case ghltar_btn::w3: return "W3";
-		case ghltar_btn::b1: return "B1";
-		case ghltar_btn::b2: return "B2";
-		case ghltar_btn::b3: return "B3";
-		case ghltar_btn::start: return "Start";
-		case ghltar_btn::hero_power: return "Hero Power";
-		case ghltar_btn::ghtv: return "GHTV";
-		case ghltar_btn::strum_down: return "Strum Down";
-		case ghltar_btn::strum_up: return "Strum Up";
-		case ghltar_btn::dpad_left: return "D-Pad Left";
-		case ghltar_btn::dpad_right: return "D-Pad Right";
-		case ghltar_btn::whammy: return "Whammy";
-		case ghltar_btn::tilt: return "Tilt";
-		case ghltar_btn::count: return "Count";
-		}
-
-		return unknown;
-	});
-}
-
-usb_device_ghltar::usb_device_ghltar(u32 controller_index, const std::array<u8, 7>& location)
-	: usb_device_emulated(location), m_controller_index(controller_index)
+usb_device_ghltar::usb_device_ghltar()
 {
 	device        = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x0200, 0x00, 0x00, 0x00, 0x20, 0x12BA, 0x074B, 0x0100, 0x01, 0x02, 0x00, 0x01});
 	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG, UsbDeviceConfiguration{0x0029, 0x01, 0x01, 0x00, 0x80, 0x96}));
@@ -53,16 +21,6 @@ usb_device_ghltar::~usb_device_ghltar()
 {
 }
 
-std::shared_ptr<usb_device> usb_device_ghltar::make_instance(u32 controller_index, const std::array<u8, 7>& location)
-{
-	return std::make_shared<usb_device_ghltar>(controller_index, location);
-}
-
-u16 usb_device_ghltar::get_num_emu_devices()
-{
-	return static_cast<u16>(g_cfg.io.ghltar.get());
-}
-
 void usb_device_ghltar::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
 {
 	transfer->fake = true;
@@ -73,12 +31,12 @@ void usb_device_ghltar::control_transfer(u8 bmRequestType, u8 bRequest, u16 wVal
 		case 0x21:
 			switch (bRequest)
 			{
-			case 0x09:
-				// Do nothing here - not sure what it should do.
-				break;
-			default:
-				ghltar_log.error("Unhandled Query: buf_size=0x%02X, Type=0x%02X, bRequest=0x%02X, bmRequestType=0x%02X", buf_size, (buf_size > 0) ? buf[0] : -1, bRequest, bmRequestType);
-				break;
+				case 0x09:
+					// Do nothing here - not sure what it should do.
+					break;
+				default:
+					ghltar_log.error("Unhandled Query Type: 0x%02X", buf[0]);
+					break;
 			}
 			break;
 		default:
@@ -87,18 +45,13 @@ void usb_device_ghltar::control_transfer(u8 bmRequestType, u8 bRequest, u16 wVal
 	}
 }
 
-extern bool is_input_allowed();
-
 void usb_device_ghltar::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/, UsbTransfer* transfer)
 {
-	ensure(buf_size >= 27);
-
 	transfer->fake            = true;
 	transfer->expected_count  = buf_size;
 	transfer->expected_result = HC_CC_NOERR;
 	// Interrupt transfers are slow(6ms, TODO accurate measurement)
-	// But make the emulated guitar reply in 1ms for better input behavior
-	transfer->expected_time = get_timestamp() + 1'000;
+	transfer->expected_time = get_timestamp() + 6000;
 
 	memset(buf, 0, buf_size);
 
@@ -143,79 +96,118 @@ void usb_device_ghltar::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint
 	// buf[7] through buf[18] are always 0x00
 	// buf[21]/[23]/[25] are also always 0x00
 
-	if (!is_input_allowed())
-	{
-		return;
-	}
-
 	std::lock_guard lock(pad::g_pad_mutex);
-	const auto handler = pad::get_pad_thread();
-	const auto& pad    = ::at32(handler->GetPads(), m_controller_index);
+	const auto handler = pad::get_current_handler();
+	const auto& pad    = handler->GetPads()[6];
 
-	if (!pad->is_connected() || pad->is_copilot())
-	{
+	if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
 		return;
-	}
 
-	const auto& cfg = ::at32(g_cfg_ghltar.players, m_controller_index);
-	cfg->handle_input(pad, true, [&buf](ghltar_btn btn, pad_button /*pad_btn*/, u16 value, bool pressed, bool& /*abort*/)
+	for (Button& button : pad->m_buttons)
+	{
+		if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2)
 		{
-			if (!pressed)
-				return;
+			if (button.m_pressed)
+				pad->m_digital_2 |= button.m_outKeyCode;
+			else
+				pad->m_digital_2 &= ~button.m_outKeyCode;
 
-			switch (btn)
+			switch (button.m_outKeyCode)
 			{
-			case ghltar_btn::w1:
-				buf[0] += 0x01; // W1
+				case CELL_PAD_CTRL_SQUARE:
+					pad->m_press_square = button.m_value;
+					if (button.m_pressed)
+						buf[0] += 0x01; // W1
+					break;
+				case CELL_PAD_CTRL_CROSS:
+					pad->m_press_cross = button.m_value;
+					if (button.m_pressed)
+						buf[0] += 0x02; // B1
+					break;
+				case CELL_PAD_CTRL_CIRCLE:
+					pad->m_press_circle = button.m_value;
+					if (button.m_pressed)
+						buf[0] += 0x04; // B2
+					break;
+				case CELL_PAD_CTRL_TRIANGLE:
+					pad->m_press_triangle = button.m_value;
+					if (button.m_pressed)
+						buf[0] += 0x08; // B3
+					break;
+				case CELL_PAD_CTRL_R1:
+					pad->m_press_R1 = button.m_value;
+					if (button.m_pressed)
+						buf[0] += 0x20; // W3
+					break;
+				case CELL_PAD_CTRL_L1:
+					pad->m_press_L1 = button.m_value;
+					if (button.m_pressed)
+						buf[0] += 0x10; // W2
+					break;
+				default:
+					break;
+			}
+		}
+		else if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
+		{
+			if (button.m_pressed)
+				pad->m_digital_1 |= button.m_outKeyCode;
+			else
+				pad->m_digital_1 &= ~button.m_outKeyCode;
+
+			switch (button.m_outKeyCode)
+			{
+				case CELL_PAD_CTRL_DOWN:
+					pad->m_press_down = button.m_value;
+					if (button.m_pressed)
+						buf[4] = 0xFF; // Strum Down
+					break;
+				case CELL_PAD_CTRL_UP:
+					pad->m_press_up = button.m_value;
+					if (button.m_pressed)
+						buf[4] = 0x00; // Strum Up
+					break;
+				case CELL_PAD_CTRL_LEFT:
+					pad->m_press_down = button.m_value;
+					if (button.m_pressed)
+						buf[2] = 0x02; // Left D-Pad (Unused)
+					break;
+				case CELL_PAD_CTRL_RIGHT:
+					pad->m_press_up = button.m_value;
+					if (button.m_pressed)
+						buf[2] = 0x06; // Right D-Pad (Unused)
+					break;
+				case CELL_PAD_CTRL_START:
+					if (button.m_pressed)
+						buf[1] += 0x02; // Pause
+					break;
+				case CELL_PAD_CTRL_SELECT:
+					if (button.m_pressed)
+						buf[1] += 0x01; // Hero Power
+					break;
+				default:
+					break;
+			}
+		}
+	}
+	for (const AnalogStick& stick : pad->m_sticks)
+	{
+		switch (stick.m_offset)
+		{
+			case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y:
+				buf[6]                = ~(stick.m_value) + 0x01; // Whammy
+				pad->m_analog_right_x = stick.m_value;
 				break;
-			case ghltar_btn::b1:
-				buf[0] += 0x02; // B1
-				break;
-			case ghltar_btn::b2:
-				buf[0] += 0x04; // B2
-				break;
-			case ghltar_btn::b3:
-				buf[0] += 0x08; // B3
-				break;
-			case ghltar_btn::w3:
-				buf[0] += 0x20; // W3
-				break;
-			case ghltar_btn::w2:
-				buf[0] += 0x10; // W2
-				break;
-			case ghltar_btn::strum_down:
-				buf[4] = 0xFF; // Strum Down
-				break;
-			case ghltar_btn::strum_up:
-				buf[4] = 0x00; // Strum Up
-				break;
-			case ghltar_btn::dpad_left:
-				buf[2] = 0x02; // Left D-Pad (Unused)
-				break;
-			case ghltar_btn::dpad_right:
-				buf[2] = 0x06; // Right D-Pad (Unused)
-				break;
-			case ghltar_btn::start:
-				buf[1] += 0x02; // Pause
-				break;
-			case ghltar_btn::hero_power:
-				buf[1] += 0x01; // Hero Power
-				break;
-			case ghltar_btn::ghtv:
-				buf[1] += 0x04; // GHTV Button
-				break;
-			case ghltar_btn::whammy:
-				buf[6] = ~(value) + 0x01; // Whammy
-				break;
-			case ghltar_btn::tilt:
-				buf[19] = static_cast<u8>(value); // Tilt
+			case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X:
+				buf[19] = static_cast<u8>(stick.m_value); // Tilt
 				if (buf[19] >= 0xF0)
 					buf[5] = 0xFF;
-				else if (buf[19] <= 0x10)
+				if (buf[19] <= 0x10)
 					buf[5] = 0x00;
+				pad->m_analog_right_y = stick.m_value;
 				break;
-			case ghltar_btn::count:
+			default:
 				break;
-			}
-		});
+		}
+	}
 }
diff --git a/rpcs3/Emu/Io/GHLtar.h b/rpcs3/Emu/Io/GHLtar.h
index e36df36498..564d932033 100644
--- a/rpcs3/Emu/Io/GHLtar.h
+++ b/rpcs3/Emu/Io/GHLtar.h
@@ -5,15 +5,9 @@
 class usb_device_ghltar : public usb_device_emulated
 {
 public:
-	usb_device_ghltar(u32 controller_index, const std::array<u8, 7>& location);
+	usb_device_ghltar();
 	~usb_device_ghltar();
 
-	static std::shared_ptr<usb_device> make_instance(u32 controller_index, const std::array<u8, 7>& location);
-	static u16 get_num_emu_devices();
-
 	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
 	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-
-private:
-	u32 m_controller_index;
 };
diff --git a/rpcs3/Emu/Io/GameTablet.cpp b/rpcs3/Emu/Io/GameTablet.cpp
deleted file mode 100644
index 4c2330d908..0000000000
--- a/rpcs3/Emu/Io/GameTablet.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-#include "stdafx.h"
-#include "GameTablet.h"
-#include "MouseHandler.h"
-#include "Emu/IdManager.h"
-#include "Emu/Cell/lv2/sys_usbd.h"
-#include "Emu/system_config.h"
-#include "Input/pad_thread.h"
-
-LOG_CHANNEL(gametablet_log);
-
-#pragma pack(push, 1)
-struct GameTablet_data
-{
-	uint8_t btn_square : 1;
-	uint8_t btn_cross : 1;
-	uint8_t btn_circle : 1;
-	uint8_t btn_triangle : 1;
-	uint8_t : 4;
-
-	uint8_t btn_select : 1;
-	uint8_t btn_start : 1;
-	uint8_t : 2;
-	uint8_t btn_ps: 1;
-	uint8_t : 3;
-
-	uint8_t dpad;
-	uint8_t stick_lx; // 0x80
-	uint8_t stick_ly; // 0x80
-	uint8_t stick_rx; // 0x80
-	uint8_t stick_ry; // 0x80
-
-	uint8_t : 8;
-	uint8_t : 8;
-	uint8_t : 8;
-	uint8_t : 8;
-	uint8_t pen;
-	uint8_t : 8;
-	uint8_t pressure;
-	uint8_t : 8;
-	uint8_t pos_x_hi;
-	uint8_t pos_y_hi;
-	uint8_t pos_x_lo;
-	uint8_t pos_y_lo;
-
-	uint16_t accel_x;
-	uint16_t accel_y;
-	uint16_t accel_z;
-	uint16_t unk; // 0x0200
-};
-#pragma pack(pop)
-
-enum
-{
-	Dpad_North,
-	Dpad_NE,
-	Dpad_East,
-	Dpad_SE,
-	Dpad_South,
-	Dpad_SW,
-	Dpad_West,
-	Dpad_NW,
-	Dpad_None = 0x0f
-};
-
-usb_device_gametablet::usb_device_gametablet(u32 controller_index, const std::array<u8, 7>& location)
-	: usb_device_emulated(location)
-	, m_controller_index(controller_index)
-{
-	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE,
-		UsbDeviceDescriptor {
-			.bcdUSB             = 0x0200,
-			.bDeviceClass       = 0x00,
-			.bDeviceSubClass    = 0x00,
-			.bDeviceProtocol    = 0x00,
-			.bMaxPacketSize0    = 0x08,
-			.idVendor           = 0x20d6,
-			.idProduct          = 0xcb17,
-			.bcdDevice          = 0x0108,
-			.iManufacturer      = 0x01,
-			.iProduct           = 0x02,
-			.iSerialNumber      = 0x00,
-			.bNumConfigurations = 0x01});
-	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG,
-		UsbDeviceConfiguration {
-			.wTotalLength        = 0x0029,
-			.bNumInterfaces      = 0x01,
-			.bConfigurationValue = 0x01,
-			.iConfiguration      = 0x00,
-			.bmAttributes        = 0x80,
-			.bMaxPower           = 0x32}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE,
-		UsbDeviceInterface {
-			.bInterfaceNumber   = 0x00,
-			.bAlternateSetting  = 0x00,
-			.bNumEndpoints      = 0x02,
-			.bInterfaceClass    = 0x03,
-			.bInterfaceSubClass = 0x00,
-			.bInterfaceProtocol = 0x00,
-			.iInterface         = 0x00}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_HID,
-		UsbDeviceHID {
-			.bcdHID            = 0x0110,
-			.bCountryCode      = 0x00,
-			.bNumDescriptors   = 0x01,
-			.bDescriptorType   = 0x22,
-			.wDescriptorLength = 0x0089}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint {
-			.bEndpointAddress = 0x83,
-			.bmAttributes     = 0x03,
-			.wMaxPacketSize   = 0x0040,
-			.bInterval        = 0x0A}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint {
-			.bEndpointAddress = 0x04,
-			.bmAttributes     = 0x03,
-			.wMaxPacketSize   = 0x0040,
-			.bInterval        = 0x0A}));
-
-	add_string("THQ Inc");
-	add_string("THQ uDraw Game Tablet for PS3");
-}
-
-usb_device_gametablet::~usb_device_gametablet()
-{
-}
-
-void usb_device_gametablet::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
-{
-	transfer->fake            = true;
-	transfer->expected_count  = buf_size;
-	transfer->expected_result = HC_CC_NOERR;
-	transfer->expected_time   = get_timestamp() + 100;
-
-	// Control transfers are nearly instant
-	switch (bmRequestType)
-	{
-	case 0U /*silences warning*/ | LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE: // 0x21
-		switch (bRequest)
-		{
-		case 0x09: // SET_REPORT
-			ensure(buf_size > 2);
-			gametablet_log.trace("Leds: %s/%s/%s/%s",
-				buf[2] & 1 ? "ON" : "OFF",
-				buf[2] & 2 ? "ON" : "OFF",
-				buf[2] & 4 ? "ON" : "OFF",
-				buf[2] & 8 ? "ON" : "OFF");
-			break;
-		default:
-			gametablet_log.error("Unhandled Request: 0x%02X/0x%02X", bmRequestType, bRequest);
-			break;
-		}
-		break;
-	default:
-		usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
-		break;
-	}
-}
-
-extern bool is_input_allowed();
-
-void usb_device_gametablet::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/, UsbTransfer* transfer)
-{
-	ensure(buf_size >= sizeof(GameTablet_data));
-
-	transfer->fake            = true;
-	transfer->expected_count  = sizeof(GameTablet_data);
-	transfer->expected_result = HC_CC_NOERR;
-	// Interrupt transfers are slow (6ms, TODO accurate measurement)
-	transfer->expected_time = get_timestamp() + 6000;
-
-	GameTablet_data gt{};
-
-	gt.dpad = Dpad_None;
-	gt.stick_lx = gt.stick_ly = gt.stick_rx = gt.stick_ry = 0x80;
-	gt.pressure = 0x72;
-	gt.pos_x_hi = gt.pos_y_hi = 0x0f;
-	gt.pos_x_lo = gt.pos_y_lo = 0xff;
-	gt.accel_x = gt.accel_y = gt.accel_z = gt.unk = 0x0200;
-
-	if (!is_input_allowed())
-	{
-		std::memcpy(buf, &gt, sizeof(GameTablet_data));
-		return;
-	}
-
-	if (g_cfg.io.mouse == mouse_handler::null)
-	{
-		gametablet_log.warning("GameTablet requires a Mouse Handler enabled");
-		std::memcpy(buf, &gt, sizeof(GameTablet_data));
-		return;
-	}
-
-	bool up = false, right = false, down = false, left = false;
-
-	{
-		std::lock_guard lock(pad::g_pad_mutex);
-		const auto gamepad_handler = pad::get_pad_thread();
-		const auto& pads = gamepad_handler->GetPads();
-		const auto& pad = ::at32(pads, m_controller_index);
-		if (pad->is_connected() && !pad->is_copilot())
-		{
-			for (Button& button : pad->m_buttons_external)
-			{
-				if (!button.m_pressed)
-				{
-					continue;
-				}
-
-				if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
-				{
-					switch (button.m_outKeyCode)
-					{
-					case CELL_PAD_CTRL_SELECT:
-						gt.btn_select |= 1;
-						break;
-					case CELL_PAD_CTRL_START:
-						gt.btn_start |= 1;
-						break;
-					case CELL_PAD_CTRL_UP:
-						up = true;
-						break;
-					case CELL_PAD_CTRL_RIGHT:
-						right = true;
-						break;
-					case CELL_PAD_CTRL_DOWN:
-						down = true;
-						break;
-					case CELL_PAD_CTRL_LEFT:
-						left = true;
-						break;
-					default:
-						break;
-					}
-				}
-				else if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2)
-				{
-					switch (button.m_outKeyCode)
-					{
-					case CELL_PAD_CTRL_SQUARE:
-						gt.btn_square |= 1;
-						break;
-					case CELL_PAD_CTRL_CROSS:
-						gt.btn_cross |= 1;
-						break;
-					case CELL_PAD_CTRL_CIRCLE:
-						gt.btn_circle |= 1;
-						break;
-					case CELL_PAD_CTRL_TRIANGLE:
-						gt.btn_triangle |= 1;
-						break;
-					case CELL_PAD_CTRL_PS:
-						gt.btn_ps |= 1;
-						break;
-					default:
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	if (!up && !right && !down && !left)
-		gt.dpad = Dpad_None;
-	else if (up && !left && !right)
-		gt.dpad = Dpad_North;
-	else if (up && right)
-		gt.dpad = Dpad_NE;
-	else if (right && !up && !down)
-		gt.dpad = Dpad_East;
-	else if (down && right)
-		gt.dpad = Dpad_SE;
-	else if (down && !left && !right)
-		gt.dpad = Dpad_South;
-	else if (down && left)
-		gt.dpad = Dpad_SW;
-	else if (left && !up && !down)
-		gt.dpad = Dpad_West;
-	else if (up && left)
-		gt.dpad = Dpad_NW;
-
-	auto& mouse_handler = g_fxo->get<MouseHandlerBase>();
-	std::lock_guard mouse_lock(mouse_handler.mutex);
-
-	mouse_handler.Init(1);
-
-	constexpr u8 mouse_index = 0;
-	if (mouse_index >= mouse_handler.GetMice().size())
-	{
-		std::memcpy(buf, &gt, sizeof(GameTablet_data));
-		return;
-	}
-
-	const Mouse& mouse_data = ::at32(mouse_handler.GetMice(), mouse_index);
-	if (mouse_data.x_max <= 0 || mouse_data.y_max <= 0)
-	{
-		std::memcpy(buf, &gt, sizeof(GameTablet_data));
-		return;
-	}
-
-	static u8 noise_x = 0; // Toggle the LSB to simulate a noisy signal, Instant Artist dislikes a pen held perfectly still
-	static u8 noise_y = 0;
-	constexpr s32 tablet_max_x = 1920;
-	constexpr s32 tablet_max_y = 1080;
-
-	const s32 tablet_x_pos = (mouse_data.x_pos * tablet_max_x / mouse_data.x_max) ^ noise_x;
-	const s32 tablet_y_pos = (mouse_data.y_pos * tablet_max_y / mouse_data.y_max) ^ noise_y;
-	noise_x ^= 0x1;
-	noise_y ^= 0x1;
-
-	gt.pen = 0x40;
-	gt.pressure = mouse_data.buttons & CELL_MOUSE_BUTTON_1 ? 0xbb : 0x72;
-	gt.pos_x_hi = static_cast<u8>(tablet_x_pos / 0x100);
-	gt.pos_y_hi = static_cast<u8>(tablet_y_pos / 0x100);
-	gt.pos_x_lo = static_cast<u8>(tablet_x_pos % 0x100);
-	gt.pos_y_lo = static_cast<u8>(tablet_y_pos % 0x100);
-
-	std::memcpy(buf, &gt, sizeof(GameTablet_data));
-}
diff --git a/rpcs3/Emu/Io/GameTablet.h b/rpcs3/Emu/Io/GameTablet.h
deleted file mode 100644
index 7fdbf8eaa6..0000000000
--- a/rpcs3/Emu/Io/GameTablet.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "Emu/Io/usb_device.h"
-
-class usb_device_gametablet : public usb_device_emulated
-{
-public:
-	usb_device_gametablet(u32 controller_index, const std::array<u8, 7>& location);
-	~usb_device_gametablet();
-
-	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
-	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-
-private:
-	u32 m_controller_index;
-};
diff --git a/rpcs3/Emu/Io/GunCon3.cpp b/rpcs3/Emu/Io/GunCon3.cpp
deleted file mode 100644
index 522369d8a4..0000000000
--- a/rpcs3/Emu/Io/GunCon3.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-#include "stdafx.h"
-#include "GunCon3.h"
-#include "MouseHandler.h"
-#include "Emu/IdManager.h"
-#include "Emu/Io/guncon3_config.h"
-#include "Emu/Cell/lv2/sys_usbd.h"
-#include "Emu/system_config.h"
-#include "Input/pad_thread.h"
-
-LOG_CHANNEL(guncon3_log);
-
-template <>
-void fmt_class_string<guncon3_btn>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](guncon3_btn value)
-	{
-		switch (value)
-		{
-		case guncon3_btn::trigger: return "Trigger";
-		case guncon3_btn::a1: return "A1";
-		case guncon3_btn::a2: return "A2";
-		case guncon3_btn::a3: return "A3";
-		case guncon3_btn::b1: return "B1";
-		case guncon3_btn::b2: return "B2";
-		case guncon3_btn::b3: return "B3";
-		case guncon3_btn::c1: return "C1";
-		case guncon3_btn::c2: return "C2";
-		case guncon3_btn::as_x: return "A-stick X-Axis";
-		case guncon3_btn::as_y: return "A-stick Y-Axis";
-		case guncon3_btn::bs_x: return "B-stick X-Axis";
-		case guncon3_btn::bs_y: return "B-stick Y-Axis";
-		case guncon3_btn::count: return "Count";
-		}
-
-		return unknown;
-	});
-}
-
-static const u8 KEY_TABLE[] = {
-	0x91, 0xFD, 0x4C, 0x8B, 0x20, 0xC1, 0x7C, 0x09, 0x58, 0x14, 0xF6, 0x00, 0x52, 0x55, 0xBF, 0x41,
-	0x75, 0xC0, 0x13, 0x30, 0xB5, 0xD0, 0x69, 0x85, 0x89, 0xBB, 0xD6, 0x88, 0xBC, 0x73, 0x18, 0x8D,
-	0x58, 0xAB, 0x3D, 0x98, 0x5C, 0xF2, 0x48, 0xE9, 0xAC, 0x9F, 0x7A, 0x0C, 0x7C, 0x25, 0xD8, 0xFF,
-	0xDC, 0x7D, 0x08, 0xDB, 0xBC, 0x18, 0x8C, 0x1D, 0xD6, 0x3C, 0x35, 0xE1, 0x2C, 0x14, 0x8E, 0x64,
-	0x83, 0x39, 0xB0, 0xE4, 0x4E, 0xF7, 0x51, 0x7B, 0xA8, 0x13, 0xAC, 0xE9, 0x43, 0xC0, 0x08, 0x25,
-	0x0E, 0x15, 0xC4, 0x20, 0x93, 0x13, 0xF5, 0xC3, 0x48, 0xCC, 0x47, 0x1C, 0xC5, 0x20, 0xDE, 0x60,
-	0x55, 0xEE, 0xA0, 0x40, 0xB4, 0xE7, 0x74, 0x95, 0xB0, 0x46, 0xEC, 0xF0, 0xA5, 0xB8, 0x23, 0xC8,
-	0x04, 0x06, 0xFC, 0x28, 0xCB, 0xF8, 0x17, 0x2C, 0x25, 0x1C, 0xCB, 0x18, 0xE3, 0x6C, 0x80, 0x85,
-	0xDD, 0x7E, 0x09, 0xD9, 0xBC, 0x19, 0x8F, 0x1D, 0xD4, 0x3D, 0x37, 0xE1, 0x2F, 0x15, 0x8D, 0x64,
-	0x06, 0x04, 0xFD, 0x29, 0xCF, 0xFA, 0x14, 0x2E, 0x25, 0x1F, 0xC9, 0x18, 0xE3, 0x6D, 0x81, 0x84,
-	0x80, 0x3B, 0xB1, 0xE5, 0x4D, 0xF7, 0x51, 0x78, 0xA9, 0x13, 0xAD, 0xE9, 0x80, 0xC1, 0x0B, 0x25,
-	0x93, 0xFC, 0x4D, 0x89, 0x23, 0xC2, 0x7C, 0x0B, 0x59, 0x15, 0xF6, 0x01, 0x50, 0x55, 0xBF, 0x81,
-	0x75, 0xC3, 0x10, 0x31, 0xB5, 0xD3, 0x69, 0x84, 0x89, 0xBA, 0xD6, 0x89, 0xBD, 0x70, 0x19, 0x8E,
-	0x58, 0xA8, 0x3D, 0x9B, 0x5D, 0xF0, 0x49, 0xE8, 0xAD, 0x9D, 0x7A, 0x0D, 0x7E, 0x24, 0xDA, 0xFC,
-	0x0D, 0x14, 0xC5, 0x23, 0x91, 0x11, 0xF5, 0xC0, 0x4B, 0xCD, 0x44, 0x1C, 0xC5, 0x21, 0xDF, 0x61,
-	0x54, 0xED, 0xA2, 0x81, 0xB7, 0xE5, 0x74, 0x94, 0xB0, 0x47, 0xEE, 0xF1, 0xA5, 0xBB, 0x21, 0xC8
-};
-
-#pragma pack(push, 1)
-struct GunCon3_data
-{
-	uint8_t : 1;
-	uint8_t btn_a2 : 1;
-	uint8_t btn_a1 : 1;
-	uint8_t btn_c2 : 1;
-	uint8_t : 4;
-
-	uint8_t : 1;
-	uint8_t btn_b2 : 1;
-	uint8_t btn_b1 : 1;
-	uint8_t : 2;
-	uint8_t btn_trigger : 1;
-	uint8_t : 1;
-	uint8_t btn_c1 : 1;
-
-	uint8_t : 6;
-	uint8_t btn_b3 : 1;
-	uint8_t btn_a3 : 1;
-
-	int16_t gun_x;
-	int16_t gun_y;
-	int16_t gun_z;
-	uint8_t stick_bx;
-	uint8_t stick_by;
-	uint8_t stick_ax;
-	uint8_t stick_ay;
-
-	uint8_t checksum;
-	uint8_t keyindex;
-};
-#pragma pack(pop)
-
-static void guncon3_encode(const GunCon3_data* gc, u8* data, const u8* key)
-{
-	std::memcpy(data, gc, sizeof(GunCon3_data));
-
-	u8 key_offset = ((((key[1] ^ key[2]) - key[3] - key[4]) ^ key[5]) + key[6] - key[7]) ^ data[14];
-	u8 key_index = 0;
-
-	for (int i = 0; i < 13; i++)
-	{
-		u8 byte = data[i];
-		for (int j = 0; j < 3; j++)
-		{
-			u8 bkey = KEY_TABLE[key_offset];
-			u8 keyr = key[++key_index];
-			if (key_index == 7)
-				key_index = 0;
-
-			if ((bkey & 3) == 0)
-				byte = (byte + bkey) + keyr;
-			else if ((bkey & 3) == 1)
-				byte = (byte - bkey) - keyr;
-			else
-				byte = (byte ^ bkey) ^ keyr;
-
-			key_offset++;
-		}
-		data[i] = byte;
-	}
-
-	data[13] = ((((((key[7] + data[0] - data[1] - data[2]) ^ data[3])
-			 + data[4] + data[5]) ^ data[6]) ^ data[7])
-			 + data[8] + data[9] - data[10] - data[11]) ^ data[12];
-}
-
-usb_device_guncon3::usb_device_guncon3(u32 controller_index, const std::array<u8, 7>& location)
-	: usb_device_emulated(location)
-	, m_controller_index(controller_index)
-{
-	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE,
-		UsbDeviceDescriptor {
-			.bcdUSB             = 0x0110,
-			.bDeviceClass       = 0x00,
-			.bDeviceSubClass    = 0x00,
-			.bDeviceProtocol    = 0x00,
-			.bMaxPacketSize0    = 0x08,
-			.idVendor           = 0x0b9a,
-			.idProduct          = 0x0800,
-			.bcdDevice          = 0x8000,
-			.iManufacturer      = 0x00,
-			.iProduct           = 0x00,
-			.iSerialNumber      = 0x00,
-			.bNumConfigurations = 0x01});
-	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG,
-		UsbDeviceConfiguration {
-			.wTotalLength        = 0x0020,
-			.bNumInterfaces      = 0x01,
-			.bConfigurationValue = 0x01,
-			.iConfiguration      = 0x00,
-			.bmAttributes        = 0x00,
-			.bMaxPower           = 0x32}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE,
-		UsbDeviceInterface {
-			.bInterfaceNumber   = 0x00,
-			.bAlternateSetting  = 0x00,
-			.bNumEndpoints      = 0x02,
-			.bInterfaceClass    = 0xff,
-			.bInterfaceSubClass = 0x00,
-			.bInterfaceProtocol = 0x00,
-			.iInterface         = 0x00}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint {
-			.bEndpointAddress = 0x02,
-			.bmAttributes     = 0x03,
-			.wMaxPacketSize   = 0x0008,
-			.bInterval        = 0x10}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint {
-			.bEndpointAddress = 0x82,
-			.bmAttributes     = 0x03,
-			.wMaxPacketSize   = 0x000f,
-			.bInterval        = 0x04}));
-}
-
-usb_device_guncon3::~usb_device_guncon3()
-{
-}
-
-void usb_device_guncon3::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
-{
-	transfer->fake            = true;
-	transfer->expected_count  = buf_size;
-	transfer->expected_result = HC_CC_NOERR;
-	transfer->expected_time   = get_timestamp() + 100;
-
-	usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
-}
-
-extern bool is_input_allowed();
-
-void usb_device_guncon3::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer)
-{
-	transfer->fake = true;
-	transfer->expected_count = buf_size;
-	transfer->expected_result = HC_CC_NOERR;
-	transfer->expected_time = get_timestamp() + 4000;
-
-	if ((endpoint & 0x80) == LIBUSB_ENDPOINT_OUT)
-	{
-		std::memcpy(m_key.data(), buf, std::min<usz>(buf_size, m_key.size()));
-		return;
-	}
-	// else ENDPOINT_IN
-
-	ensure(buf_size >= sizeof(GunCon3_data));
-
-	GunCon3_data gc{};
-	gc.stick_ax = gc.stick_ay = gc.stick_bx = gc.stick_by = 0x7f;
-
-	if (!is_input_allowed())
-	{
-		guncon3_encode(&gc, buf, m_key.data());
-		return;
-	}
-
-	if (g_cfg.io.mouse == mouse_handler::null)
-	{
-		guncon3_log.warning("GunCon3 requires a Mouse Handler enabled");
-		guncon3_encode(&gc, buf, m_key.data());
-		return;
-	}
-
-	if (m_controller_index >= g_cfg_guncon3.players.size())
-	{
-		guncon3_log.warning("GunCon3 controllers are only supported for Player1 to Player%d", g_cfg_guncon3.players.size());
-		guncon3_encode(&gc, buf, m_key.data());
-		return;
-	}
-
-	const auto input_callback = [&gc](guncon3_btn btn, pad_button /*pad_button*/, u16 value, bool pressed, bool& /*abort*/)
-	{
-		if (!pressed)
-			return;
-
-		switch (btn)
-		{
-		case guncon3_btn::trigger: gc.btn_trigger |= 1; break;
-		case guncon3_btn::a1: gc.btn_a1 |= 1; break;
-		case guncon3_btn::a2: gc.btn_a2 |= 1; break;
-		case guncon3_btn::a3: gc.btn_a3 |= 1; break;
-		case guncon3_btn::b1: gc.btn_b1 |= 1; break;
-		case guncon3_btn::b2: gc.btn_b2 |= 1; break;
-		case guncon3_btn::b3: gc.btn_b3 |= 1; break;
-		case guncon3_btn::c1: gc.btn_c1 |= 1; break;
-		case guncon3_btn::c2: gc.btn_c2 |= 1; break;
-		case guncon3_btn::as_x: gc.stick_ax = static_cast<uint8_t>(value); break;
-		case guncon3_btn::as_y: gc.stick_ay = static_cast<uint8_t>(value); break;
-		case guncon3_btn::bs_x: gc.stick_bx = static_cast<uint8_t>(value); break;
-		case guncon3_btn::bs_y: gc.stick_by = static_cast<uint8_t>(value); break;
-		case guncon3_btn::count: break;
-		}
-	};
-
-	const auto& cfg = ::at32(g_cfg_guncon3.players, m_controller_index);
-
-	{
-		std::lock_guard lock(pad::g_pad_mutex);
-		const auto gamepad_handler = pad::get_pad_thread();
-		const auto& pads = gamepad_handler->GetPads();
-		const auto& pad = ::at32(pads, m_controller_index);
-		if (pad->is_connected() && !pad->is_copilot())
-		{
-			cfg->handle_input(pad, true, input_callback);
-		}
-	}
-
-	{
-		auto& mouse_handler = g_fxo->get<MouseHandlerBase>();
-		std::lock_guard mouse_lock(mouse_handler.mutex);
-
-		mouse_handler.Init(4);
-
-		const u32 mouse_index = g_cfg.io.mouse == mouse_handler::basic ? 0 : m_controller_index;
-		if (mouse_index >= mouse_handler.GetMice().size())
-		{
-			guncon3_encode(&gc, buf, m_key.data());
-			return;
-		}
-
-		const Mouse& mouse_data = ::at32(mouse_handler.GetMice(), mouse_index);
-		cfg->handle_input(mouse_data, input_callback);
-
-		if (mouse_data.x_max <= 0 || mouse_data.y_max <= 0)
-		{
-			guncon3_encode(&gc, buf, m_key.data());
-			return;
-		}
-
-		// Expand 0..+wh to -32767..+32767
-		gc.gun_x = (mouse_data.x_pos * USHRT_MAX / mouse_data.x_max) - SHRT_MAX;
-		gc.gun_y = (mouse_data.y_pos * -USHRT_MAX / mouse_data.y_max) + SHRT_MAX;
-	}
-
-	guncon3_encode(&gc, buf, m_key.data());
-}
diff --git a/rpcs3/Emu/Io/GunCon3.h b/rpcs3/Emu/Io/GunCon3.h
deleted file mode 100644
index df013e4240..0000000000
--- a/rpcs3/Emu/Io/GunCon3.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "Emu/Io/usb_device.h"
-
-class usb_device_guncon3 : public usb_device_emulated
-{
-public:
-	usb_device_guncon3(u32 controller_index, const std::array<u8, 7>& location);
-	~usb_device_guncon3();
-
-	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
-	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-
-private:
-	u32 m_controller_index;
-	std::array<u8, 8> m_key{};
-};
diff --git a/rpcs3/Emu/Io/Infinity.cpp b/rpcs3/Emu/Io/Infinity.cpp
deleted file mode 100644
index ff4ce9e85b..0000000000
--- a/rpcs3/Emu/Io/Infinity.cpp
+++ /dev/null
@@ -1,487 +0,0 @@
-#include "stdafx.h"
-#include "Infinity.h"
-
-#include <bit>
-
-#include "Crypto/aes.h"
-#include "Crypto/sha1.h"
-
-LOG_CHANNEL(infinity_log, "infinity");
-
-infinity_base g_infinitybase;
-
-static constexpr std::array<u8, 32> SHA1_CONSTANT = {
-	0xAF, 0x62, 0xD2, 0xEC, 0x04, 0x91, 0x96, 0x8C, 0xC5, 0x2A, 0x1A, 0x71, 0x65, 0xF8, 0x65, 0xFE,
-	0x28, 0x63, 0x29, 0x20, 0x44, 0x69, 0x73, 0x6e, 0x65, 0x79, 0x20, 0x32, 0x30, 0x31, 0x33};
-
-void infinity_figure::save()
-{
-	if (!inf_file)
-	{
-		infinity_log.error("Tried to save infinity figure to file but no infinity figure is active!");
-		return;
-	}
-	inf_file.seek(0, fs::seek_set);
-	inf_file.write(data.data(), 0x14 * 0x10);
-}
-
-u8 infinity_base::generate_checksum(const std::array<u8, 32>& data, int num_of_bytes) const
-{
-	int checksum = 0;
-	for (int i = 0; i < num_of_bytes; i++)
-	{
-		checksum += data[i];
-	}
-	return (checksum & 0xFF);
-}
-
-void infinity_base::get_blank_response(u8 sequence, std::array<u8, 32>& reply_buf)
-{
-	reply_buf[0] = 0xaa;
-	reply_buf[1] = 0x01;
-	reply_buf[2] = sequence;
-	reply_buf[3] = generate_checksum(reply_buf, 3);
-}
-
-void infinity_base::descramble_and_seed(u8* buf, u8 sequence, std::array<u8, 32>& reply_buf)
-{
-	u64 value = u64(buf[4]) << 56 | u64(buf[5]) << 48 | u64(buf[6]) << 40 | u64(buf[7]) << 32 |
-	            u64(buf[8]) << 24 | u64(buf[9]) << 16 | u64(buf[10]) << 8 | u64(buf[11]);
-	u32 seed = descramble(value);
-	generate_seed(seed);
-	get_blank_response(sequence, reply_buf);
-}
-
-void infinity_base::get_next_and_scramble(u8 sequence, std::array<u8, 32>& reply_buf)
-{
-	const u32 next_random = get_next();
-	const u64 scrambled_next_random = scramble(next_random, 0);
-	reply_buf = {0xAA, 0x09, sequence};
-	reply_buf[3] = u8((scrambled_next_random >> 56) & 0xFF);
-	reply_buf[4] = u8((scrambled_next_random >> 48) & 0xFF);
-	reply_buf[5] = u8((scrambled_next_random >> 40) & 0xFF);
-	reply_buf[6] = u8((scrambled_next_random >> 32) & 0xFF);
-	reply_buf[7] = u8((scrambled_next_random >> 24) & 0xFF);
-	reply_buf[8] = u8((scrambled_next_random >> 16) & 0xFF);
-	reply_buf[9] = u8((scrambled_next_random >> 8) & 0xFF);
-	reply_buf[10] = u8(scrambled_next_random & 0xFF);
-	reply_buf[11] = generate_checksum(reply_buf, 11);
-}
-
-u32 infinity_base::descramble(u64 num_to_descramble)
-{
-	u64 mask = 0x8E55AA1B3999E8AA;
-	u32 ret = 0;
-
-	for (int i = 0; i < 64; i++)
-	{
-		if (mask & 0x8000000000000000)
-		{
-			ret = (ret << 1) | (num_to_descramble & 0x01);
-		}
-
-		num_to_descramble >>= 1;
-		mask <<= 1;
-	}
-
-	return ret;
-}
-
-u64 infinity_base::scramble(u32 num_to_scramble, u32 garbage)
-{
-	u64 mask = 0x8E55AA1B3999E8AA;
-	u64 ret = 0;
-
-	for (int i = 0; i < 64; i++)
-	{
-		ret <<= 1;
-
-		if ((mask & 1) != 0)
-		{
-			ret |= (num_to_scramble & 1);
-			num_to_scramble >>= 1;
-		}
-		else
-		{
-			ret |= (garbage & 1);
-			garbage >>= 1;
-		}
-
-		mask >>= 1;
-	}
-
-	return ret;
-}
-
-void infinity_base::generate_seed(u32 seed)
-{
-	random_a = 0xF1EA5EED;
-	random_b = seed;
-	random_c = seed;
-	random_d = seed;
-
-	for (int i = 0; i < 23; i++)
-	{
-		get_next();
-	}
-}
-
-u32 infinity_base::get_next()
-{
-	u32 a = random_a;
-	u32 b = random_b;
-	u32 c = random_c;
-	u32 ret = std::rotl(random_b, 27);
-
-	const u32 temp = (a + ((ret ^ 0xFFFFFFFF) + 1));
-	b ^= std::rotl(c, 17);
-	a = random_d;
-	c += a;
-	ret = b + temp;
-	a += temp;
-
-	random_c = a;
-	random_a = b;
-	random_b = c;
-	random_d = ret;
-
-	return ret;
-}
-
-void infinity_base::get_present_figures(u8 sequence, std::array<u8, 32>& reply_buf)
-{
-	int x = 3;
-	for (u8 i = 0; i < figures.size(); i++)
-	{
-		u8 slot = i == 0 ? 0x10 : (i < 4) ? 0x20 :
-		                                    0x30;
-		if (figures[i].present)
-		{
-			reply_buf[x] = slot + figures[i].order_added;
-			reply_buf[x + 1] = 0x09;
-			x += 2;
-		}
-	}
-	reply_buf[0] = 0xaa;
-	reply_buf[1] = x - 2;
-	reply_buf[2] = sequence;
-	reply_buf[x] = generate_checksum(reply_buf, x);
-}
-
-infinity_figure& infinity_base::get_figure_by_order(u8 order_added)
-{
-	for (u8 i = 0; i < figures.size(); i++)
-	{
-		if (figures[i].order_added == order_added)
-		{
-			return figures[i];
-		}
-	}
-	return figures[0];
-}
-
-u8 infinity_base::derive_figure_position(u8 position)
-{
-	switch (position)
-	{
-	case 0:
-	case 1:
-	case 2:
-		return 1;
-	case 3:
-	case 4:
-	case 5:
-		return 2;
-	case 6:
-	case 7:
-	case 8:
-		return 3;
-
-	default:
-		return 0;
-	}
-}
-
-void infinity_base::query_block(u8 fig_num, u8 block, std::array<u8, 32>& reply_buf, u8 sequence)
-{
-	std::lock_guard lock(infinity_mutex);
-
-	infinity_figure& figure = get_figure_by_order(fig_num);
-
-	reply_buf[0] = 0xaa;
-	reply_buf[1] = 0x12;
-	reply_buf[2] = sequence;
-	reply_buf[3] = 0x00;
-	const u8 file_block = (block == 0) ? 1 : (block * 4);
-	if (figure.present && file_block < 20)
-	{
-		memcpy(&reply_buf[4], figure.data.data() + (16 * file_block), 16);
-	}
-	reply_buf[20] = generate_checksum(reply_buf, 20);
-}
-
-void infinity_base::write_block(u8 fig_num, u8 block, const u8* to_write_buf,
-	std::array<u8, 32>& reply_buf, u8 sequence)
-{
-	std::lock_guard lock(infinity_mutex);
-
-	infinity_figure& figure = get_figure_by_order(fig_num);
-
-	reply_buf[0] = 0xaa;
-	reply_buf[1] = 0x02;
-	reply_buf[2] = sequence;
-	reply_buf[3] = 0x00;
-	const u8 file_block = (block == 0) ? 1 : (block * 4);
-	if (figure.present && file_block < 20)
-	{
-		memcpy(figure.data.data() + (file_block * 16), to_write_buf, 16);
-		figure.save();
-	}
-	reply_buf[4] = generate_checksum(reply_buf, 4);
-}
-
-void infinity_base::get_figure_identifier(u8 fig_num, u8 sequence, std::array<u8, 32>& reply_buf)
-{
-	std::lock_guard lock(infinity_mutex);
-
-	infinity_figure& figure = get_figure_by_order(fig_num);
-
-	reply_buf[0] = 0xaa;
-	reply_buf[1] = 0x09;
-	reply_buf[2] = sequence;
-	reply_buf[3] = 0x00;
-
-	if (figure.present)
-	{
-		memcpy(&reply_buf[4], figure.data.data(), 7);
-	}
-	reply_buf[11] = generate_checksum(reply_buf, 11);
-}
-
-bool infinity_base::has_figure_been_added_removed() const
-{
-	return !m_figure_added_removed_responses.empty();
-}
-
-std::array<u8, 32> infinity_base::pop_added_removed_response()
-{
-	std::array<u8, 32> response = m_figure_added_removed_responses.front();
-	m_figure_added_removed_responses.pop();
-	return response;
-}
-
-bool infinity_base::remove_figure(u8 position)
-{
-	std::lock_guard lock(infinity_mutex);
-	infinity_figure& figure = figures[position];
-
-	if (!figure.present)
-	{
-		return false;
-	}
-
-	position = derive_figure_position(position);
-	if (position == 0)
-	{
-		return false;
-	}
-
-	figure.present = false;
-
-	std::array<u8, 32> figure_change_response = {0xab, 0x04, position, 0x09, figure.order_added, 0x01};
-	figure_change_response[6] = generate_checksum(figure_change_response, 6);
-	m_figure_added_removed_responses.push(figure_change_response);
-
-	figure.save();
-	figure.inf_file.close();
-	return true;
-}
-
-u32 infinity_base::load_figure(const std::array<u8, 0x14 * 0x10>& buf, fs::file in_file, u8 position)
-{
-	std::lock_guard lock(infinity_mutex);
-	u8 order_added;
-
-	std::vector<u8> sha1_calc = {SHA1_CONSTANT.begin(), SHA1_CONSTANT.end() - 1};
-	for (int i = 0; i < 7; i++)
-	{
-		sha1_calc.push_back(buf[i]);
-	}
-
-	sha1_context ctx;
-	u8 output[20];
-
-	sha1_starts(&ctx);
-	sha1_update(&ctx, sha1_calc.data(), sha1_calc.size());
-	sha1_finish(&ctx, output);
-
-	std::array<u8, 16> key{};
-	for (int i = 0; i < 4; i++)
-	{
-		for (int x = 0; x < 4; x++)
-		{
-			key[x + (i * 4)] = output[(3 - x) + (i * 4)];
-		}
-	}
-
-	aes_context aes;
-	aes_setkey_dec(&aes, key.data(), 128);
-	std::array<u8, 16> infinity_decrypted_block{};
-	aes_crypt_ecb(&aes, AES_DECRYPT, &buf[16], infinity_decrypted_block.data());
-
-	u32 number = u32(infinity_decrypted_block[1]) << 16 | u32(infinity_decrypted_block[2]) << 8 |
-	             u32(infinity_decrypted_block[3]);
-
-	infinity_figure& figure = figures[position];
-
-	figure.inf_file = std::move(in_file);
-	memcpy(figure.data.data(), buf.data(), figure.data.size());
-	figure.present = true;
-	if (figure.order_added == 255)
-	{
-		figure.order_added = m_figure_order;
-		m_figure_order++;
-	}
-	order_added = figure.order_added;
-
-	position = derive_figure_position(position);
-	if (position == 0)
-	{
-		return 0;
-	}
-
-	std::array<u8, 32> figure_change_response = {0xab, 0x04, position, 0x09, order_added, 0x00};
-	figure_change_response[6] = generate_checksum(figure_change_response, 6);
-	m_figure_added_removed_responses.push(figure_change_response);
-
-	return number;
-}
-
-usb_device_infinity::usb_device_infinity(const std::array<u8, 7>& location)
-	: usb_device_emulated(location)
-{
-	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x200, 0x0, 0x0, 0x0, 0x20, 0x0E6F, 0x0129, 0x200, 0x1, 0x2, 0x3, 0x1});
-	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG, UsbDeviceConfiguration{0x29, 0x1, 0x1, 0x0, 0x80, 0xFA}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE, UsbDeviceInterface{0x0, 0x0, 0x2, 0x3, 0x0, 0x0, 0x0}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_HID, UsbDeviceHID{0x0111, 0x00, 0x01, 0x22, 0x001d}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x81, 0x3, 0x20, 0x1}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x1, 0x3, 0x20, 0x1}));
-}
-
-usb_device_infinity::~usb_device_infinity()
-{
-}
-
-std::shared_ptr<usb_device> usb_device_infinity::make_instance(u32, const std::array<u8, 7>& location)
-{
-	return std::make_shared<usb_device_infinity>(location);
-}
-
-u16 usb_device_infinity::get_num_emu_devices()
-{
-	return 1;
-}
-
-void usb_device_infinity::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
-{
-	usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
-}
-
-void usb_device_infinity::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer)
-{
-	ensure(buf_size == 0x20);
-
-	transfer->fake = true;
-	transfer->expected_count = buf_size;
-	transfer->expected_result = HC_CC_NOERR;
-
-	if (endpoint == 0x81)
-	{
-		// Respond after FF command
-		transfer->expected_time = get_timestamp() + 1000;
-		if (g_infinitybase.has_figure_been_added_removed())
-		{
-			memcpy(buf, g_infinitybase.pop_added_removed_response().data(), 0x20);
-		}
-		else if (!m_queries.empty())
-		{
-			memcpy(buf, m_queries.front().data(), 0x20);
-			m_queries.pop();
-		}
-	}
-	else if (endpoint == 0x01)
-	{
-		const u8 command = buf[2];
-		const u8 sequence = buf[3];
-
-		transfer->expected_time = get_timestamp() + 500;
-		std::array<u8, 32> q_result{};
-
-		switch (command)
-		{
-		case 0x80:
-		{
-			q_result = {0xaa, 0x15, 0x00, 0x00, 0x0f, 0x01, 0x00, 0x03, 0x02, 0x09, 0x09, 0x43,
-				0x20, 0x32, 0x62, 0x36, 0x36, 0x4b, 0x34, 0x99, 0x67, 0x31, 0x93, 0x8c};
-			break;
-		}
-		case 0x81:
-		{
-			// Initiate Challenge
-			g_infinitybase.descramble_and_seed(buf, sequence, q_result);
-			break;
-		}
-		case 0x83:
-		{
-			// Challenge Response
-			g_infinitybase.get_next_and_scramble(sequence, q_result);
-			break;
-		}
-		case 0x90:
-		case 0x92:
-		case 0x93:
-		case 0x95:
-		case 0x96:
-		{
-			// Color commands
-			g_infinitybase.get_blank_response(sequence, q_result);
-			break;
-		}
-		case 0xA1:
-		{
-			// Get Present Figures
-			g_infinitybase.get_present_figures(sequence, q_result);
-			break;
-		}
-		case 0xA2:
-		{
-			// Read Block from Figure
-			g_infinitybase.query_block(buf[4], buf[5], q_result, sequence);
-			break;
-		}
-		case 0xA3:
-		{
-			// Write block to figure
-			g_infinitybase.write_block(buf[4], buf[5], &buf[7], q_result, sequence);
-			break;
-		}
-		case 0xB4:
-		{
-			// Get figure ID
-			g_infinitybase.get_figure_identifier(buf[4], sequence, q_result);
-			break;
-		}
-		case 0xB5:
-		{
-			// Get status?
-			g_infinitybase.get_blank_response(sequence, q_result);
-			break;
-		}
-		default:
-			infinity_log.error("Unhandled Query Type: 0x%02X", command);
-			break;
-		}
-
-		m_queries.push(q_result);
-	}
-}
diff --git a/rpcs3/Emu/Io/Infinity.h b/rpcs3/Emu/Io/Infinity.h
deleted file mode 100644
index 2bfcff245f..0000000000
--- a/rpcs3/Emu/Io/Infinity.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#pragma once
-
-#include "Emu/Io/usb_device.h"
-#include "Utilities/mutex.h"
-#include <array>
-#include <queue>
-
-struct infinity_figure
-{
-	fs::file inf_file;
-	std::array<u8, 0x14 * 0x10> data{};
-	bool present = false;
-	u8 order_added = 255;
-	void save();
-};
-
-class infinity_base
-{
-public:
-	void get_blank_response(u8 sequence, std::array<u8, 32>& reply_buf);
-	void descramble_and_seed(u8* buf, u8 sequence, std::array<u8, 32>& reply_buf);
-	void get_next_and_scramble(u8 sequence, std::array<u8, 32>& reply_buf);
-	void get_present_figures(u8 sequence, std::array<u8, 32>& reply_buf);
-	void query_block(u8 fig_num, u8 block, std::array<u8, 32>& reply_buf, u8 sequence);
-	void write_block(u8 fig_num, u8 block, const u8* to_write_buf, std::array<u8, 32>& reply_buf, u8 sequence);
-	void get_figure_identifier(u8 fig_num, u8 sequence, std::array<u8, 32>& reply_buf);
-	bool has_figure_been_added_removed() const;
-	std::array<u8, 32> pop_added_removed_response();
-
-	bool remove_figure(u8 position);
-	u32 load_figure(const std::array<u8, 0x14 * 0x10>& buf, fs::file in_file, u8 position);
-
-protected:
-	shared_mutex infinity_mutex;
-	std::array<infinity_figure, 9> figures;
-
-private:
-	u8 generate_checksum(const std::array<u8, 32>& data, int num_of_bytes) const;
-	u32 descramble(u64 num_to_descramble);
-	u64 scramble(u32 num_to_scramble, u32 garbage);
-	void generate_seed(u32 seed);
-	u32 get_next();
-	infinity_figure& get_figure_by_order(u8 order_added);
-	u8 derive_figure_position(u8 position);
-
-	u32 random_a = 0;
-	u32 random_b = 0;
-	u32 random_c = 0;
-	u32 random_d = 0;
-
-	u8 m_figure_order = 0;
-	std::queue<std::array<u8, 32>> m_figure_added_removed_responses;
-};
-
-extern infinity_base g_infinitybase;
-
-class usb_device_infinity : public usb_device_emulated
-{
-public:
-	usb_device_infinity(const std::array<u8, 7>& location);
-	~usb_device_infinity();
-
-	static std::shared_ptr<usb_device> make_instance(u32 controller_index, const std::array<u8, 7>& location);
-	static u16 get_num_emu_devices();
-
-	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
-	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-
-protected:
-	std::queue<std::array<u8, 32>> m_queries;
-};
diff --git a/rpcs3/Emu/Io/Keyboard.h b/rpcs3/Emu/Io/Keyboard.h
index e53595d16b..ac54e7fdd2 100644
--- a/rpcs3/Emu/Io/Keyboard.h
+++ b/rpcs3/Emu/Io/Keyboard.h
@@ -206,5 +206,3 @@ enum CellKbMappingType : s32
 	CELL_KB_MAPPING_PORTUGUESE_BRAZIL        = 23,
 	CELL_KB_MAPPING_TURKISH_TURKEY           = 24
 };
-
-u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode);
diff --git a/rpcs3/Emu/Io/KeyboardHandler.cpp b/rpcs3/Emu/Io/KeyboardHandler.cpp
index 05ef6ef526..add28a1911 100644
--- a/rpcs3/Emu/Io/KeyboardHandler.cpp
+++ b/rpcs3/Emu/Io/KeyboardHandler.cpp
@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "KeyboardHandler.h"
-
-LOG_CHANNEL(input_log, "Input");
+#include "Utilities/StrUtil.h"
 
 template <>
 void fmt_class_string<CellKbMappingType>::format(std::string& out, u64 arg)
@@ -41,112 +40,40 @@ void fmt_class_string<CellKbMappingType>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
-void fmt_class_string<keyboard_consumer::identifier>::format(std::string& out, u64 arg)
+void KeyboardHandlerBase::Key(u32 code, bool pressed)
 {
-	format_enum(out, arg, [](keyboard_consumer::identifier value)
-	{
-		switch (value)
-		{
-		STR_CASE(keyboard_consumer::identifier::unknown);
-		STR_CASE(keyboard_consumer::identifier::overlays);
-		STR_CASE(keyboard_consumer::identifier::cellKb);
-		}
-
-		return unknown;
-	});
-}
-
-keyboard_consumer& KeyboardHandlerBase::AddConsumer(keyboard_consumer::identifier id, u32 max_connect)
-{
-	auto it = m_consumers.find(id);
-	if (it == m_consumers.end())
-	{
-		input_log.notice("Adding keyboard consumer with id %s.", id);
-		keyboard_consumer& consumer = m_consumers[id];
-		consumer = keyboard_consumer(id);
-		Init(consumer, max_connect);
-		return consumer;
-	}
-
-	return it->second;
-}
-
-keyboard_consumer& KeyboardHandlerBase::GetConsumer(keyboard_consumer::identifier id)
-{
-	auto it = m_consumers.find(id);
-	if (it == m_consumers.end())
-	{
-		fmt::throw_exception("No keyboard consumer with id %s", id);
-	}
-
-	return it->second;
-}
-
-void KeyboardHandlerBase::RemoveConsumer(keyboard_consumer::identifier id)
-{
-	auto it = m_consumers.find(id);
-	if (it != m_consumers.end())
-	{
-		input_log.notice("Removing keyboard consumer with id %s.", id);
-		m_consumers.erase(id);
-	}
-}
-
-bool KeyboardHandlerBase::HandleKey(u32 qt_code, u32 native_code, bool pressed, bool is_auto_repeat, const std::u32string& key)
-{
-	bool consumed = false;
+	// TODO: Key Repeat
 
 	std::lock_guard<std::mutex> lock(m_mutex);
 
-	for (auto& [id, consumer] : m_consumers)
-	{
-		consumed |= consumer.ConsumeKey(qt_code, native_code, pressed, is_auto_repeat, key);
-	}
-
-	return consumed;
-}
-
-bool keyboard_consumer::ConsumeKey(u32 qt_code, u32 native_code, bool pressed, bool is_auto_repeat, const std::u32string& key)
-{
-	bool consumed = false;
-
 	for (Keyboard& keyboard : m_keyboards)
 	{
-		if (is_auto_repeat && !keyboard.m_key_repeat)
-		{
-			continue;
-		}
-
-		consumed = true;
-
 		KbData& data = keyboard.m_data;
-		const KbConfig& config = keyboard.m_config;
+		KbConfig& config = keyboard.m_config;
 
-		if (auto it = keyboard.m_keys.find(qt_code); it != keyboard.m_keys.end())
+		for (const KbButton& button : keyboard.m_buttons)
 		{
-			KbButton& button = it->second;
-
-			const u32 out_key_code = get_out_key_code(qt_code, native_code, button.m_outKeyCode);
+			if (button.m_keyCode != code)
+				continue;
 
 			u16 kcode = CELL_KEYC_NO_EVENT;
-			bool is_meta_key = IsMetaKey(qt_code);
+			bool is_meta_key = IsMetaKey(code);
 
 			if (!is_meta_key)
 			{
 				if (config.code_type == CELL_KB_CODETYPE_RAW)
 				{
-					kcode = out_key_code;
+					kcode = button.m_outKeyCode;
 				}
 				else // config.code_type == CELL_KB_CODETYPE_ASCII
 				{
-					kcode = cellKbCnvRawCode(config.arrange, data.mkey, data.led, out_key_code);
+					kcode = cellKbCnvRawCode(config.arrange, data.mkey, data.led, button.m_outKeyCode);
 				}
 			}
 
 			if (pressed)
 			{
-				if (data.len == 1 && data.buttons[0].m_keyCode == CELL_KEYC_NO_EVENT)
+				if (data.len == 1 && data.keycode[0].first == CELL_KEYC_NO_EVENT)
 				{
 					data.len = 0;
 				}
@@ -154,33 +81,33 @@ bool keyboard_consumer::ConsumeKey(u32 qt_code, u32 native_code, bool pressed, b
 				// Meta Keys
 				if (is_meta_key)
 				{
-					data.mkey |= out_key_code;
+					data.mkey |= button.m_outKeyCode;
 
 					if (config.read_mode == CELL_KB_RMODE_INPUTCHAR)
 					{
-						data.buttons[0] = KbButton(CELL_KEYC_NO_EVENT, out_key_code, true);
+						data.keycode[0] = { CELL_KEYC_NO_EVENT, button.m_outKeyCode };
 					}
 					else
 					{
-						data.buttons[data.len % CELL_KB_MAX_KEYCODES] = KbButton(CELL_KEYC_NO_EVENT, out_key_code, true);
+						data.keycode[data.len % CELL_KB_MAX_KEYCODES] = { CELL_KEYC_NO_EVENT, button.m_outKeyCode };
 					}
 				}
 				else
 				{
 					// Led Keys
-					if (qt_code == Key_CapsLock)   data.led ^= CELL_KB_LED_CAPS_LOCK;
-					if (qt_code == Key_NumLock)    data.led ^= CELL_KB_LED_NUM_LOCK;
-					if (qt_code == Key_ScrollLock) data.led ^= CELL_KB_LED_SCROLL_LOCK;
-					// if (qt_code == Key_Kana_Lock) data.led ^= CELL_KB_LED_KANA;
-					// if (qt_code == ???) data.led ^= CELL_KB_LED_COMPOSE;
+					if (code == Key_CapsLock)   data.led ^= CELL_KB_LED_CAPS_LOCK;
+					if (code == Key_NumLock)    data.led ^= CELL_KB_LED_NUM_LOCK;
+					if (code == Key_ScrollLock) data.led ^= CELL_KB_LED_SCROLL_LOCK;
+					// if (code == Key_Kana_Lock) data.led ^= CELL_KB_LED_KANA;
+					// if (code == ???) data.led ^= CELL_KB_LED_COMPOSE;
 
 					if (config.read_mode == CELL_KB_RMODE_INPUTCHAR)
 					{
-						data.buttons[0] = KbButton(kcode, out_key_code, true);
+						data.keycode[0] = { kcode, 0 };
 					}
 					else
 					{
-						data.buttons[data.len % CELL_KB_MAX_KEYCODES] = KbButton(kcode, out_key_code, true);
+						data.keycode[data.len % CELL_KB_MAX_KEYCODES] = { kcode, 0 };
 					}
 				}
 
@@ -191,13 +118,13 @@ bool keyboard_consumer::ConsumeKey(u32 qt_code, u32 native_code, bool pressed, b
 				// Meta Keys
 				if (is_meta_key)
 				{
-					data.mkey &= ~out_key_code;
+					data.mkey &= ~button.m_outKeyCode;
 				}
 
 				// Needed to indicate key releases. Without this you have to tap another key before using the same key again
 				if (config.read_mode == CELL_KB_RMODE_INPUTCHAR)
 				{
-					data.buttons[0] = KbButton(CELL_KEYC_NO_EVENT, out_key_code, false);
+					data.keycode[0] = { CELL_KEYC_NO_EVENT, 0 };
 					data.len = 1;
 				}
 				else
@@ -206,7 +133,7 @@ bool keyboard_consumer::ConsumeKey(u32 qt_code, u32 native_code, bool pressed, b
 
 					for (s32 i = 0; i < data.len; i++)
 					{
-						if (data.buttons[i].m_keyCode == kcode && (!is_meta_key || data.buttons[i].m_outKeyCode == out_key_code))
+						if (data.keycode[i].first == kcode && (!is_meta_key || data.keycode[i].second == button.m_outKeyCode))
 						{
 							index = i;
 							break;
@@ -215,77 +142,34 @@ bool keyboard_consumer::ConsumeKey(u32 qt_code, u32 native_code, bool pressed, b
 
 					for (s32 i = index; i < data.len - 1; i++)
 					{
-						data.buttons[i] = data.buttons[i + 1];
+						data.keycode[i] = data.keycode[i + 1];
 					}
 
 					if (data.len <= 1)
 					{
-						data.buttons[0] = KbButton(CELL_KEYC_NO_EVENT, out_key_code, false);
+						data.keycode[0] = { CELL_KEYC_NO_EVENT, 0 };
 					}
 
 					data.len = std::max(1, data.len - 1);
 				}
 			}
 		}
-		else if (!key.empty())
-		{
-			if (pressed)
-			{
-				keyboard.m_extra_data.pressed_keys.insert(key);
-			}
-			else
-			{
-				keyboard.m_extra_data.pressed_keys.erase(key);
-			}
-		}
 	}
-
-	return consumed;
 }
 
-bool keyboard_consumer::IsMetaKey(u32 code)
+bool KeyboardHandlerBase::IsMetaKey(u32 code)
 {
 	return code == Key_Control
 		|| code == Key_Shift
 		|| code == Key_Alt
-		|| code == Key_Meta
 		|| code == Key_Super_L
 		|| code == Key_Super_R;
 }
 
-u32 keyboard_consumer::get_out_key_code(u32 qt_code, u32 native_code, u32 out_key_code)
-{
-	// Parse native key codes to differentiate between left and right keys. (Qt sometimes really sucks)
-	// NOTE: Qt throws a Ctrl key at us when using Alt Gr first, so right Alt does not work at the moment
-	switch (qt_code)
-	{
-	case Key_Control:
-		return native_code == native_key::ctrl_l ? CELL_KB_MKEY_L_CTRL : CELL_KB_MKEY_R_CTRL;
-	case Key_Shift:
-		return native_code == native_key::shift_l ? CELL_KB_MKEY_L_SHIFT : CELL_KB_MKEY_R_SHIFT;
-	case Key_Alt:
-		return native_code == native_key::alt_l ? CELL_KB_MKEY_L_ALT : CELL_KB_MKEY_R_ALT;
-	case Key_Meta:
-		return native_code == native_key::meta_l ? CELL_KB_MKEY_L_WIN : CELL_KB_MKEY_R_WIN;
-	default:
-		break;
-	}
-
-	return out_key_code;
-}
-
 void KeyboardHandlerBase::SetIntercepted(bool intercepted)
 {
 	std::lock_guard<std::mutex> lock(m_mutex);
 
-	for (auto& [id, consumer] : m_consumers)
-	{
-		consumer.SetIntercepted(intercepted);
-	}
-}
-
-void keyboard_consumer::SetIntercepted(bool intercepted)
-{
 	m_info.info = intercepted ? CELL_KB_INFO_INTERCEPTED : 0;
 
 	if (intercepted)
@@ -295,9 +179,9 @@ void keyboard_consumer::SetIntercepted(bool intercepted)
 			keyboard.m_data.mkey = 0;
 			keyboard.m_data.len  = 0;
 
-			for (auto& button : keyboard.m_data.buttons)
+			for (auto& keycode : keyboard.m_data.keycode)
 			{
-				button.m_keyCode = CELL_KEYC_NO_EVENT;
+				keycode.first = CELL_KEYC_NO_EVENT;
 			}
 		}
 	}
@@ -305,51 +189,11 @@ void keyboard_consumer::SetIntercepted(bool intercepted)
 
 void KeyboardHandlerBase::ReleaseAllKeys()
 {
-	std::lock_guard<std::mutex> lock(m_mutex);
-
-	for (auto& [id, consumer] : m_consumers)
+	for (const Keyboard& keyboard : m_keyboards)
 	{
-		consumer.ReleaseAllKeys();
-	}
-
-	m_keys_released = true;
-}
-
-void keyboard_consumer::ReleaseAllKeys()
-{
-	for (Keyboard& keyboard : m_keyboards)
-	{
-		for (const auto& [key_code, button] : keyboard.m_keys)
+		for (const KbButton& button : keyboard.m_buttons)
 		{
-			switch (button.m_keyCode)
-			{
-			case Key_Control:
-				ConsumeKey(button.m_keyCode, native_key::ctrl_l, false, false, {});
-				ConsumeKey(button.m_keyCode, native_key::ctrl_r, false, false, {});
-				break;
-			case Key_Shift:
-				ConsumeKey(button.m_keyCode, native_key::shift_l, false, false, {});
-				ConsumeKey(button.m_keyCode, native_key::shift_r, false, false, {});
-				break;
-			case Key_Alt:
-				ConsumeKey(button.m_keyCode, native_key::alt_l, false, false, {});
-				ConsumeKey(button.m_keyCode, native_key::alt_r, false, false, {});
-				break;
-			case Key_Meta:
-				ConsumeKey(button.m_keyCode, native_key::meta_l, false, false, {});
-				ConsumeKey(button.m_keyCode, native_key::meta_r, false, false, {});
-				break;
-			default:
-				ConsumeKey(button.m_keyCode, 0, false, false, {});
-				break;
-			}
+			Key(button.m_keyCode, false);
 		}
-
-		for (const std::u32string& key : keyboard.m_extra_data.pressed_keys)
-		{
-			ConsumeKey(CELL_KEYC_NO_EVENT, 0, false, false, key);
-		}
-
-		keyboard.m_extra_data.pressed_keys.clear();
 	}
 }
diff --git a/rpcs3/Emu/Io/KeyboardHandler.h b/rpcs3/Emu/Io/KeyboardHandler.h
index 594f7be3f8..8538be319b 100644
--- a/rpcs3/Emu/Io/KeyboardHandler.h
+++ b/rpcs3/Emu/Io/KeyboardHandler.h
@@ -4,11 +4,11 @@
 
 #include <mutex>
 #include <vector>
-#include <set>
-#include <unordered_map>
 
 #include "util/init_mutex.hpp"
 
+extern u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode); // (TODO: Can it be problematic to place SysCalls in middle of nowhere?)
+
 enum QtKeys
 {
 	Key_Shift      = 0x01000020,
@@ -22,125 +22,66 @@ enum QtKeys
 	Key_Super_R    = 0x01000054
 };
 
-// See https://developer.mozilla.org/en-US/docs/Web/API/UI_Events/Keyboard_event_code_values
-enum native_key : u32
-{
-#ifdef _WIN32
-	ctrl_l = 0x001D,
-	ctrl_r = 0xE01D,
-	shift_l = 0x002A,
-	shift_r = 0x0036,
-	alt_l = 0x0038,
-	alt_r = 0xE038,
-	meta_l = 0xE05B,
-	meta_r = 0xE05C,
-#elif defined (__APPLE__)
-	ctrl_l = 0x3B,  // kVK_Control
-	ctrl_r = 0x3E,  // kVK_RightControl
-	shift_l = 0x38, // kVK_Shift
-	shift_r = 0x3C, // kVK_RightShift
-	alt_l = 0x3A,   // kVK_Option
-	alt_r = 0x3D,   // kVK_RightOption
-	meta_l = 0x37,  // kVK_Command
-	meta_r = 0x36,  // kVK_RightCommand
-#else
-	ctrl_l = 0x0025,
-	ctrl_r = 0x0069,
-	shift_l = 0x0032,
-	shift_r = 0x003E,
-	alt_l = 0x0040,
-	alt_r = 0x006C,
-	meta_l = 0x0085,
-	meta_r = 0x0086,
-#endif
-};
-
 struct KbInfo
 {
-	u32 max_connect = 0;
-	u32 now_connect = 0;
-	u32 info = 0;
-	bool is_null_handler = false;
-	std::array<u8, CELL_KB_MAX_KEYBOARDS> status{};
-};
-
-struct KbButton
-{
-	u32 m_keyCode = 0;
-	u32 m_outKeyCode = 0;
-	bool m_pressed = false;
-
-	KbButton() = default;
-	KbButton(u32 keyCode, u32 outKeyCode, bool pressed = false)
-		: m_keyCode(keyCode)
-		, m_outKeyCode(outKeyCode)
-		, m_pressed(pressed)
-	{
-	}
+	u32 max_connect;
+	u32 now_connect;
+	u32 info;
+	u8 status[CELL_KB_MAX_KEYBOARDS];
 };
 
 struct KbData
 {
-	u32 led = 0;  // Active led lights     TODO: Set initial state of led
-	u32 mkey = 0; // Active key modifiers
-	s32 len = 0;  // Number of key codes (0 means no data available)
-	std::array<KbButton, CELL_KB_MAX_KEYCODES> buttons{};
-};
+	u32 led;  // Active led lights
+	u32 mkey; // Active key modifiers
+	s32 len;  // Number of key codes (0 means no data available)
+	std::pair<u16, u32> keycode[CELL_KB_MAX_KEYCODES];
 
-struct KbExtraData
-{
-	std::set<std::u32string> pressed_keys{};
+	KbData()
+		: led(0)
+		, mkey(0)
+		, len(0)
+	{ // (TODO: Set initial state of led)
+	}
 };
 
 struct KbConfig
 {
-	u32 arrange = CELL_KB_MAPPING_101;
-	u32 read_mode = CELL_KB_RMODE_INPUTCHAR;
-	u32 code_type = CELL_KB_CODETYPE_ASCII;
+	u32 arrange;
+	u32 read_mode;
+	u32 code_type;
+
+	KbConfig()
+		: arrange(CELL_KB_MAPPING_101)
+		, read_mode(CELL_KB_RMODE_INPUTCHAR)
+		, code_type(CELL_KB_CODETYPE_ASCII)
+	{
+	}
+};
+
+struct KbButton
+{
+	u32 m_keyCode;
+	u32 m_outKeyCode;
+	bool m_pressed = false;
+
+	KbButton(u32 keyCode, u32 outKeyCode)
+		: m_keyCode(keyCode)
+		, m_outKeyCode(outKeyCode)
+	{
+	}
 };
 
 struct Keyboard
 {
-	bool m_key_repeat = false;
-	KbData m_data{};
-	KbExtraData m_extra_data{};
-	KbConfig m_config{};
-	std::unordered_map<u32, KbButton> m_keys;
-};
+	bool m_key_repeat = false; // for future use
+	KbData m_data;
+	KbConfig m_config;
+	std::vector<KbButton> m_buttons;
 
-class keyboard_consumer
-{
-public:
-	enum class identifier
+	Keyboard()
 	{
-		unknown,
-		overlays,
-		cellKb,
-	};
-
-	keyboard_consumer() {}
-	keyboard_consumer(identifier id) : m_id(id) {}
-
-	bool ConsumeKey(u32 qt_code, u32 native_code, bool pressed, bool is_auto_repeat, const std::u32string& key);
-	void SetIntercepted(bool intercepted);
-
-	static bool IsMetaKey(u32 code);
-
-	KbInfo& GetInfo() { return m_info; }
-	std::vector<Keyboard>& GetKeyboards() { return m_keyboards; }
-	KbData& GetData(const u32 keyboard) { return m_keyboards[keyboard].m_data; }
-	KbExtraData& GetExtraData(const u32 keyboard) { return m_keyboards[keyboard].m_extra_data; }
-	KbConfig& GetConfig(const u32 keyboard) { return m_keyboards[keyboard].m_config; }
-	identifier id() const { return m_id; }
-
-	void ReleaseAllKeys();
-
-protected:
-	u32 get_out_key_code(u32 qt_code, u32 native_code, u32 out_key_code);
-
-	identifier m_id = identifier::unknown;
-	KbInfo m_info{};
-	std::vector<Keyboard> m_keyboards;
+	}
 };
 
 class KeyboardHandlerBase
@@ -148,27 +89,26 @@ class KeyboardHandlerBase
 public:
 	std::mutex m_mutex;
 
-	virtual void Init(keyboard_consumer& consumer, const u32 max_connect) = 0;
+	virtual void Init(const u32 max_connect) = 0;
 
 	virtual ~KeyboardHandlerBase() = default;
-	KeyboardHandlerBase(utils::serial* ar);
-	KeyboardHandlerBase(utils::serial& ar) : KeyboardHandlerBase(&ar) {}
-	void save(utils::serial& ar);
 
-	SAVESTATE_INIT_POS(19);
-
-	keyboard_consumer& AddConsumer(keyboard_consumer::identifier id, u32 max_connect);
-	keyboard_consumer& GetConsumer(keyboard_consumer::identifier id);
-	void RemoveConsumer(keyboard_consumer::identifier id);
-
-	bool HandleKey(u32 qt_code, u32 native_code, bool pressed, bool is_auto_repeat, const std::u32string& key);
+	void Key(u32 code, bool pressed);
 	void SetIntercepted(bool intercepted);
 
+	static bool IsMetaKey(u32 code);
+
+	KbInfo& GetInfo() { return m_info; }
+	std::vector<Keyboard>& GetKeyboards() { return m_keyboards; }
+	std::vector<KbButton>& GetButtons(const u32 keyboard) { return m_keyboards[keyboard].m_buttons; }
+	KbData& GetData(const u32 keyboard) { return m_keyboards[keyboard].m_data; }
+	KbConfig& GetConfig(const u32 keyboard) { return m_keyboards[keyboard].m_config; }
+
 	stx::init_mutex init;
 
 protected:
 	void ReleaseAllKeys();
 
-	bool m_keys_released = false;
-	std::unordered_map<keyboard_consumer::identifier, keyboard_consumer> m_consumers;
+	KbInfo m_info;
+	std::vector<Keyboard> m_keyboards;
 };
diff --git a/rpcs3/Emu/Io/LogitechG27.cpp b/rpcs3/Emu/Io/LogitechG27.cpp
deleted file mode 100644
index 5503c606fc..0000000000
--- a/rpcs3/Emu/Io/LogitechG27.cpp
+++ /dev/null
@@ -1,1574 +0,0 @@
-// Logitech G27
-
-// ffb ref
-// https://opensource.logitech.com/wiki/force_feedback/Logitech_Force_Feedback_Protocol_V1.6.pdf
-// https://github.com/mathijsvandenberg/g29emu/files/14395098/Logitech_Force_Feedback_Protocol_V1.6.pdf
-
-// shifter input ref
-// https://github.com/sonik-br/lgff_wheel_adapter/blob/d97f7823154818e1b3edff6d51498a122c302728/pico_lgff_wheel_adapter/reports.h#L265-L310
-
-#include "stdafx.h"
-
-#ifdef HAVE_SDL3
-
-#include "LogitechG27.h"
-#include "Emu/Cell/lv2/sys_usbd.h"
-#include "Emu/system_config.h"
-#include "Input/pad_thread.h"
-#include "Input/sdl_instance.h"
-
-LOG_CHANNEL(logitech_g27_log, "LOGIG27");
-
-// ref: https://github.com/libsdl-org/SDL/issues/7941, need to use SDL_HAPTIC_STEERING_AXIS for some windows drivers
-static const SDL_HapticDirection STEERING_DIRECTION =
-{
-	.type = SDL_HAPTIC_STEERING_AXIS,
-	.dir = {0, 0, 0}
-};
-
-usb_device_logitech_g27::usb_device_logitech_g27(u32 controller_index, const std::array<u8, 7>& location)
-	: usb_device_emulated(location), m_controller_index(controller_index)
-{
-	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x0200, 0, 0, 0, 16, 0x046d, 0xc29b, 0x1350, 1, 2, 0, 1});
-
-	// parse the raw response like with passthrough device
-	static constexpr u8 raw_config[] = {0x9, 0x2, 0x29, 0x0, 0x1, 0x1, 0x4, 0x80, 0x31, 0x9, 0x4, 0x0, 0x0, 0x2, 0x3, 0x0, 0x0, 0x0, 0x9, 0x21, 0x11, 0x1, 0x21, 0x1, 0x22, 0x85, 0x0, 0x7, 0x5, 0x81, 0x3, 0x10, 0x0, 0x2, 0x7, 0x5, 0x1, 0x3, 0x10, 0x0, 0x2};
-	auto& conf = device.add_node(UsbDescriptorNode(raw_config[0], raw_config[1], &raw_config[2]));
-	for (unsigned int index = raw_config[0]; index < sizeof(raw_config);)
-	{
-		conf.add_node(UsbDescriptorNode(raw_config[index], raw_config[index + 1], &raw_config[index + 2]));
-		index += raw_config[index];
-	}
-
-	m_default_spring_effect.type = SDL_HAPTIC_SPRING;
-	m_default_spring_effect.condition.direction = STEERING_DIRECTION;
-	m_default_spring_effect.condition.length = SDL_HAPTIC_INFINITY;
-	for (int i = 0; i < 1 /*3*/; i++)
-	{
-		m_default_spring_effect.condition.right_sat[i] = 0x7FFF;
-		m_default_spring_effect.condition.left_sat[i] = 0x7FFF;
-		m_default_spring_effect.condition.right_coeff[i] = 0x7FFF;
-		m_default_spring_effect.condition.left_coeff[i] = 0x7FFF;
-	}
-
-	g_cfg_logitech_g27.load();
-
-	m_enabled = g_cfg_logitech_g27.enabled.get() && sdl_instance::get_instance().initialize();
-
-	if (!m_enabled)
-		return;
-
-	m_house_keeping_thread = std::make_unique<named_thread<std::function<void()>>>("Logitech G27", [this]()
-	{
-		while (thread_ctrl::state() != thread_state::aborting)
-		{
-			sdl_refresh();
-			thread_ctrl::wait_for(5'000'000);
-		}
-	});
-}
-
-bool usb_device_logitech_g27::open_device()
-{
-	return m_enabled;
-}
-
-static void clear_sdl_joysticks(std::map<u64, std::vector<SDL_Joystick*>>& joystick_map)
-{
-	for (auto& [type, joysticks] : joystick_map)
-	{
-		for (SDL_Joystick* joystick : joysticks)
-		{
-			if (joystick)
-				SDL_CloseJoystick(joystick);
-		}
-	}
-	joystick_map.clear();
-}
-
-usb_device_logitech_g27::~usb_device_logitech_g27()
-{
-	// Wait for the house keeping thread to finish
-	m_house_keeping_thread.reset();
-
-	// Close sdl handles
-	{
-		const std::lock_guard lock(m_sdl_handles_mutex);
-		if (m_haptic_handle)
-		{
-			SDL_CloseHaptic(m_haptic_handle);
-			m_haptic_handle = nullptr;
-		}
-		clear_sdl_joysticks(m_joysticks);
-	}
-}
-
-std::shared_ptr<usb_device> usb_device_logitech_g27::make_instance(u32 controller_index, const std::array<u8, 7>& location)
-{
-	return std::make_shared<usb_device_logitech_g27>(controller_index, location);
-}
-
-u16 usb_device_logitech_g27::get_num_emu_devices()
-{
-	return 1;
-}
-
-void usb_device_logitech_g27::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
-{
-	logitech_g27_log.todo("control transfer bmRequestType %02x, bRequest %02x, wValue %04x, wIndex %04x, wLength %04x, %s", bmRequestType, bRequest, wValue, wIndex, wLength, fmt::buf_to_hexstring(buf, buf_size));
-
-	usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
-}
-
-static bool sdl_joysticks_equal(std::map<u64, std::vector<SDL_Joystick*>>& left, std::map<u64, std::vector<SDL_Joystick*>>& right)
-{
-	if (left.size() != right.size())
-	{
-		return false;
-	}
-	for (const auto& [left_type, left_joysticks] : left)
-	{
-		const auto right_joysticks = right.find(left_type);
-		if (right_joysticks == right.cend())
-		{
-			return false;
-		}
-		if (left_joysticks.size() != right_joysticks->second.size())
-		{
-			return false;
-		}
-		for (const SDL_Joystick* left_joystick : left_joysticks)
-		{
-			if (std::none_of(right_joysticks->second.begin(), right_joysticks->second.end(), [left_joystick](const SDL_Joystick* right_joystick)
-				{
-					return left_joystick == right_joystick;
-				}))
-			{
-				return false;
-			}
-		}
-	}
-	return true;
-}
-
-static inline logitech_g27_sdl_mapping get_runtime_mapping()
-{
-	logitech_g27_sdl_mapping mapping {};
-
-	const auto convert_mapping = [](const emulated_logitech_g27_mapping& cfg, sdl_mapping& mapping)
-	{
-		mapping.device_type_id = cfg.device_type_id.get();
-		mapping.type = cfg.type.get();
-		mapping.id = cfg.id.get();
-		mapping.hat = cfg.hat.get();
-		mapping.reverse = cfg.reverse.get();
-		mapping.positive_axis = false;
-	};
-
-	const auto& cfg = g_cfg_logitech_g27;
-
-	convert_mapping(cfg.steering, mapping.steering);
-	convert_mapping(cfg.throttle, mapping.throttle);
-	convert_mapping(cfg.brake, mapping.brake);
-	convert_mapping(cfg.clutch, mapping.clutch);
-	convert_mapping(cfg.shift_up, mapping.shift_up);
-	convert_mapping(cfg.shift_down, mapping.shift_down);
-
-	convert_mapping(cfg.up, mapping.up);
-	convert_mapping(cfg.down, mapping.down);
-	convert_mapping(cfg.left, mapping.left);
-	convert_mapping(cfg.right, mapping.right);
-
-	convert_mapping(cfg.triangle, mapping.triangle);
-	convert_mapping(cfg.cross, mapping.cross);
-	convert_mapping(cfg.square, mapping.square);
-	convert_mapping(cfg.circle, mapping.circle);
-
-	convert_mapping(cfg.l2, mapping.l2);
-	convert_mapping(cfg.l3, mapping.l3);
-	convert_mapping(cfg.r2, mapping.r2);
-	convert_mapping(cfg.r3, mapping.r3);
-
-	convert_mapping(cfg.plus, mapping.plus);
-	convert_mapping(cfg.minus, mapping.minus);
-
-	convert_mapping(cfg.dial_clockwise, mapping.dial_clockwise);
-	convert_mapping(cfg.dial_anticlockwise, mapping.dial_anticlockwise);
-
-	convert_mapping(cfg.select, mapping.select);
-	convert_mapping(cfg.pause, mapping.pause);
-
-	convert_mapping(cfg.shifter_1, mapping.shifter_1);
-	convert_mapping(cfg.shifter_2, mapping.shifter_2);
-	convert_mapping(cfg.shifter_3, mapping.shifter_3);
-	convert_mapping(cfg.shifter_4, mapping.shifter_4);
-	convert_mapping(cfg.shifter_5, mapping.shifter_5);
-	convert_mapping(cfg.shifter_6, mapping.shifter_6);
-	convert_mapping(cfg.shifter_r, mapping.shifter_r);
-	convert_mapping(cfg.shifter_press, mapping.shifter_press);
-
-	return mapping;
-}
-
-void usb_device_logitech_g27::sdl_refresh()
-{
-	std::unique_lock lock(g_cfg_logitech_g27.m_mutex);
-
-	m_mapping = get_runtime_mapping();
-
-	m_reverse_effects = g_cfg_logitech_g27.reverse_effects.get();
-
-	const u64 ffb_device_type_id = g_cfg_logitech_g27.ffb_device_type_id.get();
-	const u64 led_device_type_id = g_cfg_logitech_g27.led_device_type_id.get();
-
-	lock.unlock();
-
-	SDL_Joystick* new_led_joystick_handle = nullptr;
-	SDL_Haptic* new_haptic_handle = nullptr;
-	std::map<u64, std::vector<SDL_Joystick*>> new_joysticks;
-
-	int joystick_count = 0;
-	if (SDL_JoystickID* joystick_ids = SDL_GetJoysticks(&joystick_count))
-	{
-		for (int i = 0; i < joystick_count; i++)
-		{
-			SDL_Joystick* cur_joystick = SDL_OpenJoystick(joystick_ids[i]);
-			if (!cur_joystick)
-			{
-				logitech_g27_log.error("Failed opening joystick %d, %s", joystick_ids[i], SDL_GetError());
-				continue;
-			}
-			const u16 cur_vendor_id = SDL_GetJoystickVendor(cur_joystick);
-			const u16 cur_product_id = SDL_GetJoystickProduct(cur_joystick);
-			const emulated_g27_device_type_id joystick_type_id_struct =
-			{
-				.product_id = static_cast<u64>(cur_product_id),
-				.vendor_id = static_cast<u64>(cur_vendor_id),
-				.num_axes = static_cast<u64>(SDL_GetNumJoystickAxes(cur_joystick)),
-				.num_hats = static_cast<u64>(SDL_GetNumJoystickHats(cur_joystick)),
-				.num_buttons = static_cast<u64>(SDL_GetNumJoystickButtons(cur_joystick))
-			};
-			const u64 joystick_type_id = joystick_type_id_struct.as_u64();
-			auto joysticks_of_type = new_joysticks.find(joystick_type_id);
-			if (joysticks_of_type == new_joysticks.end())
-			{
-				new_joysticks[joystick_type_id] = { cur_joystick };
-			}
-			else
-			{
-				joysticks_of_type->second.push_back(cur_joystick);
-			}
-
-			if (joystick_type_id == ffb_device_type_id && new_haptic_handle == nullptr)
-			{
-				SDL_Haptic* cur_haptic = SDL_OpenHapticFromJoystick(cur_joystick);
-				if (cur_haptic == nullptr)
-				{
-					logitech_g27_log.error("Failed opening haptic device from selected ffb device %04x:%04x, %s", cur_vendor_id, cur_product_id, SDL_GetError());
-				}
-				else
-				{
-					new_haptic_handle = cur_haptic;
-				}
-			}
-
-			if (joystick_type_id == led_device_type_id && new_led_joystick_handle == nullptr)
-			{
-				new_led_joystick_handle = cur_joystick;
-			}
-		}
-		SDL_free(joystick_ids);
-	}
-	else
-	{
-		logitech_g27_log.error("Failed fetching joystick list, %s", SDL_GetError());
-	}
-
-	const bool joysticks_changed = !sdl_joysticks_equal(m_joysticks, new_joysticks);
-	const bool haptic_changed = m_haptic_handle != new_haptic_handle;
-	const bool led_joystick_changed = m_led_joystick_handle != new_led_joystick_handle;
-
-	// if we should touch the mutex
-	if (joysticks_changed || haptic_changed || led_joystick_changed)
-	{
-		const std::lock_guard<std::mutex> lock(m_sdl_handles_mutex);
-		if (haptic_changed)
-		{
-			if (m_haptic_handle)
-			{
-				SDL_CloseHaptic(m_haptic_handle);
-				m_haptic_handle = nullptr;
-			}
-			// reset effects if the ffb device is changed
-			for (logitech_g27_ffb_slot& slot : m_effect_slots)
-			{
-				slot.effect_id = -1;
-			}
-			m_default_spring_effect_id = -1;
-			m_haptic_handle = new_haptic_handle;
-		}
-		if (led_joystick_changed)
-		{
-			SDL_SetJoystickLED(m_led_joystick_handle, 0, 0, 0);
-			m_led_joystick_handle = new_led_joystick_handle;
-		}
-		if (joysticks_changed)
-		{
-			// finally clear out previous joystick handles
-			clear_sdl_joysticks(m_joysticks);
-			m_joysticks = new_joysticks;
-		}
-	}
-
-	if (!joysticks_changed)
-	{
-		clear_sdl_joysticks(new_joysticks);
-	}
-
-	if (!haptic_changed)
-	{
-		if (new_haptic_handle)
-			SDL_CloseHaptic(new_haptic_handle);
-	}
-}
-
-static inline s16 logitech_g27_force_to_level(u8 force, bool reverse = false)
-{
-	/*
-	 * Wheel documentation:
-	 * level 0, maximum clock wise force
-	 * level 127-128, no force
-	 * level 255, maximum anticlockwise force
-	 */
-
-	if (force == 127 || force == 128)
-	{
-		return 0;
-	}
-
-	const s16 subtrahend = force > 128 ? 128 : 127;
-	s16 converted = ((force - subtrahend) * 0x7FFF) / 127;
-
-	if (reverse)
-		converted *= -1;
-
-	return converted;
-}
-
-static inline s16 logitech_g27_position_to_center(u8 left, u8 right)
-{
-	const u16 center_unsigned = (((right + left) * 0xFFFF) / 255) / 2;
-	return center_unsigned - 0x8000;
-}
-
-static inline s16 logitech_g27_high_resolution_position_to_center(u16 left, u16 right)
-{
-	const u16 center_unsigned = (((right + left) * 0xFFFF) / (0xFFFF >> 5)) / 2;
-	return center_unsigned - 0x8000;
-}
-
-static inline u16 logitech_g27_position_to_width(u8 left, u8 right)
-{
-	return ((right - left) * 0xFFFF) / 255;
-}
-
-static inline u16 logitech_g27_high_resolution_position_to_width(u16 left, u16 right)
-{
-	return ((right - left) * 0xFFFF) / (0xFFFF >> 5);
-}
-
-static inline s16 logitech_g27_coeff_to_coeff(u8 coeff, u8 invert)
-{
-	if (!invert)
-	{
-		return (coeff * 0x7FFF) / 7;
-	}
-	return (coeff * 0x7FFF * -1) / 7;
-}
-
-static inline s16 logitech_g27_high_resolution_coeff_to_coeff(u8 coeff, u8 invert)
-{
-	if (!invert)
-	{
-		return (coeff * 0x7FFF) / 15;
-	}
-	return (coeff * 0x7FFF * -1) / 15;
-}
-
-static inline s16 logitech_g27_friction_coeff_to_coeff(u8 coeff, u8 invert)
-{
-	if (!invert)
-	{
-		return (coeff * 0x7FFF) / 255;
-	}
-	return (coeff * 0x7FFF * -1) / 255;
-}
-
-static inline s16 logitech_g27_clip_to_saturation(u8 clip)
-{
-	return (clip * 0x7FFF) / 255;
-}
-
-static inline s16 logitech_g27_amplitude_to_magnitude(u8 amplitude)
-{
-	return ((amplitude * 0x7FFF) / 2) / 255;
-}
-
-static inline u16 logitech_g27_loops_to_ms(u16 loops, bool afap)
-{
-	if (afap)
-	{
-		return loops;
-	}
-	return loops * 2;
-}
-
-extern bool is_input_allowed();
-
-static u8 sdl_hat_to_logitech_g27_hat(u8 sdl_hat)
-{
-	switch (sdl_hat)
-	{
-	case SDL_HAT_CENTERED:
-		return 8;
-	case SDL_HAT_UP:
-		return 0;
-	case SDL_HAT_RIGHTUP:
-		return 1;
-	case SDL_HAT_RIGHT:
-		return 2;
-	case SDL_HAT_RIGHTDOWN:
-		return 3;
-	case SDL_HAT_DOWN:
-		return 4;
-	case SDL_HAT_LEFTDOWN:
-		return 5;
-	case SDL_HAT_LEFT:
-		return 6;
-	case SDL_HAT_LEFTUP:
-		return 7;
-	default:
-		break;
-	}
-	return 0;
-}
-
-static u8 hat_components_to_logitech_g27_hat(bool up, bool down, bool left, bool right)
-{
-	u8 sdl_hat = 0;
-	if (up)
-		sdl_hat |= SDL_HAT_UP;
-	if (down)
-		sdl_hat |= SDL_HAT_DOWN;
-	if (left)
-		sdl_hat |= SDL_HAT_LEFT;
-	if (right)
-		sdl_hat |= SDL_HAT_RIGHT;
-	return sdl_hat_to_logitech_g27_hat(sdl_hat);
-}
-
-static bool fetch_sdl_as_button(SDL_Joystick* joystick, const sdl_mapping& mapping)
-{
-	switch (mapping.type)
-	{
-	case sdl_mapping_type::button:
-	{
-		const bool pressed = SDL_GetJoystickButton(joystick, static_cast<s32>(mapping.id));
-		return mapping.reverse ? !pressed : pressed;
-	}
-	case sdl_mapping_type::hat:
-	{
-		const u8 hat_value = SDL_GetJoystickHat(joystick, static_cast<s32>(mapping.id));
-		bool pressed = false;
-		switch (mapping.hat)
-		{
-		case hat_component::up:
-			pressed = (hat_value & SDL_HAT_UP) ? true : false;
-			break;
-		case hat_component::down:
-			pressed = (hat_value & SDL_HAT_DOWN) ? true : false;
-			break;
-		case hat_component::left:
-			pressed = (hat_value & SDL_HAT_LEFT) ? true : false;
-			break;
-		case hat_component::right:
-			pressed = (hat_value & SDL_HAT_RIGHT) ? true : false;
-			break;
-		case hat_component::none:
-			break;
-		}
-		return mapping.reverse ? !pressed : pressed;
-	}
-	case sdl_mapping_type::axis:
-	{
-		const s32 axis_value = SDL_GetJoystickAxis(joystick, static_cast<s32>(mapping.id));
-		bool pressed = false;
-		if (mapping.positive_axis)
-		{
-			pressed = axis_value > (0x7FFF / 2);
-		}
-		else
-		{
-			pressed = axis_value < (0x7FFF / (-2));
-		}
-		return mapping.reverse ? !pressed : pressed;
-	}
-	}
-	return false;
-}
-
-static s16 fetch_sdl_as_axis(SDL_Joystick* joystick, const sdl_mapping& mapping)
-{
-	constexpr s16 MAX = 0x7FFF;
-	constexpr s16 MIN = -0x8000;
-	constexpr s16 MID = 0;
-
-	switch (mapping.type)
-	{
-	case sdl_mapping_type::button:
-	{
-		bool pressed = SDL_GetJoystickButton(joystick, static_cast<s32>(mapping.id));
-		if (mapping.reverse)
-		{
-			pressed = !pressed;
-		}
-		return pressed ? (mapping.positive_axis ? MAX : MIN) : MID;
-	}
-	case sdl_mapping_type::hat:
-	{
-		const u8 hat_value = SDL_GetJoystickHat(joystick, static_cast<s32>(mapping.id));
-		bool pressed = false;
-		switch (mapping.hat)
-		{
-		case hat_component::up:
-			pressed = (hat_value & SDL_HAT_UP) ? true : false;
-			break;
-		case hat_component::down:
-			pressed = (hat_value & SDL_HAT_DOWN) ? true : false;
-			break;
-		case hat_component::left:
-			pressed = (hat_value & SDL_HAT_LEFT) ? true : false;
-			break;
-		case hat_component::right:
-			pressed = (hat_value & SDL_HAT_RIGHT) ? true : false;
-			break;
-		case hat_component::none:
-			break;
-		}
-		if (mapping.reverse)
-		{
-			pressed = !pressed;
-		}
-		return pressed ? (mapping.positive_axis ? MAX : MIN) : MID;
-	}
-	case sdl_mapping_type::axis:
-	{
-		s32 axis_value = SDL_GetJoystickAxis(joystick, static_cast<s32>(mapping.id));
-		if (mapping.reverse)
-			axis_value *= -1;
-		if (axis_value == (MIN + 1))
-			axis_value = MIN;
-		return std::clamp<s32>(axis_value, MIN, MAX);
-	}
-	}
-	return 0;
-}
-
-static s16 fetch_sdl_axis_avg(std::map<u64, std::vector<SDL_Joystick*>>& joysticks, const sdl_mapping& mapping)
-{
-	constexpr s16 MAX = 0x7FFF;
-	constexpr s16 MIN = -0x8000;
-
-	auto joysticks_of_type = joysticks.find(mapping.device_type_id);
-	if (joysticks_of_type == joysticks.end())
-	{
-		return mapping.reverse ? MAX : MIN;
-	}
-
-	if (joysticks_of_type->second.empty())
-	{
-		return mapping.reverse ? MAX : MIN;
-	}
-
-	// TODO account for deadzone and only pick up active devices
-	s32 sdl_joysticks_total_value = 0;
-	for (SDL_Joystick* joystick : joysticks_of_type->second)
-	{
-		sdl_joysticks_total_value += fetch_sdl_as_axis(joystick, mapping);
-	}
-
-	return std::clamp<s16>(sdl_joysticks_total_value / static_cast<s32>(joysticks_of_type->second.size()), MIN, MAX);
-}
-
-static bool sdl_to_logitech_g27_button(std::map<u64, std::vector<SDL_Joystick*>>& joysticks, const sdl_mapping& mapping)
-{
-	auto joysticks_of_type = joysticks.find(mapping.device_type_id);
-	if (joysticks_of_type == joysticks.end())
-	{
-		return mapping.reverse;
-	}
-
-	if (joysticks_of_type->second.empty())
-	{
-		return mapping.reverse;
-	}
-
-	bool pressed = false;
-	for (SDL_Joystick* joystick : joysticks_of_type->second)
-	{
-		pressed |= fetch_sdl_as_button(joystick, mapping);
-	}
-	return pressed;
-}
-
-static u16 sdl_to_logitech_g27_steering(std::map<u64, std::vector<SDL_Joystick*>>& joysticks, const sdl_mapping& mapping)
-{
-	const s16 avg = fetch_sdl_axis_avg(joysticks, mapping);
-	const u16 unsigned_avg = avg + 0x8000;
-	return unsigned_avg * (0xFFFF >> 2) / 0xFFFF;
-}
-
-static u8 sdl_to_logitech_g27_pedal(std::map<u64, std::vector<SDL_Joystick*>>& joysticks, const sdl_mapping& mapping)
-{
-	const s16 avg = fetch_sdl_axis_avg(joysticks, mapping);
-	const u16 unsigned_avg = avg + 0x8000;
-	return unsigned_avg * 0xFF / 0xFFFF;
-}
-
-static inline void set_bit(u8* buf, int bit_num, bool set)
-{
-	const int byte_num = bit_num / 8;
-	bit_num %= 8;
-	const u8 mask = 1 << bit_num;
-	if (set)
-		buf[byte_num] = buf[byte_num] | mask;
-	else
-		buf[byte_num] = buf[byte_num] & (~mask);
-}
-
-void usb_device_logitech_g27::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer)
-{
-	transfer->fake = true;
-	transfer->expected_result = HC_CC_NOERR;
-	// G29 in G27 mode polls at 500 hz, let's try a delay of 1ms for now, for wheels that updates that fast
-	transfer->expected_time = get_timestamp() + 1000;
-
-	if (endpoint & (1 << 7))
-	{
-		if (buf_size < 11)
-		{
-			logitech_g27_log.error("Not populating input buffer with a buffer of the size of %u", buf_size);
-			return;
-		}
-
-		ensure(buf_size >= 11);
-		memset(buf, 0, buf_size);
-
-		transfer->expected_count = 11;
-
-		sdl_instance::get_instance().pump_events();
-
-		// Fetch input states from SDL
-		m_sdl_handles_mutex.lock();
-		const u16 steering = sdl_to_logitech_g27_steering(m_joysticks, m_mapping.steering);
-		const u8 throttle = sdl_to_logitech_g27_pedal(m_joysticks, m_mapping.throttle);
-		const u8 brake = sdl_to_logitech_g27_pedal(m_joysticks, m_mapping.brake);
-		const u8 clutch = sdl_to_logitech_g27_pedal(m_joysticks, m_mapping.clutch);
-		const bool shift_up = sdl_to_logitech_g27_button(m_joysticks, m_mapping.shift_up);
-		const bool shift_down = sdl_to_logitech_g27_button(m_joysticks, m_mapping.shift_down);
-
-		const bool up = sdl_to_logitech_g27_button(m_joysticks, m_mapping.up);
-		const bool down = sdl_to_logitech_g27_button(m_joysticks, m_mapping.down);
-		const bool left = sdl_to_logitech_g27_button(m_joysticks, m_mapping.left);
-		const bool right = sdl_to_logitech_g27_button(m_joysticks, m_mapping.right);
-
-		const bool triangle = sdl_to_logitech_g27_button(m_joysticks, m_mapping.triangle);
-		const bool cross = sdl_to_logitech_g27_button(m_joysticks, m_mapping.cross);
-		const bool square = sdl_to_logitech_g27_button(m_joysticks, m_mapping.square);
-		const bool circle = sdl_to_logitech_g27_button(m_joysticks, m_mapping.circle);
-
-		const bool l2 = sdl_to_logitech_g27_button(m_joysticks, m_mapping.l2);
-		const bool l3 = sdl_to_logitech_g27_button(m_joysticks, m_mapping.l3);
-		const bool r2 = sdl_to_logitech_g27_button(m_joysticks, m_mapping.r2);
-		const bool r3 = sdl_to_logitech_g27_button(m_joysticks, m_mapping.r3);
-
-		const bool plus = sdl_to_logitech_g27_button(m_joysticks, m_mapping.plus);
-		const bool minus = sdl_to_logitech_g27_button(m_joysticks, m_mapping.minus);
-
-		const bool dial_clockwise = sdl_to_logitech_g27_button(m_joysticks, m_mapping.dial_clockwise);
-		const bool dial_anticlockwise = sdl_to_logitech_g27_button(m_joysticks, m_mapping.dial_anticlockwise);
-
-		const bool select = sdl_to_logitech_g27_button(m_joysticks, m_mapping.select);
-		const bool pause = sdl_to_logitech_g27_button(m_joysticks, m_mapping.pause);
-
-		const bool shifter_1 = sdl_to_logitech_g27_button(m_joysticks, m_mapping.shifter_1);
-		const bool shifter_2 = sdl_to_logitech_g27_button(m_joysticks, m_mapping.shifter_2);
-		const bool shifter_3 = sdl_to_logitech_g27_button(m_joysticks, m_mapping.shifter_3);
-		const bool shifter_4 = sdl_to_logitech_g27_button(m_joysticks, m_mapping.shifter_4);
-		const bool shifter_5 = sdl_to_logitech_g27_button(m_joysticks, m_mapping.shifter_5);
-		const bool shifter_6 = sdl_to_logitech_g27_button(m_joysticks, m_mapping.shifter_6);
-		const bool shifter_r = sdl_to_logitech_g27_button(m_joysticks, m_mapping.shifter_r);
-		const bool shifter_press = sdl_to_logitech_g27_button(m_joysticks, m_mapping.shifter_press);
-		m_sdl_handles_mutex.unlock();
-
-		// populate buffer
-		buf[0] = hat_components_to_logitech_g27_hat(up, down, left, right);
-		set_bit(buf, 8, shift_up);
-		set_bit(buf, 9, shift_down);
-
-		set_bit(buf, 7, triangle);
-		set_bit(buf, 4, cross);
-		set_bit(buf, 5, square);
-		set_bit(buf, 6, circle);
-
-		set_bit(buf, 11, l2);
-		set_bit(buf, 15, l3);
-		set_bit(buf, 10, r2);
-		set_bit(buf, 14, r3);
-
-		set_bit(buf, 22, dial_clockwise);
-		set_bit(buf, 23, dial_anticlockwise);
-
-		set_bit(buf, 24, plus);
-		set_bit(buf, 25, minus);
-
-		set_bit(buf, 12, select);
-		set_bit(buf, 13, pause);
-
-		set_bit(buf, 16, shifter_1);
-		set_bit(buf, 17, shifter_2);
-		set_bit(buf, 18, shifter_3);
-		set_bit(buf, 19, shifter_4);
-		set_bit(buf, 20, shifter_5);
-		set_bit(buf, 21, shifter_6);
-		set_bit(buf, 80, shifter_r);
-
-		// calibrated, unsure
-		set_bit(buf, 82, true);
-		// shifter connected
-		set_bit(buf, 83, true);
-		/*
-		 * shifter pressed/down bit
-		 * mechanical references:
-		 * - G29 shifter mechanical explanation https://youtu.be/d7qCn3o8K98?t=1124
-		 * - same mechanism on the G27 https://youtu.be/rdjejtIfkVA?t=760
-		 * - same mechanism on the G25 https://youtu.be/eCyt_4luwF0?t=130
-		 * on healthy G29/G27/G25 shifters, shifter is mechnically kept pressed in reverse, the bit should be set
-		 * the shifter_press mapping alone captures instead a shifter press without going into reverse, ie. neutral press, just in case there are games using it for input
-		 */
-		set_bit(buf, 86, shifter_press | shifter_r);
-
-		buf[3] = (steering << 2) | buf[3];
-		buf[4] = steering >> 6;
-		buf[5] = throttle;
-		buf[6] = brake;
-		buf[7] = clutch;
-
-		// rough analog values recorded in https://github.com/RPCS3/rpcs3/pull/17199#issuecomment-2883934412
-		// buf[8] shifter x
-		// buf[9] shifter y
-		constexpr u8 shifter_coord_center = 0x80;
-		constexpr u8 shifter_coord_top = 0xb7;
-		constexpr u8 shifter_coord_bottom = 0x32;
-		constexpr u8 shifter_coord_left = 0x30;
-		constexpr u8 shifter_coord_right = 0xb3;
-		constexpr u8 shifter_coord_right_reverse = 0xaa;
-		if (shifter_1)
-		{
-			buf[8] = shifter_coord_left;
-			buf[9] = shifter_coord_top;
-		}
-		else if (shifter_2)
-		{
-			buf[8] = shifter_coord_left;
-			buf[9] = shifter_coord_bottom;
-		}
-		else if (shifter_3)
-		{
-			buf[8] = shifter_coord_center;
-			buf[9] = shifter_coord_top;
-		}
-		else if (shifter_4)
-		{
-			buf[8] = shifter_coord_center;
-			buf[9] = shifter_coord_bottom;
-		}
-		else if (shifter_5)
-		{
-			buf[8] = shifter_coord_right;
-			buf[9] = shifter_coord_top;
-		}
-		else if (shifter_6)
-		{
-			buf[8] = shifter_coord_right;
-			buf[9] = shifter_coord_bottom;
-		}
-		else if (shifter_r)
-		{
-			buf[8] = shifter_coord_right_reverse;
-			buf[9] = shifter_coord_bottom;
-		}
-		else
-		{
-			buf[8] = shifter_coord_center;
-			buf[9] = shifter_coord_center;
-		}
-
-		buf[10] = buf[10] | (m_wheel_range > 360 ? 0x90 : 0x10);
-
-		// logitech_g27_log.error("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7], buf[8], buf[9], buf[10]);
-
-		return;
-	}
-	else
-	{
-		// Sending data to wheel
-		if (buf_size < 7)
-		{
-			logitech_g27_log.error("Unhandled wheel command with size %u != 16, %s", buf_size, fmt::buf_to_hexstring(buf, buf_size));
-			return;
-		}
-
-		transfer->expected_count = buf_size;
-
-		// logitech_g27_log.error("%02x %02x %02x %02x %02x %02x %02x", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
-		// printf("%02x %02x %02x %02x %02x %02x %02x\n", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
-
-		// TODO maybe force clipping from cfg
-
-		// Process effects
-		if (buf[0] == 0xf8)
-		{
-			const std::lock_guard lock(m_sdl_handles_mutex);
-			switch (buf[1])
-			{
-			case 0x01:
-			{
-				// Change to DFP
-				logitech_g27_log.error("Drive Force Pro mode switch command ignored");
-				break;
-			}
-			case 0x02:
-			{
-				// Change wheel range to 200 degrees
-				logitech_g27_log.error("Change wheel range to 200 degrees command not forwarded");
-				m_wheel_range = 200;
-				break;
-			}
-			case 0x03:
-			{
-				// Change wheel range to 900 degrees
-				logitech_g27_log.error("Change wheel range to 900 degrees command not forwarded");
-				m_wheel_range = 900;
-				break;
-			}
-			case 0x09:
-			{
-				// Change device mode
-				logitech_g27_log.error("Change device mode to %d %s detaching command ignored", buf[2], buf[3] ? "with" : "without");
-				break;
-			}
-			case 0x0a:
-			{
-				// Revert indentity
-				logitech_g27_log.error("Revert device identity after reset %s command ignored", buf[2] ? "enable" : "disable");
-				break;
-			}
-			case 0x10:
-			{
-				// Switch to G25 with detach
-				logitech_g27_log.error("Switch to G25 with detach command ignored");
-				break;
-			}
-			case 0x11:
-			{
-				// Switch to G25 without detach
-				logitech_g27_log.error("Switch to G25 without detach command ignored");
-				break;
-			}
-			case 0x12:
-			{
-				// Incoming data is a 5 bit mask, for each individual bulb
-				if (m_led_joystick_handle == nullptr)
-				{
-					break;
-				}
-				// Mux into total amount of bulbs on, since sdl only takes intensity
-				u8 new_led_level = 0;
-				for (int i = 0; i < 5; i++)
-				{
-					new_led_level += (buf[2] & (1 << i)) ? 1 : 0;
-				}
-
-				const u8 intensity = new_led_level * 255 / 5;
-				SDL_SetJoystickLED(m_led_joystick_handle, intensity, intensity, intensity);
-				break;
-			}
-			case 0x81:
-			{
-				// Wheel range change
-				m_wheel_range = (buf[3] << 8) | buf[2];
-				logitech_g27_log.error("Wheel range change to %u command not forwarded", m_wheel_range);
-				break;
-			}
-			default:
-			{
-				logitech_g27_log.error("Unknown extended command %02x %02x %02x %02x %02x %02x %02x ignored", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
-				break;
-			}
-			}
-		}
-		else
-		{
-			const std::lock_guard lock(m_sdl_handles_mutex);
-			const u8 cmd = buf[0] & 0xf;
-			const u8 slot_mask = buf[0] >> 4;
-			switch (cmd)
-			{
-			case 0x00:
-			case 0x01:
-			case 0x0c:
-			{
-				// Download/Download play/Refresh
-				for (int i = 0; i < 4; i++)
-				{
-					if (!(slot_mask & (1 << i)))
-					{
-						continue;
-					}
-					SDL_HapticEffect new_effect {};
-					// hack: need to reduce Download play spams for some drivers
-					bool update_hack = false;
-					bool unknown_effect = false;
-					switch (buf[1])
-					{
-					case 0x00:
-					{
-						// Constant force
-						new_effect.type = SDL_HAPTIC_CONSTANT;
-						new_effect.constant.direction = STEERING_DIRECTION;
-						new_effect.constant.length = SDL_HAPTIC_INFINITY;
-						new_effect.constant.level = logitech_g27_force_to_level(buf[2 + i], m_reverse_effects);
-						break;
-					}
-					case 0x01:
-					case 0x0b:
-					{
-						// Spring/High resolution spring
-						new_effect.type = SDL_HAPTIC_SPRING;
-						new_effect.condition.direction = STEERING_DIRECTION;
-						new_effect.condition.length = SDL_HAPTIC_INFINITY;
-						const u8 s1 = buf[5] & 1;
-						const u8 s2 = (buf[5] >> 4) & 1;
-						const u16 saturation = logitech_g27_clip_to_saturation(buf[6]);
-						s16 center = 0;
-						u16 deadband = 0;
-						s16 left_coeff = 0;
-						s16 right_coeff = 0;
-						if (buf[1] == 0x01)
-						{
-							const u8 d1 = buf[2];
-							const u8 d2 = buf[3];
-							const u8 k1 = buf[4] & (0xf >> 1);
-							const u8 k2 = (buf[4] >> 4) & (0xf >> 1);
-							center = logitech_g27_position_to_center(d1, d2);
-							deadband = logitech_g27_position_to_width(d1, d2);
-							left_coeff = logitech_g27_coeff_to_coeff(k1, s1);
-							right_coeff = logitech_g27_coeff_to_coeff(k2, s2);
-						}
-						else
-						{
-							const u16 d1 = (buf[2] << 3) | ((buf[5] >> 1) & (0xf >> 1));
-							const u16 d2 = (buf[3] << 3) | (buf[5] >> 5);
-							const u8 k1 = buf[4] & 0xf;
-							const u8 k2 = buf[4] >> 4;
-							center = logitech_g27_high_resolution_position_to_center(d1, d2);
-							deadband = logitech_g27_high_resolution_position_to_width(d1, d2);
-							left_coeff = logitech_g27_high_resolution_coeff_to_coeff(k1, s1);
-							right_coeff = logitech_g27_high_resolution_coeff_to_coeff(k2, s2);
-						}
-						if (m_reverse_effects)
-						{
-							std::swap(left_coeff, right_coeff);
-						}
-						for (int j = 0; j < 1 /*3*/; j++)
-						{
-							new_effect.condition.right_sat[j] = saturation;
-							new_effect.condition.left_sat[j] = saturation;
-							new_effect.condition.right_coeff[j] = right_coeff;
-							new_effect.condition.left_coeff[j] = left_coeff;
-							new_effect.condition.deadband[j] = deadband;
-							new_effect.condition.center[j] = center;
-						}
-						break;
-					}
-					case 0x02:
-					case 0x0c:
-					{
-						// Damper/High resolution damper
-						new_effect.type = SDL_HAPTIC_DAMPER;
-						new_effect.condition.direction = STEERING_DIRECTION;
-						new_effect.condition.length = SDL_HAPTIC_INFINITY;
-						const u8 s1 = buf[3] & 1;
-						const u8 s2 = buf[5] & 1;
-						// TODO direction cfg
-						u16 saturation = 0x7FFF;
-						s16 left_coeff = 0;
-						s16 right_coeff = 0;
-						if (buf[1] == 0x02)
-						{
-							const u8 k1 = buf[2] & (0xf >> 1);
-							const u8 k2 = buf[4] & (0xf >> 1);
-							left_coeff = logitech_g27_coeff_to_coeff(k1, s1);
-							right_coeff = logitech_g27_coeff_to_coeff(k2, s2);
-						}
-						else
-						{
-							const u8 k1 = buf[2] & 0xf;
-							const u8 k2 = buf[4] & 0xf;
-							left_coeff = logitech_g27_high_resolution_coeff_to_coeff(k1, s1);
-							right_coeff = logitech_g27_high_resolution_coeff_to_coeff(k2, s2);
-							saturation = logitech_g27_clip_to_saturation(buf[6]);
-						}
-						if (m_reverse_effects)
-						{
-							std::swap(left_coeff, right_coeff);
-						}
-						for (int j = 0; j < 1 /*3*/; j++)
-						{
-							new_effect.condition.right_sat[j] = saturation;
-							new_effect.condition.left_sat[j] = saturation;
-							new_effect.condition.right_coeff[j] = right_coeff;
-							new_effect.condition.left_coeff[j] = left_coeff;
-						}
-						break;
-					}
-					case 0x0e:
-					{
-						// Friction
-						new_effect.type = SDL_HAPTIC_FRICTION;
-						new_effect.condition.direction = STEERING_DIRECTION;
-						new_effect.condition.length = SDL_HAPTIC_INFINITY;
-						const u8 k1 = buf[2];
-						const u8 k2 = buf[3];
-						const u8 s1 = buf[5] & 1;
-						const u8 s2 = (buf[5] >> 4) & 1;
-						s16 left_coeff = logitech_g27_friction_coeff_to_coeff(k1, s1);
-						s16 right_coeff = logitech_g27_friction_coeff_to_coeff(k2, s2);
-						const s16 saturation = logitech_g27_clip_to_saturation(buf[4]);
-						if (m_reverse_effects)
-						{
-							std::swap(left_coeff, right_coeff);
-						}
-						for (int j = 0; j < 1 /*3*/; j++)
-						{
-							new_effect.condition.right_sat[j] = saturation;
-							new_effect.condition.left_sat[j] = saturation;
-							new_effect.condition.right_coeff[j] = right_coeff;
-							new_effect.condition.left_coeff[j] = left_coeff;
-						}
-						break;
-					}
-					case 0x03:
-					case 0x0d:
-					{
-						// Auto center spring/High resolution auto center spring
-						new_effect.type = SDL_HAPTIC_SPRING;
-						new_effect.condition.direction = STEERING_DIRECTION;
-						new_effect.condition.length = SDL_HAPTIC_INFINITY;
-						const u16 saturation = logitech_g27_clip_to_saturation(buf[4]);
-						const u16 deadband = 2 * 0xFFFF / 255;
-						s16 center = 0;
-						s16 left_coeff = 0;
-						s16 right_coeff = 0;
-						if (buf[1] == 0x03)
-						{
-							const u8 k1 = buf[2] & (0xf >> 1);
-							const u8 k2 = buf[3] & (0xf >> 1);
-							left_coeff = logitech_g27_coeff_to_coeff(k1, 0);
-							right_coeff = logitech_g27_coeff_to_coeff(k2, 0);
-						}
-						else
-						{
-							const u8 k1 = buf[2] & 0xf;
-							const u8 k2 = buf[3] & 0xf;
-							left_coeff = logitech_g27_high_resolution_coeff_to_coeff(k1, 0);
-							right_coeff = logitech_g27_high_resolution_coeff_to_coeff(k2, 0);
-						}
-						if (m_reverse_effects)
-						{
-							std::swap(left_coeff, right_coeff);
-						}
-						for (int j = 0; j < 1 /*3*/; j++)
-						{
-							new_effect.condition.right_sat[j] = saturation;
-							new_effect.condition.left_sat[j] = saturation;
-							new_effect.condition.right_coeff[j] = right_coeff;
-							new_effect.condition.left_coeff[j] = left_coeff;
-							new_effect.condition.deadband[j] = deadband;
-							new_effect.condition.center[j] = center;
-						}
-						break;
-					}
-					case 0x04:
-					case 0x05:
-					{
-						// Sawtooth up/Sawtooth down
-						// for reversing sawtooth, it should be mirroring the offset, then play the up/down counterpart
-						if (buf[1] == 0x04)
-							new_effect.type = !m_reverse_effects ? SDL_HAPTIC_SAWTOOTHUP : SDL_HAPTIC_SAWTOOTHDOWN;
-						else
-							new_effect.type = m_reverse_effects ? SDL_HAPTIC_SAWTOOTHUP : SDL_HAPTIC_SAWTOOTHDOWN;
-						new_effect.type = buf[1] == 0x04 ? SDL_HAPTIC_SAWTOOTHUP : SDL_HAPTIC_SAWTOOTHDOWN;
-						new_effect.periodic.direction = STEERING_DIRECTION;
-						new_effect.periodic.length = SDL_HAPTIC_INFINITY;
-						const u8 l1 = buf[2];
-						const u8 l2 = buf[3];
-						const u8 l0 = buf[4];
-						const u8 t3 = buf[6] >> 4;
-						const u8 inc = buf[6] & 0xf;
-
-						const s16 amplitude = (l1 - l2);
-						const s16 progress = buf[1] == 0x04 ? l0 - l2 : l1 - l0;
-
-						if (amplitude <= 0 || inc == 0 || t3 == 0)
-						{
-							logitech_g27_log.error("cannot evaluate period and phase for saw tooth effect, l1 %u l2 %u inc %u t3 %u", l1, l2, inc, t3);
-							new_effect.periodic.period = 0;
-							new_effect.periodic.phase = 0;
-						}
-						else
-						{
-							new_effect.periodic.period = (amplitude * logitech_g27_loops_to_ms(t3, !m_fixed_loop)) / inc;
-							if (progress < 0)
-							{
-								logitech_g27_log.error("cannot evaluate phase for saw tooth effect, l1 %u l2 %u l0 %u", l1, l2, l0);
-								new_effect.periodic.phase = 0;
-							}
-							else
-								new_effect.periodic.phase = 36000 * progress / amplitude;
-						}
-
-						// TODO implement fallback if we actually find games abusing the above fail cases for constant force on l0
-
-						new_effect.periodic.offset = logitech_g27_force_to_level((l1 + l2) / 2, m_reverse_effects);
-						new_effect.periodic.magnitude = logitech_g27_force_to_level(std::abs(amplitude) / 2);
-
-						break;
-					}
-					case 0x06:
-					{
-						// Trapezoid, convert to SDL_HAPTIC_SQUARE or SDL_HAPTIC_TRIANGLE
-						// TODO full accuracy will need some kind of rendering thread, cannot be represented with a single effect
-						new_effect.periodic.direction = STEERING_DIRECTION;
-						new_effect.periodic.length = SDL_HAPTIC_INFINITY;
-						const u8 l1 = buf[2];
-						const u8 l2 = buf[3];
-						const u8 t1 = buf[4];
-						const u8 t2 = buf[5];
-						const u8 t3 = buf[6] >> 4;
-						const u8 s = buf[6] & 0xf;
-						const u16 total_flat_time = logitech_g27_loops_to_ms(t1 + t2, !m_fixed_loop);
-						const u16 total_slope_time = (((l1 - l2) * logitech_g27_loops_to_ms(t3, !m_fixed_loop)) / s) * 2;
-						if (total_flat_time > total_slope_time)
-						{
-							new_effect.type = SDL_HAPTIC_SQUARE;
-						}
-						else
-						{
-							new_effect.type = SDL_HAPTIC_TRIANGLE;
-						}
-						new_effect.periodic.period = total_slope_time + total_flat_time;
-						// when mirroring waves, both offset and magnitude should be mirrored
-						new_effect.periodic.offset = logitech_g27_force_to_level((l1 + l2) / 2, m_reverse_effects);
-						new_effect.periodic.magnitude = logitech_g27_force_to_level(l1, m_reverse_effects) - new_effect.periodic.offset;
-						break;
-					}
-					case 0x07:
-					{
-						// Rectangle, convert to SDL_HAPTIC_SQUARE
-						// TODO full accuracy will need some kind of rendering thread, cannot be represented with a single effect
-						new_effect.type = SDL_HAPTIC_SQUARE;
-						new_effect.periodic.direction = STEERING_DIRECTION;
-						new_effect.periodic.length = SDL_HAPTIC_INFINITY;
-						const u8 l1 = buf[2];
-						const u8 l2 = buf[3];
-						const u8 t1 = buf[4];
-						const u8 t2 = buf[5];
-						const u8 p = buf[6];
-						new_effect.periodic.period = logitech_g27_loops_to_ms(t1, !m_fixed_loop) + logitech_g27_loops_to_ms(t2, !m_fixed_loop);
-						new_effect.periodic.offset = logitech_g27_force_to_level((l1 + l2) / 2, m_reverse_effects);
-						new_effect.periodic.magnitude = logitech_g27_force_to_level(l1, m_reverse_effects) - new_effect.periodic.offset;
-						if (new_effect.periodic.period != 0)
-							new_effect.periodic.phase = 36000 * logitech_g27_loops_to_ms(p, !m_fixed_loop) / new_effect.periodic.period;
-						else
-						{
-							logitech_g27_log.error("cannot evaluate phase for square effect");
-							new_effect.periodic.phase = 0;
-						}
-						break;
-					}
-					case 0x08:
-					case 0x09:
-					{
-						// Variable/Ramp, convert to SDL_HAPTIC_CONSTANT / SDL_HAPTIC_RAMP
-						if (i % 2 != 0)
-						{
-							continue;
-						}
-						const u8 l1 = buf[2];
-						const u8 l2 = buf[3];
-						const u8 t1 = buf[4] >> 4;
-						const u8 s1 = buf[4] & 0xf;
-						const u8 t2 = buf[5] >> 4;
-						const u8 s2 = buf[5] & 0xf;
-						const u8 d1 = buf[6] & 1;
-						const u8 d2 = (buf[6] >> 4) & 1;
-						if (buf[1] == 0x08)
-						{
-							new_effect.type = SDL_HAPTIC_CONSTANT;
-							const u8 t = i == 0 ? t1 : t2;
-							const u8 s = i == 0 ? s1 : s2;
-							const u8 d = i == 0 ? d1 : d2;
-							const u8 l = i == 0 ? l1 : l2;
-							new_effect.constant.length = SDL_HAPTIC_INFINITY;
-							new_effect.constant.direction = STEERING_DIRECTION;
-							if (s == 0 || t == 0)
-							{
-								// gran turismo 6 does this, gives a variable force with no step so it just behaves as constant force
-								new_effect.constant.level = logitech_g27_force_to_level(l, m_reverse_effects);
-								// hack: gran turismo 6 spams download and play
-								update_hack = true;
-							}
-							else
-							{
-								new_effect.constant.level = d ? -0x7FFF : 0x7FFF;
-								if (m_reverse_effects)
-									new_effect.constant.level *= -1;
-
-								// TODO full accuracy will need some kind of rendering thread, cannot be represented with a single effect
-								const s16 begin_level = logitech_g27_force_to_level(l, m_reverse_effects);
-								if ((new_effect.constant.level > 0 && begin_level > 0) || (new_effect.constant.level < 0 && begin_level < 0))
-								{
-									new_effect.constant.attack_level = begin_level * 0x7FFF / new_effect.constant.level;
-								}
-							}
-						}
-						else
-						{
-							new_effect.type = SDL_HAPTIC_RAMP;
-							new_effect.ramp.direction = STEERING_DIRECTION;
-							if (l2 > l1)
-								logitech_g27_log.error("min force is larger than max force in ramp effect, l1 %u l2 %u", l1, l2);
-							const s16 l1_converted = logitech_g27_force_to_level(l1, m_reverse_effects);
-							const s16 l2_converted = logitech_g27_force_to_level(l2, m_reverse_effects);
-							new_effect.ramp.start = d1 ? l1_converted : l2_converted;
-							new_effect.ramp.end = d1 ? l2_converted : l1_converted;
-							new_effect.ramp.length = 0;
-							if (s2 == 0 || t2 == 0)
-								logitech_g27_log.error("cannot evaluate slope for ramp effect, loops per step %u level per step %u", t2, s2);
-							else
-								new_effect.ramp.length = std::abs(l1 - l2) * logitech_g27_loops_to_ms(t2, !m_fixed_loop) / s2;
-						}
-						break;
-					}
-					case 0x0a:
-					{
-						// Square
-						new_effect.type = SDL_HAPTIC_SQUARE;
-						new_effect.periodic.direction = STEERING_DIRECTION;
-						const u8 a = buf[2];
-						const u8 tl = buf[3];
-						const u8 th = buf[4];
-						const u8 n = buf[5];
-						const u16 t = (th << 8) | tl;
-						new_effect.periodic.period = logitech_g27_loops_to_ms(t * 2, !m_fixed_loop);
-						new_effect.periodic.magnitude = logitech_g27_amplitude_to_magnitude(a);
-						if (n == 0)
-							new_effect.periodic.length = new_effect.periodic.period * 256;
-						else
-							new_effect.periodic.length = new_effect.periodic.period * n;
-						break;
-					}
-					default:
-					{
-						unknown_effect = true;
-						break;
-					}
-					}
-
-					if (unknown_effect)
-					{
-						logitech_g27_log.error("Command %02x %02x %02x %02x %02x %02x %02x with unknown effect ignored", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
-						continue;
-					}
-
-					const bool play_effect = (cmd == 0x01 || (cmd == 0x0c && m_effect_slots[i].effect_id == -1));
-
-					if (update_hack)
-					{
-						if (m_effect_slots[i].effect_id == -1)
-							update_hack = false;
-						if (m_effect_slots[i].last_effect.type != new_effect.type)
-							update_hack = false;
-					}
-
-					if (cmd == 0x00 || play_effect)
-					{
-						if (m_effect_slots[i].effect_id != -1 && m_haptic_handle && !update_hack)
-						{
-							SDL_DestroyHapticEffect(m_haptic_handle, m_effect_slots[i].effect_id);
-							m_effect_slots[i].effect_id = -1;
-						}
-						if (m_haptic_handle && m_effect_slots[i].effect_id == -1)
-						{
-							m_effect_slots[i].effect_id = SDL_CreateHapticEffect(m_haptic_handle, &new_effect);
-						}
-						if (update_hack)
-						{
-							if (!SDL_UpdateHapticEffect(m_haptic_handle, m_effect_slots[i].effect_id, &new_effect))
-								logitech_g27_log.error("Failed refreshing slot %d sdl effect %d, %s", i, new_effect.type, SDL_GetError());
-						}
-						m_effect_slots[i].state = logitech_g27_ffb_state::downloaded;
-						m_effect_slots[i].last_effect = new_effect;
-						m_effect_slots[i].last_update = SDL_GetTicks();
-						if (m_effect_slots[i].effect_id == -1 && m_haptic_handle)
-						{
-							logitech_g27_log.error("Failed uploading effect %02x %02x %02x %02x %02x %02x %02x to slot %i, %s", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], i, SDL_GetError());
-						}
-					}
-					if (play_effect && m_haptic_handle)
-					{
-						if (m_effect_slots[i].effect_id != -1)
-						{
-							if (!SDL_RunHapticEffect(m_haptic_handle, m_effect_slots[i].effect_id, 1))
-							{
-								logitech_g27_log.error("Failed playing sdl effect %d on slot %d, %s\n", m_effect_slots[i].last_effect.type, i, SDL_GetError());
-							}
-						}
-						else
-						{
-							logitech_g27_log.error("Tried to play effect slot %d with sdl effect %d, but upload failed previously", i, m_effect_slots[i].last_effect.type);
-						}
-						m_effect_slots[i].state = logitech_g27_ffb_state::playing;
-					}
-					if (cmd == 0xc && !play_effect && m_haptic_handle)
-					{
-						if (!SDL_UpdateHapticEffect(m_haptic_handle, m_effect_slots[i].effect_id, &new_effect))
-						{
-							logitech_g27_log.error("Failed refreshing slot %d sdl effect %d, %s", i, new_effect.type, SDL_GetError());
-						}
-					}
-				}
-				break;
-			}
-			case 0x02:
-			case 0x03:
-			{
-				for (int i = 0; i < 4; i++)
-				{
-					// Play/Stop
-					if (!(slot_mask & (1 << i)))
-					{
-						continue;
-					}
-					if (m_effect_slots[i].state == logitech_g27_ffb_state::playing || m_effect_slots[i].state == logitech_g27_ffb_state::downloaded)
-					{
-						m_effect_slots[i].state = cmd == 0x02 ? logitech_g27_ffb_state::playing : logitech_g27_ffb_state::downloaded;
-						if (m_haptic_handle != nullptr)
-						{
-							if (m_effect_slots[i].effect_id == -1)
-							{
-								m_effect_slots[i].effect_id = SDL_CreateHapticEffect(m_haptic_handle, &m_effect_slots[i].last_effect);
-							}
-							if (m_effect_slots[i].effect_id != -1)
-							{
-								if (cmd == 0x02)
-								{
-									if (!SDL_RunHapticEffect(m_haptic_handle, m_effect_slots[i].effect_id, 1))
-									{
-										logitech_g27_log.error("Failed playing sdl effect %d on slot %d, %s\n", m_effect_slots[i].last_effect.type, i, SDL_GetError());
-									}
-								}
-								else
-								{
-									if (!SDL_StopHapticEffect(m_haptic_handle, m_effect_slots[i].effect_id))
-									{
-										logitech_g27_log.error("Failed stopping sdl effect %d on slot %d, %s\n", m_effect_slots[i].last_effect.type, i, SDL_GetError());
-									}
-								}
-							}
-							else
-							{
-								if (cmd == 0x02)
-								{
-									logitech_g27_log.error("Tried to play effect slot %d with sdl effect %d, but upload failed previously", i, m_effect_slots[i].last_effect.type);
-								}
-								else
-								{
-									logitech_g27_log.error("Tried to stop effect slot %d with sdl effect %d, but upload failed previously", i, m_effect_slots[i].last_effect.type);
-								}
-							}
-						}
-					}
-					else
-					{
-						if (cmd == 0x02)
-						{
-							logitech_g27_log.error("Tried to play effect slot %d but it was never uploaded\n", i);
-						}
-						else
-						{
-							logitech_g27_log.error("Tried to stop effect slot %d but it was never uploaded\n", i);
-						}
-					}
-				}
-				break;
-			}
-			case 0x0e:
-			{
-				// Set Default Spring
-				const u8 k1 = buf[2] & (0xf >> 1);
-				const u8 k2 = buf[3] & (0xf >> 1);
-				const u16 saturation = logitech_g27_clip_to_saturation(buf[4]);
-				s16 left_coeff = logitech_g27_coeff_to_coeff(k1, 0);
-				s16 right_coeff = logitech_g27_coeff_to_coeff(k2, 0);
-				const u16 deadband = 2 * 0xFFFF / 255;
-				s16 center = 0;
-				if (m_reverse_effects)
-				{
-					std::swap(left_coeff, right_coeff);
-				}
-				for (int i = 0; i < 1 /*3*/; i++)
-				{
-					// TODO direction cfg
-					m_default_spring_effect.condition.right_sat[i] = saturation;
-					m_default_spring_effect.condition.left_sat[i] = saturation;
-					m_default_spring_effect.condition.right_coeff[i] = right_coeff;
-					m_default_spring_effect.condition.left_coeff[i] = left_coeff;
-					m_default_spring_effect.condition.deadband[i] = deadband;
-					m_default_spring_effect.condition.center[i] = center;
-				}
-
-				if (m_haptic_handle == nullptr)
-				{
-					break;
-				}
-
-				if (m_default_spring_effect_id == -1)
-				{
-					m_default_spring_effect_id = SDL_CreateHapticEffect(m_haptic_handle, &m_default_spring_effect);
-					if (m_default_spring_effect_id == -1)
-					{
-						logitech_g27_log.error("Failed creating default spring effect, %s", SDL_GetError());
-					}
-				}
-				else
-				{
-					if (!SDL_UpdateHapticEffect(m_haptic_handle, m_default_spring_effect_id, &m_default_spring_effect))
-					{
-						logitech_g27_log.error("Failed updating default spring effect, %s", SDL_GetError());
-					}
-				}
-				break;
-			}
-			case 0x04:
-			case 0x05:
-			{
-				// Default spring on/Default spring off
-				if (m_haptic_handle == nullptr)
-				{
-					break;
-				}
-
-				if (m_default_spring_effect_id == -1)
-				{
-					m_default_spring_effect_id = SDL_CreateHapticEffect(m_haptic_handle, &m_default_spring_effect);
-					if (m_default_spring_effect_id == -1)
-					{
-						logitech_g27_log.error("Failed creating default spring effect, %s", SDL_GetError());
-					}
-				}
-				if (m_default_spring_effect_id != -1)
-				{
-					if (cmd == 0x04)
-					{
-						if (!SDL_RunHapticEffect(m_haptic_handle, m_default_spring_effect_id, 1))
-						{
-							logitech_g27_log.error("Failed playing default spring effect, %s", SDL_GetError());
-						}
-					}
-					else
-					{
-						if (!SDL_StopHapticEffect(m_haptic_handle, m_default_spring_effect_id))
-						{
-							logitech_g27_log.error("Failed stopping default spring effect, %s", SDL_GetError());
-						}
-					}
-				}
-				break;
-			}
-			case 0x08:
-			{
-				// Normal Mode / Extended
-				logitech_g27_log.error("Normal mode restore command ignored");
-				break;
-			}
-			case 0x09:
-			{
-				// Set LED
-				// TODO this is practically disabled at the moment, due to effect slot matching prior
-				// need to figure out what this command actually does first, since RPM light command has priority to SDL_SetJoystickLED
-				if (m_led_joystick_handle == nullptr)
-				{
-					break;
-				}
-
-				u8 new_led_level = 0;
-				for (int i = 0; i < 8; i++)
-				{
-					new_led_level += (buf[1] & (1 << i)) ? 1 : 0;
-				}
-				const u8 intensity = new_led_level * 255 / 8;
-				SDL_SetJoystickLED(m_led_joystick_handle, intensity, intensity, intensity);
-				break;
-			}
-			case 0x0a:
-			{
-				// Set watchdog
-				logitech_g27_log.error("Watchdog command with duration of %u loops ignored", buf[1]);
-				break;
-			}
-			case 0x0b:
-			{
-				// Raw mode
-				logitech_g27_log.error("Raw mode command ignored");
-				break;
-			}
-			case 0x0d:
-			{
-				// Fixed time loop toggle
-				m_fixed_loop = buf[1] ? true : false;
-				if (!m_fixed_loop)
-				{
-					logitech_g27_log.error("as fast as possible mode requested, effect durations might be inaccurate");
-				}
-				break;
-			}
-			case 0x0f:
-			{
-				// Set dead band
-				logitech_g27_log.error("Set dead band command ignored");
-				break;
-			}
-			default:
-			{
-				logitech_g27_log.error("Unknown command %02x %02x %02x %02x %02x %02x %02x ignored", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
-				break;
-			}
-			}
-		}
-	}
-}
-
-#endif
diff --git a/rpcs3/Emu/Io/LogitechG27.h b/rpcs3/Emu/Io/LogitechG27.h
deleted file mode 100644
index 52735a253d..0000000000
--- a/rpcs3/Emu/Io/LogitechG27.h
+++ /dev/null
@@ -1,136 +0,0 @@
-#pragma once
-
-#include "Emu/Io/usb_device.h"
-#include "Utilities/Thread.h"
-#include "LogitechG27Config.h"
-
-#ifndef _MSC_VER
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include "SDL3/SDL.h"
-#ifndef _MSC_VER
-#pragma GCC diagnostic pop
-#endif
-
-#include <map>
-#include <vector>
-
-enum class logitech_g27_ffb_state
-{
-	inactive,
-	downloaded,
-	playing
-};
-
-struct logitech_g27_ffb_slot
-{
-	logitech_g27_ffb_state state = logitech_g27_ffb_state::inactive;
-	u64 last_update = 0;
-	SDL_HapticEffect last_effect {};
-
-	// TODO switch to SDL_HapticEffectID when it becomes available in a future SDL release
-	// Match the return of SDL_CreateHapticEffect for now
-	int effect_id = -1;
-};
-
-struct sdl_mapping
-{
-	/*
-	 * orginally 32bit, just vendor product match
-	 * v1: (vendor_id << 16) | product_id
-	 *
-	 * now 64bit, matching more to handle Fanatec's shenanigans, should be good until Fanatec desides that it's funny to register > 1023 axes/hats/buttons, then have two hid devices with the exact same numbers with one single wheel base
-	 * serial/version/firmware/guid is not used for now because those are still unreliable in SDL in the context of config
-	 * not migrating to string yet, don't want to make joystick look up heavy
-	 * v2: (num_buttons:10 << 52) | (num_hats:10 << 42) | (num_axes:10 << 32) | (vendor_id:16 << 16) | product_id:16
-	 */
-	u64 device_type_id = 0;
-	sdl_mapping_type type = sdl_mapping_type::button;
-	u64 id = 0;
-	hat_component hat = hat_component::none;
-	bool reverse = false;
-	bool positive_axis = false;
-};
-
-struct logitech_g27_sdl_mapping
-{
-	sdl_mapping steering {};
-	sdl_mapping throttle {};
-	sdl_mapping brake {};
-	sdl_mapping clutch {};
-	sdl_mapping shift_up {};
-	sdl_mapping shift_down {};
-
-	sdl_mapping up {};
-	sdl_mapping down {};
-	sdl_mapping left {};
-	sdl_mapping right {};
-
-	sdl_mapping triangle {};
-	sdl_mapping cross {};
-	sdl_mapping square {};
-	sdl_mapping circle {};
-
-	// mappings based on g27 compat mode on g29
-	sdl_mapping l2 {};
-	sdl_mapping l3 {};
-	sdl_mapping r2 {};
-	sdl_mapping r3 {};
-
-	sdl_mapping plus {};
-	sdl_mapping minus {};
-
-	sdl_mapping dial_clockwise {};
-	sdl_mapping dial_anticlockwise {};
-
-	sdl_mapping select {};
-	sdl_mapping pause {};
-
-	sdl_mapping shifter_1 {};
-	sdl_mapping shifter_2 {};
-	sdl_mapping shifter_3 {};
-	sdl_mapping shifter_4 {};
-	sdl_mapping shifter_5 {};
-	sdl_mapping shifter_6 {};
-	sdl_mapping shifter_r {};
-	sdl_mapping shifter_press {};
-};
-
-class usb_device_logitech_g27 : public usb_device_emulated
-{
-public:
-	usb_device_logitech_g27(u32 controller_index, const std::array<u8, 7>& location);
-	~usb_device_logitech_g27();
-
-	static std::shared_ptr<usb_device> make_instance(u32 controller_index, const std::array<u8, 7>& location);
-	static u16 get_num_emu_devices();
-
-	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
-	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-	bool open_device() override;
-
-private:
-	void sdl_refresh();
-
-	u32 m_controller_index = 0;
-
-	logitech_g27_sdl_mapping m_mapping {};
-	bool m_reverse_effects = false;
-
-	std::mutex m_sdl_handles_mutex;
-	SDL_Joystick* m_led_joystick_handle = nullptr;
-	SDL_Haptic* m_haptic_handle = nullptr;
-	std::map<u64, std::vector<SDL_Joystick*>> m_joysticks;
-	bool m_fixed_loop = false;
-	u16 m_wheel_range = 200;
-	std::array<logitech_g27_ffb_slot, 4> m_effect_slots {};
-	SDL_HapticEffect m_default_spring_effect {};
-
-	// TODO switch to SDL_HapticEffectID when it becomes available in a future SDL release
-	int m_default_spring_effect_id = -1;
-
-	bool m_enabled = false;
-
-	std::unique_ptr<named_thread<std::function<void()>>> m_house_keeping_thread;
-};
diff --git a/rpcs3/Emu/Io/LogitechG27Config.cpp b/rpcs3/Emu/Io/LogitechG27Config.cpp
deleted file mode 100644
index aa1ebf2af7..0000000000
--- a/rpcs3/Emu/Io/LogitechG27Config.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-#include "stdafx.h"
-
-#ifdef HAVE_SDL3
-
-#include "Utilities/File.h"
-#include "LogitechG27Config.h"
-
-template <>
-void fmt_class_string<sdl_mapping_type>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](sdl_mapping_type value)
-	{
-		switch (value)
-		{
-		case sdl_mapping_type::button: return "button";
-		case sdl_mapping_type::hat: return "hat";
-		case sdl_mapping_type::axis: return "axis";
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<hat_component>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](hat_component value)
-	{
-		switch (value)
-		{
-		case hat_component::up: return "up";
-		case hat_component::down: return "down";
-		case hat_component::left: return "left";
-		case hat_component::right: return "right";
-		case hat_component::none: return "";
-		}
-
-		return unknown;
-	});
-}
-
-emulated_logitech_g27_config g_cfg_logitech_g27;
-
-LOG_CHANNEL(cfg_log, "CFG");
-
-emulated_logitech_g27_config::emulated_logitech_g27_config()
-	: m_path(fs::get_config_dir(true) + "LogitechG27.yml")
-{
-}
-
-void emulated_logitech_g27_config::reset()
-{
-	const std::lock_guard lock(m_mutex);
-	cfg::node::from_default();
-}
-
-void emulated_logitech_g27_config::save(bool lock_mutex)
-{
-	std::unique_lock lock(m_mutex, std::defer_lock);
-	if (lock_mutex)
-	{
-		lock.lock();
-	}
-	cfg_log.notice("Saving LogitechG27 config: '%s'", m_path);
-
-	if (!fs::create_path(fs::get_parent_dir(m_path)))
-	{
-		cfg_log.fatal("Failed to create path: '%s' (%s)", m_path, fs::g_tls_error);
-	}
-
-	if (!cfg::node::save(m_path))
-	{
-		cfg_log.error("Failed to save LogitechG27 config to '%s' (error=%s)", m_path, fs::g_tls_error);
-	}
-}
-
-bool emulated_logitech_g27_config::load()
-{
-	const std::lock_guard lock(m_mutex);
-
-	cfg_log.notice("Loading LogitechG27 config: %s", m_path);
-
-	from_default();
-
-	if (fs::file cfg_file{m_path, fs::read})
-	{
-		if (const std::string content = cfg_file.to_string(); !content.empty())
-		{
-			return from_string(content);
-		}
-	}
-	else
-	{
-		save(false);
-	}
-
-	return true;
-}
-
-#endif
diff --git a/rpcs3/Emu/Io/LogitechG27Config.h b/rpcs3/Emu/Io/LogitechG27Config.h
deleted file mode 100644
index 82a2e89dea..0000000000
--- a/rpcs3/Emu/Io/LogitechG27Config.h
+++ /dev/null
@@ -1,128 +0,0 @@
-#pragma once
-
-#include "Utilities/Config.h"
-
-#include <mutex>
-
-enum class sdl_mapping_type
-{
-	button = 0,
-	hat,
-	axis,
-};
-
-enum class hat_component
-{
-	none = 0,
-	up,
-	down,
-	left,
-	right
-};
-
-// this was a bitfield, but juggling at least 3 compilers and OSes means no bitfield
-// num_buttons:10 << 52 | num_hats:10 << 42 | num_axes:10 << 32 | vendor_id:16 << 16 | product_id:16
-struct emulated_g27_device_type_id
-{
-	// big types to keep 64bit bit shift operations sane
-	u64 product_id = 0;
-	u64 vendor_id = 0;
-	u64 num_axes = 0;
-	u64 num_hats = 0;
-	u64 num_buttons = 0;
-
-	u64 as_u64() const
-	{
-		u64 value = product_id;
-		value |= vendor_id << 16;
-		value |= (num_axes & ((1 << 10) - 1)) << 32;
-		value |= (num_hats & ((1 << 10) - 1)) << 42;
-		value |= (num_buttons & ((1 << 10) - 1)) << 52;
-		return value;
-	}
-};
-
-struct emulated_logitech_g27_mapping : cfg::node
-{
-	cfg::uint<0, 0xFFFFFFFFFFFFFFFF> device_type_id;
-	cfg::_enum<sdl_mapping_type> type;
-	cfg::uint<0, 0xFFFFFFFFFFFFFFFF> id;
-	cfg::_enum<hat_component> hat;
-	cfg::_bool reverse;
-
-	emulated_logitech_g27_mapping(cfg::node* owner, std::string name, u64 device_type_id_def, sdl_mapping_type type_def, u64 id_def, hat_component hat_def, bool reverse_def)
-		: cfg::node(owner, std::move(name)),
-		  device_type_id(this, "device_type_id", device_type_id_def),
-		  type(this, "type", type_def),
-		  id(this, "id", id_def),
-		  hat(this, "hat", hat_def),
-		  reverse(this, "reverse", reverse_def)
-	{
-	}
-};
-
-struct emulated_logitech_g27_config : cfg::node
-{
-public:
-	std::mutex m_mutex;
-
-	// TODO these defaults are for a shifter-less G29 + a xbox controller for shifter testing, perhaps find a new default
-	// TODO, when a new default is found, use the new device type id style
-
-	emulated_logitech_g27_mapping steering{this, "steering", 0, sdl_mapping_type::axis, 0, hat_component::none, false};
-	emulated_logitech_g27_mapping throttle{this, "throttle", 0, sdl_mapping_type::axis, 2, hat_component::none, false};
-	emulated_logitech_g27_mapping brake{this, "brake", 0, sdl_mapping_type::axis, 3, hat_component::none, false};
-	emulated_logitech_g27_mapping clutch{this, "clutch", 0, sdl_mapping_type::axis, 1, hat_component::none, false};
-	emulated_logitech_g27_mapping shift_up{this, "shift_up", 0, sdl_mapping_type::button, 4, hat_component::none, false};
-	emulated_logitech_g27_mapping shift_down{this, "shift_down", 0, sdl_mapping_type::button, 5, hat_component::none, false};
-
-	emulated_logitech_g27_mapping up{this, "up", 0, sdl_mapping_type::hat, 0, hat_component::up, false};
-	emulated_logitech_g27_mapping down{this, "down", 0, sdl_mapping_type::hat, 0, hat_component::down, false};
-	emulated_logitech_g27_mapping left{this, "left", 0, sdl_mapping_type::hat, 0, hat_component::left, false};
-	emulated_logitech_g27_mapping right{this, "right", 0, sdl_mapping_type::hat, 0, hat_component::right, false};
-
-	emulated_logitech_g27_mapping triangle{this, "triangle", 0, sdl_mapping_type::button, 3, hat_component::none, false};
-	emulated_logitech_g27_mapping cross{this, "cross", 0, sdl_mapping_type::button, 0, hat_component::none, false};
-	emulated_logitech_g27_mapping square{this, "square", 0, sdl_mapping_type::button, 1, hat_component::none, false};
-	emulated_logitech_g27_mapping circle{this, "circle", 0, sdl_mapping_type::button, 2, hat_component::none, false};
-
-	emulated_logitech_g27_mapping l2{this, "l2", 0, sdl_mapping_type::button, 7, hat_component::none, false};
-	emulated_logitech_g27_mapping l3{this, "l3", 0, sdl_mapping_type::button, 11, hat_component::none, false};
-	emulated_logitech_g27_mapping r2{this, "r2", 0, sdl_mapping_type::button, 6, hat_component::none, false};
-	emulated_logitech_g27_mapping r3{this, "r3", 0, sdl_mapping_type::button, 10, hat_component::none, false};
-
-	emulated_logitech_g27_mapping plus{this, "plus", 0, sdl_mapping_type::button, 19, hat_component::none, false};
-	emulated_logitech_g27_mapping minus{this, "minus", 0, sdl_mapping_type::button, 20, hat_component::none, false};
-
-	emulated_logitech_g27_mapping dial_clockwise{this, "dial_clockwise", 0, sdl_mapping_type::button, 21, hat_component::none, false};
-	emulated_logitech_g27_mapping dial_anticlockwise{this, "dial_anticlockwise", 0, sdl_mapping_type::button, 22, hat_component::none, false};
-
-	emulated_logitech_g27_mapping select{this, "select", 0, sdl_mapping_type::button, 8, hat_component::none, false};
-	emulated_logitech_g27_mapping pause{this, "pause", 0, sdl_mapping_type::button, 9, hat_component::none, false};
-
-	emulated_logitech_g27_mapping shifter_1{this, "shifter_1", 0, sdl_mapping_type::button, 3, hat_component::none, false};
-	emulated_logitech_g27_mapping shifter_2{this, "shifter_2", 0, sdl_mapping_type::button, 0, hat_component::none, false};
-	emulated_logitech_g27_mapping shifter_3{this, "shifter_3", 0, sdl_mapping_type::button, 2, hat_component::none, false};
-	emulated_logitech_g27_mapping shifter_4{this, "shifter_4", 0, sdl_mapping_type::button, 1, hat_component::none, false};
-	emulated_logitech_g27_mapping shifter_5{this, "shifter_5", 0, sdl_mapping_type::hat, 0, hat_component::up, false};
-	emulated_logitech_g27_mapping shifter_6{this, "shifter_6", 0, sdl_mapping_type::hat, 0, hat_component::down, false};
-	emulated_logitech_g27_mapping shifter_r{this, "shifter_r", 0, sdl_mapping_type::hat, 0, hat_component::left, false};
-	emulated_logitech_g27_mapping shifter_press{this, "shifter_press", 0, sdl_mapping_type::hat, 0, hat_component::right, false};
-
-	cfg::_bool reverse_effects{this, "reverse_effects", false};
-	cfg::uint<0, 0xFFFFFFFFFFFFFFFF> ffb_device_type_id{this, "ffb_device_type_id", 0};
-	cfg::uint<0, 0xFFFFFFFFFFFFFFFF> led_device_type_id{this, "led_device_type_id", 0};
-
-	cfg::_bool enabled{this, "enabled", false};
-
-	emulated_logitech_g27_config();
-
-	bool load();
-	void save(bool lock_mutex = true);
-	void reset();
-
-private:
-	const std::string m_path;
-};
-
-extern emulated_logitech_g27_config g_cfg_logitech_g27;
diff --git a/rpcs3/Emu/Io/MouseHandler.cpp b/rpcs3/Emu/Io/MouseHandler.cpp
deleted file mode 100644
index c80d7556dc..0000000000
--- a/rpcs3/Emu/Io/MouseHandler.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-#include "stdafx.h"
-#include "MouseHandler.h"
-#include "Emu/System.h"
-#include "util/serialization.hpp"
-
-#include <algorithm>
-
-MouseHandlerBase::MouseHandlerBase(utils::serial* ar)
-{
-	if (!ar)
-	{
-		return;
-	}
-
-	(*ar)(m_info.max_connect);
-
-	if (m_info.max_connect)
-	{
-		Emu.PostponeInitCode([this]()
-		{
-			Init(m_info.max_connect);
-			auto lk = init.init();
-		});
-	}
-}
-
-void MouseHandlerBase::save(utils::serial& ar)
-{
-	const auto inited = init.access();
-
-	ar(inited ? m_info.max_connect : 0);
-}
-
-bool MouseHandlerBase::is_time_for_update(double elapsed_time_ms)
-{
-	steady_clock::time_point now = steady_clock::now();
-	const double elapsed_ms = (now - last_update).count() / 1'000'000.;
-
-	if (elapsed_ms > elapsed_time_ms)
-	{
-		last_update = now;
-		return true;
-	}
-	return false;
-}
-
-void MouseHandlerBase::Button(u32 index, u8 button, bool pressed)
-{
-	std::lock_guard lock(mutex);
-
-	if (index < m_mice.size())
-	{
-		if (m_info.status[index] != CELL_MOUSE_STATUS_CONNECTED)
-		{
-			return;
-		}
-
-		Mouse& mouse = m_mice[index];
-		MouseDataList& datalist = GetDataList(index);
-
-		if (datalist.size() > MOUSE_MAX_DATA_LIST_NUM)
-		{
-			datalist.pop_front();
-		}
-
-		if (pressed)
-			mouse.buttons |= button;
-		else
-			mouse.buttons &= ~button;
-
-		MouseData new_data{};
-		new_data.update = CELL_MOUSE_DATA_UPDATE;
-		new_data.buttons = mouse.buttons;
-
-		datalist.push_back(std::move(new_data));
-	}
-}
-
-void MouseHandlerBase::Scroll(u32 index, s8 x, s8 y)
-{
-	std::lock_guard lock(mutex);
-
-	if (index < m_mice.size())
-	{
-		if (m_info.status[index] != CELL_MOUSE_STATUS_CONNECTED)
-		{
-			return;
-		}
-
-		Mouse& mouse = m_mice[index];
-		MouseDataList& datalist = GetDataList(index);
-
-		if (datalist.size() > MOUSE_MAX_DATA_LIST_NUM)
-		{
-			datalist.pop_front();
-		}
-
-		MouseData new_data{};
-		new_data.update = CELL_MOUSE_DATA_UPDATE;
-		new_data.buttons = mouse.buttons;
-		new_data.wheel = y;
-		new_data.tilt = x;
-
-		datalist.push_back(std::move(new_data));
-	}
-}
-
-void MouseHandlerBase::Move(u32 index, s32 x_pos_new, s32 y_pos_new, s32 x_max, s32 y_max, bool is_relative, s32 x_delta, s32 y_delta)
-{
-	std::lock_guard lock(mutex);
-
-	if (index < m_mice.size())
-	{
-		if (m_info.status[index] != CELL_MOUSE_STATUS_CONNECTED)
-		{
-			return;
-		}
-
-		Mouse& mouse = m_mice[index];
-		MouseDataList& datalist = GetDataList(index);
-
-		if (datalist.size() > MOUSE_MAX_DATA_LIST_NUM)
-		{
-			datalist.pop_front();
-		}
-
-		MouseData new_data{};
-		new_data.update = CELL_MOUSE_DATA_UPDATE;
-		new_data.buttons = mouse.buttons;
-
-		if (!is_relative)
-		{
-			// The PS3 expects relative mouse movement, so we have to calculate it with the last absolute position.
-			x_delta = x_pos_new - mouse.x_pos;
-			y_delta = y_pos_new - mouse.y_pos;
-		}
-
-		new_data.x_axis = static_cast<s8>(std::clamp(x_delta, -127, 128));
-		new_data.y_axis = static_cast<s8>(std::clamp(y_delta, -127, 128));
-
-		mouse.x_max = x_max;
-		mouse.y_max = y_max;
-		mouse.x_pos = x_pos_new;
-		mouse.y_pos = y_pos_new;
-
-		//CellMouseRawData& rawdata = GetRawData(p);
-		//rawdata.data[rawdata.len % CELL_MOUSE_MAX_CODES] = 0; // (TODO)
-		//rawdata.len++;
-
-		datalist.push_back(std::move(new_data));
-	}
-}
-
-void MouseHandlerBase::SetIntercepted(bool intercepted)
-{
-	std::lock_guard lock(mutex);
-
-	m_info.info = intercepted ? CELL_MOUSE_INFO_INTERCEPTED : 0;
-
-	if (intercepted)
-	{
-		for (Mouse& mouse : m_mice)
-		{
-			mouse = {};
-		}
-	}
-}
diff --git a/rpcs3/Emu/Io/MouseHandler.h b/rpcs3/Emu/Io/MouseHandler.h
index 8a88241523..12dd31a10a 100644
--- a/rpcs3/Emu/Io/MouseHandler.h
+++ b/rpcs3/Emu/Io/MouseHandler.h
@@ -1,11 +1,10 @@
 #pragma once
 
 #include <list>
+#include <algorithm>
 #include <vector>
-#include "Utilities/StrFmt.h"
 #include "Utilities/mutex.h"
 #include "util/init_mutex.hpp"
-#include "Emu/system_config_types.h"
 
 // TODO: HLE info (constants, structs, etc.) should not be available here
 
@@ -49,59 +48,64 @@ enum
 	CELL_MOUSE_INFO_INTERCEPTED = 1
 };
 
-static inline MouseButtonCodes get_mouse_button_code(int i)
-{
-	switch (i)
-	{
-	case 0:	return CELL_MOUSE_BUTTON_1;
-	case 1:	return CELL_MOUSE_BUTTON_2;
-	case 2:	return CELL_MOUSE_BUTTON_3;
-	case 3:	return CELL_MOUSE_BUTTON_4;
-	case 4:	return CELL_MOUSE_BUTTON_5;
-	case 5:	return CELL_MOUSE_BUTTON_6;
-	case 6:	return CELL_MOUSE_BUTTON_7;
-	case 7:	return CELL_MOUSE_BUTTON_8;
-	default: fmt::throw_exception("get_mouse_button_code: Invalid index %d", i);
-	}
-}
-
 static const u32 MAX_MICE = 127;
 static const u32 MOUSE_MAX_DATA_LIST_NUM = 8;
 static const u32 MOUSE_MAX_CODES = 64;
 
 struct MouseInfo
 {
-	u32 max_connect = 0;
-	u32 now_connect = 0;
-	u32 info = 0;
-	u32 mode[MAX_MICE]{}; // TODO: tablet support
-	u32 tablet_is_supported[MAX_MICE]{}; // TODO: tablet support
-	u16 vendor_id[MAX_MICE]{};
-	u16 product_id[MAX_MICE]{};
-	u8 status[MAX_MICE]{};
-	bool is_null_handler = false;
+	u32 max_connect;
+	u32 now_connect;
+	u32 info;
+	u32 mode[MAX_MICE]; // TODO: tablet support
+	u32 tablet_is_supported[MAX_MICE]; // TODO: tablet support
+	u16 vendor_id[MAX_MICE];
+	u16 product_id[MAX_MICE];
+	u8 status[MAX_MICE];
 };
 
 struct MouseRawData
 {
-	s32 len = 0;
-	u8 data[MOUSE_MAX_CODES]{};
+	s32 len;
+	u8 data[MOUSE_MAX_CODES];
+
+	MouseRawData()
+		: len(0)
+		, data()
+	{
+	}
 };
 
 struct MouseData
 {
-	u8 update = 0;
-	u8 buttons = 0;
-	s8 x_axis = 0;
-	s8 y_axis = 0;
-	s8 wheel = 0;
-	s8 tilt = 0;
+	u8 update;
+	u8 buttons;
+	s8 x_axis;
+	s8 y_axis;
+	s8 wheel;
+	s8 tilt;  // (TODO)
+
+	MouseData()
+		: update(0)
+		, buttons(0)
+		, x_axis(0)
+		, y_axis(0)
+		, wheel(0)
+		, tilt(0)
+	{
+	}
 };
 
 struct MouseTabletData
 {
-	s32 len = 0;
-	u8 data[MOUSE_MAX_CODES]{};
+	s32 len;
+	u8 data[MOUSE_MAX_CODES];
+
+	MouseTabletData()
+		: len(0)
+		, data()
+	{
+	}
 };
 
 using MouseTabletDataList = std::list<MouseTabletData>;
@@ -109,25 +113,45 @@ using MouseDataList = std::list<MouseData>;
 
 struct Mouse
 {
-	s32 x_pos = 0;
-	s32 y_pos = 0;
-	s32 x_max = 0;
-	s32 y_max = 0;
-	u8 buttons = 0; // actual mouse button positions
+	s32 x_pos;
+	s32 y_pos;
+	s32 x_max;
+	s32 y_max;
+	u8 buttons; // actual mouse button positions
 
-	MouseTabletDataList m_tablet_datalist{};
-	MouseDataList m_datalist{};
-	MouseRawData m_rawdata{};
+	MouseTabletDataList m_tablet_datalist;
+	MouseDataList m_datalist;
+	MouseRawData m_rawdata;
+
+	Mouse()
+		: x_pos(0)
+		, y_pos(0)
+		, x_max(0)
+		, y_max(0)
+		, buttons(0)
+	{
+	}
 };
 
 class MouseHandlerBase
 {
 protected:
-	MouseInfo m_info{};
+	MouseInfo m_info;
 	std::vector<Mouse> m_mice;
-	steady_clock::time_point last_update{};
+	steady_clock::time_point last_update;
 
-	bool is_time_for_update(double elapsed_time_ms = 10.0); // 4-10 ms, let's use 10 for now
+	bool is_time_for_update(double elapsed_time = 10.0) // 4-10 ms, let's use 10 for now
+	{
+		steady_clock::time_point now = steady_clock::now();
+		double elapsed = (now - last_update).count() / 1000'000.;
+
+		if (elapsed > elapsed_time)
+		{
+			last_update = now;
+			return true;
+		}
+		return false;
+	}
 
 public:
 	shared_mutex mutex;
@@ -135,19 +159,122 @@ public:
 	virtual void Init(const u32 max_connect) = 0;
 	virtual ~MouseHandlerBase() = default;
 
-	SAVESTATE_INIT_POS(18);
+	void Button(u8 button, bool pressed)
+	{
+		std::lock_guard lock(mutex);
 
-	MouseHandlerBase(){};
-	MouseHandlerBase(const MouseHandlerBase&) = delete;
-	MouseHandlerBase(utils::serial* ar);
-	MouseHandlerBase(utils::serial& ar) : MouseHandlerBase(&ar) {}
-	void save(utils::serial& ar);
+		for (u32 p = 0; p < m_mice.size(); ++p)
+		{
+			if (m_info.status[p] != CELL_MOUSE_STATUS_CONNECTED)
+			{
+				continue;
+			}
 
-	void Button(u32 index, u8 button, bool pressed);
-	void Scroll(u32 index, s8 x, s8 y);
-	void Move(u32 index, s32 x_pos_new, s32 y_pos_new, s32 x_max, s32 y_max, bool is_relative = false, s32 x_delta = 0, s32 y_delta = 0);
+			MouseDataList& datalist = GetDataList(p);
 
-	void SetIntercepted(bool intercepted);
+			if (datalist.size() > MOUSE_MAX_DATA_LIST_NUM)
+			{
+				datalist.pop_front();
+			}
+
+			if (pressed)
+				m_mice[p].buttons |= button;
+			else
+				m_mice[p].buttons &= ~button;
+
+			MouseData new_data;
+			new_data.update = CELL_MOUSE_DATA_UPDATE;
+			new_data.buttons = m_mice[p].buttons;
+
+			datalist.push_back(new_data);
+		}
+	}
+
+	void Scroll(const s8 rotation)
+	{
+		std::lock_guard lock(mutex);
+
+		for (u32 p = 0; p < m_mice.size(); ++p)
+		{
+			if (m_info.status[p] != CELL_MOUSE_STATUS_CONNECTED)
+			{
+				continue;
+			}
+
+			MouseDataList& datalist = GetDataList(p);
+
+			if (datalist.size() > MOUSE_MAX_DATA_LIST_NUM)
+			{
+				datalist.pop_front();
+			}
+
+			MouseData new_data;
+			new_data.update = CELL_MOUSE_DATA_UPDATE;
+			new_data.wheel = rotation / 120; //120=event.GetWheelDelta()
+			new_data.buttons = m_mice[p].buttons;
+
+			datalist.push_back(new_data);
+		}
+	}
+
+	void Move(s32 x_pos_new, s32 y_pos_new, s32 x_max, s32 y_max, const bool is_qt_fullscreen = false, s32 x_delta = 0, s32 y_delta = 0)
+	{
+		std::lock_guard lock(mutex);
+
+		for (u32 p = 0; p < m_mice.size(); ++p)
+		{
+			if (m_info.status[p] != CELL_MOUSE_STATUS_CONNECTED)
+			{
+				continue;
+			}
+
+			MouseDataList& datalist = GetDataList(p);
+
+			if (datalist.size() > MOUSE_MAX_DATA_LIST_NUM)
+			{
+				datalist.pop_front();
+			}
+
+			MouseData new_data;
+			new_data.update = CELL_MOUSE_DATA_UPDATE;
+			new_data.buttons = m_mice[p].buttons;
+
+			if (!is_qt_fullscreen)
+			{
+				x_delta = x_pos_new - m_mice[p].x_pos;
+				y_delta = y_pos_new - m_mice[p].y_pos;
+			}
+
+			new_data.x_axis = static_cast<s8>(std::clamp(x_delta, -127, 128));
+			new_data.y_axis = static_cast<s8>(std::clamp(y_delta, -127, 128));
+
+			m_mice[p].x_max = x_max;
+			m_mice[p].y_max = y_max;
+			m_mice[p].x_pos = x_pos_new;
+			m_mice[p].y_pos = y_pos_new;
+
+			/*CellMouseRawData& rawdata = GetRawData(p);
+			rawdata.data[rawdata.len % CELL_MOUSE_MAX_CODES] = 0; // (TODO)
+			rawdata.len++;*/
+
+			datalist.push_back(new_data);
+		}
+	}
+
+	void SetIntercepted(bool intercepted)
+	{
+		std::lock_guard lock(mutex);
+
+		m_info.info = intercepted ? CELL_MOUSE_INFO_INTERCEPTED : 0;
+
+		if (intercepted)
+		{
+			for (Mouse& mouse : m_mice)
+			{
+				mouse = {};
+			}
+		}
+	}
 
 	MouseInfo& GetInfo() { return m_info; }
 	std::vector<Mouse>& GetMice() { return m_mice; }
@@ -156,6 +283,4 @@ public:
 	MouseRawData& GetRawData(const u32 mouse) { return m_mice[mouse].m_rawdata; }
 
 	stx::init_mutex init;
-
-	mouse_handler type = mouse_handler::null;
 };
diff --git a/rpcs3/Emu/Io/Null/NullKeyboardHandler.h b/rpcs3/Emu/Io/Null/NullKeyboardHandler.h
index 8f1b10e01b..31ac520063 100644
--- a/rpcs3/Emu/Io/Null/NullKeyboardHandler.h
+++ b/rpcs3/Emu/Io/Null/NullKeyboardHandler.h
@@ -4,21 +4,15 @@
 
 class NullKeyboardHandler final : public KeyboardHandlerBase
 {
-	using KeyboardHandlerBase::KeyboardHandlerBase;
-
 public:
-	void Init(keyboard_consumer& consumer, const u32 max_connect) override
+	void Init(const u32 max_connect) override
 	{
-		KbInfo& info = consumer.GetInfo();
-		std::vector<Keyboard>& keyboards = consumer.GetKeyboards();
-
-		info = {};
-		info.max_connect = max_connect;
-		info.is_null_handler = true;
-		keyboards.clear();
+		m_info = {};
+		m_info.max_connect = max_connect;
+		m_keyboards.clear();
 		for (u32 i = 0; i < max_connect; i++)
 		{
-			keyboards.emplace_back(Keyboard());
+			m_keyboards.emplace_back(Keyboard());
 		}
 	}
 };
diff --git a/rpcs3/Emu/Io/Null/NullMouseHandler.h b/rpcs3/Emu/Io/Null/NullMouseHandler.h
index 4d2bae2a2a..1c451fa4c0 100644
--- a/rpcs3/Emu/Io/Null/NullMouseHandler.h
+++ b/rpcs3/Emu/Io/Null/NullMouseHandler.h
@@ -4,14 +4,11 @@
 
 class NullMouseHandler final : public MouseHandlerBase
 {
-	using MouseHandlerBase::MouseHandlerBase;
-
 public:
 	void Init(const u32 max_connect) override
 	{
 		m_info = {};
 		m_info.max_connect = max_connect;
-		m_info.is_null_handler = true;
 		m_mice.clear();
 	}
 };
diff --git a/rpcs3/Emu/Io/Null/NullPadHandler.h b/rpcs3/Emu/Io/Null/NullPadHandler.h
index afb59ea704..dcba405059 100644
--- a/rpcs3/Emu/Io/Null/NullPadHandler.h
+++ b/rpcs3/Emu/Io/Null/NullPadHandler.h
@@ -9,6 +9,11 @@ public:
 	{
 		b_has_pressure_intensity_button = false;
 	}
+	
+	bool Init() override
+	{
+		return true;
+	}
 
 	void init_config(cfg_pad* cfg) override
 	{
@@ -42,26 +47,24 @@ public:
 		cfg->l3.def       = "";
 
 		cfg->pressure_intensity_button.def = "";
-		cfg->analog_limiter_button.def = "";
-		cfg->orientation_reset_button.def = "";
 
 		// Apply defaults
 		cfg->from_default();
 	}
 
-	std::vector<pad_list_entry> list_devices() override
+	std::vector<std::string> ListDevices() override
 	{
-		std::vector<pad_list_entry> nulllist;
-		nulllist.emplace_back("Default Null Device", false);
+		std::vector<std::string> nulllist;
+		nulllist.emplace_back("Default Null Device");
 		return nulllist;
 	}
 
-	bool bindPadToDevice(std::shared_ptr<Pad> /*pad*/) override
+	bool bindPadToDevice(std::shared_ptr<Pad> /*pad*/, const std::string& /*device*/, u8 /*player_id*/) override
 	{
 		return true;
 	}
 
-	void process() override
+	void ThreadProc() override
 	{
 	}
 };
diff --git a/rpcs3/Emu/Io/Null/null_camera_handler.h b/rpcs3/Emu/Io/Null/null_camera_handler.h
deleted file mode 100644
index a250facd75..0000000000
--- a/rpcs3/Emu/Io/Null/null_camera_handler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include "Emu/Io/camera_handler_base.h"
-
-class null_camera_handler final : public camera_handler_base
-{
-public:
-	null_camera_handler() : camera_handler_base() {}
-
-	void open_camera() override { set_state(camera_handler_state::open); }
-	void close_camera() override { set_state(camera_handler_state::closed); }
-	void start_camera() override { set_state(camera_handler_state::running); }
-	void stop_camera() override { set_state(camera_handler_state::open); }
-
-	void set_format(s32 format, u32 bytesize) override
-	{
-		m_format = format;
-		m_bytesize = bytesize;
-	}
-
-	void set_frame_rate(u32 frame_rate) override
-	{
-		m_frame_rate = frame_rate;
-	}
-
-	void set_resolution(u32 width, u32 height) override
-	{
-		m_width = width;
-		m_height = height;
-	};
-
-	void set_mirrored(bool mirrored) override
-	{
-		m_mirrored = mirrored;
-	}
-
-	u64 frame_number() const override
-	{
-		return 0;
-	}
-
-	camera_handler_state get_image(u8* /*buf*/, u64 /*size*/, u32& width, u32& height, u64& frame_number, u64& bytes_read) override
-	{
-		width = 0;
-		height = 0;
-		frame_number = 0;
-		bytes_read = 0;
-		return get_state();
-	}
-};
diff --git a/rpcs3/Emu/Io/Null/null_music_handler.h b/rpcs3/Emu/Io/Null/null_music_handler.h
deleted file mode 100644
index fe022dc79e..0000000000
--- a/rpcs3/Emu/Io/Null/null_music_handler.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "Emu/Io/music_handler_base.h"
-
-class null_music_handler final : public music_handler_base
-{
-public:
-	null_music_handler() : music_handler_base() {}
-
-	void stop() override { m_state = 0; } // CELL_MUSIC_PB_STATUS_STOP
-	void pause() override { m_state = 2; } // CELL_MUSIC_PB_STATUS_PAUSE
-	void play(const std::string& /*path*/) override { m_state = 1; } // CELL_MUSIC_PB_STATUS_PLAY
-	void fast_forward(const std::string& /*path*/) override { m_state = 3; } // CELL_MUSIC_PB_STATUS_FASTFORWARD
-	void fast_reverse(const std::string& /*path*/) override { m_state = 4; } // CELL_MUSIC_PB_STATUS_FASTREVERSE
-	void set_volume(f32 volume) override { m_volume = volume; }
-	f32 get_volume() const override { return m_volume; }
-
-private:
-	atomic_t<f32> m_volume{0.0f};
-};
diff --git a/rpcs3/Emu/Io/PadHandler.cpp b/rpcs3/Emu/Io/PadHandler.cpp
index 19b9347da6..e9ece45819 100644
--- a/rpcs3/Emu/Io/PadHandler.cpp
+++ b/rpcs3/Emu/Io/PadHandler.cpp
@@ -1,152 +1,214 @@
 #include "stdafx.h"
 #include "PadHandler.h"
-#include "Emu/system_config.h"
-#include "Emu/Cell/timers.hpp"
+#include "Emu/system_utils.hpp"
 #include "Input/pad_thread.h"
 #include "Input/product_info.h"
 
 cfg_input g_cfg_input;
 
+LOG_CHANNEL(input_log, "Input");
+
 PadHandlerBase::PadHandlerBase(pad_handler type) : m_type(type)
 {
 }
 
-std::set<u32> PadHandlerBase::narrow_set(const std::set<u64>& src)
+// Search an unordered map for a string value and return found keycode
+int PadHandlerBase::FindKeyCode(const std::unordered_map<u32, std::string>& map, const cfg::string& name, bool fallback)
 {
-	if (src.empty())
-		return {};
+	const std::string def = name.def;
+	const std::string nam = name.to_string();
+	int def_code = -1;
 
-	std::set<u32> dst;
-	for (const u64& s : src)
+	for (auto it = map.begin(); it != map.end(); ++it)
 	{
-		dst.insert(::narrow<u32>(s));
-	}
-	return dst;
-}
+		if (it->second == nam)
+			return it->first;
 
-// Get new multiplied value based on the multiplier
-s32 PadHandlerBase::MultipliedInput(s32 raw_value, s32 multiplier)
-{
-	return (multiplier * raw_value) / 100;
-}
-
-// Get new scaled value between 0 and range based on its minimum and maximum
-f32 PadHandlerBase::ScaledInput(f32 raw_value, f32 minimum, f32 maximum, f32 deadzone, f32 range)
-{
-	if (deadzone > 0 && deadzone > minimum)
-	{
-		// adjust minimum so we smoothly start at 0 when we surpass the deadzone value
-		minimum = deadzone;
+		if (fallback && it->second == def)
+			def_code = it->first;
 	}
 
-	// convert [min, max] to [0, 1]
-	const f32 val = static_cast<f32>(std::clamp(raw_value, minimum, maximum) - minimum) / (maximum - minimum);
-
-	// convert [0, 1] to [0, range]
-	return range * val;
-}
-
-// Get new scaled value between -range and range based on its minimum and maximum
-f32 PadHandlerBase::ScaledAxisInput(f32 raw_value, f32 minimum, f32 maximum, f32 deadzone, f32 range)
-{
-	// convert [min, max] to [0, 1]
-	f32 val = static_cast<f32>(std::clamp(raw_value, minimum, maximum) - minimum) / (maximum - minimum);
-
-	if (deadzone > 0)
+	if (fallback)
 	{
-		// convert [0, 1] to [-0.5, 0.5]
-		val -= 0.5f;
+		if (!nam.empty())
+			input_log.error("int FindKeyCode for [name = %s] returned with [def_code = %d] for [def = %s]", nam, def_code, def);
 
-		// Convert deadzone to [0, 0.5]
-		deadzone = std::max(0.0f, std::min(1.0f, deadzone / maximum)) / 2.0f;
-
-		if (val >= 0.0f)
-		{
-			// Apply deadzone. The result will be [0, 0.5]
-			val = ScaledInput(val, 0.0f, 0.5f, deadzone, 0.5f);
-		}
-		else
-		{
-			// Apply deadzone. The result will be [-0.5, 0]
-			val = ScaledInput(std::abs(val), 0, 0.5f, deadzone, 0.5f) * -1.0f;
-		}
-
-		// convert [-0.5, 0.5] back to [0, 1]
-		val += 0.5f;
+		if (def_code < 0)
+			def_code = 0;
 	}
 
-	// convert [0, 1] to [-range, range]
-	return (2.0f * range * val) - range;
+	return def_code;
+}
+
+long PadHandlerBase::FindKeyCode(const std::unordered_map<u64, std::string>& map, const cfg::string& name, bool fallback)
+{
+	const std::string def = name.def;
+	const std::string nam = name.to_string();
+	long def_code = -1;
+
+	for (auto it = map.begin(); it != map.end(); ++it)
+	{
+		if (it->second == nam)
+			return static_cast<long>(it->first);
+
+		if (fallback && it->second == def)
+			def_code = static_cast<long>(it->first);
+	}
+
+	if (fallback)
+	{
+		if (!nam.empty())
+			input_log.error("long FindKeyCode for [name = %s] returned with [def_code = %d] for [def = %s]", nam, def_code, def);
+
+		if (def_code < 0)
+			def_code = 0;
+	}
+
+	return def_code;
+}
+
+// Search an unordered map for a string value and return found keycode
+int PadHandlerBase::FindKeyCodeByString(const std::unordered_map<u32, std::string>& map, const std::string& name, bool fallback)
+{
+	for (auto it = map.begin(); it != map.end(); ++it)
+	{
+		if (it->second == name)
+			return it->first;
+	}
+
+	if (fallback)
+	{
+		if (!name.empty())
+			input_log.error("long FindKeyCodeByString for [name = %s] returned with 0", name);
+		return 0;
+	}
+
+	return -1;
+}
+
+// Search an unordered map for a string value and return found keycode
+long PadHandlerBase::FindKeyCodeByString(const std::unordered_map<u64, std::string>& map, const std::string& name, bool fallback)
+{
+	for (auto it = map.begin(); it != map.end(); ++it)
+	{
+		if (it->second == name)
+			return static_cast<long>(it->first);
+	}
+
+	if (fallback)
+	{
+		if (!name.empty())
+			input_log.error("long FindKeyCodeByString for [name = %s] returned with 0", name);
+		return 0;
+	}
+
+	return -1;
+}
+
+// Get new scaled value between 0 and 255 based on its minimum and maximum
+float PadHandlerBase::ScaledInput(s32 raw_value, int minimum, int maximum)
+{
+	// value based on max range converted to [0, 1]
+	const float val = static_cast<float>(std::clamp(raw_value, minimum, maximum) - minimum) / (abs(maximum) + abs(minimum));
+	return 255.0f * val;
+}
+
+// Get new scaled value between -255 and 255 based on its minimum and maximum
+float PadHandlerBase::ScaledInput2(s32 raw_value, int minimum, int maximum)
+{
+	// value based on max range converted to [0, 1]
+	const float val = static_cast<float>(std::clamp(raw_value, minimum, maximum) - minimum) / (abs(maximum) + abs(minimum));
+	return (510.0f * val) - 255.0f;
 }
 
 // Get normalized trigger value based on the range defined by a threshold
-u16 PadHandlerBase::NormalizeTriggerInput(u16 value, u32 threshold) const
+u16 PadHandlerBase::NormalizeTriggerInput(u16 value, int threshold) const
 {
 	if (value <= threshold || threshold >= trigger_max)
 	{
 		return static_cast<u16>(0);
 	}
-
-	return static_cast<u16>(ScaledInput(static_cast<f32>(value), static_cast<f32>(trigger_min), static_cast<f32>(trigger_max), static_cast<f32>(threshold)));
+	else if (threshold <= trigger_min)
+	{
+		return static_cast<u16>(ScaledInput(value, trigger_min, trigger_max));
+	}
+	else
+	{
+		const s32 val = static_cast<s32>(static_cast<float>(trigger_max) * (value - threshold) / (trigger_max - threshold));
+		return static_cast<u16>(ScaledInput(val, trigger_min, trigger_max));
+	}
 }
 
 // normalizes a directed input, meaning it will correspond to a single "button" and not an axis with two directions
 // the input values must lie in 0+
 u16 PadHandlerBase::NormalizeDirectedInput(s32 raw_value, s32 threshold, s32 maximum) const
 {
-	if (threshold >= maximum || maximum <= 0 || raw_value < 0)
+	if (threshold >= maximum || maximum <= 0)
 	{
 		return static_cast<u16>(0);
 	}
 
-	return static_cast<u16>(ScaledInput(static_cast<f32>(raw_value), 0.0f, static_cast<f32>(maximum), static_cast<f32>(threshold)));
+	const float val = static_cast<float>(std::clamp(raw_value, 0, maximum)) / maximum; // value based on max range converted to [0, 1]
+
+	if (threshold <= 0)
+	{
+		return static_cast<u16>(255.0f * val);
+	}
+	else
+	{
+		const float thresh = static_cast<float>(threshold) / maximum; // threshold converted to [0, 1]
+		return static_cast<u16>(255.0f * std::min(1.0f, (val - thresh) / (1.0f - thresh)));
+	}
 }
 
-u16 PadHandlerBase::NormalizeStickInput(u16 raw_value, s32 threshold, s32 multiplier, bool ignore_threshold) const
+u16 PadHandlerBase::NormalizeStickInput(u16 raw_value, int threshold, int multiplier, bool ignore_threshold) const
 {
-	const s32 scaled_value = MultipliedInput(raw_value, multiplier);
+	const s32 scaled_value = (multiplier * raw_value) / 100;
 
 	if (ignore_threshold)
 	{
-		threshold = 0;
+		return static_cast<u16>(ScaledInput(scaled_value, 0, thumb_max));
+	}
+	else
+	{
+		return NormalizeDirectedInput(scaled_value, threshold, thumb_max);
 	}
-
-	return static_cast<u16>(ScaledInput(static_cast<f32>(scaled_value), 0.0f, static_cast<f32>(thumb_max), static_cast<f32>(threshold)));
 }
 
-// This function normalizes stick deadzone based on the DS3's deadzone, which is ~13% (default of anti deadzone)
+// This function normalizes stick deadzone based on the DS3's deadzone, which is ~13%
 // X and Y is expected to be in (-255) to 255 range, deadzone should be in terms of thumb stick range
 // return is new x and y values in 0-255 range
-std::tuple<u16, u16> PadHandlerBase::NormalizeStickDeadzone(s32 inX, s32 inY, u32 deadzone, u32 anti_deadzone) const
+std::tuple<u16, u16> PadHandlerBase::NormalizeStickDeadzone(s32 inX, s32 inY, u32 deadzone) const
 {
-	f32 X = inX / 255.0f;
-	f32 Y = inY / 255.0f;
+	const float dz_range = deadzone / static_cast<float>(std::abs(thumb_max)); // NOTE: thumb_max should be positive anyway
 
-	const f32 mag = std::min(sqrtf(X * X + Y * Y), 1.f);
+	float X = inX / 255.0f;
+	float Y = inY / 255.0f;
 
-	if (mag > 0.f)
+	if (dz_range > 0.f)
 	{
-		const f32 dz_max = static_cast<f32>(thumb_max);
-		const f32 dz = deadzone / dz_max;
-		const f32 anti_dz = anti_deadzone / dz_max;
+		const float mag = std::min(sqrtf(X * X + Y * Y), 1.f);
 
-		f32 pos;
-
-		if (dz <= 0.f || mag > dz)
+		if (mag <= 0)
 		{
-			const f32 range = 1.f - dz;
-			pos = std::lerp(anti_dz, 1.f, (mag - dz) / range);
+			return std::tuple<u16, u16>(ConvertAxis(X), ConvertAxis(Y));
+		}
+
+		if (mag > dz_range)
+		{
+			const float pos = std::lerp(0.13f, 1.f, (mag - dz_range) / (1 - dz_range));
+			const float scale = pos / mag;
+			X = X * scale;
+			Y = Y * scale;
 		}
 		else
 		{
-			pos = std::lerp(0.f, anti_dz, mag / dz);
+			const float pos = std::lerp(0.f, 0.13f, mag / dz_range);
+			const float scale = pos / mag;
+			X = X * scale;
+			Y = Y * scale;
 		}
-
-		const f32 scale = pos / mag;
-		X *= scale;
-		Y *= scale;
 	}
-
 	return std::tuple<u16, u16>(ConvertAxis(X), ConvertAxis(Y));
 }
 
@@ -163,37 +225,78 @@ u16 PadHandlerBase::Clamp0To1023(f32 input)
 }
 
 // input has to be [-1,1]. result will be [0,255]
-u16 PadHandlerBase::ConvertAxis(f32 value)
+u16 PadHandlerBase::ConvertAxis(float value)
 {
-	return static_cast<u16>((value + 1.0) * (255.0 / 2.0));
+	return static_cast<u16>((value + 1.0)*(255.0 / 2.0));
 }
 
 // The DS3, (and i think xbox controllers) give a 'square-ish' type response, so that the corners will give (almost)max x/y instead of the ~30x30 from a perfect circle
 // using a simple scale/sensitivity increase would *work* although it eats a chunk of our usable range in exchange
 // this might be the best for now, in practice it seems to push the corners to max of 20x20, with a squircle_factor of 8000
 // This function assumes inX and inY is already in 0-255
-void PadHandlerBase::ConvertToSquirclePoint(u16& inX, u16& inY, u32 squircle_factor)
+std::tuple<u16, u16> PadHandlerBase::ConvertToSquirclePoint(u16 inX, u16 inY, int squircle_factor)
 {
-	if (!squircle_factor)
-		return;
-
-	constexpr f32 radius = 127.5f;
-
 	// convert inX and Y to a (-1, 1) vector;
-	const f32 x = (inX - radius) / radius;
-	const f32 y = (inY - radius) / radius;
+	const f32 x = (inX - 127.5f) / 127.5f;
+	const f32 y = (inY - 127.5f) / 127.5f;
 
-	// compute angle and len of given point to be used for squircle radius. Clamp to circle, we don't want to exceed the squircle.
+	// compute angle and len of given point to be used for squircle radius
 	const f32 angle = std::atan2(y, x);
-	const f32 distance_to_center = std::min(1.0f, std::sqrt(std::pow(x, 2.f) + std::pow(y, 2.f)));
+	const f32 r = std::sqrt(std::pow(x, 2.f) + std::pow(y, 2.f));
 
 	// now find len/point on the given squircle from our current angle and radius in polar coords
 	// https://thatsmaths.com/2016/07/14/squircles/
-	const f32 new_len = (1 + std::pow(std::sin(2 * angle), 2.f) / (squircle_factor / 1000.f)) * distance_to_center;
+	const f32 newLen = (1 + std::pow(std::sin(2 * angle), 2.f) / (squircle_factor / 1000.f)) * r;
 
 	// we now have len and angle, convert to cartesian
-	inX = Clamp0To255(std::round(((new_len * std::cos(angle)) + 1) * radius));
-	inY = Clamp0To255(std::round(((new_len * std::sin(angle)) + 1) * radius));
+	const int newX = Clamp0To255(((newLen * std::cos(angle)) + 1) * 127.5f);
+	const int newY = Clamp0To255(((newLen * std::sin(angle)) + 1) * 127.5f);
+	return std::tuple<u16, u16>(newX, newY);
+}
+
+std::string PadHandlerBase::name_string() const
+{
+	return m_name_string;
+}
+
+usz PadHandlerBase::max_devices() const
+{
+	return m_max_devices;
+}
+
+bool PadHandlerBase::has_config() const
+{
+	return b_has_config;
+}
+
+bool PadHandlerBase::has_rumble() const
+{
+	return b_has_rumble;
+}
+
+bool PadHandlerBase::has_deadzones() const
+{
+	return b_has_deadzones;
+}
+
+bool PadHandlerBase::has_led() const
+{
+	return b_has_led;
+}
+
+bool PadHandlerBase::has_rgb() const
+{
+	return b_has_rgb;
+}
+
+bool PadHandlerBase::has_battery() const
+{
+	return b_has_battery;
+}
+
+bool PadHandlerBase::has_pressure_intensity_button() const
+{
+	return b_has_pressure_intensity_button;
 }
 
 void PadHandlerBase::init_configs()
@@ -204,220 +307,114 @@ void PadHandlerBase::init_configs()
 	}
 }
 
-cfg_pad* PadHandlerBase::get_config(const std::string& pad_id)
+void PadHandlerBase::get_next_button_press(const std::string& pad_id, const pad_callback& callback, const pad_fail_callback& fail_callback, bool get_blacklist, const std::vector<std::string>& /*buttons*/)
 {
-	int index = 0;
-
-	for (uint i = 0; i < MAX_GAMEPADS; i++)
-	{
-		if (g_cfg_input.player[i]->handler == m_type)
-		{
-			if (g_cfg_input.player[i]->device.to_string() == pad_id)
-			{
-				m_pad_configs[index].from_string(g_cfg_input.player[i]->config.to_string());
-				return &m_pad_configs[index];
-			}
-			index++;
-		}
-	}
-
-	return nullptr;
-}
-
-PadHandlerBase::connection PadHandlerBase::get_next_button_press(const std::string& pad_id, const pad_callback& callback, const pad_fail_callback& fail_callback, gui_call_type call_type, const std::vector<std::string>& /*buttons*/)
-{
-	if (call_type == gui_call_type::blacklist)
+	if (get_blacklist)
 		blacklist.clear();
 
-	if (call_type == gui_call_type::reset_input || call_type == gui_call_type::blacklist)
-		min_button_values.clear();
-
 	auto device = get_device(pad_id);
 
-	const connection status = update_connection(device);
+	const auto status = update_connection(device);
 	if (status == connection::disconnected)
 	{
 		if (fail_callback)
 			fail_callback(pad_id);
-		return status;
-	}
-
-	if (status == connection::no_data || call_type == gui_call_type::get_connection)
-	{
-		return status;
-	}
-
-	if (m_type == pad_handler::move)
-	{
-		// Keep the pad cached to reduce expensive one time requests
-		if (!m_pad_for_pad_settings || m_pad_for_pad_settings->m_pad_handler != m_type)
-		{
-			m_pad_for_pad_settings = std::make_shared<Pad>(m_type, 0, 0, 0, 0);
-		}
-
-		// Get extended device ID
-		pad_ensemble binding{m_pad_for_pad_settings, device, nullptr};
-		get_extended_info(binding);
+		return;
 	}
+	else if (status == connection::no_data)
+		return;
 
 	// Get the current button values
 	auto data = get_button_values(device);
 
 	// Check for each button in our list if its corresponding (maybe remapped) button or axis was pressed.
 	// Return the new value if the button was pressed (aka. its value was bigger than 0 or the defined threshold)
-	// Get all the legally pressed buttons and use the one with highest value (prioritize first)
-	struct
+	// Use a pair to get all the legally pressed buttons and use the one with highest value (prioritize first)
+	std::pair<u16, std::string> pressed_button = { 0, "" };
+	for (const auto& button : button_list)
 	{
-		u16 value = 0;
-		std::string name;
-	} pressed_button{};
-
-	for (const auto& [keycode, name] : button_list)
-	{
-		if (call_type != gui_call_type::blacklist && blacklist.contains(keycode))
-			continue;
-
+		const u32 keycode = button.first;
 		const u16 value = data[keycode];
-		u16& min_value = min_button_values[keycode];
 
-		if (call_type == gui_call_type::reset_input || value < min_value)
-		{
-			min_value = value;
+		if (!get_blacklist && std::find(blacklist.begin(), blacklist.end(), keycode) != blacklist.end())
 			continue;
-		}
 
-		const bool is_trigger = get_is_left_trigger(device, keycode) || get_is_right_trigger(device, keycode);
-		const bool is_stick   = !is_trigger && (get_is_left_stick(device, keycode) || get_is_right_stick(device, keycode));
-		const bool is_touch_motion = !is_trigger && !is_stick && get_is_touch_pad_motion(device, keycode);
-		const bool is_button = !is_trigger && !is_stick && !is_touch_motion;
+		const bool is_trigger = get_is_left_trigger(keycode) || get_is_right_trigger(keycode);
+		const bool is_stick   = !is_trigger && (get_is_left_stick(keycode) || get_is_right_stick(keycode));
+		const bool is_button = !is_trigger && !is_stick;
 
-		if ((is_trigger && (value > m_trigger_threshold)) ||
-			(is_stick && (value > m_thumb_threshold)) ||
-			(is_button && (value > button_press_threshold)) ||
-			(is_touch_motion && (value > touch_threshold)))
+		if ((is_trigger && (value > m_trigger_threshold)) || (is_stick && (value > m_thumb_threshold)) || (is_button && (value > 0)))
 		{
-			if (call_type == gui_call_type::blacklist)
+			if (get_blacklist)
 			{
-				blacklist.insert(keycode);
-				input_log.error("%s Calibration: Added key [ %d = %s ] to blacklist. Value = %d", m_type, keycode, name, value);
-				continue;
-			}
-
-			const u16 diff = value > min_value ? value - min_value : 0;
-
-			if (diff > button_press_threshold && value > pressed_button.value)
-			{
-				pressed_button = { .value = value, .name = name };
+				blacklist.emplace_back(keycode);
+				input_log.error("%s Calibration: Added key [ %d = %s ] to blacklist. Value = %d", m_type, keycode, button.second, value);
 			}
+			else if (value > pressed_button.first)
+				pressed_button = { value, button.second };
 		}
 	}
 
-	if (call_type == gui_call_type::reset_input)
-	{
-		return connection::no_data;
-	}
-
-	if (call_type == gui_call_type::blacklist)
+	if (get_blacklist)
 	{
 		if (blacklist.empty())
 			input_log.success("%s Calibration: Blacklist is clear. No input spam detected", m_type);
-		return status;
+		return;
 	}
 
+	const auto preview_values = get_preview_values(data);
+	const auto battery_level = get_battery_level(pad_id);
+
 	if (callback)
 	{
-		pad_preview_values preview_values = get_preview_values(data);
-		const u32 battery_level = get_battery_level(pad_id);
-
-		if (pressed_button.value > 0)
-			callback(pressed_button.value, pressed_button.name, pad_id, battery_level, std::move(preview_values));
+		if (pressed_button.first > 0)
+			return callback(pressed_button.first, pressed_button.second, pad_id, battery_level, preview_values);
 		else
-			callback(0, "", pad_id, battery_level, std::move(preview_values));
+			return callback(0, "", pad_id, battery_level, preview_values);
 	}
 
-	return status;
+	return;
 }
 
-void PadHandlerBase::get_motion_sensors(const std::string& pad_id, const motion_callback& callback, const motion_fail_callback& fail_callback, motion_preview_values preview_values, const std::array<AnalogSensor, 4>& /*sensors*/)
-{
-	if (!b_has_motion)
-	{
-		return;
-	}
-
-	// Reset sensors
-	auto device = get_device(pad_id);
-
-	const connection status = update_connection(device);
-	if (status == connection::disconnected)
-	{
-		if (fail_callback)
-			fail_callback(pad_id, std::move(preview_values));
-		return;
-	}
-
-	if (status == connection::no_data || !callback)
-	{
-		return;
-	}
-
-	// Keep the pad cached to reduce expensive one time requests
-	if (!m_pad_for_pad_settings || m_pad_for_pad_settings->m_pad_handler != m_type)
-	{
-		m_pad_for_pad_settings = std::make_shared<Pad>(m_type, 0, 0, 0, 0);
-	}
-
-	// Get the current motion values
-	pad_ensemble binding{m_pad_for_pad_settings, device, nullptr};
-	get_extended_info(binding);
-
-	for (usz i = 0; i < preview_values.size(); i++)
-	{
-		preview_values[i] = m_pad_for_pad_settings->m_sensors[i].m_value;
-	}
-
-	callback(pad_id, std::move(preview_values));
-}
-
-void PadHandlerBase::convert_stick_values(u16& x_out, u16& y_out, s32 x_in, s32 y_in, u32 deadzone, u32 anti_deadzone, u32 padsquircling) const
+void PadHandlerBase::convert_stick_values(u16& x_out, u16& y_out, const s32& x_in, const s32& y_in, const s32& deadzone, const s32& padsquircling) const
 {
 	// Normalize our stick axis based on the deadzone
-	std::tie(x_out, y_out) = NormalizeStickDeadzone(x_in, y_in, deadzone, anti_deadzone);
+	std::tie(x_out, y_out) = NormalizeStickDeadzone(x_in, y_in, deadzone);
 
 	// Apply pad squircling if necessary
 	if (padsquircling != 0)
 	{
-		ConvertToSquirclePoint(x_out, y_out, padsquircling);
+		std::tie(x_out, y_out) = ConvertToSquirclePoint(x_out, y_out, padsquircling);
 	}
 }
 
 // Update the pad button values based on their type and thresholds. With this you can use axis or triggers as buttons or vice versa
-void PadHandlerBase::TranslateButtonPress(const std::shared_ptr<PadDevice>& device, u64 keyCode, bool& pressed, u16& val, bool use_stick_multipliers, bool ignore_stick_threshold, bool ignore_trigger_threshold)
+void PadHandlerBase::TranslateButtonPress(const std::shared_ptr<PadDevice>& device, u64 keyCode, bool& pressed, u16& val, bool ignore_stick_threshold, bool ignore_trigger_threshold)
 {
 	if (!device || !device->config)
 	{
 		return;
 	}
 
-	if (get_is_left_trigger(device, keyCode))
+	if (get_is_left_trigger(keyCode))
 	{
 		pressed = val > (ignore_trigger_threshold ? 0 : device->config->ltriggerthreshold);
 		val = pressed ? NormalizeTriggerInput(val, device->config->ltriggerthreshold) : 0;
 	}
-	else if (get_is_right_trigger(device, keyCode))
+	else if (get_is_right_trigger(keyCode))
 	{
 		pressed = val > (ignore_trigger_threshold ? 0 : device->config->rtriggerthreshold);
 		val = pressed ? NormalizeTriggerInput(val, device->config->rtriggerthreshold) : 0;
 	}
-	else if (get_is_left_stick(device, keyCode))
+	else if (get_is_left_stick(keyCode))
 	{
 		pressed = val > (ignore_stick_threshold ? 0 : device->config->lstickdeadzone);
-		val = pressed ? NormalizeStickInput(val, device->config->lstickdeadzone, use_stick_multipliers ? device->config->lstickmultiplier : 100, ignore_stick_threshold) : 0;
+		val = pressed ? NormalizeStickInput(val, device->config->lstickdeadzone, device->config->lstickmultiplier, ignore_stick_threshold) : 0;
 	}
-	else if (get_is_right_stick(device, keyCode))
+	else if (get_is_right_stick(keyCode))
 	{
 		pressed = val > (ignore_stick_threshold ? 0 : device->config->rstickdeadzone);
-		val = pressed ? NormalizeStickInput(val, device->config->rstickdeadzone, use_stick_multipliers ? device->config->rstickmultiplier : 100, ignore_stick_threshold) : 0;
+		val = pressed ? NormalizeStickInput(val, device->config->rstickdeadzone, device->config->rstickmultiplier, ignore_stick_threshold) : 0;
 	}
 	else // normal button (should in theory also support sensitive buttons)
 	{
@@ -426,54 +423,41 @@ void PadHandlerBase::TranslateButtonPress(const std::shared_ptr<PadDevice>& devi
 	}
 }
 
-bool PadHandlerBase::bindPadToDevice(std::shared_ptr<Pad> pad)
+bool PadHandlerBase::bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device, u8 player_id)
 {
-	if (!pad || pad->m_player_id >= g_cfg_input.player.size())
-	{
-		return false;
-	}
-
-	const cfg_player* player_config = g_cfg_input.player[pad->m_player_id];
-	if (!player_config)
-	{
-		return false;
-	}
-
-	std::shared_ptr<PadDevice> pad_device = get_device(player_config->device);
+	std::shared_ptr<PadDevice> pad_device = get_device(device);
 	if (!pad_device)
 	{
-		input_log.error("PadHandlerBase::bindPadToDevice: no PadDevice found for device '%s'", player_config->device.to_string());
+		input_log.error("PadHandlerBase::bindPadToDevice: no PadDevice found for device '%s'", device);
 		return false;
 	}
 
-	m_pad_configs[pad->m_player_id].from_string(player_config->config.to_string());
-	pad_device->config = &m_pad_configs[pad->m_player_id];
-	pad_device->player_id = pad->m_player_id;
+	m_pad_configs[player_id].from_string(g_cfg_input.player[player_id]->config.to_string());
+	pad_device->config = &m_pad_configs[player_id];
+	pad_device->player_id = player_id;
 	cfg_pad* config = pad_device->config;
 	if (config == nullptr)
 	{
-		input_log.error("PadHandlerBase::bindPadToDevice: no profile found for device %d '%s'", m_bindings.size(), player_config->device.to_string());
+		input_log.error("PadHandlerBase::bindPadToDevice: no profile found for device %d '%s'", bindings.size(), device);
 		return false;
 	}
 
-	std::array<std::set<u32>, button::button_count> mapping = get_mapped_key_codes(pad_device, config);
+	std::array<u32, button::button_count> mapping = get_mapped_key_codes(pad_device, config);
 
 	u32 pclass_profile = 0x0;
-	u32 capabilities = CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_HP_ANALOG_STICK | CELL_PAD_CAPABILITY_ACTUATOR | CELL_PAD_CAPABILITY_SENSOR_MODE;
 
-	for (const input::product_info& product : input::get_products_by_class(config->device_class_type))
+	for (const auto& product : input::get_products_by_class(config->device_class_type))
 	{
 		if (product.vendor_id == config->vendor_id && product.product_id == config->product_id)
 		{
 			pclass_profile = product.pclass_profile;
-			capabilities = product.capabilites;
 		}
 	}
 
 	pad->Init
 	(
 		CELL_PAD_STATUS_DISCONNECTED,
-		capabilities,
+		CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_HP_ANALOG_STICK | CELL_PAD_CAPABILITY_ACTUATOR | CELL_PAD_CAPABILITY_SENSOR_MODE,
 		CELL_PAD_DEV_TYPE_STANDARD,
 		config->device_class_type,
 		pclass_profile,
@@ -482,23 +466,8 @@ bool PadHandlerBase::bindPadToDevice(std::shared_ptr<Pad> pad)
 		config->pressure_intensity
 	);
 
-	if (b_has_pressure_intensity_button)
-	{
-		pad->m_buttons.emplace_back(special_button_offset, mapping[button::pressure_intensity_button], special_button_value::pressure_intensity);
-		pad->m_pressure_intensity_button_index = static_cast<s32>(pad->m_buttons.size()) - 1;
-	}
-
-	if (b_has_analog_limiter_button)
-	{
-		pad->m_buttons.emplace_back(special_button_offset, mapping[button::analog_limiter_button], special_button_value::analog_limiter);
-		pad->m_analog_limiter_button_index = static_cast<s32>(pad->m_buttons.size()) - 1;
-	}
-
-	if (b_has_orientation)
-	{
-		pad->m_buttons.emplace_back(special_button_offset, mapping[button::orientation_reset_button], special_button_value::orientation_reset);
-		pad->m_orientation_reset_button_index = static_cast<s32>(pad->m_buttons.size()) - 1;
-	}
+	pad->m_buttons.emplace_back(special_button_offset, mapping[button::pressure_intensity_button], special_button_value::pressure_intensity);
+	pad->m_pressure_intensity_button_index = static_cast<s32>(pad->m_buttons.size()) - 1;
 
 	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, mapping[button::up], CELL_PAD_CTRL_UP);
 	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, mapping[button::down], CELL_PAD_CTRL_DOWN);
@@ -516,197 +485,112 @@ bool PadHandlerBase::bindPadToDevice(std::shared_ptr<Pad> pad)
 	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, mapping[button::r3], CELL_PAD_CTRL_R3);
 	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, mapping[button::start], CELL_PAD_CTRL_START);
 	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, mapping[button::select], CELL_PAD_CTRL_SELECT);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, mapping[button::ps], CELL_PAD_CTRL_PS);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, mapping[button::ps], 0x100/*CELL_PAD_CTRL_PS*/);// TODO: PS button support
+	//pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, 0, 0x0); // Reserved (and currently not in use by rpcs3 at all)
 
-	if (pad->m_class_type == CELL_PAD_PCLASS_TYPE_SKATEBOARD)
-	{
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, mapping[button::skateboard_ir_nose], CELL_PAD_CTRL_PRESS_TRIANGLE);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, mapping[button::skateboard_ir_tail], CELL_PAD_CTRL_PRESS_CIRCLE);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, mapping[button::skateboard_ir_left], CELL_PAD_CTRL_PRESS_CROSS);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, mapping[button::skateboard_ir_right], CELL_PAD_CTRL_PRESS_SQUARE);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, mapping[button::skateboard_tilt_left], CELL_PAD_CTRL_PRESS_L1);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, mapping[button::skateboard_tilt_right], CELL_PAD_CTRL_PRESS_R1);
-	}
+	pad->m_sticks.emplace_back(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X, mapping[button::ls_left], mapping[button::ls_right]);
+	pad->m_sticks.emplace_back(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y, mapping[button::ls_down], mapping[button::ls_up]);
+	pad->m_sticks.emplace_back(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X, mapping[button::rs_left], mapping[button::rs_right]);
+	pad->m_sticks.emplace_back(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y, mapping[button::rs_down], mapping[button::rs_up]);
 
-	pad->m_sticks[0] = AnalogStick(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X, mapping[button::ls_left], mapping[button::ls_right]);
-	pad->m_sticks[1] = AnalogStick(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y, mapping[button::ls_down], mapping[button::ls_up]);
-	pad->m_sticks[2] = AnalogStick(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X, mapping[button::rs_left], mapping[button::rs_right]);
-	pad->m_sticks[3] = AnalogStick(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y, mapping[button::rs_down], mapping[button::rs_up]);
+	pad->m_sensors.emplace_back(CELL_PAD_BTN_OFFSET_SENSOR_X, 512);
+	pad->m_sensors.emplace_back(CELL_PAD_BTN_OFFSET_SENSOR_Y, 399);
+	pad->m_sensors.emplace_back(CELL_PAD_BTN_OFFSET_SENSOR_Z, 512);
+	pad->m_sensors.emplace_back(CELL_PAD_BTN_OFFSET_SENSOR_G, 512);
 
-	pad->m_sensors[0] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_X, 0, 0, 0, DEFAULT_MOTION_X);
-	pad->m_sensors[1] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_Y, 0, 0, 0, DEFAULT_MOTION_Y);
-	pad->m_sensors[2] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_Z, 0, 0, 0, DEFAULT_MOTION_Z);
-	pad->m_sensors[3] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_G, 0, 0, 0, DEFAULT_MOTION_G);
+	pad->m_vibrateMotors.emplace_back(true, 0);
+	pad->m_vibrateMotors.emplace_back(false, 0);
 
-	pad->m_vibrateMotors[0] = VibrateMotor(true, 0);
-	pad->m_vibrateMotors[1] = VibrateMotor(false, 0);
-
-	m_bindings.emplace_back(pad, pad_device, nullptr);
+	bindings.emplace_back(pad_device, pad);
 
 	return true;
 }
 
-std::array<std::set<u32>, PadHandlerBase::button::button_count> PadHandlerBase::get_mapped_key_codes(const std::shared_ptr<PadDevice>& device, const cfg_pad* cfg)
+std::array<u32, PadHandlerBase::button::button_count> PadHandlerBase::get_mapped_key_codes(const std::shared_ptr<PadDevice>& /*device*/, const cfg_pad* cfg)
 {
-	std::array<std::set<u32>, button::button_count> mapping{};
-	if (!device || !cfg)
+	std::array<u32, button::button_count> mapping{};
+	if (!cfg)
 		return mapping;
 
-	device->trigger_code_left  = FindKeyCodes<u32, u64>(button_list, cfg->l2);
-	device->trigger_code_right = FindKeyCodes<u32, u64>(button_list, cfg->r2);
-	device->axis_code_left[0]  = FindKeyCodes<u32, u64>(button_list, cfg->ls_left);
-	device->axis_code_left[1]  = FindKeyCodes<u32, u64>(button_list, cfg->ls_right);
-	device->axis_code_left[2]  = FindKeyCodes<u32, u64>(button_list, cfg->ls_down);
-	device->axis_code_left[3]  = FindKeyCodes<u32, u64>(button_list, cfg->ls_up);
-	device->axis_code_right[0] = FindKeyCodes<u32, u64>(button_list, cfg->rs_left);
-	device->axis_code_right[1] = FindKeyCodes<u32, u64>(button_list, cfg->rs_right);
-	device->axis_code_right[2] = FindKeyCodes<u32, u64>(button_list, cfg->rs_down);
-	device->axis_code_right[3] = FindKeyCodes<u32, u64>(button_list, cfg->rs_up);
+	mapping[button::up]       = FindKeyCode(button_list, cfg->up);
+	mapping[button::down]     = FindKeyCode(button_list, cfg->down);
+	mapping[button::left]     = FindKeyCode(button_list, cfg->left);
+	mapping[button::right]    = FindKeyCode(button_list, cfg->right);
+	mapping[button::cross]    = FindKeyCode(button_list, cfg->cross);
+	mapping[button::square]   = FindKeyCode(button_list, cfg->square);
+	mapping[button::circle]   = FindKeyCode(button_list, cfg->circle);
+	mapping[button::triangle] = FindKeyCode(button_list, cfg->triangle);
+	mapping[button::start]    = FindKeyCode(button_list, cfg->start);
+	mapping[button::select]   = FindKeyCode(button_list, cfg->select);
+	mapping[button::l1]       = FindKeyCode(button_list, cfg->l1);
+	mapping[button::l2]       = FindKeyCode(button_list, cfg->l2);
+	mapping[button::l3]       = FindKeyCode(button_list, cfg->l3);
+	mapping[button::r1]       = FindKeyCode(button_list, cfg->r1);
+	mapping[button::r2]       = FindKeyCode(button_list, cfg->r2);
+	mapping[button::r3]       = FindKeyCode(button_list, cfg->r3);
+	mapping[button::ls_left]  = FindKeyCode(button_list, cfg->ls_left);
+	mapping[button::ls_right] = FindKeyCode(button_list, cfg->ls_right);
+	mapping[button::ls_down]  = FindKeyCode(button_list, cfg->ls_down);
+	mapping[button::ls_up]    = FindKeyCode(button_list, cfg->ls_up);
+	mapping[button::rs_left]  = FindKeyCode(button_list, cfg->rs_left);
+	mapping[button::rs_right] = FindKeyCode(button_list, cfg->rs_right);
+	mapping[button::rs_down]  = FindKeyCode(button_list, cfg->rs_down);
+	mapping[button::rs_up]    = FindKeyCode(button_list, cfg->rs_up);
+	mapping[button::ps]       = FindKeyCode(button_list, cfg->ps);
 
-	mapping[button::up]       = FindKeyCodes<u32, u32>(button_list, cfg->up);
-	mapping[button::down]     = FindKeyCodes<u32, u32>(button_list, cfg->down);
-	mapping[button::left]     = FindKeyCodes<u32, u32>(button_list, cfg->left);
-	mapping[button::right]    = FindKeyCodes<u32, u32>(button_list, cfg->right);
-	mapping[button::cross]    = FindKeyCodes<u32, u32>(button_list, cfg->cross);
-	mapping[button::square]   = FindKeyCodes<u32, u32>(button_list, cfg->square);
-	mapping[button::circle]   = FindKeyCodes<u32, u32>(button_list, cfg->circle);
-	mapping[button::triangle] = FindKeyCodes<u32, u32>(button_list, cfg->triangle);
-	mapping[button::start]    = FindKeyCodes<u32, u32>(button_list, cfg->start);
-	mapping[button::select]   = FindKeyCodes<u32, u32>(button_list, cfg->select);
-	mapping[button::l1]       = FindKeyCodes<u32, u32>(button_list, cfg->l1);
-	mapping[button::l2]       = narrow_set(device->trigger_code_left);
-	mapping[button::l3]       = FindKeyCodes<u32, u32>(button_list, cfg->l3);
-	mapping[button::r1]       = FindKeyCodes<u32, u32>(button_list, cfg->r1);
-	mapping[button::r2]       = narrow_set(device->trigger_code_right);
-	mapping[button::r3]       = FindKeyCodes<u32, u32>(button_list, cfg->r3);
-	mapping[button::ls_left]  = narrow_set(device->axis_code_left[0]);
-	mapping[button::ls_right] = narrow_set(device->axis_code_left[1]);
-	mapping[button::ls_down]  = narrow_set(device->axis_code_left[2]);
-	mapping[button::ls_up]    = narrow_set(device->axis_code_left[3]);
-	mapping[button::rs_left]  = narrow_set(device->axis_code_right[0]);
-	mapping[button::rs_right] = narrow_set(device->axis_code_right[1]);
-	mapping[button::rs_down]  = narrow_set(device->axis_code_right[2]);
-	mapping[button::rs_up]    = narrow_set(device->axis_code_right[3]);
-	mapping[button::ps]       = FindKeyCodes<u32, u32>(button_list, cfg->ps);
-
-	mapping[button::skateboard_ir_nose]    = FindKeyCodes<u32, u32>(button_list, cfg->ir_nose);
-	mapping[button::skateboard_ir_tail]    = FindKeyCodes<u32, u32>(button_list, cfg->ir_tail);
-	mapping[button::skateboard_ir_left]    = FindKeyCodes<u32, u32>(button_list, cfg->ir_left);
-	mapping[button::skateboard_ir_right]   = FindKeyCodes<u32, u32>(button_list, cfg->ir_right);
-	mapping[button::skateboard_tilt_left]  = FindKeyCodes<u32, u32>(button_list, cfg->tilt_left);
-	mapping[button::skateboard_tilt_right] = FindKeyCodes<u32, u32>(button_list, cfg->tilt_right);
-
-	if (b_has_pressure_intensity_button)
-	{
-		mapping[button::pressure_intensity_button] = FindKeyCodes<u32, u32>(button_list, cfg->pressure_intensity_button);
-	}
-
-	if (b_has_analog_limiter_button)
-	{
-		mapping[button::analog_limiter_button] = FindKeyCodes<u32, u32>(button_list, cfg->analog_limiter_button);
-	}
-
-	if (b_has_orientation)
-	{
-		mapping[button::orientation_reset_button] = FindKeyCodes<u32, u32>(button_list, cfg->orientation_reset_button);
-	}
+	mapping[button::pressure_intensity_button] = FindKeyCode(button_list, cfg->pressure_intensity_button);
 
 	return mapping;
 }
 
-void PadHandlerBase::get_mapping(const pad_ensemble& binding)
+void PadHandlerBase::get_mapping(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad)
 {
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
 	if (!device || !pad)
 		return;
 
-	const cfg_pad* cfg = device->config;
-	if (!cfg)
-		return;
+	auto cfg = device->config;
 
 	auto button_values = get_button_values(device);
 
 	// Find out if special buttons are pressed (introduced by RPCS3).
 	// These buttons will have a delay of one cycle, but whatever.
-	const bool analog_limiter_enabled = pad->get_analog_limiter_button_active(cfg->analog_limiter_toggle_mode.get(), pad->m_player_id);
-	const bool adjust_pressure = pad->get_pressure_intensity_button_active(cfg->pressure_intensity_toggle_mode.get(), pad->m_player_id);
-	const u32 pressure_intensity_deadzone = cfg->pressure_intensity_deadzone.get();
+	const bool adjust_pressure = pad->m_pressure_intensity_button_index >= 0 && pad->m_buttons[pad->m_pressure_intensity_button_index].m_pressed;
 
 	// Translate any corresponding keycodes to our normal DS3 buttons and triggers
-	for (Button& button : pad->m_buttons)
+	for (auto& btn : pad->m_buttons)
 	{
-		bool pressed{};
-		u16 value{};
+		// Using a temporary buffer because the values can change during translation
+		Button tmp = btn;
+		tmp.m_value = button_values[btn.m_keyCode];
 
-		for (u32 code : button.m_key_codes)
+		TranslateButtonPress(device, tmp.m_keyCode, tmp.m_pressed, tmp.m_value);
+
+		// Modify pressure if necessary if the button was pressed
+		if (adjust_pressure && tmp.m_pressed)
 		{
-			bool press{};
-			u16 val = button_values[code];
-
-			TranslateButtonPress(device, code, press, val, analog_limiter_enabled);
-
-			if (press)
-			{
-				// Modify pressure if necessary if the button was pressed
-				if (adjust_pressure)
-				{
-					val = pad->m_pressure_intensity;
-				}
-				else if (pressure_intensity_deadzone > 0)
-				{
-					// Ignore triggers, since they have their own deadzones
-					if (!get_is_left_trigger(device, code) && !get_is_right_trigger(device, code))
-					{
-						val = NormalizeDirectedInput(val, pressure_intensity_deadzone, 255);
-					}
-				}
-
-				value = std::max(value, val);
-				pressed = value > 0;
-			}
+			tmp.m_value = pad->m_pressure_intensity;
 		}
 
-		button.m_value = value;
-		button.m_pressed = pressed;
+		btn = tmp;
 	}
 
 	// used to get the absolute value of an axis
-	s32 stick_val[4]{};
+	s32 stick_val[4]{ 0 };
 
 	// Translate any corresponding keycodes to our two sticks. (ignoring thresholds for now)
-	for (usz i = 0; i < pad->m_sticks.size(); i++)
+	for (int i = 0; i < static_cast<int>(pad->m_sticks.size()); i++)
 	{
-		bool pressed{};
-		u16 val_min{};
-		u16 val_max{};
+		bool pressed;
 
-		// m_key_codes_min are the mapped keys for left or down
-		for (u32 key_min : pad->m_sticks[i].m_key_codes_min)
-		{
-			u16 val = button_values[key_min];
+		// m_keyCodeMin is the mapped key for left or down
+		const u32 key_min = pad->m_sticks[i].m_keyCodeMin;
+		u16 val_min = button_values[key_min];
+		TranslateButtonPress(device, key_min, pressed, val_min, true);
 
-			TranslateButtonPress(device, key_min, pressed, val, analog_limiter_enabled, true);
-
-			if (pressed)
-			{
-				val_min = std::max(val_min, val);
-			}
-		}
-
-		// m_key_codes_max are the mapped keys for right or up
-		for (u32 key_max : pad->m_sticks[i].m_key_codes_max)
-		{
-			u16 val = button_values[key_max];
-
-			TranslateButtonPress(device, key_max, pressed, val, analog_limiter_enabled, true);
-
-			if (pressed)
-			{
-				val_max = std::max(val_max, val);
-			}
-		}
+		// m_keyCodeMax is the mapped key for right or up
+		const u32 key_max = pad->m_sticks[i].m_keyCodeMax;
+		u16 val_max = button_values[key_max];
+		TranslateButtonPress(device, key_max, pressed, val_max, true);
 
 		// cancel out opposing values and get the resulting difference
 		stick_val[i] = val_max - val_min;
@@ -715,8 +599,8 @@ void PadHandlerBase::get_mapping(const pad_ensemble& binding)
 	u16 lx, ly, rx, ry;
 
 	// Normalize and apply pad squircling
-	convert_stick_values(lx, ly, stick_val[0], stick_val[1], cfg->lstickdeadzone, cfg->lstick_anti_deadzone, cfg->lpadsquircling);
-	convert_stick_values(rx, ry, stick_val[2], stick_val[3], cfg->rstickdeadzone, cfg->rstick_anti_deadzone, cfg->rpadsquircling);
+	convert_stick_values(lx, ly, stick_val[0], stick_val[1], cfg->lstickdeadzone, cfg->lpadsquircling);
+	convert_stick_values(rx, ry, stick_val[2], stick_val[3], cfg->rstickdeadzone, cfg->rpadsquircling);
 
 	if (m_type == pad_handler::ds4)
 	{
@@ -740,35 +624,17 @@ void PadHandlerBase::get_mapping(const pad_ensemble& binding)
 	}
 }
 
-void PadHandlerBase::process()
+void PadHandlerBase::ThreadProc()
 {
-	for (usz i = 0; i < m_bindings.size(); ++i)
+	for (usz i = 0; i < bindings.size(); ++i)
 	{
-		auto& device = m_bindings[i].device;
-		auto& pad    = m_bindings[i].pad;
+		auto device = bindings[i].first;
+		auto pad    = bindings[i].second;
 
 		if (!device || !pad)
 			continue;
 
-		pad->move_data.orientation_enabled = b_has_orientation && device->config && device->config->orientation_enabled.get();
-
-		// Disable pad vibration if no new data was sent for 3 seconds
-		if (pad->m_last_rumble_time_us > 0)
-		{
-			std::lock_guard lock(pad::g_pad_mutex);
-
-			if ((get_system_time() - pad->m_last_rumble_time_us) > 3'000'000)
-			{
-				for (VibrateMotor& motor : pad->m_vibrateMotors)
-				{
-					motor.m_value = 0;
-				}
-
-				pad->m_last_rumble_time_us = 0;
-			}
-		}
-
-		const connection status = update_connection(device);
+		const auto status = update_connection(device);
 
 		switch (status)
 		{
@@ -778,200 +644,35 @@ void PadHandlerBase::process()
 			if (!last_connection_status[i])
 			{
 				input_log.success("%s device %d connected", m_type, i);
-
-				pad->m_port_status |= CELL_PAD_STATUS_CONNECTED + CELL_PAD_STATUS_ASSIGN_CHANGES;
-
+				pad->m_port_status |= CELL_PAD_STATUS_CONNECTED;
+				pad->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES;
 				last_connection_status[i] = true;
 				connected_devices++;
-
-				if (b_has_orientation)
-				{
-					device->reset_orientation();
-				}
 			}
 
 			if (status == connection::no_data)
-			{
-				// TODO: don't skip entirely if buddy device has data
-				apply_pad_data(m_bindings[i]);
 				continue;
-			}
 
 			break;
 		}
 		case connection::disconnected:
 		{
-			if (g_cfg.io.keep_pads_connected)
-			{
-				if (!last_connection_status[i])
-				{
-					input_log.success("%s device %d connected by force", m_type, i);
-
-					pad->m_port_status |= CELL_PAD_STATUS_CONNECTED + CELL_PAD_STATUS_ASSIGN_CHANGES;
-
-					last_connection_status[i] = true;
-					connected_devices++;
-				}
-				continue;
-			}
-
 			if (last_connection_status[i])
 			{
 				input_log.error("%s device %d disconnected", m_type, i);
-
 				pad->m_port_status &= ~CELL_PAD_STATUS_CONNECTED;
 				pad->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES;
-
 				last_connection_status[i] = false;
 				connected_devices--;
-
-				if (b_has_orientation)
-				{
-					device->reset_orientation();
-				}
 			}
 			continue;
 		}
+		default:
+			break;
 		}
 
-		get_mapping(m_bindings[i]);
-		get_extended_info(m_bindings[i]);
-		get_orientation(m_bindings[i]);
-		apply_pad_data(m_bindings[i]);
+		get_mapping(device, pad);
+		get_extended_info(device, pad);
+		apply_pad_data(device, pad);
 	}
 }
-
-void PadHandlerBase::set_raw_orientation(ps_move_data& move_data, f32 accel_x, f32 accel_y, f32 accel_z, f32 gyro_x, f32 gyro_y, f32 gyro_z)
-{
-	if (!move_data.orientation_enabled)
-	{
-		move_data.reset_sensors();
-		return;
-	}
-
-	// This function expects DS3 sensor accel values in linear velocity (m/s²) and gyro values in angular velocity (degree/s)
-	// The default position is flat on the ground, pointing forward.
-	// The accelerometers constantly measure G forces.
-	// The gyros measure changes in orientation and will reset when the device isn't moved anymore.
-	move_data.accelerometer_x = -accel_x;      // move_data: Increases if the device is rolled to the left
-	move_data.accelerometer_y = accel_z;       // move_data: Increases if the device is pitched upwards
-	move_data.accelerometer_z = accel_y;       // move_data: Increases if the device is moved upwards
-	move_data.gyro_x = degree_to_rad(-gyro_x); // move_data: Increases if the device is pitched upwards
-	move_data.gyro_y = degree_to_rad(gyro_z);  // move_data: Increases if the device is rolled to the right
-	move_data.gyro_z = degree_to_rad(-gyro_y); // move_data: Increases if the device is yawed to the left
-}
-
-void PadHandlerBase::set_raw_orientation(Pad& pad)
-{
-	if (!pad.move_data.orientation_enabled)
-	{
-		pad.move_data.reset_sensors();
-		return;
-	}
-
-	// acceleration (linear velocity in m/s²)
-	const f32 accel_x = (pad.m_sensors[0].m_value - 512) / static_cast<f32>(MOTION_ONE_G);
-	const f32 accel_y = (pad.m_sensors[1].m_value - 512) / static_cast<f32>(MOTION_ONE_G);
-	const f32 accel_z = (pad.m_sensors[2].m_value - 512) / static_cast<f32>(MOTION_ONE_G);
-
-	// gyro (angular velocity in degree/s)
-	constexpr f32 gyro_x = 0.0f;
-	const f32 gyro_y = (pad.m_sensors[3].m_value - 512) / (123.f / 90.f);
-	constexpr f32 gyro_z = 0.0f;
-
-	set_raw_orientation(pad.move_data, accel_x, accel_y, accel_z, gyro_x, gyro_y, gyro_z);
-}
-
-void PadHandlerBase::get_orientation(const pad_ensemble& binding) const
-{
-	if (!b_has_orientation) return;
-
-	const auto& pad = binding.pad;
-	const auto& device = binding.device;
-	if (!pad || !device) return;
-
-	if (pad->move_data.calibration_requested)
-	{
-		device->reset_orientation();
-		pad->move_data.quaternion = ps_move_data::default_quaternion;
-		pad->move_data.calibration_succeeded = true;
-		return;
-	}
-
-	if (!pad->move_data.orientation_enabled || pad->get_orientation_reset_button_active())
-	{
-		// This can be called extensively in quick succession, so let's just reset the pointer instead of creating a new object.
-		device->ahrs.reset();
-		pad->move_data.quaternion = ps_move_data::default_quaternion;
-		return;
-	}
-
-	device->update_orientation(pad->move_data);
-}
-
-void PadDevice::reset_orientation()
-{
-	// Initialize Fusion
-	ahrs = std::make_shared<FusionAhrs>();
-	FusionAhrsInitialise(ahrs.get());
-	ahrs->settings.convention = FusionConvention::FusionConventionEnu;
-	ahrs->settings.gain = 0.0f; // If gain is set, the algorithm tries to adjust the orientation over time.
-	FusionAhrsSetSettings(ahrs.get(), &ahrs->settings);
-	FusionAhrsReset(ahrs.get());
-}
-
-void PadDevice::update_orientation(ps_move_data& move_data)
-{
-	if (!ahrs)
-	{
-		reset_orientation();
-	}
-
-	// Get elapsed time since last update
-	const u64 now_us = get_system_time();
-	const float elapsed_sec = (last_ahrs_update_time_us == 0) ? 0.0f : ((now_us - last_ahrs_update_time_us) / 1'000'000.0f);
-	last_ahrs_update_time_us = now_us;
-
-	// The ps move handler's axis may differ from the Fusion axis, so we have to map them correctly.
-	// Don't ask how the axis work. It's basically been trial and error.
-	ensure(ahrs->settings.convention == FusionConvention::FusionConventionEnu); // East-North-Up
-
-	const FusionVector accelerometer{
-		.axis {
-			.x = -move_data.accelerometer_x,
-			.y = +move_data.accelerometer_y,
-			.z = +move_data.accelerometer_z
-		}
-	};
-
-	const FusionVector gyroscope{
-		.axis {
-			.x = +PadHandlerBase::rad_to_degree(move_data.gyro_x),
-			.y = +PadHandlerBase::rad_to_degree(move_data.gyro_z),
-			.z = -PadHandlerBase::rad_to_degree(move_data.gyro_y)
-		}
-	};
-
-	FusionVector magnetometer {};
-
-	if (move_data.magnetometer_enabled)
-	{
-		magnetometer = FusionVector{
-			.axis {
-				.x = move_data.magnetometer_x,
-				.y = move_data.magnetometer_y,
-				.z = move_data.magnetometer_z
-			}
-		};
-	}
-
-	// Update Fusion
-	FusionAhrsUpdate(ahrs.get(), gyroscope, accelerometer, magnetometer, elapsed_sec);
-
-	// Get quaternion
-	const FusionQuaternion quaternion = FusionAhrsGetQuaternion(ahrs.get());
-	move_data.quaternion[0] = quaternion.array[1];
-	move_data.quaternion[1] = quaternion.array[2];
-	move_data.quaternion[2] = quaternion.array[3];
-	move_data.quaternion[3] = quaternion.array[0];
-}
diff --git a/rpcs3/Emu/Io/PadHandler.h b/rpcs3/Emu/Io/PadHandler.h
index 99c085b015..27217b1068 100644
--- a/rpcs3/Emu/Io/PadHandler.h
+++ b/rpcs3/Emu/Io/PadHandler.h
@@ -5,107 +5,26 @@
 #include "pad_config_types.h"
 #include "util/types.hpp"
 
-#ifndef _MSC_VER
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-extern "C" {
-#include "3rdparty/fusion/fusion/Fusion/FusionAhrs.h"
-}
-#ifndef _MSC_VER
-#pragma GCC diagnostic pop
-#endif
-
 #include <cmath>
 #include <functional>
 #include <string>
-#include <set>
 #include <vector>
 #include <memory>
 #include <unordered_map>
 
-LOG_CHANNEL(input_log, "Input");
-
 class PadDevice
 {
 public:
-	virtual ~PadDevice() = default;
 	cfg_pad* config{ nullptr };
 	u8 player_id{0};
-	u8 large_motor{0};
-	u8 small_motor{0};
-	bool new_output_data{true};
-	steady_clock::time_point last_output;
-	std::set<u64> trigger_code_left{};
-	std::set<u64> trigger_code_right{};
-	std::array<std::set<u64>, 4> axis_code_left{};
-	std::array<std::set<u64>, 4> axis_code_right{};
-
-	struct color
-	{
-		u8 r{};
-		u8 g{};
-		u8 b{};
-	};
-	color color_override{};
-	bool color_override_active{};
-
-	bool enable_player_leds{};
-	bool update_player_leds{true};
-
-	std::shared_ptr<FusionAhrs> ahrs; // Used to calculate quaternions from sensor data
-	u64 last_ahrs_update_time_us = 0; // Last ahrs update
-
-	void update_orientation(ps_move_data& move_data);
-	void reset_orientation();
-};
-
-struct pad_ensemble
-{
-	std::shared_ptr<Pad> pad;
-	std::shared_ptr<PadDevice> device;
-	std::shared_ptr<PadDevice> buddy_device;
-
-	explicit pad_ensemble(std::shared_ptr<Pad> _pad, std::shared_ptr<PadDevice> _device, std::shared_ptr<PadDevice> _buddy_device)
-		: pad(_pad), device(_device), buddy_device(_buddy_device)
-	{}
-};
-
-struct pad_list_entry
-{
-	std::string name;
-	bool is_buddy_only = false;
-
-	explicit pad_list_entry(std::string _name, bool _is_buddy_only)
-		: name(std::move(_name)), is_buddy_only(_is_buddy_only)
-	{}
 };
 
 using pad_preview_values = std::array<int, 6>;
 using pad_callback = std::function<void(u16 /*button_value*/, std::string /*button_name*/, std::string /*pad_name*/, u32 /*battery_level*/, pad_preview_values /*preview_values*/)>;
 using pad_fail_callback = std::function<void(std::string /*pad_name*/)>;
 
-using motion_preview_values = std::array<u16, 4>;
-using motion_callback = std::function<void(std::string /*pad_name*/, motion_preview_values /*preview_values*/)>;
-using motion_fail_callback = std::function<void(std::string /*pad_name*/, motion_preview_values /*preview_values*/)>;
-
 class PadHandlerBase
 {
-public:
-	enum class connection
-	{
-		no_data,
-		connected,
-		disconnected
-	};
-
-	enum class trigger_recognition_mode
-	{
-		any,             // Add all trigger modes to the button map
-		one_directional, // Treat trigger axis as one-directional only
-		two_directional  // Treat trigger axis as two-directional only (similar to sticks)
-	};
-
 protected:
 	enum button
 	{
@@ -136,136 +55,59 @@ protected:
 		rs_down,
 		rs_up,
 
-		skateboard_ir_nose,
-		skateboard_ir_tail,
-		skateboard_ir_left,
-		skateboard_ir_right,
-		skateboard_tilt_left,
-		skateboard_tilt_right,
-
 		pressure_intensity_button,
-		analog_limiter_button,
-		orientation_reset_button,
 
 		button_count
 	};
 
-	static constexpr u32 MAX_GAMEPADS = 7;
-	static constexpr u16 button_press_threshold = 50;
-	static constexpr u16 touch_threshold = static_cast<u16>(255 * 0.9f);
-	static constexpr auto min_output_interval = 300ms;
+	enum connection
+	{
+		no_data,
+		connected,
+		disconnected
+	};
+
+	static const u32 MAX_GAMEPADS = 7;
 
 	std::array<bool, MAX_GAMEPADS> last_connection_status{{ false, false, false, false, false, false, false }};
 
 	std::string m_name_string;
 	usz m_max_devices = 0;
-	u32 m_trigger_threshold = 0;
-	u32 m_thumb_threshold = 0;
-	trigger_recognition_mode m_trigger_recognition_mode = trigger_recognition_mode::any;
+	int m_trigger_threshold = 0;
+	int m_thumb_threshold = 0;
 
 	bool b_has_led = false;
 	bool b_has_rgb = false;
-	bool b_has_player_led = false;
 	bool b_has_battery = false;
-	bool b_has_battery_led = false;
 	bool b_has_deadzones = false;
 	bool b_has_rumble = false;
-	bool b_has_motion = false;
 	bool b_has_config = false;
 	bool b_has_pressure_intensity_button = true;
-	bool b_has_analog_limiter_button = true;
-	bool b_has_orientation = false;
-
 	std::array<cfg_pad, MAX_GAMEPADS> m_pad_configs;
-	std::vector<pad_ensemble> m_bindings;
+	std::vector<std::pair<std::shared_ptr<PadDevice>, std::shared_ptr<Pad>>> bindings;
 	std::unordered_map<u32, std::string> button_list;
-	std::unordered_map<u32, u16> min_button_values;
-	std::set<u32> blacklist;
-
-	std::shared_ptr<Pad> m_pad_for_pad_settings;
-
-	static std::set<u32> narrow_set(const std::set<u64>& src);
+	std::vector<u32> blacklist;
 
 	// Search an unordered map for a string value and return found keycode
-	template <typename S, typename T>
-	static std::set<T> FindKeyCodes(const std::unordered_map<S, std::string>& map, const cfg::string& cfg_string, bool fallback = true)
-	{
-		std::set<T> key_codes;
-
-		const std::string& def = cfg_string.def;
-		const std::vector<std::string> names = cfg_pad::get_buttons(cfg_string);
-		T def_code = umax;
-
-		for (const std::string& nam : names)
-		{
-			for (const auto& [code, name] : map)
-			{
-				if (name == nam)
-				{
-					key_codes.insert(static_cast<T>(code));
-				}
-
-				if (fallback && name == def)
-					def_code = static_cast<T>(code);
-			}
-		}
-
-		if (!key_codes.empty())
-		{
-			return key_codes;
-		}
-
-		if (fallback)
-		{
-			if (!names.empty())
-				input_log.error("FindKeyCode for [name = %s] returned with [def_code = %d] for [def = %s]", cfg_string.to_string(), def_code, def);
-
-			if (def_code != umax)
-			{
-				return { def_code };
-			}
-		}
-
-		return {};
-	}
+	static int FindKeyCode(const std::unordered_map<u32, std::string>& map, const cfg::string& name, bool fallback = true);
 
 	// Search an unordered map for a string value and return found keycode
-	template <typename S, typename T>
-	static std::set<T> FindKeyCodes(const std::unordered_map<S, std::string>& map, const std::vector<std::string>& names)
-	{
-		std::set<T> key_codes;
+	static long FindKeyCode(const std::unordered_map<u64, std::string>& map, const cfg::string& name, bool fallback = true);
 
-		for (const std::string& name : names)
-		{
-			for (const auto& [code, nam] : map)
-			{
-				if (nam == name)
-				{
-					key_codes.insert(static_cast<T>(code));
-					break;
-				}
-			}
-		}
+	// Search an unordered map for a string value and return found keycode
+	static int FindKeyCodeByString(const std::unordered_map<u32, std::string>& map, const std::string& name, bool fallback = true);
 
-		if (!key_codes.empty())
-		{
-			return key_codes;
-		}
-
-		return {};
-	}
-
-	// Get new multiplied value based on the multiplier
-	static s32 MultipliedInput(s32 raw_value, s32 multiplier);
+	// Search an unordered map for a string value and return found keycode
+	static long FindKeyCodeByString(const std::unordered_map<u64, std::string>& map, const std::string& name, bool fallback = true);
 
 	// Get new scaled value between 0 and 255 based on its minimum and maximum
-	static f32 ScaledInput(f32 raw_value, f32 minimum, f32 maximum, f32 deadzone, f32 range = 255.0f);
+	static float ScaledInput(s32 raw_value, int minimum, int maximum);
 
 	// Get new scaled value between -255 and 255 based on its minimum and maximum
-	static f32 ScaledAxisInput(f32 raw_value, f32 minimum, f32 maximum, f32 deadzone, f32 range = 255.0f);
+	static float ScaledInput2(s32 raw_value, int minimum, int maximum);
 
 	// Get normalized trigger value based on the range defined by a threshold
-	u16 NormalizeTriggerInput(u16 value, u32 threshold) const;
+	u16 NormalizeTriggerInput(u16 value, int threshold) const;
 
 	// normalizes a directed input, meaning it will correspond to a single "button" and not an axis with two directions
 	// the input values must lie in 0+
@@ -274,112 +116,76 @@ protected:
 	// This function normalizes stick deadzone based on the DS3's deadzone, which is ~13%
 	// X and Y is expected to be in (-255) to 255 range, deadzone should be in terms of thumb stick range
 	// return is new x and y values in 0-255 range
-	std::tuple<u16, u16> NormalizeStickDeadzone(s32 inX, s32 inY, u32 deadzone, u32 anti_deadzone) const;
+	std::tuple<u16, u16> NormalizeStickDeadzone(s32 inX, s32 inY, u32 deadzone) const;
 
 	// get clamped value between 0 and 255
 	static u16 Clamp0To255(f32 input);
-
 	// get clamped value between 0 and 1023
 	static u16 Clamp0To1023(f32 input);
 
 	// input has to be [-1,1]. result will be [0,255]
-	static u16 ConvertAxis(f32 value);
+	static u16 ConvertAxis(float value);
 
 	// The DS3, (and i think xbox controllers) give a 'square-ish' type response, so that the corners will give (almost)max x/y instead of the ~30x30 from a perfect circle
 	// using a simple scale/sensitivity increase would *work* although it eats a chunk of our usable range in exchange
 	// this might be the best for now, in practice it seems to push the corners to max of 20x20, with a squircle_factor of 8000
 	// This function assumes inX and inY is already in 0-255
-	static void ConvertToSquirclePoint(u16& inX, u16& inY, u32 squircle_factor);
+	static std::tuple<u16, u16> ConvertToSquirclePoint(u16 inX, u16 inY, int squircle_factor);
 
 public:
-	// u32 thumb_min = 0; // Unused. Make sure all handlers report 0+ values for sticks in get_button_values.
-	u32 thumb_max = 255;
-	u32 trigger_min = 0;
-	u32 trigger_max = 255;
+	// s32 thumb_min = 0; // Unused. Make sure all handlers report 0+ values for sticks in get_button_values.
+	s32 thumb_max = 255; // NOTE: Better keep this positive
+	s32 trigger_min = 0;
+	s32 trigger_max = 255;
+	s32 vibration_min = 0;
+	s32 vibration_max = 255;
 	u32 connected_devices = 0;
 
 	pad_handler m_type;
-	bool m_is_init = false;
 
-	enum class gui_call_type
-	{
-		normal,
-		get_connection,
-		reset_input,
-		blacklist
-	};
+	std::string name_string() const;
+	usz max_devices() const;
+	bool has_config() const;
+	bool has_rumble() const;
+	bool has_deadzones() const;
+	bool has_led() const;
+	bool has_rgb() const;
+	bool has_battery() const;
+	bool has_pressure_intensity_button() const;
 
-	std::vector<pad_ensemble>& bindings() { return m_bindings; }
-	const std::string& name_string() const { return m_name_string; }
-	usz max_devices() const { return m_max_devices; }
-	bool has_config() const { return b_has_config; }
-	bool has_rumble() const { return b_has_rumble; }
-	bool has_motion() const { return b_has_motion; }
-	bool has_deadzones() const { return b_has_deadzones; }
-	bool has_led() const { return b_has_led; }
-	bool has_rgb() const { return b_has_rgb; }
-	bool has_player_led() const { return b_has_player_led; }
-	bool has_battery() const { return b_has_battery; }
-	bool has_battery_led() const { return b_has_battery_led; }
-	bool has_pressure_intensity_button() const { return b_has_pressure_intensity_button; }
-	bool has_analog_limiter_button() const { return b_has_analog_limiter_button; }
-	bool has_orientation() const { return b_has_orientation; }
-
-	u16 NormalizeStickInput(u16 raw_value, s32 threshold, s32 multiplier, bool ignore_threshold = false) const;
-	void convert_stick_values(u16& x_out, u16& y_out, s32 x_in, s32 y_in, u32 deadzone, u32 anti_deadzone, u32 padsquircling) const;
-	void set_trigger_recognition_mode(trigger_recognition_mode mode) { m_trigger_recognition_mode = mode; }
+	u16 NormalizeStickInput(u16 raw_value, int threshold, int multiplier, bool ignore_threshold = false) const;
+	void convert_stick_values(u16& x_out, u16& y_out, const s32& x_in, const s32& y_in, const s32& deadzone, const s32& padsquircling) const;
 
 	virtual bool Init() { return true; }
 	PadHandlerBase(pad_handler type = pad_handler::null);
 	virtual ~PadHandlerBase() = default;
 	// Sets window to config the controller(optional)
-	virtual void SetPadData(const std::string& /*padId*/, u8 /*player_id*/, u8 /*large_motor*/, u8 /*small_motor*/, s32 /*r*/, s32 /*g*/, s32 /*b*/, bool /*player_led*/, bool /*battery_led*/, u32 /*battery_led_brightness*/) {}
+	virtual void SetPadData(const std::string& /*padId*/, u8 /*player_id*/, u32 /*largeMotor*/, u32 /*smallMotor*/, s32 /*r*/, s32 /*g*/, s32 /*b*/, bool /*battery_led*/, u32 /*battery_led_brightness*/) {}
 	virtual u32 get_battery_level(const std::string& /*padId*/) { return 0; }
 	// Return list of devices for that handler
-	virtual std::vector<pad_list_entry> list_devices() = 0;
+	virtual std::vector<std::string> ListDevices() = 0;
 	// Callback called during pad_thread::ThreadFunc
-	virtual void process();
+	virtual void ThreadProc();
 	// Binds a Pad to a device
-	virtual bool bindPadToDevice(std::shared_ptr<Pad> pad);
-	virtual void init_config(cfg_pad* cfg) = 0;
-	virtual connection get_next_button_press(const std::string& padId, const pad_callback& callback, const pad_fail_callback& fail_callback, gui_call_type call_type, const std::vector<std::string>& buttons);
-	virtual void get_motion_sensors(const std::string& pad_id, const motion_callback& callback, const motion_fail_callback& fail_callback, motion_preview_values preview_values, const std::array<AnalogSensor, 4>& sensors);
-	virtual std::unordered_map<u32, std::string> get_motion_axis_list() const { return {}; }
-
-	static constexpr f32 PI = 3.14159265f;
-
-	static f32 degree_to_rad(f32 degree)
-	{
-		return degree * PI / 180.0f;
-	}
-
-	static f32 rad_to_degree(f32 radians)
-	{
-		return radians * 180.0f / PI;
-	};
+	virtual bool bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device, u8 player_id);
+	virtual void init_config(cfg_pad* /*cfg*/) = 0;
+	virtual void get_next_button_press(const std::string& padId, const pad_callback& callback, const pad_fail_callback& fail_callback, bool get_blacklist, const std::vector<std::string>& buttons = {});
 
 private:
 	virtual std::shared_ptr<PadDevice> get_device(const std::string& /*device*/) { return nullptr; }
-	virtual bool get_is_left_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 /*keyCode*/) { return false; }
-	virtual bool get_is_right_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 /*keyCode*/) { return false; }
-	virtual bool get_is_left_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 /*keyCode*/) { return false; }
-	virtual bool get_is_right_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 /*keyCode*/) { return false; }
-	virtual bool get_is_touch_pad_motion(const std::shared_ptr<PadDevice>& /*device*/, u64 /*keyCode*/) { return false; }
+	virtual bool get_is_left_trigger(u64 /*keyCode*/) { return false; }
+	virtual bool get_is_right_trigger(u64 /*keyCode*/) { return false; }
+	virtual bool get_is_left_stick(u64 /*keyCode*/) { return false; }
+	virtual bool get_is_right_stick(u64 /*keyCode*/) { return false; }
 	virtual PadHandlerBase::connection update_connection(const std::shared_ptr<PadDevice>& /*device*/) { return connection::disconnected; }
-	virtual void get_extended_info(const pad_ensemble& /*binding*/) {}
-	virtual void apply_pad_data(const pad_ensemble& /*binding*/) {}
+	virtual void get_extended_info(const std::shared_ptr<PadDevice>& /*device*/, const std::shared_ptr<Pad>& /*pad*/) {}
+	virtual void apply_pad_data(const std::shared_ptr<PadDevice>& /*device*/, const std::shared_ptr<Pad>& /*pad*/) {}
 	virtual std::unordered_map<u64, u16> get_button_values(const std::shared_ptr<PadDevice>& /*device*/) { return {}; }
 	virtual pad_preview_values get_preview_values(const std::unordered_map<u64, u16>& /*data*/) { return {}; }
 
-	void get_orientation(const pad_ensemble& binding) const;
-
 protected:
-	virtual std::array<std::set<u32>, PadHandlerBase::button::button_count> get_mapped_key_codes(const std::shared_ptr<PadDevice>& device, const cfg_pad* cfg);
-	virtual void get_mapping(const pad_ensemble& binding);
-	void TranslateButtonPress(const std::shared_ptr<PadDevice>& device, u64 keyCode, bool& pressed, u16& val, bool use_stick_multipliers, bool ignore_stick_threshold = false, bool ignore_trigger_threshold = false);
+	virtual std::array<u32, PadHandlerBase::button::button_count> get_mapped_key_codes(const std::shared_ptr<PadDevice>& device, const cfg_pad* cfg);
+	virtual void get_mapping(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad);
+	void TranslateButtonPress(const std::shared_ptr<PadDevice>& device, u64 keyCode, bool& pressed, u16& val, bool ignore_stick_threshold = false, bool ignore_trigger_threshold = false);
 	void init_configs();
-	cfg_pad* get_config(const std::string& pad_id);
-
-	static void set_raw_orientation(ps_move_data& move_data, f32 accel_x, f32 accel_y, f32 accel_z, f32 gyro_x, f32 gyro_y, f32 gyro_z);
-	static void set_raw_orientation(Pad& pad);
 };
diff --git a/rpcs3/Emu/Io/RB3MidiDrums.cpp b/rpcs3/Emu/Io/RB3MidiDrums.cpp
deleted file mode 100644
index 67ff121d77..0000000000
--- a/rpcs3/Emu/Io/RB3MidiDrums.cpp
+++ /dev/null
@@ -1,831 +0,0 @@
-// Rock Band 3 MIDI Pro Adapter Emulator (drums Mode)
-
-#include "stdafx.h"
-#include "RB3MidiDrums.h"
-#include "Emu/Cell/lv2/sys_usbd.h"
-#include "Emu/Io/rb3drums_config.h"
-
-using namespace std::chrono_literals;
-
-LOG_CHANNEL(rb3_midi_drums_log);
-
-namespace controller
-{
-
-// Bit flags by byte index.
-
-constexpr usz FLAG = 0;
-constexpr usz INDEX = 1;
-
-using FlagByIndex = std::array<u8, 2>;
-
-constexpr FlagByIndex BUTTON_1 = {0x01, 0};
-constexpr FlagByIndex BUTTON_2 = {0x02, 0};
-constexpr FlagByIndex BUTTON_3 = {0x04, 0};
-constexpr FlagByIndex BUTTON_4 = {0x08, 0};
-constexpr FlagByIndex BUTTON_5 = {0x10, 0};
-constexpr FlagByIndex BUTTON_6 = {0x20, 0};
-// constexpr FlagByIndex BUTTON_7 = {0x40, 0};
-// constexpr FlagByIndex BUTTON_8 = {0x80, 0};
-
-constexpr FlagByIndex BUTTON_9  = {0x01, 1};
-constexpr FlagByIndex BUTTON_10 = {0x02, 1};
-constexpr FlagByIndex BUTTON_11 = {0x04, 1};
-constexpr FlagByIndex BUTTON_12 = {0x08, 1};
-// constexpr FlagByIndex BUTTON_13 = {0x10, 1};
-
-constexpr usz DPAD_INDEX = 2;
-enum class DPad : u8
-{
-	Up     = 0x00,
-	Right  = 0x02,
-	Down   = 0x04,
-	Left   = 0x06,
-	Center = 0x08,
-};
-
-constexpr u8 AXIS_CENTER = 0x7F;
-
-constexpr std::array<u8, 27> default_state = {
-	0x00,                     // buttons 1 to 8
-	0x00,                     // buttons 9 to 13
-	static_cast<u8>(controller::DPad::Center),
-	controller::AXIS_CENTER,  // x axis
-	controller::AXIS_CENTER,  // y axis
-	controller::AXIS_CENTER,  // z axis
-	controller::AXIS_CENTER,  // w axis
-	0x00,
-	0x00,
-	0x00,
-	0x00,
-	0x00, // yellow drum/cymbal velocity
-	0x00, // red drum/cymbal velocity
-	0x00, // green drum/cymbal velocity
-	0x00, // blue drum/cymbal velocity
-	0x00,
-	0x00,
-	0x00,
-	0x00,
-	0x02,
-	0x00,
-	0x02,
-	0x00,
-	0x02,
-	0x00,
-	0x02,
-	0x00
-};
-
-} // namespace controller
-
-namespace drum
-{
-
-// Hold each hit for a period of time. Rock band doesn't pick up a single tick.
-std::chrono::milliseconds hit_duration()
-{
-	return std::chrono::milliseconds(g_cfg_rb3drums.pulse_ms);
-}
-
-// Scale velocity from midi to what rock band expects.
-u8 scale_velocity(u8 value)
-{
-	return (0xFF - (2 * value));
-}
-
-constexpr usz FLAG = controller::FLAG;
-constexpr usz INDEX = controller::INDEX;
-
-using FlagByIndex = controller::FlagByIndex;
-
-constexpr FlagByIndex GREEN         = controller::BUTTON_2;
-constexpr FlagByIndex RED           = controller::BUTTON_3;
-constexpr FlagByIndex YELLOW        = controller::BUTTON_4;
-constexpr FlagByIndex BLUE          = controller::BUTTON_1;
-constexpr FlagByIndex KICK_PEDAL    = controller::BUTTON_5;
-constexpr FlagByIndex HIHAT_PEDAL   = controller::BUTTON_6;
-
-constexpr FlagByIndex IS_DRUM       = controller::BUTTON_11;
-constexpr FlagByIndex IS_CYMBAL	    = controller::BUTTON_12;
-
-// constexpr FlagByIndex BACK_BUTTON   = controller::BUTTON_3;
-constexpr FlagByIndex START_BUTTON  = controller::BUTTON_10;
-// constexpr FlagByIndex SYSTEM_BUTTON = controller::BUTTON_13;
-constexpr FlagByIndex SELECT_BUTTON = controller::BUTTON_9;
-
-rb3drums::KitState start_state()
-{
-	rb3drums::KitState s{};
-	s.expiry = std::chrono::steady_clock::now() + drum::hit_duration();
-	s.start = true;
-	return s;
-}
-
-rb3drums::KitState select_state()
-{
-	rb3drums::KitState s{};
-	s.expiry = std::chrono::steady_clock::now() + drum::hit_duration();
-	s.select = true;
-	return s;
-}
-
-rb3drums::KitState toggle_hold_kick_state()
-{
-	rb3drums::KitState s{};
-	s.expiry = std::chrono::steady_clock::now() + drum::hit_duration();
-	s.toggle_hold_kick = true;
-	return s;
-}
-
-rb3drums::KitState kick_state()
-{
-	rb3drums::KitState s{};
-	s.expiry = std::chrono::steady_clock::now() + drum::hit_duration();
-	s.kick_pedal = 127;
-	return s;
-}
-
-} // namespace drum
-
-namespace midi
-{
-
-u8 min_velocity()
-{
-	return g_cfg_rb3drums.minimum_velocity;
-}
-
-Note str_to_note(const std::string_view name)
-{
-	static const std::unordered_map<std::string_view, Note> mapping{
-		{"Invalid", Note::Invalid},
-		{"Kick", Note::Kick},
-		{"HihatPedal", Note::HihatPedal},
-		{"Snare", Note::Snare},
-		{"SnareRim", Note::SnareRim},
-		{"HiTom", Note::HiTom},
-		{"LowTom", Note::LowTom},
-		{"FloorTom", Note::FloorTom},
-		{"HihatWithPedalUp", Note::HihatWithPedalUp},
-		{"Hihat", Note::Hihat},
-		{"Ride", Note::Ride},
-		{"Crash", Note::Crash},
-	};
-	auto it = mapping.find(name);
-	return it != std::end(mapping) ? it->second : Note::Invalid;
-}
-
-std::optional<std::pair<Id, Note>> parse_midi_override(const std::string_view config)
-{
-	auto split = fmt::split(config, {"="});
-	if (split.size() != 2)
-	{
-		return {};
-	}
-	uint64_t id_int = 0;
-	if (!try_to_uint64(&id_int, split[0], 0, 255))
-	{
-		rb3_midi_drums_log.warning("midi override: %s is not a valid midi id", split[0]);
-		return {};
-	}
-	auto id = static_cast<Id>(id_int);
-	auto note = str_to_note(split[1]);
-	if (note == Note::Invalid)
-	{
-		rb3_midi_drums_log.warning("midi override: %s is not a valid note", split[1]);
-		return {};
-	}
-	rb3_midi_drums_log.success("found valid midi override: %s", config);
-	return {{id, note}};
-}
-
-std::unordered_map<Id, Note> create_id_to_note_mapping()
-{
-	std::unordered_map<Id, Note> mapping{
-		{Id::MidiCC,            Note::Kick},
-		{Id::Kick0,             Note::Kick},
-		{Id::Kick1,             Note::Kick},
-		{Id::Kick2,             Note::Kick},
-		{Id::HihatPedal,        Note::HihatPedal},
-		{Id::HihatPedalPartial, Note::HihatPedal},
-		{Id::Snare0,            Note::Snare},
-		{Id::Snare1,            Note::Snare},
-		{Id::Snare2,            Note::Snare},
-		{Id::Snare3,            Note::Snare},
-		{Id::Snare4,            Note::Snare},
-		{Id::SnareRim,          Note::SnareRim},
-		{Id::HiTom0,            Note::HiTom},
-		{Id::HiTom1,            Note::HiTom},
-		{Id::LowTom0,           Note::LowTom},
-		{Id::LowTom1,           Note::LowTom},
-		{Id::FloorTom0,         Note::FloorTom},
-		{Id::FloorTom1,         Note::FloorTom},
-		{Id::Hihat0,            Note::Hihat},
-		{Id::Hihat1,            Note::Hihat},
-		{Id::Hihat2,            Note::Hihat},
-		{Id::Hihat3,            Note::Hihat},
-		{Id::HihatWithPedalUp,  Note::Hihat},
-		{Id::Ride0,             Note::Ride},
-		{Id::Ride1,             Note::Ride},
-		{Id::Ride2,             Note::Ride},
-		{Id::Ride3,             Note::Ride},
-		{Id::Crash0,            Note::Crash},
-		{Id::Crash1,            Note::Crash},
-		{Id::Crash2,            Note::Crash},
-		{Id::Crash3,            Note::Crash},
-	};
-
-	// Apply configured overrides.
-	const std::vector<std::string> segments = fmt::split(g_cfg_rb3drums.midi_overrides.to_string(), {","});
-	for (const std::string& segment : segments)
-	{
-		if (const auto midi_override = parse_midi_override(segment))
-		{
-			const auto id = midi_override->first;
-			const auto note = midi_override->second;
-			mapping[id] = note;
-		}
-	}
-	return mapping;
-}
-
-namespace combo
-{
-
-std::vector<u8> parse_combo(const std::string_view name, const std::string_view csv)
-{
-	if (csv.empty())
-	{
-		return {};
-	}
-	std::vector<u8> notes;
-	const auto& note_names = fmt::split(csv, {","});
-	for (const auto& note_name : note_names)
-	{
-		const auto note = str_to_note(note_name);
-		if (note != midi::Note::Invalid)
-		{
-			notes.push_back(static_cast<u8>(note));
-		}
-		else
-		{
-			rb3_midi_drums_log.warning("invalid note '%s' in configured combo '%s'", note_name, name);
-		}
-	}
-	return notes;
-}
-
-std::chrono::milliseconds window()
-{
-	return std::chrono::milliseconds{g_cfg_rb3drums.combo_window_ms};
-}
-
-}
-
-} // namespace midi
-
-namespace
-{
-
-void set_flag(u8* buf, [[maybe_unused]] std::string_view name, const controller::FlagByIndex& fbi)
-{
-	auto i = fbi[drum::INDEX];
-	auto flag = fbi[drum::FLAG];
-	buf[i] |= flag;
-	// rb3_midi_drums_log.success("wrote flag %x at index %d", flag, i);
-}
-
-void set_flag_if_any(u8* buf, std::string_view name, const controller::FlagByIndex& fbi, const std::vector<u8> velocities)
-{
-	if (std::none_of(velocities.begin(), velocities.end(), [](u8 velocity){ return velocity >= midi::min_velocity(); }))
-	{
-		return;
-	}
-	set_flag(buf, name, fbi);
-}
-
-}
-
-usb_device_rb3_midi_drums::Definition::Definition(std::string name, const std::string_view csv, const std::function<rb3drums::KitState()> create_state)
-	: name{std::move(name)}
-	, notes{midi::combo::parse_combo(this->name, csv)}
-	, create_state{create_state}
-{}
-
-usb_device_rb3_midi_drums::usb_device_rb3_midi_drums(const std::array<u8, 7>& location, const std::string& device_name)
-	: usb_device_emulated(location)
-{
-	m_id_to_note_mapping = midi::create_id_to_note_mapping();
-	combo.reload_definitions();
-
-	UsbDeviceDescriptor descriptor{};
-	descriptor.bcdDevice = 0x0200;
-	descriptor.bDeviceClass = 0x00;
-	descriptor.bDeviceSubClass = 0x00;
-	descriptor.bDeviceProtocol = 0x00;
-	descriptor.bMaxPacketSize0 = 64;
-	descriptor.idVendor = 0x12BA; // Harmonix
-	descriptor.idProduct = 0x0210; // Drums
-	descriptor.bcdDevice = 0x01;
-	descriptor.iManufacturer = 0x01;
-	descriptor.iProduct = 0x02;
-	descriptor.iSerialNumber = 0x00;
-	descriptor.bNumConfigurations = 0x01;
-	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, descriptor);
-
-	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG, UsbDeviceConfiguration{41, 1, 1, 0, 0x80, 32}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE, UsbDeviceInterface{0, 0, 2, 3, 0, 0, 0}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_HID, UsbDeviceHID{0x0111, 0x00, 0x01, 0x22, 137}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x81, 0x03, 0x0040, 10}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x02, 0x03, 0x0040, 10}));
-
-	usb_device_emulated::add_string("Licensed by Sony Computer Entertainment America");
-	usb_device_emulated::add_string("Harmonix RB3 MIDI Drums Interface for PlayStation®3");
-
-	// connect to midi device
-	midi_in = rtmidi_in_create_default();
-	ensure(midi_in);
-
-	if (!midi_in->ok)
-	{
-		rb3_midi_drums_log.error("Could not get MIDI in ptr: %s", midi_in->msg);
-		return;
-	}
-
-	const RtMidiApi api = rtmidi_in_get_current_api(midi_in);
-
-	if (!midi_in->ok)
-	{
-		rb3_midi_drums_log.error("Could not get MIDI api: %s", midi_in->msg);
-		return;
-	}
-
-	if (const char* api_name = rtmidi_api_name(api))
-	{
-		rb3_midi_drums_log.notice("Using %s api", api_name);
-	}
-	else
-	{
-		rb3_midi_drums_log.warning("Could not get MIDI api name");
-	}
-
-	rtmidi_in_ignore_types(midi_in, false, true, true);
-
-	const u32 port_count = rtmidi_get_port_count(midi_in);
-
-	if (!midi_in->ok || port_count == umax)
-	{
-		rb3_midi_drums_log.error("Could not get MIDI port count: %s", midi_in->msg);
-		return;
-	}
-
-	for (u32 port_number = 0; port_number < port_count; port_number++)
-	{
-		char buf[128]{};
-		s32 size = sizeof(buf);
-		if (rtmidi_get_port_name(midi_in, port_number, buf, &size) == -1 || !midi_in->ok)
-		{
-			rb3_midi_drums_log.error("Error getting port name for port %d: %s", port_number, midi_in->msg);
-			return;
-		}
-
-		rb3_midi_drums_log.notice("Found device with name: %s", buf);
-
-		if (device_name == buf)
-		{
-			rtmidi_open_port(midi_in, port_number, "RPCS3 MIDI Drums Input");
-
-			if (!midi_in->ok)
-			{
-				rb3_midi_drums_log.error("Could not open port %d for device '%s': %s", port_number, device_name, midi_in->msg);
-				return;
-			}
-
-			rb3_midi_drums_log.success("Connected to device: %s", device_name);
-			return;
-		}
-	}
-
-	rb3_midi_drums_log.error("Could not find device with name: %s", device_name);
-}
-
-usb_device_rb3_midi_drums::~usb_device_rb3_midi_drums()
-{
-	rtmidi_in_free(midi_in);
-}
-
-static const std::array<u8, 40> disabled_response = {
-	0xe9, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0f, 0x01,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x82,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x21, 0x26, 0x02, 0x06, 0x00, 0x00, 0x00, 0x00};
-
-static const std::array<u8, 40> enabled_response = {
-	0xe9, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8a,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x21, 0x26, 0x02, 0x06, 0x00, 0x00, 0x00, 0x00};
-
-void usb_device_rb3_midi_drums::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
-{
-	transfer->fake = true;
-
-	// configuration packets sent by rock band 3
-	// we only really need to check 1 byte here to figure out if the game
-	// wants to enable midi data or disable it
-	if (bmRequestType == 0x21 && bRequest == 0x9 && wLength == 40)
-	{
-		if (buf_size < 3)
-		{
-			rb3_midi_drums_log.warning("buffer size < 3, bailing out early (buf_size=0x%x)", buf_size);
-			return;
-		}
-
-		switch (buf[2])
-		{
-		case 0x89:
-			rb3_midi_drums_log.notice("MIDI data enabled.");
-			buttons_enabled = true;
-			response_pos = 0;
-			break;
-		case 0x81:
-			rb3_midi_drums_log.notice("MIDI data disabled.");
-			buttons_enabled = false;
-			response_pos = 0;
-			break;
-		default:
-			rb3_midi_drums_log.warning("Unhandled SET_REPORT request: 0x%02X");
-			break;
-		}
-	}
-
-	// the game expects some sort of response to the configuration packet
-	else if (bmRequestType == 0xa1 && bRequest == 0x1)
-	{
-		//rb3_midi_drums_log.success("[control_transfer] config 0xa1 0x1 length %d", wLength);
-
-		transfer->expected_count = buf_size;
-		if (buttons_enabled)
-		{
-			const usz remaining_bytes = enabled_response.size() - response_pos;
-			const usz copied_bytes = std::min<usz>(remaining_bytes, buf_size);
-			memcpy(buf, &enabled_response[response_pos], copied_bytes);
-			response_pos += copied_bytes;
-		}
-		else
-		{
-			const usz remaining_bytes = disabled_response.size() - response_pos;
-			const usz copied_bytes = std::min<usz>(remaining_bytes, buf_size);
-			memcpy(buf, &disabled_response[response_pos], copied_bytes);
-			response_pos += copied_bytes;
-		}
-	}
-	//else if (bmRequestType == 0x00 && bRequest == 0x9)
-	//{
-	//  // idk what this is but if I handle it we don't get input.
-	//	rb3_midi_drums_log.success("handled -- request %x, type %x, length %x", bmRequestType, bRequest, wLength);
-	//}
-	//else if (bmRequestType == 0x80 && bRequest == 0x6)
-	//{
-	//  // idk what this is but if I handle it we don't get input.
-	//	rb3_midi_drums_log.success("handled -- request %x, type %x, length %x", bmRequestType, bRequest, wLength);
-	//}
-	else if (bmRequestType == 0x21 && bRequest == 0x9 && wLength == 8)
-	{
-		// the game uses this request to do things like set the LEDs
-		// we don't have any LEDs, so do nothing
-	}
-	else
-	{
-		rb3_midi_drums_log.error("unhandled control_transfer: request %x, type %x, length %x", bmRequestType, bRequest, wLength);
-		usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
-	}
-}
-
-void usb_device_rb3_midi_drums::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/, UsbTransfer* transfer)
-{
-	transfer->fake = true;
-	transfer->expected_count = buf_size;
-	transfer->expected_result = HC_CC_NOERR;
-	// the real device takes 8ms to send a response, but there is
-	// no reason we can't make it faster
-	transfer->expected_time = get_timestamp() + 1'000;
-
-	const auto& bytes = controller::default_state;
-	if (buf_size < bytes.size())
-	{
-		rb3_midi_drums_log.warning("buffer size < %x, bailing out early (buf_size=0x%x)", bytes.size(), buf_size);
-		return;
-	}
-	memcpy(buf, bytes.data(), bytes.size());
-
-	if (g_cfg_rb3drums.reload_requested)
-	{
-		m_id_to_note_mapping = midi::create_id_to_note_mapping();
-		combo.reload_definitions();
-	}
-
-	while (true)
-	{
-		u8 midi_msg[32];
-		usz size = sizeof(midi_msg);
-
-		// This returns a double as some sort of delta time, with -1.0
-		// being used to signal an error.
-		if (rtmidi_in_get_message(midi_in, midi_msg, &size) == -1.0)
-		{
-			rb3_midi_drums_log.error("Error getting MIDI message: %s", midi_in->msg);
-			return;
-		}
-
-		if (size == 0)
-		{
-			break;
-		}
-
-		auto kit_state = parse_midi_message(midi_msg, size);
-		if (auto combo_state = combo.take_state())
-		{
-			if (combo_state->toggle_hold_kick)
-			{
-				hold_kick = !hold_kick;
-			}
-			else
-			{
-				kit_states.push_back(std::move(combo_state.value()));
-			}
-		}
-		else
-		{
-			bool is_cancel = kit_state.snare >= midi::min_velocity();
-			bool is_accept = kit_state.floor_tom >= midi::min_velocity();
-			if (hold_kick && (is_cancel || is_accept))
-			{
-				// Hold kick brings up the song category selector menu, which can be dismissed using accept/cancel buttons.
-				hold_kick = false;
-			}
-			else
-			{
-				kit_states.push_back(std::move(kit_state));
-			}
-		}
-	}
-
-	// Clean expired states.
-	auto now = std::chrono::steady_clock::now();
-	kit_states.erase(std::remove_if(std::begin(kit_states), std::end(kit_states), [&now](const rb3drums::KitState& kit_state) {
-		return now >= kit_state.expiry;
-	}), std::end(kit_states));
-
-	bool cymbal_hit = false;
-	usz i = 0;
-	for (; i < kit_states.size(); ++i)
-	{
-		const auto& kit_state = kit_states[i];
-
-		// Rockband sometimes has trouble registering both hits when two cymbals are hit at once.
-		// To solve for this, we stagger cymbal hits so that they occur one after another instead of at the same time.
-		// Note that this is staggering by pulse_ms (30ms default) so a human is unlikely to notice it in practice.
-		if (g_cfg_rb3drums.stagger_cymbals && cymbal_hit && kit_state.is_cymbal())
-		{
-			// Already have a cymbal applied, buffer other inputs.
-			break;
-		}
-		cymbal_hit = kit_state.is_cymbal();
-		write_state(buf, kit_state);
-	}
-
-	if (hold_kick)
-	{
-		write_state(buf, drum::kick_state());
-	}
-
-	// Extend expiry on buffered states since they are not active.
-	for (; i < kit_states.size(); ++i)
-	{
-		kit_states[i].expiry = now + drum::hit_duration();
-	}
-}
-
-rb3drums::KitState usb_device_rb3_midi_drums::parse_midi_message(u8* msg, usz size)
-{
-	if (size < 3)
-	{
-		rb3_midi_drums_log.warning("parse_midi_message: encountered message with size less than 3 bytes");
-		return rb3drums::KitState{};
-	}
-
-	auto status = msg[0];
-	auto id = msg[1];
-	auto value = msg[2];
-
-	if (status == 0x99)
-	{
-		return parse_midi_note(id, value);
-	}
-	if (status == g_cfg_rb3drums.midi_cc_status)
-	{
-		if (is_midi_cc(id, value))
-		{
-			return parse_midi_note(static_cast<u8>(midi::Id::MidiCC), 127);
-		}
-	}
-	// Ignore non-"note on" midi status messages.
-	return rb3drums::KitState{};
-}
-
-midi::Note usb_device_rb3_midi_drums::id_to_note(midi::Id id)
-{
-	const auto it = m_id_to_note_mapping.find(id);
-	return it != m_id_to_note_mapping.cend() ? it->second : midi::Note::Invalid;
-}
-
-rb3drums::KitState usb_device_rb3_midi_drums::parse_midi_note(const u8 id, const u8 velocity)
-{
-	if (velocity < midi::min_velocity())
-	{
-		// Must check here so we don't overwrite good values when applying states.
-		return rb3drums::KitState{};
-	}
-
-	rb3drums::KitState kit_state{};
-	kit_state.expiry = std::chrono::steady_clock::now() + drum::hit_duration();
-	const midi::Note note = id_to_note(static_cast<midi::Id>(id));
-	switch (note)
-	{
-		case midi::Note::Kick:              kit_state.kick_pedal    = velocity; break;
-		case midi::Note::HihatPedal:        kit_state.hihat_pedal   = velocity; break;
-		case midi::Note::Snare:             kit_state.snare         = velocity; break;
-		case midi::Note::SnareRim:          kit_state.snare_rim     = velocity; break;
-		case midi::Note::HiTom:             kit_state.hi_tom        = velocity; break;
-		case midi::Note::LowTom:            kit_state.low_tom       = velocity; break;
-		case midi::Note::FloorTom:          kit_state.floor_tom     = velocity; break;
-		case midi::Note::Hihat:             kit_state.hihat         = velocity; break;
-		case midi::Note::Ride:              kit_state.ride          = velocity; break;
-		case midi::Note::Crash:             kit_state.crash         = velocity; break;
-		default:
-			// Ignored note.
-			rb3_midi_drums_log.error("IGNORED NOTE: id = %x or %d", id, id);
-			return rb3drums::KitState{};
-	}
-
-	combo.add(static_cast<u8>(note));
-	return kit_state;
-}
-
-bool usb_device_rb3_midi_drums::is_midi_cc(const u8 id, const u8 value)
-{
-	if (id != g_cfg_rb3drums.midi_cc_number)
-	{
-		return false;
-	}
-
-	const auto is_past_threshold = [](u8 value)
-	{
-		const u8 threshold = g_cfg_rb3drums.midi_cc_threshold;
-		return g_cfg_rb3drums.midi_cc_invert_threshold
-			? value < threshold
-			: value > threshold;
-	};
-
-	if (midi_cc_triggered)
-	{
-		if (!is_past_threshold(value))
-		{
-			// Reset triggered state when we fall back past threshold.
-			midi_cc_triggered = false;
-		}
-	}
-	else
-	{
-		if (is_past_threshold(value))
-		{
-			midi_cc_triggered = true;
-			return true;
-		}
-	}
-	return false;
-}
-
-void usb_device_rb3_midi_drums::write_state(u8* buf, const rb3drums::KitState& kit_state)
-{
-	// See: https://github.com/TheNathannator/PlasticBand/blob/main/Docs/Instruments/4-Lane%20Drums/PS3%20and%20Wii.md#input-info
-
-	// Interestingly, because cymbals use the same visual track as drums, a hit on that color can only be a drum OR a cymbal.
-	// rockband handles this by taking a flag to indicate if the hit is a drum vs cymbal.
-	set_flag_if_any(buf, "red", drum::RED, {kit_state.snare});
-	set_flag_if_any(buf, "yellow", drum::YELLOW, {kit_state.hi_tom, kit_state.hihat});
-	set_flag_if_any(buf, "blue", drum::BLUE, {kit_state.low_tom, kit_state.ride}); // Rock band charts blue cymbal for both hihat open and ride sometimes.
-	set_flag_if_any(buf, "green", drum::GREEN, {kit_state.floor_tom, kit_state.crash});
-
-	// Additionally, Yellow (hihat) and Blue (ride) cymbals add dpad up or down, respectively. This allows rockband to disambiguate between tom+cymbals hit at the same time.
-	if (kit_state.hihat >= midi::min_velocity())
-	{
-		buf[controller::DPAD_INDEX] = static_cast<u8>(controller::DPad::Up);
-	}
-	if (kit_state.ride >= midi::min_velocity())
-	{
-		buf[controller::DPAD_INDEX] = static_cast<u8>(controller::DPad::Down);
-	}
-
-	set_flag_if_any(buf, "is_drum", drum::IS_DRUM, {kit_state.snare, kit_state.hi_tom, kit_state.low_tom, kit_state.floor_tom});
-	set_flag_if_any(buf, "is_cymbal", drum::IS_CYMBAL, {kit_state.hihat, kit_state.ride, kit_state.crash});
-
-	set_flag_if_any(buf, "kick_pedal", drum::KICK_PEDAL, {kit_state.kick_pedal});
-	set_flag_if_any(buf, "hihat_pedal", drum::HIHAT_PEDAL, {kit_state.hihat_pedal});
-
-	buf[11] = drum::scale_velocity(std::max(kit_state.hi_tom, kit_state.hihat));
-	buf[12] = drum::scale_velocity(kit_state.snare);
-	buf[13] = drum::scale_velocity(std::max(kit_state.floor_tom, kit_state.crash));
-	buf[14] = drum::scale_velocity(std::max({kit_state.low_tom, kit_state.ride}));
-
-	if (kit_state.start)
-	{
-		set_flag(buf, "start", drum::START_BUTTON);
-	}
-	if (kit_state.select)
-	{
-		set_flag(buf, "select", drum::SELECT_BUTTON);
-	}
-
-	// Unbound cause idk what to bind them to, but you don't really need them anyway.
-	// set_flag_if_any(buf, drum::SYSTEM_BUTTON, );
-	// set_flag_if_any(buf, drum::BACK_BUTTON, );
-}
-
-bool rb3drums::KitState::is_cymbal() const
-{
-	return std::max({hihat, ride, crash}) >= midi::min_velocity();
-}
-
-bool rb3drums::KitState::is_drum() const
-{
-	return std::max({snare, hi_tom, low_tom, floor_tom}) >= midi::min_velocity();
-}
-
-void usb_device_rb3_midi_drums::ComboTracker::reload_definitions()
-{
-	m_definitions = {
-		{"start",     g_cfg_rb3drums.combo_start.to_string(),            []{ return drum::start_state(); }},
-		{"select",    g_cfg_rb3drums.combo_select.to_string(),           []{ return drum::select_state(); }},
-		{"hold kick", g_cfg_rb3drums.combo_toggle_hold_kick.to_string(), []{ return drum::toggle_hold_kick_state(); }}
-	};
-}
-
-void usb_device_rb3_midi_drums::ComboTracker::add(u8 note)
-{
-	if (!midi_notes.empty() && std::chrono::steady_clock::now() >= expiry)
-	{
-		// Combo expired.
-		reset();
-	}
-
-	const usz i = midi_notes.size();
-	bool is_in_combo = false;
-	for (const auto& def : m_definitions)
-	{
-		if (i < def.notes.size() && note == def.notes[i])
-		{
-			// Track notes as long as we match any combo.
-			midi_notes.push_back(note);
-			is_in_combo = true;
-			break;
-		}
-	}
-
-	if (!is_in_combo)
-	{
-		reset();
-	}
-
-	if (midi_notes.size() == 1)
-	{
-		// New combo.
-		expiry = std::chrono::steady_clock::now() + midi::combo::window();
-	}
-}
-
-void usb_device_rb3_midi_drums::ComboTracker::reset()
-{
-	midi_notes.clear();
-}
-
-std::optional<rb3drums::KitState> usb_device_rb3_midi_drums::ComboTracker::take_state()
-{
-	if (midi_notes.empty())
-	{
-		return {};
-	}
-	for (const auto& combo : m_definitions)
-	{
-		if (midi_notes == combo.notes)
-		{
-			rb3_midi_drums_log.success("hit combo: %s", combo.name);
-			reset();
-			return combo.create_state();
-		}
-	}
-	return {};
-}
diff --git a/rpcs3/Emu/Io/RB3MidiDrums.h b/rpcs3/Emu/Io/RB3MidiDrums.h
deleted file mode 100644
index 9d13a81812..0000000000
--- a/rpcs3/Emu/Io/RB3MidiDrums.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#pragma once
-
-#include "Emu/Io/usb_device.h"
-
-#include <rtmidi_c.h>
-#include <chrono>
-#include <vector>
-#include <optional>
-
-namespace rb3drums
-{
-struct KitState
-{
-	std::chrono::steady_clock::time_point expiry;
-
-	u8 kick_pedal{};
-	u8 hihat_pedal{};
-
-	u8 snare{};
-	u8 snare_rim{};
-	u8 hi_tom{};
-	u8 low_tom{};
-	u8 floor_tom{};
-
-	u8 hihat{};
-	u8 ride{};
-	u8 crash{};
-
-	// Buttons triggered by combos.
-	bool start{};
-	bool select{};
-
-	// Special flag that keeps kick pedal held until toggled off.
-	// This is used in rb3 to access the category select dropdown in the song list.
-	bool toggle_hold_kick{};
-
-	bool is_cymbal() const;
-	bool is_drum() const;
-};
-
-} // namespace rb3drums
-
-namespace midi
-{
-
-enum class Id : u8
-{
-	// Each 'Note' can be triggered by multiple different numbers.
-	// Keeping them flattened in an enum for simplicity / switch statement usage.
-
-	// These follow the rockband 3 midi pro adapter support.
-	Snare0 = 38,
-	Snare1 = 31,
-	Snare2 = 34,
-	Snare3 = 37,
-	Snare4 = 39,
-	HiTom0 = 48,
-	HiTom1 = 50,
-	LowTom0 = 45,
-	LowTom1 = 47,
-	FloorTom0 = 41,
-	FloorTom1 = 43,
-	Hihat0 = 22,
-	Hihat1 = 26,
-	Hihat2 = 42,
-	Hihat3 = 54,
-	Ride0 = 51,
-	Ride1 = 53,
-	Ride2 = 56,
-	Ride3 = 59,
-	Crash0 = 49,
-	Crash1 = 52,
-	Crash2 = 55,
-	Crash3 = 57,
-	Kick0 = 33,
-	Kick1 = 35,
-	Kick2 = 36,
-	HihatPedal = 44,
-
-	// These are from alesis nitro mesh max. ymmv.
-	SnareRim = 40, // midi pro adapter counts this as snare.
-	HihatWithPedalUp = 46, // The midi pro adapter considers this a normal hihat hit.
-	HihatPedalPartial = 23, // If pedal is not 100% down, this will be sent instead of a normal hihat hit.
-
-	// Internal value used for converting midi CC.
-	// Values past 127 are not used in midi notes.
-	MidiCC = 255,
-};
-
-// Intermediate mapping regardless of which midi ids triggered it.
-enum class Note : u8
-{
-	Invalid,
-	Kick,
-	HihatPedal,
-	Snare,
-	SnareRim,
-	HiTom,
-	LowTom,
-	FloorTom,
-	HihatWithPedalUp,
-	Hihat,
-	Ride,
-	Crash,
-};
-
-}
-
-class usb_device_rb3_midi_drums : public usb_device_emulated
-{
-public:
-	usb_device_rb3_midi_drums(const std::array<u8, 7>& location, const std::string& device_name);
-	~usb_device_rb3_midi_drums();
-
-	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
-	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-
-private:
-	usz response_pos{};
-	bool buttons_enabled{};
-	RtMidiInPtr midi_in{};
-	std::vector<rb3drums::KitState> kit_states;
-	bool hold_kick{};
-	bool midi_cc_triggered{};
-
-	struct Definition
-	{
-		std::string name;
-		std::vector<u8> notes;
-		std::function<rb3drums::KitState()> create_state;
-	
-		Definition(std::string name, const std::string_view csv, const std::function<rb3drums::KitState()> create_state);
-	};
-
-	class ComboTracker
-	{
-	public:
-		void reload_definitions();
-		void add(u8 note);
-		void reset();
-		std::optional<rb3drums::KitState> take_state();
-
-	private:
-		std::chrono::steady_clock::time_point expiry;
-		std::vector<u8> midi_notes;
-		std::vector<Definition> m_definitions;
-	};
-	ComboTracker combo;
-
-	std::unordered_map<midi::Id, midi::Note> m_id_to_note_mapping;
-
-	midi::Note id_to_note(midi::Id id);
-	rb3drums::KitState parse_midi_message(u8* msg, usz size);
-	rb3drums::KitState parse_midi_note(u8 id, u8 velocity);
-	bool is_midi_cc(u8 id, u8 value);
-	void write_state(u8* buf, const rb3drums::KitState&);
-};
diff --git a/rpcs3/Emu/Io/RB3MidiGuitar.cpp b/rpcs3/Emu/Io/RB3MidiGuitar.cpp
deleted file mode 100644
index 9895722638..0000000000
--- a/rpcs3/Emu/Io/RB3MidiGuitar.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-// Rock Band 3 MIDI Pro Adapter Emulator (Guitar Mode)
-
-#include "stdafx.h"
-#include "RB3MidiGuitar.h"
-#include "Emu/Cell/lv2/sys_usbd.h"
-
-LOG_CHANNEL(rb3_midi_guitar_log);
-
-usb_device_rb3_midi_guitar::usb_device_rb3_midi_guitar(const std::array<u8, 7>& location, const std::string& device_name, bool twentytwo_fret)
-	: usb_device_emulated(location)
-{
-	// For the 22-fret guitar (Fender Squier), the only thing that's different
-	// is the device ID reported by the MIDI Pro Adapter.
-	//
-	// Everything else is *exactly* the same as the 17-fret guitar (Fender Mustang).
-	if (twentytwo_fret)
-	{
-		device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x0200, 0x00, 0x00, 0x00, 64, 0x12ba, 0x2538, 0x01, 0x01, 0x02, 0x00, 0x01});
-	}
-	else
-	{
-		device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x0200, 0x00, 0x00, 0x00, 64, 0x12ba, 0x2438, 0x01, 0x01, 0x02, 0x00, 0x01});
-	}
-
-	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG, UsbDeviceConfiguration{41, 1, 1, 0, 0x80, 32}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE, UsbDeviceInterface{0, 0, 2, 3, 0, 0, 0}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_HID, UsbDeviceHID{0x0111, 0x00, 0x01, 0x22, 137}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x81, 0x03, 0x0040, 10}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x02, 0x03, 0x0040, 10}));
-
-	usb_device_emulated::add_string("Licensed by Sony Computer Entertainment America");
-	usb_device_emulated::add_string("Harmonix RB3 MIDI Guitar Interface for PlayStation®3");
-
-	// connect to midi device
-	midi_in = rtmidi_in_create_default();
-	ensure(midi_in);
-
-	if (!midi_in->ok)
-	{
-		rb3_midi_guitar_log.error("Could not get MIDI in ptr: %s", midi_in->msg);
-		return;
-	}
-
-	const RtMidiApi api = rtmidi_in_get_current_api(midi_in);
-
-	if (!midi_in->ok)
-	{
-		rb3_midi_guitar_log.error("Could not get MIDI api: %s", midi_in->msg);
-		return;
-	}
-
-	if (const char* api_name = rtmidi_api_name(api))
-	{
-		rb3_midi_guitar_log.notice("Using %s api", api_name);
-	}
-	else
-	{
-		rb3_midi_guitar_log.warning("Could not get MIDI api name");
-	}
-
-	rtmidi_in_ignore_types(midi_in, false, true, true);
-
-	const u32 port_count = rtmidi_get_port_count(midi_in);
-
-	if (!midi_in->ok || port_count == umax)
-	{
-		rb3_midi_guitar_log.error("Could not get MIDI port count: %s", midi_in->msg);
-		return;
-	}
-
-	for (u32 port_number = 0; port_number < port_count; port_number++)
-	{
-		char buf[128]{};
-		s32 size = sizeof(buf);
-		if (rtmidi_get_port_name(midi_in, port_number, buf, &size) == -1 || !midi_in->ok)
-		{
-			rb3_midi_guitar_log.error("Error getting port name for port %d: %s", port_number, midi_in->msg);
-			return;
-		}
-
-		rb3_midi_guitar_log.notice("Found device with name: %s", buf);
-
-		if (device_name == buf)
-		{
-			rtmidi_open_port(midi_in, port_number, "RPCS3 MIDI Guitar Input");
-
-			if (!midi_in->ok)
-			{
-				rb3_midi_guitar_log.error("Could not open port %d for device '%s': %s", port_number, device_name, midi_in->msg);
-				return;
-			}
-
-			rb3_midi_guitar_log.success("Connected to device: %s", device_name);
-			return;
-		}
-	}
-
-	rb3_midi_guitar_log.error("Could not find device with name: %s", device_name);
-}
-
-usb_device_rb3_midi_guitar::~usb_device_rb3_midi_guitar()
-{
-	rtmidi_in_free(midi_in);
-}
-
-static const std::array<u8, 40> disabled_response = {
-	0xe9, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0f, 0x01,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x82,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x21, 0x26, 0x02, 0x06, 0x00, 0x00, 0x00, 0x00};
-
-static const std::array<u8, 40> enabled_response = {
-	0xe9, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8a,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x21, 0x26, 0x02, 0x06, 0x00, 0x00, 0x00, 0x00};
-
-void usb_device_rb3_midi_guitar::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
-{
-	transfer->fake = true;
-
-	// configuration packets sent by rock band 3
-	// we only really need to check 1 byte here to figure out if the game
-	// wants to enable midi data or disable it
-	if (bmRequestType == 0x21 && bRequest == 0x9 && wLength == 40)
-	{
-		if (buf_size < 3)
-		{
-			rb3_midi_guitar_log.warning("buffer size < 3, bailing out early (buf_size=0x%x)", buf_size);
-			return;
-		}
-
-		switch (buf[2])
-		{
-		case 0x89:
-			rb3_midi_guitar_log.notice("MIDI data enabled.");
-			buttons_enabled = true;
-			response_pos = 0;
-			break;
-		case 0x81:
-			rb3_midi_guitar_log.notice("MIDI data disabled.");
-			buttons_enabled = false;
-			response_pos = 0;
-			break;
-		default:
-			rb3_midi_guitar_log.warning("Unhandled SET_REPORT request: 0x%02X");
-			break;
-		}
-	}
-	// the game expects some sort of response to the configuration packet
-	else if (bmRequestType == 0xa1 && bRequest == 0x1)
-	{
-		transfer->expected_count = buf_size;
-		if (buttons_enabled)
-		{
-			const usz remaining_bytes = enabled_response.size() - response_pos;
-			const usz copied_bytes = std::min<usz>(remaining_bytes, buf_size);
-			memcpy(buf, &enabled_response[response_pos], copied_bytes);
-			response_pos += copied_bytes;
-		}
-		else
-		{
-			const usz remaining_bytes = disabled_response.size() - response_pos;
-			const usz copied_bytes = std::min<usz>(remaining_bytes, buf_size);
-			memcpy(buf, &disabled_response[response_pos], copied_bytes);
-			response_pos += copied_bytes;
-		}
-	}
-	else if (bmRequestType == 0x21 && bRequest == 0x9 && wLength == 8)
-	{
-		// the game uses this request to do things like set the LEDs
-		// we don't have any LEDs, so do nothing
-	}
-	else
-	{
-		usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
-	}
-}
-
-void usb_device_rb3_midi_guitar::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/, UsbTransfer* transfer)
-{
-	transfer->fake = true;
-	transfer->expected_count = buf_size;
-	transfer->expected_result = HC_CC_NOERR;
-	// the real device takes 8ms to send a response, but there is
-	// no reason we can't make it faster
-	transfer->expected_time = get_timestamp() + 1'000;
-
-
-	// default input state
-	const std::array<u8, 27> bytes = {
-		0x00, 0x00, 0x08, 0x80, 0x80, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-		0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00};
-
-	if (buf_size < bytes.size())
-	{
-		rb3_midi_guitar_log.warning("buffer size < %x, bailing out early (buf_size=0x%x)", bytes.size(), buf_size);
-		return;
-	}
-
-	memcpy(buf, bytes.data(), bytes.size());
-
-	while (true)
-	{
-		u8 midi_msg[32];
-		usz size = sizeof(midi_msg);
-
-		// this returns a double as some sort of delta time, with -1.0
-		// being used to signal an error
-		if (rtmidi_in_get_message(midi_in, midi_msg, &size) == -1.0)
-		{
-			rb3_midi_guitar_log.error("Error getting MIDI message: %s", midi_in->msg);
-			return;
-		}
-
-		if (size == 0)
-		{
-			break;
-		}
-
-		parse_midi_message(midi_msg, size);
-	}
-
-	write_state(buf);
-}
-
-void usb_device_rb3_midi_guitar::parse_midi_message(u8* msg, usz size)
-{
-	// this is not emulated correctly but the game doesn't seem to care
-	button_state.count++;
-
-	// read frets
-	if (size == 8 && msg[0] == 0xF0 && msg[4] == 0x01)
-	{
-		switch (msg[5])
-		{
-		case 1:
-			button_state.frets[0] = msg[6] - 0x40;
-			break;
-		case 2:
-			button_state.frets[1] = msg[6] - 0x3B;
-			break;
-		case 3:
-			button_state.frets[2] = msg[6] - 0x37;
-			break;
-		case 4:
-			button_state.frets[3] = msg[6] - 0x32;
-			break;
-		case 5:
-			button_state.frets[4] = msg[6] - 0x2D;
-			break;
-		case 6:
-			button_state.frets[5] = msg[6] - 0x28;
-			break;
-		default:
-			rb3_midi_guitar_log.warning("Invalid string for fret event: %d", msg[5]);
-			break;
-		}
-	}
-
-	// read strings
-	if (size == 8 && msg[0] == 0xF0 && msg[4] == 0x05)
-	{
-		button_state.string_velocities[msg[5] - 1] = msg[6];
-	}
-
-	// read buttons
-	if (size == 10 && msg[0] == 0xF0 && msg[4] == 0x08)
-	{
-		button_state.dpad = msg[7] & 0x0f;
-
-		button_state.square = (msg[5] & 0b0000'0001) == 0b0000'0001;
-		button_state.cross = (msg[5] & 0b0000'0010) == 0b0000'0010;
-		button_state.circle = (msg[5] & 0b0000'0100) == 0b0000'0100;
-		button_state.triangle = (msg[5] & 0b0000'1000) == 0b0000'1000;
-
-		button_state.select = (msg[6] & 0b0000'0001) == 0b0000'0001;
-		button_state.start = (msg[6] & 0b0000'0010) == 0b0000'0010;
-		button_state.tilt_sensor = (msg[7] & 0b0100'0000) == 0b0100'0000;
-	}
-
-	// sustain pedal
-	if (size == 3 && msg[0] == 0xB0 && msg[1] == 0x40)
-	{
-		button_state.sustain_pedal = msg[2] >= 40;
-	}
-}
-
-void usb_device_rb3_midi_guitar::write_state(u8* buf)
-{
-	// encode frets
-	buf[8] |= (button_state.frets[0] & 0b11111) << 2;
-	buf[8] |= (button_state.frets[1] & 0b11000) >> 3;
-	buf[7] |= (button_state.frets[1] & 0b00111) << 5;
-	buf[7] |= (button_state.frets[2] & 0b11111) >> 0;
-	buf[6] |= (button_state.frets[3] & 0b11111) << 2;
-	buf[6] |= (button_state.frets[4] & 0b11000) >> 3;
-	buf[5] |= (button_state.frets[4] & 0b00111) << 5;
-	buf[5] |= (button_state.frets[5] & 0b11111) >> 0;
-
-	// encode strings
-	buf[14] = button_state.string_velocities[0];
-	buf[13] = button_state.string_velocities[1];
-	buf[12] = button_state.string_velocities[2];
-	buf[11] = button_state.string_velocities[3];
-	buf[10] = button_state.string_velocities[4];
-	buf[9] = button_state.string_velocities[5];
-
-	// encode frets for playing 5 fret on the pro guitar
-	// this actually isn't done by the real MPA, but Rock Band 3 allows this
-	// so there's no harm in supporting it.
-	for (u8 i : button_state.frets)
-	{
-		switch (i)
-		{
-			case 1:
-			case 6:
-			case 13:
-				buf[9] |= 0b1000'0000;
-				break;
-			case 2:
-			case 7:
-			case 14:
-				buf[10] |= 0b1000'0000;
-				break;
-			case 3:
-			case 8:
-			case 15:
-				buf[11] |= 0b1000'0000;
-				break;
-			case 4:
-			case 9:
-			case 16:
-				buf[12] |= 0b1000'0000;
-				break;
-			case 5:
-			case 10:
-			case 17:
-				buf[13] |= 0b1000'0000;
-				break;
-			default:
-				break;
-		}
-
-		// enable the solo bit for frets >= 13
-		if (i >= 13)
-		{
-				buf[8] |= 0b1000'0000;
-		}
-	}
-
-	// encode tilt sensor/sustain_pedal
-	if (button_state.tilt_sensor || button_state.sustain_pedal)
-	{
-		buf[15] = 0x7f;
-		buf[16] = 0x7f;
-		buf[17] = 0x7f;
-	}
-
-	buf[1] |= 0b0000'0001 * button_state.select;
-	buf[1] |= 0b0000'0010 * button_state.start;
-
-	buf[0] |= 0b0000'0010 * button_state.cross;
-	buf[0] |= 0b0000'0100 * button_state.circle;
-	buf[0] |= 0b0000'1000 * button_state.triangle;
-	buf[0] |= 0b0000'0001 * button_state.square;
-
-	buf[2] = button_state.dpad;
-}
diff --git a/rpcs3/Emu/Io/RB3MidiGuitar.h b/rpcs3/Emu/Io/RB3MidiGuitar.h
deleted file mode 100644
index 3a93f95d61..0000000000
--- a/rpcs3/Emu/Io/RB3MidiGuitar.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include "Emu/Io/usb_device.h"
-
-#include <rtmidi_c.h>
-
-class usb_device_rb3_midi_guitar : public usb_device_emulated
-{
-private:
-	usz response_pos = 0;
-	bool buttons_enabled = false;
-	RtMidiInPtr midi_in{};
-
-	// button states
-	struct
-	{
-		u8 count = 0;
-
-		bool cross = false;
-		bool circle = false;
-		bool square = false;
-		bool triangle = false;
-
-		bool start = false;
-		bool select = false;
-		bool tilt_sensor = false;
-		bool sustain_pedal = false; // used for overdrive
-
-		u8 dpad = 8;
-
-		std::array<u8, 6> frets{};
-		std::array<u8, 6> string_velocities{};
-	} button_state;
-
-	void parse_midi_message(u8* msg, usz size);
-	void write_state(u8* buf);
-
-public:
-	usb_device_rb3_midi_guitar(const std::array<u8, 7>& location, const std::string& device_name, bool twentytwo_fret);
-	~usb_device_rb3_midi_guitar();
-
-	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
-	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-};
diff --git a/rpcs3/Emu/Io/RB3MidiKeyboard.cpp b/rpcs3/Emu/Io/RB3MidiKeyboard.cpp
deleted file mode 100644
index ccfc2dbdc8..0000000000
--- a/rpcs3/Emu/Io/RB3MidiKeyboard.cpp
+++ /dev/null
@@ -1,357 +0,0 @@
-// Rock Band 3 MIDI Pro Adapter Emulator (Keyboard Mode)
-
-#include "stdafx.h"
-#include "RB3MidiKeyboard.h"
-#include "Emu/Cell/lv2/sys_usbd.h"
-
-LOG_CHANNEL(rb3_midi_keyboard_log);
-
-usb_device_rb3_midi_keyboard::usb_device_rb3_midi_keyboard(const std::array<u8, 7>& location, const std::string& device_name)
-	: usb_device_emulated(location)
-{
-	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x0200, 0x00, 0x00, 0x00, 64, 0x12ba, 0x2338, 0x01, 0x01, 0x02, 0x00, 0x01});
-	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG, UsbDeviceConfiguration{41, 1, 1, 0, 0x80, 32}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE, UsbDeviceInterface{0, 0, 2, 3, 0, 0, 0}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_HID, UsbDeviceHID{0x0111, 0x00, 0x01, 0x22, 137}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x81, 0x03, 0x0040, 10}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x02, 0x03, 0x0040, 10}));
-
-	usb_device_emulated::add_string("Licensed by Sony Computer Entertainment America");
-	usb_device_emulated::add_string("Harmonix RB3 MIDI Keyboard Interface for PlayStation®3");
-
-	// connect to midi device
-	midi_in = rtmidi_in_create_default();
-	ensure(midi_in);
-
-	if (!midi_in->ok)
-	{
-		rb3_midi_keyboard_log.error("Could not get MIDI in ptr: %s", midi_in->msg);
-		return;
-	}
-
-	const RtMidiApi api = rtmidi_in_get_current_api(midi_in);
-
-	if (!midi_in->ok)
-	{
-		rb3_midi_keyboard_log.error("Could not get MIDI api: %s", midi_in->msg);
-		return;
-	}
-
-	if (const char* api_name = rtmidi_api_name(api))
-	{
-		rb3_midi_keyboard_log.notice("Using %s api", api_name);
-	}
-	else
-	{
-		rb3_midi_keyboard_log.warning("Could not get MIDI api name");
-	}
-
-	const u32 port_count = rtmidi_get_port_count(midi_in);
-
-	if (!midi_in->ok || port_count == umax)
-	{
-		rb3_midi_keyboard_log.error("Could not get MIDI port count: %s", midi_in->msg);
-		return;
-	}
-
-	for (u32 port_number = 0; port_number < port_count; port_number++)
-	{
-		char buf[128]{};
-		s32 size = sizeof(buf);
-		if (rtmidi_get_port_name(midi_in, port_number, buf, &size) == -1 || !midi_in->ok)
-		{
-			rb3_midi_keyboard_log.error("Error getting port name for port %d: %s", port_number, midi_in->msg);
-			return;
-		}
-
-		rb3_midi_keyboard_log.notice("Found device with name: %s", buf);
-
-		if (device_name == buf)
-		{
-			rtmidi_open_port(midi_in, port_number, "RPCS3 MIDI Keyboard Input");
-
-			if (!midi_in->ok)
-			{
-				rb3_midi_keyboard_log.error("Could not open port %d for device '%s': %s", port_number, device_name, midi_in->msg);
-				return;
-			}
-
-			rb3_midi_keyboard_log.success("Connected to device: %s", device_name);
-			return;
-		}
-	}
-
-	rb3_midi_keyboard_log.error("Could not find device with name: %s", device_name);
-}
-
-usb_device_rb3_midi_keyboard::~usb_device_rb3_midi_keyboard()
-{
-	rtmidi_in_free(midi_in);
-}
-
-static const std::array<u8, 40> disabled_response = {
-	0xe9, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0d, 0x01,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x82,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x21, 0x26, 0x02, 0x06, 0x00, 0x00, 0x00, 0x00};
-
-static const std::array<u8, 40> enabled_response = {
-	0xe9, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8a,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x21, 0x26, 0x02, 0x06, 0x00, 0x00, 0x00, 0x00};
-
-void usb_device_rb3_midi_keyboard::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
-{
-	transfer->fake = true;
-
-	// configuration packets sent by rock band 3
-	// we only really need to check 1 byte here to figure out if the game
-	// wants to enable midi data or disable it
-	if (bmRequestType == 0x21 && bRequest == 0x9 && wLength == 40)
-	{
-		if (buf_size < 3)
-		{
-			rb3_midi_keyboard_log.warning("buffer size < 3, bailing out early (buf_size=0x%x)", buf_size);
-			return;
-		}
-
-		switch (buf[2])
-		{
-		case 0x89:
-			rb3_midi_keyboard_log.notice("MIDI data enabled.");
-			buttons_enabled = true;
-			response_pos = 0;
-			break;
-		case 0x81:
-			rb3_midi_keyboard_log.notice("MIDI data disabled.");
-			buttons_enabled = false;
-			response_pos = 0;
-			break;
-		default:
-			rb3_midi_keyboard_log.warning("Unhandled SET_REPORT request: 0x%02X");
-			break;
-		}
-	}
-	// the game expects some sort of response to the configuration packet
-	else if (bmRequestType == 0xa1 && bRequest == 0x1)
-	{
-		transfer->expected_count = buf_size;
-		if (buttons_enabled)
-		{
-			const usz remaining_bytes = enabled_response.size() - response_pos;
-			const usz copied_bytes = std::min<usz>(remaining_bytes, buf_size);
-			memcpy(buf, &enabled_response[response_pos], copied_bytes);
-			response_pos += copied_bytes;
-		}
-		else
-		{
-			const usz remaining_bytes = disabled_response.size() - response_pos;
-			const usz copied_bytes = std::min<usz>(remaining_bytes, buf_size);
-			memcpy(buf, &disabled_response[response_pos], copied_bytes);
-			response_pos += copied_bytes;
-		}
-	}
-	else if (bmRequestType == 0x21 && bRequest == 0x9 && wLength == 8)
-	{
-		// the game uses this request to do things like set the LEDs
-		// we don't have any LEDs, so do nothing
-	}
-	else
-	{
-		usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
-	}
-}
-
-void usb_device_rb3_midi_keyboard::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/, UsbTransfer* transfer)
-{
-	transfer->fake = true;
-	transfer->expected_count = buf_size;
-	transfer->expected_result = HC_CC_NOERR;
-	// the real device takes 8ms to send a response, but there is
-	// no reason we can't make it faster
-	transfer->expected_time = get_timestamp() + 1'000;
-
-	// default input state
-	static const std::array<u8, 27> bytes = {
-		0x00, 0x00, 0x08, 0x80, 0x80, 0x80, 0x80, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00,
-		0x02, 0x00, 0x02};
-
-	if (buf_size < bytes.size())
-	{
-		rb3_midi_keyboard_log.warning("buffer size < %x, bailing out early (buf_size=0x%x)", bytes.size(), buf_size);
-		return;
-	}
-
-	memcpy(buf, bytes.data(), bytes.size());
-
-	while (true)
-	{
-		u8 midi_msg[32];
-		usz size = sizeof(midi_msg);
-
-		// this returns a double as some sort of delta time, with -1.0
-		// being used to signal an error
-		if (rtmidi_in_get_message(midi_in, midi_msg, &size) == -1.0)
-		{
-			rb3_midi_keyboard_log.error("Error getting MIDI message: %s", midi_in->msg);
-			return;
-		}
-
-		if (size == 0)
-		{
-			break;
-		}
-
-		parse_midi_message(midi_msg, size);
-	}
-
-	write_state(buf);
-}
-
-void usb_device_rb3_midi_keyboard::parse_midi_message(u8* msg, usz size)
-{
-	// this is not emulated correctly but the game doesn't seem to care
-	button_state.count++;
-
-	// handle note on/off messages
-	if (size == 3 && (msg[0] == 0x80 || msg[0] == 0x90))
-	{
-		const bool note_on = (0x10 & msg[0]) == 0x10 && msg[2] != 0;
-
-		// handle navigation buttons
-		switch (msg[1])
-		{
-		case 44: // G#2
-			button_state.cross = note_on;
-			break;
-		case 42: // F#2
-			button_state.circle = note_on;
-			break;
-		case 39: // D#2
-			button_state.square = note_on;
-			break;
-		case 37: // C#2
-			button_state.triangle = note_on;
-			break;
-		case 46: // A#2
-			button_state.start = note_on;
-			break;
-		case 36: // C2
-			button_state.select = note_on;
-			break;
-		case 45: // A2
-			button_state.overdrive = note_on;
-			break;
-		case 41: // F2
-			button_state.dpad_up = note_on;
-			break;
-		case 43: // G2
-			button_state.dpad_down = note_on;
-			break;
-		case 38: // D2
-			button_state.dpad_left = note_on;
-			break;
-		case 40: // E2
-			button_state.dpad_right = note_on;
-			break;
-		default:
-			break;
-		}
-
-		// handle keyboard keys
-		if (msg[1] >= 48 && msg[1] <= (48 + button_state.keys.size()))
-		{
-			const u32 key = msg[1] - 48;
-			button_state.keys[key] = note_on;
-			button_state.velocities[key] = msg[2];
-		}
-	}
-
-	// control channel for overdrive
-	else if (size == 3 && msg[0] == 0xB0)
-	{
-		switch (msg[1])
-		{
-		case 0x1:
-		case 0x40:
-			button_state.overdrive = msg[2] > 40;
-			break;
-		default:
-			break;
-		}
-	}
-
-	// pitch wheel
-	else if (size == 3 && msg[0] == 0xE0)
-	{
-		const u16 msb = msg[2];
-		const u16 lsb = msg[1];
-		button_state.pitch_wheel = (msb << 7) | lsb;
-	}
-}
-
-void usb_device_rb3_midi_keyboard::write_state(u8* buf)
-{
-	// buttons
-	buf[0] |= 0b0000'0010 * button_state.cross;
-	buf[0] |= 0b0000'0100 * button_state.circle;
-	buf[0] |= 0b0000'0001 * button_state.square;
-	buf[0] |= 0b0000'1000 * button_state.triangle;
-	buf[1] |= 0b0000'0010 * button_state.start;
-	buf[1] |= 0b0000'0001 * button_state.select;
-
-	// dpad
-	if (button_state.dpad_up)
-	{
-		buf[2] = 0;
-	}
-	else if (button_state.dpad_down)
-	{
-		buf[2] = 4;
-	}
-	else if (button_state.dpad_left)
-	{
-		buf[2] = 6;
-	}
-	else if (button_state.dpad_right)
-	{
-		buf[2] = 2;
-	}
-
-	// build key bitfield and write velocities
-	u32 key_mask = 0;
-	u8 vel_idx = 0;
-
-	for (usz i = 0; i < button_state.keys.size(); i++)
-	{
-		key_mask <<= 1;
-		key_mask |= 0x1 * button_state.keys[i];
-
-		// the keyboard can only report 5 velocities from left to right
-		if (button_state.keys[i] && vel_idx < 5)
-		{
-			buf[8 + vel_idx++] = button_state.velocities[i];
-		}
-	}
-
-	// write keys
-	buf[5] = (key_mask >> 17) & 0xff;
-	buf[6] = (key_mask >> 9) & 0xff;
-	buf[7] = (key_mask >> 1) & 0xff;
-	buf[8] |= 0b1000'0000 * (key_mask & 0x1);
-
-	// overdrive
-	buf[13] |= 0b1000'0000 * button_state.overdrive;
-
-	// pitch wheel
-	const u8 wheel_pos = std::abs((button_state.pitch_wheel >> 6) - 0x80);
-	if (wheel_pos >= 5)
-	{
-		buf[15] = std::min<u8>(std::max<u8>(0x5, wheel_pos), 0x75);
-	}
-}
diff --git a/rpcs3/Emu/Io/RB3MidiKeyboard.h b/rpcs3/Emu/Io/RB3MidiKeyboard.h
deleted file mode 100644
index c5042af239..0000000000
--- a/rpcs3/Emu/Io/RB3MidiKeyboard.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-
-#include "Emu/Io/usb_device.h"
-
-#include <rtmidi_c.h>
-
-class usb_device_rb3_midi_keyboard : public usb_device_emulated
-{
-private:
-	usz response_pos = 0;
-	bool buttons_enabled = false;
-	RtMidiInPtr midi_in{};
-
-	// button states
-	// TODO: emulate velocity
-	struct
-	{
-		u8 count = 0;
-
-		bool cross = false;
-		bool circle = false;
-		bool square = false;
-		bool triangle = false;
-
-		bool start = false;
-		bool select = false;
-		bool overdrive = false;
-
-		bool dpad_up = false;
-		bool dpad_down = false;
-		bool dpad_left = false;
-		bool dpad_right = false;
-
-		std::array<bool, 25> keys{};
-		std::array<u8, 25> velocities{};
-
-		s16 pitch_wheel = 0;
-	} button_state;
-
-	void parse_midi_message(u8* msg, usz size);
-	void write_state(u8* buf);
-
-public:
-	usb_device_rb3_midi_keyboard(const std::array<u8, 7>& location, const std::string& device_name);
-	~usb_device_rb3_midi_keyboard();
-
-	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
-	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-};
diff --git a/rpcs3/Emu/Io/Skylander.cpp b/rpcs3/Emu/Io/Skylander.cpp
index 974e9a887f..87887ddf1f 100644
--- a/rpcs3/Emu/Io/Skylander.cpp
+++ b/rpcs3/Emu/Io/Skylander.cpp
@@ -2,6 +2,8 @@
 #include "Skylander.h"
 #include "Emu/Cell/lv2/sys_usbd.h"
 
+#include "util/asm.hpp"
+
 LOG_CHANNEL(skylander_log, "skylander");
 
 sky_portal g_skyportal;
@@ -90,10 +92,10 @@ void sky_portal::get_status(u8* reply_buf)
 	}
 
 	std::memset(reply_buf, 0, 0x20);
-	reply_buf[0] = 0x53;
-	write_to_ptr<le_t<u16>>(reply_buf, 1, status);
-	reply_buf[5] = interrupt_counter++;
-	reply_buf[6] = 0x01;
+	reply_buf[0]                               = 0x53;
+	*utils::bless<le_t<u16>>(reply_buf + 1)    = status;
+	reply_buf[5]                               = interrupt_counter++;
+	reply_buf[6]                               = 0x01;
 }
 
 void sky_portal::query_block(u8 sky_num, u8 block, u8* reply_buf)
@@ -157,11 +159,11 @@ u8 sky_portal::load_skylander(u8* buf, fs::file in_file)
 {
 	std::lock_guard lock(sky_mutex);
 
-	const u32 sky_serial = read_from_ptr<le_t<u32>>(buf);
+	u32 sky_serial = *utils::bless<le_t<u32>>(buf);
 	u8 found_slot  = 0xFF;
 
 	// mimics spot retaining on the portal
-	for (u8 i = 0; i < 8; i++)
+	for (auto i = 0; i < 8; i++)
 	{
 		if ((skylanders[i].status & 1) == 0)
 		{
@@ -180,7 +182,7 @@ u8 sky_portal::load_skylander(u8* buf, fs::file in_file)
 
 	ensure(found_slot != 0xFF);
 
-	skylander& thesky = skylanders[found_slot];
+	auto& thesky = skylanders[found_slot];
 	memcpy(thesky.data.data(), buf, thesky.data.size());
 	thesky.sky_file = std::move(in_file);
 	thesky.status   = 3;
@@ -191,31 +193,20 @@ u8 sky_portal::load_skylander(u8* buf, fs::file in_file)
 	return found_slot;
 }
 
-usb_device_skylander::usb_device_skylander(const std::array<u8, 7>& location)
-	: usb_device_emulated(location)
+usb_device_skylander::usb_device_skylander()
 {
-	device        = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x0200, 0x00, 0x00, 0x00, 0x40, 0x1430, 0x0150, 0x0100, 0x01, 0x02, 0x00, 0x01});
-	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG, UsbDeviceConfiguration{0x0029, 0x01, 0x01, 0x00, 0x80, 0xFA}));
+	device        = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x0200, 0x00, 0x00, 0x00, 0x20, 0x1430, 0x0150, 0x0100, 0x01, 0x02, 0x00, 0x01});
+	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG, UsbDeviceConfiguration{0x0029, 0x01, 0x01, 0x00, 0x80, 0x96}));
 	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE, UsbDeviceInterface{0x00, 0x00, 0x02, 0x03, 0x00, 0x00, 0x00}));
 	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_HID, UsbDeviceHID{0x0111, 0x00, 0x01, 0x22, 0x001d}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x81, 0x03, 0x40, 0x01}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x02, 0x03, 0x40, 0x01}));
+	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x81, 0x03, 0x0020, 0x01}));
+	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x01, 0x03, 0x0020, 0x01}));
 }
 
 usb_device_skylander::~usb_device_skylander()
 {
 }
 
-std::shared_ptr<usb_device> usb_device_skylander::make_instance(u32, const std::array<u8, 7>& location)
-{
-	return std::make_shared<usb_device_skylander>(location);
-}
-
-u16 usb_device_skylander::get_num_emu_devices()
-{
-	return 1;
-}
-
 void usb_device_skylander::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
 {
 	transfer->fake = true;
@@ -264,9 +255,10 @@ void usb_device_skylander::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
 			}
 			case 'L':
 			{
-				// Trap Team Portal Side Lights
+				// Audio Download status?
 				ensure(buf_size == 5);
-				// TODO Proper Light side structs
+				q_result[0] = 0x4C;
+				q_queries.push(q_result);
 				break;
 			}
 			case 'M':
@@ -275,7 +267,8 @@ void usb_device_skylander::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
 				// Return version of 0 to prevent attempts to
 				// play audio on the portal
 				ensure(buf_size == 2);
-				q_result = {0x4D, buf[1], 0x00, 0x19};
+				q_result[0] = 0x4D;
+				q_result[1] = buf[1];
 				q_queries.push(q_result);
 				break;
 			}
@@ -329,9 +322,7 @@ void usb_device_skylander::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
 				q_queries.push(q_result);
 				break;
 			}
-			default:
-				skylander_log.error("Unhandled Query: buf_size=0x%02X, Type=0x%02X, bRequest=0x%02X, bmRequestType=0x%02X", buf_size, (buf_size > 0) ? buf[0] : -1, bRequest, bmRequestType);
-				break;
+			default: skylander_log.error("Unhandled Query Type: 0x%02X", buf[0]); break;
 			}
 			break;
 		}
@@ -343,32 +334,23 @@ void usb_device_skylander::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
 	}
 }
 
-void usb_device_skylander::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer)
+void usb_device_skylander::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/, UsbTransfer* transfer)
 {
 	ensure(buf_size == 0x20);
 
 	transfer->fake            = true;
 	transfer->expected_count  = buf_size;
 	transfer->expected_result = HC_CC_NOERR;
+	// Interrupt transfers are slow(~22ms)
+	transfer->expected_time = get_timestamp() + 22000;
 
-	if (endpoint == 0x02)
+	if (!q_queries.empty())
 	{
-		// Audio transfers are fairly quick(~1ms)
-		transfer->expected_time = get_timestamp() + 1000;
-		// The response is simply the request, echoed back
+		memcpy(buf, q_queries.front().data(), 0x20);
+		q_queries.pop();
 	}
 	else
 	{
-		// Interrupt transfers are slow(~22ms)
-		transfer->expected_time = get_timestamp() + 22000;
-		if (!q_queries.empty())
-		{
-			memcpy(buf, q_queries.front().data(), 0x20);
-			q_queries.pop();
-		}
-		else
-		{
-			g_skyportal.get_status(buf);
-		}
+		g_skyportal.get_status(buf);
 	}
 }
diff --git a/rpcs3/Emu/Io/Skylander.h b/rpcs3/Emu/Io/Skylander.h
index be67c8c3cc..0002c2500a 100644
--- a/rpcs3/Emu/Io/Skylander.h
+++ b/rpcs3/Emu/Io/Skylander.h
@@ -43,12 +43,9 @@ extern sky_portal g_skyportal;
 class usb_device_skylander : public usb_device_emulated
 {
 public:
-	usb_device_skylander(const std::array<u8, 7>& location);
+	usb_device_skylander();
 	~usb_device_skylander();
 
-	static std::shared_ptr<usb_device> make_instance(u32 controller_index, const std::array<u8, 7>& location);
-	static u16 get_num_emu_devices();
-
 	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
 	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
 
diff --git a/rpcs3/Emu/Io/TopShotElite.cpp b/rpcs3/Emu/Io/TopShotElite.cpp
deleted file mode 100644
index c241fe1ed4..0000000000
--- a/rpcs3/Emu/Io/TopShotElite.cpp
+++ /dev/null
@@ -1,400 +0,0 @@
-#include "stdafx.h"
-#include "TopShotElite.h"
-#include "MouseHandler.h"
-#include "Emu/IdManager.h"
-#include "Emu/Io/topshotelite_config.h"
-#include "Emu/Cell/lv2/sys_usbd.h"
-#include "Emu/system_config.h"
-#include "Input/pad_thread.h"
-
-LOG_CHANNEL(topshotelite_log);
-
-#define TSE_CALIB_LOG false
-// 0 < Calib_Top < Calib_Bottom < 0x2ff
-// 0 < Calib_Right < Calib_Left < 0x3ff
-constexpr u16 TSE_CALIB_TOP    = 20;
-constexpr u16 TSE_CALIB_BOTTOM = 840;
-constexpr u16 TSE_CALIB_LEFT   = 930;
-constexpr u16 TSE_CALIB_RIGHT  = 95;
-constexpr u16 TSE_CALIB_DIST   = 95;
-
-template <>
-void fmt_class_string<topshotelite_btn>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](topshotelite_btn value)
-	{
-		switch (value)
-		{
-		case topshotelite_btn::trigger: return "Trigger";
-		case topshotelite_btn::reload: return "Reload";
-		case topshotelite_btn::square: return "Square";
-		case topshotelite_btn::cross: return "Cross";
-		case topshotelite_btn::circle: return "Circle";
-		case topshotelite_btn::triangle: return "Triangle";
-		case topshotelite_btn::select: return "Select";
-		case topshotelite_btn::start: return "Start";
-		case topshotelite_btn::l3: return "L3";
-		case topshotelite_btn::r3: return "R3";
-		case topshotelite_btn::ps: return "PS";
-		case topshotelite_btn::dpad_up: return "D-Pad Up";
-		case topshotelite_btn::dpad_down: return "D-Pad Down";
-		case topshotelite_btn::dpad_left: return "D-Pad Left";
-		case topshotelite_btn::dpad_right: return "D-Pad Right";
-		case topshotelite_btn::ls_x: return "Left Stick X-Axis";
-		case topshotelite_btn::ls_y: return "Left Stick Y-Axis";
-		case topshotelite_btn::rs_x: return "Right Stick X-Axis";
-		case topshotelite_btn::rs_y: return "Right Stick Y-Axis";
-		case topshotelite_btn::count: return "Count";
-		}
-
-		return unknown;
-	});
-}
-
-#pragma pack(push, 1)
-struct TopShotElite_data
-{
-	uint8_t btn_square : 1;
-	uint8_t btn_cross : 1;
-	uint8_t btn_circle : 1;
-	uint8_t btn_triangle : 1;
-	uint8_t btn_reload: 1;
-	uint8_t btn_trigger: 1;
-	uint8_t : 2;
-
-	uint8_t btn_select : 1;
-	uint8_t btn_start : 1;
-	uint8_t btn_l3 : 1;
-	uint8_t btn_r3 : 1;
-	uint8_t btn_ps: 1;
-	uint8_t : 3;
-
-	uint8_t dpad;
-	uint8_t stick_lx;
-	uint8_t stick_ly;
-	uint8_t stick_rx;
-	uint8_t stick_ry;
-
-	uint8_t led_lx_hi : 8;
-	uint8_t led_ly_hi : 6;
-	uint8_t led_lx_lo : 2;
-	uint8_t detect_l : 4;
-	uint8_t led_ly_lo : 4;
-
-	uint8_t led_rx_hi : 8;
-	uint8_t led_ry_hi : 6;
-	uint8_t led_rx_lo : 2;
-	uint8_t detect_r : 4;
-	uint8_t led_ry_lo : 4;
-
-	uint8_t : 8;
-	uint8_t : 8;
-	uint8_t : 8;
-
-	uint8_t trigger;
-	uint8_t : 8;
-	uint8_t : 8;
-	uint16_t unk[4];
-};
-#pragma pack(pop)
-
-enum
-{
-	Dpad_North,
-	Dpad_NE,
-	Dpad_East,
-	Dpad_SE,
-	Dpad_South,
-	Dpad_SW,
-	Dpad_West,
-	Dpad_NW,
-	Dpad_None = 0x0f
-};
-
-usb_device_topshotelite::usb_device_topshotelite(u32 controller_index, const std::array<u8, 7>& location)
-	: usb_device_emulated(location)
-	, m_controller_index(controller_index)
-	, m_mode(0)
-{
-	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE,
-		UsbDeviceDescriptor {
-			.bcdUSB             = 0x0100,
-			.bDeviceClass       = 0x00,
-			.bDeviceSubClass    = 0x00,
-			.bDeviceProtocol    = 0x00,
-			.bMaxPacketSize0    = 0x20,
-			.idVendor           = 0x12ba,
-			.idProduct          = 0x04a0,
-			.bcdDevice          = 0x0108,
-			.iManufacturer      = 0x01,
-			.iProduct           = 0x02,
-			.iSerialNumber      = 0x03,
-			.bNumConfigurations = 0x01});
-	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG,
-		UsbDeviceConfiguration {
-			.wTotalLength        = 0x0029,
-			.bNumInterfaces      = 0x01,
-			.bConfigurationValue = 0x01,
-			.iConfiguration      = 0x00,
-			.bmAttributes        = 0x80,
-			.bMaxPower           = 0x32}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE,
-		UsbDeviceInterface {
-			.bInterfaceNumber   = 0x00,
-			.bAlternateSetting  = 0x00,
-			.bNumEndpoints      = 0x02,
-			.bInterfaceClass    = 0x03,
-			.bInterfaceSubClass = 0x00,
-			.bInterfaceProtocol = 0x00,
-			.iInterface         = 0x00}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_HID,
-		UsbDeviceHID {
-			.bcdHID            = 0x0110,
-			.bCountryCode      = 0x00,
-			.bNumDescriptors   = 0x01,
-			.bDescriptorType   = 0x22,
-			.wDescriptorLength = 0x0089}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint {
-			.bEndpointAddress = 0x81,
-			.bmAttributes     = 0x03,
-			.wMaxPacketSize   = 0x0040,
-			.bInterval        = 0x0a}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint {
-			.bEndpointAddress = 0x02,
-			.bmAttributes     = 0x03,
-			.wMaxPacketSize   = 0x0040,
-			.bInterval        = 0x0a}));
-
-	add_string("GuitarHero for Playstation (R) 3");
-	add_string("GuitarHero for Playstation (R) 3");
-}
-
-usb_device_topshotelite::~usb_device_topshotelite()
-{
-}
-
-void usb_device_topshotelite::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
-{
-	transfer->fake            = true;
-	transfer->expected_count  = buf_size;
-	transfer->expected_result = HC_CC_NOERR;
-	transfer->expected_time   = get_timestamp() + 100;
-
-	switch (bmRequestType)
-	{
-	case 0U /*silences warning*/ | LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE: // 0x21
-		switch (bRequest)
-		{
-		case 0x09: // SET_REPORT
-			ensure(buf_size >= 8);
-			switch (buf[0])
-			{
-			case 0x01:
-				topshotelite_log.trace("Leds: %s/%s/%s/%s",
-					buf[2] & 1 ? "ON" : "OFF",
-					buf[2] & 2 ? "ON" : "OFF",
-					buf[2] & 4 ? "ON" : "OFF",
-					buf[2] & 8 ? "ON" : "OFF");
-				break;
-			case 0x82:
-				m_mode = buf[2];
-				break;
-			default:
-				topshotelite_log.error("Unhandled SET_REPORT packet : %x", buf[0]);
-				break;
-			}
-			break;
-		default:
-			topshotelite_log.error("Unhandled Request: 0x%02X/0x%02X", bmRequestType, bRequest);
-			break;
-		}
-		break;
-	default:
-		usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
-		break;
-	}
-}
-
-extern bool is_input_allowed();
-
-static void set_sensor_pos(struct TopShotElite_data* ts, s32 led_lx, s32 led_ly, s32 led_rx, s32 led_ry, s32 detect_l, s32 detect_r)
-{
-	ts->led_lx_hi = led_lx >> 2;
-	ts->led_lx_lo = led_lx & 0x3;
-	ts->led_ly_hi = led_ly >> 4;
-	ts->led_ly_lo = led_ly & 0xf;
-
-	ts->led_rx_hi = led_rx >> 2;
-	ts->led_rx_lo = led_rx & 0x3;
-	ts->led_ry_hi = led_ry >> 4;
-	ts->led_ry_lo = led_ry & 0xf;
-
-	ts->detect_l = detect_l;
-	ts->detect_r = detect_r;
-}
-
-static void prepare_data(const TopShotElite_data* ts, u8* data)
-{
-	std::memcpy(data, ts, sizeof(TopShotElite_data));
-	topshotelite_log.trace("interrupt_transfer: %s", fmt::buf_to_hexstring(data, sizeof(TopShotElite_data)));
-}
-
-void usb_device_topshotelite::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/, UsbTransfer* transfer)
-{
-	ensure(buf_size >= sizeof(TopShotElite_data));
-
-	transfer->fake = true;
-	transfer->expected_count = sizeof(TopShotElite_data);
-	transfer->expected_result = HC_CC_NOERR;
-	transfer->expected_time = get_timestamp() + 4000;
-
-	struct TopShotElite_data ts{};
-	ts.dpad = Dpad_None;
-	ts.stick_lx = ts.stick_ly = ts.stick_rx = ts.stick_ry = 0x7f;
-	if (m_mode)
-	{
-		set_sensor_pos(&ts, 0x3ff, 0x3ff, 0x3ff, 0x3ff, 0xf, 0xf);
-	}
-	ts.unk[0] = ts.unk[1] = ts.unk[2] = ts.unk[3] = 0x0200;
-
-	if (!is_input_allowed())
-	{
-		prepare_data(&ts, buf);
-		return;
-	}
-
-	if (g_cfg.io.mouse == mouse_handler::null)
-	{
-		topshotelite_log.warning("Top Shot Elite requires a Mouse Handler enabled");
-		prepare_data(&ts, buf);
-		return;
-	}
-
-	if (m_controller_index >= g_cfg_topshotelite.players.size())
-	{
-		topshotelite_log.warning("Top Shot Fearmaster controllers are only supported for Player1 to Player%d", g_cfg_topshotelite.players.size());
-		prepare_data(&ts, buf);
-		return;
-	}
-
-	bool up = false, right = false, down = false, left = false;
-	const auto input_callback = [&ts, &up, &down, &left, &right](topshotelite_btn btn, pad_button /*pad_button*/, u16 value, bool pressed, bool& /*abort*/)
-	{
-		if (!pressed)
-			return;
-
-		switch (btn)
-		{
-		case topshotelite_btn::trigger: ts.btn_trigger |= 1; break;
-		case topshotelite_btn::reload: ts.btn_reload |= 1; break;
-		case topshotelite_btn::square: ts.btn_square |= 1; break;
-		case topshotelite_btn::cross: ts.btn_cross |= 1; break;
-		case topshotelite_btn::circle: ts.btn_circle |= 1; break;
-		case topshotelite_btn::triangle: ts.btn_triangle |= 1; break;
-		case topshotelite_btn::select: ts.btn_select |= 1; break;
-		case topshotelite_btn::start: ts.btn_start |= 1; break;
-		case topshotelite_btn::l3: ts.btn_l3 |= 1; break;
-		case topshotelite_btn::r3: ts.btn_r3 |= 1; break;
-		case topshotelite_btn::ps: ts.btn_ps |= 1; break;
-		case topshotelite_btn::dpad_up: up = true; break;
-		case topshotelite_btn::dpad_down: down = true; break;
-		case topshotelite_btn::dpad_left: left = true; break;
-		case topshotelite_btn::dpad_right: right = true; break;
-		case topshotelite_btn::ls_x: ts.stick_lx = static_cast<uint8_t>(value); break;
-		// you know you have a «Top» controller when the games are programmed to ignore a perfect controller, so we have to simulate a drift
-		case topshotelite_btn::ls_y: ts.stick_ly = std::min(0xff, 1 + static_cast<uint8_t>(value)); break;
-		case topshotelite_btn::rs_x: ts.stick_rx = static_cast<uint8_t>(value); break;
-		case topshotelite_btn::rs_y: ts.stick_ry = static_cast<uint8_t>(value); break;
-		case topshotelite_btn::count: break;
-		}
-	};
-
-	const auto& cfg = ::at32(g_cfg_topshotelite.players, m_controller_index);
-
-	{
-		std::lock_guard lock(pad::g_pad_mutex);
-		const auto gamepad_handler = pad::get_pad_thread();
-		const auto& pads = gamepad_handler->GetPads();
-		const auto& pad = ::at32(pads, m_controller_index);
-		if (pad->is_connected() && !pad->is_copilot())
-		{
-			cfg->handle_input(pad, true, input_callback);
-		}
-	}
-
-	if (!up && !right && !down && !left)
-		ts.dpad = Dpad_None;
-	else if (up && !left && !right)
-		ts.dpad = Dpad_North;
-	else if (up && right)
-		ts.dpad = Dpad_NE;
-	else if (right && !up && !down)
-		ts.dpad = Dpad_East;
-	else if (down && right)
-		ts.dpad = Dpad_SE;
-	else if (down && !left && !right)
-		ts.dpad = Dpad_South;
-	else if (down && left)
-		ts.dpad = Dpad_SW;
-	else if (left && !up && !down)
-		ts.dpad = Dpad_West;
-	else if (up && left)
-		ts.dpad = Dpad_NW;
-
-	if (m_mode)
-	{
-		auto& mouse_handler = g_fxo->get<MouseHandlerBase>();
-		std::lock_guard mouse_lock(mouse_handler.mutex);
-
-		mouse_handler.Init(4);
-
-		const u32 mouse_index = g_cfg.io.mouse == mouse_handler::basic ? 0 : m_controller_index;
-		if (mouse_index >= mouse_handler.GetMice().size())
-		{
-			prepare_data(&ts, buf);
-			return;
-		}
-
-		const Mouse& mouse_data = ::at32(mouse_handler.GetMice(), mouse_index);
-		cfg->handle_input(mouse_data, input_callback);
-		ts.trigger = ts.btn_trigger ? 0xff : 0x00;
-
-		if (mouse_data.x_max <= 0 || mouse_data.y_max <= 0)
-		{
-			prepare_data(&ts, buf);
-			return;
-		}
-
-		s32 led_lx = 0x3ff - (TSE_CALIB_RIGHT + (mouse_data.x_pos * (TSE_CALIB_LEFT - TSE_CALIB_RIGHT) / mouse_data.x_max) + TSE_CALIB_DIST);
-		s32 led_rx = 0x3ff - (TSE_CALIB_RIGHT + (mouse_data.x_pos * (TSE_CALIB_LEFT - TSE_CALIB_RIGHT) / mouse_data.x_max) - TSE_CALIB_DIST);
-
-		s32 led_ly = TSE_CALIB_TOP + (mouse_data.y_pos * (TSE_CALIB_BOTTOM - TSE_CALIB_TOP) / mouse_data.y_max);
-		s32 led_ry = TSE_CALIB_TOP + (mouse_data.y_pos * (TSE_CALIB_BOTTOM - TSE_CALIB_TOP) / mouse_data.y_max);
-
-		u8 detect_l = 0x2, detect_r = 0x2; // 0x2 = led detected / 0xf = undetected
-
-		if (led_lx < 0 || led_lx > 0x3ff || led_ly < 0 || led_ly > 0x3ff)
-		{
-			led_lx = 0x3ff;
-			led_ly = 0x3ff;
-			detect_l = 0xf;
-		}
-
-		if (led_rx < 0 || led_rx > 0x3ff || led_ry < 0 || led_ry > 0x3ff)
-		{
-			led_rx = 0x3ff;
-			led_ry = 0x3ff;
-			detect_r = 0xf;
-		}
-
-		set_sensor_pos(&ts, led_lx, led_ly, led_rx, led_ry, detect_l, detect_r);
-
-		#if TSE_CALIB_LOG
-			topshotelite_log.error("L: %d x %d, R: %d x %d", led_lx + TSE_CALIB_DIST, led_ly, led_rx - TSE_CALIB_DIST, led_ry);
-		#endif
-	}
-
-	prepare_data(&ts, buf);
-}
diff --git a/rpcs3/Emu/Io/TopShotElite.h b/rpcs3/Emu/Io/TopShotElite.h
deleted file mode 100644
index 00e2752714..0000000000
--- a/rpcs3/Emu/Io/TopShotElite.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "Emu/Io/usb_device.h"
-
-class usb_device_topshotelite : public usb_device_emulated
-{
-public:
-	usb_device_topshotelite(u32 controller_index, const std::array<u8, 7>& location);
-	~usb_device_topshotelite();
-
-	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
-	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-
-private:
-	u32 m_controller_index;
-	u8 m_mode;
-};
diff --git a/rpcs3/Emu/Io/TopShotFearmaster.cpp b/rpcs3/Emu/Io/TopShotFearmaster.cpp
deleted file mode 100644
index eed7ade977..0000000000
--- a/rpcs3/Emu/Io/TopShotFearmaster.cpp
+++ /dev/null
@@ -1,425 +0,0 @@
-#include "stdafx.h"
-#include "TopShotFearmaster.h"
-#include "MouseHandler.h"
-#include "Emu/IdManager.h"
-#include "Emu/Io/topshotfearmaster_config.h"
-#include "Emu/Cell/lv2/sys_usbd.h"
-#include "Emu/system_config.h"
-#include "Input/pad_thread.h"
-
-LOG_CHANNEL(topshotfearmaster_log);
-
-#define TSF_CALIB_LOG false
-// 0 < Calib_Top < Calib_Bottom < 0x2ff
-// 0 < Calib_Right < Calib_Left < 0x3ff
-constexpr u16 TSF_CALIB_TOP    = 20;
-constexpr u16 TSF_CALIB_BOTTOM = 840;
-constexpr u16 TSF_CALIB_LEFT   = 900;
-constexpr u16 TSF_CALIB_RIGHT  = 120;
-constexpr u16 TSF_CALIB_DIST   = 95;
-
-template <>
-void fmt_class_string<topshotfearmaster_btn>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](topshotfearmaster_btn value)
-	{
-		switch (value)
-		{
-		case topshotfearmaster_btn::trigger: return "Trigger";
-		case topshotfearmaster_btn::heartrate: return "Heartrate";
-		case topshotfearmaster_btn::square: return "Square";
-		case topshotfearmaster_btn::cross: return "Cross";
-		case topshotfearmaster_btn::circle: return "Circle";
-		case topshotfearmaster_btn::triangle: return "Triangle";
-		case topshotfearmaster_btn::select: return "Select";
-		case topshotfearmaster_btn::start: return "Start";
-		case topshotfearmaster_btn::l3: return "L3";
-		case topshotfearmaster_btn::ps: return "PS";
-		case topshotfearmaster_btn::dpad_up: return "D-Pad Up";
-		case topshotfearmaster_btn::dpad_down: return "D-Pad Down";
-		case topshotfearmaster_btn::dpad_left: return "D-Pad Left";
-		case topshotfearmaster_btn::dpad_right: return "D-Pad Right";
-		case topshotfearmaster_btn::ls_x: return "Left Stick X-Axis";
-		case topshotfearmaster_btn::ls_y: return "Left Stick Y-Axis";
-		case topshotfearmaster_btn::count: return "Count";
-		}
-
-		return unknown;
-	});
-}
-
-#pragma pack(push, 1)
-struct TopShotFearmaster_data
-{
-	uint8_t btn_square : 1;
-	uint8_t btn_cross : 1;
-	uint8_t btn_circle : 1;
-	uint8_t btn_triangle : 1;
-	uint8_t : 1;
-	uint8_t btn_trigger: 1;
-	uint8_t : 2;
-
-	uint8_t btn_select : 1;
-	uint8_t btn_start : 1;
-	uint8_t btn_l3 : 1;
-	uint8_t btn_heartrate : 1;
-	uint8_t btn_ps: 1;
-	uint8_t : 3;
-
-	uint8_t dpad;
-	uint8_t stick_lx;
-	uint8_t stick_ly;
-	union
-	{
-		struct
-		{
-			uint8_t stick_rx;
-			uint8_t stick_ry;
-		};
-		uint16_t heartrate;
-	};
-
-	uint8_t led_lx_hi : 8;
-	uint8_t led_ly_hi : 6;
-	uint8_t led_lx_lo : 2;
-	uint8_t detect_l : 4;
-	uint8_t led_ly_lo : 4;
-
-	uint8_t led_rx_hi : 8;
-	uint8_t led_ry_hi : 6;
-	uint8_t led_rx_lo : 2;
-	uint8_t detect_r : 4;
-	uint8_t led_ry_lo : 4;
-
-	uint8_t : 8;
-	uint8_t : 8;
-	uint8_t : 8;
-
-	uint8_t trigger;
-	uint8_t : 8;
-	uint8_t : 8;
-	uint16_t unk[4];
-};
-#pragma pack(pop)
-
-enum
-{
-	Dpad_North,
-	Dpad_NE,
-	Dpad_East,
-	Dpad_SE,
-	Dpad_South,
-	Dpad_SW,
-	Dpad_West,
-	Dpad_NW,
-	Dpad_None = 0x0f
-};
-
-usb_device_topshotfearmaster::usb_device_topshotfearmaster(u32 controller_index, const std::array<u8, 7>& location)
-	: usb_device_emulated(location)
-	, m_controller_index(controller_index)
-	, m_mode(0)
-{
-	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE,
-		UsbDeviceDescriptor {
-			.bcdUSB             = 0x0100,
-			.bDeviceClass       = 0x00,
-			.bDeviceSubClass    = 0x00,
-			.bDeviceProtocol    = 0x00,
-			.bMaxPacketSize0    = 0x20,
-			.idVendor           = 0x12ba,
-			.idProduct          = 0x04a1,
-			.bcdDevice          = 0x0108,
-			.iManufacturer      = 0x01,
-			.iProduct           = 0x02,
-			.iSerialNumber      = 0x03,
-			.bNumConfigurations = 0x01});
-	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG,
-		UsbDeviceConfiguration {
-			.wTotalLength        = 0x0029,
-			.bNumInterfaces      = 0x01,
-			.bConfigurationValue = 0x01,
-			.iConfiguration      = 0x00,
-			.bmAttributes        = 0x80,
-			.bMaxPower           = 0x32}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE,
-		UsbDeviceInterface {
-			.bInterfaceNumber   = 0x00,
-			.bAlternateSetting  = 0x00,
-			.bNumEndpoints      = 0x02,
-			.bInterfaceClass    = 0x03,
-			.bInterfaceSubClass = 0x00,
-			.bInterfaceProtocol = 0x00,
-			.iInterface         = 0x00}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_HID,
-		UsbDeviceHID {
-			.bcdHID            = 0x0110,
-			.bCountryCode      = 0x00,
-			.bNumDescriptors   = 0x01,
-			.bDescriptorType   = 0x22,
-			.wDescriptorLength = 0x0089}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint {
-			.bEndpointAddress = 0x81,
-			.bmAttributes     = 0x03,
-			.wMaxPacketSize   = 0x0040,
-			.bInterval        = 0x0a}));
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint {
-			.bEndpointAddress = 0x02,
-			.bmAttributes     = 0x03,
-			.wMaxPacketSize   = 0x0040,
-			.bInterval        = 0x0a}));
-
-	add_string("Dangerous Hunts for Playstation (R) 3");
-	add_string("Dangerous Hunts for Playstation (R) 3");
-}
-
-usb_device_topshotfearmaster::~usb_device_topshotfearmaster()
-{
-}
-
-void usb_device_topshotfearmaster::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
-{
-	transfer->fake            = true;
-	transfer->expected_count  = buf_size;
-	transfer->expected_result = HC_CC_NOERR;
-	transfer->expected_time   = get_timestamp() + 100;
-
-	switch (bmRequestType)
-	{
-	case 0U /*silences warning*/ | LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE: // 0x21
-		switch (bRequest)
-		{
-		case 0x09: // SET_REPORT
-			ensure(buf_size >= 8);
-			switch (buf[0])
-			{
-			case 0x01:
-				topshotfearmaster_log.trace("Leds: %s/%s/%s/%s",
-					buf[2] & 1 ? "ON" : "OFF",
-					buf[2] & 2 ? "ON" : "OFF",
-					buf[2] & 4 ? "ON" : "OFF",
-					buf[2] & 8 ? "ON" : "OFF");
-				break;
-			case 0x82:
-				m_mode = buf[2];
-				break;
-			default:
-				topshotfearmaster_log.error("Unhandled SET_REPORT packet : %x", buf[0]);
-				break;
-			}
-			break;
-		default:
-			topshotfearmaster_log.error("Unhandled Request: 0x%02X/0x%02X", bmRequestType, bRequest);
-			break;
-		}
-		break;
-	default:
-		usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
-		break;
-	}
-}
-
-extern bool is_input_allowed();
-
-static int get_heartrate_sensor_value(u8 heartrate)
-{
-	static const uint16_t sensor_data[] = {
-		0x7af, 0x771, 0x737, 0x6ff, 0x6cb, 0x69a, 0x66c, 0x640, 0x616, 0x5ef, // 30-39
-		0x5ca, 0x5a6, 0x584, 0x563, 0x544, 0x527, 0x50a, 0x4ef, 0x4d5, 0x4bc, // 40-49
-		0x4a4, 0x48d, 0x477, 0x462, 0x44d, 0x439, 0x426, 0x413, 0x401, 0x3f0, // 50-59
-		0x3e0, 0x3cf, 0x3c0, 0x3b1, 0x3a2, 0x394, 0x386, 0x379, 0x36c, 0x35f, // 60-69
-		0x353, 0x347, 0x33b, 0x330, 0x325, 0x31b, 0x310, 0x306, 0x2fc, 0x2f3, // 70-79
-		0x2e9, 0x2e0, 0x2d7, 0x2ce, 0x2c6, 0x2bd, 0x2b5, 0x2ad, 0x2a6, 0x29e, // 80-89
-		0x297, 0x290, 0x289, 0x282, 0x27b, 0x274, 0x26e, 0x267, 0x261, 0x25b, // 90-99
-		0x255, 0x24f, 0x249, 0x243, 0x23e, 0x239, 0x233, 0x22e, 0x229, 0x224, // 100-109
-		0x21f, 0x21a, 0x215, 0x210, 0x20c, 0x207, 0x203, 0x1fe, 0x1fa, 0x1f6, // 110-119
-		0x1f2, 0x1ed, 0x1e9, 0x1e5, 0x1e2, 0x1de, 0x1da, 0x1d6, 0x1d3, 0x1cf, // 120-129
-		0x1cc, 0x1c8, 0x1c5, 0x1c1, 0x1be, 0x1bb, 0x1b7, 0x1b4, 0x1b1, 0x1ae  // 130-139
-	};
-
-	if (heartrate < 30 || heartrate > 139)
-	{
-		return 0;
-	}
-
-	return sensor_data[heartrate - 30];
-}
-
-static void set_sensor_pos(struct TopShotFearmaster_data* ts, s32 led_lx, s32 led_ly, s32 led_rx, s32 led_ry, s32 detect_l, s32 detect_r)
-{
-	ts->led_lx_hi = led_lx >> 2;
-	ts->led_lx_lo = led_lx & 0x3;
-	ts->led_ly_hi = led_ly >> 4;
-	ts->led_ly_lo = led_ly & 0xf;
-
-	ts->led_rx_hi = led_rx >> 2;
-	ts->led_rx_lo = led_rx & 0x3;
-	ts->led_ry_hi = led_ry >> 4;
-	ts->led_ry_lo = led_ry & 0xf;
-
-	ts->detect_l = detect_l;
-	ts->detect_r = detect_r;
-}
-
-static void prepare_data(const TopShotFearmaster_data* ts, u8* data)
-{
-	std::memcpy(data, ts, sizeof(TopShotFearmaster_data));
-	topshotfearmaster_log.trace("interrupt_transfer: %s", fmt::buf_to_hexstring(data, sizeof(TopShotFearmaster_data)));
-}
-
-void usb_device_topshotfearmaster::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/, UsbTransfer* transfer)
-{
-	ensure(buf_size >= sizeof(TopShotFearmaster_data));
-
-	transfer->fake = true;
-	transfer->expected_count = sizeof(TopShotFearmaster_data);
-	transfer->expected_result = HC_CC_NOERR;
-	transfer->expected_time = get_timestamp() + 4000;
-
-	struct TopShotFearmaster_data ts{};
-	ts.dpad = Dpad_None;
-	ts.stick_lx = ts.stick_ly = ts.stick_rx = ts.stick_ry = 0x7f;
-	if (m_mode)
-	{
-		set_sensor_pos(&ts, 0x3ff, 0x3ff, 0x3ff, 0x3ff, 0xf, 0xf);
-	}
-	ts.unk[0] = ts.unk[1] = ts.unk[2] = ts.unk[3] = 0x0200;
-
-	if (!is_input_allowed())
-	{
-		prepare_data(&ts, buf);
-		return;
-	}
-
-	if (g_cfg.io.mouse == mouse_handler::null)
-	{
-		topshotfearmaster_log.warning("Top Shot Fearmaster requires a Mouse Handler enabled");
-		prepare_data(&ts, buf);
-		return;
-	}
-
-	if (m_controller_index >= g_cfg_topshotfearmaster.players.size())
-	{
-		topshotfearmaster_log.warning("Top Shot Fearmaster controllers are only supported for Player1 to Player%d", g_cfg_topshotfearmaster.players.size());
-		prepare_data(&ts, buf);
-		return;
-	}
-
-	bool up = false, right = false, down = false, left = false;
-	const auto input_callback = [&ts, &up, &down, &left, &right](topshotfearmaster_btn btn, pad_button /*pad_button*/, u16 value, bool pressed, bool& /*abort*/)
-	{
-		if (!pressed)
-			return;
-
-		switch (btn)
-		{
-		case topshotfearmaster_btn::trigger: ts.btn_trigger |= 1; break;
-		case topshotfearmaster_btn::heartrate: ts.btn_heartrate |= 1; break;
-		case topshotfearmaster_btn::square: ts.btn_square |= 1; break;
-		case topshotfearmaster_btn::cross: ts.btn_cross |= 1; break;
-		case topshotfearmaster_btn::circle: ts.btn_circle |= 1; break;
-		case topshotfearmaster_btn::triangle: ts.btn_triangle |= 1; break;
-		case topshotfearmaster_btn::select: ts.btn_select |= 1; break;
-		case topshotfearmaster_btn::start: ts.btn_start |= 1; break;
-		case topshotfearmaster_btn::l3: ts.btn_l3 |= 1; break;
-		case topshotfearmaster_btn::ps: ts.btn_ps |= 1; break;
-		case topshotfearmaster_btn::dpad_up: up = true; break;
-		case topshotfearmaster_btn::dpad_down: down = true; break;
-		case topshotfearmaster_btn::dpad_left: left = true; break;
-		case topshotfearmaster_btn::dpad_right: right = true; break;
-		case topshotfearmaster_btn::ls_x: ts.stick_lx = static_cast<uint8_t>(value); break;
-		case topshotfearmaster_btn::ls_y: ts.stick_ly = static_cast<uint8_t>(value); break;
-		case topshotfearmaster_btn::count: break;
-		}
-	};
-
-	const auto& cfg = ::at32(g_cfg_topshotfearmaster.players, m_controller_index);
-
-	{
-		std::lock_guard lock(pad::g_pad_mutex);
-		const auto gamepad_handler = pad::get_pad_thread();
-		const auto& pads = gamepad_handler->GetPads();
-		const auto& pad = ::at32(pads, m_controller_index);
-		if (pad->is_connected() && !pad->is_copilot())
-		{
-			cfg->handle_input(pad, true, input_callback);
-		}
-	}
-
-	if (!up && !right && !down && !left)
-		ts.dpad = Dpad_None;
-	else if (up && !left && !right)
-		ts.dpad = Dpad_North;
-	else if (up && right)
-		ts.dpad = Dpad_NE;
-	else if (right && !up && !down)
-		ts.dpad = Dpad_East;
-	else if (down && right)
-		ts.dpad = Dpad_SE;
-	else if (down && !left && !right)
-		ts.dpad = Dpad_South;
-	else if (down && left)
-		ts.dpad = Dpad_SW;
-	else if (left && !up && !down)
-		ts.dpad = Dpad_West;
-	else if (up && left)
-		ts.dpad = Dpad_NW;
-
-	if (m_mode)
-	{
-		auto& mouse_handler = g_fxo->get<MouseHandlerBase>();
-		std::lock_guard mouse_lock(mouse_handler.mutex);
-
-		mouse_handler.Init(4);
-
-		const u32 mouse_index = g_cfg.io.mouse == mouse_handler::basic ? 0 : m_controller_index;
-		if (mouse_index >= mouse_handler.GetMice().size())
-		{
-			prepare_data(&ts, buf);
-			return;
-		}
-
-		const Mouse& mouse_data = ::at32(mouse_handler.GetMice(), mouse_index);
-		cfg->handle_input(mouse_data, input_callback);
-		ts.trigger = ts.btn_trigger ? 0xff : 0x00;
-		ts.heartrate = ts.btn_heartrate ? get_heartrate_sensor_value(60) : 0;
-
-		if (mouse_data.x_max <= 0 || mouse_data.y_max <= 0)
-		{
-			prepare_data(&ts, buf);
-			return;
-		}
-
-		s32 led_lx = 0x3ff - (TSF_CALIB_RIGHT + (mouse_data.x_pos * (TSF_CALIB_LEFT - TSF_CALIB_RIGHT) / mouse_data.x_max) + TSF_CALIB_DIST);
-		s32 led_rx = 0x3ff - (TSF_CALIB_RIGHT + (mouse_data.x_pos * (TSF_CALIB_LEFT - TSF_CALIB_RIGHT) / mouse_data.x_max) - TSF_CALIB_DIST);
-
-		s32 led_ly = TSF_CALIB_TOP + (mouse_data.y_pos * (TSF_CALIB_BOTTOM - TSF_CALIB_TOP) / mouse_data.y_max);
-		s32 led_ry = TSF_CALIB_TOP + (mouse_data.y_pos * (TSF_CALIB_BOTTOM - TSF_CALIB_TOP) / mouse_data.y_max);
-
-		u8 detect_l = 0x2, detect_r = 0x2; // 0x2 = led detected / 0xf = undetected
-
-		if (led_lx < 0 || led_lx > 0x3ff || led_ly < 0 || led_ly > 0x3ff)
-		{
-			led_lx = 0x3ff;
-			led_ly = 0x3ff;
-			detect_l = 0xf;
-		}
-
-		if (led_rx < 0 || led_rx > 0x3ff || led_ry < 0 || led_ry > 0x3ff)
-		{
-			led_rx = 0x3ff;
-			led_ry = 0x3ff;
-			detect_r = 0xf;
-		}
-
-		set_sensor_pos(&ts, led_lx, led_ly, led_rx, led_ry, detect_l, detect_r);
-
-		#if TSF_CALIB_LOG
-			topshotfearmaster_log.error("L: %d x %d, R: %d x %d", led_lx + TSF_CALIB_DIST, led_ly, led_rx - TSF_CALIB_DIST, led_ry);
-		#endif
-	}
-
-	prepare_data(&ts, buf);
-}
diff --git a/rpcs3/Emu/Io/TopShotFearmaster.h b/rpcs3/Emu/Io/TopShotFearmaster.h
deleted file mode 100644
index 7243fb5ef0..0000000000
--- a/rpcs3/Emu/Io/TopShotFearmaster.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "Emu/Io/usb_device.h"
-
-class usb_device_topshotfearmaster: public usb_device_emulated
-{
-public:
-	usb_device_topshotfearmaster(u32 controller_index, const std::array<u8, 7>& location);
-	~usb_device_topshotfearmaster();
-
-	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
-	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-
-private:
-	u32 m_controller_index;
-	u8 m_mode;
-};
diff --git a/rpcs3/Emu/Io/Turntable.cpp b/rpcs3/Emu/Io/Turntable.cpp
index 261af88d16..e5fe6b7b22 100644
--- a/rpcs3/Emu/Io/Turntable.cpp
+++ b/rpcs3/Emu/Io/Turntable.cpp
@@ -3,44 +3,11 @@
 #include "stdafx.h"
 #include "Turntable.h"
 #include "Emu/Cell/lv2/sys_usbd.h"
-#include "Emu/Io/turntable_config.h"
 #include "Input/pad_thread.h"
-#include "Emu/system_config.h"
 
-LOG_CHANNEL(turntable_log, "TURN");
+LOG_CHANNEL(turntable_log);
 
-template <>
-void fmt_class_string<turntable_btn>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](turntable_btn value)
-	{
-		switch (value)
-		{
-		case turntable_btn::blue: return "Blue";
-		case turntable_btn::green: return "Green";
-		case turntable_btn::red: return "Red";
-		case turntable_btn::dpad_up: return "D-Pad Up";
-		case turntable_btn::dpad_down: return "D-Pad Down";
-		case turntable_btn::dpad_left: return "D-Pad Left";
-		case turntable_btn::dpad_right: return "D-Pad Right";
-		case turntable_btn::start: return "Start";
-		case turntable_btn::select: return "Select";
-		case turntable_btn::square: return "Square";
-		case turntable_btn::circle: return "Circle";
-		case turntable_btn::cross: return "Cross";
-		case turntable_btn::triangle: return "Triangle";
-		case turntable_btn::right_turntable: return "Right Turntable";
-		case turntable_btn::crossfader: return "Crossfader";
-		case turntable_btn::effects_dial: return "Effects Dial";
-		case turntable_btn::count: return "Count";
-		}
-
-		return unknown;
-	});
-}
-
-usb_device_turntable::usb_device_turntable(u32 controller_index, const std::array<u8, 7>& location)
-	: usb_device_emulated(location), m_controller_index(controller_index)
+usb_device_turntable::usb_device_turntable()
 {
 	device        = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x0100, 0x00, 0x00, 0x00, 0x40, 0x12BA, 0x0140, 0x0005, 0x01, 0x02, 0x00, 0x01});
 	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG, UsbDeviceConfiguration{0x0029, 0x01, 0x01, 0x00, 0x80, 0x19}));
@@ -54,16 +21,6 @@ usb_device_turntable::~usb_device_turntable()
 {
 }
 
-std::shared_ptr<usb_device> usb_device_turntable::make_instance(u32 controller_index, const std::array<u8, 7>& location)
-{
-	return std::make_shared<usb_device_turntable>(controller_index, location);
-}
-
-u16 usb_device_turntable::get_num_emu_devices()
-{
-	return static_cast<u16>(g_cfg.io.turntable.get());
-}
-
 void usb_device_turntable::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
 {
 	transfer->fake = true;
@@ -74,12 +31,12 @@ void usb_device_turntable::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
 		case 0x21:
 			switch (bRequest)
 			{
-			case 0x09:
-				// Do nothing here - not sure what it should do.
-				break;
-			default:
-				turntable_log.error("Unhandled Query: buf_size=0x%02X, Type=0x%02X, bRequest=0x%02X, bmRequestType=0x%02X", buf_size, (buf_size > 0) ? buf[0] : -1, bRequest, bmRequestType);
-				break;
+				case 0x09:
+					// Do nothing here - not sure what it should do.
+					break;
+				default:
+					turntable_log.error("Unhandled Query Type: 0x%02X", buf[0]);
+					break;
 			}
 			break;
 		default:
@@ -90,14 +47,12 @@ void usb_device_turntable::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
 
 void usb_device_turntable::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/, UsbTransfer* transfer)
 {
-	ensure(buf_size >= 27);
-
 	transfer->fake            = true;
 	transfer->expected_count  = buf_size;
 	transfer->expected_result = HC_CC_NOERR;
+	// Interrupt transfers are slow
 	// Turntable runs at 100hz --> 10ms
-	// But make the emulated table go at 1ms for better input behavior
-	transfer->expected_time = get_timestamp() + 1'000;
+	transfer->expected_time = get_timestamp() + 10000;
 
 	memset(buf, 0, buf_size);
 
@@ -161,139 +116,153 @@ void usb_device_turntable::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpo
 
 	// All other bufs are always 0x00
 
-	std::lock_guard lock(pad::g_pad_mutex);
-	const auto handler = pad::get_pad_thread();
-	const auto& pads   = handler->GetPads();
-	const auto& pad    = ::at32(pads, m_controller_index);
+	const auto handler = pad::get_current_handler();
+	const auto& pad    = handler->GetPads()[6];
 
-	if (!pad->is_connected() || pad->is_copilot())
+	if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
 		return;
 
-	const auto& cfg = ::at32(g_cfg_turntable.players, m_controller_index);
-	cfg->handle_input(pad, true, [&buf](turntable_btn btn, pad_button /*pad_btn*/, u16 value, bool pressed, bool& /*abort*/)
+	for (const Button& button : pad->m_buttons)
+	{
+		if (button.m_pressed)
 		{
-			if (!pressed)
-				return;
-
-			switch (btn)
+			if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2)
 			{
-			case turntable_btn::blue:
-				buf[0] |= 0x01;   // Square Button
-				buf[7] = ~buf[7]; // Square Button
-				buf[23] |= 0x04;  // Right Platter Blue
-				break;
-			case turntable_btn::green:
-				buf[0] |= 0x02;   // Cross Button
-				buf[9] = ~buf[9]; // Cross Button
-				buf[23] |= 0x01;  // Right Platter Green
-				break;
-			case turntable_btn::red:
-				buf[0] |= 0x04;     // Circle Button
-				buf[12] = ~buf[12]; // Circle Button
-				buf[23] |= 0x02;    // Right Platter Red
-				break;
-			case turntable_btn::triangle:
-				buf[0] |= 0x08;     // Triangle Button / Euphoria
-				buf[11] = ~buf[11]; // Triangle Button / Euphoria
-				break;
-			case turntable_btn::cross:
-				buf[0] |= 0x02;   // Cross Button Only
-				buf[9] = ~buf[9]; // Cross Button Only
-				break;
-			case turntable_btn::circle:
-				buf[0] |= 0x04;     // Circle Button Only
-				buf[12] = ~buf[12]; // Circle Button Only
-				break;
-			case turntable_btn::square:
-				buf[0] |= 0x01;   // Square Button Only
-				buf[7] = ~buf[7]; // Square Button Only
-				break;
-			case turntable_btn::dpad_down:
-				if (buf[2] == 0x02) // Right D-Pad
+				switch (button.m_outKeyCode)
 				{
-					buf[2] = 0x03; // Right-Down D-Pad
+					case CELL_PAD_CTRL_SQUARE:
+						buf[0] |= 0x01;   // Square Button
+						buf[7] = ~buf[7]; // Square Button
+						buf[23] |= 0x04;  // Right Platter Blue
+						break;
+					case CELL_PAD_CTRL_CROSS:
+						buf[0] |= 0x02;   // Cross Button
+						buf[9] = ~buf[9]; // Cross Button
+						buf[23] |= 0x01;  // Right Platter Green
+						break;
+					case CELL_PAD_CTRL_CIRCLE:
+						buf[0] |= 0x04;     // Circle Button
+						buf[12] = ~buf[12]; // Circle Button
+						buf[23] |= 0x02;    // Right Platter Red
+						break;
+					case CELL_PAD_CTRL_TRIANGLE:
+						buf[0] |= 0x08;     // Triangle Button / Euphoria
+						buf[11] = ~buf[11]; // Triangle Button / Euphoria
+						break;
+					case CELL_PAD_CTRL_R1:
+						buf[0] |= 0x02;   // Cross Button Only
+						buf[9] = ~buf[9]; // Cross Button Only
+						break;
+					case CELL_PAD_CTRL_L1:
+						buf[0] |= 0x04;     // Circle Button Only
+						buf[12] = ~buf[12]; // Circle Button Only
+						break;
+					case CELL_PAD_CTRL_R2:
+						buf[0] |= 0x01;   // Square Button Only
+						buf[7] = ~buf[7]; // Square Button Only
+						break;
+					default:
+						break;
 				}
-				else if (buf[2] == 0x06) // Left D-Pad
-				{
-					buf[2] = 0x05; // Left-Down D-Pad
-				}
-				else
-				{
-					buf[2] = 0x04; // Down D-Pad
-				}
-				buf[10] = ~buf[10]; // Down D-Pad;
-				break;
-			case turntable_btn::dpad_up:
-				if (buf[2] == 0x02) // Right D-Pad
-				{
-					buf[2] = 0x01; // Right-Up D-Pad
-				}
-				else if (buf[2] == 0x06) // Left D-Pad
-				{
-					buf[2] = 0x07; // Left-Up D-Pad
-				}
-				else
-				{
-					buf[2] = 0x00; // Up D-Pad
-				}
-				buf[9] = ~buf[9]; // Up D-Pad;
-				break;
-			case turntable_btn::dpad_left:
-				if (buf[2] == 0x00) // Up D-Pad
-				{
-					buf[2] = 0x07; // Left-Up D-Pad
-				}
-				else if (buf[2] == 0x04) // Down D-Pad
-				{
-					buf[2] = 0x05; // Left-Down D-Pad
-				}
-				else
-				{
-					buf[2] = 0x06; // Left D-Pad
-				}
-				buf[8] = ~buf[8]; // Left D-Pad;
-				break;
-			case turntable_btn::dpad_right:
-				if (buf[2] == 0x00) // Up D-Pad
-				{
-					buf[2] = 0x01; // Right-Up D-Pad
-				}
-				else if (buf[2] == 0x04) // Down D-Pad
-				{
-					buf[2] = 0x03; // Right-Down D-Pad
-				}
-				else
-				{
-					buf[2] = 0x02; // Right D-Pad
-				}
-				buf[7] = ~buf[7]; // Right D-Pad
-				break;
-			case turntable_btn::start:
-				buf[1] |= 0x02; // Start
-				break;
-			case turntable_btn::select:
-				buf[1] |= 0x01; // Select
-				break;
-			case turntable_btn::right_turntable:
-				// DJ Hero does not register input if the turntable is 0, so force it to 1.
-				buf[6] = std::max(1, 255 - value); // Right Turntable
-				// DJ Hero requires turntables to be centered at 128.
-				// If this axis ends up centered at 127, force it to 128.
-				if (buf[6] == 127)
-				{
-					buf[6] = 128;
-				}
-				break;
-			case turntable_btn::crossfader:
-				buf[21] = ((255 - value) & 0x3F) << 2; // Crossfader, lower 6 bits
-				buf[22] = ((255 - value) & 0xC0) >> 6; // Crossfader, upper 2 bits
-				break;
-			case turntable_btn::effects_dial:
-				buf[19] = (value & 0x3F) << 2; // Effects Dial, lower 6 bits
-				buf[20] = (value & 0xC0) >> 6; // Effects Dial, upper 2 bits
-				break;
-			case turntable_btn::count:
-				break;
 			}
-		});
+			else if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
+			{
+				switch (button.m_outKeyCode)
+				{
+					case CELL_PAD_CTRL_DOWN:
+						if (buf[2] == 0x02) // Right D-Pad
+						{
+							buf[2] = 0x03; // Right-Down D-Pad
+						}
+						else if (buf[2] == 0x06) // Left D-Pad
+						{
+							buf[2] = 0x05; // Left-Down D-Pad
+						}
+						else
+						{
+							buf[2] = 0x04; // Down D-Pad
+						}
+						buf[10] = ~buf[10]; // Down D-Pad;
+						break;
+					case CELL_PAD_CTRL_UP:
+						if (buf[2] == 0x02) // Right D-Pad
+						{
+							buf[2] = 0x01; // Right-Up D-Pad
+						}
+						else if (buf[2] == 0x06) // Left D-Pad
+						{
+							buf[2] = 0x07; // Left-Up D-Pad
+						}
+						else
+						{
+							buf[2] = 0x00; // Up D-Pad
+						}
+						buf[9] = ~buf[9]; // Up D-Pad;
+						break;
+					case CELL_PAD_CTRL_LEFT:
+						if (buf[2] == 0x00) // Up D-Pad
+						{
+							buf[2] = 0x07; // Left-Up D-Pad
+						}
+						else if (buf[2] == 0x04) // Down D-Pad
+						{
+							buf[2] = 0x05; // Left-Down D-Pad
+						}
+						else
+						{
+							buf[2] = 0x06; // Left D-Pad
+						}
+						buf[8] = ~buf[8]; // Left D-Pad;
+						break;
+					case CELL_PAD_CTRL_RIGHT:
+						if (buf[2] == 0x00) // Up D-Pad
+						{
+							buf[2] = 0x01; // Right-Up D-Pad
+						}
+						else if (buf[2] == 0x04) // Down D-Pad
+						{
+							buf[2] = 0x03; // Right-Down D-Pad
+						}
+						else
+						{
+							buf[2] = 0x02; // Right D-Pad
+						}
+						buf[7] = ~buf[7]; // Right D-Pad
+						break;
+					case CELL_PAD_CTRL_START:
+						buf[1] |= 0x02; // Start
+						break;
+					case CELL_PAD_CTRL_SELECT:
+						buf[1] |= 0x01; // Select
+						break;
+					default:
+						break;
+				}
+			}
+		}
+	}
+	for (const AnalogStick& stick : pad->m_sticks)
+	{
+		switch (stick.m_offset)
+		{
+			case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y:
+				buf[6] = ~(stick.m_value) + 0x01; // Right Turntable
+				// Some pad handlers like MMJoystick are centered at 0x81 instead of 0x80
+				// which leaves the turntable stuck at 0x7F instead of 0x80, causing auto-scrolling menus
+				// so force 0x7F to 0x80.
+				if (buf[6] == 0x7F)
+					buf[6] = 0x80;
+				break;
+			case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y:
+				buf[21] = (stick.m_value & 0x3F) << 2; // Crossfader, lower 6 bits
+				buf[22] = (stick.m_value & 0xC0) >> 6; // Crossfader, upper 2 bits
+				break;
+			case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X:
+				buf[19] = (stick.m_value & 0x3F) << 2; // Effects Dial, lower 6 bits
+				buf[20] = (stick.m_value & 0xC0) >> 6; // Effects Dial, upper 2 bits
+				break;
+			default:
+				break;
+		}
+	}
 }
diff --git a/rpcs3/Emu/Io/Turntable.h b/rpcs3/Emu/Io/Turntable.h
index f8186e9098..45962c6d97 100644
--- a/rpcs3/Emu/Io/Turntable.h
+++ b/rpcs3/Emu/Io/Turntable.h
@@ -5,15 +5,9 @@
 class usb_device_turntable : public usb_device_emulated
 {
 public:
-	usb_device_turntable(u32 controller_index, const std::array<u8, 7>& location);
+	usb_device_turntable();
 	~usb_device_turntable();
 
-	static std::shared_ptr<usb_device> make_instance(u32 controller_index, const std::array<u8, 7>& location);
-	static u16 get_num_emu_devices();
-
 	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
 	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-
-private:
-	u32 m_controller_index;
 };
diff --git a/rpcs3/Emu/Io/buzz_config.h b/rpcs3/Emu/Io/buzz_config.h
deleted file mode 100644
index f340ecd70e..0000000000
--- a/rpcs3/Emu/Io/buzz_config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "emulated_pad_config.h"
-
-enum class buzz_btn
-{
-	red,
-	yellow,
-	green,
-	orange,
-	blue,
-
-	count
-};
-
-struct cfg_buzzer final : public emulated_pad_config<buzz_btn>
-{
-	cfg_buzzer(node* owner, const std::string& name) : emulated_pad_config(owner, name) {}
-
-	cfg_pad_btn<buzz_btn> red{ this, "Red", buzz_btn::red, pad_button::R1 };
-	cfg_pad_btn<buzz_btn> yellow{ this, "Yellow", buzz_btn::yellow, pad_button::cross };
-	cfg_pad_btn<buzz_btn> green{ this, "Green", buzz_btn::green, pad_button::circle };
-	cfg_pad_btn<buzz_btn> orange{ this, "Orange", buzz_btn::orange, pad_button::square };
-	cfg_pad_btn<buzz_btn> blue{ this, "Blue", buzz_btn::blue, pad_button::triangle };
-};
-
-struct cfg_buzz final : public emulated_pads_config<cfg_buzzer, 7>
-{
-	cfg_buzz() : emulated_pads_config<cfg_buzzer, 7>("buzz") {};
-};
-
-extern cfg_buzz g_cfg_buzz;
diff --git a/rpcs3/Emu/Io/camera_config.cpp b/rpcs3/Emu/Io/camera_config.cpp
deleted file mode 100644
index d7071b05c3..0000000000
--- a/rpcs3/Emu/Io/camera_config.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-#include "stdafx.h"
-#include "camera_config.h"
-#include <charconv>
-
-LOG_CHANNEL(camera_log, "Camera");
-
-cfg_camera g_cfg_camera;
-
-cfg_camera::cfg_camera()
-	: cfg::node()
-	, path(fs::get_config_dir(true) + "camera.yml")
-{
-}
-
-bool cfg_camera::load()
-{
-	camera_log.notice("Loading camera config from '%s'", path);
-
-	if (fs::file cfg_file{ path, fs::read })
-	{
-		return from_string(cfg_file.to_string());
-	}
-
-	camera_log.notice("Camera config missing. Using default settings. Path: %s", path);
-	from_default();
-	return false;
-}
-
-void cfg_camera::save() const
-{
-	camera_log.notice("Saving camera config to '%s'", path);
-
-	if (!cfg::node::save(path))
-	{
-		camera_log.error("Failed to save camera config to '%s' (error=%s)", path, fs::g_tls_error);
-	}
-}
-
-cfg_camera::camera_setting cfg_camera::get_camera_setting(const std::string& camera, bool& success)
-{
-	camera_setting setting;
-	const std::string value = cameras.get_value(camera);
-	success = !value.empty();
-	if (success)
-	{
-		setting.from_string(cameras.get_value(camera));
-	}
-	return setting;
-}
-
-void cfg_camera::set_camera_setting(const std::string& camera, const camera_setting& setting)
-{
-	if (camera.empty())
-	{
-		camera_log.error("String '%s' cannot be used as camera key.", camera);
-		return;
-	}
-
-	cameras.set_value(camera, setting.to_string());
-}
-
-std::string cfg_camera::camera_setting::to_string() const
-{
-	return fmt::format("%d,%d,%f,%f,%d", width, height, min_fps, max_fps, format);
-}
-
-void cfg_camera::camera_setting::from_string(const std::string& text)
-{
-	if (text.empty())
-	{
-		return;
-	}
-
-	const std::vector<std::string> list = fmt::split(text, { "," });
-
-	if (list.size() != member_count)
-	{
-		camera_log.error("String '%s' cannot be interpreted as camera_setting.", text);
-		return;
-	}
-
-	const auto to_integer = [](const std::string& str, int& out) -> bool
-	{
-		auto [ptr, ec] = std::from_chars(str.c_str(), str.c_str() + str.size(), out);
-		if (ec != std::errc{})
-		{
-			camera_log.error("String '%s' cannot be interpreted as integer.", str);
-			return false;
-		}
-		return true;
-	};
-
-	const auto to_double = [](const std::string& str, double& out) -> bool
-	{
-		char* end{};
-		out = std::strtod(str.c_str(), &end);
-		if (end != str.c_str() + str.size())
-		{
-			camera_log.error("String '%s' cannot be interpreted as double.", str);
-			return false;
-		}
-		return true;
-	};
-
-	if (!to_integer(::at32(list, 0), width) ||
-		!to_integer(::at32(list, 1), height) ||
-		!to_double(::at32(list, 2), min_fps) ||
-		!to_double(::at32(list, 3), max_fps) ||
-		!to_integer(::at32(list, 4), format))
-	{
-		width = 0;
-		height = 0;
-		min_fps = 0;
-		max_fps = 0;
-		format = 0;
-	}
-}
diff --git a/rpcs3/Emu/Io/camera_config.h b/rpcs3/Emu/Io/camera_config.h
deleted file mode 100644
index a918dea458..0000000000
--- a/rpcs3/Emu/Io/camera_config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "Utilities/Config.h"
-
-struct cfg_camera final : cfg::node
-{
-	cfg_camera();
-	bool load();
-	void save() const;
-
-	struct camera_setting
-	{
-		int width = 0;
-		int height = 0;
-		double min_fps = 0;
-		double max_fps = 0;
-		int format = 0;
-
-		static constexpr u32 member_count = 5;
-
-		std::string to_string() const;
-		void from_string(const std::string& text);
-	};
-	camera_setting get_camera_setting(const std::string& camera, bool& success);
-	void set_camera_setting(const std::string& camera, const camera_setting& setting);
-
-	const std::string path;
-
-	cfg::map_entry cameras{ this, "Cameras" }; // <camera>: <width>,<height>,<min_fps>,<max_fps>,<format>
-};
-
-extern cfg_camera g_cfg_camera;
diff --git a/rpcs3/Emu/Io/camera_handler_base.h b/rpcs3/Emu/Io/camera_handler_base.h
deleted file mode 100644
index 49ce4dc635..0000000000
--- a/rpcs3/Emu/Io/camera_handler_base.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include "util/atomic.hpp"
-#include "util/types.hpp"
-
-#include <mutex>
-
-class camera_handler_base
-{
-public:
-	enum class camera_handler_state
-	{
-		closed,
-		open,
-		running
-	};
-
-	virtual ~camera_handler_base() = default;
-
-	virtual void open_camera() = 0;
-	virtual void close_camera() = 0;
-	virtual void start_camera() = 0;
-	virtual void stop_camera() = 0;
-
-	virtual void set_format(s32 format, u32 bytes_per_pixel) = 0;
-	virtual void set_frame_rate(u32 frame_rate) = 0;
-	virtual void set_resolution(u32 width, u32 height) = 0;
-	virtual void set_mirrored(bool mirrored) = 0;
-
-	virtual u64 frame_number() const = 0; // Convenience function to check if there's a new frame.
-	virtual camera_handler_state get_image(u8* buf, u64 size, u32& width, u32& height, u64& frame_number, u64& bytes_read) = 0;
-
-	camera_handler_state get_state() const { return m_state.load(); }
-	void set_state(camera_handler_state state) { m_state = m_state_expected = state; }
-
-	camera_handler_state get_expected_state() const { return m_state_expected.load(); }
-	void set_expected_state(camera_handler_state state) { m_state_expected = state; }
-
-	bool mirrored() const { return m_mirrored; }
-	s32 format() const { return m_format; }
-	u32 bytesize() const { return m_bytesize; }
-	u32 width() const { return m_width; }
-	u32 height() const { return m_height; }
-	u32 frame_rate() const { return m_frame_rate; }
-
-protected:
-	std::mutex m_mutex;
-	bool m_mirrored = false;
-	s32 m_format = 2; // CELL_CAMERA_RAW8
-	u32 m_bytesize = 0;
-	u32 m_width = 640;
-	u32 m_height = 480;
-	u32 m_frame_rate = 30;
-
-private:
-	atomic_t<camera_handler_state> m_state = camera_handler_state::closed;
-	atomic_t<camera_handler_state> m_state_expected = camera_handler_state::closed;
-};
diff --git a/rpcs3/Emu/Io/emulated_pad_config.h b/rpcs3/Emu/Io/emulated_pad_config.h
deleted file mode 100644
index b9bf68a223..0000000000
--- a/rpcs3/Emu/Io/emulated_pad_config.h
+++ /dev/null
@@ -1,294 +0,0 @@
-#pragma once
-
-#include "Utilities/Config.h"
-#include "Utilities/mutex.h"
-#include "pad_types.h"
-#include "MouseHandler.h"
-
-#include <array>
-#include <map>
-#include <set>
-#include <vector>
-
-LOG_CHANNEL(cfg_log, "CFG");
-
-template <typename T>
-class cfg_pad_btn : public cfg::_enum<pad_button>
-{
-public:
-	cfg_pad_btn(cfg::node* owner, const std::string& name, T id, pad_button value, bool dynamic = false)
-		: cfg::_enum<pad_button>(owner, name, value, dynamic)
-		, m_btn_id(id)
-	{};
-
-	T btn_id() const
-	{
-		return m_btn_id;
-	}
-
-private:
-	T m_btn_id;
-};
-
-template <typename T>
-struct emulated_pad_config : cfg::node
-{
-public:
-	using cfg::node::node;
-
-	pad_button get_pad_button(T id)
-	{
-		std::lock_guard lock(m_mutex);
-
-		if (const cfg_pad_btn<T>* item = get_button(id))
-		{
-			return item->get();
-		}
-
-		return pad_button::pad_button_max_enum;
-	}
-
-	pad_button default_pad_button(T id)
-	{
-		std::lock_guard lock(m_mutex);
-
-		if (const cfg_pad_btn<T>* item = get_button(id))
-		{
-			return item->get_default();
-		}
-
-		return pad_button::pad_button_max_enum;
-	}
-
-	void set_button(T id, pad_button btn_id)
-	{
-		std::lock_guard lock(m_mutex);
-
-		if (cfg_pad_btn<T>* item = get_button(id))
-		{
-			item->set(btn_id);
-		}
-	}
-
-	void init_buttons()
-	{
-		std::lock_guard lock(m_mutex);
-
-		for (const auto& n : get_nodes())
-		{
-			init_button(static_cast<cfg_pad_btn<T>*>(n));
-		}
-	}
-
-	void clear_buttons()
-	{
-		std::lock_guard lock(m_mutex);
-
-		buttons.clear();
-		button_map.clear();
-	}
-
-	void handle_input(std::shared_ptr<Pad> pad, bool press_only, const std::function<void(T, pad_button, u16, bool, bool&)>& func) const
-	{
-		if (!pad || pad->is_copilot())
-			return;
-
-		for (const Button& button : pad->m_buttons_external)
-		{
-			if (button.m_pressed || !press_only)
-			{
-				if (handle_input(func, button.m_offset, button.m_outKeyCode, button.m_value, button.m_pressed, true))
-				{
-					return;
-				}
-			}
-		}
-
-		for (const AnalogStick& stick : pad->m_sticks_external)
-		{
-			if (handle_input(func, stick.m_offset, get_axis_keycode(stick.m_offset, stick.m_value), stick.m_value, true, true))
-			{
-				return;
-			}
-		}
-	}
-
-	void handle_input(const Mouse& mouse, const std::function<void(T, pad_button, u16, bool, bool&)>& func) const
-	{
-		for (int i = 0; i < 8; i++)
-		{
-			const MouseButtonCodes cell_code = get_mouse_button_code(i);
-			if ((mouse.buttons & cell_code))
-			{
-				const pad_button button = static_cast<pad_button>(static_cast<int>(pad_button::mouse_button_1) + i);
-				const u32 offset = pad_button_offset(button);
-				const u32 keycode = pad_button_keycode(button);
-
-				if (handle_input(func, offset, keycode, 255, true, true))
-				{
-					return;
-				}
-			}
-		}
-	}
-
-protected:
-	mutable shared_mutex m_mutex;
-	std::vector<cfg_pad_btn<T>*> buttons;
-	std::map<u32, std::map<u32, std::set<const cfg_pad_btn<T>*>>> button_map;
-
-	cfg_pad_btn<T>* get_button(T id)
-	{
-		for (cfg_pad_btn<T>* item : buttons)
-		{
-			if (item && item->btn_id() == id)
-			{
-				return item;
-			}
-		}
-
-		return nullptr;
-	}
-
-	void init_button(cfg_pad_btn<T>* pbtn)
-	{
-		if (!pbtn) return;
-		const u32 offset = pad_button_offset(pbtn->get());
-		const u32 keycode = pad_button_keycode(pbtn->get());
-		button_map[offset][keycode].insert(std::as_const(pbtn));
-		buttons.push_back(pbtn);
-	}
-
-	const std::set<const cfg_pad_btn<T>*>& find_button(u32 offset, u32 keycode) const
-	{
-		if (const auto it = button_map.find(offset); it != button_map.cend())
-		{
-			if (const auto it2 = it->second.find(keycode); it2 != it->second.cend() && !it2->second.empty())
-			{
-				return it2->second;
-			}
-		}
-
-		static const std::set<const cfg_pad_btn<T>*> empty_set;
-		return empty_set;
-	}
-
-	bool handle_input(const std::function<void(T, pad_button, u16, bool, bool&)>& func, u32 offset, u32 keycode, u16 value, bool pressed, bool check_axis) const
-	{
-		m_mutex.lock();
-
-		bool abort = false;
-
-		const auto& btns = find_button(offset, keycode);
-		if (btns.empty())
-		{
-			m_mutex.unlock();
-
-			if (check_axis)
-			{
-				switch (offset)
-				{
-				case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X:
-				case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y:
-				case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X:
-				case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y:
-					abort = handle_input(func, offset, static_cast<u32>(axis_direction::both), value, pressed, false);
-					break;
-				default:
-					break;
-				}
-			}
-			return abort;
-		}
-
-		for (const auto& btn : btns)
-		{
-			if (btn && func)
-			{
-				func(btn->btn_id(), btn->get(), value, pressed, abort);
-				if (abort) break;
-			}
-		}
-
-		m_mutex.unlock();
-		return abort;
-	}
-};
-
-template <typename T, u32 Count>
-struct emulated_pads_config : cfg::node
-{
-	emulated_pads_config(std::string id) : cfg_id(std::move(id))
-	{
-		for (u32 i = 0; i < Count; i++)
-		{
-			players.at(i) = std::make_shared<T>(this, fmt::format("Player %d", i + 1));
-		}
-	}
-
-	shared_mutex m_mutex;
-	std::string cfg_id;
-	std::array<std::shared_ptr<T>, Count> players;
-
-	bool load()
-	{
-		m_mutex.lock();
-
-		bool result = false;
-		const std::string cfg_name = fmt::format("%s%s.yml", fs::get_config_dir(true), cfg_id);
-		cfg_log.notice("Loading %s config: %s", cfg_id, cfg_name);
-
-		from_default();
-
-		for (std::shared_ptr<T>& player : players)
-		{
-			player->clear_buttons();
-		}
-
-		if (fs::file cfg_file{ cfg_name, fs::read })
-		{
-			if (const std::string content = cfg_file.to_string(); !content.empty())
-			{
-				result = from_string(content);
-			}
-
-			for (std::shared_ptr<T>& player : players)
-			{
-				player->init_buttons();
-			}
-
-			m_mutex.unlock();
-		}
-		else
-		{
-			m_mutex.unlock();
-			save();
-		}
-
-		return result;
-	}
-
-	void save()
-	{
-		std::lock_guard lock(m_mutex);
-
-		const std::string cfg_name = fmt::format("%s%s.yml", fs::get_config_dir(true), cfg_id);
-		cfg_log.notice("Saving %s config to '%s'", cfg_id, cfg_name);
-
-		if (!fs::create_path(fs::get_parent_dir(cfg_name)))
-		{
-			cfg_log.fatal("Failed to create path: %s (%s)", cfg_name, fs::g_tls_error);
-		}
-
-		if (!cfg::node::save(cfg_name))
-		{
-			cfg_log.error("Failed to save %s config to '%s' (error=%s)", cfg_id, cfg_name, fs::g_tls_error);
-		}
-
-		for (std::shared_ptr<T>& player : players)
-		{
-			player->clear_buttons();
-			player->init_buttons();
-		}
-	}
-};
diff --git a/rpcs3/Emu/Io/evdev_gun_handler.cpp b/rpcs3/Emu/Io/evdev_gun_handler.cpp
deleted file mode 100644
index a428964f9f..0000000000
--- a/rpcs3/Emu/Io/evdev_gun_handler.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-// This makes debugging on windows less painful
-//#define HAVE_LIBEVDEV
-
-#ifdef HAVE_LIBEVDEV
-
-#include "stdafx.h"
-#include "evdev_gun_handler.h"
-#include "util/logs.hpp"
-
-#include <libudev.h>
-
-#include <libevdev/libevdev.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-LOG_CHANNEL(evdev_log, "evdev");
-
-constexpr usz max_devices = 8;
-
-const std::map<gun_button, int> button_map
-{
-	{gun_button::btn_left, BTN_LEFT},
-	{gun_button::btn_right, BTN_RIGHT},
-	{gun_button::btn_middle, BTN_MIDDLE},
-	{gun_button::btn_1, BTN_1},
-	{gun_button::btn_2, BTN_2},
-	{gun_button::btn_3, BTN_3},
-	{gun_button::btn_4, BTN_4},
-	{gun_button::btn_5, BTN_5},
-	{gun_button::btn_6, BTN_6},
-	{gun_button::btn_7, BTN_7},
-	{gun_button::btn_8, BTN_8}
-};
-
-struct event_udev_entry
-{
-	const char* devnode = nullptr;
-	struct udev_list_entry* item = nullptr;
-};
-
-bool event_is_number(const char* s)
-{
-	if (!s)
-		return false;
-
-	const usz len = strlen(s);
-	if (len == 0)
-		return false;
-
-	for (usz n = 0; n < len; n++)
-	{
-		if (s[n] < '0' || s[n] > '9')
-			return false;
-	}
-	return true;
-}
-
-// compare /dev/input/eventX and /dev/input/eventY where X and Y are numbers
-bool event_cmp_less_than(const char* x, const char* y)
-{
-	// find a common string
-	int n = 0;
-	while (x && y && x[n] == y[n] && x[n] != '\0' && y[n] != '\0')
-	{
-		n++;
-	}
-
-	// check if remaining string is a number
-	if (event_is_number(x + n) && event_is_number(y + n))
-	{
-		const int a = atoi(x + n);
-		const int b = atoi(y + n);
-
-		return a < b;
-	}
-
-	return strcmp(x, y) < 0;
-}
-
-evdev_gun_handler::evdev_gun_handler()
-{
-}
-
-evdev_gun_handler::~evdev_gun_handler()
-{
-	for (evdev_gun& gun : m_devices)
-	{
-		if (gun.device)
-		{
-			const int fd = libevdev_get_fd(gun.device);
-			libevdev_free(gun.device);
-			close(fd);
-		}
-	}
-	if (m_udev != nullptr)
-		udev_unref(m_udev);
-	evdev_log.notice("Lightgun: Shutdown udev initialization");
-}
-
-int evdev_gun_handler::get_button(u32 gunno, gun_button button) const
-{
-	const auto& buttons = ::at32(m_devices, gunno).buttons;
-
-	if (const auto it = buttons.find(::at32(button_map, button)); it != buttons.end())
-	{
-		return it->second;
-	}
-
-	return 0;
-}
-
-int evdev_gun_handler::get_axis_x(u32 gunno) const
-{
-	const evdev_axis& axis = ::at32(::at32(m_devices, gunno).axis, ABS_X);
-	return axis.value - axis.min;
-}
-
-int evdev_gun_handler::get_axis_y(u32 gunno) const
-{
-	const evdev_axis& axis = ::at32(::at32(m_devices, gunno).axis, ABS_Y);
-	return axis.value - axis.min;
-}
-
-int evdev_gun_handler::get_axis_x_max(u32 gunno) const
-{
-	const evdev_axis& axis = ::at32(::at32(m_devices, gunno).axis, ABS_X);
-	return axis.max - axis.min;
-}
-
-int evdev_gun_handler::get_axis_y_max(u32 gunno) const
-{
-	const evdev_axis& axis = ::at32(::at32(m_devices, gunno).axis, ABS_Y);
-	return axis.max - axis.min;
-}
-
-void evdev_gun_handler::poll(u32 index)
-{
-	if (!m_is_init || index >= m_devices.size())
-		return;
-
-	evdev_gun& gun = ::at32(m_devices, index);
-
-	if (!gun.device)
-		return;
-
-	// Try to fetch all new events from the joystick.
-	input_event evt;
-	int ret = LIBEVDEV_READ_STATUS_SUCCESS;
-	while (ret >= 0)
-	{
-		if (ret == LIBEVDEV_READ_STATUS_SYNC)
-		{
-			// Grab any pending sync event.
-			ret = libevdev_next_event(gun.device, LIBEVDEV_READ_FLAG_NORMAL | LIBEVDEV_READ_FLAG_SYNC, &evt);
-		}
-		else
-		{
-			ret = libevdev_next_event(gun.device, LIBEVDEV_READ_FLAG_NORMAL, &evt);
-		}
-
-		if (ret == LIBEVDEV_READ_STATUS_SUCCESS)
-		{
-			switch (evt.type)
-			{
-			case EV_KEY:
-				gun.buttons[evt.code] = evt.value;
-				break;
-			case EV_ABS:
-				gun.axis[evt.code].value = evt.value;
-				break;
-			default:
-				break;
-			}
-		}
-	}
-
-	if (ret < 0)
-	{
-		// -EAGAIN signifies no available events, not an actual *error*.
-		if (ret != -EAGAIN)
-			evdev_log.error("Failed to read latest event from lightgun device: %s [errno %d]", strerror(-ret), -ret);
-	}
-}
-
-bool evdev_gun_handler::is_init() const
-{
-	return m_is_init;
-}
-
-u32 evdev_gun_handler::get_num_guns() const
-{
-	return ::narrow<u32>(m_devices.size());
-}
-
-bool evdev_gun_handler::init()
-{
-	if (m_is_init)
-		return true;
-
-	m_devices.clear();
-
-	evdev_log.notice("Lightgun: Begin udev initialization");
-
-	m_udev = udev_new();
-	if (m_udev == nullptr)
-	{
-		evdev_log.error("Lightgun: Failed udev initialization");
-		return false;
-	}
-
-	if (udev_enumerate* enumerate = udev_enumerate_new(m_udev))
-	{
-		udev_enumerate_add_match_property(enumerate, "ID_INPUT_MOUSE", "1");
-		udev_enumerate_add_match_subsystem(enumerate, "input");
-		udev_enumerate_scan_devices(enumerate);
-		udev_list_entry* devs = udev_enumerate_get_list_entry(enumerate);
-
-		std::vector<event_udev_entry> sorted_devices;
-
-		for (udev_list_entry* item = devs; item && sorted_devices.size() < max_devices; item = udev_list_entry_get_next(item))
-		{
-			const char* name = udev_list_entry_get_name(item);
-			udev_device* dev = udev_device_new_from_syspath(m_udev, name);
-			const char* devnode = udev_device_get_devnode(dev);
-
-			if (devnode != nullptr)
-			{
-				event_udev_entry new_device{};
-				new_device.devnode = devnode;
-				new_device.item = item;
-				sorted_devices.push_back(std::move(new_device));
-			}
-			else
-			{
-				udev_device_unref(dev);
-			}
-		}
-
-		// Sort the udev entries by devnode name so that they are created in the proper order
-		std::sort(sorted_devices.begin(), sorted_devices.end(), [](const event_udev_entry& a, const event_udev_entry& b)
-		{
-			return event_cmp_less_than(a.devnode, b.devnode);
-		});
-
-		for (const event_udev_entry& entry : sorted_devices)
-		{
-			// Get the filename of the /sys entry for the device and create a udev_device object (dev) representing it.
-			const char* name = udev_list_entry_get_name(entry.item);
-			evdev_log.notice("Lightgun: found device %s", name);
-
-			udev_device* dev = udev_device_new_from_syspath(m_udev, name);
-			const char* devnode = udev_device_get_devnode(dev);
-			const int fd = open(devnode, O_RDONLY | O_NONBLOCK);
-			struct libevdev* device = nullptr;
-			const int rc = libevdev_new_from_fd(fd, &device);
-			if (rc < 0)
-			{
-				// If it's just a bad file descriptor, don't bother logging, but otherwise, log it.
-				if (rc != -9)
-					evdev_log.warning("Failed to connect to lightgun device at %s, the error was: %s", devnode, strerror(-rc));
-				libevdev_free(device);
-				close(fd);
-				continue;
-			}
-
-			if (libevdev_has_event_type(device, EV_KEY) &&
-				libevdev_has_event_type(device, EV_ABS))
-			{
-				bool is_valid = true;
-
-				evdev_gun gun{};
-				gun.device = device;
-
-				for (int code : { ABS_X, ABS_Y })
-				{
-					if (const input_absinfo* info = libevdev_get_abs_info(device, code))
-					{
-						gun.axis[code].min = info->minimum;
-						gun.axis[code].max = info->maximum;
-					}
-					else
-					{
-						evdev_log.notice("Lightgun: device %s not valid. axis %d not found", name, code);
-						is_valid = false;
-						break;
-					}
-				}
-
-				if (is_valid)
-				{
-					evdev_log.notice("Lightgun: Adding device %d: %s, ABS_X(%i, %i), ABS_Y(%i, %i)", m_devices.size(), name, gun.axis[ABS_X].min, gun.axis[ABS_X].max, gun.axis[ABS_Y].min, gun.axis[ABS_Y].max);
-					m_devices.push_back(gun);
-				}
-				else
-				{
-					close(fd);
-				}
-
-				if (m_devices.size() >= max_devices)
-					break;
-			}
-			else
-			{
-				evdev_log.notice("Lightgun: device %s not valid. No axis or key events found", name);
-				close(fd);
-			}
-		}
-		udev_enumerate_unref(enumerate);
-	}
-	else
-	{
-		evdev_log.error("Lightgun: Failed udev enumeration");
-	}
-
-	m_is_init = true;
-	return true;
-}
-
-#endif
diff --git a/rpcs3/Emu/Io/evdev_gun_handler.h b/rpcs3/Emu/Io/evdev_gun_handler.h
deleted file mode 100644
index 342fff40df..0000000000
--- a/rpcs3/Emu/Io/evdev_gun_handler.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-#ifdef HAVE_LIBEVDEV
-
-#include <map>
-#include "Utilities/mutex.h"
-
-enum class gun_button
-{
-	btn_left,
-	btn_right,
-	btn_middle,
-	btn_1,
-	btn_2,
-	btn_3,
-	btn_4,
-	btn_5,
-	btn_6,
-	btn_7,
-	btn_8
-};
-
-class evdev_gun_handler
-{
-public:
-	evdev_gun_handler();
-	~evdev_gun_handler();
-
-	bool init();
-
-	bool is_init() const;
-	u32 get_num_guns() const;
-	int get_button(u32 gunno, gun_button button) const;
-	int get_axis_x(u32 gunno) const;
-	int get_axis_y(u32 gunno) const;
-	int get_axis_x_max(u32 gunno) const;
-	int get_axis_y_max(u32 gunno) const;
-
-	void poll(u32 index);
-
-	shared_mutex mutex;
-
-private:
-	atomic_t<bool> m_is_init{false};
-	struct udev* m_udev = nullptr;
-
-	struct evdev_axis
-	{
-		int value = 0;
-		int min = 0;
-		int max = 0;
-	};
-
-	struct evdev_gun
-	{
-		struct libevdev* device = nullptr;
-		std::map<int, int> buttons;
-		std::map<int, evdev_axis> axis;
-	};
-
-	std::vector<evdev_gun> m_devices;
-};
-
-#endif
diff --git a/rpcs3/Emu/Io/gem_config.h b/rpcs3/Emu/Io/gem_config.h
deleted file mode 100644
index 9cfca88ddb..0000000000
--- a/rpcs3/Emu/Io/gem_config.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#pragma once
-
-#include "emulated_pad_config.h"
-
-enum class gem_btn : u32
-{
-	start,
-	select,
-	triangle,
-	circle,
-	cross,
-	square,
-	move,
-	t,
-	x_axis,
-	y_axis,
-
-	combo_begin,
-	combo = combo_begin,
-	combo_start,
-	combo_select,
-	combo_triangle,
-	combo_circle,
-	combo_cross,
-	combo_square,
-	combo_move,
-	combo_t,
-	combo_end = combo_t,
-
-	count
-};
-
-struct cfg_fake_gem final : public emulated_pad_config<gem_btn>
-{
-	cfg_fake_gem(node* owner, const std::string& name) : emulated_pad_config(owner, name) {}
-
-	cfg_pad_btn<gem_btn> start{ this, "Start", gem_btn::start, pad_button::start };
-	cfg_pad_btn<gem_btn> select{ this, "Select", gem_btn::select, pad_button::select };
-	cfg_pad_btn<gem_btn> triangle{ this, "Triangle", gem_btn::triangle, pad_button::triangle };
-	cfg_pad_btn<gem_btn> circle{ this, "Circle", gem_btn::circle, pad_button::circle };
-	cfg_pad_btn<gem_btn> cross{ this, "Cross", gem_btn::cross, pad_button::cross };
-	cfg_pad_btn<gem_btn> square{ this, "Square", gem_btn::square, pad_button::square };
-	cfg_pad_btn<gem_btn> move{ this, "Move", gem_btn::move, pad_button::R1 };
-	cfg_pad_btn<gem_btn> t{ this, "T", gem_btn::t, pad_button::R2 };
-	cfg_pad_btn<gem_btn> x_axis{ this, "X-Axis", gem_btn::x_axis, pad_button::ls_x };
-	cfg_pad_btn<gem_btn> y_axis{ this, "Y-Axis", gem_btn::y_axis, pad_button::ls_y };
-};
-
-struct cfg_fake_gems final : public emulated_pads_config<cfg_fake_gem, 4>
-{
-	cfg_fake_gems() : emulated_pads_config<cfg_fake_gem, 4>("gem") {};
-};
-
-struct cfg_mouse_gem final : public emulated_pad_config<gem_btn>
-{
-	cfg_mouse_gem(node* owner, const std::string& name) : emulated_pad_config(owner, name) {}
-
-	cfg_pad_btn<gem_btn> start{ this, "Start", gem_btn::start, pad_button::mouse_button_6 };
-	cfg_pad_btn<gem_btn> select{ this, "Select", gem_btn::select, pad_button::mouse_button_7 };
-	cfg_pad_btn<gem_btn> triangle{ this, "Triangle", gem_btn::triangle, pad_button::mouse_button_8 };
-	cfg_pad_btn<gem_btn> circle{ this, "Circle", gem_btn::circle, pad_button::mouse_button_4 };
-	cfg_pad_btn<gem_btn> cross{ this, "Cross", gem_btn::cross, pad_button::mouse_button_5 };
-	cfg_pad_btn<gem_btn> square{ this, "Square", gem_btn::square, pad_button::mouse_button_3 };
-	cfg_pad_btn<gem_btn> move{ this, "Move", gem_btn::move, pad_button::mouse_button_2 };
-	cfg_pad_btn<gem_btn> t{ this, "T", gem_btn::t, pad_button::mouse_button_1 };
-	cfg_pad_btn<gem_btn> combo{ this, "Combo", gem_btn::combo, pad_button::pad_button_max_enum };
-	cfg_pad_btn<gem_btn> combo_start{ this, "Combo Start", gem_btn::combo_start, pad_button::pad_button_max_enum };
-	cfg_pad_btn<gem_btn> combo_select{ this, "Combo Select", gem_btn::combo_select, pad_button::pad_button_max_enum };
-	cfg_pad_btn<gem_btn> combo_triangle{ this, "Combo Triangle", gem_btn::combo_triangle, pad_button::pad_button_max_enum };
-	cfg_pad_btn<gem_btn> combo_circle{ this, "Combo Circle", gem_btn::combo_circle, pad_button::pad_button_max_enum };
-	cfg_pad_btn<gem_btn> combo_cross{ this, "Combo Cross", gem_btn::combo_cross, pad_button::pad_button_max_enum };
-	cfg_pad_btn<gem_btn> combo_square{ this, "Combo Square", gem_btn::combo_square, pad_button::pad_button_max_enum };
-	cfg_pad_btn<gem_btn> combo_move{ this, "Combo Move", gem_btn::combo_move, pad_button::pad_button_max_enum };
-	cfg_pad_btn<gem_btn> combo_t{ this, "Combo T", gem_btn::combo_t, pad_button::pad_button_max_enum };
-};
-
-struct cfg_mouse_gems final : public emulated_pads_config<cfg_mouse_gem, 4>
-{
-	cfg_mouse_gems() : emulated_pads_config<cfg_mouse_gem, 4>("gem_mouse") {};
-};
-
-struct cfg_gem final : public emulated_pad_config<gem_btn>
-{
-	cfg_gem(node* owner, const std::string& name) : emulated_pad_config(owner, name) {}
-
-	cfg_pad_btn<gem_btn> start{ this, "Start", gem_btn::start, pad_button::start };
-	cfg_pad_btn<gem_btn> select{ this, "Select", gem_btn::select, pad_button::select };
-	cfg_pad_btn<gem_btn> triangle{ this, "Triangle", gem_btn::triangle, pad_button::triangle };
-	cfg_pad_btn<gem_btn> circle{ this, "Circle", gem_btn::circle, pad_button::circle };
-	cfg_pad_btn<gem_btn> cross{ this, "Cross", gem_btn::cross, pad_button::cross };
-	cfg_pad_btn<gem_btn> square{ this, "Square", gem_btn::square, pad_button::square };
-	cfg_pad_btn<gem_btn> move{ this, "Move", gem_btn::move, pad_button::R1 };
-	cfg_pad_btn<gem_btn> t{ this, "T", gem_btn::t, pad_button::R2 };
-};
-
-struct cfg_gems final : public emulated_pads_config<cfg_gem, 4>
-{
-	cfg_gems() : emulated_pads_config<cfg_gem, 4>("gem_real") {};
-};
-
-extern cfg_gems g_cfg_gem_real;
-extern cfg_fake_gems g_cfg_gem_fake;
-extern cfg_mouse_gems g_cfg_gem_mouse;
diff --git a/rpcs3/Emu/Io/ghltar_config.h b/rpcs3/Emu/Io/ghltar_config.h
deleted file mode 100644
index dfe43ea2c5..0000000000
--- a/rpcs3/Emu/Io/ghltar_config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-
-#include "emulated_pad_config.h"
-
-enum class ghltar_btn
-{
-	w1,
-	w2,
-	w3,
-	b1,
-	b2,
-	b3,
-	start,
-	hero_power,
-	ghtv,
-	strum_down,
-	strum_up,
-	dpad_left,
-	dpad_right,
-	whammy,
-	tilt,
-
-	count
-};
-
-struct cfg_ghltar final : public emulated_pad_config<ghltar_btn>
-{
-	cfg_ghltar(node* owner, const std::string& name) : emulated_pad_config(owner, name) {}
-
-	cfg_pad_btn<ghltar_btn> w1{ this, "W1", ghltar_btn::w1, pad_button::square };
-	cfg_pad_btn<ghltar_btn> w2{ this, "W2", ghltar_btn::w2, pad_button::L1 };
-	cfg_pad_btn<ghltar_btn> w3{ this, "W3", ghltar_btn::w3, pad_button::R1 };
-	cfg_pad_btn<ghltar_btn> b1{ this, "B1", ghltar_btn::b1, pad_button::cross };
-	cfg_pad_btn<ghltar_btn> b2{ this, "B2", ghltar_btn::b2, pad_button::circle };
-	cfg_pad_btn<ghltar_btn> b3{ this, "B3", ghltar_btn::b3, pad_button::triangle };
-	cfg_pad_btn<ghltar_btn> start{ this, "Start", ghltar_btn::start, pad_button::start };
-	cfg_pad_btn<ghltar_btn> hero_power{ this, "Hero Power", ghltar_btn::hero_power, pad_button::select };
-	cfg_pad_btn<ghltar_btn> ghtv{ this, "GHTV", ghltar_btn::ghtv, pad_button::L3 };
-	cfg_pad_btn<ghltar_btn> strum_down{ this, "Strum Down", ghltar_btn::strum_down, pad_button::dpad_down };
-	cfg_pad_btn<ghltar_btn> strum_up{ this, "Strum Up", ghltar_btn::strum_up, pad_button::dpad_up };
-	cfg_pad_btn<ghltar_btn> dpad_left{ this, "D-Pad Left", ghltar_btn::dpad_left, pad_button::dpad_left };
-	cfg_pad_btn<ghltar_btn> dpad_right{ this, "D-Pad Right", ghltar_btn::dpad_right, pad_button::dpad_right };
-	cfg_pad_btn<ghltar_btn> whammy{ this, "Whammy", ghltar_btn::whammy, pad_button::rs_y };
-	cfg_pad_btn<ghltar_btn> tilt{ this, "tilt", ghltar_btn::tilt, pad_button::rs_x };
-};
-
-struct cfg_ghltars final : public emulated_pads_config<cfg_ghltar, 2>
-{
-	cfg_ghltars() : emulated_pads_config<cfg_ghltar, 2>("ghltar") {};
-};
-
-extern cfg_ghltars g_cfg_ghltar;
diff --git a/rpcs3/Emu/Io/guncon3_config.h b/rpcs3/Emu/Io/guncon3_config.h
deleted file mode 100644
index c2ea82a9f3..0000000000
--- a/rpcs3/Emu/Io/guncon3_config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include "emulated_pad_config.h"
-
-enum class guncon3_btn
-{
-	trigger,
-	a1,
-	a2,
-	a3,
-	b1,
-	b2,
-	b3,
-	c1,
-	c2,
-	as_x,
-	as_y,
-	bs_x,
-	bs_y,
-
-	count
-};
-
-struct cfg_gc3 final : public emulated_pad_config<guncon3_btn>
-{
-	cfg_gc3(node* owner, const std::string& name) : emulated_pad_config(owner, name) {}
-
-	cfg_pad_btn<guncon3_btn> trigger{this, "Trigger", guncon3_btn::trigger, pad_button::cross};
-	cfg_pad_btn<guncon3_btn> a1{this, "A1", guncon3_btn::a1, pad_button::L1};
-	cfg_pad_btn<guncon3_btn> a2{this, "A2", guncon3_btn::a2, pad_button::L2};
-	cfg_pad_btn<guncon3_btn> a3{this, "A3", guncon3_btn::a3, pad_button::L3};
-	cfg_pad_btn<guncon3_btn> b1{this, "B1", guncon3_btn::b1, pad_button::R1};
-	cfg_pad_btn<guncon3_btn> b2{this, "B2", guncon3_btn::b2, pad_button::R2};
-	cfg_pad_btn<guncon3_btn> b3{this, "B3", guncon3_btn::b3, pad_button::R3};
-	cfg_pad_btn<guncon3_btn> c1{this, "C1", guncon3_btn::c1, pad_button::select};
-	cfg_pad_btn<guncon3_btn> c2{this, "C2", guncon3_btn::c2, pad_button::start};
-	cfg_pad_btn<guncon3_btn> as_x{this, "A-stick X-Axis", guncon3_btn::as_x, pad_button::ls_x};
-	cfg_pad_btn<guncon3_btn> as_y{this, "A-stick Y-Axis", guncon3_btn::as_y, pad_button::ls_y};
-	cfg_pad_btn<guncon3_btn> bs_x{this, "B-stick X-Axis", guncon3_btn::bs_x, pad_button::rs_x};
-	cfg_pad_btn<guncon3_btn> bs_y{this, "B-stick Y-Axis", guncon3_btn::bs_y, pad_button::rs_y};
-};
-
-struct cfg_guncon3 final : public emulated_pads_config<cfg_gc3, 4>
-{
-	cfg_guncon3() : emulated_pads_config<cfg_gc3, 4>("guncon3") {};
-};
-
-extern cfg_guncon3 g_cfg_guncon3;
diff --git a/rpcs3/Emu/Io/interception.cpp b/rpcs3/Emu/Io/interception.cpp
index dab9dbe3e8..3cbc3fa625 100644
--- a/rpcs3/Emu/Io/interception.cpp
+++ b/rpcs3/Emu/Io/interception.cpp
@@ -4,86 +4,25 @@
 #include "MouseHandler.h"
 #include "Input/pad_thread.h"
 #include "Emu/IdManager.h"
-#include "Emu/RSX/Overlays/overlay_message.h"
-#include "Emu/system_config.h"
-
-LOG_CHANNEL(input_log, "Input");
-
-template <>
-void fmt_class_string<input::active_mouse_and_keyboard>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](input::active_mouse_and_keyboard value)
-	{
-		switch (value)
-		{
-		case input::active_mouse_and_keyboard::emulated: return "emulated";
-		case input::active_mouse_and_keyboard::pad: return "pad";
-		}
-
-		return unknown;
-	});
-}
 
 namespace input
 {
-	atomic_t<active_mouse_and_keyboard> g_active_mouse_and_keyboard{active_mouse_and_keyboard::emulated};
-	atomic_t<bool> g_pads_intercepted{false};
-	atomic_t<bool> g_keyboards_intercepted{false};
-	atomic_t<bool> g_mice_intercepted{false};
+	atomic_t<bool> g_intercepted{false};
 
-	void SetIntercepted(bool pads_intercepted, bool keyboards_intercepted, bool mice_intercepted, const char* func)
+	void SetIntercepted(bool intercepted)
 	{
-		input_log.notice("SetIntercepted: pads=%d, keyboards=%d, mice=%d, src=%s)", pads_intercepted, keyboards_intercepted, mice_intercepted, func);
+		g_intercepted = intercepted;
 
-		g_pads_intercepted = pads_intercepted;
-		g_keyboards_intercepted = keyboards_intercepted;
-		g_mice_intercepted = mice_intercepted;
-
-		pad::SetIntercepted(pads_intercepted);
+		pad::SetIntercepted(intercepted);
 
 		if (const auto handler = g_fxo->try_get<KeyboardHandlerBase>())
 		{
-			handler->SetIntercepted(keyboards_intercepted);
+			handler->SetIntercepted(intercepted);
 		}
 
 		if (const auto handler = g_fxo->try_get<MouseHandlerBase>())
 		{
-			handler->SetIntercepted(mice_intercepted);
+			handler->SetIntercepted(intercepted);
 		}
 	}
-
-	void SetIntercepted(bool all_intercepted, const char* func)
-	{
-		SetIntercepted(all_intercepted, all_intercepted, all_intercepted, func);
-	}
-
-	static void show_mouse_and_keyboard_overlay()
-	{
-		if (!g_cfg.misc.show_mouse_and_keyboard_toggle_hint)
-			return;
-
-		const localized_string_id id = g_active_mouse_and_keyboard == active_mouse_and_keyboard::emulated
-			? localized_string_id::RSX_OVERLAYS_MOUSE_AND_KEYBOARD_EMULATED
-			: localized_string_id::RSX_OVERLAYS_MOUSE_AND_KEYBOARD_PAD;
-		rsx::overlays::queue_message(get_localized_string(id), 3'000'000);
-	}
-
-	void set_mouse_and_keyboard(active_mouse_and_keyboard device)
-	{
-		// Always log
-		input_log.notice("set_mouse_and_keyboard: device=%s", device);
-
-		if (g_active_mouse_and_keyboard != device)
-		{
-			g_active_mouse_and_keyboard = device;
-			show_mouse_and_keyboard_overlay();
-		}
-	}
-
-	void toggle_mouse_and_keyboard()
-	{
-		g_active_mouse_and_keyboard = g_active_mouse_and_keyboard == active_mouse_and_keyboard::emulated ? active_mouse_and_keyboard::pad : active_mouse_and_keyboard::emulated;
-		input_log.notice("toggle_mouse_and_keyboard: device=%s", g_active_mouse_and_keyboard.load());
-		show_mouse_and_keyboard_overlay();
-	}
 }
diff --git a/rpcs3/Emu/Io/interception.h b/rpcs3/Emu/Io/interception.h
index 16a407b8e7..72a88308de 100644
--- a/rpcs3/Emu/Io/interception.h
+++ b/rpcs3/Emu/Io/interception.h
@@ -4,20 +4,7 @@
 
 namespace input
 {
-	enum class active_mouse_and_keyboard : u32
-	{
-		pad,
-		emulated
-	};
-	extern atomic_t<active_mouse_and_keyboard> g_active_mouse_and_keyboard;
+	extern atomic_t<bool> g_intercepted;
 
-	extern atomic_t<bool> g_pads_intercepted;
-	extern atomic_t<bool> g_keyboards_intercepted;
-	extern atomic_t<bool> g_mice_intercepted;
-
-	void SetIntercepted(bool pads_intercepted, bool keyboards_intercepted, bool mice_intercepted, const char* func = __builtin_FUNCTION());
-	void SetIntercepted(bool all_intercepted, const char* func = __builtin_FUNCTION());
-
-	void set_mouse_and_keyboard(active_mouse_and_keyboard device);
-	void toggle_mouse_and_keyboard();
+	void SetIntercepted(bool intercepted);
 }
diff --git a/rpcs3/Emu/Io/midi_config_types.cpp b/rpcs3/Emu/Io/midi_config_types.cpp
deleted file mode 100644
index abe976ee93..0000000000
--- a/rpcs3/Emu/Io/midi_config_types.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "stdafx.h"
-#include "midi_config_types.h"
-#include "Utilities/StrUtil.h"
-#include "Utilities/Config.h"
-
-template <>
-void fmt_class_string<midi_device_type>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](midi_device_type value)
-	{
-		switch (value)
-		{
-		case midi_device_type::guitar: return "Guitar (17 frets)";
-		case midi_device_type::guitar_22fret: return "Guitar (22 frets)";
-		case midi_device_type::keyboard: return "Keyboard";
-		case midi_device_type::drums: return "Drums";
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<midi_device>::format(std::string& out, u64 arg)
-{
-	const midi_device& obj = get_object(arg);
-	fmt::append(out, "%sßßß%s", obj.type, obj.name);
-}
-
-midi_device midi_device::from_string(const std::string& str)
-{
-	midi_device res{};
-
-	if (const std::vector<std::string> parts = fmt::split(str, {"ßßß"}); !parts.empty())
-	{
-		u64 result;
-
-		if (cfg::try_to_enum_value(&result, &fmt_class_string<midi_device_type>::format, ::at32(parts, 0)))
-		{
-			res.type = static_cast<midi_device_type>(static_cast<std::underlying_type_t<midi_device_type>>(result));
-		}
-
-		if (parts.size() == 2)
-		{
-			res.name = ::at32(parts, 1);
-		}
-	}
-
-	return res;
-}
diff --git a/rpcs3/Emu/Io/midi_config_types.h b/rpcs3/Emu/Io/midi_config_types.h
deleted file mode 100644
index 9d2f40adf1..0000000000
--- a/rpcs3/Emu/Io/midi_config_types.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <string>
-
-static constexpr usz max_midi_devices = 3;
-
-enum class midi_device_type
-{
-	keyboard,
-	guitar,
-	guitar_22fret,
-	drums,
-};
-
-struct midi_device
-{
-	midi_device_type type{};
-	std::string name;
-
-	static midi_device from_string(const std::string& str);
-};
diff --git a/rpcs3/Emu/Io/mouse_config.cpp b/rpcs3/Emu/Io/mouse_config.cpp
deleted file mode 100644
index 07ec4b525a..0000000000
--- a/rpcs3/Emu/Io/mouse_config.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "stdafx.h"
-#include "mouse_config.h"
-#include "MouseHandler.h"
-#include "Utilities/File.h"
-
-mouse_config::mouse_config()
-	: cfg_name(fs::get_config_dir(true) + "config_mouse.yml")
-{
-}
-
-bool mouse_config::exist() const
-{
-	return fs::is_file(cfg_name);
-}
-
-bool mouse_config::load()
-{
-	g_cfg_mouse.from_default();
-
-	if (fs::file cfg_file{cfg_name, fs::read})
-	{
-		if (const std::string content = cfg_file.to_string(); !content.empty())
-		{
-			return from_string(content);
-		}
-	}
-
-	return false;
-}
-
-void mouse_config::save()
-{
-	fs::pending_file file(cfg_name);
-
-	if (file.file)
-	{
-		file.file.write(to_string());
-		file.commit();
-	}
-
-	reload_requested = true;
-}
-
-cfg::string& mouse_config::get_button(int code)
-{
-	switch (code)
-	{
-	case CELL_MOUSE_BUTTON_1: return mouse_button_1;
-	case CELL_MOUSE_BUTTON_2: return mouse_button_2;
-	case CELL_MOUSE_BUTTON_3: return mouse_button_3;
-	case CELL_MOUSE_BUTTON_4: return mouse_button_4;
-	case CELL_MOUSE_BUTTON_5: return mouse_button_5;
-	case CELL_MOUSE_BUTTON_6: return mouse_button_6;
-	case CELL_MOUSE_BUTTON_7: return mouse_button_7;
-	case CELL_MOUSE_BUTTON_8: return mouse_button_8;
-	default: fmt::throw_exception("Invalid code %d", code);
-	}
-}
diff --git a/rpcs3/Emu/Io/mouse_config.h b/rpcs3/Emu/Io/mouse_config.h
deleted file mode 100644
index 8b583a95fb..0000000000
--- a/rpcs3/Emu/Io/mouse_config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "Utilities/Config.h"
-
-// For simplicity's sake, there is only one config instead of 127 for MAX_MICE
-struct mouse_config final : cfg::node
-{
-	mouse_config();
-
-	const std::string cfg_name;
-
-	cfg::string mouse_button_1{ this, "Button 1", "Mouse Left", true };
-	cfg::string mouse_button_2{ this, "Button 2", "Mouse Right", true };
-	cfg::string mouse_button_3{ this, "Button 3", "Mouse Middle", true };
-	cfg::string mouse_button_4{ this, "Button 4", "", true };
-	cfg::string mouse_button_5{ this, "Button 5", "", true };
-	cfg::string mouse_button_6{ this, "Button 6", "", true };
-	cfg::string mouse_button_7{ this, "Button 7", "", true };
-	cfg::string mouse_button_8{ this, "Button 8", "", true };
-
-	atomic_t<bool> reload_requested = true;
-
-	bool exist() const;
-	bool load();
-	void save();
-
-	cfg::string& get_button(int code);
-};
-
-extern mouse_config g_cfg_mouse;
diff --git a/rpcs3/Emu/Io/music_handler_base.h b/rpcs3/Emu/Io/music_handler_base.h
deleted file mode 100644
index 8af59a938d..0000000000
--- a/rpcs3/Emu/Io/music_handler_base.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-#include "util/atomic.hpp"
-
-class music_handler_base
-{
-public:
-	enum class player_status
-	{
-		end_of_media
-	};
-
-	virtual ~music_handler_base() = default;
-
-	virtual void stop() = 0;
-	virtual void pause() = 0;
-	virtual void play(const std::string& path) = 0;
-	virtual void fast_forward(const std::string& path) = 0;
-	virtual void fast_reverse(const std::string& path) = 0;
-	virtual void set_volume(f32 volume) = 0;
-	virtual f32 get_volume() const = 0;
-
-	s32 get_state() const
-	{
-		return m_state;
-	}
-
-	void set_status_callback(std::function<void(player_status)> status_callback)
-	{
-		m_status_callback = std::move(status_callback);
-	}
-
-protected:
-	atomic_t<s32> m_state{0};
-	std::function<void(player_status status)> m_status_callback;
-};
diff --git a/rpcs3/Emu/Io/pad_config.cpp b/rpcs3/Emu/Io/pad_config.cpp
index fb0b140aeb..d68e1c1e23 100644
--- a/rpcs3/Emu/Io/pad_config.cpp
+++ b/rpcs3/Emu/Io/pad_config.cpp
@@ -4,107 +4,53 @@
 
 LOG_CHANNEL(input_log, "Input");
 
-extern std::string g_input_config_override;
-
-std::vector<std::string> cfg_pad::get_buttons(const std::string& str)
+bool cfg_input::load(const std::string& title_id, const std::string& profile, bool strict)
 {
-	std::vector<std::string> vec = fmt::split(str, {","});
-
-	// Handle special case: string contains separator itself as configured value
-	if (str == "," || str.find(",,") != umax)
-	{
-		vec.push_back(",");
-	}
-
-	// Remove duplicates
-	std::sort(vec.begin(), vec.end());
-	vec.erase(std::unique(vec.begin(), vec.end()), vec.end());
-
-	return vec;
-}
-
-std::string cfg_pad::get_buttons(std::vector<std::string> vec)
-{
-	// Remove duplicates
-	std::sort(vec.begin(), vec.end());
-	vec.erase(std::unique(vec.begin(), vec.end()), vec.end());
-
-	return fmt::merge(vec, ",");
-}
-
-u8 cfg_pad::get_large_motor_speed(const std::array<VibrateMotor, 2>& motor_speed) const
-{
-	const u8 idx = switch_vibration_motors ? 1 : 0;
-	const f32 multiplier = multiplier_vibration_motor_large / 100.0f;
-	return static_cast<u8>(std::clamp(motor_speed[idx].m_value * multiplier, 0.0f, 255.0f));
-}
-
-u8 cfg_pad::get_small_motor_speed(const std::array<VibrateMotor, 2>& motor_speed) const
-{
-	const u8 idx = switch_vibration_motors ? 0 : 1;
-	const f32 multiplier = multiplier_vibration_motor_small / 100.0f;
-	return static_cast<u8>(std::clamp(motor_speed[idx].m_value * multiplier, 0.0f, 255.0f));
-}
-
-bool cfg_input::load(const std::string& title_id, const std::string& config_file, bool strict)
-{
-	input_log.notice("Loading pad config (title_id='%s', config_file='%s', strict=%d)", title_id, config_file, strict);
-
+	// Check custom config first
 	std::string cfg_name;
 
-	// Check configuration override first
-	if (!strict && !g_input_config_override.empty())
+	if (title_id.empty())
 	{
-		cfg_name = rpcs3::utils::get_input_config_dir() + g_input_config_override + ".yml";
+		cfg_name = rpcs3::utils::get_input_config_dir() + profile + ".yml";
 	}
-
-	// Check custom config next
-	if (!title_id.empty() && !fs::is_file(cfg_name))
+	else
 	{
 		cfg_name = rpcs3::utils::get_custom_input_config_path(title_id);
 	}
 
-	// Check active global configuration next
-	if ((title_id.empty() || !strict) && !config_file.empty() && !fs::is_file(cfg_name))
-	{
-		cfg_name = rpcs3::utils::get_input_config_dir() + config_file + ".yml";
-	}
-
-	// Fallback to default configuration
 	if (!strict && !fs::is_file(cfg_name))
 	{
-		cfg_name = rpcs3::utils::get_input_config_dir() + g_cfg_input_configs.default_config + ".yml";
+		cfg_name = rpcs3::utils::get_input_config_dir() + g_cfg_profile.default_profile + ".yml";
 	}
 
 	from_default();
 
 	if (fs::file cfg_file{ cfg_name, fs::read })
 	{
-		input_log.notice("Loading input configuration: '%s'", cfg_name);
+		input_log.notice("Loading pad profile: '%s'", cfg_name);
 
-		if (const std::string content = cfg_file.to_string(); !content.empty())
+		if (std::string content = cfg_file.to_string(); !content.empty())
 		{
 			return from_string(content);
 		}
 	}
 
 	// Add keyboard by default
-	input_log.notice("Input configuration empty. Adding default keyboard pad handler");
+	input_log.notice("Pad profile empty. Adding default keyboard pad handler");
 	player[0]->handler.from_string(fmt::format("%s", pad_handler::keyboard));
 	player[0]->device.from_string(pad::keyboard_device_name.data());
-	player[0]->buddy_device.from_string(""sv);
 
 	return false;
 }
 
-void cfg_input::save(const std::string& title_id, const std::string& config_file) const
+void cfg_input::save(const std::string& title_id, const std::string& profile) const
 {
 	std::string cfg_name;
 
 	if (title_id.empty())
 	{
-		cfg_name = rpcs3::utils::get_input_config_dir() + config_file + ".yml";
-		input_log.notice("Saving input configuration '%s' to '%s'", config_file, cfg_name);
+		cfg_name = rpcs3::utils::get_input_config_dir() + profile + ".yml";
+		input_log.notice("Saving pad config profile '%s' to '%s'", profile, cfg_name);
 	}
 	else
 	{
@@ -117,18 +63,22 @@ void cfg_input::save(const std::string& title_id, const std::string& config_file
 		input_log.fatal("Failed to create path: %s (%s)", cfg_name, fs::g_tls_error);
 	}
 
-	if (!cfg::node::save(cfg_name))
+	if (auto cfg_file = fs::file(cfg_name, fs::rewrite))
 	{
-		input_log.error("Failed to save pad config to '%s' (error=%s)", cfg_name, fs::g_tls_error);
+		cfg_file.write(to_string());
+	}
+	else
+	{
+		input_log.error("Failed to save pad config to '%s'", cfg_name);
 	}
 }
 
-cfg_input_configurations::cfg_input_configurations()
-	: path(rpcs3::utils::get_input_config_root() + "/active_input_configurations.yml")
+cfg_profile::cfg_profile()
+	: path(rpcs3::utils::get_input_config_root() + "/active_profiles.yml")
 {
 }
 
-bool cfg_input_configurations::load()
+bool cfg_profile::load()
 {
 	if (fs::file cfg_file{ path, fs::read })
 	{
@@ -139,12 +89,16 @@ bool cfg_input_configurations::load()
 	return false;
 }
 
-void cfg_input_configurations::save() const
+void cfg_profile::save() const
 {
-	input_log.notice("Saving input configurations config to '%s'", path);
+	input_log.notice("Saving pad profile config to '%s'", path);
 
-	if (!cfg::node::save(path))
+	if (auto cfg_file = fs::file(path, fs::rewrite))
 	{
-		input_log.error("Failed to save input configurations config to '%s' (error=%s)", path, fs::g_tls_error);
+		cfg_file.write(to_string());
+	}
+	else
+	{
+		input_log.error("Failed to save pad profile config to '%s'", path);
 	}
 }
diff --git a/rpcs3/Emu/Io/pad_config.h b/rpcs3/Emu/Io/pad_config.h
index 7c39a79411..a9d5048d53 100644
--- a/rpcs3/Emu/Io/pad_config.h
+++ b/rpcs3/Emu/Io/pad_config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "pad_types.h"
+#include "pad_config_types.h"
 
 #include "Utilities/Config.h"
 
@@ -11,26 +11,11 @@ namespace pad
 	constexpr static std::string_view keyboard_device_name = "Keyboard";
 }
 
-struct cfg_sensor final : cfg::node
-{
-	cfg_sensor(node* owner, const std::string& name) : cfg::node(owner, name) {}
-
-	cfg::string axis{ this, "Axis", "" };
-	cfg::_bool mirrored{ this, "Mirrored", false };
-	cfg::_int<-1023, 1023> shift{ this, "Shift", 0 };
-};
-
 struct cfg_pad final : cfg::node
 {
 	cfg_pad() {};
 	cfg_pad(node* owner, const std::string& name) : cfg::node(owner, name) {}
 
-	static std::vector<std::string> get_buttons(const std::string& str);
-	static std::string get_buttons(std::vector<std::string> vec);
-
-	u8 get_large_motor_speed(const std::array<VibrateMotor, 2>& motor_speed) const;
-	u8 get_small_motor_speed(const std::array<VibrateMotor, 2>& motor_speed) const;
-
 	cfg::string ls_left{ this, "Left Stick Left", "" };
 	cfg::string ls_down{ this, "Left Stick Down", "" };
 	cfg::string ls_right{ this, "Left Stick Right", "" };
@@ -57,38 +42,17 @@ struct cfg_pad final : cfg::node
 	cfg::string l2{ this, "L2", "" };
 	cfg::string l3{ this, "L3", "" };
 
-	cfg::string ir_nose{ this, "IR Nose", "" };
-	cfg::string ir_tail{ this, "IR Tail", "" };
-	cfg::string ir_left{ this, "IR Left", "" };
-	cfg::string ir_right{ this, "IR Right", "" };
-	cfg::string tilt_left{ this, "Tilt Left", "" };
-	cfg::string tilt_right{ this, "Tilt Right", "" };
-
-	cfg_sensor motion_sensor_x{ this, "Motion Sensor X" };
-	cfg_sensor motion_sensor_y{ this, "Motion Sensor Y" };
-	cfg_sensor motion_sensor_z{ this, "Motion Sensor Z" };
-	cfg_sensor motion_sensor_g{ this, "Motion Sensor G" };
-
-	cfg::string orientation_reset_button{ this, "Orientation Reset Button", "" };
-	cfg::_bool orientation_enabled{ this, "Orientation Enabled", false };
-
 	cfg::string pressure_intensity_button{ this, "Pressure Intensity Button", "" };
 	cfg::uint<0, 100> pressure_intensity{ this, "Pressure Intensity Percent", 50 };
-	cfg::_bool pressure_intensity_toggle_mode{ this, "Pressure Intensity Toggle Mode", false };
-	cfg::uint<0, 255> pressure_intensity_deadzone{ this, "Pressure Intensity Deadzone", 0 };
 
-	cfg::string analog_limiter_button{ this, "Analog Limiter Button", "" };
-	cfg::_bool analog_limiter_toggle_mode{ this, "Analog Limiter Toggle Mode", false };
 	cfg::uint<0, 200> lstickmultiplier{ this, "Left Stick Multiplier", 100 };
 	cfg::uint<0, 200> rstickmultiplier{ this, "Right Stick Multiplier", 100 };
 	cfg::uint<0, 1000000> lstickdeadzone{ this, "Left Stick Deadzone", 0 };
 	cfg::uint<0, 1000000> rstickdeadzone{ this, "Right Stick Deadzone", 0 };
-	cfg::uint<0, 1000000> lstick_anti_deadzone{ this, "Left Stick Anti-Deadzone", 0 };
-	cfg::uint<0, 1000000> rstick_anti_deadzone{ this, "Right Stick Anti-Deadzone", 0 };
 	cfg::uint<0, 1000000> ltriggerthreshold{ this, "Left Trigger Threshold", 0 };
 	cfg::uint<0, 1000000> rtriggerthreshold{ this, "Right Trigger Threshold", 0 };
-	cfg::uint<0, 1000000> lpadsquircling{ this, "Left Pad Squircling Factor", 8000 };
-	cfg::uint<0, 1000000> rpadsquircling{ this, "Right Pad Squircling Factor", 8000 };
+	cfg::uint<0, 1000000> lpadsquircling{ this, "Left Pad Squircling Factor", 0 };
+	cfg::uint<0, 1000000> rpadsquircling{ this, "Right Pad Squircling Factor", 0 };
 
 	cfg::uint<0, 255> colorR{ this, "Color Value R", 0 };
 	cfg::uint<0, 255> colorG{ this, "Color Value G", 0 };
@@ -97,24 +61,22 @@ struct cfg_pad final : cfg::node
 	cfg::_bool led_low_battery_blink{ this, "Blink LED when battery is below 20%", true };
 	cfg::_bool led_battery_indicator{ this, "Use LED as a battery indicator", false };
 	cfg::uint<0, 100> led_battery_indicator_brightness{ this, "LED battery indicator brightness", 50 };
-	cfg::_bool player_led_enabled{ this, "Player LED enabled", true };
 
-	cfg::uint<0, 200> multiplier_vibration_motor_large{ this, "Large Vibration Motor Multiplier", 100 };
-	cfg::uint<0, 200> multiplier_vibration_motor_small{ this, "Small Vibration Motor Multiplier", 100 };
+	cfg::_bool enable_vibration_motor_large{ this, "Enable Large Vibration Motor", true };
+	cfg::_bool enable_vibration_motor_small{ this, "Enable Small Vibration Motor", true };
 	cfg::_bool switch_vibration_motors{ this, "Switch Vibration Motors", false };
 
-	cfg::_enum<mouse_movement_mode> mouse_move_mode{ this, "Mouse Movement Mode", mouse_movement_mode::relative };
 	cfg::uint<0, 255> mouse_deadzone_x{ this, "Mouse Deadzone X Axis", 60 };
 	cfg::uint<0, 255> mouse_deadzone_y{ this, "Mouse Deadzone Y Axis", 60 };
-	cfg::uint<0, 999999> mouse_acceleration_x{ this, "Mouse Acceleration X Axis", 200 };
-	cfg::uint<0, 999999> mouse_acceleration_y{ this, "Mouse Acceleration Y Axis", 250 };
+	cfg::uint<0, 3000> mouse_acceleration_x{ this, "Mouse Acceleration X Axis", 200 };
+	cfg::uint<0, 3000> mouse_acceleration_y{ this, "Mouse Acceleration Y Axis", 250 };
 
 	cfg::uint<0, 100> l_stick_lerp_factor{ this, "Left Stick Lerp Factor", 100 };
 	cfg::uint<0, 100> r_stick_lerp_factor{ this, "Right Stick Lerp Factor", 100 };
 	cfg::uint<0, 100> analog_lerp_factor{ this, "Analog Button Lerp Factor", 100 };
 	cfg::uint<0, 100> trigger_lerp_factor{ this, "Trigger Lerp Factor", 100 };
 
-	cfg::uint<CELL_PAD_PCLASS_TYPE_STANDARD, CELL_PAD_PCLASS_TYPE_MAX> device_class_type{ this, "Device Class Type", 0 };
+	cfg::uint<0, 5> device_class_type{ this, "Device Class Type", 0 };
 	cfg::uint<0, 65535> vendor_id{ this, "Vendor ID", 0 };
 	cfg::uint<0, 65535> product_id{ this, "Product ID", 0 };
 };
@@ -125,11 +87,8 @@ struct cfg_player final : cfg::node
 	cfg_player(node* owner, const std::string& name, pad_handler type) : cfg::node(owner, name), def_handler(type) {}
 
 	cfg::_enum<pad_handler> handler{ this, "Handler", def_handler };
-
 	cfg::string device{ this, "Device", handler.to_string() };
 	cfg_pad config{ this, "Config" };
-
-	cfg::string buddy_device{ this, "Buddy Device", handler.to_string() };
 };
 
 struct cfg_input final : cfg::node
@@ -148,18 +107,18 @@ struct cfg_input final : cfg::node
 	void save(const std::string& title_id, const std::string& profile = "") const;
 };
 
-struct cfg_input_configurations final : cfg::node
+struct cfg_profile final : cfg::node
 {
-	cfg_input_configurations();
+	cfg_profile();
 	bool load();
 	void save() const;
 
 	const std::string path;
 	const std::string global_key = "global";
-	const std::string default_config = "Default";
+	const std::string default_profile = "Default";
 
-	cfg::map_entry active_configs{ this, "Active Configurations" };
+	cfg::map_entry active_profiles{ this, "Active Profiles" };
 };
 
 extern cfg_input g_cfg_input;
-extern cfg_input_configurations g_cfg_input_configs;
+extern cfg_profile g_cfg_profile;
diff --git a/rpcs3/Emu/Io/pad_config_types.cpp b/rpcs3/Emu/Io/pad_config_types.cpp
index e09be8a4e0..733bf6b393 100644
--- a/rpcs3/Emu/Io/pad_config_types.cpp
+++ b/rpcs3/Emu/Io/pad_config_types.cpp
@@ -13,15 +13,10 @@ void fmt_class_string<pad_handler>::format(std::string& out, u64 arg)
 		case pad_handler::ds3: return "DualShock 3";
 		case pad_handler::ds4: return "DualShock 4";
 		case pad_handler::dualsense: return "DualSense";
-		case pad_handler::skateboard: return "Skateboard";
-		case pad_handler::move: return "PS Move";
 #ifdef _WIN32
 		case pad_handler::xinput: return "XInput";
 		case pad_handler::mm: return "MMJoystick";
 #endif
-#ifdef HAVE_SDL3
-		case pad_handler::sdl: return "SDL";
-#endif
 #ifdef HAVE_LIBEVDEV
 		case pad_handler::evdev: return "Evdev";
 #endif
@@ -30,18 +25,3 @@ void fmt_class_string<pad_handler>::format(std::string& out, u64 arg)
 		return unknown;
 	});
 }
-
-template <>
-void fmt_class_string<mouse_movement_mode>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](mouse_movement_mode value)
-	{
-		switch (value)
-		{
-		case mouse_movement_mode::relative: return "Relative";
-		case mouse_movement_mode::absolute: return "Absolute";
-		}
-
-		return unknown;
-	});
-}
diff --git a/rpcs3/Emu/Io/pad_config_types.h b/rpcs3/Emu/Io/pad_config_types.h
index 36fc8328fa..94e6d31186 100644
--- a/rpcs3/Emu/Io/pad_config_types.h
+++ b/rpcs3/Emu/Io/pad_config_types.h
@@ -9,29 +9,18 @@ enum class pad_handler
 	ds3,
 	ds4,
 	dualsense,
-	skateboard,
-	move,
 #ifdef _WIN32
 	xinput,
 	mm,
 #endif
-#ifdef HAVE_SDL3
-	sdl,
-#endif
 #ifdef HAVE_LIBEVDEV
 	evdev,
 #endif
 };
 
-enum class mouse_movement_mode : s32
-{
-	relative = 0,
-	absolute = 1
-};
-
 struct PadInfo
 {
-	u32 now_connect = 0;
-	u32 system_info = 0;
-	bool ignore_input = false;
+	u32 now_connect;
+	u32 system_info;
+	bool ignore_input;
 };
diff --git a/rpcs3/Emu/Io/pad_types.cpp b/rpcs3/Emu/Io/pad_types.cpp
deleted file mode 100644
index 428e0d6cea..0000000000
--- a/rpcs3/Emu/Io/pad_types.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-#include "stdafx.h"
-#include "pad_types.h"
-#include "Emu/system_config.h"
-#include "Emu/RSX/Overlays/overlay_message.h"
-
-template <>
-void fmt_class_string<pad_button>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](pad_button value)
-	{
-		switch (value)
-		{
-		case pad_button::dpad_up: return "D-Pad Up";
-		case pad_button::dpad_down: return "D-Pad Down";
-		case pad_button::dpad_left: return "D-Pad Left";
-		case pad_button::dpad_right: return "D-Pad Right";
-		case pad_button::select: return "Select";
-		case pad_button::start: return "Start";
-		case pad_button::ps: return "PS";
-		case pad_button::triangle: return "Triangle";
-		case pad_button::circle: return "Circle";
-		case pad_button::square: return "Square";
-		case pad_button::cross: return "Cross";
-		case pad_button::L1: return "L1";
-		case pad_button::R1: return "R1";
-		case pad_button::L2: return "L2";
-		case pad_button::R2: return "R2";
-		case pad_button::L3: return "L3";
-		case pad_button::R3: return "R3";
-		case pad_button::ls_up: return "Left Stick Up";
-		case pad_button::ls_down: return "Left Stick Down";
-		case pad_button::ls_left: return "Left Stick Left";
-		case pad_button::ls_right: return "Left Stick Right";
-		case pad_button::ls_x: return "Left Stick X-Axis";
-		case pad_button::ls_y: return "Left Stick Y-Axis";
-		case pad_button::rs_up: return "Right Stick Up";
-		case pad_button::rs_down: return "Right Stick Down";
-		case pad_button::rs_left: return "Right Stick Left";
-		case pad_button::rs_right: return "Right Stick Right";
-		case pad_button::rs_x: return "Right Stick X-Axis";
-		case pad_button::rs_y: return "Right Stick Y-Axis";
-		case pad_button::pad_button_max_enum: return "";
-		case pad_button::mouse_button_1: return "Mouse Button 1";
-		case pad_button::mouse_button_2: return "Mouse Button 2";
-		case pad_button::mouse_button_3: return "Mouse Button 3";
-		case pad_button::mouse_button_4: return "Mouse Button 4";
-		case pad_button::mouse_button_5: return "Mouse Button 5";
-		case pad_button::mouse_button_6: return "Mouse Button 6";
-		case pad_button::mouse_button_7: return "Mouse Button 7";
-		case pad_button::mouse_button_8: return "Mouse Button 8";
-		}
-
-		return unknown;
-	});
-}
-
-u32 pad_button_offset(pad_button button)
-{
-	switch (button)
-	{
-	case pad_button::dpad_up: return CELL_PAD_BTN_OFFSET_DIGITAL1;
-	case pad_button::dpad_down: return CELL_PAD_BTN_OFFSET_DIGITAL1;
-	case pad_button::dpad_left: return CELL_PAD_BTN_OFFSET_DIGITAL1;
-	case pad_button::dpad_right: return CELL_PAD_BTN_OFFSET_DIGITAL1;
-	case pad_button::select: return CELL_PAD_BTN_OFFSET_DIGITAL1;
-	case pad_button::start: return CELL_PAD_BTN_OFFSET_DIGITAL1;
-	case pad_button::ps: return CELL_PAD_BTN_OFFSET_DIGITAL1;
-	case pad_button::triangle: return CELL_PAD_BTN_OFFSET_DIGITAL2;
-	case pad_button::circle: return CELL_PAD_BTN_OFFSET_DIGITAL2;
-	case pad_button::square: return CELL_PAD_BTN_OFFSET_DIGITAL2;
-	case pad_button::cross: return CELL_PAD_BTN_OFFSET_DIGITAL2;
-	case pad_button::L1: return CELL_PAD_BTN_OFFSET_DIGITAL2;
-	case pad_button::R1: return CELL_PAD_BTN_OFFSET_DIGITAL2;
-	case pad_button::L2: return CELL_PAD_BTN_OFFSET_DIGITAL2;
-	case pad_button::R2: return CELL_PAD_BTN_OFFSET_DIGITAL2;
-	case pad_button::L3: return CELL_PAD_BTN_OFFSET_DIGITAL1;
-	case pad_button::R3: return CELL_PAD_BTN_OFFSET_DIGITAL1;
-	case pad_button::ls_up: return CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y;
-	case pad_button::ls_down: return CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y;
-	case pad_button::ls_left: return CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X;
-	case pad_button::ls_right: return CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X;
-	case pad_button::ls_x: return CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X;
-	case pad_button::ls_y: return CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y;
-	case pad_button::rs_up: return CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y;
-	case pad_button::rs_down: return CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y;
-	case pad_button::rs_left: return CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X;
-	case pad_button::rs_right: return CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X;
-	case pad_button::rs_x: return CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X;
-	case pad_button::rs_y: return CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y;
-	case pad_button::pad_button_max_enum:
-	case pad_button::mouse_button_1:
-	case pad_button::mouse_button_2:
-	case pad_button::mouse_button_3:
-	case pad_button::mouse_button_4:
-	case pad_button::mouse_button_5:
-	case pad_button::mouse_button_6:
-	case pad_button::mouse_button_7:
-	case pad_button::mouse_button_8:
-		return 0;
-	}
-	return 0;
-}
-
-u32 pad_button_keycode(pad_button button)
-{
-	switch (button)
-	{
-	case pad_button::dpad_up: return CELL_PAD_CTRL_UP;
-	case pad_button::dpad_down: return CELL_PAD_CTRL_DOWN;
-	case pad_button::dpad_left: return CELL_PAD_CTRL_LEFT;
-	case pad_button::dpad_right: return CELL_PAD_CTRL_RIGHT;
-	case pad_button::select: return CELL_PAD_CTRL_SELECT;
-	case pad_button::start: return CELL_PAD_CTRL_START;
-	case pad_button::ps: return CELL_PAD_CTRL_PS;
-	case pad_button::triangle: return CELL_PAD_CTRL_TRIANGLE;
-	case pad_button::circle: return CELL_PAD_CTRL_CIRCLE;
-	case pad_button::square: return CELL_PAD_CTRL_SQUARE;
-	case pad_button::cross: return CELL_PAD_CTRL_CROSS;
-	case pad_button::L1: return CELL_PAD_CTRL_L1;
-	case pad_button::R1: return CELL_PAD_CTRL_R1;
-	case pad_button::L2: return CELL_PAD_CTRL_L2;
-	case pad_button::R2: return CELL_PAD_CTRL_R2;
-	case pad_button::L3: return CELL_PAD_CTRL_L3;
-	case pad_button::R3: return CELL_PAD_CTRL_R3;
-	case pad_button::ls_up: return static_cast<u32>(axis_direction::positive);
-	case pad_button::ls_down: return static_cast<u32>(axis_direction::negative);
-	case pad_button::ls_left: return static_cast<u32>(axis_direction::negative);
-	case pad_button::ls_right: return static_cast<u32>(axis_direction::positive);
-	case pad_button::ls_x: return static_cast<u32>(axis_direction::both);
-	case pad_button::ls_y: return static_cast<u32>(axis_direction::both);
-	case pad_button::rs_up: return static_cast<u32>(axis_direction::positive);
-	case pad_button::rs_down: return static_cast<u32>(axis_direction::negative);
-	case pad_button::rs_left: return static_cast<u32>(axis_direction::negative);
-	case pad_button::rs_right: return static_cast<u32>(axis_direction::positive);
-	case pad_button::rs_x: return static_cast<u32>(axis_direction::both);
-	case pad_button::rs_y: return static_cast<u32>(axis_direction::both);
-	case pad_button::pad_button_max_enum: return 0;
-	case pad_button::mouse_button_1: return 1;
-	case pad_button::mouse_button_2: return 2;
-	case pad_button::mouse_button_3: return 3;
-	case pad_button::mouse_button_4: return 4;
-	case pad_button::mouse_button_5: return 5;
-	case pad_button::mouse_button_6: return 6;
-	case pad_button::mouse_button_7: return 7;
-	case pad_button::mouse_button_8: return 8;
-	}
-	return 0;
-}
-
-u32 get_axis_keycode(u32 offset, u16 value)
-{
-	switch (offset)
-	{
-	case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X:  return static_cast<u32>(value > 127 ? axis_direction::positive : axis_direction::negative);
-	case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y:  return static_cast<u32>(value < 128 ? axis_direction::positive : axis_direction::negative);
-	case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X: return static_cast<u32>(value > 127 ? axis_direction::positive : axis_direction::negative);
-	case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y: return static_cast<u32>(value < 128 ? axis_direction::positive : axis_direction::negative);
-	default: return static_cast<u32>(axis_direction::both);
-	}
-}
-
-void ps_move_data::reset_sensors()
-{
-	quaternion = default_quaternion;
-	accelerometer_x = 0.0f;
-	accelerometer_y = 0.0f;
-	accelerometer_z = 0.0f;
-	gyro_x = 0.0f;
-	gyro_y = 0.0f;
-	gyro_z = 0.0f;
-	magnetometer_x = 0.0f;
-	magnetometer_y = 0.0f;
-	magnetometer_z = 0.0f;
-}
-
-bool Pad::get_pressure_intensity_button_active(bool is_toggle_mode, u32 player_id)
-{
-	if (m_pressure_intensity_button_index < 0)
-	{
-		return false;
-	}
-
-	const Button& pressure_intensity_button = m_buttons[m_pressure_intensity_button_index];
-
-	if (is_toggle_mode)
-	{
-		const bool pressed = pressure_intensity_button.m_pressed;
-
-		if (std::exchange(m_pressure_intensity_button_pressed, pressed) != pressed)
-		{
-			if (pressed)
-			{
-				m_pressure_intensity_toggled = !m_pressure_intensity_toggled;
-
-				if (g_cfg.misc.show_pressure_intensity_toggle_hint)
-				{
-					const std::string player_id_string = std::to_string(player_id + 1);
-					if (m_pressure_intensity_toggled)
-					{
-						rsx::overlays::queue_message(get_localized_string(localized_string_id::RSX_OVERLAYS_PRESSURE_INTENSITY_TOGGLED_ON, player_id_string.c_str()), 3'000'000);
-					}
-					else
-					{
-						rsx::overlays::queue_message(get_localized_string(localized_string_id::RSX_OVERLAYS_PRESSURE_INTENSITY_TOGGLED_OFF, player_id_string.c_str()), 3'000'000);
-					}
-				}
-			}
-		}
-
-		return m_pressure_intensity_toggled;
-	}
-
-	return pressure_intensity_button.m_pressed;
-}
-
-bool Pad::get_analog_limiter_button_active(bool is_toggle_mode, u32 player_id)
-{
-	if (m_analog_limiter_button_index < 0)
-	{
-		return false;
-	}
-
-	const Button& analog_limiter_button = m_buttons[m_analog_limiter_button_index];
-
-	if (is_toggle_mode)
-	{
-		const bool pressed = analog_limiter_button.m_pressed;
-
-		if (std::exchange(m_analog_limiter_button_pressed, pressed) != pressed)
-		{
-			if (pressed)
-			{
-				m_analog_limiter_toggled = !m_analog_limiter_toggled;
-
-				if (g_cfg.misc.show_analog_limiter_toggle_hint)
-				{
-					const std::string player_id_string = std::to_string(player_id + 1);
-					if (m_analog_limiter_toggled)
-					{
-						rsx::overlays::queue_message(get_localized_string(localized_string_id::RSX_OVERLAYS_ANALOG_LIMITER_TOGGLED_ON, player_id_string.c_str()), 3'000'000);
-					}
-					else
-					{
-						rsx::overlays::queue_message(get_localized_string(localized_string_id::RSX_OVERLAYS_ANALOG_LIMITER_TOGGLED_OFF, player_id_string.c_str()), 3'000'000);
-					}
-				}
-			}
-		}
-
-		return m_analog_limiter_toggled;
-	}
-
-	return analog_limiter_button.m_pressed;
-}
-
-bool Pad::get_orientation_reset_button_active()
-{
-	if (m_orientation_reset_button_index < 0)
-	{
-		return false;
-	}
-
-	return m_buttons[m_orientation_reset_button_index].m_pressed;
-}
diff --git a/rpcs3/Emu/Io/pad_types.h b/rpcs3/Emu/Io/pad_types.h
index ecbadff3bf..d3841ddc71 100644
--- a/rpcs3/Emu/Io/pad_types.h
+++ b/rpcs3/Emu/Io/pad_types.h
@@ -1,71 +1,9 @@
 #pragma once
 
 #include "util/types.hpp"
-#include "util/endian.hpp"
-#include "Emu/Io/pad_config_types.h"
 
-#include <map>
-#include <set>
 #include <vector>
 
-enum class pad_button : u8
-{
-	dpad_up = 0,
-	dpad_down,
-	dpad_left,
-	dpad_right,
-	select,
-	start,
-	ps,
-	triangle,
-	circle,
-	square,
-	cross,
-	L1,
-	R1,
-	L2,
-	R2,
-	L3,
-	R3,
-
-	ls_up,
-	ls_down,
-	ls_left,
-	ls_right,
-	ls_x,
-	ls_y,
-	rs_up,
-	rs_down,
-	rs_left,
-	rs_right,
-	rs_x,
-	rs_y,
-
-	pad_button_max_enum,
-
-	// Special buttons for mouse input
-	mouse_button_1,
-	mouse_button_2,
-	mouse_button_3,
-	mouse_button_4,
-	mouse_button_5,
-	mouse_button_6,
-	mouse_button_7,
-	mouse_button_8,
-};
-
-u32 pad_button_offset(pad_button button);
-u32 pad_button_keycode(pad_button button);
-
-enum class axis_direction : u8
-{
-	both = 0,
-	negative,
-	positive
-};
-
-u32 get_axis_keycode(u32 offset, u16 value);
-
 enum SystemInfo
 {
 	CELL_PAD_INFO_INTERCEPTED = 0x00000001
@@ -88,34 +26,28 @@ enum PortSettings
 	CELL_PAD_SETTING_SENSOR_OFF = 0x00000000,
 };
 
-enum Digital1Flags : u32
+enum Digital1Flags
 {
+	CELL_PAD_CTRL_LEFT = 0x00000080,
+	CELL_PAD_CTRL_DOWN = 0x00000040,
+	CELL_PAD_CTRL_RIGHT = 0x00000020,
+	CELL_PAD_CTRL_UP = 0x00000010,
+	CELL_PAD_CTRL_START = 0x00000008,
+	CELL_PAD_CTRL_R3 = 0x00000004,
+	CELL_PAD_CTRL_L3 = 0x00000002,
 	CELL_PAD_CTRL_SELECT = 0x00000001,
-	CELL_PAD_CTRL_L3     = 0x00000002,
-	CELL_PAD_CTRL_R3     = 0x00000004,
-	CELL_PAD_CTRL_START  = 0x00000008,
-	CELL_PAD_CTRL_UP     = 0x00000010,
-	CELL_PAD_CTRL_RIGHT  = 0x00000020,
-	CELL_PAD_CTRL_DOWN   = 0x00000040,
-	CELL_PAD_CTRL_LEFT   = 0x00000080,
-	CELL_PAD_CTRL_PS     = 0x00000100,
 };
 
-enum Digital2Flags : u32
+enum Digital2Flags
 {
-	CELL_PAD_CTRL_L2       = 0x00000001,
-	CELL_PAD_CTRL_R2       = 0x00000002,
-	CELL_PAD_CTRL_L1       = 0x00000004,
-	CELL_PAD_CTRL_R1       = 0x00000008,
+	CELL_PAD_CTRL_SQUARE = 0x00000080,
+	CELL_PAD_CTRL_CROSS = 0x00000040,
+	CELL_PAD_CTRL_CIRCLE = 0x00000020,
 	CELL_PAD_CTRL_TRIANGLE = 0x00000010,
-	CELL_PAD_CTRL_CIRCLE   = 0x00000020,
-	CELL_PAD_CTRL_CROSS    = 0x00000040,
-	CELL_PAD_CTRL_SQUARE   = 0x00000080,
-};
-
-enum
-{
-	CELL_PAD_CTRL_LDD_PS = 0x00000001
+	CELL_PAD_CTRL_R1 = 0x00000008,
+	CELL_PAD_CTRL_L1 = 0x00000004,
+	CELL_PAD_CTRL_R2 = 0x00000002,
+	CELL_PAD_CTRL_L2 = 0x00000001,
 };
 
 enum DeviceCapability
@@ -134,110 +66,6 @@ enum DeviceType
 	CELL_PAD_DEV_TYPE_LDD = 5,
 };
 
-// Controller types
-enum
-{
-	CELL_PAD_PCLASS_TYPE_STANDARD   = 0x00,
-	CELL_PAD_PCLASS_TYPE_GUITAR     = 0x01,
-	CELL_PAD_PCLASS_TYPE_DRUM       = 0x02,
-	CELL_PAD_PCLASS_TYPE_DJ         = 0x03,
-	CELL_PAD_PCLASS_TYPE_DANCEMAT   = 0x04,
-	CELL_PAD_PCLASS_TYPE_NAVIGATION = 0x05,
-	CELL_PAD_PCLASS_TYPE_SKATEBOARD = 0x8001,
-
-	// these are used together with pad->is_fake_pad to capture input events for usbd/gem/move without conflicting with cellPad
-	CELL_PAD_FAKE_TYPE_FIRST               = 0xa000,
-	CELL_PAD_FAKE_TYPE_GUNCON3             = 0xa000,
-	CELL_PAD_FAKE_TYPE_TOP_SHOT_ELITE      = 0xa001,
-	CELL_PAD_FAKE_TYPE_TOP_SHOT_FEARMASTER = 0xa002,
-	CELL_PAD_FAKE_TYPE_GAMETABLET          = 0xa003,
-	CELL_PAD_FAKE_TYPE_COPILOT_1           = 0xa004,
-	CELL_PAD_FAKE_TYPE_COPILOT_2           = 0xa005,
-	CELL_PAD_FAKE_TYPE_COPILOT_3           = 0xa006,
-	CELL_PAD_FAKE_TYPE_COPILOT_4           = 0xa007,
-	CELL_PAD_FAKE_TYPE_COPILOT_5           = 0xa008,
-	CELL_PAD_FAKE_TYPE_COPILOT_6           = 0xa009,
-	CELL_PAD_FAKE_TYPE_COPILOT_7           = 0xa00a,
-	CELL_PAD_FAKE_TYPE_LAST,
-
-	CELL_PAD_PCLASS_TYPE_MAX // last item
-};
-
-// 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
-};
-
 enum ButtonDataOffset
 {
 	CELL_PAD_BTN_OFFSET_DIGITAL1 = 2,
@@ -262,9 +90,6 @@ enum ButtonDataOffset
 	CELL_PAD_BTN_OFFSET_SENSOR_Y = 21,
 	CELL_PAD_BTN_OFFSET_SENSOR_Z = 22,
 	CELL_PAD_BTN_OFFSET_SENSOR_G = 23,
-
-	// Fake helpers
-	CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK,
 };
 
 enum CellPadPeriphGuitarBtnDataOffset
@@ -338,63 +163,30 @@ enum
 	CELL_MAX_PADS = 127,
 };
 
-struct CellPadData
-{
-	be_t<s32> len;
-	be_t<u16> button[CELL_PAD_MAX_CODES];
-};
-
-static constexpr u16 MOTION_ONE_G = 113;
-static constexpr u16 DEFAULT_MOTION_X = 512;
-static constexpr u16 DEFAULT_MOTION_Y = 399; // 512 - 113 (113 is 1G gravity)
-static constexpr u16 DEFAULT_MOTION_Z = 512;
-static constexpr u16 DEFAULT_MOTION_G = 512;
-
-// Fake helper enum
-enum PressurePiggybackFlags : u32
-{
-	CELL_PAD_CTRL_PRESS_RIGHT    = CELL_PAD_BTN_OFFSET_PRESS_RIGHT,
-	CELL_PAD_CTRL_PRESS_LEFT     = CELL_PAD_BTN_OFFSET_PRESS_LEFT,
-	CELL_PAD_CTRL_PRESS_UP       = CELL_PAD_BTN_OFFSET_PRESS_UP,
-	CELL_PAD_CTRL_PRESS_DOWN     = CELL_PAD_BTN_OFFSET_PRESS_DOWN,
-	CELL_PAD_CTRL_PRESS_TRIANGLE = CELL_PAD_BTN_OFFSET_PRESS_TRIANGLE,
-	CELL_PAD_CTRL_PRESS_CIRCLE   = CELL_PAD_BTN_OFFSET_PRESS_CIRCLE,
-	CELL_PAD_CTRL_PRESS_CROSS    = CELL_PAD_BTN_OFFSET_PRESS_CROSS,
-	CELL_PAD_CTRL_PRESS_SQUARE   = CELL_PAD_BTN_OFFSET_PRESS_SQUARE,
-	CELL_PAD_CTRL_PRESS_L1       = CELL_PAD_BTN_OFFSET_PRESS_L1,
-	CELL_PAD_CTRL_PRESS_R1       = CELL_PAD_BTN_OFFSET_PRESS_R1,
-	CELL_PAD_CTRL_PRESS_L2       = CELL_PAD_BTN_OFFSET_PRESS_L2,
-	CELL_PAD_CTRL_PRESS_R2       = CELL_PAD_BTN_OFFSET_PRESS_R2,
-};
 
 constexpr u32 special_button_offset = 666; // Must not conflict with other CELL offsets like ButtonDataOffset
 
 enum special_button_value
 {
-	pressure_intensity,
-	analog_limiter,
-	orientation_reset
+	pressure_intensity
 };
 
 struct Button
 {
-	u32 m_offset = 0;
-	u32 m_outKeyCode = 0;
+	u32 m_offset;
+	u32 m_keyCode;
+	u32 m_outKeyCode;
 	u16 m_value    = 0;
 	bool m_pressed = false;
 
-	std::set<u32> m_key_codes{};
+	u16 m_actual_value = 0;     // only used in keyboard_pad_handler
+	bool m_analog      = false; // only used in keyboard_pad_handler
+	bool m_trigger     = false; // only used in keyboard_pad_handler
 
-	u16 m_actual_value = 0;              // only used in keyboard_pad_handler
-	bool m_analog      = false;          // only used in keyboard_pad_handler
-	bool m_trigger     = false;          // only used in keyboard_pad_handler
-	std::map<u32, u16> m_pressed_keys{}; // only used in keyboard_pad_handler
-
-	Button(){}
-	Button(u32 offset, std::set<u32> key_codes, u32 outKeyCode)
+	Button(u32 offset, u32 keyCode, u32 outKeyCode)
 		: m_offset(offset)
+		, m_keyCode(keyCode)
 		, m_outKeyCode(outKeyCode)
-		, m_key_codes(std::move(key_codes))
 	{
 		if (offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
 		{
@@ -420,90 +212,43 @@ struct Button
 
 struct AnalogStick
 {
-	u32 m_offset = 0;
+	u32 m_offset;
+	u32 m_keyCodeMin;
+	u32 m_keyCodeMax;
 	u16 m_value = 128;
 
-	std::set<u32> m_key_codes_min{};
-	std::set<u32> m_key_codes_max{};
-
-	std::map<u32, u16> m_pressed_keys_min{}; // only used in keyboard_pad_handler
-	std::map<u32, u16> m_pressed_keys_max{}; // only used in keyboard_pad_handler
-
-	AnalogStick() {}
-	AnalogStick(u32 offset, std::set<u32> key_codes_min, std::set<u32> key_codes_max)
+	AnalogStick(u32 offset, u32 keyCodeMin, u32 keyCodeMax)
 		: m_offset(offset)
-		, m_key_codes_min(std::move(key_codes_min))
-		, m_key_codes_max(std::move(key_codes_max))
-	{}
+		, m_keyCodeMin(keyCodeMin)
+		, m_keyCodeMax(keyCodeMax)
+	{
+	}
 };
 
 struct AnalogSensor
 {
-	u32 m_offset = 0;
-	u32 m_keyCode = 0;
-	b8 m_mirrored = false;
-	s16 m_shift = 0;
-	u16 m_value = 0;
+	u32 m_offset;
+	u16 m_value;
 
-	AnalogSensor() {}
-	AnalogSensor(u32 offset, u32 key_code, b8 mirrored, s16 shift, u16 value)
+	AnalogSensor(u32 offset, u16 value)
 		: m_offset(offset)
-		, m_keyCode(key_code)
-		, m_mirrored(mirrored)
-		, m_shift(shift)
 		, m_value(value)
 	{}
 };
 
 struct VibrateMotor
 {
-	bool m_is_large_motor = false;
-	u8 m_value = 0;
+	bool m_isLargeMotor;
+	u16 m_value;
 
-	VibrateMotor() {}
-	VibrateMotor(bool is_large_motor, u8 value)
-		: m_is_large_motor(is_large_motor)
+	VibrateMotor(bool largeMotor, u16 value)
+		: m_isLargeMotor(largeMotor)
 		, m_value(value)
 	{}
 };
 
-struct ps_move_data
-{
-	u32 external_device_id = 0;
-	std::array<u8, 38> external_device_read{};  // CELL_GEM_EXTERNAL_PORT_DEVICE_INFO_SIZE
-	std::array<u8, 40> external_device_write{}; // CELL_GEM_EXTERNAL_PORT_OUTPUT_SIZE
-	std::array<u8, 5> external_device_data{};
-	bool external_device_connected = false;
-	bool external_device_read_requested = false;
-	bool external_device_write_requested = false;
-
-	bool calibration_requested = false;
-	bool calibration_succeeded = false;
-
-	bool magnetometer_enabled = false;
-	bool orientation_enabled = false;
-
-	static constexpr std::array<f32, 4> default_quaternion { 1.0f, 0.0f, 0.0f, 0.0f };
-	std::array<f32, 4> quaternion = default_quaternion; // quaternion orientation (x,y,z,w) of controller relative to default (facing the camera with buttons up)
-	f32 accelerometer_x = 0.0f; // linear velocity in m/s²
-	f32 accelerometer_y = 0.0f; // linear velocity in m/s²
-	f32 accelerometer_z = 0.0f; // linear velocity in m/s²
-	f32 gyro_x = 0.0f; // angular velocity in rad/s
-	f32 gyro_y = 0.0f; // angular velocity in rad/s
-	f32 gyro_z = 0.0f; // angular velocity in rad/s
-	f32 magnetometer_x = 0.0f;
-	f32 magnetometer_y = 0.0f;
-	f32 magnetometer_z = 0.0f;
-	s16 temperature = 0;
-
-	void reset_sensors();
-};
-
 struct Pad
 {
-	const pad_handler m_pad_handler;
-	const u32 m_player_id;
-
 	bool m_buffer_cleared{true};
 	u32 m_port_status{0};
 	u32 m_device_capability{0};
@@ -514,25 +259,8 @@ struct Pad
 	u16 m_vendor_id{0};
 	u16 m_product_id{0};
 
-	u64 m_disconnection_timer{0};
-
 	s32 m_pressure_intensity_button_index{-1}; // Special button index. -1 if not set.
-	bool m_pressure_intensity_button_pressed{}; // Last sensitivity button press state, used for toggle.
-	bool m_pressure_intensity_toggled{}; // Whether the sensitivity is toggled on or off.
 	u8 m_pressure_intensity{127}; // 0-255
-	bool m_adjust_pressure_last{}; // only used in keyboard_pad_handler
-	bool get_pressure_intensity_button_active(bool is_toggle_mode, u32 player_id);
-
-	s32 m_analog_limiter_button_index{-1}; // Special button index. -1 if not set.
-	bool m_analog_limiter_button_pressed{}; // Last sensitivity button press state, used for toggle.
-	bool m_analog_limiter_toggled{}; // Whether the sensitivity is toggled on or off.
-	bool m_analog_limiter_enabled_last{}; // only used in keyboard_pad_handler
-	bool get_analog_limiter_button_active(bool is_toggle_mode, u32 player_id);
-
-	s32 m_orientation_reset_button_index{-1}; // Special button index. -1 if not set.
-	bool get_orientation_reset_button_active();
-
-	u64 m_last_rumble_time_us{0};
 
 	// Cable State:   0 - 1  plugged in ?
 	u8 m_cable_state{0};
@@ -542,14 +270,9 @@ struct Pad
 	u8 m_battery_level{0};
 
 	std::vector<Button> m_buttons;
-	std::array<AnalogStick, 4> m_sticks{};
-	std::array<AnalogSensor, 4> m_sensors{};
-	std::array<VibrateMotor, 2> m_vibrateMotors{};
-
-	std::vector<Button> m_buttons_external;
-	std::array<AnalogStick, 4> m_sticks_external{};
-
-	std::vector<std::shared_ptr<Pad>> copilots;
+	std::vector<AnalogStick> m_sticks;
+	std::vector<AnalogSensor> m_sensors;
+	std::vector<VibrateMotor> m_vibrateMotors;
 
 	// These hold bits for their respective buttons
 	u16 m_digital_1{0};
@@ -575,22 +298,17 @@ struct Pad
 	u16 m_press_R2{0};
 
 	// Except for these...0-1023
-	u16 m_sensor_x{DEFAULT_MOTION_X};
-	u16 m_sensor_y{DEFAULT_MOTION_Y};
-	u16 m_sensor_z{DEFAULT_MOTION_Z};
-	u16 m_sensor_g{DEFAULT_MOTION_G};
+	// ~399 on sensor y is a level non moving controller
+	u16 m_sensor_x{512};
+	u16 m_sensor_y{399};
+	u16 m_sensor_z{512};
+	u16 m_sensor_g{512};
 
 	bool ldd{false};
-	CellPadData ldd_data{};
+	u8 ldd_data[132] = {};
 
-	bool is_fake_pad = false;
-
-	ps_move_data move_data{};
-
-	explicit Pad(pad_handler handler, u32 player_id, u32 port_status, u32 device_capability, u32 device_type)
-		: m_pad_handler(handler)
-		, m_player_id(player_id)
-		, m_port_status(port_status)
+	explicit Pad(u32 port_status, u32 device_capability, u32 device_type)
+		: m_port_status(port_status)
 		, m_device_capability(device_capability)
 		, m_device_type(device_type)
 	{
@@ -607,25 +325,4 @@ struct Pad
 		m_product_id = product_id;
 		m_pressure_intensity = (255 * pressure_intensity_percent) / 100;
 	}
-
-	u32 copilot_player() const
-	{
-		if (m_class_type >= CELL_PAD_FAKE_TYPE_COPILOT_1 && m_class_type <= CELL_PAD_FAKE_TYPE_COPILOT_7)
-		{
-			return m_class_type - CELL_PAD_FAKE_TYPE_COPILOT_1;
-		}
-
-		return umax;
-	}
-
-	bool is_copilot() const
-	{
-		const u32 copilot_player_id = copilot_player();
-		return copilot_player_id != umax && copilot_player_id != m_player_id;
-	}
-
-	bool is_connected() const
-	{
-		return !!(m_port_status & CELL_PAD_STATUS_CONNECTED);
-	}
 };
diff --git a/rpcs3/Emu/Io/rb3drums_config.cpp b/rpcs3/Emu/Io/rb3drums_config.cpp
deleted file mode 100644
index 76c86252ab..0000000000
--- a/rpcs3/Emu/Io/rb3drums_config.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "stdafx.h"
-#include "rb3drums_config.h"
-
-LOG_CHANNEL(cfg_log, "CFG");
-
-cfg_rb3drums g_cfg_rb3drums;
-
-cfg_rb3drums::cfg_rb3drums()
-	: cfg::node()
-	, path(fs::get_config_dir(true) + "rb3drums.yml")
-{
-}
-
-bool cfg_rb3drums::load()
-{
-	cfg_log.notice("Loading rb3drums config from '%s'", path);
-
-	if (fs::file cfg_file{path, fs::read})
-	{
-		return from_string(cfg_file.to_string());
-	}
-
-	cfg_log.notice("No rb3drums config found. Using default settings. Path: %s", path);
-	from_default();
-	save();
-	return false;
-}
-
-void cfg_rb3drums::save()
-{
-	cfg_log.notice("Saving rb3drums config to '%s'", path);
-
-	if (!cfg::node::save(path))
-	{
-		cfg_log.error("Failed to save rb3drums config to '%s' (error=%s)", path, fs::g_tls_error);
-	}
-
-	reload_requested = true;
-}
diff --git a/rpcs3/Emu/Io/rb3drums_config.h b/rpcs3/Emu/Io/rb3drums_config.h
deleted file mode 100644
index 5910d88d72..0000000000
--- a/rpcs3/Emu/Io/rb3drums_config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include "Utilities/Config.h"
-
-struct cfg_rb3drums final : cfg::node
-{
-	cfg_rb3drums();
-	bool load();
-	void save();
-
-	cfg::uint<1, 100> pulse_ms{this, "Pulse width ms", 30, true};
-	cfg::uint<1, 127> minimum_velocity{this, "Minimum velocity", 10, true};
-	cfg::uint<1, 5000> combo_window_ms{this, "Combo window in milliseconds", 2000, true};
-	cfg::_bool stagger_cymbals{this, "Stagger cymbal hits", true, true};
-	cfg::string midi_overrides{this, "Midi id to note override", "", true};
-	cfg::string combo_start{this, "Combo Start", "HihatPedal,HihatPedal,HihatPedal,Snare", true};
-	cfg::string combo_select{this, "Combo Select", "HihatPedal,HihatPedal,HihatPedal,SnareRim", true};
-	cfg::string combo_toggle_hold_kick{this, "Combo Toggle Hold Kick", "HihatPedal,HihatPedal,HihatPedal,Kick", true};
-	cfg::uint<0, 255> midi_cc_status{this, "Midi CC status", 0xB0, true};
-	cfg::uint<0, 127> midi_cc_number{this, "Midi CC control number", 4, true};
-	cfg::uint<0, 127> midi_cc_threshold{this, "Midi CC threshold", 64, true};
-	cfg::_bool midi_cc_invert_threshold{this, "Midi CC invert threshold", false, true};
-
-	const std::string path;
-
-	atomic_t<bool> reload_requested = false;
-};
-
-extern cfg_rb3drums g_cfg_rb3drums;
diff --git a/rpcs3/Emu/Io/recording_config.cpp b/rpcs3/Emu/Io/recording_config.cpp
deleted file mode 100644
index 9b360a24ef..0000000000
--- a/rpcs3/Emu/Io/recording_config.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "stdafx.h"
-#include "recording_config.h"
-
-LOG_CHANNEL(cfg_log, "CFG");
-
-cfg_recording g_cfg_recording;
-
-cfg_recording::cfg_recording()
-	: cfg::node()
-	, path(fs::get_config_dir(true) + "recording.yml")
-{
-}
-
-bool cfg_recording::load()
-{
-	cfg_log.notice("Loading recording config from '%s'", path);
-
-	if (fs::file cfg_file{path, fs::read})
-	{
-		return from_string(cfg_file.to_string());
-	}
-
-	cfg_log.notice("Recording config missing. Using default settings. Path: %s", path);
-	from_default();
-	save();
-	return false;
-}
-
-void cfg_recording::save() const
-{
-	cfg_log.notice("Saving recording config to '%s'", path);
-
-	if (!cfg::node::save(path))
-	{
-		cfg_log.error("Failed to save recording config to '%s' (error=%s)", path, fs::g_tls_error);
-	}
-}
diff --git a/rpcs3/Emu/Io/recording_config.h b/rpcs3/Emu/Io/recording_config.h
deleted file mode 100644
index 127d24015f..0000000000
--- a/rpcs3/Emu/Io/recording_config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include "Utilities/Config.h"
-
-struct cfg_recording final : cfg::node
-{
-	cfg_recording();
-	bool load();
-	void save() const;
-
-	struct node_video : cfg::node
-	{
-		node_video(cfg::node* _this) : cfg::node(_this, "Video") {}
-
-		cfg::uint<0, 60> framerate{this, "Framerate", 30};
-		cfg::uint<0, 7680> width{this, "Width", 1280};
-		cfg::uint<0, 4320> height{this, "Height", 720};
-		cfg::uint<0, 192> pixel_format{this, "AVPixelFormat", 0}; // AVPixelFormat::AV_PIX_FMT_YUV420P
-		cfg::uint<0, 0xFFFF> video_codec{this, "AVCodecID", 12}; // AVCodecID::AV_CODEC_ID_MPEG4
-		cfg::uint<0, 25000000> video_bps{this, "Video Bitrate", 4000000};
-		cfg::uint<0, 5> max_b_frames{this, "Max B-Frames", 2};
-		cfg::uint<0, 20> gop_size{this, "Group of Pictures Size", 12};
-
-	} video{ this };
-
-	struct node_audio : cfg::node
-	{
-		node_audio(cfg::node* _this) : cfg::node(_this, "Audio") {}
-		
-		cfg::uint<0x10000, 0x17000> audio_codec{this, "AVCodecID", 86018}; // AVCodecID::AV_CODEC_ID_AAC
-		cfg::uint<0, 25000000> audio_bps{this, "Audio Bitrate", 320000};
-
-	} audio{ this };
-
-	const std::string path;
-};
-
-extern cfg_recording g_cfg_recording;
diff --git a/rpcs3/Emu/Io/topshotelite_config.h b/rpcs3/Emu/Io/topshotelite_config.h
deleted file mode 100644
index fa9ca952d2..0000000000
--- a/rpcs3/Emu/Io/topshotelite_config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-
-#include "emulated_pad_config.h"
-
-enum class topshotelite_btn
-{
-	trigger,
-	reload,
-	square,
-	cross,
-	circle,
-	triangle,
-	select,
-	start,
-	l3,
-	r3,
-	ps,
-	dpad_up,
-	dpad_down,
-	dpad_left,
-	dpad_right,
-	ls_x,
-	ls_y,
-	rs_x,
-	rs_y,
-
-	count
-};
-
-struct cfg_tse final : public emulated_pad_config<topshotelite_btn>
-{
-	cfg_tse(node* owner, const std::string& name) : emulated_pad_config(owner, name) {}
-
-	cfg_pad_btn<topshotelite_btn> trigger{this, "Trigger", topshotelite_btn::trigger, pad_button::mouse_button_1};
-	cfg_pad_btn<topshotelite_btn> reload{this, "Reload", topshotelite_btn::reload, pad_button::mouse_button_2};
-	cfg_pad_btn<topshotelite_btn> square{this, "Square", topshotelite_btn::square, pad_button::square};
-	cfg_pad_btn<topshotelite_btn> cross{this, "Cross", topshotelite_btn::cross, pad_button::cross};
-	cfg_pad_btn<topshotelite_btn> circle{this, "Circle", topshotelite_btn::circle, pad_button::circle};
-	cfg_pad_btn<topshotelite_btn> triangle{this, "Triangle", topshotelite_btn::triangle, pad_button::triangle};
-	cfg_pad_btn<topshotelite_btn> select{this, "Select", topshotelite_btn::select, pad_button::select};
-	cfg_pad_btn<topshotelite_btn> start{this, "Start", topshotelite_btn::start, pad_button::start};
-	cfg_pad_btn<topshotelite_btn> l3{this, "L3", topshotelite_btn::l3, pad_button::L3};
-	cfg_pad_btn<topshotelite_btn> r3{this, "R3", topshotelite_btn::r3, pad_button::R3};
-	cfg_pad_btn<topshotelite_btn> ps{this, "PS", topshotelite_btn::ps, pad_button::ps};
-	cfg_pad_btn<topshotelite_btn> dpad_up{this, "D-Pad Up", topshotelite_btn::dpad_up, pad_button::dpad_up};
-	cfg_pad_btn<topshotelite_btn> dpad_down{this, "D-Pad Down", topshotelite_btn::dpad_down, pad_button::dpad_down};
-	cfg_pad_btn<topshotelite_btn> dpad_left{this, "D-Pad Left", topshotelite_btn::dpad_left, pad_button::dpad_left};
-	cfg_pad_btn<topshotelite_btn> dpad_right{this, "D-Pad Right", topshotelite_btn::dpad_right, pad_button::dpad_right};
-	cfg_pad_btn<topshotelite_btn> ls_x{this, "Left Stick X-Axis", topshotelite_btn::ls_x, pad_button::ls_x};
-	cfg_pad_btn<topshotelite_btn> ls_y{this, "Left Stick Y-Axis", topshotelite_btn::ls_y, pad_button::ls_y};
-	cfg_pad_btn<topshotelite_btn> rs_x{this, "Right Stick X-Axis", topshotelite_btn::rs_x, pad_button::rs_x};
-	cfg_pad_btn<topshotelite_btn> rs_y{this, "Right Stick Y-Axis", topshotelite_btn::rs_y, pad_button::rs_y};
-};
-
-struct cfg_topshotelite final : public emulated_pads_config<cfg_tse, 4>
-{
-	cfg_topshotelite() : emulated_pads_config<cfg_tse, 4>("topshotelite") {};
-};
-
-extern cfg_topshotelite g_cfg_topshotelite;
diff --git a/rpcs3/Emu/Io/topshotfearmaster_config.h b/rpcs3/Emu/Io/topshotfearmaster_config.h
deleted file mode 100644
index cd2aadf02d..0000000000
--- a/rpcs3/Emu/Io/topshotfearmaster_config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include "emulated_pad_config.h"
-
-enum class topshotfearmaster_btn
-{
-	trigger,
-	heartrate,
-	square,
-	cross,
-	circle,
-	triangle,
-	select,
-	start,
-	l3,
-	ps,
-	dpad_up,
-	dpad_down,
-	dpad_left,
-	dpad_right,
-	ls_x,
-	ls_y,
-
-	count
-};
-
-struct cfg_tsf final : public emulated_pad_config<topshotfearmaster_btn>
-{
-	cfg_tsf(node* owner, const std::string& name) : emulated_pad_config(owner, name) {}
-
-	cfg_pad_btn<topshotfearmaster_btn> trigger{this, "Trigger", topshotfearmaster_btn::trigger, pad_button::mouse_button_1};
-	cfg_pad_btn<topshotfearmaster_btn> heartrate{this, "Heartrate", topshotfearmaster_btn::heartrate, pad_button::mouse_button_2};
-	cfg_pad_btn<topshotfearmaster_btn> square{this, "Square", topshotfearmaster_btn::square, pad_button::square};
-	cfg_pad_btn<topshotfearmaster_btn> cross{this, "Cross", topshotfearmaster_btn::cross, pad_button::cross};
-	cfg_pad_btn<topshotfearmaster_btn> circle{this, "Circle", topshotfearmaster_btn::circle, pad_button::circle};
-	cfg_pad_btn<topshotfearmaster_btn> triangle{this, "Triangle", topshotfearmaster_btn::triangle, pad_button::triangle};
-	cfg_pad_btn<topshotfearmaster_btn> select{this, "Select", topshotfearmaster_btn::select, pad_button::select};
-	cfg_pad_btn<topshotfearmaster_btn> start{this, "Start", topshotfearmaster_btn::start, pad_button::start};
-	cfg_pad_btn<topshotfearmaster_btn> l3{this, "L3", topshotfearmaster_btn::l3, pad_button::L3};
-	cfg_pad_btn<topshotfearmaster_btn> ps{this, "PS", topshotfearmaster_btn::ps, pad_button::ps};
-	cfg_pad_btn<topshotfearmaster_btn> dpad_up{this, "D-Pad Up", topshotfearmaster_btn::dpad_up, pad_button::dpad_up};
-	cfg_pad_btn<topshotfearmaster_btn> dpad_down{this, "D-Pad Down", topshotfearmaster_btn::dpad_down, pad_button::dpad_down};
-	cfg_pad_btn<topshotfearmaster_btn> dpad_left{this, "D-Pad Left", topshotfearmaster_btn::dpad_left, pad_button::dpad_left};
-	cfg_pad_btn<topshotfearmaster_btn> dpad_right{this, "D-Pad Right", topshotfearmaster_btn::dpad_right, pad_button::dpad_right};
-	cfg_pad_btn<topshotfearmaster_btn> ls_x{this, "Left Stick X-Axis", topshotfearmaster_btn::ls_x, pad_button::ls_x};
-	cfg_pad_btn<topshotfearmaster_btn> ls_y{this, "Left Stick Y-Axis", topshotfearmaster_btn::ls_y, pad_button::ls_y};
-};
-
-struct cfg_topshotfearmaster final : public emulated_pads_config<cfg_tsf, 4>
-{
-	cfg_topshotfearmaster() : emulated_pads_config<cfg_tsf, 4>("topshotfearmaster") {};
-};
-
-extern cfg_topshotfearmaster g_cfg_topshotfearmaster;
diff --git a/rpcs3/Emu/Io/turntable_config.h b/rpcs3/Emu/Io/turntable_config.h
deleted file mode 100644
index c2237520f9..0000000000
--- a/rpcs3/Emu/Io/turntable_config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include "emulated_pad_config.h"
-
-enum class turntable_btn
-{
-	red,
-	green,
-	blue,
-	dpad_up,
-	dpad_down,
-	dpad_left,
-	dpad_right,
-	start,
-	select,
-	square,
-	circle,
-	cross,
-	triangle,
-	right_turntable,
-	crossfader,
-	effects_dial,
-
-	count
-};
-
-struct cfg_turntable final : public emulated_pad_config<turntable_btn>
-{
-	cfg_turntable(node* owner, const std::string& name) : emulated_pad_config(owner, name) {}
-
-	cfg_pad_btn<turntable_btn> blue{ this, "Blue", turntable_btn::blue, pad_button::square };
-	cfg_pad_btn<turntable_btn> green{ this, "Green", turntable_btn::green, pad_button::cross };
-	cfg_pad_btn<turntable_btn> red{ this, "Red", turntable_btn::red, pad_button::circle };
-	cfg_pad_btn<turntable_btn> dpad_up{ this, "D-Pad Up", turntable_btn::dpad_up, pad_button::dpad_up };
-	cfg_pad_btn<turntable_btn> dpad_down{ this, "D-Pad Down", turntable_btn::dpad_down, pad_button::dpad_down };
-	cfg_pad_btn<turntable_btn> dpad_left{ this, "D-Pad Left", turntable_btn::dpad_left, pad_button::dpad_left };
-	cfg_pad_btn<turntable_btn> dpad_right{ this, "D-Pad Right", turntable_btn::dpad_right, pad_button::dpad_right };
-	cfg_pad_btn<turntable_btn> start{ this, "Start", turntable_btn::start, pad_button::start };
-	cfg_pad_btn<turntable_btn> select{ this, "Select", turntable_btn::select, pad_button::select };
-	cfg_pad_btn<turntable_btn> square{ this, "Square", turntable_btn::square, pad_button::R2 };
-	cfg_pad_btn<turntable_btn> circle{ this, "Circle", turntable_btn::circle, pad_button::L1 };
-	cfg_pad_btn<turntable_btn> cross{ this, "Cross", turntable_btn::cross, pad_button::R1 };
-	cfg_pad_btn<turntable_btn> triangle{ this, "Triangle", turntable_btn::triangle, pad_button::triangle };
-	cfg_pad_btn<turntable_btn> right_turntable{ this, "Right Turntable", turntable_btn::right_turntable, pad_button::ls_y };
-	cfg_pad_btn<turntable_btn> crossfader{ this, "Crossfader", turntable_btn::crossfader, pad_button::rs_y };
-	cfg_pad_btn<turntable_btn> effects_dial{ this, "Effects Dial", turntable_btn::effects_dial, pad_button::rs_x };
-};
-
-struct cfg_turntables final : public emulated_pads_config<cfg_turntable, 2>
-{
-	cfg_turntables() : emulated_pads_config<cfg_turntable, 2>("turntable") {};
-};
-
-extern cfg_turntables g_cfg_turntable;
diff --git a/rpcs3/Emu/Io/usb_device.cpp b/rpcs3/Emu/Io/usb_device.cpp
index 9291805a8c..4383c5f8c2 100644
--- a/rpcs3/Emu/Io/usb_device.cpp
+++ b/rpcs3/Emu/Io/usb_device.cpp
@@ -1,9 +1,8 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/Cell/timers.hpp"
+
 #include "Emu/Cell/lv2/sys_usbd.h"
 #include "Emu/Io/usb_device.h"
-#include "Utilities/StrUtil.h"
 #include <libusb.h>
 
 LOG_CHANNEL(sys_usbd);
@@ -14,26 +13,10 @@ extern void LIBUSB_CALL callback_transfer(struct libusb_transfer* transfer);
 // ALL DEVICES ///////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////
 
-usb_device::usb_device(const std::array<u8, 7>& location)
-{
-	this->location = location;
-}
-
-void usb_device::get_location(u8* location) const
-{
-	memcpy(location, this->location.data(), 7);
-}
-
 void usb_device::read_descriptors()
 {
 }
 
-u32 usb_device::get_configuration(u8* buf)
-{
-	*buf = current_config;
-	return sizeof(u8);
-}
-
 bool usb_device::set_configuration(u8 cfg_num)
 {
 	current_config = cfg_num;
@@ -54,43 +37,20 @@ u64 usb_device::get_timestamp()
 //////////////////////////////////////////////////////////////////
 // PASSTHROUGH DEVICE ////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////
-usb_device_passthrough::usb_device_passthrough(libusb_device* _device, libusb_device_descriptor& desc, const std::array<u8, 7>& location)
-	: usb_device(location), lusb_device(_device)
+usb_device_passthrough::usb_device_passthrough(libusb_device* _device, libusb_device_descriptor& desc)
+    : lusb_device(_device)
 {
 	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{desc.bcdUSB, desc.bDeviceClass, desc.bDeviceSubClass, desc.bDeviceProtocol, desc.bMaxPacketSize0, desc.idVendor, desc.idProduct,
-														  desc.bcdDevice, desc.iManufacturer, desc.iProduct, desc.iSerialNumber, desc.bNumConfigurations});
+	                                                      desc.bcdDevice, desc.iManufacturer, desc.iProduct, desc.iSerialNumber, desc.bNumConfigurations});
 }
 
 usb_device_passthrough::~usb_device_passthrough()
 {
 	if (lusb_handle)
-	{
-		libusb_release_interface(lusb_handle, 0);
 		libusb_close(lusb_handle);
-	}
 
 	if (lusb_device)
-	{
 		libusb_unref_device(lusb_device);
-	}
-}
-
-void usb_device_passthrough::send_libusb_transfer(libusb_transfer* transfer)
-{
-	while (true)
-	{
-		auto res = libusb_submit_transfer(transfer);
-		switch (res)
-		{
-		case LIBUSB_SUCCESS: return;
-		case LIBUSB_ERROR_BUSY: continue;
-		default:
-		{
-			sys_usbd.error("Unexpected error from libusb_submit_transfer: %d(%s)", res, libusb_error_name(res));
-			return;
-		}
-		}
-	}
 }
 
 bool usb_device_passthrough::open_device()
@@ -115,7 +75,7 @@ void usb_device_passthrough::read_descriptors()
 		int ssize = libusb_control_transfer(lusb_handle, +LIBUSB_ENDPOINT_IN | +LIBUSB_REQUEST_TYPE_STANDARD | +LIBUSB_RECIPIENT_DEVICE, LIBUSB_REQUEST_GET_DESCRIPTOR, 0x0200 | index, 0, buf, 1000, 0);
 		if (ssize < 0)
 		{
-			sys_usbd.fatal("Couldn't get the config from the device: %d(%s)", ssize, libusb_error_name(ssize));
+			sys_usbd.fatal("Couldn't get the config from the device: %d", ssize);
 			continue;
 		}
 
@@ -130,11 +90,6 @@ void usb_device_passthrough::read_descriptors()
 	}
 }
 
-u32 usb_device_passthrough::get_configuration(u8* buf)
-{
-	return (libusb_get_configuration(lusb_handle, reinterpret_cast<int*>(buf)) == LIBUSB_SUCCESS) ? sizeof(u8) : 0;
-};
-
 bool usb_device_passthrough::set_configuration(u8 cfg_num)
 {
 	usb_device::set_configuration(cfg_num);
@@ -147,23 +102,21 @@ bool usb_device_passthrough::set_interface(u8 int_num)
 	return (libusb_claim_interface(lusb_handle, int_num) == LIBUSB_SUCCESS);
 }
 
-void usb_device_passthrough::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, [[maybe_unused]] u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
+void usb_device_passthrough::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 /*wLength*/, u32 buf_size, u8* buf, UsbTransfer* transfer)
 {
-	if (transfer->setup_buf.size() < buf_size + LIBUSB_CONTROL_SETUP_SIZE)
-		transfer->setup_buf.resize(buf_size + LIBUSB_CONTROL_SETUP_SIZE);
-
-	transfer->control_destbuf = (bmRequestType & LIBUSB_ENDPOINT_IN) ? buf : nullptr;
+	if (transfer->setup_buf.size() < buf_size + 8)
+		transfer->setup_buf.resize(buf_size + 8);
 
 	libusb_fill_control_setup(transfer->setup_buf.data(), bmRequestType, bRequest, wValue, wIndex, buf_size);
-	memcpy(transfer->setup_buf.data() + LIBUSB_CONTROL_SETUP_SIZE, buf, buf_size);
+	memcpy(transfer->setup_buf.data() + 8, buf, buf_size);
 	libusb_fill_control_transfer(transfer->transfer, lusb_handle, transfer->setup_buf.data(), callback_transfer, transfer, 0);
-	send_libusb_transfer(transfer->transfer);
+	libusb_submit_transfer(transfer->transfer);
 }
 
 void usb_device_passthrough::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer)
 {
 	libusb_fill_interrupt_transfer(transfer->transfer, lusb_handle, endpoint, buf, buf_size, callback_transfer, transfer, 0);
-	send_libusb_transfer(transfer->transfer);
+	libusb_submit_transfer(transfer->transfer);
 }
 
 void usb_device_passthrough::isochronous_transfer(UsbTransfer* transfer)
@@ -177,19 +130,17 @@ void usb_device_passthrough::isochronous_transfer(UsbTransfer* transfer)
 		transfer->transfer->iso_packet_desc[index].length = transfer->iso_request.packets[index];
 	}
 
-	send_libusb_transfer(transfer->transfer);
+	libusb_submit_transfer(transfer->transfer);
 }
 
 //////////////////////////////////////////////////////////////////
 // EMULATED DEVICE ///////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////
-usb_device_emulated::usb_device_emulated(const std::array<u8, 7>& location)
-	: usb_device(location)
+usb_device_emulated::usb_device_emulated()
 {
 }
 
-usb_device_emulated::usb_device_emulated(const UsbDeviceDescriptor& _device, const std::array<u8, 7>& location)
-	: usb_device(location)
+usb_device_emulated::usb_device_emulated(const UsbDeviceDescriptor& _device)
 {
 	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, _device);
 }
@@ -199,79 +150,32 @@ bool usb_device_emulated::open_device()
 	return true;
 }
 
-u32 usb_device_emulated::get_descriptor(u8 type, u8 index, u8* buf, u32 buf_size)
+s32 usb_device_emulated::get_descriptor(u8 type, u8 index, u8* ptr, u32 /*max_size*/)
 {
-	if (!buf)
+	if (type == USB_DESCRIPTOR_STRING)
 	{
-		return 0;
-	}
-
-	std::array<u8, 2> header;
-	header = {static_cast<u8>(header.size()), type};
-
-	u32 expected_count = std::min<u32>(static_cast<u32>(header.size()), buf_size);
-	std::memcpy(buf, header.data(), expected_count);
-
-	if (expected_count < header.size())
-		return expected_count;
-
-	switch (type)
-	{
-	case USB_DESCRIPTOR_DEVICE:
-	{
-		buf[0] = device.bLength;
-		expected_count = std::min(device.bLength, ::narrow<u8>(buf_size));
-		std::memcpy(buf + header.size(), device.data, expected_count - header.size());
-		break;
-	}
-	case USB_DESCRIPTOR_CONFIG:
-	{
-		if (index < device.subnodes.size())
+		if (index < strings.size())
 		{
-			buf[0] = device.subnodes[index].bLength;
-			expected_count = std::min(device.subnodes[index].bLength, ::narrow<u8>(buf_size));
-			std::memcpy(buf + header.size(), device.subnodes[index].data, expected_count - header.size());
+			u8 string_len = ::narrow<u8>(strings[index].size());
+			ptr[0]        = (string_len * 2) + 2;
+			ptr[1]        = USB_DESCRIPTOR_STRING;
+			for (u32 i = 0; i < string_len; i++)
+			{
+				ptr[2 + (i * 2)] = strings[index].data()[i];
+				ptr[3 + (i * 2)] = 0;
+			}
+			return ptr[0];
 		}
-		break;
 	}
-	case USB_DESCRIPTOR_STRING:
+	else
 	{
-		if (index < strings.size() + 1)
-		{
-			if (index == 0)
-			{
-				constexpr u8 len = static_cast<u8>(sizeof(u16) + header.size());
-				buf[0] = len;
-				expected_count = std::min(len, ::narrow<u8>(buf_size));
-				constexpr le_t<u16> langid = 0x0409; // English (United States)
-				std::memcpy(buf + header.size(), &langid, expected_count - header.size());
-			}
-			else
-			{
-				const std::u16string u16str = utf8_to_utf16(strings[index - 1]);
-				const u8 len = static_cast<u8>(std::min(u16str.size() * sizeof(u16) + header.size(), static_cast<usz>(0xFF)));
-				buf[0] = len;
-				expected_count = std::min(len, ::narrow<u8>(std::min<u32>(255, buf_size)));
-				std::memcpy(buf + header.size(), u16str.data(), expected_count - header.size());
-			}
-		}
-		break;
-	}
-	default: sys_usbd.error("Unhandled DescriptorType: get_descriptor(type=0x%02x, index=0x%02x, buf=*0x%x, buf_size=0x%x)", type, index, buf, buf_size); break;
+		sys_usbd.error("[Emulated]: Trying to get a descriptor other than string descriptor");
 	}
 
-	return expected_count;
+	return -1;
 }
 
-u32 usb_device_emulated::get_status(bool self_powered, bool remote_wakeup, u8* buf, u32 buf_size)
-{
-	const u32 expected_count = buf ? std::min<u32>(sizeof(u16), buf_size) : 0;
-	const u16 device_status = static_cast<int>(self_powered) | static_cast<int>(remote_wakeup) << 1;
-	std::memcpy(buf, &device_status, expected_count);
-	return expected_count;
-}
-
-void usb_device_emulated::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 /*wLength*/, u32 buf_size, u8* buf, UsbTransfer* transfer)
+void usb_device_emulated::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 /*wIndex*/, u16 /*wLength*/, u32 buf_size, u8* /*buf*/, UsbTransfer* transfer)
 {
 	transfer->fake            = true;
 	transfer->expected_count  = buf_size;
@@ -280,42 +184,31 @@ void usb_device_emulated::control_transfer(u8 bmRequestType, u8 bRequest, u16 wV
 
 	switch (bmRequestType)
 	{
-	case 0U /*silences warning*/ | LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_DEVICE: // 0x00
+	case 0:
 		switch (bRequest)
 		{
-		case LIBUSB_REQUEST_SET_CONFIGURATION: usb_device::set_configuration(::narrow<u8>(wValue)); break;
-		default: sys_usbd.error("Unhandled control transfer(0x%02x): 0x%02x", bmRequestType, bRequest); break;
+		case 0x09: usb_device::set_configuration(::narrow<u8>(wValue)); break;
+		default: sys_usbd.fatal("Unhandled control transfer(0): 0x%x", bRequest); break;
 		}
 		break;
-	case 0U /*silences warning*/ | LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_INTERFACE: // 0x01
-		switch (bRequest)
-		{
-		case LIBUSB_REQUEST_SET_INTERFACE: usb_device::set_interface(::narrow<u8>(wIndex)); break;
-		default: sys_usbd.error("Unhandled control transfer(0x%02x): 0x%02x", bmRequestType, bRequest); break;
-		}
-		break;
-	case 0U /*silences warning*/ | LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_DEVICE: // 0x80
-		switch (bRequest)
-		{
-		case LIBUSB_REQUEST_GET_STATUS: transfer->expected_count = get_status(false, false, buf, buf_size); break;
-		case LIBUSB_REQUEST_GET_DESCRIPTOR: transfer->expected_count = get_descriptor(wValue >> 8, wValue & 0xFF, buf, buf_size); break;
-		case LIBUSB_REQUEST_GET_CONFIGURATION: transfer->expected_count = get_configuration(buf); break;
-		default: sys_usbd.error("Unhandled control transfer(0x%02x): 0x%02x", bmRequestType, bRequest); break;
-		}
-		break;
-	default: sys_usbd.error("Unhandled control transfer: 0x%02x", bmRequestType); break;
+	default: sys_usbd.fatal("Unhandled control transfer: 0x%x", bmRequestType); break;
 	}
 }
 
-void usb_device_emulated::interrupt_transfer(u32 /*buf_size*/, u8* /*buf*/, u32 /*endpoint*/, UsbTransfer* /*transfer*/)
+// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
+void usb_device_emulated::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer)
 {
 }
 
-void usb_device_emulated::isochronous_transfer(UsbTransfer* /*transfer*/)
+void usb_device_emulated::isochronous_transfer(UsbTransfer* transfer)
 {
 }
 
-void usb_device_emulated::add_string(std::string str)
+void usb_device_emulated::add_string(char* str)
 {
-	strings.emplace_back(std::move(str));
+	strings.emplace_back(str);
 }
diff --git a/rpcs3/Emu/Io/usb_device.h b/rpcs3/Emu/Io/usb_device.h
index 3d60bd36b0..040d29cccd 100644
--- a/rpcs3/Emu/Io/usb_device.h
+++ b/rpcs3/Emu/Io/usb_device.h
@@ -88,20 +88,16 @@ struct UsbDeviceHID
 
 struct UsbTransfer
 {
-	u32 assigned_number = 0;
 	u32 transfer_id = 0;
 
 	s32 result = 0;
 	u32 count  = 0;
-	UsbDeviceIsoRequest iso_request{};
+	UsbDeviceIsoRequest iso_request;
 
 	std::vector<u8> setup_buf;
 	libusb_transfer* transfer = nullptr;
 	bool busy                 = false;
 
-	// For control transfers
-	u8 *control_destbuf = nullptr;
-
 	// For fake transfers
 	bool fake           = false;
 	u64 expected_time   = 0;
@@ -112,30 +108,31 @@ struct UsbTransfer
 // Usb descriptor helper
 struct UsbDescriptorNode
 {
-	u8 bLength{};
-	u8 bDescriptorType{};
+	u8 bLength;
+	u8 bDescriptorType;
 
-	union
-	{
+	union {
 		UsbDeviceDescriptor _device;
 		UsbDeviceConfiguration _configuration;
 		UsbDeviceInterface _interface;
 		UsbDeviceEndpoint _endpoint;
 		UsbDeviceHID _hid;
-		u8 data[0xFF]{};
+		u8 data[0xFF];
 	};
 
 	std::vector<UsbDescriptorNode> subnodes;
 
-	UsbDescriptorNode() {}
+	UsbDescriptorNode(){}
 	template <typename T>
 	UsbDescriptorNode(u8 _bDescriptorType, const T& _data)
-		: bLength(sizeof(T) + 2), bDescriptorType(_bDescriptorType)
+	    : bLength(sizeof(T) + 2)
+	    , bDescriptorType(_bDescriptorType)
 	{
 		memcpy(data, &_data, sizeof(T));
 	}
-	UsbDescriptorNode(u8 _bLength, u8 _bDescriptorType, const u8* _data)
-		: bLength(_bLength), bDescriptorType(_bDescriptorType)
+	UsbDescriptorNode(u8 _bLength, u8 _bDescriptorType, u8* _data)
+	    : bLength(_bLength)
+	    , bDescriptorType(_bDescriptorType)
 	{
 		memcpy(data, _data, _bLength - 2);
 	}
@@ -145,7 +142,6 @@ struct UsbDescriptorNode
 		subnodes.push_back(newnode);
 		return subnodes.back();
 	}
-
 	u32 get_size() const
 	{
 		u32 nodesize = bLength;
@@ -155,33 +151,26 @@ struct UsbDescriptorNode
 		}
 		return nodesize;
 	}
-
-	u32 write_data(u8* ptr, u32 max_size) const
+	void write_data(u8*& ptr)
 	{
-		u32 size = std::min<u32>(bLength, max_size);
-		memcpy(ptr, this, size);
-		for (const auto& node : subnodes)
+		ptr[0] = bLength;
+		ptr[1] = bDescriptorType;
+		memcpy(ptr + 2, data, bLength - 2);
+		ptr += bLength;
+		for (auto& node : subnodes)
 		{
-			const u32 remaining = max_size - size;
-			if (remaining == 0) break;
-			size += node.write_data(ptr + size, remaining);
+			node.write_data(ptr);
 		}
-		return size;
 	}
 };
 
 class usb_device
 {
 public:
-	usb_device(const std::array<u8, 7>& location);
-	virtual ~usb_device() = default;
-
 	virtual bool open_device() = 0;
 
-	void get_location(u8* location) const;
 	virtual void read_descriptors();
 
-	virtual u32 get_configuration(u8* buf);
 	virtual bool set_configuration(u8 cfg_num);
 	virtual bool set_interface(u8 int_num);
 
@@ -198,7 +187,6 @@ public:
 protected:
 	u8 current_config    = 1;
 	u8 current_interface = 0;
-	std::array<u8, 7> location{};
 
 protected:
 	static u64 get_timestamp();
@@ -207,21 +195,17 @@ protected:
 class usb_device_passthrough : public usb_device
 {
 public:
-	usb_device_passthrough(libusb_device* _device, libusb_device_descriptor& desc, const std::array<u8, 7>& location);
+	usb_device_passthrough(libusb_device* _device, libusb_device_descriptor& desc);
 	~usb_device_passthrough();
 
 	bool open_device() override;
 	void read_descriptors() override;
-	u32 get_configuration(u8* buf) override;
 	bool set_configuration(u8 cfg_num) override;
 	bool set_interface(u8 int_num) override;
 	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
 	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
 	void isochronous_transfer(UsbTransfer* transfer) override;
 
-protected:
-	void send_libusb_transfer(libusb_transfer* transfer);
-
 protected:
 	libusb_device* lusb_device        = nullptr;
 	libusb_device_handle* lusb_handle = nullptr;
@@ -230,8 +214,8 @@ protected:
 class usb_device_emulated : public usb_device
 {
 public:
-	usb_device_emulated(const std::array<u8, 7>& location);
-	usb_device_emulated(const UsbDeviceDescriptor& _device, const std::array<u8, 7>& location);
+	usb_device_emulated();
+	usb_device_emulated(const UsbDeviceDescriptor& _device);
 
 	bool open_device() override;
 	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
@@ -239,9 +223,8 @@ public:
 	void isochronous_transfer(UsbTransfer* transfer) override;
 
 	// Emulated specific functions
-	void add_string(std::string str);
-	u32 get_descriptor(u8 type, u8 index, u8* buf, u32 buf_size);
-	u32 get_status(bool self_powered, bool remote_wakeup, u8* buf, u32 buf_size);
+	void add_string(char* str);
+	s32 get_descriptor(u8 type, u8 index, u8* ptr, u32 max_size);
 
 protected:
 	std::vector<std::string> strings;
diff --git a/rpcs3/Emu/Io/usb_vfs.cpp b/rpcs3/Emu/Io/usb_vfs.cpp
deleted file mode 100644
index cea02fb276..0000000000
--- a/rpcs3/Emu/Io/usb_vfs.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "stdafx.h"
-#include "usb_vfs.h"
-
-LOG_CHANNEL(usb_vfs);
-
-usb_device_vfs::usb_device_vfs(const cfg::device_info& device_info, const std::array<u8, 7>& location)
-	: usb_device_emulated(location)
-{
-	const auto [vid, pid] = device_info.get_usb_ids();
-
-	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE,
-		UsbDeviceDescriptor{
-			.bcdUSB = 0x0200,
-			.bDeviceClass = 0x00,
-			.bDeviceSubClass = 0x00,
-			.bDeviceProtocol = 0x00,
-			.bMaxPacketSize0 = 0x40,
-			.idVendor = vid,
-			.idProduct = pid,
-			.bcdDevice = pid,
-			.iManufacturer = 0x01,
-			.iProduct = 0x02,
-			.iSerialNumber = 0x03,
-			.bNumConfigurations = 0x01});
-
-	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG,
-		UsbDeviceConfiguration{
-			.wTotalLength = 0x0020,
-			.bNumInterfaces = 0x01,
-			.bConfigurationValue = 0x01,
-			.iConfiguration = 0x00,
-			.bmAttributes = 0x80,
-			.bMaxPower = 0x32}));
-
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE,
-		UsbDeviceInterface{
-			.bInterfaceNumber = 0x00,
-			.bAlternateSetting = 0x00,
-			.bNumEndpoints = 0x02,
-			.bInterfaceClass = 0x08,
-			.bInterfaceSubClass = 0x06,
-			.bInterfaceProtocol = 0x50,
-			.iInterface = 0x00}));
-
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint{
-			.bEndpointAddress = 0x81,
-			.bmAttributes = 0x02,
-			.wMaxPacketSize = 0x0200,
-			.bInterval = 0xFF}));
-
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint{
-			.bEndpointAddress = 0x02,
-			.bmAttributes = 0x02,
-			.wMaxPacketSize = 0x0200,
-			.bInterval = 0xFF}));
-
-	strings = {"SMI Corporation", "USB DISK", device_info.serial}; // Manufacturer, Product, SerialNumber
-}
-
-usb_device_vfs::~usb_device_vfs()
-{
-}
diff --git a/rpcs3/Emu/Io/usb_vfs.h b/rpcs3/Emu/Io/usb_vfs.h
deleted file mode 100644
index ad734d368d..0000000000
--- a/rpcs3/Emu/Io/usb_vfs.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "Emu/Io/usb_device.h"
-#include "Utilities/Config.h"
-
-class usb_device_vfs : public usb_device_emulated
-{
-public:
-	usb_device_vfs(const cfg::device_info& device_info, const std::array<u8, 7>& location);
-	~usb_device_vfs();
-};
diff --git a/rpcs3/Emu/Io/usio.cpp b/rpcs3/Emu/Io/usio.cpp
deleted file mode 100644
index 21dc241d81..0000000000
--- a/rpcs3/Emu/Io/usio.cpp
+++ /dev/null
@@ -1,689 +0,0 @@
-// v406 USIO emulator
-
-#include "stdafx.h"
-#include "usio.h"
-#include "Input/pad_thread.h"
-#include "Emu/Io/usio_config.h"
-#include "Emu/IdManager.h"
-
-LOG_CHANNEL(usio_log, "USIO");
-
-template <>
-void fmt_class_string<usio_btn>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](usio_btn value)
-	{
-		switch (value)
-		{
-		case usio_btn::test: return "Test";
-		case usio_btn::coin: return "Coin";
-		case usio_btn::service: return "Service";
-		case usio_btn::enter: return "Enter/Start";
-		case usio_btn::up: return "Up";
-		case usio_btn::down: return "Down";
-		case usio_btn::left: return "Left";
-		case usio_btn::right: return "Right";
-		case usio_btn::taiko_hit_side_left: return "Taiko Hit Side Left";
-		case usio_btn::taiko_hit_side_right: return "Taiko Hit Side Right";
-		case usio_btn::taiko_hit_center_left: return "Taiko Hit Center Left";
-		case usio_btn::taiko_hit_center_right: return "Taiko Hit Center Right";
-		case usio_btn::tekken_button1: return "Tekken Button 1";
-		case usio_btn::tekken_button2: return "Tekken Button 2";
-		case usio_btn::tekken_button3: return "Tekken Button 3";
-		case usio_btn::tekken_button4: return "Tekken Button 4";
-		case usio_btn::tekken_button5: return "Tekken Button 5";
-		case usio_btn::count: return "Count";
-		}
-
-		return unknown;
-	});
-}
-
-struct usio_memory
-{
-	std::vector<u8> backup_memory;
-
-	usio_memory() = default;
-	usio_memory(const usio_memory&) = delete;
-	usio_memory& operator=(const usio_memory&) = delete;
-
-	void init()
-	{
-		backup_memory.clear();
-		backup_memory.resize(page_size * page_count);
-	}
-
-	static constexpr usz page_size = 0x10000;
-	static constexpr usz page_count = 0x10;
-};
-
-usb_device_usio::usb_device_usio(const std::array<u8, 7>& location)
-	: usb_device_emulated(location)
-{
-	// Initialize dependencies
-	g_fxo->need<usio_memory>();
-
-	device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE,
-		UsbDeviceDescriptor{
-			.bcdUSB             = 0x0110,
-			.bDeviceClass       = 0xff,
-			.bDeviceSubClass    = 0x00,
-			.bDeviceProtocol    = 0xff,
-			.bMaxPacketSize0    = 0x8,
-			.idVendor           = 0x0b9a,
-			.idProduct          = 0x0910,
-			.bcdDevice          = 0x0910,
-			.iManufacturer      = 0x01,
-			.iProduct           = 0x02,
-			.iSerialNumber      = 0x00,
-			.bNumConfigurations = 0x01});
-
-	auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG,
-		UsbDeviceConfiguration{
-			.wTotalLength        = 39,
-			.bNumInterfaces      = 0x01,
-			.bConfigurationValue = 0x01,
-			.iConfiguration      = 0x00,
-			.bmAttributes        = 0xc0,
-			.bMaxPower           = 0x32 // ??? 100ma
-		}));
-
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE,
-		UsbDeviceInterface{
-			.bInterfaceNumber   = 0x00,
-			.bAlternateSetting  = 0x00,
-			.bNumEndpoints      = 0x03,
-			.bInterfaceClass    = 0x00,
-			.bInterfaceSubClass = 0x00,
-			.bInterfaceProtocol = 0x00,
-			.iInterface         = 0x00}));
-
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint{
-			.bEndpointAddress = 0x01,
-			.bmAttributes     = 0x02,
-			.wMaxPacketSize   = 0x0040,
-			.bInterval        = 0x00}));
-
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint{
-			.bEndpointAddress = 0x82,
-			.bmAttributes     = 0x02,
-			.wMaxPacketSize   = 0x0040,
-			.bInterval        = 0x00}));
-
-	config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT,
-		UsbDeviceEndpoint{
-			.bEndpointAddress = 0x83,
-			.bmAttributes     = 0x03,
-			.wMaxPacketSize   = 0x0008,
-			.bInterval        = 16}));
-
-	load_backup();
-}
-
-usb_device_usio::~usb_device_usio()
-{
-	save_backup();
-}
-
-std::shared_ptr<usb_device> usb_device_usio::make_instance(u32, const std::array<u8, 7>& location)
-{
-	return std::make_shared<usb_device_usio>(location);
-}
-
-u16 usb_device_usio::get_num_emu_devices()
-{
-	return 1;
-}
-
-void usb_device_usio::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer)
-{
-	transfer->fake = true;
-
-	// Control transfers are nearly instant
-	//switch (bmRequestType)
-	{
-	//default:
-		// Follow to default emulated handler
-		usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
-		//break;
-	}
-}
-
-extern bool is_input_allowed();
-
-void usb_device_usio::load_backup()
-{
-	usio_memory& memory = g_fxo->get<usio_memory>();
-	memory.init();
-
-	fs::file usio_backup_file;
-
-	if (!usio_backup_file.open(usio_backup_path, fs::read))
-	{
-		usio_log.trace("Failed to load the USIO Backup file: %s", usio_backup_path);
-		return;
-	}
-
-	const u64 file_size = memory.backup_memory.size();
-
-	if (usio_backup_file.size() != file_size)
-	{
-		usio_log.trace("Invalid USIO Backup file detected: %s", usio_backup_path);
-		return;
-	}
-
-	usio_backup_file.read(memory.backup_memory.data(), file_size);
-}
-
-void usb_device_usio::save_backup()
-{
-	if (!is_used)
-		return;
-
-	fs::file usio_backup_file;
-
-	if (!usio_backup_file.open(usio_backup_path, fs::create + fs::write + fs::lock))
-	{
-		usio_log.error("Failed to save the USIO Backup file: %s", usio_backup_path);
-		return;
-	}
-
-	const u64 file_size = g_fxo->get<usio_memory>().backup_memory.size();
-
-	usio_backup_file.write(g_fxo->get<usio_memory>().backup_memory.data(), file_size);
-	usio_backup_file.trunc(file_size);
-}
-
-void usb_device_usio::translate_input_taiko()
-{
-	std::lock_guard lock(pad::g_pad_mutex);
-	const auto handler = pad::get_pad_thread();
-
-	std::vector<u8> input_buf(0x60);
-	constexpr le_t<u16> c_hit = 0x1800;
-	le_t<u16> digital_input = 0;
-
-	const auto translate_from_pad = [&](usz pad_number, usz player)
-	{
-		const usz offset = player * 8ULL;
-		auto& status = m_io_status[0];
-
-		if (const auto& pad = ::at32(handler->GetPads(), pad_number); pad->is_connected() && !pad->is_copilot() && is_input_allowed())
-		{
-			const auto& cfg = ::at32(g_cfg_usio.players, pad_number);
-			cfg->handle_input(pad, false, [&](usio_btn btn, pad_button /*pad_btn*/, u16 /*value*/, bool pressed, bool& /*abort*/)
-			{
-				switch (btn)
-				{
-				case usio_btn::test:
-					if (player != 0) break;
-					if (pressed && !status.test_key_pressed) // Solve the need to hold the Test key
-						status.test_on = !status.test_on;
-					status.test_key_pressed = pressed;
-					break;
-				case usio_btn::coin:
-					if (player != 0) break;
-					if (pressed && !status.coin_key_pressed) // Ensure only one coin is inserted each time the Coin key is pressed
-						status.coin_counter++;
-					status.coin_key_pressed = pressed;
-					break;
-				case usio_btn::service:
-					if (player == 0 && pressed)
-						digital_input |= 0x4000;
-					break;
-				case usio_btn::enter:
-					if (player == 0 && pressed)
-						digital_input |= 0x200;
-					break;
-				case usio_btn::up:
-					if (player == 0 && pressed)
-						digital_input |= 0x2000;
-					break;
-				case usio_btn::down:
-					if (player == 0 && pressed)
-						digital_input |= 0x1000;
-					break;
-				case usio_btn::taiko_hit_side_left:
-					if (pressed)
-						std::memcpy(input_buf.data() + 32 + offset, &c_hit, sizeof(u16));
-					break;
-				case usio_btn::taiko_hit_center_right:
-					if (pressed)
-						std::memcpy(input_buf.data() + 36 + offset, &c_hit, sizeof(u16));
-					break;
-				case usio_btn::taiko_hit_side_right:
-					if (pressed)
-						std::memcpy(input_buf.data() + 38 + offset, &c_hit, sizeof(u16));
-					break;
-				case usio_btn::taiko_hit_center_left:
-					if (pressed)
-						std::memcpy(input_buf.data() + 34 + offset, &c_hit, sizeof(u16));
-					break;
-				default:
-					break;
-				}
-			});
-		}
-
-		if (player == 0 && status.test_on)
-			digital_input |= 0x80;
-	};
-
-	for (usz i = 0; i < g_cfg_usio.players.size(); i++)
-		translate_from_pad(i, i);
-
-	std::memcpy(input_buf.data(), &digital_input, sizeof(u16));
-	std::memcpy(input_buf.data() + 16, &m_io_status[0].coin_counter, sizeof(u16));
-
-	response = std::move(input_buf);
-}
-
-void usb_device_usio::translate_input_tekken()
-{
-	std::lock_guard lock(pad::g_pad_mutex);
-	const auto handler = pad::get_pad_thread();
-
-	std::vector<u8> input_buf(0x180);
-	le_t<u64> digital_input[2]{};
-	le_t<u16> digital_input_lm = 0;
-
-	const auto translate_from_pad = [&](usz pad_number, usz player)
-	{
-		const usz shift = (player % 2) * 24ULL;
-		auto& status = m_io_status[player / 2];
-		auto& input = digital_input[player / 2];
-
-		if (const auto& pad = ::at32(handler->GetPads(), pad_number); pad->is_connected() && !pad->is_copilot() && is_input_allowed())
-		{
-			const auto& cfg = ::at32(g_cfg_usio.players, pad_number);
-			cfg->handle_input(pad, false, [&](usio_btn btn, pad_button /*pad_btn*/, u16 /*value*/, bool pressed, bool& /*abort*/)
-			{
-				switch (btn)
-				{
-				case usio_btn::test:
-					if (player % 2 != 0)
-						break;
-					if (pressed && !status.test_key_pressed) // Solve the need to hold the Test button
-						status.test_on = !status.test_on;
-					status.test_key_pressed = pressed;
-					break;
-				case usio_btn::coin:
-					if (player % 2 != 0)
-						break;
-					if (pressed && !status.coin_key_pressed) // Ensure only one coin is inserted each time the Coin button is pressed
-						status.coin_counter++;
-					status.coin_key_pressed = pressed;
-					break;
-				case usio_btn::service:
-					if (player % 2 == 0 && pressed)
-						input |= 0x4000;
-					break;
-				case usio_btn::enter:
-					if (pressed)
-					{
-						input |= 0x800000ULL << shift;
-						if (player == 0)
-							digital_input_lm |= 0x800;
-					}
-					break;
-				case usio_btn::up:
-					if (pressed)
-					{
-						input |= 0x200000ULL << shift;
-						if (player == 0)
-							digital_input_lm |= 0x200;
-					}
-					break;
-				case usio_btn::down:
-					if (pressed)
-					{
-						input |= 0x100000ULL << shift;
-						if (player == 0)
-							digital_input_lm |= 0x400;
-					}
-					break;
-				case usio_btn::left:
-					if (pressed)
-					{
-						input |= 0x80000ULL << shift;
-						if (player == 0)
-							digital_input_lm |= 0x2000;
-					}
-					break;
-				case usio_btn::right:
-					if (pressed)
-					{
-						input |= 0x40000ULL << shift;
-						if (player == 0)
-							digital_input_lm |= 0x4000;
-					}
-					break;
-				case usio_btn::tekken_button1:
-					if (pressed)
-					{
-						input |= 0x20000ULL << shift;
-						if (player == 0)
-							digital_input_lm |= 0x100;
-					}
-					break;
-				case usio_btn::tekken_button2:
-					if (pressed)
-						input |= 0x10000ULL << shift;
-					break;
-				case usio_btn::tekken_button3:
-					if (pressed)
-						input |= 0x40000000ULL << shift;
-					break;
-				case usio_btn::tekken_button4:
-					if (pressed)
-						input |= 0x20000000ULL << shift;
-					break;
-				case usio_btn::tekken_button5:
-					if (pressed)
-						input |= 0x80000000ULL << shift;
-					break;
-				default:
-					break;
-				}
-			});
-		}
-
-		if (player % 2 == 0 && status.test_on)
-		{
-			input |= 0x80;
-			if (player == 0)
-				digital_input_lm |= 0x1000;
-		}
-	};
-
-	for (usz i = 0; i < g_cfg_usio.players.size(); i++)
-		translate_from_pad(i, i);
-
-	for (usz i = 0; i < 2; i++)
-	{
-		std::memcpy(input_buf.data() - i * 0x80 + 0x100, &digital_input[i], sizeof(u64));
-		std::memcpy(input_buf.data() - i * 0x80 + 0x100 + 0x10, &m_io_status[i].coin_counter, sizeof(u16));
-	}
-
-	std::memcpy(input_buf.data(), &digital_input_lm, sizeof(u16));
-
-	input_buf[2] = 0b00010000; // DIP switches, 8 in total
-
-	response = std::move(input_buf);
-}
-
-void usb_device_usio::usio_write(u8 channel, u16 reg, std::vector<u8>& data)
-{
-	const auto get_u16 = [&](std::string_view usio_func) -> u16
-	{
-		if (data.size() != 2)
-		{
-			usio_log.error("data.size() is %d, expected 2 for get_u16 in %s", data.size(), usio_func);
-		}
-		return *reinterpret_cast<const le_t<u16>*>(data.data());
-	};
-
-	if (channel == 0)
-	{
-		switch (reg)
-		{
-		case 0x0002:
-		{
-			usio_log.trace("SetSystemError: 0x%04X", get_u16("SetSystemError"));
-			break;
-		}
-		case 0x000A:
-		{
-			if (get_u16("ClearSram") == 0x6666)
-			    usio_log.trace("ClearSram");
-			break;
-		}
-		case 0x0028:
-		{
-			usio_log.trace("SetExpansionMode: 0x%04X", get_u16("SetExpansionMode"));
-			break;
-		}
-		case 0x0048:
-		case 0x0058:
-		case 0x0068:
-		case 0x0078:
-		{
-			usio_log.trace("SetHopperRequest(Hopper: %d, Request: 0x%04X)", (reg - 0x48) / 0x10, get_u16("SetHopperRequest"));
-			break;
-		}
-		case 0x004A:
-		case 0x005A:
-		case 0x006A:
-		case 0x007A:
-		{
-			usio_log.trace("SetHopperRequest(Hopper: %d, Limit: 0x%04X)", (reg - 0x4A) / 0x10, get_u16("SetHopperLimit"));
-			break;
-		}
-		default:
-		{
-			usio_log.trace("Unhandled channel 0 register write(reg: 0x%04X, size: 0x%04X, data: %s)", reg, data.size(), fmt::buf_to_hexstring(data.data(), data.size()));
-			break;
-		}
-		}
-	}
-	else if (channel >= 2)
-	{
-		const u8 page = channel - 2;
-		usio_log.trace("Usio write of sram(page: 0x%02X, addr: 0x%04X, size: 0x%04X, data: %s)", page, reg, data.size(), fmt::buf_to_hexstring(data.data(), data.size()));
-		auto& memory = g_fxo->get<usio_memory>().backup_memory;
-		const usz addr_end = reg + data.size();
-		if (data.size() > 0 && page < usio_memory::page_count && addr_end <= usio_memory::page_size)
-			std::memcpy(&memory[usio_memory::page_size * page + reg], data.data(), data.size());
-		else
-			usio_log.error("Usio sram invalid write operation(page: 0x%02X, addr: 0x%04X, size: 0x%04X, data: %s)", page, reg, data.size(), fmt::buf_to_hexstring(data.data(), data.size()));
-	}
-	else
-	{
-		// Channel 1 is the endpoint for firmware update.
-		// We are not using any firmware since this is emulation.
-		usio_log.trace("Unsupported write operation(channel: 0x%02X, addr: 0x%04X, size: 0x%04X, data: %s)", channel, reg, data.size(), fmt::buf_to_hexstring(data.data(), data.size()));
-	}
-}
-
-void usb_device_usio::usio_read(u8 channel, u16 reg, u16 size)
-{
-	if (channel == 0)
-	{
-		switch (reg)
-		{
-		case 0x0000:
-		{
-			// Get Buffer, rarely gives a reply on real HW
-			// First U16 seems to be a timestamp of sort
-			// Purpose seems related to connectivity check
-			response = {0x7E, 0xE4, 0x00, 0x00, 0x74, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-			break;
-		}
-		case 0x0080:
-		{
-			// Card reader check - 1
-			response = {0x02, 0x03, 0x06, 0x00, 0xFF, 0x0F, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x10, 0x00};
-			break;
-		}
-		case 0x7000:
-		{
-			// Card reader check - 2
-			// No data returned
-			break;
-		}
-		case 0x1000:
-		{
-			// Often called, gets input from usio for Tekken
-			translate_input_tekken();
-			break;
-		}
-		case 0x1080:
-		{
-			// Often called, gets input from usio for Taiko
-			translate_input_taiko();
-			break;
-		}
-		case 0x1800:
-		case 0x1880:
-		{
-			// Seems to contain a few extra bytes of info in addition to the firmware string
-			// Firmware
-			// "NBGI.;USIO01;Ver1.00;JPN,Multipurpose with PPG."
-			constexpr std::array<u8, 0x180> info {0x4E, 0x42, 0x47, 0x49, 0x2E, 0x3B, 0x55, 0x53, 0x49, 0x4F, 0x30, 0x31, 0x3B, 0x56, 0x65, 0x72, 0x31, 0x2E, 0x30, 0x30, 0x3B, 0x4A, 0x50, 0x4E, 0x2C, 0x4D, 0x75, 0x6C, 0x74, 0x69, 0x70, 0x75, 0x72, 0x70, 0x6F, 0x73, 0x65, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x50, 0x50, 0x47, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0x42, 0x47, 0x49, 0x31, 0x3B, 0x55, 0x53, 0x49, 0x4F, 0x30, 0x31, 0x3B, 0x56, 0x65, 0x72, 0x31, 0x2E, 0x30, 0x30, 0x3B, 0x4A, 0x50, 0x4E, 0x2C, 0x4D, 0x75, 0x6C, 0x74, 0x69, 0x70, 0x75, 0x72, 0x70, 0x6F, 0x73, 0x65, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x50, 0x50, 0x47, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x13, 0x00, 0x30, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x02, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x75, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0x42, 0x47, 0x49, 0x32, 0x3B, 0x55, 0x53, 0x49, 0x4F, 0x30, 0x31, 0x3B, 0x56, 0x65, 0x72, 0x31, 0x2E, 0x30, 0x30, 0x3B, 0x4A, 0x50, 0x4E, 0x2C, 0x4D, 0x75, 0x6C, 0x74, 0x69, 0x70, 0x75, 0x72, 0x70, 0x6F, 0x73, 0x65, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x50, 0x50, 0x47, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x13, 0x00, 0x30, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x02, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x75, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-			response = {info.begin() + (reg - 0x1800), info.end()};
-			break;
-		}
-		default:
-		{
-			usio_log.trace("Unhandled channel 0 register read(reg: 0x%04X, size: 0x%04X)", reg, size);
-			break;
-		}
-		}
-	}
-	else if (channel >= 2)
-	{
-		const u8 page = channel - 2;
-		usio_log.trace("Usio read of sram(page: 0x%02X, addr: 0x%04X, size: 0x%04X)", page, reg, size);
-		auto& memory = g_fxo->get<usio_memory>().backup_memory;
-		const usz addr_end = reg + size;
-		if (size > 0 && page < usio_memory::page_count && addr_end <= usio_memory::page_size)
-			response.insert(response.end(), memory.begin() + (usio_memory::page_size * page + reg), memory.begin() + (usio_memory::page_size * page + addr_end));
-		else
-			usio_log.error("Usio sram invalid read operation(page: 0x%02X, addr: 0x%04X, size: 0x%04X)", page, reg, size);
-	}
-	else
-	{
-		// Channel 1 is the endpoint for firmware update.
-		// We are not using any firmware since this is emulation.
-		usio_log.trace("Unsupported read operation(channel: 0x%02X, addr: 0x%04X, size: 0x%04X)", channel, reg, size);
-	}
-
-	response.resize(size); // Always resize the response vector to the given size
-}
-
-void usb_device_usio::usio_init(u8 channel, u16 reg, u16 size)
-{
-	if (channel == 0)
-	{
-		switch (reg)
-		{
-		case 0x0008:
-		{
-			usio_log.trace("USIO Reset");
-			break;
-		}
-		case 0x000A:
-		{
-			usio_log.trace("USIO ClearSram");
-			g_fxo->get<usio_memory>().init();
-			break;
-		}
-		default:
-		{
-			usio_log.trace("Unhandled channel 0 register init(reg: 0x%04X, size: 0x%04X)", reg, size);
-			break;
-		}
-		}
-	}
-	else
-	{
-		usio_log.trace("Unsupported init operation(channel: 0x%02X, addr: 0x%04X, size: 0x%04X)", channel, reg, size);
-	}
-}
-
-void usb_device_usio::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer)
-{
-	constexpr u8 USIO_COMMAND_WRITE = 0x90;
-	constexpr u8 USIO_COMMAND_READ  = 0x10;
-	constexpr u8 USIO_COMMAND_INIT  = 0xA0;
-
-	static bool expecting_data = false;
-	static std::vector<u8> usio_data;
-	static u32 response_seek = 0;
-	static u8 usio_channel   = 0;
-	static u16 usio_register = 0;
-	static u16 usio_length   = 0;
-
-	transfer->fake            = true;
-	transfer->expected_result = HC_CC_NOERR;
-	// The latency varies per operation but it doesn't seem to matter for this device so let's go fast!
-	transfer->expected_time = get_timestamp() + 1'000;
-
-	is_used = true;
-
-	switch (endpoint)
-	{
-	case 0x01:
-	{
-		// Write endpoint
-		transfer->expected_count = buf_size;
-
-		if (expecting_data)
-		{
-			usio_data.insert(usio_data.end(), buf, buf + buf_size);
-			usio_length -= buf_size;
-
-			if (usio_length == 0)
-			{
-				expecting_data = false;
-				usio_write(usio_channel, usio_register, usio_data);
-			}
-			return;
-		}
-
-		// Commands
-		if (buf_size != 6)
-		{
-			usio_log.error("Expected a command but buf_size != 6");
-			return;
-		}
-
-		usio_channel  = buf[0] & 0xF;
-		usio_register = *reinterpret_cast<le_t<u16>*>(&buf[2]);
-		usio_length   = *reinterpret_cast<le_t<u16>*>(&buf[4]);
-
-		if ((buf[0] & USIO_COMMAND_WRITE) == USIO_COMMAND_WRITE)
-		{
-			usio_log.trace("UsioWrite(Channel: 0x%02X, Register: 0x%04X, Length: 0x%04X)", usio_channel, usio_register, usio_length);
-			if (((~(usio_register >> 8)) & 0xF0) != buf[1])
-			{
-				usio_log.error("Invalid UsioWrite command");
-				return;
-			}
-			expecting_data = true;
-			usio_data.clear();
-		}
-		else if ((buf[0] & USIO_COMMAND_READ) == USIO_COMMAND_READ)
-		{
-			usio_log.trace("UsioRead(Channel: 0x%02X, Register: 0x%04X, Length: 0x%04X)", usio_channel, usio_register, usio_length);
-			response_seek = 0;
-			response.clear();
-			usio_read(usio_channel, usio_register, usio_length);
-		}
-		else if ((buf[0] & USIO_COMMAND_INIT) == USIO_COMMAND_INIT)
-		{
-			usio_log.trace("UsioInit(Channel: 0x%02X, Register: 0x%04X, Length: 0x%04X)", usio_channel, usio_register, usio_length);
-			usio_init(usio_channel, usio_register, usio_length);
-		}
-		else
-		{
-			usio_log.error("Received an unexpected command: 0x%02X", buf[0]);
-		}
-		break;
-	}
-	case 0x82:
-	{
-		// Read endpoint
-		const u32 size = std::min(buf_size, static_cast<u32>(response.size() - response_seek));
-		memcpy(buf, response.data() + response_seek, size);
-		response_seek += size;
-		transfer->expected_count = size;
-		break;
-	}
-	default:
-		usio_log.error("Unhandled endpoint: 0x%x", endpoint);
-		break;
-	}
-}
diff --git a/rpcs3/Emu/Io/usio.h b/rpcs3/Emu/Io/usio.h
deleted file mode 100644
index 7a83e7a8ca..0000000000
--- a/rpcs3/Emu/Io/usio.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-#include "Emu/system_utils.hpp"
-#include "Emu/Io/usb_device.h"
-
-class usb_device_usio : public usb_device_emulated
-{
-public:
-	usb_device_usio(const std::array<u8, 7>& location);
-	~usb_device_usio();
-
-	static std::shared_ptr<usb_device> make_instance(u32 controller_index, const std::array<u8, 7>& location);
-	static u16 get_num_emu_devices();
-
-	void control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue, u16 wIndex, u16 wLength, u32 buf_size, u8* buf, UsbTransfer* transfer) override;
-	void interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer) override;
-
-private:
-	void load_backup();
-	void save_backup();
-	void translate_input_taiko();
-	void translate_input_tekken();
-	void usio_write(u8 channel, u16 reg, std::vector<u8>& data);
-	void usio_read(u8 channel, u16 reg, u16 size);
-	void usio_init(u8 channel, u16 reg, u16 size);
-
-private:
-	bool is_used = false;
-	const std::string usio_backup_path = rpcs3::utils::get_hdd1_dir() + "/caches/usiobackup.bin";
-	std::vector<u8> response;
-
-	struct io_status
-	{
-		bool test_on = false;
-		bool test_key_pressed = false;
-		bool coin_key_pressed = false;
-		le_t<u16> coin_counter = 0;
-	};
-
-	std::array<io_status, 2> m_io_status;
-};
diff --git a/rpcs3/Emu/Io/usio_config.h b/rpcs3/Emu/Io/usio_config.h
deleted file mode 100644
index 4c5fe6f017..0000000000
--- a/rpcs3/Emu/Io/usio_config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#pragma once
-
-#include "emulated_pad_config.h"
-
-enum class usio_btn
-{
-	test,
-	coin,
-	service,
-	enter,
-	up,
-	down,
-	left,
-	right,
-	taiko_hit_side_left,
-	taiko_hit_side_right,
-	taiko_hit_center_left,
-	taiko_hit_center_right,
-	tekken_button1,
-	tekken_button2,
-	tekken_button3,
-	tekken_button4,
-	tekken_button5,
-
-	count
-};
-
-struct cfg_usio final : public emulated_pad_config<usio_btn>
-{
-	cfg_usio(node* owner, const std::string& name) : emulated_pad_config(owner, name) {}
-
-	cfg_pad_btn<usio_btn> test{ this, "Test", usio_btn::test, pad_button::select };
-	cfg_pad_btn<usio_btn> coin{ this, "Coin", usio_btn::coin, pad_button::L3 };
-	cfg_pad_btn<usio_btn> service{this, "Service", usio_btn::service, pad_button::R3};
-	cfg_pad_btn<usio_btn> enter{ this, "Enter/Start", usio_btn::enter, pad_button::start };
-	cfg_pad_btn<usio_btn> up{ this, "Up", usio_btn::up, pad_button::dpad_up };
-	cfg_pad_btn<usio_btn> down{ this, "Down", usio_btn::down, pad_button::dpad_down };
-	cfg_pad_btn<usio_btn> left{this, "Left", usio_btn::left, pad_button::dpad_left};
-	cfg_pad_btn<usio_btn> right{this, "Right", usio_btn::right, pad_button::dpad_right};
-	cfg_pad_btn<usio_btn> taiko_hit_side_left{ this, "Taiko Hit Side Left", usio_btn::taiko_hit_side_left, pad_button::square };
-	cfg_pad_btn<usio_btn> taiko_hit_side_right{ this, "Taiko Hit Side Right", usio_btn::taiko_hit_side_right, pad_button::circle };
-	cfg_pad_btn<usio_btn> taiko_hit_center_left{ this, "Taiko Hit Center Left", usio_btn::taiko_hit_center_left, pad_button::triangle };
-	cfg_pad_btn<usio_btn> taiko_hit_center_right{ this, "Taiko Hit Center Right", usio_btn::taiko_hit_center_right, pad_button::cross };
-	cfg_pad_btn<usio_btn> tekken_button1{this, "Tekken Button 1", usio_btn::tekken_button1, pad_button::square};
-	cfg_pad_btn<usio_btn> tekken_button2{this, "Tekken Button 2", usio_btn::tekken_button2, pad_button::triangle};
-	cfg_pad_btn<usio_btn> tekken_button3{this, "Tekken Button 3", usio_btn::tekken_button3, pad_button::cross};
-	cfg_pad_btn<usio_btn> tekken_button4{this, "Tekken Button 4", usio_btn::tekken_button4, pad_button::circle};
-	cfg_pad_btn<usio_btn> tekken_button5{this, "Tekken Button 5", usio_btn::tekken_button5, pad_button::R1};
-};
-
-struct cfg_usios final : public emulated_pads_config<cfg_usio, 4>
-{
-	cfg_usios() : emulated_pads_config<cfg_usio, 4>("usio") {};
-};
-
-extern cfg_usios g_cfg_usio;
diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp
index d7109bf78a..f6f9dcf0db 100644
--- a/rpcs3/Emu/Memory/vm.cpp
+++ b/rpcs3/Emu/Memory/vm.cpp
@@ -1,37 +1,32 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "vm_locking.h"
 #include "vm_ptr.h"
 #include "vm_ref.h"
 #include "vm_reservation.h"
 
+#include "Utilities/mutex.h"
 #include "Utilities/Thread.h"
 #include "Utilities/address_range.h"
 #include "Emu/CPU/CPUThread.h"
 #include "Emu/RSX/RSXThread.h"
 #include "Emu/Cell/SPURecompiler.h"
 #include "Emu/perf_meter.hpp"
+#include <thread>
 #include <deque>
-#include <span>
+#include <shared_mutex>
 
 #include "util/vm.hpp"
 #include "util/asm.hpp"
-#include "util/simd.hpp"
-#include "util/serialization.hpp"
-
-#include <thread>
 
 LOG_CHANNEL(vm_log, "VM");
 
-void ppu_remove_hle_instructions(u32 addr, u32 size);
-extern bool is_memory_compatible_for_copy_from_executable_optimization(u32 addr, u32 size);
-
 namespace vm
 {
-	static u8* memory_reserve_4GiB(void* _addr, u64 size = 0x100000000, bool is_memory_mapping = false)
+	static u8* memory_reserve_4GiB(void* _addr, u64 size = 0x100000000)
 	{
 		for (u64 addr = reinterpret_cast<u64>(_addr) + 0x100000000; addr < 0x8000'0000'0000; addr += 0x100000000)
 		{
-			if (auto ptr = utils::memory_reserve(size, reinterpret_cast<void*>(addr), is_memory_mapping))
+			if (auto ptr = utils::memory_reserve(size, reinterpret_cast<void*>(addr)))
 			{
 				return static_cast<u8*>(ptr);
 			}
@@ -41,13 +36,13 @@ namespace vm
 	}
 
 	// Emulated virtual memory
-	u8* const g_base_addr = memory_reserve_4GiB(reinterpret_cast<void*>(0x2'0000'0000), 0x2'0000'0000, true);
+	u8* const g_base_addr = memory_reserve_4GiB(reinterpret_cast<void*>(0x2'0000'0000), 0x2'0000'0000);
 
 	// Unprotected virtual memory mirror
 	u8* const g_sudo_addr = g_base_addr + 0x1'0000'0000;
 
 	// Auxiliary virtual memory for executable areas
-	u8* const g_exec_addr = memory_reserve_4GiB(g_sudo_addr, 0x300000000);
+	u8* const g_exec_addr = memory_reserve_4GiB(g_sudo_addr, 0x200000000);
 
 	// Hooks for memory R/W interception (default: zero offset to some function with only ret instructions)
 	u8* const g_hook_addr = memory_reserve_4GiB(g_exec_addr, 0x800000000);
@@ -67,19 +62,20 @@ namespace vm
 	// Memory locations
 	alignas(64) std::vector<std::shared_ptr<block_t>> g_locations;
 
+	// Memory mutex core
+	shared_mutex g_mutex;
+
 	// Memory mutex acknowledgement
 	thread_local atomic_t<cpu_thread*>* g_tls_locked = nullptr;
 
+	// "Unique locked" range lock, as opposed to "shared" range locks from set
+	atomic_t<u64> g_range_lock = 0;
+
 	// Memory mutex: passive locks
 	std::array<atomic_t<cpu_thread*>, g_cfg.core.ppu_threads.max> g_locks{};
 
 	// Range lock slot allocation bits
-	atomic_t<u64, 64> g_range_lock_bits[2]{};
-
-	auto& get_range_lock_bits(bool is_exclusive_range)
-	{
-		return g_range_lock_bits[+is_exclusive_range];
-	}
+	atomic_t<u64> g_range_lock_bits{};
 
 	// Memory range lock slots (sparse atomics)
 	atomic_t<u64, 64> g_range_lock_set[64]{};
@@ -101,13 +97,6 @@ namespace vm
 		u64 old = -1;
 		const auto cpu = get_current_cpu_thread();
 
-		const bool had_wait = cpu && cpu->state & cpu_flag::wait;
-
-		if (cpu && !had_wait)
-		{
-			cpu->state += cpu_flag::wait;
-		}
-
 		while (true)
 		{
 			const auto [ok, rtime] = try_reservation_update(addr);
@@ -116,18 +105,18 @@ namespace vm
 			{
 				if (ok)
 				{
-					reservation_notifier_notify(addr);
-				}
-
-				if (cpu && !had_wait && cpu->test_stopped())
-				{
-					//
+					reservation_notifier(addr).notify_all();
 				}
 
 				return;
 			}
 
 			old = rtime;
+
+			if (cpu && cpu->test_stopped())
+			{
+				return;
+			}
 		}
 	}
 
@@ -147,10 +136,9 @@ namespace vm
 
 	atomic_t<u64, 64>* alloc_range_lock()
 	{
-		const auto [bits, ok] = get_range_lock_bits(false).fetch_op([](u64& bits)
+		const auto [bits, ok] = g_range_lock_bits.fetch_op([](u64& bits)
 		{
-			// MSB is reserved for locking with memory setting changes
-			if ((~(bits | (bits + 1))) << 1) [[likely]]
+			if (~bits) [[likely]]
 			{
 				bits |= bits + 1;
 				return true;
@@ -167,109 +155,89 @@ namespace vm
 		return &g_range_lock_set[std::countr_one(bits)];
 	}
 
-	template <typename F>
-	static u64 for_all_range_locks(u64 input, F func);
-
 	void range_lock_internal(atomic_t<u64, 64>* range_lock, u32 begin, u32 size)
 	{
-		perf_meter<"RHW_LOCK"_u64> perf0(0);
+		perf_meter<"RHW_LOCK"_u64> perf0;
 
-		cpu_thread* _cpu = nullptr;
+		auto _cpu = get_current_cpu_thread();
 
-		if (u64 to_store = begin | (u64{size} << 32); *range_lock != to_store)
+		if (_cpu)
 		{
-			range_lock->store(to_store);
+			_cpu->state += cpu_flag::wait + cpu_flag::temp;
 		}
 
 		for (u64 i = 0;; i++)
 		{
+			range_lock->store(begin | (u64{size} << 32));
+
+			const u64 lock_val = g_range_lock.load();
 			const u64 is_share = g_shmem[begin >> 16].load();
 
-			const u64 busy = for_all_range_locks(get_range_lock_bits(true), [&](u64 addr_exec, u32 size_exec)
+			u64 lock_addr = static_cast<u32>(lock_val); // -> u64
+			u32 lock_size = static_cast<u32>(lock_val << range_bits >> (range_bits + 32));
+
+			u64 addr = begin;
+
+			if ((lock_val & range_full_mask) == range_locked) [[likely]]
 			{
-				u64 addr = begin;
+				lock_size = 128;
 
-				if ((size_exec & (range_full_mask >> 32)) == (range_locked >> 32)) [[likely]]
+				if (is_share)
 				{
-					size_exec = 128;
-
-					if (is_share)
-					{
-						addr = static_cast<u16>(addr) | is_share;
-					}
+					addr = static_cast<u16>(addr) | is_share;
+					lock_addr = lock_val;
 				}
+			}
 
-				size_exec = (size_exec << range_bits) >> range_bits;
-
-				// TODO (currently not possible): handle 2 64K pages (inverse range), or more pages
-				if (u64 is_shared = g_shmem[addr_exec >> 16]) [[unlikely]]
-				{
-					addr_exec = static_cast<u16>(addr_exec) | is_shared;
-				}
-
-				if (addr <= addr_exec + size_exec - 1 && addr_exec <= addr + size - 1) [[unlikely]]
-				{
-					return 1;
-				}
-
-				return 0;
-			});
-
-			if (!busy) [[likely]]
+			if (addr + size <= lock_addr || addr >= lock_addr + lock_size) [[likely]]
 			{
-				if (vm::check_addr(begin, vm::page_readable, size)) [[likely]]
+				const u64 new_lock_val = g_range_lock.load();
+
+				if (vm::check_addr(begin, vm::page_readable, size) && (!new_lock_val || new_lock_val == lock_val)) [[likely]]
 				{
 					break;
 				}
-
-				u32 test = umax;
-
-				for (u32 i = begin / 4096, max = (begin + size - 1) / 4096; i <= max; i++)
-				{
-					if (!(g_pages[i] & (vm::page_readable)))
-					{
-						test = i * 4096;
-						break;
-					}
-				}
-
-				if (test != umax)
-				{
-					range_lock->release(0);
-
-					if (!perf0)
-					{
-						perf0.restart();
-					}
-
-					// Try triggering a page fault (write)
-					// TODO: Read memory if needed
-					utils::trigger_write_page_fault(vm::base(test / 4096 == begin / 4096 ? begin : test));
-					continue;
-				}
-			}
-
-			// Wait a bit before accessing global lock
-			range_lock->release(0);
-
-			if (!perf0)
-			{
-				perf0.restart();
 			}
 
+			// Wait a bit before accessing g_mutex
+			range_lock->store(0);
 			busy_wait(200);
 
-			if (i >= 2 && !_cpu)
-			{
-				_cpu = cpu_thread::get_current();
+			std::shared_lock lock(g_mutex, std::try_to_lock);
 
-				if (_cpu)
+			if (!lock && i < 15)
+			{
+				busy_wait(200);
+				continue;
+			}
+			else if (!lock)
+			{
+				lock.lock();
+			}
+
+			u32 test = 0;
+
+			for (u32 i = begin / 4096, max = (begin + size - 1) / 4096; i <= max; i++)
+			{
+				if (!(g_pages[i] & (vm::page_readable)))
 				{
-					_cpu->state += cpu_flag::wait + cpu_flag::temp;
+					test = i * 4096;
+					break;
 				}
 			}
 
-			range_lock->store(begin | (u64{size} << 32));
+			if (test)
+			{
+				lock.unlock();
+
+				// Try tiggering a page fault (write)
+				// TODO: Read memory if needed
+				vm::_ref<atomic_t<u8>>(test) += 0;
+				continue;
+			}
+
+			range_lock->release(begin | (u64{size} << 32));
+			break;
 		}
 
 		if (_cpu)
@@ -289,7 +257,7 @@ namespace vm
 
 		// Use ptr difference to determine location
 		const auto diff = range_lock - g_range_lock_set;
-		g_range_lock_bits[0] &= ~(1ull << diff);
+		g_range_lock_bits &= ~(1ull << diff);
 	}
 
 	template <typename F>
@@ -319,13 +287,14 @@ namespace vm
 		return result;
 	}
 
-	static atomic_t<u64, 64>* _lock_main_range_lock(u64 flags, u32 addr, u32 size)
+	static void _lock_main_range_lock(u64 flags, u32 addr, u32 size)
 	{
 		// Shouldn't really happen
 		if (size == 0)
 		{
 			vm_log.warning("Tried to lock empty range (flags=0x%x, addr=0x%x)", flags >> 32, addr);
-			return {};
+			g_range_lock.release(0);
+			return;
 		}
 
 		// Limit to <512 MiB at once; make sure if it operates on big amount of data, it's page-aligned
@@ -335,22 +304,21 @@ namespace vm
 		}
 
 		// Block or signal new range locks
-		auto range_lock = &*std::prev(std::end(vm::g_range_lock_set));
-		*range_lock = addr | u64{size} << 32 | flags;
+		g_range_lock = addr | u64{size} << 32 | flags;
 
 		utils::prefetch_read(g_range_lock_set + 0);
 		utils::prefetch_read(g_range_lock_set + 2);
 		utils::prefetch_read(g_range_lock_set + 4);
 
-		const auto range = utils::address_range32::start_length(addr, size);
+		const auto range = utils::address_range::start_length(addr, size);
 
-		u64 to_clear = get_range_lock_bits(false).load();
+		u64 to_clear = g_range_lock_bits.load();
 
 		while (to_clear)
 		{
 			to_clear = for_all_range_locks(to_clear, [&](u32 addr2, u32 size2)
 			{
-				if (range.overlaps(utils::address_range32::start_length(addr2, size2))) [[unlikely]]
+				if (range.overlaps(utils::address_range::start_length(addr2, size2))) [[unlikely]]
 				{
 					return 1;
 				}
@@ -365,21 +333,22 @@ namespace vm
 
 			utils::pause();
 		}
-
-		return range_lock;
 	}
 
 	void passive_lock(cpu_thread& cpu)
 	{
-		ensure(cpu.state & cpu_flag::wait);
-
 		bool ok = true;
 
 		if (!g_tls_locked || *g_tls_locked != &cpu) [[unlikely]]
 		{
 			_register_lock(&cpu);
 
-			if (!get_range_lock_bits(true))
+			if (cpu.state & cpu_flag::memory) [[likely]]
+			{
+				cpu.state -= cpu_flag::memory;
+			}
+
+			if (g_mutex.is_lockable())
 			{
 				return;
 			}
@@ -387,33 +356,17 @@ namespace vm
 			ok = false;
 		}
 
-		// Do some CPU work
-		cpu.cpu_wait(+cpu_flag::exit);
-
 		if (!ok || cpu.state & cpu_flag::memory)
 		{
-			for (u64 i = 0;; i++)
+			while (true)
 			{
-				if (cpu.is_paused())
-				{
-					// Assume called from cpu_thread::check_state(), it can handle the pause flags better
-					return;
-				}
+				g_mutex.lock_unlock();
+				cpu.state -= cpu_flag::memory;
 
-				if (!get_range_lock_bits(true)) [[likely]]
+				if (g_mutex.is_lockable()) [[likely]]
 				{
 					return;
 				}
-
-				if (i < 100)
-					busy_wait(200);
-				else
-					std::this_thread::yield();
-
-				if (cpu_flag::wait - cpu.state)
-				{
-					cpu.state += cpu_flag::wait;
-				}
 			}
 		}
 	}
@@ -432,22 +385,14 @@ namespace vm
 		}
 	}
 
-	bool temporary_unlock(cpu_thread& cpu) noexcept
+	void temporary_unlock(cpu_thread& cpu) noexcept
 	{
-		bs_t<cpu_flag> add_state = cpu_flag::wait;
+		if (!(cpu.state & cpu_flag::wait)) cpu.state += cpu_flag::wait;
 
 		if (g_tls_locked && g_tls_locked->compare_and_swap_test(&cpu, nullptr))
 		{
-			add_state += cpu_flag::memory;
+			cpu.state += cpu_flag::memory;
 		}
-
-		if (add_state - cpu.state)
-		{
-			cpu.state += add_state;
-			return true;
-		}
-
-		return false;
 	}
 
 	void temporary_unlock() noexcept
@@ -458,22 +403,13 @@ namespace vm
 		}
 	}
 
-	writer_lock::writer_lock() noexcept
-		: writer_lock(0, nullptr, 1)
+	reader_lock::reader_lock()
 	{
-	}
+		auto cpu = get_current_cpu_thread();
 
-	writer_lock::writer_lock(u32 const addr, atomic_t<u64, 64>* range_lock, u32 const size, u64 const flags) noexcept
-		: range_lock(range_lock)
-	{
-		cpu_thread* cpu{};
-
-		if (g_tls_locked)
+		if (cpu)
 		{
-			cpu = get_current_cpu_thread();
-			AUDIT(cpu);
-
-			if (*g_tls_locked != cpu || cpu->state & cpu_flag::wait)
+			if (!g_tls_locked || *g_tls_locked != cpu || cpu->state & cpu_flag::wait)
 			{
 				cpu = nullptr;
 			}
@@ -483,48 +419,62 @@ namespace vm
 			}
 		}
 
-		for (u64 i = 0;; i++)
+		g_mutex.lock_shared();
+
+		if (cpu)
 		{
-			auto& bits = get_range_lock_bits(true);
+			cpu->state -= cpu_flag::memory + cpu_flag::wait;
+		}
+	}
 
-			if (!range_lock)
+	reader_lock::~reader_lock()
+	{
+		if (m_upgraded)
+		{
+			g_mutex.unlock();
+		}
+		else
+		{
+			g_mutex.unlock_shared();
+		}
+	}
+
+	void reader_lock::upgrade()
+	{
+		if (m_upgraded)
+		{
+			return;
+		}
+
+		g_mutex.lock_upgrade();
+		m_upgraded = true;
+	}
+
+	writer_lock::writer_lock(u32 addr /*mutable*/)
+	{
+		auto cpu = get_current_cpu_thread();
+
+		if (cpu)
+		{
+			if (!g_tls_locked || *g_tls_locked != cpu || cpu->state & cpu_flag::wait)
 			{
-				if (!bits && bits.compare_and_swap_test(0, u64{umax}))
-				{
-					break;
-				}
+				cpu = nullptr;
 			}
 			else
 			{
-				range_lock->release(addr | u64{size} << 32 | flags);
-
-				const auto diff = range_lock - g_range_lock_set;
-
-				if (bits != umax && !bits.bit_test_set(static_cast<u32>(diff)))
-				{
-					break;
-				}
-
-				range_lock->release(0);
-			}
-
-			if (i < 100)
-			{
-				busy_wait(200);
-			}
-			else
-			{
-				std::this_thread::yield();
+				cpu->state += cpu_flag::wait;
 			}
 		}
 
-		if (range_lock)
+		g_mutex.lock();
+
+		if (addr >= 0x10000)
 		{
 			perf_meter<"SUSPEND"_u64> perf0;
 
 			for (auto lock = g_locks.cbegin(), end = lock + g_cfg.core.ppu_threads; lock != end; lock++)
 			{
-				if (auto ptr = +*lock; ptr && ptr->state.none_of(cpu_flag::wait + cpu_flag::memory))
+				if (auto ptr = +*lock; ptr && !(ptr->state & cpu_flag::memory))
 				{
 					ptr->state.test_and_set(cpu_flag::memory);
 				}
@@ -538,36 +488,29 @@ namespace vm
 				addr1 = static_cast<u16>(addr) | is_shared;
 			}
 
+			g_range_lock = addr | range_locked;
+
 			utils::prefetch_read(g_range_lock_set + 0);
 			utils::prefetch_read(g_range_lock_set + 2);
 			utils::prefetch_read(g_range_lock_set + 4);
 
-			u64 to_clear = get_range_lock_bits(false);
+			u64 to_clear = g_range_lock_bits.load();
 
 			u64 point = addr1 / 128;
 
 			while (true)
 			{
-				to_clear = for_all_range_locks(to_clear & ~get_range_lock_bits(true), [&](u64 addr2, u32 size2)
+				to_clear = for_all_range_locks(to_clear, [&](u64 addr2, u32 size2)
 				{
-					// Split and check every 64K page separately
-					for (u64 hi = addr2 >> 16, max = (addr2 + size2 - 1) >> 16; hi <= max; hi++)
+					// TODO (currently not possible): handle 2 64K pages (inverse range), or more pages
+					if (u64 is_shared = g_shmem[addr2 >> 16]) [[unlikely]]
 					{
-						u64 addr3 = addr2;
-						u64 size3 = std::min<u64>(addr2 + size2, utils::align(addr2, 0x10000)) - addr2;
+						addr2 = static_cast<u16>(addr2) | is_shared;
+					}
 
-						if (u64 is_shared = g_shmem[hi]) [[unlikely]]
-						{
-							addr3 = static_cast<u16>(addr2) | is_shared;
-						}
-
-						if (point - (addr3 / 128) <= (addr3 + size3 - 1) / 128 - (addr3 / 128)) [[unlikely]]
-						{
-							return 1;
-						}
-
-						addr2 += size3;
-						size2 -= static_cast<u32>(size3);
+					if (point - (addr2 / 128) <= (addr2 + size2 - 1) / 128 - (addr2 / 128)) [[unlikely]]
+					{
+						return 1;
 					}
 
 					return 0;
@@ -599,6 +542,12 @@ namespace vm
 		}
 	}
 
+	writer_lock::~writer_lock()
+	{
+		g_range_lock.release(0);
+		g_mutex.unlock();
+	}
+
 	u64 reservation_lock_internal(u32 addr, atomic_t<u64>& res)
 	{
 		for (u64 i = 0;; i++)
@@ -688,12 +637,12 @@ namespace vm
 	{
 		const auto _cpu = get_current_cpu_thread();
 
-		if (_cpu && _cpu->get_class() == thread_class::ppu)
+		if (_cpu && _cpu->id_type() == 1)
 		{
 			// TODO: PPU g_escape
 		}
 
-		if (_cpu && _cpu->get_class() == thread_class::spu)
+		if (_cpu && _cpu->id_type() == 2)
 		{
 			spu_runtime::g_escape(static_cast<spu_thread*>(_cpu));
 		}
@@ -701,7 +650,7 @@ namespace vm
 		thread_ctrl::emergency_exit("vm::reservation_escape");
 	}
 
-	static void _page_map(u32 addr, u8 flags, u32 size, utils::shm* shm, u64 bflags, std::pair<const u32, std::pair<u32, std::shared_ptr<utils::shm>>>* (*search_shm)(vm::block_t* block, utils::shm* shm))
+	static void _page_map(u32 addr, u8 flags, u32 size, utils::shm* shm, std::pair<const u32, std::pair<u32, std::shared_ptr<utils::shm>>>* (*search_shm)(vm::block_t* block, utils::shm* shm))
 	{
 		perf_meter<"PAGE_MAP"_u64> perf0;
 
@@ -718,11 +667,8 @@ namespace vm
 			}
 		}
 
-		// If native page size exceeds 4096, don't map native pages (expected to be always mapped in this case)
-		const bool is_noop = bflags & page_size_4k && utils::get_page_size() > 4096;
-
 		// Lock range being mapped
-		auto range_lock = _lock_main_range_lock(range_allocation, addr, size);
+		_lock_main_range_lock(range_allocation, addr, size);
 
 		if (shm && shm->flags() != 0 && shm->info++)
 		{
@@ -736,7 +682,7 @@ namespace vm
 				// 1. To simplify range_lock logic
 				// 2. To make sure it never overlaps with 32-bit addresses
 				// Also check that it's aligned (lowest 16 bits)
-				ensure((shm_self & 0xffff'0000'0000'ffff) == range_locked);
+				ensure((shm_self & 0xffff'8000'0000'ffff) == range_locked);
 
 				// Find another mirror and map it as shareable too
 				for (auto& ploc : g_locations)
@@ -766,7 +712,7 @@ namespace vm
 			u64 shm_self = reinterpret_cast<u64>(shm->get()) ^ range_locked;
 
 			// Check (see above)
-			ensure((shm_self & 0xffff'0000'0000'ffff) == range_locked);
+			ensure((shm_self & 0xffff'8000'0000'ffff) == range_locked);
 
 			// Map range as shareable
 			for (u32 i = addr / 65536; i < addr / 65536 + size / 65536; i++)
@@ -789,38 +735,16 @@ namespace vm
 		if (~flags & page_readable)
 			prot = utils::protection::no;
 
-		std::string map_error;
-
-		auto map_critical = [&](u8* ptr, utils::protection prot)
-		{
-			auto [res, error] = shm->map_critical(ptr, prot);
-
-			if (res != ptr)
-			{
-				map_error = std::move(error);
-				return false;
-			}
-
-			return true;
-		};
-
-		if (is_noop)
-		{
-		}
-		else if (!shm)
+		if (!shm)
 		{
 			utils::memory_protect(g_base_addr + addr, size, prot);
-
-			perf_meter<"PAGE_LCK"_u64> perf;
-			utils::memory_lock(g_base_addr + addr, size);
-			utils::memory_lock(g_sudo_addr + addr, size);
 		}
-		else if (!map_critical(g_base_addr + addr, prot) || !map_critical(g_sudo_addr + addr, utils::protection::rw) || (map_error = "map_self()", !shm->map_self()))
+		else if (shm->map_critical(g_base_addr + addr, prot) != g_base_addr + addr || shm->map_critical(g_sudo_addr + addr) != g_sudo_addr + addr)
 		{
-			fmt::throw_exception("Memory mapping failed (addr=0x%x, size=0x%x, flags=0x%x): %s", addr, size, flags, map_error);
+			fmt::throw_exception("Memory mapping failed - blame Windows (addr=0x%x, size=0x%x, flags=0x%x)", addr, size, flags);
 		}
 
-		if (flags & page_executable && !is_noop)
+		if (flags & page_executable)
 		{
 			// TODO (dead code)
 			utils::memory_commit(g_exec_addr + addr * 2, size * 2);
@@ -839,14 +763,15 @@ namespace vm
 			}
 		}
 
-		range_lock->release(0);
+		// Unlock
+		g_range_lock.release(0);
 	}
 
 	bool page_protect(u32 addr, u32 size, u8 flags_test, u8 flags_set, u8 flags_clear)
 	{
 		perf_meter<"PAGE_PRO"_u64> perf0;
 
-		vm::writer_lock lock;
+		vm::writer_lock lock(0);
 
 		if (!size || (size | addr) % 4096)
 		{
@@ -897,7 +822,7 @@ namespace vm
 						safe_bits |= range_writable;
 
 					// Protect range locks from observing changes in memory protection
-					auto range_lock = _lock_main_range_lock(safe_bits, start * 4096, page_size);
+					_lock_main_range_lock(safe_bits, start * 4096, page_size);
 
 					for (u32 j = start; j < i; j++)
 					{
@@ -909,8 +834,10 @@ namespace vm
 						const auto protection = start_value & page_writable ? utils::protection::rw : (start_value & page_readable ? utils::protection::ro : utils::protection::no);
 						utils::memory_protect(g_base_addr + start * 4096, page_size, protection);
 					}
-
-					range_lock->release(0);
+				}
+				else
+				{
+					g_range_lock.release(0);
 				}
 
 				start_value = new_val;
@@ -918,10 +845,12 @@ namespace vm
 			}
 		}
 
+		g_range_lock.release(0);
+
 		return true;
 	}
 
-	static u32 _page_unmap(u32 addr, u32 max_size, u64 bflags, utils::shm* shm, std::vector<std::pair<u64, u64>>& unmap_events)
+	static u32 _page_unmap(u32 addr, u32 max_size, utils::shm* shm)
 	{
 		perf_meter<"PAGE_UNm"_u64> perf0;
 
@@ -930,9 +859,6 @@ namespace vm
 			fmt::throw_exception("Invalid arguments (addr=0x%x, max_size=0x%x)", addr, max_size);
 		}
 
-		// If native page size exceeds 4096, don't unmap native pages (always mapped)
-		const bool is_noop = bflags & page_size_4k && utils::get_page_size() > 4096;
-
 		// Determine deallocation size
 		u32 size = 0;
 		bool is_exec = false;
@@ -958,7 +884,7 @@ namespace vm
 		}
 
 		// Protect range locks from actual memory protection changes
-		auto range_lock = _lock_main_range_lock(range_allocation, addr, size);
+		_lock_main_range_lock(range_allocation, addr, size);
 
 		if (shm && shm->flags() != 0 && g_shmem[addr >> 16])
 		{
@@ -983,20 +909,13 @@ namespace vm
 		// Notify rsx to invalidate range
 		// Note: This must be done *before* memory gets unmapped while holding the vm lock, otherwise
 		//       the RSX might try to call VirtualProtect on memory that is already unmapped
-		if (auto rsxthr = g_fxo->try_get<rsx::thread>())
+		if (auto& rsxthr = g_fxo->get<rsx::thread>(); g_fxo->is_init<rsx::thread>())
 		{
-			rsxthr->on_notify_pre_memory_unmapped(addr, size, unmap_events);
+			rsxthr.on_notify_memory_unmapped(addr, size);
 		}
 
-		// Deregister PPU related data
-		ppu_remove_hle_instructions(addr, size);
-
 		// Actually unmap memory
-		if (is_noop)
-		{
-			std::memset(g_sudo_addr + addr, 0, size);
-		}
-		else if (!shm)
+		if (!shm)
 		{
 			utils::memory_protect(g_base_addr + addr, size, utils::protection::no);
 			std::memset(g_sudo_addr + addr, 0, size);
@@ -1009,7 +928,7 @@ namespace vm
 #endif
 		}
 
-		if (is_exec && !is_noop)
+		if (is_exec)
 		{
 			utils::memory_decommit(g_exec_addr + addr * 2, size * 2);
 
@@ -1019,7 +938,9 @@ namespace vm
 			}
 		}
 
-		range_lock->release(0);
+		// Unlock
+		g_range_lock.release(0);
+
 		return size;
 	}
 
@@ -1080,7 +1001,7 @@ namespace vm
 		return block->alloc(size, nullptr, align);
 	}
 
-	bool falloc(u32 addr, u32 size, memory_location_t location, const std::shared_ptr<utils::shm>* src)
+	u32 falloc(u32 addr, u32 size, memory_location_t location, const std::shared_ptr<utils::shm>* src)
 	{
 		const auto block = get(location, addr);
 
@@ -1088,7 +1009,7 @@ namespace vm
 		{
 			vm_log.error("vm::falloc(): Invalid memory location (%u, addr=0x%x)", +location, addr);
 			ensure(location == any || location < memory_location_max); // The only allowed locations to fail
-			return false;
+			return 0;
 		}
 
 		return block->falloc(addr, size, src);
@@ -1124,7 +1045,7 @@ namespace vm
 	// Mapped regions: addr -> shm handle
 	constexpr auto block_map = &auto_typemap<block_t>::get<std::map<u32, std::pair<u32, std::shared_ptr<utils::shm>>>>;
 
-	bool block_t::try_alloc(u32 addr, u64 bflags, u32 size, std::shared_ptr<utils::shm>&& shm) const
+	bool block_t::try_alloc(u32 addr, u8 flags, u32 size, std::shared_ptr<utils::shm>&& shm) const
 	{
 		// Check if memory area is already mapped
 		for (u32 i = addr / 4096; i <= (addr + size - 1) / 4096; i++)
@@ -1138,34 +1059,6 @@ namespace vm
 		const u32 page_addr = addr + (this->flags & stack_guarded ? 0x1000 : 0);
 		const u32 page_size = size - (this->flags & stack_guarded ? 0x2000 : 0);
 
-		// No flags are default to readable/writable
-		// Explicit (un...) flags are used to protect from such access
-		u8 flags = 0;
-
-		if (~bflags & alloc_hidden)
-		{
-			flags |= page_readable;
-
-			if (~bflags & alloc_unwritable)
-			{
-				flags |= page_writable;
-			}
-		}
-
-		if (bflags & alloc_executable)
-		{
-			flags |= page_executable;
-		}
-
-		if ((bflags & page_size_mask) == page_size_64k)
-		{
-			flags |= page_64k_size;
-		}
-		else if (!(bflags & (page_size_mask & ~page_size_1m)))
-		{
-			flags |= page_1m_size;
-		}
-
 		if (this->flags & stack_guarded)
 		{
 			// Mark overflow/underflow guard pages as allocated
@@ -1174,7 +1067,7 @@ namespace vm
 		}
 
 		// Map "real" memory pages; provide a function to search for mirrors with private member access
-		_page_map(page_addr, flags, page_size, shm.get(), this->flags, [](vm::block_t* _this, utils::shm* shm)
+		_page_map(page_addr, flags, page_size, shm.get(), [](vm::block_t* _this, utils::shm* shm)
 		{
 			auto& map = (_this->m.*block_map)();
 
@@ -1203,16 +1096,13 @@ namespace vm
 		{
 			auto fill64 = [](u8* ptr, u64 data, usz count)
 			{
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 				__stosq(reinterpret_cast<u64*>(ptr), data, count);
-#elif defined(ARCH_X64)
+#else
 				__asm__ ("mov %0, %%rdi; mov %1, %%rax; mov %2, %%rcx; rep stosq;"
 					:
 					: "r" (ptr), "r" (data), "r" (count)
 					: "rdi", "rax", "rcx", "memory");
-#else
-				for (usz i = 0; i < count; i++)
-					reinterpret_cast<u64*>(ptr)[i] = data;
 #endif
 			};
 
@@ -1227,79 +1117,32 @@ namespace vm
 		return true;
 	}
 
-	static constexpr u64 process_block_flags(u64 flags)
-	{
-		if ((flags & page_size_mask) == 0)
-		{
-			flags |= page_size_1m;
-		}
-
-		if (flags & page_size_4k)
-		{
-			flags |= preallocated;
-		}
-		else
-		{
-			flags &= ~stack_guarded;
-		}
-
-		return flags;
-	}
-
-	static u64 init_block_id()
-	{
-		static atomic_t<u64> s_id = 1;
-		return s_id++;
-	}
-
 	block_t::block_t(u32 addr, u32 size, u64 flags)
-		: m_id(init_block_id())
-		, addr(addr)
+		: addr(addr)
 		, size(size)
-		, flags(process_block_flags(flags))
+		, flags(flags)
 	{
-		if (this->flags & preallocated)
+		if (flags & page_size_4k || flags & preallocated)
 		{
-			std::string map_error;
-
-			auto map_critical = [&](u8* ptr, utils::protection prot)
-			{
-				auto [res, error] = m_common->map_critical(ptr, prot);
-
-				if (res != ptr)
-				{
-					map_error = std::move(error);
-					return false;
-				}
-
-				return true;
-			};
-
 			// Special path for whole-allocated areas allowing 4k granularity
-			m_common = std::make_shared<utils::shm>(size, fmt::format("_block_x%08x", addr));
-
-			if (!map_critical(vm::_ptr<u8>(addr), this->flags & page_size_4k && utils::get_page_size() > 4096 ? utils::protection::rw : utils::protection::no) || !map_critical(vm::get_super_ptr(addr), utils::protection::rw))
-			{
-				fmt::throw_exception("Memory mapping failed (addr=0x%x, size=0x%x, flags=0x%x): %s", addr, size, flags, map_error);
-			}
+			m_common = std::make_shared<utils::shm>(size);
+			m_common->map_critical(vm::base(addr), utils::protection::no);
+			m_common->map_critical(vm::get_super_ptr(addr));
 		}
 	}
 
-	bool block_t::unmap(std::vector<std::pair<u64, u64>>* unmapped)
+	block_t::~block_t()
 	{
 		auto& m_map = (m.*block_map)();
-
-		if (m_id.exchange(0))
 		{
+			vm::writer_lock lock(0);
+
 			// Deallocate all memory
 			for (auto it = m_map.begin(), end = m_map.end(); it != end;)
 			{
 				const auto next = std::next(it);
 				const auto size = it->second.first;
-
-				std::vector<std::pair<u64, u64>> event_data;
-				ensure(size == _page_unmap(it->first, size, this->flags, it->second.second.get(), unmapped ? *unmapped : event_data));
-
+				_page_unmap(it->first, size, it->second.second.get());
 				it = next;
 			}
 
@@ -1310,24 +1153,15 @@ namespace vm
 				m_common->unmap_critical(vm::get_super_ptr(addr));
 #endif
 			}
-
-			return true;
 		}
-
-		return false;
-	}
-
-	block_t::~block_t()
-	{
-		ensure(!is_valid());
 	}
 
 	u32 block_t::alloc(const u32 orig_size, const std::shared_ptr<utils::shm>* src, u32 align, u64 flags)
 	{
 		if (!src)
 		{
-			// Use the block's flags (excpet for protection)
-			flags = (this->flags & ~alloc_prot_mask) | (flags & alloc_prot_mask);
+			// Use the block's flags
+			flags = this->flags;
 		}
 
 		// Determine minimal alignment
@@ -1348,6 +1182,17 @@ namespace vm
 			return 0;
 		}
 
+		u8 pflags = flags & page_hidden ? 0 : page_readable | page_writable;
+
+		if ((flags & page_size_64k) == page_size_64k)
+		{
+			pflags |= page_64k_size;
+		}
+		else if (!(flags & (page_size_mask & ~page_size_1m)))
+		{
+			pflags |= page_1m_size;
+		}
+
 		// Create or import shared memory object
 		std::shared_ptr<utils::shm> shm;
 
@@ -1364,23 +1209,17 @@ namespace vm
 
 		u32 addr = utils::align(this->addr, align);
 
-		if (this->addr > max || addr > max)
+		if (this->addr > std::min(max, addr))
 		{
 			return 0;
 		}
 
-		vm::writer_lock lock;
-
-		if (!is_valid())
-		{
-			// Expired block
-			return 0;
-		}
+		vm::writer_lock lock(0);
 
 		// Search for an appropriate place (unoptimized)
 		for (;; addr += align)
 		{
-			if (try_alloc(addr, flags, size, std::move(shm)))
+			if (try_alloc(addr, pflags, size, std::move(shm)))
 			{
 				return addr + (flags & stack_guarded ? 0x1000 : 0);
 			}
@@ -1394,12 +1233,12 @@ namespace vm
 		return 0;
 	}
 
-	bool block_t::falloc(u32 addr, const u32 orig_size, const std::shared_ptr<utils::shm>* src, u64 flags)
+	u32 block_t::falloc(u32 addr, const u32 orig_size, const std::shared_ptr<utils::shm>* src, u64 flags)
 	{
 		if (!src)
 		{
-			// Use the block's flags (excpet for protection)
-			flags = (this->flags & ~alloc_prot_mask) | (flags & alloc_prot_mask);
+			// Use the block's flags
+			flags = this->flags;
 		}
 
 		// Determine minimal alignment
@@ -1421,12 +1260,23 @@ namespace vm
 			(src && (orig_size | addr) % min_page_size) ||
 			flags & stack_guarded)
 		{
-			return false;
+			return 0;
 		}
 
 		// Force aligned address
 		addr -= addr % min_page_size;
 
+		u8 pflags = flags & page_hidden ? 0 : page_readable | page_writable;
+
+		if ((flags & page_size_64k) == page_size_64k)
+		{
+			pflags |= page_64k_size;
+		}
+		else if (!(flags & (page_size_mask & ~page_size_1m)))
+		{
+			pflags |= page_1m_size;
+		}
+
 		// Create or import shared memory object
 		std::shared_ptr<utils::shm> shm;
 
@@ -1439,43 +1289,21 @@ namespace vm
 			shm = std::make_shared<utils::shm>(size);
 		}
 
-		vm::writer_lock lock;
+		vm::writer_lock lock(0);
 
-		if (!is_valid())
+		if (!try_alloc(addr, pflags, size, std::move(shm)))
 		{
-			// Expired block
-			return false;
+			return 0;
 		}
 
-		if (!try_alloc(addr, flags, size, std::move(shm)))
-		{
-			return false;
-		}
-
-		return true;
+		return addr;
 	}
 
 	u32 block_t::dealloc(u32 addr, const std::shared_ptr<utils::shm>* src) const
 	{
 		auto& m_map = (m.*block_map)();
 		{
-			struct notify_t
-			{
-				std::vector<std::pair<u64, u64>> event_data;
-
-				~notify_t() noexcept
-				{
-					if (auto rsxthr = g_fxo->try_get<rsx::thread>())
-					{
-						for (const auto& [event_data1, event_data2] : event_data)
-						{
-							rsxthr->on_notify_post_memory_unmapped(event_data1, event_data2);
-						}
-					}
-				}
-			} unmap_notification;
-
-			vm::writer_lock lock;
+			vm::writer_lock lock(0);
 
 			const auto found = m_map.find(addr - (flags & stack_guarded ? 0x1000 : 0));
 
@@ -1500,7 +1328,7 @@ namespace vm
 			}
 
 			// Unmap "real" memory pages
-			ensure(size == _page_unmap(addr, size, this->flags, found->second.second.get(), unmap_notification.event_data));
+			ensure(size == _page_unmap(addr, size, found->second.second.get()));
 
 			// Clear stack guards
 			if (flags & stack_guarded)
@@ -1525,7 +1353,7 @@ namespace vm
 
 		auto& m_map = (m.*block_map)();
 
-		vm::writer_lock lock;
+		vm::reader_lock lock;
 
 		const auto upper = m_map.upper_bound(addr);
 
@@ -1571,252 +1399,14 @@ namespace vm
 
 	u32 block_t::used()
 	{
-		vm::writer_lock lock;
+		vm::writer_lock lock(0);
 
 		return imp_used(lock);
 	}
 
-	void block_t::get_shared_memory(std::vector<std::pair<utils::shm*, u32>>& shared)
-	{
-		auto& m_map = (m.*block_map)();
-
-		if (!(flags & preallocated))
-		{
-			shared.reserve(shared.size() + m_map.size());
-
-			for (const auto& [addr, shm] : m_map)
-			{
-				shared.emplace_back(shm.second.get(), addr);
-			}
-		}
-	}
-
-	u32 block_t::get_shm_addr(const std::shared_ptr<utils::shm>& shared)
-	{
-		auto& m_map = (m.*block_map)();
-
-		if (!(flags & preallocated))
-		{
-			for (auto& [addr, pair] : m_map)
-			{
-				if (pair.second == shared)
-				{
-					return addr;
-				}
-			}
-		}
-
-		return 0;
-	}
-
-	static bool check_cache_line_zero(const void* ptr)
-	{
-		const auto p = reinterpret_cast<const v128*>(ptr);
-		const v128 _1 = p[0] | p[1];
-		const v128 _2 = p[2] | p[3];
-		const v128 _3 = p[4] | p[5];
-		const v128 _4 = p[6] | p[7];
-		const v128 _5 = _1 | _2;
-		const v128 _6 = _3 | _4;
-		const v128 _7 = _5 | _6;
-		return gv_testz(_7);
-	}
-
-	static void serialize_memory_bytes(utils::serial& ar, u8* ptr, usz size)
-	{
-		ensure((size % 4096) == 0);
-
-		constexpr usz byte_of_pages = 128 * 8;
-
-		std::vector<u8> bit_array(size / byte_of_pages);
-
-		if (ar.is_writing())
-		{
-			auto data_ptr = ptr;
-
-			for (usz iter_count = 0; iter_count < bit_array.size(); iter_count++, data_ptr += byte_of_pages)
-			{
-				u8 bitmap = 0;
-
-				for (usz i = 0; i < byte_of_pages; i += 128 * 2)
-				{
-					const u64 sample64_1 = read_from_ptr<u64>(data_ptr, i);
-					const u64 sample64_2 = read_from_ptr<u64>(data_ptr, i + 128);
-
-					// Speed up testing in scenarios where it is likely non-zero data
-					if (sample64_1 && sample64_2)
-					{
-						bitmap |= 3u << (i / 128);
-						continue;
-					}
-
-					bitmap |= (check_cache_line_zero(data_ptr + i + 0) ? 0 : 1) << (i / 128);
-					bitmap |= (check_cache_line_zero(data_ptr + i + 128) ? 0 : 2) << (i / 128);
-				}
-
-				// bitmap of 1024 bytes (bit is 128-byte)
-				ar(bitmap);
-				bit_array[iter_count] = bitmap;
-			}
-		}
-		else
-		{
-			// Load bitmap
-			ar(std::span<u8>(bit_array.data(), bit_array.size()));
-		}
-
-		ar.breathe();
-
-		for (usz iter_count = 0; size; iter_count += sizeof(u32), ptr += byte_of_pages * sizeof(u32))
-		{
-			const u32 bitmap = read_from_ptr<le_t<u32>>(bit_array, iter_count);
-
-			size -= byte_of_pages * sizeof(bitmap);
-
-			for (usz i = 0; i < byte_of_pages * sizeof(bitmap);)
-			{
-				usz block_count = 0;
-
-				for (usz bit = i / 128; bit < sizeof(bitmap) * 8 && (bitmap & (1u << bit)) != 0;)
-				{
-					bit++;
-					block_count++;
-				}
-
-				if (!block_count)
-				{
-					i += 128;
-					continue;
-				}
-
-				ar(std::span<u8>(ptr + i, block_count * 128));
-				i += block_count * 128;
-			}
-
-			if (iter_count % 256 == 0)
-			{
-				ar.breathe();
-			}
-		}
-
-		ar.breathe();
-	}
-
-	void block_t::save(utils::serial& ar, std::map<utils::shm*, usz>& shared)
-	{
-		auto& m_map = (m.*block_map)();
-
-		ar(addr, size, flags);
-
-		for (const auto& [addr, shm] : m_map)
-		{
-			// Assume first page flags represent all the map
-			ar(g_pages[addr / 4096 + !!(flags & stack_guarded)]);
-
-			ar(addr);
-			ar(shm.first);
-
-			if (flags & preallocated)
-			{
-				// Do not save memory which matches the memory found in the executable (we can use it instead)
-				if (is_memory_compatible_for_copy_from_executable_optimization(addr, shm.first))
-				{
-					// Revert changes
-					ar.trunc(sizeof(u32) * 2 + sizeof(memory_page));
-					vm_log.success("Removed memory block matching the memory of the executable from savestate. (addr=0x%x, size=0x%x)", addr, shm.first);
-					continue;
-				}
-
-				// Save raw binary image
-				const u32 guard_size = flags & stack_guarded ? 0x1000 : 0;
-				serialize_memory_bytes(ar, vm::get_super_ptr<u8>(addr + guard_size), shm.first - guard_size * 2);
-			}
-			else
-			{
-				// Save index of shm
-				ar(shared[shm.second.get()]);
-			}
-		}
-
-		// Terminator
-		ar(u8{0});
-	}
-
-	block_t::block_t(utils::serial& ar, std::vector<std::shared_ptr<utils::shm>>& shared)
-		: m_id(init_block_id())
-		, addr(ar)
-		, size(ar)
-		, flags(ar)
-	{
-		if (flags & preallocated)
-		{
-			m_common = std::make_shared<utils::shm>(size, fmt::format("_block_x%08x", addr));
-			m_common->map_critical(vm::base(addr), this->flags & page_size_4k && utils::get_page_size() > 4096 ? utils::protection::rw : utils::protection::no);
-			m_common->map_critical(vm::get_super_ptr(addr));
-		}
-
-		std::shared_ptr<utils::shm> null_shm;
-
-		while (true)
-		{
-			const u8 flags0 = ar;
-
-			if (!(flags0 & page_allocated))
-			{
-				// Terminator found
-				break;
-			}
-
-			const u32 addr0 = ar;
-			const u32 size0 = ar;
-
-			u64 pflags = 0;
-
-			if (flags0 & page_executable)
-			{
-				pflags |= alloc_executable;
-			}
-
-			if (~flags0 & page_writable)
-			{
-				pflags |= alloc_unwritable;
-			}
-
-			if (~flags0 & page_readable)
-			{
-				pflags |= alloc_hidden;
-			}
-
-			if ((flags & page_size_64k) == page_size_64k)
-			{
-				pflags |= page_size_64k;
-			}
-			else if (!(flags & (page_size_mask & ~page_size_1m)))
-			{
-				pflags |= page_size_1m;
-			}
-
-			// Map the memory through the same method as alloc() and falloc()
-			// Copy the shared handle unconditionally
-			ensure(try_alloc(addr0, pflags, size0, ::as_rvalue(flags & preallocated ? null_shm : shared[ar.pop<usz>()])));
-
-			if (flags & preallocated)
-			{
-				// Load binary image
-				const u32 guard_size = flags & stack_guarded ? 0x1000 : 0;
-				serialize_memory_bytes(ar, vm::get_super_ptr<u8>(addr0 + guard_size), size0 - guard_size * 2);
-			}
-		}
-	}
-
-	bool _unmap_block(const std::shared_ptr<block_t>& block, std::vector<std::pair<u64, u64>>* unmapped = nullptr)
-	{
-		return block->unmap(unmapped);
-	}
-
 	static bool _test_map(u32 addr, u32 size)
 	{
-		const auto range = utils::address_range32::start_length(addr, size);
+		const auto range = utils::address_range::start_length(addr, size);
 
 		if (!range.valid())
 		{
@@ -1830,7 +1420,7 @@ namespace vm
 				continue;
 			}
 
-			if (range.overlaps(utils::address_range32::start_length(block->addr, block->size)))
+			if (range.overlaps(utils::address_range::start_length(block->addr, block->size)))
 			{
 				return false;
 			}
@@ -1843,12 +1433,12 @@ namespace vm
 	{
 		const u32 max = (0xC0000000 - size) & (0 - align);
 
-		if (size > 0xC0000000 - 0x10000000 || max < 0x10000000)
+		if (size > 0xC0000000 - 0x20000000 || max < 0x20000000)
 		{
 			return nullptr;
 		}
 
-		for (u32 addr = utils::align<u32>(0x10000000, align);; addr += align)
+		for (u32 addr = utils::align<u32>(0x20000000, align);; addr += align)
 		{
 			if (_test_map(addr, size))
 			{
@@ -1918,14 +1508,14 @@ namespace vm
 
 	std::shared_ptr<block_t> map(u32 addr, u32 size, u64 flags)
 	{
-		vm::writer_lock lock;
+		vm::writer_lock lock(0);
 
 		return _map(addr, size, flags);
 	}
 
 	std::shared_ptr<block_t> find_map(u32 orig_size, u32 align, u64 flags)
 	{
-		vm::writer_lock lock;
+		vm::writer_lock lock(0);
 
 		// Align to minimal page size
 		const u32 size = utils::align(orig_size, 0x10000);
@@ -1949,32 +1539,9 @@ namespace vm
 		return block;
 	}
 
-	std::pair<std::shared_ptr<block_t>, bool> unmap(u32 addr, bool must_be_empty, const std::shared_ptr<block_t>* ptr)
+	std::shared_ptr<block_t> unmap(u32 addr, bool must_be_empty)
 	{
-		if (ptr)
-		{
-			addr = (*ptr)->addr;
-		}
-
-		std::pair<std::shared_ptr<block_t>, bool> result{};
-
-		struct notify_t
-		{
-			std::vector<std::pair<u64, u64>> unmap_data;
-
-			~notify_t() noexcept
-			{
-				if (auto rsxthr = g_fxo->try_get<rsx::thread>())
-				{
-					for (const auto& [event_data1, event_data2] : unmap_data)
-					{
-						rsxthr->on_notify_post_memory_unmapped(event_data1, event_data2);
-					}
-				}
-			}
-		} unmap_notifications;
-
-		vm::writer_lock lock;
+		vm::writer_lock lock(0);
 
 		for (auto it = g_locations.begin() + memory_location_max; it != g_locations.end(); it++)
 		{
@@ -1990,38 +1557,30 @@ namespace vm
 					continue;
 				}
 
-				if (ptr && *it != *ptr)
+				if (must_be_empty && (it->use_count() != 1 || (*it)->imp_used(lock)))
 				{
-					return {};
+					return *it;
 				}
 
-				if (must_be_empty && (*it)->imp_used(lock))
-				{
-					result.first = *it;
-					return result;
-				}
-
-				result.first = std::move(*it);
+				auto block = std::move(*it);
 				g_locations.erase(it);
-				ensure(_unmap_block(result.first, &unmap_notifications.unmap_data));
-				result.second = true;
-				return result;
+				return block;
 			}
 		}
 
-		return {};
+		return nullptr;
 	}
 
 	std::shared_ptr<block_t> get(memory_location_t location, u32 addr)
 	{
-		vm::writer_lock lock;
+		vm::reader_lock lock;
 
 		return _get_map(location, addr);
 	}
 
 	std::shared_ptr<block_t> reserve_map(memory_location_t location, u32 addr, u32 area_size, u64 flags)
 	{
-		vm::writer_lock lock;
+		vm::reader_lock lock;
 
 		auto area = _get_map(location, addr);
 
@@ -2030,6 +1589,8 @@ namespace vm
 			return area;
 		}
 
+		lock.upgrade();
+
 		// Allocation on arbitrary address
 		if (location != any && location < g_locations.size())
 		{
@@ -2056,8 +1617,10 @@ namespace vm
 		return _map(addr, area_size, flags);
 	}
 
-	static bool try_access_internal(u32 addr, void* ptr, u32 size, bool is_write)
+	bool try_access(u32 addr, void* ptr, u32 size, bool is_write)
 	{
+		vm::reader_lock lock;
+
 		if (vm::check_addr(addr, is_write ? page_writable : page_readable, size))
 		{
 			void* src = vm::g_sudo_addr + addr;
@@ -2090,79 +1653,6 @@ namespace vm
 		return false;
 	}
 
-	bool try_access(u32 begin, void* ptr, u32 size, bool is_write)
-	{
-		auto* range_lock = alloc_range_lock(); // Released at the end of function
-
-		auto mem_lock = &*std::prev(std::end(vm::g_range_lock_set));
-
-		while (true)
-		{
-			range_lock->store(begin | (u64{size} << 32));
-
-			const u64 lock_val = mem_lock->load();
-			const u64 is_share = g_shmem[begin >> 16].load();
-
-			u64 lock_addr = static_cast<u32>(lock_val); // -> u64
-			u32 lock_size = static_cast<u32>(lock_val << range_bits >> (range_bits + 32));
-
-			u64 addr = begin;
-
-			if ((lock_val & range_full_mask) == range_locked) [[likely]]
-			{
-				lock_size = 128;
-
-				if (is_share)
-				{
-					addr = static_cast<u16>(addr) | is_share;
-					lock_addr = lock_val;
-				}
-			}
-
-			if (addr + size <= lock_addr || addr >= lock_addr + lock_size) [[likely]]
-			{
-				if (vm::check_addr(begin, is_write ? page_writable : page_readable, size)) [[likely]]
-				{
-					const u64 new_lock_val = mem_lock->load();
-
-					if (!new_lock_val || new_lock_val == lock_val) [[likely]]
-					{
-						break;
-					}
-				}
-				else
-				{
-					free_range_lock(range_lock);
-					return false;
-				}
-			}
-			else if (lock_val & range_readable && lock_val & range_writable)
-			{
-				// Probably a safe case of page protection change
-				break;
-			}
-			else if (!is_write && lock_val & range_readable)
-			{
-				// Same but for read-only access
-				break;
-			}
-			else if ((lock_val & range_full_mask) != range_locked)
-			{
-				free_range_lock(range_lock);
-				return false;
-			}
-
-			// Wait a bit before accessing global lock
-			range_lock->release(0);
-
-			busy_wait(200);
-		}
-
-		const bool result = try_access_internal(begin, ptr, size, is_write);
-		free_range_lock(range_lock);
-		return result;
-	}
-
 	inline namespace ps3_
 	{
 		static utils::shm s_hook{0x800000000, ""};
@@ -2187,8 +1677,8 @@ namespace vm
 
 			g_locations =
 			{
-				std::make_shared<block_t>(0x00010000, 0x0FFF0000, page_size_64k | preallocated), // main
-				nullptr,		                                                                 // user 64k pages
+				std::make_shared<block_t>(0x00010000, 0x1FFF0000, page_size_64k | preallocated), // main
+				std::make_shared<block_t>(0x20000000, 0x10000000, page_size_64k | bf0_0x1),		 // user 64k pages
 				nullptr,                                                                         // user 1m pages
 				nullptr,                                                                         // rsx context
 				std::make_shared<block_t>(0xC0000000, 0x10000000, page_size_64k | preallocated), // video
@@ -2199,7 +1689,7 @@ namespace vm
 			std::memset(g_reservations, 0, sizeof(g_reservations));
 			std::memset(g_shmem, 0, sizeof(g_shmem));
 			std::memset(g_range_lock_set, 0, sizeof(g_range_lock_set));
-			std::memset(g_range_lock_bits, 0, sizeof(g_range_lock_bits));
+			g_range_lock_bits = 0;
 
 #ifdef _WIN32
 			utils::memory_release(g_hook_addr, 0x800000000);
@@ -2210,17 +1700,9 @@ namespace vm
 
 	void close()
 	{
-		{
-			vm::writer_lock lock;
-
-			for (auto& block : g_locations)
-			{
-				if (block) _unmap_block(block);
-			}
-
-			g_locations.clear();
-		}
+		g_locations.clear();
 
+		utils::memory_decommit(g_base_addr, 0x200000000);
 		utils::memory_decommit(g_exec_addr, 0x200000000);
 		utils::memory_decommit(g_stat_addr, 0x100000000);
 
@@ -2232,179 +1714,7 @@ namespace vm
 #endif
 
 		std::memset(g_range_lock_set, 0, sizeof(g_range_lock_set));
-		std::memset(g_range_lock_bits, 0, sizeof(g_range_lock_bits));
-	}
-
-	void save(utils::serial& ar)
-	{
-		// Shared memory lookup, sample address is saved for easy memory copy
-		// Just need one address for this optimization
-		std::vector<std::pair<utils::shm*, u32>> shared;
-
-		for (auto& loc : g_locations)
-		{
-			if (loc) loc->get_shared_memory(shared);
-		}
-
-		std::map<utils::shm*, usz> shared_map;
-
-#ifndef _MSC_VER
-		shared.erase(std::unique(shared.begin(), shared.end(), [](auto& a, auto& b) { return a.first == b.first; }), shared.end());
-#else
-		// Workaround for bugged std::unique
-		for (auto it = shared.begin(); it != shared.end();)
-		{
-			if (shared_map.count(it->first))
-			{
-				it = shared.erase(it);
-				continue;
-			}
-
-			shared_map.emplace(it->first, 0);
-			it++;
-		}
-
-		shared_map.clear();
-#endif
-
-		for (auto& p : shared)
-		{
-			shared_map.emplace(p.first, &p - shared.data());
-		}
-
-		// TODO: proper serialization of std::map
-		ar(static_cast<usz>(shared_map.size()));
-
-		for (const auto& [shm, addr] : shared)
-		{
-			//  Save shared memory
-			ar(shm->flags());
-
-			ar(shm->size());
-			serialize_memory_bytes(ar, vm::get_super_ptr<u8>(addr), shm->size());
-		}
-
-		// TODO: Serialize std::vector direcly
-		ar(g_locations.size());
-
-		for (auto& loc : g_locations)
-		{
-			const u8 has = loc.operator bool();
-			ar(has);
-
-			if (loc)
-			{
-				loc->save(ar, shared_map);
-			}
-		}
-
-		is_memory_compatible_for_copy_from_executable_optimization(0, 0); // Cleanup internal data
-	}
-
-	void load(utils::serial& ar)
-	{
-		std::vector<std::shared_ptr<utils::shm>> shared;
-
-		const usz shared_size = ar.pop<usz>();
-
-		if (!shared_size || ar.get_size(umax) / 4096 < shared_size)
-		{
-			fmt::throw_exception("Invalid VM serialization state: shared_size=0x%x, ar=%s", shared_size, ar);
-		}
-
-		shared.resize(shared_size);
-
-		for (auto& shm : shared)
-		{
-			// Load shared memory
-
-			const u32 flags = ar.pop<u32>();
-			const u64 size = ar.pop<u64>();
-			shm = std::make_shared<utils::shm>(size, flags);
-
-			// Load binary image
-			// elad335: I'm not proud about it as well.. (ideal situation is to not call map_self())
-			serialize_memory_bytes(ar, shm->map_self(), shm->size());
-		}
-
-		for (auto& block : g_locations)
-		{
-			if (block) _unmap_block(block);
-		}
-
-		g_locations.clear();
-		g_locations.resize(ar.pop<usz>());
-
-		for (auto& loc : g_locations)
-		{
-			const u8 has = ar.pop<u8>();
-
-			if (has)
-			{
-				loc = std::make_shared<block_t>(ar, shared);
-			}
-		}
-	}
-
-	u32 get_shm_addr(const std::shared_ptr<utils::shm>& shared)
-	{
-		for (auto& loc : g_locations)
-		{
-			if (u32 addr = loc ? loc->get_shm_addr(shared) : 0)
-			{
-				return addr;
-			}
-		}
-
-		return 0;
-	}
-
-	bool read_string(u32 addr, u32 max_size, std::string& out_string, bool check_pages) noexcept
-	{
-		if (!max_size)
-		{
-			return true;
-		}
-
-		// Prevent overflow
-		const u32 size = 0 - max_size < addr ? (0 - addr) : max_size;
-
-		for (u32 i = addr, end = utils::align(addr + size, 4096) - 1; i <= end;)
-		{
-			if (check_pages && !vm::check_addr(i, vm::page_readable))
-			{
-				// Invalid string termination
-				return false;
-			}
-
-			const char* s_start = vm::get_super_ptr<const char>(i);
-			const u32 space = std::min<u32>(end - i + 1, 4096 - (i % 4096));
-			const char* s_end = s_start + space;
-			const char* s_null = std::find(s_start, s_end, '\0');
-
-			// Append string
-			out_string.append(s_start, s_null);
-
-			// Recheck for zeroes after append
-			const usz old_size = out_string.size();
-			out_string.erase(std::find(out_string.end() - (s_null - s_start), out_string.end(), '\0'), out_string.end());
-
-			if (out_string.size() != old_size || s_null != s_end)
-			{
-				// Null terminated
-				return true;
-			}
-
-			i += space;
-
-			if (!i)
-			{
-				break;
-			}
-		}
-
-		// Non-null terminated but terminated by size limit (so the string may continue)
-		return size == max_size;
+		g_range_lock_bits = 0;
 	}
 }
 
@@ -2422,10 +1732,8 @@ void fmt_class_string<vm::_ptr_base<const char, u32>>::format(std::string& out,
 		return;
 	}
 
-	const u32 addr = ::narrow<u32>(arg);
-
-	// Filter certainly invalid addresses
-	if (!vm::check_addr(addr, vm::page_readable))
+	// Filter certainly invalid addresses (TODO)
+	if (arg < 0x10000 || arg >= 0xf0000000)
 	{
 		out += reinterpret_cast<const char*>(u8"«INVALID_ADDRESS:");
 		fmt_class_string<u32>::format(out, arg);
@@ -2437,14 +1745,26 @@ void fmt_class_string<vm::_ptr_base<const char, u32>>::format(std::string& out,
 
 	out += reinterpret_cast<const char*>(u8"“");
 
-	if (!vm::read_string(addr, umax, out, true))
+	for (vm::_ptr_base<const volatile char, u32> ptr = vm::cast(arg);; ptr++)
 	{
-		// Revert changes
-		out.resize(start);
-		out += reinterpret_cast<const char*>(u8"«INVALID_ADDRESS:");
-		fmt_class_string<u32>::format(out, arg);
-		out += reinterpret_cast<const char*>(u8"»");
-		return;
+		if (!vm::check_addr(ptr.addr()))
+		{
+			// TODO: optimize checks
+			out.resize(start);
+			out += reinterpret_cast<const char*>(u8"«INVALID_ADDRESS:");
+			fmt_class_string<u32>::format(out, arg);
+			out += reinterpret_cast<const char*>(u8"»");
+			return;
+		}
+
+		if (const char ch = *ptr)
+		{
+			out += ch;
+		}
+		else
+		{
+			break;
+		}
 	}
 
 	out += reinterpret_cast<const char*>(u8"”");
diff --git a/rpcs3/Emu/Memory/vm.h b/rpcs3/Emu/Memory/vm.h
index 3c39d0aa4a..e6623187c0 100644
--- a/rpcs3/Emu/Memory/vm.h
+++ b/rpcs3/Emu/Memory/vm.h
@@ -1,30 +1,16 @@
 #pragma once
 
 #include <memory>
-#include <map>
 #include "util/types.hpp"
 #include "util/atomic.hpp"
 #include "util/auto_typemap.hpp"
+#include "Utilities/StrFmt.h"
 
 #include "util/to_endian.hpp"
 
-class ppu_thread;
-
-#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS
-#include "rpcs3qt/breakpoint_handler.h"
-#include "util/logs.hpp"
-
-LOG_CHANNEL(debugbp_log, "DebugBP");
-
-void ppubreak(ppu_thread& ppu);
-#endif
-
 namespace utils
 {
 	class shm;
-
-	template <typename T> class address_range;
-	using address_range32 = address_range<u32>;
 }
 
 namespace vm
@@ -34,9 +20,7 @@ namespace vm
 	extern u8* const g_exec_addr;
 	extern u8* const g_stat_addr;
 	extern u8* const g_free_addr;
-	extern u8 g_reservations[65536 / 128 * 64];
-
-	static constexpr u64 g_exec_addr_seg_offset = 0x2'0000'0000ULL;
+	extern u8 g_reservations[];
 
 	struct writer_lock;
 
@@ -94,14 +78,11 @@ namespace vm
 		return !(~g_pages[addr / 4096] & (flags | page_allocated));
 	}
 
-	// Read string in a safe manner (page aware) (bool true = if null-termination)
-	bool read_string(u32 addr, u32 max_size, std::string& out_string, bool check_pages = true) noexcept;
-
 	// Search and map memory in specified memory location (min alignment is 0x10000)
 	u32 alloc(u32 size, memory_location_t location, u32 align = 0x10000);
 
 	// Map memory at specified address (in optionally specified memory location)
-	bool falloc(u32 addr, u32 size, memory_location_t location = any, const std::shared_ptr<utils::shm>* src = nullptr);
+	u32 falloc(u32 addr, u32 size, memory_location_t location = any, const std::shared_ptr<utils::shm>* src = nullptr);
 
 	// Unmap memory at specified address (in optionally specified memory location), return size
 	u32 dealloc(u32 addr, memory_location_t location = any, const std::shared_ptr<utils::shm>* src = nullptr);
@@ -111,6 +92,8 @@ namespace vm
 
 	enum block_flags_3
 	{
+		page_hidden    = 0x1000,
+
 		page_size_4k   = 0x100, // SYS_MEMORY_PAGE_SIZE_4K
 		page_size_64k  = 0x200, // SYS_MEMORY_PAGE_SIZE_64K
 		page_size_1m   = 0x400, // SYS_MEMORY_PAGE_SIZE_1M
@@ -125,15 +108,6 @@ namespace vm
 		bf0_mask = bf0_0x1 | bf0_0x2,
 	};
 
-	enum alloc_flags
-	{
-		alloc_hidden = 0x1000,
-		alloc_unwritable = 0x2000,
-		alloc_executable = 0x4000,
-
-		alloc_prot_mask = alloc_hidden | alloc_unwritable | alloc_executable,
-	};
-
 	// Object that handles memory allocations inside specific constant bounds ("location")
 	class block_t final
 	{
@@ -142,13 +116,7 @@ namespace vm
 		// Common mapped region for special cases
 		std::shared_ptr<utils::shm> m_common;
 
-		atomic_t<u64> m_id = 0;
-
-		bool try_alloc(u32 addr, u64 bflags, u32 size, std::shared_ptr<utils::shm>&&) const;
-
-		// Unmap block
-		bool unmap(std::vector<std::pair<u64, u64>>* unmapped = nullptr);
-		friend bool _unmap_block(const std::shared_ptr<block_t>&, std::vector<std::pair<u64, u64>>* unmapped);
+		bool try_alloc(u32 addr, u8 flags, u32 size, std::shared_ptr<utils::shm>&&) const;
 
 	public:
 		block_t(u32 addr, u32 size, u64 flags);
@@ -167,7 +135,7 @@ namespace vm
 		u32 alloc(u32 size, const std::shared_ptr<utils::shm>* = nullptr, u32 align = 0x10000, u64 flags = 0);
 
 		// Try to map memory at fixed location
-		bool falloc(u32 addr, u32 size, const std::shared_ptr<utils::shm>* = nullptr, u64 flags = 0);
+		u32 falloc(u32 addr, u32 size, const std::shared_ptr<utils::shm>* = nullptr, u64 flags = 0);
 
 		// Unmap memory at specified location previously returned by alloc(), return size
 		u32 dealloc(u32 addr, const std::shared_ptr<utils::shm>* = nullptr) const;
@@ -180,22 +148,6 @@ namespace vm
 
 		// Internal
 		u32 imp_used(const vm::writer_lock&) const;
-
-		// Returns 0 if invalid, none-zero unique id if valid
-		u64 is_valid() const
-		{
-			return m_id;
-		}
-
-		// Serialization helper for shared memory
-		void get_shared_memory(std::vector<std::pair<utils::shm*, u32>>& shared);
-
-		// Returns sample address for shared memory, 0 on failure
-		u32 get_shm_addr(const std::shared_ptr<utils::shm>& shared);
-
-		// Serialization
-		void save(utils::serial& ar, std::map<utils::shm*, usz>& shared);
-		block_t(utils::serial& ar, std::vector<std::shared_ptr<utils::shm>>& shared);
 	};
 
 	// Create new memory block with specified parameters and return it
@@ -204,8 +156,8 @@ namespace vm
 	// Create new memory block with at arbitrary position with specified alignment
 	std::shared_ptr<block_t> find_map(u32 size, u32 align, u64 flags = 0);
 
-	// Delete existing memory block with specified start address, .first=its ptr, .second=success
-	std::pair<std::shared_ptr<block_t>, bool> unmap(u32 addr, bool must_be_empty = false, const std::shared_ptr<block_t>* ptr = nullptr);
+	// Delete existing memory block with specified start address, return it
+	std::shared_ptr<block_t> unmap(u32 addr, bool must_be_empty = false);
 
 	// Get memory block associated with optionally specified memory location or optionally specified address
 	std::shared_ptr<block_t> get(memory_location_t location, u32 addr = 0);
@@ -227,29 +179,77 @@ namespace vm
 		return {};
 	}
 
-	// Unsafe convert host ptr to PS3 VM address (clamp with 4GiB alignment assumption)
 	inline vm::addr_t get_addr(const void* ptr)
 	{
-		return vm::addr_t{static_cast<u32>(uptr(ptr))};
+		const auto [addr, ok] = try_get_addr(ptr);
+
+		if (!ok)
+		{
+			fmt::throw_exception("Not a virtual memory pointer (%p)", ptr);
+		}
+
+		return addr;
 	}
 
-	template<typename T> requires (std::is_integral_v<decltype(+T{})> && (sizeof(+T{}) > 4 || std::is_signed_v<decltype(+T{})>))
-	vm::addr_t cast(const T& addr, std::source_location src_loc = std::source_location::current())
+	template<typename T>
+	struct cast_impl
 	{
-		return vm::addr_t{::narrow<u32>(+addr, src_loc)};
-	}
+		static_assert(std::is_same<T, u32>::value, "vm::cast() error: unsupported type");
+	};
 
-	template<typename T> requires (std::is_integral_v<decltype(+T{})> && (sizeof(+T{}) <= 4 && !std::is_signed_v<decltype(+T{})>))
-	vm::addr_t cast(const T& addr, u32 = 0, u32 = 0, const char* = nullptr, const char* = nullptr)
+	template<>
+	struct cast_impl<u32>
 	{
-		return vm::addr_t{static_cast<u32>(+addr)};
+		static vm::addr_t cast(u32 addr,
+			u32,
+			u32,
+			const char*,
+			const char*)
+		{
+			return static_cast<vm::addr_t>(addr);
+		}
+	};
+
+	template<>
+	struct cast_impl<u64>
+	{
+		static vm::addr_t cast(u64 addr,
+			u32 line,
+			u32 col,
+			const char* file,
+			const char* func)
+		{
+			return static_cast<vm::addr_t>(::narrow<u32>(addr, line, col, file, func));
+		}
+	};
+
+	template<typename T, bool Se>
+	struct cast_impl<se_t<T, Se>>
+	{
+		static vm::addr_t cast(const se_t<T, Se>& addr,
+			u32 line,
+			u32 col,
+			const char* file,
+			const char* func)
+		{
+			return cast_impl<T>::cast(addr, line, col, file, func);
+		}
+	};
+
+	template<typename T>
+	vm::addr_t cast(const T& addr,
+		u32 line = __builtin_LINE(),
+		u32 col = __builtin_COLUMN(),
+		const char* file = __builtin_FILE(),
+		const char* func = __builtin_FUNCTION())
+	{
+		return cast_impl<T>::cast(addr, line, col, file, func);
 	}
 
 	// Convert specified PS3/PSV virtual memory address to a pointer for common access
-	template <typename T> requires (std::is_integral_v<decltype(+T{})>)
-	inline void* base(T addr)
+	inline void* base(u32 addr)
 	{
-		return g_base_addr + static_cast<u32>(vm::cast(addr));
+		return g_base_addr + addr;
 	}
 
 	inline const u8& read8(u32 addr)
@@ -257,21 +257,9 @@ namespace vm
 		return g_base_addr[addr];
 	}
 
-#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS
-	inline void write8(u32 addr, u8 value, ppu_thread* ppu = nullptr)
-#else
 	inline void write8(u32 addr, u8 value)
-#endif
 	{
 		g_base_addr[addr] = value;
-
-#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS
-		if (ppu && g_breakpoint_handler.HasBreakpoint(addr, breakpoint_types::bp_write))
-		{
-			debugbp_log.success("BPMW: breakpoint writing(8) 0x%x at 0x%x", value, addr);
-			ppubreak(*ppu);
-		}
-#endif
 	}
 
 	// Read or write virtual memory in a safe manner, returns false on failure
@@ -280,16 +268,15 @@ namespace vm
 	inline namespace ps3_
 	{
 		// Convert specified PS3 address to a pointer of specified (possibly converted to BE) type
-		template <typename T, typename U> inline to_be_t<T>* _ptr(const U& addr)
+		template<typename T> inline to_be_t<T>* _ptr(u32 addr)
 		{
 			return static_cast<to_be_t<T>*>(base(addr));
 		}
 
 		// Convert specified PS3 address to a reference of specified (possibly converted to BE) type
-		// Const lvalue: prevent abused writes
-		template <typename T, typename U> inline const to_be_t<T>& _ref(const U& addr)
+		template<typename T> inline to_be_t<T>& _ref(u32 addr)
 		{
-			return *static_cast<const to_be_t<T>*>(base(addr));
+			return *_ptr<T>(addr);
 		}
 
 		// Access memory bypassing memory protection
@@ -304,34 +291,9 @@ namespace vm
 			return _ref<u16>(addr);
 		}
 
-#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS
-		template <typename T, typename U = T>
-		inline void write(u32 addr, U value, ppu_thread* ppu = nullptr)
-#else
-		template <typename T, typename U = T>
-		inline void write(u32 addr, U value, ppu_thread* = nullptr)
-#endif
+		inline void write16(u32 addr, be_t<u16> value)
 		{
-			using dest_t = std::conditional_t<std::is_void_v<T>, U, T>;
-
-			if constexpr (!std::is_void_v<T>)
-			{
-				*_ptr<dest_t>(addr) = value;
-			}
-
-#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS
-			if (ppu && g_breakpoint_handler.HasBreakpoint(addr, breakpoint_types::bp_write))
-			{
-				debugbp_log.success("BPMW: breakpoint writing(%d) 0x%x at 0x%x",
-					sizeof(dest_t) * CHAR_BIT, value, addr);
-				ppubreak(*ppu);
-			}
-#endif
-		}
-
-		inline void write16(u32 addr, be_t<u16> value, ppu_thread* ppu = nullptr)
-		{
-			write<be_t<u16>>(addr, value, ppu);
+			_ref<u16>(addr) = value;
 		}
 
 		inline const be_t<u32>& read32(u32 addr)
@@ -339,9 +301,9 @@ namespace vm
 			return _ref<u32>(addr);
 		}
 
-		inline void write32(u32 addr, be_t<u32> value, ppu_thread* ppu = nullptr)
+		inline void write32(u32 addr, be_t<u32> value)
 		{
-			write<be_t<u32>>(addr, value, ppu);
+			_ref<u32>(addr) = value;
 		}
 
 		inline const be_t<u64>& read64(u32 addr)
@@ -349,9 +311,9 @@ namespace vm
 			return _ref<u64>(addr);
 		}
 
-		inline void write64(u32 addr, be_t<u64> value, ppu_thread* ppu = nullptr)
+		inline void write64(u32 addr, be_t<u64> value)
 		{
-			write<be_t<u64>>(addr, value, ppu);
+			_ref<u64>(addr) = value;
 		}
 
 		void init();
@@ -359,12 +321,6 @@ namespace vm
 
 	void close();
 
-	void load(utils::serial& ar);
-	void save(utils::serial& ar);
-
-	// Returns sample address for shared memory, 0 on failure (wraps block_t::get_shm_addr)
-	u32 get_shm_addr(const std::shared_ptr<utils::shm>& shared);
-
 	template <typename T, typename AT>
 	class _ptr_base;
 
diff --git a/rpcs3/Emu/Memory/vm_locking.h b/rpcs3/Emu/Memory/vm_locking.h
index c4d805554f..70b54af394 100644
--- a/rpcs3/Emu/Memory/vm_locking.h
+++ b/rpcs3/Emu/Memory/vm_locking.h
@@ -1,13 +1,14 @@
 #pragma once
 
 #include "vm.h"
-#include "Emu/RSX/rsx_utils.h"
 
 class cpu_thread;
 class shared_mutex;
 
 namespace vm
 {
+	extern shared_mutex g_mutex;
+
 	extern thread_local atomic_t<cpu_thread*>* g_tls_locked;
 
 	enum range_lock_flags : u64
@@ -28,7 +29,7 @@ namespace vm
 		range_bits = 3,
 	};
 
-	extern atomic_t<u64, 64> g_range_lock_bits[2];
+	extern atomic_t<u64> g_range_lock;
 
 	extern atomic_t<u64> g_shmem[];
 
@@ -44,14 +45,6 @@ namespace vm
 	template <uint Size = 0>
 	FORCE_INLINE void range_lock(atomic_t<u64, 64>* range_lock, u32 begin, u32 _size)
 	{
-		if constexpr (Size == 0)
-		{
-			if (begin >> 28 == rsx::constants::local_mem_base >> 28)
-			{
-				return;
-			}
-		}
-
 		// Optimistic locking.
 		// Note that we store the range we will be accessing, without any clamping.
 		range_lock->store(begin | (u64{_size} << 32));
@@ -59,22 +52,50 @@ namespace vm
 		// Old-style conditional constexpr
 		const u32 size = Size ? Size : _size;
 
-		if (Size == 1 || (begin % 4096 + size % 4096) / 4096 == 0 ? !vm::check_addr(begin) : !vm::check_addr(begin, vm::page_readable, size))
+		if (size <= 4096u && !((begin | size) & (size - 1)) ? !vm::check_addr(begin) : !vm::check_addr(begin, vm::page_readable, size))
 		{
 			range_lock->release(0);
 			range_lock_internal(range_lock, begin, _size);
 			return;
 		}
 
+		const u64 lock_val = g_range_lock.load();
+		const u64 is_share = g_shmem[begin >> 16].load();
+
 		#ifndef _MSC_VER
 		__asm__(""); // Tiny barrier
 		#endif
 
-		if (!g_range_lock_bits[1]) [[likely]]
+		u64 lock_addr = static_cast<u32>(lock_val); // -> u64
+		u32 lock_size = static_cast<u32>(lock_val << range_bits >> (32 + range_bits));
+
+		u64 addr = begin;
+
+		// Optimization: if range_locked is not used, the addr check will always pass
+		// Otherwise, g_shmem is unchanged and its value is reliable to read
+		if ((lock_val >> range_pos) == (range_locked >> range_pos))
 		{
-			return;
+			lock_size = 128;
+
+			if (is_share) [[unlikely]]
+			{
+				addr = static_cast<u16>(begin) | is_share;
+				lock_addr = lock_val;
+			}
 		}
 
+		if (addr + size <= lock_addr || addr >= lock_addr + lock_size) [[likely]]
+		{
+			const u64 new_lock_val = g_range_lock.load();
+
+			if (!new_lock_val || new_lock_val == lock_val) [[likely]]
+			{
+				return;
+			}
+		}
+
+		range_lock->release(0);
+
 		// Fallback to slow path
 		range_lock_internal(range_lock, begin, size);
 	}
@@ -86,17 +107,27 @@ namespace vm
 	void passive_unlock(cpu_thread& cpu);
 
 	// Optimization (set cpu_flag::memory)
-	bool temporary_unlock(cpu_thread& cpu) noexcept;
+	void temporary_unlock(cpu_thread& cpu) noexcept;
 	void temporary_unlock() noexcept;
 
+	class reader_lock final
+	{
+		bool m_upgraded = false;
+
+	public:
+		reader_lock(const reader_lock&) = delete;
+		reader_lock& operator=(const reader_lock&) = delete;
+		reader_lock();
+		~reader_lock();
+
+		void upgrade();
+	};
+
 	struct writer_lock final
 	{
-		atomic_t<u64, 64>* range_lock;
-
 		writer_lock(const writer_lock&) = delete;
 		writer_lock& operator=(const writer_lock&) = delete;
-		writer_lock() noexcept;
-		writer_lock(u32 addr, atomic_t<u64, 64>* range_lock = nullptr, u32 size = 128, u64 flags = range_locked) noexcept;
-		~writer_lock() noexcept;
+		writer_lock(u32 addr = 0);
+		~writer_lock();
 	};
 } // namespace vm
diff --git a/rpcs3/Emu/Memory/vm_ptr.h b/rpcs3/Emu/Memory/vm_ptr.h
index 5081e0701d..761f784df8 100644
--- a/rpcs3/Emu/Memory/vm_ptr.h
+++ b/rpcs3/Emu/Memory/vm_ptr.h
@@ -22,18 +22,18 @@ namespace vm
 	{
 		AT m_addr;
 
-		static_assert(!std::is_pointer_v<T>, "vm::_ptr_base<> error: invalid type (pointer)");
-		static_assert(!std::is_reference_v<T>, "vm::_ptr_base<> error: invalid type (reference)");
+		static_assert(!std::is_pointer<T>::value, "vm::_ptr_base<> error: invalid type (pointer)");
+		static_assert(!std::is_reference<T>::value, "vm::_ptr_base<> error: invalid type (reference)");
 
 	public:
 		using type = T;
 		using addr_type = std::remove_cv_t<AT>;
 
-		ENABLE_BITWISE_SERIALIZATION;
+		using enable_bitcopy = std::true_type;
 
 		_ptr_base() = default;
 
-		_ptr_base(vm::addr_t addr) noexcept
+		_ptr_base(vm::addr_t addr)
 			: m_addr(addr)
 		{
 		}
@@ -57,12 +57,12 @@ namespace vm
 
 		// Enable only the conversions which are originally possible between pointer types
 		template <typename T2, typename AT2> requires (std::is_convertible_v<T*, T2*>)
-		operator _ptr_base<T2, AT2>() const noexcept
+		operator _ptr_base<T2, AT2>() const
 		{
 			return vm::cast(m_addr);
 		}
 
-		explicit operator bool() const noexcept
+		explicit operator bool() const
 		{
 			return m_addr != 0u;
 		}
@@ -96,36 +96,30 @@ namespace vm
 		}
 
 		// Get vm reference
-		_ref_base<T, u32> ref() const requires (!std::is_void_v<T>)
+		template <bool = false> requires (!std::is_void_v<T>)
+		_ref_base<T, u32> ref() const
 		{
 			return vm::cast(m_addr);
 		}
 
-		template <bool Strict = false>
 		T* get_ptr() const
 		{
-			if constexpr (Strict)
-			{
-				AUDIT(m_addr);
-			}
-
 			return static_cast<T*>(vm::base(vm::cast(m_addr)));
 		}
 
-		T* operator ->() const requires (!std::is_void_v<T>)
+		template <bool = false> requires (!std::is_void_v<T>)
+		T* operator ->() const
 		{
-			return get_ptr<true>();
+			return get_ptr();
 		}
 
-		std::add_lvalue_reference_t<T> operator *() const requires (!std::is_void_v<T>)
+		std::add_lvalue_reference_t<T> operator *() const
 		{
-			return *get_ptr<true>();
+			return *static_cast<T*>(vm::base(vm::cast(m_addr)));
 		}
 
-		std::add_lvalue_reference_t<T> operator [](u32 index) const requires (!std::is_void_v<T>)
+		std::add_lvalue_reference_t<T> operator [](u32 index) const
 		{
-			AUDIT(m_addr);
-
 			return *static_cast<T*>(vm::base(vm::cast(m_addr) + u32{sizeof(T)} * index));
 		}
 
@@ -136,13 +130,13 @@ namespace vm
 		}
 
 		// Get type size
-		static constexpr u32 size() noexcept requires (!std::is_void_v<T>)
+		static constexpr u32 size()
 		{
 			return sizeof(T);
 		}
 
 		// Get type alignment
-		static constexpr u32 align() noexcept requires (!std::is_void_v<T>)
+		static constexpr u32 align()
 		{
 			return alignof(T);
 		}
@@ -152,17 +146,17 @@ namespace vm
 			return vm::cast(m_addr);
 		}
 
-		_ptr_base<T, u32> operator +(u32 count) const requires (!std::is_void_v<T>)
+		_ptr_base<T, u32> operator +(u32 count) const
 		{
 			return vm::cast(vm::cast(m_addr) + count * size());
 		}
 
-		_ptr_base<T, u32> operator -(u32 count) const requires (!std::is_void_v<T>)
+		_ptr_base<T, u32> operator -(u32 count) const
 		{
 			return vm::cast(vm::cast(m_addr) - count * size());
 		}
 
-		friend _ptr_base<T, u32> operator +(u32 count, const _ptr_base& ptr) requires (!std::is_void_v<T>)
+		friend _ptr_base<T, u32> operator +(u32 count, const _ptr_base& ptr)
 		{
 			return vm::cast(vm::cast(ptr.m_addr) + count * size());
 		}
@@ -174,57 +168,60 @@ namespace vm
 			return static_cast<s32>(vm::cast(m_addr) - vm::cast(right.m_addr)) / size();
 		}
 
-		_ptr_base operator ++(int) requires (!std::is_void_v<T>)
+		_ptr_base operator ++(int)
 		{
 			_ptr_base result = *this;
 			m_addr = vm::cast(m_addr) + size();
 			return result;
 		}
 
-		_ptr_base& operator ++() requires (!std::is_void_v<T>)
+		_ptr_base& operator ++()
 		{
 			m_addr = vm::cast(m_addr) + size();
 			return *this;
 		}
 
-		_ptr_base operator --(int) requires (!std::is_void_v<T>)
+		_ptr_base operator --(int)
 		{
 			_ptr_base result = *this;
 			m_addr = vm::cast(m_addr) - size();
 			return result;
 		}
 
-		_ptr_base& operator --() requires (!std::is_void_v<T>)
+		_ptr_base& operator --()
 		{
 			m_addr = vm::cast(m_addr) - size();
 			return *this;
 		}
 
-		_ptr_base& operator +=(s32 count) requires (!std::is_void_v<T>)
+		_ptr_base& operator +=(s32 count)
 		{
 			m_addr = vm::cast(m_addr) + count * size();
 			return *this;
 		}
 
-		_ptr_base& operator -=(s32 count) requires (!std::is_void_v<T>)
+		_ptr_base& operator -=(s32 count)
 		{
 			m_addr = vm::cast(m_addr) - count * size();
 			return *this;
 		}
 
-		std::pair<bool, std::conditional_t<std::is_void_v<T>, char, std::remove_const_t<T>>> try_read() const requires (std::is_copy_constructible_v<T>)
+		template <bool = false> requires (std::is_copy_constructible_v<T>)
+		std::pair<bool, std::conditional_t<std::is_void_v<T>, char, std::remove_const_t<T>>> try_read() const
 		{
 			alignas(sizeof(T) >= 16 ? 16 : 8) char buf[sizeof(T)]{};
 			const bool ok = vm::try_access(vm::cast(m_addr), buf, sizeof(T), false);
 			return { ok, std::bit_cast<decltype(try_read().second)>(buf) };
 		}
 
-		bool try_read(std::conditional_t<std::is_void_v<T>, char, std::remove_const_t<T>>& out) const requires (!std::is_void_v<T>)
+		template <bool = false> requires (!std::is_void_v<T>)
+		bool try_read(std::conditional_t<std::is_void_v<T>, char, std::remove_const_t<T>>& out) const
 		{
 			return vm::try_access(vm::cast(m_addr), std::addressof(out), sizeof(T), false);
 		}
 
-		bool try_write(const std::conditional_t<std::is_void_v<T>, char, T>& _in) const requires (!std::is_void_v<T>)
+		template <bool = false> requires (!std::is_void_v<T> && !std::is_const_v<T>)
+		bool try_write(const std::conditional_t<std::is_void_v<T>, char, T>& _in) const
 		{
 			return vm::try_access(vm::cast(m_addr), const_cast<T*>(std::addressof(_in)), sizeof(T), true);
 		}
@@ -243,7 +240,7 @@ namespace vm
 
 	public:
 		using addr_type = std::remove_cv_t<AT>;
-		ENABLE_BITWISE_SERIALIZATION;
+		using enable_bitcopy = std::true_type;
 
 		_ptr_base() = default;
 
@@ -342,24 +339,21 @@ namespace vm
 		template<typename T, typename AT = u32, typename AT2 = u32> using bcpptr = bpptr<const T, AT, AT2>;
 
 		// Perform static_cast (for example, vm::ptr<void> to vm::ptr<char>)
-		template <typename CT, typename T, typename AT>
-			requires requires(T* t) { static_cast<to_be_t<CT>*>(t); }
+		template<typename CT, typename T, typename AT, typename = decltype(static_cast<to_be_t<CT>*>(std::declval<T*>()))>
 		inline _ptr_base<to_be_t<CT>, u32> static_ptr_cast(const _ptr_base<T, AT>& other)
 		{
 			return vm::cast(other.addr());
 		}
 
 		// Perform const_cast (for example, vm::cptr<char> to vm::ptr<char>)
-		template <typename CT, typename T, typename AT>
-			requires requires(T* t) { const_cast<to_be_t<CT>*>(t); }
+		template<typename CT, typename T, typename AT, typename = decltype(const_cast<to_be_t<CT>*>(std::declval<T*>()))>
 		inline _ptr_base<to_be_t<CT>, u32> const_ptr_cast(const _ptr_base<T, AT>& other)
 		{
 			return vm::cast(other.addr());
 		}
 
 		// Perform reinterpret cast
-		template <typename CT, typename T, typename AT>
-			requires requires(T* t) { reinterpret_cast<to_be_t<CT>*>(t); }
+		template <typename CT, typename T, typename AT, typename = decltype(reinterpret_cast<to_be_t<CT>*>(std::declval<T*>()))>
 		inline _ptr_base<to_be_t<CT>, u32> unsafe_ptr_cast(const _ptr_base<T, AT>& other)
 		{
 			return vm::cast(other.addr());
@@ -429,8 +423,8 @@ struct to_se<vm::_ptr_base<T, AT>, Se>
 };
 
 // Format pointer
-template <typename T, typename AT>
-struct fmt_unveil<vm::_ptr_base<T, AT>>
+template<typename T, typename AT>
+struct fmt_unveil<vm::_ptr_base<T, AT>, void>
 {
 	using type = vm::_ptr_base<T, u32>; // Use only T, ignoring AT
 
@@ -441,37 +435,25 @@ struct fmt_unveil<vm::_ptr_base<T, AT>>
 };
 
 template <>
-struct fmt_class_string<vm::_ptr_base<const void, u32>>
+struct fmt_class_string<vm::_ptr_base<const void, u32>, void>
 {
 	static void format(std::string& out, u64 arg);
 };
 
 template <typename T>
-struct fmt_class_string<vm::_ptr_base<T, u32>> : fmt_class_string<vm::_ptr_base<const void, u32>>
+struct fmt_class_string<vm::_ptr_base<T, u32>, void> : fmt_class_string<vm::_ptr_base<const void, u32>, void>
 {
 	// Classify all pointers as const void*
 };
 
 template <>
-struct fmt_class_string<vm::_ptr_base<const char, u32>>
+struct fmt_class_string<vm::_ptr_base<const char, u32>, void>
 {
 	static void format(std::string& out, u64 arg);
 };
 
 template <>
-struct fmt_class_string<vm::_ptr_base<char, u32>> : fmt_class_string<vm::_ptr_base<const char, u32>>
+struct fmt_class_string<vm::_ptr_base<char, u32>, void> : fmt_class_string<vm::_ptr_base<const char, u32>>
 {
 	// Classify char* as const char*
 };
-
-template <usz Size>
-struct fmt_class_string<vm::_ptr_base<const char[Size], u32>> : fmt_class_string<vm::_ptr_base<const char, u32>>
-{
-	// Classify const char[] as const char*
-};
-
-template <usz Size>
-struct fmt_class_string<vm::_ptr_base<char[Size], u32>> : fmt_class_string<vm::_ptr_base<const char, u32>>
-{
-	// Classify char[] as const char*
-};
diff --git a/rpcs3/Emu/Memory/vm_ref.h b/rpcs3/Emu/Memory/vm_ref.h
index 59e6daa8f0..4e792b9f55 100644
--- a/rpcs3/Emu/Memory/vm_ref.h
+++ b/rpcs3/Emu/Memory/vm_ref.h
@@ -20,10 +20,10 @@ namespace vm
 	{
 		AT m_addr;
 
-		static_assert(!std::is_pointer_v<T>, "vm::_ref_base<> error: invalid type (pointer)");
-		static_assert(!std::is_reference_v<T>, "vm::_ref_base<> error: invalid type (reference)");
-		static_assert(!std::is_function_v<T>, "vm::_ref_base<> error: invalid type (function)");
-		static_assert(!std::is_void_v<T>, "vm::_ref_base<> error: invalid type (void)");
+		static_assert(!std::is_pointer<T>::value, "vm::_ref_base<> error: invalid type (pointer)");
+		static_assert(!std::is_reference<T>::value, "vm::_ref_base<> error: invalid type (reference)");
+		static_assert(!std::is_function<T>::value, "vm::_ref_base<> error: invalid type (function)");
+		static_assert(!std::is_void<T>::value, "vm::_ref_base<> error: invalid type (void)");
 
 	public:
 		using type = T;
@@ -193,8 +193,8 @@ struct to_se<vm::_ref_base<T, AT>, Se>
 };
 
 // Forbid formatting
-template <typename T, typename AT>
-struct fmt_unveil<vm::_ref_base<T, AT>>
+template<typename T, typename AT>
+struct fmt_unveil<vm::_ref_base<T, AT>, void>
 {
 	static_assert(!sizeof(T), "vm::_ref_base<>: ambiguous format argument");
 };
diff --git a/rpcs3/Emu/Memory/vm_reservation.h b/rpcs3/Emu/Memory/vm_reservation.h
index 15e6c51320..e27d083618 100644
--- a/rpcs3/Emu/Memory/vm_reservation.h
+++ b/rpcs3/Emu/Memory/vm_reservation.h
@@ -3,7 +3,6 @@
 #include "vm.h"
 #include "vm_locking.h"
 #include "util/atomic.hpp"
-#include "util/tsc.hpp"
 #include <functional>
 
 extern bool g_use_rtm;
@@ -12,6 +11,7 @@ extern u64 g_rtm_tx_limit2;
 #ifdef _MSC_VER
 extern "C"
 {
+	u64 __rdtsc();
 	u32 _xbegin();
 	void _xend();
 }
@@ -19,11 +19,20 @@ extern "C"
 
 namespace vm
 {
+	inline u64 get_tsc()
+	{
+#ifdef _MSC_VER
+		return __rdtsc();
+#else
+		return __builtin_ia32_rdtsc();
+#endif
+	}
+
 	enum : u64
 	{
 		rsrv_lock_mask = 127,
 		rsrv_unique_lock = 64,
-		rsrv_putunc_flag = 32,
+		rsrv_shared_mask = 63,
 	};
 
 	// Get reservation status for further atomic update: last update timestamp
@@ -35,115 +44,11 @@ namespace vm
 
 	// Update reservation status
 	void reservation_update(u32 addr);
-	std::pair<bool, u64> try_reservation_update(u32 addr);
 
-	struct reservation_waiter_t
+	// Get reservation sync variable
+	inline atomic_t<u64>& reservation_notifier(u32 addr)
 	{
-		u32 wait_flag = 0;
-		u8 waiters_count = 0;
-		u8 waiters_index = 0;
-	};
-
-	static inline std::pair<atomic_t<reservation_waiter_t>*, atomic_t<reservation_waiter_t>*> reservation_notifier(u32 raddr)
-	{
-		extern std::array<atomic_t<reservation_waiter_t>, 1024> g_resrv_waiters_count;
-
-		// Storage efficient method to distinguish different nearby addresses (which are likely)
-		constexpr u32 wait_vars_for_each = 8;
-		constexpr u32 unique_address_bit_mask = 0b11;
-		const usz index = std::popcount(raddr & -1024) + ((raddr / 128) & unique_address_bit_mask) * 32;
-		auto& waiter = g_resrv_waiters_count[index * wait_vars_for_each];
-		return { &g_resrv_waiters_count[index * wait_vars_for_each + waiter.load().waiters_index % wait_vars_for_each], &waiter };
-	}
-
-	// Returns waiter count and index
-	static inline std::pair<u32, u32> reservation_notifier_count_index(u32 raddr)
-	{
-		const auto notifiers = reservation_notifier(raddr);
-		return { notifiers.first->load().waiters_count, static_cast<u32>(notifiers.first - notifiers.second) };
-	}
-
-	// Returns waiter count
-	static inline u32 reservation_notifier_count(u32 raddr)
-	{
-		return reservation_notifier(raddr).first->load().waiters_count;
-	}
-
-	static inline void reservation_notifier_end_wait(atomic_t<reservation_waiter_t>& waiter)
-	{
-		waiter.atomic_op([](reservation_waiter_t& value)
-		{
-			if (value.waiters_count-- == 1)
-			{
-				value.wait_flag = 0;
-			}
-		});
-	}
-
-	static inline atomic_t<reservation_waiter_t>* reservation_notifier_begin_wait(u32 raddr, u64 rtime)
-	{
-		const auto notifiers = reservation_notifier(raddr);
-		atomic_t<reservation_waiter_t>& waiter = *notifiers.first;
-
-		waiter.atomic_op([](reservation_waiter_t& value)
-		{
-			value.wait_flag = 1;
-			value.waiters_count++;
-		});
-
-		if ((reservation_acquire(raddr) & -128) != rtime)
-		{
-			reservation_notifier_end_wait(waiter);
-			return nullptr;
-		}
-
-		return &waiter;
-	}
-
-	static inline atomic_t<u32>* reservation_notifier_notify(u32 raddr, bool pospone = false)
-	{
-		const auto notifiers = reservation_notifier(raddr);
-
-		if (notifiers.first->load().wait_flag)
-		{
-			if (notifiers.first == notifiers.second)
-			{
-				if (!notifiers.first->fetch_op([](reservation_waiter_t& value)
-				{
-					if (value.waiters_index == 0)
-					{
-						value.wait_flag = 0;
-						value.waiters_count = 0;
-						value.waiters_index++;
-						return true;
-					}
-
-					return false;
-				}).second)
-				{
-					return nullptr;
-				}
-			}
-			else
-			{
-				u8 old_index = static_cast<u8>(notifiers.first - notifiers.second);
-				if (!atomic_storage<u8>::compare_exchange(notifiers.second->raw().waiters_index, old_index, (old_index + 1) % 4))
-				{
-					return nullptr;
-				}
-
-				notifiers.first->release(reservation_waiter_t{});
-			}
-
-			if (pospone)
-			{
-				return utils::bless<atomic_t<u32>>(&notifiers.first->raw().wait_flag);
-			}
-
-			utils::bless<atomic_t<u32>>(&notifiers.first->raw().wait_flag)->notify_all();
-		}
-
-		return nullptr;
+		return *reinterpret_cast<atomic_t<u64>*>(g_reservations + (addr & 0xff80) / 2);
 	}
 
 	u64 reservation_lock_internal(u32, atomic_t<u64>&);
@@ -203,14 +108,13 @@ namespace vm
 		auto& res = vm::reservation_acquire(addr);
 		//_m_prefetchw(&res);
 
-#if defined(ARCH_X64)
 		if (g_use_rtm)
 		{
 			// Stage 1: single optimistic transaction attempt
 			unsigned status = -1;
 			u64 _old = 0;
 
-			auto stamp0 = utils::get_tsc(), stamp1 = stamp0, stamp2 = stamp0;
+			auto stamp0 = get_tsc(), stamp1 = stamp0, stamp2 = stamp0;
 
 #ifndef _MSC_VER
 			__asm__ goto ("xbegin %l[stage2];" ::: "memory" : stage2);
@@ -239,7 +143,7 @@ namespace vm
 					_xend();
 #endif
 					if constexpr (Ack)
-						res.notify_all();
+						res.notify_all(-128);
 					return;
 				}
 				else
@@ -253,7 +157,7 @@ namespace vm
 						_xend();
 #endif
 						if constexpr (Ack)
-							res.notify_all();
+							res.notify_all(-128);
 						return result;
 					}
 					else
@@ -272,16 +176,16 @@ namespace vm
 #ifndef _MSC_VER
 			__asm__ volatile ("mov %%eax, %0;" : "=r" (status) :: "memory");
 #endif
-			stamp1 = utils::get_tsc();
+			stamp1 = get_tsc();
 
 			// Stage 2: try to lock reservation first
 			_old = res.fetch_add(1);
 
 			// Compute stamps excluding memory touch
-			stamp2 = utils::get_tsc() - (stamp1 - stamp0);
+			stamp2 = get_tsc() - (stamp1 - stamp0);
 
 			// Start lightened transaction
-			for (; !(_old & vm::rsrv_unique_lock) && stamp2 - stamp0 <= g_rtm_tx_limit2; stamp2 = utils::get_tsc())
+			for (; !(_old & vm::rsrv_unique_lock) && stamp2 - stamp0 <= g_rtm_tx_limit2; stamp2 = get_tsc())
 			{
 				if (cpu.has_pause_flag())
 				{
@@ -308,7 +212,7 @@ namespace vm
 #endif
 					res += 127;
 					if (Ack)
-						res.notify_all();
+						res.notify_all(-128);
 					return;
 				}
 				else
@@ -322,7 +226,7 @@ namespace vm
 #endif
 						res += 127;
 						if (Ack)
-							res.notify_all();
+							res.notify_all(-128);
 						return result;
 					}
 					else
@@ -357,7 +261,7 @@ namespace vm
 				});
 
 				if constexpr (Ack)
-					res.notify_all();
+					res.notify_all(-128);
 				return;
 			}
 			else
@@ -377,13 +281,10 @@ namespace vm
 				});
 
 				if (Ack && result)
-					res.notify_all();
+					res.notify_all(-128);
 				return result;
 			}
 		}
-#else
-		static_cast<void>(cpu);
-#endif /* ARCH_X64 */
 
 		// Lock reservation and perform heavyweight lock
 		reservation_shared_lock_internal(res);
@@ -397,7 +298,7 @@ namespace vm
 			}
 
 			if constexpr (Ack)
-				res.notify_all();
+				res.notify_all(-128);
 			return;
 		}
 		else
@@ -417,7 +318,7 @@ namespace vm
 			}
 
 			if (Ack && result)
-				res.notify_all();
+				res.notify_all(-128);
 			return result;
 		}
 	}
@@ -509,7 +410,7 @@ namespace vm
 
 			if constexpr (Ack)
 			{
-				res.notify_all();
+				res.notify_all(-128);
 			}
 		}
 		else
@@ -519,7 +420,7 @@ namespace vm
 
 			if constexpr (Ack)
 			{
-				res.notify_all();
+				res.notify_all(-128);
 			}
 
 			return result;
diff --git a/rpcs3/Emu/Memory/vm_var.h b/rpcs3/Emu/Memory/vm_var.h
index 4231ab048b..323699ae6f 100644
--- a/rpcs3/Emu/Memory/vm_var.h
+++ b/rpcs3/Emu/Memory/vm_var.h
@@ -172,7 +172,7 @@ namespace vm
 		struct gvar final : ptr<T>
 		{
 			static constexpr u32 alloc_size{sizeof(T) * Count};
-			static constexpr u32 alloc_align{std::max<u32>(alignof(T), 16)};
+			static constexpr u32 alloc_align{alignof(T)};
 		};
 	} // namespace ps3_
 } // namespace vm
diff --git a/rpcs3/Emu/NP/fb_helpers.cpp b/rpcs3/Emu/NP/fb_helpers.cpp
index 100c3e864c..33f89b64c0 100644
--- a/rpcs3/Emu/NP/fb_helpers.cpp
+++ b/rpcs3/Emu/NP/fb_helpers.cpp
@@ -1,650 +1,400 @@
 #include "stdafx.h"
-#include "Emu/Cell/lv2/sys_process.h"
-#include "fb_helpers.h"
+#include "np_handler.h"
 
 LOG_CHANNEL(rpcn_log, "rpcn");
 
-namespace np
+void np_handler::BinAttr_to_SceNpMatching2BinAttr(const flatbuffers::Vector<flatbuffers::Offset<BinAttr>>* fb_attr, vm::ptr<SceNpMatching2BinAttr> binattr_info)
 {
-	void BinAttr_to_SceNpMatching2BinAttr(event_data& edata, const BinAttr* bin_attr, SceNpMatching2BinAttr* binattr_info)
+	for (flatbuffers::uoffset_t i = 0; i < fb_attr->size(); i++)
 	{
-		binattr_info->id   = bin_attr->id();
-		binattr_info->size = bin_attr->data()->size();
-		auto* ptr          = edata.allocate<u8>(binattr_info->size, binattr_info->ptr);
-		for (flatbuffers::uoffset_t i = 0; i < bin_attr->data()->size(); i++)
+		auto bin_attr        = fb_attr->Get(i);
+		binattr_info[i].id   = bin_attr->id();
+		binattr_info[i].size = bin_attr->data()->size();
+		binattr_info[i].ptr  = allocate(binattr_info[i].size);
+		for (flatbuffers::uoffset_t tmp_index = 0; tmp_index < bin_attr->data()->size(); tmp_index++)
 		{
-			ptr[i] = bin_attr->data()->Get(i);
+			binattr_info[i].ptr[tmp_index] = bin_attr->data()->Get(tmp_index);
 		}
 	}
+}
 
-	void BinAttrs_to_SceNpMatching2BinAttrs(event_data& edata, const flatbuffers::Vector<flatbuffers::Offset<BinAttr>>* fb_attr, SceNpMatching2BinAttr* binattr_info)
+void np_handler::RoomGroup_to_SceNpMatching2RoomGroup(const flatbuffers::Vector<flatbuffers::Offset<RoomGroup>>* fb_group, vm::ptr<SceNpMatching2RoomGroup> group_info)
+{
+	for (flatbuffers::uoffset_t i = 0; i < fb_group->size(); i++)
 	{
-		for (flatbuffers::uoffset_t i = 0; i < fb_attr->size(); i++)
+		auto group                 = fb_group->Get(i);
+		group_info[i].groupId      = group->groupId();
+		group_info[i].withPassword = group->withPassword();
+		group_info[i].withLabel    = group->withLabel();
+		if (group->label())
 		{
-			auto cur_fb_attr = fb_attr->Get(i);
-			auto cur_binattr = binattr_info + i;
-
-			BinAttr_to_SceNpMatching2BinAttr(edata, cur_fb_attr, cur_binattr);
-		}
-	}
-
-	void RoomMemberBinAttrInternal_to_SceNpMatching2RoomMemberBinAttrInternal(event_data& edata, const RoomMemberBinAttrInternal* fb_attr, SceNpMatching2RoomMemberBinAttrInternal* binattr_info)
-	{
-		binattr_info->updateDate.tick = fb_attr->updateDate();
-		BinAttr_to_SceNpMatching2BinAttr(edata, fb_attr->data(), &binattr_info->data);
-	}
-
-	void RoomBinAttrInternal_to_SceNpMatching2RoomBinAttrInternal(event_data& edata, const BinAttrInternal* fb_attr, SceNpMatching2RoomBinAttrInternal* binattr_info)
-	{
-		binattr_info->updateDate.tick = fb_attr->updateDate();
-		binattr_info->updateMemberId  = fb_attr->updateMemberId();
-		BinAttr_to_SceNpMatching2BinAttr(edata, fb_attr->data(), &binattr_info->data);
-	}
-
-	void RoomGroup_to_SceNpMatching2RoomGroup(const RoomGroup* fb_group, SceNpMatching2RoomGroup* sce_group)
-	{
-		sce_group->groupId      = fb_group->groupId();
-		sce_group->withPassword = fb_group->withPassword();
-		sce_group->withLabel = fb_group->label() ? 1 : 0;
-		if (fb_group->label())
-		{
-			for (flatbuffers::uoffset_t l_index = 0; l_index < fb_group->label()->size(); l_index++)
+			for (flatbuffers::uoffset_t l_index = 0; l_index < group->label()->size(); l_index++)
 			{
-				sce_group->label.data[l_index] = fb_group->label()->Get(l_index);
+				group_info[i].label.data[l_index] = group->label()->Get(l_index);
 			}
 		}
-		sce_group->slotNum           = fb_group->slotNum();
-		sce_group->curGroupMemberNum = fb_group->curGroupMemberNum();
+		group_info[i].slotNum           = group->slotNum();
+		group_info[i].curGroupMemberNum = group->curGroupMemberNum();
 	}
+}
 
-	void RoomGroups_to_SceNpMatching2RoomGroups(const flatbuffers::Vector<flatbuffers::Offset<RoomGroup>>* fb_groups, SceNpMatching2RoomGroup* sce_groups)
+void np_handler::UserInfo2_to_SceNpUserInfo2(const UserInfo2* user, SceNpUserInfo2* user_info)
+{
+	if (user->npId())
+		std::memcpy(user_info->npId.handle.data, user->npId()->c_str(), std::min<usz>(16, user->npId()->size()));
+
+	if (user->onlineName())
 	{
-		for (flatbuffers::uoffset_t i = 0; i < fb_groups->size(); i++)
-		{
-			const auto* fb_group               = fb_groups->Get(i);
-			SceNpMatching2RoomGroup* sce_group = &sce_groups[i];
-			RoomGroup_to_SceNpMatching2RoomGroup(fb_group, sce_group);
-		}
+		user_info->onlineName.set(allocate(sizeof(SceNpOnlineName)));
+		std::memcpy(user_info->onlineName->data, user->onlineName()->c_str(), std::min<usz>(48, user->onlineName()->size()));
 	}
-
-	void UserInfo_to_SceNpUserInfo(const UserInfo* user, SceNpUserInfo* user_info)
+	if (user->avatarUrl())
 	{
-		if (const auto npid = user->npId(); npid)
-		{
-			std::memcpy(user_info->userId.handle.data, npid->c_str(), std::min<usz>(16, npid->size()));
-		}
-
-		if (const auto online_name = user->onlineName(); online_name)
-		{
-			std::memcpy(user_info->name.data, online_name->c_str(), std::min<usz>(48, online_name->size()));
-		}
-
-		if (const auto avatar_url = user->avatarUrl(); avatar_url)
-		{
-			std::memcpy(user_info->icon.data, avatar_url->c_str(), std::min<usz>(127, avatar_url->size()));
-		}
+		user_info->avatarUrl.set(allocate(sizeof(SceNpAvatarUrl)));
+		std::memcpy(user_info->avatarUrl->data, user->avatarUrl()->c_str(), std::min<usz>(127, user->avatarUrl()->size()));
 	}
+}
 
-	void UserInfo_to_SceNpUserInfo2(event_data& edata, const UserInfo* user, SceNpUserInfo2* user_info, bool include_onlinename, bool include_avatarurl)
+void np_handler::SearchRoomReponse_to_SceNpMatching2SearchRoomResponse(const SearchRoomResponse* resp, SceNpMatching2SearchRoomResponse* search_resp)
+{
+	search_resp->range.size       = resp->size();
+	search_resp->range.startIndex = resp->startIndex();
+	search_resp->range.total      = resp->total();
+
+	if (resp->rooms() && resp->rooms()->size() != 0)
 	{
-		if (user->npId())
-			std::memcpy(user_info->npId.handle.data, user->npId()->c_str(), std::min<usz>(16, user->npId()->size()));
-
-		if (include_onlinename && user->onlineName())
+		vm::addr_t previous_next = vm::cast<u32>(0);
+		for (flatbuffers::uoffset_t i = 0; i < resp->rooms()->size(); i++)
 		{
-			auto* ptr = edata.allocate<SceNpOnlineName>(sizeof(SceNpOnlineName), user_info->onlineName);
-			std::memcpy(ptr->data, user->onlineName()->c_str(), std::min<usz>(48, user->onlineName()->size()));
-		}
-		if (include_avatarurl && user->avatarUrl())
-		{
-			auto* ptr = edata.allocate<SceNpAvatarUrl>(sizeof(SceNpAvatarUrl), user_info->avatarUrl);
-			std::memcpy(ptr->data, user->avatarUrl()->c_str(), std::min<usz>(127, user->avatarUrl()->size()));
-		}
-	}
+			auto room = resp->rooms()->Get(i);
+			vm::ptr<SceNpMatching2RoomDataExternal> room_info(allocate(sizeof(SceNpMatching2RoomDataExternal)));
 
-	void RoomDataExternal_to_SceNpMatching2RoomDataExternal(event_data& edata, const RoomDataExternal* room, SceNpMatching2RoomDataExternal* room_info, bool include_onlinename, bool include_avatarurl)
-	{
-		room_info->serverId           = room->serverId();
-		room_info->worldId            = room->worldId();
-		room_info->lobbyId            = room->lobbyId();
-		room_info->roomId             = room->roomId();
-		room_info->maxSlot            = room->maxSlot();
-		room_info->curMemberNum       = room->curMemberNum();
-		room_info->passwordSlotMask   = room->passwordSlotMask();
-
-		s32 sdk_ver;
-		process_get_sdk_version(process_getpid(), sdk_ver);
-
-		// Structure changed in sdk 3.3.0
-		if (sdk_ver >= 0x330000)
-		{
-			room_info->publicSlotNum = room->publicSlotNum();
-			room_info->privateSlotNum = room->privateSlotNum();
-			room_info->openPublicSlotNum = room->openPublicSlotNum();
-			room_info->openPrivateSlotNum = room->openPrivateSlotNum();
-		}
-		else
-		{
-			room_info->publicSlotNum = 0;
-			room_info->privateSlotNum = 0;
-			room_info->openPublicSlotNum = 0;
-			room_info->openPrivateSlotNum = 0;
-		}
-
-		if (auto owner = room->owner())
-		{
-			auto* ptr_owner = edata.allocate<SceNpUserInfo2>(sizeof(SceNpUserInfo2), room_info->owner);
-			UserInfo_to_SceNpUserInfo2(edata, owner, ptr_owner, include_onlinename, include_avatarurl);
-		}
-
-		if (room->roomGroup() && room->roomGroup()->size() != 0)
-		{
-			room_info->roomGroupNum = room->roomGroup()->size();
-			auto* ptr_groups        = edata.allocate<SceNpMatching2RoomGroup>(sizeof(SceNpMatching2RoomGroup) * room_info->roomGroupNum, room_info->roomGroup);
-			RoomGroups_to_SceNpMatching2RoomGroups(room->roomGroup(), ptr_groups);
-		}
-
-		room_info->flagAttr = room->flagAttr();
-
-		if (room->roomSearchableIntAttrExternal() && room->roomSearchableIntAttrExternal()->size() != 0)
-		{
-			room_info->roomSearchableIntAttrExternalNum = room->roomSearchableIntAttrExternal()->size();
-			auto* ptr_int_attr                          = edata.allocate<SceNpMatching2IntAttr>(sizeof(SceNpMatching2IntAttr) * room_info->roomSearchableIntAttrExternalNum, room_info->roomSearchableIntAttrExternal);
-			for (flatbuffers::uoffset_t a_index = 0; a_index < room->roomSearchableIntAttrExternal()->size(); a_index++)
+			if (i > 0)
 			{
-				auto fb_int_attr          = room->roomSearchableIntAttrExternal()->Get(a_index);
-				ptr_int_attr[a_index].id  = fb_int_attr->id();
-				ptr_int_attr[a_index].num = fb_int_attr->num();
-			}
-		}
-
-		if (room->roomSearchableBinAttrExternal() && room->roomSearchableBinAttrExternal()->size() != 0)
-		{
-			room_info->roomSearchableBinAttrExternalNum = room->roomSearchableBinAttrExternal()->size();
-			auto* ptr_bin_attr                          = edata.allocate<SceNpMatching2BinAttr>(sizeof(SceNpMatching2BinAttr) * room_info->roomSearchableBinAttrExternalNum, room_info->roomSearchableBinAttrExternal);
-			BinAttrs_to_SceNpMatching2BinAttrs(edata, room->roomSearchableBinAttrExternal(), ptr_bin_attr);
-		}
-
-		if (room->roomBinAttrExternal() && room->roomBinAttrExternal()->size() != 0)
-		{
-			room_info->roomBinAttrExternalNum = room->roomBinAttrExternal()->size();
-			auto* ptr_bin_attr                = edata.allocate<SceNpMatching2BinAttr>(sizeof(SceNpMatching2BinAttr) * room_info->roomBinAttrExternalNum, room_info->roomBinAttrExternal);
-			BinAttrs_to_SceNpMatching2BinAttrs(edata, room->roomBinAttrExternal(), ptr_bin_attr);
-		}
-	}
-
-	void SearchRoomResponse_to_SceNpMatching2SearchRoomResponse(event_data& edata, const SearchRoomResponse* resp, SceNpMatching2SearchRoomResponse* search_resp)
-	{
-		search_resp->range.size = resp->rooms() ? resp->rooms()->size() : 0;
-		search_resp->range.startIndex = resp->startIndex();
-		search_resp->range.total      = resp->total();
-
-		SceNpMatching2RoomDataExternal* prev_room = nullptr;
-		for (flatbuffers::uoffset_t i = 0; i < search_resp->range.size; i++)
-		{
-			auto* fb_room = resp->rooms()->Get(i);
-			SceNpMatching2RoomDataExternal* cur_room;
-			cur_room = edata.allocate<SceNpMatching2RoomDataExternal>(sizeof(SceNpMatching2RoomDataExternal), (i > 0) ? prev_room->next : search_resp->roomDataExternal);
-			RoomDataExternal_to_SceNpMatching2RoomDataExternal(edata, fb_room, cur_room, true, true);
-			prev_room = cur_room;
-		}
-	}
-
-	void GetRoomDataExternalListResponse_to_SceNpMatching2GetRoomDataExternalListResponse(event_data& edata, const GetRoomDataExternalListResponse* resp, SceNpMatching2GetRoomDataExternalListResponse* get_resp, bool include_onlinename, bool include_avatarurl)
-	{
-		get_resp->roomDataExternalNum = resp->rooms() ? resp->rooms()->size() : 0;
-
-		SceNpMatching2RoomDataExternal* prev_room = nullptr;
-		for (flatbuffers::uoffset_t i = 0; i < get_resp->roomDataExternalNum; i++)
-		{
-			auto* fb_room = resp->rooms()->Get(i);
-			SceNpMatching2RoomDataExternal* cur_room;
-
-			cur_room = edata.allocate<SceNpMatching2RoomDataExternal>(sizeof(SceNpMatching2RoomDataExternal), (i > 0) ? prev_room->next : get_resp->roomDataExternal);
-
-			RoomDataExternal_to_SceNpMatching2RoomDataExternal(edata, fb_room, cur_room, include_onlinename, include_avatarurl);
-			prev_room = cur_room;
-		}
-	}
-
-	u16 RoomDataInternal_to_SceNpMatching2RoomDataInternal(event_data& edata, const RoomDataInternal* resp, SceNpMatching2RoomDataInternal* room_info, const SceNpId& npid, bool include_onlinename, bool include_avatarurl)
-	{
-		u16 member_id               = 0;
-		room_info->serverId         = resp->serverId();
-		room_info->worldId          = resp->worldId();
-		room_info->lobbyId          = resp->lobbyId();
-		room_info->roomId           = resp->roomId();
-		room_info->passwordSlotMask = resp->passwordSlotMask();
-		room_info->maxSlot          = resp->maxSlot();
-
-		if (resp->roomGroup() && resp->roomGroup()->size() != 0)
-		{
-			room_info->roomGroupNum = resp->roomGroup()->size();
-			auto* ptr_groups        = edata.allocate<SceNpMatching2RoomGroup>(sizeof(SceNpMatching2RoomGroup) * room_info->roomGroupNum, room_info->roomGroup);
-			RoomGroups_to_SceNpMatching2RoomGroups(resp->roomGroup(), ptr_groups);
-		}
-
-		room_info->memberList.membersNum = static_cast<u32>(resp->memberList()->size());
-		edata.allocate<SceNpMatching2RoomMemberDataInternal>(sizeof(SceNpMatching2RoomMemberDataInternal) * room_info->memberList.membersNum, room_info->memberList.members);
-
-		for (flatbuffers::uoffset_t i = 0; i < resp->memberList()->size(); i++)
-		{
-			auto fb_member                                   = resp->memberList()->Get(i);
-			SceNpMatching2RoomMemberDataInternal* sce_member = &room_info->memberList.members[i];
-
-			if (i < (resp->memberList()->size() - 1))
-			{
-				sce_member->next = room_info->memberList.members + i + 1;
-				edata.add_relocation<SceNpMatching2RoomMemberDataInternal>(sce_member->next);
-			}
-
-			RoomMemberDataInternal_to_SceNpMatching2RoomMemberDataInternal(edata, fb_member, room_info, sce_member, include_onlinename, include_avatarurl);
-		}
-
-		for (u32 i = 0; i < room_info->memberList.membersNum; i++)
-		{
-			SceNpMatching2RoomMemberDataInternal* sce_member = &room_info->memberList.members[i];
-			if (strcmp(sce_member->userInfo.npId.handle.data, npid.handle.data) == 0)
-			{
-				room_info->memberList.me = room_info->memberList.members + i;
-				edata.add_relocation<SceNpMatching2RoomMemberDataInternal>(room_info->memberList.me);
-				member_id = sce_member->memberId;
-				break;
-			}
-		}
-
-		for (u32 i = 0; i < room_info->memberList.membersNum; i++)
-		{
-			SceNpMatching2RoomMemberDataInternal* sce_member = &room_info->memberList.members[i];
-			if (sce_member->memberId == resp->ownerId())
-			{
-				room_info->memberList.owner = room_info->memberList.members + i;
-				edata.add_relocation<SceNpMatching2RoomMemberDataInternal>(room_info->memberList.owner);
-				break;
-			}
-		}
-
-		room_info->flagAttr = resp->flagAttr();
-
-		if (resp->roomBinAttrInternal() && resp->roomBinAttrInternal()->size() != 0)
-		{
-			room_info->roomBinAttrInternalNum = resp->roomBinAttrInternal()->size();
-			auto* ptr_bin_attr                = edata.allocate<SceNpMatching2RoomBinAttrInternal>(sizeof(SceNpMatching2RoomBinAttrInternal) * room_info->roomBinAttrInternalNum, room_info->roomBinAttrInternal);
-
-			for (u32 b_index = 0; b_index < room_info->roomBinAttrInternalNum; b_index++)
-			{
-				auto fb_bin_attr                      = resp->roomBinAttrInternal()->Get(b_index);
-				ptr_bin_attr[b_index].updateDate.tick = fb_bin_attr->updateDate();
-				ptr_bin_attr[b_index].updateMemberId  = fb_bin_attr->updateMemberId();
-
-				ptr_bin_attr[b_index].data.id   = fb_bin_attr->data()->id();
-				ptr_bin_attr[b_index].data.size = fb_bin_attr->data()->data()->size();
-				auto* ptr_bin_attr_data         = edata.allocate<u8>(ptr_bin_attr[b_index].data.size, ptr_bin_attr[b_index].data.ptr);
-				for (flatbuffers::uoffset_t tmp_index = 0; tmp_index < ptr_bin_attr[b_index].data.size; tmp_index++)
-				{
-					ptr_bin_attr_data[tmp_index] = fb_bin_attr->data()->data()->Get(tmp_index);
-				}
-			}
-		}
-
-		return member_id;
-	}
-
-	void RoomMemberDataInternal_to_SceNpMatching2RoomMemberDataInternal(event_data& edata, const RoomMemberDataInternal* member_data, const SceNpMatching2RoomDataInternal* room_info, SceNpMatching2RoomMemberDataInternal* sce_member_data, bool include_onlinename, bool include_avatarurl)
-	{
-		UserInfo_to_SceNpUserInfo2(edata, member_data->userInfo(), &sce_member_data->userInfo, include_onlinename, include_avatarurl);
-		sce_member_data->joinDate.tick = member_data->joinDate();
-		sce_member_data->memberId      = member_data->memberId();
-		sce_member_data->teamId        = member_data->teamId();
-
-		if (const auto* fb_roomgroup = member_data->roomGroup())
-		{
-			if (room_info)
-			{
-				// If we have SceNpMatching2RoomDataInternal available we point the pointers to the group there
-				sce_member_data->roomGroup = room_info->roomGroup + (fb_roomgroup->groupId() - 1);
-				edata.add_relocation<SceNpMatching2RoomGroup>(sce_member_data->roomGroup);
+				vm::ptr<SceNpMatching2RoomDataExternal> prev_room(previous_next);
+				prev_room->next.set(room_info.addr());
 			}
 			else
 			{
-				// Otherwise we allocate for it
-				auto* ptr_group = edata.allocate<SceNpMatching2RoomGroup>(sizeof(SceNpMatching2RoomGroup), sce_member_data->roomGroup);
-				RoomGroup_to_SceNpMatching2RoomGroup(fb_roomgroup, ptr_group);
+				search_resp->roomDataExternal = room_info;
+			}
+
+			previous_next = vm::cast(room_info.addr());
+
+			room_info->serverId           = room->serverId();
+			room_info->worldId            = room->worldId();
+			room_info->publicSlotNum      = room->publicSlotNum();
+			room_info->privateSlotNum     = room->privateSlotNum();
+			room_info->lobbyId            = room->lobbyId();
+			room_info->roomId             = room->roomId();
+			room_info->openPublicSlotNum  = room->openPublicSlotNum();
+			room_info->maxSlot            = room->maxSlot();
+			room_info->openPrivateSlotNum = room->openPrivateSlotNum();
+			room_info->curMemberNum       = room->curMemberNum();
+			room_info->passwordSlotMask   = room->curMemberNum();
+			if (auto owner = room->owner())
+			{
+				vm::ptr<SceNpUserInfo2> owner_info(allocate(sizeof(SceNpUserInfo2)));
+				UserInfo2_to_SceNpUserInfo2(owner, owner_info.get_ptr());
+				room_info->owner = owner_info;
+			}
+
+			if (room->roomGroup() && room->roomGroup()->size() != 0)
+			{
+				room_info->roomGroupNum = room->roomGroup()->size();
+				vm::ptr<SceNpMatching2RoomGroup> group_info(allocate(sizeof(SceNpMatching2RoomGroup) * room_info->roomGroupNum));
+				RoomGroup_to_SceNpMatching2RoomGroup(room->roomGroup(), group_info);
+				room_info->roomGroup = group_info;
+			}
+
+			room_info->flagAttr = room->flagAttr();
+
+			if (room->roomSearchableIntAttrExternal() && room->roomSearchableIntAttrExternal()->size() != 0)
+			{
+				room_info->roomSearchableIntAttrExternalNum = room->roomSearchableIntAttrExternal()->size();
+				vm::ptr<SceNpMatching2IntAttr> intattr_info(allocate(sizeof(SceNpMatching2IntAttr) * room_info->roomSearchableIntAttrExternalNum));
+				for (flatbuffers::uoffset_t a_index = 0; a_index < room->roomSearchableIntAttrExternal()->size(); a_index++)
+				{
+					auto int_attr             = room->roomSearchableIntAttrExternal()->Get(a_index);
+					intattr_info[a_index].id  = int_attr->id();
+					intattr_info[a_index].num = int_attr->num();
+				}
+				room_info->roomSearchableIntAttrExternal = intattr_info;
+			}
+
+			if (room->roomSearchableBinAttrExternal() && room->roomSearchableBinAttrExternal()->size() != 0)
+			{
+				room_info->roomSearchableBinAttrExternalNum = room->roomSearchableBinAttrExternal()->size();
+				vm::ptr<SceNpMatching2BinAttr> binattr_info(allocate(sizeof(SceNpMatching2BinAttr) * room_info->roomSearchableBinAttrExternalNum));
+				BinAttr_to_SceNpMatching2BinAttr(room->roomSearchableBinAttrExternal(), binattr_info);
+				room_info->roomSearchableBinAttrExternal = binattr_info;
+			}
+
+			if (room->roomBinAttrExternal() && room->roomBinAttrExternal()->size() != 0)
+			{
+				room_info->roomBinAttrExternalNum = room->roomBinAttrExternal()->size();
+				vm::ptr<SceNpMatching2BinAttr> binattr_info(allocate(sizeof(SceNpMatching2BinAttr) * room_info->roomBinAttrExternalNum));
+				BinAttr_to_SceNpMatching2BinAttr(room->roomBinAttrExternal(), binattr_info);
+				room_info->roomBinAttrExternal = binattr_info;
 			}
 		}
+	}
+	else
+	{
+		search_resp->roomDataExternal.set(0);
+	}
+}
 
-		sce_member_data->natType  = member_data->natType();
-		sce_member_data->flagAttr = member_data->flagAttr();
+u16 np_handler::RoomDataInternal_to_SceNpMatching2RoomDataInternal(const RoomDataInternal* resp, SceNpMatching2RoomDataInternal* room_info, const SceNpId& npid)
+{
+	u16 member_id                    = 0;
+	room_info->serverId              = resp->serverId();
+	room_info->worldId               = resp->worldId();
+	room_info->lobbyId               = resp->lobbyId();
+	room_info->roomId                = resp->roomId();
+	room_info->passwordSlotMask      = resp->passwordSlotMask();
+	room_info->maxSlot               = resp->maxSlot();
+	room_info->memberList.membersNum = resp->memberList()->size();
 
-		if (member_data->roomMemberBinAttrInternal() && member_data->roomMemberBinAttrInternal()->size() != 0)
+	if (resp->roomGroup() && resp->roomGroup()->size() != 0)
+	{
+		room_info->roomGroupNum = resp->roomGroup()->size();
+		vm::ptr<SceNpMatching2RoomGroup> group_info(allocate(sizeof(SceNpMatching2RoomGroup) * room_info->roomGroupNum));
+		RoomGroup_to_SceNpMatching2RoomGroup(resp->roomGroup(), group_info);
+		room_info->roomGroup = group_info;
+	}
+
+	vm::ptr<SceNpMatching2RoomMemberDataInternal> prev_member;
+	for (flatbuffers::uoffset_t i = 0; i < resp->memberList()->size(); i++)
+	{
+		auto member = resp->memberList()->Get(i);
+		vm::ptr<SceNpMatching2RoomMemberDataInternal> member_info(allocate(sizeof(SceNpMatching2RoomMemberDataInternal)));
+
+		if (i > 0)
 		{
-			sce_member_data->roomMemberBinAttrInternalNum = member_data->roomMemberBinAttrInternal()->size();
-			auto* sce_binattrs                            = edata.allocate<SceNpMatching2RoomMemberBinAttrInternal>(sizeof(SceNpMatching2RoomMemberBinAttrInternal) * sce_member_data->roomMemberBinAttrInternalNum, sce_member_data->roomMemberBinAttrInternal);
-			for (u32 b_index = 0; b_index < sce_member_data->roomMemberBinAttrInternalNum; b_index++)
-			{
-				const auto fb_battr                   = member_data->roomMemberBinAttrInternal()->Get(b_index);
-				sce_binattrs[b_index].updateDate.tick = fb_battr->updateDate();
+			prev_member->next = member_info;
+		}
+		else
+		{
+			room_info->memberList.members    = member_info;
+			room_info->memberList.membersNum = static_cast<u32>(resp->memberList()->size());
+		}
 
-				sce_binattrs[b_index].data.id   = fb_battr->data()->id();
-				sce_binattrs[b_index].data.size = fb_battr->data()->data()->size();
-				auto* sce_binattr_data          = edata.allocate<u8>(sce_binattrs[b_index].data.size, sce_binattrs[b_index].data.ptr);
-				for (flatbuffers::uoffset_t tmp_index = 0; tmp_index < sce_binattrs[b_index].data.size; tmp_index++)
+		prev_member = member_info;
+
+		UserInfo2_to_SceNpUserInfo2(member->userInfo(), &member_info->userInfo);
+		member_info->joinDate.tick = member->joinDate();
+		member_info->memberId      = member->memberId();
+		member_info->teamId        = member->teamId();
+
+		// Look for id
+		if (member->roomGroup() != 0)
+		{
+			bool found = false;
+			for (u32 g_index = 0; g_index < room_info->roomGroupNum; g_index++)
+			{
+				if (room_info->roomGroup[g_index].groupId == member->roomGroup())
 				{
-					sce_binattr_data[tmp_index] = fb_battr->data()->data()->Get(tmp_index);
+					member_info->roomGroup = vm::cast(room_info->roomGroup.addr() + (u32{sizeof(SceNpMatching2RoomGroup)} * g_index));
+					found                  = true;
 				}
 			}
+			ensure(found);
 		}
-	}
 
-	void RoomMemberUpdateInfo_to_SceNpMatching2RoomMemberUpdateInfo(event_data& edata, const RoomMemberUpdateInfo* update_info, SceNpMatching2RoomMemberUpdateInfo* sce_update_info, bool include_onlinename, bool include_avatarurl)
-	{
-		sce_update_info->eventCause = 0;
-		if (update_info->optData())
+		member_info->natType  = member->natType();
+		member_info->flagAttr = member->flagAttr();
+
+		if (member->roomMemberBinAttrInternal() && member->roomMemberBinAttrInternal()->size() != 0)
 		{
-			sce_update_info->optData.length = update_info->optData()->data()->size();
-			for (flatbuffers::uoffset_t i = 0; i < 16; i++)
+			member_info->roomMemberBinAttrInternalNum = member->roomMemberBinAttrInternal()->size();
+			vm::ptr<SceNpMatching2RoomMemberBinAttrInternal> binattr_info(allocate(sizeof(SceNpMatching2RoomMemberBinAttrInternal) * member_info->roomMemberBinAttrInternalNum));
+			for (u32 b_index = 0; b_index < member_info->roomMemberBinAttrInternalNum; b_index++)
 			{
-				sce_update_info->optData.data[i] = update_info->optData()->data()->Get(i);
-			}
-		}
+				const auto battr                      = member->roomMemberBinAttrInternal()->Get(b_index);
+				binattr_info[b_index].updateDate.tick = battr->updateDate();
 
-		if (update_info->roomMemberDataInternal())
-		{
-			auto fb_member              = update_info->roomMemberDataInternal();
-			auto* ptr_roomemberinternal = edata.allocate<SceNpMatching2RoomMemberDataInternal>(sizeof(SceNpMatching2RoomMemberDataInternal), sce_update_info->roomMemberDataInternal);
-
-			// TODO: Pass room_info
-			RoomMemberDataInternal_to_SceNpMatching2RoomMemberDataInternal(edata, fb_member, nullptr, ptr_roomemberinternal, include_onlinename, include_avatarurl);
-		}
-	}
-
-	void RoomUpdateInfo_to_SceNpMatching2RoomUpdateInfo(const RoomUpdateInfo* update_info, SceNpMatching2RoomUpdateInfo* sce_update_info)
-	{
-		sce_update_info->errorCode  = 0;
-		sce_update_info->eventCause = 0;
-		if (update_info->optData())
-		{
-			sce_update_info->optData.length = update_info->optData()->data()->size();
-			for (flatbuffers::uoffset_t i = 0; i < 16; i++)
-			{
-				sce_update_info->optData.data[i] = update_info->optData()->data()->Get(i);
-			}
-		}
-	}
-
-	void RoomDataInternalUpdateInfo_to_SceNpMatching2RoomDataInternalUpdateInfo(event_data& edata, const RoomDataInternalUpdateInfo* update_info, SceNpMatching2RoomDataInternalUpdateInfo* sce_update_info, const SceNpId& npid, bool include_onlinename, bool include_avatarurl)
-	{
-		auto* sce_room_data = edata.allocate<SceNpMatching2RoomDataInternal>(sizeof(SceNpMatching2RoomDataInternal), sce_update_info->newRoomDataInternal);
-		RoomDataInternal_to_SceNpMatching2RoomDataInternal(edata, update_info->newRoomDataInternal(), sce_room_data, npid, include_onlinename, include_avatarurl);
-
-		if (sce_room_data->flagAttr != update_info->prevFlagAttr())
-		{
-			sce_update_info->newFlagAttr = sce_update_info->newRoomDataInternal.ptr(&SceNpMatching2RoomDataInternal::flagAttr);
-			edata.add_relocation<u32>(sce_update_info->newFlagAttr);
-			auto* ptr_sce_prevflag = edata.allocate<SceNpMatching2FlagAttr>(sizeof(SceNpMatching2FlagAttr), sce_update_info->prevFlagAttr);
-			*ptr_sce_prevflag      = update_info->prevFlagAttr();
-		}
-
-		if (sce_room_data->passwordSlotMask != update_info->prevRoomPasswordSlotMask())
-		{
-			sce_update_info->newRoomPasswordSlotMask = sce_update_info->newRoomDataInternal.ptr(&SceNpMatching2RoomDataInternal::passwordSlotMask);
-			edata.add_relocation<u64>(sce_update_info->newRoomPasswordSlotMask);
-			auto* ptr_sce_prevpass = edata.allocate<SceNpMatching2RoomPasswordSlotMask>(sizeof(SceNpMatching2RoomPasswordSlotMask), sce_update_info->prevRoomPasswordSlotMask);
-			*ptr_sce_prevpass      = update_info->prevRoomPasswordSlotMask();
-		}
-
-		if (update_info->newRoomGroup() && update_info->newRoomGroup()->size() != 0)
-		{
-			rpcn_log.todo("RoomDataInternalUpdateInfo::newRoomGroup");
-			// TODO
-			// sce_update_info->newRoomGroupNum = update_info->newRoomGroup()->size();
-			// vm::ptr<SceNpMatching2RoomGroup> group_info(allocate(sizeof(SceNpMatching2RoomGroup) * sce_update_info->newRoomGroupNum));
-			// RoomGroups_to_SceNpMatching2RoomGroup(update_info->newRoomGroup(), group_info);
-			// sce_update_info->newRoomGroup = group_info;
-		}
-
-		if (update_info->newRoomBinAttrInternal() && update_info->newRoomBinAttrInternal()->size() != 0)
-		{
-			const auto get_ptr_for_binattr = [&](u16 binattr_id) -> vm::bptr<SceNpMatching2RoomBinAttrInternal>
-			{
-				vm::bptr<SceNpMatching2RoomBinAttrInternal> ret_ptr = sce_room_data->roomBinAttrInternal;
-				for (u32 i = 0; i < sce_room_data->roomBinAttrInternalNum; i++)
+				binattr_info[b_index].data.id   = battr->data()->id();
+				binattr_info[b_index].data.size = battr->data()->data()->size();
+				binattr_info[b_index].data.ptr  = allocate(binattr_info[b_index].data.size);
+				for (flatbuffers::uoffset_t tmp_index = 0; tmp_index < binattr_info[b_index].data.size; tmp_index++)
 				{
-					if (ret_ptr->data.id == binattr_id)
-						return ret_ptr;
-
-					ret_ptr++;
+					binattr_info[b_index].data.ptr[tmp_index] = battr->data()->data()->Get(tmp_index);
 				}
-				rpcn_log.fatal("RoomDataInternalUpdateInfo_to_SceNpMatching2RoomDataInternalUpdateInfo: Couldn't find matching roomBinAttrInternal!");
-				return vm::null;
-			};
-
-			sce_update_info->newRoomBinAttrInternalNum = update_info->newRoomBinAttrInternal()->size();
-			edata.allocate_ptr_array<SceNpMatching2RoomBinAttrInternal>(sce_update_info->newRoomBinAttrInternalNum, sce_update_info->newRoomBinAttrInternal);
-			for (u32 i = 0; i < sce_update_info->newRoomBinAttrInternalNum; i++)
-			{
-				sce_update_info->newRoomBinAttrInternal[i] = get_ptr_for_binattr(update_info->newRoomBinAttrInternal()->Get(i));
 			}
+			member_info->roomMemberBinAttrInternal = binattr_info;
 		}
 	}
 
-	void RoomMemberDataInternalUpdateInfo_to_SceNpMatching2RoomMemberDataInternalUpdateInfo(event_data& edata, const RoomMemberDataInternalUpdateInfo* update_info, SceNpMatching2RoomMemberDataInternalUpdateInfo* sce_update_info, bool include_onlinename, bool include_avatarurl)
+	vm::ptr<SceNpMatching2RoomMemberDataInternal> ptr = room_info->memberList.members;
+	while (ptr)
 	{
-		auto* sce_room_member_data = edata.allocate<SceNpMatching2RoomMemberDataInternal>(sizeof(SceNpMatching2RoomMemberDataInternal), sce_update_info->newRoomMemberDataInternal);
-		RoomMemberDataInternal_to_SceNpMatching2RoomMemberDataInternal(edata, update_info->newRoomMemberDataInternal(), nullptr, sce_room_member_data, include_onlinename, include_avatarurl);
-
-		if (sce_update_info->newRoomMemberDataInternal->flagAttr != update_info->prevFlagAttr())
+		if (strcmp(ptr->userInfo.npId.handle.data, npid.handle.data) == 0)
 		{
-			sce_update_info->newFlagAttr = sce_update_info->newRoomMemberDataInternal.ptr(&SceNpMatching2RoomMemberDataInternal::flagAttr);
-			edata.add_relocation<u32>(sce_update_info->newFlagAttr);
-			auto* ptr_sce_prevflag = edata.allocate<SceNpMatching2FlagAttr>(sizeof(SceNpMatching2FlagAttr), sce_update_info->prevFlagAttr);
-			*ptr_sce_prevflag      = update_info->prevFlagAttr();
-		}
-
-		if (sce_update_info->newRoomMemberDataInternal->teamId != update_info->prevTeamId())
-		{
-			sce_update_info->newTeamId = sce_update_info->newRoomMemberDataInternal.ptr(&SceNpMatching2RoomMemberDataInternal::teamId);
-			edata.add_relocation<u8>(sce_update_info->newTeamId);
-		}
-
-		if (update_info->newRoomMemberBinAttrInternal() && update_info->newRoomMemberBinAttrInternal()->size() != 0)
-		{
-			const auto get_ptr_for_binattr = [&](u16 binattr_id) -> vm::bptr<SceNpMatching2RoomMemberBinAttrInternal>
-			{
-				vm::bptr<SceNpMatching2RoomMemberBinAttrInternal> ret_ptr = sce_room_member_data->roomMemberBinAttrInternal;
-				for (u32 i = 0; i < sce_room_member_data->roomMemberBinAttrInternalNum; i++)
-				{
-					if (ret_ptr->data.id == binattr_id)
-						return ret_ptr;
-
-					ret_ptr++;
-				}
-				rpcn_log.fatal("RoomMemberDataInternalUpdateInfo_to_SceNpMatching2RoomMemberDataInternalUpdateInfo: Couldn't find matching roomMemberBinAttrInternal!");
-				return vm::null;
-			};
-
-			sce_update_info->newRoomMemberBinAttrInternalNum = update_info->newRoomMemberBinAttrInternal()->size();
-			edata.allocate_ptr_array<SceNpMatching2RoomMemberBinAttrInternal>(sce_update_info->newRoomMemberBinAttrInternalNum, sce_update_info->newRoomMemberBinAttrInternal);
-			for (u32 i = 0; i < sce_update_info->newRoomMemberBinAttrInternalNum; i++)
-			{
-				sce_update_info->newRoomMemberBinAttrInternal[i] = get_ptr_for_binattr(update_info->newRoomMemberBinAttrInternal()->Get(i));
-			}
-		}
-	}
-
-	void GetPingInfoResponse_to_SceNpMatching2SignalingGetPingInfoResponse(const GetPingInfoResponse* resp, SceNpMatching2SignalingGetPingInfoResponse* sce_resp)
-	{
-		sce_resp->serverId = resp->serverId();
-		sce_resp->worldId  = resp->worldId();
-		sce_resp->roomId   = resp->roomId();
-		sce_resp->rtt      = resp->rtt();
-	}
-
-	void RoomMessageInfo_to_SceNpMatching2RoomMessageInfo(event_data& edata, const RoomMessageInfo* mi, SceNpMatching2RoomMessageInfo* sce_mi, bool include_onlinename, bool include_avatarurl)
-	{
-		sce_mi->filtered = mi->filtered();
-		sce_mi->castType = mi->castType();
-
-		if (sce_mi->castType != SCE_NP_MATCHING2_CASTTYPE_BROADCAST)
-		{
-			edata.allocate<SceNpMatching2RoomMessageDestination>(sizeof(SceNpMatching2RoomMessageDestination), sce_mi->dst);
-		}
-
-		switch (sce_mi->castType)
-		{
-		case SCE_NP_MATCHING2_CASTTYPE_BROADCAST: break;
-		case SCE_NP_MATCHING2_CASTTYPE_UNICAST: sce_mi->dst->unicastTarget = mi->dst()->Get(0); break;
-		case SCE_NP_MATCHING2_CASTTYPE_MULTICAST:
-		{
-			sce_mi->dst->multicastTarget.memberIdNum = mi->dst()->size();
-			edata.allocate<u16>(sizeof(u16) * mi->dst()->size(), sce_mi->dst->multicastTarget.memberId);
-			for (u32 i = 0; i < mi->dst()->size(); i++)
-			{
-				sce_mi->dst->multicastTarget.memberId[i] = mi->dst()->Get(i);
-			}
+			room_info->memberList.me = ptr;
+			member_id                = ptr->memberId;
 			break;
 		}
-		case SCE_NP_MATCHING2_CASTTYPE_MULTICAST_TEAM: sce_mi->dst->multicastTargetTeamId = ::narrow<SceNpMatching2TeamId>(mi->dst()->Get(0)); break;
-		default: ensure(false);
-		}
-
-		if (auto src_member = mi->srcMember())
-		{
-			auto* ptr_sce_userinfo = edata.allocate<SceNpUserInfo2>(sizeof(SceNpUserInfo2), sce_mi->srcMember);
-			UserInfo_to_SceNpUserInfo2(edata, src_member, ptr_sce_userinfo, include_onlinename, include_avatarurl);
-		}
-
-		if (auto msg = mi->msg())
-		{
-			sce_mi->msgLen     = msg->size();
-			auto* ptr_msg_data = static_cast<u8*>(edata.allocate<void>(msg->size(), sce_mi->msg));
-			for (u32 i = 0; i < msg->size(); i++)
-			{
-				ptr_msg_data[i] = msg->Get(i);
-			}
-		}
+		ptr = ptr->next;
 	}
 
-	void MatchingRoomStatus_to_SceNpMatchingRoomStatus(event_data& edata, const MatchingRoomStatus* resp, SceNpMatchingRoomStatus* room_status)
+	ptr = room_info->memberList.members;
+	while (ptr)
 	{
-		const auto* vec_id = resp->id();
-		ensure(vec_id && vec_id->size() == 28, "Invalid room id in MatchingRoomStatus");
-
-		for (flatbuffers::uoffset_t i = 0; i < 28; i++)
+		if (ptr->memberId == resp->ownerId())
 		{
-			room_status->id.opt[i] = vec_id->Get(i);
+			room_info->memberList.owner = ptr;
+			break;
 		}
+		ptr = ptr->next;
+	}
 
-		// In some events the member list can be empty
-		if (const auto* members = resp->members(); members && members->size())
+	room_info->flagAttr = resp->flagAttr();
+
+	if (resp->roomBinAttrInternal() && resp->roomBinAttrInternal()->size() != 0)
+	{
+		room_info->roomBinAttrInternalNum = resp->roomBinAttrInternal()->size();
+		vm::ptr<SceNpMatching2RoomBinAttrInternal> binattrint_info(allocate(sizeof(SceNpMatching2RoomBinAttrInternal) * room_info->roomBinAttrInternalNum));
+
+		for (u32 b_index = 0; b_index < room_info->roomBinAttrInternalNum; b_index++)
 		{
-			room_status->num = members->size();
-			SceNpMatchingRoomMember* prev_member{};
+			auto battr                               = resp->roomBinAttrInternal()->Get(b_index);
+			binattrint_info[b_index].updateDate.tick = battr->updateDate();
+			binattrint_info[b_index].updateMemberId  = battr->updateMemberId();
 
-			for (flatbuffers::uoffset_t i = 0; i < members->size(); i++)
+			binattrint_info[b_index].data.id   = battr->data()->id();
+			binattrint_info[b_index].data.size = battr->data()->data()->size();
+			binattrint_info[b_index].data.ptr  = allocate(binattrint_info[b_index].data.size);
+			for (flatbuffers::uoffset_t tmp_index = 0; tmp_index < binattrint_info[b_index].data.size; tmp_index++)
 			{
-				auto* cur_member = edata.allocate<SceNpMatchingRoomMember>(sizeof(SceNpMatchingRoomMember), (i > 0) ? prev_member->next : room_status->members);
-				const auto* member = members->Get(i);
-				ensure(member && member->info(), "Invalid member in MatchingRoomStatus list");
-
-				cur_member->owner = member->owner() ? 1 : 0;
-				UserInfo_to_SceNpUserInfo(member->info(), &cur_member->user_info);
-
-				prev_member = cur_member;
+				binattrint_info[b_index].data.ptr[tmp_index] = battr->data()->data()->Get(tmp_index);
 			}
 		}
 
-		if (const auto* kick_npid = resp->kick_actor(); kick_npid)
-		{
-			auto* npid = edata.allocate<SceNpId>(sizeof(SceNpId), room_status->kick_actor);
-			std::memcpy(npid->handle.data, kick_npid->c_str(), std::min<usz>(16, kick_npid->size()));
-		}
+		room_info->roomBinAttrInternal = binattrint_info;
+	}
 
-		if (const auto* opt = resp->opt(); opt && opt->size())
-		{
-			room_status->opt_len = opt->size();
-			u8* opt_data = static_cast<u8*>(edata.allocate<void>(opt->size(), room_status->opt));
+	return member_id;
+}
 
-			for (flatbuffers::uoffset_t i = 0; i < opt->size(); i++)
-			{
-				opt_data[i] = opt->Get(i);
-			}
+void np_handler::RoomMemberUpdateInfo_to_SceNpMatching2RoomMemberUpdateInfo(const RoomMemberUpdateInfo* update_info, SceNpMatching2RoomMemberUpdateInfo* sce_update_info)
+{
+	sce_update_info->eventCause = 0;
+	if (update_info->optData())
+	{
+		sce_update_info->optData.length = update_info->optData()->data()->size();
+		for (usz i = 0; i < 16; i++)
+		{
+			sce_update_info->optData.data[i] = update_info->optData()->data()->Get(i);
 		}
 	}
 
-	void MatchingRoomStatus_to_SceNpMatchingJoinedRoomInfo(event_data& edata, const MatchingRoomStatus* resp, SceNpMatchingJoinedRoomInfo* room_info)
+	if (update_info->roomMemberDataInternal())
 	{
-		// The use of SceNpLobbyId is unclear as it is never specified by the client except in further operations, so we always set it to a series of 0 and a 1
-		room_info->lobbyid.opt[27] = 1;
-		MatchingRoomStatus_to_SceNpMatchingRoomStatus(edata, resp, &room_info->room_status);
-	}
+		auto member = update_info->roomMemberDataInternal();
+		vm::ptr<SceNpMatching2RoomMemberDataInternal> member_info(allocate(sizeof(SceNpMatching2RoomMemberDataInternal)));
+		sce_update_info->roomMemberDataInternal = member_info;
 
-	void MatchingAttr_to_SceNpMatchingAttr(event_data& edata, const flatbuffers::Vector<flatbuffers::Offset<MatchingAttr>>* attr_list, vm::bptr<SceNpMatchingAttr>& first_attr)
-	{
-		if (attr_list)
+		UserInfo2_to_SceNpUserInfo2(member->userInfo(), &member_info->userInfo);
+		member_info->joinDate.tick = member->joinDate();
+		member_info->memberId      = member->memberId();
+		member_info->teamId        = member->teamId();
+
+		// Look for id
+		// TODO
+
+		member_info->natType  = member->natType();
+		member_info->flagAttr = member->flagAttr();
+
+		if (member->roomMemberBinAttrInternal() && member->roomMemberBinAttrInternal()->size() != 0)
 		{
-			SceNpMatchingAttr* cur_attr = nullptr;
-
-			for (flatbuffers::uoffset_t i_attr = 0; i_attr < attr_list->size(); i_attr++)
+			member_info->roomMemberBinAttrInternalNum = member->roomMemberBinAttrInternal()->size();
+			vm::ptr<SceNpMatching2RoomMemberBinAttrInternal> binattr_info(allocate(sizeof(SceNpMatching2RoomMemberBinAttrInternal) * member_info->roomMemberBinAttrInternalNum));
+			for (u32 b_index = 0; b_index < member_info->roomMemberBinAttrInternalNum; b_index++)
 			{
-				const auto* attr = attr_list->Get(i_attr);
-				cur_attr = edata.allocate<SceNpMatchingAttr>(sizeof(SceNpMatchingAttr), cur_attr ? cur_attr->next : first_attr);
+				const auto battr                      = member->roomMemberBinAttrInternal()->Get(b_index);
+				binattr_info[b_index].updateDate.tick = battr->updateDate();
 
-				ensure(attr);
-				cur_attr->type = attr->attr_type();
-				cur_attr->id = attr->attr_id();
-				if (attr->data())
+				binattr_info[b_index].data.id   = battr->data()->id();
+				binattr_info[b_index].data.size = battr->data()->data()->size();
+				binattr_info[b_index].data.ptr  = allocate(binattr_info[b_index].data.size);
+				for (flatbuffers::uoffset_t tmp_index = 0; tmp_index < binattr_info[b_index].data.size; tmp_index++)
 				{
-					if (attr->data()->size())
-					{
-						cur_attr->value.data.size = attr->data()->size();
-						u8* data_ptr = static_cast<u8*>(edata.allocate<void>(attr->data()->size(), cur_attr->value.data.ptr));
-						memcpy(data_ptr, attr->data()->data(), attr->data()->size());
-					}
-				}
-				else
-				{
-					cur_attr->value.num = attr->num();
+					binattr_info[b_index].data.ptr[tmp_index] = battr->data()->data()->Get(tmp_index);
 				}
 			}
+			member_info->roomMemberBinAttrInternal = binattr_info;
 		}
 	}
+}
 
-	void MatchingRoom_to_SceNpMatchingRoom(event_data& edata, const MatchingRoom* resp, SceNpMatchingRoom* room)
+void np_handler::RoomUpdateInfo_to_SceNpMatching2RoomUpdateInfo(const RoomUpdateInfo* update_info, SceNpMatching2RoomUpdateInfo* sce_update_info)
+{
+	sce_update_info->errorCode  = 0;
+	sce_update_info->eventCause = 0;
+	if (update_info->optData())
 	{
-		ensure(room && resp->id() && resp->id()->size() == sizeof(SceNpRoomId::opt));
-		memcpy(room->id.opt, resp->id()->data(), sizeof(SceNpRoomId::opt));
-		MatchingAttr_to_SceNpMatchingAttr(edata, resp->attr(), room->attr);
-	}
-
-	void MatchingRoomList_to_SceNpMatchingRoomList(event_data& edata, const MatchingRoomList* resp, SceNpMatchingRoomList* room_list)
-	{
-		// The use of SceNpLobbyId is unclear as it is never specified by the client except in further operations, so we always set it to a series of 0 and a 1
-		room_list->lobbyid.opt[27] = 1;
-		room_list->range.start = resp->start();
-		room_list->range.total = resp->total();
-
-		if (auto rooms = resp->rooms(); rooms)
+		sce_update_info->optData.length = update_info->optData()->data()->size();
+		for (usz i = 0; i < 16; i++)
 		{
-			room_list->range.results = rooms->size();
-
-			SceNpMatchingRoom* cur_room = nullptr;
-
-			for (flatbuffers::uoffset_t i = 0; i < rooms->size(); i++)
-			{
-				const auto* room = rooms->Get(i);
-				cur_room = edata.allocate<SceNpMatchingRoom>(sizeof(SceNpMatchingRoom), cur_room ? cur_room->next : room_list->head);
-				MatchingRoom_to_SceNpMatchingRoom(edata, room, cur_room);
-			}
+			sce_update_info->optData.data[i] = update_info->optData()->data()->Get(i);
 		}
 	}
+}
 
-	void MatchingSearchJoinRoomInfo_to_SceNpMatchingSearchJoinRoomInfo(event_data& edata, const MatchingSearchJoinRoomInfo* resp, SceNpMatchingSearchJoinRoomInfo* room_info)
+void np_handler::GetPingInfoResponse_to_SceNpMatching2SignalingGetPingInfoResponse(const GetPingInfoResponse* resp, SceNpMatching2SignalingGetPingInfoResponse* sce_resp)
+{
+	sce_resp->serverId = resp->serverId();
+	sce_resp->worldId  = resp->worldId();
+	sce_resp->roomId   = resp->roomId();
+	sce_resp->rtt      = resp->rtt();
+}
+
+void np_handler::RoomMessageInfo_to_SceNpMatching2RoomMessageInfo(const RoomMessageInfo* mi, SceNpMatching2RoomMessageInfo* sce_mi)
+{
+	sce_mi->filtered = mi->filtered();
+	sce_mi->castType = mi->castType();
+
+	if (sce_mi->castType != SCE_NP_MATCHING2_CASTTYPE_BROADCAST)
 	{
-		ensure(resp->room());
-		room_info->lobbyid.opt[27] = 1;
-		MatchingRoomStatus_to_SceNpMatchingRoomStatus(edata, resp->room(), &room_info->room_status);
-		MatchingAttr_to_SceNpMatchingAttr(edata, resp->attr(), room_info->attr);
+		vm::ptr<SceNpMatching2RoomMessageDestination> dst_info(allocate(sizeof(SceNpMatching2RoomMessageDestination)));
+		sce_mi->dst = dst_info;
 	}
 
-} // namespace np
+	switch (sce_mi->castType)
+	{
+	case SCE_NP_MATCHING2_CASTTYPE_BROADCAST: break;
+	case SCE_NP_MATCHING2_CASTTYPE_UNICAST: sce_mi->dst->unicastTarget = mi->dst()->Get(0); break;
+	case SCE_NP_MATCHING2_CASTTYPE_MULTICAST:
+	{
+		sce_mi->dst->multicastTarget.memberIdNum = mi->dst()->size();
+		vm::ptr<be_t<u16>> member_list(allocate(sizeof(u16) * mi->dst()->size()));
+		sce_mi->dst->multicastTarget.memberId = member_list;
+		for (u32 i = 0; i < mi->dst()->size(); i++)
+		{
+			sce_mi->dst->multicastTarget.memberId[i] = mi->dst()->Get(i);
+		}
+		break;
+	}
+	case SCE_NP_MATCHING2_CASTTYPE_MULTICAST_TEAM: sce_mi->dst->multicastTargetTeamId = mi->dst()->Get(0); break;
+	default: ensure(false);
+	}
+
+	if (auto src_member = mi->srcMember())
+	{
+		vm::ptr<SceNpUserInfo2> src_info(allocate(sizeof(SceNpUserInfo2)));
+		UserInfo2_to_SceNpUserInfo2(src_member, src_info.get_ptr());
+		sce_mi->srcMember = src_info;
+	}
+
+	if (auto msg = mi->msg())
+	{
+		sce_mi->msgLen = msg->size();
+		vm::ptr<u8> msg_data(allocate(msg->size()));
+		for (u32 i = 0; i < msg->size(); i++)
+		{
+			msg_data[i] = msg->Get(i);
+		}
+		sce_mi->msg = msg_data;
+	}
+}
diff --git a/rpcs3/Emu/NP/fb_helpers.h b/rpcs3/Emu/NP/fb_helpers.h
deleted file mode 100644
index 6b92cfba37..0000000000
--- a/rpcs3/Emu/NP/fb_helpers.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include "Emu/Cell/Modules/sceNp.h"
-#include "Emu/Cell/Modules/sceNp2.h"
-#include "np_event_data.h"
-#include "generated/np2_structs_generated.h"
-
-namespace np
-{
-	void BinAttr_to_SceNpMatching2BinAttr(event_data& edata, const BinAttr* bin_attr, SceNpMatching2BinAttr* binattr_info);
-	void BinAttrs_to_SceNpMatching2BinAttrs(event_data& edata, const flatbuffers::Vector<flatbuffers::Offset<BinAttr>>* fb_attr, SceNpMatching2BinAttr* binattr_info);
-	void RoomMemberBinAttrInternal_to_SceNpMatching2RoomMemberBinAttrInternal(event_data& edata, const RoomMemberBinAttrInternal* fb_attr, SceNpMatching2RoomMemberBinAttrInternal* binattr_info);
-	void RoomBinAttrInternal_to_SceNpMatching2RoomBinAttrInternal(event_data& edata, const BinAttrInternal* fb_attr, SceNpMatching2RoomBinAttrInternal* binattr_info);
-	void RoomGroup_to_SceNpMatching2RoomGroup(const RoomGroup* fb_group, SceNpMatching2RoomGroup* sce_group);
-	void RoomGroups_to_SceNpMatching2RoomGroups(const flatbuffers::Vector<flatbuffers::Offset<RoomGroup>>* fb_groups, SceNpMatching2RoomGroup* sce_groups);
-	void UserInfo_to_SceNpUserInfo(const UserInfo* user, SceNpUserInfo* user_info);
-	void UserInfo_to_SceNpUserInfo2(event_data& edata, const UserInfo* user, SceNpUserInfo2* user_info, bool include_onlinename, bool include_avatarurl);
-	void RoomDataExternal_to_SceNpMatching2RoomDataExternal(event_data& edata, const RoomDataExternal* room, SceNpMatching2RoomDataExternal* room_info, bool include_onlinename, bool include_avatarurl);
-	void SearchRoomResponse_to_SceNpMatching2SearchRoomResponse(event_data& edata, const SearchRoomResponse* resp, SceNpMatching2SearchRoomResponse* search_resp);
-	void GetRoomDataExternalListResponse_to_SceNpMatching2GetRoomDataExternalListResponse(event_data& edata, const GetRoomDataExternalListResponse* resp, SceNpMatching2GetRoomDataExternalListResponse* get_resp, bool include_onlinename, bool include_avatarurl);
-	u16 RoomDataInternal_to_SceNpMatching2RoomDataInternal(event_data& edata, const RoomDataInternal* resp, SceNpMatching2RoomDataInternal* room_resp, const SceNpId& npid, bool include_onlinename, bool include_avatarurl);
-	void RoomMemberDataInternal_to_SceNpMatching2RoomMemberDataInternal(event_data& edata, const RoomMemberDataInternal* member_data, const SceNpMatching2RoomDataInternal* room_info, SceNpMatching2RoomMemberDataInternal* sce_member_data, bool include_onlinename, bool include_avatarurl);
-	void RoomMemberUpdateInfo_to_SceNpMatching2RoomMemberUpdateInfo(event_data& edata, const RoomMemberUpdateInfo* resp, SceNpMatching2RoomMemberUpdateInfo* room_info, bool include_onlinename, bool include_avatarurl);
-	void RoomUpdateInfo_to_SceNpMatching2RoomUpdateInfo(const RoomUpdateInfo* update_info, SceNpMatching2RoomUpdateInfo* sce_update_info);
-	void GetPingInfoResponse_to_SceNpMatching2SignalingGetPingInfoResponse(const GetPingInfoResponse* resp, SceNpMatching2SignalingGetPingInfoResponse* sce_resp);
-	void RoomMessageInfo_to_SceNpMatching2RoomMessageInfo(event_data& edata, const RoomMessageInfo* mi, SceNpMatching2RoomMessageInfo* sce_mi, bool include_onlinename, bool include_avatarurl);
-	void RoomDataInternalUpdateInfo_to_SceNpMatching2RoomDataInternalUpdateInfo(event_data& edata, const RoomDataInternalUpdateInfo* update_info, SceNpMatching2RoomDataInternalUpdateInfo* sce_update_info, const SceNpId& npid, bool include_onlinename, bool include_avatarurl);
-	void RoomMemberDataInternalUpdateInfo_to_SceNpMatching2RoomMemberDataInternalUpdateInfo(event_data& edata, const RoomMemberDataInternalUpdateInfo* update_info, SceNpMatching2RoomMemberDataInternalUpdateInfo* sce_update_info, bool include_onlinename, bool include_avatarurl);
-	void MatchingRoomStatus_to_SceNpMatchingRoomStatus(event_data& edata, const MatchingRoomStatus* resp, SceNpMatchingRoomStatus* room_status);
-	void MatchingRoomStatus_to_SceNpMatchingJoinedRoomInfo(event_data& edata, const MatchingRoomStatus* resp, SceNpMatchingJoinedRoomInfo* room_info);
-	void MatchingRoom_to_SceNpMatchingRoom(event_data& edata, const MatchingRoom* resp, SceNpMatchingRoom* room);
-	void MatchingRoomList_to_SceNpMatchingRoomList(event_data& edata, const MatchingRoomList* resp, SceNpMatchingRoomList* room_list);
-	void MatchingSearchJoinRoomInfo_to_SceNpMatchingSearchJoinRoomInfo(event_data& edata, const MatchingSearchJoinRoomInfo* resp, SceNpMatchingSearchJoinRoomInfo* room_info);
-} // namespace np
diff --git a/rpcs3/Emu/NP/generated/np2_structs.fbs b/rpcs3/Emu/NP/generated/np2_structs.fbs
index bf360bdb86..c1e016234e 100644
--- a/rpcs3/Emu/NP/generated/np2_structs.fbs
+++ b/rpcs3/Emu/NP/generated/np2_structs.fbs
@@ -1,584 +1,225 @@
-table SignalingAddr {
-	ip:[uint8];
-	port:uint16;
-}
-
-table MatchingSignalingInfo {
-	npid:string;
-	addr:SignalingAddr;
-}
-
-table Matching2SignalingInfo {
-	member_id:uint16;
-	addr:SignalingAddr;
-}
-
 table BinAttr {
-	id:uint16;
-	data:[uint8];
+    id:uint16;
+    data:[uint8];
 }
 
 table IntAttr {
-	id:uint16;
-	num:uint32;
+    id:uint16;
+    num:uint32;
 }
 
-table RoomMemberBinAttrInternal {
-	updateDate:uint64;
-	data:BinAttr;
+table MemberBinAttrInternal {
+    updateDate:uint64;
+    data:BinAttr;
 }
 
 table BinAttrInternal {
-	updateDate:uint64;
-	updateMemberId:uint16;
-	data:BinAttr;
+    updateDate:uint64;
+    updateMemberId:uint16;
+    data:BinAttr;
 }
 
 table OptParam {
-	type:uint8;
-	flag:uint8;
-	hubMemberId:uint16 ;
+    type:uint8;
+    flag:uint8;
+    hubMemberId:uint16 ;
 }
 
 table GroupConfig {
-	slotNum:uint32;
-	label:[uint8];
-	withPassword:bool;
+    slotNum:uint32;
+    withLabel:bool;
+    label:[uint8];
+    withPassword:bool;
 }
 
-table UserInfo {
-	npId:string;
-	onlineName:string;
-	avatarUrl:string;
+table UserInfo2 {
+    npId:string;
+    onlineName:string;
+    avatarUrl:string;
 }
 
 table RoomMemberDataInternal {
-	userInfo:UserInfo;
-	joinDate:uint64;
-	memberId:uint16;
-	teamId:uint8;
-	roomGroup:RoomGroup;
-	natType:uint8;
-	flagAttr:uint32;
-	roomMemberBinAttrInternal:[RoomMemberBinAttrInternal];
+    userInfo:UserInfo2;
+    joinDate:uint64;
+    memberId:uint16;
+    teamId:uint8;
+    roomGroup:uint8;
+    natType:uint8;
+    flagAttr:uint32;
+    roomMemberBinAttrInternal:[MemberBinAttrInternal];
 }
 
 table RoomGroup {
-	groupId:uint8;
-	withPassword:bool;
-	label:[uint8];
-	slotNum:uint32;
-	curGroupMemberNum:uint32;
+    groupId:uint8;
+    withPassword:bool;
+    withLabel:bool;
+    label:[uint8];
+    slotNum:uint32;
+    curGroupMemberNum:uint32;
 }
 
 table RoomDataInternal {
-	serverId:uint16;
-	worldId:uint32;
-	lobbyId:uint64;
-	roomId:uint64;
-	passwordSlotMask:uint64;
-	maxSlot:uint32;
-	memberList:[RoomMemberDataInternal];
-	ownerId:uint16;
-	roomGroup:[RoomGroup];
-	flagAttr:uint32;
-	roomBinAttrInternal:[BinAttrInternal];
+    serverId:uint16;
+    worldId:uint32;
+    lobbyId:uint64;
+    roomId:uint64;
+    passwordSlotMask:uint64;
+    maxSlot:uint32;
+    memberList:[RoomMemberDataInternal];
+    ownerId:uint16;
+    roomGroup:[RoomGroup];
+    flagAttr:uint32;
+    roomBinAttrInternal:[BinAttrInternal];
 }
 
 table RoomDataExternal {
-	serverId:uint16;
-	worldId:uint32;
-	publicSlotNum:uint16;
-	privateSlotNum:uint16;
-	lobbyId:uint64;
-	roomId:uint64;
-	openPublicSlotNum:uint16;
-	maxSlot:uint16;
-	openPrivateSlotNum:uint16;
-	curMemberNum:uint16;
-	passwordSlotMask:uint64;
-	owner:UserInfo;
-	roomGroup:[RoomGroup];
-	flagAttr:uint32;
-	roomSearchableIntAttrExternal:[IntAttr];
-	roomSearchableBinAttrExternal:[BinAttr];
-	roomBinAttrExternal:[BinAttr];
+    serverId:uint16;
+    worldId:uint32;
+    publicSlotNum:uint16;
+    privateSlotNum:uint16;
+    lobbyId:uint64;
+    roomId:uint64;
+    openPublicSlotNum:uint16;
+    maxSlot:uint16;
+    openPrivateSlotNum:uint16;
+    curMemberNum:uint16;
+    passwordSlotMask:uint64;
+    owner:UserInfo2;
+    roomGroup:[RoomGroup];
+    flagAttr:uint32;
+    roomSearchableIntAttrExternal:[IntAttr];
+    roomSearchableBinAttrExternal:[BinAttr];
+    roomBinAttrExternal:[BinAttr];
 }
 
 table IntSearchFilter {
-	searchOperator:uint8;
-	attr:IntAttr;
+    searchOperator:uint8;
+    attr:IntAttr;
 }
 
 table BinSearchFilter {
-	searchOperator:uint8;
-	attr:BinAttr;
+    searchOperator:uint8;
+    attr:BinAttr;
 }
 
 table PresenceOptionData {
-	data:[uint8];
-	len:uint32;
+    data:[uint8];
+    len:uint32;
 }
 
 table RoomGroupPasswordConfig {
-	groupId:uint8;
-	withPassword:bool;
+    groupId:[uint8];
+    withPassword:bool;
 }
 
 table SearchRoomRequest {
-	option:int32;
-	worldId:uint32;
-	lobbyId:uint64;
-	rangeFilter_startIndex:uint32;
-	rangeFilter_max:uint32;
-	flagFilter:uint32;
-	flagAttr:uint32;
-	intFilter:[IntSearchFilter];
-	binFilter:[BinSearchFilter];
-	attrId:[uint16];
+    option:int32;
+    worldId:uint32;
+    lobbyId:uint64;
+    rangeFilter_startIndex:uint32;
+    rangeFilter_max:uint32;
+    flagFilter:uint32;
+    flagAttr:uint32;
+    intFilter:[IntSearchFilter];
+    binFilter:[BinSearchFilter];
+    attrId:[uint16];
 }
 
 table SearchRoomResponse {
-	startIndex:uint32;
-	total:uint32;
-	rooms:[RoomDataExternal];
+    startIndex:uint32;
+    total:uint32;
+    size:uint32;
+    rooms:[RoomDataExternal];
 }
 
 table CreateJoinRoomRequest {
-	worldId:uint32;
-	lobbyId:uint64;
-	maxSlot:uint32;
-	flagAttr:uint32;
-	roomBinAttrInternal:[BinAttr];
-	roomSearchableIntAttrExternal:[IntAttr];
-	roomSearchableBinAttrExternal:[BinAttr];
-	roomBinAttrExternal:[BinAttr];
-	roomPassword:[uint8];
-	groupConfig:[GroupConfig];
-	passwordSlotMask:uint64;
-	allowedUser:[string];
-	blockedUser:[string];
+    worldId:uint32;
+    lobbyId:uint64;
+    maxSlot:uint32;
+    flagAttr:uint32;
+    roomBinAttrInternal:[BinAttr];
+    roomSearchableIntAttrExternal:[IntAttr];
+    roomSearchableBinAttrExternal:[BinAttr];
+    roomBinAttrExternal:[BinAttr];
+    roomPassword:[uint8];
+    groupConfig:[GroupConfig];
+    passwordSlotMask:uint64;
+    allowedUser:[string];
+    blockedUser:[string];
 
-	joinRoomGroupLabel:[uint8];
-	roomMemberBinAttrInternal:[BinAttr];
-	teamId:uint8;
-	sigOptParam:OptParam;
+    joinRoomGroupLabel:[uint8];
+    roomMemberBinAttrInternal:[BinAttr];
+    teamId:uint8;
+    sigOptParam:OptParam;
 }
 
 table JoinRoomRequest {
-	roomId:uint64;
-	roomPassword:[uint8];
-	joinRoomGroupLabel:[uint8];
-	roomMemberBinAttrInternal:[BinAttr];
-	optData:PresenceOptionData;
-	teamId:uint8;
-}
-
-table JoinRoomResponse {
-	room_data: RoomDataInternal;
-	signaling_data: [Matching2SignalingInfo];
+    roomId:uint64;
+    roomPassword:[uint8];
+    joinRoomGroupLabel:[uint8];
+    roomMemberBinAttrInternal:[BinAttr];
+    optData:PresenceOptionData;
+    teamId:uint8;
 }
 
 table LeaveRoomRequest {
-	roomId:uint64;
-	optData:PresenceOptionData;
-}
-
-table GetRoomDataExternalListRequest {
-	roomIds:[uint64];
-	attrIds:[uint16];
-}
-
-table GetRoomDataExternalListResponse {
-	rooms:[RoomDataExternal];
+    roomId:uint64;
+    optData:PresenceOptionData;
 }
 
 table SetRoomDataExternalRequest {
-	roomId:uint64;
-	roomSearchableIntAttrExternal:[IntAttr];
-	roomSearchableBinAttrExternal:[BinAttr];
-	roomBinAttrExternal:[BinAttr];
+    roomId:uint64;
+    roomSearchableIntAttrExternal:[IntAttr];
+    roomSearchableBinAttrExternal:[BinAttr];
+    roomBinAttrExternal:[BinAttr];
 }
 
 table SetRoomDataInternalRequest {
-	roomId:uint64;
-	flagFilter:uint32;
-	flagAttr:uint32;
-	roomBinAttrInternal:[BinAttr];
-	passwordConfig:[RoomGroupPasswordConfig];
-	passwordSlotMask:uint64;
-	ownerPrivilegeRank:[uint16];
-}
-
-table GetRoomMemberDataInternalRequest {
-	roomId:uint64;
-	memberId:uint16;
-	attrId:[uint16];
-}
-
-table SetRoomMemberDataInternalRequest {
-	roomId:uint64;
-	memberId:uint16;
-	teamId:uint8;
-	roomMemberBinAttrInternal:[BinAttr];
-}
-
-table SetUserInfo {
-	serverId:uint16;
-	userBinAttr:[BinAttr];
+    roomId:uint64;
+    flagFilter:uint32;
+    flagAttr:uint32;
+    roomBinAttrInternal:[BinAttr];
+    passwordConfig:[RoomGroupPasswordConfig];
+    passwordSlotMask:uint64;
+    ownerPrivilegeRank:[uint16];
 }
 
 table GetRoomDataInternalRequest {
-	roomId:uint64;
-	attrId:[uint16];
+    roomId:uint64;
+    attrId:[uint16];
 }
 
 table RoomMemberUpdateInfo {
-	roomMemberDataInternal:RoomMemberDataInternal;
-	eventCause:uint8;
-	optData:PresenceOptionData;
-}
-
-table NotificationUserJoinedRoom {
-	room_id:uint64;
-	update_info:RoomMemberUpdateInfo;
-	signaling:SignalingAddr;
+    roomMemberDataInternal:RoomMemberDataInternal;
+    eventCause:uint8;
+    optData:PresenceOptionData;
 }
 
 table RoomUpdateInfo {
-	eventCause:uint8;
-	errorCode:int32;
-	optData:PresenceOptionData;
-}
-
-table RoomDataInternalUpdateInfo {
-	newRoomDataInternal:RoomDataInternal;
-	prevFlagAttr:uint32;
-	prevRoomPasswordSlotMask:uint64;
-	newRoomGroup:[uint8];
-	newRoomBinAttrInternal:[uint16];
-}
-
-table RoomMemberDataInternalUpdateInfo {
-	newRoomMemberDataInternal:RoomMemberDataInternal;
-	prevFlagAttr:uint32;
-	prevTeamId:uint8;
-	newRoomMemberBinAttrInternal:[uint16];
+    eventCause:uint8;
+    errorCode:int32;
+    optData:PresenceOptionData;
 }
 
 table GetPingInfoResponse {
-	serverId:uint16;
-	worldId:uint32;
-	roomId:uint64;
-	rtt:uint32;
+    serverId:uint16;
+    worldId:uint32;
+    roomId:uint64;
+    rtt:uint32;
 }
 
 table SendRoomMessageRequest {
-	roomId:uint64;
-	castType:uint8;
-	dst:[uint16];
-	msg:[uint8];
-	option:uint8;
+    roomId:uint64;
+    castType:uint8;
+    dst:[uint16];
+    msg:[uint8];
+    option:uint8;
 }
 
 table RoomMessageInfo {
-	filtered:bool;
-	castType:uint8;
-	dst:[uint16];
-	srcMember:UserInfo;
-	msg:[uint8];
-}
-
-table MessageDetails {
-	communicationId:string;
-	msgId:uint64;
-	mainType:uint16;
-	subType:uint16;
-	msgFeatures:uint32;
-	subject:string;
-	body:string;
-	data:[uint8];
-}
-
-table SendMessageRequest {
-	message:[uint8] (nested_flatbuffer: "MessageDetails");
-	npids:[string];
-}
-
-table BoardInfo {
-	rankLimit:uint32;
-	updateMode:uint32;
-	sortMode:uint32;
-	uploadNumLimit:uint32;
-	uploadSizeLimit:uint32;
-}
-
-table RecordScoreRequest {
-	boardId:uint32;
-	pcId:int32;
-	score:int64;
-	comment:string;
-	data:[uint8];
-}
-
-table GetScoreRangeRequest {
-	boardId:uint32;
-	startRank:uint32;
-	numRanks:uint32;
-	withComment:bool;
-	withGameInfo:bool;
-}
-
-table ScoreNpIdPcId {
-	npid:string;
-	pcId:int32;
-}
-
-table GetScoreNpIdRequest {
-	boardId:uint32;
-	npids:[ScoreNpIdPcId];
-	withComment:bool;
-	withGameInfo:bool;
-}
-
-table GetScoreFriendsRequest {
-	boardId:uint32;
-	include_self:bool;
-	max:uint32;
-	withComment:bool;
-	withGameInfo:bool;
-}
-
-table ScoreRankData {
-	npId:string;
-	onlineName:string;
-	pcId:int32;
-	rank:uint32;
-	score:int64;
-	hasGameData:bool;
-	recordDate:uint64;
-}
-
-table ScoreInfo {
-	data:[uint8];
-}
-
-table GetScoreResponse {
-	rankArray:[ScoreRankData];
-	commentArray:[string];
-	infoArray:[ScoreInfo];
-	lastSortDate:uint64;
-	totalRecord:uint32;
-}
-
-table RecordScoreGameDataRequest {
-	boardId:uint32;
-	pcId:int32;
-	score:int64;
-}
-
-table GetScoreGameDataRequest {
-	boardId:uint32;
-	npId:string;
-	pcId:int32;
-}
-
-table TusUser {
-	vuser:bool;
-	npid:string;
-}
-
-table TusVariable {
-	ownerId:string;
-	hasData:bool;
-	lastChangedDate:uint64;
-	lastChangedAuthorId:string;
-	variable:int64;
-	oldVariable:int64;
-}
-
-table TusVarResponse {
-	vars:[TusVariable];
-}
-
-table TusSetMultiSlotVariableRequest {
-	user:TusUser;
-	slotIdArray:[int32];
-	variableArray:[int64];
-}
-
-table TusGetMultiSlotVariableRequest {
-	user:TusUser;
-	slotIdArray:[int32];
-}
-
-table TusGetMultiUserVariableRequest {
-	users:[TusUser];
-	slotId:int32;
-}
-
-table TusGetFriendsVariableRequest {
-	slotId:int32;
-	includeSelf:bool;
-	sortType:int32;
-	arrayNum:uint32;
-}
-
-table TusAddAndGetVariableRequest {
-	user:TusUser;
-	slotId:int32;
-	inVariable:int64;
-	isLastChangedDate:[uint64];
-	isLastChangedAuthorId:string;
-}
-
-table TusTryAndSetVariableRequest {
-	user:TusUser;
-	slotId:int32;
-	opeType:int32;
-	variable:int64;
-	isLastChangedDate:[uint64];
-	isLastChangedAuthorId:string;
-	compareValue:[int64];
-}
-
-table TusDeleteMultiSlotVariableRequest {
-	user:TusUser;
-	slotIdArray:[int32];
-}
-
-table TusSetDataRequest {
-	user:TusUser;
-	slotId:int32;
-	data:[uint8];
-	info:[uint8];
-	isLastChangedDate:[uint64];
-	isLastChangedAuthorId:string;
-}
-
-table TusDataStatus {
-	ownerId:string;
-	hasData:bool;
-	lastChangedDate:uint64;
-	lastChangedAuthorId:string;
-	info:[uint8];
-}
-
-table TusData {
-	status: TusDataStatus;
-	data:[uint8];
-}
-
-table TusDataStatusResponse {
-	status: [TusDataStatus];
-}
-
-table TusGetDataRequest {
-	user:TusUser;
-	slotId:int32;
-}
-
-table TusGetMultiSlotDataStatusRequest {
-	user:TusUser;
-	slotIdArray:[int32];
-}
-
-table TusGetMultiUserDataStatusRequest {
-	users:[TusUser];
-	slotId:int32;
-}
-
-table TusGetFriendsDataStatusRequest {
-	slotId:int32;
-	includeSelf:bool;
-	sortType:int32;
-	arrayNum:uint32;	
-}
-
-table TusDeleteMultiSlotDataRequest {
-	user:TusUser;
-	slotIdArray:[int32];
-}
-
-table SetPresenceRequest {
-	title:string;
-	status:string;
-	comment:string;
-	data:[uint8];
-}
-
-table MatchingSearchCondition {
-	attr_type:uint32;
-	attr_id:uint32;
-	comp_op:uint32;
-	comp_value:uint32;
-}
-
-table MatchingAttr {
-	attr_type:uint32;
-	attr_id:uint32;
-	num:uint32;
-	data:[uint8];
-}
-
-table CreateRoomGUIRequest {
-	total_slots:uint32;
-	private_slots:uint32;
-	privilege_grant:bool;
-	stealth:bool;
-	game_attrs:[MatchingAttr];
-}
-
-table GUIUserInfo {
-	info:UserInfo;
-	owner:bool;
-}
-
-table MatchingRoomStatus {
-	id:[uint8];
-	members:[GUIUserInfo];
-	kick_actor:string;
-	opt:[uint8];
-}
-
-table GetRoomListGUIRequest {
-	range_start:uint32;
-	range_max:uint32;
-	conds:[MatchingSearchCondition];
-	attrs:[MatchingAttr];
-}
-
-table MatchingRoom {
-	id:[uint8];
-	attr:[MatchingAttr];
-}
-
-table MatchingRoomList {
-	start:uint32;
-	total:uint32;
-	rooms:[MatchingRoom];
-}
-
-table MatchingGuiRoomId {
-	id:[uint8];
-}
-
-table SetRoomSearchFlagGUI {
-	roomid:[uint8];
-	stealth:bool;
-}
-
-table QuickMatchGUIRequest {
-	conds:[MatchingSearchCondition];
-	available_num:uint32;
-}
-
-table SearchJoinRoomGUIRequest {
-	conds:[MatchingSearchCondition];
-	attrs:[MatchingAttr];
-}
-
-table MatchingSearchJoinRoomInfo {
-	room:MatchingRoomStatus;
-	attr:[MatchingAttr];
+    filtered:bool;
+    castType:uint8;
+    dst:[uint16];
+    srcMember:UserInfo2;
+    msg:[uint8];
 }
diff --git a/rpcs3/Emu/NP/generated/np2_structs_generated.h b/rpcs3/Emu/NP/generated/np2_structs_generated.h
index f1d24ae568..826be310be 100644
--- a/rpcs3/Emu/NP/generated/np2_structs_generated.h
+++ b/rpcs3/Emu/NP/generated/np2_structs_generated.h
@@ -6,465 +6,76 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-// Ensure the included flatbuffers.h is the same version as when this file was
-// generated, otherwise it may not be compatible.
-static_assert(FLATBUFFERS_VERSION_MAJOR == 24 &&
-              FLATBUFFERS_VERSION_MINOR == 3 &&
-              FLATBUFFERS_VERSION_REVISION == 25,
-             "Non-compatible flatbuffers version included");
-
-struct SignalingAddr;
-struct SignalingAddrBuilder;
-
-struct MatchingSignalingInfo;
-struct MatchingSignalingInfoBuilder;
-
-struct Matching2SignalingInfo;
-struct Matching2SignalingInfoBuilder;
-
 struct BinAttr;
-struct BinAttrBuilder;
 
 struct IntAttr;
-struct IntAttrBuilder;
 
-struct RoomMemberBinAttrInternal;
-struct RoomMemberBinAttrInternalBuilder;
+struct MemberBinAttrInternal;
 
 struct BinAttrInternal;
-struct BinAttrInternalBuilder;
 
 struct OptParam;
-struct OptParamBuilder;
 
 struct GroupConfig;
-struct GroupConfigBuilder;
 
-struct UserInfo;
-struct UserInfoBuilder;
+struct UserInfo2;
 
 struct RoomMemberDataInternal;
-struct RoomMemberDataInternalBuilder;
 
 struct RoomGroup;
-struct RoomGroupBuilder;
 
 struct RoomDataInternal;
-struct RoomDataInternalBuilder;
 
 struct RoomDataExternal;
-struct RoomDataExternalBuilder;
 
 struct IntSearchFilter;
-struct IntSearchFilterBuilder;
 
 struct BinSearchFilter;
-struct BinSearchFilterBuilder;
 
 struct PresenceOptionData;
-struct PresenceOptionDataBuilder;
 
 struct RoomGroupPasswordConfig;
-struct RoomGroupPasswordConfigBuilder;
 
 struct SearchRoomRequest;
-struct SearchRoomRequestBuilder;
 
 struct SearchRoomResponse;
-struct SearchRoomResponseBuilder;
 
 struct CreateJoinRoomRequest;
-struct CreateJoinRoomRequestBuilder;
 
 struct JoinRoomRequest;
-struct JoinRoomRequestBuilder;
-
-struct JoinRoomResponse;
-struct JoinRoomResponseBuilder;
 
 struct LeaveRoomRequest;
-struct LeaveRoomRequestBuilder;
-
-struct GetRoomDataExternalListRequest;
-struct GetRoomDataExternalListRequestBuilder;
-
-struct GetRoomDataExternalListResponse;
-struct GetRoomDataExternalListResponseBuilder;
 
 struct SetRoomDataExternalRequest;
-struct SetRoomDataExternalRequestBuilder;
 
 struct SetRoomDataInternalRequest;
-struct SetRoomDataInternalRequestBuilder;
-
-struct GetRoomMemberDataInternalRequest;
-struct GetRoomMemberDataInternalRequestBuilder;
-
-struct SetRoomMemberDataInternalRequest;
-struct SetRoomMemberDataInternalRequestBuilder;
-
-struct SetUserInfo;
-struct SetUserInfoBuilder;
 
 struct GetRoomDataInternalRequest;
-struct GetRoomDataInternalRequestBuilder;
 
 struct RoomMemberUpdateInfo;
-struct RoomMemberUpdateInfoBuilder;
-
-struct NotificationUserJoinedRoom;
-struct NotificationUserJoinedRoomBuilder;
 
 struct RoomUpdateInfo;
-struct RoomUpdateInfoBuilder;
-
-struct RoomDataInternalUpdateInfo;
-struct RoomDataInternalUpdateInfoBuilder;
-
-struct RoomMemberDataInternalUpdateInfo;
-struct RoomMemberDataInternalUpdateInfoBuilder;
 
 struct GetPingInfoResponse;
-struct GetPingInfoResponseBuilder;
 
 struct SendRoomMessageRequest;
-struct SendRoomMessageRequestBuilder;
 
 struct RoomMessageInfo;
-struct RoomMessageInfoBuilder;
 
-struct MessageDetails;
-struct MessageDetailsBuilder;
-
-struct SendMessageRequest;
-struct SendMessageRequestBuilder;
-
-struct BoardInfo;
-struct BoardInfoBuilder;
-
-struct RecordScoreRequest;
-struct RecordScoreRequestBuilder;
-
-struct GetScoreRangeRequest;
-struct GetScoreRangeRequestBuilder;
-
-struct ScoreNpIdPcId;
-struct ScoreNpIdPcIdBuilder;
-
-struct GetScoreNpIdRequest;
-struct GetScoreNpIdRequestBuilder;
-
-struct GetScoreFriendsRequest;
-struct GetScoreFriendsRequestBuilder;
-
-struct ScoreRankData;
-struct ScoreRankDataBuilder;
-
-struct ScoreInfo;
-struct ScoreInfoBuilder;
-
-struct GetScoreResponse;
-struct GetScoreResponseBuilder;
-
-struct RecordScoreGameDataRequest;
-struct RecordScoreGameDataRequestBuilder;
-
-struct GetScoreGameDataRequest;
-struct GetScoreGameDataRequestBuilder;
-
-struct TusUser;
-struct TusUserBuilder;
-
-struct TusVariable;
-struct TusVariableBuilder;
-
-struct TusVarResponse;
-struct TusVarResponseBuilder;
-
-struct TusSetMultiSlotVariableRequest;
-struct TusSetMultiSlotVariableRequestBuilder;
-
-struct TusGetMultiSlotVariableRequest;
-struct TusGetMultiSlotVariableRequestBuilder;
-
-struct TusGetMultiUserVariableRequest;
-struct TusGetMultiUserVariableRequestBuilder;
-
-struct TusGetFriendsVariableRequest;
-struct TusGetFriendsVariableRequestBuilder;
-
-struct TusAddAndGetVariableRequest;
-struct TusAddAndGetVariableRequestBuilder;
-
-struct TusTryAndSetVariableRequest;
-struct TusTryAndSetVariableRequestBuilder;
-
-struct TusDeleteMultiSlotVariableRequest;
-struct TusDeleteMultiSlotVariableRequestBuilder;
-
-struct TusSetDataRequest;
-struct TusSetDataRequestBuilder;
-
-struct TusDataStatus;
-struct TusDataStatusBuilder;
-
-struct TusData;
-struct TusDataBuilder;
-
-struct TusDataStatusResponse;
-struct TusDataStatusResponseBuilder;
-
-struct TusGetDataRequest;
-struct TusGetDataRequestBuilder;
-
-struct TusGetMultiSlotDataStatusRequest;
-struct TusGetMultiSlotDataStatusRequestBuilder;
-
-struct TusGetMultiUserDataStatusRequest;
-struct TusGetMultiUserDataStatusRequestBuilder;
-
-struct TusGetFriendsDataStatusRequest;
-struct TusGetFriendsDataStatusRequestBuilder;
-
-struct TusDeleteMultiSlotDataRequest;
-struct TusDeleteMultiSlotDataRequestBuilder;
-
-struct SetPresenceRequest;
-struct SetPresenceRequestBuilder;
-
-struct MatchingSearchCondition;
-struct MatchingSearchConditionBuilder;
-
-struct MatchingAttr;
-struct MatchingAttrBuilder;
-
-struct CreateRoomGUIRequest;
-struct CreateRoomGUIRequestBuilder;
-
-struct GUIUserInfo;
-struct GUIUserInfoBuilder;
-
-struct MatchingRoomStatus;
-struct MatchingRoomStatusBuilder;
-
-struct GetRoomListGUIRequest;
-struct GetRoomListGUIRequestBuilder;
-
-struct MatchingRoom;
-struct MatchingRoomBuilder;
-
-struct MatchingRoomList;
-struct MatchingRoomListBuilder;
-
-struct MatchingGuiRoomId;
-struct MatchingGuiRoomIdBuilder;
-
-struct SetRoomSearchFlagGUI;
-struct SetRoomSearchFlagGUIBuilder;
-
-struct QuickMatchGUIRequest;
-struct QuickMatchGUIRequestBuilder;
-
-struct SearchJoinRoomGUIRequest;
-struct SearchJoinRoomGUIRequestBuilder;
-
-struct MatchingSearchJoinRoomInfo;
-struct MatchingSearchJoinRoomInfoBuilder;
-
-struct SignalingAddr FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SignalingAddrBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_IP = 4,
-    VT_PORT = 6
-  };
-  const ::flatbuffers::Vector<uint8_t> *ip() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_IP);
-  }
-  uint16_t port() const {
-    return GetField<uint16_t>(VT_PORT, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_IP) &&
-           verifier.VerifyVector(ip()) &&
-           VerifyField<uint16_t>(verifier, VT_PORT, 2) &&
-           verifier.EndTable();
-  }
-};
-
-struct SignalingAddrBuilder {
-  typedef SignalingAddr Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_ip(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> ip) {
-    fbb_.AddOffset(SignalingAddr::VT_IP, ip);
-  }
-  void add_port(uint16_t port) {
-    fbb_.AddElement<uint16_t>(SignalingAddr::VT_PORT, port, 0);
-  }
-  explicit SignalingAddrBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<SignalingAddr> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<SignalingAddr>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<SignalingAddr> CreateSignalingAddr(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> ip = 0,
-    uint16_t port = 0) {
-  SignalingAddrBuilder builder_(_fbb);
-  builder_.add_ip(ip);
-  builder_.add_port(port);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<SignalingAddr> CreateSignalingAddrDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<uint8_t> *ip = nullptr,
-    uint16_t port = 0) {
-  auto ip__ = ip ? _fbb.CreateVector<uint8_t>(*ip) : 0;
-  return CreateSignalingAddr(
-      _fbb,
-      ip__,
-      port);
-}
-
-struct MatchingSignalingInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef MatchingSignalingInfoBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_NPID = 4,
-    VT_ADDR = 6
-  };
-  const ::flatbuffers::String *npid() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_NPID);
-  }
-  const SignalingAddr *addr() const {
-    return GetPointer<const SignalingAddr *>(VT_ADDR);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_NPID) &&
-           verifier.VerifyString(npid()) &&
-           VerifyOffset(verifier, VT_ADDR) &&
-           verifier.VerifyTable(addr()) &&
-           verifier.EndTable();
-  }
-};
-
-struct MatchingSignalingInfoBuilder {
-  typedef MatchingSignalingInfo Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_npid(::flatbuffers::Offset<::flatbuffers::String> npid) {
-    fbb_.AddOffset(MatchingSignalingInfo::VT_NPID, npid);
-  }
-  void add_addr(::flatbuffers::Offset<SignalingAddr> addr) {
-    fbb_.AddOffset(MatchingSignalingInfo::VT_ADDR, addr);
-  }
-  explicit MatchingSignalingInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<MatchingSignalingInfo> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<MatchingSignalingInfo>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<MatchingSignalingInfo> CreateMatchingSignalingInfo(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::String> npid = 0,
-    ::flatbuffers::Offset<SignalingAddr> addr = 0) {
-  MatchingSignalingInfoBuilder builder_(_fbb);
-  builder_.add_addr(addr);
-  builder_.add_npid(npid);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<MatchingSignalingInfo> CreateMatchingSignalingInfoDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const char *npid = nullptr,
-    ::flatbuffers::Offset<SignalingAddr> addr = 0) {
-  auto npid__ = npid ? _fbb.CreateString(npid) : 0;
-  return CreateMatchingSignalingInfo(
-      _fbb,
-      npid__,
-      addr);
-}
-
-struct Matching2SignalingInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef Matching2SignalingInfoBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_MEMBER_ID = 4,
-    VT_ADDR = 6
-  };
-  uint16_t member_id() const {
-    return GetField<uint16_t>(VT_MEMBER_ID, 0);
-  }
-  const SignalingAddr *addr() const {
-    return GetPointer<const SignalingAddr *>(VT_ADDR);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint16_t>(verifier, VT_MEMBER_ID, 2) &&
-           VerifyOffset(verifier, VT_ADDR) &&
-           verifier.VerifyTable(addr()) &&
-           verifier.EndTable();
-  }
-};
-
-struct Matching2SignalingInfoBuilder {
-  typedef Matching2SignalingInfo Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_member_id(uint16_t member_id) {
-    fbb_.AddElement<uint16_t>(Matching2SignalingInfo::VT_MEMBER_ID, member_id, 0);
-  }
-  void add_addr(::flatbuffers::Offset<SignalingAddr> addr) {
-    fbb_.AddOffset(Matching2SignalingInfo::VT_ADDR, addr);
-  }
-  explicit Matching2SignalingInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<Matching2SignalingInfo> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<Matching2SignalingInfo>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<Matching2SignalingInfo> CreateMatching2SignalingInfo(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint16_t member_id = 0,
-    ::flatbuffers::Offset<SignalingAddr> addr = 0) {
-  Matching2SignalingInfoBuilder builder_(_fbb);
-  builder_.add_addr(addr);
-  builder_.add_member_id(member_id);
-  return builder_.Finish();
-}
-
-struct BinAttr FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef BinAttrBuilder Builder;
+struct BinAttr FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_ID = 4,
     VT_DATA = 6
   };
-  uint16_t id() const {
-    return GetField<uint16_t>(VT_ID, 0);
+  u16 id() const {
+    return GetField<u16>(VT_ID, 0);
   }
-  const ::flatbuffers::Vector<uint8_t> *data() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_DATA);
+  const flatbuffers::Vector<u8> *data() const {
+    return GetPointer<const flatbuffers::Vector<u8> *>(VT_DATA);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint16_t>(verifier, VT_ID, 2) &&
+           VerifyField<u16>(verifier, VT_ID) &&
            VerifyOffset(verifier, VT_DATA) &&
            verifier.VerifyVector(data()) &&
            verifier.EndTable();
@@ -472,170 +83,167 @@ struct BinAttr FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
 };
 
 struct BinAttrBuilder {
-  typedef BinAttr Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_id(uint16_t id) {
-    fbb_.AddElement<uint16_t>(BinAttr::VT_ID, id, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_id(u16 id) {
+    fbb_.AddElement<u16>(BinAttr::VT_ID, id, 0);
   }
-  void add_data(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data) {
+  void add_data(flatbuffers::Offset<flatbuffers::Vector<u8>> data) {
     fbb_.AddOffset(BinAttr::VT_DATA, data);
   }
-  explicit BinAttrBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit BinAttrBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<BinAttr> Finish() {
+  BinAttrBuilder &operator=(const BinAttrBuilder &);
+  flatbuffers::Offset<BinAttr> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<BinAttr>(end);
+    auto o = flatbuffers::Offset<BinAttr>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<BinAttr> CreateBinAttr(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint16_t id = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data = 0) {
+inline flatbuffers::Offset<BinAttr> CreateBinAttr(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u16 id = 0,
+    flatbuffers::Offset<flatbuffers::Vector<u8>> data = 0) {
   BinAttrBuilder builder_(_fbb);
   builder_.add_data(data);
   builder_.add_id(id);
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<BinAttr> CreateBinAttrDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint16_t id = 0,
-    const std::vector<uint8_t> *data = nullptr) {
-  auto data__ = data ? _fbb.CreateVector<uint8_t>(*data) : 0;
+inline flatbuffers::Offset<BinAttr> CreateBinAttrDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u16 id = 0,
+    const std::vector<u8> *data = nullptr) {
+  auto data__ = data ? _fbb.CreateVector<u8>(*data) : 0;
   return CreateBinAttr(
       _fbb,
       id,
       data__);
 }
 
-struct IntAttr FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef IntAttrBuilder Builder;
+struct IntAttr FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_ID = 4,
     VT_NUM = 6
   };
-  uint16_t id() const {
-    return GetField<uint16_t>(VT_ID, 0);
+  u16 id() const {
+    return GetField<u16>(VT_ID, 0);
   }
-  uint32_t num() const {
-    return GetField<uint32_t>(VT_NUM, 0);
+  u32 num() const {
+    return GetField<u32>(VT_NUM, 0);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint16_t>(verifier, VT_ID, 2) &&
-           VerifyField<uint32_t>(verifier, VT_NUM, 4) &&
+           VerifyField<u16>(verifier, VT_ID) &&
+           VerifyField<u32>(verifier, VT_NUM) &&
            verifier.EndTable();
   }
 };
 
 struct IntAttrBuilder {
-  typedef IntAttr Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_id(uint16_t id) {
-    fbb_.AddElement<uint16_t>(IntAttr::VT_ID, id, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_id(u16 id) {
+    fbb_.AddElement<u16>(IntAttr::VT_ID, id, 0);
   }
-  void add_num(uint32_t num) {
-    fbb_.AddElement<uint32_t>(IntAttr::VT_NUM, num, 0);
+  void add_num(u32 num) {
+    fbb_.AddElement<u32>(IntAttr::VT_NUM, num, 0);
   }
-  explicit IntAttrBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit IntAttrBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<IntAttr> Finish() {
+  IntAttrBuilder &operator=(const IntAttrBuilder &);
+  flatbuffers::Offset<IntAttr> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<IntAttr>(end);
+    auto o = flatbuffers::Offset<IntAttr>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<IntAttr> CreateIntAttr(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint16_t id = 0,
-    uint32_t num = 0) {
+inline flatbuffers::Offset<IntAttr> CreateIntAttr(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u16 id = 0,
+    u32 num = 0) {
   IntAttrBuilder builder_(_fbb);
   builder_.add_num(num);
   builder_.add_id(id);
   return builder_.Finish();
 }
 
-struct RoomMemberBinAttrInternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef RoomMemberBinAttrInternalBuilder Builder;
+struct MemberBinAttrInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_UPDATEDATE = 4,
     VT_DATA = 6
   };
-  uint64_t updateDate() const {
-    return GetField<uint64_t>(VT_UPDATEDATE, 0);
+  u64 updateDate() const {
+    return GetField<u64>(VT_UPDATEDATE, 0);
   }
   const BinAttr *data() const {
     return GetPointer<const BinAttr *>(VT_DATA);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint64_t>(verifier, VT_UPDATEDATE, 8) &&
+           VerifyField<u64>(verifier, VT_UPDATEDATE) &&
            VerifyOffset(verifier, VT_DATA) &&
            verifier.VerifyTable(data()) &&
            verifier.EndTable();
   }
 };
 
-struct RoomMemberBinAttrInternalBuilder {
-  typedef RoomMemberBinAttrInternal Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_updateDate(uint64_t updateDate) {
-    fbb_.AddElement<uint64_t>(RoomMemberBinAttrInternal::VT_UPDATEDATE, updateDate, 0);
+struct MemberBinAttrInternalBuilder {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_updateDate(u64 updateDate) {
+    fbb_.AddElement<u64>(MemberBinAttrInternal::VT_UPDATEDATE, updateDate, 0);
   }
-  void add_data(::flatbuffers::Offset<BinAttr> data) {
-    fbb_.AddOffset(RoomMemberBinAttrInternal::VT_DATA, data);
+  void add_data(flatbuffers::Offset<BinAttr> data) {
+    fbb_.AddOffset(MemberBinAttrInternal::VT_DATA, data);
   }
-  explicit RoomMemberBinAttrInternalBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit MemberBinAttrInternalBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<RoomMemberBinAttrInternal> Finish() {
+  MemberBinAttrInternalBuilder &operator=(const MemberBinAttrInternalBuilder &);
+  flatbuffers::Offset<MemberBinAttrInternal> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<RoomMemberBinAttrInternal>(end);
+    auto o = flatbuffers::Offset<MemberBinAttrInternal>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<RoomMemberBinAttrInternal> CreateRoomMemberBinAttrInternal(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t updateDate = 0,
-    ::flatbuffers::Offset<BinAttr> data = 0) {
-  RoomMemberBinAttrInternalBuilder builder_(_fbb);
+inline flatbuffers::Offset<MemberBinAttrInternal> CreateMemberBinAttrInternal(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u64 updateDate = 0,
+    flatbuffers::Offset<BinAttr> data = 0) {
+  MemberBinAttrInternalBuilder builder_(_fbb);
   builder_.add_updateDate(updateDate);
   builder_.add_data(data);
   return builder_.Finish();
 }
 
-struct BinAttrInternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef BinAttrInternalBuilder Builder;
+struct BinAttrInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_UPDATEDATE = 4,
     VT_UPDATEMEMBERID = 6,
     VT_DATA = 8
   };
-  uint64_t updateDate() const {
-    return GetField<uint64_t>(VT_UPDATEDATE, 0);
+  u64 updateDate() const {
+    return GetField<u64>(VT_UPDATEDATE, 0);
   }
-  uint16_t updateMemberId() const {
-    return GetField<uint16_t>(VT_UPDATEMEMBERID, 0);
+  u16 updateMemberId() const {
+    return GetField<u16>(VT_UPDATEMEMBERID, 0);
   }
   const BinAttr *data() const {
     return GetPointer<const BinAttr *>(VT_DATA);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint64_t>(verifier, VT_UPDATEDATE, 8) &&
-           VerifyField<uint16_t>(verifier, VT_UPDATEMEMBERID, 2) &&
+           VerifyField<u64>(verifier, VT_UPDATEDATE) &&
+           VerifyField<u16>(verifier, VT_UPDATEMEMBERID) &&
            VerifyOffset(verifier, VT_DATA) &&
            verifier.VerifyTable(data()) &&
            verifier.EndTable();
@@ -643,34 +251,34 @@ struct BinAttrInternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
 };
 
 struct BinAttrInternalBuilder {
-  typedef BinAttrInternal Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_updateDate(uint64_t updateDate) {
-    fbb_.AddElement<uint64_t>(BinAttrInternal::VT_UPDATEDATE, updateDate, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_updateDate(u64 updateDate) {
+    fbb_.AddElement<u64>(BinAttrInternal::VT_UPDATEDATE, updateDate, 0);
   }
-  void add_updateMemberId(uint16_t updateMemberId) {
-    fbb_.AddElement<uint16_t>(BinAttrInternal::VT_UPDATEMEMBERID, updateMemberId, 0);
+  void add_updateMemberId(u16 updateMemberId) {
+    fbb_.AddElement<u16>(BinAttrInternal::VT_UPDATEMEMBERID, updateMemberId, 0);
   }
-  void add_data(::flatbuffers::Offset<BinAttr> data) {
+  void add_data(flatbuffers::Offset<BinAttr> data) {
     fbb_.AddOffset(BinAttrInternal::VT_DATA, data);
   }
-  explicit BinAttrInternalBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit BinAttrInternalBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<BinAttrInternal> Finish() {
+  BinAttrInternalBuilder &operator=(const BinAttrInternalBuilder &);
+  flatbuffers::Offset<BinAttrInternal> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<BinAttrInternal>(end);
+    auto o = flatbuffers::Offset<BinAttrInternal>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<BinAttrInternal> CreateBinAttrInternal(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t updateDate = 0,
-    uint16_t updateMemberId = 0,
-    ::flatbuffers::Offset<BinAttr> data = 0) {
+inline flatbuffers::Offset<BinAttrInternal> CreateBinAttrInternal(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u64 updateDate = 0,
+    u16 updateMemberId = 0,
+    flatbuffers::Offset<BinAttr> data = 0) {
   BinAttrInternalBuilder builder_(_fbb);
   builder_.add_updateDate(updateDate);
   builder_.add_data(data);
@@ -678,60 +286,59 @@ inline ::flatbuffers::Offset<BinAttrInternal> CreateBinAttrInternal(
   return builder_.Finish();
 }
 
-struct OptParam FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef OptParamBuilder Builder;
+struct OptParam FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_TYPE = 4,
     VT_FLAG = 6,
     VT_HUBMEMBERID = 8
   };
-  uint8_t type() const {
-    return GetField<uint8_t>(VT_TYPE, 0);
+  u8 type() const {
+    return GetField<u8>(VT_TYPE, 0);
   }
-  uint8_t flag() const {
-    return GetField<uint8_t>(VT_FLAG, 0);
+  u8 flag() const {
+    return GetField<u8>(VT_FLAG, 0);
   }
-  uint16_t hubMemberId() const {
-    return GetField<uint16_t>(VT_HUBMEMBERID, 0);
+  u16 hubMemberId() const {
+    return GetField<u16>(VT_HUBMEMBERID, 0);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint8_t>(verifier, VT_TYPE, 1) &&
-           VerifyField<uint8_t>(verifier, VT_FLAG, 1) &&
-           VerifyField<uint16_t>(verifier, VT_HUBMEMBERID, 2) &&
+           VerifyField<u8>(verifier, VT_TYPE) &&
+           VerifyField<u8>(verifier, VT_FLAG) &&
+           VerifyField<u16>(verifier, VT_HUBMEMBERID) &&
            verifier.EndTable();
   }
 };
 
 struct OptParamBuilder {
-  typedef OptParam Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_type(uint8_t type) {
-    fbb_.AddElement<uint8_t>(OptParam::VT_TYPE, type, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_type(u8 type) {
+    fbb_.AddElement<u8>(OptParam::VT_TYPE, type, 0);
   }
-  void add_flag(uint8_t flag) {
-    fbb_.AddElement<uint8_t>(OptParam::VT_FLAG, flag, 0);
+  void add_flag(u8 flag) {
+    fbb_.AddElement<u8>(OptParam::VT_FLAG, flag, 0);
   }
-  void add_hubMemberId(uint16_t hubMemberId) {
-    fbb_.AddElement<uint16_t>(OptParam::VT_HUBMEMBERID, hubMemberId, 0);
+  void add_hubMemberId(u16 hubMemberId) {
+    fbb_.AddElement<u16>(OptParam::VT_HUBMEMBERID, hubMemberId, 0);
   }
-  explicit OptParamBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit OptParamBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<OptParam> Finish() {
+  OptParamBuilder &operator=(const OptParamBuilder &);
+  flatbuffers::Offset<OptParam> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<OptParam>(end);
+    auto o = flatbuffers::Offset<OptParam>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<OptParam> CreateOptParam(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint8_t type = 0,
-    uint8_t flag = 0,
-    uint16_t hubMemberId = 0) {
+inline flatbuffers::Offset<OptParam> CreateOptParam(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u8 type = 0,
+    u8 flag = 0,
+    u16 hubMemberId = 0) {
   OptParamBuilder builder_(_fbb);
   builder_.add_hubMemberId(hubMemberId);
   builder_.add_flag(flag);
@@ -739,98 +346,108 @@ inline ::flatbuffers::Offset<OptParam> CreateOptParam(
   return builder_.Finish();
 }
 
-struct GroupConfig FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef GroupConfigBuilder Builder;
+struct GroupConfig FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_SLOTNUM = 4,
-    VT_LABEL = 6,
-    VT_WITHPASSWORD = 8
+    VT_WITHLABEL = 6,
+    VT_LABEL = 8,
+    VT_WITHPASSWORD = 10
   };
-  uint32_t slotNum() const {
-    return GetField<uint32_t>(VT_SLOTNUM, 0);
+  u32 slotNum() const {
+    return GetField<u32>(VT_SLOTNUM, 0);
   }
-  const ::flatbuffers::Vector<uint8_t> *label() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_LABEL);
+  bool withLabel() const {
+    return GetField<u8>(VT_WITHLABEL, 0) != 0;
+  }
+  const flatbuffers::Vector<u8> *label() const {
+    return GetPointer<const flatbuffers::Vector<u8> *>(VT_LABEL);
   }
   bool withPassword() const {
-    return GetField<uint8_t>(VT_WITHPASSWORD, 0) != 0;
+    return GetField<u8>(VT_WITHPASSWORD, 0) != 0;
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_SLOTNUM, 4) &&
+           VerifyField<u32>(verifier, VT_SLOTNUM) &&
+           VerifyField<u8>(verifier, VT_WITHLABEL) &&
            VerifyOffset(verifier, VT_LABEL) &&
            verifier.VerifyVector(label()) &&
-           VerifyField<uint8_t>(verifier, VT_WITHPASSWORD, 1) &&
+           VerifyField<u8>(verifier, VT_WITHPASSWORD) &&
            verifier.EndTable();
   }
 };
 
 struct GroupConfigBuilder {
-  typedef GroupConfig Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_slotNum(uint32_t slotNum) {
-    fbb_.AddElement<uint32_t>(GroupConfig::VT_SLOTNUM, slotNum, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_slotNum(u32 slotNum) {
+    fbb_.AddElement<u32>(GroupConfig::VT_SLOTNUM, slotNum, 0);
   }
-  void add_label(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> label) {
+  void add_withLabel(bool withLabel) {
+    fbb_.AddElement<u8>(GroupConfig::VT_WITHLABEL, static_cast<u8>(withLabel), 0);
+  }
+  void add_label(flatbuffers::Offset<flatbuffers::Vector<u8>> label) {
     fbb_.AddOffset(GroupConfig::VT_LABEL, label);
   }
   void add_withPassword(bool withPassword) {
-    fbb_.AddElement<uint8_t>(GroupConfig::VT_WITHPASSWORD, static_cast<uint8_t>(withPassword), 0);
+    fbb_.AddElement<u8>(GroupConfig::VT_WITHPASSWORD, static_cast<u8>(withPassword), 0);
   }
-  explicit GroupConfigBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit GroupConfigBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<GroupConfig> Finish() {
+  GroupConfigBuilder &operator=(const GroupConfigBuilder &);
+  flatbuffers::Offset<GroupConfig> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<GroupConfig>(end);
+    auto o = flatbuffers::Offset<GroupConfig>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<GroupConfig> CreateGroupConfig(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t slotNum = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> label = 0,
+inline flatbuffers::Offset<GroupConfig> CreateGroupConfig(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u32 slotNum = 0,
+    bool withLabel = false,
+    flatbuffers::Offset<flatbuffers::Vector<u8>> label = 0,
     bool withPassword = false) {
   GroupConfigBuilder builder_(_fbb);
   builder_.add_label(label);
   builder_.add_slotNum(slotNum);
   builder_.add_withPassword(withPassword);
+  builder_.add_withLabel(withLabel);
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<GroupConfig> CreateGroupConfigDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t slotNum = 0,
-    const std::vector<uint8_t> *label = nullptr,
+inline flatbuffers::Offset<GroupConfig> CreateGroupConfigDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u32 slotNum = 0,
+    bool withLabel = false,
+    const std::vector<u8> *label = nullptr,
     bool withPassword = false) {
-  auto label__ = label ? _fbb.CreateVector<uint8_t>(*label) : 0;
+  auto label__ = label ? _fbb.CreateVector<u8>(*label) : 0;
   return CreateGroupConfig(
       _fbb,
       slotNum,
+      withLabel,
       label__,
       withPassword);
 }
 
-struct UserInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef UserInfoBuilder Builder;
+struct UserInfo2 FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_NPID = 4,
     VT_ONLINENAME = 6,
     VT_AVATARURL = 8
   };
-  const ::flatbuffers::String *npId() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_NPID);
+  const flatbuffers::String *npId() const {
+    return GetPointer<const flatbuffers::String *>(VT_NPID);
   }
-  const ::flatbuffers::String *onlineName() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_ONLINENAME);
+  const flatbuffers::String *onlineName() const {
+    return GetPointer<const flatbuffers::String *>(VT_ONLINENAME);
   }
-  const ::flatbuffers::String *avatarUrl() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_AVATARURL);
+  const flatbuffers::String *avatarUrl() const {
+    return GetPointer<const flatbuffers::String *>(VT_AVATARURL);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyOffset(verifier, VT_NPID) &&
            verifier.VerifyString(npId()) &&
@@ -842,59 +459,58 @@ struct UserInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
   }
 };
 
-struct UserInfoBuilder {
-  typedef UserInfo Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_npId(::flatbuffers::Offset<::flatbuffers::String> npId) {
-    fbb_.AddOffset(UserInfo::VT_NPID, npId);
+struct UserInfo2Builder {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_npId(flatbuffers::Offset<flatbuffers::String> npId) {
+    fbb_.AddOffset(UserInfo2::VT_NPID, npId);
   }
-  void add_onlineName(::flatbuffers::Offset<::flatbuffers::String> onlineName) {
-    fbb_.AddOffset(UserInfo::VT_ONLINENAME, onlineName);
+  void add_onlineName(flatbuffers::Offset<flatbuffers::String> onlineName) {
+    fbb_.AddOffset(UserInfo2::VT_ONLINENAME, onlineName);
   }
-  void add_avatarUrl(::flatbuffers::Offset<::flatbuffers::String> avatarUrl) {
-    fbb_.AddOffset(UserInfo::VT_AVATARURL, avatarUrl);
+  void add_avatarUrl(flatbuffers::Offset<flatbuffers::String> avatarUrl) {
+    fbb_.AddOffset(UserInfo2::VT_AVATARURL, avatarUrl);
   }
-  explicit UserInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit UserInfo2Builder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<UserInfo> Finish() {
+  UserInfo2Builder &operator=(const UserInfo2Builder &);
+  flatbuffers::Offset<UserInfo2> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<UserInfo>(end);
+    auto o = flatbuffers::Offset<UserInfo2>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<UserInfo> CreateUserInfo(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::String> npId = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> onlineName = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> avatarUrl = 0) {
-  UserInfoBuilder builder_(_fbb);
+inline flatbuffers::Offset<UserInfo2> CreateUserInfo2(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    flatbuffers::Offset<flatbuffers::String> npId = 0,
+    flatbuffers::Offset<flatbuffers::String> onlineName = 0,
+    flatbuffers::Offset<flatbuffers::String> avatarUrl = 0) {
+  UserInfo2Builder builder_(_fbb);
   builder_.add_avatarUrl(avatarUrl);
   builder_.add_onlineName(onlineName);
   builder_.add_npId(npId);
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<UserInfo> CreateUserInfoDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
+inline flatbuffers::Offset<UserInfo2> CreateUserInfo2Direct(
+    flatbuffers::FlatBufferBuilder &_fbb,
     const char *npId = nullptr,
     const char *onlineName = nullptr,
     const char *avatarUrl = nullptr) {
   auto npId__ = npId ? _fbb.CreateString(npId) : 0;
   auto onlineName__ = onlineName ? _fbb.CreateString(onlineName) : 0;
   auto avatarUrl__ = avatarUrl ? _fbb.CreateString(avatarUrl) : 0;
-  return CreateUserInfo(
+  return CreateUserInfo2(
       _fbb,
       npId__,
       onlineName__,
       avatarUrl__);
 }
 
-struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef RoomMemberDataInternalBuilder Builder;
+struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_USERINFO = 4,
     VT_JOINDATE = 6,
@@ -905,41 +521,40 @@ struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::T
     VT_FLAGATTR = 16,
     VT_ROOMMEMBERBINATTRINTERNAL = 18
   };
-  const UserInfo *userInfo() const {
-    return GetPointer<const UserInfo *>(VT_USERINFO);
+  const UserInfo2 *userInfo() const {
+    return GetPointer<const UserInfo2 *>(VT_USERINFO);
   }
-  uint64_t joinDate() const {
-    return GetField<uint64_t>(VT_JOINDATE, 0);
+  u64 joinDate() const {
+    return GetField<u64>(VT_JOINDATE, 0);
   }
-  uint16_t memberId() const {
-    return GetField<uint16_t>(VT_MEMBERID, 0);
+  u16 memberId() const {
+    return GetField<u16>(VT_MEMBERID, 0);
   }
-  uint8_t teamId() const {
-    return GetField<uint8_t>(VT_TEAMID, 0);
+  u8 teamId() const {
+    return GetField<u8>(VT_TEAMID, 0);
   }
-  const RoomGroup *roomGroup() const {
-    return GetPointer<const RoomGroup *>(VT_ROOMGROUP);
+  u8 roomGroup() const {
+    return GetField<u8>(VT_ROOMGROUP, 0);
   }
-  uint8_t natType() const {
-    return GetField<uint8_t>(VT_NATTYPE, 0);
+  u8 natType() const {
+    return GetField<u8>(VT_NATTYPE, 0);
   }
-  uint32_t flagAttr() const {
-    return GetField<uint32_t>(VT_FLAGATTR, 0);
+  u32 flagAttr() const {
+    return GetField<u32>(VT_FLAGATTR, 0);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<RoomMemberBinAttrInternal>> *roomMemberBinAttrInternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<RoomMemberBinAttrInternal>> *>(VT_ROOMMEMBERBINATTRINTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<MemberBinAttrInternal>> *roomMemberBinAttrInternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<MemberBinAttrInternal>> *>(VT_ROOMMEMBERBINATTRINTERNAL);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyOffset(verifier, VT_USERINFO) &&
            verifier.VerifyTable(userInfo()) &&
-           VerifyField<uint64_t>(verifier, VT_JOINDATE, 8) &&
-           VerifyField<uint16_t>(verifier, VT_MEMBERID, 2) &&
-           VerifyField<uint8_t>(verifier, VT_TEAMID, 1) &&
-           VerifyOffset(verifier, VT_ROOMGROUP) &&
-           verifier.VerifyTable(roomGroup()) &&
-           VerifyField<uint8_t>(verifier, VT_NATTYPE, 1) &&
-           VerifyField<uint32_t>(verifier, VT_FLAGATTR, 4) &&
+           VerifyField<u64>(verifier, VT_JOINDATE) &&
+           VerifyField<u16>(verifier, VT_MEMBERID) &&
+           VerifyField<u8>(verifier, VT_TEAMID) &&
+           VerifyField<u8>(verifier, VT_ROOMGROUP) &&
+           VerifyField<u8>(verifier, VT_NATTYPE) &&
+           VerifyField<u32>(verifier, VT_FLAGATTR) &&
            VerifyOffset(verifier, VT_ROOMMEMBERBINATTRINTERNAL) &&
            verifier.VerifyVector(roomMemberBinAttrInternal()) &&
            verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) &&
@@ -948,77 +563,77 @@ struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::T
 };
 
 struct RoomMemberDataInternalBuilder {
-  typedef RoomMemberDataInternal Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_userInfo(::flatbuffers::Offset<UserInfo> userInfo) {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_userInfo(flatbuffers::Offset<UserInfo2> userInfo) {
     fbb_.AddOffset(RoomMemberDataInternal::VT_USERINFO, userInfo);
   }
-  void add_joinDate(uint64_t joinDate) {
-    fbb_.AddElement<uint64_t>(RoomMemberDataInternal::VT_JOINDATE, joinDate, 0);
+  void add_joinDate(u64 joinDate) {
+    fbb_.AddElement<u64>(RoomMemberDataInternal::VT_JOINDATE, joinDate, 0);
   }
-  void add_memberId(uint16_t memberId) {
-    fbb_.AddElement<uint16_t>(RoomMemberDataInternal::VT_MEMBERID, memberId, 0);
+  void add_memberId(u16 memberId) {
+    fbb_.AddElement<u16>(RoomMemberDataInternal::VT_MEMBERID, memberId, 0);
   }
-  void add_teamId(uint8_t teamId) {
-    fbb_.AddElement<uint8_t>(RoomMemberDataInternal::VT_TEAMID, teamId, 0);
+  void add_teamId(u8 teamId) {
+    fbb_.AddElement<u8>(RoomMemberDataInternal::VT_TEAMID, teamId, 0);
   }
-  void add_roomGroup(::flatbuffers::Offset<RoomGroup> roomGroup) {
-    fbb_.AddOffset(RoomMemberDataInternal::VT_ROOMGROUP, roomGroup);
+  void add_roomGroup(u8 roomGroup) {
+    fbb_.AddElement<u8>(RoomMemberDataInternal::VT_ROOMGROUP, roomGroup, 0);
   }
-  void add_natType(uint8_t natType) {
-    fbb_.AddElement<uint8_t>(RoomMemberDataInternal::VT_NATTYPE, natType, 0);
+  void add_natType(u8 natType) {
+    fbb_.AddElement<u8>(RoomMemberDataInternal::VT_NATTYPE, natType, 0);
   }
-  void add_flagAttr(uint32_t flagAttr) {
-    fbb_.AddElement<uint32_t>(RoomMemberDataInternal::VT_FLAGATTR, flagAttr, 0);
+  void add_flagAttr(u32 flagAttr) {
+    fbb_.AddElement<u32>(RoomMemberDataInternal::VT_FLAGATTR, flagAttr, 0);
   }
-  void add_roomMemberBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomMemberBinAttrInternal>>> roomMemberBinAttrInternal) {
+  void add_roomMemberBinAttrInternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<MemberBinAttrInternal>>> roomMemberBinAttrInternal) {
     fbb_.AddOffset(RoomMemberDataInternal::VT_ROOMMEMBERBINATTRINTERNAL, roomMemberBinAttrInternal);
   }
-  explicit RoomMemberDataInternalBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit RoomMemberDataInternalBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<RoomMemberDataInternal> Finish() {
+  RoomMemberDataInternalBuilder &operator=(const RoomMemberDataInternalBuilder &);
+  flatbuffers::Offset<RoomMemberDataInternal> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<RoomMemberDataInternal>(end);
+    auto o = flatbuffers::Offset<RoomMemberDataInternal>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<RoomMemberDataInternal> CreateRoomMemberDataInternal(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<UserInfo> userInfo = 0,
-    uint64_t joinDate = 0,
-    uint16_t memberId = 0,
-    uint8_t teamId = 0,
-    ::flatbuffers::Offset<RoomGroup> roomGroup = 0,
-    uint8_t natType = 0,
-    uint32_t flagAttr = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomMemberBinAttrInternal>>> roomMemberBinAttrInternal = 0) {
+inline flatbuffers::Offset<RoomMemberDataInternal> CreateRoomMemberDataInternal(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    flatbuffers::Offset<UserInfo2> userInfo = 0,
+    u64 joinDate = 0,
+    u16 memberId = 0,
+    u8 teamId = 0,
+    u8 roomGroup = 0,
+    u8 natType = 0,
+    u32 flagAttr = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<MemberBinAttrInternal>>> roomMemberBinAttrInternal = 0) {
   RoomMemberDataInternalBuilder builder_(_fbb);
   builder_.add_joinDate(joinDate);
   builder_.add_roomMemberBinAttrInternal(roomMemberBinAttrInternal);
   builder_.add_flagAttr(flagAttr);
-  builder_.add_roomGroup(roomGroup);
   builder_.add_userInfo(userInfo);
   builder_.add_memberId(memberId);
   builder_.add_natType(natType);
+  builder_.add_roomGroup(roomGroup);
   builder_.add_teamId(teamId);
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<RoomMemberDataInternal> CreateRoomMemberDataInternalDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<UserInfo> userInfo = 0,
-    uint64_t joinDate = 0,
-    uint16_t memberId = 0,
-    uint8_t teamId = 0,
-    ::flatbuffers::Offset<RoomGroup> roomGroup = 0,
-    uint8_t natType = 0,
-    uint32_t flagAttr = 0,
-    const std::vector<::flatbuffers::Offset<RoomMemberBinAttrInternal>> *roomMemberBinAttrInternal = nullptr) {
-  auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset<RoomMemberBinAttrInternal>>(*roomMemberBinAttrInternal) : 0;
+inline flatbuffers::Offset<RoomMemberDataInternal> CreateRoomMemberDataInternalDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    flatbuffers::Offset<UserInfo2> userInfo = 0,
+    u64 joinDate = 0,
+    u16 memberId = 0,
+    u8 teamId = 0,
+    u8 roomGroup = 0,
+    u8 natType = 0,
+    u32 flagAttr = 0,
+    const std::vector<flatbuffers::Offset<MemberBinAttrInternal>> *roomMemberBinAttrInternal = nullptr) {
+  auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector<flatbuffers::Offset<MemberBinAttrInternal>>(*roomMemberBinAttrInternal) : 0;
   return CreateRoomMemberDataInternal(
       _fbb,
       userInfo,
@@ -1031,107 +646,117 @@ inline ::flatbuffers::Offset<RoomMemberDataInternal> CreateRoomMemberDataInterna
       roomMemberBinAttrInternal__);
 }
 
-struct RoomGroup FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef RoomGroupBuilder Builder;
+struct RoomGroup FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_GROUPID = 4,
     VT_WITHPASSWORD = 6,
-    VT_LABEL = 8,
-    VT_SLOTNUM = 10,
-    VT_CURGROUPMEMBERNUM = 12
+    VT_WITHLABEL = 8,
+    VT_LABEL = 10,
+    VT_SLOTNUM = 12,
+    VT_CURGROUPMEMBERNUM = 14
   };
-  uint8_t groupId() const {
-    return GetField<uint8_t>(VT_GROUPID, 0);
+  u8 groupId() const {
+    return GetField<u8>(VT_GROUPID, 0);
   }
   bool withPassword() const {
-    return GetField<uint8_t>(VT_WITHPASSWORD, 0) != 0;
+    return GetField<u8>(VT_WITHPASSWORD, 0) != 0;
   }
-  const ::flatbuffers::Vector<uint8_t> *label() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_LABEL);
+  bool withLabel() const {
+    return GetField<u8>(VT_WITHLABEL, 0) != 0;
   }
-  uint32_t slotNum() const {
-    return GetField<uint32_t>(VT_SLOTNUM, 0);
+  const flatbuffers::Vector<u8> *label() const {
+    return GetPointer<const flatbuffers::Vector<u8> *>(VT_LABEL);
   }
-  uint32_t curGroupMemberNum() const {
-    return GetField<uint32_t>(VT_CURGROUPMEMBERNUM, 0);
+  u32 slotNum() const {
+    return GetField<u32>(VT_SLOTNUM, 0);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  u32 curGroupMemberNum() const {
+    return GetField<u32>(VT_CURGROUPMEMBERNUM, 0);
+  }
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint8_t>(verifier, VT_GROUPID, 1) &&
-           VerifyField<uint8_t>(verifier, VT_WITHPASSWORD, 1) &&
+           VerifyField<u8>(verifier, VT_GROUPID) &&
+           VerifyField<u8>(verifier, VT_WITHPASSWORD) &&
+           VerifyField<u8>(verifier, VT_WITHLABEL) &&
            VerifyOffset(verifier, VT_LABEL) &&
            verifier.VerifyVector(label()) &&
-           VerifyField<uint32_t>(verifier, VT_SLOTNUM, 4) &&
-           VerifyField<uint32_t>(verifier, VT_CURGROUPMEMBERNUM, 4) &&
+           VerifyField<u32>(verifier, VT_SLOTNUM) &&
+           VerifyField<u32>(verifier, VT_CURGROUPMEMBERNUM) &&
            verifier.EndTable();
   }
 };
 
 struct RoomGroupBuilder {
-  typedef RoomGroup Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_groupId(uint8_t groupId) {
-    fbb_.AddElement<uint8_t>(RoomGroup::VT_GROUPID, groupId, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_groupId(u8 groupId) {
+    fbb_.AddElement<u8>(RoomGroup::VT_GROUPID, groupId, 0);
   }
   void add_withPassword(bool withPassword) {
-    fbb_.AddElement<uint8_t>(RoomGroup::VT_WITHPASSWORD, static_cast<uint8_t>(withPassword), 0);
+    fbb_.AddElement<u8>(RoomGroup::VT_WITHPASSWORD, static_cast<u8>(withPassword), 0);
   }
-  void add_label(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> label) {
+  void add_withLabel(bool withLabel) {
+    fbb_.AddElement<u8>(RoomGroup::VT_WITHLABEL, static_cast<u8>(withLabel), 0);
+  }
+  void add_label(flatbuffers::Offset<flatbuffers::Vector<u8>> label) {
     fbb_.AddOffset(RoomGroup::VT_LABEL, label);
   }
-  void add_slotNum(uint32_t slotNum) {
-    fbb_.AddElement<uint32_t>(RoomGroup::VT_SLOTNUM, slotNum, 0);
+  void add_slotNum(u32 slotNum) {
+    fbb_.AddElement<u32>(RoomGroup::VT_SLOTNUM, slotNum, 0);
   }
-  void add_curGroupMemberNum(uint32_t curGroupMemberNum) {
-    fbb_.AddElement<uint32_t>(RoomGroup::VT_CURGROUPMEMBERNUM, curGroupMemberNum, 0);
+  void add_curGroupMemberNum(u32 curGroupMemberNum) {
+    fbb_.AddElement<u32>(RoomGroup::VT_CURGROUPMEMBERNUM, curGroupMemberNum, 0);
   }
-  explicit RoomGroupBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit RoomGroupBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<RoomGroup> Finish() {
+  RoomGroupBuilder &operator=(const RoomGroupBuilder &);
+  flatbuffers::Offset<RoomGroup> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<RoomGroup>(end);
+    auto o = flatbuffers::Offset<RoomGroup>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<RoomGroup> CreateRoomGroup(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint8_t groupId = 0,
+inline flatbuffers::Offset<RoomGroup> CreateRoomGroup(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u8 groupId = 0,
     bool withPassword = false,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> label = 0,
-    uint32_t slotNum = 0,
-    uint32_t curGroupMemberNum = 0) {
+    bool withLabel = false,
+    flatbuffers::Offset<flatbuffers::Vector<u8>> label = 0,
+    u32 slotNum = 0,
+    u32 curGroupMemberNum = 0) {
   RoomGroupBuilder builder_(_fbb);
   builder_.add_curGroupMemberNum(curGroupMemberNum);
   builder_.add_slotNum(slotNum);
   builder_.add_label(label);
+  builder_.add_withLabel(withLabel);
   builder_.add_withPassword(withPassword);
   builder_.add_groupId(groupId);
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<RoomGroup> CreateRoomGroupDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint8_t groupId = 0,
+inline flatbuffers::Offset<RoomGroup> CreateRoomGroupDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u8 groupId = 0,
     bool withPassword = false,
-    const std::vector<uint8_t> *label = nullptr,
-    uint32_t slotNum = 0,
-    uint32_t curGroupMemberNum = 0) {
-  auto label__ = label ? _fbb.CreateVector<uint8_t>(*label) : 0;
+    bool withLabel = false,
+    const std::vector<u8> *label = nullptr,
+    u32 slotNum = 0,
+    u32 curGroupMemberNum = 0) {
+  auto label__ = label ? _fbb.CreateVector<u8>(*label) : 0;
   return CreateRoomGroup(
       _fbb,
       groupId,
       withPassword,
+      withLabel,
       label__,
       slotNum,
       curGroupMemberNum);
 }
 
-struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef RoomDataInternalBuilder Builder;
+struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_SERVERID = 4,
     VT_WORLDID = 6,
@@ -1145,55 +770,55 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     VT_FLAGATTR = 22,
     VT_ROOMBINATTRINTERNAL = 24
   };
-  uint16_t serverId() const {
-    return GetField<uint16_t>(VT_SERVERID, 0);
+  u16 serverId() const {
+    return GetField<u16>(VT_SERVERID, 0);
   }
-  uint32_t worldId() const {
-    return GetField<uint32_t>(VT_WORLDID, 0);
+  u32 worldId() const {
+    return GetField<u32>(VT_WORLDID, 0);
   }
-  uint64_t lobbyId() const {
-    return GetField<uint64_t>(VT_LOBBYID, 0);
+  u64 lobbyId() const {
+    return GetField<u64>(VT_LOBBYID, 0);
   }
-  uint64_t roomId() const {
-    return GetField<uint64_t>(VT_ROOMID, 0);
+  u64 roomId() const {
+    return GetField<u64>(VT_ROOMID, 0);
   }
-  uint64_t passwordSlotMask() const {
-    return GetField<uint64_t>(VT_PASSWORDSLOTMASK, 0);
+  u64 passwordSlotMask() const {
+    return GetField<u64>(VT_PASSWORDSLOTMASK, 0);
   }
-  uint32_t maxSlot() const {
-    return GetField<uint32_t>(VT_MAXSLOT, 0);
+  u32 maxSlot() const {
+    return GetField<u32>(VT_MAXSLOT, 0);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<RoomMemberDataInternal>> *memberList() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<RoomMemberDataInternal>> *>(VT_MEMBERLIST);
+  const flatbuffers::Vector<flatbuffers::Offset<RoomMemberDataInternal>> *memberList() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<RoomMemberDataInternal>> *>(VT_MEMBERLIST);
   }
-  uint16_t ownerId() const {
-    return GetField<uint16_t>(VT_OWNERID, 0);
+  u16 ownerId() const {
+    return GetField<u16>(VT_OWNERID, 0);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<RoomGroup>> *roomGroup() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<RoomGroup>> *>(VT_ROOMGROUP);
+  const flatbuffers::Vector<flatbuffers::Offset<RoomGroup>> *roomGroup() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<RoomGroup>> *>(VT_ROOMGROUP);
   }
-  uint32_t flagAttr() const {
-    return GetField<uint32_t>(VT_FLAGATTR, 0);
+  u32 flagAttr() const {
+    return GetField<u32>(VT_FLAGATTR, 0);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttrInternal>> *roomBinAttrInternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttrInternal>> *>(VT_ROOMBINATTRINTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<BinAttrInternal>> *roomBinAttrInternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttrInternal>> *>(VT_ROOMBINATTRINTERNAL);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint16_t>(verifier, VT_SERVERID, 2) &&
-           VerifyField<uint32_t>(verifier, VT_WORLDID, 4) &&
-           VerifyField<uint64_t>(verifier, VT_LOBBYID, 8) &&
-           VerifyField<uint64_t>(verifier, VT_ROOMID, 8) &&
-           VerifyField<uint64_t>(verifier, VT_PASSWORDSLOTMASK, 8) &&
-           VerifyField<uint32_t>(verifier, VT_MAXSLOT, 4) &&
+           VerifyField<u16>(verifier, VT_SERVERID) &&
+           VerifyField<u32>(verifier, VT_WORLDID) &&
+           VerifyField<u64>(verifier, VT_LOBBYID) &&
+           VerifyField<u64>(verifier, VT_ROOMID) &&
+           VerifyField<u64>(verifier, VT_PASSWORDSLOTMASK) &&
+           VerifyField<u32>(verifier, VT_MAXSLOT) &&
            VerifyOffset(verifier, VT_MEMBERLIST) &&
            verifier.VerifyVector(memberList()) &&
            verifier.VerifyVectorOfTables(memberList()) &&
-           VerifyField<uint16_t>(verifier, VT_OWNERID, 2) &&
+           VerifyField<u16>(verifier, VT_OWNERID) &&
            VerifyOffset(verifier, VT_ROOMGROUP) &&
            verifier.VerifyVector(roomGroup()) &&
            verifier.VerifyVectorOfTables(roomGroup()) &&
-           VerifyField<uint32_t>(verifier, VT_FLAGATTR, 4) &&
+           VerifyField<u32>(verifier, VT_FLAGATTR) &&
            VerifyOffset(verifier, VT_ROOMBINATTRINTERNAL) &&
            verifier.VerifyVector(roomBinAttrInternal()) &&
            verifier.VerifyVectorOfTables(roomBinAttrInternal()) &&
@@ -1202,66 +827,66 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
 };
 
 struct RoomDataInternalBuilder {
-  typedef RoomDataInternal Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_serverId(uint16_t serverId) {
-    fbb_.AddElement<uint16_t>(RoomDataInternal::VT_SERVERID, serverId, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_serverId(u16 serverId) {
+    fbb_.AddElement<u16>(RoomDataInternal::VT_SERVERID, serverId, 0);
   }
-  void add_worldId(uint32_t worldId) {
-    fbb_.AddElement<uint32_t>(RoomDataInternal::VT_WORLDID, worldId, 0);
+  void add_worldId(u32 worldId) {
+    fbb_.AddElement<u32>(RoomDataInternal::VT_WORLDID, worldId, 0);
   }
-  void add_lobbyId(uint64_t lobbyId) {
-    fbb_.AddElement<uint64_t>(RoomDataInternal::VT_LOBBYID, lobbyId, 0);
+  void add_lobbyId(u64 lobbyId) {
+    fbb_.AddElement<u64>(RoomDataInternal::VT_LOBBYID, lobbyId, 0);
   }
-  void add_roomId(uint64_t roomId) {
-    fbb_.AddElement<uint64_t>(RoomDataInternal::VT_ROOMID, roomId, 0);
+  void add_roomId(u64 roomId) {
+    fbb_.AddElement<u64>(RoomDataInternal::VT_ROOMID, roomId, 0);
   }
-  void add_passwordSlotMask(uint64_t passwordSlotMask) {
-    fbb_.AddElement<uint64_t>(RoomDataInternal::VT_PASSWORDSLOTMASK, passwordSlotMask, 0);
+  void add_passwordSlotMask(u64 passwordSlotMask) {
+    fbb_.AddElement<u64>(RoomDataInternal::VT_PASSWORDSLOTMASK, passwordSlotMask, 0);
   }
-  void add_maxSlot(uint32_t maxSlot) {
-    fbb_.AddElement<uint32_t>(RoomDataInternal::VT_MAXSLOT, maxSlot, 0);
+  void add_maxSlot(u32 maxSlot) {
+    fbb_.AddElement<u32>(RoomDataInternal::VT_MAXSLOT, maxSlot, 0);
   }
-  void add_memberList(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomMemberDataInternal>>> memberList) {
+  void add_memberList(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomMemberDataInternal>>> memberList) {
     fbb_.AddOffset(RoomDataInternal::VT_MEMBERLIST, memberList);
   }
-  void add_ownerId(uint16_t ownerId) {
-    fbb_.AddElement<uint16_t>(RoomDataInternal::VT_OWNERID, ownerId, 0);
+  void add_ownerId(u16 ownerId) {
+    fbb_.AddElement<u16>(RoomDataInternal::VT_OWNERID, ownerId, 0);
   }
-  void add_roomGroup(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomGroup>>> roomGroup) {
+  void add_roomGroup(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomGroup>>> roomGroup) {
     fbb_.AddOffset(RoomDataInternal::VT_ROOMGROUP, roomGroup);
   }
-  void add_flagAttr(uint32_t flagAttr) {
-    fbb_.AddElement<uint32_t>(RoomDataInternal::VT_FLAGATTR, flagAttr, 0);
+  void add_flagAttr(u32 flagAttr) {
+    fbb_.AddElement<u32>(RoomDataInternal::VT_FLAGATTR, flagAttr, 0);
   }
-  void add_roomBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttrInternal>>> roomBinAttrInternal) {
+  void add_roomBinAttrInternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttrInternal>>> roomBinAttrInternal) {
     fbb_.AddOffset(RoomDataInternal::VT_ROOMBINATTRINTERNAL, roomBinAttrInternal);
   }
-  explicit RoomDataInternalBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit RoomDataInternalBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<RoomDataInternal> Finish() {
+  RoomDataInternalBuilder &operator=(const RoomDataInternalBuilder &);
+  flatbuffers::Offset<RoomDataInternal> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<RoomDataInternal>(end);
+    auto o = flatbuffers::Offset<RoomDataInternal>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<RoomDataInternal> CreateRoomDataInternal(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint16_t serverId = 0,
-    uint32_t worldId = 0,
-    uint64_t lobbyId = 0,
-    uint64_t roomId = 0,
-    uint64_t passwordSlotMask = 0,
-    uint32_t maxSlot = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomMemberDataInternal>>> memberList = 0,
-    uint16_t ownerId = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomGroup>>> roomGroup = 0,
-    uint32_t flagAttr = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttrInternal>>> roomBinAttrInternal = 0) {
+inline flatbuffers::Offset<RoomDataInternal> CreateRoomDataInternal(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u16 serverId = 0,
+    u32 worldId = 0,
+    u64 lobbyId = 0,
+    u64 roomId = 0,
+    u64 passwordSlotMask = 0,
+    u32 maxSlot = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomMemberDataInternal>>> memberList = 0,
+    u16 ownerId = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomGroup>>> roomGroup = 0,
+    u32 flagAttr = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttrInternal>>> roomBinAttrInternal = 0) {
   RoomDataInternalBuilder builder_(_fbb);
   builder_.add_passwordSlotMask(passwordSlotMask);
   builder_.add_roomId(roomId);
@@ -1277,22 +902,22 @@ inline ::flatbuffers::Offset<RoomDataInternal> CreateRoomDataInternal(
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<RoomDataInternal> CreateRoomDataInternalDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint16_t serverId = 0,
-    uint32_t worldId = 0,
-    uint64_t lobbyId = 0,
-    uint64_t roomId = 0,
-    uint64_t passwordSlotMask = 0,
-    uint32_t maxSlot = 0,
-    const std::vector<::flatbuffers::Offset<RoomMemberDataInternal>> *memberList = nullptr,
-    uint16_t ownerId = 0,
-    const std::vector<::flatbuffers::Offset<RoomGroup>> *roomGroup = nullptr,
-    uint32_t flagAttr = 0,
-    const std::vector<::flatbuffers::Offset<BinAttrInternal>> *roomBinAttrInternal = nullptr) {
-  auto memberList__ = memberList ? _fbb.CreateVector<::flatbuffers::Offset<RoomMemberDataInternal>>(*memberList) : 0;
-  auto roomGroup__ = roomGroup ? _fbb.CreateVector<::flatbuffers::Offset<RoomGroup>>(*roomGroup) : 0;
-  auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttrInternal>>(*roomBinAttrInternal) : 0;
+inline flatbuffers::Offset<RoomDataInternal> CreateRoomDataInternalDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u16 serverId = 0,
+    u32 worldId = 0,
+    u64 lobbyId = 0,
+    u64 roomId = 0,
+    u64 passwordSlotMask = 0,
+    u32 maxSlot = 0,
+    const std::vector<flatbuffers::Offset<RoomMemberDataInternal>> *memberList = nullptr,
+    u16 ownerId = 0,
+    const std::vector<flatbuffers::Offset<RoomGroup>> *roomGroup = nullptr,
+    u32 flagAttr = 0,
+    const std::vector<flatbuffers::Offset<BinAttrInternal>> *roomBinAttrInternal = nullptr) {
+  auto memberList__ = memberList ? _fbb.CreateVector<flatbuffers::Offset<RoomMemberDataInternal>>(*memberList) : 0;
+  auto roomGroup__ = roomGroup ? _fbb.CreateVector<flatbuffers::Offset<RoomGroup>>(*roomGroup) : 0;
+  auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector<flatbuffers::Offset<BinAttrInternal>>(*roomBinAttrInternal) : 0;
   return CreateRoomDataInternal(
       _fbb,
       serverId,
@@ -1308,8 +933,7 @@ inline ::flatbuffers::Offset<RoomDataInternal> CreateRoomDataInternalDirect(
       roomBinAttrInternal__);
 }
 
-struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef RoomDataExternalBuilder Builder;
+struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_SERVERID = 4,
     VT_WORLDID = 6,
@@ -1329,76 +953,76 @@ struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     VT_ROOMSEARCHABLEBINATTREXTERNAL = 34,
     VT_ROOMBINATTREXTERNAL = 36
   };
-  uint16_t serverId() const {
-    return GetField<uint16_t>(VT_SERVERID, 0);
+  u16 serverId() const {
+    return GetField<u16>(VT_SERVERID, 0);
   }
-  uint32_t worldId() const {
-    return GetField<uint32_t>(VT_WORLDID, 0);
+  u32 worldId() const {
+    return GetField<u32>(VT_WORLDID, 0);
   }
-  uint16_t publicSlotNum() const {
-    return GetField<uint16_t>(VT_PUBLICSLOTNUM, 0);
+  u16 publicSlotNum() const {
+    return GetField<u16>(VT_PUBLICSLOTNUM, 0);
   }
-  uint16_t privateSlotNum() const {
-    return GetField<uint16_t>(VT_PRIVATESLOTNUM, 0);
+  u16 privateSlotNum() const {
+    return GetField<u16>(VT_PRIVATESLOTNUM, 0);
   }
-  uint64_t lobbyId() const {
-    return GetField<uint64_t>(VT_LOBBYID, 0);
+  u64 lobbyId() const {
+    return GetField<u64>(VT_LOBBYID, 0);
   }
-  uint64_t roomId() const {
-    return GetField<uint64_t>(VT_ROOMID, 0);
+  u64 roomId() const {
+    return GetField<u64>(VT_ROOMID, 0);
   }
-  uint16_t openPublicSlotNum() const {
-    return GetField<uint16_t>(VT_OPENPUBLICSLOTNUM, 0);
+  u16 openPublicSlotNum() const {
+    return GetField<u16>(VT_OPENPUBLICSLOTNUM, 0);
   }
-  uint16_t maxSlot() const {
-    return GetField<uint16_t>(VT_MAXSLOT, 0);
+  u16 maxSlot() const {
+    return GetField<u16>(VT_MAXSLOT, 0);
   }
-  uint16_t openPrivateSlotNum() const {
-    return GetField<uint16_t>(VT_OPENPRIVATESLOTNUM, 0);
+  u16 openPrivateSlotNum() const {
+    return GetField<u16>(VT_OPENPRIVATESLOTNUM, 0);
   }
-  uint16_t curMemberNum() const {
-    return GetField<uint16_t>(VT_CURMEMBERNUM, 0);
+  u16 curMemberNum() const {
+    return GetField<u16>(VT_CURMEMBERNUM, 0);
   }
-  uint64_t passwordSlotMask() const {
-    return GetField<uint64_t>(VT_PASSWORDSLOTMASK, 0);
+  u64 passwordSlotMask() const {
+    return GetField<u64>(VT_PASSWORDSLOTMASK, 0);
   }
-  const UserInfo *owner() const {
-    return GetPointer<const UserInfo *>(VT_OWNER);
+  const UserInfo2 *owner() const {
+    return GetPointer<const UserInfo2 *>(VT_OWNER);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<RoomGroup>> *roomGroup() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<RoomGroup>> *>(VT_ROOMGROUP);
+  const flatbuffers::Vector<flatbuffers::Offset<RoomGroup>> *roomGroup() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<RoomGroup>> *>(VT_ROOMGROUP);
   }
-  uint32_t flagAttr() const {
-    return GetField<uint32_t>(VT_FLAGATTR, 0);
+  u32 flagAttr() const {
+    return GetField<u32>(VT_FLAGATTR, 0);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<IntAttr>> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<IntAttr>> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *>(VT_ROOMSEARCHABLEBINATTREXTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *>(VT_ROOMSEARCHABLEBINATTREXTERNAL);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *roomBinAttrExternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *>(VT_ROOMBINATTREXTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *roomBinAttrExternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *>(VT_ROOMBINATTREXTERNAL);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint16_t>(verifier, VT_SERVERID, 2) &&
-           VerifyField<uint32_t>(verifier, VT_WORLDID, 4) &&
-           VerifyField<uint16_t>(verifier, VT_PUBLICSLOTNUM, 2) &&
-           VerifyField<uint16_t>(verifier, VT_PRIVATESLOTNUM, 2) &&
-           VerifyField<uint64_t>(verifier, VT_LOBBYID, 8) &&
-           VerifyField<uint64_t>(verifier, VT_ROOMID, 8) &&
-           VerifyField<uint16_t>(verifier, VT_OPENPUBLICSLOTNUM, 2) &&
-           VerifyField<uint16_t>(verifier, VT_MAXSLOT, 2) &&
-           VerifyField<uint16_t>(verifier, VT_OPENPRIVATESLOTNUM, 2) &&
-           VerifyField<uint16_t>(verifier, VT_CURMEMBERNUM, 2) &&
-           VerifyField<uint64_t>(verifier, VT_PASSWORDSLOTMASK, 8) &&
+           VerifyField<u16>(verifier, VT_SERVERID) &&
+           VerifyField<u32>(verifier, VT_WORLDID) &&
+           VerifyField<u16>(verifier, VT_PUBLICSLOTNUM) &&
+           VerifyField<u16>(verifier, VT_PRIVATESLOTNUM) &&
+           VerifyField<u64>(verifier, VT_LOBBYID) &&
+           VerifyField<u64>(verifier, VT_ROOMID) &&
+           VerifyField<u16>(verifier, VT_OPENPUBLICSLOTNUM) &&
+           VerifyField<u16>(verifier, VT_MAXSLOT) &&
+           VerifyField<u16>(verifier, VT_OPENPRIVATESLOTNUM) &&
+           VerifyField<u16>(verifier, VT_CURMEMBERNUM) &&
+           VerifyField<u64>(verifier, VT_PASSWORDSLOTMASK) &&
            VerifyOffset(verifier, VT_OWNER) &&
            verifier.VerifyTable(owner()) &&
            VerifyOffset(verifier, VT_ROOMGROUP) &&
            verifier.VerifyVector(roomGroup()) &&
            verifier.VerifyVectorOfTables(roomGroup()) &&
-           VerifyField<uint32_t>(verifier, VT_FLAGATTR, 4) &&
+           VerifyField<u32>(verifier, VT_FLAGATTR) &&
            VerifyOffset(verifier, VT_ROOMSEARCHABLEINTATTREXTERNAL) &&
            verifier.VerifyVector(roomSearchableIntAttrExternal()) &&
            verifier.VerifyVectorOfTables(roomSearchableIntAttrExternal()) &&
@@ -1413,90 +1037,90 @@ struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
 };
 
 struct RoomDataExternalBuilder {
-  typedef RoomDataExternal Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_serverId(uint16_t serverId) {
-    fbb_.AddElement<uint16_t>(RoomDataExternal::VT_SERVERID, serverId, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_serverId(u16 serverId) {
+    fbb_.AddElement<u16>(RoomDataExternal::VT_SERVERID, serverId, 0);
   }
-  void add_worldId(uint32_t worldId) {
-    fbb_.AddElement<uint32_t>(RoomDataExternal::VT_WORLDID, worldId, 0);
+  void add_worldId(u32 worldId) {
+    fbb_.AddElement<u32>(RoomDataExternal::VT_WORLDID, worldId, 0);
   }
-  void add_publicSlotNum(uint16_t publicSlotNum) {
-    fbb_.AddElement<uint16_t>(RoomDataExternal::VT_PUBLICSLOTNUM, publicSlotNum, 0);
+  void add_publicSlotNum(u16 publicSlotNum) {
+    fbb_.AddElement<u16>(RoomDataExternal::VT_PUBLICSLOTNUM, publicSlotNum, 0);
   }
-  void add_privateSlotNum(uint16_t privateSlotNum) {
-    fbb_.AddElement<uint16_t>(RoomDataExternal::VT_PRIVATESLOTNUM, privateSlotNum, 0);
+  void add_privateSlotNum(u16 privateSlotNum) {
+    fbb_.AddElement<u16>(RoomDataExternal::VT_PRIVATESLOTNUM, privateSlotNum, 0);
   }
-  void add_lobbyId(uint64_t lobbyId) {
-    fbb_.AddElement<uint64_t>(RoomDataExternal::VT_LOBBYID, lobbyId, 0);
+  void add_lobbyId(u64 lobbyId) {
+    fbb_.AddElement<u64>(RoomDataExternal::VT_LOBBYID, lobbyId, 0);
   }
-  void add_roomId(uint64_t roomId) {
-    fbb_.AddElement<uint64_t>(RoomDataExternal::VT_ROOMID, roomId, 0);
+  void add_roomId(u64 roomId) {
+    fbb_.AddElement<u64>(RoomDataExternal::VT_ROOMID, roomId, 0);
   }
-  void add_openPublicSlotNum(uint16_t openPublicSlotNum) {
-    fbb_.AddElement<uint16_t>(RoomDataExternal::VT_OPENPUBLICSLOTNUM, openPublicSlotNum, 0);
+  void add_openPublicSlotNum(u16 openPublicSlotNum) {
+    fbb_.AddElement<u16>(RoomDataExternal::VT_OPENPUBLICSLOTNUM, openPublicSlotNum, 0);
   }
-  void add_maxSlot(uint16_t maxSlot) {
-    fbb_.AddElement<uint16_t>(RoomDataExternal::VT_MAXSLOT, maxSlot, 0);
+  void add_maxSlot(u16 maxSlot) {
+    fbb_.AddElement<u16>(RoomDataExternal::VT_MAXSLOT, maxSlot, 0);
   }
-  void add_openPrivateSlotNum(uint16_t openPrivateSlotNum) {
-    fbb_.AddElement<uint16_t>(RoomDataExternal::VT_OPENPRIVATESLOTNUM, openPrivateSlotNum, 0);
+  void add_openPrivateSlotNum(u16 openPrivateSlotNum) {
+    fbb_.AddElement<u16>(RoomDataExternal::VT_OPENPRIVATESLOTNUM, openPrivateSlotNum, 0);
   }
-  void add_curMemberNum(uint16_t curMemberNum) {
-    fbb_.AddElement<uint16_t>(RoomDataExternal::VT_CURMEMBERNUM, curMemberNum, 0);
+  void add_curMemberNum(u16 curMemberNum) {
+    fbb_.AddElement<u16>(RoomDataExternal::VT_CURMEMBERNUM, curMemberNum, 0);
   }
-  void add_passwordSlotMask(uint64_t passwordSlotMask) {
-    fbb_.AddElement<uint64_t>(RoomDataExternal::VT_PASSWORDSLOTMASK, passwordSlotMask, 0);
+  void add_passwordSlotMask(u64 passwordSlotMask) {
+    fbb_.AddElement<u64>(RoomDataExternal::VT_PASSWORDSLOTMASK, passwordSlotMask, 0);
   }
-  void add_owner(::flatbuffers::Offset<UserInfo> owner) {
+  void add_owner(flatbuffers::Offset<UserInfo2> owner) {
     fbb_.AddOffset(RoomDataExternal::VT_OWNER, owner);
   }
-  void add_roomGroup(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomGroup>>> roomGroup) {
+  void add_roomGroup(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomGroup>>> roomGroup) {
     fbb_.AddOffset(RoomDataExternal::VT_ROOMGROUP, roomGroup);
   }
-  void add_flagAttr(uint32_t flagAttr) {
-    fbb_.AddElement<uint32_t>(RoomDataExternal::VT_FLAGATTR, flagAttr, 0);
+  void add_flagAttr(u32 flagAttr) {
+    fbb_.AddElement<u32>(RoomDataExternal::VT_FLAGATTR, flagAttr, 0);
   }
-  void add_roomSearchableIntAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal) {
+  void add_roomSearchableIntAttrExternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal) {
     fbb_.AddOffset(RoomDataExternal::VT_ROOMSEARCHABLEINTATTREXTERNAL, roomSearchableIntAttrExternal);
   }
-  void add_roomSearchableBinAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal) {
+  void add_roomSearchableBinAttrExternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal) {
     fbb_.AddOffset(RoomDataExternal::VT_ROOMSEARCHABLEBINATTREXTERNAL, roomSearchableBinAttrExternal);
   }
-  void add_roomBinAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomBinAttrExternal) {
+  void add_roomBinAttrExternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrExternal) {
     fbb_.AddOffset(RoomDataExternal::VT_ROOMBINATTREXTERNAL, roomBinAttrExternal);
   }
-  explicit RoomDataExternalBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit RoomDataExternalBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<RoomDataExternal> Finish() {
+  RoomDataExternalBuilder &operator=(const RoomDataExternalBuilder &);
+  flatbuffers::Offset<RoomDataExternal> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<RoomDataExternal>(end);
+    auto o = flatbuffers::Offset<RoomDataExternal>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<RoomDataExternal> CreateRoomDataExternal(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint16_t serverId = 0,
-    uint32_t worldId = 0,
-    uint16_t publicSlotNum = 0,
-    uint16_t privateSlotNum = 0,
-    uint64_t lobbyId = 0,
-    uint64_t roomId = 0,
-    uint16_t openPublicSlotNum = 0,
-    uint16_t maxSlot = 0,
-    uint16_t openPrivateSlotNum = 0,
-    uint16_t curMemberNum = 0,
-    uint64_t passwordSlotMask = 0,
-    ::flatbuffers::Offset<UserInfo> owner = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomGroup>>> roomGroup = 0,
-    uint32_t flagAttr = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomBinAttrExternal = 0) {
+inline flatbuffers::Offset<RoomDataExternal> CreateRoomDataExternal(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u16 serverId = 0,
+    u32 worldId = 0,
+    u16 publicSlotNum = 0,
+    u16 privateSlotNum = 0,
+    u64 lobbyId = 0,
+    u64 roomId = 0,
+    u16 openPublicSlotNum = 0,
+    u16 maxSlot = 0,
+    u16 openPrivateSlotNum = 0,
+    u16 curMemberNum = 0,
+    u64 passwordSlotMask = 0,
+    flatbuffers::Offset<UserInfo2> owner = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomGroup>>> roomGroup = 0,
+    u32 flagAttr = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrExternal = 0) {
   RoomDataExternalBuilder builder_(_fbb);
   builder_.add_passwordSlotMask(passwordSlotMask);
   builder_.add_roomId(roomId);
@@ -1518,29 +1142,29 @@ inline ::flatbuffers::Offset<RoomDataExternal> CreateRoomDataExternal(
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<RoomDataExternal> CreateRoomDataExternalDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint16_t serverId = 0,
-    uint32_t worldId = 0,
-    uint16_t publicSlotNum = 0,
-    uint16_t privateSlotNum = 0,
-    uint64_t lobbyId = 0,
-    uint64_t roomId = 0,
-    uint16_t openPublicSlotNum = 0,
-    uint16_t maxSlot = 0,
-    uint16_t openPrivateSlotNum = 0,
-    uint16_t curMemberNum = 0,
-    uint64_t passwordSlotMask = 0,
-    ::flatbuffers::Offset<UserInfo> owner = 0,
-    const std::vector<::flatbuffers::Offset<RoomGroup>> *roomGroup = nullptr,
-    uint32_t flagAttr = 0,
-    const std::vector<::flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal = nullptr,
-    const std::vector<::flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal = nullptr,
-    const std::vector<::flatbuffers::Offset<BinAttr>> *roomBinAttrExternal = nullptr) {
-  auto roomGroup__ = roomGroup ? _fbb.CreateVector<::flatbuffers::Offset<RoomGroup>>(*roomGroup) : 0;
-  auto roomSearchableIntAttrExternal__ = roomSearchableIntAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset<IntAttr>>(*roomSearchableIntAttrExternal) : 0;
-  auto roomSearchableBinAttrExternal__ = roomSearchableBinAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*roomSearchableBinAttrExternal) : 0;
-  auto roomBinAttrExternal__ = roomBinAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*roomBinAttrExternal) : 0;
+inline flatbuffers::Offset<RoomDataExternal> CreateRoomDataExternalDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u16 serverId = 0,
+    u32 worldId = 0,
+    u16 publicSlotNum = 0,
+    u16 privateSlotNum = 0,
+    u64 lobbyId = 0,
+    u64 roomId = 0,
+    u16 openPublicSlotNum = 0,
+    u16 maxSlot = 0,
+    u16 openPrivateSlotNum = 0,
+    u16 curMemberNum = 0,
+    u64 passwordSlotMask = 0,
+    flatbuffers::Offset<UserInfo2> owner = 0,
+    const std::vector<flatbuffers::Offset<RoomGroup>> *roomGroup = nullptr,
+    u32 flagAttr = 0,
+    const std::vector<flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal = nullptr,
+    const std::vector<flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal = nullptr,
+    const std::vector<flatbuffers::Offset<BinAttr>> *roomBinAttrExternal = nullptr) {
+  auto roomGroup__ = roomGroup ? _fbb.CreateVector<flatbuffers::Offset<RoomGroup>>(*roomGroup) : 0;
+  auto roomSearchableIntAttrExternal__ = roomSearchableIntAttrExternal ? _fbb.CreateVector<flatbuffers::Offset<IntAttr>>(*roomSearchableIntAttrExternal) : 0;
+  auto roomSearchableBinAttrExternal__ = roomSearchableBinAttrExternal ? _fbb.CreateVector<flatbuffers::Offset<BinAttr>>(*roomSearchableBinAttrExternal) : 0;
+  auto roomBinAttrExternal__ = roomBinAttrExternal ? _fbb.CreateVector<flatbuffers::Offset<BinAttr>>(*roomBinAttrExternal) : 0;
   return CreateRoomDataExternal(
       _fbb,
       serverId,
@@ -1562,21 +1186,20 @@ inline ::flatbuffers::Offset<RoomDataExternal> CreateRoomDataExternalDirect(
       roomBinAttrExternal__);
 }
 
-struct IntSearchFilter FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef IntSearchFilterBuilder Builder;
+struct IntSearchFilter FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_SEARCHOPERATOR = 4,
     VT_ATTR = 6
   };
-  uint8_t searchOperator() const {
-    return GetField<uint8_t>(VT_SEARCHOPERATOR, 0);
+  u8 searchOperator() const {
+    return GetField<u8>(VT_SEARCHOPERATOR, 0);
   }
   const IntAttr *attr() const {
     return GetPointer<const IntAttr *>(VT_ATTR);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint8_t>(verifier, VT_SEARCHOPERATOR, 1) &&
+           VerifyField<u8>(verifier, VT_SEARCHOPERATOR) &&
            VerifyOffset(verifier, VT_ATTR) &&
            verifier.VerifyTable(attr()) &&
            verifier.EndTable();
@@ -1584,51 +1207,50 @@ struct IntSearchFilter FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
 };
 
 struct IntSearchFilterBuilder {
-  typedef IntSearchFilter Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_searchOperator(uint8_t searchOperator) {
-    fbb_.AddElement<uint8_t>(IntSearchFilter::VT_SEARCHOPERATOR, searchOperator, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_searchOperator(u8 searchOperator) {
+    fbb_.AddElement<u8>(IntSearchFilter::VT_SEARCHOPERATOR, searchOperator, 0);
   }
-  void add_attr(::flatbuffers::Offset<IntAttr> attr) {
+  void add_attr(flatbuffers::Offset<IntAttr> attr) {
     fbb_.AddOffset(IntSearchFilter::VT_ATTR, attr);
   }
-  explicit IntSearchFilterBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit IntSearchFilterBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<IntSearchFilter> Finish() {
+  IntSearchFilterBuilder &operator=(const IntSearchFilterBuilder &);
+  flatbuffers::Offset<IntSearchFilter> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<IntSearchFilter>(end);
+    auto o = flatbuffers::Offset<IntSearchFilter>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<IntSearchFilter> CreateIntSearchFilter(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint8_t searchOperator = 0,
-    ::flatbuffers::Offset<IntAttr> attr = 0) {
+inline flatbuffers::Offset<IntSearchFilter> CreateIntSearchFilter(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u8 searchOperator = 0,
+    flatbuffers::Offset<IntAttr> attr = 0) {
   IntSearchFilterBuilder builder_(_fbb);
   builder_.add_attr(attr);
   builder_.add_searchOperator(searchOperator);
   return builder_.Finish();
 }
 
-struct BinSearchFilter FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef BinSearchFilterBuilder Builder;
+struct BinSearchFilter FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_SEARCHOPERATOR = 4,
     VT_ATTR = 6
   };
-  uint8_t searchOperator() const {
-    return GetField<uint8_t>(VT_SEARCHOPERATOR, 0);
+  u8 searchOperator() const {
+    return GetField<u8>(VT_SEARCHOPERATOR, 0);
   }
   const BinAttr *attr() const {
     return GetPointer<const BinAttr *>(VT_ATTR);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint8_t>(verifier, VT_SEARCHOPERATOR, 1) &&
+           VerifyField<u8>(verifier, VT_SEARCHOPERATOR) &&
            VerifyOffset(verifier, VT_ATTR) &&
            verifier.VerifyTable(attr()) &&
            verifier.EndTable();
@@ -1636,152 +1258,161 @@ struct BinSearchFilter FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
 };
 
 struct BinSearchFilterBuilder {
-  typedef BinSearchFilter Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_searchOperator(uint8_t searchOperator) {
-    fbb_.AddElement<uint8_t>(BinSearchFilter::VT_SEARCHOPERATOR, searchOperator, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_searchOperator(u8 searchOperator) {
+    fbb_.AddElement<u8>(BinSearchFilter::VT_SEARCHOPERATOR, searchOperator, 0);
   }
-  void add_attr(::flatbuffers::Offset<BinAttr> attr) {
+  void add_attr(flatbuffers::Offset<BinAttr> attr) {
     fbb_.AddOffset(BinSearchFilter::VT_ATTR, attr);
   }
-  explicit BinSearchFilterBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit BinSearchFilterBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<BinSearchFilter> Finish() {
+  BinSearchFilterBuilder &operator=(const BinSearchFilterBuilder &);
+  flatbuffers::Offset<BinSearchFilter> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<BinSearchFilter>(end);
+    auto o = flatbuffers::Offset<BinSearchFilter>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<BinSearchFilter> CreateBinSearchFilter(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint8_t searchOperator = 0,
-    ::flatbuffers::Offset<BinAttr> attr = 0) {
+inline flatbuffers::Offset<BinSearchFilter> CreateBinSearchFilter(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u8 searchOperator = 0,
+    flatbuffers::Offset<BinAttr> attr = 0) {
   BinSearchFilterBuilder builder_(_fbb);
   builder_.add_attr(attr);
   builder_.add_searchOperator(searchOperator);
   return builder_.Finish();
 }
 
-struct PresenceOptionData FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef PresenceOptionDataBuilder Builder;
+struct PresenceOptionData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_DATA = 4,
     VT_LEN = 6
   };
-  const ::flatbuffers::Vector<uint8_t> *data() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_DATA);
+  const flatbuffers::Vector<u8> *data() const {
+    return GetPointer<const flatbuffers::Vector<u8> *>(VT_DATA);
   }
-  uint32_t len() const {
-    return GetField<uint32_t>(VT_LEN, 0);
+  u32 len() const {
+    return GetField<u32>(VT_LEN, 0);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyOffset(verifier, VT_DATA) &&
            verifier.VerifyVector(data()) &&
-           VerifyField<uint32_t>(verifier, VT_LEN, 4) &&
+           VerifyField<u32>(verifier, VT_LEN) &&
            verifier.EndTable();
   }
 };
 
 struct PresenceOptionDataBuilder {
-  typedef PresenceOptionData Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_data(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data) {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_data(flatbuffers::Offset<flatbuffers::Vector<u8>> data) {
     fbb_.AddOffset(PresenceOptionData::VT_DATA, data);
   }
-  void add_len(uint32_t len) {
-    fbb_.AddElement<uint32_t>(PresenceOptionData::VT_LEN, len, 0);
+  void add_len(u32 len) {
+    fbb_.AddElement<u32>(PresenceOptionData::VT_LEN, len, 0);
   }
-  explicit PresenceOptionDataBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit PresenceOptionDataBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<PresenceOptionData> Finish() {
+  PresenceOptionDataBuilder &operator=(const PresenceOptionDataBuilder &);
+  flatbuffers::Offset<PresenceOptionData> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<PresenceOptionData>(end);
+    auto o = flatbuffers::Offset<PresenceOptionData>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<PresenceOptionData> CreatePresenceOptionData(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data = 0,
-    uint32_t len = 0) {
+inline flatbuffers::Offset<PresenceOptionData> CreatePresenceOptionData(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    flatbuffers::Offset<flatbuffers::Vector<u8>> data = 0,
+    u32 len = 0) {
   PresenceOptionDataBuilder builder_(_fbb);
   builder_.add_len(len);
   builder_.add_data(data);
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<PresenceOptionData> CreatePresenceOptionDataDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<uint8_t> *data = nullptr,
-    uint32_t len = 0) {
-  auto data__ = data ? _fbb.CreateVector<uint8_t>(*data) : 0;
+inline flatbuffers::Offset<PresenceOptionData> CreatePresenceOptionDataDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    const std::vector<u8> *data = nullptr,
+    u32 len = 0) {
+  auto data__ = data ? _fbb.CreateVector<u8>(*data) : 0;
   return CreatePresenceOptionData(
       _fbb,
       data__,
       len);
 }
 
-struct RoomGroupPasswordConfig FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef RoomGroupPasswordConfigBuilder Builder;
+struct RoomGroupPasswordConfig FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_GROUPID = 4,
     VT_WITHPASSWORD = 6
   };
-  uint8_t groupId() const {
-    return GetField<uint8_t>(VT_GROUPID, 0);
+  const flatbuffers::Vector<u8> *groupId() const {
+    return GetPointer<const flatbuffers::Vector<u8> *>(VT_GROUPID);
   }
   bool withPassword() const {
-    return GetField<uint8_t>(VT_WITHPASSWORD, 0) != 0;
+    return GetField<u8>(VT_WITHPASSWORD, 0) != 0;
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint8_t>(verifier, VT_GROUPID, 1) &&
-           VerifyField<uint8_t>(verifier, VT_WITHPASSWORD, 1) &&
+           VerifyOffset(verifier, VT_GROUPID) &&
+           verifier.VerifyVector(groupId()) &&
+           VerifyField<u8>(verifier, VT_WITHPASSWORD) &&
            verifier.EndTable();
   }
 };
 
 struct RoomGroupPasswordConfigBuilder {
-  typedef RoomGroupPasswordConfig Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_groupId(uint8_t groupId) {
-    fbb_.AddElement<uint8_t>(RoomGroupPasswordConfig::VT_GROUPID, groupId, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_groupId(flatbuffers::Offset<flatbuffers::Vector<u8>> groupId) {
+    fbb_.AddOffset(RoomGroupPasswordConfig::VT_GROUPID, groupId);
   }
   void add_withPassword(bool withPassword) {
-    fbb_.AddElement<uint8_t>(RoomGroupPasswordConfig::VT_WITHPASSWORD, static_cast<uint8_t>(withPassword), 0);
+    fbb_.AddElement<u8>(RoomGroupPasswordConfig::VT_WITHPASSWORD, static_cast<u8>(withPassword), 0);
   }
-  explicit RoomGroupPasswordConfigBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit RoomGroupPasswordConfigBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<RoomGroupPasswordConfig> Finish() {
+  RoomGroupPasswordConfigBuilder &operator=(const RoomGroupPasswordConfigBuilder &);
+  flatbuffers::Offset<RoomGroupPasswordConfig> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<RoomGroupPasswordConfig>(end);
+    auto o = flatbuffers::Offset<RoomGroupPasswordConfig>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<RoomGroupPasswordConfig> CreateRoomGroupPasswordConfig(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint8_t groupId = 0,
+inline flatbuffers::Offset<RoomGroupPasswordConfig> CreateRoomGroupPasswordConfig(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    flatbuffers::Offset<flatbuffers::Vector<u8>> groupId = 0,
     bool withPassword = false) {
   RoomGroupPasswordConfigBuilder builder_(_fbb);
-  builder_.add_withPassword(withPassword);
   builder_.add_groupId(groupId);
+  builder_.add_withPassword(withPassword);
   return builder_.Finish();
 }
 
-struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SearchRoomRequestBuilder Builder;
+inline flatbuffers::Offset<RoomGroupPasswordConfig> CreateRoomGroupPasswordConfigDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    const std::vector<u8> *groupId = nullptr,
+    bool withPassword = false) {
+  auto groupId__ = groupId ? _fbb.CreateVector<u8>(*groupId) : 0;
+  return CreateRoomGroupPasswordConfig(
+      _fbb,
+      groupId__,
+      withPassword);
+}
+
+struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_OPTION = 4,
     VT_WORLDID = 6,
@@ -1794,45 +1425,45 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table
     VT_BINFILTER = 20,
     VT_ATTRID = 22
   };
-  int32_t option() const {
-    return GetField<int32_t>(VT_OPTION, 0);
+  s32 option() const {
+    return GetField<s32>(VT_OPTION, 0);
   }
-  uint32_t worldId() const {
-    return GetField<uint32_t>(VT_WORLDID, 0);
+  u32 worldId() const {
+    return GetField<u32>(VT_WORLDID, 0);
   }
-  uint64_t lobbyId() const {
-    return GetField<uint64_t>(VT_LOBBYID, 0);
+  u64 lobbyId() const {
+    return GetField<u64>(VT_LOBBYID, 0);
   }
-  uint32_t rangeFilter_startIndex() const {
-    return GetField<uint32_t>(VT_RANGEFILTER_STARTINDEX, 0);
+  u32 rangeFilter_startIndex() const {
+    return GetField<u32>(VT_RANGEFILTER_STARTINDEX, 0);
   }
-  uint32_t rangeFilter_max() const {
-    return GetField<uint32_t>(VT_RANGEFILTER_MAX, 0);
+  u32 rangeFilter_max() const {
+    return GetField<u32>(VT_RANGEFILTER_MAX, 0);
   }
-  uint32_t flagFilter() const {
-    return GetField<uint32_t>(VT_FLAGFILTER, 0);
+  u32 flagFilter() const {
+    return GetField<u32>(VT_FLAGFILTER, 0);
   }
-  uint32_t flagAttr() const {
-    return GetField<uint32_t>(VT_FLAGATTR, 0);
+  u32 flagAttr() const {
+    return GetField<u32>(VT_FLAGATTR, 0);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<IntSearchFilter>> *intFilter() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<IntSearchFilter>> *>(VT_INTFILTER);
+  const flatbuffers::Vector<flatbuffers::Offset<IntSearchFilter>> *intFilter() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<IntSearchFilter>> *>(VT_INTFILTER);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinSearchFilter>> *binFilter() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinSearchFilter>> *>(VT_BINFILTER);
+  const flatbuffers::Vector<flatbuffers::Offset<BinSearchFilter>> *binFilter() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinSearchFilter>> *>(VT_BINFILTER);
   }
-  const ::flatbuffers::Vector<uint16_t> *attrId() const {
-    return GetPointer<const ::flatbuffers::Vector<uint16_t> *>(VT_ATTRID);
+  const flatbuffers::Vector<u16> *attrId() const {
+    return GetPointer<const flatbuffers::Vector<u16> *>(VT_ATTRID);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<int32_t>(verifier, VT_OPTION, 4) &&
-           VerifyField<uint32_t>(verifier, VT_WORLDID, 4) &&
-           VerifyField<uint64_t>(verifier, VT_LOBBYID, 8) &&
-           VerifyField<uint32_t>(verifier, VT_RANGEFILTER_STARTINDEX, 4) &&
-           VerifyField<uint32_t>(verifier, VT_RANGEFILTER_MAX, 4) &&
-           VerifyField<uint32_t>(verifier, VT_FLAGFILTER, 4) &&
-           VerifyField<uint32_t>(verifier, VT_FLAGATTR, 4) &&
+           VerifyField<s32>(verifier, VT_OPTION) &&
+           VerifyField<u32>(verifier, VT_WORLDID) &&
+           VerifyField<u64>(verifier, VT_LOBBYID) &&
+           VerifyField<u32>(verifier, VT_RANGEFILTER_STARTINDEX) &&
+           VerifyField<u32>(verifier, VT_RANGEFILTER_MAX) &&
+           VerifyField<u32>(verifier, VT_FLAGFILTER) &&
+           VerifyField<u32>(verifier, VT_FLAGATTR) &&
            VerifyOffset(verifier, VT_INTFILTER) &&
            verifier.VerifyVector(intFilter()) &&
            verifier.VerifyVectorOfTables(intFilter()) &&
@@ -1846,62 +1477,62 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table
 };
 
 struct SearchRoomRequestBuilder {
-  typedef SearchRoomRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_option(int32_t option) {
-    fbb_.AddElement<int32_t>(SearchRoomRequest::VT_OPTION, option, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_option(s32 option) {
+    fbb_.AddElement<s32>(SearchRoomRequest::VT_OPTION, option, 0);
   }
-  void add_worldId(uint32_t worldId) {
-    fbb_.AddElement<uint32_t>(SearchRoomRequest::VT_WORLDID, worldId, 0);
+  void add_worldId(u32 worldId) {
+    fbb_.AddElement<u32>(SearchRoomRequest::VT_WORLDID, worldId, 0);
   }
-  void add_lobbyId(uint64_t lobbyId) {
-    fbb_.AddElement<uint64_t>(SearchRoomRequest::VT_LOBBYID, lobbyId, 0);
+  void add_lobbyId(u64 lobbyId) {
+    fbb_.AddElement<u64>(SearchRoomRequest::VT_LOBBYID, lobbyId, 0);
   }
-  void add_rangeFilter_startIndex(uint32_t rangeFilter_startIndex) {
-    fbb_.AddElement<uint32_t>(SearchRoomRequest::VT_RANGEFILTER_STARTINDEX, rangeFilter_startIndex, 0);
+  void add_rangeFilter_startIndex(u32 rangeFilter_startIndex) {
+    fbb_.AddElement<u32>(SearchRoomRequest::VT_RANGEFILTER_STARTINDEX, rangeFilter_startIndex, 0);
   }
-  void add_rangeFilter_max(uint32_t rangeFilter_max) {
-    fbb_.AddElement<uint32_t>(SearchRoomRequest::VT_RANGEFILTER_MAX, rangeFilter_max, 0);
+  void add_rangeFilter_max(u32 rangeFilter_max) {
+    fbb_.AddElement<u32>(SearchRoomRequest::VT_RANGEFILTER_MAX, rangeFilter_max, 0);
   }
-  void add_flagFilter(uint32_t flagFilter) {
-    fbb_.AddElement<uint32_t>(SearchRoomRequest::VT_FLAGFILTER, flagFilter, 0);
+  void add_flagFilter(u32 flagFilter) {
+    fbb_.AddElement<u32>(SearchRoomRequest::VT_FLAGFILTER, flagFilter, 0);
   }
-  void add_flagAttr(uint32_t flagAttr) {
-    fbb_.AddElement<uint32_t>(SearchRoomRequest::VT_FLAGATTR, flagAttr, 0);
+  void add_flagAttr(u32 flagAttr) {
+    fbb_.AddElement<u32>(SearchRoomRequest::VT_FLAGATTR, flagAttr, 0);
   }
-  void add_intFilter(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<IntSearchFilter>>> intFilter) {
+  void add_intFilter(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntSearchFilter>>> intFilter) {
     fbb_.AddOffset(SearchRoomRequest::VT_INTFILTER, intFilter);
   }
-  void add_binFilter(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinSearchFilter>>> binFilter) {
+  void add_binFilter(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinSearchFilter>>> binFilter) {
     fbb_.AddOffset(SearchRoomRequest::VT_BINFILTER, binFilter);
   }
-  void add_attrId(::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> attrId) {
+  void add_attrId(flatbuffers::Offset<flatbuffers::Vector<u16>> attrId) {
     fbb_.AddOffset(SearchRoomRequest::VT_ATTRID, attrId);
   }
-  explicit SearchRoomRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit SearchRoomRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<SearchRoomRequest> Finish() {
+  SearchRoomRequestBuilder &operator=(const SearchRoomRequestBuilder &);
+  flatbuffers::Offset<SearchRoomRequest> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<SearchRoomRequest>(end);
+    auto o = flatbuffers::Offset<SearchRoomRequest>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<SearchRoomRequest> CreateSearchRoomRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    int32_t option = 0,
-    uint32_t worldId = 0,
-    uint64_t lobbyId = 0,
-    uint32_t rangeFilter_startIndex = 0,
-    uint32_t rangeFilter_max = 0,
-    uint32_t flagFilter = 0,
-    uint32_t flagAttr = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<IntSearchFilter>>> intFilter = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinSearchFilter>>> binFilter = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> attrId = 0) {
+inline flatbuffers::Offset<SearchRoomRequest> CreateSearchRoomRequest(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    s32 option = 0,
+    u32 worldId = 0,
+    u64 lobbyId = 0,
+    u32 rangeFilter_startIndex = 0,
+    u32 rangeFilter_max = 0,
+    u32 flagFilter = 0,
+    u32 flagAttr = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntSearchFilter>>> intFilter = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinSearchFilter>>> binFilter = 0,
+    flatbuffers::Offset<flatbuffers::Vector<u16>> attrId = 0) {
   SearchRoomRequestBuilder builder_(_fbb);
   builder_.add_lobbyId(lobbyId);
   builder_.add_attrId(attrId);
@@ -1916,21 +1547,21 @@ inline ::flatbuffers::Offset<SearchRoomRequest> CreateSearchRoomRequest(
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<SearchRoomRequest> CreateSearchRoomRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    int32_t option = 0,
-    uint32_t worldId = 0,
-    uint64_t lobbyId = 0,
-    uint32_t rangeFilter_startIndex = 0,
-    uint32_t rangeFilter_max = 0,
-    uint32_t flagFilter = 0,
-    uint32_t flagAttr = 0,
-    const std::vector<::flatbuffers::Offset<IntSearchFilter>> *intFilter = nullptr,
-    const std::vector<::flatbuffers::Offset<BinSearchFilter>> *binFilter = nullptr,
-    const std::vector<uint16_t> *attrId = nullptr) {
-  auto intFilter__ = intFilter ? _fbb.CreateVector<::flatbuffers::Offset<IntSearchFilter>>(*intFilter) : 0;
-  auto binFilter__ = binFilter ? _fbb.CreateVector<::flatbuffers::Offset<BinSearchFilter>>(*binFilter) : 0;
-  auto attrId__ = attrId ? _fbb.CreateVector<uint16_t>(*attrId) : 0;
+inline flatbuffers::Offset<SearchRoomRequest> CreateSearchRoomRequestDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    s32 option = 0,
+    u32 worldId = 0,
+    u64 lobbyId = 0,
+    u32 rangeFilter_startIndex = 0,
+    u32 rangeFilter_max = 0,
+    u32 flagFilter = 0,
+    u32 flagAttr = 0,
+    const std::vector<flatbuffers::Offset<IntSearchFilter>> *intFilter = nullptr,
+    const std::vector<flatbuffers::Offset<BinSearchFilter>> *binFilter = nullptr,
+    const std::vector<u16> *attrId = nullptr) {
+  auto intFilter__ = intFilter ? _fbb.CreateVector<flatbuffers::Offset<IntSearchFilter>>(*intFilter) : 0;
+  auto binFilter__ = binFilter ? _fbb.CreateVector<flatbuffers::Offset<BinSearchFilter>>(*binFilter) : 0;
+  auto attrId__ = attrId ? _fbb.CreateVector<u16>(*attrId) : 0;
   return CreateSearchRoomRequest(
       _fbb,
       option,
@@ -1945,26 +1576,30 @@ inline ::flatbuffers::Offset<SearchRoomRequest> CreateSearchRoomRequestDirect(
       attrId__);
 }
 
-struct SearchRoomResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SearchRoomResponseBuilder Builder;
+struct SearchRoomResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_STARTINDEX = 4,
     VT_TOTAL = 6,
-    VT_ROOMS = 8
+    VT_SIZE = 8,
+    VT_ROOMS = 10
   };
-  uint32_t startIndex() const {
-    return GetField<uint32_t>(VT_STARTINDEX, 0);
+  u32 startIndex() const {
+    return GetField<u32>(VT_STARTINDEX, 0);
   }
-  uint32_t total() const {
-    return GetField<uint32_t>(VT_TOTAL, 0);
+  u32 total() const {
+    return GetField<u32>(VT_TOTAL, 0);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<RoomDataExternal>> *rooms() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<RoomDataExternal>> *>(VT_ROOMS);
+  u32 size() const {
+    return GetField<u32>(VT_SIZE, 0);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  const flatbuffers::Vector<flatbuffers::Offset<RoomDataExternal>> *rooms() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<RoomDataExternal>> *>(VT_ROOMS);
+  }
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_STARTINDEX, 4) &&
-           VerifyField<uint32_t>(verifier, VT_TOTAL, 4) &&
+           VerifyField<u32>(verifier, VT_STARTINDEX) &&
+           VerifyField<u32>(verifier, VT_TOTAL) &&
+           VerifyField<u32>(verifier, VT_SIZE) &&
            VerifyOffset(verifier, VT_ROOMS) &&
            verifier.VerifyVector(rooms()) &&
            verifier.VerifyVectorOfTables(rooms()) &&
@@ -1973,56 +1608,62 @@ struct SearchRoomResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table
 };
 
 struct SearchRoomResponseBuilder {
-  typedef SearchRoomResponse Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_startIndex(uint32_t startIndex) {
-    fbb_.AddElement<uint32_t>(SearchRoomResponse::VT_STARTINDEX, startIndex, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_startIndex(u32 startIndex) {
+    fbb_.AddElement<u32>(SearchRoomResponse::VT_STARTINDEX, startIndex, 0);
   }
-  void add_total(uint32_t total) {
-    fbb_.AddElement<uint32_t>(SearchRoomResponse::VT_TOTAL, total, 0);
+  void add_total(u32 total) {
+    fbb_.AddElement<u32>(SearchRoomResponse::VT_TOTAL, total, 0);
   }
-  void add_rooms(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomDataExternal>>> rooms) {
+  void add_size(u32 size) {
+    fbb_.AddElement<u32>(SearchRoomResponse::VT_SIZE, size, 0);
+  }
+  void add_rooms(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomDataExternal>>> rooms) {
     fbb_.AddOffset(SearchRoomResponse::VT_ROOMS, rooms);
   }
-  explicit SearchRoomResponseBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit SearchRoomResponseBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<SearchRoomResponse> Finish() {
+  SearchRoomResponseBuilder &operator=(const SearchRoomResponseBuilder &);
+  flatbuffers::Offset<SearchRoomResponse> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<SearchRoomResponse>(end);
+    auto o = flatbuffers::Offset<SearchRoomResponse>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<SearchRoomResponse> CreateSearchRoomResponse(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t startIndex = 0,
-    uint32_t total = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomDataExternal>>> rooms = 0) {
+inline flatbuffers::Offset<SearchRoomResponse> CreateSearchRoomResponse(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u32 startIndex = 0,
+    u32 total = 0,
+    u32 size = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomDataExternal>>> rooms = 0) {
   SearchRoomResponseBuilder builder_(_fbb);
   builder_.add_rooms(rooms);
+  builder_.add_size(size);
   builder_.add_total(total);
   builder_.add_startIndex(startIndex);
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<SearchRoomResponse> CreateSearchRoomResponseDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t startIndex = 0,
-    uint32_t total = 0,
-    const std::vector<::flatbuffers::Offset<RoomDataExternal>> *rooms = nullptr) {
-  auto rooms__ = rooms ? _fbb.CreateVector<::flatbuffers::Offset<RoomDataExternal>>(*rooms) : 0;
+inline flatbuffers::Offset<SearchRoomResponse> CreateSearchRoomResponseDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u32 startIndex = 0,
+    u32 total = 0,
+    u32 size = 0,
+    const std::vector<flatbuffers::Offset<RoomDataExternal>> *rooms = nullptr) {
+  auto rooms__ = rooms ? _fbb.CreateVector<flatbuffers::Offset<RoomDataExternal>>(*rooms) : 0;
   return CreateSearchRoomResponse(
       _fbb,
       startIndex,
       total,
+      size,
       rooms__);
 }
 
-struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef CreateJoinRoomRequestBuilder Builder;
+struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_WORLDID = 4,
     VT_LOBBYID = 6,
@@ -2042,63 +1683,63 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Ta
     VT_TEAMID = 34,
     VT_SIGOPTPARAM = 36
   };
-  uint32_t worldId() const {
-    return GetField<uint32_t>(VT_WORLDID, 0);
+  u32 worldId() const {
+    return GetField<u32>(VT_WORLDID, 0);
   }
-  uint64_t lobbyId() const {
-    return GetField<uint64_t>(VT_LOBBYID, 0);
+  u64 lobbyId() const {
+    return GetField<u64>(VT_LOBBYID, 0);
   }
-  uint32_t maxSlot() const {
-    return GetField<uint32_t>(VT_MAXSLOT, 0);
+  u32 maxSlot() const {
+    return GetField<u32>(VT_MAXSLOT, 0);
   }
-  uint32_t flagAttr() const {
-    return GetField<uint32_t>(VT_FLAGATTR, 0);
+  u32 flagAttr() const {
+    return GetField<u32>(VT_FLAGATTR, 0);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *roomBinAttrInternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *>(VT_ROOMBINATTRINTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *roomBinAttrInternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *>(VT_ROOMBINATTRINTERNAL);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<IntAttr>> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<IntAttr>> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *>(VT_ROOMSEARCHABLEBINATTREXTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *>(VT_ROOMSEARCHABLEBINATTREXTERNAL);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *roomBinAttrExternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *>(VT_ROOMBINATTREXTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *roomBinAttrExternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *>(VT_ROOMBINATTREXTERNAL);
   }
-  const ::flatbuffers::Vector<uint8_t> *roomPassword() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_ROOMPASSWORD);
+  const flatbuffers::Vector<u8> *roomPassword() const {
+    return GetPointer<const flatbuffers::Vector<u8> *>(VT_ROOMPASSWORD);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<GroupConfig>> *groupConfig() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<GroupConfig>> *>(VT_GROUPCONFIG);
+  const flatbuffers::Vector<flatbuffers::Offset<GroupConfig>> *groupConfig() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<GroupConfig>> *>(VT_GROUPCONFIG);
   }
-  uint64_t passwordSlotMask() const {
-    return GetField<uint64_t>(VT_PASSWORDSLOTMASK, 0);
+  u64 passwordSlotMask() const {
+    return GetField<u64>(VT_PASSWORDSLOTMASK, 0);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>> *allowedUser() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>> *>(VT_ALLOWEDUSER);
+  const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *allowedUser() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *>(VT_ALLOWEDUSER);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>> *blockedUser() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>> *>(VT_BLOCKEDUSER);
+  const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *blockedUser() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *>(VT_BLOCKEDUSER);
   }
-  const ::flatbuffers::Vector<uint8_t> *joinRoomGroupLabel() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_JOINROOMGROUPLABEL);
+  const flatbuffers::Vector<u8> *joinRoomGroupLabel() const {
+    return GetPointer<const flatbuffers::Vector<u8> *>(VT_JOINROOMGROUPLABEL);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *roomMemberBinAttrInternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *>(VT_ROOMMEMBERBINATTRINTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *roomMemberBinAttrInternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *>(VT_ROOMMEMBERBINATTRINTERNAL);
   }
-  uint8_t teamId() const {
-    return GetField<uint8_t>(VT_TEAMID, 0);
+  u8 teamId() const {
+    return GetField<u8>(VT_TEAMID, 0);
   }
   const OptParam *sigOptParam() const {
     return GetPointer<const OptParam *>(VT_SIGOPTPARAM);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_WORLDID, 4) &&
-           VerifyField<uint64_t>(verifier, VT_LOBBYID, 8) &&
-           VerifyField<uint32_t>(verifier, VT_MAXSLOT, 4) &&
-           VerifyField<uint32_t>(verifier, VT_FLAGATTR, 4) &&
+           VerifyField<u32>(verifier, VT_WORLDID) &&
+           VerifyField<u64>(verifier, VT_LOBBYID) &&
+           VerifyField<u32>(verifier, VT_MAXSLOT) &&
+           VerifyField<u32>(verifier, VT_FLAGATTR) &&
            VerifyOffset(verifier, VT_ROOMBINATTRINTERNAL) &&
            verifier.VerifyVector(roomBinAttrInternal()) &&
            verifier.VerifyVectorOfTables(roomBinAttrInternal()) &&
@@ -2116,7 +1757,7 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Ta
            VerifyOffset(verifier, VT_GROUPCONFIG) &&
            verifier.VerifyVector(groupConfig()) &&
            verifier.VerifyVectorOfTables(groupConfig()) &&
-           VerifyField<uint64_t>(verifier, VT_PASSWORDSLOTMASK, 8) &&
+           VerifyField<u64>(verifier, VT_PASSWORDSLOTMASK) &&
            VerifyOffset(verifier, VT_ALLOWEDUSER) &&
            verifier.VerifyVector(allowedUser()) &&
            verifier.VerifyVectorOfStrings(allowedUser()) &&
@@ -2128,7 +1769,7 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Ta
            VerifyOffset(verifier, VT_ROOMMEMBERBINATTRINTERNAL) &&
            verifier.VerifyVector(roomMemberBinAttrInternal()) &&
            verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) &&
-           VerifyField<uint8_t>(verifier, VT_TEAMID, 1) &&
+           VerifyField<u8>(verifier, VT_TEAMID) &&
            VerifyOffset(verifier, VT_SIGOPTPARAM) &&
            verifier.VerifyTable(sigOptParam()) &&
            verifier.EndTable();
@@ -2136,90 +1777,90 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Ta
 };
 
 struct CreateJoinRoomRequestBuilder {
-  typedef CreateJoinRoomRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_worldId(uint32_t worldId) {
-    fbb_.AddElement<uint32_t>(CreateJoinRoomRequest::VT_WORLDID, worldId, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_worldId(u32 worldId) {
+    fbb_.AddElement<u32>(CreateJoinRoomRequest::VT_WORLDID, worldId, 0);
   }
-  void add_lobbyId(uint64_t lobbyId) {
-    fbb_.AddElement<uint64_t>(CreateJoinRoomRequest::VT_LOBBYID, lobbyId, 0);
+  void add_lobbyId(u64 lobbyId) {
+    fbb_.AddElement<u64>(CreateJoinRoomRequest::VT_LOBBYID, lobbyId, 0);
   }
-  void add_maxSlot(uint32_t maxSlot) {
-    fbb_.AddElement<uint32_t>(CreateJoinRoomRequest::VT_MAXSLOT, maxSlot, 0);
+  void add_maxSlot(u32 maxSlot) {
+    fbb_.AddElement<u32>(CreateJoinRoomRequest::VT_MAXSLOT, maxSlot, 0);
   }
-  void add_flagAttr(uint32_t flagAttr) {
-    fbb_.AddElement<uint32_t>(CreateJoinRoomRequest::VT_FLAGATTR, flagAttr, 0);
+  void add_flagAttr(u32 flagAttr) {
+    fbb_.AddElement<u32>(CreateJoinRoomRequest::VT_FLAGATTR, flagAttr, 0);
   }
-  void add_roomBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomBinAttrInternal) {
+  void add_roomBinAttrInternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrInternal) {
     fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMBINATTRINTERNAL, roomBinAttrInternal);
   }
-  void add_roomSearchableIntAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal) {
+  void add_roomSearchableIntAttrExternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal) {
     fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMSEARCHABLEINTATTREXTERNAL, roomSearchableIntAttrExternal);
   }
-  void add_roomSearchableBinAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal) {
+  void add_roomSearchableBinAttrExternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal) {
     fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMSEARCHABLEBINATTREXTERNAL, roomSearchableBinAttrExternal);
   }
-  void add_roomBinAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomBinAttrExternal) {
+  void add_roomBinAttrExternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrExternal) {
     fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMBINATTREXTERNAL, roomBinAttrExternal);
   }
-  void add_roomPassword(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> roomPassword) {
+  void add_roomPassword(flatbuffers::Offset<flatbuffers::Vector<u8>> roomPassword) {
     fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMPASSWORD, roomPassword);
   }
-  void add_groupConfig(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<GroupConfig>>> groupConfig) {
+  void add_groupConfig(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<GroupConfig>>> groupConfig) {
     fbb_.AddOffset(CreateJoinRoomRequest::VT_GROUPCONFIG, groupConfig);
   }
-  void add_passwordSlotMask(uint64_t passwordSlotMask) {
-    fbb_.AddElement<uint64_t>(CreateJoinRoomRequest::VT_PASSWORDSLOTMASK, passwordSlotMask, 0);
+  void add_passwordSlotMask(u64 passwordSlotMask) {
+    fbb_.AddElement<u64>(CreateJoinRoomRequest::VT_PASSWORDSLOTMASK, passwordSlotMask, 0);
   }
-  void add_allowedUser(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> allowedUser) {
+  void add_allowedUser(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> allowedUser) {
     fbb_.AddOffset(CreateJoinRoomRequest::VT_ALLOWEDUSER, allowedUser);
   }
-  void add_blockedUser(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> blockedUser) {
+  void add_blockedUser(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> blockedUser) {
     fbb_.AddOffset(CreateJoinRoomRequest::VT_BLOCKEDUSER, blockedUser);
   }
-  void add_joinRoomGroupLabel(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> joinRoomGroupLabel) {
+  void add_joinRoomGroupLabel(flatbuffers::Offset<flatbuffers::Vector<u8>> joinRoomGroupLabel) {
     fbb_.AddOffset(CreateJoinRoomRequest::VT_JOINROOMGROUPLABEL, joinRoomGroupLabel);
   }
-  void add_roomMemberBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomMemberBinAttrInternal) {
+  void add_roomMemberBinAttrInternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomMemberBinAttrInternal) {
     fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMMEMBERBINATTRINTERNAL, roomMemberBinAttrInternal);
   }
-  void add_teamId(uint8_t teamId) {
-    fbb_.AddElement<uint8_t>(CreateJoinRoomRequest::VT_TEAMID, teamId, 0);
+  void add_teamId(u8 teamId) {
+    fbb_.AddElement<u8>(CreateJoinRoomRequest::VT_TEAMID, teamId, 0);
   }
-  void add_sigOptParam(::flatbuffers::Offset<OptParam> sigOptParam) {
+  void add_sigOptParam(flatbuffers::Offset<OptParam> sigOptParam) {
     fbb_.AddOffset(CreateJoinRoomRequest::VT_SIGOPTPARAM, sigOptParam);
   }
-  explicit CreateJoinRoomRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit CreateJoinRoomRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<CreateJoinRoomRequest> Finish() {
+  CreateJoinRoomRequestBuilder &operator=(const CreateJoinRoomRequestBuilder &);
+  flatbuffers::Offset<CreateJoinRoomRequest> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<CreateJoinRoomRequest>(end);
+    auto o = flatbuffers::Offset<CreateJoinRoomRequest>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<CreateJoinRoomRequest> CreateCreateJoinRoomRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t worldId = 0,
-    uint64_t lobbyId = 0,
-    uint32_t maxSlot = 0,
-    uint32_t flagAttr = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomBinAttrInternal = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomBinAttrExternal = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> roomPassword = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<GroupConfig>>> groupConfig = 0,
-    uint64_t passwordSlotMask = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> allowedUser = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> blockedUser = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> joinRoomGroupLabel = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomMemberBinAttrInternal = 0,
-    uint8_t teamId = 0,
-    ::flatbuffers::Offset<OptParam> sigOptParam = 0) {
+inline flatbuffers::Offset<CreateJoinRoomRequest> CreateCreateJoinRoomRequest(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u32 worldId = 0,
+    u64 lobbyId = 0,
+    u32 maxSlot = 0,
+    u32 flagAttr = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrInternal = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrExternal = 0,
+    flatbuffers::Offset<flatbuffers::Vector<u8>> roomPassword = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<GroupConfig>>> groupConfig = 0,
+    u64 passwordSlotMask = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> allowedUser = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> blockedUser = 0,
+    flatbuffers::Offset<flatbuffers::Vector<u8>> joinRoomGroupLabel = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomMemberBinAttrInternal = 0,
+    u8 teamId = 0,
+    flatbuffers::Offset<OptParam> sigOptParam = 0) {
   CreateJoinRoomRequestBuilder builder_(_fbb);
   builder_.add_passwordSlotMask(passwordSlotMask);
   builder_.add_lobbyId(lobbyId);
@@ -2241,35 +1882,35 @@ inline ::flatbuffers::Offset<CreateJoinRoomRequest> CreateCreateJoinRoomRequest(
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<CreateJoinRoomRequest> CreateCreateJoinRoomRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t worldId = 0,
-    uint64_t lobbyId = 0,
-    uint32_t maxSlot = 0,
-    uint32_t flagAttr = 0,
-    const std::vector<::flatbuffers::Offset<BinAttr>> *roomBinAttrInternal = nullptr,
-    const std::vector<::flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal = nullptr,
-    const std::vector<::flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal = nullptr,
-    const std::vector<::flatbuffers::Offset<BinAttr>> *roomBinAttrExternal = nullptr,
-    const std::vector<uint8_t> *roomPassword = nullptr,
-    const std::vector<::flatbuffers::Offset<GroupConfig>> *groupConfig = nullptr,
-    uint64_t passwordSlotMask = 0,
-    const std::vector<::flatbuffers::Offset<::flatbuffers::String>> *allowedUser = nullptr,
-    const std::vector<::flatbuffers::Offset<::flatbuffers::String>> *blockedUser = nullptr,
-    const std::vector<uint8_t> *joinRoomGroupLabel = nullptr,
-    const std::vector<::flatbuffers::Offset<BinAttr>> *roomMemberBinAttrInternal = nullptr,
-    uint8_t teamId = 0,
-    ::flatbuffers::Offset<OptParam> sigOptParam = 0) {
-  auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*roomBinAttrInternal) : 0;
-  auto roomSearchableIntAttrExternal__ = roomSearchableIntAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset<IntAttr>>(*roomSearchableIntAttrExternal) : 0;
-  auto roomSearchableBinAttrExternal__ = roomSearchableBinAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*roomSearchableBinAttrExternal) : 0;
-  auto roomBinAttrExternal__ = roomBinAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*roomBinAttrExternal) : 0;
-  auto roomPassword__ = roomPassword ? _fbb.CreateVector<uint8_t>(*roomPassword) : 0;
-  auto groupConfig__ = groupConfig ? _fbb.CreateVector<::flatbuffers::Offset<GroupConfig>>(*groupConfig) : 0;
-  auto allowedUser__ = allowedUser ? _fbb.CreateVector<::flatbuffers::Offset<::flatbuffers::String>>(*allowedUser) : 0;
-  auto blockedUser__ = blockedUser ? _fbb.CreateVector<::flatbuffers::Offset<::flatbuffers::String>>(*blockedUser) : 0;
-  auto joinRoomGroupLabel__ = joinRoomGroupLabel ? _fbb.CreateVector<uint8_t>(*joinRoomGroupLabel) : 0;
-  auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*roomMemberBinAttrInternal) : 0;
+inline flatbuffers::Offset<CreateJoinRoomRequest> CreateCreateJoinRoomRequestDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u32 worldId = 0,
+    u64 lobbyId = 0,
+    u32 maxSlot = 0,
+    u32 flagAttr = 0,
+    const std::vector<flatbuffers::Offset<BinAttr>> *roomBinAttrInternal = nullptr,
+    const std::vector<flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal = nullptr,
+    const std::vector<flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal = nullptr,
+    const std::vector<flatbuffers::Offset<BinAttr>> *roomBinAttrExternal = nullptr,
+    const std::vector<u8> *roomPassword = nullptr,
+    const std::vector<flatbuffers::Offset<GroupConfig>> *groupConfig = nullptr,
+    u64 passwordSlotMask = 0,
+    const std::vector<flatbuffers::Offset<flatbuffers::String>> *allowedUser = nullptr,
+    const std::vector<flatbuffers::Offset<flatbuffers::String>> *blockedUser = nullptr,
+    const std::vector<u8> *joinRoomGroupLabel = nullptr,
+    const std::vector<flatbuffers::Offset<BinAttr>> *roomMemberBinAttrInternal = nullptr,
+    u8 teamId = 0,
+    flatbuffers::Offset<OptParam> sigOptParam = 0) {
+  auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector<flatbuffers::Offset<BinAttr>>(*roomBinAttrInternal) : 0;
+  auto roomSearchableIntAttrExternal__ = roomSearchableIntAttrExternal ? _fbb.CreateVector<flatbuffers::Offset<IntAttr>>(*roomSearchableIntAttrExternal) : 0;
+  auto roomSearchableBinAttrExternal__ = roomSearchableBinAttrExternal ? _fbb.CreateVector<flatbuffers::Offset<BinAttr>>(*roomSearchableBinAttrExternal) : 0;
+  auto roomBinAttrExternal__ = roomBinAttrExternal ? _fbb.CreateVector<flatbuffers::Offset<BinAttr>>(*roomBinAttrExternal) : 0;
+  auto roomPassword__ = roomPassword ? _fbb.CreateVector<u8>(*roomPassword) : 0;
+  auto groupConfig__ = groupConfig ? _fbb.CreateVector<flatbuffers::Offset<GroupConfig>>(*groupConfig) : 0;
+  auto allowedUser__ = allowedUser ? _fbb.CreateVector<flatbuffers::Offset<flatbuffers::String>>(*allowedUser) : 0;
+  auto blockedUser__ = blockedUser ? _fbb.CreateVector<flatbuffers::Offset<flatbuffers::String>>(*blockedUser) : 0;
+  auto joinRoomGroupLabel__ = joinRoomGroupLabel ? _fbb.CreateVector<u8>(*joinRoomGroupLabel) : 0;
+  auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector<flatbuffers::Offset<BinAttr>>(*roomMemberBinAttrInternal) : 0;
   return CreateCreateJoinRoomRequest(
       _fbb,
       worldId,
@@ -2291,8 +1932,7 @@ inline ::flatbuffers::Offset<CreateJoinRoomRequest> CreateCreateJoinRoomRequestD
       sigOptParam);
 }
 
-struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef JoinRoomRequestBuilder Builder;
+struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_ROOMID = 4,
     VT_ROOMPASSWORD = 6,
@@ -2301,27 +1941,27 @@ struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     VT_OPTDATA = 12,
     VT_TEAMID = 14
   };
-  uint64_t roomId() const {
-    return GetField<uint64_t>(VT_ROOMID, 0);
+  u64 roomId() const {
+    return GetField<u64>(VT_ROOMID, 0);
   }
-  const ::flatbuffers::Vector<uint8_t> *roomPassword() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_ROOMPASSWORD);
+  const flatbuffers::Vector<u8> *roomPassword() const {
+    return GetPointer<const flatbuffers::Vector<u8> *>(VT_ROOMPASSWORD);
   }
-  const ::flatbuffers::Vector<uint8_t> *joinRoomGroupLabel() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_JOINROOMGROUPLABEL);
+  const flatbuffers::Vector<u8> *joinRoomGroupLabel() const {
+    return GetPointer<const flatbuffers::Vector<u8> *>(VT_JOINROOMGROUPLABEL);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *roomMemberBinAttrInternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *>(VT_ROOMMEMBERBINATTRINTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *roomMemberBinAttrInternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *>(VT_ROOMMEMBERBINATTRINTERNAL);
   }
   const PresenceOptionData *optData() const {
     return GetPointer<const PresenceOptionData *>(VT_OPTDATA);
   }
-  uint8_t teamId() const {
-    return GetField<uint8_t>(VT_TEAMID, 0);
+  u8 teamId() const {
+    return GetField<u8>(VT_TEAMID, 0);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint64_t>(verifier, VT_ROOMID, 8) &&
+           VerifyField<u64>(verifier, VT_ROOMID) &&
            VerifyOffset(verifier, VT_ROOMPASSWORD) &&
            verifier.VerifyVector(roomPassword()) &&
            VerifyOffset(verifier, VT_JOINROOMGROUPLABEL) &&
@@ -2331,52 +1971,52 @@ struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
            verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) &&
            VerifyOffset(verifier, VT_OPTDATA) &&
            verifier.VerifyTable(optData()) &&
-           VerifyField<uint8_t>(verifier, VT_TEAMID, 1) &&
+           VerifyField<u8>(verifier, VT_TEAMID) &&
            verifier.EndTable();
   }
 };
 
 struct JoinRoomRequestBuilder {
-  typedef JoinRoomRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_roomId(uint64_t roomId) {
-    fbb_.AddElement<uint64_t>(JoinRoomRequest::VT_ROOMID, roomId, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_roomId(u64 roomId) {
+    fbb_.AddElement<u64>(JoinRoomRequest::VT_ROOMID, roomId, 0);
   }
-  void add_roomPassword(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> roomPassword) {
+  void add_roomPassword(flatbuffers::Offset<flatbuffers::Vector<u8>> roomPassword) {
     fbb_.AddOffset(JoinRoomRequest::VT_ROOMPASSWORD, roomPassword);
   }
-  void add_joinRoomGroupLabel(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> joinRoomGroupLabel) {
+  void add_joinRoomGroupLabel(flatbuffers::Offset<flatbuffers::Vector<u8>> joinRoomGroupLabel) {
     fbb_.AddOffset(JoinRoomRequest::VT_JOINROOMGROUPLABEL, joinRoomGroupLabel);
   }
-  void add_roomMemberBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomMemberBinAttrInternal) {
+  void add_roomMemberBinAttrInternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomMemberBinAttrInternal) {
     fbb_.AddOffset(JoinRoomRequest::VT_ROOMMEMBERBINATTRINTERNAL, roomMemberBinAttrInternal);
   }
-  void add_optData(::flatbuffers::Offset<PresenceOptionData> optData) {
+  void add_optData(flatbuffers::Offset<PresenceOptionData> optData) {
     fbb_.AddOffset(JoinRoomRequest::VT_OPTDATA, optData);
   }
-  void add_teamId(uint8_t teamId) {
-    fbb_.AddElement<uint8_t>(JoinRoomRequest::VT_TEAMID, teamId, 0);
+  void add_teamId(u8 teamId) {
+    fbb_.AddElement<u8>(JoinRoomRequest::VT_TEAMID, teamId, 0);
   }
-  explicit JoinRoomRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit JoinRoomRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<JoinRoomRequest> Finish() {
+  JoinRoomRequestBuilder &operator=(const JoinRoomRequestBuilder &);
+  flatbuffers::Offset<JoinRoomRequest> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<JoinRoomRequest>(end);
+    auto o = flatbuffers::Offset<JoinRoomRequest>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<JoinRoomRequest> CreateJoinRoomRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> roomPassword = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> joinRoomGroupLabel = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomMemberBinAttrInternal = 0,
-    ::flatbuffers::Offset<PresenceOptionData> optData = 0,
-    uint8_t teamId = 0) {
+inline flatbuffers::Offset<JoinRoomRequest> CreateJoinRoomRequest(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u64 roomId = 0,
+    flatbuffers::Offset<flatbuffers::Vector<u8>> roomPassword = 0,
+    flatbuffers::Offset<flatbuffers::Vector<u8>> joinRoomGroupLabel = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomMemberBinAttrInternal = 0,
+    flatbuffers::Offset<PresenceOptionData> optData = 0,
+    u8 teamId = 0) {
   JoinRoomRequestBuilder builder_(_fbb);
   builder_.add_roomId(roomId);
   builder_.add_optData(optData);
@@ -2387,17 +2027,17 @@ inline ::flatbuffers::Offset<JoinRoomRequest> CreateJoinRoomRequest(
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<JoinRoomRequest> CreateJoinRoomRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    const std::vector<uint8_t> *roomPassword = nullptr,
-    const std::vector<uint8_t> *joinRoomGroupLabel = nullptr,
-    const std::vector<::flatbuffers::Offset<BinAttr>> *roomMemberBinAttrInternal = nullptr,
-    ::flatbuffers::Offset<PresenceOptionData> optData = 0,
-    uint8_t teamId = 0) {
-  auto roomPassword__ = roomPassword ? _fbb.CreateVector<uint8_t>(*roomPassword) : 0;
-  auto joinRoomGroupLabel__ = joinRoomGroupLabel ? _fbb.CreateVector<uint8_t>(*joinRoomGroupLabel) : 0;
-  auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*roomMemberBinAttrInternal) : 0;
+inline flatbuffers::Offset<JoinRoomRequest> CreateJoinRoomRequestDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u64 roomId = 0,
+    const std::vector<u8> *roomPassword = nullptr,
+    const std::vector<u8> *joinRoomGroupLabel = nullptr,
+    const std::vector<flatbuffers::Offset<BinAttr>> *roomMemberBinAttrInternal = nullptr,
+    flatbuffers::Offset<PresenceOptionData> optData = 0,
+    u8 teamId = 0) {
+  auto roomPassword__ = roomPassword ? _fbb.CreateVector<u8>(*roomPassword) : 0;
+  auto joinRoomGroupLabel__ = joinRoomGroupLabel ? _fbb.CreateVector<u8>(*joinRoomGroupLabel) : 0;
+  auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector<flatbuffers::Offset<BinAttr>>(*roomMemberBinAttrInternal) : 0;
   return CreateJoinRoomRequest(
       _fbb,
       roomId,
@@ -2408,86 +2048,20 @@ inline ::flatbuffers::Offset<JoinRoomRequest> CreateJoinRoomRequestDirect(
       teamId);
 }
 
-struct JoinRoomResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef JoinRoomResponseBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ROOM_DATA = 4,
-    VT_SIGNALING_DATA = 6
-  };
-  const RoomDataInternal *room_data() const {
-    return GetPointer<const RoomDataInternal *>(VT_ROOM_DATA);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<Matching2SignalingInfo>> *signaling_data() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<Matching2SignalingInfo>> *>(VT_SIGNALING_DATA);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_ROOM_DATA) &&
-           verifier.VerifyTable(room_data()) &&
-           VerifyOffset(verifier, VT_SIGNALING_DATA) &&
-           verifier.VerifyVector(signaling_data()) &&
-           verifier.VerifyVectorOfTables(signaling_data()) &&
-           verifier.EndTable();
-  }
-};
-
-struct JoinRoomResponseBuilder {
-  typedef JoinRoomResponse Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_room_data(::flatbuffers::Offset<RoomDataInternal> room_data) {
-    fbb_.AddOffset(JoinRoomResponse::VT_ROOM_DATA, room_data);
-  }
-  void add_signaling_data(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<Matching2SignalingInfo>>> signaling_data) {
-    fbb_.AddOffset(JoinRoomResponse::VT_SIGNALING_DATA, signaling_data);
-  }
-  explicit JoinRoomResponseBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<JoinRoomResponse> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<JoinRoomResponse>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<JoinRoomResponse> CreateJoinRoomResponse(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<RoomDataInternal> room_data = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<Matching2SignalingInfo>>> signaling_data = 0) {
-  JoinRoomResponseBuilder builder_(_fbb);
-  builder_.add_signaling_data(signaling_data);
-  builder_.add_room_data(room_data);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<JoinRoomResponse> CreateJoinRoomResponseDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<RoomDataInternal> room_data = 0,
-    const std::vector<::flatbuffers::Offset<Matching2SignalingInfo>> *signaling_data = nullptr) {
-  auto signaling_data__ = signaling_data ? _fbb.CreateVector<::flatbuffers::Offset<Matching2SignalingInfo>>(*signaling_data) : 0;
-  return CreateJoinRoomResponse(
-      _fbb,
-      room_data,
-      signaling_data__);
-}
-
-struct LeaveRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef LeaveRoomRequestBuilder Builder;
+struct LeaveRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_ROOMID = 4,
     VT_OPTDATA = 6
   };
-  uint64_t roomId() const {
-    return GetField<uint64_t>(VT_ROOMID, 0);
+  u64 roomId() const {
+    return GetField<u64>(VT_ROOMID, 0);
   }
   const PresenceOptionData *optData() const {
     return GetPointer<const PresenceOptionData *>(VT_OPTDATA);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint64_t>(verifier, VT_ROOMID, 8) &&
+           VerifyField<u64>(verifier, VT_ROOMID) &&
            VerifyOffset(verifier, VT_OPTDATA) &&
            verifier.VerifyTable(optData()) &&
            verifier.EndTable();
@@ -2495,176 +2069,58 @@ struct LeaveRoomRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
 };
 
 struct LeaveRoomRequestBuilder {
-  typedef LeaveRoomRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_roomId(uint64_t roomId) {
-    fbb_.AddElement<uint64_t>(LeaveRoomRequest::VT_ROOMID, roomId, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_roomId(u64 roomId) {
+    fbb_.AddElement<u64>(LeaveRoomRequest::VT_ROOMID, roomId, 0);
   }
-  void add_optData(::flatbuffers::Offset<PresenceOptionData> optData) {
+  void add_optData(flatbuffers::Offset<PresenceOptionData> optData) {
     fbb_.AddOffset(LeaveRoomRequest::VT_OPTDATA, optData);
   }
-  explicit LeaveRoomRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit LeaveRoomRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<LeaveRoomRequest> Finish() {
+  LeaveRoomRequestBuilder &operator=(const LeaveRoomRequestBuilder &);
+  flatbuffers::Offset<LeaveRoomRequest> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<LeaveRoomRequest>(end);
+    auto o = flatbuffers::Offset<LeaveRoomRequest>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<LeaveRoomRequest> CreateLeaveRoomRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    ::flatbuffers::Offset<PresenceOptionData> optData = 0) {
+inline flatbuffers::Offset<LeaveRoomRequest> CreateLeaveRoomRequest(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u64 roomId = 0,
+    flatbuffers::Offset<PresenceOptionData> optData = 0) {
   LeaveRoomRequestBuilder builder_(_fbb);
   builder_.add_roomId(roomId);
   builder_.add_optData(optData);
   return builder_.Finish();
 }
 
-struct GetRoomDataExternalListRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef GetRoomDataExternalListRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ROOMIDS = 4,
-    VT_ATTRIDS = 6
-  };
-  const ::flatbuffers::Vector<uint64_t> *roomIds() const {
-    return GetPointer<const ::flatbuffers::Vector<uint64_t> *>(VT_ROOMIDS);
-  }
-  const ::flatbuffers::Vector<uint16_t> *attrIds() const {
-    return GetPointer<const ::flatbuffers::Vector<uint16_t> *>(VT_ATTRIDS);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_ROOMIDS) &&
-           verifier.VerifyVector(roomIds()) &&
-           VerifyOffset(verifier, VT_ATTRIDS) &&
-           verifier.VerifyVector(attrIds()) &&
-           verifier.EndTable();
-  }
-};
-
-struct GetRoomDataExternalListRequestBuilder {
-  typedef GetRoomDataExternalListRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_roomIds(::flatbuffers::Offset<::flatbuffers::Vector<uint64_t>> roomIds) {
-    fbb_.AddOffset(GetRoomDataExternalListRequest::VT_ROOMIDS, roomIds);
-  }
-  void add_attrIds(::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> attrIds) {
-    fbb_.AddOffset(GetRoomDataExternalListRequest::VT_ATTRIDS, attrIds);
-  }
-  explicit GetRoomDataExternalListRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<GetRoomDataExternalListRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<GetRoomDataExternalListRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<GetRoomDataExternalListRequest> CreateGetRoomDataExternalListRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint64_t>> roomIds = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> attrIds = 0) {
-  GetRoomDataExternalListRequestBuilder builder_(_fbb);
-  builder_.add_attrIds(attrIds);
-  builder_.add_roomIds(roomIds);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<GetRoomDataExternalListRequest> CreateGetRoomDataExternalListRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<uint64_t> *roomIds = nullptr,
-    const std::vector<uint16_t> *attrIds = nullptr) {
-  auto roomIds__ = roomIds ? _fbb.CreateVector<uint64_t>(*roomIds) : 0;
-  auto attrIds__ = attrIds ? _fbb.CreateVector<uint16_t>(*attrIds) : 0;
-  return CreateGetRoomDataExternalListRequest(
-      _fbb,
-      roomIds__,
-      attrIds__);
-}
-
-struct GetRoomDataExternalListResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef GetRoomDataExternalListResponseBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ROOMS = 4
-  };
-  const ::flatbuffers::Vector<::flatbuffers::Offset<RoomDataExternal>> *rooms() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<RoomDataExternal>> *>(VT_ROOMS);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_ROOMS) &&
-           verifier.VerifyVector(rooms()) &&
-           verifier.VerifyVectorOfTables(rooms()) &&
-           verifier.EndTable();
-  }
-};
-
-struct GetRoomDataExternalListResponseBuilder {
-  typedef GetRoomDataExternalListResponse Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_rooms(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomDataExternal>>> rooms) {
-    fbb_.AddOffset(GetRoomDataExternalListResponse::VT_ROOMS, rooms);
-  }
-  explicit GetRoomDataExternalListResponseBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<GetRoomDataExternalListResponse> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<GetRoomDataExternalListResponse>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<GetRoomDataExternalListResponse> CreateGetRoomDataExternalListResponse(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomDataExternal>>> rooms = 0) {
-  GetRoomDataExternalListResponseBuilder builder_(_fbb);
-  builder_.add_rooms(rooms);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<GetRoomDataExternalListResponse> CreateGetRoomDataExternalListResponseDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<::flatbuffers::Offset<RoomDataExternal>> *rooms = nullptr) {
-  auto rooms__ = rooms ? _fbb.CreateVector<::flatbuffers::Offset<RoomDataExternal>>(*rooms) : 0;
-  return CreateGetRoomDataExternalListResponse(
-      _fbb,
-      rooms__);
-}
-
-struct SetRoomDataExternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SetRoomDataExternalRequestBuilder Builder;
+struct SetRoomDataExternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_ROOMID = 4,
     VT_ROOMSEARCHABLEINTATTREXTERNAL = 6,
     VT_ROOMSEARCHABLEBINATTREXTERNAL = 8,
     VT_ROOMBINATTREXTERNAL = 10
   };
-  uint64_t roomId() const {
-    return GetField<uint64_t>(VT_ROOMID, 0);
+  u64 roomId() const {
+    return GetField<u64>(VT_ROOMID, 0);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<IntAttr>> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<IntAttr>> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *>(VT_ROOMSEARCHABLEBINATTREXTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *>(VT_ROOMSEARCHABLEBINATTREXTERNAL);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *roomBinAttrExternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *>(VT_ROOMBINATTREXTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *roomBinAttrExternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *>(VT_ROOMBINATTREXTERNAL);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint64_t>(verifier, VT_ROOMID, 8) &&
+           VerifyField<u64>(verifier, VT_ROOMID) &&
            VerifyOffset(verifier, VT_ROOMSEARCHABLEINTATTREXTERNAL) &&
            verifier.VerifyVector(roomSearchableIntAttrExternal()) &&
            verifier.VerifyVectorOfTables(roomSearchableIntAttrExternal()) &&
@@ -2679,38 +2135,38 @@ struct SetRoomDataExternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffer
 };
 
 struct SetRoomDataExternalRequestBuilder {
-  typedef SetRoomDataExternalRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_roomId(uint64_t roomId) {
-    fbb_.AddElement<uint64_t>(SetRoomDataExternalRequest::VT_ROOMID, roomId, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_roomId(u64 roomId) {
+    fbb_.AddElement<u64>(SetRoomDataExternalRequest::VT_ROOMID, roomId, 0);
   }
-  void add_roomSearchableIntAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal) {
+  void add_roomSearchableIntAttrExternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal) {
     fbb_.AddOffset(SetRoomDataExternalRequest::VT_ROOMSEARCHABLEINTATTREXTERNAL, roomSearchableIntAttrExternal);
   }
-  void add_roomSearchableBinAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal) {
+  void add_roomSearchableBinAttrExternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal) {
     fbb_.AddOffset(SetRoomDataExternalRequest::VT_ROOMSEARCHABLEBINATTREXTERNAL, roomSearchableBinAttrExternal);
   }
-  void add_roomBinAttrExternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomBinAttrExternal) {
+  void add_roomBinAttrExternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrExternal) {
     fbb_.AddOffset(SetRoomDataExternalRequest::VT_ROOMBINATTREXTERNAL, roomBinAttrExternal);
   }
-  explicit SetRoomDataExternalRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit SetRoomDataExternalRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<SetRoomDataExternalRequest> Finish() {
+  SetRoomDataExternalRequestBuilder &operator=(const SetRoomDataExternalRequestBuilder &);
+  flatbuffers::Offset<SetRoomDataExternalRequest> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<SetRoomDataExternalRequest>(end);
+    auto o = flatbuffers::Offset<SetRoomDataExternalRequest>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<SetRoomDataExternalRequest> CreateSetRoomDataExternalRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomBinAttrExternal = 0) {
+inline flatbuffers::Offset<SetRoomDataExternalRequest> CreateSetRoomDataExternalRequest(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u64 roomId = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrExternal = 0) {
   SetRoomDataExternalRequestBuilder builder_(_fbb);
   builder_.add_roomId(roomId);
   builder_.add_roomBinAttrExternal(roomBinAttrExternal);
@@ -2719,15 +2175,15 @@ inline ::flatbuffers::Offset<SetRoomDataExternalRequest> CreateSetRoomDataExtern
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<SetRoomDataExternalRequest> CreateSetRoomDataExternalRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    const std::vector<::flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal = nullptr,
-    const std::vector<::flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal = nullptr,
-    const std::vector<::flatbuffers::Offset<BinAttr>> *roomBinAttrExternal = nullptr) {
-  auto roomSearchableIntAttrExternal__ = roomSearchableIntAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset<IntAttr>>(*roomSearchableIntAttrExternal) : 0;
-  auto roomSearchableBinAttrExternal__ = roomSearchableBinAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*roomSearchableBinAttrExternal) : 0;
-  auto roomBinAttrExternal__ = roomBinAttrExternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*roomBinAttrExternal) : 0;
+inline flatbuffers::Offset<SetRoomDataExternalRequest> CreateSetRoomDataExternalRequestDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u64 roomId = 0,
+    const std::vector<flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal = nullptr,
+    const std::vector<flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal = nullptr,
+    const std::vector<flatbuffers::Offset<BinAttr>> *roomBinAttrExternal = nullptr) {
+  auto roomSearchableIntAttrExternal__ = roomSearchableIntAttrExternal ? _fbb.CreateVector<flatbuffers::Offset<IntAttr>>(*roomSearchableIntAttrExternal) : 0;
+  auto roomSearchableBinAttrExternal__ = roomSearchableBinAttrExternal ? _fbb.CreateVector<flatbuffers::Offset<BinAttr>>(*roomSearchableBinAttrExternal) : 0;
+  auto roomBinAttrExternal__ = roomBinAttrExternal ? _fbb.CreateVector<flatbuffers::Offset<BinAttr>>(*roomBinAttrExternal) : 0;
   return CreateSetRoomDataExternalRequest(
       _fbb,
       roomId,
@@ -2736,8 +2192,7 @@ inline ::flatbuffers::Offset<SetRoomDataExternalRequest> CreateSetRoomDataExtern
       roomBinAttrExternal__);
 }
 
-struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SetRoomDataInternalRequestBuilder Builder;
+struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_ROOMID = 4,
     VT_FLAGFILTER = 6,
@@ -2747,39 +2202,39 @@ struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffer
     VT_PASSWORDSLOTMASK = 14,
     VT_OWNERPRIVILEGERANK = 16
   };
-  uint64_t roomId() const {
-    return GetField<uint64_t>(VT_ROOMID, 0);
+  u64 roomId() const {
+    return GetField<u64>(VT_ROOMID, 0);
   }
-  uint32_t flagFilter() const {
-    return GetField<uint32_t>(VT_FLAGFILTER, 0);
+  u32 flagFilter() const {
+    return GetField<u32>(VT_FLAGFILTER, 0);
   }
-  uint32_t flagAttr() const {
-    return GetField<uint32_t>(VT_FLAGATTR, 0);
+  u32 flagAttr() const {
+    return GetField<u32>(VT_FLAGATTR, 0);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *roomBinAttrInternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *>(VT_ROOMBINATTRINTERNAL);
+  const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *roomBinAttrInternal() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *>(VT_ROOMBINATTRINTERNAL);
   }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<RoomGroupPasswordConfig>> *passwordConfig() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<RoomGroupPasswordConfig>> *>(VT_PASSWORDCONFIG);
+  const flatbuffers::Vector<flatbuffers::Offset<RoomGroupPasswordConfig>> *passwordConfig() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<RoomGroupPasswordConfig>> *>(VT_PASSWORDCONFIG);
   }
-  uint64_t passwordSlotMask() const {
-    return GetField<uint64_t>(VT_PASSWORDSLOTMASK, 0);
+  u64 passwordSlotMask() const {
+    return GetField<u64>(VT_PASSWORDSLOTMASK, 0);
   }
-  const ::flatbuffers::Vector<uint16_t> *ownerPrivilegeRank() const {
-    return GetPointer<const ::flatbuffers::Vector<uint16_t> *>(VT_OWNERPRIVILEGERANK);
+  const flatbuffers::Vector<u16> *ownerPrivilegeRank() const {
+    return GetPointer<const flatbuffers::Vector<u16> *>(VT_OWNERPRIVILEGERANK);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint64_t>(verifier, VT_ROOMID, 8) &&
-           VerifyField<uint32_t>(verifier, VT_FLAGFILTER, 4) &&
-           VerifyField<uint32_t>(verifier, VT_FLAGATTR, 4) &&
+           VerifyField<u64>(verifier, VT_ROOMID) &&
+           VerifyField<u32>(verifier, VT_FLAGFILTER) &&
+           VerifyField<u32>(verifier, VT_FLAGATTR) &&
            VerifyOffset(verifier, VT_ROOMBINATTRINTERNAL) &&
            verifier.VerifyVector(roomBinAttrInternal()) &&
            verifier.VerifyVectorOfTables(roomBinAttrInternal()) &&
            VerifyOffset(verifier, VT_PASSWORDCONFIG) &&
            verifier.VerifyVector(passwordConfig()) &&
            verifier.VerifyVectorOfTables(passwordConfig()) &&
-           VerifyField<uint64_t>(verifier, VT_PASSWORDSLOTMASK, 8) &&
+           VerifyField<u64>(verifier, VT_PASSWORDSLOTMASK) &&
            VerifyOffset(verifier, VT_OWNERPRIVILEGERANK) &&
            verifier.VerifyVector(ownerPrivilegeRank()) &&
            verifier.EndTable();
@@ -2787,50 +2242,50 @@ struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffer
 };
 
 struct SetRoomDataInternalRequestBuilder {
-  typedef SetRoomDataInternalRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_roomId(uint64_t roomId) {
-    fbb_.AddElement<uint64_t>(SetRoomDataInternalRequest::VT_ROOMID, roomId, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_roomId(u64 roomId) {
+    fbb_.AddElement<u64>(SetRoomDataInternalRequest::VT_ROOMID, roomId, 0);
   }
-  void add_flagFilter(uint32_t flagFilter) {
-    fbb_.AddElement<uint32_t>(SetRoomDataInternalRequest::VT_FLAGFILTER, flagFilter, 0);
+  void add_flagFilter(u32 flagFilter) {
+    fbb_.AddElement<u32>(SetRoomDataInternalRequest::VT_FLAGFILTER, flagFilter, 0);
   }
-  void add_flagAttr(uint32_t flagAttr) {
-    fbb_.AddElement<uint32_t>(SetRoomDataInternalRequest::VT_FLAGATTR, flagAttr, 0);
+  void add_flagAttr(u32 flagAttr) {
+    fbb_.AddElement<u32>(SetRoomDataInternalRequest::VT_FLAGATTR, flagAttr, 0);
   }
-  void add_roomBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomBinAttrInternal) {
+  void add_roomBinAttrInternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrInternal) {
     fbb_.AddOffset(SetRoomDataInternalRequest::VT_ROOMBINATTRINTERNAL, roomBinAttrInternal);
   }
-  void add_passwordConfig(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomGroupPasswordConfig>>> passwordConfig) {
+  void add_passwordConfig(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomGroupPasswordConfig>>> passwordConfig) {
     fbb_.AddOffset(SetRoomDataInternalRequest::VT_PASSWORDCONFIG, passwordConfig);
   }
-  void add_passwordSlotMask(uint64_t passwordSlotMask) {
-    fbb_.AddElement<uint64_t>(SetRoomDataInternalRequest::VT_PASSWORDSLOTMASK, passwordSlotMask, 0);
+  void add_passwordSlotMask(u64 passwordSlotMask) {
+    fbb_.AddElement<u64>(SetRoomDataInternalRequest::VT_PASSWORDSLOTMASK, passwordSlotMask, 0);
   }
-  void add_ownerPrivilegeRank(::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> ownerPrivilegeRank) {
+  void add_ownerPrivilegeRank(flatbuffers::Offset<flatbuffers::Vector<u16>> ownerPrivilegeRank) {
     fbb_.AddOffset(SetRoomDataInternalRequest::VT_OWNERPRIVILEGERANK, ownerPrivilegeRank);
   }
-  explicit SetRoomDataInternalRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit SetRoomDataInternalRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<SetRoomDataInternalRequest> Finish() {
+  SetRoomDataInternalRequestBuilder &operator=(const SetRoomDataInternalRequestBuilder &);
+  flatbuffers::Offset<SetRoomDataInternalRequest> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<SetRoomDataInternalRequest>(end);
+    auto o = flatbuffers::Offset<SetRoomDataInternalRequest>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<SetRoomDataInternalRequest> CreateSetRoomDataInternalRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    uint32_t flagFilter = 0,
-    uint32_t flagAttr = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomBinAttrInternal = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomGroupPasswordConfig>>> passwordConfig = 0,
-    uint64_t passwordSlotMask = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> ownerPrivilegeRank = 0) {
+inline flatbuffers::Offset<SetRoomDataInternalRequest> CreateSetRoomDataInternalRequest(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u64 roomId = 0,
+    u32 flagFilter = 0,
+    u32 flagAttr = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrInternal = 0,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomGroupPasswordConfig>>> passwordConfig = 0,
+    u64 passwordSlotMask = 0,
+    flatbuffers::Offset<flatbuffers::Vector<u16>> ownerPrivilegeRank = 0) {
   SetRoomDataInternalRequestBuilder builder_(_fbb);
   builder_.add_passwordSlotMask(passwordSlotMask);
   builder_.add_roomId(roomId);
@@ -2842,18 +2297,18 @@ inline ::flatbuffers::Offset<SetRoomDataInternalRequest> CreateSetRoomDataIntern
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<SetRoomDataInternalRequest> CreateSetRoomDataInternalRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    uint32_t flagFilter = 0,
-    uint32_t flagAttr = 0,
-    const std::vector<::flatbuffers::Offset<BinAttr>> *roomBinAttrInternal = nullptr,
-    const std::vector<::flatbuffers::Offset<RoomGroupPasswordConfig>> *passwordConfig = nullptr,
-    uint64_t passwordSlotMask = 0,
-    const std::vector<uint16_t> *ownerPrivilegeRank = nullptr) {
-  auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*roomBinAttrInternal) : 0;
-  auto passwordConfig__ = passwordConfig ? _fbb.CreateVector<::flatbuffers::Offset<RoomGroupPasswordConfig>>(*passwordConfig) : 0;
-  auto ownerPrivilegeRank__ = ownerPrivilegeRank ? _fbb.CreateVector<uint16_t>(*ownerPrivilegeRank) : 0;
+inline flatbuffers::Offset<SetRoomDataInternalRequest> CreateSetRoomDataInternalRequestDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u64 roomId = 0,
+    u32 flagFilter = 0,
+    u32 flagAttr = 0,
+    const std::vector<flatbuffers::Offset<BinAttr>> *roomBinAttrInternal = nullptr,
+    const std::vector<flatbuffers::Offset<RoomGroupPasswordConfig>> *passwordConfig = nullptr,
+    u64 passwordSlotMask = 0,
+    const std::vector<u16> *ownerPrivilegeRank = nullptr) {
+  auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector<flatbuffers::Offset<BinAttr>>(*roomBinAttrInternal) : 0;
+  auto passwordConfig__ = passwordConfig ? _fbb.CreateVector<flatbuffers::Offset<RoomGroupPasswordConfig>>(*passwordConfig) : 0;
+  auto ownerPrivilegeRank__ = ownerPrivilegeRank ? _fbb.CreateVector<u16>(*ownerPrivilegeRank) : 0;
   return CreateSetRoomDataInternalRequest(
       _fbb,
       roomId,
@@ -2865,248 +2320,20 @@ inline ::flatbuffers::Offset<SetRoomDataInternalRequest> CreateSetRoomDataIntern
       ownerPrivilegeRank__);
 }
 
-struct GetRoomMemberDataInternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef GetRoomMemberDataInternalRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ROOMID = 4,
-    VT_MEMBERID = 6,
-    VT_ATTRID = 8
-  };
-  uint64_t roomId() const {
-    return GetField<uint64_t>(VT_ROOMID, 0);
-  }
-  uint16_t memberId() const {
-    return GetField<uint16_t>(VT_MEMBERID, 0);
-  }
-  const ::flatbuffers::Vector<uint16_t> *attrId() const {
-    return GetPointer<const ::flatbuffers::Vector<uint16_t> *>(VT_ATTRID);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint64_t>(verifier, VT_ROOMID, 8) &&
-           VerifyField<uint16_t>(verifier, VT_MEMBERID, 2) &&
-           VerifyOffset(verifier, VT_ATTRID) &&
-           verifier.VerifyVector(attrId()) &&
-           verifier.EndTable();
-  }
-};
-
-struct GetRoomMemberDataInternalRequestBuilder {
-  typedef GetRoomMemberDataInternalRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_roomId(uint64_t roomId) {
-    fbb_.AddElement<uint64_t>(GetRoomMemberDataInternalRequest::VT_ROOMID, roomId, 0);
-  }
-  void add_memberId(uint16_t memberId) {
-    fbb_.AddElement<uint16_t>(GetRoomMemberDataInternalRequest::VT_MEMBERID, memberId, 0);
-  }
-  void add_attrId(::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> attrId) {
-    fbb_.AddOffset(GetRoomMemberDataInternalRequest::VT_ATTRID, attrId);
-  }
-  explicit GetRoomMemberDataInternalRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<GetRoomMemberDataInternalRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<GetRoomMemberDataInternalRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<GetRoomMemberDataInternalRequest> CreateGetRoomMemberDataInternalRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    uint16_t memberId = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> attrId = 0) {
-  GetRoomMemberDataInternalRequestBuilder builder_(_fbb);
-  builder_.add_roomId(roomId);
-  builder_.add_attrId(attrId);
-  builder_.add_memberId(memberId);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<GetRoomMemberDataInternalRequest> CreateGetRoomMemberDataInternalRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    uint16_t memberId = 0,
-    const std::vector<uint16_t> *attrId = nullptr) {
-  auto attrId__ = attrId ? _fbb.CreateVector<uint16_t>(*attrId) : 0;
-  return CreateGetRoomMemberDataInternalRequest(
-      _fbb,
-      roomId,
-      memberId,
-      attrId__);
-}
-
-struct SetRoomMemberDataInternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SetRoomMemberDataInternalRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ROOMID = 4,
-    VT_MEMBERID = 6,
-    VT_TEAMID = 8,
-    VT_ROOMMEMBERBINATTRINTERNAL = 10
-  };
-  uint64_t roomId() const {
-    return GetField<uint64_t>(VT_ROOMID, 0);
-  }
-  uint16_t memberId() const {
-    return GetField<uint16_t>(VT_MEMBERID, 0);
-  }
-  uint8_t teamId() const {
-    return GetField<uint8_t>(VT_TEAMID, 0);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *roomMemberBinAttrInternal() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *>(VT_ROOMMEMBERBINATTRINTERNAL);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint64_t>(verifier, VT_ROOMID, 8) &&
-           VerifyField<uint16_t>(verifier, VT_MEMBERID, 2) &&
-           VerifyField<uint8_t>(verifier, VT_TEAMID, 1) &&
-           VerifyOffset(verifier, VT_ROOMMEMBERBINATTRINTERNAL) &&
-           verifier.VerifyVector(roomMemberBinAttrInternal()) &&
-           verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) &&
-           verifier.EndTable();
-  }
-};
-
-struct SetRoomMemberDataInternalRequestBuilder {
-  typedef SetRoomMemberDataInternalRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_roomId(uint64_t roomId) {
-    fbb_.AddElement<uint64_t>(SetRoomMemberDataInternalRequest::VT_ROOMID, roomId, 0);
-  }
-  void add_memberId(uint16_t memberId) {
-    fbb_.AddElement<uint16_t>(SetRoomMemberDataInternalRequest::VT_MEMBERID, memberId, 0);
-  }
-  void add_teamId(uint8_t teamId) {
-    fbb_.AddElement<uint8_t>(SetRoomMemberDataInternalRequest::VT_TEAMID, teamId, 0);
-  }
-  void add_roomMemberBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomMemberBinAttrInternal) {
-    fbb_.AddOffset(SetRoomMemberDataInternalRequest::VT_ROOMMEMBERBINATTRINTERNAL, roomMemberBinAttrInternal);
-  }
-  explicit SetRoomMemberDataInternalRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<SetRoomMemberDataInternalRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<SetRoomMemberDataInternalRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<SetRoomMemberDataInternalRequest> CreateSetRoomMemberDataInternalRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    uint16_t memberId = 0,
-    uint8_t teamId = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomMemberBinAttrInternal = 0) {
-  SetRoomMemberDataInternalRequestBuilder builder_(_fbb);
-  builder_.add_roomId(roomId);
-  builder_.add_roomMemberBinAttrInternal(roomMemberBinAttrInternal);
-  builder_.add_memberId(memberId);
-  builder_.add_teamId(teamId);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<SetRoomMemberDataInternalRequest> CreateSetRoomMemberDataInternalRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    uint16_t memberId = 0,
-    uint8_t teamId = 0,
-    const std::vector<::flatbuffers::Offset<BinAttr>> *roomMemberBinAttrInternal = nullptr) {
-  auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*roomMemberBinAttrInternal) : 0;
-  return CreateSetRoomMemberDataInternalRequest(
-      _fbb,
-      roomId,
-      memberId,
-      teamId,
-      roomMemberBinAttrInternal__);
-}
-
-struct SetUserInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SetUserInfoBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_SERVERID = 4,
-    VT_USERBINATTR = 6
-  };
-  uint16_t serverId() const {
-    return GetField<uint16_t>(VT_SERVERID, 0);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *userBinAttr() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>> *>(VT_USERBINATTR);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint16_t>(verifier, VT_SERVERID, 2) &&
-           VerifyOffset(verifier, VT_USERBINATTR) &&
-           verifier.VerifyVector(userBinAttr()) &&
-           verifier.VerifyVectorOfTables(userBinAttr()) &&
-           verifier.EndTable();
-  }
-};
-
-struct SetUserInfoBuilder {
-  typedef SetUserInfo Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_serverId(uint16_t serverId) {
-    fbb_.AddElement<uint16_t>(SetUserInfo::VT_SERVERID, serverId, 0);
-  }
-  void add_userBinAttr(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> userBinAttr) {
-    fbb_.AddOffset(SetUserInfo::VT_USERBINATTR, userBinAttr);
-  }
-  explicit SetUserInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<SetUserInfo> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<SetUserInfo>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<SetUserInfo> CreateSetUserInfo(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint16_t serverId = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> userBinAttr = 0) {
-  SetUserInfoBuilder builder_(_fbb);
-  builder_.add_userBinAttr(userBinAttr);
-  builder_.add_serverId(serverId);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<SetUserInfo> CreateSetUserInfoDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint16_t serverId = 0,
-    const std::vector<::flatbuffers::Offset<BinAttr>> *userBinAttr = nullptr) {
-  auto userBinAttr__ = userBinAttr ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*userBinAttr) : 0;
-  return CreateSetUserInfo(
-      _fbb,
-      serverId,
-      userBinAttr__);
-}
-
-struct GetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef GetRoomDataInternalRequestBuilder Builder;
+struct GetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_ROOMID = 4,
     VT_ATTRID = 6
   };
-  uint64_t roomId() const {
-    return GetField<uint64_t>(VT_ROOMID, 0);
+  u64 roomId() const {
+    return GetField<u64>(VT_ROOMID, 0);
   }
-  const ::flatbuffers::Vector<uint16_t> *attrId() const {
-    return GetPointer<const ::flatbuffers::Vector<uint16_t> *>(VT_ATTRID);
+  const flatbuffers::Vector<u16> *attrId() const {
+    return GetPointer<const flatbuffers::Vector<u16> *>(VT_ATTRID);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint64_t>(verifier, VT_ROOMID, 8) &&
+           VerifyField<u64>(verifier, VT_ROOMID) &&
            VerifyOffset(verifier, VT_ATTRID) &&
            verifier.VerifyVector(attrId()) &&
            verifier.EndTable();
@@ -3114,49 +2341,48 @@ struct GetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffer
 };
 
 struct GetRoomDataInternalRequestBuilder {
-  typedef GetRoomDataInternalRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_roomId(uint64_t roomId) {
-    fbb_.AddElement<uint64_t>(GetRoomDataInternalRequest::VT_ROOMID, roomId, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_roomId(u64 roomId) {
+    fbb_.AddElement<u64>(GetRoomDataInternalRequest::VT_ROOMID, roomId, 0);
   }
-  void add_attrId(::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> attrId) {
+  void add_attrId(flatbuffers::Offset<flatbuffers::Vector<u16>> attrId) {
     fbb_.AddOffset(GetRoomDataInternalRequest::VT_ATTRID, attrId);
   }
-  explicit GetRoomDataInternalRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit GetRoomDataInternalRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<GetRoomDataInternalRequest> Finish() {
+  GetRoomDataInternalRequestBuilder &operator=(const GetRoomDataInternalRequestBuilder &);
+  flatbuffers::Offset<GetRoomDataInternalRequest> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<GetRoomDataInternalRequest>(end);
+    auto o = flatbuffers::Offset<GetRoomDataInternalRequest>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<GetRoomDataInternalRequest> CreateGetRoomDataInternalRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> attrId = 0) {
+inline flatbuffers::Offset<GetRoomDataInternalRequest> CreateGetRoomDataInternalRequest(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u64 roomId = 0,
+    flatbuffers::Offset<flatbuffers::Vector<u16>> attrId = 0) {
   GetRoomDataInternalRequestBuilder builder_(_fbb);
   builder_.add_roomId(roomId);
   builder_.add_attrId(attrId);
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<GetRoomDataInternalRequest> CreateGetRoomDataInternalRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    const std::vector<uint16_t> *attrId = nullptr) {
-  auto attrId__ = attrId ? _fbb.CreateVector<uint16_t>(*attrId) : 0;
+inline flatbuffers::Offset<GetRoomDataInternalRequest> CreateGetRoomDataInternalRequestDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u64 roomId = 0,
+    const std::vector<u16> *attrId = nullptr) {
+  auto attrId__ = attrId ? _fbb.CreateVector<u16>(*attrId) : 0;
   return CreateGetRoomDataInternalRequest(
       _fbb,
       roomId,
       attrId__);
 }
 
-struct RoomMemberUpdateInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef RoomMemberUpdateInfoBuilder Builder;
+struct RoomMemberUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_ROOMMEMBERDATAINTERNAL = 4,
     VT_EVENTCAUSE = 6,
@@ -3165,17 +2391,17 @@ struct RoomMemberUpdateInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Tab
   const RoomMemberDataInternal *roomMemberDataInternal() const {
     return GetPointer<const RoomMemberDataInternal *>(VT_ROOMMEMBERDATAINTERNAL);
   }
-  uint8_t eventCause() const {
-    return GetField<uint8_t>(VT_EVENTCAUSE, 0);
+  u8 eventCause() const {
+    return GetField<u8>(VT_EVENTCAUSE, 0);
   }
   const PresenceOptionData *optData() const {
     return GetPointer<const PresenceOptionData *>(VT_OPTDATA);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyOffset(verifier, VT_ROOMMEMBERDATAINTERNAL) &&
            verifier.VerifyTable(roomMemberDataInternal()) &&
-           VerifyField<uint8_t>(verifier, VT_EVENTCAUSE, 1) &&
+           VerifyField<u8>(verifier, VT_EVENTCAUSE) &&
            VerifyOffset(verifier, VT_OPTDATA) &&
            verifier.VerifyTable(optData()) &&
            verifier.EndTable();
@@ -3183,34 +2409,34 @@ struct RoomMemberUpdateInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Tab
 };
 
 struct RoomMemberUpdateInfoBuilder {
-  typedef RoomMemberUpdateInfo Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_roomMemberDataInternal(::flatbuffers::Offset<RoomMemberDataInternal> roomMemberDataInternal) {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_roomMemberDataInternal(flatbuffers::Offset<RoomMemberDataInternal> roomMemberDataInternal) {
     fbb_.AddOffset(RoomMemberUpdateInfo::VT_ROOMMEMBERDATAINTERNAL, roomMemberDataInternal);
   }
-  void add_eventCause(uint8_t eventCause) {
-    fbb_.AddElement<uint8_t>(RoomMemberUpdateInfo::VT_EVENTCAUSE, eventCause, 0);
+  void add_eventCause(u8 eventCause) {
+    fbb_.AddElement<u8>(RoomMemberUpdateInfo::VT_EVENTCAUSE, eventCause, 0);
   }
-  void add_optData(::flatbuffers::Offset<PresenceOptionData> optData) {
+  void add_optData(flatbuffers::Offset<PresenceOptionData> optData) {
     fbb_.AddOffset(RoomMemberUpdateInfo::VT_OPTDATA, optData);
   }
-  explicit RoomMemberUpdateInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit RoomMemberUpdateInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<RoomMemberUpdateInfo> Finish() {
+  RoomMemberUpdateInfoBuilder &operator=(const RoomMemberUpdateInfoBuilder &);
+  flatbuffers::Offset<RoomMemberUpdateInfo> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<RoomMemberUpdateInfo>(end);
+    auto o = flatbuffers::Offset<RoomMemberUpdateInfo>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<RoomMemberUpdateInfo> CreateRoomMemberUpdateInfo(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<RoomMemberDataInternal> roomMemberDataInternal = 0,
-    uint8_t eventCause = 0,
-    ::flatbuffers::Offset<PresenceOptionData> optData = 0) {
+inline flatbuffers::Offset<RoomMemberUpdateInfo> CreateRoomMemberUpdateInfo(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    flatbuffers::Offset<RoomMemberDataInternal> roomMemberDataInternal = 0,
+    u8 eventCause = 0,
+    flatbuffers::Offset<PresenceOptionData> optData = 0) {
   RoomMemberUpdateInfoBuilder builder_(_fbb);
   builder_.add_optData(optData);
   builder_.add_roomMemberDataInternal(roomMemberDataInternal);
@@ -3218,89 +2444,25 @@ inline ::flatbuffers::Offset<RoomMemberUpdateInfo> CreateRoomMemberUpdateInfo(
   return builder_.Finish();
 }
 
-struct NotificationUserJoinedRoom FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef NotificationUserJoinedRoomBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ROOM_ID = 4,
-    VT_UPDATE_INFO = 6,
-    VT_SIGNALING = 8
-  };
-  uint64_t room_id() const {
-    return GetField<uint64_t>(VT_ROOM_ID, 0);
-  }
-  const RoomMemberUpdateInfo *update_info() const {
-    return GetPointer<const RoomMemberUpdateInfo *>(VT_UPDATE_INFO);
-  }
-  const SignalingAddr *signaling() const {
-    return GetPointer<const SignalingAddr *>(VT_SIGNALING);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint64_t>(verifier, VT_ROOM_ID, 8) &&
-           VerifyOffset(verifier, VT_UPDATE_INFO) &&
-           verifier.VerifyTable(update_info()) &&
-           VerifyOffset(verifier, VT_SIGNALING) &&
-           verifier.VerifyTable(signaling()) &&
-           verifier.EndTable();
-  }
-};
-
-struct NotificationUserJoinedRoomBuilder {
-  typedef NotificationUserJoinedRoom Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_room_id(uint64_t room_id) {
-    fbb_.AddElement<uint64_t>(NotificationUserJoinedRoom::VT_ROOM_ID, room_id, 0);
-  }
-  void add_update_info(::flatbuffers::Offset<RoomMemberUpdateInfo> update_info) {
-    fbb_.AddOffset(NotificationUserJoinedRoom::VT_UPDATE_INFO, update_info);
-  }
-  void add_signaling(::flatbuffers::Offset<SignalingAddr> signaling) {
-    fbb_.AddOffset(NotificationUserJoinedRoom::VT_SIGNALING, signaling);
-  }
-  explicit NotificationUserJoinedRoomBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<NotificationUserJoinedRoom> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<NotificationUserJoinedRoom>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<NotificationUserJoinedRoom> CreateNotificationUserJoinedRoom(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t room_id = 0,
-    ::flatbuffers::Offset<RoomMemberUpdateInfo> update_info = 0,
-    ::flatbuffers::Offset<SignalingAddr> signaling = 0) {
-  NotificationUserJoinedRoomBuilder builder_(_fbb);
-  builder_.add_room_id(room_id);
-  builder_.add_signaling(signaling);
-  builder_.add_update_info(update_info);
-  return builder_.Finish();
-}
-
-struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef RoomUpdateInfoBuilder Builder;
+struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_EVENTCAUSE = 4,
     VT_ERRORCODE = 6,
     VT_OPTDATA = 8
   };
-  uint8_t eventCause() const {
-    return GetField<uint8_t>(VT_EVENTCAUSE, 0);
+  u8 eventCause() const {
+    return GetField<u8>(VT_EVENTCAUSE, 0);
   }
-  int32_t errorCode() const {
-    return GetField<int32_t>(VT_ERRORCODE, 0);
+  s32 errorCode() const {
+    return GetField<s32>(VT_ERRORCODE, 0);
   }
   const PresenceOptionData *optData() const {
     return GetPointer<const PresenceOptionData *>(VT_OPTDATA);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint8_t>(verifier, VT_EVENTCAUSE, 1) &&
-           VerifyField<int32_t>(verifier, VT_ERRORCODE, 4) &&
+           VerifyField<u8>(verifier, VT_EVENTCAUSE) &&
+           VerifyField<s32>(verifier, VT_ERRORCODE) &&
            VerifyOffset(verifier, VT_OPTDATA) &&
            verifier.VerifyTable(optData()) &&
            verifier.EndTable();
@@ -3308,34 +2470,34 @@ struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
 };
 
 struct RoomUpdateInfoBuilder {
-  typedef RoomUpdateInfo Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_eventCause(uint8_t eventCause) {
-    fbb_.AddElement<uint8_t>(RoomUpdateInfo::VT_EVENTCAUSE, eventCause, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_eventCause(u8 eventCause) {
+    fbb_.AddElement<u8>(RoomUpdateInfo::VT_EVENTCAUSE, eventCause, 0);
   }
-  void add_errorCode(int32_t errorCode) {
-    fbb_.AddElement<int32_t>(RoomUpdateInfo::VT_ERRORCODE, errorCode, 0);
+  void add_errorCode(s32 errorCode) {
+    fbb_.AddElement<s32>(RoomUpdateInfo::VT_ERRORCODE, errorCode, 0);
   }
-  void add_optData(::flatbuffers::Offset<PresenceOptionData> optData) {
+  void add_optData(flatbuffers::Offset<PresenceOptionData> optData) {
     fbb_.AddOffset(RoomUpdateInfo::VT_OPTDATA, optData);
   }
-  explicit RoomUpdateInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit RoomUpdateInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<RoomUpdateInfo> Finish() {
+  RoomUpdateInfoBuilder &operator=(const RoomUpdateInfoBuilder &);
+  flatbuffers::Offset<RoomUpdateInfo> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<RoomUpdateInfo>(end);
+    auto o = flatbuffers::Offset<RoomUpdateInfo>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<RoomUpdateInfo> CreateRoomUpdateInfo(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint8_t eventCause = 0,
-    int32_t errorCode = 0,
-    ::flatbuffers::Offset<PresenceOptionData> optData = 0) {
+inline flatbuffers::Offset<RoomUpdateInfo> CreateRoomUpdateInfo(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u8 eventCause = 0,
+    s32 errorCode = 0,
+    flatbuffers::Offset<PresenceOptionData> optData = 0) {
   RoomUpdateInfoBuilder builder_(_fbb);
   builder_.add_optData(optData);
   builder_.add_errorCode(errorCode);
@@ -3343,259 +2505,68 @@ inline ::flatbuffers::Offset<RoomUpdateInfo> CreateRoomUpdateInfo(
   return builder_.Finish();
 }
 
-struct RoomDataInternalUpdateInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef RoomDataInternalUpdateInfoBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_NEWROOMDATAINTERNAL = 4,
-    VT_PREVFLAGATTR = 6,
-    VT_PREVROOMPASSWORDSLOTMASK = 8,
-    VT_NEWROOMGROUP = 10,
-    VT_NEWROOMBINATTRINTERNAL = 12
-  };
-  const RoomDataInternal *newRoomDataInternal() const {
-    return GetPointer<const RoomDataInternal *>(VT_NEWROOMDATAINTERNAL);
-  }
-  uint32_t prevFlagAttr() const {
-    return GetField<uint32_t>(VT_PREVFLAGATTR, 0);
-  }
-  uint64_t prevRoomPasswordSlotMask() const {
-    return GetField<uint64_t>(VT_PREVROOMPASSWORDSLOTMASK, 0);
-  }
-  const ::flatbuffers::Vector<uint8_t> *newRoomGroup() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_NEWROOMGROUP);
-  }
-  const ::flatbuffers::Vector<uint16_t> *newRoomBinAttrInternal() const {
-    return GetPointer<const ::flatbuffers::Vector<uint16_t> *>(VT_NEWROOMBINATTRINTERNAL);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_NEWROOMDATAINTERNAL) &&
-           verifier.VerifyTable(newRoomDataInternal()) &&
-           VerifyField<uint32_t>(verifier, VT_PREVFLAGATTR, 4) &&
-           VerifyField<uint64_t>(verifier, VT_PREVROOMPASSWORDSLOTMASK, 8) &&
-           VerifyOffset(verifier, VT_NEWROOMGROUP) &&
-           verifier.VerifyVector(newRoomGroup()) &&
-           VerifyOffset(verifier, VT_NEWROOMBINATTRINTERNAL) &&
-           verifier.VerifyVector(newRoomBinAttrInternal()) &&
-           verifier.EndTable();
-  }
-};
-
-struct RoomDataInternalUpdateInfoBuilder {
-  typedef RoomDataInternalUpdateInfo Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_newRoomDataInternal(::flatbuffers::Offset<RoomDataInternal> newRoomDataInternal) {
-    fbb_.AddOffset(RoomDataInternalUpdateInfo::VT_NEWROOMDATAINTERNAL, newRoomDataInternal);
-  }
-  void add_prevFlagAttr(uint32_t prevFlagAttr) {
-    fbb_.AddElement<uint32_t>(RoomDataInternalUpdateInfo::VT_PREVFLAGATTR, prevFlagAttr, 0);
-  }
-  void add_prevRoomPasswordSlotMask(uint64_t prevRoomPasswordSlotMask) {
-    fbb_.AddElement<uint64_t>(RoomDataInternalUpdateInfo::VT_PREVROOMPASSWORDSLOTMASK, prevRoomPasswordSlotMask, 0);
-  }
-  void add_newRoomGroup(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> newRoomGroup) {
-    fbb_.AddOffset(RoomDataInternalUpdateInfo::VT_NEWROOMGROUP, newRoomGroup);
-  }
-  void add_newRoomBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> newRoomBinAttrInternal) {
-    fbb_.AddOffset(RoomDataInternalUpdateInfo::VT_NEWROOMBINATTRINTERNAL, newRoomBinAttrInternal);
-  }
-  explicit RoomDataInternalUpdateInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<RoomDataInternalUpdateInfo> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<RoomDataInternalUpdateInfo>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<RoomDataInternalUpdateInfo> CreateRoomDataInternalUpdateInfo(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<RoomDataInternal> newRoomDataInternal = 0,
-    uint32_t prevFlagAttr = 0,
-    uint64_t prevRoomPasswordSlotMask = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> newRoomGroup = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> newRoomBinAttrInternal = 0) {
-  RoomDataInternalUpdateInfoBuilder builder_(_fbb);
-  builder_.add_prevRoomPasswordSlotMask(prevRoomPasswordSlotMask);
-  builder_.add_newRoomBinAttrInternal(newRoomBinAttrInternal);
-  builder_.add_newRoomGroup(newRoomGroup);
-  builder_.add_prevFlagAttr(prevFlagAttr);
-  builder_.add_newRoomDataInternal(newRoomDataInternal);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<RoomDataInternalUpdateInfo> CreateRoomDataInternalUpdateInfoDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<RoomDataInternal> newRoomDataInternal = 0,
-    uint32_t prevFlagAttr = 0,
-    uint64_t prevRoomPasswordSlotMask = 0,
-    const std::vector<uint8_t> *newRoomGroup = nullptr,
-    const std::vector<uint16_t> *newRoomBinAttrInternal = nullptr) {
-  auto newRoomGroup__ = newRoomGroup ? _fbb.CreateVector<uint8_t>(*newRoomGroup) : 0;
-  auto newRoomBinAttrInternal__ = newRoomBinAttrInternal ? _fbb.CreateVector<uint16_t>(*newRoomBinAttrInternal) : 0;
-  return CreateRoomDataInternalUpdateInfo(
-      _fbb,
-      newRoomDataInternal,
-      prevFlagAttr,
-      prevRoomPasswordSlotMask,
-      newRoomGroup__,
-      newRoomBinAttrInternal__);
-}
-
-struct RoomMemberDataInternalUpdateInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef RoomMemberDataInternalUpdateInfoBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_NEWROOMMEMBERDATAINTERNAL = 4,
-    VT_PREVFLAGATTR = 6,
-    VT_PREVTEAMID = 8,
-    VT_NEWROOMMEMBERBINATTRINTERNAL = 10
-  };
-  const RoomMemberDataInternal *newRoomMemberDataInternal() const {
-    return GetPointer<const RoomMemberDataInternal *>(VT_NEWROOMMEMBERDATAINTERNAL);
-  }
-  uint32_t prevFlagAttr() const {
-    return GetField<uint32_t>(VT_PREVFLAGATTR, 0);
-  }
-  uint8_t prevTeamId() const {
-    return GetField<uint8_t>(VT_PREVTEAMID, 0);
-  }
-  const ::flatbuffers::Vector<uint16_t> *newRoomMemberBinAttrInternal() const {
-    return GetPointer<const ::flatbuffers::Vector<uint16_t> *>(VT_NEWROOMMEMBERBINATTRINTERNAL);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_NEWROOMMEMBERDATAINTERNAL) &&
-           verifier.VerifyTable(newRoomMemberDataInternal()) &&
-           VerifyField<uint32_t>(verifier, VT_PREVFLAGATTR, 4) &&
-           VerifyField<uint8_t>(verifier, VT_PREVTEAMID, 1) &&
-           VerifyOffset(verifier, VT_NEWROOMMEMBERBINATTRINTERNAL) &&
-           verifier.VerifyVector(newRoomMemberBinAttrInternal()) &&
-           verifier.EndTable();
-  }
-};
-
-struct RoomMemberDataInternalUpdateInfoBuilder {
-  typedef RoomMemberDataInternalUpdateInfo Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_newRoomMemberDataInternal(::flatbuffers::Offset<RoomMemberDataInternal> newRoomMemberDataInternal) {
-    fbb_.AddOffset(RoomMemberDataInternalUpdateInfo::VT_NEWROOMMEMBERDATAINTERNAL, newRoomMemberDataInternal);
-  }
-  void add_prevFlagAttr(uint32_t prevFlagAttr) {
-    fbb_.AddElement<uint32_t>(RoomMemberDataInternalUpdateInfo::VT_PREVFLAGATTR, prevFlagAttr, 0);
-  }
-  void add_prevTeamId(uint8_t prevTeamId) {
-    fbb_.AddElement<uint8_t>(RoomMemberDataInternalUpdateInfo::VT_PREVTEAMID, prevTeamId, 0);
-  }
-  void add_newRoomMemberBinAttrInternal(::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> newRoomMemberBinAttrInternal) {
-    fbb_.AddOffset(RoomMemberDataInternalUpdateInfo::VT_NEWROOMMEMBERBINATTRINTERNAL, newRoomMemberBinAttrInternal);
-  }
-  explicit RoomMemberDataInternalUpdateInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<RoomMemberDataInternalUpdateInfo> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<RoomMemberDataInternalUpdateInfo>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<RoomMemberDataInternalUpdateInfo> CreateRoomMemberDataInternalUpdateInfo(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<RoomMemberDataInternal> newRoomMemberDataInternal = 0,
-    uint32_t prevFlagAttr = 0,
-    uint8_t prevTeamId = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> newRoomMemberBinAttrInternal = 0) {
-  RoomMemberDataInternalUpdateInfoBuilder builder_(_fbb);
-  builder_.add_newRoomMemberBinAttrInternal(newRoomMemberBinAttrInternal);
-  builder_.add_prevFlagAttr(prevFlagAttr);
-  builder_.add_newRoomMemberDataInternal(newRoomMemberDataInternal);
-  builder_.add_prevTeamId(prevTeamId);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<RoomMemberDataInternalUpdateInfo> CreateRoomMemberDataInternalUpdateInfoDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<RoomMemberDataInternal> newRoomMemberDataInternal = 0,
-    uint32_t prevFlagAttr = 0,
-    uint8_t prevTeamId = 0,
-    const std::vector<uint16_t> *newRoomMemberBinAttrInternal = nullptr) {
-  auto newRoomMemberBinAttrInternal__ = newRoomMemberBinAttrInternal ? _fbb.CreateVector<uint16_t>(*newRoomMemberBinAttrInternal) : 0;
-  return CreateRoomMemberDataInternalUpdateInfo(
-      _fbb,
-      newRoomMemberDataInternal,
-      prevFlagAttr,
-      prevTeamId,
-      newRoomMemberBinAttrInternal__);
-}
-
-struct GetPingInfoResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef GetPingInfoResponseBuilder Builder;
+struct GetPingInfoResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_SERVERID = 4,
     VT_WORLDID = 6,
     VT_ROOMID = 8,
     VT_RTT = 10
   };
-  uint16_t serverId() const {
-    return GetField<uint16_t>(VT_SERVERID, 0);
+  u16 serverId() const {
+    return GetField<u16>(VT_SERVERID, 0);
   }
-  uint32_t worldId() const {
-    return GetField<uint32_t>(VT_WORLDID, 0);
+  u32 worldId() const {
+    return GetField<u32>(VT_WORLDID, 0);
   }
-  uint64_t roomId() const {
-    return GetField<uint64_t>(VT_ROOMID, 0);
+  u64 roomId() const {
+    return GetField<u64>(VT_ROOMID, 0);
   }
-  uint32_t rtt() const {
-    return GetField<uint32_t>(VT_RTT, 0);
+  u32 rtt() const {
+    return GetField<u32>(VT_RTT, 0);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint16_t>(verifier, VT_SERVERID, 2) &&
-           VerifyField<uint32_t>(verifier, VT_WORLDID, 4) &&
-           VerifyField<uint64_t>(verifier, VT_ROOMID, 8) &&
-           VerifyField<uint32_t>(verifier, VT_RTT, 4) &&
+           VerifyField<u16>(verifier, VT_SERVERID) &&
+           VerifyField<u32>(verifier, VT_WORLDID) &&
+           VerifyField<u64>(verifier, VT_ROOMID) &&
+           VerifyField<u32>(verifier, VT_RTT) &&
            verifier.EndTable();
   }
 };
 
 struct GetPingInfoResponseBuilder {
-  typedef GetPingInfoResponse Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_serverId(uint16_t serverId) {
-    fbb_.AddElement<uint16_t>(GetPingInfoResponse::VT_SERVERID, serverId, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_serverId(u16 serverId) {
+    fbb_.AddElement<u16>(GetPingInfoResponse::VT_SERVERID, serverId, 0);
   }
-  void add_worldId(uint32_t worldId) {
-    fbb_.AddElement<uint32_t>(GetPingInfoResponse::VT_WORLDID, worldId, 0);
+  void add_worldId(u32 worldId) {
+    fbb_.AddElement<u32>(GetPingInfoResponse::VT_WORLDID, worldId, 0);
   }
-  void add_roomId(uint64_t roomId) {
-    fbb_.AddElement<uint64_t>(GetPingInfoResponse::VT_ROOMID, roomId, 0);
+  void add_roomId(u64 roomId) {
+    fbb_.AddElement<u64>(GetPingInfoResponse::VT_ROOMID, roomId, 0);
   }
-  void add_rtt(uint32_t rtt) {
-    fbb_.AddElement<uint32_t>(GetPingInfoResponse::VT_RTT, rtt, 0);
+  void add_rtt(u32 rtt) {
+    fbb_.AddElement<u32>(GetPingInfoResponse::VT_RTT, rtt, 0);
   }
-  explicit GetPingInfoResponseBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit GetPingInfoResponseBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<GetPingInfoResponse> Finish() {
+  GetPingInfoResponseBuilder &operator=(const GetPingInfoResponseBuilder &);
+  flatbuffers::Offset<GetPingInfoResponse> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<GetPingInfoResponse>(end);
+    auto o = flatbuffers::Offset<GetPingInfoResponse>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<GetPingInfoResponse> CreateGetPingInfoResponse(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint16_t serverId = 0,
-    uint32_t worldId = 0,
-    uint64_t roomId = 0,
-    uint32_t rtt = 0) {
+inline flatbuffers::Offset<GetPingInfoResponse> CreateGetPingInfoResponse(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u16 serverId = 0,
+    u32 worldId = 0,
+    u64 roomId = 0,
+    u32 rtt = 0) {
   GetPingInfoResponseBuilder builder_(_fbb);
   builder_.add_roomId(roomId);
   builder_.add_rtt(rtt);
@@ -3604,8 +2575,7 @@ inline ::flatbuffers::Offset<GetPingInfoResponse> CreateGetPingInfoResponse(
   return builder_.Finish();
 }
 
-struct SendRoomMessageRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SendRoomMessageRequestBuilder Builder;
+struct SendRoomMessageRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_ROOMID = 4,
     VT_CASTTYPE = 6,
@@ -3613,71 +2583,71 @@ struct SendRoomMessageRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::T
     VT_MSG = 10,
     VT_OPTION = 12
   };
-  uint64_t roomId() const {
-    return GetField<uint64_t>(VT_ROOMID, 0);
+  u64 roomId() const {
+    return GetField<u64>(VT_ROOMID, 0);
   }
-  uint8_t castType() const {
-    return GetField<uint8_t>(VT_CASTTYPE, 0);
+  u8 castType() const {
+    return GetField<u8>(VT_CASTTYPE, 0);
   }
-  const ::flatbuffers::Vector<uint16_t> *dst() const {
-    return GetPointer<const ::flatbuffers::Vector<uint16_t> *>(VT_DST);
+  const flatbuffers::Vector<u16> *dst() const {
+    return GetPointer<const flatbuffers::Vector<u16> *>(VT_DST);
   }
-  const ::flatbuffers::Vector<uint8_t> *msg() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_MSG);
+  const flatbuffers::Vector<u8> *msg() const {
+    return GetPointer<const flatbuffers::Vector<u8> *>(VT_MSG);
   }
-  uint8_t option() const {
-    return GetField<uint8_t>(VT_OPTION, 0);
+  u8 option() const {
+    return GetField<u8>(VT_OPTION, 0);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint64_t>(verifier, VT_ROOMID, 8) &&
-           VerifyField<uint8_t>(verifier, VT_CASTTYPE, 1) &&
+           VerifyField<u64>(verifier, VT_ROOMID) &&
+           VerifyField<u8>(verifier, VT_CASTTYPE) &&
            VerifyOffset(verifier, VT_DST) &&
            verifier.VerifyVector(dst()) &&
            VerifyOffset(verifier, VT_MSG) &&
            verifier.VerifyVector(msg()) &&
-           VerifyField<uint8_t>(verifier, VT_OPTION, 1) &&
+           VerifyField<u8>(verifier, VT_OPTION) &&
            verifier.EndTable();
   }
 };
 
 struct SendRoomMessageRequestBuilder {
-  typedef SendRoomMessageRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_roomId(uint64_t roomId) {
-    fbb_.AddElement<uint64_t>(SendRoomMessageRequest::VT_ROOMID, roomId, 0);
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_roomId(u64 roomId) {
+    fbb_.AddElement<u64>(SendRoomMessageRequest::VT_ROOMID, roomId, 0);
   }
-  void add_castType(uint8_t castType) {
-    fbb_.AddElement<uint8_t>(SendRoomMessageRequest::VT_CASTTYPE, castType, 0);
+  void add_castType(u8 castType) {
+    fbb_.AddElement<u8>(SendRoomMessageRequest::VT_CASTTYPE, castType, 0);
   }
-  void add_dst(::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> dst) {
+  void add_dst(flatbuffers::Offset<flatbuffers::Vector<u16>> dst) {
     fbb_.AddOffset(SendRoomMessageRequest::VT_DST, dst);
   }
-  void add_msg(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> msg) {
+  void add_msg(flatbuffers::Offset<flatbuffers::Vector<u8>> msg) {
     fbb_.AddOffset(SendRoomMessageRequest::VT_MSG, msg);
   }
-  void add_option(uint8_t option) {
-    fbb_.AddElement<uint8_t>(SendRoomMessageRequest::VT_OPTION, option, 0);
+  void add_option(u8 option) {
+    fbb_.AddElement<u8>(SendRoomMessageRequest::VT_OPTION, option, 0);
   }
-  explicit SendRoomMessageRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit SendRoomMessageRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<SendRoomMessageRequest> Finish() {
+  SendRoomMessageRequestBuilder &operator=(const SendRoomMessageRequestBuilder &);
+  flatbuffers::Offset<SendRoomMessageRequest> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<SendRoomMessageRequest>(end);
+    auto o = flatbuffers::Offset<SendRoomMessageRequest>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<SendRoomMessageRequest> CreateSendRoomMessageRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    uint8_t castType = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> dst = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> msg = 0,
-    uint8_t option = 0) {
+inline flatbuffers::Offset<SendRoomMessageRequest> CreateSendRoomMessageRequest(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u64 roomId = 0,
+    u8 castType = 0,
+    flatbuffers::Offset<flatbuffers::Vector<u16>> dst = 0,
+    flatbuffers::Offset<flatbuffers::Vector<u8>> msg = 0,
+    u8 option = 0) {
   SendRoomMessageRequestBuilder builder_(_fbb);
   builder_.add_roomId(roomId);
   builder_.add_msg(msg);
@@ -3687,15 +2657,15 @@ inline ::flatbuffers::Offset<SendRoomMessageRequest> CreateSendRoomMessageReques
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<SendRoomMessageRequest> CreateSendRoomMessageRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint64_t roomId = 0,
-    uint8_t castType = 0,
-    const std::vector<uint16_t> *dst = nullptr,
-    const std::vector<uint8_t> *msg = nullptr,
-    uint8_t option = 0) {
-  auto dst__ = dst ? _fbb.CreateVector<uint16_t>(*dst) : 0;
-  auto msg__ = msg ? _fbb.CreateVector<uint8_t>(*msg) : 0;
+inline flatbuffers::Offset<SendRoomMessageRequest> CreateSendRoomMessageRequestDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    u64 roomId = 0,
+    u8 castType = 0,
+    const std::vector<u16> *dst = nullptr,
+    const std::vector<u8> *msg = nullptr,
+    u8 option = 0) {
+  auto dst__ = dst ? _fbb.CreateVector<u16>(*dst) : 0;
+  auto msg__ = msg ? _fbb.CreateVector<u8>(*msg) : 0;
   return CreateSendRoomMessageRequest(
       _fbb,
       roomId,
@@ -3705,8 +2675,7 @@ inline ::flatbuffers::Offset<SendRoomMessageRequest> CreateSendRoomMessageReques
       option);
 }
 
-struct RoomMessageInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef RoomMessageInfoBuilder Builder;
+struct RoomMessageInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_FILTERED = 4,
     VT_CASTTYPE = 6,
@@ -3715,24 +2684,24 @@ struct RoomMessageInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     VT_MSG = 12
   };
   bool filtered() const {
-    return GetField<uint8_t>(VT_FILTERED, 0) != 0;
+    return GetField<u8>(VT_FILTERED, 0) != 0;
   }
-  uint8_t castType() const {
-    return GetField<uint8_t>(VT_CASTTYPE, 0);
+  u8 castType() const {
+    return GetField<u8>(VT_CASTTYPE, 0);
   }
-  const ::flatbuffers::Vector<uint16_t> *dst() const {
-    return GetPointer<const ::flatbuffers::Vector<uint16_t> *>(VT_DST);
+  const flatbuffers::Vector<u16> *dst() const {
+    return GetPointer<const flatbuffers::Vector<u16> *>(VT_DST);
   }
-  const UserInfo *srcMember() const {
-    return GetPointer<const UserInfo *>(VT_SRCMEMBER);
+  const UserInfo2 *srcMember() const {
+    return GetPointer<const UserInfo2 *>(VT_SRCMEMBER);
   }
-  const ::flatbuffers::Vector<uint8_t> *msg() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_MSG);
+  const flatbuffers::Vector<u8> *msg() const {
+    return GetPointer<const flatbuffers::Vector<u8> *>(VT_MSG);
   }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
+  bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
-           VerifyField<uint8_t>(verifier, VT_FILTERED, 1) &&
-           VerifyField<uint8_t>(verifier, VT_CASTTYPE, 1) &&
+           VerifyField<u8>(verifier, VT_FILTERED) &&
+           VerifyField<u8>(verifier, VT_CASTTYPE) &&
            VerifyOffset(verifier, VT_DST) &&
            verifier.VerifyVector(dst()) &&
            VerifyOffset(verifier, VT_SRCMEMBER) &&
@@ -3744,42 +2713,42 @@ struct RoomMessageInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
 };
 
 struct RoomMessageInfoBuilder {
-  typedef RoomMessageInfo Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
   void add_filtered(bool filtered) {
-    fbb_.AddElement<uint8_t>(RoomMessageInfo::VT_FILTERED, static_cast<uint8_t>(filtered), 0);
+    fbb_.AddElement<u8>(RoomMessageInfo::VT_FILTERED, static_cast<u8>(filtered), 0);
   }
-  void add_castType(uint8_t castType) {
-    fbb_.AddElement<uint8_t>(RoomMessageInfo::VT_CASTTYPE, castType, 0);
+  void add_castType(u8 castType) {
+    fbb_.AddElement<u8>(RoomMessageInfo::VT_CASTTYPE, castType, 0);
   }
-  void add_dst(::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> dst) {
+  void add_dst(flatbuffers::Offset<flatbuffers::Vector<u16>> dst) {
     fbb_.AddOffset(RoomMessageInfo::VT_DST, dst);
   }
-  void add_srcMember(::flatbuffers::Offset<UserInfo> srcMember) {
+  void add_srcMember(flatbuffers::Offset<UserInfo2> srcMember) {
     fbb_.AddOffset(RoomMessageInfo::VT_SRCMEMBER, srcMember);
   }
-  void add_msg(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> msg) {
+  void add_msg(flatbuffers::Offset<flatbuffers::Vector<u8>> msg) {
     fbb_.AddOffset(RoomMessageInfo::VT_MSG, msg);
   }
-  explicit RoomMessageInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
+  explicit RoomMessageInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
   }
-  ::flatbuffers::Offset<RoomMessageInfo> Finish() {
+  RoomMessageInfoBuilder &operator=(const RoomMessageInfoBuilder &);
+  flatbuffers::Offset<RoomMessageInfo> Finish() {
     const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<RoomMessageInfo>(end);
+    auto o = flatbuffers::Offset<RoomMessageInfo>(end);
     return o;
   }
 };
 
-inline ::flatbuffers::Offset<RoomMessageInfo> CreateRoomMessageInfo(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
+inline flatbuffers::Offset<RoomMessageInfo> CreateRoomMessageInfo(
+    flatbuffers::FlatBufferBuilder &_fbb,
     bool filtered = false,
-    uint8_t castType = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> dst = 0,
-    ::flatbuffers::Offset<UserInfo> srcMember = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> msg = 0) {
+    u8 castType = 0,
+    flatbuffers::Offset<flatbuffers::Vector<u16>> dst = 0,
+    flatbuffers::Offset<UserInfo2> srcMember = 0,
+    flatbuffers::Offset<flatbuffers::Vector<u8>> msg = 0) {
   RoomMessageInfoBuilder builder_(_fbb);
   builder_.add_msg(msg);
   builder_.add_srcMember(srcMember);
@@ -3789,15 +2758,15 @@ inline ::flatbuffers::Offset<RoomMessageInfo> CreateRoomMessageInfo(
   return builder_.Finish();
 }
 
-inline ::flatbuffers::Offset<RoomMessageInfo> CreateRoomMessageInfoDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
+inline flatbuffers::Offset<RoomMessageInfo> CreateRoomMessageInfoDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
     bool filtered = false,
-    uint8_t castType = 0,
-    const std::vector<uint16_t> *dst = nullptr,
-    ::flatbuffers::Offset<UserInfo> srcMember = 0,
-    const std::vector<uint8_t> *msg = nullptr) {
-  auto dst__ = dst ? _fbb.CreateVector<uint16_t>(*dst) : 0;
-  auto msg__ = msg ? _fbb.CreateVector<uint8_t>(*msg) : 0;
+    u8 castType = 0,
+    const std::vector<u16> *dst = nullptr,
+    flatbuffers::Offset<UserInfo2> srcMember = 0,
+    const std::vector<u8> *msg = nullptr) {
+  auto dst__ = dst ? _fbb.CreateVector<u16>(*dst) : 0;
+  auto msg__ = msg ? _fbb.CreateVector<u8>(*msg) : 0;
   return CreateRoomMessageInfo(
       _fbb,
       filtered,
@@ -3807,3621 +2776,4 @@ inline ::flatbuffers::Offset<RoomMessageInfo> CreateRoomMessageInfoDirect(
       msg__);
 }
 
-struct MessageDetails FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef MessageDetailsBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_COMMUNICATIONID = 4,
-    VT_MSGID = 6,
-    VT_MAINTYPE = 8,
-    VT_SUBTYPE = 10,
-    VT_MSGFEATURES = 12,
-    VT_SUBJECT = 14,
-    VT_BODY = 16,
-    VT_DATA = 18
-  };
-  const ::flatbuffers::String *communicationId() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_COMMUNICATIONID);
-  }
-  uint64_t msgId() const {
-    return GetField<uint64_t>(VT_MSGID, 0);
-  }
-  uint16_t mainType() const {
-    return GetField<uint16_t>(VT_MAINTYPE, 0);
-  }
-  uint16_t subType() const {
-    return GetField<uint16_t>(VT_SUBTYPE, 0);
-  }
-  uint32_t msgFeatures() const {
-    return GetField<uint32_t>(VT_MSGFEATURES, 0);
-  }
-  const ::flatbuffers::String *subject() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_SUBJECT);
-  }
-  const ::flatbuffers::String *body() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_BODY);
-  }
-  const ::flatbuffers::Vector<uint8_t> *data() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_DATA);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_COMMUNICATIONID) &&
-           verifier.VerifyString(communicationId()) &&
-           VerifyField<uint64_t>(verifier, VT_MSGID, 8) &&
-           VerifyField<uint16_t>(verifier, VT_MAINTYPE, 2) &&
-           VerifyField<uint16_t>(verifier, VT_SUBTYPE, 2) &&
-           VerifyField<uint32_t>(verifier, VT_MSGFEATURES, 4) &&
-           VerifyOffset(verifier, VT_SUBJECT) &&
-           verifier.VerifyString(subject()) &&
-           VerifyOffset(verifier, VT_BODY) &&
-           verifier.VerifyString(body()) &&
-           VerifyOffset(verifier, VT_DATA) &&
-           verifier.VerifyVector(data()) &&
-           verifier.EndTable();
-  }
-};
-
-struct MessageDetailsBuilder {
-  typedef MessageDetails Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_communicationId(::flatbuffers::Offset<::flatbuffers::String> communicationId) {
-    fbb_.AddOffset(MessageDetails::VT_COMMUNICATIONID, communicationId);
-  }
-  void add_msgId(uint64_t msgId) {
-    fbb_.AddElement<uint64_t>(MessageDetails::VT_MSGID, msgId, 0);
-  }
-  void add_mainType(uint16_t mainType) {
-    fbb_.AddElement<uint16_t>(MessageDetails::VT_MAINTYPE, mainType, 0);
-  }
-  void add_subType(uint16_t subType) {
-    fbb_.AddElement<uint16_t>(MessageDetails::VT_SUBTYPE, subType, 0);
-  }
-  void add_msgFeatures(uint32_t msgFeatures) {
-    fbb_.AddElement<uint32_t>(MessageDetails::VT_MSGFEATURES, msgFeatures, 0);
-  }
-  void add_subject(::flatbuffers::Offset<::flatbuffers::String> subject) {
-    fbb_.AddOffset(MessageDetails::VT_SUBJECT, subject);
-  }
-  void add_body(::flatbuffers::Offset<::flatbuffers::String> body) {
-    fbb_.AddOffset(MessageDetails::VT_BODY, body);
-  }
-  void add_data(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data) {
-    fbb_.AddOffset(MessageDetails::VT_DATA, data);
-  }
-  explicit MessageDetailsBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<MessageDetails> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<MessageDetails>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<MessageDetails> CreateMessageDetails(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::String> communicationId = 0,
-    uint64_t msgId = 0,
-    uint16_t mainType = 0,
-    uint16_t subType = 0,
-    uint32_t msgFeatures = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> subject = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> body = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data = 0) {
-  MessageDetailsBuilder builder_(_fbb);
-  builder_.add_msgId(msgId);
-  builder_.add_data(data);
-  builder_.add_body(body);
-  builder_.add_subject(subject);
-  builder_.add_msgFeatures(msgFeatures);
-  builder_.add_communicationId(communicationId);
-  builder_.add_subType(subType);
-  builder_.add_mainType(mainType);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<MessageDetails> CreateMessageDetailsDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const char *communicationId = nullptr,
-    uint64_t msgId = 0,
-    uint16_t mainType = 0,
-    uint16_t subType = 0,
-    uint32_t msgFeatures = 0,
-    const char *subject = nullptr,
-    const char *body = nullptr,
-    const std::vector<uint8_t> *data = nullptr) {
-  auto communicationId__ = communicationId ? _fbb.CreateString(communicationId) : 0;
-  auto subject__ = subject ? _fbb.CreateString(subject) : 0;
-  auto body__ = body ? _fbb.CreateString(body) : 0;
-  auto data__ = data ? _fbb.CreateVector<uint8_t>(*data) : 0;
-  return CreateMessageDetails(
-      _fbb,
-      communicationId__,
-      msgId,
-      mainType,
-      subType,
-      msgFeatures,
-      subject__,
-      body__,
-      data__);
-}
-
-struct SendMessageRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SendMessageRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_MESSAGE = 4,
-    VT_NPIDS = 6
-  };
-  const ::flatbuffers::Vector<uint8_t> *message() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_MESSAGE);
-  }
-  const MessageDetails *message_nested_root() const {
-    const auto _f = message();
-    return _f ? ::flatbuffers::GetRoot<MessageDetails>(_f->Data())
-              : nullptr;
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>> *npids() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>> *>(VT_NPIDS);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_MESSAGE) &&
-           verifier.VerifyVector(message()) &&
-           verifier.VerifyNestedFlatBuffer<MessageDetails>(message(), nullptr) &&
-           VerifyOffset(verifier, VT_NPIDS) &&
-           verifier.VerifyVector(npids()) &&
-           verifier.VerifyVectorOfStrings(npids()) &&
-           verifier.EndTable();
-  }
-};
-
-struct SendMessageRequestBuilder {
-  typedef SendMessageRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_message(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> message) {
-    fbb_.AddOffset(SendMessageRequest::VT_MESSAGE, message);
-  }
-  void add_npids(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> npids) {
-    fbb_.AddOffset(SendMessageRequest::VT_NPIDS, npids);
-  }
-  explicit SendMessageRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<SendMessageRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<SendMessageRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<SendMessageRequest> CreateSendMessageRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> message = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> npids = 0) {
-  SendMessageRequestBuilder builder_(_fbb);
-  builder_.add_npids(npids);
-  builder_.add_message(message);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<SendMessageRequest> CreateSendMessageRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<uint8_t> *message = nullptr,
-    const std::vector<::flatbuffers::Offset<::flatbuffers::String>> *npids = nullptr) {
-  auto message__ = message ? _fbb.CreateVector<uint8_t>(*message) : 0;
-  auto npids__ = npids ? _fbb.CreateVector<::flatbuffers::Offset<::flatbuffers::String>>(*npids) : 0;
-  return CreateSendMessageRequest(
-      _fbb,
-      message__,
-      npids__);
-}
-
-struct BoardInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef BoardInfoBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_RANKLIMIT = 4,
-    VT_UPDATEMODE = 6,
-    VT_SORTMODE = 8,
-    VT_UPLOADNUMLIMIT = 10,
-    VT_UPLOADSIZELIMIT = 12
-  };
-  uint32_t rankLimit() const {
-    return GetField<uint32_t>(VT_RANKLIMIT, 0);
-  }
-  uint32_t updateMode() const {
-    return GetField<uint32_t>(VT_UPDATEMODE, 0);
-  }
-  uint32_t sortMode() const {
-    return GetField<uint32_t>(VT_SORTMODE, 0);
-  }
-  uint32_t uploadNumLimit() const {
-    return GetField<uint32_t>(VT_UPLOADNUMLIMIT, 0);
-  }
-  uint32_t uploadSizeLimit() const {
-    return GetField<uint32_t>(VT_UPLOADSIZELIMIT, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_RANKLIMIT, 4) &&
-           VerifyField<uint32_t>(verifier, VT_UPDATEMODE, 4) &&
-           VerifyField<uint32_t>(verifier, VT_SORTMODE, 4) &&
-           VerifyField<uint32_t>(verifier, VT_UPLOADNUMLIMIT, 4) &&
-           VerifyField<uint32_t>(verifier, VT_UPLOADSIZELIMIT, 4) &&
-           verifier.EndTable();
-  }
-};
-
-struct BoardInfoBuilder {
-  typedef BoardInfo Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_rankLimit(uint32_t rankLimit) {
-    fbb_.AddElement<uint32_t>(BoardInfo::VT_RANKLIMIT, rankLimit, 0);
-  }
-  void add_updateMode(uint32_t updateMode) {
-    fbb_.AddElement<uint32_t>(BoardInfo::VT_UPDATEMODE, updateMode, 0);
-  }
-  void add_sortMode(uint32_t sortMode) {
-    fbb_.AddElement<uint32_t>(BoardInfo::VT_SORTMODE, sortMode, 0);
-  }
-  void add_uploadNumLimit(uint32_t uploadNumLimit) {
-    fbb_.AddElement<uint32_t>(BoardInfo::VT_UPLOADNUMLIMIT, uploadNumLimit, 0);
-  }
-  void add_uploadSizeLimit(uint32_t uploadSizeLimit) {
-    fbb_.AddElement<uint32_t>(BoardInfo::VT_UPLOADSIZELIMIT, uploadSizeLimit, 0);
-  }
-  explicit BoardInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<BoardInfo> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<BoardInfo>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<BoardInfo> CreateBoardInfo(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t rankLimit = 0,
-    uint32_t updateMode = 0,
-    uint32_t sortMode = 0,
-    uint32_t uploadNumLimit = 0,
-    uint32_t uploadSizeLimit = 0) {
-  BoardInfoBuilder builder_(_fbb);
-  builder_.add_uploadSizeLimit(uploadSizeLimit);
-  builder_.add_uploadNumLimit(uploadNumLimit);
-  builder_.add_sortMode(sortMode);
-  builder_.add_updateMode(updateMode);
-  builder_.add_rankLimit(rankLimit);
-  return builder_.Finish();
-}
-
-struct RecordScoreRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef RecordScoreRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_BOARDID = 4,
-    VT_PCID = 6,
-    VT_SCORE = 8,
-    VT_COMMENT = 10,
-    VT_DATA = 12
-  };
-  uint32_t boardId() const {
-    return GetField<uint32_t>(VT_BOARDID, 0);
-  }
-  int32_t pcId() const {
-    return GetField<int32_t>(VT_PCID, 0);
-  }
-  int64_t score() const {
-    return GetField<int64_t>(VT_SCORE, 0);
-  }
-  const ::flatbuffers::String *comment() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_COMMENT);
-  }
-  const ::flatbuffers::Vector<uint8_t> *data() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_DATA);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_BOARDID, 4) &&
-           VerifyField<int32_t>(verifier, VT_PCID, 4) &&
-           VerifyField<int64_t>(verifier, VT_SCORE, 8) &&
-           VerifyOffset(verifier, VT_COMMENT) &&
-           verifier.VerifyString(comment()) &&
-           VerifyOffset(verifier, VT_DATA) &&
-           verifier.VerifyVector(data()) &&
-           verifier.EndTable();
-  }
-};
-
-struct RecordScoreRequestBuilder {
-  typedef RecordScoreRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_boardId(uint32_t boardId) {
-    fbb_.AddElement<uint32_t>(RecordScoreRequest::VT_BOARDID, boardId, 0);
-  }
-  void add_pcId(int32_t pcId) {
-    fbb_.AddElement<int32_t>(RecordScoreRequest::VT_PCID, pcId, 0);
-  }
-  void add_score(int64_t score) {
-    fbb_.AddElement<int64_t>(RecordScoreRequest::VT_SCORE, score, 0);
-  }
-  void add_comment(::flatbuffers::Offset<::flatbuffers::String> comment) {
-    fbb_.AddOffset(RecordScoreRequest::VT_COMMENT, comment);
-  }
-  void add_data(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data) {
-    fbb_.AddOffset(RecordScoreRequest::VT_DATA, data);
-  }
-  explicit RecordScoreRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<RecordScoreRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<RecordScoreRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<RecordScoreRequest> CreateRecordScoreRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t boardId = 0,
-    int32_t pcId = 0,
-    int64_t score = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> comment = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data = 0) {
-  RecordScoreRequestBuilder builder_(_fbb);
-  builder_.add_score(score);
-  builder_.add_data(data);
-  builder_.add_comment(comment);
-  builder_.add_pcId(pcId);
-  builder_.add_boardId(boardId);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<RecordScoreRequest> CreateRecordScoreRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t boardId = 0,
-    int32_t pcId = 0,
-    int64_t score = 0,
-    const char *comment = nullptr,
-    const std::vector<uint8_t> *data = nullptr) {
-  auto comment__ = comment ? _fbb.CreateString(comment) : 0;
-  auto data__ = data ? _fbb.CreateVector<uint8_t>(*data) : 0;
-  return CreateRecordScoreRequest(
-      _fbb,
-      boardId,
-      pcId,
-      score,
-      comment__,
-      data__);
-}
-
-struct GetScoreRangeRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef GetScoreRangeRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_BOARDID = 4,
-    VT_STARTRANK = 6,
-    VT_NUMRANKS = 8,
-    VT_WITHCOMMENT = 10,
-    VT_WITHGAMEINFO = 12
-  };
-  uint32_t boardId() const {
-    return GetField<uint32_t>(VT_BOARDID, 0);
-  }
-  uint32_t startRank() const {
-    return GetField<uint32_t>(VT_STARTRANK, 0);
-  }
-  uint32_t numRanks() const {
-    return GetField<uint32_t>(VT_NUMRANKS, 0);
-  }
-  bool withComment() const {
-    return GetField<uint8_t>(VT_WITHCOMMENT, 0) != 0;
-  }
-  bool withGameInfo() const {
-    return GetField<uint8_t>(VT_WITHGAMEINFO, 0) != 0;
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_BOARDID, 4) &&
-           VerifyField<uint32_t>(verifier, VT_STARTRANK, 4) &&
-           VerifyField<uint32_t>(verifier, VT_NUMRANKS, 4) &&
-           VerifyField<uint8_t>(verifier, VT_WITHCOMMENT, 1) &&
-           VerifyField<uint8_t>(verifier, VT_WITHGAMEINFO, 1) &&
-           verifier.EndTable();
-  }
-};
-
-struct GetScoreRangeRequestBuilder {
-  typedef GetScoreRangeRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_boardId(uint32_t boardId) {
-    fbb_.AddElement<uint32_t>(GetScoreRangeRequest::VT_BOARDID, boardId, 0);
-  }
-  void add_startRank(uint32_t startRank) {
-    fbb_.AddElement<uint32_t>(GetScoreRangeRequest::VT_STARTRANK, startRank, 0);
-  }
-  void add_numRanks(uint32_t numRanks) {
-    fbb_.AddElement<uint32_t>(GetScoreRangeRequest::VT_NUMRANKS, numRanks, 0);
-  }
-  void add_withComment(bool withComment) {
-    fbb_.AddElement<uint8_t>(GetScoreRangeRequest::VT_WITHCOMMENT, static_cast<uint8_t>(withComment), 0);
-  }
-  void add_withGameInfo(bool withGameInfo) {
-    fbb_.AddElement<uint8_t>(GetScoreRangeRequest::VT_WITHGAMEINFO, static_cast<uint8_t>(withGameInfo), 0);
-  }
-  explicit GetScoreRangeRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<GetScoreRangeRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<GetScoreRangeRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<GetScoreRangeRequest> CreateGetScoreRangeRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t boardId = 0,
-    uint32_t startRank = 0,
-    uint32_t numRanks = 0,
-    bool withComment = false,
-    bool withGameInfo = false) {
-  GetScoreRangeRequestBuilder builder_(_fbb);
-  builder_.add_numRanks(numRanks);
-  builder_.add_startRank(startRank);
-  builder_.add_boardId(boardId);
-  builder_.add_withGameInfo(withGameInfo);
-  builder_.add_withComment(withComment);
-  return builder_.Finish();
-}
-
-struct ScoreNpIdPcId FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef ScoreNpIdPcIdBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_NPID = 4,
-    VT_PCID = 6
-  };
-  const ::flatbuffers::String *npid() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_NPID);
-  }
-  int32_t pcId() const {
-    return GetField<int32_t>(VT_PCID, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_NPID) &&
-           verifier.VerifyString(npid()) &&
-           VerifyField<int32_t>(verifier, VT_PCID, 4) &&
-           verifier.EndTable();
-  }
-};
-
-struct ScoreNpIdPcIdBuilder {
-  typedef ScoreNpIdPcId Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_npid(::flatbuffers::Offset<::flatbuffers::String> npid) {
-    fbb_.AddOffset(ScoreNpIdPcId::VT_NPID, npid);
-  }
-  void add_pcId(int32_t pcId) {
-    fbb_.AddElement<int32_t>(ScoreNpIdPcId::VT_PCID, pcId, 0);
-  }
-  explicit ScoreNpIdPcIdBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<ScoreNpIdPcId> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<ScoreNpIdPcId>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<ScoreNpIdPcId> CreateScoreNpIdPcId(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::String> npid = 0,
-    int32_t pcId = 0) {
-  ScoreNpIdPcIdBuilder builder_(_fbb);
-  builder_.add_pcId(pcId);
-  builder_.add_npid(npid);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<ScoreNpIdPcId> CreateScoreNpIdPcIdDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const char *npid = nullptr,
-    int32_t pcId = 0) {
-  auto npid__ = npid ? _fbb.CreateString(npid) : 0;
-  return CreateScoreNpIdPcId(
-      _fbb,
-      npid__,
-      pcId);
-}
-
-struct GetScoreNpIdRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef GetScoreNpIdRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_BOARDID = 4,
-    VT_NPIDS = 6,
-    VT_WITHCOMMENT = 8,
-    VT_WITHGAMEINFO = 10
-  };
-  uint32_t boardId() const {
-    return GetField<uint32_t>(VT_BOARDID, 0);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<ScoreNpIdPcId>> *npids() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<ScoreNpIdPcId>> *>(VT_NPIDS);
-  }
-  bool withComment() const {
-    return GetField<uint8_t>(VT_WITHCOMMENT, 0) != 0;
-  }
-  bool withGameInfo() const {
-    return GetField<uint8_t>(VT_WITHGAMEINFO, 0) != 0;
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_BOARDID, 4) &&
-           VerifyOffset(verifier, VT_NPIDS) &&
-           verifier.VerifyVector(npids()) &&
-           verifier.VerifyVectorOfTables(npids()) &&
-           VerifyField<uint8_t>(verifier, VT_WITHCOMMENT, 1) &&
-           VerifyField<uint8_t>(verifier, VT_WITHGAMEINFO, 1) &&
-           verifier.EndTable();
-  }
-};
-
-struct GetScoreNpIdRequestBuilder {
-  typedef GetScoreNpIdRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_boardId(uint32_t boardId) {
-    fbb_.AddElement<uint32_t>(GetScoreNpIdRequest::VT_BOARDID, boardId, 0);
-  }
-  void add_npids(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<ScoreNpIdPcId>>> npids) {
-    fbb_.AddOffset(GetScoreNpIdRequest::VT_NPIDS, npids);
-  }
-  void add_withComment(bool withComment) {
-    fbb_.AddElement<uint8_t>(GetScoreNpIdRequest::VT_WITHCOMMENT, static_cast<uint8_t>(withComment), 0);
-  }
-  void add_withGameInfo(bool withGameInfo) {
-    fbb_.AddElement<uint8_t>(GetScoreNpIdRequest::VT_WITHGAMEINFO, static_cast<uint8_t>(withGameInfo), 0);
-  }
-  explicit GetScoreNpIdRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<GetScoreNpIdRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<GetScoreNpIdRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<GetScoreNpIdRequest> CreateGetScoreNpIdRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t boardId = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<ScoreNpIdPcId>>> npids = 0,
-    bool withComment = false,
-    bool withGameInfo = false) {
-  GetScoreNpIdRequestBuilder builder_(_fbb);
-  builder_.add_npids(npids);
-  builder_.add_boardId(boardId);
-  builder_.add_withGameInfo(withGameInfo);
-  builder_.add_withComment(withComment);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<GetScoreNpIdRequest> CreateGetScoreNpIdRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t boardId = 0,
-    const std::vector<::flatbuffers::Offset<ScoreNpIdPcId>> *npids = nullptr,
-    bool withComment = false,
-    bool withGameInfo = false) {
-  auto npids__ = npids ? _fbb.CreateVector<::flatbuffers::Offset<ScoreNpIdPcId>>(*npids) : 0;
-  return CreateGetScoreNpIdRequest(
-      _fbb,
-      boardId,
-      npids__,
-      withComment,
-      withGameInfo);
-}
-
-struct GetScoreFriendsRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef GetScoreFriendsRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_BOARDID = 4,
-    VT_INCLUDE_SELF = 6,
-    VT_MAX = 8,
-    VT_WITHCOMMENT = 10,
-    VT_WITHGAMEINFO = 12
-  };
-  uint32_t boardId() const {
-    return GetField<uint32_t>(VT_BOARDID, 0);
-  }
-  bool include_self() const {
-    return GetField<uint8_t>(VT_INCLUDE_SELF, 0) != 0;
-  }
-  uint32_t max() const {
-    return GetField<uint32_t>(VT_MAX, 0);
-  }
-  bool withComment() const {
-    return GetField<uint8_t>(VT_WITHCOMMENT, 0) != 0;
-  }
-  bool withGameInfo() const {
-    return GetField<uint8_t>(VT_WITHGAMEINFO, 0) != 0;
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_BOARDID, 4) &&
-           VerifyField<uint8_t>(verifier, VT_INCLUDE_SELF, 1) &&
-           VerifyField<uint32_t>(verifier, VT_MAX, 4) &&
-           VerifyField<uint8_t>(verifier, VT_WITHCOMMENT, 1) &&
-           VerifyField<uint8_t>(verifier, VT_WITHGAMEINFO, 1) &&
-           verifier.EndTable();
-  }
-};
-
-struct GetScoreFriendsRequestBuilder {
-  typedef GetScoreFriendsRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_boardId(uint32_t boardId) {
-    fbb_.AddElement<uint32_t>(GetScoreFriendsRequest::VT_BOARDID, boardId, 0);
-  }
-  void add_include_self(bool include_self) {
-    fbb_.AddElement<uint8_t>(GetScoreFriendsRequest::VT_INCLUDE_SELF, static_cast<uint8_t>(include_self), 0);
-  }
-  void add_max(uint32_t max) {
-    fbb_.AddElement<uint32_t>(GetScoreFriendsRequest::VT_MAX, max, 0);
-  }
-  void add_withComment(bool withComment) {
-    fbb_.AddElement<uint8_t>(GetScoreFriendsRequest::VT_WITHCOMMENT, static_cast<uint8_t>(withComment), 0);
-  }
-  void add_withGameInfo(bool withGameInfo) {
-    fbb_.AddElement<uint8_t>(GetScoreFriendsRequest::VT_WITHGAMEINFO, static_cast<uint8_t>(withGameInfo), 0);
-  }
-  explicit GetScoreFriendsRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<GetScoreFriendsRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<GetScoreFriendsRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<GetScoreFriendsRequest> CreateGetScoreFriendsRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t boardId = 0,
-    bool include_self = false,
-    uint32_t max = 0,
-    bool withComment = false,
-    bool withGameInfo = false) {
-  GetScoreFriendsRequestBuilder builder_(_fbb);
-  builder_.add_max(max);
-  builder_.add_boardId(boardId);
-  builder_.add_withGameInfo(withGameInfo);
-  builder_.add_withComment(withComment);
-  builder_.add_include_self(include_self);
-  return builder_.Finish();
-}
-
-struct ScoreRankData FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef ScoreRankDataBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_NPID = 4,
-    VT_ONLINENAME = 6,
-    VT_PCID = 8,
-    VT_RANK = 10,
-    VT_SCORE = 12,
-    VT_HASGAMEDATA = 14,
-    VT_RECORDDATE = 16
-  };
-  const ::flatbuffers::String *npId() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_NPID);
-  }
-  const ::flatbuffers::String *onlineName() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_ONLINENAME);
-  }
-  int32_t pcId() const {
-    return GetField<int32_t>(VT_PCID, 0);
-  }
-  uint32_t rank() const {
-    return GetField<uint32_t>(VT_RANK, 0);
-  }
-  int64_t score() const {
-    return GetField<int64_t>(VT_SCORE, 0);
-  }
-  bool hasGameData() const {
-    return GetField<uint8_t>(VT_HASGAMEDATA, 0) != 0;
-  }
-  uint64_t recordDate() const {
-    return GetField<uint64_t>(VT_RECORDDATE, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_NPID) &&
-           verifier.VerifyString(npId()) &&
-           VerifyOffset(verifier, VT_ONLINENAME) &&
-           verifier.VerifyString(onlineName()) &&
-           VerifyField<int32_t>(verifier, VT_PCID, 4) &&
-           VerifyField<uint32_t>(verifier, VT_RANK, 4) &&
-           VerifyField<int64_t>(verifier, VT_SCORE, 8) &&
-           VerifyField<uint8_t>(verifier, VT_HASGAMEDATA, 1) &&
-           VerifyField<uint64_t>(verifier, VT_RECORDDATE, 8) &&
-           verifier.EndTable();
-  }
-};
-
-struct ScoreRankDataBuilder {
-  typedef ScoreRankData Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_npId(::flatbuffers::Offset<::flatbuffers::String> npId) {
-    fbb_.AddOffset(ScoreRankData::VT_NPID, npId);
-  }
-  void add_onlineName(::flatbuffers::Offset<::flatbuffers::String> onlineName) {
-    fbb_.AddOffset(ScoreRankData::VT_ONLINENAME, onlineName);
-  }
-  void add_pcId(int32_t pcId) {
-    fbb_.AddElement<int32_t>(ScoreRankData::VT_PCID, pcId, 0);
-  }
-  void add_rank(uint32_t rank) {
-    fbb_.AddElement<uint32_t>(ScoreRankData::VT_RANK, rank, 0);
-  }
-  void add_score(int64_t score) {
-    fbb_.AddElement<int64_t>(ScoreRankData::VT_SCORE, score, 0);
-  }
-  void add_hasGameData(bool hasGameData) {
-    fbb_.AddElement<uint8_t>(ScoreRankData::VT_HASGAMEDATA, static_cast<uint8_t>(hasGameData), 0);
-  }
-  void add_recordDate(uint64_t recordDate) {
-    fbb_.AddElement<uint64_t>(ScoreRankData::VT_RECORDDATE, recordDate, 0);
-  }
-  explicit ScoreRankDataBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<ScoreRankData> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<ScoreRankData>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<ScoreRankData> CreateScoreRankData(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::String> npId = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> onlineName = 0,
-    int32_t pcId = 0,
-    uint32_t rank = 0,
-    int64_t score = 0,
-    bool hasGameData = false,
-    uint64_t recordDate = 0) {
-  ScoreRankDataBuilder builder_(_fbb);
-  builder_.add_recordDate(recordDate);
-  builder_.add_score(score);
-  builder_.add_rank(rank);
-  builder_.add_pcId(pcId);
-  builder_.add_onlineName(onlineName);
-  builder_.add_npId(npId);
-  builder_.add_hasGameData(hasGameData);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<ScoreRankData> CreateScoreRankDataDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const char *npId = nullptr,
-    const char *onlineName = nullptr,
-    int32_t pcId = 0,
-    uint32_t rank = 0,
-    int64_t score = 0,
-    bool hasGameData = false,
-    uint64_t recordDate = 0) {
-  auto npId__ = npId ? _fbb.CreateString(npId) : 0;
-  auto onlineName__ = onlineName ? _fbb.CreateString(onlineName) : 0;
-  return CreateScoreRankData(
-      _fbb,
-      npId__,
-      onlineName__,
-      pcId,
-      rank,
-      score,
-      hasGameData,
-      recordDate);
-}
-
-struct ScoreInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef ScoreInfoBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_DATA = 4
-  };
-  const ::flatbuffers::Vector<uint8_t> *data() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_DATA);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_DATA) &&
-           verifier.VerifyVector(data()) &&
-           verifier.EndTable();
-  }
-};
-
-struct ScoreInfoBuilder {
-  typedef ScoreInfo Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_data(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data) {
-    fbb_.AddOffset(ScoreInfo::VT_DATA, data);
-  }
-  explicit ScoreInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<ScoreInfo> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<ScoreInfo>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<ScoreInfo> CreateScoreInfo(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data = 0) {
-  ScoreInfoBuilder builder_(_fbb);
-  builder_.add_data(data);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<ScoreInfo> CreateScoreInfoDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<uint8_t> *data = nullptr) {
-  auto data__ = data ? _fbb.CreateVector<uint8_t>(*data) : 0;
-  return CreateScoreInfo(
-      _fbb,
-      data__);
-}
-
-struct GetScoreResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef GetScoreResponseBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_RANKARRAY = 4,
-    VT_COMMENTARRAY = 6,
-    VT_INFOARRAY = 8,
-    VT_LASTSORTDATE = 10,
-    VT_TOTALRECORD = 12
-  };
-  const ::flatbuffers::Vector<::flatbuffers::Offset<ScoreRankData>> *rankArray() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<ScoreRankData>> *>(VT_RANKARRAY);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>> *commentArray() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>> *>(VT_COMMENTARRAY);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<ScoreInfo>> *infoArray() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<ScoreInfo>> *>(VT_INFOARRAY);
-  }
-  uint64_t lastSortDate() const {
-    return GetField<uint64_t>(VT_LASTSORTDATE, 0);
-  }
-  uint32_t totalRecord() const {
-    return GetField<uint32_t>(VT_TOTALRECORD, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_RANKARRAY) &&
-           verifier.VerifyVector(rankArray()) &&
-           verifier.VerifyVectorOfTables(rankArray()) &&
-           VerifyOffset(verifier, VT_COMMENTARRAY) &&
-           verifier.VerifyVector(commentArray()) &&
-           verifier.VerifyVectorOfStrings(commentArray()) &&
-           VerifyOffset(verifier, VT_INFOARRAY) &&
-           verifier.VerifyVector(infoArray()) &&
-           verifier.VerifyVectorOfTables(infoArray()) &&
-           VerifyField<uint64_t>(verifier, VT_LASTSORTDATE, 8) &&
-           VerifyField<uint32_t>(verifier, VT_TOTALRECORD, 4) &&
-           verifier.EndTable();
-  }
-};
-
-struct GetScoreResponseBuilder {
-  typedef GetScoreResponse Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_rankArray(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<ScoreRankData>>> rankArray) {
-    fbb_.AddOffset(GetScoreResponse::VT_RANKARRAY, rankArray);
-  }
-  void add_commentArray(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> commentArray) {
-    fbb_.AddOffset(GetScoreResponse::VT_COMMENTARRAY, commentArray);
-  }
-  void add_infoArray(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<ScoreInfo>>> infoArray) {
-    fbb_.AddOffset(GetScoreResponse::VT_INFOARRAY, infoArray);
-  }
-  void add_lastSortDate(uint64_t lastSortDate) {
-    fbb_.AddElement<uint64_t>(GetScoreResponse::VT_LASTSORTDATE, lastSortDate, 0);
-  }
-  void add_totalRecord(uint32_t totalRecord) {
-    fbb_.AddElement<uint32_t>(GetScoreResponse::VT_TOTALRECORD, totalRecord, 0);
-  }
-  explicit GetScoreResponseBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<GetScoreResponse> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<GetScoreResponse>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<GetScoreResponse> CreateGetScoreResponse(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<ScoreRankData>>> rankArray = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> commentArray = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<ScoreInfo>>> infoArray = 0,
-    uint64_t lastSortDate = 0,
-    uint32_t totalRecord = 0) {
-  GetScoreResponseBuilder builder_(_fbb);
-  builder_.add_lastSortDate(lastSortDate);
-  builder_.add_totalRecord(totalRecord);
-  builder_.add_infoArray(infoArray);
-  builder_.add_commentArray(commentArray);
-  builder_.add_rankArray(rankArray);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<GetScoreResponse> CreateGetScoreResponseDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<::flatbuffers::Offset<ScoreRankData>> *rankArray = nullptr,
-    const std::vector<::flatbuffers::Offset<::flatbuffers::String>> *commentArray = nullptr,
-    const std::vector<::flatbuffers::Offset<ScoreInfo>> *infoArray = nullptr,
-    uint64_t lastSortDate = 0,
-    uint32_t totalRecord = 0) {
-  auto rankArray__ = rankArray ? _fbb.CreateVector<::flatbuffers::Offset<ScoreRankData>>(*rankArray) : 0;
-  auto commentArray__ = commentArray ? _fbb.CreateVector<::flatbuffers::Offset<::flatbuffers::String>>(*commentArray) : 0;
-  auto infoArray__ = infoArray ? _fbb.CreateVector<::flatbuffers::Offset<ScoreInfo>>(*infoArray) : 0;
-  return CreateGetScoreResponse(
-      _fbb,
-      rankArray__,
-      commentArray__,
-      infoArray__,
-      lastSortDate,
-      totalRecord);
-}
-
-struct RecordScoreGameDataRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef RecordScoreGameDataRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_BOARDID = 4,
-    VT_PCID = 6,
-    VT_SCORE = 8
-  };
-  uint32_t boardId() const {
-    return GetField<uint32_t>(VT_BOARDID, 0);
-  }
-  int32_t pcId() const {
-    return GetField<int32_t>(VT_PCID, 0);
-  }
-  int64_t score() const {
-    return GetField<int64_t>(VT_SCORE, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_BOARDID, 4) &&
-           VerifyField<int32_t>(verifier, VT_PCID, 4) &&
-           VerifyField<int64_t>(verifier, VT_SCORE, 8) &&
-           verifier.EndTable();
-  }
-};
-
-struct RecordScoreGameDataRequestBuilder {
-  typedef RecordScoreGameDataRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_boardId(uint32_t boardId) {
-    fbb_.AddElement<uint32_t>(RecordScoreGameDataRequest::VT_BOARDID, boardId, 0);
-  }
-  void add_pcId(int32_t pcId) {
-    fbb_.AddElement<int32_t>(RecordScoreGameDataRequest::VT_PCID, pcId, 0);
-  }
-  void add_score(int64_t score) {
-    fbb_.AddElement<int64_t>(RecordScoreGameDataRequest::VT_SCORE, score, 0);
-  }
-  explicit RecordScoreGameDataRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<RecordScoreGameDataRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<RecordScoreGameDataRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<RecordScoreGameDataRequest> CreateRecordScoreGameDataRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t boardId = 0,
-    int32_t pcId = 0,
-    int64_t score = 0) {
-  RecordScoreGameDataRequestBuilder builder_(_fbb);
-  builder_.add_score(score);
-  builder_.add_pcId(pcId);
-  builder_.add_boardId(boardId);
-  return builder_.Finish();
-}
-
-struct GetScoreGameDataRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef GetScoreGameDataRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_BOARDID = 4,
-    VT_NPID = 6,
-    VT_PCID = 8
-  };
-  uint32_t boardId() const {
-    return GetField<uint32_t>(VT_BOARDID, 0);
-  }
-  const ::flatbuffers::String *npId() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_NPID);
-  }
-  int32_t pcId() const {
-    return GetField<int32_t>(VT_PCID, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_BOARDID, 4) &&
-           VerifyOffset(verifier, VT_NPID) &&
-           verifier.VerifyString(npId()) &&
-           VerifyField<int32_t>(verifier, VT_PCID, 4) &&
-           verifier.EndTable();
-  }
-};
-
-struct GetScoreGameDataRequestBuilder {
-  typedef GetScoreGameDataRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_boardId(uint32_t boardId) {
-    fbb_.AddElement<uint32_t>(GetScoreGameDataRequest::VT_BOARDID, boardId, 0);
-  }
-  void add_npId(::flatbuffers::Offset<::flatbuffers::String> npId) {
-    fbb_.AddOffset(GetScoreGameDataRequest::VT_NPID, npId);
-  }
-  void add_pcId(int32_t pcId) {
-    fbb_.AddElement<int32_t>(GetScoreGameDataRequest::VT_PCID, pcId, 0);
-  }
-  explicit GetScoreGameDataRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<GetScoreGameDataRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<GetScoreGameDataRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<GetScoreGameDataRequest> CreateGetScoreGameDataRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t boardId = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> npId = 0,
-    int32_t pcId = 0) {
-  GetScoreGameDataRequestBuilder builder_(_fbb);
-  builder_.add_pcId(pcId);
-  builder_.add_npId(npId);
-  builder_.add_boardId(boardId);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<GetScoreGameDataRequest> CreateGetScoreGameDataRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t boardId = 0,
-    const char *npId = nullptr,
-    int32_t pcId = 0) {
-  auto npId__ = npId ? _fbb.CreateString(npId) : 0;
-  return CreateGetScoreGameDataRequest(
-      _fbb,
-      boardId,
-      npId__,
-      pcId);
-}
-
-struct TusUser FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusUserBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_VUSER = 4,
-    VT_NPID = 6
-  };
-  bool vuser() const {
-    return GetField<uint8_t>(VT_VUSER, 0) != 0;
-  }
-  const ::flatbuffers::String *npid() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_NPID);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint8_t>(verifier, VT_VUSER, 1) &&
-           VerifyOffset(verifier, VT_NPID) &&
-           verifier.VerifyString(npid()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusUserBuilder {
-  typedef TusUser Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_vuser(bool vuser) {
-    fbb_.AddElement<uint8_t>(TusUser::VT_VUSER, static_cast<uint8_t>(vuser), 0);
-  }
-  void add_npid(::flatbuffers::Offset<::flatbuffers::String> npid) {
-    fbb_.AddOffset(TusUser::VT_NPID, npid);
-  }
-  explicit TusUserBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusUser> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusUser>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusUser> CreateTusUser(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    bool vuser = false,
-    ::flatbuffers::Offset<::flatbuffers::String> npid = 0) {
-  TusUserBuilder builder_(_fbb);
-  builder_.add_npid(npid);
-  builder_.add_vuser(vuser);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusUser> CreateTusUserDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    bool vuser = false,
-    const char *npid = nullptr) {
-  auto npid__ = npid ? _fbb.CreateString(npid) : 0;
-  return CreateTusUser(
-      _fbb,
-      vuser,
-      npid__);
-}
-
-struct TusVariable FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusVariableBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_OWNERID = 4,
-    VT_HASDATA = 6,
-    VT_LASTCHANGEDDATE = 8,
-    VT_LASTCHANGEDAUTHORID = 10,
-    VT_VARIABLE = 12,
-    VT_OLDVARIABLE = 14
-  };
-  const ::flatbuffers::String *ownerId() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_OWNERID);
-  }
-  bool hasData() const {
-    return GetField<uint8_t>(VT_HASDATA, 0) != 0;
-  }
-  uint64_t lastChangedDate() const {
-    return GetField<uint64_t>(VT_LASTCHANGEDDATE, 0);
-  }
-  const ::flatbuffers::String *lastChangedAuthorId() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_LASTCHANGEDAUTHORID);
-  }
-  int64_t variable() const {
-    return GetField<int64_t>(VT_VARIABLE, 0);
-  }
-  int64_t oldVariable() const {
-    return GetField<int64_t>(VT_OLDVARIABLE, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_OWNERID) &&
-           verifier.VerifyString(ownerId()) &&
-           VerifyField<uint8_t>(verifier, VT_HASDATA, 1) &&
-           VerifyField<uint64_t>(verifier, VT_LASTCHANGEDDATE, 8) &&
-           VerifyOffset(verifier, VT_LASTCHANGEDAUTHORID) &&
-           verifier.VerifyString(lastChangedAuthorId()) &&
-           VerifyField<int64_t>(verifier, VT_VARIABLE, 8) &&
-           VerifyField<int64_t>(verifier, VT_OLDVARIABLE, 8) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusVariableBuilder {
-  typedef TusVariable Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_ownerId(::flatbuffers::Offset<::flatbuffers::String> ownerId) {
-    fbb_.AddOffset(TusVariable::VT_OWNERID, ownerId);
-  }
-  void add_hasData(bool hasData) {
-    fbb_.AddElement<uint8_t>(TusVariable::VT_HASDATA, static_cast<uint8_t>(hasData), 0);
-  }
-  void add_lastChangedDate(uint64_t lastChangedDate) {
-    fbb_.AddElement<uint64_t>(TusVariable::VT_LASTCHANGEDDATE, lastChangedDate, 0);
-  }
-  void add_lastChangedAuthorId(::flatbuffers::Offset<::flatbuffers::String> lastChangedAuthorId) {
-    fbb_.AddOffset(TusVariable::VT_LASTCHANGEDAUTHORID, lastChangedAuthorId);
-  }
-  void add_variable(int64_t variable) {
-    fbb_.AddElement<int64_t>(TusVariable::VT_VARIABLE, variable, 0);
-  }
-  void add_oldVariable(int64_t oldVariable) {
-    fbb_.AddElement<int64_t>(TusVariable::VT_OLDVARIABLE, oldVariable, 0);
-  }
-  explicit TusVariableBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusVariable> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusVariable>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusVariable> CreateTusVariable(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::String> ownerId = 0,
-    bool hasData = false,
-    uint64_t lastChangedDate = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> lastChangedAuthorId = 0,
-    int64_t variable = 0,
-    int64_t oldVariable = 0) {
-  TusVariableBuilder builder_(_fbb);
-  builder_.add_oldVariable(oldVariable);
-  builder_.add_variable(variable);
-  builder_.add_lastChangedDate(lastChangedDate);
-  builder_.add_lastChangedAuthorId(lastChangedAuthorId);
-  builder_.add_ownerId(ownerId);
-  builder_.add_hasData(hasData);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusVariable> CreateTusVariableDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const char *ownerId = nullptr,
-    bool hasData = false,
-    uint64_t lastChangedDate = 0,
-    const char *lastChangedAuthorId = nullptr,
-    int64_t variable = 0,
-    int64_t oldVariable = 0) {
-  auto ownerId__ = ownerId ? _fbb.CreateString(ownerId) : 0;
-  auto lastChangedAuthorId__ = lastChangedAuthorId ? _fbb.CreateString(lastChangedAuthorId) : 0;
-  return CreateTusVariable(
-      _fbb,
-      ownerId__,
-      hasData,
-      lastChangedDate,
-      lastChangedAuthorId__,
-      variable,
-      oldVariable);
-}
-
-struct TusVarResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusVarResponseBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_VARS = 4
-  };
-  const ::flatbuffers::Vector<::flatbuffers::Offset<TusVariable>> *vars() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<TusVariable>> *>(VT_VARS);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_VARS) &&
-           verifier.VerifyVector(vars()) &&
-           verifier.VerifyVectorOfTables(vars()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusVarResponseBuilder {
-  typedef TusVarResponse Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_vars(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<TusVariable>>> vars) {
-    fbb_.AddOffset(TusVarResponse::VT_VARS, vars);
-  }
-  explicit TusVarResponseBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusVarResponse> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusVarResponse>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusVarResponse> CreateTusVarResponse(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<TusVariable>>> vars = 0) {
-  TusVarResponseBuilder builder_(_fbb);
-  builder_.add_vars(vars);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusVarResponse> CreateTusVarResponseDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<::flatbuffers::Offset<TusVariable>> *vars = nullptr) {
-  auto vars__ = vars ? _fbb.CreateVector<::flatbuffers::Offset<TusVariable>>(*vars) : 0;
-  return CreateTusVarResponse(
-      _fbb,
-      vars__);
-}
-
-struct TusSetMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusSetMultiSlotVariableRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_USER = 4,
-    VT_SLOTIDARRAY = 6,
-    VT_VARIABLEARRAY = 8
-  };
-  const TusUser *user() const {
-    return GetPointer<const TusUser *>(VT_USER);
-  }
-  const ::flatbuffers::Vector<int32_t> *slotIdArray() const {
-    return GetPointer<const ::flatbuffers::Vector<int32_t> *>(VT_SLOTIDARRAY);
-  }
-  const ::flatbuffers::Vector<int64_t> *variableArray() const {
-    return GetPointer<const ::flatbuffers::Vector<int64_t> *>(VT_VARIABLEARRAY);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_USER) &&
-           verifier.VerifyTable(user()) &&
-           VerifyOffset(verifier, VT_SLOTIDARRAY) &&
-           verifier.VerifyVector(slotIdArray()) &&
-           VerifyOffset(verifier, VT_VARIABLEARRAY) &&
-           verifier.VerifyVector(variableArray()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusSetMultiSlotVariableRequestBuilder {
-  typedef TusSetMultiSlotVariableRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_user(::flatbuffers::Offset<TusUser> user) {
-    fbb_.AddOffset(TusSetMultiSlotVariableRequest::VT_USER, user);
-  }
-  void add_slotIdArray(::flatbuffers::Offset<::flatbuffers::Vector<int32_t>> slotIdArray) {
-    fbb_.AddOffset(TusSetMultiSlotVariableRequest::VT_SLOTIDARRAY, slotIdArray);
-  }
-  void add_variableArray(::flatbuffers::Offset<::flatbuffers::Vector<int64_t>> variableArray) {
-    fbb_.AddOffset(TusSetMultiSlotVariableRequest::VT_VARIABLEARRAY, variableArray);
-  }
-  explicit TusSetMultiSlotVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusSetMultiSlotVariableRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusSetMultiSlotVariableRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusSetMultiSlotVariableRequest> CreateTusSetMultiSlotVariableRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<int32_t>> slotIdArray = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<int64_t>> variableArray = 0) {
-  TusSetMultiSlotVariableRequestBuilder builder_(_fbb);
-  builder_.add_variableArray(variableArray);
-  builder_.add_slotIdArray(slotIdArray);
-  builder_.add_user(user);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusSetMultiSlotVariableRequest> CreateTusSetMultiSlotVariableRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    const std::vector<int32_t> *slotIdArray = nullptr,
-    const std::vector<int64_t> *variableArray = nullptr) {
-  auto slotIdArray__ = slotIdArray ? _fbb.CreateVector<int32_t>(*slotIdArray) : 0;
-  auto variableArray__ = variableArray ? _fbb.CreateVector<int64_t>(*variableArray) : 0;
-  return CreateTusSetMultiSlotVariableRequest(
-      _fbb,
-      user,
-      slotIdArray__,
-      variableArray__);
-}
-
-struct TusGetMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusGetMultiSlotVariableRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_USER = 4,
-    VT_SLOTIDARRAY = 6
-  };
-  const TusUser *user() const {
-    return GetPointer<const TusUser *>(VT_USER);
-  }
-  const ::flatbuffers::Vector<int32_t> *slotIdArray() const {
-    return GetPointer<const ::flatbuffers::Vector<int32_t> *>(VT_SLOTIDARRAY);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_USER) &&
-           verifier.VerifyTable(user()) &&
-           VerifyOffset(verifier, VT_SLOTIDARRAY) &&
-           verifier.VerifyVector(slotIdArray()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusGetMultiSlotVariableRequestBuilder {
-  typedef TusGetMultiSlotVariableRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_user(::flatbuffers::Offset<TusUser> user) {
-    fbb_.AddOffset(TusGetMultiSlotVariableRequest::VT_USER, user);
-  }
-  void add_slotIdArray(::flatbuffers::Offset<::flatbuffers::Vector<int32_t>> slotIdArray) {
-    fbb_.AddOffset(TusGetMultiSlotVariableRequest::VT_SLOTIDARRAY, slotIdArray);
-  }
-  explicit TusGetMultiSlotVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusGetMultiSlotVariableRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusGetMultiSlotVariableRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusGetMultiSlotVariableRequest> CreateTusGetMultiSlotVariableRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<int32_t>> slotIdArray = 0) {
-  TusGetMultiSlotVariableRequestBuilder builder_(_fbb);
-  builder_.add_slotIdArray(slotIdArray);
-  builder_.add_user(user);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusGetMultiSlotVariableRequest> CreateTusGetMultiSlotVariableRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    const std::vector<int32_t> *slotIdArray = nullptr) {
-  auto slotIdArray__ = slotIdArray ? _fbb.CreateVector<int32_t>(*slotIdArray) : 0;
-  return CreateTusGetMultiSlotVariableRequest(
-      _fbb,
-      user,
-      slotIdArray__);
-}
-
-struct TusGetMultiUserVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusGetMultiUserVariableRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_USERS = 4,
-    VT_SLOTID = 6
-  };
-  const ::flatbuffers::Vector<::flatbuffers::Offset<TusUser>> *users() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<TusUser>> *>(VT_USERS);
-  }
-  int32_t slotId() const {
-    return GetField<int32_t>(VT_SLOTID, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_USERS) &&
-           verifier.VerifyVector(users()) &&
-           verifier.VerifyVectorOfTables(users()) &&
-           VerifyField<int32_t>(verifier, VT_SLOTID, 4) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusGetMultiUserVariableRequestBuilder {
-  typedef TusGetMultiUserVariableRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_users(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<TusUser>>> users) {
-    fbb_.AddOffset(TusGetMultiUserVariableRequest::VT_USERS, users);
-  }
-  void add_slotId(int32_t slotId) {
-    fbb_.AddElement<int32_t>(TusGetMultiUserVariableRequest::VT_SLOTID, slotId, 0);
-  }
-  explicit TusGetMultiUserVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusGetMultiUserVariableRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusGetMultiUserVariableRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusGetMultiUserVariableRequest> CreateTusGetMultiUserVariableRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<TusUser>>> users = 0,
-    int32_t slotId = 0) {
-  TusGetMultiUserVariableRequestBuilder builder_(_fbb);
-  builder_.add_slotId(slotId);
-  builder_.add_users(users);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusGetMultiUserVariableRequest> CreateTusGetMultiUserVariableRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<::flatbuffers::Offset<TusUser>> *users = nullptr,
-    int32_t slotId = 0) {
-  auto users__ = users ? _fbb.CreateVector<::flatbuffers::Offset<TusUser>>(*users) : 0;
-  return CreateTusGetMultiUserVariableRequest(
-      _fbb,
-      users__,
-      slotId);
-}
-
-struct TusGetFriendsVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusGetFriendsVariableRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_SLOTID = 4,
-    VT_INCLUDESELF = 6,
-    VT_SORTTYPE = 8,
-    VT_ARRAYNUM = 10
-  };
-  int32_t slotId() const {
-    return GetField<int32_t>(VT_SLOTID, 0);
-  }
-  bool includeSelf() const {
-    return GetField<uint8_t>(VT_INCLUDESELF, 0) != 0;
-  }
-  int32_t sortType() const {
-    return GetField<int32_t>(VT_SORTTYPE, 0);
-  }
-  uint32_t arrayNum() const {
-    return GetField<uint32_t>(VT_ARRAYNUM, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<int32_t>(verifier, VT_SLOTID, 4) &&
-           VerifyField<uint8_t>(verifier, VT_INCLUDESELF, 1) &&
-           VerifyField<int32_t>(verifier, VT_SORTTYPE, 4) &&
-           VerifyField<uint32_t>(verifier, VT_ARRAYNUM, 4) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusGetFriendsVariableRequestBuilder {
-  typedef TusGetFriendsVariableRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_slotId(int32_t slotId) {
-    fbb_.AddElement<int32_t>(TusGetFriendsVariableRequest::VT_SLOTID, slotId, 0);
-  }
-  void add_includeSelf(bool includeSelf) {
-    fbb_.AddElement<uint8_t>(TusGetFriendsVariableRequest::VT_INCLUDESELF, static_cast<uint8_t>(includeSelf), 0);
-  }
-  void add_sortType(int32_t sortType) {
-    fbb_.AddElement<int32_t>(TusGetFriendsVariableRequest::VT_SORTTYPE, sortType, 0);
-  }
-  void add_arrayNum(uint32_t arrayNum) {
-    fbb_.AddElement<uint32_t>(TusGetFriendsVariableRequest::VT_ARRAYNUM, arrayNum, 0);
-  }
-  explicit TusGetFriendsVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusGetFriendsVariableRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusGetFriendsVariableRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusGetFriendsVariableRequest> CreateTusGetFriendsVariableRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    int32_t slotId = 0,
-    bool includeSelf = false,
-    int32_t sortType = 0,
-    uint32_t arrayNum = 0) {
-  TusGetFriendsVariableRequestBuilder builder_(_fbb);
-  builder_.add_arrayNum(arrayNum);
-  builder_.add_sortType(sortType);
-  builder_.add_slotId(slotId);
-  builder_.add_includeSelf(includeSelf);
-  return builder_.Finish();
-}
-
-struct TusAddAndGetVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusAddAndGetVariableRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_USER = 4,
-    VT_SLOTID = 6,
-    VT_INVARIABLE = 8,
-    VT_ISLASTCHANGEDDATE = 10,
-    VT_ISLASTCHANGEDAUTHORID = 12
-  };
-  const TusUser *user() const {
-    return GetPointer<const TusUser *>(VT_USER);
-  }
-  int32_t slotId() const {
-    return GetField<int32_t>(VT_SLOTID, 0);
-  }
-  int64_t inVariable() const {
-    return GetField<int64_t>(VT_INVARIABLE, 0);
-  }
-  const ::flatbuffers::Vector<uint64_t> *isLastChangedDate() const {
-    return GetPointer<const ::flatbuffers::Vector<uint64_t> *>(VT_ISLASTCHANGEDDATE);
-  }
-  const ::flatbuffers::String *isLastChangedAuthorId() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_ISLASTCHANGEDAUTHORID);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_USER) &&
-           verifier.VerifyTable(user()) &&
-           VerifyField<int32_t>(verifier, VT_SLOTID, 4) &&
-           VerifyField<int64_t>(verifier, VT_INVARIABLE, 8) &&
-           VerifyOffset(verifier, VT_ISLASTCHANGEDDATE) &&
-           verifier.VerifyVector(isLastChangedDate()) &&
-           VerifyOffset(verifier, VT_ISLASTCHANGEDAUTHORID) &&
-           verifier.VerifyString(isLastChangedAuthorId()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusAddAndGetVariableRequestBuilder {
-  typedef TusAddAndGetVariableRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_user(::flatbuffers::Offset<TusUser> user) {
-    fbb_.AddOffset(TusAddAndGetVariableRequest::VT_USER, user);
-  }
-  void add_slotId(int32_t slotId) {
-    fbb_.AddElement<int32_t>(TusAddAndGetVariableRequest::VT_SLOTID, slotId, 0);
-  }
-  void add_inVariable(int64_t inVariable) {
-    fbb_.AddElement<int64_t>(TusAddAndGetVariableRequest::VT_INVARIABLE, inVariable, 0);
-  }
-  void add_isLastChangedDate(::flatbuffers::Offset<::flatbuffers::Vector<uint64_t>> isLastChangedDate) {
-    fbb_.AddOffset(TusAddAndGetVariableRequest::VT_ISLASTCHANGEDDATE, isLastChangedDate);
-  }
-  void add_isLastChangedAuthorId(::flatbuffers::Offset<::flatbuffers::String> isLastChangedAuthorId) {
-    fbb_.AddOffset(TusAddAndGetVariableRequest::VT_ISLASTCHANGEDAUTHORID, isLastChangedAuthorId);
-  }
-  explicit TusAddAndGetVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusAddAndGetVariableRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusAddAndGetVariableRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusAddAndGetVariableRequest> CreateTusAddAndGetVariableRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    int32_t slotId = 0,
-    int64_t inVariable = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint64_t>> isLastChangedDate = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> isLastChangedAuthorId = 0) {
-  TusAddAndGetVariableRequestBuilder builder_(_fbb);
-  builder_.add_inVariable(inVariable);
-  builder_.add_isLastChangedAuthorId(isLastChangedAuthorId);
-  builder_.add_isLastChangedDate(isLastChangedDate);
-  builder_.add_slotId(slotId);
-  builder_.add_user(user);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusAddAndGetVariableRequest> CreateTusAddAndGetVariableRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    int32_t slotId = 0,
-    int64_t inVariable = 0,
-    const std::vector<uint64_t> *isLastChangedDate = nullptr,
-    const char *isLastChangedAuthorId = nullptr) {
-  auto isLastChangedDate__ = isLastChangedDate ? _fbb.CreateVector<uint64_t>(*isLastChangedDate) : 0;
-  auto isLastChangedAuthorId__ = isLastChangedAuthorId ? _fbb.CreateString(isLastChangedAuthorId) : 0;
-  return CreateTusAddAndGetVariableRequest(
-      _fbb,
-      user,
-      slotId,
-      inVariable,
-      isLastChangedDate__,
-      isLastChangedAuthorId__);
-}
-
-struct TusTryAndSetVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusTryAndSetVariableRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_USER = 4,
-    VT_SLOTID = 6,
-    VT_OPETYPE = 8,
-    VT_VARIABLE = 10,
-    VT_ISLASTCHANGEDDATE = 12,
-    VT_ISLASTCHANGEDAUTHORID = 14,
-    VT_COMPAREVALUE = 16
-  };
-  const TusUser *user() const {
-    return GetPointer<const TusUser *>(VT_USER);
-  }
-  int32_t slotId() const {
-    return GetField<int32_t>(VT_SLOTID, 0);
-  }
-  int32_t opeType() const {
-    return GetField<int32_t>(VT_OPETYPE, 0);
-  }
-  int64_t variable() const {
-    return GetField<int64_t>(VT_VARIABLE, 0);
-  }
-  const ::flatbuffers::Vector<uint64_t> *isLastChangedDate() const {
-    return GetPointer<const ::flatbuffers::Vector<uint64_t> *>(VT_ISLASTCHANGEDDATE);
-  }
-  const ::flatbuffers::String *isLastChangedAuthorId() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_ISLASTCHANGEDAUTHORID);
-  }
-  const ::flatbuffers::Vector<int64_t> *compareValue() const {
-    return GetPointer<const ::flatbuffers::Vector<int64_t> *>(VT_COMPAREVALUE);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_USER) &&
-           verifier.VerifyTable(user()) &&
-           VerifyField<int32_t>(verifier, VT_SLOTID, 4) &&
-           VerifyField<int32_t>(verifier, VT_OPETYPE, 4) &&
-           VerifyField<int64_t>(verifier, VT_VARIABLE, 8) &&
-           VerifyOffset(verifier, VT_ISLASTCHANGEDDATE) &&
-           verifier.VerifyVector(isLastChangedDate()) &&
-           VerifyOffset(verifier, VT_ISLASTCHANGEDAUTHORID) &&
-           verifier.VerifyString(isLastChangedAuthorId()) &&
-           VerifyOffset(verifier, VT_COMPAREVALUE) &&
-           verifier.VerifyVector(compareValue()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusTryAndSetVariableRequestBuilder {
-  typedef TusTryAndSetVariableRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_user(::flatbuffers::Offset<TusUser> user) {
-    fbb_.AddOffset(TusTryAndSetVariableRequest::VT_USER, user);
-  }
-  void add_slotId(int32_t slotId) {
-    fbb_.AddElement<int32_t>(TusTryAndSetVariableRequest::VT_SLOTID, slotId, 0);
-  }
-  void add_opeType(int32_t opeType) {
-    fbb_.AddElement<int32_t>(TusTryAndSetVariableRequest::VT_OPETYPE, opeType, 0);
-  }
-  void add_variable(int64_t variable) {
-    fbb_.AddElement<int64_t>(TusTryAndSetVariableRequest::VT_VARIABLE, variable, 0);
-  }
-  void add_isLastChangedDate(::flatbuffers::Offset<::flatbuffers::Vector<uint64_t>> isLastChangedDate) {
-    fbb_.AddOffset(TusTryAndSetVariableRequest::VT_ISLASTCHANGEDDATE, isLastChangedDate);
-  }
-  void add_isLastChangedAuthorId(::flatbuffers::Offset<::flatbuffers::String> isLastChangedAuthorId) {
-    fbb_.AddOffset(TusTryAndSetVariableRequest::VT_ISLASTCHANGEDAUTHORID, isLastChangedAuthorId);
-  }
-  void add_compareValue(::flatbuffers::Offset<::flatbuffers::Vector<int64_t>> compareValue) {
-    fbb_.AddOffset(TusTryAndSetVariableRequest::VT_COMPAREVALUE, compareValue);
-  }
-  explicit TusTryAndSetVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusTryAndSetVariableRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusTryAndSetVariableRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusTryAndSetVariableRequest> CreateTusTryAndSetVariableRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    int32_t slotId = 0,
-    int32_t opeType = 0,
-    int64_t variable = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint64_t>> isLastChangedDate = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> isLastChangedAuthorId = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<int64_t>> compareValue = 0) {
-  TusTryAndSetVariableRequestBuilder builder_(_fbb);
-  builder_.add_variable(variable);
-  builder_.add_compareValue(compareValue);
-  builder_.add_isLastChangedAuthorId(isLastChangedAuthorId);
-  builder_.add_isLastChangedDate(isLastChangedDate);
-  builder_.add_opeType(opeType);
-  builder_.add_slotId(slotId);
-  builder_.add_user(user);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusTryAndSetVariableRequest> CreateTusTryAndSetVariableRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    int32_t slotId = 0,
-    int32_t opeType = 0,
-    int64_t variable = 0,
-    const std::vector<uint64_t> *isLastChangedDate = nullptr,
-    const char *isLastChangedAuthorId = nullptr,
-    const std::vector<int64_t> *compareValue = nullptr) {
-  auto isLastChangedDate__ = isLastChangedDate ? _fbb.CreateVector<uint64_t>(*isLastChangedDate) : 0;
-  auto isLastChangedAuthorId__ = isLastChangedAuthorId ? _fbb.CreateString(isLastChangedAuthorId) : 0;
-  auto compareValue__ = compareValue ? _fbb.CreateVector<int64_t>(*compareValue) : 0;
-  return CreateTusTryAndSetVariableRequest(
-      _fbb,
-      user,
-      slotId,
-      opeType,
-      variable,
-      isLastChangedDate__,
-      isLastChangedAuthorId__,
-      compareValue__);
-}
-
-struct TusDeleteMultiSlotVariableRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusDeleteMultiSlotVariableRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_USER = 4,
-    VT_SLOTIDARRAY = 6
-  };
-  const TusUser *user() const {
-    return GetPointer<const TusUser *>(VT_USER);
-  }
-  const ::flatbuffers::Vector<int32_t> *slotIdArray() const {
-    return GetPointer<const ::flatbuffers::Vector<int32_t> *>(VT_SLOTIDARRAY);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_USER) &&
-           verifier.VerifyTable(user()) &&
-           VerifyOffset(verifier, VT_SLOTIDARRAY) &&
-           verifier.VerifyVector(slotIdArray()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusDeleteMultiSlotVariableRequestBuilder {
-  typedef TusDeleteMultiSlotVariableRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_user(::flatbuffers::Offset<TusUser> user) {
-    fbb_.AddOffset(TusDeleteMultiSlotVariableRequest::VT_USER, user);
-  }
-  void add_slotIdArray(::flatbuffers::Offset<::flatbuffers::Vector<int32_t>> slotIdArray) {
-    fbb_.AddOffset(TusDeleteMultiSlotVariableRequest::VT_SLOTIDARRAY, slotIdArray);
-  }
-  explicit TusDeleteMultiSlotVariableRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusDeleteMultiSlotVariableRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusDeleteMultiSlotVariableRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusDeleteMultiSlotVariableRequest> CreateTusDeleteMultiSlotVariableRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<int32_t>> slotIdArray = 0) {
-  TusDeleteMultiSlotVariableRequestBuilder builder_(_fbb);
-  builder_.add_slotIdArray(slotIdArray);
-  builder_.add_user(user);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusDeleteMultiSlotVariableRequest> CreateTusDeleteMultiSlotVariableRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    const std::vector<int32_t> *slotIdArray = nullptr) {
-  auto slotIdArray__ = slotIdArray ? _fbb.CreateVector<int32_t>(*slotIdArray) : 0;
-  return CreateTusDeleteMultiSlotVariableRequest(
-      _fbb,
-      user,
-      slotIdArray__);
-}
-
-struct TusSetDataRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusSetDataRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_USER = 4,
-    VT_SLOTID = 6,
-    VT_DATA = 8,
-    VT_INFO = 10,
-    VT_ISLASTCHANGEDDATE = 12,
-    VT_ISLASTCHANGEDAUTHORID = 14
-  };
-  const TusUser *user() const {
-    return GetPointer<const TusUser *>(VT_USER);
-  }
-  int32_t slotId() const {
-    return GetField<int32_t>(VT_SLOTID, 0);
-  }
-  const ::flatbuffers::Vector<uint8_t> *data() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_DATA);
-  }
-  const ::flatbuffers::Vector<uint8_t> *info() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_INFO);
-  }
-  const ::flatbuffers::Vector<uint64_t> *isLastChangedDate() const {
-    return GetPointer<const ::flatbuffers::Vector<uint64_t> *>(VT_ISLASTCHANGEDDATE);
-  }
-  const ::flatbuffers::String *isLastChangedAuthorId() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_ISLASTCHANGEDAUTHORID);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_USER) &&
-           verifier.VerifyTable(user()) &&
-           VerifyField<int32_t>(verifier, VT_SLOTID, 4) &&
-           VerifyOffset(verifier, VT_DATA) &&
-           verifier.VerifyVector(data()) &&
-           VerifyOffset(verifier, VT_INFO) &&
-           verifier.VerifyVector(info()) &&
-           VerifyOffset(verifier, VT_ISLASTCHANGEDDATE) &&
-           verifier.VerifyVector(isLastChangedDate()) &&
-           VerifyOffset(verifier, VT_ISLASTCHANGEDAUTHORID) &&
-           verifier.VerifyString(isLastChangedAuthorId()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusSetDataRequestBuilder {
-  typedef TusSetDataRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_user(::flatbuffers::Offset<TusUser> user) {
-    fbb_.AddOffset(TusSetDataRequest::VT_USER, user);
-  }
-  void add_slotId(int32_t slotId) {
-    fbb_.AddElement<int32_t>(TusSetDataRequest::VT_SLOTID, slotId, 0);
-  }
-  void add_data(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data) {
-    fbb_.AddOffset(TusSetDataRequest::VT_DATA, data);
-  }
-  void add_info(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> info) {
-    fbb_.AddOffset(TusSetDataRequest::VT_INFO, info);
-  }
-  void add_isLastChangedDate(::flatbuffers::Offset<::flatbuffers::Vector<uint64_t>> isLastChangedDate) {
-    fbb_.AddOffset(TusSetDataRequest::VT_ISLASTCHANGEDDATE, isLastChangedDate);
-  }
-  void add_isLastChangedAuthorId(::flatbuffers::Offset<::flatbuffers::String> isLastChangedAuthorId) {
-    fbb_.AddOffset(TusSetDataRequest::VT_ISLASTCHANGEDAUTHORID, isLastChangedAuthorId);
-  }
-  explicit TusSetDataRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusSetDataRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusSetDataRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusSetDataRequest> CreateTusSetDataRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    int32_t slotId = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> info = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint64_t>> isLastChangedDate = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> isLastChangedAuthorId = 0) {
-  TusSetDataRequestBuilder builder_(_fbb);
-  builder_.add_isLastChangedAuthorId(isLastChangedAuthorId);
-  builder_.add_isLastChangedDate(isLastChangedDate);
-  builder_.add_info(info);
-  builder_.add_data(data);
-  builder_.add_slotId(slotId);
-  builder_.add_user(user);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusSetDataRequest> CreateTusSetDataRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    int32_t slotId = 0,
-    const std::vector<uint8_t> *data = nullptr,
-    const std::vector<uint8_t> *info = nullptr,
-    const std::vector<uint64_t> *isLastChangedDate = nullptr,
-    const char *isLastChangedAuthorId = nullptr) {
-  auto data__ = data ? _fbb.CreateVector<uint8_t>(*data) : 0;
-  auto info__ = info ? _fbb.CreateVector<uint8_t>(*info) : 0;
-  auto isLastChangedDate__ = isLastChangedDate ? _fbb.CreateVector<uint64_t>(*isLastChangedDate) : 0;
-  auto isLastChangedAuthorId__ = isLastChangedAuthorId ? _fbb.CreateString(isLastChangedAuthorId) : 0;
-  return CreateTusSetDataRequest(
-      _fbb,
-      user,
-      slotId,
-      data__,
-      info__,
-      isLastChangedDate__,
-      isLastChangedAuthorId__);
-}
-
-struct TusDataStatus FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusDataStatusBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_OWNERID = 4,
-    VT_HASDATA = 6,
-    VT_LASTCHANGEDDATE = 8,
-    VT_LASTCHANGEDAUTHORID = 10,
-    VT_INFO = 12
-  };
-  const ::flatbuffers::String *ownerId() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_OWNERID);
-  }
-  bool hasData() const {
-    return GetField<uint8_t>(VT_HASDATA, 0) != 0;
-  }
-  uint64_t lastChangedDate() const {
-    return GetField<uint64_t>(VT_LASTCHANGEDDATE, 0);
-  }
-  const ::flatbuffers::String *lastChangedAuthorId() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_LASTCHANGEDAUTHORID);
-  }
-  const ::flatbuffers::Vector<uint8_t> *info() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_INFO);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_OWNERID) &&
-           verifier.VerifyString(ownerId()) &&
-           VerifyField<uint8_t>(verifier, VT_HASDATA, 1) &&
-           VerifyField<uint64_t>(verifier, VT_LASTCHANGEDDATE, 8) &&
-           VerifyOffset(verifier, VT_LASTCHANGEDAUTHORID) &&
-           verifier.VerifyString(lastChangedAuthorId()) &&
-           VerifyOffset(verifier, VT_INFO) &&
-           verifier.VerifyVector(info()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusDataStatusBuilder {
-  typedef TusDataStatus Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_ownerId(::flatbuffers::Offset<::flatbuffers::String> ownerId) {
-    fbb_.AddOffset(TusDataStatus::VT_OWNERID, ownerId);
-  }
-  void add_hasData(bool hasData) {
-    fbb_.AddElement<uint8_t>(TusDataStatus::VT_HASDATA, static_cast<uint8_t>(hasData), 0);
-  }
-  void add_lastChangedDate(uint64_t lastChangedDate) {
-    fbb_.AddElement<uint64_t>(TusDataStatus::VT_LASTCHANGEDDATE, lastChangedDate, 0);
-  }
-  void add_lastChangedAuthorId(::flatbuffers::Offset<::flatbuffers::String> lastChangedAuthorId) {
-    fbb_.AddOffset(TusDataStatus::VT_LASTCHANGEDAUTHORID, lastChangedAuthorId);
-  }
-  void add_info(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> info) {
-    fbb_.AddOffset(TusDataStatus::VT_INFO, info);
-  }
-  explicit TusDataStatusBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusDataStatus> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusDataStatus>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusDataStatus> CreateTusDataStatus(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::String> ownerId = 0,
-    bool hasData = false,
-    uint64_t lastChangedDate = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> lastChangedAuthorId = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> info = 0) {
-  TusDataStatusBuilder builder_(_fbb);
-  builder_.add_lastChangedDate(lastChangedDate);
-  builder_.add_info(info);
-  builder_.add_lastChangedAuthorId(lastChangedAuthorId);
-  builder_.add_ownerId(ownerId);
-  builder_.add_hasData(hasData);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusDataStatus> CreateTusDataStatusDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const char *ownerId = nullptr,
-    bool hasData = false,
-    uint64_t lastChangedDate = 0,
-    const char *lastChangedAuthorId = nullptr,
-    const std::vector<uint8_t> *info = nullptr) {
-  auto ownerId__ = ownerId ? _fbb.CreateString(ownerId) : 0;
-  auto lastChangedAuthorId__ = lastChangedAuthorId ? _fbb.CreateString(lastChangedAuthorId) : 0;
-  auto info__ = info ? _fbb.CreateVector<uint8_t>(*info) : 0;
-  return CreateTusDataStatus(
-      _fbb,
-      ownerId__,
-      hasData,
-      lastChangedDate,
-      lastChangedAuthorId__,
-      info__);
-}
-
-struct TusData FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusDataBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_STATUS = 4,
-    VT_DATA = 6
-  };
-  const TusDataStatus *status() const {
-    return GetPointer<const TusDataStatus *>(VT_STATUS);
-  }
-  const ::flatbuffers::Vector<uint8_t> *data() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_DATA);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_STATUS) &&
-           verifier.VerifyTable(status()) &&
-           VerifyOffset(verifier, VT_DATA) &&
-           verifier.VerifyVector(data()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusDataBuilder {
-  typedef TusData Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_status(::flatbuffers::Offset<TusDataStatus> status) {
-    fbb_.AddOffset(TusData::VT_STATUS, status);
-  }
-  void add_data(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data) {
-    fbb_.AddOffset(TusData::VT_DATA, data);
-  }
-  explicit TusDataBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusData> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusData>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusData> CreateTusData(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusDataStatus> status = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data = 0) {
-  TusDataBuilder builder_(_fbb);
-  builder_.add_data(data);
-  builder_.add_status(status);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusData> CreateTusDataDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusDataStatus> status = 0,
-    const std::vector<uint8_t> *data = nullptr) {
-  auto data__ = data ? _fbb.CreateVector<uint8_t>(*data) : 0;
-  return CreateTusData(
-      _fbb,
-      status,
-      data__);
-}
-
-struct TusDataStatusResponse FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusDataStatusResponseBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_STATUS = 4
-  };
-  const ::flatbuffers::Vector<::flatbuffers::Offset<TusDataStatus>> *status() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<TusDataStatus>> *>(VT_STATUS);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_STATUS) &&
-           verifier.VerifyVector(status()) &&
-           verifier.VerifyVectorOfTables(status()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusDataStatusResponseBuilder {
-  typedef TusDataStatusResponse Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_status(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<TusDataStatus>>> status) {
-    fbb_.AddOffset(TusDataStatusResponse::VT_STATUS, status);
-  }
-  explicit TusDataStatusResponseBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusDataStatusResponse> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusDataStatusResponse>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusDataStatusResponse> CreateTusDataStatusResponse(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<TusDataStatus>>> status = 0) {
-  TusDataStatusResponseBuilder builder_(_fbb);
-  builder_.add_status(status);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusDataStatusResponse> CreateTusDataStatusResponseDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<::flatbuffers::Offset<TusDataStatus>> *status = nullptr) {
-  auto status__ = status ? _fbb.CreateVector<::flatbuffers::Offset<TusDataStatus>>(*status) : 0;
-  return CreateTusDataStatusResponse(
-      _fbb,
-      status__);
-}
-
-struct TusGetDataRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusGetDataRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_USER = 4,
-    VT_SLOTID = 6
-  };
-  const TusUser *user() const {
-    return GetPointer<const TusUser *>(VT_USER);
-  }
-  int32_t slotId() const {
-    return GetField<int32_t>(VT_SLOTID, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_USER) &&
-           verifier.VerifyTable(user()) &&
-           VerifyField<int32_t>(verifier, VT_SLOTID, 4) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusGetDataRequestBuilder {
-  typedef TusGetDataRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_user(::flatbuffers::Offset<TusUser> user) {
-    fbb_.AddOffset(TusGetDataRequest::VT_USER, user);
-  }
-  void add_slotId(int32_t slotId) {
-    fbb_.AddElement<int32_t>(TusGetDataRequest::VT_SLOTID, slotId, 0);
-  }
-  explicit TusGetDataRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusGetDataRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusGetDataRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusGetDataRequest> CreateTusGetDataRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    int32_t slotId = 0) {
-  TusGetDataRequestBuilder builder_(_fbb);
-  builder_.add_slotId(slotId);
-  builder_.add_user(user);
-  return builder_.Finish();
-}
-
-struct TusGetMultiSlotDataStatusRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusGetMultiSlotDataStatusRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_USER = 4,
-    VT_SLOTIDARRAY = 6
-  };
-  const TusUser *user() const {
-    return GetPointer<const TusUser *>(VT_USER);
-  }
-  const ::flatbuffers::Vector<int32_t> *slotIdArray() const {
-    return GetPointer<const ::flatbuffers::Vector<int32_t> *>(VT_SLOTIDARRAY);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_USER) &&
-           verifier.VerifyTable(user()) &&
-           VerifyOffset(verifier, VT_SLOTIDARRAY) &&
-           verifier.VerifyVector(slotIdArray()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusGetMultiSlotDataStatusRequestBuilder {
-  typedef TusGetMultiSlotDataStatusRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_user(::flatbuffers::Offset<TusUser> user) {
-    fbb_.AddOffset(TusGetMultiSlotDataStatusRequest::VT_USER, user);
-  }
-  void add_slotIdArray(::flatbuffers::Offset<::flatbuffers::Vector<int32_t>> slotIdArray) {
-    fbb_.AddOffset(TusGetMultiSlotDataStatusRequest::VT_SLOTIDARRAY, slotIdArray);
-  }
-  explicit TusGetMultiSlotDataStatusRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusGetMultiSlotDataStatusRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusGetMultiSlotDataStatusRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusGetMultiSlotDataStatusRequest> CreateTusGetMultiSlotDataStatusRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<int32_t>> slotIdArray = 0) {
-  TusGetMultiSlotDataStatusRequestBuilder builder_(_fbb);
-  builder_.add_slotIdArray(slotIdArray);
-  builder_.add_user(user);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusGetMultiSlotDataStatusRequest> CreateTusGetMultiSlotDataStatusRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    const std::vector<int32_t> *slotIdArray = nullptr) {
-  auto slotIdArray__ = slotIdArray ? _fbb.CreateVector<int32_t>(*slotIdArray) : 0;
-  return CreateTusGetMultiSlotDataStatusRequest(
-      _fbb,
-      user,
-      slotIdArray__);
-}
-
-struct TusGetMultiUserDataStatusRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusGetMultiUserDataStatusRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_USERS = 4,
-    VT_SLOTID = 6
-  };
-  const ::flatbuffers::Vector<::flatbuffers::Offset<TusUser>> *users() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<TusUser>> *>(VT_USERS);
-  }
-  int32_t slotId() const {
-    return GetField<int32_t>(VT_SLOTID, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_USERS) &&
-           verifier.VerifyVector(users()) &&
-           verifier.VerifyVectorOfTables(users()) &&
-           VerifyField<int32_t>(verifier, VT_SLOTID, 4) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusGetMultiUserDataStatusRequestBuilder {
-  typedef TusGetMultiUserDataStatusRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_users(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<TusUser>>> users) {
-    fbb_.AddOffset(TusGetMultiUserDataStatusRequest::VT_USERS, users);
-  }
-  void add_slotId(int32_t slotId) {
-    fbb_.AddElement<int32_t>(TusGetMultiUserDataStatusRequest::VT_SLOTID, slotId, 0);
-  }
-  explicit TusGetMultiUserDataStatusRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusGetMultiUserDataStatusRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusGetMultiUserDataStatusRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusGetMultiUserDataStatusRequest> CreateTusGetMultiUserDataStatusRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<TusUser>>> users = 0,
-    int32_t slotId = 0) {
-  TusGetMultiUserDataStatusRequestBuilder builder_(_fbb);
-  builder_.add_slotId(slotId);
-  builder_.add_users(users);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusGetMultiUserDataStatusRequest> CreateTusGetMultiUserDataStatusRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<::flatbuffers::Offset<TusUser>> *users = nullptr,
-    int32_t slotId = 0) {
-  auto users__ = users ? _fbb.CreateVector<::flatbuffers::Offset<TusUser>>(*users) : 0;
-  return CreateTusGetMultiUserDataStatusRequest(
-      _fbb,
-      users__,
-      slotId);
-}
-
-struct TusGetFriendsDataStatusRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusGetFriendsDataStatusRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_SLOTID = 4,
-    VT_INCLUDESELF = 6,
-    VT_SORTTYPE = 8,
-    VT_ARRAYNUM = 10
-  };
-  int32_t slotId() const {
-    return GetField<int32_t>(VT_SLOTID, 0);
-  }
-  bool includeSelf() const {
-    return GetField<uint8_t>(VT_INCLUDESELF, 0) != 0;
-  }
-  int32_t sortType() const {
-    return GetField<int32_t>(VT_SORTTYPE, 0);
-  }
-  uint32_t arrayNum() const {
-    return GetField<uint32_t>(VT_ARRAYNUM, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<int32_t>(verifier, VT_SLOTID, 4) &&
-           VerifyField<uint8_t>(verifier, VT_INCLUDESELF, 1) &&
-           VerifyField<int32_t>(verifier, VT_SORTTYPE, 4) &&
-           VerifyField<uint32_t>(verifier, VT_ARRAYNUM, 4) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusGetFriendsDataStatusRequestBuilder {
-  typedef TusGetFriendsDataStatusRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_slotId(int32_t slotId) {
-    fbb_.AddElement<int32_t>(TusGetFriendsDataStatusRequest::VT_SLOTID, slotId, 0);
-  }
-  void add_includeSelf(bool includeSelf) {
-    fbb_.AddElement<uint8_t>(TusGetFriendsDataStatusRequest::VT_INCLUDESELF, static_cast<uint8_t>(includeSelf), 0);
-  }
-  void add_sortType(int32_t sortType) {
-    fbb_.AddElement<int32_t>(TusGetFriendsDataStatusRequest::VT_SORTTYPE, sortType, 0);
-  }
-  void add_arrayNum(uint32_t arrayNum) {
-    fbb_.AddElement<uint32_t>(TusGetFriendsDataStatusRequest::VT_ARRAYNUM, arrayNum, 0);
-  }
-  explicit TusGetFriendsDataStatusRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusGetFriendsDataStatusRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusGetFriendsDataStatusRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusGetFriendsDataStatusRequest> CreateTusGetFriendsDataStatusRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    int32_t slotId = 0,
-    bool includeSelf = false,
-    int32_t sortType = 0,
-    uint32_t arrayNum = 0) {
-  TusGetFriendsDataStatusRequestBuilder builder_(_fbb);
-  builder_.add_arrayNum(arrayNum);
-  builder_.add_sortType(sortType);
-  builder_.add_slotId(slotId);
-  builder_.add_includeSelf(includeSelf);
-  return builder_.Finish();
-}
-
-struct TusDeleteMultiSlotDataRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TusDeleteMultiSlotDataRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_USER = 4,
-    VT_SLOTIDARRAY = 6
-  };
-  const TusUser *user() const {
-    return GetPointer<const TusUser *>(VT_USER);
-  }
-  const ::flatbuffers::Vector<int32_t> *slotIdArray() const {
-    return GetPointer<const ::flatbuffers::Vector<int32_t> *>(VT_SLOTIDARRAY);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_USER) &&
-           verifier.VerifyTable(user()) &&
-           VerifyOffset(verifier, VT_SLOTIDARRAY) &&
-           verifier.VerifyVector(slotIdArray()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TusDeleteMultiSlotDataRequestBuilder {
-  typedef TusDeleteMultiSlotDataRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_user(::flatbuffers::Offset<TusUser> user) {
-    fbb_.AddOffset(TusDeleteMultiSlotDataRequest::VT_USER, user);
-  }
-  void add_slotIdArray(::flatbuffers::Offset<::flatbuffers::Vector<int32_t>> slotIdArray) {
-    fbb_.AddOffset(TusDeleteMultiSlotDataRequest::VT_SLOTIDARRAY, slotIdArray);
-  }
-  explicit TusDeleteMultiSlotDataRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TusDeleteMultiSlotDataRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TusDeleteMultiSlotDataRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TusDeleteMultiSlotDataRequest> CreateTusDeleteMultiSlotDataRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<int32_t>> slotIdArray = 0) {
-  TusDeleteMultiSlotDataRequestBuilder builder_(_fbb);
-  builder_.add_slotIdArray(slotIdArray);
-  builder_.add_user(user);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TusDeleteMultiSlotDataRequest> CreateTusDeleteMultiSlotDataRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<TusUser> user = 0,
-    const std::vector<int32_t> *slotIdArray = nullptr) {
-  auto slotIdArray__ = slotIdArray ? _fbb.CreateVector<int32_t>(*slotIdArray) : 0;
-  return CreateTusDeleteMultiSlotDataRequest(
-      _fbb,
-      user,
-      slotIdArray__);
-}
-
-struct SetPresenceRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SetPresenceRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_TITLE = 4,
-    VT_STATUS = 6,
-    VT_COMMENT = 8,
-    VT_DATA = 10
-  };
-  const ::flatbuffers::String *title() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_TITLE);
-  }
-  const ::flatbuffers::String *status() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_STATUS);
-  }
-  const ::flatbuffers::String *comment() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_COMMENT);
-  }
-  const ::flatbuffers::Vector<uint8_t> *data() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_DATA);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_TITLE) &&
-           verifier.VerifyString(title()) &&
-           VerifyOffset(verifier, VT_STATUS) &&
-           verifier.VerifyString(status()) &&
-           VerifyOffset(verifier, VT_COMMENT) &&
-           verifier.VerifyString(comment()) &&
-           VerifyOffset(verifier, VT_DATA) &&
-           verifier.VerifyVector(data()) &&
-           verifier.EndTable();
-  }
-};
-
-struct SetPresenceRequestBuilder {
-  typedef SetPresenceRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_title(::flatbuffers::Offset<::flatbuffers::String> title) {
-    fbb_.AddOffset(SetPresenceRequest::VT_TITLE, title);
-  }
-  void add_status(::flatbuffers::Offset<::flatbuffers::String> status) {
-    fbb_.AddOffset(SetPresenceRequest::VT_STATUS, status);
-  }
-  void add_comment(::flatbuffers::Offset<::flatbuffers::String> comment) {
-    fbb_.AddOffset(SetPresenceRequest::VT_COMMENT, comment);
-  }
-  void add_data(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data) {
-    fbb_.AddOffset(SetPresenceRequest::VT_DATA, data);
-  }
-  explicit SetPresenceRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<SetPresenceRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<SetPresenceRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<SetPresenceRequest> CreateSetPresenceRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::String> title = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> status = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> comment = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data = 0) {
-  SetPresenceRequestBuilder builder_(_fbb);
-  builder_.add_data(data);
-  builder_.add_comment(comment);
-  builder_.add_status(status);
-  builder_.add_title(title);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<SetPresenceRequest> CreateSetPresenceRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const char *title = nullptr,
-    const char *status = nullptr,
-    const char *comment = nullptr,
-    const std::vector<uint8_t> *data = nullptr) {
-  auto title__ = title ? _fbb.CreateString(title) : 0;
-  auto status__ = status ? _fbb.CreateString(status) : 0;
-  auto comment__ = comment ? _fbb.CreateString(comment) : 0;
-  auto data__ = data ? _fbb.CreateVector<uint8_t>(*data) : 0;
-  return CreateSetPresenceRequest(
-      _fbb,
-      title__,
-      status__,
-      comment__,
-      data__);
-}
-
-struct MatchingSearchCondition FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef MatchingSearchConditionBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ATTR_TYPE = 4,
-    VT_ATTR_ID = 6,
-    VT_COMP_OP = 8,
-    VT_COMP_VALUE = 10
-  };
-  uint32_t attr_type() const {
-    return GetField<uint32_t>(VT_ATTR_TYPE, 0);
-  }
-  uint32_t attr_id() const {
-    return GetField<uint32_t>(VT_ATTR_ID, 0);
-  }
-  uint32_t comp_op() const {
-    return GetField<uint32_t>(VT_COMP_OP, 0);
-  }
-  uint32_t comp_value() const {
-    return GetField<uint32_t>(VT_COMP_VALUE, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_ATTR_TYPE, 4) &&
-           VerifyField<uint32_t>(verifier, VT_ATTR_ID, 4) &&
-           VerifyField<uint32_t>(verifier, VT_COMP_OP, 4) &&
-           VerifyField<uint32_t>(verifier, VT_COMP_VALUE, 4) &&
-           verifier.EndTable();
-  }
-};
-
-struct MatchingSearchConditionBuilder {
-  typedef MatchingSearchCondition Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_attr_type(uint32_t attr_type) {
-    fbb_.AddElement<uint32_t>(MatchingSearchCondition::VT_ATTR_TYPE, attr_type, 0);
-  }
-  void add_attr_id(uint32_t attr_id) {
-    fbb_.AddElement<uint32_t>(MatchingSearchCondition::VT_ATTR_ID, attr_id, 0);
-  }
-  void add_comp_op(uint32_t comp_op) {
-    fbb_.AddElement<uint32_t>(MatchingSearchCondition::VT_COMP_OP, comp_op, 0);
-  }
-  void add_comp_value(uint32_t comp_value) {
-    fbb_.AddElement<uint32_t>(MatchingSearchCondition::VT_COMP_VALUE, comp_value, 0);
-  }
-  explicit MatchingSearchConditionBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<MatchingSearchCondition> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<MatchingSearchCondition>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<MatchingSearchCondition> CreateMatchingSearchCondition(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t attr_type = 0,
-    uint32_t attr_id = 0,
-    uint32_t comp_op = 0,
-    uint32_t comp_value = 0) {
-  MatchingSearchConditionBuilder builder_(_fbb);
-  builder_.add_comp_value(comp_value);
-  builder_.add_comp_op(comp_op);
-  builder_.add_attr_id(attr_id);
-  builder_.add_attr_type(attr_type);
-  return builder_.Finish();
-}
-
-struct MatchingAttr FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef MatchingAttrBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ATTR_TYPE = 4,
-    VT_ATTR_ID = 6,
-    VT_NUM = 8,
-    VT_DATA = 10
-  };
-  uint32_t attr_type() const {
-    return GetField<uint32_t>(VT_ATTR_TYPE, 0);
-  }
-  uint32_t attr_id() const {
-    return GetField<uint32_t>(VT_ATTR_ID, 0);
-  }
-  uint32_t num() const {
-    return GetField<uint32_t>(VT_NUM, 0);
-  }
-  const ::flatbuffers::Vector<uint8_t> *data() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_DATA);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_ATTR_TYPE, 4) &&
-           VerifyField<uint32_t>(verifier, VT_ATTR_ID, 4) &&
-           VerifyField<uint32_t>(verifier, VT_NUM, 4) &&
-           VerifyOffset(verifier, VT_DATA) &&
-           verifier.VerifyVector(data()) &&
-           verifier.EndTable();
-  }
-};
-
-struct MatchingAttrBuilder {
-  typedef MatchingAttr Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_attr_type(uint32_t attr_type) {
-    fbb_.AddElement<uint32_t>(MatchingAttr::VT_ATTR_TYPE, attr_type, 0);
-  }
-  void add_attr_id(uint32_t attr_id) {
-    fbb_.AddElement<uint32_t>(MatchingAttr::VT_ATTR_ID, attr_id, 0);
-  }
-  void add_num(uint32_t num) {
-    fbb_.AddElement<uint32_t>(MatchingAttr::VT_NUM, num, 0);
-  }
-  void add_data(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data) {
-    fbb_.AddOffset(MatchingAttr::VT_DATA, data);
-  }
-  explicit MatchingAttrBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<MatchingAttr> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<MatchingAttr>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<MatchingAttr> CreateMatchingAttr(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t attr_type = 0,
-    uint32_t attr_id = 0,
-    uint32_t num = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> data = 0) {
-  MatchingAttrBuilder builder_(_fbb);
-  builder_.add_data(data);
-  builder_.add_num(num);
-  builder_.add_attr_id(attr_id);
-  builder_.add_attr_type(attr_type);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<MatchingAttr> CreateMatchingAttrDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t attr_type = 0,
-    uint32_t attr_id = 0,
-    uint32_t num = 0,
-    const std::vector<uint8_t> *data = nullptr) {
-  auto data__ = data ? _fbb.CreateVector<uint8_t>(*data) : 0;
-  return CreateMatchingAttr(
-      _fbb,
-      attr_type,
-      attr_id,
-      num,
-      data__);
-}
-
-struct CreateRoomGUIRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef CreateRoomGUIRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_TOTAL_SLOTS = 4,
-    VT_PRIVATE_SLOTS = 6,
-    VT_PRIVILEGE_GRANT = 8,
-    VT_STEALTH = 10,
-    VT_GAME_ATTRS = 12
-  };
-  uint32_t total_slots() const {
-    return GetField<uint32_t>(VT_TOTAL_SLOTS, 0);
-  }
-  uint32_t private_slots() const {
-    return GetField<uint32_t>(VT_PRIVATE_SLOTS, 0);
-  }
-  bool privilege_grant() const {
-    return GetField<uint8_t>(VT_PRIVILEGE_GRANT, 0) != 0;
-  }
-  bool stealth() const {
-    return GetField<uint8_t>(VT_STEALTH, 0) != 0;
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>> *game_attrs() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>> *>(VT_GAME_ATTRS);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_TOTAL_SLOTS, 4) &&
-           VerifyField<uint32_t>(verifier, VT_PRIVATE_SLOTS, 4) &&
-           VerifyField<uint8_t>(verifier, VT_PRIVILEGE_GRANT, 1) &&
-           VerifyField<uint8_t>(verifier, VT_STEALTH, 1) &&
-           VerifyOffset(verifier, VT_GAME_ATTRS) &&
-           verifier.VerifyVector(game_attrs()) &&
-           verifier.VerifyVectorOfTables(game_attrs()) &&
-           verifier.EndTable();
-  }
-};
-
-struct CreateRoomGUIRequestBuilder {
-  typedef CreateRoomGUIRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_total_slots(uint32_t total_slots) {
-    fbb_.AddElement<uint32_t>(CreateRoomGUIRequest::VT_TOTAL_SLOTS, total_slots, 0);
-  }
-  void add_private_slots(uint32_t private_slots) {
-    fbb_.AddElement<uint32_t>(CreateRoomGUIRequest::VT_PRIVATE_SLOTS, private_slots, 0);
-  }
-  void add_privilege_grant(bool privilege_grant) {
-    fbb_.AddElement<uint8_t>(CreateRoomGUIRequest::VT_PRIVILEGE_GRANT, static_cast<uint8_t>(privilege_grant), 0);
-  }
-  void add_stealth(bool stealth) {
-    fbb_.AddElement<uint8_t>(CreateRoomGUIRequest::VT_STEALTH, static_cast<uint8_t>(stealth), 0);
-  }
-  void add_game_attrs(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>>> game_attrs) {
-    fbb_.AddOffset(CreateRoomGUIRequest::VT_GAME_ATTRS, game_attrs);
-  }
-  explicit CreateRoomGUIRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<CreateRoomGUIRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<CreateRoomGUIRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<CreateRoomGUIRequest> CreateCreateRoomGUIRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t total_slots = 0,
-    uint32_t private_slots = 0,
-    bool privilege_grant = false,
-    bool stealth = false,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>>> game_attrs = 0) {
-  CreateRoomGUIRequestBuilder builder_(_fbb);
-  builder_.add_game_attrs(game_attrs);
-  builder_.add_private_slots(private_slots);
-  builder_.add_total_slots(total_slots);
-  builder_.add_stealth(stealth);
-  builder_.add_privilege_grant(privilege_grant);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<CreateRoomGUIRequest> CreateCreateRoomGUIRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t total_slots = 0,
-    uint32_t private_slots = 0,
-    bool privilege_grant = false,
-    bool stealth = false,
-    const std::vector<::flatbuffers::Offset<MatchingAttr>> *game_attrs = nullptr) {
-  auto game_attrs__ = game_attrs ? _fbb.CreateVector<::flatbuffers::Offset<MatchingAttr>>(*game_attrs) : 0;
-  return CreateCreateRoomGUIRequest(
-      _fbb,
-      total_slots,
-      private_slots,
-      privilege_grant,
-      stealth,
-      game_attrs__);
-}
-
-struct GUIUserInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef GUIUserInfoBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_INFO = 4,
-    VT_OWNER = 6
-  };
-  const UserInfo *info() const {
-    return GetPointer<const UserInfo *>(VT_INFO);
-  }
-  bool owner() const {
-    return GetField<uint8_t>(VT_OWNER, 0) != 0;
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_INFO) &&
-           verifier.VerifyTable(info()) &&
-           VerifyField<uint8_t>(verifier, VT_OWNER, 1) &&
-           verifier.EndTable();
-  }
-};
-
-struct GUIUserInfoBuilder {
-  typedef GUIUserInfo Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_info(::flatbuffers::Offset<UserInfo> info) {
-    fbb_.AddOffset(GUIUserInfo::VT_INFO, info);
-  }
-  void add_owner(bool owner) {
-    fbb_.AddElement<uint8_t>(GUIUserInfo::VT_OWNER, static_cast<uint8_t>(owner), 0);
-  }
-  explicit GUIUserInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<GUIUserInfo> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<GUIUserInfo>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<GUIUserInfo> CreateGUIUserInfo(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<UserInfo> info = 0,
-    bool owner = false) {
-  GUIUserInfoBuilder builder_(_fbb);
-  builder_.add_info(info);
-  builder_.add_owner(owner);
-  return builder_.Finish();
-}
-
-struct MatchingRoomStatus FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef MatchingRoomStatusBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ID = 4,
-    VT_MEMBERS = 6,
-    VT_KICK_ACTOR = 8,
-    VT_OPT = 10
-  };
-  const ::flatbuffers::Vector<uint8_t> *id() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_ID);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<GUIUserInfo>> *members() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<GUIUserInfo>> *>(VT_MEMBERS);
-  }
-  const ::flatbuffers::String *kick_actor() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_KICK_ACTOR);
-  }
-  const ::flatbuffers::Vector<uint8_t> *opt() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_OPT);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_ID) &&
-           verifier.VerifyVector(id()) &&
-           VerifyOffset(verifier, VT_MEMBERS) &&
-           verifier.VerifyVector(members()) &&
-           verifier.VerifyVectorOfTables(members()) &&
-           VerifyOffset(verifier, VT_KICK_ACTOR) &&
-           verifier.VerifyString(kick_actor()) &&
-           VerifyOffset(verifier, VT_OPT) &&
-           verifier.VerifyVector(opt()) &&
-           verifier.EndTable();
-  }
-};
-
-struct MatchingRoomStatusBuilder {
-  typedef MatchingRoomStatus Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_id(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> id) {
-    fbb_.AddOffset(MatchingRoomStatus::VT_ID, id);
-  }
-  void add_members(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<GUIUserInfo>>> members) {
-    fbb_.AddOffset(MatchingRoomStatus::VT_MEMBERS, members);
-  }
-  void add_kick_actor(::flatbuffers::Offset<::flatbuffers::String> kick_actor) {
-    fbb_.AddOffset(MatchingRoomStatus::VT_KICK_ACTOR, kick_actor);
-  }
-  void add_opt(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> opt) {
-    fbb_.AddOffset(MatchingRoomStatus::VT_OPT, opt);
-  }
-  explicit MatchingRoomStatusBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<MatchingRoomStatus> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<MatchingRoomStatus>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<MatchingRoomStatus> CreateMatchingRoomStatus(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> id = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<GUIUserInfo>>> members = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> kick_actor = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> opt = 0) {
-  MatchingRoomStatusBuilder builder_(_fbb);
-  builder_.add_opt(opt);
-  builder_.add_kick_actor(kick_actor);
-  builder_.add_members(members);
-  builder_.add_id(id);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<MatchingRoomStatus> CreateMatchingRoomStatusDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<uint8_t> *id = nullptr,
-    const std::vector<::flatbuffers::Offset<GUIUserInfo>> *members = nullptr,
-    const char *kick_actor = nullptr,
-    const std::vector<uint8_t> *opt = nullptr) {
-  auto id__ = id ? _fbb.CreateVector<uint8_t>(*id) : 0;
-  auto members__ = members ? _fbb.CreateVector<::flatbuffers::Offset<GUIUserInfo>>(*members) : 0;
-  auto kick_actor__ = kick_actor ? _fbb.CreateString(kick_actor) : 0;
-  auto opt__ = opt ? _fbb.CreateVector<uint8_t>(*opt) : 0;
-  return CreateMatchingRoomStatus(
-      _fbb,
-      id__,
-      members__,
-      kick_actor__,
-      opt__);
-}
-
-struct GetRoomListGUIRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef GetRoomListGUIRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_RANGE_START = 4,
-    VT_RANGE_MAX = 6,
-    VT_CONDS = 8,
-    VT_ATTRS = 10
-  };
-  uint32_t range_start() const {
-    return GetField<uint32_t>(VT_RANGE_START, 0);
-  }
-  uint32_t range_max() const {
-    return GetField<uint32_t>(VT_RANGE_MAX, 0);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingSearchCondition>> *conds() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingSearchCondition>> *>(VT_CONDS);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>> *attrs() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>> *>(VT_ATTRS);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_RANGE_START, 4) &&
-           VerifyField<uint32_t>(verifier, VT_RANGE_MAX, 4) &&
-           VerifyOffset(verifier, VT_CONDS) &&
-           verifier.VerifyVector(conds()) &&
-           verifier.VerifyVectorOfTables(conds()) &&
-           VerifyOffset(verifier, VT_ATTRS) &&
-           verifier.VerifyVector(attrs()) &&
-           verifier.VerifyVectorOfTables(attrs()) &&
-           verifier.EndTable();
-  }
-};
-
-struct GetRoomListGUIRequestBuilder {
-  typedef GetRoomListGUIRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_range_start(uint32_t range_start) {
-    fbb_.AddElement<uint32_t>(GetRoomListGUIRequest::VT_RANGE_START, range_start, 0);
-  }
-  void add_range_max(uint32_t range_max) {
-    fbb_.AddElement<uint32_t>(GetRoomListGUIRequest::VT_RANGE_MAX, range_max, 0);
-  }
-  void add_conds(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingSearchCondition>>> conds) {
-    fbb_.AddOffset(GetRoomListGUIRequest::VT_CONDS, conds);
-  }
-  void add_attrs(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>>> attrs) {
-    fbb_.AddOffset(GetRoomListGUIRequest::VT_ATTRS, attrs);
-  }
-  explicit GetRoomListGUIRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<GetRoomListGUIRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<GetRoomListGUIRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<GetRoomListGUIRequest> CreateGetRoomListGUIRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t range_start = 0,
-    uint32_t range_max = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingSearchCondition>>> conds = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>>> attrs = 0) {
-  GetRoomListGUIRequestBuilder builder_(_fbb);
-  builder_.add_attrs(attrs);
-  builder_.add_conds(conds);
-  builder_.add_range_max(range_max);
-  builder_.add_range_start(range_start);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<GetRoomListGUIRequest> CreateGetRoomListGUIRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t range_start = 0,
-    uint32_t range_max = 0,
-    const std::vector<::flatbuffers::Offset<MatchingSearchCondition>> *conds = nullptr,
-    const std::vector<::flatbuffers::Offset<MatchingAttr>> *attrs = nullptr) {
-  auto conds__ = conds ? _fbb.CreateVector<::flatbuffers::Offset<MatchingSearchCondition>>(*conds) : 0;
-  auto attrs__ = attrs ? _fbb.CreateVector<::flatbuffers::Offset<MatchingAttr>>(*attrs) : 0;
-  return CreateGetRoomListGUIRequest(
-      _fbb,
-      range_start,
-      range_max,
-      conds__,
-      attrs__);
-}
-
-struct MatchingRoom FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef MatchingRoomBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ID = 4,
-    VT_ATTR = 6
-  };
-  const ::flatbuffers::Vector<uint8_t> *id() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_ID);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>> *attr() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>> *>(VT_ATTR);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_ID) &&
-           verifier.VerifyVector(id()) &&
-           VerifyOffset(verifier, VT_ATTR) &&
-           verifier.VerifyVector(attr()) &&
-           verifier.VerifyVectorOfTables(attr()) &&
-           verifier.EndTable();
-  }
-};
-
-struct MatchingRoomBuilder {
-  typedef MatchingRoom Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_id(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> id) {
-    fbb_.AddOffset(MatchingRoom::VT_ID, id);
-  }
-  void add_attr(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>>> attr) {
-    fbb_.AddOffset(MatchingRoom::VT_ATTR, attr);
-  }
-  explicit MatchingRoomBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<MatchingRoom> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<MatchingRoom>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<MatchingRoom> CreateMatchingRoom(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> id = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>>> attr = 0) {
-  MatchingRoomBuilder builder_(_fbb);
-  builder_.add_attr(attr);
-  builder_.add_id(id);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<MatchingRoom> CreateMatchingRoomDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<uint8_t> *id = nullptr,
-    const std::vector<::flatbuffers::Offset<MatchingAttr>> *attr = nullptr) {
-  auto id__ = id ? _fbb.CreateVector<uint8_t>(*id) : 0;
-  auto attr__ = attr ? _fbb.CreateVector<::flatbuffers::Offset<MatchingAttr>>(*attr) : 0;
-  return CreateMatchingRoom(
-      _fbb,
-      id__,
-      attr__);
-}
-
-struct MatchingRoomList FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef MatchingRoomListBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_START = 4,
-    VT_TOTAL = 6,
-    VT_ROOMS = 8
-  };
-  uint32_t start() const {
-    return GetField<uint32_t>(VT_START, 0);
-  }
-  uint32_t total() const {
-    return GetField<uint32_t>(VT_TOTAL, 0);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingRoom>> *rooms() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingRoom>> *>(VT_ROOMS);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint32_t>(verifier, VT_START, 4) &&
-           VerifyField<uint32_t>(verifier, VT_TOTAL, 4) &&
-           VerifyOffset(verifier, VT_ROOMS) &&
-           verifier.VerifyVector(rooms()) &&
-           verifier.VerifyVectorOfTables(rooms()) &&
-           verifier.EndTable();
-  }
-};
-
-struct MatchingRoomListBuilder {
-  typedef MatchingRoomList Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_start(uint32_t start) {
-    fbb_.AddElement<uint32_t>(MatchingRoomList::VT_START, start, 0);
-  }
-  void add_total(uint32_t total) {
-    fbb_.AddElement<uint32_t>(MatchingRoomList::VT_TOTAL, total, 0);
-  }
-  void add_rooms(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingRoom>>> rooms) {
-    fbb_.AddOffset(MatchingRoomList::VT_ROOMS, rooms);
-  }
-  explicit MatchingRoomListBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<MatchingRoomList> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<MatchingRoomList>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<MatchingRoomList> CreateMatchingRoomList(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t start = 0,
-    uint32_t total = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingRoom>>> rooms = 0) {
-  MatchingRoomListBuilder builder_(_fbb);
-  builder_.add_rooms(rooms);
-  builder_.add_total(total);
-  builder_.add_start(start);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<MatchingRoomList> CreateMatchingRoomListDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint32_t start = 0,
-    uint32_t total = 0,
-    const std::vector<::flatbuffers::Offset<MatchingRoom>> *rooms = nullptr) {
-  auto rooms__ = rooms ? _fbb.CreateVector<::flatbuffers::Offset<MatchingRoom>>(*rooms) : 0;
-  return CreateMatchingRoomList(
-      _fbb,
-      start,
-      total,
-      rooms__);
-}
-
-struct MatchingGuiRoomId FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef MatchingGuiRoomIdBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ID = 4
-  };
-  const ::flatbuffers::Vector<uint8_t> *id() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_ID);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_ID) &&
-           verifier.VerifyVector(id()) &&
-           verifier.EndTable();
-  }
-};
-
-struct MatchingGuiRoomIdBuilder {
-  typedef MatchingGuiRoomId Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_id(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> id) {
-    fbb_.AddOffset(MatchingGuiRoomId::VT_ID, id);
-  }
-  explicit MatchingGuiRoomIdBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<MatchingGuiRoomId> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<MatchingGuiRoomId>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<MatchingGuiRoomId> CreateMatchingGuiRoomId(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> id = 0) {
-  MatchingGuiRoomIdBuilder builder_(_fbb);
-  builder_.add_id(id);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<MatchingGuiRoomId> CreateMatchingGuiRoomIdDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<uint8_t> *id = nullptr) {
-  auto id__ = id ? _fbb.CreateVector<uint8_t>(*id) : 0;
-  return CreateMatchingGuiRoomId(
-      _fbb,
-      id__);
-}
-
-struct SetRoomSearchFlagGUI FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SetRoomSearchFlagGUIBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ROOMID = 4,
-    VT_STEALTH = 6
-  };
-  const ::flatbuffers::Vector<uint8_t> *roomid() const {
-    return GetPointer<const ::flatbuffers::Vector<uint8_t> *>(VT_ROOMID);
-  }
-  bool stealth() const {
-    return GetField<uint8_t>(VT_STEALTH, 0) != 0;
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_ROOMID) &&
-           verifier.VerifyVector(roomid()) &&
-           VerifyField<uint8_t>(verifier, VT_STEALTH, 1) &&
-           verifier.EndTable();
-  }
-};
-
-struct SetRoomSearchFlagGUIBuilder {
-  typedef SetRoomSearchFlagGUI Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_roomid(::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> roomid) {
-    fbb_.AddOffset(SetRoomSearchFlagGUI::VT_ROOMID, roomid);
-  }
-  void add_stealth(bool stealth) {
-    fbb_.AddElement<uint8_t>(SetRoomSearchFlagGUI::VT_STEALTH, static_cast<uint8_t>(stealth), 0);
-  }
-  explicit SetRoomSearchFlagGUIBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<SetRoomSearchFlagGUI> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<SetRoomSearchFlagGUI>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<SetRoomSearchFlagGUI> CreateSetRoomSearchFlagGUI(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint8_t>> roomid = 0,
-    bool stealth = false) {
-  SetRoomSearchFlagGUIBuilder builder_(_fbb);
-  builder_.add_roomid(roomid);
-  builder_.add_stealth(stealth);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<SetRoomSearchFlagGUI> CreateSetRoomSearchFlagGUIDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<uint8_t> *roomid = nullptr,
-    bool stealth = false) {
-  auto roomid__ = roomid ? _fbb.CreateVector<uint8_t>(*roomid) : 0;
-  return CreateSetRoomSearchFlagGUI(
-      _fbb,
-      roomid__,
-      stealth);
-}
-
-struct QuickMatchGUIRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef QuickMatchGUIRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_CONDS = 4,
-    VT_AVAILABLE_NUM = 6
-  };
-  const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingSearchCondition>> *conds() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingSearchCondition>> *>(VT_CONDS);
-  }
-  uint32_t available_num() const {
-    return GetField<uint32_t>(VT_AVAILABLE_NUM, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_CONDS) &&
-           verifier.VerifyVector(conds()) &&
-           verifier.VerifyVectorOfTables(conds()) &&
-           VerifyField<uint32_t>(verifier, VT_AVAILABLE_NUM, 4) &&
-           verifier.EndTable();
-  }
-};
-
-struct QuickMatchGUIRequestBuilder {
-  typedef QuickMatchGUIRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_conds(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingSearchCondition>>> conds) {
-    fbb_.AddOffset(QuickMatchGUIRequest::VT_CONDS, conds);
-  }
-  void add_available_num(uint32_t available_num) {
-    fbb_.AddElement<uint32_t>(QuickMatchGUIRequest::VT_AVAILABLE_NUM, available_num, 0);
-  }
-  explicit QuickMatchGUIRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<QuickMatchGUIRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<QuickMatchGUIRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<QuickMatchGUIRequest> CreateQuickMatchGUIRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingSearchCondition>>> conds = 0,
-    uint32_t available_num = 0) {
-  QuickMatchGUIRequestBuilder builder_(_fbb);
-  builder_.add_available_num(available_num);
-  builder_.add_conds(conds);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<QuickMatchGUIRequest> CreateQuickMatchGUIRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<::flatbuffers::Offset<MatchingSearchCondition>> *conds = nullptr,
-    uint32_t available_num = 0) {
-  auto conds__ = conds ? _fbb.CreateVector<::flatbuffers::Offset<MatchingSearchCondition>>(*conds) : 0;
-  return CreateQuickMatchGUIRequest(
-      _fbb,
-      conds__,
-      available_num);
-}
-
-struct SearchJoinRoomGUIRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SearchJoinRoomGUIRequestBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_CONDS = 4,
-    VT_ATTRS = 6
-  };
-  const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingSearchCondition>> *conds() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingSearchCondition>> *>(VT_CONDS);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>> *attrs() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>> *>(VT_ATTRS);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_CONDS) &&
-           verifier.VerifyVector(conds()) &&
-           verifier.VerifyVectorOfTables(conds()) &&
-           VerifyOffset(verifier, VT_ATTRS) &&
-           verifier.VerifyVector(attrs()) &&
-           verifier.VerifyVectorOfTables(attrs()) &&
-           verifier.EndTable();
-  }
-};
-
-struct SearchJoinRoomGUIRequestBuilder {
-  typedef SearchJoinRoomGUIRequest Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_conds(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingSearchCondition>>> conds) {
-    fbb_.AddOffset(SearchJoinRoomGUIRequest::VT_CONDS, conds);
-  }
-  void add_attrs(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>>> attrs) {
-    fbb_.AddOffset(SearchJoinRoomGUIRequest::VT_ATTRS, attrs);
-  }
-  explicit SearchJoinRoomGUIRequestBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<SearchJoinRoomGUIRequest> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<SearchJoinRoomGUIRequest>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<SearchJoinRoomGUIRequest> CreateSearchJoinRoomGUIRequest(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingSearchCondition>>> conds = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>>> attrs = 0) {
-  SearchJoinRoomGUIRequestBuilder builder_(_fbb);
-  builder_.add_attrs(attrs);
-  builder_.add_conds(conds);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<SearchJoinRoomGUIRequest> CreateSearchJoinRoomGUIRequestDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<::flatbuffers::Offset<MatchingSearchCondition>> *conds = nullptr,
-    const std::vector<::flatbuffers::Offset<MatchingAttr>> *attrs = nullptr) {
-  auto conds__ = conds ? _fbb.CreateVector<::flatbuffers::Offset<MatchingSearchCondition>>(*conds) : 0;
-  auto attrs__ = attrs ? _fbb.CreateVector<::flatbuffers::Offset<MatchingAttr>>(*attrs) : 0;
-  return CreateSearchJoinRoomGUIRequest(
-      _fbb,
-      conds__,
-      attrs__);
-}
-
-struct MatchingSearchJoinRoomInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef MatchingSearchJoinRoomInfoBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ROOM = 4,
-    VT_ATTR = 6
-  };
-  const MatchingRoomStatus *room() const {
-    return GetPointer<const MatchingRoomStatus *>(VT_ROOM);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>> *attr() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>> *>(VT_ATTR);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_ROOM) &&
-           verifier.VerifyTable(room()) &&
-           VerifyOffset(verifier, VT_ATTR) &&
-           verifier.VerifyVector(attr()) &&
-           verifier.VerifyVectorOfTables(attr()) &&
-           verifier.EndTable();
-  }
-};
-
-struct MatchingSearchJoinRoomInfoBuilder {
-  typedef MatchingSearchJoinRoomInfo Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_room(::flatbuffers::Offset<MatchingRoomStatus> room) {
-    fbb_.AddOffset(MatchingSearchJoinRoomInfo::VT_ROOM, room);
-  }
-  void add_attr(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>>> attr) {
-    fbb_.AddOffset(MatchingSearchJoinRoomInfo::VT_ATTR, attr);
-  }
-  explicit MatchingSearchJoinRoomInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<MatchingSearchJoinRoomInfo> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<MatchingSearchJoinRoomInfo>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<MatchingSearchJoinRoomInfo> CreateMatchingSearchJoinRoomInfo(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<MatchingRoomStatus> room = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<MatchingAttr>>> attr = 0) {
-  MatchingSearchJoinRoomInfoBuilder builder_(_fbb);
-  builder_.add_attr(attr);
-  builder_.add_room(room);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<MatchingSearchJoinRoomInfo> CreateMatchingSearchJoinRoomInfoDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<MatchingRoomStatus> room = 0,
-    const std::vector<::flatbuffers::Offset<MatchingAttr>> *attr = nullptr) {
-  auto attr__ = attr ? _fbb.CreateVector<::flatbuffers::Offset<MatchingAttr>>(*attr) : 0;
-  return CreateMatchingSearchJoinRoomInfo(
-      _fbb,
-      room,
-      attr__);
-}
-
 #endif  // FLATBUFFERS_GENERATED_NP2STRUCTS_H_
diff --git a/rpcs3/Emu/NP/ip_address.cpp b/rpcs3/Emu/NP/ip_address.cpp
deleted file mode 100644
index ce7b460272..0000000000
--- a/rpcs3/Emu/NP/ip_address.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-#include "stdafx.h"
-#include "Emu/system_config.h"
-#include "ip_address.h"
-#include "Utilities/StrFmt.h"
-#include "Emu/IdManager.h"
-#include "util/endian.hpp"
-#include "util/types.hpp"
-#include "Emu/NP/rpcn_config.h"
-#include "Emu/Cell/lv2/sys_net/sys_net_helpers.h"
-#include <algorithm>
-
-#ifndef _WIN32
-#include <unistd.h>
-#include <fcntl.h>
-#endif
-
-LOG_CHANNEL(IPv6_log, "IPv6_layer");
-
-namespace np
-{
-	bool ip_address_translator::is_ipv6(u32 addr_be)
-	{
-		const u32 addr = std::bit_cast<u32, be_t<u32>>(addr_be);
-		return (addr >= translation_range_begin && addr <= translation_range_end);
-	}
-
-	u32 ip_address_translator::register_ipv6(const std::array<u8, 16>& ipv6_addr)
-	{
-		if (ipv6_addr[10] == 0xFF && ipv6_addr[11] == 0xFF &&
-			std::all_of(ipv6_addr.begin(), ipv6_addr.begin() + 10, [](u8 val)
-				{
-					return val == 0;
-				}))
-		{
-			// IPv4 over IPv6
-			u32 ip_addr{};
-			std::memcpy(&ip_addr, &ipv6_addr[12], sizeof(u32));
-			return ip_addr;
-		}
-
-		std::lock_guard lock(mutex);
-
-		const auto it = ipv6_to_ipv4.find(ipv6_addr);
-
-		if (it == ipv6_to_ipv4.end())
-		{
-			ensure(cur_addr != translation_range_end);
-			const u32 translation_ip = cur_addr++;
-			const u32 translation_ip_be = std::bit_cast<u32, be_t<u32>>(translation_ip);
-			ipv6_to_ipv4.emplace(ipv6_addr, translation_ip_be);
-			ipv4_to_ipv6.push_back(ipv6_addr);
-			return translation_ip_be;
-		}
-
-		return it->second;
-	}
-
-	sockaddr_in6 ip_address_translator::get_ipv6_sockaddr(u32 addr_be, u16 port_be)
-	{
-		const u32 addr_native = std::bit_cast<u32, be_t<u32>>(addr_be);
-		const auto ipv6_addr = ::at32(ipv4_to_ipv6, addr_native - translation_range_begin);
-
-		sockaddr_in6 sockaddr_ipv6{.sin6_family = AF_INET6, .sin6_port = port_be};
-		std::memcpy(&sockaddr_ipv6.sin6_addr, ipv6_addr.data(), ipv6_addr.size());
-
-		return sockaddr_ipv6;
-	}
-
-	u32 register_ip(const flatbuffers::Vector<std::uint8_t>* vec)
-	{
-		if (vec->size() == 4)
-		{
-			const u32 ip = static_cast<u32>(vec->Get(0)) << 24 | static_cast<u32>(vec->Get(1)) << 16 |
-			               static_cast<u32>(vec->Get(2)) << 8 | static_cast<u32>(vec->Get(3));
-
-			u32 result_ip = std::bit_cast<u32, be_t<u32>>(ip);
-
-			return result_ip;
-		}
-		else if (vec->size() == 16)
-		{
-			std::array<u8, 16> ipv6_addr{};
-			std::memcpy(ipv6_addr.data(), vec->Data(), 16);
-
-			auto& translator = g_fxo->get<np::ip_address_translator>();
-			return translator.register_ipv6(ipv6_addr);
-		}
-		else
-		{
-			fmt::throw_exception("Received ip address with size = %d", vec->size());
-		}
-	}
-
-	struct ipv6_support_state
-	{
-		ipv6_support_state() = default;
-		ipv6_support_state(const ipv6_support_state&) = delete;
-		ipv6_support_state& operator=(const ipv6_support_state&) = delete;
-
-		atomic_t<IPV6_SUPPORT> status = IPV6_SUPPORT::IPV6_UNKNOWN;
-	};
-
-	// The conditions for IPv6 to be enabled are, in order:
-	// -IPv6 is not disabled in config
-	// -Internet config is Connected
-	// -PSN config is RPCN
-	// -Bind IP is not set
-	// -RPCN host has an IPv6
-	// -Can connect to ipv6.google.com:413
-	bool is_ipv6_supported(std::optional<IPV6_SUPPORT> force_state)
-	{
-		auto& ipv6_support = g_fxo->get<ipv6_support_state>();
-
-		if (force_state)
-			ipv6_support.status = *force_state;
-
-		if (ipv6_support.status != IPV6_SUPPORT::IPV6_UNKNOWN)
-			return ipv6_support.status == IPV6_SUPPORT::IPV6_SUPPORTED;
-
-		static shared_mutex mtx;
-		std::lock_guard lock(mtx);
-
-		if (ipv6_support.status != IPV6_SUPPORT::IPV6_UNKNOWN)
-			return ipv6_support.status == IPV6_SUPPORT::IPV6_SUPPORTED;
-
-		auto notice_and_disable = [&](std::string_view reason) -> bool
-		{
-			IPv6_log.notice("is_ipv6_supported(): disabled cause: %s", reason);
-			ipv6_support.status = IPV6_SUPPORT::IPV6_UNSUPPORTED;
-			return false;
-		};
-
-		// IPv6 feature is only used by RPCN
-		if (!g_cfg_rpcn.get_ipv6_support())
-			return notice_and_disable("force-disabled through config");
-
-		if (g_cfg.net.net_active != np_internet_status::enabled || g_cfg.net.psn_status != np_psn_status::psn_rpcn)
-			return notice_and_disable("RPCN is disabled");
-
-		if (resolve_binding_ip())
-			return notice_and_disable("Bind IP is used");
-
-		addrinfo* addr_info{};
-		socket_type socket_ipv6{};
-		const addrinfo hints{.ai_family = AF_INET6};
-
-		auto cleanup = [&]()
-		{
-			if (socket_ipv6)
-				close_socket(socket_ipv6);
-
-			if (addr_info)
-				freeaddrinfo(addr_info);
-		};
-
-		auto error_and_disable = [&](std::string_view message) -> bool
-		{
-			IPv6_log.error("is_ipv6_supported(): disabled cause: %s", message);
-			ipv6_support.status = IPV6_SUPPORT::IPV6_UNSUPPORTED;
-			cleanup();
-			return false;
-		};
-
-		auto get_ipv6 = [](const addrinfo* addr_info) -> const addrinfo*
-		{
-			const addrinfo* found = addr_info;
-
-			while (found != nullptr)
-			{
-				if (found->ai_family == AF_INET6)
-					break;
-
-				found = found->ai_next;
-			}
-
-			return found;
-		};
-
-		// Check if RPCN has an IPv6 address
-		const auto parsed_host = parse_rpcn_host(g_cfg_rpcn.get_host());
-
-		if (!parsed_host)
-			return error_and_disable("failed to parse RPCN host");
-
-		const auto [hostname, _] = *parsed_host;
-
-		if (getaddrinfo(hostname.c_str(), nullptr, &hints, &addr_info))
-			return error_and_disable("failed to resolve RPCN host");
-
-		if (!get_ipv6(addr_info))
-			return error_and_disable("RPCN host doesn't support IPv6");
-
-		freeaddrinfo(addr_info);
-		addr_info = {};
-
-		// We try to connect to ipv6.google.com:8080
-		if (getaddrinfo("ipv6.google.com", nullptr, &hints, &addr_info))
-			return error_and_disable("failed to resolve ipv6.google.com");
-
-		const auto* google_ipv6_addr = get_ipv6(addr_info);
-
-		if (!google_ipv6_addr)
-			return error_and_disable("failed to find IPv6 for ipv6.google.com");
-
-		socket_type socket_or_err = ::socket(AF_INET6, SOCK_STREAM, 0);
-
-#ifdef _WIN32
-		if (socket_or_err == INVALID_SOCKET)
-#else
-		if (socket_or_err == -1)
-#endif
-			return error_and_disable("Failed to create IPv6 socket!");
-
-		socket_ipv6 = socket_or_err;
-		sockaddr_in6 ipv6_addr = *reinterpret_cast<const sockaddr_in6*>(google_ipv6_addr->ai_addr);
-		ipv6_addr.sin6_port = std::bit_cast<u16, be_t<u16>>(443);
-
-		if (::connect(socket_ipv6, reinterpret_cast<const sockaddr*>(&ipv6_addr), sizeof(ipv6_addr)) != 0)
-			return error_and_disable("Failed to connect to ipv6.google.com");
-
-		cleanup();
-
-		IPv6_log.success("Successfully tested IPv6 support!");
-		ipv6_support.status = IPV6_SUPPORT::IPV6_SUPPORTED;
-		return true;
-	}
-
-	s32 sendto_possibly_ipv6(socket_type native_socket, const char* data, u32 size, const sockaddr_in* addr, int native_flags)
-	{
-		if (is_ipv6_supported())
-		{
-			sockaddr_in6 addr_ipv6{};
-
-			if (np::ip_address_translator::is_ipv6(addr->sin_addr.s_addr))
-			{
-				auto& translator = g_fxo->get<np::ip_address_translator>();
-				addr_ipv6 = translator.get_ipv6_sockaddr(addr->sin_addr.s_addr, addr->sin_port);
-			}
-			else
-			{
-				addr_ipv6 = sockaddr_to_sockaddr6(*addr);
-			}
-
-			return ::sendto(native_socket, data, size, native_flags, reinterpret_cast<const sockaddr*>(&addr_ipv6), sizeof(sockaddr_in6));
-		}
-
-		return ::sendto(native_socket, data, size, native_flags, reinterpret_cast<const sockaddr*>(addr), sizeof(sockaddr_in));
-	}
-
-	sockaddr_in6 sockaddr_to_sockaddr6(const sockaddr_in& addr)
-	{
-		sockaddr_in6 addr_ipv6{.sin6_family = AF_INET6, .sin6_port = addr.sin_port};
-		std::array<u8, 16> ipv6{};
-
-		// IPv4 over IPv6
-		ipv6[10] = 0xFF;
-		ipv6[11] = 0xFF;
-		std::memcpy(ipv6.data() + 12, &addr.sin_addr.s_addr, 4);
-		std::memcpy(&addr_ipv6.sin6_addr, ipv6.data(), ipv6.size());
-		return addr_ipv6;
-	}
-
-	sockaddr_in sockaddr6_to_sockaddr(const sockaddr_in6& addr)
-	{
-		sockaddr_in addr_ipv4{.sin_family = AF_INET, .sin_port = addr.sin6_port};
-
-		std::array<u8, 16> ipv6{};
-		std::memcpy(ipv6.data(), &addr.sin6_addr, 16);
-		auto& translator = g_fxo->get<np::ip_address_translator>();
-		addr_ipv4.sin_addr.s_addr = translator.register_ipv6(ipv6);
-
-		return addr_ipv4;
-	}
-
-	void close_socket(socket_type socket)
-	{
-		if (socket)
-		{
-#ifdef _WIN32
-			::closesocket(socket);
-#else
-			::close(socket);
-#endif
-		}
-	}
-
-	void set_socket_non_blocking(socket_type socket)
-	{
-		if (socket)
-		{
-#ifdef _WIN32
-			u_long _true = 1;
-			::ioctlsocket(socket, FIONBIO, &_true);
-#else
-			::fcntl(socket, F_SETFL, ::fcntl(socket, F_GETFL, 0) | O_NONBLOCK);
-#endif
-		}
-	}
-} // namespace np
diff --git a/rpcs3/Emu/NP/ip_address.h b/rpcs3/Emu/NP/ip_address.h
deleted file mode 100644
index 3857275aac..0000000000
--- a/rpcs3/Emu/NP/ip_address.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#pragma once
-
-#include <array>
-#include <unordered_map>
-
-#include <flatbuffers/vector.h>
-
-#include "util/types.hpp"
-#include "Utilities/mutex.h"
-
-#ifdef _WIN32
-#include <winsock2.h>
-#include <WS2tcpip.h>
-#else
-#ifdef __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#ifdef __clang__
-#pragma GCC diagnostic pop
-#endif
-#endif
-
-#ifdef _WIN32
-using socket_type = uptr;
-#else
-using socket_type = int;
-#endif
-
-template <>
-struct std::hash<std::array<u8, 16>>
-{
-	std::size_t operator()(const std::array<u8, 16>& array) const noexcept
-	{
-		std::size_t hash = 0;
-		std::hash<std::uint8_t> hasher;
-
-		for (auto byte : array)
-		{
-			hash ^= hasher(byte) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
-		}
-
-		return hash;
-	}
-};
-
-namespace np
-{
-	class ip_address_translator
-	{
-	public:
-		static bool is_ipv6(u32 addr_be);
-
-		u32 register_ipv6(const std::array<u8, 16>& ipv6_addr);
-		sockaddr_in6 get_ipv6_sockaddr(u32 addr_be, u16 port_be);
-
-	private:
-		static constexpr u32 translation_range_begin = 0x00'00'00'01;
-		static constexpr u32 translation_range_end = 0x00'00'FF'FF;
-
-		shared_mutex mutex;
-		u32 cur_addr = translation_range_begin;
-		std::unordered_map<std::array<u8, 16>, u32> ipv6_to_ipv4;
-		std::vector<std::array<u8, 16>> ipv4_to_ipv6;
-	};
-
-	u32 register_ip(const flatbuffers::Vector<std::uint8_t>* vec);
-
-	enum class IPV6_SUPPORT : u8
-	{
-		IPV6_UNKNOWN,
-		IPV6_UNSUPPORTED,
-		IPV6_SUPPORTED,
-	};
-
-	bool is_ipv6_supported(std::optional<IPV6_SUPPORT> force_state = std::nullopt);
-	s32 sendto_possibly_ipv6(socket_type native_socket, const char* data, u32 size, const sockaddr_in* addr, int native_flags);
-	sockaddr_in6 sockaddr_to_sockaddr6(const sockaddr_in& addr);
-	sockaddr_in sockaddr6_to_sockaddr(const sockaddr_in6& addr);
-
-	void close_socket(socket_type socket);
-	void set_socket_non_blocking(socket_type socket);
-} // namespace np
diff --git a/rpcs3/Emu/NP/np_allocator.h b/rpcs3/Emu/NP/np_allocator.h
deleted file mode 100644
index ee8017cb72..0000000000
--- a/rpcs3/Emu/NP/np_allocator.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#pragma once
-
-#include <map>
-
-#include "Emu/Memory/vm_ptr.h"
-#include "Utilities/mutex.h"
-#include "util/asm.hpp"
-#include "util/logs.hpp"
-
-LOG_CHANNEL(np_mem_allocator);
-
-namespace np
-{
-	class memory_allocator
-	{
-	public:
-		memory_allocator() = default;
-		memory_allocator(utils::serial& ar) noexcept { save(ar); }
-		memory_allocator(const memory_allocator&) = delete;
-		memory_allocator& operator=(const memory_allocator&) = delete;
-
-		void save(utils::serial& ar);
-
-		void setup(vm::ptr<void> ptr_pool, u32 size)
-		{
-			std::lock_guard lock(m_mutex);
-			m_pool  = ptr_pool;
-			m_size  = size;
-			m_avail = size;
-			m_allocs.clear();
-		}
-
-		void release()
-		{
-			std::lock_guard lock(m_mutex);
-			m_pool  = vm::null;
-			m_size  = 0;
-			m_avail = 0;
-			m_allocs.clear();
-		}
-
-		u32 allocate(u32 size)
-		{
-			std::lock_guard lock(m_mutex);
-			if (!size)
-			{
-				np_mem_allocator.error("Can't allocate 0 size buffer!");
-				return 0;
-			}
-
-			// Align allocs
-			const u32 alloc_size = utils::align(size, 4);
-			if (alloc_size > m_avail)
-			{
-				np_mem_allocator.error("Not enough memory available in NP pool!");
-				return 0;
-			}
-
-			u32 last_free    = 0;
-			bool found_space = false;
-
-			for (const auto& a : m_allocs)
-			{
-				if ((a.first - last_free) >= alloc_size)
-				{
-					found_space = true;
-					break;
-				}
-
-				last_free = a.first + a.second;
-			}
-
-			if (!found_space)
-			{
-				if ((m_size - last_free) < alloc_size)
-				{
-					np_mem_allocator.error("Not enough memory available in NP pool(continuous block)!");
-					return 0;
-				}
-			}
-
-			m_allocs.emplace(last_free, alloc_size);
-			m_avail -= alloc_size;
-
-			memset((static_cast<u8*>(m_pool.get_ptr())) + last_free, 0, alloc_size);
-
-			np_mem_allocator.trace("Allocation off:%d size:%d psize:%d, pavail:%d", last_free, alloc_size, m_size, m_avail);
-
-			return m_pool.addr() + last_free;
-		}
-
-		void free(u32 addr)
-		{
-			std::lock_guard lock(m_mutex);
-
-			ensure(addr >= m_pool.addr() && addr < (m_pool.addr() + m_size), "memory_allocator::free: addr is out of bounds!");
-
-			const u32 offset = addr - m_pool.addr();
-			ensure(m_allocs.contains(offset), "memory_allocator::free: m_allocs doesn't contain the allocation!");
-
-			m_avail += ::at32(m_allocs, offset);
-			m_allocs.erase(offset);
-		}
-
-		void shrink_allocation(u32 addr, u32 new_size)
-		{
-			std::lock_guard lock(m_mutex);
-
-			ensure(addr >= m_pool.addr() && addr < (m_pool.addr() + m_size), "memory_allocator::reduce_allocation: addr is out of bounds!");
-
-			const u32 offset = addr - m_pool.addr();
-			ensure(m_allocs.contains(offset), "memory_allocator::reduce_allocation: m_allocs doesn't contain the allocation!");
-			ensure(m_allocs[offset] >= new_size, "memory_allocator::reduce_allocation: New size is bigger than current allocation!");
-
-			m_avail += (::at32(m_allocs, offset) - new_size);
-			m_allocs[offset] = new_size;
-		}
-
-	private:
-		shared_mutex m_mutex;
-		vm::ptr<void> m_pool{};
-		u32 m_size  = 0;
-		u32 m_avail = 0;
-		std::map<u32, u32> m_allocs{}; // offset/size
-	};
-} // namespace np
diff --git a/rpcs3/Emu/NP/np_cache.cpp b/rpcs3/Emu/NP/np_cache.cpp
deleted file mode 100644
index 3b1c38bd9e..0000000000
--- a/rpcs3/Emu/NP/np_cache.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-#include "stdafx.h"
-#include <bit>
-
-#include "Emu/NP/np_allocator.h"
-#include "Emu/NP/np_cache.h"
-#include "Emu/NP/np_helpers.h"
-
-LOG_CHANNEL(np_cache);
-
-namespace np
-{
-	memberbin_cache::memberbin_cache(const SceNpMatching2RoomMemberBinAttrInternal* sce_memberbin)
-	{
-		ensure(sce_memberbin && (sce_memberbin->data.ptr || !sce_memberbin->data.size));
-
-		id = sce_memberbin->data.id;
-		updateDate.tick = sce_memberbin->updateDate.tick;
-		data = std::vector<u8>(sce_memberbin->data.ptr.get_ptr(), sce_memberbin->data.ptr.get_ptr() + sce_memberbin->data.size);
-	}
-
-	member_cache::member_cache(const SceNpMatching2RoomMemberDataInternal* sce_member)
-	{
-		userInfo.npId = sce_member->userInfo.npId;
-		if (sce_member->userInfo.onlineName)
-		{
-			userInfo.onlineName = *sce_member->userInfo.onlineName;
-		}
-		if (sce_member->userInfo.avatarUrl)
-		{
-			userInfo.avatarUrl = *sce_member->userInfo.avatarUrl;
-		}
-
-		joinDate.tick = sce_member->joinDate.tick;
-		memberId      = sce_member->memberId;
-		teamId        = sce_member->teamId;
-		if (sce_member->roomGroup)
-		{
-			group_id = sce_member->roomGroup->groupId;
-		}
-		else
-		{
-			group_id = 0;
-		}
-
-		natType  = sce_member->natType;
-		flagAttr = sce_member->flagAttr;
-
-		for (u32 i = 0; i < sce_member->roomMemberBinAttrInternalNum; i++)
-		{
-			bins.insert_or_assign(sce_member->roomMemberBinAttrInternal[i].data.id, memberbin_cache(&sce_member->roomMemberBinAttrInternal[i]));
-		}
-	}
-
-	void room_cache::update(const SceNpMatching2RoomDataInternal* sce_roomdata)
-	{
-		num_slots     = sce_roomdata->maxSlot;
-		mask_password = sce_roomdata->passwordSlotMask;
-
-		groups.clear();
-		for (u32 i = 0; i < sce_roomdata->roomGroupNum && sce_roomdata->roomGroup; i++)
-		{
-			const SceNpMatching2RoomGroup* sce_group = &sce_roomdata->roomGroup[i];
-			memcpy(&groups[sce_group->groupId], sce_group, sizeof(SceNpMatching2RoomGroup));
-		}
-
-		members.clear();
-		vm::bptr<SceNpMatching2RoomMemberDataInternal> sce_member = sce_roomdata->memberList.members;
-		while (sce_member)
-		{
-			members.insert_or_assign(sce_member->memberId, member_cache(sce_member.get_ptr()));
-			sce_member = sce_member->next;
-		}
-
-		if (sce_roomdata->memberList.me == sce_roomdata->memberList.owner)
-		{
-			owner = true;
-		}
-	}
-
-	void cache_manager::insert_room(const SceNpMatching2RoomDataInternal* sce_roomdata)
-	{
-		std::lock_guard lock(mutex);
-
-		rooms[sce_roomdata->roomId].update(sce_roomdata);
-	}
-
-	bool cache_manager::add_member(SceNpMatching2RoomId room_id, const SceNpMatching2RoomMemberDataInternal* sce_roommemberdata)
-	{
-		std::lock_guard lock(mutex);
-
-		if (!rooms.contains(room_id))
-		{
-			np_cache.error("np_cache::add_member cache miss: room_id(%d)", room_id);
-			return false;
-		}
-
-		rooms[room_id].members.insert_or_assign(sce_roommemberdata->memberId, member_cache(sce_roommemberdata));
-		return true;
-	}
-
-	bool cache_manager::del_member(SceNpMatching2RoomId room_id, SceNpMatching2RoomMemberId member_id)
-	{
-		std::lock_guard lock(mutex);
-
-		if (!rooms.contains(room_id))
-		{
-			np_cache.error("np_cache::del_member cache miss: room_id(%d)/member_id(%d)", room_id, member_id);
-			return false;
-		}
-
-		rooms.erase(member_id);
-		return true;
-	}
-
-	void cache_manager::update_password(SceNpMatching2RoomId room_id, const std::optional<SceNpMatching2SessionPassword>& password)
-	{
-		std::lock_guard lock(mutex);
-
-		rooms[room_id].password = password;
-	}
-
-	std::pair<error_code, std::optional<SceNpMatching2RoomSlotInfo>> cache_manager::get_slots(SceNpMatching2RoomId room_id)
-	{
-		std::lock_guard lock(mutex);
-
-		if (!rooms.contains(room_id))
-		{
-			return {SCE_NP_MATCHING2_ERROR_ROOM_NOT_FOUND, {}};
-		}
-
-		const auto& room = rooms[room_id];
-
-		SceNpMatching2RoomSlotInfo slots{};
-
-		slots.roomId = room_id;
-
-		SceNpMatching2RoomJoinedSlotMask join_mask = 0;
-		for (const auto& member : room.members)
-		{
-			join_mask |= (1ull << ((member.first >> 4) - 1));
-		}
-		slots.joinedSlotMask   = join_mask;
-		slots.passwordSlotMask = room.mask_password;
-
-		u64 joinable_slot_mask = (static_cast<u64>(1) << room.num_slots) - 1;
-		u16 num_private_slots  = std::popcount(room.mask_password & joinable_slot_mask);
-		u16 num_public_slots   = room.num_slots - num_private_slots;
-
-		slots.publicSlotNum  = num_public_slots;
-		slots.privateSlotNum = num_private_slots;
-
-		u16 open_private_slots = num_private_slots - std::popcount(join_mask & room.mask_password);
-		u16 open_public_slots  = num_public_slots - std::popcount(join_mask & (~room.mask_password));
-
-		slots.openPublicSlotNum  = open_public_slots;
-		slots.openPrivateSlotNum = open_private_slots;
-
-		return {CELL_OK, slots};
-	}
-
-	std::pair<error_code, std::vector<SceNpMatching2RoomMemberId>> cache_manager::get_memberids(u64 room_id, s32 sort_method)
-	{
-		std::lock_guard lock(mutex);
-
-		if (!rooms.contains(room_id))
-		{
-			return {SCE_NP_MATCHING2_ERROR_ROOM_NOT_FOUND, {}};
-		}
-
-		const auto& room = rooms[room_id];
-
-		std::vector<SceNpMatching2RoomMemberId> vec_memberids;
-
-		switch (sort_method)
-		{
-		case SCE_NP_MATCHING2_SORT_METHOD_SLOT_NUMBER:
-		{
-			for (const auto& member : room.members)
-			{
-				vec_memberids.push_back(member.first);
-			}
-			break;
-		}
-		case SCE_NP_MATCHING2_SORT_METHOD_JOIN_DATE:
-		{
-			std::map<u64, u16> map_joindate_id;
-
-			for (const auto& member : room.members)
-			{
-				map_joindate_id.insert(std::make_pair(member.second.joinDate.tick, member.first));
-			}
-
-			for (const auto& member : map_joindate_id)
-			{
-				vec_memberids.push_back(member.second);
-			}
-
-			break;
-		}
-		default: fmt::throw_exception("Unreachable");
-		}
-
-		return {CELL_OK, vec_memberids};
-	}
-
-	std::pair<error_code, std::optional<SceNpMatching2SessionPassword>> cache_manager::get_password(SceNpMatching2RoomId room_id)
-	{
-		std::lock_guard lock(mutex);
-
-		if (!rooms.contains(room_id))
-		{
-			return {SCE_NP_MATCHING2_ERROR_ROOM_NOT_FOUND, {}};
-		}
-
-		if (!rooms[room_id].owner)
-		{
-			return {SCE_NP_MATCHING2_ERROR_NOT_ALLOWED, {}};
-		}
-
-		return {CELL_OK, rooms[room_id].password};
-	}
-
-	error_code cache_manager::get_member_and_attrs(SceNpMatching2RoomId room_id, SceNpMatching2RoomMemberId member_id, const std::vector<SceNpMatching2AttributeId>& binattrs_list, SceNpMatching2RoomMemberDataInternal* ptr_member, u32 addr_data, u32 size_data, bool include_onlinename, bool include_avatarurl)
-	{
-		std::lock_guard lock(mutex);
-
-		if (!rooms.contains(room_id))
-		{
-			return SCE_NP_MATCHING2_ERROR_ROOM_NOT_FOUND;
-		}
-
-		if (!rooms[room_id].members.contains(member_id))
-		{
-			return SCE_NP_MATCHING2_ERROR_ROOM_MEMBER_NOT_FOUND;
-		}
-
-		const auto& room = ::at32(rooms, room_id);
-		const auto& member = ::at32(room.members, member_id);
-
-		if (ptr_member)
-		{
-			memset(ptr_member, 0, sizeof(SceNpMatching2RoomMemberDataInternal));
-			memcpy(&ptr_member->userInfo.npId, &member.userInfo.npId, sizeof(SceNpId));
-			ptr_member->joinDate.tick = member.joinDate.tick;
-			ptr_member->memberId      = member.memberId;
-			ptr_member->teamId        = member.teamId;
-			ptr_member->natType       = member.natType;
-			ptr_member->flagAttr      = member.flagAttr;
-		}
-
-		u32 needed_data_size = 0;
-
-		if (include_onlinename && member.userInfo.onlineName)
-			needed_data_size += sizeof(SceNpOnlineName);
-
-		if (include_avatarurl && member.userInfo.avatarUrl)
-			needed_data_size += sizeof(SceNpAvatarUrl);
-
-		if (member.group_id)
-			needed_data_size += sizeof(SceNpMatching2RoomGroup);
-
-		for (usz i = 0; i < binattrs_list.size(); i++)
-		{
-			if (member.bins.contains(binattrs_list[i]))
-			{
-				needed_data_size += ::narrow<u32>(sizeof(SceNpMatching2RoomMemberBinAttrInternal) + ::at32(member.bins, binattrs_list[i]).data.size());
-			}
-		}
-
-		if (!addr_data || !ptr_member)
-		{
-			return not_an_error(needed_data_size);
-		}
-
-		if (size_data < needed_data_size)
-		{
-			return SCE_NP_MATCHING2_ERROR_INSUFFICIENT_BUFFER;
-		}
-
-		memory_allocator mem;
-		mem.setup(vm::ptr<void>(vm::cast(addr_data)), size_data);
-
-		if (include_onlinename && member.userInfo.onlineName)
-		{
-			ptr_member->userInfo.onlineName.set(mem.allocate(sizeof(SceNpOnlineName)));
-			memcpy(ptr_member->userInfo.onlineName.get_ptr(), &member.userInfo.onlineName.value(), sizeof(SceNpOnlineName));
-		}
-
-		if (include_avatarurl && member.userInfo.avatarUrl)
-		{
-			ptr_member->userInfo.avatarUrl.set(mem.allocate(sizeof(SceNpAvatarUrl)));
-			memcpy(ptr_member->userInfo.avatarUrl.get_ptr(), &member.userInfo.avatarUrl.value(), sizeof(SceNpAvatarUrl));
-		}
-
-		if (member.group_id)
-		{
-			ptr_member->roomGroup.set(mem.allocate(sizeof(SceNpMatching2RoomGroup)));
-			memcpy(ptr_member->roomGroup.get_ptr(), &::at32(room.groups, member.group_id), sizeof(SceNpMatching2RoomGroup));
-		}
-
-		u32 num_binattrs = 0;
-		for (u32 i = 0; i < binattrs_list.size(); i++)
-		{
-			if (member.bins.contains(binattrs_list[i]))
-			{
-				num_binattrs++;
-			}
-		}
-
-		if (num_binattrs)
-		{
-			ptr_member->roomMemberBinAttrInternal.set(mem.allocate(sizeof(SceNpMatching2RoomMemberBinAttrInternal) * num_binattrs));
-			ptr_member->roomMemberBinAttrInternalNum         = num_binattrs;
-			SceNpMatching2RoomMemberBinAttrInternal* bin_ptr = ptr_member->roomMemberBinAttrInternal.get_ptr();
-
-			u32 actual_cnt = 0;
-			for (u32 i = 0; i < binattrs_list.size(); i++)
-			{
-				if (member.bins.contains(binattrs_list[i]))
-				{
-					const auto& bin = ::at32(member.bins, binattrs_list[i]);
-					bin_ptr[actual_cnt].updateDate.tick = bin.updateDate.tick;
-					bin_ptr[actual_cnt].data.id         = bin.id;
-					bin_ptr[actual_cnt].data.size       = ::size32(bin.data);
-					bin_ptr[actual_cnt].data.ptr.set(mem.allocate(::size32(bin.data)));
-					std::memcpy(bin_ptr[actual_cnt].data.ptr.get_ptr(), bin.data.data(), bin.data.size());
-					actual_cnt++;
-				}
-			}
-		}
-
-		return not_an_error(needed_data_size);
-	}
-
-	std::pair<error_code, std::optional<SceNpId>> cache_manager::get_npid(u64 room_id, u16 member_id)
-	{
-		std::lock_guard lock(mutex);
-
-		if (!rooms.contains(room_id))
-		{
-			np_cache.error("np_cache::get_npid cache miss room_id: room_id(%d)/member_id(%d)", room_id, member_id);
-			return {SCE_NP_MATCHING2_ERROR_INVALID_ROOM_ID, std::nullopt};
-		}
-
-		if (!::at32(rooms, room_id).members.contains(member_id))
-		{
-			np_cache.error("np_cache::get_npid cache miss member_id: room_id(%d)/member_id(%d)", room_id, member_id);
-			return {SCE_NP_MATCHING2_ERROR_INVALID_MEMBER_ID, std::nullopt};
-		}
-
-		return {CELL_OK, ::at32(::at32(rooms, room_id).members, member_id).userInfo.npId};
-	}
-
-	std::optional<u16> cache_manager::get_memberid(u64 room_id, const SceNpId& npid)
-	{
-		std::lock_guard lock(mutex);
-
-		if (!rooms.contains(room_id))
-		{
-			np_cache.error("np_cache::get_memberid cache miss room_id: room_id(%d)/npid(%s)", room_id, static_cast<const char*>(npid.handle.data));
-			return std::nullopt;
-		}
-
-		const auto& members = ::at32(rooms, room_id).members;
-
-		for (const auto& [id, member_cache] : members)
-		{
-			if (np::is_same_npid(member_cache.userInfo.npId, npid))
-				return id;
-		}
-
-		np_cache.error("np_cache::get_memberid cache miss member_id: room_id(%d)/npid(%s)", room_id, static_cast<const char*>(npid.handle.data));
-		return std::nullopt;
-	}
-
-} // namespace np
diff --git a/rpcs3/Emu/NP/np_cache.h b/rpcs3/Emu/NP/np_cache.h
deleted file mode 100644
index 9e1b496ea5..0000000000
--- a/rpcs3/Emu/NP/np_cache.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#pragma once
-
-#include <map>
-#include <optional>
-
-#include "Utilities/mutex.h"
-
-#include "Emu/Cell/Modules/sceNp.h"
-#include "Emu/Cell/Modules/sceNp2.h"
-
-namespace np
-{
-	struct userinfo_cache
-	{
-		SceNpId npId{};
-		std::optional<SceNpOnlineName> onlineName;
-		std::optional<SceNpAvatarUrl> avatarUrl;
-	};
-
-	struct memberbin_cache
-	{
-		memberbin_cache(const SceNpMatching2RoomMemberBinAttrInternal* sce_memberbin);
-
-		SceNpMatching2AttributeId id;
-		CellRtcTick updateDate;
-		std::vector<u8> data;
-	};
-
-	struct member_cache
-	{
-		member_cache(const SceNpMatching2RoomMemberDataInternal* sce_member);
-
-		userinfo_cache userInfo;
-		CellRtcTick joinDate;
-		SceNpMatching2RoomMemberId memberId;
-		SceNpMatching2TeamId teamId;
-		SceNpMatching2RoomGroupId group_id;
-		SceNpMatching2NatType natType;
-		SceNpMatching2FlagAttr flagAttr;
-
-		std::map<SceNpMatching2AttributeId, memberbin_cache> bins;
-	};
-
-	struct password_info_cache
-	{
-		bool with_password = false;
-		SceNpMatching2SessionPassword password{};
-	};
-
-	struct room_cache
-	{
-		void update(const SceNpMatching2RoomDataInternal* sce_roomdata);
-
-		u32 num_slots                                    = 0;
-		SceNpMatching2RoomPasswordSlotMask mask_password = 0;
-		std::optional<SceNpMatching2SessionPassword> password;
-
-		std::map<SceNpMatching2RoomGroupId, SceNpMatching2RoomGroup> groups;
-		std::map<SceNpMatching2RoomMemberId, member_cache> members;
-
-		bool owner = false;
-	};
-
-	class cache_manager
-	{
-	public:
-		cache_manager() = default;
-
-		void insert_room(const SceNpMatching2RoomDataInternal* sce_roomdata);
-		bool add_member(SceNpMatching2RoomId room_id, const SceNpMatching2RoomMemberDataInternal* sce_roommemberdata);
-		bool del_member(SceNpMatching2RoomId room_id, SceNpMatching2RoomMemberId member_id);
-		void update_password(SceNpMatching2RoomId room_id, const std::optional<SceNpMatching2SessionPassword>& password);
-
-		std::pair<error_code, std::optional<SceNpMatching2RoomSlotInfo>> get_slots(SceNpMatching2RoomId room_id);
-		std::pair<error_code, std::vector<SceNpMatching2RoomMemberId>> get_memberids(u64 room_id, s32 sort_method);
-		std::pair<error_code, std::optional<SceNpMatching2SessionPassword>> get_password(SceNpMatching2RoomId room_id);
-		error_code get_member_and_attrs(SceNpMatching2RoomId room_id, SceNpMatching2RoomMemberId member_id, const std::vector<SceNpMatching2AttributeId>& binattrs_list, SceNpMatching2RoomMemberDataInternal* ptr_member, u32 addr_data, u32 size_data, bool include_onlinename, bool include_avatarurl);
-		std::pair<error_code, std::optional<SceNpId>> get_npid(u64 room_id, u16 member_id);
-		std::optional<u16> get_memberid(u64 room_id, const SceNpId& npid);
-
-	private:
-		shared_mutex mutex;
-		std::map<SceNpMatching2RoomId, room_cache> rooms;
-	};
-} // namespace np
diff --git a/rpcs3/Emu/NP/np_contexts.cpp b/rpcs3/Emu/NP/np_contexts.cpp
index acc934c8b9..37f69bfea0 100644
--- a/rpcs3/Emu/NP/np_contexts.cpp
+++ b/rpcs3/Emu/NP/np_contexts.cpp
@@ -1,98 +1,7 @@
 #include "stdafx.h"
 #include "np_contexts.h"
 
-#include "Emu/Cell/PPUCallback.h"
 #include "Emu/IdManager.h"
-#include "Emu/Cell/Modules/cellSysutil.h"
-
-LOG_CHANNEL(sceNp2);
-
-generic_async_transaction_context::generic_async_transaction_context(const SceNpCommunicationId& communicationId, const SceNpCommunicationPassphrase& passphrase, u64 timeout)
-	: communicationId(communicationId), passphrase(passphrase), timeout(timeout)
-	, idm_id(idm::last_id())
-{
-}
-
-generic_async_transaction_context::~generic_async_transaction_context()
-{
-	if (thread.joinable())
-		thread.join();
-}
-
-std::optional<s32> generic_async_transaction_context::get_transaction_status()
-{
-	std::lock_guard lock(mutex);
-	return result;
-}
-void generic_async_transaction_context::abort_transaction()
-{
-	std::lock_guard lock(mutex);
-
-	result = SCE_NP_COMMUNITY_ERROR_ABORTED;
-	wake_cond.notify_one();
-}
-error_code generic_async_transaction_context::wait_for_completion()
-{
-	std::unique_lock lock(mutex);
-
-	if (result)
-	{
-		return *result;
-	}
-
-	completion_cond.wait(lock);
-
-	return *result;
-}
-
-void generic_async_transaction_context::set_result_and_wake(error_code err)
-{
-	result = err;
-	wake_cond.notify_one();
-}
-
-tus_ctx::tus_ctx(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase)
-{
-	ensure(!communicationId->data[9] && strlen(communicationId->data) == 9);
-	memcpy(&this->communicationId, communicationId.get_ptr(), sizeof(SceNpCommunicationId));
-	memcpy(&this->passphrase, passphrase.get_ptr(), sizeof(SceNpCommunicationPassphrase));
-}
-s32 create_tus_context(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase)
-{
-	s32 tus_id = idm::make<tus_ctx>(communicationId, passphrase);
-
-	if (tus_id == id_manager::id_traits<tus_ctx>::invalid)
-	{
-		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_OBJECTS;
-	}
-
-	return static_cast<s32>(tus_id);
-}
-bool destroy_tus_context(s32 ctx_id)
-{
-	return idm::remove<tus_ctx>(static_cast<u32>(ctx_id));
-}
-
-tus_transaction_ctx::tus_transaction_ctx(const shared_ptr<tus_ctx>& tus)
-	: generic_async_transaction_context(tus->communicationId, tus->passphrase, tus->timeout)
-{
-}
-
-s32 create_tus_transaction_context(const shared_ptr<tus_ctx>& tus)
-{
-	s32 tus_id = idm::make<tus_transaction_ctx>(tus);
-
-	if (tus_id == id_manager::id_traits<tus_transaction_ctx>::invalid)
-	{
-		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_OBJECTS;
-	}
-
-	return static_cast<s32>(tus_id);
-}
-bool destroy_tus_transaction_context(s32 ctx_id)
-{
-	return idm::remove<tus_transaction_ctx>(static_cast<u32>(ctx_id));
-}
 
 score_ctx::score_ctx(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase)
 {
@@ -102,55 +11,35 @@ score_ctx::score_ctx(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<Sc
 }
 s32 create_score_context(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase)
 {
-	s32 score_id = idm::make<score_ctx>(communicationId, passphrase);
-
-	if (score_id == id_manager::id_traits<score_ctx>::invalid)
-	{
-		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_OBJECTS;
-	}
-
-	return static_cast<s32>(score_id);
+	return static_cast<s32>(idm::make<score_ctx>(communicationId, passphrase));
 }
 bool destroy_score_context(s32 ctx_id)
 {
 	return idm::remove<score_ctx>(static_cast<u32>(ctx_id));
 }
 
-score_transaction_ctx::score_transaction_ctx(const shared_ptr<score_ctx>& score)
-	: generic_async_transaction_context(score->communicationId, score->passphrase, score->timeout)
+score_transaction_ctx::score_transaction_ctx(s32 score_context_id)
 {
-	pcId = score->pcId;
+	this->score_context_id = score_context_id;
 }
-
-s32 create_score_transaction_context(const shared_ptr<score_ctx>& score)
+s32 create_score_transaction_context(s32 score_context_id)
 {
-	s32 trans_id = idm::make<score_transaction_ctx>(score);
-
-	if (trans_id == id_manager::id_traits<score_transaction_ctx>::invalid)
-	{
-		return SCE_NP_COMMUNITY_ERROR_TOO_MANY_OBJECTS;
-	}
-
-	return static_cast<s32>(trans_id);
+	return static_cast<s32>(idm::make<score_transaction_ctx>(score_context_id));
 }
 bool destroy_score_transaction_context(s32 ctx_id)
 {
 	return idm::remove<score_transaction_ctx>(static_cast<u32>(ctx_id));
 }
 
-match2_ctx::match2_ctx(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase, s32 option)
+match2_ctx::match2_ctx(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase)
 {
 	ensure(!communicationId->data[9] && strlen(communicationId->data) == 9);
 	memcpy(&this->communicationId, communicationId.get_ptr(), sizeof(SceNpCommunicationId));
 	memcpy(&this->passphrase, passphrase.get_ptr(), sizeof(SceNpCommunicationPassphrase));
-
-	include_onlinename = option & SCE_NP_MATCHING2_CONTEXT_OPTION_USE_ONLINENAME;
-	include_avatarurl = option & SCE_NP_MATCHING2_CONTEXT_OPTION_USE_AVATARURL;
 }
-u16 create_match2_context(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase, s32 option)
+u16 create_match2_context(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase)
 {
-	sceNp2.notice("Creating match2 context with communicationId: <%s>", static_cast<const char*>(communicationId->data));
-	return static_cast<u16>(idm::make<match2_ctx>(communicationId, passphrase, option));
+	return static_cast<u16>(idm::make<match2_ctx>(communicationId, passphrase));
 }
 bool destroy_match2_context(u16 ctx_id)
 {
@@ -158,11 +47,11 @@ bool destroy_match2_context(u16 ctx_id)
 }
 bool check_match2_context(u16 ctx_id)
 {
-	return (idm::check_unlocked<match2_ctx>(ctx_id) != nullptr);
+	return (idm::check<match2_ctx>(ctx_id) != nullptr);
 }
-shared_ptr<match2_ctx> get_match2_context(u16 ctx_id)
+std::shared_ptr<match2_ctx> get_match2_context(u16 ctx_id)
 {
-	return idm::get_unlocked<match2_ctx>(ctx_id);
+	return idm::get<match2_ctx>(ctx_id);
 }
 
 lookup_title_ctx::lookup_title_ctx(vm::cptr<SceNpCommunicationId> communicationId)
@@ -196,18 +85,18 @@ commerce2_ctx::commerce2_ctx(u32 version, vm::cptr<SceNpId> npid, vm::ptr<SceNpC
 {
 	this->version = version;
 	memcpy(&this->npid, npid.get_ptr(), sizeof(SceNpId));
-	this->context_callback = handler;
+	this->context_callback       = handler;
 	this->context_callback_param = arg;
 }
 s32 create_commerce2_context(u32 version, vm::cptr<SceNpId> npid, vm::ptr<SceNpCommerce2Handler> handler, vm::ptr<void> arg)
 {
 	return static_cast<s32>(idm::make<commerce2_ctx>(version, npid, handler, arg));
 }
-bool destroy_commerce2_context(u32 ctx_id)
+bool destroy_commerce2_context(s32 ctx_id)
 {
 	return idm::remove<commerce2_ctx>(static_cast<u32>(ctx_id));
 }
-shared_ptr<commerce2_ctx> get_commerce2_context(u16 ctx_id)
+std::shared_ptr<commerce2_ctx> get_commerce2_context(u16 ctx_id)
 {
 	return idm::get_unlocked<commerce2_ctx>(ctx_id);
 }
@@ -216,61 +105,13 @@ signaling_ctx::signaling_ctx(vm::ptr<SceNpId> npid, vm::ptr<SceNpSignalingHandle
 {
 	memcpy(&this->npid, npid.get_ptr(), sizeof(SceNpId));
 	this->handler = handler;
-	this->arg = arg;
+	this->arg     = arg;
 }
 s32 create_signaling_context(vm::ptr<SceNpId> npid, vm::ptr<SceNpSignalingHandler> handler, vm::ptr<void> arg)
 {
 	return static_cast<s32>(idm::make<signaling_ctx>(npid, handler, arg));
 }
-bool destroy_signaling_context(u32 ctx_id)
+bool destroy_signaling_context(s32 ctx_id)
 {
 	return idm::remove<signaling_ctx>(static_cast<u32>(ctx_id));
 }
-shared_ptr<signaling_ctx> get_signaling_context(u32 ctx_id)
-{
-	return idm::get_unlocked<signaling_ctx>(ctx_id);
-}
-
-matching_ctx::matching_ctx(vm::ptr<SceNpId> npId, vm::ptr<SceNpMatchingHandler> handler, vm::ptr<void> arg)
-{
-	memcpy(&this->npid, npId.get_ptr(), sizeof(SceNpId));
-	this->handler = handler;
-	this->arg = arg;
-}
-void matching_ctx::queue_callback(u32 req_id, s32 event, s32 error_code) const
-{
-	if (handler)
-	{
-		sysutil_register_cb([=, handler = this->handler, ctx_id = this->ctx_id, arg = this->arg](ppu_thread& cb_ppu) -> s32
-			{
-				handler(cb_ppu, ctx_id, req_id, event, error_code, arg);
-				return 0;
-			});
-	}
-}
-void matching_ctx::queue_gui_callback(s32 event, s32 error_code) const
-{
-	if (gui_handler)
-	{
-		sysutil_register_cb([=, gui_handler = this->gui_handler, ctx_id = this->ctx_id, gui_arg = this->gui_arg](ppu_thread& cb_ppu) -> s32
-			{
-				gui_handler(cb_ppu, ctx_id, event, error_code, gui_arg);
-				return 0;
-			});
-	}
-}
-s32 create_matching_context(vm::ptr<SceNpId> npId, vm::ptr<SceNpMatchingHandler> handler, vm::ptr<void> arg)
-{
-	const u32 ctx_id = idm::make<matching_ctx>(npId, handler, arg);
-	auto ctx = get_matching_context(ctx_id);
-	ctx->ctx_id = ctx_id;
-	return static_cast<s32>(ctx_id);
-}
-shared_ptr<matching_ctx> get_matching_context(u32 ctx_id)
-{
-	return idm::get_unlocked<matching_ctx>(ctx_id);
-}
-bool destroy_matching_context(u32 ctx_id)
-{
-	return idm::remove<matching_ctx>(static_cast<u32>(ctx_id));
-}
diff --git a/rpcs3/Emu/NP/np_contexts.h b/rpcs3/Emu/NP/np_contexts.h
index 20e123730b..7a04cd8a89 100644
--- a/rpcs3/Emu/NP/np_contexts.h
+++ b/rpcs3/Emu/NP/np_contexts.h
@@ -1,226 +1,67 @@
 #pragma once
 
-#include <optional>
-#include <condition_variable>
-#include <thread>
-#include <variant>
-
-#include "Utilities/mutex.h"
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/Modules/sceNp.h"
 #include "Emu/Cell/Modules/sceNp2.h"
 #include "Emu/Cell/Modules/sceNpCommerce2.h"
-#include "Emu/Cell/Modules/sceNpTus.h"
-#include "Utilities/Thread.h"
-
-// Used By Score and Tus
-struct generic_async_transaction_context
-{
-	~generic_async_transaction_context();
-
-	generic_async_transaction_context(const SceNpCommunicationId& communicationId, const SceNpCommunicationPassphrase& passphrase, u64 timeout);
-
-	std::optional<s32> get_transaction_status();
-	void abort_transaction();
-	error_code wait_for_completion();
-	void set_result_and_wake(error_code err);
-
-	shared_mutex mutex;
-	std::condition_variable_any wake_cond, completion_cond;
-	std::optional<error_code> result;
-	SceNpCommunicationId communicationId;
-	SceNpCommunicationPassphrase passphrase;
-	u64 timeout;
-
-	std::thread thread;
-
-	u32 idm_id;
-};
-
-struct tdata_invalid
-{
-};
-
-// Score transaction data
-
-struct tdata_get_board_infos
-{
-	vm::ptr<SceNpScoreBoardInfo> boardInfo;
-};
-
-struct tdata_record_score
-{
-	vm::ptr<SceNpScoreRankNumber> tmpRank;
-};
-
-struct tdata_record_score_data
-{
-	u32 game_data_size = 0;
-	std::vector<u8> game_data;
-};
-
-struct tdata_get_score_data
-{
-	vm::ptr<u32> totalSize;
-	u32 recvSize = 0;
-	vm::ptr<void> score_data;
-	u32 game_data_size = 0;
-	std::vector<u8> game_data;
-};
-
-struct tdata_get_score_generic
-{
-	vm::ptr<void> rankArray;
-	u32 rankArraySize = 0;
-	vm::ptr<SceNpScoreComment> commentArray;
-	vm::ptr<void> infoArray;
-	u32 infoArraySize = 0;
-	u32 arrayNum = 0;
-	vm::ptr<CellRtcTick> lastSortDate;
-	vm::ptr<SceNpScoreRankNumber> totalRecord;
-	bool player_rank_data = false;
-	bool deprecated = false;
-};
-
-// TUS transaction data
-
-struct tdata_tus_get_variables_generic
-{
-	vm::ptr<SceNpTusVariable> variableArray;
-	s32 arrayNum;
-};
-
-struct tdata_tus_get_variable_generic
-{
-	vm::ptr<SceNpTusVariable> outVariable;
-};
-
-struct tdata_tus_set_data
-{
-	u32 tus_data_size;
-	std::vector<u8> tus_data;
-};
-
-struct tdata_tus_get_data
-{
-	u32 recvSize = 0;
-	vm::ptr<SceNpTusDataStatus> dataStatus;
-	vm::ptr<void> data;
-	std::vector<u8> tus_data;
-};
-
-struct tdata_tus_get_datastatus_generic
-{
-	vm::ptr<SceNpTusDataStatus> statusArray;
-	s32 arrayNum;
-};
-
-// TUS related
-struct tus_ctx
-{
-	tus_ctx(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase);
-
-	static const u32 id_base = 0x7001;
-	static const u32 id_step = 1;
-	static const u32 id_count = SCE_NP_TUS_MAX_CTX_NUM;
-	SAVESTATE_INIT_POS(50);
-
-	shared_mutex mutex;
-	u64 timeout = 60'000'000; // 60 seconds
-	SceNpCommunicationId communicationId{};
-	SceNpCommunicationPassphrase passphrase{};
-};
-s32 create_tus_context(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase);
-bool destroy_tus_context(s32 ctx_id);
-
-struct tus_transaction_ctx : public generic_async_transaction_context
-{
-	tus_transaction_ctx(const shared_ptr<tus_ctx>& tus);
-
-	static const u32 id_base  = 0x8001;
-	static const u32 id_step  = 1;
-	static const u32 id_count = SCE_NP_TUS_MAX_CTX_NUM;
-	SAVESTATE_INIT_POS(51);
-
-	std::variant<tdata_invalid, tdata_tus_get_variables_generic, tdata_tus_get_variable_generic, tdata_tus_set_data, tdata_tus_get_data, tdata_tus_get_datastatus_generic> tdata;
-};
-
-s32 create_tus_transaction_context(const shared_ptr<tus_ctx>& tus);
-bool destroy_tus_transaction_context(s32 ctx_id);
 
 // Score related
 struct score_ctx
 {
 	score_ctx(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase);
 
-	static const u32 id_base  = 0x2001;
+	static const u32 id_base  = 1;
 	static const u32 id_step  = 1;
-	static const u32 id_count = SCE_NP_SCORE_MAX_CTX_NUM;
-	SAVESTATE_INIT_POS(25);
+	static const u32 id_count = 32;
 
-	shared_mutex mutex;
-	u64 timeout = 60'000'000; // 60 seconds
 	SceNpCommunicationId communicationId{};
 	SceNpCommunicationPassphrase passphrase{};
-	s32 pcId = 0;
 };
 s32 create_score_context(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase);
 bool destroy_score_context(s32 ctx_id);
 
-struct score_transaction_ctx : public generic_async_transaction_context
+struct score_transaction_ctx
 {
-	score_transaction_ctx(const shared_ptr<score_ctx>& score);
+	score_transaction_ctx(s32 score_context_id);
 
-	static const u32 id_base  = 0x1001;
+	static const u32 id_base  = 1;
 	static const u32 id_step  = 1;
-	static const u32 id_count = SCE_NP_SCORE_MAX_CTX_NUM;
-	SAVESTATE_INIT_POS(26);
+	static const u32 id_count = 32;
 
-	std::variant<tdata_invalid, tdata_get_board_infos, tdata_record_score, tdata_record_score_data, tdata_get_score_data, tdata_get_score_generic> tdata;
-	s32 pcId = 0;
+	s32 score_context_id      = 0;
 };
-s32 create_score_transaction_context(const shared_ptr<score_ctx>& score);
+s32 create_score_transaction_context(s32 score_context_id);
 bool destroy_score_transaction_context(s32 ctx_id);
 
 // Match2 related
 struct match2_ctx
 {
-	match2_ctx(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase, s32 option);
+	match2_ctx(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase);
 
 	static const u32 id_base  = 1;
 	static const u32 id_step  = 1;
-	static const u32 id_count = 255; // TODO: constant here?
-	SAVESTATE_INIT_POS(27);
-
-	atomic_t<u32> started = 0;
-
-	shared_mutex mutex;
+	static const u32 id_count = 255;
 
 	SceNpCommunicationId communicationId{};
 	SceNpCommunicationPassphrase passphrase{};
-	bool include_onlinename = false, include_avatarurl = false;
 
 	vm::ptr<SceNpMatching2ContextCallback> context_callback{};
 	vm::ptr<void> context_callback_param{};
 
 	SceNpMatching2RequestOptParam default_match2_optparam{};
-
-	vm::ptr<SceNpMatching2SignalingCallback> signaling_cb{};
-	vm::ptr<void> signaling_cb_arg{};
 };
-u16 create_match2_context(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase, s32 option);
+u16 create_match2_context(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpCommunicationPassphrase> passphrase);
 bool check_match2_context(u16 ctx_id);
-shared_ptr<match2_ctx> get_match2_context(u16 ctx_id);
+std::shared_ptr<match2_ctx> get_match2_context(u16 ctx_id);
 bool destroy_match2_context(u16 ctx_id);
 
 struct lookup_title_ctx
 {
 	lookup_title_ctx(vm::cptr<SceNpCommunicationId> communicationId);
 
-	static const u32 id_base  = 0x3001;
+	static const u32 id_base  = 1;
 	static const u32 id_step  = 1;
-	static const u32 id_count = SCE_NP_LOOKUP_MAX_CTX_NUM;
-	SAVESTATE_INIT_POS(28);
+	static const u32 id_count = 32;
 
 	SceNpCommunicationId communicationId{};
 	SceNpCommunicationPassphrase passphrase{};
@@ -232,10 +73,9 @@ struct lookup_transaction_ctx
 {
 	lookup_transaction_ctx(s32 lt_ctx);
 
-	static const u32 id_base  = 0x4001;
+	static const u32 id_base  = 1;
 	static const u32 id_step  = 1;
-	static const u32 id_count = SCE_NP_LOOKUP_MAX_CTX_NUM;
-	SAVESTATE_INIT_POS(29);
+	static const u32 id_count = 32;
 
 	s32 lt_ctx = 0;
 };
@@ -246,10 +86,9 @@ struct commerce2_ctx
 {
 	commerce2_ctx(u32 version, vm::cptr<SceNpId> npid, vm::ptr<SceNpCommerce2Handler> handler, vm::ptr<void> arg);
 
-	static const u32 id_base  = 0x5001;
+	static const u32 id_base  = 1;
 	static const u32 id_step  = 1;
-	static const u32 id_count = SCE_NP_COMMERCE2_CTX_MAX;
-	SAVESTATE_INIT_POS(30);
+	static const u32 id_count = 32;
 
 	u32 version{};
 	SceNpId npid{};
@@ -257,59 +96,20 @@ struct commerce2_ctx
 	vm::ptr<void> context_callback_param{};
 };
 s32 create_commerce2_context(u32 version, vm::cptr<SceNpId> npid, vm::ptr<SceNpCommerce2Handler> handler, vm::ptr<void> arg);
-shared_ptr<commerce2_ctx> get_commerce2_context(u16 ctx_id);
-bool destroy_commerce2_context(u32 ctx_id);
+std::shared_ptr<commerce2_ctx> get_commerce2_context(u16 ctx_id);
+bool destroy_commerce2_context(s32 ctx_id);
 
 struct signaling_ctx
 {
 	signaling_ctx(vm::ptr<SceNpId> npid, vm::ptr<SceNpSignalingHandler> handler, vm::ptr<void> arg);
 
-	static const u32 id_base  = 0x6001;
+	static const u32 id_base  = 1;
 	static const u32 id_step  = 1;
-	static const u32 id_count = SCE_NP_SIGNALING_CTX_MAX;
-	SAVESTATE_INIT_POS(31);
-
-	shared_mutex mutex;
+	static const u32 id_count = 32;
 
 	SceNpId npid{};
 	vm::ptr<SceNpSignalingHandler> handler{};
 	vm::ptr<void> arg{};
-	vm::ptr<SceNpSignalingHandler> ext_handler{};
-	vm::ptr<void> ext_arg{};
 };
 s32 create_signaling_context(vm::ptr<SceNpId> npid, vm::ptr<SceNpSignalingHandler> handler, vm::ptr<void> arg);
-shared_ptr<signaling_ctx> get_signaling_context(u32 ctx_id);
-bool destroy_signaling_context(u32 ctx_id);
-
-struct matching_ctx
-{
-	matching_ctx(vm::ptr<SceNpId> npid, vm::ptr<SceNpMatchingHandler> handler, vm::ptr<void> arg);
-
-	void queue_callback(u32 req_id, s32 event, s32 error_code) const;
-	void queue_gui_callback(s32 event, s32 error_code) const;
-
-	static const u32 id_base = 0x9001;
-	static const u32 id_step = 1;
-	static const u32 id_count = 1;
-	SAVESTATE_INIT_POS(32);
-
-	SceNpId npid{};
-	vm::ptr<SceNpMatchingHandler> handler{};
-	vm::ptr<void> arg{};
-
-	atomic_t<u32> busy = 0;
-	u32 ctx_id = 0;
-	vm::ptr<SceNpMatchingGUIHandler> gui_handler{};
-	vm::ptr<void> gui_arg{};
-
-	// Used by QuickMatchGUI
-	u64 timeout = 0;
-	std::unique_ptr<named_thread<std::function<void(SceNpRoomId)>>> thread;
-	atomic_t<u32> wakey = 0;
-
-	// To keep track of which callback to use for sceNpMatchingGetRoomListWithoutGUI / sceNpMatchingGetRoomListGUI / sceNpMatchingGetRoomListLimitGUI
-	atomic_t<bool> get_room_limit_version = false;
-};
-s32 create_matching_context(vm::ptr<SceNpId> npid, vm::ptr<SceNpMatchingHandler> handler, vm::ptr<void> arg);
-shared_ptr<matching_ctx> get_matching_context(u32 ctx_id);
-bool destroy_matching_context(u32 ctx_id);
+bool destroy_signaling_context(s32 ctx_id);
diff --git a/rpcs3/Emu/NP/np_dnshook.cpp b/rpcs3/Emu/NP/np_dnshook.cpp
deleted file mode 100644
index a035947e1f..0000000000
--- a/rpcs3/Emu/NP/np_dnshook.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-#include "stdafx.h"
-#include "Emu/NP/np_dnshook.h"
-
-#include "Emu/system_config.h"
-#include "Utilities/StrUtil.h"
-#include "util/logs.hpp"
-
-#include <regex>
-
-#ifdef _WIN32
-#include <WS2tcpip.h>
-#else
-#ifdef __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#ifdef __clang__
-#pragma GCC diagnostic pop
-#endif
-#endif
-
-LOG_CHANNEL(dnshook_log, "DnsHook");
-
-namespace np
-{
-	dnshook::dnshook()
-	{
-		// Init switch map for dns
-		auto swaps = fmt::split(g_cfg.net.swap_list.to_string(), {"&&"});
-		for (usz i = 0; i < swaps.size(); i++)
-		{
-			auto host_and_ip = fmt::split(swaps[i], {"="});
-			if (host_and_ip.size() != 2)
-			{
-				dnshook_log.error("Pattern <%s> contains none or more than one '='", swaps[i]);
-				continue;
-			}
-
-			in_addr conv;
-			if (!inet_pton(AF_INET, host_and_ip[1].c_str(), &conv))
-			{
-				dnshook_log.error("IP(%s) provided for %s in the switch list is invalid!", host_and_ip[1], host_and_ip[0]);
-			}
-			else
-			{
-				m_redirs.push_back({std::move(host_and_ip[0]), conv.s_addr});
-			}
-		}
-	}
-
-	void dnshook::add_dns_spy(u32 sock)
-	{
-		std::lock_guard lock(mutex);
-		m_dns_spylist.emplace(std::make_pair(sock, std::queue<std::vector<u8>>()));
-	}
-
-	void dnshook::remove_dns_spy(u32 sock)
-	{
-		std::lock_guard lock(mutex);
-		m_dns_spylist.erase(sock);
-	}
-
-	bool dnshook::is_dns(u32 sock)
-	{
-		std::lock_guard lock(mutex);
-		return m_dns_spylist.contains(sock);
-	}
-
-	bool dnshook::is_dns_queue(u32 sock)
-	{
-		std::lock_guard lock(mutex);
-		return !::at32(m_dns_spylist, sock).empty();
-	}
-
-	std::vector<u8> dnshook::get_dns_packet(u32 sock)
-	{
-		std::lock_guard lock(mutex);
-		auto ret_vec = std::move(::at32(m_dns_spylist, sock).front());
-		::at32(m_dns_spylist, sock).pop();
-
-		return ret_vec;
-	}
-
-	std::optional<u32> dnshook::get_redir(const std::string& hostname)
-	{
-		for (const auto& [pattern, ip] : m_redirs)
-		{
-			const std::regex regex_pattern(fmt::replace_all(pattern, {{".", "\\."}, {"*", ".*"}}), std::regex_constants::icase);
-
-			if (std::regex_match(hostname, regex_pattern))
-			{
-				dnshook_log.trace("Matched '%s' to pattern '%s'", hostname, pattern);
-				return ip;
-			}
-		}
-
-		return std::nullopt;
-	}
-
-	s32 dnshook::analyze_dns_packet(s32 s, const u8* buf, u32 len)
-	{
-		std::lock_guard lock(mutex);
-
-		dnshook_log.trace("DNS REQUEST:\n%s", fmt::buf_to_hexstring(buf, len));
-
-		struct dns_header
-		{
-			u16 id; // identification number
-
-			u8 rd : 1;     // recursion desired
-			u8 tc : 1;     // truncated message
-			u8 aa : 1;     // authoritive answer
-			u8 opcode : 4; // purpose of message
-			u8 qr : 1;     // query/response flag
-
-			u8 rcode : 4; // response code
-			u8 cd : 1;    // checking disabled
-			u8 ad : 1;    // authenticated data
-			u8 z : 1;     // its z! reserved
-			u8 ra : 1;    // recursion available
-
-			be_t<u16> q_count;    // number of question entries
-			be_t<u16> ans_count;  // number of answer entries
-			be_t<u16> auth_count; // number of authority entries
-			be_t<u16> add_count;  // number of resource entries
-		};
-
-		if (len < sizeof(dns_header))
-			return -1;
-
-		const dns_header* dhead = reinterpret_cast<const dns_header*>(buf);
-		// We are only looking for queries not truncated(todo?), only handle one dns query at a time(todo?)
-		if (dhead->qr != 0 || dhead->tc != 0 || dhead->q_count != 1 || dhead->ans_count != 0 || dhead->auth_count != 0 || dhead->add_count != 0)
-			return -1;
-
-		// Get the actual address
-		u8 count = 0;
-		std::string host{};
-		for (u32 i = sizeof(dns_header); (i < len) && buf[i] != 0; i++)
-		{
-			if (count == 0)
-			{
-				count = buf[i];
-				if (i != sizeof(dns_header))
-				{
-					host += '.';
-				}
-			}
-			else
-			{
-				host += static_cast<char>(buf[i]);
-				count--;
-			}
-		}
-
-		dnshook_log.warning("DNS query for %s", host);
-
-		if (auto ip = get_redir(host))
-		{
-			// design fake packet
-			std::vector<u8> fake(len);
-			memcpy(fake.data(), buf, len);
-			dns_header* fake_header = reinterpret_cast<dns_header*>(fake.data());
-			fake_header->qr         = 1;
-			fake_header->ra         = 1;
-			fake_header->ans_count  = 1;
-			fake.insert(fake.end(), {0xC0, 0x0C});             // Ref to name in header
-			fake.insert(fake.end(), {0x00, 0x01});             // IPv4
-			fake.insert(fake.end(), {0x00, 0x01});             // Class?
-			fake.insert(fake.end(), {0x00, 0x00, 0x00, 0x3B}); // TTL
-			fake.insert(fake.end(), {0x00, 0x04});             // Size of data
-			u8* ptr_ip = reinterpret_cast<u8*>(&(*ip));
-			fake.insert(fake.end(), ptr_ip, ptr_ip + 4); // IP
-
-			dnshook_log.warning("Solving %s to %d.%d.%d.%d", host, ptr_ip[0], ptr_ip[1], ptr_ip[2], ptr_ip[3]);
-
-			m_dns_spylist[s].push(std::move(fake));
-			return len;
-		}
-		return -1;
-	}
-} // namespace np
diff --git a/rpcs3/Emu/NP/np_dnshook.h b/rpcs3/Emu/NP/np_dnshook.h
deleted file mode 100644
index 57a72e97e6..0000000000
--- a/rpcs3/Emu/NP/np_dnshook.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <unordered_map>
-#include <queue>
-#include <vector>
-#include <optional>
-
-#include "util/types.hpp"
-#include "Utilities/mutex.h"
-
-namespace np
-{
-	class dnshook
-	{
-	public:
-		dnshook();
-
-		void add_dns_spy(u32 sock);
-		void remove_dns_spy(u32 sock);
-
-		bool is_dns(u32 sock);
-		bool is_dns_queue(u32 sock);
-
-		std::vector<u8> get_dns_packet(u32 sock);
-		s32 analyze_dns_packet(s32 s, const u8* buf, u32 len);
-
-	private:
-		std::optional<u32> get_redir(const std::string& hostname);
-
-	private:
-		shared_mutex mutex;
-		std::unordered_map<s32, std::queue<std::vector<u8>>> m_dns_spylist;
-		std::vector<std::pair<std::string, u32>> m_redirs;
-	};
-} // namespace np
diff --git a/rpcs3/Emu/NP/np_event_data.h b/rpcs3/Emu/NP/np_event_data.h
deleted file mode 100644
index ba6d975888..0000000000
--- a/rpcs3/Emu/NP/np_event_data.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma once
-
-#include "Emu/Memory/vm_ptr.h"
-#include "util/asm.hpp"
-
-namespace np
-{
-	class event_data
-	{
-	public:
-		event_data(u32 vm_addr, u32 initial_size, u32 max_size)
-			: m_max_size(max_size), m_cur_size(utils::align(initial_size, 4))
-		{
-			m_data_ptr.set(vm_addr);
-		}
-
-		event_data()
-		{
-		}
-
-		u8* data()
-		{
-			return m_data_ptr.get_ptr();
-		}
-
-		const u8* data() const
-		{
-			return m_data_ptr.get_ptr();
-		}
-
-		u32 size() const
-		{
-			return m_cur_size;
-		}
-
-		u32 addr() const
-		{
-			return m_data_ptr.addr();
-		}
-
-		template <typename T>
-		void add_relocation(vm::bptr<T>& dest)
-		{
-			u8* dest_ptr = reinterpret_cast<u8*>(&dest);
-			ensure(dest_ptr >= m_data_ptr.get_ptr() && dest_ptr < (m_data_ptr.get_ptr() + m_cur_size), "event_data::allocate: dest is out of bounds!");
-
-			m_relocs.push_back(static_cast<u32>(dest_ptr - m_data_ptr.get_ptr()));
-		}
-
-		template <typename T>
-		T* allocate(u32 size, vm::bptr<T>& dest)
-		{
-			const u32 to_alloc = utils::align(size, 4);
-			ensure((m_cur_size + to_alloc) <= m_max_size, "event_data::allocate: size would overflow the allocated buffer!");
-
-			u8* dest_ptr = reinterpret_cast<u8*>(&dest);
-			ensure(dest_ptr >= m_data_ptr.get_ptr() && dest_ptr < (m_data_ptr.get_ptr() + m_cur_size), "event_data::allocate: dest is out of bounds!");
-
-			const u32 offset_alloc = m_cur_size;
-
-			// Set the vm::bptr to new allocated portion of memory
-			dest.set(m_data_ptr.addr() + offset_alloc);
-			// Save the relocation offset
-			m_relocs.push_back(static_cast<u32>(dest_ptr - m_data_ptr.get_ptr()));
-			// Update currently allocated space
-			m_cur_size += to_alloc;
-			// Return actual pointer to allocated
-			return reinterpret_cast<T*>(m_data_ptr.get_ptr() + offset_alloc);
-		}
-
-		template <typename T>
-		void allocate_ptr_array(u32 num_pointers, vm::bpptr<T>& dest)
-		{
-			const u32 to_alloc = num_pointers * sizeof(u32);
-			ensure((m_cur_size + to_alloc) <= m_max_size, "event_data::allocate: size would overflow the allocated buffer!");
-
-			u8* dest_ptr = reinterpret_cast<u8*>(&dest);
-			ensure(dest_ptr >= m_data_ptr.get_ptr() && dest_ptr < (m_data_ptr.get_ptr() + m_cur_size), "event_data::allocate_ptr_array: dest is out of bounds!");
-
-			const u32 offset_alloc = m_cur_size;
-
-			// Set the vm::bpptr to relative offset
-			dest.set(m_data_ptr.addr() + offset_alloc);
-			// Save the relocation offset
-			m_relocs.push_back(static_cast<u32>(dest_ptr - m_data_ptr.get_ptr()));
-			// Add all the pointers to the relocation
-			for (u32 i = 0; i < num_pointers; i++)
-			{
-				m_relocs.push_back(offset_alloc + (i * 4));
-			}
-			// Update currently allocated space
-			m_cur_size += to_alloc;
-		}
-
-		void apply_relocations(u32 new_addr)
-		{
-			u32 diff_offset = new_addr - m_data_ptr.addr();
-			for (const auto offset : m_relocs)
-			{
-				auto* ptr = reinterpret_cast<be_t<u32>*>(m_data_ptr.get_ptr() + offset);
-				*ptr += diff_offset;
-			}
-		}
-
-	private:
-		vm::bptr<u8> m_data_ptr{};
-		u32 m_max_size = 0, m_cur_size = 0;
-		std::vector<u32> m_relocs;
-	};
-} // namespace np
diff --git a/rpcs3/Emu/NP/np_gui_cache.cpp b/rpcs3/Emu/NP/np_gui_cache.cpp
deleted file mode 100644
index fee08356d5..0000000000
--- a/rpcs3/Emu/NP/np_gui_cache.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include "stdafx.h"
-#include "util/asm.hpp"
-#include "np_gui_cache.h"
-
-LOG_CHANNEL(np_gui_cache);
-
-namespace np
-{
-	void gui_cache_manager::add_room(const SceNpRoomId& room_id)
-	{
-		std::lock_guard lock(mutex);
-		const auto [room, inserted] = rooms.insert_or_assign(room_id, gui_room_cache{});
-
-		if (!inserted)
-			np_gui_cache.error("Cache mismatch: tried to insert room but it already existed");
-	}
-
-	void gui_cache_manager::del_room(const SceNpRoomId& room_id)
-	{
-		std::lock_guard lock(mutex);
-
-		if (rooms.erase(room_id) != 1)
-			np_gui_cache.error("Cache mismatch: tried to delete a room that wasn't in the cache");
-	}
-
-	void gui_cache_manager::add_member(const SceNpRoomId& room_id, const SceNpMatchingRoomMember* user_info, bool new_member)
-	{
-		std::lock_guard lock(mutex);
-
-		if (!rooms.contains(room_id))
-		{
-			np_gui_cache.error("Cache mismatch: tried to add a member to a non-existing room");
-			return;
-		}
-
-		auto& room = ::at32(rooms, room_id);
-		const auto [_, inserted] = room.members.insert_or_assign(user_info->user_info.userId, gui_room_member{.info = user_info->user_info, .owner = !!user_info->owner});
-
-		if (new_member)
-		{
-			if (!inserted)
-				np_gui_cache.error("Cache mismatch: tried to add a member but it was already in the room");
-		}
-		else
-		{
-			if (inserted)
-				np_gui_cache.error("Cache mismatch: tried to update a member but it wasn't already in the room");
-		}
-	}
-
-	void gui_cache_manager::del_member(const SceNpRoomId& room_id, const SceNpMatchingRoomMember* user_info)
-	{
-		std::lock_guard lock(mutex);
-
-		if (!rooms.contains(room_id))
-		{
-			np_gui_cache.error("Cache mismatch: tried to remove a member from a non-existing room");
-			return;
-		}
-
-		auto& room = ::at32(rooms, room_id);
-		if (room.members.erase(user_info->user_info.userId) != 1)
-			np_gui_cache.error("Cache mismatch: tried to remove a member but it wasn't in the room");
-	}
-
-	error_code gui_cache_manager::get_room_member_list(const SceNpRoomId& room_id, u32 buf_len, vm::ptr<void> data)
-	{
-		std::lock_guard lock(mutex);
-
-		if (!rooms.contains(room_id))
-			return SCE_NP_MATCHING_ERROR_ROOM_NOT_FOUND;
-
-		const auto& room = ::at32(rooms, room_id);
-
-		const u32 room_size = ::narrow<u32>(utils::align(sizeof(SceNpMatchingRoomStatus), 8) + (utils::align(sizeof(SceNpMatchingRoomMember), 8) * room.members.size()));
-
-		if (!data)
-			return not_an_error(room_size);
-
-		if (buf_len < room_size)
-			return SCE_NP_MATCHING_ERROR_INSUFFICIENT_BUFFER;
-
-		std::memset(data.get_ptr(), 0, buf_len);
-
-		vm::ptr<SceNpMatchingRoomStatus> room_status = vm::cast(data.addr());
-		std::memcpy(&room_status->id, &room_id, sizeof(SceNpRoomId));
-		room_status->num = ::narrow<s32>(room.members.size());
-
-		if (!room.members.empty())
-		{
-			vm::ptr<SceNpMatchingRoomMember> cur_member_ptr{};
-
-			for (const auto& [_, member] : room.members)
-			{
-				if (!cur_member_ptr)
-				{
-					room_status->members = vm::cast(data.addr() + utils::align(sizeof(SceNpMatchingRoomStatus), 8));
-					cur_member_ptr = room_status->members;
-				}
-				else
-				{
-					cur_member_ptr->next = vm::cast(cur_member_ptr.addr() + utils::align(sizeof(SceNpMatchingRoomMember), 8));
-					cur_member_ptr = cur_member_ptr->next;
-				}
-
-				cur_member_ptr->owner = member.owner ? 1 : 0;
-				std::memcpy(&cur_member_ptr->user_info, &member.info, sizeof(SceNpUserInfo));
-			}
-		}
-
-		return CELL_OK;
-	}
-} // namespace np
diff --git a/rpcs3/Emu/NP/np_gui_cache.h b/rpcs3/Emu/NP/np_gui_cache.h
deleted file mode 100644
index d742cc5749..0000000000
--- a/rpcs3/Emu/NP/np_gui_cache.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include <map>
-#include "Utilities/mutex.h"
-#include "Emu/Cell/Modules/sceNp.h"
-
-template <>
-struct std::less<SceNpRoomId>
-{
-	bool operator()(const SceNpRoomId& a, const SceNpRoomId& b) const
-	{
-		return (std::memcmp(a.opt, b.opt, sizeof(a.opt)) < 0);
-	}
-};
-
-template <>
-struct std::less<SceNpId>
-{
-	bool operator()(const SceNpId& a, const SceNpId& b) const
-	{
-		return (std::memcmp(a.handle.data, b.handle.data, sizeof(a.handle.data)) < 0);
-	}
-};
-
-namespace np
-{
-	struct gui_room_member
-	{
-		SceNpUserInfo info;
-		bool owner;
-	};
-
-	struct gui_room_cache
-	{
-		std::map<SceNpId, gui_room_member> members;
-	};
-
-	class gui_cache_manager
-	{
-	public:
-		gui_cache_manager() = default;
-
-		void add_room(const SceNpRoomId& room_id);
-		void del_room(const SceNpRoomId& room_id);
-		void add_member(const SceNpRoomId& room_id, const SceNpMatchingRoomMember* user_info, bool new_member);
-		void del_member(const SceNpRoomId& room_id, const SceNpMatchingRoomMember* user_info);
-
-		error_code get_room_member_list(const SceNpRoomId& room_id, u32 buf_len, vm::ptr<void> data);
-
-	private:
-		shared_mutex mutex;
-		std::map<SceNpRoomId, gui_room_cache> rooms;
-	};
-} // namespace np
diff --git a/rpcs3/Emu/NP/np_handler.cpp b/rpcs3/Emu/NP/np_handler.cpp
index b64fad1767..6929baae58 100644
--- a/rpcs3/Emu/NP/np_handler.cpp
+++ b/rpcs3/Emu/NP/np_handler.cpp
@@ -1,41 +1,29 @@
 #include "stdafx.h"
 #include "Emu/system_config.h"
-#include "Emu/NP/np_handler.h"
-#include "Emu/Cell/PPUCallback.h"
+#include "np_handler.h"
+#include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/Modules/sceNp.h"
 #include "Emu/Cell/Modules/sceNp2.h"
 #include "Emu/Cell/Modules/cellNetCtl.h"
-#include "Emu/Cell/timers.hpp"
 #include "Utilities/StrUtil.h"
+#include "Emu/Cell/Modules/cellSysutil.h"
 #include "Emu/IdManager.h"
+#include "np_structs_extra.h"
 #include "Emu/System.h"
 #include "Emu/NP/rpcn_config.h"
 #include "Emu/NP/np_contexts.h"
-#include "Emu/NP/np_helpers.h"
-#include "Emu/NP/signaling_handler.h"
-#include "Emu/RSX/Overlays/overlay_message.h"
-#include "Emu/Cell/lv2/sys_net/network_context.h"
-#include "Emu/Cell/lv2/sys_net/sys_net_helpers.h"
 
 #ifdef _WIN32
 #include <winsock2.h>
 #include <WS2tcpip.h>
 #include <iphlpapi.h>
 #else
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#endif
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <net/if.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <unistd.h>
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
 #endif
 
 #if defined(__FreeBSD__) || defined(__APPLE__)
@@ -43,9 +31,7 @@
 #include <net/if_dl.h>
 #endif
 
-#include "util/yaml.hpp"
-
-#include <span>
+#include "util/asm.hpp"
 
 LOG_CHANNEL(sys_net);
 LOG_CHANNEL(sceNp2);
@@ -53,1653 +39,1349 @@ LOG_CHANNEL(sceNp);
 
 LOG_CHANNEL(rpcn_log, "rpcn");
 LOG_CHANNEL(nph_log, "NPHandler");
-LOG_CHANNEL(ticket_log, "Ticket");
 
-namespace np
+np_handler::np_handler()
 {
-	std::string get_players_history_path()
+	g_fxo->need<named_thread<signaling_handler>>();
+
+	g_cfg_rpcn.load();
+
+	is_connected  = (g_cfg.net.net_active == np_internet_status::enabled);
+	is_psn_active = (g_cfg.net.psn_status >= np_psn_status::fake);
+
+	if (get_net_status() == CELL_NET_CTL_STATE_IPObtained)
 	{
-		return fs::get_config_dir(true) + "players_history.yml";
+		if (!discover_ip_address())
+		{
+			nph_log.error("Failed to discover local IP!");
+			is_connected = false;
+			is_psn_active = false;
+		}
+
+		if (!discover_ether_address())
+		{
+			nph_log.error("Failed to discover ethernet address!");
+			is_connected = false;
+			is_psn_active = false;
+		}
+
+		// Convert dns address
+		// TODO: recover actual user dns through OS specific API
+		in_addr conv{};
+		if (!inet_pton(AF_INET, g_cfg.net.dns.to_string().c_str(), &conv))
+		{
+			// Do not set to disconnected on invalid IP just error and continue using default(google's 8.8.8.8)
+			nph_log.error("Provided IP(%s) address for DNS is invalid!", g_cfg.net.dns.to_string());
+		}
+		else
+		{
+			dns_ip = conv.s_addr;
+		}
+
+		// Init switch map for dns
+		auto swaps = fmt::split(g_cfg.net.swap_list.to_string(), {"&&"});
+		for (usz i = 0; i < swaps.size(); i++)
+		{
+			auto host_and_ip = fmt::split(swaps[i], {"="});
+			if (host_and_ip.size() != 2)
+			{
+				nph_log.error("Pattern <%s> contains more than one '='", swaps[i]);
+				continue;
+			}
+
+			in_addr conv;
+			if (!inet_pton(AF_INET, host_and_ip[1].c_str(), &conv))
+			{
+				nph_log.error("IP(%s) provided for %s in the switch list is invalid!", host_and_ip[1], host_and_ip[0]);
+			}
+			else
+			{
+				switch_map[host_and_ip[0]] = conv.s_addr;
+			}
+		}
+	}
+}
+
+bool np_handler::discover_ip_address()
+{
+	hostname.clear();
+	hostname.resize(1024);
+
+	if (gethostname(hostname.data(), hostname.size()) == -1)
+	{
+		nph_log.error("gethostname failed in IP discovery!");
+		return false;
 	}
 
-	std::map<std::string, player_history> load_players_history()
+	nph_log.notice("Hostname was determined to be %s", hostname.c_str());
+
+	hostent *host = gethostbyname(hostname.data());
+	if (!host)
 	{
-		const auto parsing_error = [](std::string_view error) -> std::map<std::string, player_history>
+		nph_log.error("gethostbyname failed in IP discovery!");
+		return false;
+	}
+
+	if (host->h_addrtype != AF_INET)
+	{
+		nph_log.error("Could only find IPv6 addresses for current host!");
+		return false;
+	}
+
+	// First address is used for now, (TODO combobox with possible local addresses to use?)
+	local_ip_addr = *reinterpret_cast<u32 *>(host->h_addr_list[0]);
+
+	// Set public address to local discovered address for now, may be updated later;
+	public_ip_addr = local_ip_addr;
+
+	nph_log.notice("IP was determined to be %s", ip_to_string(local_ip_addr));
+
+	return true;
+}
+
+bool np_handler::discover_ether_address()
+{
+#if defined(__FreeBSD__) || defined(__APPLE__)
+	ifaddrs* ifap;
+
+	if (getifaddrs(&ifap) == 0)
+	{
+		ifaddrs* p;
+		for (p = ifap; p; p = p->ifa_next)
 		{
-			nph_log.error("Error parsing %s: %s", get_players_history_path(), error);
-			return {};
-		};
-
-		std::map<std::string, player_history> history;
-
-		if (fs::file history_file{get_players_history_path(), fs::read + fs::create})
-		{
-			auto [yml_players_history, error] = yaml_load(history_file.to_string());
-
-			if (!error.empty())
-				return parsing_error(error);
-
-			for (const auto& player : yml_players_history)
+			if (p->ifa_addr->sa_family == AF_LINK)
 			{
-				std::string username = player.first.Scalar();
-				const auto& seq = player.second;
+				sockaddr_dl* sdp = reinterpret_cast<sockaddr_dl*>(p->ifa_addr);
+				memcpy(ether_address.data(), sdp->sdl_data + sdp->sdl_nlen, 6);
+				freeifaddrs(ifap);
+				nph_log.notice("Determined Ethernet address to be %s", ether_to_string(ether_address));
+				return true;
+			}
+		}
+		freeifaddrs(ifap);
+	}
+#elif defined(_WIN32)
+	std::vector<u8> adapter_infos(sizeof(IP_ADAPTER_INFO));
+	ULONG size_infos = sizeof(IP_ADAPTER_INFO);
 
-				if (!seq.IsSequence() || seq.size() != 3)
-					return parsing_error("Player history is not a proper sequence!");
+    if (GetAdaptersInfo(reinterpret_cast<PIP_ADAPTER_INFO>(adapter_infos.data()), &size_infos) == ERROR_BUFFER_OVERFLOW)
+		adapter_infos.resize(size_infos);
 
-				const u64 timestamp = get_yaml_node_value<u64>(seq[0], error);
-				if (!error.empty())
-					return parsing_error(error);
+    if (GetAdaptersInfo(reinterpret_cast<PIP_ADAPTER_INFO>(adapter_infos.data()), &size_infos) == NO_ERROR && size_infos)
+	{
+		PIP_ADAPTER_INFO info = reinterpret_cast<PIP_ADAPTER_INFO>(adapter_infos.data());
+		memcpy(ether_address.data(), info[0].Address, 6);
+		nph_log.notice("Determined Ethernet address to be %s", ether_to_string(ether_address));
+		return true;
+	}
+#else
+	ifreq ifr;
+	ifconf ifc;
+	char buf[1024];
+	int success = 0;
 
-				std::string description = seq[1].Scalar();
+	int sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
+	if (sock == -1)
+		return false;
 
-				if (!seq[2].IsSequence())
-					return parsing_error("Expected communication ids sequence");
+	ifc.ifc_len = sizeof(buf);
+	ifc.ifc_buf = buf;
+	if (ioctl(sock, SIOCGIFCONF, &ifc) == -1)
+		return false;
 
-				std::set<std::string> com_ids;
+	ifreq* it              = ifc.ifc_req;
+	const ifreq* const end = it + (ifc.ifc_len / sizeof(ifreq));
 
-				for (usz i = 0; i < seq[2].size(); i++)
+	for (; it != end; ++it)
+	{
+		strcpy(ifr.ifr_name, it->ifr_name);
+		if (ioctl(sock, SIOCGIFFLAGS, &ifr) == 0)
+		{
+			if (!(ifr.ifr_flags & IFF_LOOPBACK))
+			{
+				if (ioctl(sock, SIOCGIFHWADDR, &ifr) == 0)
 				{
-					com_ids.insert(seq[2][i].Scalar());
+					success = 1;
+					break;
 				}
-
-				history.insert(std::make_pair(std::move(username), player_history{.timestamp = timestamp, .communication_ids = std::move(com_ids), .description = std::move(description)}));
 			}
 		}
-
-		return history;
 	}
 
-	ticket::ticket(std::vector<u8>&& raw_data)
-		: raw_data(raw_data)
+	if (success)
 	{
-		parse();
-	}
-
-	std::size_t ticket::size() const
-	{
-		return raw_data.size();
-	}
-
-	const u8* ticket::data() const
-	{
-		return raw_data.data();
-	}
-
-	bool ticket::empty() const
-	{
-		return raw_data.empty();
-	}
-
-	bool ticket::get_value(s32 param_id, vm::ptr<SceNpTicketParam> param) const
-	{
-		if (!parse_success)
-		{
-			return false;
-		}
-
-		switch (param_id)
-		{
-		case SCE_NP_TICKET_PARAM_SERIAL_ID:
-		{
-			const auto& node = nodes[0].data.data_nodes[0];
-			if (node.len != SCE_NP_TICKET_SERIAL_ID_SIZE)
-			{
-				return false;
-			}
-
-			memcpy(param->data, node.data.data_vec.data(), SCE_NP_TICKET_SERIAL_ID_SIZE);
-			break;
-		}
-		case SCE_NP_TICKET_PARAM_ISSUER_ID:
-		{
-			const auto& node = nodes[0].data.data_nodes[1];
-			param->ui32      = node.data.data_u32;
-			break;
-		}
-		case SCE_NP_TICKET_PARAM_ISSUED_DATE:
-		{
-			const auto& node = nodes[0].data.data_nodes[2];
-			param->ui64      = node.data.data_u64;
-			break;
-		}
-		case SCE_NP_TICKET_PARAM_EXPIRE_DATE:
-		{
-			const auto& node = nodes[0].data.data_nodes[3];
-			param->ui64      = node.data.data_u64;
-			break;
-		}
-		case SCE_NP_TICKET_PARAM_SUBJECT_ACCOUNT_ID:
-		{
-			const auto& node = nodes[0].data.data_nodes[4];
-			param->ui64      = node.data.data_u64;
-			break;
-		}
-		case SCE_NP_TICKET_PARAM_SUBJECT_ONLINE_ID:
-		{
-			const auto& node = nodes[0].data.data_nodes[5];
-			if (node.len != 0x20)
-			{
-				return false;
-			}
-
-			memcpy(param->data, node.data.data_vec.data(), 0x20);
-			break;
-		}
-		case SCE_NP_TICKET_PARAM_SUBJECT_REGION:
-		{
-			const auto& node = nodes[0].data.data_nodes[6];
-			if (node.len != SCE_NP_SUBJECT_REGION_SIZE)
-			{
-				return false;
-			}
-
-			memcpy(param->data, node.data.data_vec.data(), SCE_NP_SUBJECT_REGION_SIZE);
-			break;
-		}
-		case SCE_NP_TICKET_PARAM_SUBJECT_DOMAIN:
-		{
-			const auto& node = nodes[0].data.data_nodes[7];
-			if (node.len != SCE_NP_SUBJECT_DOMAIN_SIZE)
-			{
-				return false;
-			}
-
-			memcpy(param->data, node.data.data_vec.data(), SCE_NP_SUBJECT_DOMAIN_SIZE);
-			break;
-		}
-		case SCE_NP_TICKET_PARAM_SERVICE_ID:
-		{
-			const auto& node = nodes[0].data.data_nodes[8];
-			if (node.len != SCE_NP_SERVICE_ID_SIZE)
-			{
-				return false;
-			}
-
-			memcpy(param->data, node.data.data_vec.data(), SCE_NP_SERVICE_ID_SIZE);
-			break;
-		}
-		case SCE_NP_TICKET_PARAM_SUBJECT_STATUS:
-		{
-			const auto& node = nodes[0].data.data_nodes[9];
-			param->ui32      = node.data.data_u32;
-			break;
-		}
-		case SCE_NP_TICKET_PARAM_STATUS_DURATION:
-		case SCE_NP_TICKET_PARAM_SUBJECT_DOB:
-		{
-			param->ui64 = 0;
-			break;
-		}
-		default:
-			sceNp.fatal("Invalid ticket param id requested!");
-			return false;
-		}
+		memcpy(ether_address.data(), ifr.ifr_hwaddr.sa_data, 6);
+		nph_log.notice("Determined Ethernet address to be %s", ether_to_string(ether_address));
 
 		return true;
 	}
+#endif
 
-	std::optional<ticket_data> ticket::parse_node(std::size_t index) const
+	return false;
+}
+
+const std::array<u8, 6>& np_handler::get_ether_addr() const
+{
+	return ether_address;
+}
+
+const std::string& np_handler::get_hostname() const
+{
+	return hostname;
+}
+
+u32 np_handler::get_local_ip_addr() const
+{
+	return local_ip_addr;
+}
+
+u32 np_handler::get_public_ip_addr() const
+{
+	return public_ip_addr;
+}
+
+u32 np_handler::get_dns_ip() const
+{
+	return dns_ip;
+}
+
+s32 np_handler::get_net_status() const
+{
+	return is_connected ? CELL_NET_CTL_STATE_IPObtained : CELL_NET_CTL_STATE_Disconnected;
+}
+
+s32 np_handler::get_psn_status() const
+{
+	return is_psn_active ? SCE_NP_MANAGER_STATUS_ONLINE : SCE_NP_MANAGER_STATUS_OFFLINE;
+}
+
+const SceNpId& np_handler::get_npid() const
+{
+	return npid;
+}
+
+const SceNpOnlineId& np_handler::get_online_id() const
+{
+	return npid.handle;
+}
+
+const SceNpOnlineName& np_handler::get_online_name() const
+{
+	return online_name;
+}
+
+const SceNpAvatarUrl& np_handler::get_avatar_url() const
+{
+	return avatar_url;
+}
+
+std::string np_handler::ip_to_string(u32 ip_addr)
+{
+	char ip_str[16];
+
+	inet_ntop(AF_INET, &ip_addr, ip_str, sizeof(ip_str));
+	return std::string(ip_str);
+}
+
+std::string np_handler::ether_to_string(std::array<u8, 6>& ether)
+{
+	return fmt::format("%02X:%02X:%02X:%02X:%02X:%02X", ether[0], ether[1], ether[2], ether[3], ether[4], ether[5]);
+}
+
+void np_handler::string_to_npid(const std::string& str, SceNpId* npid)
+{
+	memset(npid, 0, sizeof(SceNpId));
+	strcpy_trunc(npid->handle.data, str);
+	// npid->reserved[0] = 1;
+}
+
+void np_handler::string_to_online_name(const std::string& str, SceNpOnlineName* online_name)
+{
+	strcpy_trunc(online_name->data, str);
+}
+
+void np_handler::string_to_avatar_url(const std::string& str, SceNpAvatarUrl* avatar_url)
+{
+	strcpy_trunc(avatar_url->data, str);
+}
+
+void np_handler::init_NP(u32 poolsize, vm::ptr<void> poolptr)
+{
+	// Init memory pool
+	mpool       = poolptr;
+	mpool_size  = poolsize;
+	mpool_avail = poolsize;
+	mpool_allocs.clear();
+
+	memset(&npid, 0, sizeof(npid));
+	memset(&online_name, 0, sizeof(online_name));
+	memset(&avatar_url, 0, sizeof(avatar_url));
+
+	if (g_cfg.net.psn_status >= np_psn_status::fake)
 	{
-		if ((index + MIN_TICKET_DATA_SIZE) > size())
-		{
-			ticket_log.error("node didn't meet minimum size requirements");
-			return std::nullopt;
-		}
+		std::string s_npid = g_cfg_rpcn.get_npid();
+		ensure(!s_npid.empty()); // It should have been generated before this
 
-		ticket_data tdata{};
-		const auto* ptr = data() + index;
-		tdata.id = read_from_ptr<be_t<u16>>(ptr);
-		tdata.len = read_from_ptr<be_t<u16>>(ptr + 2);
-		const auto* data_ptr = data() + index + 4;
-
-		auto check_size = [&](std::size_t expected) -> bool
-		{
-			if ((index + MIN_TICKET_DATA_SIZE + expected) > size())
-			{
-				return false;
-			}
-			return true;
-		};
-
-		switch (tdata.id)
-		{
-		case 0:
-			if (tdata.len != 0)
-			{
-				return std::nullopt;
-			}
-			break;
-		case 1:
-			if (tdata.len != 4 || !check_size(4))
-			{
-				return std::nullopt;
-			}
-			tdata.data.data_u32 = read_from_ptr<be_t<u32>>(data_ptr);
-			break;
-		case 2:
-		case 7:
-			if (tdata.len != 8 || !check_size(8))
-			{
-				return std::nullopt;
-			}
-			tdata.data.data_u64 = read_from_ptr<be_t<u64>>(data_ptr);
-			break;
-		case 4:
-		case 8:
-			if (!check_size(tdata.len))
-			{
-				return std::nullopt;
-			}
-			tdata.data.data_vec = std::vector<u8>(tdata.len);
-			memcpy(tdata.data.data_vec.data(), data_ptr, tdata.len);
-			break;
-		default:
-			if ((tdata.id & 0x3000) == 0x3000)
-			{
-				if (!check_size(tdata.len))
-				{
-					return std::nullopt;
-				}
-
-				std::size_t sub_index = 0;
-				tdata.data.data_nodes = {};
-				while (sub_index < tdata.len)
-				{
-					auto sub_node = parse_node(sub_index + index + 4);
-					if (!sub_node)
-					{
-						ticket_log.error("Failed to parse subnode at %d", sub_index + index + 4);
-						return std::nullopt;
-					}
-					sub_index += sub_node->len + MIN_TICKET_DATA_SIZE;
-					tdata.data.data_nodes.push_back(std::move(*sub_node));
-				}
-				break;
-			}
-			return std::nullopt;
-		}
-
-		return tdata;
+		np_handler::string_to_npid(s_npid, &npid);
+		auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
+		sigh.set_self_sig_info(npid);
 	}
 
-	void ticket::parse()
+	switch (g_cfg.net.psn_status)
 	{
-		nodes.clear();
-		parse_success = false;
+	case np_psn_status::disabled:
+		break;
+	case np_psn_status::fake:
+	{
+		np_handler::string_to_online_name("RPCS3's user", &online_name);
+		np_handler::string_to_avatar_url("https://rpcs3.net/cdn/netplay/DefaultAvatar.png", &avatar_url);
+		break;
+	}
+	case np_psn_status::rpcn:
+	{
+		if (!is_psn_active)
+			break;
 
-		if (size() < (sizeof(u32) * 2))
+		// Connect RPCN client
+		if (!rpcn.connect(g_cfg_rpcn.get_host()))
 		{
+			rpcn_log.error("Connection to RPCN Failed!");
+			is_psn_active = false;
 			return;
 		}
 
-		version = read_from_ptr<be_t<u32>>(data());
-		if (version != 0x21010000)
+		if (!rpcn.login(g_cfg_rpcn.get_npid(), g_cfg_rpcn.get_password(), g_cfg_rpcn.get_token()))
 		{
-			ticket_log.error("Invalid version: 0x%08x", version);
+			rpcn_log.error("RPCN login attempt failed!");
+			is_psn_active = false;
 			return;
 		}
 
-		u32 given_size = read_from_ptr<be_t<u32>>(data() + 4);
-		if ((given_size + 8) != size())
+		np_handler::string_to_online_name(rpcn.get_online_name(), &online_name);
+		np_handler::string_to_avatar_url(rpcn.get_avatar_url(), &avatar_url);
+		public_ip_addr = rpcn.get_addr_sig();
+
+		break;
+	}
+	default:
+		break;
+	}
+}
+
+void np_handler::terminate_NP()
+{
+	// Reset memory pool
+	mpool.set(0);
+	mpool_size  = 0;
+	mpool_avail = 0;
+	mpool_allocs.clear();
+
+	if (g_cfg.net.psn_status == np_psn_status::rpcn)
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		rpcn.disconnect();
+	}
+}
+
+vm::addr_t np_handler::allocate(u32 size)
+{
+	if (!size)
+		return vm::cast(static_cast<u64>(0));
+
+	// Align allocs
+	const u32 alloc_size = utils::align(size, 4);
+	if (alloc_size > mpool_avail)
+	{
+		sceNp.error("Not enough memory available in NP pool!");
+		return vm::cast<u32>(0);
+	}
+
+	u32 last_free    = 0;
+	bool found_space = false;
+
+	for (auto& a : mpool_allocs)
+	{
+		if ((a.first - last_free) >= alloc_size)
 		{
-			ticket_log.error("Size mismatch (gs: %d vs s: %d)", given_size, size());
-			return;
+			found_space = true;
+			break;
 		}
 
-		std::size_t index = 8;
-		while (index < size())
+		last_free = a.first + a.second;
+	}
+
+	if (!found_space)
+	{
+		if ((mpool_size - last_free) < alloc_size)
 		{
-			auto node = parse_node(index);
-			if (!node)
+			sceNp.error("Not enough memory available in NP pool(continuous block)!");
+			return vm::cast<u32>(0);
+		}
+	}
+
+	mpool_allocs.emplace(last_free, alloc_size);
+	mpool_avail -= alloc_size;
+
+	memset((static_cast<u8*>(mpool.get_ptr())) + last_free, 0, alloc_size);
+
+	sceNp.trace("Allocation off:%d size:%d psize:%d, pavail:%d", last_free, alloc_size, mpool_size, mpool_avail);
+
+	return vm::cast(mpool.addr() + last_free);
+}
+
+std::vector<SceNpMatching2ServerId> np_handler::get_match2_server_list(SceNpMatching2ContextId ctx_id)
+{
+	std::vector<SceNpMatching2ServerId> server_list{};
+
+	if (g_cfg.net.psn_status != np_psn_status::rpcn)
+	{
+		return server_list;
+	}
+
+	if (!rpcn.get_server_list(get_req_id(0), get_match2_context(ctx_id)->communicationId, server_list))
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		is_psn_active = false;
+	}
+
+	return server_list;
+}
+
+u32 np_handler::get_server_status(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 server_id)
+{
+	// TODO: actually implement interaction with server for this?
+	u32 req_id    = generate_callback_info(ctx_id, optParam);
+	u32 event_key = get_event_key();
+
+	SceNpMatching2GetServerInfoResponse* serv_info = reinterpret_cast<SceNpMatching2GetServerInfoResponse*>(allocate_req_result(event_key, sizeof(SceNpMatching2GetServerInfoResponse)));
+	serv_info->server.serverId                     = server_id;
+	serv_info->server.status                       = SCE_NP_MATCHING2_SERVER_STATUS_AVAILABLE;
+
+	const auto cb_info = std::move(pending_requests.at(req_id));
+	pending_requests.erase(req_id);
+
+	sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+	{
+		cb_info.cb(cb_ppu, cb_info.ctx_id, req_id, SCE_NP_MATCHING2_REQUEST_EVENT_GetServerInfo, event_key, 0, sizeof(SceNpMatching2GetServerInfoResponse), cb_info.cb_arg);
+		return 0;
+	});
+
+	return req_id;
+}
+
+u32 np_handler::create_server_context(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 /*server_id*/)
+{
+	u32 req_id    = generate_callback_info(ctx_id, optParam);
+	u32 event_key = get_event_key();
+
+	const auto cb_info = std::move(pending_requests.at(req_id));
+	pending_requests.erase(req_id);
+
+	sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+	{
+		cb_info.cb(cb_ppu, cb_info.ctx_id, req_id, SCE_NP_MATCHING2_REQUEST_EVENT_CreateServerContext, event_key, 0, 0, cb_info.cb_arg);
+		return 0;
+	});
+
+	return req_id;
+}
+
+u32 np_handler::get_world_list(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 server_id)
+{
+	u32 req_id = generate_callback_info(ctx_id, optParam);
+
+	if (!rpcn.get_world_list(req_id, get_match2_context(ctx_id)->communicationId, server_id))
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		is_psn_active = false;
+	}
+
+	return req_id;
+}
+
+u32 np_handler::create_join_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2CreateJoinRoomRequest* req)
+{
+	u32 req_id = generate_callback_info(ctx_id, optParam);
+
+	if (!rpcn.createjoin_room(req_id, get_match2_context(ctx_id)->communicationId, req))
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		is_psn_active = false;
+	}
+
+	return req_id;
+}
+
+u32 np_handler::join_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2JoinRoomRequest* req)
+{
+	u32 req_id = generate_callback_info(ctx_id, optParam);
+
+	if (!rpcn.join_room(req_id, get_match2_context(ctx_id)->communicationId, req))
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		is_psn_active = false;
+	}
+
+	return req_id;
+}
+
+u32 np_handler::leave_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2LeaveRoomRequest* req)
+{
+	u32 req_id = generate_callback_info(ctx_id, optParam);
+
+	if (!rpcn.leave_room(req_id, get_match2_context(ctx_id)->communicationId, req))
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		is_psn_active = false;
+	}
+
+	return req_id;
+}
+
+u32 np_handler::search_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SearchRoomRequest* req)
+{
+	u32 req_id = generate_callback_info(ctx_id, optParam);
+
+	if (!rpcn.search_room(req_id, get_match2_context(ctx_id)->communicationId, req))
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		is_psn_active = false;
+	}
+
+	return req_id;
+}
+
+u32 np_handler::set_roomdata_external(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SetRoomDataExternalRequest* req)
+{
+	u32 req_id = generate_callback_info(ctx_id, optParam);
+
+	extra_nps::print_set_roomdata_ext_req(req);
+
+	if (!rpcn.set_roomdata_external(req_id, get_match2_context(ctx_id)->communicationId, req))
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		is_psn_active = false;
+	}
+
+	return req_id;
+}
+
+u32 np_handler::get_roomdata_internal(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2GetRoomDataInternalRequest* req)
+{
+	u32 req_id = generate_callback_info(ctx_id, optParam);
+
+	if (!rpcn.get_roomdata_internal(req_id, get_match2_context(ctx_id)->communicationId, req))
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		is_psn_active = false;
+	}
+
+	return req_id;
+}
+
+u32 np_handler::set_roomdata_internal(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SetRoomDataInternalRequest* req)
+{
+	u32 req_id = generate_callback_info(ctx_id, optParam);
+
+	extra_nps::print_set_roomdata_int_req(req);
+
+	if (!rpcn.set_roomdata_internal(req_id, get_match2_context(ctx_id)->communicationId, req))
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		is_psn_active = false;
+	}
+
+	return req_id;
+}
+
+u32 np_handler::get_ping_info(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SignalingGetPingInfoRequest* req)
+{
+	u32 req_id = generate_callback_info(ctx_id, optParam);
+
+	if (!rpcn.ping_room_owner(req_id, get_match2_context(ctx_id)->communicationId, req->roomId))
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		is_psn_active = false;
+	}
+
+	return req_id;
+}
+
+u32 np_handler::send_room_message(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SendRoomMessageRequest* req)
+{
+	u32 req_id = generate_callback_info(ctx_id, optParam);
+
+	if (!rpcn.send_room_message(req_id, get_match2_context(ctx_id)->communicationId, req))
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		is_psn_active = false;
+	}
+
+	return req_id;
+}
+
+void np_handler::req_sign_infos(const std::string& npid, u32 conn_id)
+{
+	u32 req_id = get_req_id(0x3333);
+	pending_sign_infos_requests[req_id] = conn_id;
+
+	if (!rpcn.req_sign_infos(req_id, npid))
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		is_psn_active = false;
+	}
+
+	return;
+}
+
+void np_handler::req_ticket(u32 /*version*/, const SceNpId* /*npid*/, const char* service_id, const u8* /*cookie*/, u32 /*cookie_size*/, const char* /*entitlement_id*/, u32 /*consumed_count*/)
+{
+	u32 req_id = get_req_id(0x3333);
+
+	std::string service_id_str(service_id);
+
+	if (!rpcn.req_ticket(req_id, service_id_str))
+	{
+		rpcn_log.error("Disconnecting from RPCN!");
+		is_psn_active = false;
+	}
+
+	return;
+}
+
+
+u32 np_handler::get_match2_event(SceNpMatching2EventKey event_key, u8* dest, u32 size)
+{
+	std::lock_guard lock(mutex_req_results);
+
+	if (!match2_req_results.count(event_key))
+		return 0;
+
+	u32 size_copied = std::min(size, static_cast<u32>(match2_req_results.at(event_key).size()));
+	memcpy(dest, match2_req_results.at(event_key).data(), size_copied);
+
+	return size_copied;
+}
+
+void np_handler::operator()()
+{
+	if (g_cfg.net.psn_status != np_psn_status::rpcn)
+		return;
+
+	while (thread_ctrl::state() != thread_state::aborting && !Emu.IsStopped())
+	{
+		if (!rpcn.manage_connection())
+		{
+			thread_ctrl::wait_for(200'000);
+			continue;
+		}
+
+		auto replies = rpcn.get_replies();
+		for (auto& reply : replies)
+		{
+			const u16 command     = reply.second.first;
+			const u32 req_id      = reply.first;
+			std::vector<u8>& data = reply.second.second;
+
+			switch (command)
 			{
-				ticket_log.error("Failed to parse node at index %d", index);
-				return;
+			case CommandType::GetWorldList: reply_get_world_list(req_id, data); break;
+			case CommandType::CreateRoom: reply_create_join_room(req_id, data); break;
+			case CommandType::JoinRoom: reply_join_room(req_id, data); break;
+			case CommandType::LeaveRoom: reply_leave_room(req_id, data); break;
+			case CommandType::SearchRoom: reply_search_room(req_id, data); break;
+			case CommandType::SetRoomDataExternal: reply_set_roomdata_external(req_id, data); break;
+			case CommandType::GetRoomDataInternal: reply_get_roomdata_internal(req_id, data); break;
+			case CommandType::SetRoomDataInternal: reply_set_roomdata_internal(req_id, data); break;
+			case CommandType::PingRoomOwner: reply_get_ping_info(req_id, data); break;
+			case CommandType::SendRoomMessage: reply_send_room_message(req_id, data); break;
+			case CommandType::RequestSignalingInfos: reply_req_sign_infos(req_id, data); break;
+			case CommandType::RequestTicket: reply_req_ticket(req_id, data); break;
+			default: rpcn_log.error("Unknown reply(%d) received!", command); break;
 			}
-
-			index += (node->len + MIN_TICKET_DATA_SIZE);
-			nodes.push_back(std::move(*node));
 		}
 
-		// Check that everything expected is there
-		if (nodes.size() != 2)
+		auto notifications = rpcn.get_notifications();
+		for (auto& notif : notifications)
 		{
-			ticket_log.error("Expected 2 blobs, found %d", nodes.size());
-			return;
+			switch (notif.first)
+			{
+			case NotificationType::UserJoinedRoom: notif_user_joined_room(notif.second); break;
+			case NotificationType::UserLeftRoom: notif_user_left_room(notif.second); break;
+			case NotificationType::RoomDestroyed: notif_room_destroyed(notif.second); break;
+			case NotificationType::SignalP2PConnect: notif_p2p_connect(notif.second); break;
+			case NotificationType::RoomMessageReceived: notif_room_message_received(notif.second); break;
+			default: rpcn_log.error("Unknown notification(%d) received!", notif.first); break;
+			}
 		}
+	}
+}
 
-		if (nodes[0].id != 0x3000 && nodes[1].id != 0x3002)
+bool np_handler::reply_get_world_list(u32 req_id, std::vector<u8>& reply_data)
+{
+	if (pending_requests.count(req_id) == 0)
+		return error_and_disconnect("Unexpected reply ID to GetWorldList");
+
+	const auto cb_info = std::move(pending_requests.at(req_id));
+	pending_requests.erase(req_id);
+
+	vec_stream reply(reply_data, 1);
+
+	std::vector<u32> world_list;
+	u32 num_worlds = reply.get<u32>();
+	for (u32 i = 0; i < num_worlds; i++)
+	{
+		world_list.push_back(reply.get<u32>());
+	}
+
+	if (reply.is_error())
+	{
+		world_list.clear();
+		return error_and_disconnect("Malformed reply to GetWorldList command");
+	}
+
+	u32 event_key = get_event_key();
+
+	SceNpMatching2GetWorldInfoListResponse* world_info = reinterpret_cast<SceNpMatching2GetWorldInfoListResponse*>(allocate_req_result(event_key, sizeof(SceNpMatching2GetWorldInfoListResponse)));
+	world_info->worldNum                               = world_list.size();
+
+	if (!world_list.empty())
+	{
+		world_info->world.set(allocate(sizeof(SceNpMatching2World) * world_list.size()));
+		for (usz i = 0; i < world_list.size(); i++)
 		{
-			ticket_log.error("The 2 blobs ids are incorrect");
-			return;
+			world_info->world[i].worldId                  = world_list[i];
+			world_info->world[i].numOfLobby               = 1; // TODO
+			world_info->world[i].maxNumOfTotalLobbyMember = 10000;
+			world_info->world[i].curNumOfTotalLobbyMember = 1;
+			world_info->world[i].curNumOfRoom             = 1;
+			world_info->world[i].curNumOfTotalRoomMember  = 1;
 		}
+	}
 
-		if (nodes[0].data.data_nodes.size() < 12)
+	sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+	{
+		cb_info.cb(cb_ppu, cb_info.ctx_id, req_id, SCE_NP_MATCHING2_REQUEST_EVENT_GetWorldInfoList, event_key, 0, sizeof(SceNpMatching2GetWorldInfoListResponse), cb_info.cb_arg);
+		return 0;
+	});
+
+	return true;
+}
+
+bool np_handler::reply_create_join_room(u32 req_id, std::vector<u8>& reply_data)
+{
+	if (pending_requests.count(req_id) == 0)
+		return error_and_disconnect("Unexpected reply ID to CreateRoom");
+
+	const auto cb_info = std::move(pending_requests.at(req_id));
+	pending_requests.erase(req_id);
+
+	vec_stream reply(reply_data, 1);
+	auto create_room_resp = reply.get_rawdata();
+
+	if (reply.is_error())
+		return error_and_disconnect("Malformed reply to CreateRoom command");
+
+	u32 event_key = get_event_key();
+
+	auto resp = flatbuffers::GetRoot<RoomDataInternal>(create_room_resp.data());
+
+	SceNpMatching2CreateJoinRoomResponse* room_resp = reinterpret_cast<SceNpMatching2CreateJoinRoomResponse*>(allocate_req_result(event_key, sizeof(SceNpMatching2CreateJoinRoomResponse)));
+	vm::ptr<SceNpMatching2RoomDataInternal> room_info(allocate(sizeof(SceNpMatching2RoomDataInternal)));
+	room_resp->roomDataInternal = room_info;
+
+	RoomDataInternal_to_SceNpMatching2RoomDataInternal(resp, room_info.get_ptr(), npid);
+
+	// Establish Matching2 self signaling info
+	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
+	sigh.set_self_sig2_info(room_info->roomId, 1);
+	sigh.set_sig2_infos(room_info->roomId, 1, SCE_NP_SIGNALING_CONN_STATUS_ACTIVE, rpcn.get_addr_sig(), rpcn.get_port_sig(), true);
+	// TODO? Should this send a message to Signaling CB? Is this even necessary?
+
+	extra_nps::print_create_room_resp(room_resp);
+
+	sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+	{
+		cb_info.cb(cb_ppu, cb_info.ctx_id, req_id, SCE_NP_MATCHING2_REQUEST_EVENT_CreateJoinRoom, event_key, 0, sizeof(SceNpMatching2CreateJoinRoomResponse), cb_info.cb_arg);
+		return 0;
+	});
+
+	return true;
+}
+
+bool np_handler::reply_join_room(u32 req_id, std::vector<u8>& reply_data)
+{
+	if (pending_requests.count(req_id) == 0)
+		return error_and_disconnect("Unexpected reply ID to JoinRoom");
+
+	const auto cb_info = std::move(pending_requests.at(req_id));
+	pending_requests.erase(req_id);
+
+	vec_stream reply(reply_data, 1);
+
+	auto join_room_resp = reply.get_rawdata();
+
+	if (reply.is_error())
+		return error_and_disconnect("Malformed reply to JoinRoom command");
+
+	u32 event_key = get_event_key();
+
+	auto resp = flatbuffers::GetRoot<RoomDataInternal>(join_room_resp.data());
+
+	SceNpMatching2JoinRoomResponse* room_resp = reinterpret_cast<SceNpMatching2JoinRoomResponse*>(allocate_req_result(event_key, sizeof(SceNpMatching2JoinRoomResponse)));
+	vm::ptr<SceNpMatching2RoomDataInternal> room_info(allocate(sizeof(SceNpMatching2RoomDataInternal)));
+	room_resp->roomDataInternal = room_info;
+
+	u16 member_id = RoomDataInternal_to_SceNpMatching2RoomDataInternal(resp, room_info.get_ptr(), npid);
+
+	extra_nps::print_room_data_internal(room_resp->roomDataInternal.get_ptr());
+
+	// Establish Matching2 self signaling info
+	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
+	sigh.set_self_sig2_info(room_info->roomId, member_id);
+	sigh.set_sig2_infos(room_info->roomId, member_id, SCE_NP_SIGNALING_CONN_STATUS_ACTIVE, rpcn.get_addr_sig(), rpcn.get_port_sig(), true);
+	// TODO? Should this send a message to Signaling CB? Is this even necessary?
+
+	sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+	{
+		cb_info.cb(cb_ppu, cb_info.ctx_id, req_id, SCE_NP_MATCHING2_REQUEST_EVENT_JoinRoom, event_key, 0, sizeof(SceNpMatching2JoinRoomResponse), cb_info.cb_arg);
+		return 0;
+	});
+
+	return true;
+}
+
+bool np_handler::reply_leave_room(u32 req_id, std::vector<u8>& reply_data)
+{
+	if (pending_requests.count(req_id) == 0)
+		return error_and_disconnect("Unexpected reply ID to LeaveRoom");
+
+	const auto cb_info = std::move(pending_requests.at(req_id));
+	pending_requests.erase(req_id);
+
+	vec_stream reply(reply_data, 1);
+	u64 room_id = reply.get<u64>();
+	if (reply.is_error())
+		return error_and_disconnect("Malformed reply to LeaveRoom command");
+
+	u32 event_key = get_event_key(); // Unsure if necessary if there is no data
+
+	// Disconnect all users from that room
+	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
+	sigh.disconnect_sig2_users(room_id);
+
+	sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+	{
+		cb_info.cb(cb_ppu, cb_info.ctx_id, req_id, SCE_NP_MATCHING2_REQUEST_EVENT_LeaveRoom, event_key, 0, 0, cb_info.cb_arg);
+		return 0;
+	});
+
+	return true;
+}
+
+bool np_handler::reply_search_room(u32 req_id, std::vector<u8>& reply_data)
+{
+	if (pending_requests.count(req_id) == 0)
+		return error_and_disconnect("Unexpected reply ID to SearchRoom");
+
+	const auto cb_info = std::move(pending_requests.at(req_id));
+	pending_requests.erase(req_id);
+
+	vec_stream reply(reply_data, 1);
+	auto search_room_resp = reply.get_rawdata();
+	if (reply.is_error())
+		return error_and_disconnect("Malformed reply to SearchRoom command");
+
+	u32 event_key = get_event_key();
+
+	auto resp                                     = flatbuffers::GetRoot<SearchRoomResponse>(search_room_resp.data());
+	SceNpMatching2SearchRoomResponse* search_resp = reinterpret_cast<SceNpMatching2SearchRoomResponse*>(allocate_req_result(event_key, sizeof(SceNpMatching2SearchRoomResponse)));
+
+	SearchRoomReponse_to_SceNpMatching2SearchRoomResponse(resp, search_resp);
+
+	sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+	{
+		cb_info.cb(cb_ppu, cb_info.ctx_id, req_id, SCE_NP_MATCHING2_REQUEST_EVENT_SearchRoom, event_key, 0, sizeof(SceNpMatching2SearchRoomResponse), cb_info.cb_arg);
+		return 0;
+	});
+
+	return true;
+}
+
+bool np_handler::reply_set_roomdata_external(u32 req_id, std::vector<u8>& /*reply_data*/)
+{
+	if (pending_requests.count(req_id) == 0)
+		return error_and_disconnect("Unexpected reply ID to SetRoomDataExternal");
+
+	const auto cb_info = std::move(pending_requests.at(req_id));
+	pending_requests.erase(req_id);
+
+	u32 event_key = get_event_key(); // Unsure if necessary if there is no data
+
+	sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+	{
+		cb_info.cb(cb_ppu, cb_info.ctx_id, req_id, SCE_NP_MATCHING2_REQUEST_EVENT_SetRoomDataExternal, event_key, 0, 0, cb_info.cb_arg);
+		return 0;
+	});
+
+	return true;
+}
+
+bool np_handler::reply_get_roomdata_internal(u32 req_id, std::vector<u8>& reply_data)
+{
+	if (pending_requests.count(req_id) == 0)
+		return error_and_disconnect("Unexpected reply ID to GetRoomDataInternal");
+
+	const auto cb_info = std::move(pending_requests.at(req_id));
+	pending_requests.erase(req_id);
+
+	vec_stream reply(reply_data, 1);
+
+	auto internal_data = reply.get_rawdata();
+
+	if (reply.is_error())
+		return error_and_disconnect("Malformed reply to GetRoomDataInternal command");
+
+	u32 event_key = get_event_key();
+
+	auto resp                                            = flatbuffers::GetRoot<RoomDataInternal>(internal_data.data());
+	SceNpMatching2GetRoomDataInternalResponse* room_resp = reinterpret_cast<SceNpMatching2GetRoomDataInternalResponse*>(allocate_req_result(event_key, sizeof(SceNpMatching2GetRoomDataInternalResponse)));
+	vm::ptr<SceNpMatching2RoomDataInternal> room_info(allocate(sizeof(SceNpMatching2RoomDataInternal)));
+	room_resp->roomDataInternal = room_info;
+	RoomDataInternal_to_SceNpMatching2RoomDataInternal(resp, room_info.get_ptr(), npid);
+
+	extra_nps::print_room_data_internal(room_resp->roomDataInternal.get_ptr());
+
+	sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+	{
+		cb_info.cb(cb_ppu, cb_info.ctx_id, req_id, SCE_NP_MATCHING2_REQUEST_EVENT_GetRoomDataInternal, event_key, 0, sizeof(SceNpMatching2GetRoomDataInternalResponse), cb_info.cb_arg);
+		return 0;
+	});
+
+	return true;
+}
+
+bool np_handler::reply_set_roomdata_internal(u32 req_id, std::vector<u8>& /*reply_data*/)
+{
+	if (pending_requests.count(req_id) == 0)
+		return error_and_disconnect("Unexpected reply ID to SetRoomDataInternal");
+
+	const auto cb_info = std::move(pending_requests.at(req_id));
+	pending_requests.erase(req_id);
+
+	u32 event_key = get_event_key(); // Unsure if necessary if there is no data
+
+	sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+	{
+		cb_info.cb(cb_ppu, cb_info.ctx_id, req_id, SCE_NP_MATCHING2_REQUEST_EVENT_SetRoomDataInternal, event_key, 0, 0, cb_info.cb_arg);
+		return 0;
+	});
+
+	return true;
+}
+
+bool np_handler::reply_get_ping_info(u32 req_id, std::vector<u8>& reply_data)
+{
+	if (pending_requests.count(req_id) == 0)
+		return error_and_disconnect("Unexpected reply ID to PingRoomOwner");
+
+	const auto cb_info = std::move(pending_requests.at(req_id));
+	pending_requests.erase(req_id);
+
+	vec_stream reply(reply_data, 1);
+
+	auto ping_resp = reply.get_rawdata();
+
+	if (reply.is_error())
+		return error_and_disconnect("Malformed reply to PingRoomOwner command");
+
+	u32 event_key = get_event_key();
+
+	auto resp                                                   = flatbuffers::GetRoot<GetPingInfoResponse>(ping_resp.data());
+	SceNpMatching2SignalingGetPingInfoResponse* final_ping_resp = reinterpret_cast<SceNpMatching2SignalingGetPingInfoResponse*>(allocate_req_result(event_key, sizeof(SceNpMatching2SignalingGetPingInfoResponse)));
+	GetPingInfoResponse_to_SceNpMatching2SignalingGetPingInfoResponse(resp, final_ping_resp);
+
+	sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+	{
+		cb_info.cb(cb_ppu, cb_info.ctx_id, req_id, SCE_NP_MATCHING2_REQUEST_EVENT_SignalingGetPingInfo, event_key, 0, sizeof(SceNpMatching2SignalingGetPingInfoResponse), cb_info.cb_arg);
+		return 0;
+	});
+
+	return true;
+}
+
+bool np_handler::reply_send_room_message(u32 req_id, std::vector<u8>& /*reply_data*/)
+{
+	if (pending_requests.count(req_id) == 0)
+		return error_and_disconnect("Unexpected reply ID to PingRoomOwner");
+
+	const auto cb_info = std::move(pending_requests.at(req_id));
+	pending_requests.erase(req_id);
+
+	sysutil_register_cb([=](ppu_thread& cb_ppu) -> s32
+	{
+		cb_info.cb(cb_ppu, cb_info.ctx_id, req_id, SCE_NP_MATCHING2_REQUEST_EVENT_SendRoomMessage, 0, 0, 0, cb_info.cb_arg);
+		return 0;
+	});
+
+	return true;
+}
+
+bool np_handler::reply_req_sign_infos(u32 req_id, std::vector<u8>& reply_data)
+{
+	if (!pending_sign_infos_requests.count(req_id))
+		return error_and_disconnect("Unexpected reply ID to req RequestSignalingInfos");
+
+	u32 conn_id = pending_sign_infos_requests.at(req_id);
+	pending_sign_infos_requests.erase(req_id);
+
+	vec_stream reply(reply_data, 1);
+	u32 addr = reply.get<u32>();
+	u16 port = reply.get<u16>();
+
+	if (reply.is_error())
+		return error_and_disconnect("Malformed reply to RequestSignalingInfos command");
+
+	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
+	sigh.start_sig(conn_id, addr, port);
+
+	return true;
+}
+
+bool np_handler::reply_req_ticket(u32 /*req_id*/, std::vector<u8>& reply_data)
+{
+	vec_stream reply(reply_data, 1);
+	auto ticket_raw = reply.get_rawdata();
+
+	if (reply.is_error())
+		return error_and_disconnect("Malformed reply to RequestTicket command");
+
+	current_ticket = std::move(ticket_raw);
+	auto ticket_size = static_cast<s32>(current_ticket.size());
+
+	if (manager_cb)
+	{
+		sysutil_register_cb([manager_cb = this->manager_cb, ticket_size, manager_cb_arg = this->manager_cb_arg](ppu_thread& cb_ppu) -> s32
 		{
-			ticket_log.error("Expected at least 12 sub-nodes, found %d", nodes[0].data.data_nodes.size());
-			return;
-		}
+			manager_cb(cb_ppu, SCE_NP_MANAGER_EVENT_GOT_TICKET, ticket_size, manager_cb_arg);
+			return 0;
+		});
+	}
 
-		const auto& subnodes = nodes[0].data.data_nodes;
+	return true;
+}
 
-		if (subnodes[0].id != 8 || subnodes[1].id != 1 || subnodes[2].id != 7 || subnodes[3].id != 7 ||
-			subnodes[4].id != 2 || subnodes[5].id != 4 || subnodes[6].id != 8 || subnodes[7].id != 4 ||
-			subnodes[8].id != 8 || subnodes[9].id != 1)
-		{
-			ticket_log.error("Mismatched node");
-			return;
-		}
+void np_handler::notif_user_joined_room(std::vector<u8>& data)
+{
+	vec_stream noti(data);
+	u64 room_id          = noti.get<u64>();
+	auto update_info_raw = noti.get_rawdata();
 
-		parse_success = true;
+	if (noti.is_error())
+	{
+		rpcn_log.error("Received faulty UserJoinedRoom notification");
 		return;
 	}
 
-	extern void init_np_handler_dependencies()
+	u32 event_key = get_event_key();
+
+	auto update_info                               = flatbuffers::GetRoot<RoomMemberUpdateInfo>(update_info_raw.data());
+	SceNpMatching2RoomMemberUpdateInfo* notif_data = reinterpret_cast<SceNpMatching2RoomMemberUpdateInfo*>(allocate_req_result(event_key, sizeof(SceNpMatching2RoomMemberUpdateInfo)));
+	RoomMemberUpdateInfo_to_SceNpMatching2RoomMemberUpdateInfo(update_info, notif_data);
+
+	rpcn_log.notice("Received notification that user %s(%d) joined the room(%d)", notif_data->roomMemberDataInternal->userInfo.npId.handle.data, notif_data->roomMemberDataInternal->memberId, room_id);
+	extra_nps::print_room_member_data_internal(notif_data->roomMemberDataInternal.get_ptr());
+
+	sysutil_register_cb([room_event_cb = this->room_event_cb, room_id, event_key, room_event_cb_ctx = this->room_event_cb_ctx, room_event_cb_arg = this->room_event_cb_arg](ppu_thread& cb_ppu) -> s32
 	{
-		if (auto handler = g_fxo->try_get<named_thread<np_handler>>())
+		room_event_cb(cb_ppu, room_event_cb_ctx, room_id, SCE_NP_MATCHING2_ROOM_EVENT_MemberJoined, event_key, 0, sizeof(SceNpMatching2RoomMemberUpdateInfo), room_event_cb_arg);
+		return 0;
+	});
+}
+
+void np_handler::notif_user_left_room(std::vector<u8>& data)
+{
+	vec_stream noti(data);
+	u64 room_id          = noti.get<u64>();
+	auto update_info_raw = noti.get_rawdata();
+
+	if (noti.is_error())
+	{
+		rpcn_log.error("Received faulty UserLeftRoom notification");
+		return;
+	}
+
+	u32 event_key = get_event_key();
+
+	auto update_info                               = flatbuffers::GetRoot<RoomMemberUpdateInfo>(update_info_raw.data());
+	SceNpMatching2RoomMemberUpdateInfo* notif_data = reinterpret_cast<SceNpMatching2RoomMemberUpdateInfo*>(allocate_req_result(event_key, sizeof(SceNpMatching2RoomMemberUpdateInfo)));
+	RoomMemberUpdateInfo_to_SceNpMatching2RoomMemberUpdateInfo(update_info, notif_data);
+
+	rpcn_log.notice("Received notification that user %s(%d) left the room(%d)", notif_data->roomMemberDataInternal->userInfo.npId.handle.data, notif_data->roomMemberDataInternal->memberId, room_id);
+	extra_nps::print_room_member_data_internal(notif_data->roomMemberDataInternal.get_ptr());
+
+	sysutil_register_cb([room_event_cb = this->room_event_cb, room_event_cb_ctx = this->room_event_cb_ctx, room_id, event_key, room_event_cb_arg = this->room_event_cb_arg](ppu_thread& cb_ppu) -> s32
+	{
+		room_event_cb(cb_ppu, room_event_cb_ctx, room_id, SCE_NP_MATCHING2_ROOM_EVENT_MemberLeft, event_key, 0, sizeof(SceNpMatching2RoomMemberUpdateInfo), room_event_cb_arg);
+		return 0;
+	});
+}
+
+void np_handler::notif_room_destroyed(std::vector<u8>& data)
+{
+	vec_stream noti(data);
+	u64 room_id          = noti.get<u64>();
+	auto update_info_raw = noti.get_rawdata();
+
+	if (noti.is_error())
+	{
+		rpcn_log.error("Received faulty RoomDestroyed notification");
+		return;
+	}
+
+	u32 event_key = get_event_key();
+
+	auto update_info                         = flatbuffers::GetRoot<RoomUpdateInfo>(update_info_raw.data());
+	SceNpMatching2RoomUpdateInfo* notif_data = reinterpret_cast<SceNpMatching2RoomUpdateInfo*>(allocate_req_result(event_key, sizeof(SceNpMatching2RoomUpdateInfo)));
+	RoomUpdateInfo_to_SceNpMatching2RoomUpdateInfo(update_info, notif_data);
+
+	rpcn_log.notice("Received notification that room(%d) was destroyed", room_id);
+
+	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
+	sigh.disconnect_sig2_users(room_id);
+
+	sysutil_register_cb([room_event_cb = this->room_event_cb, room_event_cb_ctx = this->room_event_cb_ctx, room_id, event_key, room_event_cb_arg = this->room_event_cb_arg](ppu_thread& cb_ppu) -> s32
+	{
+		room_event_cb(cb_ppu, room_event_cb_ctx, room_id, SCE_NP_MATCHING2_ROOM_EVENT_RoomDestroyed, event_key, 0, sizeof(SceNpMatching2RoomUpdateInfo), room_event_cb_arg);
+		return 0;
+	});
+}
+
+void np_handler::notif_p2p_connect(std::vector<u8>& data)
+{
+	if (data.size() != 16)
+	{
+		rpcn_log.error("Notification data for SignalP2PConnect != 14");
+		return;
+	}
+
+	const u64 room_id    = reinterpret_cast<le_t<u64>&>(data[0]);
+	const u16 member_id  = reinterpret_cast<le_t<u16>&>(data[8]);
+	const u16 port_p2p   = reinterpret_cast<be_t<u16>&>(data[10]);
+	const u32 addr_p2p   = reinterpret_cast<le_t<u32>&>(data[12]);
+
+	rpcn_log.notice("Received notification to connect to member(%d) of room(%d): %s:%d", member_id, room_id, ip_to_string(addr_p2p), port_p2p);
+
+	// Attempt Signaling
+	auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
+	sigh.set_sig2_infos(room_id, member_id, SCE_NP_SIGNALING_CONN_STATUS_PENDING, addr_p2p, port_p2p);
+	sigh.start_sig2(room_id, member_id);
+}
+
+void np_handler::notif_room_message_received(std::vector<u8>& data)
+{
+	vec_stream noti(data);
+	u64 room_id           = noti.get<u64>();
+	u16 member_id         = noti.get<u16>();
+	auto message_info_raw = noti.get_rawdata();
+
+	if (noti.is_error())
+	{
+		rpcn_log.error("Received faulty RoomMessageReceived notification");
+		return;
+	}
+
+	u32 event_key = get_event_key();
+
+	auto message_info                        = flatbuffers::GetRoot<RoomMessageInfo>(message_info_raw.data());
+	SceNpMatching2RoomMessageInfo* notif_data = reinterpret_cast<SceNpMatching2RoomMessageInfo*>(allocate_req_result(event_key, sizeof(SceNpMatching2RoomMessageInfo)));
+	RoomMessageInfo_to_SceNpMatching2RoomMessageInfo(message_info, notif_data);
+
+	rpcn_log.notice("Received notification of a room message from member(%d) in room(%d)", member_id, room_id);
+
+	if (room_msg_cb)
+	{
+		sysutil_register_cb([room_msg_cb = this->room_msg_cb, room_msg_cb_ctx = this->room_msg_cb_ctx, room_id, member_id, event_key, room_msg_cb_arg = this->room_msg_cb_arg](ppu_thread& cb_ppu) -> s32
 		{
-			handler->init_np_handler_dependencies();
-		}
-	}
-
-	void np_handler::init_np_handler_dependencies()
-	{
-		if (is_psn_active && g_cfg.net.psn_status == np_psn_status::psn_rpcn && g_fxo->is_init<p2p_context>() && !m_inited_np_handler_dependencies)
-		{
-			m_inited_np_handler_dependencies = true;
-
-			auto& nc = g_fxo->get<p2p_context>();
-			nc.bind_sce_np_port();
-
-			std::lock_guard lock(mutex_rpcn);
-			rpcn = rpcn::rpcn_client::get_instance(bind_ip);
-		}
-	}
-
-	np_handler::np_handler()
-	{
-		{
-			auto history = load_players_history();
-
-			std::lock_guard lock(mutex_history);
-			players_history = std::move(history);
-		}
-
-		g_fxo->need<named_thread<signaling_handler>>();
-
-		is_connected  = (g_cfg.net.net_active == np_internet_status::enabled);
-		is_psn_active = (g_cfg.net.psn_status >= np_psn_status::psn_fake) && is_connected;
-
-		if (get_net_status() == CELL_NET_CTL_STATE_IPObtained)
-		{
-
-			if (!discover_ether_address() || !discover_ip_address())
-			{
-				nph_log.error("Failed to discover ethernet or ip address!");
-				is_connected  = false;
-				is_psn_active = false;
-				return;
-			}
-
-			// Convert dns address
-			// TODO: recover actual user dns through OS specific API
-			in_addr conv{};
-			if (!inet_pton(AF_INET, g_cfg.net.dns.to_string().c_str(), &conv))
-			{
-				// Do not set to disconnected on invalid IP just error and continue using default(google's 8.8.8.8)
-				nph_log.error("Provided IP(%s) address for DNS is invalid!", g_cfg.net.dns.to_string());
-			}
-			else
-			{
-				dns_ip = conv.s_addr;
-			}
-
-			// Convert bind address
-			bind_ip = resolve_binding_ip();
-
-			if (bind_ip)
-				local_ip_addr = bind_ip;
-
-			if (g_cfg.net.upnp_enabled)
-				upnp.upnp_enable();
-		}
-
-		init_np_handler_dependencies();
-	}
-
-	np_handler::np_handler(utils::serial& ar)
-		: np_handler()
-	{
-		ar(is_netctl_init, is_NP_init);
-
-		if (!is_NP_init)
-		{
-			return;
-		}
-
-		ar(is_NP_Lookup_init, is_NP_Score_init, is_NP2_init, is_NP2_Match2_init, is_NP_Auth_init, manager_cb, manager_cb_arg, std::as_bytes(std::span(&basic_handler, 1)), is_connected, is_psn_active, hostname, ether_address, local_ip_addr, public_ip_addr, dns_ip);
-
-		// Call init func if needed (np_memory is unaffected when an empty pool is provided)
-		init_NP(0, vm::null);
-
-		np_memory.save(ar);
-
-		// TODO: IDM-tied objects are not yet saved
-	}
-
-	np_handler::~np_handler()
-	{
-		std::unordered_map<u32, shared_ptr<generic_async_transaction_context>> moved_trans;
-		{
-			std::lock_guard lock(mutex_async_transactions);
-			moved_trans = std::move(async_transactions);
-			async_transactions.clear();
-		}
-
-		for (auto& [trans_id, trans] : moved_trans)
-		{
-			trans->abort_transaction();
-		}
-
-		for (auto& [trans_id, trans] : moved_trans)
-		{
-			if (trans->thread.joinable())
-				trans->thread.join();
-		}
-	}
-
-	std::shared_ptr<rpcn::rpcn_client> np_handler::get_rpcn()
-	{
-		if (!rpcn) [[unlikely]]
-		{
-			ensure(g_cfg.net.psn_status == np_psn_status::psn_fake);
-			fmt::throw_exception("RPCN is required to use PSN online features.");
-		}
-		return rpcn;
-	}
-
-	void np_handler::save(utils::serial& ar)
-	{
-		// TODO: See ctor
-		ar(is_netctl_init, is_NP_init);
-
-		if (!is_NP_init)
-		{
-			return;
-		}
-
-		USING_SERIALIZATION_VERSION(sceNp);
-
-		ar(is_NP_Lookup_init, is_NP_Score_init, is_NP2_init, is_NP2_Match2_init, is_NP_Auth_init, manager_cb, manager_cb_arg, std::as_bytes(std::span(&basic_handler, 1)), is_connected, is_psn_active, hostname, ether_address, local_ip_addr, public_ip_addr, dns_ip);
-
-		np_memory.save(ar);
-	}
-
-	void memory_allocator::save(utils::serial& ar)
-	{
-		ar(m_pool, m_size, m_allocs, m_avail);
-	}
-
-	bool np_handler::discover_ip_address()
-	{
-		auto sockfd = socket(AF_INET, SOCK_DGRAM, 0);
-#ifdef _WIN32
-		if (sockfd == INVALID_SOCKET)
-#else
-		if (sockfd == -1)
-#endif
-		{
-			nph_log.error("Creating socket to discover local ip failed: %d", get_native_error());
-			return false;
-		}
-
-		auto close_socket = [&]()
-		{
-#ifdef _WIN32
-			closesocket(sockfd);
-#else
-			close(sockfd);
-#endif
-		};
-
-		::sockaddr_in addr;
-		std::memset(&addr, 0, sizeof(addr));
-		addr.sin_family = AF_INET;
-		addr.sin_port = 53;
-		addr.sin_addr.s_addr = 0x08080808;
-		if (connect(sockfd, reinterpret_cast<const sockaddr *>(&addr), sizeof(addr)) != 0)
-		{
-			// If connect fails a route to the internet is not available
-			nph_log.error("connect to discover local ip failed: %d", get_native_error());
-			close_socket();
-			return false; // offline
-		}
-
-		sockaddr_in client_addr{};
-		socklen_t client_addr_size = sizeof(client_addr);
-		if (getsockname(sockfd, reinterpret_cast<struct sockaddr*>(&client_addr), &client_addr_size) != 0)
-		{
-			rpcn_log.error("getsockname to discover local ip failed: %d", get_native_error());
-			close_socket();
-			return true; // still assume online
-		}
-
-		local_ip_addr = client_addr.sin_addr.s_addr;
-		if (nph_log.trace)
-			nph_log.trace("discover_ip_address: IP was determined to be %s", ip_to_string(local_ip_addr));
-		close_socket();
-		return true;
-	}
-
-	bool np_handler::discover_ether_address()
-	{
-#if defined(__FreeBSD__) || defined(__APPLE__)
-		ifaddrs* ifap;
-
-		if (getifaddrs(&ifap) == 0)
-		{
-			ifaddrs* p;
-			for (p = ifap; p; p = p->ifa_next)
-			{
-				if (p->ifa_addr->sa_family == AF_LINK)
-				{
-					sockaddr_dl* sdp = reinterpret_cast<sockaddr_dl*>(p->ifa_addr);
-					memcpy(ether_address.data(), sdp->sdl_data + sdp->sdl_nlen, 6);
-					freeifaddrs(ifap);
-					// nph_log.notice("Determined Ethernet address to be %s", ether_to_string(ether_address));
-					return true;
-				}
-			}
-			freeifaddrs(ifap);
-		}
-#elif defined(_WIN32)
-		std::vector<u8> adapter_infos(sizeof(IP_ADAPTER_INFO));
-		ULONG size_infos = sizeof(IP_ADAPTER_INFO);
-
-		if (GetAdaptersInfo(reinterpret_cast<PIP_ADAPTER_INFO>(adapter_infos.data()), &size_infos) == ERROR_BUFFER_OVERFLOW)
-			adapter_infos.resize(size_infos);
-
-		if (GetAdaptersInfo(reinterpret_cast<PIP_ADAPTER_INFO>(adapter_infos.data()), &size_infos) == NO_ERROR && size_infos)
-		{
-			PIP_ADAPTER_INFO info = reinterpret_cast<PIP_ADAPTER_INFO>(adapter_infos.data());
-			memcpy(ether_address.data(), info[0].Address, 6);
-			// nph_log.notice("Determined Ethernet address to be %s", ether_to_string(ether_address));
-			return true;
-		}
-#else
-		ifreq ifr;
-		ifconf ifc;
-		char buf[1024];
-		int success = 0;
-
-		int sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
-		if (sock == -1)
-			return false;
-
-		ifc.ifc_len = sizeof(buf);
-		ifc.ifc_buf = buf;
-		if (ioctl(sock, SIOCGIFCONF, &ifc) == -1)
-			return false;
-
-		ifreq* it              = ifc.ifc_req;
-		const ifreq* const end = it + (ifc.ifc_len / sizeof(ifreq));
-
-		for (; it != end; ++it)
-		{
-			strcpy(ifr.ifr_name, it->ifr_name);
-			if (ioctl(sock, SIOCGIFFLAGS, &ifr) == 0)
-			{
-				if (!(ifr.ifr_flags & IFF_LOOPBACK))
-				{
-					if (ioctl(sock, SIOCGIFHWADDR, &ifr) == 0)
-					{
-						success = 1;
-						break;
-					}
-				}
-			}
-		}
-
-		if (success)
-		{
-			memcpy(ether_address.data(), ifr.ifr_hwaddr.sa_data, 6);
-			// nph_log.notice("Determined Ethernet address to be %s", ether_to_string(ether_address));
-
-			return true;
-		}
-#endif
-
-		return false;
-	}
-
-	const std::array<u8, 6>& np_handler::get_ether_addr() const
-	{
-		return ether_address;
-	}
-
-	const std::string& np_handler::get_hostname() const
-	{
-		return hostname;
-	}
-
-	u32 np_handler::get_local_ip_addr() const
-	{
-		return local_ip_addr;
-	}
-
-	u32 np_handler::get_public_ip_addr() const
-	{
-		return public_ip_addr;
-	}
-
-	u32 np_handler::get_dns_ip() const
-	{
-		return dns_ip;
-	}
-
-	u32 np_handler::get_bind_ip() const
-	{
-		return bind_ip;
-	}
-
-	s32 np_handler::get_net_status() const
-	{
-		return is_connected ? CELL_NET_CTL_STATE_IPObtained : CELL_NET_CTL_STATE_Disconnected;
-	}
-
-	s32 np_handler::get_psn_status() const
-	{
-		return is_psn_active ? SCE_NP_MANAGER_STATUS_ONLINE : SCE_NP_MANAGER_STATUS_OFFLINE;
-	}
-
-	s32 np_handler::get_upnp_status() const
-	{
-		if (upnp.is_active())
-			return SCE_NP_SIGNALING_NETINFO_UPNP_STATUS_VALID;
-
-		return SCE_NP_SIGNALING_NETINFO_UPNP_STATUS_INVALID;
-	}
-
-	const SceNpId& np_handler::get_npid() const
-	{
-		return npid;
-	}
-
-	const SceNpOnlineId& np_handler::get_online_id() const
-	{
-		return npid.handle;
-	}
-
-	const SceNpOnlineName& np_handler::get_online_name() const
-	{
-		return online_name;
-	}
-
-	const SceNpAvatarUrl& np_handler::get_avatar_url() const
-	{
-		return avatar_url;
-	}
-
-	void np_handler::init_NP(u32 poolsize, vm::ptr<void> poolptr)
-	{
-		if (poolsize)
-		{
-			// Init memory pool (zero arg is reserved for savestate's use)
-			np_memory.setup(poolptr, poolsize);
-		}
-
-		std::memset(&npid, 0, sizeof(npid));
-		std::memset(&online_name, 0, sizeof(online_name));
-		std::memset(&avatar_url, 0, sizeof(avatar_url));
-
-		if (g_cfg.net.psn_status >= np_psn_status::psn_fake)
-		{
-			g_cfg_rpcn.load(); // Ensures config is loaded even if rpcn is not running for simulated
-			const std::string s_npid = g_cfg_rpcn.get_npid();
-			ensure(!s_npid.empty()); // It should have been generated before this
-
-			string_to_npid(s_npid, npid);
-			auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-			sigh.set_self_sig_info(npid);
-		}
-
-		switch (g_cfg.net.psn_status)
-		{
-		case np_psn_status::disabled:
-			break;
-		case np_psn_status::psn_fake:
-		{
-			string_to_online_name("RPCS3's user", online_name);
-			string_to_avatar_url("https://rpcs3.net/cdn/netplay/DefaultAvatar.png", avatar_url);
-			break;
-		}
-		case np_psn_status::psn_rpcn:
-		{
-			if (!is_psn_active)
-				break;
-
-			std::lock_guard lock(mutex_rpcn);
-
-			bool was_already_started = true;
-
-			if (!rpcn)
-			{
-				rpcn = rpcn::rpcn_client::get_instance(bind_ip);
-				was_already_started = false;
-			}
-
-			// Make sure we're connected
-
-			if (auto state = rpcn->wait_for_connection(); state != rpcn::rpcn_state::failure_no_failure)
-			{
-				rsx::overlays::queue_message(rpcn::rpcn_state_to_localized_string_id(state));
-				rpcn_log.error("Connection to RPCN Failed!");
-				is_psn_active = false;
-				return;
-			}
-
-			if (auto state = rpcn->wait_for_authentified(); state != rpcn::rpcn_state::failure_no_failure)
-			{
-				rsx::overlays::queue_message(rpcn::rpcn_state_to_localized_string_id(state));
-				rpcn_log.error("RPCN login attempt failed!");
-				is_psn_active = false;
-				return;
-			}
-
-			if (!was_already_started)
-				rsx::overlays::queue_message(localized_string_id::RPCN_SUCCESS_LOGGED_ON);
-
-			string_to_online_name(rpcn->get_online_name(), online_name);
-			string_to_avatar_url(rpcn->get_avatar_url(), avatar_url);
-			public_ip_addr = rpcn->get_addr_sig();
-
-			if (!public_ip_addr)
-			{
-				rsx::overlays::queue_message(rpcn::rpcn_state_to_localized_string_id(rpcn::rpcn_state::failure_other));
-				rpcn_log.error("Failed to get a reply from RPCN signaling!");
-				is_psn_active = false;
-				rpcn->terminate_connection();
-				return;
-			}
-
-			local_ip_addr  = std::bit_cast<u32, be_t<u32>>(rpcn->get_addr_local());
-
-			break;
-		}
-		default:
-			break;
-		}
-	}
-
-	void np_handler::terminate_NP()
-	{
-		np_memory.release();
-
-		manager_cb = {};
-		manager_cb_arg = {};
-		basic_handler_registered = false;
-		room_event_cb = {};
-		room_event_cb_ctx = 0;
-		room_event_cb_arg = {};
-		room_msg_cb = {};
-		room_msg_cb_ctx = 0;
-		room_msg_cb_arg = {};
-
-		presence_self.pr_status = {};
-		presence_self.pr_data = {};
-		presence_self.advertised = false;
-
-		if (is_connected && is_psn_active && rpcn)
-		{
-			rpcn_log.notice("Setting RPCN state to disconnected!");
-			rpcn->reset_state();
-		}
-	}
-
-	u32 np_handler::get_match2_event(SceNpMatching2EventKey event_key, u32 dest_addr, u32 size)
-	{
-		std::lock_guard lock(mutex_match2_req_results);
-
-		if (!match2_req_results.contains(event_key))
+			room_msg_cb(cb_ppu, room_msg_cb_ctx, room_id, member_id, SCE_NP_MATCHING2_ROOM_MSG_EVENT_Message, event_key, 0, sizeof(SceNpMatching2RoomUpdateInfo), room_msg_cb_arg);
 			return 0;
+		});
+	}
+}
 
-		auto& data = ::at32(match2_req_results, event_key);
-		data.apply_relocations(dest_addr);
+void np_handler::add_dns_spy(u32 sock)
+{
+	dns_spylist.emplace(std::make_pair(sock, std::queue<std::vector<u8>>()));
+}
 
-		const u32 size_copied = std::min(size, data.size());
+void np_handler::remove_dns_spy(u32 sock)
+{
+	dns_spylist.erase(sock);
+}
 
-		if (dest_addr && size_copied)
+bool np_handler::is_dns(u32 sock) const
+{
+	return dns_spylist.count(sock) != 0;
+}
+
+bool np_handler::is_dns_queue(u32 sock) const
+{
+	return !dns_spylist.at(sock).empty();
+}
+
+std::vector<u8> np_handler::get_dns_packet(u32 sock)
+{
+	auto ret_vec = std::move(dns_spylist.at(sock).front());
+	dns_spylist.at(sock).pop();
+
+	return ret_vec;
+}
+
+s32 np_handler::analyze_dns_packet(s32 s, const u8* buf, u32 len)
+{
+	if (sys_net.enabled == logs::level::trace)
+	{
+		std::string datrace;
+		const char hex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+		for (u32 index = 0; index < len; index++)
 		{
-			vm::ptr<void> dest = vm::cast(dest_addr);
-			memcpy(dest.get_ptr(), data.data(), size_copied);
+			if ((index % 16) == 0)
+				datrace += '\n';
+
+			datrace += hex[(buf[index] >> 4) & 15];
+			datrace += hex[(buf[index]) & 15];
+			datrace += ' ';
 		}
-
-		np_memory.free(data.addr());
-		match2_req_results.erase(event_key);
-
-		return size_copied;
+		sys_net.trace("DNS REQUEST: %s", datrace);
 	}
 
-	void np_handler::register_basic_handler(vm::cptr<SceNpCommunicationId> context, vm::ptr<SceNpBasicEventHandler> handler, vm::ptr<void> arg, bool context_sensitive)
+	struct dns_header
 	{
+		u16 id; // identification number
+
+		u8 rd : 1;     // recursion desired
+		u8 tc : 1;     // truncated message
+		u8 aa : 1;     // authoritive answer
+		u8 opcode : 4; // purpose of message
+		u8 qr : 1;     // query/response flag
+
+		u8 rcode : 4; // response code
+		u8 cd : 1;    // checking disabled
+		u8 ad : 1;    // authenticated data
+		u8 z : 1;     // its z! reserved
+		u8 ra : 1;    // recursion available
+
+		be_t<u16> q_count;    // number of question entries
+		be_t<u16> ans_count;  // number of answer entries
+		be_t<u16> auth_count; // number of authority entries
+		be_t<u16> add_count;  // number of resource entries
+	};
+
+	if (len < sizeof(dns_header))
+		return -1;
+
+	const dns_header* dhead = reinterpret_cast<const dns_header*>(buf);
+	// We are only looking for queries not truncated(todo?), only handle one dns query at a time(todo?)
+	if (dhead->qr != 0 || dhead->tc != 0 || dhead->q_count != 1 || dhead->ans_count != 0 || dhead->auth_count != 0 || dhead->add_count != 0)
+		return -1;
+
+	// Get the actual address
+	u8 count = 0;
+	std::string host{};
+	for (u32 i = sizeof(dns_header); (i < len) && buf[i] != 0; i++)
+	{
+		if (count == 0)
 		{
-			std::lock_guard lock(basic_handler.mutex);
-			memcpy(&basic_handler.context, context.get_ptr(), sizeof(basic_handler.context));
-			basic_handler.handler_func = handler;
-			basic_handler.handler_arg = arg;
-			basic_handler.context_sensitive = context_sensitive;
-			basic_handler_registered = true;
-
-			presence_self.pr_com_id = *context;
-			presence_self.pr_title = fmt::truncate(Emu.GetTitle(), SCE_NP_BASIC_PRESENCE_TITLE_SIZE_MAX - 1);
-		}
-
-		if (g_cfg.net.psn_status != np_psn_status::psn_rpcn || !is_psn_active)
-		{
-			return;
-		}
-
-		std::lock_guard lock(mutex_rpcn);
-
-		if (!rpcn)
-		{
-			return;
-		}
-
-		auto current_presences = rpcn->get_presence_states();
-
-		for (auto& [npid, pr_info] : current_presences)
-		{
-			basic_event to_add{};
-			strcpy_trunc(to_add.from.userId.handle.data, npid);
-			strcpy_trunc(to_add.from.name.data, npid);
-
-			if (pr_info.online)
+			count = buf[i];
+			if (i != sizeof(dns_header))
 			{
-				if (std::memcmp(pr_info.pr_com_id.data, basic_handler.context.data, sizeof(pr_info.pr_com_id.data)) == 0)
-				{
-					to_add.event = SCE_NP_BASIC_EVENT_PRESENCE;
-					to_add.data = std::move(pr_info.pr_data);
-				}
-				else
-				{
-					if (basic_handler.context_sensitive)
-					{
-						to_add.event = SCE_NP_BASIC_EVENT_OUT_OF_CONTEXT;
-					}
-					else
-					{
-						to_add.event = SCE_NP_BASIC_EVENT_OFFLINE;
-					}
-				}
-			}
-			else
-			{
-				to_add.event = SCE_NP_BASIC_EVENT_OFFLINE;
-			}
-
-			queue_basic_event(to_add);
-			send_basic_event(to_add.event, 0, 0);
-		}
-
-		send_basic_event(SCE_NP_BASIC_EVENT_END_OF_INITIAL_PRESENCE, 0, 0);
-	}
-
-	SceNpCommunicationId np_handler::get_basic_handler_context()
-	{
-		std::lock_guard lock(basic_handler.mutex);
-		return basic_handler.context;
-	}
-
-	bool np_handler::send_basic_event(s32 event, s32 retCode, u32 reqId)
-	{
-		if (basic_handler_registered)
-		{
-			std::lock_guard lock(basic_handler.mutex);
-
-			sysutil_register_cb([handler_func = this->basic_handler.handler_func, handler_arg = this->basic_handler.handler_arg, event, retCode, reqId](ppu_thread& cb_ppu) -> s32
-				{
-					handler_func(cb_ppu, event, retCode, reqId, handler_arg);
-					return 0;
-				});
-
-			return true;
-		}
-
-		return false;
-	}
-
-	void np_handler::queue_basic_event(basic_event to_queue)
-	{
-		std::lock_guard lock(mutex_queue_basic_events);
-		queue_basic_events.push(std::move(to_queue));
-	}
-
-	error_code np_handler::get_basic_event(vm::ptr<s32> event, vm::ptr<SceNpUserInfo> from, vm::ptr<u8> data, vm::ptr<u32> size)
-	{
-		basic_event cur_event;
-		{
-			std::lock_guard lock(mutex_queue_basic_events);
-			if (queue_basic_events.empty())
-			{
-				return not_an_error(SCE_NP_BASIC_ERROR_NO_EVENT);
-			}
-
-			cur_event = std::move(queue_basic_events.front());
-			queue_basic_events.pop();
-		}
-
-		*event = cur_event.event;
-		memcpy(from.get_ptr(), &cur_event.from, sizeof(cur_event.from));
-		if (cur_event.event != SCE_NP_BASIC_EVENT_OFFLINE)
-		{
-			const u32 size_avail = *size;
-			const u32 res_size   = std::min(static_cast<u32>(cur_event.data.size()), size_avail);
-
-			memcpy(data.get_ptr(), cur_event.data.data(), res_size);
-			*size = res_size;
-
-			if (res_size < cur_event.data.size())
-			{
-				return SCE_NP_BASIC_ERROR_DATA_LOST;
-			}
-		}
-
-		nph_log.notice("basic_event: event:%d, from:%s(%s), size:%d", *event, static_cast<char*>(from->userId.handle.data), static_cast<char*>(from->name.data), *size);
-
-		return CELL_OK;
-	}
-
-	std::optional<shared_ptr<std::pair<std::string, message_data>>> np_handler::get_message(u64 id)
-	{
-		return get_rpcn()->get_message(id);
-	}
-
-	void np_handler::set_message_selected(SceNpBasicAttachmentDataId id, u64 msg_id)
-	{
-		switch (id)
-		{
-		case SCE_NP_BASIC_SELECTED_INVITATION_DATA:
-			selected_invite_id = msg_id;
-			break;
-		case SCE_NP_BASIC_SELECTED_MESSAGE_DATA:
-			selected_message_id = msg_id;
-			break;
-		default:
-			fmt::throw_exception("set_message_selected with id %d", id);
-		}
-	}
-
-	std::optional<shared_ptr<std::pair<std::string, message_data>>> np_handler::get_message_selected(SceNpBasicAttachmentDataId id)
-	{
-		switch (id)
-		{
-		case SCE_NP_BASIC_SELECTED_INVITATION_DATA:
-			if (!selected_invite_id)
-				return std::nullopt;
-
-			return get_message(*selected_invite_id);
-		case SCE_NP_BASIC_SELECTED_MESSAGE_DATA:
-			if (!selected_message_id)
-				return std::nullopt;
-
-			return get_message(*selected_message_id);
-		default:
-			fmt::throw_exception("get_message_selected with id %d", id);
-		}
-	}
-
-	void np_handler::clear_message_selected(SceNpBasicAttachmentDataId id)
-	{
-		switch (id)
-		{
-		case SCE_NP_BASIC_SELECTED_INVITATION_DATA:
-			selected_invite_id = std::nullopt;
-			break;
-		case SCE_NP_BASIC_SELECTED_MESSAGE_DATA:
-			selected_message_id = std::nullopt;
-			break;
-		default:
-			fmt::throw_exception("clear_message_selected with id %d", id);
-		}
-	}
-
-	void np_handler::send_message(const message_data& msg_data, const std::set<std::string>& npids)
-	{
-		get_rpcn()->send_message(msg_data, npids);
-	}
-
-	void np_handler::operator()()
-	{
-		if (g_cfg.net.psn_status != np_psn_status::psn_rpcn)
-			return;
-
-		while (thread_ctrl::state() != thread_state::aborting && !Emu.IsStopped())
-		{
-			bool sleep = true;
-			if (rpcn)
-			{
-				std::lock_guard lock(mutex_rpcn);
-				if (!rpcn)
-				{
-					continue;
-				}
-
-				auto replies = rpcn->get_replies();
-				for (auto& reply : replies)
-				{
-					const rpcn::CommandType command = static_cast<rpcn::CommandType>(reply.second.first);
-					const u32 req_id      = reply.first;
-					std::vector<u8>& data = reply.second.second;
-
-					// Every reply should at least contain a return value/error code
-					ensure(data.size() >= 1);
-					const auto error = static_cast<rpcn::ErrorType>(data[0]);
-					vec_stream reply_data(data, 1);
-
-					switch (command)
-					{
-					case rpcn::CommandType::GetWorldList: reply_get_world_list(req_id, error, reply_data); break;
-					case rpcn::CommandType::CreateRoom: reply_create_join_room(req_id, error, reply_data); break;
-					case rpcn::CommandType::JoinRoom: reply_join_room(req_id, error, reply_data); break;
-					case rpcn::CommandType::LeaveRoom: reply_leave_room(req_id, error, reply_data); break;
-					case rpcn::CommandType::SearchRoom: reply_search_room(req_id, error, reply_data); break;
-					case rpcn::CommandType::GetRoomDataExternalList: reply_get_roomdata_external_list(req_id, error, reply_data); break;
-					case rpcn::CommandType::SetRoomDataExternal: reply_set_roomdata_external(req_id, error); break;
-					case rpcn::CommandType::GetRoomDataInternal: reply_get_roomdata_internal(req_id, error, reply_data); break;
-					case rpcn::CommandType::SetRoomDataInternal: reply_set_roomdata_internal(req_id, error); break;
-					case rpcn::CommandType::GetRoomMemberDataInternal: reply_get_roommemberdata_internal(req_id, error, reply_data); break;
-					case rpcn::CommandType::SetRoomMemberDataInternal: reply_set_roommemberdata_internal(req_id, error); break;
-					case rpcn::CommandType::SetUserInfo: reply_set_userinfo(req_id, error); break;
-					case rpcn::CommandType::PingRoomOwner: reply_get_ping_info(req_id, error, reply_data); break;
-					case rpcn::CommandType::SendRoomMessage: reply_send_room_message(req_id, error); break;
-					case rpcn::CommandType::RequestSignalingInfos: reply_req_sign_infos(req_id, error, reply_data); break;
-					case rpcn::CommandType::RequestTicket: reply_req_ticket(req_id, error, reply_data); break;
-					case rpcn::CommandType::GetBoardInfos: reply_get_board_infos(req_id, error, reply_data); break;
-					case rpcn::CommandType::RecordScore: reply_record_score(req_id, error, reply_data); break;
-					case rpcn::CommandType::RecordScoreData: reply_record_score_data(req_id, error); break;
-					case rpcn::CommandType::GetScoreData: reply_get_score_data(req_id, error, reply_data); break;
-					case rpcn::CommandType::GetScoreRange: reply_get_score_range(req_id, error, reply_data); break;
-					case rpcn::CommandType::GetScoreFriends: reply_get_score_friends(req_id, error, reply_data); break;
-					case rpcn::CommandType::GetScoreNpid: reply_get_score_npid(req_id, error, reply_data); break;
-					case rpcn::CommandType::TusSetMultiSlotVariable: reply_tus_set_multislot_variable(req_id, error); break;
-					case rpcn::CommandType::TusGetMultiSlotVariable: reply_tus_get_multislot_variable(req_id, error, reply_data); break;
-					case rpcn::CommandType::TusGetMultiUserVariable: reply_tus_get_multiuser_variable(req_id, error, reply_data); break;
-					case rpcn::CommandType::TusGetFriendsVariable: reply_tus_get_friends_variable(req_id, error, reply_data); break;
-					case rpcn::CommandType::TusAddAndGetVariable: reply_tus_add_and_get_variable(req_id, error, reply_data); break;
-					case rpcn::CommandType::TusTryAndSetVariable: reply_tus_try_and_set_variable(req_id, error, reply_data); break;
-					case rpcn::CommandType::TusDeleteMultiSlotVariable: reply_tus_delete_multislot_variable(req_id, error); break;
-					case rpcn::CommandType::TusSetData: reply_tus_set_data(req_id, error); break;
-					case rpcn::CommandType::TusGetData: reply_tus_get_data(req_id, error, reply_data); break;
-					case rpcn::CommandType::TusGetMultiSlotDataStatus: reply_tus_get_multislot_data_status(req_id, error, reply_data); break;
-					case rpcn::CommandType::TusGetMultiUserDataStatus: reply_tus_get_multiuser_data_status(req_id, error, reply_data); break;
-					case rpcn::CommandType::TusGetFriendsDataStatus: reply_tus_get_friends_data_status(req_id, error, reply_data); break;
-					case rpcn::CommandType::TusDeleteMultiSlotData: reply_tus_delete_multislot_data(req_id, error); break;
-					case rpcn::CommandType::CreateRoomGUI: reply_create_room_gui(req_id, error, reply_data); break;
-					case rpcn::CommandType::JoinRoomGUI: reply_join_room_gui(req_id, error, reply_data); break;
-					case rpcn::CommandType::LeaveRoomGUI: reply_leave_room_gui(req_id, error, reply_data); break;
-					case rpcn::CommandType::GetRoomListGUI: reply_get_room_list_gui(req_id, error, reply_data); break;
-					case rpcn::CommandType::SetRoomSearchFlagGUI: reply_set_room_search_flag_gui(req_id, error); break;
-					case rpcn::CommandType::GetRoomSearchFlagGUI: reply_get_room_search_flag_gui(req_id, error, reply_data); break;
-					case rpcn::CommandType::SetRoomInfoGUI: reply_set_room_info_gui(req_id, error); break;
-					case rpcn::CommandType::GetRoomInfoGUI: reply_get_room_info_gui(req_id, error, reply_data); break;
-					case rpcn::CommandType::QuickMatchGUI: reply_quickmatch_gui(req_id, error, reply_data); break;
-					case rpcn::CommandType::SearchJoinRoomGUI: reply_searchjoin_gui(req_id, error, reply_data); break;
-					default: fmt::throw_exception("Unknown reply(%d) received!", command); break;
-					}
-				}
-
-				auto notifications = rpcn->get_notifications();
-				for (auto& notif : notifications)
-				{
-					vec_stream noti_data(notif.second);
-
-					switch (notif.first)
-					{
-					case rpcn::NotificationType::UserJoinedRoom: notif_user_joined_room(noti_data); break;
-					case rpcn::NotificationType::UserLeftRoom: notif_user_left_room(noti_data); break;
-					case rpcn::NotificationType::RoomDestroyed: notif_room_destroyed(noti_data); break;
-					case rpcn::NotificationType::UpdatedRoomDataInternal: notif_updated_room_data_internal(noti_data); break;
-					case rpcn::NotificationType::UpdatedRoomMemberDataInternal: notif_updated_room_member_data_internal(noti_data); break;
-					case rpcn::NotificationType::RoomMessageReceived: notif_room_message_received(noti_data); break;
-					case rpcn::NotificationType::SignalingHelper: notif_signaling_helper(noti_data); break;
-					case rpcn::NotificationType::MemberJoinedRoomGUI: notif_member_joined_room_gui(noti_data); break;
-					case rpcn::NotificationType::MemberLeftRoomGUI: notif_member_left_room_gui(noti_data); break;
-					case rpcn::NotificationType::RoomDisappearedGUI: notif_room_disappeared_gui(noti_data); break;
-					case rpcn::NotificationType::RoomOwnerChangedGUI: notif_room_owner_changed_gui(noti_data); break;
-					case rpcn::NotificationType::UserKickedGUI: notif_user_kicked_gui(noti_data); break;
-					case rpcn::NotificationType::QuickMatchCompleteGUI: notif_quickmatch_complete_gui(noti_data); break;
-					default: fmt::throw_exception("Unknown notification(%d) received!", notif.first); break;
-					}
-				}
-
-				auto presence_updates = rpcn->get_presence_updates();
-				if (basic_handler_registered)
-				{
-					for (auto& [npid, pr_info] : presence_updates)
-					{
-						basic_event to_add{};
-						strcpy_trunc(to_add.from.userId.handle.data, npid);
-						strcpy_trunc(to_add.from.name.data, npid);
-
-						if (std::memcmp(pr_info.pr_com_id.data, basic_handler.context.data, sizeof(pr_info.pr_com_id.data)) == 0)
-						{
-							to_add.event = SCE_NP_BASIC_EVENT_PRESENCE;
-							to_add.data = std::move(pr_info.pr_data);
-						}
-						else
-						{
-							if (basic_handler.context_sensitive && pr_info.online)
-							{
-								to_add.event = SCE_NP_BASIC_EVENT_OUT_OF_CONTEXT;
-							}
-							else
-							{
-								to_add.event = SCE_NP_BASIC_EVENT_OFFLINE;
-							}
-						}
-
-						queue_basic_event(to_add);
-						send_basic_event(to_add.event, 0, 0);
-					}
-				}
-
-				auto messages = rpcn->get_new_messages();
-				if (basic_handler_registered)
-				{
-					for (const auto msg_id : messages)
-					{
-						const auto opt_msg = rpcn->get_message(msg_id);
-						if (!opt_msg)
-						{
-							continue;
-						}
-						const auto& msg = opt_msg.value();
-						if (strncmp(msg->second.commId.data, basic_handler.context.data, sizeof(basic_handler.context.data) - 1) == 0)
-						{
-							u32 event;
-							switch (msg->second.mainType)
-							{
-							case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT:
-							case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_URL_ATTACHMENT:
-								event = SCE_NP_BASIC_EVENT_INCOMING_ATTACHMENT;
-								break;
-							case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE:
-								event = (msg->second.msgFeatures & SCE_NP_BASIC_MESSAGE_FEATURES_BOOTABLE) ? SCE_NP_BASIC_EVENT_INCOMING_BOOTABLE_INVITATION : SCE_NP_BASIC_EVENT_INCOMING_INVITATION;
-								break;
-							case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_CUSTOM_DATA:
-								event = (msg->second.msgFeatures & SCE_NP_BASIC_MESSAGE_FEATURES_BOOTABLE) ? SCE_NP_BASIC_EVENT_INCOMING_BOOTABLE_CUSTOM_DATA_MESSAGE : SCE_NP_BASIC_EVENT_INCOMING_CUSTOM_DATA_MESSAGE;
-								break;
-							case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_GENERAL:
-								event = SCE_NP_BASIC_EVENT_MESSAGE;
-								break;
-							case SCE_NP_BASIC_MESSAGE_MAIN_TYPE_ADD_FRIEND:
-							default:
-								continue;
-							}
-
-							basic_event to_add{};
-							to_add.event = event;
-							to_add.data = msg->second.data;
-							strcpy_trunc(to_add.from.userId.handle.data, msg->first);
-							strcpy_trunc(to_add.from.name.data, msg->first);
-
-							queue_basic_event(std::move(to_add));
-							send_basic_event(event, 0, 0);
-						}
-					}
-				}
-
-				if (!replies.empty() || !notifications.empty() || !presence_updates.empty())
-				{
-					sleep = false;
-				}
-			}
-
-			// TODO: replace with an appropriate semaphore
-			if (sleep)
-			{
-				thread_ctrl::wait_for(200'000);
-				continue;
-			}
-		}
-	}
-
-	bool np_handler::error_and_disconnect(const std::string& error_msg)
-	{
-		rpcn_log.error("%s", error_msg);
-		rpcn.reset();
-
-		return false;
-	}
-
-	u32 np_handler::generate_callback_info(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, SceNpMatching2Event event_type)
-	{
-		callback_info ret;
-
-		const auto ctx = get_match2_context(ctx_id);
-		ensure(ctx);
-
-		const u32 req_id = get_req_id(optParam ? optParam->appReqId : ctx->default_match2_optparam.appReqId);
-
-		ret.ctx_id = ctx_id;
-		ret.cb_arg = (optParam && optParam->cbFuncArg) ? optParam->cbFuncArg : ctx->default_match2_optparam.cbFuncArg;
-		ret.cb     = (optParam && optParam->cbFunc) ? optParam->cbFunc : ctx->default_match2_optparam.cbFunc;
-		ret.event_type = event_type;
-
-		nph_log.trace("Callback used is 0x%x with req_id %d", ret.cb, req_id);
-
-		{
-			std::lock_guard lock(mutex_pending_requests);
-			pending_requests[req_id] = std::move(ret);
-		}
-
-		return req_id;
-	}
-
-	std::optional<np_handler::callback_info> np_handler::take_pending_request(u32 req_id)
-	{
-		std::lock_guard lock(mutex_pending_requests);
-
-		if (!pending_requests.contains(req_id))
-			return std::nullopt;
-
-		const auto cb_info = std::move(::at32(pending_requests, req_id));
-		pending_requests.erase(req_id);
-
-		return cb_info;
-	}
-
-	bool np_handler::abort_request(u32 req_id)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return false;
-
-		cb_info_opt->queue_callback(req_id, 0, SCE_NP_MATCHING2_ERROR_ABORTED, 0);
-
-		return true;
-	}
-
-	event_data& np_handler::allocate_req_result(u32 event_key, u32 max_size, u32 initial_size)
-	{
-		std::lock_guard lock(mutex_match2_req_results);
-		match2_req_results.emplace(std::piecewise_construct, std::forward_as_tuple(event_key), std::forward_as_tuple(np_memory.allocate(max_size), initial_size, max_size));
-		return ::at32(match2_req_results, event_key);
-	}
-
-	player_history& np_handler::get_player_and_set_timestamp(const SceNpId& npid, u64 timestamp)
-	{
-		std::string npid_str = std::string(npid.handle.data);
-
-		if (!players_history.contains(npid_str))
-		{
-			auto [it, success] = players_history.insert(std::make_pair(std::move(npid_str), player_history{.timestamp = timestamp}));
-			ensure(success);
-			return it->second;
-		}
-
-		auto& history = ::at32(players_history, npid_str);
-		history.timestamp = timestamp;
-		return history;
-	}
-
-	constexpr usz MAX_HISTORY_ENTRIES = 200;
-
-	void np_handler::add_player_to_history(const SceNpId* npid, const char* description)
-	{
-		std::lock_guard lock(mutex_history);
-		auto& history = get_player_and_set_timestamp(*npid, get_system_time());
-
-		if (description)
-			history.description = description;
-
-		while (players_history.size() > MAX_HISTORY_ENTRIES)
-		{
-			auto it = std::min_element(players_history.begin(), players_history.end(), [](const auto& a, const auto& b) { return a.second.timestamp < b.second.timestamp; } );
-			players_history.erase(it);
-		}
-
-		save_players_history();
-	}
-
-	u32 np_handler::add_players_to_history(const SceNpId* npids, const char* description, u32 count)
-	{
-		std::lock_guard lock(mutex_history);
-
-		const std::string communication_id_str = std::string(basic_handler.context.data);
-
-		for (u32 i = 0; i < count; i++)
-		{
-			auto& history = get_player_and_set_timestamp(npids[i], get_system_time());
-
-			if (description)
-				history.description = description;
-
-			history.communication_ids.insert(communication_id_str);
-		}
-
-		while (players_history.size() > MAX_HISTORY_ENTRIES)
-		{
-			auto it = std::min_element(players_history.begin(), players_history.end(), [](const auto& a, const auto& b) { return a.second.timestamp < b.second.timestamp; } );
-			players_history.erase(it);
-		}
-
-		save_players_history();
-
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::MISC);
-		send_basic_event(SCE_NP_BASIC_EVENT_ADD_PLAYERS_HISTORY_RESULT, 0, req_id);
-		return req_id;
-	}
-
-	u32 np_handler::get_players_history_count(u32 options)
-	{
-		const bool all_history = (options == SCE_NP_BASIC_PLAYERS_HISTORY_OPTIONS_ALL);
-
-		std::lock_guard lock(mutex_history);
-
-		if (all_history)
-		{
-			return ::size32(players_history);
-		}
-
-		const std::string communication_id_str = std::string(basic_handler.context.data);
-		return static_cast<u32>(std::count_if(players_history.begin(), players_history.end(), [&](const auto& entry)
-			{
-				return entry.second.communication_ids.contains(communication_id_str);
-			}));
-	}
-
-	bool np_handler::get_player_history_entry(u32 options, u32 index, SceNpId* npid)
-	{
-		const bool all_history = (options == SCE_NP_BASIC_PLAYERS_HISTORY_OPTIONS_ALL);
-
-		std::lock_guard lock(mutex_history);
-
-		if (all_history)
-		{
-			auto it = players_history.begin();
-			std::advance(it, index);
-
-			if (it != players_history.end())
-			{
-				string_to_npid(it->first, *npid);
-				return true;
+				host += '.';
 			}
 		}
 		else
 		{
-			const std::string communication_id_str = std::string(basic_handler.context.data);
-
-			// Get the nth element that contains the current communication_id
-			for (auto it = players_history.begin(); it != players_history.end(); it++)
-			{
-				if (it->second.communication_ids.contains(communication_id_str))
-				{
-					if (index == 0)
-					{
-						string_to_npid(it->first, *npid);
-						return true;
-					}
-
-					index--;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	void np_handler::save_players_history()
-	{
-#ifdef _WIN32
-		const std::string path_to_cfg = fs::get_config_dir(true);
-		if (!fs::create_path(path_to_cfg))
-		{
-			nph_log.error("Could not create path: %s", path_to_cfg);
-		}
-#endif
-		fs::file history_file(get_players_history_path(), fs::rewrite);
-		if (!history_file)
-			return;
-
-		YAML::Emitter out;
-
-		out << YAML::BeginMap;
-		for (const auto& [player_npid, player_info] : players_history)
-		{
-			out << player_npid;
-			out << YAML::BeginSeq;
-			out << player_info.timestamp;
-			out << player_info.description;
-			out << YAML::BeginSeq;
-			for (const auto& com_id : player_info.communication_ids)
-			{
-				out << com_id;
-			}
-			out << YAML::EndSeq;
-			out << YAML::EndSeq;
-		}
-		out << YAML::EndMap;
-
-		history_file.write(out.c_str(), out.size());
-	}
-
-	u32 np_handler::get_num_friends()
-	{
-		return get_rpcn()->get_num_friends();
-	}
-
-	u32 np_handler::get_num_blocks()
-	{
-		return get_rpcn()->get_num_blocks();
-	}
-
-	std::pair<error_code, std::optional<SceNpId>> np_handler::get_friend_by_index(u32 index)
-	{
-		auto str_friend = get_rpcn()->get_friend_by_index(index);
-
-		if (!str_friend)
-		{
-			return {SCE_NP_ERROR_ID_NOT_FOUND, {}};
-		}
-
-		SceNpId npid_friend;
-		string_to_npid(str_friend.value(), npid_friend);
-
-		return {CELL_OK, npid_friend};
-	}
-
-	void np_handler::set_presence(std::optional<std::string> status, std::optional<std::vector<u8>> data)
-	{
-		bool send_update = false;
-
-		if (status)
-		{
-			if (status != presence_self.pr_status)
-			{
-				presence_self.pr_status = *status;
-				send_update = true;
-			}
-		}
-
-		if (data)
-		{
-			if (data != presence_self.pr_data)
-			{
-				presence_self.pr_data = *data;
-				send_update = true;
-			}
-		}
-
-		if (is_psn_active && (!presence_self.advertised || send_update))
-		{
-			std::lock_guard lock(mutex_rpcn);
-
-			if (!rpcn)
-			{
-				return;
-			}
-
-			presence_self.advertised = true;
-			rpcn->send_presence(presence_self.pr_com_id, presence_self.pr_title, presence_self.pr_status, presence_self.pr_comment, presence_self.pr_data);
+			host += static_cast<char>(buf[i]);
+			count--;
 		}
 	}
 
-	template <typename T>
-	error_code np_handler::get_friend_presence_by_index(u32 index, SceNpUserInfo* user, T* pres)
+	sys_net.warning("DNS query for %s", host);
+
+	if (switch_map.count(host))
 	{
-		if (!is_psn_active || g_cfg.net.psn_status != np_psn_status::psn_rpcn)
-		{
-			return SCE_NP_BASIC_ERROR_NOT_CONNECTED;
-		}
+		// design fake packet
+		std::vector<u8> fake(len);
+		memcpy(fake.data(), buf, len);
+		dns_header* fake_header = reinterpret_cast<dns_header*>(fake.data());
+		fake_header->qr         = 1;
+		fake_header->ra         = 1;
+		fake_header->ans_count  = 1;
+		fake.insert(fake.end(), {0xC0, 0x0C});             // Ref to name in header
+		fake.insert(fake.end(), {0x00, 0x01});             // IPv4
+		fake.insert(fake.end(), {0x00, 0x01});             // Class?
+		fake.insert(fake.end(), {0x00, 0x00, 0x00, 0x3B}); // TTL
+		fake.insert(fake.end(), {0x00, 0x04});             // Size of data
+		u32 ip     = switch_map[host];
+		u8* ptr_ip = reinterpret_cast<u8*>(&ip);
+		fake.insert(fake.end(), ptr_ip, ptr_ip + 4); // IP
 
-		std::lock_guard lock(mutex_rpcn);
+		sys_net.warning("Solving %s to %d.%d.%d.%d", host, ptr_ip[0], ptr_ip[1], ptr_ip[2], ptr_ip[3]);
 
-		if (!rpcn)
-		{
-			return SCE_NP_BASIC_ERROR_NOT_CONNECTED;
-		}
-
-		auto friend_infos = rpcn->get_friend_presence_by_index(index);
-		if (!friend_infos)
-		{
-			return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-		}
-
-		const bool same_context = (std::memcmp(friend_infos->second.pr_com_id.data, basic_handler.context.data, sizeof(friend_infos->second.pr_com_id.data)) == 0);
-		strings_to_userinfo(friend_infos->first, friend_infos->first, "", *user);
-		onlinedata_to_presencedetails(friend_infos->second, same_context, *pres);
-
-		return CELL_OK;
+		dns_spylist[s].push(std::move(fake));
+		return len;
 	}
 
-	template error_code np_handler::get_friend_presence_by_index<SceNpBasicPresenceDetails>(u32 index, SceNpUserInfo* user, SceNpBasicPresenceDetails* pres);
-	template error_code np_handler::get_friend_presence_by_index<SceNpBasicPresenceDetails2>(u32 index, SceNpUserInfo* user, SceNpBasicPresenceDetails2* pres);
+	return -1;
+}
 
-	template <typename T>
-	error_code np_handler::get_friend_presence_by_npid(const SceNpId& npid, T* pres)
-	{
-		if (!is_psn_active || g_cfg.net.psn_status != np_psn_status::psn_rpcn)
-		{
-			return SCE_NP_BASIC_ERROR_NOT_CONNECTED;
-		}
+bool np_handler::error_and_disconnect(const std::string& error_msg)
+{
+	rpcn_log.error("%s", error_msg);
+	rpcn.disconnect();
 
-		std::lock_guard lock(mutex_rpcn);
-		
-		if (!rpcn)
-		{
-			return SCE_NP_BASIC_ERROR_NOT_CONNECTED;
-		}
+	return false;
+}
 
-		auto friend_infos = rpcn->get_friend_presence_by_npid(std::string(npid.handle.data));
-		if (!friend_infos)
-		{
-			return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
-		}
+u32 np_handler::generate_callback_info(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam)
+{
+	callback_info ret;
 
-		const bool same_context = (std::memcmp(friend_infos->second.pr_com_id.data, basic_handler.context.data, sizeof(friend_infos->second.pr_com_id.data)) == 0);
-		onlinedata_to_presencedetails(friend_infos->second, same_context, *pres);
+	const auto ctx = get_match2_context(ctx_id);
+	ensure(ctx);
 
-		return CELL_OK;
-	}
+	const u32 req_id = get_req_id(optParam ? optParam->appReqId : ctx->default_match2_optparam.appReqId);
 
-	template error_code np_handler::get_friend_presence_by_npid<SceNpBasicPresenceDetails>(const SceNpId& npid, SceNpBasicPresenceDetails* pres);
-	template error_code np_handler::get_friend_presence_by_npid<SceNpBasicPresenceDetails2>(const SceNpId& npid, SceNpBasicPresenceDetails2* pres);
+	ret.ctx_id = ctx_id;
+	ret.cb     = optParam ? optParam->cbFunc : ctx->default_match2_optparam.cbFunc;
+	ret.cb_arg = optParam ? optParam->cbFuncArg : ctx->default_match2_optparam.cbFuncArg;
 
-	std::pair<error_code, std::optional<SceNpId>> np_handler::local_get_npid(u64 room_id, u16 member_id)
-	{
-		return np_cache.get_npid(room_id, member_id);
-	}
+	nph_log.warning("Callback used is 0x%x", ret.cb);
 
-	std::pair<error_code, std::optional<SceNpMatching2SessionPassword>> np_handler::local_get_room_password(SceNpMatching2RoomId room_id)
-	{
-		return np_cache.get_password(room_id);
-	}
+	pending_requests[req_id] = std::move(ret);
 
-	std::pair<error_code, std::optional<SceNpMatching2RoomSlotInfo>> np_handler::local_get_room_slots(SceNpMatching2RoomId room_id)
-	{
-		return np_cache.get_slots(room_id);
-	}
+	return req_id;
+}
 
-	std::pair<error_code, std::vector<SceNpMatching2RoomMemberId>> np_handler::local_get_room_memberids(SceNpMatching2RoomId room_id, s32 sort_method)
-	{
-		return np_cache.get_memberids(room_id, sort_method);
-	}
+u8* np_handler::allocate_req_result(u32 event_key, usz size)
+{
+	std::lock_guard lock(mutex_req_results);
+	match2_req_results[event_key] = std::vector<u8>(size, 0);
+	return match2_req_results[event_key].data();
+}
 
-	error_code np_handler::local_get_room_member_data(SceNpMatching2RoomId room_id, SceNpMatching2RoomMemberId member_id, const std::vector<SceNpMatching2AttributeId>& binattrs_list, SceNpMatching2RoomMemberDataInternal* ptr_member, u32 addr_data, u32 size_data, u32 ctx_id)
-	{
-		auto [include_onlinename, include_avatarurl] = get_match2_context_options(ctx_id);
-		return np_cache.get_member_and_attrs(room_id, member_id, binattrs_list, ptr_member, addr_data, size_data, include_onlinename, include_avatarurl);
-	}
+u32 np_handler::add_players_to_history(vm::cptr<SceNpId> /*npids*/, u32 /*count*/)
+{
+	const u32 req_id = get_req_id(0);
 
-	void np_handler::upnp_add_port_mapping(u16 internal_port, std::string_view protocol)
-	{
-		upnp.add_port_redir(np::ip_to_string(get_local_ip_addr()), internal_port, protocol);
-	}
+	// if (basic_handler)
+	// {
+	// 	sysutil_register_cb([basic_handler = this->basic_handler, req_id, basic_handler_arg = this->basic_handler_arg](ppu_thread& cb_ppu) -> s32
+	// 	{
+	// 		basic_handler(cb_ppu, SCE_NP_BASIC_EVENT_ADD_PLAYERS_HISTORY_RESULT, 0, req_id, basic_handler_arg);
+	// 		return 0;
+	// 	});
+	// }
 
-	void np_handler::upnp_remove_port_mapping(u16 internal_port, std::string_view protocol)
-	{
-		upnp.remove_port_redir(internal_port, protocol);
-	}
-
-	std::pair<bool, bool> np_handler::get_match2_context_options(u32 ctx_id)
-	{
-		bool include_onlinename = false, include_avatarurl = false;
-
-		if (auto ctx = get_match2_context(ctx_id))
-		{
-			include_onlinename = ctx->include_onlinename;
-			include_avatarurl = ctx->include_avatarurl;
-		}
-
-		return {include_onlinename, include_avatarurl};
-	}
-
-	void np_handler::add_gui_request(u32 req_id, u32 ctx_id)
-	{
-		std::lock_guard lock(gui_requests.mutex);
-		ensure(gui_requests.list.insert({req_id, ctx_id}).second);
-	}
-
-	void np_handler::remove_gui_request(u32 req_id)
-	{
-		std::lock_guard lock(gui_requests.mutex);
-		if (gui_requests.list.erase(req_id) != 1)
-		{
-			rpcn_log.error("Failed to erase gui request %d", req_id);
-		}
-	}
-
-	u32 np_handler::take_gui_request(u32 req_id)
-	{
-		std::lock_guard lock(gui_requests.mutex);
-
-		if (!gui_requests.list.contains(req_id))
-		{
-			return 0;
-		}
-
-		const u32 ctx_id = ::at32(gui_requests.list, req_id);
-		gui_requests.list.erase(req_id);
-
-		return ctx_id;
-	}
-
-	shared_ptr<matching_ctx> np_handler::take_pending_gui_request(u32 req_id)
-	{
-		const u32 ctx_id = take_gui_request(req_id);
-
-		if (!ctx_id)
-			return {};
-
-		auto ctx = get_matching_context(ctx_id);
-
-		if (!ctx)
-			return {};
-
-		return ctx;
-	}
-
-} // namespace np
+	return req_id;
+}
diff --git a/rpcs3/Emu/NP/np_handler.h b/rpcs3/Emu/NP/np_handler.h
index c7a086f224..8efbeafef9 100644
--- a/rpcs3/Emu/NP/np_handler.h
+++ b/rpcs3/Emu/NP/np_handler.h
@@ -7,529 +7,211 @@
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/Modules/sceNp.h"
 #include "Emu/Cell/Modules/sceNp2.h"
-#include "Emu/Cell/Modules/cellSysutil.h"
 
 #include "Emu/NP/rpcn_client.h"
-#include "Emu/NP/np_allocator.h"
-#include "Emu/NP/np_cache.h"
-#include "Emu/NP/np_gui_cache.h"
-#include "Emu/NP/np_event_data.h"
-#include "Emu/NP/np_contexts.h"
-#include "Emu/NP/upnp_handler.h"
+#include "generated/np2_structs_generated.h"
+#include "signaling_handler.h"
 
-namespace np
+class np_handler
 {
-	constexpr usz MAX_SceNpMatchingAttr_list_SIZE = ((SCE_NP_MATCHING_ATTR_ID_MAX * 2) * sizeof(SceNpMatchingAttr))
-		+ (SCE_NP_MATCHING_ATTR_BIN_BIG_SIZE_ID_MAX * SCE_NP_MATCHING_ATTR_BIN_MAX_SIZE_BIG) +
-		+ ((SCE_NP_MATCHING_ATTR_ID_MAX - SCE_NP_MATCHING_ATTR_BIN_BIG_SIZE_ID_MAX) * SCE_NP_MATCHING_ATTR_BIN_MAX_SIZE_SMALL);
-	constexpr usz MAX_MEMBERS_PER_ROOM = 64;
-	constexpr usz MAX_ROOMS_PER_GET_ROOM_LIST = 20;
-	constexpr usz MAX_SceNpMatchingRoomStatus_SIZE = sizeof(SceNpMatchingRoomStatus) + (MAX_MEMBERS_PER_ROOM * sizeof(SceNpMatchingRoomMember)) + sizeof(SceNpId);
-	constexpr usz MAX_SceNpMatchingJoinedRoomInfo_SIZE = sizeof(SceNpMatchingJoinedRoomInfo) + (MAX_MEMBERS_PER_ROOM * sizeof(SceNpMatchingRoomMember)) + sizeof(SceNpId);
-	constexpr usz MAX_SceNpMatchingRoomList_SIZE = sizeof(SceNpMatchingRoomList) + MAX_ROOMS_PER_GET_ROOM_LIST * (sizeof(SceNpMatchingRoom) + MAX_SceNpMatchingAttr_list_SIZE);
-	constexpr usz MAX_SceNpMatchingRoom_SIZE = sizeof(SceNpMatchingRoom) + MAX_SceNpMatchingAttr_list_SIZE;
-	constexpr usz MAX_SceNpMatchingSearchJoinRoomInfo_SIZE = sizeof(SceNpMatchingSearchJoinRoomInfo) + MAX_SceNpMatchingAttr_list_SIZE;
+public:
+	np_handler();
 
-	enum class REQUEST_ID_HIGH : u16
+	const std::array<u8, 6>& get_ether_addr() const;
+	const std::string& get_hostname() const;
+	u32 get_local_ip_addr() const;
+	u32 get_public_ip_addr() const;
+	u32 get_dns_ip() const;
+
+	s32 get_psn_status() const;
+	s32 get_net_status() const;
+
+	const SceNpId& get_npid() const;
+	const SceNpOnlineId& get_online_id() const;
+	const SceNpOnlineName& get_online_name() const;
+	const SceNpAvatarUrl& get_avatar_url() const;
+
+	// Public helpers
+	static std::string ip_to_string(u32 addr);
+	static std::string ether_to_string(std::array<u8, 6>& ether);
+	// Helpers for setting various structures from string
+	static void string_to_npid(const std::string&, SceNpId* npid);
+	static void string_to_online_name(const std::string&, SceNpOnlineName* online_name);
+	static void string_to_avatar_url(const std::string&, SceNpAvatarUrl* avatar_url);
+
+	// DNS hooking functions
+	void add_dns_spy(u32 sock);
+	void remove_dns_spy(u32 sock);
+	bool is_dns(u32 sock) const;
+	bool is_dns_queue(u32 sock) const;
+	std::vector<u8> get_dns_packet(u32 sock);
+	s32 analyze_dns_packet(s32 s, const u8* buf, u32 len);
+
+	enum NotificationType : u16
 	{
-		MISC = 0x3333,
-		SCORE = 0x3334,
-		TUS = 0x3335,
-		GUI = 0x3336,
+		UserJoinedRoom,
+		UserLeftRoom,
+		RoomDestroyed,
+		SignalP2PConnect,
+		_SignalP2PDisconnect,
+		RoomMessageReceived,
 	};
 
-	struct ticket_data
+	// handles async messages from server(only needed for RPCN)
+	void operator()();
+
+	void init_NP(u32 poolsize, vm::ptr<void> poolptr);
+	void terminate_NP();
+
+	bool is_netctl_init     = false;
+	bool is_NP_init         = false;
+	bool is_NP_Lookup_init  = false;
+	bool is_NP_Score_init   = false;
+	bool is_NP2_init        = false;
+	bool is_NP2_Match2_init = false;
+	bool is_NP_Auth_init    = false;
+
+	// NP Handlers/Callbacks
+	// Seems to be global
+	vm::ptr<SceNpManagerCallback> manager_cb{};               // Connection status and tickets
+	vm::ptr<void> manager_cb_arg{};
+
+	// Registered by SceNpCommunicationId
+	vm::ptr<SceNpBasicEventHandler> basic_handler;
+	vm::ptr<void> basic_handler_arg;
+
+	// Those should probably be under match2 ctx
+	vm::ptr<SceNpMatching2RoomEventCallback> room_event_cb{}; // Room events
+	u16 room_event_cb_ctx = 0;
+	vm::ptr<void> room_event_cb_arg{};
+	vm::ptr<SceNpMatching2RoomMessageCallback> room_msg_cb{};
+	u16 room_msg_cb_ctx = 0;
+	vm::ptr<void> room_msg_cb_arg{};
+
+	// Synchronous requests
+	std::vector<SceNpMatching2ServerId> get_match2_server_list(SceNpMatching2ContextId);
+	// Asynchronous requests
+	u32 get_server_status(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 server_id);
+	u32 create_server_context(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 server_id);
+	u32 get_world_list(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 server_id);
+	u32 create_join_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2CreateJoinRoomRequest* req);
+	u32 join_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2JoinRoomRequest* req);
+	u32 leave_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2LeaveRoomRequest* req);
+	u32 search_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SearchRoomRequest* req);
+	u32 set_roomdata_external(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SetRoomDataExternalRequest* req);
+	u32 get_roomdata_internal(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2GetRoomDataInternalRequest* req);
+	u32 set_roomdata_internal(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SetRoomDataInternalRequest* req);
+	u32 get_ping_info(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SignalingGetPingInfoRequest* req);
+	u32 send_room_message(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SendRoomMessageRequest* req);
+
+	u32 get_match2_event(SceNpMatching2EventKey event_key, u8* dest, u32 size);
+
+	// Misc stuff
+	void req_ticket(u32 version, const SceNpId *npid, const char *service_id, const u8 *cookie, u32 cookie_size, const char *entitlement_id, u32 consumed_count);
+	const std::vector<u8>& get_ticket() const { return current_ticket; }
+	u32 add_players_to_history(vm::cptr<SceNpId> npids, u32 count);
+
+	// For signaling
+	void req_sign_infos(const std::string& npid, u32 conn_id);
+
+	// Mutex for NP status change
+	shared_mutex mutex_status;
+
+	static constexpr std::string_view thread_name = "NP Handler Thread";
+
+protected:
+	// Various generic helpers
+	bool discover_ip_address();
+	bool discover_ether_address();
+	bool error_and_disconnect(const std::string& error_msg);
+
+	// Notification handlers
+	void notif_user_joined_room(std::vector<u8>& data);
+	void notif_user_left_room(std::vector<u8>& data);
+	void notif_room_destroyed(std::vector<u8>& data);
+	void notif_p2p_connect(std::vector<u8>& data);
+	void notif_room_message_received(std::vector<u8>& data);
+
+	// Reply handlers
+	bool reply_get_world_list(u32 req_id, std::vector<u8>& reply_data);
+	bool reply_create_join_room(u32 req_id, std::vector<u8>& reply_data);
+	bool reply_join_room(u32 req_id, std::vector<u8>& reply_data);
+	bool reply_leave_room(u32 req_id, std::vector<u8>& reply_data);
+	bool reply_search_room(u32 req_id, std::vector<u8>& reply_data);
+	bool reply_set_roomdata_external(u32 req_id, std::vector<u8>& reply_data);
+	bool reply_get_roomdata_internal(u32 req_id, std::vector<u8>& reply_data);
+	bool reply_set_roomdata_internal(u32 req_id, std::vector<u8>& reply_data);
+	bool reply_get_ping_info(u32 req_id, std::vector<u8>& reply_data);
+	bool reply_send_room_message(u32 req_id, std::vector<u8>& reply_data);
+	bool reply_req_sign_infos(u32 req_id, std::vector<u8>& reply_data);
+	bool reply_req_ticket(u32 req_id, std::vector<u8>& reply_data);
+
+	// Helper functions(fb=>np2)
+	void BinAttr_to_SceNpMatching2BinAttr(const flatbuffers::Vector<flatbuffers::Offset<BinAttr>>* fb_attr, vm::ptr<SceNpMatching2BinAttr> binattr_info);
+	void RoomGroup_to_SceNpMatching2RoomGroup(const flatbuffers::Vector<flatbuffers::Offset<RoomGroup>>* fb_group, vm::ptr<SceNpMatching2RoomGroup> group_info);
+	void UserInfo2_to_SceNpUserInfo2(const UserInfo2* user, SceNpUserInfo2* user_info);
+	void SearchRoomReponse_to_SceNpMatching2SearchRoomResponse(const SearchRoomResponse* resp, SceNpMatching2SearchRoomResponse* search_resp);
+	u16 RoomDataInternal_to_SceNpMatching2RoomDataInternal(const RoomDataInternal* resp, SceNpMatching2RoomDataInternal* room_resp, const SceNpId& npid);
+	void RoomMemberUpdateInfo_to_SceNpMatching2RoomMemberUpdateInfo(const RoomMemberUpdateInfo* resp, SceNpMatching2RoomMemberUpdateInfo* room_info);
+	void RoomUpdateInfo_to_SceNpMatching2RoomUpdateInfo(const RoomUpdateInfo* update_info, SceNpMatching2RoomUpdateInfo* sce_update_info);
+	void GetPingInfoResponse_to_SceNpMatching2SignalingGetPingInfoResponse(const GetPingInfoResponse* resp, SceNpMatching2SignalingGetPingInfoResponse* sce_resp);
+	void RoomMessageInfo_to_SceNpMatching2RoomMessageInfo(const RoomMessageInfo* mi, SceNpMatching2RoomMessageInfo* sce_mi);
+
+	struct callback_info
 	{
-		u16 id{}, len{};
-
-		struct
-		{
-			u32 data_u32{};
-			u64 data_u64{};
-			std::vector<u8> data_vec;
-			std::vector<ticket_data> data_nodes;
-		} data;
+		SceNpMatching2ContextId ctx_id;
+		vm::ptr<SceNpMatching2RequestCallback> cb;
+		vm::ptr<void> cb_arg;
 	};
+	u32 generate_callback_info(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam);
 
-	struct player_history
+	std::unordered_map<u32, callback_info> pending_requests;
+	std::unordered_map<u32, u32> pending_sign_infos_requests;
+
+protected:
+	bool is_connected  = false;
+	bool is_psn_active = false;
+
+	std::vector<u8> current_ticket;
+
+	// IP & DNS info
+	std::string hostname = "localhost";
+	std::array<u8, 6> ether_address{};
+	be_t<u32> local_ip_addr{};
+	be_t<u32> public_ip_addr{};
+	be_t<u32> dns_ip = 0x08080808;
+
+	// User infos
+	SceNpId npid{};
+	SceNpOnlineName online_name{};
+	SceNpAvatarUrl avatar_url{};
+
+	// DNS related
+	std::map<s32, std::queue<std::vector<u8>>> dns_spylist{};
+	std::map<std::string, u32> switch_map{};
+
+	// Memory pool for sceNp/sceNp2
+	vm::ptr<void> mpool{};
+	u32 mpool_size  = 0;
+	u32 mpool_avail = 0;
+	std::map<u32, u32> mpool_allocs{}; // offset/size
+	vm::addr_t allocate(u32 size);
+
+	// Requests(reqEventKey : data)
+	std::unordered_map<u32, std::vector<u8>> match2_req_results{};
+	atomic_t<u16> match2_low_reqid_cnt = 1;
+	atomic_t<u32> match2_event_cnt     = 1;
+	u32 get_req_id(u16 app_req)
 	{
-		u64 timestamp{};
-		std::set<std::string> communication_ids;
-		std::string description;
-	};
-
-	class ticket
+		return ((app_req << 16) | match2_low_reqid_cnt.fetch_add(1));
+	}
+	u32 get_event_key()
 	{
-	public:
-		ticket() = default;
-		ticket(std::vector<u8>&& raw_data);
-
-		std::size_t size() const;
-		const u8* data() const;
-		bool empty() const;
-
-		bool get_value(s32 param_id, vm::ptr<SceNpTicketParam> param) const;
-
-	private:
-		std::optional<ticket_data> parse_node(std::size_t index) const;
-		void parse();
-
-	private:
-		static constexpr std::size_t MIN_TICKET_DATA_SIZE = 4;
-
-		std::vector<u8> raw_data;
-
-		bool parse_success = false;
-		u32 version{};
-		std::vector<ticket_data> nodes;
-	};
-
-	struct basic_event
-	{
-		s32 event = 0;
-		SceNpUserInfo from{};
-		std::vector<u8> data;
-	};
-
-	class np_handler
-	{
-	public:
-		SAVESTATE_INIT_POS(5);
-
-		np_handler();
-		~np_handler();
-		np_handler(utils::serial& ar);
-		void save(utils::serial& ar);
-
-		void init_np_handler_dependencies();
-		const std::array<u8, 6>& get_ether_addr() const;
-		const std::string& get_hostname() const;
-		u32 get_local_ip_addr() const;
-		u32 get_public_ip_addr() const;
-		u32 get_dns_ip() const;
-		u32 get_bind_ip() const;
-
-		s32 get_psn_status() const;
-		s32 get_net_status() const;
-		s32 get_upnp_status() const;
-
-		const SceNpId& get_npid() const;
-		const SceNpOnlineId& get_online_id() const;
-		const SceNpOnlineName& get_online_name() const;
-		const SceNpAvatarUrl& get_avatar_url() const;
-
-		// handles async messages from server(only needed for RPCN)
-		void operator()();
-
-		void init_NP(u32 poolsize, vm::ptr<void> poolptr);
-		void terminate_NP();
-
-		atomic_t<bool> is_netctl_init     = false;
-		atomic_t<bool> is_NP_init         = false;
-		atomic_t<bool> is_NP_Lookup_init  = false;
-		atomic_t<bool> is_NP_Score_init   = false;
-		atomic_t<bool> is_NP2_init        = false;
-		atomic_t<bool> is_NP2_Match2_init = false;
-		atomic_t<bool> is_NP_Auth_init    = false;
-		atomic_t<bool> is_NP_TUS_init     = false; // TODO: savestate
-		atomic_t<bool> is_NP_Com2_init    = false; // TODO: savestate
-
-		// NP Handlers/Callbacks
-		// Seems to be global
-		vm::ptr<SceNpManagerCallback> manager_cb{}; // Connection status and tickets
-		vm::ptr<void> manager_cb_arg{};
-
-		atomic_t<bool> basic_handler_registered = false;
-
-		void register_basic_handler(vm::cptr<SceNpCommunicationId> context, vm::ptr<SceNpBasicEventHandler> handler, vm::ptr<void> arg, bool context_sensitive);
-		SceNpCommunicationId get_basic_handler_context();
-		void queue_basic_event(basic_event to_queue);
-		bool send_basic_event(s32 event, s32 retCode, u32 reqId);
-		error_code get_basic_event(vm::ptr<s32> event, vm::ptr<SceNpUserInfo> from, vm::ptr<u8> data, vm::ptr<u32> size);
-
-		// Messages-related functions
-		std::optional<shared_ptr<std::pair<std::string, message_data>>> get_message(u64 id);
-		void set_message_selected(SceNpBasicAttachmentDataId id, u64 msg_id);
-		std::optional<shared_ptr<std::pair<std::string, message_data>>> get_message_selected(SceNpBasicAttachmentDataId id);
-		void clear_message_selected(SceNpBasicAttachmentDataId id);
-		void send_message(const message_data& msg_data, const std::set<std::string>& npids);
-
-		// Those should probably be under match2 ctx
-		vm::ptr<SceNpMatching2RoomEventCallback> room_event_cb{}; // Room events
-		u16 room_event_cb_ctx = 0;
-		vm::ptr<void> room_event_cb_arg{};
-		vm::ptr<SceNpMatching2RoomMessageCallback> room_msg_cb{};
-		u16 room_msg_cb_ctx = 0;
-		vm::ptr<void> room_msg_cb_arg{};
-
-		// Synchronous requests
-		std::vector<SceNpMatching2ServerId> get_match2_server_list(SceNpMatching2ContextId);
-		u64 get_network_time();
-		// Asynchronous requests
-		u32 get_server_status(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 server_id);
-		u32 create_server_context(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 server_id);
-		u32 delete_server_context(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 server_id);
-		u32 get_world_list(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 server_id);
-		u32 create_join_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2CreateJoinRoomRequest* req);
-		u32 join_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2JoinRoomRequest* req);
-		u32 leave_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2LeaveRoomRequest* req);
-		u32 search_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SearchRoomRequest* req);
-		u32 get_roomdata_external_list(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2GetRoomDataExternalListRequest* req);
-		u32 set_roomdata_external(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SetRoomDataExternalRequest* req);
-		u32 get_roomdata_internal(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2GetRoomDataInternalRequest* req);
-		u32 set_roomdata_internal(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SetRoomDataInternalRequest* req);
-		u32 get_roommemberdata_internal(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2GetRoomMemberDataInternalRequest* req);
-		u32 set_roommemberdata_internal(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SetRoomMemberDataInternalRequest* req);
-		u32 set_userinfo(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SetUserInfoRequest* req);
-		u32 get_ping_info(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SignalingGetPingInfoRequest* req);
-		u32 send_room_message(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SendRoomMessageRequest* req);
-		u32 get_lobby_info_list(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2GetLobbyInfoListRequest* req);
-
-		u32 get_match2_event(SceNpMatching2EventKey event_key, u32 dest_addr, u32 size);
-
-		// Old GUI Matching requests
-		error_code get_matching_result(u32 ctx_id, u32 req_id, vm::ptr<void> buf, vm::ptr<u32> size, vm::ptr<s32> event);
-		error_code get_result_gui(vm::ptr<void> buf, vm::ptr<u32> size, vm::ptr<s32> event);
-		error_code create_room_gui(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg);
-		error_code join_room_gui(u32 ctx_id, vm::ptr<SceNpRoomId> roomid, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg);
-		error_code leave_room_gui(u32 ctx_id, vm::cptr<SceNpRoomId> roomid);
-		error_code get_room_list_gui(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::ptr<SceNpMatchingReqRange> range, vm::ptr<SceNpMatchingSearchCondition> cond, vm::ptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg, bool limit);
-		error_code set_room_search_flag_gui(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, s32 flag);
-		error_code get_room_search_flag_gui(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id);
-		error_code set_room_info_gui(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr);
-		error_code get_room_info_gui(u32 ctx_id, vm::ptr<SceNpLobbyId> lobby_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr);
-		error_code quickmatch_gui(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpMatchingSearchCondition> cond, s32 available_num, s32 timeout, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg);
-		error_code searchjoin_gui(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpMatchingSearchCondition> cond, vm::cptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg);
-
-		void set_current_gui_ctx_id(u32 id);
-
-		// Score requests
-		void transaction_async_handler(std::unique_lock<shared_mutex> lock, const shared_ptr<generic_async_transaction_context>& trans_ctx, u32 req_id, bool async);
-		void get_board_infos(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, vm::ptr<SceNpScoreBoardInfo> boardInfo, bool async);
-		void record_score(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, SceNpScoreValue score, vm::cptr<SceNpScoreComment> scoreComment, const u8* data, u32 data_size, vm::ptr<SceNpScoreRankNumber> tmpRank, bool async);
-		void record_score_data(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, SceNpScoreValue score, u32 totalSize, u32 sendSize, const u8* score_data, bool async);
-		void get_score_data(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, const SceNpId& npId, vm::ptr<u32> totalSize, u32 recvSize, vm::ptr<void> score_data, bool async);
-		void get_score_range(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, SceNpScoreRankNumber startSerialRank, vm::ptr<SceNpScoreRankData> rankArray, u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, bool async, bool deprecated);
-		void get_score_npid(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, const std::vector<std::pair<SceNpId, s32>>& npid_vec, vm::ptr<SceNpScorePlayerRankData> rankArray, u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, bool async, bool deprecated);
-		void get_score_friend(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, bool include_self, vm::ptr<SceNpScoreRankData> rankArray, u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, bool async, bool deprecated);
-
-		// TUS requests
-		void tus_set_multislot_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::cptr<s64> variableArray, s32 arrayNum, bool vuser, bool async);
-		void tus_get_multislot_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusVariable> variableArray, s32 arrayNum, bool vuser, bool async);
-		void tus_get_multiuser_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, std::vector<SceNpOnlineId> targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusVariable> variableArray, s32 arrayNum, bool vuser, bool async);
-		void tus_get_friends_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusVariable> variableArray,s32 arrayNum, bool async);
-		void tus_add_and_get_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr<SceNpTusVariable> outVariable, vm::ptr<SceNpTusAddAndGetVariableOptParam> option, bool vuser, bool async);
-		void tus_try_and_set_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr<SceNpTusVariable> resultVariable, vm::ptr<SceNpTusTryAndSetVariableOptParam> option, bool vuser, bool async);
-		void tus_delete_multislot_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, bool vuser, bool async);
-		void tus_set_data(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr<void> data, vm::cptr<SceNpTusDataInfo> info, vm::ptr<SceNpTusSetDataOptParam> option, bool vuser, bool async);
-		void tus_get_data(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> dataStatus, vm::ptr<void> data, u32 recvSize, bool vuser, bool async);
-		void tus_get_multislot_data_status(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusDataStatus> statusArray, s32 arrayNum, bool vuser, bool async);
-		void tus_get_multiuser_data_status(shared_ptr<tus_transaction_ctx>& trans_ctx, std::vector<SceNpOnlineId> targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> statusArray, s32 arrayNum, bool vuser, bool async);
-		void tus_get_friends_data_status(shared_ptr<tus_transaction_ctx>& trans_ctx, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusDataStatus> statusArray, s32 arrayNum, bool async);
-		void tus_delete_multislot_data(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, bool vuser, bool async);
-
-		// Local functions
-		std::pair<error_code, std::optional<SceNpId>> local_get_npid(u64 room_id, u16 member_id);
-		std::pair<error_code, std::optional<SceNpMatching2RoomSlotInfo>> local_get_room_slots(SceNpMatching2RoomId room_id);
-		std::pair<error_code, std::optional<SceNpMatching2SessionPassword>> local_get_room_password(SceNpMatching2RoomId room_id);
-		std::pair<error_code, std::vector<SceNpMatching2RoomMemberId>> local_get_room_memberids(SceNpMatching2RoomId room_id, s32 sort_method);
-		error_code local_get_room_member_data(SceNpMatching2RoomId room_id, SceNpMatching2RoomMemberId member_id, const std::vector<SceNpMatching2AttributeId>& binattrs_list, SceNpMatching2RoomMemberDataInternal* ptr_member, u32 addr_data, u32 size_data, u32 ctx_id);
-
-		// Local GUI functions
-		error_code get_room_member_list_local_gui(u32 ctx_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<u32> buflen, vm::ptr<void> buf);
-
-		// Friend stuff
-		u32 get_num_friends();
-		u32 get_num_blocks();
-		std::pair<error_code, std::optional<SceNpId>> get_friend_by_index(u32 index);
-		void set_presence(std::optional<std::string> status, std::optional<std::vector<u8>> data);
-
-		template <typename T>
-		error_code get_friend_presence_by_index(u32 index, SceNpUserInfo* user, T* pres);
-
-		template <typename T>
-		error_code get_friend_presence_by_npid(const SceNpId& npid, T* pres);
-
-		// Misc stuff
-		void req_ticket(u32 version, const SceNpId* npid, const char* service_id, const u8* cookie, u32 cookie_size, const char* entitlement_id, u32 consumed_count);
-		const ticket& get_ticket() const;
-		void add_player_to_history(const SceNpId* npid, const char* description);
-		u32 add_players_to_history(const SceNpId* npids, const char* description, u32 count);
-		u32 get_players_history_count(u32 options);
-		bool get_player_history_entry(u32 options, u32 index, SceNpId* npid);
-		bool abort_request(u32 req_id);
-
-		// For signaling
-		void req_sign_infos(const std::string& npid, u32 conn_id);
-
-		// For UPNP
-		void upnp_add_port_mapping(u16 internal_port, std::string_view protocol);
-		void upnp_remove_port_mapping(u16 internal_port, std::string_view protocol);
-
-		// For custom menu
-		struct custom_menu_action
-		{
-			s32 id   = 0;
-			u32 mask = SCE_NP_CUSTOM_MENU_ACTION_MASK_ME;
-			std::string name;
-		};
-		shared_mutex mutex_custom_menu;
-		bool custom_menu_registered = false;
-		vm::ptr<SceNpCustomMenuEventHandler> custom_menu_handler{};
-		vm::ptr<void> custom_menu_user_arg{};
-		std::vector<custom_menu_action> custom_menu_actions;
-		SceNpCustomMenuIndexArray custom_menu_activation{};
-		std::vector<SceNpCustomMenuActionExceptions> custom_menu_exception_list{};
-
-		// Mutex for NP status change
-		shared_mutex mutex_status;
-
-		static constexpr std::string_view thread_name = "NP Handler Thread";
-
-	private:
-		// Various generic helpers
-		bool discover_ip_address();
-		bool discover_ether_address();
-		bool error_and_disconnect(const std::string& error_msg);
-
-		// Notification handlers
-		void notif_user_joined_room(vec_stream& noti);
-		void notif_user_left_room(vec_stream& noti);
-		void notif_room_destroyed(vec_stream& noti);
-		void notif_updated_room_data_internal(vec_stream& noti);
-		void notif_updated_room_member_data_internal(vec_stream& noti);
-		void notif_signaling_helper(vec_stream& noti);
-		void notif_room_message_received(vec_stream& noti);
-
-		void generic_gui_notification_handler(vec_stream& noti, std::string_view name, s32 notification_type);
-
-		void notif_member_joined_room_gui(vec_stream& noti);
-		void notif_member_left_room_gui(vec_stream& noti);
-		void notif_room_disappeared_gui(vec_stream& noti);
-		void notif_room_owner_changed_gui(vec_stream& noti);
-		void notif_user_kicked_gui(vec_stream& noti);
-		void notif_quickmatch_complete_gui(vec_stream& noti);
-
-		// Reply handlers
-		void reply_get_world_list(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_create_join_room(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_join_room(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_leave_room(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_search_room(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_get_roomdata_external_list(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_set_roomdata_external(u32 req_id, rpcn::ErrorType error);
-		void reply_get_roomdata_internal(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_set_roomdata_internal(u32 req_id, rpcn::ErrorType error);
-		void reply_set_roommemberdata_internal(u32 req_id, rpcn::ErrorType error);
-		void reply_get_roommemberdata_internal(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_set_userinfo(u32 req_id, rpcn::ErrorType error);
-		void reply_get_ping_info(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_send_room_message(u32 req_id, rpcn::ErrorType error);
-		void reply_req_sign_infos(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_req_ticket(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_get_board_infos(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_record_score(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_record_score_data(u32 req_id, rpcn::ErrorType error);
-		void reply_get_score_data(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_get_score_range(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_get_score_friends(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_get_score_npid(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_tus_set_multislot_variable(u32 req_id, rpcn::ErrorType error);
-		void reply_tus_get_multislot_variable(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_tus_get_multiuser_variable(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_tus_get_friends_variable(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_tus_add_and_get_variable(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_tus_try_and_set_variable(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_tus_delete_multislot_variable(u32 req_id, rpcn::ErrorType error);
-		void reply_tus_set_data(u32 req_id, rpcn::ErrorType error);
-		void reply_tus_get_data(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_tus_get_multislot_data_status(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_tus_get_multiuser_data_status(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_tus_get_friends_data_status(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_tus_delete_multislot_data(u32 req_id, rpcn::ErrorType error);
-		void reply_create_room_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_join_room_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_leave_room_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_get_room_list_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_set_room_search_flag_gui(u32 req_id, rpcn::ErrorType error);
-		void reply_get_room_search_flag_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_set_room_info_gui(u32 req_id, rpcn::ErrorType error);
-		void reply_get_room_info_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_quickmatch_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void reply_searchjoin_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-
-		// Helper functions
-		std::pair<bool, bool> get_match2_context_options(u32 ctx_id);
-		void handle_GetScoreResponse(u32 req_id, rpcn::ErrorType error, vec_stream& reply, bool simple_result = false);
-		void handle_tus_no_data(u32 req_id, rpcn::ErrorType error);
-		void handle_TusVarResponse(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void handle_TusVariable(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-		void handle_TusDataStatusResponse(u32 req_id, rpcn::ErrorType error, vec_stream& reply);
-
-		struct callback_info
-		{
-			SceNpMatching2ContextId ctx_id;
-			vm::ptr<SceNpMatching2RequestCallback> cb;
-			vm::ptr<void> cb_arg;
-			SceNpMatching2Event event_type;
-
-			void queue_callback(u32 req_id, u32 event_key, s32 error_code, u32 data_size) const
-			{
-				if (cb)
-				{
-					sysutil_register_cb([=, ctx_id = this->ctx_id, event_type = this->event_type, cb = this->cb, cb_arg = this->cb_arg](ppu_thread& cb_ppu) -> s32
-					{
-						cb(cb_ppu, ctx_id, req_id, event_type, event_key, error_code, data_size, cb_arg);
-						return 0;
-					});
-				}
-			}
-		};
-
-		u32 generate_callback_info(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, SceNpMatching2Event event_type);
-		std::optional<callback_info> take_pending_request(u32 req_id);
-
-	private:
-		shared_mutex mutex_pending_requests;
-		std::unordered_map<u32, callback_info> pending_requests;
-		shared_mutex mutex_pending_sign_infos_requests;
-		std::unordered_map<u32, u32> pending_sign_infos_requests;
-
-		shared_mutex mutex_queue_basic_events;
-		std::queue<basic_event> queue_basic_events;
-
-		bool m_inited_np_handler_dependencies = false;
-
-		// Basic event handler;
-		struct
-		{
-			shared_mutex mutex;
-			SceNpCommunicationId context{};
-			vm::ptr<SceNpBasicEventHandler> handler_func;
-			vm::ptr<void> handler_arg;
-			bool context_sensitive = false;
-		} basic_handler;
-
-		bool is_connected  = false;
-		bool is_psn_active = false;
-
-		ticket current_ticket;
-
-		// IP & DNS info
-		std::string hostname = "localhost";
-		std::array<u8, 6> ether_address{};
-		be_t<u32> local_ip_addr{};
-		be_t<u32> public_ip_addr{};
-		be_t<u32> dns_ip = 0x08080808;
-		be_t<u32> bind_ip = 0x00000000;
-
-		// User infos
-		SceNpId npid{};
-		SceNpOnlineName online_name{};
-		SceNpAvatarUrl avatar_url{};
-
-		// Memory pool for sceNp/sceNp2
-		memory_allocator np_memory;
-
-		// Cache related
-		std::optional<SceNpMatching2SessionPassword> cached_cj_password;
-		cache_manager np_cache;
-		gui_cache_manager gui_cache;
-
-		// Messages related
-		std::optional<u64> selected_invite_id{};
-		std::optional<u64> selected_message_id{};
-
-		// Misc
-		s64 network_time_offset = 0;
-
-		// Requests(reqEventKey : data)
-		shared_mutex mutex_match2_req_results;
-		std::unordered_map<u32, event_data> match2_req_results;
-		atomic_t<u16> match2_low_reqid_cnt = 1;
-		atomic_t<u32> match2_event_cnt     = 1;
-		u32 get_req_id(u16 app_req)
-		{
-			return ((app_req << 16) | match2_low_reqid_cnt.fetch_add(1));
-		}
-
-		u32 get_req_id(REQUEST_ID_HIGH int_req)
-		{
-			return ((static_cast<u16>(int_req) << 16) | match2_low_reqid_cnt.fetch_add(1));
-		}
-
-		u32 get_event_key()
-		{
-			return match2_event_cnt.fetch_add(1);
-		}
-		event_data& allocate_req_result(u32 event_key, u32 max_size, u32 initial_size);
-
-		// GUI result
-		struct
-		{
-			shared_mutex mutex;
-			s32 event = 0;
-			event_data data;
-		} gui_result;
-
-		void set_gui_result(s32 event, event_data data);
-
-		// GUI notifications
-		struct gui_notification
-		{
-			s32 event = 0;
-			event_data edata;
-		};
-
-		struct
-		{
-			shared_mutex mutex;
-			std::map<std::pair<u32, u32>, gui_notification> list; // (ctx_id, req_id), notif
-			u32 counter_req_id = 1;
-			u32 current_gui_ctx_id = 0;
-		} gui_notifications;
-
-		// Async transaction threads
-		shared_mutex mutex_async_transactions;
-		std::unordered_map<u32, shared_ptr<generic_async_transaction_context>> async_transactions; // (req_id, transaction_ctx)
-
-		// RPCN
-		shared_mutex mutex_rpcn;
-		std::shared_ptr<rpcn::rpcn_client> rpcn;
-		std::shared_ptr<rpcn::rpcn_client> get_rpcn();
-
-		// UPNP
-		upnp_handler upnp;
-
-		// Presence
-		struct
-		{
-			SceNpCommunicationId pr_com_id;
-			std::string pr_title;
-			std::string pr_status;
-			std::string pr_comment;
-			std::vector<u8> pr_data;
-			atomic_t<bool> advertised = false;
-		} presence_self;
-
-		player_history& get_player_and_set_timestamp(const SceNpId& npid, u64 timestamp);
-		void save_players_history();
-
-		shared_mutex mutex_history;
-		std::map<std::string, player_history> players_history; // npid / history
-
-		struct
-		{
-			shared_mutex mutex;
-			std::map<u32, u32> list; // req_id / ctx_id
-		} gui_requests;
-
-		void add_gui_request(u32 req_id, u32 ctx_id);
-		void remove_gui_request(u32 req_id);
-		u32 take_gui_request(u32 req_id);
-		shared_ptr<matching_ctx> take_pending_gui_request(u32 req_id);
-
-		shared_mutex mutex_quickmatching;
-		std::map<SceNpRoomId, u32> pending_quickmatching;
-	};
-} // namespace np
+		return match2_event_cnt.fetch_add(1);
+	}
+	shared_mutex mutex_req_results;
+	u8* allocate_req_result(u32 event_key, usz size);
+
+	// RPCN
+	rpcn_client rpcn;
+};
diff --git a/rpcs3/Emu/NP/np_helpers.cpp b/rpcs3/Emu/NP/np_helpers.cpp
deleted file mode 100644
index 641a15dde3..0000000000
--- a/rpcs3/Emu/NP/np_helpers.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "stdafx.h"
-#include "util/types.hpp"
-#include "Utilities/StrUtil.h"
-#include "rpcn_client.h"
-
-#ifdef _WIN32
-#include <WS2tcpip.h>
-#endif
-
-namespace np
-{
-	std::string ip_to_string(u32 ip_addr)
-	{
-		char ip_str[16]{};
-
-		inet_ntop(AF_INET, &ip_addr, ip_str, sizeof(ip_str));
-		return std::string(ip_str);
-	}
-
-	std::string ether_to_string(std::array<u8, 6>& ether)
-	{
-		return fmt::format("%02X:%02X:%02X:%02X:%02X:%02X", ether[0], ether[1], ether[2], ether[3], ether[4], ether[5]);
-	}
-
-	std::string communication_id_to_string(const SceNpCommunicationId& communicationId)
-	{
-		return fmt::format("%s_%02d", communicationId.data, communicationId.num);
-	}
-
-	void strings_to_userinfo(std::string_view npid, std::string_view online_name, std::string_view avatar_url, SceNpUserInfo& user_info)
-	{
-		memset(&user_info, 0, sizeof(user_info));
-		strcpy_trunc(user_info.userId.handle.data, npid);
-		strcpy_trunc(user_info.name.data, online_name);
-		strcpy_trunc(user_info.icon.data, avatar_url);
-	}
-
-	template <typename T>
-	void onlinedata_to_presencedetails(const rpcn::friend_online_data& data, bool same_context, T& details)
-	{
-		memset(&details, 0, sizeof(T));
-		details.state = data.online ? (same_context ? SCE_NP_BASIC_PRESENCE_STATE_IN_CONTEXT : SCE_NP_BASIC_PRESENCE_STATE_OUT_OF_CONTEXT) : SCE_NP_BASIC_PRESENCE_STATE_OFFLINE;
-		strcpy_trunc(details.title, data.pr_title);
-		strcpy_trunc(details.status, data.pr_status);
-		strcpy_trunc(details.comment, data.pr_comment);
-		details.size = std::min<u32>(::size32(data.pr_data), SCE_NP_BASIC_MAX_PRESENCE_SIZE);
-		std::memcpy(details.data, data.pr_data.data(), details.size);
-
-		if constexpr (std::is_same_v<T, SceNpBasicPresenceDetails2>)
-		{
-			details.struct_size = sizeof(SceNpBasicPresenceDetails2);
-		}
-	}
-
-	template void onlinedata_to_presencedetails<SceNpBasicPresenceDetails>(const rpcn::friend_online_data& data, bool same_context, SceNpBasicPresenceDetails& details);
-	template void onlinedata_to_presencedetails<SceNpBasicPresenceDetails2>(const rpcn::friend_online_data& data, bool same_context, SceNpBasicPresenceDetails2& details);
-
-	void string_to_npid(std::string_view str, SceNpId& npid)
-	{
-		memset(&npid, 0, sizeof(npid));
-		strcpy_trunc(npid.handle.data, str);
-		// npid->reserved[0] = 1;
-	}
-
-	void string_to_online_name(std::string_view str, SceNpOnlineName& online_name)
-	{
-		memset(&online_name, 0, sizeof(online_name));
-		strcpy_trunc(online_name.data, str);
-	}
-
-	void string_to_avatar_url(std::string_view str, SceNpAvatarUrl& avatar_url)
-	{
-		memset(&avatar_url, 0, sizeof(avatar_url));
-		strcpy_trunc(avatar_url.data, str);
-	}
-
-	void string_to_communication_id(std::string_view str, SceNpCommunicationId& comm_id)
-	{
-		memset(&comm_id, 0, sizeof(comm_id));
-		strcpy_trunc(comm_id.data, str);
-	}
-
-	bool is_valid_npid(const SceNpId& npid)
-	{
-		if (!std::all_of(npid.handle.data, npid.handle.data + 16, [](char c) { return std::isalnum(c) || c == '-' || c == '_' || c == 0; } )
-			|| npid.handle.data[16] != 0
-			|| !std::all_of(npid.handle.dummy, npid.handle.dummy + 3, [](char val) { return val == 0; }) )
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	bool is_same_npid(const SceNpId& npid_1, const SceNpId& npid_2)
-	{
-		// Unknown what this constant means
-		// if (id1->reserved[0] != 1 || id2->reserved[0] != 1)
-		// {
-		// 	return SCE_NP_UTIL_ERROR_INVALID_NP_ID;
-		// }
-
-		if (strncmp(npid_1.handle.data, npid_2.handle.data, 16) == 0) // || id1->unk1[0] != id2->unk1[0])
-		{
-			return true;
-		}
-
-		// if (id1->unk1[1] != id2->unk1[1])
-		// {
-		// 	// If either is zero they match
-		// 	if (id1->opt[4] && id2->opt[4])
-		// 	{
-		// 		return SCE_NP_UTIL_ERROR_NOT_MATCH;
-		// 	}
-		// }
-
-		return false;
-	}
-}
diff --git a/rpcs3/Emu/NP/np_helpers.h b/rpcs3/Emu/NP/np_helpers.h
deleted file mode 100644
index a90f5d144c..0000000000
--- a/rpcs3/Emu/NP/np_helpers.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-#include "Emu/Cell/Modules/sceNp.h"
-#include "rpcn_client.h"
-
-namespace np
-{
-	std::string ip_to_string(u32 addr);
-	std::string ether_to_string(std::array<u8, 6>& ether);
-	std::string communication_id_to_string(const SceNpCommunicationId& communicationId);
-
-	void string_to_npid(std::string_view str, SceNpId& npid);
-	void string_to_online_name(std::string_view str, SceNpOnlineName& online_name);
-	void string_to_avatar_url(std::string_view str, SceNpAvatarUrl& avatar_url);
-	void string_to_communication_id(std::string_view str, SceNpCommunicationId& comm_id);
-	void strings_to_userinfo(std::string_view npid, std::string_view online_name, std::string_view avatar_url, SceNpUserInfo& user_info);
-
-	template <typename T>
-	void onlinedata_to_presencedetails(const rpcn::friend_online_data& data, bool same_context, T& details);
-
-	bool is_valid_npid(const SceNpId& npid);
-	bool is_same_npid(const SceNpId& npid_1, const SceNpId& npid_2);
-}
diff --git a/rpcs3/Emu/NP/np_notifications.cpp b/rpcs3/Emu/NP/np_notifications.cpp
deleted file mode 100644
index 55b74ec761..0000000000
--- a/rpcs3/Emu/NP/np_notifications.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-#include "stdafx.h"
-#include "Emu/Cell/PPUCallback.h"
-#include "Emu/Cell/Modules/cellSysutil.h"
-#include "Emu/IdManager.h"
-#include "Emu/NP/np_handler.h"
-#include "Emu/NP/np_helpers.h"
-#include "Emu/NP/np_structs_extra.h"
-#include "Emu/NP/fb_helpers.h"
-#include "Emu/NP/signaling_handler.h"
-#include "Emu/NP/ip_address.h"
-
-LOG_CHANNEL(rpcn_log, "rpcn");
-
-namespace np
-{
-	void np_handler::notif_user_joined_room(vec_stream& noti)
-	{
-		const auto* notification = noti.get_flatbuffer<NotificationUserJoinedRoom>();
-
-		if (noti.is_error())
-		{
-			rpcn_log.error("Received faulty UserJoinedRoom notification");
-			return;
-		}
-
-		ensure(notification->update_info());
-
-		const u32 event_key = get_event_key();
-		const auto [include_onlinename, include_avatarurl] = get_match2_context_options(room_event_cb_ctx);
-		const auto room_id = notification->room_id();
-
-		auto& edata      = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_RoomMemberUpdateInfo, sizeof(SceNpMatching2RoomMemberUpdateInfo));
-		auto* notif_data = reinterpret_cast<SceNpMatching2RoomMemberUpdateInfo*>(edata.data());
-		RoomMemberUpdateInfo_to_SceNpMatching2RoomMemberUpdateInfo(edata, notification->update_info(), notif_data, include_onlinename, include_avatarurl);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		// Ensures we do not call the callback if the room is not in the cache(ie we left the room already)
-		if (!np_cache.add_member(room_id, notif_data->roomMemberDataInternal.get_ptr()))
-		{
-			get_match2_event(event_key, 0, 0);
-			return;
-		}
-
-		rpcn_log.notice("Received notification that user %s(%d) joined the room(%d)", notif_data->roomMemberDataInternal->userInfo.npId.handle.data, notif_data->roomMemberDataInternal->memberId, room_id);
-		extra_nps::print_SceNpMatching2RoomMemberDataInternal(notif_data->roomMemberDataInternal.get_ptr());
-
-		// We initiate signaling if necessary
-		if (const auto* signaling_info = notification->signaling())
-		{
-			const u32 addr_p2p = register_ip(signaling_info->ip());
-			const u16 port_p2p = signaling_info->port();
-
-			const u16 member_id = notif_data->roomMemberDataInternal->memberId;
-			const SceNpId& npid = notif_data->roomMemberDataInternal->userInfo.npId;
-
-			rpcn_log.notice("Join notification told to connect to member(%d=%s) of room(%d): %s:%d", member_id, reinterpret_cast<const char*>(npid.handle.data), room_id, ip_to_string(addr_p2p), port_p2p);
-
-			// Attempt Signaling
-			auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-			const u32 conn_id = sigh.init_sig2(npid, room_id, member_id);
-			sigh.start_sig(conn_id, addr_p2p, port_p2p);
-		}
-
-		if (room_event_cb)
-		{
-			sysutil_register_cb([room_event_cb = this->room_event_cb, room_id, event_key, room_event_cb_ctx = this->room_event_cb_ctx, room_event_cb_arg = this->room_event_cb_arg, size = edata.size()](ppu_thread& cb_ppu) -> s32
-				{
-					room_event_cb(cb_ppu, room_event_cb_ctx, room_id, SCE_NP_MATCHING2_ROOM_EVENT_MemberJoined, event_key, 0, size, room_event_cb_arg);
-					return 0;
-				});
-		}
-	}
-
-	void np_handler::notif_user_left_room(vec_stream& noti)
-	{
-		u64 room_id       = noti.get<u64>();
-		const auto* update_info = noti.get_flatbuffer<RoomMemberUpdateInfo>();
-
-		if (noti.is_error())
-		{
-			rpcn_log.error("Received faulty UserLeftRoom notification");
-			return;
-		}
-
-		const u32 event_key = get_event_key();
-		auto [include_onlinename, include_avatarurl] = get_match2_context_options(room_event_cb_ctx);
-
-		auto& edata      = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_RoomMemberUpdateInfo, sizeof(SceNpMatching2RoomMemberUpdateInfo));
-		auto* notif_data = reinterpret_cast<SceNpMatching2RoomMemberUpdateInfo*>(edata.data());
-		RoomMemberUpdateInfo_to_SceNpMatching2RoomMemberUpdateInfo(edata, update_info, notif_data, include_onlinename, include_avatarurl);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		// Ensures we do not call the callback if the room is not in the cache(ie we left the room already)
-		if (!np_cache.del_member(room_id, notif_data->roomMemberDataInternal->memberId))
-		{
-			get_match2_event(event_key, 0, 0);
-			return;
-		}
-
-		rpcn_log.notice("Received notification that user %s(%d) left the room(%d)", notif_data->roomMemberDataInternal->userInfo.npId.handle.data, notif_data->roomMemberDataInternal->memberId, room_id);
-		extra_nps::print_SceNpMatching2RoomMemberDataInternal(notif_data->roomMemberDataInternal.get_ptr());
-
-		if (room_event_cb)
-		{
-			sysutil_register_cb([room_event_cb = this->room_event_cb, room_event_cb_ctx = this->room_event_cb_ctx, room_id, event_key, room_event_cb_arg = this->room_event_cb_arg, size = edata.size()](ppu_thread& cb_ppu) -> s32
-				{
-					room_event_cb(cb_ppu, room_event_cb_ctx, room_id, SCE_NP_MATCHING2_ROOM_EVENT_MemberLeft, event_key, 0, size, room_event_cb_arg);
-					return 0;
-				});
-		}
-	}
-
-	void np_handler::notif_room_destroyed(vec_stream& noti)
-	{
-		u64 room_id       = noti.get<u64>();
-		const auto* update_info = noti.get_flatbuffer<RoomUpdateInfo>();
-
-		if (noti.is_error())
-		{
-			rpcn_log.error("Received faulty RoomDestroyed notification");
-			return;
-		}
-
-		const u32 event_key = get_event_key();
-
-		auto& edata      = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_RoomUpdateInfo, sizeof(SceNpMatching2RoomUpdateInfo));
-		auto* notif_data = reinterpret_cast<SceNpMatching2RoomUpdateInfo*>(edata.data());
-		RoomUpdateInfo_to_SceNpMatching2RoomUpdateInfo(update_info, notif_data);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		rpcn_log.notice("Received notification that room(%d) was destroyed", room_id);
-
-		auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-		sigh.disconnect_sig2_users(room_id);
-
-		if (room_event_cb)
-		{
-			sysutil_register_cb([room_event_cb = this->room_event_cb, room_event_cb_ctx = this->room_event_cb_ctx, room_id, event_key, room_event_cb_arg = this->room_event_cb_arg, size = edata.size()](ppu_thread& cb_ppu) -> s32
-				{
-					room_event_cb(cb_ppu, room_event_cb_ctx, room_id, SCE_NP_MATCHING2_ROOM_EVENT_RoomDestroyed, event_key, 0, size, room_event_cb_arg);
-					return 0;
-				});
-		}
-	}
-
-	void np_handler::notif_updated_room_data_internal(vec_stream& noti)
-	{
-		SceNpMatching2RoomId room_id = noti.get<u64>();
-		const auto* update_info = noti.get_flatbuffer<RoomDataInternalUpdateInfo>();
-
-		if (noti.is_error())
-		{
-			rpcn_log.error("Received faulty UpdatedRoomDataInternal notification");
-			return;
-		}
-
-		const u32 event_key = get_event_key();
-		auto [include_onlinename, include_avatarurl] = get_match2_context_options(room_event_cb_ctx);
-
-		auto& edata      = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_RoomDataInternalUpdateInfo, sizeof(SceNpMatching2RoomDataInternalUpdateInfo));
-		auto* notif_data = reinterpret_cast<SceNpMatching2RoomDataInternalUpdateInfo*>(edata.data());
-		RoomDataInternalUpdateInfo_to_SceNpMatching2RoomDataInternalUpdateInfo(edata, update_info, notif_data, npid, include_onlinename, include_avatarurl);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		np_cache.insert_room(notif_data->newRoomDataInternal.get_ptr());
-
-		extra_nps::print_SceNpMatching2RoomDataInternal(notif_data->newRoomDataInternal.get_ptr());
-
-		rpcn_log.notice("Received notification that room(%d)'s data was updated", room_id);
-
-		if (room_event_cb)
-		{
-			sysutil_register_cb([room_event_cb = this->room_event_cb, room_event_cb_ctx = this->room_event_cb_ctx, room_id, event_key, room_event_cb_arg = this->room_event_cb_arg, size = edata.size()](ppu_thread& cb_ppu) -> s32
-				{
-					room_event_cb(cb_ppu, room_event_cb_ctx, room_id, SCE_NP_MATCHING2_ROOM_EVENT_UpdatedRoomDataInternal, event_key, 0, size, room_event_cb_arg);
-					return 0;
-				});
-		}
-	}
-
-	void np_handler::notif_updated_room_member_data_internal(vec_stream& noti)
-	{
-		SceNpMatching2RoomId room_id = noti.get<u64>();
-		const auto* update_info = noti.get_flatbuffer<RoomMemberDataInternalUpdateInfo>();
-
-		if (noti.is_error())
-		{
-			rpcn_log.error("Received faulty UpdatedRoomMemberDataInternal notification");
-			return;
-		}
-
-		const u32 event_key = get_event_key();
-		auto [include_onlinename, include_avatarurl] = get_match2_context_options(room_event_cb_ctx);
-
-		auto& edata      = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_RoomMemberDataInternalUpdateInfo, sizeof(SceNpMatching2RoomMemberDataInternalUpdateInfo));
-		auto* notif_data = reinterpret_cast<SceNpMatching2RoomMemberDataInternalUpdateInfo*>(edata.data());
-		RoomMemberDataInternalUpdateInfo_to_SceNpMatching2RoomMemberDataInternalUpdateInfo(edata, update_info, notif_data, include_onlinename, include_avatarurl);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		if (!np_cache.add_member(room_id, notif_data->newRoomMemberDataInternal.get_ptr()))
-		{
-			get_match2_event(event_key, 0, 0);
-			return;
-		}
-
-		rpcn_log.notice("Received notification that user's %s(%d) room (%d) data was updated", notif_data->newRoomMemberDataInternal->userInfo.npId.handle.data, notif_data->newRoomMemberDataInternal->memberId, room_id);
-		extra_nps::print_SceNpMatching2RoomMemberDataInternal(notif_data->newRoomMemberDataInternal.get_ptr());
-
-		if (room_event_cb)
-		{
-			sysutil_register_cb([room_event_cb = this->room_event_cb, room_event_cb_ctx = this->room_event_cb_ctx, room_id, event_key, room_event_cb_arg = this->room_event_cb_arg, size = edata.size()](ppu_thread& cb_ppu) -> s32
-				{
-					room_event_cb(cb_ppu, room_event_cb_ctx, room_id, SCE_NP_MATCHING2_ROOM_EVENT_UpdatedRoomMemberDataInternal, event_key, 0, size, room_event_cb_arg);
-					return 0;
-				});
-		}
-	}
-
-	void np_handler::notif_room_message_received(vec_stream& noti)
-	{
-		u64 room_id        = noti.get<u64>();
-		u16 member_id      = noti.get<u16>();
-		const auto* message_info = noti.get_flatbuffer<RoomMessageInfo>();
-
-		if (noti.is_error())
-		{
-			rpcn_log.error("Received faulty RoomMessageReceived notification");
-			return;
-		}
-
-		const u32 event_key = get_event_key();
-		auto [include_onlinename, include_avatarurl] = get_match2_context_options(room_event_cb_ctx);
-
-		auto& edata      = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_RoomMessageInfo, sizeof(SceNpMatching2RoomMessageInfo));
-		auto* notif_data = reinterpret_cast<SceNpMatching2RoomMessageInfo*>(edata.data());
-		RoomMessageInfo_to_SceNpMatching2RoomMessageInfo(edata, message_info, notif_data, include_onlinename, include_avatarurl);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		rpcn_log.notice("Received notification of a room message from member(%d) in room(%d)", member_id, room_id);
-
-		if (room_msg_cb)
-		{
-			sysutil_register_cb([room_msg_cb = this->room_msg_cb, room_msg_cb_ctx = this->room_msg_cb_ctx, room_id, member_id, event_key, room_msg_cb_arg = this->room_msg_cb_arg, size = edata.size()](ppu_thread& cb_ppu) -> s32
-				{
-					room_msg_cb(cb_ppu, room_msg_cb_ctx, room_id, member_id, SCE_NP_MATCHING2_ROOM_MSG_EVENT_Message, event_key, 0, size, room_msg_cb_arg);
-					return 0;
-				});
-		}
-	}
-
-	void np_handler::notif_signaling_helper(vec_stream& noti)
-	{
-		const auto* matching_info = noti.get_flatbuffer<MatchingSignalingInfo>();
-
-		if (noti.is_error() || !matching_info->addr() || !matching_info->npid() || !matching_info->addr()->ip())
-		{
-			rpcn_log.error("Received faulty SignalingHelper notification");
-			return;
-		}
-
-		SceNpId npid_p2p;
-		string_to_npid(matching_info->npid()->string_view(), npid_p2p);
-
-		const u32 addr_p2p = register_ip(matching_info->addr()->ip());
-		const u16 port_p2p = matching_info->addr()->port();
-
-		auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-		sigh.send_information_packets(addr_p2p, port_p2p, npid_p2p);
-	}
-
-	void np_handler::generic_gui_notification_handler(vec_stream& noti, std::string_view name, s32 notification_type)
-	{
-		const auto* update_info = noti.get_flatbuffer<MatchingRoomStatus>();
-
-		if (noti.is_error())
-		{
-			rpcn_log.error("Received faulty %s notification", name);
-			return;
-		}
-
-		std::lock_guard lock(gui_notifications.mutex);
-
-		if (!gui_notifications.current_gui_ctx_id)
-			return;
-
-		// Should the callback signaled depend on the room id and should we track if the context is the one that created/joined/left/etc the room?
-		auto ctx = get_matching_context(gui_notifications.current_gui_ctx_id);
-		ensure(ctx);
-		const u32 req_id = gui_notifications.counter_req_id++;
-
-		event_data edata(np_memory.allocate(MAX_SceNpMatchingRoomStatus_SIZE), sizeof(SceNpMatchingRoomStatus), MAX_SceNpMatchingRoomStatus_SIZE);
-		auto* room_status = reinterpret_cast<SceNpMatchingRoomStatus*>(edata.data());
-		MatchingRoomStatus_to_SceNpMatchingRoomStatus(edata, update_info, room_status);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		extra_nps::print_SceNpMatchingRoomStatus(room_status);
-
-		switch (notification_type)
-		{
-		case SCE_NP_MATCHING_EVENT_ROOM_UPDATE_NEW_MEMBER:
-			gui_cache.add_member(room_status->id, room_status->members.get_ptr(), true);
-			break;
-		case SCE_NP_MATCHING_EVENT_ROOM_UPDATE_MEMBER_LEAVE:
-			gui_cache.del_member(room_status->id, room_status->members.get_ptr());
-			break;
-		case SCE_NP_MATCHING_EVENT_ROOM_DISAPPEARED:
-			gui_cache.del_room(room_status->id);
-			break;
-		case SCE_NP_MATCHING_EVENT_ROOM_UPDATE_OWNER_CHANGE:
-			gui_cache.add_member(room_status->id, room_status->members.get_ptr(), false);
-			gui_cache.add_member(room_status->id, room_status->members->next.get_ptr(), false);
-			break;
-		case SCE_NP_MATCHING_EVENT_ROOM_KICKED:
-			gui_cache.del_room(room_status->id);
-			break;
-		default:
-			fmt::throw_exception("Unexpected notification type in generic_gui_notification_handler: 0x%08X", notification_type);
-			break;
-		}
-
-		gui_notifications.list.emplace(std::make_pair(gui_notifications.current_gui_ctx_id, req_id), gui_notification{.event = notification_type, .edata = std::move(edata)});
-		ctx->queue_callback(req_id, notification_type, 0);
-	}
-
-	void np_handler::notif_member_joined_room_gui(vec_stream& noti)
-	{
-		return generic_gui_notification_handler(noti, "MemberJoinedRoomGUI", SCE_NP_MATCHING_EVENT_ROOM_UPDATE_NEW_MEMBER);
-	}
-
-	void np_handler::notif_member_left_room_gui(vec_stream& noti)
-	{
-		return generic_gui_notification_handler(noti, "MemberLeftRoomGUI", SCE_NP_MATCHING_EVENT_ROOM_UPDATE_MEMBER_LEAVE);
-	}
-
-	void np_handler::notif_room_disappeared_gui(vec_stream& noti)
-	{
-		return generic_gui_notification_handler(noti, "RoomDisappearedGUI", SCE_NP_MATCHING_EVENT_ROOM_DISAPPEARED);
-	}
-
-	void np_handler::notif_room_owner_changed_gui(vec_stream& noti)
-	{
-		return generic_gui_notification_handler(noti, "RoomOwnerChangedGUI", SCE_NP_MATCHING_EVENT_ROOM_UPDATE_OWNER_CHANGE);
-	}
-
-	void np_handler::notif_user_kicked_gui(vec_stream& noti)
-	{
-		return generic_gui_notification_handler(noti, "UserKickedGUI", SCE_NP_MATCHING_EVENT_ROOM_KICKED);
-	}
-
-	void gui_epilog(const shared_ptr<matching_ctx>& ctx);
-
-	void np_handler::notif_quickmatch_complete_gui(vec_stream& noti)
-	{
-		const auto* update_info = noti.get_flatbuffer<MatchingRoomStatus>();
-
-		if (noti.is_error())
-		{
-			rpcn_log.error("Received faulty QuickMatchCompleteGUI notification");
-			return;
-		}
-
-		std::lock_guard lock(mutex_quickmatching);
-
-		event_data edata(np_memory.allocate(MAX_SceNpMatchingJoinedRoomInfo_SIZE), sizeof(SceNpMatchingJoinedRoomInfo), MAX_SceNpMatchingJoinedRoomInfo_SIZE);
-		auto* room_info = reinterpret_cast<SceNpMatchingJoinedRoomInfo*>(edata.data());
-		MatchingRoomStatus_to_SceNpMatchingJoinedRoomInfo(edata, update_info, room_info);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		extra_nps::print_SceNpMatchingJoinedRoomInfo(room_info);
-
-		if (!pending_quickmatching.contains(room_info->room_status.id))
-		{
-			np_memory.free(edata.addr());
-			return;
-		}
-
-		const u32 ctx_id = ::at32(pending_quickmatching, room_info->room_status.id);
-		ensure(pending_quickmatching.erase(room_info->room_status.id) == 1);
-
-		auto ctx = get_matching_context(ctx_id);
-
-		if (!ctx)
-			return;
-
-		gui_cache.add_room(room_info->room_status.id);
-
-		for (auto cur_member = room_info->room_status.members; cur_member; cur_member = cur_member->next)
-		{
-			gui_cache.add_member(room_info->room_status.id, cur_member.get_ptr(), true);
-		}
-
-		set_gui_result(SCE_NP_MATCHING_GUI_EVENT_QUICK_MATCH, std::move(edata));
-		ctx->queue_gui_callback(SCE_NP_MATCHING_GUI_EVENT_QUICK_MATCH, 0);
-		gui_epilog(ctx);
-
-		ctx->wakey = 1;
-		ctx->wakey.notify_one();
-	}
-} // namespace np
diff --git a/rpcs3/Emu/NP/np_requests.cpp b/rpcs3/Emu/NP/np_requests.cpp
deleted file mode 100644
index 23e18f1353..0000000000
--- a/rpcs3/Emu/NP/np_requests.cpp
+++ /dev/null
@@ -1,1909 +0,0 @@
-#include "Emu/Cell/Modules/sceNp.h"
-#include "Emu/Cell/Modules/sceNp2.h"
-#include "Emu/NP/rpcn_types.h"
-#include "Utilities/StrFmt.h"
-#include "stdafx.h"
-#include "Emu/Cell/PPUCallback.h"
-#include "Emu/Cell/lv2/sys_sync.h"
-#include "Emu/system_config.h"
-#include "Emu/Cell/Modules/cellSysutil.h"
-#include "Emu/Memory/vm_ptr.h"
-#include "Emu/IdManager.h"
-#include "np_handler.h"
-#include "np_contexts.h"
-#include "np_helpers.h"
-#include "np_structs_extra.h"
-#include "fb_helpers.h"
-#include "Emu/NP/signaling_handler.h"
-#include "Emu/NP/ip_address.h"
-
-LOG_CHANNEL(rpcn_log, "rpcn");
-
-namespace np
-{
-	std::vector<SceNpMatching2ServerId> np_handler::get_match2_server_list(SceNpMatching2ContextId ctx_id)
-	{
-		std::vector<SceNpMatching2ServerId> server_list{};
-
-		if (g_cfg.net.psn_status != np_psn_status::psn_rpcn)
-		{
-			return server_list;
-		}
-
-		if (!get_rpcn()->get_server_list(get_req_id(REQUEST_ID_HIGH::MISC), get_match2_context(ctx_id)->communicationId, server_list))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return server_list;
-	}
-
-	u64 np_handler::get_network_time()
-	{
-		// If network time hasn't been set we need to sync time with the rpcn server
-		auto get_local_timestamp = []() -> u64
-		{
-			return std::chrono::duration_cast<std::chrono::microseconds>(steady_clock::now().time_since_epoch()).count();
-		};
-
-		if (!network_time_offset)
-		{
-			// Could be improved with multiple requests to increase latency determination accuracy
-			const u64 req_timestamp = get_local_timestamp();
-			const u64 server_timestamp = get_rpcn()->get_network_time(get_req_id(REQUEST_ID_HIGH::MISC));
-			if (!server_timestamp)
-			{
-				rpcn_log.error("Disconnecting from RPCN!");
-				is_psn_active = false;
-				return 0;
-			}
-			const u64 reply_timestamp = get_local_timestamp();
-			const u64 latency = (reply_timestamp - req_timestamp) / 2;
-			network_time_offset = reply_timestamp - (server_timestamp + latency);
-		}
-
-		return get_local_timestamp() - network_time_offset;
-	}
-
-	u32 np_handler::get_server_status(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 server_id)
-	{
-		// TODO: actually implement interaction with server for this?
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_GetServerInfo);
-		const u32 event_key = get_event_key();
-
-		auto& edata = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetServerInfo, sizeof(SceNpMatching2GetServerInfoResponse));
-		SceNpMatching2GetServerInfoResponse* serv_info = reinterpret_cast<SceNpMatching2GetServerInfoResponse*>(edata.data());
-		serv_info->server.serverId = server_id;
-		serv_info->server.status = SCE_NP_MATCHING2_SERVER_STATUS_AVAILABLE;
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		const auto cb_info_opt = take_pending_request(req_id);
-		ensure(cb_info_opt);
-		cb_info_opt->queue_callback(req_id, event_key, 0, edata.size());
-
-		return req_id;
-	}
-
-	u32 np_handler::create_server_context(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 /*server_id*/)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_CreateServerContext);
-
-		const auto cb_info_opt = take_pending_request(req_id);
-		ensure(cb_info_opt);
-		cb_info_opt->queue_callback(req_id, 0, 0, 0);
-
-		return req_id;
-	}
-
-	u32 np_handler::delete_server_context(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 /*server_id*/)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_DeleteServerContext);
-
-		const auto cb_info_opt = take_pending_request(req_id);
-		ensure(cb_info_opt);
-		cb_info_opt->queue_callback(req_id, 0, 0, 0);
-
-		return req_id;
-	}
-
-	u32 np_handler::get_world_list(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, u16 server_id)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_GetWorldInfoList);
-
-		if (!get_rpcn()->get_world_list(req_id, get_match2_context(ctx_id)->communicationId, server_id))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return req_id;
-	}
-
-	void np_handler::reply_get_world_list(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		ensure(error == rpcn::ErrorType::NoError, "Unexpected error in GetWorldList reply");
-
-		std::vector<u32> world_list;
-		u32 num_worlds = reply.get<u32>();
-		for (u32 i = 0; i < num_worlds; i++)
-		{
-			world_list.push_back(reply.get<u32>());
-		}
-
-		ensure(!reply.is_error(), "Malformed reply to GetWorldList command");
-
-		const u32 event_key = get_event_key();
-
-		auto& edata = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetWorldInfoList, sizeof(SceNpMatching2GetWorldInfoListResponse));
-		auto* world_info = reinterpret_cast<SceNpMatching2GetWorldInfoListResponse*>(edata.data());
-		world_info->worldNum = ::size32(world_list);
-
-		if (!world_list.empty())
-		{
-			auto* worlds = edata.allocate<SceNpMatching2World>(::narrow<u32>(sizeof(SceNpMatching2World) * world_list.size()), world_info->world);
-			for (usz i = 0; i < world_list.size(); i++)
-			{
-				worlds[i].worldId = world_list[i];
-			}
-		}
-
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-		cb_info_opt->queue_callback(req_id, event_key, 0, edata.size());
-	}
-
-	u32 np_handler::create_join_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2CreateJoinRoomRequest* req)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_CreateJoinRoom);
-
-		extra_nps::print_SceNpMatching2CreateJoinRoomRequest(req);
-
-		if (!get_rpcn()->createjoin_room(req_id, get_match2_context(ctx_id)->communicationId, req))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		// More elegant solution would be to send back password with creation reply
-		cached_cj_password = req->roomPassword ? std::optional<SceNpMatching2SessionPassword>{*req->roomPassword} : std::nullopt;
-
-		return req_id;
-	}
-
-	void np_handler::reply_create_join_room(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomGroupMaxSlotMismatch: error_code = SCE_NP_MATCHING2_SERVER_ERROR_MAX_OVER_SLOT_GROUP; break;
-		case rpcn::ErrorType::RoomPasswordMissing: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_PASSWORD; break;
-		case rpcn::ErrorType::RoomGroupNoJoinLabel: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_JOIN_GROUP_LABEL; break;
-		default: fmt::throw_exception("Unexpected error in reply to CreateRoom: %d", static_cast<u8>(error));
-		}
-
-		if (error_code != CELL_OK)
-		{
-			cb_info_opt->queue_callback(req_id, 0, error_code, 0);
-			return;
-		}
-
-		const auto* resp = reply.get_flatbuffer<RoomDataInternal>();
-		ensure(!reply.is_error(), "Malformed reply to CreateRoom command");
-
-		const u32 event_key = get_event_key();
-		auto [include_onlinename, include_avatarurl] = get_match2_context_options(cb_info_opt->ctx_id);
-
-		auto& edata = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_CreateJoinRoom, sizeof(SceNpMatching2CreateJoinRoomResponse));
-		auto* room_resp = reinterpret_cast<SceNpMatching2CreateJoinRoomResponse*>(edata.data());
-		auto* room_info = edata.allocate<SceNpMatching2RoomDataInternal>(sizeof(SceNpMatching2RoomDataInternal), room_resp->roomDataInternal);
-		RoomDataInternal_to_SceNpMatching2RoomDataInternal(edata, resp, room_info, npid, include_onlinename, include_avatarurl);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		np_cache.insert_room(room_info);
-		np_cache.update_password(room_resp->roomDataInternal->roomId, cached_cj_password);
-
-		extra_nps::print_SceNpMatching2CreateJoinRoomResponse(room_resp);
-
-		cb_info_opt->queue_callback(req_id, event_key, 0, edata.size());
-	}
-
-	u32 np_handler::join_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2JoinRoomRequest* req)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_JoinRoom);
-
-		extra_nps::print_SceNpMatching2JoinRoomRequest(req);
-
-		if (!get_rpcn()->join_room(req_id, get_match2_context(ctx_id)->communicationId, req))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return req_id;
-	}
-
-	void np_handler::reply_join_room(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		s32 error_code = 0;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_SUCH_ROOM; break;
-		case rpcn::ErrorType::RoomAlreadyJoined: error_code = SCE_NP_MATCHING2_SERVER_ERROR_ALREADY_JOINED; break;
-		case rpcn::ErrorType::RoomFull: error_code = SCE_NP_MATCHING2_SERVER_ERROR_ROOM_FULL; break;
-		case rpcn::ErrorType::RoomPasswordMismatch: error_code = SCE_NP_MATCHING2_SERVER_ERROR_PASSWORD_MISMATCH; break;
-		case rpcn::ErrorType::RoomGroupFull: error_code = SCE_NP_MATCHING2_SERVER_ERROR_GROUP_FULL; break;
-		case rpcn::ErrorType::RoomGroupJoinLabelNotFound: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_SUCH_GROUP; break;
-		default: fmt::throw_exception("Unexpected error in reply to JoinRoom: %d", static_cast<u8>(error));
-		}
-
-		if (error_code != 0)
-		{
-			cb_info_opt->queue_callback(req_id, 0, error_code, 0);
-			return;
-		}
-
-		const auto* resp = reply.get_flatbuffer<JoinRoomResponse>();
-		ensure(!reply.is_error(), "Malformed reply to JoinRoom command");
-		ensure(resp->room_data());
-
-		const u32 event_key = get_event_key();
-		const auto [include_onlinename, include_avatarurl] = get_match2_context_options(cb_info_opt->ctx_id);
-
-		auto& edata = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_JoinRoom, sizeof(SceNpMatching2JoinRoomResponse));
-		auto* room_resp = reinterpret_cast<SceNpMatching2JoinRoomResponse*>(edata.data());
-		auto* room_info = edata.allocate<SceNpMatching2RoomDataInternal>(sizeof(SceNpMatching2RoomDataInternal), room_resp->roomDataInternal);
-		RoomDataInternal_to_SceNpMatching2RoomDataInternal(edata, resp->room_data(), room_info, npid, include_onlinename, include_avatarurl);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		np_cache.insert_room(room_info);
-
-		extra_nps::print_SceNpMatching2RoomDataInternal(room_info);
-
-		// We initiate signaling if necessary
-		if (const auto* signaling_data = resp->signaling_data())
-		{
-			const u64 room_id = resp->room_data()->roomId();
-
-			for (unsigned int i = 0; i < signaling_data->size(); i++)
-			{
-				const auto* signaling_info = signaling_data->Get(i);
-				ensure(signaling_info->addr());
-
-				const u32 addr_p2p = register_ip(signaling_info->addr()->ip());
-				const u16 port_p2p = signaling_info->addr()->port();
-
-				const u16 member_id = signaling_info->member_id();
-				const auto [npid_res, npid_p2p] = np_cache.get_npid(room_id, member_id);
-
-				if (npid_res != CELL_OK)
-					continue;
-
-				rpcn_log.notice("JoinRoomResult told to connect to member(%d=%s) of room(%d): %s:%d", member_id, reinterpret_cast<const char*>(npid_p2p->handle.data), room_id, ip_to_string(addr_p2p), port_p2p);
-
-				// Attempt Signaling
-				auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-				const u32 conn_id = sigh.init_sig2(*npid_p2p, room_id, member_id);
-				sigh.start_sig(conn_id, addr_p2p, port_p2p);
-			}
-		}
-
-		cb_info_opt->queue_callback(req_id, event_key, 0, edata.size());
-	}
-
-	u32 np_handler::leave_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2LeaveRoomRequest* req)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_LeaveRoom);
-
-		if (!get_rpcn()->leave_room(req_id, get_match2_context(ctx_id)->communicationId, req))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return req_id;
-	}
-
-	void np_handler::reply_leave_room(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::NotFound: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_SUCH_ROOM; break; // Unsure if this should return another error(missing user in room has no appropriate error code)
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_SUCH_ROOM; break;
-		default: fmt::throw_exception("Unexpected error in reply to LeaveRoom: %d", static_cast<u8>(error));
-		}
-
-		if (error_code != CELL_OK)
-		{
-			cb_info_opt->queue_callback(req_id, 0, error_code, 0);
-			return;
-		}
-
-		u64 room_id = reply.get<u64>();
-		ensure(!reply.is_error(), "Malformed reply to LeaveRoom command");
-
-		// Disconnect all users from that room
-		auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-		sigh.disconnect_sig2_users(room_id);
-		cb_info_opt->queue_callback(req_id, 0, 0, 0);
-	}
-
-	u32 np_handler::search_room(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SearchRoomRequest* req)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_SearchRoom);
-
-		extra_nps::print_SceNpMatching2SearchRoomRequest(req);
-
-		if (!get_rpcn()->search_room(req_id, get_match2_context(ctx_id)->communicationId, req))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return req_id;
-	}
-
-	void np_handler::reply_search_room(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		ensure(error == rpcn::ErrorType::NoError, "Unexpected error in SearchRoom reply");
-
-		const auto* resp = reply.get_flatbuffer<SearchRoomResponse>();
-		ensure(!reply.is_error(), "Malformed reply to SearchRoom command");
-
-		const u32 event_key = get_event_key();
-
-		auto& edata = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_SearchRoom, sizeof(SceNpMatching2SearchRoomResponse));
-		auto* search_resp = reinterpret_cast<SceNpMatching2SearchRoomResponse*>(edata.data());
-		// The online_name and avatar_url are naturally filtered by the reply from the server
-		SearchRoomResponse_to_SceNpMatching2SearchRoomResponse(edata, resp, search_resp);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		extra_nps::print_SceNpMatching2SearchRoomResponse(search_resp);
-		cb_info_opt->queue_callback(req_id, event_key, 0, edata.size());
-	}
-
-	u32 np_handler::get_roomdata_external_list(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2GetRoomDataExternalListRequest* req)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_GetRoomDataExternalList);
-
-		extra_nps::print_SceNpMatching2GetRoomDataExternalListRequest(req);
-
-		if (!get_rpcn()->get_roomdata_external_list(req_id, get_match2_context(ctx_id)->communicationId, req))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return req_id;
-	}
-
-	void np_handler::reply_get_roomdata_external_list(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		ensure(error == rpcn::ErrorType::NoError, "Unexpected error in GetRoomDataExternalList reply");
-
-		const auto* resp = reply.get_flatbuffer<GetRoomDataExternalListResponse>();
-		ensure(!reply.is_error(), "Malformed reply to GetRoomDataExternalList command");
-
-		const u32 event_key = get_event_key();
-		auto [include_onlinename, include_avatarurl] = get_match2_context_options(cb_info_opt->ctx_id);
-
-		auto& edata = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetRoomDataExternalList, sizeof(SceNpMatching2GetRoomDataExternalListResponse));
-		auto* sce_get_room_ext_resp = reinterpret_cast<SceNpMatching2GetRoomDataExternalListResponse*>(edata.data());
-		GetRoomDataExternalListResponse_to_SceNpMatching2GetRoomDataExternalListResponse(edata, resp, sce_get_room_ext_resp, include_onlinename, include_avatarurl);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		extra_nps::print_SceNpMatching2GetRoomDataExternalListResponse(sce_get_room_ext_resp);
-
-		cb_info_opt->queue_callback(req_id, event_key, 0, edata.size());
-	}
-
-	u32 np_handler::set_roomdata_external(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SetRoomDataExternalRequest* req)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_SetRoomDataExternal);
-
-		extra_nps::print_SceNpMatching2SetRoomDataExternalRequest(req);
-
-		if (!get_rpcn()->set_roomdata_external(req_id, get_match2_context(ctx_id)->communicationId, req))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return req_id;
-	}
-
-	void np_handler::reply_set_roomdata_external(u32 req_id, rpcn::ErrorType error)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_SUCH_ROOM; break;
-		case rpcn::ErrorType::Unauthorized: error_code = SCE_NP_MATCHING2_SERVER_ERROR_FORBIDDEN; break;
-		default: fmt::throw_exception("Unexpected error in reply to SetRoomDataExternal: %d", static_cast<u8>(error));
-		}
-
-		cb_info_opt->queue_callback(req_id, 0, error_code, 0);
-	}
-
-	u32 np_handler::get_roomdata_internal(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2GetRoomDataInternalRequest* req)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_GetRoomDataInternal);
-
-		if (!get_rpcn()->get_roomdata_internal(req_id, get_match2_context(ctx_id)->communicationId, req))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return req_id;
-	}
-
-	void np_handler::reply_get_roomdata_internal(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_SUCH_ROOM; break;
-		default: fmt::throw_exception("Unexpected error in reply to GetRoomDataInternal: %d", static_cast<u8>(error));
-		}
-
-		if (error_code != CELL_OK)
-		{
-			cb_info_opt->queue_callback(req_id, 0, error_code, 0);
-			return;
-		}
-
-		const auto* resp = reply.get_flatbuffer<RoomDataInternal>();
-		ensure(!reply.is_error(), "Malformed reply to GetRoomDataInternal command");
-
-		const u32 event_key = get_event_key();
-		auto [include_onlinename, include_avatarurl] = get_match2_context_options(cb_info_opt->ctx_id);
-
-		auto& edata = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetRoomDataInternal, sizeof(SceNpMatching2GetRoomDataInternalResponse));
-		auto* room_resp = reinterpret_cast<SceNpMatching2GetRoomDataInternalResponse*>(edata.data());
-		auto* room_info = edata.allocate<SceNpMatching2RoomDataInternal>(sizeof(SceNpMatching2RoomDataInternal), room_resp->roomDataInternal);
-		RoomDataInternal_to_SceNpMatching2RoomDataInternal(edata, resp, room_info, npid, include_onlinename, include_avatarurl);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		np_cache.insert_room(room_info);
-
-		extra_nps::print_SceNpMatching2RoomDataInternal(room_info);
-
-		cb_info_opt->queue_callback(req_id, event_key, 0, edata.size());
-	}
-
-	u32 np_handler::set_roomdata_internal(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SetRoomDataInternalRequest* req)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_SetRoomDataInternal);
-
-		extra_nps::print_SceNpMatching2SetRoomDataInternalRequest(req);
-
-		if (!get_rpcn()->set_roomdata_internal(req_id, get_match2_context(ctx_id)->communicationId, req))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return req_id;
-	}
-
-	void np_handler::reply_set_roomdata_internal(u32 req_id, rpcn::ErrorType error)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_SUCH_ROOM; break;
-		default: fmt::throw_exception("Unexpected error in reply to GetRoomDataInternal: %d", static_cast<u8>(error));
-		}
-
-		cb_info_opt->queue_callback(req_id, 0, error_code, 0);
-	}
-
-	u32 np_handler::get_roommemberdata_internal(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2GetRoomMemberDataInternalRequest* req)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_GetRoomMemberDataInternal);
-		extra_nps::print_SceNpMatching2GetRoomMemberDataInternalRequest(req);
-
-		if (!get_rpcn()->get_roommemberdata_internal(req_id, get_match2_context(ctx_id)->communicationId, req))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return req_id;
-	}
-
-	void np_handler::reply_get_roommemberdata_internal(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_SUCH_ROOM; break;
-		case rpcn::ErrorType::NotFound: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_SUCH_USER; break;
-		default: fmt::throw_exception("Unexpected error in reply to GetRoomMemberDataInternal: %d", static_cast<u8>(error));
-		}
-
-		if (error_code != CELL_OK)
-		{
-			cb_info_opt->queue_callback(req_id, 0, error_code, 0);
-			return;
-		}
-
-		const auto* resp = reply.get_flatbuffer<RoomMemberDataInternal>();
-		ensure(!reply.is_error(), "Malformed reply to GetRoomMemberDataInternal command");
-
-		const u32 event_key = get_event_key();
-		auto [include_onlinename, include_avatarurl] = get_match2_context_options(cb_info_opt->ctx_id);
-
-		auto& edata = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetRoomMemberDataInternal, sizeof(SceNpMatching2GetRoomMemberDataInternalResponse));
-		auto* mdata_resp = reinterpret_cast<SceNpMatching2GetRoomMemberDataInternalResponse*>(edata.data());
-		auto* mdata_info = edata.allocate<SceNpMatching2RoomMemberDataInternal>(sizeof(SceNpMatching2RoomMemberDataInternal), mdata_resp->roomMemberDataInternal);
-		RoomMemberDataInternal_to_SceNpMatching2RoomMemberDataInternal(edata, resp, nullptr, mdata_info, include_onlinename, include_avatarurl);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		cb_info_opt->queue_callback(req_id, event_key, 0, edata.size());
-	}
-
-	u32 np_handler::set_roommemberdata_internal(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SetRoomMemberDataInternalRequest* req)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_SetRoomMemberDataInternal);
-
-		extra_nps::print_SceNpMatching2SetRoomMemberDataInternalRequest(req);
-
-		if (!get_rpcn()->set_roommemberdata_internal(req_id, get_match2_context(ctx_id)->communicationId, req))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return req_id;
-	}
-
-	void np_handler::reply_set_roommemberdata_internal(u32 req_id, rpcn::ErrorType error)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_SUCH_ROOM; break;
-		case rpcn::ErrorType::NotFound: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_SUCH_USER; break;
-		case rpcn::ErrorType::Unauthorized: error_code = SCE_NP_MATCHING2_SERVER_ERROR_FORBIDDEN; break;
-		default: fmt::throw_exception("Unexpected error in reply to SetRoomMemberDataInternal: %d", static_cast<u8>(error));
-		}
-
-		cb_info_opt->queue_callback(req_id, 0, error_code, 0);
-	}
-
-	u32 np_handler::set_userinfo(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SetUserInfoRequest* req)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_SetUserInfo);
-
-		if (!get_rpcn()->set_userinfo(req_id, get_match2_context(ctx_id)->communicationId, req))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return req_id;
-	}
-
-	void np_handler::reply_set_userinfo(u32 req_id, rpcn::ErrorType error)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		default: fmt::throw_exception("Unexpected error in reply to SetUserInfo: %d", static_cast<u8>(error));
-		}
-
-		cb_info_opt->queue_callback(req_id, 0, 0, 0);
-	}
-
-	u32 np_handler::get_ping_info(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SignalingGetPingInfoRequest* req)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_SignalingGetPingInfo);
-
-		if (!get_rpcn()->ping_room_owner(req_id, get_match2_context(ctx_id)->communicationId, req->roomId))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return req_id;
-	}
-
-	void np_handler::reply_get_ping_info(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_SUCH_ROOM; break;
-		default: fmt::throw_exception("Unexpected error in reply to PingRoomOwner: %d", static_cast<u8>(error));
-		}
-
-		if (error_code != CELL_OK)
-		{
-			cb_info_opt->queue_callback(req_id, 0, error_code, 0);
-			return;
-		}
-
-		const auto* resp = reply.get_flatbuffer<GetPingInfoResponse>();
-		ensure(!reply.is_error(), "Malformed reply to PingRoomOwner command");
-
-		const u32 event_key = get_event_key();
-
-		auto& edata = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_SignalingGetPingInfo, sizeof(SceNpMatching2SignalingGetPingInfoResponse));
-		auto* final_ping_resp = reinterpret_cast<SceNpMatching2SignalingGetPingInfoResponse*>(edata.data());
-		GetPingInfoResponse_to_SceNpMatching2SignalingGetPingInfoResponse(resp, final_ping_resp);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-		cb_info_opt->queue_callback(req_id, event_key, 0, edata.size());
-	}
-
-	u32 np_handler::send_room_message(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2SendRoomMessageRequest* req)
-	{
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_SendRoomMessage);
-
-		if (!get_rpcn()->send_room_message(req_id, get_match2_context(ctx_id)->communicationId, req))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return req_id;
-	}
-
-	void np_handler::reply_send_room_message(u32 req_id, rpcn::ErrorType error)
-	{
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING2_SERVER_ERROR_NO_SUCH_ROOM; break;
-		case rpcn::ErrorType::Unauthorized: error_code = SCE_NP_MATCHING2_SERVER_ERROR_FORBIDDEN; break;
-		default: fmt::throw_exception("Unexpected error in reply to SendRoomMessage: %d", static_cast<u8>(error));
-		}
-
-		cb_info_opt->queue_callback(req_id, 0, error_code, 0);
-	}
-
-	void np_handler::req_sign_infos(const std::string& npid, u32 conn_id)
-	{
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::MISC);
-		{
-			std::lock_guard lock(mutex_pending_sign_infos_requests);
-			pending_sign_infos_requests[req_id] = conn_id;
-		}
-
-		if (!get_rpcn()->req_sign_infos(req_id, npid))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-	}
-
-	void np_handler::reply_req_sign_infos(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		u32 conn_id;
-		{
-			std::lock_guard lock(mutex_pending_sign_infos_requests);
-			conn_id = ::at32(pending_sign_infos_requests, req_id);
-			pending_sign_infos_requests.erase(req_id);
-		}
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::NotFound:
-		{
-			rpcn_log.error("Signaling information was requested for a user that doesn't exist or is not online");
-			return;
-		}
-		default: fmt::throw_exception("Unexpected error in reply to RequestSignalingInfos: %d", static_cast<u8>(error));
-		}
-
-		const auto* resp = reply.get_flatbuffer<SignalingAddr>();
-		ensure(!reply.is_error() && resp->ip(), "Malformed reply to RequestSignalingInfos command");
-		u32 addr = register_ip(resp->ip());
-
-		auto& sigh = g_fxo->get<named_thread<signaling_handler>>();
-		sigh.start_sig(conn_id, addr, resp->port());
-	}
-
-	u32 np_handler::get_lobby_info_list(SceNpMatching2ContextId ctx_id, vm::cptr<SceNpMatching2RequestOptParam> optParam, const SceNpMatching2GetLobbyInfoListRequest* req)
-	{
-		// Hack
-		// Note that this is fake and needs to be properly implemented both on server and on rpcs3
-
-		extra_nps::print_SceNpMatching2GetLobbyInfoListRequest(req);
-
-		const u32 req_id = generate_callback_info(ctx_id, optParam, SCE_NP_MATCHING2_REQUEST_EVENT_GetLobbyInfoList);
-		auto cb_info_opt = take_pending_request(req_id);
-
-		if (!cb_info_opt)
-			return true;
-
-		const u32 event_key = get_event_key();
-
-		auto& edata = allocate_req_result(event_key, SCE_NP_MATCHING2_EVENT_DATA_MAX_SIZE_GetLobbyInfoList, sizeof(SceNpMatching2GetLobbyInfoListResponse));
-		auto* resp = reinterpret_cast<SceNpMatching2GetLobbyInfoListResponse*>(edata.data());
-
-		resp->range.size = 1;
-		resp->range.startIndex = 1;
-		resp->range.total = 1;
-		auto lobby_data = edata.allocate<SceNpMatching2LobbyDataExternal>(sizeof(SceNpMatching2LobbyDataExternal), resp->lobbyDataExternal);
-		lobby_data->serverId = 1;
-		lobby_data->worldId = req->worldId;
-		lobby_data->lobbyId = 1;
-		lobby_data->maxSlot = 64;
-		lobby_data->curMemberNum = 0;
-		lobby_data->flagAttr = SCE_NP_MATCHING2_LOBBY_FLAG_ATTR_PERMANENT;
-
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-		cb_info_opt->queue_callback(req_id, event_key, 0, edata.size());
-
-		return req_id;
-	}
-
-	void np_handler::req_ticket([[maybe_unused]] u32 version, [[maybe_unused]] const SceNpId* npid, const char* service_id, const u8* cookie, u32 cookie_size, [[maybe_unused]] const char* entitlement_id, [[maybe_unused]] u32 consumed_count)
-	{
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::MISC);
-
-		std::string service_id_str(service_id);
-
-		std::vector<u8> cookie_vec;
-		if (cookie && cookie_size)
-		{
-			cookie_vec.assign(cookie, cookie + cookie_size);
-		}
-
-		if (!get_rpcn()->req_ticket(req_id, service_id_str, cookie_vec))
-		{
-			rpcn_log.error("Disconnecting from RPCN!");
-			is_psn_active = false;
-		}
-
-		return;
-	}
-
-	const ticket& np_handler::get_ticket() const
-	{
-		return current_ticket;
-	}
-
-	void np_handler::reply_req_ticket(u32 /* req_id */, rpcn::ErrorType error, vec_stream& reply)
-	{
-		ensure(error == rpcn::ErrorType::NoError, "Unexpected error in reply to RequestTicket");
-		auto ticket_raw = reply.get_rawdata();
-		ensure(!reply.is_error(), "Malformed reply to RequestTicket command");
-
-		current_ticket = ticket(std::move(ticket_raw));
-		auto ticket_size = static_cast<s32>(current_ticket.size());
-
-		if (manager_cb)
-		{
-			sysutil_register_cb([manager_cb = this->manager_cb, ticket_size, manager_cb_arg = this->manager_cb_arg](ppu_thread& cb_ppu) -> s32
-				{
-					manager_cb(cb_ppu, SCE_NP_MANAGER_EVENT_GOT_TICKET, ticket_size, manager_cb_arg);
-					return 0;
-				});
-		}
-	}
-
-	void np_handler::transaction_async_handler(std::unique_lock<shared_mutex> lock, const shared_ptr<generic_async_transaction_context>& trans_ctx, u32 req_id, bool async)
-	{
-		auto worker_function = [trans_ctx = trans_ctx, req_id, this](std::unique_lock<shared_mutex> lock)
-		{
-			thread_base::set_name("NP Trans Worker");
-
-			auto res = trans_ctx->wake_cond.wait_for(lock, std::chrono::microseconds(trans_ctx->timeout));
-			{
-				std::lock_guard lock_threads(this->mutex_async_transactions);
-				this->async_transactions.erase(req_id);
-			}
-
-			if (res == std::cv_status::timeout)
-			{
-				trans_ctx->result = SCE_NP_COMMUNITY_ERROR_TIMEOUT;
-				return;
-			}
-
-			// Only 2 cases should be timeout or caller setting result
-			ensure(trans_ctx->result, "transaction_async_handler: trans_ctx->result is not set");
-			trans_ctx->completion_cond.notify_one();
-		};
-
-		{
-			std::lock_guard lock_score(mutex_async_transactions);
-			ensure(async_transactions.insert({req_id, trans_ctx}).second, "transaction_async_handler: async_transactions insert failed");
-		}
-
-		if (async)
-		{
-			trans_ctx->thread = std::thread(worker_function, std::move(lock));
-			return;
-		}
-
-		auto& cpu_thread = *get_current_cpu_thread();
-		lv2_obj::sleep(cpu_thread);
-		worker_function(std::move(lock));
-		cpu_thread.check_state();
-	}
-
-	void np_handler::get_board_infos(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, vm::ptr<SceNpScoreBoardInfo> boardInfo, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::SCORE);
-		trans_ctx->tdata = tdata_get_board_infos{.boardInfo = boardInfo};
-		get_rpcn()->get_board_infos(req_id, trans_ctx->communicationId, boardId);
-
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	void np_handler::reply_get_board_infos(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		std::lock_guard lock_trans(mutex_async_transactions);
-		if (!async_transactions.count(req_id))
-		{
-			rpcn_log.error("Couldn't find transaction(%d) in trans_id!", req_id);
-			return;
-		}
-
-		auto score_trans = idm::get_unlocked<score_transaction_ctx>(::at32(async_transactions, req_id)->idm_id);
-		ensure(score_trans);
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::NotFound: error_code = SCE_NP_COMMUNITY_SERVER_ERROR_RANKING_BOARD_MASTER_NOT_FOUND; break;
-		default: fmt::throw_exception("Unexpected error in reply to GetBoardInfos: %d", static_cast<u8>(error));
-		}
-
-		if (error_code != CELL_OK)
-		{
-			std::lock_guard lock(score_trans->mutex);
-			score_trans->result = error_code;
-			score_trans->wake_cond.notify_one();
-			return;
-		}
-
-		const auto* resp = reply.get_flatbuffer<BoardInfo>();
-		ensure(!reply.is_error(), "Malformed reply to GetBoardInfos command");
-
-		const SceNpScoreBoardInfo board_info{
-			.rankLimit = resp->rankLimit(),
-			.updateMode = resp->updateMode(),
-			.sortMode = resp->sortMode(),
-			.uploadNumLimit = resp->uploadNumLimit(),
-			.uploadSizeLimit = resp->uploadSizeLimit()
-		};
-
-		std::lock_guard lock(score_trans->mutex);
-
-		const auto* tdata = std::get_if<tdata_get_board_infos>(&score_trans->tdata);
-		ensure(tdata);
-
-		memcpy(reinterpret_cast<u8*>(tdata->boardInfo.get_ptr()), &board_info, sizeof(SceNpScoreBoardInfo));
-		score_trans->result = CELL_OK;
-		score_trans->wake_cond.notify_one();
-	}
-
-	void np_handler::record_score(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, SceNpScoreValue score, vm::cptr<SceNpScoreComment> scoreComment, const u8* data, u32 data_size, vm::ptr<SceNpScoreRankNumber> tmpRank, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::SCORE);
-		std::optional<std::string> str_comment = scoreComment ? std::optional(std::string(reinterpret_cast<const char*>(scoreComment->data))) : std::nullopt;
-		std::optional<std::vector<u8>> vec_data;
-
-		if (data)
-		{
-			vec_data = std::vector<u8>(data, data + data_size);
-		}
-
-		trans_ctx->tdata = tdata_record_score{.tmpRank = tmpRank};
-
-		get_rpcn()->record_score(req_id, trans_ctx->communicationId, boardId, trans_ctx->pcId, score, str_comment, vec_data);
-
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	void np_handler::reply_record_score(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		std::lock_guard lock_trans(mutex_async_transactions);
-		if (!async_transactions.count(req_id))
-		{
-			rpcn_log.error("Couldn't find transaction(%d) in trans_id!", req_id);
-			return;
-		}
-
-		auto score_trans = idm::get_unlocked<score_transaction_ctx>(::at32(async_transactions, req_id)->idm_id);
-		ensure(score_trans);
-
-		std::lock_guard lock(score_trans->mutex);
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::ScoreNotBest:
-		{
-			score_trans->result = SCE_NP_COMMUNITY_SERVER_ERROR_NOT_BEST_SCORE;
-			score_trans->wake_cond.notify_one();
-			return;
-		}
-		default: fmt::throw_exception("Unexpected error in reply_record_score: %d", static_cast<u8>(error));
-		}
-
-		auto tmp_rank = reply.get<u32>();
-		ensure(!reply.is_error(), "Error parsing response in reply_record_score");
-
-		const auto* tdata = std::get_if<tdata_record_score>(&score_trans->tdata);
-		ensure(tdata);
-
-		if (tdata->tmpRank)
-		{
-			*tdata->tmpRank = tmp_rank;
-		}
-
-		score_trans->result = CELL_OK;
-		score_trans->wake_cond.notify_one();
-	}
-
-	void np_handler::record_score_data(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, SceNpScoreValue score, u32 totalSize, u32 sendSize, const u8* score_data, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-
-		auto* tdata = std::get_if<tdata_record_score_data>(&trans_ctx->tdata);
-		if (!tdata)
-		{
-			trans_ctx->tdata = tdata_record_score_data{.game_data_size = totalSize};
-			tdata = std::get_if<tdata_record_score_data>(&trans_ctx->tdata);
-			tdata->game_data.reserve(totalSize);
-		}
-
-		std::copy(score_data, score_data + sendSize, std::back_inserter(tdata->game_data));
-
-		if (tdata->game_data.size() == tdata->game_data_size)
-		{
-			trans_ctx->result = std::nullopt;
-			const u32 req_id = get_req_id(REQUEST_ID_HIGH::SCORE);
-			get_rpcn()->record_score_data(req_id, trans_ctx->communicationId, trans_ctx->pcId, boardId, score, tdata->game_data);
-			transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-		}
-		else
-		{
-			trans_ctx->result = CELL_OK;
-		}
-	}
-
-	void np_handler::reply_record_score_data(u32 req_id, rpcn::ErrorType error)
-	{
-		std::lock_guard lock_trans(mutex_async_transactions);
-		if (!async_transactions.count(req_id))
-		{
-			rpcn_log.error("Couldn't find transaction(%d) in trans_id!", req_id);
-			return;
-		}
-
-		auto trans = ::at32(async_transactions, req_id);
-		std::lock_guard lock(trans->mutex);
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: trans->set_result_and_wake(CELL_OK); break;
-		case rpcn::ErrorType::NotFound: trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_RANKING_STORE_NOT_FOUND); break;
-		case rpcn::ErrorType::ScoreInvalid: trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_INVALID_SCORE); break;
-		case rpcn::ErrorType::ScoreHasData: trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_GAME_DATA_ALREADY_EXISTS); break;
-		default: fmt::throw_exception("Unexpected error in reply to RecordScoreData: %d", static_cast<u8>(error));
-		}
-	}
-
-	void np_handler::get_score_data(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, const SceNpId& npId, vm::ptr<u32> totalSize, u32 recvSize, vm::ptr<void> score_data, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-
-		auto* tdata = std::get_if<tdata_get_score_data>(&trans_ctx->tdata);
-		if (!tdata)
-		{
-			trans_ctx->tdata = tdata_get_score_data{.totalSize = totalSize, .recvSize = recvSize, .score_data = score_data};
-
-			const u32 req_id = get_req_id(REQUEST_ID_HIGH::SCORE);
-			get_rpcn()->get_score_data(req_id, trans_ctx->communicationId, trans_ctx->pcId, boardId, npId);
-			transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-			return;
-		}
-
-		// Check if the transaction has actually completed, otherwise adjust tdata parameters
-		if (!trans_ctx->result)
-		{
-			tdata->totalSize = totalSize;
-			tdata->recvSize = recvSize;
-			tdata->score_data = score_data;
-			return;
-		}
-
-		// If here the data has already been acquired and the client is just asking for part of it
-		usz to_copy = std::min(tdata->game_data.size(), static_cast<usz>(recvSize));
-		std::memcpy(score_data.get_ptr(), tdata->game_data.data(), to_copy);
-		tdata->game_data.erase(tdata->game_data.begin(), tdata->game_data.begin() + to_copy);
-		*totalSize = tdata->game_data_size;
-		trans_ctx->result = not_an_error(to_copy);
-	}
-
-	void np_handler::reply_get_score_data(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		std::lock_guard lock_trans(mutex_async_transactions);
-		if (!async_transactions.count(req_id))
-		{
-			rpcn_log.error("Couldn't find transaction(%d) in trans_id!", req_id);
-			return;
-		}
-
-		auto score_trans = idm::get_unlocked<score_transaction_ctx>(::at32(async_transactions, req_id)->idm_id);
-		ensure(score_trans);
-		std::lock_guard lock(score_trans->mutex);
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::NotFound: score_trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_RANKING_GAME_DATA_MASTER_NOT_FOUND); return;
-		default: fmt::throw_exception("Unexpected error in reply to GetScoreData: %d", static_cast<u8>(error));
-		}
-
-		auto* tdata = std::get_if<tdata_get_score_data>(&score_trans->tdata);
-		ensure(tdata);
-
-		tdata->game_data = reply.get_rawdata();
-		ensure(!reply.is_error(), "Error parsing response in reply_get_score_data");
-
-		tdata->game_data_size = ::size32(tdata->game_data);
-
-		usz to_copy = std::min(tdata->game_data.size(), static_cast<usz>(tdata->recvSize));
-		std::memcpy(tdata->score_data.get_ptr(), tdata->game_data.data(), to_copy);
-		tdata->game_data.erase(tdata->game_data.begin(), tdata->game_data.begin() + to_copy);
-		*tdata->totalSize = tdata->game_data_size;
-
-		score_trans->set_result_and_wake(not_an_error(to_copy));
-	}
-
-	void np_handler::get_score_range(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, SceNpScoreRankNumber startSerialRank, vm::ptr<SceNpScoreRankData> rankArray, u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, [[maybe_unused]] u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, bool async, bool deprecated)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::SCORE);
-
-		trans_ctx->tdata = tdata_get_score_generic{
-			.rankArray = rankArray,
-			.rankArraySize = rankArraySize,
-			.commentArray = commentArray,
-			.infoArray = infoArray,
-			.infoArraySize = infoArraySize,
-			.arrayNum = arrayNum,
-			.lastSortDate = lastSortDate,
-			.totalRecord = totalRecord,
-			.player_rank_data = false,
-			.deprecated = deprecated,
-		};
-
-		bool with_comments = !!commentArray;
-		bool with_gameinfo = !!infoArray;
-
-		get_rpcn()->get_score_range(req_id, trans_ctx->communicationId, boardId, startSerialRank, arrayNum, with_comments, with_gameinfo);
-
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	template <typename T>
-	void set_rankdata_values(T& cur_rank, const ScoreRankData* fb_rankdata)
-	{
-		string_to_npid(fb_rankdata->npId()->string_view(), cur_rank.npId);
-		string_to_online_name(fb_rankdata->onlineName()->string_view(), cur_rank.onlineName);
-
-		static_assert(std::is_same_v<T, SceNpScoreRankData> || std::is_same_v<T, SceNpScoreRankData_deprecated>);
-
-		if constexpr (std::is_same_v<T, SceNpScoreRankData>)
-			cur_rank.pcId = fb_rankdata->pcId();
-
-		cur_rank.serialRank = fb_rankdata->rank();
-		cur_rank.rank = fb_rankdata->rank();
-		cur_rank.highestRank = fb_rankdata->rank();
-		cur_rank.scoreValue = fb_rankdata->score();
-		cur_rank.hasGameData = fb_rankdata->hasGameData();
-		cur_rank.recordDate.tick = fb_rankdata->recordDate();
-	}
-
-	void np_handler::handle_GetScoreResponse(u32 req_id, rpcn::ErrorType error, vec_stream& reply, bool simple_result)
-	{
-		std::lock_guard lock_trans(mutex_async_transactions);
-		if (!async_transactions.count(req_id))
-		{
-			rpcn_log.error("Couldn't find transaction(%d) in trans_id!", req_id);
-			return;
-		}
-
-		auto score_trans = idm::get_unlocked<score_transaction_ctx>(::at32(async_transactions, req_id)->idm_id);
-		ensure(score_trans);
-		std::lock_guard lock(score_trans->mutex);
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		default: fmt::throw_exception("Unexpected error in GetScoreResponse: %d", static_cast<u8>(error));
-		}
-
-		const auto* resp = reply.get_flatbuffer<GetScoreResponse>();
-		ensure(!reply.is_error(), "Error parsing response in handle_GetScoreResponse");
-
-		const auto* tdata = std::get_if<tdata_get_score_generic>(&score_trans->tdata);
-		ensure(tdata);
-		ensure(resp->rankArray() && resp->rankArray()->size() <= tdata->arrayNum);
-
-		memset(tdata->rankArray.get_ptr(), 0, tdata->rankArraySize);
-		auto* fb_rankarray = resp->rankArray();
-
-		vm::ptr<SceNpScorePlayerRankData> rankPlayerArray = vm::static_ptr_cast<SceNpScorePlayerRankData>(tdata->rankArray);
-		vm::ptr<SceNpScorePlayerRankData_deprecated> rankPlayerArray_deprecated = vm::static_ptr_cast<SceNpScorePlayerRankData_deprecated>(tdata->rankArray);
-		vm::ptr<SceNpScoreRankData> rankArray = vm::static_ptr_cast<SceNpScoreRankData>(tdata->rankArray);
-		vm::ptr<SceNpScoreRankData_deprecated> rankArray_deprecated = vm::static_ptr_cast<SceNpScoreRankData_deprecated>(tdata->rankArray);
-
-		u32 num_scores_registered = 0;
-
-		for (flatbuffers::uoffset_t i = 0; i < fb_rankarray->size(); i++)
-		{
-			const auto* fb_rankdata = fb_rankarray->Get(i);
-			ensure(fb_rankdata->npId() && fb_rankdata->onlineName());
-
-			if (fb_rankdata->recordDate() == 0)
-				continue;
-
-			num_scores_registered++;
-
-			if (tdata->player_rank_data)
-			{
-				if (tdata->deprecated)
-				{
-					rankPlayerArray_deprecated[i].hasData = 1;
-					set_rankdata_values(rankPlayerArray_deprecated[i].rankData, fb_rankdata);
-				}
-				else
-				{
-					rankPlayerArray[i].hasData = 1;
-					set_rankdata_values(rankPlayerArray[i].rankData, fb_rankdata);
-				}
-			}
-			else
-			{
-				if (tdata->deprecated)
-				{
-					set_rankdata_values(rankArray_deprecated[i], fb_rankdata);
-				}
-				else
-				{
-					set_rankdata_values(rankArray[i], fb_rankdata);
-				}
-			}
-		}
-
-		if (tdata->commentArray)
-		{
-			ensure(resp->commentArray() && resp->commentArray()->size() <= tdata->arrayNum);
-			memset(tdata->commentArray.get_ptr(), 0, sizeof(SceNpScoreComment) * tdata->arrayNum);
-
-			auto* fb_commentarray = resp->commentArray();
-			for (flatbuffers::uoffset_t i = 0; i < fb_commentarray->size(); i++)
-			{
-				const auto* fb_comment = fb_commentarray->Get(i);
-				strcpy_trunc(tdata->commentArray[i].data, fb_comment->string_view());
-			}
-		}
-
-		if (tdata->infoArray)
-		{
-			ensure(resp->infoArray() && resp->infoArray()->size() <= tdata->arrayNum);
-			auto* fb_infoarray = resp->infoArray();
-
-			if ((tdata->arrayNum * sizeof(SceNpScoreGameInfo)) == tdata->infoArraySize)
-			{
-				vm::ptr<SceNpScoreGameInfo> ptr_gameinfo = vm::static_ptr_cast<SceNpScoreGameInfo>(tdata->infoArray);
-				memset(ptr_gameinfo.get_ptr(), 0, sizeof(SceNpScoreGameInfo) * tdata->arrayNum);
-				for (flatbuffers::uoffset_t i = 0; i < fb_infoarray->size(); i++)
-				{
-					const auto* fb_info = fb_infoarray->Get(i);
-					ensure(fb_info->data()->size() <= SCE_NP_SCORE_GAMEINFO_SIZE);
-					memcpy(ptr_gameinfo[i].nativeData, fb_info->data()->data(), fb_info->data()->size());
-				}
-			}
-			else
-			{
-				vm::ptr<SceNpScoreVariableSizeGameInfo> ptr_vargameinfo = vm::static_ptr_cast<SceNpScoreVariableSizeGameInfo>(tdata->infoArray);
-				memset(ptr_vargameinfo.get_ptr(), 0, sizeof(SceNpScoreVariableSizeGameInfo) * tdata->arrayNum);
-				for (flatbuffers::uoffset_t i = 0; i < fb_infoarray->size(); i++)
-				{
-					const auto* fb_info = fb_infoarray->Get(i);
-					ensure(fb_info->data()->size() <= SCE_NP_SCORE_VARIABLE_SIZE_GAMEINFO_MAXSIZE);
-					ptr_vargameinfo[i].infoSize = fb_info->data()->size();
-					memcpy(ptr_vargameinfo[i].data, fb_info->data(), fb_info->data()->size());
-				}
-			}
-		}
-
-		tdata->lastSortDate->tick = resp->lastSortDate();
-		*tdata->totalRecord = resp->totalRecord();
-
-		if (num_scores_registered)
-			score_trans->result = simple_result ? CELL_OK : not_an_error(fb_rankarray->size());
-		else
-			score_trans->result = SCE_NP_COMMUNITY_SERVER_ERROR_GAME_RANKING_NOT_FOUND;
-
-		score_trans->wake_cond.notify_one();
-	}
-
-	void np_handler::reply_get_score_range(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		handle_GetScoreResponse(req_id, error, reply);
-	}
-
-	void np_handler::get_score_friend(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, bool include_self, vm::ptr<SceNpScoreRankData> rankArray, u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, [[maybe_unused]] u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, bool async, bool deprecated)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::SCORE);
-		trans_ctx->tdata = tdata_get_score_generic{
-			.rankArray = rankArray,
-			.rankArraySize = rankArraySize,
-			.commentArray = commentArray,
-			.infoArray = infoArray,
-			.infoArraySize = infoArraySize,
-			.arrayNum = arrayNum,
-			.lastSortDate = lastSortDate,
-			.totalRecord = totalRecord,
-			.player_rank_data = false,
-			.deprecated = deprecated,
-		};
-
-		bool with_comments = !!commentArray;
-		bool with_gameinfo = !!infoArray;
-
-		get_rpcn()->get_score_friend(req_id, trans_ctx->communicationId, boardId, include_self, with_comments, with_gameinfo, arrayNum);
-
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-	void np_handler::reply_get_score_friends(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		handle_GetScoreResponse(req_id, error, reply);
-	}
-
-	void np_handler::get_score_npid(shared_ptr<score_transaction_ctx>& trans_ctx, SceNpScoreBoardId boardId, const std::vector<std::pair<SceNpId, s32>>& npid_vec, vm::ptr<SceNpScorePlayerRankData> rankArray, u32 rankArraySize, vm::ptr<SceNpScoreComment> commentArray, [[maybe_unused]] u32 commentArraySize, vm::ptr<void> infoArray, u32 infoArraySize, u32 arrayNum, vm::ptr<CellRtcTick> lastSortDate, vm::ptr<SceNpScoreRankNumber> totalRecord, bool async, bool deprecated)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::SCORE);
-		trans_ctx->tdata = tdata_get_score_generic{
-			.rankArray = rankArray,
-			.rankArraySize = rankArraySize,
-			.commentArray = commentArray,
-			.infoArray = infoArray,
-			.infoArraySize = infoArraySize,
-			.arrayNum = arrayNum,
-			.lastSortDate = lastSortDate,
-			.totalRecord = totalRecord,
-			.player_rank_data = true,
-			.deprecated = deprecated,
-		};
-
-		bool with_comments = !!commentArray;
-		bool with_gameinfo = !!infoArray;
-
-		get_rpcn()->get_score_npid(req_id, trans_ctx->communicationId, boardId, npid_vec, with_comments, with_gameinfo);
-
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-	void np_handler::reply_get_score_npid(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		handle_GetScoreResponse(req_id, error, reply, true);
-	}
-
-	void np_handler::handle_tus_no_data(u32 req_id, rpcn::ErrorType error)
-	{
-		std::lock_guard lock_trans(mutex_async_transactions);
-		if (!async_transactions.count(req_id))
-		{
-			rpcn_log.error("Couldn't find transaction(%d) in trans_id!", req_id);
-			return;
-		}
-
-		auto trans = ::at32(async_transactions, req_id);
-		std::lock_guard lock(trans->mutex);
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: trans->set_result_and_wake(CELL_OK); break;
-		case rpcn::ErrorType::NotFound: trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_USER_NOT_ASSIGNED); break;
-		case rpcn::ErrorType::Unauthorized: trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_FORBIDDEN); break;
-		case rpcn::ErrorType::CondFail: trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_CONDITIONS_NOT_SATISFIED); break;
-		default: fmt::throw_exception("Unexpected error in handle_tus_no_data: %d", static_cast<u8>(error));
-		}
-	}
-
-	void np_handler::handle_TusVarResponse(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		std::lock_guard lock_trans(mutex_async_transactions);
-		if (!async_transactions.count(req_id))
-		{
-			rpcn_log.error("Couldn't find transaction(%d) in trans_id!", req_id);
-			return;
-		}
-
-		auto tus_trans = idm::get_unlocked<tus_transaction_ctx>(::at32(async_transactions, req_id)->idm_id);
-		ensure(tus_trans);
-		std::lock_guard lock(tus_trans->mutex);
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::NotFound: return tus_trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_USER_NOT_ASSIGNED);
-		case rpcn::ErrorType::Unauthorized: return tus_trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_FORBIDDEN);
-		case rpcn::ErrorType::CondFail: return tus_trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_CONDITIONS_NOT_SATISFIED);
-		default: fmt::throw_exception("Unexpected error in handle_TusVarResponse: %d", static_cast<u8>(error));
-		}
-
-		const auto* resp = reply.get_flatbuffer<TusVarResponse>();
-		ensure(!reply.is_error(), "Error parsing response in handle_TusVarResponse");
-
-		const auto* tdata = std::get_if<tdata_tus_get_variables_generic>(&tus_trans->tdata);
-		ensure(tdata);
-		ensure(resp->vars() && resp->vars()->size() <= static_cast<usz>(tdata->arrayNum));
-
-		const auto* fb_vars = resp->vars();
-
-		memset(tdata->variableArray.get_ptr(), 0, sizeof(SceNpTusVariable) * tdata->arrayNum);
-		for (flatbuffers::uoffset_t i = 0; i < fb_vars->size(); i++)
-		{
-			auto* cur_var = &tdata->variableArray[i];
-			const auto* cur_fb_var = fb_vars->Get(i);
-
-			ensure(cur_fb_var->ownerId());
-			string_to_npid(cur_fb_var->ownerId()->string_view(), cur_var->ownerId);
-
-			if (!cur_fb_var->hasData())
-			{
-				continue;
-			}
-
-			ensure(cur_fb_var->lastChangedAuthorId());
-
-			cur_var->hasData = 1;
-			cur_var->lastChangedDate.tick = cur_fb_var->lastChangedDate();
-			string_to_npid(cur_fb_var->lastChangedAuthorId()->string_view(), cur_var->lastChangedAuthorId);
-			cur_var->variable = cur_fb_var->variable();
-			cur_var->oldVariable = cur_fb_var->oldVariable();
-		}
-
-		tus_trans->result = not_an_error(fb_vars->size());
-		tus_trans->wake_cond.notify_one();
-	}
-
-	void np_handler::handle_TusVariable(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		std::lock_guard lock_trans(mutex_async_transactions);
-		if (!async_transactions.count(req_id))
-		{
-			rpcn_log.error("Couldn't find transaction(%d) in trans_id!", req_id);
-			return;
-		}
-
-		auto tus_trans = idm::get_unlocked<tus_transaction_ctx>(::at32(async_transactions, req_id)->idm_id);
-		ensure(tus_trans);
-		std::lock_guard lock(tus_trans->mutex);
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::NotFound: return tus_trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_USER_NOT_ASSIGNED);
-		case rpcn::ErrorType::Unauthorized: return tus_trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_FORBIDDEN);
-		case rpcn::ErrorType::CondFail: return tus_trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_CONDITIONS_NOT_SATISFIED);
-		default: fmt::throw_exception("Unexpected error in handle_TusVariable: %d", static_cast<u8>(error));
-		}
-
-		const auto* fb_var = reply.get_flatbuffer<TusVariable>();
-		ensure(!reply.is_error(), "Error parsing response in handle_TusVariable");
-
-		const auto* tdata = std::get_if<tdata_tus_get_variable_generic>(&tus_trans->tdata);
-		ensure(tdata);
-
-		auto* var = tdata->outVariable.get_ptr();
-		memset(var, 0, sizeof(SceNpTusVariable));
-
-		ensure(fb_var->ownerId());
-		string_to_npid(fb_var->ownerId()->string_view(), var->ownerId);
-
-		if (fb_var->hasData())
-		{
-			ensure(fb_var->lastChangedAuthorId());
-			var->hasData = 1;
-			var->lastChangedDate.tick = fb_var->lastChangedDate();
-			string_to_npid(fb_var->lastChangedAuthorId()->string_view(), var->lastChangedAuthorId);
-			var->variable = fb_var->variable();
-			var->oldVariable = fb_var->oldVariable();
-		}
-
-		tus_trans->result = CELL_OK;
-		tus_trans->wake_cond.notify_one();
-	}
-
-	void np_handler::handle_TusDataStatusResponse(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		std::lock_guard lock_trans(mutex_async_transactions);
-		if (!async_transactions.count(req_id))
-		{
-			rpcn_log.error("Couldn't find transaction(%d) in trans_id!", req_id);
-			return;
-		}
-
-		auto tus_trans = idm::get_unlocked<tus_transaction_ctx>(::at32(async_transactions, req_id)->idm_id);
-		ensure(tus_trans);
-		std::lock_guard lock(tus_trans->mutex);
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::NotFound: return tus_trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_USER_NOT_ASSIGNED);
-		case rpcn::ErrorType::Unauthorized: return tus_trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_FORBIDDEN);
-		case rpcn::ErrorType::CondFail: return tus_trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_CONDITIONS_NOT_SATISFIED);
-		default: fmt::throw_exception("Unexpected error in handle_TusDataStatusResponse: %d", static_cast<u8>(error));
-		}
-
-		const auto* resp = reply.get_flatbuffer<TusDataStatusResponse>();
-		ensure(!reply.is_error(), "Error parsing response in handle_TusDataStatusReponse");
-
-		const auto* tdata = std::get_if<tdata_tus_get_datastatus_generic>(&tus_trans->tdata);
-		ensure(tdata);
-		ensure(resp->status() && resp->status()->size() <= static_cast<usz>(tdata->arrayNum));
-
-		const auto* fb_status = resp->status();
-
-		memset(tdata->statusArray.get_ptr(), 0, sizeof(SceNpTusDataStatus) * tdata->arrayNum);
-		for (flatbuffers::uoffset_t i = 0; i < fb_status->size(); i++)
-		{
-			auto* cur_status = &tdata->statusArray[i];
-			const auto* cur_fb_status = fb_status->Get(i);
-
-			ensure(cur_fb_status->ownerId());
-			string_to_npid(cur_fb_status->ownerId()->string_view(), cur_status->ownerId);
-
-			if (!cur_fb_status->hasData())
-			{
-				continue;
-			}
-
-			ensure(cur_fb_status->lastChangedAuthorId());
-
-			cur_status->hasData = 1;
-			cur_status->lastChangedDate.tick = cur_fb_status->lastChangedDate();
-			string_to_npid(cur_fb_status->lastChangedAuthorId()->string_view(), cur_status->lastChangedAuthorId);
-			cur_status->info.infoSize = cur_fb_status->info() ? cur_fb_status->info()->size() : 0;
-			for (flatbuffers::uoffset_t i = 0; i < cur_status->info.infoSize; i++)
-			{
-				cur_status->info.data[i] = cur_fb_status->info()->Get(i);
-			}
-		}
-
-		tus_trans->result = not_an_error(fb_status->size());
-		tus_trans->wake_cond.notify_one();
-	}
-
-	void np_handler::tus_set_multislot_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::cptr<s64> variableArray, s32 arrayNum, bool vuser, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::TUS);
-
-		get_rpcn()->tus_set_multislot_variable(req_id, trans_ctx->communicationId, targetNpId, slotIdArray, variableArray, arrayNum, vuser);
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	void np_handler::reply_tus_set_multislot_variable(u32 req_id, rpcn::ErrorType error)
-	{
-		return handle_tus_no_data(req_id, error);
-	}
-
-	void np_handler::tus_get_multislot_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusVariable> variableArray, s32 arrayNum, bool vuser, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::TUS);
-
-		trans_ctx->tdata = tdata_tus_get_variables_generic {
-			.variableArray = variableArray,
-			.arrayNum = arrayNum,
-		};
-
-		get_rpcn()->tus_get_multislot_variable(req_id, trans_ctx->communicationId, targetNpId, slotIdArray, arrayNum, vuser);
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	void np_handler::reply_tus_get_multislot_variable(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		return handle_TusVarResponse(req_id, error, reply);
-	}
-
-	void np_handler::tus_get_multiuser_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, std::vector<SceNpOnlineId> targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusVariable> variableArray, s32 arrayNum, bool vuser, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::TUS);
-
-		trans_ctx->tdata = tdata_tus_get_variables_generic {
-			.variableArray = variableArray,
-			.arrayNum = arrayNum,
-		};
-
-		get_rpcn()->tus_get_multiuser_variable(req_id, trans_ctx->communicationId, targetNpIdArray, slotId, arrayNum, vuser);
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	void np_handler::reply_tus_get_multiuser_variable(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		return handle_TusVarResponse(req_id, error, reply);
-	}
-
-	void np_handler::tus_get_friends_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusVariable> variableArray,s32 arrayNum, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::TUS);
-
-		trans_ctx->tdata = tdata_tus_get_variables_generic {
-			.variableArray = variableArray,
-			.arrayNum = arrayNum,
-		};
-
-		get_rpcn()->tus_get_friends_variable(req_id, trans_ctx->communicationId, slotId, !!includeSelf, sortType, arrayNum);
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	void np_handler::reply_tus_get_friends_variable(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		return handle_TusVarResponse(req_id, error, reply);
-	}
-
-	void np_handler::tus_add_and_get_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr<SceNpTusVariable> outVariable, vm::ptr<SceNpTusAddAndGetVariableOptParam> option, bool vuser, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::TUS);
-
-		trans_ctx->tdata = tdata_tus_get_variable_generic {
-			.outVariable = outVariable,
-		};
-
-		get_rpcn()->tus_add_and_get_variable(req_id, trans_ctx->communicationId, targetNpId, slotId, inVariable, option, vuser);
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	void np_handler::reply_tus_add_and_get_variable(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		return handle_TusVariable(req_id, error, reply);
-	}
-
-	void np_handler::tus_try_and_set_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr<SceNpTusVariable> resultVariable, vm::ptr<SceNpTusTryAndSetVariableOptParam> option, bool vuser, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::TUS);
-
-		trans_ctx->tdata = tdata_tus_get_variable_generic {
-			.outVariable = resultVariable,
-		};
-
-		get_rpcn()->tus_try_and_set_variable(req_id, trans_ctx->communicationId, targetNpId, slotId, opeType, variable, option, vuser);
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	void np_handler::reply_tus_try_and_set_variable(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		return handle_TusVariable(req_id, error, reply);
-	}
-
-	void np_handler::tus_delete_multislot_variable(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, bool vuser, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::TUS);
-
-		get_rpcn()->tus_delete_multislot_variable(req_id, trans_ctx->communicationId, targetNpId, slotIdArray, arrayNum, vuser);
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	void np_handler::reply_tus_delete_multislot_variable(u32 req_id, rpcn::ErrorType error)
-	{
-		return handle_tus_no_data(req_id, error);
-	}
-
-	void np_handler::tus_set_data(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, u32 totalSize, u32 sendSize, vm::cptr<void> data, vm::cptr<SceNpTusDataInfo> info, vm::ptr<SceNpTusSetDataOptParam> option, bool vuser, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-
-		auto* tdata = std::get_if<tdata_tus_set_data>(&trans_ctx->tdata);
-		if (!tdata)
-		{
-			trans_ctx->tdata = tdata_tus_set_data{.tus_data_size = totalSize};
-			tdata = std::get_if<tdata_tus_set_data>(&trans_ctx->tdata);
-			tdata->tus_data.reserve(totalSize);
-		}
-
-		const u8* ptr = static_cast<const u8*>(data.get_ptr());
-
-		std::copy(ptr, ptr + sendSize, std::back_inserter(tdata->tus_data));
-
-		if (tdata->tus_data.size() == tdata->tus_data_size)
-		{
-			trans_ctx->result = std::nullopt;
-			const u32 req_id = get_req_id(REQUEST_ID_HIGH::TUS);
-			get_rpcn()->tus_set_data(req_id, trans_ctx->communicationId, targetNpId, slotId, tdata->tus_data, info, option, vuser);
-			transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-		}
-		else
-		{
-			trans_ctx->result = CELL_OK;
-		}
-	}
-
-	void np_handler::reply_tus_set_data(u32 req_id, rpcn::ErrorType error)
-	{
-		return handle_tus_no_data(req_id, error);
-	}
-
-	void np_handler::tus_get_data(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> dataStatus, vm::ptr<void> data, u32 recvSize, bool vuser, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-
-		auto* tdata = std::get_if<tdata_tus_get_data>(&trans_ctx->tdata);
-		if (!tdata)
-		{
-			trans_ctx->tdata = tdata_tus_get_data{.recvSize = recvSize, .dataStatus = dataStatus, .data = data};
-			const u32 req_id = get_req_id(REQUEST_ID_HIGH::SCORE);
-			get_rpcn()->tus_get_data(req_id, trans_ctx->communicationId, targetNpId, slotId, vuser);
-			transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-			return;
-		}
-
-		// Check if the transaction has actually completed, otherwise adjust tdata parameters
-		if (!trans_ctx->result)
-		{
-			tdata->recvSize = recvSize;
-			tdata->dataStatus = dataStatus;
-			tdata->data = data;
-			return;
-		}
-
-		// If here the data has already been acquired and the client is just asking for part of it
-		usz to_copy = std::min(tdata->tus_data.size(), static_cast<usz>(recvSize));
-		std::memcpy(data.get_ptr(), tdata->tus_data.data(), to_copy);
-		tdata->tus_data.erase(tdata->tus_data.begin(), tdata->tus_data.begin() + to_copy);
-		trans_ctx->result = not_an_error(to_copy);
-	}
-
-	void np_handler::reply_tus_get_data(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		std::lock_guard lock_trans(mutex_async_transactions);
-		if (!async_transactions.count(req_id))
-		{
-			rpcn_log.error("Couldn't find transaction(%d) in trans_id!", req_id);
-			return;
-		}
-
-		auto tus_trans = idm::get_unlocked<tus_transaction_ctx>(::at32(async_transactions, req_id)->idm_id);
-		ensure(tus_trans);
-		std::lock_guard lock(tus_trans->mutex);
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::NotFound: return tus_trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_USER_NOT_ASSIGNED);
-		case rpcn::ErrorType::Unauthorized: return tus_trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_FORBIDDEN);
-		case rpcn::ErrorType::CondFail: return tus_trans->set_result_and_wake(SCE_NP_COMMUNITY_SERVER_ERROR_CONDITIONS_NOT_SATISFIED);
-		default: fmt::throw_exception("Unexpected error in reply to TusGetData: %d", static_cast<u8>(error));
-		}
-
-		const auto* fb_data = reply.get_flatbuffer<TusData>();
-		ensure(!reply.is_error(), "Error parsing response in reply_tus_get_data");
-
-		auto* tdata = std::get_if<tdata_tus_get_data>(&tus_trans->tdata);
-		ensure(tdata);
-
-		const auto* fb_status = fb_data->status();
-		ensure(fb_status && fb_status->ownerId());
-		if (!fb_status)
-			return; // Sanity check to make compiler happy
-
-		auto* data_status = tdata->dataStatus.get_ptr();
-		auto* data = static_cast<u8 *>(tdata->data.get_ptr());
-
-		memset(data_status, 0, sizeof(SceNpTusDataStatus));
-		string_to_npid(fb_status->ownerId()->string_view(), data_status->ownerId);
-
-		if (fb_status->hasData())
-		{
-			data_status->hasData = 1;
-			data_status->lastChangedDate.tick = fb_status->lastChangedDate();
-			string_to_npid(fb_status->lastChangedAuthorId()->string_view(), data_status->lastChangedAuthorId);
-			data_status->data = tdata->data;
-			data_status->dataSize = fb_data->data() ? fb_data->data()->size() : 0;
-			data_status->info.infoSize = fb_status->info() ? fb_status->info()->size() : 0;
-			
-			const u32 to_copy = std::min<u32>(data_status->dataSize, tdata->recvSize);
-			for (flatbuffers::uoffset_t i = 0; i < to_copy; i++)
-			{
-				data[i] = fb_data->data()->Get(i);
-			}
-			const u32 bytes_left = data_status->dataSize - to_copy;
-			tdata->tus_data.reserve(bytes_left);
-			for (flatbuffers::uoffset_t i = to_copy; i < bytes_left; i++)
-			{
-				tdata->tus_data.push_back(fb_data->data()->Get(i));
-			}
-
-			for (flatbuffers::uoffset_t i = 0; i < data_status->info.infoSize; i++)
-			{
-				fb_status->info()->Get(i);
-			}
-			tus_trans->result = not_an_error(to_copy);
-		}
-		else
-		{
-			tus_trans->result = SCE_NP_COMMUNITY_SERVER_ERROR_USER_STORAGE_DATA_NOT_FOUND;
-		}
-
-		tus_trans->wake_cond.notify_one();
-	}
-
-	void np_handler::tus_get_multislot_data_status(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::ptr<SceNpTusDataStatus> statusArray, s32 arrayNum, bool vuser, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::TUS);
-
-		trans_ctx->tdata = tdata_tus_get_datastatus_generic {
-			.statusArray = statusArray,
-			.arrayNum = arrayNum,
-		};
-
-		get_rpcn()->tus_get_multislot_data_status(req_id, trans_ctx->communicationId, targetNpId, slotIdArray, arrayNum, vuser);
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	void np_handler::reply_tus_get_multislot_data_status(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		return handle_TusDataStatusResponse(req_id, error, reply);
-	}
-
-	void np_handler::tus_get_multiuser_data_status(shared_ptr<tus_transaction_ctx>& trans_ctx, std::vector<SceNpOnlineId> targetNpIdArray, SceNpTusSlotId slotId, vm::ptr<SceNpTusDataStatus> statusArray, s32 arrayNum, bool vuser, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::TUS);
-
-		trans_ctx->tdata = tdata_tus_get_datastatus_generic {
-			.statusArray = statusArray,
-			.arrayNum = arrayNum,
-		};
-
-		get_rpcn()->tus_get_multiuser_data_status(req_id, trans_ctx->communicationId, targetNpIdArray, slotId, arrayNum, vuser);
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	void np_handler::reply_tus_get_multiuser_data_status(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		return handle_TusDataStatusResponse(req_id, error, reply);
-	}
-
-	void np_handler::tus_get_friends_data_status(shared_ptr<tus_transaction_ctx>& trans_ctx, SceNpTusSlotId slotId, s32 includeSelf, s32 sortType, vm::ptr<SceNpTusDataStatus> statusArray, s32 arrayNum, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::TUS);
-
-		trans_ctx->tdata = tdata_tus_get_datastatus_generic {
-			.statusArray = statusArray,
-			.arrayNum = arrayNum,
-		};
-
-		get_rpcn()->tus_get_friends_data_status(req_id, trans_ctx->communicationId, slotId, !!includeSelf, sortType, arrayNum);
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	void np_handler::reply_tus_get_friends_data_status(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		return handle_TusDataStatusResponse(req_id, error, reply);
-	}
-
-	void np_handler::tus_delete_multislot_data(shared_ptr<tus_transaction_ctx>& trans_ctx, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, bool vuser, bool async)
-	{
-		std::unique_lock lock(trans_ctx->mutex);
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::TUS);
-
-		get_rpcn()->tus_delete_multislot_data(req_id, trans_ctx->communicationId, targetNpId, slotIdArray, arrayNum, vuser);
-		transaction_async_handler(std::move(lock), trans_ctx, req_id, async);
-	}
-
-	void np_handler::reply_tus_delete_multislot_data(u32 req_id, rpcn::ErrorType error)
-	{
-		return handle_tus_no_data(req_id, error);
-	}
-} // namespace np
diff --git a/rpcs3/Emu/NP/np_requests_gui.cpp b/rpcs3/Emu/NP/np_requests_gui.cpp
deleted file mode 100644
index 7782287053..0000000000
--- a/rpcs3/Emu/NP/np_requests_gui.cpp
+++ /dev/null
@@ -1,708 +0,0 @@
-#include "Emu/NP/rpcn_types.h"
-#include "stdafx.h"
-#include "Emu/Cell/PPUCallback.h"
-#include "Emu/Memory/vm_ptr.h"
-#include "Emu/IdManager.h"
-#include "np_handler.h"
-#include "np_contexts.h"
-#include "np_structs_extra.h"
-#include "fb_helpers.h"
-
-LOG_CHANNEL(rpcn_log, "rpcn");
-
-namespace np
-{
-	std::pair<error_code, shared_ptr<matching_ctx>> gui_prelude(u32 ctx_id, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
-	{
-		auto ctx = get_matching_context(ctx_id);
-
-		if (!ctx)
-			return {SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND, {}};
-
-		if (!ctx->busy.compare_and_swap_test(0, 1))
-			return {SCE_NP_MATCHING_ERROR_CTX_STILL_RUNNING, {}};
-
-		ctx->ctx_id = ctx_id;
-		ctx->gui_handler = handler;
-		ctx->gui_arg = arg;
-
-		ctx->queue_gui_callback(SCE_NP_MATCHING_GUI_EVENT_COMMON_LOAD, 0);
-
-		return {CELL_OK, ctx};
-	}
-
-	void gui_epilog(const shared_ptr<matching_ctx>& ctx)
-	{
-		ensure(ctx->busy.compare_and_swap_test(1, 0), "Matching context wasn't busy in gui_epilog");
-		ctx->queue_gui_callback(SCE_NP_MATCHING_GUI_EVENT_COMMON_UNLOAD, 0);
-	}
-
-	void np_handler::set_current_gui_ctx_id(u32 id)
-	{
-		std::lock_guard lock(gui_notifications.mutex);
-
-		gui_notifications.current_gui_ctx_id = id;
-
-		if (id == 0)
-		{
-			for (const auto& [key, notif_data] : gui_notifications.list)
-			{
-				np_memory.free(notif_data.edata.addr());
-			}
-
-			gui_notifications.list.clear();
-		}
-	}
-
-	void np_handler::set_gui_result(s32 event, np::event_data data)
-	{
-		std::lock_guard lock(gui_result.mutex);
-		if (gui_result.event)
-			np_memory.free(gui_result.data.addr());
-
-		gui_result.data = std::move(data);
-		gui_result.event = event;
-	}
-
-	error_code np_handler::get_matching_result(u32 ctx_id, u32 req_id, vm::ptr<void> buf, vm::ptr<u32> size, vm::ptr<s32> event)
-	{
-		std::lock_guard lock(gui_notifications.mutex);
-
-		auto ctx = get_matching_context(ctx_id);
-
-		if (!gui_notifications.current_gui_ctx_id || !ctx)
-		{
-			return SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND;
-		}
-
-		if (!gui_notifications.list.contains(std::make_pair(ctx_id, req_id)))
-		{
-			return SCE_NP_MATCHING_ERROR_INVALID_REQ_ID;
-		}
-
-		const auto key = std::make_pair(ctx_id, req_id);
-
-		auto& notif = ::at32(gui_notifications.list, key);
-
-		if (event)
-		{
-			*event = notif.event;
-		}
-
-		if (!buf)
-		{
-			*size = notif.edata.size();
-			return CELL_OK;
-		}
-
-		const u32 final_size = std::min(static_cast<u32>(*size), notif.edata.size());
-		notif.edata.apply_relocations(buf.addr());
-		memcpy(buf.get_ptr(), notif.edata.data(), final_size);
-		*size = final_size;
-
-		np_memory.free(notif.edata.addr());
-		gui_notifications.list.erase(key);
-
-		return CELL_OK;
-	}
-
-	error_code np_handler::get_result_gui(vm::ptr<void> buf, vm::ptr<u32> size, vm::ptr<s32> event)
-	{
-		std::lock_guard lock(gui_result.mutex);
-
-		if (!gui_result.event)
-		{
-			return SCE_NP_MATCHING_ERROR_RESULT_NOT_FOUND;
-		}
-
-		if (event)
-		{
-			*event = gui_result.event;
-		}
-
-		if (!buf)
-		{
-			*size = gui_result.data.size();
-			return CELL_OK;
-		}
-
-		const u32 final_size = std::min(static_cast<u32>(*size), gui_result.data.size());
-		gui_result.data.apply_relocations(buf.addr());
-		memcpy(buf.get_ptr(), gui_result.data.data(), final_size);
-		*size = final_size;
-
-		np_memory.free(gui_result.data.addr());
-		gui_result.event = 0;
-
-		return CELL_OK;
-	}
-
-	error_code np_handler::create_room_gui(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
-	{
-		const auto [error, ctx] = gui_prelude(ctx_id, handler, arg);
-
-		if (error)
-			return error;
-
-		for (auto cur_attr = attr; cur_attr; cur_attr = cur_attr->next)
-		{
-			extra_nps::print_SceNpMatchingAttr(cur_attr.get_ptr());
-		}
-
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::GUI);
-		add_gui_request(req_id, ctx_id);
-
-		get_rpcn()->createjoin_room_gui(req_id, *communicationId, attr.get_ptr());
-
-		return CELL_OK;
-	}
-
-	void np_handler::reply_create_room_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto ctx = take_pending_gui_request(req_id);
-
-		if (!ctx)
-			return;
-
-		ensure(error == rpcn::ErrorType::NoError, "Unexpected error in CreateRoomGUI reply");
-		const auto* resp = reply.get_flatbuffer<MatchingRoomStatus>();
-		ensure(!reply.is_error(), "Malformed reply to CreateRoomGUI command");
-
-		event_data edata(np_memory.allocate(MAX_SceNpMatchingJoinedRoomInfo_SIZE), sizeof(SceNpMatchingJoinedRoomInfo), MAX_SceNpMatchingJoinedRoomInfo_SIZE);
-		auto* room_info = reinterpret_cast<SceNpMatchingJoinedRoomInfo*>(edata.data());
-		MatchingRoomStatus_to_SceNpMatchingJoinedRoomInfo(edata, resp, room_info);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		gui_cache.add_room(room_info->room_status.id);
-		gui_cache.add_member(room_info->room_status.id, room_info->room_status.members.get_ptr(), true);
-
-		set_gui_result(SCE_NP_MATCHING_GUI_EVENT_CREATE_ROOM, std::move(edata));
-		ctx->queue_gui_callback(SCE_NP_MATCHING_GUI_EVENT_CREATE_ROOM, 0);
-		gui_epilog(ctx);
-	}
-
-	error_code np_handler::join_room_gui(u32 ctx_id, vm::ptr<SceNpRoomId> roomid, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
-	{
-		auto [error, ctx] = gui_prelude(ctx_id, handler, arg);
-
-		if (error)
-			return error;
-
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::GUI);
-		add_gui_request(req_id, ctx_id);
-
-		get_rpcn()->join_room_gui(req_id, *roomid);
-
-		return CELL_OK;
-	}
-
-	void np_handler::reply_join_room_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto ctx = take_pending_gui_request(req_id);
-
-		if (!ctx)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing:
-			error_code = SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_ROOM;
-			break;
-		case rpcn::ErrorType::RoomFull:
-			// Might also be SCE_NP_MATCHING_SERVER_ERROR_ACCESS_FORBIDDEN or SCE_NP_MATCHING_SERVER_ERROR_NOT_ALLOWED ?
-			error_code = SCE_NP_MATCHING_SERVER_ERROR_ROOM_CLOSED;
-			break;
-		case rpcn::ErrorType::RoomAlreadyJoined:
-			error_code = SCE_NP_MATCHING_SERVER_ERROR_ACCESS_FORBIDDEN;
-			break;
-		default:
-			fmt::throw_exception("Unexpected error in JoinRoomGUI reply: %d", static_cast<u8>(error));
-			break;
-		}
-
-		if (error_code != 0)
-		{
-			ctx->queue_gui_callback(SCE_NP_MATCHING_GUI_EVENT_JOIN_ROOM, error_code);
-			gui_epilog(ctx);
-			return;
-		}
-
-		const auto* resp = reply.get_flatbuffer<MatchingRoomStatus>();
-		ensure(!reply.is_error(), "Malformed reply to JoinRoomGUI command");
-
-		event_data edata(np_memory.allocate(MAX_SceNpMatchingJoinedRoomInfo_SIZE), sizeof(SceNpMatchingJoinedRoomInfo), MAX_SceNpMatchingJoinedRoomInfo_SIZE);
-		auto* room_info = reinterpret_cast<SceNpMatchingJoinedRoomInfo*>(edata.data());
-		MatchingRoomStatus_to_SceNpMatchingJoinedRoomInfo(edata, resp, room_info);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		extra_nps::print_SceNpMatchingJoinedRoomInfo(room_info);
-
-		gui_cache.add_room(room_info->room_status.id);
-
-		for (auto cur_member = room_info->room_status.members; cur_member; cur_member = cur_member->next)
-		{
-			gui_cache.add_member(room_info->room_status.id, cur_member.get_ptr(), true);
-		}
-
-		set_gui_result(SCE_NP_MATCHING_GUI_EVENT_JOIN_ROOM, std::move(edata));
-		ctx->queue_gui_callback(SCE_NP_MATCHING_GUI_EVENT_JOIN_ROOM, 0);
-		gui_epilog(ctx);
-	}
-
-	error_code np_handler::leave_room_gui(u32 ctx_id, vm::cptr<SceNpRoomId> roomid)
-	{
-		auto ctx = get_matching_context(ctx_id);
-
-		if (!ctx)
-			return SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND;
-
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::GUI);
-		add_gui_request(req_id, ctx_id);
-
-		ensure(roomid);
-		extra_nps::print_SceNpRoomId(*roomid);
-		get_rpcn()->leave_room_gui(req_id, *roomid);
-
-		return not_an_error(req_id);
-	}
-
-	void np_handler::reply_leave_room_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto ctx = take_pending_gui_request(req_id);
-
-		if (!ctx)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_ROOM; break;
-		default: fmt::throw_exception("Unexpected error in LeaveRoomGUI reply: %d", static_cast<u8>(error));
-		}
-
-		if (error_code != CELL_OK)
-		{
-			ctx->queue_callback(req_id, SCE_NP_MATCHING_EVENT_LEAVE_ROOM_DONE, error_code);
-			return;
-		}
-
-		const auto* resp = reply.get_flatbuffer<MatchingRoomStatus>();
-		ensure(!reply.is_error(), "Malformed reply to LeaveRoomGUI command");
-
-		event_data edata(np_memory.allocate(MAX_SceNpMatchingRoomStatus_SIZE), sizeof(SceNpMatchingRoomStatus), MAX_SceNpMatchingRoomStatus_SIZE);
-		auto* room_status = reinterpret_cast<SceNpMatchingRoomStatus*>(edata.data());
-		MatchingRoomStatus_to_SceNpMatchingRoomStatus(edata, resp, room_status);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		extra_nps::print_SceNpMatchingRoomStatus(room_status);
-
-		gui_cache.del_room(room_status->id);
-
-		gui_notifications.list.emplace(std::make_pair(gui_notifications.current_gui_ctx_id, req_id), gui_notification{.event = SCE_NP_MATCHING_EVENT_LEAVE_ROOM_DONE, .edata = std::move(edata)});
-		ctx->queue_callback(req_id, SCE_NP_MATCHING_EVENT_LEAVE_ROOM_DONE, 0);
-	}
-
-	error_code np_handler::get_room_list_gui(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::ptr<SceNpMatchingReqRange> range, vm::ptr<SceNpMatchingSearchCondition> cond, vm::ptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg, bool limit)
-	{
-		auto [error, ctx] = gui_prelude(ctx_id, handler, arg);
-
-		if (error)
-			return error;
-
-		for (auto cur_cond = cond; cur_cond; cur_cond = cur_cond->next)
-		{
-			extra_nps::print_SceNpMatchingSearchCondition(cur_cond.get_ptr());
-		}
-
-		for (auto cur_attr = attr; cur_attr; cur_attr = cur_attr->next)
-		{
-			extra_nps::print_SceNpMatchingAttr(cur_attr.get_ptr());
-		}
-
-		ctx->get_room_limit_version = limit;
-
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::GUI);
-		add_gui_request(req_id, ctx_id);
-
-		ensure(range);
-		get_rpcn()->get_room_list_gui(req_id, *communicationId, range.get_ptr(), cond, attr);
-
-		return CELL_OK;
-	}
-
-	void np_handler::reply_get_room_list_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto ctx = take_pending_gui_request(req_id);
-
-		if (!ctx)
-			return;
-
-		ensure(error == rpcn::ErrorType::NoError, "Unexpected error in GetRoomListGUI reply");
-		const auto* resp = reply.get_flatbuffer<MatchingRoomList>();
-		ensure(!reply.is_error(), "Malformed reply to GetRoomListGUI command");
-
-		event_data edata(np_memory.allocate(MAX_SceNpMatchingRoomList_SIZE), sizeof(SceNpMatchingRoomList), MAX_SceNpMatchingRoomList_SIZE);
-		auto* room_list = reinterpret_cast<SceNpMatchingRoomList*>(edata.data());
-		MatchingRoomList_to_SceNpMatchingRoomList(edata, resp, room_list);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		extra_nps::print_SceNpMatchingRoomList(room_list);
-
-		if (ctx->get_room_limit_version)
-		{
-			set_gui_result(SCE_NP_MATCHING_GUI_EVENT_GET_ROOM_LIST_LIMIT, std::move(edata));
-			ctx->queue_gui_callback(SCE_NP_MATCHING_GUI_EVENT_GET_ROOM_LIST_LIMIT, 0);
-		}
-		else
-		{
-			set_gui_result(SCE_NP_MATCHING_GUI_EVENT_GET_ROOM_LIST, std::move(edata));
-			ctx->queue_gui_callback(SCE_NP_MATCHING_GUI_EVENT_GET_ROOM_LIST, 0);
-		}
-
-		gui_epilog(ctx);
-	}
-
-	error_code np_handler::set_room_search_flag_gui(u32 ctx_id, vm::ptr<SceNpLobbyId> /* lobby_id */, vm::ptr<SceNpRoomId> room_id, s32 flag)
-	{
-		auto ctx = get_matching_context(ctx_id);
-
-		if (!ctx)
-			return SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND;
-
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::GUI);
-		add_gui_request(req_id, ctx_id);
-
-		ensure(room_id);
-		extra_nps::print_SceNpRoomId(*room_id);
-		get_rpcn()->set_room_search_flag_gui(req_id, *room_id, flag);
-
-		return not_an_error(req_id);
-	}
-
-	void np_handler::reply_set_room_search_flag_gui(u32 req_id, rpcn::ErrorType error)
-	{
-		auto ctx = take_pending_gui_request(req_id);
-
-		if (!ctx)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_ROOM; break;
-		case rpcn::ErrorType::Unauthorized: error_code = SCE_NP_MATCHING_SERVER_ERROR_NOT_ALLOWED; break;
-		default: fmt::throw_exception("Unexpected error in SetRoomSearchFlagGUI reply: %d", static_cast<u8>(error));
-		}
-
-		ctx->queue_callback(req_id, SCE_NP_MATCHING_EVENT_SET_ROOM_SEARCH_FLAG_DONE, error_code);
-	}
-
-	error_code np_handler::get_room_search_flag_gui(u32 ctx_id, vm::ptr<SceNpLobbyId> /* lobby_id */, vm::ptr<SceNpRoomId> room_id)
-	{
-		auto ctx = get_matching_context(ctx_id);
-
-		if (!ctx)
-			return SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND;
-
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::GUI);
-		add_gui_request(req_id, ctx_id);
-
-		ensure(room_id);
-		extra_nps::print_SceNpRoomId(*room_id);
-		get_rpcn()->get_room_search_flag_gui(req_id, *room_id);
-
-		return not_an_error(req_id);
-	}
-
-	void np_handler::reply_get_room_search_flag_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto ctx = take_pending_gui_request(req_id);
-
-		if (!ctx)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_ROOM; break;
-		default: fmt::throw_exception("Unexpected error in GetRoomSearchFlagGUI reply: %d", static_cast<u8>(error));
-		}
-
-		if (error_code != CELL_OK)
-		{
-			ctx->queue_callback(req_id, SCE_NP_MATCHING_EVENT_GET_ROOM_SEARCH_FLAG_DONE, error_code);
-			return;
-		}
-
-		const auto* resp = reply.get_flatbuffer<MatchingRoom>();
-		ensure(!reply.is_error(), "Malformed reply to GetRoomSearchFlagGUI command");
-
-		event_data edata(np_memory.allocate(MAX_SceNpMatchingRoom_SIZE), sizeof(SceNpMatchingRoom), MAX_SceNpMatchingRoom_SIZE);
-		auto* room_info = reinterpret_cast<SceNpMatchingRoom*>(edata.data());
-		MatchingRoom_to_SceNpMatchingRoom(edata, resp, room_info);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		extra_nps::print_SceNpMatchingRoom(room_info);
-
-		gui_notifications.list.emplace(std::make_pair(gui_notifications.current_gui_ctx_id, req_id), gui_notification{.event = SCE_NP_MATCHING_EVENT_GET_ROOM_SEARCH_FLAG_DONE, .edata = std::move(edata)});
-		ctx->queue_callback(req_id, SCE_NP_MATCHING_EVENT_GET_ROOM_SEARCH_FLAG_DONE, 0);
-	}
-
-	error_code np_handler::set_room_info_gui(u32 ctx_id, vm::ptr<SceNpLobbyId> /* lobby_id */, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr)
-	{
-		auto ctx = get_matching_context(ctx_id);
-
-		if (!ctx)
-			return SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND;
-
-		for (auto cur_attr = attr; cur_attr; cur_attr = cur_attr->next)
-		{
-			extra_nps::print_SceNpMatchingAttr(cur_attr.get_ptr());
-		}
-
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::GUI);
-		add_gui_request(req_id, ctx_id);
-
-		ensure(room_id && attr);
-		// extra_nps::print_SceNpRoomId(*room_id);
-		get_rpcn()->set_room_info_gui(req_id, *room_id, attr);
-
-		return not_an_error(req_id);
-	}
-
-	void np_handler::reply_set_room_info_gui(u32 req_id, rpcn::ErrorType error)
-	{
-		auto ctx = take_pending_gui_request(req_id);
-
-		if (!ctx)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_ROOM; break;
-		case rpcn::ErrorType::Unauthorized: error_code = SCE_NP_MATCHING_SERVER_ERROR_NOT_ALLOWED; break;
-		default: fmt::throw_exception("Unexpected error in SetRoomInfoGUI reply: %d", static_cast<u8>(error));
-		}
-
-		ctx->queue_callback(req_id, SCE_NP_MATCHING_EVENT_SET_ROOM_INFO_DONE, error_code);
-	}
-
-	error_code np_handler::get_room_info_gui(u32 ctx_id, vm::ptr<SceNpLobbyId> /* lobby_id */, vm::ptr<SceNpRoomId> room_id, vm::ptr<SceNpMatchingAttr> attr)
-	{
-		auto ctx = get_matching_context(ctx_id);
-
-		if (!ctx)
-			return SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND;
-
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::GUI);
-		add_gui_request(req_id, ctx_id);
-
-		ensure(room_id && attr);
-		// extra_nps::print_SceNpRoomId(*room_id);
-		get_rpcn()->get_room_info_gui(req_id, *room_id, attr);
-
-		return not_an_error(req_id);
-	}
-
-	void np_handler::reply_get_room_info_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto ctx = take_pending_gui_request(req_id);
-
-		if (!ctx)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::RoomMissing: error_code = SCE_NP_MATCHING_SERVER_ERROR_NO_SUCH_ROOM; break;
-		default: fmt::throw_exception("Unexpected error in GetRoomInfoGUI reply: %d", static_cast<u8>(error));
-		}
-
-		if (error_code != CELL_OK)
-		{
-			ctx->queue_callback(req_id, SCE_NP_MATCHING_EVENT_GET_ROOM_INFO_DONE, error_code);
-			return;
-		}
-
-		const auto* resp = reply.get_flatbuffer<MatchingRoom>();
-		ensure(!reply.is_error(), "Malformed reply to GetRoomInfoGUI command");
-
-		event_data edata(np_memory.allocate(MAX_SceNpMatchingRoom_SIZE), sizeof(SceNpMatchingRoom), MAX_SceNpMatchingRoom_SIZE);
-		auto* room_info = reinterpret_cast<SceNpMatchingRoom*>(edata.data());
-		MatchingRoom_to_SceNpMatchingRoom(edata, resp, room_info);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		extra_nps::print_SceNpMatchingRoom(room_info);
-
-		gui_notifications.list.emplace(std::make_pair(gui_notifications.current_gui_ctx_id, req_id), gui_notification{.event = SCE_NP_MATCHING_EVENT_GET_ROOM_INFO_DONE, .edata = std::move(edata)});
-		ctx->queue_callback(req_id, SCE_NP_MATCHING_EVENT_GET_ROOM_INFO_DONE, 0);
-	}
-
-	error_code np_handler::quickmatch_gui(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpMatchingSearchCondition> cond, s32 available_num, s32 timeout, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
-	{
-		auto [error, ctx] = gui_prelude(ctx_id, handler, arg);
-
-		if (error)
-			return error;
-
-		ctx->timeout = timeout;
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::GUI);
-		add_gui_request(req_id, ctx_id);
-
-		get_rpcn()->quickmatch_gui(req_id, *communicationId, cond, available_num);
-
-		return CELL_OK;
-	}
-
-	void np_handler::reply_quickmatch_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto ctx = take_pending_gui_request(req_id);
-
-		if (!ctx)
-			return;
-
-		ensure(error == rpcn::ErrorType::NoError, "Unexpected error in QuickMatchGUI reply");
-		const auto* resp = reply.get_flatbuffer<MatchingGuiRoomId>();
-		ensure(!reply.is_error(), "Malformed reply to QuickMatchGUI command");
-
-		SceNpRoomId room_id{};
-		ensure(resp->id() && resp->id()->size() == sizeof(SceNpRoomId::opt));
-		std::memcpy(room_id.opt, resp->id()->data(), sizeof(SceNpRoomId::opt));
-		const auto [_, inserted] = pending_quickmatching.insert_or_assign(room_id, ctx->ctx_id);
-		ensure(inserted);
-
-		// Now that the reply has been received, we start the wait for the notification
-		ctx->thread = std::make_unique<named_thread<std::function<void(SceNpRoomId)>>>("NP GUI Timeout Worker", [ctx, req_id, this](SceNpRoomId room_id)
-			{
-				ctx->wakey.wait(0, static_cast<atomic_wait_timeout>(ctx->timeout * 1'000'000'000));
-
-				if (thread_ctrl::state() == thread_state::aborting)
-					return;
-
-				{
-					std::lock_guard lock(this->mutex_quickmatching);
-					if (this->pending_quickmatching.erase(room_id) != 1)
-						return;
-				}
-
-				if (ctx->wakey == 0)
-				{
-					// Verify that the context is still valid
-					if (!idm::check_unlocked<matching_ctx>(ctx->ctx_id))
-						return;
-
-					rpcn_log.notice("QuickMatch timeout");
-
-					const u32 req_id = get_req_id(REQUEST_ID_HIGH::GUI);
-					this->get_rpcn()->leave_room_gui(req_id, room_id);
-
-					ctx->queue_gui_callback(SCE_NP_MATCHING_GUI_EVENT_QUICK_MATCH, SCE_NP_MATCHING_ERROR_TIMEOUT);
-					gui_epilog(ctx);
-				}
-			});
-
-		ctx->wakey = 0;
-		auto& thread = *ctx->thread;
-		thread(room_id);
-	}
-
-	error_code np_handler::searchjoin_gui(u32 ctx_id, vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpMatchingSearchCondition> cond, vm::cptr<SceNpMatchingAttr> attr, vm::ptr<SceNpMatchingGUIHandler> handler, vm::ptr<void> arg)
-	{
-		auto [error, ctx] = gui_prelude(ctx_id, handler, arg);
-
-		if (error)
-			return error;
-
-		const u32 req_id = get_req_id(REQUEST_ID_HIGH::GUI);
-		add_gui_request(req_id, ctx_id);
-
-		get_rpcn()->searchjoin_gui(req_id, *communicationId, cond, attr);
-		return CELL_OK;
-	}
-
-	void np_handler::reply_searchjoin_gui(u32 req_id, rpcn::ErrorType error, vec_stream& reply)
-	{
-		auto ctx = take_pending_gui_request(req_id);
-
-		if (!ctx)
-			return;
-
-		s32 error_code = CELL_OK;
-
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: break;
-		case rpcn::ErrorType::NotFound: error_code = SCE_NP_MATCHING_ERROR_SEARCH_JOIN_ROOM_NOT_FOUND; break;
-		default: fmt::throw_exception("Unexpected error in SearchJoinRoomGUI reply: %d", static_cast<u8>(error));
-		}
-
-		if (error_code != CELL_OK)
-		{
-			ctx->queue_gui_callback(SCE_NP_MATCHING_GUI_EVENT_SEARCH_JOIN, error_code);
-			gui_epilog(ctx);
-			return;
-		}
-
-		const auto* resp = reply.get_flatbuffer<MatchingSearchJoinRoomInfo>();
-		ensure(!reply.is_error(), "Malformed reply to SearchJoinRoomGUI command");
-
-		event_data edata(np_memory.allocate(MAX_SceNpMatchingSearchJoinRoomInfo_SIZE), sizeof(SceNpMatchingSearchJoinRoomInfo), MAX_SceNpMatchingSearchJoinRoomInfo_SIZE);
-		auto* room_info = reinterpret_cast<SceNpMatchingSearchJoinRoomInfo*>(edata.data());
-		MatchingSearchJoinRoomInfo_to_SceNpMatchingSearchJoinRoomInfo(edata, resp, room_info);
-		np_memory.shrink_allocation(edata.addr(), edata.size());
-
-		extra_nps::print_SceNpMatchingSearchJoinRoomInfo(room_info);
-
-		gui_cache.add_room(room_info->room_status.id);
-
-		for (auto cur_member = room_info->room_status.members; cur_member; cur_member = cur_member->next)
-		{
-			gui_cache.add_member(room_info->room_status.id, cur_member.get_ptr(), true);
-		}
-
-		set_gui_result(SCE_NP_MATCHING_GUI_EVENT_SEARCH_JOIN, std::move(edata));
-		ctx->queue_gui_callback(SCE_NP_MATCHING_GUI_EVENT_SEARCH_JOIN, 0);
-		gui_epilog(ctx);
-	}
-
-	// Local cache requests
-
-	error_code np_handler::get_room_member_list_local_gui(u32 ctx_id, vm::ptr<SceNpRoomId> room_id, vm::ptr<u32> buflen, vm::ptr<void> buf)
-	{
-		auto ctx = get_matching_context(ctx_id);
-
-		if (!ctx)
-			return SCE_NP_MATCHING_ERROR_CTX_NOT_FOUND;
-
-		if (!room_id)
-			return SCE_NP_MATCHING_ERROR_ROOM_NOT_FOUND;
-
-		if (!buf)
-		{
-			error_code room_size = gui_cache.get_room_member_list(*room_id, 0, {});
-
-			if (room_size < 0)
-				return room_size;
-
-			*buflen = room_size;
-			return CELL_OK;
-		}
-
-		return gui_cache.get_room_member_list(*room_id, *buflen, buf);
-	}
-
-} // namespace np
diff --git a/rpcs3/Emu/NP/np_structs_extra.cpp b/rpcs3/Emu/NP/np_structs_extra.cpp
index 2acba3d045..5073b77f0e 100644
--- a/rpcs3/Emu/NP/np_structs_extra.cpp
+++ b/rpcs3/Emu/NP/np_structs_extra.cpp
@@ -1,92 +1,61 @@
-#include "Utilities/StrUtil.h"
 #include "stdafx.h"
-#include <span>
+#include "Emu/System.h"
 #include "np_structs_extra.h"
 
-LOG_CHANNEL(sceNp);
 LOG_CHANNEL(sceNp2);
 
 // Helper functions for printing
 
 namespace extra_nps
 {
-	void print_SceNpUserInfo2(const SceNpUserInfo2* user)
+	void print_sigoptparam(const SceNpMatching2SignalingOptParam* opt)
 	{
-		sceNp2.warning("SceNpUserInfo2:");
-		sceNp2.warning("npid: %s", static_cast<const char*>(user->npId.handle.data));
-		sceNp2.warning("onlineName: *0x%x(%s)", user->onlineName, user->onlineName ? static_cast<const char*>(user->onlineName->data) : "");
-		sceNp2.warning("avatarUrl: *0x%x(%s)", user->avatarUrl, user->avatarUrl ? static_cast<const char*>(user->avatarUrl->data) : "");
-	}
-
-	void print_SceNpMatching2SignalingOptParam(const SceNpMatching2SignalingOptParam* opt)
-	{
-		sceNp2.warning("SceNpMatching2SignalingOptParam:");
 		sceNp2.warning("type: %d", opt->type);
 		sceNp2.warning("flag: %d", opt->flag);
 		sceNp2.warning("hubMemberId: %d", opt->hubMemberId);
 	}
 
-	void print_int_attr(const SceNpMatching2IntAttr* attr)
+	void print_bin_attr(const SceNpMatching2BinAttr* bin)
 	{
-		sceNp2.warning("Id: 0x%x, num:%d(0x%x)", attr->id, attr->num, attr->num);
-	}
+		sceNp2.warning("Id: %d, Size: %d, ptr: 0x%x", bin->id, bin->size, bin->ptr);
 
-	void print_SceNpMatching2BinAttr(const SceNpMatching2BinAttr* bin)
-	{
-		const auto ptr = +bin->ptr;
-		const u32 size = bin->size;
-
-		sceNp2.warning("Id: %d, Size: %d, ptr: *0x%x", bin->id, size, ptr);
-
-		if (ptr && size)
+		std::string dadata{};
+		for (u32 i = 0; i < bin->size; i++)
 		{
-			sceNp2.warning("Data: %s", std::span<u8>{ptr.get_ptr(), size});
+			dadata = fmt::format("%s %02X", dadata, bin->ptr[i]);
 		}
+		sceNp2.warning("Data: %s", dadata);
 	}
 
-	void print_SceNpMatching2BinAttr_internal(const SceNpMatching2RoomBinAttrInternal* bin)
+	void print_bin_attr_internal(const SceNpMatching2RoomBinAttrInternal* bin)
 	{
 		sceNp2.warning("updateDate: %llu updateMemberId: %d", bin->updateDate.tick, bin->updateMemberId);
-		print_SceNpMatching2BinAttr(&bin->data);
+		print_bin_attr(&bin->data);
 	}
 
 	void print_member_bin_attr_internal(const SceNpMatching2RoomMemberBinAttrInternal* bin)
 	{
 		sceNp2.warning("updateDate: %llu", bin->updateDate.tick);
-		print_SceNpMatching2BinAttr(&bin->data);
+		print_bin_attr(&bin->data);
 	}
 
-	void print_SceNpMatching2PresenceOptionData(const SceNpMatching2PresenceOptionData* opt)
+	void print_presence_data(const SceNpMatching2PresenceOptionData* opt)
 	{
-		sceNp2.warning("Data: %s", std::span<const u8>{std::data(opt->data), std::size(opt->data)});
+		std::string dadata{};
+		for (int i = 0; i < 16; i++)
+		{
+			dadata = fmt::format("%s %02X", dadata, opt->data[i]);
+		}
+		sceNp2.warning("Data: %s", dadata);
 	}
 
-	void print_range(const SceNpMatching2Range* range)
-	{
-		sceNp2.warning("startIndex: %d", range->startIndex);
-		sceNp2.warning("total: %d", range->total);
-		sceNp2.warning("size: %d", range->size);
-	}
-
-	void print_SceNpMatching2RangeFilter(const SceNpMatching2RangeFilter* filt)
+	void print_range_filter(const SceNpMatching2RangeFilter* filt)
 	{
 		sceNp2.warning("startIndex: %d", filt->startIndex);
 		sceNp2.warning("max: %d", filt->max);
 	}
 
-	void print_int_search_filter(const SceNpMatching2IntSearchFilter* filt)
-	{
-		sceNp2.warning("searchOperator: %s", filt->searchOperator);
-		print_int_attr(&filt->attr);
-	}
-
-	void print_bin_search_filter(const SceNpMatching2BinSearchFilter* filt)
-	{
-		sceNp2.warning("searchOperator: %s", filt->searchOperator);
-		print_SceNpMatching2BinAttr(&filt->attr);
-	}
-
-	void print_SceNpMatching2CreateJoinRoomRequest(const SceNpMatching2CreateJoinRoomRequest* req)
+	void print_createjoinroom(const SceNpMatching2CreateJoinRoomRequest* req)
 	{
 		sceNp2.warning("SceNpMatching2CreateJoinRoomRequest:");
 		sceNp2.warning("worldId: %d", req->worldId);
@@ -96,35 +65,19 @@ namespace extra_nps
 		sceNp2.warning("roomBinAttrInternal: *0x%x", req->roomBinAttrInternal);
 		sceNp2.warning("roomBinAttrInternalNum: %d", req->roomBinAttrInternalNum);
 
-		for (u32 i = 0; i < req->roomBinAttrInternalNum && req->roomBinAttrInternal; i++)
-			print_SceNpMatching2BinAttr(&req->roomBinAttrInternal[i]);
+		for (u32 i = 0; i < req->roomBinAttrInternalNum; i++)
+			print_bin_attr(&req->roomBinAttrInternal[i]);
 
 		sceNp2.warning("roomSearchableIntAttrExternal: *0x%x", req->roomSearchableIntAttrExternal);
 		sceNp2.warning("roomSearchableIntAttrExternalNum: %d", req->roomSearchableIntAttrExternalNum);
-
-		for (u32 i = 0; i < req->roomSearchableIntAttrExternalNum && req->roomSearchableIntAttrExternal; i++)
-			print_int_attr(&req->roomSearchableIntAttrExternal[i]);
-		
 		sceNp2.warning("roomSearchableBinAttrExternal: *0x%x", req->roomSearchableBinAttrExternal);
 		sceNp2.warning("roomSearchableBinAttrExternalNum: %d", req->roomSearchableBinAttrExternalNum);
-
-		for (u32 i = 0; i < req->roomSearchableBinAttrExternalNum && req->roomSearchableBinAttrExternal; i++)
-			print_SceNpMatching2BinAttr(&req->roomSearchableBinAttrExternal[i]);
-
 		sceNp2.warning("roomBinAttrExternal: *0x%x", req->roomBinAttrExternal);
 		sceNp2.warning("roomBinAttrExternalNum: %d", req->roomBinAttrExternalNum);
-
-		for (u32 i = 0; i < req->roomBinAttrExternalNum && req->roomBinAttrExternal; i++)
-			print_SceNpMatching2BinAttr(&req->roomBinAttrExternal[i]);
-
 		sceNp2.warning("roomPassword: *0x%x", req->roomPassword);
-
-		if (req->roomPassword)
-			sceNp2.warning("data: %s", fmt::buf_to_hexstring(req->roomPassword->data, sizeof(req->roomPassword->data)));
-
 		sceNp2.warning("groupConfig: *0x%x", req->groupConfig);
 		sceNp2.warning("groupConfigNum: %d", req->groupConfigNum);
-		sceNp2.warning("passwordSlotMask: *0x%x, value: 0x%x", req->passwordSlotMask, req->passwordSlotMask ? static_cast<u64>(*req->passwordSlotMask) : 0ull);
+		sceNp2.warning("passwordSlotMask: *0x%x", req->passwordSlotMask);
 		sceNp2.warning("allowedUser: *0x%x", req->allowedUser);
 		sceNp2.warning("allowedUserNum: %d", req->allowedUserNum);
 		sceNp2.warning("blockedUser: *0x%x", req->blockedUser);
@@ -133,17 +86,22 @@ namespace extra_nps
 		sceNp2.warning("roomMemberBinAttrInternal: *0x%x", req->roomMemberBinAttrInternal);
 		sceNp2.warning("roomMemberBinAttrInternalNum: %d", req->roomMemberBinAttrInternalNum);
 
-		for (u32 i = 0; i < req->roomMemberBinAttrInternalNum && req->roomMemberBinAttrInternal; i++)
-			print_SceNpMatching2BinAttr(&req->roomMemberBinAttrInternal[i]);
+		for (u32 i = 0; i < req->roomMemberBinAttrInternalNum; i++)
+			print_bin_attr(&req->roomMemberBinAttrInternal[i]);
 
 		sceNp2.warning("teamId: %d", req->teamId);
 		sceNp2.warning("sigOptParam: *0x%x", req->sigOptParam);
 
 		if (req->sigOptParam)
-			print_SceNpMatching2SignalingOptParam(req->sigOptParam.get_ptr());
+			print_sigoptparam(req->sigOptParam.get_ptr());
+
+		for (u32 i = 0; i < req->roomSearchableIntAttrExternalNum; i++)
+		{
+			sceNp2.warning("roomSearchableIntAttrExternal(%d) = %d", req->roomSearchableIntAttrExternal[i].id, req->roomSearchableIntAttrExternal[i].num);
+		}
 	}
 
-	void print_SceNpMatching2JoinRoomRequest(const SceNpMatching2JoinRoomRequest* req)
+	void print_joinroom(const SceNpMatching2JoinRoomRequest* req)
 	{
 		sceNp2.warning("SceNpMatching2JoinRoomRequest:");
 		sceNp2.warning("roomId: %d", req->roomId);
@@ -151,57 +109,37 @@ namespace extra_nps
 		sceNp2.warning("joinRoomGroupLabel: *0x%x", req->joinRoomGroupLabel);
 		sceNp2.warning("roomMemberBinAttrInternal: *0x%x", req->roomMemberBinAttrInternal);
 		sceNp2.warning("roomMemberBinAttrInternalNum: %d", req->roomMemberBinAttrInternalNum);
-		print_SceNpMatching2PresenceOptionData(&req->optData);
+		print_presence_data(&req->optData);
 		sceNp2.warning("teamId: %d", req->teamId);
 
-		for (u32 i = 0; i < req->roomMemberBinAttrInternalNum && req->roomMemberBinAttrInternal; i++)
-			print_SceNpMatching2BinAttr(&req->roomMemberBinAttrInternal[i]);
+		for (u32 i = 0; i < req->roomMemberBinAttrInternalNum; i++)
+			print_bin_attr(&req->roomMemberBinAttrInternal[i]);
 	}
 
-	void print_SceNpMatching2SearchRoomRequest(const SceNpMatching2SearchRoomRequest* req)
+	void print_search_room(const SceNpMatching2SearchRoomRequest* req)
 	{
 		sceNp2.warning("SceNpMatching2SearchRoomRequest:");
 		sceNp2.warning("option: 0x%x", req->option);
 		sceNp2.warning("worldId: %d", req->worldId);
 		sceNp2.warning("lobbyId: %lld", req->lobbyId);
-		print_SceNpMatching2RangeFilter(&req->rangeFilter);
+		print_range_filter(&req->rangeFilter);
 		sceNp2.warning("flagFilter: 0x%x", req->flagFilter);
 		sceNp2.warning("flagAttr: 0x%x", req->flagAttr);
 		sceNp2.warning("intFilter: *0x%x", req->intFilter);
 		sceNp2.warning("intFilterNum: %d", req->intFilterNum);
-		for (u32 i = 0; i < req->intFilterNum && req->intFilter; i++)
-			print_int_search_filter(&req->intFilter[i]);
 		sceNp2.warning("binFilter: *0x%x", req->binFilter);
 		sceNp2.warning("binFilterNum: %d", req->binFilterNum);
-		for (u32 i = 0; i < req->binFilterNum && req->binFilter; i++)
-			print_bin_search_filter(&req->binFilter[i]);
 		sceNp2.warning("attrId: *0x%x", req->attrId);
 		sceNp2.warning("attrIdNum: %d", req->attrIdNum);
-		for (u32 i = 0; i < req->attrIdNum && req->attrId; i++)
-			sceNp2.warning("attrId[%d] = 0x%x", i, req->attrId[i]);
 	}
 
-	void print_SceNpMatching2SearchRoomResponse(const SceNpMatching2SearchRoomResponse* resp)
-	{
-		sceNp2.warning("SceNpMatching2SearchRoomResponse:");
-		print_range(&resp->range);
-
-		const SceNpMatching2RoomDataExternal *room_ptr = resp->roomDataExternal.get_ptr();
-		for (u32 i = 0; i < resp->range.total; i++)
-		{
-			sceNp2.warning("SceNpMatching2SearchRoomResponse[%d]:", i);
-			print_SceNpMatching2RoomDataExternal(room_ptr);
-			room_ptr = room_ptr->next.get_ptr();
-		}
-	}
-
-	void print_SceNpMatching2RoomMemberDataInternal(const SceNpMatching2RoomMemberDataInternal* member)
+	void print_room_member_data_internal(const SceNpMatching2RoomMemberDataInternal* member)
 	{
 		sceNp2.warning("SceNpMatching2RoomMemberDataInternal:");
 		sceNp2.warning("next: *0x%x", member->next);
 		sceNp2.warning("npId: %s", member->userInfo.npId.handle.data);
-		sceNp2.warning("onlineName: %s", member->userInfo.onlineName ? member->userInfo.onlineName->data : "");
-		sceNp2.warning("avatarUrl: %s", member->userInfo.avatarUrl ? member->userInfo.avatarUrl->data : "");
+		sceNp2.warning("onlineName: %s", member->userInfo.onlineName->data);
+		sceNp2.warning("avatarUrl: %s", member->userInfo.avatarUrl->data);
 		sceNp2.warning("joinDate: %lld", member->joinDate.tick);
 		sceNp2.warning("memberId: %d", member->memberId);
 		sceNp2.warning("teamId: %d", member->teamId);
@@ -210,11 +148,11 @@ namespace extra_nps
 		sceNp2.warning("flagAttr: 0x%x", member->flagAttr);
 		sceNp2.warning("roomMemberBinAttrInternal: *0x%x", member->roomMemberBinAttrInternal);
 		sceNp2.warning("roomMemberBinAttrInternalNum: %d", member->roomMemberBinAttrInternalNum);
-		for (u32 i = 0; i < member->roomMemberBinAttrInternalNum && member->roomMemberBinAttrInternal; i++)
+		for (u32 i = 0; i < member->roomMemberBinAttrInternalNum; i++)
 			print_member_bin_attr_internal(&member->roomMemberBinAttrInternal[i]);
 	}
 
-	void print_SceNpMatching2RoomDataInternal(const SceNpMatching2RoomDataInternal* room)
+	void print_room_data_internal(const SceNpMatching2RoomDataInternal* room)
 	{
 		sceNp2.warning("SceNpMatching2RoomDataInternal:");
 		sceNp2.warning("serverId: %d", room->serverId);
@@ -228,7 +166,7 @@ namespace extra_nps
 		auto cur_member = room->memberList.members;
 		while (cur_member)
 		{
-			print_SceNpMatching2RoomMemberDataInternal(cur_member.get_ptr());
+			print_room_member_data_internal(cur_member.get_ptr());
 			cur_member = cur_member->next;
 		}
 		sceNp2.warning("membersNum: %d", room->memberList.membersNum);
@@ -240,85 +178,31 @@ namespace extra_nps
 		sceNp2.warning("flagAttr: 0x%x", room->flagAttr);
 		sceNp2.warning("roomBinAttrInternal: *0x%x", room->roomBinAttrInternal);
 		sceNp2.warning("roomBinAttrInternalNum: %d", room->roomBinAttrInternalNum);
-		for (u32 i = 0; i < room->roomBinAttrInternalNum && room->roomBinAttrInternal; i++)
-			print_SceNpMatching2BinAttr_internal(&room->roomBinAttrInternal[i]);
+		for (u32 i = 0; i < room->roomBinAttrInternalNum; i++)
+			print_bin_attr_internal(&room->roomBinAttrInternal[i]);
 	}
 
-	void print_SceNpMatching2RoomDataExternal(const SceNpMatching2RoomDataExternal* room)
-	{
-		sceNp2.warning("SceNpMatching2RoomDataExternal:");
-		sceNp2.warning("next: *0x%x", room->next);
-		sceNp2.warning("serverId: %d", room->serverId);
-		sceNp2.warning("worldId: %d", room->worldId);
-		sceNp2.warning("publicSlotNum: %d", room->publicSlotNum);
-		sceNp2.warning("privateSlotNum: %d", room->privateSlotNum);
-		sceNp2.warning("lobbyId: %d", room->lobbyId);
-		sceNp2.warning("roomId: %d", room->roomId);
-		sceNp2.warning("openPublicSlotNum: %d", room->openPublicSlotNum);
-		sceNp2.warning("maxSlot: %d", room->maxSlot);
-		sceNp2.warning("openPrivateSlotNum: %d", room->openPrivateSlotNum);
-		sceNp2.warning("curMemberNum: %d", room->curMemberNum);
-		sceNp2.warning("SceNpMatching2RoomPasswordSlotMask: 0x%x", room->passwordSlotMask);
-		sceNp2.warning("owner: *0x%x", room->owner);
-
-		if (room->owner)
-			print_SceNpUserInfo2(room->owner.get_ptr());
-
-		sceNp2.warning("roomGroup: *0x%x", room->roomGroup);
-		// TODO: print roomGroup
-		sceNp2.warning("roomGroupNum: %d", room->roomGroupNum);
-		sceNp2.warning("flagAttr: 0x%x", room->flagAttr);
-		sceNp2.warning("roomSearchableIntAttrExternal: *0x%x", room->roomSearchableIntAttrExternal);
-		sceNp2.warning("roomSearchableIntAttrExternalNum: %d", room->roomSearchableIntAttrExternalNum);
-
-		for (u32 i = 0; i < room->roomSearchableIntAttrExternalNum && room->roomSearchableIntAttrExternal; i++)
-			print_int_attr(&room->roomSearchableIntAttrExternal[i]);
-
-		sceNp2.warning("roomSearchableBinAttrExternal: *0x%x", room->roomSearchableBinAttrExternal);
-		sceNp2.warning("roomSearchableBinAttrExternalNum: %d", room->roomSearchableBinAttrExternalNum);
-
-		for (u32 i = 0; i < room->roomSearchableBinAttrExternalNum && room->roomSearchableBinAttrExternal; i++)
-			print_SceNpMatching2BinAttr(&room->roomSearchableBinAttrExternal[i]);
-
-		sceNp2.warning("roomBinAttrExternal: *0x%x", room->roomBinAttrExternal);
-		sceNp2.warning("roomBinAttrExternalNum: %d", room->roomBinAttrExternalNum);
-
-		for (u32 i = 0; i < room->roomBinAttrExternalNum && room->roomBinAttrExternal; i++)
-			print_SceNpMatching2BinAttr(&room->roomBinAttrExternal[i]);
-	}
-
-	void print_SceNpMatching2CreateJoinRoomResponse(const SceNpMatching2CreateJoinRoomResponse* resp)
+	void print_create_room_resp(const SceNpMatching2CreateJoinRoomResponse *resp)
 	{
 		sceNp2.warning("SceNpMatching2CreateJoinRoomResponse:");
 		sceNp2.warning("roomDataInternal: *0x%x", resp->roomDataInternal);
-		if (resp->roomDataInternal)
-			print_SceNpMatching2RoomDataInternal(resp->roomDataInternal.get_ptr());
+		if(resp->roomDataInternal)
+			print_room_data_internal(resp->roomDataInternal.get_ptr());
 	}
 
-	void print_SceNpMatching2SetRoomDataExternalRequest(const SceNpMatching2SetRoomDataExternalRequest* req)
+	void print_set_roomdata_ext_req(const SceNpMatching2SetRoomDataExternalRequest* req)
 	{
 		sceNp2.warning("SceNpMatching2SetRoomDataExternalRequest:");
 		sceNp2.warning("roomId: %d", req->roomId);
 		sceNp2.warning("roomSearchableIntAttrExternal: *0x%x", req->roomSearchableIntAttrExternal);
 		sceNp2.warning("roomSearchableIntAttrExternalNum: %d", req->roomSearchableIntAttrExternalNum);
-
-		for (u32 i = 0; i < req->roomSearchableIntAttrExternalNum && req->roomSearchableIntAttrExternal; i++)
-			print_int_attr(&req->roomSearchableIntAttrExternal[i]);
-
 		sceNp2.warning("roomSearchableBinAttrExternal: *0x%x", req->roomSearchableBinAttrExternal);
 		sceNp2.warning("roomSearchableBinAttrExternalNum: %d", req->roomSearchableBinAttrExternalNum);
-
-		for (u32 i = 0; i < req->roomSearchableBinAttrExternalNum && req->roomSearchableBinAttrExternal; i++)
-			print_SceNpMatching2BinAttr(&req->roomSearchableBinAttrExternal[i]);
-
 		sceNp2.warning("roomBinAttrExternal: *0x%x", req->roomBinAttrExternal);
 		sceNp2.warning("roomBinAttrExternalNum: %d", req->roomBinAttrExternalNum);
-
-		for (u32 i = 0; i < req->roomBinAttrExternalNum && req->roomBinAttrExternal; i++)
-			print_SceNpMatching2BinAttr(&req->roomBinAttrExternal[i]);
 	}
 
-	void print_SceNpMatching2SetRoomDataInternalRequest(const SceNpMatching2SetRoomDataInternalRequest* req)
+	void print_set_roomdata_int_req(const SceNpMatching2SetRoomDataInternalRequest* req)
 	{
 		sceNp2.warning("SceNpMatching2SetRoomDataInternalRequest:");
 		sceNp2.warning("roomId: %d", req->roomId);
@@ -326,10 +210,6 @@ namespace extra_nps
 		sceNp2.warning("flagAttr: 0x%x", req->flagAttr);
 		sceNp2.warning("roomBinAttrInternal: *0x%x", req->roomBinAttrInternal);
 		sceNp2.warning("roomBinAttrInternalNum: %d", req->roomBinAttrInternalNum);
-
-		for (u32 i = 0; i < req->roomBinAttrInternalNum && req->roomBinAttrInternal; i++)
-			print_SceNpMatching2BinAttr(&req->roomBinAttrInternal[i]);
-
 		sceNp2.warning("passwordConfig: *0x%x", req->passwordConfig);
 		sceNp2.warning("passwordConfigNum: %d", req->passwordConfigNum);
 		sceNp2.warning("passwordSlotMask: *0x%x", req->passwordSlotMask);
@@ -337,244 +217,4 @@ namespace extra_nps
 		sceNp2.warning("ownerPrivilegeRankNum: %d", req->ownerPrivilegeRankNum);
 	}
 
-	void print_SceNpMatching2GetRoomMemberDataInternalRequest(const SceNpMatching2GetRoomMemberDataInternalRequest* req)
-	{
-		sceNp2.warning("SceNpMatching2GetRoomMemberDataInternalRequest:");
-		sceNp2.warning("roomId: %d", req->roomId);
-		sceNp2.warning("memberId: %d", req->memberId);
-		sceNp2.warning("attrId: *0x%x", req->attrId);
-		sceNp2.warning("attrIdNum: %d", req->attrIdNum);
-		for (u32 i = 0; i < req->attrIdNum && req->attrId; i++)
-		{
-			sceNp2.warning("attrId[%d] = %d", i, req->attrId[i]);
-		}
-	}
-
-	void print_SceNpMatching2SetRoomMemberDataInternalRequest(const SceNpMatching2SetRoomMemberDataInternalRequest* req)
-	{
-		sceNp2.warning("SceNpMatching2SetRoomMemberDataInternalRequest:");
-		sceNp2.warning("roomId: %d", req->roomId);
-		sceNp2.warning("memberId: %d", req->memberId);
-		sceNp2.warning("teamId: %d", req->teamId);
-		sceNp2.warning("flagFilter: 0x%x", req->flagFilter);
-		sceNp2.warning("flagAttr: 0x%x", req->flagAttr);
-		sceNp2.warning("roomMemberBinAttrInternal: *0x%x", req->roomMemberBinAttrInternal);
-		sceNp2.warning("roomMemberBinAttrInternalNum: %d", req->roomMemberBinAttrInternalNum);
-		for (u32 i = 0; i < req->roomMemberBinAttrInternalNum && req->roomMemberBinAttrInternal; i++)
-			print_SceNpMatching2BinAttr(&req->roomMemberBinAttrInternal[i]);
-	}
-
-	void print_SceNpMatching2GetRoomDataExternalListRequest(const SceNpMatching2GetRoomDataExternalListRequest* req)
-	{
-		sceNp2.warning("SceNpMatching2GetRoomDataExternalListRequest:");
-		sceNp2.warning("roomId: *0x%x", req->roomId);
-		sceNp2.warning("roomIdNum: %d", req->roomIdNum);
-		for (u32 i = 0; i < req->roomIdNum && req->roomId; i++)
-		{
-			sceNp2.warning("RoomId[%d] = %d", i, req->roomId[i]);
-		}
-		sceNp2.warning("attrId: *0x%x", req->attrId);
-		sceNp2.warning("attrIdNum: %d", req->attrIdNum);
-		for (u32 i = 0; i < req->attrIdNum && req->attrId; i++)
-		{
-			sceNp2.warning("attrId[%d] = %d", i, req->attrId[i]);
-		}
-	}
-
-	void print_SceNpMatching2GetRoomDataExternalListResponse(const SceNpMatching2GetRoomDataExternalListResponse* resp)
-	{
-		sceNp2.warning("SceNpMatching2GetRoomDataExternalListResponse:");
-		sceNp2.warning("roomDataExternal: *0x%x", resp->roomDataExternal);
-		sceNp2.warning("roomDataExternalNum: %d", resp->roomDataExternalNum);
-
-		vm::bptr<SceNpMatching2RoomDataExternal> cur_room = resp->roomDataExternal;
-
-		for (u32 i = 0; i < resp->roomDataExternalNum && cur_room; i++)
-		{
-			sceNp2.warning("SceNpMatching2GetRoomDataExternalListResponse[%d]:", i);
-			print_SceNpMatching2RoomDataExternal(cur_room.get_ptr());
-			cur_room = cur_room->next;
-		}
-	}
-
-	void print_SceNpMatching2GetLobbyInfoListRequest(const SceNpMatching2GetLobbyInfoListRequest* resp)
-	{
-		sceNp2.warning("SceNpMatching2GetLobbyInfoListRequest:");
-		sceNp2.warning("worldId: %d", resp->worldId);
-		print_SceNpMatching2RangeFilter(&resp->rangeFilter);
-		sceNp2.warning("attrIdNum: %d", resp->attrIdNum);
-		sceNp2.warning("attrId: *0x%x", resp->attrId);
-
-		if (resp->attrId)
-		{
-			for (u32 i = 0; i < resp->attrIdNum; i++)
-			{
-				sceNp2.warning("attrId[%d] = %d", i, resp->attrId[i]);
-			}
-		}
-	}
-
-	void print_SceNpBasicAttachmentData(const SceNpBasicAttachmentData* data)
-	{
-		sceNp.warning("SceNpBasicAttachmentData:");
-		sceNp.warning("id: 0x%x", data->id);
-		sceNp.warning("size: %d", data->size);
-	}
-
-	void print_SceNpBasicExtendedAttachmentData(const SceNpBasicExtendedAttachmentData* data)
-	{
-		sceNp.warning("SceNpBasicExtendedAttachmentData:");
-
-		sceNp.warning("flags: 0x%x", data->flags);
-		sceNp.warning("msgId: %d", data->msgId);
-		sceNp.warning("SceNpBasicAttachmentData.id: %d", data->data.id);
-		sceNp.warning("SceNpBasicAttachmentData.size: %d", data->data.size);
-		sceNp.warning("userAction: %d", data->userAction);
-		sceNp.warning("markedAsUsed: %d", data->markedAsUsed);
-	}
-
-	void print_SceNpScoreRankData(const SceNpScoreRankData* data)
-	{
-		sceNp.warning("sceNpScoreRankData:");
-		sceNp.warning("npId: %s", static_cast<const char*>(data->npId.handle.data));
-		sceNp.warning("onlineName: %s", static_cast<const char*>(data->onlineName.data));
-		sceNp.warning("pcId: %d", data->pcId);
-		sceNp.warning("serialRank: %d", data->serialRank);
-		sceNp.warning("rank: %d", data->rank);
-		sceNp.warning("highestRank: %d", data->highestRank);
-		sceNp.warning("scoreValue: %d", data->scoreValue);
-		sceNp.warning("hasGameData: %d", data->hasGameData);
-		sceNp.warning("recordDate: %d", data->recordDate.tick);
-	}
-
-	void print_SceNpScoreRankData_deprecated(const SceNpScoreRankData_deprecated* data)
-	{
-		sceNp.warning("sceNpScoreRankData_deprecated:");
-		sceNp.warning("npId: %s", static_cast<const char*>(data->npId.handle.data));
-		sceNp.warning("onlineName: %s", static_cast<const char*>(data->onlineName.data));
-		sceNp.warning("serialRank: %d", data->serialRank);
-		sceNp.warning("rank: %d", data->rank);
-		sceNp.warning("highestRank: %d", data->highestRank);
-		sceNp.warning("scoreValue: %d", data->scoreValue);
-		sceNp.warning("hasGameData: %d", data->hasGameData);
-		sceNp.warning("recordDate: %d", data->recordDate.tick);
-	}
-
-	void print_SceNpMatchingAttr(const SceNpMatchingAttr* data)
-	{
-		sceNp.warning("SceNpMatchingAttr:");
-		sceNp.warning("next: 0x%x", data->next);
-		sceNp.warning("type: %d", data->type);
-		sceNp.warning("id: %d", data->id);
-
-		if (data->type == SCE_NP_MATCHING_ATTR_TYPE_BASIC_BIN || data->type == SCE_NP_MATCHING_ATTR_TYPE_GAME_BIN)
-		{
-			sceNp.warning("ptr: *0x%x", data->value.data.ptr);
-			sceNp.warning("size: %d", data->value.data.size);
-			sceNp.warning("data:\n%s", fmt::buf_to_hexstring(static_cast<u8 *>(data->value.data.ptr.get_ptr()), data->value.data.size));
-		}
-		else
-		{
-			sceNp.warning("num: %d(0x%x)", data->value.num, data->value.num);
-		}
-	}
-
-	void print_SceNpMatchingSearchCondition(const SceNpMatchingSearchCondition* data)
-	{
-		sceNp.warning("SceNpMatchingSearchCondition:");
-		sceNp.warning("target_attr_type: %d", data->target_attr_type);
-		sceNp.warning("target_attr_id: %d", data->target_attr_id);
-		sceNp.warning("comp_type: %d", data->comp_type);
-		sceNp.warning("comp_op: %d", data->comp_op);
-		sceNp.warning("next: 0x%x", data->next);
-		print_SceNpMatchingAttr(&data->compared);
-	}
-
-	void print_SceNpMatchingRoom(const SceNpMatchingRoom* data)
-	{
-		sceNp.warning("SceNpMatchingRoom:");
-		sceNp.warning("next: 0x%x", data->next);
-		print_SceNpRoomId(data->id);
-
-		for (auto it = data->attr; it; it = it->next)
-		{
-			print_SceNpMatchingAttr(it.get_ptr());
-		}
-	}
-
-	void print_SceNpMatchingRoomList(const SceNpMatchingRoomList* data)
-	{
-		sceNp.warning("SceNpMatchingRoomList:");
-		sceNp.warning("lobbyid.opt: %s", fmt::buf_to_hexstring(data->lobbyid.opt, sizeof(data->lobbyid.opt), sizeof(data->lobbyid.opt)));
-		sceNp.warning("start: %d", data->range.start);
-		sceNp.warning("results: %d", data->range.results);
-		sceNp.warning("total: %d", data->range.total);
-
-		for (auto it = data->head; it; it = it->next)
-		{
-			print_SceNpMatchingRoom(it.get_ptr());
-		}
-	}
-
-	void print_SceNpUserInfo(const SceNpUserInfo* data)
-	{
-		sceNp.warning("userId: %s", data->userId.handle.data);
-		sceNp.warning("name: %s", data->name.data);
-		sceNp.warning("icon: %s", data->icon.data);
-	}
-
-	void print_SceNpRoomId(const SceNpRoomId& room_id)
-	{
-		sceNp.warning("room_id: %s", fmt::buf_to_hexstring(room_id.opt, sizeof(room_id.opt), sizeof(room_id.opt)));
-	}
-
-	void print_SceNpMatchingRoomMember(const SceNpMatchingRoomMember* data)
-	{
-		sceNp.warning("SceNpMatchingRoomMember:");
-		sceNp.warning("next: 0x%x", data->next);
-		sceNp.warning("owner: %d", data->owner);
-		print_SceNpUserInfo(&data->user_info);
-	}
-
-	void print_SceNpMatchingRoomStatus(const SceNpMatchingRoomStatus* data)
-	{
-		sceNp.warning("SceNpMatchingRoomStatus:");
-		print_SceNpRoomId(data->id);
-		sceNp.warning("members: 0x%x", data->members);
-		sceNp.warning("num: %d", data->num);
-
-		for (auto it = data->members; it; it = it->next)
-		{
-			print_SceNpMatchingRoomMember(it.get_ptr());
-		}
-
-		sceNp.warning("kick_actor: 0x%x", data->kick_actor);
-
-		if (data->kick_actor)
-		{
-			sceNp.warning("kick_actor: %s", data->kick_actor->handle.data);
-		}
-
-		sceNp.warning("opt: 0x%x", data->kick_actor);
-		sceNp.warning("opt_len: %d", data->opt_len);
-	}
-
-	void print_SceNpMatchingJoinedRoomInfo(const SceNpMatchingJoinedRoomInfo* data)
-	{
-		sceNp.warning("SceNpMatchingJoinedRoomInfo:");
-		sceNp.warning("lobbyid.opt: %s", fmt::buf_to_hexstring(data->lobbyid.opt, sizeof(data->lobbyid.opt), sizeof(data->lobbyid.opt)));
-		print_SceNpMatchingRoomStatus(&data->room_status);
-	}
-
-	void print_SceNpMatchingSearchJoinRoomInfo(const SceNpMatchingSearchJoinRoomInfo* data)
-	{
-		sceNp.warning("SceNpMatchingSearchJoinRoomInfo:");
-		sceNp.warning("lobbyid.opt: %s", fmt::buf_to_hexstring(data->lobbyid.opt, sizeof(data->lobbyid.opt), sizeof(data->lobbyid.opt)));
-		print_SceNpMatchingRoomStatus(&data->room_status);
-		for (auto it = data->attr; it; it = it->next)
-		{
-			print_SceNpMatchingAttr(it.get_ptr());
-		}
-	}
-
 } // namespace extra_nps
diff --git a/rpcs3/Emu/NP/np_structs_extra.h b/rpcs3/Emu/NP/np_structs_extra.h
index d05711fabd..b45842864d 100644
--- a/rpcs3/Emu/NP/np_structs_extra.h
+++ b/rpcs3/Emu/NP/np_structs_extra.h
@@ -4,41 +4,17 @@
 
 namespace extra_nps
 {
-	void print_SceNpUserInfo2(const SceNpUserInfo2* user);
-	void print_SceNpMatching2SignalingOptParam(const SceNpMatching2SignalingOptParam* opt);
-	void print_SceNpMatching2BinAttr(const SceNpMatching2BinAttr* bin);
-	void print_SceNpMatching2PresenceOptionData(const SceNpMatching2PresenceOptionData* opt);
-	void print_SceNpMatching2RangeFilter(const SceNpMatching2RangeFilter* filt);
-	void print_SceNpMatching2RoomDataInternal(const SceNpMatching2RoomDataInternal* room);
-	void print_SceNpMatching2RoomDataExternal(const SceNpMatching2RoomDataExternal* room);
-	void print_SceNpMatching2RoomMemberDataInternal(const SceNpMatching2RoomMemberDataInternal* member);
+	void print_sigoptparam(const SceNpMatching2SignalingOptParam* opt);
+	void print_bin_attr(const SceNpMatching2BinAttr* bin);
+	void print_presence_data(const SceNpMatching2PresenceOptionData* opt);
+	void print_range_filter(const SceNpMatching2RangeFilter* filt);
+	void print_room_data_internal(const SceNpMatching2RoomDataInternal* room);
+	void print_room_member_data_internal(const SceNpMatching2RoomMemberDataInternal* member);
 
-	void print_SceNpMatching2CreateJoinRoomRequest(const SceNpMatching2CreateJoinRoomRequest* req);
-	void print_SceNpMatching2CreateJoinRoomResponse(const SceNpMatching2CreateJoinRoomResponse* resp);
-	void print_SceNpMatching2JoinRoomRequest(const SceNpMatching2JoinRoomRequest* req);
-	void print_SceNpMatching2SearchRoomRequest(const SceNpMatching2SearchRoomRequest* req);
-	void print_SceNpMatching2SearchRoomResponse(const SceNpMatching2SearchRoomResponse* resp);
-	void print_SceNpMatching2SetRoomDataExternalRequest(const SceNpMatching2SetRoomDataExternalRequest* req);
-	void print_SceNpMatching2SetRoomDataInternalRequest(const SceNpMatching2SetRoomDataInternalRequest* req);
-	void print_SceNpMatching2GetRoomMemberDataInternalRequest(const SceNpMatching2GetRoomMemberDataInternalRequest* req);
-	void print_SceNpMatching2SetRoomMemberDataInternalRequest(const SceNpMatching2SetRoomMemberDataInternalRequest* req);
-	void print_SceNpMatching2GetRoomDataExternalListRequest(const SceNpMatching2GetRoomDataExternalListRequest* req);
-	void print_SceNpMatching2GetRoomDataExternalListResponse(const SceNpMatching2GetRoomDataExternalListResponse* resp);
-
-	void print_SceNpMatching2GetLobbyInfoListRequest(const SceNpMatching2GetLobbyInfoListRequest* resp);
-
-	void print_SceNpBasicAttachmentData(const SceNpBasicAttachmentData* data);
-	void print_SceNpBasicExtendedAttachmentData(const SceNpBasicExtendedAttachmentData* data);
-
-	void print_SceNpScoreRankData(const SceNpScoreRankData* data);
-	void print_SceNpScoreRankData_deprecated(const SceNpScoreRankData_deprecated* data);
-
-	void print_SceNpRoomId(const SceNpRoomId& room_id);
-	void print_SceNpMatchingAttr(const SceNpMatchingAttr* data);
-	void print_SceNpMatchingSearchCondition(const SceNpMatchingSearchCondition* data);
-	void print_SceNpMatchingRoom(const SceNpMatchingRoom* data);
-	void print_SceNpMatchingRoomList(const SceNpMatchingRoomList* data);
-	void print_SceNpMatchingRoomStatus(const SceNpMatchingRoomStatus* data);
-	void print_SceNpMatchingJoinedRoomInfo(const SceNpMatchingJoinedRoomInfo* data);
-	void print_SceNpMatchingSearchJoinRoomInfo(const SceNpMatchingSearchJoinRoomInfo* data);
+	void print_createjoinroom(const SceNpMatching2CreateJoinRoomRequest* req);
+	void print_create_room_resp(const SceNpMatching2CreateJoinRoomResponse* resp);
+	void print_joinroom(const SceNpMatching2JoinRoomRequest* req);
+	void print_search_room(const SceNpMatching2SearchRoomRequest* req);
+	void print_set_roomdata_ext_req(const SceNpMatching2SetRoomDataExternalRequest* req);
+	void print_set_roomdata_int_req(const SceNpMatching2SetRoomDataInternalRequest* req);
 } // namespace extra_nps
diff --git a/rpcs3/Emu/NP/rpcn_client.cpp b/rpcs3/Emu/NP/rpcn_client.cpp
index 5074ea81a4..f937fc1a86 100644
--- a/rpcs3/Emu/NP/rpcn_client.cpp
+++ b/rpcs3/Emu/NP/rpcn_client.cpp
@@ -1,20 +1,17 @@
 #include "stdafx.h"
-#include "Emu/Cell/lv2/sys_net/sys_net_helpers.h"
-#include "Emu/NP/ip_address.h"
 #include <string>
 #include <mutex>
 #include <thread>
 #include <chrono>
+#include <queue>
 #include "rpcn_client.h"
+#include "np_structs_extra.h"
 #include "Utilities/StrUtil.h"
-#include "Utilities/StrFmt.h"
 #include "Utilities/Thread.h"
+#include "Emu/IdManager.h"
 #include "Emu/System.h"
-#include "Emu/NP/rpcn_config.h"
-#include "Emu/NP/np_helpers.h"
-#include "Emu/NP/vport0.h"
-#include "Emu/system_config.h"
-#include "Emu/RSX/Overlays/overlay_message.h"
+
+#include "util/asm.hpp"
 
 #include "generated/np2_structs_generated.h"
 
@@ -22,10 +19,7 @@
 #include <winsock2.h>
 #include <WS2tcpip.h>
 #else
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#endif
+#include <errno.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -36,2097 +30,1022 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <netdb.h>
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
 #endif
 
 LOG_CHANNEL(rpcn_log, "rpcn");
 
-template <>
-void fmt_class_string<rpcn::ErrorType>::format(std::string& out, u64 arg)
+#define RPCN_PROTOCOL_VERSION 10
+#define RPCN_HEADER_SIZE 9
+#define COMMUNICATION_ID_SIZE 9
+
+rpcn_client::rpcn_client(bool in_config)
+    : in_config(in_config)
 {
-	format_enum(out, arg, [](auto value)
-		{
-			switch (value)
-			{
-			case rpcn::ErrorType::NoError: return "NoError";
-			case rpcn::ErrorType::Malformed: return "Malformed";
-			case rpcn::ErrorType::Invalid: return "Invalid";
-			case rpcn::ErrorType::InvalidInput: return "InvalidInput";
-			case rpcn::ErrorType::TooSoon: return "TooSoon";
-			case rpcn::ErrorType::LoginError: return "LoginError";
-			case rpcn::ErrorType::LoginAlreadyLoggedIn: return "LoginAlreadyLoggedIn";
-			case rpcn::ErrorType::LoginInvalidUsername: return "LoginInvalidUsername";
-			case rpcn::ErrorType::LoginInvalidPassword: return "LoginInvalidPassword";
-			case rpcn::ErrorType::LoginInvalidToken: return "LoginInvalidToken";
-			case rpcn::ErrorType::CreationError: return "CreationError";
-			case rpcn::ErrorType::CreationExistingUsername: return "CreationExistingUsername";
-			case rpcn::ErrorType::CreationBannedEmailProvider: return "CreationBannedEmailProvider";
-			case rpcn::ErrorType::CreationExistingEmail: return "CreationExistingEmail";
-			case rpcn::ErrorType::RoomMissing: return "RoomMissing";
-			case rpcn::ErrorType::RoomAlreadyJoined: return "RoomAlreadyJoined";
-			case rpcn::ErrorType::RoomFull: return "RoomFull";
-			case rpcn::ErrorType::RoomPasswordMismatch: return "RoomPasswordMismatch";
-			case rpcn::ErrorType::RoomPasswordMissing: return "RoomPasswordMissing";
-			case rpcn::ErrorType::RoomGroupNoJoinLabel: return "RoomGroupNoJoinLabel";
-			case rpcn::ErrorType::RoomGroupFull: return "RoomGroupFull";
-			case rpcn::ErrorType::RoomGroupJoinLabelNotFound: return "RoomGroupJoinLabelNotFound";
-			case rpcn::ErrorType::RoomGroupMaxSlotMismatch: return "RoomGroupMaxSlotMismatch";
-			case rpcn::ErrorType::Unauthorized: return "Unauthorized";
-			case rpcn::ErrorType::DbFail: return "DbFail";
-			case rpcn::ErrorType::EmailFail: return "EmailFail";
-			case rpcn::ErrorType::NotFound: return "NotFound";
-			case rpcn::ErrorType::Blocked: return "Blocked";
-			case rpcn::ErrorType::AlreadyFriend: return "AlreadyFriend";
-			case rpcn::ErrorType::ScoreNotBest: return "ScoreNotBest";
-			case rpcn::ErrorType::ScoreInvalid: return "ScoreInvalid";
-			case rpcn::ErrorType::ScoreHasData: return "ScoreHasData";
-			case rpcn::ErrorType::CondFail: return "CondFail";
-			case rpcn::ErrorType::Unsupported: return "Unsupported";
-			default: break;
-			}
-
-			return unknown;
-		});
-}
-
-template <>
-void fmt_class_string<rpcn::CommandType>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-		{
-			switch (value)
-			{
-			case rpcn::CommandType::Login: return "Login";
-			case rpcn::CommandType::Terminate: return "Terminate";
-			case rpcn::CommandType::Create: return "Create";
-			case rpcn::CommandType::SendToken: return "SendToken";
-			case rpcn::CommandType::SendResetToken: return "SendResetToken";
-			case rpcn::CommandType::ResetPassword: return "ResetPassword";
-			case rpcn::CommandType::ResetState: return "ResetState";
-			case rpcn::CommandType::AddFriend: return "AddFriend";
-			case rpcn::CommandType::RemoveFriend: return "RemoveFriend";
-			case rpcn::CommandType::AddBlock: return "AddBlock";
-			case rpcn::CommandType::RemoveBlock: return "RemoveBlock";
-			case rpcn::CommandType::GetServerList: return "GetServerList";
-			case rpcn::CommandType::GetWorldList: return "GetWorldList";
-			case rpcn::CommandType::CreateRoom: return "CreateRoom";
-			case rpcn::CommandType::JoinRoom: return "JoinRoom";
-			case rpcn::CommandType::LeaveRoom: return "LeaveRoom";
-			case rpcn::CommandType::SearchRoom: return "SearchRoom";
-			case rpcn::CommandType::GetRoomDataExternalList: return "GetRoomDataExternalList";
-			case rpcn::CommandType::SetRoomDataExternal: return "SetRoomDataExternal";
-			case rpcn::CommandType::GetRoomDataInternal: return "GetRoomDataInternal";
-			case rpcn::CommandType::SetRoomDataInternal: return "SetRoomDataInternal";
-			case rpcn::CommandType::GetRoomMemberDataInternal: return "GetRoomMemberDataInternal";
-			case rpcn::CommandType::SetRoomMemberDataInternal: return "SetRoomMemberDataInternal";
-			case rpcn::CommandType::SetUserInfo: return "SetUserInfo";
-			case rpcn::CommandType::PingRoomOwner: return "PingRoomOwner";
-			case rpcn::CommandType::SendRoomMessage: return "SendRoomMessage";
-			case rpcn::CommandType::RequestSignalingInfos: return "RequestSignalingInfos";
-			case rpcn::CommandType::RequestTicket: return "RequestTicket";
-			case rpcn::CommandType::SendMessage: return "SendMessage";
-			case rpcn::CommandType::GetBoardInfos: return "GetBoardInfos";
-			case rpcn::CommandType::RecordScore: return "RecordScore";
-			case rpcn::CommandType::RecordScoreData: return "RecordScoreData";
-			case rpcn::CommandType::GetScoreData: return "GetScoreData";
-			case rpcn::CommandType::GetScoreRange: return "GetScoreRange";
-			case rpcn::CommandType::GetScoreFriends: return "GetScoreFriends";
-			case rpcn::CommandType::GetScoreNpid: return "GetScoreNpid";
-			case rpcn::CommandType::GetNetworkTime: return "GetNetworkTime";
-			case rpcn::CommandType::TusSetMultiSlotVariable: return "TusSetMultiSlotVariable";
-			case rpcn::CommandType::TusGetMultiSlotVariable: return "TusGetMultiSlotVariable";
-			case rpcn::CommandType::TusGetMultiUserVariable: return "TusGetMultiUserVariable";
-			case rpcn::CommandType::TusGetFriendsVariable: return "TusGetFriendsVariable";
-			case rpcn::CommandType::TusAddAndGetVariable: return "TusAddAndGetVariable";
-			case rpcn::CommandType::TusTryAndSetVariable: return "TusTryAndSetVariable";
-			case rpcn::CommandType::TusDeleteMultiSlotVariable: return "TusDeleteMultiSlotVariable";
-			case rpcn::CommandType::TusSetData: return "TusSetData";
-			case rpcn::CommandType::TusGetData: return "TusGetData";
-			case rpcn::CommandType::TusGetMultiSlotDataStatus: return "TusGetMultiSlotDataStatus";
-			case rpcn::CommandType::TusGetMultiUserDataStatus: return "TusGetMultiUserDataStatus";
-			case rpcn::CommandType::TusGetFriendsDataStatus: return "TusGetFriendsDataStatus";
-			case rpcn::CommandType::TusDeleteMultiSlotData: return "TusDeleteMultiSlotData";
-			case rpcn::CommandType::SetPresence: return "SetPresence";
-			case rpcn::CommandType::CreateRoomGUI: return "CreateRoomGUI";
-			case rpcn::CommandType::JoinRoomGUI: return "JoinRoomGUI";
-			case rpcn::CommandType::LeaveRoomGUI: return "LeaveRoomGUI";
-			case rpcn::CommandType::GetRoomListGUI: return "GetRoomListGUI";
-			case rpcn::CommandType::SetRoomSearchFlagGUI: return "SetRoomSearchFlagGUI";
-			case rpcn::CommandType::GetRoomSearchFlagGUI: return "GetRoomSearchFlagGUI";
-			case rpcn::CommandType::SetRoomInfoGUI: return "SetRoomInfoGUI";
-			case rpcn::CommandType::GetRoomInfoGUI: return "GetRoomInfoGUI";
-			case rpcn::CommandType::QuickMatchGUI: return "QuickMatchGUI";
-			case rpcn::CommandType::SearchJoinRoomGUI: return "SearchJoinRoomGUI";
-			}
-
-			return unknown;
-		});
-}
-
-template <>
-void fmt_class_string<rpcn::NotificationType>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-		{
-			switch (value)
-			{
-			case rpcn::NotificationType::UserJoinedRoom: return "UserJoinedRoom";
-			case rpcn::NotificationType::UserLeftRoom: return "UserLeftRoom";
-			case rpcn::NotificationType::RoomDestroyed: return "RoomDestroyed";
-			case rpcn::NotificationType::UpdatedRoomDataInternal: return "UpdatedRoomDataInternal";
-			case rpcn::NotificationType::UpdatedRoomMemberDataInternal: return "UpdatedRoomMemberDataInternal";
-			case rpcn::NotificationType::FriendQuery: return "FriendQuery";
-			case rpcn::NotificationType::FriendNew: return "FriendNew";
-			case rpcn::NotificationType::FriendLost: return "FriendLost";
-			case rpcn::NotificationType::FriendStatus: return "FriendStatus";
-			case rpcn::NotificationType::RoomMessageReceived: return "RoomMessageReceived";
-			case rpcn::NotificationType::MessageReceived: return "MessageReceived";
-			case rpcn::NotificationType::FriendPresenceChanged: return "FriendPresenceChanged";
-			case rpcn::NotificationType::SignalingHelper: return "SignalingHelper";
-			case rpcn::NotificationType::MemberJoinedRoomGUI: return "MemberJoinedRoomGUI";
-			case rpcn::NotificationType::MemberLeftRoomGUI: return "MemberLeftRoomGUI";
-			case rpcn::NotificationType::RoomDisappearedGUI: return "RoomDisappearedGUI";
-			case rpcn::NotificationType::RoomOwnerChangedGUI: return "RoomOwnerChangedGUI";
-			case rpcn::NotificationType::UserKickedGUI: return "UserKickedGUI";
-			case rpcn::NotificationType::QuickMatchCompleteGUI: return "QuickMatchCompleteGUI";
-			}
-
-			return unknown;
-		});
-}
-
-void vec_stream::dump() const
-{
-	rpcn_log.error("vec_stream dump:\n%s", fmt::buf_to_hexstring(vec.data(), vec.size()));
-}
-
-namespace rpcn
-{
-	localized_string_id rpcn_state_to_localized_string_id(rpcn::rpcn_state state)
-	{
-		switch (state)
-		{
-		case rpcn::rpcn_state::failure_no_failure: return localized_string_id::RPCN_NO_ERROR;
-		case rpcn::rpcn_state::failure_input: return localized_string_id::RPCN_ERROR_INVALID_INPUT;
-		case rpcn::rpcn_state::failure_wolfssl: return localized_string_id::RPCN_ERROR_WOLFSSL;
-		case rpcn::rpcn_state::failure_resolve: return localized_string_id::RPCN_ERROR_RESOLVE;
-		case rpcn::rpcn_state::failure_binding: return localized_string_id::RPCN_ERROR_BINDING;
-		case rpcn::rpcn_state::failure_connect: return localized_string_id::RPCN_ERROR_CONNECT;
-		case rpcn::rpcn_state::failure_id: return localized_string_id::RPCN_ERROR_LOGIN_ERROR;
-		case rpcn::rpcn_state::failure_id_already_logged_in: return localized_string_id::RPCN_ERROR_ALREADY_LOGGED;
-		case rpcn::rpcn_state::failure_id_username: return localized_string_id::RPCN_ERROR_INVALID_LOGIN;
-		case rpcn::rpcn_state::failure_id_password: return localized_string_id::RPCN_ERROR_INVALID_PASSWORD;
-		case rpcn::rpcn_state::failure_id_token: return localized_string_id::RPCN_ERROR_INVALID_TOKEN;
-		case rpcn::rpcn_state::failure_protocol: return localized_string_id::RPCN_ERROR_INVALID_PROTOCOL_VERSION;
-		case rpcn::rpcn_state::failure_other: return localized_string_id::RPCN_ERROR_UNKNOWN;
-		default: return localized_string_id::INVALID;
-		}
-	}
-
-	void overlay_friend_callback(void* /*param*/, rpcn::NotificationType ntype, const std::string& username, bool status)
-	{
-		if (!g_cfg.misc.show_rpcn_popups)
-			return;
-
-		localized_string_id loc_id = localized_string_id::INVALID;
-
-		switch (ntype)
-		{
-		case rpcn::NotificationType::FriendQuery: loc_id = localized_string_id::RPCN_FRIEND_REQUEST_RECEIVED; break;
-		case rpcn::NotificationType::FriendNew: loc_id = localized_string_id::RPCN_FRIEND_ADDED; break;
-		case rpcn::NotificationType::FriendLost: loc_id = localized_string_id::RPCN_FRIEND_LOST; break;
-		case rpcn::NotificationType::FriendStatus: loc_id = status ? localized_string_id::RPCN_FRIEND_LOGGED_IN : localized_string_id::RPCN_FRIEND_LOGGED_OUT; break;
-		case rpcn::NotificationType::FriendPresenceChanged: return;
-		default: rpcn_log.fatal("An unhandled notification type was received by the overlay friend callback!"); break;
-		}
-
-		rsx::overlays::queue_message(get_localized_string(loc_id, username.c_str()), 3'000'000);
-	}
-
-	std::string rpcn_state_to_string(rpcn::rpcn_state state)
-	{
-		return get_localized_string(rpcn_state_to_localized_string_id(state));
-	}
-
-	void friend_online_data::dump() const
-	{
-		rpcn_log.notice("online: %s, pr_com_id: %s, pr_title: %s, pr_status: %s, pr_comment: %s, pr_data: %s", online ? "true" : "false", pr_com_id.data, pr_title, pr_status, pr_comment, fmt::buf_to_hexstring(pr_data.data(), pr_data.size()));
-	}
-
-	constexpr u32 RPCN_PROTOCOL_VERSION = 26;
-	constexpr usz RPCN_HEADER_SIZE = 15;
-
-	const char* error_to_explanation(rpcn::ErrorType error)
-	{
-		switch (error)
-		{
-		case rpcn::ErrorType::NoError: return "No error";
-		case rpcn::ErrorType::Malformed: return "Sent packet was malformed!";
-		case rpcn::ErrorType::Invalid: return "Sent command was invalid!";
-		case rpcn::ErrorType::InvalidInput: return "Sent data was invalid!";
-		case rpcn::ErrorType::TooSoon: return "Request happened too soon!";
-		case rpcn::ErrorType::LoginError: return "Unknown login error!";
-		case rpcn::ErrorType::LoginAlreadyLoggedIn: return "User is already logged in!";
-		case rpcn::ErrorType::LoginInvalidUsername: return "Login error: invalid username!";
-		case rpcn::ErrorType::LoginInvalidPassword: return "Login error: invalid password!";
-		case rpcn::ErrorType::LoginInvalidToken: return "Login error: invalid token!";
-		case rpcn::ErrorType::CreationError: return "Error creating an account!";
-		case rpcn::ErrorType::CreationExistingUsername: return "Error creating an account: existing username!";
-		case rpcn::ErrorType::CreationBannedEmailProvider: return "Error creating an account: banned email provider!";
-		case rpcn::ErrorType::CreationExistingEmail: return "Error creating an account: an account with that email already exist!";
-		case rpcn::ErrorType::RoomMissing: return "User tried to join a non-existent room!";
-		case rpcn::ErrorType::RoomAlreadyJoined: return "User has already joined!";
-		case rpcn::ErrorType::RoomFull: return "User tried to join a full room!";
-		case rpcn::ErrorType::RoomPasswordMismatch: return "Room password used was invalid";
-		case rpcn::ErrorType::RoomPasswordMissing: return "Room password was missing during room creation";
-		case rpcn::ErrorType::RoomGroupNoJoinLabel: return "Tried to join a group room without a label";
-		case rpcn::ErrorType::RoomGroupFull: return "Room group is full";
-		case rpcn::ErrorType::RoomGroupJoinLabelNotFound: return "Join label was invalid";
-		case rpcn::ErrorType::RoomGroupMaxSlotMismatch: return "Mismatch between max_slot and the listed slots in groups";
-		case rpcn::ErrorType::Unauthorized: return "User attempted an unauthorized operation!";
-		case rpcn::ErrorType::DbFail: return "A db query failed on the server!";
-		case rpcn::ErrorType::EmailFail: return "An email action failed on the server!";
-		case rpcn::ErrorType::NotFound: return "A request replied not found!";
-		case rpcn::ErrorType::Blocked: return "You're blocked!";
-		case rpcn::ErrorType::AlreadyFriend: return "You're already friends!";
-		case rpcn::ErrorType::ScoreNotBest: return "Attempted to register a score that is not better!";
-		case rpcn::ErrorType::ScoreInvalid: return "Score for player was found but wasn't what was expected!";
-		case rpcn::ErrorType::ScoreHasData: return "Score already has game data associated with it!";
-		case rpcn::ErrorType::CondFail: return "Condition related to the query failed!";
-		case rpcn::ErrorType::Unsupported: return "An unsupported operation was attempted!";
-		}
-
-		fmt::throw_exception("Unknown error returned: %d", static_cast<u8>(error));
-	}
-
-	void print_error(rpcn::CommandType command, rpcn::ErrorType error)
-	{
-		const std::string error_message = fmt::format("command: %s result: %s, explanation: %s", command, error, error_to_explanation(error));
-
-		if (error == rpcn::ErrorType::NoError)
-		{
-			rpcn_log.trace("%s", error_message);
-		}
-		else
-		{
-			rpcn_log.warning("%s", error_message);
-		}
-	}
-
-	// Constructor, destructor & singleton manager
-
-	rpcn_client::rpcn_client(u32 binding_address)
-		: binding_address(binding_address), sem_connected(0), sem_authentified(0), sem_reader(0), sem_writer(0), sem_rpcn(0),
-		  thread_rpcn(std::thread(&rpcn_client::rpcn_thread, this)),
-		  thread_rpcn_reader(std::thread(&rpcn_client::rpcn_reader_thread, this)),
-		  thread_rpcn_writer(std::thread(&rpcn_client::rpcn_writer_thread, this))
-	{
-		g_cfg_rpcn.load();
-
-		sem_rpcn.release();
-	}
-
-	rpcn_client::~rpcn_client()
-	{
-		terminate_connection();
-		std::lock_guard lock(inst_mutex);
-		terminate = true;
-		sem_rpcn.release();
-		sem_reader.release();
-		sem_writer.release();
-
-		if (thread_rpcn.joinable())
-			thread_rpcn.join();
-		if (thread_rpcn_reader.joinable())
-			thread_rpcn_reader.join();
-		if (thread_rpcn_writer.joinable())
-			thread_rpcn_writer.join();
-
-		disconnect();
-
-		sem_connected.release();
-		sem_authentified.release();
-	}
-
-	std::shared_ptr<rpcn_client> rpcn_client::get_instance(u32 binding_address, bool check_config)
-	{
-		if (check_config && g_cfg.net.psn_status != np_psn_status::psn_rpcn)
-		{
-			fmt::throw_exception("RPCN is required to use PSN online features.");
-		}
-
-		std::shared_ptr<rpcn_client> sptr;
-
-		std::lock_guard lock(inst_mutex);
-		sptr = instance.lock();
-		if (!sptr)
-		{
-			sptr = std::shared_ptr<rpcn_client>(new rpcn_client(binding_address));
-			sptr->register_friend_cb(overlay_friend_callback, nullptr);
-			instance = sptr;
-		}
-
-		return sptr;
-	}
-
-	// inform rpcn that the server infos have been updated and signal rpcn_thread to try again
-	void rpcn_client::server_infos_updated()
-	{
-		if (connected)
-		{
-			disconnect();
-		}
-
-		sem_rpcn.release();
-	}
-
-	// RPCN thread
-	void rpcn_client::rpcn_reader_thread()
-	{
-		thread_base::set_name("RPCN Reader");
-
-		while (true)
-		{
-			sem_reader.acquire();
-			{
-				std::lock_guard lock(mutex_read);
-				while (true)
-				{
-					if (terminate)
-					{
-						return;
-					}
-
-					if (!handle_input())
-					{
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	void rpcn_client::rpcn_writer_thread()
-	{
-		thread_base::set_name("RPCN Writer");
-
-		while (true)
-		{
-			sem_writer.acquire();
-
-			{
-				std::lock_guard lock(mutex_write);
-
-				if (terminate)
-				{
-					return;
-				}
-
-				if (!handle_output())
-				{
-					break;
-				}
-			}
-		}
-	}
-
-	void rpcn_client::rpcn_thread()
-	{
-		thread_base::set_name("RPCN Client");
-
-		// UDP Signaling related
-		steady_clock::time_point last_ping_time_ipv4{}, last_pong_time_ipv4{};
-		steady_clock::time_point last_ping_time_ipv6{}, last_pong_time_ipv6{};
-
-		while (true)
-		{
-			sem_rpcn.acquire();
-
-			while (true)
-			{
-				if (terminate)
-				{
-					return;
-				}
-
-				// By default is the object is alive we should be connected
-				if (!connected)
-				{
-					if (want_conn)
-					{
-						want_conn = false;
-						{
-							std::lock_guard lock(mutex_connected);
-							connect(g_cfg_rpcn.get_host());
-						}
-						sem_connected.release();
-					}
-
-					break;
-				}
-
-				if (!authentified)
-				{
-					if (want_auth)
-					{
-						bool result_login;
-						{
-							std::lock_guard lock(mutex_authentified);
-							result_login = login(g_cfg_rpcn.get_npid(), g_cfg_rpcn.get_password(), g_cfg_rpcn.get_token());
-						}
-						sem_authentified.release();
-
-						if (!result_login)
-						{
-							break;
-						}
-						continue;
-					}
-					else
-					{
-						// Nothing to do while waiting for auth request so wait for main sem
-						break;
-					}
-				}
-
-				if (authentified && !Emu.IsStopped())
-				{
-					// Ping the UDP Signaling Server if we're authentified & ingame
-					const auto now = steady_clock::now();
-					const auto rpcn_msgs = get_rpcn_msgs();
-
-					for (const auto& msg : rpcn_msgs)
-					{
-						if (msg.size() == 6)
-						{
-							const u32 new_addr_sig = read_from_ptr<le_t<u32>>(&msg[0]);
-							const u16 new_port_sig = read_from_ptr<be_t<u16>>(&msg[4]);
-							const u32 old_addr_sig = addr_sig;
-							const u32 old_port_sig = port_sig;
-
-							if (new_addr_sig != old_addr_sig)
-							{
-								addr_sig = new_addr_sig;
-								if (old_addr_sig == 0)
-								{
-									addr_sig.notify_one();
-								}
-							}
-
-							if (new_port_sig != old_port_sig)
-							{
-								port_sig = new_port_sig;
-								if (old_port_sig == 0)
-								{
-									port_sig.notify_one();
-								}
-							}
-
-							last_pong_time_ipv4 = now;
-						}
-						else if (msg.size() == 18)
-						{
-							// We don't really need ipv6 info stored so we just update the pong data
-							// std::array<u8, 16> new_ipv6_addr;
-							// std::memcpy(new_ipv6_addr.data(), &msg[3], 16);
-							// const u32 new_ipv6_port = read_from_ptr<be_t<u16>>(&msg[16]);
-
-							last_pong_time_ipv6 = now;
-						}
-						else
-						{
-							rpcn_log.error("Received faulty RPCN UDP message!");
-						}
-					}
-
-					const std::chrono::nanoseconds time_since_last_ipv4_ping = now - last_ping_time_ipv4;
-					const std::chrono::nanoseconds time_since_last_ipv4_pong = now - last_pong_time_ipv4;
-					const std::chrono::nanoseconds time_since_last_ipv6_ping = now - last_ping_time_ipv6;
-					const std::chrono::nanoseconds time_since_last_ipv6_pong = now - last_pong_time_ipv6;
-
-					auto forge_ping_packet = [&]() -> std::vector<u8>
-					{
-						std::vector<u8> ping(13);
-						ping[0] = 1;
-						write_to_ptr<le_t<s64>>(ping, 1, user_id);
-						write_to_ptr<be_t<u32>>(ping, 9, +local_addr_sig);
-						return ping;
-					};
-
-					// Send a packet every 5 seconds and then every 500 ms until reply is received
-					if (time_since_last_ipv4_pong >= 5s && time_since_last_ipv4_ping > 500ms)
-					{
-						const auto ping = forge_ping_packet();
-
-						if (!send_packet_from_p2p_port_ipv4(ping, addr_rpcn_udp_ipv4))
-							rpcn_log.error("Failed to send IPv4 ping to RPCN!");
-
-						last_ping_time_ipv4 = now;
-						continue;
-					}
-
-					if (np::is_ipv6_supported() && time_since_last_ipv6_pong >= 5s && time_since_last_ipv6_ping > 500ms)
-					{
-						const auto ping = forge_ping_packet();
-
-						if (!send_packet_from_p2p_port_ipv6(ping, addr_rpcn_udp_ipv6))
-							rpcn_log.error("Failed to send IPv6 ping to RPCN!");
-
-						last_ping_time_ipv6 = now;
-						continue;
-					}
-
-					auto min_duration_for = [&](const auto last_ping_time, const auto last_pong_time) -> std::chrono::nanoseconds
-					{
-						if ((now - last_pong_time) < 5s)
-						{
-							return (5s - (now - last_pong_time));
-						}
-						else
-						{
-							return (500ms - (now - last_ping_time));
-						}
-					};
-
-					auto duration = min_duration_for(last_ping_time_ipv4, last_pong_time_ipv4);
-
-					if (np::is_ipv6_supported())
-					{
-						const auto duration_ipv6 = min_duration_for(last_ping_time_ipv6, last_pong_time_ipv6);
-						duration = std::min(duration, duration_ipv6);
-					}
-
-					// Expected to fail unless rpcn is terminated
-					// The check is there to nuke a msvc warning
-					if (!sem_rpcn.try_acquire_for(duration))
-					{
-					}
-				}
-			}
-		}
-	}
-
-	bool rpcn_client::handle_input()
-	{
-		u8 header[RPCN_HEADER_SIZE];
-		auto res_recvn = recvn(header, RPCN_HEADER_SIZE);
-
-		switch (res_recvn)
-		{
-		case recvn_result::recvn_noconn: return error_and_disconnect("Disconnected");
-		case recvn_result::recvn_fatal:
-		case recvn_result::recvn_timeout: return error_and_disconnect("Failed to read a packet header on socket");
-		case recvn_result::recvn_nodata: return true;
-		case recvn_result::recvn_success: break;
-		case recvn_result::recvn_terminate: return error_and_disconnect_notice("Recvn was forcefully aborted");
-		}
-
-		const u8 packet_type = header[0];
-		const auto command = static_cast<rpcn::CommandType>(static_cast<u16>(read_from_ptr<le_t<u16>>(&header[1])));
-		const u32 packet_size = read_from_ptr<le_t<u32>>(&header[3]);
-		const u64 packet_id = read_from_ptr<le_t<u64>>(&header[7]);
-
-		if (packet_size < RPCN_HEADER_SIZE)
-			return error_and_disconnect("Invalid packet size");
-
-		std::vector<u8> data;
-		if (packet_size > RPCN_HEADER_SIZE)
-		{
-			const u32 data_size = packet_size - RPCN_HEADER_SIZE;
-			data.resize(data_size);
-			if (recvn(data.data(), data_size) != recvn_result::recvn_success)
-				return error_and_disconnect("Failed to receive a whole packet");
-		}
-
-		switch (static_cast<PacketType>(packet_type))
-		{
-		case PacketType::Request: return error_and_disconnect("Client shouldn't receive request packets!");
-		case PacketType::Reply:
-		{
-			if (data.empty())
-				return error_and_disconnect("Reply packet without result");
-
-			// Internal commands without feedback
-			if (command == CommandType::ResetState)
-			{
-				ensure(data[0] == static_cast<u8>(ErrorType::NoError));
-				break;
-			}
-
-			// Those commands are handled synchronously and won't be forwarded to NP Handler
-			if (command == CommandType::Login || command == CommandType::GetServerList || command == CommandType::Create ||
-				command == CommandType::AddFriend || command == CommandType::RemoveFriend ||
-				command == CommandType::AddBlock || command == CommandType::RemoveBlock ||
-				command == CommandType::SendMessage || command == CommandType::SendToken ||
-				command == CommandType::SendResetToken || command == CommandType::ResetPassword ||
-				command == CommandType::GetNetworkTime || command == CommandType::SetPresence || command == CommandType::Terminate)
-			{
-				std::lock_guard lock(mutex_replies_sync);
-				replies_sync.insert(std::make_pair(packet_id, std::make_pair(command, std::move(data))));
-			}
-			else
-			{
-				if (packet_id < 0x100000000)
-				{
-					std::lock_guard lock(mutex_replies);
-					replies.insert(std::make_pair(static_cast<u32>(packet_id), std::make_pair(command, std::move(data))));
-				}
-				else
-				{
-					rpcn_log.error("Tried to forward a reply whose packet_id marks it as internal to RPCN");
-				}
-			}
-
-			break;
-		}
-		case PacketType::Notification:
-		{
-			auto notif_type = static_cast<rpcn::NotificationType>(command);
-
-			switch (notif_type)
-			{
-			case NotificationType::FriendNew:
-			case NotificationType::FriendLost:
-			case NotificationType::FriendQuery:
-			case NotificationType::FriendStatus:
-			case NotificationType::FriendPresenceChanged:
-			{
-				handle_friend_notification(notif_type, std::move(data));
-				break;
-			}
-			case NotificationType::MessageReceived:
-			{
-				handle_message(std::move(data));
-				break;
-			}
-			default:
-			{
-				std::lock_guard lock(mutex_notifs);
-				notifications.emplace_back(std::make_pair(notif_type, std::move(data)));
-				break;
-			}
-			}
-			break;
-		}
-		case PacketType::ServerInfo:
-		{
-			if (data.size() != 4)
-				return error_and_disconnect("Invalid size of ServerInfo packet");
-
-			received_version = reinterpret_cast<le_t<u32>&>(data[0]);
-			server_info_received = true;
-			break;
-		}
-
-		default: return error_and_disconnect("Unknown packet received!");
-		}
-
-		return true;
-	}
-
-	void rpcn_client::add_packet(std::vector<u8> packet)
-	{
-		std::lock_guard lock(mutex_packets_to_send);
-		packets_to_send.push_back(std::move(packet));
-		sem_writer.release();
-	}
-
-	bool rpcn_client::handle_output()
-	{
-		std::vector<std::vector<u8>> packets;
-		{
-			std::lock_guard lock(mutex_packets_to_send);
-			packets = std::move(packets_to_send);
-			packets_to_send.clear();
-		}
-
-		for (const auto& packet : packets)
-		{
-			if (!send_packet(packet))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	// WolfSSL operations
-
-	std::string rpcn_client::get_wolfssl_error(WOLFSSL* wssl, int error) const
-	{
-		char error_string[WOLFSSL_MAX_ERROR_SZ]{};
-		const auto wssl_err = wolfSSL_get_error(wssl, error);
-		wolfSSL_ERR_error_string(wssl_err, &error_string[0]);
-		return std::string(error_string);
-	}
-
-	rpcn_client::recvn_result rpcn_client::recvn(u8* buf, usz n)
-	{
-		u32 num_timeouts = 0;
-
-		usz n_recv = 0;
-		while (n_recv != n)
-		{
-			if (!connected)
-				return recvn_result::recvn_noconn;
-
-			if (terminate)
-				return recvn_result::recvn_terminate;
-
-			int res = wolfSSL_read(read_wssl, reinterpret_cast<char*>(buf) + n_recv, ::narrow<s32>(n - n_recv));
-			if (res <= 0)
-			{
-				if (wolfSSL_want_read(read_wssl))
-				{
-					pollfd poll_fd{};
-
-					while ((poll_fd.revents & POLLIN) != POLLIN && (poll_fd.revents & POLLRDNORM) != POLLRDNORM)
-					{
-						if (!connected)
-							return recvn_result::recvn_noconn;
-
-						if (terminate)
-							return recvn_result::recvn_terminate;
-
-						poll_fd.fd = sockfd;
-						poll_fd.events = POLLIN;
-						poll_fd.revents = 0;
 #ifdef _WIN32
-						int res_poll = WSAPoll(&poll_fd, 1, RPCN_TIMEOUT_INTERVAL);
-#else
-						int res_poll = poll(&poll_fd, 1, RPCN_TIMEOUT_INTERVAL);
+	WSADATA wsa_data;
+	WSAStartup(MAKEWORD(2, 2), &wsa_data);
 #endif
+}
 
-						if (res_poll < 0)
-						{
-							rpcn_log.error("recvn poll failed with native error: %d)", get_native_error());
-							return recvn_result::recvn_fatal;
-						}
+rpcn_client::~rpcn_client()
+{
+	disconnect();
+}
 
-						num_timeouts++;
+std::string rpcn_client::get_wolfssl_error(int error) const
+{
+	char error_string[80]{};
+	const auto wssl_err = wolfSSL_get_error(wssl, error);
+	wolfSSL_ERR_error_string(wssl_err, &error_string[0]);
+	return std::string(error_string);
+}
 
-						if (num_timeouts > (RPCN_TIMEOUT / RPCN_TIMEOUT_INTERVAL))
-						{
-							if (n_recv == 0)
-								return recvn_result::recvn_nodata;
+void rpcn_client::disconnect()
+{
+	std::lock_guard lock(mutex_socket);
 
-							rpcn_log.error("recvn timeout with %d bytes received", n_recv);
-							return recvn_result::recvn_timeout;
-						}
-					}
-				}
-				else
+	if (wssl)
+	{
+		wolfSSL_free(wssl);
+		wssl = nullptr;
+	}
+
+	if (wssl_ctx)
+	{
+		wolfSSL_CTX_free(wssl_ctx);
+		wssl_ctx = nullptr;
+	}
+
+	wolfSSL_Cleanup();
+
+	if (sockfd)
+	{
+#ifdef _WIN32
+		::closesocket(sockfd);
+#else
+		::close(sockfd);
+#endif
+		sockfd = 0;
+	}
+
+	connected            = false;
+	authentified         = false;
+	server_info_received = false;
+}
+
+rpcn_client::recvn_result rpcn_client::recvn(u8* buf, usz n)
+{
+	u32 num_timeouts = 0;
+
+	usz n_recv = 0;
+	while (n_recv != n && !is_abort())
+	{
+		std::lock_guard lock(mutex_socket);
+
+		if (!connected)
+			return recvn_result::recvn_noconn;
+
+		int res = wolfSSL_read(wssl, reinterpret_cast<char*>(buf) + n_recv, n - n_recv);
+		if (res <= 0)
+		{
+			if (wolfSSL_want_read(wssl))
+			{
+				// If we received partially what we want try to wait longer
+				if (n_recv == 0)
+					return recvn_result::recvn_nodata;
+
+				num_timeouts++;
+				if (num_timeouts >= 1000)
 				{
-					if (res == 0)
-					{
-						// Remote closed connection
-						rpcn_log.notice("recv failed: connection reset by server");
-						return recvn_result::recvn_noconn;
-					}
-
-					rpcn_log.error("recvn failed with error: %d:%s(native: %d)", res, get_wolfssl_error(read_wssl, res), get_native_error());
-					return recvn_result::recvn_fatal;
+					rpcn_log.error("recvn timeout with %d bytes received", n_recv);
+					return recvn_result::recvn_timeout;
 				}
 			}
 			else
 			{
-				// Reset timeout each time something is received
-				num_timeouts = 0;
-				n_recv += res;
+				rpcn_log.error("recvn failed with error: %s", get_wolfssl_error(res));
+				return recvn_result::recvn_fatal;
 			}
-		}
 
-		return recvn_result::recvn_success;
+			res = 0;
+		}
+		n_recv += res;
 	}
 
-	bool rpcn_client::send_packet(const std::vector<u8>& packet)
+	return recvn_result::recvn_success;
+}
+
+bool rpcn_client::send_packet(const std::vector<u8>& packet)
+{
+	u32 num_timeouts = 0;
+	usz n_sent = 0;
+	while (n_sent != packet.size())
 	{
-		u32 num_timeouts = 0;
-		usz n_sent = 0;
-		while (n_sent != packet.size())
+		std::lock_guard lock(mutex_socket);
+
+		if (!connected)
+			return false;
+
+		int res = wolfSSL_write(wssl, reinterpret_cast<const char*>(packet.data()), packet.size());
+		if (res <= 0)
 		{
-			if (terminate)
-				return error_and_disconnect("send_packet was forcefully aborted");
-
-			if (!connected)
-				return false;
-
-			int res = wolfSSL_write(write_wssl, reinterpret_cast<const char*>(packet.data() + n_sent), ::narrow<s32>(packet.size() - n_sent));
-			if (res <= 0)
+			if (wolfSSL_want_write(wssl))
 			{
-				if (wolfSSL_want_write(write_wssl))
+				num_timeouts++;
+				if (num_timeouts >= 1000)
 				{
-					pollfd poll_fd{};
-
-					while ((poll_fd.revents & POLLOUT) != POLLOUT)
-					{
-						if (terminate)
-							return error_and_disconnect("send_packet was forcefully aborted");
-
-						poll_fd.fd = sockfd;
-						poll_fd.events = POLLOUT;
-						poll_fd.revents = 0;
-#ifdef _WIN32
-						int res_poll = WSAPoll(&poll_fd, 1, RPCN_TIMEOUT_INTERVAL);
-#else
-						int res_poll = poll(&poll_fd, 1, RPCN_TIMEOUT_INTERVAL);
-#endif
-						if (res_poll < 0)
-						{
-							rpcn_log.error("send_packet failed with native error: %d)", get_native_error());
-							return error_and_disconnect("send_packet failed on poll");
-						}
-
-						num_timeouts++;
-						if (num_timeouts > (RPCN_TIMEOUT / RPCN_TIMEOUT_INTERVAL))
-						{
-							rpcn_log.error("send_packet timeout with %d bytes sent", n_sent);
-							return error_and_disconnect("Failed to send all the bytes");
-						}
-					}
-				}
-				else
-				{
-					rpcn_log.error("send_packet failed with error: %s", get_wolfssl_error(write_wssl, res));
+					rpcn_log.error("send_packet timeout with %d bytes sent", n_sent);
 					return error_and_disconnect("Failed to send all the bytes");
 				}
-
-				res = 0;
 			}
-			n_sent += res;
-		}
-
-		return true;
-	}
-
-	// Helper functions
-
-	bool rpcn_client::forge_send(rpcn::CommandType command, u64 packet_id, const std::vector<u8>& data)
-	{
-		// TODO: add a check for status?
-
-		std::vector<u8> sent_packet = forge_request(command, packet_id, data);
-		add_packet(std::move(sent_packet));
-		return true;
-	}
-
-	bool rpcn_client::forge_send_reply(rpcn::CommandType command, u64 packet_id, const std::vector<u8>& data, std::vector<u8>& reply_data)
-	{
-		if (!forge_send(command, packet_id, data))
-			return false;
-
-		if (!get_reply(packet_id, reply_data))
-			return false;
-
-		return true;
-	}
-
-	// Connect & disconnect functions
-
-	void rpcn_client::disconnect()
-	{
-		if (read_wssl)
-		{
-			wolfSSL_free(read_wssl);
-			read_wssl = nullptr;
-		}
-
-		if (write_wssl)
-		{
-			wolfSSL_free(write_wssl);
-			write_wssl = nullptr;
-		}
-
-		if (wssl_ctx)
-		{
-			wolfSSL_CTX_free(wssl_ctx);
-			wssl_ctx = nullptr;
-		}
-
-		wolfSSL_Cleanup();
-
-		if (sockfd)
-		{
-#ifdef _WIN32
-			::shutdown(sockfd, SD_BOTH);
-			::closesocket(sockfd);
-#else
-			::shutdown(sockfd, SHUT_RDWR);
-			::close(sockfd);
-#endif
-			sockfd = 0;
-		}
-
-		connected = false;
-		authentified = false;
-		server_info_received = false;
-	}
-
-	bool rpcn_client::connect(const std::string& host)
-	{
-		rpcn_log.warning("connect: Attempting to connect");
-
-		state = rpcn_state::failure_no_failure;
-
-		const auto hostname_and_port = parse_rpcn_host(host);
-
-		if (!hostname_and_port)
-		{
-			state = rpcn_state::failure_input;
-			return false;
-		}
-
-		const auto [hostname, port] = *hostname_and_port;
-
-		{
-			// Ensures both read & write threads are in waiting state
-			std::lock_guard lock_read(mutex_read), lock_write(mutex_write);
-
-			// Cleans previous data if any
-			disconnect();
-
-			if (wolfSSL_Init() != WOLFSSL_SUCCESS)
+			else
 			{
-				rpcn_log.error("connect: Failed to initialize wolfssl");
-				state = rpcn_state::failure_wolfssl;
-				return false;
+				rpcn_log.error("send_packet failed with error: %s", get_wolfssl_error(res));
+				return error_and_disconnect("Failed to send all the bytes");
 			}
 
-			if ((wssl_ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())) == nullptr)
-			{
-				rpcn_log.error("connect: Failed to create wolfssl context");
-				state = rpcn_state::failure_wolfssl;
-				return false;
-			}
-
-			wolfSSL_CTX_set_verify(wssl_ctx, SSL_VERIFY_NONE, nullptr);
-
-			if ((read_wssl = wolfSSL_new(wssl_ctx)) == nullptr)
-			{
-				rpcn_log.error("connect: Failed to create wolfssl object");
-				state = rpcn_state::failure_wolfssl;
-				return false;
-			}
-
-			wolfSSL_set_using_nonblock(read_wssl, 1);
-
-			memset(&addr_rpcn, 0, sizeof(addr_rpcn));
-
-			addr_rpcn.sin_port = std::bit_cast<u16, be_t<u16>>(port); // htons
-			addr_rpcn.sin_family = AF_INET;
-
-			addrinfo* addr_info{};
-
-			if (getaddrinfo(hostname.c_str(), nullptr, nullptr, &addr_info))
-			{
-				rpcn_log.error("connect: Failed to getaddrinfo %s", host);
-				state = rpcn_state::failure_resolve;
-				return false;
-			}
-
-			bool found_ipv4 = false;
-			addrinfo* found = addr_info;
-
-			while (found != nullptr)
-			{
-				switch (found->ai_family)
-				{
-				case AF_INET:
-				{
-					addr_rpcn.sin_addr = reinterpret_cast<sockaddr_in*>(found->ai_addr)->sin_addr;
-					found_ipv4 = true;
-					break;
-				}
-				case AF_INET6:
-				{
-					addr_rpcn_udp_ipv6.sin6_family = AF_INET6;
-					addr_rpcn_udp_ipv6.sin6_port = std::bit_cast<u16, be_t<u16>>(3657);
-					addr_rpcn_udp_ipv6.sin6_addr = reinterpret_cast<sockaddr_in6*>(found->ai_addr)->sin6_addr;
-					break;
-				}
-				default: break;
-				}
-
-				found = found->ai_next;
-			}
-
-			if (!found_ipv4)
-			{
-				rpcn_log.error("connect: Failed to find IPv4 for %s", host);
-				state = rpcn_state::failure_resolve;
-				return false;
-			}
-
-			memcpy(&addr_rpcn_udp_ipv4, &addr_rpcn, sizeof(addr_rpcn_udp_ipv4));
-			addr_rpcn_udp_ipv4.sin_port = std::bit_cast<u16, be_t<u16>>(3657); // htons
-
-			sockfd = socket(AF_INET, SOCK_STREAM, 0);
-#ifdef _WIN32
-			if (sockfd == INVALID_SOCKET)
-#else
-			if (sockfd == -1)
-#endif
-			{
-				rpcn_log.error("connect: Failed to connect to RPCN server!");
-				state = rpcn_state::failure_connect;
-				return false;
-			}
-
-			sockaddr_in sock_addr = {.sin_family = AF_INET};
-			sock_addr.sin_addr.s_addr = binding_address;
-
-			if (binding_address != 0 && ::bind(sockfd, reinterpret_cast<const sockaddr*>(&sock_addr), sizeof(sock_addr)) == -1)
-			{
-				rpcn_log.error("bind: Failed to bind RPCN client socket to binding address(%s): 0x%x!", np::ip_to_string(binding_address), get_native_error());
-				state = rpcn_state::failure_binding;
-				return false;
-			}
-
-			if (::connect(sockfd, reinterpret_cast<struct sockaddr*>(&addr_rpcn), sizeof(addr_rpcn)) != 0)
-			{
-				rpcn_log.error("connect: Failed to connect to RPCN server!");
-				state = rpcn_state::failure_connect;
-				return false;
-			}
-
-			rpcn_log.notice("connect: Connection successful");
-
-#ifdef _WIN32
-			u_long _true = 1;
-			ensure(::ioctlsocket(sockfd, FIONBIO, &_true) == 0);
-#else
-			ensure(::fcntl(sockfd, F_SETFL, ::fcntl(sockfd, F_GETFL, 0) | O_NONBLOCK) == 0);
-#endif
-
-			sockaddr_in client_addr;
-			socklen_t client_addr_size = sizeof(client_addr);
-			if (getsockname(sockfd, reinterpret_cast<struct sockaddr*>(&client_addr), &client_addr_size) != 0)
-			{
-				rpcn_log.error("Failed to get the client address from the socket!");
-			}
-
-			update_local_addr(client_addr.sin_addr.s_addr);
-			// rpcn_log.notice("Updated local address to %s", np::ip_to_string(std::bit_cast<u32, be_t<u32>>(local_addr_sig.load())));
-
-			if (wolfSSL_set_fd(read_wssl, ::narrow<int>(sockfd)) != WOLFSSL_SUCCESS)
-			{
-				rpcn_log.error("connect: Failed to associate wolfssl to the socket");
-				state = rpcn_state::failure_wolfssl;
-				return false;
-			}
-
-			int ret_connect;
-			while ((ret_connect = wolfSSL_connect(read_wssl)) != SSL_SUCCESS)
-			{
-				if (wolfSSL_want_read(read_wssl) || wolfSSL_want_write(read_wssl))
-					continue;
-
-				state = rpcn_state::failure_wolfssl;
-				rpcn_log.error("connect: Handshake failed with RPCN Server: %s", get_wolfssl_error(read_wssl, ret_connect));
-				return false;
-			}
-
-			rpcn_log.notice("connect: Handshake successful");
-
-			if ((write_wssl = wolfSSL_write_dup(read_wssl)) == NULL)
-			{
-				rpcn_log.error("connect: Failed to create write dup for SSL");
-				state = rpcn_state::failure_wolfssl;
-				return false;
-			}
+			res = 0;
 		}
-
-		connected = true;
-		// Wake up both read & write threads
-		sem_reader.release();
-		sem_writer.release();
-
-		rpcn_log.notice("connect: Waiting for protocol version");
-
-		while (!server_info_received && connected && !terminate)
-		{
-			std::this_thread::sleep_for(5ms);
-		}
-
-		if (!connected || terminate)
-		{
-			state = rpcn_state::failure_other;
-			return true;
-		}
-
-		if (received_version != RPCN_PROTOCOL_VERSION)
-		{
-			state = rpcn_state::failure_protocol;
-			rpcn_log.error("Server returned protocol version: %d, expected: %d", received_version, RPCN_PROTOCOL_VERSION);
-			return false;
-		}
-
-		rpcn_log.notice("connect: Protocol version matches");
-		return true;
+		n_sent += res;
 	}
 
-	bool rpcn_client::login(const std::string& npid, const std::string& password, const std::string& token)
+	return true;
+}
+
+bool rpcn_client::forge_send(u16 command, u32 packet_id, const std::vector<u8>& data)
+{
+	const auto sent_packet = forge_request(command, packet_id, data);
+	if (!send_packet(sent_packet))
+		return false;
+
+	return true;
+}
+
+bool rpcn_client::forge_send_reply(u16 command, u32 packet_id, const std::vector<u8>& data, std::vector<u8>& reply_data)
+{
+	if (!forge_send(command, packet_id, data))
+		return false;
+
+	if (!get_reply(packet_id, reply_data))
+		return false;
+
+	if (is_error(static_cast<ErrorType>(reply_data[0])))
 	{
-		if (npid.empty())
-		{
-			state = rpcn_state::failure_id_username;
-			return false;
-		}
-
-		if (password.empty())
-		{
-			state = rpcn_state::failure_id_password;
-			return false;
-		}
-
-		rpcn_log.notice("Attempting to login!");
-
-		std::vector<u8> data;
-		std::copy(npid.begin(), npid.end(), std::back_inserter(data));
-		data.push_back(0);
-		std::copy(password.begin(), password.end(), std::back_inserter(data));
-		data.push_back(0);
-		std::copy(token.begin(), token.end(), std::back_inserter(data));
-		data.push_back(0);
-
-		u64 req_id = rpcn_request_counter.fetch_add(1);
-
-		std::vector<u8> packet_data;
-
-		if (!forge_send_reply(CommandType::Login, req_id, data, packet_data))
-		{
-			state = rpcn_state::failure_other;
-			return false;
-		}
-
-		vec_stream reply(packet_data);
-		auto error = static_cast<ErrorType>(reply.get<u8>());
-		online_name = reply.get_string(false);
-		avatar_url = reply.get_string(false);
-		user_id = reply.get<s64>();
-
-		auto get_usernames_and_status = [](vec_stream& stream, std::map<std::string, friend_online_data>& friends)
-		{
-			u32 num_friends = stream.get<u32>();
-			for (u32 i = 0; i < num_friends; i++)
-			{
-				std::string friend_name = stream.get_string(false);
-				bool online = !!(stream.get<u8>());
-
-				SceNpCommunicationId pr_com_id = stream.get_com_id();
-				std::string pr_title = fmt::truncate(stream.get_string(true), SCE_NP_BASIC_PRESENCE_TITLE_SIZE_MAX - 1);
-				std::string pr_status = fmt::truncate(stream.get_string(true), SCE_NP_BASIC_PRESENCE_EXTENDED_STATUS_SIZE_MAX - 1);
-				std::string pr_comment = fmt::truncate(stream.get_string(true), SCE_NP_BASIC_PRESENCE_COMMENT_SIZE_MAX - 1);
-				std::vector<u8> pr_data = stream.get_rawdata();
-
-				if (pr_data.size() > SCE_NP_BASIC_MAX_PRESENCE_SIZE)
-				{
-					pr_data.resize(SCE_NP_BASIC_MAX_PRESENCE_SIZE);
-				}
-
-				friend_online_data infos(online, std::move(pr_com_id), std::move(pr_title), std::move(pr_status), std::move(pr_comment), std::move(pr_data));
-				friends.insert_or_assign(std::move(friend_name), std::move(infos));
-			}
-		};
-
-		auto get_usernames = [](vec_stream& stream, std::set<std::string>& usernames)
-		{
-			u32 num_usernames = stream.get<u32>();
-			for (u32 i = 0; i < num_usernames; i++)
-			{
-				std::string username = stream.get_string(false);
-				usernames.insert(std::move(username));
-			}
-		};
-
-		{
-			std::lock_guard lock(mutex_friends);
-
-			get_usernames_and_status(reply, friend_infos.friends);
-			get_usernames(reply, friend_infos.requests_sent);
-			get_usernames(reply, friend_infos.requests_received);
-			get_usernames(reply, friend_infos.blocked);
-		}
-
-		if (error != rpcn::ErrorType::NoError)
-		{
-			switch (error)
-			{
-			case rpcn::ErrorType::LoginError: state = rpcn_state::failure_id; break;
-			case rpcn::ErrorType::LoginAlreadyLoggedIn: state = rpcn_state::failure_id_already_logged_in; break;
-			case rpcn::ErrorType::LoginInvalidUsername: state = rpcn_state::failure_id_username; break;
-			case rpcn::ErrorType::LoginInvalidPassword: state = rpcn_state::failure_id_password; break;
-			case rpcn::ErrorType::LoginInvalidToken: state = rpcn_state::failure_id_token; break;
-			default: state = rpcn_state::failure_id; break;
-			}
-
-			disconnect();
-			return false;
-		}
-
-		if (reply.is_error())
-			return error_and_disconnect("Malformed reply to Login command");
-
-		rpcn_log.success("You are now logged in RPCN(%s | %s)!", npid, online_name);
-		authentified = true;
-
-		return true;
-	}
-
-	bool rpcn_client::terminate_connection()
-	{
-		u64 req_id = rpcn_request_counter.fetch_add(1);
-
-		std::vector<u8> packet_data;
-		std::vector<u8> data;
-
-		if (!forge_send_reply(CommandType::Terminate, req_id, data, packet_data))
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	void rpcn_client::reset_state()
-	{
-		if (!connected || !authentified)
-			return;
-
-		std::vector<u8> data;
-		forge_send(CommandType::ResetState, rpcn_request_counter.fetch_add(1), data);
-	}
-
-	ErrorType rpcn_client::create_user(std::string_view npid, std::string_view password, std::string_view online_name, std::string_view avatar_url, std::string_view email)
-	{
-		std::vector<u8> data;
-		std::copy(npid.begin(), npid.end(), std::back_inserter(data));
-		data.push_back(0);
-		std::copy(password.begin(), password.end(), std::back_inserter(data));
-		data.push_back(0);
-		std::copy(online_name.begin(), online_name.end(), std::back_inserter(data));
-		data.push_back(0);
-		std::copy(avatar_url.begin(), avatar_url.end(), std::back_inserter(data));
-		data.push_back(0);
-		std::copy(email.begin(), email.end(), std::back_inserter(data));
-		data.push_back(0);
-
-		u64 req_id = rpcn_request_counter.fetch_add(1);
-
-		std::vector<u8> packet_data;
-		if (!forge_send_reply(CommandType::Create, req_id, data, packet_data))
-		{
-			state = rpcn_state::failure_other;
-			return ErrorType::CreationError;
-		}
-
-		vec_stream reply(packet_data);
-		auto error = static_cast<ErrorType>(reply.get<u8>());
-
-		if (error == rpcn::ErrorType::NoError)
-		{
-			rpcn_log.success("You have successfully created a RPCN account(%s | %s)!", npid, online_name);
-		}
-
-		return error;
-	}
-
-	ErrorType rpcn_client::resend_token(const std::string& npid, const std::string& password)
-	{
-		if (authentified)
-		{
-			// If you're already logged in why do you need a token?
-			return ErrorType::LoginAlreadyLoggedIn;
-		}
-
-		std::vector<u8> data;
-		std::copy(npid.begin(), npid.end(), std::back_inserter(data));
-		data.push_back(0);
-		std::copy(password.begin(), password.end(), std::back_inserter(data));
-		data.push_back(0);
-
-		u64 req_id = rpcn_request_counter.fetch_add(1);
-
-		std::vector<u8> packet_data;
-		if (!forge_send_reply(CommandType::SendToken, req_id, data, packet_data))
-		{
-			return ErrorType::Malformed;
-		}
-
-		vec_stream reply(packet_data);
-		auto error = static_cast<ErrorType>(reply.get<u8>());
-
-		if (error == rpcn::ErrorType::NoError)
-		{
-			rpcn_log.success("Token has successfully been resent!");
-		}
-
-		return error;
-	}
-
-	ErrorType rpcn_client::send_reset_token(std::string_view npid, std::string_view email)
-	{
-		if (authentified)
-		{
-			// If you're already logged in why do you need a password reset token?
-			return ErrorType::LoginAlreadyLoggedIn;
-		}
-
-		std::vector<u8> data;
-		std::copy(npid.begin(), npid.end(), std::back_inserter(data));
-		data.push_back(0);
-		std::copy(email.begin(), email.end(), std::back_inserter(data));
-		data.push_back(0);
-
-		u64 req_id = rpcn_request_counter.fetch_add(1);
-
-		std::vector<u8> packet_data;
-		if (!forge_send_reply(CommandType::SendResetToken, req_id, data, packet_data))
-		{
-			return ErrorType::Malformed;
-		}
-
-		vec_stream reply(packet_data);
-		auto error = static_cast<ErrorType>(reply.get<u8>());
-
-		if (error == rpcn::ErrorType::NoError)
-		{
-			rpcn_log.success("Password reset token has successfully been sent!");
-		}
-
-		return error;
-	}
-
-	ErrorType rpcn_client::reset_password(std::string_view npid, std::string_view token, std::string_view password)
-	{
-		if (authentified)
-		{
-			// If you're already logged in why do you need to reset the password?
-			return ErrorType::LoginAlreadyLoggedIn;
-		}
-
-		std::vector<u8> data;
-		std::copy(npid.begin(), npid.end(), std::back_inserter(data));
-		data.push_back(0);
-		std::copy(token.begin(), token.end(), std::back_inserter(data));
-		data.push_back(0);
-		std::copy(password.begin(), password.end(), std::back_inserter(data));
-		data.push_back(0);
-
-		u64 req_id = rpcn_request_counter.fetch_add(1);
-
-		std::vector<u8> packet_data;
-		if (!forge_send_reply(CommandType::ResetPassword, req_id, data, packet_data))
-		{
-			return ErrorType::Malformed;
-		}
-
-		vec_stream reply(packet_data);
-		auto error = static_cast<ErrorType>(reply.get<u8>());
-
-		if (error == rpcn::ErrorType::NoError)
-		{
-			rpcn_log.success("Password has successfully been reset!");
-		}
-
-		return error;
-	}
-
-	bool rpcn_client::add_friend(const std::string& friend_username)
-	{
-		std::vector<u8> data;
-		std::copy(friend_username.begin(), friend_username.end(), std::back_inserter(data));
-		data.push_back(0);
-
-		u64 req_id = rpcn_request_counter.fetch_add(1);
-
-		std::vector<u8> packet_data;
-		if (!forge_send_reply(CommandType::AddFriend, req_id, data, packet_data))
-		{
-			return false;
-		}
-
-		vec_stream reply(packet_data);
-		auto error = static_cast<ErrorType>(reply.get<u8>());
-
-		if (error != rpcn::ErrorType::NoError)
-		{
-			return false;
-		}
-
-		rpcn_log.success("You have successfully added \"%s\" as a friend", friend_username);
-		return true;
-	}
-
-	bool rpcn_client::remove_friend(const std::string& friend_username)
-	{
-		std::vector<u8> data;
-		std::copy(friend_username.begin(), friend_username.end(), std::back_inserter(data));
-		data.push_back(0);
-
-		u64 req_id = rpcn_request_counter.fetch_add(1);
-
-		std::vector<u8> packet_data;
-		if (!forge_send_reply(CommandType::RemoveFriend, req_id, data, packet_data))
-		{
-			return false;
-		}
-
-		vec_stream reply(packet_data);
-		auto error = static_cast<ErrorType>(reply.get<u8>());
-
-		if (error != rpcn::ErrorType::NoError)
-		{
-			return false;
-		}
-
-		rpcn_log.success("You have successfully removed \"%s\" from your friendlist", friend_username);
-		return true;
-	}
-
-	std::vector<std::pair<rpcn::NotificationType, std::vector<u8>>> rpcn_client::get_notifications()
-	{
-		std::lock_guard lock(mutex_notifs);
-		auto notifs = std::move(notifications);
-		notifications.clear();
-		return notifs;
-	}
-
-	std::unordered_map<u32, std::pair<rpcn::CommandType, std::vector<u8>>> rpcn_client::get_replies()
-	{
-		std::lock_guard lock(mutex_replies);
-		auto ret_replies = std::move(replies);
-		replies.clear();
-		return ret_replies;
-	}
-
-	std::unordered_map<std::string, friend_online_data> rpcn_client::get_presence_updates()
-	{
-		std::lock_guard lock(mutex_presence_updates);
-		std::unordered_map<std::string, friend_online_data> ret_updates = std::move(presence_updates);
-		presence_updates.clear();
-		return ret_updates;
-	}
-
-	std::map<std::string, friend_online_data> rpcn_client::get_presence_states()
-	{
-		std::scoped_lock lock(mutex_friends, mutex_presence_updates);
-		presence_updates.clear();
-		return friend_infos.friends;
-	}
-
-	std::vector<u64> rpcn_client::get_new_messages()
-	{
-		std::lock_guard lock(mutex_messages);
-		std::vector<u64> ret_new_messages = std::move(new_messages);
-		new_messages.clear();
-		return ret_new_messages;
-	}
-
-	bool rpcn_client::get_reply(const u64 expected_id, std::vector<u8>& data)
-	{
-		auto check_for_reply = [this, expected_id, &data]() -> bool
-		{
-			std::lock_guard lock(mutex_replies_sync);
-			if (auto r = replies_sync.find(expected_id); r != replies_sync.end())
-			{
-				data = std::move(r->second.second);
-				replies_sync.erase(r);
-				return true;
-			}
-			return false;
-		};
-
-		while (connected && !terminate)
-		{
-			if (check_for_reply())
-				return true;
-
-			std::this_thread::sleep_for(5ms);
-		}
-
-		if (check_for_reply())
-			return true;
-
+		disconnect();
 		return false;
 	}
 
-	bool rpcn_client::get_server_list(u32 req_id, const SceNpCommunicationId& communication_id, std::vector<u16>& server_list)
+	return true;
+}
+
+bool rpcn_client::connect(const std::string& host)
+{
+	rpcn_log.warning("Attempting to connect to RPCN!");
+
+	// Cleans previous data if any
+	disconnect();
+
 	{
-		std::vector<u8> data(COMMUNICATION_ID_SIZE), reply_data;
-		rpcn_client::write_communication_id(communication_id, data);
+		std::lock_guard lock(mutex_socket);
 
-		if (!forge_send_reply(CommandType::GetServerList, req_id, data, reply_data))
+		if (wolfSSL_Init() != WOLFSSL_SUCCESS)
 		{
+			rpcn_log.fatal("Failed to initialize wolfssl");
 			return false;
 		}
 
-		vec_stream reply(reply_data);
-		auto error = static_cast<ErrorType>(reply.get<u8>());
-
-		if (error != rpcn::ErrorType::NoError)
+		if ((wssl_ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())) == nullptr)
 		{
+			rpcn_log.fatal("Failed to create wolfssl context");
 			return false;
 		}
 
-		u16 num_servs = reply.get<u16>();
+		wolfSSL_CTX_set_verify(wssl_ctx, SSL_VERIFY_NONE, nullptr);
 
-		server_list.clear();
-		for (u16 i = 0; i < num_servs; i++)
+		if ((wssl = wolfSSL_new(wssl_ctx)) == nullptr)
 		{
-			server_list.push_back(reply.get<u16>());
+			rpcn_log.fatal("Failed to create wolfssl object");
+			return false;
 		}
 
-		if (reply.is_error())
+		memset(&addr_rpcn, 0, sizeof(addr_rpcn));
+
+		addr_rpcn.sin_port   = std::bit_cast<u16, be_t<u16>>(31313); // htons
+		addr_rpcn.sin_family = AF_INET;
+		auto splithost       = fmt::split(host, {":"});
+
+		if (splithost.size() != 1 && splithost.size() != 2)
 		{
-			server_list.clear();
-			return error_and_disconnect("Malformed reply to GetServerList command");
+			rpcn_log.fatal("RPCN host is invalid!");
+			return false;
 		}
 
+		if (splithost.size() == 2)
+			addr_rpcn.sin_port = std::bit_cast<u16, be_t<u16>>(std::stoul(splithost[1])); // htons
+
+		hostent* host_addr = gethostbyname(splithost[0].c_str());
+		if (!host_addr)
+		{
+			rpcn_log.fatal("Failed to resolve %s", splithost[0]);
+			return false;
+		}
+
+		addr_rpcn.sin_addr.s_addr = *reinterpret_cast<u32*>(host_addr->h_addr_list[0]);
+
+		memcpy(&addr_rpcn_udp, &addr_rpcn, sizeof(addr_rpcn_udp));
+		addr_rpcn_udp.sin_port = std::bit_cast<u16, be_t<u16>>(3657); // htons
+
+		sockfd = socket(AF_INET, SOCK_STREAM, 0);
+
+#ifdef _WIN32
+		u32 timeout = 5;
+#else
+		struct timeval timeout;
+		timeout.tv_sec  = 0;
+		timeout.tv_usec = 5000;
+#endif
+
+		if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, reinterpret_cast<char*>(&timeout), sizeof(timeout)) < 0)
+		{
+			rpcn_log.fatal("Failed to setsockopt!");
+			return false;
+		}
+
+		if (::connect(sockfd, reinterpret_cast<struct sockaddr*>(&addr_rpcn), sizeof(addr_rpcn)) != 0)
+		{
+			rpcn_log.fatal("Failed to connect to RPCN server!");
+			return false;
+		}
+
+		if (wolfSSL_set_fd(wssl, sockfd) != WOLFSSL_SUCCESS)
+		{
+			rpcn_log.fatal("Failed to associate wolfssl to the socket");
+			return false;
+		}
+
+		int ret_connect;
+		while((ret_connect = wolfSSL_connect(wssl)) != SSL_SUCCESS)
+		{
+			if(wolfSSL_want_read(wssl))
+				continue;
+
+			rpcn_log.fatal("Handshake failed with RPCN Server: %s", get_wolfssl_error(ret_connect));
+			return false;
+		}
+	}
+
+	connected = true;
+
+	while (!server_info_received && connected && !is_abort())
+	{
+		if (in_config)
+			std::this_thread::sleep_for(5ms);
+		else
+			thread_ctrl::wait_for(5000);
+	}
+
+	if (received_version != RPCN_PROTOCOL_VERSION)
+	{
+		rpcn_log.fatal("Server returned protocol version: %d, expected: %d", received_version, RPCN_PROTOCOL_VERSION);
+		disconnect();
+		return false;
+	}
+
+	last_ping_time = steady_clock::now() - 5s;
+	last_pong_time = last_ping_time;
+
+	return true;
+}
+
+bool rpcn_client::login(const std::string& npid, const std::string& password, const std::string& token)
+{
+	std::vector<u8> data{};
+	std::copy(npid.begin(), npid.end(), std::back_inserter(data));
+	data.push_back(0);
+	std::copy(password.begin(), password.end(), std::back_inserter(data));
+	data.push_back(0);
+	std::copy(token.begin(), token.end(), std::back_inserter(data));
+	data.push_back(0);
+	const auto sent_packet = forge_request(CommandType::Login, 1, data);
+	if (!send_packet(sent_packet))
+		return false;
+
+	std::vector<u8> packet_data{};
+	if (!get_reply(1, packet_data))
+		return false;
+
+	vec_stream reply(packet_data);
+	u8 error    = reply.get<u8>();
+	online_name = reply.get_string(false);
+	avatar_url  = reply.get_string(false);
+	user_id     = reply.get<s64>();
+
+	if (is_error(static_cast<ErrorType>(error)))
+	{
+		disconnect();
+		return false;
+	}
+
+	if (reply.is_error())
+		return error_and_disconnect("Malformed reply to Login command");
+
+	rpcn_log.success("You are now logged in RPCN(%s | %s)!", npid, online_name);
+	authentified = true;
+
+	// Make sure signaling works
+	if (!in_config)
+	{
+		auto start = steady_clock::now();
+
+		while (!get_addr_sig() && steady_clock::now() - start < 5s)
+		{
+			std::this_thread::sleep_for(5ms);
+		}
+
+		if (!get_addr_sig())
+			return error_and_disconnect("Failed to get Signaling going with the server!");
+	}
+
+	return true;
+}
+
+bool rpcn_client::create_user(const std::string& npid, const std::string& password, const std::string& online_name, const std::string& avatar_url, const std::string& email)
+{
+	std::vector<u8> data{};
+	std::copy(npid.begin(), npid.end(), std::back_inserter(data));
+	data.push_back(0);
+	std::copy(password.begin(), password.end(), std::back_inserter(data));
+	data.push_back(0);
+	std::copy(online_name.begin(), online_name.end(), std::back_inserter(data));
+	data.push_back(0);
+	std::copy(avatar_url.begin(), avatar_url.end(), std::back_inserter(data));
+	data.push_back(0);
+	std::copy(email.begin(), email.end(), std::back_inserter(data));
+	data.push_back(0);
+	const auto sent_packet = forge_request(CommandType::Create, 1, data);
+	if (!send_packet(sent_packet))
+		return false;
+
+	std::vector<u8> packet_data{};
+	if (!get_reply(1, packet_data))
+		return false;
+
+	vec_stream reply(packet_data);
+	u8 error = reply.get<u8>();
+
+	if (is_error(static_cast<ErrorType>(error)))
+	{
+		disconnect();
+		return false;
+	}
+
+	rpcn_log.success("You have successfully created a RPCN account(%s | %s)!", npid, online_name);
+
+	return true;
+}
+
+s32 send_packet_from_p2p_port(const std::vector<u8>& data, const sockaddr_in& addr);
+std::vector<std::vector<u8>> get_rpcn_msgs();
+
+bool rpcn_client::manage_connection()
+{
+	if (!connected)
+		return false;
+
+	if (authentified && !in_config)
+	{
+		// Ping the UDP Signaling Server
+		auto now = steady_clock::now();
+
+		auto rpcn_msgs = get_rpcn_msgs();
+
+		for (const auto& msg : rpcn_msgs)
+		{
+			if (msg.size() == 6)
+			{
+				addr_sig = *utils::bless<le_t<u32>>(&msg[0]);
+				port_sig = *utils::bless<be_t<u16>>(&msg[4]);
+
+				[[maybe_unused]] in_addr orig{};
+				orig.s_addr = addr_sig;
+
+				last_pong_time = now;
+			}
+			else
+			{
+				rpcn_log.error("Received faulty RPCN UDP message!");
+			}
+		}
+
+		// Send a packet every 5 seconds and then every 500 ms until reply is received
+		if (now - last_pong_time > 5s && now - last_ping_time > 500ms)
+		{
+			std::vector<u8> ping(9);
+			ping[0]                                 = 1;
+			*utils::bless<le_t<s64, 1>>(&ping[1])   = user_id;
+			if (send_packet_from_p2p_port(ping, addr_rpcn_udp) == -1)
+			{
+				rpcn_log.error("Failed to send ping to rpcn!");
+			}
+			last_ping_time = now;
+		}
+	}
+
+	u8 header[RPCN_HEADER_SIZE];
+	auto res_recvn = recvn(header, RPCN_HEADER_SIZE);
+
+	switch (res_recvn)
+	{
+	case recvn_result::recvn_noconn: return error_and_disconnect("Disconnected");
+	case recvn_result::recvn_fatal:
+	case recvn_result::recvn_timeout: return error_and_disconnect("Failed to read a packet header on socket");
+	case recvn_result::recvn_nodata: return false;
+	case recvn_result::recvn_success: break;
+	}
+
+	const u8 packet_type  = header[0];
+	const u16 command     = *utils::bless<le_t<u16>>(&header[1]);
+	const u16 packet_size = *utils::bless<le_t<u16>>(&header[3]);
+	const u32 packet_id   = *utils::bless<le_t<u32>>(&header[5]);
+
+	if (packet_size < RPCN_HEADER_SIZE)
+		return error_and_disconnect("Invalid packet size");
+
+	std::vector<u8> data{};
+	if (packet_size > RPCN_HEADER_SIZE)
+	{
+		const u16 data_size = packet_size - RPCN_HEADER_SIZE;
+		data.resize(data_size);
+		if (recvn(data.data(), data_size) != recvn_result::recvn_success)
+			return error_and_disconnect("Failed to receive a whole packet");
+	}
+
+	switch (static_cast<PacketType>(packet_type))
+	{
+	case PacketType::Request: return error_and_disconnect("Client shouldn't receive request packets!");
+	case PacketType::Reply:
+	{
+		if (data.empty())
+			return error_and_disconnect("Reply packet without result");
+
+		// Those commands are handled synchronously and won't be forwarded to NP Handler
+		if (command == CommandType::Login || command == CommandType::GetServerList || command == CommandType::Create)
+		{
+			std::lock_guard lock(mutex_replies_sync);
+			replies_sync.insert(std::make_pair(packet_id, std::make_pair(command, std::move(data))));
+		}
+		else
+		{
+			std::lock_guard lock(mutex_replies);
+			replies.insert(std::make_pair(packet_id, std::make_pair(command, std::move(data))));
+		}
+
+		break;
+	}
+	case PacketType::Notification:
+	{
+		std::lock_guard lock(mutex_notifs);
+		notifications.emplace_back(std::make_pair(command, std::move(data)));
+		break;
+	}
+	case PacketType::ServerInfo:
+	{
+		if (data.size() != 4)
+			return error_and_disconnect("Invalid size of ServerInfo packet");
+
+		received_version     = reinterpret_cast<le_t<u32>&>(data[0]);
+		server_info_received = true;
+		break;
+	}
+
+	default: return error_and_disconnect("Unknown packet received!");
+	}
+
+	return true;
+}
+
+std::vector<std::pair<u16, std::vector<u8>>> rpcn_client::get_notifications()
+{
+	std::vector<std::pair<u16, std::vector<u8>>> notifs;
+
+	{
+		std::lock_guard lock(mutex_notifs);
+		notifs = std::move(notifications);
+		notifications.clear();
+	}
+
+	return notifs;
+}
+
+std::unordered_map<u32, std::pair<u16, std::vector<u8>>> rpcn_client::get_replies()
+{
+	std::unordered_map<u32, std::pair<u16, std::vector<u8>>> ret_replies;
+
+	{
+		std::lock_guard lock(mutex_replies);
+		ret_replies = std::move(replies);
+		replies.clear();
+	}
+
+	return ret_replies;
+}
+
+bool rpcn_client::get_reply(const u32 expected_id, std::vector<u8>& data)
+{
+	auto check_for_reply = [this, expected_id, &data]() -> bool
+	{
+		std::lock_guard lock(mutex_replies_sync);
+		if (auto r = replies_sync.find(expected_id); r != replies_sync.end())
+		{
+			data = std::move(r->second.second);
+			replies_sync.erase(r);
+			return true;
+		}
+		return false;
+	};
+
+	while (connected && !is_abort())
+	{
+		if (check_for_reply())
+			return true;
+
+		if (in_config)
+			std::this_thread::sleep_for(5ms);
+		else
+			thread_ctrl::wait_for(5000);
+	}
+
+	if (check_for_reply())
 		return true;
+
+	return false;
+}
+
+bool rpcn_client::get_server_list(u32 req_id, const SceNpCommunicationId& communication_id, std::vector<u16>& server_list)
+{
+	std::vector<u8> data(COMMUNICATION_ID_SIZE), reply_data{};
+	memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE);
+
+	if (!forge_send_reply(CommandType::GetServerList, req_id, data, reply_data))
+		return false;
+
+	vec_stream reply(reply_data, 1);
+	u16 num_servs = reply.get<u16>();
+	server_list.clear();
+	for (u16 i = 0; i < num_servs; i++)
+	{
+		server_list.push_back(reply.get<u16>());
 	}
 
-	u64 rpcn_client::get_network_time(u32 req_id)
+	if (reply.is_error())
 	{
-		std::vector<u8> data, reply_data;
-		if (!forge_send_reply(CommandType::GetNetworkTime, req_id, data, reply_data))
-		{
-			return 0;
-		}
-
-		vec_stream reply(reply_data);
-		auto error = static_cast<ErrorType>(reply.get<u8>());
-
-		if (error != rpcn::ErrorType::NoError)
-		{
-			return 0;
-		}
-
-		u64 network_time = reply.get<u64>();
-
-		if (reply.is_error())
-		{
-			error_and_disconnect("Malformed reply to GetNetworkTime command");
-			return 0;
-		}
-
-		return network_time;
+		server_list.clear();
+		return error_and_disconnect("Malformed reply to GetServerList command");
 	}
 
-	bool rpcn_client::get_world_list(u32 req_id, const SceNpCommunicationId& communication_id, u16 server_id)
-	{
-		std::vector<u8> data(COMMUNICATION_ID_SIZE + sizeof(u16));
-		rpcn_client::write_communication_id(communication_id, data);
-		reinterpret_cast<le_t<u16>&>(data[COMMUNICATION_ID_SIZE]) = server_id;
+	return true;
+}
 
-		return forge_send(CommandType::GetWorldList, req_id, data);
+bool rpcn_client::get_world_list(u32 req_id, const SceNpCommunicationId& communication_id, u16 server_id)
+{
+	std::vector<u8> data(COMMUNICATION_ID_SIZE + sizeof(u16));
+	memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE);
+	reinterpret_cast<le_t<u16>&>(data[COMMUNICATION_ID_SIZE]) = server_id;
+
+	if (!forge_send(CommandType::GetWorldList, req_id, data))
+		return false;
+
+	return true;
+}
+
+bool rpcn_client::createjoin_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2CreateJoinRoomRequest* req)
+{
+	std::vector<u8> data{};
+
+	extra_nps::print_createjoinroom(req);
+
+	flatbuffers::FlatBufferBuilder builder(1024);
+
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_binattrinternal_vec;
+	if (req->roomBinAttrInternalNum)
+	{
+		std::vector<flatbuffers::Offset<BinAttr>> davec;
+		for (u32 i = 0; i < req->roomBinAttrInternalNum; i++)
+		{
+			auto bin = CreateBinAttr(builder, req->roomBinAttrInternal[i].id, builder.CreateVector(req->roomBinAttrInternal[i].ptr.get_ptr(), req->roomBinAttrInternal[i].size));
+			davec.push_back(bin);
+		}
+		final_binattrinternal_vec = builder.CreateVector(davec);
 	}
-
-	bool rpcn_client::createjoin_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2CreateJoinRoomRequest* req)
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntAttr>>> final_searchintattrexternal_vec;
+	if (req->roomSearchableIntAttrExternalNum)
 	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntAttr>>> final_searchintattrexternal_vec;
-		if (req->roomSearchableIntAttrExternalNum && req->roomSearchableIntAttrExternal)
+		std::vector<flatbuffers::Offset<IntAttr>> davec;
+		for (u32 i = 0; i < req->roomSearchableIntAttrExternalNum; i++)
 		{
-			std::vector<flatbuffers::Offset<IntAttr>> davec;
-			for (u32 i = 0; i < req->roomSearchableIntAttrExternalNum; i++)
-			{
-				auto bin = CreateIntAttr(builder, req->roomSearchableIntAttrExternal[i].id, req->roomSearchableIntAttrExternal[i].num);
-				davec.push_back(bin);
-			}
-			final_searchintattrexternal_vec = builder.CreateVector(davec);
+			auto bin = CreateIntAttr(builder, req->roomSearchableIntAttrExternal[i].id, req->roomSearchableIntAttrExternal[i].num);
+			davec.push_back(bin);
 		}
-
-		// WWE SmackDown vs. RAW 2009 passes roomBinAttrExternal in roomSearchableBinAttrExternal so we parse based on attribute ids
-
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_binattrinternal_vec;
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_searchbinattrexternal_vec;
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_binattrexternal_vec;
-
-		std::vector<flatbuffers::Offset<BinAttr>> davec_binattrinternal;
-		std::vector<flatbuffers::Offset<BinAttr>> davec_searchable_binattrexternal;
-		std::vector<flatbuffers::Offset<BinAttr>> davec_binattrexternal;
-
-		auto put_binattr = [&](SceNpMatching2AttributeId id, flatbuffers::Offset<BinAttr> bin)
-		{
-			switch (id)
-			{
-			case SCE_NP_MATCHING2_ROOM_BIN_ATTR_INTERNAL_1_ID:
-			case SCE_NP_MATCHING2_ROOM_BIN_ATTR_INTERNAL_2_ID:
-				davec_binattrinternal.push_back(bin);
-				break;
-			case SCE_NP_MATCHING2_ROOM_BIN_ATTR_EXTERNAL_1_ID:
-			case SCE_NP_MATCHING2_ROOM_BIN_ATTR_EXTERNAL_2_ID:
-				davec_binattrexternal.push_back(bin);
-				break;
-			case SCE_NP_MATCHING2_ROOM_SEARCHABLE_BIN_ATTR_EXTERNAL_1_ID:
-				davec_searchable_binattrexternal.push_back(bin);
-				break;
-			default:
-				rpcn_log.error("Unexpected bin attribute id in createjoin_room request: 0x%x", id);
-				break;
-			}
-		};
-
-		if (req->roomBinAttrInternalNum && req->roomBinAttrInternal)
-		{
-			for (u32 i = 0; i < req->roomBinAttrInternalNum; i++)
-			{
-				auto bin = CreateBinAttr(builder, req->roomBinAttrInternal[i].id, builder.CreateVector(req->roomBinAttrInternal[i].ptr.get_ptr(), req->roomBinAttrInternal[i].size));
-				put_binattr(req->roomBinAttrInternal[i].id, bin);
-			}
-		}
-
-		if (req->roomSearchableBinAttrExternalNum && req->roomSearchableBinAttrExternal)
-		{
-			for (u32 i = 0; i < req->roomSearchableBinAttrExternalNum; i++)
-			{
-				auto bin = CreateBinAttr(builder, req->roomSearchableBinAttrExternal[i].id, builder.CreateVector(req->roomSearchableBinAttrExternal[i].ptr.get_ptr(), req->roomSearchableBinAttrExternal[i].size));
-				put_binattr(req->roomSearchableBinAttrExternal[i].id, bin);
-			}
-		}
-
-		if (req->roomBinAttrExternalNum && req->roomBinAttrExternal)
-		{
-			for (u32 i = 0; i < req->roomBinAttrExternalNum; i++)
-			{
-				auto bin = CreateBinAttr(builder, req->roomBinAttrExternal[i].id, builder.CreateVector(req->roomBinAttrExternal[i].ptr.get_ptr(), req->roomBinAttrExternal[i].size));
-				put_binattr(req->roomBinAttrExternal[i].id, bin);
-			}
-		}
-
-		if (!davec_binattrinternal.empty())
-			final_binattrinternal_vec = builder.CreateVector(davec_binattrinternal);
-
-		if (!davec_searchable_binattrexternal.empty())
-			final_searchbinattrexternal_vec = builder.CreateVector(davec_searchable_binattrexternal);
-
-		if (!davec_binattrexternal.empty())
-			final_binattrexternal_vec = builder.CreateVector(davec_binattrexternal);
-
-		flatbuffers::Offset<flatbuffers::Vector<u8>> final_roompassword;
-		if (req->roomPassword)
-			final_roompassword = builder.CreateVector(req->roomPassword->data, 8);
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<GroupConfig>>> final_groupconfigs_vec;
-		if (req->groupConfigNum && req->groupConfig)
-		{
-			std::vector<flatbuffers::Offset<GroupConfig>> davec;
-			for (u32 i = 0; i < req->groupConfigNum; i++)
-			{
-				auto bin = CreateGroupConfig(builder, req->groupConfig[i].slotNum, req->groupConfig[i].withLabel ? builder.CreateVector(req->groupConfig[i].label.data, 8) : 0, req->groupConfig[i].withPassword);
-				davec.push_back(bin);
-			}
-			final_groupconfigs_vec = builder.CreateVector(davec);
-		}
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> final_allowedusers_vec;
-		if (req->allowedUserNum && req->allowedUser)
-		{
-			std::vector<flatbuffers::Offset<flatbuffers::String>> davec;
-			for (u32 i = 0; i < req->allowedUserNum; i++)
-			{
-				// Some games just give us garbage, make sure npid is valid before passing
-				// Ex: Aquapazza (gives uninitialized buffer on the stack and allowedUserNum is hardcoded to 100)
-				if (!np::is_valid_npid(req->allowedUser[i]))
-				{
-					continue;
-				}
-
-				auto bin = builder.CreateString(req->allowedUser[i].handle.data);
-				davec.push_back(bin);
-			}
-			final_allowedusers_vec = builder.CreateVector(davec);
-		}
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> final_blockedusers_vec;
-		if (req->blockedUserNum && req->blockedUser)
-		{
-			std::vector<flatbuffers::Offset<flatbuffers::String>> davec;
-			for (u32 i = 0; i < req->blockedUserNum; i++)
-			{
-				if (!np::is_valid_npid(req->blockedUser[i]))
-				{
-					continue;
-				}
-
-				auto bin = builder.CreateString(req->blockedUser[i].handle.data);
-				davec.push_back(bin);
-			}
-			final_blockedusers_vec = builder.CreateVector(davec);
-		}
-		flatbuffers::Offset<flatbuffers::Vector<u8>> final_grouplabel;
-		if (req->joinRoomGroupLabel)
-			final_grouplabel = builder.CreateVector(req->joinRoomGroupLabel->data, 8);
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_memberbinattrinternal_vec;
-		if (req->roomMemberBinAttrInternalNum && req->roomMemberBinAttrInternal)
-		{
-			std::vector<flatbuffers::Offset<BinAttr>> davec;
-			for (u32 i = 0; i < req->roomMemberBinAttrInternalNum; i++)
-			{
-				auto bin = CreateBinAttr(
-					builder, req->roomMemberBinAttrInternal[i].id, builder.CreateVector(reinterpret_cast<const u8*>(req->roomMemberBinAttrInternal[i].ptr.get_ptr()), req->roomMemberBinAttrInternal[i].size));
-				davec.push_back(bin);
-			}
-			final_memberbinattrinternal_vec = builder.CreateVector(davec);
-		}
-		flatbuffers::Offset<OptParam> final_optparam;
-		if (req->sigOptParam)
-			final_optparam = CreateOptParam(builder, req->sigOptParam->type, req->sigOptParam->flag, req->sigOptParam->hubMemberId);
-		u64 final_passwordSlotMask = 0;
-		if (req->passwordSlotMask)
-			final_passwordSlotMask = *req->passwordSlotMask;
-
-		auto req_finished = CreateCreateJoinRoomRequest(builder, req->worldId, req->lobbyId, req->maxSlot, req->flagAttr, final_binattrinternal_vec, final_searchintattrexternal_vec,
-			final_searchbinattrexternal_vec, final_binattrexternal_vec, final_roompassword, final_groupconfigs_vec, final_passwordSlotMask, final_allowedusers_vec, final_blockedusers_vec, final_grouplabel,
-			final_memberbinattrinternal_vec, req->teamId, final_optparam);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::CreateRoom, req_id);
+		final_searchintattrexternal_vec = builder.CreateVector(davec);
 	}
-
-	bool rpcn_client::join_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2JoinRoomRequest* req)
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_searchbinattrexternal_vec;
+	if (req->roomSearchableBinAttrExternalNum)
 	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		flatbuffers::Offset<flatbuffers::Vector<u8>> final_roompassword;
-		if (req->roomPassword)
-			final_roompassword = builder.CreateVector(req->roomPassword->data, 8);
-		flatbuffers::Offset<flatbuffers::Vector<u8>> final_grouplabel;
-		if (req->joinRoomGroupLabel)
-			final_grouplabel = builder.CreateVector(req->joinRoomGroupLabel->data, 8);
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_memberbinattrinternal_vec;
-		if (req->roomMemberBinAttrInternalNum && req->roomMemberBinAttrInternal)
+		std::vector<flatbuffers::Offset<BinAttr>> davec;
+		for (u32 i = 0; i < req->roomSearchableBinAttrExternalNum; i++)
 		{
-			std::vector<flatbuffers::Offset<BinAttr>> davec;
-			for (u32 i = 0; i < req->roomMemberBinAttrInternalNum; i++)
-			{
-				auto bin = CreateBinAttr(builder, req->roomMemberBinAttrInternal[i].id, builder.CreateVector(req->roomMemberBinAttrInternal[i].ptr.get_ptr(), req->roomMemberBinAttrInternal[i].size));
-				davec.push_back(bin);
-			}
-			final_memberbinattrinternal_vec = builder.CreateVector(davec);
+			auto bin = CreateBinAttr(builder, req->roomSearchableBinAttrExternal[i].id, builder.CreateVector(req->roomSearchableBinAttrExternal[i].ptr.get_ptr(), req->roomSearchableBinAttrExternal[i].size));
+			davec.push_back(bin);
 		}
-		flatbuffers::Offset<PresenceOptionData> final_optdata = CreatePresenceOptionData(builder, builder.CreateVector(req->optData.data, 16), req->optData.length);
-
-		auto req_finished = CreateJoinRoomRequest(builder, req->roomId, final_roompassword, final_grouplabel, final_memberbinattrinternal_vec, final_optdata, req->teamId);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::JoinRoom, req_id);
+		final_searchbinattrexternal_vec = builder.CreateVector(davec);
 	}
-
-	bool rpcn_client::leave_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2LeaveRoomRequest* req)
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_binattrexternal_vec;
+	if (req->roomBinAttrExternalNum)
 	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		flatbuffers::Offset<PresenceOptionData> final_optdata = CreatePresenceOptionData(builder, builder.CreateVector(req->optData.data, 16), req->optData.length);
-		auto req_finished = CreateLeaveRoomRequest(builder, req->roomId, final_optdata);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::LeaveRoom, req_id);
+		std::vector<flatbuffers::Offset<BinAttr>> davec;
+		for (u32 i = 0; i < req->roomBinAttrExternalNum; i++)
+		{
+			auto bin = CreateBinAttr(builder, req->roomBinAttrExternal[i].id, builder.CreateVector(req->roomBinAttrExternal[i].ptr.get_ptr(), req->roomBinAttrExternal[i].size));
+			davec.push_back(bin);
+		}
+		final_binattrexternal_vec = builder.CreateVector(davec);
 	}
-
-	bool rpcn_client::search_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SearchRoomRequest* req)
+	flatbuffers::Offset<flatbuffers::Vector<u8>> final_roompassword;
+	if (req->roomPassword)
+		final_roompassword = builder.CreateVector(req->roomPassword->data, 8);
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<GroupConfig>>> final_groupconfigs_vec;
+	if (req->groupConfigNum)
 	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntSearchFilter>>> final_intfilter_vec;
-		if (req->intFilterNum && req->intFilter)
+		std::vector<flatbuffers::Offset<GroupConfig>> davec;
+		for (u32 i = 0; i < req->groupConfigNum; i++)
 		{
-			std::vector<flatbuffers::Offset<IntSearchFilter>> davec{};
-			for (u32 i = 0; i < req->intFilterNum; i++)
-			{
-				auto int_attr = CreateIntAttr(builder, req->intFilter[i].attr.id, req->intFilter[i].attr.num);
-				auto bin = CreateIntSearchFilter(builder, req->intFilter[i].searchOperator, int_attr);
-				davec.push_back(bin);
-			}
-			final_intfilter_vec = builder.CreateVector(davec);
+			auto bin = CreateGroupConfig(builder, req->groupConfig[i].slotNum, req->groupConfig[i].withLabel, builder.CreateVector(req->groupConfig[i].label.data, 8), req->groupConfig[i].withPassword);
+			davec.push_back(bin);
 		}
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinSearchFilter>>> final_binfilter_vec;
-		if (req->binFilterNum && req->binFilter)
-		{
-			std::vector<flatbuffers::Offset<BinSearchFilter>> davec;
-			for (u32 i = 0; i < req->binFilterNum; i++)
-			{
-				auto bin_attr = CreateBinAttr(builder, req->binFilter[i].attr.id, builder.CreateVector(req->binFilter[i].attr.ptr.get_ptr(), req->binFilter[i].attr.size));
-				auto bin = CreateBinSearchFilter(builder, req->binFilter[i].searchOperator, bin_attr);
-				davec.push_back(bin);
-			}
-			final_binfilter_vec = builder.CreateVector(davec);
-		}
-
-		flatbuffers::Offset<flatbuffers::Vector<u16>> attrid_vec;
-		if (req->attrIdNum && req->attrId)
-		{
-			std::vector<u16> attr_ids;
-			for (u32 i = 0; i < req->attrIdNum; i++)
-			{
-				attr_ids.push_back(req->attrId[i]);
-			}
-			attrid_vec = builder.CreateVector(attr_ids);
-		}
-
-		SearchRoomRequestBuilder s_req(builder);
-		s_req.add_option(req->option);
-		s_req.add_worldId(req->worldId);
-		s_req.add_lobbyId(req->lobbyId);
-		s_req.add_rangeFilter_startIndex(req->rangeFilter.startIndex);
-		s_req.add_rangeFilter_max(req->rangeFilter.max);
-		s_req.add_flagFilter(req->flagFilter);
-		s_req.add_flagAttr(req->flagAttr);
-		if (req->intFilterNum)
-			s_req.add_intFilter(final_intfilter_vec);
-		if (req->binFilterNum)
-			s_req.add_binFilter(final_binfilter_vec);
-		if (req->attrIdNum)
-			s_req.add_attrId(attrid_vec);
-
-		auto req_finished = s_req.Finish();
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::SearchRoom, req_id);
+		final_groupconfigs_vec = builder.CreateVector(davec);
 	}
-
-	bool rpcn_client::get_roomdata_external_list(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2GetRoomDataExternalListRequest* req)
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> final_allowedusers_vec;
+	if (req->allowedUserNum && req->allowedUser)
 	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		std::vector<u64> roomIds;
-		for (u32 i = 0; i < req->roomIdNum && req->roomId; i++)
+		std::vector<flatbuffers::Offset<flatbuffers::String>> davec;
+		for (u32 i = 0; i < req->allowedUserNum; i++)
 		{
-			roomIds.push_back(req->roomId[i]);
+			auto bin = builder.CreateString(req->allowedUser[i].handle.data);
+			davec.push_back(bin);
 		}
-		std::vector<u16> attrIds;
-		for (u32 i = 0; i < req->attrIdNum && req->attrId; i++)
-		{
-			attrIds.push_back(req->attrId[i]);
-		}
-
-		auto req_finished = CreateGetRoomDataExternalListRequestDirect(builder, &roomIds, &attrIds);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::GetRoomDataExternalList, req_id);
+		final_allowedusers_vec = builder.CreateVector(davec);
 	}
-
-	bool rpcn_client::set_roomdata_external(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetRoomDataExternalRequest* req)
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> final_blockedusers_vec;
+	if (req->blockedUserNum)
 	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntAttr>>> final_searchintattrexternal_vec;
-		if (req->roomSearchableIntAttrExternalNum && req->roomSearchableIntAttrExternal)
+		std::vector<flatbuffers::Offset<flatbuffers::String>> davec;
+		for (u32 i = 0; i < req->blockedUserNum; i++)
 		{
-			std::vector<flatbuffers::Offset<IntAttr>> davec;
-			for (u32 i = 0; i < req->roomSearchableIntAttrExternalNum; i++)
-			{
-				auto bin = CreateIntAttr(builder, req->roomSearchableIntAttrExternal[i].id, req->roomSearchableIntAttrExternal[i].num);
-				davec.push_back(bin);
-			}
-			final_searchintattrexternal_vec = builder.CreateVector(davec);
+			auto bin = builder.CreateString(req->blockedUser[i].handle.data);
+			davec.push_back(bin);
 		}
-
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_searchbinattrexternal_vec;
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_binattrexternal_vec;
-
-		std::vector<flatbuffers::Offset<BinAttr>> davec_searchable_binattrexternal;
-		std::vector<flatbuffers::Offset<BinAttr>> davec_binattrexternal;
-
-		auto put_binattr = [&](SceNpMatching2AttributeId id, flatbuffers::Offset<BinAttr> bin)
-		{
-			switch (id)
-			{
-			case SCE_NP_MATCHING2_ROOM_BIN_ATTR_EXTERNAL_1_ID:
-			case SCE_NP_MATCHING2_ROOM_BIN_ATTR_EXTERNAL_2_ID:
-				davec_binattrexternal.push_back(bin);
-				break;
-			case SCE_NP_MATCHING2_ROOM_SEARCHABLE_BIN_ATTR_EXTERNAL_1_ID:
-				davec_searchable_binattrexternal.push_back(bin);
-				break;
-			default:
-				rpcn_log.error("Unexpected bin attribute id in set_roomdata_external request: 0x%x", id);
-				break;
-			}
-		};
-
-		if (req->roomSearchableBinAttrExternalNum && req->roomSearchableBinAttrExternal)
-		{
-			for (u32 i = 0; i < req->roomSearchableBinAttrExternalNum; i++)
-			{
-				auto bin = CreateBinAttr(builder, req->roomSearchableBinAttrExternal[i].id, builder.CreateVector(req->roomSearchableBinAttrExternal[i].ptr.get_ptr(), req->roomSearchableBinAttrExternal[i].size));
-				put_binattr(req->roomSearchableBinAttrExternal[i].id, bin);
-			}
-		}
-
-		if (req->roomBinAttrExternalNum && req->roomBinAttrExternal)
-		{
-			for (u32 i = 0; i < req->roomBinAttrExternalNum; i++)
-			{
-				auto bin = CreateBinAttr(builder, req->roomBinAttrExternal[i].id, builder.CreateVector(req->roomBinAttrExternal[i].ptr.get_ptr(), req->roomBinAttrExternal[i].size));
-				put_binattr(req->roomBinAttrExternal[i].id, bin);
-			}
-		}
-
-		if (!davec_searchable_binattrexternal.empty())
-			final_searchbinattrexternal_vec = builder.CreateVector(davec_searchable_binattrexternal);
-
-		if (!davec_binattrexternal.empty())
-			final_binattrexternal_vec = builder.CreateVector(davec_binattrexternal);
-
-		auto req_finished = CreateSetRoomDataExternalRequest(builder, req->roomId, final_searchintattrexternal_vec, final_searchbinattrexternal_vec, final_binattrexternal_vec);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::SetRoomDataExternal, req_id);
+		final_blockedusers_vec = builder.CreateVector(davec);
 	}
-
-	bool rpcn_client::get_roomdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2GetRoomDataInternalRequest* req)
+	flatbuffers::Offset<flatbuffers::Vector<u8>> final_grouplabel;
+	if (req->joinRoomGroupLabel)
+		final_grouplabel = builder.CreateVector(req->joinRoomGroupLabel->data, 8);
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_memberbinattrinternal_vec;
+	if (req->roomMemberBinAttrInternalNum)
 	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		flatbuffers::Offset<flatbuffers::Vector<u16>> final_attr_ids_vec;
-		if (req->attrIdNum && req->attrId)
+		std::vector<flatbuffers::Offset<BinAttr>> davec;
+		for (u32 i = 0; i < req->roomMemberBinAttrInternalNum; i++)
 		{
-			std::vector<u16> attr_ids;
-			for (u32 i = 0; i < req->attrIdNum; i++)
-			{
-				attr_ids.push_back(req->attrId[i]);
-			}
-			final_attr_ids_vec = builder.CreateVector(attr_ids);
+			auto bin = CreateBinAttr(
+			    builder, req->roomMemberBinAttrInternal[i].id, builder.CreateVector(reinterpret_cast<const u8*>(req->roomMemberBinAttrInternal[i].ptr.get_ptr()), req->roomMemberBinAttrInternal[i].size));
+			davec.push_back(bin);
 		}
-
-		auto req_finished = CreateGetRoomDataInternalRequest(builder, req->roomId, final_attr_ids_vec);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::GetRoomDataInternal, req_id);
+		final_memberbinattrinternal_vec = builder.CreateVector(davec);
 	}
+	flatbuffers::Offset<OptParam> final_optparam;
+	if (req->sigOptParam)
+		final_optparam = CreateOptParam(builder, req->sigOptParam->type, req->sigOptParam->flag, req->sigOptParam->hubMemberId);
+	u64 final_passwordSlotMask = 0;
+	if (req->passwordSlotMask)
+		final_passwordSlotMask = *req->passwordSlotMask;
 
-	bool rpcn_client::set_roomdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetRoomDataInternalRequest* req)
+	auto req_finished = CreateCreateJoinRoomRequest(builder, req->worldId, req->lobbyId, req->maxSlot, req->flagAttr, final_binattrinternal_vec, final_searchintattrexternal_vec,
+	    final_searchbinattrexternal_vec, final_binattrexternal_vec, final_roompassword, final_groupconfigs_vec, final_passwordSlotMask, final_allowedusers_vec, final_blockedusers_vec, final_grouplabel,
+	    final_memberbinattrinternal_vec, req->teamId, final_optparam);
+
+	builder.Finish(req_finished);
+	u8* buf        = builder.GetBufferPointer();
+	usz bufsize = builder.GetSize();
+	data.resize(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize);
+
+	memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE);
+	reinterpret_cast<le_t<u32>&>(data[COMMUNICATION_ID_SIZE]) = static_cast<u32>(bufsize);
+	memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize);
+
+	if (!forge_send(CommandType::CreateRoom, req_id, data))
+		return false;
+
+	return true;
+}
+
+bool rpcn_client::join_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2JoinRoomRequest* req)
+{
+	std::vector<u8> data{};
+
+	extra_nps::print_joinroom(req);
+
+	flatbuffers::FlatBufferBuilder builder(1024);
+
+	flatbuffers::Offset<flatbuffers::Vector<u8>> final_roompassword;
+	if (req->roomPassword)
+		final_roompassword = builder.CreateVector(req->roomPassword->data, 8);
+	flatbuffers::Offset<flatbuffers::Vector<u8>> final_grouplabel;
+	if (req->joinRoomGroupLabel)
+		final_grouplabel = builder.CreateVector(req->joinRoomGroupLabel->data, 8);
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_memberbinattrinternal_vec;
+	if (req->roomMemberBinAttrInternalNum)
 	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_binattrinternal_vec;
-		if (req->roomBinAttrInternalNum && req->roomBinAttrInternal)
+		std::vector<flatbuffers::Offset<BinAttr>> davec;
+		for (u32 i = 0; i < req->roomMemberBinAttrInternalNum; i++)
 		{
-			std::vector<flatbuffers::Offset<BinAttr>> davec;
-			for (u32 i = 0; i < req->roomBinAttrInternalNum; i++)
-			{
-				auto bin = CreateBinAttr(builder, req->roomBinAttrInternal[i].id, builder.CreateVector(req->roomBinAttrInternal[i].ptr.get_ptr(), req->roomBinAttrInternal[i].size));
-				davec.push_back(bin);
-			}
-			final_binattrinternal_vec = builder.CreateVector(davec);
+			auto bin = CreateBinAttr(builder, req->roomMemberBinAttrInternal[i].id, builder.CreateVector(req->roomMemberBinAttrInternal[i].ptr.get_ptr(), req->roomMemberBinAttrInternal[i].size));
+			davec.push_back(bin);
 		}
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomGroupPasswordConfig>>> final_grouppasswordconfig_vec;
-		if (req->passwordConfigNum && req->passwordConfig)
-		{
-			std::vector<flatbuffers::Offset<RoomGroupPasswordConfig>> davec;
-			for (u32 i = 0; i < req->passwordConfigNum; i++)
-			{
-				auto rg = CreateRoomGroupPasswordConfig(builder, req->passwordConfig[i].groupId, req->passwordConfig[i].withPassword);
-				davec.push_back(rg);
-			}
-			final_grouppasswordconfig_vec = builder.CreateVector(davec);
-		}
-		u64 final_passwordSlotMask = 0;
-		if (req->passwordSlotMask)
-			final_passwordSlotMask = *req->passwordSlotMask;
-
-		flatbuffers::Offset<flatbuffers::Vector<u16>> final_ownerprivilege_vec;
-		if (req->ownerPrivilegeRankNum && req->ownerPrivilegeRank)
-		{
-			std::vector<u16> priv_ranks;
-			for (u32 i = 0; i < req->ownerPrivilegeRankNum; i++)
-			{
-				priv_ranks.push_back(req->ownerPrivilegeRank[i]);
-			}
-			final_ownerprivilege_vec = builder.CreateVector(priv_ranks);
-		}
-
-		auto req_finished =
-			CreateSetRoomDataInternalRequest(builder, req->roomId, req->flagFilter, req->flagAttr, final_binattrinternal_vec, final_grouppasswordconfig_vec, final_passwordSlotMask, final_ownerprivilege_vec);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::SetRoomDataInternal, req_id);
+		final_memberbinattrinternal_vec = builder.CreateVector(davec);
 	}
+	flatbuffers::Offset<PresenceOptionData> final_optdata = CreatePresenceOptionData(builder, builder.CreateVector(req->optData.data, 16), req->optData.length);
 
-	bool rpcn_client::get_roommemberdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2GetRoomMemberDataInternalRequest* req)
+	auto req_finished = CreateJoinRoomRequest(builder, req->roomId, final_roompassword, final_grouplabel, final_memberbinattrinternal_vec, final_optdata, req->teamId);
+
+	builder.Finish(req_finished);
+	u8* buf        = builder.GetBufferPointer();
+	usz bufsize = builder.GetSize();
+	data.resize(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize);
+
+	memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE);
+	reinterpret_cast<le_t<u32>&>(data[COMMUNICATION_ID_SIZE]) = static_cast<u32>(bufsize);
+	memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize);
+
+	if (!forge_send(CommandType::JoinRoom, req_id, data))
+		return false;
+
+	return true;
+}
+
+bool rpcn_client::leave_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2LeaveRoomRequest* req)
+{
+	std::vector<u8> data{};
+
+	flatbuffers::FlatBufferBuilder builder(1024);
+	flatbuffers::Offset<PresenceOptionData> final_optdata = CreatePresenceOptionData(builder, builder.CreateVector(req->optData.data, 16), req->optData.length);
+	auto req_finished                                     = CreateLeaveRoomRequest(builder, req->roomId, final_optdata);
+	builder.Finish(req_finished);
+	u8* buf        = builder.GetBufferPointer();
+	usz bufsize = builder.GetSize();
+	data.resize(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize);
+
+	memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE);
+	reinterpret_cast<le_t<u32>&>(data[COMMUNICATION_ID_SIZE]) = static_cast<u32>(bufsize);
+	memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize);
+
+	if (!forge_send(CommandType::LeaveRoom, req_id, data))
+		return false;
+
+	return true;
+}
+
+bool rpcn_client::search_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SearchRoomRequest* req)
+{
+	std::vector<u8> data{};
+
+	extra_nps::print_search_room(req);
+
+	flatbuffers::FlatBufferBuilder builder(1024);
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntSearchFilter>>> final_intfilter_vec;
+	if (req->intFilterNum)
 	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		flatbuffers::Offset<flatbuffers::Vector<u16>> final_attrid_vec;
-		if (req->attrIdNum && req->attrId)
+		std::vector<flatbuffers::Offset<IntSearchFilter>> davec{};
+		for (u32 i = 0; i < req->intFilterNum; i++)
 		{
-			std::vector<u16> attrid_vec;
-			for (u32 i = 0; i < req->attrIdNum; i++)
-			{
-				attrid_vec.push_back(req->attrId[i]);
-			}
-			final_attrid_vec = builder.CreateVector(attrid_vec);
+			auto int_attr = CreateIntAttr(builder, req->intFilter[i].attr.id, req->intFilter[i].attr.num);
+			auto bin      = CreateIntSearchFilter(builder, req->intFilter[i].searchOperator, int_attr);
+			davec.push_back(bin);
 		}
-
-		auto req_finished = CreateGetRoomMemberDataInternalRequest(builder, req->roomId, req->memberId, final_attrid_vec);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::GetRoomMemberDataInternal, req_id);
+		final_intfilter_vec = builder.CreateVector(davec);
 	}
-
-	bool rpcn_client::set_roommemberdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetRoomMemberDataInternalRequest* req)
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinSearchFilter>>> final_binfilter_vec;
+	if (req->binFilterNum)
 	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_binattrinternal_vec;
-		if (req->roomMemberBinAttrInternalNum && req->roomMemberBinAttrInternal)
+		std::vector<flatbuffers::Offset<BinSearchFilter>> davec;
+		for (u32 i = 0; i < req->binFilterNum; i++)
 		{
-			std::vector<flatbuffers::Offset<BinAttr>> davec;
-			for (u32 i = 0; i < req->roomMemberBinAttrInternalNum; i++)
-			{
-				auto bin = CreateBinAttr(builder, req->roomMemberBinAttrInternal[i].id, builder.CreateVector(req->roomMemberBinAttrInternal[i].ptr.get_ptr(), req->roomMemberBinAttrInternal[i].size));
-				davec.push_back(bin);
-			}
-			final_binattrinternal_vec = builder.CreateVector(davec);
+			auto bin_attr = CreateBinAttr(builder, req->binFilter[i].attr.id, builder.CreateVector(req->binFilter[i].attr.ptr.get_ptr(), req->binFilter[i].attr.size));
+			auto bin      = CreateBinSearchFilter(builder, req->binFilter[i].searchOperator, bin_attr);
+			davec.push_back(bin);
 		}
-
-		auto req_finished = CreateSetRoomMemberDataInternalRequest(builder, req->roomId, req->memberId, req->teamId, final_binattrinternal_vec);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::SetRoomMemberDataInternal, req_id);
+		final_binfilter_vec = builder.CreateVector(davec);
 	}
+	flatbuffers::Offset<flatbuffers::Vector<u16>> attrid_vec;
+	if (req->attrIdNum)
+		attrid_vec = builder.CreateVector(utils::bless<const u16>(req->attrId.get_ptr()), req->attrIdNum);
 
-	bool rpcn_client::set_userinfo(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetUserInfoRequest* req)
+	SearchRoomRequestBuilder s_req(builder);
+	s_req.add_option(req->option);
+	s_req.add_worldId(req->worldId);
+	s_req.add_lobbyId(req->lobbyId);
+	s_req.add_rangeFilter_startIndex(req->rangeFilter.startIndex);
+	s_req.add_rangeFilter_max(req->rangeFilter.max);
+	s_req.add_flagFilter(req->flagFilter);
+	s_req.add_flagAttr(req->flagAttr);
+	if (req->intFilterNum)
+		s_req.add_intFilter(final_intfilter_vec);
+	if (req->binFilterNum)
+		s_req.add_binFilter(final_binfilter_vec);
+	if (req->attrIdNum)
+		s_req.add_attrId(attrid_vec);
+
+	auto req_finished = s_req.Finish();
+	builder.Finish(req_finished);
+	u8* buf        = builder.GetBufferPointer();
+	usz bufsize = builder.GetSize();
+	data.resize(COMMUNICATION_ID_SIZE + bufsize + sizeof(u32));
+
+	memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE);
+	reinterpret_cast<le_t<u32>&>(data[COMMUNICATION_ID_SIZE]) = static_cast<u32>(bufsize);
+	memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize);
+
+	if (!forge_send(CommandType::SearchRoom, req_id, data))
+		return false;
+
+	return true;
+}
+
+bool rpcn_client::set_roomdata_external(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetRoomDataExternalRequest* req)
+{
+	std::vector<u8> data{};
+
+	flatbuffers::FlatBufferBuilder builder(1024);
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntAttr>>> final_searchintattrexternal_vec;
+	if (req->roomSearchableIntAttrExternalNum)
 	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_memberbinattr_vec;
-		if (req->userBinAttrNum && req->userBinAttr)
+		std::vector<flatbuffers::Offset<IntAttr>> davec;
+		for (u32 i = 0; i < req->roomSearchableIntAttrExternalNum; i++)
 		{
-			std::vector<flatbuffers::Offset<BinAttr>> davec;
-			for (u32 i = 0; i < req->userBinAttrNum; i++)
-			{
-				auto bin = CreateBinAttr(builder, req->userBinAttr[i].id, builder.CreateVector(req->userBinAttr[i].ptr.get_ptr(), req->userBinAttr[i].size));
-				davec.push_back(bin);
-			}
-			final_memberbinattr_vec = builder.CreateVector(davec);
+			auto bin = CreateIntAttr(builder, req->roomSearchableIntAttrExternal[i].id, req->roomSearchableIntAttrExternal[i].num);
+			davec.push_back(bin);
 		}
-
-		auto req_finished = CreateSetUserInfo(builder, req->serverId, final_memberbinattr_vec);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::SetUserInfo, req_id);
+		final_searchintattrexternal_vec = builder.CreateVector(davec);
 	}
-
-	bool rpcn_client::ping_room_owner(u32 req_id, const SceNpCommunicationId& communication_id, u64 room_id)
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_searchbinattrexternal_vec;
+	if (req->roomSearchableBinAttrExternalNum)
 	{
-		std::vector<u8> data(COMMUNICATION_ID_SIZE + sizeof(u64));
-
-		rpcn_client::write_communication_id(communication_id, data);
-		write_to_ptr<le_t<u64>>(data, COMMUNICATION_ID_SIZE, room_id);
-
-		return forge_send(CommandType::PingRoomOwner, req_id, data);
-	}
-
-	bool rpcn_client::send_room_message(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SendRoomMessageRequest* req)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		std::vector<u16> dst;
-		switch (req->castType)
+		std::vector<flatbuffers::Offset<BinAttr>> davec;
+		for (u32 i = 0; i < req->roomSearchableBinAttrExternalNum; i++)
 		{
+			auto bin = CreateBinAttr(builder, req->roomSearchableBinAttrExternal[i].id, builder.CreateVector(req->roomSearchableBinAttrExternal[i].ptr.get_ptr(), req->roomSearchableBinAttrExternal[i].size));
+			davec.push_back(bin);
+		}
+		final_searchbinattrexternal_vec = builder.CreateVector(davec);
+	}
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_binattrexternal_vec;
+	if (req->roomBinAttrExternalNum)
+	{
+		std::vector<flatbuffers::Offset<BinAttr>> davec;
+		for (u32 i = 0; i < req->roomBinAttrExternalNum; i++)
+		{
+			auto bin = CreateBinAttr(builder, req->roomBinAttrExternal[i].id, builder.CreateVector(req->roomBinAttrExternal[i].ptr.get_ptr(), req->roomBinAttrExternal[i].size));
+			davec.push_back(bin);
+		}
+		final_binattrexternal_vec = builder.CreateVector(davec);
+	}
+	auto req_finished = CreateSetRoomDataExternalRequest(builder, req->roomId, final_searchintattrexternal_vec, final_searchbinattrexternal_vec, final_binattrexternal_vec);
+
+	builder.Finish(req_finished);
+	u8* buf        = builder.GetBufferPointer();
+	usz bufsize = builder.GetSize();
+	data.resize(COMMUNICATION_ID_SIZE + bufsize + sizeof(u32));
+
+	memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE);
+	reinterpret_cast<le_t<u32>&>(data[COMMUNICATION_ID_SIZE]) = static_cast<u32>(bufsize);
+	memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize);
+
+	if (!forge_send(CommandType::SetRoomDataExternal, req_id, data))
+		return false;
+
+	return true;
+}
+
+bool rpcn_client::get_roomdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2GetRoomDataInternalRequest* req)
+{
+	std::vector<u8> data{}, reply_data{};
+
+	flatbuffers::FlatBufferBuilder builder(1024);
+
+	flatbuffers::Offset<flatbuffers::Vector<u16>> final_attr_ids_vec;
+	if (req->attrIdNum)
+		final_attr_ids_vec = builder.CreateVector(utils::bless<const u16>(req->attrId.get_ptr()), req->attrIdNum);
+
+	auto req_finished = CreateGetRoomDataInternalRequest(builder, req->roomId, final_attr_ids_vec);
+
+	builder.Finish(req_finished);
+	u8* buf        = builder.GetBufferPointer();
+	usz bufsize = builder.GetSize();
+	data.resize(COMMUNICATION_ID_SIZE + bufsize + sizeof(u32));
+
+	memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE);
+	reinterpret_cast<le_t<u32>&>(data[COMMUNICATION_ID_SIZE]) = static_cast<u32>(bufsize);
+	memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize);
+
+	if (!forge_send(CommandType::GetRoomDataInternal, req_id, data))
+		return false;
+
+	return true;
+}
+
+bool rpcn_client::set_roomdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetRoomDataInternalRequest* req)
+{
+	std::vector<u8> data{};
+
+	//	extra_nps::print_set_roomdata_req(req);
+
+	flatbuffers::FlatBufferBuilder builder(1024);
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> final_binattrinternal_vec;
+	if (req->roomBinAttrInternalNum)
+	{
+		std::vector<flatbuffers::Offset<BinAttr>> davec;
+		for (u32 i = 0; i < req->roomBinAttrInternalNum; i++)
+		{
+			auto bin = CreateBinAttr(builder, req->roomBinAttrInternal[i].id, builder.CreateVector(req->roomBinAttrInternal[i].ptr.get_ptr(), req->roomBinAttrInternal[i].size));
+			davec.push_back(bin);
+		}
+		final_binattrinternal_vec = builder.CreateVector(davec);
+	}
+	flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomGroupPasswordConfig>>> final_grouppasswordconfig_vec;
+	if (req->passwordConfigNum)
+	{
+		std::vector<flatbuffers::Offset<RoomGroupPasswordConfig>> davec;
+		for (u32 i = 0; i < req->passwordConfigNum; i++)
+		{
+			auto rg = CreateRoomGroupPasswordConfig(builder, req->passwordConfig[i].groupId, req->passwordConfig[i].withPassword);
+			davec.push_back(rg);
+		}
+		final_grouppasswordconfig_vec = builder.CreateVector(davec);
+	}
+	u64 final_passwordSlotMask = 0;
+	if (req->passwordSlotMask)
+		final_passwordSlotMask = *req->passwordSlotMask;
+
+	flatbuffers::Offset<flatbuffers::Vector<u16>> final_ownerprivilege_vec;
+	if (req->ownerPrivilegeRankNum)
+		final_ownerprivilege_vec = builder.CreateVector(utils::bless<const u16>(req->ownerPrivilegeRank.get_ptr()), req->ownerPrivilegeRankNum);
+
+	auto req_finished =
+	    CreateSetRoomDataInternalRequest(builder, req->roomId, req->flagFilter, req->flagAttr, final_binattrinternal_vec, final_grouppasswordconfig_vec, final_passwordSlotMask, final_ownerprivilege_vec);
+
+	builder.Finish(req_finished);
+	u8* buf        = builder.GetBufferPointer();
+	usz bufsize = builder.GetSize();
+	data.resize(COMMUNICATION_ID_SIZE + bufsize + sizeof(u32));
+
+	memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE);
+	reinterpret_cast<le_t<u32>&>(data[COMMUNICATION_ID_SIZE]) = static_cast<u32>(bufsize);
+	memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize);
+
+	if (!forge_send(CommandType::SetRoomDataInternal, req_id, data))
+		return false;
+
+	return true;
+}
+
+bool rpcn_client::ping_room_owner(u32 req_id, const SceNpCommunicationId& communication_id, u64 room_id)
+{
+	std::vector<u8> data{};
+
+	data.resize(COMMUNICATION_ID_SIZE + sizeof(u64));
+
+	memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE);
+	*utils::bless<le_t<u64>>(&data[COMMUNICATION_ID_SIZE]) = room_id;
+
+	if (!forge_send(CommandType::PingRoomOwner, req_id, data))
+		return false;
+
+	return true;
+}
+
+bool rpcn_client::send_room_message(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SendRoomMessageRequest* req)
+{
+	std::vector<u8> data{};
+	flatbuffers::FlatBufferBuilder builder(1024);
+
+	std::vector<u16> dst;
+	switch(req->castType)
+	{
 		case SCE_NP_MATCHING2_CASTTYPE_BROADCAST:
 			break;
 		case SCE_NP_MATCHING2_CASTTYPE_UNICAST:
 			dst.push_back(req->dst.unicastTarget);
 			break;
 		case SCE_NP_MATCHING2_CASTTYPE_MULTICAST:
-			for (u32 i = 0; i < req->dst.multicastTarget.memberIdNum && req->dst.multicastTarget.memberId; i++)
+			for (u32 i = 0; i < req->dst.multicastTarget.memberIdNum; i++)
 			{
 				dst.push_back(req->dst.multicastTarget.memberId[i]);
 			}
@@ -2137,1108 +1056,115 @@ namespace rpcn
 		default:
 			ensure(false);
 			break;
-		}
-
-		auto req_finished = CreateSendRoomMessageRequest(builder, req->roomId, req->castType, builder.CreateVector(dst.data(), dst.size()), builder.CreateVector(reinterpret_cast<const u8*>(req->msg.get_ptr()), req->msgLen), req->option);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::SendRoomMessage, req_id);
 	}
 
-	bool rpcn_client::req_sign_infos(u32 req_id, const std::string& npid)
-	{
-		std::vector<u8> data;
-		std::copy(npid.begin(), npid.end(), std::back_inserter(data));
-		data.push_back(0);
+	auto req_finished = CreateSendRoomMessageRequest(builder, req->roomId, req->castType, builder.CreateVector(dst.data(), dst.size()), builder.CreateVector(reinterpret_cast<const u8 *>(req->msg.get_ptr()), req->msgLen), req->option);
 
-		return forge_send(CommandType::RequestSignalingInfos, req_id, data);
-	}
+	builder.Finish(req_finished);
+	u8* buf        = builder.GetBufferPointer();
+	usz bufsize = builder.GetSize();
+	data.resize(COMMUNICATION_ID_SIZE + bufsize + sizeof(u32));
 
-	bool rpcn_client::req_ticket(u32 req_id, const std::string& service_id, const std::vector<u8>& cookie)
-	{
-		std::vector<u8> data;
-		std::copy(service_id.begin(), service_id.end(), std::back_inserter(data));
-		data.push_back(0);
-		const le_t<u32> size = ::size32(cookie);
-		std::copy(reinterpret_cast<const u8*>(&size), reinterpret_cast<const u8*>(&size) + sizeof(le_t<u32>), std::back_inserter(data));
-		std::copy(cookie.begin(), cookie.end(), std::back_inserter(data));
+	memcpy(data.data(), communication_id.data, COMMUNICATION_ID_SIZE);
+	reinterpret_cast<le_t<u32>&>(data[COMMUNICATION_ID_SIZE]) = static_cast<u32>(bufsize);
+	memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize);
 
-		return forge_send(CommandType::RequestTicket, req_id, data);
-	}
-
-	bool rpcn_client::send_message(const message_data& msg_data, const std::set<std::string>& npids)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		flatbuffers::FlatBufferBuilder nested_builder(1024);
-		auto fb_message = CreateMessageDetailsDirect(nested_builder, static_cast<const char*>(msg_data.commId.data), msg_data.msgId, msg_data.mainType, msg_data.subType, msg_data.msgFeatures, msg_data.subject.c_str(), msg_data.body.c_str(), &msg_data.data);
-		nested_builder.Finish(fb_message);
-		builder.ForceVectorAlignment(nested_builder.GetSize(), sizeof(uint8_t), nested_builder.GetBufferMinAlignment());
-		auto nested_flatbuffer_vector = builder.CreateVector(nested_builder.GetBufferPointer(), nested_builder.GetSize());
-
-		std::vector<flatbuffers::Offset<flatbuffers::String>> davec;
-		for (const auto& npid : npids)
-		{
-			auto s_npid = builder.CreateString(npid);
-			davec.push_back(s_npid);
-		}
-		auto npids_vector = builder.CreateVector(davec);
-
-		// auto npids = builder.Create
-		auto fb_sendmessage = CreateSendMessageRequest(builder, nested_flatbuffer_vector, npids_vector);
-
-		builder.Finish(fb_sendmessage);
-		const u8* buf = builder.GetBufferPointer();
-		const usz bufsize = builder.GetSize();
-		std::vector<u8> data(bufsize + sizeof(u32));
-
-		reinterpret_cast<le_t<u32>&>(data[0]) = static_cast<u32>(bufsize);
-		memcpy(data.data() + sizeof(u32), buf, bufsize);
-
-		return forge_send(CommandType::SendMessage, rpcn_request_counter.fetch_add(1), data);
-	}
-
-	bool rpcn_client::get_board_infos(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id)
-	{
-		std::vector<u8> data(COMMUNICATION_ID_SIZE + sizeof(u32));
-		rpcn_client::write_communication_id(communication_id, data);
-		write_to_ptr<le_t<u32>>(data, COMMUNICATION_ID_SIZE, board_id);
-
-		return forge_send(CommandType::GetBoardInfos, req_id, data);
-	}
-
-	bool rpcn_client::record_score(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id, SceNpScorePcId char_id, SceNpScoreValue score, const std::optional<std::string> comment, const std::optional<std::vector<u8>> score_data)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		auto req_finished = CreateRecordScoreRequestDirect(builder, board_id, char_id, score, comment ? (*comment).c_str() : nullptr, score_data ? &*score_data : nullptr);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::RecordScore, req_id);
-	}
-
-	bool rpcn_client::get_score_range(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id, u32 start_rank, u32 num_rank, bool with_comment, bool with_gameinfo)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		auto req_finished = CreateGetScoreRangeRequest(builder, board_id, start_rank, num_rank, with_comment, with_gameinfo);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::GetScoreRange, req_id);
-	}
-
-	bool rpcn_client::get_score_npid(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id, const std::vector<std::pair<SceNpId, s32>>& npids, bool with_comment, bool with_gameinfo)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		std::vector<flatbuffers::Offset<ScoreNpIdPcId>> davec;
-		for (usz i = 0; i < npids.size(); i++)
-		{
-			auto npid = CreateScoreNpIdPcId(builder, builder.CreateString(static_cast<const char*>(npids[i].first.handle.data)), npids[i].second);
-			davec.push_back(npid);
-		}
-
-		auto req_finished = CreateGetScoreNpIdRequest(builder, board_id, builder.CreateVector(davec), with_comment, with_gameinfo);
-
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::GetScoreNpid, req_id);
-	}
-
-	bool rpcn_client::get_score_friend(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id, bool include_self, bool with_comment, bool with_gameinfo, u32 max_entries)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		auto req_finished = CreateGetScoreFriendsRequest(builder, board_id, include_self, max_entries, with_comment, with_gameinfo);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::GetScoreFriends, req_id);
-	}
-
-	bool rpcn_client::record_score_data(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScorePcId pc_id, SceNpScoreBoardId board_id, s64 score, const std::vector<u8>& score_data)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		auto req_finished = CreateRecordScoreGameDataRequest(builder, board_id, pc_id, score);
-		builder.Finish(req_finished);
-
-		const u8* buf = builder.GetBufferPointer();
-		const usz bufsize = builder.GetSize();
-		std::vector<u8> data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize + sizeof(u32) + score_data.size());
-
-		rpcn_client::write_communication_id(communication_id, data);
-		reinterpret_cast<le_t<u32>&>(data[COMMUNICATION_ID_SIZE]) = static_cast<u32>(bufsize);
-		memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize);
-		reinterpret_cast<le_t<u32>&>(data[COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize]) = static_cast<u32>(score_data.size());
-		memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize + sizeof(u32), score_data.data(), score_data.size());
-
-		return forge_send(CommandType::RecordScoreData, req_id, data);
-	}
-
-	bool rpcn_client::get_score_data(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScorePcId pc_id, SceNpScoreBoardId board_id, const SceNpId& npid)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		auto req_finished = CreateGetScoreGameDataRequest(builder, board_id, builder.CreateString(reinterpret_cast<const char*>(npid.handle.data)), pc_id);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::GetScoreData, req_id);
-	}
-
-	bool rpcn_client::tus_set_multislot_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::cptr<s64> variableArray, s32 arrayNum, bool vuser)
-	{
-		const std::vector<s32> slotid_array(slotIdArray.get_ptr(), slotIdArray.get_ptr() + arrayNum);
-		const std::vector<s64> variable_array(variableArray.get_ptr(), variableArray.get_ptr() + arrayNum);
-
-		flatbuffers::FlatBufferBuilder builder(1024);
-		auto req_finished = CreateTusSetMultiSlotVariableRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), builder.CreateVector(slotid_array), builder.CreateVector(variable_array));
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::TusSetMultiSlotVariable, req_id);
-	}
-
-	bool rpcn_client::tus_get_multislot_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, bool vuser)
-	{
-		const std::vector<s32> slotid_array(slotIdArray.get_ptr(), slotIdArray.get_ptr() + arrayNum);
-
-		flatbuffers::FlatBufferBuilder builder(1024);
-		auto req_finished = CreateTusGetMultiSlotVariableRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), builder.CreateVector(slotid_array));
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::TusGetMultiSlotVariable, req_id);
-	}
-
-	bool rpcn_client::tus_get_multiuser_variable(u32 req_id, const SceNpCommunicationId& communication_id, const std::vector<SceNpOnlineId>& targetNpIdArray, SceNpTusSlotId slotId, s32 arrayNum, bool vuser)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		std::vector<flatbuffers::Offset<TusUser>> davec;
-		for (s32 i = 0; i < std::min(arrayNum, ::narrow<s32>(targetNpIdArray.size())); i++)
-		{
-			davec.push_back(CreateTusUser(builder, vuser, builder.CreateString(targetNpIdArray[i].data)));
-		}
-
-		auto req_finished = CreateTusGetMultiUserVariableRequest(builder, builder.CreateVector(davec), slotId);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::TusGetMultiUserVariable, req_id);
-	}
-
-	bool rpcn_client::tus_get_friends_variable(u32 req_id, const SceNpCommunicationId& communication_id, SceNpTusSlotId slotId, bool includeSelf, s32 sortType, s32 arrayNum)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		auto req_finished = CreateTusGetFriendsVariableRequest(builder, slotId, includeSelf, sortType, arrayNum);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::TusGetFriendsVariable, req_id);
-	}
-
-	bool rpcn_client::tus_add_and_get_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr<SceNpTusAddAndGetVariableOptParam> option, bool vuser)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		flatbuffers::Offset<flatbuffers::Vector<uint64_t>> isLastChangedDate;
-		flatbuffers::Offset<flatbuffers::String> isLastChangedAuthorId;
-
-		if (option)
-		{
-			if (option->isLastChangedDate)
-			{
-				std::vector<u64> is_last_changed_date_vec;
-				is_last_changed_date_vec.push_back(option->isLastChangedDate->tick);
-				isLastChangedDate = builder.CreateVector(is_last_changed_date_vec);
-			}
-
-			if (option->isLastChangedAuthorId)
-			{
-				isLastChangedAuthorId = builder.CreateString(option->isLastChangedAuthorId->handle.data);
-			}
-		}
-
-		auto req_finished = CreateTusAddAndGetVariableRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), slotId, inVariable, isLastChangedDate, isLastChangedAuthorId);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::TusAddAndGetVariable, req_id);
-	}
-
-	bool rpcn_client::tus_try_and_set_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr<SceNpTusTryAndSetVariableOptParam> option, bool vuser)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		flatbuffers::Offset<flatbuffers::Vector<uint64_t>> isLastChangedDate;
-		flatbuffers::Offset<flatbuffers::String> isLastChangedAuthorId;
-		flatbuffers::Offset<flatbuffers::Vector<int64_t>> compareValue;
-
-		if (option)
-		{
-			if (option->isLastChangedDate)
-			{
-				std::vector<u64> is_last_changed_date_vec;
-				is_last_changed_date_vec.push_back(option->isLastChangedDate->tick);
-				isLastChangedDate = builder.CreateVector(is_last_changed_date_vec);
-			}
-
-			if (option->isLastChangedAuthorId)
-			{
-				isLastChangedAuthorId = builder.CreateString(option->isLastChangedAuthorId->handle.data);
-			}
-
-			if (option->compareValue)
-			{
-				std::vector<s64> compare_value_vec;
-				compare_value_vec.push_back(*(option->compareValue));
-				compareValue = builder.CreateVector(compare_value_vec);
-			}
-		}
-
-		auto req_finished = CreateTusTryAndSetVariableRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), slotId, opeType, variable, isLastChangedDate, isLastChangedAuthorId, compareValue);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::TusTryAndSetVariable, req_id);
-	}
-
-	bool rpcn_client::tus_delete_multislot_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, bool vuser)
-	{
-		const std::vector<s32> slotid_array(slotIdArray.get_ptr(), slotIdArray.get_ptr() + arrayNum);
-
-		flatbuffers::FlatBufferBuilder builder(1024);
-		auto req_finished = CreateTusDeleteMultiSlotVariableRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), builder.CreateVector(slotid_array));
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::TusDeleteMultiSlotVariable, req_id);
-	}
-
-	bool rpcn_client::tus_set_data(u32 req_id, SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, const std::vector<u8>& tus_data, vm::cptr<SceNpTusDataInfo> info, vm::ptr<SceNpTusSetDataOptParam> option, bool vuser)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		flatbuffers::Offset<flatbuffers::Vector<uint64_t>> isLastChangedDate;
-		flatbuffers::Offset<flatbuffers::String> isLastChangedAuthorId;
-
-		if (option)
-		{
-			if (option->isLastChangedDate)
-			{
-				std::vector<u64> is_last_changed_date_vec;
-				is_last_changed_date_vec.push_back(option->isLastChangedDate->tick);
-				isLastChangedDate = builder.CreateVector(is_last_changed_date_vec);
-			}
-
-			if (option->isLastChangedAuthorId)
-			{
-				isLastChangedAuthorId = builder.CreateString(option->isLastChangedAuthorId->handle.data);
-			}
-		}
-
-		flatbuffers::Offset<flatbuffers::Vector<uint8_t>> fb_info;
-
-		if (info)
-		{
-			fb_info = builder.CreateVector(info->data, static_cast<size_t>(info->infoSize));
-		}
-
-		auto req_finished = CreateTusSetDataRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), slotId, builder.CreateVector(tus_data), fb_info, isLastChangedDate, isLastChangedAuthorId);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::TusSetData, req_id);
-	}
-
-	bool rpcn_client::tus_get_data(u32 req_id, SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, bool vuser)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		auto req_finished = CreateTusGetDataRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), slotId);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::TusGetData, req_id);
-	}
-
-	bool rpcn_client::tus_get_multislot_data_status(u32 req_id, SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, bool vuser)
-	{
-		const std::vector<s32> slotid_array(slotIdArray.get_ptr(), slotIdArray.get_ptr() + arrayNum);
-
-		flatbuffers::FlatBufferBuilder builder(1024);
-		auto req_finished = CreateTusGetMultiSlotDataStatusRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), builder.CreateVector(slotid_array));
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::TusGetMultiSlotDataStatus, req_id);
-	}
-
-	bool rpcn_client::tus_get_multiuser_data_status(u32 req_id, SceNpCommunicationId& communication_id, const std::vector<SceNpOnlineId>& targetNpIdArray, SceNpTusSlotId slotId, s32 arrayNum, bool vuser)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		std::vector<flatbuffers::Offset<TusUser>> davec;
-		for (s32 i = 0; i < std::min(arrayNum, ::narrow<s32>(targetNpIdArray.size())); i++)
-		{
-			davec.push_back(CreateTusUser(builder, vuser, builder.CreateString(targetNpIdArray[i].data)));
-		}
-
-		auto req_finished = CreateTusGetMultiUserDataStatusRequest(builder, builder.CreateVector(davec), slotId);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::TusGetMultiUserDataStatus, req_id);
-	}
-
-	bool rpcn_client::tus_get_friends_data_status(u32 req_id, SceNpCommunicationId& communication_id, SceNpTusSlotId slotId, bool includeSelf, s32 sortType, s32 arrayNum)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		auto req_finished = CreateTusGetFriendsDataStatusRequest(builder, slotId, includeSelf, sortType, arrayNum);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::TusGetFriendsDataStatus, req_id);
-	}
-
-	bool rpcn_client::tus_delete_multislot_data(u32 req_id, SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, bool vuser)
-	{
-		const std::vector<s32> slotid_array(slotIdArray.get_ptr(), slotIdArray.get_ptr() + arrayNum);
-
-		flatbuffers::FlatBufferBuilder builder(1024);
-		auto req_finished = CreateTusDeleteMultiSlotDataRequest(builder, CreateTusUser(builder, vuser, builder.CreateString(targetNpId.data)), builder.CreateVector(slotid_array));
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::TusDeleteMultiSlotData, req_id);
-	}
-
-	bool rpcn_client::send_presence(const SceNpCommunicationId& pr_com_id, const std::string& pr_title, const std::string& pr_status, const std::string& pr_comment, const std::vector<u8>& pr_data)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		auto req_finished = CreateSetPresenceRequest(builder, builder.CreateString(pr_title), builder.CreateString(pr_status), builder.CreateString(pr_comment), builder.CreateVector(pr_data));
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, pr_com_id, CommandType::SetPresence, rpcn_request_counter.fetch_add(1));
-	}
-
-	bool rpcn_client::createjoin_room_gui(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatchingAttr* attr_list)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		u32 total_slots = 0;
-		u32 private_slots = 0;
-		bool privilege_grant = false;
-		bool stealth = false;
-
-		std::vector<flatbuffers::Offset<MatchingAttr>> vec_attrs;
-
-		for (const SceNpMatchingAttr* cur_attr = attr_list; cur_attr != nullptr; cur_attr = cur_attr->next ? cur_attr->next.get_ptr() : nullptr)
-		{
-			switch (cur_attr->type)
-			{
-			case SCE_NP_MATCHING_ATTR_TYPE_BASIC_NUM:
-			{
-				switch (cur_attr->id)
-				{
-				case SCE_NP_MATCHING_ROOM_ATTR_ID_TOTAL_SLOT:
-					total_slots = cur_attr->value.num;
-					break;
-				case SCE_NP_MATCHING_ROOM_ATTR_ID_PRIVATE_SLOT:
-					private_slots = cur_attr->value.num;
-					break;
-				case SCE_NP_MATCHING_ROOM_ATTR_ID_PRIVILEGE_TYPE:
-					ensure(cur_attr->value.num == SCE_NP_MATCHING_ROOM_PRIVILEGE_TYPE_NO_AUTO_GRANT || cur_attr->value.num == SCE_NP_MATCHING_ROOM_PRIVILEGE_TYPE_AUTO_GRANT, "Invalid SCE_NP_MATCHING_ROOM_ATTR_ID_PRIVILEGE_TYPE value");
-					privilege_grant = (cur_attr->value.num == SCE_NP_MATCHING_ROOM_PRIVILEGE_TYPE_AUTO_GRANT);
-					break;
-				case SCE_NP_MATCHING_ROOM_ATTR_ID_ROOM_SEARCH_FLAG:
-					ensure(cur_attr->value.num == SCE_NP_MATCHING_ROOM_SEARCH_FLAG_OPEN || cur_attr->value.num == SCE_NP_MATCHING_ROOM_SEARCH_FLAG_STEALTH, "Invalid SCE_NP_MATCHING_ROOM_ATTR_ID_ROOM_SEARCH_FLAG value");
-					stealth = (cur_attr->value.num == SCE_NP_MATCHING_ROOM_SEARCH_FLAG_STEALTH);
-					break;
-				default:
-					fmt::throw_exception("Invalid basic num attribute id");
-					break;
-				}
-
-				break;
-			}
-			case SCE_NP_MATCHING_ATTR_TYPE_GAME_BIN:
-			{
-				ensure(cur_attr->id >= 1u && cur_attr->id <= 16u, "Invalid game bin attribute id");
-				ensure(cur_attr->value.data.size <= 64u || ((cur_attr->id == 1u || cur_attr->id == 2u) && cur_attr->value.data.size <= 256u), "Invalid game bin size");
-
-				const std::vector<u8> vec_data(static_cast<const u8*>(cur_attr->value.data.ptr.get_ptr()), static_cast<const u8*>(cur_attr->value.data.ptr.get_ptr()) + cur_attr->value.data.size);
-				auto attr = CreateMatchingAttrDirect(builder, cur_attr->type, cur_attr->id, 0, &vec_data);
-				vec_attrs.push_back(attr);
-				break;
-			}
-			case SCE_NP_MATCHING_ATTR_TYPE_GAME_NUM:
-			{
-				ensure(cur_attr->id >= 1u && cur_attr->id <= 16u, "Invalid game num attribute id");
-
-				auto attr = CreateMatchingAttrDirect(builder, cur_attr->type, cur_attr->id, cur_attr->value.num, nullptr);
-				vec_attrs.push_back(attr);
-				break;
-			}
-			default:
-				fmt::throw_exception("Invalid attribute type");
-			}
-		}
-
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<MatchingAttr>>> final_attrs_vec;
-
-		if (!vec_attrs.empty())
-		{
-			final_attrs_vec = builder.CreateVector(vec_attrs);
-		}
-
-		auto req_finished = CreateCreateRoomGUIRequest(builder, total_slots, private_slots, privilege_grant, stealth, final_attrs_vec);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::CreateRoomGUI, req_id);
-	}
-
-	bool rpcn_client::join_room_gui(u32 req_id, const SceNpRoomId& room_id)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		const std::vector<u8> vec_room_id(room_id.opt, room_id.opt + sizeof(room_id.opt));
-		auto req_finished = CreateMatchingGuiRoomIdDirect(builder, &vec_room_id);
-		builder.Finish(req_finished);
-		return forge_request_with_data(builder, CommandType::JoinRoomGUI, req_id);
-	}
-
-	bool rpcn_client::leave_room_gui(u32 req_id, const SceNpRoomId& room_id)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		const std::vector<u8> vec_room_id(room_id.opt, room_id.opt + sizeof(room_id.opt));
-		auto req_finished = CreateMatchingGuiRoomIdDirect(builder, &vec_room_id);
-		builder.Finish(req_finished);
-		return forge_request_with_data(builder, CommandType::LeaveRoomGUI, req_id);
-	}
-
-	bool rpcn_client::get_room_list_gui(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatchingReqRange* range, vm::ptr<SceNpMatchingSearchCondition> cond, vm::ptr<SceNpMatchingAttr> attr)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		const s32 range_start = range->start;
-		const u32 range_max = range->max;
-
-		std::vector<flatbuffers::Offset<MatchingSearchCondition>> vec_conds;
-		std::vector<flatbuffers::Offset<MatchingAttr>> vec_attrs;
-
-		for (auto cur_cond = cond; cur_cond; cur_cond = cur_cond->next)
-		{
-			auto fb_cond = CreateMatchingSearchCondition(builder, cur_cond->target_attr_type, cur_cond->target_attr_id, cur_cond->comp_op, cur_cond->compared.value.num);
-			vec_conds.push_back(fb_cond);
-		}
-
-		for (auto cur_attr = attr; cur_attr; cur_attr = cur_attr->next)
-		{
-			auto fb_attr = CreateMatchingAttr(builder, cur_attr->type, cur_attr->id);
-			vec_attrs.push_back(fb_attr);
-		}
-
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<MatchingSearchCondition>>> final_conds_vec;
-		flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<MatchingAttr>>> final_attrs_vec;
-
-		if (!vec_conds.empty())
-		{
-			final_conds_vec = builder.CreateVector(vec_conds);
-		}
-
-		if (!vec_attrs.empty())
-		{
-			final_attrs_vec = builder.CreateVector(vec_attrs);
-		}
-
-		auto req_finished = CreateGetRoomListGUIRequest(builder, range_start, range_max, final_conds_vec, final_attrs_vec);
-		builder.Finish(req_finished);
-
-		return forge_request_with_com_id(builder, communication_id, CommandType::GetRoomListGUI, req_id);
-	}
-
-	bool rpcn_client::set_room_search_flag_gui(u32 req_id, const SceNpRoomId& room_id, bool stealth)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		const std::vector<u8> vec_room_id(room_id.opt, room_id.opt + sizeof(room_id.opt));
-		auto req_finished = CreateSetRoomSearchFlagGUIDirect(builder, &vec_room_id, stealth);
-		builder.Finish(req_finished);
-		return forge_request_with_data(builder, CommandType::SetRoomSearchFlagGUI, req_id);
-	}
-
-	bool rpcn_client::get_room_search_flag_gui(u32 req_id, const SceNpRoomId& room_id)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		const std::vector<u8> vec_room_id(room_id.opt, room_id.opt + sizeof(room_id.opt));
-		auto req_finished = CreateMatchingGuiRoomIdDirect(builder, &vec_room_id);
-		builder.Finish(req_finished);
-		return forge_request_with_data(builder, CommandType::GetRoomSearchFlagGUI, req_id);
-	}
-
-	bool rpcn_client::set_room_info_gui(u32 req_id, const SceNpRoomId& room_id, vm::ptr<SceNpMatchingAttr> attrs)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		const std::vector<u8> vec_room_id(room_id.opt, room_id.opt + sizeof(room_id.opt));
-		std::vector<flatbuffers::Offset<MatchingAttr>> vec_attrs;
-
-		for (auto cur_attr = attrs; cur_attr; cur_attr = cur_attr->next)
-		{
-			u32 num = 0;
-			flatbuffers::Offset<flatbuffers::Vector<uint8_t>> fb_vec_data = 0;
-
-			switch (cur_attr->type)
-			{
-			case SCE_NP_MATCHING_ATTR_TYPE_GAME_BIN:
-			{
-				const std::vector<u8> vec_data(static_cast<const u8*>(cur_attr->value.data.ptr.get_ptr()), static_cast<const u8*>(cur_attr->value.data.ptr.get_ptr()) + cur_attr->value.data.size);
-				fb_vec_data = builder.CreateVector(vec_data);
-				break;
-			}
-			case SCE_NP_MATCHING_ATTR_TYPE_GAME_NUM:
-			{
-				num = cur_attr->value.num;
-				break;
-			}
-			default: fmt::throw_exception("Invalid attr type reached set_room_info_gui");
-			}
-
-			auto fb_attr = CreateMatchingAttr(builder, cur_attr->type, cur_attr->id, num, fb_vec_data);
-			vec_attrs.push_back(fb_attr);
-		}
-
-		auto req_finished = CreateMatchingRoomDirect(builder, &vec_room_id, &vec_attrs);
-		builder.Finish(req_finished);
-		return forge_request_with_data(builder, CommandType::SetRoomInfoGUI, req_id);
-	}
-
-	bool rpcn_client::get_room_info_gui(u32 req_id, const SceNpRoomId& room_id, vm::ptr<SceNpMatchingAttr> attrs)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		const std::vector<u8> vec_room_id(room_id.opt, room_id.opt + sizeof(room_id.opt));
-		std::vector<flatbuffers::Offset<MatchingAttr>> vec_attrs;
-
-		for (auto cur_attr = attrs; cur_attr; cur_attr = cur_attr->next)
-		{
-			auto fb_attr = CreateMatchingAttr(builder, cur_attr->type, cur_attr->id);
-			vec_attrs.push_back(fb_attr);
-		}
-
-		auto req_finished = CreateMatchingRoomDirect(builder, &vec_room_id, &vec_attrs);
-		builder.Finish(req_finished);
-		return forge_request_with_data(builder, CommandType::GetRoomInfoGUI, req_id);
-	}
-
-	bool rpcn_client::quickmatch_gui(u32 req_id, const SceNpCommunicationId& com_id, vm::cptr<SceNpMatchingSearchCondition> cond, s32 available_num)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-		std::vector<flatbuffers::Offset<MatchingSearchCondition>> vec_conds;
-
-		for (auto cur_cond = cond; cur_cond; cur_cond = cur_cond->next)
-		{
-			auto fb_cond = CreateMatchingSearchCondition(builder, cur_cond->target_attr_type, cur_cond->target_attr_id, cur_cond->comp_op, cur_cond->compared.value.num);
-			vec_conds.push_back(fb_cond);
-		}
-
-		auto req_finished = CreateQuickMatchGUIRequestDirect(builder, &vec_conds, available_num);
-		builder.Finish(req_finished);
-		return forge_request_with_com_id(builder, com_id, CommandType::QuickMatchGUI, req_id);
-	}
-
-	bool rpcn_client::searchjoin_gui(u32 req_id, const SceNpCommunicationId& com_id, vm::cptr<SceNpMatchingSearchCondition> cond, vm::cptr<SceNpMatchingAttr> attr)
-	{
-		flatbuffers::FlatBufferBuilder builder(1024);
-
-		std::vector<flatbuffers::Offset<MatchingSearchCondition>> vec_conds;
-		std::vector<flatbuffers::Offset<MatchingAttr>> vec_attrs;
-
-		for (auto cur_cond = cond; cur_cond; cur_cond = cur_cond->next)
-		{
-			auto fb_cond = CreateMatchingSearchCondition(builder, cur_cond->target_attr_type, cur_cond->target_attr_id, cur_cond->comp_op, cur_cond->compared.value.num);
-			vec_conds.push_back(fb_cond);
-		}
-
-		for (auto cur_attr = attr; cur_attr; cur_attr = cur_attr->next)
-		{
-			auto fb_attr = CreateMatchingAttr(builder, cur_attr->type, cur_attr->id);
-			vec_attrs.push_back(fb_attr);
-		}
-
-		auto req_finished = CreateSearchJoinRoomGUIRequestDirect(builder, vec_conds.empty() ? nullptr : &vec_conds, vec_attrs.empty() ? nullptr : &vec_attrs);
-		builder.Finish(req_finished);
-		return forge_request_with_com_id(builder, com_id, CommandType::SearchJoinRoomGUI, req_id);
-	}
-
-	void rpcn_client::write_communication_id(const SceNpCommunicationId& com_id, std::vector<u8>& data)
-	{
-		ensure(com_id.data[9] == 0 && com_id.num <= 99, "rpcn_client::write_communication_id: Invalid SceNpCommunicationId");
-		const std::string com_id_str = np::communication_id_to_string(com_id);
-		ensure(com_id_str.size() == 12, "rpcn_client::write_communication_id: Error formatting SceNpCommunicationId");
-		memcpy(data.data(), com_id_str.data(), COMMUNICATION_ID_SIZE);
-	}
-
-	bool rpcn_client::forge_request_with_com_id(const flatbuffers::FlatBufferBuilder& builder, const SceNpCommunicationId& com_id, CommandType command, u64 packet_id)
-	{
-		const u8* buf = builder.GetBufferPointer();
-		const usz bufsize = builder.GetSize();
-		std::vector<u8> data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize);
-
-		rpcn_client::write_communication_id(com_id, data);
-
-		reinterpret_cast<le_t<u32>&>(data[COMMUNICATION_ID_SIZE]) = static_cast<u32>(bufsize);
-		memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), buf, bufsize);
-
-		return forge_send(command, packet_id, data);
-	}
-
-	bool rpcn_client::forge_request_with_data(const flatbuffers::FlatBufferBuilder& builder, CommandType command, u64 packet_id)
-	{
-		const u8* buf = builder.GetBufferPointer();
-		const usz bufsize = builder.GetSize();
-		std::vector<u8> data(sizeof(u32) + bufsize);
-
-		reinterpret_cast<le_t<u32>&>(data[0]) = static_cast<u32>(bufsize);
-		memcpy(data.data() + sizeof(u32), buf, bufsize);
-
-		return forge_send(command, packet_id, data);
-	}
-
-	std::vector<u8> rpcn_client::forge_request(rpcn::CommandType command, u64 packet_id, const std::vector<u8>& data) const
-	{
-		const usz packet_size = data.size() + RPCN_HEADER_SIZE;
-
-		std::vector<u8> packet(packet_size);
-		packet[0] = static_cast<u8>(PacketType::Request);
-		reinterpret_cast<le_t<u16>&>(packet[1]) = static_cast<u16>(command);
-		reinterpret_cast<le_t<u32>&>(packet[3]) = ::narrow<u32>(packet_size);
-		reinterpret_cast<le_t<u64>&>(packet[7]) = packet_id;
-
-		memcpy(packet.data() + RPCN_HEADER_SIZE, data.data(), data.size());
-		return packet;
-	}
-
-	bool rpcn_client::error_and_disconnect(const std::string& error_msg)
-	{
-		connected = false;
-		rpcn_log.error("%s", error_msg);
+	if (!forge_send(CommandType::SendRoomMessage, req_id, data))
 		return false;
-	}
 
-	bool rpcn_client::error_and_disconnect_notice(const std::string& error_msg)
-	{
-		connected = false;
-		rpcn_log.notice("%s", error_msg);
+	return true;
+}
+
+bool rpcn_client::req_sign_infos(u32 req_id, const std::string& npid)
+{
+	std::vector<u8> data{};
+	std::copy(npid.begin(), npid.end(), std::back_inserter(data));
+	data.push_back(0);
+
+	if (!forge_send(CommandType::RequestSignalingInfos, req_id, data))
 		return false;
-	}
 
-	rpcn_state rpcn_client::wait_for_connection()
+	return true;
+}
+
+bool rpcn_client::req_ticket(u32 req_id, const std::string& service_id)
+{
+	std::vector<u8> data{};
+	std::copy(service_id.begin(), service_id.end(), std::back_inserter(data));
+	data.push_back(0);
+
+	if (!forge_send(CommandType::RequestTicket, req_id, data))
+		return false;
+
+	return true;
+}
+
+std::vector<u8> rpcn_client::forge_request(u16 command, u32 packet_id, const std::vector<u8>& data) const
+{
+	u16 packet_size = data.size() + RPCN_HEADER_SIZE;
+
+	std::vector<u8> packet(packet_size);
+	packet[0]                               = PacketType::Request;
+	reinterpret_cast<le_t<u16>&>(packet[1]) = command;
+	reinterpret_cast<le_t<u16>&>(packet[3]) = packet_size;
+	reinterpret_cast<le_t<u32>&>(packet[5]) = packet_id;
+
+	memcpy(packet.data() + RPCN_HEADER_SIZE, data.data(), data.size());
+	return packet;
+}
+
+bool rpcn_client::is_error(ErrorType err) const
+{
+	if (err >= ErrorType::__error_last)
 	{
-		{
-			std::lock_guard lock(mutex_connected);
-			if (connected)
-			{
-				return rpcn_state::failure_no_failure;
-			}
-
-			if (state != rpcn_state::failure_no_failure)
-			{
-				return state;
-			}
-
-			want_conn = true;
-			sem_rpcn.release();
-		}
-
-		sem_connected.acquire();
-
-		return state;
+		rpcn_log.error("Invalid error returned!");
+		return true;
 	}
 
-	rpcn_state rpcn_client::wait_for_authentified()
+	switch (err)
 	{
-		{
-			std::lock_guard lock(mutex_authentified);
-
-			if (authentified)
-			{
-				return rpcn_state::failure_no_failure;
-			}
-
-			if (state != rpcn_state::failure_no_failure)
-			{
-				return state;
-			}
-
-			want_auth = true;
-			sem_rpcn.release();
-		}
-
-		sem_authentified.acquire();
-
-		return state;
+	case NoError: return false;
+	case Malformed: rpcn_log.error("Sent packet was malformed!"); break;
+	case Invalid: rpcn_log.error("Sent command was invalid!"); break;
+	case InvalidInput: rpcn_log.error("Sent data was invalid!"); break;
+	case ErrorLogin: rpcn_log.error("Sent password/token was incorrect!"); break;
+	case ErrorCreate: rpcn_log.error("Error creating an account!"); break;
+	case AlreadyLoggedIn: rpcn_log.error("User is already logged in!"); break;
+	case AlreadyJoined: rpcn_log.error("User has already joined!"); break;
+	case DbFail: rpcn_log.error("A db query failed on the server!"); break;
+	case NotFound: rpcn_log.error("A request replied not found!"); return false;
+	case Unsupported: rpcn_log.error("An unsupported operation was attempted!"); return false;
+	default: rpcn_log.fatal("Unhandled ErrorType reached the switch?"); break;
 	}
 
-	void rpcn_client::get_friends(friend_data& friend_infos)
+	return true;
+}
+
+bool rpcn_client::error_and_disconnect(const std::string& error_msg)
+{
+	rpcn_log.error("%s", error_msg);
+	disconnect();
+	return false;
+}
+
+bool rpcn_client::is_abort() const
+{
+	if (in_config)
 	{
-		std::lock_guard lock(mutex_friends);
-		friend_infos = this->friend_infos;
+		if (abort_config)
+			return true;
 	}
-
-	void rpcn_client::get_friends_and_register_cb(friend_data& friend_infos, friend_cb_func cb_func, void* cb_param)
+	else
 	{
-		std::lock_guard lock(mutex_friends);
-
-		friend_infos = this->friend_infos;
-		friend_cbs.insert(std::make_pair(cb_func, cb_param));
+		if (Emu.IsStopped() || thread_ctrl::state() == thread_state::aborting)
+			return true;
 	}
 
-	void rpcn_client::register_friend_cb(friend_cb_func cb_func, void* cb_param)
-	{
-		std::lock_guard lock(mutex_friends);
-		friend_cbs.insert(std::make_pair(cb_func, cb_param));
-	}
+	return false;
+}
 
-	void rpcn_client::remove_friend_cb(friend_cb_func cb_func, void* cb_param)
-	{
-		std::lock_guard lock(mutex_friends);
-
-		for (const auto& friend_cb : friend_cbs)
-		{
-			if (friend_cb.first == cb_func && friend_cb.second == cb_param)
-			{
-				friend_cbs.erase(friend_cb);
-				break;
-			}
-		}
-	}
-
-	void rpcn_client::handle_friend_notification(rpcn::NotificationType ntype, std::vector<u8> data)
-	{
-		std::lock_guard lock(mutex_friends);
-
-		vec_stream vdata(data);
-
-		const auto call_callbacks = [&](NotificationType ntype, const std::string& username, bool status)
-		{
-			for (auto& friend_cb : friend_cbs)
-			{
-				friend_cb.first(friend_cb.second, ntype, username, status);
-			}
-		};
-
-		switch (ntype)
-		{
-		case NotificationType::FriendQuery: // Other user sent a friend request
-		{
-			const std::string username = vdata.get_string(false);
-			if (vdata.is_error())
-			{
-				rpcn_log.error("Error parsing FriendQuery notification");
-				break;
-			}
-
-			friend_infos.requests_received.insert(username);
-			call_callbacks(ntype, username, false);
-			break;
-		}
-		case NotificationType::FriendNew: // Add a friend to the friendlist(either accepted a friend request or friend accepted it)
-		{
-			const bool online = !!vdata.get<u8>();
-			const std::string username = vdata.get_string(false);
-			if (vdata.is_error())
-			{
-				rpcn_log.error("Error parsing FriendNew notification");
-				break;
-			}
-
-			friend_infos.requests_received.erase(username);
-			friend_infos.requests_sent.erase(username);
-			friend_infos.friends.insert_or_assign(username, friend_online_data(online, 0));
-			call_callbacks(ntype, username, online);
-
-			break;
-		}
-		case NotificationType::FriendLost: // Remove friend from the friendlist(user removed friend or friend removed friend)
-		{
-			const std::string username = vdata.get_string(false);
-			if (vdata.is_error())
-			{
-				rpcn_log.error("Error parsing FriendLost notification");
-				break;
-			}
-
-			friend_infos.requests_received.erase(username);
-			friend_infos.requests_sent.erase(username);
-			friend_infos.friends.erase(username);
-			call_callbacks(ntype, username, false);
-			break;
-		}
-		case NotificationType::FriendStatus: // Set status of friend to Offline or Online
-		{
-			const bool online = !!vdata.get<u8>();
-			const u64 timestamp = vdata.get<u64>();
-			const std::string username = vdata.get_string(false);
-			if (vdata.is_error())
-			{
-				rpcn_log.error("Error parsing FriendStatus notification");
-				break;
-			}
-
-			if (auto u = friend_infos.friends.find(username); u != friend_infos.friends.end())
-			{
-				if (timestamp < u->second.timestamp)
-				{
-					break;
-				}
-
-				// clear presence data on online/offline
-				u->second = friend_online_data(online, timestamp);
-
-				{
-					std::lock_guard lock(mutex_presence_updates);
-					presence_updates.insert_or_assign(username, u->second);
-				}
-
-				call_callbacks(ntype, username, online);
-			}
-			break;
-		}
-		case NotificationType::FriendPresenceChanged:
-		{
-			const std::string username = vdata.get_string(true);
-			SceNpCommunicationId pr_com_id = vdata.get_com_id();
-			std::string pr_title = fmt::truncate(vdata.get_string(true), SCE_NP_BASIC_PRESENCE_TITLE_SIZE_MAX - 1);
-			std::string pr_status = fmt::truncate(vdata.get_string(true), SCE_NP_BASIC_PRESENCE_EXTENDED_STATUS_SIZE_MAX - 1);
-			std::string pr_comment = fmt::truncate(vdata.get_string(true), SCE_NP_BASIC_PRESENCE_COMMENT_SIZE_MAX - 1);
-			std::vector<u8> pr_data = vdata.get_rawdata();
-			if (pr_data.size() > SCE_NP_BASIC_MAX_PRESENCE_SIZE)
-			{
-				pr_data.resize(SCE_NP_BASIC_MAX_PRESENCE_SIZE);
-			}
-
-			if (vdata.is_error())
-			{
-				rpcn_log.error("Error parsing FriendPresenceChanged notification");
-				break;
-			}
-
-			if (auto u = friend_infos.friends.find(username); u != friend_infos.friends.end())
-			{
-				u->second.pr_com_id = std::move(pr_com_id);
-				u->second.pr_title = std::move(pr_title);
-				u->second.pr_status = std::move(pr_status);
-				u->second.pr_comment = std::move(pr_comment);
-				u->second.pr_data = std::move(pr_data);
-
-				std::lock_guard lock(mutex_presence_updates);
-				presence_updates.insert_or_assign(username, u->second);
-			}
-
-			call_callbacks(ntype, username, false);
-			break;
-		}
-		default:
-		{
-			rpcn_log.fatal("Unknown notification forwarded to handle_friend_notification");
-			break;
-		}
-		}
-	}
-
-	void rpcn_client::handle_message(std::vector<u8> data)
-	{
-		// Unserialize the message
-		vec_stream sdata(data);
-		std::string sender = sdata.get_string(false);
-		auto* fb_mdata = sdata.get_flatbuffer<MessageDetails>();
-
-		if (sdata.is_error())
-		{
-			return;
-		}
-
-		if (!fb_mdata->communicationId() || fb_mdata->communicationId()->size() == 0 || fb_mdata->communicationId()->size() > 9 ||
-			!fb_mdata->subject() || !fb_mdata->body() || !fb_mdata->data())
-		{
-			rpcn_log.warning("Discarded invalid message!");
-			return;
-		}
-
-		message_data mdata = {
-			.msgId = message_counter,
-			.mainType = fb_mdata->mainType(),
-			.subType = fb_mdata->subType(),
-			.msgFeatures = fb_mdata->msgFeatures(),
-			.subject = fb_mdata->subject()->str(),
-			.body = fb_mdata->body()->str()};
-
-		strcpy_trunc(mdata.commId.data, fb_mdata->communicationId()->str());
-		mdata.data.assign(fb_mdata->data()->Data(), fb_mdata->data()->Data() + fb_mdata->data()->size());
-
-		// Save the message and call callbacks
-		{
-			std::lock_guard lock(mutex_messages);
-			const u64 msg_id = message_counter++;
-			auto id_and_msg = stx::make_shared<std::pair<std::string, message_data>>(std::make_pair(std::move(sender), std::move(mdata)));
-			messages.emplace(msg_id, id_and_msg);
-			new_messages.push_back(msg_id);
-			active_messages.insert(msg_id);
-
-			const auto& msg = id_and_msg->second;
-			for (const auto& message_cb : message_cbs)
-			{
-				if (msg.mainType == message_cb.type_filter && (message_cb.inc_bootable || !(msg.msgFeatures & SCE_NP_BASIC_MESSAGE_FEATURES_BOOTABLE)))
-				{
-					message_cb.cb_func(message_cb.cb_param, id_and_msg, msg_id);
-				}
-			}
-		}
-	}
-
-	std::optional<shared_ptr<std::pair<std::string, message_data>>> rpcn_client::get_message(u64 id)
-	{
-		{
-			std::lock_guard lock(mutex_messages);
-
-			if (!messages.contains(id))
-				return std::nullopt;
-
-			return ::at32(messages, id);
-		}
-	}
-
-	std::vector<std::pair<u64, shared_ptr<std::pair<std::string, message_data>>>> rpcn_client::get_messages_and_register_cb(SceNpBasicMessageMainType type_filter, bool include_bootable, message_cb_func cb_func, void* cb_param)
-	{
-		std::vector<std::pair<u64, shared_ptr<std::pair<std::string, message_data>>>> vec_messages;
-		{
-			std::lock_guard lock(mutex_messages);
-			for (auto id : active_messages)
-			{
-				const auto& entry = ::at32(messages, id);
-				const auto& msg = entry->second;
-				if (msg.mainType == type_filter && (include_bootable || !(msg.msgFeatures & SCE_NP_BASIC_MESSAGE_FEATURES_BOOTABLE)))
-				{
-					vec_messages.push_back(std::make_pair(id, entry));
-				}
-			}
-
-			message_cbs.insert(message_cb_t{
-				.cb_func = cb_func,
-				.cb_param = cb_param,
-				.type_filter = type_filter,
-				.inc_bootable = include_bootable,
-			});
-		}
-		return vec_messages;
-	}
-
-	void rpcn_client::remove_message_cb(message_cb_func cb_func, void* cb_param)
-	{
-		std::lock_guard lock(mutex_messages);
-
-		for (const auto& message_cb : message_cbs)
-		{
-			if (message_cb.cb_func == cb_func && message_cb.cb_param == cb_param)
-			{
-				message_cbs.erase(message_cb);
-				break;
-			}
-		}
-	}
-
-	void rpcn_client::mark_message_used(u64 id)
-	{
-		std::lock_guard lock(mutex_messages);
-
-		active_messages.erase(id);
-	}
-
-	u32 rpcn_client::get_num_friends()
-	{
-		std::lock_guard lock(mutex_friends);
-
-		return ::size32(friend_infos.friends);
-	}
-
-	u32 rpcn_client::get_num_blocks()
-	{
-		std::lock_guard lock(mutex_friends);
-
-		return ::size32(friend_infos.blocked);
-	}
-
-	std::optional<std::string> rpcn_client::get_friend_by_index(u32 index)
-	{
-		std::lock_guard lock(mutex_friends);
-
-		if (index >= friend_infos.friends.size())
-		{
-			return {};
-		}
-
-		auto it = friend_infos.friends.begin();
-		for (usz i = 0; i < index; i++)
-		{
-			it++;
-		}
-
-		return it->first;
-	}
-
-	std::optional<std::pair<std::string, friend_online_data>> rpcn_client::get_friend_presence_by_index(u32 index)
-	{
-		std::lock_guard lock(mutex_friends);
-
-		if (index >= friend_infos.friends.size())
-		{
-			return std::nullopt;
-		}
-
-		auto it = friend_infos.friends.begin();
-		std::advance(it, index);
-		return std::optional(*it);
-	}
-
-	std::optional<std::pair<std::string, friend_online_data>> rpcn_client::get_friend_presence_by_npid(const std::string& npid)
-	{
-		std::lock_guard lock(mutex_friends);
-		const auto it = friend_infos.friends.find(npid);
-		return it == friend_infos.friends.end() ? std::nullopt : std::optional(*it);
-	}
-
-	bool rpcn_client::is_connected() const
-	{
-		return connected;
-	}
-
-	bool rpcn_client::is_authentified() const
-	{
-		return authentified;
-	}
-	rpcn_state rpcn_client::get_rpcn_state() const
-	{
-		return state;
-	}
-
-	const std::string& rpcn_client::get_online_name() const
-	{
-		return online_name;
-	}
-
-	const std::string& rpcn_client::get_avatar_url() const
-	{
-		return avatar_url;
-	}
-
-	u32 rpcn_client::get_addr_sig() const
-	{
-		if (!addr_sig)
-		{
-			addr_sig.wait(0, static_cast<atomic_wait_timeout>(10'000'000'000));
-		}
-
-		return addr_sig.load();
-	}
-
-	u16 rpcn_client::get_port_sig() const
-	{
-		if (!port_sig)
-		{
-			port_sig.wait(0, static_cast<atomic_wait_timeout>(10'000'000'000));
-		}
-
-		return port_sig.load();
-	}
-
-	u32 rpcn_client::get_addr_local() const
-	{
-		return local_addr_sig.load();
-	}
-
-	void rpcn_client::update_local_addr(u32 addr)
-	{
-		local_addr_sig = std::bit_cast<u32, be_t<u32>>(addr);
-	}
-
-} // namespace rpcn
+void rpcn_client::abort()
+{
+	ensure(in_config);
+	abort_config = true;
+}
diff --git a/rpcs3/Emu/NP/rpcn_client.h b/rpcs3/Emu/NP/rpcn_client.h
index 11acb291a5..87d5881c23 100644
--- a/rpcs3/Emu/NP/rpcn_client.h
+++ b/rpcs3/Emu/NP/rpcn_client.h
@@ -2,73 +2,48 @@
 
 #include <unordered_map>
 #include <chrono>
-#include <thread>
-#include <semaphore>
 #include "Utilities/mutex.h"
-#include "Emu/localized_string_id.h"
+
+#include "util/asm.hpp"
 
 #ifdef _WIN32
 #include <winsock2.h>
-#include <ws2tcpip.h>
 #else
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#endif
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
 #endif
 
 #include "Emu/Cell/Modules/sceNp.h"
 #include "Emu/Cell/Modules/sceNp2.h"
-#include "Emu/Cell/Modules/sceNpTus.h"
-#include <flatbuffers/flatbuffers.h>
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#pragma clang diagnostic ignored "-Wextern-c-compat"
-#endif
+#include "generated/np2_structs_generated.h"
+
 #include <wolfssl/ssl.h>
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#include "rpcn_types.h"
-
-// COMID is sent as 9 chars - + '_' + 2 digits
-constexpr usz COMMUNICATION_ID_COMID_COMPONENT_SIZE = 9;
-constexpr usz COMMUNICATION_ID_SUBID_COMPONENT_SIZE = 2;
-constexpr usz COMMUNICATION_ID_SIZE = COMMUNICATION_ID_COMID_COMPONENT_SIZE + COMMUNICATION_ID_SUBID_COMPONENT_SIZE + 1;
 
 class vec_stream
 {
 public:
 	vec_stream() = delete;
 	vec_stream(std::vector<u8>& _vec, usz initial_index = 0)
-		: vec(_vec), i(initial_index) {}
+	    : vec(_vec)
+	    , i(initial_index){}
 	bool is_error() const
 	{
 		return error;
 	}
 
-	void dump() const;
-
 	// Getters
 
 	template <typename T>
 	T get()
 	{
-		if (sizeof(T) + i > vec.size() || error)
+		if (sizeof(T) + i > vec.size())
 		{
 			error = true;
-			return static_cast<T>(0);
+			return 0;
 		}
-		T res = read_from_ptr<le_t<T>>(&vec[i]);
+		T res = *utils::bless<le_t<T, 1>>(&vec[i]);
 		i += sizeof(T);
 		return res;
 	}
@@ -91,68 +66,13 @@ public:
 	}
 	std::vector<u8> get_rawdata()
 	{
+		std::vector<u8> ret;
 		u32 size = get<u32>();
 
-		if (i + size > vec.size())
-		{
+		if ((vec.begin() + i + size) <= vec.end())
+			std::copy(vec.begin() + i, vec.begin() + i + size, std::back_inserter(ret));
+		else
 			error = true;
-			return {};
-		}
-
-		std::vector<u8> ret;
-		std::copy(vec.begin() + i, vec.begin() + i + size, std::back_inserter(ret));
-		i += size;
-		return ret;
-	}
-
-	SceNpCommunicationId get_com_id()
-	{
-		if (i + COMMUNICATION_ID_SIZE > vec.size() || error)
-		{
-			error = true;
-			return {};
-		}
-
-		SceNpCommunicationId com_id{};
-		std::memcpy(&com_id.data[0], &vec[i], COMMUNICATION_ID_COMID_COMPONENT_SIZE);
-		const std::string sub_id(reinterpret_cast<const char*>(&vec[i + COMMUNICATION_ID_COMID_COMPONENT_SIZE + 1]), COMMUNICATION_ID_SUBID_COMPONENT_SIZE);
-		const unsigned long result_num = std::strtoul(sub_id.c_str(), nullptr, 10);
-
-		if (result_num > 99)
-		{
-			error = true;
-			return {};
-		}
-
-		com_id.num = static_cast<u8>(result_num);
-		i += COMMUNICATION_ID_SIZE;
-		return com_id;
-	}
-
-	template <typename T>
-	const T* get_flatbuffer()
-	{
-		auto rawdata_vec = get_rawdata();
-
-		if (error)
-			return nullptr;
-
-		if (vec.empty())
-		{
-			error = true;
-			return nullptr;
-		}
-
-		const T* ret = flatbuffers::GetRoot<T>(rawdata_vec.data());
-		flatbuffers::Verifier verifier(rawdata_vec.data(), rawdata_vec.size());
-
-		if (!ret->Verify(verifier))
-		{
-			error = true;
-			return nullptr;
-		}
-
-		aligned_bufs.push_back(std::move(rawdata_vec));
 
 		return ret;
 	}
@@ -177,294 +97,160 @@ public:
 
 protected:
 	std::vector<u8>& vec;
-	std::vector<std::vector<u8>> aligned_bufs;
-	usz i      = 0;
+	usz i   = 0;
 	bool error = false;
 };
 
-namespace rpcn
+enum CommandType : u16
 {
-	using friend_cb_func  = void (*)(void* param, NotificationType ntype, const std::string& username, bool status);
-	using message_cb_func = void (*)(void* param, const shared_ptr<std::pair<std::string, message_data>> new_msg, u64 msg_id);
+	Login,
+	Terminate,
+	Create,
+	SendToken,
+	GetServerList,
+	GetWorldList,
+	CreateRoom,
+	JoinRoom,
+	LeaveRoom,
+	SearchRoom,
+	SetRoomDataExternal,
+	GetRoomDataInternal,
+	SetRoomDataInternal,
+	PingRoomOwner,
+	SendRoomMessage,
+	RequestSignalingInfos,
+	RequestTicket,
+};
 
-	struct friend_online_data
+class rpcn_client
+{
+	enum PacketType : u8
 	{
-		friend_online_data(bool online, SceNpCommunicationId&& pr_com_id, std::string&& pr_title, std::string&& pr_status, std::string&& pr_comment, std::vector<u8>&& pr_data)
-			: online(online), timestamp(0), pr_com_id(pr_com_id), pr_title(pr_title), pr_status(pr_status), pr_comment(pr_comment), pr_data(pr_data) {}
-
-		friend_online_data(bool online, u64 timestamp)
-			: online(online), timestamp(timestamp) {}
-
-		void dump() const;
-
-		bool online = false;
-		u64 timestamp = 0;
-		SceNpCommunicationId pr_com_id{};
-		std::string pr_title;
-		std::string pr_status;
-		std::string pr_comment;
-		std::vector<u8> pr_data;
+		Request,
+		Reply,
+		Notification,
+		ServerInfo,
 	};
 
-	struct friend_data
+	enum ErrorType : u8
 	{
-		std::map<std::string, friend_online_data> friends;
-		std::set<std::string> requests_sent;
-		std::set<std::string> requests_received;
-		std::set<std::string> blocked;
+		NoError,
+		Malformed,
+		Invalid,
+		InvalidInput,
+		ErrorLogin,
+		ErrorCreate,
+		AlreadyLoggedIn,
+		AlreadyJoined,
+		DbFail,
+		NotFound,
+		Unsupported,
+		__error_last
 	};
 
-	localized_string_id rpcn_state_to_localized_string_id(rpcn::rpcn_state state);
-	std::string rpcn_state_to_string(rpcn::rpcn_state state);
-	void print_error(rpcn::CommandType command, rpcn::ErrorType error);
+public:
+	rpcn_client(bool in_config = false);
+	~rpcn_client();
 
-	class rpcn_client
+	bool connect(const std::string& host);
+	bool login(const std::string& npid, const std::string& password, const std::string& token);
+	bool create_user(const std::string& npid, const std::string& password, const std::string& online_name, const std::string& avatar_url, const std::string& email);
+	void disconnect();
+	bool manage_connection();
+	std::vector<std::pair<u16, std::vector<u8>>> get_notifications();
+	std::unordered_map<u32, std::pair<u16, std::vector<u8>>> get_replies();
+	void abort();
+
+	// Synchronous requests
+	bool get_server_list(u32 req_id, const SceNpCommunicationId& communication_id, std::vector<u16>& server_list);
+	// Asynchronous requests
+	bool get_world_list(u32 req_id, const SceNpCommunicationId& communication_id, u16 server_id);
+	bool createjoin_room(u32 req_id,const SceNpCommunicationId& communication_id, const SceNpMatching2CreateJoinRoomRequest* req);
+	bool join_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2JoinRoomRequest* req);
+	bool leave_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2LeaveRoomRequest* req);
+	bool search_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SearchRoomRequest* req);
+	bool set_roomdata_external(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetRoomDataExternalRequest* req);
+	bool get_roomdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2GetRoomDataInternalRequest* req);
+	bool set_roomdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetRoomDataInternalRequest* req);
+	bool ping_room_owner(u32 req_id, const SceNpCommunicationId& communication_id, u64 room_id);
+	bool send_room_message(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SendRoomMessageRequest* req);
+	bool req_sign_infos(u32 req_id, const std::string& npid);
+	bool req_ticket(u32 req_id, const std::string& service_id);
+
+	const std::string& get_online_name() const
 	{
-	private:
-		static inline std::weak_ptr<rpcn_client> instance;
-		static inline shared_mutex inst_mutex;
+		return online_name;
+	}
+	const std::string& get_avatar_url() const
+	{
+		return avatar_url;
+	}
 
-		atomic_t<bool> connected    = false;
-		atomic_t<bool> authentified = false;
-		atomic_t<bool> want_conn    = false;
-		atomic_t<bool> want_auth    = false;
-		u32 binding_address = 0;
-		std::binary_semaphore sem_connected, sem_authentified;
-		std::mutex mutex_connected, mutex_authentified;
+	u32 get_addr_sig() const
+	{
+		return addr_sig.load();
+	}
+	u16 get_port_sig() const
+	{
+		return port_sig.load();
+	}
 
-		std::binary_semaphore sem_reader, sem_writer, sem_rpcn;
-		std::mutex mutex_read, mutex_write;
-
-		std::thread thread_rpcn, thread_rpcn_reader, thread_rpcn_writer;
-
-		atomic_t<bool> terminate = false;
-
-		atomic_t<u32> num_failures = 0;
-		atomic_t<rpcn_state> state = rpcn_state::failure_no_failure;
-
-		std::vector<std::vector<u8>> packets_to_send;
-		std::mutex mutex_packets_to_send;
-
-		// Friends related
-		shared_mutex mutex_friends;
-		std::set<std::pair<friend_cb_func, void*>> friend_cbs;
-		friend_data friend_infos;
-
-		void handle_friend_notification(rpcn::NotificationType ntype, std::vector<u8> data);
-
-		void handle_message(std::vector<u8> data);
-
-	private:
-		rpcn_client(u32 binding_address);
-
-		void rpcn_reader_thread();
-		void rpcn_writer_thread();
-		void rpcn_thread();
-
-		bool handle_input();
-		bool handle_output();
-
-		void add_packet(std::vector<u8> packet);
-
-	private:
-		enum class recvn_result
-		{
-			recvn_success,
-			recvn_nodata,
-			recvn_timeout,
-			recvn_noconn,
-			recvn_terminate,
-			recvn_fatal,
-		};
-
-		recvn_result recvn(u8* buf, usz n);
-		bool send_packet(const std::vector<u8>& packet);
-
-	private:
-		bool connect(const std::string& host);
-		bool login(const std::string& npid, const std::string& password, const std::string& token);
-		void disconnect();
-
-	public:
-		~rpcn_client();
-		rpcn_client(rpcn_client& other)    = delete;
-		void operator=(const rpcn_client&) = delete;
-		static std::shared_ptr<rpcn_client> get_instance(u32 binding_address, bool check_config = false);
-		rpcn_state wait_for_connection();
-		rpcn_state wait_for_authentified();
-		bool terminate_connection();
-		void reset_state();
-
-		void get_friends(friend_data& friend_infos);
-		void get_friends_and_register_cb(friend_data& friend_infos, friend_cb_func cb_func, void* cb_param);
-		void register_friend_cb(friend_cb_func, void* cb_param);
-		void remove_friend_cb(friend_cb_func, void* cb_param);
-
-		ErrorType create_user(std::string_view npid, std::string_view password, std::string_view online_name, std::string_view avatar_url, std::string_view email);
-		ErrorType resend_token(const std::string& npid, const std::string& password);
-		ErrorType send_reset_token(std::string_view npid, std::string_view email);
-		ErrorType reset_password(std::string_view npid, std::string_view token, std::string_view password);
-		bool add_friend(const std::string& friend_username);
-		bool remove_friend(const std::string& friend_username);
-
-		u32 get_num_friends();
-		u32 get_num_blocks();
-		std::optional<std::string> get_friend_by_index(u32 index);
-		std::optional<std::pair<std::string, friend_online_data>> get_friend_presence_by_index(u32 index);
-		std::optional<std::pair<std::string, friend_online_data>> get_friend_presence_by_npid(const std::string& npid);
-
-		std::vector<std::pair<rpcn::NotificationType, std::vector<u8>>> get_notifications();
-		std::unordered_map<u32, std::pair<rpcn::CommandType, std::vector<u8>>> get_replies();
-		std::unordered_map<std::string, friend_online_data> get_presence_updates();
-		std::map<std::string, friend_online_data> get_presence_states();
-
-		std::vector<u64> get_new_messages();
-		std::optional<shared_ptr<std::pair<std::string, message_data>>> get_message(u64 id);
-		std::vector<std::pair<u64, shared_ptr<std::pair<std::string, message_data>>>> get_messages_and_register_cb(SceNpBasicMessageMainType type, bool include_bootable, message_cb_func cb_func, void* cb_param);
-		void remove_message_cb(message_cb_func cb_func, void* cb_param);
-		void mark_message_used(u64 id);
-
-		bool is_connected() const;
-		bool is_authentified() const;
-		rpcn_state get_rpcn_state() const;
-
-		void server_infos_updated();
-
-		// Synchronous requests
-		bool get_server_list(u32 req_id, const SceNpCommunicationId& communication_id, std::vector<u16>& server_list);
-		u64 get_network_time(u32 req_id);
-		// Asynchronous requests
-		bool get_world_list(u32 req_id, const SceNpCommunicationId& communication_id, u16 server_id);
-		bool createjoin_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2CreateJoinRoomRequest* req);
-		bool join_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2JoinRoomRequest* req);
-		bool leave_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2LeaveRoomRequest* req);
-		bool search_room(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SearchRoomRequest* req);
-		bool get_roomdata_external_list(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2GetRoomDataExternalListRequest* req);
-		bool set_roomdata_external(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetRoomDataExternalRequest* req);
-		bool get_roomdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2GetRoomDataInternalRequest* req);
-		bool set_roomdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetRoomDataInternalRequest* req);
-		bool get_roommemberdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2GetRoomMemberDataInternalRequest* req);
-		bool set_roommemberdata_internal(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetRoomMemberDataInternalRequest* req);
-		bool set_userinfo(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SetUserInfoRequest* req);
-		bool ping_room_owner(u32 req_id, const SceNpCommunicationId& communication_id, u64 room_id);
-		bool send_room_message(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatching2SendRoomMessageRequest* req);
-		bool req_sign_infos(u32 req_id, const std::string& npid);
-		bool req_ticket(u32 req_id, const std::string& service_id, const std::vector<u8>& cookie);
-		bool send_message(const message_data& msg_data, const std::set<std::string>& npids);
-		bool get_board_infos(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id);
-		bool record_score(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id, SceNpScorePcId char_id, SceNpScoreValue score, const std::optional<std::string> comment, const std::optional<std::vector<u8>> score_data);
-		bool get_score_range(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id, u32 start_rank, u32 num_rank, bool with_comment, bool with_gameinfo);
-		bool get_score_npid(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id, const std::vector<std::pair<SceNpId, s32>>& npids, bool with_comment, bool with_gameinfo);
-		bool get_score_friend(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScoreBoardId board_id, bool include_self, bool with_comment, bool with_gameinfo, u32 max_entries);
-		bool record_score_data(u32 req_id, const SceNpCommunicationId& communication_id,  SceNpScorePcId pc_id, SceNpScoreBoardId board_id, s64 score, const std::vector<u8>& score_data);
-		bool get_score_data(u32 req_id, const SceNpCommunicationId& communication_id, SceNpScorePcId pc_id, SceNpScoreBoardId board_id, const SceNpId& npid);
-		bool tus_set_multislot_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, vm::cptr<s64> variableArray, s32 arrayNum, bool vuser);
-		bool tus_get_multislot_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, bool vuser);
-		bool tus_get_multiuser_variable(u32 req_id, const SceNpCommunicationId& communication_id, const std::vector<SceNpOnlineId>& targetNpIdArray, SceNpTusSlotId slotId, s32 arrayNum, bool vuser);
-		bool tus_get_friends_variable(u32 req_id, const SceNpCommunicationId& communication_id, SceNpTusSlotId slotId, bool includeSelf, s32 sortType, s32 arrayNum);
-		bool tus_add_and_get_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, s64 inVariable, vm::ptr<SceNpTusAddAndGetVariableOptParam> option, bool vuser);
-		bool tus_try_and_set_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, s32 opeType, s64 variable, vm::ptr<SceNpTusTryAndSetVariableOptParam> option, bool vuser);
-		bool tus_delete_multislot_variable(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, bool vuser);
-		bool tus_set_data(u32 req_id, SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, const std::vector<u8>& tus_data, vm::cptr<SceNpTusDataInfo> info, vm::ptr<SceNpTusSetDataOptParam> option, bool vuser);
-		bool tus_get_data(u32 req_id, SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, SceNpTusSlotId slotId, bool vuser);
-		bool tus_get_multislot_data_status(u32 req_id, SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, bool vuser);
-		bool tus_get_multiuser_data_status(u32 req_id, SceNpCommunicationId& communication_id, const std::vector<SceNpOnlineId>& targetNpIdArray, SceNpTusSlotId slotId, s32 arrayNum, bool vuser);
-		bool tus_get_friends_data_status(u32 req_id, SceNpCommunicationId& communication_id, SceNpTusSlotId slotId, bool includeSelf, s32 sortType, s32 arrayNum);
-		bool tus_delete_multislot_data(u32 req_id, SceNpCommunicationId& communication_id, const SceNpOnlineId& targetNpId, vm::cptr<SceNpTusSlotId> slotIdArray, s32 arrayNum, bool vuser);
-		bool send_presence(const SceNpCommunicationId& pr_com_id, const std::string& pr_title, const std::string& pr_status, const std::string& pr_comment, const std::vector<u8>& pr_data);
-		bool createjoin_room_gui(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatchingAttr* attr_list);
-		bool join_room_gui(u32 req_id, const SceNpRoomId& room_id);
-		bool leave_room_gui(u32 req_id, const SceNpRoomId& room_id);
-		bool get_room_list_gui(u32 req_id, const SceNpCommunicationId& communication_id, const SceNpMatchingReqRange* range, vm::ptr<SceNpMatchingSearchCondition> cond, vm::ptr<SceNpMatchingAttr> attr);
-		bool set_room_search_flag_gui(u32 req_id, const SceNpRoomId& room_id, bool stealth);
-		bool get_room_search_flag_gui(u32 req_id, const SceNpRoomId& room_id);
-		bool set_room_info_gui(u32 req_id, const SceNpRoomId& room_id, vm::ptr<SceNpMatchingAttr> attrs);
-		bool get_room_info_gui(u32 req_id, const SceNpRoomId& room_id, vm::ptr<SceNpMatchingAttr> attrs);
-		bool quickmatch_gui(u32 req_id, const SceNpCommunicationId& com_id, vm::cptr<SceNpMatchingSearchCondition> cond, s32 available_num);
-		bool searchjoin_gui(u32 req_id, const SceNpCommunicationId& com_id, vm::cptr<SceNpMatchingSearchCondition> cond, vm::cptr<SceNpMatchingAttr> attr);
-
-		const std::string& get_online_name() const;
-		const std::string& get_avatar_url() const;
-
-		u32 get_addr_sig() const;
-		u16 get_port_sig() const;
-		u32 get_addr_local() const;
-		void update_local_addr(u32 addr);
-
-	private:
-		bool get_reply(u64 expected_id, std::vector<u8>& data);
-
-		static void write_communication_id(const SceNpCommunicationId& com_id, std::vector<u8>& data);
-
-		std::vector<u8> forge_request(rpcn::CommandType command, u64 packet_id, const std::vector<u8>& data) const;
-		bool forge_send(rpcn::CommandType command, u64 packet_id, const std::vector<u8>& data);
-		bool forge_request_with_com_id(const flatbuffers::FlatBufferBuilder& builder, const SceNpCommunicationId& com_id, CommandType command, u64 packet_id);
-		bool forge_request_with_data(const flatbuffers::FlatBufferBuilder& builder, CommandType command, u64 packet_id);
-		bool forge_send_reply(rpcn::CommandType command, u64 packet_id, const std::vector<u8>& data, std::vector<u8>& reply_data);
-
-		bool error_and_disconnect(const std::string& error_mgs);
-		bool error_and_disconnect_notice(const std::string& error_msg);
-
-		std::string get_wolfssl_error(WOLFSSL* wssl, int error) const;
-
-	private:
-		WOLFSSL_CTX* wssl_ctx = nullptr;
-		WOLFSSL* read_wssl    = nullptr;
-		WOLFSSL* write_wssl   = nullptr;
-
-		atomic_t<bool> server_info_received = false;
-		u32 received_version                = 0;
-
-		sockaddr_in addr_rpcn{};
-		sockaddr_in addr_rpcn_udp_ipv4{};
-		sockaddr_in6 addr_rpcn_udp_ipv6{};
-#ifdef _WIN32
-		SOCKET sockfd = 0;
-#else
-		int sockfd = 0;
-#endif
-
-		atomic_t<u64> rpcn_request_counter = 0x100000001; // Counter used for commands whose result is not forwarded to NP handler(login, create, sendmessage, etc)
-
-		shared_mutex mutex_notifs, mutex_replies, mutex_replies_sync, mutex_presence_updates;
-		std::vector<std::pair<rpcn::NotificationType, std::vector<u8>>> notifications;       // notif type / data
-		std::unordered_map<u32, std::pair<rpcn::CommandType, std::vector<u8>>> replies;      // req id / (command / data)
-		std::unordered_map<u64, std::pair<rpcn::CommandType, std::vector<u8>>> replies_sync; // same but for sync replies(see handle_input())
-		std::unordered_map<std::string, friend_online_data> presence_updates;                // npid / presence data
-
-		// Messages
-		struct message_cb_t
-		{
-			message_cb_func cb_func;
-			void* cb_param;
-			SceNpBasicMessageMainType type_filter;
-			bool inc_bootable;
-
-			bool operator<(const message_cb_t& other) const
-			{
-				const void* void_cb_func       = reinterpret_cast<const void*>(cb_func);
-				const void* void_other_cb_func = reinterpret_cast<const void*>(other.cb_func);
-				return (void_cb_func < void_other_cb_func) || ((!(void_other_cb_func < void_cb_func)) && (cb_param < other.cb_param));
-			}
-		};
-		shared_mutex mutex_messages;
-		std::set<message_cb_t> message_cbs;
-		std::unordered_map<u64, shared_ptr<std::pair<std::string, message_data>>> messages; // msg id / (sender / message)
-		std::set<u64> active_messages;                                                           // msg id of messages that have not been discarded
-		std::vector<u64> new_messages;                                                           // list of msg_id used to inform np_handler of new messages
-		u64 message_counter = 3;                                                                 // id counter
-
-		std::string online_name{};
-		std::string avatar_url{};
-
-		s64 user_id = 0;
-
-		atomic_t<u32> addr_sig = 0;
-		atomic_t<u32> port_sig = 0; // Stores an u16, u32 is used for atomic_t::wait convenience
-		atomic_t<u32> local_addr_sig = 0;
-
-		static constexpr int RPCN_TIMEOUT_INTERVAL = 50; // 50ms
-		static constexpr int RPCN_TIMEOUT = 10'000;      // 10s
+protected:
+	enum class recvn_result
+	{
+		recvn_success,
+		recvn_nodata,
+		recvn_timeout,
+		recvn_noconn,
+		recvn_fatal,
 	};
 
-} // namespace rpcn
+	recvn_result recvn(u8* buf, usz n);
+
+	bool get_reply(u32 expected_id, std::vector<u8>& data);
+
+	std::vector<u8> forge_request(u16 command, u32 packet_id, const std::vector<u8>& data) const;
+	bool send_packet(const std::vector<u8>& packet);
+	bool forge_send(u16 command, u32 packet_id, const std::vector<u8>& data);
+	bool forge_send_reply(u16 command, u32 packet_id, const std::vector<u8>& data, std::vector<u8>& reply_data);
+
+	bool is_error(ErrorType err) const;
+	bool error_and_disconnect(const std::string& error_mgs);
+	bool is_abort() const;
+
+	std::string get_wolfssl_error(int error) const;
+
+protected:
+	atomic_t<bool> connected    = false;
+	atomic_t<bool> authentified = false;
+
+	WOLFSSL_CTX* wssl_ctx = nullptr;
+	WOLFSSL* wssl = nullptr;
+
+	bool in_config    = false;
+	bool abort_config = false;
+
+	atomic_t<bool> server_info_received = false;
+	u32 received_version                = 0;
+
+	// UDP Signaling related
+	steady_clock::time_point last_ping_time{}, last_pong_time{};
+
+	sockaddr_in addr_rpcn{};
+	sockaddr_in addr_rpcn_udp{};
+	int sockfd = 0;
+	shared_mutex mutex_socket;
+
+	shared_mutex mutex_notifs, mutex_replies, mutex_replies_sync;
+	std::vector<std::pair<u16, std::vector<u8>>> notifications;            // notif type / data
+	std::unordered_map<u32, std::pair<u16, std::vector<u8>>> replies;      // req id / (command / data)
+	std::unordered_map<u32, std::pair<u16, std::vector<u8>>> replies_sync; // same but for sync replies(Login, Create, GetServerList)
+
+	std::string online_name{};
+	std::string avatar_url{};
+
+	s64 user_id = 0;
+
+	atomic_t<u32> addr_sig{};
+	atomic_t<u16> port_sig{};
+};
diff --git a/rpcs3/Emu/NP/rpcn_config.cpp b/rpcs3/Emu/NP/rpcn_config.cpp
index b489d7d924..5588209e43 100644
--- a/rpcs3/Emu/NP/rpcn_config.cpp
+++ b/rpcs3/Emu/NP/rpcn_config.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "rpcn_config.h"
-#include "Utilities/File.h"
+#include "Emu/System.h"
 
 cfg_rpcn g_cfg_rpcn;
 
@@ -8,50 +8,41 @@ LOG_CHANNEL(rpcn_log, "rpcn");
 
 void cfg_rpcn::load()
 {
-	const std::string path = cfg_rpcn::get_path();
-
-	fs::file cfg_file(path, fs::read);
+	fs::file cfg_file(cfg_rpcn::get_path(), fs::read);
 	if (cfg_file)
 	{
-		rpcn_log.notice("Loading RPCN config. Path: %s", path);
 		from_string(cfg_file.to_string());
 	}
-	else
-	{
-		rpcn_log.notice("RPCN config missing. Using default settings. Path: %s", path);
-		from_default();
-	}
-
-	// Update config from old version(s)
-	if (version == 1)
-	{
-		password.from_string("");
-		version.set(2);
-		save();
-	}
 }
 
 void cfg_rpcn::save() const
 {
 #ifdef _WIN32
-	const std::string path_to_cfg = fs::get_config_dir(true);
+	const std::string path_to_cfg = fs::get_config_dir() + "config/";
 	if (!fs::create_path(path_to_cfg))
 	{
 		rpcn_log.error("Could not create path: %s", path_to_cfg);
 	}
 #endif
 
-	const std::string path = cfg_rpcn::get_path();
-
-	if (!cfg::node::save(path))
+	fs::file cfg_file(cfg_rpcn::get_path(), fs::rewrite);
+	if (cfg_file)
 	{
-		rpcn_log.error("Could not save config: %s (error=%s)", path, fs::g_tls_error);
+		cfg_file.write(to_string());	
+	}
+	else
+	{
+		rpcn_log.error("Could not save config: %s", cfg_rpcn::get_path());
 	}
 }
 
 std::string cfg_rpcn::get_path()
 {
-	return fs::get_config_dir(true) + "rpcn.yml";
+#ifdef _WIN32
+	return fs::get_config_dir() + "config/rpcn.yml";
+#else
+	return fs::get_config_dir() + "rpcn.yml";
+#endif
 }
 
 std::string cfg_rpcn::generate_npid()
@@ -59,9 +50,9 @@ std::string cfg_rpcn::generate_npid()
 	std::string gen_npid = "RPCS3_";
 
 	const char list_chars[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
-		'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'};
+	    'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'};
 
-	std::srand(static_cast<u32>(time(nullptr)));
+	std::srand(time(nullptr));
 
 	for (int i = 0; i < 10; i++)
 	{
@@ -76,32 +67,6 @@ std::string cfg_rpcn::get_host() const
 	return host.to_string();
 }
 
-std::vector<std::pair<std::string, std::string>> cfg_rpcn::get_hosts()
-{
-	std::vector<std::pair<std::string, std::string>> vec_hosts;
-	auto hosts_list = fmt::split(hosts.to_string(), {"|||"});
-
-	for (const auto& cur_host : hosts_list)
-	{
-		auto desc_and_host = fmt::split(cur_host, {"|"});
-		if (desc_and_host.size() != 2)
-		{
-			rpcn_log.error("Invalid host in the list of hosts: %s", cur_host);
-			continue;
-		}
-		vec_hosts.push_back(std::make_pair(std::move(desc_and_host[0]), std::move(desc_and_host[1])));
-	}
-
-	if (vec_hosts.empty())
-	{
-		hosts.from_default();
-		save();
-		return get_hosts();
-	}
-
-	return vec_hosts;
-}
-
 std::string cfg_rpcn::get_npid()
 {
 	std::string final_npid = npid.to_string();
@@ -124,120 +89,22 @@ std::string cfg_rpcn::get_token() const
 	return token.to_string();
 }
 
-bool cfg_rpcn::get_ipv6_support() const
-{
-	return ipv6_support.get();
-}
-
-void cfg_rpcn::set_host(std::string_view host)
+void cfg_rpcn::set_host(const std::string& host)
 {
 	this->host.from_string(host);
 }
 
-void cfg_rpcn::set_npid(std::string_view npid)
+void cfg_rpcn::set_npid(const std::string& npid)
 {
 	this->npid.from_string(npid);
 }
 
-void cfg_rpcn::set_password(std::string_view password)
+void cfg_rpcn::set_password(const std::string& password)
 {
 	this->password.from_string(password);
 }
 
-void cfg_rpcn::set_token(std::string_view token)
+void cfg_rpcn::set_token(const std::string& token)
 {
 	this->token.from_string(token);
 }
-
-void cfg_rpcn::set_ipv6_support(bool ipv6_support)
-{
-	this->ipv6_support.set(ipv6_support);
-}
-
-void cfg_rpcn::set_hosts(const std::vector<std::pair<std::string, std::string>>& vec_hosts)
-{
-	std::string final_string;
-	for (const auto& [cur_desc, cur_host] : vec_hosts)
-	{
-		fmt::append(final_string, "%s|%s|||", cur_desc, cur_host);
-	}
-
-	if (final_string.empty())
-	{
-		hosts.from_default();
-		return;
-	}
-
-	final_string.resize(final_string.size() - 3);
-	hosts.from_string(final_string);
-}
-
-bool cfg_rpcn::add_host(std::string_view new_description, std::string_view new_host)
-{
-	auto cur_hosts = get_hosts();
-
-	for (const auto& [cur_desc, cur_host] : cur_hosts)
-	{
-		if (cur_desc == new_description && cur_host == new_host)
-			return false;
-	}
-
-	cur_hosts.push_back(std::make_pair(std::string(new_description), std::string(new_host)));
-	set_hosts(cur_hosts);
-
-	return true;
-}
-
-bool cfg_rpcn::del_host(std::string_view del_description, std::string_view del_host)
-{
-	// Do not delete default servers
-	if ((del_description == "Official RPCN Server" && del_host == "np.rpcs3.net") ||
-		(del_description == "RPCN Test Server" && del_host == "test-np.rpcs3.net"))
-	{
-		return true;
-	}
-
-	auto cur_hosts = get_hosts();
-
-	for (auto it = cur_hosts.begin(); it != cur_hosts.end(); it++)
-	{
-		if (it->first == del_description && it->second == del_host)
-		{
-			cur_hosts.erase(it);
-			set_hosts(cur_hosts);
-			return true;
-		}
-	}
-
-	return false;
-}
-
-std::optional<std::pair<std::string, u16>> parse_rpcn_host(std::string_view host)
-{
-	if (host.empty())
-	{
-		rpcn_log.error("RPCN host is empty!");
-		return std::nullopt;
-	}
-
-	auto splithost = fmt::split(host, {":"});
-	if (splithost.size() != 1 && splithost.size() != 2)
-	{
-		rpcn_log.error("RPCN host is invalid!");
-		return std::nullopt;
-	}
-
-	u16 port = 31313;
-
-	if (splithost.size() == 2)
-	{
-		port = ::narrow<u16>(std::stoul(splithost[1]));
-		if (port == 0)
-		{
-			rpcn_log.error("RPCN port is invalid!");
-			return std::nullopt;
-		}
-	}
-
-	return std::make_pair(std::move(splithost[0]), port);
-}
diff --git a/rpcs3/Emu/NP/rpcn_config.h b/rpcs3/Emu/NP/rpcn_config.h
index a94eb053b7..9b90bd2ece 100644
--- a/rpcs3/Emu/NP/rpcn_config.h
+++ b/rpcs3/Emu/NP/rpcn_config.h
@@ -4,13 +4,10 @@
 
 struct cfg_rpcn : cfg::node
 {
-	cfg::uint32 version{this, "Version", 1};
 	cfg::string host{this, "Host", "np.rpcs3.net"};
 	cfg::string npid{this, "NPID", ""};
 	cfg::string password{this, "Password", ""};
 	cfg::string token{this, "Token", ""};
-	cfg::string hosts{this, "Hosts", "Official RPCN Server|np.rpcs3.net|||RPCN Test Server|test-np.rpcs3.net"};
-	cfg::_bool ipv6_support{this, "IPv6 support", true};
 
 	void load();
 	void save() const;
@@ -19,23 +16,15 @@ struct cfg_rpcn : cfg::node
 	std::string get_npid(); // not const because it can save if npid is requested and it has never been set
 	std::string get_password() const;
 	std::string get_token() const;
-	bool get_ipv6_support() const;
-	std::vector<std::pair<std::string, std::string>> get_hosts(); // saves default if no valid server in the list
 
-	void set_host(std::string_view host);
-	void set_npid(std::string_view npid);
-	void set_password(std::string_view password);
-	void set_token(std::string_view token);
-	void set_ipv6_support(bool ipv6_support);
-	bool add_host(std::string_view description, std::string_view host);
-	bool del_host(std::string_view description, std::string_view host);
+	void set_host(const std::string& host);
+	void set_npid(const std::string& npid);
+	void set_password(const std::string& password);
+	void set_token(const std::string& token);
 
-private:
+	private:
 	static std::string get_path();
 	static std::string generate_npid();
-	void set_hosts(const std::vector<std::pair<std::string, std::string>>& vec_hosts);
 };
 
-std::optional<std::pair<std::string, u16>> parse_rpcn_host(std::string_view host);
-
 extern cfg_rpcn g_cfg_rpcn;
diff --git a/rpcs3/Emu/NP/rpcn_countries.cpp b/rpcs3/Emu/NP/rpcn_countries.cpp
deleted file mode 100644
index 9d841d9dfd..0000000000
--- a/rpcs3/Emu/NP/rpcn_countries.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "stdafx.h"
-#include "rpcn_countries.h"
-
-namespace countries
-{
-	const std::array<country_code, 72> g_countries =
-		{
-			country_code{"Japan", "jp"},
-			country_code{"United States", "us"},
-			country_code{"Argentina", "ar"},
-			country_code{"Australia", "au"},
-			country_code{"Austria", "at"},
-			country_code{"Bahrain", "bh"},
-			country_code{"Belgium", "be"},
-			country_code{"Bolivia", "bo"},
-			country_code{"Brazil", "br"},
-			country_code{"Bulgaria", "bg"},
-			country_code{"Canada", "ca"},
-			country_code{"Chile", "cl"},
-			country_code{"China", "cn"},
-			country_code{"Colombia", "co"},
-			country_code{"Costa Rica", "cr"},
-			country_code{"Croatia", "hr"},
-			country_code{"Cyprus", "cy"},
-			country_code{"Czech Republic", "cz"},
-			country_code{"Denmark", "dk"},
-			country_code{"Ecuador", "ec"},
-			country_code{"El Salvador", "sv"},
-			country_code{"Finland", "fi"},
-			country_code{"France", "fr"},
-			country_code{"Germany", "de"},
-			country_code{"Greece", "gr"},
-			country_code{"Guatemala", "gt"},
-			country_code{"Honduras", "hn"},
-			country_code{"Hong Kong", "hk"},
-			country_code{"Hungary", "hu"},
-			country_code{"Iceland", "is"},
-			country_code{"India", "in"},
-			country_code{"Indonesia", "id"},
-			country_code{"Ireland", "ie"},
-			country_code{"Israel", "il"},
-			country_code{"Italy", "it"},
-			country_code{"Korea", "kr"},
-			country_code{"Kuwait", "kw"},
-			country_code{"Lebanon", "lb"},
-			country_code{"Luxembourg", "lu"},
-			country_code{"Malaysia", "my"},
-			country_code{"Malta", "mt"},
-			country_code{"Mexico", "mx"},
-			country_code{"Netherlands", "nl"},
-			country_code{"New Zealand", "nz"},
-			country_code{"Nicaragua", "ni"},
-			country_code{"Norway", "no"},
-			country_code{"Oman", "om"},
-			country_code{"Panama", "pa"},
-			country_code{"Paraguay", "py"},
-			country_code{"Peru", "pe"},
-			country_code{"Philippines", "ph"},
-			country_code{"Poland", "pl"},
-			country_code{"Portugal", "pt"},
-			country_code{"Qatar", "qa"},
-			country_code{"Romania", "ro"},
-			country_code{"Russia", "ru"},
-			country_code{"Saudi Arabia", "sa"},
-			country_code{"Serbia", "rs"},
-			country_code{"Singapore", "sg"},
-			country_code{"Slovakia", "sk"},
-			country_code{"South Africa", "za"},
-			country_code{"Spain", "es"},
-			country_code{"Sweden", "se"},
-			country_code{"Switzerland", "ch"},
-			country_code{"Taiwan", "tw"},
-			country_code{"Thailand", "th"},
-			country_code{"Turkey", "tr"},
-			country_code{"Ukraine", "ua"},
-			country_code{"United Arab Emirates", "ae"},
-			country_code{"United Kingdom", "gb"},
-			country_code{"Uruguay", "uy"},
-			country_code{"Vietnam", "vn"}
-		};
-} // namespace countries
-
diff --git a/rpcs3/Emu/NP/rpcn_countries.h b/rpcs3/Emu/NP/rpcn_countries.h
deleted file mode 100644
index 5c7e00fb4d..0000000000
--- a/rpcs3/Emu/NP/rpcn_countries.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include <array>
-#include <string_view>
-
-namespace countries
-{
-	struct country_code
-	{
-		std::string_view name;
-		std::string_view ccode;
-	};
-	extern const std::array<country_code, 72> g_countries;
-} // namespace countries
-
diff --git a/rpcs3/Emu/NP/rpcn_types.h b/rpcs3/Emu/NP/rpcn_types.h
deleted file mode 100644
index 684f0e65e9..0000000000
--- a/rpcs3/Emu/NP/rpcn_types.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-
-namespace rpcn
-{
-	enum class CommandType : u16
-	{
-		Login,
-		Terminate,
-		Create,
-		SendToken,
-		SendResetToken,
-		ResetPassword,
-		ResetState,
-		AddFriend,
-		RemoveFriend,
-		AddBlock,
-		RemoveBlock,
-		GetServerList,
-		GetWorldList,
-		CreateRoom,
-		JoinRoom,
-		LeaveRoom,
-		SearchRoom,
-		GetRoomDataExternalList,
-		SetRoomDataExternal,
-		GetRoomDataInternal,
-		SetRoomDataInternal,
-		GetRoomMemberDataInternal,
-		SetRoomMemberDataInternal,
-		SetUserInfo,
-		PingRoomOwner,
-		SendRoomMessage,
-		RequestSignalingInfos,
-		RequestTicket,
-		SendMessage,
-		GetBoardInfos,
-		RecordScore,
-		RecordScoreData,
-		GetScoreData,
-		GetScoreRange,
-		GetScoreFriends,
-		GetScoreNpid,
-		GetNetworkTime,
-		TusSetMultiSlotVariable,
-		TusGetMultiSlotVariable,
-		TusGetMultiUserVariable,
-		TusGetFriendsVariable,
-		TusAddAndGetVariable,
-		TusTryAndSetVariable,
-		TusDeleteMultiSlotVariable,
-		TusSetData,
-		TusGetData,
-		TusGetMultiSlotDataStatus,
-		TusGetMultiUserDataStatus,
-		TusGetFriendsDataStatus,
-		TusDeleteMultiSlotData,
-		SetPresence,
-		CreateRoomGUI,
-		JoinRoomGUI,
-		LeaveRoomGUI,
-		GetRoomListGUI,
-		SetRoomSearchFlagGUI,
-		GetRoomSearchFlagGUI,
-		SetRoomInfoGUI,
-		GetRoomInfoGUI,
-		QuickMatchGUI,
-		SearchJoinRoomGUI,
-	};
-
-	enum class NotificationType : u16
-	{
-		UserJoinedRoom,
-		UserLeftRoom,
-		RoomDestroyed,
-		UpdatedRoomDataInternal,
-		UpdatedRoomMemberDataInternal,
-		FriendQuery,  // Other user sent a friend request
-		FriendNew,    // Add a friend to the friendlist(either accepted a friend request or friend accepted it)
-		FriendLost,   // Remove friend from the friendlist(user removed friend or friend removed friend)
-		FriendStatus, // Set status of friend to Offline or Online
-		RoomMessageReceived,
-		MessageReceived,
-		FriendPresenceChanged,
-		SignalingHelper,
-		MemberJoinedRoomGUI,
-		MemberLeftRoomGUI,
-		RoomDisappearedGUI,
-		RoomOwnerChangedGUI,
-		UserKickedGUI,
-		QuickMatchCompleteGUI,
-	};
-
-	enum class rpcn_state
-	{
-		failure_no_failure,
-		failure_input,
-		failure_wolfssl,
-		failure_resolve,
-		failure_binding,
-		failure_connect,
-		failure_id,
-		failure_id_already_logged_in,
-		failure_id_username,
-		failure_id_password,
-		failure_id_token,
-		failure_protocol,
-		failure_other,
-	};
-
-	enum class PacketType : u8
-	{
-		Request,
-		Reply,
-		Notification,
-		ServerInfo,
-	};
-
-	enum class ErrorType : u8
-	{
-		NoError,                     // No error
-		Malformed,                   // Query was malformed, critical error that should close the connection
-		Invalid,                     // The request type is invalid(wrong stage?)
-		InvalidInput,                // The Input doesn't fit the constraints of the request
-		TooSoon,                     // Time limited operation attempted too soon
-		LoginError,                  // An error happened related to login
-		LoginAlreadyLoggedIn,        // Can't log in because you're already logged in
-		LoginInvalidUsername,        // Invalid username
-		LoginInvalidPassword,        // Invalid password
-		LoginInvalidToken,           // Invalid token
-		CreationError,               // An error happened related to account creation
-		CreationExistingUsername,    // Specific to Account Creation: username exists already
-		CreationBannedEmailProvider, // Specific to Account Creation: the email provider is banned
-		CreationExistingEmail,       // Specific to Account Creation: that email is already registered to an account
-		RoomMissing,                 // User tried to interact with a non existing room
-		RoomAlreadyJoined,           // User tried to join a room he's already part of
-		RoomFull,                    // User tried to join a full room
-		RoomPasswordMismatch,        // Room password didn't match
-		RoomPasswordMissing,         // A password was missing during room creation
-		RoomGroupNoJoinLabel,        // Tried to join a group room without a label
-		RoomGroupFull,               // Room group is full
-		RoomGroupJoinLabelNotFound,  // Join label was invalid in some way
-		RoomGroupMaxSlotMismatch,    // Mismatch between max_slot and the listed slots in groups
-		Unauthorized,                // User attempted an unauthorized operation
-		DbFail,                      // Generic failure on db side
-		EmailFail,                   // Generic failure related to email
-		NotFound,                    // Object of the query was not found(user, etc), use RoomMissing for rooms instead
-		Blocked,                     // The operation can't complete because you've been blocked
-		AlreadyFriend,               // Can't add friend because already friend
-		ScoreNotBest,                // A better score is already registered for that user/character_id
-		ScoreInvalid,                // Score for player was found but wasn't what was expected
-		ScoreHasData,                // Score already has data
-		CondFail,                    // Condition related to query failed
-		Unsupported,
-	};
-} // namespace rpcn
diff --git a/rpcs3/Emu/NP/signaling_handler.cpp b/rpcs3/Emu/NP/signaling_handler.cpp
index 2e4ac5df56..917d59df7f 100644
--- a/rpcs3/Emu/NP/signaling_handler.cpp
+++ b/rpcs3/Emu/NP/signaling_handler.cpp
@@ -1,12 +1,9 @@
-#include "Emu/NP/ip_address.h"
 #include "stdafx.h"
-#include "Emu/Cell/PPUCallback.h"
+#include "Emu/Cell/PPUModule.h"
 #include "signaling_handler.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/Modules/cellSysutil.h"
 #include "np_handler.h"
-#include "Emu/NP/vport0.h"
-#include "Emu/NP/np_helpers.h"
 
 #ifdef _WIN32
 #include <winsock2.h>
@@ -18,142 +15,105 @@
 
 LOG_CHANNEL(sign_log, "Signaling");
 
+std::vector<std::pair<std::pair<u32, u16>, std::vector<u8>>> get_sign_msgs();
+s32 send_packet_from_p2p_port(const std::vector<u8>& data, const sockaddr_in& addr);
+void need_network();
+
 template <>
 void fmt_class_string<SignalingCommand>::format(std::string& out, u64 arg)
 {
 	format_enum(out, arg, [](auto value)
+	{
+		switch (value)
 		{
-			switch (value)
-			{
-			case signal_ping: return "PING";
-			case signal_pong: return "PONG";
-			case signal_connect: return "CONNECT";
-			case signal_connect_ack: return "CONNECT_ACK";
-			case signal_confirm: return "CONFIRM";
-			case signal_finished: return "FINISHED";
-			case signal_finished_ack: return "FINISHED_ACK";
-			case signal_info: return "INFO";
-			}
+		case signal_ping: return "PING";
+		case signal_pong: return "PONG";
+		case signal_connect: return "CONNECT";
+		case signal_connect_ack: return "CONNECT_ACK";
+		case signal_confirm: return "CONFIRM";
+		case signal_finished: return "FINISHED";
+		case signal_finished_ack: return "FINISHED_ACK";
+		}
 
-			return unknown;
-		});
+		return unknown;
+	});
 }
 
 signaling_handler::signaling_handler()
 {
+	need_network();
 }
 
 /////////////////////////////
 //// SIGNALING CALLBACKS ////
 /////////////////////////////
 
-void signaling_handler::add_sig_ctx(u32 ctx_id)
+void signaling_handler::set_sig_cb(u32 sig_cb_ctx, vm::ptr<SceNpSignalingHandler> sig_cb, vm::ptr<void> sig_cb_arg)
 {
 	std::lock_guard lock(data_mutex);
-	sig_ctx_lst.insert(ctx_id);
+	this->sig_cb_ctx = sig_cb_ctx;
+	this->sig_cb     = sig_cb;
+	this->sig_cb_arg = sig_cb_arg;
 }
 
-void signaling_handler::remove_sig_ctx(u32 ctx_id)
+void signaling_handler::set_ext_sig_cb(u32 sig_ext_cb_ctx, vm::ptr<SceNpSignalingHandler> sig_ext_cb, vm::ptr<void> sig_ext_cb_arg)
 {
 	std::lock_guard lock(data_mutex);
-	sig_ctx_lst.erase(ctx_id);
+	this->sig_ext_cb_ctx = sig_ext_cb_ctx;
+	this->sig_ext_cb     = sig_ext_cb;
+	this->sig_ext_cb_arg = sig_ext_cb_arg;
 }
 
-void signaling_handler::clear_sig_ctx()
+void signaling_handler::set_sig2_cb(u16 sig2_cb_ctx, vm::ptr<SceNpMatching2SignalingCallback> sig2_cb, vm::ptr<void> sig2_cb_arg)
 {
 	std::lock_guard lock(data_mutex);
-	sig_ctx_lst.clear();
+	this->sig2_cb_ctx = sig2_cb_ctx;
+	this->sig2_cb     = sig2_cb;
+	this->sig2_cb_arg = sig2_cb_arg;
 }
 
-void signaling_handler::add_match2_ctx(u16 ctx_id)
+void signaling_handler::signal_sig_callback(u32 conn_id, int event)
 {
-	std::lock_guard lock(data_mutex);
-	match2_ctx_lst.insert(ctx_id);
-}
-
-void signaling_handler::remove_match2_ctx(u16 ctx_id)
-{
-	std::lock_guard lock(data_mutex);
-	match2_ctx_lst.erase(ctx_id);
-}
-
-void signaling_handler::clear_match2_ctx()
-{
-	std::lock_guard lock(data_mutex);
-	match2_ctx_lst.clear();
-}
-
-void signaling_handler::signal_sig_callback(u32 conn_id, s32 event, s32 error_code)
-{
-	for (const auto& ctx_id : sig_ctx_lst)
+	if (sig_cb)
 	{
-		const auto ctx = get_signaling_context(ctx_id);
-
-		if (!ctx)
-			continue;
-
-		std::lock_guard lock(ctx->mutex);
-
-		if (ctx->handler)
+		sysutil_register_cb([sig_cb = this->sig_cb, sig_cb_ctx = this->sig_cb_ctx, conn_id, event, sig_cb_arg = this->sig_cb_arg](ppu_thread& cb_ppu) -> s32
 		{
-			sysutil_register_cb([sig_cb = ctx->handler, sig_cb_ctx = ctx_id, conn_id, event, error_code, sig_cb_arg = ctx->arg](ppu_thread& cb_ppu) -> s32
-				{
-					sig_cb(cb_ppu, sig_cb_ctx, conn_id, event, error_code, sig_cb_arg);
-					return 0;
-				});
-			sign_log.notice("Called sig CB: 0x%x (conn_id: %d)", event, conn_id);
-		}
+			sig_cb(cb_ppu, sig_cb_ctx, conn_id, event, 0, sig_cb_arg);
+			return 0;
+		});
+		sign_log.notice("Called sig CB: 0x%x (conn_id: %d)", event, conn_id);
 	}
 
 	// extended callback also receives normal events
-	signal_ext_sig_callback(conn_id, event, error_code);
+	signal_ext_sig_callback(conn_id, event);
 }
 
-void signaling_handler::signal_ext_sig_callback(u32 conn_id, s32 event, s32 error_code) const
+void signaling_handler::signal_ext_sig_callback(u32 conn_id, int event) const
 {
-	for (const auto ctx_id : sig_ctx_lst)
+	if (sig_ext_cb)
 	{
-		const auto ctx = get_signaling_context(ctx_id);
-
-		if (!ctx)
-			continue;
-
-		std::lock_guard lock(ctx->mutex);
-
-		if (ctx->ext_handler)
+		sysutil_register_cb([sig_ext_cb = this->sig_ext_cb, sig_ext_cb_ctx = this->sig_ext_cb_ctx, conn_id, event, sig_ext_cb_arg = this->sig_ext_cb_arg](ppu_thread& cb_ppu) -> s32
 		{
-			sysutil_register_cb([sig_ext_cb = ctx->ext_handler, sig_ext_cb_ctx = ctx_id, conn_id, event, error_code, sig_ext_cb_arg = ctx->ext_arg](ppu_thread& cb_ppu) -> s32
-				{
-					sig_ext_cb(cb_ppu, sig_ext_cb_ctx, conn_id, event, error_code, sig_ext_cb_arg);
-					return 0;
-				});
-			sign_log.notice("Called EXT sig CB: 0x%x (conn_id: %d)", event, conn_id);
-		}
+			sig_ext_cb(cb_ppu, sig_ext_cb_ctx, conn_id, event, 0, sig_ext_cb_arg);
+			return 0;
+		});
+		sign_log.notice("Called EXT sig CB: 0x%x (conn_id: %d, member_id: %d)", event, conn_id);
 	}
 }
 
-void signaling_handler::signal_sig2_callback(u64 room_id, u16 member_id, SceNpMatching2Event event, s32 error_code) const
+void signaling_handler::signal_sig2_callback(u64 room_id, u16 member_id, SceNpMatching2Event event) const
 {
-	if (room_id)
+	// Signal the callback
+	if (sig2_cb)
 	{
-		for (const auto ctx_id : match2_ctx_lst)
+		sysutil_register_cb([sig2_cb = this->sig2_cb, sig2_cb_ctx = this->sig2_cb_ctx, room_id, member_id, event, sig2_cb_arg = this->sig2_cb_arg](ppu_thread& cb_ppu) -> s32
 		{
-			const auto ctx = get_match2_context(ctx_id);
-
-			if (!ctx)
-				continue;
-
-			if (ctx->signaling_cb)
-			{
-				sysutil_register_cb([sig2_cb = ctx->signaling_cb, sig2_cb_ctx = ctx_id, room_id, member_id, event, error_code, sig2_cb_arg = ctx->signaling_cb_arg](ppu_thread& cb_ppu) -> s32
-					{
-						sig2_cb(cb_ppu, sig2_cb_ctx, room_id, member_id, event, error_code, sig2_cb_arg);
-						return 0;
-					});
-				sign_log.notice("Called sig2 CB: 0x%x (room_id: %d, member_id: %d)", event, room_id, member_id);
-			}
-		}
+			sig2_cb(cb_ppu, sig2_cb_ctx, room_id, member_id, event, 0, sig2_cb_arg);
+			return 0;
+		});
 	}
+
+	sign_log.notice("Called sig2 CB: 0x%x (room_id: %d, member_id: %d)", event, room_id, member_id);
 }
 
 ///////////////////////////////////
@@ -166,7 +126,7 @@ void signaling_handler::reschedule_packet(std::shared_ptr<signaling_info>& si, S
 	{
 		if (it->second.packet.command == cmd && it->second.sig_info == si)
 		{
-			auto new_queue = qpackets.extract(it);
+			auto new_queue  = qpackets.extract(it);
 			new_queue.key() = new_timepoint;
 			qpackets.insert(std::move(new_queue));
 			return;
@@ -205,76 +165,80 @@ bool signaling_handler::validate_signaling_packet(const signaling_packet* sp)
 		return false;
 	}
 
-	if (sp->version != SIGNALING_VERSION)
+	if (sp->version != 1u && sp->version != 2u)
 	{
-		sign_log.error("Invalid version in signaling packet: %d, expected: %d", sp->version, SIGNALING_VERSION);
-
-		if (sp->version > SIGNALING_VERSION)
-			sign_log.error("You are most likely using an outdated version of RPCS3");
-		else
-			sign_log.error("The other user is most likely using an outdated version of RPCS3");
-
-		return false;
-	}
-
-	if (!np::is_valid_npid(sp->npid))
-	{
-		sign_log.error("Invalid npid in signaling packet");
+		sign_log.error("Invalid version in signaling packet");
 		return false;
 	}
 
 	return true;
 }
 
-u64 signaling_handler::get_micro_timestamp(const std::chrono::steady_clock::time_point& time_point)
-{
-	return std::chrono::duration_cast<std::chrono::microseconds>(time_point.time_since_epoch()).count();
-}
-
 void signaling_handler::process_incoming_messages()
 {
 	auto msgs = get_sign_msgs();
 
 	for (const auto& msg : msgs)
 	{
-		if (msg.data.size() != sizeof(signaling_packet))
+		if (msg.second.size() != sizeof(signaling_packet))
 		{
 			sign_log.error("Received an invalid signaling packet");
 			continue;
 		}
 
-		auto op_addr = msg.src_addr;
-		auto op_port = msg.src_port;
-		const auto* sp = reinterpret_cast<const signaling_packet*>(msg.data.data());
+		auto op_addr = msg.first.first;
+		auto op_port = msg.first.second;
+		auto* sp     = reinterpret_cast<const signaling_packet*>(msg.second.data());
 
 		if (!validate_signaling_packet(sp))
 			continue;
 
-		if (sign_log.trace)
+		if (sign_log.enabled == logs::level::trace)
 		{
-			in_addr addr{};
+			in_addr addr;
 			addr.s_addr = op_addr;
-			char ip_str[16];
-			inet_ntop(AF_INET, &addr, ip_str, sizeof(ip_str));
-			std::string_view npid(sp->npid.handle.data);
 
-			sign_log.trace("SP %s from %s:%d(npid: %s)", sp->command, ip_str, op_port, npid);
+			if (sp->version == 1u)
+			{
+				char npid_buf[17]{};
+				memcpy(npid_buf, sp->V1.npid.handle.data, 16);
+				std::string npid(npid_buf);
+
+				char ip_str[16];
+				inet_ntop(AF_INET, &addr, ip_str, sizeof(ip_str));
+
+				sign_log.trace("sig1 %s from %s:%d(%s)", sp->command, ip_str, op_port, npid);
+			}
+			else
+			{
+				char inet_addr[16];
+				const char* inet_addr_string = inet_ntop(AF_INET, &addr, inet_addr, sizeof(inet_addr));
+
+				sign_log.trace("sig2 %s from %s:%d(%d:%d)", sp->command, inet_addr_string, op_port, sp->V2.room_id, sp->V2.member_id);
+			}
 		}
 
 		bool reply = false, schedule_repeat = false;
-		auto& sent_packet = sig_packet;
+		auto& sent_packet = sp->version == 1u ? sig1_packet : sig2_packet;
 
 		// Get signaling info for user to know if we should even bother looking further
 		auto si = get_signaling_ptr(sp);
 
-		if (!si && (sp->command == signal_connect || sp->command == signal_info))
+		if (!si && sp->version == 1u && sp->command == signal_connect)
 		{
 			// Connection can be remotely established and not mutual
-			const u32 conn_id = get_always_conn_id(sp->npid);
-			si = ::at32(sig_peers, conn_id);
+			const u32 conn_id = create_sig_infos(&sp->V1.npid);
+			si = sig1_peers.at(conn_id);
+			// Activate the connection without triggering the main CB
+			si->connStatus = SCE_NP_SIGNALING_CONN_STATUS_ACTIVE;
+			si->addr = op_addr;
+			si->port = op_port;
+			si->ext_status = ext_sign_peer;
+			// Notify extended callback that peer activated
+			signal_ext_sig_callback(conn_id, SCE_NP_SIGNALING_EVENT_EXT_PEER_ACTIVATED);
 		}
 
-		if (!si && sp->command != signal_finished)
+		if (!si || (si->connStatus == SCE_NP_SIGNALING_CONN_STATUS_INACTIVE && sp->command != signal_finished))
 		{
 			// User is unknown to us or the connection is inactive
 			// Ignore packet unless it's a finished packet in case the finished_ack wasn't received by opponent
@@ -296,88 +260,57 @@ void signaling_handler::process_incoming_messages()
 			}
 
 			sent_packet.command = signal_ping;
-			sent_packet.timestamp_sender = get_micro_timestamp(now);
-			send_signaling_packet(sent_packet, si->addr, si->port);
 			queue_signaling_packet(sent_packet, si, now + REPEAT_PING_DELAY);
 		};
 
-		const auto update_rtt = [&](u64 rtt_timestamp)
-		{
-			u64 timestamp_now = get_micro_timestamp(now);
-			u64 rtt = timestamp_now - rtt_timestamp;
-			si->last_rtts[(si->rtt_counters % 6)] = rtt;
-			si->rtt_counters++;
-
-			usz num_rtts = std::min(static_cast<std::size_t>(6), si->rtt_counters);
-			u64 sum = 0;
-			for (usz index = 0; index < num_rtts; index++)
-			{
-				sum += si->last_rtts[index];
-			}
-
-			si->rtt = ::narrow<u32>(sum / num_rtts);
-		};
-
 		switch (sp->command)
 		{
 		case signal_ping:
-			reply = true;
-			schedule_repeat = false;
+			reply               = true;
+			schedule_repeat     = false;
 			sent_packet.command = signal_pong;
-			sent_packet.timestamp_sender = sp->timestamp_sender;
 			break;
 		case signal_pong:
-			update_rtt(sp->timestamp_sender);
-			reply = false;
-			schedule_repeat = false;
-			reschedule_packet(si, signal_ping, now + 10s);
-			break;
-		case signal_info:
-			update_si_addr(si, op_addr, op_port);
-			reply = false;
+			reply           = false;
 			schedule_repeat = false;
+			reschedule_packet(si, signal_ping, now + 15s);
 			break;
 		case signal_connect:
-			reply = true;
-			schedule_repeat = true;
+			reply               = true;
+			schedule_repeat     = true;
 			sent_packet.command = signal_connect_ack;
-			sent_packet.timestamp_sender = sp->timestamp_sender;
-			sent_packet.timestamp_receiver = get_micro_timestamp(now);
-			update_si_addr(si, op_addr, op_port);
+			// connection is established
+			// TODO: notify extended callback!
 			break;
 		case signal_connect_ack:
-			update_rtt(sp->timestamp_sender);
-			reply = true;
+			reply           = true;
 			schedule_repeat = false;
 			setup_ping();
 			sent_packet.command = signal_confirm;
-			sent_packet.timestamp_receiver = sp->timestamp_receiver;
 			retire_packet(si, signal_connect);
+			// connection is active
 			update_si_addr(si, op_addr, op_port);
-			update_si_mapped_addr(si, sp->sent_addr, sp->sent_port);
-			update_si_status(si, SCE_NP_SIGNALING_CONN_STATUS_ACTIVE, CELL_OK);
+			update_si_status(si, SCE_NP_SIGNALING_CONN_STATUS_ACTIVE);
 			break;
 		case signal_confirm:
-			update_rtt(sp->timestamp_receiver);
-			reply = false;
+			reply           = false;
 			schedule_repeat = false;
 			setup_ping();
 			retire_packet(si, signal_connect_ack);
+			// connection is active
 			update_si_addr(si, op_addr, op_port);
-			update_si_mapped_addr(si, sp->sent_addr, sp->sent_port);
-			update_ext_si_status(si, true);
+			update_si_status(si, SCE_NP_SIGNALING_CONN_STATUS_ACTIVE, true);
 			break;
 		case signal_finished:
-			reply = true;
-			schedule_repeat = false;
+			reply               = true;
+			schedule_repeat     = false;
 			sent_packet.command = signal_finished_ack;
-			update_ext_si_status(si, false);
-			update_si_status(si, SCE_NP_SIGNALING_CONN_STATUS_INACTIVE, SCE_NP_SIGNALING_ERROR_TERMINATED_BY_PEER);
+			// terminate connection
+			update_si_status(si, SCE_NP_SIGNALING_CONN_STATUS_INACTIVE);
 			break;
 		case signal_finished_ack:
-			reply = false;
+			reply           = false;
 			schedule_repeat = false;
-			update_si_status(si, SCE_NP_SIGNALING_CONN_STATUS_INACTIVE, SCE_NP_SIGNALING_ERROR_TERMINATED_BY_MYSELF);
 			retire_packet(si, signal_finished);
 			break;
 		default: sign_log.error("Invalid signaling command received"); continue;
@@ -394,63 +327,40 @@ void signaling_handler::process_incoming_messages()
 
 void signaling_handler::operator()()
 {
-	atomic_wait_timeout timeout = atomic_wait_timeout::inf;
-
 	while (thread_ctrl::state() != thread_state::aborting)
 	{
-		if (!wakey)
-		{
-			wakey.wait(0, timeout);
-		}
-
-		wakey = 0;
+		std::unique_lock<std::mutex> lock(data_mutex);
+		if (!qpackets.empty())
+			wakey.wait_until(lock, qpackets.begin()->first);
+		else
+			wakey.wait(lock);
 
 		if (thread_ctrl::state() == thread_state::aborting)
 			return;
 
-		std::lock_guard lock(data_mutex);
-
 		process_incoming_messages();
 
 		const auto now = steady_clock::now();
 
 		for (auto it = qpackets.begin(); it != qpackets.end();)
 		{
-			auto& [timestamp, sig] = *it;
-
-			if (timestamp > now)
+			if (it->first > now)
 				break;
 
-			SignalingCommand cmd = sig.packet.command;
-
-			if (sig.sig_info->time_last_msg_recvd < now - 60s && cmd != signal_info)
+			if (it->second.sig_info->time_last_msg_recvd < now - 60s)
 			{
 				// We had no connection to opponent for 60 seconds, consider the connection dead
-				sign_log.notice("Timeout disconnection");
-				update_si_status(sig.sig_info, SCE_NP_SIGNALING_CONN_STATUS_INACTIVE, SCE_NP_SIGNALING_ERROR_TIMEOUT);
-				retire_packet(sig.sig_info, signal_ping); // Retire ping packet if necessary
-				break; // qpackets has been emptied of all packets for this user so we're requeuing
-			}
-
-			// Update the timestamp if necessary
-			switch (sig.packet.command)
-			{
-			case signal_connect:
-			case signal_ping:
-				sig.packet.timestamp_sender = get_micro_timestamp(now);
-				break;
-			case signal_connect_ack:
-				sig.packet.timestamp_receiver = get_micro_timestamp(now);
-				break;
-			default:
-				break;
+				sign_log.trace("Timeout disconnection");
+				update_si_status(it->second.sig_info, SCE_NP_SIGNALING_CONN_STATUS_INACTIVE);
+				break; // qpackets will be emptied of all packets from this user so we're requeuing
 			}
 
 			// Resend the packet
-			send_signaling_packet(sig.packet, sig.sig_info->addr, sig.sig_info->port);
+			send_signaling_packet(it->second.packet, it->second.sig_info->addr, it->second.sig_info->port);
 
 			// Reschedule another packet
-			auto& si = sig.sig_info;
+			SignalingCommand cmd = it->second.packet.command;
+			auto& si             = it->second.sig_info;
 
 			std::chrono::milliseconds delay(500);
 			switch (cmd)
@@ -468,53 +378,21 @@ void signaling_handler::operator()()
 			case signal_finished_ack:
 				delay = REPEAT_FINISHED_DELAY;
 				break;
-			case signal_info:
-				// Don't reschedule
-				if (si->info_counter == 0)
-				{
-					it = qpackets.erase(it);
-					continue;
-				}
-
-				delay = REPEAT_INFO_DELAY;
-				si->info_counter--;
-				break;
 			}
 
 			it++;
-
 			reschedule_packet(si, cmd, now + delay);
 		}
-
-		if (!qpackets.empty())
-		{
-			const auto current_timepoint = steady_clock::now();
-			const auto expected_timepoint = qpackets.begin()->first;
-			if (current_timepoint > expected_timepoint)
-			{
-				wakey = 1;
-			}
-			else
-			{
-				timeout = static_cast<atomic_wait_timeout>(std::chrono::duration_cast<std::chrono::nanoseconds>(expected_timepoint - current_timepoint).count());
-			}
-		}
-		else
-		{
-			timeout = atomic_wait_timeout::inf;
-		}
 	}
 }
 
 void signaling_handler::wake_up()
 {
-	wakey.release(1);
 	wakey.notify_one();
 }
 
 signaling_handler& signaling_handler::operator=(thread_state)
 {
-	wakey.release(1);
 	wakey.notify_one();
 	return *this;
 }
@@ -525,138 +403,89 @@ void signaling_handler::update_si_addr(std::shared_ptr<signaling_info>& si, u32
 
 	if (si->addr != new_addr || si->port != new_port)
 	{
-		if (sign_log.trace)
-		{
-			in_addr addr_old, addr_new;
-			addr_old.s_addr = si->addr;
-			addr_new.s_addr = new_addr;
+		in_addr addr_old, addr_new;
+		addr_old.s_addr = si->addr;
+		addr_new.s_addr = new_addr;
 
-			char ip_str_old[16];
-			char ip_str_new[16];
-			inet_ntop(AF_INET, &addr_old, ip_str_old, sizeof(ip_str_old));
-			inet_ntop(AF_INET, &addr_new, ip_str_new, sizeof(ip_str_new));
-
-			sign_log.trace("Updated Address from %s:%d to %s:%d", ip_str_old, si->port, ip_str_new, new_port);
-		}
+		char ip_str_old[16];
+		char ip_str_new[16];
+		inet_ntop(AF_INET, &addr_old, ip_str_old, sizeof(ip_str_old));
+		inet_ntop(AF_INET, &addr_new, ip_str_new, sizeof(ip_str_new));
 
+		sign_log.trace("Updated Address from %s:%d to %s:%d", ip_str_old, si->port, ip_str_new, new_port);
 		si->addr = new_addr;
 		si->port = new_port;
 	}
 }
 
-void signaling_handler::update_si_mapped_addr(std::shared_ptr<signaling_info>& si, u32 new_addr, u16 new_port)
-{
-	ensure(si);
-
-	// If the address given to us by op is a translation IP, just replace it with our public ip(v4)
-	if (np::is_ipv6_supported() && np::ip_address_translator::is_ipv6(new_addr))
-	{
-		auto& nph = g_fxo->get<named_thread<np::np_handler>>();
-		new_addr = nph.get_public_ip_addr();
-	}
-
-	if (si->mapped_addr != new_addr || si->mapped_port != new_port)
-	{
-		if (sign_log.trace)
-		{
-			in_addr addr_old, addr_new;
-			addr_old.s_addr = si->mapped_addr;
-			addr_new.s_addr = new_addr;
-
-			char ip_str_old[16];
-			char ip_str_new[16];
-			inet_ntop(AF_INET, &addr_old, ip_str_old, sizeof(ip_str_old));
-			inet_ntop(AF_INET, &addr_new, ip_str_new, sizeof(ip_str_new));
-
-			sign_log.trace("Updated Mapped Address from %s:%d to %s:%d", ip_str_old, si->mapped_port, ip_str_new, new_port);
-		}
-
-		si->mapped_addr = new_addr;
-		si->mapped_port = new_port;
-	}
-}
-
-void signaling_handler::update_si_status(std::shared_ptr<signaling_info>& si, s32 new_status, s32 error_code)
+void signaling_handler::update_si_status(std::shared_ptr<signaling_info>& si, s32 new_status, bool confirm_packet)
 {
 	if (!si)
 		return;
 
-	if (si->conn_status == SCE_NP_SIGNALING_CONN_STATUS_PENDING && new_status == SCE_NP_SIGNALING_CONN_STATUS_ACTIVE)
+	if (si->connStatus == SCE_NP_SIGNALING_CONN_STATUS_PENDING && new_status == SCE_NP_SIGNALING_CONN_STATUS_ACTIVE)
 	{
-		si->conn_status = SCE_NP_SIGNALING_CONN_STATUS_ACTIVE;
-
-		signal_sig_callback(si->conn_id, SCE_NP_SIGNALING_EVENT_ESTABLISHED, error_code);
-		signal_sig2_callback(si->room_id, si->member_id, SCE_NP_MATCHING2_SIGNALING_EVENT_Established, error_code);
-
-		if (si->op_activated)
-			signal_ext_sig_callback(si->conn_id, SCE_NP_SIGNALING_EVENT_EXT_MUTUAL_ACTIVATED, CELL_OK);
-	}
-	else if ((si->conn_status == SCE_NP_SIGNALING_CONN_STATUS_PENDING || si->conn_status == SCE_NP_SIGNALING_CONN_STATUS_ACTIVE) && new_status == SCE_NP_SIGNALING_CONN_STATUS_INACTIVE)
-	{
-		si->conn_status = SCE_NP_SIGNALING_CONN_STATUS_INACTIVE;
-		signal_sig_callback(si->conn_id, SCE_NP_SIGNALING_EVENT_DEAD, error_code);
-		signal_sig2_callback(si->room_id, si->member_id, SCE_NP_MATCHING2_SIGNALING_EVENT_Dead, error_code);
-		retire_all_packets(si);
-	}
-}
-
-void signaling_handler::update_ext_si_status(std::shared_ptr<signaling_info>& si, bool op_activated)
-{
-	if (!si)
-		return;
-
-	if (op_activated && !si->op_activated)
-	{
-		si->op_activated = true;
-
-		if (si->conn_status != SCE_NP_SIGNALING_CONN_STATUS_ACTIVE)
-			signal_ext_sig_callback(si->conn_id, SCE_NP_SIGNALING_EVENT_EXT_PEER_ACTIVATED, CELL_OK);
+		si->connStatus = SCE_NP_SIGNALING_CONN_STATUS_ACTIVE;
+		ensure(si->version == 1u || si->version == 2u);
+		if (si->version == 1u)
+			signal_sig_callback(si->conn_id, SCE_NP_SIGNALING_EVENT_ESTABLISHED);
 		else
-			signal_ext_sig_callback(si->conn_id, SCE_NP_SIGNALING_EVENT_EXT_MUTUAL_ACTIVATED, CELL_OK);
-	}
-	else if (!op_activated && si->op_activated)
-	{
-		si->op_activated = false;
+			signal_sig2_callback(si->room_id, si->member_id, SCE_NP_MATCHING2_SIGNALING_EVENT_Established);
 
-		signal_ext_sig_callback(si->conn_id, SCE_NP_SIGNALING_EVENT_EXT_PEER_DEACTIVATED, CELL_OK);
+		return;
+	}
+
+	if ((si->connStatus == SCE_NP_SIGNALING_CONN_STATUS_PENDING || si->connStatus == SCE_NP_SIGNALING_CONN_STATUS_ACTIVE) && new_status == SCE_NP_SIGNALING_CONN_STATUS_INACTIVE)
+	{
+		si->connStatus = SCE_NP_SIGNALING_CONN_STATUS_INACTIVE;
+		ensure(si->version == 1u || si->version == 2u);
+		if (si->version == 1u)
+			signal_sig_callback(si->conn_id, SCE_NP_SIGNALING_EVENT_DEAD);
+		else
+			signal_sig2_callback(si->room_id, si->member_id, SCE_NP_MATCHING2_SIGNALING_EVENT_Dead);
+
+		retire_all_packets(si);
+		return;
+	}
+
+	if (confirm_packet && si->version == 1u && si->ext_status == ext_sign_none)
+	{
+		si->ext_status = ext_sign_mutual;
+		signal_ext_sig_callback(si->conn_id, SCE_NP_SIGNALING_EVENT_EXT_MUTUAL_ACTIVATED);
 	}
 }
 
 void signaling_handler::set_self_sig_info(SceNpId& npid)
 {
 	std::lock_guard lock(data_mutex);
-	sig_packet.npid = npid;
+	sig1_packet.V1.npid = npid;
+}
+
+void signaling_handler::set_self_sig2_info(u64 room_id, u16 member_id)
+{
+	std::lock_guard lock(data_mutex);
+	sig2_packet.V2.room_id   = room_id;
+	sig2_packet.V2.member_id = member_id;
 }
 
 void signaling_handler::send_signaling_packet(signaling_packet& sp, u32 addr, u16 port) const
 {
-	std::vector<u8> packet(sizeof(signaling_packet) + VPORT_0_HEADER_SIZE);
-	reinterpret_cast<le_t<u16>&>(packet[0]) = 0; // VPort 0
-	packet[2] = SUBSET_SIGNALING;
-	sp.sent_addr = addr;
-	sp.sent_port = port;
-	memcpy(packet.data() + VPORT_0_HEADER_SIZE, &sp, sizeof(signaling_packet));
+	std::vector<u8> packet(sizeof(signaling_packet) + sizeof(u16));
+	reinterpret_cast<le_t<u16>&>(packet[0]) = 65535;
+	memcpy(packet.data() + sizeof(u16), &sp, sizeof(signaling_packet));
 
 	sockaddr_in dest;
 	memset(&dest, 0, sizeof(sockaddr_in));
-	dest.sin_family = AF_INET;
+	dest.sin_family      = AF_INET;
 	dest.sin_addr.s_addr = addr;
-	dest.sin_port = std::bit_cast<u16, be_t<u16>>(port);
+	dest.sin_port        = std::bit_cast<u16, be_t<u16>>(port);
 
 	char ip_str[16];
 	inet_ntop(AF_INET, &dest.sin_addr, ip_str, sizeof(ip_str));
 
 	sign_log.trace("Sending %s packet to %s:%d", sp.command, ip_str, port);
 
-	if (np::is_ipv6_supported() && np::ip_address_translator::is_ipv6(dest.sin_addr.s_addr))
-	{
-		auto& translator = g_fxo->get<np::ip_address_translator>();
-		const auto addr6 = translator.get_ipv6_sockaddr(dest.sin_addr.s_addr, dest.sin_port);
-
-		if (!send_packet_from_p2p_port_ipv6(packet, addr6))
-			sign_log.error("Failed to send signaling packet to %s:%d", ip_str, port);
-	}
-	else if (!send_packet_from_p2p_port_ipv4(packet, dest))
+	if (send_packet_from_p2p_port(packet, dest) == -1)
 	{
 		sign_log.error("Failed to send signaling packet to %s:%d", ip_str, port);
 	}
@@ -666,206 +495,185 @@ void signaling_handler::queue_signaling_packet(signaling_packet& sp, std::shared
 {
 	queued_packet qp;
 	qp.sig_info = std::move(si);
-	qp.packet = sp;
+	qp.packet   = sp;
 	qpackets.emplace(wakeup_time, std::move(qp));
 }
 
 std::shared_ptr<signaling_info> signaling_handler::get_signaling_ptr(const signaling_packet* sp)
 {
-	u32 conn_id;
-
-	char npid_buf[17]{};
-	memcpy(npid_buf, sp->npid.handle.data, 16);
-	std::string npid(npid_buf);
-
-	if (!npid_to_conn_id.contains(npid))
-		return nullptr;
-
-	conn_id = ::at32(npid_to_conn_id, npid);
-
-	if (!sig_peers.contains(conn_id))
+	// V1
+	if (sp->version == 1u)
 	{
-		sign_log.error("Discrepancy in signaling data");
-		return nullptr;
+		char npid_buf[17]{};
+		memcpy(npid_buf, sp->V1.npid.handle.data, 16);
+		std::string npid(npid_buf);
+
+		if (!npid_to_conn_id.count(npid))
+			return nullptr;
+
+		const u32 conn_id = npid_to_conn_id.at(npid);
+		if (!sig1_peers.contains(conn_id))
+		{
+			sign_log.error("Discrepancy in signaling 1 data");
+			return nullptr;
+		}
+
+		return sig1_peers.at(conn_id);
 	}
 
-	return ::at32(sig_peers, conn_id);
+	// V2
+	auto room_id   = sp->V2.room_id;
+	auto member_id = sp->V2.member_id;
+	if (!sig2_peers.contains(room_id) || !sig2_peers.at(room_id).contains(member_id))
+		return nullptr;
+
+	return sig2_peers.at(room_id).at(member_id);
 }
 
 void signaling_handler::start_sig(u32 conn_id, u32 addr, u16 port)
 {
 	std::lock_guard lock(data_mutex);
-	auto& sent_packet = sig_packet;
-	sent_packet.command = signal_connect;
-	sent_packet.timestamp_sender = get_micro_timestamp(steady_clock::now());
-
-	std::shared_ptr<signaling_info> si = ::at32(sig_peers, conn_id);
-
-	const auto now = steady_clock::now();
-
-	si->time_last_msg_recvd = now;
-
-	// Only update if those haven't been set before(possible we received a signal_info before)
-	if (si->addr == 0 || si->port == 0)
-	{
-		si->addr = addr;
-		si->port = port;
-	}
-
-	send_signaling_packet(sent_packet, si->addr, si->port);
-	queue_signaling_packet(sent_packet, si, now + REPEAT_CONNECT_DELAY);
-	wake_up();
+	start_sig_nl(conn_id, addr, port);
 }
 
-void signaling_handler::stop_sig_nl(u32 conn_id, bool forceful)
+void signaling_handler::start_sig_nl(u32 conn_id, u32 addr, u16 port)
 {
-	if (!sig_peers.contains(conn_id))
-		return;
+	auto& sent_packet   = sig1_packet;
+	sent_packet.command = signal_connect;
 
-	std::shared_ptr<signaling_info> si = ::at32(sig_peers, conn_id);
+	ensure(sig1_peers.contains(conn_id));
+	std::shared_ptr<signaling_info> si = sig1_peers.at(conn_id);
 
-	retire_all_packets(si);
-
-	// If forceful we don't go through any transition and don't call any CB
-	if (forceful)
-	{
-		si->conn_status = SCE_NP_SIGNALING_CONN_STATUS_INACTIVE;
-		si->op_activated = false;
-	}
-
-	// Do not queue packets for an already dead connection
-	if (si->conn_status == SCE_NP_SIGNALING_CONN_STATUS_INACTIVE)
-		return;
-
-	auto& sent_packet = sig_packet;
-	sent_packet.command = signal_finished;
+	si->addr = addr;
+	si->port = port;
 
 	send_signaling_packet(sent_packet, si->addr, si->port);
-	queue_signaling_packet(sent_packet, std::move(si), steady_clock::now() + REPEAT_FINISHED_DELAY);
-	wake_up();
+	queue_signaling_packet(sent_packet, si, steady_clock::now() + REPEAT_CONNECT_DELAY);
 }
 
-void signaling_handler::stop_sig(u32 conn_id, bool forceful)
+void signaling_handler::start_sig2(u64 room_id, u16 member_id)
 {
 	std::lock_guard lock(data_mutex);
-	stop_sig_nl(conn_id, forceful);
+
+	auto& sent_packet   = sig2_packet;
+	sent_packet.command = signal_connect;
+
+	ensure(sig2_peers.contains(room_id));
+	const auto& sp = sig2_peers.at(room_id);
+
+	ensure(sp.contains(member_id));
+	std::shared_ptr<signaling_info> si = sp.at(member_id);
+
+	send_signaling_packet(sent_packet, si->addr, si->port);
+	queue_signaling_packet(sent_packet, si, steady_clock::now() + REPEAT_CONNECT_DELAY);
 }
 
 void signaling_handler::disconnect_sig2_users(u64 room_id)
 {
 	std::lock_guard lock(data_mutex);
 
-	for (auto& [conn_id, si] : sig_peers)
+	if (!sig2_peers.contains(room_id))
+		return;
+
+	auto& sent_packet = sig2_packet;
+
+	sent_packet.command = signal_finished;
+
+	for (const auto& member : sig2_peers.at(room_id))
 	{
-		if (si->room_id == room_id)
+		auto& si = member.second;
+		if (si->connStatus != SCE_NP_SIGNALING_CONN_STATUS_INACTIVE && !si->self)
 		{
-			stop_sig_nl(conn_id, false);
+			send_signaling_packet(sent_packet, si->addr, si->port);
+			queue_signaling_packet(sent_packet, si, steady_clock::now() + REPEAT_FINISHED_DELAY);
 		}
 	}
 }
 
-void signaling_handler::send_information_packets(u32 addr, u16 port, const SceNpId& npid)
+u32 signaling_handler::create_sig_infos(const SceNpId* npid)
 {
-	std::lock_guard lock(data_mutex);
+	ensure(npid->handle.data[16] == 0);
+	std::string npid_str(reinterpret_cast<const char*>(npid->handle.data));
 
-	const u32 conn_id = get_always_conn_id(npid);
-	std::shared_ptr<signaling_info> si = ::at32(sig_peers, conn_id);
-	si->addr = addr;
-	si->port = port;
-	si->info_counter = 10;
-
-	auto& sent_packet = sig_packet;
-	sent_packet.command = signal_info;
-
-	send_signaling_packet(sent_packet, addr, port);
-	queue_signaling_packet(sent_packet, si, steady_clock::now() + REPEAT_INFO_DELAY);
-	wake_up();
-}
-
-u32 signaling_handler::get_always_conn_id(const SceNpId& npid)
-{
-	std::string npid_str(reinterpret_cast<const char*>(npid.handle.data));
 	if (npid_to_conn_id.contains(npid_str))
-		return ::at32(npid_to_conn_id, npid_str);
+	{
+		return npid_to_conn_id.at(npid_str);
+	}
 
 	const u32 conn_id = cur_conn_id++;
-	npid_to_conn_id.emplace(std::move(npid_str), conn_id);
-	sig_peers.emplace(conn_id, std::make_shared<signaling_info>());
-	auto& si = ::at32(sig_peers, conn_id);
-	si->conn_id = conn_id;
-	si->npid = npid;
+	npid_to_conn_id.emplace(npid_str, conn_id);
+	sig1_peers.emplace(conn_id, std::make_shared<signaling_info>());
+	sig1_peers.at(conn_id)->version = 1;
+	sig1_peers.at(conn_id)->conn_id = conn_id;
 
 	return conn_id;
 }
 
-u32 signaling_handler::init_sig1(const SceNpId& npid)
+u32 signaling_handler::init_sig_infos(const SceNpId* npid)
 {
 	std::lock_guard lock(data_mutex);
 
-	const u32 conn_id = get_always_conn_id(npid);
+	const u32 conn_id = create_sig_infos(npid);
 
-	if (sig_peers[conn_id]->conn_status == SCE_NP_SIGNALING_CONN_STATUS_INACTIVE)
+	if (sig1_peers[conn_id]->connStatus == SCE_NP_SIGNALING_CONN_STATUS_INACTIVE)
 	{
 		sign_log.trace("Creating new sig1 connection and requesting infos from RPCN");
-		sig_peers[conn_id]->conn_status = SCE_NP_SIGNALING_CONN_STATUS_PENDING;
+		sig1_peers[conn_id]->connStatus = SCE_NP_SIGNALING_CONN_STATUS_PENDING;
 
 		// Request peer infos from RPCN
-		std::string npid_str(reinterpret_cast<const char*>(npid.handle.data));
-		auto& nph = g_fxo->get<named_thread<np::np_handler>>();
+		std::string npid_str(reinterpret_cast<const char*>(npid->handle.data));
+		auto& nph = g_fxo->get<named_thread<np_handler>>();
 		nph.req_sign_infos(npid_str, conn_id);
 	}
-
-	return conn_id;
-}
-
-u32 signaling_handler::init_sig2(const SceNpId& npid, u64 room_id, u16 member_id)
-{
-	std::lock_guard lock(data_mutex);
-	u32 conn_id = get_always_conn_id(npid);
-	auto& si = ::at32(sig_peers, conn_id);
-	si->room_id = room_id;
-	si->member_id = member_id;
-
-	// If connection exists from prior state notify
-	if (si->conn_status == SCE_NP_SIGNALING_CONN_STATUS_ACTIVE)
-		signal_sig2_callback(si->room_id, si->member_id, SCE_NP_MATCHING2_SIGNALING_EVENT_Established, CELL_OK);
 	else
-		si->conn_status = SCE_NP_SIGNALING_CONN_STATUS_PENDING;
-
-	return conn_id;
-}
-
-std::optional<u32> signaling_handler::get_conn_id_from_npid(const SceNpId& npid)
-{
-	std::lock_guard lock(data_mutex);
-
-	std::string npid_str(reinterpret_cast<const char*>(npid.handle.data));
-	if (npid_to_conn_id.contains(npid_str))
-		return ::at32(npid_to_conn_id, npid_str);
-
-	return std::nullopt;
-}
-
-std::optional<signaling_info> signaling_handler::get_sig_infos(u32 conn_id)
-{
-	std::lock_guard lock(data_mutex);
-	if (sig_peers.contains(conn_id))
-		return *::at32(sig_peers, conn_id);
-
-	return std::nullopt;
-}
-
-std::optional<u32> signaling_handler::get_conn_id_from_addr(u32 addr, u16 port)
-{
-	std::lock_guard lock(data_mutex);
-
-	for (const auto& [conn_id, conn_info] : sig_peers)
 	{
-		if (conn_info && std::bit_cast<u32, be_t<u32>>(conn_info->addr) == addr && conn_info->port == port)
+		// Connection already exists(from passive connection)
+		if (sig1_peers[conn_id]->connStatus == SCE_NP_SIGNALING_CONN_STATUS_ACTIVE && sig1_peers[conn_id]->ext_status == ext_sign_peer)
 		{
-			return conn_id;
+			sign_log.trace("Activating already peer activated connection");
+			sig1_peers[conn_id]->ext_status = ext_sign_mutual;
+			start_sig_nl(conn_id, sig1_peers[conn_id]->addr, sig1_peers[conn_id]->port);
+			signal_sig_callback(conn_id, SCE_NP_SIGNALING_EVENT_ESTABLISHED);
+			signal_ext_sig_callback(conn_id, SCE_NP_SIGNALING_EVENT_EXT_MUTUAL_ACTIVATED);
 		}
 	}
 
-	return std::nullopt;
+	return conn_id;
+}
+
+signaling_info signaling_handler::get_sig_infos(u32 conn_id)
+{
+	return *sig1_peers[conn_id];
+}
+
+void signaling_handler::set_sig2_infos(u64 room_id, u16 member_id, s32 status, u32 addr, u16 port, bool self)
+{
+	std::lock_guard lock(data_mutex);
+	if (!sig2_peers[room_id][member_id])
+		sig2_peers[room_id][member_id] = std::make_shared<signaling_info>();
+
+	auto& peer       = sig2_peers[room_id][member_id];
+	peer->connStatus = status;
+	peer->addr       = addr;
+	peer->port       = port;
+	peer->self       = self;
+	peer->version    = 2;
+	peer->room_id    = room_id;
+	peer->member_id  = member_id;
+}
+
+signaling_info signaling_handler::get_sig2_infos(u64 room_id, u16 member_id)
+{
+	std::lock_guard lock(data_mutex);
+
+	if (!sig2_peers[room_id][member_id])
+	{
+		sig2_peers[room_id][member_id] = std::make_shared<signaling_info>();
+		auto& peer = sig2_peers[room_id][member_id];
+		peer->room_id = room_id;
+		peer->member_id = member_id;
+		peer->version = 2;
+	}
+
+	return *sig2_peers[room_id][member_id];
 }
diff --git a/rpcs3/Emu/NP/signaling_handler.h b/rpcs3/Emu/NP/signaling_handler.h
index b4ec8229b8..bf674c62fe 100644
--- a/rpcs3/Emu/NP/signaling_handler.h
+++ b/rpcs3/Emu/NP/signaling_handler.h
@@ -1,42 +1,37 @@
 #pragma once
+#include "Emu/Memory/vm.h"
+#include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/Modules/sceNp.h"
 #include "Emu/Cell/Modules/sceNp2.h"
 #include "Utilities/Thread.h"
-#include "Utilities/mutex.h"
 #include <unordered_map>
+#include <condition_variable>
 #include <chrono>
-#include <optional>
+
+enum ext_signaling_status : u8
+{
+	ext_sign_none = 0,
+	ext_sign_peer = 1,
+	ext_sign_mutual = 2,
+};
 
 struct signaling_info
 {
-	s32 conn_status = SCE_NP_SIGNALING_CONN_STATUS_INACTIVE;
-	u32 addr = 0;
-	u16 port = 0;
-
-	// User seen from that peer
-	u32 mapped_addr = 0;
-	u16 mapped_port = 0;
+	s32 connStatus = SCE_NP_SIGNALING_CONN_STATUS_INACTIVE;
+	u32 addr       = 0;
+	u16 port       = 0;
 
 	// For handler
 	steady_clock::time_point time_last_msg_recvd = steady_clock::now();
-	bool self = false;
-	SceNpId npid{};
 
+	bool self   = false;
+	u32 version = 0;
 	// Signaling
-	u32 conn_id = 0;
-	bool op_activated = false;
-	u32 info_counter = 10;
-
+	u32 conn_id                     = 0;
+	ext_signaling_status ext_status = ext_sign_none;
 	// Matching2
-	u64 room_id = 0;
+	u64 room_id   = 0;
 	u16 member_id = 0;
-
-	// Stats
-	u64 last_rtts[6] = {};
-	usz rtt_counters = 0;
-	u32 rtt = 0;
-	u32 pings_sent = 1, lost_pings = 0;
-	u32 packet_loss = 0;
 };
 
 enum SignalingCommand : u32
@@ -48,7 +43,6 @@ enum SignalingCommand : u32
 	signal_confirm,
 	signal_finished,
 	signal_finished_ack,
-	signal_info,
 };
 
 class signaling_handler
@@ -60,84 +54,93 @@ public:
 	signaling_handler& operator=(thread_state);
 
 	void set_self_sig_info(SceNpId& npid);
+	void set_self_sig2_info(u64 room_id, u16 member_id);
 
-	u32 init_sig1(const SceNpId& npid);
-	u32 init_sig2(const SceNpId& npid, u64 room_id, u16 member_id);
-	std::optional<signaling_info> get_sig_infos(u32 conn_id);
-	std::optional<u32> get_conn_id_from_npid(const SceNpId& npid);
-	std::optional<u32> get_conn_id_from_addr(u32 addr, u16 port);
+	u32 init_sig_infos(const SceNpId* npid);
+	signaling_info get_sig_infos(u32 conn_id);
 
-	void add_sig_ctx(u32 ctx_id);
-	void remove_sig_ctx(u32 ctx_id);
-	void clear_sig_ctx();
-	void add_match2_ctx(u16 ctx_id);
-	void remove_match2_ctx(u16 ctx_id);
-	void clear_match2_ctx();
+	void set_sig2_infos(u64 room_id, u16 member_id, s32 status, u32 addr, u16 port, bool self = false);
+	signaling_info get_sig2_infos(u64 room_id, u16 member_id);
+
+	void set_sig_cb(u32 sig_cb_ctx, vm::ptr<SceNpSignalingHandler> sig_cb, vm::ptr<void> sig_cb_arg);
+	void set_ext_sig_cb(u32 sig_ext_cb_ctx, vm::ptr<SceNpSignalingHandler> sig_ext_cb, vm::ptr<void> sig_ext_cb_arg);
+	void set_sig2_cb(u16 sig2_cb_ctx, vm::ptr<SceNpMatching2SignalingCallback> sig2_cb, vm::ptr<void> sig2_cb_arg);
 
 	void start_sig(u32 conn_id, u32 addr, u16 port);
-	void stop_sig(u32 conn_id, bool forceful);
-	void send_information_packets(u32 addr, u16 port, const SceNpId& npid);
 
+	void start_sig2(u64 room_id, u16 member_id);
 	void disconnect_sig2_users(u64 room_id);
 
 	static constexpr auto thread_name = "Signaling Manager Thread"sv;
 
 private:
-	static constexpr auto REPEAT_CONNECT_DELAY = std::chrono::milliseconds(200);
-	static constexpr auto REPEAT_PING_DELAY = std::chrono::milliseconds(500);
+	static constexpr auto REPEAT_CONNECT_DELAY  = std::chrono::milliseconds(200);
+	static constexpr auto REPEAT_PING_DELAY     = std::chrono::milliseconds(500);
 	static constexpr auto REPEAT_FINISHED_DELAY = std::chrono::milliseconds(500);
-	static constexpr auto REPEAT_INFO_DELAY = std::chrono::milliseconds(200);
 	static constexpr be_t<u32> SIGNALING_SIGNATURE = (static_cast<u32>('S') << 24 | static_cast<u32>('I') << 16 | static_cast<u32>('G') << 8 | static_cast<u32>('N'));
-	static constexpr le_t<u32> SIGNALING_VERSION = 3;
 
 	struct signaling_packet
 	{
 		be_t<u32> signature = SIGNALING_SIGNATURE;
-		le_t<u32> version = SIGNALING_VERSION;
-		le_t<u64> timestamp_sender;
-		le_t<u64> timestamp_receiver;
+		le_t<u32> version;
 		le_t<SignalingCommand> command;
-		le_t<u32> sent_addr;
-		le_t<u16> sent_port;
-		SceNpId npid;
+		union {
+			struct
+			{
+				SceNpId npid;
+			} V1;
+			struct
+			{
+				le_t<u64> room_id;
+				le_t<u16> member_id;
+			} V2;
+		};
 	};
 
 	struct queued_packet
 	{
-		signaling_packet packet{};
+		signaling_packet packet;
 		std::shared_ptr<signaling_info> sig_info;
 	};
 
-	std::set<u32> sig_ctx_lst;
-	std::set<u16> match2_ctx_lst;
+	u32 sig_cb_ctx = 0;
+	vm::ptr<SceNpSignalingHandler> sig_cb{};
+	vm::ptr<void> sig_cb_arg{};
 
-	static u64 get_micro_timestamp(const std::chrono::steady_clock::time_point& time_point);
+	u32 sig_ext_cb_ctx = 0;
+	vm::ptr<SceNpSignalingHandler> sig_ext_cb{};
+	vm::ptr<void> sig_ext_cb_arg{};
 
-	u32 get_always_conn_id(const SceNpId& npid);
+	u16 sig2_cb_ctx = 0;
+	vm::ptr<SceNpMatching2SignalingCallback> sig2_cb{};
+	vm::ptr<void> sig2_cb_arg{};
+
+	u32 create_sig_infos(const SceNpId* npid);
 	static void update_si_addr(std::shared_ptr<signaling_info>& si, u32 new_addr, u16 new_port);
-	static void update_si_mapped_addr(std::shared_ptr<signaling_info>& si, u32 new_addr, u16 new_port);
-	void update_si_status(std::shared_ptr<signaling_info>& si, s32 new_status, s32 error_code);
-	void update_ext_si_status(std::shared_ptr<signaling_info>& si, bool op_activated);
-	void signal_sig_callback(u32 conn_id, s32 event, s32 error_code);
-	void signal_ext_sig_callback(u32 conn_id, s32 event, s32 error_code) const;
-	void signal_sig2_callback(u64 room_id, u16 member_id, SceNpMatching2Event event, s32 error_code) const;
+	void update_si_status(std::shared_ptr<signaling_info>& si, s32 new_status, bool confirm_packet = false);
+	void signal_sig_callback(u32 conn_id, int event);
+	void signal_ext_sig_callback(u32 conn_id, int event) const;
+	void signal_sig2_callback(u64 room_id, u16 member_id, SceNpMatching2Event event) const;
+
+	void start_sig_nl(u32 conn_id, u32 addr, u16 port);
 
 	static bool validate_signaling_packet(const signaling_packet* sp);
 	void reschedule_packet(std::shared_ptr<signaling_info>& si, SignalingCommand cmd, steady_clock::time_point new_timepoint);
 	void retire_packet(std::shared_ptr<signaling_info>& si, SignalingCommand cmd);
 	void retire_all_packets(std::shared_ptr<signaling_info>& si);
-	void stop_sig_nl(u32 conn_id, bool forceful);
 
-	shared_mutex data_mutex;
-	atomic_t<u32> wakey = 0;
+	std::mutex data_mutex;
+	std::condition_variable wakey;
 
-	signaling_packet sig_packet{};
+	signaling_packet sig1_packet{.version = 1u};
+	signaling_packet sig2_packet{.version = 2u};
 
 	std::map<steady_clock::time_point, queued_packet> qpackets; // (wakeup time, packet)
 
 	u32 cur_conn_id = 1;
-	std::unordered_map<std::string, u32> npid_to_conn_id;               // (npid, conn_id)
-	std::unordered_map<u32, std::shared_ptr<signaling_info>> sig_peers; // (conn_id, sig_info)
+	std::unordered_map<std::string, u32> npid_to_conn_id;                                         // (npid, conn_id)
+	std::unordered_map<u32, std::shared_ptr<signaling_info>> sig1_peers;                          // (conn_id, sig_info)
+	std::unordered_map<u64, std::unordered_map<u16, std::shared_ptr<signaling_info>>> sig2_peers; // (room (member_id, sig_info))
 
 	void process_incoming_messages();
 	std::shared_ptr<signaling_info> get_signaling_ptr(const signaling_packet* sp);
diff --git a/rpcs3/Emu/NP/upnp_config.cpp b/rpcs3/Emu/NP/upnp_config.cpp
deleted file mode 100644
index bf43b8e55b..0000000000
--- a/rpcs3/Emu/NP/upnp_config.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "stdafx.h"
-#include "upnp_config.h"
-#include "Utilities/File.h"
-
-LOG_CHANNEL(upnp_cfg_log, "UPNP_CFG");
-
-void cfg_upnp::load()
-{
-	const std::string path = cfg_upnp::get_path();
-
-	fs::file cfg_file(path, fs::read);
-	if (cfg_file)
-	{
-		upnp_cfg_log.notice("Loading UPNP config. Path: %s", path);
-		from_string(cfg_file.to_string());
-	}
-	else
-	{
-		upnp_cfg_log.notice("UPNP config missing. Using default settings. Path: %s", path);
-		from_default();
-	}
-}
-
-void cfg_upnp::save() const
-{
-#ifdef _WIN32
-	const std::string path_to_cfg = fs::get_config_dir(true);
-	if (!fs::create_path(path_to_cfg))
-	{
-		upnp_cfg_log.error("Could not create path: %s", path_to_cfg);
-	}
-#endif
-
-	const std::string path = cfg_upnp::get_path();
-
-	if (!cfg::node::save(path))
-	{
-		upnp_cfg_log.error("Could not save config: %s (error=%s)", path, fs::g_tls_error);
-	}
-}
-
-std::string cfg_upnp::get_device_url() const
-{
-	return device_url.to_string();
-}
-
-void cfg_upnp::set_device_url(std::string_view url)
-{
-	device_url.from_string(url);
-}
-
-std::string cfg_upnp::get_path()
-{
-	return fs::get_config_dir(true) + "upnp.yml";
-}
diff --git a/rpcs3/Emu/NP/upnp_config.h b/rpcs3/Emu/NP/upnp_config.h
deleted file mode 100644
index f1068c07c0..0000000000
--- a/rpcs3/Emu/NP/upnp_config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "Utilities/Config.h"
-
-struct cfg_upnp : cfg::node
-{
-	cfg::string device_url{this, "DeviceUrl", ""};
-
-	void load();
-	void save() const;
-
-	std::string get_device_url() const;
-
-	void set_device_url(std::string_view url);
-
-private:
-	static std::string get_path();
-};
diff --git a/rpcs3/Emu/NP/upnp_handler.cpp b/rpcs3/Emu/NP/upnp_handler.cpp
deleted file mode 100644
index dca00de986..0000000000
--- a/rpcs3/Emu/NP/upnp_handler.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-#include "stdafx.h"
-#include "upnp_handler.h"
-#include "util/logs.hpp"
-
-#include <miniwget.h>
-#include <upnpcommands.h>
-
-LOG_CHANNEL(upnp_log, "UPNP");
-
-upnp_handler::~upnp_handler()
-{
-	std::lock_guard lock(m_mutex);
-
-	for (const auto& [protocol, prot_bindings] : m_bindings)
-	{
-		for (const auto& [internal_port, external_port] : prot_bindings)
-		{
-			remove_port_redir_external(external_port, protocol);
-		}
-	}
-
-	m_active = false;
-}
-
-void upnp_handler::upnp_enable()
-{
-	std::lock_guard lock(m_mutex);
-
-	m_cfg.load();
-
-	auto check_igd = [&](const char* url) -> bool
-	{
-		int desc_xml_size = 0;
-		int status_code = 0;
-
-		m_igd_data = {};
-		m_igd_urls = {};
-
-		char* desc_xml = static_cast<char*>(miniwget(url, &desc_xml_size, 1, &status_code));
-
-		if (!desc_xml)
-			return false;
-
-		parserootdesc(desc_xml, desc_xml_size, &m_igd_data);
-		free(desc_xml);
-		desc_xml = nullptr;
-		GetUPNPUrls(&m_igd_urls, &m_igd_data, url, 1);
-
-		return true;
-	};
-
-	std::string dev_url = m_cfg.get_device_url();
-
-	if (!dev_url.empty())
-	{
-		if (check_igd(dev_url.c_str()))
-		{
-			upnp_log.notice("Saved UPNP(%s) enabled", dev_url);
-			m_active = true;
-			return;
-		}
-
-		upnp_log.error("Saved UPNP(%s) isn't available anymore", dev_url);
-	}
-
-	upnp_log.notice("Starting UPNP search");
-
-	int upnperror = 0;
-	UPNPDev* devlist = upnpDiscover(2000, nullptr, nullptr, 0, 0, 2, &upnperror);
-
-	if (!devlist)
-	{
-		upnp_log.error("No UPNP device was found");
-		return;
-	}
-
-	const UPNPDev* dev = devlist;
-	for (; dev; dev = dev->pNext)
-	{
-		if (strstr(dev->st, "InternetGatewayDevice"))
-			break;
-	}
-
-	if (dev)
-	{
-		int desc_xml_size = 0;
-		int status_code = 0;
-		char* desc_xml = static_cast<char*>(miniwget(dev->descURL, &desc_xml_size, 1, &status_code));
-
-		if (desc_xml)
-		{
-			IGDdatas igd_data{};
-			UPNPUrls igd_urls{};
-			parserootdesc(desc_xml, desc_xml_size, &igd_data);
-			free(desc_xml);
-			desc_xml = nullptr;
-			GetUPNPUrls(&igd_urls, &igd_data, dev->descURL, 1);
-
-			upnp_log.notice("Found UPnP device type:%s at %s", dev->st, dev->descURL);
-
-			m_cfg.set_device_url(dev->descURL);
-			m_cfg.save();
-
-			m_active = true;
-		}
-		else
-		{
-			upnp_log.error("Failed to retrieve UPNP xml for %s", dev->descURL);
-		}
-	}
-	else
-	{
-		upnp_log.error("No UPNP IGD device was found");
-	}
-
-	freeUPNPDevlist(devlist);
-}
-
-void upnp_handler::add_port_redir(std::string_view addr, u16 internal_port, std::string_view protocol)
-{
-	if (!m_active)
-		return;
-
-	std::lock_guard lock(m_mutex);
-
-	u16 external_port = internal_port;
-	std::string internal_port_str = fmt::format("%d", internal_port);
-	int res = 0;
-
-	for (u16 external_port = internal_port; external_port < internal_port + 100; external_port++)
-	{
-		std::string external_port_str = fmt::format("%d", external_port);
-		res = UPNP_AddPortMapping(m_igd_urls.controlURL, m_igd_data.first.servicetype, external_port_str.c_str(), internal_port_str.c_str(), addr.data(), "RPCS3", protocol.data(), nullptr, nullptr);
-		if (res == UPNPCOMMAND_SUCCESS)
-		{
-			m_bindings[std::string(protocol)][internal_port] = external_port;
-			upnp_log.notice("Successfully bound %s:%d(%s) to IGD:%d", addr, internal_port, protocol, external_port);
-			return;
-		}
-
-		// need more testing, may vary per router, etc, for now assume port conflict silently
-		// else if (res != 718) // ConflictInMappingEntry
-		// {
-		// 	upnp_log.error("Failed to bind %s:%d(%s) to IGD:%d: %d", addr, internal_port, protocol, external_port, res);
-		// 	return;
-		// }
-	}
-
-	upnp_log.error("Failed to bind %s:%d(%s) to IGD:(%d=>%d): %d", addr, internal_port, protocol, internal_port, external_port, res);
-}
-
-void upnp_handler::remove_port_redir(u16 internal_port, std::string_view protocol)
-{
-	if (!m_active)
-		return;
-
-	std::lock_guard lock(m_mutex);
-
-	const std::string str_protocol(protocol);
-
-	if (!m_bindings.contains(str_protocol) || !::at32(m_bindings, str_protocol).contains(internal_port))
-	{
-		upnp_log.error("tried to unbind port mapping %d to IGD(%s) but it isn't bound", internal_port, protocol);
-		return;
-	}
-
-	const u16 external_port = ::at32(::at32(m_bindings, str_protocol), internal_port);
-
-	remove_port_redir_external(external_port, protocol);
-
-	ensure(::at32(m_bindings, str_protocol).erase(internal_port));
-	upnp_log.notice("Successfully deleted port mapping %d to IGD:%d(%s)", internal_port, external_port, protocol);
-}
-
-void upnp_handler::remove_port_redir_external(u16 external_port, std::string_view protocol, bool verbose)
-{
-	const std::string str_ext_port = fmt::format("%d", external_port);
-
-	if (int res = UPNP_DeletePortMapping(m_igd_urls.controlURL, m_igd_data.first.servicetype, str_ext_port.c_str(), protocol.data(), nullptr); res != 0 && verbose)
-		upnp_log.error("Failed to delete port mapping IGD:%s(%s): %d", str_ext_port, protocol, res);
-}
-
-bool upnp_handler::is_active() const
-{
-	return m_active;
-}
diff --git a/rpcs3/Emu/NP/upnp_handler.h b/rpcs3/Emu/NP/upnp_handler.h
deleted file mode 100644
index 40892f7443..0000000000
--- a/rpcs3/Emu/NP/upnp_handler.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <unordered_map>
-
-#include <miniupnpc.h>
-
-#include "upnp_config.h"
-#include "Utilities/mutex.h"
-
-class upnp_handler
-{
-public:
-	~upnp_handler();
-
-	void upnp_enable();
-	void add_port_redir(std::string_view addr, u16 internal_port, std::string_view protocol);
-	void remove_port_redir(u16 internal_port, std::string_view protocol);
-
-	bool is_active() const;
-
-private:
-	void remove_port_redir_external(u16 external_port, std::string_view protocol, bool verbose = true);
-
-private:
-	atomic_t<bool> m_active = false;
-
-	shared_mutex m_mutex;
-	cfg_upnp m_cfg;
-	IGDdatas m_igd_data{};
-	UPNPUrls m_igd_urls{};
-	std::unordered_map<std::string, std::unordered_map<u16, u16>> m_bindings;
-};
diff --git a/rpcs3/Emu/NP/vport0.h b/rpcs3/Emu/NP/vport0.h
deleted file mode 100644
index 927e1a5390..0000000000
--- a/rpcs3/Emu/NP/vport0.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <vector>
-
-#ifdef _WIN32
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-
-#include "Emu/Cell/lv2/sys_net/nt_p2p_port.h"
-
-bool send_packet_from_p2p_port_ipv4(const std::vector<u8>& data, const sockaddr_in& addr);
-bool send_packet_from_p2p_port_ipv6(const std::vector<u8>& data, const sockaddr_in6& addr);
-std::vector<signaling_message> get_sign_msgs();
-std::vector<std::vector<u8>> get_rpcn_msgs();
-
-constexpr s32 VPORT_0_HEADER_SIZE = sizeof(u16) + sizeof(u8);
-
-// VPort 0 is invalid for sys_net so we use it for:
-// Subset 0: Messages from RPCN server, IP retrieval / UDP hole punching
-// Subset 1: Signaling
-enum VPORT_0_SUBSET : u8
-{
-	SUBSET_RPCN      = 0,
-	SUBSET_SIGNALING = 1,
-};
diff --git a/rpcs3/Emu/RSX/Capture/rsx_capture.cpp b/rpcs3/Emu/RSX/Capture/rsx_capture.cpp
index 3ac2dd929e..0eeea99db9 100644
--- a/rpcs3/Emu/RSX/Capture/rsx_capture.cpp
+++ b/rpcs3/Emu/RSX/Capture/rsx_capture.cpp
@@ -2,37 +2,38 @@
 #include "rsx_capture.h"
 #include "Emu/RSX/Common/BufferUtils.h"
 #include "Emu/RSX/Common/TextureUtils.h"
+#include "Emu/RSX/Common/surface_store.h"
 #include "Emu/RSX/GCM.h"
 #include "Emu/RSX/RSXThread.h"
 #include "Emu/Memory/vm.h"
 
+#include "xxhash.h"
+
 namespace rsx
 {
 	namespace capture
 	{
-		void insert_mem_block_in_map(u64& indexer, std::unordered_set<u64>& mem_changes, frame_capture_data::memory_block&& block, frame_capture_data::memory_block_data&& data)
+		void insert_mem_block_in_map(std::unordered_set<u64>& mem_changes, frame_capture_data::memory_block&& block, frame_capture_data::memory_block_data&& data)
 		{
 			if (!data.data.empty())
 			{
-				const auto [it, inserted] = frame_capture.memory_data_map.try_emplace(data, 0);
-				u64& data_hash = it->second;
-
-				if (inserted)
-				{
-					data_hash = ++indexer;
-				}
-
+				u64 data_hash = XXH64(data.data.data(), data.data.size(), 0);
 				block.data_state = data_hash;
 
-				const auto [block_it, inserted_block] = frame_capture.memory_map.try_emplace(block, 0);
-				u64& block_hash = block_it->second;
-
-				if (inserted_block)
+				auto it = frame_capture.memory_data_map.find(data_hash);
+				if (it != frame_capture.memory_data_map.end())
 				{
-					block_hash = ++indexer;
+					if (it->second.data != data.data)
+						// screw this
+						fmt::throw_exception("Memory map hash collision detected...cant capture");
 				}
+				else
+					frame_capture.memory_data_map.insert(std::make_pair(data_hash, std::move(data)));
 
+				u64 block_hash = XXH64(&block, sizeof(frame_capture_data::memory_block), 0);
 				mem_changes.insert(block_hash);
+				if (frame_capture.memory_map.find(block_hash) == frame_capture.memory_map.end())
+					frame_capture.memory_map.insert(std::make_pair(block_hash, std::move(block)));
 			}
 		}
 
@@ -48,7 +49,6 @@ namespace rsx
 
 			// shove the mem_changes onto the last issued command
 			std::unordered_set<u64>& mem_changes = frame_capture.replay_commands.back().memory_state;
-			u64& mem_indexer = frame_capture.memory_indexer;
 
 			// capture fragment shader mem
 			const auto [program_offset, program_location] = method_registers.shader_program_address();
@@ -64,7 +64,7 @@ namespace rsx
 			frame_capture_data::memory_block_data block_data;
 			block_data.data.resize(ucode_size + program_start);
 			std::memcpy(block_data.data.data(), vm::base(addr), ucode_size + program_start);
-			insert_mem_block_in_map(mem_indexer, mem_changes, std::move(block), std::move(block_data));
+			insert_mem_block_in_map(mem_changes, std::move(block), std::move(block_data));
 
 			// vertex shader is passed in registers, so it can be ignored
 
@@ -91,7 +91,7 @@ namespace rsx
 				frame_capture_data::memory_block_data block_data;
 				block_data.data.resize(texSize);
 				std::memcpy(block_data.data.data(), vm::base(texaddr), texSize);
-				insert_mem_block_in_map(mem_indexer, mem_changes, std::move(block), std::move(block_data));
+				insert_mem_block_in_map(mem_changes, std::move(block), std::move(block_data));
 			}
 
 			// save vertex texture mem
@@ -117,7 +117,7 @@ namespace rsx
 				frame_capture_data::memory_block_data block_data;
 				block_data.data.resize(texSize);
 				std::memcpy(block_data.data.data(), vm::base(texaddr), texSize);
-				insert_mem_block_in_map(mem_indexer, mem_changes, std::move(block), std::move(block_data));
+				insert_mem_block_in_map(mem_changes, std::move(block), std::move(block_data));
 			}
 
 			// save vertex buffer memory
@@ -155,7 +155,7 @@ namespace rsx
 						frame_capture_data::memory_block_data block_data;
 						block_data.data.resize(bufferSize);
 						std::memcpy(block_data.data.data(), vm::base(addr + (range.first * vertStride)), bufferSize);
-						insert_mem_block_in_map(mem_indexer, mem_changes, std::move(block), std::move(block_data));
+						insert_mem_block_in_map(mem_changes, std::move(block), std::move(block_data));
 					}
 					while (method_registers.current_draw_clause.next());
 				}
@@ -194,7 +194,7 @@ namespace rsx
 					frame_capture_data::memory_block_data block_data;
 					block_data.data.resize(bufferSize);
 					std::memcpy(block_data.data.data(), vm::base(idxAddr), bufferSize);
-					insert_mem_block_in_map(mem_indexer, mem_changes, std::move(block), std::move(block_data));
+					insert_mem_block_in_map(mem_changes, std::move(block), std::move(block_data));
 
 					switch (index_type)
 					{
@@ -257,7 +257,7 @@ namespace rsx
 						frame_capture_data::memory_block_data block_data;
 						block_data.data.resize(bufferSize);
 						std::memcpy(block_data.data.data(), vm::base(addr + (min_index * vertStride)), bufferSize);
-						insert_mem_block_in_map(mem_indexer, mem_changes, std::move(block), std::move(block_data));
+						insert_mem_block_in_map(mem_changes, std::move(block), std::move(block_data));
 					}
 				}
 			}
@@ -309,7 +309,7 @@ namespace rsx
 			frame_capture_data::memory_block_data block_data;
 			block_data.data.resize(src_size);
 			std::memcpy(block_data.data.data(), pixels_src, src_size);
-			insert_mem_block_in_map(frame_capture.memory_indexer, replay_command.memory_state, std::move(block), std::move(block_data));
+			insert_mem_block_in_map(replay_command.memory_state, std::move(block), std::move(block_data));
 
 			capture_display_tile_state(rsx, replay_command);
 		}
@@ -341,17 +341,14 @@ namespace rsx
 				src += in_pitch;
 			}
 
-			insert_mem_block_in_map(frame_capture.memory_indexer, replay_command.memory_state, std::move(block), std::move(block_data));
+			insert_mem_block_in_map(replay_command.memory_state, std::move(block), std::move(block_data));
 			capture_display_tile_state(rsx, replay_command);
 		}
 
 		void capture_display_tile_state(thread* rsx, frame_capture_data::replay_command& replay_command)
 		{
-			u64& mem_indexer = frame_capture.memory_indexer;
-
 			frame_capture_data::display_buffers_state dbstate;
 			dbstate.count = rsx->display_buffers_count;
-
 			// should this only happen on flip?
 			for (u32 i = 0; i < rsx->display_buffers_count; ++i)
 			{
@@ -362,13 +359,9 @@ namespace rsx
 				dbstate.buffers[i].pitch  = db.pitch;
 			}
 
-			const auto [db_it, db_inserted] = frame_capture.display_buffers_map.try_emplace(dbstate, 0);
-			u64& dbnum = db_it->second;
-
-			if (db_inserted)
-			{
-				dbnum = ++mem_indexer;
-			}
+			const u64 dbnum = XXH64(&dbstate, sizeof(frame_capture_data::display_buffers_state), 0);
+			if (frame_capture.display_buffers_map.find(dbnum) == frame_capture.display_buffers_map.end())
+				frame_capture.display_buffers_map.insert(std::make_pair(dbnum, std::move(dbstate)));
 
 			// todo: hook tile call sys_rsx call or something
 			frame_capture_data::tile_state tilestate;
@@ -394,13 +387,10 @@ namespace rsx
 				zcstate.status1 = rsx->zculls[i].bound ? u32{zc.status1} : 0;
 			}
 
-			const auto [ts_it, ts_inserted] = frame_capture.tile_map.try_emplace(tilestate, 0);
-			u64& tsnum = ts_it->second;
+			const u64 tsnum = XXH64(&tilestate, sizeof(frame_capture_data::tile_state), 0);
 
-			if (ts_inserted)
-			{
-				tsnum = ++mem_indexer;
-			}
+			if (frame_capture.tile_map.find(tsnum) == frame_capture.tile_map.end())
+				frame_capture.tile_map.insert(std::make_pair(tsnum, std::move(tilestate)));
 
 			replay_command.display_buffer_state = dbnum;
 			replay_command.tile_state           = tsnum;
diff --git a/rpcs3/Emu/RSX/Capture/rsx_replay.cpp b/rpcs3/Emu/RSX/Capture/rsx_replay.cpp
index bb558744aa..7bac9f64c4 100644
--- a/rpcs3/Emu/RSX/Capture/rsx_replay.cpp
+++ b/rpcs3/Emu/RSX/Capture/rsx_replay.cpp
@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "rsx_replay.h"
 
-#include "Emu/System.h"
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/lv2/sys_rsx.h"
 #include "Emu/Cell/lv2/sys_memory.h"
@@ -9,8 +8,6 @@
 
 #include "util/asm.hpp"
 
-#include <thread>
-
 namespace rsx
 {
 	be_t<u32> rsx_replay_thread::allocate_context()
@@ -106,26 +103,26 @@ namespace rsx
 		// apply memory needed for command
 		for (const auto& state : replay_cmd.memory_state)
 		{
-			auto it = std::find_if(frame->memory_map.begin(), frame->memory_map.end(), FN(x.second == state));
+			auto it = frame->memory_map.find(state);
 			if (it == frame->memory_map.end())
 				fmt::throw_exception("requested memory state for command not found in memory_map");
 
-			const auto& memblock = it->first;
-			auto it_data = std::find_if(frame->memory_data_map.begin(), frame->memory_data_map.end(), FN(x.second == memblock.data_state));
+			const auto& memblock = it->second;
+			auto it_data = frame->memory_data_map.find(it->second.data_state);
 			if (it_data == frame->memory_data_map.end())
 				fmt::throw_exception("requested memory data state for command not found in memory_data_map");
 
-			const auto& data_block = it_data->first;
+			const auto& data_block = it_data->second;
 			std::memcpy(vm::base(get_address(memblock.offset, memblock.location)), data_block.data.data(), data_block.data.size());
 		}
 
 		if (replay_cmd.display_buffer_state != 0 && replay_cmd.display_buffer_state != cs.display_buffer_hash)
 		{
-			auto it = std::find_if(frame->display_buffers_map.begin(), frame->display_buffers_map.end(), FN(x.second == replay_cmd.display_buffer_state));
+			auto it = frame->display_buffers_map.find(replay_cmd.display_buffer_state);
 			if (it == frame->display_buffers_map.end())
 				fmt::throw_exception("requested display buffer for command not found");
 
-			const auto& dbstate = it->first;
+			const auto& dbstate = it->second;
 			for (u32 i = 0; i < dbstate.count; ++i)
 			{
 				const auto& buf = dbstate.buffers[i];
@@ -136,17 +133,16 @@ namespace rsx
 				sys_rsx_context_attribute(context_id, 0x104, i,
 					u64{dbstate.buffers[i].width} << 32 | dbstate.buffers[i].height, u64{dbstate.buffers[i].pitch} << 32 | dbstate.buffers[i].offset, 0);
 			}
-
 			cs.display_buffer_hash = replay_cmd.display_buffer_state;
 		}
 
 		if (replay_cmd.tile_state != 0 && replay_cmd.tile_state != cs.tile_hash)
 		{
-			auto it = std::find_if(frame->tile_map.begin(), frame->tile_map.end(), FN(x.second == replay_cmd.tile_state));
+			auto it = frame->tile_map.find(replay_cmd.tile_state);
 			if (it == frame->tile_map.end())
 				fmt::throw_exception("requested tile state command not found");
 
-			const auto& tstate = it->first;
+			const auto& tstate = it->second;
 			for (u32 i = 0; i < limits::tiles_count; ++i)
 			{
 				const auto& ti = tstate.tiles[i];
@@ -177,7 +173,7 @@ namespace rsx
 
 		auto fifo_stops = alloc_write_fifo(context_id);
 
-		while (thread_ctrl::state() != thread_state::aborting)
+		while (!Emu.IsStopped())
 		{
 			// Load registers while the RSX is still idle
 			method_registers = frame->reg_state;
@@ -195,7 +191,7 @@ namespace rsx
 				while (Emu.IsPaused())
 					thread_ctrl::wait_for(10'000);
 
-				if (thread_ctrl::state() == thread_state::aborting)
+				if (Emu.IsStopped())
 					break;
 
 				// Loop and hunt down our next state change that needs to be done
@@ -203,12 +199,11 @@ namespace rsx
 					continue;
 
 				// wait until rsx idle and at our first 'stop' to apply state
-				while (thread_ctrl::state() != thread_state::aborting && !render->is_fifo_idle() && (render->ctrl->get != fifo_stops[stopIdx]))
+				while (!Emu.IsStopped() && !render->is_fifo_idle() && (render->ctrl->get != fifo_stops[stopIdx]))
 				{
-					if (Emu.IsPaused())
+					while (Emu.IsPaused())
 						thread_ctrl::wait_for(10'000);
-					else
-						std::this_thread::yield();
+					std::this_thread::yield();
 				}
 
 				stopIdx++;
@@ -226,12 +221,10 @@ namespace rsx
 			u32 end = fifo_stops.back();
 			render->ctrl->put = end;
 
-			while (!render->is_fifo_idle() && thread_ctrl::state() != thread_state::aborting)
+			while (!render->is_fifo_idle() && !Emu.IsStopped())
 			{
-				if (Emu.IsPaused())
+				while (Emu.IsPaused())
 					thread_ctrl::wait_for(10'000);
-				else
-					std::this_thread::yield();
 			}
 
 			// Check if the captured application used syscall instead of a gcm command to flip
diff --git a/rpcs3/Emu/RSX/Capture/rsx_replay.h b/rpcs3/Emu/RSX/Capture/rsx_replay.h
index f11f2e08e9..8fe5053c66 100644
--- a/rpcs3/Emu/RSX/Capture/rsx_replay.h
+++ b/rpcs3/Emu/RSX/Capture/rsx_replay.h
@@ -11,7 +11,7 @@ namespace rsx
 	enum : u32
 	{
 		c_fc_magic = "RRC"_u32,
-		c_fc_version = 0x6,
+		c_fc_version = 0x5,
 	};
 
 	struct frame_capture_data
@@ -24,7 +24,7 @@ namespace rsx
 		// simple block to hold ps3 address and data
 		struct memory_block
 		{
-			ENABLE_BITWISE_SERIALIZATION;
+			using enable_bitcopy = std::true_type;
 
 			u32 offset; // Offset in rsx address space
 			u32 location; // rsx memory location of the block
@@ -41,7 +41,7 @@ namespace rsx
 
 		struct tile_info
 		{
-			ENABLE_BITWISE_SERIALIZATION;
+			using enable_bitcopy = std::true_type;
 
 			u32 tile;
 			u32 limit;
@@ -51,7 +51,7 @@ namespace rsx
 
 		struct zcull_info
 		{
-			ENABLE_BITWISE_SERIALIZATION;
+			using enable_bitcopy = std::true_type;
 
 			u32 region;
 			u32 size;
@@ -64,7 +64,7 @@ namespace rsx
 		// bleh, may need to break these out, might be unnecessary to do both always
 		struct tile_state
 		{
-			ENABLE_BITWISE_SERIALIZATION;
+			using enable_bitcopy = std::true_type;
 
 			tile_info tiles[15]{};
 			zcull_info zculls[8]{};
@@ -72,7 +72,7 @@ namespace rsx
 
 		struct buffer_state
 		{
-			ENABLE_BITWISE_SERIALIZATION;
+			using enable_bitcopy = std::true_type;
 
 			u32 width{0};
 			u32 height{0};
@@ -82,7 +82,7 @@ namespace rsx
 
 		struct display_buffers_state
 		{
-			ENABLE_BITWISE_SERIALIZATION;
+			using enable_bitcopy = std::true_type;
 
 			std::array<buffer_state, 8> buffers{};
 			u32 count{0};
@@ -92,60 +92,19 @@ namespace rsx
 		u32 version = c_fc_version;
 		u32 LE_format = std::endian::little == std::endian::native;
 
-		struct bitwise_hasher
-		{
-			template <typename T>
-			usz operator()(const T& key) const noexcept
-			{
-				if constexpr (!!(requires (const T& a) { a.data[0]; }))
-				{
-					return std::hash<std::string_view>{}(std::string_view{ reinterpret_cast<const char*>(key.data.data()), key.data.size() * sizeof(key.data[0]) });
-				}
-
-				return std::hash<std::string_view>{}(std::string_view{ reinterpret_cast<const char*>(&key), sizeof(key) });
-			}
-
-			template <typename T>
-			bool operator()(const T& keya, const T& keyb) const noexcept
-			{
-				if constexpr (!!(requires (const T& a) { a.data[0]; }))
-				{
-					if (keya.data.size() != keyb.data.size())
-					{
-						return false;
-					}
-
-					return std::equal(keya.data.begin(), keya.data.end(), keyb.data.begin());
-				}
-
-				return std::equal(reinterpret_cast<const char*>(&keya), reinterpret_cast<const char*>(&keya) + sizeof(T), reinterpret_cast<const char*>(&keyb));
-			}
-		};
-
-		template <typename T, typename V>
-		using uno_bit_map = std::unordered_map<T, V, bitwise_hasher, bitwise_hasher>;
-
-		// Hashmap of holding various states for tile
-		uno_bit_map<tile_state, u64> tile_map;
-
-		// Hashmap of various memory 'changes' that can be applied to ps3 memory
-		uno_bit_map<memory_block, u64> memory_map;
-
-		// Hashmap of memory blocks that can be applied, this is split from above for size decrease
-		uno_bit_map<memory_block_data, u64> memory_data_map;
-
-		// Display buffer state map
-		uno_bit_map<display_buffers_state, u64> display_buffers_map;
-
-		// Actual command queue to hold everything above
+		// hashmap of holding various states for tile
+		std::unordered_map<u64, tile_state> tile_map;
+		// hashmap of various memory 'changes' that can be applied to ps3 memory
+		std::unordered_map<u64, memory_block> memory_map;
+		// hashmap of memory blocks that can be applied, this is split from above for size decrease
+		std::unordered_map<u64, memory_block_data> memory_data_map;
+		// display buffer state map
+		std::unordered_map<u64, display_buffers_state> display_buffers_map;
+		// actual command queue to hold everything above
 		std::vector<replay_command> replay_commands;
-
 		// Initial registers state at the beginning of the capture
 		rsx::rsx_state reg_state;
 
-		// Indexer for memory blocks
-		u64 memory_indexer = 0x1234;
-
 		void reset()
 		{
 			magic = c_fc_magic;
@@ -191,7 +150,6 @@ namespace rsx
 		{
 		}
 
-		using cpu_thread::operator=;
 		void cpu_task() override;
 	private:
 		be_t<u32> allocate_context();
diff --git a/rpcs3/Emu/RSX/Capture/rsx_trace.h b/rpcs3/Emu/RSX/Capture/rsx_trace.h
index 0d005423d7..ad90496ad9 100644
--- a/rpcs3/Emu/RSX/Capture/rsx_trace.h
+++ b/rpcs3/Emu/RSX/Capture/rsx_trace.h
@@ -19,6 +19,7 @@ struct frame_trace_data
 		std::array<std::vector<std::byte>, 2> depth_stencil;
 		std::vector<std::byte> index;
 		u32 vertex_count;
+
 	};
 
 	std::vector<std::pair<u32, u32>> command_queue;
diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.cpp b/rpcs3/Emu/RSX/Common/BufferUtils.cpp
index d6ee2349d2..4a72da05a6 100644
--- a/rpcs3/Emu/RSX/Common/BufferUtils.cpp
+++ b/rpcs3/Emu/RSX/Common/BufferUtils.cpp
@@ -1,68 +1,50 @@
 #include "stdafx.h"
 #include "BufferUtils.h"
+#include "../rsx_methods.h"
+#include "../RSXThread.h"
+
 #include "util/to_endian.hpp"
 #include "util/sysinfo.hpp"
-#include "Utilities/JIT.h"
-#include "util/v128.hpp"
-#include "util/simd.hpp"
+#include "util/asm.hpp"
 
-#if !defined(_MSC_VER)
+#include "emmintrin.h"
+#include "immintrin.h"
+
+#define DEBUG_VERTEX_STREAMING 0
+
+#if !defined(_MSC_VER) && defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
 
-#if defined(ARCH_ARM64)
-#if !defined(_MSC_VER)
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif
-#undef FORCE_INLINE
-#include "Emu/CPU/sse2neon.h"
-#endif
-
-#if defined(_MSC_VER) || !defined(__SSE2__)
+#if defined(_MSC_VER)
+#define SSSE3_FUNC
 #define SSE4_1_FUNC
 #define AVX2_FUNC
-#define AVX3_FUNC
 #else
+#define SSSE3_FUNC __attribute__((__target__("ssse3")))
 #define SSE4_1_FUNC __attribute__((__target__("sse4.1")))
 #define AVX2_FUNC __attribute__((__target__("avx2")))
-#define AVX3_FUNC __attribute__((__target__("avx512f,avx512bw,avx512dq,avx512cd,avx512vl")))
 #endif // _MSC_VER
 
-#if defined(__AVX512F__) && defined(__AVX512VL__) && defined(__AVX512DQ__) && defined(__AVX512CD__) && defined(__AVX512BW__)
-[[maybe_unused]] constexpr bool s_use_ssse3 = true;
-[[maybe_unused]] constexpr bool s_use_sse4_1 = true;
-[[maybe_unused]] constexpr bool s_use_avx2 = true;
-[[maybe_unused]] constexpr bool s_use_avx3 = true;
-#elif defined(__AVX2__)
-[[maybe_unused]] constexpr bool s_use_ssse3 = true;
-[[maybe_unused]] constexpr bool s_use_sse4_1 = true;
-[[maybe_unused]] constexpr bool s_use_avx2 = true;
-[[maybe_unused]] constexpr bool s_use_avx3 = false;
-#elif defined(__SSE4_1__)
-[[maybe_unused]] constexpr bool s_use_ssse3 = true;
-[[maybe_unused]] constexpr bool s_use_sse4_1 = true;
-[[maybe_unused]] constexpr bool s_use_avx2 = false;
-[[maybe_unused]] constexpr bool s_use_avx3 = false;
-#elif defined(__SSSE3__)
-[[maybe_unused]] constexpr bool s_use_ssse3 = true;
-[[maybe_unused]] constexpr bool s_use_sse4_1 = false;
-[[maybe_unused]] constexpr bool s_use_avx2 = false;
-[[maybe_unused]] constexpr bool s_use_avx3 = false;
-#elif defined(ARCH_X64)
-[[maybe_unused]] const bool s_use_ssse3 = utils::has_ssse3();
-[[maybe_unused]] const bool s_use_sse4_1 = utils::has_sse41();
-[[maybe_unused]] const bool s_use_avx2 = utils::has_avx2();
-[[maybe_unused]] const bool s_use_avx3 = utils::has_avx512();
-#else
-[[maybe_unused]] constexpr bool s_use_ssse3 = true; // Non x86
-[[maybe_unused]] constexpr bool s_use_sse4_1 = true; // Non x86
-[[maybe_unused]] constexpr bool s_use_avx2 = false;
-[[maybe_unused]] constexpr bool s_use_avx3 = false;
-#endif
+SSSE3_FUNC static inline __m128i ssse3_shuffle_epi8(__m128i x, __m128i y)
+{
+	return _mm_shuffle_epi8(x, y);
+}
 
-const v128 s_bswap_u32_mask = v128::from32(0x00010203, 0x04050607, 0x08090a0b, 0x0c0d0e0f);
-const v128 s_bswap_u16_mask = v128::from32(0x02030001, 0x06070405, 0x0a0b0809, 0x0e0f0c0d);
+SSE4_1_FUNC static inline u16 sse41_hmin_epu16(__m128i x)
+{
+	return _mm_cvtsi128_si32(_mm_minpos_epu16(x));
+}
+
+SSE4_1_FUNC static inline u16 sse41_hmax_epu16(__m128i x)
+{
+	return ~_mm_cvtsi128_si32(_mm_minpos_epu16(_mm_xor_si128(x, _mm_set1_epi32(-1))));
+}
+
+const bool s_use_ssse3 = utils::has_ssse3();
+const bool s_use_sse4_1 = utils::has_sse41();
+const bool s_use_avx2 = utils::has_avx2();
 
 namespace utils
 {
@@ -75,115 +57,625 @@ namespace utils
 
 namespace
 {
-	template <bool Compare>
-	auto copy_data_swap_u32_naive(u32* dst, const u32* src, u32 count)
+	/**
+	 * Convert CMP vector to RGBA16.
+	 * A vector in CMP (compressed) format is stored as X11Y11Z10 and has a W component of 1.
+	 * X11 and Y11 channels are int between -1024 and 1023 interpreted as -1.f, 1.f
+	 * Z10 is int between -512 and 511 interpreted as -1.f, 1.f
+	 */
+	std::array<u16, 4> decode_cmp_vector(u32 encoded_vector)
 	{
-		u32 result = 0;
-
-		for (u32 i = 0; i < count; i++)
-		{
-			const u32 data = stx::se_storage<u32>::swap(src[i]);
-
-			if constexpr (Compare)
-			{
-				result |= data ^ dst[i];
-			}
-
-			dst[i] = data;
-		}
-
-		if constexpr (Compare)
-		{
-			return static_cast<bool>(result);
-		}
+		u16 Z = encoded_vector >> 22;
+		Z = Z << 6;
+		u16 Y = (encoded_vector >> 11) & 0x7FF;
+		Y = Y << 5;
+		u16 X = encoded_vector & 0x7FF;
+		X = X << 5;
+		return{ X, Y, Z, 1 };
 	}
+}
 
-#if defined(ARCH_X64)
-	template <bool Compare>
-	void build_copy_data_swap_u32(asmjit::simd_builder& c, native_args& args)
+	template <bool unaligned>
+	void stream_data_to_memory_swapped_u32(void *dst, const void *src, u32 vertex_count, u8 stride)
 	{
-		using namespace asmjit;
+		const __m128i mask = _mm_set_epi8(
+			0xC, 0xD, 0xE, 0xF,
+			0x8, 0x9, 0xA, 0xB,
+			0x4, 0x5, 0x6, 0x7,
+			0x0, 0x1, 0x2, 0x3);
 
-		// Load and broadcast shuffle mask
-		if (utils::has_ssse3())
+		auto dst_ptr = static_cast<__m128i*>(dst);
+		auto src_ptr = static_cast<const __m128i*>(src);
+
+		const u32 dword_count = (vertex_count * (stride >> 2));
+		const u32 iterations = dword_count >> 2;
+		const u32 remaining = dword_count % 4;
+
+		if (s_use_ssse3) [[likely]]
 		{
-			c.vec_set_const(c.v1, s_bswap_u32_mask);
-		}
-
-		// Clear v2 (bitwise inequality accumulator)
-		if constexpr (Compare)
-		{
-			c.vec_set_all_zeros(c.v2);
-		}
-
-		c.build_loop(sizeof(u32), x86::eax, args[2].r32(), [&]
-		{
-			c.zero_if_not_masked().vec_load_unaligned(sizeof(u32), c.v0, c.ptr_scale_for_vec(sizeof(u32), args[1], x86::rax));
-
-			if (utils::has_ssse3())
+			for (u32 i = 0; i < iterations; ++i)
 			{
-				c.vec_shuffle_xi8(c.v0, c.v0, c.v1);
-			}
-			else
-			{
-				c.emit(x86::Inst::kIdMovdqa, c.v1, c.v0);
-				c.emit(x86::Inst::kIdPsrlw, c.v0, 8);
-				c.emit(x86::Inst::kIdPsllw, c.v1, 8);
-				c.emit(x86::Inst::kIdPor, c.v0, c.v1);
-				c.emit(x86::Inst::kIdPshuflw, c.v0, c.v0, 0b10110001);
-				c.emit(x86::Inst::kIdPshufhw, c.v0, c.v0, 0b10110001);
-			}
+				const __m128i vector = _mm_loadu_si128(src_ptr);
+				const __m128i shuffled_vector = ssse3_shuffle_epi8(vector, mask);
 
-			if constexpr (Compare)
-			{
-				if (utils::has_avx512())
+				if constexpr (!unaligned)
 				{
-					c.keep_if_not_masked().emit(x86::Inst::kIdVpternlogd, c.v2, c.v0, c.ptr_scale_for_vec(sizeof(u32), args[0], x86::rax), 0xf6); // orAxorBC
+					_mm_stream_si128(dst_ptr, shuffled_vector);
 				}
 				else
 				{
-					c.zero_if_not_masked().vec_load_unaligned(sizeof(u32), c.v3, c.ptr_scale_for_vec(sizeof(u32), args[0], x86::rax));
-					c.vec_xor(sizeof(u32), c.v3, c.v3, c.v0);
-					c.vec_or(sizeof(u32), c.v2, c.v2, c.v3);
+					_mm_storeu_si128(dst_ptr, shuffled_vector);
 				}
-			}
 
-			c.keep_if_not_masked().vec_store_unaligned(sizeof(u32), c.v0, c.ptr_scale_for_vec(sizeof(u32), args[0], x86::rax));
-		}, [&]
+				src_ptr++;
+				dst_ptr++;
+			}
+		}
+		else
 		{
-			if constexpr (Compare)
+			for (u32 i = 0; i < iterations; ++i)
 			{
-				if (c.vsize == 16 && c.vmask == 0)
-				{
-					// Fix for AVX2 path
-					c.vextracti128(x86::xmm0, x86::ymm2, 1);
-					c.vpor(x86::xmm2, x86::xmm2, x86::xmm0);
-				}
-			}
-		});
+				const __m128i vec0 = _mm_loadu_si128(src_ptr);
+				const __m128i vec1 = _mm_or_si128(_mm_slli_epi16(vec0, 8), _mm_srli_epi16(vec0, 8));
+				const __m128i vec2 = _mm_or_si128(_mm_slli_epi32(vec1, 16), _mm_srli_epi32(vec1, 16));
 
-		if constexpr (Compare)
-		{
-			if (c.vsize == 32 && c.vmask == 0)
-				c.vec_clobbering_test(16, x86::xmm2, x86::xmm2);
-			else
-				c.vec_clobbering_test(c.vsize, c.v2, c.v2);
-			c.setnz(x86::al);
+				if constexpr (!unaligned)
+				{
+					_mm_stream_si128(dst_ptr, vec2);
+				}
+				else
+				{
+					_mm_storeu_si128(dst_ptr, vec2);
+				}
+
+				src_ptr++;
+				dst_ptr++;
+			}
 		}
 
-		c.vec_cleanup_ret();
+		if (remaining)
+		{
+			const auto src_ptr2 = utils::bless<const se_t<u32, true, 1>>(src_ptr);
+			const auto dst_ptr2 = utils::bless<nse_t<u32, 1>>(dst_ptr);
+
+			for (u32 i = 0; i < remaining; ++i)
+				dst_ptr2[i] = src_ptr2[i];
+		}
+	}
+
+	template void stream_data_to_memory_swapped_u32<false>(void *, const void *, u32, u8);
+	template void stream_data_to_memory_swapped_u32<true>(void*, const void*, u32, u8);
+
+	template <bool unaligned>
+	bool stream_data_to_memory_swapped_and_compare_u32(void *dst, const void *src, u32 size)
+	{
+		const __m128i mask = _mm_set_epi8(
+			0xC, 0xD, 0xE, 0xF,
+			0x8, 0x9, 0xA, 0xB,
+			0x4, 0x5, 0x6, 0x7,
+			0x0, 0x1, 0x2, 0x3);
+
+		auto dst_ptr = static_cast<__m128i*>(dst);
+		auto src_ptr = static_cast<const __m128i*>(src);
+
+		const u32 dword_count = size >> 2;
+		const u32 iterations = dword_count >> 2;
+
+		__m128i bits_diff = _mm_setzero_si128();
+
+		if (s_use_ssse3) [[likely]]
+		{
+			for (u32 i = 0; i < iterations; ++i)
+			{
+				const __m128i vector = _mm_loadu_si128(src_ptr);
+				const __m128i shuffled_vector = ssse3_shuffle_epi8(vector, mask);
+
+				if constexpr (!unaligned)
+				{
+					bits_diff = _mm_or_si128(bits_diff, _mm_xor_si128(_mm_load_si128(dst_ptr), shuffled_vector));
+					_mm_stream_si128(dst_ptr, shuffled_vector);
+				}
+				else
+				{
+					bits_diff = _mm_or_si128(bits_diff, _mm_xor_si128(_mm_loadu_si128(dst_ptr), shuffled_vector));
+					_mm_storeu_si128(dst_ptr, shuffled_vector);
+				}
+
+				src_ptr++;
+				dst_ptr++;
+			}
+		}
+		else
+		{
+			for (u32 i = 0; i < iterations; ++i)
+			{
+				const __m128i vec0 = _mm_loadu_si128(src_ptr);
+				const __m128i vec1 = _mm_or_si128(_mm_slli_epi16(vec0, 8), _mm_srli_epi16(vec0, 8));
+				const __m128i vec2 = _mm_or_si128(_mm_slli_epi32(vec1, 16), _mm_srli_epi32(vec1, 16));
+
+				if constexpr (!unaligned)
+				{
+					bits_diff = _mm_or_si128(bits_diff, _mm_xor_si128(_mm_load_si128(dst_ptr), vec2));
+					_mm_stream_si128(dst_ptr, vec2);
+				}
+				else
+				{
+					bits_diff = _mm_or_si128(bits_diff, _mm_xor_si128(_mm_loadu_si128(dst_ptr), vec2));
+					_mm_storeu_si128(dst_ptr, vec2);
+				}
+
+				src_ptr++;
+				dst_ptr++;
+			}
+		}
+
+		const u32 remaining = dword_count % 4;
+
+		if (remaining)
+		{
+			const auto src_ptr2 = utils::bless<const se_t<u32, true, 1>>(src_ptr);
+			const auto dst_ptr2 = utils::bless<nse_t<u32, 1>>(dst_ptr);
+
+			for (u32 i = 0; i < remaining; ++i)
+			{
+				const u32 data = src_ptr2[i];
+
+				if (dst_ptr2[i] != data)
+				{
+					dst_ptr2[i] = data;
+					bits_diff = _mm_set1_epi64x(-1);
+				}
+			}
+		}
+
+		return _mm_cvtsi128_si64(_mm_packs_epi32(bits_diff, bits_diff)) != 0;
+	}
+
+	template bool stream_data_to_memory_swapped_and_compare_u32<false>(void *dst, const void *src, u32 size);
+	template bool stream_data_to_memory_swapped_and_compare_u32<true>(void *dst, const void *src, u32 size);
+
+namespace
+{
+	inline void stream_data_to_memory_swapped_u16(void *dst, const void *src, u32 vertex_count, u8 stride)
+	{
+		const __m128i mask = _mm_set_epi8(
+			0xE, 0xF, 0xC, 0xD,
+			0xA, 0xB, 0x8, 0x9,
+			0x6, 0x7, 0x4, 0x5,
+			0x2, 0x3, 0x0, 0x1);
+
+		auto dst_ptr = static_cast<__m128i*>(dst);
+		auto src_ptr = static_cast<const __m128i*>(src);
+
+		const u32 word_count = (vertex_count * (stride >> 1));
+		const u32 iterations = word_count >> 3;
+		const u32 remaining = word_count % 8;
+
+		if (s_use_ssse3) [[likely]]
+		{
+			for (u32 i = 0; i < iterations; ++i)
+			{
+				const __m128i vector = _mm_loadu_si128(src_ptr);
+				const __m128i shuffled_vector = ssse3_shuffle_epi8(vector, mask);
+				_mm_stream_si128(dst_ptr, shuffled_vector);
+
+				src_ptr++;
+				dst_ptr++;
+			}
+		}
+		else
+		{
+			for (u32 i = 0; i < iterations; ++i)
+			{
+				const __m128i vec0 = _mm_loadu_si128(src_ptr);
+				const __m128i vec1 = _mm_or_si128(_mm_slli_epi16(vec0, 8), _mm_srli_epi16(vec0, 8));
+				_mm_stream_si128(dst_ptr, vec1);
+
+				src_ptr++;
+				dst_ptr++;
+			}
+		}
+
+		if (remaining)
+		{
+			auto src_ptr2 = utils::bless<const se_t<u16, true, 1>>(src_ptr);
+			auto dst_ptr2 = utils::bless<nse_t<u16, 1>>(dst_ptr);
+
+			for (u32 i = 0; i < remaining; ++i)
+				dst_ptr2[i] = src_ptr2[i];
+		}
+	}
+
+	inline void stream_data_to_memory_swapped_u32_non_continuous(void *dst, const void *src, u32 vertex_count, u8 dst_stride, u8 src_stride)
+	{
+		const __m128i mask = _mm_set_epi8(
+			0xC, 0xD, 0xE, 0xF,
+			0x8, 0x9, 0xA, 0xB,
+			0x4, 0x5, 0x6, 0x7,
+			0x0, 0x1, 0x2, 0x3);
+
+		auto src_ptr = static_cast<const char*>(src);
+		auto dst_ptr = static_cast<char*>(dst);
+
+		//Count vertices to copy
+		const bool is_128_aligned = !((dst_stride | src_stride) & 15);
+
+		u32 min_block_size = std::min(src_stride, dst_stride);
+		if (min_block_size == 0) min_block_size = dst_stride;
+
+		u32 iterations = 0;
+		u32 remainder = is_128_aligned ? 0 : 1 + ((16 - min_block_size) / min_block_size);
+
+		if (vertex_count > remainder)
+			iterations = vertex_count - remainder;
+		else
+			remainder = vertex_count;
+
+		if (s_use_ssse3) [[likely]]
+		{
+			for (u32 i = 0; i < iterations; ++i)
+			{
+				const __m128i vector = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src_ptr));
+				const __m128i shuffled_vector = ssse3_shuffle_epi8(vector, mask);
+				_mm_storeu_si128(reinterpret_cast<__m128i*>(dst_ptr), shuffled_vector);
+
+				src_ptr += src_stride;
+				dst_ptr += dst_stride;
+			}
+		}
+		else
+		{
+			for (u32 i = 0; i < iterations; ++i)
+			{
+				const __m128i vec0 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src_ptr));
+				const __m128i vec1 = _mm_or_si128(_mm_slli_epi16(vec0, 8), _mm_srli_epi16(vec0, 8));
+				const __m128i vec2 = _mm_or_si128(_mm_slli_epi32(vec1, 16), _mm_srli_epi32(vec1, 16));
+				_mm_storeu_si128(reinterpret_cast<__m128i*>(dst_ptr), vec2);
+
+				src_ptr += src_stride;
+				dst_ptr += dst_stride;
+			}
+		}
+
+		if (remainder)
+		{
+			const u8 attribute_sz = min_block_size >> 2;
+			for (u32 n = 0; n < remainder; ++n)
+			{
+				auto src_ptr2 = utils::bless<const be_t<u32>>(src_ptr);
+				auto dst_ptr2 = utils::bless<u32>(dst_ptr);
+
+				for (u32 v = 0; v < attribute_sz; ++v)
+					dst_ptr2[v] = src_ptr2[v];
+
+				src_ptr += src_stride;
+				dst_ptr += dst_stride;
+			}
+		}
+	}
+
+	inline void stream_data_to_memory_swapped_u16_non_continuous(void *dst, const void *src, u32 vertex_count, u8 dst_stride, u8 src_stride)
+	{
+		const __m128i mask = _mm_set_epi8(
+			0xE, 0xF, 0xC, 0xD,
+			0xA, 0xB, 0x8, 0x9,
+			0x6, 0x7, 0x4, 0x5,
+			0x2, 0x3, 0x0, 0x1);
+
+		auto src_ptr = static_cast<const char*>(src);
+		auto dst_ptr = static_cast<char*>(dst);
+
+		const bool is_128_aligned = !((dst_stride | src_stride) & 15);
+
+		u32 min_block_size = std::min(src_stride, dst_stride);
+		if (min_block_size == 0) min_block_size = dst_stride;
+
+		u32 iterations = 0;
+		u32 remainder = is_128_aligned ? 0 : 1 + ((16 - min_block_size) / min_block_size);
+
+		if (vertex_count > remainder)
+			iterations = vertex_count - remainder;
+		else
+			remainder = vertex_count;
+
+		if (s_use_ssse3) [[likely]]
+		{
+			for (u32 i = 0; i < iterations; ++i)
+			{
+				const __m128i vector = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src_ptr));
+				const __m128i shuffled_vector = ssse3_shuffle_epi8(vector, mask);
+				_mm_storeu_si128(reinterpret_cast<__m128i*>(dst_ptr), shuffled_vector);
+
+				src_ptr += src_stride;
+				dst_ptr += dst_stride;
+			}
+		}
+		else
+		{
+			for (u32 i = 0; i < iterations; ++i)
+			{
+				const __m128i vec0 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(src_ptr));
+				const __m128i vec1 = _mm_or_si128(_mm_slli_epi16(vec0, 8), _mm_srli_epi16(vec0, 8));
+				_mm_storeu_si128(reinterpret_cast<__m128i*>(dst_ptr), vec1);
+
+				src_ptr += src_stride;
+				dst_ptr += dst_stride;
+			}
+		}
+
+		if (remainder)
+		{
+			const u8 attribute_sz = min_block_size >> 1;
+			for (u32 n = 0; n < remainder; ++n)
+			{
+				auto src_ptr2 = utils::bless<const be_t<u16>>(src_ptr);
+				auto dst_ptr2 = utils::bless<u16>(dst_ptr);
+
+				for (u32 v = 0; v < attribute_sz; ++v)
+					dst_ptr2[v] = src_ptr2[v];
+
+				src_ptr += src_stride;
+				dst_ptr += dst_stride;
+			}
+		}
+	}
+
+	inline void stream_data_to_memory_u8_non_continuous(void *dst, const void *src, u32 vertex_count, u8 attribute_size, u8 dst_stride, u8 src_stride)
+	{
+		auto src_ptr = static_cast<const char*>(src);
+		auto dst_ptr = static_cast<char*>(dst);
+
+		switch (attribute_size)
+		{
+			case 4:
+			{
+				//Read one dword every iteration
+				for (u32 vertex = 0; vertex < vertex_count; ++vertex)
+				{
+					*reinterpret_cast<u32*>(dst_ptr) = *reinterpret_cast<const u32*>(src_ptr);
+
+					dst_ptr += dst_stride;
+					src_ptr += src_stride;
+				}
+
+				break;
+			}
+			case 3:
+			{
+				//Read one word and one byte
+				for (u32 vertex = 0; vertex < vertex_count; ++vertex)
+				{
+					*reinterpret_cast<u16*>(dst_ptr) = *reinterpret_cast<const u16*>(src_ptr);
+					dst_ptr[2] = src_ptr[2];
+
+					dst_ptr += dst_stride;
+					src_ptr += src_stride;
+				}
+
+				break;
+			}
+			case 2:
+			{
+				//Copy u16 blocks
+				for (u32 vertex = 0; vertex < vertex_count; ++vertex)
+				{
+					*reinterpret_cast<u16*>(dst_ptr) = *reinterpret_cast<const u16*>(src_ptr);
+
+					dst_ptr += dst_stride;
+					src_ptr += src_stride;
+				}
+
+				break;
+			}
+			case 1:
+			{
+				for (u32 vertex = 0; vertex < vertex_count; ++vertex)
+				{
+					dst_ptr[0] = src_ptr[0];
+
+					dst_ptr += dst_stride;
+					src_ptr += src_stride;
+				}
+
+				break;
+			}
+		}
+	}
+
+	template <typename T, typename U, int N>
+	void copy_whole_attribute_array_impl(void* raw_dst, const void* raw_src, u8 dst_stride, u32 src_stride, u32 vertex_count)
+	{
+		auto src_ptr = static_cast<const char*>(raw_src);
+		auto dst_ptr = static_cast<char*>(raw_dst);
+
+		for (u32 vertex = 0; vertex < vertex_count; ++vertex)
+		{
+			auto typed_dst = reinterpret_cast<T*>(dst_ptr);
+			auto typed_src = reinterpret_cast<const U*>(src_ptr);
+
+			for (u32 i = 0; i < N; ++i)
+			{
+				typed_dst[i] = typed_src[i];
+			}
+
+			src_ptr += src_stride;
+			dst_ptr += dst_stride;
+		}
+	}
+
+	/*
+	 * Copies a number of src vertices, repeated over and over to fill the dst
+	 * e.g repeat 2 vertices over a range of 16 verts, so 8 reps
+	 */
+	template <typename T, typename U, int N>
+	void copy_whole_attribute_array_repeating_impl(void* raw_dst, const void* raw_src, const u8 dst_stride, const u32 src_stride, const u32 vertex_count, const u32 src_vertex_count)
+	{
+		auto src_ptr = static_cast<const char*>(raw_src);
+		auto dst_ptr = static_cast<char*>(raw_dst);
+
+		u32 src_offset = 0;
+		u32 src_limit = src_stride * src_vertex_count;
+
+		for (u32 vertex = 0; vertex < vertex_count; ++vertex)
+		{
+			auto typed_dst = reinterpret_cast<T*>(dst_ptr);
+			auto typed_src = reinterpret_cast<const U*>(src_ptr + src_offset);
+
+			for (u32 i = 0; i < N; ++i)
+			{
+				typed_dst[i] = typed_src[i];
+			}
+
+			src_offset = (src_offset + src_stride) % src_limit;
+			dst_ptr += dst_stride;
+		}
+	}
+
+	template <typename U, typename T>
+	void copy_whole_attribute_array(void* raw_dst, const void* raw_src, const u8 attribute_size, const u8 dst_stride, const u32 src_stride, const u32 vertex_count, const u32 src_vertex_count)
+	{
+		//Eliminate the inner loop by templating the inner loop counter N
+
+		if (src_vertex_count == vertex_count)
+		{
+			switch (attribute_size)
+			{
+			case 1:
+				copy_whole_attribute_array_impl<U, T, 1>(raw_dst, raw_src, dst_stride, src_stride, vertex_count);
+				break;
+			case 2:
+				copy_whole_attribute_array_impl<U, T, 2>(raw_dst, raw_src, dst_stride, src_stride, vertex_count);
+				break;
+			case 3:
+				copy_whole_attribute_array_impl<U, T, 3>(raw_dst, raw_src, dst_stride, src_stride, vertex_count);
+				break;
+			case 4:
+				copy_whole_attribute_array_impl<U, T, 4>(raw_dst, raw_src, dst_stride, src_stride, vertex_count);
+				break;
+			}
+		}
+		else
+		{
+			switch (attribute_size)
+			{
+			case 1:
+				copy_whole_attribute_array_repeating_impl<U, T, 1>(raw_dst, raw_src, dst_stride, src_stride, vertex_count, src_vertex_count);
+				break;
+			case 2:
+				copy_whole_attribute_array_repeating_impl<U, T, 2>(raw_dst, raw_src, dst_stride, src_stride, vertex_count, src_vertex_count);
+				break;
+			case 3:
+				copy_whole_attribute_array_repeating_impl<U, T, 3>(raw_dst, raw_src, dst_stride, src_stride, vertex_count, src_vertex_count);
+				break;
+			case 4:
+				copy_whole_attribute_array_repeating_impl<U, T, 4>(raw_dst, raw_src, dst_stride, src_stride, vertex_count, src_vertex_count);
+				break;
+			}
+		}
 	}
-#endif
 }
 
-#if defined(ARCH_X64)
-DECLARE(copy_data_swap_u32) = build_function_asm<void(*)(u32*, const u32*, u32), asmjit::simd_builder>("copy_data_swap_u32", &build_copy_data_swap_u32<false>);
-DECLARE(copy_data_swap_u32_cmp) = build_function_asm<bool(*)(u32*, const u32*, u32), asmjit::simd_builder>("copy_data_swap_u32_cmp", &build_copy_data_swap_u32<true>);
-#else
-DECLARE(copy_data_swap_u32) = copy_data_swap_u32_naive<false>;
-DECLARE(copy_data_swap_u32_cmp) = copy_data_swap_u32_naive<true>;
+void write_vertex_array_data_to_buffer(std::span<std::byte> raw_dst_span, std::span<const std::byte> src_ptr, u32 count, rsx::vertex_base_type type, u32 vector_element_count, u32 attribute_src_stride, u8 dst_stride, bool swap_endianness)
+{
+	ensure((vector_element_count > 0));
+	const u32 src_read_stride = rsx::get_vertex_type_size_on_host(type, vector_element_count);
+
+	bool use_stream_no_stride = false;
+	bool use_stream_with_stride = false;
+
+	//If stride is not defined, we have a packed array
+	if (attribute_src_stride == 0) attribute_src_stride = src_read_stride;
+
+	//Sometimes, we get a vertex attribute to be repeated. Just copy the supplied vertices only
+	//TODO: Stop these requests from getting here in the first place!
+	//TODO: Check if it is possible to have a repeating array with more than one attribute instance
+	const u32 real_count = static_cast<u32>(src_ptr.size_bytes()) / attribute_src_stride;
+	if (real_count == 1) attribute_src_stride = 0;	//Always fetch src[0]
+
+	//TODO: Determine favourable vertex threshold where vector setup costs become negligible
+	//Tests show that even with 4 vertices, using traditional bswap is significantly slower over a large number of calls
+
+	const u64 src_address = reinterpret_cast<u64>(src_ptr.data());
+	const bool sse_aligned = ((src_address & 15) == 0);
+
+#if !DEBUG_VERTEX_STREAMING
+
+	if (swap_endianness)
+	{
+		if (real_count >= count || real_count == 1)
+		{
+			if (attribute_src_stride == dst_stride && src_read_stride == dst_stride)
+				use_stream_no_stride = true;
+			else
+				use_stream_with_stride = true;
+		}
+	}
+
 #endif
 
+	switch (type)
+	{
+	case rsx::vertex_base_type::ub:
+	case rsx::vertex_base_type::ub256:
+	{
+		if (use_stream_no_stride)
+			memcpy(raw_dst_span.data(), src_ptr.data(), count * dst_stride);
+		else if (use_stream_with_stride)
+			stream_data_to_memory_u8_non_continuous(raw_dst_span.data(), src_ptr.data(), count, vector_element_count, dst_stride, attribute_src_stride);
+		else
+			copy_whole_attribute_array<u8, u8>(raw_dst_span.data(), src_ptr.data(), vector_element_count, dst_stride, attribute_src_stride, count, real_count);
+
+		return;
+	}
+	case rsx::vertex_base_type::s1:
+	case rsx::vertex_base_type::sf:
+	case rsx::vertex_base_type::s32k:
+	{
+		if (use_stream_no_stride && sse_aligned)
+			stream_data_to_memory_swapped_u16(raw_dst_span.data(), src_ptr.data(), count, attribute_src_stride);
+		else if (use_stream_with_stride)
+			stream_data_to_memory_swapped_u16_non_continuous(raw_dst_span.data(), src_ptr.data(), count, dst_stride, attribute_src_stride);
+		else if (swap_endianness)
+			copy_whole_attribute_array<be_t<u16>, u16>(raw_dst_span.data(), src_ptr.data(), vector_element_count, dst_stride, attribute_src_stride, count, real_count);
+		else
+			copy_whole_attribute_array<u16, u16>(raw_dst_span.data(), src_ptr.data(), vector_element_count, dst_stride, attribute_src_stride, count, real_count);
+
+		return;
+	}
+	case rsx::vertex_base_type::f:
+	{
+		if (use_stream_no_stride && sse_aligned)
+			stream_data_to_memory_swapped_u32(raw_dst_span.data(), src_ptr.data(), count, attribute_src_stride);
+		else if (use_stream_with_stride)
+			stream_data_to_memory_swapped_u32_non_continuous(raw_dst_span.data(), src_ptr.data(), count, dst_stride, attribute_src_stride);
+		else if (swap_endianness)
+			copy_whole_attribute_array<be_t<u32>, u32>(raw_dst_span.data(), src_ptr.data(), vector_element_count, dst_stride, attribute_src_stride, count, real_count);
+		else
+			copy_whole_attribute_array<u32, u32>(raw_dst_span.data(), src_ptr.data(), vector_element_count, dst_stride, attribute_src_stride, count, real_count);
+
+		return;
+	}
+	case rsx::vertex_base_type::cmp:
+	{
+		std::span<u16> dst_span = utils::bless<u16>(raw_dst_span);
+		for (u32 i = 0; i < count; ++i)
+		{
+			u32 src_value;
+			memcpy(&src_value, src_ptr.subspan(attribute_src_stride * i).data(), sizeof(u32));
+
+			if (swap_endianness) src_value = stx::se_storage<u32>::swap(src_value);
+
+			const auto& decoded_vector                 = decode_cmp_vector(src_value);
+			dst_span[i * dst_stride / sizeof(u16)] = decoded_vector[0];
+			dst_span[i * dst_stride / sizeof(u16) + 1] = decoded_vector[1];
+			dst_span[i * dst_stride / sizeof(u16) + 2] = decoded_vector[2];
+			dst_span[i * dst_stride / sizeof(u16) + 3] = decoded_vector[3];
+		}
+		return;
+	}
+	}
+}
+
 namespace
 {
 	template <typename T>
@@ -206,275 +698,336 @@ namespace
 
 	struct untouched_impl
 	{
-		template <typename T>
-		static u64 upload_untouched_naive(const be_t<T>* src, T* dst, u32 count)
+		SSE4_1_FUNC
+		static
+		std::tuple<u16, u16, u32> upload_u16_swapped_sse4_1(const void *src, void *dst, u32 count)
 		{
-			u32 written = 0;
-			T max_index = 0;
-			T min_index = -1;
+			const __m128i mask = _mm_set_epi8(
+				0xE, 0xF, 0xC, 0xD,
+				0xA, 0xB, 0x8, 0x9,
+				0x6, 0x7, 0x4, 0x5,
+				0x2, 0x3, 0x0, 0x1);
 
-			while (count--)
+			auto src_stream = static_cast<const __m128i*>(src);
+			auto dst_stream = static_cast<__m128i*>(dst);
+
+			__m128i min = _mm_set1_epi16(-1);
+			__m128i max = _mm_set1_epi16(0);
+
+			const auto iterations = count / 8;
+			for (unsigned n = 0; n < iterations; ++n)
+			{
+				const __m128i raw = _mm_loadu_si128(src_stream++);
+				const __m128i value = _mm_shuffle_epi8(raw, mask);
+				max = _mm_max_epu16(max, value);
+				min = _mm_min_epu16(min, value);
+				_mm_storeu_si128(dst_stream++, value);
+			}
+
+			const u16 min_index = sse41_hmin_epu16(min);
+			const u16 max_index = sse41_hmax_epu16(max);
+
+			return std::make_tuple(min_index, max_index, count);
+		}
+
+		SSE4_1_FUNC
+		static
+		std::tuple<u32, u32, u32> upload_u32_swapped_sse4_1(const void *src, void *dst, u32 count)
+		{
+			const __m128i mask = _mm_set_epi8(
+				0xC, 0xD, 0xE, 0xF,
+				0x8, 0x9, 0xA, 0xB,
+				0x4, 0x5, 0x6, 0x7,
+				0x0, 0x1, 0x2, 0x3);
+
+			auto src_stream = static_cast<const __m128i*>(src);
+			auto dst_stream = static_cast<__m128i*>(dst);
+
+			__m128i min = _mm_set1_epi32(~0u);
+			__m128i max = _mm_set1_epi32(0);
+
+			const auto iterations = count / 4;
+			for (unsigned n = 0; n < iterations; ++n)
+			{
+				const __m128i raw = _mm_loadu_si128(src_stream++);
+				const __m128i value = _mm_shuffle_epi8(raw, mask);
+				max = _mm_max_epu32(max, value);
+				min = _mm_min_epu32(min, value);
+				_mm_storeu_si128(dst_stream++, value);
+			}
+
+			__m128i tmp = _mm_srli_si128(min, 8);
+			min = _mm_min_epu32(min, tmp);
+			tmp = _mm_srli_si128(min, 4);
+			min = _mm_min_epu32(min, tmp);
+
+			tmp = _mm_srli_si128(max, 8);
+			max = _mm_max_epu32(max, tmp);
+			tmp = _mm_srli_si128(max, 4);
+			max = _mm_max_epu32(max, tmp);
+
+			const u32 min_index = _mm_cvtsi128_si32(min);
+			const u32 max_index = _mm_cvtsi128_si32(max);
+
+			return std::make_tuple(min_index, max_index, count);
+		}
+
+		template<typename T>
+		static
+		std::tuple<T, T, u32> upload_untouched(std::span<to_be_t<const T>> src, std::span<T> dst)
+		{
+			T min_index, max_index;
+			u32 written;
+			u32 remaining = ::size32(src);
+
+			if (s_use_sse4_1 && remaining >= 32)
+			{
+				if constexpr (std::is_same<T, u32>::value)
+				{
+					const auto count = (remaining & ~0x3);
+					std::tie(min_index, max_index, written) = upload_u32_swapped_sse4_1(src.data(), dst.data(), count);
+				}
+				else if constexpr (std::is_same<T, u16>::value)
+				{
+					const auto count = (remaining & ~0x7);
+					std::tie(min_index, max_index, written) = upload_u16_swapped_sse4_1(src.data(), dst.data(), count);
+				}
+				else
+				{
+					fmt::throw_exception("Unreachable");
+				}
+
+				remaining -= written;
+			}
+			else
+			{
+				min_index = index_limit<T>();
+				max_index = 0;
+				written = 0;
+			}
+
+			while (remaining--)
 			{
 				T index = src[written];
 				dst[written++] = min_max(min_index, max_index, index);
 			}
 
-			return (u64{max_index} << 32) | u64{min_index};
-		}
-
-#if defined(ARCH_X64)
-		template <typename T>
-		static void build_upload_untouched(asmjit::simd_builder& c, native_args& args)
-		{
-			using namespace asmjit;
-
-			if (!utils::has_sse41())
-			{
-				c.jmp(&upload_untouched_naive<T>);
-				return;
-			}
-
-			c.vec_set_const(c.v1, sizeof(T) == 2 ? s_bswap_u16_mask : s_bswap_u32_mask);
-			c.vec_set_all_ones(c.v2); // vec min
-			c.vec_set_all_zeros(c.v3); // vec max
-
-			c.build_loop(sizeof(T), x86::eax, args[2].r32(), [&]
-			{
-				c.zero_if_not_masked().vec_load_unaligned(sizeof(T), c.v0, c.ptr_scale_for_vec(sizeof(T), args[0], x86::rax));
-
-				if (utils::has_ssse3())
-				{
-					c.vec_shuffle_xi8(c.v0, c.v0, c.v1);
-				}
-				else
-				{
-					c.emit(x86::Inst::kIdMovdqa, c.v1, c.v0);
-					c.emit(x86::Inst::kIdPsrlw, c.v0, 8);
-					c.emit(x86::Inst::kIdPsllw, c.v1, 8);
-					c.emit(x86::Inst::kIdPor, c.v0, c.v1);
-
-					if constexpr (sizeof(T) == 4)
-					{
-						c.emit(x86::Inst::kIdPshuflw, c.v0, c.v0, 0b10110001);
-						c.emit(x86::Inst::kIdPshufhw, c.v0, c.v0, 0b10110001);
-					}
-				}
-
-				c.keep_if_not_masked().vec_umax(sizeof(T), c.v3, c.v3, c.v0);
-				c.keep_if_not_masked().vec_umin(sizeof(T), c.v2, c.v2, c.v0);
-				c.keep_if_not_masked().vec_store_unaligned(sizeof(T), c.v0, c.ptr_scale_for_vec(sizeof(T), args[1], x86::rax));
-			}, [&]
-			{
-				// Compress horizontally, protect high values
-				c.vec_extract_high(sizeof(T), c.v0, c.v3);
-				c.vec_umax(sizeof(T), c.v3, c.v3, c.v0);
-				c.vec_extract_high(sizeof(T), c.v0, c.v2);
-				c.vec_umin(sizeof(T), c.v2, c.v2, c.v0);
-			});
-
-			c.vec_extract_gpr(sizeof(T), x86::edx, c.v3);
-			c.vec_extract_gpr(sizeof(T), x86::eax, c.v2);
-			c.shl(x86::rdx, 32);
-			c.or_(x86::rax, x86::rdx);
-			c.vec_cleanup_ret();
-		}
-
-		static inline auto upload_xi16 = build_function_asm<u64(*)(const be_t<u16>*, u16*, u32), asmjit::simd_builder>("untouched_upload_xi16", &build_upload_untouched<u16>);
-		static inline auto upload_xi32 = build_function_asm<u64(*)(const be_t<u32>*, u32*, u32), asmjit::simd_builder>("untouched_upload_xi32", &build_upload_untouched<u32>);
-#endif
-
-		template <typename T>
-		static std::tuple<T, T, u32> upload_untouched(std::span<to_be_t<const T>> src, std::span<T> dst)
-		{
-			T min_index, max_index;
-			u32 count = ::size32(src);
-			u64 r;
-
-#if defined(ARCH_X64)
-			if constexpr (sizeof(T) == 2)
-				r = upload_xi16(src.data(), dst.data(), count);
-			else
-				r = upload_xi32(src.data(), dst.data(), count);
-#else
-			r = upload_untouched_naive(src.data(), dst.data(), count);
-#endif
-
-			min_index = static_cast<T>(r);
-			max_index = static_cast<T>(r >> 32);
-
-			return std::make_tuple(min_index, max_index, count);
+			return std::make_tuple(min_index, max_index, written);
 		}
 	};
 
 	struct primitive_restart_impl
 	{
-		template <typename T>
-		static inline u64 upload_untouched_naive(const be_t<T>* src, T* dst, u32 count, T restart_index)
+		AVX2_FUNC
+		static
+		std::tuple<u16, u16> upload_u16_swapped_avx2(const void *src, void *dst, u32 iterations, u16 restart_index)
+		{
+			const __m256i shuffle_mask = _mm256_set_epi8(
+				0xE, 0xF, 0xC, 0xD,
+				0xA, 0xB, 0x8, 0x9,
+				0x6, 0x7, 0x4, 0x5,
+				0x2, 0x3, 0x0, 0x1,
+				0xE, 0xF, 0xC, 0xD,
+				0xA, 0xB, 0x8, 0x9,
+				0x6, 0x7, 0x4, 0x5,
+				0x2, 0x3, 0x0, 0x1);
+
+			auto src_stream = static_cast<const __m256i*>(src);
+			auto dst_stream = static_cast<__m256i*>(dst);
+
+			__m256i restart = _mm256_set1_epi16(restart_index);
+			__m256i min = _mm256_set1_epi16(-1);
+			__m256i max = _mm256_set1_epi16(0);
+
+			for (unsigned n = 0; n < iterations; ++n)
+			{
+				const __m256i raw = _mm256_loadu_si256(src_stream++);
+				const __m256i value = _mm256_shuffle_epi8(raw, shuffle_mask);
+				const __m256i mask = _mm256_cmpeq_epi16(restart, value);
+				const __m256i value_with_min_restart = _mm256_andnot_si256(mask, value);
+				const __m256i value_with_max_restart = _mm256_or_si256(mask, value);
+				max = _mm256_max_epu16(max, value_with_min_restart);
+				min = _mm256_min_epu16(min, value_with_max_restart);
+				_mm256_storeu_si256(dst_stream++, value_with_max_restart);
+			}
+
+			__m128i tmp = _mm256_extracti128_si256(min, 1);
+			__m128i min2 = _mm256_castsi256_si128(min);
+			min2 = _mm_min_epu16(min2, tmp);
+
+			tmp = _mm256_extracti128_si256(max, 1);
+			__m128i max2 = _mm256_castsi256_si128(max);
+			max2 = _mm_max_epu16(max2, tmp);
+
+			const u16 min_index = sse41_hmin_epu16(min2);
+			const u16 max_index = sse41_hmax_epu16(max2);
+
+			return std::make_tuple(min_index, max_index);
+		}
+
+		SSE4_1_FUNC
+		static
+		std::tuple<u16, u16> upload_u16_swapped_sse4_1(const void *src, void *dst, u32 iterations, u16 restart_index)
+		{
+			const __m128i shuffle_mask = _mm_set_epi8(
+				0xE, 0xF, 0xC, 0xD,
+				0xA, 0xB, 0x8, 0x9,
+				0x6, 0x7, 0x4, 0x5,
+				0x2, 0x3, 0x0, 0x1);
+
+			auto src_stream = static_cast<const __m128i*>(src);
+			auto dst_stream = static_cast<__m128i*>(dst);
+
+			__m128i restart = _mm_set1_epi16(restart_index);
+			__m128i min = _mm_set1_epi16(-1);
+			__m128i max = _mm_set1_epi16(0);
+
+			for (unsigned n = 0; n < iterations; ++n)
+			{
+				const __m128i raw = _mm_loadu_si128(src_stream++);
+				const __m128i value = _mm_shuffle_epi8(raw, shuffle_mask);
+				const __m128i mask = _mm_cmpeq_epi16(restart, value);
+				const __m128i value_with_min_restart = _mm_andnot_si128(mask, value);
+				const __m128i value_with_max_restart = _mm_or_si128(mask, value);
+				max = _mm_max_epu16(max, value_with_min_restart);
+				min = _mm_min_epu16(min, value_with_max_restart);
+				_mm_storeu_si128(dst_stream++, value_with_max_restart);
+			}
+
+			const u16 min_index = sse41_hmin_epu16(min);
+			const u16 max_index = sse41_hmax_epu16(max);
+
+			return std::make_tuple(min_index, max_index);
+		}
+
+		SSE4_1_FUNC
+		static
+		std::tuple<u32, u32> upload_u32_swapped_sse4_1(const void *src, void *dst, u32 iterations, u32 restart_index)
+		{
+			const __m128i shuffle_mask = _mm_set_epi8(
+				0xC, 0xD, 0xE, 0xF,
+				0x8, 0x9, 0xA, 0xB,
+				0x4, 0x5, 0x6, 0x7,
+				0x0, 0x1, 0x2, 0x3);
+
+			auto src_stream = static_cast<const __m128i*>(src);
+			auto dst_stream = static_cast<__m128i*>(dst);
+
+			__m128i restart = _mm_set1_epi32(restart_index);
+			__m128i min = _mm_set1_epi32(0xffffffff);
+			__m128i max = _mm_set1_epi32(0);
+
+			for (unsigned n = 0; n < iterations; ++n)
+			{
+				const __m128i raw = _mm_loadu_si128(src_stream++);
+				const __m128i value = _mm_shuffle_epi8(raw, shuffle_mask);
+				const __m128i mask = _mm_cmpeq_epi32(restart, value);
+				const __m128i value_with_min_restart = _mm_andnot_si128(mask, value);
+				const __m128i value_with_max_restart = _mm_or_si128(mask, value);
+				max = _mm_max_epu32(max, value_with_min_restart);
+				min = _mm_min_epu32(min, value_with_max_restart);
+				_mm_storeu_si128(dst_stream++, value_with_max_restart);
+			}
+
+			__m128i tmp = _mm_srli_si128(min, 8);
+			min = _mm_min_epu32(min, tmp);
+			tmp = _mm_srli_si128(min, 4);
+			min = _mm_min_epu32(min, tmp);
+
+			tmp = _mm_srli_si128(max, 8);
+			max = _mm_max_epu32(max, tmp);
+			tmp = _mm_srli_si128(max, 4);
+			max = _mm_max_epu32(max, tmp);
+
+			const u32 min_index = _mm_cvtsi128_si32(min);
+			const u32 max_index = _mm_cvtsi128_si32(max);
+
+			return std::make_tuple(min_index, max_index);
+		}
+
+		template<typename T>
+		static
+		std::tuple<T, T, u32> upload_untouched(std::span<to_be_t<const T>> src, std::span<T> dst, T restart_index, bool skip_restart)
 		{
 			T min_index = index_limit<T>();
 			T max_index = 0;
+			u32 written = 0;
+			u32 length = ::size32(src);
 
-			for (u32 i = 0; i < count; ++i)
+			if (length >= 32 && !skip_restart)
 			{
-				T index = src[i].value();
-				dst[i] = index == restart_index ? index_limit<T>() : min_max(min_index, max_index, index);
-			}
-
-			return (u64{max_index} << 32) | u64{min_index};
-		}
-
-#ifdef ARCH_X64
-		template <typename T>
-		static void build_upload_untouched(asmjit::simd_builder& c, native_args& args)
-		{
-			using namespace asmjit;
-
-			if (!utils::has_sse41())
-			{
-				c.jmp(&upload_untouched_naive<T>);
-				return;
-			}
-
-			c.vec_set_const(c.v1, sizeof(T) == 2 ? s_bswap_u16_mask : s_bswap_u32_mask);
-			c.vec_set_all_ones(c.v2); // vec min
-			c.vec_set_all_zeros(c.v3); // vec max
-			c.vec_broadcast_gpr(sizeof(T), c.v4, args[3].r32());
-
-			c.build_loop(sizeof(T), x86::eax, args[2].r32(), [&]
-			{
-				c.zero_if_not_masked().vec_load_unaligned(sizeof(T), c.v0, c.ptr_scale_for_vec(sizeof(T), args[0], x86::rax));
-
-				if (utils::has_ssse3())
+				if constexpr (std::is_same<T, u16>::value)
 				{
-					c.vec_shuffle_xi8(c.v0, c.v0, c.v1);
+					if (s_use_avx2)
+					{
+						u32 iterations = length >> 4;
+						written = length & ~0xF;
+						std::tie(min_index, max_index) = upload_u16_swapped_avx2(src.data(), dst.data(), iterations, restart_index);
+					}
+					else if (s_use_sse4_1)
+					{
+						u32 iterations = length >> 3;
+						written = length & ~0x7;
+						std::tie(min_index, max_index) = upload_u16_swapped_sse4_1(src.data(), dst.data(), iterations, restart_index);
+					}
+				}
+				else if constexpr (std::is_same<T, u32>::value)
+				{
+					if (s_use_sse4_1)
+					{
+						u32 iterations = length >> 2;
+						written = length & ~0x3;
+						std::tie(min_index, max_index) = upload_u32_swapped_sse4_1(src.data(), dst.data(), iterations, restart_index);
+					}
 				}
 				else
 				{
-					c.emit(x86::Inst::kIdMovdqa, c.v1, c.v0);
-					c.emit(x86::Inst::kIdPsrlw, c.v0, 8);
-					c.emit(x86::Inst::kIdPsllw, c.v1, 8);
-					c.emit(x86::Inst::kIdPor, c.v0, c.v1);
+					fmt::throw_exception("Unreachable");
+				}
+			}
 
-					if constexpr (sizeof(T) == 4)
+			for (u32 i = written; i < length; ++i)
+			{
+				T index = src[i];
+				if (index == restart_index)
+				{
+					if (!skip_restart)
 					{
-						c.emit(x86::Inst::kIdPshuflw, c.v0, c.v0, 0b10110001);
-						c.emit(x86::Inst::kIdPshufhw, c.v0, c.v0, 0b10110001);
+						dst[written++] = index_limit<T>();
 					}
 				}
+				else
+				{
+					dst[written++] = min_max(min_index, max_index, index);
+				}
+			}
 
-				c.vec_cmp_eq(sizeof(T), c.v5, c.v4, c.v0);
-				c.vec_andn(sizeof(T), c.v5, c.v5, c.v0);
-				c.keep_if_not_masked().vec_umax(sizeof(T), c.v3, c.v3, c.v5);
-				c.vec_cmp_eq(sizeof(T), c.v5, c.v4, c.v0);
-				c.vec_or(sizeof(T), c.v0, c.v0, c.v5);
-				c.keep_if_not_masked().vec_umin(sizeof(T), c.v2, c.v2, c.v0);
-				c.keep_if_not_masked().vec_store_unaligned(sizeof(T), c.v0, c.ptr_scale_for_vec(sizeof(T), args[1], x86::rax));
-			}, [&]
-			{
-				// Compress horizontally, protect high values
-				c.vec_extract_high(sizeof(T), c.v0, c.v3);
-				c.vec_umax(sizeof(T), c.v3, c.v3, c.v0);
-				c.vec_extract_high(sizeof(T), c.v0, c.v2);
-				c.vec_umin(sizeof(T), c.v2, c.v2, c.v0);
-			});
-
-			c.vec_extract_gpr(sizeof(T), x86::edx, c.v3);
-			c.vec_extract_gpr(sizeof(T), x86::eax, c.v2);
-			c.shl(x86::rdx, 32);
-			c.or_(x86::rax, x86::rdx);
-			c.vec_cleanup_ret();
-		}
-
-		static inline auto upload_xi16 = build_function_asm<u64(*)(const be_t<u16>*, u16*, u32, u32), asmjit::simd_builder>("restart_untouched_upload_xi16", &build_upload_untouched<u16>);
-		static inline auto upload_xi32 = build_function_asm<u64(*)(const be_t<u32>*, u32*, u32, u32), asmjit::simd_builder>("restart_untouched_upload_xi32", &build_upload_untouched<u32>);
-#endif
-
-		template <typename T>
-		static inline std::tuple<T, T, u32> upload_untouched(std::span<to_be_t<const T>> src, std::span<T> dst, T restart_index)
-		{
-			T min_index, max_index;
-			u32 count = ::size32(src);
-			u64 r;
-
-#if defined(ARCH_X64)
-			if constexpr (sizeof(T) == 2)
-				r = upload_xi16(src.data(), dst.data(), count, restart_index);
-			else
-				r = upload_xi32(src.data(), dst.data(), count, restart_index);
-#else
-			r = upload_untouched_naive(src.data(), dst.data(), count, restart_index);
-#endif
-
-			min_index = static_cast<T>(r);
-			max_index = static_cast<T>(r >> 32);
-
-			return std::make_tuple(min_index, max_index, count);
+			return std::make_tuple(min_index, max_index, written);
 		}
 	};
 
-	template <typename T>
-	NEVER_INLINE std::tuple<T, T, u32> upload_untouched_skip_restart(std::span<to_be_t<const T>> src, std::span<T> dst, T restart_index)
-	{
-		T min_index = index_limit<T>();
-		T max_index = 0;
-		u32 written = 0;
-		u32 length = ::size32(src);
-
-		for (u32 i = written; i < length; ++i)
-		{
-			T index = src[i];
-			if (index != restart_index)
-			{
-				dst[written++] = min_max(min_index, max_index, index);
-			}
-		}
-
-		return std::make_tuple(min_index, max_index, written);
-	}
-
-	template<typename T, typename U = remove_be_t<T>>
-		requires std::is_same_v<U, u32> || std::is_same_v<U, u16>
+	template<typename T>
 	std::tuple<T, T, u32> upload_untouched(std::span<to_be_t<const T>> src, std::span<T> dst, rsx::primitive_type draw_mode, bool is_primitive_restart_enabled, u32 primitive_restart_index)
 	{
-		if constexpr (std::is_same_v<T, u16>)
-		{
-			if (primitive_restart_index > 0xffff)
-			{
-				// Will never trip index restart, unpload untouched
-				is_primitive_restart_enabled = false;
-			}
-		}
-
 		if (!is_primitive_restart_enabled)
 		{
 			return untouched_impl::upload_untouched(src, dst);
 		}
-
-		if (is_primitive_disjointed(draw_mode))
+		else if constexpr (std::is_same<T, u16>::value)
 		{
-			return upload_untouched_skip_restart(src, dst, static_cast<U>(primitive_restart_index));
+			if (primitive_restart_index > 0xffff)
+			{
+				return untouched_impl::upload_untouched(src, dst);
+			}
+			else
+			{
+				return primitive_restart_impl::upload_untouched(src, dst, static_cast<u16>(primitive_restart_index), is_primitive_disjointed(draw_mode));
+			}
 		}
-
-		return primitive_restart_impl::upload_untouched(src, dst, static_cast<U>(primitive_restart_index));
-	}
-
-	void iota16(u16* dst, u32 count)
-	{
-		unsigned i = 0;
-#if defined(ARCH_X64) || defined(ARCH_ARM64)
-		const unsigned step = 8;                          // We do 8 entries per step
-		const __m128i vec_step = _mm_set1_epi16(8);     // Constant to increment the raw values
-		__m128i values = _mm_set_epi16(7, 6, 5, 4, 3, 2, 1, 0);
-		__m128i* vec_ptr = utils::bless<__m128i>(dst);
-
-		for (; (i + step) <= count; i += step, vec_ptr++)
+		else
 		{
-			_mm_stream_si128(vec_ptr, values);
-			_mm_add_epi16(values,  vec_step);
+			return primitive_restart_impl::upload_untouched(src, dst, primitive_restart_index, is_primitive_disjointed(draw_mode));
 		}
-#endif
-		for (; i < count; ++i)
-			dst[i] = i;
 	}
 
 	template<typename T>
@@ -588,6 +1141,8 @@ bool is_primitive_native(rsx::primitive_type draw_mode)
 	case rsx::primitive_type::triangle_fan:
 	case rsx::primitive_type::quads:
 		return false;
+	case rsx::primitive_type::invalid:
+		break;
 	}
 
 	fmt::throw_exception("Wrong primitive type");
@@ -645,7 +1200,8 @@ void write_index_array_for_non_indexed_non_native_primitive_to_buffer(char* dst,
 	switch (draw_mode)
 	{
 	case rsx::primitive_type::line_loop:
-		iota16(typedDst, count);
+		for (unsigned i = 0; i < count; ++i)
+			typedDst[i] = i;
 		typedDst[count] = 0;
 		return;
 	case rsx::primitive_type::triangle_fan:
@@ -677,6 +1233,8 @@ void write_index_array_for_non_indexed_non_native_primitive_to_buffer(char* dst,
 	case rsx::primitive_type::triangles:
 	case rsx::primitive_type::triangle_strip:
 		fmt::throw_exception("Native primitive type doesn't require expansion");
+	case rsx::primitive_type::invalid:
+		break;
 	}
 
 	fmt::throw_exception("Tried to load invalid primitive type");
@@ -741,3 +1299,19 @@ std::tuple<u32, u32, u32> write_index_array_data_to_buffer(std::span<std::byte>
 		fmt::throw_exception("Unreachable");
 	}
 }
+
+void stream_vector(void *dst, u32 x, u32 y, u32 z, u32 w)
+{
+	const __m128i vector = _mm_set_epi32(w, z, y, x);
+	_mm_stream_si128(reinterpret_cast<__m128i*>(dst), vector);
+}
+
+void stream_vector(void *dst, f32 x, f32 y, f32 z, f32 w)
+{
+	stream_vector(dst, std::bit_cast<u32>(x), std::bit_cast<u32>(y), std::bit_cast<u32>(z), std::bit_cast<u32>(w));
+}
+void stream_vector_from_memory(void *dst, void *src)
+{
+	const __m128i vector = _mm_loadu_si128(reinterpret_cast<__m128i*>(src));
+	_mm_stream_si128(reinterpret_cast<__m128i*>(dst), vector);
+}
diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.h b/rpcs3/Emu/RSX/Common/BufferUtils.h
index 183ee1f8da..1ce46091ad 100644
--- a/rpcs3/Emu/RSX/Common/BufferUtils.h
+++ b/rpcs3/Emu/RSX/Common/BufferUtils.h
@@ -4,6 +4,12 @@
 
 #include <span>
 
+/**
+ * Write count vertex attributes from src_ptr.
+ * src_ptr array layout is deduced from the type, vector element count and src_stride arguments.
+ */
+void write_vertex_array_data_to_buffer(std::span<std::byte> raw_dst_span, std::span<const std::byte> src_ptr, u32 count, rsx::vertex_base_type type, u32 vector_element_count, u32 attribute_src_stride, u8 dst_stride, bool swap_endianness);
+
 /*
  * If primitive mode is not supported and need to be emulated (using an index buffer) returns false.
  */
@@ -38,8 +44,21 @@ std::tuple<u32, u32, u32> write_index_array_data_to_buffer(std::span<std::byte>
  */
 void write_index_array_for_non_indexed_non_native_primitive_to_buffer(char* dst, rsx::primitive_type draw_mode, unsigned count);
 
-// Copy and swap data in 32-bit units
-extern void(*const copy_data_swap_u32)(u32* dst, const u32* src, u32 count);
+/**
+ * Stream a 128 bits vector to dst.
+ */
+void stream_vector(void *dst, f32 x, f32 y, f32 z, f32 w);
+void stream_vector(void *dst, u32 x, u32 y, u32 z, u32 w);
 
-// Copy and swap data in 32-bit units, return true if changed
-extern bool(*const copy_data_swap_u32_cmp)(u32* dst, const u32* src, u32 count);
+/**
+ * Stream a 128 bits vector from src to dst.
+ */
+void stream_vector_from_memory(void *dst, void *src);
+
+/**
+ * Stream and swap data in u32 units.
+ */
+template <bool unaligned = false>
+void stream_data_to_memory_swapped_u32(void *dst, const void *src, u32 vertex_count, u8 stride);
+template <bool unaligned = false>
+bool stream_data_to_memory_swapped_and_compare_u32(void *dst, const void *src, u32 size);
diff --git a/rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl b/rpcs3/Emu/RSX/Common/Interpreter/FragmentInterpreter.glsl
similarity index 77%
rename from rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl
rename to rpcs3/Emu/RSX/Common/Interpreter/FragmentInterpreter.glsl
index 0af25a0150..8229eb42ee 100644
--- a/rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl
+++ b/rpcs3/Emu/RSX/Common/Interpreter/FragmentInterpreter.glsl
@@ -86,11 +86,8 @@ layout(location=0) in vec4 in_regs[16];
 #define CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT 0xe
 #define CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS 0x40
 
-#define GET_BITS(bitfield, offset, count) bitfieldExtract(bitfield, offset, count)
-#define TEST_BIT(bitfield, offset) (GET_BITS(bitfield, offset, 1) > 0)
-
-#define GET_INST_BITS(word, offset, count) GET_BITS(inst.words[word], offset, count)
-#define TEST_INST_BIT(word, offset) (GET_INST_BITS(word, offset, 1) > 0)
+#define GET_BITS(word, offset, count) bitfieldExtract(inst.words[word], offset, count)
+#define TEST_BIT(word, offset) (GET_BITS(word, offset, 1) > 0)
 
 #define select mix
 #define reg_mov(d, s, m) d = select(d, s, m)
@@ -177,7 +174,7 @@ int counter = 0;
 
 vec4 read_src(const in int index)
 {
-	ur0 = GET_INST_BITS(index + 1, 0, 2);
+	ur0 = GET_BITS(index + 1, 0, 2);
 
 	switch (ur0)
 	{
@@ -186,14 +183,14 @@ vec4 read_src(const in int index)
 		switch(index)
 		{
 		case 0:
-			ur1 = GET_INST_BITS(1, 2, 6); break;
+			ur1 = GET_BITS(1, 2, 6); break;
 		case 1:
-			ur1 = GET_INST_BITS(2, 2, 6); break;
+			ur1 = GET_BITS(2, 2, 6); break;
 		case 2:
-			ur1 = GET_INST_BITS(3, 2, 6); break;
+			ur1 = GET_BITS(3, 2, 6); break;
 		}
 
-		if (TEST_INST_BIT(index + 1, 8))
+		if (TEST_BIT(index + 1, 8))
 		{
 			vr0 = regs16[ur1];
 		}
@@ -205,7 +202,7 @@ vec4 read_src(const in int index)
 	}
 	case RSX_FP_REGISTER_TYPE_INPUT:
 	{
-		ur1 = GET_INST_BITS(0, 13, 4);
+		ur1 = GET_BITS(0, 13, 4);
 		switch (ur1)
 		{
 		case 0:
@@ -238,27 +235,27 @@ vec4 read_src(const in int index)
 	}
 	}
 
-	ur1 = GET_INST_BITS(index + 1, 9, 8);
+	ur1 = GET_BITS(index + 1, 9, 8);
 	vr0 = shuffle(vr0, ur1);
 
 	// abs
 	if (index == 0)
 	{
-		if (TEST_INST_BIT(1, 29)) vr0 = abs(vr0);
+		if (TEST_BIT(1, 29)) vr0 = abs(vr0);
 	}
 	else
 	{
 		ur1 = index + 1;
-		if (TEST_INST_BIT(ur1, 18)) vr0 = abs(vr0);
+		if (TEST_BIT(ur1, 18)) vr0 = abs(vr0);
 	}
 
 	// neg
-	return (TEST_INST_BIT(index + 1, 17))? -vr0 : vr0;
+	return (TEST_BIT(index + 1, 17))? -vr0 : vr0;
 }
 
 vec4 read_cond()
 {
-	return shuffle(cc[GET_INST_BITS(1, 31, 1)], GET_INST_BITS(1, 21, 8));
+	return shuffle(cc[GET_BITS(1, 31, 1)], GET_BITS(1, 21, 8));
 }
 
 bvec4 decode_cond(const in uint mode, const in vec4 cond)
@@ -286,7 +283,7 @@ bvec4 decode_cond(const in uint mode, const in vec4 cond)
 
 bool check_cond()
 {
-	ur0 = GET_INST_BITS(1, 18, 3);
+	ur0 = GET_BITS(1, 18, 3);
 	if (ur0 == 0x7)
 	{
 		return true;
@@ -301,89 +298,31 @@ bool check_cond()
 
 #ifdef WITH_TEXTURES
 
-#define RSX_SAMPLE_TEXTURE_1D   0
-#define RSX_SAMPLE_TEXTURE_2D   1
-#define RSX_SAMPLE_TEXTURE_CUBE 2
-#define RSX_SAMPLE_TEXTURE_3D   3
-
-// FIXME: Remove when codegen is unified
-#define CLAMP_COORDS_BIT 17
-
-float _texcoord_xform(const in float coord, const in sampler_info params)
-{
-	float result = fma(coord, params.scale_x, params.bias_x);
-	if (TEST_BIT(params.flags, CLAMP_COORDS_BIT))
-	{
-		result = clamp(result, params.clamp_min_x, params.clamp_max_x);
-	}
-
-	return result;
-}
-
-vec2 _texcoord_xform(const in vec2 coord, const in sampler_info params)
-{
-	vec2 result = fma(
-		coord,
-		vec2(params.scale_x, params.scale_y),
-		vec2(params.bias_x, params.bias_y)
-	);
-
-	if (TEST_BIT(params.flags, CLAMP_COORDS_BIT))
-	{
-		result = clamp(
-			result,
-			vec2(params.clamp_min_x, params.clamp_min_y),
-			vec2(params.clamp_max_x, params.clamp_max_y)
-		);
-	}
-
-	return result;
-}
-
-vec3 _texcoord_xform(const in vec3 coord, const in sampler_info params)
-{
-	vec3 result = fma(
-		coord,
-		vec3(params.scale_x, params.scale_y, params.scale_z),
-		vec3(params.bias_x, params.bias_y, params.bias_z)
-	);
-
-	// NOTE: Coordinate clamping not supported for CUBE and 3D textures
-	return result;
-}
-
 vec4 _texture(in vec4 coord, float bias)
 {
-	ur0 = GET_INST_BITS(0, 17, 4);
+	ur0 = GET_BITS(0, 17, 4);
 	if (!IS_TEXTURE_RESIDENT(ur0))
 	{
 		return vr_zero;
 	}
 
 	ur1 = ur0 + ur0;
-	const uint type = GET_BITS(texture_control, int(ur1), 2);
+	const uint type = bitfieldExtract(texture_control, int(ur1), 2);
+	coord.xyz = (coord.xyz + texture_parameters[ur0].scale_bias.w) * texture_parameters[ur0].scale_bias.xyz;
 
 	switch (type)
 	{
-	case RSX_SAMPLE_TEXTURE_1D:
-		coord.x = _texcoord_xform(coord.x, texture_parameters[ur0]);
-		vr0 = texture(SAMPLER1D(ur0), coord.x, bias);
-		break;
-	case RSX_SAMPLE_TEXTURE_2D:
-		coord.xy = _texcoord_xform(coord.xy, texture_parameters[ur0]);
-		vr0 = texture(SAMPLER2D(ur0), coord.xy, bias);
-		break;
-	case RSX_SAMPLE_TEXTURE_CUBE:
-		coord.xyz = _texcoord_xform(coord.xyz, texture_parameters[ur0]);
-		vr0 = texture(SAMPLERCUBE(ur0), coord.xyz, bias);
-		break;
-	case RSX_SAMPLE_TEXTURE_3D:
-		coord.xyz = _texcoord_xform(coord.xyz, texture_parameters[ur0]);
-		vr0 = texture(SAMPLER3D(ur0), coord.xyz, bias);
-		break;
+	case 0:
+		vr0 = texture(SAMPLER1D(ur0), coord.x, bias); break;
+	case 1:
+		vr0 = texture(SAMPLER2D(ur0), coord.xy, bias); break;
+	case 2:
+		vr0 = texture(SAMPLERCUBE(ur0), coord.xyz, bias); break;
+	case 3:
+		vr0 = texture(SAMPLER3D(ur0), coord.xyz, bias); break;
 	}
 
-	if (TEST_INST_BIT(0, 21))
+	if (TEST_BIT(0, 21))
 	{
 		vr0 = vr0 * 2. - 1.;
 	}
@@ -393,40 +332,31 @@ vec4 _texture(in vec4 coord, float bias)
 
 vec4 _textureLod(in vec4 coord, float lod)
 {
-	ur0 = GET_INST_BITS(0, 17, 4);
+	ur0 = GET_BITS(0, 17, 4);
 	if (!IS_TEXTURE_RESIDENT(ur0))
 	{
 		return vr_zero;
 	}
 
 	ur1 = ur0 + ur0;
-	const uint type = GET_BITS(texture_control, int(ur1), 2);
+	const uint type = bitfieldExtract(texture_control, int(ur1), 2);
+	coord.xyz = (coord.xyz + texture_parameters[ur0].scale_bias.w) * texture_parameters[ur0].scale_bias.xyz;
 
 	switch (type)
 	{
-	case RSX_SAMPLE_TEXTURE_1D:
-		coord.x = _texcoord_xform(coord.x, texture_parameters[ur0]);
-		vr0 = textureLod(SAMPLER1D(ur0), coord.x, lod);
-		break;
-	case RSX_SAMPLE_TEXTURE_2D:
-		coord.xy = _texcoord_xform(coord.xy, texture_parameters[ur0]);
-		vr0 = textureLod(SAMPLER2D(ur0), coord.xy, lod);
-		break;
-	case RSX_SAMPLE_TEXTURE_CUBE:
-		coord.xyz = _texcoord_xform(coord.xyz, texture_parameters[ur0]);
-		vr0 = textureLod(SAMPLERCUBE(ur0), coord.xyz, lod);
-		break;
-	case RSX_SAMPLE_TEXTURE_3D:
-		coord.xyz = _texcoord_xform(coord.xyz, texture_parameters[ur0]);
-		vr0 = textureLod(SAMPLER3D(ur0), coord.xyz, lod);
-		break;
+	case 0:
+		vr0 = textureLod(SAMPLER1D(ur0), coord.x, lod); break;
+	case 1:
+		vr0 = textureLod(SAMPLER2D(ur0), coord.xy, lod); break;
+	case 2:
+		vr0 = textureLod(SAMPLERCUBE(ur0), coord.xyz, lod); break;
+	case 3:
+		vr0 = textureLod(SAMPLER3D(ur0), coord.xyz, lod); break;
 	}
 
-	if (TEST_INST_BIT(0, 21))
+	if (TEST_BIT(0, 21))
 	{
-		// Normal-expand, v = 2v - 1
-		vr0 += vr0;
-		vr0 -= 1.;
+		vr0 = vr0 * 2. - 1.;
 	}
 
 	return vr0;
@@ -439,27 +369,27 @@ void write_dst(const in vec4 value)
 	uvr0 = uvec4(uint(1 << 9), uint(1 << 10), uint(1 << 11), uint(1 << 12));
 	bvr0 = bvec4(uvr0 & inst.words.xxxx);
 
-	if (TEST_INST_BIT(0, 8)) // SET COND
+	if (TEST_BIT(0, 8)) // SET COND
 	{
-		ur0 = GET_INST_BITS(1, 30, 1);
+		ur0 = GET_BITS(1, 30, 1);
 		reg_mov(cc[ur0], value, bvr0);
 	}
 
-	if (TEST_INST_BIT(0, 30)) // NO DEST
+	if (TEST_BIT(0, 30)) // NO DEST
 	{
 		return;
 	}
 
-	ur1 = GET_INST_BITS(2, 28, 3);
+	ur1 = GET_BITS(2, 28, 3);
 	sr0 = modifier_scale[ur1];
 	vr0 = value * sr0;
 
-	if (TEST_INST_BIT(0, 31)) // SAT
+	if (TEST_BIT(0, 31)) // SAT
 	{
 		vr0 = clamp(vr0, 0, 1);
 	}
 
-	ur0 = GET_INST_BITS(1, 18, 3);
+	ur0 = GET_BITS(1, 18, 3);
 	if (ur0 != 0x7)
 	{
 		vr1 = read_cond();
@@ -467,8 +397,8 @@ void write_dst(const in vec4 value)
 		bvr0 = bvec4(uvec4(bvr0) & uvec4(bvr1));
 	}
 
-	ur1 = GET_INST_BITS(0, 1, 6);
-	if (TEST_INST_BIT(0, 7))
+	ur1 = GET_BITS(0, 1, 6);
+	if (TEST_BIT(0, 7))
 	{
 		reg_mov(regs16[ur1], vr0, bvr0);
 	}
@@ -484,7 +414,7 @@ void initialize()
 	// NOTE: Register count is the number of 'full' registers that will be consumed. Hardware seems to do some renaming.
 	// NOTE: Attempting to zero-initialize all the registers will slow things to a crawl!
 
-	uint register_count = GET_BITS(shader_control, 24, 6);
+	uint register_count = bitfieldExtract(shader_control, 24, 6);
 	ur0 = 0, ur1 = 0;
 	while (register_count > 0)
 	{
@@ -531,10 +461,6 @@ void initialize()
 	vr0 = vec4(abs(wpos_scale), wpos_scale, 1., 1.);
 	vr1 = vec4(0., wpos_bias, 0., 0.);
 	wpos = gl_FragCoord * vr0 + vr1;
-
-	// Other
-	cc[0] = vr_zero;
-	cc[1] = vr_zero;
 })"
 
 R"(
@@ -594,11 +520,11 @@ void main()
 			((fp_instructions[ip] << 8) & uvec4(0xFF00FF00)) |
 			((fp_instructions[ip] >> 8) & uvec4(0x00FF00FF));
 
-		inst.opcode = GET_INST_BITS(0, 24, 6);
-		inst.end = TEST_INST_BIT(0, 0);
+		inst.opcode = GET_BITS(0, 24, 6);
+		inst.end = TEST_BIT(0, 0);
 
 #ifdef WITH_FLOW_CTRL
-		if (TEST_INST_BIT(2, 31))
+		if (TEST_BIT(2, 31))
 		{
 			// Flow control
 			switch (inst.opcode | (1 << 6))
@@ -630,8 +556,8 @@ void main()
 			case RSX_FP_OPCODE_REP:
 				if (check_cond())
 				{
-					counter = int(GET_INST_BITS(2, 2, 8) - GET_INST_BITS(2, 10, 8));
-					counter /= int(GET_INST_BITS(2, 19, 8));
+					counter = int(GET_BITS(2, 2, 8) - GET_BITS(2, 10, 8));
+					counter /= int(GET_BITS(2, 19, 8));
 					loop_start_addr = ip + 1;
 					loop_end_addr = int(inst.words.w >> 2);
 				}
diff --git a/rpcs3/Emu/RSX/Program/GLSLInterpreter/VertexInterpreter.glsl b/rpcs3/Emu/RSX/Common/Interpreter/VertexInterpreter.glsl
similarity index 95%
rename from rpcs3/Emu/RSX/Program/GLSLInterpreter/VertexInterpreter.glsl
rename to rpcs3/Emu/RSX/Common/Interpreter/VertexInterpreter.glsl
index e60bc51d92..e41fda1782 100644
--- a/rpcs3/Emu/RSX/Program/GLSLInterpreter/VertexInterpreter.glsl
+++ b/rpcs3/Emu/RSX/Common/Interpreter/VertexInterpreter.glsl
@@ -368,11 +368,11 @@ vec4 read_src(const in int index)
 	case RSX_VP_REGISTER_TYPE_CONSTANT:
 		if (d3.index_const)
 		{
-			value = _fetch_constant(d1.const_src + ref(a[d0.addr_reg_sel_1], d0.addr_swz));
+			value = vc[d1.const_src + ref(a[d0.addr_reg_sel_1], d0.addr_swz)];
 		}
 		else
 		{
-			value = _fetch_constant(d1.const_src);
+			value = vc[d1.const_src];
 		}
 		break;
 	}
diff --git a/rpcs3/Emu/RSX/Common/TextGlyphs.h b/rpcs3/Emu/RSX/Common/TextGlyphs.h
new file mode 100644
index 0000000000..7b7cbc890c
--- /dev/null
+++ b/rpcs3/Emu/RSX/Common/TextGlyphs.h
@@ -0,0 +1,252 @@
+#pragma once
+
+#include <array>
+#include <charconv>
+#include <unordered_map>
+#include <vector>
+
+#include "util/types.hpp"
+
+/**
+* FONT GLYPHS GO HERE
+* Any font in hex format should work here.
+* For this case, We're using ANSI 128 characters, but more types can be supported
+*
+* This example is the GNU unifont glyph set
+*/
+
+constexpr std::array<std::string_view, 128> GNU_UNIFONT_GLYPHS =
+{
+	"0000 : AAAA00018000000180004A51EA505A51C99E0001800000018000000180005555",
+	"0001 : AAAA00018000000180003993C252325F8A527193800000018000000180005555",
+	"0002 : AAAA00018000000180003BA5C124311989247125800000018000000180005555",
+	"0003 : AAAA00018000000180007BA5C1247919C1247925800000018000000180005555",
+	"0004 : AAAA000180000001800079BFC2487A49C2487989800000018000000180005555",
+	"0005 : AAAA00018000000180007A4DC2527B53C2D67A4F800000018000000180005555",
+	"0006 : AAAA000180000001800031A5CA287A31CA2849A5800000018000000180005555",
+	"0007 : AAAA000180000001800073D1CA1073D1CA1073DF800000018000000180005555",
+	"0008 : AAAA00018000000180001E3991401E3191081E71800000018000000180005555",
+	"0009 : AAAA000180000001800022F9A2203E21A2202221800000018000000180005555",
+	"000A : AAAA000180000001800020F9A08020F9A0803E81800000018000000180005555",
+	"000B : AAAA000180000001800022F9A220222194200821800000018000000180005555",
+	"000C : AAAA00018000000180003EF9A0803EF9A0802081800000018000000180005555",
+	"000D : AAAA00018000000180001EF1A08820F1A0901E89800000018000000180005555",
+	"000E : AAAA00018000000180001E71A0881C8982883C71800000018000000180005555",
+	"000F : AAAA00018000000180001EF9A0201C2182203CF9800000018000000180005555",
+	"0010 : AAAA0001800000018000391DA510251DA51039DD800000018000000180005555",
+	"0011 : AAAA00018000000180007189CA184A09CA08719D800000018000000180005555",
+	"0012 : AAAA00018000000180007199CA044A09CA10719D800000018000000180005555",
+	"0013 : AAAA00018000000180007199CA044A19CA047199800000018000000180005555",
+	"0014 : AAAA00018000000180007185CA0C4A15CA1C7185800000018000000180005555",
+	"0015 : AAAA00018000000180004993EA546A59DBD44A53800000018000000180005555",
+	"0016 : AAAA00018000000180003453C29A311789127113800000018000000180005555",
+	"0017 : AAAA00018000000180007BB9C1247939C1247939800000018000000180005555",
+	"0018 : AAAA00018000000180003325C4B447ADC4A434A5800000018000000180005555",
+	"0019 : AAAA00018000000180003E89A0D83EA9A0883E89800000018000000180005555",
+	"001A : AAAA00018000000180003A5DC252325D8A52719D800000018000000180005555",
+	"001B : AAAA000180000001800079CFC2107991C0507B8F800000018000000180005555",
+	"001C : AAAA00018000000180001E7190801E61901010E1800000018000000180005555",
+	"001D : AAAA00018000000180000E719080166192100EE1800000018000000180005555",
+	"001E : AAAA00018000000180001C7192801C61941012E1800000018000000180005555",
+	"001F : AAAA000180000001800012719280126192100CE1800000018000000180005555",
+	"0020 : 00000000000000000000000000000000",
+	"0021 : 00000000080808080808080008080000",
+	"0022 : 00002222222200000000000000000000",
+	"0023 : 000000001212127E24247E4848480000",
+	"0024 : 00000000083E4948380E09493E080000",
+	"0025 : 00000000314A4A340808162929460000",
+	"0026 : 000000001C2222141829454246390000",
+	"0027 : 00000808080800000000000000000000",
+	"0028 : 00000004080810101010101008080400",
+	"0029 : 00000020101008080808080810102000",
+	"002A : 00000000000008492A1C2A4908000000",
+	"002B : 0000000000000808087F080808000000",
+	"002C : 00000000000000000000000018080810",
+	"002D : 0000000000000000003C000000000000",
+	"002E : 00000000000000000000000018180000",
+	"002F : 00000000020204080810102040400000",
+	"0030 : 00000000182442464A52624224180000",
+	"0031 : 000000000818280808080808083E0000",
+	"0032 : 000000003C4242020C102040407E0000",
+	"0033 : 000000003C4242021C020242423C0000",
+	"0034 : 00000000040C142444447E0404040000",
+	"0035 : 000000007E4040407C020202423C0000",
+	"0036 : 000000001C2040407C424242423C0000",
+	"0037 : 000000007E0202040404080808080000",
+	"0038 : 000000003C4242423C424242423C0000",
+	"0039 : 000000003C4242423E02020204380000",
+	"003A : 00000000000018180000001818000000",
+	"003B : 00000000000018180000001808081000",
+	"003C : 00000000000204081020100804020000",
+	"003D : 000000000000007E0000007E00000000",
+	"003E : 00000000004020100804081020400000",
+	"003F : 000000003C4242020408080008080000",
+	"0040 : 000000001C224A565252524E201E0000",
+	"0041 : 0000000018242442427E424242420000",
+	"0042 : 000000007C4242427C424242427C0000",
+	"0043 : 000000003C42424040404042423C0000",
+	"0044 : 00000000784442424242424244780000",
+	"0045 : 000000007E4040407C404040407E0000",
+	"0046 : 000000007E4040407C40404040400000",
+	"0047 : 000000003C424240404E4242463A0000",
+	"0048 : 00000000424242427E42424242420000",
+	"0049 : 000000003E08080808080808083E0000",
+	"004A : 000000001F0404040404044444380000",
+	"004B : 00000000424448506060504844420000",
+	"004C : 000000004040404040404040407E0000",
+	"004D : 00000000424266665A5A424242420000",
+	"004E : 0000000042626252524A4A4646420000",
+	"004F : 000000003C42424242424242423C0000",
+	"0050 : 000000007C4242427C40404040400000",
+	"0051 : 000000003C4242424242425A663C0300",
+	"0052 : 000000007C4242427C48444442420000",
+	"0053 : 000000003C424240300C0242423C0000",
+	"0054 : 000000007F0808080808080808080000",
+	"0055 : 000000004242424242424242423C0000",
+	"0056 : 00000000414141222222141408080000",
+	"0057 : 00000000424242425A5A666642420000",
+	"0058 : 00000000424224241818242442420000",
+	"0059 : 00000000414122221408080808080000",
+	"005A : 000000007E02020408102040407E0000",
+	"005B : 0000000E080808080808080808080E00",
+	"005C : 00000000404020101008080402020000",
+	"005D : 00000070101010101010101010107000",
+	"005E : 00001824420000000000000000000000",
+	"005F : 00000000000000000000000000007F00",
+	"0060 : 00201008000000000000000000000000",
+	"0061 : 0000000000003C42023E4242463A0000",
+	"0062 : 0000004040405C6242424242625C0000",
+	"0063 : 0000000000003C4240404040423C0000",
+	"0064 : 0000000202023A4642424242463A0000",
+	"0065 : 0000000000003C42427E4040423C0000",
+	"0066 : 0000000C1010107C1010101010100000",
+	"0067 : 0000000000023A44444438203C42423C",
+	"0068 : 0000004040405C624242424242420000",
+	"0069 : 000000080800180808080808083E0000",
+	"006A : 0000000404000C040404040404044830",
+	"006B : 00000040404044485060504844420000",
+	"006C : 000000180808080808080808083E0000",
+	"006D : 00000000000076494949494949490000",
+	"006E : 0000000000005C624242424242420000",
+	"006F : 0000000000003C4242424242423C0000",
+	"0070 : 0000000000005C6242424242625C4040",
+	"0071 : 0000000000003A4642424242463A0202",
+	"0072 : 0000000000005C624240404040400000",
+	"0073 : 0000000000003C4240300C02423C0000",
+	"0074 : 000000001010107C10101010100C0000",
+	"0075 : 000000000000424242424242463A0000",
+	"0076 : 00000000000042424224242418180000",
+	"0077 : 00000000000041494949494949360000",
+	"0078 : 00000000000042422418182442420000",
+	"0079 : 0000000000004242424242261A02023C",
+	"007A : 0000000000007E0204081020407E0000",
+	"007B : 0000000C101008081010080810100C00",
+	"007C : 00000808080808080808080808080808",
+	"007D : 00000030080810100808101008083000",
+	"007E : 00000031494600000000000000000000",
+	"007F : AAAA000180000001800073D1CA104BD1CA1073DF800000018000000180005555"
+};
+
+class GlyphManager
+{
+private:
+
+	struct glyph
+	{
+		u8 character;
+		u32 glyph_point_offset;
+		u32 points_count;
+		std::array<u8, 16> plot;
+	};
+
+	std::vector<glyph> glyph_map;
+
+	void decode_glyph_map(const std::array<std::string_view, 128>& font_glyphs)
+	{
+		glyph_map.reserve(font_glyphs.size());
+
+		for (const auto &font_glyph : font_glyphs)
+		{
+			glyph this_glyph{};
+
+			const auto index = font_glyph.substr(0, 4);
+			std::from_chars(index.data(), index.data() + index.size(), this_glyph.character, 16);
+
+			const auto glyph_data = font_glyph.substr(7);
+			if (glyph_data.length() == 32)
+			{
+				for (usz n = 0; n < this_glyph.plot.size(); ++n)
+				{
+					const auto line = glyph_data.substr(n * 2, 2);
+					std::from_chars(line.data(), line.data() + line.size(), this_glyph.plot[n], 16);
+				}
+			}
+			else
+			{
+				// TODO: Support 16-wide characters
+			}
+
+			glyph_map.push_back(this_glyph);
+		}
+	}
+
+public:
+
+	struct glyph_point
+	{
+		float x;
+		float y;
+
+		explicit glyph_point(float _x, float _y) : x(_x), y(_y)
+		{}
+	};
+
+	GlyphManager()
+	{
+		decode_glyph_map(GNU_UNIFONT_GLYPHS);
+	}
+
+	std::vector<glyph_point> generate_point_map()
+	{
+		std::vector<glyph_point> result;
+
+		for (auto &entry : glyph_map)
+		{
+			entry.glyph_point_offset = ::size32(result);
+
+			for (usz j = 0; j < entry.plot.size(); ++j)
+			{
+				const auto &line = entry.plot[j];
+				if (line == 0)
+					continue;
+
+				for (int i = 0; i < 8; ++i)
+				{
+					if (line & (1 << i))
+					{
+						// Font is inverted, so we correct it for conventional renderers
+						const auto x = static_cast<float>(7 - i);
+						const auto y = static_cast<float>(15 - j);
+						result.emplace_back(x, y);
+					}
+				}
+			}
+
+			entry.points_count = ::size32(result) - entry.glyph_point_offset;
+		}
+
+		return result;
+	}
+
+	std::unordered_map<u8, std::pair<u32, u32>> get_glyph_offsets() const
+	{
+		std::unordered_map<u8, std::pair<u32, u32>> result = {};
+
+		for (const auto &entry : glyph_map)
+		{
+			result[entry.character] = std::make_pair(entry.glyph_point_offset, entry.points_count);
+		}
+
+		return result;
+	}
+};
diff --git a/rpcs3/Emu/RSX/Common/TextureUtils.cpp b/rpcs3/Emu/RSX/Common/TextureUtils.cpp
index 382ef9cc06..97ff4ae802 100644
--- a/rpcs3/Emu/RSX/Common/TextureUtils.cpp
+++ b/rpcs3/Emu/RSX/Common/TextureUtils.cpp
@@ -3,7 +3,6 @@
 #include "TextureUtils.h"
 #include "../RSXThread.h"
 #include "../rsx_utils.h"
-#include "3rdparty/bcdec/bcdec.hpp"
 
 #include "util/asm.hpp"
 
@@ -25,155 +24,12 @@ namespace utils
 namespace
 {
 
-#ifndef __APPLE__
 u16 convert_rgb655_to_rgb565(const u16 bits)
 {
 	// g6 = g5
 	// r5 = (((bits & 0xFC00) >> 1) & 0xFC00) << 1 is equivalent to truncating the least significant bit
 	return (bits & 0xF81F) | (bits & 0x3E0) << 1;
 }
-#else
-u32 convert_rgb565_to_bgra8(const u16 bits)
-{
-	const u8 r5 = ((bits >> 11) & 0x1F);
-	const u8 g6 = ((bits >> 5) & 0x3F);
-	const u8 b5 = (bits & 0x1F);
-
-	const u8 b8 = ((b5 * 527) + 23) >> 6;
-	const u8 g8 = ((g6 * 259) + 33) >> 6;
-	const u8 r8 = ((r5 * 527) + 23) >> 6;
-	const u8 a8 = 255;
-
-	return b8 | (g8 << 8) | (r8 << 16) | (a8 << 24);
-}
-
-u32 convert_argb4_to_bgra8(const u16 bits)
-{
-	const u8 b8 = (bits & 0xF0);
-	const u8 g8 = ((bits >> 4) & 0xF0);
-	const u8 r8 = ((bits >> 8) & 0xF0);
-	const u8 a8 = ((bits << 4) & 0xF0);
-
-	return b8 | (g8 << 8) | (r8 << 16) | (a8 << 24);
-}
-
-u32 convert_a1rgb5_to_bgra8(const u16 bits)
-{
-	const u8 a1 = ((bits >> 11) & 0x80);
-	const u8 r5 = ((bits >> 10) & 0x1F);
-	const u8 g5 = ((bits >> 5) & 0x1F);
-	const u8 b5 = (bits & 0x1F);
-
-	const u8 b8 = ((b5 * 527) + 23) >> 6;
-	const u8 g8 = ((g5 * 527) + 23) >> 6;
-	const u8 r8 = ((r5 * 527) + 23) >> 6;
-	const u8 a8 = a1;
-
-	return b8 | (g8 << 8) | (r8 << 16) | (a8 << 24);
-}
-
-u32 convert_rgb5a1_to_bgra8(const u16 bits)
-{
-	const u8 r5 = ((bits >> 11) & 0x1F);
-	const u8 g5 = ((bits >> 6) & 0x1F);
-	const u8 b5 = ((bits >> 1) & 0x1F);
-	const u8 a1 = (bits & 0x80);
-
-	const u8 b8 = ((b5 * 527) + 23) >> 6;
-	const u8 g8 = ((g5 * 527) + 23) >> 6;
-	const u8 r8 = ((r5 * 527) + 23) >> 6;
-	const u8 a8 = a1;
-
-	return b8 | (g8 << 8) | (r8 << 16) | (a8 << 24);
-}
-
-u32 convert_rgb655_to_bgra8(const u16 bits)
-{
-	const u8 r6 = ((bits >> 10) & 0x3F);
-	const u8 g5 = ((bits >> 5) & 0x1F);
-	const u8 b5 = ((bits) & 0x1F);
-
-	const u8 b8 = ((b5 * 527) + 23) >> 6;
-	const u8 g8 = ((g5 * 527) + 23) >> 6;
-	const u8 r8 = ((r6 * 259) + 33) >> 6;
-	const u8 a8 = 1;
-
-	return b8 | (g8 << 8) | (r8 << 16) | (a8 << 24);
-}
-
-u32 convert_d1rgb5_to_bgra8(const u16 bits)
-{
-	const u8 r5 = ((bits >> 10) & 0x1F);
-	const u8 g5 = ((bits >> 5) & 0x1F);
-	const u8 b5 = (bits & 0x1F);
-
-	const u8 b8 = ((b5 * 527) + 23) >> 6;
-	const u8 g8 = ((g5 * 527) + 23) >> 6;
-	const u8 r8 = ((r5 * 527) + 23) >> 6;
-	const u8 a8 = 1;
-
-	return b8 | (g8 << 8) | (r8 << 16) | (a8 << 24);
-}
-
-struct convert_16_block_32
-{
-	template<typename T>
-	static void copy_mipmap_level(std::span<u32> dst, std::span<const T> src, u16 width_in_block, u16 row_count, u16 depth, u8 border, u32 dst_pitch_in_block, u32 src_pitch_in_block, u32 (*converter)(const u16))
-	{
-		static_assert(sizeof(T) == 2, "Type size doesn't match.");
-
-		u32 src_offset = 0, dst_offset = 0;
-		const u32 v_porch = src_pitch_in_block * border;
-
-		for (int layer = 0; layer < depth; ++layer)
-		{
-			// Front
-			src_offset += v_porch;
-
-			for (u32 row = 0; row < row_count; ++row)
-			{
-				for (int col = 0; col < width_in_block; ++col)
-				{
-					dst[dst_offset + col] = converter(src[src_offset + col + border]);
-				}
-
-				src_offset += src_pitch_in_block;
-				dst_offset += dst_pitch_in_block;
-			}
-
-			// Back
-			src_offset += v_porch;
-		}
-	}
-};
-
-struct convert_16_block_32_swizzled
-{
-	template<typename T, typename U>
-	static void copy_mipmap_level(std::span<T> dst, std::span<const U> src, u16 width_in_block, u16 row_count, u16 depth, u8 border, u32 dst_pitch_in_block, u32 (*converter)(const u16))
-	{
-		u32 padded_width, padded_height;
-		if (border)
-		{
-			padded_width = rsx::next_pow2(width_in_block + border + border);
-			padded_height = rsx::next_pow2(row_count + border + border);
-		}
-		else
-		{
-			padded_width = width_in_block;
-			padded_height = row_count;
-		}
-
-		u32 size = padded_width * padded_height * depth * 2;
-		rsx::simple_array<U> tmp(size);
-
-		rsx::convert_linear_swizzle_3d<U>(src.data(), tmp.data(), padded_width, padded_height, depth);
-
-		std::span<const U> src_span = tmp;
-		convert_16_block_32::copy_mipmap_level(dst, src_span, width_in_block, row_count, depth, border, dst_pitch_in_block, padded_width, converter);
-	}
-};
-#endif
 
 struct copy_unmodified_block
 {
@@ -225,7 +81,7 @@ struct copy_unmodified_block_swizzled
 	template<typename T, typename U>
 	static void copy_mipmap_level(std::span<T> dst, std::span<const U> src, u16 words_per_block, u16 width_in_block, u16 row_count, u16 depth, u8 border, u32 dst_pitch_in_block)
 	{
-		if (std::is_same_v<T, U> && dst_pitch_in_block == width_in_block && words_per_block == 1 && !border)
+		if (std::is_same<T, U>::value && dst_pitch_in_block == width_in_block && words_per_block == 1 && !border)
 		{
 			rsx::convert_linear_swizzle_3d<T>(src.data(), dst.data(), width_in_block, row_count, depth);
 		}
@@ -244,7 +100,7 @@ struct copy_unmodified_block_swizzled
 			}
 
 			const u32 size_in_block = padded_width * padded_height * depth * 2;
-			rsx::simple_array<U> tmp(size_in_block * words_per_block);
+			std::vector<U> tmp(size_in_block * words_per_block);
 
 			if (words_per_block == 1) [[likely]]
 			{
@@ -489,7 +345,7 @@ struct copy_rgb655_block_swizzled
 		}
 
 		u32 size = padded_width * padded_height * depth * 2;
-		rsx::simple_array<U> tmp(size);
+		std::vector<U> tmp(size);
 
 		rsx::convert_linear_swizzle_3d<U>(src.data(), tmp.data(), padded_width, padded_height, depth);
 
@@ -498,66 +354,6 @@ struct copy_rgb655_block_swizzled
 	}
 };
 
-struct copy_decoded_bc1_block
-{
-	static void copy_mipmap_level(std::span<u32> dst, std::span<const u64> src, u16 width_in_block, u32 row_count, u16 depth, u32 dst_pitch_in_block, u32 src_pitch_in_block)
-	{
-		u32 src_offset = 0, dst_offset = 0, destinationPitch = dst_pitch_in_block * 4;
-		for (u32 row = 0; row < row_count * depth; row++)
-		{
-			for (u32 col = 0; col < width_in_block; col++)
-			{
-				const u8* compressedBlock = reinterpret_cast<const u8*>(&src[src_offset + col]);
-				u8* decompressedBlock = reinterpret_cast<u8*>(&dst[dst_offset + col * 4]);
-				bcdec_bc1(compressedBlock, decompressedBlock, destinationPitch);
-			}
-
-			src_offset += src_pitch_in_block;
-			dst_offset += destinationPitch;
-		}
-	}
-};
-
-struct copy_decoded_bc2_block
-{
-	static void copy_mipmap_level(std::span<u32> dst, std::span<const u128> src, u16 width_in_block, u32 row_count, u16 depth, u32 dst_pitch_in_block, u32 src_pitch_in_block)
-	{
-		u32 src_offset = 0, dst_offset = 0, destinationPitch = dst_pitch_in_block * 4;
-		for (u32 row = 0; row < row_count * depth; row++)
-		{
-			for (u32 col = 0; col < width_in_block; col++)
-			{
-				const u8* compressedBlock = reinterpret_cast<const u8*>(&src[src_offset + col]);
-				u8* decompressedBlock = reinterpret_cast<u8*>(&dst[dst_offset + col * 4]);
-				bcdec_bc2(compressedBlock, decompressedBlock, destinationPitch);
-			}
-
-			src_offset += src_pitch_in_block;
-			dst_offset += destinationPitch;
-		}
-	}
-};
-
-struct copy_decoded_bc3_block
-{
-	static void copy_mipmap_level(std::span<u32> dst, std::span<const u128> src, u16 width_in_block, u32 row_count, u16 depth, u32 dst_pitch_in_block, u32 src_pitch_in_block)
-	{
-		u32 src_offset = 0, dst_offset = 0, destinationPitch = dst_pitch_in_block * 4;
-		for (u32 row = 0; row < row_count * depth; row++)
-		{
-			for (u32 col = 0; col < width_in_block; col++)
-			{
-				const u8* compressedBlock = reinterpret_cast<const u8*>(&src[src_offset + col]);
-				u8* decompressedBlock = reinterpret_cast<u8*>(&dst[dst_offset + col * 4]);
-				bcdec_bc3(compressedBlock, decompressedBlock, destinationPitch);
-			}
-
-			src_offset += src_pitch_in_block;
-			dst_offset += destinationPitch;
-		}
-	}
-};
-
 namespace
 {
 	/**
@@ -629,7 +425,7 @@ namespace
 		*/
 
 		// <= 128 so fits in u8
-		constexpr u8 block_size_in_bytes = sizeof(SRC_TYPE);
+		u8 block_size_in_bytes = sizeof(SRC_TYPE);
 
 		std::vector<rsx::subresource_layout> result;
 		usz offset_in_src = 0;
@@ -640,7 +436,7 @@ namespace
 
 		for (unsigned layer = 0; layer < layer_count; layer++)
 		{
-			u16 miplevel_width_in_texel = width_in_texel, miplevel_height_in_texel = height_in_texel, miplevel_depth = depth;
+			u16 miplevel_width_in_texel = width_in_texel, miplevel_height_in_texel = height_in_texel;
 			for (unsigned mip_level = 0; mip_level < mipmap_count; mip_level++)
 			{
 				result.push_back({});
@@ -650,7 +446,7 @@ namespace
 				current_subresource_layout.height_in_texel = miplevel_height_in_texel;
 				current_subresource_layout.level = mip_level;
 				current_subresource_layout.layer = layer;
-				current_subresource_layout.depth = miplevel_depth;
+				current_subresource_layout.depth = depth;
 				current_subresource_layout.border = border_size;
 
 				if constexpr (block_edge_in_texel == 1)
@@ -686,20 +482,16 @@ namespace
 					full_height_in_block = rsx::next_pow2(current_subresource_layout.height_in_block + border_size + border_size);
 				}
 
-				const u32 slice_sz = src_pitch_in_block * block_size_in_bytes * full_height_in_block * miplevel_depth;
+				const u32 slice_sz = src_pitch_in_block * block_size_in_bytes * full_height_in_block * depth;
 				current_subresource_layout.pitch_in_block = src_pitch_in_block;
-				current_subresource_layout.data = { texture_data_pointer + offset_in_src, slice_sz };
+				current_subresource_layout.data = std::span<const std::byte>(texture_data_pointer + offset_in_src, slice_sz);
 
 				offset_in_src += slice_sz;
 				miplevel_width_in_texel = std::max(miplevel_width_in_texel / 2, 1);
 				miplevel_height_in_texel = std::max(miplevel_height_in_texel / 2, 1);
-				miplevel_depth = std::max(miplevel_depth / 2, 1);
 			}
 
-			if (!padded_row) // Only swizzled textures obey this restriction
-			{
-				offset_in_src = utils::align(offset_in_src, 128);
-			}
+			offset_in_src = utils::align(offset_in_src, 128);
 		}
 
 		return result;
@@ -764,7 +556,7 @@ std::vector<rsx::subresource_layout> get_subresources_layout_impl(const RsxTextu
 	std::tie(h, depth, layer) = get_height_depth_layer(texture);
 
 	const auto format = texture.format() & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN);
-	auto pitch = texture.pitch();
+	const auto pitch = texture.pitch();
 
 	const u32 texaddr = rsx::get_address(texture.offset(), texture.location());
 	auto pixels = vm::_ptr<const std::byte>(texaddr);
@@ -774,18 +566,17 @@ std::vector<rsx::subresource_layout> get_subresources_layout_impl(const RsxTextu
 
 	if (!is_swizzled)
 	{
-		if (const auto packed_pitch = rsx::get_format_packed_pitch(format, w, has_border, false); pitch < packed_pitch) [[unlikely]]
+		if (pitch) [[likely]]
 		{
-			if (pitch)
+			if (pitch < rsx::get_format_packed_pitch(format, w, has_border, false))
 			{
 				const u32 real_width_in_block = pitch / rsx::get_format_block_size_in_bytes(format);
 				w = std::max<u16>(real_width_in_block * rsx::get_format_block_size_in_texel(format), 1);
 			}
-			else
-			{
-				h = depth = 1;
-				pitch = packed_pitch;
-			}
+		}
+		else
+		{
+			w = h = depth = 1;
 		}
 	}
 
@@ -857,7 +648,7 @@ namespace rsx
 		return get_subresources_layout_impl(texture);
 	}
 
-	texture_memory_info upload_texture_subresource(rsx::io_buffer& dst_buffer, const rsx::subresource_layout& src_layout, int format, bool is_swizzled, texture_uploader_capabilities& caps)
+	texture_memory_info upload_texture_subresource(std::span<std::byte> dst_buffer, const rsx::subresource_layout& src_layout, int format, bool is_swizzled, texture_uploader_capabilities& caps)
 	{
 		u16 w = src_layout.width_in_block;
 		u16 h = src_layout.height_in_block;
@@ -886,87 +677,35 @@ namespace rsx
 
 		case CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8:
 		{
-			copy_decoded_rb_rg_block::copy_mipmap_level<true>(dst_buffer.as_span<u32>(), src_layout.data.as_span<const u32>(), w, h, depth, get_row_pitch_in_block<u32>(src_layout.width_in_texel, caps.alignment), src_layout.pitch_in_block);
+			copy_decoded_rb_rg_block::copy_mipmap_level<true>(utils::bless<u32>(dst_buffer), utils::bless<const u32>(src_layout.data), w, h, depth, get_row_pitch_in_block<u32>(src_layout.width_in_texel, caps.alignment), src_layout.pitch_in_block);
 			break;
 		}
 
 		case CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8:
 		{
-			copy_decoded_rb_rg_block::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const u32>(), w, h, depth, get_row_pitch_in_block<u32>(src_layout.width_in_texel, caps.alignment), src_layout.pitch_in_block);
+			copy_decoded_rb_rg_block::copy_mipmap_level(utils::bless<u32>(dst_buffer), utils::bless<const u32>(src_layout.data), w, h, depth, get_row_pitch_in_block<u32>(src_layout.width_in_texel, caps.alignment), src_layout.pitch_in_block);
 			break;
 		}
 
-#ifndef __APPLE__
 		case CELL_GCM_TEXTURE_R6G5B5:
 		{
 			if (is_swizzled)
-				copy_rgb655_block_swizzled::copy_mipmap_level(dst_buffer.as_span<u16>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u16>(w, caps.alignment));
+				copy_rgb655_block_swizzled::copy_mipmap_level(utils::bless<u16>(dst_buffer), utils::bless<const be_t<u16>>(src_layout.data), w, h, depth, src_layout.border, get_row_pitch_in_block<u16>(w, caps.alignment));
 			else
-				copy_rgb655_block::copy_mipmap_level(dst_buffer.as_span<u16>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u16>(w, caps.alignment), src_layout.pitch_in_block);
+				copy_rgb655_block::copy_mipmap_level(utils::bless<u16>(dst_buffer), utils::bless<const be_t<u16>>(src_layout.data), w, h, depth, src_layout.border, get_row_pitch_in_block<u16>(w, caps.alignment), src_layout.pitch_in_block);
 			break;
 		}
 
-		case CELL_GCM_TEXTURE_D1R5G5B5:
-		case CELL_GCM_TEXTURE_A1R5G5B5:
-		case CELL_GCM_TEXTURE_A4R4G4B4:
-		case CELL_GCM_TEXTURE_R5G5B5A1:
-		case CELL_GCM_TEXTURE_R5G6B5:
-#else
-		// convert the following formats to B8G8R8A8_UNORM, because they are not supported by Metal
-		case CELL_GCM_TEXTURE_R6G5B5:
-		{
-			if (is_swizzled)
-				convert_16_block_32_swizzled::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u32>(w, caps.alignment), &convert_rgb655_to_bgra8);
-			else
-				convert_16_block_32::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u32>(w, caps.alignment), src_layout.pitch_in_block, &convert_rgb655_to_bgra8);
-			break;
-		}
-		case CELL_GCM_TEXTURE_D1R5G5B5:
-		{
-			if (is_swizzled)
-				convert_16_block_32_swizzled::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u32>(w, caps.alignment), &convert_d1rgb5_to_bgra8);
-			else
-				convert_16_block_32::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u32>(w, caps.alignment), src_layout.pitch_in_block, &convert_d1rgb5_to_bgra8);
-			break;
-		}
-		case CELL_GCM_TEXTURE_A1R5G5B5:
-		{
-			if (is_swizzled)
-				convert_16_block_32_swizzled::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u32>(w, caps.alignment), &convert_a1rgb5_to_bgra8);
-			else
-				convert_16_block_32::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u32>(w, caps.alignment), src_layout.pitch_in_block, &convert_a1rgb5_to_bgra8);
-			break;
-		}
-		case CELL_GCM_TEXTURE_A4R4G4B4:
-		{
-			if (is_swizzled)
-				convert_16_block_32_swizzled::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u32>(w, caps.alignment), &convert_argb4_to_bgra8);
-			else
-				convert_16_block_32::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u32>(w, caps.alignment), src_layout.pitch_in_block, &convert_argb4_to_bgra8);
-			break;
-		}
-		case CELL_GCM_TEXTURE_R5G5B5A1:
-		{
-			if (is_swizzled)
-				convert_16_block_32_swizzled::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u32>(w, caps.alignment), &convert_rgb5a1_to_bgra8);
-			else
-				convert_16_block_32::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u32>(w, caps.alignment), src_layout.pitch_in_block, &convert_rgb5a1_to_bgra8);
-			break;
-		}
-		case CELL_GCM_TEXTURE_R5G6B5:
-		{
-			if (is_swizzled)
-				convert_16_block_32_swizzled::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u32>(w, caps.alignment), &convert_rgb565_to_bgra8);
-			else
-				convert_16_block_32::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u16>>(), w, h, depth, src_layout.border, get_row_pitch_in_block<u32>(w, caps.alignment), src_layout.pitch_in_block, &convert_rgb565_to_bgra8);
-			break;
-		}
-#endif
 		case CELL_GCM_TEXTURE_COMPRESSED_HILO8:
 		case CELL_GCM_TEXTURE_COMPRESSED_HILO_S8:
 			// TODO: Test if the HILO compressed formats support swizzling (other compressed_* formats ignore this option)
 		case CELL_GCM_TEXTURE_DEPTH16:
 		case CELL_GCM_TEXTURE_DEPTH16_FLOAT: // Untested
+		case CELL_GCM_TEXTURE_D1R5G5B5:
+		case CELL_GCM_TEXTURE_A1R5G5B5:
+		case CELL_GCM_TEXTURE_A4R4G4B4:
+		case CELL_GCM_TEXTURE_R5G5B5A1:
+		case CELL_GCM_TEXTURE_R5G6B5:
 		case CELL_GCM_TEXTURE_G8B8:
 		{
 			word_size = 2;
@@ -1013,12 +752,6 @@ namespace rsx
 
 		case CELL_GCM_TEXTURE_COMPRESSED_DXT1:
 		{
-			if (!caps.supports_dxt)
-			{
-				copy_decoded_bc1_block::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const u64>(), w, h, depth, get_row_pitch_in_block<u32>(w, caps.alignment), src_layout.pitch_in_block);
-				break;
-			}
-
 			const bool is_3d = depth > 1;
 			const bool is_po2 = utils::is_power_of_2(src_layout.width_in_texel) && utils::is_power_of_2(src_layout.height_in_texel);
 
@@ -1027,13 +760,13 @@ namespace rsx
 				// PS3 uses the Nvidia VTC memory layout for compressed 3D textures.
 				// This is only supported using Nvidia OpenGL.
 				// Remove the VTC tiling to support ATI and Vulkan.
-				copy_unmodified_block_vtc::copy_mipmap_level(dst_buffer.as_span<u64>(), src_layout.data.as_span<const u64>(), w, h, depth, get_row_pitch_in_block<u64>(w, caps.alignment), src_layout.pitch_in_block);
+				copy_unmodified_block_vtc::copy_mipmap_level(utils::bless<u64>(dst_buffer), utils::bless<const u64>(src_layout.data), w, h, depth, get_row_pitch_in_block<u64>(w, caps.alignment), src_layout.pitch_in_block);
 			}
 			else if (is_3d && !is_po2 && caps.supports_vtc_decoding)
 			{
 				// In this case, hardware expects us to feed it a VTC input, but on PS3 we only have a linear one.
 				// We need to compress the 2D-planar DXT input into a VTC output
-				copy_linear_block_to_vtc::copy_mipmap_level(dst_buffer.as_span<u64>(), src_layout.data.as_span<const u64>(), w, h, depth, get_row_pitch_in_block<u64>(w, caps.alignment), src_layout.pitch_in_block);
+				copy_linear_block_to_vtc::copy_mipmap_level(utils::bless<u64>(dst_buffer), utils::bless<const u64>(src_layout.data), w, h, depth, get_row_pitch_in_block<u64>(w, caps.alignment), src_layout.pitch_in_block);
 			}
 			else if (caps.supports_zero_copy)
 			{
@@ -1042,28 +775,14 @@ namespace rsx
 			}
 			else
 			{
-				copy_unmodified_block::copy_mipmap_level(dst_buffer.as_span<u64>(), src_layout.data.as_span<const u64>(), 1, w, h, depth, 0, get_row_pitch_in_block<u64>(w, caps.alignment), src_layout.pitch_in_block);
+				copy_unmodified_block::copy_mipmap_level(utils::bless<u64>(dst_buffer), utils::bless<const u64>(src_layout.data), 1, w, h, depth, 0, get_row_pitch_in_block<u64>(w, caps.alignment), src_layout.pitch_in_block);
 			}
 			break;
 		}
 
 		case CELL_GCM_TEXTURE_COMPRESSED_DXT23:
-		{
-			if (!caps.supports_dxt)
-			{
-				copy_decoded_bc2_block::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const u128>(), w, h, depth, get_row_pitch_in_block<u32>(w, caps.alignment), src_layout.pitch_in_block);
-				break;
-			}
-			[[fallthrough]];
-		}
 		case CELL_GCM_TEXTURE_COMPRESSED_DXT45:
 		{
-			if (!caps.supports_dxt)
-			{
-				copy_decoded_bc3_block::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const u128>(), w, h, depth, get_row_pitch_in_block<u32>(w, caps.alignment), src_layout.pitch_in_block);
-				break;
-			}
-
 			const bool is_3d = depth > 1;
 			const bool is_po2 = utils::is_power_of_2(src_layout.width_in_texel) && utils::is_power_of_2(src_layout.height_in_texel);
 
@@ -1072,13 +791,13 @@ namespace rsx
 				// PS3 uses the Nvidia VTC memory layout for compressed 3D textures.
 				// This is only supported using Nvidia OpenGL.
 				// Remove the VTC tiling to support ATI and Vulkan.
-				copy_unmodified_block_vtc::copy_mipmap_level(dst_buffer.as_span<u128>(), src_layout.data.as_span<const u128>(), w, h, depth, get_row_pitch_in_block<u128>(w, caps.alignment), src_layout.pitch_in_block);
+				copy_unmodified_block_vtc::copy_mipmap_level(utils::bless<u128>(dst_buffer), utils::bless<const u128>(src_layout.data), w, h, depth, get_row_pitch_in_block<u128>(w, caps.alignment), src_layout.pitch_in_block);
 			}
 			else if (is_3d && !is_po2 && caps.supports_vtc_decoding)
 			{
 				// In this case, hardware expects us to feed it a VTC input, but on PS3 we only have a linear one.
 				// We need to compress the 2D-planar DXT input into a VTC output
-				copy_linear_block_to_vtc::copy_mipmap_level(dst_buffer.as_span<u128>(), src_layout.data.as_span<const u128>(), w, h, depth, get_row_pitch_in_block<u128>(w, caps.alignment), src_layout.pitch_in_block);
+				copy_linear_block_to_vtc::copy_mipmap_level(utils::bless<u128>(dst_buffer), utils::bless<const u128>(src_layout.data), w, h, depth, get_row_pitch_in_block<u128>(w, caps.alignment), src_layout.pitch_in_block);
 			}
 			else if (caps.supports_zero_copy)
 			{
@@ -1087,7 +806,7 @@ namespace rsx
 			}
 			else
 			{
-				copy_unmodified_block::copy_mipmap_level(dst_buffer.as_span<u128>(), src_layout.data.as_span<const u128>(), 1, w, h, depth, 0, get_row_pitch_in_block<u128>(w, caps.alignment), src_layout.pitch_in_block);
+				copy_unmodified_block::copy_mipmap_level(utils::bless<u128>(dst_buffer), utils::bless<const u128>(src_layout.data), 1, w, h, depth, 0, get_row_pitch_in_block<u128>(w, caps.alignment), src_layout.pitch_in_block);
 			}
 			break;
 		}
@@ -1102,7 +821,7 @@ namespace rsx
 			{
 				if (is_swizzled)
 				{
-					copy_unmodified_block_swizzled::copy_mipmap_level(dst_buffer.as_span<u8>(), src_layout.data.as_span<const u8>(), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block);
+					copy_unmodified_block_swizzled::copy_mipmap_level(utils::bless<u8>(dst_buffer), utils::bless<const u8>(src_layout.data), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block);
 				}
 				else if (caps.supports_zero_copy)
 				{
@@ -1111,7 +830,7 @@ namespace rsx
 				}
 				else
 				{
-					copy_unmodified_block::copy_mipmap_level(dst_buffer.as_span<u8>(), src_layout.data.as_span<const u8>(), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block, src_layout.pitch_in_block);
+					copy_unmodified_block::copy_mipmap_level(utils::bless<u8>(dst_buffer), utils::bless<const u8>(src_layout.data), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block, src_layout.pitch_in_block);
 				}
 			}
 			else
@@ -1119,7 +838,7 @@ namespace rsx
 				result.element_size = word_size;
 				result.block_length = words_per_block;
 
-				bool require_cpu_swizzle = !caps.supports_hw_deswizzle && is_swizzled;
+				bool require_cpu_swizzle = !caps.supports_hw_deswizzle;
 				bool require_cpu_byteswap = !caps.supports_byteswap;
 
 				if (is_swizzled && caps.supports_hw_deswizzle)
@@ -1145,11 +864,11 @@ namespace rsx
 					}
 					else if (word_size == 2)
 					{
-						copy_unmodified_block::copy_mipmap_level(dst_buffer.as_span<u16>(), src_layout.data.as_span<const u16>(), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block, src_layout.pitch_in_block);
+						copy_unmodified_block::copy_mipmap_level(utils::bless<u16>(dst_buffer), utils::bless<const u16>(src_layout.data), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block, src_layout.pitch_in_block);
 					}
 					else if (word_size == 4)
 					{
-						copy_unmodified_block::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const u32>(), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block, src_layout.pitch_in_block);
+						copy_unmodified_block::copy_mipmap_level(utils::bless<u32>(dst_buffer), utils::bless<const u32>(src_layout.data), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block, src_layout.pitch_in_block);
 					}
 				}
 				else
@@ -1157,16 +876,16 @@ namespace rsx
 					if (word_size == 2)
 					{
 						if (is_swizzled)
-							copy_unmodified_block_swizzled::copy_mipmap_level(dst_buffer.as_span<u16>(), src_layout.data.as_span<const be_t<u16>>(), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block);
+							copy_unmodified_block_swizzled::copy_mipmap_level(utils::bless<u16>(dst_buffer), utils::bless<const be_t<u16>>(src_layout.data), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block);
 						else
-							copy_unmodified_block::copy_mipmap_level(dst_buffer.as_span<u16>(), src_layout.data.as_span<const be_t<u16>>(), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block, src_layout.pitch_in_block);
+							copy_unmodified_block::copy_mipmap_level(utils::bless<u16>(dst_buffer), utils::bless<const be_t<u16>>(src_layout.data), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block, src_layout.pitch_in_block);
 					}
 					else if (word_size == 4)
 					{
 						if (is_swizzled)
-							copy_unmodified_block_swizzled::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u32>>(), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block);
+							copy_unmodified_block_swizzled::copy_mipmap_level(utils::bless<u32>(dst_buffer), utils::bless<const be_t<u32>>(src_layout.data), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block);
 						else
-							copy_unmodified_block::copy_mipmap_level(dst_buffer.as_span<u32>(), src_layout.data.as_span<const be_t<u32>>(), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block, src_layout.pitch_in_block);
+							copy_unmodified_block::copy_mipmap_level(utils::bless<u32>(dst_buffer), utils::bless<const be_t<u32>>(src_layout.data), words_per_block, w, h, depth, src_layout.border, dst_pitch_in_block, src_layout.pitch_in_block);
 					}
 				}
 			}
@@ -1175,7 +894,7 @@ namespace rsx
 		return result;
 	}
 
-	bool is_compressed_host_format(const texture_uploader_capabilities& caps, u32 texture_format)
+	bool is_compressed_host_format(u32 texture_format)
 	{
 		switch (texture_format)
 		{
@@ -1210,32 +929,9 @@ namespace rsx
 		case CELL_GCM_TEXTURE_COMPRESSED_DXT1:
 		case CELL_GCM_TEXTURE_COMPRESSED_DXT23:
 		case CELL_GCM_TEXTURE_COMPRESSED_DXT45:
-			return caps.supports_dxt;
-		}
-		fmt::throw_exception("Unknown format 0x%x", texture_format);
-	}
-
-	bool is_int8_remapped_format(u32 format)
-	{
-		switch (format)
-		{
-		case CELL_GCM_TEXTURE_DEPTH24_D8:
-		case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT:
-		case CELL_GCM_TEXTURE_DEPTH16:
-		case CELL_GCM_TEXTURE_DEPTH16_FLOAT:
-		case CELL_GCM_TEXTURE_X16:
-		case CELL_GCM_TEXTURE_Y16_X16:
-		case CELL_GCM_TEXTURE_COMPRESSED_HILO8:
-		case CELL_GCM_TEXTURE_COMPRESSED_HILO_S8:
-		case CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT:
-		case CELL_GCM_TEXTURE_W32_Z32_Y32_X32_FLOAT:
-		case CELL_GCM_TEXTURE_X32_FLOAT:
-		case CELL_GCM_TEXTURE_Y16_X16_FLOAT:
-			// NOTE: Special data formats (XY, HILO, DEPTH) are not RGB formats
-			return false;
-		default:
 			return true;
 		}
+		fmt::throw_exception("Unknown format 0x%x", texture_format);
 	}
 
 	/**
@@ -1461,7 +1157,7 @@ namespace rsx
 			if (width > 1 || height > 1)
 			{
 				// If width == 1, the scanning just returns texel 0, so it is a valid setup
-				rsx_log.warning("Invalid texture pitch setup, width=%d, height=%d, format=0x%x(0x%x)",
+				rsx_log.error("Invalid texture pitch setup, width=%d, height=%d, format=0x%x(0x%x)",
 					width, height, format, gcm_format);
 			}
 
@@ -1521,18 +1217,17 @@ namespace rsx
 			texture.border_type() ^ 1);
 	}
 
-	u32 get_remap_encoding(const texture_channel_remap_t& remap)
+	u32 get_remap_encoding(const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap)
 	{
 		u32 encode = 0;
-		encode |= (remap.channel_map[0] << 0);
-		encode |= (remap.channel_map[1] << 2);
-		encode |= (remap.channel_map[2] << 4);
-		encode |= (remap.channel_map[3] << 6);
-
-		encode |= (remap.control_map[0] << 8);
-		encode |= (remap.control_map[1] << 10);
-		encode |= (remap.control_map[2] << 12);
-		encode |= (remap.control_map[3] << 14);
+		encode |= (remap.first[0] << 0);
+		encode |= (remap.first[1] << 2);
+		encode |= (remap.first[2] << 4);
+		encode |= (remap.first[3] << 6);
+		encode |= (remap.second[0] << 8);
+		encode |= (remap.second[1] << 10);
+		encode |= (remap.second[2] << 12);
+		encode |= (remap.second[3] << 14);
 		return encode;
 	}
 
@@ -1631,47 +1326,4 @@ namespace rsx
 	{
 		return get_format_block_size_in_bytes(format) == 2 ? 0xFFFF : 0xFFFFFF;
 	}
-
-	bool is_texcoord_wrapping_mode(rsx::texture_wrap_mode mode)
-	{
-		switch (mode)
-		{
-			// Clamping modes
-			default:
-				rsx_log.error("Unknown texture wrap mode: %d", static_cast<int>(mode));
-				[[ fallthrough ]];
-			case rsx::texture_wrap_mode::border:
-			case rsx::texture_wrap_mode::clamp:
-			case rsx::texture_wrap_mode::clamp_to_edge:
-			case rsx::texture_wrap_mode::mirror_once_clamp_to_edge:
-			case rsx::texture_wrap_mode::mirror_once_border:
-			case rsx::texture_wrap_mode::mirror_once_clamp:
-				return false;
-			// Wrapping modes
-			case rsx::texture_wrap_mode::wrap:
-			case rsx::texture_wrap_mode::mirror:
-				return true;
-		}
-	}
-
-	bool is_border_clamped_texture(
-		rsx::texture_wrap_mode wrap_s,
-		rsx::texture_wrap_mode wrap_t,
-		rsx::texture_wrap_mode wrap_r,
-		rsx::texture_dimension dimension)
-	{
-		// Technically we should check border and mirror_once_border
-		// However, the latter is not implemented in any modern API, so we can just ignore it (emulated with mirror_once_clamp).
-		switch (dimension)
-		{
-		case rsx::texture_dimension::dimension1d:
-			return wrap_s == rsx::texture_wrap_mode::border;
-		case rsx::texture_dimension::dimension2d:
-			return wrap_s == rsx::texture_wrap_mode::border || wrap_t == rsx::texture_wrap_mode::border;
-		case rsx::texture_dimension::dimension3d:
-			return wrap_s == rsx::texture_wrap_mode::border || wrap_t == rsx::texture_wrap_mode::border || wrap_r == rsx::texture_wrap_mode::border;
-		default:
-			return false;
-		}
-	}
 }
diff --git a/rpcs3/Emu/RSX/Common/TextureUtils.h b/rpcs3/Emu/RSX/Common/TextureUtils.h
index 2b9552bc7a..2a5eacd535 100644
--- a/rpcs3/Emu/RSX/Common/TextureUtils.h
+++ b/rpcs3/Emu/RSX/Common/TextureUtils.h
@@ -1,10 +1,8 @@
 #pragma once
 
-#include "io_buffer.h"
-#include "../color_utils.h"
 #include "../RSXTexture.h"
 
-#include <stack>
+#include <span>
 #include <vector>
 
 namespace rsx
@@ -118,55 +116,27 @@ namespace rsx
 			RSX_FORMAT_CLASS_DEPTH24_UNORM_X8_PACK32 = 8,
 			RSX_FORMAT_CLASS_DEPTH24_FLOAT_X8_PACK32 = 16,
 
-			RSX_FORMAT_CLASS_DEPTH_FLOAT_MASK = (RSX_FORMAT_CLASS_DEPTH16_FLOAT | RSX_FORMAT_CLASS_DEPTH24_FLOAT_X8_PACK32),
-			RSX_FORMAT_CLASS_DONT_CARE = RSX_FORMAT_CLASS_UNDEFINED,
+			RSX_FORMAT_CLASS_DEPTH_FLOAT_MASK = (RSX_FORMAT_CLASS_DEPTH16_FLOAT | RSX_FORMAT_CLASS_DEPTH24_FLOAT_X8_PACK32)
 		};
 	}
 
 	using namespace format_class_;
 
-	// Sampled image descriptor
-	class sampled_image_descriptor_base
+	//Sampled image descriptor
+	struct sampled_image_descriptor_base
 	{
-#pragma pack(push, 1)
-		struct texcoord_xform_t
-		{
-			f32 scale[3];
-			f32 bias[3];
-			f32 clamp_min[2];
-			f32 clamp_max[2];
-			bool clamp = false;
-		};
-#pragma pack(pop)
-
-		// Texure matrix stack
-		std::stack<texcoord_xform_t> m_texcoord_xform_stack;
-
-	public:
-		virtual ~sampled_image_descriptor_base() = default;
-		virtual u32 encoded_component_map() const = 0;
-
-		void push_texcoord_xform()
-		{
-			m_texcoord_xform_stack.push(texcoord_xform);
-		}
-
-		void pop_texcoord_xform()
-		{
-			ensure(!m_texcoord_xform_stack.empty());
-			std::memcpy(&texcoord_xform, &m_texcoord_xform_stack.top(), sizeof(texcoord_xform_t));
-			m_texcoord_xform_stack.pop();
-		}
-
 		texture_upload_context upload_context = texture_upload_context::shader_read;
 		rsx::texture_dimension_extended image_type = texture_dimension_extended::texture_dimension_2d;
 		rsx::format_class format_class = RSX_FORMAT_CLASS_UNDEFINED;
 		bool is_cyclic_reference = false;
-		u8 samples = 1;
 		u32 ref_address = 0;
 		u64 surface_cache_tag = 0;
+		f32 scale_x = 1.f;
+		f32 scale_y = 1.f;
+		f32 scale_z = 1.f;
 
-		texcoord_xform_t texcoord_xform;
+		virtual ~sampled_image_descriptor_base() = default;
+		virtual u32 encoded_component_map() const = 0;
 	};
 
 	struct typeless_xfer
@@ -190,7 +160,7 @@ namespace rsx
 
 	struct subresource_layout
 	{
-		rsx::io_buffer data;
+		std::span<const std::byte> data;
 		u16 width_in_texel;
 		u16 height_in_texel;
 		u16 width_in_block;
@@ -227,7 +197,6 @@ namespace rsx
 		bool supports_vtc_decoding;
 		bool supports_hw_deswizzle;
 		bool supports_zero_copy;
-		bool supports_dxt;
 		usz alignment;
 	};
 
@@ -246,18 +215,17 @@ namespace rsx
 	std::vector<subresource_layout> get_subresources_layout(const rsx::fragment_texture &texture);
 	std::vector<subresource_layout> get_subresources_layout(const rsx::vertex_texture &texture);
 
-	texture_memory_info upload_texture_subresource(rsx::io_buffer& dst_buffer, const subresource_layout &src_layout, int format, bool is_swizzled, texture_uploader_capabilities& caps);
+	texture_memory_info upload_texture_subresource(std::span<std::byte> dst_buffer, const subresource_layout &src_layout, int format, bool is_swizzled, texture_uploader_capabilities& caps);
 
 	u8 get_format_block_size_in_bytes(int format);
 	u8 get_format_block_size_in_texel(int format);
 	u8 get_format_block_size_in_bytes(rsx::surface_color_format format);
 	u8 get_format_block_size_in_bytes(rsx::surface_depth_format2 format);
 
-	bool is_compressed_host_format(const texture_uploader_capabilities& caps, u32 format); // Returns true for host-compressed formats (DXT)
+	bool is_compressed_host_format(u32 format); // Returns true for host-compressed formats (DXT)
 	u8 get_format_sample_count(rsx::surface_antialiasing antialias);
 	u32 get_max_depth_value(rsx::surface_depth_format2 format);
 	bool is_depth_stencil_format(rsx::surface_depth_format2 format);
-	bool is_int8_remapped_format(u32 format); // Returns true if the format is treated as INT8 by the RSX remapper.
 
 	/**
 	 * Returns number of texel rows encoded in one pitch-length line of bytes
@@ -278,7 +246,7 @@ namespace rsx
 	/**
 	* Reverse encoding
 	*/
-	u32 get_remap_encoding(const texture_channel_remap_t& remap);
+	u32 get_remap_encoding(const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap);
 
 	/**
 	 * Get gcm texel layout. Returns <format, byteswapped>
@@ -288,13 +256,4 @@ namespace rsx
 
 	format_class classify_format(rsx::surface_depth_format2 format);
 	format_class classify_format(u32 gcm_format);
-
-	bool is_texcoord_wrapping_mode(rsx::texture_wrap_mode mode);
-	bool is_border_clamped_texture(rsx::texture_wrap_mode wrap_s, rsx::texture_wrap_mode wrap_t, rsx::texture_wrap_mode wrap_r, rsx::texture_dimension dimension);
-
-	template <typename TextureType>
-	bool is_border_clamped_texture(const TextureType& tex)
-	{
-		return is_border_clamped_texture(tex.wrap_s(), tex.wrap_t(), tex.wrap_r(), tex.dimension());
-	}
 }
diff --git a/rpcs3/Emu/RSX/Common/bitfield.hpp b/rpcs3/Emu/RSX/Common/bitfield.hpp
deleted file mode 100644
index af02792fc7..0000000000
--- a/rpcs3/Emu/RSX/Common/bitfield.hpp
+++ /dev/null
@@ -1,171 +0,0 @@
-#pragma once
-
-#include "util/atomic.hpp"
-#include <util/types.hpp>
-#include <bitset>
-
-namespace rsx
-{
-	template <int N>
-	void unpack_bitset(const std::bitset<N>& block, u64* values)
-	{
-		for (int bit = 0, n = -1, shift = 0; bit < N; ++bit, ++shift)
-		{
-			if ((bit % 64) == 0)
-			{
-				values[++n] = 0;
-				shift = 0;
-			}
-
-			if (block[bit])
-			{
-				values[n] |= (1ull << shift);
-			}
-		}
-	}
-
-	template <int N>
-	void pack_bitset(std::bitset<N>& block, u64* values)
-	{
-		for (int n = 0, shift = 0; shift < N; ++n, shift += 64)
-		{
-			std::bitset<N> tmp = values[n];
-			tmp <<= shift;
-			block |= tmp;
-		}
-	}
-
-	template <typename T, typename bitmask_type = u32>
-		requires std::is_integral_v<bitmask_type>&& std::is_enum_v<T>
-	class atomic_bitmask_t
-	{
-	private:
-		atomic_t<bitmask_type> m_data{ 0 };
-
-	public:
-		atomic_bitmask_t() = default;
-
-		T load() const
-		{
-			return static_cast<T>(m_data.load());
-		}
-
-		void store(T value)
-		{
-			m_data.store(static_cast<bitmask_type>(value));
-		}
-
-		bool operator & (T mask) const
-		{
-			return ((m_data.load() & static_cast<bitmask_type>(mask)) != 0);
-		}
-
-		T operator | (T mask) const
-		{
-			return static_cast<T>(m_data.load() | static_cast<bitmask_type>(mask));
-		}
-
-		void operator &= (T mask)
-		{
-			m_data.fetch_and(static_cast<bitmask_type>(mask));
-		}
-
-		void operator |= (T mask)
-		{
-			m_data.fetch_or(static_cast<bitmask_type>(mask));
-		}
-
-		bool test_and_set(T mask)
-		{
-			const auto old = m_data.fetch_or(static_cast<bitmask_type>(mask));
-			return (old & static_cast<bitmask_type>(mask)) != 0;
-		}
-
-		auto clear(T mask)
-		{
-			bitmask_type clear_mask = ~(static_cast<bitmask_type>(mask));
-			return m_data.and_fetch(clear_mask);
-		}
-
-		void clear()
-		{
-			m_data.release(0);
-		}
-
-		operator bool () const
-		{
-			return m_data.observe() != 0;
-		}
-	};
-
-	template <typename T, typename bitmask_type = u32>
-		requires std::is_integral_v<bitmask_type> && std::is_enum_v<T>
-	class bitmask_t
-	{
-	private:
-		bitmask_type m_data = 0;
-
-	public:
-		bitmask_t() = default;
-
-		bitmask_type load() const
-		{
-			return m_data;
-		}
-
-		bool operator & (bitmask_type mask) const
-		{
-			return !!(m_data & mask);
-		}
-
-		bitmask_type operator | (bitmask_type mask) const
-		{
-			return m_data | mask;
-		}
-
-		void operator &= (bitmask_type mask)
-		{
-			m_data &= mask;
-		}
-
-		void operator |= (bitmask_type mask)
-		{
-			m_data |= mask;
-		}
-
-		bool test(T mask)
-		{
-			return !!(m_data & static_cast<bitmask_type>(mask));
-		}
-
-		void set(T mask)
-		{
-			m_data |= static_cast<bitmask_type>(mask);
-		}
-
-		bool test_and_set(T mask)
-		{
-			const auto old = m_data;
-			m_data |= static_cast<bitmask_type>(mask);
-			return !!(old & mask);
-		}
-
-		template <typename U>
-			requires std::is_same_v<T, U> || std::is_same_v<bitmask_type, U>
-		void clear(U mask)
-		{
-			const bitmask_type clear_mask = ~(static_cast<bitmask_type>(mask));
-			m_data &= clear_mask;
-		}
-
-		void clear()
-		{
-			m_data = 0;
-		}
-
-		operator bool() const
-		{
-			return !!m_data;
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/Common/buffer_stream.hpp b/rpcs3/Emu/RSX/Common/buffer_stream.hpp
deleted file mode 100644
index ff68d6008d..0000000000
--- a/rpcs3/Emu/RSX/Common/buffer_stream.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-
-#if defined(ARCH_X64)
-#include "emmintrin.h"
-#include "immintrin.h"
-#endif
-
-#ifdef ARCH_ARM64
-#ifndef _MSC_VER
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include "Emu/CPU/sse2neon.h"
-#ifndef _MSC_VER
-#pragma GCC diagnostic pop
-#endif
-#endif
-
-namespace utils
-{
-	/**
-	 * Stream a 128 bits vector to dst.
-	 */
-	static inline
-		void stream_vector(void* dst, u32 x, u32 y, u32 z, u32 w)
-	{
-		const __m128i vector = _mm_set_epi32(w, z, y, x);
-		_mm_stream_si128(reinterpret_cast<__m128i*>(dst), vector);
-	}
-
-	static inline
-		void stream_vector(void* dst, f32 x, f32 y, f32 z, f32 w)
-	{
-		stream_vector(dst, std::bit_cast<u32>(x), std::bit_cast<u32>(y), std::bit_cast<u32>(z), std::bit_cast<u32>(w));
-	}
-
-	/**
-	 * Stream a 128 bits vector from src to dst.
-	 */
-	static inline
-		void stream_vector_from_memory(void* dst, void* src)
-	{
-		const __m128i vector = _mm_loadu_si128(reinterpret_cast<__m128i*>(src));
-		_mm_stream_si128(reinterpret_cast<__m128i*>(dst), vector);
-	}
-}
diff --git a/rpcs3/Emu/RSX/Common/expected.hpp b/rpcs3/Emu/RSX/Common/expected.hpp
deleted file mode 100644
index d3da0a402d..0000000000
--- a/rpcs3/Emu/RSX/Common/expected.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-#pragma once
-#include <util/types.hpp>
-
-#include <concepts>
-#include <string>
-#include <utility>
-
-namespace fmt
-{
-	template <typename CharT, usz N, typename... Args>
-	static std::string format(const CharT(&)[N], const Args&...);
-}
-
-namespace rsx
-{
-	namespace exception_utils
-	{
-		enum soft_exception_error_code
-		{
-			none = 0,
-			range_exception = 1,
-			invalid_enum = 2
-		};
-
-		struct soft_exception_t
-		{
-			soft_exception_error_code error = soft_exception_error_code::none;
-
-			soft_exception_t() = default;
-			soft_exception_t(soft_exception_error_code code)
-				: error(code) {}
-
-			bool empty() const
-			{
-				return error == soft_exception_error_code::none;
-			}
-
-			std::string to_string() const
-			{
-				switch (error)
-				{
-				case soft_exception_error_code::none:
-					return "No error";
-				case soft_exception_error_code::range_exception:
-					return "Bad Range";
-				case soft_exception_error_code::invalid_enum:
-					return "Invalid enum";
-				default:
-					return "Unknown Error";
-				}
-			}
-		};
-	}
-
-	template <typename E>
-	concept ErrorType = requires (E & e)
-	{
-		{ e.empty() } -> std::same_as<bool>;
-	};
-
-    template <typename T, ErrorType E = exception_utils::soft_exception_t>
-    class expected
-    {
-        T value;
-        E error{};
-
-    public:
-        [[ nodiscard ]] expected(const T& value_)
-            : value(value_)
-        {}
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 26495) // disable warning for uninitialized value member (performance reasons)
-#endif
-        [[ nodiscard ]] expected(const E& error_)
-            : error(error_)
-        {
-            ensure(!error.empty());
-        }
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-        operator T() const
-        {
-            ensure(error.empty());
-            return value;
-        }
-
-        T operator *() const
-        {
-            ensure(error.empty());
-            return value;
-        }
-
-		operator bool() const
-			requires(!std::is_same_v<T, bool>)
-		{
-			return error.empty();
-		}
-
-        operator std::pair<T&, E&>() const
-        {
-            return { value, error };
-        }
-
-        bool operator == (const T& other) const
-        {
-            return error.empty() && value == other;
-        }
-
-		std::string to_string() const
-		{
-			if (error.empty())
-			{
-				return fmt::format("%s", value);
-			}
-
-			if constexpr (std::is_same_v<E, exception_utils::soft_exception_t>)
-			{
-				return error.to_string();
-			}
-
-			return fmt::format("%s", error);
-		}
-    };
-}
diff --git a/rpcs3/Emu/RSX/Common/io_buffer.h b/rpcs3/Emu/RSX/Common/io_buffer.h
deleted file mode 100644
index 29397d1136..0000000000
--- a/rpcs3/Emu/RSX/Common/io_buffer.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#pragma once
-#include <util/types.hpp>
-#include <util/bless.hpp>
-#include <span>
-#include <functional>
-
-namespace rsx
-{
-	template <typename T>
-	concept SpanLike = requires(T t)
-	{
-		{ t.data() } -> std::convertible_to<void*>;
-		{ t.size_bytes() } -> std::convertible_to<usz>;
-	};
-
-	template <typename T>
-	concept Integral = std::is_integral_v<T> || std::is_same_v<T, u128>;
-
-	class io_buffer
-	{
-		mutable void* m_ptr = nullptr;
-		mutable usz m_size = 0;
-
-		std::function<std::tuple<void*, usz>(usz)> m_allocator{};
-		mutable usz m_allocation_size = 0u;
-
-	public:
-		io_buffer() = default;
-
-		template <SpanLike T>
-		io_buffer(const T& container)
-		{
-			m_ptr = const_cast<void*>(reinterpret_cast<const void*>(container.data()));
-			m_size = container.size_bytes();
-		}
-
-		io_buffer(std::function<std::tuple<void*, usz>(usz)> allocator)
-		{
-			ensure(allocator);
-			m_allocator = allocator;
-		}
-
-		template <Integral T>
-		io_buffer(void* ptr, T size)
-			: m_ptr(ptr), m_size(size)
-		{}
-
-		template <Integral T>
-		io_buffer(const void* ptr, T size)
-			: m_ptr(const_cast<void*>(ptr)), m_size(size)
-		{}
-
-		void reserve(usz size) const
-		{
-			m_allocation_size = size;
-		}
-
-		std::pair<void*, usz> raw() const
-		{
-			return { m_ptr, m_size };
-		}
-
-		template <Integral T = u8>
-		T* data() const
-		{
-			if (!m_ptr && m_allocator)
-			{
-				std::tie(m_ptr, m_size) = m_allocator(m_allocation_size);
-			}
-
-			return static_cast<T*>(m_ptr);
-		}
-
-		usz size() const
-		{
-			return m_size;
-		}
-
-		template<typename T>
-		std::span<T> as_span() const
-		{
-			auto bytes = data();
-			return { utils::bless<T>(bytes), m_size / sizeof(T) };
-		}
-
-		bool empty() const
-		{
-			return m_size == 0;
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/Common/profiling_timer.hpp b/rpcs3/Emu/RSX/Common/profiling_timer.hpp
deleted file mode 100644
index f5ecacb4eb..0000000000
--- a/rpcs3/Emu/RSX/Common/profiling_timer.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include "Emu/Cell/timers.hpp"
-
-namespace rsx
-{
-	struct profiling_timer
-	{
-		bool enabled = false;
-		u64 last;
-
-		profiling_timer() = default;
-
-		void start()
-		{
-			if (enabled) [[unlikely]]
-			{
-				last = get_system_time();
-			}
-		}
-
-		s64 duration()
-		{
-			if (!enabled) [[likely]]
-			{
-				return 0ll;
-			}
-
-			auto old = last;
-			last = get_system_time();
-			return static_cast<s64>(last - old);
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/Common/ranged_map.hpp b/rpcs3/Emu/RSX/Common/ranged_map.hpp
deleted file mode 100644
index cd728ad48a..0000000000
--- a/rpcs3/Emu/RSX/Common/ranged_map.hpp
+++ /dev/null
@@ -1,244 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include "Utilities/address_range.h"
-
-#include <unordered_map>
-
-namespace rsx
-{
-	template <typename T, int BlockSize>
-	class ranged_map
-	{
-	protected:
-		struct block_metadata_t
-		{
-			u32 id = umax;             // ID of the matadata blob
-			u32 head_block = umax;     // Earliest block that may have an object that intersects with the data at the block with ID 'id'
-		};
-
-	public:
-		using inner_type = typename std::unordered_map<u32, T>;
-		using outer_type = typename std::array<inner_type, 0x100000000ull / BlockSize>;
-		using metadata_array = typename std::array<block_metadata_t, 0x100000000ull / BlockSize>;
-
-	protected:
-		outer_type m_data;
-		metadata_array m_metadata;
-
-		static inline u32 block_for(u32 address)
-		{
-			return address / BlockSize;
-		}
-
-		static inline u32 block_address(u32 block_id)
-		{
-			return block_id * BlockSize;
-		}
-
-		void broadcast_insert(const utils::address_range32& range)
-		{
-			const auto head_block = block_for(range.start);
-			for (auto meta = &m_metadata[head_block]; meta <= &m_metadata[block_for(range.end)]; ++meta)
-			{
-				meta->head_block = std::min(head_block, meta->head_block);
-			}
-		}
-
-	public:
-		class iterator
-		{
-			using super = typename rsx::ranged_map<T, BlockSize>;
-			using inner_iterator = typename inner_type::iterator;
-			friend super;
-
-		protected:
-			inner_type* m_current = nullptr;
-			inner_type* m_end = nullptr;
-
-			inner_type* m_data_ptr = nullptr;
-			block_metadata_t* m_metadata_ptr = nullptr;
-			inner_iterator m_it{};
-
-			void forward_scan()
-			{
-				while (m_current < m_end)
-				{
-					m_it = (++m_current)->begin();
-					if (m_it != m_current->end()) [[ likely ]]
-					{
-						return;
-					}
-				}
-
-				// end pointer
-				m_current = nullptr;
-				m_it = {};
-			}
-
-			void next()
-			{
-				if (!m_current)
-				{
-					return;
-				}
-
-				if (++m_it != m_current->end()) [[ likely ]]
-				{
-					return;
-				}
-
-				forward_scan();
-			}
-
-			void begin_range(u32 address, inner_iterator& where)
-			{
-				m_current = &m_data_ptr[address / BlockSize];
-				m_end = m_current;
-				m_it = where;
-			}
-
-			void begin_range(const utils::address_range32& range)
-			{
-				const auto start_block_id = range.start / BlockSize;
-				const auto& metadata = m_metadata_ptr[start_block_id];
-				m_current = &m_data_ptr[std::min(start_block_id, metadata.head_block)];
-				m_end = &m_data_ptr[range.end / BlockSize];
-
-				--m_current;
-				forward_scan();
-			}
-
-			void erase()
-			{
-				m_it = m_current->erase(m_it);
-				if (m_it != m_current->end())
-				{
-					return;
-				}
-
-				forward_scan();
-			}
-
-			iterator(super* parent):
-				m_data_ptr(parent->m_data.data()),
-				m_metadata_ptr(parent->m_metadata.data())
-			{}
-
-		public:
-			bool operator == (const iterator& other) const
-			{
-				return m_current == other.m_current && m_it == other.m_it;
-			}
-
-			auto* operator -> ()
-			{
-				ensure(m_current);
-				return m_it.operator->();
-			}
-
-			auto& operator * ()
-			{
-				ensure(m_current);
-				return m_it.operator*();
-			}
-
-			auto* operator -> () const
-			{
-				ensure(m_current);
-				return m_it.operator->();
-			}
-
-			auto& operator * () const
-			{
-				ensure(m_current);
-				return m_it.operator*();
-			}
-
-			iterator& operator ++ ()
-			{
-				ensure(m_current);
-				next();
-				return *this;
-			}
-
-			T& operator ++ (int)
-			{
-				ensure(m_current);
-				auto old = *this;
-				next();
-				return old;
-			}
-		};
-
-	public:
-		ranged_map()
-		{
-			std::for_each(m_metadata.begin(), m_metadata.end(), [&](auto& meta) { meta.id = static_cast<u32>(&meta - m_metadata.data()); });
-		}
-
-		void emplace(const utils::address_range32& range, T&& value)
-		{
-			broadcast_insert(range);
-			m_data[block_for(range.start)].insert_or_assign(range.start, std::forward<T>(value));
-		}
-
-		usz count(const u32 key) const
-		{
-			const auto& block = m_data[block_for(key)];
-			if (const auto found = block.find(key);
-				found != block.end())
-			{
-				return 1;
-			}
-
-			return 0;
-		}
-
-		iterator find(const u32 key)
-		{
-			auto& block = m_data[block_for(key)];
-			iterator ret = { this };
-
-			if (auto found = block.find(key);
-				found != block.end())
-			{
-				ret.begin_range(key, found);
-			}
-
-			return ret;
-		}
-
-		iterator erase(iterator& where)
-		{
-			where.erase();
-			return where;
-		}
-
-		void erase(u32 address)
-		{
-			m_data[block_for(address)].erase(address);
-		}
-
-		iterator begin_range(const utils::address_range32& range)
-		{
-			iterator ret = { this };
-			ret.begin_range(range);
-			return ret;
-		}
-
-		iterator end()
-		{
-			iterator ret = { this };
-			return ret;
-		}
-
-		void clear()
-		{
-			for (auto& e : m_data)
-			{
-				e.clear();
-			}
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/Common/ring_buffer_helper.h b/rpcs3/Emu/RSX/Common/ring_buffer_helper.h
index 398b355e39..46e99d928a 100644
--- a/rpcs3/Emu/RSX/Common/ring_buffer_helper.h
+++ b/rpcs3/Emu/RSX/Common/ring_buffer_helper.h
@@ -15,46 +15,34 @@ class data_heap
 {
 protected:
 	/**
-	* Internal implementation of allocation test
-	* Does alloc cross get position?
-	*/
-	bool can_alloc_impl(usz aligned_put_pos, usz aligned_alloc_size) const
-	{
-		const usz alloc_end = aligned_put_pos + aligned_alloc_size;
-		if (alloc_end < m_size) [[ likely ]]
-		{
-			// Range before get
-			if (alloc_end < m_get_pos)
-				return true;
-
-			// Range after get
-			if (aligned_put_pos > m_get_pos)
-				return true;
-
-			return false;
-		}
-
-		// ..]....[..get..
-		if (aligned_put_pos < m_get_pos)
-			return false;
-
-		// ..get..]...[...
-		// Actually all resources extending beyond heap space starts at 0
-		if (aligned_alloc_size > m_get_pos)
-			return false;
-
-		return true;
-	}
-
-	/**
-	* Does alloc cross get position?
+	* Does alloc cross get position ?
 	*/
 	template<int Alignment>
 	bool can_alloc(usz size) const
 	{
-		const usz alloc_size = utils::align(size, Alignment);
-		const usz aligned_put_pos = utils::align(m_put_pos, Alignment);
-		return can_alloc_impl(aligned_put_pos, alloc_size);
+		usz alloc_size = utils::align(size, Alignment);
+		usz aligned_put_pos = utils::align(m_put_pos, Alignment);
+		if (aligned_put_pos + alloc_size < m_size)
+		{
+			// range before get
+			if (aligned_put_pos + alloc_size < m_get_pos)
+				return true;
+			// range after get
+			if (aligned_put_pos > m_get_pos)
+				return true;
+			return false;
+		}
+		else
+		{
+			// ..]....[..get..
+			if (aligned_put_pos < m_get_pos)
+				return false;
+			// ..get..]...[...
+			// Actually all resources extending beyond heap space starts at 0
+			if (alloc_size > m_get_pos)
+				return false;
+			return true;
+		}
 	}
 
 	// Grow the buffer to hold at least size bytes
@@ -65,9 +53,10 @@ protected:
 	}
 
 	usz m_size;
-	usz m_put_pos;                 // Start of free space
-	usz m_get_pos;                 // End of free space
-	usz m_min_guard_size;          // If an allocation touches the guard region, reset the heap to avoid going over budget
+	usz m_put_pos; // Start of free space
+	usz m_min_guard_size; //If an allocation touches the guard region, reset the heap to avoid going over budget
+	usz m_current_allocated_size;
+	usz m_largest_allocated_pool;
 
 	char* m_name;
 public:
@@ -76,6 +65,8 @@ public:
 	data_heap(const data_heap&) = delete;
 	data_heap(data_heap&&) = delete;
 
+	usz m_get_pos; // End of free space
+
 	void init(usz heap_size, const char* buffer_name = "unnamed", usz min_guard_size=0x10000)
 	{
 		m_name = const_cast<char*>(buffer_name);
@@ -84,8 +75,10 @@ public:
 		m_put_pos = 0;
 		m_get_pos = heap_size - 1;
 
-		// Allocation stats
+		//allocation stats
 		m_min_guard_size = min_guard_size;
+		m_current_allocated_size = 0;
+		m_largest_allocated_pool = 0;
 	}
 
 	template<int Alignment>
@@ -96,46 +89,24 @@ public:
 
 		if (!can_alloc<Alignment>(size) && !grow(alloc_size))
 		{
-			fmt::throw_exception("[%s] Working buffer not big enough, buffer_length=%d requested=%d guard=%d",
-					m_name, m_size, size, m_min_guard_size);
+			fmt::throw_exception("[%s] Working buffer not big enough, buffer_length=%d allocated=%d requested=%d guard=%d largest_pool=%d",
+					m_name, m_size, m_current_allocated_size, size, m_min_guard_size, m_largest_allocated_pool);
 		}
 
-		const usz alloc_end = aligned_put_pos + alloc_size;
-		if (alloc_end < m_size)
+		const usz block_length = (aligned_put_pos - m_put_pos) + alloc_size;
+		m_current_allocated_size += block_length;
+		m_largest_allocated_pool = std::max(m_largest_allocated_pool, block_length);
+
+		if (aligned_put_pos + alloc_size < m_size)
 		{
-			m_put_pos = alloc_end;
+			m_put_pos = aligned_put_pos + alloc_size;
 			return aligned_put_pos;
 		}
-
-		m_put_pos = alloc_size;
-		return 0;
-	}
-
-	/*
-	 * For use in cases where we take a fixed amount each time
-	 */
-	template<int Alignment, usz Size = Alignment>
-	usz static_alloc()
-	{
-		static_assert((Size & (Alignment - 1)) == 0);
-		ensure((m_put_pos & (Alignment - 1)) == 0);
-
-		if (!can_alloc_impl(m_put_pos, Size) && !grow(Size))
+		else
 		{
-			fmt::throw_exception("[%s] Working buffer not big enough, buffer_length=%d requested=%d guard=%d",
-					m_name, m_size, Size, m_min_guard_size);
+			m_put_pos = alloc_size;
+			return 0;
 		}
-
-		const usz alloc_end = m_put_pos + Size;
-		if (alloc_end < m_size)
-		{
-			const auto ret_pos = m_put_pos;
-			m_put_pos = alloc_end;
-			return ret_pos;
-		}
-
-		m_put_pos = Size;
-		return 0;
 	}
 
 	/**
@@ -146,20 +117,30 @@ public:
 		return (m_put_pos > 0) ? m_put_pos - 1 : m_size - 1;
 	}
 
-	inline void set_get_pos(usz value)
+	virtual bool is_critical() const
 	{
-		m_get_pos = value;
+		const usz guard_length = std::max(m_min_guard_size, m_largest_allocated_pool);
+		return (m_current_allocated_size + guard_length) >= m_size;
 	}
 
 	void reset_allocation_stats()
 	{
+		m_current_allocated_size = 0;
+		m_largest_allocated_pool = 0;
 		m_get_pos = get_current_put_pos_minus_one();
 	}
 
 	// Updates the current_allocated_size metrics
-	inline void notify()
+	void notify()
 	{
-		// @unused
+		if (m_get_pos == umax)
+			m_current_allocated_size = 0;
+		else if (m_get_pos < m_put_pos)
+			m_current_allocated_size = (m_put_pos - m_get_pos - 1);
+		else if (m_get_pos > m_put_pos)
+			m_current_allocated_size = (m_put_pos + (m_size - m_get_pos - 1));
+		else
+			fmt::throw_exception("m_put_pos == m_get_pos!");
 	}
 
 	usz size() const
diff --git a/rpcs3/Emu/RSX/Common/simple_array.hpp b/rpcs3/Emu/RSX/Common/simple_array.hpp
deleted file mode 100644
index 033994547d..0000000000
--- a/rpcs3/Emu/RSX/Common/simple_array.hpp
+++ /dev/null
@@ -1,484 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include <functional>
-#include <algorithm>
-
-namespace rsx
-{
-	template <typename Ty>
-		requires std::is_trivially_destructible_v<Ty>
-	struct simple_array
-	{
-	public:
-		using iterator = Ty*;
-		using const_iterator = const Ty*;
-		using value_type = Ty;
-
-	private:
-		static constexpr u32 _local_capacity = std::max<u32>(64u / sizeof(Ty), 1u);
-		char _local_storage[_local_capacity * sizeof(Ty)];
-
-		u32 _capacity = _local_capacity;
-		Ty* _data = _local_capacity ? reinterpret_cast<Ty*>(_local_storage) : nullptr;
-		u32 _size = 0;
-
-		inline u32 offset(const_iterator pos)
-		{
-			return (_data) ? u32(pos - _data) : 0u;
-		}
-
-		bool is_local_storage() const
-		{
-			return _data == reinterpret_cast<const Ty*>(_local_storage);
-		}
-
-	public:
-		simple_array() = default;
-
-		simple_array(u32 initial_size)
-		{
-			reserve(initial_size);
-			_size = initial_size;
-		}
-
-		simple_array(u32 initial_size, const Ty val)
-		{
-			reserve(initial_size);
-			_size = initial_size;
-
-			for (u32 n = 0; n < initial_size; ++n)
-			{
-				_data[n] = val;
-			}
-		}
-
-		simple_array(const std::initializer_list<Ty>& args)
-		{
-			reserve(::size32(args));
-
-			for (const auto& arg : args)
-			{
-				push_back(arg);
-			}
-		}
-
-		simple_array(const simple_array& other)
-		{
-			resize(other._size);
-
-			if (_size)
-			{
-				std::memcpy(_data, other._data, size_bytes());
-			}
-		}
-
-		simple_array(simple_array&& other) noexcept
-		{
-			swap(other);
-		}
-
-		simple_array& operator=(const simple_array& other)
-		{
-			if (&other != this)
-			{
-				resize(other._size);
-
-				if (_size)
-				{
-					std::memcpy(_data, other._data, size_bytes());
-				}
-			}
-
-			return *this;
-		}
-
-		simple_array& operator=(simple_array&& other) noexcept
-		{
-			swap(other);
-			return *this;
-		}
-
-		~simple_array()
-		{
-			if (_data)
-			{
-				if (!is_local_storage())
-				{
-					free(_data);
-				}
-
-				_data = nullptr;
-				_size = _capacity = 0;
-			}
-		}
-
-		void swap(simple_array<Ty>& that) noexcept
-		{
-			if (!_size && !that._size)
-			{
-				// NOP. Surprisingly common
-				return;
-			}
-
-			const auto _this_is_local = is_local_storage();
-			const auto _that_is_local = that.is_local_storage();
-
-			if (!_this_is_local && !_that_is_local)
-			{
-				std::swap(_capacity, that._capacity);
-				std::swap(_size, that._size);
-				std::swap(_data, that._data);
-				return;
-			}
-
-			if (!_size)
-			{
-				*this = that;
-				that.clear();
-				return;
-			}
-
-			if (!that._size)
-			{
-				that = *this;
-				clear();
-				return;
-			}
-
-			if (_this_is_local != _that_is_local)
-			{
-				// Mismatched usage of the stack storage.
-				rsx::simple_array<Ty> tmp{ *this };
-				*this = that;
-				that = tmp;
-				return;
-			}
-
-			// Use memcpy to allow compiler optimizations
-			Ty _stack_alloc[_local_capacity];
-			std::memcpy(_stack_alloc, that._data, that.size_bytes());
-			std::memcpy(that._data, _data, size_bytes());
-			std::memcpy(_data, _stack_alloc, that.size_bytes());
-			std::swap(_size, that._size);
-		}
-
-		void reserve(u32 size)
-		{
-			if (_capacity >= size)
-			{
-				return;
-			}
-
-			if (is_local_storage())
-			{
-				// Switch to heap storage
-				_data = static_cast<Ty*>(std::malloc(sizeof(Ty) * size));
-				std::memcpy(static_cast<void*>(_data), _local_storage, size_bytes());
-			}
-			else
-			{
-				// Extend heap storage
-				ensure(_data = static_cast<Ty*>(std::realloc(_data, sizeof(Ty) * size))); // "realloc() failed!"
-			}
-
-			_capacity = size;
-		}
-
-		template <typename T> requires UnsignedInt<T>
-		void resize(T size)
-		{
-			const auto new_size = static_cast<u32>(size);
-			reserve(new_size);
-			_size = new_size;
-		}
-
-		void push_back(const Ty& val)
-		{
-			if (_size >= _capacity)
-			{
-				reserve(_capacity + 16);
-			}
-
-			_data[_size++] = val;
-		}
-
-		void push_back(Ty&& val)
-		{
-			if (_size >= _capacity)
-			{
-				reserve(_capacity + 16);
-			}
-
-			_data[_size++] = val;
-		}
-
-		template <typename... Args>
-		void emplace_back(Args&&... args)
-		{
-			if (_size >= _capacity)
-			{
-				reserve(_capacity + 16);
-			}
-
-			std::construct_at(&_data[_size++], std::forward<Args&&>(args)...);
-		}
-
-		Ty pop_back()
-		{
-			return _data[--_size];
-		}
-
-		iterator insert(iterator pos, const Ty& val)
-		{
-			ensure(pos >= _data);
-			const auto _loc = offset(pos);
-
-			if (_size >= _capacity)
-			{
-				reserve(_capacity + 16);
-				pos = _data + _loc;
-			}
-
-			if (_loc >= _size)
-			{
-				_data[_size++] = val;
-				return pos;
-			}
-
-			AUDIT(_loc < _size);
-
-			const auto remaining = (_size - _loc);
-			memmove(pos + 1, pos, remaining * sizeof(Ty));
-
-			*pos = val;
-			_size++;
-
-			return pos;
-		}
-
-		iterator insert(iterator pos, Ty&& val)
-		{
-			ensure(pos >= _data);
-			const auto _loc = offset(pos);
-
-			if (_size >= _capacity)
-			{
-				reserve(_capacity + 16);
-				pos = _data + _loc;
-			}
-
-			if (_loc >= _size)
-			{
-				_data[_size++] = val;
-				return pos;
-			}
-
-			AUDIT(_loc < _size);
-
-			const u32 remaining = (_size - _loc);
-			memmove(pos + 1, pos, remaining * sizeof(Ty));
-
-			*pos = val;
-			_size++;
-
-			return pos;
-		}
-
-		void operator += (const rsx::simple_array<Ty>& that)
-		{
-			const auto old_size = _size;
-			resize(_size + that._size);
-			std::memcpy(data() + old_size, that.data(), that.size_bytes());
-		}
-
-		void clear()
-		{
-			_size = 0;
-		}
-
-		bool empty() const
-		{
-			return _size == 0;
-		}
-
-		u32 size() const
-		{
-			return _size;
-		}
-
-		u64 size_bytes() const
-		{
-			return _size * sizeof(Ty);
-		}
-
-		u32 size_bytes32() const
-		{
-			return _size * sizeof(Ty);
-		}
-
-		u32 capacity() const
-		{
-			return _capacity;
-		}
-
-		Ty& operator[] (u32 index)
-		{
-			return _data[index];
-		}
-
-		const Ty& operator[] (u32 index) const
-		{
-			return _data[index];
-		}
-
-		Ty* data()
-		{
-			return _data;
-		}
-
-		const Ty* data() const
-		{
-			return _data;
-		}
-
-		Ty& back()
-		{
-			return _data[_size - 1];
-		}
-
-		const Ty& back() const
-		{
-			return _data[_size - 1];
-		}
-
-		Ty& front()
-		{
-			return _data[0];
-		}
-
-		const Ty& front() const
-		{
-			return _data[0];
-		}
-
-		iterator begin()
-		{
-			return _data;
-		}
-
-		iterator end()
-		{
-			return _data ? _data + _size : nullptr;
-		}
-
-		const_iterator begin() const
-		{
-			return _data;
-		}
-
-		const_iterator end() const
-		{
-			return _data ? _data + _size : nullptr;
-		}
-
-		bool any(std::predicate<const Ty&> auto predicate) const
-		{
-			for (auto it = begin(); it != end(); ++it)
-			{
-				if (std::invoke(predicate, *it))
-				{
-					return true;
-				}
-			}
-			return false;
-		}
-
-		bool erase_if(std::predicate<const Ty&> auto predicate)
-		{
-			if (!_size)
-			{
-				return false;
-			}
-
-			bool ret = false;
-			for (auto ptr = _data, last = _data + _size - 1; ptr <= last;)
-			{
-				if (predicate(*ptr))
-				{
-					ret = true;
-
-					if (ptr == last)
-					{
-						// Popping the last entry from list. Just set the new size and exit
-						_size--;
-						break;
-					}
-
-					// Move item to the end of the list and shrink by 1
-					std::memcpy(ptr, last, sizeof(Ty));
-					_size--;
-					last--;
-
-					// Retest the same ptr which now has the previous tail item
-					continue;
-				}
-
-				ptr++;
-			}
-
-			return ret;
-		}
-
-		simple_array<Ty>& sort(std::predicate<const Ty&, const Ty&> auto predicate)
-		{
-			if (_size < 2)
-			{
-				return *this;
-			}
-
-			std::sort(begin(), end(), predicate);
-			return *this;
-		}
-
-		template <typename F, typename U = std::invoke_result_t<F, const Ty&>>
-			requires (std::is_invocable_v<F, const Ty&> && std::is_trivially_destructible_v<U>)
-		simple_array<U> map(F&& xform) const
-		{
-			simple_array<U> result;
-			result.reserve(size());
-
-			for (auto it = begin(); it != end(); ++it)
-			{
-				result.push_back(xform(*it));
-			}
-			return result;
-		}
-
-		template <typename F, typename U = std::invoke_result_t<F, const Ty&>>
-			requires (std::is_invocable_v<F, const Ty&> && !std::is_trivially_destructible_v<U>)
-		std::vector<U> map(F&& xform) const
-		{
-			std::vector<U> result;
-			result.reserve(size());
-
-			for (auto it = begin(); it != end(); ++it)
-			{
-				result.push_back(xform(*it));
-			}
-			return result;
-		}
-
-		template <typename F, typename U>
-			requires std::is_invocable_r_v<U, F, const U&, const Ty&>
-		U reduce(U initial_value, F&& reducer) const
-		{
-			U accumulate = initial_value;
-			for (auto it = begin(); it != end(); ++it)
-			{
-				accumulate = reducer(accumulate, *it);
-			}
-			return accumulate;
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/Common/surface_cache_dma.hpp b/rpcs3/Emu/RSX/Common/surface_cache_dma.hpp
deleted file mode 100644
index 02c507fde2..0000000000
--- a/rpcs3/Emu/RSX/Common/surface_cache_dma.hpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include "Utilities/address_range.h"
-
-namespace rsx
-{
-	template <typename Traits, int BlockSize>
-	class surface_cache_dma
-	{
-	protected:
-		static inline u32 block_for(u32 address)
-		{
-			return address / BlockSize;
-		}
-
-		static inline u32 block_address(u32 block_id)
-		{
-			return block_id * BlockSize;
-		}
-
-		using buffer_object_storage_type = typename Traits::buffer_object_storage_type;
-		using buffer_object_type = typename Traits::buffer_object_type;
-		using command_list_type = typename Traits::command_list_type;
-
-		struct memory_buffer_entry_t
-		{
-			u32 id;
-			buffer_object_storage_type bo;
-			u64 memory_tag = 0;
-			u32 base_address = 0;
-
-			inline buffer_object_type get() { return Traits::get(bo); }
-			inline operator bool () const { return base_address != 0; }
-
-			inline void release() { bo.release(); }
-			inline void acquire(buffer_object_type b) { bo = b; }
-		};
-
-		using buffer_block_array = typename std::array<memory_buffer_entry_t, 0x100000000ull / BlockSize>;
-		buffer_block_array m_buffer_list;
-
-	public:
-		surface_cache_dma()
-		{
-			for (u32 i = 0; i < ::size32(m_buffer_list); ++i)
-			{
-				m_buffer_list[i].id = i;
-			}
-		}
-
-		surface_cache_dma& with_range(command_list_type cmd, const utils::address_range32& range)
-		{
-			// Prepare underlying memory so that the range specified is provisioned and contiguous
-			// 1. Check if we have a pre-existing bo layer
-			const auto& this_entry = m_buffer_list[block_for(range.start)];
-			if (this_entry)
-			{
-				const auto bo = this_entry.get();
-				const auto buffer_range = utils::address_range32::start_length(bo.base_address, ::size32(*bo));
-
-				if (range.inside(buffer_range))
-				{
-					// All is well
-					return *this;
-				}
-			}
-
-			// Data does not exist or is not contiguous. Merge the layer
-			std::vector<buffer_object_type> bo_list;
-			const auto start_address = this_entry ? this_entry.base_address : block_address(this_entry.id);
-
-			for (u32 address = start_address; address <= range.end;)
-			{
-				auto& bo_storage = m_buffer_list[block_for(address)];
-				bo_storage.base_address = start_address;
-
-				if (auto bo = bo_storage.get())
-				{
-					bo_list.push_back(bo);
-					bo_storage.release();
-					address += ::size32(*bo);
-					continue;
-				}
-
-				bo_list.push_back(nullptr);
-				address += BlockSize;
-			}
-
-			auto unified = Traits::template merge_bo_list<BlockSize>(cmd, bo_list);
-			ensure(unified);
-
-			m_buffer_list[block_for(start_address)].acquire(unified);
-			return *this;
-		}
-
-		utils::address_range32 to_block_range(const utils::address_range32& range)
-		{
-			u32 start = block_address(block_for(range.start));
-			u32 end = block_address(block_for(range.end + BlockSize - 1));
-			return utils::address_range32::start_end(start, end - 1);
-		}
-
-		std::tuple<buffer_object_type, u32, u64> get(u32 address)
-		{
-			const auto& block = m_buffer_list[block_for(address)];
-			return { block.get(), block.base_address - address };
-		}
-
-		void touch(const utils::address_range32& range)
-		{
-			const u64 stamp = rsx::get_shared_tag();
-			for (usz i = block_for(range.start); i <= block_for(range.end); i++)
-			{
-				m_buffer_list[i].memory_tag = stamp;
-			}
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/Common/surface_store.cpp b/rpcs3/Emu/RSX/Common/surface_store.cpp
index 43f4b4161f..53981ac6db 100644
--- a/rpcs3/Emu/RSX/Common/surface_store.cpp
+++ b/rpcs3/Emu/RSX/Common/surface_store.cpp
@@ -18,21 +18,7 @@ namespace rsx
 			case surface_target::surfaces_a_b_c: return{ 0, 1, 2 };
 			case surface_target::surfaces_a_b_c_d: return{ 0, 1, 2, 3 };
 			}
-			fmt::throw_exception("Invalid color target %d", static_cast<int>(color_target));
-		}
-
-		u8 get_mrt_buffers_count(surface_target color_target)
-		{
-			switch (color_target)
-			{
-			case surface_target::none: return 0;
-			case surface_target::surface_a: return 1;
-			case surface_target::surface_b: return 1;
-			case surface_target::surfaces_a_b: return 2;
-			case surface_target::surfaces_a_b_c: return 3;
-			case surface_target::surfaces_a_b_c_d: return 4;
-			}
-			fmt::throw_exception("Invalid color target %d", static_cast<int>(color_target));
+			fmt::throw_exception("Wrong color_target");
 		}
 
 		usz get_aligned_pitch(surface_color_format format, u32 width)
diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h
index 4c884c3615..b11ab7bc6f 100644
--- a/rpcs3/Emu/RSX/Common/surface_store.h
+++ b/rpcs3/Emu/RSX/Common/surface_store.h
@@ -1,26 +1,24 @@
 #pragma once
 
 #include "surface_utils.h"
-#include "simple_array.hpp"
-#include "ranged_map.hpp"
-#include "surface_cache_dma.hpp"
 #include "../gcm_enums.h"
 #include "../rsx_utils.h"
 #include <list>
 
 #include "util/asm.hpp"
 
+#include <unordered_map>
+
 namespace rsx
 {
 	namespace utility
 	{
 		std::vector<u8> get_rtt_indexes(surface_target color_target);
-		u8 get_mrt_buffers_count(surface_target color_target);
 		usz get_aligned_pitch(surface_color_format format, u32 width);
 		usz get_packed_pitch(surface_color_format format, u32 width);
 	}
 
-	template <typename Traits>
+	template<typename Traits>
 	struct surface_store
 	{
 		static constexpr u32 get_aa_factor_u(surface_antialiasing aa_mode)
@@ -45,35 +43,32 @@ namespace rsx
 		using surface_type = typename Traits::surface_type;
 		using command_list_type = typename Traits::command_list_type;
 		using surface_overlap_info = surface_overlap_info_t<surface_type>;
-		using surface_ranged_map = ranged_map<surface_storage_type, 0x400000>;
-		using surface_cache_dma_map = surface_cache_dma<Traits, 0x400000>;
 
 	protected:
-		surface_ranged_map m_render_targets_storage = {};
-		surface_ranged_map m_depth_stencil_storage = {};
+		std::unordered_map<u32, surface_storage_type> m_render_targets_storage = {};
+		std::unordered_map<u32, surface_storage_type> m_depth_stencil_storage = {};
 
-		rsx::address_range32 m_render_targets_memory_range;
-		rsx::address_range32 m_depth_stencil_memory_range;
-
-		surface_cache_dma_map m_dma_block;
+		rsx::address_range m_render_targets_memory_range;
+		rsx::address_range m_depth_stencil_memory_range;
 
 		bool m_invalidate_on_write = false;
+		bool m_skip_write_updates = false;
 
 		rsx::surface_raster_type m_active_raster_type = rsx::surface_raster_type::linear;
 
 	public:
-		rsx::simple_array<u8> m_bound_render_target_ids = {};
+		std::pair<u8, u8> m_bound_render_targets_config = {};
 		std::array<std::pair<u32, surface_type>, 4> m_bound_render_targets = {};
 		std::pair<u32, surface_type> m_bound_depth_stencil = {};
+		u8 m_bound_buffers_count = 0;
 
 		// List of sections derived from a section that has been split and invalidated
-		std::vector<std::pair<u32, surface_type>> orphaned_surfaces;
+		std::vector<surface_type> orphaned_surfaces;
 
 		// List of sections that have been wholly inherited and invalidated
 		std::vector<surface_type> superseded_surfaces;
 
 		std::list<surface_storage_type> invalidated_resources;
-		const u64 max_invalidated_resources_count = 256ull;
 		u64 cache_tag = 1ull; // Use 1 as the start since 0 is default tag on new surfaces
 		u64 write_tag = 1ull;
 
@@ -91,7 +86,7 @@ namespace rsx
 			auto insert_new_surface = [&](
 				u32 new_address,
 				deferred_clipped_region<surface_type>& region,
-				surface_ranged_map& data)
+				std::unordered_map<u32, surface_storage_type>& data)
 			{
 				surface_storage_type sink;
 				surface_type invalidated = 0;
@@ -156,8 +151,8 @@ namespace rsx
 				}
 
 				ensure(region.target == Traits::get(sink));
-				orphaned_surfaces.push_back({ address, region.target });
-				data.emplace(region.target->get_memory_range(), std::move(sink));
+				orphaned_surfaces.push_back(region.target);
+				data[new_address] = std::move(sink);
 			};
 
 			// Define incoming region
@@ -196,7 +191,7 @@ namespace rsx
 				copy.dst_x = 0;
 				copy.dst_y = 0;
 				copy.width = std::max<u16>((old.width - _new.width) / bytes_to_texels_x, 1);
-				copy.height = prev_surface->template get_surface_height<>();
+				copy.height = prev_surface->get_surface_height();
 				copy.transfer_scale_x = 1.f;
 				copy.transfer_scale_y = 1.f;
 				copy.target = nullptr;
@@ -244,17 +239,17 @@ namespace rsx
 		template <bool is_depth_surface>
 		void intersect_surface_region(command_list_type cmd, u32 address, surface_type new_surface, surface_type prev_surface)
 		{
-			auto scan_list = [&new_surface, address](const rsx::address_range32& mem_range,
-				surface_ranged_map& data) -> std::vector<std::pair<u32, surface_type>>
+			auto scan_list = [&new_surface, address](const rsx::address_range& mem_range,
+				std::unordered_map<u32, surface_storage_type>& data) -> std::vector<std::pair<u32, surface_type>>
 			{
 				std::vector<std::pair<u32, surface_type>> result;
-				for (auto it = data.begin_range(mem_range); it != data.end(); ++it)
+				for (const auto &e : data)
 				{
-					auto surface = Traits::get(it->second);
+					auto surface = Traits::get(e.second);
 
 					if (new_surface->last_use_tag >= surface->last_use_tag ||
 						new_surface == surface ||
-						address == it->first)
+						address == e.first)
 					{
 						// Do not bother synchronizing with uninitialized data
 						continue;
@@ -263,11 +258,11 @@ namespace rsx
 					// Memory partition check
 					if (mem_range.start >= constants::local_mem_base)
 					{
-						if (it->first < constants::local_mem_base) continue;
+						if (e.first < constants::local_mem_base) continue;
 					}
 					else
 					{
-						if (it->first >= constants::local_mem_base) continue;
+						if (e.first >= constants::local_mem_base) continue;
 					}
 
 					// Pitch check
@@ -277,20 +272,20 @@ namespace rsx
 					}
 
 					// Range check
-					const rsx::address_range32 this_range = surface->get_memory_range();
+					const rsx::address_range this_range = surface->get_memory_range();
 					if (!this_range.overlaps(mem_range))
 					{
 						continue;
 					}
 
-					result.push_back({ it->first, surface });
-					ensure(it->first == surface->base_addr);
+					result.push_back({ e.first, surface });
+					ensure(e.first == surface->base_addr);
 				}
 
 				return result;
 			};
 
-			const rsx::address_range32 mem_range = new_surface->get_memory_range();
+			const rsx::address_range mem_range = new_surface->get_memory_range();
 			auto list1 = scan_list(mem_range, m_render_targets_storage);
 			auto list2 = scan_list(mem_range, m_depth_stencil_storage);
 
@@ -352,7 +347,7 @@ namespace rsx
 
 					// If this surface has already been added via another descendant, just ignore it
 					bool ignore = false;
-					for (const auto& slice : new_surface->old_contents)
+					for (auto &slice : new_surface->old_contents)
 					{
 						if (slice.source == surface)
 						{
@@ -373,8 +368,8 @@ namespace rsx
 					surface == e.second)
 				{
 					// This has been 'swallowed' by the new surface and can be safely freed
-					auto& storage = surface->is_depth_surface() ? m_depth_stencil_storage : m_render_targets_storage;
-					auto& object = ::at32(storage, e.first);
+					auto &storage = surface->is_depth_surface() ? m_depth_stencil_storage : m_render_targets_storage;
+					auto &object = storage[e.first];
 
 					ensure(object);
 
@@ -407,12 +402,8 @@ namespace rsx
 			bool do_intersection_test = true;
 			bool store = true;
 
-			// Workaround. Preserve new surface tag value because pitch convert is unimplemented
-			u64 new_content_tag = 0;
-
-			address_range32* storage_bounds;
-			surface_ranged_map* primary_storage;
-			surface_ranged_map* secondary_storage;
+			address_range *storage_bounds;
+			std::unordered_map<u32, surface_storage_type> *primary_storage, *secondary_storage;
 			if constexpr (depth)
 			{
 				primary_storage = &m_depth_stencil_storage;
@@ -430,32 +421,16 @@ namespace rsx
 			auto It = primary_storage->find(address);
 			if (It != primary_storage->end())
 			{
-				surface_storage_type& surface = It->second;
+				surface_storage_type &surface = It->second;
 				const bool pitch_compatible = Traits::surface_is_pitch_compatible(surface, pitch);
 
-				if (!pitch_compatible)
-				{
-					// This object should be pitch-converted and re-intersected with
-					if (old_surface_storage = Traits::convert_pitch(command_list, surface, pitch); old_surface_storage)
-					{
-						old_surface = Traits::get(old_surface_storage);
-					}
-					else
-					{
-						// Preserve content age. This is hacky, but matches previous behavior
-						// TODO: Remove when pitch convert is implemented
-						new_content_tag = Traits::get(surface)->last_use_tag;
-					}
-				}
-
 				if (Traits::surface_matches_properties(surface, format, width, height, antialias))
 				{
-					if (!pitch_compatible)
-					{
-						Traits::invalidate_surface_contents(command_list, Traits::get(surface), format, address, pitch);
-					}
+					if (pitch_compatible)
+						Traits::notify_surface_persist(surface);
+					else
+						Traits::invalidate_surface_contents(command_list, Traits::get(surface), address, pitch);
 
-					Traits::notify_surface_persist(surface);
 					Traits::prepare_surface_for_drawing(command_list, Traits::get(surface));
 					new_surface = Traits::get(surface);
 					store = false;
@@ -473,12 +448,6 @@ namespace rsx
 					free_rsx_memory(Traits::get(surface));
 					Traits::notify_surface_invalidated(surface);
 
-					if (old_surface_storage)
-					{
-						// Pitch-converted data. Send to invalidated pool immediately.
-						invalidated_resources.push_back(std::move(old_surface_storage));
-					}
-
 					old_surface_storage = std::move(surface);
 					primary_storage->erase(It);
 				}
@@ -488,7 +457,7 @@ namespace rsx
 			{
 				// Range test
 				const auto aa_factor_v = get_aa_factor_v(antialias);
-				rsx::address_range32 range = rsx::address_range32::start_length(address, static_cast<u32>(pitch * height * aa_factor_v));
+				rsx::address_range range = rsx::address_range::start_length(address, static_cast<u32>(pitch * height * aa_factor_v));
 				*storage_bounds = range.get_min_max(*storage_bounds);
 
 				// Search invalidated resources for a suitable surface
@@ -504,7 +473,6 @@ namespace rsx
 						{
 							// Exchange this surface with the invalidated one
 							surface = std::move(old_surface_storage);
-							old_surface_storage = {};
 						}
 						else
 						{
@@ -513,7 +481,7 @@ namespace rsx
 						}
 
 						new_surface = Traits::get(new_surface_storage);
-						Traits::invalidate_surface_contents(command_list, new_surface, format, address, pitch);
+						Traits::invalidate_surface_contents(command_list, new_surface, address, pitch);
 						Traits::prepare_surface_for_drawing(command_list, new_surface);
 						allocate_rsx_memory(new_surface);
 						break;
@@ -581,18 +549,13 @@ namespace rsx
 
 			if (do_intersection_test)
 			{
-				if (new_content_tag)
-				{
-					new_surface->last_use_tag = new_content_tag;
-				}
-
 				intersect_surface_region<depth>(command_list, address, new_surface, old_surface);
 			}
 
 			if (store)
 			{
 				// New surface was found among invalidated surfaces or created from scratch
-				primary_storage->emplace(new_surface->get_memory_range(), std::move(new_surface_storage));
+				(*primary_storage)[address] = std::move(new_surface_storage);
 			}
 
 			ensure(!old_surface_storage);
@@ -629,206 +592,6 @@ namespace rsx
 			invalidated_resources.push_back(std::move(storage));
 		}
 
-		int remove_duplicates_fast_impl(std::vector<surface_overlap_info>& sections, const rsx::address_range32& range)
-		{
-			// Range tests to check for gaps
-			std::list<utils::address_range32> m_ranges;
-			bool invalidate_sections = false;
-			int removed_count = 0;
-
-			for (auto it = sections.crbegin(); it != sections.crend(); ++it)
-			{
-				auto this_range = it->surface->get_memory_range();
-				if (invalidate_sections)
-				{
-					if (this_range.inside(range))
-					{
-						invalidate_surface_address(it->base_address, it->is_depth);
-						removed_count++;
-					}
-					continue;
-				}
-
-				if (it->surface->get_rsx_pitch() != it->surface->get_native_pitch() &&
-					it->surface->template get_surface_height<>() != 1)
-				{
-					// Memory gap in descriptor
-					continue;
-				}
-
-				// Insert the range, respecting sort order
-				bool inserted = false;
-				for (auto iter = m_ranges.begin(); iter != m_ranges.end(); ++iter)
-				{
-					if (this_range.start < iter->start)
-					{
-						// This range slots in here. Test ranges after this one to find the end position
-						auto pos = iter;
-						for (auto _p = ++iter; _p != m_ranges.end();)
-						{
-							if (_p->start > (this_range.end + 1))
-							{
-								// Gap
-								break;
-							}
-
-							// Consume
-							this_range.end = std::max(this_range.end, _p->end);
-							_p = m_ranges.erase(_p);
-						}
-
-						m_ranges.insert(pos, this_range);
-						inserted = true;
-						break;
-					}
-				}
-
-				if (!inserted)
-				{
-					m_ranges.push_back(this_range);
-				}
-				else if (m_ranges.size() == 1 && range.inside(m_ranges.front()))
-				{
-					invalidate_sections = true;
-				}
-			}
-
-			rsx_log.notice("rsx::surface_cache::check_for_duplicates_fast analysed %u overlapping sections and removed %u", ::size32(sections), removed_count);
-			return removed_count;
-		}
-
-		void remove_duplicates_fallback_impl(std::vector<surface_overlap_info>& sections, const rsx::address_range32& range)
-		{
-			// Originally used to debug crashes but this function breaks often enough that I'll leave the checks in for now.
-			// Safe to remove after some time if no asserts are reported.
-			constexpr u32 overrun_cookie_value = 0xCAFEBABEu;
-
-			// Generic painter's algorithm to detect obsolete sections
-			ensure(range.length() < 64 * 0x100000);
-			std::vector<u8> marker(range.length() + sizeof(overrun_cookie_value), 0);
-
-			// Tag end
-			write_to_ptr(marker, range.length(), overrun_cookie_value);
-
-			u32 removed_count = 0;
-
-			auto compare_and_tag_row = [&](const u32 offset, u32 length) -> bool
-			{
-				u64 mask = 0;
-				u8* dst_ptr = marker.data() + offset;
-
-				while (length >= 8)
-				{
-					const u64 value = read_from_ptr<u64>(dst_ptr);
-					const u64 block_mask = ~value;              // If the value is not all 1s, set valid to true
-					mask |= block_mask;
-					write_to_ptr<u64>(dst_ptr, umax);
-
-					dst_ptr += 8;
-					length -= 8;
-				}
-
-				if (length >= 4)
-				{
-					const u32 value = read_from_ptr<u32>(dst_ptr);
-					const u32 block_mask = ~value;
-					mask |= block_mask;
-					write_to_ptr<u32>(dst_ptr, umax);
-
-					dst_ptr += 4;
-					length -= 4;
-				}
-
-				if (length >= 2)
-				{
-					const u16 value = read_from_ptr<u16>(dst_ptr);
-					const u16 block_mask = ~value;
-					mask |= block_mask;
-					write_to_ptr<u16>(dst_ptr, umax);
-
-					dst_ptr += 2;
-					length -= 2;
-				}
-
-				if (length)
-				{
-					const u8 value = *dst_ptr;
-					const u8 block_mask = ~value;
-					mask |= block_mask;
-					*dst_ptr = umax;
-				}
-
-				return !!mask;
-			};
-
-			for (auto it = sections.crbegin(); it != sections.crend(); ++it)
-			{
-				auto this_range = it->surface->get_memory_range();
-				ensure(this_range.overlaps(range));
-
-				const auto native_pitch = it->surface->template get_surface_width<rsx::surface_metrics::bytes>();
-				const auto rsx_pitch = it->surface->get_rsx_pitch();
-				auto num_rows = it->surface->template get_surface_height<rsx::surface_metrics::samples>();
-				bool valid = false;
-
-				if (this_range.start < range.start)
-				{
-					// Starts outside bounds
-					const auto internal_offset = (range.start - this_range.start);
-					const auto row_num = internal_offset / rsx_pitch;
-					const auto row_offset = internal_offset % rsx_pitch;
-
-					// This section is unconditionally valid
-					valid = true;
-
-					if (row_offset < native_pitch)
-					{
-						compare_and_tag_row(0, std::min(native_pitch - row_offset, range.length()));
-					}
-
-					// Jump to next row...
-					this_range.start = this_range.start + (row_num + 1) * rsx_pitch;
-				}
-
-				if (this_range.end > range.end)
-				{
-					// Unconditionally valid
-					valid = true;
-					this_range.end = range.end;
-				}
-
-				if (valid)
-				{
-					if (this_range.start >= this_range.end)
-					{
-						continue;
-					}
-
-					num_rows = utils::aligned_div(this_range.length(), rsx_pitch);
-				}
-
-				for (u32 row = 0, offset = (this_range.start - range.start), section_len = (this_range.end - range.start + 1);
-					row < num_rows;
-					++row, offset += rsx_pitch)
-				{
-					valid |= compare_and_tag_row(offset, std::min<u32>(native_pitch, (section_len - offset)));
-				}
-
-				if (!valid)
-				{
-					removed_count++;
-					rsx_log.warning("Stale surface at address 0x%x will be deleted", it->base_address);
-					invalidate_surface_address(it->base_address, it->is_depth);
-				}
-			}
-
-			// Notify
-			rsx_log.notice("rsx::surface_cache::check_for_duplicates_fallback analysed %u overlapping sections and removed %u", ::size32(sections), removed_count);
-
-			// Verify no OOB
-			ensure(read_from_ptr<u32>(marker, range.length()) == overrun_cookie_value);
-		}
-
 	protected:
 		/**
 		* If render target already exists at address, issue state change operation on cmdList.
@@ -866,94 +629,6 @@ namespace rsx
 				std::forward<Args>(extra_params)...);
 		}
 
-		std::tuple<std::vector<surface_type>, std::vector<surface_type>>
-		find_overlapping_set(const utils::address_range32& range) const
-		{
-			std::vector<surface_type> color_result, depth_result;
-			utils::address_range32 result_range;
-
-			if (m_render_targets_memory_range.valid() &&
-				range.overlaps(m_render_targets_memory_range))
-			{
-				for (auto it = m_render_targets_storage.begin_range(range); it != m_render_targets_storage.end(); ++it)
-				{
-					auto surface = Traits::get(it->second);
-					const auto surface_range = surface->get_memory_range();
-					if (!range.overlaps(surface_range))
-						continue;
-
-					color_result.push_back(surface);
-				}
-			}
-
-			if (m_depth_stencil_memory_range.valid() &&
-				range.overlaps(m_depth_stencil_memory_range))
-			{
-				for (auto it = m_depth_stencil_storage.begin_range(range); it != m_depth_stencil_storage.end(); ++it)
-				{
-					auto surface = Traits::get(it->second);
-					const auto surface_range = surface->get_memory_range();
-					if (!range.overlaps(surface_range))
-						continue;
-
-					depth_result.push_back(surface);
-				}
-			}
-
-			return { color_result, depth_result, result_range };
-		}
-
-		void write_to_dma_buffers(
-			command_list_type command_list,
-			const utils::address_range32& range)
-		{
-			auto block_range = m_dma_block.to_block_range(range);
-			auto [color_data, depth_stencil_data] = find_overlapping_set(block_range);
-			auto [bo, offset, bo_timestamp] = m_dma_block
-				.with_range(command_list, block_range)
-				.get(block_range.start);
-
-			u64 src_offset, dst_offset, write_length;
-			auto block_length = block_range.length();
-
-			auto all_data = std::move(color_data);
-			all_data.insert(all_data.end(), depth_stencil_data.begin(), depth_stencil_data.end());
-
-			if (all_data.size() > 1)
-			{
-				std::sort(all_data.begin(), all_data.end(), [](const auto& a, const auto& b)
-				{
-					return a->last_use_tag < b->last_use_tag;
-				});
-			}
-
-			for (const auto& surface : all_data)
-			{
-				if (surface->last_use_tag <= bo_timestamp)
-				{
-					continue;
-				}
-
-				const auto this_range = surface->get_memory_range();
-				const auto max_length = this_range.length();
-				if (this_range.start < block_range.start)
-				{
-					src_offset = block_range.start - this_range.start;
-					dst_offset = 0;
-				}
-				else
-				{
-					src_offset = 0;
-					dst_offset = this_range.start - block_range.start;
-				}
-
-				write_length = std::min(max_length, block_length - dst_offset);
-				Traits::write_render_target_to_memory(command_list, bo, surface, dst_offset, src_offset, write_length);
-			}
-
-			m_dma_block.touch(block_range);
-		}
-
 	public:
 		/**
 		 * Update bound color and depth surface.
@@ -977,19 +652,23 @@ namespace rsx
 			cache_tag = rsx::get_shared_tag();
 			m_invalidate_on_write = (antialias != rsx::surface_antialiasing::center_1_sample);
 			m_active_raster_type = raster_type;
+			m_bound_buffers_count = 0;
 
 			// Make previous RTTs sampleable
-			for (const auto& i : m_bound_render_target_ids)
+			for (int i = m_bound_render_targets_config.first, count = 0;
+				count < m_bound_render_targets_config.second;
+				++i, ++count)
 			{
 				auto &rtt = m_bound_render_targets[i];
 				Traits::prepare_surface_for_sampling(command_list, std::get<1>(rtt));
 				rtt = std::make_pair(0, nullptr);
 			}
 
-			m_bound_render_target_ids.clear();
-			if (const auto rtt_indices = utility::get_rtt_indexes(set_surface_target);
-				!rtt_indices.empty()) [[likely]]
+			const auto rtt_indices = utility::get_rtt_indexes(set_surface_target);
+			if (!rtt_indices.empty()) [[likely]]
 			{
+				m_bound_render_targets_config = { rtt_indices.front(), 0 };
+
 				// Create/Reuse requested rtts
 				for (u8 surface_index : rtt_indices)
 				{
@@ -1000,9 +679,14 @@ namespace rsx
 						bind_address_as_render_targets(command_list, surface_addresses[surface_index], color_format, antialias,
 							clip_width, clip_height, surface_pitch[surface_index], std::forward<Args>(extra_params)...));
 
-					m_bound_render_target_ids.push_back(surface_index);
+					++m_bound_render_targets_config.second;
+					++m_bound_buffers_count;
 				}
 			}
+			else
+			{
+				m_bound_render_targets_config = { 0, 0 };
+			}
 
 			// Same for depth buffer
 			if (std::get<1>(m_bound_depth_stencil) != nullptr)
@@ -1015,6 +699,8 @@ namespace rsx
 				m_bound_depth_stencil = std::make_pair(address_z,
 					bind_address_as_depth_stencil(command_list, address_z, depth_format, antialias,
 						clip_width, clip_height, zeta_pitch, std::forward<Args>(extra_params)...));
+
+				++m_bound_buffers_count;
 			}
 			else
 			{
@@ -1024,7 +710,7 @@ namespace rsx
 
 		u8 get_color_surface_count() const
 		{
-			return static_cast<u8>(m_bound_render_target_ids.size());
+			return m_bound_render_targets_config.second;
 		}
 
 		surface_type get_surface_at(u32 address)
@@ -1073,15 +759,14 @@ namespace rsx
 			}
 		}
 
-		inline bool address_is_bound(u32 address) const
+		bool address_is_bound(u32 address) const
 		{
-			ensure(address);
-			for (int i = 0; i < 4; ++i)
+			for (int i = m_bound_render_targets_config.first, count = 0;
+				count < m_bound_render_targets_config.second;
+				++i, ++count)
 			{
 				if (m_bound_render_targets[i].first == address)
-				{
 					return true;
-				}
 			}
 
 			return (m_bound_depth_stencil.first == address);
@@ -1103,17 +788,17 @@ namespace rsx
 				return {};
 			}
 
-			const auto test_range = utils::address_range32::start_length(texaddr, (required_pitch * required_height) - (required_pitch - surface_internal_pitch));
+			const auto test_range = utils::address_range::start_length(texaddr, (required_pitch * required_height) - (required_pitch - surface_internal_pitch));
 
-			auto process_list_function = [&](surface_ranged_map& data, bool is_depth)
+			auto process_list_function = [&](std::unordered_map<u32, surface_storage_type>& data, bool is_depth)
 			{
-				for (auto it = data.begin_range(test_range); it != data.end(); ++it)
+				for (auto& tex_info : data)
 				{
-					const auto range = it->second->get_memory_range();
+					const auto range = tex_info.second->get_memory_range();
 					if (!range.overlaps(test_range))
 						continue;
 
-					auto surface = it->second.get();
+					auto surface = tex_info.second.get();
 					if (access.is_transfer() && access.is_read() && surface->write_through())
 					{
 						// The surface has no data other than what can be loaded from CPU
@@ -1129,8 +814,8 @@ namespace rsx
 					info.base_address = range.start;
 					info.is_depth = is_depth;
 
-					const u32 normalized_surface_width = surface->template get_surface_width<rsx::surface_metrics::bytes>() / required_bpp;
-					const u32 normalized_surface_height = surface->template get_surface_height<rsx::surface_metrics::samples>();
+					const u32 normalized_surface_width = surface->get_surface_width(rsx::surface_metrics::bytes) / required_bpp;
+					const u32 normalized_surface_height = surface->get_surface_height(rsx::surface_metrics::samples);
 
 					if (range.start >= texaddr) [[likely]]
 					{
@@ -1236,107 +921,151 @@ namespace rsx
 			return result;
 		}
 
-		void check_for_duplicates(std::vector<surface_overlap_info>& sections)
+		void check_for_duplicates(std::vector<surface_overlap_info>& sections, const rsx::address_range& range)
 		{
-			utils::address_range32 test_range;
-			for (const auto& section : sections)
-			{
-				const auto range = section.surface->get_memory_range();
-				test_range.start = std::min(test_range.start, range.start);
-				test_range.end = std::max(test_range.end, range.end);
-			}
+			// Generic painter's algorithm to detect obsolete sections
+			ensure(range.length() < 64 * 0x100000);
+			std::vector<u8> marker(range.length());
+			std::memset(marker.data(), 0, range.length());
 
-			if (!remove_duplicates_fast_impl(sections, test_range))
+			for (auto it = sections.crbegin(); it != sections.crend(); ++it)
 			{
-				remove_duplicates_fallback_impl(sections, test_range);
+				if (!it->surface->get_memory_range().inside(range))
+				{
+					continue;
+				}
+
+				const auto true_pitch_in_bytes = it->surface->get_surface_width(rsx::surface_metrics::bytes);
+				const auto true_height_in_rows = it->surface->get_surface_height(rsx::surface_metrics::samples);
+
+				bool valid = false;
+				auto addr = it->base_address - range.start;
+				auto data = marker.data();
+
+				for (usz row = 0; row < true_height_in_rows; ++row)
+				{
+					for (usz col = 0; col < true_pitch_in_bytes; ++col)
+					{
+						if (const auto loc = col + addr; !data[loc])
+						{
+							valid = true;
+							data[loc] = 1;
+						}
+					}
+
+					addr += true_pitch_in_bytes;
+				}
+
+				if (!valid)
+				{
+					rsx_log.error("Stale surface at address 0x%x will be deleted", it->base_address);
+					invalidate_surface_address(it->base_address, it->is_depth);
+				}
 			}
 		}
 
-		void on_write(const std::array<bool, 4>& color_mrt_writes_enabled, const bool depth_stencil_writes_enabled)
+		void on_write(const bool* color, bool z)
 		{
-			if (write_tag >= cache_tag && !m_invalidate_on_write)
+			if (write_tag == cache_tag && m_skip_write_updates)
 			{
+				// Nothing to do
+				ensure(!m_invalidate_on_write);
 				return;
 			}
 
-			// TODO: Take WCB/WDB into account. Should speed this up a bit by skipping sync_tag calls
-			write_tag = rsx::get_shared_tag();
+			write_tag = cache_tag;
+			m_skip_write_updates = false;
+			int tagged = 0;
 
-			for (const auto& i : m_bound_render_target_ids)
+			// Tag surfaces
+			if (color)
 			{
-				if (color_mrt_writes_enabled[i])
+				for (int i = m_bound_render_targets_config.first, count = 0;
+					count < m_bound_render_targets_config.second;
+					++i, ++count)
 				{
-					auto surface = m_bound_render_targets[i].second;
-					if (surface->last_use_tag > cache_tag) [[ likely ]]
+					if (!color[i])
+						continue;
+
+					auto& surface = m_bound_render_targets[i].second;
+					if (surface->last_use_tag != write_tag)
 					{
-						surface->on_write_fast(write_tag);
+						m_bound_render_targets[i].second->on_write(write_tag, surface_state_flags::require_resolve, m_active_raster_type);
 					}
-					else
+					else if (m_invalidate_on_write)
 					{
-						surface->on_write(write_tag, rsx::surface_state_flags::require_resolve, m_active_raster_type);
+						m_bound_render_targets[i].second->on_invalidate_children();
 					}
+
+					++tagged;
 				}
 			}
 
-			if (auto zsurface = m_bound_depth_stencil.second;
-				zsurface && depth_stencil_writes_enabled)
+			if (z && m_bound_depth_stencil.first)
 			{
-				if (zsurface->last_use_tag > cache_tag) [[ likely ]]
+				auto& surface = m_bound_depth_stencil.second;
+				if (surface->last_use_tag != write_tag)
 				{
-					zsurface->on_write_fast(write_tag);
+					m_bound_depth_stencil.second->on_write(write_tag, surface_state_flags::require_resolve, m_active_raster_type);
 				}
-				else
+				else if (m_invalidate_on_write)
 				{
-					zsurface->on_write(write_tag, rsx::surface_state_flags::require_resolve, m_active_raster_type);
+					m_bound_depth_stencil.second->on_invalidate_children();
 				}
+
+				++tagged;
+			}
+
+			if (!m_invalidate_on_write && tagged == m_bound_buffers_count)
+			{
+				// Skip any further updates as all active surfaces have been updated
+				m_skip_write_updates = true;
 			}
 		}
 
 		void invalidate_all()
 		{
 			// Unbind and invalidate all resources
-			auto free_resource_list = [&](auto &data, const utils::address_range32& range)
+			auto free_resource_list = [&](auto &data)
 			{
-				for (auto it = data.begin_range(range); it != data.end(); ++it)
+				for (auto &e : data)
 				{
-					invalidate(it->second);
+					invalidate(e.second);
 				}
 
 				data.clear();
 			};
 
-			free_resource_list(m_render_targets_storage, m_render_targets_memory_range);
-			free_resource_list(m_depth_stencil_storage, m_depth_stencil_memory_range);
+			free_resource_list(m_render_targets_storage);
+			free_resource_list(m_depth_stencil_storage);
 
 			ensure(m_active_memory_used == 0);
 
 			m_bound_depth_stencil = std::make_pair(0, nullptr);
-			m_bound_render_target_ids.clear();
+			m_bound_render_targets_config = { 0, 0 };
 			for (auto &rtt : m_bound_render_targets)
 			{
 				rtt = std::make_pair(0, nullptr);
 			}
 		}
 
-		void invalidate_range(const rsx::address_range32& range)
+		void invalidate_range(const rsx::address_range& range)
 		{
-			for (auto it = m_render_targets_storage.begin_range(range); it != m_render_targets_storage.end(); ++it)
+			for (auto &rtt : m_render_targets_storage)
 			{
-				auto& rtt = it->second;
-				if (range.overlaps(rtt->get_memory_range()))
+				if (range.overlaps(rtt.second->get_memory_range()))
 				{
-					rtt->clear_rw_barrier();
-					rtt->state_flags |= rsx::surface_state_flags::erase_bkgnd;
+					rtt.second->clear_rw_barrier();
+					rtt.second->state_flags |= rsx::surface_state_flags::erase_bkgnd;
 				}
 			}
 
-			for (auto it = m_depth_stencil_storage.begin_range(range); it != m_depth_stencil_storage.end(); ++it)
+			for (auto &ds : m_depth_stencil_storage)
 			{
-				auto& ds = it->second;
-				if (range.overlaps(ds->get_memory_range()))
+				if (range.overlaps(ds.second->get_memory_range()))
 				{
-					ds->clear_rw_barrier();
-					ds->state_flags |= rsx::surface_state_flags::erase_bkgnd;
+					ds.second->clear_rw_barrier();
+					ds.second->state_flags |= rsx::surface_state_flags::erase_bkgnd;
 				}
 			}
 		}
@@ -1364,29 +1093,11 @@ namespace rsx
 			return true;
 		}
 
-		void trim_invalidated_resources(command_list_type cmd, problem_severity severity)
+		virtual bool handle_memory_pressure(command_list_type cmd, problem_severity severity)
 		{
-			// It is possible to have stale invalidated resources holding references to other invalidated resources.
-			// This can bloat the VRAM usage significantly especially if the references are never collapsed.
-			for (auto& surface : invalidated_resources)
+			auto process_list_function = [&](std::unordered_map<u32, surface_storage_type>& data)
 			{
-				if (!surface->has_refs() || surface->old_contents.empty())
-				{
-					continue;
-				}
-
-				if (can_collapse_surface(surface, severity))
-				{
-					surface->memory_barrier(cmd, rsx::surface_access::transfer_read);
-				}
-			}
-		}
-
-		void collapse_dirty_surfaces(command_list_type cmd, problem_severity severity)
-		{
-			auto process_list_function = [&](surface_ranged_map& data, const utils::address_range32& range)
-			{
-				for (auto It = data.begin_range(range); It != data.end();)
+				for (auto It = data.begin(); It != data.end();)
 				{
 					auto surface = Traits::get(It->second);
 					if (surface->dirty())
@@ -1411,57 +1122,14 @@ namespace rsx
 				}
 			};
 
-			process_list_function(m_render_targets_storage, m_render_targets_memory_range);
-			process_list_function(m_depth_stencil_storage, m_depth_stencil_memory_range);
-		}
-
-		virtual bool handle_memory_pressure(command_list_type cmd, problem_severity severity)
-		{
 			ensure(severity >= rsx::problem_severity::moderate);
 			const auto old_usage = m_active_memory_used;
 
 			// Try and find old surfaces to remove
-			collapse_dirty_surfaces(cmd, severity);
-
-			// Check invalidated resources as they can have long dependency chains
-			if (invalidated_resources.size() > max_invalidated_resources_count ||
-				severity >= rsx::problem_severity::severe)
-			{
-				trim_invalidated_resources(cmd, severity);
-			}
+			process_list_function(m_render_targets_storage);
+			process_list_function(m_depth_stencil_storage);
 
 			return (m_active_memory_used < old_usage);
 		}
-
-		void run_cleanup_internal(
-			command_list_type cmd,
-			rsx::problem_severity memory_pressure,
-			u32 max_surface_store_memory_mb,
-			std::function<void(command_list_type)> pre_task_callback)
-		{
-			if (check_memory_usage(max_surface_store_memory_mb * 0x100000))
-			{
-				pre_task_callback(cmd);
-
-				const auto severity = std::max(memory_pressure, rsx::problem_severity::moderate);
-				handle_memory_pressure(cmd, severity);
-			}
-			else if (invalidated_resources.size() > max_invalidated_resources_count)
-			{
-				pre_task_callback(cmd);
-
-				rsx_log.warning("[PERFORMANCE WARNING] Invalidated resource pool has exceeded the desired limit. A trim will now be attempted. Current=%u, Limit=%u",
-					invalidated_resources.size(), max_invalidated_resources_count);
-
-				// Check invalidated resources as they can have long dependency chains
-				trim_invalidated_resources(cmd, memory_pressure);
-
-				if ((invalidated_resources.size() + 16u) > max_invalidated_resources_count)
-				{
-					// We didn't release enough resources, scan the active RTTs as well
-					collapse_dirty_surfaces(cmd, memory_pressure);
-				}
-			}
-		}
 	};
 }
diff --git a/rpcs3/Emu/RSX/Common/surface_utils.h b/rpcs3/Emu/RSX/Common/surface_utils.h
index bf7dee2db3..5b0dd6c70c 100644
--- a/rpcs3/Emu/RSX/Common/surface_utils.h
+++ b/rpcs3/Emu/RSX/Common/surface_utils.h
@@ -2,6 +2,7 @@
 
 #include "util/types.hpp"
 #include "Utilities/geometry.h"
+#include "Utilities/address_range.h"
 #include "TextureUtils.h"
 #include "../rsx_utils.h"
 #include "Emu/Memory/vm.h"
@@ -93,12 +94,12 @@ namespace rsx
 					auto src = static_cast<T>(source);
 
 					std::tie(src_w, src_h) = rsx::apply_resolution_scale<true>(src_w, src_h,
-						src->template get_surface_width<rsx::surface_metrics::pixels>(),
-						src->template get_surface_height<rsx::surface_metrics::pixels>());
+						src->get_surface_width(rsx::surface_metrics::pixels),
+						src->get_surface_height(rsx::surface_metrics::pixels));
 
 					std::tie(dst_w, dst_h) = rsx::apply_resolution_scale<true>(dst_w, dst_h,
-						target_surface->template get_surface_width<rsx::surface_metrics::pixels>(),
-						target_surface->template get_surface_height<rsx::surface_metrics::pixels>());
+						target_surface->get_surface_width(rsx::surface_metrics::pixels),
+						target_surface->get_surface_height(rsx::surface_metrics::pixels));
 				}
 
 				width = src_w;
@@ -124,7 +125,7 @@ namespace rsx
 	};
 
 	template <typename image_storage_type>
-	struct render_target_descriptor : public rsx::ref_counted
+	struct render_target_descriptor
 	{
 		u64 last_use_tag = 0;         // tag indicating when this block was last confirmed to have been written to
 		u32 base_addr = 0;
@@ -138,17 +139,15 @@ namespace rsx
 		std::vector<deferred_clipped_region<image_storage_type>> old_contents;
 
 		// Surface properties
-		u32 rsx_pitch = 0;
-		u32 native_pitch = 0;
+		u16 rsx_pitch = 0;
+		u16 native_pitch = 0;
 		u16 surface_width = 0;
 		u16 surface_height = 0;
 		u8  spp = 1;
 		u8  samples_x = 1;
 		u8  samples_y = 1;
 
-		rsx::address_range32 memory_range;
-
-		std::unique_ptr<typename std::remove_pointer_t<image_storage_type>> resolve_surface;
+		std::unique_ptr<typename std::remove_pointer<image_storage_type>::type> resolve_surface;
 		surface_sample_layout sample_layout = surface_sample_layout::null;
 		surface_raster_type raster_type = surface_raster_type::linear;
 
@@ -164,13 +163,6 @@ namespace rsx
 		}
 		format_info;
 
-		struct
-		{
-			u64 timestamp = 0;
-			bool locked = false;
-		}
-		texture_cache_metadata;
-
 		render_target_descriptor() {}
 
 		virtual ~render_target_descriptor()
@@ -184,70 +176,53 @@ namespace rsx
 
 		virtual image_storage_type get_surface(rsx::surface_access access_type) = 0;
 		virtual bool is_depth_surface() const = 0;
+		virtual void release_ref(image_storage_type) const = 0;
 
-		void reset()
+		virtual u16 get_surface_width(rsx::surface_metrics metrics = rsx::surface_metrics::pixels) const
 		{
-			texture_cache_metadata = {};
-		}
-
-		template<rsx::surface_metrics Metrics = rsx::surface_metrics::pixels, typename T = u32>
-		T get_surface_width() const
-		{
-			if constexpr (Metrics == rsx::surface_metrics::samples)
+			switch (metrics)
 			{
-				return static_cast<T>(surface_width * samples_x);
-			}
-			else if constexpr (Metrics == rsx::surface_metrics::pixels)
-			{
-				return static_cast<T>(surface_width);
-			}
-			else if constexpr (Metrics == rsx::surface_metrics::bytes)
-			{
-				return static_cast<T>(native_pitch);
-			}
-			else
-			{
-				fmt::throw_exception("Unreachable");
+				case rsx::surface_metrics::samples:
+					return surface_width * samples_x;
+				case rsx::surface_metrics::pixels:
+					return surface_width;
+				case rsx::surface_metrics::bytes:
+					return native_pitch;
+				default:
+					fmt::throw_exception("Unknown surface metric %d", u32(metrics));
 			}
 		}
 
-		template<rsx::surface_metrics Metrics = rsx::surface_metrics::pixels, typename T = u32>
-		T get_surface_height() const
+		virtual u16 get_surface_height(rsx::surface_metrics metrics = rsx::surface_metrics::pixels) const
 		{
-			if constexpr (Metrics == rsx::surface_metrics::samples)
+			switch (metrics)
 			{
-				return static_cast<T>(surface_height * samples_y);
-			}
-			else if constexpr (Metrics == rsx::surface_metrics::pixels)
-			{
-				return static_cast<T>(surface_height);
-			}
-			else if constexpr (Metrics == rsx::surface_metrics::bytes)
-			{
-				return static_cast<T>(surface_height * samples_y);
-			}
-			else
-			{
-				fmt::throw_exception("Unreachable");
+				case rsx::surface_metrics::samples:
+				case rsx::surface_metrics::bytes:
+					return surface_height * samples_y;
+				case rsx::surface_metrics::pixels:
+					return surface_height;
+				default:
+					fmt::throw_exception("Unknown surface metric %d", u32(metrics));
 			}
 		}
 
-		inline u32 get_rsx_pitch() const
+		virtual u16 get_rsx_pitch() const
 		{
 			return rsx_pitch;
 		}
 
-		inline u32 get_native_pitch() const
+		virtual u16 get_native_pitch() const
 		{
 			return native_pitch;
 		}
 
-		inline u8 get_bpp() const
+		u8 get_bpp() const
 		{
-			return u8(get_native_pitch() / get_surface_width<rsx::surface_metrics::samples>());
+			return u8(get_native_pitch() / get_surface_width(rsx::surface_metrics::samples));
 		}
 
-		inline u8 get_spp() const
+		u8 get_spp() const
 		{
 			return spp;
 		}
@@ -303,17 +278,17 @@ namespace rsx
 			format_info.gcm_depth_format = format;
 		}
 
-		inline rsx::surface_color_format get_surface_color_format() const
+		rsx::surface_color_format get_surface_color_format() const
 		{
 			return format_info.gcm_color_format;
 		}
 
-		inline rsx::surface_depth_format2 get_surface_depth_format() const
+		rsx::surface_depth_format2 get_surface_depth_format() const
 		{
 			return format_info.gcm_depth_format;
 		}
 
-		inline u32 get_gcm_format() const
+		u32 get_gcm_format() const
 		{
 			return
 			(
@@ -323,12 +298,12 @@ namespace rsx
 			);
 		}
 
-		inline bool dirty() const
+		bool dirty() const
 		{
 			return (state_flags != rsx::surface_state_flags::ready) || !old_contents.empty();
 		}
 
-		inline bool write_through() const
+		bool write_through() const
 		{
 			return (state_flags & rsx::surface_state_flags::erase_bkgnd) && old_contents.empty();
 		}
@@ -360,14 +335,7 @@ namespace rsx
 
 		void queue_tag(u32 address)
 		{
-			ensure(native_pitch);
-			ensure(rsx_pitch);
-
 			base_addr = address;
-
-			const u32 internal_height = get_surface_height<rsx::surface_metrics::samples>();
-			const u32 excess = (rsx_pitch - native_pitch);
-			memory_range = rsx::address_range32::start_length(base_addr, internal_height * rsx_pitch - excess);
 		}
 
 		void sync_tag()
@@ -391,9 +359,6 @@ namespace rsx
 			ensure(native_pitch);
 			ensure(rsx_pitch);
 
-			// Clear metadata
-			reset();
-
 			base_addr = address;
 
 			const u32 size_x = (native_pitch > 8)? (native_pitch - 8) : 0u;
@@ -416,17 +381,13 @@ namespace rsx
 				const auto sample_offset = (samples[n].y * rsx_pitch) + samples[n].x;
 				memory_tag_samples[n].first = (sample_offset + base_addr);
 			}
-
-			const u32 internal_height = get_surface_height<rsx::surface_metrics::samples>();
-			const u32 excess = (rsx_pitch - native_pitch);
-			memory_range = rsx::address_range32::start_length(base_addr, internal_height * rsx_pitch - excess);
 		}
 
 		void sync_tag()
 		{
 			for (auto &e : memory_tag_samples)
 			{
-				e.second = *reinterpret_cast<nse_t<u64, 1>*>(vm::g_sudo_addr + e.first);
+				e.second = *reinterpret_cast<u64*>(vm::g_sudo_addr + e.first);
 			}
 		}
 
@@ -435,11 +396,11 @@ namespace rsx
 			memory_tag_samples[0].second = ~memory_tag_samples[0].second;
 		}
 
-		bool test() const
+		bool test()
 		{
-			for (const auto& e : memory_tag_samples)
+			for (auto &e : memory_tag_samples)
 			{
-				if (e.second != *reinterpret_cast<nse_t<u64, 1>*>(vm::g_sudo_addr + e.first))
+				if (e.second != *reinterpret_cast<u64*>(vm::g_sudo_addr + e.first))
 					return false;
 			}
 
@@ -447,18 +408,11 @@ namespace rsx
 		}
 #endif
 
-		void invalidate_GPU_memory()
-		{
-			// Here be dragons. Use with caution.
-			shuffle_tag();
-			state_flags |= rsx::surface_state_flags::erase_bkgnd;
-		}
-
 		void clear_rw_barrier()
 		{
 			for (auto &e : old_contents)
 			{
-				ensure(dynamic_cast<rsx::ref_counted*>(e.source))->release();
+				release_ref(e.source);
 			}
 
 			old_contents.clear();
@@ -471,10 +425,10 @@ namespace rsx
 				return 0;
 
 			// Sort here before doing transfers since surfaces may have been updated in the meantime
-			std::sort(old_contents.begin(), old_contents.end(), [](const auto& a, const auto &b)
+			std::sort(old_contents.begin(), old_contents.end(), [](auto& a, auto &b)
 			{
-				const auto _a = static_cast<const T*>(a.source);
-				const auto _b = static_cast<const T*>(b.source);
+				auto _a = static_cast<T*>(a.source);
+				auto _b = static_cast<T*>(b.source);
 				return (_a->last_use_tag < _b->last_use_tag);
 			});
 
@@ -560,24 +514,29 @@ namespace rsx
 		template <typename T>
 		surface_inheritance_result inherit_surface_contents(T* surface)
 		{
-			const auto child_w = get_surface_width<rsx::surface_metrics::bytes>();
-			const auto child_h = get_surface_height<rsx::surface_metrics::bytes>();
+			const auto child_w = get_surface_width(rsx::surface_metrics::bytes);
+			const auto child_h = get_surface_height(rsx::surface_metrics::bytes);
 
-			const auto parent_w = surface->template get_surface_width<rsx::surface_metrics::bytes>();
-			const auto parent_h = surface->template get_surface_height<rsx::surface_metrics::bytes>();
+			const auto parent_w = surface->get_surface_width(rsx::surface_metrics::bytes);
+			const auto parent_h = surface->get_surface_height(rsx::surface_metrics::bytes);
 
-			const auto [src_offset, dst_offset, size] = rsx::intersect_region(surface->base_addr, parent_w, parent_h, base_addr, child_w, child_h, get_rsx_pitch());
+			const auto rect = rsx::intersect_region(surface->base_addr, parent_w, parent_h, 1, base_addr, child_w, child_h, 1, get_rsx_pitch());
+			const auto src_offset = std::get<0>(rect);
+			const auto dst_offset = std::get<1>(rect);
+			const auto size = std::get<2>(rect);
 
-			if (!size.width || !size.height)
+			if (src_offset.x >= parent_w || src_offset.y >= parent_h)
 			{
 				return surface_inheritance_result::none;
 			}
 
-			ensure(src_offset.x < parent_w && src_offset.y < parent_h);
-			ensure(dst_offset.x < child_w && dst_offset.y < child_h);
+			if (dst_offset.x >= child_w || dst_offset.y >= child_h)
+			{
+				return surface_inheritance_result::none;
+			}
 
 			// TODO: Eventually need to stack all the overlapping regions, but for now just do the latest rect in the space
-			deferred_clipped_region<T*> region{};
+			deferred_clipped_region<T*> region;
 			region.src_x = src_offset.x;
 			region.src_y = src_offset.y;
 			region.dst_x = dst_offset.x;
@@ -638,29 +597,28 @@ namespace rsx
 			}
 		}
 
-		inline void on_write_fast(u64 write_tag)
+		void on_invalidate_children()
 		{
-			ensure(write_tag);
-			last_use_tag = write_tag;
-
-			if (spp > 1 && sample_layout != surface_sample_layout::null)
+			if (resolve_surface)
 			{
-				msaa_flags |= rsx::surface_state_flags::require_resolve;
+				msaa_flags = rsx::surface_state_flags::require_resolve;
 			}
 		}
 
 		// Returns the rect area occupied by this surface expressed as an 8bpp image with no AA
-		inline areau get_normalized_memory_area() const
+		areau get_normalized_memory_area() const
 		{
-			const u16 internal_width = get_surface_width<rsx::surface_metrics::bytes>();
-			const u16 internal_height = get_surface_height<rsx::surface_metrics::bytes>();
+			const u16 internal_width = get_surface_width(rsx::surface_metrics::bytes);
+			const u16 internal_height = get_surface_height(rsx::surface_metrics::bytes);
 
 			return { 0, 0, internal_width, internal_height };
 		}
 
-		inline rsx::address_range32 get_memory_range() const
+		rsx::address_range get_memory_range() const
 		{
-			return memory_range;
+			const u32 internal_height = get_surface_height(rsx::surface_metrics::samples);
+			const u32 excess = (rsx_pitch - native_pitch);
+			return rsx::address_range::start_length(base_addr, internal_height * rsx_pitch - excess);
 		}
 
 		template <typename T>
@@ -716,68 +674,5 @@ namespace rsx
 			ensure(access_type.is_read() || access_type.is_transfer());
 			transform_samples_to_pixels(region);
 		}
-
-		void on_lock()
-		{
-			add_ref();
-			texture_cache_metadata.locked = true;
-			texture_cache_metadata.timestamp = rsx::get_shared_tag();
-		}
-
-		void on_unlock()
-		{
-			texture_cache_metadata.locked = false;
-			texture_cache_metadata.timestamp = rsx::get_shared_tag();
-			release();
-		}
-
-		void on_swap_out()
-		{
-			if (is_locked())
-			{
-				on_unlock();
-			}
-			else
-			{
-				release();
-			}
-		}
-
-		void on_swap_in(bool lock)
-		{
-			if (!is_locked() && lock)
-			{
-				on_lock();
-			}
-			else
-			{
-				add_ref();
-			}
-		}
-
-		void on_clone_from(const render_target_descriptor* ref)
-		{
-			if (ref->is_locked() && !is_locked())
-			{
-				// Propagate locked state only.
-				texture_cache_metadata = ref->texture_cache_metadata;
-			}
-
-			rsx_pitch = ref->get_rsx_pitch();
-			last_use_tag = ref->last_use_tag;
-			raster_type = ref->raster_type;     // Can't actually cut up swizzled data
-		}
-
-		bool is_locked() const
-		{
-			return texture_cache_metadata.locked;
-		}
-
-		bool has_flushable_data() const
-		{
-			ensure(is_locked());
-			ensure(texture_cache_metadata.timestamp);
-			return (texture_cache_metadata.timestamp < last_use_tag);
-		}
 	};
 }
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/Common/texture_cache.cpp b/rpcs3/Emu/RSX/Common/texture_cache.cpp
index ab884c407b..95a396f941 100644
--- a/rpcs3/Emu/RSX/Common/texture_cache.cpp
+++ b/rpcs3/Emu/RSX/Common/texture_cache.cpp
@@ -5,9 +5,7 @@
 
 namespace rsx
 {
-	constexpr u32 min_lockable_data_size = 4096; // Increasing this value has worse results even on systems with pages > 4k
-
-	void buffered_section::init_lockable_range(const address_range32& range)
+	void buffered_section::init_lockable_range(const address_range& range)
 	{
 		locked_range = range.to_page_range();
 		AUDIT((locked_range.start == page_start(range.start)) || (locked_range.start == next_page(range.start)));
@@ -15,11 +13,11 @@ namespace rsx
 		ensure(locked_range.is_page_range());
 	}
 
-	void buffered_section::reset(const address_range32& memory_range)
+	void buffered_section::reset(const address_range& memory_range)
 	{
 		ensure(memory_range.valid() && locked == false);
 
-		cpu_range = address_range32(memory_range);
+		cpu_range = address_range(memory_range);
 		confirmed_range.invalidate();
 		locked_range.invalidate();
 
@@ -29,7 +27,7 @@ namespace rsx
 
 		init_lockable_range(cpu_range);
 
-		if (memory_range.length() < min_lockable_data_size)
+		if (memory_range.length() < 4096)
 		{
 			protection_strat = section_protection_strategy::hash;
 			mem_hash = 0;
@@ -98,9 +96,6 @@ namespace rsx
 			tex_cache_checker.remove(locked_range, protection);
 #endif
 
-		// Save previous state to compare for changes
-		const auto prev_confirmed_range = confirmed_range;
-
 		if (prot != utils::protection::rw)
 		{
 			if (confirmed_range.valid())
@@ -110,7 +105,7 @@ namespace rsx
 			}
 			else
 			{
-				confirmed_range = address_range32::start_length(cpu_range.start + new_confirm.first, new_confirm.second);
+				confirmed_range = address_range::start_length(cpu_range.start + new_confirm.first, new_confirm.second);
 				ensure(!locked || locked_range.inside(confirmed_range.to_page_range()));
 			}
 
@@ -118,7 +113,7 @@ namespace rsx
 			init_lockable_range(confirmed_range);
 		}
 
-		protect(prot, confirmed_range != prev_confirmed_range);
+		protect(prot, true);
 	}
 
 	void buffered_section::unprotect()
@@ -139,7 +134,7 @@ namespace rsx
 		locked = false;
 	}
 
-	const address_range32& buffered_section::get_bounds(section_bounds bounds) const
+	const address_range& buffered_section::get_bounds(section_bounds bounds) const
 	{
 		switch (bounds)
 		{
diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h
index 91e41e6179..76aac4eb60 100644
--- a/rpcs3/Emu/RSX/Common/texture_cache.h
+++ b/rpcs3/Emu/RSX/Common/texture_cache.h
@@ -1,14 +1,13 @@
 #pragma once
 
-#include "Emu/RSX/Common/simple_array.hpp"
-#include "Emu/RSX/Core/RSXContext.h"
-#include "Emu/RSX/RSXThread.h"
 #include "texture_cache_utils.h"
 #include "texture_cache_predictor.h"
 #include "texture_cache_helpers.h"
 
 #include <unordered_map>
 
+#include "Emu/Cell/timers.hpp"
+
 #define RSX_GCM_FORMAT_IGNORED 0
 
 namespace rsx
@@ -27,7 +26,6 @@ namespace rsx
 		using image_view_type      = typename traits::image_view_type;
 		using image_storage_type   = typename traits::image_storage_type;
 		using texture_format       = typename traits::texture_format;
-		using viewable_image_type  = typename traits::viewable_image_type;
 
 		using predictor_type       = texture_cache_predictor<traits>;
 		using ranged_storage       = rsx::ranged_storage<traits>;
@@ -36,7 +34,7 @@ namespace rsx
 		using copy_region_descriptor = copy_region_descriptor_base<typename traits::image_resource_type>;
 
 	private:
-		static_assert(std::is_base_of_v<rsx::cached_texture_section<section_storage_type, traits>, section_storage_type>, "section_storage_type must derive from rsx::cached_texture_section");
+		static_assert(std::is_base_of<rsx::cached_texture_section<section_storage_type, traits>, section_storage_type>::value, "section_storage_type must derive from rsx::cached_texture_section");
 
 		/**
 		 * Helper structs/enums
@@ -61,12 +59,10 @@ namespace rsx
 			std::vector<section_storage_type*> sections_to_unprotect; // These sections are to be unpotected and discarded by caller
 			std::vector<section_storage_type*> sections_to_exclude; // These sections are do be excluded from protection manipulation (subtracted from other sections)
 			u32 num_flushable = 0;
-			u32 num_excluded = 0;  // Sections-to-exclude + sections that would have been excluded but are false positives
-			u32 num_discarded = 0;
 			u64 cache_tag = 0;
 
-			address_range32 fault_range;
-			address_range32 invalidate_range;
+			address_range fault_range;
+			address_range invalidate_range;
 
 			void clear_sections()
 			{
@@ -135,8 +131,8 @@ namespace rsx
 
 		struct intersecting_set
 		{
-			rsx::simple_array<section_storage_type*> sections = {};
-			address_range32 invalidate_range = {};
+			std::vector<section_storage_type*> sections = {};
+			address_range invalidate_range = {};
 			bool has_flushables = false;
 		};
 
@@ -146,11 +142,10 @@ namespace rsx
 			std::vector<copy_region_descriptor> sections_to_copy;
 			texture_channel_remap_t remap;
 			deferred_request_command op = deferred_request_command::nop;
-			u32 external_ref_addr = 0;
 			u16 x = 0;
 			u16 y = 0;
 
-			utils::address_range32 cache_range;
+			utils::address_range cache_range;
 			bool do_not_cache = false;
 
 			deferred_subresource() = default;
@@ -166,27 +161,6 @@ namespace rsx
 			{
 				static_cast<image_section_attributes_t&>(*this) = attr;
 			}
-
-			viewable_image_type as_viewable() const
-			{
-				return static_cast<viewable_image_type>(external_handle);
-			}
-
-			image_resource_type src0() const
-			{
-				if (external_handle)
-				{
-					return external_handle;
-				}
-
-				if (!sections_to_copy.empty())
-				{
-					return sections_to_copy[0].src;
-				}
-
-				// Return typed null
-				return external_handle;
-			}
 		};
 
 		struct sampled_image_descriptor : public sampled_image_descriptor_base
@@ -198,23 +172,16 @@ namespace rsx
 			sampled_image_descriptor() = default;
 
 			sampled_image_descriptor(image_view_type handle, texture_upload_context ctx, rsx::format_class ftype,
-				size3f scale, rsx::texture_dimension_extended type, bool cyclic_reference = false,
-				u8 msaa_samples = 1)
+				size3f scale, rsx::texture_dimension_extended type, bool cyclic_reference = false)
 			{
 				image_handle = handle;
 				upload_context = ctx;
 				format_class = ftype;
 				is_cyclic_reference = cyclic_reference;
+				scale_x = scale.width;
+				scale_y = scale.height;
+				scale_z = scale.depth;
 				image_type = type;
-				samples = msaa_samples;
-
-				texcoord_xform.scale[0] = scale.width;
-				texcoord_xform.scale[1] = scale.height;
-				texcoord_xform.scale[2] = scale.depth;
-				texcoord_xform.bias[0] = 0.;
-				texcoord_xform.bias[1] = 0.;
-				texcoord_xform.bias[2] = 0.;
-				texcoord_xform.clamp = false;
 			}
 
 			sampled_image_descriptor(image_resource_type external_handle, deferred_request_command reason,
@@ -227,107 +194,50 @@ namespace rsx
 				image_handle = 0;
 				upload_context = ctx;
 				format_class = ftype;
+				scale_x = scale.width;
+				scale_y = scale.height;
+				scale_z = scale.depth;
 				image_type = type;
-
-				texcoord_xform.scale[0] = scale.width;
-				texcoord_xform.scale[1] = scale.height;
-				texcoord_xform.scale[2] = scale.depth;
-				texcoord_xform.bias[0] = 0.;
-				texcoord_xform.bias[1] = 0.;
-				texcoord_xform.bias[2] = 0.;
-				texcoord_xform.clamp = false;
-			}
-
-			inline bool section_fills_target(const copy_region_descriptor& cpy) const
-			{
-				return cpy.dst_x == 0 && cpy.dst_y == 0 &&
-					cpy.dst_w == external_subresource_desc.width && cpy.dst_h == external_subresource_desc.height;
-			}
-
-			inline bool section_is_transfer_only(const copy_region_descriptor& cpy) const
-			{
-				return cpy.src_w == cpy.dst_w && cpy.src_h == cpy.dst_h;
 			}
 
 			void simplify()
 			{
-				if (external_subresource_desc.op != deferred_request_command::atlas_gather)
-				{
-					// Only atlas simplification supported for now
-					return;
-				}
-
-				auto& sections = external_subresource_desc.sections_to_copy;
-				if (sections.size() > 1)
-				{
-					// GPU image copies are expensive, cull unnecessary transfers if possible
-					for (auto idx = sections.size() - 1; idx >= 1; idx--)
-					{
-						if (section_fills_target(sections[idx]))
-						{
-							const auto remaining = sections.size() - idx;
-							std::memcpy(
-								sections.data(),
-								&sections[idx],
-								remaining * sizeof(sections[0])
-							);
-							sections.resize(remaining);
-							break;
-						}
-					}
-				}
-
 				// Optimizations in the straightforward methods copy_image_static and copy_image_dynamic make them preferred over the atlas method
-				if (sections.size() == 1 && section_fills_target(sections[0]))
+				if (external_subresource_desc.op == deferred_request_command::atlas_gather &&
+					external_subresource_desc.sections_to_copy.size() == 1)
 				{
-					const auto cpy = sections[0];
-					external_subresource_desc.external_ref_addr = cpy.base_addr;
-
-					if (section_is_transfer_only(cpy))
+					// Check if the subresource fills the target, if so, change the command to copy_image_static
+					const auto &cpy = external_subresource_desc.sections_to_copy.front();
+					if (cpy.dst_x == 0 && cpy.dst_y == 0 &&
+						cpy.dst_w == external_subresource_desc.width && cpy.dst_h == external_subresource_desc.height &&
+						cpy.src_w == cpy.dst_w && cpy.src_h == cpy.dst_h)
 					{
-						// Change the command to copy_image_static
 						external_subresource_desc.external_handle = cpy.src;
 						external_subresource_desc.x = cpy.src_x;
 						external_subresource_desc.y = cpy.src_y;
-						external_subresource_desc.width = cpy.src_w;
-						external_subresource_desc.height = cpy.src_h;
 						external_subresource_desc.op = deferred_request_command::copy_image_static;
 					}
-					else
-					{
-						// Blit op is a semantic variant of the copy and atlas ops.
-						// We can simply reuse the atlas handler for this for now, but this allows simplification.
-						external_subresource_desc.op = deferred_request_command::blit_image_static;
-					}
 				}
 			}
 
 			// Returns true if at least threshold% is covered in pixels
 			bool atlas_covers_target_area(int threshold) const
 			{
-				const int target_area = (external_subresource_desc.width * external_subresource_desc.height * external_subresource_desc.depth * threshold) / 100;
+				if (external_subresource_desc.op != deferred_request_command::atlas_gather)
+					return true;
+
+				const int target_area = (external_subresource_desc.width * external_subresource_desc.height * threshold) / 100;
 				int covered_area = 0;
 				areai bbox{smax, smax, 0, 0};
 
 				for (const auto& section : external_subresource_desc.sections_to_copy)
 				{
-					if (section.level != 0)
-					{
-						// Ignore other slices other than mip0
-						continue;
-					}
-
-					// Calculate virtual Y coordinate
-					const auto dst_y = (section.dst_z * external_subresource_desc.height) + section.dst_y;
-
-					// Add this slice's dimensions to the total
 					covered_area += section.dst_w * section.dst_h;
 
-					// Extend the covered bbox
 					bbox.x1 = std::min<int>(section.dst_x, bbox.x1);
 					bbox.x2 = std::max<int>(section.dst_x + section.dst_w, bbox.x2);
-					bbox.y1 = std::min<int>(dst_y, bbox.y1);
-					bbox.y2 = std::max<int>(dst_y + section.dst_h, bbox.y2);
+					bbox.y1 = std::min<int>(section.dst_y, bbox.y1);
+					bbox.y2 = std::max<int>(section.dst_y + section.dst_h, bbox.y2);
 				}
 
 				if (covered_area < target_area)
@@ -367,65 +277,26 @@ namespace rsx
 			template <typename surface_store_type, typename surface_type = typename surface_store_type::surface_type>
 			std::pair<bool, surface_type> is_expired(surface_store_type& surface_cache)
 			{
-				if (upload_context != rsx::texture_upload_context::framebuffer_storage)
+				if (upload_context != rsx::texture_upload_context::framebuffer_storage ||
+					surface_cache_tag == surface_cache.cache_tag)
 				{
-					return {};
+					return { false, nullptr };
 				}
 
 				// Expired, but may still be valid. Check if the texture is still accessible
 				auto ref_image = image_handle ? image_handle->image() : external_subresource_desc.external_handle;
-				surface_type surface = dynamic_cast<surface_type>(ref_image);
-
-				// Try and grab a cache reference in case of MSAA resolve target or compositing op
-				if (!surface)
+				if (ref_image)
 				{
-					if (!(surface = surface_cache.get_surface_at(ref_address)))
+					if (auto surface = dynamic_cast<surface_type>(ref_image);
+						surface && surface == surface_cache.get_surface_at(ref_address))
 					{
-						// Surface cache does not have our image. Two possibilities:
-						// 1. It was never a real RTT, just some op like dynamic/static-copy/composite request. image_ref is null in such cases.
-						// 2. It was real but probably deleted some time ago and we have a bogus pointer. Discard it in this case.
-						if (!ref_image)
-						{
-							// Compositing op. Just ignore expiry for now
-							return {};
-						}
-
-						// We have a real image but surface cache says it doesn't exist any more. Force a reupload.
-						// Normally the global samplers dirty flag should have been set to invalidate all references.
-						ensure(external_subresource_desc.op == deferred_request_command::nop);
-						rsx_log.warning("Renderer is holding a stale reference to a surface that no longer exists!");
-						return { true, nullptr };
-					}
-				}
-
-				ensure(surface);
-				if (!ref_image || surface->get_surface(rsx::surface_access::gpu_reference) == ref_image)
-				{
-					// Same image, so configuration did not change.
-					if (surface_cache.cache_tag <= surface_cache_tag &&
-						surface->last_use_tag <= surface_cache_tag)
-					{
-						external_subresource_desc.do_not_cache = false;
-						return {};
-					}
-
-					// Image was written to since last bind. Insert texture barrier.
-					surface_cache_tag = surface->last_use_tag;
-					is_cyclic_reference = surface_cache.address_is_bound(ref_address);
-					external_subresource_desc.do_not_cache = is_cyclic_reference;
-
-					switch (external_subresource_desc.op)
-					{
-					case deferred_request_command::copy_image_dynamic:
-					case deferred_request_command::copy_image_static:
-						external_subresource_desc.op = (is_cyclic_reference) ? deferred_request_command::copy_image_dynamic : deferred_request_command::copy_image_static;
-						[[ fallthrough ]];
-					default:
+						// Fast sync
+						surface_cache_tag = surface_cache.cache_tag;
+						is_cyclic_reference = surface_cache.address_is_bound(ref_address);
 						return { false, surface };
 					}
 				}
 
-				// Reupload
 				return { true, nullptr };
 			}
 		};
@@ -445,8 +316,8 @@ namespace rsx
 
 		atomic_t<u64> m_cache_update_tag = {0};
 
-		address_range32 read_only_range;
-		address_range32 no_access_range;
+		address_range read_only_range;
+		address_range no_access_range;
 
 		//Map of messages to only emit once
 		std::unordered_set<std::string> m_once_only_messages_set;
@@ -455,7 +326,7 @@ namespace rsx
 		bool read_only_tex_invalidate = false;
 
 		//Store of all objects in a flush_always state. A lazy readback is attempted every draw call
-		std::unordered_map<address_range32, section_storage_type*> m_flush_always_cache;
+		std::unordered_map<address_range, section_storage_type*> m_flush_always_cache;
 		u64 m_flush_always_update_timestamp = 0;
 
 		//Memory usage
@@ -468,7 +339,6 @@ namespace rsx
 		atomic_t<u32> m_unavoidable_hard_faults_this_frame = { 0 };
 		atomic_t<u32> m_texture_upload_calls_this_frame = { 0 };
 		atomic_t<u32> m_texture_upload_misses_this_frame = { 0 };
-		atomic_t<u32> m_texture_copies_ellided_this_frame = { 0 };
 		static const u32 m_predict_max_flushes_per_frame = 50; // Above this number the predictions are disabled
 
 		// Invalidation
@@ -484,11 +354,11 @@ namespace rsx
 		virtual image_view_type create_temporary_subresource_view(commandbuffer_type&, image_resource_type* src, u32 gcm_format, u16 x, u16 y, u16 w, u16 h, const texture_channel_remap_t& remap_vector) = 0;
 		virtual image_view_type create_temporary_subresource_view(commandbuffer_type&, image_storage_type* src, u32 gcm_format, u16 x, u16 y, u16 w, u16 h, const texture_channel_remap_t& remap_vector) = 0;
 		virtual void release_temporary_subresource(image_view_type rsc) = 0;
-		virtual section_storage_type* create_new_texture(commandbuffer_type&, const address_range32 &rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u32 pitch, u32 gcm_format,
+		virtual section_storage_type* create_new_texture(commandbuffer_type&, const address_range &rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch, u32 gcm_format,
 			rsx::texture_upload_context context, rsx::texture_dimension_extended type, bool swizzled, component_order swizzle_flags, rsx::flags32_t flags) = 0;
-		virtual section_storage_type* upload_image_from_cpu(commandbuffer_type&, const address_range32 &rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u32 pitch, u32 gcm_format, texture_upload_context context,
+		virtual section_storage_type* upload_image_from_cpu(commandbuffer_type&, const address_range &rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch, u32 gcm_format, texture_upload_context context,
 			const std::vector<rsx::subresource_layout>& subresource_layout, rsx::texture_dimension_extended type, bool swizzled) = 0;
-		virtual section_storage_type* create_nul_section(commandbuffer_type&, const address_range32 &rsx_range, const image_section_attributes_t& attrs, const GCM_tile_reference& tile, bool memory_load) = 0;
+		virtual section_storage_type* create_nul_section(commandbuffer_type&, const address_range &rsx_range, bool memory_load) = 0;
 		virtual void set_component_order(section_storage_type& section, u32 gcm_format, component_order expected) = 0;
 		virtual void insert_texture_barrier(commandbuffer_type&, image_storage_type* tex, bool strong_ordering = true) = 0;
 		virtual image_view_type generate_cubemap_from_images(commandbuffer_type&, u32 gcm_format, u16 size, const std::vector<copy_region_descriptor>& sources, const texture_channel_remap_t& remap_vector) = 0;
@@ -545,7 +415,7 @@ namespace rsx
 		 * Internal implementation methods and helpers
 		 */
 
-		inline bool region_intersects_cache(const address_range32 &test_range, bool is_writing)
+		inline bool region_intersects_cache(const address_range &test_range, bool is_writing)
 		{
 			AUDIT(test_range.valid());
 
@@ -579,7 +449,7 @@ namespace rsx
 		 */
 	private:
 		template <typename ...Args>
-		void flush_set(commandbuffer_type& cmd, thrashed_set& data, std::function<void()> on_data_transfer_completed, Args&&... extras)
+		void flush_set(commandbuffer_type& cmd, thrashed_set& data, Args&&... extras)
 		{
 			AUDIT(!data.flushed);
 
@@ -587,7 +457,10 @@ namespace rsx
 			{
 				// Sort with oldest data first
 				// Ensures that new data tramples older data
-				std::sort(data.sections_to_flush.begin(), data.sections_to_flush.end(), FN(x->last_write_tag < y->last_write_tag));
+				std::sort(data.sections_to_flush.begin(), data.sections_to_flush.end(), [](const auto& a, const auto& b)
+				{
+					return (a->last_write_tag < b->last_write_tag);
+				});
 			}
 
 			rsx::simple_array<section_storage_type*> sections_to_transfer;
@@ -621,11 +494,6 @@ namespace rsx
 				cleanup_after_dma_transfers(cmd);
 			}
 
-			if (on_data_transfer_completed)
-			{
-				on_data_transfer_completed();
-			}
-
 			for (auto &surface : data.sections_to_flush)
 			{
 				surface->flush();
@@ -637,10 +505,8 @@ namespace rsx
 					AUDIT(other != surface);
 					if (!other->is_flushable())
 					{
-						if (other->overlaps(*surface, section_bounds::confirmed_range))
+						if (other->overlaps(*surface, section_bounds::full_range))
 						{
-							// This should never happen. It will raise exceptions later due to a dirty region being locked
-							rsx_log.error("Excluded region overlaps with flushed surface!");
 							other->set_dirty(true);
 						}
 					}
@@ -680,12 +546,11 @@ namespace rsx
 			}
 
 			data.flushed = true;
-			update_cache_tag();
 		}
 
 
 		// Merges the protected ranges of the sections in "sections" into "result"
-		void merge_protected_ranges(address_range_vector32 &result, const std::vector<section_storage_type*> &sections)
+		void merge_protected_ranges(address_range_vector &result, const std::vector<section_storage_type*> &sections)
 		{
 			result.reserve(result.size() + sections.size());
 
@@ -704,21 +569,21 @@ namespace rsx
 		//       Otherwise the page protections will end up incorrect and things will break!
 		void unprotect_set(thrashed_set& data)
 		{
-			auto protect_ranges = [](address_range_vector32& _set, utils::protection _prot)
+			auto protect_ranges = [this](address_range_vector& _set, utils::protection _prot)
 			{
-				//u32 count = 0;
+				u32 count = 0;
 				for (auto &range : _set)
 				{
 					if (range.valid())
 					{
 						rsx::memory_protect(range, _prot);
-						//count++;
+						count++;
 					}
 				}
 				//rsx_log.error("Set protection of %d blocks to 0x%x", count, static_cast<u32>(prot));
 			};
 
-			auto discard_set = [](std::vector<section_storage_type*>& _set)
+			auto discard_set = [this](std::vector<section_storage_type*>& _set)
 			{
 				for (auto* section : _set)
 				{
@@ -734,8 +599,8 @@ namespace rsx
 			AUDIT(data.is_flushed());
 
 			// Merge ranges to unprotect
-			address_range_vector32 ranges_to_unprotect;
-			address_range_vector32 ranges_to_protect_ro;
+			address_range_vector ranges_to_unprotect;
+			address_range_vector ranges_to_protect_ro;
 			ranges_to_unprotect.reserve(data.sections_to_unprotect.size() + data.sections_to_flush.size() + data.sections_to_exclude.size());
 
 			merge_protected_ranges(ranges_to_unprotect, data.sections_to_unprotect);
@@ -751,7 +616,7 @@ namespace rsx
 				for (const auto &excluded : data.sections_to_exclude)
 				{
 					ensure(excluded->is_locked(true));
-					address_range32 exclusion_range = excluded->get_locked_range();
+					address_range exclusion_range = excluded->get_locked_range();
 
 					// We need to make sure that the exclusion range is *inside* invalidate range
 					exclusion_range.intersect(data.invalidate_range);
@@ -824,14 +689,14 @@ namespace rsx
 
 		// Return a set containing all sections that should be flushed/unprotected/reprotected
 		atomic_t<u64> m_last_section_cache_tag = 0;
-		intersecting_set get_intersecting_set(const address_range32 &fault_range)
+		intersecting_set get_intersecting_set(const address_range &fault_range)
 		{
 			AUDIT(fault_range.is_page_range());
 
 			const u64 cache_tag = ++m_last_section_cache_tag;
 
 			intersecting_set result = {};
-			address_range32 &invalidate_range = result.invalidate_range;
+			address_range &invalidate_range = result.invalidate_range;
 			invalidate_range = fault_range; // Sections fully inside this range will be invalidated, others will be deemed false positives
 
 			// Loop through cache and find pages that overlap the invalidate_range
@@ -918,12 +783,7 @@ namespace rsx
 
 		//Invalidate range base implementation
 		template <typename ...Args>
-		thrashed_set invalidate_range_impl_base(
-			commandbuffer_type& cmd,
-			const address_range32 &fault_range_in,
-			invalidation_cause cause,
-			std::function<void()> on_data_transfer_completed = {},
-			Args&&... extras)
+		thrashed_set invalidate_range_impl_base(commandbuffer_type& cmd, const address_range &fault_range_in, invalidation_cause cause, Args&&... extras)
 		{
 #ifdef TEXTURE_CACHE_DEBUG
 			// Check that the cache has the correct protections
@@ -932,30 +792,15 @@ namespace rsx
 
 			AUDIT(cause.valid());
 			AUDIT(fault_range_in.valid());
-			address_range32 fault_range = fault_range_in.to_page_range();
+			address_range fault_range = fault_range_in.to_page_range();
 
-			intersecting_set trampled_set = get_intersecting_set(fault_range);
+			intersecting_set trampled_set = std::move(get_intersecting_set(fault_range));
 
 			thrashed_set result = {};
 			result.cause = cause;
 			result.fault_range = fault_range;
 			result.invalidate_range = trampled_set.invalidate_range;
 
-			if (cause.use_strict_data_bounds())
-			{
-				// Drop all sections outside the actual target range. This is useful when we simply need to tag that we'll be updating some memory content on the CPU
-				// But we don't really care about writeback or invalidation of anything outside the update range.
-				if (trampled_set.sections.erase_if(FN(!x->overlaps(fault_range_in, section_bounds::full_range))))
-				{
-					trampled_set.has_flushables = trampled_set.sections.any(FN(x->is_flushable()));
-				}
-			}
-
-			if (trampled_set.sections.empty())
-			{
-				return {};
-			}
-
 			// Fast code-path for keeping the fault range protection when not flushing anything
 			if (cause.keep_fault_range_protection() && cause.skip_flush() && !trampled_set.sections.empty())
 			{
@@ -979,7 +824,6 @@ namespace rsx
 							// Discard - this section won't be needed any more
 							tex.discard(/* set_dirty */ true);
 							result.invalidate_samplers = true;
-							result.num_discarded++;
 						}
 						else if (g_cfg.video.strict_texture_flushing && tex.is_flushable())
 						{
@@ -990,12 +834,6 @@ namespace rsx
 							tex.set_dirty(true);
 							result.invalidate_samplers = true;
 						}
-
-						if (tex.is_dirty() && tex.get_context() == rsx::texture_upload_context::framebuffer_storage)
-						{
-							// Make sure the region is not going to get immediately reprotected
-							m_flush_always_cache.erase(tex.get_section_range());
-						}
 					}
 				}
 
@@ -1005,7 +843,7 @@ namespace rsx
 #endif
 
 				// If invalidate_range is fault_range, we can stop now
-				const address_range32 invalidate_range = trampled_set.invalidate_range;
+				const address_range invalidate_range = trampled_set.invalidate_range;
 				if (invalidate_range == fault_range)
 				{
 					result.violation_handled = true;
@@ -1016,146 +854,148 @@ namespace rsx
 #endif
 					return result;
 				}
-
 				AUDIT(fault_range.inside(invalidate_range));
 			}
 
 
 			// Decide which sections to flush, unprotect, and exclude
-			update_cache_tag();
-
-			for (auto &obj : trampled_set.sections)
+			if (!trampled_set.sections.empty())
 			{
-				auto &tex = *obj;
+				update_cache_tag();
 
-				if (!tex.is_locked())
-					continue;
-
-				const rsx::section_bounds bounds = tex.get_overlap_test_bounds();
-				const bool overlaps_fault_range = tex.overlaps(fault_range, bounds);
-
-				if (
-					// RO sections during a read invalidation can be ignored (unless there are flushables in trampled_set, since those could overwrite RO data)
-					(invalidation_keep_ro_during_read && !trampled_set.has_flushables && cause.is_read() && !tex.is_flushable()) ||
-					// Sections that are not fully contained in invalidate_range can be ignored
-					!tex.inside(trampled_set.invalidate_range, bounds) ||
-					// Unsynchronized sections (or any flushable when skipping flushes) that do not overlap the fault range directly can also be ignored
-					(invalidation_ignore_unsynchronized && tex.is_flushable() && (cause.skip_flush() || !tex.is_synchronized()) && !overlaps_fault_range) ||
-					// HACK: When being superseded by an fbo, we preserve other overlapped flushables unless the start addresses match
-					// If region is committed as fbo, all non-flushable data is removed but all flushables in the region must be preserved if possible
-					(overlaps_fault_range && tex.is_flushable() && cause.skip_fbos() && tex.get_section_base() != fault_range_in.start)
-					)
+				for (auto &obj : trampled_set.sections)
 				{
-					// False positive
-					if (tex.is_locked(true))
+					auto &tex = *obj;
+
+					if (!tex.is_locked())
+						continue;
+
+					const rsx::section_bounds bounds = tex.get_overlap_test_bounds();
+					const bool overlaps_fault_range = tex.overlaps(fault_range, bounds);
+
+					if (
+						// RO sections during a read invalidation can be ignored (unless there are flushables in trampled_set, since those could overwrite RO data)
+						(invalidation_keep_ro_during_read && !trampled_set.has_flushables && cause.is_read() && !tex.is_flushable()) ||
+						// Sections that are not fully contained in invalidate_range can be ignored
+						!tex.inside(trampled_set.invalidate_range, bounds) ||
+						// Unsynchronized sections (or any flushable when skipping flushes) that do not overlap the fault range directly can also be ignored
+						(invalidation_ignore_unsynchronized && tex.is_flushable() && (cause.skip_flush() || !tex.is_synchronized()) && !overlaps_fault_range) ||
+						// HACK: When being superseded by an fbo, we preserve other overlapped flushables unless the start addresses match
+						// If region is committed as fbo, all non-flushable data is removed but all flushables in the region must be preserved if possible
+						(overlaps_fault_range && tex.is_flushable() && cause.skip_fbos() && tex.get_section_base() != fault_range_in.start)
+					   )
 					{
-						// Do not exclude hashed pages from unprotect! They will cause protection holes
-						result.sections_to_exclude.push_back(&tex);
+						// False positive
+						if (tex.is_locked(true))
+						{
+							// Do not exclude hashed pages from unprotect! They will cause protection holes
+							result.sections_to_exclude.push_back(&tex);
+						}
+						continue;
 					}
-					result.num_excluded++;
-					continue;
-				}
 
-				if (tex.is_flushable())
-				{
-					// Write if and only if no one else has trashed section memory already
-					// TODO: Proper section management should prevent this from happening
-					// TODO: Blit engine section merge support and/or partial texture memory buffering
-					if (tex.is_dirty())
+					if (tex.is_flushable())
 					{
-						// Contents clobbered, destroy this
+						// Write if and only if no one else has trashed section memory already
+						// TODO: Proper section management should prevent this from happening
+						// TODO: Blit engine section merge support and/or partial texture memory buffering
+						if (tex.is_dirty())
+						{
+							// Contents clobbered, destroy this
+							if (!tex.is_dirty())
+							{
+								tex.set_dirty(true);
+							}
+
+							result.sections_to_unprotect.push_back(&tex);
+						}
+						else
+						{
+							result.sections_to_flush.push_back(&tex);
+						}
+
+						continue;
+					}
+					else
+					{
+						// deferred_flush = true and not synchronized
 						if (!tex.is_dirty())
 						{
+							AUDIT(tex.get_memory_read_flags() != memory_read_flags::flush_always);
 							tex.set_dirty(true);
 						}
 
-						result.sections_to_unprotect.push_back(&tex);
-					}
-					else
-					{
-						result.sections_to_flush.push_back(&tex);
+						if (tex.is_locked(true))
+						{
+							result.sections_to_unprotect.push_back(&tex);
+						}
+						else
+						{
+							// No need to waste resources on hashed section, just discard immediately
+							tex.discard(true);
+							result.invalidate_samplers = true;
+						}
+
+						continue;
 					}
 
-					continue;
+					fmt::throw_exception("Unreachable");
+				}
+
+
+				result.violation_handled = true;
+#ifdef TEXTURE_CACHE_DEBUG
+				// Check that result makes sense
+				result.check_pre_sanity();
+#endif // TEXTURE_CACHE_DEBUG
+
+				const bool has_flushables = !result.sections_to_flush.empty();
+				const bool has_unprotectables = !result.sections_to_unprotect.empty();
+
+				if (cause.deferred_flush() && has_flushables)
+				{
+					// There is something to flush, but we've been asked to defer it
+					result.num_flushable = static_cast<int>(result.sections_to_flush.size());
+					result.cache_tag = m_cache_update_tag.load();
+					return result;
+				}
+				else if (has_flushables || has_unprotectables)
+				{
+					AUDIT(!has_flushables || !cause.deferred_flush());
+
+					// We have something to flush and are allowed to flush now
+					// or there is nothing to flush but we have something to unprotect
+					if (has_flushables && !cause.skip_flush())
+					{
+						flush_set(cmd, result, std::forward<Args>(extras)...);
+					}
+
+					unprotect_set(result);
+
+					// Everything has been handled
+					result.clear_sections();
 				}
 				else
 				{
-					// deferred_flush = true and not synchronized
-					if (!tex.is_dirty())
-					{
-						AUDIT(tex.get_memory_read_flags() != memory_read_flags::flush_always);
-						tex.set_dirty(true);
-					}
+					// This is a read and all overlapping sections were RO and were excluded (except for cause == superseded_by_fbo)
+					AUDIT(cause.skip_fbos() || (cause.is_read() && !result.sections_to_exclude.empty()));
 
-					if (tex.is_locked(true))
-					{
-						result.sections_to_unprotect.push_back(&tex);
-					}
-					else
-					{
-						// No need to waste resources on hashed section, just discard immediately
-						tex.discard(true);
-						result.invalidate_samplers = true;
-						result.num_discarded++;
-					}
-
-					continue;
+					// We did not handle this violation
+					result.clear_sections();
+					result.violation_handled = false;
 				}
 
-				fmt::throw_exception("Unreachable");
-			}
+				result.invalidate_samplers |= result.violation_handled;
 
-			result.violation_handled = true;
 #ifdef TEXTURE_CACHE_DEBUG
-			// Check that result makes sense
-			result.check_pre_sanity();
+				// Post-check the result
+				result.check_post_sanity();
 #endif // TEXTURE_CACHE_DEBUG
 
-			const bool has_flushables = !result.sections_to_flush.empty();
-			const bool has_unprotectables = !result.sections_to_unprotect.empty();
-
-			if (cause.deferred_flush() && has_flushables)
-			{
-				// There is something to flush, but we've been asked to defer it
-				result.num_flushable = static_cast<int>(result.sections_to_flush.size());
-				result.cache_tag = m_cache_update_tag.load();
 				return result;
 			}
-			else if (has_flushables || has_unprotectables)
-			{
-				AUDIT(!has_flushables || !cause.deferred_flush());
 
-				// We have something to flush and are allowed to flush now
-				// or there is nothing to flush but we have something to unprotect
-				if (has_flushables && !cause.skip_flush())
-				{
-					flush_set(cmd, result, on_data_transfer_completed, std::forward<Args>(extras)...);
-				}
-
-				unprotect_set(result);
-
-				// Everything has been handled
-				result.clear_sections();
-			}
-			else
-			{
-				// This is a read and all overlapping sections were RO and were excluded (except for cause == superseded_by_fbo)
-				// Can also happen when we have hash strat in use, since we "unlock" sections by just discarding
-				AUDIT(cause.skip_fbos() || (cause.is_read() && result.num_excluded > 0) || result.num_discarded > 0);
-
-				// We did not handle this violation
-				result.clear_sections();
-				result.violation_handled = false;
-			}
-
-			result.invalidate_samplers |= result.violation_handled;
-
-#ifdef TEXTURE_CACHE_DEBUG
-			// Post-check the result
-			result.check_post_sanity();
-#endif // TEXTURE_CACHE_DEBUG
-
-			return result;
+			return {};
 		}
 
 	public:
@@ -1165,29 +1005,19 @@ namespace rsx
 
 		void clear()
 		{
-			// Release objects used for frame data
-			on_frame_end();
-
-			// Nuke the permanent storage pool
 			m_storage.clear();
 			m_predictor.clear();
 		}
 
 		virtual void on_frame_end()
 		{
-			// Must manually release each cached entry
-			for (auto& entry : m_temporary_subresource_cache)
-			{
-				release_temporary_subresource(entry.second.second);
-			}
-
 			m_temporary_subresource_cache.clear();
 			m_predictor.on_frame_end();
 			reset_frame_statistics();
 		}
 
 		template <bool check_unlocked = false>
-		std::vector<section_storage_type*> find_texture_from_range(const address_range32 &test_range, u32 required_pitch = 0, u32 context_mask = 0xFF)
+		std::vector<section_storage_type*> find_texture_from_range(const address_range &test_range, u16 required_pitch = 0, u32 context_mask = 0xFF)
 		{
 			std::vector<section_storage_type*> results;
 
@@ -1239,7 +1069,7 @@ namespace rsx
 			return nullptr;
 		}
 
-		section_storage_type* find_cached_texture(const address_range32 &range, const image_section_attributes_t& attr, bool create_if_not_found, bool confirm_dimensions, bool allow_dirty)
+		section_storage_type* find_cached_texture(const address_range &range, const image_section_attributes_t& attr, bool create_if_not_found, bool confirm_dimensions, bool allow_dirty)
 		{
 			auto &block = m_storage.block_for(range);
 
@@ -1276,7 +1106,7 @@ namespace rsx
 					}
 					else if (best_fit == nullptr && tex.can_be_reused())
 					{
-						// By grabbing a ref to a matching entry, duplicates are avoided
+						//By grabbing a ref to a matching entry, duplicates are avoided
 						best_fit = &tex;
 					}
 				}
@@ -1329,7 +1159,7 @@ namespace rsx
 			return tex;
 		}
 
-		section_storage_type* find_flushable_section(const address_range32 &memory_range)
+		section_storage_type* find_flushable_section(const address_range &memory_range)
 		{
 			auto &block = m_storage.block_for(memory_range);
 			for (auto &tex : block)
@@ -1345,7 +1175,7 @@ namespace rsx
 		}
 
 		template <typename ...FlushArgs, typename ...Args>
-		void lock_memory_region(commandbuffer_type& cmd, image_storage_type* image, const address_range32 &rsx_range, bool is_active_surface, u16 width, u16 height, u32 pitch, Args&&... extras)
+		void lock_memory_region(commandbuffer_type& cmd, image_storage_type* image, const address_range &rsx_range, bool is_active_surface, u16 width, u16 height, u16 pitch, Args&&... extras)
 		{
 			AUDIT(g_cfg.video.write_color_buffers || g_cfg.video.write_depth_buffer); // this method is only called when either WCB or WDB are enabled
 
@@ -1414,7 +1244,7 @@ namespace rsx
 		}
 
 		template <typename ...Args>
-		void commit_framebuffer_memory_region(commandbuffer_type& cmd, const address_range32 &rsx_range, Args&&... extras)
+		void commit_framebuffer_memory_region(commandbuffer_type& cmd, const address_range &rsx_range, Args&&... extras)
 		{
 			AUDIT(!g_cfg.video.write_color_buffers || !g_cfg.video.write_depth_buffer);
 
@@ -1422,11 +1252,11 @@ namespace rsx
 				return;
 
 			std::lock_guard lock(m_cache_mutex);
-			invalidate_range_impl_base(cmd, rsx_range, invalidation_cause::committed_as_fbo, {}, std::forward<Args>(extras)...);
+			invalidate_range_impl_base(cmd, rsx_range, invalidation_cause::committed_as_fbo, std::forward<Args>(extras)...);
 		}
 
 		template <typename ...Args>
-		void discard_framebuffer_memory_region(commandbuffer_type& /*cmd*/, const address_range32& rsx_range, Args&&... /*extras*/)
+		void discard_framebuffer_memory_region(commandbuffer_type& /*cmd*/, const address_range& rsx_range, Args&&... /*extras*/)
 		{
 			if (g_cfg.video.write_color_buffers || g_cfg.video.write_depth_buffer)
 			{
@@ -1439,11 +1269,11 @@ namespace rsx
 			}
 		}
 
-		void set_memory_read_flags(const address_range32 &memory_range, memory_read_flags flags)
+		void set_memory_read_flags(const address_range &memory_range, memory_read_flags flags)
 		{
 			std::lock_guard lock(m_cache_mutex);
 
-			auto* region_ptr = find_cached_texture(memory_range, { .gcm_format = RSX_GCM_FORMAT_IGNORED }, false, false, true);
+			auto* region_ptr = find_cached_texture(memory_range, { .gcm_format = RSX_GCM_FORMAT_IGNORED }, false, false, false);
 			if (region_ptr == nullptr)
 			{
 				AUDIT(m_flush_always_cache.find(memory_range) == m_flush_always_cache.end());
@@ -1451,12 +1281,6 @@ namespace rsx
 				return;
 			}
 
-			if (region_ptr->is_dirty())
-			{
-				// Previously invalidated
-				return;
-			}
-
 			auto& region = *region_ptr;
 
 			if (!region.exists() || region.is_dirty() || region.get_context() != texture_upload_context::framebuffer_storage)
@@ -1492,7 +1316,7 @@ namespace rsx
 	private:
 		inline void update_flush_always_cache(section_storage_type &section, bool add)
 		{
-			const address_range32& range = section.get_section_range();
+			const address_range& range = section.get_section_range();
 			if (add)
 			{
 				// Add to m_flush_always_cache
@@ -1510,40 +1334,30 @@ namespace rsx
 	public:
 
 		template <typename ...Args>
-		thrashed_set invalidate_address(
-			commandbuffer_type& cmd,
-			u32 address,
-			invalidation_cause cause,
-			std::function<void()> on_data_transfer_completed = {},
-			Args&&... extras)
+		thrashed_set invalidate_address(commandbuffer_type& cmd, u32 address, invalidation_cause cause, Args&&... extras)
 		{
-			// Test before trying to acquire the lock
+			//Test before trying to acquire the lock
 			const auto range = page_for(address);
 			if (!region_intersects_cache(range, !cause.is_read()))
 				return{};
 
 			std::lock_guard lock(m_cache_mutex);
-			return invalidate_range_impl_base(cmd, range, cause, on_data_transfer_completed, std::forward<Args>(extras)...);
+			return invalidate_range_impl_base(cmd, range, cause, std::forward<Args>(extras)...);
 		}
 
 		template <typename ...Args>
-		thrashed_set invalidate_range(
-			commandbuffer_type& cmd,
-			const address_range32 &range,
-			invalidation_cause cause,
-			std::function<void()> on_data_transfer_completed = {},
-			Args&&... extras)
+		thrashed_set invalidate_range(commandbuffer_type& cmd, const address_range &range, invalidation_cause cause, Args&&... extras)
 		{
-			// Test before trying to acquire the lock
+			//Test before trying to acquire the lock
 			if (!region_intersects_cache(range, !cause.is_read()))
 				return {};
 
 			std::lock_guard lock(m_cache_mutex);
-			return invalidate_range_impl_base(cmd, range, cause, on_data_transfer_completed, std::forward<Args>(extras)...);
+			return invalidate_range_impl_base(cmd, range, cause, std::forward<Args>(extras)...);
 		}
 
 		template <typename ...Args>
-		bool flush_all(commandbuffer_type& cmd, thrashed_set& data, std::function<void()> on_data_transfer_completed = {}, Args&&... extras)
+		bool flush_all(commandbuffer_type& cmd, thrashed_set& data, Args&&... extras)
 		{
 			std::lock_guard lock(m_cache_mutex);
 
@@ -1553,7 +1367,7 @@ namespace rsx
 			if (m_cache_update_tag.load() == data.cache_tag)
 			{
 				//1. Write memory to cpu side
-				flush_set(cmd, data, on_data_transfer_completed, std::forward<Args>(extras)...);
+				flush_set(cmd, data, std::forward<Args>(extras)...);
 
 				//2. Release all obsolete sections
 				unprotect_set(data);
@@ -1561,14 +1375,14 @@ namespace rsx
 			else
 			{
 				// The cache contents have changed between the two readings. This means the data held is useless
-				invalidate_range_impl_base(cmd, data.fault_range, data.cause.undefer(), on_data_transfer_completed, std::forward<Args>(extras)...);
+				invalidate_range_impl_base(cmd, data.fault_range, data.cause.undefer(), std::forward<Args>(extras)...);
 			}
 
 			return true;
 		}
 
 		template <typename ...Args>
-		bool flush_if_cache_miss_likely(commandbuffer_type& cmd, const address_range32 &range, Args&&... extras)
+		bool flush_if_cache_miss_likely(commandbuffer_type& cmd, const address_range &range, Args&&... extras)
 		{
 			u32 cur_flushes_this_frame = (m_flushes_this_frame + m_speculations_this_frame);
 
@@ -1736,18 +1550,13 @@ namespace rsx
 				{
 					sections[n] =
 					{
-						.src = desc.external_handle,
-						.xform = surface_transform::coordinate_transform,
-						.level = 0,
-						.src_x = 0,
-						.src_y = static_cast<u16>(desc.slice_h * n),
-						.dst_x = 0,
-						.dst_y = 0,
-						.dst_z = n,
-						.src_w = desc.width,
-						.src_h = desc.height,
-						.dst_w = desc.width,
-						.dst_h = desc.height
+						desc.external_handle,
+						surface_transform::coordinate_transform,
+						0,
+						0, static_cast<u16>(desc.slice_h * n),
+						0, 0, n,
+						desc.width, desc.height,
+						desc.width, desc.height
 					};
 				}
 
@@ -1767,18 +1576,13 @@ namespace rsx
 				{
 					sections[n] =
 					{
-						.src = desc.external_handle,
-						.xform = surface_transform::coordinate_transform,
-						.level = 0,
-						.src_x = 0,
-						.src_y = static_cast<u16>(desc.slice_h * n),
-						.dst_x = 0,
-						.dst_y = 0,
-						.dst_z = n,
-						.src_w = desc.width,
-						.src_h = desc.height,
-						.dst_w = desc.width,
-						.dst_h = desc.height
+						desc.external_handle,
+						surface_transform::coordinate_transform,
+						0,
+						0, static_cast<u16>(desc.slice_h * n),
+						0, 0, n,
+						desc.width, desc.height,
+						desc.width, desc.height
 					};
 				}
 
@@ -1786,7 +1590,6 @@ namespace rsx
 				break;
 			}
 			case deferred_request_command::atlas_gather:
-			case deferred_request_command::blit_image_static:
 			{
 				result = generate_atlas_from_images(cmd, desc.gcm_format, desc.width, desc.height, desc.sections_to_copy, desc.remap);
 				break;
@@ -1834,7 +1637,7 @@ namespace rsx
 			m_uncached_subresources.clear();
 		}
 
-		void notify_surface_changed(const utils::address_range32& range)
+		void notify_surface_changed(const utils::address_range& range)
 		{
 			for (auto It = m_temporary_subresource_cache.begin(); It != m_temporary_subresource_cache.end();)
 			{
@@ -1856,9 +1659,10 @@ namespace rsx
 			commandbuffer_type& cmd,
 			const image_section_attributes_t& attr,
 			const size3f& scale,
+			u32 encoded_remap,
 			const texture_channel_remap_t& remap,
 			const texture_cache_search_options& options,
-			const utils::address_range32& memory_range,
+			const utils::address_range& memory_range,
 			rsx::texture_dimension_extended extended_dimension,
 			SurfaceStoreType& m_rtts, Args&&... /*extras*/)
 		{
@@ -1867,7 +1671,7 @@ namespace rsx
 				// Most mesh textures are stored as compressed to make the most of the limited memory
 				if (auto cached_texture = find_texture_from_dimensions(attr.address, attr.gcm_format, attr.width, attr.height, attr.depth))
 				{
-					return{ cached_texture->get_view(remap), cached_texture->get_context(), cached_texture->get_format_class(), scale, cached_texture->get_image_type() };
+					return{ cached_texture->get_view(encoded_remap, remap), cached_texture->get_context(), cached_texture->get_format_class(), scale, cached_texture->get_image_type() };
 				}
 			}
 			else
@@ -1881,7 +1685,7 @@ namespace rsx
 						const bool force_convert = !render_target_format_is_compatible(texptr, attr.gcm_format);
 
 						auto result = helpers::process_framebuffer_resource_fast<sampled_image_descriptor>(
-							cmd, texptr, attr, scale, extended_dimension, remap, true, force_convert);
+							cmd, texptr, attr, scale, extended_dimension, encoded_remap, remap, true, force_convert);
 
 						if (!options.skip_texture_barriers && result.is_cyclic_reference)
 						{
@@ -1905,7 +1709,7 @@ namespace rsx
 						const bool force_convert = !render_target_format_is_compatible(last.surface, attr.gcm_format);
 
 						return helpers::process_framebuffer_resource_fast<sampled_image_descriptor>(
-							cmd, last.surface, attr, scale, extended_dimension, remap, false, force_convert);
+							cmd, last.surface, attr, scale, extended_dimension, encoded_remap, remap, false, force_convert);
 					}
 
 					return {};
@@ -1956,10 +1760,10 @@ namespace rsx
 							rsx_log.warning("A texture was found in cache for address 0x%x, but swizzle flag does not match", attr.address);
 							cached_texture->unprotect();
 							cached_texture->set_dirty(true);
-							break;
+							return {};
 						}
 
-						return{ cached_texture->get_view(remap), cached_texture->get_context(), cached_texture->get_format_class(), scale, cached_texture->get_image_type() };
+						return{ cached_texture->get_view(encoded_remap, remap), cached_texture->get_context(), cached_texture->get_format_class(), scale, cached_texture->get_image_type() };
 					}
 				}
 
@@ -1970,7 +1774,7 @@ namespace rsx
 					(
 						std::remove_if(overlapping_locals.begin(), overlapping_locals.end(), [](const auto& e)
 						{
-							return e->is_dirty() || (e->get_context() != rsx::texture_upload_context::blit_engine_dst);
+							return (e->get_context() != rsx::texture_upload_context::blit_engine_dst);
 						}),
 						overlapping_locals.end()
 					);
@@ -2030,68 +1834,23 @@ namespace rsx
 							auto new_attr = attr;
 							new_attr.gcm_format = gcm_format;
 
-							if (last->get_gcm_format() == attr.gcm_format && attr.edge_clamped)
-							{
-								// Clipped view
-								auto viewed_image = last->get_raw_texture();
-								sampled_image_descriptor result = { viewed_image->get_view(remap), last->get_context(),
-									viewed_image->format_class(), scale, extended_dimension, false, viewed_image->samples() };
-
-								helpers::calculate_sample_clip_parameters(result, position2i(0, 0), size2i(attr.width, attr.height), size2i(normalized_width, last->get_height()));
-								return result;
-							}
-
 							return { last->get_raw_texture(), deferred_request_command::copy_image_static, new_attr, {},
 									last->get_context(), classify_format(gcm_format), scale, extended_dimension, remap };
 						}
 					}
 
 					auto result = helpers::merge_cache_resources<sampled_image_descriptor>(
-						cmd, overlapping_fbos, overlapping_locals, attr, scale, extended_dimension, remap, _pool);
-
-					const bool is_simple_subresource_copy =
-						(result.external_subresource_desc.op == deferred_request_command::copy_image_static) ||
-						(result.external_subresource_desc.op == deferred_request_command::copy_image_dynamic) ||
-						(result.external_subresource_desc.op == deferred_request_command::blit_image_static);
-
-					if (attr.edge_clamped &&
-						!g_cfg.video.strict_rendering_mode &&
-						is_simple_subresource_copy &&
-						render_target_format_is_compatible(result.external_subresource_desc.src0(), attr.gcm_format))
-					{
-						if (result.external_subresource_desc.op != deferred_request_command::blit_image_static) [[ likely ]]
-						{
-							helpers::convert_image_copy_to_clip_descriptor(
-								result,
-								position2i(result.external_subresource_desc.x, result.external_subresource_desc.y),
-								size2i(result.external_subresource_desc.width, result.external_subresource_desc.height),
-								size2i(result.external_subresource_desc.external_handle->width(), result.external_subresource_desc.external_handle->height()),
-								remap, false);
-						}
-						else
-						{
-							helpers::convert_image_blit_to_clip_descriptor(
-								result,
-								remap,
-								false);
-						}
-
-						if (!!result.ref_address && m_rtts.address_is_bound(result.ref_address))
-						{
-							result.is_cyclic_reference = true;
-
-							auto texptr = ensure(m_rtts.get_surface_at(result.ref_address));
-							insert_texture_barrier(cmd, texptr);
-						}
-
-						return result;
-					}
+						overlapping_fbos, overlapping_locals, attr, scale, extended_dimension, encoded_remap, remap, _pool);
 
 					if (options.skip_texture_merge)
 					{
-						if (is_simple_subresource_copy)
+						switch (result.external_subresource_desc.op)
 						{
+						case deferred_request_command::copy_image_static:
+						case deferred_request_command::copy_image_dynamic:
 							return result;
+						default:
+							break;
 						}
 
 						return {};
@@ -2100,8 +1859,8 @@ namespace rsx
 					if (const auto section_count = result.external_subresource_desc.sections_to_copy.size();
 						section_count > 0)
 					{
-						bool result_is_valid;
-						if (_pool == 0 && !g_cfg.video.write_color_buffers && !g_cfg.video.write_depth_buffer)
+						bool result_is_valid = result.atlas_covers_target_area(section_count == 1 ? 99 : 90);
+						if (!result_is_valid && _pool == 0 && !g_cfg.video.write_color_buffers && !g_cfg.video.write_depth_buffer)
 						{
 							// HACK: Avoid WCB requirement for some games with wrongly declared sampler dimensions.
 							// TODO: Some games may render a small region (e.g 1024x256x2) and sample a huge texture (e.g 1024x1024).
@@ -2110,53 +1869,27 @@ namespace rsx
 							// enabled by default. Blit engine already handles this correctly.
 							result_is_valid = true;
 						}
-						else
-						{
-							result_is_valid = result.atlas_covers_target_area(section_count == 1 ? 99 : 90);
-						}
 
 						if (result_is_valid)
 						{
 							// Check for possible duplicates
-							usz max_overdraw_ratio = u32{ umax };
-							usz max_safe_sections = u32{ umax };
-
+							usz max_safe_sections = u32{umax};
 							switch (result.external_subresource_desc.op)
 							{
 							case deferred_request_command::atlas_gather:
-								max_overdraw_ratio = 150;
-								max_safe_sections = 8 + 2 * attr.mipmaps;
-								break;
+								max_safe_sections = 8 + attr.mipmaps; break;
 							case deferred_request_command::cubemap_gather:
-								max_overdraw_ratio = 150;
-								max_safe_sections = 6 * 2 * attr.mipmaps;
-								break;
+								max_safe_sections = 8 * attr.mipmaps; break;
 							case deferred_request_command::_3d_gather:
-								// 3D gather can have very many input sections, try to keep section count low
-								max_overdraw_ratio = 125;
-								max_safe_sections = (attr.depth * attr.mipmaps * 110) / 100;
-								break;
+								max_safe_sections = (attr.depth * attr.mipmaps * 110) / 100; break; // 10% factor of safety
 							default:
 								break;
 							}
 
 							if (overlapping_fbos.size() > max_safe_sections)
 							{
-								// Are we really over-budget?
-								u32 coverage_size = 0;
-								for (const auto& section : overlapping_fbos)
-								{
-									const auto area = section.surface->get_native_pitch() * section.surface->template get_surface_height<rsx::surface_metrics::bytes>();
-									coverage_size += area;
-								}
-
-								if (const auto coverage_ratio = (coverage_size * 100ull) / memory_range.length();
-									coverage_ratio > max_overdraw_ratio)
-								{
-									rsx_log.warning("[Performance warning] Texture gather routine encountered too many objects! Operation=%d, Mipmaps=%d, Depth=%d, Sections=%zu, Ratio=%llu%",
-										static_cast<int>(result.external_subresource_desc.op), attr.mipmaps, attr.depth, overlapping_fbos.size(), coverage_ratio);
-									m_rtts.check_for_duplicates(overlapping_fbos);
-								}
+								rsx_log.error("[Performance warning] Texture gather routine encountered too many objects!");
+								m_rtts.check_for_duplicates(overlapping_fbos, memory_range);
 							}
 
 							// Optionally disallow caching if resource is being written to as it is being read from
@@ -2199,7 +1932,7 @@ namespace rsx
 				 * 3. Surface is swapped back in. Surface cache resets layout to optimal rasterization layout
 				 * 4. During bind, the surface is converted to shader layout because it is not in GENERAL layout
 				 */
-				if (!texture_cache_helpers::force_strict_fbo_sampling(result.second->samples()))
+				if (!g_cfg.video.strict_rendering_mode)
 				{
 					insert_texture_barrier(cmd, result.second, false);
 				}
@@ -2298,7 +2031,7 @@ namespace rsx
 				if (attributes.pitch = tex.pitch(); !attributes.pitch)
 				{
 					attributes.pitch = packed_pitch;
-					scale = { 1.f, 0.f, 0.f };
+					scale = { 0.f, 0.f, 0.f };
 				}
 				else if (packed_pitch > attributes.pitch && !options.is_compressed_format)
 				{
@@ -2315,16 +2048,13 @@ namespace rsx
 			{
 			case rsx::texture_dimension_extended::texture_dimension_1d:
 				attributes.depth = 1;
-				attributes.height = 1;
 				attributes.slice_h = 1;
-				attributes.edge_clamped = (tex.wrap_s() == rsx::texture_wrap_mode::clamp_to_edge);
 				scale.height = scale.depth = 0.f;
 				subsurface_count = 1;
 				required_surface_height = 1;
 				break;
 			case rsx::texture_dimension_extended::texture_dimension_2d:
 				attributes.depth = 1;
-				attributes.edge_clamped = (tex.wrap_s() == rsx::texture_wrap_mode::clamp_to_edge && tex.wrap_t() == rsx::texture_wrap_mode::clamp_to_edge);
 				scale.depth = 0.f;
 				subsurface_count = options.is_compressed_format? 1 : tex.get_exact_mipmap_count();
 				attributes.slice_h = required_surface_height = attributes.height;
@@ -2347,25 +2077,16 @@ namespace rsx
 				fmt::throw_exception("Unsupported texture dimension %d", static_cast<int>(extended_dimension));
 			}
 
-			// Validation
-			if (!attributes.width || !attributes.height || !attributes.depth)
-			{
-				rsx_log.warning("Image at address 0x%x has invalid dimensions. Type=%d, Dims=%dx%dx%d",
-					attributes.address, static_cast<s32>(extended_dimension),
-					attributes.width, attributes.height, attributes.depth);
-				return {};
-			}
-
 			if (options.is_compressed_format)
 			{
 				// Compressed textures cannot be 1D in some APIs
 				extended_dimension = std::max(extended_dimension, rsx::texture_dimension_extended::texture_dimension_2d);
 			}
 
-			const auto lookup_range = utils::address_range32::start_length(attributes.address, attributes.pitch * required_surface_height);
+			const auto lookup_range = utils::address_range::start_length(attributes.address, attributes.pitch * required_surface_height);
 			reader_lock lock(m_cache_mutex);
 
-			auto result = fast_texture_search(cmd, attributes, scale, tex.decoded_remap(),
+			auto result = fast_texture_search(cmd, attributes, scale, tex.remap(), tex.decoded_remap(),
 				options, lookup_range, extended_dimension, m_rtts,
 				std::forward<Args>(extras)...);
 
@@ -2376,17 +2097,9 @@ namespace rsx
 					// Deferred reconstruct
 					result.external_subresource_desc.cache_range = lookup_range;
 				}
-				else if (result.texcoord_xform.clamp)
-				{
-					m_texture_copies_ellided_this_frame++;
-				}
 
-				if (!result.ref_address)
-				{
-					result.ref_address = attributes.address;
-				}
-
-				result.surface_cache_tag = m_rtts.write_tag;
+				result.ref_address = attributes.address;
+				result.surface_cache_tag = m_rtts.cache_tag;
 
 				if (subsurface_count == 1)
 				{
@@ -2439,8 +2152,8 @@ namespace rsx
 						attr2.pitch = attr2.width * attr2.bpp;
 					}
 
-					const auto range = utils::address_range32::start_length(attr2.address, attr2.pitch * attr2.height);
-					auto ret = fast_texture_search(cmd, attr2, scale, tex.decoded_remap(),
+					const auto range = utils::address_range::start_length(attr2.address, attr2.pitch * attr2.height);
+					auto ret = fast_texture_search(cmd, attr2, scale, tex.remap(), tex.decoded_remap(),
 						options, range, extended_dimension, m_rtts, std::forward<Args>(extras)...);
 
 					if (!ret.validate() ||
@@ -2460,13 +2173,6 @@ namespace rsx
 					// NOTE: Do not disable 'cyclic ref' since the texture_barrier may have already been issued!
 					result.image_handle = 0;
 					result.external_subresource_desc = { 0, deferred_request_command::mipmap_gather, attributes, {}, tex.decoded_remap() };
-					result.format_class = rsx::classify_format(attributes.gcm_format);
-
-					if (result.texcoord_xform.clamp)
-					{
-						// Revert clamp configuration
-						result.pop_texcoord_xform();
-					}
 
 					if (use_upscaling)
 					{
@@ -2477,7 +2183,7 @@ namespace rsx
 					}
 
 					const u32 cache_end = attr2.address + (attr2.pitch * attr2.height);
-					result.external_subresource_desc.cache_range = utils::address_range32::start_end(attributes.address, cache_end);
+					result.external_subresource_desc.cache_range = utils::address_range::start_end(attributes.address, cache_end);
 
 					result.external_subresource_desc.sections_to_copy = std::move(sections);
 					return result;
@@ -2498,25 +2204,22 @@ namespace rsx
 			lock.upgrade();
 
 			// Invalidate
-			const address_range32 tex_range = address_range32::start_length(attributes.address, tex_size);
-			invalidate_range_impl_base(cmd, tex_range, invalidation_cause::read, {}, std::forward<Args>(extras)...);
+			const address_range tex_range = address_range::start_length(attributes.address, tex_size);
+			invalidate_range_impl_base(cmd, tex_range, invalidation_cause::read, std::forward<Args>(extras)...);
 
 			// Upload from CPU. Note that sRGB conversion is handled in the FS
 			auto uploaded = upload_image_from_cpu(cmd, tex_range, attributes.width, attributes.height, attributes.depth, tex.get_exact_mipmap_count(), attributes.pitch, attributes.gcm_format,
 				texture_upload_context::shader_read, subresources_layout, extended_dimension, attributes.swizzled);
 
-			return{ uploaded->get_view(tex.decoded_remap()),
+			return{ uploaded->get_view(tex.remap(), tex.decoded_remap()),
 					texture_upload_context::shader_read, format_class, scale, extended_dimension };
 		}
 
-		// FIXME: This function is way too large and needs an urgent refactor.
 		template <typename surface_store_type, typename blitter_type, typename ...Args>
-		blit_op_result upload_scaled_image(const rsx::blit_src_info& src_info, const rsx::blit_dst_info& dst_info, bool interpolate, commandbuffer_type& cmd, surface_store_type& m_rtts, blitter_type& blitter, Args&&... extras)
+		blit_op_result upload_scaled_image(rsx::blit_src_info& src, rsx::blit_dst_info& dst, bool interpolate, commandbuffer_type& cmd, surface_store_type& m_rtts, blitter_type& blitter, Args&&... extras)
 		{
-			// Local working copy. We may modify the descriptors for optimization purposes
-			auto src = src_info;
-			auto dst = dst_info;
-
+			// Since we will have dst in vram, we can 'safely' ignore the swizzle flag
+			// TODO: Verify correct behavior
 			bool src_is_render_target = false;
 			bool dst_is_render_target = false;
 			const bool dst_is_argb8 = (dst.format == rsx::blit_engine::transfer_destination_format::a8r8g8b8);
@@ -2595,13 +2298,7 @@ namespace rsx
 				src_address += (src.width - src_w) * src_bpp;
 			}
 
-			const auto get_tiled_region = [&](const utils::address_range32& range)
-			{
-				auto rsxthr = rsx::get_current_renderer();
-				return rsxthr->get_tiled_memory_region(range);
-			};
-
-			auto rtt_lookup = [&m_rtts, &cmd, &scale_x, &scale_y](u32 address, u32 width, u32 height, u32 pitch, u8 bpp, rsx::flags32_t access, bool allow_clipped) -> typename surface_store_type::surface_overlap_info
+			auto rtt_lookup = [&m_rtts, &cmd, &scale_x, &scale_y, this](u32 address, u32 width, u32 height, u32 pitch, u8 bpp, rsx::flags32_t access, bool allow_clipped) -> typename surface_store_type::surface_overlap_info
 			{
 				const auto list = m_rtts.get_merged_texture_memory_region(cmd, address, width, height, pitch, bpp, access);
 				if (list.empty())
@@ -2683,33 +2380,6 @@ namespace rsx
 				return true;
 			};
 
-			auto validate_fbo_integrity = [&](const utils::address_range32& range, bool is_depth_texture)
-			{
-				const bool will_upload = is_depth_texture ? !!g_cfg.video.read_depth_buffer : !!g_cfg.video.read_color_buffers;
-				if (!will_upload)
-				{
-					// Give a pass. The data is lost anyway.
-					return true;
-				}
-
-				const bool should_be_locked = is_depth_texture ? !!g_cfg.video.write_depth_buffer : !!g_cfg.video.write_color_buffers;
-				if (!should_be_locked)
-				{
-					// Data is lost anyway.
-					return true;
-				}
-
-				// Optimal setup. We have ideal conditions presented so we can correctly decide what to do here.
-				const auto section = find_cached_texture(range, { .gcm_format = RSX_GCM_FORMAT_IGNORED }, false, false, false);
-				return section && section->is_locked();
-			};
-
-			// Check tiled mem
-			const auto dst_tile = get_tiled_region(utils::address_range32::start_length(dst_address, dst.pitch * dst.clip_height));
-			const auto src_tile = get_tiled_region(utils::address_range32::start_length(src_address, src.pitch * src.height));
-			const auto dst_is_tiled = !!dst_tile;
-			const auto src_is_tiled = !!src_tile;
-
 			// Check if src/dst are parts of render targets
 			typename surface_store_type::surface_overlap_info dst_subres;
 			bool use_null_region = false;
@@ -2719,6 +2389,7 @@ namespace rsx
 			auto src_subres = rtt_lookup(src_address, src_w, src_h, src.pitch, src_bpp, surface_access::transfer_read, false);
 			src_is_render_target = src_subres.surface != nullptr;
 
+
 			if (get_location(dst_address) == CELL_GCM_LOCATION_LOCAL)
 			{
 				// TODO: HACK
@@ -2728,30 +2399,11 @@ namespace rsx
 			}
 			else
 			{
-				// Surface exists in main memory.
+				// Surface exists in local memory.
 				use_null_region = (is_copy_op && !is_format_convert);
 
-				// Now we have a blit write into main memory. This really could be anything, so we need to be careful here.
-				// If we have a pitched write, or a suspiciously large transfer, we likely have a valid write.
-
 				// Invalidate surfaces in range. Sample tests should catch overlaps in theory.
-				m_rtts.invalidate_range(utils::address_range32::start_length(dst_address, dst.pitch * dst_h));
-			}
-
-			// FBO re-validation. It is common for GPU and CPU data to desync as we do not have a way to share memory pages directly between the two (in most setups)
-			// To avoid losing data, we need to do some gymnastics
-			if (src_is_render_target && !validate_fbo_integrity(src_subres.surface->get_memory_range(), src_subres.is_depth))
-			{
-				src_is_render_target = false;
-				src_subres.surface = nullptr;
-			}
-
-			if (dst_is_render_target && !validate_fbo_integrity(dst_subres.surface->get_memory_range(), dst_subres.is_depth))
-			{
-				// This is a lot more serious that the src case. We have to signal surface cache to reload the memory and discard what we have GPU-side.
-				// Do the transfer CPU side and we should eventually "read" the data on RCB/RDB barrier.
-				dst_subres.surface->invalidate_GPU_memory();
-				return false;
+				m_rtts.invalidate_range(utils::address_range::start_length(dst_address, dst.pitch* dst_h));
 			}
 
 			if (src_is_render_target)
@@ -2773,8 +2425,8 @@ namespace rsx
 					typeless_info.src_gcm_format = helpers::get_sized_blit_format(src_is_argb8, false, is_format_convert);
 				}
 
-				if (surf->template get_surface_width<rsx::surface_metrics::pixels>() != surf->width() ||
-					surf->template get_surface_height<rsx::surface_metrics::pixels>() != surf->height())
+				if (surf->get_surface_width(rsx::surface_metrics::pixels) != surf->width() ||
+					surf->get_surface_height(rsx::surface_metrics::pixels) != surf->height())
 				{
 					// Must go through a scaling operation due to resolution scaling being present
 					ensure(g_cfg.video.resolution_scale_percent != 100);
@@ -2784,7 +2436,7 @@ namespace rsx
 			else
 			{
 				// Determine whether to perform this transfer on CPU or GPU (src data may not be graphical)
-				const bool is_trivial_copy = is_copy_op && !is_format_convert && !dst.swizzled && !dst_is_tiled && !src_is_tiled;
+				const bool is_trivial_copy = is_copy_op && !is_format_convert && !dst.swizzled;
 				const bool is_block_transfer = (dst_w == src_w && dst_h == src_h && (src.pitch == dst.pitch || src_h == 1));
 				const bool is_mirror_op = (dst.scale_x < 0.f || dst.scale_y < 0.f);
 
@@ -2814,7 +2466,7 @@ namespace rsx
 						skip_if_collision_exists = true;
 					}
 
-					if (!g_cfg.video.use_gpu_texture_scaling && !dst_is_tiled && !src_is_tiled)
+					if (!g_cfg.video.use_gpu_texture_scaling)
 					{
 						if (dst.swizzled)
 						{
@@ -2850,28 +2502,27 @@ namespace rsx
 			}
 
 			section_storage_type* cached_dest = nullptr;
-			section_storage_type* cached_src = nullptr;
 			bool dst_is_depth_surface = false;
 			u16 max_dst_width = dst.width;
 			u16 max_dst_height = dst.height;
 			areai src_area = { 0, 0, src_w, src_h };
 			areai dst_area = { 0, 0, dst_w, dst_h };
 
-			size2i dst_dimensions = { static_cast<s32>(dst.pitch / dst_bpp), dst.height };
+			size2i dst_dimensions = { dst.pitch / dst_bpp, dst.height };
 			position2i dst_offset = { dst.offset_x, dst.offset_y };
 			u32 dst_base_address = dst.rsx_address;
 
 			const auto src_payload_length = (src.pitch * (src_h - 1) + (src_w * src_bpp));
 			const auto dst_payload_length = (dst.pitch * (dst_h - 1) + (dst_w * dst_bpp));
-			const auto dst_range = address_range32::start_length(dst_address, dst_payload_length);
+			const auto dst_range = address_range::start_length(dst_address, dst_payload_length);
 
 			if (!use_null_region && !dst_is_render_target)
 			{
 				size2u src_dimensions = { 0, 0 };
 				if (src_is_render_target)
 				{
-					src_dimensions.width = src_subres.surface->template get_surface_width<rsx::surface_metrics::samples>();
-					src_dimensions.height = src_subres.surface->template get_surface_height<rsx::surface_metrics::samples>();
+					src_dimensions.width = src_subres.surface->get_surface_width(rsx::surface_metrics::samples);
+					src_dimensions.height = src_subres.surface->get_surface_height(rsx::surface_metrics::samples);
 				}
 
 				const auto props = texture_cache_helpers::get_optimal_blit_target_properties(
@@ -2970,6 +2621,7 @@ namespace rsx
 					case CELL_GCM_TEXTURE_A8R8G8B8:
 						if (!dst_is_argb8) continue;
 						break;
+					case CELL_GCM_TEXTURE_X16:
 					case CELL_GCM_TEXTURE_R5G6B5:
 						if (dst_is_argb8) continue;
 						break;
@@ -2980,9 +2632,9 @@ namespace rsx
 					if (const auto this_address = surface->get_section_base();
 						const u32 address_offset = dst_address - this_address)
 					{
-						const u32 offset_y = address_offset / dst.pitch;
-						const u32 offset_x = address_offset % dst.pitch;
-						const u32 offset_x_in_block = offset_x / dst_bpp;
+						const u16 offset_y = address_offset / dst.pitch;
+						const u16 offset_x = address_offset % dst.pitch;
+						const u16 offset_x_in_block = offset_x / dst_bpp;
 
 						dst_area.x1 += offset_x_in_block;
 						dst_area.x2 += offset_x_in_block;
@@ -3025,8 +2677,8 @@ namespace rsx
 				typeless_info.dst_context = texture_upload_context::framebuffer_storage;
 				dst_is_depth_surface = typeless_info.dst_is_typeless ? false : dst_subres.is_depth;
 
-				max_dst_width = static_cast<u16>(dst_subres.surface->template get_surface_width<rsx::surface_metrics::samples>() * typeless_info.dst_scaling_hint);
-				max_dst_height = dst_subres.surface->template get_surface_height<rsx::surface_metrics::samples>();
+				max_dst_width = static_cast<u16>(dst_subres.surface->get_surface_width(rsx::surface_metrics::samples) * typeless_info.dst_scaling_hint);
+				max_dst_height = dst_subres.surface->get_surface_height(rsx::surface_metrics::samples);
 			}
 
 			// Create source texture if does not exist
@@ -3035,8 +2687,10 @@ namespace rsx
 			{
 				// NOTE: Src address already takes into account the flipped nature of the overlap!
 				const u32 lookup_mask = rsx::texture_upload_context::blit_engine_src | rsx::texture_upload_context::blit_engine_dst | rsx::texture_upload_context::shader_read;
-				auto overlapping_surfaces = find_texture_from_range<false>(address_range32::start_length(src_address, src_payload_length), src.pitch, lookup_mask);
+				auto overlapping_surfaces = find_texture_from_range<false>(address_range::start_length(src_address, src_payload_length), src.pitch, lookup_mask);
+
 				auto old_src_area = src_area;
+				section_storage_type *cached_src = nullptr;
 
 				for (const auto &surface : overlapping_surfaces)
 				{
@@ -3050,28 +2704,20 @@ namespace rsx
 					// Force format matching; only accept 16-bit data for 16-bit transfers, 32-bit for 32-bit transfers
 					switch (surface->get_gcm_format())
 					{
+					case CELL_GCM_TEXTURE_A8R8G8B8:
+					case CELL_GCM_TEXTURE_D8R8G8B8:
+					case CELL_GCM_TEXTURE_DEPTH24_D8:
+					case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT:
 					case CELL_GCM_TEXTURE_X32_FLOAT:
 					case CELL_GCM_TEXTURE_Y16_X16:
 					case CELL_GCM_TEXTURE_Y16_X16_FLOAT:
 					{
-						// Should be copy compatible but not scaling compatible
-						if (src_is_argb8 && (is_copy_op || dst_is_render_target)) break;
-						continue;
-					}
-					case CELL_GCM_TEXTURE_DEPTH24_D8:
-					case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT:
-					{
-						// Should be copy compatible but not scaling compatible
-						if (src_is_argb8 && (is_copy_op || !dst_is_render_target)) break;
-						continue;
-					}
-					case CELL_GCM_TEXTURE_A8R8G8B8:
-					case CELL_GCM_TEXTURE_D8R8G8B8:
-					{
-						// Perfect match
-						if (src_is_argb8) break;
-						continue;
+						if (!src_is_argb8) continue;
+						break;
 					}
+					case CELL_GCM_TEXTURE_R5G6B5:
+					case CELL_GCM_TEXTURE_DEPTH16:
+					case CELL_GCM_TEXTURE_DEPTH16_FLOAT:
 					case CELL_GCM_TEXTURE_X16:
 					case CELL_GCM_TEXTURE_G8B8:
 					case CELL_GCM_TEXTURE_A1R5G5B5:
@@ -3079,22 +2725,8 @@ namespace rsx
 					case CELL_GCM_TEXTURE_D1R5G5B5:
 					case CELL_GCM_TEXTURE_R5G5B5A1:
 					{
-						// Copy compatible
-						if (!src_is_argb8 && (is_copy_op || dst_is_render_target)) break;
-						continue;
-					}
-					case CELL_GCM_TEXTURE_DEPTH16:
-					case CELL_GCM_TEXTURE_DEPTH16_FLOAT:
-					{
-						// Copy compatible
-						if (!src_is_argb8 && (is_copy_op || !dst_is_render_target)) break;
-						continue;
-					}
-					case CELL_GCM_TEXTURE_R5G6B5:
-					{
-						// Perfect match
-						if (!src_is_argb8) break;
-						continue;
+						if (src_is_argb8) continue;
+						break;
 					}
 					default:
 					{
@@ -3110,9 +2742,9 @@ namespace rsx
 
 					if (const u32 address_offset = src_address - this_address)
 					{
-						const u32 offset_y = address_offset / src.pitch;
-						const u32 offset_x = address_offset % src.pitch;
-						const u32 offset_x_in_block = offset_x / src_bpp;
+						const u16 offset_y = address_offset / src.pitch;
+						const u16 offset_x = address_offset % src.pitch;
+						const u16 offset_x_in_block = offset_x / src_bpp;
 
 						src_area.x1 += offset_x_in_block;
 						src_area.x2 += offset_x_in_block;
@@ -3168,23 +2800,22 @@ namespace rsx
 					subresource_layout.push_back(subres);
 
 					const u32 gcm_format = helpers::get_sized_blit_format(src_is_argb8, dst_is_depth_surface, is_format_convert);
-					const auto rsx_range = address_range32::start_length(image_base, src.pitch * image_height);
+					const auto rsx_range = address_range::start_length(image_base, src.pitch * image_height);
 
 					lock.upgrade();
 
-					invalidate_range_impl_base(cmd, rsx_range, invalidation_cause::read, {}, std::forward<Args>(extras)...);
+					invalidate_range_impl_base(cmd, rsx_range, invalidation_cause::read, std::forward<Args>(extras)...);
 
 					cached_src = upload_image_from_cpu(cmd, rsx_range, image_width, image_height, 1, 1, src.pitch, gcm_format, texture_upload_context::blit_engine_src,
 						subresource_layout, rsx::texture_dimension_extended::texture_dimension_2d, dst.swizzled);
 
 					typeless_info.src_gcm_format = gcm_format;
 				}
-				else
+				else if (cached_src->is_depth_texture() != dst_is_depth_surface)
 				{
 					typeless_info.src_gcm_format = cached_src->get_gcm_format();
 				}
 
-				cached_src->add_ref();
 				vram_texture = cached_src->get_raw_texture();
 				typeless_info.src_context = cached_src->get_context();
 			}
@@ -3243,13 +2874,12 @@ namespace rsx
 				dst_dimensions.height = align2(usable_section_length, dst.pitch) / dst.pitch;
 
 				const u32 full_section_length = ((dst_dimensions.height - 1) * dst.pitch) + (dst_dimensions.width * dst_bpp);
-				const auto rsx_range = address_range32::start_length(dst_base_address, full_section_length);
+				const auto rsx_range = address_range::start_length(dst_base_address, full_section_length);
 
 				lock.upgrade();
 
 				// NOTE: Write flag set to remove all other overlapping regions (e.g shader_read or blit_src)
-				// NOTE: This step can potentially invalidate the newly created src image as well.
-				invalidate_range_impl_base(cmd, rsx_range, invalidation_cause::cause_is_write | invalidation_cause::cause_uses_strict_data_bounds, {}, std::forward<Args>(extras)...);
+				invalidate_range_impl_base(cmd, rsx_range, invalidation_cause::write, std::forward<Args>(extras)...);
 
 				if (use_null_region) [[likely]]
 				{
@@ -3263,14 +2893,7 @@ namespace rsx
 						force_dma_load = true;
 					}
 
-					const image_section_attributes_t attrs =
-					{
-						.pitch = dst.pitch,
-						.width = static_cast<u16>(dst_dimensions.width),
-						.height = static_cast<u16>(dst_dimensions.height),
-						.bpp = dst_bpp
-					};
-					cached_dest = create_nul_section(cmd, rsx_range, attrs, dst_tile, force_dma_load);
+					cached_dest = create_nul_section(cmd, rsx_range, force_dma_load);
 				}
 				else
 				{
@@ -3289,7 +2912,7 @@ namespace rsx
 					{
 						cached_dest = create_new_texture(cmd, rsx_range, dst_dimensions.width, dst_dimensions.height, 1, 1, dst.pitch,
 							preferred_dst_format, rsx::texture_upload_context::blit_engine_dst, rsx::texture_dimension_extended::texture_dimension_2d,
-							dst.swizzled, channel_order, 0);
+							false, channel_order, 0);
 					}
 					else
 					{
@@ -3298,7 +2921,7 @@ namespace rsx
 						const auto prot_range = dst_range.to_page_range();
 						utils::memory_protect(vm::base(prot_range.start), prot_range.length(), utils::protection::no);
 
-						const auto pitch_in_block = dst.pitch / dst_bpp;
+						const u16 pitch_in_block = dst.pitch / dst_bpp;
 						std::vector<rsx::subresource_layout> subresource_layout;
 						rsx::subresource_layout subres = {};
 						subres.width_in_block = subres.width_in_texel = dst_dimensions.width;
@@ -3310,7 +2933,7 @@ namespace rsx
 
 						cached_dest = upload_image_from_cpu(cmd, rsx_range, dst_dimensions.width, dst_dimensions.height, 1, 1, dst.pitch,
 							preferred_dst_format, rsx::texture_upload_context::blit_engine_dst, subresource_layout,
-							rsx::texture_dimension_extended::texture_dimension_2d, dst.swizzled);
+							rsx::texture_dimension_extended::texture_dimension_2d, false);
 
 						set_component_order(*cached_dest, preferred_dst_format, channel_order);
 					}
@@ -3342,7 +2965,7 @@ namespace rsx
 				update_cache_tag();
 
 				// Set swizzle flag
-				cached_dest->set_swizzled(raster_type == rsx::surface_raster_type::swizzle || dst.swizzled);
+				cached_dest->set_swizzled(raster_type == rsx::surface_raster_type::swizzle);
 			}
 			else
 			{
@@ -3371,13 +2994,7 @@ namespace rsx
 						else
 						{
 							// Unlikely situation, but the only one which would allow re-upload from CPU to overlap this section.
-							if (found->is_flushable())
-							{
-								// Technically this is possible in games that may change surface pitch at random (insomniac engine)
-								// FIXME: A proper fix includes pitch conversion and surface inheritance chains between surface targets and blit targets (unified cache) which is a very long-term thing.
-								const auto range = found->get_section_range();
-								rsx_log.error("[Pitch Mismatch] GPU-resident data at 0x%x->0x%x is discarded due to surface cache data clobbering it.", range.start, range.end);
-							}
+							ensure(!found->is_flushable());
 							found->discard(true);
 						}
 					}
@@ -3386,8 +3003,8 @@ namespace rsx
 
 			if (src_is_render_target)
 			{
-				const auto surface_width = src_subres.surface->template get_surface_width<rsx::surface_metrics::pixels>();
-				const auto surface_height = src_subres.surface->template get_surface_height<rsx::surface_metrics::pixels>();
+				const auto surface_width = src_subres.surface->get_surface_width(rsx::surface_metrics::pixels);
+				const auto surface_height = src_subres.surface->get_surface_height(rsx::surface_metrics::pixels);
 				std::tie(src_area.x1, src_area.y1) = rsx::apply_resolution_scale<false>(src_area.x1, src_area.y1, surface_width, surface_height);
 				std::tie(src_area.x2, src_area.y2) = rsx::apply_resolution_scale<true>(src_area.x2, src_area.y2, surface_width, surface_height);
 
@@ -3397,8 +3014,8 @@ namespace rsx
 
 			if (dst_is_render_target)
 			{
-				const auto surface_width = dst_subres.surface->template get_surface_width<rsx::surface_metrics::pixels>();
-				const auto surface_height = dst_subres.surface->template get_surface_height<rsx::surface_metrics::pixels>();
+				const auto surface_width = dst_subres.surface->get_surface_width(rsx::surface_metrics::pixels);
+				const auto surface_height = dst_subres.surface->get_surface_height(rsx::surface_metrics::pixels);
 				std::tie(dst_area.x1, dst_area.y1) = rsx::apply_resolution_scale<false>(dst_area.x1, dst_area.y1, surface_width, surface_height);
 				std::tie(dst_area.x2, dst_area.y2) = rsx::apply_resolution_scale<true>(dst_area.x2, dst_area.y2, surface_width, surface_height);
 
@@ -3437,16 +3054,11 @@ namespace rsx
 
 				blitter.scale_image(cmd, vram_texture, dest_texture, src_area, dst_area, interpolate, typeless_info);
 			}
-			else if (cached_dest)
+			else
 			{
 				cached_dest->dma_transfer(cmd, vram_texture, src_area, dst_range, dst.pitch);
 			}
 
-			if (cached_src)
-			{
-				cached_src->release();
-			}
-
 			blit_op_result result = true;
 
 			if (cached_dest)
@@ -3502,24 +3114,6 @@ namespace rsx
 			return m_predictor;
 		}
 
-		bool is_protected(u32 section_base_address, const address_range32& test_range, rsx::texture_upload_context context)
-		{
-			reader_lock lock(m_cache_mutex);
-
-			const auto& block = m_storage.block_for(section_base_address);
-			for (const auto& tex : block)
-			{
-				if (tex.get_section_base() == section_base_address)
-				{
-					return tex.get_context() == context &&
-						tex.is_locked() &&
-						test_range.inside(tex.get_section_range());
-				}
-			}
-
-			return false;
-		}
-
 
 		/**
 		 * The read only texture invalidate flag is set if a read only texture is trampled by framebuffer memory
@@ -3547,7 +3141,6 @@ namespace rsx
 			m_unavoidable_hard_faults_this_frame.store(0u);
 			m_texture_upload_calls_this_frame.store(0u);
 			m_texture_upload_misses_this_frame.store(0u);
-			m_texture_copies_ellided_this_frame.store(0u);
 		}
 
 		void on_flush()
@@ -3630,10 +3223,5 @@ namespace rsx
 		{
 			return (m_texture_upload_calls_this_frame)? (m_texture_upload_misses_this_frame * 100 / m_texture_upload_calls_this_frame) : 0;
 		}
-
-		u32 get_texture_copies_ellided_this_frame() const
-		{
-			return m_texture_copies_ellided_this_frame;
-		}
 	};
 }
diff --git a/rpcs3/Emu/RSX/Common/texture_cache_checker.h b/rpcs3/Emu/RSX/Common/texture_cache_checker.h
index cb283cc96a..0325dda596 100644
--- a/rpcs3/Emu/RSX/Common/texture_cache_checker.h
+++ b/rpcs3/Emu/RSX/Common/texture_cache_checker.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#ifdef TEXTURE_CACHE_DEBUG
-
 #include "../rsx_utils.h"
 
+#ifdef TEXTURE_CACHE_DEBUG
 namespace rsx {
 
 	class tex_cache_checker_t {
@@ -112,7 +111,7 @@ namespace rsx {
 		}
 
 	public:
-		void set_protection(const address_range32& range, utils::protection prot)
+		void set_protection(const address_range& range, utils::protection prot)
 		{
 			AUDIT(range.is_page_range());
 			AUDIT(prot == utils::protection::no || prot == utils::protection::ro || prot == utils::protection::rw);
@@ -123,7 +122,7 @@ namespace rsx {
 			}
 		}
 
-		void discard(const address_range32& range)
+		void discard(const address_range& range)
 		{
 			set_protection(range, utils::protection::rw);
 		}
@@ -136,7 +135,7 @@ namespace rsx {
 			}
 		}
 
-		void add(const address_range32& range, utils::protection prot)
+		void add(const address_range& range, utils::protection prot)
 		{
 			AUDIT(range.is_page_range());
 			AUDIT(prot == utils::protection::no || prot == utils::protection::ro);
@@ -147,7 +146,7 @@ namespace rsx {
 			}
 		}
 
-		void remove(const address_range32& range, utils::protection prot)
+		void remove(const address_range& range, utils::protection prot)
 		{
 			AUDIT(range.is_page_range());
 			AUDIT(prot == utils::protection::no || prot == utils::protection::ro);
@@ -160,7 +159,7 @@ namespace rsx {
 
 		// Returns the a lower bound as to how many locked sections are known to be within the given range with each protection {NA,RO}
 		// The assumption here is that the page in the given range with the largest number of refcounted sections represents the lower bound to how many there must be
-		std::pair<u8,u8> get_minimum_number_of_sections(const address_range32& range) const
+		std::pair<u8,u8> get_minimum_number_of_sections(const address_range& range) const
 		{
 			AUDIT(range.is_page_range());
 
@@ -175,7 +174,7 @@ namespace rsx {
 			return { no,ro };
 		}
 
-		void check_unprotected(const address_range32& range, bool allow_ro = false, bool must_be_empty = true) const
+		void check_unprotected(const address_range& range, bool allow_ro = false, bool must_be_empty = true) const
 		{
 			AUDIT(range.is_page_range());
 			for (const per_page_info_t* ptr = rsx_address_to_info_pointer(range.start); ptr <= rsx_address_to_info_pointer(range.end); ptr++)
diff --git a/rpcs3/Emu/RSX/Common/texture_cache_helpers.h b/rpcs3/Emu/RSX/Common/texture_cache_helpers.h
index dfe4cb5ee9..b4914c36fc 100644
--- a/rpcs3/Emu/RSX/Common/texture_cache_helpers.h
+++ b/rpcs3/Emu/RSX/Common/texture_cache_helpers.h
@@ -5,11 +5,14 @@
 
 namespace rsx
 {
+	using texture_channel_remap_t = std::pair<std::array<u8, 4>, std::array<u8, 4>>;
+
 	// Defines pixel operation to be performed on a surface before it is ready for use
 	enum surface_transform : u32
 	{
 		identity = 0,                // Nothing
-		coordinate_transform = 1     // Incoming source coordinates may generated based on the format of the secondary (dest) surface. Recalculate them before use.
+		argb_to_bgra = 1,            // Swap ARGB to BGRA (endian swap)
+		coordinate_transform = 2     // Incoming source coordinates may generated based on the format of the secondary (dest) surface. Recalculate them before use.
 	};
 
 	template<typename image_resource_type>
@@ -17,7 +20,6 @@ namespace rsx
 	{
 		image_resource_type src;
 		flags32_t xform;
-		u32 base_addr;
 		u8  level;
 		u16 src_x;
 		u16 src_y;
@@ -41,23 +43,21 @@ namespace rsx
 		atlas_gather,             // Provided list of sections generates a texture atlas
 		_3d_gather,               // Provided list of sections generates a 3D array
 		_3d_unwrap,               // One large texture provided to be partitioned into a 3D array
-		mipmap_gather,            // Provided list of sections to be reassembled as mipmap levels of the same texture
-		blit_image_static,        // Variant of the copy command that does scaling instead of copying
+		mipmap_gather             // Provided list of sections to be reassembled as mipmap levels of the same texture
 	};
 
 	struct image_section_attributes_t
 	{
 		u32 address;
 		u32 gcm_format;
-		u32 pitch;
 		u16 width;
 		u16 height;
 		u16 depth;
 		u16 mipmaps;
+		u16 pitch;
 		u16 slice_h;
 		u8  bpp;
 		bool swizzled;
-		bool edge_clamped;
 	};
 
 	struct blit_op_result
@@ -69,9 +69,9 @@ namespace rsx
 		blit_op_result(bool success) : succeeded(success)
 		{}
 
-		inline address_range32 to_address_range() const
+		inline address_range to_address_range() const
 		{
-			return address_range32::start_length(real_dst_address, real_dst_size);
+			return address_range::start_length(real_dst_address, real_dst_size);
 		}
 	};
 
@@ -94,24 +94,6 @@ namespace rsx
 
 	namespace texture_cache_helpers
 	{
-		static inline bool force_strict_fbo_sampling(u8 samples)
-		{
-			if (g_cfg.video.strict_rendering_mode)
-			{
-				// Strict mode. All access is strict.
-				return true;
-			}
-
-			if (g_cfg.video.antialiasing_level == msaa_level::none)
-			{
-				// MSAA disabled. All access is fast.
-				return false;
-			}
-
-			// Strict access if MSAA only.
-			return samples > 1 && !!g_cfg.video.force_hw_MSAA_resolve;
-		}
-
 		static inline bool is_gcm_depth_format(u32 format)
 		{
 			switch (format)
@@ -151,15 +133,19 @@ namespace rsx
 			return gcm_format;
 		}
 
-		static inline u32 get_sized_blit_format(bool is_32_bit, bool depth_format, bool /*is_format_convert*/)
+		static inline u32 get_sized_blit_format(bool is_32_bit, bool depth_format, bool format_conversion)
 		{
-			if (is_32_bit)
+			if (format_conversion)
+			{
+				return (is_32_bit) ? CELL_GCM_TEXTURE_A8R8G8B8 : CELL_GCM_TEXTURE_R5G6B5;
+			}
+			else if (is_32_bit)
 			{
 				return (!depth_format) ? CELL_GCM_TEXTURE_A8R8G8B8 : CELL_GCM_TEXTURE_DEPTH24_D8;
 			}
 			else
 			{
-				return (!depth_format) ? CELL_GCM_TEXTURE_R5G6B5 : CELL_GCM_TEXTURE_DEPTH16;
+				return (!depth_format) ? CELL_GCM_TEXTURE_X16 : CELL_GCM_TEXTURE_DEPTH16;
 			}
 		}
 
@@ -182,7 +168,7 @@ namespace rsx
 
 		static inline blit_target_properties get_optimal_blit_target_properties(
 			bool src_is_render_target,
-			address_range32 dst_range,
+			address_range dst_range,
 			u32 dst_pitch,
 			const sizeu src_dimensions,
 			const sizeu dst_dimensions)
@@ -209,7 +195,7 @@ namespace rsx
 						continue;
 					}
 
-					const auto buffer_range = address_range32::start_length(rsx::get_address(buffer.offset, CELL_GCM_LOCATION_LOCAL), pitch * (buffer.height - 1) + (buffer.width * bpp));
+					const auto buffer_range = address_range::start_length(rsx::get_address(buffer.offset, CELL_GCM_LOCATION_LOCAL), pitch * (buffer.height - 1) + (buffer.width * bpp));
 					if (dst_range.inside(buffer_range))
 					{
 						// Match found
@@ -246,9 +232,8 @@ namespace rsx
 			return { false, 0, dst_dimensions.width, dst_dimensions.height };
 		}
 
-		template<typename commandbuffer_type, typename section_storage_type, typename copy_region_type, typename surface_store_list_type>
+		template<typename section_storage_type, typename copy_region_type, typename surface_store_list_type>
 		void gather_texture_slices(
-			commandbuffer_type& cmd,
 			std::vector<copy_region_type>& out,
 			const surface_store_list_type& fbos,
 			const std::vector<section_storage_type*>& local,
@@ -283,7 +268,10 @@ namespace rsx
 					sort_list.push_back({ local[index]->last_write_tag, 1, index });
 				}
 
-				std::sort(sort_list.begin(), sort_list.end(), FN(x.tag < y.tag));
+				std::sort(sort_list.begin(), sort_list.end(), [](const auto& a, const auto& b)
+				{
+					return (a.tag < b.tag);
+				});
 			}
 
 			auto add_rtt_resource = [&](auto& section, u16 slice)
@@ -319,115 +307,104 @@ namespace rsx
 				const auto h = std::min(section_end, slice_end) - dst_y;
 				dst_y = (dst_y - slice_begin);
 
-				const auto surface_width = section.surface->template get_surface_width<rsx::surface_metrics::pixels>();
-				const auto surface_height = section.surface->template get_surface_height<rsx::surface_metrics::pixels>();
+				const auto surface_width = section.surface->get_surface_width(rsx::surface_metrics::pixels);
+				const auto surface_height = section.surface->get_surface_height(rsx::surface_metrics::pixels);
 				const auto [src_width, src_height] = rsx::apply_resolution_scale<true>(section.src_area.width, h, surface_width, surface_height);
 				const auto [dst_width, dst_height] = rsx::apply_resolution_scale<true>(section.dst_area.width, h, attr.width, attr.height);
 
 				std::tie(src_x, src_y) = rsx::apply_resolution_scale<false>(src_x, src_y, surface_width, surface_height);
 				std::tie(dst_x, dst_y) = rsx::apply_resolution_scale<false>(dst_x, dst_y, attr.width, attr.height);
 
-				section.surface->memory_barrier(cmd, rsx::surface_access::transfer_read);
-
 				out.push_back
 				({
-					.src = section.surface->get_surface(rsx::surface_access::transfer_read),
-					.xform = surface_transform::identity,
-					.base_addr = section.base_address,
-					.level = 0,
-					.src_x = static_cast<u16>(src_x),
-					.src_y = static_cast<u16>(src_y),
-					.dst_x = static_cast<u16>(dst_x),
-					.dst_y = static_cast<u16>(dst_y),
-					.dst_z = slice,
-					.src_w = src_width,
-					.src_h = src_height,
-					.dst_w = dst_width,
-					.dst_h = dst_height
-				});
+					section.surface->get_surface(rsx::surface_access::shader_read),
+					surface_transform::identity,
+					0,
+					static_cast<u16>(src_x),
+					static_cast<u16>(src_y),
+					static_cast<u16>(dst_x),
+					static_cast<u16>(dst_y),
+					slice,
+					src_width, src_height,
+					dst_width, dst_height
+					});
 			};
 
 			auto add_local_resource = [&](auto& section, u32 address, u16 slice, bool scaling = true)
 			{
-				// Intersect this resource with the original one.
-				// Note that intersection takes place in a normalized coordinate space (bpp = 1)
-				const u32 section_bpp = get_format_block_size_in_bytes(section->get_gcm_format());
-				const u32 normalized_section_width = (section->get_width() * section_bpp);
-				const u32 normalized_attr_width = (attr.width * attr.bpp);
+				// Intersect this resource with the original one
+				const auto section_bpp = get_format_block_size_in_bytes(section->get_gcm_format());
+				const auto normalized_width = (section->get_width() * section_bpp) / attr.bpp;
 
-				auto [src_offset, dst_offset, dimensions] = rsx::intersect_region(
-					section->get_section_base(), normalized_section_width, section->get_height(), /* parent region (extractee) */
-					address, normalized_attr_width, attr.slice_h, /* child region (extracted) */
+				const auto clipped = rsx::intersect_region(
+					section->get_section_base(), normalized_width, section->get_height(), section_bpp, /* parent region (extractee) */
+					address, attr.width, attr.slice_h, attr.bpp, /* child region (extracted) */
 					attr.pitch);
 
-				if (!dimensions.width || !dimensions.height)
+				// Rect intersection test
+				// TODO: Make the intersection code cleaner with proper 2D regions
+				if (std::get<0>(clipped).x >= section->get_width())
 				{
-					// Out of bounds, invalid intersection
+					// Overlap lies outside the image area!
 					return;
 				}
 
-				// The intersection takes place in a normalized coordinate space. Now we convert back to domain-specific
-				src_offset.x /= section_bpp;
-				dst_offset.x /= attr.bpp;
-				const size2u dst_size = { dimensions.width / attr.bpp, dimensions.height };
-				const size2u src_size = { dimensions.width / section_bpp, dimensions.height };
+				const u32 slice_begin = slice * attr.slice_h;
+				const u32 slice_end = slice_begin + attr.height;
 
-				const u32 dst_slice_begin = slice * attr.slice_h;      // Output slice low watermark
-				const u32 dst_slice_end = dst_slice_begin + attr.height;   // Output slice high watermark
+				const auto dst_y = std::get<1>(clipped).y;
+				const auto dst_h = std::get<2>(clipped).height;
 
-				const auto dst_y = dst_offset.y;
-				const auto dst_h = dst_size.height;
-
-				const auto write_section_end = dst_y + dst_h;
-				if (dst_y >= dst_slice_end || write_section_end <= dst_slice_begin)
+				const auto section_end = dst_y + dst_h;
+				if (dst_y >= slice_end || section_end <= slice_begin)
 				{
 					// Belongs to a different slice
 					return;
 				}
 
-				const u16 dst_w = static_cast<u16>(dst_size.width);
-				const u16 src_w = static_cast<u16>(src_size.width);
-				const u16 height = std::min(dst_slice_end, write_section_end) - dst_y;
+				const u16 dst_w = static_cast<u16>(std::get<2>(clipped).width);
+				const u16 src_w = static_cast<u16>(dst_w * attr.bpp) / section_bpp;
+				const u16 height = static_cast<u16>(dst_h);
 
 				if (scaling)
 				{
 					// Since output is upscaled, also upscale on dst
-					const auto [_dst_x, _dst_y] = rsx::apply_resolution_scale<false>(static_cast<u16>(dst_offset.x), static_cast<u16>(dst_y - dst_slice_begin), attr.width, attr.height);
+					const auto [_dst_x, _dst_y] = rsx::apply_resolution_scale<false>(static_cast<u16>(std::get<1>(clipped).x), static_cast<u16>(dst_y - slice_begin), attr.width, attr.height);
 					const auto [_dst_w, _dst_h] = rsx::apply_resolution_scale<true>(dst_w, height, attr.width, attr.height);
 
 					out.push_back
 					({
-						.src = section->get_raw_texture(),
-						.xform = surface_transform::identity,
-						.level = 0,
-						.src_x = static_cast<u16>(src_offset.x),   // src.x
-						.src_y = static_cast<u16>(src_offset.y),   // src.y
-						.dst_x = _dst_x,                           // dst.x
-						.dst_y = _dst_y,                           // dst.y
-						.dst_z = slice,
-						.src_w = src_w,
-						.src_h = height,
-						.dst_w = _dst_w,
-						.dst_h = _dst_h
-					});
+						section->get_raw_texture(),
+						surface_transform::identity,
+						0,
+						static_cast<u16>(std::get<0>(clipped).x),   // src.x
+						static_cast<u16>(std::get<0>(clipped).y),   // src.y
+						_dst_x,                                     // dst.x
+						_dst_y,                                     // dst.y
+						slice,
+						src_w,
+						height,
+						_dst_w,
+						_dst_h,
+						});
 				}
 				else
 				{
 					out.push_back
 					({
-						.src = section->get_raw_texture(),
-						.xform = surface_transform::identity,
-						.level = 0,
-						.src_x = static_cast<u16>(src_offset.x),         // src.x
-						.src_y = static_cast<u16>(src_offset.y),         // src.y
-						.dst_x = static_cast<u16>(dst_offset.x),         // dst.x
-						.dst_y = static_cast<u16>(dst_y - dst_slice_begin),  // dst.y
-						.dst_z = 0,
-						.src_w = src_w,
-						.src_h = height,
-						.dst_w = dst_w,
-						.dst_h = height
-					});
+						section->get_raw_texture(),
+						surface_transform::identity,
+						0,
+						static_cast<u16>(std::get<0>(clipped).x),   // src.x
+						static_cast<u16>(std::get<0>(clipped).y),   // src.y
+						static_cast<u16>(std::get<1>(clipped).x),   // dst.x
+						static_cast<u16>(dst_y - slice_begin),      // dst.y
+						0,
+						src_w,
+						height,
+						dst_w,
+						height,
+						});
 				}
 			};
 
@@ -483,8 +460,8 @@ namespace rsx
 			{
 				if (found_slices > 0)
 				{
-					// TODO: Gather remaining sides from the texture cache or upload from cpu (too slow?)
-					rsx_log.warning("Could not gather all required slices for cubemap/3d generation");
+					//TODO: Gather remaining sides from the texture cache or upload from cpu (too slow?)
+					rsx_log.error("Could not gather all required slices for cubemap/3d generation");
 				}
 				else
 				{
@@ -504,8 +481,8 @@ namespace rsx
 				return false;
 			}
 
-			const auto surface_width = texptr->template get_surface_width<rsx::surface_metrics::samples>();
-			const auto surface_height = texptr->template get_surface_height<rsx::surface_metrics::samples>();
+			const auto surface_width = texptr->get_surface_width(rsx::surface_metrics::samples);
+			const auto surface_height = texptr->get_surface_height(rsx::surface_metrics::samples);
 
 			switch (extended_dimension)
 			{
@@ -514,106 +491,28 @@ namespace rsx
 			case rsx::texture_dimension_extended::texture_dimension_2d:
 				return (surface_width >= attr.width && surface_height >= attr.height);
 			case rsx::texture_dimension_extended::texture_dimension_3d:
-				return (surface_width >= attr.width && surface_height >= u32{attr.slice_h} * attr.depth);
+				return (surface_width >= attr.width && surface_height >= (attr.slice_h * attr.depth));
 			case rsx::texture_dimension_extended::texture_dimension_cubemap:
-				return (surface_width == attr.height && surface_width >= attr.width && surface_height >= (u32{attr.slice_h} * 6));
+				return (surface_width == attr.height && surface_width >= attr.width && surface_height >= (attr.slice_h * 6));
 			}
 
 			return false;
 		}
 
-		template <typename sampled_image_descriptor>
-		void calculate_sample_clip_parameters(
-			sampled_image_descriptor& desc,
-			const position2i& offset,
-			const size2i& desired_dimensions,
-			const size2i& actual_dimensions)
-		{
-			// Back up the transformation before we destructively modify it.
-			desc.push_texcoord_xform();
-
-			desc.texcoord_xform.scale[0] *= f32(desired_dimensions.width) / actual_dimensions.width;
-			desc.texcoord_xform.scale[1] *= f32(desired_dimensions.height) / actual_dimensions.height;
-			desc.texcoord_xform.bias[0] += f32(offset.x) / actual_dimensions.width;
-			desc.texcoord_xform.bias[1] += f32(offset.y) / actual_dimensions.height;
-			desc.texcoord_xform.clamp_min[0] = (offset.x + 0.49999f) / actual_dimensions.width;
-			desc.texcoord_xform.clamp_min[1] = (offset.y + 0.49999f) / actual_dimensions.height;
-			desc.texcoord_xform.clamp_max[0] = (offset.x + desired_dimensions.width - 0.50001f) / actual_dimensions.width;
-			desc.texcoord_xform.clamp_max[1] = (offset.y + desired_dimensions.height - 0.50001f) / actual_dimensions.height;
-			desc.texcoord_xform.clamp = true;
-		}
-
-		template <typename sampled_image_descriptor>
-		void convert_image_copy_to_clip_descriptor(
-			sampled_image_descriptor& desc,
-			const position2i& offset,
-			const size2i& desired_dimensions,
-			const size2i& actual_dimensions,
-			const texture_channel_remap_t& decoded_remap,
-			bool cyclic_reference)
-		{
-			desc.image_handle = desc.external_subresource_desc.as_viewable()->get_view(decoded_remap);
-			desc.ref_address = desc.external_subresource_desc.external_ref_addr;
-			desc.is_cyclic_reference = cyclic_reference;
-			desc.samples = desc.external_subresource_desc.external_handle->samples();
-			desc.external_subresource_desc = {};
-
-			calculate_sample_clip_parameters(desc, offset, desired_dimensions, actual_dimensions);
-		}
-
-		template <typename sampled_image_descriptor>
-		void convert_image_blit_to_clip_descriptor(
-			sampled_image_descriptor& desc,
-			const texture_channel_remap_t& decoded_remap,
-			bool cyclic_reference)
-		{
-			// Our "desired" output is the source window, and the "actual" output is the real size
-			const auto& section = desc.external_subresource_desc.sections_to_copy[0];
-
-			// Apply AA correct factor
-			auto surface_width = section.src->width();
-			auto surface_height = section.src->height();
-			switch (section.src->samples())
-			{
-			case 1:
-				break;
-			case 2:
-				surface_width *= 2;
-				break;
-			case 4:
-				surface_width *= 2;
-				surface_height *= 2;
-				break;
-			default:
-				fmt::throw_exception("Unsupported MSAA configuration");
-			}
-
-			// First, we convert this descriptor to a copy descriptor
-			desc.external_subresource_desc.external_handle = section.src;
-			desc.external_subresource_desc.external_ref_addr = section.base_addr;
-
-			// Now apply conversion
-			convert_image_copy_to_clip_descriptor(
-				desc,
-				position2i(section.src_x, section.src_y),
-				size2i(section.src_w, section.src_h),
-				size2i(surface_width, surface_height),
-				decoded_remap,
-				cyclic_reference);
-		}
-
 		template <typename sampled_image_descriptor, typename commandbuffer_type, typename render_target_type>
 		sampled_image_descriptor process_framebuffer_resource_fast(commandbuffer_type& cmd,
 			render_target_type texptr,
 			const image_section_attributes_t& attr,
 			const size3f& scale,
 			texture_dimension_extended extended_dimension,
-			const texture_channel_remap_t& decoded_remap,
+			u32 encoded_remap, const texture_channel_remap_t& decoded_remap,
 			bool surface_is_rop_target,
 			bool force_convert)
 		{
-			const auto surface_width = texptr->template get_surface_width<rsx::surface_metrics::samples>();
-			const auto surface_height = texptr->template get_surface_height<rsx::surface_metrics::samples>();
+			texptr->read_barrier(cmd);
+
+			const auto surface_width = texptr->get_surface_width(rsx::surface_metrics::samples);
+			const auto surface_height = texptr->get_surface_height(rsx::surface_metrics::samples);
 
 			bool is_depth = texptr->is_depth_surface();
 			auto attr2 = attr;
@@ -658,69 +557,26 @@ namespace rsx
 					ensure(attr.height == 1);
 				}
 
-				// A GPU operation must be performed on the data before sampling. Implies transfer_read access.
-				bool requires_processing = force_convert;
-				// A GPU clip operation may be performed by combining texture coordinate scaling with a clamp.
-				bool requires_clip = false;
-
-				rsx::surface_access access_type = rsx::surface_access::shader_read;
-
-				if (attr.width != surface_width || attr.height != surface_height)
-				{
-					// If we can get away with clip only, do it
-					if (attr.edge_clamped)
-					{
-						requires_clip = true;
-					}
-					else
-					{
-						requires_processing = true;
-					}
-				}
-
-				if (surface_is_rop_target && texture_cache_helpers::force_strict_fbo_sampling(texptr->samples()))
-				{
-					// Framebuffer feedback avoidance. For MSAA, we do not need to make copies; just use the resolve target
-					if (texptr->samples() == 1)
-					{
-						requires_processing = true;
-					}
-					else if (!requires_processing)
-					{
-						// Select resolve target instead of MSAA image
-						access_type = rsx::surface_access::transfer_read;
-					}
-				}
-
-				if (requires_processing)
+				if ((surface_is_rop_target && g_cfg.video.strict_rendering_mode) ||
+					attr.width < surface_width ||
+					attr.height < surface_height ||
+					force_convert)
 				{
 					const auto format_class = (force_convert) ? classify_format(attr2.gcm_format) : texptr->format_class();
 					const auto command = surface_is_rop_target ? deferred_request_command::copy_image_dynamic : deferred_request_command::copy_image_static;
 
-					texptr->memory_barrier(cmd, rsx::surface_access::transfer_read);
-					return { texptr->get_surface(rsx::surface_access::transfer_read), command, attr2, {},
+					return { texptr->get_surface(rsx::surface_access::shader_read), command, attr2, {},
 							texture_upload_context::framebuffer_storage, format_class, scale,
 							extended_dimension, decoded_remap };
 				}
 
-				texptr->memory_barrier(cmd, access_type);
-				auto viewed_surface = texptr->get_surface(access_type);
-				sampled_image_descriptor result = { viewed_surface->get_view(decoded_remap), texture_upload_context::framebuffer_storage,
-						texptr->format_class(), scale, rsx::texture_dimension_extended::texture_dimension_2d, surface_is_rop_target, viewed_surface->samples() };
-
-				if (requires_clip)
-				{
-					calculate_sample_clip_parameters(result, position2i(0, 0), size2i(attr.width, attr.height), size2i(surface_width, surface_height));
-				}
-
-				return result;
+				return{ texptr->get_view(encoded_remap, decoded_remap), texture_upload_context::framebuffer_storage,
+						texptr->format_class(), scale, rsx::texture_dimension_extended::texture_dimension_2d, surface_is_rop_target };
 			}
 
-			texptr->memory_barrier(cmd, rsx::surface_access::transfer_read);
-
 			if (extended_dimension == rsx::texture_dimension_extended::texture_dimension_3d)
 			{
-				return{ texptr->get_surface(rsx::surface_access::transfer_read), deferred_request_command::_3d_unwrap,
+				return{ texptr->get_surface(rsx::surface_access::shader_read), deferred_request_command::_3d_unwrap,
 						attr2, {},
 						texture_upload_context::framebuffer_storage, texptr->format_class(), scale,
 						rsx::texture_dimension_extended::texture_dimension_3d, decoded_remap };
@@ -728,20 +584,19 @@ namespace rsx
 
 			ensure(extended_dimension == rsx::texture_dimension_extended::texture_dimension_cubemap);
 
-			return{ texptr->get_surface(rsx::surface_access::transfer_read), deferred_request_command::cubemap_unwrap,
+			return{ texptr->get_surface(rsx::surface_access::shader_read), deferred_request_command::cubemap_unwrap,
 					attr2, {},
 					texture_upload_context::framebuffer_storage, texptr->format_class(), scale,
 					rsx::texture_dimension_extended::texture_dimension_cubemap, decoded_remap };
 		}
 
-		template <typename sampled_image_descriptor, typename commandbuffer_type, typename surface_store_list_type, typename section_storage_type>
+		template <typename sampled_image_descriptor, typename surface_store_list_type, typename section_storage_type>
 		sampled_image_descriptor merge_cache_resources(
-			commandbuffer_type& cmd,
 			const surface_store_list_type& fbos, const std::vector<section_storage_type*>& local,
 			const image_section_attributes_t& attr,
 			const size3f& scale,
 			texture_dimension_extended extended_dimension,
-			const texture_channel_remap_t& decoded_remap,
+			u32 /*encoded_remap*/, const texture_channel_remap_t& decoded_remap,
 			int select_hint = -1)
 		{
 			ensure((select_hint & 0x1) == select_hint);
@@ -807,13 +662,14 @@ namespace rsx
 			{
 				attr2.width = scaled_w;
 				attr2.height = scaled_h;
+				attr2.depth = 1;
 
 				sampled_image_descriptor desc = { nullptr, deferred_request_command::cubemap_gather,
 						attr2, {},
 						upload_context, format_class, scale,
 						rsx::texture_dimension_extended::texture_dimension_cubemap, decoded_remap };
 
-				gather_texture_slices(cmd, desc.external_subresource_desc.sections_to_copy, fbos, local, attr, 6, is_depth);
+				gather_texture_slices(desc.external_subresource_desc.sections_to_copy, fbos, local, attr, 6, is_depth);
 				return desc;
 			}
 			else if (extended_dimension == rsx::texture_dimension_extended::texture_dimension_3d && attr.depth > 1)
@@ -826,7 +682,7 @@ namespace rsx
 					upload_context, format_class, scale,
 					rsx::texture_dimension_extended::texture_dimension_3d, decoded_remap };
 
-				gather_texture_slices(cmd, desc.external_subresource_desc.sections_to_copy, fbos, local, attr, attr.depth, is_depth);
+				gather_texture_slices(desc.external_subresource_desc.sections_to_copy, fbos, local, attr, attr.depth, is_depth);
 				return desc;
 			}
 
@@ -845,7 +701,7 @@ namespace rsx
 					attr2, {}, upload_context, format_class,
 					scale, rsx::texture_dimension_extended::texture_dimension_2d, decoded_remap };
 
-			gather_texture_slices(cmd, result.external_subresource_desc.sections_to_copy, fbos, local, attr, 1, is_depth);
+			gather_texture_slices(result.external_subresource_desc.sections_to_copy, fbos, local, attr, 1, is_depth);
 			result.simplify();
 			return result;
 		}
@@ -861,14 +717,12 @@ namespace rsx
 		{
 			if (level.image_handle)
 			{
-				copy_region_descriptor_type mip
-				{
-					.src = level.image_handle->image(),
-					.xform = surface_transform::coordinate_transform,
-					.level = mipmap_level,
-					.dst_w = attr.width,
-					.dst_h = attr.height
-				};
+				copy_region_descriptor_type mip{};
+				mip.src = level.image_handle->image();
+				mip.xform = surface_transform::coordinate_transform;
+				mip.level = mipmap_level;
+				mip.dst_w = attr.width;
+				mip.dst_h = attr.height;
 
 				// "Fast" framebuffer results are a perfect match for attr so we do not store transfer sizes
 				// Calculate transfer dimensions from attr
@@ -891,21 +745,18 @@ namespace rsx
 				case deferred_request_command::copy_image_dynamic:
 				case deferred_request_command::copy_image_static:
 				{
-					copy_region_descriptor_type mip
-					{
-						.src = level.external_subresource_desc.external_handle,
-						.xform = surface_transform::coordinate_transform,
-						.level = mipmap_level,
+					copy_region_descriptor_type mip{};
+					mip.src = level.external_subresource_desc.external_handle;
+					mip.xform = surface_transform::coordinate_transform;
+					mip.level = mipmap_level;
+					mip.dst_w = attr.width;
+					mip.dst_h = attr.height;
 
-						// NOTE: gather_texture_slices pre-applies resolution scaling
-						.src_x = level.external_subresource_desc.x,
-						.src_y = level.external_subresource_desc.y,
-						.src_w = level.external_subresource_desc.width,
-						.src_h = level.external_subresource_desc.height,
-
-						.dst_w = attr.width,
-						.dst_h = attr.height
-					};
+					// NOTE: gather_texture_slices pre-applies resolution scaling
+					mip.src_x = level.external_subresource_desc.x;
+					mip.src_y = level.external_subresource_desc.y;
+					mip.src_w = level.external_subresource_desc.width;
+					mip.src_h = level.external_subresource_desc.height;
 
 					sections.push_back(mip);
 					break;
diff --git a/rpcs3/Emu/RSX/Common/texture_cache_predictor.h b/rpcs3/Emu/RSX/Common/texture_cache_predictor.h
index bfa500ef1a..287a2debca 100644
--- a/rpcs3/Emu/RSX/Common/texture_cache_predictor.h
+++ b/rpcs3/Emu/RSX/Common/texture_cache_predictor.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "../rsx_cache.h"
 #include "../rsx_utils.h"
 #include "TextureUtils.h"
 
@@ -76,14 +77,14 @@ namespace rsx
 		using texture_format       = typename traits::texture_format;
 		using section_storage_type = typename traits::section_storage_type;
 
-		address_range32          cpu_range;
+		address_range          cpu_range;
 		texture_format         format;
 		texture_upload_context context;
 
 		// Constructors
 		texture_cache_predictor_key() = default;
 
-		texture_cache_predictor_key(const address_range32& _cpu_range, texture_format _format, texture_upload_context _context)
+		texture_cache_predictor_key(const address_range& _cpu_range, texture_format _format, texture_upload_context _context)
 		    : cpu_range(_cpu_range)
 		    , format(_format)
 			, context(_context)
@@ -345,6 +346,8 @@ namespace rsx
 		constexpr const_iterator begin() const noexcept { return m_entries.begin(); }
 		inline iterator end() noexcept { return m_entries.end(); }
 		inline const_iterator end() const noexcept { return m_entries.end(); }
+		inline iterator at(size_type pos) { return m_entries.at(pos); }
+		inline const_iterator at(size_type pos) const { return m_entries.at(pos); }
 		bool empty() const noexcept { return m_entries.empty(); }
 		size_type size() const noexcept { return m_entries.size(); }
 		void clear() { m_entries.clear(); }
@@ -393,14 +396,17 @@ namespace rsx
 	};
 } // namespace rsx
 
-template <typename Traits>
-struct std::hash<rsx::texture_cache_predictor_key<Traits>>
+namespace std
 {
-	usz operator()(const rsx::texture_cache_predictor_key<Traits>& k) const
+	template <typename traits>
+	struct hash<rsx::texture_cache_predictor_key<traits>>
 	{
-		usz result = std::hash<utils::address_range32>{}(k.cpu_range);
-		result ^= static_cast<usz>(k.format);
-		result ^= (static_cast<usz>(k.context) << 16);
-		return result;
-	}
-};
+		usz operator()(const rsx::texture_cache_predictor_key<traits>& k) const
+		{
+			usz result = std::hash<utils::address_range>{}(k.cpu_range);
+			result ^= static_cast<usz>(k.format);
+			result ^= (static_cast<usz>(k.context) << 16);
+			return result;
+		}
+	};
+} // namespace std
diff --git a/rpcs3/Emu/RSX/Common/texture_cache_types.cpp b/rpcs3/Emu/RSX/Common/texture_cache_types.cpp
deleted file mode 100644
index 4a90f27198..0000000000
--- a/rpcs3/Emu/RSX/Common/texture_cache_types.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "stdafx.h"
-#include "texture_cache_types.h"
-#include "Emu/system_config.h"
-
-namespace rsx
-{
-	void invalidation_cause::flag_bits_from_cause(enum_type cause)
-	{
-		constexpr const std::array s_lookup_table
-		{
-			std::make_pair<enum_type, u32>(enum_type::read, flags::cause_is_read),
-			std::make_pair<enum_type, u32>(enum_type::deferred_read, flags::cause_is_read | flags::cause_is_deferred),
-			std::make_pair<enum_type, u32>(enum_type::write, flags::cause_is_write),
-			std::make_pair<enum_type, u32>(enum_type::deferred_write, flags::cause_is_write | flags::cause_is_deferred),
-			std::make_pair<enum_type, u32>(enum_type::unmap, flags::cause_keeps_fault_range_protection | flags::cause_skips_flush),
-			std::make_pair<enum_type, u32>(enum_type::reprotect, flags::cause_keeps_fault_range_protection),
-			std::make_pair<enum_type, u32>(enum_type::superseded_by_fbo, flags::cause_keeps_fault_range_protection | flags::cause_skips_fbos | flags::cause_skips_flush),
-			std::make_pair<enum_type, u32>(enum_type::committed_as_fbo, flags::cause_skips_fbos),
-		};
-
-		m_flag_bits = 0;
-		for (const auto& entry : s_lookup_table)
-		{
-			if (entry.first == cause)
-			{
-				m_flag_bits = entry.second | flags::cause_is_valid;
-				break;
-			}
-		}
-
-		if (cause == enum_type::superseded_by_fbo &&
-			g_cfg.video.strict_texture_flushing) [[ unlikely ]]
-		{
-			m_flag_bits &= ~flags::cause_skips_flush;
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/Common/texture_cache_types.h b/rpcs3/Emu/RSX/Common/texture_cache_types.h
index 77ba88d0b7..1da06f1e32 100644
--- a/rpcs3/Emu/RSX/Common/texture_cache_types.h
+++ b/rpcs3/Emu/RSX/Common/texture_cache_types.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Emu/system_config.h"
+
 namespace rsx
 {
 	/**
@@ -32,103 +34,85 @@ namespace rsx
 		flush_once = 1
 	};
 
-	class invalidation_cause
+	struct invalidation_cause
 	{
-	public:
-		enum class enum_type
+		enum enum_type
 		{
 			invalid = 0,
 			read,
 			deferred_read,
 			write,
 			deferred_write,
-			unmap,             // fault range is being unmapped
-			reprotect,         // we are going to reprotect the fault range
+			unmap, // fault range is being unmapped
+			reprotect, // we are going to reprotect the fault range
 			superseded_by_fbo, // used by texture_cache::locked_memory_region
 			committed_as_fbo   // same as superseded_by_fbo but without locking or preserving page flags
-		};
-
-		enum flags : u32
-		{
-			cause_is_valid    = (1 << 0),
-			cause_is_read     = (1 << 1),
-			cause_is_write    = (1 << 2),
-			cause_is_deferred = (1 << 3),
-			cause_skips_fbos  = (1 << 4),
-			cause_skips_flush = (1 << 5),
-			cause_keeps_fault_range_protection = (1 << 6),
-			cause_uses_strict_data_bounds      = (1 << 7),
-		};
-
-		using enum enum_type;
+		} cause;
 
 		constexpr bool valid() const
 		{
-			return m_flag_bits & flags::cause_is_valid;
+			return cause != invalid;
 		}
 
 		constexpr bool is_read() const
 		{
 			AUDIT(valid());
-			return m_flag_bits & flags::cause_is_read;
+			return (cause == read || cause == deferred_read);
 		}
 
 		constexpr bool deferred_flush() const
 		{
 			AUDIT(valid());
-			return m_flag_bits & flags::cause_is_deferred;
+			return (cause == deferred_read || cause == deferred_write);
+		}
+
+		constexpr bool destroy_fault_range() const
+		{
+			AUDIT(valid());
+			return (cause == unmap);
 		}
 
 		constexpr bool keep_fault_range_protection() const
 		{
 			AUDIT(valid());
-			return m_flag_bits & flags::cause_keeps_fault_range_protection;
+			return (cause == unmap || cause == reprotect || cause == superseded_by_fbo);
 		}
 
 		constexpr bool skip_fbos() const
 		{
 			AUDIT(valid());
-			return m_flag_bits & flags::cause_skips_fbos;
+			return (cause == superseded_by_fbo || cause == committed_as_fbo);
 		}
 
 		constexpr bool skip_flush() const
 		{
 			AUDIT(valid());
-			return m_flag_bits & flags::cause_skips_flush;
+			return (cause == unmap) || (!g_cfg.video.strict_texture_flushing && cause == superseded_by_fbo);
 		}
 
-		constexpr bool use_strict_data_bounds() const
+		constexpr invalidation_cause undefer() const
 		{
-			AUDIT(valid());
-			return m_flag_bits & flags::cause_uses_strict_data_bounds;
+			AUDIT(deferred_flush());
+			if (cause == deferred_read)
+				return read;
+			if (cause == deferred_write)
+				return write;
+			fmt::throw_exception("Unreachable");
 		}
 
-		inline invalidation_cause undefer() const
+		constexpr invalidation_cause defer() const
 		{
-			ensure(m_flag_bits & cause_is_deferred);
-			return invalidation_cause(m_flag_bits & ~cause_is_deferred);
+			AUDIT(!deferred_flush());
+			if (cause == read)
+				return deferred_read;
+			if (cause == write)
+				return deferred_write;
+			fmt::throw_exception("Unreachable");
 		}
 
-		inline invalidation_cause defer() const
-		{
-			ensure(!(m_flag_bits & cause_is_deferred));
-			return invalidation_cause(m_flag_bits | cause_is_deferred);
-		}
-
-		inline bool operator == (const invalidation_cause& other) const
-		{
-			return m_flag_bits == other.m_flag_bits;
-		}
-
-		invalidation_cause() = default;
-		invalidation_cause(enum_type cause) { flag_bits_from_cause(cause); }
-		invalidation_cause(u32 flag_bits)
-			: m_flag_bits(flag_bits | flags::cause_is_valid) // FIXME: Actual validation
-		{}
-
-	private:
-		u32 m_flag_bits = 0;
-
-		void flag_bits_from_cause(enum_type cause);
+		constexpr invalidation_cause() : cause(invalid) {}
+		constexpr invalidation_cause(enum_type _cause) : cause(_cause) {}
+		operator enum_type&() { return cause; }
+		constexpr operator enum_type() const { return cause; }
 	};
 }
diff --git a/rpcs3/Emu/RSX/Common/texture_cache_utils.h b/rpcs3/Emu/RSX/Common/texture_cache_utils.h
index 8c5defdd0b..1ad6f9402e 100644
--- a/rpcs3/Emu/RSX/Common/texture_cache_utils.h
+++ b/rpcs3/Emu/RSX/Common/texture_cache_utils.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#include "Emu/System.h"
 #include "texture_cache_types.h"
 #include "texture_cache_predictor.h"
 #include "TextureUtils.h"
 
 #include "Emu/Memory/vm.h"
-#include "Emu/RSX/Host/MM.h"
 #include "util/vm.hpp"
 
 #include <list>
@@ -27,11 +25,12 @@ namespace rsx
 		hash
 	};
 
-	static inline void memory_protect(const address_range32& range, utils::protection prot)
+	static inline void memory_protect(const address_range& range, utils::protection prot)
 	{
 		ensure(range.is_page_range());
 
-		rsx::mm_protect(vm::base(range.start), range.length(), prot);
+		//rsx_log.error("memory_protect(0x%x, 0x%x, %x)", static_cast<u32>(range.start), static_cast<u32>(range.length()), static_cast<u32>(prot));
+		utils::memory_protect(vm::base(range.start), range.length(), prot);
 
 #ifdef TEXTURE_CACHE_DEBUG
 		tex_cache_checker.set_protection(range, prot);
@@ -232,7 +231,7 @@ namespace rsx
 
 	private:
 		u32 index = 0;
-		address_range32 range = {};
+		address_range range = {};
 		block_container_type sections = {};
 		unowned_container_type unowned; // pointers to sections from other blocks that overlap this block
 		atomic_t<u32> exists_count = 0;
@@ -269,7 +268,7 @@ namespace rsx
 
 			m_storage = storage;
 			index = _index;
-			range = address_range32::start_length(index * block_size, block_size);
+			range = address_range::start_length(index * block_size, block_size);
 
 			AUDIT(range.is_page_range() && get_start() / block_size == index);
 		}
@@ -281,6 +280,8 @@ namespace rsx
 		constexpr const_iterator begin() const noexcept { return sections.begin(); }
 		inline iterator end() noexcept { return sections.end(); }
 		inline const_iterator end() const noexcept { return sections.end(); }
+		inline iterator at(size_type pos) { return sections.data(pos); }
+		inline const_iterator at(size_type pos) const { return sections.data(pos); }
 		inline bool empty() const { return sections.empty(); }
 		inline size_type size() const { return sections.size(); }
 		inline u32 get_exists_count() const { return exists_count; }
@@ -346,12 +347,12 @@ namespace rsx
 		}
 
 		// Address range
-		inline const address_range32& get_range() const { return range; }
+		inline const address_range& get_range() const { return range; }
 		inline u32 get_start() const { return range.start; }
 		inline u32 get_end() const { return range.end; }
 		inline u32 get_index() const { return index; }
 		inline bool overlaps(const section_storage_type& section, section_bounds bounds = full_range) const { return section.overlaps(range, bounds); }
-		inline bool overlaps(const address_range32& _range) const { return range.overlaps(_range); }
+		inline bool overlaps(const address_range& _range) const { return range.overlaps(_range); }
 
 		/**
 		 * Section callbacks
@@ -473,6 +474,7 @@ namespace rsx
 		block_type blocks[num_blocks];
 		texture_cache_type *m_tex_cache;
 		std::unordered_set<block_type*> m_in_use;
+		bool m_purging = false;
 
 	public:
 		atomic_t<u32> m_unreleased_texture_objects = { 0 }; //Number of invalidated objects not yet freed from memory
@@ -511,7 +513,7 @@ namespace rsx
 			return blocks[address / block_size];
 		}
 
-		inline block_type& block_for(const address_range32 &range)
+		inline block_type& block_for(const address_range &range)
 		{
 			AUDIT(range.valid());
 			return block_for(range.start);
@@ -554,6 +556,7 @@ namespace rsx
 
 		void purge_unreleased_sections()
 		{
+			m_purging = true;
 			std::vector<section_storage_type*> textures_to_remove;
 
 			// Reclaims all graphics memory consumed by dirty textures
@@ -578,6 +581,7 @@ namespace rsx
 				tex->destroy();
 			}
 
+			m_purging = false;
 			AUDIT(m_unreleased_texture_objects == 0);
 		}
 
@@ -661,12 +665,16 @@ namespace rsx
 
 		void on_ranged_block_first_section_created(block_type& block)
 		{
+			AUDIT(!m_purging);
 			AUDIT(m_in_use.find(&block) == m_in_use.end());
 			m_in_use.insert(&block);
 		}
 
 		void on_ranged_block_last_section_destroyed(block_type& block)
 		{
+			if (m_purging)
+				return;
+
 			AUDIT(m_in_use.find(&block) != m_in_use.end());
 			m_in_use.erase(&block);
 		}
@@ -689,7 +697,7 @@ namespace rsx
 			// Constructors
 			range_iterator_tmpl() = default; // end iterator
 
-			explicit range_iterator_tmpl(parent_type &storage, const address_range32 &_range, section_bounds _bounds, bool _locked_only)
+			explicit range_iterator_tmpl(parent_type &storage, const address_range &_range, section_bounds _bounds, bool _locked_only)
 				: range(_range)
 				, bounds(_bounds)
 				, block(&storage.block_for(range.start))
@@ -704,7 +712,7 @@ namespace rsx
 
 		private:
 			// Members
-			address_range32 range;
+			address_range range;
 			section_bounds bounds;
 
 			block_type *block = nullptr;
@@ -825,16 +833,16 @@ namespace rsx
 		using range_iterator = range_iterator_tmpl<section_storage_type, typename block_type::unowned_iterator, typename block_type::iterator, block_type, ranged_storage>;
 		using range_const_iterator = range_iterator_tmpl<const section_storage_type, typename block_type::unowned_const_iterator, typename block_type::const_iterator, const block_type, const ranged_storage>;
 
-		inline range_iterator range_begin(const address_range32 &range, section_bounds bounds, bool locked_only = false) {
+		inline range_iterator range_begin(const address_range &range, section_bounds bounds, bool locked_only = false) {
 			return range_iterator(*this, range, bounds, locked_only);
 		}
 
-		inline range_const_iterator range_begin(const address_range32 &range, section_bounds bounds, bool locked_only = false) const {
+		inline range_const_iterator range_begin(const address_range &range, section_bounds bounds, bool locked_only = false) const {
 			return range_const_iterator(*this, range, bounds, locked_only);
 		}
 
 		inline range_const_iterator range_begin(u32 address, section_bounds bounds, bool locked_only = false) const {
-			return range_const_iterator(*this, address_range32::start_length(address, 1), bounds, locked_only);
+			return range_const_iterator(*this, address_range::start_length(address, 1), bounds, locked_only);
 		}
 
 		constexpr range_iterator range_end()
@@ -881,9 +889,9 @@ namespace rsx
 	class buffered_section
 	{
 	private:
-		address_range32 locked_range;
-		address_range32 cpu_range = {};
-		address_range32 confirmed_range;
+		address_range locked_range;
+		address_range cpu_range = {};
+		address_range confirmed_range;
 
 		utils::protection protection = utils::protection::rw;
 
@@ -891,7 +899,7 @@ namespace rsx
 		u64 mem_hash = 0;
 
 		bool locked = false;
-		void init_lockable_range(const address_range32& range);
+		void init_lockable_range(const address_range& range);
 		u64  fast_hash_internal() const;
 
 	public:
@@ -899,7 +907,7 @@ namespace rsx
 		buffered_section() = default;
 		~buffered_section() = default;
 
-		void reset(const address_range32& memory_range);
+		void reset(const address_range& memory_range);
 
 	protected:
 		void invalidate_range();
@@ -911,7 +919,7 @@ namespace rsx
 		bool sync() const;
 
 		void discard();
-		const address_range32& get_bounds(section_bounds bounds) const;
+		const address_range& get_bounds(section_bounds bounds) const;
 
 		bool is_locked(bool actual_page_flags = false) const;
 
@@ -923,12 +931,12 @@ namespace rsx
 			return get_bounds(bounds).overlaps(address);
 		}
 
-		inline bool overlaps(const address_range32& other, section_bounds bounds) const
+		inline bool overlaps(const address_range& other, section_bounds bounds) const
 		{
 			return get_bounds(bounds).overlaps(other);
 		}
 
-		inline bool overlaps(const address_range_vector32& other, section_bounds bounds) const
+		inline bool overlaps(const address_range_vector& other, section_bounds bounds) const
 		{
 			return get_bounds(bounds).overlaps(other);
 		}
@@ -938,12 +946,12 @@ namespace rsx
 			return get_bounds(bounds).overlaps(other.get_bounds(bounds));
 		}
 
-		inline bool inside(const address_range32& other, section_bounds bounds) const
+		inline bool inside(const address_range& other, section_bounds bounds) const
 		{
 			return get_bounds(bounds).inside(other);
 		}
 
-		inline bool inside(const address_range_vector32& other, section_bounds bounds) const
+		inline bool inside(const address_range_vector& other, section_bounds bounds) const
 		{
 			return get_bounds(bounds).inside(other);
 		}
@@ -953,12 +961,12 @@ namespace rsx
 			return get_bounds(bounds).inside(other.get_bounds(bounds));
 		}
 
-		inline s32 signed_distance(const address_range32& other, section_bounds bounds) const
+		inline s32 signed_distance(const address_range& other, section_bounds bounds) const
 		{
 			return get_bounds(bounds).signed_distance(other);
 		}
 
-		inline u32 distance(const address_range32& other, section_bounds bounds) const
+		inline u32 distance(const address_range& other, section_bounds bounds) const
 		{
 			return get_bounds(bounds).distance(other);
 		}
@@ -981,18 +989,18 @@ namespace rsx
 			return cpu_range.valid() ? cpu_range.length() : 0;
 		}
 
-		inline const address_range32& get_locked_range() const
+		inline const address_range& get_locked_range() const
 		{
 			AUDIT(locked);
 			return locked_range;
 		}
 
-		inline const address_range32& get_section_range() const
+		inline const address_range& get_section_range() const
 		{
 			return cpu_range;
 		}
 
-		const address_range32& get_confirmed_range() const
+		const address_range& get_confirmed_range() const
 		{
 			return confirmed_range.valid() ? confirmed_range : cpu_range;
 		}
@@ -1005,7 +1013,7 @@ namespace rsx
 			return { confirmed_range.start - cpu_range.start, confirmed_range.length() };
 		}
 
-		inline bool matches(const address_range32& range) const
+		inline bool matches(const address_range& range) const
 		{
 			return cpu_range.valid() && cpu_range == range;
 		}
@@ -1015,7 +1023,7 @@ namespace rsx
 			return protection;
 		}
 
-		inline address_range32 get_min_max(const address_range32& current_min_max, section_bounds bounds) const
+		inline address_range get_min_max(const address_range& current_min_max, section_bounds bounds) const
 		{
 			return get_bounds(bounds).get_min_max(current_min_max);
 		}
@@ -1034,7 +1042,7 @@ namespace rsx
 	 * Cached Texture Section
 	 */
 	template <typename derived_type, typename traits>
-	class cached_texture_section : public rsx::buffered_section, public rsx::ref_counted
+	class cached_texture_section : public rsx::buffered_section
 	{
 	public:
 		using ranged_storage_type       = ranged_storage<traits>;
@@ -1071,8 +1079,8 @@ namespace rsx
 		u16 depth;
 		u16 mipmaps;
 
-		u32 real_pitch;
-		u32 rsx_pitch;
+		u16 real_pitch;
+		u16 rsx_pitch;
 
 		u32 gcm_format = 0;
 		bool pack_unpack_swap_bytes = false;
@@ -1088,7 +1096,7 @@ namespace rsx
 		rsx::texture_upload_context context = rsx::texture_upload_context::shader_read;
 		rsx::texture_dimension_extended image_type = rsx::texture_dimension_extended::texture_dimension_2d;
 
-		address_range_vector32 flush_exclusions; // Address ranges that will be skipped during flush
+		address_range_vector flush_exclusions; // Address ranges that will be skipped during flush
 
 		predictor_type *m_predictor = nullptr;
 		usz m_predictor_key_hash = 0;
@@ -1124,7 +1132,7 @@ namespace rsx
 		/**
 		 * Reset
 		 */
-		void reset(const address_range32 &memory_range)
+		void reset(const address_range &memory_range)
 		{
 			AUDIT(memory_range.valid());
 			AUDIT(!is_locked());
@@ -1172,14 +1180,7 @@ namespace rsx
 			notify_range_valid();
 		}
 
-		void create_dma_only(u16 width, u16 height, u32 pitch)
-		{
-			this->width = width;
-			this->height = height;
-			this->rsx_pitch = pitch;
 
-			set_context(rsx::texture_upload_context::dma);
-		}
 
 		/**
 		 * Destroyed Flag
@@ -1311,11 +1312,6 @@ namespace rsx
 
 		bool can_be_reused() const
 		{
-			if (has_refs()) [[unlikely]]
-			{
-				return false;
-			}
-
 			return !exists() || (is_dirty() && !is_locked());
 		}
 
@@ -1325,26 +1321,6 @@ namespace rsx
 			return (get_protection() == utils::protection::no);
 		}
 
-		bool is_synchronized() const
-		{
-			return synchronized;
-		}
-
-		bool is_flushed() const
-		{
-			return flushed;
-		}
-
-		bool should_flush() const
-		{
-			if (context == rsx::texture_upload_context::framebuffer_storage)
-			{
-				const auto surface = derived()->get_render_target();
-				return surface->has_flushable_data();
-			}
-
-			return true;
-		}
 
 	private:
 		/**
@@ -1372,28 +1348,9 @@ namespace rsx
 
 				set_dirty(false);
 			}
-
-			if (context == rsx::texture_upload_context::framebuffer_storage && !Emu.IsStopped())
-			{
-				// Lock, unlock
-				auto surface = derived()->get_render_target();
-
-				if (prot == utils::protection::no && old_prot != utils::protection::no)
-				{
-					// Locked memory. We have to take ownership of the object in the surface cache as well
-					surface->on_lock();
-				}
-				else if (old_prot == utils::protection::no && prot != utils::protection::no)
-				{
-					// Release the surface, the cache can remove it if needed
-					ensure(prot == utils::protection::rw);
-					surface->on_unlock();
-				}
-			}
 		}
 
 	public:
-
 		inline void protect(utils::protection prot)
 		{
 			utils::protection old_prot = get_protection();
@@ -1480,11 +1437,6 @@ namespace rsx
 			}
 
 			flush_exclusions.clear();
-
-			if (context == rsx::texture_upload_context::framebuffer_storage)
-			{
-				derived()->get_render_target()->sync_tag();
-			}
 		}
 
 		void on_speculative_flush()
@@ -1537,7 +1489,7 @@ namespace rsx
 		void imp_flush_memcpy(u32 vm_dst, u8* src, u32 len) const
 		{
 			u8 *dst = get_ptr<u8>(vm_dst);
-			address_range32 copy_range = address_range32::start_length(vm_dst, len);
+			address_range copy_range = address_range::start_length(vm_dst, len);
 
 			if (flush_exclusions.empty() || !copy_range.overlaps(flush_exclusions))
 			{
@@ -1553,7 +1505,7 @@ namespace rsx
 
 			// Otherwise, we need to filter the memcpy with our flush exclusions
 			// Should be relatively rare
-			address_range_vector32 vec;
+			address_range_vector vec;
 			vec.merge(copy_range);
 			vec.exclude(flush_exclusions);
 
@@ -1646,18 +1598,12 @@ namespace rsx
 			ensure(exists());
 			AUDIT(is_locked());
 
-			auto cleanup_flush = [&]()
+			// If we are fully inside the flush exclusions regions, we just mark ourselves as flushed and return
+			if (get_confirmed_range().inside(flush_exclusions))
 			{
 				flushed = true;
 				flush_exclusions.clear();
 				on_flush();
-			};
-
-			// If we are fully inside the flush exclusions regions, we just mark ourselves as flushed and return
-			// We apply the same skip if there is nothing new in the surface data
-			if (!should_flush() || get_confirmed_range().inside(flush_exclusions))
-			{
-				cleanup_flush();
 				return;
 			}
 
@@ -1669,11 +1615,13 @@ namespace rsx
 
 			// Finish up
 			// Its highly likely that this surface will be reused, so we just leave resources in place
+			flushed = true;
 			derived()->finish_flush();
-			cleanup_flush();
+			flush_exclusions.clear();
+			on_flush();
 		}
 
-		void add_flush_exclusion(const address_range32& rng)
+		void add_flush_exclusion(const address_range& rng)
 		{
 			AUDIT(is_locked() && is_flushable());
 			const auto _rng = rng.get_intersect(get_section_range());
@@ -1751,7 +1699,7 @@ namespace rsx
 			return mipmaps;
 		}
 
-		u32 get_rsx_pitch() const
+		u16 get_rsx_pitch() const
 		{
 			return rsx_pitch;
 		}
@@ -1804,7 +1752,7 @@ namespace rsx
 		/**
 		 * Comparison
 		 */
-		inline bool matches(const address_range32 &memory_range) const
+		inline bool matches(const address_range &memory_range) const
 		{
 			return valid_range() && rsx::buffered_section::matches(memory_range);
 		}
@@ -1814,7 +1762,7 @@ namespace rsx
 			if (!valid_range())
 				return false;
 
-			if (format && gcm_format != format)
+			if ((gcm_format & format) != format)
 				return false;
 
 			if (!width && !height && !depth && !mipmaps)
@@ -1846,7 +1794,7 @@ namespace rsx
 			return matches(format, width, height, depth, mipmaps);
 		}
 
-		bool matches(const address_range32& memory_range, u32 format, u32 width, u32 height, u32 depth, u32 mipmaps) const
+		bool matches(const address_range& memory_range, u32 format, u32 width, u32 height, u32 depth, u32 mipmaps) const
 		{
 			if (!valid_range())
 				return false;
diff --git a/rpcs3/Emu/RSX/Common/tiled_dma_copy.hpp b/rpcs3/Emu/RSX/Common/tiled_dma_copy.hpp
deleted file mode 100644
index f336ec30af..0000000000
--- a/rpcs3/Emu/RSX/Common/tiled_dma_copy.hpp
+++ /dev/null
@@ -1,199 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include <cstdint>
-
-// Set this to 1 to force all decoding to be done on the CPU.
-#define DEBUG_DMA_TILING 0
-
-// This is a 1:1 port of the GPU code for my own sanity when debugging misplaced bits
-// For a high-level explanation, read https://envytools.readthedocs.io/en/latest/hw/memory/vram.html
-namespace rsx
-{
-	struct detiler_config
-	{
-		uint32_t prime;
-		uint32_t factor;
-		uint32_t num_tiles_per_row;
-		uint32_t tile_base_address;
-		uint32_t tile_size;
-		uint32_t tile_address_offset;
-		uint32_t tile_rw_offset;
-		uint32_t tile_pitch;
-		uint32_t tile_bank;
-		uint32_t image_width;
-		uint32_t image_height;
-		uint32_t image_pitch;
-		uint32_t image_bpp;
-	};
-
-#define RSX_TILE_WIDTH 256
-#define RSX_TILE_HEIGHT 64
-#define RSX_DMA_OP_ENCODE_TILE 0
-#define RSX_DMA_OP_DECODE_TILE 1
-
-	static inline void tiled_dma_copy(const uint32_t row, const uint32_t col, const detiler_config& conf, char* tiled_data, char* linear_data, int direction)
-	{
-		const uint32_t row_offset = (row * conf.tile_pitch) + conf.tile_base_address + conf.tile_address_offset;
-		const uint32_t this_address = row_offset + (col * conf.image_bpp);
-
-		// 1. Calculate row_addr
-		const uint32_t texel_offset = (this_address - conf.tile_base_address) / RSX_TILE_WIDTH;
-		// Calculate coordinate of the tile grid we're supposed to be in
-		const uint32_t tile_x = texel_offset % conf.num_tiles_per_row;
-		const uint32_t tile_y = (texel_offset / conf.num_tiles_per_row) / RSX_TILE_HEIGHT;
-		// Calculate the grid offset for the tile selected and add the base offset. It's supposed to affect the bank stuff in the next step
-		const uint32_t tile_id = tile_y * conf.num_tiles_per_row + tile_x;
-		const uint32_t tile_selector = (tile_id + (conf.tile_base_address >> 14)) & 0x3ffff;
-		// Calculate row address
-		const uint32_t row_address = (tile_selector >> 2) & 0xffff;
-
-		// 2. Calculate bank selector
-		// There's a lot of weird math here, but it's just a variant of (tile_selector % 4) to pick a value between [0..3]
-		uint32_t bank_selector = 0;
-		const uint32_t bank_distribution_lookup[16] = { 0, 1, 2, 3, 2, 3, 0, 1, 1, 2, 3, 0, 3, 0, 1, 2 };
-
-		if (conf.factor == 1)
-		{
-			bank_selector = (tile_selector & 3);
-		}
-		else if (conf.factor == 2)
-		{
-			const uint32_t idx = ((tile_selector + ((tile_y & 1) << 1)) & 3) * 4 + (tile_y & 3);
-			bank_selector = bank_distribution_lookup[idx];
-		}
-		else if (conf.factor >= 4)
-		{
-			const uint32_t idx = (tile_selector & 3) * 4 + (tile_y & 3);
-			bank_selector = bank_distribution_lookup[idx];
-		}
-		bank_selector = (bank_selector + conf.tile_bank) & 3;
-
-		// 3. Calculate column selector
-		uint32_t column_selector = 0;
-		const uint32_t line_offset_in_tile = (texel_offset / conf.num_tiles_per_row) % RSX_TILE_HEIGHT;
-		// Calculate column_selector by bit-twiddling line offset and the other calculated parameter bits:
-		// column_selector[9:7] = line_offset_in_tile[5:3]
-		// column_selector[6:4] = this_address[7:5]
-		// column_selector[3:2] = line_offset_in_tile[1:0]
-		// column_selector[1:0] = 0
-		column_selector |= ((line_offset_in_tile >> 3) & 0x7) << 7;
-		column_selector |= ((this_address >> 5) & 0x7) << 4;
-		column_selector |= ((line_offset_in_tile >> 0) & 0x3) << 2;
-
-		// 4. Calculate partition selector (0 or 1)
-		const uint32_t partition_selector = (((line_offset_in_tile >> 2) & 1) + ((this_address >> 6) & 1)) & 1;
-
-		// 5. Build tiled address
-		uint32_t tile_address = 0;
-		// tile_address[31:16] = row_adr[15:0]
-		// tile_address[15:14] = bank_sel[1:0]
-		// tile_address[13:8] = column_sel[9:4]
-		// tile_address[7:7] = partition_sel[0:0]
-		// tile_address[6:5] = column_sel[3:2]
-		// tile_address[4:0] = this_address[4:0]
-		tile_address |= ((row_address >> 0) & 0xFFFF) << 16;
-		tile_address |= ((bank_selector >> 0) & 0x3) << 14;
-		tile_address |= ((column_selector >> 4) & 0x3F) << 8;
-		tile_address |= ((partition_selector >> 0) & 0x1) << 7;
-		tile_address |= ((column_selector >> 2) & 0x3) << 5;
-		tile_address |= ((this_address >> 0) & 0x1F) << 0;
-		// Twiddle bits 9 and 10
-		tile_address ^= (((tile_address >> 12) ^ ((bank_selector ^ tile_selector) & 1) ^ (tile_address >> 14)) & 1) << 9;
-		tile_address ^= ((tile_address >> 11) & 1) << 10;
-
-		// Calculate relative addresses and sample
-		const uint32_t linear_image_offset = (row * conf.image_pitch) + (col * conf.image_bpp);
-		const uint32_t tile_base_offset = tile_address - conf.tile_base_address;  // Distance from tile base address
-		const uint32_t tile_data_offset = tile_base_offset - conf.tile_rw_offset; // Distance from data base address
-
-		if (tile_base_offset >= conf.tile_size)
-		{
-			// Do not touch anything out of bounds
-			return;
-		}
-
-		if (direction == RSX_DMA_OP_ENCODE_TILE)
-		{
-			std::memcpy(tiled_data + tile_data_offset, linear_data + linear_image_offset, conf.image_bpp);
-		}
-		else
-		{
-			std::memcpy(linear_data + linear_image_offset, tiled_data + tile_data_offset, conf.image_bpp);
-		}
-	}
-
-	// Entry point. In GPU code this is handled by dispatch + main
-	template <typename T, bool Decode = false>
-	void tile_texel_data(void* dst, const void* src, uint32_t base_address, uint32_t base_offset, uint32_t tile_size, uint8_t bank_sense, uint16_t row_pitch_in_bytes, uint16_t image_width, uint16_t image_height)
-	{
-		// Some constants
-		auto get_prime_factor = [](uint32_t pitch) -> std::pair<uint32_t, uint32_t>
-		{
-			const uint32_t base = (pitch >> 8);
-			if ((pitch & (pitch - 1)) == 0)
-			{
-				return { 1u, base };
-			}
-
-			for (const auto prime : { 3, 5, 7, 11, 13 })
-			{
-				if ((base % prime) == 0)
-				{
-					return { prime, base / prime };
-				}
-			}
-
-			// rsx_log.error("Unexpected pitch value 0x%x", pitch);
-			return {};
-		};
-
-		const auto [prime, factor] = get_prime_factor(row_pitch_in_bytes);
-		const uint32_t tiles_per_row = prime * factor;
-		constexpr int op = Decode ? RSX_DMA_OP_DECODE_TILE : RSX_DMA_OP_ENCODE_TILE;
-
-		auto src2 = static_cast<char*>(const_cast<void*>(src));
-		auto dst2 = static_cast<char*>(dst);
-
-		const detiler_config dconf = {
-			.prime = prime,
-			.factor = factor,
-			.num_tiles_per_row = tiles_per_row,
-			.tile_base_address = base_address,
-			.tile_size = tile_size,
-			.tile_address_offset = base_offset,
-			.tile_rw_offset = base_offset,
-			.tile_pitch = row_pitch_in_bytes,
-			.tile_bank = bank_sense,
-			.image_width = image_width,
-			.image_height = image_height,
-			.image_pitch = row_pitch_in_bytes,
-			.image_bpp = sizeof(T)
-		};
-
-		for (u16 row = 0; row < image_height; ++row)
-		{
-			for (u16 col = 0; col < image_width; ++col)
-			{
-				if constexpr (op == RSX_DMA_OP_DECODE_TILE)
-				{
-					tiled_dma_copy(row, col, dconf, src2, dst2, op);
-				}
-				else
-				{
-					tiled_dma_copy(row, col, dconf, dst2, src2, op);
-				}
-			}
-		}
-	}
-
-	[[maybe_unused]] static auto tile_texel_data16 = tile_texel_data<u16, false>;
-	[[maybe_unused]] static auto tile_texel_data32 = tile_texel_data<u32, false>;
-	[[maybe_unused]] static auto detile_texel_data16 = tile_texel_data<u16, true>;
-	[[maybe_unused]] static auto detile_texel_data32 = tile_texel_data<u32, true>;
-
-#undef RSX_TILE_WIDTH
-#undef RSX_TILE_HEIGHT
-#undef RSX_DMA_OP_ENCODE_TILE
-#undef RSX_DMA_OP_DECODE_TILE
-}
diff --git a/rpcs3/Emu/RSX/Common/time.hpp b/rpcs3/Emu/RSX/Common/time.hpp
deleted file mode 100644
index db176fb4cc..0000000000
--- a/rpcs3/Emu/RSX/Common/time.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include <util/asm.hpp>
-#include <util/sysinfo.hpp>
diff --git a/rpcs3/Emu/RSX/Common/unordered_map.hpp b/rpcs3/Emu/RSX/Common/unordered_map.hpp
deleted file mode 100644
index f3f4aee0bb..0000000000
--- a/rpcs3/Emu/RSX/Common/unordered_map.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#ifdef RSX_USE_STD_MAP
-#include <unordered_map>
-
-namespace rsx
-{
-	template<typename T, typename U>
-	using unordered_map = std::unordered_map<T, U>;
-}
-#else
-#include "3rdparty/unordered_dense/include/unordered_dense.h"
-
-namespace rsx
-{
-	template<typename T, typename U>
-	using unordered_map = ankerl::unordered_dense::map<T, U>;
-}
-#endif
diff --git a/rpcs3/Emu/RSX/Core/RSXContext.cpp b/rpcs3/Emu/RSX/Core/RSXContext.cpp
deleted file mode 100644
index aa5962c745..0000000000
--- a/rpcs3/Emu/RSX/Core/RSXContext.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "stdafx.h"
-#include "Emu/RSX/rsx_utils.h"
-#include "RSXContext.h"
-
-namespace rsx
-{
-	GCM_tile_reference GCM_context::get_tiled_memory_region(const utils::address_range32& range) const
-	{
-		if (rsx::get_location(range.start) != CELL_GCM_LOCATION_MAIN)
-		{
-			// Local mem can be tiled but access is transparent from the memory controller
-			return {};
-		}
-
-		if (!g_cfg.video.handle_tiled_memory)
-		{
-			// Tiled memory sections will simply be ignored if the option is disabled.
-			// TODO: This option should never be needed.
-			return {};
-		}
-
-		for (const auto& tile : tiles)
-		{
-			if (!tile.bound || tile.location != CELL_GCM_LOCATION_MAIN)
-			{
-				continue;
-			}
-
-			const auto tile_base_address = iomap_table.get_addr(tile.offset);
-			const auto tile_range = utils::address_range32::start_length(tile_base_address, tile.size);
-
-			if (range.inside(tile_range))
-			{
-				ensure(tile_base_address + 1);
-				return { .base_address = tile_base_address, .tile = &tile };
-			}
-		}
-
-		return {};
-	}
-
-	utils::address_range32 GCM_tile_reference::tile_align(const utils::address_range32& range) const
-	{
-		const auto alignment = 64 * tile->pitch;
-		const u32 start_offset = rsx::align_down2(range.start - base_address, alignment);
-		const u32 end_offset = rsx::align2(range.end - base_address + 1, alignment);
-
-		return utils::address_range32::start_length(start_offset + base_address, end_offset - start_offset);
-	}
-}
diff --git a/rpcs3/Emu/RSX/Core/RSXContext.h b/rpcs3/Emu/RSX/Core/RSXContext.h
deleted file mode 100644
index dd18747012..0000000000
--- a/rpcs3/Emu/RSX/Core/RSXContext.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include "Emu/Cell/lv2/sys_rsx.h"
-#include "Emu/RSX/GCM.h"
-#include "Emu/RSX/rsx_utils.h"
-#include "RSXIOMap.hpp"
-
-namespace rsx
-{
-	namespace gcm
-	{
-		enum limits
-		{
-			tiles_count = 15,
-			zculls_count = 8
-		};
-	}
-
-	struct GCM_tile_reference
-	{
-		u32 base_address = 0;
-		const GcmTileInfo* tile = nullptr;
-
-		operator bool() const
-		{
-			return !!tile;
-		}
-
-		utils::address_range32 tile_align(const rsx::address_range32& range) const;
-	};
-
-	struct GCM_context
-	{
-		RsxDmaControl* ctrl = nullptr;
-		u32 dma_address{ 0 };
-		rsx_iomap_table iomap_table;
-
-		GcmTileInfo tiles[gcm::limits::tiles_count];
-		GcmZcullInfo zculls[gcm::limits::zculls_count];
-
-		RsxDisplayInfo display_buffers[8];
-		u32 display_buffers_count{ 0 };
-		u32 current_display_buffer{ 0 };
-
-		shared_mutex sys_rsx_mtx;
-		u32 device_addr{ 0 };
-		u32 label_addr{ 0 };
-		u32 main_mem_size{ 0 };
-		u32 local_mem_size{ 0 };
-		u32 rsx_event_port{ 0 };
-		u32 driver_info{ 0 };
-
-		atomic_t<u64> unsent_gcm_events = 0; // Unsent event bits when aborting RSX/VBLANK thread (will be sent on savestate load)
-
-		GCM_tile_reference get_tiled_memory_region(const utils::address_range32& range) const;
-	};
-}
diff --git a/rpcs3/Emu/RSX/Core/RSXDisplay.cpp b/rpcs3/Emu/RSX/Core/RSXDisplay.cpp
deleted file mode 100644
index e263a945ef..0000000000
--- a/rpcs3/Emu/RSX/Core/RSXDisplay.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-#include "stdafx.h"
-#include "RSXDisplay.h"
-
-#include "../Common/simple_array.hpp"
-#include "../rsx_utils.h"
-
-namespace rsx
-{
-	std::string framebuffer_dimensions_t::to_string(bool skip_aa_suffix) const
-	{
-		std::string suffix = "";
-		const auto spp = samples_x * samples_y;
-
-		if (!skip_aa_suffix && spp > 1)
-		{
-			suffix = std::string(" @MSAA ") + std::to_string(spp) + "x";
-		}
-
-		return std::to_string(width) + "x" + std::to_string(height) + suffix;
-	}
-
-	framebuffer_dimensions_t framebuffer_dimensions_t::make(u16 width, u16 height, rsx::surface_antialiasing aa)
-	{
-		framebuffer_dimensions_t result { .width = width, .height = height };
-		switch (aa)
-		{
-		case rsx::surface_antialiasing::center_1_sample:
-			result.samples_x = result.samples_y = 1;
-			break;
-		case rsx::surface_antialiasing::diagonal_centered_2_samples:
-			result.samples_x = 2;
-			result.samples_y = 1;
-			break;
-		case rsx::surface_antialiasing::square_centered_4_samples:
-		case rsx::surface_antialiasing::square_rotated_4_samples:
-			result.samples_x = result.samples_y = 2;
-			break;
-		}
-		return result;
-	}
-
-	void framebuffer_statistics_t::add(u16 width, u16 height, rsx::surface_antialiasing aa)
-	{
-		auto& stashed = data[aa];
-		const auto& incoming = framebuffer_dimensions_t::make(width, height, aa);
-		if (incoming > stashed)
-		{
-			stashed = incoming;
-		}
-	}
-
-	std::string framebuffer_statistics_t::to_string(bool squash) const
-	{
-		// Format is sorted by sample count
-		struct sorted_message_t
-		{
-			u32 id;
-			surface_antialiasing aa_mode;
-			u32 samples;
-		};
-
-		if (data.size() == 0)
-		{
-			return "None";
-		}
-
-		rsx::simple_array<sorted_message_t> messages;
-		rsx::simple_array<framebuffer_dimensions_t> real_stats;
-
-		for (const auto& [aa_mode, stat] : data)
-		{
-			auto real_stat = stat;
-			std::tie(real_stat.width, real_stat.height) = apply_resolution_scale(stat.width, stat.height);
-			real_stats.push_back(real_stat);
-
-			sorted_message_t msg;
-			msg.id = real_stats.size() - 1;
-			msg.aa_mode = aa_mode;
-			msg.samples = real_stat.samples_total();
-			messages.push_back(msg);
-		}
-
-		if (squash)
-		{
-			messages.sort(FN(x.samples > y.samples));
-			return real_stats[messages.front().id]
-				.to_string(g_cfg.video.antialiasing_level == msaa_level::none);
-		}
-
-		if (messages.size() > 1)
-		{
-			// Should we bother showing the No-AA entry?
-			// This heurestic ignores pointless no-AA surfaces usually used as compositing buffers for output.
-			messages.sort(FN(x.samples > y.samples));
-			if (messages.back().aa_mode == rsx::surface_antialiasing::center_1_sample)
-			{
-				// Drop the last entry if it has no AA.
-				messages.resize(messages.size() - 1);
-			}
-		}
-
-		const auto text = messages
-			.sort(FN(static_cast<u8>(x.aa_mode) > static_cast<u8>(y.aa_mode)))
-			.map(FN(real_stats[x.id].to_string()));
-		return fmt::merge(text, ", ");
-	}
-}
diff --git a/rpcs3/Emu/RSX/Core/RSXDisplay.h b/rpcs3/Emu/RSX/Core/RSXDisplay.h
deleted file mode 100644
index 77407f2f19..0000000000
--- a/rpcs3/Emu/RSX/Core/RSXDisplay.h
+++ /dev/null
@@ -1,127 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include <util/logs.hpp>
-#include <deque>
-#include <unordered_map>
-
-template <typename T>
-class named_thread;
-
-namespace rsx
-{
-	enum class surface_antialiasing : u8;
-
-	struct framebuffer_dimensions_t
-	{
-		u16 width;
-		u16 height;
-		u8 samples_x;
-		u8 samples_y;
-
-		inline u32 samples_total() const
-		{
-			return static_cast<u32>(width) * height * samples_x * samples_y;
-		}
-
-		inline bool operator > (const framebuffer_dimensions_t& that) const
-		{
-			return samples_total() > that.samples_total();
-		}
-
-		std::string to_string(bool skip_aa_suffix = false) const;
-
-		static framebuffer_dimensions_t make(u16 width, u16 height, rsx::surface_antialiasing aa);
-	};
-
-	struct framebuffer_statistics_t
-	{
-		std::unordered_map<rsx::surface_antialiasing, framebuffer_dimensions_t> data;
-
-		// Replace the existing data with this input if it is greater than what is already known
-		void add(u16 width, u16 height, rsx::surface_antialiasing aa);
-
-		// Returns a formatted string representing the statistics collected over the frame.
-		std::string to_string(bool squash) const;
-	};
-
-	struct frame_statistics_t
-	{
-		u32 draw_calls;
-		u32 submit_count;
-
-		s64 setup_time;
-		s64 vertex_upload_time;
-		s64 textures_upload_time;
-		s64 draw_exec_time;
-		s64 flip_time;
-
-		u32 vertex_cache_request_count;
-		u32 vertex_cache_miss_count;
-
-		u32 program_cache_lookups_total;
-		u32 program_cache_lookups_ellided;
-
-		framebuffer_statistics_t framebuffer_stats;
-	};
-
-	struct frame_time_t
-	{
-		u64 preempt_count;
-		u64 timestamp;
-		u64 tsc;
-	};
-
-	struct display_flip_info_t
-	{
-		std::deque<u32> buffer_queue;
-		u32 buffer;
-		bool skip_frame;
-		bool emu_flip;
-		bool in_progress;
-		frame_statistics_t stats;
-
-		inline void push(u32 _buffer)
-		{
-			buffer_queue.push_back(_buffer);
-		}
-
-		inline bool pop(u32 _buffer)
-		{
-			if (buffer_queue.empty())
-			{
-				return false;
-			}
-
-			do
-			{
-				const auto index = buffer_queue.front();
-				buffer_queue.pop_front();
-
-				if (index == _buffer)
-				{
-					buffer = _buffer;
-					return true;
-				}
-			} while (!buffer_queue.empty());
-
-			// Need to observe this happening in the wild
-			rsx_log.error("Display queue was discarded while not empty!");
-			return false;
-		}
-	};
-
-	class vblank_thread
-	{
-		std::shared_ptr<named_thread<std::function<void()>>> m_thread;
-
-	public:
-		vblank_thread() = default;
-		vblank_thread(const vblank_thread&) = delete;
-
-		void set_thread(std::shared_ptr<named_thread<std::function<void()>>> thread);
-
-		vblank_thread& operator=(thread_state);
-		vblank_thread& operator=(const vblank_thread&) = delete;
-	};
-}
diff --git a/rpcs3/Emu/RSX/Core/RSXDrawCommands.cpp b/rpcs3/Emu/RSX/Core/RSXDrawCommands.cpp
deleted file mode 100644
index 97cf918e57..0000000000
--- a/rpcs3/Emu/RSX/Core/RSXDrawCommands.cpp
+++ /dev/null
@@ -1,861 +0,0 @@
-#include "stdafx.h"
-#include "RSXDrawCommands.h"
-
-#include "Emu/RSX/Common/BufferUtils.h"
-#include "Emu/RSX/Common/buffer_stream.hpp"
-#include "Emu/RSX/Common/io_buffer.h"
-#include "Emu/RSX/NV47/HW/context_accessors.define.h"
-#include "Emu/RSX/Program/GLSLCommon.h"
-#include "Emu/RSX/rsx_methods.h"
-#include "Emu/RSX/RSXThread.h"
-
-#include "Emu/Memory/vm.h"
-
-namespace rsx
-{
-	void draw_command_processor::analyse_inputs_interleaved(vertex_input_layout& result, const vertex_program_metadata_t& vp_metadata)
-	{
-		const rsx_state& state = *REGS(m_ctx);
-		const u32 input_mask = state.vertex_attrib_input_mask() & vp_metadata.referenced_inputs_mask;
-
-		result.clear();
-		result.attribute_mask = static_cast<u16>(input_mask);
-
-		if (state.current_draw_clause.command == rsx::draw_command::inlined_array)
-		{
-			interleaved_range_info& info = *result.alloc_interleaved_block();
-			info.interleaved = true;
-
-			for (u8 index = 0; index < rsx::limits::vertex_count; ++index)
-			{
-				auto& vinfo = state.vertex_arrays_info[index];
-				result.attribute_placement[index] = attribute_buffer_placement::none;
-
-				if (vinfo.size() > 0)
-				{
-					// Stride must be updated even if the stream is disabled
-					info.attribute_stride += rsx::get_vertex_type_size_on_host(vinfo.type(), vinfo.size());
-					info.locations.push_back({ index, false, 1 });
-
-					if (input_mask & (1u << index))
-					{
-						result.attribute_placement[index] = attribute_buffer_placement::transient;
-					}
-				}
-				else if (state.register_vertex_info[index].size > 0 && input_mask & (1u << index))
-				{
-					// Reads from register
-					result.referenced_registers.push_back(index);
-					result.attribute_placement[index] = attribute_buffer_placement::transient;
-				}
-			}
-
-			if (info.attribute_stride)
-			{
-				// At least one array feed must be enabled for vertex input
-				result.interleaved_blocks.push_back(&info);
-			}
-
-			return;
-		}
-
-		const u32 frequency_divider_mask = REGS(m_ctx)->frequency_divider_operation_mask();
-		result.interleaved_blocks.reserve(16);
-		result.referenced_registers.reserve(16);
-
-		for (auto [ref_mask, index] = std::tuple{ input_mask, u8(0) }; ref_mask; ++index, ref_mask >>= 1)
-		{
-			ensure(index < rsx::limits::vertex_count);
-
-			if (!(ref_mask & 1u))
-			{
-				// Nothing to do, uninitialized
-				continue;
-			}
-
-			// Always reset attribute placement by default
-			result.attribute_placement[index] = attribute_buffer_placement::none;
-
-			// Check for interleaving
-			if (REGS(m_ctx)->current_draw_clause.is_immediate_draw &&
-				REGS(m_ctx)->current_draw_clause.command != rsx::draw_command::indexed)
-			{
-				// NOTE: In immediate rendering mode, all vertex setup is ignored
-				// Observed with GT5, immediate render bypasses array pointers completely, even falling back to fixed-function register defaults
-				if (m_vertex_push_buffers[index].vertex_count > 1)
-				{
-					// Ensure consistent number of vertices per attribute.
-					m_vertex_push_buffers[index].pad_to(m_vertex_push_buffers[0].vertex_count, false);
-
-					// Read temp buffer (register array)
-					std::pair<u8, u32> volatile_range_info = std::make_pair(index, static_cast<u32>(m_vertex_push_buffers[index].data.size() * sizeof(u32)));
-					result.volatile_blocks.push_back(volatile_range_info);
-					result.attribute_placement[index] = attribute_buffer_placement::transient;
-				}
-				else if (state.register_vertex_info[index].size > 0)
-				{
-					// Reads from register
-					result.referenced_registers.push_back(index);
-					result.attribute_placement[index] = attribute_buffer_placement::transient;
-				}
-
-				// Fall back to the default register value if no source is specified via register
-				continue;
-			}
-
-			const auto& info = state.vertex_arrays_info[index];
-			if (!info.size())
-			{
-				if (state.register_vertex_info[index].size > 0)
-				{
-					// Reads from register
-					result.referenced_registers.push_back(index);
-					result.attribute_placement[index] = attribute_buffer_placement::transient;
-					continue;
-				}
-			}
-			else
-			{
-				result.attribute_placement[index] = attribute_buffer_placement::persistent;
-				const u32 base_address = info.offset() & 0x7fffffff;
-				bool alloc_new_block = true;
-				bool modulo = !!(frequency_divider_mask & (1 << index));
-
-				for (auto& block : result.interleaved_blocks)
-				{
-					if (block->single_vertex)
-					{
-						// Single vertex definition, continue
-						continue;
-					}
-
-					if (block->attribute_stride != info.stride())
-					{
-						// Stride does not match, continue
-						continue;
-					}
-
-					if (base_address > block->base_offset)
-					{
-						const u32 diff = base_address - block->base_offset;
-						if (diff > info.stride())
-						{
-							// Not interleaved, continue
-							continue;
-						}
-					}
-					else
-					{
-						const u32 diff = block->base_offset - base_address;
-						if (diff > info.stride())
-						{
-							// Not interleaved, continue
-							continue;
-						}
-
-						// Matches, and this address is lower than existing
-						block->base_offset = base_address;
-					}
-
-					alloc_new_block = false;
-					block->locations.push_back({ index, modulo, info.frequency() });
-					block->interleaved = true;
-					break;
-				}
-
-				if (alloc_new_block)
-				{
-					interleaved_range_info& block = *result.alloc_interleaved_block();
-					block.base_offset = base_address;
-					block.attribute_stride = info.stride();
-					block.memory_location = info.offset() >> 31;
-					block.locations.reserve(16);
-					block.locations.push_back({ index, modulo, info.frequency() });
-
-					if (block.attribute_stride == 0)
-					{
-						block.single_vertex = true;
-						block.attribute_stride = rsx::get_vertex_type_size_on_host(info.type(), info.size());
-					}
-
-					result.interleaved_blocks.push_back(&block);
-				}
-			}
-		}
-
-		for (auto& info : result.interleaved_blocks)
-		{
-			// Calculate real data address to be used during upload
-			info->real_offset_address = rsx::get_address(rsx::get_vertex_offset_from_base(state.vertex_data_base_offset(), info->base_offset), info->memory_location);
-		}
-	}
-
-	std::span<const std::byte> draw_command_processor::get_raw_index_array(const draw_clause& draw_indexed_clause) const
-	{
-		if (!m_element_push_buffer.empty()) [[ unlikely ]]
-		{
-			// Indices provided via immediate mode
-			return { reinterpret_cast<const std::byte*>(m_element_push_buffer.data()), ::narrow<u32>(m_element_push_buffer.size() * sizeof(u32)) };
-		}
-
-		const rsx::index_array_type type = REGS(m_ctx)->index_type();
-		const u32 type_size = get_index_type_size(type);
-
-		// Force aligned indices as realhw
-		const u32 address = (0 - type_size) & get_address(REGS(m_ctx)->index_array_address(), REGS(m_ctx)->index_array_location());
-
-		const u32 first = draw_indexed_clause.min_index();
-		const u32 count = draw_indexed_clause.get_elements_count();
-
-		const auto ptr = vm::_ptr<const std::byte>(address);
-		return { ptr + first * type_size, count * type_size };
-	}
-
-	std::variant<draw_array_command, draw_indexed_array_command, draw_inlined_array>
-		draw_command_processor::get_draw_command(const rsx::rsx_state& state) const
-	{
-		if (REGS(m_ctx)->current_draw_clause.command == rsx::draw_command::indexed) [[ likely ]]
-		{
-			return draw_indexed_array_command
-			{
-				get_raw_index_array(state.current_draw_clause)
-			};
-		}
-
-		if (REGS(m_ctx)->current_draw_clause.command == rsx::draw_command::array)
-		{
-			return draw_array_command{};
-		}
-
-		if (REGS(m_ctx)->current_draw_clause.command == rsx::draw_command::inlined_array)
-		{
-			return draw_inlined_array{};
-		}
-
-		fmt::throw_exception("ill-formed draw command");
-	}
-
-	void draw_command_processor::append_to_push_buffer(u32 attribute, u32 size, u32 subreg_index, vertex_base_type type, u32 value)
-	{
-		if (!(REGS(m_ctx)->vertex_attrib_input_mask() & (1 << attribute)))
-		{
-			return;
-		}
-
-		// Enforce ATTR0 as vertex attribute for push buffers.
-		// This whole thing becomes a mess if we don't have a provoking attribute.
-		const auto vertex_id = m_vertex_push_buffers[0].get_vertex_id();
-		m_vertex_push_buffers[attribute].set_vertex_data(attribute, vertex_id, subreg_index, type, size, value);
-		RSX(m_ctx)->m_graphics_state |= rsx::pipeline_state::push_buffer_arrays_dirty;
-	}
-
-	u32 draw_command_processor::get_push_buffer_vertex_count() const
-	{
-		// Enforce ATTR0 as vertex attribute for push buffers.
-		// This whole thing becomes a mess if we don't have a provoking attribute.
-		return m_vertex_push_buffers[0].vertex_count;
-	}
-
-	void draw_command_processor::append_array_element(u32 index)
-	{
-		// Endianness is swapped because common upload code expects input in BE
-		// TODO: Implement fast upload path for LE inputs and do away with this
-		m_element_push_buffer.push_back(std::bit_cast<u32, be_t<u32>>(index));
-	}
-
-	u32 draw_command_processor::get_push_buffer_index_count() const
-	{
-		return ::size32(m_element_push_buffer);
-	}
-
-	void draw_command_processor::clear_push_buffers()
-	{
-		auto& graphics_state = RSX(m_ctx)->m_graphics_state;
-		if (graphics_state & rsx::pipeline_state::push_buffer_arrays_dirty)
-		{
-			for (auto& push_buf : m_vertex_push_buffers)
-			{
-				//Disabled, see https://github.com/RPCS3/rpcs3/issues/1932
-				//REGS(m_ctx)->register_vertex_info[index].size = 0;
-
-				push_buf.clear();
-			}
-
-			graphics_state.clear(rsx::pipeline_state::push_buffer_arrays_dirty);
-		}
-
-		m_element_push_buffer.clear();
-	}
-
-	void draw_command_processor::fill_vertex_layout_state(
-		const vertex_input_layout& layout,
-		const vertex_program_metadata_t& vp_metadata,
-		u32 first_vertex,
-		u32 vertex_count,
-		s32* buffer,
-		u32 persistent_offset_base,
-		u32 volatile_offset_base) const
-	{
-		std::array<s32, 16> offset_in_block = {};
-		u32 volatile_offset = volatile_offset_base;
-		u32 persistent_offset = persistent_offset_base;
-
-		// NOTE: Order is important! Transient ayout is always push_buffers followed by register data
-		if (REGS(m_ctx)->current_draw_clause.is_immediate_draw)
-		{
-			for (const auto& info : layout.volatile_blocks)
-			{
-				offset_in_block[info.first] = volatile_offset;
-				volatile_offset += info.second;
-			}
-		}
-
-		for (u8 index : layout.referenced_registers)
-		{
-			offset_in_block[index] = volatile_offset;
-			volatile_offset += 16;
-		}
-
-		if (REGS(m_ctx)->current_draw_clause.command == rsx::draw_command::inlined_array)
-		{
-			const auto& block = layout.interleaved_blocks[0];
-			u32 inline_data_offset = volatile_offset;
-			for (const auto& attrib : block->locations)
-			{
-				auto& info = REGS(m_ctx)->vertex_arrays_info[attrib.index];
-
-				offset_in_block[attrib.index] = inline_data_offset;
-				inline_data_offset += rsx::get_vertex_type_size_on_host(info.type(), info.size());
-			}
-		}
-		else
-		{
-			for (const auto& block : layout.interleaved_blocks)
-			{
-				for (const auto& attrib : block->locations)
-				{
-					const u32 local_address = (REGS(m_ctx)->vertex_arrays_info[attrib.index].offset() & 0x7fffffff);
-					offset_in_block[attrib.index] = persistent_offset + (local_address - block->base_offset);
-				}
-
-				const auto range = block->calculate_required_range(first_vertex, vertex_count);
-				persistent_offset += block->attribute_stride * range.second;
-			}
-		}
-
-		// Fill the data
-		// Each descriptor field is 64 bits wide
-		// [0-8] attribute stride
-		// [8-24] attribute divisor
-		// [24-27] attribute type
-		// [27-30] attribute size
-		// [30-31] reserved
-		// [31-60] starting offset
-		// [60-21] swap bytes flag
-		// [61-22] volatile flag
-		// [62-63] modulo enable flag
-
-		const s32 default_frequency_mask = (1 << 8);
-		const s32 swap_storage_mask = (1 << 29);
-		const s32 volatile_storage_mask = (1 << 30);
-		const s32 modulo_op_frequency_mask = smin;
-
-		const u32 modulo_mask = REGS(m_ctx)->frequency_divider_operation_mask();
-		const auto max_index = (first_vertex + vertex_count) - 1;
-
-		for (u16 ref_mask = vp_metadata.referenced_inputs_mask, index = 0; ref_mask; ++index, ref_mask >>= 1)
-		{
-			if (!(ref_mask & 1u))
-			{
-				// Unused input, ignore this
-				continue;
-			}
-
-			if (layout.attribute_placement[index] == attribute_buffer_placement::none)
-			{
-				static constexpr u64 zero = 0;
-				std::memcpy(buffer + index * 2, &zero, sizeof(zero));
-				continue;
-			}
-
-			rsx::vertex_base_type type = {};
-			s32 size = 0;
-			s32 attrib0 = 0;
-			s32 attrib1 = 0;
-
-			if (layout.attribute_placement[index] == attribute_buffer_placement::transient)
-			{
-				if (REGS(m_ctx)->current_draw_clause.command == rsx::draw_command::inlined_array)
-				{
-					const auto& info = REGS(m_ctx)->vertex_arrays_info[index];
-
-					if (!info.size())
-					{
-						// Register
-						const auto& reginfo = REGS(m_ctx)->register_vertex_info[index];
-						type = reginfo.type;
-						size = reginfo.size;
-
-						attrib0 = rsx::get_vertex_type_size_on_host(type, size);
-					}
-					else
-					{
-						// Array
-						type = info.type();
-						size = info.size();
-
-						attrib0 = layout.interleaved_blocks[0]->attribute_stride | default_frequency_mask;
-					}
-				}
-				else
-				{
-					// Data is either from an immediate render or register input
-					// Immediate data overrides register input
-
-					if (REGS(m_ctx)->current_draw_clause.is_immediate_draw &&
-						m_vertex_push_buffers[index].vertex_count > 1)
-					{
-						// Push buffer
-						const auto& info = m_vertex_push_buffers[index];
-						type = info.type;
-						size = info.size;
-
-						attrib0 = rsx::get_vertex_type_size_on_host(type, size) | default_frequency_mask;
-					}
-					else
-					{
-						// Register
-						const auto& info = REGS(m_ctx)->register_vertex_info[index];
-						type = info.type;
-						size = info.size;
-
-						attrib0 = rsx::get_vertex_type_size_on_host(type, size);
-					}
-				}
-
-				attrib1 |= volatile_storage_mask;
-			}
-			else
-			{
-				auto& info = REGS(m_ctx)->vertex_arrays_info[index];
-				type = info.type();
-				size = info.size();
-
-				auto stride = info.stride();
-				attrib0 = stride;
-
-				if (stride > 0) // when stride is 0, input is not an array but a single element
-				{
-					const u32 frequency = info.frequency();
-					switch (frequency)
-					{
-					case 0:
-					case 1:
-					{
-						attrib0 |= default_frequency_mask;
-						break;
-					}
-					default:
-					{
-						if (modulo_mask & (1 << index))
-						{
-							if (max_index >= frequency)
-							{
-								// Only set modulo mask if a modulo op is actually necessary!
-								// This requires that the uploaded range for this attr = [0, freq-1]
-								// Ignoring modulo op if the rendered range does not wrap allows for range optimization
-								attrib0 |= (frequency << 8);
-								attrib1 |= modulo_op_frequency_mask;
-							}
-							else
-							{
-								attrib0 |= default_frequency_mask;
-							}
-						}
-						else
-						{
-							// Division
-							attrib0 |= (frequency << 8);
-						}
-						break;
-					}
-					}
-				}
-			} // end attribute placement check
-
-			// Special compressed 4 components into one 4-byte value. Decoded as one value.
-			if (type == rsx::vertex_base_type::cmp)
-			{
-				size = 1;
-			}
-
-			// All data is passed in in PS3-native order (BE) so swap flag should be set
-			attrib1 |= swap_storage_mask;
-			attrib0 |= (static_cast<s32>(type) << 24);
-			attrib0 |= (size << 27);
-			attrib1 |= offset_in_block[index];
-
-			buffer[index * 2 + 0] = attrib0;
-			buffer[index * 2 + 1] = attrib1;
-		}
-	}
-
-	void draw_command_processor::write_vertex_data_to_memory(
-		const vertex_input_layout& layout,
-		u32 first_vertex,
-		u32 vertex_count,
-		void* persistent_data,
-		void* volatile_data) const
-	{
-		auto transient = static_cast<char*>(volatile_data);
-		auto persistent = static_cast<char*>(persistent_data);
-
-		auto& draw_call = REGS(m_ctx)->current_draw_clause;
-
-		if (transient != nullptr)
-		{
-			if (draw_call.command == rsx::draw_command::inlined_array)
-			{
-				for (const u8 index : layout.referenced_registers)
-				{
-					memcpy(transient, REGS(m_ctx)->register_vertex_info[index].data.data(), 16);
-					transient += 16;
-				}
-
-				memcpy(transient, draw_call.inline_vertex_array.data(), draw_call.inline_vertex_array.size() * sizeof(u32));
-				// Is it possible to reference data outside of the inlined array?
-				return;
-			}
-
-			// NOTE: Order is important! Transient layout is always push_buffers followed by register data
-			if (draw_call.is_immediate_draw)
-			{
-				// NOTE: It is possible for immediate draw to only contain index data, so vertex data can be in persistent memory
-				for (const auto& info : layout.volatile_blocks)
-				{
-					memcpy(transient, m_vertex_push_buffers[info.first].data.data(), info.second);
-					transient += info.second;
-				}
-			}
-
-			for (const u8 index : layout.referenced_registers)
-			{
-				memcpy(transient, REGS(m_ctx)->register_vertex_info[index].data.data(), 16);
-				transient += 16;
-			}
-		}
-
-		if (persistent != nullptr)
-		{
-			for (interleaved_range_info* block : layout.interleaved_blocks)
-			{
-				auto range = block->calculate_required_range(first_vertex, vertex_count);
-
-				const u32 data_size = range.second * block->attribute_stride;
-				const u32 vertex_base = range.first * block->attribute_stride;
-
-				g_fxo->get<rsx::dma_manager>().copy(persistent, vm::_ptr<char>(block->real_offset_address) + vertex_base, data_size);
-				persistent += data_size;
-			}
-		}
-	}
-
-	void draw_command_processor::fill_scale_offset_data(void* buffer, bool flip_y) const
-	{
-		const int clip_w = REGS(m_ctx)->surface_clip_width();
-		const int clip_h = REGS(m_ctx)->surface_clip_height();
-
-		const float scale_x = REGS(m_ctx)->viewport_scale_x() / (clip_w / 2.f);
-		float offset_x = REGS(m_ctx)->viewport_offset_x() - (clip_w / 2.f);
-		offset_x /= clip_w / 2.f;
-
-		float scale_y = REGS(m_ctx)->viewport_scale_y() / (clip_h / 2.f);
-		float offset_y = (REGS(m_ctx)->viewport_offset_y() - (clip_h / 2.f));
-		offset_y /= clip_h / 2.f;
-		if (flip_y) scale_y *= -1;
-		if (flip_y) offset_y *= -1;
-
-		const float scale_z = REGS(m_ctx)->viewport_scale_z();
-		const float offset_z = REGS(m_ctx)->viewport_offset_z();
-		const float one = 1.f;
-
-		utils::stream_vector(buffer, std::bit_cast<u32>(scale_x), 0, 0, std::bit_cast<u32>(offset_x));
-		utils::stream_vector(static_cast<char*>(buffer) + 16, 0, std::bit_cast<u32>(scale_y), 0, std::bit_cast<u32>(offset_y));
-		utils::stream_vector(static_cast<char*>(buffer) + 32, 0, 0, std::bit_cast<u32>(scale_z), std::bit_cast<u32>(offset_z));
-		utils::stream_vector(static_cast<char*>(buffer) + 48, 0, 0, 0, std::bit_cast<u32>(one));
-	}
-
-	void draw_command_processor::fill_user_clip_data(void* buffer) const
-	{
-		const rsx::user_clip_plane_op clip_plane_control[6] =
-		{
-			REGS(m_ctx)->clip_plane_0_enabled(),
-			REGS(m_ctx)->clip_plane_1_enabled(),
-			REGS(m_ctx)->clip_plane_2_enabled(),
-			REGS(m_ctx)->clip_plane_3_enabled(),
-			REGS(m_ctx)->clip_plane_4_enabled(),
-			REGS(m_ctx)->clip_plane_5_enabled(),
-		};
-
-		u8 data_block[64];
-		s32* clip_enabled_flags = reinterpret_cast<s32*>(data_block);
-		f32* clip_distance_factors = reinterpret_cast<f32*>(data_block + 32);
-
-		for (int index = 0; index < 6; ++index)
-		{
-			switch (clip_plane_control[index])
-			{
-			default:
-				rsx_log.error("bad clip plane control (0x%x)", static_cast<u8>(clip_plane_control[index]));
-				[[fallthrough]];
-
-			case rsx::user_clip_plane_op::disable:
-				clip_enabled_flags[index] = 0;
-				clip_distance_factors[index] = 0.f;
-				break;
-
-			case rsx::user_clip_plane_op::greater_or_equal:
-				clip_enabled_flags[index] = 1;
-				clip_distance_factors[index] = 1.f;
-				break;
-
-			case rsx::user_clip_plane_op::less_than:
-				clip_enabled_flags[index] = 1;
-				clip_distance_factors[index] = -1.f;
-				break;
-			}
-		}
-
-		memcpy(buffer, data_block, 2 * 8 * sizeof(u32));
-	}
-
-	/**
-	* Fill buffer with vertex program constants.
-	* Buffer must be at least 512 float4 wide.
-	*/
-	void draw_command_processor::fill_vertex_program_constants_data(void* buffer, const std::span<const u16>& reloc_table) const
-	{
-		if (!reloc_table.empty()) [[ likely ]]
-		{
-			char* dst = reinterpret_cast<char*>(buffer);
-			for (const auto& index : reloc_table)
-			{
-				utils::stream_vector_from_memory(dst, &REGS(m_ctx)->transform_constants[index]);
-				dst += 16;
-			}
-		}
-		else
-		{
-			memcpy(buffer, REGS(m_ctx)->transform_constants.data(), 468 * 4 * sizeof(float));
-		}
-	}
-
-	void draw_command_processor::fill_fragment_state_buffer(void* buffer, const RSXFragmentProgram& /*fragment_program*/) const
-	{
-		ROP_control_t rop_control{};
-
-		if (REGS(m_ctx)->alpha_test_enabled())
-		{
-			const u32 alpha_func = static_cast<u32>(REGS(m_ctx)->alpha_func());
-			rop_control.set_alpha_test_func(alpha_func);
-			rop_control.enable_alpha_test();
-		}
-
-		if (REGS(m_ctx)->polygon_stipple_enabled())
-		{
-			rop_control.enable_polygon_stipple();
-		}
-
-		auto can_use_hw_a2c = [&]() -> bool
-		{
-			const auto& config = RSX(m_ctx)->get_backend_config();
-			if (!config.supports_hw_a2c)
-			{
-				return false;
-			}
-
-			if (config.supports_hw_a2c_1spp)
-			{
-				return true;
-			}
-
-			return REGS(m_ctx)->surface_antialias() != rsx::surface_antialiasing::center_1_sample;
-		};
-
-		if (REGS(m_ctx)->msaa_alpha_to_coverage_enabled() && !can_use_hw_a2c())
-		{
-			// TODO: Properly support alpha-to-coverage and alpha-to-one behavior in shaders
-			// Alpha values generate a coverage mask for order independent blending
-			// Requires hardware AA to work properly (or just fragment sample stage in fragment shaders)
-			// Simulated using combined alpha blend and alpha test
-			rop_control.enable_alpha_to_coverage();
-			if (REGS(m_ctx)->msaa_sample_mask())
-			{
-				rop_control.enable_MSAA_writes();
-			}
-
-			// Sample configuration bits
-			switch (REGS(m_ctx)->surface_antialias())
-			{
-			case rsx::surface_antialiasing::center_1_sample:
-				break;
-			case rsx::surface_antialiasing::diagonal_centered_2_samples:
-				rop_control.set_msaa_control(1u);
-				break;
-			default:
-				rop_control.set_msaa_control(3u);
-				break;
-			}
-		}
-
-		const f32 fog0 = REGS(m_ctx)->fog_params_0();
-		const f32 fog1 = REGS(m_ctx)->fog_params_1();
-		const u32 fog_mode = static_cast<u32>(REGS(m_ctx)->fog_equation());
-
-		// Check if framebuffer is actually an XRGB format and not a WZYX format
-		switch (REGS(m_ctx)->surface_color())
-		{
-		case rsx::surface_color_format::w16z16y16x16:
-		case rsx::surface_color_format::w32z32y32x32:
-		case rsx::surface_color_format::x32:
-			// These behave very differently from "normal" formats.
-			break;
-		default:
-			// Integer framebuffer formats.
-			rop_control.enable_framebuffer_INT();
-
-			// Check if we want sRGB conversion.
-			if (REGS(m_ctx)->framebuffer_srgb_enabled())
-			{
-				rop_control.enable_framebuffer_sRGB();
-			}
-			break;
-		}
-
-		// Generate wpos coefficients
-		// wpos equation is now as follows:
-		// wpos.y = (frag_coord / resolution_scale) * ((window_origin!=top)?-1.: 1.) + ((window_origin!=top)? window_height : 0)
-		// wpos.x = (frag_coord / resolution_scale)
-		// wpos.zw = frag_coord.zw
-
-		const auto window_origin = REGS(m_ctx)->shader_window_origin();
-		const u32 window_height = REGS(m_ctx)->shader_window_height();
-		const f32 resolution_scale = (window_height <= static_cast<u32>(g_cfg.video.min_scalable_dimension)) ? 1.f : rsx::get_resolution_scale();
-		const f32 wpos_scale = (window_origin == rsx::window_origin::top) ? (1.f / resolution_scale) : (-1.f / resolution_scale);
-		const f32 wpos_bias = (window_origin == rsx::window_origin::top) ? 0.f : window_height;
-		const f32 alpha_ref = REGS(m_ctx)->alpha_ref();
-
-		u32* dst = static_cast<u32*>(buffer);
-		utils::stream_vector(dst, std::bit_cast<u32>(fog0), std::bit_cast<u32>(fog1), rop_control.value, std::bit_cast<u32>(alpha_ref));
-		utils::stream_vector(dst + 4, 0u, fog_mode, std::bit_cast<u32>(wpos_scale), std::bit_cast<u32>(wpos_bias));
-	}
-
-	void draw_command_processor::fill_constants_instancing_buffer(rsx::io_buffer& indirection_table_buf, rsx::io_buffer& constants_data_array_buffer, const VertexProgramBase* prog) const
-	{
-		auto& draw_call = REGS(m_ctx)->current_draw_clause;
-
-		// Only call this for instanced draws!
-		ensure(draw_call.is_trivial_instanced_draw);
-
-		// Temp indirection table. Used to track "running" updates.
-		auto& instancing_indirection_table = m_scratch_buffers.u32buf;
-
-		// indirection table size
-		const auto full_reupload = !prog || prog->has_indexed_constants;
-		const auto reloc_table = full_reupload ? decltype(prog->constant_ids){} : prog->constant_ids;
-		const auto redirection_table_size = full_reupload ? 468u : ::size32(prog->constant_ids);
-		instancing_indirection_table.resize(redirection_table_size);
-
-		// Temp constants data
-		auto& constants_data = m_scratch_buffers.u128buf;
-		constants_data.clear();
-		constants_data.reserve(redirection_table_size * draw_call.pass_count());
-
-		// Allocate indirection buffer on GPU stream
-		indirection_table_buf.reserve(instancing_indirection_table.size_bytes() * draw_call.pass_count());
-		auto indirection_out = indirection_table_buf.data<u32>();
-
-		rsx::instanced_draw_config_t instance_config;
-		u32 indirection_table_offset = 0;
-
-		// We now replay the draw call here to pack the data.
-		draw_call.begin();
-
-		// Write initial draw data.
-		std::iota(instancing_indirection_table.begin(), instancing_indirection_table.end(), 0);
-
-		constants_data.resize(redirection_table_size);
-		fill_vertex_program_constants_data(constants_data.data(), reloc_table);
-
-		// Next draw. We're guaranteed more than one draw call by the caller.
-		draw_call.next();
-
-		do
-		{
-			// Write previous state
-			std::memcpy(indirection_out + indirection_table_offset, instancing_indirection_table.data(), instancing_indirection_table.size_bytes());
-			indirection_table_offset += redirection_table_size;
-
-			// Decode next draw state
-			instance_config = {};
-			draw_call.execute_pipeline_dependencies(m_ctx, &instance_config);
-
-			if (!instance_config.transform_constants_data_changed)
-			{
-				continue;
-			}
-
-			const int translated_offset = full_reupload
-				? instance_config.patch_load_offset
-				: prog->translate_constants_range(instance_config.patch_load_offset, instance_config.patch_load_count);
-
-			if (translated_offset >= 0)
-			{
-				// Trivially patchable in bulk
-				const u32 redirection_loc = ::size32(constants_data);
-				constants_data.resize(::size32(constants_data) + instance_config.patch_load_count);
-				std::memcpy(constants_data.data() + redirection_loc, &REGS(m_ctx)->transform_constants[instance_config.patch_load_offset], instance_config.patch_load_count * sizeof(u128));
-
-				// Update indirection table
-				for (auto i = translated_offset, count = 0;
-					 static_cast<u32>(count) < instance_config.patch_load_count;
-					 ++i, ++count)
-				{
-					instancing_indirection_table[i] = redirection_loc + count;
-				}
-
-				continue;
-			}
-
-			ensure(!full_reupload);
-
-			// Sparse update. Update records individually instead of bulk
-			// FIXME: Range batching optimization
-			const auto load_end = instance_config.patch_load_offset + instance_config.patch_load_count;
-			for (u32 i = 0; i < redirection_table_size; ++i)
-			{
-				const auto read_index = prog->constant_ids[i];
-				if (read_index < instance_config.patch_load_offset || read_index >= load_end)
-				{
-					// Reading outside "hot" range.
-					continue;
-				}
-
-				const u32 redirection_loc = ::size32(constants_data);
-				constants_data.resize(::size32(constants_data) + 1);
-				std::memcpy(constants_data.data() + redirection_loc, &REGS(m_ctx)->transform_constants[read_index], sizeof(u128));
-
-				instancing_indirection_table[i] = redirection_loc;
-			}
-
-		} while (draw_call.next());
-
-		// Tail
-		ensure(indirection_table_offset < (instancing_indirection_table.size() * draw_call.pass_count()));
-		std::memcpy(indirection_out + indirection_table_offset, instancing_indirection_table.data(), instancing_indirection_table.size_bytes());
-
-		// Now write the constants to the GPU buffer
-		constants_data_array_buffer.reserve(constants_data.size_bytes());
-		std::memcpy(constants_data_array_buffer.data(), constants_data.data(), constants_data.size_bytes());
-	}
-}
diff --git a/rpcs3/Emu/RSX/Core/RSXDrawCommands.h b/rpcs3/Emu/RSX/Core/RSXDrawCommands.h
deleted file mode 100644
index fd61a9a67c..0000000000
--- a/rpcs3/Emu/RSX/Core/RSXDrawCommands.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-
-#include "Emu/RSX/Common/simple_array.hpp"
-#include "Emu/RSX/Core/RSXVertexTypes.h"
-#include "Emu/RSX/NV47/FW/draw_call.hpp"
-#include "Emu/RSX/Program/ProgramStateCache.h"
-#include "Emu/RSX/rsx_vertex_data.h"
-
-#include <span>
-#include <variant>
-
-namespace rsx
-{
-	struct rsx_state;
-	struct context;
-	class io_buffer;
-
-	class draw_command_processor
-	{
-		using vertex_program_metadata_t = program_hash_util::vertex_program_utils::vertex_program_metadata;
-
-		context* m_ctx = nullptr;
-
-	protected:
-		friend class thread;
-
-		std::array<push_buffer_vertex_info, 16> m_vertex_push_buffers;
-		rsx::simple_array<u32> m_element_push_buffer;
-
-		struct
-		{
-			rsx::simple_array<u32> u32buf;
-			rsx::simple_array<u128> u128buf;
-		} mutable m_scratch_buffers;
-
-	public:
-		draw_command_processor() = default;
-
-		void init(context* ctx)
-		{
-			m_ctx = ctx;
-		}
-
-		// Analyze vertex inputs and group all interleaved blocks
-		void analyse_inputs_interleaved(vertex_input_layout& layout, const vertex_program_metadata_t& vp_metadata);
-
-		// Retrieve raw bytes for the index array (untyped)
-		std::span<const std::byte> get_raw_index_array(const draw_clause& draw_indexed_clause) const;
-
-		// Get compiled draw command for backend rendering
-		std::variant<draw_array_command, draw_indexed_array_command, draw_inlined_array>
-			get_draw_command(const rsx::rsx_state& state) const;
-
-		// Push-buffers for immediate rendering (begin-end scopes)
-		void append_to_push_buffer(u32 attribute, u32 size, u32 subreg_index, vertex_base_type type, u32 value);
-
-		u32 get_push_buffer_vertex_count() const;
-
-		void append_array_element(u32 index);
-
-		u32 get_push_buffer_index_count() const;
-
-		void clear_push_buffers();
-
-		const std::span<const u32> element_push_buffer() const
-		{
-			return m_element_push_buffer;
-		}
-
-		// Host driver helpers
-		void fill_vertex_layout_state(
-			const vertex_input_layout& layout,
-			const vertex_program_metadata_t& vp_metadata,
-			u32 first_vertex,
-			u32 vertex_count,
-			s32* buffer,
-			u32 persistent_offset_base,
-			u32 volatile_offset_base) const;
-
-		void write_vertex_data_to_memory(
-			const vertex_input_layout& layout,
-			u32 first_vertex,
-			u32 vertex_count,
-			void* persistent_data,
-			void* volatile_data) const;
-
-		/**
-		 * Fill buffer with 4x4 scale offset matrix.
-		 * Vertex shader's position is to be multiplied by this matrix.
-		 * if flip_y is set, the matrix is modified to use d3d convention.
-		 */
-		void fill_scale_offset_data(void* buffer, bool flip_y) const;
-
-		/**
-		 * Fill buffer with user clip information
-		 */
-		void fill_user_clip_data(void* buffer) const;
-
-		/**
-		* Fill buffer with vertex program constants.
-		* Relocation table allows to do a partial fill with only selected registers.
-		*/
-		void fill_vertex_program_constants_data(void* buffer, const std::span<const u16>& reloc_table) const;
-
-		/**
-		 * Fill buffer with fragment rasterization state.
-		 * Fills current fog values, alpha test parameters and texture scaling parameters
-		 */
-		void fill_fragment_state_buffer(void* buffer, const RSXFragmentProgram& fragment_program) const;
-
-		// Fill instancing buffers. A single iobuf is used for both. 256byte alignment enforced to allow global bind
-		// Returns offsets to the index redirection lookup table and constants field array
-		void fill_constants_instancing_buffer(rsx::io_buffer& indirection_table_buf, rsx::io_buffer& constants_data_array_buffer, const VertexProgramBase* prog) const;
-	};
-}
diff --git a/rpcs3/Emu/RSX/Core/RSXDriverState.h b/rpcs3/Emu/RSX/Core/RSXDriverState.h
deleted file mode 100644
index 16dd08c78d..0000000000
--- a/rpcs3/Emu/RSX/Core/RSXDriverState.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-
-namespace rsx
-{
-	enum pipeline_state : u32
-	{
-		fragment_program_ucode_dirty = (1 << 0),   // Fragment program ucode changed
-		vertex_program_ucode_dirty   = (1 << 1),   // Vertex program ucode changed
-		fragment_program_state_dirty = (1 << 2),   // Fragment program state changed
-		vertex_program_state_dirty   = (1 << 3),   // Vertex program state changed
-		fragment_state_dirty         = (1 << 4),   // Fragment state changed (alpha test, etc)
-		vertex_state_dirty           = (1 << 5),   // Vertex state changed (scale_offset, clip planes, etc)
-		transform_constants_dirty    = (1 << 6),   // Transform constants changed
-		fragment_constants_dirty     = (1 << 7),   // Fragment constants changed
-		framebuffer_reads_dirty      = (1 << 8),   // Framebuffer contents changed
-		fragment_texture_state_dirty = (1 << 9),   // Fragment texture parameters changed
-		vertex_texture_state_dirty   = (1 << 10),  // Fragment texture parameters changed
-		scissor_config_state_dirty   = (1 << 11),  // Scissor region changed
-		zclip_config_state_dirty     = (1 << 12),  // Viewport Z clip changed
-
-		scissor_setup_invalid        = (1 << 13),  // Scissor configuration is broken
-		scissor_setup_clipped        = (1 << 14),  // Scissor region is cropped by viewport constraint
-
-		polygon_stipple_pattern_dirty = (1 << 15),  // Rasterizer stippling pattern changed
-		line_stipple_pattern_dirty    = (1 << 16),  // Line stippling pattern changed
-
-		push_buffer_arrays_dirty      = (1 << 17),   // Push buffers have data written to them (immediate mode vertex buffers)
-
-		polygon_offset_state_dirty    = (1 << 18), // Polygon offset config was changed
-		depth_bounds_state_dirty      = (1 << 19), // Depth bounds configuration changed
-
-		pipeline_config_dirty         = (1 << 20), // Generic pipeline configuration changes. Shader peek hint.
-
-		rtt_config_dirty              = (1 << 21), // Render target configuration changed
-		rtt_config_contested          = (1 << 22), // Render target configuration is indeterminate
-		rtt_config_valid              = (1 << 23), // Render target configuration is valid
-		rtt_cache_state_dirty         = (1 << 24), // Texture cache state is indeterminate
-
-		xform_instancing_state_dirty  = (1 << 25), // Transform instancing state has changed
-
-		// TODO - Should signal that we simply need to do a FP compare before the next draw call and invalidate the ucode if the content has changed.
-		// Marking as dirty to invalidate hot cache also works, it's not like there's tons of barriers per frame anyway.
-		fragment_program_needs_rehash = fragment_program_ucode_dirty,
-
-		fragment_program_dirty = fragment_program_ucode_dirty | fragment_program_state_dirty,
-		vertex_program_dirty = vertex_program_ucode_dirty | vertex_program_state_dirty,
-		invalidate_pipeline_bits = fragment_program_dirty | vertex_program_dirty | xform_instancing_state_dirty,
-		invalidate_zclip_bits = vertex_state_dirty | zclip_config_state_dirty,
-		memory_barrier_bits = framebuffer_reads_dirty,
-
-		// Vulkan-specific signals
-		invalidate_vk_dynamic_state = zclip_config_state_dirty | scissor_config_state_dirty | polygon_offset_state_dirty | depth_bounds_state_dirty,
-
-		all_dirty = ~0u
-	};
-}
diff --git a/rpcs3/Emu/RSX/Core/RSXEngLock.hpp b/rpcs3/Emu/RSX/Core/RSXEngLock.hpp
deleted file mode 100644
index 8c50e38f15..0000000000
--- a/rpcs3/Emu/RSX/Core/RSXEngLock.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include "../RSXThread.h"
-
-namespace rsx
-{
-	class eng_lock
-	{
-		rsx::thread* pthr;
-
-	public:
-		eng_lock(rsx::thread* target)
-			:pthr(target)
-		{
-			if (pthr->is_current_thread())
-			{
-				pthr = nullptr;
-			}
-			else
-			{
-				pthr->pause();
-			}
-		}
-
-		~eng_lock()
-		{
-			if (pthr) pthr->unpause();
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/Core/RSXFrameBuffer.h b/rpcs3/Emu/RSX/Core/RSXFrameBuffer.h
deleted file mode 100644
index fc623fd360..0000000000
--- a/rpcs3/Emu/RSX/Core/RSXFrameBuffer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include "../gcm_enums.h"
-#include "../GCM.h"
-
-namespace rsx
-{
-	struct tiled_region
-	{
-		u32 address;
-		u32 base;
-		GcmTileInfo* tile;
-		u8* ptr;
-
-		void write(const void* src, u32 width, u32 height, u32 pitch);
-		void read(void* dst, u32 width, u32 height, u32 pitch);
-	};
-
-	struct framebuffer_layout
-	{
-		ENABLE_BITWISE_SERIALIZATION;
-
-		u16 width;
-		u16 height;
-		std::array<u32, 4> color_addresses;
-		std::array<u32, 4> color_pitch;
-		std::array<u32, 4> actual_color_pitch;
-		std::array<bool, 4> color_write_enabled;
-		u32 zeta_address;
-		u32 zeta_pitch;
-		u32 actual_zeta_pitch;
-		bool zeta_write_enabled;
-		rsx::surface_target target;
-		rsx::surface_color_format color_format;
-		rsx::surface_depth_format2 depth_format;
-		rsx::surface_antialiasing aa_mode;
-		rsx::surface_raster_type raster_type;
-		u32 aa_factors[2];
-		bool ignore_change;
-	};
-}
diff --git a/rpcs3/Emu/RSX/Core/RSXIOMap.hpp b/rpcs3/Emu/RSX/Core/RSXIOMap.hpp
deleted file mode 100644
index 46d749c13b..0000000000
--- a/rpcs3/Emu/RSX/Core/RSXIOMap.hpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include "Utilities/mutex.h"
-#include "Emu/CPU/CPUThread.h"
-
-namespace rsx
-{
-	namespace iomap_helper
-	{
-		template <bool Shared>
-		struct io_lock
-		{
-			shared_mutex& ref;
-
-			io_lock(shared_mutex& obj)
-				: ref(obj)
-			{}
-
-			bool try_lock()
-			{
-				if constexpr (Shared)
-				{
-					return ref.try_lock_shared();
-				}
-
-				return ref.try_lock();
-			}
-
-			void lock()
-			{
-				if constexpr (Shared)
-				{
-					ref.lock_shared();
-					return;
-				}
-
-				ref.lock();
-			}
-		};
-	}
-
-	struct rsx_iomap_table
-	{
-		static constexpr u32 c_lock_stride = 8192;
-
-		std::array<atomic_t<u32>, 4096> ea;
-		std::array<atomic_t<u32>, 4096> io;
-		std::array<shared_mutex, 0x1'0000'0000 / c_lock_stride> rs;
-
-		rsx_iomap_table() noexcept;
-
-		// Try to get the real address given a mapped address
-		// Returns -1 on failure
-		u32 get_addr(u32 offs) const noexcept
-		{
-			return this->ea[offs >> 20] | (offs & 0xFFFFF);
-		}
-
-		template <bool IsFullLock, uint Stride>
-		bool lock(u32 addr, u32 len, cpu_thread* self = nullptr) noexcept
-		{
-			if (len <= 1) return false;
-			const u32 end = addr + len - 1;
-
-			bool added_wait = false;
-
-			for (u32 block = addr / c_lock_stride; block <= (end / c_lock_stride); block += Stride)
-			{
-				auto mutex_ = iomap_helper::io_lock<!IsFullLock>(rs[block]);
-
-				if (!mutex_.try_lock()) [[ unlikely ]]
-				{
-					if (self)
-					{
-						added_wait |= !self->state.test_and_set(cpu_flag::wait);
-					}
-
-					if (!self || self->get_class() != thread_class::rsx)
-					{
-						mutex_.lock();
-						continue;
-					}
-
-					while (!mutex_.try_lock())
-					{
-						self->cpu_wait({});
-					}
-				}
-			}
-
-			if (added_wait)
-			{
-				self->check_state();
-			}
-
-			return true;
-		}
-
-		template <bool IsFullLock, uint Stride>
-		void unlock(u32 addr, u32 len) noexcept
-		{
-			ensure(len >= 1);
-			const u32 end = addr + len - 1;
-
-			for (u32 block = (addr / 8192); block <= (end / 8192); block += Stride)
-			{
-				if constexpr (IsFullLock)
-				{
-					rs[block].unlock();
-				}
-				else
-				{
-					rs[block].unlock_shared();
-				}
-			}
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/Core/RSXReservationLock.hpp b/rpcs3/Emu/RSX/Core/RSXReservationLock.hpp
deleted file mode 100644
index 7a4ab76624..0000000000
--- a/rpcs3/Emu/RSX/Core/RSXReservationLock.hpp
+++ /dev/null
@@ -1,122 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include "../RSXThread.h"
-
-namespace rsx
-{
-	template<bool IsFullLock = false, uint Stride = 128>
-	class reservation_lock
-	{
-		u32 addr = 0;
-		u32 length = 0;
-
-		inline void lock_range(u32 addr, u32 length)
-		{
-			if (!get_current_renderer()->iomap_table.lock<IsFullLock, Stride>(addr, length, get_current_cpu_thread()))
-			{
-				length = 0;
-			}
-
-			this->addr = addr;
-			this->length = length;
-		}
-
-	public:
-		reservation_lock(u32 addr, u32 length)
-		{
-			if (g_cfg.core.rsx_accurate_res_access &&
-				addr < constants::local_mem_base)
-			{
-				lock_range(addr, length);
-			}
-		}
-
-		reservation_lock(u32 addr, u32 length, bool setting)
-		{
-			if (setting)
-			{
-				lock_range(addr, length);
-			}
-		}
-
-		// Multi-range lock. If ranges overlap, the combined range will be acquired.
-		// If ranges do not overlap, the first range that is in main memory will be acquired.
-		reservation_lock(u32 dst_addr, u32 dst_length, u32 src_addr, u32 src_length)
-		{
-			if (!g_cfg.core.rsx_accurate_res_access)
-			{
-				return;
-			}
-
-			const auto range1 = utils::address_range32::start_length(dst_addr, dst_length);
-			const auto range2 = utils::address_range32::start_length(src_addr, src_length);
-			utils::address_range32 target_range;
-
-			if (!range1.overlaps(range2)) [[likely]]
-			{
-				target_range = (dst_addr < constants::local_mem_base) ? range1 : range2;
-			}
-			else
-			{
-				// Very unlikely
-				target_range = range1.get_min_max(range2);
-			}
-
-			if (target_range.start < constants::local_mem_base)
-			{
-				lock_range(target_range.start, target_range.length());
-			}
-		}
-
-		// Very special utility for batched transfers (SPU related)
-		template <typename T = void>
-		void update_if_enabled(u32 addr, u32 _length, const std::add_pointer_t<T>& lock_release = std::add_pointer_t<void>{})
-		{
-			if (!length)
-			{
-				unlock();
-				return;
-			}
-
-			// This check is not perfect but it covers the important cases fast (this check is only an optimization - forcing true disables it)
-			const bool should_update =
-				(this->addr / rsx_iomap_table::c_lock_stride) != (addr / rsx_iomap_table::c_lock_stride) ||  // Lock-addr and test-addr have different locks, update
-				(addr % rsx_iomap_table::c_lock_stride + _length) > rsx_iomap_table::c_lock_stride;          // Test range spills beyond our base section
-
-			if (!should_update)
-			{
-				return;
-			}
-
-			if constexpr (!std::is_void_v<T>)
-			{
-				// See SPUThread.cpp
-				lock_release->release(0);
-			}
-
-			unlock();
-			lock_range(addr, _length);
-		}
-
-		void unlock(bool destructor = false)
-		{
-			if (!length)
-			{
-				return;
-			}
-
-			get_current_renderer()->iomap_table.unlock<IsFullLock, Stride>(addr, length);
-
-			if (!destructor)
-			{
-				length = 0;
-			}
-		}
-
-		~reservation_lock()
-		{
-			unlock(true);
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/Core/RSXVertexTypes.h b/rpcs3/Emu/RSX/Core/RSXVertexTypes.h
deleted file mode 100644
index 51cad0a4b4..0000000000
--- a/rpcs3/Emu/RSX/Core/RSXVertexTypes.h
+++ /dev/null
@@ -1,177 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include "../Common/simple_array.hpp"
-#include "../gcm_enums.h"
-
-#include <span>
-
-namespace rsx
-{
-	struct vertex_array_buffer
-	{
-		rsx::vertex_base_type type;
-		u8 attribute_size;
-		u8 stride;
-		std::span<const std::byte> data;
-		u8 index;
-		bool is_be;
-	};
-
-	struct vertex_array_register
-	{
-		rsx::vertex_base_type type;
-		u8 attribute_size;
-		std::array<u32, 4> data;
-		u8 index;
-	};
-
-	struct empty_vertex_array
-	{
-		u8 index;
-	};
-
-	struct draw_array_command
-	{
-		u32 __dummy;
-	};
-
-	struct draw_indexed_array_command
-	{
-		std::span<const std::byte> raw_index_buffer;
-	};
-
-	struct draw_inlined_array
-	{
-		u32 __dummy;
-		u32 __dummy2;
-	};
-
-	struct interleaved_attribute_t
-	{
-		u8 index;
-		bool modulo;
-		u16 frequency;
-	};
-
-	struct interleaved_range_info
-	{
-		bool interleaved = false;
-		bool single_vertex = false;
-		u32  base_offset = 0;
-		u32  real_offset_address = 0;
-		u8   memory_location = 0;
-		u8   attribute_stride = 0;
-		std::pair<u32, u32> vertex_range{};
-
-		rsx::simple_array<interleaved_attribute_t> locations;
-
-		// Check if we need to upload a full unoptimized range, i.e [0-max_index]
-		std::pair<u32, u32> calculate_required_range(u32 first, u32 count);
-	};
-
-	enum attribute_buffer_placement : u8
-	{
-		none = 0,
-		persistent = 1,
-		transient = 2
-	};
-
-	class vertex_input_layout
-	{
-		int m_num_used_blocks = 0;
-		std::array<interleaved_range_info, 16> m_blocks_data{};
-
-	public:
-		rsx::simple_array<interleaved_range_info*> interleaved_blocks{};  // Interleaved blocks to be uploaded as-is
-		std::vector<std::pair<u8, u32>> volatile_blocks{};                // Volatile data blocks (immediate draw vertex data for example)
-		rsx::simple_array<u8> referenced_registers{};                     // Volatile register data
-		u16 attribute_mask = 0;                                           // ATTRn mask
-
-		std::array<attribute_buffer_placement, 16> attribute_placement = fill_array(attribute_buffer_placement::none);
-
-		vertex_input_layout() = default;
-
-		interleaved_range_info* alloc_interleaved_block()
-		{
-			auto result = &m_blocks_data[m_num_used_blocks++];
-			result->attribute_stride = 0;
-			result->base_offset = 0;
-			result->memory_location = 0;
-			result->real_offset_address = 0;
-			result->single_vertex = false;
-			result->locations.clear();
-			result->interleaved = true;
-			result->vertex_range.second = 0;
-			return result;
-		}
-
-		void clear()
-		{
-			m_num_used_blocks = 0;
-			attribute_mask = 0;
-			interleaved_blocks.clear();
-			volatile_blocks.clear();
-			referenced_registers.clear();
-		}
-
-		bool validate() const
-		{
-			// Criteria: At least one array stream has to be defined to feed vertex positions
-			// This stream cannot be a const register as the vertices cannot create a zero-area primitive
-			if (!interleaved_blocks.empty() && interleaved_blocks[0]->attribute_stride != 0)
-				return true;
-
-			if (!volatile_blocks.empty())
-				return true;
-
-			for (u16 ref_mask = attribute_mask, index = 0; ref_mask; ++index, ref_mask >>= 1)
-			{
-				if (!(ref_mask & 1))
-				{
-					// Disabled
-					continue;
-				}
-
-				switch (attribute_placement[index])
-				{
-				case attribute_buffer_placement::transient:
-				{
-					// Ignore register reference
-					if (std::find(referenced_registers.begin(), referenced_registers.end(), index) != referenced_registers.end())
-						continue;
-
-					// The source is inline array or immediate draw push buffer
-					return true;
-				}
-				case attribute_buffer_placement::persistent:
-				{
-					return true;
-				}
-				case attribute_buffer_placement::none:
-				{
-					continue;
-				}
-				default:
-				{
-					fmt::throw_exception("Unreachable");
-				}
-				}
-			}
-
-			return false;
-		}
-
-		u32 calculate_interleaved_memory_requirements(u32 first_vertex, u32 vertex_count) const
-		{
-			u32 mem = 0;
-			for (auto& block : interleaved_blocks)
-			{
-				const auto range = block->calculate_required_range(first_vertex, vertex_count);
-				mem += range.second * block->attribute_stride;
-			}
-
-			return mem;
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/GCM.h b/rpcs3/Emu/RSX/GCM.h
index c61e9907a4..8a993bca2e 100644
--- a/rpcs3/Emu/RSX/GCM.h
+++ b/rpcs3/Emu/RSX/GCM.h
@@ -1,6 +1,9 @@
 #pragma once
 
 #include "Emu/Memory/vm_ptr.h"
+#include "gcm_enums.h"
+#include "util/atomic.hpp"
+
 
 struct CellGcmControl
 {
@@ -36,6 +39,7 @@ struct gcmInfo
 	u32 config_addr;
 	u32 context_addr;
 	u32 control_addr;
+	u32 label_addr;
 	u32 command_size = 0x400;
 	u32 segment_size = 0x100;
 };
@@ -95,8 +99,6 @@ struct CellGcmTileInfo
 
 struct GcmZcullInfo
 {
-	ENABLE_BITWISE_SERIALIZATION;
-
 	u32 offset;
 	u32 width;
 	u32 height;
@@ -112,15 +114,14 @@ struct GcmZcullInfo
 
 	CellGcmZcullInfo pack() const
 	{
-		CellGcmZcullInfo ret
-		{
-			.region = (1<<0) | (zFormat<<4) | (aaFormat<<8),
-			.size = ((width>>6)<<22) | ((height>>6)<<6),
-			.start = cullStart&(~0xFFF),
-			.offset = offset,
-			.status0 = (zcullDir<<1) | (zcullFormat<<2) | ((sFunc&0xF)<<12) | (sRef<<16) | (sMask<<24),
-			.status1 = (0x2000<<0) | (0x20<<16)
-		};
+		CellGcmZcullInfo ret;
+
+		ret.region = (1<<0) | (zFormat<<4) | (aaFormat<<8);
+		ret.size = ((width>>6)<<22) | ((height>>6)<<6);
+		ret.start = cullStart&(~0xFFF);
+		ret.offset = offset;
+		ret.status0 = (zcullDir<<1) | (zcullFormat<<2) | ((sFunc&0xF)<<12) | (sRef<<16) | (sMask<<24);
+		ret.status1 = (0x2000<<0) | (0x20<<16);
 
 		return ret;
 	}
@@ -128,8 +129,6 @@ struct GcmZcullInfo
 
 struct GcmTileInfo
 {
-	ENABLE_BITWISE_SERIALIZATION;
-
 	u32 location;
 	u32 offset;
 	u32 size;
@@ -141,13 +140,12 @@ struct GcmTileInfo
 
 	CellGcmTileInfo pack() const
 	{
-		CellGcmTileInfo ret
-		{
-			.tile = (location + 1) | (bank << 4) | ((offset / 0x10000) << 16) | (location << 31),
-			.limit = ((offset + size - 1) / 0x10000) << 16 | (location << 31),
-			.pitch = (pitch / 0x100) << 8,
-			.format = base | ((base + ((size - 1) / 0x10000)) << 13) | (comp << 26) | (1 << 30)
-		};
+		CellGcmTileInfo ret;
+
+		ret.tile = (location + 1) | (bank << 4) | ((offset / 0x10000) << 16) | (location << 31);
+		ret.limit = ((offset + size - 1) / 0x10000) << 16 | (location << 31);
+		ret.pitch = (pitch / 0x100) << 8;
+		ret.format = base | ((base + ((size - 1) / 0x10000)) << 13) | (comp << 26) | (1 << 30);
 
 		return ret;
 	}
diff --git a/rpcs3/Emu/RSX/GL/GLCompute.cpp b/rpcs3/Emu/RSX/GL/GLCompute.cpp
index 5607c149ed..ff19922581 100644
--- a/rpcs3/Emu/RSX/GL/GLCompute.cpp
+++ b/rpcs3/Emu/RSX/GL/GLCompute.cpp
@@ -1,29 +1,8 @@
 #include "GLCompute.h"
-#include "GLTexture.h"
 #include "Utilities/StrUtil.h"
 
 namespace gl
 {
-	struct bind_image_view_safe
-	{
-		GLuint m_layer;
-		GLenum m_target;
-		GLuint m_value;
-		gl::command_context& m_commands;
-
-		bind_image_view_safe(gl::command_context& cmd, GLuint layer, gl::texture_view* value)
-			: m_layer(layer), m_target(value->target()), m_commands(cmd)
-		{
-			m_value = cmd->get_bound_texture(layer, m_target);
-			value->bind(cmd, layer);
-		}
-
-		~bind_image_view_safe()
-		{
-			m_commands->bind_texture(m_layer, m_target, m_value);
-		}
-	};
-
 	void compute_task::initialize()
 	{
 		// Set up optimal kernel size
@@ -42,24 +21,13 @@ namespace gl
 			optimal_group_size = 128;
 		}
 
-		optimal_kernel_size = 256 / optimal_group_size;
-
 		glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 0, reinterpret_cast<GLint*>(&max_invocations_x));
-
-		initialized = true;
 	}
 
 	void compute_task::create()
 	{
-		if (!initialized)
-		{
-			initialize();
-		}
-
 		if (!compiled)
 		{
-			ensure(!m_src.empty(), "Compute shader is not initialized!");
-
 			m_shader.create(::glsl::program_domain::glsl_compute_program, m_src);
 			m_shader.compile();
 
@@ -82,16 +50,19 @@ namespace gl
 		}
 	}
 
-	void compute_task::run(gl::command_context& cmd, u32 invocations_x, u32 invocations_y)
+	void compute_task::run(u32 invocations_x, u32 invocations_y)
 	{
-		ensure(compiled && m_program.id() != GL_NONE);
-		bind_resources();
+		GLint old_program;
+		glGetIntegerv(GL_CURRENT_PROGRAM, &old_program);
 
-		cmd->use_program(m_program.id());
+		bind_resources();
+		m_program.use();
 		glDispatchCompute(invocations_x, invocations_y, 1);
+
+		glUseProgram(old_program);
 	}
 
-	void compute_task::run(gl::command_context& cmd, u32 num_invocations)
+	void compute_task::run(u32 num_invocations)
 	{
 		u32 invocations_x, invocations_y;
 		if (num_invocations <= max_invocations_x) [[likely]]
@@ -109,7 +80,7 @@ namespace gl
 			if (num_invocations % invocations_x) invocations_y++;
 		}
 
-		run(cmd, invocations_x, invocations_y);
+		run(invocations_x, invocations_y);
 	}
 
 	cs_shuffle_base::cs_shuffle_base()
@@ -133,19 +104,46 @@ namespace gl
 		kernel_size = _kernel_size? _kernel_size : optimal_kernel_size;
 
 		m_src =
-		#include "../Program/GLSLSnippets/ShuffleBytes.glsl"
-		;
+			"#version 430\n"
+			"layout(local_size_x=%ws, local_size_y=1, local_size_z=1) in;\n"
+			"layout(binding=%loc, std430) buffer ssbo{ uint data[]; };\n"
+			"%ub"
+			"\n"
+			"#define KERNEL_SIZE %ks\n"
+			"\n"
+			"// Generic swap routines\n"
+			"#define bswap_u16(bits)     (bits & 0xFF) << 8 | (bits & 0xFF00) >> 8 | (bits & 0xFF0000) << 8 | (bits & 0xFF000000) >> 8\n"
+			"#define bswap_u32(bits)     (bits & 0xFF) << 24 | (bits & 0xFF00) << 8 | (bits & 0xFF0000) >> 8 | (bits & 0xFF000000) >> 24\n"
+			"#define bswap_u16_u32(bits) (bits & 0xFFFF) << 16 | (bits & 0xFFFF0000) >> 16\n"
+			"\n"
+			"// Depth format conversions\n"
+			"#define d24f_to_f32(bits) (bits << 7)\n"
+			"#define f32_to_d24f(bits) (bits >> 7)\n"
+			"\n"
+			"uint linear_invocation_id()\n"
+			"{\n"
+			"	uint size_in_x = (gl_NumWorkGroups.x * gl_WorkGroupSize.x);\n"
+			"	return (gl_GlobalInvocationID.y * size_in_x) + gl_GlobalInvocationID.x;\n"
+			"}\n"
+			"\n"
+			"%md"
+			"void main()\n"
+			"{\n"
+			"	uint invocation_id = linear_invocation_id();\n"
+			"	uint index = invocation_id * KERNEL_SIZE;\n"
+			"	uint value;\n"
+			"	%vars"
+			"\n";
 
-		const std::pair<std::string_view, std::string> syntax_replace[] =
+		const std::pair<std::string, std::string> syntax_replace[] =
 		{
-			{ "%set, ", ""},
 			{ "%loc", std::to_string(GL_COMPUTE_BUFFER_SLOT(0)) },
 			{ "%ws", std::to_string(optimal_group_size) },
 			{ "%ks", std::to_string(kernel_size) },
 			{ "%vars", variables },
 			{ "%f", function_name },
 			{ "%ub", uniforms },
-			{ "%md", method_declarations },
+			{ "%md", method_declarations }
 		};
 
 		m_src = fmt::replace_all(m_src, syntax_replace);
@@ -190,7 +188,7 @@ namespace gl
 		m_data->bind_range(gl::buffer::target::ssbo, GL_COMPUTE_BUFFER_SLOT(0), m_data_offset, m_data_length);
 	}
 
-	void cs_shuffle_base::run(gl::command_context& cmd, const gl::buffer* data, u32 data_length, u32 data_offset)
+	void cs_shuffle_base::run(const gl::buffer* data, u32 data_length, u32 data_offset)
 	{
 		m_data = data;
 		m_data_offset = data_offset;
@@ -207,11 +205,10 @@ namespace gl
 				"Required=%d bytes, Available=%d bytes", num_bytes_to_process, data->size());
 		}
 
-		compute_task::run(cmd, num_invocations);
+		compute_task::run(num_invocations);
 	}
 
-	template <bool SwapBytes>
-	cs_shuffle_d32fx8_to_x8d24f<SwapBytes>::cs_shuffle_d32fx8_to_x8d24f()
+	cs_shuffle_d32fx8_to_x8d24f::cs_shuffle_d32fx8_to_x8d24f()
 	{
 		uniforms = "uniform uint in_ptr, out_ptr;\n";
 
@@ -227,22 +224,15 @@ namespace gl
 			"		value |= stencil;\n"
 			"		data[index + out_ptr] = bswap_u32(value);\n";
 
-		if constexpr (!SwapBytes)
-		{
-			work_kernel = fmt::replace_all(work_kernel, "bswap_u32(value)", "value", 1);
-		}
-
 		cs_shuffle_base::build("");
 	}
 
-	template <bool SwapBytes>
-	void cs_shuffle_d32fx8_to_x8d24f<SwapBytes>::bind_resources()
+	void cs_shuffle_d32fx8_to_x8d24f::bind_resources()
 	{
 		m_data->bind_range(gl::buffer::target::ssbo, GL_COMPUTE_BUFFER_SLOT(0), m_data_offset, m_ssbo_length);
 	}
 
-	template <bool SwapBytes>
-	void cs_shuffle_d32fx8_to_x8d24f<SwapBytes>::run(gl::command_context& cmd, const gl::buffer* data, u32 src_offset, u32 dst_offset, u32 num_texels)
+	void cs_shuffle_d32fx8_to_x8d24f::run(const gl::buffer* data, u32 src_offset, u32 dst_offset, u32 num_texels)
 	{
 		u32 data_offset;
 		if (src_offset > dst_offset)
@@ -258,14 +248,10 @@ namespace gl
 
 		m_program.uniforms["in_ptr"] = src_offset - data_offset;
 		m_program.uniforms["out_ptr"] = dst_offset - data_offset;
-		cs_shuffle_base::run(cmd, data, num_texels * 4, data_offset);
+		cs_shuffle_base::run(data, num_texels * 4, data_offset);
 	}
 
-	template struct cs_shuffle_d32fx8_to_x8d24f<true>;
-	template struct cs_shuffle_d32fx8_to_x8d24f<false>;
-
-	template <bool SwapBytes>
-	cs_shuffle_x8d24f_to_d32fx8<SwapBytes>::cs_shuffle_x8d24f_to_d32fx8()
+	cs_shuffle_x8d24f_to_d32fx8::cs_shuffle_x8d24f_to_d32fx8()
 	{
 		uniforms = "uniform uint texel_count, in_ptr, out_ptr;\n";
 
@@ -282,22 +268,15 @@ namespace gl
 			"		data[index * 2 + out_offset] = d24f_to_f32(depth);\n"
 			"		data[index * 2 + (out_offset + 1)] = stencil;\n";
 
-		if constexpr (!SwapBytes)
-		{
-			work_kernel = fmt::replace_all(work_kernel, "value = bswap_u32(value)", "// value = bswap_u32(value)", 1);
-		}
-
 		cs_shuffle_base::build("");
 	}
 
-	template <bool SwapBytes>
-	void cs_shuffle_x8d24f_to_d32fx8<SwapBytes>::bind_resources()
+	void cs_shuffle_x8d24f_to_d32fx8::bind_resources()
 	{
 		m_data->bind_range(gl::buffer::target::ssbo, GL_COMPUTE_BUFFER_SLOT(0), m_data_offset, m_ssbo_length);
 	}
 
-	template <bool SwapBytes>
-	void cs_shuffle_x8d24f_to_d32fx8<SwapBytes>::run(gl::command_context& cmd, const gl::buffer* data, u32 src_offset, u32 dst_offset, u32 num_texels)
+	void cs_shuffle_x8d24f_to_d32fx8::run(const gl::buffer* data, u32 src_offset, u32 dst_offset, u32 num_texels)
 	{
 		u32 data_offset;
 		if (src_offset > dst_offset)
@@ -313,151 +292,6 @@ namespace gl
 
 		m_program.uniforms["in_ptr"] = src_offset - data_offset;
 		m_program.uniforms["out_ptr"] = dst_offset - data_offset;
-		cs_shuffle_base::run(cmd, data, num_texels * 4, data_offset);
-	}
-
-	template struct cs_shuffle_x8d24f_to_d32fx8<true>;
-	template struct cs_shuffle_x8d24f_to_d32fx8<false>;
-
-	cs_d24x8_to_ssbo::cs_d24x8_to_ssbo()
-	{
-		initialize();
-
-		const auto raw_data =
-		#include "../Program/GLSLSnippets/CopyD24x8ToBuffer.glsl"
-		;
-
-		const std::pair<std::string_view, std::string> repl_list[] =
-		{
-			{ "%set, ", "" },
-			{ "%loc", std::to_string(GL_COMPUTE_BUFFER_SLOT(0)) },
-			{ "%ws", std::to_string(optimal_group_size) },
-			{ "%wks", std::to_string(optimal_kernel_size) }
-		};
-
-		m_src = fmt::replace_all(raw_data, repl_list);
-	}
-
-	void cs_d24x8_to_ssbo::run(gl::command_context& cmd, gl::viewable_image* src, const gl::buffer* dst, u32 out_offset, const coordu& region, const gl::pixel_buffer_layout& layout)
-	{
-		const auto row_pitch = region.width;
-
-		m_program.uniforms["swap_bytes"] = layout.swap_bytes;
-		m_program.uniforms["output_pitch"] = row_pitch;
-		m_program.uniforms["region_offset"] = color2i(region.x, region.y);
-		m_program.uniforms["region_size"] = color2i(region.width, region.height);
-
-		auto depth_view = src->get_view(rsx::default_remap_vector.with_encoding(GL_REMAP_IDENTITY), gl::image_aspect::depth);
-		auto stencil_view = src->get_view(rsx::default_remap_vector.with_encoding(GL_REMAP_IDENTITY), gl::image_aspect::stencil);
-
-		if (!m_sampler)
-		{
-			m_sampler.create();
-			m_sampler.apply_defaults();
-		}
-
-		// This method is callable in sensitive code and must restore the GL state on exit
-		gl::saved_sampler_state save_sampler0(GL_COMPUTE_BUFFER_SLOT(0), m_sampler);
-		gl::saved_sampler_state save_sampler1(GL_COMPUTE_BUFFER_SLOT(1), m_sampler);
-
-		gl::bind_image_view_safe save_image1(cmd, GL_COMPUTE_BUFFER_SLOT(0), depth_view);
-		gl::bind_image_view_safe save_image2(cmd, GL_COMPUTE_BUFFER_SLOT(1), stencil_view);
-
-		dst->bind_range(gl::buffer::target::ssbo, GL_COMPUTE_BUFFER_SLOT(2), out_offset, row_pitch * 4 * region.height);
-
-		const int num_invocations = utils::aligned_div(region.width * region.height, optimal_kernel_size * optimal_group_size);
-		compute_task::run(cmd, num_invocations);
-	}
-
-	cs_rgba8_to_ssbo::cs_rgba8_to_ssbo()
-	{
-		initialize();
-
-		const auto raw_data =
-		#include "../Program/GLSLSnippets/CopyRGBA8ToBuffer.glsl"
-		;
-
-		const std::pair<std::string_view, std::string> repl_list[] =
-		{
-			{ "%set, ", "" },
-			{ "%loc", std::to_string(GL_COMPUTE_BUFFER_SLOT(0)) },
-			{ "%ws", std::to_string(optimal_group_size) },
-			{ "%wks", std::to_string(optimal_kernel_size) }
-		};
-
-		m_src = fmt::replace_all(raw_data, repl_list);
-	}
-
-	void cs_rgba8_to_ssbo::run(gl::command_context& cmd, gl::viewable_image* src, const gl::buffer* dst, u32 out_offset, const coordu& region, const gl::pixel_buffer_layout& layout)
-	{
-		const auto row_pitch = region.width;
-
-		m_program.uniforms["swap_bytes"] = layout.swap_bytes;
-		m_program.uniforms["output_pitch"] = row_pitch;
-		m_program.uniforms["region_offset"] = color2i(region.x, region.y);
-		m_program.uniforms["region_size"] = color2i(region.width, region.height);
-		m_program.uniforms["is_bgra"] = (layout.format == static_cast<GLenum>(gl::texture::format::bgra));
-		m_program.uniforms["block_width"] = static_cast<u32>(layout.size);
-
-		auto data_view = src->get_view(rsx::default_remap_vector.with_encoding(GL_REMAP_IDENTITY), gl::image_aspect::color);
-
-		if (!m_sampler)
-		{
-			m_sampler.create();
-			m_sampler.apply_defaults();
-		}
-
-		// This method is callable in sensitive code and must restore the GL state on exit
-		gl::saved_sampler_state save_sampler(GL_COMPUTE_BUFFER_SLOT(0), m_sampler);
-		gl::bind_image_view_safe save_image(cmd, GL_COMPUTE_BUFFER_SLOT(0), data_view);
-
-		dst->bind_range(gl::buffer::target::ssbo, GL_COMPUTE_BUFFER_SLOT(1), out_offset, row_pitch * 4 * region.height);
-
-		const int num_invocations = utils::aligned_div(region.width * region.height, optimal_kernel_size * optimal_group_size);
-		compute_task::run(cmd, num_invocations);
-	}
-
-	cs_ssbo_to_color_image::cs_ssbo_to_color_image()
-	{
-		initialize();
-
-		const auto raw_data =
-		#include "../Program/GLSLSnippets/CopyBufferToColorImage.glsl"
-		;
-
-		const std::pair<std::string_view, std::string> repl_list[] =
-		{
-			{ "%set, ", "" },
-			{ "%image_slot", std::to_string(GL_COMPUTE_IMAGE_SLOT(0)) },
-			{ "%ssbo_slot", std::to_string(GL_COMPUTE_BUFFER_SLOT(0)) },
-			{ "%ws", std::to_string(optimal_group_size) },
-			{ "%wks", std::to_string(optimal_kernel_size) }
-		};
-
-		m_src = fmt::replace_all(raw_data, repl_list);
-	}
-
-	void cs_ssbo_to_color_image::run(gl::command_context& cmd, const buffer* src, const texture_view* dst, const u32 src_offset, const coordu& dst_region, const pixel_buffer_layout& layout)
-	{
-		const u32 bpp = dst->image()->pitch() / dst->image()->width();
-		const u32 row_length = utils::align(dst_region.width * bpp, std::max<int>(layout.alignment, 1)) / bpp;
-
-		m_program.uniforms["swap_bytes"] = layout.swap_bytes;
-		m_program.uniforms["src_pitch"] = row_length;
-		m_program.uniforms["format"] = static_cast<GLenum>(dst->image()->get_internal_format());
-		m_program.uniforms["region_offset"] = color2i(dst_region.x, dst_region.y);
-		m_program.uniforms["region_size"] = color2i(dst_region.width, dst_region.height);
-
-		src->bind_range(gl::buffer::target::ssbo, GL_COMPUTE_BUFFER_SLOT(0), src_offset, row_length * bpp * dst_region.height);
-		glBindImageTexture(GL_COMPUTE_IMAGE_SLOT(0), dst->id(), 0, GL_FALSE, 0, GL_WRITE_ONLY, dst->view_format());
-
-		const int num_invocations = utils::aligned_div(dst_region.width * dst_region.height, optimal_kernel_size * optimal_group_size);
-		compute_task::run(cmd, num_invocations);
-	}
-
-	void cs_ssbo_to_color_image::run(gl::command_context& cmd, const buffer* src, texture* dst, const u32 src_offset, const coordu& dst_region, const pixel_buffer_layout& layout)
-	{
-		gl::nil_texture_view view(dst);
-		run(cmd, src, &view, src_offset, dst_region, layout);
+		cs_shuffle_base::run(data, num_texels * 4, data_offset);
 	}
 }
diff --git a/rpcs3/Emu/RSX/GL/GLCompute.h b/rpcs3/Emu/RSX/GL/GLCompute.h
index 54458c1f1c..de63ce477c 100644
--- a/rpcs3/Emu/RSX/GL/GLCompute.h
+++ b/rpcs3/Emu/RSX/GL/GLCompute.h
@@ -2,8 +2,6 @@
 
 #include "Emu/IdManager.h"
 #include "GLHelpers.h"
-#include "glutils/program.h"
-#include "../rsx_utils.h"
 
 #include <unordered_map>
 
@@ -15,7 +13,6 @@ namespace gl
 		gl::glsl::shader m_shader;
 		gl::glsl::program m_program;
 		bool compiled = false;
-		bool initialized = false;
 
 		// Device-specific options
 		bool unroll_loops = true;
@@ -23,15 +20,14 @@ namespace gl
 		u32 optimal_kernel_size = 1;
 		u32 max_invocations_x = 65535;
 
-		virtual ~compute_task() = default;
 		void initialize();
 		void create();
-		virtual void destroy();
+		void destroy();
 
 		virtual void bind_resources() {}
 
-		void run(gl::command_context& cmd, u32 invocations_x, u32 invocations_y);
-		void run(gl::command_context& cmd, u32 num_invocations);
+		void run(u32 invocations_x, u32 invocations_y);
+		void run(u32 num_invocations);
 	};
 
 	struct cs_shuffle_base : compute_task
@@ -44,16 +40,15 @@ namespace gl
 		std::string uniforms, variables, work_kernel, loop_advance, suffix, method_declarations;
 
 		cs_shuffle_base();
-		virtual ~cs_shuffle_base() = default;
 
 		void build(const char* function_name, u32 _kernel_size = 0);
 
 		void bind_resources() override;
 
-		void run(gl::command_context& cmd, const gl::buffer* data, u32 data_length, u32 data_offset = 0);
+		void run(const gl::buffer* data, u32 data_length, u32 data_offset = 0);
 	};
 
-	struct cs_shuffle_16 final : cs_shuffle_base
+	struct cs_shuffle_16 : cs_shuffle_base
 	{
 		// byteswap ushort
 		cs_shuffle_16()
@@ -62,7 +57,7 @@ namespace gl
 		}
 	};
 
-	struct cs_shuffle_32 final : cs_shuffle_base
+	struct cs_shuffle_32 : cs_shuffle_base
 	{
 		// byteswap_ulong
 		cs_shuffle_32()
@@ -71,7 +66,7 @@ namespace gl
 		}
 	};
 
-	struct cs_shuffle_32_16 final : cs_shuffle_base
+	struct cs_shuffle_32_16 : cs_shuffle_base
 	{
 		// byteswap_ulong + byteswap_ushort
 		cs_shuffle_32_16()
@@ -80,8 +75,7 @@ namespace gl
 		}
 	};
 
-	template <bool SwapBytes>
-	struct cs_shuffle_d32fx8_to_x8d24f final : cs_shuffle_base
+	struct cs_shuffle_d32fx8_to_x8d24f : cs_shuffle_base
 	{
 		u32 m_ssbo_length = 0;
 
@@ -89,11 +83,10 @@ namespace gl
 
 		void bind_resources() override;
 
-		void run(gl::command_context& cmd, const gl::buffer* data, u32 src_offset, u32 dst_offset, u32 num_texels);
+		void run(const gl::buffer* data, u32 src_offset, u32 dst_offset, u32 num_texels);
 	};
 
-	template <bool SwapBytes>
-	struct cs_shuffle_x8d24f_to_d32fx8 final : cs_shuffle_base
+	struct cs_shuffle_x8d24f_to_d32fx8 : cs_shuffle_base
 	{
 		u32 m_ssbo_length = 0;
 
@@ -101,11 +94,12 @@ namespace gl
 
 		void bind_resources() override;
 
-		void run(gl::command_context& cmd, const gl::buffer* data, u32 src_offset, u32 dst_offset, u32 num_texels);
+		void run(const gl::buffer* data, u32 src_offset, u32 dst_offset, u32 num_texels);
 	};
 
-	template <typename From, typename To, bool _SwapSrc = false, bool _SwapDst = false>
-	struct cs_fconvert_task final : cs_shuffle_base
+
+	template<typename From, typename To, bool _SwapSrc = false, bool _SwapDst = false>
+	struct cs_fconvert_task : cs_shuffle_base
 	{
 		u32 m_ssbo_length = 0;
 
@@ -210,7 +204,7 @@ namespace gl
 			m_data->bind_range(gl::buffer::target::ssbo, GL_COMPUTE_BUFFER_SLOT(0), m_data_offset, m_ssbo_length);
 		}
 
-		void run(gl::command_context& cmd, const gl::buffer* data, u32 src_offset, u32 src_length, u32 dst_offset)
+		void run(const gl::buffer* data, u32 src_offset, u32 src_length, u32 dst_offset)
 		{
 			u32 data_offset;
 			if (src_offset > dst_offset)
@@ -228,160 +222,17 @@ namespace gl
 			m_program.uniforms["in_ptr"] = src_offset - data_offset;
 			m_program.uniforms["out_ptr"] = dst_offset - data_offset;
 
-			cs_shuffle_base::run(cmd, data, src_length, data_offset);
+			cs_shuffle_base::run(data, src_length, data_offset);
 		}
 	};
 
-	// Reverse morton-order block arrangement
-	template <typename _BlockType, typename _BaseType, bool _SwapBytes>
-	struct cs_deswizzle_3d final : compute_task
-	{
-		union params_t
-		{
-			u32 data[7];
-
-			struct
-			{
-				u32 width;
-				u32 height;
-				u32 depth;
-				u32 logw;
-				u32 logh;
-				u32 logd;
-				u32 mipmaps;
-			};
-		}
-		params;
-
-		gl::buffer param_buffer;
-
-		const gl::buffer* src_buffer = nullptr;
-		const gl::buffer* dst_buffer = nullptr;
-		u32 in_offset = 0;
-		u32 out_offset = 0;
-		u32 block_length = 0;
-
-		cs_deswizzle_3d()
-		{
-			ensure((sizeof(_BlockType) & 3) == 0); // "Unsupported block type"
-
-			initialize();
-
-			m_src =
-			#include "../Program/GLSLSnippets/GPUDeswizzle.glsl"
-			;
-
-			std::string transform;
-			if constexpr (_SwapBytes)
-			{
-				if constexpr (sizeof(_BaseType) == 4)
-				{
-					transform = "bswap_u32";
-				}
-				else if constexpr (sizeof(_BaseType) == 2)
-				{
-					transform = "bswap_u16";
-				}
-				else
-				{
-					fmt::throw_exception("Unreachable");
-				}
-			}
-
-			const std::pair<std::string_view, std::string> syntax_replace[] =
-			{
-				{ "%set, ", ""},
-				{ "%loc", std::to_string(GL_COMPUTE_BUFFER_SLOT(0))},
-				{ "%push_block", fmt::format("binding=%d, std140", GL_COMPUTE_BUFFER_SLOT(2)) },
-				{ "%ws", std::to_string(optimal_group_size) },
-				{ "%_wordcount", std::to_string(sizeof(_BlockType) / 4) },
-				{ "%f", transform }
-			};
-
-			m_src = fmt::replace_all(m_src, syntax_replace);
-
-			param_buffer.create(gl::buffer::target::uniform, 32, nullptr, gl::buffer::memory_type::local, gl::buffer::usage::dynamic_update);
-		}
-
-		~cs_deswizzle_3d()
-		{
-			param_buffer.remove();
-		}
-
-		void bind_resources() override
-		{
-			src_buffer->bind_range(gl::buffer::target::ssbo, GL_COMPUTE_BUFFER_SLOT(0), in_offset, block_length);
-			dst_buffer->bind_range(gl::buffer::target::ssbo, GL_COMPUTE_BUFFER_SLOT(1), out_offset, block_length);
-			param_buffer.bind_range(gl::buffer::target::uniform, GL_COMPUTE_BUFFER_SLOT(2), 0, sizeof(params));
-		}
-
-		void set_parameters(gl::command_context& /*cmd*/)
-		{
-			param_buffer.sub_data(0, sizeof(params), params.data);
-		}
-
-		void run(gl::command_context& cmd, const gl::buffer* dst, u32 out_offset, const gl::buffer* src, u32 in_offset, u32 data_length, u32 width, u32 height, u32 depth, u32 mipmaps)
-		{
-			dst_buffer = dst;
-			src_buffer = src;
-
-			this->in_offset = in_offset;
-			this->out_offset = out_offset;
-			this->block_length = data_length;
-
-			params.width = width;
-			params.height = height;
-			params.depth = depth;
-			params.mipmaps = mipmaps;
-			params.logw = rsx::ceil_log2(width);
-			params.logh = rsx::ceil_log2(height);
-			params.logd = rsx::ceil_log2(depth);
-			set_parameters(cmd);
-
-			const u32 num_bytes_per_invocation = (sizeof(_BlockType) * optimal_group_size);
-			const u32 linear_invocations = utils::aligned_div(data_length, num_bytes_per_invocation);
-			compute_task::run(cmd, linear_invocations);
-		}
-	};
-
-	struct pixel_buffer_layout;
-
-	class cs_image_to_ssbo : public compute_task
-	{
-	protected:
-		gl::sampler_state m_sampler;
-
-	public:
-		void destroy() override { m_sampler.remove(); compute_task::destroy(); }
-		virtual void run(gl::command_context& cmd, gl::viewable_image* src, const gl::buffer* dst, u32 out_offset, const coordu& region, const gl::pixel_buffer_layout& layout) = 0;
-	};
-
-	struct cs_d24x8_to_ssbo final : cs_image_to_ssbo
-	{
-		cs_d24x8_to_ssbo();
-		void run(gl::command_context& cmd, gl::viewable_image* src, const gl::buffer* dst, u32 out_offset, const coordu& region, const gl::pixel_buffer_layout& layout) override;
-	};
-
-	struct cs_rgba8_to_ssbo final : cs_image_to_ssbo
-	{
-		cs_rgba8_to_ssbo();
-		void run(gl::command_context& cmd, gl::viewable_image* src, const gl::buffer* dst, u32 out_offset, const coordu& region, const gl::pixel_buffer_layout& layout) override;
-	};
-
-	struct cs_ssbo_to_color_image final : compute_task
-	{
-		cs_ssbo_to_color_image();
-		void run(gl::command_context& cmd, const buffer* src, const texture_view* dst, const u32 src_offset, const coordu& dst_region, const pixel_buffer_layout& layout);
-		void run(gl::command_context& cmd, const buffer* src, texture* dst, const u32 src_offset, const coordu& dst_region, const pixel_buffer_layout& layout);
-	};
-
 	// TODO: Replace with a proper manager
 	extern std::unordered_map<u32, std::unique_ptr<gl::compute_task>> g_compute_tasks;
 
 	template<class T>
 	T* get_compute_task()
 	{
-		u32 index = stx::typeindex<id_manager::typeinfo, T>();
+		u32 index = id_manager::typeinfo::get_index<T>();
 		auto &e = g_compute_tasks[index];
 
 		if (!e)
diff --git a/rpcs3/Emu/RSX/GL/GLDMA.cpp b/rpcs3/Emu/RSX/GL/GLDMA.cpp
deleted file mode 100644
index 3c12009f67..0000000000
--- a/rpcs3/Emu/RSX/GL/GLDMA.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "stdafx.h"
-#include "GLDMA.h"
-
-#include "Emu/Memory/vm.h"
-#include "Emu/RSX/GL/glutils/common.h"
-
-namespace gl
-{
-	static constexpr u32 s_dma_block_size = 0x10000;
-	static constexpr u32 s_dma_block_mask = ~(s_dma_block_size - 1);
-
-	std::unordered_map<u32, std::unique_ptr<dma_block>> g_dma_pool;
-
-	void dma_block::allocate(u32 base_address, u32 block_size)
-	{
-		// Since this is a userptr block, we don't need to move data around on resize. Just "claim" a different chunk and move on.
-		if (m_data)
-		{
-			m_data->remove();
-		}
-
-		void* userptr = vm::get_super_ptr(base_address);
-
-		m_data = std::make_unique<gl::buffer>();
-		m_data->create(buffer::target::array, block_size, userptr, buffer::memory_type::userptr, 0);
-		m_base_address = base_address;
-
-		// Some drivers may reject userptr input for whatever reason. Check that the state is still valid.
-		gl::check_state();
-	}
-
-	void* dma_block::map(const utils::address_range32& range) const
-	{
-		ensure(range.inside(this->range()));
-		return vm::get_super_ptr(range.start);
-	}
-
-	void dma_block::resize(u32 new_length)
-	{
-		if (new_length <= length())
-		{
-			return;
-		}
-
-		allocate(m_base_address, new_length);
-	}
-
-	void dma_block::set_parent(const dma_block* other)
-	{
-		ensure(this->range().inside(other->range()));
-		ensure(other != this);
-
-		m_parent = other;
-		if (m_data)
-		{
-			m_data->remove();
-			m_data.reset();
-		}
-	}
-
-	bool dma_block::can_map(const utils::address_range32& range) const
-	{
-		if (m_parent)
-		{
-			return m_parent->can_map(range);
-		}
-
-		return range.inside(this->range());
-	}
-
-	void clear_dma_resources()
-	{
-		g_dma_pool.clear();
-	}
-
-	utils::address_range32 to_dma_block_range(u32 start, u32 length)
-	{
-		const auto start_block_address = start & s_dma_block_mask;
-		const auto end_block_address = (start + length + s_dma_block_size - 1) & s_dma_block_mask;
-		return utils::address_range32::start_end(start_block_address, end_block_address);
-	}
-
-	const dma_block& get_block(u32 start, u32 length)
-	{
-		const auto block_range = to_dma_block_range(start, length);
-		auto& block = g_dma_pool[block_range.start];
-		if (!block)
-		{
-			block = std::make_unique<dma_block>();
-			block->allocate(block_range.start, block_range.length());
-			return *block;
-		}
-
-		const auto range = utils::address_range32::start_length(start, length);
-		if (block->can_map(range)) [[ likely ]]
-		{
-			return *block;
-		}
-
-		const auto owner = block->head();
-		const auto new_length = (block_range.end + 1) - owner->base_addr();
-		const auto search_end = (block_range.end + 1);
-
-		// 1. Resize to new length
-		ensure((new_length & ~s_dma_block_mask) == 0);
-		auto new_owner = std::make_unique<dma_block>();
-		new_owner->allocate(owner->base_addr(), new_length);
-
-		// 2. Acquire all the extras
-		for (u32 id = owner->base_addr() + s_dma_block_size;
-			 id < search_end;
-			 id += s_dma_block_size)
-		{
-			ensure((id % s_dma_block_size) == 0);
-			g_dma_pool[id]->set_parent(new_owner.get());
-		}
-
-		block = std::move(new_owner);
-		return *block;
-	}
-
-	dma_mapping_handle map_dma(u32 guest_address, u32 length)
-	{
-		auto& block = get_block(guest_address, length);
-		return { guest_address - block.base_addr(), block.get() };
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/GLDMA.h b/rpcs3/Emu/RSX/GL/GLDMA.h
deleted file mode 100644
index c5862f5166..0000000000
--- a/rpcs3/Emu/RSX/GL/GLDMA.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include "Utilities/address_range.h"
-
-#include "glutils/buffer_object.h"
-
-// TODO: Unify the DMA implementation across backends as part of RSX restructuring.
-namespace gl
-{
-	using dma_mapping_handle = std::pair<u32, gl::buffer*>;
-
-	dma_mapping_handle map_dma(u32 guest_addr, u32 length);
-	void clear_dma_resources();
-
-	// GL does not currently support mixed block types...
-	class dma_block
-	{
-	public:
-		dma_block() = default;
-
-		void allocate(u32 base_address, u32 block_size);
-		void resize(u32 new_length);
-		void* map(const utils::address_range32& range) const;
-
-		void set_parent(const dma_block* other);
-		const dma_block* head() const { return m_parent ? m_parent : this; }
-		bool can_map(const utils::address_range32& range) const;
-
-		u32 base_addr() const { return m_base_address; }
-		u32 length() const { return m_data ? static_cast<u32>(m_data->size()) : 0; }
-		bool empty() const { return length() == 0; }
-		buffer* get() const { return m_data.get(); }
-		utils::address_range32 range() const { return utils::address_range32::start_length(m_base_address, length()); }
-
-	protected:
-		u32 m_base_address = 0;
-		const dma_block* m_parent = nullptr;
-		std::unique_ptr<gl::buffer> m_data;
-	};
-}
diff --git a/rpcs3/Emu/RSX/GL/GLDraw.cpp b/rpcs3/Emu/RSX/GL/GLDraw.cpp
index 955bfbd59b..0da7ddc068 100644
--- a/rpcs3/Emu/RSX/GL/GLDraw.cpp
+++ b/rpcs3/Emu/RSX/GL/GLDraw.cpp
@@ -3,8 +3,6 @@
 #include "../rsx_methods.h"
 #include "../Common/BufferUtils.h"
 
-#include "Emu/RSX/NV47/HW/context_accessors.define.h"
-
 namespace gl
 {
 	GLenum comparison_op(rsx::comparison_function op)
@@ -50,11 +48,11 @@ namespace gl
 		case rsx::blend_equation::add: return GL_FUNC_ADD;
 		case rsx::blend_equation::min: return GL_MIN;
 		case rsx::blend_equation::max: return GL_MAX;
-		case rsx::blend_equation::subtract: return GL_FUNC_SUBTRACT;
-		case rsx::blend_equation::reverse_subtract_signed:
+		case rsx::blend_equation::substract: return GL_FUNC_SUBTRACT;
+		case rsx::blend_equation::reverse_substract_signed:
 			rsx_log.trace("blend equation reverse_subtract_signed used. Emulating using FUNC_REVERSE_SUBTRACT");
 			[[fallthrough]];
-		case rsx::blend_equation::reverse_subtract: return GL_FUNC_REVERSE_SUBTRACT;
+		case rsx::blend_equation::reverse_substract: return GL_FUNC_REVERSE_SUBTRACT;
 		case rsx::blend_equation::reverse_add_signed:
 		default:
 			rsx_log.error("Blend equation 0x%X is unimplemented!", static_cast<u32>(op));
@@ -139,201 +137,120 @@ void GLGSRender::update_draw_state()
 {
 	m_profiler.start();
 
-	gl_state.enable(GL_SCISSOR_TEST);
+	for (int index = 0; index < m_rtts.get_color_surface_count(); ++index)
+	{
+		bool color_mask_b = rsx::method_registers.color_mask_b(index);
+		bool color_mask_g = rsx::method_registers.color_mask_g(index);
+		bool color_mask_r = rsx::method_registers.color_mask_r(index);
+		bool color_mask_a = rsx::method_registers.color_mask_a(index);
+
+		if (rsx::method_registers.surface_color() == rsx::surface_color_format::g8b8)
+		{
+			//Map GB components onto RG
+			rsx::get_g8b8_r8g8_colormask(color_mask_r, color_mask_g, color_mask_b, color_mask_a);
+		}
+
+		gl_state.color_maski(index, color_mask_r, color_mask_g, color_mask_b, color_mask_a);
+	}
+
+	gl_state.depth_mask(rsx::method_registers.depth_write_enabled());
+	gl_state.stencil_mask(rsx::method_registers.stencil_mask());
+
+	gl_state.enable(rsx::method_registers.depth_clamp_enabled() || !rsx::method_registers.depth_clip_enabled(), GL_DEPTH_CLAMP);
+
+	if (gl_state.enable(rsx::method_registers.depth_test_enabled(), GL_DEPTH_TEST))
+	{
+		gl_state.depth_func(gl::comparison_op(rsx::method_registers.depth_func()));
+	}
+
+	if (gl::get_driver_caps().EXT_depth_bounds_test && (gl_state.enable(rsx::method_registers.depth_bounds_test_enabled(), GL_DEPTH_BOUNDS_TEST_EXT)))
+	{
+		gl_state.depth_bounds(rsx::method_registers.depth_bounds_min(), rsx::method_registers.depth_bounds_max());
+	}
+
+	if (gl::get_driver_caps().NV_depth_buffer_float_supported)
+	{
+		gl_state.depth_range(rsx::method_registers.clip_min(), rsx::method_registers.clip_max());
+	}
+
 	gl_state.enable(rsx::method_registers.dither_enabled(), GL_DITHER);
 
-	if (m_rtts.m_bound_depth_stencil.first)
+	if (gl_state.enable(rsx::method_registers.stencil_test_enabled(), GL_STENCIL_TEST))
 	{
-		// Z-buffer is active.
-		gl_state.depth_mask(rsx::method_registers.depth_write_enabled());
-		gl_state.stencil_mask(rsx::method_registers.stencil_mask());
+		glStencilFunc(gl::comparison_op(rsx::method_registers.stencil_func()),
+			rsx::method_registers.stencil_func_ref(),
+			rsx::method_registers.stencil_func_mask());
 
-		gl_state.enable(rsx::method_registers.depth_clamp_enabled() || !rsx::method_registers.depth_clip_enabled(), GL_DEPTH_CLAMP);
+		glStencilOp(gl::stencil_op(rsx::method_registers.stencil_op_fail()), gl::stencil_op(rsx::method_registers.stencil_op_zfail()),
+			gl::stencil_op(rsx::method_registers.stencil_op_zpass()));
 
-		if (gl_state.enable(rsx::method_registers.depth_test_enabled(), GL_DEPTH_TEST))
+		if (rsx::method_registers.two_sided_stencil_test_enabled())
 		{
-			gl_state.depth_func(gl::comparison_op(rsx::method_registers.depth_func()));
-		}
+			glStencilMaskSeparate(GL_BACK, rsx::method_registers.back_stencil_mask());
 
-		if (gl::get_driver_caps().EXT_depth_bounds_test_supported && (gl_state.enable(rsx::method_registers.depth_bounds_test_enabled(), GL_DEPTH_BOUNDS_TEST_EXT)))
-		{
-			gl_state.depth_bounds(rsx::method_registers.depth_bounds_min(), rsx::method_registers.depth_bounds_max());
-		}
+			glStencilFuncSeparate(GL_BACK, gl::comparison_op(rsx::method_registers.back_stencil_func()),
+				rsx::method_registers.back_stencil_func_ref(), rsx::method_registers.back_stencil_func_mask());
 
-		if (gl::get_driver_caps().NV_depth_buffer_float_supported)
-		{
-			gl_state.depth_range(rsx::method_registers.clip_min(), rsx::method_registers.clip_max());
-		}
-
-		if (gl_state.enable(rsx::method_registers.stencil_test_enabled(), GL_STENCIL_TEST))
-		{
-			gl_state.stencil_func(gl::comparison_op(rsx::method_registers.stencil_func()),
-				rsx::method_registers.stencil_func_ref(),
-				rsx::method_registers.stencil_func_mask());
-
-			gl_state.stencil_op(gl::stencil_op(rsx::method_registers.stencil_op_fail()), gl::stencil_op(rsx::method_registers.stencil_op_zfail()),
-				gl::stencil_op(rsx::method_registers.stencil_op_zpass()));
-
-			if (rsx::method_registers.two_sided_stencil_test_enabled())
-			{
-				gl_state.stencil_back_mask(rsx::method_registers.back_stencil_mask());
-
-				gl_state.stencil_back_func(gl::comparison_op(rsx::method_registers.back_stencil_func()),
-					rsx::method_registers.back_stencil_func_ref(), rsx::method_registers.back_stencil_func_mask());
-
-				gl_state.stencil_back_op(gl::stencil_op(rsx::method_registers.back_stencil_op_fail()),
-					gl::stencil_op(rsx::method_registers.back_stencil_op_zfail()), gl::stencil_op(rsx::method_registers.back_stencil_op_zpass()));
-			}
+			glStencilOpSeparate(GL_BACK, gl::stencil_op(rsx::method_registers.back_stencil_op_fail()),
+				gl::stencil_op(rsx::method_registers.back_stencil_op_zfail()), gl::stencil_op(rsx::method_registers.back_stencil_op_zpass()));
 		}
 	}
 
-	if (m_rtts.get_color_surface_count())
+	bool mrt_blend_enabled[] =
 	{
-		// Color buffer is active
-		const auto host_write_mask = rsx::get_write_output_mask(rsx::method_registers.surface_color());
-		for (int index = 0; index < m_rtts.get_color_surface_count(); ++index)
-		{
-			bool color_mask_b = rsx::method_registers.color_mask_b(index);
-			bool color_mask_g = rsx::method_registers.color_mask_g(index);
-			bool color_mask_r = rsx::method_registers.color_mask_r(index);
-			bool color_mask_a = rsx::method_registers.color_mask_a(index);
+		rsx::method_registers.blend_enabled(),
+		rsx::method_registers.blend_enabled_surface_1(),
+		rsx::method_registers.blend_enabled_surface_2(),
+		rsx::method_registers.blend_enabled_surface_3()
+	};
 
-			switch (rsx::method_registers.surface_color())
-			{
-			case rsx::surface_color_format::b8:
-				rsx::get_b8_colormask(color_mask_r, color_mask_g, color_mask_b, color_mask_a);
-				break;
-			case rsx::surface_color_format::g8b8:
-				rsx::get_g8b8_r8g8_colormask(color_mask_r, color_mask_g, color_mask_b, color_mask_a);
-				break;
-			default:
-				break;
-			}
+	if (mrt_blend_enabled[0] || mrt_blend_enabled[1] || mrt_blend_enabled[2] || mrt_blend_enabled[3])
+	{
+		glBlendFuncSeparate(gl::blend_factor(rsx::method_registers.blend_func_sfactor_rgb()),
+			gl::blend_factor(rsx::method_registers.blend_func_dfactor_rgb()),
+			gl::blend_factor(rsx::method_registers.blend_func_sfactor_a()),
+			gl::blend_factor(rsx::method_registers.blend_func_dfactor_a()));
 
-			gl_state.color_maski(
-				index,
-				color_mask_r && host_write_mask[0],
-				color_mask_g && host_write_mask[1],
-				color_mask_b && host_write_mask[2],
-				color_mask_a && host_write_mask[3]);
-		}
+		auto blend_colors = rsx::get_constant_blend_colors();
+		glBlendColor(blend_colors[0], blend_colors[1], blend_colors[2], blend_colors[3]);
 
-		// LogicOp and Blend are mutually exclusive. If both are enabled, LogicOp takes precedence.
-		// In OpenGL, this behavior is enforced in spec, but let's enforce it at renderer level as well.
-		if (gl_state.enable(rsx::method_registers.logic_op_enabled(), GL_COLOR_LOGIC_OP))
-		{
-			gl_state.logic_op(gl::logic_op(rsx::method_registers.logic_operation()));
-
-			gl_state.enablei(GL_FALSE, GL_BLEND, 0);
-			gl_state.enablei(GL_FALSE, GL_BLEND, 1);
-			gl_state.enablei(GL_FALSE, GL_BLEND, 2);
-			gl_state.enablei(GL_FALSE, GL_BLEND, 3);
-		}
-		else
-		{
-			bool mrt_blend_enabled[] =
-			{
-				rsx::method_registers.blend_enabled(),
-				rsx::method_registers.blend_enabled_surface_1(),
-				rsx::method_registers.blend_enabled_surface_2(),
-				rsx::method_registers.blend_enabled_surface_3()
-			};
-
-			if (mrt_blend_enabled[0] || mrt_blend_enabled[1] || mrt_blend_enabled[2] || mrt_blend_enabled[3])
-			{
-				glBlendFuncSeparate(gl::blend_factor(rsx::method_registers.blend_func_sfactor_rgb()),
-					gl::blend_factor(rsx::method_registers.blend_func_dfactor_rgb()),
-					gl::blend_factor(rsx::method_registers.blend_func_sfactor_a()),
-					gl::blend_factor(rsx::method_registers.blend_func_dfactor_a()));
-
-				auto blend_colors = rsx::get_constant_blend_colors();
-				glBlendColor(blend_colors[0], blend_colors[1], blend_colors[2], blend_colors[3]);
-
-				glBlendEquationSeparate(gl::blend_equation(rsx::method_registers.blend_equation_rgb()),
-					gl::blend_equation(rsx::method_registers.blend_equation_a()));
-			}
-
-			gl_state.enablei(mrt_blend_enabled[0], GL_BLEND, 0);
-			gl_state.enablei(mrt_blend_enabled[1], GL_BLEND, 1);
-			gl_state.enablei(mrt_blend_enabled[2], GL_BLEND, 2);
-			gl_state.enablei(mrt_blend_enabled[3], GL_BLEND, 3);
-		}
-
-		// Antialias control
-		if (backend_config.supports_hw_msaa)
-		{
-			gl_state.enable(/*REGS(m_ctx)->msaa_enabled()*/GL_MULTISAMPLE);
-
-			gl_state.enable(GL_SAMPLE_MASK);
-			gl_state.sample_mask(REGS(m_ctx)->msaa_sample_mask());
-
-			gl_state.enable(GL_SAMPLE_SHADING);
-			gl_state.min_sample_shading_rate(1.f);
-
-			gl_state.enable(GL_SAMPLE_COVERAGE);
-			gl_state.sample_coverage(1.f);
-		}
-
-		if (backend_config.supports_hw_a2c)
-		{
-			const bool hw_enable = backend_config.supports_hw_a2c_1spp || REGS(m_ctx)->surface_antialias() != rsx::surface_antialiasing::center_1_sample;
-			gl_state.enable(hw_enable && REGS(m_ctx)->msaa_alpha_to_coverage_enabled(), GL_SAMPLE_ALPHA_TO_COVERAGE);
-		}
-
-		if (backend_config.supports_hw_a2one)
-		{
-			gl_state.enable(REGS(m_ctx)->msaa_alpha_to_one_enabled(), GL_SAMPLE_ALPHA_TO_ONE);
-		}
+		glBlendEquationSeparate(gl::blend_equation(rsx::method_registers.blend_equation_rgb()),
+			gl::blend_equation(rsx::method_registers.blend_equation_a()));
 	}
 
-	switch (rsx::method_registers.current_draw_clause.primitive)
+	gl_state.enablei(mrt_blend_enabled[0], GL_BLEND, 0);
+	gl_state.enablei(mrt_blend_enabled[1], GL_BLEND, 1);
+	gl_state.enablei(mrt_blend_enabled[2], GL_BLEND, 2);
+	gl_state.enablei(mrt_blend_enabled[3], GL_BLEND, 3);
+
+	if (gl_state.enable(rsx::method_registers.logic_op_enabled(), GL_COLOR_LOGIC_OP))
 	{
-	case rsx::primitive_type::lines:
-	case rsx::primitive_type::line_loop:
-	case rsx::primitive_type::line_strip:
-		gl_state.line_width(rsx::method_registers.line_width() * rsx::get_resolution_scale());
-		gl_state.enable(rsx::method_registers.line_smooth_enabled(), GL_LINE_SMOOTH);
-		break;
-	default:
-		gl_state.enable(rsx::method_registers.poly_offset_point_enabled(), GL_POLYGON_OFFSET_POINT);
-		gl_state.enable(rsx::method_registers.poly_offset_line_enabled(), GL_POLYGON_OFFSET_LINE);
-		gl_state.enable(rsx::method_registers.poly_offset_fill_enabled(), GL_POLYGON_OFFSET_FILL);
-
-		// offset_bias is the constant factor, multiplied by the implementation factor R
-		// offset_scale is the slope factor, multiplied by the triangle slope factor M
-		const auto poly_offset_scale = rsx::method_registers.poly_offset_scale();
-		auto poly_offset_bias = rsx::method_registers.poly_offset_bias();
-
-		if (auto ds = m_rtts.m_bound_depth_stencil.second;
-			ds && ds->get_internal_format() == gl::texture::internal_format::depth24_stencil8)
-		{
-			// Check details in VKDraw.cpp about behaviour of RSX vs desktop D24X8 implementations
-			// TLDR, RSX expects R = 16,777,215 (2^24 - 1)
-			const auto& caps = gl::get_driver_caps();
-			if (caps.vendor_NVIDIA || caps.vendor_MESA)
-			{
-				// R derived to be 8388607 (2^23 - 1)
-				poly_offset_bias *= 0.5f;
-			}
-			else if (caps.vendor_AMD)
-			{
-				// R derived to be 4194303 (2^22 - 1)
-				poly_offset_bias *= 0.25f;
-			}
-		}
-		gl_state.polygon_offset(poly_offset_scale, poly_offset_bias);
-
-		if (gl_state.enable(rsx::method_registers.cull_face_enabled(), GL_CULL_FACE))
-		{
-			gl_state.cull_face(gl::cull_face(rsx::method_registers.cull_face_mode()));
-		}
-
-		gl_state.front_face(gl::front_face(rsx::method_registers.front_face_mode()));
-		break;
+		gl_state.logic_op(gl::logic_op(rsx::method_registers.logic_operation()));
 	}
 
-	// Clip planes
-	gl_state.clip_planes((current_vertex_program.output_mask >> CELL_GCM_ATTRIB_OUTPUT_UC0) & 0x3F);
+	gl_state.line_width(rsx::method_registers.line_width() * rsx::get_resolution_scale());
+	gl_state.enable(rsx::method_registers.line_smooth_enabled(), GL_LINE_SMOOTH);
+
+	gl_state.enable(rsx::method_registers.poly_offset_point_enabled(), GL_POLYGON_OFFSET_POINT);
+	gl_state.enable(rsx::method_registers.poly_offset_line_enabled(), GL_POLYGON_OFFSET_LINE);
+	gl_state.enable(rsx::method_registers.poly_offset_fill_enabled(), GL_POLYGON_OFFSET_FILL);
+
+	//offset_bias is the constant factor, multiplied by the implementation factor R
+	//offset_scale is the slope factor, multiplied by the triangle slope factor M
+	gl_state.polygon_offset(rsx::method_registers.poly_offset_scale(), rsx::method_registers.poly_offset_bias());
+
+	if (gl_state.enable(rsx::method_registers.cull_face_enabled(), GL_CULL_FACE))
+	{
+		gl_state.cull_face(gl::cull_face(rsx::method_registers.cull_face_mode()));
+	}
+
+	gl_state.front_face(gl::front_face(rsx::method_registers.front_face_mode()));
+
+	// Sample control
+	// TODO: MinSampleShading
+	//gl_state.enable(rsx::method_registers.msaa_enabled(), GL_MULTISAMPLE);
+	//gl_state.enable(rsx::method_registers.msaa_alpha_to_coverage_enabled(), GL_SAMPLE_ALPHA_TO_COVERAGE);
+	//gl_state.enable(rsx::method_registers.msaa_alpha_to_one_enabled(), GL_SAMPLE_ALPHA_TO_ONE);
 
 	//TODO
 	//NV4097_SET_ANISO_SPREAD
@@ -348,7 +265,7 @@ void GLGSRender::update_draw_state()
 	//NV4097_SET_CLIP_ID_TEST_ENABLE
 
 	// For OGL Z range is updated every draw as it is separate from viewport config
-	m_graphics_state.clear(rsx::pipeline_state::zclip_config_state_dirty);
+	m_graphics_state &= ~(rsx::pipeline_state::zclip_config_state_dirty);
 
 	m_frame_stats.setup_time += m_profiler.duration();
 }
@@ -369,7 +286,6 @@ void GLGSRender::load_texture_env()
 
 		auto sampler_state = static_cast<gl::texture_cache::sampled_image_descriptor*>(fs_sampler_state[i].get());
 		const auto& tex = rsx::method_registers.fragment_textures[i];
-		const auto previous_format_class = sampler_state->format_class;
 
 		if (m_samplers_dirty || m_textures_dirty[i] || m_gl_texture_cache.test_if_descriptor_expired(cmd, m_rtts, sampler_state, tex))
 		{
@@ -377,27 +293,8 @@ void GLGSRender::load_texture_env()
 			{
 				*sampler_state = m_gl_texture_cache.upload_texture(cmd, tex, m_rtts);
 
-				if (sampler_state->validate())
-				{
-					if (m_textures_dirty[i])
-					{
-						m_fs_sampler_states[i].apply(tex, fs_sampler_state[i].get());
-					}
-					else if (sampler_state->format_class != previous_format_class)
-					{
-						m_graphics_state |= rsx::fragment_program_state_dirty;
-					}
-
-					if (const auto texture_format = tex.format() & ~(CELL_GCM_TEXTURE_UN | CELL_GCM_TEXTURE_LN);
-						sampler_state->format_class != rsx::classify_format(texture_format) &&
-						(texture_format == CELL_GCM_TEXTURE_A8R8G8B8 || texture_format == CELL_GCM_TEXTURE_D8R8G8B8))
-					{
-						// Depth format redirected to BGRA8 resample stage. Do not filter to avoid bits leaking.
-						// If accurate graphics are desired, force a bitcast to COLOR as a workaround.
-						m_fs_sampler_states[i].set_parameteri(GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-						m_fs_sampler_states[i].set_parameteri(GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-					}
-				}
+				if (m_textures_dirty[i])
+					m_fs_sampler_states[i].apply(tex, fs_sampler_state[i].get());
 			}
 			else
 			{
@@ -418,7 +315,6 @@ void GLGSRender::load_texture_env()
 
 		auto sampler_state = static_cast<gl::texture_cache::sampled_image_descriptor*>(vs_sampler_state[i].get());
 		const auto& tex = rsx::method_registers.vertex_textures[i];
-		const auto previous_format_class = sampler_state->format_class;
 
 		if (m_samplers_dirty || m_vertex_textures_dirty[i] || m_gl_texture_cache.test_if_descriptor_expired(cmd, m_rtts, sampler_state, tex))
 		{
@@ -426,22 +322,11 @@ void GLGSRender::load_texture_env()
 			{
 				*sampler_state = m_gl_texture_cache.upload_texture(cmd, rsx::method_registers.vertex_textures[i], m_rtts);
 
-				if (sampler_state->validate())
-				{
-					if (m_vertex_textures_dirty[i])
-					{
-						m_vs_sampler_states[i].apply(tex, vs_sampler_state[i].get());
-					}
-					else if (sampler_state->format_class != previous_format_class)
-					{
-						m_graphics_state |= rsx::vertex_program_state_dirty;
-					}
-				}
+				if (m_vertex_textures_dirty[i])
+					m_vs_sampler_states[i].apply(tex, vs_sampler_state[i].get());
 			}
 			else
-			{
 				*sampler_state = {};
-			}
 
 			m_vertex_textures_dirty[i] = false;
 		}
@@ -460,6 +345,8 @@ void GLGSRender::bind_texture_env()
 		if (!(textures_ref & 1))
 			continue;
 
+		_SelectTexture(GL_FRAGMENT_TEXTURES_START + i);
+
 		gl::texture_view* view = nullptr;
 		auto sampler_state = static_cast<gl::texture_cache::sampled_image_descriptor*>(fs_sampler_state[i].get());
 
@@ -474,23 +361,26 @@ void GLGSRender::bind_texture_env()
 
 		if (view) [[likely]]
 		{
-			view->bind(cmd, GL_FRAGMENT_TEXTURES_START + i);
+			view->bind();
 
 			if (current_fragment_program.texture_state.redirected_textures & (1 << i))
 			{
+				_SelectTexture(GL_STENCIL_MIRRORS_START + i);
+
 				auto root_texture = static_cast<gl::viewable_image*>(view->image());
-				auto stencil_view = root_texture->get_view(rsx::default_remap_vector.with_encoding(gl::GL_REMAP_IDENTITY), gl::image_aspect::stencil);
-				stencil_view->bind(cmd, GL_STENCIL_MIRRORS_START + i);
+				auto stencil_view = root_texture->get_view(0xAAE4, rsx::default_remap_vector, gl::image_aspect::stencil);
+				stencil_view->bind();
 			}
 		}
 		else
 		{
 			auto target = gl::get_target(current_fragment_program.get_texture_dimension(i));
-			cmd->bind_texture(GL_FRAGMENT_TEXTURES_START + i, target, m_null_textures[target]->id());
+			glBindTexture(target, m_null_textures[target]->id());
 
 			if (current_fragment_program.texture_state.redirected_textures & (1 << i))
 			{
-				cmd->bind_texture(GL_STENCIL_MIRRORS_START + i, target, m_null_textures[target]->id());
+				_SelectTexture(GL_STENCIL_MIRRORS_START + i);
+				glBindTexture(target, m_null_textures[target]->id());
 			}
 		}
 	}
@@ -501,22 +391,23 @@ void GLGSRender::bind_texture_env()
 			continue;
 
 		auto sampler_state = static_cast<gl::texture_cache::sampled_image_descriptor*>(vs_sampler_state[i].get());
+		_SelectTexture(GL_VERTEX_TEXTURES_START + i);
 
 		if (rsx::method_registers.vertex_textures[i].enabled() &&
 			sampler_state->validate())
 		{
 			if (sampler_state->image_handle) [[likely]]
 			{
-				sampler_state->image_handle->bind(cmd, GL_VERTEX_TEXTURES_START + i);
+				sampler_state->image_handle->bind();
 			}
 			else
 			{
-				m_gl_texture_cache.create_temporary_subresource(cmd, sampler_state->external_subresource_desc)->bind(cmd, GL_VERTEX_TEXTURES_START + i);
+				m_gl_texture_cache.create_temporary_subresource(cmd, sampler_state->external_subresource_desc)->bind();
 			}
 		}
 		else
 		{
-			cmd->bind_texture(GL_VERTEX_TEXTURES_START + i, GL_TEXTURE_2D, GL_NONE);
+			glBindTexture(GL_TEXTURE_2D, GL_NONE);
 		}
 	}
 }
@@ -537,42 +428,31 @@ void GLGSRender::emit_geometry(u32 sub_index)
 		}
 	};
 
-	m_profiler.start();
-
 	auto& draw_call = rsx::method_registers.current_draw_clause;
 	const rsx::flags32_t vertex_state_mask = rsx::vertex_base_changed | rsx::vertex_arrays_changed;
-	const rsx::flags32_t vertex_state = (sub_index == 0) ? rsx::vertex_arrays_changed : draw_call.execute_pipeline_dependencies(m_ctx) & vertex_state_mask;
+	const rsx::flags32_t vertex_state = (sub_index == 0) ? rsx::vertex_arrays_changed : draw_call.execute_pipeline_dependencies() & vertex_state_mask;
 
 	if (vertex_state & rsx::vertex_arrays_changed)
 	{
-		m_draw_processor.analyse_inputs_interleaved(m_vertex_layout, current_vp_metadata);
+		analyse_inputs_interleaved(m_vertex_layout);
 	}
 	else if (vertex_state & rsx::vertex_base_changed)
 	{
 		// Rebase vertex bases instead of
 		for (auto& info : m_vertex_layout.interleaved_blocks)
 		{
-			info->vertex_range.second = 0;
 			const auto vertex_base_offset = rsx::method_registers.vertex_data_base_offset();
-			info->real_offset_address = rsx::get_address(rsx::get_vertex_offset_from_base(vertex_base_offset, info->base_offset), info->memory_location);
-		}
-	}
-	else
-	{
-		// Discard cached results
-		for (auto& info : m_vertex_layout.interleaved_blocks)
-		{
-			info->vertex_range.second = 0;
+			info.real_offset_address = rsx::get_address(rsx::get_vertex_offset_from_base(vertex_base_offset, info.base_offset), info.memory_location);
 		}
 	}
 
 	if (vertex_state && !m_vertex_layout.validate())
 	{
 		// No vertex inputs enabled
-		// Execute remaining pipeline barriers with NOP draw
+		// Execute remainining pipeline barriers with NOP draw
 		do
 		{
-			draw_call.execute_pipeline_dependencies(m_ctx);
+			draw_call.execute_pipeline_dependencies();
 		} while (draw_call.next());
 
 		draw_call.end();
@@ -603,25 +483,17 @@ void GLGSRender::emit_geometry(u32 sub_index)
 	const GLenum draw_mode = gl::draw_mode(draw_call.primitive);
 	update_vertex_env(upload_info);
 
-	m_frame_stats.vertex_upload_time += m_profiler.duration();
-
-	gl_state.use_program(m_program->id());
-
 	if (!upload_info.index_info)
 	{
-		if (draw_call.is_trivial_instanced_draw)
-		{
-			glDrawArraysInstanced(draw_mode, 0, upload_info.vertex_draw_count, draw_call.pass_count());
-		}
-		else if (draw_call.is_single_draw())
+		if (draw_call.is_single_draw())
 		{
 			glDrawArrays(draw_mode, 0, upload_info.vertex_draw_count);
 		}
 		else
 		{
-			const auto& subranges = draw_call.get_subranges();
+			const auto subranges = draw_call.get_subranges();
 			const auto draw_count = subranges.size();
-			const auto& driver_caps = gl::get_driver_caps();
+			const auto driver_caps = gl::get_driver_caps();
 			bool use_draw_arrays_fallback = false;
 
 			m_scratch_buffer.resize(draw_count * 24);
@@ -631,7 +503,7 @@ void GLGSRender::emit_geometry(u32 sub_index)
 
 			u32 first = 0;
 			u32 dst_index = 0;
-			for (const auto& range : subranges)
+			for (const auto &range : subranges)
 			{
 				firsts[dst_index] = first;
 				counts[dst_index] = range.count;
@@ -639,7 +511,7 @@ void GLGSRender::emit_geometry(u32 sub_index)
 
 				if (driver_caps.vendor_AMD && (first + range.count) > (0x100000 >> 2))
 				{
-					// Unlikely, but added here in case the identity buffer is not large enough somehow
+					//Unlikely, but added here in case the identity buffer is not large enough somehow
 					use_draw_arrays_fallback = true;
 					break;
 				}
@@ -649,7 +521,7 @@ void GLGSRender::emit_geometry(u32 sub_index)
 
 			if (use_draw_arrays_fallback)
 			{
-				// MultiDrawArrays is broken on some primitive types using AMD. One known type is GL_TRIANGLE_STRIP but there could be more
+				//MultiDrawArrays is broken on some primitive types using AMD. One known type is GL_TRIANGLE_STRIP but there could be more
 				for (u32 n = 0; n < draw_count; ++n)
 				{
 					glDrawArrays(draw_mode, firsts[n], counts[n]);
@@ -657,13 +529,13 @@ void GLGSRender::emit_geometry(u32 sub_index)
 			}
 			else if (driver_caps.vendor_AMD)
 			{
-				// Use identity index buffer to fix broken vertexID on AMD
+				//Use identity index buffer to fix broken vertexID on AMD
 				m_identity_index_buffer->bind();
 				glMultiDrawElements(draw_mode, counts, GL_UNSIGNED_INT, offsets, static_cast<GLsizei>(draw_count));
 			}
 			else
 			{
-				// Normal render
+				//Normal render
 				glMultiDrawArrays(draw_mode, firsts, counts, static_cast<GLsizei>(draw_count));
 			}
 		}
@@ -681,11 +553,7 @@ void GLGSRender::emit_geometry(u32 sub_index)
 
 		m_index_ring_buffer->bind();
 
-		if (draw_call.is_trivial_instanced_draw)
-		{
-			glDrawElementsInstanced(draw_mode, upload_info.vertex_draw_count, index_type, reinterpret_cast<GLvoid*>(u64{ index_offset }), draw_call.pass_count());
-		}
-		else if (draw_call.is_single_draw())
+		if (draw_call.is_single_draw())
 		{
 			glDrawElements(draw_mode, upload_info.vertex_draw_count, index_type, reinterpret_cast<GLvoid*>(u64{index_offset}));
 		}
@@ -713,37 +581,26 @@ void GLGSRender::emit_geometry(u32 sub_index)
 			glMultiDrawElements(draw_mode, counts, index_type, offsets, static_cast<GLsizei>(draw_count));
 		}
 	}
-
-	m_frame_stats.draw_exec_time += m_profiler.duration();
 }
 
 void GLGSRender::begin()
 {
 	// Save shader state now before prefetch and loading happens
-	m_interpreter_state = (m_graphics_state.load() & rsx::pipeline_state::invalidate_pipeline_bits);
+	m_interpreter_state = (m_graphics_state & rsx::pipeline_state::invalidate_pipeline_bits);
 
 	rsx::thread::begin();
 
 	if (skip_current_frame || cond_render_ctrl.disable_rendering())
-	{
 		return;
-	}
 
 	init_buffers(rsx::framebuffer_creation_context::context_draw);
-
-	if (m_graphics_state & rsx::pipeline_state::invalidate_pipeline_bits)
-	{
-		// Shaders need to be reloaded.
-		m_prev_program = m_program;
-		m_program = nullptr;
-	}
 }
 
 void GLGSRender::end()
 {
 	m_profiler.start();
 
-	if (skip_current_frame || !m_graphics_state.test(rsx::rtt_config_valid) || cond_render_ctrl.disable_rendering())
+	if (skip_current_frame || !framebuffer_status_valid || cond_render_ctrl.disable_rendering())
 	{
 		execute_nop_draw();
 		rsx::thread::end();
@@ -751,7 +608,6 @@ void GLGSRender::end()
 	}
 
 	analyse_current_rsx_pipeline();
-
 	m_frame_stats.setup_time += m_profiler.duration();
 
 	// Active texture environment is used to decode shaders
@@ -778,6 +634,8 @@ void GLGSRender::end()
 	m_gl_texture_cache.release_uncached_temporary_subresources();
 	m_frame_stats.textures_upload_time += m_profiler.duration();
 
+	gl_state.enable(GL_FALSE, GL_SCISSOR_TEST);
+
 	gl::command_context cmd{ gl_state };
 	if (auto ds = std::get<1>(m_rtts.m_bound_depth_stencil)) ds->write_barrier(cmd);
 
@@ -789,6 +647,9 @@ void GLGSRender::end()
 		}
 	}
 
+	// Unconditionally enable stencil test if it was disabled before
+	gl_state.enable(GL_TRUE, GL_SCISSOR_TEST);
+
 	update_draw_state();
 
 	if (g_cfg.video.debug_output)
@@ -796,22 +657,15 @@ void GLGSRender::end()
 		m_program->validate();
 	}
 
-	auto& draw_call = REGS(m_ctx)->current_draw_clause;
-	draw_call.begin();
+	rsx::method_registers.current_draw_clause.begin();
 	u32 subdraw = 0u;
 	do
 	{
 		emit_geometry(subdraw++);
-
-		if (draw_call.is_trivial_instanced_draw)
-		{
-			// We already completed. End the draw.
-			draw_call.end();
-		}
 	}
-	while (draw_call.next());
+	while (rsx::method_registers.current_draw_clause.next());
 
-	m_rtts.on_write(m_framebuffer_layout.color_write_enabled, m_framebuffer_layout.zeta_write_enabled);
+	m_rtts.on_write(m_framebuffer_layout.color_write_enabled.data(), m_framebuffer_layout.zeta_write_enabled);
 
 	m_attrib_ring_buffer->notify();
 	m_index_ring_buffer->notify();
@@ -821,9 +675,8 @@ void GLGSRender::end()
 	m_vertex_layout_buffer->notify();
 	m_fragment_constants_buffer->notify();
 	m_transform_constants_buffer->notify();
-	m_instancing_ring_buffer->notify();
 
-	m_frame_stats.setup_time += m_profiler.duration();
+	m_frame_stats.textures_upload_time += m_profiler.duration();
 
 	rsx::thread::end();
 }
diff --git a/rpcs3/Emu/RSX/GL/GLExecutionState.h b/rpcs3/Emu/RSX/GL/GLExecutionState.h
new file mode 100644
index 0000000000..63f58bd432
--- /dev/null
+++ b/rpcs3/Emu/RSX/GL/GLExecutionState.h
@@ -0,0 +1,469 @@
+#pragma once
+
+#include "util/logs.hpp"
+#include "util/types.hpp"
+#include "Utilities/geometry.h"
+#include "OpenGL.h"
+
+#include <unordered_map>
+
+namespace gl
+{
+	class capabilities
+	{
+	public:
+		bool EXT_dsa_supported = false;
+		bool EXT_depth_bounds_test = false;
+		bool ARB_dsa_supported = false;
+		bool ARB_buffer_storage_supported = false;
+		bool ARB_texture_buffer_supported = false;
+		bool ARB_shader_draw_parameters_supported = false;
+		bool ARB_depth_buffer_float_supported = false;
+		bool ARB_texture_barrier_supported = false;
+		bool NV_texture_barrier_supported = false;
+		bool NV_gpu_shader5_supported = false;
+		bool AMD_gpu_shader_half_float_supported = false;
+		bool ARB_compute_shader_supported = false;
+		bool NV_depth_buffer_float_supported = false;
+		bool initialized = false;
+		bool vendor_INTEL = false;  // has broken GLSL compiler
+		bool vendor_AMD = false;    // has broken ARB_multidraw
+		bool vendor_NVIDIA = false; // has NaN poisoning issues
+		bool vendor_MESA = false;   // requires CLIENT_STORAGE bit set for streaming buffers
+
+		bool check(const std::string& ext_name, const char* test)
+		{
+			if (ext_name == test)
+			{
+				rsx_log.notice("Extension %s is supported", ext_name);
+				return true;
+			}
+
+			return false;
+		}
+
+		void initialize()
+		{
+			int find_count = 13;
+			int ext_count = 0;
+			glGetIntegerv(GL_NUM_EXTENSIONS, &ext_count);
+			std::string vendor_string = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
+			std::string version_string = reinterpret_cast<const char*>(glGetString(GL_VERSION));
+			std::string renderer_string = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
+
+			for (int i = 0; i < ext_count; i++)
+			{
+				if (!find_count) break;
+
+				const std::string ext_name = reinterpret_cast<const char*>(glGetStringi(GL_EXTENSIONS, i));
+
+				if (check(ext_name, "GL_ARB_shader_draw_parameters"))
+				{
+					ARB_shader_draw_parameters_supported = true;
+					find_count--;
+					continue;
+				}
+
+				if (check(ext_name, "GL_EXT_direct_state_access"))
+				{
+					EXT_dsa_supported = true;
+					find_count--;
+					continue;
+				}
+
+				if (check(ext_name, "GL_ARB_direct_state_access"))
+				{
+					ARB_dsa_supported = true;
+					find_count--;
+					continue;
+				}
+
+				if (check(ext_name, "GL_ARB_buffer_storage"))
+				{
+					ARB_buffer_storage_supported = true;
+					find_count--;
+					continue;
+				}
+
+				if (check(ext_name, "GL_ARB_texture_buffer_object"))
+				{
+					ARB_texture_buffer_supported = true;
+					find_count--;
+					continue;
+				}
+
+				if (check(ext_name, "GL_ARB_depth_buffer_float"))
+				{
+					ARB_depth_buffer_float_supported = true;
+					find_count--;
+					continue;
+				}
+
+				if (check(ext_name, "GL_ARB_texture_barrier"))
+				{
+					ARB_texture_barrier_supported = true;
+					find_count--;
+					continue;
+				}
+
+				if (check(ext_name, "GL_NV_texture_barrier"))
+				{
+					NV_texture_barrier_supported = true;
+					find_count--;
+					continue;
+				}
+
+				if (check(ext_name, "GL_NV_gpu_shader5"))
+				{
+					NV_gpu_shader5_supported = true;
+					find_count--;
+					continue;
+				}
+
+				if (check(ext_name, "GL_AMD_gpu_shader_half_float"))
+				{
+					AMD_gpu_shader_half_float_supported = true;
+					find_count--;
+					continue;
+				}
+
+				if (check(ext_name, "GL_ARB_compute_shader"))
+				{
+					ARB_compute_shader_supported = true;
+					find_count--;
+					continue;
+				}
+
+				if (check(ext_name, "GL_EXT_depth_bounds_test"))
+				{
+					EXT_depth_bounds_test = true;
+					find_count--;
+					continue;
+				}
+
+				if (check(ext_name, "GL_NV_depth_buffer_float"))
+				{
+					NV_depth_buffer_float_supported = true;
+					find_count--;
+					continue;
+				}
+			}
+
+			// Check GL_VERSION and GL_RENDERER for the presence of Mesa
+			if (version_string.find("Mesa") != umax || renderer_string.find("Mesa") != umax)
+			{
+				vendor_MESA = true;
+			}
+
+			// Workaround for intel drivers which have terrible capability reporting
+			if (!vendor_string.empty())
+			{
+				std::transform(vendor_string.begin(), vendor_string.end(), vendor_string.begin(), ::tolower);
+			}
+			else
+			{
+				rsx_log.error("Failed to get vendor string from driver. Are we missing a context?");
+				vendor_string = "intel"; // lowest acceptable value
+			}
+
+			if (!vendor_MESA && vendor_string.find("intel") != umax)
+			{
+				int version_major = 0;
+				int version_minor = 0;
+
+				glGetIntegerv(GL_MAJOR_VERSION, &version_major);
+				glGetIntegerv(GL_MINOR_VERSION, &version_minor);
+
+				vendor_INTEL = true;
+
+				//Texture buffers moved into core at GL 3.3
+				if (version_major > 3 || (version_major == 3 && version_minor >= 3))
+					ARB_texture_buffer_supported = true;
+
+				//Check for expected library entry-points for some required functions
+				if (!ARB_buffer_storage_supported && glBufferStorage && glMapBufferRange)
+					ARB_buffer_storage_supported = true;
+
+				if (!ARB_dsa_supported && glGetTextureImage && glTextureBufferRange)
+					ARB_dsa_supported = true;
+
+				if (!EXT_dsa_supported && glGetTextureImageEXT && glTextureBufferRangeEXT)
+					EXT_dsa_supported = true;
+			}
+			else if (!vendor_MESA && vendor_string.find("nvidia") != umax)
+			{
+				vendor_NVIDIA = true;
+			}
+#ifdef _WIN32
+			else if (vendor_string.find("amd") != umax || vendor_string.find("ati") != umax)
+			{
+				vendor_AMD = true;
+			}
+#endif
+
+			initialized = true;
+		}
+	};
+
+	const capabilities& get_driver_caps();
+
+	struct driver_state
+	{
+		const u32 DEPTH_BOUNDS_MIN = 0xFFFF0001;
+		const u32 DEPTH_BOUNDS_MAX = 0xFFFF0002;
+		const u32 DEPTH_RANGE_MIN = 0xFFFF0003;
+		const u32 DEPTH_RANGE_MAX = 0xFFFF0004;
+
+		std::unordered_map<GLenum, u32> properties = {};
+		std::unordered_map<GLenum, std::array<u32, 4>> indexed_properties = {};
+
+		bool enable(u32 test, GLenum cap)
+		{
+			auto found = properties.find(cap);
+			if (found != properties.end() && found->second == test)
+				return !!test;
+
+			properties[cap] = test;
+
+			if (test)
+				glEnable(cap);
+			else
+				glDisable(cap);
+
+			return !!test;
+		}
+
+		bool enablei(u32 test, GLenum cap, u32 index)
+		{
+			auto found = indexed_properties.find(cap);
+			const bool exists = found != indexed_properties.end();
+
+			if (!exists)
+			{
+				indexed_properties[cap] = {};
+				indexed_properties[cap][index] = test;
+			}
+			else
+			{
+				if (found->second[index] == test)
+					return !!test;
+
+				found->second[index] = test;
+			}
+
+			if (test)
+				glEnablei(cap, index);
+			else
+				glDisablei(cap, index);
+
+			return !!test;
+		}
+
+		inline bool test_property(GLenum property, u32 test) const
+		{
+			auto found = properties.find(property);
+			if (found == properties.end())
+				return false;
+
+			return (found->second == test);
+		}
+
+		inline bool test_propertyi(GLenum property, u32 test, GLint index) const
+		{
+			auto found = indexed_properties.find(property);
+			if (found == indexed_properties.end())
+				return false;
+
+			return found->second[index] == test;
+		}
+
+		void depth_func(GLenum func)
+		{
+			if (!test_property(GL_DEPTH_FUNC, func))
+			{
+				glDepthFunc(func);
+				properties[GL_DEPTH_FUNC] = func;
+			}
+		}
+
+		void depth_mask(GLboolean mask)
+		{
+			if (!test_property(GL_DEPTH_WRITEMASK, mask))
+			{
+				glDepthMask(mask);
+				properties[GL_DEPTH_WRITEMASK] = mask;
+			}
+		}
+
+		void clear_depth(GLfloat depth)
+		{
+			u32 value = std::bit_cast<u32>(depth);
+			if (!test_property(GL_DEPTH_CLEAR_VALUE, value))
+			{
+				glClearDepth(depth);
+				properties[GL_DEPTH_CLEAR_VALUE] = value;
+			}
+		}
+
+		void stencil_mask(GLuint mask)
+		{
+			if (!test_property(GL_STENCIL_WRITEMASK, mask))
+			{
+				glStencilMask(mask);
+				properties[GL_STENCIL_WRITEMASK] = mask;
+			}
+		}
+
+		void clear_stencil(GLint stencil)
+		{
+			u32 value = std::bit_cast<u32>(stencil);
+			if (!test_property(GL_STENCIL_CLEAR_VALUE, value))
+			{
+				glClearStencil(stencil);
+				properties[GL_STENCIL_CLEAR_VALUE] = value;
+			}
+		}
+
+		void color_maski(GLint index, u32 mask)
+		{
+			if (!test_propertyi(GL_COLOR_WRITEMASK, mask, index))
+			{
+				glColorMaski(index, ((mask & 0x10) ? 1 : 0), ((mask & 0x20) ? 1 : 0), ((mask & 0x40) ? 1 : 0), ((mask & 0x80) ? 1 : 0));
+				indexed_properties[GL_COLOR_WRITEMASK][index] = mask;
+			}
+		}
+
+		void color_maski(GLint index, bool r, bool g, bool b, bool a)
+		{
+			u32 mask = 0;
+			if (r) mask |= 0x10;
+			if (g) mask |= 0x20;
+			if (b) mask |= 0x40;
+			if (a) mask |= 0x80;
+
+			color_maski(index, mask);
+		}
+
+		void clear_color(u8 r, u8 g, u8 b, u8 a)
+		{
+			u32 value = u32{r} | u32{g} << 8 | u32{b} << 16 | u32{a} << 24;
+			if (!test_property(GL_COLOR_CLEAR_VALUE, value))
+			{
+				glClearColor(r / 255.f, g / 255.f, b / 255.f, a / 255.f);
+				properties[GL_COLOR_CLEAR_VALUE] = value;
+			}
+		}
+
+		void clear_color(const color4f& color)
+		{
+			clear_color(static_cast<u8>(color.r * 255), static_cast<u8>(color.g * 255), static_cast<u8>(color.b * 255), static_cast<u8>(color.a * 255));
+		}
+
+		void depth_bounds(float min, float max)
+		{
+			u32 depth_min = std::bit_cast<u32>(min);
+			u32 depth_max = std::bit_cast<u32>(max);
+
+			if (!test_property(DEPTH_BOUNDS_MIN, depth_min) || !test_property(DEPTH_BOUNDS_MAX, depth_max))
+			{
+				if (get_driver_caps().NV_depth_buffer_float_supported)
+				{
+					glDepthBoundsdNV(min, max);
+				}
+				else
+				{
+					glDepthBoundsEXT(min, max);
+				}
+
+				properties[DEPTH_BOUNDS_MIN] = depth_min;
+				properties[DEPTH_BOUNDS_MAX] = depth_max;
+			}
+		}
+
+		void depth_range(float min, float max)
+		{
+			u32 depth_min = std::bit_cast<u32>(min);
+			u32 depth_max = std::bit_cast<u32>(max);
+
+			if (!test_property(DEPTH_RANGE_MIN, depth_min) || !test_property(DEPTH_RANGE_MAX, depth_max))
+			{
+				if (get_driver_caps().NV_depth_buffer_float_supported)
+				{
+					glDepthRangedNV(min, max);
+				}
+				else
+				{
+					glDepthRange(min, max);
+				}
+
+				properties[DEPTH_RANGE_MIN] = depth_min;
+				properties[DEPTH_RANGE_MAX] = depth_max;
+			}
+		}
+
+		void logic_op(GLenum op)
+		{
+			if (!test_property(GL_COLOR_LOGIC_OP, op))
+			{
+				glLogicOp(op);
+				properties[GL_COLOR_LOGIC_OP] = op;
+			}
+		}
+
+		void line_width(GLfloat width)
+		{
+			u32 value = std::bit_cast<u32>(width);
+
+			if (!test_property(GL_LINE_WIDTH, value))
+			{
+				glLineWidth(width);
+				properties[GL_LINE_WIDTH] = value;
+			}
+		}
+
+		void front_face(GLenum face)
+		{
+			if (!test_property(GL_FRONT_FACE, face))
+			{
+				glFrontFace(face);
+				properties[GL_FRONT_FACE] = face;
+			}
+		}
+
+		void cull_face(GLenum mode)
+		{
+			if (!test_property(GL_CULL_FACE_MODE, mode))
+			{
+				glCullFace(mode);
+				properties[GL_CULL_FACE_MODE] = mode;
+			}
+		}
+
+		void polygon_offset(float factor, float units)
+		{
+			u32 _units = std::bit_cast<u32>(units);
+			u32 _factor = std::bit_cast<u32>(factor);
+
+			if (!test_property(GL_POLYGON_OFFSET_UNITS, _units) || !test_property(GL_POLYGON_OFFSET_FACTOR, _factor))
+			{
+				glPolygonOffset(factor, units);
+
+				properties[GL_POLYGON_OFFSET_UNITS] = _units;
+				properties[GL_POLYGON_OFFSET_FACTOR] = _factor;
+			}
+		}
+	};
+
+	struct command_context
+	{
+		driver_state* drv;
+
+		command_context()
+			: drv(nullptr)
+		{}
+
+		command_context(driver_state& drv_)
+			: drv(&drv_)
+		{}
+	};
+}
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp
index 3c95d571d3..42a81f81ea 100644
--- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp
+++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp
@@ -3,8 +3,8 @@
 
 #include "Emu/system_config.h"
 #include "GLCommonDecompiler.h"
+#include "../GCM.h"
 #include "../Program/GLSLCommon.h"
-#include "../RSXThread.h"
 
 std::string GLFragmentDecompilerThread::getFloatTypeName(usz elementCount)
 {
@@ -28,65 +28,68 @@ std::string GLFragmentDecompilerThread::compareFunction(COMPARE f, const std::st
 
 void GLFragmentDecompilerThread::insertHeader(std::stringstream & OS)
 {
-	int gl_version = 430;
-	std::vector<std::string> required_extensions;
+	OS << "#version 430\n";
 
 	if (device_props.has_native_half_support)
 	{
-		const auto& driver_caps = gl::get_driver_caps();
+		const auto driver_caps = gl::get_driver_caps();
 		if (driver_caps.NV_gpu_shader5_supported)
 		{
-			required_extensions.push_back("GL_NV_gpu_shader5");
+			OS << "#extension GL_NV_gpu_shader5: require\n";
 		}
 		else if (driver_caps.AMD_gpu_shader_half_float_supported)
 		{
-			required_extensions.push_back("GL_AMD_gpu_shader_half_float");
+			OS << "#extension GL_AMD_gpu_shader_half_float: require\n";
 		}
 	}
 
-	if (properties.multisampled_sampler_mask)
-	{
-		// Requires this extension or GLSL 450
-		const auto& driver_caps = gl::get_driver_caps();
-		if (driver_caps.glsl_version.version >= 450)
-		{
-			gl_version = 450;
-		}
-		else
-		{
-			ensure(driver_caps.ARB_shader_texture_image_samples_supported, "MSAA support on OpenGL requires a driver running OpenGL 4.5 or supporting GL_ARB_shader_texture_image_samples.");
-			required_extensions.push_back("GL_ARB_shader_texture_image_samples");
-		}
-	}
-
-	if (m_prog.ctrl & RSX_SHADER_CONTROL_ATTRIBUTE_INTERPOLATION)
-	{
-		gl_version = std::max(gl_version, 450);
-		required_extensions.push_back("GL_NV_fragment_shader_barycentric");
-	}
-
-	OS << "#version " << gl_version << "\n";
-	for (const auto& ext : required_extensions)
-	{
-		OS << "#extension " << ext << ": require\n";
-	}
-
 	glsl::insert_subheader_block(OS);
 }
 
 void GLFragmentDecompilerThread::insertInputs(std::stringstream & OS)
 {
-	glsl::insert_fragment_shader_inputs_block(
-		OS,
-		glsl::extension_flavour::NV,
-		m_prog,
-		m_parr.params[PF_PARAM_IN],
+	for (const ParamType& PT : m_parr.params[PF_PARAM_IN])
+	{
+		for (const ParamItem& PI : PT.items)
 		{
-			.two_sided_color = !!(properties.in_register_mask & in_diff_color),
-			.two_sided_specular = !!(properties.in_register_mask & in_spec_color)
-		},
-		gl::get_varying_register_location
-	);
+			//ssa is defined in the program body and is not a varying type
+			if (PI.name == "ssa") continue;
+
+			const auto reg_location = gl::get_varying_register_location(PI.name);
+			std::string var_name = PI.name;
+
+			if (var_name == "fogc")
+			{
+				var_name = "fog_c";
+			}
+			else if (m_prog.two_sided_lighting)
+			{
+				if (var_name == "diff_color")
+				{
+					var_name = "diff_color0";
+				}
+				else if (var_name == "spec_color")
+				{
+					var_name = "spec_color0";
+				}
+			}
+
+			OS << "layout(location=" << reg_location << ") in vec4 " << var_name << ";\n";
+		}
+	}
+
+	if (m_prog.two_sided_lighting)
+	{
+		if (properties.in_register_mask & in_diff_color)
+		{
+			OS << "layout(location=" << gl::get_varying_register_location("diff_color1") << ") in vec4 diff_color1;\n";
+		}
+
+		if (properties.in_register_mask & in_spec_color)
+		{
+			OS << "layout(location=" << gl::get_varying_register_location("spec_color1") << ") in vec4 spec_color1;\n";
+		}
+	}
 }
 
 void GLFragmentDecompilerThread::insertOutputs(std::stringstream & OS)
@@ -125,14 +128,10 @@ void GLFragmentDecompilerThread::insertConstants(std::stringstream & OS)
 
 			const auto mask = (1 << index);
 
-			if (properties.multisampled_sampler_mask & mask)
+			if (properties.redirected_sampler_mask & mask)
 			{
-				if (samplerType != "sampler1D" && samplerType != "sampler2D")
-				{
-					rsx_log.error("Unexpected multisampled image type '%s'", samplerType);
-				}
-
-				samplerType = "sampler2DMS";
+				// Provide a stencil view of the main resource for the S channel
+				OS << "uniform u" << samplerType << " " << PI.name << "_stencil;\n";
 			}
 			else if (properties.shadow_sampler_mask & mask)
 			{
@@ -146,12 +145,6 @@ void GLFragmentDecompilerThread::insertConstants(std::stringstream & OS)
 				}
 			}
 
-			if (properties.redirected_sampler_mask & mask)
-			{
-				// Provide a stencil view of the main resource for the S channel
-				OS << "uniform u" << samplerType << " " << PI.name << "_stencil;\n";
-			}
-
 			OS << "uniform " << samplerType << " " << PI.name << ";\n";
 		}
 	}
@@ -175,13 +168,13 @@ void GLFragmentDecompilerThread::insertConstants(std::stringstream & OS)
 
 	if (!constants_block.empty())
 	{
-		OS << "layout(std140, binding = " << GL_FRAGMENT_CONSTANT_BUFFERS_BIND_SLOT << ") uniform FragmentConstantsBuffer\n";
+		OS << "layout(std140, binding = 3) uniform FragmentConstantsBuffer\n";
 		OS << "{\n";
 		OS << constants_block;
 		OS << "};\n\n";
 	}
 
-	OS << "layout(std140, binding = " << GL_FRAGMENT_STATE_BIND_SLOT << ") uniform FragmentStateBuffer\n";
+	OS << "layout(std140, binding = 4) uniform FragmentStateBuffer\n";
 	OS << "{\n";
 	OS << "	float fog_param0;\n";
 	OS << "	float fog_param1;\n";
@@ -193,7 +186,7 @@ void GLFragmentDecompilerThread::insertConstants(std::stringstream & OS)
 	OS << "	float wpos_bias;\n";
 	OS << "};\n\n";
 
-	OS << "layout(std140, binding = " << GL_FRAGMENT_TEXTURE_PARAMS_BIND_SLOT << ") uniform TextureParametersBuffer\n";
+	OS << "layout(std140, binding = 5) uniform TextureParametersBuffer\n";
 	OS << "{\n";
 	OS << "	sampler_info texture_parameters[16];\n";
 	OS << "};\n\n";
@@ -212,28 +205,24 @@ void GLFragmentDecompilerThread::insertGlobalFunctions(std::stringstream &OS)
 	m_shader_props.require_depth_conversion = properties.redirected_sampler_mask != 0;
 	m_shader_props.require_wpos = !!(properties.in_register_mask & in_wpos);
 	m_shader_props.require_texture_ops = properties.has_tex_op;
-	m_shader_props.require_tex_shadow_ops = properties.shadow_sampler_mask != 0;
-	m_shader_props.require_msaa_ops = properties.multisampled_sampler_mask != 0;
+	m_shader_props.require_shadow_ops = properties.shadow_sampler_mask != 0;
 	m_shader_props.require_texture_expand = properties.has_exp_tex_op;
 	m_shader_props.require_srgb_to_linear = properties.has_upg;
 	m_shader_props.require_linear_to_srgb = properties.has_pkg;
-	m_shader_props.require_fog_read = properties.in_register_mask & in_fogc;
-	m_shader_props.emulate_coverage_tests = !rsx::get_renderer_backend_config().supports_hw_a2c_1spp;
+	m_shader_props.emulate_coverage_tests = true; // g_cfg.video.antialiasing_level == msaa_level::none;
 	m_shader_props.emulate_shadow_compare = device_props.emulate_depth_compare;
-	m_shader_props.low_precision_tests = ::gl::get_driver_caps().vendor_NVIDIA && !(m_prog.ctrl & RSX_SHADER_CONTROL_ATTRIBUTE_INTERPOLATION);
+	m_shader_props.low_precision_tests = ::gl::get_driver_caps().vendor_NVIDIA;
 	m_shader_props.disable_early_discard = !::gl::get_driver_caps().vendor_NVIDIA;
 	m_shader_props.supports_native_fp16 = device_props.has_native_half_support;
-	m_shader_props.ROP_output_rounding = g_cfg.video.shader_precision != gpu_preset_level::low;
-	m_shader_props.require_tex1D_ops = properties.has_tex1D;
-	m_shader_props.require_tex2D_ops = properties.has_tex2D;
-	m_shader_props.require_tex3D_ops = properties.has_tex3D;
-	m_shader_props.require_shadowProj_ops = properties.shadow_sampler_mask != 0 && properties.has_texShadowProj;
 
 	glsl::insert_glsl_legacy_function(OS, m_shader_props);
 }
 
 void GLFragmentDecompilerThread::insertMainStart(std::stringstream & OS)
 {
+	if (properties.in_register_mask & in_fogc)
+		glsl::insert_fog_declaration(OS);
+
 	std::set<std::string> output_registers;
 	if (m_ctrl & CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS)
 	{
@@ -364,9 +353,9 @@ void GLFragmentProgram::Decompile(const RSXFragmentProgram& prog)
 	std::string source;
 	GLFragmentDecompilerThread decompiler(source, parr, prog, size);
 
-	if (g_cfg.video.shader_precision == gpu_preset_level::low)
+	if (!g_cfg.video.disable_native_float16)
 	{
-		const auto& driver_caps = gl::get_driver_caps();
+		const auto driver_caps = gl::get_driver_caps();
 		decompiler.device_props.has_native_half_support = driver_caps.NV_gpu_shader5_supported || driver_caps.AMD_gpu_shader_half_float_supported;
 		decompiler.device_props.has_low_precision_rounding = driver_caps.vendor_NVIDIA;
 	}
diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.h b/rpcs3/Emu/RSX/GL/GLFragmentProgram.h
index c6b5244389..ffd6904af7 100644
--- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.h
+++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../Program/FragmentProgramDecompiler.h"
 #include "../Program/GLSLTypes.h"
-#include "glutils/program.h"
+#include "GLHelpers.h"
 
 namespace glsl
 {
diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp
index 1470f8fead..a809fe9fea 100644
--- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp
+++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp
@@ -1,70 +1,30 @@
 #include "stdafx.h"
-#include "../Overlays/overlay_compile_notification.h"
+#include "../Overlays/overlay_shader_compile_notification.h"
 #include "../Overlays/Shaders/shader_loading_dialog_native.h"
 #include "GLGSRender.h"
 #include "GLCompute.h"
-#include "GLDMA.h"
-#include "GLResolveHelper.h"
-
 #include "Emu/Memory/vm_locking.h"
 #include "Emu/RSX/rsx_methods.h"
-#include "Emu/RSX/Host/MM.h"
-#include "Emu/RSX/Host/RSXDMAWriter.h"
-#include "Emu/RSX/NV47/HW/context_accessors.define.h"
 
-[[noreturn]] extern void report_fatal_error(std::string_view _text, bool is_html = false, bool include_help_text = true);
-
-namespace
-{
-	void throw_fatal(const std::vector<std::string>& reasons)
-	{
-		const std::string delimiter = "\n- ";
-		const std::string reasons_list = fmt::merge(reasons, delimiter);
-		const std::string message = fmt::format(
-			"OpenGL could not be initialized on this system for the following reason(s):\n"
-			"\n"
-			"- %s",
-			reasons_list);
-
-		Emu.BlockingCallFromMainThread([message]()
-		{
-			report_fatal_error(message, false, false);
-		});
-	}
-}
+#include "../Program/program_state_cache2.hpp"
 
 u64 GLGSRender::get_cycles()
 {
 	return thread_ctrl::get_cycles(static_cast<named_thread<GLGSRender>&>(*this));
 }
 
-GLGSRender::GLGSRender(utils::serial* ar) noexcept : GSRender(ar)
+GLGSRender::GLGSRender() : GSRender()
 {
-	m_shaders_cache = std::make_unique<gl::shader_cache>(m_prog_buffer, "opengl", "v1.95");
+	m_shaders_cache = std::make_unique<gl::shader_cache>(m_prog_buffer, "opengl", "v1.92");
 
-	if (g_cfg.video.disable_vertex_cache)
+	if (g_cfg.video.disable_vertex_cache || g_cfg.video.multithreaded_rsx)
 		m_vertex_cache = std::make_unique<gl::null_vertex_cache>();
 	else
 		m_vertex_cache = std::make_unique<gl::weak_vertex_cache>();
 
+	backend_config.supports_hw_a2c = false;
+	backend_config.supports_hw_a2one = false;
 	backend_config.supports_multidraw = true;
-	backend_config.supports_normalized_barycentrics = true;
-
-	if (g_cfg.video.antialiasing_level != msaa_level::none)
-	{
-		backend_config.supports_hw_msaa = true;
-		backend_config.supports_hw_a2c = true;
-		backend_config.supports_hw_a2c_1spp = false; // In OGL A2C is implicitly disabled at 1spp
-		backend_config.supports_hw_a2one = true;
-	}
-}
-
-GLGSRender::~GLGSRender()
-{
-	if (m_frame)
-	{
-		m_frame->reset();
-	}
 }
 
 extern CellGcmContextData current_context;
@@ -133,37 +93,29 @@ void GLGSRender::on_init_thread()
 	gl::set_primary_context_thread();
 
 	zcull_ctrl.reset(static_cast<::rsx::reports::ZCULL_control*>(this));
-	m_occlusion_type = g_cfg.video.precise_zpass_count ? GL_SAMPLES_PASSED : GL_ANY_SAMPLES_PASSED;
 
 	gl::init();
-	gl::set_command_context(gl_state);
 
-	// Enable adaptive vsync if vsync is requested
+	//Enable adaptive vsync if vsync is requested
 	gl::set_swapinterval(g_cfg.video.vsync ? -1 : 0);
 
 	if (g_cfg.video.debug_output)
 		gl::enable_debugging();
 
-	rsx_log.success("GL RENDERER: %s (%s)", reinterpret_cast<const char*>(glGetString(GL_RENDERER)), reinterpret_cast<const char*>(glGetString(GL_VENDOR)));
-	rsx_log.success("GL VERSION: %s", reinterpret_cast<const char*>(glGetString(GL_VERSION)));
-	rsx_log.success("GLSL VERSION: %s", reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION)));
+	rsx_log.notice("GL RENDERER: %s (%s)", reinterpret_cast<const char*>(glGetString(GL_RENDERER)), reinterpret_cast<const char*>(glGetString(GL_VENDOR)));
+	rsx_log.notice("GL VERSION: %s", reinterpret_cast<const char*>(glGetString(GL_VERSION)));
+	rsx_log.notice("GLSL VERSION: %s", reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION)));
 
-	const auto& gl_caps = gl::get_driver_caps();
+	auto& gl_caps = gl::get_driver_caps();
 
-	std::vector<std::string> exception_reasons;
-	if (!gl_caps.ARB_texture_buffer_object_supported)
+	if (!gl_caps.ARB_texture_buffer_supported)
 	{
-		exception_reasons.push_back("GL_ARB_texture_buffer_object is required but not supported by your GPU");
+		fmt::throw_exception("Failed to initialize OpenGL renderer. ARB_texture_buffer_object is required but not supported by your GPU");
 	}
 
-	if (!gl_caps.ARB_direct_state_access_supported && !gl_caps.EXT_direct_state_access_supported)
+	if (!gl_caps.ARB_dsa_supported && !gl_caps.EXT_dsa_supported)
 	{
-		exception_reasons.push_back("GL_ARB_direct_state_access or GL_EXT_direct_state_access is required but not supported by your GPU");
-	}
-
-	if (!exception_reasons.empty())
-	{
-		throw_fatal(exception_reasons);
+		fmt::throw_exception("Failed to initialize OpenGL renderer. ARB_direct_state_access or EXT_direct_state_access is required but not supported by your GPU");
 	}
 
 	if (!gl_caps.ARB_depth_buffer_float_supported && g_cfg.video.force_high_precision_z_buffer)
@@ -176,43 +128,7 @@ void GLGSRender::on_init_thread()
 		rsx_log.warning("Texture barriers are not supported by your GPU. Feedback loops will have undefined results.");
 	}
 
-	if (!gl_caps.ARB_bindless_texture_supported)
-	{
-		switch (shadermode)
-		{
-		case shader_mode::async_with_interpreter:
-		case shader_mode::interpreter_only:
-			rsx_log.error("Bindless texture extension required for shader interpreter is not supported on your GPU. Will use async recompiler as a fallback.");
-			g_cfg.video.shadermode.set(shader_mode::async_recompiler);
-			break;
-		default:
-			break;
-		}
-	}
-
-	if (gl_caps.NV_fragment_shader_barycentric_supported &&
-		gl_caps.vendor_NVIDIA &&
-		g_cfg.video.shader_precision != gpu_preset_level::low)
-	{
-		// NVIDIA's attribute interpolation requires some workarounds
-		backend_config.supports_normalized_barycentrics = false;
-	}
-
-	if (gl_caps.AMD_pinned_memory_supported && g_cfg.video.host_label_synchronization)
-	{
-		backend_config.supports_host_gpu_labels = true;
-
-		m_host_gpu_context_data = std::make_unique<gl::buffer>();
-		m_host_gpu_context_data->create(gl::buffer::target::array, 4096, nullptr, gl::buffer::memory_type::host_visible,
-			gl::buffer::usage::host_read | gl::buffer::usage::host_write | gl::buffer::usage::persistent_map);
-
-		auto host_context_ptr = reinterpret_cast<rsx::host_gpu_context_t*>(m_host_gpu_context_data->map(0, 4096, gl::buffer::access::persistent_rw));
-		m_host_dma_ctrl = std::make_unique<rsx::RSXDMAWriter>(host_context_ptr);
-		m_enqueued_host_write_buffer = std::make_unique<gl::scratch_ring_buffer>();
-		m_enqueued_host_write_buffer->create(gl::buffer::target::array, 64 * 0x100000, gl::buffer::usage::dynamic_update);
-	}
-
-	// Use industry standard resource alignment values as defaults
+	//Use industry standard resource alignment values as defaults
 	m_uniform_buffer_offset_align = 256;
 	m_min_texbuffer_alignment = 256;
 	m_max_texbuffer_size = 0;
@@ -223,7 +139,7 @@ void GLGSRender::on_init_thread()
 	glGetIntegerv(GL_MAX_TEXTURE_BUFFER_SIZE, &m_max_texbuffer_size);
 	m_vao.create();
 
-	// Set min alignment to 16-bytes for SSE optimizations with aligned addresses to work
+	//Set min alignment to 16-bytes for SSE optimizations with aligned addresses to work
 	m_min_texbuffer_alignment = std::max(m_min_texbuffer_alignment, 16);
 	m_uniform_buffer_offset_align = std::max(m_uniform_buffer_offset_align, 16);
 
@@ -234,36 +150,38 @@ void GLGSRender::on_init_thread()
 		m_max_texbuffer_size = (16 * 0x100000);
 	}
 
-	// Array stream buffer
+	//Array stream buffer
 	{
-		m_gl_persistent_stream_buffer = std::make_unique<gl::texture>(GL_TEXTURE_BUFFER, 0, 0, 0, 0, 0, GL_R8UI, RSX_FORMAT_CLASS_DONT_CARE);
-		gl_state.bind_texture(GL_STREAM_BUFFER_START + 0, GL_TEXTURE_BUFFER, m_gl_persistent_stream_buffer->id());
+		m_gl_persistent_stream_buffer = std::make_unique<gl::texture>(GL_TEXTURE_BUFFER, 0, 0, 0, 0, GL_R8UI);
+		_SelectTexture(GL_STREAM_BUFFER_START + 0);
+		glBindTexture(GL_TEXTURE_BUFFER, m_gl_persistent_stream_buffer->id());
 	}
 
-	// Register stream buffer
+	//Register stream buffer
 	{
-		m_gl_volatile_stream_buffer = std::make_unique<gl::texture>(GL_TEXTURE_BUFFER, 0, 0, 0, 0, 0, GL_R8UI, RSX_FORMAT_CLASS_DONT_CARE);
-		gl_state.bind_texture(GL_STREAM_BUFFER_START + 1, GL_TEXTURE_BUFFER, m_gl_volatile_stream_buffer->id());
+		m_gl_volatile_stream_buffer = std::make_unique<gl::texture>(GL_TEXTURE_BUFFER, 0, 0, 0, 0, GL_R8UI);
+		_SelectTexture(GL_STREAM_BUFFER_START + 1);
+		glBindTexture(GL_TEXTURE_BUFFER, m_gl_volatile_stream_buffer->id());
 	}
 
-	// Fallback null texture instead of relying on texture0
+	//Fallback null texture instead of relying on texture0
 	{
-		std::array<u32, 8> pixeldata = { 0, 0, 0, 0, 0, 0, 0, 0 };
+		std::vector<u32> pixeldata = { 0, 0, 0, 0 };
 
-		// 1D
-		auto tex1D = std::make_unique<gl::texture>(GL_TEXTURE_1D, 1, 1, 1, 1, 1, GL_RGBA8, RSX_FORMAT_CLASS_COLOR);
+		//1D
+		auto tex1D = std::make_unique<gl::texture>(GL_TEXTURE_1D, 1, 1, 1, 1, GL_RGBA8);
 		tex1D->copy_from(pixeldata.data(), gl::texture::format::rgba, gl::texture::type::uint_8_8_8_8, {});
 
-		// 2D
-		auto tex2D = std::make_unique<gl::texture>(GL_TEXTURE_2D, 1, 1, 1, 1, 1, GL_RGBA8, RSX_FORMAT_CLASS_COLOR);
+		//2D
+		auto tex2D = std::make_unique<gl::texture>(GL_TEXTURE_2D, 1, 1, 1, 1, GL_RGBA8);
 		tex2D->copy_from(pixeldata.data(), gl::texture::format::rgba, gl::texture::type::uint_8_8_8_8, {});
 
-		// 3D
-		auto tex3D = std::make_unique<gl::texture>(GL_TEXTURE_3D, 1, 1, 1, 1, 1, GL_RGBA8, RSX_FORMAT_CLASS_COLOR);
+		//3D
+		auto tex3D = std::make_unique<gl::texture>(GL_TEXTURE_3D, 1, 1, 1, 1, GL_RGBA8);
 		tex3D->copy_from(pixeldata.data(), gl::texture::format::rgba, gl::texture::type::uint_8_8_8_8, {});
 
-		// CUBE
-		auto texCUBE = std::make_unique<gl::texture>(GL_TEXTURE_CUBE_MAP, 1, 1, 1, 1, 1, GL_RGBA8, RSX_FORMAT_CLASS_COLOR);
+		//CUBE
+		auto texCUBE = std::make_unique<gl::texture>(GL_TEXTURE_CUBE_MAP, 1, 1, 1, 1, GL_RGBA8);
 		texCUBE->copy_from(pixeldata.data(), gl::texture::format::rgba, gl::texture::type::uint_8_8_8_8, {});
 
 		m_null_textures[GL_TEXTURE_1D] = std::move(tex1D);
@@ -295,8 +213,6 @@ void GLGSRender::on_init_thread()
 		m_vertex_instructions_buffer = std::make_unique<gl::legacy_ring_buffer>();
 		m_fragment_instructions_buffer = std::make_unique<gl::legacy_ring_buffer>();
 		m_raster_env_ring_buffer = std::make_unique<gl::legacy_ring_buffer>();
-		m_scratch_ring_buffer = std::make_unique<gl::legacy_ring_buffer>();
-		m_instancing_ring_buffer = std::make_unique<gl::legacy_ring_buffer>();
 	}
 	else
 	{
@@ -307,16 +223,14 @@ void GLGSRender::on_init_thread()
 		m_vertex_env_buffer = std::make_unique<gl::ring_buffer>();
 		m_texture_parameters_buffer = std::make_unique<gl::ring_buffer>();
 		m_vertex_layout_buffer = std::make_unique<gl::ring_buffer>();
-		m_index_ring_buffer = gl_caps.vendor_AMD ? std::make_unique<gl::transient_ring_buffer>() : std::make_unique<gl::ring_buffer>();
+		m_index_ring_buffer = std::make_unique<gl::ring_buffer>();
 		m_vertex_instructions_buffer = std::make_unique<gl::ring_buffer>();
 		m_fragment_instructions_buffer = std::make_unique<gl::ring_buffer>();
 		m_raster_env_ring_buffer = std::make_unique<gl::ring_buffer>();
-		m_scratch_ring_buffer = std::make_unique<gl::ring_buffer>();
-		m_instancing_ring_buffer = std::make_unique<gl::ring_buffer>();
 	}
 
 	m_attrib_ring_buffer->create(gl::buffer::target::texture, 256 * 0x100000);
-	m_index_ring_buffer->create(gl::buffer::target::element_array, 16 * 0x100000);
+	m_index_ring_buffer->create(gl::buffer::target::element_array, 64 * 0x100000);
 	m_transform_constants_buffer->create(gl::buffer::target::uniform, 64 * 0x100000);
 	m_fragment_constants_buffer->create(gl::buffer::target::uniform, 16 * 0x100000);
 	m_fragment_env_buffer->create(gl::buffer::target::uniform, 16 * 0x100000);
@@ -324,8 +238,6 @@ void GLGSRender::on_init_thread()
 	m_texture_parameters_buffer->create(gl::buffer::target::uniform, 16 * 0x100000);
 	m_vertex_layout_buffer->create(gl::buffer::target::uniform, 16 * 0x100000);
 	m_raster_env_ring_buffer->create(gl::buffer::target::uniform, 16 * 0x100000);
-	m_scratch_ring_buffer->create(gl::buffer::target::uniform, 16 * 0x100000);
-	m_instancing_ring_buffer->create(gl::buffer::target::ssbo, 128 * 0x100000);
 
 	if (shadermode == shader_mode::async_with_interpreter || shadermode == shader_mode::interpreter_only)
 	{
@@ -337,15 +249,17 @@ void GLGSRender::on_init_thread()
 
 	if (gl_caps.vendor_AMD)
 	{
+		m_identity_index_buffer = std::make_unique<gl::buffer>();
+		m_identity_index_buffer->create(gl::buffer::target::element_array, 1 * 0x100000, nullptr, gl::buffer::memory_type::host_visible);
+
 		// Initialize with 256k identity entries
-		std::vector<u32> dst(256 * 1024);
+		auto* dst = reinterpret_cast<u32*>(m_identity_index_buffer->map(gl::buffer::access::write));
 		for (u32 n = 0; n < (0x100000 >> 2); ++n)
 		{
 			dst[n] = n;
 		}
 
-		m_identity_index_buffer = std::make_unique<gl::buffer>();
-		m_identity_index_buffer->create(gl::buffer::target::element_array,dst.size() * sizeof(u32), dst.data(), gl::buffer::memory_type::local);
+		m_identity_index_buffer->unmap();
 	}
 	else if (gl_caps.vendor_NVIDIA)
 	{
@@ -368,21 +282,21 @@ void GLGSRender::on_init_thread()
 		sampler.bind(image_unit++);
 	}
 
-	for (auto &sampler : m_vs_sampler_states)
-	{
-		sampler.create();
-		sampler.bind(image_unit++);
-	}
-
-	for (auto& sampler : m_fs_sampler_mirror_states)
+	for (auto &sampler : m_fs_sampler_mirror_states)
 	{
 		sampler.create();
 		sampler.apply_defaults();
 		sampler.bind(image_unit++);
 	}
 
+	for (auto &sampler : m_vs_sampler_states)
+	{
+		sampler.create();
+		sampler.bind(image_unit++);
+	}
+
 	//Occlusion query
-	for (u32 i = 0; i < rsx::reports::occlusion_query_count; ++i)
+	for (u32 i = 0; i < occlusion_query_count; ++i)
 	{
 		GLuint handle = 0;
 		auto &query = m_occlusion_query_data[i];
@@ -394,6 +308,14 @@ void GLGSRender::on_init_thread()
 		query.result = 0;
 	}
 
+	//Clip planes are shader controlled; enable all planes driver-side
+	glEnable(GL_CLIP_DISTANCE0 + 0);
+	glEnable(GL_CLIP_DISTANCE0 + 1);
+	glEnable(GL_CLIP_DISTANCE0 + 2);
+	glEnable(GL_CLIP_DISTANCE0 + 3);
+	glEnable(GL_CLIP_DISTANCE0 + 4);
+	glEnable(GL_CLIP_DISTANCE0 + 5);
+
 	m_ui_renderer.create();
 	m_video_output_pass.create();
 
@@ -431,11 +353,11 @@ void GLGSRender::on_exit()
 	// Globals
 	// TODO: Move these
 	gl::destroy_compute_tasks();
-	gl::destroy_overlay_passes();
-	gl::clear_dma_resources();
-	gl::clear_resolve_helpers();
 
-	gl::destroy_global_texture_resources();
+	if (gl::g_typeless_transfer_buffer)
+	{
+		gl::g_typeless_transfer_buffer.remove();
+	}
 
 	gl::debug::g_vis_texture.reset(); // TODO
 
@@ -444,10 +366,6 @@ void GLGSRender::on_exit()
 	m_prog_buffer.clear();
 	m_rtts.destroy();
 
-	m_host_dma_ctrl.reset();
-	m_host_gpu_context_data.reset();
-	m_enqueued_host_write_buffer.reset();
-
 	for (auto &fbo : m_framebuffer_cache)
 	{
 		fbo.remove();
@@ -455,11 +373,14 @@ void GLGSRender::on_exit()
 
 	m_framebuffer_cache.clear();
 
-	m_upscaler.reset();
-
-	for (auto& flip_tex_image : m_flip_tex_color)
+	if (m_flip_fbo)
 	{
-		flip_tex_image.reset();
+		m_flip_fbo.remove();
+	}
+
+	if (m_flip_tex_color)
+	{
+		m_flip_tex_color.reset();
 	}
 
 	if (m_vao)
@@ -545,24 +466,15 @@ void GLGSRender::on_exit()
 		m_raster_env_ring_buffer->remove();
 	}
 
-	if (m_scratch_ring_buffer)
-	{
-		m_scratch_ring_buffer->remove();
-	}
-
-	if (m_instancing_ring_buffer)
-	{
-		m_instancing_ring_buffer->remove();
-	}
-
 	m_null_textures.clear();
+	m_text_printer.close();
 	m_gl_texture_cache.destroy();
 	m_ui_renderer.destroy();
 	m_video_output_pass.destroy();
 
 	m_shader_interpreter.destroy();
 
-	for (u32 i = 0; i < rsx::reports::occlusion_query_count; ++i)
+	for (u32 i = 0; i < occlusion_query_count; ++i)
 	{
 		auto &query = m_occlusion_query_data[i];
 		query.active = false;
@@ -583,20 +495,20 @@ void GLGSRender::clear_surface(u32 arg)
 	if (skip_current_frame) return;
 
 	// If stencil write mask is disabled, remove clear_stencil bit
-	if (!rsx::method_registers.stencil_mask()) arg &= ~RSX_GCM_CLEAR_STENCIL_BIT;
+	if (!rsx::method_registers.stencil_mask()) arg &= ~0x2u;
 
 	// Ignore invalid clear flags
-	if ((arg & RSX_GCM_CLEAR_ANY_MASK) == 0) return;
+	if ((arg & 0xf3) == 0) return;
 
 	u8 ctx = rsx::framebuffer_creation_context::context_draw;
-	if (arg & RSX_GCM_CLEAR_COLOR_RGBA_MASK) ctx |= rsx::framebuffer_creation_context::context_clear_color;
-	if (arg & RSX_GCM_CLEAR_DEPTH_STENCIL_MASK) ctx |= rsx::framebuffer_creation_context::context_clear_depth;
+	if (arg & 0xF0) ctx |= rsx::framebuffer_creation_context::context_clear_color;
+	if (arg & 0x3) ctx |= rsx::framebuffer_creation_context::context_clear_depth;
 
 	init_buffers(static_cast<rsx::framebuffer_creation_context>(ctx), true);
 
-	if (!m_graphics_state.test(rsx::rtt_config_valid)) return;
+	if (!framebuffer_status_valid) return;
 
-	gl::clear_cmd_info clear_cmd{};
+	GLbitfield mask = 0;
 
 	gl::command_context cmd{ gl_state };
 	const bool full_frame =
@@ -608,47 +520,50 @@ void GLGSRender::clear_surface(u32 arg)
 	bool update_color = false, update_z = false;
 	rsx::surface_depth_format2 surface_depth_format = rsx::method_registers.surface_depth_fmt();
 
-	if (auto ds = std::get<1>(m_rtts.m_bound_depth_stencil); arg & RSX_GCM_CLEAR_DEPTH_STENCIL_MASK)
+	if (auto ds = std::get<1>(m_rtts.m_bound_depth_stencil); arg & 0x3)
 	{
-		if (arg & RSX_GCM_CLEAR_DEPTH_BIT)
+		if (arg & 0x1)
 		{
 			u32 max_depth_value = get_max_depth_value(surface_depth_format);
 			u32 clear_depth = rsx::method_registers.z_clear_value(is_depth_stencil_format(surface_depth_format));
 
-			clear_cmd.clear_depth.value = f32(clear_depth) / max_depth_value;
-			clear_cmd.aspect_mask |= gl::image_aspect::depth;
+			gl_state.depth_mask(GL_TRUE);
+			gl_state.clear_depth(f32(clear_depth) / max_depth_value);
+			mask |= GLenum(gl::buffers::depth);
 		}
 
 		if (is_depth_stencil_format(surface_depth_format))
 		{
-			if (arg & RSX_GCM_CLEAR_STENCIL_BIT)
+			if (arg & 0x2)
 			{
-				clear_cmd.clear_stencil.mask = rsx::method_registers.stencil_mask();
-				clear_cmd.clear_stencil.value = rsx::method_registers.stencil_clear_value();
-				clear_cmd.aspect_mask |= gl::image_aspect::stencil;
+				u8 clear_stencil = rsx::method_registers.stencil_clear_value();
+
+				gl_state.stencil_mask(rsx::method_registers.stencil_mask());
+				gl_state.clear_stencil(clear_stencil);
+				mask |= GLenum(gl::buffers::stencil);
 			}
 
-			if (const auto ds_mask = (arg & RSX_GCM_CLEAR_DEPTH_STENCIL_MASK);
-				ds_mask != RSX_GCM_CLEAR_DEPTH_STENCIL_MASK || !full_frame)
+			if ((arg & 0x3) != 0x3 || !full_frame)
 			{
-				ensure(clear_cmd.aspect_mask);
+				ensure(mask);
 
 				if (ds->state_flags & rsx::surface_state_flags::erase_bkgnd &&  // Needs initialization
 					ds->old_contents.empty() && !g_cfg.video.read_depth_buffer) // No way to load data from memory, so no initialization given
 				{
 					// Only one aspect was cleared. Make sure to memory initialize the other before removing dirty flag
-					if (ds_mask == RSX_GCM_CLEAR_DEPTH_BIT)
+					if (arg == 1)
 					{
 						// Depth was cleared, initialize stencil
-						clear_cmd.clear_stencil.mask = 0xff;
-						clear_cmd.clear_stencil.value = 0xff;
-						clear_cmd.aspect_mask |= gl::image_aspect::stencil;
+						gl_state.stencil_mask(0xFF);
+						gl_state.clear_stencil(0xFF);
+						mask |= GLenum(gl::buffers::stencil);
 					}
-					else if (ds_mask == RSX_GCM_CLEAR_STENCIL_BIT)
+					else
 					{
 						// Stencil was cleared, initialize depth
-						clear_cmd.clear_depth.value = 1.f;
-						clear_cmd.aspect_mask |= gl::image_aspect::depth;
+						gl_state.depth_mask(GL_TRUE);
+						gl_state.clear_depth(1.f);
+						mask |= GLenum(gl::buffers::depth);
 					}
 				}
 				else
@@ -658,7 +573,7 @@ void GLGSRender::clear_surface(u32 arg)
 			}
 		}
 
-		if (clear_cmd.aspect_mask)
+		if (mask)
 		{
 			// Memory has been initialized
 			update_z = true;
@@ -682,31 +597,10 @@ void GLGSRender::clear_surface(u32 arg)
 			colormask = 0;
 			break;
 		}
-		case rsx::surface_color_format::b8:
-		{
-			rsx::get_b8_clear_color(clear_r, clear_g, clear_b, clear_a);
-			colormask = rsx::get_b8_clearmask(colormask);
-			break;
-		}
 		case rsx::surface_color_format::g8b8:
 		{
 			rsx::get_g8b8_clear_color(clear_r, clear_g, clear_b, clear_a);
-			colormask = rsx::get_g8b8_r8g8_clearmask(colormask);
-			break;
-		}
-		case rsx::surface_color_format::r5g6b5:
-		{
-			rsx::get_rgb565_clear_color(clear_r, clear_g, clear_b, clear_a);
-			break;
-		}
-		case rsx::surface_color_format::x1r5g5b5_o1r5g5b5:
-		{
-			rsx::get_a1rgb555_clear_color(clear_r, clear_g, clear_b, clear_a, 255);
-			break;
-		}
-		case rsx::surface_color_format::x1r5g5b5_z1r5g5b5:
-		{
-			rsx::get_a1rgb555_clear_color(clear_r, clear_g, clear_b, clear_a, 0);
+			colormask = rsx::get_g8b8_r8g8_colormask(colormask);
 			break;
 		}
 		case rsx::surface_color_format::a8b8g8r8:
@@ -714,7 +608,7 @@ void GLGSRender::clear_surface(u32 arg)
 		case rsx::surface_color_format::x8b8g8r8_z8b8g8r8:
 		{
 			rsx::get_abgr8_clear_color(clear_r, clear_g, clear_b, clear_a);
-			colormask = rsx::get_abgr8_clearmask(colormask);
+			colormask = rsx::get_abgr8_colormask(colormask);
 			break;
 		}
 		default:
@@ -725,20 +619,19 @@ void GLGSRender::clear_surface(u32 arg)
 
 		if (colormask)
 		{
-			clear_cmd.clear_color.mask = colormask;
-			clear_cmd.clear_color.attachment_count = static_cast<u8>(m_rtts.m_bound_render_target_ids.size());
-			clear_cmd.clear_color.r = clear_r;
-			clear_cmd.clear_color.g = clear_g;
-			clear_cmd.clear_color.b = clear_b;
-			clear_cmd.clear_color.a = clear_a;
-			clear_cmd.aspect_mask |= gl::image_aspect::color;
+			gl_state.clear_color(clear_r, clear_g, clear_b, clear_a);
+			mask |= GLenum(gl::buffers::color);
 
-			if (!full_frame)
+			for (u8 index = m_rtts.m_bound_render_targets_config.first, count = 0;
+				 count < m_rtts.m_bound_render_targets_config.second;
+				 ++count, ++index)
 			{
-				for (const auto& index : m_rtts.m_bound_render_target_ids)
+				if (!full_frame)
 				{
 					m_rtts.m_bound_render_targets[index].second->write_barrier(cmd);
 				}
+
+				gl_state.color_maski(count, colormask);
 			}
 
 			update_color = true;
@@ -747,15 +640,11 @@ void GLGSRender::clear_surface(u32 arg)
 
 	if (update_color || update_z)
 	{
-		m_rtts.on_write({ update_color, update_color, update_color, update_color }, update_z);
+		const bool write_all_mask[] = { true, true, true, true };
+		m_rtts.on_write(update_color ? write_all_mask : nullptr, update_z);
 	}
 
-	if (!full_frame)
-	{
-		gl_state.enable(GL_SCISSOR_TEST);
-	}
-
-	gl::clear_attachments(cmd, clear_cmd);
+	glClear(mask);
 }
 
 bool GLGSRender::load_program()
@@ -768,6 +657,9 @@ bool GLGSRender::load_program()
 		ensure(current_fragment_program.valid);
 
 		get_current_vertex_program(vs_sampler_state);
+
+		current_vertex_program.skip_vertex_input_check = true;	//not needed for us since decoding is done server side
+		current_fragment_program.texture_state.unnormalized_coords = 0; //unused
 	}
 	else if (m_program)
 	{
@@ -778,38 +670,16 @@ bool GLGSRender::load_program()
 
 		if (shadermode == shader_mode::interpreter_only)
 		{
-			m_program = m_shader_interpreter.get(
-				current_fp_metadata,
-				current_vertex_program.ctrl,
-				current_fragment_program.ctrl);
+			m_program = m_shader_interpreter.get(current_fp_metadata);
 			return true;
 		}
 	}
 
-	m_vertex_prog = nullptr;
-	m_fragment_prog = nullptr;
-
+	const bool was_interpreter = m_shader_interpreter.is_interpreter(m_program);
 	if (shadermode != shader_mode::interpreter_only) [[likely]]
 	{
-		if (g_cfg.video.debug_overlay)
-		{
-			m_frame_stats.program_cache_lookups_total += 2;
-			if (m_program_cache_hint.has_fragment_program())
-			{
-				m_frame_stats.program_cache_lookups_ellided++;
-			}
-			if (m_program_cache_hint.has_vertex_program())
-			{
-				m_frame_stats.program_cache_lookups_ellided++;
-			}
-		}
-
 		void* pipeline_properties = nullptr;
-		std::tie(m_program, m_vertex_prog, m_fragment_prog) = m_prog_buffer.get_graphics_pipeline(
-			&m_program_cache_hint,
-			current_vertex_program,
-			current_fragment_program,
-			pipeline_properties,
+		m_program = m_prog_buffer.get_graphics_pipeline(current_vertex_program, current_fragment_program, pipeline_properties,
 			shadermode != shader_mode::recompiler, true);
 
 		if (m_prog_buffer.check_cache_missed())
@@ -817,7 +687,19 @@ bool GLGSRender::load_program()
 			// Notify the user with HUD notification
 			if (g_cfg.misc.show_shader_compilation_hint)
 			{
-				rsx::overlays::show_shader_compile_notification();
+				if (m_overlay_manager)
+				{
+					if (auto dlg = m_overlay_manager->get<rsx::overlays::shader_compile_notification>())
+					{
+						// Extend duration
+						dlg->touch();
+					}
+					else
+					{
+						// Create dialog but do not show immediately
+						m_overlay_manager->create<rsx::overlays::shader_compile_notification>();
+					}
+				}
 			}
 		}
 		else
@@ -831,35 +713,15 @@ bool GLGSRender::load_program()
 		m_program = nullptr;
 	}
 
-	if (shadermode == shader_mode::async_with_interpreter || shadermode == shader_mode::interpreter_only)
+	if (!m_program && (shadermode == shader_mode::async_with_interpreter || shadermode == shader_mode::interpreter_only))
 	{
-		const bool is_interpreter = !m_program;
-		const bool was_interpreter = m_shader_interpreter.is_interpreter(m_prev_program);
-
-		// First load the next program if not available
-		if (!m_program)
+		// Fall back to interpreter
+		m_program = m_shader_interpreter.get(current_fp_metadata);
+		if (was_interpreter != m_shader_interpreter.is_interpreter(m_program))
 		{
-			m_program = m_shader_interpreter.get(
-				current_fp_metadata,
-				current_vertex_program.ctrl,
-				current_fragment_program.ctrl);
-
 			// Program has changed, reupload
 			m_interpreter_state = rsx::invalidate_pipeline_bits;
 		}
-
-		// If swapping between interpreter and recompiler, we need to adjust some flags to reupload data as needed.
-		if (is_interpreter != was_interpreter)
-		{
-			// Always reupload transform constants when going between interpreter and recompiler
-			m_graphics_state |= rsx::transform_constants_dirty;
-
-			// Always reload fragment constansts when moving from interpreter back to recompiler.
-			if (was_interpreter)
-			{
-				m_graphics_state |= rsx::fragment_constants_dirty;
-			}
-		}
 	}
 
 	return m_program != nullptr;
@@ -874,14 +736,15 @@ void GLGSRender::load_program_env()
 
 	const u32 fragment_constants_size = current_fp_metadata.program_constants_buffer_length;
 
-	const bool update_transform_constants = m_graphics_state & rsx::pipeline_state::transform_constants_dirty;
-	const bool update_fragment_constants = (m_graphics_state & rsx::pipeline_state::fragment_constants_dirty) && fragment_constants_size;
-	const bool update_vertex_env = m_graphics_state & rsx::pipeline_state::vertex_state_dirty;
-	const bool update_fragment_env = m_graphics_state & rsx::pipeline_state::fragment_state_dirty;
-	const bool update_fragment_texture_env = m_graphics_state & rsx::pipeline_state::fragment_texture_state_dirty;
-	const bool update_instruction_buffers = !!m_interpreter_state && m_shader_interpreter.is_interpreter(m_program);
-	const bool update_raster_env = REGS(m_ctx)->polygon_stipple_enabled() && (m_graphics_state & rsx::pipeline_state::polygon_stipple_pattern_dirty);
-	const bool update_instancing_data = REGS(m_ctx)->current_draw_clause.is_trivial_instanced_draw;
+	const bool update_transform_constants = !!(m_graphics_state & rsx::pipeline_state::transform_constants_dirty);
+	const bool update_fragment_constants = !!(m_graphics_state & rsx::pipeline_state::fragment_constants_dirty) && fragment_constants_size;
+	const bool update_vertex_env = !!(m_graphics_state & rsx::pipeline_state::vertex_state_dirty);
+	const bool update_fragment_env = !!(m_graphics_state & rsx::pipeline_state::fragment_state_dirty);
+	const bool update_fragment_texture_env = !!(m_graphics_state & rsx::pipeline_state::fragment_texture_state_dirty);
+	const bool update_instruction_buffers = (!!m_interpreter_state && m_shader_interpreter.is_interpreter(m_program));
+	const bool update_raster_env = (rsx::method_registers.polygon_stipple_enabled() && !!(m_graphics_state & rsx::pipeline_state::polygon_stipple_pattern_dirty));
+
+	m_program->use();
 
 	if (manually_flush_ring_buffers)
 	{
@@ -891,7 +754,6 @@ void GLGSRender::load_program_env()
 		if (update_fragment_constants) m_fragment_constants_buffer->reserve_storage_on_heap(utils::align(fragment_constants_size, 256));
 		if (update_transform_constants) m_transform_constants_buffer->reserve_storage_on_heap(8192);
 		if (update_raster_env) m_raster_env_ring_buffer->reserve_storage_on_heap(128);
-		if (update_instancing_data) m_instancing_ring_buffer->reserve_storage_on_heap(8192 * REGS(m_ctx)->current_draw_clause.pass_count());
 
 		if (update_instruction_buffers)
 		{
@@ -905,8 +767,8 @@ void GLGSRender::load_program_env()
 		// Vertex state
 		auto mapping = m_vertex_env_buffer->alloc_from_heap(144, m_uniform_buffer_offset_align);
 		auto buf = static_cast<u8*>(mapping.first);
-		m_draw_processor.fill_scale_offset_data(buf, false);
-		m_draw_processor.fill_user_clip_data(buf + 64);
+		fill_scale_offset_data(buf, false);
+		fill_user_clip_data(buf + 64);
 		*(reinterpret_cast<u32*>(buf + 128)) = rsx::method_registers.transform_branch_bits();
 		*(reinterpret_cast<f32*>(buf + 132)) = rsx::method_registers.point_size() * rsx::get_resolution_scale();
 		*(reinterpret_cast<f32*>(buf + 136)) = rsx::method_registers.clip_min();
@@ -915,61 +777,24 @@ void GLGSRender::load_program_env()
 		m_vertex_env_buffer->bind_range(GL_VERTEX_PARAMS_BIND_SLOT, mapping.second, 144);
 	}
 
-	if (update_instancing_data)
-	{
-		// Combines transform load + instancing lookup table
-		const auto alignment = m_min_ssbo_alignment;
-		u32 indirection_table_offset = 0;
-		u32 constants_data_table_offset = 0;
-
-		rsx::io_buffer indirection_table_buf([&](usz size) -> std::pair<void*, usz>
-		{
-			const auto mapping = m_instancing_ring_buffer->alloc_from_heap(static_cast<u32>(size), alignment);
-			indirection_table_offset = mapping.second;
-			return mapping;
-		});
-
-		rsx::io_buffer constants_array_buf([&](usz size) -> std::pair<void*, usz>
-		{
-			const auto mapping = m_instancing_ring_buffer->alloc_from_heap(static_cast<u32>(size), alignment);
-			constants_data_table_offset = mapping.second;
-			return mapping;
-		});
-
-		m_draw_processor.fill_constants_instancing_buffer(indirection_table_buf, constants_array_buf, m_vertex_prog);
-
-		m_instancing_ring_buffer->bind_range(GL_INSTANCING_LUT_BIND_SLOT, indirection_table_offset, ::size32(indirection_table_buf));
-		m_instancing_ring_buffer->bind_range(GL_INSTANCING_XFORM_CONSTANTS_SLOT, constants_data_table_offset, ::size32(constants_array_buf));
-	}
-
 	if (update_transform_constants)
 	{
 		// Vertex constants
-		u32 mem_offset = 0;
-		auto mem_alloc = [&](usz size) -> std::pair<void*, usz>
-		{
-			const auto mapping = m_transform_constants_buffer->alloc_from_heap(static_cast<u32>(size), m_uniform_buffer_offset_align);
-			mem_offset = mapping.second;
-			return { mapping.first, size };
-		};
+		auto mapping = m_transform_constants_buffer->alloc_from_heap(8192, m_uniform_buffer_offset_align);
+		auto buf = static_cast<u8*>(mapping.first);
+		fill_vertex_program_constants_data(buf);
 
-		rsx::io_buffer io_buf(mem_alloc);
-		upload_transform_constants(io_buf);
-
-		if (!io_buf.empty())
-		{
-			m_transform_constants_buffer->bind_range(GL_VERTEX_CONSTANT_BUFFERS_BIND_SLOT, mem_offset, ::size32(io_buf));
-		}
+		m_transform_constants_buffer->bind_range(GL_VERTEX_CONSTANT_BUFFERS_BIND_SLOT, mapping.second, 8192);
 	}
 
-	if (update_fragment_constants && !m_shader_interpreter.is_interpreter(m_program))
+	if (update_fragment_constants && !update_instruction_buffers)
 	{
 		// Fragment constants
 		auto mapping = m_fragment_constants_buffer->alloc_from_heap(fragment_constants_size, m_uniform_buffer_offset_align);
 		auto buf = static_cast<u8*>(mapping.first);
 
 		m_prog_buffer.fill_fragment_constants_buffer({ reinterpret_cast<float*>(buf), fragment_constants_size },
-			*ensure(m_fragment_prog), current_fragment_program, true);
+			current_fragment_program, true);
 
 		m_fragment_constants_buffer->bind_range(GL_FRAGMENT_CONSTANT_BUFFERS_BIND_SLOT, mapping.second, fragment_constants_size);
 	}
@@ -979,7 +804,7 @@ void GLGSRender::load_program_env()
 		// Fragment state
 		auto mapping = m_fragment_env_buffer->alloc_from_heap(32, m_uniform_buffer_offset_align);
 		auto buf = static_cast<u8*>(mapping.first);
-		m_draw_processor.fill_fragment_state_buffer(buf, current_fragment_program);
+		fill_fragment_state_buffer(buf, current_fragment_program);
 
 		m_fragment_env_buffer->bind_range(GL_FRAGMENT_STATE_BIND_SLOT, mapping.second, 32);
 	}
@@ -987,10 +812,10 @@ void GLGSRender::load_program_env()
 	if (update_fragment_texture_env)
 	{
 		// Fragment texture parameters
-		auto mapping = m_texture_parameters_buffer->alloc_from_heap(768, m_uniform_buffer_offset_align);
+		auto mapping = m_texture_parameters_buffer->alloc_from_heap(512, m_uniform_buffer_offset_align);
 		current_fragment_program.texture_params.write_to(mapping.first, current_fp_metadata.referenced_textures_mask);
 
-		m_texture_parameters_buffer->bind_range(GL_FRAGMENT_TEXTURE_PARAMS_BIND_SLOT, mapping.second, 768);
+		m_texture_parameters_buffer->bind_range(GL_FRAGMENT_TEXTURE_PARAMS_BIND_SLOT, mapping.second, 512);
 	}
 
 	if (update_raster_env)
@@ -1000,7 +825,7 @@ void GLGSRender::load_program_env()
 		std::memcpy(mapping.first, rsx::method_registers.polygon_stipple_pattern(), 128);
 		m_raster_env_ring_buffer->bind_range(GL_RASTERIZER_STATE_BIND_SLOT, mapping.second, 128);
 
-		m_graphics_state.clear(rsx::pipeline_state::polygon_stipple_pattern_dirty);
+		m_graphics_state &= ~(rsx::pipeline_state::polygon_stipple_pattern_dirty);
 	}
 
 	if (update_instruction_buffers)
@@ -1054,7 +879,6 @@ void GLGSRender::load_program_env()
 		if (update_fragment_constants) m_fragment_constants_buffer->unmap();
 		if (update_transform_constants) m_transform_constants_buffer->unmap();
 		if (update_raster_env) m_raster_env_ring_buffer->unmap();
-		if (update_instancing_data) m_instancing_ring_buffer->unmap();
 
 		if (update_instruction_buffers)
 		{
@@ -1063,44 +887,8 @@ void GLGSRender::load_program_env()
 		}
 	}
 
-	rsx::flags32_t handled_flags =
-		rsx::pipeline_state::fragment_state_dirty |
-		rsx::pipeline_state::vertex_state_dirty |
-		rsx::pipeline_state::transform_constants_dirty |
-		rsx::pipeline_state::fragment_texture_state_dirty;
-
-	if (update_fragment_constants && !m_shader_interpreter.is_interpreter(m_program))
-	{
-		handled_flags |= rsx::pipeline_state::fragment_constants_dirty;
-	}
-
-	if (m_shader_interpreter.is_interpreter(m_program))
-	{
-		ensure(m_transform_constants_buffer->bound_range().second >= 468 * 16);
-	}
-
-	m_graphics_state.clear(handled_flags);
-}
-
-bool GLGSRender::is_current_program_interpreted() const
-{
-	return m_program && m_shader_interpreter.is_interpreter(m_program);
-}
-
-void GLGSRender::upload_transform_constants(const rsx::io_buffer& buffer)
-{
-	const bool is_interpreter = m_shader_interpreter.is_interpreter(m_program);
-	const usz transform_constants_size = (is_interpreter || m_vertex_prog->has_indexed_constants) ? 8192 : m_vertex_prog->constant_ids.size() * 16;
-
-	if (transform_constants_size)
-	{
-		const auto constant_ids = (transform_constants_size == 8192)
-			? std::span<const u16>{}
-			: std::span<const u16>(m_vertex_prog->constant_ids);
-
-		buffer.reserve(transform_constants_size);
-		m_draw_processor.fill_vertex_program_constants_data(buffer.data(), constant_ids);
-	}
+	const u32 handled_flags = (rsx::pipeline_state::fragment_state_dirty | rsx::pipeline_state::vertex_state_dirty | rsx::pipeline_state::transform_constants_dirty | rsx::pipeline_state::fragment_constants_dirty | rsx::pipeline_state::fragment_texture_state_dirty);
+	m_graphics_state &= ~handled_flags;
 }
 
 void GLGSRender::update_vertex_env(const gl::vertex_upload_info& upload_info)
@@ -1118,14 +906,7 @@ void GLGSRender::update_vertex_env(const gl::vertex_upload_info& upload_info)
 	buf[1] = upload_info.vertex_index_offset;
 	buf += 4;
 
-	m_draw_processor.fill_vertex_layout_state(
-		m_vertex_layout,
-		current_vp_metadata,
-		upload_info.first_vertex,
-		upload_info.allocated_vertex_count,
-		reinterpret_cast<s32*>(buf),
-		upload_info.persistent_mapping_offset,
-		upload_info.volatile_mapping_offset);
+	fill_vertex_layout_state(m_vertex_layout, upload_info.first_vertex, upload_info.allocated_vertex_count, reinterpret_cast<s32*>(buf), upload_info.persistent_mapping_offset, upload_info.volatile_mapping_offset);
 
 	m_vertex_layout_buffer->bind_range(GL_VERTEX_LAYOUT_BIND_SLOT, mapping.second, 128 + 16);
 
@@ -1135,84 +916,12 @@ void GLGSRender::update_vertex_env(const gl::vertex_upload_info& upload_info)
 	}
 }
 
-void GLGSRender::patch_transform_constants(rsx::context* ctx, u32 index, u32 count)
-{
-	if (!m_program || !m_vertex_prog)
-	{
-		// Shouldn't be reachable, but handle it correctly anyway
-		m_graphics_state |= rsx::pipeline_state::transform_constants_dirty;
-		return;
-	}
-
-	if (!m_vertex_prog->overlaps_constants_range(index, count))
-	{
-		// Nothing meaningful to us
-		return;
-	}
-
-	std::pair<u32, u32> data_range {};
-	void* data_source = nullptr;
-	const auto bound_range = m_transform_constants_buffer->bound_range();
-
-	if (m_vertex_prog->has_indexed_constants)
-	{
-		// We're working with a full range. We can do a direct patch in this case since no index translation is required.
-		const auto byte_count = count * 16;
-		const auto byte_offset = index * 16;
-
-		data_range = { bound_range.first + byte_offset, byte_count};
-		data_source = &REGS(ctx)->transform_constants[index];
-	}
-	else if (auto xform_id = m_vertex_prog->translate_constants_range(index, count); xform_id >= 0)
-	{
-		const auto write_offset = xform_id * 16;
-		const auto byte_count = count * 16;
-
-		data_range = { bound_range.first + write_offset, byte_count };
-		data_source = &REGS(ctx)->transform_constants[index];
-	}
-	else
-	{
-		auto allocate_mem = [&](usz size) -> std::pair<void*, usz>
-		{
-			m_scratch_buffer.resize(size);
-			return { m_scratch_buffer.data(), size };
-		};
-
-		rsx::io_buffer iobuf(allocate_mem);
-		upload_transform_constants(iobuf);
-
-		data_range = { bound_range.first, ::size32(iobuf) };
-		data_source = iobuf.data();
-	}
-
-	// Move data to memory that the GPU can work with
-	if (manually_flush_ring_buffers)
-	{
-		m_scratch_ring_buffer->reserve_storage_on_heap(data_range.second);
-	}
-
-	auto mapping = m_scratch_ring_buffer->alloc_from_heap(data_range.second, 16);
-	std::memcpy(mapping.first, data_source, data_range.second);
-
-	if (manually_flush_ring_buffers)
-	{
-		m_scratch_ring_buffer->unmap();
-	}
-	m_scratch_ring_buffer->notify();
-
-	// Do the transfer to patch the constants on the host device
-	m_scratch_ring_buffer->copy_to(m_transform_constants_buffer.get(), mapping.second, data_range.first, data_range.second);
-}
-
 bool GLGSRender::on_access_violation(u32 address, bool is_writing)
 {
-	rsx::mm_flush(address);
-
-	const bool can_flush = is_current_thread();
-	const rsx::invalidation_cause cause = is_writing
-		? (can_flush ? rsx::invalidation_cause::write : rsx::invalidation_cause::deferred_write)
-		: (can_flush ? rsx::invalidation_cause::read  : rsx::invalidation_cause::deferred_read);
+	const bool can_flush = (std::this_thread::get_id() == m_rsx_thread);
+	const rsx::invalidation_cause cause =
+		is_writing ? (can_flush ? rsx::invalidation_cause::write : rsx::invalidation_cause::deferred_write)
+		           : (can_flush ? rsx::invalidation_cause::read  : rsx::invalidation_cause::deferred_read);
 
 	auto cmd = can_flush ? gl::command_context{ gl_state } : gl::command_context{};
 	auto result = m_gl_texture_cache.invalidate_address(cmd, address, cause);
@@ -1225,14 +934,13 @@ bool GLGSRender::on_access_violation(u32 address, bool is_writing)
 
 	if (!result.violation_handled)
 	{
-		return zcull_ctrl->on_access_violation(address);
+		return false;
 	}
 
 	if (result.num_flushable > 0)
 	{
 		auto &task = post_flush_request(address, result);
 
-		m_eng_interrupt_mask |= rsx::backend_interrupt;
 		vm::temporary_unlock();
 		task.producer_wait();
 	}
@@ -1240,7 +948,7 @@ bool GLGSRender::on_access_violation(u32 address, bool is_writing)
 	return true;
 }
 
-void GLGSRender::on_invalidate_memory_range(const utils::address_range32 &range, rsx::invalidation_cause cause)
+void GLGSRender::on_invalidate_memory_range(const utils::address_range &range, rsx::invalidation_cause cause)
 {
 	gl::command_context cmd{ gl_state };
 	auto data = m_gl_texture_cache.invalidate_range(cmd, range, cause);
@@ -1261,11 +969,11 @@ void GLGSRender::on_semaphore_acquire_wait()
 	if (!work_queue.empty() ||
 		(async_flip_requested & flip_request::emu_requested))
 	{
-		do_local_task(rsx::FIFO::state::lock_wait);
+		do_local_task(rsx::FIFO_state::lock_wait);
 	}
 }
 
-void GLGSRender::do_local_task(rsx::FIFO::state state)
+void GLGSRender::do_local_task(rsx::FIFO_state state)
 {
 	if (!work_queue.empty())
 	{
@@ -1282,20 +990,20 @@ void GLGSRender::do_local_task(rsx::FIFO::state state)
 			q.processed = true;
 		}
 	}
-	else if (!in_begin_end && state != rsx::FIFO::state::lock_wait)
+	else if (!in_begin_end && state != rsx::FIFO_state::lock_wait)
 	{
 		if (m_graphics_state & rsx::pipeline_state::framebuffer_reads_dirty)
 		{
 			//This will re-engage locks and break the texture cache if another thread is waiting in access violation handler!
 			//Only call when there are no waiters
 			m_gl_texture_cache.do_update();
-			m_graphics_state.clear(rsx::pipeline_state::framebuffer_reads_dirty);
+			m_graphics_state &= ~rsx::pipeline_state::framebuffer_reads_dirty;
 		}
 	}
 
 	rsx::thread::do_local_task(state);
 
-	if (state == rsx::FIFO::state::lock_wait)
+	if (state == rsx::FIFO_state::lock_wait)
 	{
 		// Critical check finished
 		return;
@@ -1303,8 +1011,7 @@ void GLGSRender::do_local_task(rsx::FIFO::state state)
 
 	if (m_overlay_manager)
 	{
-		const auto should_ignore = in_begin_end && state != rsx::FIFO::state::empty;
-		if ((async_flip_requested & flip_request::native_ui) && !should_ignore && !is_stopped())
+		if (!in_begin_end && async_flip_requested & flip_request::native_ui)
 		{
 			rsx::display_flip_info_t info{};
 			info.buffer = current_display_buffer;
@@ -1323,7 +1030,7 @@ gl::work_item& GLGSRender::post_flush_request(u32 address, gl::texture_cache::th
 	return result;
 }
 
-bool GLGSRender::scaled_image_from_memory(const rsx::blit_src_info& src, const rsx::blit_dst_info& dst, bool interpolate)
+bool GLGSRender::scaled_image_from_memory(rsx::blit_src_info& src, rsx::blit_dst_info& dst, bool interpolate)
 {
 	gl::command_context cmd{ gl_state };
 	if (m_gl_texture_cache.blit(cmd, src, dst, interpolate, m_rtts))
@@ -1341,7 +1048,7 @@ void GLGSRender::notify_tile_unbound(u32 tile)
 	if (false)
 	{
 		u32 addr = rsx::get_address(tiles[tile].offset, tiles[tile].location);
-		on_notify_pre_memory_unmapped(addr, tiles[tile].size, *std::make_unique<std::vector<std::pair<u64, u64>>>());
+		on_notify_memory_unmapped(addr, tiles[tile].size);
 		m_rtts.invalidate_surface_address(addr, false);
 	}
 
@@ -1351,76 +1058,16 @@ void GLGSRender::notify_tile_unbound(u32 tile)
 	}
 }
 
-bool GLGSRender::release_GCM_label(u32 address, u32 args)
-{
-	if (!backend_config.supports_host_gpu_labels)
-	{
-		return false;
-	}
-
-	auto host_ctx = ensure(m_host_dma_ctrl->host_ctx());
-
-	if (host_ctx->texture_loads_completed())
-	{
-		// We're about to poll waiting for GPU state, ensure the context is still valid.
-		gl::check_state();
-
-		// All texture loads already seen by the host GPU
-		// Wait for all previously submitted labels to be flushed
-		m_host_dma_ctrl->drain_label_queue();
-		return false;
-	}
-
-	const auto mapping = gl::map_dma(address, 4);
-	const auto write_data = std::bit_cast<u32, be_t<u32>>(args);
-	const auto release_event_id = host_ctx->on_label_acquire();
-
-	// We don't have async texture loads yet, so just release both the label and the commands complete
-	u64 write_buf[2] = { write_data, release_event_id };
-	const auto host_read_offset = m_enqueued_host_write_buffer->alloc(16, 16);
-	m_enqueued_host_write_buffer->get().sub_data(host_read_offset, 16, write_buf);
-
-	// Now write to DMA and then to host context
-	m_enqueued_host_write_buffer->get().copy_to(mapping.second, host_read_offset, mapping.first, 4);
-	m_enqueued_host_write_buffer->get().copy_to(m_host_gpu_context_data.get(), host_read_offset + 8, ::offset32(&rsx::host_gpu_context_t::commands_complete_event), 8);
-	m_enqueued_host_write_buffer->push_barrier(host_read_offset, 16);
-
-	host_ctx->on_label_release();
-	return true;
-}
-
-void GLGSRender::enqueue_host_context_write(u32 offset, u32 size, const void* data)
-{
-	ensure(size <= 8);
-	const u32 host_read_offset = m_enqueued_host_write_buffer->alloc(8, 16);
-	m_enqueued_host_write_buffer->get().sub_data(host_read_offset, size, data);
-	m_enqueued_host_write_buffer->get().copy_to(m_host_gpu_context_data.get(), host_read_offset, offset, size);
-	m_enqueued_host_write_buffer->push_barrier(host_read_offset, 16);
-}
-
-void GLGSRender::on_guest_texture_read()
-{
-	if (!backend_config.supports_host_gpu_labels)
-	{
-		return;
-	}
-
-	// Tag the read as being in progress
-	u64 event_id = m_host_dma_ctrl->host_ctx()->inc_counter();
-	m_host_dma_ctrl->host_ctx()->texture_load_request_event = event_id;
-	enqueue_host_context_write(::offset32(&rsx::host_gpu_context_t::texture_load_complete_event), 8, &event_id);
-}
-
 void GLGSRender::begin_occlusion_query(rsx::reports::occlusion_query_info* query)
 {
 	query->result = 0;
-	glBeginQuery(m_occlusion_type, query->driver_handle);
+	glBeginQuery(GL_ANY_SAMPLES_PASSED, query->driver_handle);
 }
 
 void GLGSRender::end_occlusion_query(rsx::reports::occlusion_query_info* query)
 {
 	ensure(query->active);
-	glEndQuery(m_occlusion_type);
+	glEndQuery(GL_ANY_SAMPLES_PASSED);
 }
 
 bool GLGSRender::check_occlusion_query_status(rsx::reports::occlusion_query_info* query)
@@ -1450,6 +1097,6 @@ void GLGSRender::discard_occlusion_query(rsx::reports::occlusion_query_info* que
 	if (query->active)
 	{
 		//Discard is being called on an active query, close it
-		glEndQuery(m_occlusion_type);
+		glEndQuery(GL_ANY_SAMPLES_PASSED);
 	}
 }
diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.h b/rpcs3/Emu/RSX/GL/GLGSRender.h
index 51b126cc73..1ad11c3350 100644
--- a/rpcs3/Emu/RSX/GL/GLGSRender.h
+++ b/rpcs3/Emu/RSX/GL/GLGSRender.h
@@ -1,29 +1,25 @@
 #pragma once
 #include "Emu/RSX/GSRender.h"
+#include "GLHelpers.h"
+#include "GLTexture.h"
 #include "GLTextureCache.h"
 #include "GLRenderTargets.h"
 #include "GLProgramBuffer.h"
+#include "GLTextOut.h"
 #include "GLOverlays.h"
 #include "GLShaderInterpreter.h"
-#include "Emu/RSX/rsx_cache.h"
 
 #include <optional>
 #include <unordered_map>
-#include <thread>
 
-#include "glutils/ring_buffer.h"
-#include "upscalers/upscaling.h"
-
-#ifdef _MSC_VER
+#ifdef _WIN32
 #pragma comment(lib, "opengl32.lib")
 #endif
 
-using namespace gl::upscaling_flags_;
-
 namespace gl
 {
-	using vertex_cache = rsx::vertex_cache::default_vertex_cache<rsx::vertex_cache::uploaded_range>;
-	using weak_vertex_cache = rsx::vertex_cache::weak_vertex_cache;
+	using vertex_cache = rsx::vertex_cache::default_vertex_cache<rsx::vertex_cache::uploaded_range<GLenum>, GLenum>;
+	using weak_vertex_cache = rsx::vertex_cache::weak_vertex_cache<GLenum>;
 	using null_vertex_cache = vertex_cache;
 
 	using shader_cache = rsx::shaders_cache<void*, GLProgramBuffer>;
@@ -67,22 +63,22 @@ namespace gl
 		u32 width;
 		u32 height;
 		u32 pitch;
-		u8  eye;
 	};
 }
 
 class GLGSRender : public GSRender, public ::rsx::reports::ZCULL_control
 {
+private:
+	GLFragmentProgram m_fragment_prog;
+	GLVertexProgram m_vertex_prog;
+
 	gl::sampler_state m_fs_sampler_states[rsx::limits::fragment_textures_count];         // Fragment textures
 	gl::sampler_state m_fs_sampler_mirror_states[rsx::limits::fragment_textures_count];  // Alternate views of fragment textures with different format (e.g Depth vs Stencil for D24S8)
 	gl::sampler_state m_vs_sampler_states[rsx::limits::vertex_textures_count];           // Vertex textures
 
 	gl::glsl::program *m_program = nullptr;
-	gl::glsl::program* m_prev_program = nullptr;
-	const GLFragmentProgram *m_fragment_prog = nullptr;
-	const GLVertexProgram *m_vertex_prog = nullptr;
 
-	rsx::flags32_t m_interpreter_state = 0;
+	u32 m_interpreter_state = 0;
 	gl::shader_interpreter m_shader_interpreter;
 
 	gl_render_targets m_rtts;
@@ -105,24 +101,20 @@ class GLGSRender : public GSRender, public ::rsx::reports::ZCULL_control
 	std::unique_ptr<gl::ring_buffer> m_vertex_instructions_buffer;
 	std::unique_ptr<gl::ring_buffer> m_fragment_instructions_buffer;
 	std::unique_ptr<gl::ring_buffer> m_raster_env_ring_buffer;
-	std::unique_ptr<gl::ring_buffer> m_instancing_ring_buffer;
 
 	// Identity buffer used to fix broken gl_VertexID on ATI stack
 	std::unique_ptr<gl::buffer> m_identity_index_buffer;
 
-	// Used for hot-patching
-	std::unique_ptr<gl::ring_buffer> m_scratch_ring_buffer;
-
 	std::unique_ptr<gl::vertex_cache> m_vertex_cache;
 	std::unique_ptr<gl::shader_cache> m_shaders_cache;
 
 	GLint m_min_texbuffer_alignment = 256;
 	GLint m_uniform_buffer_offset_align = 256;
-	GLint m_min_ssbo_alignment = 256;
 	GLint m_max_texbuffer_size = 65536;
 
 	bool manually_flush_ring_buffers = false;
 
+	gl::text_writer m_text_printer;
 	gl::ui_overlay_renderer m_ui_renderer;
 	gl::video_out_calibration_pass m_video_output_pass;
 
@@ -131,36 +123,25 @@ class GLGSRender : public GSRender, public ::rsx::reports::ZCULL_control
 
 	GLProgramBuffer m_prog_buffer;
 
-	// Draw Buffers
+	//buffer
 	gl::fbo* m_draw_fbo = nullptr;
 	std::list<gl::framebuffer_holder> m_framebuffer_cache;
-	std::unique_ptr<gl::texture> m_flip_tex_color[2];
+	gl::fbo m_flip_fbo;
+	std::unique_ptr<gl::texture> m_flip_tex_color;
 
-	// Present
-	std::unique_ptr<gl::upscaler> m_upscaler;
-	output_scaling_mode m_output_scaling = output_scaling_mode::bilinear;
-
-	// VAOs are mandatory for core profile
+	//vaos are mandatory for core profile
 	gl::vao m_vao;
 
 	shared_mutex m_sampler_mutex;
 	atomic_t<bool> m_samplers_dirty = {true};
+	std::array<std::unique_ptr<rsx::sampled_image_descriptor_base>, rsx::limits::fragment_textures_count> fs_sampler_state = {};
+	std::array<std::unique_ptr<rsx::sampled_image_descriptor_base>, rsx::limits::vertex_textures_count> vs_sampler_state = {};
 	std::unordered_map<GLenum, std::unique_ptr<gl::texture>> m_null_textures;
-	rsx::simple_array<u8> m_scratch_buffer;
-
-	// Occlusion query type, can be SAMPLES_PASSED or ANY_SAMPLES_PASSED
-	GLenum m_occlusion_type = GL_ANY_SAMPLES_PASSED;
-
-	// Host context for GPU-driven work
-	std::unique_ptr<gl::buffer> m_host_gpu_context_data;
-	std::unique_ptr<gl::scratch_ring_buffer> m_enqueued_host_write_buffer;
+	std::vector<u8> m_scratch_buffer;
 
 public:
 	u64 get_cycles() final;
-
-	GLGSRender(utils::serial* ar) noexcept;
-	GLGSRender() noexcept : GLGSRender(nullptr) {}
-	virtual ~GLGSRender();
+	GLGSRender();
 
 private:
 
@@ -175,7 +156,6 @@ private:
 	bool load_program();
 	void load_program_env();
 	void update_vertex_env(const gl::vertex_upload_info& upload_info);
-	void upload_transform_constants(const rsx::io_buffer& buffer);
 
 	void update_draw_state();
 
@@ -190,26 +170,14 @@ public:
 
 	gl::work_item& post_flush_request(u32 address, gl::texture_cache::thrashed_set& flush_data);
 
-	bool scaled_image_from_memory(const rsx::blit_src_info& src_info, const rsx::blit_dst_info& dst_info, bool interpolate) override;
+	bool scaled_image_from_memory(rsx::blit_src_info& src_info, rsx::blit_dst_info& dst_info, bool interpolate) override;
 
-	// ZCULL
 	void begin_occlusion_query(rsx::reports::occlusion_query_info* query) override;
 	void end_occlusion_query(rsx::reports::occlusion_query_info* query) override;
 	bool check_occlusion_query_status(rsx::reports::occlusion_query_info* query) override;
 	void get_occlusion_query_result(rsx::reports::occlusion_query_info* query) override;
 	void discard_occlusion_query(rsx::reports::occlusion_query_info* query) override;
 
-	// DMA
-	bool release_GCM_label(u32 address, u32 data) override;
-	void enqueue_host_context_write(u32 offset, u32 size, const void* data);
-	void on_guest_texture_read();
-
-	// GRAPH backend
-	void patch_transform_constants(rsx::context* ctx, u32 index, u32 count) override;
-
-	// Misc
-	bool is_current_program_interpreted() const override;
-
 protected:
 	void clear_surface(u32 arg) override;
 	void begin() override;
@@ -220,10 +188,10 @@ protected:
 	void on_exit() override;
 	void flip(const rsx::display_flip_info_t& info) override;
 
-	void do_local_task(rsx::FIFO::state state) override;
+	void do_local_task(rsx::FIFO_state state) override;
 
 	bool on_access_violation(u32 address, bool is_writing) override;
-	void on_invalidate_memory_range(const utils::address_range32 &range, rsx::invalidation_cause cause) override;
+	void on_invalidate_memory_range(const utils::address_range &range, rsx::invalidation_cause cause) override;
 	void notify_tile_unbound(u32 tile) override;
 	void on_semaphore_acquire_wait() override;
 };
diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.cpp b/rpcs3/Emu/RSX/GL/GLHelpers.cpp
index da95960f40..34532b6d26 100644
--- a/rpcs3/Emu/RSX/GL/GLHelpers.cpp
+++ b/rpcs3/Emu/RSX/GL/GLHelpers.cpp
@@ -1,13 +1,29 @@
 #include "stdafx.h"
 #include "GLHelpers.h"
+#include "GLTexture.h"
 #include "GLCompute.h"
 #include "util/logs.hpp"
+
 #include <unordered_map>
 
 namespace gl
 {
 	std::unordered_map<u32, std::unique_ptr<gl::compute_task>> g_compute_tasks;
+	blitter *g_hw_blitter = nullptr;
 	capabilities g_driver_caps;
+	const fbo screen{};
+
+	static thread_local bool s_tls_primary_context_thread = false;
+
+	void set_primary_context_thread(bool value)
+	{
+		s_tls_primary_context_thread = value;
+	}
+
+	bool is_primary_context_thread()
+	{
+		return s_tls_primary_context_thread;
+	}
 
 	void flush_command_queue(fence& fence_obj)
 	{
@@ -166,6 +182,277 @@ namespace gl
 		return g_driver_caps;
 	}
 
+	void fbo::create()
+	{
+		glGenFramebuffers(1, &m_id);
+	}
+
+	void fbo::bind() const
+	{
+		glBindFramebuffer(GL_FRAMEBUFFER, m_id);
+	}
+
+	void fbo::blit(const fbo& dst, areai src_area, areai dst_area, buffers buffers_, filter filter_) const
+	{
+		bind_as(target::read_frame_buffer);
+		dst.bind_as(target::draw_frame_buffer);
+		glBlitFramebuffer(
+			src_area.x1, src_area.y1, src_area.x2, src_area.y2,
+			dst_area.x1, dst_area.y1, dst_area.x2, dst_area.y2,
+			static_cast<GLbitfield>(buffers_), static_cast<GLenum>(filter_));
+	}
+
+	void fbo::bind_as(target target_) const
+	{
+		glBindFramebuffer(static_cast<int>(target_), id());
+	}
+
+	void fbo::remove()
+	{
+		if (m_id != GL_NONE)
+		{
+			glDeleteFramebuffers(1, &m_id);
+			m_id = GL_NONE;
+		}
+	}
+
+	bool fbo::created() const
+	{
+		return m_id != GL_NONE;
+	}
+
+	bool fbo::check() const
+	{
+		save_binding_state save(*this);
+		GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+
+		if (status != GL_FRAMEBUFFER_COMPLETE)
+		{
+			rsx_log.error("FBO check failed: 0x%04x", status);
+			return false;
+		}
+
+		return true;
+	}
+
+	void fbo::recreate()
+	{
+		if (created())
+			remove();
+
+		create();
+	}
+
+	void fbo::draw_buffer(const attachment& buffer) const
+	{
+		save_binding_state save(*this);
+		GLenum buf = buffer.id();
+		glDrawBuffers(1, &buf);
+	}
+
+	void fbo::draw_buffers(const std::initializer_list<attachment>& indexes) const
+	{
+		save_binding_state save(*this);
+		std::vector<GLenum> ids;
+		ids.reserve(indexes.size());
+
+		for (auto &index : indexes)
+			ids.push_back(index.id());
+
+		glDrawBuffers(::narrow<GLsizei>(ids.size()), ids.data());
+	}
+
+	void fbo::read_buffer(const attachment& buffer) const
+	{
+		save_binding_state save(*this);
+		GLenum buf = buffer.id();
+
+		glReadBuffer(buf);
+	}
+
+	void fbo::draw_arrays(rsx::primitive_type mode, GLsizei count, GLint first) const
+	{
+		save_binding_state save(*this);
+		glDrawArrays(draw_mode(mode), first, count);
+	}
+
+	void fbo::draw_arrays(const buffer& buffer, rsx::primitive_type mode, GLsizei count, GLint first) const
+	{
+		buffer.bind(buffer::target::array);
+		draw_arrays(mode, count, first);
+	}
+
+	void fbo::draw_arrays(const vao& buffer, rsx::primitive_type mode, GLsizei count, GLint first) const
+	{
+		buffer.bind();
+		draw_arrays(mode, count, first);
+	}
+
+	void fbo::draw_elements(rsx::primitive_type mode, GLsizei count, indices_type type, const GLvoid *indices) const
+	{
+		save_binding_state save(*this);
+		glDrawElements(draw_mode(mode), count, static_cast<GLenum>(type), indices);
+	}
+
+	void fbo::draw_elements(const buffer& buffer, rsx::primitive_type mode, GLsizei count, indices_type type, const GLvoid *indices) const
+	{
+		buffer.bind(buffer::target::array);
+		glDrawElements(draw_mode(mode), count, static_cast<GLenum>(type), indices);
+	}
+
+	void fbo::draw_elements(rsx::primitive_type mode, GLsizei count, indices_type type, const buffer& indices, usz indices_buffer_offset) const
+	{
+		indices.bind(buffer::target::element_array);
+		glDrawElements(draw_mode(mode), count, static_cast<GLenum>(type), reinterpret_cast<GLvoid*>(indices_buffer_offset));
+	}
+
+	void fbo::draw_elements(const buffer& buffer_, rsx::primitive_type mode, GLsizei count, indices_type type, const buffer& indices, usz indices_buffer_offset) const
+	{
+		buffer_.bind(buffer::target::array);
+		draw_elements(mode, count, type, indices, indices_buffer_offset);
+	}
+
+	void fbo::draw_elements(rsx::primitive_type mode, GLsizei count, const GLubyte *indices) const
+	{
+		draw_elements(mode, count, indices_type::ubyte, indices);
+	}
+
+	void fbo::draw_elements(const buffer& buffer, rsx::primitive_type mode, GLsizei count, const GLubyte *indices) const
+	{
+		draw_elements(buffer, mode, count, indices_type::ubyte, indices);
+	}
+
+	void fbo::draw_elements(rsx::primitive_type mode, GLsizei count, const GLushort *indices) const
+	{
+		draw_elements(mode, count, indices_type::ushort, indices);
+	}
+
+	void fbo::draw_elements(const buffer& buffer, rsx::primitive_type mode, GLsizei count, const GLushort *indices) const
+	{
+		draw_elements(buffer, mode, count, indices_type::ushort, indices);
+	}
+
+	void fbo::draw_elements(rsx::primitive_type mode, GLsizei count, const GLuint *indices) const
+	{
+		draw_elements(mode, count, indices_type::uint, indices);
+	}
+
+	void fbo::draw_elements(const buffer& buffer, rsx::primitive_type mode, GLsizei count, const GLuint *indices) const
+	{
+		draw_elements(buffer, mode, count, indices_type::uint, indices);
+	}
+
+	void fbo::clear(buffers buffers_) const
+	{
+		save_binding_state save(*this);
+		glClear(static_cast<GLbitfield>(buffers_));
+	}
+
+	void fbo::clear(buffers buffers_, color4f color_value, double depth_value, u8 stencil_value) const
+	{
+		save_binding_state save(*this);
+		glClearColor(color_value.r, color_value.g, color_value.b, color_value.a);
+		glClearDepth(depth_value);
+		glClearStencil(stencil_value);
+		clear(buffers_);
+	}
+
+	void fbo::copy_from(const void* pixels, const sizei& size, gl::texture::format format_, gl::texture::type type_, class pixel_unpack_settings pixel_settings) const
+	{
+		save_binding_state save(*this);
+		pixel_settings.apply();
+		glDrawPixels(size.width, size.height, static_cast<GLenum>(format_), static_cast<GLenum>(type_), pixels);
+	}
+
+	void fbo::copy_from(const buffer& buf, const sizei& size, gl::texture::format format_, gl::texture::type type_, class pixel_unpack_settings pixel_settings) const
+	{
+		save_binding_state save(*this);
+		buffer::save_binding_state save_buffer(buffer::target::pixel_unpack, buf);
+		pixel_settings.apply();
+		glDrawPixels(size.width, size.height, static_cast<GLenum>(format_), static_cast<GLenum>(type_), nullptr);
+	}
+
+	void fbo::copy_to(void* pixels, coordi coord, gl::texture::format format_, gl::texture::type type_, class pixel_pack_settings pixel_settings) const
+	{
+		save_binding_state save(*this);
+		pixel_settings.apply();
+		glReadPixels(coord.x, coord.y, coord.width, coord.height, static_cast<GLenum>(format_), static_cast<GLenum>(type_), pixels);
+	}
+
+	void fbo::copy_to(const buffer& buf, coordi coord, gl::texture::format format_, gl::texture::type type_, class pixel_pack_settings pixel_settings) const
+	{
+		save_binding_state save(*this);
+		buffer::save_binding_state save_buffer(buffer::target::pixel_pack, buf);
+		pixel_settings.apply();
+		glReadPixels(coord.x, coord.y, coord.width, coord.height, static_cast<GLenum>(format_), static_cast<GLenum>(type_), nullptr);
+	}
+
+	fbo fbo::get_bound_draw_buffer()
+	{
+		GLint value;
+		glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &value);
+
+		return{ static_cast<GLuint>(value) };
+	}
+
+	fbo fbo::get_bound_read_buffer()
+	{
+		GLint value;
+		glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &value);
+
+		return{ static_cast<GLuint>(value) };
+	}
+
+	fbo fbo::get_bound_buffer()
+	{
+		GLint value;
+		glGetIntegerv(GL_FRAMEBUFFER_BINDING, &value);
+
+		return{ static_cast<GLuint>(value) };
+	}
+
+	GLuint fbo::id() const
+	{
+		return m_id;
+	}
+
+	void fbo::set_id(GLuint id)
+	{
+		m_id = id;
+	}
+
+	void fbo::set_extents(const size2i& extents)
+	{
+		m_size = extents;
+	}
+
+	size2i fbo::get_extents() const
+	{
+		return m_size;
+	}
+
+	bool fbo::matches(const std::array<GLuint, 4>& color_targets, GLuint depth_stencil_target) const
+	{
+		for (u32 index = 0; index < 4; ++index)
+		{
+			if (color[index].resource_id() != color_targets[index])
+			{
+				return false;
+			}
+		}
+
+		const auto depth_resource = depth.resource_id() | depth_stencil.resource_id();
+		return (depth_resource == depth_stencil_target);
+	}
+
+	bool fbo::references_any(const std::vector<GLuint>& resources) const
+	{
+		return std::any_of(m_resource_bindings.cbegin(), m_resource_bindings.cend(), [&resources](const auto& e)
+		{
+			return std::find(resources.cbegin(), resources.cend(), e.second) != resources.cend();
+		});
+	}
+
 	bool is_primitive_native(rsx::primitive_type in)
 	{
 		switch (in)
@@ -186,4 +473,192 @@ namespace gl
 			fmt::throw_exception("unknown primitive type");
 		}
 	}
+
+	attrib_t vao::operator[](u32 index) const noexcept
+	{
+		return attrib_t(index);
+	}
+
+	void blitter::scale_image(gl::command_context& cmd, const texture* src, texture* dst, areai src_rect, areai dst_rect,
+		bool linear_interpolation, const rsx::typeless_xfer& xfer_info)
+	{
+		std::unique_ptr<texture> typeless_src;
+		std::unique_ptr<texture> typeless_dst;
+		const gl::texture* real_src = src;
+		const gl::texture* real_dst = dst;
+
+		// Optimization pass; check for pass-through data transfer
+		if (!xfer_info.flip_horizontal && !xfer_info.flip_vertical && src_rect.height() == dst_rect.height())
+		{
+			auto src_w = src_rect.width();
+			auto dst_w = dst_rect.width();
+
+			if (xfer_info.src_is_typeless) src_w = static_cast<int>(src_w * xfer_info.src_scaling_hint);
+			if (xfer_info.dst_is_typeless) dst_w = static_cast<int>(dst_w * xfer_info.dst_scaling_hint);
+
+			if (src_w == dst_w)
+			{
+				// Final dimensions are a match
+				if (xfer_info.src_is_typeless || xfer_info.dst_is_typeless)
+				{
+					const coord3i src_region = { { src_rect.x1, src_rect.y1, 0 }, { src_rect.width(), src_rect.height(), 1 } };
+					const coord3i dst_region = { { dst_rect.x1, dst_rect.y1, 0 }, { dst_rect.width(), dst_rect.height(), 1 } };
+					gl::copy_typeless(dst, src, static_cast<coord3u>(dst_region), static_cast<coord3u>(src_region));
+				}
+				else
+				{
+					glCopyImageSubData(src->id(), GL_TEXTURE_2D, 0, src_rect.x1, src_rect.y1, 0,
+						dst->id(), GL_TEXTURE_2D, 0, dst_rect.x1, dst_rect.y1, 0,
+						src_rect.width(), src_rect.height(), 1);
+				}
+
+				return;
+			}
+		}
+
+		if (xfer_info.src_is_typeless)
+		{
+			const auto internal_fmt = xfer_info.src_native_format_override ?
+				GLenum(xfer_info.src_native_format_override) :
+				get_sized_internal_format(xfer_info.src_gcm_format);
+
+			if (static_cast<gl::texture::internal_format>(internal_fmt) != src->get_internal_format())
+			{
+				const u16 internal_width = static_cast<u16>(src->width() * xfer_info.src_scaling_hint);
+				typeless_src = std::make_unique<texture>(GL_TEXTURE_2D, internal_width, src->height(), 1, 1, internal_fmt);
+				copy_typeless(typeless_src.get(), src);
+
+				real_src = typeless_src.get();
+				src_rect.x1 = static_cast<u16>(src_rect.x1 * xfer_info.src_scaling_hint);
+				src_rect.x2 = static_cast<u16>(src_rect.x2 * xfer_info.src_scaling_hint);
+			}
+		}
+
+		if (xfer_info.dst_is_typeless)
+		{
+			const auto internal_fmt = xfer_info.dst_native_format_override ?
+				GLenum(xfer_info.dst_native_format_override) :
+				get_sized_internal_format(xfer_info.dst_gcm_format);
+
+			if (static_cast<gl::texture::internal_format>(internal_fmt) != dst->get_internal_format())
+			{
+				const auto internal_width = static_cast<u16>(dst->width() * xfer_info.dst_scaling_hint);
+				typeless_dst = std::make_unique<texture>(GL_TEXTURE_2D, internal_width, dst->height(), 1, 1, internal_fmt);
+				copy_typeless(typeless_dst.get(), dst);
+
+				real_dst = typeless_dst.get();
+				dst_rect.x1 = static_cast<u16>(dst_rect.x1 * xfer_info.dst_scaling_hint);
+				dst_rect.x2 = static_cast<u16>(dst_rect.x2 * xfer_info.dst_scaling_hint);
+			}
+		}
+
+		ensure(real_src->aspect() == real_dst->aspect());
+
+		const bool is_depth_copy = (real_src->aspect() != image_aspect::color);
+		const filter interp = (linear_interpolation && !is_depth_copy) ? filter::linear : filter::nearest;
+		GLenum attachment;
+		gl::buffers target;
+
+		if (is_depth_copy)
+		{
+			if (real_dst->aspect() & gl::image_aspect::stencil)
+			{
+				attachment = GL_DEPTH_STENCIL_ATTACHMENT;
+				target = gl::buffers::depth_stencil;
+			}
+			else
+			{
+				attachment = GL_DEPTH_ATTACHMENT;
+				target = gl::buffers::depth;
+			}
+		}
+		else
+		{
+			attachment = GL_COLOR_ATTACHMENT0;
+			target = gl::buffers::color;
+		}
+
+		cmd.drv->enable(GL_FALSE, GL_SCISSOR_TEST);
+
+		save_binding_state saved;
+
+		glBindFramebuffer(GL_READ_FRAMEBUFFER, blit_src.id());
+		glFramebufferTexture2D(GL_READ_FRAMEBUFFER, attachment, GL_TEXTURE_2D, real_src->id(), 0);
+
+		glBindFramebuffer(GL_DRAW_FRAMEBUFFER, blit_dst.id());
+		glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, attachment, GL_TEXTURE_2D, real_dst->id(), 0);
+
+		if (xfer_info.flip_horizontal)
+		{
+			src_rect.flip_horizontal();
+		}
+
+		if (xfer_info.flip_vertical)
+		{
+			src_rect.flip_vertical();
+		}
+
+		glBlitFramebuffer(src_rect.x1, src_rect.y1, src_rect.x2, src_rect.y2,
+			dst_rect.x1, dst_rect.y1, dst_rect.x2, dst_rect.y2,
+			static_cast<GLbitfield>(target), static_cast<GLenum>(interp));
+
+		if (xfer_info.dst_is_typeless)
+		{
+			// Transfer contents from typeless dst back to original dst
+			copy_typeless(dst, typeless_dst.get());
+		}
+
+		// Release the attachments explicitly (not doing so causes glitches, e.g Journey Menu)
+		glFramebufferTexture2D(GL_READ_FRAMEBUFFER, attachment, GL_TEXTURE_2D, GL_NONE, 0);
+		glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, attachment, GL_TEXTURE_2D, GL_NONE, 0);
+	}
+
+	void blitter::fast_clear_image(gl::command_context& cmd, const texture* dst, const color4f& color)
+	{
+		save_binding_state saved;
+
+		blit_dst.bind();
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, dst->id(), 0);
+		blit_dst.check();
+
+		cmd.drv->clear_color(color);
+		cmd.drv->color_maski(0, true, true, true, true);
+
+		glClear(GL_COLOR_BUFFER_BIT);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, GL_NONE, 0);
+	}
+
+	void blitter::fast_clear_image(gl::command_context& cmd, const texture* dst, float /*depth*/, u8 /*stencil*/)
+	{
+		GLenum attachment;
+		GLbitfield clear_mask;
+
+		switch (const auto fmt = dst->get_internal_format())
+		{
+		case texture::internal_format::depth16:
+		case texture::internal_format::depth32f:
+			clear_mask = GL_DEPTH_BUFFER_BIT;
+			attachment = GL_DEPTH_ATTACHMENT;
+			break;
+		case texture::internal_format::depth24_stencil8:
+		case texture::internal_format::depth32f_stencil8:
+			clear_mask = GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT;
+			attachment = GL_DEPTH_STENCIL_ATTACHMENT;
+			break;
+		default:
+			fmt::throw_exception("Invalid texture passed to clear depth function, format=0x%x", static_cast<u32>(fmt));
+		}
+
+		save_binding_state saved;
+
+		blit_dst.bind();
+		glFramebufferTexture2D(GL_FRAMEBUFFER, attachment, GL_TEXTURE_2D, dst->id(), 0);
+		blit_dst.check();
+
+		cmd.drv->depth_mask(GL_TRUE);
+		cmd.drv->stencil_mask(0xFF);
+
+		glClear(clear_mask);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, attachment, GL_TEXTURE_2D, GL_NONE, 0);
+	}
 }
diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.h b/rpcs3/Emu/RSX/GL/GLHelpers.h
index 368cd9e124..9930f33fbc 100644
--- a/rpcs3/Emu/RSX/GL/GLHelpers.h
+++ b/rpcs3/Emu/RSX/GL/GLHelpers.h
@@ -7,33 +7,2778 @@
 #include <unordered_map>
 #include <algorithm>
 
+#include "GLExecutionState.h"
 #include "../GCM.h"
 #include "../Common/TextureUtils.h"
 #include "../Program/GLSLTypes.h"
 
+#include "Emu/system_config.h"
 #include "Utilities/mutex.h"
 #include "Utilities/geometry.h"
 #include "Utilities/File.h"
 #include "util/logs.hpp"
 #include "util/asm.hpp"
 
-#include "glutils/common.h"
-// TODO: Include on use
-#include "glutils/buffer_object.h"
-#include "glutils/image.h"
-#include "glutils/sampler.h"
-#include "glutils/pixel_settings.hpp"
-#include "glutils/state_tracker.hpp"
+#define GL_FRAGMENT_TEXTURES_START 0
+#define GL_VERTEX_TEXTURES_START   (GL_FRAGMENT_TEXTURES_START + 16)
+#define GL_STENCIL_MIRRORS_START   (GL_VERTEX_TEXTURES_START + 4)
+#define GL_STREAM_BUFFER_START     (GL_STENCIL_MIRRORS_START + 16)
+
+#define GL_VERTEX_PARAMS_BIND_SLOT 0
+#define GL_VERTEX_LAYOUT_BIND_SLOT 1
+#define GL_VERTEX_CONSTANT_BUFFERS_BIND_SLOT 2
+#define GL_FRAGMENT_CONSTANT_BUFFERS_BIND_SLOT 3
+#define GL_FRAGMENT_STATE_BIND_SLOT 4
+#define GL_FRAGMENT_TEXTURE_PARAMS_BIND_SLOT 5
+#define GL_RASTERIZER_STATE_BIND_SLOT 6
+#define GL_INTERPRETER_VERTEX_BLOCK 7
+#define GL_INTERPRETER_FRAGMENT_BLOCK 8
+#define GL_COMPUTE_BUFFER_SLOT(index) (index + 9)
 
 // Noop keyword outside of Windows (used in log_debug)
 #if !defined(_WIN32) && !defined(APIENTRY)
 #define APIENTRY
 #endif
 
+inline static void _SelectTexture(int unit) { glActiveTexture(GL_TEXTURE0 + unit); }
+
+//using enum rsx::format_class;
+using namespace ::rsx::format_class_;
 
 namespace gl
 {
+	//Function call wrapped in ARB_DSA vs EXT_DSA compat check
+#define DSA_CALL(func, texture_name, target, ...)\
+	if (::gl::get_driver_caps().ARB_dsa_supported)\
+		gl##func(texture_name, __VA_ARGS__);\
+	else\
+		gl##func##EXT(texture_name, target, __VA_ARGS__);
+
+	class fence;
+
 	void enable_debugging();
 	bool is_primitive_native(rsx::primitive_type in);
 	GLenum draw_mode(rsx::primitive_type in);
+
+	void set_primary_context_thread(bool = true);
+	bool is_primary_context_thread();
+	void flush_command_queue(fence& fence_obj);
+
+	// Texture helpers
+	std::array<GLenum, 4> apply_swizzle_remap(const std::array<GLenum, 4>& swizzle_remap, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& decoded_remap);
+
+	class exception : public std::exception
+	{
+	protected:
+		std::string m_what;
+
+	public:
+		const char* what() const noexcept override
+		{
+			return m_what.c_str();
+		}
+	};
+
+	class fence
+	{
+		GLsync m_value = nullptr;
+		mutable GLenum flags = GL_SYNC_FLUSH_COMMANDS_BIT;
+		mutable bool signaled = false;
+
+	public:
+
+		fence() = default;
+		~fence() = default;
+
+		void create()
+		{
+			m_value = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+			flags = GL_SYNC_FLUSH_COMMANDS_BIT;
+		}
+
+		void destroy()
+		{
+			glDeleteSync(m_value);
+			m_value = nullptr;
+		}
+
+		void reset()
+		{
+			if (m_value != nullptr)
+				destroy();
+
+			create();
+		}
+
+		bool is_empty() const
+		{
+			return (m_value == nullptr);
+		}
+
+		bool check_signaled() const
+		{
+			ensure(m_value);
+
+			if (signaled)
+				return true;
+
+			if (flags)
+			{
+				GLenum err = glClientWaitSync(m_value, flags, 0);
+				flags = 0;
+
+				if (!(err == GL_ALREADY_SIGNALED || err == GL_CONDITION_SATISFIED))
+					return false;
+			}
+			else
+			{
+				GLint status = GL_UNSIGNALED;
+				GLint tmp;
+
+				glGetSynciv(m_value, GL_SYNC_STATUS, 4, &tmp, &status);
+
+				if (status != GL_SIGNALED)
+					return false;
+			}
+
+			signaled = true;
+			return true;
+		}
+
+		bool wait_for_signal()
+		{
+			ensure(m_value);
+
+			if (signaled == GL_FALSE)
+			{
+				GLenum err = GL_WAIT_FAILED;
+				bool done = false;
+
+				while (!done)
+				{
+					if (flags)
+					{
+						err = glClientWaitSync(m_value, flags, 0);
+						flags = 0;
+
+						switch (err)
+						{
+						default:
+							rsx_log.error("gl::fence sync returned unknown error 0x%X", err);
+							[[fallthrough]];
+						case GL_ALREADY_SIGNALED:
+						case GL_CONDITION_SATISFIED:
+							done = true;
+							break;
+						case GL_TIMEOUT_EXPIRED:
+							continue;
+						}
+					}
+					else
+					{
+						GLint status = GL_UNSIGNALED;
+						GLint tmp;
+
+						glGetSynciv(m_value, GL_SYNC_STATUS, 4, &tmp, &status);
+
+						if (status == GL_SIGNALED)
+							break;
+					}
+				}
+
+				signaled = (err == GL_ALREADY_SIGNALED || err == GL_CONDITION_SATISFIED);
+			}
+
+			glDeleteSync(m_value);
+			m_value = nullptr;
+
+			return signaled;
+		}
+
+		void server_wait_sync() const
+		{
+			ensure(m_value != nullptr);
+			glWaitSync(m_value, 0, GL_TIMEOUT_IGNORED);
+		}
+	};
+
+	template<typename Type, uint BindId, uint GetStateId>
+	class save_binding_state_base
+	{
+		GLint m_last_binding;
+
+	public:
+		save_binding_state_base(const Type& new_state) : save_binding_state_base()
+		{
+			new_state.bind();
+		}
+
+		save_binding_state_base()
+		{
+			glGetIntegerv(GetStateId, &m_last_binding);
+		}
+
+		~save_binding_state_base()
+		{
+			glBindBuffer(BindId, m_last_binding);
+		}
+	};
+
+	enum class filter
+	{
+		nearest = GL_NEAREST,
+		linear = GL_LINEAR
+	};
+
+	enum class min_filter
+	{
+		nearest = GL_NEAREST,
+		linear = GL_LINEAR,
+		nearest_mipmap_nearest = GL_NEAREST_MIPMAP_NEAREST,
+		nearest_mipmap_linear = GL_NEAREST_MIPMAP_LINEAR,
+		linear_mipmap_nearest = GL_LINEAR_MIPMAP_NEAREST,
+		linear_mipmap_linear = GL_LINEAR_MIPMAP_LINEAR
+	};
+
+	enum class buffers
+	{
+		none = 0,
+		color = GL_COLOR_BUFFER_BIT,
+		depth = GL_DEPTH_BUFFER_BIT,
+		stencil = GL_STENCIL_BUFFER_BIT,
+
+		color_depth = color | depth,
+		color_depth_stencil = color | depth | stencil,
+		color_stencil = color | stencil,
+
+		depth_stencil = depth | stencil
+	};
+
+	class pixel_pack_settings
+	{
+		bool m_swap_bytes = false;
+		bool m_lsb_first = false;
+		int m_row_length = 0;
+		int m_image_height = 0;
+		int m_skip_rows = 0;
+		int m_skip_pixels = 0;
+		int m_skip_images = 0;
+		int m_alignment = 4;
+
+	public:
+		void apply() const
+		{
+			glPixelStorei(GL_PACK_SWAP_BYTES, m_swap_bytes ? GL_TRUE : GL_FALSE);
+			glPixelStorei(GL_PACK_LSB_FIRST, m_lsb_first ? GL_TRUE : GL_FALSE);
+			glPixelStorei(GL_PACK_ROW_LENGTH, m_row_length);
+			glPixelStorei(GL_PACK_IMAGE_HEIGHT, m_image_height);
+			glPixelStorei(GL_PACK_SKIP_ROWS, m_skip_rows);
+			glPixelStorei(GL_PACK_SKIP_PIXELS, m_skip_pixels);
+			glPixelStorei(GL_PACK_SKIP_IMAGES, m_skip_images);
+			glPixelStorei(GL_PACK_ALIGNMENT, m_alignment);
+		}
+
+		pixel_pack_settings& swap_bytes(bool value = true)
+		{
+			m_swap_bytes = value;
+			return *this;
+		}
+		pixel_pack_settings& lsb_first(bool value = true)
+		{
+			m_lsb_first = value;
+			return *this;
+		}
+		pixel_pack_settings& row_length(int value)
+		{
+			m_row_length = value;
+			return *this;
+		}
+		pixel_pack_settings& image_height(int value)
+		{
+			m_image_height = value;
+			return *this;
+		}
+		pixel_pack_settings& skip_rows(int value)
+		{
+			m_skip_rows = value;
+			return *this;
+		}
+		pixel_pack_settings& skip_pixels(int value)
+		{
+			m_skip_pixels = value;
+			return *this;
+		}
+		pixel_pack_settings& skip_images(int value)
+		{
+			m_skip_images = value;
+			return *this;
+		}
+		pixel_pack_settings& alignment(int value)
+		{
+			m_alignment = value;
+			return *this;
+		}
+	};
+
+	class pixel_unpack_settings
+	{
+		bool m_swap_bytes = false;
+		bool m_lsb_first = false;
+		int m_row_length = 0;
+		int m_image_height = 0;
+		int m_skip_rows = 0;
+		int m_skip_pixels = 0;
+		int m_skip_images = 0;
+		int m_alignment = 4;
+
+	public:
+		void apply() const
+		{
+			glPixelStorei(GL_UNPACK_SWAP_BYTES, m_swap_bytes ? GL_TRUE : GL_FALSE);
+			glPixelStorei(GL_UNPACK_LSB_FIRST, m_lsb_first ? GL_TRUE : GL_FALSE);
+			glPixelStorei(GL_UNPACK_ROW_LENGTH, m_row_length);
+			glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, m_image_height);
+			glPixelStorei(GL_UNPACK_SKIP_ROWS, m_skip_rows);
+			glPixelStorei(GL_UNPACK_SKIP_PIXELS, m_skip_pixels);
+			glPixelStorei(GL_UNPACK_SKIP_IMAGES, m_skip_images);
+			glPixelStorei(GL_UNPACK_ALIGNMENT, m_alignment);
+		}
+
+		pixel_unpack_settings& swap_bytes(bool value = true)
+		{
+			m_swap_bytes = value;
+			return *this;
+		}
+		pixel_unpack_settings& lsb_first(bool value = true)
+		{
+			m_lsb_first = value;
+			return *this;
+		}
+		pixel_unpack_settings& row_length(int value)
+		{
+			m_row_length = value;
+			return *this;
+		}
+		pixel_unpack_settings& image_height(int value)
+		{
+			m_image_height = value;
+			return *this;
+		}
+		pixel_unpack_settings& skip_rows(int value)
+		{
+			m_skip_rows = value;
+			return *this;
+		}
+		pixel_unpack_settings& skip_pixels(int value)
+		{
+			m_skip_pixels = value;
+			return *this;
+		}
+		pixel_unpack_settings& skip_images(int value)
+		{
+			m_skip_images = value;
+			return *this;
+		}
+		pixel_unpack_settings& alignment(int value)
+		{
+			m_alignment = value;
+			return *this;
+		}
+	};
+
+	class vao;
+	class attrib_t;
+
+	class buffer_pointer
+	{
+	public:
+		enum class type
+		{
+			s8 = GL_BYTE,
+			u8 = GL_UNSIGNED_BYTE,
+			s16 = GL_SHORT,
+			u16 = GL_UNSIGNED_SHORT,
+			s32 = GL_INT,
+			u32 = GL_UNSIGNED_INT,
+			f16 = GL_HALF_FLOAT,
+			f32 = GL_FLOAT,
+			f64 = GL_DOUBLE,
+			fixed = GL_FIXED,
+			s32_2_10_10_10_rev = GL_INT_2_10_10_10_REV,
+			u32_2_10_10_10_rev = GL_UNSIGNED_INT_2_10_10_10_REV,
+			u32_10f_11f_11f_rev = GL_UNSIGNED_INT_10F_11F_11F_REV
+		};
+
+	private:
+		vao* m_vao;
+		u32 m_offset;
+		u32 m_stride;
+		u32 m_size = 4;
+		type m_type = type::f32;
+		bool m_normalize = false;
+
+	public:
+		buffer_pointer(vao* vao, u32 offset = 0, u32 stride = 0)
+			: m_vao(vao)
+			, m_offset(offset)
+			, m_stride(stride)
+		{
+		}
+
+		const class ::gl::vao& get_vao() const
+		{
+			return *m_vao;
+		}
+
+		class ::gl::vao& get_vao()
+		{
+			return *m_vao;
+		}
+
+		buffer_pointer& offset(u32 value)
+		{
+			m_offset = value;
+			return *this;
+		}
+
+		u32 offset() const
+		{
+			return m_offset;
+		}
+
+		buffer_pointer& stride(u32 value)
+		{
+			m_stride = value;
+			return *this;
+		}
+
+		u32 stride() const
+		{
+			return m_stride;
+		}
+
+		buffer_pointer& size(u32 value)
+		{
+			m_size = value;
+			return *this;
+		}
+
+		u32 size() const
+		{
+			return m_size;
+		}
+
+		buffer_pointer& set_type(type value)
+		{
+			m_type = value;
+			return *this;
+		}
+
+		type get_type() const
+		{
+			return m_type;
+		}
+
+		buffer_pointer& normalize(bool value)
+		{
+			m_normalize = value;
+			return *this;
+		}
+
+		bool normalize() const
+		{
+			return m_normalize;
+		}
+
+		buffer_pointer& operator >> (u32 value)
+		{
+			return stride(value);
+		}
+
+		buffer_pointer& config(type type_ = type::f32, u32 size_ = 4, bool normalize_ = false)
+		{
+			return set_type(type_).size(size_).normalize(normalize_);
+		}
+	};
+
+	class buffer
+	{
+	public:
+		enum class target
+		{
+			pixel_pack = GL_PIXEL_PACK_BUFFER,
+			pixel_unpack = GL_PIXEL_UNPACK_BUFFER,
+			array = GL_ARRAY_BUFFER,
+			element_array = GL_ELEMENT_ARRAY_BUFFER,
+			uniform = GL_UNIFORM_BUFFER,
+			texture = GL_TEXTURE_BUFFER,
+			ssbo = GL_SHADER_STORAGE_BUFFER
+		};
+
+		enum class access
+		{
+			read = GL_READ_ONLY,
+			write = GL_WRITE_ONLY,
+			read_write = GL_READ_WRITE
+		};
+
+		enum class memory_type
+		{
+			undefined = 0,
+			local = 1,
+			host_visible = 2
+		};
+
+		class save_binding_state
+		{
+			GLint m_last_binding;
+			GLenum m_target;
+
+		public:
+			save_binding_state(target target_, const buffer& new_state) : save_binding_state(target_)
+			{
+				new_state.bind(target_);
+			}
+
+			save_binding_state(target target_)
+			{
+				GLenum pname{};
+				switch (target_)
+				{
+				case target::pixel_pack: pname = GL_PIXEL_PACK_BUFFER_BINDING; break;
+				case target::pixel_unpack: pname = GL_PIXEL_UNPACK_BUFFER_BINDING; break;
+				case target::array: pname = GL_ARRAY_BUFFER_BINDING; break;
+				case target::element_array: pname = GL_ELEMENT_ARRAY_BUFFER_BINDING; break;
+				case target::uniform: pname = GL_UNIFORM_BUFFER_BINDING; break;
+				case target::texture: pname = GL_TEXTURE_BUFFER_BINDING; break;
+				case target::ssbo: pname = GL_SHADER_STORAGE_BUFFER_BINDING; break;
+				default: fmt::throw_exception("Invalid binding state target (0x%x)", static_cast<int>(target_));
+				}
+
+				glGetIntegerv(pname, &m_last_binding);
+				m_target = static_cast<GLenum>(target_);
+			}
+
+			~save_binding_state()
+			{
+				glBindBuffer(m_target, m_last_binding);
+			}
+		};
+
+	protected:
+		GLuint m_id = GL_NONE;
+		GLsizeiptr m_size = 0;
+		target m_target = target::array;
+		memory_type m_memory_type = memory_type::undefined;
+
+		void allocate(GLsizeiptr size, const void* data_, memory_type type, GLenum usage)
+		{
+			if (const auto& caps = get_driver_caps();
+				caps.ARB_buffer_storage_supported)
+			{
+				target target_ = current_target();
+				save_binding_state save(target_, *this);
+				GLenum flags = 0;
+
+				if (type == memory_type::host_visible)
+				{
+					switch (usage)
+					{
+					case GL_STREAM_DRAW:
+					case GL_STATIC_DRAW:
+					case GL_DYNAMIC_DRAW:
+						flags |= GL_MAP_WRITE_BIT;
+						break;
+					case GL_STREAM_READ:
+					case GL_STATIC_READ:
+					case GL_DYNAMIC_READ:
+						flags |= GL_MAP_READ_BIT;
+						break;
+					default:
+						fmt::throw_exception("Unsupported buffer usage 0x%x", usage);
+					}
+				}
+
+				if ((flags & GL_MAP_READ_BIT) && !caps.vendor_AMD)
+				{
+					// This flag stops NVIDIA from allocating read-only memory in VRAM.
+					// NOTE: On AMD, allocating client-side memory via CLIENT_STORAGE_BIT or
+					// making use of GL_AMD_pinned_memory brings everything down to a crawl.
+					// Afaict there is no reason for this; disabling pixel pack/unpack operations does not alleviate the problem.
+					// The driver seems to eventually figure out the optimal storage location by itself.
+					flags |= GL_CLIENT_STORAGE_BIT;
+				}
+
+				glBufferStorage(static_cast<GLenum>(target_), size, data_, flags);
+				m_size = size;
+			}
+			else
+			{
+				data(size, data_, usage);
+			}
+
+			m_memory_type = type;
+		}
+
+	public:
+		buffer() = default;
+		buffer(const buffer&) = delete;
+
+		buffer(GLuint id)
+		{
+			set_id(id);
+		}
+
+		~buffer()
+		{
+			if (created())
+				remove();
+		}
+
+		void recreate()
+		{
+			if (created())
+			{
+				remove();
+			}
+
+			create();
+		}
+
+		void recreate(GLsizeiptr size, const void* data = nullptr)
+		{
+			if (created())
+			{
+				remove();
+			}
+
+			create(size, data);
+		}
+
+		void create()
+		{
+			glGenBuffers(1, &m_id);
+		}
+
+		void create(GLsizeiptr size, const void* data_ = nullptr, memory_type type = memory_type::local, GLenum usage = GL_STREAM_DRAW)
+		{
+			create();
+			allocate(size, data_, type, usage);
+		}
+
+		void create(target target_, GLsizeiptr size, const void* data_ = nullptr, memory_type type = memory_type::local, GLenum usage = GL_STREAM_DRAW)
+		{
+			create();
+			m_target = target_;
+			allocate(size, data_, type, usage);
+		}
+
+		void bind(target target_) const
+		{
+			glBindBuffer(static_cast<GLenum>(target_), m_id);
+		}
+
+		void bind() const
+		{
+			bind(current_target());
+		}
+
+		target current_target() const
+		{
+			return m_target;
+		}
+
+		void remove()
+		{
+			if (m_id != GL_NONE)
+			{
+				glDeleteBuffers(1, &m_id);
+				m_id = GL_NONE;
+			}
+		}
+
+		GLsizeiptr size() const
+		{
+			return m_size;
+		}
+
+		uint id() const
+		{
+			return m_id;
+		}
+
+		void set_id(uint id)
+		{
+			m_id = id;
+		}
+
+		bool created() const
+		{
+			return m_id != GL_NONE;
+		}
+
+		explicit operator bool() const
+		{
+			return created();
+		}
+
+		void data(GLsizeiptr size, const void* data_ = nullptr, GLenum usage = GL_STREAM_DRAW)
+		{
+			ensure(m_memory_type != memory_type::local);
+
+			target target_ = current_target();
+			save_binding_state save(target_, *this);
+			glBufferData(static_cast<GLenum>(target_), size, data_, usage);
+			m_size = size;
+		}
+
+		GLubyte* map(access access_)
+		{
+			ensure(m_memory_type == memory_type::host_visible);
+
+			bind(current_target());
+			return reinterpret_cast<GLubyte*>(glMapBuffer(static_cast<GLenum>(current_target()), static_cast<GLenum>(access_)));
+		}
+
+		void unmap()
+		{
+			ensure(m_memory_type == memory_type::host_visible);
+			glUnmapBuffer(static_cast<GLenum>(current_target()));
+		}
+
+		void bind_range(u32 index, u32 offset, u32 size) const
+		{
+			glBindBufferRange(static_cast<GLenum>(current_target()), index, id(), offset, size);
+		}
+
+		void bind_range(target target_, u32 index, u32 offset, u32 size) const
+		{
+			glBindBufferRange(static_cast<GLenum>(target_), index, id(), offset, size);
+		}
+
+		void copy_to(buffer* other, u64 src_offset, u64 dst_offset, u64 size)
+		{
+			if (get_driver_caps().ARB_dsa_supported)
+			{
+				glCopyNamedBufferSubData(this->id(), other->id(), src_offset, dst_offset, size);
+			}
+			else
+			{
+				glNamedCopyBufferSubDataEXT(this->id(), other->id(), src_offset, dst_offset, size);
+			}
+		}
+	};
+
+	class ring_buffer : public buffer
+	{
+	protected:
+
+		u32 m_data_loc = 0;
+		void *m_memory_mapping = nullptr;
+
+		fence m_fence;
+
+	public:
+
+		virtual void recreate(GLsizeiptr size, const void* data = nullptr)
+		{
+			if (m_id)
+			{
+				m_fence.wait_for_signal();
+				remove();
+			}
+
+			buffer::create();
+
+			GLbitfield buffer_storage_flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT;
+			if (gl::get_driver_caps().vendor_MESA) buffer_storage_flags |= GL_CLIENT_STORAGE_BIT;
+
+			glBindBuffer(static_cast<GLenum>(m_target), m_id);
+			glBufferStorage(static_cast<GLenum>(m_target), size, data, buffer_storage_flags);
+			m_memory_mapping = glMapBufferRange(static_cast<GLenum>(m_target), 0, size, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
+
+			ensure(m_memory_mapping != nullptr);
+			m_data_loc = 0;
+			m_size = ::narrow<u32>(size);
+		}
+
+		void create(target target_, GLsizeiptr size, const void* data_ = nullptr)
+		{
+			m_target = target_;
+			recreate(size, data_);
+		}
+
+		virtual std::pair<void*, u32> alloc_from_heap(u32 alloc_size, u16 alignment)
+		{
+			u32 offset = m_data_loc;
+			if (m_data_loc) offset = utils::align(offset, alignment);
+
+			if ((offset + alloc_size) > m_size)
+			{
+				if (!m_fence.is_empty())
+				{
+					m_fence.wait_for_signal();
+				}
+				else
+				{
+					rsx_log.error("OOM Error: Ring buffer was likely being used without notify() being called");
+					glFinish();
+				}
+
+				m_data_loc = 0;
+				offset = 0;
+			}
+
+			//Align data loc to 256; allows some "guard" region so we dont trample our own data inadvertently
+			m_data_loc = utils::align(offset + alloc_size, 256);
+			return std::make_pair(static_cast<char*>(m_memory_mapping) + offset, offset);
+		}
+
+		virtual void remove()
+		{
+			if (m_memory_mapping)
+			{
+				glBindBuffer(static_cast<GLenum>(m_target), m_id);
+				glUnmapBuffer(static_cast<GLenum>(m_target));
+
+				m_memory_mapping = nullptr;
+				m_data_loc = 0;
+				m_size = 0;
+			}
+
+
+			if (m_id != GL_NONE)
+			{
+				glDeleteBuffers(1, &m_id);
+				m_id = GL_NONE;
+			}
+		}
+
+		virtual void reserve_storage_on_heap(u32 /*alloc_size*/) {}
+
+		virtual void unmap() {}
+
+		//Notification of a draw command
+		virtual void notify()
+		{
+			//Insert fence about 25% into the buffer
+			if (m_fence.is_empty() && (m_data_loc > (m_size >> 2)))
+				m_fence.reset();
+		}
+	};
+
+	class legacy_ring_buffer : public ring_buffer
+	{
+		u32 m_mapped_bytes = 0;
+		u32 m_mapping_offset = 0;
+		u32 m_alignment_offset = 0;
+
+	public:
+
+		void recreate(GLsizeiptr size, const void* data = nullptr) override
+		{
+			if (m_id)
+				remove();
+
+			buffer::create();
+			buffer::data(size, data, GL_DYNAMIC_DRAW);
+
+			m_memory_type = memory_type::host_visible;
+			m_memory_mapping = nullptr;
+			m_data_loc = 0;
+			m_size = ::narrow<u32>(size);
+		}
+
+		void create(target target_, GLsizeiptr size, const void* data_ = nullptr)
+		{
+			m_target = target_;
+			recreate(size, data_);
+		}
+
+		void reserve_storage_on_heap(u32 alloc_size) override
+		{
+			ensure(m_memory_mapping == nullptr);
+
+			u32 offset = m_data_loc;
+			if (m_data_loc) offset = utils::align(offset, 256);
+
+			const u32 block_size = utils::align(alloc_size + 16, 256);	//Overallocate just in case we need to realign base
+
+			if ((offset + block_size) > m_size)
+			{
+				buffer::data(m_size, nullptr, GL_DYNAMIC_DRAW);
+				m_data_loc = 0;
+			}
+
+			glBindBuffer(static_cast<GLenum>(m_target), m_id);
+			m_memory_mapping = glMapBufferRange(static_cast<GLenum>(m_target), m_data_loc, block_size, GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
+			m_mapped_bytes = block_size;
+			m_mapping_offset = m_data_loc;
+			m_alignment_offset = 0;
+
+			//When using debugging tools, the mapped base might not be aligned as expected
+			const u64 mapped_address_base = reinterpret_cast<u64>(m_memory_mapping);
+			if (mapped_address_base & 0xF)
+			{
+				//Unaligned result was returned. We have to modify the base address a bit
+				//We lose some memory here, but the 16 byte overallocation above makes up for it
+				const u64 new_base = (mapped_address_base & ~0xF) + 16;
+				const u64 diff_bytes = new_base - mapped_address_base;
+
+				m_memory_mapping = reinterpret_cast<void*>(new_base);
+				m_mapped_bytes -= ::narrow<u32>(diff_bytes);
+				m_alignment_offset = ::narrow<u32>(diff_bytes);
+			}
+
+			ensure(m_mapped_bytes >= alloc_size);
+		}
+
+		std::pair<void*, u32> alloc_from_heap(u32 alloc_size, u16 alignment) override
+		{
+			u32 offset = m_data_loc;
+			if (m_data_loc) offset = utils::align(offset, alignment);
+
+			u32 padding = (offset - m_data_loc);
+			u32 real_size = utils::align(padding + alloc_size, alignment);	//Ensures we leave the loc pointer aligned after we exit
+
+			if (real_size > m_mapped_bytes)
+			{
+				//Missed allocation. We take a performance hit on doing this.
+				//Overallocate slightly for the next allocation if requested size is too small
+				unmap();
+				reserve_storage_on_heap(std::max(real_size, 4096U));
+
+				offset = m_data_loc;
+				if (m_data_loc) offset = utils::align(offset, alignment);
+
+				padding = (offset - m_data_loc);
+				real_size = utils::align(padding + alloc_size, alignment);
+			}
+
+			m_data_loc = offset + real_size;
+			m_mapped_bytes -= real_size;
+
+			u32 local_offset = (offset - m_mapping_offset);
+			return std::make_pair(static_cast<char*>(m_memory_mapping) + local_offset, offset + m_alignment_offset);
+		}
+
+		void remove() override
+		{
+			ring_buffer::remove();
+			m_mapped_bytes = 0;
+		}
+
+		void unmap() override
+		{
+			buffer::bind();
+			buffer::unmap();
+
+			m_memory_mapping = nullptr;
+			m_mapped_bytes = 0;
+			m_mapping_offset = 0;
+		}
+
+		void notify() override {}
+	};
+
+	class buffer_view
+	{
+		buffer* m_buffer = nullptr;
+		u32 m_offset = 0;
+		u32 m_range = 0;
+		GLenum m_format = GL_R8UI;
+
+	public:
+		buffer_view(buffer *_buffer, u32 offset, u32 range, GLenum format = GL_R8UI)
+			: m_buffer(_buffer), m_offset(offset), m_range(range), m_format(format)
+		{}
+
+		buffer_view() = default;
+
+		void update(buffer *_buffer, u32 offset, u32 range, GLenum format = GL_R8UI)
+		{
+			ensure(_buffer->size() >= (offset + range));
+			m_buffer = _buffer;
+			m_offset = offset;
+			m_range = range;
+			m_format = format;
+		}
+
+		u32 offset() const
+		{
+			return m_offset;
+		}
+
+		u32 range() const
+		{
+			return m_range;
+		}
+
+		u32 format() const
+		{
+			return m_format;
+		}
+
+		buffer* value() const
+		{
+			return m_buffer;
+		}
+
+		bool in_range(u32 address, u32 size, u32& new_offset) const
+		{
+			if (address < m_offset)
+				return false;
+
+			const u32 _offset = address - m_offset;
+			if (m_range < _offset)
+				return false;
+
+			const auto remaining = m_range - _offset;
+			if (size <= remaining)
+			{
+				new_offset = _offset;
+				return true;
+			}
+
+			return false;
+		}
+	};
+
+	class vao
+	{
+		template<buffer::target BindId, uint GetStateId>
+		class entry
+		{
+			vao& m_parent;
+
+		public:
+			using save_binding_state = save_binding_state_base<entry, (static_cast<GLuint>(BindId)), GetStateId>;
+
+			entry(vao* parent) noexcept : m_parent(*parent)
+			{
+			}
+
+			entry& operator = (const buffer& buf) noexcept
+			{
+				m_parent.bind();
+				buf.bind(BindId);
+
+				return *this;
+			}
+		};
+
+		GLuint m_id = GL_NONE;
+
+	public:
+		entry<buffer::target::pixel_pack, GL_PIXEL_PACK_BUFFER_BINDING> pixel_pack_buffer{ this };
+		entry<buffer::target::pixel_unpack, GL_PIXEL_UNPACK_BUFFER_BINDING> pixel_unpack_buffer{ this };
+		entry<buffer::target::array, GL_ARRAY_BUFFER_BINDING> array_buffer{ this };
+		entry<buffer::target::element_array, GL_ELEMENT_ARRAY_BUFFER_BINDING> element_array_buffer{ this };
+
+		vao() = default;
+		vao(const vao&) = delete;
+
+		vao(vao&& vao_) noexcept
+		{
+			swap(vao_);
+		}
+		vao(GLuint id) noexcept
+		{
+			set_id(id);
+		}
+
+		~vao() noexcept
+		{
+			if (created())
+				remove();
+		}
+
+		void swap(vao& vao_) noexcept
+		{
+			auto my_old_id = id();
+			set_id(vao_.id());
+			vao_.set_id(my_old_id);
+		}
+
+		vao& operator = (const vao& rhs) = delete;
+		vao& operator = (vao&& rhs) noexcept
+		{
+			swap(rhs);
+			return *this;
+		}
+
+		void bind() const noexcept
+		{
+			glBindVertexArray(m_id);
+		}
+
+		void create() noexcept
+		{
+			glGenVertexArrays(1, &m_id);
+		}
+
+		void remove() noexcept
+		{
+			if (m_id != GL_NONE)
+			{
+				glDeleteVertexArrays(1, &m_id);
+				m_id = GL_NONE;
+			}
+		}
+
+		uint id() const noexcept
+		{
+			return m_id;
+		}
+
+		void set_id(uint id) noexcept
+		{
+			m_id = id;
+		}
+
+		bool created() const noexcept
+		{
+			return m_id != GL_NONE;
+		}
+
+		explicit operator bool() const noexcept
+		{
+			return created();
+		}
+
+		void enable_for_attributes(std::initializer_list<GLuint> indexes) noexcept
+		{
+			for (auto &index : indexes)
+			{
+				glEnableVertexAttribArray(index);
+			}
+		}
+
+		void disable_for_attributes(std::initializer_list<GLuint> indexes) noexcept
+		{
+			for (auto &index : indexes)
+			{
+				glDisableVertexAttribArray(index);
+			}
+		}
+
+		void enable_for_attribute(GLuint index) noexcept
+		{
+			enable_for_attributes({ index });
+		}
+
+		void disable_for_attribute(GLuint index) noexcept
+		{
+			disable_for_attributes({ index });
+		}
+
+		buffer_pointer operator + (u32 offset) noexcept
+		{
+			return{ this, offset };
+		}
+
+		buffer_pointer operator >> (u32 stride) noexcept
+		{
+			return{ this, {}, stride };
+		}
+
+		operator buffer_pointer() noexcept
+		{
+			return{ this };
+		}
+
+		attrib_t operator [] (u32 index) const noexcept;
+	};
+
+	class attrib_t
+	{
+		GLint m_location;
+
+	public:
+		attrib_t(GLint location)
+			: m_location(location)
+		{
+		}
+
+		GLint location() const
+		{
+			return m_location;
+		}
+
+		void operator = (float rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib1f(location(), rhs); }
+		void operator = (double rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib1d(location(), rhs); }
+
+		void operator = (const color1f& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib1f(location(), rhs.r); }
+		void operator = (const color1d& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib1d(location(), rhs.r); }
+		void operator = (const color2f& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib2f(location(), rhs.r, rhs.g); }
+		void operator = (const color2d& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib2d(location(), rhs.r, rhs.g); }
+		void operator = (const color3f& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib3f(location(), rhs.r, rhs.g, rhs.b); }
+		void operator = (const color3d& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib3d(location(), rhs.r, rhs.g, rhs.b); }
+		void operator = (const color4f& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib4f(location(), rhs.r, rhs.g, rhs.b, rhs.a); }
+		void operator = (const color4d& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib4d(location(), rhs.r, rhs.g, rhs.b, rhs.a); }
+
+		void operator = (buffer_pointer& pointer) const
+		{
+			pointer.get_vao().enable_for_attribute(m_location);
+			glVertexAttribPointer(location(), pointer.size(), static_cast<GLenum>(pointer.get_type()), pointer.normalize(),
+				pointer.stride(), reinterpret_cast<const void*>(u64{pointer.offset()}));
+		}
+	};
+
+	enum image_aspect : u32
+	{
+		color = 1,
+		depth = 2,
+		stencil = 4
+	};
+
+	class texture
+	{
+	public:
+		enum class type
+		{
+			ubyte = GL_UNSIGNED_BYTE,
+			ushort = GL_UNSIGNED_SHORT,
+			uint = GL_UNSIGNED_INT,
+
+			ubyte_3_3_2 = GL_UNSIGNED_BYTE_3_3_2,
+			ubyte_2_3_3_rev = GL_UNSIGNED_BYTE_2_3_3_REV,
+
+			ushort_5_6_5 = GL_UNSIGNED_SHORT_5_6_5,
+			ushort_5_6_5_rev = GL_UNSIGNED_SHORT_5_6_5_REV,
+			ushort_4_4_4_4 = GL_UNSIGNED_SHORT_4_4_4_4,
+			ushort_4_4_4_4_rev = GL_UNSIGNED_SHORT_4_4_4_4_REV,
+			ushort_5_5_5_1 = GL_UNSIGNED_SHORT_5_5_5_1,
+			ushort_1_5_5_5_rev = GL_UNSIGNED_SHORT_1_5_5_5_REV,
+
+			uint_8_8_8_8 = GL_UNSIGNED_INT_8_8_8_8,
+			uint_8_8_8_8_rev = GL_UNSIGNED_INT_8_8_8_8_REV,
+			uint_10_10_10_2 = GL_UNSIGNED_INT_10_10_10_2,
+			uint_2_10_10_10_rev = GL_UNSIGNED_INT_2_10_10_10_REV,
+			uint_24_8 = GL_UNSIGNED_INT_24_8,
+			float32_uint8 = GL_FLOAT_32_UNSIGNED_INT_24_8_REV,
+
+			sbyte = GL_BYTE,
+			sshort = GL_SHORT,
+			sint = GL_INT,
+			f16 = GL_HALF_FLOAT,
+			f32 = GL_FLOAT,
+			f64 = GL_DOUBLE,
+		};
+
+		enum class channel
+		{
+			zero = GL_ZERO,
+			one = GL_ONE,
+			r = GL_RED,
+			g = GL_GREEN,
+			b = GL_BLUE,
+			a = GL_ALPHA,
+		};
+
+		enum class format
+		{
+			r = GL_RED,
+			rg = GL_RG,
+			rgb = GL_RGB,
+			rgba = GL_RGBA,
+
+			bgr = GL_BGR,
+			bgra = GL_BGRA,
+
+			stencil = GL_STENCIL_INDEX,
+			depth = GL_DEPTH_COMPONENT,
+			depth_stencil = GL_DEPTH_STENCIL
+		};
+
+		enum class internal_format
+		{
+			stencil8 = GL_STENCIL_INDEX8,
+			depth16 = GL_DEPTH_COMPONENT16,
+			depth32f = GL_DEPTH_COMPONENT32F,
+			depth24_stencil8 = GL_DEPTH24_STENCIL8,
+			depth32f_stencil8 = GL_DEPTH32F_STENCIL8,
+
+			compressed_rgb_s3tc_dxt1 = GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
+			compressed_rgba_s3tc_dxt1 = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
+			compressed_rgba_s3tc_dxt3 = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT,
+			compressed_rgba_s3tc_dxt5 = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,
+
+			//Sized internal formats, see opengl spec document on glTexImage2D, table 3
+			rgba8 = GL_RGBA8,
+			rgb565 = GL_RGB565,
+			rgb5a1 = GL_RGB5_A1,
+			rgba4 = GL_RGBA4,
+			r8 = GL_R8,
+			r16 = GL_R16,
+			r32f = GL_R32F,
+			rg8 = GL_RG8,
+			rg16 = GL_RG16,
+			rg16f = GL_RG16F,
+			rgba16f = GL_RGBA16F,
+			rgba32f = GL_RGBA32F
+		};
+
+		enum class wrap
+		{
+			repeat = GL_REPEAT,
+			mirrored_repeat = GL_MIRRORED_REPEAT,
+			clamp_to_edge = GL_CLAMP_TO_EDGE,
+			clamp_to_border = GL_CLAMP_TO_BORDER,
+			mirror_clamp = GL_MIRROR_CLAMP_EXT,
+			//mirror_clamp_to_edge = GL_MIRROR_CLAMP_TO_EDGE,
+			mirror_clamp_to_border = GL_MIRROR_CLAMP_TO_BORDER_EXT
+		};
+
+		enum class compare_mode
+		{
+			none = GL_NONE,
+			ref_to_texture = GL_COMPARE_REF_TO_TEXTURE
+		};
+
+		enum class target
+		{
+			texture1D = GL_TEXTURE_1D,
+			texture2D = GL_TEXTURE_2D,
+			texture3D = GL_TEXTURE_3D,
+			textureCUBE = GL_TEXTURE_CUBE_MAP,
+			textureBuffer = GL_TEXTURE_BUFFER
+		};
+
+	protected:
+		GLuint m_id = GL_NONE;
+		GLuint m_width = 0;
+		GLuint m_height = 0;
+		GLuint m_depth = 0;
+		GLuint m_mipmaps = 0;
+		GLuint m_pitch = 0;
+		GLuint m_compressed = GL_FALSE;
+		GLuint m_aspect_flags = 0;
+
+		target m_target = target::texture2D;
+		internal_format m_internal_format = internal_format::rgba8;
+		std::array<GLenum, 4> m_component_layout;
+
+		rsx::format_class m_format_class = RSX_FORMAT_CLASS_UNDEFINED;
+
+	private:
+		class save_binding_state
+		{
+			GLenum target = GL_NONE;
+			GLuint old_binding = GL_NONE;
+
+		public:
+			save_binding_state(GLenum target)
+			{
+				this->target = target;
+				switch (target)
+				{
+				case GL_TEXTURE_1D:
+					glGetIntegerv(GL_TEXTURE_BINDING_1D, reinterpret_cast<GLint*>(&old_binding));
+					break;
+				case GL_TEXTURE_2D:
+					glGetIntegerv(GL_TEXTURE_BINDING_2D, reinterpret_cast<GLint*>(&old_binding));
+					break;
+				case GL_TEXTURE_3D:
+					glGetIntegerv(GL_TEXTURE_BINDING_3D, reinterpret_cast<GLint*>(&old_binding));
+					break;
+				case GL_TEXTURE_CUBE_MAP:
+					glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, reinterpret_cast<GLint*>(&old_binding));
+					break;
+				case GL_TEXTURE_2D_ARRAY:
+					glGetIntegerv(GL_TEXTURE_BINDING_2D_ARRAY, reinterpret_cast<GLint*>(&old_binding));
+					break;
+				case GL_TEXTURE_BUFFER:
+					glGetIntegerv(GL_TEXTURE_BINDING_BUFFER, reinterpret_cast<GLint*>(&old_binding));
+					break;
+				}
+			}
+
+			~save_binding_state()
+			{
+				glBindTexture(target, old_binding);
+			}
+		};
+	public:
+		texture(const texture&) = delete;
+		texture(texture&& texture_) = delete;
+
+		texture(GLenum target, GLuint width, GLuint height, GLuint depth, GLuint mipmaps, GLenum sized_format,
+				rsx::format_class format_class = rsx::RSX_FORMAT_CLASS_UNDEFINED)
+		{
+			save_binding_state save(target);
+			glGenTextures(1, &m_id);
+			glBindTexture(target, m_id); //Must bind to initialize the new texture
+
+			switch (target)
+			{
+			default:
+				fmt::throw_exception("Invalid image target 0x%X", target);
+			case GL_TEXTURE_1D:
+				glTexStorage1D(target, mipmaps, sized_format, width);
+				height = depth = 1;
+				break;
+			case GL_TEXTURE_2D:
+			case GL_TEXTURE_CUBE_MAP:
+				glTexStorage2D(target, mipmaps, sized_format, width, height);
+				depth = 1;
+				break;
+			case GL_TEXTURE_3D:
+			case GL_TEXTURE_2D_ARRAY:
+				glTexStorage3D(target, mipmaps, sized_format, width, height, depth);
+				break;
+			case GL_TEXTURE_BUFFER:
+				break;
+			}
+
+			if (target != GL_TEXTURE_BUFFER)
+			{
+				glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+				glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+				glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT);
+				glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_REPEAT);
+				glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_REPEAT);
+				glTexParameteri(target, GL_TEXTURE_BASE_LEVEL, 0);
+				glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, mipmaps - 1);
+
+				m_width = width;
+				m_height = height;
+				m_depth = depth;
+				m_mipmaps = mipmaps;
+				m_aspect_flags = image_aspect::color;
+
+				switch (sized_format)
+				{
+				case GL_DEPTH_COMPONENT16:
+				{
+					m_pitch = width * 2;
+					m_aspect_flags = image_aspect::depth;
+					break;
+				}
+				case GL_DEPTH_COMPONENT32F:
+				{
+					m_pitch = width * 4;
+					m_aspect_flags = image_aspect::depth;
+					break;
+				}
+				case GL_DEPTH24_STENCIL8:
+				case GL_DEPTH32F_STENCIL8:
+				{
+					m_pitch = width * 4;
+					m_aspect_flags = image_aspect::depth | image_aspect::stencil;
+					break;
+				}
+				case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+				{
+					m_compressed = true;
+					m_pitch = width / 2;
+					break;
+				}
+				case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+				case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+				{
+					m_compressed = true;
+					m_pitch = width;
+					break;
+				}
+				default:
+				{
+					GLenum query_target = (target == GL_TEXTURE_CUBE_MAP) ? GL_TEXTURE_CUBE_MAP_POSITIVE_X : target;
+					GLint r, g, b, a;
+
+					glGetTexLevelParameteriv(query_target, 0, GL_TEXTURE_RED_SIZE, &r);
+					glGetTexLevelParameteriv(query_target, 0, GL_TEXTURE_GREEN_SIZE, &g);
+					glGetTexLevelParameteriv(query_target, 0, GL_TEXTURE_BLUE_SIZE, &b);
+					glGetTexLevelParameteriv(query_target, 0, GL_TEXTURE_ALPHA_SIZE, &a);
+
+					m_pitch = width * (r + g + b + a) / 8;
+					break;
+				}
+				}
+
+				if (!m_pitch)
+				{
+					fmt::throw_exception("Unhandled GL format 0x%X", sized_format);
+				}
+
+				if (format_class == RSX_FORMAT_CLASS_UNDEFINED)
+				{
+					if (m_aspect_flags != image_aspect::color)
+					{
+						rsx_log.error("Undefined format class for depth texture is not allowed");
+					}
+					else
+					{
+						format_class = RSX_FORMAT_CLASS_COLOR;
+					}
+				}
+			}
+
+			m_target = static_cast<texture::target>(target);
+			m_internal_format = static_cast<internal_format>(sized_format);
+			m_component_layout = { GL_ALPHA, GL_RED, GL_GREEN, GL_BLUE };
+			m_format_class = format_class;
+		}
+
+		virtual ~texture()
+		{
+			if (m_id != GL_NONE)
+			{
+				glDeleteTextures(1, &m_id);
+				m_id = GL_NONE;
+			}
+		}
+
+		void set_native_component_layout(const std::array<GLenum, 4>& layout)
+		{
+			m_component_layout[0] = layout[0];
+			m_component_layout[1] = layout[1];
+			m_component_layout[2] = layout[2];
+			m_component_layout[3] = layout[3];
+		}
+
+		target get_target() const noexcept
+		{
+			return m_target;
+		}
+
+		static bool compressed_format(internal_format format_) noexcept
+		{
+			switch (format_)
+			{
+			case internal_format::compressed_rgb_s3tc_dxt1:
+			case internal_format::compressed_rgba_s3tc_dxt1:
+			case internal_format::compressed_rgba_s3tc_dxt3:
+			case internal_format::compressed_rgba_s3tc_dxt5:
+				return true;
+			default:
+				return false;
+			}
+		}
+
+		uint id() const noexcept
+		{
+			return m_id;
+		}
+
+		explicit operator bool() const noexcept
+		{
+			return (m_id != GL_NONE);
+		}
+
+		GLuint width() const
+		{
+			return m_width;
+		}
+
+		GLuint height() const
+		{
+			return m_height;
+		}
+
+		GLuint depth() const
+		{
+			return m_depth;
+		}
+
+		GLuint levels() const
+		{
+			return m_mipmaps;
+		}
+
+		GLuint pitch() const
+		{
+			return m_pitch;
+		}
+
+		GLboolean compressed() const
+		{
+			return m_compressed;
+		}
+
+		GLuint aspect() const
+		{
+			return m_aspect_flags;
+		}
+
+		rsx::format_class format_class() const
+		{
+			return m_format_class;
+		}
+
+		sizeu size2D() const
+		{
+			return{ m_width, m_height };
+		}
+
+		size3u size3D() const
+		{
+			const auto depth = (m_target == target::textureCUBE) ? 6 : m_depth;
+			return{ m_width, m_height, depth };
+		}
+
+		texture::internal_format get_internal_format() const
+		{
+			return m_internal_format;
+		}
+
+		std::array<GLenum, 4> get_native_component_layout() const
+		{
+			return m_component_layout;
+		}
+
+		void copy_from(const void* src, texture::format format, texture::type type, int level, const coord3u region, const pixel_unpack_settings& pixel_settings)
+		{
+			pixel_settings.apply();
+
+			switch (const auto target_ =static_cast<GLenum>(m_target))
+			{
+			case GL_TEXTURE_1D:
+			{
+				DSA_CALL(TextureSubImage1D, m_id, GL_TEXTURE_1D, level, region.x, region.width, static_cast<GLenum>(format), static_cast<GLenum>(type), src);
+				break;
+			}
+			case GL_TEXTURE_2D:
+			{
+				DSA_CALL(TextureSubImage2D, m_id, GL_TEXTURE_2D, level, region.x, region.y, region.width, region.height, static_cast<GLenum>(format), static_cast<GLenum>(type), src);
+				break;
+			}
+			case GL_TEXTURE_3D:
+			case GL_TEXTURE_2D_ARRAY:
+			{
+				DSA_CALL(TextureSubImage3D, m_id, target_, level, region.x, region.y, region.z, region.width, region.height, region.depth, static_cast<GLenum>(format), static_cast<GLenum>(type), src);
+				break;
+			}
+			case GL_TEXTURE_CUBE_MAP:
+			{
+				if (get_driver_caps().ARB_dsa_supported)
+				{
+					glTextureSubImage3D(m_id, level, region.x, region.y, region.z, region.width, region.height, region.depth, static_cast<GLenum>(format), static_cast<GLenum>(type), src);
+				}
+				else
+				{
+					rsx_log.warning("Cubemap upload via texture::copy_from is halfplemented!");
+					auto ptr = static_cast<const u8*>(src);
+					const auto end = std::min(6u, region.z + region.depth);
+					for (unsigned face = region.z; face < end; ++face)
+					{
+						glTextureSubImage2DEXT(m_id, GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, level, region.x, region.y, region.width, region.height, static_cast<GLenum>(format), static_cast<GLenum>(type), ptr);
+						ptr += (region.width * region.height * 4); //TODO
+					}
+				}
+				break;
+			}
+			}
+		}
+
+		void copy_from(const void* src, texture::format format, texture::type type, const pixel_unpack_settings& pixel_settings)
+		{
+			const coord3u region = { {}, size3D() };
+			copy_from(src, format, type, 0, region, pixel_settings);
+		}
+
+		void copy_from(buffer &buf, u32 gl_format_type, u32 offset, u32 length)
+		{
+			if (get_target() != target::textureBuffer)
+				fmt::throw_exception("OpenGL error: texture cannot copy from buffer");
+
+			DSA_CALL(TextureBufferRange, m_id, GL_TEXTURE_BUFFER, gl_format_type, buf.id(), offset, length);
+		}
+
+		void copy_from(buffer_view &view)
+		{
+			copy_from(*view.value(), view.format(), view.offset(), view.range());
+		}
+
+		void copy_to(void* dst, texture::format format, texture::type type, int level, const coord3u& region, const pixel_pack_settings& pixel_settings) const
+		{
+			pixel_settings.apply();
+			const auto& caps = get_driver_caps();
+
+			if (!region.x && !region.y && !region.z &&
+				region.width == m_width && region.height == m_height && region.depth == m_depth)
+			{
+				if (caps.ARB_dsa_supported)
+					glGetTextureImage(m_id, level, static_cast<GLenum>(format), static_cast<GLenum>(type), s32{smax}, dst);
+				else
+					glGetTextureImageEXT(m_id, static_cast<GLenum>(m_target), level, static_cast<GLenum>(format), static_cast<GLenum>(type), dst);
+			}
+			else if (caps.ARB_dsa_supported)
+			{
+				glGetTextureSubImage(m_id, level, region.x, region.y, region.z, region.width, region.height, region.depth,
+					static_cast<GLenum>(format), static_cast<GLenum>(type), s32{smax}, dst);
+			}
+			else
+			{
+				// Worst case scenario. For some reason, EXT_dsa does not have glGetTextureSubImage
+				const auto target_ = static_cast<GLenum>(m_target);
+				texture tmp{ target_, region.width, region.height, region.depth, 1, static_cast<GLenum>(m_internal_format) };
+				glCopyImageSubData(m_id, target_, level, region.x, region.y, region.z, tmp.id(), target_, 0, 0, 0, 0,
+					region.width, region.height, region.depth);
+
+				const coord3u region2 = { {0, 0, 0}, region.size };
+				tmp.copy_to(dst, format, type, 0, region2, pixel_settings);
+			}
+		}
+
+		void copy_to(void* dst, texture::format format, texture::type type, const pixel_pack_settings& pixel_settings) const
+		{
+			const coord3u region = { {}, size3D() };
+			copy_to(dst, format, type, 0, region, pixel_settings);
+		}
+	};
+
+	class texture_view
+	{
+		GLuint m_id = GL_NONE;
+		GLenum m_target = 0;
+		GLenum m_format = 0;
+		GLenum m_aspect_flags = 0;
+		texture *m_image_data = nullptr;
+
+		GLenum component_swizzle[4];
+
+		void create(texture* data, GLenum target, GLenum sized_format, GLenum aspect_flags, const GLenum* argb_swizzle = nullptr)
+		{
+			m_target = target;
+			m_format = sized_format;
+			m_image_data = data;
+			m_aspect_flags = aspect_flags;
+
+			u32 num_layers;
+			switch (target)
+			{
+			default:
+				num_layers = 1; break;
+			case GL_TEXTURE_CUBE_MAP:
+				num_layers = 6; break;
+			case GL_TEXTURE_2D_ARRAY:
+				num_layers = data->depth(); break;
+			}
+
+			glGenTextures(1, &m_id);
+			glTextureView(m_id, target, data->id(), sized_format, 0, data->levels(), 0, num_layers);
+
+			if (argb_swizzle)
+			{
+				component_swizzle[0] = argb_swizzle[1];
+				component_swizzle[1] = argb_swizzle[2];
+				component_swizzle[2] = argb_swizzle[3];
+				component_swizzle[3] = argb_swizzle[0];
+
+				glBindTexture(m_target, m_id);
+				glTexParameteriv(m_target, GL_TEXTURE_SWIZZLE_RGBA, reinterpret_cast<GLint*>(component_swizzle));
+			}
+			else
+			{
+				component_swizzle[0] = GL_RED;
+				component_swizzle[1] = GL_GREEN;
+				component_swizzle[2] = GL_BLUE;
+				component_swizzle[3] = GL_ALPHA;
+			}
+
+			if (aspect_flags & image_aspect::stencil)
+			{
+				constexpr u32 depth_stencil_mask = (image_aspect::depth | image_aspect::stencil);
+				ensure((aspect_flags & depth_stencil_mask) != depth_stencil_mask); // "Invalid aspect mask combination"
+
+				glBindTexture(m_target, m_id);
+				glTexParameteri(m_target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX);
+			}
+		}
+
+	public:
+		texture_view(const texture_view&) = delete;
+		texture_view(texture_view&&) = delete;
+
+		texture_view(texture* data, GLenum target, GLenum sized_format,
+			const GLenum* argb_swizzle = nullptr,
+			GLenum aspect_flags = image_aspect::color | image_aspect::depth)
+		{
+			create(data, target, sized_format, aspect_flags, argb_swizzle);
+		}
+
+		texture_view(texture* data, const GLenum* argb_swizzle = nullptr,
+			GLenum aspect_flags = image_aspect::color | image_aspect::depth)
+		{
+			GLenum target = static_cast<GLenum>(data->get_target());
+			GLenum sized_format = static_cast<GLenum>(data->get_internal_format());
+			create(data, target, sized_format, aspect_flags, argb_swizzle);
+		}
+
+		~texture_view()
+		{
+			if (m_id != GL_NONE)
+			{
+				glDeleteTextures(1, &m_id);
+				m_id = GL_NONE;
+			}
+		}
+
+		GLuint id() const
+		{
+			return m_id;
+		}
+
+		GLenum target() const
+		{
+			return m_target;
+		}
+
+		GLenum internal_format() const
+		{
+			return m_format;
+		}
+
+		GLenum aspect() const
+		{
+			return m_aspect_flags;
+		}
+
+		bool compare_swizzle(const GLenum* argb_swizzle) const
+		{
+			return (argb_swizzle[0] == component_swizzle[3] &&
+				argb_swizzle[1] == component_swizzle[0] &&
+				argb_swizzle[2] == component_swizzle[1] &&
+				argb_swizzle[3] == component_swizzle[2]);
+		}
+
+		void bind() const
+		{
+			glBindTexture(m_target, m_id);
+		}
+
+		texture* image() const
+		{
+			return m_image_data;
+		}
+
+		std::array<GLenum, 4> component_mapping() const
+		{
+			return{ component_swizzle[3], component_swizzle[0], component_swizzle[1], component_swizzle[2] };
+		}
+
+		u32 encoded_component_map() const
+		{
+			// Unused, OGL supports proper component swizzles
+			return 0u;
+		}
+	};
+
+	class viewable_image : public texture
+	{
+		std::unordered_multimap<u32, std::unique_ptr<texture_view>> views;
+
+public:
+		using texture::texture;
+
+		texture_view* get_view(u32 remap_encoding, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap, GLenum aspect_flags = image_aspect::color | image_aspect::depth)
+		{
+			auto found = views.equal_range(remap_encoding);
+			for (auto It = found.first; It != found.second; ++It)
+			{
+				if (It->second->aspect() & aspect_flags)
+				{
+					return It->second.get();
+				}
+			}
+
+			ensure(aspect() & aspect_flags);
+			auto mapping = apply_swizzle_remap(get_native_component_layout(), remap);
+			auto view = std::make_unique<texture_view>(this, mapping.data(), aspect_flags);
+			auto result = view.get();
+			views.emplace(remap_encoding, std::move(view));
+			return result;
+		}
+
+		void set_native_component_layout(const std::array<GLenum, 4>& layout)
+		{
+			if (m_component_layout[0] != layout[0] ||
+				m_component_layout[1] != layout[1] ||
+				m_component_layout[2] != layout[2] ||
+				m_component_layout[3] != layout[3])
+			{
+				texture::set_native_component_layout(layout);
+				views.clear();
+			}
+		}
+	};
+
+	class rbo
+	{
+		GLuint m_id = GL_NONE;
+
+	public:
+		rbo() = default;
+
+		rbo(GLuint id)
+		{
+			set_id(id);
+		}
+
+		~rbo()
+		{
+			if (created())
+				remove();
+		}
+
+		class save_binding_state
+		{
+			GLint m_old_value;
+
+		public:
+			save_binding_state(const rbo& new_state)
+			{
+				glGetIntegerv(GL_RENDERBUFFER_BINDING, &m_old_value);
+				new_state.bind();
+			}
+
+			~save_binding_state()
+			{
+				glBindRenderbuffer(GL_RENDERBUFFER, m_old_value);
+			}
+		};
+
+		void recreate()
+		{
+			if (created())
+				remove();
+
+			create();
+		}
+
+		void recreate(texture::format format, u32 width, u32 height)
+		{
+			if (created())
+				remove();
+
+			create(format, width, height);
+		}
+
+		void create()
+		{
+			glGenRenderbuffers(1, &m_id);
+		}
+
+		void create(texture::format format, u32 width, u32 height)
+		{
+			create();
+			storage(format, width, height);
+		}
+
+		void bind() const
+		{
+			glBindRenderbuffer(GL_RENDERBUFFER, m_id);
+		}
+
+		void storage(texture::format format, u32 width, u32 height)
+		{
+			save_binding_state save(*this);
+			glRenderbufferStorage(GL_RENDERBUFFER, static_cast<GLenum>(format), width, height);
+		}
+
+		void remove()
+		{
+			if (m_id != GL_NONE)
+			{
+				glDeleteRenderbuffers(1, &m_id);
+				m_id = GL_NONE;
+			}
+		}
+
+		uint id() const
+		{
+			return m_id;
+		}
+
+		void set_id(uint id)
+		{
+			m_id = id;
+		}
+
+		bool created() const
+		{
+			return m_id != GL_NONE;
+		}
+
+		explicit operator bool() const
+		{
+			return created();
+		}
+	};
+
+	enum class indices_type
+	{
+		ubyte = GL_UNSIGNED_BYTE,
+		ushort = GL_UNSIGNED_SHORT,
+		uint = GL_UNSIGNED_INT
+	};
+
+	class fbo
+	{
+		GLuint m_id = GL_NONE;
+		size2i m_size;
+
+	protected:
+		std::unordered_map<GLenum, GLuint> m_resource_bindings;
+
+	public:
+		fbo() = default;
+
+		fbo(GLuint id)
+		{
+			set_id(id);
+		}
+
+		~fbo()
+		{
+			if (created())
+				remove();
+		}
+
+		class save_binding_state
+		{
+			GLint m_last_binding;
+			bool reset = true;
+
+		public:
+			save_binding_state(const fbo& new_binding)
+			{
+				glGetIntegerv(GL_FRAMEBUFFER_BINDING, &m_last_binding);
+
+				if (m_last_binding + 0u != new_binding.id())
+					new_binding.bind();
+				else
+					reset = false;
+			}
+
+			~save_binding_state()
+			{
+				if (reset)
+					glBindFramebuffer(GL_FRAMEBUFFER, m_last_binding);
+			}
+		};
+
+		class attachment
+		{
+		public:
+			enum class type
+			{
+				color = GL_COLOR_ATTACHMENT0,
+				depth = GL_DEPTH_ATTACHMENT,
+				stencil = GL_STENCIL_ATTACHMENT,
+				depth_stencil = GL_DEPTH_STENCIL_ATTACHMENT
+			};
+
+		protected:
+			GLuint m_id = GL_NONE;
+			fbo &m_parent;
+
+		public:
+			attachment(fbo& parent, type type)
+				: m_id(static_cast<int>(type))
+				, m_parent(parent)
+			{
+			}
+
+			void set_id(uint id)
+			{
+				m_id = id;
+			}
+
+			uint id() const
+			{
+				return m_id;
+			}
+
+			GLuint resource_id() const
+			{
+				const auto found = m_parent.m_resource_bindings.find(m_id);
+				if (found != m_parent.m_resource_bindings.end())
+				{
+					return found->second;
+				}
+
+				return 0;
+			}
+
+			void operator = (const rbo& rhs)
+			{
+				save_binding_state save(m_parent);
+				m_parent.m_resource_bindings[m_id] = rhs.id();
+				glFramebufferRenderbuffer(GL_FRAMEBUFFER, m_id, GL_RENDERBUFFER, rhs.id());
+			}
+
+			void operator = (const texture& rhs)
+			{
+				save_binding_state save(m_parent);
+
+				ensure(rhs.get_target() == texture::target::texture2D);
+				m_parent.m_resource_bindings[m_id] = rhs.id();
+				glFramebufferTexture2D(GL_FRAMEBUFFER, m_id, GL_TEXTURE_2D, rhs.id(), 0);
+			}
+
+			void operator = (const GLuint rhs)
+			{
+				save_binding_state save(m_parent);
+				m_parent.m_resource_bindings[m_id] = rhs;
+				glFramebufferTexture2D(GL_FRAMEBUFFER, m_id, GL_TEXTURE_2D, rhs, 0);
+			}
+		};
+
+		class indexed_attachment : public attachment
+		{
+		public:
+			indexed_attachment(fbo& parent, type type) : attachment(parent, type)
+			{
+			}
+
+			attachment operator[](int index) const
+			{
+				return{ m_parent, type(id() + index) };
+			}
+
+			std::vector<attachment> range(int from, int count) const
+			{
+				std::vector<attachment> result;
+
+				for (int i = from; i < from + count; ++i)
+					result.push_back((*this)[i]);
+
+				return result;
+			}
+
+			using attachment::operator =;
+		};
+
+		indexed_attachment color{ *this, attachment::type::color };
+		attachment depth{ *this, attachment::type::depth };
+		attachment stencil{ *this, attachment::type::stencil };
+		attachment depth_stencil{ *this, attachment::type::depth_stencil };
+
+		enum class target
+		{
+			read_frame_buffer = GL_READ_FRAMEBUFFER,
+			draw_frame_buffer = GL_DRAW_FRAMEBUFFER
+		};
+
+		void create();
+		void bind() const;
+		void blit(const fbo& dst, areai src_area, areai dst_area, buffers buffers_ = buffers::color, filter filter_ = filter::nearest) const;
+		void bind_as(target target_) const;
+		void remove();
+		bool created() const;
+		bool check() const;
+
+		void recreate();
+		void draw_buffer(const attachment& buffer) const;
+		void draw_buffers(const std::initializer_list<attachment>& indexes) const;
+
+		void read_buffer(const attachment& buffer) const;
+
+		void draw_arrays(rsx::primitive_type mode, GLsizei count, GLint first = 0) const;
+		void draw_arrays(const buffer& buffer, rsx::primitive_type mode, GLsizei count, GLint first = 0) const;
+		void draw_arrays(const vao& buffer, rsx::primitive_type mode, GLsizei count, GLint first = 0) const;
+
+		void draw_elements(rsx::primitive_type mode, GLsizei count, indices_type type, const GLvoid *indices) const;
+		void draw_elements(const buffer& buffer, rsx::primitive_type mode, GLsizei count, indices_type type, const GLvoid *indices) const;
+		void draw_elements(rsx::primitive_type mode, GLsizei count, indices_type type, const buffer& indices, usz indices_buffer_offset = 0) const;
+		void draw_elements(const buffer& buffer_, rsx::primitive_type mode, GLsizei count, indices_type type, const buffer& indices, usz indices_buffer_offset = 0) const;
+		void draw_elements(rsx::primitive_type mode, GLsizei count, const GLubyte *indices) const;
+		void draw_elements(const buffer& buffer, rsx::primitive_type mode, GLsizei count, const GLubyte *indices) const;
+		void draw_elements(rsx::primitive_type mode, GLsizei count, const GLushort *indices) const;
+		void draw_elements(const buffer& buffer, rsx::primitive_type mode, GLsizei count, const GLushort *indices) const;
+		void draw_elements(rsx::primitive_type mode, GLsizei count, const GLuint *indices) const;
+		void draw_elements(const buffer& buffer, rsx::primitive_type mode, GLsizei count, const GLuint *indices) const;
+
+		void clear(buffers buffers_) const;
+		void clear(buffers buffers_, color4f color_value, double depth_value, u8 stencil_value) const;
+
+		void copy_from(const void* pixels, const sizei& size, gl::texture::format format_, gl::texture::type type_, class pixel_unpack_settings pixel_settings = pixel_unpack_settings()) const;
+		void copy_from(const buffer& buf, const sizei& size, gl::texture::format format_, gl::texture::type type_, class pixel_unpack_settings pixel_settings = pixel_unpack_settings()) const;
+
+		void copy_to(void* pixels, coordi coord, gl::texture::format format_, gl::texture::type type_, class pixel_pack_settings pixel_settings = pixel_pack_settings()) const;
+		void copy_to(const buffer& buf, coordi coord, gl::texture::format format_, gl::texture::type type_, class pixel_pack_settings pixel_settings = pixel_pack_settings()) const;
+
+		static fbo get_bound_draw_buffer();
+		static fbo get_bound_read_buffer();
+		static fbo get_bound_buffer();
+
+		GLuint id() const;
+		void set_id(GLuint id);
+
+		void set_extents(const size2i& extents);
+		size2i get_extents() const;
+
+		bool matches(const std::array<GLuint, 4>& color_targets, GLuint depth_stencil_target) const;
+		bool references_any(const std::vector<GLuint>& resources) const;
+
+		explicit operator bool() const
+		{
+			return created();
+		}
+	};
+
+	extern const fbo screen;
+
+	namespace glsl
+	{
+		class shader
+		{
+			std::string source;
+			::glsl::program_domain type;
+			GLuint m_id = GL_NONE;
+
+			fence m_compiled_fence;
+			fence m_init_fence;
+
+			shared_mutex m_compile_lock;
+			atomic_t<bool> m_is_compiled{};
+
+			void precompile()
+			{
+				const char* str = source.c_str();
+				const GLint length = ::narrow<GLint>(source.length());
+
+				if (g_cfg.video.log_programs)
+				{
+					std::string base_name;
+					switch (type)
+					{
+					case ::glsl::program_domain::glsl_vertex_program:
+						base_name = "shaderlog/VertexProgram";
+						break;
+					case ::glsl::program_domain::glsl_fragment_program:
+						base_name = "shaderlog/FragmentProgram";
+						break;
+					case ::glsl::program_domain::glsl_compute_program:
+						base_name = "shaderlog/ComputeProgram";
+						break;
+					}
+
+					fs::file(fs::get_cache_dir() + base_name + std::to_string(m_id) + ".glsl", fs::rewrite).write(str, length);
+				}
+
+				glShaderSource(m_id, 1, &str, &length);
+
+				m_init_fence.create();
+				flush_command_queue(m_init_fence);
+			}
+
+		public:
+			shader() = default;
+
+			shader(GLuint id)
+			{
+				set_id(id);
+			}
+
+			shader(::glsl::program_domain type_, const std::string& src)
+			{
+				create(type_, src);
+			}
+
+			~shader()
+			{
+				if (created())
+					remove();
+			}
+
+			void create(::glsl::program_domain type_, const std::string& src)
+			{
+				type = type_;
+				source = src;
+
+				GLenum shader_type{};
+				switch (type)
+				{
+				case ::glsl::program_domain::glsl_vertex_program:
+					shader_type = GL_VERTEX_SHADER;
+					break;
+				case ::glsl::program_domain::glsl_fragment_program:
+					shader_type = GL_FRAGMENT_SHADER;
+					break;
+				case ::glsl::program_domain::glsl_compute_program:
+					shader_type = GL_COMPUTE_SHADER;
+					break;
+				default:
+					rsx_log.fatal("gl::glsl::shader::compile(): Unhandled shader type (%d)", +type_);
+					return;
+				}
+
+				m_id = glCreateShader(shader_type);
+				precompile();
+			}
+
+			shader& compile()
+			{
+				std::lock_guard lock(m_compile_lock);
+				if (m_is_compiled)
+				{
+					// Another thread compiled this already
+					return *this;
+				}
+
+				ensure(!m_init_fence.is_empty()); // Do not attempt to compile a shader_view!!
+				m_init_fence.server_wait_sync();
+
+				glCompileShader(m_id);
+
+				GLint status = GL_FALSE;
+				glGetShaderiv(m_id, GL_COMPILE_STATUS, &status);
+
+				if (status == GL_FALSE)
+				{
+					GLint length = 0;
+					glGetShaderiv(m_id, GL_INFO_LOG_LENGTH, &length);
+
+					std::string error_msg;
+					if (length)
+					{
+						std::unique_ptr<GLchar[]> buf(new char[length + 1]);
+						glGetShaderInfoLog(m_id, length, nullptr, buf.get());
+						error_msg = buf.get();
+					}
+
+					rsx_log.fatal("Compilation failed: %s\nsource: %s", error_msg, source);
+				}
+
+				m_compiled_fence.create();
+				flush_command_queue(m_compiled_fence);
+
+				m_is_compiled = true;
+				return *this;
+			}
+
+			void remove()
+			{
+				if (m_id != GL_NONE)
+				{
+					glDeleteShader(m_id);
+					m_id = GL_NONE;
+				}
+			}
+
+			uint id() const
+			{
+				return m_id;
+			}
+
+			const std::string& get_source() const
+			{
+				return source;
+			}
+
+			fence get_compile_fence_sync() const
+			{
+				return m_compiled_fence;
+			}
+
+			void set_id(uint id)
+			{
+				m_id = id;
+			}
+
+			bool created() const
+			{
+				return m_id != GL_NONE;
+			}
+
+			bool compiled() const
+			{
+				return m_is_compiled;
+			}
+
+			explicit operator bool() const
+			{
+				return created();
+			}
+		};
+
+		class shader_view : public shader
+		{
+		public:
+			shader_view(GLuint id) : shader(id)
+			{
+			}
+
+			~shader_view()
+			{
+				set_id(0);
+			}
+		};
+
+		class program
+		{
+			GLuint m_id = GL_NONE;
+			fence m_fence;
+
+		public:
+			class uniform_t
+			{
+				program& m_program;
+				GLint m_location;
+
+			public:
+				uniform_t(program& program, GLint location)
+					: m_program(program)
+					, m_location(location)
+				{
+				}
+
+				GLint location() const
+				{
+					return m_location;
+				}
+
+				void operator = (int rhs) const { glProgramUniform1i(m_program.id(), location(), rhs); }
+				void operator = (unsigned rhs) const { glProgramUniform1ui(m_program.id(), location(), rhs); }
+				void operator = (float rhs) const { glProgramUniform1f(m_program.id(), location(), rhs); }
+				void operator = (const color1i& rhs) const { glProgramUniform1i(m_program.id(), location(), rhs.r); }
+				void operator = (const color1f& rhs) const { glProgramUniform1f(m_program.id(), location(), rhs.r); }
+				void operator = (const color2i& rhs) const { glProgramUniform2i(m_program.id(), location(), rhs.r, rhs.g); }
+				void operator = (const color2f& rhs) const { glProgramUniform2f(m_program.id(), location(), rhs.r, rhs.g); }
+				void operator = (const color3i& rhs) const { glProgramUniform3i(m_program.id(), location(), rhs.r, rhs.g, rhs.b); }
+				void operator = (const color3f& rhs) const { glProgramUniform3f(m_program.id(), location(), rhs.r, rhs.g, rhs.b); }
+				void operator = (const color4i& rhs) const { glProgramUniform4i(m_program.id(), location(), rhs.r, rhs.g, rhs.b, rhs.a); }
+				void operator = (const color4f& rhs) const { glProgramUniform4f(m_program.id(), location(), rhs.r, rhs.g, rhs.b, rhs.a); }
+				void operator = (const areaf& rhs) const { glProgramUniform4f(m_program.id(), location(), rhs.x1, rhs.y1, rhs.x2, rhs.y2); }
+				void operator = (const areai& rhs) const { glProgramUniform4i(m_program.id(), location(), rhs.x1, rhs.y1, rhs.x2, rhs.y2); }
+				void operator = (const std::vector<int>& rhs) const { glProgramUniform1iv(m_program.id(), location(), ::size32(rhs), rhs.data()); }
+			};
+
+			class uniforms_t
+			{
+				program& m_program;
+				std::unordered_map<std::string, GLint> locations;
+				int active_texture = 0;
+
+			public:
+				uniforms_t(program* program) : m_program(*program)
+				{
+				}
+
+				void clear()
+				{
+					locations.clear();
+					active_texture = 0;
+				}
+
+				bool has_location(const std::string &name, int *location = nullptr)
+				{
+					auto found = locations.find(name);
+					if (found != locations.end())
+					{
+						if (location)
+						{
+							*location = found->second;
+						}
+
+						return (found->second >= 0);
+					}
+
+					auto result = glGetUniformLocation(m_program.id(), name.c_str());
+					locations[name] = result;
+
+					if (location)
+					{
+						*location = result;
+					}
+
+					return (result >= 0);
+				}
+
+				GLint location(const std::string &name)
+				{
+					auto found = locations.find(name);
+					if (found != locations.end())
+					{
+						if (found->second >= 0)
+						{
+							return found->second;
+						}
+						else
+						{
+							rsx_log.fatal("%s not found.", name);
+							return -1;
+						}
+					}
+
+					auto result = glGetUniformLocation(m_program.id(), name.c_str());
+
+					if (result < 0)
+					{
+						rsx_log.fatal("%s not found.", name);
+						return result;
+					}
+
+					locations[name] = result;
+					return result;
+				}
+
+				int texture(GLint location, int active_texture, const gl::texture_view& texture)
+				{
+					glActiveTexture(GL_TEXTURE0 + active_texture);
+					texture.bind();
+					(*this)[location] = active_texture;
+
+					return active_texture;
+				}
+
+				uniform_t operator[](GLint location)
+				{
+					return{ m_program, location };
+				}
+
+				uniform_t operator[](const std::string &name)
+				{
+					return{ m_program, location(name) };
+				}
+
+				void swap(uniforms_t& uniforms)
+				{
+					locations.swap(uniforms.locations);
+					std::swap(active_texture, uniforms.active_texture);
+				}
+			} uniforms{ this };
+
+			program& recreate()
+			{
+				if (created())
+					remove();
+
+				return create();
+			}
+
+			program& create()
+			{
+				m_id = glCreateProgram();
+				return *this;
+			}
+
+			void remove()
+			{
+				if (m_id != GL_NONE)
+				{
+					glDeleteProgram(m_id);
+					m_id = GL_NONE;
+				}
+				uniforms.clear();
+			}
+
+			static program get_current_program()
+			{
+				GLint id;
+				glGetIntegerv(GL_CURRENT_PROGRAM, &id);
+				return{ static_cast<GLuint>(id) };
+			}
+
+			void use()
+			{
+				glUseProgram(m_id);
+			}
+
+			void link(std::function<void(program*)> init_func = {})
+			{
+				glLinkProgram(m_id);
+
+				GLint status = GL_FALSE;
+				glGetProgramiv(m_id, GL_LINK_STATUS, &status);
+
+				if (status == GL_FALSE)
+				{
+					GLint length = 0;
+					glGetProgramiv(m_id, GL_INFO_LOG_LENGTH, &length);
+
+					std::string error_msg;
+					if (length)
+					{
+						std::unique_ptr<GLchar[]> buf(new char[length + 1]);
+						glGetProgramInfoLog(m_id, length, nullptr, buf.get());
+						error_msg = buf.get();
+					}
+
+					rsx_log.fatal("Linkage failed: %s", error_msg);
+				}
+				else
+				{
+					if (init_func)
+					{
+						init_func(this);
+					}
+
+					m_fence.create();
+					flush_command_queue(m_fence);
+				}
+			}
+
+			void validate()
+			{
+				glValidateProgram(m_id);
+
+				GLint status = GL_FALSE;
+				glGetProgramiv(m_id, GL_VALIDATE_STATUS, &status);
+
+				if (status == GL_FALSE)
+				{
+					GLint length = 0;
+					glGetProgramiv(m_id, GL_INFO_LOG_LENGTH, &length);
+
+					std::string error_msg;
+					if (length)
+					{
+						std::unique_ptr<GLchar[]> buf(new char[length + 1]);
+						glGetProgramInfoLog(m_id, length, nullptr, buf.get());
+						error_msg = buf.get();
+					}
+
+					rsx_log.error("Validation failed: %s", error_msg.c_str());
+				}
+			}
+
+			GLuint id() const
+			{
+				return m_id;
+			}
+
+			void set_id(uint id)
+			{
+				uniforms.clear();
+				m_id = id;
+			}
+
+			bool created() const
+			{
+				return m_id != GL_NONE;
+			}
+
+			void sync()
+			{
+				if (!m_fence.check_signaled())
+				{
+					m_fence.server_wait_sync();
+				}
+			}
+
+			explicit operator bool() const
+			{
+				return created();
+			}
+
+			program& attach(const shader& shader_)
+			{
+				glAttachShader(m_id, shader_.id());
+				return *this;
+			}
+
+			program& bind_attribute_location(const std::string& name, int index)
+			{
+				glBindAttribLocation(m_id, index, name.c_str());
+				return *this;
+			}
+
+			program& bind_fragment_data_location(const std::string& name, int color_number)
+			{
+				glBindFragDataLocation(m_id, color_number, name.c_str());
+				return *this;
+			}
+
+			int attribute_location(const std::string& name)
+			{
+				return glGetAttribLocation(m_id, name.c_str());
+			}
+
+			int uniform_location(const std::string& name)
+			{
+				return glGetUniformLocation(m_id, name.c_str());
+			}
+
+			program() = default;
+			program(const program&) = delete;
+			program(program&& program_)
+			{
+				swap(program_);
+			}
+
+			program(GLuint id)
+			{
+				set_id(id);
+			}
+
+			~program()
+			{
+				if (created())
+					remove();
+			}
+
+			void swap(program& program_)
+			{
+				auto my_old_id = id();
+				set_id(program_.id());
+				program_.set_id(my_old_id);
+				uniforms.swap(program_.uniforms);
+			}
+
+			program& operator = (const program& rhs) = delete;
+			program& operator = (program&& rhs)
+			{
+				swap(rhs);
+				return *this;
+			}
+		};
+
+		class program_view : public program
+		{
+		public:
+			program_view(GLuint id) : program(id)
+			{
+			}
+
+			~program_view()
+			{
+				set_id(0);
+			}
+		};
+	}
+
+	class blitter
+	{
+		struct save_binding_state
+		{
+			GLuint old_fbo;
+
+			save_binding_state()
+			{
+				glGetIntegerv(GL_FRAMEBUFFER_BINDING, reinterpret_cast<GLint*>(&old_fbo));
+			}
+
+			~save_binding_state()
+			{
+				glBindFramebuffer(GL_FRAMEBUFFER, old_fbo);
+			}
+		};
+
+		fbo blit_src;
+		fbo blit_dst;
+
+	public:
+
+		void init()
+		{
+			blit_src.create();
+			blit_dst.create();
+		}
+
+		void destroy()
+		{
+			blit_dst.remove();
+			blit_src.remove();
+		}
+
+		void scale_image(gl::command_context& cmd, const texture* src, texture* dst, areai src_rect, areai dst_rect, bool linear_interpolation,
+			const rsx::typeless_xfer& xfer_info);
+
+		void fast_clear_image(gl::command_context& cmd, const texture* dst, const color4f& color);
+		void fast_clear_image(gl::command_context& cmd, const texture* dst, float depth, u8 stencil);
+	};
 }
diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.cpp b/rpcs3/Emu/RSX/GL/GLOverlays.cpp
index 983bed6f85..3d28e263cb 100644
--- a/rpcs3/Emu/RSX/GL/GLOverlays.cpp
+++ b/rpcs3/Emu/RSX/GL/GLOverlays.cpp
@@ -1,30 +1,11 @@
 #include "GLOverlays.h"
 
-#include "Utilities/StrUtil.h"
-#include "../Program/RSXOverlay.h"
-#include "Emu/Cell/timers.hpp"
-
 namespace gl
 {
-	// Lame
-	std::unordered_map<u32, std::unique_ptr<gl::overlay_pass>> g_overlay_passes;
-
-	void destroy_overlay_passes()
-	{
-		for (auto& [key, prog] : g_overlay_passes)
-		{
-			prog->destroy();
-		}
-
-		g_overlay_passes.clear();
-	}
-
 	void overlay_pass::create()
 	{
 		if (!compiled)
 		{
-			ensure(!fs_src.empty() && !vs_src.empty(), "Shaders have not been initialized.");
-
 			fs.create(::glsl::program_domain::glsl_fragment_program, fs_src);
 			fs.compile();
 
@@ -36,12 +17,10 @@ namespace gl
 			program_handle.attach(fs);
 			program_handle.link();
 
-			ensure(program_handle.id());
-
 			fbo.create();
 
 			m_sampler.create();
-			m_sampler.apply_defaults(static_cast<GLenum>(m_input_filter));
+			m_sampler.apply_defaults(input_filter);
 
 			m_vertex_data_buffer.create();
 
@@ -79,7 +58,7 @@ namespace gl
 		}
 	}
 
-	void overlay_pass::emit_geometry(gl::command_context& /*cmd*/)
+	void overlay_pass::emit_geometry()
 	{
 		int old_vao;
 		glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &old_vao);
@@ -90,105 +69,137 @@ namespace gl
 		glBindVertexArray(old_vao);
 	}
 
-	void overlay_pass::run(gl::command_context& cmd, const areau& region, GLuint target_texture, GLuint image_aspect_bits, bool enable_blending)
+	void overlay_pass::run(const areau& region, GLuint target_texture, bool depth_target, bool use_blending)
 	{
-		ensure(compiled && program_handle.id() != GL_NONE, "You must initialize overlay passes with create() before calling run()");
+		if (!compiled)
+		{
+			rsx_log.error("You must initialize overlay passes with create() before calling run()");
+			return;
+		}
 
+		GLint program;
+		GLint old_fbo;
+		GLint depth_func;
 		GLint viewport[4];
-		std::unique_ptr<fbo::save_binding_state> save_fbo;
+		GLboolean color_writes[4];
+		GLboolean depth_write;
+
+		GLint blend_src_rgb;
+		GLint blend_src_a;
+		GLint blend_dst_rgb;
+		GLint blend_dst_a;
+		GLint blend_eq_a;
+		GLint blend_eq_rgb;
 
 		if (target_texture)
 		{
-			save_fbo = std::make_unique<fbo::save_binding_state>(fbo);
+			glGetIntegerv(GL_FRAMEBUFFER_BINDING, &old_fbo);
+			glBindFramebuffer(GL_FRAMEBUFFER, fbo.id());
 
-			switch (image_aspect_bits)
+			if (depth_target)
 			{
-			case gl::image_aspect::color:
-				fbo.color[0] = target_texture;
-				fbo.draw_buffer(fbo.color[0]);
-				break;
-			case gl::image_aspect::depth:
-				fbo.draw_buffer(fbo.no_color);
-				fbo.depth = target_texture;
-				break;
-			case gl::image_aspect::stencil:
-				fbo.draw_buffer(fbo.no_color);
-				fbo.depth_stencil = target_texture;
-				break;
-			case gl::image_aspect::depth | gl::image_aspect::stencil:
-				fbo.draw_buffer(fbo.no_color);
-				fbo.depth_stencil = target_texture;
-				break;
-			default:
-				fmt::throw_exception("Unsupported image aspect combination 0x%x", image_aspect_bits);
+				glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, target_texture, 0);
+				glDrawBuffer(GL_NONE);
+			}
+			else
+			{
+				GLenum buffer = GL_COLOR_ATTACHMENT0;
+				glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, target_texture, 0);
+				glDrawBuffers(1, &buffer);
 			}
-
-			enable_depth_writes = (image_aspect_bits & m_write_aspect_mask) & gl::image_aspect::depth;
-			enable_stencil_writes = (image_aspect_bits & m_write_aspect_mask) & gl::image_aspect::stencil;
 		}
 
-		if (!target_texture || fbo.check())
+		if (!target_texture || glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE)
 		{
-			// Save state (TODO)
+			// Push rasterizer state
 			glGetIntegerv(GL_VIEWPORT, viewport);
+			glGetBooleanv(GL_COLOR_WRITEMASK, color_writes);
+			glGetBooleanv(GL_DEPTH_WRITEMASK, &depth_write);
+			glGetIntegerv(GL_CURRENT_PROGRAM, &program);
+			glGetIntegerv(GL_DEPTH_FUNC, &depth_func);
+
+			GLboolean scissor_enabled = glIsEnabled(GL_SCISSOR_TEST);
+			GLboolean depth_test_enabled = glIsEnabled(GL_DEPTH_TEST);
+			GLboolean cull_face_enabled = glIsEnabled(GL_CULL_FACE);
+			GLboolean blend_enabled = glIsEnabledi(GL_BLEND, 0);
+			GLboolean stencil_test_enabled = glIsEnabled(GL_STENCIL_TEST);
+
+			if (use_blending)
+			{
+				glGetIntegerv(GL_BLEND_SRC_RGB, &blend_src_rgb);
+				glGetIntegerv(GL_BLEND_SRC_ALPHA, &blend_src_a);
+				glGetIntegerv(GL_BLEND_DST_RGB, &blend_dst_rgb);
+				glGetIntegerv(GL_BLEND_DST_ALPHA, &blend_dst_a);
+				glGetIntegerv(GL_BLEND_EQUATION_RGB, &blend_eq_rgb);
+				glGetIntegerv(GL_BLEND_EQUATION_ALPHA, &blend_eq_a);
+			}
 
 			// Set initial state
 			glViewport(region.x1, region.y1, region.width(), region.height());
-			cmd->color_maski(0, GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-			cmd->depth_mask(image_aspect_bits == gl::image_aspect::color ? GL_FALSE : GL_TRUE);
+			glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+			glDepthMask(depth_target ? GL_TRUE : GL_FALSE);
 
-			cmd->disable(GL_CULL_FACE);
-			cmd->disable(GL_SCISSOR_TEST);
-			cmd->clip_planes(GL_NONE);
+			// Disabling depth test will also disable depth writes which is not desired
+			glDepthFunc(GL_ALWAYS);
+			glEnable(GL_DEPTH_TEST);
 
-			if (enable_depth_writes)
-			{
-				// Disabling depth test will also disable depth writes which is not desired
-				cmd->depth_func(GL_ALWAYS);
-				cmd->enable(GL_DEPTH_TEST);
-			}
-			else
-			{
-				cmd->disable(GL_DEPTH_TEST);
-			}
+			if (scissor_enabled) glDisable(GL_SCISSOR_TEST);
+			if (cull_face_enabled) glDisable(GL_CULL_FACE);
+			if (stencil_test_enabled) glDisable(GL_STENCIL_TEST);
 
-			if (enable_stencil_writes)
+			if (use_blending)
 			{
-				// Disabling stencil test also disables stencil writes.
-				cmd->enable(GL_STENCIL_TEST);
-				cmd->stencil_mask(0xFF);
-				cmd->stencil_func(GL_ALWAYS, 0xFF, 0xFF);
-				cmd->stencil_op(GL_KEEP, GL_KEEP, GL_REPLACE);
-			}
-			else
-			{
-				cmd->disable(GL_STENCIL_TEST);
-			}
+				if (!blend_enabled)
+					glEnablei(GL_BLEND, 0);
 
-			if (enable_blending)
-			{
-				cmd->enablei(GL_BLEND, 0);
-				glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ZERO, GL_ONE);
+				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 				glBlendEquation(GL_FUNC_ADD);
 			}
-			else
+			else if (blend_enabled)
 			{
-				cmd->disablei(GL_BLEND, 0);
+				glDisablei(GL_BLEND, 0);
 			}
 
 			// Render
-			cmd->use_program(program_handle.id());
+			program_handle.use();
 			on_load();
 			bind_resources();
-			emit_geometry(cmd);
-
-			glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
+			emit_geometry();
 
+			// Clean up
 			if (target_texture)
 			{
-				fbo.color[0] = GL_NONE;
-				fbo.depth = GL_NONE;
-				fbo.depth_stencil = GL_NONE;
+				if (depth_target)
+					glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0);
+				else
+					glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0);
+
+				glBindFramebuffer(GL_FRAMEBUFFER, old_fbo);
+			}
+
+			glUseProgram(program);
+
+			glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
+			glColorMask(color_writes[0], color_writes[1], color_writes[2], color_writes[3]);
+			glDepthMask(depth_write);
+			glDepthFunc(depth_func);
+
+			if (!depth_test_enabled) glDisable(GL_DEPTH_TEST);
+			if (scissor_enabled) glEnable(GL_SCISSOR_TEST);
+			if (cull_face_enabled) glEnable(GL_CULL_FACE);
+			if (stencil_test_enabled) glEnable(GL_STENCIL_TEST);
+
+			if (use_blending)
+			{
+				if (!blend_enabled)
+					glDisablei(GL_BLEND, 0);
+
+				glBlendFuncSeparate(blend_src_rgb, blend_dst_rgb, blend_src_a, blend_dst_a);
+				glBlendEquationSeparate(blend_eq_rgb, blend_eq_a);
+			}
+			else if (blend_enabled)
+			{
+				 glEnablei(GL_BLEND, 0);
 			}
 		}
 		else
@@ -200,30 +211,143 @@ namespace gl
 	ui_overlay_renderer::ui_overlay_renderer()
 	{
 		vs_src =
-		#include "../Program/GLSLSnippets/OverlayRenderVS.glsl"
-		;
+			"#version 420\n\n"
+			"layout(location=0) in vec4 in_pos;\n"
+			"layout(location=0) out vec2 tc0;\n"
+			"layout(location=1) flat out vec4 clip_rect;\n"
+			"uniform vec4 ui_scale;\n"
+			"uniform vec4 viewport;\n"
+			"uniform vec4 clip_bounds;\n"
+			"\n"
+			"vec2 snap_to_grid(vec2 normalized)\n"
+			"{\n"
+			"	return (floor(normalized * viewport.xy) + 0.5) / viewport.xy;\n"
+			"}\n"
+			"\n"
+			"vec4 clip_to_ndc(const in vec4 coord)\n"
+			"{\n"
+			"	vec4 ret = (coord * ui_scale.zwzw) / ui_scale.xyxy;\n"
+			"	ret.yw = 1. - ret.yw;\n"
+			"	return ret;\n"
+			"}\n"
+			"\n"
+			"vec4 ndc_to_window(const in vec4 coord)\n"
+			"{\n"
+			"	return fma(coord, viewport.xyxy, viewport.zwzw);\n"
+			"}\n"
+			"\n"
+			"void main()\n"
+			"{\n"
+			"	tc0.xy = in_pos.zw;\n"
+			"	clip_rect = ndc_to_window(clip_to_ndc(clip_bounds)).xwzy; // Swap y1 and y2 due to flipped origin!\n"
+			"	vec4 pos = vec4(clip_to_ndc(in_pos).xy, 0.5, 1.);\n"
+			"	pos.xy = snap_to_grid(pos.xy);\n"
+			"	gl_Position = (pos + pos) - 1.;\n"
+			"}\n";
 
 		fs_src =
-		#include "../Program/GLSLSnippets/OverlayRenderFS.glsl"
-		;
-
-		vs_src = fmt::replace_all(vs_src,
-		{
-			{ "#version 450", "#version 420" },
-			{ "%preprocessor", "// %preprocessor" }
-		});
-		fs_src = fmt::replace_all(fs_src, "%preprocessor", "// %preprocessor");
+			"#version 420\n\n"
+			"layout(binding=31) uniform sampler2D fs0;\n"
+			"layout(binding=30) uniform sampler2DArray fs1;\n"
+			"layout(location=0) in vec2 tc0;\n"
+			"layout(location=1) flat in vec4 clip_rect;\n"
+			"layout(location=0) out vec4 ocol;\n"
+			"uniform vec4 color;\n"
+			"uniform float time;\n"
+			"uniform int sampler_mode;\n"
+			"uniform int pulse_glow;\n"
+			"uniform int clip_region;\n"
+			"uniform int blur_strength;\n"
+			"\n"
+			"vec4 blur_sample(sampler2D tex, vec2 coord, vec2 tex_offset)\n"
+			"{\n"
+			"	vec2 coords[9];\n"
+			"	coords[0] = coord - tex_offset\n;"
+			"	coords[1] = coord + vec2(0., -tex_offset.y);\n"
+			"	coords[2] = coord + vec2(tex_offset.x, -tex_offset.y);\n"
+			"	coords[3] = coord + vec2(-tex_offset.x, 0.);\n"
+			"	coords[4] = coord;\n"
+			"	coords[5] = coord + vec2(tex_offset.x, 0.);\n"
+			"	coords[6] = coord + vec2(-tex_offset.x, tex_offset.y);\n"
+			"	coords[7] = coord + vec2(0., tex_offset.y);\n"
+			"	coords[8] = coord + tex_offset;\n"
+			"\n"
+			"	float weights[9] =\n"
+			"	{\n"
+			"		1., 2., 1.,\n"
+			"		2., 4., 2.,\n"
+			"		1., 2., 1.\n"
+			"	};\n"
+			"\n"
+			"	vec4 blurred = vec4(0.);\n"
+			"	for (int n = 0; n < 9; ++n)\n"
+			"	{\n"
+			"		blurred += texture(tex, coords[n]) * weights[n];\n"
+			"	}\n"
+			"\n"
+			"	return blurred / 16.f;\n"
+			"}\n"
+			"\n"
+			"vec4 sample_image(sampler2D tex, vec2 coord)\n"
+			"{\n"
+			"	vec4 original = texture(tex, coord);\n"
+			"	if (blur_strength == 0) return original;\n"
+			"	\n"
+			"	vec2 constraints = 1.f / vec2(640, 360);\n"
+			"	vec2 res_offset = 1.f / textureSize(fs0, 0);\n"
+			"	vec2 tex_offset = max(res_offset, constraints);\n"
+			"\n"
+			"	// Sample triangle pattern and average\n"
+			"	// TODO: Nicer looking gaussian blur with less sampling\n"
+			"	vec4 blur0 = blur_sample(tex, coord + vec2(-res_offset.x, 0.), tex_offset);\n"
+			"	vec4 blur1 = blur_sample(tex, coord + vec2(res_offset.x, 0.), tex_offset);\n"
+			"	vec4 blur2 = blur_sample(tex, coord + vec2(0., res_offset.y), tex_offset);\n"
+			"\n"
+			"	vec4 blurred = blur0 + blur1 + blur2;\n"
+			"	blurred /= 3.;\n"
+			"	return mix(original, blurred, float(blur_strength) / 100.);\n"
+			"}\n"
+			"\n"
+			"void main()\n"
+			"{\n"
+			"	if (clip_region != 0)\n"
+			"	{"
+			"		if (gl_FragCoord.x < clip_rect.x || gl_FragCoord.x > clip_rect.z ||\n"
+			"			gl_FragCoord.y < clip_rect.y || gl_FragCoord.y > clip_rect.w)\n"
+			"		{\n"
+			"			discard;\n"
+			"			return;\n"
+			"		}\n"
+			"	}\n"
+			"\n"
+			"	vec4 diff_color = color;\n"
+			"	if (pulse_glow != 0)\n"
+			"		diff_color.a *= (sin(time) + 1.f) * 0.5f;\n"
+			"\n"
+			"	switch (sampler_mode)\n"
+			"	{\n"
+			"	case 1:\n"
+			"		ocol = sample_image(fs0, tc0) * diff_color;\n"
+			"		break;\n"
+			"	case 2:\n"
+			"		ocol = texture(fs1, vec3(tc0.x, fract(tc0.y), trunc(tc0.y))) * diff_color;\n"
+			"		break;\n"
+			"	default:\n"
+			"		ocol = diff_color;\n"
+			"		break;\n"
+			"	}\n"
+			"}\n";
 
 		// Smooth filtering required for inputs
-		m_input_filter = gl::filter::linear;
+		input_filter = GL_LINEAR;
 	}
 
-	gl::texture_view* ui_overlay_renderer::load_simple_image(rsx::overlays::image_info_base* desc, bool temp_resource, u32 owner_uid)
+	gl::texture_view* ui_overlay_renderer::load_simple_image(rsx::overlays::image_info* desc, bool temp_resource, u32 owner_uid)
 	{
-		auto tex = std::make_unique<gl::texture>(GL_TEXTURE_2D, desc->w, desc->h, 1, 1, 1, GL_RGBA8, RSX_FORMAT_CLASS_COLOR);
-		tex->copy_from(desc->get_data(), gl::texture::format::rgba, gl::texture::type::uint_8_8_8_8, {});
+		auto tex = std::make_unique<gl::texture>(GL_TEXTURE_2D, desc->w, desc->h, 1, 1, GL_RGBA8);
+		tex->copy_from(desc->data, gl::texture::format::rgba, gl::texture::type::uint_8_8_8_8, {});
 
-		const GLenum remap[] = { GL_RED, GL_ALPHA, GL_BLUE, GL_GREEN };
+		GLenum remap[] = { GL_RED, GL_ALPHA, GL_BLUE, GL_GREEN };
 		auto view = std::make_unique<gl::texture_view>(tex.get(), remap);
 
 		auto result = view.get();
@@ -234,7 +358,7 @@ namespace gl
 		}
 		else
 		{
-			const u64 key = reinterpret_cast<u64>(desc);
+			u64 key = reinterpret_cast<u64>(desc);
 			temp_image_cache[key] = std::make_pair(owner_uid, std::move(tex));
 			temp_view_cache[key] = std::move(view);
 		}
@@ -249,7 +373,7 @@ namespace gl
 		rsx::overlays::resource_config configuration;
 		configuration.load_files();
 
-		for (const auto& res : configuration.texture_raw_data)
+		for (const auto &res : configuration.texture_raw_data)
 		{
 			load_simple_image(res.get(), false, -1);
 		}
@@ -260,10 +384,8 @@ namespace gl
 	void ui_overlay_renderer::destroy()
 	{
 		temp_image_cache.clear();
-		temp_view_cache.clear();
 		resources.clear();
 		font_cache.clear();
-		view_cache.clear();
 		overlay_pass::destroy();
 	}
 
@@ -303,9 +425,10 @@ namespace gl
 		}
 
 		// Create font file
-		const std::vector<u8>& glyph_data = font->get_glyph_data();
+		std::vector<u8> glyph_data;
+		font->get_glyph_data(glyph_data);
 
-		auto tex = std::make_unique<gl::texture>(GL_TEXTURE_2D_ARRAY, font_size.width, font_size.height, font_size.depth, 1, 1, GL_R8, RSX_FORMAT_CLASS_COLOR);
+		auto tex = std::make_unique<gl::texture>(GL_TEXTURE_2D_ARRAY, font_size.width, font_size.height, font_size.depth, 1, GL_R8);
 		tex->copy_from(glyph_data.data(), gl::texture::format::r, gl::texture::type::ubyte, {});
 
 		GLenum remap[] = { GL_RED, GL_RED, GL_RED, GL_RED };
@@ -318,25 +441,18 @@ namespace gl
 		return result;
 	}
 
-	gl::texture_view* ui_overlay_renderer::find_temp_image(rsx::overlays::image_info_base* desc, u32 owner_uid)
+	gl::texture_view* ui_overlay_renderer::find_temp_image(rsx::overlays::image_info* desc, u32 owner_uid)
 	{
-		const bool dirty = std::exchange(desc->dirty, false);
-		const u64 key = reinterpret_cast<u64>(desc);
-
+		auto key = reinterpret_cast<u64>(desc);
 		auto cached = temp_view_cache.find(key);
 		if (cached != temp_view_cache.end())
 		{
-			gl::texture_view* view = cached->second.get();
-
-			if (dirty)
-			{
-				view->image()->copy_from(desc->get_data(), gl::texture::format::rgba, gl::texture::type::uint_8_8_8_8, {});
-			}
-
-			return view;
+			return cached->second.get();
+		}
+		else
+		{
+			return load_simple_image(desc, true, owner_uid);
 		}
-
-		return load_simple_image(desc, true, owner_uid);
 	}
 
 	void ui_overlay_renderer::set_primitive_type(rsx::overlays::primitive_type type)
@@ -355,15 +471,12 @@ namespace gl
 			case rsx::overlays::primitive_type::line_strip:
 				primitives = GL_LINE_STRIP;
 				break;
-			case rsx::overlays::primitive_type::triangle_fan:
-				primitives = GL_TRIANGLE_FAN;
-				break;
 			default:
 				fmt::throw_exception("Unexpected primitive type %d", static_cast<s32>(type));
 		}
 	}
 
-	void ui_overlay_renderer::emit_geometry(gl::command_context& cmd)
+	void ui_overlay_renderer::emit_geometry()
 	{
 		if (m_current_primitive_type == rsx::overlays::primitive_type::quad_list)
 		{
@@ -391,11 +504,11 @@ namespace gl
 		}
 		else
 		{
-			overlay_pass::emit_geometry(cmd);
+			overlay_pass::emit_geometry();
 		}
 	}
 
-	void ui_overlay_renderer::run(gl::command_context& cmd_, const areau& viewport, GLuint target, rsx::overlays::overlay& ui)
+	void ui_overlay_renderer::run(const areau& viewport, GLuint target, rsx::overlays::overlay& ui)
 	{
 		program_handle.uniforms["viewport"] = color4f(static_cast<f32>(viewport.width()), static_cast<f32>(viewport.height()), static_cast<f32>(viewport.x1), static_cast<f32>(viewport.y1));
 		program_handle.uniforms["ui_scale"] = color4f(static_cast<f32>(ui.virtual_width), static_cast<f32>(ui.virtual_height), 1.f, 1.f);
@@ -403,18 +516,12 @@ namespace gl
 		saved_sampler_state save_30(30, m_sampler);
 		saved_sampler_state save_31(31, m_sampler);
 
-		if (ui.status_flags & rsx::overlays::status_bits::invalidate_image_cache)
-		{
-			remove_temp_resources(ui.uid);
-			ui.status_flags.clear(rsx::overlays::status_bits::invalidate_image_cache);
-		}
-
 		for (auto& cmd : ui.get_compiled().draw_commands)
 		{
 			set_primitive_type(cmd.config.primitives);
 			upload_vertex_data(cmd.verts.data(), ::size32(cmd.verts));
 			num_drawable_elements = ::size32(cmd.verts);
-			auto texture_mode = rsx::overlays::texture_sampling_mode::texture2D;
+			GLint texture_read = GL_TRUE;
 
 			switch (cmd.config.texture_ref)
 			{
@@ -423,148 +530,117 @@ namespace gl
 				// TODO
 			case rsx::overlays::image_resource_id::none:
 			{
-				texture_mode = rsx::overlays::texture_sampling_mode::none;
-				cmd_->bind_texture(31, GL_TEXTURE_2D, GL_NONE);
+				texture_read = GL_FALSE;
+				glBindTexture(GL_TEXTURE_2D, GL_NONE);
 				break;
 			}
 			case rsx::overlays::image_resource_id::raw_image:
 			{
-				cmd_->bind_texture(31, GL_TEXTURE_2D, find_temp_image(static_cast<rsx::overlays::image_info_base*>(cmd.config.external_data_ref), ui.uid)->id());
+				glBindTexture(GL_TEXTURE_2D, find_temp_image(static_cast<rsx::overlays::image_info*>(cmd.config.external_data_ref), ui.uid)->id());
 				break;
 			}
 			case rsx::overlays::image_resource_id::font_file:
 			{
-				texture_mode = rsx::overlays::texture_sampling_mode::font3D;
-				cmd_->bind_texture(30, GL_TEXTURE_2D_ARRAY, find_font(cmd.config.font_ref)->id());
+				texture_read = (GL_TRUE + 1);
+				glActiveTexture(GL_TEXTURE0 + 30);
+				glBindTexture(GL_TEXTURE_2D_ARRAY, find_font(cmd.config.font_ref)->id());
+				glActiveTexture(GL_TEXTURE0 + 31);
 				break;
 			}
 			default:
 			{
-				cmd_->bind_texture(31, GL_TEXTURE_2D, view_cache[cmd.config.texture_ref - 1]->id());
+				glBindTexture(GL_TEXTURE_2D, view_cache[cmd.config.texture_ref - 1]->id());
 				break;
 			}
 			}
 
-			rsx::overlays::vertex_options vert_opts;
-			program_handle.uniforms["vertex_config"] = vert_opts
-				.disable_vertex_snap(cmd.config.disable_vertex_snap)
-				.get();
-
-			rsx::overlays::fragment_options draw_opts;
-			program_handle.uniforms["fragment_config"] = draw_opts
-				.texture_mode(texture_mode)
-				.clip_fragments(cmd.config.clip_region)
-				.pulse_glow(cmd.config.pulse_glow)
-				.get();
-
-			program_handle.uniforms["timestamp"] = cmd.config.get_sinus_value();
-			program_handle.uniforms["albedo"] = cmd.config.color;
+			program_handle.uniforms["time"] = cmd.config.get_sinus_value();
+			program_handle.uniforms["color"] = cmd.config.color;
+			program_handle.uniforms["sampler_mode"] = texture_read;
+			program_handle.uniforms["pulse_glow"] = static_cast<s32>(cmd.config.pulse_glow);
+			program_handle.uniforms["blur_strength"] = static_cast<s32>(cmd.config.blur_strength);
+			program_handle.uniforms["clip_region"] = static_cast<s32>(cmd.config.clip_region);
 			program_handle.uniforms["clip_bounds"] = cmd.config.clip_rect;
-			program_handle.uniforms["blur_intensity"] = static_cast<f32>(cmd.config.blur_strength);
-			overlay_pass::run(cmd_, viewport, target, gl::image_aspect::color, true);
+			overlay_pass::run(viewport, target, false, true);
 		}
 
-		ui.update(get_system_time());
+		ui.update();
 	}
 
 	video_out_calibration_pass::video_out_calibration_pass()
 	{
 		vs_src =
-		#include "../Program/GLSLSnippets/GenericVSPassthrough.glsl"
-		;
+			"#version 420\n\n"
+			"layout(location=0) out vec2 tc0;\n"
+			"\n"
+			"void main()\n"
+			"{\n"
+			"	vec2 positions[] = {vec2(-1., -1.), vec2(1., -1.), vec2(-1., 1.), vec2(1., 1.)};\n"
+			"	vec2 coords[] = {vec2(0., 1.), vec2(1., 1.), vec2(0., 0.), vec2(1., 0.)};\n"
+			"	tc0 = coords[gl_VertexID % 4];\n"
+			"	vec2 pos = positions[gl_VertexID % 4];\n"
+			"	gl_Position = vec4(pos, 0., 1.);\n"
+			"}\n";
 
 		fs_src =
-		#include "../Program/GLSLSnippets/VideoOutCalibrationPass.glsl"
-		;
+			"#version 420\n\n"
+			"layout(binding=31) uniform sampler2D fs0;\n"
+			"layout(binding=30) uniform sampler2D fs1;\n"
+			"layout(location=0) in vec2 tc0;\n"
+			"layout(location=0) out vec4 ocol;\n"
+			"\n"
+			"uniform float gamma;\n"
+			"uniform int limit_range;\n"
+			"uniform int stereo;\n"
+			"uniform int stereo_image_count;\n"
+			"\n"
+			"vec4 read_source()\n"
+			"{\n"
+			"	if (stereo == 0) return texture(fs0, tc0);\n"
+			"\n"
+			"	vec4 left, right;\n"
+			"	if (stereo_image_count == 2)\n"
+			"	{\n"
+			"		left = texture(fs0, tc0);\n"
+			"		right = texture(fs1, tc0);\n"
+			"	}\n"
+			"	else\n"
+			"	{\n"
+			"		vec2 coord_left = tc0 * vec2(1.f, 0.4898f);\n"
+			"		vec2 coord_right = coord_left + vec2(0.f, 0.510204f);\n"
+			"		left = texture(fs0, coord_left);\n"
+			"		right = texture(fs0, coord_right);\n"
+			"	}\n"
+			"\n"
+			"	return vec4(left.r, right.g, right.b, 1.);\n"
+			"}\n"
+			"\n"
+			"void main()\n"
+			"{\n"
+			"	vec4 color = read_source();\n"
+			"	color.rgb = pow(color.rgb, vec3(gamma));\n"
+			"	if (limit_range > 0)\n"
+			"		ocol = ((color * 220.) + 16.) / 255.;\n"
+			"	else\n"
+			"		ocol = color;\n"
+			"}\n";
 
-		std::pair<std::string_view, std::string> repl_list[] =
-		{
-			{ "%sampler_binding", fmt::format("(%d - x)", GL_TEMP_IMAGE_SLOT(0)) },
-			{ "%set_decorator, ", "" },
-		};
-		fs_src = fmt::replace_all(fs_src, repl_list);
-
-		m_input_filter = gl::filter::linear;
+		input_filter = GL_LINEAR;
 	}
 
-	void video_out_calibration_pass::run(gl::command_context& cmd, const areau& viewport, const rsx::simple_array<GLuint>& source, f32 gamma, bool limited_rgb, stereo_render_mode_options stereo_mode, gl::filter input_filter)
+	void video_out_calibration_pass::run(const areau& viewport, const rsx::simple_array<GLuint>& source, f32 gamma, bool limited_rgb, bool _3d)
 	{
-		if (m_input_filter != input_filter)
-		{
-			m_input_filter = input_filter;
-			m_sampler.set_parameteri(GL_TEXTURE_MIN_FILTER, static_cast<GLenum>(m_input_filter));
-			m_sampler.set_parameteri(GL_TEXTURE_MAG_FILTER, static_cast<GLenum>(m_input_filter));
-		}
-
 		program_handle.uniforms["gamma"] = gamma;
 		program_handle.uniforms["limit_range"] = limited_rgb + 0;
-		program_handle.uniforms["stereo_display_mode"] = static_cast<u8>(stereo_mode);
+		program_handle.uniforms["stereo"] = _3d + 0;
 		program_handle.uniforms["stereo_image_count"] = (source[1] == GL_NONE? 1 : 2);
 
-		saved_sampler_state saved(GL_TEMP_IMAGE_SLOT(0), m_sampler);
-		cmd->bind_texture(GL_TEMP_IMAGE_SLOT(0), GL_TEXTURE_2D, source[0]);
+		saved_sampler_state saved(31, m_sampler);
+		glBindTexture(GL_TEXTURE_2D, source[0]);
 
-		saved_sampler_state saved2(GL_TEMP_IMAGE_SLOT(1), m_sampler);
-		cmd->bind_texture(GL_TEMP_IMAGE_SLOT(1), GL_TEXTURE_2D, source[1]);
+		saved_sampler_state saved2(30, m_sampler);
+		glBindTexture(GL_TEXTURE_2D, source[1]);
 
-		overlay_pass::run(cmd, viewport, GL_NONE, gl::image_aspect::color, false);
-	}
-
-	rp_ssbo_to_generic_texture::rp_ssbo_to_generic_texture()
-	{
-		vs_src =
-		#include "../Program/GLSLSnippets/GenericVSPassthrough.glsl"
-		;
-
-		fs_src =
-		#include "../Program/GLSLSnippets/CopyBufferToGenericImage.glsl"
-		;
-
-		const auto& caps = gl::get_driver_caps();
-		const bool stencil_export_supported = caps.ARB_shader_stencil_export_supported;
-		const bool legacy_format_support = caps.subvendor_ATI;
-
-		std::pair<std::string_view, std::string> repl_list[] =
-		{
-			{ "%set, ", "" },
-			{ "%loc", std::to_string(GL_COMPUTE_BUFFER_SLOT(0)) },
-			{ "%push_block", fmt::format("binding=%d, std140", GL_COMPUTE_BUFFER_SLOT(1)) },
-			{ "%stencil_export_supported", stencil_export_supported ? "1" : "0" },
-			{ "%legacy_format_support", legacy_format_support ? "1" : "0" }
-		};
-
-		fs_src = fmt::replace_all(fs_src, repl_list);
-
-		if (stencil_export_supported)
-		{
-			m_write_aspect_mask |= gl::image_aspect::stencil;
-		}
-	}
-
-	void rp_ssbo_to_generic_texture::run(gl::command_context& cmd,
-		const buffer* src, const texture_view* dst,
-		const u32 src_offset, const coordu& dst_region,
-		const pixel_buffer_layout& layout)
-	{
-		const u32 bpp = dst->image()->pitch() / dst->image()->width();
-		const u32 row_length = utils::align(dst_region.width * bpp, std::max<int>(layout.alignment, 1)) / bpp;
-
-		program_handle.uniforms["src_pitch"] = row_length;
-		program_handle.uniforms["swap_bytes"] = layout.swap_bytes;
-		program_handle.uniforms["format"] = static_cast<GLenum>(dst->image()->get_internal_format());
-		src->bind_range(gl::buffer::target::ssbo, GL_COMPUTE_BUFFER_SLOT(0), src_offset, row_length * bpp * dst_region.height);
-
-		cmd->stencil_mask(0xFF);
-
-		overlay_pass::run(cmd, dst_region, dst->id(), dst->aspect());
-	}
-
-	void rp_ssbo_to_generic_texture::run(gl::command_context& cmd,
-		const buffer* src, texture* dst,
-		const u32 src_offset, const coordu& dst_region,
-		const pixel_buffer_layout& layout)
-	{
-		gl::nil_texture_view view(dst);
-		run(cmd, src, &view, src_offset, dst_region, layout);
+		overlay_pass::run(viewport, GL_NONE, false, false);
 	}
 }
diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.h b/rpcs3/Emu/RSX/GL/GLOverlays.h
index bd2be2d0ed..574d713bfc 100644
--- a/rpcs3/Emu/RSX/GL/GLOverlays.h
+++ b/rpcs3/Emu/RSX/GL/GLOverlays.h
@@ -1,16 +1,9 @@
 #pragma once
 
-#include "Emu/system_config_types.h"
-#include "Emu/IdManager.h"
 #include "util/types.hpp"
-#include "../Common/simple_array.hpp"
 #include "../Overlays/overlays.h"
 #include "GLTexture.h"
-
-#include "glutils/fbo.h"
-#include "glutils/program.h"
-#include "glutils/vao.hpp"
-
+#include "Emu/RSX/rsx_utils.h"
 #include <string>
 #include <unordered_map>
 
@@ -35,13 +28,29 @@ namespace gl
 
 		u32 num_drawable_elements = 4;
 		GLenum primitives = GL_TRIANGLE_STRIP;
-		gl::filter m_input_filter = gl::filter::nearest;
+		GLenum input_filter = GL_NEAREST;
 
-		u32 m_write_aspect_mask = gl::image_aspect::color | gl::image_aspect::depth;
-		bool enable_depth_writes = false;
-		bool enable_stencil_writes = false;
+		struct saved_sampler_state
+		{
+			GLuint saved = GL_NONE;
+			GLuint unit = 0;
 
-		virtual ~overlay_pass() = default;
+			saved_sampler_state(GLuint _unit, const gl::sampler_state& sampler)
+			{
+				glActiveTexture(GL_TEXTURE0 + _unit);
+				glGetIntegerv(GL_SAMPLER_BINDING, reinterpret_cast<GLint*>(&saved));
+
+				unit = _unit;
+				sampler.bind(_unit);
+			}
+
+			saved_sampler_state(const saved_sampler_state&) = delete;
+
+			~saved_sampler_state()
+			{
+				glBindSampler(unit, saved);
+			}
+		};
 
 		void create();
 		void destroy();
@@ -58,12 +67,12 @@ namespace gl
 			m_vertex_data_buffer.data(elements_count * sizeof(T), data);
 		}
 
-		virtual void emit_geometry(gl::command_context& cmd);
+		virtual void emit_geometry();
 
-		void run(gl::command_context& cmd, const areau& region, GLuint target_texture, GLuint image_aspect_bits, bool enable_blending = false);
+		void run(const areau& region, GLuint target_texture, bool depth_target, bool use_blending = false);
 	};
 
-	struct ui_overlay_renderer final : public overlay_pass
+	struct ui_overlay_renderer : public overlay_pass
 	{
 		u32 num_elements = 0;
 		std::vector<std::unique_ptr<gl::texture>> resources;
@@ -75,7 +84,7 @@ namespace gl
 
 		ui_overlay_renderer();
 
-		gl::texture_view* load_simple_image(rsx::overlays::image_info_base* desc, bool temp_resource, u32 owner_uid);
+		gl::texture_view* load_simple_image(rsx::overlays::image_info* desc, bool temp_resource, u32 owner_uid);
 
 		void create();
 		void destroy();
@@ -84,46 +93,19 @@ namespace gl
 
 		gl::texture_view* find_font(rsx::overlays::font* font);
 
-		gl::texture_view* find_temp_image(rsx::overlays::image_info_base* desc, u32 owner_uid);
+		gl::texture_view* find_temp_image(rsx::overlays::image_info* desc, u32 owner_uid);
 
 		void set_primitive_type(rsx::overlays::primitive_type type);
 
-		void emit_geometry(gl::command_context& cmd) override;
+		void emit_geometry() override;
 
-		void run(gl::command_context& cmd, const areau& viewport, GLuint target, rsx::overlays::overlay& ui);
+		void run(const areau& viewport, GLuint target, rsx::overlays::overlay& ui);
 	};
 
-	struct video_out_calibration_pass final : public overlay_pass
+	struct video_out_calibration_pass : public overlay_pass
 	{
 		video_out_calibration_pass();
 
-		void run(gl::command_context& cmd, const areau& viewport, const rsx::simple_array<GLuint>& source, f32 gamma, bool limited_rgb, stereo_render_mode_options stereo_mode, gl::filter input_filter);
+		void run(const areau& viewport, const rsx::simple_array<GLuint>& source, f32 gamma, bool limited_rgb, bool _3d);
 	};
-
-	struct rp_ssbo_to_generic_texture final : public overlay_pass
-	{
-		rp_ssbo_to_generic_texture();
-		void run(gl::command_context& cmd, const buffer* src, texture* dst, const u32 src_offset, const coordu& dst_region, const pixel_buffer_layout& layout);
-		void run(gl::command_context& cmd, const buffer* src, const texture_view* dst, const u32 src_offset, const coordu& dst_region, const pixel_buffer_layout& layout);
-	};
-
-	// TODO: Replace with a proper manager
-	extern std::unordered_map<u32, std::unique_ptr<gl::overlay_pass>> g_overlay_passes;
-
-	template<class T>
-	T* get_overlay_pass()
-	{
-		u32 index = stx::typeindex<id_manager::typeinfo, T>();
-		auto &e = g_overlay_passes[index];
-
-		if (!e)
-		{
-			e = std::make_unique<T>();
-			e->create();
-		}
-
-		return static_cast<T*>(e.get());
-	}
-
-	void destroy_overlay_passes();
 }
diff --git a/rpcs3/Emu/RSX/GL/GLPipelineCompiler.cpp b/rpcs3/Emu/RSX/GL/GLPipelineCompiler.cpp
index bdf03c6fff..ff20beb17f 100644
--- a/rpcs3/Emu/RSX/GL/GLPipelineCompiler.cpp
+++ b/rpcs3/Emu/RSX/GL/GLPipelineCompiler.cpp
@@ -1,6 +1,9 @@
 #include "stdafx.h"
 #include "GLPipelineCompiler.h"
 #include "Utilities/Thread.h"
+
+#include <thread>
+
 #include "util/sysinfo.hpp"
 
 namespace gl
@@ -52,7 +55,7 @@ namespace gl
 				job.completion_callback(result);
 			}
 
-			thread_ctrl::wait_on(m_work_queue);
+			thread_ctrl::wait_on(m_work_queue, nullptr);
 		}
 	}
 
diff --git a/rpcs3/Emu/RSX/GL/GLPipelineCompiler.h b/rpcs3/Emu/RSX/GL/GLPipelineCompiler.h
index 4d4dbc020b..2fa56902b6 100644
--- a/rpcs3/Emu/RSX/GL/GLPipelineCompiler.h
+++ b/rpcs3/Emu/RSX/GL/GLPipelineCompiler.h
@@ -1,6 +1,5 @@
 #pragma once
 #include "GLHelpers.h"
-#include "glutils/program.h"
 #include "Emu/RSX/display.h"
 #include "Utilities/lockless.h"
 
diff --git a/rpcs3/Emu/RSX/GL/GLPresent.cpp b/rpcs3/Emu/RSX/GL/GLPresent.cpp
index ed71652063..e33e1481f2 100644
--- a/rpcs3/Emu/RSX/GL/GLPresent.cpp
+++ b/rpcs3/Emu/RSX/GL/GLPresent.cpp
@@ -1,21 +1,9 @@
 #include "stdafx.h"
 #include "GLGSRender.h"
-
-#include "upscalers/bilinear_pass.hpp"
-#include "upscalers/fsr_pass.h"
-#include "upscalers/nearest_pass.hpp"
-
 #include "Emu/Cell/Modules/cellVideoOut.h"
-#include "Emu/RSX/Overlays/overlay_manager.h"
-#include "Emu/RSX/Overlays/overlay_debug_overlay.h"
-
-#include "util/video_provider.h"
 
 LOG_CHANNEL(screenshot_log, "SCREENSHOT");
 
-extern atomic_t<bool> g_user_asked_for_screenshot;
-extern atomic_t<recording_mode> g_recording_mode;
-
 namespace gl
 {
 	namespace debug
@@ -26,40 +14,21 @@ namespace gl
 		{
 			const auto target = static_cast<GLenum>(visual->get_target());
 			const auto ifmt = static_cast<GLenum>(visual->get_internal_format());
-			g_vis_texture.reset(new texture(target, visual->width(), visual->height(), 1, 1, 1, ifmt, visual->format_class()));
+			g_vis_texture.reset(new texture(target, visual->width(), visual->height(), 1, 1, ifmt, visual->format_class()));
 			glCopyImageSubData(visual->id(), target, 0, 0, 0, 0, g_vis_texture->id(), target, 0, 0, 0, 0, visual->width(), visual->height(), 1);
 		}
 	}
-
-	GLenum RSX_display_format_to_gl_format(u8 format)
-	{
-		switch (format)
-		{
-		default:
-			rsx_log.error("Unhandled video output format 0x%x", static_cast<s32>(format));
-			[[fallthrough]];
-		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8:
-			return GL_BGRA8;
-		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8B8G8R8:
-			return GL_RGBA8;
-		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_R16G16B16X16_FLOAT:
-			return GL_RGBA16F;
-		}
-	}
 }
 
 gl::texture* GLGSRender::get_present_source(gl::present_surface_info* info, const rsx::avconf& avconfig)
 {
 	gl::texture* image = nullptr;
 
-	// @FIXME: This implementation needs to merge into the texture cache's upload_texture routine.
-	// See notes on the vulkan implementation on what needs to happen before that is viable.
-
 	// Check the surface store first
 	gl::command_context cmd = { gl_state };
 	const auto format_bpp = rsx::get_format_block_size_in_bytes(info->format);
 	const auto overlap_info = m_rtts.get_merged_texture_memory_region(cmd,
-		info->address, info->width, info->height, info->pitch, format_bpp, rsx::surface_access::transfer_read);
+		info->address, info->width, info->height, info->pitch, format_bpp, rsx::surface_access::shader_read);
 
 	if (!overlap_info.empty())
 	{
@@ -69,8 +38,8 @@ gl::texture* GLGSRender::get_present_source(gl::present_surface_info* info, cons
 
 		if (section.base_address >= info->address)
 		{
-			const auto surface_width = surface->get_surface_width<rsx::surface_metrics::samples>();
-			const auto surface_height = surface->get_surface_height<rsx::surface_metrics::samples>();
+			const auto surface_width = surface->get_surface_width(rsx::surface_metrics::samples);
+			const auto surface_height = surface->get_surface_height(rsx::surface_metrics::samples);
 
 			if (section.base_address == info->address)
 			{
@@ -92,11 +61,12 @@ gl::texture* GLGSRender::get_present_source(gl::present_surface_info* info, cons
 
 			if (viable)
 			{
-				image = section.surface->get_surface(rsx::surface_access::transfer_read);
+				surface->read_barrier(cmd);
+				image = section.surface->get_surface(rsx::surface_access::shader_read);
 
 				std::tie(info->width, info->height) = rsx::apply_resolution_scale<true>(
-					std::min(surface_width, info->width),
-					std::min(surface_height, info->height));
+					std::min(surface_width, static_cast<u16>(info->width)),
+					std::min(surface_height, static_cast<u16>(info->height)));
 			}
 		}
 	}
@@ -108,17 +78,6 @@ gl::texture* GLGSRender::get_present_source(gl::present_surface_info* info, cons
 		if (const auto tex = surface->get_raw_texture(); tex) image = tex;
 	}
 
-	const GLenum expected_format = gl::RSX_display_format_to_gl_format(avconfig.format);
-	std::unique_ptr<gl::texture>& flip_image = m_flip_tex_color[info->eye];
-
-	auto initialize_scratch_image = [&]()
-	{
-		if (!flip_image || flip_image->size2D() != sizeu{ info->width, info->height })
-		{
-			flip_image = std::make_unique<gl::texture>(GL_TEXTURE_2D, info->width, info->height, 1, 1, 1, expected_format, RSX_FORMAT_CLASS_COLOR);
-		}
-	};
-
 	if (!image)
 	{
 		rsx_log.warning("Flip texture was not found in cache. Uploading surface from CPU");
@@ -126,32 +85,31 @@ gl::texture* GLGSRender::get_present_source(gl::present_surface_info* info, cons
 		gl::pixel_unpack_settings unpack_settings;
 		unpack_settings.alignment(1).row_length(info->pitch / 4);
 
-		initialize_scratch_image();
+		if (!m_flip_tex_color || m_flip_tex_color->size2D() != sizeu{info->width, info->height})
+		{
+			m_flip_tex_color = std::make_unique<gl::texture>(GL_TEXTURE_2D, info->width, info->height, 1, 1, GL_RGBA8);
+		}
 
 		gl::command_context cmd{ gl_state };
-		const auto range = utils::address_range32::start_length(info->address, info->pitch * info->height);
+		const auto range = utils::address_range::start_length(info->address, info->pitch * info->height);
 		m_gl_texture_cache.invalidate_range(cmd, range, rsx::invalidation_cause::read);
 
-		flip_image->copy_from(vm::base(info->address), static_cast<gl::texture::format>(expected_format), gl::texture::type::uint_8_8_8_8, unpack_settings);
-		image = flip_image.get();
-	}
-	else if (image->get_internal_format() != static_cast<gl::texture::internal_format>(expected_format))
-	{
-		initialize_scratch_image();
-
-		// Copy
-		if (gl::formats_are_bitcast_compatible(flip_image.get(), image))
+		gl::texture::format fmt;
+		switch (avconfig.format)
 		{
-			const position3u offset{};
-			gl::g_hw_blitter->copy_image(cmd, image, flip_image.get(), 0, 0, offset, offset, { info->width, info->height, 1 });
-		}
-		else
-		{
-			const coord3u region = { {/* offsets */}, { info->width, info->height, 1 } };
-			gl::copy_typeless(cmd, flip_image.get(), image, region, region);
+		default:
+			rsx_log.error("Unhandled video output format 0x%x", avconfig.format);
+			[[fallthrough]];
+		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8:
+			fmt = gl::texture::format::bgra;
+			break;
+		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8B8G8R8:
+			fmt = gl::texture::format::rgba;
+			break;
 		}
 
-		image = flip_image.get();
+		m_flip_tex_color->copy_from(vm::base(info->address), fmt, gl::texture::type::uint_8_8_8_8, unpack_settings);
+		image = m_flip_tex_color.get();
 	}
 
 	return image;
@@ -166,20 +124,12 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
 		return;
 	}
 
-	gl::command_context cmd{ gl_state };
-
 	u32 buffer_width = display_buffers[info.buffer].width;
 	u32 buffer_height = display_buffers[info.buffer].height;
 	u32 buffer_pitch = display_buffers[info.buffer].pitch;
 
 	u32 av_format;
-	const auto& avconfig = g_fxo->get<rsx::avconf>();
-
-	if (!buffer_width)
-	{
-		buffer_width = avconfig.resolution_x;
-		buffer_height = avconfig.resolution_y;
-	}
+	auto& avconfig = g_fxo->get<rsx::avconf>();
 
 	if (avconfig.state)
 	{
@@ -187,7 +137,7 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
 		if (!buffer_pitch)
 			buffer_pitch = buffer_width * avconfig.get_bpp();
 
-		const u32 video_frame_height = (avconfig.stereo_mode == stereo_render_mode_options::disabled ? avconfig.resolution_y : ((avconfig.resolution_y - 30) / 2));
+		const u32 video_frame_height = (!avconfig._3d? avconfig.resolution_y : (avconfig.resolution_y - 30) / 2);
 		buffer_width = std::min(buffer_width, avconfig.resolution_x);
 		buffer_height = std::min(buffer_height, video_frame_height);
 	}
@@ -199,47 +149,44 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
 	}
 
 	// Disable scissor test (affects blit, clear, etc)
-	gl_state.disable(GL_SCISSOR_TEST);
+	gl_state.enable(GL_FALSE, GL_SCISSOR_TEST);
 
 	// Enable drawing to window backbuffer
 	gl::screen.bind();
 
-	gl::texture *image_to_flip = nullptr, *image_to_flip2 = nullptr;
+	GLuint image_to_flip = GL_NONE, image_to_flip2 = GL_NONE;
 
 	if (info.buffer < display_buffers_count && buffer_width && buffer_height)
 	{
 		// Find the source image
-		gl::present_surface_info present_info
-		{
-			.address = rsx::get_address(display_buffers[info.buffer].offset, CELL_GCM_LOCATION_LOCAL),
-			.format = av_format,
-			.width = buffer_width,
-			.height = buffer_height,
-			.pitch = buffer_pitch,
-			.eye = 0
-		};
+		gl::present_surface_info present_info;
+		present_info.width = buffer_width;
+		present_info.height = buffer_height;
+		present_info.pitch = buffer_pitch;
+		present_info.format = av_format;
+		present_info.address = rsx::get_address(display_buffers[info.buffer].offset, CELL_GCM_LOCATION_LOCAL);
 
-		image_to_flip = get_present_source(&present_info, avconfig);
+		const auto image_to_flip_ = get_present_source(&present_info, avconfig);
+		image_to_flip = image_to_flip_->id();
 
-		if (avconfig.stereo_mode != stereo_render_mode_options::disabled) [[unlikely]]
+		if (avconfig._3d) [[unlikely]]
 		{
 			const auto [unused, min_expected_height] = rsx::apply_resolution_scale<true>(RSX_SURFACE_DIMENSION_IGNORED, buffer_height + 30);
-			if (image_to_flip->height() < min_expected_height)
+			if (image_to_flip_->height() < min_expected_height)
 			{
 				// Get image for second eye
 				const u32 image_offset = (buffer_height + 30) * buffer_pitch + display_buffers[info.buffer].offset;
 				present_info.width = buffer_width;
 				present_info.height = buffer_height;
 				present_info.address = rsx::get_address(image_offset, CELL_GCM_LOCATION_LOCAL);
-				present_info.eye = 1;
 
-				image_to_flip2 = get_present_source(&present_info, avconfig);
+				image_to_flip2 = get_present_source(&present_info, avconfig)->id();
 			}
 			else
 			{
 				// Account for possible insets
 				const auto [unused2, scaled_buffer_height] = rsx::apply_resolution_scale<true>(RSX_SURFACE_DIMENSION_IGNORED, buffer_height);
-				buffer_height = std::min<u32>(image_to_flip->height() - min_expected_height, scaled_buffer_height);
+				buffer_height = std::min<u32>(image_to_flip_->height() - min_expected_height, scaled_buffer_height);
 			}
 		}
 
@@ -247,105 +194,86 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
 		buffer_height = present_info.height;
 	}
 
-	if (info.emu_flip)
-	{
-		evaluate_cpu_usage_reduction_limits();
-	}
-
 	// Get window state
 	const int width = m_frame->client_width();
 	const int height = m_frame->client_height();
 
 	// Calculate blit coordinates
-	areai aspect_ratio;
+	coordi aspect_ratio;
+	sizei csize(width, height);
+	sizei new_size = csize;
+
 	if (!g_cfg.video.stretch_to_display_area)
 	{
-		const sizeu csize(width, height);
-		const auto converted = avconfig.aspect_convert_region(size2u{ buffer_width, buffer_height }, csize);
-		aspect_ratio = static_cast<areai>(converted);
-	}
-	else
-	{
-		aspect_ratio = { 0, 0, width, height };
+		const double aq = 1. * buffer_width / buffer_height;
+		const double rq = 1. * new_size.width / new_size.height;
+		const double q = aq / rq;
+
+		if (q > 1.0)
+		{
+			new_size.height = static_cast<int>(new_size.height / q);
+			aspect_ratio.y = (csize.height - new_size.height) / 2;
+		}
+		else if (q < 1.0)
+		{
+			new_size.width = static_cast<int>(new_size.width * q);
+			aspect_ratio.x = (csize.width - new_size.width) / 2;
+		}
 	}
 
-	if (!image_to_flip || aspect_ratio.x1 || aspect_ratio.y1)
+	aspect_ratio.size = new_size;
+
+	if (!image_to_flip || aspect_ratio.width < csize.width || aspect_ratio.height < csize.height)
 	{
-		// Clear the window background to opaque black
-		gl_state.clear_color(0, 0, 0, 255);
+		// Clear the window background to black
+		gl_state.clear_color(0, 0, 0, 0);
 		gl::screen.clear(gl::buffers::color);
 	}
 
 	if (image_to_flip)
 	{
-		if (g_user_asked_for_screenshot || (g_recording_mode != recording_mode::stopped && m_frame->can_consume_frame()))
+		if (m_frame->screenshot_toggle)
 		{
+			m_frame->screenshot_toggle = false;
+
 			std::vector<u8> sshot_frame(buffer_height * buffer_width * 4);
-			glGetError();
 
 			gl::pixel_pack_settings pack_settings{};
-			image_to_flip->copy_to(sshot_frame.data(), gl::texture::format::rgba, gl::texture::type::ubyte, pack_settings);
+			pack_settings.apply();
 
-			if (GLenum err = glGetError(); err != GL_NO_ERROR)
-			{
-				screenshot_log.error("Failed to capture image: 0x%x", err);
-			}
-			else if (g_user_asked_for_screenshot.exchange(false))
-			{
-				m_frame->take_screenshot(std::move(sshot_frame), buffer_width, buffer_height, false);
-			}
+			if (gl::get_driver_caps().ARB_dsa_supported)
+				glGetTextureImage(image_to_flip, 0, GL_RGBA, GL_UNSIGNED_BYTE, buffer_height * buffer_width * 4, sshot_frame.data());
 			else
-			{
-				m_frame->present_frame(sshot_frame, buffer_width * 4, buffer_width, buffer_height, false);
-			}
+				glGetTextureImageEXT(image_to_flip, GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, sshot_frame.data());
+
+			if (GLenum err; (err = glGetError()) != GL_NO_ERROR)
+				screenshot_log.error("Failed to capture image: 0x%x", err);
+			else
+				m_frame->take_screenshot(std::move(sshot_frame), buffer_width, buffer_height, false);
 		}
 
 		const areai screen_area = coordi({}, { static_cast<int>(buffer_width), static_cast<int>(buffer_height) });
+
 		const bool use_full_rgb_range_output = g_cfg.video.full_rgb_range_output.get();
-		const bool backbuffer_has_alpha = m_frame->has_alpha();
 
-		if (!m_upscaler || m_output_scaling != g_cfg.video.output_scaling)
-		{
-			m_output_scaling = g_cfg.video.output_scaling;
-
-			switch (m_output_scaling)
-			{
-			case output_scaling_mode::nearest:
-				m_upscaler = std::make_unique<gl::nearest_upscale_pass>();
-				break;
-			case output_scaling_mode::fsr:
-				m_upscaler = std::make_unique<gl::fsr_upscale_pass>();
-				break;
-			case output_scaling_mode::bilinear:
-			default:
-				m_upscaler = std::make_unique<gl::bilinear_upscale_pass>();
-				break;
-			}
-		}
-
-		if (!backbuffer_has_alpha && use_full_rgb_range_output && rsx::fcmp(avconfig.gamma, 1.f) && avconfig.stereo_mode == stereo_render_mode_options::disabled)
+		if (use_full_rgb_range_output && rsx::fcmp(avconfig.gamma, 1.f) && !avconfig._3d)
 		{
 			// Blit source image to the screen
-			m_upscaler->scale_output(cmd, image_to_flip, screen_area, aspect_ratio.flipped_vertical(), UPSCALE_AND_COMMIT | UPSCALE_DEFAULT_VIEW);
+			m_flip_fbo.recreate();
+			m_flip_fbo.bind();
+			m_flip_fbo.color = image_to_flip;
+			m_flip_fbo.read_buffer(m_flip_fbo.color);
+			m_flip_fbo.draw_buffer(m_flip_fbo.color);
+			m_flip_fbo.blit(gl::screen, screen_area, areai(aspect_ratio).flipped_vertical(), gl::buffers::color, gl::filter::linear);
 		}
 		else
 		{
 			const f32 gamma = avconfig.gamma;
 			const bool limited_range = !use_full_rgb_range_output;
-			const auto filter = m_output_scaling == output_scaling_mode::nearest ? gl::filter::nearest : gl::filter::linear;
-			rsx::simple_array<gl::texture*> images{ image_to_flip, image_to_flip2 };
-
-			if (m_output_scaling == output_scaling_mode::fsr && avconfig.stereo_mode == stereo_render_mode_options::disabled) // 3D will be implemented later
-			{
-				for (unsigned i = 0; i < 2 && images[i]; ++i)
-				{
-					const rsx::flags32_t mode = (i == 0) ? UPSCALE_LEFT_VIEW : UPSCALE_RIGHT_VIEW;
-					images[i] = m_upscaler->scale_output(cmd, image_to_flip, screen_area, aspect_ratio.flipped_vertical(), mode);
-				}
-			}
+			const rsx::simple_array<GLuint> images{ image_to_flip, image_to_flip2 };
 
 			gl::screen.bind();
-			m_video_output_pass.run(cmd, areau(aspect_ratio), images.map(FN(x ? x->id() : GL_NONE)), gamma, limited_range, avconfig.stereo_mode, filter);
+			m_video_output_pass.run(areau(aspect_ratio), images, gamma, limited_range, avconfig._3d);
 		}
 	}
 
@@ -353,7 +281,7 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
 	{
 		if (m_overlay_manager->has_dirty())
 		{
-			m_overlay_manager->lock_shared();
+			m_overlay_manager->lock();
 
 			std::vector<u32> uids_to_dispose;
 			uids_to_dispose.reserve(m_overlay_manager->get_dirty().size());
@@ -364,7 +292,7 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
 				uids_to_dispose.push_back(view->uid);
 			}
 
-			m_overlay_manager->unlock_shared();
+			m_overlay_manager->unlock();
 			m_overlay_manager->dispose(uids_to_dispose);
 		}
 
@@ -377,13 +305,34 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
 
 			for (const auto& view : m_overlay_manager->get_views())
 			{
-				m_ui_renderer.run(cmd, areau(aspect_ratio), 0, *view.get());
+				m_ui_renderer.run(areau(aspect_ratio), 0, *view.get());
 			}
 		}
 	}
 
-	if (g_cfg.video.debug_overlay)
+	if (g_cfg.video.overlay && gl::get_driver_caps().ARB_shader_draw_parameters_supported)
 	{
+		if (!m_text_printer.is_enabled())
+		{
+			m_text_printer.init();
+			m_text_printer.set_enabled(true);
+		}
+
+		// Disable depth test
+		gl_state.depth_func(GL_ALWAYS);
+
+		gl::screen.bind();
+		glViewport(0, 0, width, height);
+
+		m_text_printer.set_scale(m_frame->client_device_pixel_ratio());
+
+		m_text_printer.print_text(4,  0, width, height, fmt::format("RSX Load:                %3d%%", get_load()));
+		m_text_printer.print_text(4, 18, width, height, fmt::format("draw calls: %16d", info.stats.draw_calls));
+		m_text_printer.print_text(4, 36, width, height, fmt::format("draw call setup: %11dus", info.stats.setup_time));
+		m_text_printer.print_text(4, 54, width, height, fmt::format("vertex upload time: %8dus", info.stats.vertex_upload_time));
+		m_text_printer.print_text(4, 72, width, height, fmt::format("textures upload time: %6dus", info.stats.textures_upload_time));
+		m_text_printer.print_text(4, 90, width, height, fmt::format("draw call execution: %7dus", info.stats.draw_exec_time));
+
 		const auto num_dirty_textures = m_gl_texture_cache.get_unreleased_textures_count();
 		const auto texture_memory_size = m_gl_texture_cache.get_texture_memory_in_use() / (1024 * 1024);
 		const auto num_flushes = m_gl_texture_cache.get_num_flush_requests();
@@ -395,39 +344,10 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
 		const auto num_texture_upload = m_gl_texture_cache.get_texture_upload_calls_this_frame();
 		const auto num_texture_upload_miss = m_gl_texture_cache.get_texture_upload_misses_this_frame();
 		const auto texture_upload_miss_ratio = m_gl_texture_cache.get_texture_upload_miss_percentage();
-		const auto texture_copies_ellided = m_gl_texture_cache.get_texture_copies_ellided_this_frame();
-		const auto vertex_cache_hit_count = (info.stats.vertex_cache_request_count - info.stats.vertex_cache_miss_count);
-		const auto vertex_cache_hit_ratio = info.stats.vertex_cache_request_count
-			? (vertex_cache_hit_count * 100) / info.stats.vertex_cache_request_count
-			: 0;
-		const auto program_cache_lookups = info.stats.program_cache_lookups_total;
-		const auto program_cache_ellided = info.stats.program_cache_lookups_ellided;
-		const auto program_cache_ellision_rate = program_cache_lookups
-			? (program_cache_ellided * 100) / program_cache_lookups
-			: 0;
-
-		rsx::overlays::set_debug_overlay_text(fmt::format(
-			"Internal Resolution:     %s\n"
-			"RSX Load:                %3d%%\n"
-			"draw calls: %16d\n"
-			"draw call setup: %11dus\n"
-			"vertex upload time: %8dus\n"
-			"textures upload time: %6dus\n"
-			"draw call execution: %7dus\n"
-			"Unreleased textures: %7d\n"
-			"Texture memory: %12dM\n"
-			"Flush requests: %12d  = %2d (%3d%%) hard faults, %2d unavoidable, %2d misprediction(s), %2d speculation(s)\n"
-			"Texture uploads: %11u (%u from CPU - %02u%%, %u copies avoided)\n"
-			"Vertex cache hits: %9u/%u (%u%%)\n"
-			"Program cache lookup ellision: %u/%u (%u%%)",
-			info.stats.framebuffer_stats.to_string(!backend_config.supports_hw_msaa),
-			get_load(), info.stats.draw_calls, info.stats.setup_time, info.stats.vertex_upload_time,
-			info.stats.textures_upload_time, info.stats.draw_exec_time, num_dirty_textures, texture_memory_size,
-			num_flushes, num_misses, cache_miss_ratio, num_unavoidable, num_mispredict, num_speculate,
-			num_texture_upload, num_texture_upload_miss, texture_upload_miss_ratio, texture_copies_ellided,
-			vertex_cache_hit_count, info.stats.vertex_cache_request_count, vertex_cache_hit_ratio,
-			program_cache_ellided, program_cache_lookups, program_cache_ellision_rate)
-		);
+		m_text_printer.print_text(4, 126, width, height, fmt::format("Unreleased textures: %7d", num_dirty_textures));
+		m_text_printer.print_text(4, 144, width, height, fmt::format("Texture memory: %12dM", texture_memory_size));
+		m_text_printer.print_text(4, 162, width, height, fmt::format("Flush requests: %12d  = %2d (%3d%%) hard faults, %2d unavoidable, %2d misprediction(s), %2d speculation(s)", num_flushes, num_misses, cache_miss_ratio, num_unavoidable, num_mispredict, num_speculate));
+		m_text_printer.print_text(4, 180, width, height, fmt::format("Texture uploads: %15u (%u from CPU - %02u%%)", num_texture_upload, num_texture_upload_miss, texture_upload_miss_ratio));
 	}
 
 	if (gl::debug::g_vis_texture)
@@ -461,7 +381,8 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
 	m_gl_texture_cache.on_frame_end();
 	m_vertex_cache->purge();
 
-	auto removed_textures = m_rtts.trim(cmd);
+	gl::command_context cmd{ gl_state };
+	auto removed_textures = m_rtts.free_invalidated(cmd);
 	m_framebuffer_cache.remove_if([&](auto& fbo)
 	{
 		if (fbo.unused_check_count() >= 2) return true; // Remove if stale
@@ -470,11 +391,11 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
 		return false;
 	});
 
-	if (m_draw_fbo && !m_graphics_state.test(rsx::rtt_config_dirty))
+	if (m_draw_fbo && !m_rtts_dirty)
 	{
 		// Always restore the active framebuffer
 		m_draw_fbo->bind();
 		set_viewport();
-		set_scissor(m_graphics_state & rsx::pipeline_state::scissor_setup_clipped);
+		set_scissor(!!(m_graphics_state & rsx::pipeline_state::scissor_setup_clipped));
 	}
 }
diff --git a/rpcs3/Emu/RSX/GL/GLProcTable.h b/rpcs3/Emu/RSX/GL/GLProcTable.h
index 8f42995a9d..0a2a1a34eb 100644
--- a/rpcs3/Emu/RSX/GL/GLProcTable.h
+++ b/rpcs3/Emu/RSX/GL/GLProcTable.h
@@ -5,6 +5,8 @@ OPENGL_PROC(PFNGLISBUFFERPROC, IsBuffer);
 OPENGL_PROC(PFNGLBUFFERDATAPROC, BufferData);
 OPENGL_PROC(PFNGLBUFFERSUBDATAPROC, BufferSubData);
 OPENGL_PROC(PFNGLGETBUFFERSUBDATAPROC, GetBufferSubData);
+OPENGL_PROC(PFNGLMAPBUFFERPROC, MapBuffer);
+OPENGL_PROC(PFNGLUNMAPBUFFERPROC, UnmapBuffer);
 OPENGL_PROC(PFNGLGETBUFFERPARAMETERIVPROC, GetBufferParameteriv);
 OPENGL_PROC(PFNGLGETBUFFERPOINTERVPROC, GetBufferPointerv);
 OPENGL_PROC(PFNGLBLENDFUNCSEPARATEPROC, BlendFuncSeparate);
@@ -147,15 +149,12 @@ OPENGL_PROC(PFNGLRENDERBUFFERSTORAGEPROC, RenderbufferStorage);
 OPENGL_PROC(PFNGLBINDFRAMEBUFFERPROC, BindFramebuffer);
 OPENGL_PROC(PFNGLDELETEFRAMEBUFFERSPROC, DeleteFramebuffers);
 OPENGL_PROC(PFNGLGENFRAMEBUFFERSPROC, GenFramebuffers);
+OPENGL_PROC(PFNGLFRAMEBUFFERTEXTURE1DPROC, FramebufferTexture1D);
+OPENGL_PROC(PFNGLFRAMEBUFFERTEXTURE2DPROC, FramebufferTexture2D);
+OPENGL_PROC(PFNGLFRAMEBUFFERTEXTURE3DPROC, FramebufferTexture3D);
+OPENGL_PROC(PFNGLFRAMEBUFFERRENDERBUFFERPROC, FramebufferRenderbuffer);
 OPENGL_PROC(PFNGLBLITFRAMEBUFFERPROC, BlitFramebuffer);
-OPENGL_PROC(PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC, NamedFramebufferRenderbuffer);
-OPENGL_PROC(PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC, NamedFramebufferRenderbufferEXT);
-OPENGL_PROC(PFNGLNAMEDFRAMEBUFFERTEXTUREPROC, NamedFramebufferTexture);
-OPENGL_PROC(PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC, NamedFramebufferTextureEXT);
-OPENGL_PROC(PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC, NamedFramebufferDrawBuffers);
-OPENGL_PROC(PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC, FramebufferDrawBuffersEXT);
-OPENGL_PROC(PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC, NamedFramebufferReadBuffer);
-OPENGL_PROC(PFNGLFRAMEBUFFERREADBUFFEREXTPROC, FramebufferReadBufferEXT);
+OPENGL_PROC(PFNGLDRAWBUFFERSPROC, DrawBuffers);
 
 OPENGL_PROC(PFNGLENABLEIPROC, Enablei);
 OPENGL_PROC(PFNGLDISABLEIPROC, Disablei);
@@ -169,23 +168,15 @@ OPENGL_PROC(PFNGLGETINTEGER64VPROC, GetInteger64v);
 OPENGL_PROC(PFNGLGETSTRINGIPROC, GetStringi);
 OPENGL_PROC(PFNGLGETINTEGERI_VPROC, GetIntegeri_v);
 
-OPENGL_PROC(PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC, CheckNamedFramebufferStatus);
-OPENGL_PROC(PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC, CheckNamedFramebufferStatusEXT);
+OPENGL_PROC(PFNGLCHECKFRAMEBUFFERSTATUSPROC, CheckFramebufferStatus);
 
+OPENGL_PROC(PFNGLMAPBUFFERRANGEPROC, MapBufferRange);
 OPENGL_PROC(PFNGLBINDBUFFERRANGEPROC, BindBufferRange);
 OPENGL_PROC(PFNGLBINDBUFFERBASEPROC, BindBufferBase);
 
-OPENGL_PROC(PFNGLMAPNAMEDBUFFERRANGEPROC, MapNamedBufferRange);
-OPENGL_PROC(PFNGLMAPNAMEDBUFFERRANGEEXTPROC, MapNamedBufferRangeEXT);
-OPENGL_PROC(PFNGLUNMAPNAMEDBUFFERPROC, UnmapNamedBuffer);
-OPENGL_PROC(PFNGLUNMAPNAMEDBUFFEREXTPROC, UnmapNamedBufferEXT);
-
 OPENGL_PROC(PFNGLMULTIDRAWELEMENTSPROC, MultiDrawElements);
 OPENGL_PROC(PFNGLMULTIDRAWARRAYSPROC, MultiDrawArrays);
 
-OPENGL_PROC(PFNGLDRAWARRAYSINSTANCEDPROC, DrawArraysInstanced);
-OPENGL_PROC(PFNGLDRAWELEMENTSINSTANCEDPROC, DrawElementsInstanced);
-
 OPENGL_PROC(PFNGLGETTEXTUREIMAGEEXTPROC, GetTextureImageEXT);
 OPENGL_PROC(PFNGLGETTEXTUREIMAGEPROC, GetTextureImage);
 OPENGL_PROC(PFNGLGETTEXTURESUBIMAGEPROC, GetTextureSubImage);
@@ -195,32 +186,12 @@ OPENGL_PROC(PFNGLTEXTURESUBIMAGE2DEXTPROC, TextureSubImage2DEXT);
 OPENGL_PROC(PFNGLTEXTURESUBIMAGE2DPROC, TextureSubImage2D);
 OPENGL_PROC(PFNGLTEXTURESUBIMAGE3DEXTPROC, TextureSubImage3DEXT);
 OPENGL_PROC(PFNGLTEXTURESUBIMAGE3DPROC, TextureSubImage3D);
-OPENGL_PROC(PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC, CompressedTextureSubImage1D);
-OPENGL_PROC(PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC, CompressedTextureSubImage1DEXT);
-OPENGL_PROC(PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC, CompressedTextureSubImage2D);
-OPENGL_PROC(PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC, CompressedTextureSubImage2DEXT);
-OPENGL_PROC(PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC, CompressedTextureSubImage3D);
-OPENGL_PROC(PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC, CompressedTextureSubImage3DEXT);
-
-OPENGL_PROC(PFNGLTEXTUREPARAMETERIPROC, TextureParameteri);
-OPENGL_PROC(PFNGLTEXTUREPARAMETERIEXTPROC, TextureParameteriEXT);
-OPENGL_PROC(PFNGLTEXTUREPARAMETERIVPROC, TextureParameteriv);
-OPENGL_PROC(PFNGLTEXTUREPARAMETERIVEXTPROC, TextureParameterivEXT);
 
 OPENGL_PROC(PFNGLCLEARBUFFERFVPROC, ClearBufferfv);
 
 OPENGL_PROC(PFNGLCOPYNAMEDBUFFERSUBDATAPROC, CopyNamedBufferSubData);
 OPENGL_PROC(PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC, NamedCopyBufferSubDataEXT);
 
-OPENGL_PROC(PFNGLNAMEDBUFFERDATAPROC, NamedBufferData);
-OPENGL_PROC(PFNGLNAMEDBUFFERDATAEXTPROC, NamedBufferDataEXT);
-
-OPENGL_PROC(PFNGLNAMEDBUFFERSUBDATAPROC, NamedBufferSubData);
-OPENGL_PROC(PFNGLNAMEDBUFFERSUBDATAEXTPROC, NamedBufferSubDataEXT);
-
-// ARB_shader_image_load_store
-OPENGL_PROC(PFNGLBINDIMAGETEXTUREPROC, BindImageTexture);
-
 // Sampler Objects
 OPENGL_PROC(PFNGLGENSAMPLERSPROC, GenSamplers);
 OPENGL_PROC(PFNGLDELETESAMPLERSPROC, DeleteSamplers);
@@ -244,8 +215,7 @@ OPENGL_PROC(PFNGLTEXTUREBUFFERRANGEPROC, TextureBufferRange);
 OPENGL_PROC(PFNGLCOPYIMAGESUBDATAPROC, CopyImageSubData);
 
 // ARB_Buffer_Storage
-OPENGL_PROC(PFNGLNAMEDBUFFERSTORAGEPROC, NamedBufferStorage);
-OPENGL_PROC(PFNGLNAMEDBUFFERSTORAGEEXTPROC, NamedBufferStorageEXT);
+OPENGL_PROC(PFNGLBUFFERSTORAGEPROC, BufferStorage);
 
 // ARB_sync
 OPENGL_PROC(PFNGLFENCESYNCPROC, FenceSync);
@@ -262,13 +232,6 @@ OPENGL_PROC(PFNGLTEXSTORAGE1DPROC, TexStorage1D);
 OPENGL_PROC(PFNGLTEXSTORAGE2DPROC, TexStorage2D);
 OPENGL_PROC(PFNGLTEXSTORAGE3DPROC, TexStorage3D);
 
-// ARB_texture_multisample
-OPENGL_PROC(PFNGLTEXSTORAGE2DMULTISAMPLEPROC, TexStorage2DMultisample);
-OPENGL_PROC(PFNGLTEXSTORAGE3DMULTISAMPLEPROC, TexStorage3DMultisample);
-OPENGL_PROC(PFNGLSAMPLEMASKIPROC, SampleMaski);
-OPENGL_PROC(PFNGLMINSAMPLESHADINGPROC, MinSampleShading);
-OPENGL_PROC(PFNGLSAMPLECOVERAGEPROC, SampleCoverage);
-
 // Texture_View
 OPENGL_PROC(PFNGLTEXTUREVIEWPROC, TextureView);
 
@@ -287,13 +250,14 @@ OPENGL_PROC(PFNGLDISPATCHCOMPUTEPROC, DispatchCompute);
 OPENGL_PROC(PFNGLDEPTHRANGEDNVPROC, DepthRangedNV);
 OPENGL_PROC(PFNGLDEPTHBOUNDSDNVPROC, DepthBoundsdNV);
 
-// EXT_debug_marker
-OPENGL_PROC(PFNGLINSERTEVENTMARKEREXTPROC, InsertEventMarkerEXT);
-
 WGL_PROC(PFNWGLSWAPINTERVALEXTPROC, SwapIntervalEXT);
 
 #if !defined(__GNUG__) || defined(__MINGW32__)
 OPENGL_PROC(PFNGLBLENDCOLORPROC, BlendColor);
 OPENGL_PROC(PFNGLBLENDEQUATIONPROC, BlendEquation);
+OPENGL_PROC(PFNGLCOMPRESSEDTEXIMAGE2DPROC, CompressedTexImage2D);
+OPENGL_PROC(PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC, CompressedTexSubImage1D);
+OPENGL_PROC(PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC, CompressedTexSubImage2D);
+OPENGL_PROC(PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC, CompressedTexSubImage3D);
 OPENGL_PROC(PFNGLACTIVETEXTUREPROC, ActiveTexture);
 #endif
diff --git a/rpcs3/Emu/RSX/GL/GLProgramBuffer.h b/rpcs3/Emu/RSX/GL/GLProgramBuffer.h
index 8dd34caacd..a7eb8f98ad 100644
--- a/rpcs3/Emu/RSX/GL/GLProgramBuffer.h
+++ b/rpcs3/Emu/RSX/GL/GLProgramBuffer.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "GLVertexProgram.h"
 #include "GLFragmentProgram.h"
+#include "GLHelpers.h"
 #include "GLPipelineCompiler.h"
 #include "../Program/ProgramStateCache.h"
 #include "../rsx_utils.h"
@@ -133,15 +134,16 @@ struct GLProgramBuffer : public program_state_cache<GLTraits>
 	}
 
 	template <typename... Args>
-	void add_pipeline_entry(const RSXVertexProgram& vp, const RSXFragmentProgram& fp, void* &props, Args&& ...args)
+	void add_pipeline_entry(RSXVertexProgram &vp, RSXFragmentProgram &fp, void* &props, Args&& ...args)
 	{
-		get_graphics_pipeline(nullptr, vp, fp, props, false, false, std::forward<Args>(args)...);
+		vp.skip_vertex_input_check = true;
+		get_graphics_pipeline(vp, fp, props, false, false, std::forward<Args>(args)...);
 	}
 
-	void preload_programs(rsx::program_cache_hint_t* cache_hint, const RSXVertexProgram& vp, const RSXFragmentProgram& fp)
+	void preload_programs(RSXVertexProgram &vp, RSXFragmentProgram &fp)
 	{
-		search_vertex_program(cache_hint, vp);
-		search_fragment_program(cache_hint, fp);
+		search_vertex_program(vp);
+		search_fragment_program(fp);
 	}
 
 	bool check_cache_missed() const
diff --git a/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp b/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
index c222262699..d149462289 100644
--- a/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
+++ b/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "GLGSRender.h"
-#include "GLResolveHelper.h"
 #include "Emu/RSX/rsx_methods.h"
 
 #include <span>
@@ -14,33 +13,33 @@ color_format rsx::internals::surface_color_format_to_gl(rsx::surface_color_forma
 		return{ ::gl::texture::type::ushort_5_6_5, ::gl::texture::format::rgb, ::gl::texture::internal_format::rgb565, true };
 
 	case rsx::surface_color_format::a8r8g8b8:
-		return{ ::gl::texture::type::uint_8_8_8_8_rev, ::gl::texture::format::bgra, ::gl::texture::internal_format::bgra8, true };
+		return{ ::gl::texture::type::uint_8_8_8_8, ::gl::texture::format::bgra, ::gl::texture::internal_format::rgba8, false };
 
 	//These formats discard their alpha component, forced to 0 or 1
 	//All XBGR formats will have remapping before they can be read back in shaders as DRGB8
 	//Prefix o = 1, z = 0
 	case rsx::surface_color_format::x1r5g5b5_o1r5g5b5:
-		return{ ::gl::texture::type::ushort_5_5_5_1, ::gl::texture::format::rgb, ::gl::texture::internal_format::bgr5a1, true,
+		return{ ::gl::texture::type::ushort_5_5_5_1, ::gl::texture::format::rgb, ::gl::texture::internal_format::rgb5a1, true,
 		{ ::gl::texture::channel::one, ::gl::texture::channel::r, ::gl::texture::channel::g, ::gl::texture::channel::b } };
 
 	case rsx::surface_color_format::x1r5g5b5_z1r5g5b5:
-		return{ ::gl::texture::type::ushort_5_5_5_1, ::gl::texture::format::rgb, ::gl::texture::internal_format::bgr5a1, true,
+		return{ ::gl::texture::type::ushort_5_5_5_1, ::gl::texture::format::rgb, ::gl::texture::internal_format::rgb5a1, true,
 		{ ::gl::texture::channel::zero, ::gl::texture::channel::r, ::gl::texture::channel::g, ::gl::texture::channel::b } };
 
 	case rsx::surface_color_format::x8r8g8b8_z8r8g8b8:
-		return{ ::gl::texture::type::uint_8_8_8_8_rev, ::gl::texture::format::bgra, ::gl::texture::internal_format::bgra8, true,
+		return{ ::gl::texture::type::uint_8_8_8_8, ::gl::texture::format::bgra, ::gl::texture::internal_format::rgba8, false,
 		{ ::gl::texture::channel::zero, ::gl::texture::channel::r, ::gl::texture::channel::g, ::gl::texture::channel::b } };
 
 	case rsx::surface_color_format::x8b8g8r8_o8b8g8r8:
-		return{ ::gl::texture::type::uint_8_8_8_8_rev, ::gl::texture::format::rgba, ::gl::texture::internal_format::rgba8, true,
-		{ ::gl::texture::channel::one, ::gl::texture::channel::r, ::gl::texture::channel::g, ::gl::texture::channel::b } };
+		return{ ::gl::texture::type::uint_8_8_8_8, ::gl::texture::format::rgba, ::gl::texture::internal_format::rgba8, false,
+		{ ::gl::texture::channel::one, ::gl::texture::channel::b, ::gl::texture::channel::g, ::gl::texture::channel::r } };
 
 	case rsx::surface_color_format::x8b8g8r8_z8b8g8r8:
-		return{ ::gl::texture::type::uint_8_8_8_8_rev, ::gl::texture::format::rgba, ::gl::texture::internal_format::rgba8, true,
-		{ ::gl::texture::channel::zero, ::gl::texture::channel::r, ::gl::texture::channel::g, ::gl::texture::channel::b } };
+		return{ ::gl::texture::type::uint_8_8_8_8, ::gl::texture::format::rgba, ::gl::texture::internal_format::rgba8, false,
+		{ ::gl::texture::channel::zero, ::gl::texture::channel::b, ::gl::texture::channel::g, ::gl::texture::channel::r } };
 
 	case rsx::surface_color_format::x8r8g8b8_o8r8g8b8:
-		return{ ::gl::texture::type::uint_8_8_8_8_rev, ::gl::texture::format::bgra, ::gl::texture::internal_format::bgra8, true,
+		return{ ::gl::texture::type::uint_8_8_8_8, ::gl::texture::format::bgra, ::gl::texture::internal_format::rgba8, false,
 		{ ::gl::texture::channel::one, ::gl::texture::channel::r, ::gl::texture::channel::g, ::gl::texture::channel::b } };
 
 	case rsx::surface_color_format::w16z16y16x16:
@@ -62,7 +61,8 @@ color_format rsx::internals::surface_color_format_to_gl(rsx::surface_color_forma
 		{ ::gl::texture::channel::r, ::gl::texture::channel::r, ::gl::texture::channel::r, ::gl::texture::channel::r } };
 
 	case rsx::surface_color_format::a8b8g8r8:
-		return{ ::gl::texture::type::uint_8_8_8_8_rev, ::gl::texture::format::rgba, ::gl::texture::internal_format::rgba8, true };
+		return{ ::gl::texture::type::uint_8_8_8_8, ::gl::texture::format::rgba, ::gl::texture::internal_format::rgba8, false,
+		{ ::gl::texture::channel::a, ::gl::texture::channel::b, ::gl::texture::channel::g, ::gl::texture::channel::r } };
 
 	default:
 		fmt::throw_exception("Unsupported surface color format 0x%x", static_cast<u32>(color_format));
@@ -104,7 +104,7 @@ u8 rsx::internals::get_pixel_size(rsx::surface_depth_format format)
 void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool /*skip_reading*/)
 {
 	const bool clipped_scissor = (context == rsx::framebuffer_creation_context::context_draw);
-	if (m_current_framebuffer_context == context && !m_graphics_state.test(rsx::rtt_config_dirty) && m_draw_fbo)
+	if (m_current_framebuffer_context == context && !m_rtts_dirty && m_draw_fbo)
 	{
 		// Fast path
 		// Framebuffer usage has not changed, framebuffer exists and config regs have not changed
@@ -112,14 +112,12 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool /*
 		return;
 	}
 
-	m_graphics_state.clear(
-		rsx::rtt_config_dirty |
-		rsx::rtt_config_contested |
-		rsx::rtt_config_valid |
-		rsx::rtt_cache_state_dirty);
+	m_rtts_dirty = false;
+	framebuffer_status_valid = false;
+	m_framebuffer_state_contested = false;
 
 	get_framebuffer_layout(context, m_framebuffer_layout);
-	if (!m_graphics_state.test(rsx::rtt_config_valid))
+	if (!framebuffer_status_valid)
 	{
 		return;
 	}
@@ -153,7 +151,7 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool /*
 	{
 		if (m_surface_info[i].pitch && g_cfg.video.write_color_buffers)
 		{
-			const utils::address_range32 surface_range = m_surface_info[i].get_memory_range();
+			const utils::address_range surface_range = m_surface_info[i].get_memory_range();
 			m_gl_texture_cache.set_memory_read_flags(surface_range, rsx::memory_read_flags::flush_once);
 			m_gl_texture_cache.flush_if_cache_miss_likely(cmd, surface_range);
 		}
@@ -182,7 +180,7 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool /*
 
 	if (m_depth_surface_info.pitch && g_cfg.video.write_depth_buffer)
 	{
-		const utils::address_range32 surface_range = m_depth_surface_info.get_memory_range();
+		const utils::address_range surface_range = m_depth_surface_info.get_memory_range();
 		m_gl_texture_cache.set_memory_read_flags(surface_range, rsx::memory_read_flags::flush_once);
 		m_gl_texture_cache.flush_if_cache_miss_likely(cmd, surface_range);
 	}
@@ -210,7 +208,7 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool /*
 		m_depth_surface_info = {};
 	}
 
-	m_graphics_state.clear(rsx::rtt_config_valid);
+	framebuffer_status_valid = false;
 
 	if (m_draw_fbo)
 	{
@@ -228,12 +226,12 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool /*
 			m_draw_fbo->bind();
 			m_draw_fbo->set_extents({ m_framebuffer_layout.width, m_framebuffer_layout.height });
 
-			m_graphics_state.set(rsx::rtt_config_valid);
+			framebuffer_status_valid = true;
 			break;
 		}
 	}
 
-	if (!m_graphics_state.test(rsx::rtt_config_valid))
+	if (!framebuffer_status_valid)
 	{
 		m_framebuffer_cache.emplace_back();
 		m_framebuffer_cache.back().add_ref();
@@ -294,13 +292,8 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool /*
 		break;
 	}
 
-	if (!m_draw_fbo->check())
-	{
-		m_graphics_state.clear(rsx::rtt_config_valid);
-		return;
-	}
-
-	m_graphics_state.set(rsx::rtt_config_valid);
+	framebuffer_status_valid = m_draw_fbo->check();
+	if (!framebuffer_status_valid) return;
 
 	check_zcull_status(true);
 	set_viewport();
@@ -318,61 +311,6 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool /*
 		m_rtts.superseded_surfaces.clear();
 	}
 
-	if (!m_rtts.orphaned_surfaces.empty())
-	{
-		gl::texture::format format;
-		gl::texture::type type;
-		bool swap_bytes;
-
-		for (auto& [base_addr, surface] : m_rtts.orphaned_surfaces)
-		{
-			bool lock = surface->is_depth_surface() ? !!g_cfg.video.write_depth_buffer :
-				!!g_cfg.video.write_color_buffers;
-
-			if (lock &&
-#ifdef TEXTURE_CACHE_DEBUG
-				!m_gl_texture_cache.is_protected(
-					base_addr,
-					surface->get_memory_range(),
-					rsx::texture_upload_context::framebuffer_storage)
-#else
-				!surface->is_locked()
-#endif
-				)
-			{
-				lock = false;
-			}
-
-			if (!lock) [[likely]]
-			{
-				m_gl_texture_cache.commit_framebuffer_memory_region(cmd, surface->get_memory_range());
-				continue;
-			}
-
-			if (surface->is_depth_surface())
-			{
-				const auto depth_format_gl = rsx::internals::surface_depth_format_to_gl(surface->get_surface_depth_format());
-				format = depth_format_gl.format;
-				type = depth_format_gl.type;
-				swap_bytes = (type != gl::texture::type::uint_24_8);
-			}
-			else
-			{
-				const auto color_format_gl = rsx::internals::surface_color_format_to_gl(surface->get_surface_color_format());
-				format = color_format_gl.format;
-				type = color_format_gl.type;
-				swap_bytes = color_format_gl.swap_bytes;
-			}
-
-			m_gl_texture_cache.lock_memory_region(
-				cmd, surface, surface->get_memory_range(), false,
-				surface->get_surface_width<rsx::surface_metrics::pixels>(), surface->get_surface_height<rsx::surface_metrics::pixels>(), surface->get_rsx_pitch(),
-				format, type, swap_bytes);
-		}
-
-		m_rtts.orphaned_surfaces.clear();
-	}
-
 	const auto color_format = rsx::internals::surface_color_format_to_gl(m_framebuffer_layout.color_format);
 	for (u8 i = 0; i < rsx::limits::color_buffers_count; ++i)
 	{
@@ -410,6 +348,47 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool /*
 		}
 	}
 
+	if (!m_rtts.orphaned_surfaces.empty())
+	{
+		gl::texture::format format;
+		gl::texture::type type;
+		bool swap_bytes;
+
+		for (auto& surface : m_rtts.orphaned_surfaces)
+		{
+			const bool lock = surface->is_depth_surface() ? !!g_cfg.video.write_depth_buffer :
+				!!g_cfg.video.write_color_buffers;
+
+			if (!lock) [[likely]]
+			{
+				m_gl_texture_cache.commit_framebuffer_memory_region(cmd, surface->get_memory_range());
+				continue;
+			}
+
+			if (surface->is_depth_surface())
+			{
+				const auto depth_format_gl = rsx::internals::surface_depth_format_to_gl(surface->get_surface_depth_format());
+				format = depth_format_gl.format;
+				type = depth_format_gl.type;
+				swap_bytes = (type != gl::texture::type::uint_24_8);
+			}
+			else
+			{
+				const auto color_format_gl = rsx::internals::surface_color_format_to_gl(surface->get_surface_color_format());
+				format = color_format_gl.format;
+				type = color_format_gl.type;
+				swap_bytes = color_format_gl.swap_bytes;
+			}
+
+			m_gl_texture_cache.lock_memory_region(
+				cmd, surface, surface->get_memory_range(), false,
+				surface->get_surface_width(rsx::surface_metrics::pixels), surface->get_surface_height(rsx::surface_metrics::pixels), surface->get_rsx_pitch(),
+				format, type, swap_bytes);
+		}
+
+		m_rtts.orphaned_surfaces.clear();
+	}
+
 	if (m_gl_texture_cache.get_ro_tex_invalidate_intr())
 	{
 		// Invalidate cached sampler state
@@ -418,16 +397,15 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool /*
 }
 
 // Render target helpers
-void gl::render_target::clear_memory(gl::command_context& cmd, gl::texture* surface)
+void gl::render_target::clear_memory(gl::command_context& cmd)
 {
-	auto dst = surface ? surface : this;
 	if (aspect() & gl::image_aspect::depth)
 	{
-		gl::g_hw_blitter->fast_clear_image(cmd, dst, 1.f, 255);
+		gl::g_hw_blitter->fast_clear_image(cmd, this, 1.f, 255);
 	}
 	else
 	{
-		gl::g_hw_blitter->fast_clear_image(cmd, dst, {});
+		gl::g_hw_blitter->fast_clear_image(cmd, this, {});
 	}
 
 	state_flags &= ~rsx::surface_state_flags::erase_bkgnd;
@@ -447,30 +425,22 @@ void gl::render_target::load_memory(gl::command_context& cmd)
 	// TODO: MSAA support
 	if (g_cfg.video.resolution_scale_percent == 100 && spp == 1) [[likely]]
 	{
-		gl::upload_texture(cmd, this, get_gcm_format(), is_swizzled, { subres });
+		gl::upload_texture(this, get_gcm_format(), is_swizzled, { subres });
 	}
 	else
 	{
-		auto tmp = std::make_unique<gl::texture>(GL_TEXTURE_2D, subres.width_in_block, subres.height_in_block, 1, 1, 1, static_cast<GLenum>(get_internal_format()), format_class());
-		auto dst = samples() > 1 ? get_resolve_target_safe(cmd) : this;
-		gl::upload_texture(cmd, tmp.get(), get_gcm_format(), is_swizzled, { subres });
+		auto tmp = std::make_unique<gl::texture>(GL_TEXTURE_2D, subres.width_in_block, subres.height_in_block, 1, 1, static_cast<GLenum>(get_internal_format()), format_class());
+		gl::upload_texture(tmp.get(), get_gcm_format(), is_swizzled, { subres });
 
-		gl::g_hw_blitter->scale_image(cmd, tmp.get(), dst,
+		gl::g_hw_blitter->scale_image(cmd, tmp.get(), this,
 			{ 0, 0, subres.width_in_block, subres.height_in_block },
 			{ 0, 0, static_cast<int>(width()), static_cast<int>(height()) },
 			!is_depth_surface(),
 			{});
-
-		if (samples() > 1)
-		{
-			msaa_flags = rsx::surface_state_flags::require_unresolve;
-		}
 	}
-
-	state_flags &= ~rsx::surface_state_flags::erase_bkgnd;
 }
 
-void gl::render_target::initialize_memory(gl::command_context& cmd, rsx::surface_access access)
+void gl::render_target::initialize_memory(gl::command_context& cmd, rsx::surface_access /*access*/)
 {
 	const bool memory_load = is_depth_surface() ?
 		!!g_cfg.video.read_depth_buffer :
@@ -479,14 +449,6 @@ void gl::render_target::initialize_memory(gl::command_context& cmd, rsx::surface
 	if (!memory_load)
 	{
 		clear_memory(cmd);
-
-		if (samples() > 1 && access.is_transfer_or_read())
-		{
-			// Only clear the resolve surface if reading from it, otherwise it's a waste
-			clear_memory(cmd, get_resolve_target_safe(cmd));
-		}
-
-		msaa_flags = rsx::surface_state_flags::ready;
 	}
 	else
 	{
@@ -494,28 +456,8 @@ void gl::render_target::initialize_memory(gl::command_context& cmd, rsx::surface
 	}
 }
 
-gl::viewable_image* gl::render_target::get_surface(rsx::surface_access access_type)
-{
-	if (samples() == 1 || !access_type.is_transfer())
-	{
-		return this;
-	}
-
-	// A read barrier should have been called before this!
-	ensure(resolve_surface, "Read access without explicit barrier");
-	ensure(!(msaa_flags & rsx::surface_state_flags::require_resolve));
-	return static_cast<gl::viewable_image*>(resolve_surface.get());
-}
-
 void gl::render_target::memory_barrier(gl::command_context& cmd, rsx::surface_access access)
 {
-	if (access == rsx::surface_access::gpu_reference)
-	{
-		// In OpenGL, resources are always assumed to be visible to the GPU.
-		// We don't manage memory spilling, so just return.
-		return;
-	}
-
 	const bool read_access = access.is_read();
 	const bool is_depth = is_depth_surface();
 	const bool should_read_buffers = is_depth ? !!g_cfg.video.read_depth_buffer : !!g_cfg.video.read_color_buffers;
@@ -542,33 +484,12 @@ void gl::render_target::memory_barrier(gl::command_context& cmd, rsx::surface_ac
 			on_write();
 		}
 
-		if (msaa_flags & rsx::surface_state_flags::require_resolve)
-		{
-			if (access.is_transfer())
-			{
-				// Only do this step when read access is required
-				get_resolve_target_safe(cmd);
-				resolve(cmd);
-			}
-		}
-		else if (msaa_flags & rsx::surface_state_flags::require_unresolve)
-		{
-			if (access == rsx::surface_access::shader_write)
-			{
-				// Only do this step when it is needed to start rendering
-				ensure(resolve_surface);
-				unresolve(cmd);
-			}
-		}
-
 		return;
 	}
 
-	auto dst_img = (samples() > 1) ? get_resolve_target_safe(cmd) : this;
 	const bool dst_is_depth = !!(aspect() & gl::image_aspect::depth);
 	const auto dst_bpp = get_bpp();
 	unsigned first = prepare_rw_barrier_for_transfer(this);
-	bool optimize_copy = true;
 	u64 newest_tag = 0;
 
 	for (auto i = first; i < old_contents.size(); ++i)
@@ -578,8 +499,6 @@ void gl::render_target::memory_barrier(gl::command_context& cmd, rsx::surface_ac
 		const auto src_bpp = src_texture->get_bpp();
 		rsx::typeless_xfer typeless_info{};
 
-		src_texture->memory_barrier(cmd, rsx::surface_access::transfer_read);
-
 		if (get_internal_format() == src_texture->get_internal_format())
 		{
 			// Copy data from old contents onto this one
@@ -588,7 +507,8 @@ void gl::render_target::memory_barrier(gl::command_context& cmd, rsx::surface_ac
 		else
 		{
 			// Mem cast, generate typeless xfer info
-			if (!formats_are_bitcast_compatible(this, src_texture))
+			if (!formats_are_bitcast_compatible(static_cast<GLenum>(get_internal_format()), static_cast<GLenum>(src_texture->get_internal_format())) ||
+				aspect() != src_texture->aspect())
 			{
 				typeless_info.src_is_typeless = true;
 				typeless_info.src_context = rsx::texture_upload_context::framebuffer_storage;
@@ -599,106 +519,29 @@ void gl::render_target::memory_barrier(gl::command_context& cmd, rsx::surface_ac
 		}
 
 		section.init_transfer(this);
-		auto src_area = section.src_rect();
-		auto dst_area = section.dst_rect();
 
-		if (g_cfg.video.antialiasing_level != msaa_level::none)
+		if (state_flags & rsx::surface_state_flags::erase_bkgnd)
 		{
-			src_texture->transform_pixels_to_samples(src_area);
-			this->transform_pixels_to_samples(dst_area);
+			const auto area = section.dst_rect();
+			if (area.x1 > 0 || area.y1 > 0 || unsigned(area.x2) < width() || unsigned(area.y2) < height())
+			{
+				initialize_memory(cmd, access);
+			}
+			else
+			{
+				state_flags &= ~rsx::surface_state_flags::erase_bkgnd;
+			}
 		}
 
-		bool memory_load = true;
-		if (dst_area.x1 == 0 && dst_area.y1 == 0 &&
-			unsigned(dst_area.x2) == dst_img->width() && unsigned(dst_area.y2) == dst_img->height())
-		{
-			// Skip a bunch of useless work
-			state_flags &= ~(rsx::surface_state_flags::erase_bkgnd);
-			msaa_flags = rsx::surface_state_flags::ready;
-
-			memory_load = false;
-			stencil_init_flags = src_texture->stencil_init_flags;
-		}
-		else if (state_flags & rsx::surface_state_flags::erase_bkgnd)
-		{
-			// Might introduce MSAA flags
-			initialize_memory(cmd, rsx::surface_access::memory_write);
-			ensure(state_flags == rsx::surface_state_flags::ready);
-		}
-
-		if (msaa_flags & rsx::surface_state_flags::require_resolve)
-		{
-			// Need to forward resolve this
-			resolve(cmd);
-		}
-
-		if (src_texture->samples() > 1)
-		{
-			// Ensure a readable surface exists for the source
-			src_texture->get_resolve_target_safe(cmd);
-		}
-
-		gl::g_hw_blitter->scale_image(
-			cmd,
-			src_texture->get_surface(rsx::surface_access::transfer_read),
-			this->get_surface(rsx::surface_access::transfer_write),
-			src_area,
-			dst_area,
+		gl::g_hw_blitter->scale_image(cmd, section.source, this,
+			section.src_rect(),
+			section.dst_rect(),
 			!dst_is_depth, typeless_info);
 
-		optimize_copy = optimize_copy && !memory_load;
 		newest_tag = src_texture->last_use_tag;
 	}
 
-	if (!newest_tag) [[unlikely]]
-	{
-		// Underlying memory has been modified and we could not find valid data to fill it
-		clear_rw_barrier();
-
-		state_flags |= rsx::surface_state_flags::erase_bkgnd;
-		initialize_memory(cmd, access);
-		ensure(state_flags == rsx::surface_state_flags::ready);
-	}
-
-	// NOTE: Optimize flag relates to stencil resolve/unresolve for NVIDIA.
-	on_write_copy(newest_tag, optimize_copy);
-
-	if (access == rsx::surface_access::shader_write && samples() > 1)
-	{
-		// Write barrier, must initialize
-		unresolve(cmd);
-	}
-}
-
-// MSAA support
-gl::viewable_image* gl::render_target::get_resolve_target_safe(gl::command_context& /*cmd*/)
-{
-	if (!resolve_surface)
-	{
-		// Create a resolve surface
-		const auto resolve_w = width() * samples_x;
-		const auto resolve_h = height() * samples_y;
-
-		resolve_surface.reset(new gl::viewable_image(
-			GL_TEXTURE_2D,
-			resolve_w, resolve_h,
-			1, 1, 1,
-			static_cast<GLenum>(get_internal_format()),
-			format_class()
-		));
-	}
-
-	return static_cast<gl::viewable_image*>(resolve_surface.get());
-}
-
-void gl::render_target::resolve(gl::command_context& cmd)
-{
-	gl::resolve_image(cmd, get_resolve_target_safe(cmd), this);
-	msaa_flags &= ~(rsx::surface_state_flags::require_resolve);
-}
-
-void gl::render_target::unresolve(gl::command_context& cmd)
-{
-	gl::unresolve_image(cmd, this, get_resolve_target_safe(cmd));
-	msaa_flags &= ~(rsx::surface_state_flags::require_unresolve);
+	// Memory has been transferred, discard old contents and update memory flags
+	// TODO: Preserve memory outside surface clip region
+	on_write(newest_tag);
 }
diff --git a/rpcs3/Emu/RSX/GL/GLRenderTargets.h b/rpcs3/Emu/RSX/GL/GLRenderTargets.h
index 9b01746a87..9130475b95 100644
--- a/rpcs3/Emu/RSX/GL/GLRenderTargets.h
+++ b/rpcs3/Emu/RSX/GL/GLRenderTargets.h
@@ -1,9 +1,8 @@
 #pragma once
 #include "../Common/surface_store.h"
+#include "GLHelpers.h"
 #include "../rsx_utils.h"
 
-#include "glutils/fbo.h"
-
 struct color_swizzle
 {
 	gl::texture::channel a = gl::texture::channel::a;
@@ -46,49 +45,58 @@ namespace rsx
 
 namespace gl
 {
-	class render_target : public viewable_image, public rsx::render_target_descriptor<texture*>
+	class render_target : public viewable_image, public rsx::ref_counted, public rsx::render_target_descriptor<texture*>
 	{
-		void clear_memory(gl::command_context& cmd, gl::texture* surface = nullptr);
+		void clear_memory(gl::command_context& cmd);
 		void load_memory(gl::command_context& cmd);
 		void initialize_memory(gl::command_context& cmd, rsx::surface_access access);
 
-		// MSAA support:
-		// Get the linear resolve target bound to this surface. Initialize if none exists
-		gl::viewable_image* get_resolve_target_safe(gl::command_context& cmd);
-		// Resolve the planar MSAA data into a linear block
-		void resolve(gl::command_context& cmd);
-		// Unresolve the linear data into planar MSAA data
-		void unresolve(gl::command_context& cmd);
-
 	public:
-		render_target(GLuint width, GLuint height, GLubyte samples, GLenum sized_format, rsx::format_class format_class)
-			: viewable_image(GL_TEXTURE_2D, width, height, 1, 1, samples, sized_format, format_class)
+		render_target(GLuint width, GLuint height, GLenum sized_format, rsx::format_class format_class)
+			: viewable_image(GL_TEXTURE_2D, width, height, 1, 1, sized_format, format_class)
 		{}
 
 		// Internal pitch is the actual row length in bytes of the openGL texture
-		void set_native_pitch(u32 pitch)
+		void set_native_pitch(u16 pitch)
 		{
 			native_pitch = pitch;
 		}
 
-		void set_surface_dimensions(u16 w, u16 h, u32 pitch)
+		void set_surface_dimensions(u16 w, u16 h, u16 pitch)
 		{
 			surface_width = w;
 			surface_height = h;
 			rsx_pitch = pitch;
 		}
 
-		void set_rsx_pitch(u32 pitch)
+		void set_rsx_pitch(u16 pitch)
 		{
 			rsx_pitch = pitch;
 		}
 
 		bool is_depth_surface() const override
 		{
-			return !!(aspect() & gl::image_aspect::depth);
+			switch (get_internal_format())
+			{
+			case gl::texture::internal_format::depth16:
+			case gl::texture::internal_format::depth24_stencil8:
+			case gl::texture::internal_format::depth32f_stencil8:
+				return true;
+			default:
+				return false;
+			}
 		}
 
-		viewable_image* get_surface(rsx::surface_access /*access_type*/) override;
+		void release_ref(texture* t) const override
+		{
+			static_cast<gl::render_target*>(t)->release();
+		}
+
+		texture* get_surface(rsx::surface_access /*access_type*/) override
+		{
+			// TODO
+			return static_cast<gl::texture*>(this);
+		}
 
 		u32 raw_handle() const
 		{
@@ -116,19 +124,12 @@ namespace gl
 	{
 		return ensure(dynamic_cast<gl::render_target*>(t));
 	}
-
-	static inline const gl::render_target* as_rtt(const gl::texture* t)
-	{
-		return ensure(dynamic_cast<const gl::render_target*>(t));
-	}
 }
 
 struct gl_render_target_traits
 {
 	using surface_storage_type = std::unique_ptr<gl::render_target>;
 	using surface_type = gl::render_target*;
-	using buffer_object_storage_type = std::unique_ptr<gl::buffer>;
-	using buffer_object_type = gl::buffer*;
 	using command_list_type = gl::command_context&;
 	using download_buffer_object = std::vector<u8>;
 	using barrier_descriptor_t = rsx::deferred_clipped_region<gl::render_target*>;
@@ -144,25 +145,12 @@ struct gl_render_target_traits
 		auto format = rsx::internals::surface_color_format_to_gl(surface_color_format);
 		const auto [width_, height_] = rsx::apply_resolution_scale<true>(static_cast<u16>(width), static_cast<u16>(height));
 
-		u8 samples;
-		rsx::surface_sample_layout sample_layout;
-		if (g_cfg.video.antialiasing_level == msaa_level::_auto)
-		{
-			samples = get_format_sample_count(antialias);
-			sample_layout = rsx::surface_sample_layout::ps3;
-		}
-		else
-		{
-			samples = 1;
-			sample_layout = rsx::surface_sample_layout::null;
-		}
-
-		std::unique_ptr<gl::render_target> result(new gl::render_target(width_, height_, samples,
+		std::unique_ptr<gl::render_target> result(new gl::render_target(width_, height_,
 			static_cast<GLenum>(format.internal_format), RSX_FORMAT_CLASS_COLOR));
 
 		result->set_aa_mode(antialias);
-		result->set_native_pitch(static_cast<u32>(width) * get_format_block_size_in_bytes(surface_color_format) * result->samples_x);
-		result->set_surface_dimensions(static_cast<u16>(width), static_cast<u16>(height), static_cast<u32>(pitch));
+		result->set_native_pitch(static_cast<u16>(width) * get_format_block_size_in_bytes(surface_color_format) * result->samples_x);
+		result->set_surface_dimensions(static_cast<u16>(width), static_cast<u16>(height), static_cast<u16>(pitch));
 		result->set_format(surface_color_format);
 
 		std::array<GLenum, 4> native_layout = { static_cast<GLenum>(format.swizzle.a), static_cast<GLenum>(format.swizzle.r), static_cast<GLenum>(format.swizzle.g), static_cast<GLenum>(format.swizzle.b) };
@@ -170,7 +158,6 @@ struct gl_render_target_traits
 
 		result->memory_usage_flags = rsx::surface_usage_flags::attachment;
 		result->state_flags = rsx::surface_state_flags::erase_bkgnd;
-		result->sample_layout = sample_layout;
 		result->queue_tag(address);
 		result->add_ref();
 		return result;
@@ -187,33 +174,19 @@ struct gl_render_target_traits
 		auto format = rsx::internals::surface_depth_format_to_gl(surface_depth_format);
 		const auto [width_, height_] = rsx::apply_resolution_scale<true>(static_cast<u16>(width), static_cast<u16>(height));
 
-		u8 samples;
-		rsx::surface_sample_layout sample_layout;
-		if (g_cfg.video.antialiasing_level == msaa_level::_auto)
-		{
-			samples = get_format_sample_count(antialias);
-			sample_layout = rsx::surface_sample_layout::ps3;
-		}
-		else
-		{
-			samples = 1;
-			sample_layout = rsx::surface_sample_layout::null;
-		}
-
-		std::unique_ptr<gl::render_target> result(new gl::render_target(width_, height_, samples,
+		std::unique_ptr<gl::render_target> result(new gl::render_target(width_, height_,
 			static_cast<GLenum>(format.internal_format), rsx::classify_format(surface_depth_format)));
 
 		result->set_aa_mode(antialias);
-		result->set_surface_dimensions(static_cast<u16>(width), static_cast<u16>(height), static_cast<u32>(pitch));
+		result->set_surface_dimensions(static_cast<u16>(width), static_cast<u16>(height), static_cast<u16>(pitch));
 		result->set_format(surface_depth_format);
-		result->set_native_pitch(static_cast<u32>(width) * get_format_block_size_in_bytes(surface_depth_format) * result->samples_x);
+		result->set_native_pitch(static_cast<u16>(width) * get_format_block_size_in_bytes(surface_depth_format) * result->samples_x);
 
 		std::array<GLenum, 4> native_layout = { GL_RED, GL_RED, GL_RED, GL_RED };
 		result->set_native_component_layout(native_layout);
 
 		result->memory_usage_flags = rsx::surface_usage_flags::attachment;
 		result->state_flags = rsx::surface_state_flags::erase_bkgnd;
-		result->sample_layout = sample_layout;
 		result->queue_tag(address);
 		result->add_ref();
 		return result;
@@ -229,9 +202,9 @@ struct gl_render_target_traits
 		{
 			auto internal_format = static_cast<GLenum>(ref->get_internal_format());
 			const auto [new_w, new_h] = rsx::apply_resolution_scale<true>(prev.width, prev.height,
-				ref->get_surface_width<rsx::surface_metrics::pixels>(), ref->get_surface_height<rsx::surface_metrics::pixels>());
+				ref->get_surface_width(rsx::surface_metrics::pixels), ref->get_surface_height(rsx::surface_metrics::pixels));
 
-			sink = std::make_unique<gl::render_target>(new_w, new_h, ref->samples(), internal_format, ref->format_class());
+			sink = std::make_unique<gl::render_target>(new_w, new_h, internal_format, ref->format_class());
 			sink->add_ref();
 
 			sink->memory_usage_flags = rsx::surface_usage_flags::storage;
@@ -239,14 +212,14 @@ struct gl_render_target_traits
 			sink->format_info = ref->format_info;
 
 			sink->set_spp(ref->get_spp());
-			sink->set_native_pitch(static_cast<u32>(prev.width) * ref->get_bpp() * ref->samples_x);
+			sink->set_native_pitch(prev.width * ref->get_bpp() * ref->samples_x);
 			sink->set_rsx_pitch(ref->get_rsx_pitch());
 			sink->set_surface_dimensions(prev.width, prev.height, ref->get_rsx_pitch());
 			sink->set_native_component_layout(ref->get_native_component_layout());
 			sink->queue_tag(address);
 		}
 
-		sink->on_clone_from(ref);
+		prev.target = sink.get();
 
 		if (!sink->old_contents.empty())
 		{
@@ -261,19 +234,10 @@ struct gl_render_target_traits
 			}
 		}
 
-		prev.target = sink.get();
+		sink->set_rsx_pitch(ref->get_rsx_pitch());
 		sink->set_old_contents_region(prev, false);
-	}
-
-	static
-	std::unique_ptr<gl::render_target> convert_pitch(
-		gl::command_context& /*cmd*/,
-		std::unique_ptr<gl::render_target>& src,
-		usz /*out_pitch*/)
-	{
-		// TODO
-		src->state_flags = rsx::surface_state_flags::erase_bkgnd;
-		return {};
+		sink->last_use_tag = ref->last_use_tag;
+		sink->raster_type = ref->raster_type;     // Can't actually cut up swizzled data
 	}
 
 	static
@@ -281,14 +245,13 @@ struct gl_render_target_traits
 	{
 		return (surface->get_internal_format() == ref->get_internal_format() &&
 				surface->get_spp() == sample_count &&
-				surface->get_surface_width<rsx::surface_metrics::pixels>() == width &&
-				surface->get_surface_height<rsx::surface_metrics::pixels>() == height);
+				surface->get_surface_width(rsx::surface_metrics::pixels) >= width &&
+				surface->get_surface_height(rsx::surface_metrics::pixels) >= height);
 	}
 
 	static
-	void prepare_surface_for_drawing(gl::command_context& cmd, gl::render_target* surface)
+	void prepare_surface_for_drawing(gl::command_context&, gl::render_target* surface)
 	{
-		surface->memory_barrier(cmd, rsx::surface_access::gpu_reference);
 		surface->memory_usage_flags |= rsx::surface_usage_flags::attachment;
 	}
 
@@ -303,9 +266,9 @@ struct gl_render_target_traits
 	}
 
 	static
-	void int_invalidate_surface_contents(gl::command_context&, gl::render_target *surface, u32 address, usz pitch)
+	void invalidate_surface_contents(gl::command_context&, gl::render_target *surface, u32 address, usz pitch)
 	{
-		surface->set_rsx_pitch(static_cast<u32>(pitch));
+		surface->set_rsx_pitch(static_cast<u16>(pitch));
 		surface->queue_tag(address);
 		surface->last_use_tag = 0;
 		surface->stencil_init_flags = 0;
@@ -313,34 +276,6 @@ struct gl_render_target_traits
 		surface->raster_type = rsx::surface_raster_type::linear;
 	}
 
-	static
-	void invalidate_surface_contents(
-		gl::command_context& cmd,
-		gl::render_target* surface,
-		rsx::surface_color_format format,
-		u32 address,
-		usz pitch)
-	{
-		auto fmt = rsx::internals::surface_color_format_to_gl(format);
-		std::array<GLenum, 4> native_layout = { static_cast<GLenum>(fmt.swizzle.a), static_cast<GLenum>(fmt.swizzle.r), static_cast<GLenum>(fmt.swizzle.g), static_cast<GLenum>(fmt.swizzle.b) };
-		surface->set_native_component_layout(native_layout);
-		surface->set_format(format);
-
-		int_invalidate_surface_contents(cmd, surface, address, pitch);
-	}
-
-	static
-	void invalidate_surface_contents(
-		gl::command_context& cmd,
-		gl::render_target* surface,
-		rsx::surface_depth_format2 format,
-		u32 address,
-		usz pitch)
-	{
-		surface->set_format(format);
-		int_invalidate_surface_contents(cmd, surface, address, pitch);
-	}
-
 	static
 	void notify_surface_invalidated(const std::unique_ptr<gl::render_target>& surface)
 	{
@@ -405,38 +340,7 @@ struct gl_render_target_traits
 	}
 
 	static
-	void spill_buffer(std::unique_ptr<gl::buffer>& /*bo*/)
-	{
-		// TODO
-	}
-
-	static
-	void unspill_buffer(std::unique_ptr<gl::buffer>& /*bo*/)
-	{
-		// TODO
-	}
-
-	static
-	void write_render_target_to_memory(
-		gl::command_context&,
-		gl::buffer*,
-		gl::render_target*,
-		u64, u64, u64)
-	{
-		// TODO
-	}
-
-	template <int BlockSize>
-	static
-	gl::buffer* merge_bo_list(gl::command_context&, const std::vector<gl::buffer*>& /*list*/)
-	{
-		// TODO
-		return nullptr;
-	}
-
-	template <typename T>
-	static
-	T* get(const std::unique_ptr<T> &in)
+	gl::render_target* get(const std::unique_ptr<gl::render_target> &in)
 	{
 		return in.get();
 	}
@@ -450,9 +354,13 @@ struct gl_render_targets : public rsx::surface_store<gl_render_target_traits>
 		invalidated_resources.clear();
 	}
 
-	std::vector<GLuint> trim(gl::command_context& cmd)
+	std::vector<GLuint> free_invalidated(gl::command_context& cmd)
 	{
-		run_cleanup_internal(cmd, rsx::problem_severity::moderate, 256, [](gl::command_context&) {});
+		// Do not allow more than 256M of RSX memory to be used by RTTs
+		if (check_memory_usage(256 * 0x100000))
+		{
+			handle_memory_pressure(cmd, rsx::problem_severity::moderate);
+		}
 
 		std::vector<GLuint> removed;
 		invalidated_resources.remove_if([&](auto &rtt)
diff --git a/rpcs3/Emu/RSX/GL/GLResolveHelper.cpp b/rpcs3/Emu/RSX/GL/GLResolveHelper.cpp
deleted file mode 100644
index 52cdc39c77..0000000000
--- a/rpcs3/Emu/RSX/GL/GLResolveHelper.cpp
+++ /dev/null
@@ -1,391 +0,0 @@
-#include "stdafx.h"
-#include "GLResolveHelper.h"
-#include "GLTexture.h"
-
-#include <unordered_map>
-#include <stack>
-
-namespace gl
-{
-	std::unordered_map<texture::internal_format, std::unique_ptr<cs_resolve_task>> g_resolve_helpers;
-	std::unordered_map<texture::internal_format, std::unique_ptr<cs_unresolve_task>> g_unresolve_helpers;
-	std::unordered_map<GLuint, std::unique_ptr<ds_resolve_pass_base>> g_depth_resolvers;
-	std::unordered_map<GLuint, std::unique_ptr<ds_resolve_pass_base>> g_depth_unresolvers;
-
-	void clear_resolve_helpers()
-	{
-		g_resolve_helpers.clear();
-		g_unresolve_helpers.clear();
-		g_depth_resolvers.clear();
-		g_depth_unresolvers.clear();
-	}
-
-	static const char* get_format_string(gl::texture::internal_format format)
-	{
-		switch (format)
-		{
-		case texture::internal_format::rgb565:
-			return "r16";
-		case texture::internal_format::rgba8:
-		case texture::internal_format::bgra8:
-			return "rgba8";
-		case texture::internal_format::rgba16f:
-			return "rgba16f";
-		case texture::internal_format::rgba32f:
-			return "rgba32f";
-		case texture::internal_format::bgr5a1:
-			return "r16";
-		case texture::internal_format::r8:
-			return "r8";
-		case texture::internal_format::rg8:
-			return "rg8";
-		case texture::internal_format::r32f:
-			return "r32f";
-		default:
-			fmt::throw_exception("Unhandled internal format 0x%x", u32(format));
-		}
-	}
-
-	void resolve_image(gl::command_context& cmd, gl::viewable_image* dst, gl::viewable_image* src)
-	{
-		ensure(src->samples() > 1 && dst->samples() == 1);
-
-		if (src->aspect() == gl::image_aspect::color) [[ likely ]]
-		{
-			auto& job = g_resolve_helpers[src->get_internal_format()];
-			if (!job)
-			{
-				const auto fmt = get_format_string(src->get_internal_format());
-				job.reset(new cs_resolve_task(fmt));
-			}
-
-			job->run(cmd, src, dst);
-			return;
-		}
-
-		auto get_resolver_pass = [](GLuint aspect_bits) -> std::unique_ptr<ds_resolve_pass_base>&
-		{
-			auto& pass = g_depth_resolvers[aspect_bits];
-			if (!pass)
-			{
-				ds_resolve_pass_base* ptr = nullptr;
-				switch (aspect_bits)
-				{
-				case gl::image_aspect::depth:
-					ptr = new depth_only_resolver();
-					break;
-				case gl::image_aspect::stencil:
-					ptr = new stencil_only_resolver();
-					break;
-				case (gl::image_aspect::depth | gl::image_aspect::stencil):
-					ptr = new depth_stencil_resolver();
-					break;
-				default:
-					fmt::throw_exception("Unreachable");
-				}
-
-				pass.reset(ptr);
-			}
-
-			return pass;
-		};
-
-		if (src->aspect() == (gl::image_aspect::depth | gl::image_aspect::stencil) &&
-			!gl::get_driver_caps().ARB_shader_stencil_export_supported)
-		{
-			// Special case, NVIDIA-only fallback
-			auto& depth_pass = get_resolver_pass(gl::image_aspect::depth);
-			depth_pass->run(cmd, src, dst);
-
-			auto& stencil_pass = get_resolver_pass(gl::image_aspect::stencil);
-			stencil_pass->run(cmd, src, dst);
-			return;
-		}
-
-		auto& pass = get_resolver_pass(src->aspect());
-		pass->run(cmd, src, dst);
-	}
-
-	void unresolve_image(gl::command_context& cmd, gl::viewable_image* dst, gl::viewable_image* src)
-	{
-		ensure(dst->samples() > 1 && src->samples() == 1);
-
-		if (src->aspect() == gl::image_aspect::color) [[ likely ]]
-		{
-			auto& job = g_unresolve_helpers[src->get_internal_format()];
-			if (!job)
-			{
-				const auto fmt = get_format_string(src->get_internal_format());
-				job.reset(new cs_unresolve_task(fmt));
-			}
-
-			job->run(cmd, dst, src);
-			return;
-		}
-
-		auto get_unresolver_pass = [](GLuint aspect_bits) -> std::unique_ptr<ds_resolve_pass_base>&
-		{
-			auto& pass = g_depth_unresolvers[aspect_bits];
-			if (!pass)
-			{
-				ds_resolve_pass_base* ptr = nullptr;
-				switch (aspect_bits)
-				{
-				case gl::image_aspect::depth:
-					ptr = new depth_only_unresolver();
-					break;
-				case gl::image_aspect::stencil:
-					ptr = new stencil_only_unresolver();
-					break;
-				case (gl::image_aspect::depth | gl::image_aspect::stencil):
-					ptr = new depth_stencil_unresolver();
-					break;
-				default:
-					fmt::throw_exception("Unreachable");
-				}
-
-				pass.reset(ptr);
-			}
-
-			return pass;
-		};
-
-		if (src->aspect() == (gl::image_aspect::depth | gl::image_aspect::stencil) &&
-			!gl::get_driver_caps().ARB_shader_stencil_export_supported)
-		{
-			// Special case, NVIDIA-only fallback
-			auto& depth_pass = get_unresolver_pass(gl::image_aspect::depth);
-			depth_pass->run(cmd, dst, src);
-
-			auto& stencil_pass = get_unresolver_pass(gl::image_aspect::stencil);
-			stencil_pass->run(cmd, dst, src);
-			return;
-		}
-
-		auto& pass = get_unresolver_pass(src->aspect());
-		pass->run(cmd, dst, src);
-	}
-
-	// Implementation
-
-	void cs_resolve_base::build(const std::string& format_prefix, bool unresolve)
-	{
-		is_unresolve = unresolve;
-
-		switch (optimal_group_size)
-		{
-		default:
-		case 64:
-			cs_wave_x = 8;
-			cs_wave_y = 8;
-			break;
-		case 32:
-			cs_wave_x = 8;
-			cs_wave_y = 4;
-			break;
-		}
-
-		static const char* resolve_kernel =
-			#include "Emu/RSX/Program/MSAA/ColorResolvePass.glsl"
-			;
-
-		static const char* unresolve_kernel =
-			#include "Emu/RSX/Program/MSAA/ColorUnresolvePass.glsl"
-			;
-
-		const std::pair<std::string_view, std::string> syntax_replace[] =
-		{
-			{ "%WORKGROUP_SIZE_X", std::to_string(cs_wave_x) },
-			{ "%WORKGROUP_SIZE_Y", std::to_string(cs_wave_y) },
-			{ "%IMAGE_FORMAT", format_prefix },
-			{ "%BGRA_SWAP", "0" }
-		};
-
-		m_src = unresolve ? unresolve_kernel : resolve_kernel;
-		m_src = fmt::replace_all(m_src, syntax_replace);
-
-		rsx_log.notice("Resolve shader:\n%s", m_src);
-
-		create();
-	}
-
-	void cs_resolve_base::bind_resources()
-	{
-		auto msaa_view = multisampled->get_view(rsx::default_remap_vector.with_encoding(GL_REMAP_VIEW_MULTISAMPLED));
-		auto resolved_view = resolve->get_view(rsx::default_remap_vector.with_encoding(GL_REMAP_IDENTITY));
-
-		glBindImageTexture(GL_COMPUTE_IMAGE_SLOT(0), msaa_view->id(), 0, GL_FALSE, 0, is_unresolve ? GL_WRITE_ONLY : GL_READ_ONLY, msaa_view->view_format());
-		glBindImageTexture(GL_COMPUTE_IMAGE_SLOT(1), resolved_view->id(), 0, GL_FALSE, 0, is_unresolve ? GL_READ_ONLY : GL_WRITE_ONLY, resolved_view->view_format());
-	}
-
-	void cs_resolve_base::run(gl::command_context& cmd, gl::viewable_image* msaa_image, gl::viewable_image* resolve_image)
-	{
-		ensure(msaa_image->samples() > 1);
-		ensure(resolve_image->samples() == 1);
-
-		multisampled = msaa_image;
-		resolve = resolve_image;
-
-		const u32 invocations_x = utils::align(resolve_image->width(), cs_wave_x) / cs_wave_x;
-		const u32 invocations_y = utils::align(resolve_image->height(), cs_wave_y) / cs_wave_y;
-
-		compute_task::run(cmd, invocations_x, invocations_y);
-	}
-
-	void ds_resolve_pass_base::build(bool depth, bool stencil, bool unresolve)
-	{
-		m_config.resolve_depth = depth;
-		m_config.resolve_stencil = stencil;
-		m_config.is_unresolve = unresolve;
-
-		vs_src =
-#include "Emu/RSX/Program/GLSLSnippets/GenericVSPassthrough.glsl"
-			;
-
-		static const char* depth_resolver =
-#include "Emu/RSX/Program/MSAA/DepthResolvePass.glsl"
-			;
-
-		static const char* depth_unresolver =
-#include "Emu/RSX/Program/MSAA/DepthUnresolvePass.glsl"
-			;
-
-		static const char* stencil_resolver =
-#include "Emu/RSX/Program/MSAA/StencilResolvePass.glsl"
-			;
-
-		static const char* stencil_unresolver =
-#include "Emu/RSX/Program/MSAA/StencilUnresolvePass.glsl"
-			;
-
-		static const char* depth_stencil_resolver =
-#include "Emu/RSX/Program/MSAA/DepthStencilResolvePass.glsl"
-			;
-
-		static const char* depth_stencil_unresolver =
-#include "Emu/RSX/Program/MSAA/DepthStencilUnresolvePass.glsl"
-			;
-
-		if (m_config.resolve_depth && m_config.resolve_stencil)
-		{
-			fs_src = m_config.is_unresolve ? depth_stencil_unresolver : depth_stencil_resolver;
-			m_write_aspect_mask = gl::image_aspect::depth | gl::image_aspect::stencil;
-		}
-		else if (m_config.resolve_depth)
-		{
-			fs_src = m_config.is_unresolve ? depth_unresolver : depth_resolver;
-			m_write_aspect_mask = gl::image_aspect::depth;
-		}
-		else if (m_config.resolve_stencil)
-		{
-			fs_src = m_config.is_unresolve ? stencil_unresolver : stencil_resolver;
-			m_write_aspect_mask = gl::image_aspect::stencil;
-		}
-
-		enable_depth_writes = m_config.resolve_depth;
-		enable_stencil_writes = m_config.resolve_stencil;
-
-
-		create();
-
-		rsx_log.notice("Resolve shader:\n%s", fs_src);
-	}
-
-	void ds_resolve_pass_base::update_config()
-	{
-		ensure(multisampled && multisampled->samples() > 1);
-		switch (multisampled->samples())
-		{
-		case 2:
-			m_config.sample_count.x = 2;
-			m_config.sample_count.y = 1;
-			break;
-		case 4:
-			m_config.sample_count.x = m_config.sample_count.y = 2;
-			break;
-		default:
-			fmt::throw_exception("Unsupported sample count %d", multisampled->samples());
-		}
-
-		program_handle.uniforms["sample_count"] = m_config.sample_count;
-	}
-
-	void ds_resolve_pass_base::run(gl::command_context& cmd, gl::viewable_image* msaa_image, gl::viewable_image* resolve_image)
-	{
-		multisampled = msaa_image;
-		resolve = resolve_image;
-		update_config();
-
-		const auto read_resource = m_config.is_unresolve ? resolve_image : msaa_image;
-		const auto write_resource = m_config.is_unresolve ? msaa_image : resolve_image;
-
-		// Resource binding
-		std::stack<int> bind_slots;
-		std::vector<std::unique_ptr<saved_sampler_state>> saved_sampler_states;
-		auto allocate_slot = [&]() -> int
-		{
-			ensure(!bind_slots.empty());
-			const int slot = bind_slots.top();
-			bind_slots.pop();
-			saved_sampler_states.emplace_back(std::make_unique<gl::saved_sampler_state>(slot, m_sampler));
-			return slot;
-		};
-
-		// Reserve 2 slots max
-		bind_slots.push(GL_TEMP_IMAGE_SLOT(1));
-		bind_slots.push(GL_TEMP_IMAGE_SLOT(0));
-
-		if (m_config.resolve_depth)
-		{
-			const int bind_slot = allocate_slot();
-			cmd->bind_texture(bind_slot, static_cast<GLenum>(read_resource->get_target()), read_resource->id(), GL_TRUE);
-		}
-
-		if (m_config.resolve_stencil)
-		{
-			const int bind_slot = allocate_slot();
-			auto stencil_view = read_resource->get_view(rsx::default_remap_vector.with_encoding(gl::GL_REMAP_IDENTITY), gl::image_aspect::stencil);
-			cmd->bind_texture(bind_slot, static_cast<GLenum>(read_resource->get_target()), stencil_view->id(), GL_TRUE);
-		}
-
-		areau viewport{};
-		viewport.x2 = write_resource->width();
-		viewport.y2 = write_resource->height();
-		overlay_pass::run(cmd, viewport, write_resource->id(), m_write_aspect_mask, false);
-	}
-
-	void stencil_only_resolver_base::emit_geometry(gl::command_context& cmd)
-	{
-		// Modified version of the base overlay pass to emit 8 draws instead of 1
-		int old_vao;
-		glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &old_vao);
-		m_vao.bind();
-
-		// Clear the target
-		gl::clear_cmd_info clear_info
-		{
-			.aspect_mask = gl::image_aspect::stencil,
-			.clear_stencil = {
-				.mask = 0xFF,
-				.value = 0
-			}
-		};
-		gl::clear_attachments(cmd, clear_info);
-
-		// Override stencil settings. Always pass, reference is all one, compare mask doesn't matter.
-		// For each pass the write mask will be overriden to commit output bitwise
-		cmd->stencil_func(GL_ALWAYS, 0xFF, 0xFF);
-		cmd->stencil_op(GL_REPLACE, GL_REPLACE, GL_REPLACE);
-
-		// Start our inner loop
-		for (s32 write_mask = 0x1; write_mask <= 0x80; write_mask <<= 1)
-		{
-			program_handle.uniforms["stencil_mask"] = write_mask;
-			cmd->stencil_mask(write_mask);
-
-			glDrawArrays(primitives, 0, num_drawable_elements);
-		}
-
-		glBindVertexArray(old_vao);
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/GLResolveHelper.h b/rpcs3/Emu/RSX/GL/GLResolveHelper.h
deleted file mode 100644
index 8799efbf25..0000000000
--- a/rpcs3/Emu/RSX/GL/GLResolveHelper.h
+++ /dev/null
@@ -1,129 +0,0 @@
-#pragma once
-
-#include "GLCompute.h"
-#include "GLOverlays.h"
-
-namespace gl
-{
-	void resolve_image(gl::command_context& cmd, gl::viewable_image* dst, gl::viewable_image* src);
-	void unresolve_image(gl::command_context& cmd, gl::viewable_image* dst, gl::viewable_image* src);
-	void clear_resolve_helpers();
-
-	struct cs_resolve_base : compute_task
-	{
-		gl::viewable_image* multisampled = nullptr;
-		gl::viewable_image* resolve = nullptr;
-		bool is_unresolve = false;
-
-		u32 cs_wave_x = 1;
-		u32 cs_wave_y = 1;
-
-		cs_resolve_base()
-		{}
-
-		virtual ~cs_resolve_base()
-		{}
-
-		void build(const std::string& format_prefix, bool unresolve);
-
-		void bind_resources() override;
-
-		void run(gl::command_context& cmd, gl::viewable_image* msaa_image, gl::viewable_image* resolve_image);
-	};
-
-	struct cs_resolve_task : cs_resolve_base
-	{
-		cs_resolve_task(const std::string& format_prefix)
-		{
-			build(format_prefix, false);
-		}
-	};
-
-	struct cs_unresolve_task : cs_resolve_base
-	{
-		cs_unresolve_task(const std::string& format_prefix)
-		{
-			build(format_prefix, true);
-		}
-	};
-
-	struct ds_resolve_pass_base : overlay_pass
-	{
-		gl::viewable_image* multisampled = nullptr;
-		gl::viewable_image* resolve = nullptr;
-
-		struct
-		{
-			bool resolve_depth = false;
-			bool resolve_stencil = false;
-			bool is_unresolve = false;
-			color2i sample_count;
-		} m_config;
-
-		void build(bool depth, bool stencil, bool unresolve);
-
-		void update_config();
-
-		void run(gl::command_context& cmd, gl::viewable_image* msaa_image, gl::viewable_image* resolve_image);
-	};
-
-	struct depth_only_resolver : ds_resolve_pass_base
-	{
-		depth_only_resolver()
-		{
-			build(true, false, false);
-		}
-	};
-
-	struct depth_only_unresolver : ds_resolve_pass_base
-	{
-		depth_only_unresolver()
-		{
-			build(true, false, true);
-		}
-	};
-
-	struct stencil_only_resolver_base : ds_resolve_pass_base
-	{
-		virtual ~stencil_only_resolver_base() = default;
-
-		void build(bool is_unresolver)
-		{
-			ds_resolve_pass_base::build(false, true, is_unresolver);
-		}
-
-		void emit_geometry(gl::command_context& cmd) override;
-	};
-
-	struct stencil_only_resolver : stencil_only_resolver_base
-	{
-		stencil_only_resolver()
-		{
-			build(false);
-		}
-	};
-
-	struct stencil_only_unresolver : stencil_only_resolver_base
-	{
-		stencil_only_unresolver()
-		{
-			build(true);
-		}
-	};
-
-	struct depth_stencil_resolver : ds_resolve_pass_base
-	{
-		depth_stencil_resolver()
-		{
-			build(true, true, false);
-		}
-	};
-
-	struct depth_stencil_unresolver : ds_resolve_pass_base
-	{
-		depth_stencil_unresolver()
-		{
-			build(true, true, true);
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp
index 406ece755c..422455071b 100644
--- a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp
+++ b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "GLShaderInterpreter.h"
-#include "GLTextureCache.h"
+#include "GLGSRender.h"
 #include "GLVertexProgram.h"
 #include "GLFragmentProgram.h"
 #include "../rsx_methods.h"
@@ -20,7 +20,6 @@ namespace gl
 			{
 			default:
 				rsx_log.fatal("Unexpected program domain %d", static_cast<int>(domain));
-				[[fallthrough]];
 			case ::glsl::program_domain::glsl_vertex_program:
 				pname = GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS; break;
 			case ::glsl::program_domain::glsl_fragment_program:
@@ -46,6 +45,7 @@ namespace gl
 
 	void shader_interpreter::create()
 	{
+		build_vs();
 		build_program(::program_common::interpreter::COMPILER_OPT_ENABLE_TEXTURES);
 		build_program(::program_common::interpreter::COMPILER_OPT_ENABLE_TEXTURES | ::program_common::interpreter::COMPILER_OPT_ENABLE_F32_EXPORT);
 	}
@@ -54,13 +54,14 @@ namespace gl
 	{
 		for (auto& prog : m_program_cache)
 		{
-			prog.second->vertex_shader.remove();
-			prog.second->fragment_shader.remove();
+			prog.second->fs.remove();
 			prog.second->prog.remove();
 		}
+
+		m_vs.remove();
 	}
 
-	glsl::program* shader_interpreter::get(const interpreter::program_metadata& metadata, u32 vp_ctrl, u32 fp_ctrl)
+	glsl::program* shader_interpreter::get(const interpreter::program_metadata& metadata)
 	{
 		// Build options
 		u64 opt = 0;
@@ -93,14 +94,13 @@ namespace gl
 			}
 		}
 
-		if (fp_ctrl & CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_DEPTH_EXPORT;
-		if (fp_ctrl & CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_F32_EXPORT;
-		if (fp_ctrl & RSX_SHADER_CONTROL_USES_KIL) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_KIL;
+		if (rsx::method_registers.shader_control() & CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_DEPTH_EXPORT;
+		if (rsx::method_registers.shader_control() & CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_F32_EXPORT;
+		if (rsx::method_registers.shader_control() & RSX_SHADER_CONTROL_USES_KIL) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_KIL;
 		if (metadata.referenced_textures_mask) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_TEXTURES;
 		if (metadata.has_branch_instructions) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_FLOW_CTRL;
 		if (metadata.has_pack_instructions) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_PACKING;
 		if (rsx::method_registers.polygon_stipple_enabled()) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_STIPPLING;
-		if (vp_ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_INSTANCING;
 
 		if (auto it = m_program_cache.find(opt); it != m_program_cache.end()) [[likely]]
 		{
@@ -114,7 +114,7 @@ namespace gl
 		return &m_current_interpreter->prog;
 	}
 
-	void shader_interpreter::build_vs(u64 compiler_options, interpreter::cached_program& prog_data)
+	void shader_interpreter::build_vs()
 	{
 		::glsl::shader_properties properties{};
 		properties.domain = ::glsl::program_domain::glsl_vertex_program;
@@ -125,46 +125,26 @@ namespace gl
 		RSXVertexProgram null_prog;
 		std::string shader_str;
 		ParamArray arr;
-
-		null_prog.ctrl = (compiler_options & program_common::interpreter::COMPILER_OPT_ENABLE_INSTANCING)
-			? RSX_SHADER_CONTROL_INSTANCED_CONSTANTS
-			: 0;
 		GLVertexDecompilerThread comp(null_prog, shader_str, arr);
 
-		// Initialize compiler properties
-		comp.properties.has_indexed_constants = true;
-
-		ParamType uniforms = { PF_PARAM_UNIFORM, "vec4" };
-		uniforms.items.emplace_back("vc[468]", -1);
-
 		std::stringstream builder;
 		comp.insertHeader(builder);
 
 		builder << "#define Z_NEGATIVE_ONE_TO_ONE\n\n";
 
-		comp.insertConstants(builder, { uniforms });
+		comp.insertConstants(builder, {});
 		comp.insertInputs(builder, {});
 
 		// Insert vp stream input
 		builder << "\n"
-			"layout(std140, binding = " << GL_INTERPRETER_VERTEX_BLOCK << ") readonly restrict buffer VertexInstructionBlock\n"
-			"{\n"
-			"	uint base_address;\n"
-			"	uint entry;\n"
-			"	uint output_mask;\n"
-			"	uint control;\n"
-			"	uvec4 vp_instructions[];\n"
-			"};\n\n";
-
-		if (compiler_options & program_common::interpreter::COMPILER_OPT_ENABLE_INSTANCING)
-		{
-			builder << "#define _ENABLE_INSTANCED_CONSTANTS\n";
-		}
-
-		if (compiler_options)
-		{
-			builder << "\n";
-		}
+		"layout(std140, binding = " << GL_INTERPRETER_VERTEX_BLOCK << ") readonly restrict buffer VertexInstructionBlock\n"
+		"{\n"
+		"	uint base_address;\n"
+		"	uint entry;\n"
+		"	uint output_mask;\n"
+		"	uint control;\n"
+		"	uvec4 vp_instructions[];\n"
+		"};\n\n";
 
 		::glsl::insert_glsl_legacy_function(builder, properties);
 		::glsl::insert_vertex_input_fetch(builder, ::glsl::glsl_rules::glsl_rules_opengl4);
@@ -172,8 +152,8 @@ namespace gl
 		builder << program_common::interpreter::get_vertex_interpreter();
 		const std::string s = builder.str();
 
-		prog_data.vertex_shader.create(::glsl::program_domain::glsl_vertex_program, s);
-		prog_data.vertex_shader.compile();
+		m_vs.create(::glsl::program_domain::glsl_vertex_program, s);
+		m_vs.compile();
 	}
 
 	void shader_interpreter::build_fs(u64 compiler_options, interpreter::cached_program& prog_data)
@@ -311,32 +291,31 @@ namespace gl
 		}
 
 		builder <<
-			"layout(std430, binding =" << GL_INTERPRETER_FRAGMENT_BLOCK << ") readonly restrict buffer FragmentInstructionBlock\n"
-			"{\n"
-			"	uint shader_control;\n"
-			"	uint texture_control;\n"
-			"	uint reserved1;\n"
-			"	uint reserved2;\n"
-			"	uint texture_handles[16];\n"
-			"	uvec4 fp_instructions[];\n"
-			"};\n\n";
+		"layout(std430, binding =" << GL_INTERPRETER_FRAGMENT_BLOCK << ") readonly restrict buffer FragmentInstructionBlock\n"
+		"{\n"
+		"	uint shader_control;\n"
+		"	uint texture_control;\n"
+		"	uint reserved1;\n"
+		"	uint reserved2;\n"
+		"	uint texture_handles[16];\n"
+		"	uvec4 fp_instructions[];\n"
+		"};\n\n";
 
 		builder << program_common::interpreter::get_fragment_interpreter();
 		const std::string s = builder.str();
 
-		prog_data.fragment_shader.create(::glsl::program_domain::glsl_fragment_program, s);
-		prog_data.fragment_shader.compile();
+		prog_data.fs.create(::glsl::program_domain::glsl_fragment_program, s);
+		prog_data.fs.compile();
 	}
 
 	interpreter::cached_program* shader_interpreter::build_program(u64 compiler_options)
 	{
 		auto data = new interpreter::cached_program();
 		build_fs(compiler_options, *data);
-		build_vs(compiler_options, *data);
 
 		data->prog.create().
-			attach(data->vertex_shader).
-			attach(data->fragment_shader).
+			attach(m_vs).
+			attach(data->fs).
 			link();
 
 		data->prog.uniforms[0] = GL_STREAM_BUFFER_START + 0;
@@ -364,7 +343,7 @@ namespace gl
 		return data;
 	}
 
-	bool shader_interpreter::is_interpreter(const glsl::program* program) const
+	bool shader_interpreter::is_interpreter(const glsl::program* program)
 	{
 		return (program == &m_current_interpreter->prog);
 	}
diff --git a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h
index 62075dbb4b..6603488601 100644
--- a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h
+++ b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "glutils/program.h"
+#include "GLHelpers.h"
 #include "../Program/ProgramStateCache.h"
 #include "../Common/TextureUtils.h"
 
@@ -59,8 +59,7 @@ namespace gl
 
 		struct cached_program
 		{
-			glsl::shader vertex_shader;
-			glsl::shader fragment_shader;
+			glsl::shader fs;
 			glsl::program prog;
 			texture_pool_allocator allocator;
 		};
@@ -68,10 +67,10 @@ namespace gl
 
 	class shader_interpreter
 	{
-		using shader_cache_t = std::unordered_map<u64, std::unique_ptr<interpreter::cached_program>>;
-		shader_cache_t m_program_cache;
+		glsl::shader m_vs;
+		std::unordered_map<u64, std::unique_ptr<interpreter::cached_program>> m_program_cache;
 
-		void build_vs(u64 compiler_options, interpreter::cached_program& prog_data);
+		void build_vs();
 		void build_fs(u64 compiler_options, interpreter::cached_program& prog_data);
 		interpreter::cached_program* build_program(u64 compiler_options);
 
@@ -83,7 +82,7 @@ namespace gl
 
 		void update_fragment_textures(const std::array<std::unique_ptr<rsx::sampled_image_descriptor_base>, 16>& descriptors, u16 reference_mask, u32* out);
 
-		glsl::program* get(const interpreter::program_metadata& fp_metadata, u32 vp_ctrl, u32 fp_ctrl);
-		bool is_interpreter(const glsl::program* program) const;
+		glsl::program* get(const interpreter::program_metadata& fp_metadata);
+		bool is_interpreter(const glsl::program* program);
 	};
 }
diff --git a/rpcs3/Emu/RSX/GL/GLTextOut.h b/rpcs3/Emu/RSX/GL/GLTextOut.h
new file mode 100644
index 0000000000..28d94e7f91
--- /dev/null
+++ b/rpcs3/Emu/RSX/GL/GLTextOut.h
@@ -0,0 +1,219 @@
+#pragma once
+
+#include "util/types.hpp"
+#include "GLHelpers.h"
+#include "../Common/TextGlyphs.h"
+#include <string>
+#include <vector>
+#include <unordered_map>
+
+namespace gl
+{
+	class text_writer
+	{
+	private:
+
+		gl::glsl::program m_program;
+		gl::glsl::shader m_vs;
+		gl::glsl::shader m_fs;
+
+		gl::vao m_vao;
+		gl::buffer m_text_buffer;
+		gl::buffer m_scale_offsets_buffer;
+		std::unordered_map<u8, std::pair<u32, u32>> m_offsets;
+
+		bool initialized = false;
+		bool enabled = false;
+
+		f32 m_scale = 1.0f;
+
+		void init_program()
+		{
+			std::string vs =
+			{
+				"#version 420\n"
+				"#extension GL_ARB_shader_draw_parameters: enable\n"
+				"layout(location=0) in vec2 pos;\n"
+				"uniform vec2 offsets[255];\n"
+				"uniform vec2 scale;\n"
+				"\n"
+				"void main()\n"
+				"{\n"
+				"	vec2 offset = offsets[gl_DrawIDARB];\n"
+				"	gl_Position = vec4(pos, 0., 1.);\n"
+				"	gl_Position.xy = gl_Position.xy * scale + offset;\n"
+				"}\n"
+			};
+
+			std::string fs =
+			{
+				"#version 420\n"
+				"layout(location=0) out vec4 col0;\n"
+				"uniform vec4 draw_color;\n"
+				"\n"
+				"void main()\n"
+				"{\n"
+				"	col0 = draw_color;\n"
+				"}\n"
+			};
+
+			m_fs.create(::glsl::program_domain::glsl_fragment_program, fs);
+			m_fs.compile();
+
+			m_vs.create(::glsl::program_domain::glsl_vertex_program, vs);
+			m_vs.compile();
+
+			m_program.create();
+			m_program.attach(m_vs);
+			m_program.attach(m_fs);
+			m_program.link();
+		}
+
+		void load_program(float scale_x, float scale_y, float *offsets, usz nb_offsets, color4f color)
+		{
+			float scale[] = { scale_x, scale_y };
+
+			m_program.use();
+
+			m_program.uniforms["draw_color"] = color;
+			glProgramUniform2fv(m_program.id(), m_program.uniforms["offsets"].location(), static_cast<GLsizei>(nb_offsets), offsets);
+			glProgramUniform2fv(m_program.id(), m_program.uniforms["scale"].location(), 1, scale);
+		}
+
+	public:
+
+		text_writer() = default;
+		~text_writer() = default;
+
+		void init()
+		{
+			m_text_buffer.create();
+			m_scale_offsets_buffer.create();
+
+			GlyphManager glyph_source;
+			auto points = glyph_source.generate_point_map();
+
+			const usz buffer_size = points.size() * sizeof(GlyphManager::glyph_point);
+
+			m_text_buffer.data(buffer_size, points.data());
+			m_offsets = glyph_source.get_glyph_offsets();
+
+			m_scale_offsets_buffer.data(512 * 4 * sizeof(float));
+
+			//Init VAO
+			int old_vao;
+			glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &old_vao);
+
+			m_vao.create();
+			m_vao.bind();
+
+			//This is saved as part of the bound VAO's state
+			m_vao.array_buffer = m_text_buffer;
+			glEnableVertexAttribArray(0);
+			glVertexAttribPointer(0, 2, GL_FLOAT, false, sizeof(GlyphManager::glyph_point), 0);
+
+			glBindVertexArray(old_vao);
+
+			init_program();
+			initialized = true;
+		}
+
+		void set_enabled(bool state)
+		{
+			enabled = state;
+		}
+
+		bool is_enabled()
+		{
+			return enabled;
+		}
+
+		void print_text(int x, int y, int target_w, int target_h, const std::string &text, color4f color = { 0.3f, 1.f, 0.3f, 1.f })
+		{
+			if (!enabled) return;
+
+			ensure(initialized);
+
+			std::vector<GLint> offsets;
+			std::vector<GLsizei> counts;
+			std::vector<float> shader_offsets;
+			char *s = const_cast<char *>(text.c_str());
+
+			//Y is in raster coordinates: convert to bottom-left origin
+			y = (static_cast<int>(target_h / m_scale) - y - 16);
+
+			//Compress [0, w] and [0, h] into range [-1, 1]
+			float scale_x = m_scale * 2.f / target_w;
+			float scale_y = m_scale * 2.f / target_h;
+
+			float base_offset = 0.f;
+			shader_offsets.reserve(text.length() * 2);
+
+			while (u8 offset = static_cast<u8>(*s))
+			{
+				bool to_draw = false;	//Can be false for space or unsupported characters
+
+				auto o = m_offsets.find(offset);
+				if (o != m_offsets.end())
+				{
+					if (o->second.second > 0)
+					{
+						to_draw = true;
+						offsets.push_back(o->second.first);
+						counts.push_back(o->second.second);
+					}
+				}
+
+				if (to_draw)
+				{
+					//Generate a scale_offset pair for this entry
+					float offset_x = scale_x * (x + base_offset);
+					offset_x -= 1.f;
+
+					float offset_y = scale_y * y;
+					offset_y -= 1.f;
+
+					shader_offsets.push_back(offset_x);
+					shader_offsets.push_back(offset_y);
+				}
+
+				base_offset += 9.f;
+				s++;
+			}
+
+			//TODO: Add drop shadow if deemed necessary for visibility
+
+			int old_vao;
+			glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &old_vao);
+
+			load_program(scale_x, scale_y, shader_offsets.data(), counts.size(), color);
+
+			m_vao.bind();
+
+			glMultiDrawArrays(GL_POINTS, offsets.data(), counts.data(), static_cast<GLsizei>(counts.size()));
+			glBindVertexArray(old_vao);
+		}
+
+		void close()
+		{
+			if (initialized)
+			{
+				m_scale_offsets_buffer.remove();
+				m_text_buffer.remove();
+				m_vao.remove();
+
+				m_program.remove();
+				m_fs.remove();
+				m_vs.remove();
+
+				initialized = false;
+			}
+		}
+
+		void set_scale(double scale)
+		{
+			// Restrict scale to 2. The dots are gonna be too sparse otherwise.
+			m_scale = std::min(static_cast<f32>(scale), 2.0f);
+		}
+	};
+}
diff --git a/rpcs3/Emu/RSX/GL/GLTexture.cpp b/rpcs3/Emu/RSX/GL/GLTexture.cpp
index 0c34690bf4..49eacb3145 100644
--- a/rpcs3/Emu/RSX/GL/GLTexture.cpp
+++ b/rpcs3/Emu/RSX/GL/GLTexture.cpp
@@ -1,13 +1,10 @@
 #include "stdafx.h"
 #include "GLTexture.h"
 #include "GLCompute.h"
-#include "GLOverlays.h"
-#include "GLGSRender.h"
-
-#include "glutils/blitter.h"
-#include "glutils/ring_buffer.h"
-
+#include "GLRenderTargets.h"
+#include "../GCM.h"
 #include "../RSXThread.h"
+#include "../RSXTexture.h"
 
 #include "util/asm.hpp"
 
@@ -18,43 +15,7 @@ namespace gl
 		extern void set_vis_texture(texture*);
 	}
 
-	scratch_ring_buffer g_typeless_transfer_buffer;
-	legacy_ring_buffer g_upload_transfer_buffer;
-	scratch_ring_buffer g_compute_decode_buffer;
-	scratch_ring_buffer g_deswizzle_scratch_buffer;
-
-	void destroy_global_texture_resources()
-	{
-		g_typeless_transfer_buffer.remove();
-		g_upload_transfer_buffer.remove();
-		g_compute_decode_buffer.remove();
-		g_deswizzle_scratch_buffer.remove();
-	}
-
-	template <typename WordType, bool SwapBytes>
-	void do_deswizzle_transformation(gl::command_context& cmd, u32 block_size, buffer* dst, u32 dst_offset, buffer* src, u32 src_offset, u32 data_length, u16 width, u16 height, u16 depth)
-	{
-		switch (block_size)
-		{
-		case 4:
-			gl::get_compute_task<gl::cs_deswizzle_3d<u32, WordType, SwapBytes>>()->run(
-				cmd, dst, dst_offset, src, src_offset,
-				data_length, width, height, depth, 1);
-			break;
-		case 8:
-			gl::get_compute_task<gl::cs_deswizzle_3d<u64, WordType, SwapBytes>>()->run(
-				cmd, dst, dst_offset, src, src_offset,
-				data_length, width, height, depth, 1);
-			break;
-		case 16:
-			gl::get_compute_task<gl::cs_deswizzle_3d<u128, WordType, SwapBytes>>()->run(
-				cmd, dst, dst_offset, src, src_offset,
-				data_length, width, height, depth, 1);
-			break;
-		default:
-			fmt::throw_exception("Unreachable");
-		}
-	}
+	buffer g_typeless_transfer_buffer;
 
 	GLenum get_target(rsx::texture_dimension_extended type)
 	{
@@ -70,14 +31,13 @@ namespace gl
 
 	GLenum get_sized_internal_format(u32 texture_format)
 	{
-		const bool supports_dxt = get_driver_caps().EXT_texture_compression_s3tc_supported;
 		switch (texture_format)
 		{
 		case CELL_GCM_TEXTURE_B8: return GL_R8;
-		case CELL_GCM_TEXTURE_A1R5G5B5: return GL_BGR5_A1;
+		case CELL_GCM_TEXTURE_A1R5G5B5: return GL_RGB5_A1;
 		case CELL_GCM_TEXTURE_A4R4G4B4: return GL_RGBA4;
 		case CELL_GCM_TEXTURE_R5G6B5: return GL_RGB565;
-		case CELL_GCM_TEXTURE_A8R8G8B8: return GL_BGRA8;
+		case CELL_GCM_TEXTURE_A8R8G8B8: return GL_RGBA8;
 		case CELL_GCM_TEXTURE_G8B8: return GL_RG8;
 		case CELL_GCM_TEXTURE_R6G5B5: return GL_RGB565;
 		case CELL_GCM_TEXTURE_DEPTH24_D8: return GL_DEPTH24_STENCIL8;
@@ -90,23 +50,22 @@ namespace gl
 		case CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT: return GL_RGBA16F;
 		case CELL_GCM_TEXTURE_W32_Z32_Y32_X32_FLOAT: return GL_RGBA32F;
 		case CELL_GCM_TEXTURE_X32_FLOAT: return GL_R32F;
-		case CELL_GCM_TEXTURE_D1R5G5B5: return GL_BGR5_A1;
-		case CELL_GCM_TEXTURE_D8R8G8B8: return GL_BGRA8;
+		case CELL_GCM_TEXTURE_D1R5G5B5: return GL_RGB5_A1;
+		case CELL_GCM_TEXTURE_D8R8G8B8: return GL_RGBA8;
 		case CELL_GCM_TEXTURE_Y16_X16_FLOAT: return GL_RG16F;
-		case CELL_GCM_TEXTURE_COMPRESSED_DXT1: return supports_dxt ? GL_COMPRESSED_RGBA_S3TC_DXT1_EXT : GL_BGRA8;
-		case CELL_GCM_TEXTURE_COMPRESSED_DXT23: return supports_dxt ? GL_COMPRESSED_RGBA_S3TC_DXT3_EXT : GL_BGRA8;
-		case CELL_GCM_TEXTURE_COMPRESSED_DXT45: return supports_dxt ? GL_COMPRESSED_RGBA_S3TC_DXT5_EXT : GL_BGRA8;
+		case CELL_GCM_TEXTURE_COMPRESSED_DXT1: return GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
+		case CELL_GCM_TEXTURE_COMPRESSED_DXT23: return GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+		case CELL_GCM_TEXTURE_COMPRESSED_DXT45: return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
 		case CELL_GCM_TEXTURE_COMPRESSED_HILO8: return GL_RG8;
-		case CELL_GCM_TEXTURE_COMPRESSED_HILO_S8: return GL_RG8_SNORM;
-		case CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8: return GL_BGRA8;
-		case CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8: return GL_BGRA8;
+		case CELL_GCM_TEXTURE_COMPRESSED_HILO_S8: return GL_RG8;
+		case CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8: return GL_RGBA8;
+		case CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8: return GL_RGBA8;
 		}
 		fmt::throw_exception("Unknown texture format 0x%x", texture_format);
 	}
 
 	std::tuple<GLenum, GLenum> get_format_type(u32 texture_format)
 	{
-		const bool supports_dxt = get_driver_caps().EXT_texture_compression_s3tc_supported;
 		switch (texture_format)
 		{
 		case CELL_GCM_TEXTURE_B8: return std::make_tuple(GL_RED, GL_UNSIGNED_BYTE);
@@ -129,9 +88,9 @@ namespace gl
 		case CELL_GCM_TEXTURE_D1R5G5B5: return std::make_tuple(GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV);
 		case CELL_GCM_TEXTURE_D8R8G8B8: return std::make_tuple(GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV);
 		case CELL_GCM_TEXTURE_Y16_X16_FLOAT: return std::make_tuple(GL_RG, GL_HALF_FLOAT);
-		case CELL_GCM_TEXTURE_COMPRESSED_DXT1: return std::make_tuple(supports_dxt ? GL_COMPRESSED_RGBA_S3TC_DXT1_EXT : GL_BGRA, GL_UNSIGNED_BYTE);
-		case CELL_GCM_TEXTURE_COMPRESSED_DXT23: return std::make_tuple(supports_dxt ? GL_COMPRESSED_RGBA_S3TC_DXT3_EXT : GL_BGRA, GL_UNSIGNED_BYTE);
-		case CELL_GCM_TEXTURE_COMPRESSED_DXT45: return std::make_tuple(supports_dxt ? GL_COMPRESSED_RGBA_S3TC_DXT5_EXT : GL_BGRA, GL_UNSIGNED_BYTE);
+		case CELL_GCM_TEXTURE_COMPRESSED_DXT1: return std::make_tuple(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_UNSIGNED_BYTE);
+		case CELL_GCM_TEXTURE_COMPRESSED_DXT23: return std::make_tuple(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_UNSIGNED_BYTE);
+		case CELL_GCM_TEXTURE_COMPRESSED_DXT45: return std::make_tuple(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_UNSIGNED_BYTE);
 		case CELL_GCM_TEXTURE_COMPRESSED_HILO8: return std::make_tuple(GL_RG, GL_UNSIGNED_BYTE);
 		case CELL_GCM_TEXTURE_COMPRESSED_HILO_S8: return std::make_tuple(GL_RG, GL_BYTE);
 		case CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8: return std::make_tuple(GL_BGRA, GL_UNSIGNED_BYTE);
@@ -164,14 +123,10 @@ namespace gl
 			return { GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 2, true };
 		case texture::internal_format::rgb5a1:
 			return { GL_RGB, GL_UNSIGNED_SHORT_5_5_5_1, 2, true };
-		case texture::internal_format::bgr5a1:
-			return { GL_RGB, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2, true };
 		case texture::internal_format::rgba4:
 			return { GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4, 2, false };
 		case texture::internal_format::rgba8:
-			return { GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 4, true };
-		case texture::internal_format::bgra8:
-			return { GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4, true };
+			return { GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, 4, false };
 		case texture::internal_format::rgba16f:
 			return { GL_RGBA, GL_HALF_FLOAT, 2, true };
 		case texture::internal_format::rgba32f:
@@ -190,7 +145,25 @@ namespace gl
 
 	pixel_buffer_layout get_format_type(const gl::texture* tex)
 	{
-		auto ret = get_format_type(tex->get_internal_format());
+		const auto ifmt = tex->get_internal_format();
+		if (ifmt == gl::texture::internal_format::rgba8)
+		{
+			// Multiple RTT layouts can map to this format. Override ABGR formats
+			if (auto rtt = dynamic_cast<const gl::render_target*>(tex))
+			{
+				switch (rtt->format_info.gcm_color_format)
+				{
+				case rsx::surface_color_format::x8b8g8r8_z8b8g8r8:
+				case rsx::surface_color_format::x8b8g8r8_o8b8g8r8:
+				case rsx::surface_color_format::a8b8g8r8:
+					return { GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4, false };
+				default:
+					break;
+				}
+			}
+		}
+
+		auto ret = get_format_type(ifmt);
 		if (tex->format_class() == RSX_FORMAT_CLASS_DEPTH24_FLOAT_X8_PACK32)
 		{
 			ret.type = GL_FLOAT_32_UNSIGNED_INT_24_8_REV;
@@ -199,6 +172,197 @@ namespace gl
 		return ret;
 	}
 
+	GLenum get_srgb_format(GLenum in_format)
+	{
+		switch (in_format)
+		{
+		case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+			return GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;
+		case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+			return GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;
+		case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+			return GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
+		case GL_RGBA8:
+			return GL_SRGB8_ALPHA8;
+		default:
+			//rsx_log.error("No gamma conversion for format 0x%X", in_format);
+			return in_format;
+		}
+	}
+
+	GLenum wrap_mode(rsx::texture_wrap_mode wrap)
+	{
+		switch (wrap)
+		{
+		case rsx::texture_wrap_mode::wrap: return GL_REPEAT;
+		case rsx::texture_wrap_mode::mirror: return GL_MIRRORED_REPEAT;
+		case rsx::texture_wrap_mode::clamp_to_edge: return GL_CLAMP_TO_EDGE;
+		case rsx::texture_wrap_mode::border: return GL_CLAMP_TO_BORDER;
+		case rsx::texture_wrap_mode::clamp: return GL_CLAMP_TO_EDGE;
+		case rsx::texture_wrap_mode::mirror_once_clamp_to_edge: return GL_MIRROR_CLAMP_TO_EDGE_EXT;
+		case rsx::texture_wrap_mode::mirror_once_border: return GL_MIRROR_CLAMP_TO_BORDER_EXT;
+		case rsx::texture_wrap_mode::mirror_once_clamp: return GL_MIRROR_CLAMP_EXT;
+		}
+
+		rsx_log.error("Texture wrap error: bad wrap (%d)", static_cast<u32>(wrap));
+		return GL_REPEAT;
+	}
+
+	float max_aniso(rsx::texture_max_anisotropy aniso)
+	{
+		switch (aniso)
+		{
+		case rsx::texture_max_anisotropy::x1: return 1.0f;
+		case rsx::texture_max_anisotropy::x2: return 2.0f;
+		case rsx::texture_max_anisotropy::x4: return 4.0f;
+		case rsx::texture_max_anisotropy::x6: return 6.0f;
+		case rsx::texture_max_anisotropy::x8: return 8.0f;
+		case rsx::texture_max_anisotropy::x10: return 10.0f;
+		case rsx::texture_max_anisotropy::x12: return 12.0f;
+		case rsx::texture_max_anisotropy::x16: return 16.0f;
+		}
+
+		rsx_log.error("Texture anisotropy error: bad max aniso (%d)", static_cast<u32>(aniso));
+		return 1.0f;
+	}
+
+	int tex_min_filter(rsx::texture_minify_filter min_filter)
+	{
+		switch (min_filter)
+		{
+		case rsx::texture_minify_filter::nearest: return GL_NEAREST;
+		case rsx::texture_minify_filter::linear: return GL_LINEAR;
+		case rsx::texture_minify_filter::nearest_nearest: return GL_NEAREST_MIPMAP_NEAREST;
+		case rsx::texture_minify_filter::linear_nearest: return GL_LINEAR_MIPMAP_NEAREST;
+		case rsx::texture_minify_filter::nearest_linear: return GL_NEAREST_MIPMAP_LINEAR;
+		case rsx::texture_minify_filter::linear_linear: return GL_LINEAR_MIPMAP_LINEAR;
+		case rsx::texture_minify_filter::convolution_min: return GL_LINEAR_MIPMAP_LINEAR;
+		}
+		fmt::throw_exception("Unknown min filter");
+	}
+
+	int tex_mag_filter(rsx::texture_magnify_filter mag_filter)
+	{
+		switch (mag_filter)
+		{
+		case rsx::texture_magnify_filter::nearest: return GL_NEAREST;
+		case rsx::texture_magnify_filter::linear: return GL_LINEAR;
+		case rsx::texture_magnify_filter::convolution_mag: return GL_LINEAR;
+		}
+		fmt::throw_exception("Unknown mag filter");
+	}
+
+	// Apply sampler state settings
+	void sampler_state::apply(const rsx::fragment_texture& tex, const rsx::sampled_image_descriptor_base* sampled_image)
+	{
+		set_parameteri(GL_TEXTURE_WRAP_S, wrap_mode(tex.wrap_s()));
+		set_parameteri(GL_TEXTURE_WRAP_T, wrap_mode(tex.wrap_t()));
+		set_parameteri(GL_TEXTURE_WRAP_R, wrap_mode(tex.wrap_r()));
+
+		if (const auto color = tex.border_color();
+			get_parameteri(GL_TEXTURE_BORDER_COLOR) != color)
+		{
+			m_propertiesi[GL_TEXTURE_BORDER_COLOR] = color;
+
+			const color4f border_color = rsx::decode_border_color(color);
+			glSamplerParameterfv(samplerHandle, GL_TEXTURE_BORDER_COLOR, border_color.rgba);
+		}
+
+		if (sampled_image->upload_context != rsx::texture_upload_context::shader_read ||
+			tex.get_exact_mipmap_count() == 1)
+		{
+			GLint min_filter = tex_min_filter(tex.min_filter());
+
+			if (min_filter != GL_LINEAR && min_filter != GL_NEAREST)
+			{
+				switch (min_filter)
+				{
+				case GL_NEAREST_MIPMAP_NEAREST:
+				case GL_NEAREST_MIPMAP_LINEAR:
+					min_filter = GL_NEAREST; break;
+				case GL_LINEAR_MIPMAP_NEAREST:
+				case GL_LINEAR_MIPMAP_LINEAR:
+					min_filter = GL_LINEAR; break;
+				default:
+					rsx_log.error("No mipmap fallback defined for rsx_min_filter = 0x%X", static_cast<u32>(tex.min_filter()));
+					min_filter = GL_NEAREST;
+				}
+			}
+
+			set_parameteri(GL_TEXTURE_MIN_FILTER, min_filter);
+			set_parameterf(GL_TEXTURE_LOD_BIAS, 0.f);
+			set_parameterf(GL_TEXTURE_MIN_LOD, -1000.f);
+			set_parameterf(GL_TEXTURE_MAX_LOD, 1000.f);
+		}
+		else
+		{
+			set_parameteri(GL_TEXTURE_MIN_FILTER, tex_min_filter(tex.min_filter()));
+			set_parameterf(GL_TEXTURE_LOD_BIAS, tex.bias());
+			set_parameterf(GL_TEXTURE_MIN_LOD, tex.min_lod());
+			set_parameterf(GL_TEXTURE_MAX_LOD, tex.max_lod());
+		}
+
+		const f32 af_level = max_aniso(tex.max_aniso());
+		set_parameterf(GL_TEXTURE_MAX_ANISOTROPY_EXT, af_level);
+		set_parameteri(GL_TEXTURE_MAG_FILTER, tex_mag_filter(tex.mag_filter()));
+
+		const u32 texture_format = tex.format() & ~(CELL_GCM_TEXTURE_UN | CELL_GCM_TEXTURE_LN);
+		if (texture_format == CELL_GCM_TEXTURE_DEPTH16 || texture_format == CELL_GCM_TEXTURE_DEPTH24_D8 ||
+			texture_format == CELL_GCM_TEXTURE_DEPTH16_FLOAT || texture_format == CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT)
+		{
+			//NOTE: The stored texture function is reversed wrt the textureProj compare function
+			GLenum compare_mode = static_cast<GLenum>(tex.zfunc()) | GL_NEVER;
+
+			switch (compare_mode)
+			{
+			case GL_GREATER: compare_mode = GL_LESS; break;
+			case GL_GEQUAL: compare_mode = GL_LEQUAL; break;
+			case GL_LESS: compare_mode = GL_GREATER; break;
+			case GL_LEQUAL: compare_mode = GL_GEQUAL; break;
+			}
+
+			set_parameteri(GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
+			set_parameteri(GL_TEXTURE_COMPARE_FUNC, compare_mode);
+		}
+		else
+			set_parameteri(GL_TEXTURE_COMPARE_MODE, GL_NONE);
+	}
+
+	void sampler_state::apply(const rsx::vertex_texture& tex, const rsx::sampled_image_descriptor_base* /*sampled_image*/)
+	{
+		if (const auto color = tex.border_color();
+			get_parameteri(GL_TEXTURE_BORDER_COLOR) != color)
+		{
+			m_propertiesi[GL_TEXTURE_BORDER_COLOR] = color;
+
+			const color4f border_color = rsx::decode_border_color(color);
+			glSamplerParameterfv(samplerHandle, GL_TEXTURE_BORDER_COLOR, border_color.rgba);
+		}
+
+		set_parameteri(GL_TEXTURE_WRAP_S, wrap_mode(tex.wrap_s()));
+		set_parameteri(GL_TEXTURE_WRAP_T, wrap_mode(tex.wrap_t()));
+		set_parameteri(GL_TEXTURE_WRAP_R, wrap_mode(tex.wrap_r()));
+		set_parameteri(GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		set_parameteri(GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		set_parameterf(GL_TEXTURE_LOD_BIAS, tex.bias());
+		set_parameterf(GL_TEXTURE_MIN_LOD, tex.min_lod());
+		set_parameterf(GL_TEXTURE_MAX_LOD, tex.max_lod());
+		set_parameteri(GL_TEXTURE_COMPARE_MODE, GL_NONE);
+	}
+
+	void sampler_state::apply_defaults(GLenum default_filter)
+	{
+		set_parameteri(GL_TEXTURE_WRAP_S, GL_REPEAT);
+		set_parameteri(GL_TEXTURE_WRAP_T, GL_REPEAT);
+		set_parameteri(GL_TEXTURE_WRAP_R, GL_REPEAT);
+		set_parameteri(GL_TEXTURE_MIN_FILTER, default_filter);
+		set_parameteri(GL_TEXTURE_MAG_FILTER, default_filter);
+		set_parameterf(GL_TEXTURE_LOD_BIAS, 0.f);
+		set_parameteri(GL_TEXTURE_MIN_LOD, 0);
+		set_parameteri(GL_TEXTURE_MAX_LOD, 0);
+		set_parameteri(GL_TEXTURE_COMPARE_MODE, GL_NONE);
+	}
+
 	std::array<GLenum, 4> get_swizzle_remap(u32 texture_format)
 	{
 		// NOTE: This must be in ARGB order in all forms below.
@@ -208,7 +372,6 @@ namespace gl
 		case CELL_GCM_TEXTURE_R5G5B5A1:
 		case CELL_GCM_TEXTURE_R6G5B5:
 		case CELL_GCM_TEXTURE_R5G6B5:
-		case CELL_GCM_TEXTURE_A4R4G4B4:
 		case CELL_GCM_TEXTURE_A8R8G8B8:
 		case CELL_GCM_TEXTURE_COMPRESSED_DXT1:
 		case CELL_GCM_TEXTURE_COMPRESSED_DXT23:
@@ -223,6 +386,9 @@ namespace gl
 		case CELL_GCM_TEXTURE_DEPTH16_FLOAT:
 			return{ GL_RED, GL_RED, GL_RED, GL_RED };
 
+		case CELL_GCM_TEXTURE_A4R4G4B4:
+			return{ GL_BLUE, GL_GREEN, GL_RED, GL_ALPHA };
+
 		case CELL_GCM_TEXTURE_B8:
 			return{ GL_ONE, GL_RED, GL_RED, GL_RED };
 
@@ -276,96 +442,52 @@ namespace gl
 		}
 	}
 
-	void* copy_image_to_buffer(gl::command_context& cmd, const pixel_buffer_layout& pack_info, const gl::texture* src, gl::buffer* dst,
-		u32 dst_offset, const int src_level, const coord3u& src_region,  image_memory_requirements* mem_info)
+	void* copy_image_to_buffer(const pixel_buffer_layout& pack_info, const gl::texture* src, gl::buffer* dst,
+		const int src_level, const coord3u& src_region,  image_memory_requirements* mem_info)
 	{
-		auto initialize_scratch_mem = [&]() -> bool // skip_transform
+		auto initialize_scratch_mem = [&]()
 		{
 			const u64 max_mem = (mem_info->memory_required) ? mem_info->memory_required : mem_info->image_size_in_bytes;
 			if (!(*dst) || max_mem > static_cast<u64>(dst->size()))
 			{
 				if (*dst) dst->remove();
-				dst->create(buffer::target::ssbo, max_mem, nullptr, buffer::memory_type::local, 0);
-			}
-
-			if (auto as_vi = dynamic_cast<const gl::viewable_image*>(src);
-				src->get_target() == gl::texture::target::texture2D &&
-				as_vi)
-			{
-				// RGBA8 <-> D24X8 bitcasts are some very common conversions due to some PS3 coding hacks & workarounds.
-				switch (src->get_internal_format())
-				{
-				case gl::texture::internal_format::depth24_stencil8:
-					gl::get_compute_task<gl::cs_d24x8_to_ssbo>()->run(cmd,
-						const_cast<gl::viewable_image*>(as_vi), dst, dst_offset,
-						{ {src_region.x, src_region.y}, {src_region.width, src_region.height} },
-						pack_info);
-					return true;
-				case gl::texture::internal_format::rgba8:
-				case gl::texture::internal_format::bgra8:
-					gl::get_compute_task<gl::cs_rgba8_to_ssbo>()->run(cmd,
-						const_cast<gl::viewable_image*>(as_vi), dst, dst_offset,
-						{ {src_region.x, src_region.y}, {src_region.width, src_region.height} },
-						pack_info);
-					return true;
-				default:
-					break;
-				}
+				dst->create(buffer::target::pixel_pack, max_mem, nullptr, buffer::memory_type::local, GL_STATIC_COPY);
 			}
 
 			dst->bind(buffer::target::pixel_pack);
-			src->copy_to(reinterpret_cast<void*>(static_cast<uintptr_t>(dst_offset)), static_cast<texture::format>(pack_info.format), static_cast<texture::type>(pack_info.type), src_level, src_region, {});
-			return false;
+			src->copy_to(nullptr, static_cast<texture::format>(pack_info.format), static_cast<texture::type>(pack_info.type), src_level, src_region, {});
 		};
 
-		void* result = reinterpret_cast<void*>(static_cast<uintptr_t>(dst_offset));
+		void* result = nullptr;
 		if (src->aspect() == image_aspect::color ||
 			pack_info.type == GL_UNSIGNED_SHORT ||
 			pack_info.type == GL_UNSIGNED_INT_24_8)
 		{
-			if (!initialize_scratch_mem())
+			initialize_scratch_mem();
+			if (auto job = get_trivial_transform_job(pack_info))
 			{
-				if (auto job = get_trivial_transform_job(pack_info))
-				{
-					job->run(cmd, dst, static_cast<u32>(mem_info->image_size_in_bytes), dst_offset);
-				}
+				job->run(dst, static_cast<u32>(mem_info->image_size_in_bytes));
 			}
 		}
 		else if (pack_info.type == GL_FLOAT)
 		{
 			ensure(mem_info->image_size_in_bytes == (mem_info->image_size_in_texels * 4));
 			mem_info->memory_required = (mem_info->image_size_in_texels * 6);
-			ensure(!initialize_scratch_mem());
+			initialize_scratch_mem();
 
-			if (pack_info.swap_bytes) [[ likely ]]
-			{
-				get_compute_task<cs_fconvert_task<f32, f16, false, true>>()->run(cmd, dst, dst_offset,
-					static_cast<u32>(mem_info->image_size_in_bytes), static_cast<u32>(mem_info->image_size_in_bytes));
-			}
-			else
-			{
-				get_compute_task<cs_fconvert_task<f32, f16, false, false>>()->run(cmd, dst, dst_offset,
-					static_cast<u32>(mem_info->image_size_in_bytes), static_cast<u32>(mem_info->image_size_in_bytes));
-			}
-			result = reinterpret_cast<void*>(mem_info->image_size_in_bytes + dst_offset);
+			get_compute_task<cs_fconvert_task<f32, f16, false, true>>()->run(dst, 0,
+				static_cast<u32>(mem_info->image_size_in_bytes), static_cast<u32>(mem_info->image_size_in_bytes));
+			result = reinterpret_cast<void*>(mem_info->image_size_in_bytes);
 		}
 		else if (pack_info.type == GL_FLOAT_32_UNSIGNED_INT_24_8_REV)
 		{
 			ensure(mem_info->image_size_in_bytes == (mem_info->image_size_in_texels * 8));
 			mem_info->memory_required = (mem_info->image_size_in_texels * 12);
-			ensure(!initialize_scratch_mem());
+			initialize_scratch_mem();
 
-			if (pack_info.swap_bytes)
-			{
-				get_compute_task<cs_shuffle_d32fx8_to_x8d24f<true>>()->run(cmd, dst, dst_offset,
-					static_cast<u32>(mem_info->image_size_in_bytes), static_cast<u32>(mem_info->image_size_in_texels));
-			}
-			else
-			{
-				get_compute_task<cs_shuffle_d32fx8_to_x8d24f<false>>()->run(cmd, dst, dst_offset,
-					static_cast<u32>(mem_info->image_size_in_bytes), static_cast<u32>(mem_info->image_size_in_texels));
-			}
-			result = reinterpret_cast<void*>(mem_info->image_size_in_bytes + dst_offset);
+			get_compute_task<cs_shuffle_d32fx8_to_x8d24f>()->run(dst, 0,
+				static_cast<u32>(mem_info->image_size_in_bytes), static_cast<u32>(mem_info->image_size_in_texels));
+			result = reinterpret_cast<void*>(mem_info->image_size_in_bytes);
 		}
 		else
 		{
@@ -376,7 +498,7 @@ namespace gl
 		return result;
 	}
 
-	void copy_buffer_to_image(gl::command_context& cmd, const pixel_buffer_layout& unpack_info, gl::buffer* src, gl::texture* dst,
+	void copy_buffer_to_image(const pixel_buffer_layout& unpack_info, gl::buffer* src, gl::texture* dst,
 		const void* src_offset, const int dst_level, const coord3u& dst_region, image_memory_requirements* mem_info)
 	{
 		buffer scratch_mem;
@@ -384,7 +506,6 @@ namespace gl
 		bool skip_barrier = false;
 		u32 in_offset = static_cast<u32>(reinterpret_cast<u64>(src_offset));
 		u32 out_offset = in_offset;
-		const auto& caps = gl::get_driver_caps();
 
 		auto initialize_scratch_mem = [&]()
 		{
@@ -400,7 +521,7 @@ namespace gl
 				return;
 			}
 
-			scratch_mem.create(buffer::target::pixel_pack, max_mem, nullptr, buffer::memory_type::local, 0);
+			scratch_mem.create(buffer::target::pixel_pack, max_mem, nullptr, buffer::memory_type::local, GL_STATIC_COPY);
 
 			glMemoryBarrier(GL_BUFFER_UPDATE_BARRIER_BIT);
 			src->copy_to(&scratch_mem, in_offset, 0, mem_info->image_size_in_bytes);
@@ -410,242 +531,117 @@ namespace gl
 			transfer_buf = &scratch_mem;
 		};
 
-		if ((dst->aspect() & image_aspect::stencil) == 0 || caps.ARB_shader_stencil_export_supported)
+		if (dst->aspect() == image_aspect::color ||
+			unpack_info.type == GL_UNSIGNED_SHORT ||
+			unpack_info.type == GL_UNSIGNED_INT_24_8)
 		{
-			// We do not need to use the driver's builtin transport mechanism
-			glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
-
-			std::unique_ptr<gl::texture> scratch;
-			std::unique_ptr<gl::texture_view> scratch_view;
-
-			coordu image_region = { {dst_region.x, dst_region.y}, {dst_region.width, dst_region.height} };
-
-			switch (dst->get_target())
+			if (auto job = get_trivial_transform_job(unpack_info))
 			{
-			case texture::target::texture3D:
-			{
-				// Upload to splatted image and do the final copy GPU-side
-				image_region.height *= dst_region.depth;
-				scratch = std::make_unique<gl::texture>(
-					GL_TEXTURE_2D,
-					image_region.x + image_region.width, image_region.y + image_region.height, 1, 1, 1,
-					static_cast<GLenum>(dst->get_internal_format()), dst->format_class());
-
-				scratch_view = std::make_unique<gl::nil_texture_view>(scratch.get());
-				break;
-			}
-			case texture::target::textureCUBE:
-			{
-				const subresource_range range = { image_aspect::depth | image_aspect::color, static_cast<GLuint>(dst_level), 1, dst_region.z , 1 };
-				scratch_view = std::make_unique<gl::texture_view>(dst, GL_TEXTURE_2D, range);
-				break;
-			}
-			case texture::target::texture1D:
-			{
-				scratch = std::make_unique<gl::texture>(
-					GL_TEXTURE_2D,
-					image_region.x + image_region.width, 1, 1, 1, 1,
-					static_cast<GLenum>(dst->get_internal_format()), dst->format_class());
-
-				scratch_view = std::make_unique<gl::nil_texture_view>(scratch.get());
-				break;
-			}
-			default:
-			{
-				ensure(dst->layers() == 1);
-
-				if (dst->levels() > 1) [[ likely ]]
-				{
-					const subresource_range range = { image_aspect::depth | image_aspect::color, static_cast<GLuint>(dst_level), 1, 0 , 1 };
-					scratch_view = std::make_unique<gl::texture_view>(dst, GL_TEXTURE_2D, range);
-				}
-				else
-				{
-					scratch_view = std::make_unique<gl::nil_texture_view>(dst);
-				}
-
-				break;
-			}
-			}
-
-			// If possible, decode using a compute transform to potentially have asynchronous scheduling
-			bool use_compute_transform = (
-				dst->aspect() == gl::image_aspect::color &&  // Cannot use image_load_store with depth images
-				caps.subvendor_ATI == false);                // The old AMD/ATI driver does not support image writeonly without format specifier
-
-			if (use_compute_transform)
-			{
-				switch (dst->get_internal_format())
-				{
-				case texture::internal_format::bgr5a1:
-				case texture::internal_format::rgb5a1:
-				case texture::internal_format::rgb565:
-				case texture::internal_format::rgba4:
-					// Packed formats are a problem with image_load_store
-					use_compute_transform = false;
-					break;
-				default:
-					break;
-				}
-			}
-
-			if (use_compute_transform)
-			{
-				gl::get_compute_task<gl::cs_ssbo_to_color_image>()->run(cmd, transfer_buf, scratch_view.get(), out_offset, image_region, unpack_info);
+				job->run(src, static_cast<u32>(mem_info->image_size_in_bytes), in_offset);
 			}
 			else
 			{
-				gl::get_overlay_pass<gl::rp_ssbo_to_generic_texture>()->run(cmd, transfer_buf, scratch_view.get(), out_offset, image_region, unpack_info);
-			}
-
-			glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT | GL_TEXTURE_UPDATE_BARRIER_BIT);
-
-			switch (dst->get_target())
-			{
-			case texture::target::texture1D:
-			{
-				const position3u transfer_offset = { dst_region.position.x, 0, 0 };
-				g_hw_blitter->copy_image(cmd, scratch.get(), dst, 0, dst_level, transfer_offset, transfer_offset, { dst_region.width, 1, 1 });
-				break;
-			}
-			case texture::target::texture3D:
-			{
-				// Memcpy
-				for (u32 layer = dst_region.z, i = 0; i < dst_region.depth; ++i, ++layer)
-				{
-					const position3u src_offset = { dst_region.position.x, dst_region.position.y + (i * dst_region.height), 0 };
-					const position3u dst_offset = { dst_region.position.x, dst_region.position.y, layer };
-					g_hw_blitter->copy_image(cmd, scratch.get(), dst, 0, dst_level, src_offset, dst_offset, { dst_region.width, dst_region.height, 1 });
-				}
-				break;
-			}
-			default: break;
+				skip_barrier = true;
 			}
 		}
+		else if (unpack_info.type == GL_FLOAT)
+		{
+			mem_info->memory_required = (mem_info->image_size_in_texels * 4);
+			initialize_scratch_mem();
+			get_compute_task<cs_fconvert_task<f16, f32, true, false>>()->run(transfer_buf, in_offset, static_cast<u32>(mem_info->image_size_in_bytes), out_offset);
+		}
+		else if (unpack_info.type == GL_FLOAT_32_UNSIGNED_INT_24_8_REV)
+		{
+			mem_info->memory_required = (mem_info->image_size_in_texels * 8);
+			initialize_scratch_mem();
+			get_compute_task<cs_shuffle_x8d24f_to_d32fx8>()->run(transfer_buf, in_offset, out_offset, static_cast<u32>(mem_info->image_size_in_texels));
+		}
 		else
 		{
-			// Stencil format on NV. Use driver upload path
-			if (unpack_info.type == GL_UNSIGNED_INT_24_8)
-			{
-				if (auto job = get_trivial_transform_job(unpack_info))
-				{
-					job->run(cmd, src, static_cast<u32>(mem_info->image_size_in_bytes), in_offset);
-				}
-				else
-				{
-					skip_barrier = true;
-				}
-			}
-			else if (unpack_info.type == GL_FLOAT_32_UNSIGNED_INT_24_8_REV)
-			{
-				mem_info->memory_required = (mem_info->image_size_in_texels * 8);
-				initialize_scratch_mem();
-
-				if (unpack_info.swap_bytes)
-				{
-					get_compute_task<cs_shuffle_x8d24f_to_d32fx8<true>>()->run(cmd, transfer_buf, in_offset, out_offset, static_cast<u32>(mem_info->image_size_in_texels));
-				}
-				else
-				{
-					get_compute_task<cs_shuffle_x8d24f_to_d32fx8<false>>()->run(cmd, transfer_buf, in_offset, out_offset, static_cast<u32>(mem_info->image_size_in_texels));
-				}
-			}
-			else
-			{
-				fmt::throw_exception("Invalid depth/stencil type 0x%x", unpack_info.type);
-			}
-
-			if (!skip_barrier)
-			{
-				glMemoryBarrier(GL_PIXEL_BUFFER_BARRIER_BIT);
-			}
-
-			glBindBuffer(GL_SHADER_STORAGE_BUFFER, GL_NONE);
-			transfer_buf->bind(buffer::target::pixel_unpack);
-
-			dst->copy_from(reinterpret_cast<void*>(u64(out_offset)), static_cast<texture::format>(unpack_info.format),
-				static_cast<texture::type>(unpack_info.type), dst_level, dst_region, {});
+			fmt::throw_exception("Invalid depth/stencil type 0x%x", unpack_info.type);
 		}
+
+		if (!skip_barrier)
+		{
+			glMemoryBarrier(GL_PIXEL_BUFFER_BARRIER_BIT);
+		}
+
+		glBindBuffer(GL_SHADER_STORAGE_BUFFER, GL_NONE);
+		transfer_buf->bind(buffer::target::pixel_unpack);
+
+		dst->copy_from(reinterpret_cast<void*>(u64(out_offset)), static_cast<texture::format>(unpack_info.format),
+			static_cast<texture::type>(unpack_info.type), dst_level, dst_region, {});
+
+		if (scratch_mem) scratch_mem.remove();
 	}
 
 	gl::viewable_image* create_texture(u32 gcm_format, u16 width, u16 height, u16 depth, u16 mipmaps,
 			rsx::texture_dimension_extended type)
 	{
+		if (rsx::is_compressed_host_format(gcm_format))
+		{
+			//Compressed formats have a 4-byte alignment
+			//TODO: Verify that samplers are not affected by the padding
+			width = utils::align(width, 4);
+			height = utils::align(height, 4);
+		}
+
 		const GLenum target = get_target(type);
 		const GLenum internal_format = get_sized_internal_format(gcm_format);
 		const auto format_class = rsx::classify_format(gcm_format);
 
-		return new gl::viewable_image(target, width, height, depth, mipmaps, 1, internal_format, format_class);
+		return new gl::viewable_image(target, width, height, depth, mipmaps, internal_format, format_class);
 	}
 
-	void fill_texture(gl::command_context& cmd, texture* dst, int format,
+	void fill_texture(texture* dst, int format,
 			const std::vector<rsx::subresource_layout> &input_layouts,
-			bool is_swizzled, GLenum gl_format, GLenum gl_type, rsx::simple_array<std::byte>& staging_buffer)
+			bool is_swizzled, GLenum gl_format, GLenum gl_type, std::vector<std::byte>& staging_buffer)
 	{
-		const auto& driver_caps = gl::get_driver_caps();
-		rsx::texture_uploader_capabilities caps
-		{
-			.supports_byteswap = true,
-			.supports_vtc_decoding = false,
-			.supports_hw_deswizzle = driver_caps.ARB_compute_shader_supported,
-			.supports_zero_copy = false,
-			.supports_dxt = driver_caps.EXT_texture_compression_s3tc_supported,
-			.alignment = 4
-		};
+		rsx::texture_uploader_capabilities caps{ true, false, false, false, 4 };
 
 		pixel_unpack_settings unpack_settings;
 		unpack_settings.row_length(0).alignment(4);
 
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER, GL_NONE);
-		glBindBuffer(GL_PIXEL_PACK_BUFFER, GL_NONE);
-
-		if (rsx::is_compressed_host_format(caps, format)) [[likely]]
+		if (rsx::is_compressed_host_format(format)) [[likely]]
 		{
-			caps.supports_vtc_decoding = driver_caps.vendor_NVIDIA;
+			caps.supports_vtc_decoding = gl::get_driver_caps().vendor_NVIDIA;
+
+			unpack_settings.row_length(utils::align(dst->width(), 4));
 			unpack_settings.apply();
 
+			glBindTexture(static_cast<GLenum>(dst->get_target()), dst->id());
+
 			const GLsizei format_block_size = (format == CELL_GCM_TEXTURE_COMPRESSED_DXT1) ? 8 : 16;
 
 			for (const rsx::subresource_layout& layout : input_layouts)
 			{
-				rsx::io_buffer io_buf = staging_buffer;
-				upload_texture_subresource(io_buf, layout, format, is_swizzled, caps);
+				upload_texture_subresource(staging_buffer, layout, format, is_swizzled, caps);
+				const sizei image_size{utils::align(layout.width_in_texel, 4), utils::align(layout.height_in_texel, 4)};
 
 				switch (dst->get_target())
 				{
 				case texture::target::texture1D:
 				{
 					const GLsizei size = layout.width_in_block * format_block_size;
-					ensure(usz(size) <= staging_buffer.size());
-					DSA_CALL(CompressedTextureSubImage1D, dst->id(), GL_TEXTURE_1D, layout.level, 0, layout.width_in_texel, gl_format, size, staging_buffer.data());
+					glCompressedTexSubImage1D(GL_TEXTURE_1D, layout.level, 0, image_size.width, gl_format, size, staging_buffer.data());
 					break;
 				}
 				case texture::target::texture2D:
 				{
 					const GLsizei size = layout.width_in_block * layout.height_in_block * format_block_size;
-					ensure(usz(size) <= staging_buffer.size());
-					DSA_CALL(CompressedTextureSubImage2D, dst->id(), GL_TEXTURE_2D, layout.level, 0, 0, layout.width_in_texel, layout.height_in_texel, gl_format, size, staging_buffer.data());
+					glCompressedTexSubImage2D(GL_TEXTURE_2D, layout.level, 0, 0, image_size.width, image_size.height, gl_format, size, staging_buffer.data());
 					break;
 				}
 				case texture::target::textureCUBE:
 				{
 					const GLsizei size = layout.width_in_block * layout.height_in_block * format_block_size;
-					ensure(usz(size) <= staging_buffer.size());
-					if (gl::get_driver_caps().ARB_direct_state_access_supported)
-					{
-						glCompressedTextureSubImage3D(dst->id(), layout.level, 0, 0, layout.layer, layout.width_in_texel, layout.height_in_texel, 1, gl_format, size, staging_buffer.data());
-					}
-					else
-					{
-						glCompressedTextureSubImage2DEXT(dst->id(), GL_TEXTURE_CUBE_MAP_POSITIVE_X + layout.layer, layout.level, 0, 0, layout.width_in_texel, layout.height_in_texel, gl_format, size, staging_buffer.data());
-					}
+					glCompressedTexSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + layout.layer, layout.level, 0, 0, image_size.width, image_size.height, gl_format, size, staging_buffer.data());
 					break;
 				}
 				case texture::target::texture3D:
 				{
 					const GLsizei size = layout.width_in_block * layout.height_in_block * layout.depth * format_block_size;
-					ensure(usz(size) <= staging_buffer.size());
-					DSA_CALL(CompressedTextureSubImage3D, dst->id(), GL_TEXTURE_3D, layout.level, 0, 0, 0, layout.width_in_texel, layout.height_in_texel, layout.depth, gl_format, size, staging_buffer.data());
+					glCompressedTexSubImage3D(GL_TEXTURE_3D, layout.level, 0, 0, 0, image_size.width, image_size.height, layout.depth, gl_format, size, staging_buffer.data());
 					break;
 				}
 				default:
@@ -657,58 +653,55 @@ namespace gl
 		}
 		else
 		{
-			std::pair<void*, u32> upload_scratch_mem = {}, compute_scratch_mem = {};
+			bool apply_settings = true;
+			bool use_compute_transform = false;
+			buffer upload_scratch_mem, compute_scratch_mem;
 			image_memory_requirements mem_info;
 			pixel_buffer_layout mem_layout;
 
 			std::span<std::byte> dst_buffer = staging_buffer;
 			void* out_pointer = staging_buffer.data();
 			u8 block_size_in_bytes = rsx::get_format_block_size_in_bytes(format);
-			u64 image_linear_size = staging_buffer.size();
+			u64 image_linear_size;
 
-			const auto min_required_buffer_size = std::max<u64>(utils::align(image_linear_size * 4, 0x100000), 16 * 0x100000);
-
-			if (driver_caps.ARB_compute_shader_supported)
+			switch (gl_type)
 			{
-				if (g_upload_transfer_buffer.size() < static_cast<GLsizeiptr>(min_required_buffer_size))
-				{
-					g_upload_transfer_buffer.remove();
-					g_upload_transfer_buffer.create(gl::buffer::target::pixel_unpack, min_required_buffer_size);
-				}
-
-				if (g_compute_decode_buffer.size() < min_required_buffer_size)
-				{
-					g_compute_decode_buffer.remove();
-					g_compute_decode_buffer.create(gl::buffer::target::ssbo, min_required_buffer_size);
-				}
+			case GL_BYTE:
+			case GL_UNSIGNED_BYTE:
+				// Multi-channel format uploaded one byte at a time. This is due to poor driver support for formats like GL_UNSIGNED SHORT_8_8
+				// Do byteswapping in software for now until compute acceleration is available
+				apply_settings = (gl_format == GL_RED);
+				caps.supports_byteswap = apply_settings;
+				break;
+			case GL_FLOAT:
+			case GL_UNSIGNED_INT_24_8:
+			case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
+				mem_layout.format = gl_format;
+				mem_layout.type = gl_type;
+				mem_layout.swap_bytes = true;
+				mem_layout.size = 4;
+				use_compute_transform = true;
+				apply_settings = false;
+				break;
+			}
 
+			if (use_compute_transform)
+			{
+				upload_scratch_mem.create(staging_buffer.size(), nullptr, buffer::memory_type::host_visible, GL_STREAM_DRAW);
+				compute_scratch_mem.create(std::max<GLsizeiptr>(512, staging_buffer.size() * 3), nullptr, buffer::memory_type::local, GL_STATIC_COPY);
 				out_pointer = nullptr;
 			}
 
 			for (const rsx::subresource_layout& layout : input_layouts)
 			{
-				if (driver_caps.ARB_compute_shader_supported)
+				if (use_compute_transform)
 				{
-					u64 row_pitch = rsx::align2<u64, u64>(layout.width_in_block * block_size_in_bytes, caps.alignment);
-
-					// We're in the "else" branch, so "is_compressed_host_format()" is always false.
-					// Handle emulated compressed formats with host unpack (R8G8 compressed)
-					row_pitch = std::max<u64>(row_pitch, dst->pitch());
-
-					// FIXME: Double-check this logic; it seems like we should always use texels both here and for row_pitch.
-					image_linear_size = row_pitch * layout.height_in_texel * layout.depth;
-
-					compute_scratch_mem = { nullptr, g_compute_decode_buffer.alloc(static_cast<u32>(image_linear_size), 256) };
-					compute_scratch_mem.first = reinterpret_cast<void*>(static_cast<uintptr_t>(compute_scratch_mem.second));
-
-					g_upload_transfer_buffer.reserve_storage_on_heap(static_cast<u32>(image_linear_size));
-					upload_scratch_mem = g_upload_transfer_buffer.alloc_from_heap(static_cast<u32>(image_linear_size), 256);
-					dst_buffer = { reinterpret_cast<std::byte*>(upload_scratch_mem.first), image_linear_size };
+					const u64 row_pitch = rsx::align2<u64, u64>(layout.width_in_block * block_size_in_bytes, caps.alignment);
+					image_linear_size = row_pitch * layout.height_in_block * layout.depth;
+					dst_buffer = { reinterpret_cast<std::byte*>(upload_scratch_mem.map(buffer::access::write)), image_linear_size };
 				}
 
-				rsx::io_buffer io_buf = dst_buffer;
-				caps.supports_hw_deswizzle = (is_swizzled && driver_caps.ARB_compute_shader_supported && image_linear_size > 4096);
-				auto op = upload_texture_subresource(io_buf, layout, format, is_swizzled, caps);
+				auto op = upload_texture_subresource(dst_buffer, layout, format, is_swizzled, caps);
 
 				// Define upload region
 				coord3u region;
@@ -719,128 +712,85 @@ namespace gl
 				region.height = layout.height_in_texel;
 				region.depth = layout.depth;
 
-				if (driver_caps.ARB_compute_shader_supported)
+				if (use_compute_transform)
 				{
-					// 0. Preconf
-					mem_layout.alignment = static_cast<u8>(caps.alignment);
-					mem_layout.swap_bytes = op.require_swap;
-					mem_layout.format = gl_format;
-					mem_layout.type = gl_type;
-					mem_layout.size = block_size_in_bytes;
+					// 1. Unmap buffer
+					upload_scratch_mem.unmap();
 
 					// 2. Upload memory to GPU
-					if (!op.require_deswizzle)
-					{
-						g_upload_transfer_buffer.unmap();
-						g_upload_transfer_buffer.copy_to(&g_compute_decode_buffer.get(), upload_scratch_mem.second, compute_scratch_mem.second, image_linear_size);
-					}
-					else
-					{
-						// 2.1 Copy data to deswizzle buf
-						if (g_deswizzle_scratch_buffer.size() < min_required_buffer_size)
-						{
-							g_deswizzle_scratch_buffer.remove();
-							g_deswizzle_scratch_buffer.create(gl::buffer::target::ssbo, min_required_buffer_size);
-						}
+					upload_scratch_mem.copy_to(&compute_scratch_mem, 0, 0, image_linear_size);
 
-						u32 deswizzle_data_offset = g_deswizzle_scratch_buffer.alloc(static_cast<u32>(image_linear_size), 256);
-						g_upload_transfer_buffer.unmap();
-						g_upload_transfer_buffer.copy_to(&g_deswizzle_scratch_buffer.get(), upload_scratch_mem.second, deswizzle_data_offset, static_cast<u32>(image_linear_size));
-
-						// 2.2 Apply compute transform to deswizzle input and dump it in compute_scratch_mem
-						ensure(op.element_size == 2 || op.element_size == 4);
-						const auto block_size = op.element_size * op.block_length;
-
-						if (op.require_swap)
-						{
-							mem_layout.swap_bytes = false;
-
-							if (op.element_size == 4) [[ likely ]]
-							{
-								do_deswizzle_transformation<u32, true>(cmd, block_size,
-									&g_compute_decode_buffer.get(), compute_scratch_mem.second, &g_deswizzle_scratch_buffer.get(), deswizzle_data_offset,
-									static_cast<u32>(image_linear_size), layout.width_in_texel, layout.height_in_texel, layout.depth);
-							}
-							else
-							{
-								do_deswizzle_transformation<u16, true>(cmd, block_size,
-									&g_compute_decode_buffer.get(), compute_scratch_mem.second, &g_deswizzle_scratch_buffer.get(), deswizzle_data_offset,
-									static_cast<u32>(image_linear_size), layout.width_in_texel, layout.height_in_texel, layout.depth);
-							}
-						}
-						else
-						{
-							if (op.element_size == 4) [[ likely ]]
-							{
-								do_deswizzle_transformation<u32, false>(cmd, block_size,
-									&g_compute_decode_buffer.get(), compute_scratch_mem.second, &g_deswizzle_scratch_buffer.get(), deswizzle_data_offset,
-									static_cast<u32>(image_linear_size), layout.width_in_texel, layout.height_in_texel, layout.depth);
-							}
-							else
-							{
-								do_deswizzle_transformation<u16, false>(cmd, block_size,
-									&g_compute_decode_buffer.get(), compute_scratch_mem.second, &g_deswizzle_scratch_buffer.get(), deswizzle_data_offset,
-									static_cast<u32>(image_linear_size), layout.width_in_texel, layout.height_in_texel, layout.depth);
-							}
-						}
-
-						// Barrier
-						g_deswizzle_scratch_buffer.push_barrier(deswizzle_data_offset, static_cast<u32>(image_linear_size));
-					}
-
-					// 3. Update configuration
+					// 3. Dispatch compute routines
 					mem_info.image_size_in_texels = image_linear_size / block_size_in_bytes;
 					mem_info.image_size_in_bytes = image_linear_size;
 					mem_info.memory_required = 0;
-
-					// 4. Dispatch compute routines
-					copy_buffer_to_image(cmd, mem_layout, &g_compute_decode_buffer.get(), dst, compute_scratch_mem.first, layout.level, region, &mem_info);
-
-					// Barrier
-					g_compute_decode_buffer.push_barrier(compute_scratch_mem.second, static_cast<u32>(image_linear_size));
+					copy_buffer_to_image(mem_layout, &compute_scratch_mem, dst, nullptr, layout.level, region, & mem_info);
 				}
 				else
 				{
-					unpack_settings.swap_bytes(op.require_swap);
+					if (apply_settings)
+					{
+						unpack_settings.swap_bytes(op.require_swap);
+						apply_settings = false;
+					}
+
 					dst->copy_from(out_pointer, static_cast<texture::format>(gl_format), static_cast<texture::type>(gl_type), layout.level, region, unpack_settings);
 				}
 			}
+
+			if (use_compute_transform)
+			{
+				upload_scratch_mem.remove();
+				compute_scratch_mem.remove();
+			}
 		}
 	}
 
-	std::array<GLenum, 4> apply_swizzle_remap(const std::array<GLenum, 4>& swizzle_remap, const rsx::texture_channel_remap_t& decoded_remap)
+	std::array<GLenum, 4> apply_swizzle_remap(const std::array<GLenum, 4>& swizzle_remap, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& decoded_remap)
 	{
-		return decoded_remap.remap<GLenum>(swizzle_remap, GL_ZERO, GL_ONE);
+		//Remapping tables; format is A-R-G-B
+		//Remap input table. Contains channel index to read color from
+		const auto remap_inputs = decoded_remap.first;
+
+		//Remap control table. Controls whether the remap value is used, or force either 0 or 1
+		const auto remap_lookup = decoded_remap.second;
+
+		std::array<GLenum, 4> remap_values;
+
+		for (u8 channel = 0; channel < 4; ++channel)
+		{
+			switch (remap_lookup[channel])
+			{
+			default:
+				rsx_log.error("Unknown remap function 0x%X", remap_lookup[channel]);
+				[[fallthrough]];
+			case CELL_GCM_TEXTURE_REMAP_REMAP:
+				remap_values[channel] = swizzle_remap[remap_inputs[channel]];
+				break;
+			case CELL_GCM_TEXTURE_REMAP_ZERO:
+				remap_values[channel] = GL_ZERO;
+				break;
+			case CELL_GCM_TEXTURE_REMAP_ONE:
+				remap_values[channel] = GL_ONE;
+				break;
+			}
+		}
+
+		return remap_values;
 	}
 
-	void upload_texture(gl::command_context& cmd, texture* dst, u32 gcm_format, bool is_swizzled, const std::vector<rsx::subresource_layout>& subresources_layout)
+	void upload_texture(texture* dst, u32 gcm_format, bool is_swizzled, const std::vector<rsx::subresource_layout>& subresources_layout)
 	{
 		// Calculate staging buffer size
-		rsx::simple_array<std::byte> data_upload_buf;
-
-		rsx::texture_uploader_capabilities caps { .supports_dxt = gl::get_driver_caps().EXT_texture_compression_s3tc_supported };
-		if (rsx::is_compressed_host_format(caps, gcm_format))
-		{
-			const auto& desc = subresources_layout[0];
-			const u32 texture_data_sz = desc.width_in_block * desc.height_in_block * desc.depth * rsx::get_format_block_size_in_bytes(gcm_format);
-			data_upload_buf.resize(texture_data_sz);
-		}
-		else
-		{
-			const auto aligned_pitch = utils::align<u32>(dst->pitch(), 4);
-			const u32 texture_data_sz = dst->depth() * dst->height() * aligned_pitch;
-			data_upload_buf.resize(texture_data_sz);
-		}
+		const u32 aligned_pitch = utils::align<u32>(dst->pitch(), 4);
+		usz texture_data_sz = dst->depth() * dst->height() * aligned_pitch;
+		std::vector<std::byte> data_upload_buf(texture_data_sz);
 
 		// TODO: GL drivers support byteswapping and this should be used instead of doing so manually
 		const auto format_type = get_format_type(gcm_format);
 		const GLenum gl_format = std::get<0>(format_type);
 		const GLenum gl_type = std::get<1>(format_type);
-		fill_texture(cmd, dst, gcm_format, subresources_layout, is_swizzled, gl_format, gl_type, data_upload_buf);
-
-		// Notify the renderer of the upload
-		auto renderer = static_cast<GLGSRender*>(rsx::get_current_renderer());
-		renderer->on_guest_texture_read();
+		fill_texture(dst, gcm_format, subresources_layout, is_swizzled, gl_format, gl_type, data_upload_buf);
 	}
 
 	u32 get_format_texel_width(GLenum format)
@@ -853,7 +803,6 @@ namespace gl
 		case GL_RG16:
 		case GL_RG16F:
 		case GL_RGBA8:
-		case GL_BGRA8:
 		case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
 		case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
 		case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
@@ -867,7 +816,6 @@ namespace gl
 		case GL_RGBA32F:
 			return 16;
 		case GL_DEPTH_COMPONENT16:
-		case GL_DEPTH_COMPONENT32F:
 			return 2;
 		case GL_DEPTH24_STENCIL8:
 		case GL_DEPTH32F_STENCIL8:
@@ -881,40 +829,31 @@ namespace gl
 	{
 		switch (format)
 		{
-			// 8-bit
 		case GL_R8:
-			return { false, 1 };
-		case GL_RGBA8:
-		case GL_BGRA8:
-			return { true, 4 };
-			// 16-bit
 		case GL_RG8:
+		case GL_RGBA8:
+			return { false, 1 };
+		case GL_R16:
 		case GL_RG16:
 		case GL_RG16F:
-		case GL_R16:
 		case GL_RGB565:
+		case GL_RGBA16F:
 			return { true, 2 };
-			// 32-bit
 		case GL_R32F:
 		case GL_RGBA32F:
 			return { true, 4 };
-			// DXT
 		case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
 		case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
 		case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-			return { false, 1 };
-			// Depth
+			return { false, 4 };
 		case GL_DEPTH_COMPONENT16:
-		case GL_DEPTH_COMPONENT32F:
 			return { true, 2 };
 		case GL_DEPTH24_STENCIL8:
 		case GL_DEPTH32F_STENCIL8:
 			return { true, 4 };
 		default:
-			break;
+			fmt::throw_exception("Unexpected internal format 0x%X", static_cast<u32>(format));
 		}
-
-		fmt::throw_exception("Unexpected internal format 0x%X", static_cast<u32>(format));
 	}
 
 	bool formats_are_bitcast_compatible(GLenum format1, GLenum format2)
@@ -929,11 +868,6 @@ namespace gl
 		// 2. Both formats require no transforms (basic memcpy) or...
 		// 3. Both formats have the same transform (e.g RG16_UNORM to RG16_SFLOAT, both are down and uploaded with a 2-byte byteswap)
 
-		if (format1 == GL_BGRA8 || format2 == GL_BGRA8)
-		{
-			return false;
-		}
-
 		if (get_format_texel_width(format1) != get_format_texel_width(format2))
 		{
 			return false;
@@ -950,19 +884,7 @@ namespace gl
 		return false;
 	}
 
-	bool formats_are_bitcast_compatible(const texture* texture1, const texture* texture2)
-	{
-		if (const u32 transfer_class = texture1->format_class() | texture2->format_class();
-			transfer_class > RSX_FORMAT_CLASS_COLOR)
-		{
-			// If any one of the two images is a depth format, the other must match exactly or bust
-			return (texture1->format_class() == texture2->format_class());
-		}
-
-		return formats_are_bitcast_compatible(static_cast<GLenum>(texture1->get_internal_format()), static_cast<GLenum>(texture2->get_internal_format()));
-	}
-
-	void copy_typeless(gl::command_context& cmd, texture * dst, const texture * src, const coord3u& dst_region, const coord3u& src_region)
+	void copy_typeless(texture * dst, const texture * src, const coord3u& dst_region, const coord3u& src_region)
 	{
 		const auto src_bpp = src->pitch() / src->width();
 		const auto dst_bpp = dst->pitch() / dst->width();
@@ -1002,25 +924,8 @@ namespace gl
 				unpack_info.swap_bytes = false;
 			}
 
-			u32 scratch_offset = 0;
-			const u64 min_storage_requirement = src_mem.image_size_in_bytes + dst_mem.image_size_in_bytes;
-			const u64 min_required_buffer_size = utils::align(min_storage_requirement, 256);
-
-			if (g_typeless_transfer_buffer.size() >= min_required_buffer_size) [[ likely ]]
-			{
-				scratch_offset = g_typeless_transfer_buffer.alloc(static_cast<u32>(min_storage_requirement), 256);
-			}
-			else
-			{
-				const auto new_size = std::max(min_required_buffer_size, g_typeless_transfer_buffer.size() + (64 * 0x100000));
-				g_typeless_transfer_buffer.create(gl::buffer::target::ssbo, new_size);
-			}
-
-			void* data_ptr = copy_image_to_buffer(cmd, pack_info, src, &g_typeless_transfer_buffer.get(), scratch_offset, 0, src_region, &src_mem);
-			copy_buffer_to_image(cmd, unpack_info, &g_typeless_transfer_buffer.get(), dst, data_ptr, 0, dst_region, &dst_mem);
-
-			// Not truly range-accurate, but should cover most of what we care about
-			g_typeless_transfer_buffer.push_barrier(scratch_offset, static_cast<u32>(min_storage_requirement));
+			void* data_ptr = copy_image_to_buffer(pack_info, src, &g_typeless_transfer_buffer, 0, src_region, &src_mem);
+			copy_buffer_to_image(unpack_info, &g_typeless_transfer_buffer, dst, data_ptr, 0, dst_region, &dst_mem);
 
 			// Cleanup
 			// NOTE: glBindBufferRange also binds the buffer to the old-school target.
@@ -1032,10 +937,10 @@ namespace gl
 		else
 		{
 			const u64 max_mem = std::max(src_mem.image_size_in_bytes, dst_mem.image_size_in_bytes);
-			if (max_mem > static_cast<u64>(g_typeless_transfer_buffer.size()))
+			if (!g_typeless_transfer_buffer || max_mem > static_cast<u64>(g_typeless_transfer_buffer.size()))
 			{
-				g_typeless_transfer_buffer.remove();
-				g_typeless_transfer_buffer.create(buffer::target::pixel_pack, max_mem);
+				if (g_typeless_transfer_buffer) g_typeless_transfer_buffer.remove();
+				g_typeless_transfer_buffer.create(buffer::target::pixel_pack, max_mem, nullptr, buffer::memory_type::local, GL_STATIC_COPY);
 			}
 
 			// Simplify pack/unpack information to something OpenGL can natively digest
@@ -1092,7 +997,7 @@ namespace gl
 			pixel_pack_settings pack_settings{};
 			pack_settings.swap_bytes(pack_info.swap_bytes);
 
-			g_typeless_transfer_buffer.get().bind(buffer::target::pixel_pack);
+			g_typeless_transfer_buffer.bind(buffer::target::pixel_pack);
 			src->copy_to(nullptr, static_cast<texture::format>(pack_info.format), static_cast<texture::type>(pack_info.type), 0, src_region, pack_settings);
 
 			glBindBuffer(GL_PIXEL_PACK_BUFFER, GL_NONE);
@@ -1101,46 +1006,16 @@ namespace gl
 			pixel_unpack_settings unpack_settings{};
 			unpack_settings.swap_bytes(unpack_info.swap_bytes);
 
-			g_typeless_transfer_buffer.get().bind(buffer::target::pixel_unpack);
+			g_typeless_transfer_buffer.bind(buffer::target::pixel_unpack);
 			dst->copy_from(nullptr, static_cast<texture::format>(unpack_info.format), static_cast<texture::type>(unpack_info.type), 0, dst_region, unpack_settings);
 			glBindBuffer(GL_PIXEL_UNPACK_BUFFER, GL_NONE);
 		}
 	}
 
-	void copy_typeless(gl::command_context& cmd, texture* dst, const texture* src)
+	void copy_typeless(texture* dst, const texture* src)
 	{
 		const coord3u src_area = { {}, src->size3D() };
 		const coord3u dst_area = { {}, dst->size3D() };
-		copy_typeless(cmd, dst, src, dst_area, src_area);
-	}
-
-	void clear_attachments(gl::command_context& cmd, const clear_cmd_info& info)
-	{
-		// Compile the clear command at the end. Other intervening operations will
-		GLbitfield clear_mask = 0;
-		if (info.aspect_mask & gl::image_aspect::color)
-		{
-			for (u32 buffer_id = 0; buffer_id < info.clear_color.attachment_count; ++buffer_id)
-			{
-				cmd->color_maski(buffer_id, info.clear_color.mask);
-			}
-
-			cmd->clear_color(info.clear_color.r, info.clear_color.g, info.clear_color.b, info.clear_color.a);
-			clear_mask |= GL_COLOR_BUFFER_BIT;
-		}
-		if (info.aspect_mask & gl::image_aspect::depth)
-		{
-			cmd->depth_mask(GL_TRUE);
-			cmd->clear_depth(info.clear_depth.value);
-			clear_mask |= GL_DEPTH_BUFFER_BIT;
-		}
-		if (info.aspect_mask & gl::image_aspect::stencil)
-		{
-			cmd->stencil_mask(info.clear_stencil.mask);
-			cmd->clear_stencil(info.clear_stencil.value);
-			clear_mask |= GL_STENCIL_BUFFER_BIT;
-		}
-
-		glClear(clear_mask);
+		copy_typeless(dst, src, dst_area, src_area);
 	}
 }
diff --git a/rpcs3/Emu/RSX/GL/GLTexture.h b/rpcs3/Emu/RSX/GL/GLTexture.h
index dc6d90098a..2e360683a1 100644
--- a/rpcs3/Emu/RSX/GL/GLTexture.h
+++ b/rpcs3/Emu/RSX/GL/GLTexture.h
@@ -1,9 +1,12 @@
 #pragma once
 
 #include "OpenGL.h"
+#include "../GCM.h"
 #include "../Common/TextureUtils.h"
 #include "GLHelpers.h"
 
+#include <unordered_map>
+
 namespace rsx
 {
 	class vertex_texture;
@@ -18,7 +21,6 @@ namespace gl
 		GLenum type;
 		u8     size;
 		bool   swap_bytes;
-		u8     alignment;
 	};
 
 	struct image_memory_requirements
@@ -28,61 +30,99 @@ namespace gl
 		u64 memory_required;
 	};
 
-	struct clear_cmd_info
-	{
-		GLbitfield aspect_mask = 0;
-
-		struct
-		{
-			f32 value;
-		}
-		clear_depth{};
-
-		struct
-		{
-			u8 mask;
-			u8 value;
-		}
-		clear_stencil{};
-
-		struct
-		{
-			u32 mask;
-			u8 attachment_count;
-			u8 r;
-			u8 g;
-			u8 b;
-			u8 a;
-		}
-		clear_color{};
-	};
-
 	GLenum get_target(rsx::texture_dimension_extended type);
 	GLenum get_sized_internal_format(u32 texture_format);
 	std::tuple<GLenum, GLenum> get_format_type(u32 texture_format);
 	pixel_buffer_layout get_format_type(texture::internal_format format);
+	GLenum wrap_mode(rsx::texture_wrap_mode wrap);
+	float max_aniso(rsx::texture_max_anisotropy aniso);
 	std::array<GLenum, 4> get_swizzle_remap(u32 texture_format);
 
 	viewable_image* create_texture(u32 gcm_format, u16 width, u16 height, u16 depth, u16 mipmaps, rsx::texture_dimension_extended type);
 
-	bool formats_are_bitcast_compatible(const texture* texture1, const texture* texture2);
-	void copy_typeless(gl::command_context& cmd, texture* dst, const texture* src, const coord3u& dst_region, const coord3u& src_region);
-	void copy_typeless(gl::command_context& cmd, texture* dst, const texture* src);
+	bool formats_are_bitcast_compatible(GLenum format1, GLenum format2);
+	void copy_typeless(texture* dst, const texture* src, const coord3u& dst_region, const coord3u& src_region);
+	void copy_typeless(texture* dst, const texture* src);
 
-	void* copy_image_to_buffer(gl::command_context& cmd, const pixel_buffer_layout& pack_info, const gl::texture* src, gl::buffer* dst,
-		u32 dst_offset, const int src_level, const coord3u& src_region, image_memory_requirements* mem_info);
+	void* copy_image_to_buffer(const pixel_buffer_layout& pack_info, const gl::texture* src, gl::buffer* dst,
+		const int src_level, const coord3u& src_region, image_memory_requirements* mem_info);
 
-	void copy_buffer_to_image(gl::command_context& cmd, const pixel_buffer_layout& unpack_info, gl::buffer* src, gl::texture* dst,
+	void copy_buffer_to_image(const pixel_buffer_layout& unpack_info, gl::buffer* src, gl::texture* dst,
 		const void* src_offset, const int dst_level, const coord3u& dst_region, image_memory_requirements* mem_info);
 
-	void upload_texture(gl::command_context& cmd, texture* dst, u32 gcm_format, bool is_swizzled, const std::vector<rsx::subresource_layout>& subresources_layout);
+	void upload_texture(texture* dst, u32 gcm_format, bool is_swizzled, const std::vector<rsx::subresource_layout>& subresources_layout);
 
-	void clear_attachments(gl::command_context& cmd, const clear_cmd_info& info);
+	class sampler_state
+	{
+		GLuint samplerHandle = 0;
+		std::unordered_map<GLenum, GLuint> m_propertiesi;
+		std::unordered_map<GLenum, GLfloat> m_propertiesf;
+
+	public:
+
+		void create()
+		{
+			glGenSamplers(1, &samplerHandle);
+		}
+
+		void remove()
+		{
+			glDeleteSamplers(1, &samplerHandle);
+		}
+
+		void bind(int index) const
+		{
+			glBindSampler(index, samplerHandle);
+		}
+
+		void set_parameteri(GLenum pname, GLuint value)
+		{
+			auto prop = m_propertiesi.find(pname);
+			if (prop != m_propertiesi.end() &&
+				prop->second == value)
+			{
+				return;
+			}
+
+			m_propertiesi[pname] = value;
+			glSamplerParameteri(samplerHandle, pname, value);
+		}
+
+		void set_parameterf(GLenum pname, GLfloat value)
+		{
+			auto prop = m_propertiesf.find(pname);
+			if (prop != m_propertiesf.end() &&
+				prop->second == value)
+			{
+				return;
+			}
+
+			m_propertiesf[pname] = value;
+			glSamplerParameterf(samplerHandle, pname, value);
+		}
+
+		GLuint get_parameteri(GLenum pname)
+		{
+			auto prop = m_propertiesi.find(pname);
+			return (prop == m_propertiesi.end()) ? 0 : prop->second;
+		}
+
+		GLfloat get_parameterf(GLenum pname)
+		{
+			auto prop = m_propertiesf.find(pname);
+			return (prop == m_propertiesf.end()) ? 0 : prop->second;
+		}
+
+		void apply(const rsx::fragment_texture& tex, const rsx::sampled_image_descriptor_base* sampled_image);
+		void apply(const rsx::vertex_texture& tex, const rsx::sampled_image_descriptor_base* sampled_image);
+
+		void apply_defaults(GLenum default_filter = GL_NEAREST);
+	};
 
 	namespace debug
 	{
 		extern std::unique_ptr<texture> g_vis_texture;
 	}
 
-	void destroy_global_texture_resources();
+	extern buffer g_typeless_transfer_buffer;
 }
diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.cpp b/rpcs3/Emu/RSX/GL/GLTextureCache.cpp
index f3103dac5c..b7469f9761 100644
--- a/rpcs3/Emu/RSX/GL/GLTextureCache.cpp
+++ b/rpcs3/Emu/RSX/GL/GLTextureCache.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include "Emu/RSX/RSXThread.h"
 #include "GLTexture.h"
 #include "GLTextureCache.h"
 #include "../Common/BufferUtils.h"
@@ -7,48 +8,11 @@
 
 namespace gl
 {
-	static u64 encode_properties(GLenum sized_internal_fmt, GLenum target, u16 width, u16 height, u16 depth, u8 mipmaps)
-	{
-		// Generate cache key
-		// 00..13 = width
-		// 14..27 = height
-		// 28..35 = depth
-		// 36..39 = mipmaps
-		// 40..41 = type
-		// 42..57 = format
-		ensure(((width | height) & ~0x3fff) == 0, "Image dimensions are too large - lower your resolution scale.");
-		ensure(mipmaps <= 13);
-
-		GLuint target_encoding = 0;
-		switch (target)
-		{
-		case GL_TEXTURE_1D:
-			target_encoding = 0; break;
-		case GL_TEXTURE_2D:
-			target_encoding = 1; break;
-		case GL_TEXTURE_3D:
-			target_encoding = 2; break;
-		case GL_TEXTURE_CUBE_MAP:
-			target_encoding = 3; break;
-		default:
-			fmt::throw_exception("Unsupported destination target 0x%x", target);
-		}
-
-		const u64 key =
-			(static_cast<u64>(width) << 0) |
-			(static_cast<u64>(height) << 14) |
-			(static_cast<u64>(depth) << 28) |
-			(static_cast<u64>(mipmaps) << 36) |
-			(static_cast<u64>(target_encoding) << 40) |
-			(static_cast<u64>(sized_internal_fmt) << 42);
-
-		return key;
-	}
-
 	void cached_texture_section::finish_flush()
 	{
 		// Free resources
-		pbo.unmap();
+		glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
+		glBindBuffer(GL_PIXEL_PACK_BUFFER, GL_NONE);
 
 		const auto valid_range = get_confirmed_range_delta();
 		const u32 valid_offset = valid_range.first;
@@ -74,16 +38,16 @@ namespace gl
 				ensure(real_pitch == (width * 4));
 				if (rsx_pitch == real_pitch) [[likely]]
 				{
-					copy_data_swap_u32(static_cast<u32*>(dst), static_cast<u32*>(dst), valid_length / 4);
+					stream_data_to_memory_swapped_u32<true>(dst, dst, valid_length / 4, 4);
 				}
 				else
 				{
 					const u32 num_rows = utils::align(valid_length, rsx_pitch) / rsx_pitch;
-					u32* data = static_cast<u32*>(dst);
+					u8* data = static_cast<u8*>(dst);
 					for (u32 row = 0; row < num_rows; ++row)
 					{
-						copy_data_swap_u32(data, data, width);
-						data += rsx_pitch / 4;
+						stream_data_to_memory_swapped_u32<true>(data, data, width, 4);
+						data += rsx_pitch;
 					}
 				}
 				break;
@@ -97,7 +61,7 @@ namespace gl
 		{
 			// This format is completely worthless to CPU processing algorithms where cache lines on die are linear.
 			// If this is happening, usually it means it was not a planned readback (e.g shared pages situation)
-			rsx_log.trace("[Performance warning] CPU readback of swizzled data");
+			rsx_log.warning("[Performance warning] CPU readback of swizzled data");
 
 			// Read-modify-write to avoid corrupting already resident memory outside texture region
 			std::vector<u8> tmp_data(rsx_pitch * height);
@@ -105,7 +69,6 @@ namespace gl
 
 			switch (type)
 			{
-			case gl::texture::type::uint_8_8_8_8_rev:
 			case gl::texture::type::uint_8_8_8_8:
 			case gl::texture::type::uint_24_8:
 				rsx::convert_linear_swizzle<u32, false>(tmp_data.data(), dst, width, height, rsx_pitch);
@@ -118,9 +81,15 @@ namespace gl
 				rsx_log.error("Unexpected swizzled texture format 0x%x", static_cast<u32>(format));
 			}
 		}
+
+		if (context == rsx::texture_upload_context::framebuffer_storage)
+		{
+			// Update memory tag
+			static_cast<gl::render_target*>(vram_texture)->sync_tag();
+		}
 	}
 
-	gl::texture_view* texture_cache::create_temporary_subresource_impl(gl::command_context& cmd, gl::texture* src, GLenum sized_internal_fmt, GLenum dst_target,
+	gl::texture_view* texture_cache::create_temporary_subresource_impl(gl::command_context& cmd, gl::texture* src, GLenum sized_internal_fmt, GLenum dst_type,
 		u32 gcm_format, u16 x, u16 y, u16 width, u16 height, u16 depth, u8 mipmaps, const rsx::texture_channel_remap_t& remap, bool copy)
 	{
 		if (sized_internal_fmt == GL_NONE)
@@ -128,59 +97,42 @@ namespace gl
 			sized_internal_fmt = gl::get_sized_internal_format(gcm_format);
 		}
 
-		temporary_image_t* dst = nullptr;
-		const auto match_key = encode_properties(sized_internal_fmt, dst_target, width, height, depth, mipmaps);
-
-		// Search image cache
-		for (auto& e : m_temporary_surfaces)
-		{
-			if (e->has_refs())
-			{
-				continue;
-			}
-
-			if (e->properties_encoding == match_key)
-			{
-				dst = e.get();
-				break;
-			}
-		}
-
-		if (!dst)
-		{
-			std::unique_ptr<temporary_image_t> data = std::make_unique<temporary_image_t>(dst_target, width, height, depth, mipmaps, 1, sized_internal_fmt, rsx::classify_format(gcm_format));
-			dst = data.get();
-			dst->properties_encoding = match_key;
-			m_temporary_surfaces.emplace_back(std::move(data));
-		}
-
-		dst->add_ref();
+		std::unique_ptr<gl::texture> dst = std::make_unique<gl::viewable_image>(dst_type, width, height, depth, mipmaps, sized_internal_fmt, rsx::classify_format(gcm_format));
 
 		if (copy)
 		{
 			std::vector<copy_region_descriptor> region =
 			{{
-				.src = src,
-				.xform = rsx::surface_transform::coordinate_transform,
-				.src_x = x,
-				.src_y = y,
-				.src_w = width,
-				.src_h = height,
-				.dst_w = width,
-				.dst_h = height
+				src,
+				rsx::surface_transform::coordinate_transform,
+				0,
+				x, y, 0, 0, 0,
+				width, height, width, height
 			}};
 
-			copy_transfer_regions_impl(cmd, dst, region);
+			copy_transfer_regions_impl(cmd, dst.get(), region);
 		}
 
+		std::array<GLenum, 4> swizzle;
 		if (!src || static_cast<GLenum>(src->get_internal_format()) != sized_internal_fmt)
 		{
 			// Apply base component map onto the new texture if a data cast has been done
-			auto components = get_component_mapping(gcm_format, rsx::component_order::default_);
-			dst->set_native_component_layout(components);
+			swizzle = get_component_mapping(gcm_format, rsx::component_order::default_);
+		}
+		else
+		{
+			swizzle = src->get_native_component_layout();
 		}
 
-		return dst->get_view(remap);
+		if (memcmp(remap.first.data(), rsx::default_remap_vector.first.data(), 4) ||
+			memcmp(remap.second.data(), rsx::default_remap_vector.second.data(), 4))
+			swizzle = apply_swizzle_remap(swizzle, remap);
+
+		auto view = std::make_unique<gl::texture_view>(dst.get(), dst_type, sized_internal_fmt, swizzle.data());
+		auto result = view.get();
+
+		m_temporary_surfaces.emplace_back(dst, view);
+		return result;
 	}
 
 	void texture_cache::copy_transfer_regions_impl(gl::command_context& cmd, gl::texture* dst_image, const std::vector<copy_region_descriptor>& sources) const
@@ -191,12 +143,10 @@ namespace gl
 		for (const auto &slice : sources)
 		{
 			if (!slice.src)
-			{
 				continue;
-			}
 
-			const bool typeless = !formats_are_bitcast_compatible(slice.src, dst_image);
-			ensure(typeless || dst_aspect == slice.src->aspect());
+			const bool typeless = dst_aspect != slice.src->aspect() ||
+				!formats_are_bitcast_compatible(static_cast<GLenum>(slice.src->get_internal_format()), static_cast<GLenum>(dst_image->get_internal_format()));
 
 			std::unique_ptr<gl::texture> tmp;
 			auto src_image = slice.src;
@@ -222,12 +172,7 @@ namespace gl
 			{
 				const auto src_bpp = slice.src->pitch() / slice.src->width();
 				const u16 convert_w = u16(slice.src->width() * src_bpp) / dst_bpp;
-				tmp = std::make_unique<texture>(
-					GL_TEXTURE_2D,
-					convert_w, slice.src->height(),
-					1, 1, 1,
-					static_cast<GLenum>(dst_image->get_internal_format()),
-					dst_image->format_class());
+				tmp = std::make_unique<texture>(GL_TEXTURE_2D, convert_w, slice.src->height(), 1, 1, static_cast<GLenum>(dst_image->get_internal_format()));
 
 				src_image = tmp.get();
 
@@ -241,14 +186,14 @@ namespace gl
 					// Combine the two transfers into one
 					const coord3u src_region = { { src_x, src_y, 0 }, { src_w, src_h, 1 } };
 					const coord3u dst_region = { { slice.dst_x, slice.dst_y, slice.dst_z }, { slice.dst_w, slice.dst_h, 1 } };
-					gl::copy_typeless(cmd, dst_image, slice.src, dst_region, src_region);
+					gl::copy_typeless(dst_image, slice.src, dst_region, src_region);
 
 					continue;
 				}
 
 				const coord3u src_region = { { src_x, src_y, 0 }, { src_w, src_h, 1 } };
 				const coord3u dst_region = { { src_x2, src_y, 0 }, { src_w2, src_h, 1 } };
-				gl::copy_typeless(cmd, src_image, slice.src, dst_region, src_region);
+				gl::copy_typeless(src_image, slice.src, dst_region, src_region);
 
 				src_x = src_x2;
 				src_w = src_w2;
@@ -256,41 +201,36 @@ namespace gl
 
 			if (src_w == slice.dst_w && src_h == slice.dst_h)
 			{
-				gl::g_hw_blitter->copy_image(cmd, src_image, dst_image, 0, slice.level,
-					position3i{ src_x, src_y, 0 },
-					position3i{ slice.dst_x, slice.dst_y, slice.dst_z },
-					size3i{ src_w, src_h, 1 });
+				glCopyImageSubData(src_image->id(), GL_TEXTURE_2D, 0, src_x, src_y, 0,
+					dst_image->id(), static_cast<GLenum>(dst_image->get_target()), slice.level, slice.dst_x, slice.dst_y, slice.dst_z, src_w, src_h, 1);
 			}
 			else
 			{
+				ensure(dst_image->get_target() == gl::texture::target::texture2D);
+
 				auto _blitter = gl::g_hw_blitter;
 				const areai src_rect = { src_x, src_y, src_x + src_w, src_y + src_h };
 				const areai dst_rect = { slice.dst_x, slice.dst_y, slice.dst_x + slice.dst_w, slice.dst_y + slice.dst_h };
 
-				gl::texture* _dst = dst_image;
-				if (src_image->get_internal_format() != dst_image->get_internal_format() ||
-					slice.level != 0 ||
-					slice.dst_z != 0) [[ unlikely ]]
+				gl::texture* _dst;
+				if (src_image->get_internal_format() == dst_image->get_internal_format() && slice.level == 0)
 				{
-					tmp = std::make_unique<texture>(
-						GL_TEXTURE_2D,
-						dst_rect.x2, dst_rect.y2,
-						1, 1, 1,
-						static_cast<GLenum>(slice.src->get_internal_format()),
-						slice.src->format_class());
-
+					_dst = dst_image;
+				}
+				else
+				{
+					tmp = std::make_unique<texture>(GL_TEXTURE_2D, dst_rect.x2, dst_rect.y2, 1, 1, static_cast<GLenum>(slice.src->get_internal_format()));
 					_dst = tmp.get();
 				}
 
-				_blitter->scale_image(cmd, src_image, _dst, src_rect, dst_rect, false, {});
+				_blitter->scale_image(cmd, src_image, _dst,
+					src_rect, dst_rect, false, {});
 
 				if (_dst != dst_image)
 				{
 					// Data cast comes after scaling
-					gl::g_hw_blitter->copy_image(cmd, tmp.get(), dst_image, 0, slice.level,
-						position3i{slice.dst_x, slice.dst_y, 0},
-						position3i{slice.dst_x, slice.dst_y, slice.dst_z},
-						size3i{slice.dst_w, slice.dst_h, 1});
+					glCopyImageSubData(tmp->id(), GL_TEXTURE_2D, 0, slice.dst_x, slice.dst_y, 0,
+						dst_image->id(), static_cast<GLenum>(dst_image->get_target()), slice.level, slice.dst_x, slice.dst_y, slice.dst_z, slice.dst_w, slice.dst_h, 1);
 				}
 			}
 		}
diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.h b/rpcs3/Emu/RSX/GL/GLTextureCache.h
index f3b37e7f27..772b7ee21b 100644
--- a/rpcs3/Emu/RSX/GL/GLTextureCache.h
+++ b/rpcs3/Emu/RSX/GL/GLTextureCache.h
@@ -1,10 +1,8 @@
 #pragma once
 
-#include "Emu/RSX/GL/GLTexture.h"
-#include "GLRenderTargets.h"
-#include "glutils/blitter.h"
-#include "glutils/sync.hpp"
+#include "util/types.hpp"
 
+#include "GLRenderTargets.h"
 #include "../Common/texture_cache.h"
 
 #include <memory>
@@ -14,6 +12,10 @@ class GLGSRender;
 
 namespace gl
 {
+	class blitter;
+
+	extern blitter* g_hw_blitter;
+
 	class cached_texture_section;
 	class texture_cache;
 
@@ -27,7 +29,6 @@ namespace gl
 		using image_view_type         = gl::texture_view*;
 		using image_storage_type      = gl::texture;
 		using texture_format          = gl::texture::format;
-		using viewable_image_type     = gl::viewable_image*;
 	};
 
 	class cached_texture_section : public rsx::cached_texture_section<gl::cached_texture_section, gl::texture_cache_traits>
@@ -59,34 +60,21 @@ namespace gl
 				pbo.remove();
 			}
 
-			pbo.create(buffer::target::pixel_pack, buffer_size, nullptr, buffer::memory_type::host_visible, buffer::usage::host_read);
+			pbo.create(buffer::target::pixel_pack, buffer_size, nullptr, buffer::memory_type::host_visible, GL_STREAM_READ);
 			glBindBuffer(GL_PIXEL_PACK_BUFFER, GL_NONE);
 		}
 
 	public:
 		using baseclass::cached_texture_section;
 
-		void create(u16 w, u16 h, u16 depth, u16 mipmaps, gl::texture* image, u32 rsx_pitch, bool managed,
+		void create(u16 w, u16 h, u16 depth, u16 mipmaps, gl::texture* image, u32 rsx_pitch, bool read_only,
 				gl::texture::format gl_format = gl::texture::format::rgba, gl::texture::type gl_type = gl::texture::type::ubyte, bool swap_bytes = false)
 		{
 			auto new_texture = static_cast<gl::viewable_image*>(image);
 			ensure(!exists() || !is_managed() || vram_texture == new_texture);
-
-			if (vram_texture != new_texture && !managed_texture && get_protection() == utils::protection::no)
-			{
-				// In-place image swap, still locked. Likely a color buffer that got rebound as depth buffer or vice-versa.
-				gl::as_rtt(vram_texture)->on_swap_out();
-
-				if (!managed)
-				{
-					// Incoming is also an external resource, reference it immediately
-					gl::as_rtt(image)->on_swap_in(is_locked());
-				}
-			}
-
 			vram_texture = new_texture;
 
-			if (managed)
+			if (read_only)
 			{
 				managed_texture.reset(vram_texture);
 			}
@@ -148,7 +136,7 @@ namespace gl
 			}
 		}
 
-		void dma_transfer(gl::command_context& cmd, gl::texture* src, const areai& /*src_area*/, const utils::address_range32& /*valid_range*/, u32 pitch)
+		void dma_transfer(gl::command_context& /*cmd*/, gl::texture* src, const areai& /*src_area*/, const utils::address_range& /*valid_range*/, u32 pitch)
 		{
 			init_buffer(src);
 			glGetError();
@@ -193,7 +181,7 @@ namespace gl
 							mem_info.image_size_in_bytes *= 2;
 						}
 
-						void* out_offset = copy_image_to_buffer(cmd, pack_info, src, &scratch_mem, 0, 0, { {}, src->size3D() }, &mem_info);
+						void* out_offset = copy_image_to_buffer(pack_info, src, &scratch_mem, 0, { {}, src->size3D() }, &mem_info);
 
 						glBindBuffer(GL_SHADER_STORAGE_BUFFER, GL_NONE);
 						glMemoryBarrier(GL_BUFFER_UPDATE_BARRIER_BIT);
@@ -247,7 +235,7 @@ namespace gl
 
 			m_fence.reset();
 			synchronized = true;
-			sync_timestamp = rsx::get_shared_tag();
+			sync_timestamp = get_system_time();
 		}
 
 		void copy_texture(gl::command_context& cmd, bool miss)
@@ -263,24 +251,28 @@ namespace gl
 				baseclass::on_miss();
 			}
 
-			gl::texture* target_texture = vram_texture;
-			u32 transfer_width = width;
-			u32 transfer_height = height;
-
 			if (context == rsx::texture_upload_context::framebuffer_storage)
 			{
-				auto surface = gl::as_rtt(vram_texture);
-				surface->memory_barrier(cmd, rsx::surface_access::transfer_read);
-				target_texture = surface->get_surface(rsx::surface_access::transfer_read);
-				transfer_width *= surface->samples_x;
-				transfer_height *= surface->samples_y;
+				auto as_rtt = static_cast<gl::render_target*>(vram_texture);
+				if (as_rtt->dirty()) as_rtt->read_barrier(cmd);
 			}
 
+			gl::texture* target_texture = vram_texture;
 			if ((rsx::get_resolution_scale_percent() != 100 && context == rsx::texture_upload_context::framebuffer_storage) ||
 				(vram_texture->pitch() != rsx_pitch))
 			{
+				u32 real_width = width;
+				u32 real_height = height;
+
+				if (context == rsx::texture_upload_context::framebuffer_storage)
+				{
+					auto surface = gl::as_rtt(vram_texture);
+					real_width *= surface->samples_x;
+					real_height *= surface->samples_y;
+				}
+
 				areai src_area = { 0, 0, 0, 0 };
-				const areai dst_area = { 0, 0, static_cast<s32>(transfer_width), static_cast<s32>(transfer_height) };
+				const areai dst_area = { 0, 0, static_cast<s32>(real_width), static_cast<s32>(real_height) };
 
 				auto ifmt = vram_texture->get_internal_format();
 				src_area.x2 = vram_texture->width();
@@ -291,22 +283,22 @@ namespace gl
 					if (scaled_texture)
 					{
 						auto sfmt = scaled_texture->get_internal_format();
-						if (scaled_texture->width() != transfer_width ||
-							scaled_texture->height() != transfer_height ||
+						if (scaled_texture->width() != real_width ||
+							scaled_texture->height() != real_height ||
 							sfmt != ifmt)
 						{
-							// Discard current scaled texture
+							//Discard current scaled texture
 							scaled_texture.reset();
 						}
 					}
 
 					if (!scaled_texture)
 					{
-						scaled_texture = std::make_unique<gl::texture>(GL_TEXTURE_2D, transfer_width, transfer_height, 1, 1, 1, static_cast<GLenum>(ifmt), vram_texture->format_class());
+						scaled_texture = std::make_unique<gl::texture>(GL_TEXTURE_2D, real_width, real_height, 1, 1, static_cast<GLenum>(ifmt));
 					}
 
 					const bool linear_interp = is_depth_texture() ? false : true;
-					g_hw_blitter->scale_image(cmd, target_texture, scaled_texture.get(), src_area, dst_area, linear_interp, {});
+					g_hw_blitter->scale_image(cmd, vram_texture, scaled_texture.get(), src_area, dst_area, linear_interp, {});
 					target_texture = scaled_texture.get();
 				}
 			}
@@ -324,7 +316,9 @@ namespace gl
 			m_fence.wait_for_signal();
 
 			ensure(offset + GLsizeiptr{size} <= pbo.size());
-			return pbo.map(offset, size, gl::buffer::access::read);
+			pbo.bind(buffer::target::pixel_pack);
+
+			return glMapBufferRange(GL_PIXEL_PACK_BUFFER, offset, size, GL_MAP_READ_BIT);
 		}
 
 		void finish_flush();
@@ -382,29 +376,52 @@ namespace gl
 			return format;
 		}
 
-		gl::texture_view* get_view(const rsx::texture_channel_remap_t& remap)
+		bool is_flushed() const
 		{
-			return vram_texture->get_view(remap);
+			return flushed;
 		}
 
-		gl::viewable_image* get_raw_texture() const
+		bool is_synchronized() const
+		{
+			return synchronized;
+		}
+
+		void set_flushed(bool state)
+		{
+			flushed = state;
+		}
+
+		bool is_empty() const
+		{
+			return vram_texture == nullptr;
+		}
+
+		gl::texture_view* get_view(u32 remap_encoding, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap)
+		{
+			return vram_texture->get_view(remap_encoding, remap);
+		}
+
+		gl::texture* get_raw_texture() const
 		{
 			return managed_texture.get();
 		}
 
-		gl::render_target* get_render_target() const
-		{
-			return gl::as_rtt(vram_texture);
-		}
-
 		gl::texture_view* get_raw_view()
 		{
-			return vram_texture->get_view(rsx::default_remap_vector.with_encoding(GL_REMAP_IDENTITY));
+			return vram_texture->get_view(0xAAE4, rsx::default_remap_vector);
 		}
 
 		bool is_depth_texture() const
 		{
-			return !!(vram_texture->aspect() & gl::image_aspect::depth);
+			switch (vram_texture->get_internal_format())
+			{
+			case gl::texture::internal_format::depth16:
+			case gl::texture::internal_format::depth24_stencil8:
+			case gl::texture::internal_format::depth32f_stencil8:
+				return true;
+			default:
+				return false;
+			}
 		}
 
 		bool has_compatible_format(gl::texture* tex) const
@@ -420,19 +437,36 @@ namespace gl
 		using baseclass = rsx::texture_cache<gl::texture_cache, gl::texture_cache_traits>;
 		friend baseclass;
 
-		struct temporary_image_t : public gl::viewable_image, public rsx::ref_counted
+	private:
+		struct discardable_storage
 		{
-			u64 properties_encoding = 0;
+			std::unique_ptr<gl::texture> image;
+			std::unique_ptr<gl::texture_view> view;
 
-			using gl::viewable_image::viewable_image;
+			discardable_storage() = default;
+
+			discardable_storage(std::unique_ptr<gl::texture>& tex)
+			{
+				image = std::move(tex);
+			}
+
+			discardable_storage(std::unique_ptr<gl::texture_view>& _view)
+			{
+				view = std::move(_view);
+			}
+
+			discardable_storage(std::unique_ptr<gl::texture>& tex, std::unique_ptr<gl::texture_view>& _view)
+			{
+				image = std::move(tex);
+				view = std::move(_view);
+			}
 		};
 
-		blitter m_hw_blitter;
-		std::vector<std::unique_ptr<temporary_image_t>> m_temporary_surfaces;
-
-		const u32 max_cached_image_pool_size = 256;
-
 	private:
+
+		blitter m_hw_blitter;
+		std::vector<discardable_storage> m_temporary_surfaces;
+
 		void clear()
 		{
 			baseclass::clear();
@@ -521,13 +555,13 @@ namespace gl
 
 	protected:
 
-		gl::texture_view* create_temporary_subresource_view(gl::command_context& cmd, gl::texture** src, u32 gcm_format, u16 x, u16 y, u16 w, u16 h,
+		gl::texture_view* create_temporary_subresource_view(gl::command_context &cmd, gl::texture** src, u32 gcm_format, u16 x, u16 y, u16 w, u16 h,
 				const rsx::texture_channel_remap_t& remap_vector) override
 		{
 			return create_temporary_subresource_impl(cmd, *src, GL_NONE, GL_TEXTURE_2D, gcm_format, x, y, w, h, 1, 1, remap_vector, true);
 		}
 
-		gl::texture_view* create_temporary_subresource_view(gl::command_context& cmd, gl::texture* src, u32 gcm_format, u16 x, u16 y, u16 w, u16 h,
+		gl::texture_view* create_temporary_subresource_view(gl::command_context &cmd, gl::texture* src, u32 gcm_format, u16 x, u16 y, u16 w, u16 h,
 				const rsx::texture_channel_remap_t& remap_vector) override
 		{
 			return create_temporary_subresource_impl(cmd, src, static_cast<GLenum>(src->get_internal_format()),
@@ -537,7 +571,7 @@ namespace gl
 		gl::texture_view* generate_cubemap_from_images(gl::command_context& cmd, u32 gcm_format, u16 size, const std::vector<copy_region_descriptor>& sources, const rsx::texture_channel_remap_t& remap_vector) override
 		{
 			auto _template = get_template_from_collection_impl(sources);
-			auto result = create_temporary_subresource_impl(cmd, _template, GL_NONE, GL_TEXTURE_CUBE_MAP, gcm_format, 0, 0, size, size, 1, 1, remap_vector, false);
+			auto result = create_temporary_subresource_impl(cmd, _template, GL_NONE, GL_TEXTURE_3D, gcm_format, 0, 0, size, size, 1, 1, remap_vector, false);
 
 			copy_transfer_regions_impl(cmd, result->image(), sources);
 			return result;
@@ -577,9 +611,10 @@ namespace gl
 		{
 			for (auto& e : m_temporary_surfaces)
 			{
-				if (e.get() == view->image())
+				if (e.image.get() == view->image())
 				{
-					e->release();
+					e.view.reset();
+					e.image.reset();
 					return;
 				}
 			}
@@ -589,18 +624,17 @@ namespace gl
 		{
 			std::vector<copy_region_descriptor> region =
 			{{
-				.src = src,
-				.xform = rsx::surface_transform::identity,
-				.src_w = width,
-				.src_h = height,
-				.dst_w = width,
-				.dst_h = height
+				src,
+				rsx::surface_transform::identity,
+				0,
+				0, 0, 0, 0, 0,
+				width, height, width, height
 			}};
 
 			copy_transfer_regions_impl(cmd, dst->image(), region);
 		}
 
-		cached_texture_section* create_new_texture(gl::command_context& cmd, const utils::address_range32 &rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u32 pitch,
+		cached_texture_section* create_new_texture(gl::command_context &cmd, const utils::address_range &rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch,
 			u32 gcm_format, rsx::texture_upload_context context, rsx::texture_dimension_extended type, bool swizzled, rsx::component_order swizzle_flags, rsx::flags32_t /*flags*/) override
 		{
 			const rsx::image_section_attributes_t search_desc = { .gcm_format = gcm_format, .width = width, .height = height, .depth = depth, .mipmaps = mipmaps };
@@ -675,7 +709,7 @@ namespace gl
 				{
 				case CELL_GCM_TEXTURE_A8R8G8B8:
 				{
-					cached.set_format(gl::texture::format::bgra, gl::texture::type::uint_8_8_8_8_rev, true);
+					cached.set_format(gl::texture::format::bgra, gl::texture::type::uint_8_8_8_8, false);
 					break;
 				}
 				case CELL_GCM_TEXTURE_R5G6B5:
@@ -706,19 +740,14 @@ namespace gl
 			return &cached;
 		}
 
-		cached_texture_section* create_nul_section(
-			gl::command_context& /*cmd*/,
-			const utils::address_range32& rsx_range,
-			const rsx::image_section_attributes_t& attrs,
-			const rsx::GCM_tile_reference& /*tile*/,
-			bool /*memory_load*/) override
+		cached_texture_section* create_nul_section(gl::command_context& /*cmd*/, const utils::address_range& rsx_range, bool /*memory_load*/) override
 		{
 			auto& cached = *find_cached_texture(rsx_range, { .gcm_format = RSX_GCM_FORMAT_IGNORED }, true, false, false);
 			ensure(!cached.is_locked());
 
 			// Prepare section
 			cached.reset(rsx_range);
-			cached.create_dma_only(attrs.width, attrs.height, attrs.pitch);
+			cached.set_context(rsx::texture_upload_context::dma);
 			cached.set_dirty(false);
 
 			no_access_range = cached.get_min_max(no_access_range, rsx::section_bounds::locked_range);
@@ -726,13 +755,13 @@ namespace gl
 			return &cached;
 		}
 
-		cached_texture_section* upload_image_from_cpu(gl::command_context& cmd, const utils::address_range32& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u32 pitch, u32 gcm_format,
+		cached_texture_section* upload_image_from_cpu(gl::command_context &cmd, const utils::address_range& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch, u32 gcm_format,
 			rsx::texture_upload_context context, const std::vector<rsx::subresource_layout>& subresource_layout, rsx::texture_dimension_extended type, bool input_swizzled) override
 		{
 			auto section = create_new_texture(cmd, rsx_range, width, height, depth, mipmaps, pitch, gcm_format, context, type, input_swizzled,
 				rsx::component_order::default_, 0);
 
-			gl::upload_texture(cmd, section->get_raw_texture(), gcm_format, input_swizzled, subresource_layout);
+			gl::upload_texture(section->get_raw_texture(), gcm_format, input_swizzled, subresource_layout);
 
 			section->last_write_tag = rsx::get_shared_tag();
 			return section;
@@ -768,8 +797,8 @@ namespace gl
 			switch (gcm_format)
 			{
 			default:
-				// TODO
-				err_once("Format incompatibility detected, reporting failure to force data copy (GL_INTERNAL_FORMAT=0x%X, GCM_FORMAT=0x%X)", static_cast<u32>(ifmt), gcm_format);
+				//TODO
+				warn_once("Format incompatibility detected, reporting failure to force data copy (GL_INTERNAL_FORMAT=0x%X, GCM_FORMAT=0x%X)", static_cast<u32>(ifmt), gcm_format);
 				return false;
 			case CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT:
 				return (ifmt == gl::texture::internal_format::rgba16f);
@@ -781,7 +810,7 @@ namespace gl
 				return (ifmt == gl::texture::internal_format::rgb565);
 			case CELL_GCM_TEXTURE_A8R8G8B8:
 			case CELL_GCM_TEXTURE_D8R8G8B8:
-				return (ifmt == gl::texture::internal_format::bgra8 ||
+				return (ifmt == gl::texture::internal_format::rgba8 ||
 						ifmt == gl::texture::internal_format::depth24_stencil8 ||
 						ifmt == gl::texture::internal_format::depth32f_stencil8);
 			case CELL_GCM_TEXTURE_B8:
@@ -856,15 +885,12 @@ namespace gl
 				purge_unreleased_sections();
 			}
 
-			if (m_temporary_surfaces.size() > max_cached_image_pool_size)
-			{
-				m_temporary_surfaces.resize(max_cached_image_pool_size / 2);
-			}
+			clear_temporary_subresources();
 
 			baseclass::on_frame_end();
 		}
 
-		bool blit(gl::command_context& cmd, const rsx::blit_src_info& src, const rsx::blit_dst_info& dst, bool linear_interpolate, gl_render_targets& m_rtts)
+		bool blit(gl::command_context &cmd, rsx::blit_src_info& src, rsx::blit_dst_info& dst, bool linear_interpolate, gl_render_targets& m_rtts)
 		{
 			auto result = upload_scaled_image(src, dst, linear_interpolate, cmd, m_rtts, m_hw_blitter);
 
diff --git a/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp b/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp
index 6d39b7c6b8..72a1984c9f 100644
--- a/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp
+++ b/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp
@@ -127,7 +127,7 @@ namespace
 		vertex_input_state operator()(const rsx::draw_inlined_array& /*command*/)
 		{
 			const auto stream_length = rsx::method_registers.current_draw_clause.inline_vertex_array.size();
-			const u32 vertex_count = u32(stream_length * sizeof(u32)) / m_vertex_layout.interleaved_blocks[0]->attribute_stride;
+			const u32 vertex_count = u32(stream_length * sizeof(u32)) / m_vertex_layout.interleaved_blocks[0].attribute_stride;
 
 			if (!gl::is_primitive_native(rsx::method_registers.current_draw_clause.primitive))
 			{
@@ -153,7 +153,7 @@ gl::vertex_upload_info GLGSRender::set_vertex_buffer()
 	m_profiler.start();
 
 	//Write index buffers and count verts
-	auto result = std::visit(draw_command_visitor(*m_index_ring_buffer, m_vertex_layout), m_draw_processor.get_draw_command(rsx::method_registers));
+	auto result = std::visit(draw_command_visitor(*m_index_ring_buffer, m_vertex_layout), get_draw_command(rsx::method_registers));
 
 	const u32 vertex_count = (result.max_index - result.min_index) + 1;
 	u32 vertex_base = result.min_index;
@@ -192,10 +192,10 @@ gl::vertex_upload_info GLGSRender::set_vertex_buffer()
 		if (m_vertex_layout.interleaved_blocks.size() == 1 &&
 			rsx::method_registers.current_draw_clause.command != rsx::draw_command::inlined_array)
 		{
-			const auto data_offset = (vertex_base * m_vertex_layout.interleaved_blocks[0]->attribute_stride);
-			storage_address = m_vertex_layout.interleaved_blocks[0]->real_offset_address + data_offset;
+			const auto data_offset = (vertex_base * m_vertex_layout.interleaved_blocks[0].attribute_stride);
+			storage_address = m_vertex_layout.interleaved_blocks[0].real_offset_address + data_offset;
 
-			if (auto cached = m_vertex_cache->find_vertex_range(storage_address, required.first))
+			if (auto cached = m_vertex_cache->find_vertex_range(storage_address, GL_R8UI, required.first))
 			{
 				ensure(cached->local_address == storage_address);
 
@@ -216,7 +216,7 @@ gl::vertex_upload_info GLGSRender::set_vertex_buffer()
 			if (to_store)
 			{
 				//store ref in vertex cache
-				m_vertex_cache->store_range(storage_address, required.first, persistent_mapping.second);
+				m_vertex_cache->store_range(storage_address, GL_R8UI, required.first, persistent_mapping.second);
 			}
 		}
 
@@ -250,7 +250,7 @@ gl::vertex_upload_info GLGSRender::set_vertex_buffer()
 	}
 
 	//Write all the data
-	m_draw_processor.write_vertex_data_to_memory(m_vertex_layout, vertex_base, vertex_count, persistent_mapping.first, volatile_mapping.first);
+	write_vertex_data_to_memory(m_vertex_layout, vertex_base, vertex_count, persistent_mapping.first, volatile_mapping.first);
 
 	m_frame_stats.vertex_upload_time += m_profiler.duration();
 	return upload_info;
diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp
index dfa18d37e6..ee6a4e6660 100644
--- a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp
+++ b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp
@@ -1,11 +1,13 @@
 #include "stdafx.h"
 #include "GLVertexProgram.h"
 
-#include "Emu/system_config.h"
+#include "Emu/System.h"
 
 #include "GLCommonDecompiler.h"
 #include "../Program/GLSLCommon.h"
 
+#include <algorithm>
+
 std::string GLVertexDecompilerThread::getFloatTypeName(usz elementCount)
 {
 	return glsl::getFloatTypeNameImpl(elementCount);
@@ -28,93 +30,47 @@ std::string GLVertexDecompilerThread::compareFunction(COMPARE f, const std::stri
 
 void GLVertexDecompilerThread::insertHeader(std::stringstream &OS)
 {
-	OS <<
-		"#version 430\n"
-		"layout(std140, binding = " << GL_VERTEX_PARAMS_BIND_SLOT << ") uniform VertexContextBuffer\n"
-		"{\n"
-		"	mat4 scale_offset_mat;\n"
-		"	ivec4 user_clip_enabled[2];\n"
-		"	vec4 user_clip_factor[2];\n"
-		"	uint transform_branch_bits;\n"
-		"	float point_size;\n"
-		"	float z_near;\n"
-		"	float z_far;\n"
-		"};\n\n"
+	OS << "#version 430\n";
+	OS << "layout(std140, binding = 0) uniform VertexContextBuffer\n";
+	OS << "{\n";
+	OS << "	mat4 scale_offset_mat;\n";
+	OS << "	ivec4 user_clip_enabled[2];\n";
+	OS << "	vec4 user_clip_factor[2];\n";
+	OS << "	uint transform_branch_bits;\n";
+	OS << "	float point_size;\n";
+	OS << "	float z_near;\n";
+	OS << "	float z_far;\n";
+	OS << "};\n\n";
 
-		"layout(std140, binding = " << GL_VERTEX_LAYOUT_BIND_SLOT << ") uniform VertexLayoutBuffer\n"
-		"{\n"
-		"	uint  vertex_base_index;\n"
-		"	uint  vertex_index_offset;\n"
-		"	uvec4 input_attributes_blob[16 / 2];\n"
-		"};\n\n";
+	OS << "layout(std140, binding = 1) uniform VertexLayoutBuffer\n";
+	OS << "{\n";
+	OS << "	uint  vertex_base_index;\n";
+	OS << "	uint  vertex_index_offset;\n";
+	OS << "	uvec4 input_attributes_blob[16 / 2];\n";
+	OS << "};\n\n";
 }
 
 void GLVertexDecompilerThread::insertInputs(std::stringstream& OS, const std::vector<ParamType>& /*inputs*/)
 {
-	OS << "layout(location=0) uniform usamplerBuffer persistent_input_stream;\n";    // Data stream with persistent vertex data (cacheable)
-	OS << "layout(location=1) uniform usamplerBuffer volatile_input_stream;\n";      // Data stream with per-draw data (registers and immediate draw data)
+	OS << "layout(location=0) uniform usamplerBuffer persistent_input_stream;\n";    //Data stream with persistent vertex data (cacheable)
+	OS << "layout(location=1) uniform usamplerBuffer volatile_input_stream;\n";      //Data stream with per-draw data (registers and immediate draw data)
 }
 
 void GLVertexDecompilerThread::insertConstants(std::stringstream& OS, const std::vector<ParamType>& constants)
 {
+	OS << "layout(std140, binding = 2) uniform VertexConstantsBuffer\n";
+	OS << "{\n";
+	OS << "	vec4 vc[468];\n";
+	OS << "};\n\n";
+
 	for (const ParamType &PT: constants)
 	{
 		for (const ParamItem &PI : PT.items)
 		{
-			if (PI.name.starts_with("vc["))
-			{
-				if (!(m_prog.ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS))
-				{
-					OS <<
-						"layout(std140, binding = " << GL_VERTEX_CONSTANT_BUFFERS_BIND_SLOT << ") uniform VertexConstantsBuffer\n"
-						"{\n"
-						"	vec4 " << PI.name << ";\n"
-						"};\n\n";
-				}
-				else
-				{
-					OS <<
-						"layout(std430, binding = " << GL_INSTANCING_LUT_BIND_SLOT << ") readonly buffer InstancingIndirectionLUT\n"
-						"{\n"
-						"	int constants_addressing_lookup[];\n"
-						"};\n\n"
-
-						"layout(std430, binding = " << GL_INSTANCING_XFORM_CONSTANTS_SLOT << ") readonly buffer InstancingVertexConstantsBlock\n"
-						"{\n"
-						"	vec4 instanced_constants_array[];\n"
-						"};\n\n"
-
-						"#define CONSTANTS_ARRAY_LENGTH " << (properties.has_indexed_constants ? 468 : ::size32(m_constant_ids)) << "\n\n";
-				}
-
+			if (PI.name == "vc[468]")
 				continue;
-			}
 
-			auto type = PT.type;
-
-			if (PT.type == "sampler2D" ||
-				PT.type == "samplerCube" ||
-				PT.type == "sampler1D" ||
-				PT.type == "sampler3D")
-			{
-				if (m_prog.texture_state.multisampled_textures) [[ unlikely ]]
-				{
-					ensure(PI.name.length() > 3);
-					int index = atoi(&PI.name[3]);
-
-					if (m_prog.texture_state.multisampled_textures & (1 << index))
-					{
-						if (type != "sampler1D" && type != "sampler2D")
-						{
-							rsx_log.error("Unexpected multisampled sampler type '%s'", type);
-						}
-
-						type = "sampler2DMS";
-					}
-				}
-			}
-
-			OS << "uniform " << type << " " << PI.name << ";\n";
+			OS << "uniform " << PT.type << " " << PI.name << ";\n";
 		}
 	}
 }
@@ -124,19 +80,19 @@ static const vertex_reg_info reg_table[] =
 	{ "gl_Position", false, "dst_reg0", "", false },
 	{ "diff_color", true, "dst_reg1", "", false, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTDIFFUSE | CELL_GCM_ATTRIB_OUTPUT_MASK_BACKDIFFUSE },
 	{ "spec_color", true, "dst_reg2", "", false, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTSPECULAR | CELL_GCM_ATTRIB_OUTPUT_MASK_BACKSPECULAR },
-	// These are only present when back variants are specified, otherwise the default diff/spec color vars are for both front and back
+	//These are only present when back variants are specified, otherwise the default diff/spec color vars are for both front and back
 	{ "diff_color1", true, "dst_reg3", "", false, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTDIFFUSE | CELL_GCM_ATTRIB_OUTPUT_MASK_BACKDIFFUSE },
 	{ "spec_color1", true, "dst_reg4", "", false, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTSPECULAR | CELL_GCM_ATTRIB_OUTPUT_MASK_BACKSPECULAR },
-	// Fog output shares a data source register with clip planes 0-2 so only declare when specified
+	//Fog output shares a data source register with clip planes 0-2 so only declare when specified
 	{ "fog_c", true, "dst_reg5", ".xxxx", true, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_FOG },
-	// Warning: Always define all 3 clip plane groups together to avoid flickering with openGL
-	{ "gl_ClipDistance[0]", false, "dst_reg5", ".y * user_clip_factor[0].x", false, "user_clip_enabled[0].x > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC0 },
-	{ "gl_ClipDistance[1]", false, "dst_reg5", ".z * user_clip_factor[0].y", false, "user_clip_enabled[0].y > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC1 },
-	{ "gl_ClipDistance[2]", false, "dst_reg5", ".w * user_clip_factor[0].z", false, "user_clip_enabled[0].z > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC2 },
-	{ "gl_PointSize", false, "dst_reg6", ".x", false, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_POINTSIZE },
-	{ "gl_ClipDistance[3]", false, "dst_reg6", ".y * user_clip_factor[0].w", false, "user_clip_enabled[0].w > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC3 },
-	{ "gl_ClipDistance[4]", false, "dst_reg6", ".z * user_clip_factor[1].x", false, "user_clip_enabled[1].x > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC4 },
-	{ "gl_ClipDistance[5]", false, "dst_reg6", ".w * user_clip_factor[1].y", false, "user_clip_enabled[1].y > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC5 },
+	//Warning: Always define all 3 clip plane groups together to avoid flickering with openGL
+	{ "gl_ClipDistance[0]", false, "dst_reg5", ".y * user_clip_factor[0].x", false, "user_clip_enabled[0].x > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC0 | CELL_GCM_ATTRIB_OUTPUT_MASK_UC1 | CELL_GCM_ATTRIB_OUTPUT_MASK_UC2 },
+	{ "gl_ClipDistance[1]", false, "dst_reg5", ".z * user_clip_factor[0].y", false, "user_clip_enabled[0].y > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC0 | CELL_GCM_ATTRIB_OUTPUT_MASK_UC1 | CELL_GCM_ATTRIB_OUTPUT_MASK_UC2 },
+	{ "gl_ClipDistance[2]", false, "dst_reg5", ".w * user_clip_factor[0].z", false, "user_clip_enabled[0].z > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC0 | CELL_GCM_ATTRIB_OUTPUT_MASK_UC1 | CELL_GCM_ATTRIB_OUTPUT_MASK_UC2 },
+	{ "gl_PointSize", false, "dst_reg6", ".x", false, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_POINTSIZE },
+	{ "gl_ClipDistance[3]", false, "dst_reg6", ".y * user_clip_factor[0].w", false, "user_clip_enabled[0].w > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC3 | CELL_GCM_ATTRIB_OUTPUT_MASK_UC4 | CELL_GCM_ATTRIB_OUTPUT_MASK_UC5 },
+	{ "gl_ClipDistance[4]", false, "dst_reg6", ".z * user_clip_factor[1].x", false, "user_clip_enabled[1].x > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC3 | CELL_GCM_ATTRIB_OUTPUT_MASK_UC4 | CELL_GCM_ATTRIB_OUTPUT_MASK_UC5 },
+	{ "gl_ClipDistance[5]", false, "dst_reg6", ".w * user_clip_factor[1].y", false, "user_clip_enabled[1].y > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC3 | CELL_GCM_ATTRIB_OUTPUT_MASK_UC4 | CELL_GCM_ATTRIB_OUTPUT_MASK_UC5 },
 	{ "tc0", true, "dst_reg7", "", false, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_TEX0 },
 	{ "tc1", true, "dst_reg8", "", false, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_TEX1 },
 	{ "tc2", true, "dst_reg9", "", false, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_TEX2 },
@@ -170,9 +126,6 @@ void GLVertexDecompilerThread::insertMainStart(std::stringstream & OS)
 	properties2.require_lit_emulation = properties.has_lit_op;
 	properties2.emulate_zclip_transform = true;
 	properties2.emulate_depth_clip_only = dev_caps.NV_depth_buffer_float_supported;
-	properties2.low_precision_tests = dev_caps.vendor_NVIDIA;
-	properties2.require_explicit_invariance = dev_caps.vendor_MESA || (dev_caps.vendor_NVIDIA && g_cfg.video.shader_precision != gpu_preset_level::low);
-	properties2.require_instanced_render = !!(m_prog.ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS);
 
 	insert_glsl_legacy_function(OS, properties2);
 	glsl::insert_vertex_input_fetch(OS, glsl::glsl_rules_opengl4, dev_caps.vendor_INTEL == false);
@@ -209,7 +162,7 @@ void GLVertexDecompilerThread::insertMainStart(std::stringstream & OS)
 	OS << "void vs_main()\n";
 	OS << "{\n";
 
-	// Declare temporary registers, ignoring those mapped to outputs
+	//Declare temporary registers, ignoring those mapped to outputs
 	for (const ParamType &PT : m_parr.params[PF_PARAM_NONE])
 	{
 		for (const ParamItem &PI : PT.items)
@@ -258,7 +211,7 @@ void GLVertexDecompilerThread::insertMainEnd(std::stringstream & OS)
 				}
 				else
 				{
-					// Insert if-else condition
+					//Insert if-else condition
 					OS << "	" << i.name << " = " << condition << "? " << i.src_reg << i.src_reg_mask << ": " << i.default_val << ";\n";
 				}
 
@@ -282,21 +235,21 @@ void GLVertexDecompilerThread::insertMainEnd(std::stringstream & OS)
 	OS << "	gl_Position = gl_Position * scale_offset_mat;\n";
 	OS << "	gl_Position = apply_zclip_xform(gl_Position, z_near, z_far);\n";
 
-	// Since our clip_space is symmetrical [-1, 1] we map it to linear space using the eqn:
-	// ln = (clip * 2) - 1 to fully utilize the 0-1 range of the depth buffer
-	// RSX matrices passed already map to the [0, 1] range but mapping to classic OGL requires that we undo this step
-	// This can be made unnecessary using the call glClipControl(GL_LOWER_LEFT, GL_ZERO_TO_ONE).
-	// However, ClipControl only made it to opengl core in ver 4.5 though, so this is a workaround.
-	   
-	// NOTE: It is completely valid for games to use very large w values, causing the post-multiplied z to be in the hundreds
-	// It is therefore critical that this step is done post-transform and the result re-scaled by w
-	// SEE Naruto: UNS
-	   
-	// NOTE: On GPUs, poor fp32 precision means dividing z by w, then multiplying by w again gives slightly incorrect results
-	// This equation is simplified algebraically to an addition and subtraction which gives more accurate results (Fixes flickering skybox in Dark Souls 2)
-	// OS << "	float ndc_z = gl_Position.z / gl_Position.w;\n";
-	// OS << "	ndc_z = (ndc_z * 2.) - 1.;\n";
-	// OS << "	gl_Position.z = ndc_z * gl_Position.w;\n";
+	//Since our clip_space is symmetrical [-1, 1] we map it to linear space using the eqn:
+	//ln = (clip * 2) - 1 to fully utilize the 0-1 range of the depth buffer
+	//RSX matrices passed already map to the [0, 1] range but mapping to classic OGL requires that we undo this step
+	//This can be made unnecessary using the call glClipControl(GL_LOWER_LEFT, GL_ZERO_TO_ONE).
+	//However, ClipControl only made it to opengl core in ver 4.5 though, so this is a workaround.
+
+	//NOTE: It is completely valid for games to use very large w values, causing the post-multiplied z to be in the hundreds
+	//It is therefore critical that this step is done post-transform and the result re-scaled by w
+	//SEE Naruto: UNS
+
+	//NOTE: On GPUs, poor fp32 precision means dividing z by w, then multiplying by w again gives slightly incorrect results
+	//This equation is simplified algebraically to an addition and subtraction which gives more accurate results (Fixes flickering skybox in Dark Souls 2)
+	//OS << "	float ndc_z = gl_Position.z / gl_Position.w;\n";
+	//OS << "	ndc_z = (ndc_z * 2.) - 1.;\n";
+	//OS << "	gl_Position.z = ndc_z * gl_Position.w;\n";
 	OS << "	gl_Position.z = (gl_Position.z + gl_Position.z) - gl_Position.w;\n";
 	OS << "}\n";
 }
@@ -319,9 +272,6 @@ void GLVertexProgram::Decompile(const RSXVertexProgram& prog)
 	GLVertexDecompilerThread decompiler(prog, source, parr);
 	decompiler.Task();
 
-	has_indexed_constants = decompiler.properties.has_indexed_constants;
-	constant_ids = std::vector<u16>(decompiler.m_constant_ids.begin(), decompiler.m_constant_ids.end());
-
 	shader.create(::glsl::program_domain::glsl_vertex_program, source);
 	id = shader.id();
 }
diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.h b/rpcs3/Emu/RSX/GL/GLVertexProgram.h
index 631b6ac245..4f61930e46 100644
--- a/rpcs3/Emu/RSX/GL/GLVertexProgram.h
+++ b/rpcs3/Emu/RSX/GL/GLVertexProgram.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "../Program/VertexProgramDecompiler.h"
-#include "glutils/program.h"
+#include "GLHelpers.h"
 
 #include <unordered_map>
 
@@ -49,13 +49,14 @@ public:
 	void Task();
 };
 
-class GLVertexProgram : public rsx::VertexProgramBase
+class GLVertexProgram
 {
 public:
 	GLVertexProgram();
 	~GLVertexProgram();
 
 	ParamArray parr;
+	u32 id;
 	gl::glsl::shader shader;
 
 	void Decompile(const RSXVertexProgram& prog);
diff --git a/rpcs3/Emu/RSX/GL/OpenGL.cpp b/rpcs3/Emu/RSX/GL/OpenGL.cpp
index 78241f557a..599f4ca535 100644
--- a/rpcs3/Emu/RSX/GL/OpenGL.cpp
+++ b/rpcs3/Emu/RSX/GL/OpenGL.cpp
@@ -1,10 +1,6 @@
 #include "stdafx.h"
 #include "OpenGL.h"
 
-#if defined(HAVE_WAYLAND)
-#include <EGL/egl.h>
-#endif
-
 #ifdef _WIN32
 
 extern "C"
@@ -29,7 +25,7 @@ void gl::init()
 #ifdef _WIN32
 #define OPENGL_PROC(p, n) OPENGL_PROC2(p, gl##n, gl##n)
 #define WGL_PROC(p, n) OPENGL_PROC2(p, wgl##n, wgl##n)
-#define OPENGL_PROC2(p, n, tn) /*if(!gl##n)*/ if(!(n = reinterpret_cast<p>(wglGetProcAddress(#tn)))) rsx_log.error("OpenGL: initialization of " #tn " failed.")
+#define OPENGL_PROC2(p, n, tn) /*if(!gl##n)*/ if(!(n = (p)wglGetProcAddress(#tn))) rsx_log.error("OpenGL: initialization of " #tn " failed.")
 #include "GLProcTable.h"
 #undef OPENGL_PROC
 #undef WGL_PROC
@@ -58,17 +54,9 @@ void gl::set_swapinterval(int interval)
 		}
 	}
 
-#ifdef HAVE_WAYLAND
-	if (auto egl_display = eglGetCurrentDisplay(); egl_display != EGL_NO_DISPLAY)
-	{
-		eglSwapInterval(egl_display, interval);
-		return;
-	}
-#endif
-
 	//No existing drawable or missing swap extension, EGL?
 	rsx_log.error("Failed to set swap interval");
 #else
-	rsx_log.error("Swap control not implemented for this platform. Vsync options not available. (interval=%d)", interval);
+	rsx_log.error("Swap control not implemented for this platform. Vsync options not available.");
 #endif
 }
diff --git a/rpcs3/Emu/RSX/GL/glutils/blitter.cpp b/rpcs3/Emu/RSX/GL/glutils/blitter.cpp
deleted file mode 100644
index 57998b761d..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/blitter.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-#include "stdafx.h"
-#include "blitter.h"
-#include "state_tracker.hpp"
-
-#include "../GLTexture.h" // TODO: This system also needs to be refactored
-
-namespace gl
-{
-	blitter* g_hw_blitter = nullptr;
-
-	void blitter::copy_image(gl::command_context&, const texture* src, const texture* dst, int src_level, int dst_level, const position3i& src_offset, const position3i& dst_offset, const size3i& size) const
-	{
-		ensure(src_level == 0);
-
-		// Typeless bypass for BGRA8
-		std::unique_ptr<gl::texture> temp_image;
-		const texture* real_src = src;
-
-		glCopyImageSubData(real_src->id(), static_cast<GLenum>(real_src->get_target()), src_level,
-			src_offset.x, src_offset.y, src_offset.z,
-			dst->id(), static_cast<GLenum>(dst->get_target()), dst_level,
-			dst_offset.x, dst_offset.y, dst_offset.z, size.width, size.height, size.depth);
-	}
-
-	void blitter::scale_image(gl::command_context& cmd, const texture* src, texture* dst, areai src_rect, areai dst_rect,
-		bool linear_interpolation, const rsx::typeless_xfer& xfer_info)
-	{
-		std::unique_ptr<texture> typeless_src;
-		std::unique_ptr<texture> typeless_dst;
-		const gl::texture* real_src = src;
-		const gl::texture* real_dst = dst;
-
-		// Optimization pass; check for pass-through data transfer
-		if (!xfer_info.flip_horizontal && !xfer_info.flip_vertical && src_rect.height() == dst_rect.height())
-		{
-			auto src_w = src_rect.width();
-			auto dst_w = dst_rect.width();
-
-			if (xfer_info.src_is_typeless) src_w = static_cast<int>(src_w * xfer_info.src_scaling_hint);
-			if (xfer_info.dst_is_typeless) dst_w = static_cast<int>(dst_w * xfer_info.dst_scaling_hint);
-
-			if (src_w == dst_w)
-			{
-				// Final dimensions are a match
-				if (xfer_info.src_is_typeless || xfer_info.dst_is_typeless)
-				{
-					const coord3i src_region = { { src_rect.x1, src_rect.y1, 0 }, { src_rect.width(), src_rect.height(), 1 } };
-					const coord3i dst_region = { { dst_rect.x1, dst_rect.y1, 0 }, { dst_rect.width(), dst_rect.height(), 1 } };
-					gl::copy_typeless(cmd, dst, src, static_cast<coord3u>(dst_region), static_cast<coord3u>(src_region));
-				}
-				else
-				{
-					copy_image(cmd, src, dst, 0, 0, position3i{ src_rect.x1, src_rect.y1, 0u }, position3i{ dst_rect.x1, dst_rect.y1, 0 }, size3i{ src_rect.width(), src_rect.height(), 1 });
-				}
-
-				return;
-			}
-		}
-
-		if (xfer_info.src_is_typeless)
-		{
-			const auto internal_fmt = xfer_info.src_native_format_override ?
-				GLenum(xfer_info.src_native_format_override) :
-				get_sized_internal_format(xfer_info.src_gcm_format);
-
-			if (static_cast<gl::texture::internal_format>(internal_fmt) != src->get_internal_format())
-			{
-				const u16 internal_width = static_cast<u16>(src->width() * xfer_info.src_scaling_hint);
-				typeless_src = std::make_unique<texture>(GL_TEXTURE_2D, internal_width, src->height(), 1, 1, 1, internal_fmt, RSX_FORMAT_CLASS_DONT_CARE);
-				copy_typeless(cmd, typeless_src.get(), src);
-
-				real_src = typeless_src.get();
-				src_rect.x1 = static_cast<u16>(src_rect.x1 * xfer_info.src_scaling_hint);
-				src_rect.x2 = static_cast<u16>(src_rect.x2 * xfer_info.src_scaling_hint);
-			}
-		}
-
-		if (xfer_info.dst_is_typeless)
-		{
-			const auto internal_fmt = xfer_info.dst_native_format_override ?
-				GLenum(xfer_info.dst_native_format_override) :
-				get_sized_internal_format(xfer_info.dst_gcm_format);
-
-			if (static_cast<gl::texture::internal_format>(internal_fmt) != dst->get_internal_format())
-			{
-				const auto internal_width = static_cast<u16>(dst->width() * xfer_info.dst_scaling_hint);
-				typeless_dst = std::make_unique<texture>(GL_TEXTURE_2D, internal_width, dst->height(), 1, 1, 1, internal_fmt, RSX_FORMAT_CLASS_DONT_CARE);
-				copy_typeless(cmd, typeless_dst.get(), dst);
-
-				real_dst = typeless_dst.get();
-				dst_rect.x1 = static_cast<u16>(dst_rect.x1 * xfer_info.dst_scaling_hint);
-				dst_rect.x2 = static_cast<u16>(dst_rect.x2 * xfer_info.dst_scaling_hint);
-			}
-		}
-
-		ensure(real_src->aspect() == real_dst->aspect());
-
-		if (xfer_info.flip_horizontal)
-		{
-			src_rect.flip_horizontal();
-		}
-
-		if (xfer_info.flip_vertical)
-		{
-			src_rect.flip_vertical();
-		}
-
-		if (src_rect.width() == dst_rect.width() &&
-			src_rect.height() == dst_rect.height() &&
-			!src_rect.is_flipped() && !dst_rect.is_flipped())
-		{
-			copy_image(cmd, real_src, real_dst, 0, 0, position3i{ src_rect.x1, src_rect.y1, 0 }, position3i{ dst_rect.x1, dst_rect.y1, 0 }, size3i{ src_rect.width(), src_rect.height(), 1 });
-		}
-		else
-		{
-			const bool is_depth_copy = (real_src->aspect() != image_aspect::color);
-			const filter interp = (linear_interpolation && !is_depth_copy) ? filter::linear : filter::nearest;
-			gl::fbo::attachment::type attachment;
-			gl::buffers target;
-
-			if (is_depth_copy)
-			{
-				if (real_dst->aspect() & gl::image_aspect::stencil)
-				{
-					attachment = fbo::attachment::type::depth_stencil;
-					target = gl::buffers::depth_stencil;
-				}
-				else
-				{
-					attachment = fbo::attachment::type::depth;
-					target = gl::buffers::depth;
-				}
-			}
-			else
-			{
-				attachment = fbo::attachment::type::color;
-				target = gl::buffers::color;
-			}
-
-			cmd->disable(GL_SCISSOR_TEST);
-
-			save_binding_state saved;
-
-			gl::fbo::attachment src_att{ blit_src, static_cast<fbo::attachment::type>(attachment) };
-			src_att = *real_src;
-
-			gl::fbo::attachment dst_att{ blit_dst, static_cast<fbo::attachment::type>(attachment) };
-			dst_att = *real_dst;
-
-			blit_src.blit(blit_dst, src_rect, dst_rect, target, interp);
-
-			// Release the attachments explicitly (not doing so causes glitches, e.g Journey Menu)
-			src_att = GL_NONE;
-			dst_att = GL_NONE;
-		}
-
-		if (xfer_info.dst_is_typeless)
-		{
-			// Transfer contents from typeless dst back to original dst
-			copy_typeless(cmd, dst, typeless_dst.get());
-		}
-	}
-
-	void blitter::fast_clear_image(gl::command_context& cmd, const texture* dst, const color4f& color)
-	{
-		save_binding_state saved;
-
-		blit_dst.bind();
-		blit_dst.color[0] = *dst;
-		blit_dst.check();
-
-		cmd->clear_color(color);
-		cmd->color_maski(0, true, true, true, true);
-
-		glClear(GL_COLOR_BUFFER_BIT);
-		blit_dst.color[0] = GL_NONE;
-	}
-
-	void blitter::fast_clear_image(gl::command_context& cmd, const texture* dst, float /*depth*/, u8 /*stencil*/)
-	{
-		fbo::attachment::type attachment;
-		GLbitfield clear_mask;
-
-		switch (const auto fmt = dst->get_internal_format())
-		{
-		case texture::internal_format::depth16:
-		case texture::internal_format::depth32f:
-			clear_mask = GL_DEPTH_BUFFER_BIT;
-			attachment = fbo::attachment::type::depth;
-			break;
-		case texture::internal_format::depth24_stencil8:
-		case texture::internal_format::depth32f_stencil8:
-			clear_mask = GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT;
-			attachment = fbo::attachment::type::depth_stencil;
-			break;
-		default:
-			fmt::throw_exception("Invalid texture passed to clear depth function, format=0x%x", static_cast<u32>(fmt));
-		}
-
-		save_binding_state saved;
-		fbo::attachment attach_point{ blit_dst, attachment };
-
-		blit_dst.bind();
-		attach_point = *dst;
-		blit_dst.check();
-
-		cmd->depth_mask(GL_TRUE);
-		cmd->stencil_mask(0xFF);
-
-		glClear(clear_mask);
-		attach_point = GL_NONE;
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/blitter.h b/rpcs3/Emu/RSX/GL/glutils/blitter.h
deleted file mode 100644
index d7adc1dd14..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/blitter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-
-#include "common.h"
-#include "fbo.h"
-
-namespace gl
-{
-	class command_context;
-	class texture;
-
-	class blitter
-	{
-		struct save_binding_state
-		{
-			GLuint old_fbo;
-
-			save_binding_state()
-			{
-				glGetIntegerv(GL_FRAMEBUFFER_BINDING, reinterpret_cast<GLint*>(&old_fbo));
-			}
-
-			~save_binding_state()
-			{
-				glBindFramebuffer(GL_FRAMEBUFFER, old_fbo);
-			}
-		};
-
-		fbo blit_src;
-		fbo blit_dst;
-
-	public:
-
-		void init()
-		{
-			blit_src.create();
-			blit_dst.create();
-		}
-
-		void destroy()
-		{
-			blit_dst.remove();
-			blit_src.remove();
-		}
-
-		void scale_image(gl::command_context& cmd, const texture* src, texture* dst, areai src_rect, areai dst_rect, bool linear_interpolation,
-			const rsx::typeless_xfer& xfer_info);
-
-		void copy_image(gl::command_context& cmd, const texture* src, const texture* dst, int src_level, int dst_level, const position3i& src_offset, const position3i& dst_offset, const size3i& size) const;
-
-		void fast_clear_image(gl::command_context& cmd, const texture* dst, const color4f& color);
-		void fast_clear_image(gl::command_context& cmd, const texture* dst, float depth, u8 stencil);
-
-		void copy_image(gl::command_context& cmd, const texture* src, const texture* dst, int src_level, int dst_level, const position3u& src_offset, const position3u& dst_offset, const size3u& size) const
-		{
-			copy_image(cmd, src, dst, src_level, dst_level, static_cast<position3i>(src_offset), static_cast<position3i>(dst_offset), static_cast<size3i>(size));
-		}
-	};
-
-	extern blitter* g_hw_blitter;
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp b/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp
deleted file mode 100644
index 5c1f0d0447..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-#include "stdafx.h"
-#include "buffer_object.h"
-#include "common.h"
-
-namespace gl
-{
-	void buffer::allocate(GLsizeiptr size, const void* data_, memory_type type, GLuint usage_flags)
-	{
-		m_memory_type = type;
-
-		if (const auto& caps = get_driver_caps();
-			type != memory_type::userptr && caps.ARB_buffer_storage_supported)
-		{
-			GLenum flags = 0;
-			if (usage_flags & usage::host_write)
-			{
-				flags |= GL_MAP_WRITE_BIT;
-			}
-			if (usage_flags & usage::host_read)
-			{
-				flags |= GL_MAP_READ_BIT;
-			}
-			if (usage_flags & usage::persistent_map)
-			{
-				flags |= GL_MAP_PERSISTENT_BIT;
-			}
-			if (usage_flags & usage::dynamic_update)
-			{
-				flags |= GL_DYNAMIC_STORAGE_BIT;
-			}
-
-			ensure((flags & (GL_MAP_PERSISTENT_BIT | GL_DYNAMIC_STORAGE_BIT)) != (GL_MAP_PERSISTENT_BIT | GL_DYNAMIC_STORAGE_BIT),
-				"Mutually exclusive usage flags set!");
-
-			ensure(type == memory_type::local || flags != 0, "Host-visible memory must have usage flags set!");
-
-			if ((flags & GL_MAP_READ_BIT) && !caps.vendor_AMD)
-			{
-				// This flag stops NVIDIA from allocating read-only memory in VRAM.
-				// NOTE: On AMD, allocating client-side memory via CLIENT_STORAGE_BIT or
-				// making use of GL_AMD_pinned_memory brings everything down to a crawl.
-				// Afaict there is no reason for this; disabling pixel pack/unpack operations does not alleviate the problem.
-				// The driver seems to eventually figure out the optimal storage location by itself.
-				flags |= GL_CLIENT_STORAGE_BIT;
-			}
-
-			DSA_CALL2(NamedBufferStorage, m_id, size, data_, flags);
-			m_size = size;
-		}
-		else
-		{
-			data(size, data_, GL_STREAM_COPY);
-		}
-	}
-
-	buffer::~buffer()
-	{
-		if (created())
-			remove();
-	}
-
-	void buffer::recreate()
-	{
-		if (created())
-		{
-			remove();
-		}
-
-		create();
-	}
-
-	void buffer::recreate(GLsizeiptr size, const void* data)
-	{
-		if (created())
-		{
-			remove();
-		}
-
-		create(size, data);
-	}
-
-	void buffer::create()
-	{
-		glGenBuffers(1, &m_id);
-		save_binding_state save(current_target(), *this);
-	}
-
-	void buffer::create(GLsizeiptr size, const void* data_, memory_type type, GLuint usage_bits)
-	{
-		create();
-		allocate(size, data_, type, usage_bits);
-	}
-
-	void buffer::create(target target_, GLsizeiptr size, const void* data_, memory_type type, GLuint usage_bits)
-	{
-		m_target = target_;
-
-		create();
-		allocate(size, data_, type, usage_bits);
-	}
-
-	void buffer::remove()
-	{
-		if (m_id != GL_NONE)
-		{
-			glDeleteBuffers(1, &m_id);
-			m_id = GL_NONE;
-			m_size = 0;
-		}
-	}
-
-	void buffer::data(GLsizeiptr size, const void* data_, GLenum usage)
-	{
-		ensure(m_memory_type != memory_type::local);
-
-		m_size = size;
-
-		if (m_memory_type == memory_type::userptr)
-		{
-			glBindBuffer(GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD, m_id);
-			glBufferData(GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD, size, data_, usage);
-			return;
-		}
-
-		DSA_CALL2(NamedBufferData, m_id, size, data_, usage);
-	}
-
-	void buffer::sub_data(GLsizeiptr offset, GLsizeiptr length, const GLvoid* data)
-	{
-		ensure(m_memory_type == memory_type::local);
-		DSA_CALL2(NamedBufferSubData, m_id, offset, length, data);
-	}
-
-	GLubyte* buffer::map(GLsizeiptr offset, GLsizeiptr length, access access_)
-	{
-		ensure(m_memory_type == memory_type::host_visible);
-
-		GLenum access_bits = static_cast<GLenum>(access_);
-		if (access_bits == GL_MAP_WRITE_BIT) access_bits |= GL_MAP_UNSYNCHRONIZED_BIT;
-
-		auto raw_data = DSA_CALL2_RET(MapNamedBufferRange, id(), offset, length, access_bits);
-		return reinterpret_cast<GLubyte*>(raw_data);
-	}
-
-	void buffer::unmap()
-	{
-		ensure(m_memory_type == memory_type::host_visible);
-		DSA_CALL2(UnmapNamedBuffer, id());
-	}
-
-	void buffer::bind_range(u32 index, u32 offset, u32 size) const
-	{
-		m_bound_range = { offset, size };
-		glBindBufferRange(static_cast<GLenum>(current_target()), index, id(), offset, size);
-	}
-
-	void buffer::bind_range(target target_, u32 index, u32 offset, u32 size) const
-	{
-		m_bound_range = { offset, size };
-		glBindBufferRange(static_cast<GLenum>(target_), index, id(), offset, size);
-	}
-
-	void buffer::copy_to(buffer* other, u64 src_offset, u64 dst_offset, u64 size)
-	{
-		if (get_driver_caps().ARB_direct_state_access_supported)
-		{
-			glCopyNamedBufferSubData(this->id(), other->id(), src_offset, dst_offset, size);
-		}
-		else
-		{
-			glNamedCopyBufferSubDataEXT(this->id(), other->id(), src_offset, dst_offset, size);
-		}
-	}
-
-	// Buffer view
-	void buffer_view::update(buffer* _buffer, u32 offset, u32 range, GLenum format)
-	{
-		ensure(_buffer->size() >= (offset + range));
-		m_buffer = _buffer;
-		m_offset = offset;
-		m_range = range;
-		m_format = format;
-	}
-
-	bool buffer_view::in_range(u32 address, u32 size, u32& new_offset) const
-	{
-		if (address < m_offset)
-			return false;
-
-		const u32 _offset = address - m_offset;
-		if (m_range < _offset)
-			return false;
-
-		const auto remaining = m_range - _offset;
-		if (size <= remaining)
-		{
-			new_offset = _offset;
-			return true;
-		}
-
-		return false;
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/buffer_object.h b/rpcs3/Emu/RSX/GL/glutils/buffer_object.h
deleted file mode 100644
index dccb2a314e..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/buffer_object.h
+++ /dev/null
@@ -1,161 +0,0 @@
-#pragma once
-
-#include "Emu/RSX/GL/OpenGL.h"
-
-namespace gl
-{
-	class buffer
-	{
-	public:
-		enum class target
-		{
-			pixel_pack = GL_PIXEL_PACK_BUFFER,
-			pixel_unpack = GL_PIXEL_UNPACK_BUFFER,
-			array = GL_ARRAY_BUFFER,
-			element_array = GL_ELEMENT_ARRAY_BUFFER,
-			uniform = GL_UNIFORM_BUFFER,
-			texture = GL_TEXTURE_BUFFER,
-			ssbo = GL_SHADER_STORAGE_BUFFER
-		};
-
-		enum class access
-		{
-			read = GL_MAP_READ_BIT,
-			write = GL_MAP_WRITE_BIT,
-			rw = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT,
-			persistent_rw = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT
-		};
-
-		enum class memory_type
-		{
-			undefined = 0,
-			local = 1,
-			host_visible = 2,
-			userptr = 4
-		};
-
-		enum usage
-		{
-			host_write     = (1 << 0),
-			host_read      = (1 << 1),
-			persistent_map = (1 << 2),
-			dynamic_update = (1 << 3),
-		};
-
-		class save_binding_state
-		{
-			GLint m_last_binding = GL_ZERO;
-			GLenum m_target = GL_NONE;
-
-		public:
-			save_binding_state(target target_, const buffer& new_state) : save_binding_state(target_)
-			{
-				new_state.bind(target_);
-			}
-
-			save_binding_state(target target_)
-			{
-				GLenum pname{};
-				switch (target_)
-				{
-				case target::pixel_pack: pname = GL_PIXEL_PACK_BUFFER_BINDING; break;
-				case target::pixel_unpack: pname = GL_PIXEL_UNPACK_BUFFER_BINDING; break;
-				case target::array: pname = GL_ARRAY_BUFFER_BINDING; break;
-				case target::element_array: pname = GL_ELEMENT_ARRAY_BUFFER_BINDING; break;
-				case target::uniform: pname = GL_UNIFORM_BUFFER_BINDING; break;
-				case target::texture: pname = GL_TEXTURE_BUFFER_BINDING; break;
-				case target::ssbo: pname = GL_SHADER_STORAGE_BUFFER_BINDING; break;
-				default: fmt::throw_exception("Invalid binding state target (0x%x)", static_cast<int>(target_));
-				}
-
-				glGetIntegerv(pname, &m_last_binding);
-				m_target = static_cast<GLenum>(target_);
-			}
-
-			~save_binding_state()
-			{
-				if (!m_target)
-				{
-					return;
-				}
-
-				glBindBuffer(m_target, m_last_binding);
-			}
-		};
-
-	protected:
-		GLuint m_id = GL_NONE;
-		GLsizeiptr m_size = 0;
-		target m_target = target::array;
-		memory_type m_memory_type = memory_type::undefined;
-
-		// Metadata
-		mutable std::pair<u32, u32> m_bound_range{};
-
-		void allocate(GLsizeiptr size, const void* data_, memory_type type, GLuint usage_bits);
-
-	public:
-		buffer() = default;
-		buffer(const buffer&) = delete;
-		~buffer();
-
-		void recreate();
-		void recreate(GLsizeiptr size, const void* data = nullptr);
-
-		void create();
-		void create(GLsizeiptr size, const void* data_ = nullptr, memory_type type = memory_type::local, GLuint usage_bits = 0);
-		void create(target target_, GLsizeiptr size, const void* data_ = nullptr, memory_type type = memory_type::local, GLuint usage_bits = 0);
-
-		void remove();
-
-		void bind(target target_) const { glBindBuffer(static_cast<GLenum>(target_), m_id); }
-		void bind() const { bind(current_target()); }
-
-		void data(GLsizeiptr size, const void* data_ = nullptr, GLenum usage = GL_STREAM_DRAW);
-		void sub_data(GLsizeiptr offset, GLsizeiptr length, const GLvoid* data);
-
-		GLubyte* map(GLsizeiptr offset, GLsizeiptr length, access access_);
-		void unmap();
-
-		void bind_range(u32 index, u32 offset, u32 size) const;
-		void bind_range(target target_, u32 index, u32 offset, u32 size) const;
-
-		void copy_to(buffer* other, u64 src_offset, u64 dst_offset, u64 size);
-
-		target current_target() const { return m_target; }
-		GLsizeiptr size() const { return m_size; }
-		uint id() const { return m_id; }
-		void set_id(uint id) { m_id = id; }
-		bool created() const { return m_id != GL_NONE; }
-		std::pair<u32, u32> bound_range() const { return m_bound_range; }
-
-		explicit operator bool() const { return created(); }
-	};
-
-	class buffer_view
-	{
-		buffer* m_buffer = nullptr;
-		u32 m_offset = 0;
-		u32 m_range = 0;
-		GLenum m_format = GL_R8UI;
-
-	public:
-		buffer_view(buffer* _buffer, u32 offset, u32 range, GLenum format = GL_R8UI)
-			: m_buffer(_buffer), m_offset(offset), m_range(range), m_format(format)
-		{}
-
-		buffer_view() = default;
-
-		void update(buffer* _buffer, u32 offset, u32 range, GLenum format = GL_R8UI);
-
-		u32 offset() const { return m_offset; }
-
-		u32 range() const { return m_range; }
-
-		u32 format() const { return m_format; }
-
-		buffer* value() const { return m_buffer; }
-
-		bool in_range(u32 address, u32 size, u32& new_offset) const;
-	};
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/capabilities.cpp b/rpcs3/Emu/RSX/GL/glutils/capabilities.cpp
deleted file mode 100644
index d6a51beb09..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/capabilities.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-#include "stdafx.h"
-#include "capabilities.h"
-
-#include "Utilities/StrUtil.h"
-
-#include <unordered_set>
-
-namespace gl
-{
-	version_info::version_info(const char* version_string, int major_scale)
-	{
-		auto tokens = fmt::split(version_string, { "." });
-		if (tokens.size() < 2)
-		{
-			rsx_log.warning("Invalid version string: '%s'", version_string);
-			version = version_major = version_minor = 0;
-			return;
-		}
-
-		version_major = static_cast<u8>(std::stoi(tokens[0]));
-		version_minor = static_cast<u8>(std::stoi(tokens[1]));
-		version = static_cast<u16>(version_major * major_scale) + version_minor;
-	}
-
-	void capabilities::initialize()
-	{
-		int ext_count = 0;
-		glGetIntegerv(GL_NUM_EXTENSIONS, &ext_count);
-
-		if (!ext_count)
-		{
-			rsx_log.error("Could not initialize GL driver capabilities. Is OpenGL initialized?");
-			return;
-		}
-
-		std::string vendor_string = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
-		std::string version_string = reinterpret_cast<const char*>(glGetString(GL_VERSION));
-		std::string renderer_string = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
-
-		std::unordered_set<std::string> all_extensions;
-		for (int i = 0; i < ext_count; i++)
-		{
-			all_extensions.emplace(reinterpret_cast<const char*>(glGetStringi(GL_EXTENSIONS, i)));
-		}
-
-#define CHECK_EXTENSION_SUPPORT(extension_short_name)\
-	do {\
-		if (all_extensions.contains("GL_"#extension_short_name)) {\
-			extension_short_name##_supported = true;\
-			rsx_log.success("[CAPS] Using GL_"#extension_short_name);\
-			continue;\
-		} \
-	} while (0)
-
-		CHECK_EXTENSION_SUPPORT(ARB_shader_draw_parameters);
-
-		CHECK_EXTENSION_SUPPORT(EXT_direct_state_access);
-
-		CHECK_EXTENSION_SUPPORT(ARB_direct_state_access);
-
-		CHECK_EXTENSION_SUPPORT(ARB_bindless_texture);
-
-		CHECK_EXTENSION_SUPPORT(ARB_buffer_storage);
-
-		CHECK_EXTENSION_SUPPORT(ARB_texture_buffer_object);
-
-		CHECK_EXTENSION_SUPPORT(ARB_depth_buffer_float);
-
-		CHECK_EXTENSION_SUPPORT(ARB_texture_barrier);
-
-		CHECK_EXTENSION_SUPPORT(NV_texture_barrier);
-
-		CHECK_EXTENSION_SUPPORT(NV_gpu_shader5);
-
-		CHECK_EXTENSION_SUPPORT(AMD_gpu_shader_half_float);
-
-		CHECK_EXTENSION_SUPPORT(ARB_compute_shader);
-
-		CHECK_EXTENSION_SUPPORT(EXT_depth_bounds_test);
-
-		CHECK_EXTENSION_SUPPORT(NV_depth_buffer_float);
-
-		CHECK_EXTENSION_SUPPORT(ARB_shader_stencil_export);
-
-		CHECK_EXTENSION_SUPPORT(NV_fragment_shader_barycentric);
-
-		CHECK_EXTENSION_SUPPORT(AMD_pinned_memory);
-
-		CHECK_EXTENSION_SUPPORT(ARB_shader_texture_image_samples);
-
-		CHECK_EXTENSION_SUPPORT(EXT_texture_compression_s3tc);
-
-#undef CHECK_EXTENSION_SUPPORT
-
-		// Set GLSL version
-		glsl_version = version_info(reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION)));
-
-		// Check GL_VERSION and GL_RENDERER for the presence of Mesa
-		if (version_string.find("Mesa") != umax || renderer_string.find("Mesa") != umax)
-		{
-			vendor_MESA = true;
-
-			if (vendor_string.find("nouveau") != umax)
-			{
-				subvendor_NOUVEAU = true;
-			}
-			else if (vendor_string.find("AMD") != umax)
-			{
-				subvendor_RADEONSI = true;
-			}
-		}
-
-		// Workaround for intel drivers which have terrible capability reporting
-		if (!vendor_string.empty())
-		{
-			std::transform(vendor_string.begin(), vendor_string.end(), vendor_string.begin(), ::tolower);
-		}
-		else
-		{
-			rsx_log.error("Failed to get vendor string from driver. Are we missing a context?");
-			vendor_string = "intel"; // lowest acceptable value
-		}
-
-		if (!vendor_MESA && vendor_string.find("intel") != umax)
-		{
-			int version_major = 0;
-			int version_minor = 0;
-
-			glGetIntegerv(GL_MAJOR_VERSION, &version_major);
-			glGetIntegerv(GL_MINOR_VERSION, &version_minor);
-
-			vendor_INTEL = true;
-
-			// Texture buffers moved into core at GL 3.3
-			if (version_major > 3 || (version_major == 3 && version_minor >= 3))
-				ARB_texture_buffer_object_supported = true;
-
-			// Check for expected library entry-points for some required functions
-			if (!ARB_buffer_storage_supported && glNamedBufferStorage && glMapNamedBufferRange)
-				ARB_buffer_storage_supported = true;
-
-			if (!ARB_direct_state_access_supported && glGetTextureImage && glTextureBufferRange)
-				ARB_direct_state_access_supported = true;
-
-			if (!EXT_direct_state_access_supported && glGetTextureImageEXT && glTextureBufferRangeEXT)
-				EXT_direct_state_access_supported = true;
-		}
-		else if (!vendor_MESA && vendor_string.find("nvidia") != umax)
-		{
-			vendor_NVIDIA = true;
-		}
-#ifdef _WIN32
-		else if (vendor_string.find("amd") != umax || vendor_string.find("ati") != umax)
-		{
-			vendor_AMD = true;
-
-			// NOTE: Some of the later rebrands ended up in the 7000 line with 'AMD Radeon' branding.
-			// However, they all are stuck at GLSL 4.40 and below.
-			subvendor_ATI = renderer_string.find("ATI Radeon") != umax || glsl_version.version < 450;
-		}
-#endif
-
-		initialized = true;
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/capabilities.h b/rpcs3/Emu/RSX/GL/glutils/capabilities.h
deleted file mode 100644
index 756250430b..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/capabilities.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include "../OpenGL.h"
-#include <util/types.hpp>
-#include <util/asm.hpp>
-#include <util/logs.hpp>
-
-namespace gl
-{
-	struct version_info
-	{
-		u8 version_major = 0;
-		u8 version_minor = 0;
-		u16 version = 0;
-
-		version_info() = default;
-		version_info(const char* version_string, int major_scale = 100);
-	};
-
-	class capabilities
-	{
-	public:
-		bool initialized = false;
-		version_info glsl_version;
-
-		bool EXT_direct_state_access_supported = false;
-		bool EXT_depth_bounds_test_supported = false;
-		bool AMD_pinned_memory_supported = false;
-		bool ARB_direct_state_access_supported = false;
-		bool ARB_bindless_texture_supported = false;
-		bool ARB_buffer_storage_supported = false;
-		bool ARB_texture_buffer_object_supported = false;
-		bool ARB_shader_draw_parameters_supported = false;
-		bool ARB_depth_buffer_float_supported = false;
-		bool ARB_texture_barrier_supported = false;
-		bool ARB_shader_stencil_export_supported = false;
-		bool NV_texture_barrier_supported = false;
-		bool NV_gpu_shader5_supported = false;
-		bool AMD_gpu_shader_half_float_supported = false;
-		bool ARB_compute_shader_supported = false;
-		bool NV_depth_buffer_float_supported = false;
-		bool NV_fragment_shader_barycentric_supported = false;
-		bool ARB_shader_texture_image_samples_supported = false;
-		bool EXT_texture_compression_s3tc_supported = false;
-
-		bool vendor_INTEL = false;  // has broken GLSL compiler
-		bool vendor_AMD = false;    // has broken ARB_multidraw
-		bool vendor_NVIDIA = false; // has NaN poisoning issues
-		bool vendor_MESA = false;   // requires CLIENT_STORAGE bit set for streaming buffers
-		bool subvendor_RADEONSI = false;
-		bool subvendor_NOUVEAU = false;
-		bool subvendor_ATI = false; // Pre-GCN cards (terascale, evergreen)
-
-		void initialize();
-	};
-
-	const capabilities& get_driver_caps();
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/common.cpp b/rpcs3/Emu/RSX/GL/glutils/common.cpp
deleted file mode 100644
index 05320ee90f..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/common.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "state_tracker.hpp"
-#include "vao.hpp"
-
-namespace gl
-{
-	static thread_local bool s_tls_primary_context_thread = false;
-	static gl::driver_state* s_current_state = nullptr;
-
-	void set_primary_context_thread(bool value)
-	{
-		s_tls_primary_context_thread = value;
-	}
-
-	bool is_primary_context_thread()
-	{
-		return s_tls_primary_context_thread;
-	}
-
-	void set_command_context(gl::command_context& ctx)
-	{
-		s_current_state = ctx.operator->();
-	}
-
-	void set_command_context(gl::driver_state& ctx)
-	{
-		s_current_state = &ctx;
-	}
-
-	gl::command_context get_command_context()
-	{
-		return { *s_current_state };
-	}
-
-	attrib_t vao::operator[](u32 index) const noexcept
-	{
-		return attrib_t(index);
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/common.h b/rpcs3/Emu/RSX/GL/glutils/common.h
deleted file mode 100644
index f99c3590a6..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/common.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#pragma once
-
-#include "capabilities.h"
-
-#define GL_FRAGMENT_TEXTURES_START 0
-#define GL_VERTEX_TEXTURES_START   (GL_FRAGMENT_TEXTURES_START + 16)
-#define GL_STENCIL_MIRRORS_START   (GL_VERTEX_TEXTURES_START + 4)
-#define GL_STREAM_BUFFER_START     (GL_STENCIL_MIRRORS_START + 16)
-#define GL_TEMP_IMAGE_SLOT(x)      (31 - x)
-
-#define UBO_SLOT(x)  (x + 8)
-#define SSBO_SLOT(x) (x)
-
-#define GL_VERTEX_PARAMS_BIND_SLOT             UBO_SLOT(0)
-#define GL_VERTEX_LAYOUT_BIND_SLOT             UBO_SLOT(1)
-#define GL_VERTEX_CONSTANT_BUFFERS_BIND_SLOT   UBO_SLOT(2)
-#define GL_FRAGMENT_CONSTANT_BUFFERS_BIND_SLOT UBO_SLOT(3)
-#define GL_FRAGMENT_STATE_BIND_SLOT            UBO_SLOT(4)
-#define GL_FRAGMENT_TEXTURE_PARAMS_BIND_SLOT   UBO_SLOT(5)
-#define GL_RASTERIZER_STATE_BIND_SLOT          UBO_SLOT(6)
-#define GL_INTERPRETER_VERTEX_BLOCK            SSBO_SLOT(0)
-#define GL_INTERPRETER_FRAGMENT_BLOCK          SSBO_SLOT(1)
-#define GL_INSTANCING_LUT_BIND_SLOT            SSBO_SLOT(2)
-#define GL_INSTANCING_XFORM_CONSTANTS_SLOT     SSBO_SLOT(3)
-#define GL_COMPUTE_BUFFER_SLOT(index)          SSBO_SLOT(2 + index)
-#define GL_COMPUTE_IMAGE_SLOT(index)           SSBO_SLOT(index)
-
-//Function call wrapped in ARB_DSA vs EXT_DSA compat check
-#define DSA_CALL(func, object_name, target, ...)\
-	if (::gl::get_driver_caps().ARB_direct_state_access_supported)\
-		gl##func(object_name, __VA_ARGS__);\
-	else\
-		gl##func##EXT(object_name, target, __VA_ARGS__);
-
-#define DSA_CALL2(func, ...)\
-	if (::gl::get_driver_caps().ARB_direct_state_access_supported)\
-		gl##func(__VA_ARGS__);\
-	else\
-		gl##func##EXT(__VA_ARGS__);
-
-#define DSA_CALL2_RET(func, ...)\
-	(::gl::get_driver_caps().ARB_direct_state_access_supported) ?\
-		gl##func(__VA_ARGS__) :\
-		gl##func##EXT(__VA_ARGS__)
-
-#define DSA_CALL3(funcARB, funcDSA, ...)\
-	if (::gl::get_driver_caps().ARB_direct_state_access_supported)\
-		gl##funcARB(__VA_ARGS__);\
-	else\
-		gl##funcDSA##EXT(__VA_ARGS__);
-
-namespace gl
-{
-	using flags32_t = u32;
-	using handle32_t = u32;
-
-	template<typename Type, uint BindId, uint GetStateId>
-	class save_binding_state_base
-	{
-		GLint m_last_binding;
-
-	public:
-		save_binding_state_base(const Type& new_state) : save_binding_state_base()
-		{
-			new_state.bind();
-		}
-
-		save_binding_state_base()
-		{
-			glGetIntegerv(GetStateId, &m_last_binding);
-		}
-
-		~save_binding_state_base()
-		{
-			glBindBuffer(BindId, m_last_binding);
-		}
-	};
-
-	// Very useful util when capturing traces with RenderDoc
-	static inline void push_debug_label(const char* label)
-	{
-		glInsertEventMarkerEXT(static_cast<GLsizei>(strlen(label)), label);
-	}
-
-	// Checks if GL state is still valid
-	static inline void check_state()
-	{
-		// GL_OUT_OF_MEMORY invalidates the OpenGL context and is actually the GL version of DEVICE_LOST.
-		// This spec workaround allows it to be abused by ISVs to indicate a broken GL context.
-		ensure(glGetError() != GL_OUT_OF_MEMORY);
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/fbo.cpp b/rpcs3/Emu/RSX/GL/glutils/fbo.cpp
deleted file mode 100644
index b1f6300c01..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/fbo.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-#include "stdafx.h"
-#include "fbo.h"
-#include "buffer_object.h"
-#include "vao.hpp"
-
-#include "Emu/RSX/Common/simple_array.hpp"
-
-namespace gl
-{
-	const fbo screen{};
-
-	void fbo::create()
-	{
-		glGenFramebuffers(1, &m_id);
-	}
-
-	void fbo::bind() const
-	{
-		glBindFramebuffer(GL_FRAMEBUFFER, m_id);
-	}
-
-	void fbo::blit(const fbo& dst, areai src_area, areai dst_area, buffers buffers_, filter filter_) const
-	{
-		bind_as(target::read_frame_buffer);
-		dst.bind_as(target::draw_frame_buffer);
-		glBlitFramebuffer(
-			src_area.x1, src_area.y1, src_area.x2, src_area.y2,
-			dst_area.x1, dst_area.y1, dst_area.x2, dst_area.y2,
-			static_cast<GLbitfield>(buffers_), static_cast<GLenum>(filter_));
-	}
-
-	void fbo::bind_as(target target_) const
-	{
-		glBindFramebuffer(static_cast<int>(target_), id());
-	}
-
-	void fbo::remove()
-	{
-		if (m_id != GL_NONE)
-		{
-			glDeleteFramebuffers(1, &m_id);
-			m_id = GL_NONE;
-		}
-	}
-
-	bool fbo::created() const
-	{
-		return m_id != GL_NONE;
-	}
-
-	bool fbo::check() const
-	{
-		GLenum status = DSA_CALL2_RET(CheckNamedFramebufferStatus, m_id, GL_FRAMEBUFFER);
-
-		if (status != GL_FRAMEBUFFER_COMPLETE)
-		{
-			rsx_log.error("FBO check failed: 0x%04x", status);
-			return false;
-		}
-
-		return true;
-	}
-
-	void fbo::recreate()
-	{
-		if (created())
-			remove();
-
-		create();
-	}
-
-	void fbo::draw_buffer(const attachment& buffer) const
-	{
-		GLenum buf = buffer.id();
-		DSA_CALL3(NamedFramebufferDrawBuffers, FramebufferDrawBuffers, m_id, 1, &buf);
-	}
-
-	void fbo::draw_buffer(swapchain_buffer buffer) const
-	{
-		GLenum buf = static_cast<GLenum>(buffer);
-		DSA_CALL3(NamedFramebufferDrawBuffers, FramebufferDrawBuffers, m_id, 1, &buf);
-	}
-
-	void fbo::draw_buffers(const std::initializer_list<attachment>& indexes) const
-	{
-		rsx::simple_array<GLenum> ids;
-		ids.reserve(::size32(indexes));
-
-		for (auto& index : indexes)
-			ids.push_back(index.id());
-
-		DSA_CALL3(NamedFramebufferDrawBuffers, FramebufferDrawBuffers, m_id, static_cast<GLsizei>(ids.size()), ids.data());
-	}
-
-	void fbo::read_buffer(const attachment& buffer) const
-	{
-		DSA_CALL3(NamedFramebufferReadBuffer, FramebufferReadBuffer, m_id, buffer.id());
-	}
-
-	void fbo::read_buffer(swapchain_buffer buffer) const
-	{
-		GLenum buf = static_cast<GLenum>(buffer);
-		DSA_CALL3(NamedFramebufferReadBuffer, FramebufferReadBuffer, m_id, buf);
-	}
-
-	void fbo::draw_arrays(GLenum mode, GLsizei count, GLint first) const
-	{
-		save_binding_state save(*this);
-		glDrawArrays(mode, first, count);
-	}
-
-	void fbo::draw_arrays(const buffer& buffer, GLenum mode, GLsizei count, GLint first) const
-	{
-		buffer.bind(buffer::target::array);
-		draw_arrays(mode, count, first);
-	}
-
-	void fbo::draw_arrays(const vao& buffer, GLenum mode, GLsizei count, GLint first) const
-	{
-		buffer.bind();
-		draw_arrays(mode, count, first);
-	}
-
-	void fbo::draw_elements(GLenum mode, GLsizei count, indices_type type, const GLvoid* indices) const
-	{
-		save_binding_state save(*this);
-		glDrawElements(mode, count, static_cast<GLenum>(type), indices);
-	}
-
-	void fbo::draw_elements(const buffer& buffer, GLenum mode, GLsizei count, indices_type type, const GLvoid* indices) const
-	{
-		buffer.bind(buffer::target::array);
-		glDrawElements(mode, count, static_cast<GLenum>(type), indices);
-	}
-
-	void fbo::draw_elements(GLenum mode, GLsizei count, indices_type type, const buffer& indices, usz indices_buffer_offset) const
-	{
-		indices.bind(buffer::target::element_array);
-		glDrawElements(mode, count, static_cast<GLenum>(type), reinterpret_cast<GLvoid*>(indices_buffer_offset));
-	}
-
-	void fbo::draw_elements(const buffer& buffer_, GLenum mode, GLsizei count, indices_type type, const buffer& indices, usz indices_buffer_offset) const
-	{
-		buffer_.bind(buffer::target::array);
-		draw_elements(mode, count, type, indices, indices_buffer_offset);
-	}
-
-	void fbo::draw_elements(GLenum mode, GLsizei count, const GLubyte* indices) const
-	{
-		draw_elements(mode, count, indices_type::ubyte, indices);
-	}
-
-	void fbo::draw_elements(const buffer& buffer, GLenum mode, GLsizei count, const GLubyte* indices) const
-	{
-		draw_elements(buffer, mode, count, indices_type::ubyte, indices);
-	}
-
-	void fbo::draw_elements(GLenum mode, GLsizei count, const GLushort* indices) const
-	{
-		draw_elements(mode, count, indices_type::ushort, indices);
-	}
-
-	void fbo::draw_elements(const buffer& buffer, GLenum mode, GLsizei count, const GLushort* indices) const
-	{
-		draw_elements(buffer, mode, count, indices_type::ushort, indices);
-	}
-
-	void fbo::draw_elements(GLenum mode, GLsizei count, const GLuint* indices) const
-	{
-		draw_elements(mode, count, indices_type::uint, indices);
-	}
-
-	void fbo::draw_elements(const buffer& buffer, GLenum mode, GLsizei count, const GLuint* indices) const
-	{
-		draw_elements(buffer, mode, count, indices_type::uint, indices);
-	}
-
-	void fbo::clear(buffers buffers_) const
-	{
-		save_binding_state save(*this);
-		glClear(static_cast<GLbitfield>(buffers_));
-	}
-
-	void fbo::copy_from(const void* pixels, const sizei& size, gl::texture::format format_, gl::texture::type type_, class pixel_unpack_settings pixel_settings) const
-	{
-		save_binding_state save(*this);
-		pixel_settings.apply();
-		glDrawPixels(size.width, size.height, static_cast<GLenum>(format_), static_cast<GLenum>(type_), pixels);
-	}
-
-	void fbo::copy_from(const buffer& buf, const sizei& size, gl::texture::format format_, gl::texture::type type_, class pixel_unpack_settings pixel_settings) const
-	{
-		save_binding_state save(*this);
-		buffer::save_binding_state save_buffer(buffer::target::pixel_unpack, buf);
-		pixel_settings.apply();
-		glDrawPixels(size.width, size.height, static_cast<GLenum>(format_), static_cast<GLenum>(type_), nullptr);
-	}
-
-	void fbo::copy_to(void* pixels, coordi coord, gl::texture::format format_, gl::texture::type type_, class pixel_pack_settings pixel_settings) const
-	{
-		save_binding_state save(*this);
-		pixel_settings.apply();
-		glReadPixels(coord.x, coord.y, coord.width, coord.height, static_cast<GLenum>(format_), static_cast<GLenum>(type_), pixels);
-	}
-
-	void fbo::copy_to(const buffer& buf, coordi coord, gl::texture::format format_, gl::texture::type type_, class pixel_pack_settings pixel_settings) const
-	{
-		save_binding_state save(*this);
-		buffer::save_binding_state save_buffer(buffer::target::pixel_pack, buf);
-		pixel_settings.apply();
-		glReadPixels(coord.x, coord.y, coord.width, coord.height, static_cast<GLenum>(format_), static_cast<GLenum>(type_), nullptr);
-	}
-
-	fbo fbo::get_bound_draw_buffer()
-	{
-		GLint value;
-		glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &value);
-
-		return{ static_cast<GLuint>(value) };
-	}
-
-	fbo fbo::get_bound_read_buffer()
-	{
-		GLint value;
-		glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &value);
-
-		return{ static_cast<GLuint>(value) };
-	}
-
-	fbo fbo::get_bound_buffer()
-	{
-		GLint value;
-		glGetIntegerv(GL_FRAMEBUFFER_BINDING, &value);
-
-		return{ static_cast<GLuint>(value) };
-	}
-
-	GLuint fbo::id() const
-	{
-		return m_id;
-	}
-
-	void fbo::set_id(GLuint id)
-	{
-		m_id = id;
-	}
-
-	void fbo::set_extents(const size2i& extents)
-	{
-		m_size = extents;
-	}
-
-	size2i fbo::get_extents() const
-	{
-		return m_size;
-	}
-
-	bool fbo::matches(const std::array<GLuint, 4>& color_targets, GLuint depth_stencil_target) const
-	{
-		for (u32 index = 0; index < 4; ++index)
-		{
-			if (color[index].resource_id() != color_targets[index])
-			{
-				return false;
-			}
-		}
-
-		const auto depth_resource = depth.resource_id() | depth_stencil.resource_id();
-		return (depth_resource == depth_stencil_target);
-	}
-
-	bool fbo::references_any(const std::vector<GLuint>& resources) const
-	{
-		return std::any_of(m_resource_bindings.cbegin(), m_resource_bindings.cend(), [&resources](const auto& e)
-			{
-				return std::find(resources.cbegin(), resources.cend(), e.second) != resources.cend();
-			});
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/fbo.h b/rpcs3/Emu/RSX/GL/glutils/fbo.h
deleted file mode 100644
index ef71bfa469..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/fbo.h
+++ /dev/null
@@ -1,251 +0,0 @@
-#pragma once
-
-#include "common.h"
-#include "image.h"
-#include "pixel_settings.hpp"
-
-#include "Utilities/geometry.h"
-
-namespace gl
-{
-	enum class buffers
-	{
-		none = 0,
-		color = GL_COLOR_BUFFER_BIT,
-		depth = GL_DEPTH_BUFFER_BIT,
-		stencil = GL_STENCIL_BUFFER_BIT,
-
-		color_depth = color | depth,
-		color_depth_stencil = color | depth | stencil,
-		color_stencil = color | stencil,
-
-		depth_stencil = depth | stencil
-	};
-
-	enum class indices_type
-	{
-		ubyte = GL_UNSIGNED_BYTE,
-		ushort = GL_UNSIGNED_SHORT,
-		uint = GL_UNSIGNED_INT
-	};
-
-	class vao;
-
-	class fbo
-	{
-		GLuint m_id = GL_NONE;
-		size2i m_size;
-
-	protected:
-		std::unordered_map<GLenum, GLuint> m_resource_bindings;
-
-	public:
-		fbo() = default;
-
-		fbo(GLuint id)
-		{
-			set_id(id);
-		}
-
-		~fbo()
-		{
-			if (created())
-				remove();
-		}
-
-		class save_binding_state
-		{
-			GLint m_last_binding;
-			bool reset = true;
-
-		public:
-			save_binding_state(const fbo& new_binding)
-			{
-				glGetIntegerv(GL_FRAMEBUFFER_BINDING, &m_last_binding);
-
-				if (m_last_binding + 0u != new_binding.id())
-					new_binding.bind();
-				else
-					reset = false;
-			}
-
-			~save_binding_state()
-			{
-				if (reset)
-					glBindFramebuffer(GL_FRAMEBUFFER, m_last_binding);
-			}
-		};
-
-		class attachment
-		{
-		public:
-			enum class type
-			{
-				color = GL_COLOR_ATTACHMENT0,
-				depth = GL_DEPTH_ATTACHMENT,
-				stencil = GL_STENCIL_ATTACHMENT,
-				depth_stencil = GL_DEPTH_STENCIL_ATTACHMENT
-			};
-
-		protected:
-			GLuint m_id = GL_NONE;
-			fbo& m_parent;
-
-			attachment(fbo& parent)
-				: m_parent(parent)
-			{}
-
-		public:
-			attachment(fbo& parent, type type)
-				: m_id(static_cast<int>(type))
-				, m_parent(parent)
-			{
-			}
-
-			void set_id(uint id)
-			{
-				m_id = id;
-			}
-
-			uint id() const
-			{
-				return m_id;
-			}
-
-			GLuint resource_id() const
-			{
-				const auto found = m_parent.m_resource_bindings.find(m_id);
-				if (found != m_parent.m_resource_bindings.end())
-				{
-					return found->second;
-				}
-
-				return 0;
-			}
-
-			void operator = (const texture& rhs)
-			{
-				ensure(rhs.get_target() == texture::target::texture2D ||
-					rhs.get_target() == texture::target::texture2DMS);
-
-				m_parent.m_resource_bindings[m_id] = rhs.id();
-				DSA_CALL2(NamedFramebufferTexture, m_parent.id(), m_id, rhs.id(), 0);
-			}
-
-			void operator = (const GLuint rhs)
-			{
-				m_parent.m_resource_bindings[m_id] = rhs;
-				DSA_CALL2(NamedFramebufferTexture, m_parent.id(), m_id, rhs, 0);
-			}
-		};
-
-		class indexed_attachment : public attachment
-		{
-		public:
-			indexed_attachment(fbo& parent, type type) : attachment(parent, type)
-			{
-			}
-
-			attachment operator[](int index) const
-			{
-				return{ m_parent, type(id() + index) };
-			}
-
-			std::vector<attachment> range(int from, int count) const
-			{
-				std::vector<attachment> result;
-
-				for (int i = from; i < from + count; ++i)
-					result.push_back((*this)[i]);
-
-				return result;
-			}
-
-			using attachment::operator =;
-		};
-
-		struct null_attachment : public attachment
-		{
-			null_attachment(fbo& parent)
-				: attachment(parent)
-			{}
-		};
-
-		indexed_attachment color{ *this, attachment::type::color };
-		attachment depth{ *this, attachment::type::depth };
-		attachment stencil{ *this, attachment::type::stencil };
-		attachment depth_stencil{ *this, attachment::type::depth_stencil };
-		null_attachment no_color{ *this };
-
-		enum class target
-		{
-			read_frame_buffer = GL_READ_FRAMEBUFFER,
-			draw_frame_buffer = GL_DRAW_FRAMEBUFFER
-		};
-
-		enum class swapchain_buffer
-		{
-			back = GL_BACK,
-			front = GL_FRONT
-		};
-
-		void create();
-		void bind() const;
-		void blit(const fbo& dst, areai src_area, areai dst_area, buffers buffers_ = buffers::color, filter filter_ = filter::nearest) const;
-		void bind_as(target target_) const;
-		void remove();
-		bool created() const;
-		bool check() const;
-
-		void recreate();
-		void draw_buffer(const attachment& buffer) const;
-		void draw_buffer(swapchain_buffer buffer) const;
-		void draw_buffers(const std::initializer_list<attachment>& indexes) const;
-
-		void read_buffer(const attachment& buffer) const;
-		void read_buffer(swapchain_buffer buffer) const;
-
-		void draw_arrays(GLenum mode, GLsizei count, GLint first = 0) const;
-		void draw_arrays(const buffer& buffer, GLenum mode, GLsizei count, GLint first = 0) const;
-		void draw_arrays(const vao& buffer, GLenum mode, GLsizei count, GLint first = 0) const;
-
-		void draw_elements(GLenum mode, GLsizei count, indices_type type, const GLvoid* indices) const;
-		void draw_elements(const buffer& buffer, GLenum mode, GLsizei count, indices_type type, const GLvoid* indices) const;
-		void draw_elements(GLenum mode, GLsizei count, indices_type type, const buffer& indices, usz indices_buffer_offset = 0) const;
-		void draw_elements(const buffer& buffer_, GLenum mode, GLsizei count, indices_type type, const buffer& indices, usz indices_buffer_offset = 0) const;
-		void draw_elements(GLenum mode, GLsizei count, const GLubyte* indices) const;
-		void draw_elements(const buffer& buffer, GLenum mode, GLsizei count, const GLubyte* indices) const;
-		void draw_elements(GLenum mode, GLsizei count, const GLushort* indices) const;
-		void draw_elements(const buffer& buffer, GLenum mode, GLsizei count, const GLushort* indices) const;
-		void draw_elements(GLenum mode, GLsizei count, const GLuint* indices) const;
-		void draw_elements(const buffer& buffer, GLenum mode, GLsizei count, const GLuint* indices) const;
-
-		void clear(buffers buffers_) const;
-
-		void copy_from(const void* pixels, const sizei& size, gl::texture::format format_, gl::texture::type type_, class pixel_unpack_settings pixel_settings = pixel_unpack_settings()) const;
-		void copy_from(const buffer& buf, const sizei& size, gl::texture::format format_, gl::texture::type type_, class pixel_unpack_settings pixel_settings = pixel_unpack_settings()) const;
-
-		void copy_to(void* pixels, coordi coord, gl::texture::format format_, gl::texture::type type_, class pixel_pack_settings pixel_settings = pixel_pack_settings()) const;
-		void copy_to(const buffer& buf, coordi coord, gl::texture::format format_, gl::texture::type type_, class pixel_pack_settings pixel_settings = pixel_pack_settings()) const;
-
-		static fbo get_bound_draw_buffer();
-		static fbo get_bound_read_buffer();
-		static fbo get_bound_buffer();
-
-		GLuint id() const;
-		void set_id(GLuint id);
-
-		void set_extents(const size2i& extents);
-		size2i get_extents() const;
-
-		bool matches(const std::array<GLuint, 4>& color_targets, GLuint depth_stencil_target) const;
-		bool references_any(const std::vector<GLuint>& resources) const;
-
-		explicit operator bool() const
-		{
-			return created();
-		}
-	};
-
-	extern const fbo screen;
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/image.cpp b/rpcs3/Emu/RSX/GL/glutils/image.cpp
deleted file mode 100644
index bb6439cc05..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/image.cpp
+++ /dev/null
@@ -1,386 +0,0 @@
-#include "stdafx.h"
-#include "image.h"
-#include "buffer_object.h"
-#include "state_tracker.hpp"
-#include "pixel_settings.hpp"
-
-namespace gl
-{
-	static GLenum sizedfmt_to_ifmt(GLenum sized)
-	{
-		switch (sized)
-		{
-		case GL_BGRA8:
-			return GL_RGBA8;
-		case GL_BGR5_A1:
-			return GL_RGB5_A1;
-		default:
-			return sized;
-		}
-	}
-
-	texture::texture(GLenum target, GLuint width, GLuint height, GLuint depth, GLuint mipmaps, GLubyte samples, GLenum sized_format, rsx::format_class format_class)
-	{
-		// Upgrade targets for MSAA
-		if (samples > 1)
-		{
-			switch (target)
-			{
-			case GL_TEXTURE_2D:
-				target = GL_TEXTURE_2D_MULTISAMPLE;
-				break;
-			case GL_TEXTURE_2D_ARRAY:
-				target = GL_TEXTURE_2D_MULTISAMPLE_ARRAY;
-				break;
-			default:
-				fmt::throw_exception("MSAA is only supported on 2D images. Target=0x%x", target);
-			}
-		}
-
-		glGenTextures(1, &m_id);
-
-		// Must bind to initialize the new texture
-		gl::get_command_context()->bind_texture(GL_TEMP_IMAGE_SLOT(0), target, m_id, GL_TRUE);
-
-		const GLenum storage_fmt = sizedfmt_to_ifmt(sized_format);
-		switch (target)
-		{
-		default:
-			fmt::throw_exception("Invalid image target 0x%X", target);
-		case GL_TEXTURE_1D:
-			glTexStorage1D(target, mipmaps, storage_fmt, width);
-			height = depth = 1;
-			break;
-		case GL_TEXTURE_2D:
-		case GL_TEXTURE_CUBE_MAP:
-			glTexStorage2D(target, mipmaps, storage_fmt, width, height);
-			depth = 1;
-			break;
-		case GL_TEXTURE_2D_MULTISAMPLE:
-			ensure(mipmaps == 1);
-			glTexStorage2DMultisample(target, samples, storage_fmt, width, height, GL_TRUE);
-			depth = 1;
-			break;
-		case GL_TEXTURE_3D:
-		case GL_TEXTURE_2D_ARRAY:
-			glTexStorage3D(target, mipmaps, storage_fmt, width, height, depth);
-			break;
-		case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
-			ensure(mipmaps == 1);
-			glTexStorage3DMultisample(target, samples, storage_fmt, width, height, depth, GL_TRUE);
-			break;
-		case GL_TEXTURE_BUFFER:
-			break;
-		}
-
-		if (target != GL_TEXTURE_BUFFER)
-		{
-			if (samples == 1)
-			{
-				glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-				glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-				glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT);
-				glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_REPEAT);
-				glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_REPEAT);
-				glTexParameteri(target, GL_TEXTURE_BASE_LEVEL, 0);
-				glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, mipmaps - 1);
-			}
-
-			m_width = width;
-			m_height = height;
-			m_depth = depth;
-			m_mipmaps = mipmaps;
-			m_samples = samples;
-			m_aspect_flags = image_aspect::color;
-
-			ensure(width > 0 && height > 0 && depth > 0 && mipmaps > 0 && samples > 0, "Invalid OpenGL texture definition.");
-
-			switch (storage_fmt)
-			{
-			case GL_DEPTH_COMPONENT16:
-			{
-				m_pitch = width * 2;
-				m_aspect_flags = image_aspect::depth;
-				break;
-			}
-			case GL_DEPTH_COMPONENT32F:
-			{
-				m_pitch = width * 4;
-				m_aspect_flags = image_aspect::depth;
-				break;
-			}
-			case GL_DEPTH24_STENCIL8:
-			case GL_DEPTH32F_STENCIL8:
-			{
-				m_pitch = width * 4;
-				m_aspect_flags = image_aspect::depth | image_aspect::stencil;
-				break;
-			}
-			case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-			{
-				m_compressed = true;
-				m_pitch = utils::align(width, 4) / 2;
-				break;
-			}
-			case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-			case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-			{
-				m_compressed = true;
-				m_pitch = utils::align(width, 4);
-				break;
-			}
-			default:
-			{
-				GLenum query_target = (target == GL_TEXTURE_CUBE_MAP) ? GL_TEXTURE_CUBE_MAP_POSITIVE_X : target;
-				GLint r, g, b, a;
-
-				glGetTexLevelParameteriv(query_target, 0, GL_TEXTURE_RED_SIZE, &r);
-				glGetTexLevelParameteriv(query_target, 0, GL_TEXTURE_GREEN_SIZE, &g);
-				glGetTexLevelParameteriv(query_target, 0, GL_TEXTURE_BLUE_SIZE, &b);
-				glGetTexLevelParameteriv(query_target, 0, GL_TEXTURE_ALPHA_SIZE, &a);
-
-				m_pitch = width * (r + g + b + a) / 8;
-				break;
-			}
-			}
-
-			if (!m_pitch)
-			{
-				fmt::throw_exception("Unhandled GL format 0x%X", sized_format);
-			}
-
-			if (format_class == RSX_FORMAT_CLASS_UNDEFINED)
-			{
-				if (m_aspect_flags != image_aspect::color)
-				{
-					rsx_log.error("Undefined format class for depth texture is not allowed");
-				}
-				else
-				{
-					format_class = RSX_FORMAT_CLASS_COLOR;
-				}
-			}
-		}
-
-		m_target = static_cast<texture::target>(target);
-		m_internal_format = static_cast<internal_format>(sized_format);
-		m_component_layout = { GL_ALPHA, GL_RED, GL_GREEN, GL_BLUE };
-		m_format_class = format_class;
-	}
-
-	texture::~texture()
-	{
-		gl::get_command_context()->unbind_texture(static_cast<GLenum>(m_target), m_id);
-		glDeleteTextures(1, &m_id);
-		m_id = GL_NONE;
-	}
-
-	void texture::copy_from(const void* src, texture::format format, texture::type type, int level, const coord3u region, const pixel_unpack_settings& pixel_settings)
-	{
-		ensure(m_samples <= 1, "Transfer operations are unsupported on multisampled textures.");
-
-		pixel_settings.apply();
-
-		switch (const auto target_ = static_cast<GLenum>(m_target))
-		{
-		case GL_TEXTURE_1D:
-		{
-			DSA_CALL(TextureSubImage1D, m_id, GL_TEXTURE_1D, level, region.x, region.width, static_cast<GLenum>(format), static_cast<GLenum>(type), src);
-			break;
-		}
-		case GL_TEXTURE_2D:
-		{
-			DSA_CALL(TextureSubImage2D, m_id, GL_TEXTURE_2D, level, region.x, region.y, region.width, region.height, static_cast<GLenum>(format), static_cast<GLenum>(type), src);
-			break;
-		}
-		case GL_TEXTURE_3D:
-		case GL_TEXTURE_2D_ARRAY:
-		{
-			DSA_CALL(TextureSubImage3D, m_id, target_, level, region.x, region.y, region.z, region.width, region.height, region.depth, static_cast<GLenum>(format), static_cast<GLenum>(type), src);
-			break;
-		}
-		case GL_TEXTURE_CUBE_MAP:
-		{
-			if (get_driver_caps().ARB_direct_state_access_supported)
-			{
-				glTextureSubImage3D(m_id, level, region.x, region.y, region.z, region.width, region.height, region.depth, static_cast<GLenum>(format), static_cast<GLenum>(type), src);
-			}
-			else
-			{
-				rsx_log.warning("Cubemap upload via texture::copy_from is halfplemented!");
-				auto ptr = static_cast<const u8*>(src);
-				const auto end = std::min(6u, region.z + region.depth);
-				for (unsigned face = region.z; face < end; ++face)
-				{
-					glTextureSubImage2DEXT(m_id, GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, level, region.x, region.y, region.width, region.height, static_cast<GLenum>(format), static_cast<GLenum>(type), ptr);
-					ptr += (region.width * region.height * 4); //TODO
-				}
-			}
-			break;
-		}
-		}
-	}
-
-	void texture::copy_from(buffer& buf, u32 gl_format_type, u32 offset, u32 length)
-	{
-		ensure(m_samples <= 1, "Transfer operations are unsupported on multisampled textures.");
-
-		if (get_target() != target::textureBuffer)
-			fmt::throw_exception("OpenGL error: texture cannot copy from buffer");
-
-		DSA_CALL(TextureBufferRange, m_id, GL_TEXTURE_BUFFER, gl_format_type, buf.id(), offset, length);
-	}
-
-	void texture::copy_from(buffer_view& view)
-	{
-		copy_from(*view.value(), view.format(), view.offset(), view.range());
-	}
-
-	void texture::copy_to(void* dst, texture::format format, texture::type type, int level, const coord3u& region, const pixel_pack_settings& pixel_settings) const
-	{
-		ensure(m_samples <= 1, "Transfer operations are unsupported on multisampled textures.");
-
-		pixel_settings.apply();
-		const auto& caps = get_driver_caps();
-
-		if (!region.x && !region.y && !region.z &&
-			region.width == m_width && region.height == m_height && region.depth == m_depth)
-		{
-			if (caps.ARB_direct_state_access_supported)
-				glGetTextureImage(m_id, level, static_cast<GLenum>(format), static_cast<GLenum>(type), s32{ smax }, dst);
-			else
-				glGetTextureImageEXT(m_id, static_cast<GLenum>(m_target), level, static_cast<GLenum>(format), static_cast<GLenum>(type), dst);
-		}
-		else if (caps.ARB_direct_state_access_supported)
-		{
-			glGetTextureSubImage(m_id, level, region.x, region.y, region.z, region.width, region.height, region.depth,
-				static_cast<GLenum>(format), static_cast<GLenum>(type), s32{ smax }, dst);
-		}
-		else
-		{
-			// Worst case scenario. For some reason, EXT_dsa does not have glGetTextureSubImage
-			const auto target_ = static_cast<GLenum>(m_target);
-			texture tmp{ target_, region.width, region.height, region.depth, 1, 1, static_cast<GLenum>(m_internal_format), m_format_class };
-			glCopyImageSubData(m_id, target_, level, region.x, region.y, region.z, tmp.id(), target_, 0, 0, 0, 0,
-				region.width, region.height, region.depth);
-
-			const coord3u region2 = { {0, 0, 0}, region.size };
-			tmp.copy_to(dst, format, type, 0, region2, pixel_settings);
-		}
-	}
-
-	void texture_view::create(texture* data, GLenum target, GLenum sized_format, const subresource_range& range, const GLenum* argb_swizzle)
-	{
-		m_target = target;
-		m_format = sized_format;
-		m_view_format = sizedfmt_to_ifmt(sized_format);
-		m_image_data = data;
-		m_aspect_flags = range.aspect_mask & data->aspect();
-
-		ensure(m_aspect_flags);
-
-		glGenTextures(1, &m_id);
-		glTextureView(m_id, target, data->id(), m_view_format, range.min_level, range.num_levels, range.min_layer, range.num_layers);
-
-		if (argb_swizzle)
-		{
-			component_swizzle[0] = argb_swizzle[1];
-			component_swizzle[1] = argb_swizzle[2];
-			component_swizzle[2] = argb_swizzle[3];
-			component_swizzle[3] = argb_swizzle[0];
-
-			DSA_CALL(TextureParameteriv, m_id, m_target, GL_TEXTURE_SWIZZLE_RGBA, reinterpret_cast<GLint*>(component_swizzle));
-		}
-		else
-		{
-			component_swizzle[0] = GL_RED;
-			component_swizzle[1] = GL_GREEN;
-			component_swizzle[2] = GL_BLUE;
-			component_swizzle[3] = GL_ALPHA;
-		}
-
-		if (range.aspect_mask & image_aspect::stencil)
-		{
-			constexpr u32 depth_stencil_mask = (image_aspect::depth | image_aspect::stencil);
-			ensure((range.aspect_mask & depth_stencil_mask) != depth_stencil_mask); // "Invalid aspect mask combination"
-
-			DSA_CALL(TextureParameteri, m_id, m_target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX);
-		}
-	}
-
-	texture_view::~texture_view()
-	{
-		if (m_id)
-		{
-			gl::get_command_context()->unbind_texture(static_cast<GLenum>(m_target), m_id);
-			glDeleteTextures(1, &m_id);
-			m_id = GL_NONE;
-		}
-	}
-
-	void texture_view::bind(gl::command_context& cmd, GLuint layer) const
-	{
-		cmd->bind_texture(layer, m_target, m_id);
-	}
-
-	nil_texture_view::nil_texture_view(texture* data)
-	{
-		m_id = data->id();
-		m_target = static_cast<GLenum>(data->get_target());
-		m_format = static_cast<GLenum>(data->get_internal_format());
-		m_view_format = sizedfmt_to_ifmt(m_format);
-		m_aspect_flags = data->aspect();
-		m_image_data = data;
-
-		component_swizzle[0] = GL_RED;
-		component_swizzle[1] = GL_GREEN;
-		component_swizzle[2] = GL_BLUE;
-		component_swizzle[3] = GL_ALPHA;
-	}
-
-	nil_texture_view::~nil_texture_view()
-	{
-		m_id = GL_NONE;
-	}
-
-	texture_view* viewable_image::get_view(const rsx::texture_channel_remap_t& remap_, GLenum aspect_flags)
-	{
-		auto remap = remap_;
-		const u64 view_aspect = static_cast<u64>(aspect_flags) & aspect();
-		ensure(view_aspect);
-
-		const u64 key = static_cast<u64>(remap.encoded) | (view_aspect << 32);
-		if (auto found = views.find(key);
-			found != views.end())
-		{
-			ensure(found->second.get() != nullptr);
-			return found->second.get();
-		}
-
-		std::array<GLenum, 4> mapping;
-		GLenum* swizzle = nullptr;
-
-		if (remap.encoded != GL_REMAP_IDENTITY)
-		{
-			mapping = apply_swizzle_remap(get_native_component_layout(), remap);
-			swizzle = mapping.data();
-		}
-
-		auto view = std::make_unique<texture_view>(this, swizzle, aspect_flags);
-		auto result = view.get();
-		views.emplace(key, std::move(view));
-		return result;
-	}
-
-	void viewable_image::set_native_component_layout(const std::array<GLenum, 4>& layout)
-	{
-		if (m_component_layout[0] != layout[0] ||
-			m_component_layout[1] != layout[1] ||
-			m_component_layout[2] != layout[2] ||
-			m_component_layout[3] != layout[3])
-		{
-			texture::set_native_component_layout(layout);
-			views.clear();
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/image.h b/rpcs3/Emu/RSX/GL/glutils/image.h
deleted file mode 100644
index 896c3ee088..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/image.h
+++ /dev/null
@@ -1,471 +0,0 @@
-#pragma once
-
-#include "common.h"
-
-#include "Utilities/geometry.h"
-#include "Emu/RSX/Common/TextureUtils.h"
-
-//using enum rsx::format_class;
-using namespace ::rsx::format_class_;
-
-namespace gl
-{
-#define GL_BGRA8        0x80E1 // Enumerant of GL_BGRA8_EXT from the GL_EXT_texture_format_BGRA8888
-#define GL_BGR5_A1      0x99F0 // Unused enum 0x96xx is the last official GL enumerant
-
-	class buffer;
-	class buffer_view;
-	class command_context;
-	class pixel_pack_settings;
-	class pixel_unpack_settings;
-
-	enum image_aspect : u32
-	{
-		color = 1,
-		depth = 2,
-		stencil = 4
-	};
-
-	enum class filter
-	{
-		nearest = GL_NEAREST,
-		linear = GL_LINEAR
-	};
-
-	enum class min_filter
-	{
-		nearest = GL_NEAREST,
-		linear = GL_LINEAR,
-		nearest_mipmap_nearest = GL_NEAREST_MIPMAP_NEAREST,
-		nearest_mipmap_linear = GL_NEAREST_MIPMAP_LINEAR,
-		linear_mipmap_nearest = GL_LINEAR_MIPMAP_NEAREST,
-		linear_mipmap_linear = GL_LINEAR_MIPMAP_LINEAR
-	};
-
-	enum remap_constants : u32
-	{
-		GL_REMAP_IDENTITY = 0xCAFEBABE,
-		GL_REMAP_BGRA = 0x0000AA6C,
-		GL_REMAP_VIEW_MULTISAMPLED = 0xDEADBEEF
-	};
-
-	struct subresource_range
-	{
-		GLenum aspect_mask;
-		GLuint min_level;
-		GLuint num_levels;
-		GLuint min_layer;
-		GLuint num_layers;
-	};
-
-	class texture
-	{
-		friend class texture_view;
-
-	public:
-		enum class type
-		{
-			ubyte = GL_UNSIGNED_BYTE,
-			ushort = GL_UNSIGNED_SHORT,
-			uint = GL_UNSIGNED_INT,
-
-			ubyte_3_3_2 = GL_UNSIGNED_BYTE_3_3_2,
-			ubyte_2_3_3_rev = GL_UNSIGNED_BYTE_2_3_3_REV,
-
-			ushort_5_6_5 = GL_UNSIGNED_SHORT_5_6_5,
-			ushort_5_6_5_rev = GL_UNSIGNED_SHORT_5_6_5_REV,
-			ushort_4_4_4_4 = GL_UNSIGNED_SHORT_4_4_4_4,
-			ushort_4_4_4_4_rev = GL_UNSIGNED_SHORT_4_4_4_4_REV,
-			ushort_5_5_5_1 = GL_UNSIGNED_SHORT_5_5_5_1,
-			ushort_1_5_5_5_rev = GL_UNSIGNED_SHORT_1_5_5_5_REV,
-
-			uint_8_8_8_8 = GL_UNSIGNED_INT_8_8_8_8,
-			uint_8_8_8_8_rev = GL_UNSIGNED_INT_8_8_8_8_REV,
-			uint_10_10_10_2 = GL_UNSIGNED_INT_10_10_10_2,
-			uint_2_10_10_10_rev = GL_UNSIGNED_INT_2_10_10_10_REV,
-			uint_24_8 = GL_UNSIGNED_INT_24_8,
-			float32_uint8 = GL_FLOAT_32_UNSIGNED_INT_24_8_REV,
-
-			sbyte = GL_BYTE,
-			sshort = GL_SHORT,
-			sint = GL_INT,
-			f16 = GL_HALF_FLOAT,
-			f32 = GL_FLOAT,
-			f64 = GL_DOUBLE,
-		};
-
-		enum class channel
-		{
-			zero = GL_ZERO,
-			one = GL_ONE,
-			r = GL_RED,
-			g = GL_GREEN,
-			b = GL_BLUE,
-			a = GL_ALPHA,
-		};
-
-		enum class format
-		{
-			r = GL_RED,
-			rg = GL_RG,
-			rgb = GL_RGB,
-			rgba = GL_RGBA,
-
-			bgr = GL_BGR,
-			bgra = GL_BGRA,
-
-			stencil = GL_STENCIL_INDEX,
-			depth = GL_DEPTH_COMPONENT,
-			depth_stencil = GL_DEPTH_STENCIL
-		};
-
-		enum class internal_format
-		{
-			stencil8 = GL_STENCIL_INDEX8,
-			depth16 = GL_DEPTH_COMPONENT16,
-			depth32f = GL_DEPTH_COMPONENT32F,
-			depth24_stencil8 = GL_DEPTH24_STENCIL8,
-			depth32f_stencil8 = GL_DEPTH32F_STENCIL8,
-
-			compressed_rgb_s3tc_dxt1 = GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
-			compressed_rgba_s3tc_dxt1 = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
-			compressed_rgba_s3tc_dxt3 = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT,
-			compressed_rgba_s3tc_dxt5 = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,
-
-			//Sized internal formats, see opengl spec document on glTexImage2D, table 3
-			rgba8 = GL_RGBA8,
-			bgra8 = GL_BGRA8,
-			rgb565 = GL_RGB565,
-			rgb5a1 = GL_RGB5_A1,
-			bgr5a1 = GL_BGR5_A1,
-			rgba4 = GL_RGBA4,
-			r8 = GL_R8,
-			r16 = GL_R16,
-			r32f = GL_R32F,
-			rg8 = GL_RG8,
-			rg16 = GL_RG16,
-			rg16f = GL_RG16F,
-			rgba16f = GL_RGBA16F,
-			rgba32f = GL_RGBA32F,
-
-			rg8_snorm = GL_RG8_SNORM
-		};
-
-		enum class wrap
-		{
-			repeat = GL_REPEAT,
-			mirrored_repeat = GL_MIRRORED_REPEAT,
-			clamp_to_edge = GL_CLAMP_TO_EDGE,
-			clamp_to_border = GL_CLAMP_TO_BORDER,
-			mirror_clamp = GL_MIRROR_CLAMP_EXT,
-			//mirror_clamp_to_edge = GL_MIRROR_CLAMP_TO_EDGE,
-			mirror_clamp_to_border = GL_MIRROR_CLAMP_TO_BORDER_EXT
-		};
-
-		enum class compare_mode
-		{
-			none = GL_NONE,
-			ref_to_texture = GL_COMPARE_REF_TO_TEXTURE
-		};
-
-		enum class target
-		{
-			texture1D = GL_TEXTURE_1D,
-			texture2D = GL_TEXTURE_2D,
-			texture3D = GL_TEXTURE_3D,
-			textureCUBE = GL_TEXTURE_CUBE_MAP,
-			textureBuffer = GL_TEXTURE_BUFFER,
-			texture2DArray = GL_TEXTURE_2D_ARRAY,
-			texture2DMS = GL_TEXTURE_2D_MULTISAMPLE
-		};
-
-	protected:
-		GLuint m_id = GL_NONE;
-		GLuint m_width = 0;
-		GLuint m_height = 0;
-		GLuint m_depth = 0;
-		GLuint m_mipmaps = 0;
-		GLubyte m_samples = 0;
-		GLuint m_pitch = 0;
-		GLuint m_compressed = GL_FALSE;
-		GLuint m_aspect_flags = 0;
-
-		target m_target = target::texture2D;
-		internal_format m_internal_format = internal_format::rgba8;
-		std::array<GLenum, 4> m_component_layout;
-
-		rsx::format_class m_format_class = RSX_FORMAT_CLASS_UNDEFINED;
-
-	public:
-		texture(const texture&) = delete;
-		texture(texture&& texture_) = delete;
-
-		texture(GLenum target, GLuint width, GLuint height, GLuint depth, GLuint mipmaps, GLubyte samples, GLenum sized_format, rsx::format_class format_class);
-		virtual ~texture();
-
-		// Getters/setters
-		void set_native_component_layout(const std::array<GLenum, 4>& layout)
-		{
-			m_component_layout[0] = layout[0];
-			m_component_layout[1] = layout[1];
-			m_component_layout[2] = layout[2];
-			m_component_layout[3] = layout[3];
-		}
-
-		target get_target() const noexcept
-		{
-			return m_target;
-		}
-
-		static bool compressed_format(internal_format format_) noexcept
-		{
-			switch (format_)
-			{
-			case internal_format::compressed_rgb_s3tc_dxt1:
-			case internal_format::compressed_rgba_s3tc_dxt1:
-			case internal_format::compressed_rgba_s3tc_dxt3:
-			case internal_format::compressed_rgba_s3tc_dxt5:
-				return true;
-			default:
-				return false;
-			}
-		}
-
-		uint id() const noexcept
-		{
-			return m_id;
-		}
-
-		explicit operator bool() const noexcept
-		{
-			return (m_id != GL_NONE);
-		}
-
-		GLuint width() const
-		{
-			return m_width;
-		}
-
-		GLuint height() const
-		{
-			return m_height;
-		}
-
-		GLuint depth() const
-		{
-			return m_depth;
-		}
-
-		GLuint levels() const
-		{
-			return m_mipmaps;
-		}
-
-		GLuint layers() const
-		{
-			switch (m_target)
-			{
-			case target::textureCUBE:
-				return 6;
-			case target::texture2DArray:
-				return m_depth;
-			default:
-				return 1;
-			}
-		}
-
-		GLuint pitch() const
-		{
-			return m_pitch;
-		}
-
-		GLubyte samples() const
-		{
-			return m_samples;
-		}
-
-		GLboolean compressed() const
-		{
-			return m_compressed;
-		}
-
-		GLuint aspect() const
-		{
-			return m_aspect_flags;
-		}
-
-		rsx::format_class format_class() const
-		{
-			return m_format_class;
-		}
-
-		sizeu size2D() const
-		{
-			return{ m_width, m_height };
-		}
-
-		size3u size3D() const
-		{
-			const auto depth = (m_target == target::textureCUBE) ? 6 : m_depth;
-			return{ m_width, m_height, depth };
-		}
-
-		texture::internal_format get_internal_format() const
-		{
-			return m_internal_format;
-		}
-
-		std::array<GLenum, 4> get_native_component_layout() const
-		{
-			return m_component_layout;
-		}
-
-		// Data management
-		void copy_from(const void* src, texture::format format, texture::type type, int level, const coord3u region, const pixel_unpack_settings& pixel_settings);
-
-		void copy_from(buffer& buf, u32 gl_format_type, u32 offset, u32 length);
-
-		void copy_from(buffer_view& view);
-
-		void copy_to(void* dst, texture::format format, texture::type type, int level, const coord3u& region, const pixel_pack_settings& pixel_settings) const;
-
-		// Convenience wrappers
-		void copy_from(const void* src, texture::format format, texture::type type, const pixel_unpack_settings& pixel_settings)
-		{
-			const coord3u region = { {}, size3D() };
-			copy_from(src, format, type, 0, region, pixel_settings);
-		}
-
-		void copy_to(void* dst, texture::format format, texture::type type, const pixel_pack_settings& pixel_settings) const
-		{
-			const coord3u region = { {}, size3D() };
-			copy_to(dst, format, type, 0, region, pixel_settings);
-		}
-	};
-
-	class texture_view
-	{
-	protected:
-		GLuint m_id = GL_NONE;
-		GLenum m_target = 0;
-		GLenum m_format = 0;
-		GLenum m_view_format = 0;
-		GLenum m_aspect_flags = 0;
-		texture* m_image_data = nullptr;
-
-		GLenum component_swizzle[4];
-
-		texture_view() = default;
-
-		void create(texture* data, GLenum target, GLenum sized_format, const subresource_range& range, const GLenum* argb_swizzle = nullptr);
-
-	public:
-		texture_view(const texture_view&) = delete;
-		texture_view(texture_view&&) = delete;
-
-		texture_view(texture* data, GLenum target, GLenum sized_format,
-			const GLenum* argb_swizzle = nullptr,
-			GLenum aspect_flags = image_aspect::color | image_aspect::depth)
-		{
-			create(data, target, sized_format, { aspect_flags, 0, data->levels(), 0, data->layers() }, argb_swizzle);
-		}
-
-		texture_view(texture* data, const GLenum* argb_swizzle = nullptr,
-			GLenum aspect_flags = image_aspect::color | image_aspect::depth)
-		{
-			GLenum target = static_cast<GLenum>(data->get_target());
-			GLenum sized_format = static_cast<GLenum>(data->get_internal_format());
-			create(data, target, sized_format, { aspect_flags, 0, data->levels(), 0, data->layers() }, argb_swizzle);
-		}
-
-		texture_view(texture* data, const subresource_range& range,
-			const GLenum* argb_swizzle = nullptr)
-		{
-			GLenum target = static_cast<GLenum>(data->get_target());
-			GLenum sized_format = static_cast<GLenum>(data->get_internal_format());
-			create(data, target, sized_format, range, argb_swizzle);
-		}
-
-		texture_view(texture* data, GLenum target, const subresource_range& range,
-			const GLenum* argb_swizzle = nullptr)
-		{
-			GLenum sized_format = static_cast<GLenum>(data->get_internal_format());
-			create(data, target, sized_format, range, argb_swizzle);
-		}
-
-		virtual ~texture_view();
-
-		GLuint id() const
-		{
-			return m_id;
-		}
-
-		GLenum target() const
-		{
-			return m_target;
-		}
-
-		GLenum internal_format() const
-		{
-			return m_format;
-		}
-
-		GLenum view_format() const
-		{
-			return m_view_format;
-		}
-
-		GLenum aspect() const
-		{
-			return m_aspect_flags;
-		}
-
-		bool compare_swizzle(const GLenum* argb_swizzle) const
-		{
-			return (argb_swizzle[0] == component_swizzle[3] &&
-				argb_swizzle[1] == component_swizzle[0] &&
-				argb_swizzle[2] == component_swizzle[1] &&
-				argb_swizzle[3] == component_swizzle[2]);
-		}
-
-		texture* image() const
-		{
-			return m_image_data;
-		}
-
-		std::array<GLenum, 4> component_mapping() const
-		{
-			return{ component_swizzle[3], component_swizzle[0], component_swizzle[1], component_swizzle[2] };
-		}
-
-		u32 encoded_component_map() const
-		{
-			// Unused, OGL supports proper component swizzles
-			return 0u;
-		}
-
-		void bind(gl::command_context& cmd, GLuint layer) const;
-	};
-
-	// Passthrough texture view that simply wraps the original texture in a texture_view interface
-	class nil_texture_view : public texture_view
-	{
-	public:
-		nil_texture_view(texture* data);
-		~nil_texture_view();
-	};
-
-	class viewable_image : public texture
-	{
-		std::unordered_map<u64, std::unique_ptr<texture_view>> views;
-
-	public:
-		using texture::texture;
-
-		texture_view* get_view(const rsx::texture_channel_remap_t& remap, GLenum aspect_flags = image_aspect::color | image_aspect::depth);
-		void set_native_component_layout(const std::array<GLenum, 4>& layout);
-	};
-
-	// Texture helpers
-	std::array<GLenum, 4> apply_swizzle_remap(const std::array<GLenum, 4>& swizzle_remap, const rsx::texture_channel_remap_t& decoded_remap);
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/pixel_settings.hpp b/rpcs3/Emu/RSX/GL/glutils/pixel_settings.hpp
deleted file mode 100644
index 475b5f3b8e..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/pixel_settings.hpp
+++ /dev/null
@@ -1,157 +0,0 @@
-#pragma once
-
-#include "common.h"
-
-namespace gl
-{
-	class pixel_pack_settings
-	{
-		bool m_swap_bytes = false;
-		bool m_lsb_first = false;
-		int m_row_length = 0;
-		int m_image_height = 0;
-		int m_skip_rows = 0;
-		int m_skip_pixels = 0;
-		int m_skip_images = 0;
-		int m_alignment = 4;
-
-	public:
-		void apply() const
-		{
-			glPixelStorei(GL_PACK_SWAP_BYTES, m_swap_bytes ? GL_TRUE : GL_FALSE);
-			glPixelStorei(GL_PACK_LSB_FIRST, m_lsb_first ? GL_TRUE : GL_FALSE);
-			glPixelStorei(GL_PACK_ROW_LENGTH, m_row_length);
-			glPixelStorei(GL_PACK_IMAGE_HEIGHT, m_image_height);
-			glPixelStorei(GL_PACK_SKIP_ROWS, m_skip_rows);
-			glPixelStorei(GL_PACK_SKIP_PIXELS, m_skip_pixels);
-			glPixelStorei(GL_PACK_SKIP_IMAGES, m_skip_images);
-			glPixelStorei(GL_PACK_ALIGNMENT, m_alignment);
-		}
-
-		pixel_pack_settings& swap_bytes(bool value = true)
-		{
-			m_swap_bytes = value;
-			return *this;
-		}
-		pixel_pack_settings& lsb_first(bool value = true)
-		{
-			m_lsb_first = value;
-			return *this;
-		}
-		pixel_pack_settings& row_length(int value)
-		{
-			m_row_length = value;
-			return *this;
-		}
-		pixel_pack_settings& image_height(int value)
-		{
-			m_image_height = value;
-			return *this;
-		}
-		pixel_pack_settings& skip_rows(int value)
-		{
-			m_skip_rows = value;
-			return *this;
-		}
-		pixel_pack_settings& skip_pixels(int value)
-		{
-			m_skip_pixels = value;
-			return *this;
-		}
-		pixel_pack_settings& skip_images(int value)
-		{
-			m_skip_images = value;
-			return *this;
-		}
-		pixel_pack_settings& alignment(int value)
-		{
-			m_alignment = value;
-			return *this;
-		}
-
-		bool get_swap_bytes() const
-		{
-			return m_swap_bytes;
-		}
-		int get_row_length() const
-		{
-			return m_row_length;
-		}
-	};
-
-	class pixel_unpack_settings
-	{
-		bool m_swap_bytes = false;
-		bool m_lsb_first = false;
-		int m_row_length = 0;
-		int m_image_height = 0;
-		int m_skip_rows = 0;
-		int m_skip_pixels = 0;
-		int m_skip_images = 0;
-		int m_alignment = 4;
-
-	public:
-		void apply() const
-		{
-			glPixelStorei(GL_UNPACK_SWAP_BYTES, m_swap_bytes ? GL_TRUE : GL_FALSE);
-			glPixelStorei(GL_UNPACK_LSB_FIRST, m_lsb_first ? GL_TRUE : GL_FALSE);
-			glPixelStorei(GL_UNPACK_ROW_LENGTH, m_row_length);
-			glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, m_image_height);
-			glPixelStorei(GL_UNPACK_SKIP_ROWS, m_skip_rows);
-			glPixelStorei(GL_UNPACK_SKIP_PIXELS, m_skip_pixels);
-			glPixelStorei(GL_UNPACK_SKIP_IMAGES, m_skip_images);
-			glPixelStorei(GL_UNPACK_ALIGNMENT, m_alignment);
-		}
-
-		pixel_unpack_settings& swap_bytes(bool value = true)
-		{
-			m_swap_bytes = value;
-			return *this;
-		}
-		pixel_unpack_settings& lsb_first(bool value = true)
-		{
-			m_lsb_first = value;
-			return *this;
-		}
-		pixel_unpack_settings& row_length(int value)
-		{
-			m_row_length = value;
-			return *this;
-		}
-		pixel_unpack_settings& image_height(int value)
-		{
-			m_image_height = value;
-			return *this;
-		}
-		pixel_unpack_settings& skip_rows(int value)
-		{
-			m_skip_rows = value;
-			return *this;
-		}
-		pixel_unpack_settings& skip_pixels(int value)
-		{
-			m_skip_pixels = value;
-			return *this;
-		}
-		pixel_unpack_settings& skip_images(int value)
-		{
-			m_skip_images = value;
-			return *this;
-		}
-		pixel_unpack_settings& alignment(int value)
-		{
-			m_alignment = value;
-			return *this;
-		}
-
-		bool get_swap_bytes() const
-		{
-			return m_swap_bytes;
-		}
-
-		int get_row_length() const
-		{
-			return m_row_length;
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/program.cpp b/rpcs3/Emu/RSX/GL/glutils/program.cpp
deleted file mode 100644
index eaeb6f2540..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/program.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-#include "stdafx.h"
-#include "program.h"
-#include "state_tracker.hpp"
-
-#include "Emu/system_config.h"
-
-namespace gl
-{
-	namespace glsl
-	{
-		void patch_macros_INTEL(std::string& source)
-		{
-			auto read_token = [&source](size_t start) -> std::tuple<size_t, size_t>
-			{
-				size_t string_begin = std::string::npos, i = start;
-				for (size_t count = 0; i < source.length(); ++i)
-				{
-					const auto& c = source[i];
-					const auto is_space = std::isspace(c);
-
-					if (string_begin == std::string::npos)
-					{
-						if (c == '\n') break;
-						if (is_space) continue;
-
-						string_begin = i;
-					}
-
-					if (is_space)
-					{
-						if (!count) break;
-					}
-					else if (c == '(')
-					{
-						count++;
-					}
-					else if (c == ')')
-					{
-						count--;
-					}
-				}
-
-				return std::make_tuple(string_begin, i - 1);
-			};
-
-			auto is_exempt = [&source](const std::string_view& token) -> bool
-			{
-				const char* handled_keywords[] =
-				{
-					"SSBO_LOCATION(x)",
-					"UBO_LOCATION(x)",
-					"IMAGE_LOCATION(x)"
-				};
-
-				for (const auto& keyword : handled_keywords)
-				{
-					if (token.starts_with(keyword))
-					{
-						return false;
-					}
-				}
-
-				return true;
-			};
-
-			size_t prev_loc = 0;
-			while (true)
-			{
-				// Find macro define blocks and remove the outer-most brackets around the expression part
-				const auto next_loc = source.find("#define", prev_loc);
-				if (next_loc == std::string::npos)
-				{
-					break;
-				}
-
-				prev_loc = next_loc + 1;
-
-				const auto [name_start, name_end] = read_token(next_loc + ("#define"sv).length());
-				if (name_start == std::string::npos)
-				{
-					break;
-				}
-
-				const auto macro_name = std::string_view(source.data() + name_start, (name_end - name_start) + 1);
-				if (is_exempt(macro_name))
-				{
-					continue;
-				}
-
-				const auto [expr_start, expr_end] = read_token(name_end + 1);
-				if (expr_start == std::string::npos)
-				{
-					continue;
-				}
-
-				if (source[expr_start] == '(' && source[expr_end] == ')')
-				{
-					rsx_log.notice("[Compiler warning] We'll remove brackets around the expression named '%s'. Add it to exclusion list if this is not desired.", macro_name);
-
-					source[expr_start] = ' ';
-					source[expr_end] = ' ';
-				}
-			}
-		}
-
-		void shader::precompile()
-		{
-			if (gl::get_driver_caps().vendor_INTEL)
-			{
-				// Workaround for broken macro expansion.
-				patch_macros_INTEL(source);
-			}
-
-			const char* str = source.c_str();
-			const GLint length = ::narrow<GLint>(source.length());
-
-			if (g_cfg.video.log_programs)
-			{
-				std::string base_name;
-				switch (type)
-				{
-				case ::glsl::program_domain::glsl_vertex_program:
-					base_name = "shaderlog/VertexProgram";
-					break;
-				case ::glsl::program_domain::glsl_fragment_program:
-					base_name = "shaderlog/FragmentProgram";
-					break;
-				case ::glsl::program_domain::glsl_compute_program:
-					base_name = "shaderlog/ComputeProgram";
-					break;
-				}
-
-				fs::write_file(fs::get_cache_dir() + base_name + std::to_string(m_id) + ".glsl", fs::rewrite, str, length);
-			}
-
-			glShaderSource(m_id, 1, &str, &length);
-
-			m_init_fence.create();
-			flush_command_queue(m_init_fence);
-		}
-
-		void shader::create(::glsl::program_domain type_, const std::string & src)
-		{
-			type = type_;
-			source = src;
-
-			GLenum shader_type{};
-			switch (type)
-			{
-			case ::glsl::program_domain::glsl_vertex_program:
-				shader_type = GL_VERTEX_SHADER;
-				break;
-			case ::glsl::program_domain::glsl_fragment_program:
-				shader_type = GL_FRAGMENT_SHADER;
-				break;
-			case ::glsl::program_domain::glsl_compute_program:
-				shader_type = GL_COMPUTE_SHADER;
-				break;
-			default:
-				rsx_log.fatal("gl::glsl::shader::compile(): Unhandled shader type (%d)", +type_);
-				return;
-			}
-
-			m_id = glCreateShader(shader_type);
-			precompile();
-		}
-
-		shader& shader::compile()
-		{
-			std::lock_guard lock(m_compile_lock);
-			if (m_is_compiled)
-			{
-				// Another thread compiled this already
-				return *this;
-			}
-
-			ensure(!m_init_fence.is_empty()); // Do not attempt to compile a shader_view!!
-			m_init_fence.server_wait_sync();
-
-			glCompileShader(m_id);
-
-			GLint status = GL_FALSE;
-			glGetShaderiv(m_id, GL_COMPILE_STATUS, &status);
-
-			if (status == GL_FALSE)
-			{
-				GLint length = 0;
-				glGetShaderiv(m_id, GL_INFO_LOG_LENGTH, &length);
-
-				std::string error_msg;
-				if (length)
-				{
-					std::unique_ptr<GLchar[]> buf(new char[length + 1]);
-					glGetShaderInfoLog(m_id, length, nullptr, buf.get());
-					error_msg = buf.get();
-				}
-
-				rsx_log.fatal("Compilation failed: %s\nsource: %s", error_msg, source);
-			}
-
-			m_compiled_fence.create();
-			flush_command_queue(m_compiled_fence);
-
-			m_is_compiled = true;
-			return *this;
-		}
-
-		bool program::uniforms_t::has_location(const std::string & name, int* location)
-		{
-			auto found = locations.find(name);
-			if (found != locations.end())
-			{
-				if (location)
-				{
-					*location = found->second;
-				}
-
-				return (found->second >= 0);
-			}
-
-			auto result = glGetUniformLocation(m_program.id(), name.c_str());
-			locations[name] = result;
-
-			if (location)
-			{
-				*location = result;
-			}
-
-			return (result >= 0);
-		}
-
-		GLint program::uniforms_t::location(const std::string& name)
-		{
-			auto found = locations.find(name);
-			if (found != locations.end())
-			{
-				if (found->second >= 0)
-				{
-					return found->second;
-				}
-				else
-				{
-					rsx_log.fatal("%s not found.", name);
-					return -1;
-				}
-			}
-
-			auto result = glGetUniformLocation(m_program.id(), name.c_str());
-
-			if (result < 0)
-			{
-				rsx_log.fatal("%s not found.", name);
-				return result;
-			}
-
-			locations[name] = result;
-			return result;
-		}
-
-		void program::link(std::function<void(program*)> init_func)
-		{
-			glLinkProgram(m_id);
-
-			GLint status = GL_FALSE;
-			glGetProgramiv(m_id, GL_LINK_STATUS, &status);
-
-			if (status == GL_FALSE)
-			{
-				GLint length = 0;
-				glGetProgramiv(m_id, GL_INFO_LOG_LENGTH, &length);
-
-				std::string error_msg;
-				if (length)
-				{
-					std::unique_ptr<GLchar[]> buf(new char[length + 1]);
-					glGetProgramInfoLog(m_id, length, nullptr, buf.get());
-					error_msg = buf.get();
-				}
-
-				rsx_log.fatal("Linkage failed: %s", error_msg);
-			}
-			else
-			{
-				if (init_func)
-				{
-					init_func(this);
-				}
-
-				m_fence.create();
-				flush_command_queue(m_fence);
-			}
-		}
-
-		void program::validate()
-		{
-			glValidateProgram(m_id);
-
-			GLint status = GL_FALSE;
-			glGetProgramiv(m_id, GL_VALIDATE_STATUS, &status);
-
-			if (status == GL_FALSE)
-			{
-				GLint length = 0;
-				glGetProgramiv(m_id, GL_INFO_LOG_LENGTH, &length);
-
-				std::string error_msg;
-				if (length)
-				{
-					std::unique_ptr<GLchar[]> buf(new char[length + 1]);
-					glGetProgramInfoLog(m_id, length, nullptr, buf.get());
-					error_msg = buf.get();
-				}
-
-				rsx_log.error("Validation failed: %s", error_msg.c_str());
-			}
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/program.h b/rpcs3/Emu/RSX/GL/glutils/program.h
deleted file mode 100644
index 72daef2523..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/program.h
+++ /dev/null
@@ -1,197 +0,0 @@
-#pragma once
-
-#include "common.h"
-#include "sync.hpp"
-
-#include "Emu/RSX/Program/GLSLTypes.h"
-#include "Utilities/geometry.h"
-#include "Utilities/mutex.h"
-
-namespace gl
-{
-	namespace glsl
-	{
-		class shader
-		{
-			std::string source;
-			::glsl::program_domain type;
-			GLuint m_id = GL_NONE;
-
-			fence m_compiled_fence;
-			fence m_init_fence;
-
-			shared_mutex m_compile_lock;
-			atomic_t<bool> m_is_compiled{};
-
-			void precompile();
-
-		public:
-			shader() = default;
-
-			shader(::glsl::program_domain type_, const std::string& src)
-			{
-				create(type_, src);
-			}
-
-			~shader()
-			{
-				remove();
-			}
-
-			void remove()
-			{
-				if (m_id)
-				{
-					glDeleteShader(m_id);
-					m_id = GL_NONE;
-				}
-			}
-
-			void create(::glsl::program_domain type_, const std::string& src);
-
-			shader& compile();
-
-			uint id() const { return m_id; }
-
-			const std::string& get_source() const { return source; }
-
-			fence get_compile_fence_sync() const { return m_compiled_fence; }
-
-			bool created() const { return m_id != GL_NONE; }
-
-			bool compiled() const { return m_is_compiled; }
-
-			explicit operator bool() const { return created(); }
-		};
-
-		class program
-		{
-			GLuint m_id = GL_NONE;
-			fence m_fence;
-
-		public:
-			class uniform_t
-			{
-				program& m_program;
-				GLint m_location;
-
-			public:
-				uniform_t(program& program, GLint location)
-					: m_program(program)
-					, m_location(location)
-				{
-				}
-
-				GLint location() const
-				{
-					return m_location;
-				}
-
-				void operator = (int rhs) const { glProgramUniform1i(m_program.id(), location(), rhs); }
-				void operator = (unsigned rhs) const { glProgramUniform1ui(m_program.id(), location(), rhs); }
-				void operator = (float rhs) const { glProgramUniform1f(m_program.id(), location(), rhs); }
-				void operator = (bool rhs) const { glProgramUniform1ui(m_program.id(), location(), rhs ? 1 : 0); }
-				void operator = (const color1i& rhs) const { glProgramUniform1i(m_program.id(), location(), rhs.r); }
-				void operator = (const color1f& rhs) const { glProgramUniform1f(m_program.id(), location(), rhs.r); }
-				void operator = (const color2i& rhs) const { glProgramUniform2i(m_program.id(), location(), rhs.r, rhs.g); }
-				void operator = (const color2f& rhs) const { glProgramUniform2f(m_program.id(), location(), rhs.r, rhs.g); }
-				void operator = (const color3i& rhs) const { glProgramUniform3i(m_program.id(), location(), rhs.r, rhs.g, rhs.b); }
-				void operator = (const color3f& rhs) const { glProgramUniform3f(m_program.id(), location(), rhs.r, rhs.g, rhs.b); }
-				void operator = (const color4i& rhs) const { glProgramUniform4i(m_program.id(), location(), rhs.r, rhs.g, rhs.b, rhs.a); }
-				void operator = (const color4f& rhs) const { glProgramUniform4f(m_program.id(), location(), rhs.r, rhs.g, rhs.b, rhs.a); }
-				void operator = (const areaf& rhs) const { glProgramUniform4f(m_program.id(), location(), rhs.x1, rhs.y1, rhs.x2, rhs.y2); }
-				void operator = (const areai& rhs) const { glProgramUniform4i(m_program.id(), location(), rhs.x1, rhs.y1, rhs.x2, rhs.y2); }
-				void operator = (const std::vector<int>& rhs) const { glProgramUniform1iv(m_program.id(), location(), ::size32(rhs), rhs.data()); }
-			};
-
-			class uniforms_t
-			{
-				program& m_program;
-				std::unordered_map<std::string, GLint> locations;
-
-			public:
-				uniforms_t(program* program)
-					: m_program(*program)
-				{}
-
-				void clear() { locations.clear(); }
-
-				bool has_location(const std::string& name, int* location = nullptr);
-
-				GLint location(const std::string& name);
-
-				uniform_t operator[](GLint location) { return{ m_program, location }; }
-
-				uniform_t operator[](const std::string& name) { return{ m_program, location(name) }; }
-
-			} uniforms{ this };
-
-		public:
-			program() = default;
-			program(const program&) = delete;
-
-			~program()
-			{
-				if (created())
-				{
-					remove();
-				}
-			}
-
-			program& recreate()
-			{
-				remove();
-				return create();
-			}
-
-			program& create()
-			{
-				m_id = glCreateProgram();
-				return *this;
-			}
-
-			void remove()
-			{
-				glDeleteProgram(m_id);
-				m_id = GL_NONE;
-				uniforms.clear();
-			}
-
-			void link(std::function<void(program*)> init_func = {});
-
-			void validate();
-
-			void sync()
-			{
-				if (!m_fence.check_signaled())
-				{
-					m_fence.server_wait_sync();
-				}
-			}
-
-			program& attach(const shader& shader_)
-			{
-				glAttachShader(m_id, shader_.id());
-				return *this;
-			}
-
-			program& bind_attribute_location(const std::string& name, int index)
-			{
-				glBindAttribLocation(m_id, index, name.c_str());
-				return *this;
-			}
-
-			program& bind_fragment_data_location(const std::string& name, int color_number)
-			{
-				glBindFragDataLocation(m_id, color_number, name.c_str());
-				return *this;
-			}
-
-			GLuint id() const { return m_id; }
-
-			bool created() const { return m_id != GL_NONE; }
-
-			explicit operator bool() const { return created(); }
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/ring_buffer.cpp b/rpcs3/Emu/RSX/GL/glutils/ring_buffer.cpp
deleted file mode 100644
index 146136e4b4..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/ring_buffer.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-#include "stdafx.h"
-#include "ring_buffer.h"
-
-namespace gl
-{
-	void ring_buffer::recreate(GLsizeiptr size, const void* data)
-	{
-		if (m_id)
-		{
-			m_fence.wait_for_signal();
-			remove();
-		}
-
-		buffer::create();
-		save_binding_state save(current_target(), *this);
-
-		GLbitfield buffer_storage_flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT;
-		if (gl::get_driver_caps().vendor_MESA) buffer_storage_flags |= GL_CLIENT_STORAGE_BIT;
-
-		DSA_CALL2(NamedBufferStorage, m_id, size, data, buffer_storage_flags);
-		m_memory_mapping = DSA_CALL2_RET(MapNamedBufferRange, m_id, 0, size, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
-
-		ensure(m_memory_mapping != nullptr);
-		m_data_loc = 0;
-		m_size = ::narrow<u32>(size);
-		m_memory_type = memory_type::host_visible;
-	}
-
-	void ring_buffer::create(target target_, GLsizeiptr size, const void* data_)
-	{
-		m_target = target_;
-		recreate(size, data_);
-	}
-
-	std::pair<void*, u32> ring_buffer::alloc_from_heap(u32 alloc_size, u16 alignment)
-	{
-		u32 offset = m_data_loc;
-		if (m_data_loc) offset = utils::align(offset, alignment);
-
-		if ((offset + alloc_size) > m_size)
-		{
-			if (!m_fence.is_empty())
-			{
-				m_fence.wait_for_signal();
-			}
-			else
-			{
-				rsx_log.error("OOM Error: Ring buffer was likely being used without notify() being called");
-				glFinish();
-			}
-
-			m_data_loc = 0;
-			offset = 0;
-		}
-
-		//Align data loc to 256; allows some "guard" region so we dont trample our own data inadvertently
-		m_data_loc = utils::align(offset + alloc_size, 256);
-		return std::make_pair(static_cast<char*>(m_memory_mapping) + offset, offset);
-	}
-
-	void ring_buffer::remove()
-	{
-		if (m_memory_mapping)
-		{
-			buffer::unmap();
-
-			m_memory_mapping = nullptr;
-			m_data_loc = 0;
-			m_size = 0;
-		}
-
-		buffer::remove();
-	}
-
-	void ring_buffer::notify()
-	{
-		//Insert fence about 25% into the buffer
-		if (m_fence.is_empty() && (m_data_loc > (m_size >> 2)))
-			m_fence.reset();
-	}
-
-	// Legacy ring buffer - used when ARB_buffer_storage is not available, OR when capturing with renderdoc
-	void legacy_ring_buffer::recreate(GLsizeiptr size, const void* data)
-	{
-		if (m_id)
-			remove();
-
-		buffer::create();
-		buffer::data(size, data, GL_DYNAMIC_DRAW);
-
-		m_memory_type = memory_type::host_visible;
-		m_memory_mapping = nullptr;
-		m_data_loc = 0;
-		m_size = ::narrow<u32>(size);
-	}
-
-	void legacy_ring_buffer::create(target target_, GLsizeiptr size, const void* data_)
-	{
-		m_target = target_;
-		recreate(size, data_);
-	}
-
-	void legacy_ring_buffer::reserve_storage_on_heap(u32 alloc_size)
-	{
-		ensure(m_memory_mapping == nullptr);
-
-		u32 offset = m_data_loc;
-		if (m_data_loc) offset = utils::align(offset, 256);
-
-		const u32 block_size = utils::align(alloc_size + 16, 256);	//Overallocate just in case we need to realign base
-
-		if ((offset + block_size) > m_size)
-		{
-			buffer::data(m_size, nullptr, GL_DYNAMIC_DRAW);
-			m_data_loc = 0;
-		}
-
-		m_memory_mapping = DSA_CALL2_RET(MapNamedBufferRange, m_id, m_data_loc, block_size, GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
-		m_mapped_bytes = block_size;
-		m_mapping_offset = m_data_loc;
-		m_alignment_offset = 0;
-
-		//When using debugging tools, the mapped base might not be aligned as expected
-		const u64 mapped_address_base = reinterpret_cast<u64>(m_memory_mapping);
-		if (mapped_address_base & 0xF)
-		{
-			//Unaligned result was returned. We have to modify the base address a bit
-			//We lose some memory here, but the 16 byte overallocation above makes up for it
-			const u64 new_base = (mapped_address_base & ~0xF) + 16;
-			const u64 diff_bytes = new_base - mapped_address_base;
-
-			m_memory_mapping = reinterpret_cast<void*>(new_base);
-			m_mapped_bytes -= ::narrow<u32>(diff_bytes);
-			m_alignment_offset = ::narrow<u32>(diff_bytes);
-		}
-
-		ensure(m_mapped_bytes >= alloc_size);
-	}
-
-	std::pair<void*, u32> legacy_ring_buffer::alloc_from_heap(u32 alloc_size, u16 alignment)
-	{
-		u32 offset = m_data_loc;
-		if (m_data_loc) offset = utils::align(offset, alignment);
-
-		u32 padding = (offset - m_data_loc);
-		u32 real_size = utils::align(padding + alloc_size, alignment);	//Ensures we leave the loc pointer aligned after we exit
-
-		if (real_size > m_mapped_bytes)
-		{
-			//Missed allocation. We take a performance hit on doing this.
-			//Overallocate slightly for the next allocation if requested size is too small
-			unmap();
-			reserve_storage_on_heap(std::max(real_size, 4096U));
-
-			offset = m_data_loc;
-			if (m_data_loc) offset = utils::align(offset, alignment);
-
-			padding = (offset - m_data_loc);
-			real_size = utils::align(padding + alloc_size, alignment);
-		}
-
-		m_data_loc = offset + real_size;
-		m_mapped_bytes -= real_size;
-
-		u32 local_offset = (offset - m_mapping_offset);
-		return std::make_pair(static_cast<char*>(m_memory_mapping) + local_offset, offset + m_alignment_offset);
-	}
-
-	void legacy_ring_buffer::remove()
-	{
-		ring_buffer::remove();
-		m_mapped_bytes = 0;
-	}
-
-	void legacy_ring_buffer::unmap()
-	{
-		buffer::unmap();
-
-		m_memory_mapping = nullptr;
-		m_mapped_bytes = 0;
-		m_mapping_offset = 0;
-	}
-
-	// AMD persistent mapping workaround for driver-assisted flushing
-	void* transient_ring_buffer::map_internal(u32 offset, u32 length)
-	{
-		flush();
-
-		dirty = true;
-		return DSA_CALL2_RET(MapNamedBufferRange, m_id, offset, length, GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
-	}
-
-	void transient_ring_buffer::bind()
-	{
-		flush();
-		buffer::bind();
-	}
-
-	void transient_ring_buffer::recreate(GLsizeiptr size, const void* data)
-	{
-		if (m_id)
-		{
-			m_fence.wait_for_signal();
-			remove();
-		}
-
-		buffer::create();
-		save_binding_state save(current_target(), *this);
-		DSA_CALL2(NamedBufferStorage, m_id, size, data, GL_MAP_WRITE_BIT);
-
-		m_data_loc = 0;
-		m_size = ::narrow<u32>(size);
-		m_memory_type = memory_type::host_visible;
-	}
-
-	std::pair<void*, u32> transient_ring_buffer::alloc_from_heap(u32 alloc_size, u16 alignment)
-	{
-		ensure(m_memory_mapping == nullptr);
-		const auto allocation = ring_buffer::alloc_from_heap(alloc_size, alignment);
-		return { map_internal(allocation.second, alloc_size), allocation.second };
-	}
-
-	void transient_ring_buffer::flush()
-	{
-		if (dirty)
-		{
-			buffer::unmap();
-			dirty = false;
-		}
-	}
-
-	void transient_ring_buffer::unmap()
-	{
-		flush();
-	}
-
-	scratch_ring_buffer::~scratch_ring_buffer()
-	{
-		if (m_storage)
-		{
-			remove();
-		}
-	}
-
-	void scratch_ring_buffer::create(buffer::target target_, u64 size, u32 usage_flags)
-	{
-		if (m_storage)
-		{
-			remove();
-		}
-
-		m_storage.create(target_, size, nullptr, gl::buffer::memory_type::local, usage_flags);
-	}
-
-	void scratch_ring_buffer::remove()
-	{
-		if (m_storage)
-		{
-			m_storage.remove();
-		}
-
-		m_barriers.clear();
-		m_alloc_pointer = 0;
-	}
-
-	u32 scratch_ring_buffer::alloc(u32 size, u32 alignment)
-	{
-		u64 start = utils::align(m_alloc_pointer, alignment);
-		m_alloc_pointer = (start + size);
-
-		if (static_cast<GLsizeiptr>(m_alloc_pointer) > m_storage.size())
-		{
-			start = 0;
-			m_alloc_pointer = size;
-		}
-
-		pop_barrier(static_cast<u32>(start), size);
-		return static_cast<u32>(start);
-	}
-
-	void scratch_ring_buffer::pop_barrier(u32 start, u32 length)
-	{
-		const auto range = utils::address_range32::start_length(start, length);
-		m_barriers.erase(std::remove_if(m_barriers.begin(), m_barriers.end(), [&range](auto& barrier_)
-		{
-			if (barrier_.range.overlaps(range))
-			{
-				barrier_.signal.server_wait_sync();
-				barrier_.signal.destroy();
-				return true;
-			}
-
-			return false;
-		}), m_barriers.end());
-	}
-
-	void scratch_ring_buffer::push_barrier(u32 start, u32 length)
-	{
-		if (!length)
-		{
-			return;
-		}
-
-		barrier barrier_;
-		barrier_.range = utils::address_range32::start_length(start, length);
-		barrier_.signal.create();
-		m_barriers.emplace_back(barrier_);
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/ring_buffer.h b/rpcs3/Emu/RSX/GL/glutils/ring_buffer.h
deleted file mode 100644
index 37ba0e4bdf..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/ring_buffer.h
+++ /dev/null
@@ -1,115 +0,0 @@
-#pragma once
-
-#include "buffer_object.h"
-#include "sync.hpp"
-#include "Utilities/address_range.h"
-
-namespace gl
-{
-	class ring_buffer : public buffer
-	{
-	protected:
-
-		u32 m_data_loc = 0;
-		void* m_memory_mapping = nullptr;
-
-		fence m_fence;
-
-	public:
-		virtual ~ring_buffer() = default;
-
-		virtual void bind() { buffer::bind(); }
-
-		virtual void recreate(GLsizeiptr size, const void* data = nullptr);
-
-		void create(target target_, GLsizeiptr size, const void* data_ = nullptr);
-
-		virtual std::pair<void*, u32> alloc_from_heap(u32 alloc_size, u16 alignment);
-
-		virtual void remove();
-
-		virtual void reserve_storage_on_heap(u32 /*alloc_size*/) {}
-
-		virtual void unmap() {}
-
-		virtual void flush() {}
-
-		virtual void notify();
-	};
-
-	class legacy_ring_buffer final : public ring_buffer
-	{
-		u32 m_mapped_bytes = 0;
-		u32 m_mapping_offset = 0;
-		u32 m_alignment_offset = 0;
-
-	public:
-
-		void recreate(GLsizeiptr size, const void* data = nullptr) override;
-
-		void create(target target_, GLsizeiptr size, const void* data_ = nullptr);
-
-		void reserve_storage_on_heap(u32 alloc_size) override;
-
-		std::pair<void*, u32> alloc_from_heap(u32 alloc_size, u16 alignment) override;
-
-		void remove() override;
-
-		void unmap() override;
-
-		void notify() override {}
-	};
-
-	// A non-persistent ring buffer
-	// Internally maps and unmaps data. Uses persistent storage just like the regular persistent variant
-	// Works around drivers that have issues using mapped data for specific sources (e.g AMD proprietary driver with index buffers)
-	class transient_ring_buffer final : public ring_buffer
-	{
-		bool dirty = false;
-
-		void* map_internal(u32 offset, u32 length);
-
-	public:
-
-		void bind() override;
-
-		void recreate(GLsizeiptr size, const void* data = nullptr) override;
-
-		std::pair<void*, u32> alloc_from_heap(u32 alloc_size, u16 alignment) override;
-
-		void flush() override;
-
-		void unmap() override;
-	};
-
-	// Simple GPU-side ring buffer with no map/unmap semantics
-	class scratch_ring_buffer
-	{
-		struct barrier
-		{
-			fence signal;
-			utils::address_range32 range;
-		};
-
-		buffer m_storage;
-		std::vector<barrier> m_barriers;
-		u64 m_alloc_pointer = 0;
-
-		void pop_barrier(u32 start, u32 length);
-
-	public:
-
-		scratch_ring_buffer() = default;
-		scratch_ring_buffer(const scratch_ring_buffer&) = delete;
-		~scratch_ring_buffer();
-
-		void create(buffer::target _target, u64 size, u32 usage_flags = 0);
-		void remove();
-
-		u32 alloc(u32 size, u32 alignment);
-		void push_barrier(u32 start, u32 length);
-
-		buffer& get() { return m_storage; }
-		u64 size() const { return m_storage.size(); }
-	};
-}
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/GL/glutils/sampler.cpp b/rpcs3/Emu/RSX/GL/glutils/sampler.cpp
deleted file mode 100644
index 580caf0dc2..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/sampler.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-#include "stdafx.h"
-#include "sampler.h"
-
-#include "Emu/RSX/gcm_enums.h"
-#include "Emu/RSX/Common/TextureUtils.h"
-
-//GLenum wrap_mode(rsx::texture_wrap_mode wrap);
-//float max_aniso(rsx::texture_max_anisotropy aniso);
-
-namespace gl
-{
-	GLenum wrap_mode(rsx::texture_wrap_mode wrap)
-	{
-		switch (wrap)
-		{
-		case rsx::texture_wrap_mode::wrap: return GL_REPEAT;
-		case rsx::texture_wrap_mode::mirror: return GL_MIRRORED_REPEAT;
-		case rsx::texture_wrap_mode::clamp_to_edge: return GL_CLAMP_TO_EDGE;
-		case rsx::texture_wrap_mode::border: return GL_CLAMP_TO_BORDER;
-		case rsx::texture_wrap_mode::clamp: return GL_CLAMP_TO_EDGE;
-		case rsx::texture_wrap_mode::mirror_once_clamp_to_edge: return GL_MIRROR_CLAMP_TO_EDGE_EXT;
-		case rsx::texture_wrap_mode::mirror_once_border: return GL_MIRROR_CLAMP_TO_BORDER_EXT;
-		case rsx::texture_wrap_mode::mirror_once_clamp: return GL_MIRROR_CLAMP_EXT;
-		}
-
-		rsx_log.error("Texture wrap error: bad wrap (%d)", static_cast<u32>(wrap));
-		return GL_REPEAT;
-	}
-
-	float max_aniso(rsx::texture_max_anisotropy aniso)
-	{
-		switch (aniso)
-		{
-		case rsx::texture_max_anisotropy::x1: return 1.0f;
-		case rsx::texture_max_anisotropy::x2: return 2.0f;
-		case rsx::texture_max_anisotropy::x4: return 4.0f;
-		case rsx::texture_max_anisotropy::x6: return 6.0f;
-		case rsx::texture_max_anisotropy::x8: return 8.0f;
-		case rsx::texture_max_anisotropy::x10: return 10.0f;
-		case rsx::texture_max_anisotropy::x12: return 12.0f;
-		case rsx::texture_max_anisotropy::x16: return 16.0f;
-		}
-
-		rsx_log.error("Texture anisotropy error: bad max aniso (%d)", static_cast<u32>(aniso));
-		return 1.0f;
-	}
-
-	int tex_min_filter(rsx::texture_minify_filter min_filter)
-	{
-		switch (min_filter)
-		{
-		case rsx::texture_minify_filter::nearest: return GL_NEAREST;
-		case rsx::texture_minify_filter::linear: return GL_LINEAR;
-		case rsx::texture_minify_filter::nearest_nearest: return GL_NEAREST_MIPMAP_NEAREST;
-		case rsx::texture_minify_filter::linear_nearest: return GL_LINEAR_MIPMAP_NEAREST;
-		case rsx::texture_minify_filter::nearest_linear: return GL_NEAREST_MIPMAP_LINEAR;
-		case rsx::texture_minify_filter::linear_linear: return GL_LINEAR_MIPMAP_LINEAR;
-		case rsx::texture_minify_filter::convolution_min: return GL_LINEAR_MIPMAP_LINEAR;
-		}
-		fmt::throw_exception("Unknown min filter");
-	}
-
-	int tex_mag_filter(rsx::texture_magnify_filter mag_filter)
-	{
-		switch (mag_filter)
-		{
-		case rsx::texture_magnify_filter::nearest: return GL_NEAREST;
-		case rsx::texture_magnify_filter::linear: return GL_LINEAR;
-		case rsx::texture_magnify_filter::convolution_mag: return GL_LINEAR;
-		}
-		fmt::throw_exception("Unknown mag filter");
-	}
-
-	// Apply sampler state settings
-	void sampler_state::apply(const rsx::fragment_texture& tex, const rsx::sampled_image_descriptor_base* sampled_image)
-	{
-		set_parameteri(GL_TEXTURE_WRAP_S, wrap_mode(tex.wrap_s()));
-		set_parameteri(GL_TEXTURE_WRAP_T, wrap_mode(tex.wrap_t()));
-		set_parameteri(GL_TEXTURE_WRAP_R, wrap_mode(tex.wrap_r()));
-
-		if (rsx::is_border_clamped_texture(tex))
-		{
-			// NOTE: In OpenGL, the border texels are processed by the pipeline and will be swizzled by the texture view.
-			// Therefore, we pass the raw value here, and the texture view will handle the rest for us.
-			const auto encoded_color = tex.border_color();
-			if (get_parameteri(GL_TEXTURE_BORDER_COLOR) != encoded_color)
-			{
-				m_propertiesi[GL_TEXTURE_BORDER_COLOR] = encoded_color;
-				const auto border_color = rsx::decode_border_color(encoded_color);
-				glSamplerParameterfv(sampler_handle, GL_TEXTURE_BORDER_COLOR, border_color.rgba);
-			}
-		}
-
-		if (sampled_image->upload_context != rsx::texture_upload_context::shader_read ||
-			tex.get_exact_mipmap_count() == 1)
-		{
-			GLint min_filter = tex_min_filter(tex.min_filter());
-
-			if (min_filter != GL_LINEAR && min_filter != GL_NEAREST)
-			{
-				switch (min_filter)
-				{
-				case GL_NEAREST_MIPMAP_NEAREST:
-				case GL_NEAREST_MIPMAP_LINEAR:
-					min_filter = GL_NEAREST; break;
-				case GL_LINEAR_MIPMAP_NEAREST:
-				case GL_LINEAR_MIPMAP_LINEAR:
-					min_filter = GL_LINEAR; break;
-				default:
-					rsx_log.error("No mipmap fallback defined for rsx_min_filter = 0x%X", static_cast<u32>(tex.min_filter()));
-					min_filter = GL_NEAREST;
-				}
-			}
-
-			set_parameteri(GL_TEXTURE_MIN_FILTER, min_filter);
-			set_parameterf(GL_TEXTURE_LOD_BIAS, 0.f);
-			set_parameterf(GL_TEXTURE_MIN_LOD, -1000.f);
-			set_parameterf(GL_TEXTURE_MAX_LOD, 1000.f);
-		}
-		else
-		{
-			set_parameteri(GL_TEXTURE_MIN_FILTER, tex_min_filter(tex.min_filter()));
-			set_parameterf(GL_TEXTURE_LOD_BIAS, tex.bias());
-			set_parameterf(GL_TEXTURE_MIN_LOD, tex.min_lod());
-			set_parameterf(GL_TEXTURE_MAX_LOD, tex.max_lod());
-		}
-
-		const f32 af_level = max_aniso(tex.max_aniso());
-		set_parameterf(GL_TEXTURE_MAX_ANISOTROPY_EXT, af_level);
-		set_parameteri(GL_TEXTURE_MAG_FILTER, tex_mag_filter(tex.mag_filter()));
-
-		const u32 texture_format = tex.format() & ~(CELL_GCM_TEXTURE_UN | CELL_GCM_TEXTURE_LN);
-		if (texture_format == CELL_GCM_TEXTURE_DEPTH16 || texture_format == CELL_GCM_TEXTURE_DEPTH24_D8 ||
-			texture_format == CELL_GCM_TEXTURE_DEPTH16_FLOAT || texture_format == CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT)
-		{
-			//NOTE: The stored texture function is reversed wrt the textureProj compare function
-			GLenum compare_mode = static_cast<GLenum>(tex.zfunc()) | GL_NEVER;
-
-			switch (compare_mode)
-			{
-			case GL_GREATER: compare_mode = GL_LESS; break;
-			case GL_GEQUAL: compare_mode = GL_LEQUAL; break;
-			case GL_LESS: compare_mode = GL_GREATER; break;
-			case GL_LEQUAL: compare_mode = GL_GEQUAL; break;
-			}
-
-			set_parameteri(GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
-			set_parameteri(GL_TEXTURE_COMPARE_FUNC, compare_mode);
-		}
-		else
-			set_parameteri(GL_TEXTURE_COMPARE_MODE, GL_NONE);
-	}
-
-	void sampler_state::apply(const rsx::vertex_texture& tex, const rsx::sampled_image_descriptor_base* /*sampled_image*/)
-	{
-		if (rsx::is_border_clamped_texture(tex))
-		{
-			// NOTE: In OpenGL, the border texels are processed by the pipeline and will be swizzled by the texture view.
-			// Therefore, we pass the raw value here, and the texture view will handle the rest for us.
-			const auto encoded_color = tex.border_color();
-			if (get_parameteri(GL_TEXTURE_BORDER_COLOR) != encoded_color)
-			{
-				m_propertiesi[GL_TEXTURE_BORDER_COLOR] = encoded_color;
-				const auto border_color = rsx::decode_border_color(encoded_color);
-				glSamplerParameterfv(sampler_handle, GL_TEXTURE_BORDER_COLOR, border_color.rgba);
-			}
-		}
-
-		set_parameteri(GL_TEXTURE_WRAP_S, wrap_mode(tex.wrap_s()));
-		set_parameteri(GL_TEXTURE_WRAP_T, wrap_mode(tex.wrap_t()));
-		set_parameteri(GL_TEXTURE_WRAP_R, wrap_mode(tex.wrap_r()));
-		set_parameteri(GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		set_parameteri(GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-		set_parameterf(GL_TEXTURE_LOD_BIAS, tex.bias());
-		set_parameterf(GL_TEXTURE_MIN_LOD, tex.min_lod());
-		set_parameterf(GL_TEXTURE_MAX_LOD, tex.max_lod());
-		set_parameteri(GL_TEXTURE_COMPARE_MODE, GL_NONE);
-	}
-
-	void sampler_state::apply_defaults(GLenum default_filter)
-	{
-		set_parameteri(GL_TEXTURE_WRAP_S, GL_REPEAT);
-		set_parameteri(GL_TEXTURE_WRAP_T, GL_REPEAT);
-		set_parameteri(GL_TEXTURE_WRAP_R, GL_REPEAT);
-		set_parameteri(GL_TEXTURE_MIN_FILTER, default_filter);
-		set_parameteri(GL_TEXTURE_MAG_FILTER, default_filter);
-		set_parameterf(GL_TEXTURE_LOD_BIAS, 0.f);
-		set_parameteri(GL_TEXTURE_MIN_LOD, 0);
-		set_parameteri(GL_TEXTURE_MAX_LOD, 0);
-		set_parameteri(GL_TEXTURE_COMPARE_MODE, GL_NONE);
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/sampler.h b/rpcs3/Emu/RSX/GL/glutils/sampler.h
deleted file mode 100644
index 89200915f8..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/sampler.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma once
-
-#include "common.h"
-
-namespace rsx
-{
-	class fragment_texture;
-	class vertex_texture;
-	class sampled_image_descriptor_base;
-}
-
-namespace gl
-{
-	class sampler_state
-	{
-		GLuint sampler_handle = 0;
-		std::unordered_map<GLenum, GLuint> m_propertiesi;
-		std::unordered_map<GLenum, GLfloat> m_propertiesf;
-
-	public:
-
-		void create()
-		{
-			glGenSamplers(1, &sampler_handle);
-		}
-
-		void remove()
-		{
-			if (sampler_handle)
-			{
-				glDeleteSamplers(1, &sampler_handle);
-			}
-		}
-
-		void bind(int index) const
-		{
-			glBindSampler(index, sampler_handle);
-		}
-
-		void set_parameteri(GLenum pname, GLuint value)
-		{
-			auto prop = m_propertiesi.find(pname);
-			if (prop != m_propertiesi.end() &&
-				prop->second == value)
-			{
-				return;
-			}
-
-			m_propertiesi[pname] = value;
-			glSamplerParameteri(sampler_handle, pname, value);
-		}
-
-		void set_parameterf(GLenum pname, GLfloat value)
-		{
-			auto prop = m_propertiesf.find(pname);
-			if (prop != m_propertiesf.end() &&
-				prop->second == value)
-			{
-				return;
-			}
-
-			m_propertiesf[pname] = value;
-			glSamplerParameterf(sampler_handle, pname, value);
-		}
-
-		GLuint get_parameteri(GLenum pname)
-		{
-			auto prop = m_propertiesi.find(pname);
-			return (prop == m_propertiesi.end()) ? 0 : prop->second;
-		}
-
-		GLfloat get_parameterf(GLenum pname)
-		{
-			auto prop = m_propertiesf.find(pname);
-			return (prop == m_propertiesf.end()) ? 0 : prop->second;
-		}
-
-		void apply(const rsx::fragment_texture& tex, const rsx::sampled_image_descriptor_base* sampled_image);
-		void apply(const rsx::vertex_texture& tex, const rsx::sampled_image_descriptor_base* sampled_image);
-
-		void apply_defaults(GLenum default_filter = GL_NEAREST);
-
-		operator bool() const { return sampler_handle != GL_NONE; }
-	};
-
-	struct saved_sampler_state
-	{
-		GLuint saved = GL_NONE;
-		GLuint unit = 0;
-
-		saved_sampler_state(GLuint _unit, const gl::sampler_state& sampler)
-		{
-			glActiveTexture(GL_TEXTURE0 + _unit);
-			glGetIntegerv(GL_SAMPLER_BINDING, reinterpret_cast<GLint*>(&saved));
-
-			unit = _unit;
-			sampler.bind(_unit);
-		}
-
-		saved_sampler_state(const saved_sampler_state&) = delete;
-
-		~saved_sampler_state()
-		{
-			glBindSampler(unit, saved);
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/state_tracker.hpp b/rpcs3/Emu/RSX/GL/glutils/state_tracker.hpp
deleted file mode 100644
index ffc4fe38f1..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/state_tracker.hpp
+++ /dev/null
@@ -1,437 +0,0 @@
-#pragma once
-
-#include "capabilities.h"
-
-#include "Utilities/geometry.h"
-#include <unordered_map>
-
-namespace gl
-{
-	class driver_state
-	{
-		const u32 DEPTH_BOUNDS       = 0xFFFF0001;
-		const u32 CLIP_PLANES        = 0xFFFF0002;
-		const u32 DEPTH_RANGE        = 0xFFFF0004;
-		const u32 STENCIL_FRONT_FUNC = 0xFFFF0005;
-		const u32 STENCIL_BACK_FUNC  = 0xFFFF0006;
-		const u32 STENCIL_FRONT_OP   = 0xFFFF0007;
-		const u32 STENCIL_BACK_OP    = 0xFFFF0008;
-		const u32 STENCIL_BACK_MASK  = 0xFFFF0009;
-
-		std::unordered_map<GLenum, u64> properties = {};
-		std::unordered_map<GLenum, std::array<u64, 4>> indexed_properties = {};
-
-		GLuint current_program = GL_NONE;
-		std::array<std::unordered_map<GLenum, GLuint>, 48> bound_textures{ {} };
-
-		bool test_and_set_property(GLenum property, u64 test)
-		{
-			auto found = properties.find(property);
-			if (found != properties.end() && found->second == test)
-				return true;
-
-			properties[property] = test;
-			return false;
-		}
-
-		bool test_and_set_property(GLenum property, u64 test, GLint index)
-		{
-			auto found = indexed_properties.find(property);
-			if (found != indexed_properties.end())
-			{
-				if (found->second[index] == test)
-				{
-					return true;
-				}
-
-				found->second[index] = test;
-				return false;
-			}
-
-			indexed_properties[property][index] = test;
-			return false;
-		}
-
-	public:
-
-		bool enable(u32 test, GLenum cap)
-		{
-			auto found = properties.find(cap);
-			if (found != properties.end() && found->second == test)
-				return !!test;
-
-			properties[cap] = test;
-
-			if (test)
-				glEnable(cap);
-			else
-				glDisable(cap);
-
-			return !!test;
-		}
-
-		bool enablei(u32 test, GLenum cap, u32 index)
-		{
-			auto found = indexed_properties.find(cap);
-			const bool exists = found != indexed_properties.end();
-
-			if (!exists)
-			{
-				indexed_properties[cap] = {};
-				indexed_properties[cap][index] = test;
-			}
-			else
-			{
-				if (found->second[index] == test)
-					return !!test;
-
-				found->second[index] = test;
-			}
-
-			if (test)
-				glEnablei(cap, index);
-			else
-				glDisablei(cap, index);
-
-			return !!test;
-		}
-
-		bool enable(GLenum cap)
-		{
-			return enable(GL_TRUE, cap);
-		}
-
-		bool enablei(GLenum cap, u32 index)
-		{
-			return enablei(GL_TRUE, cap, index);
-		}
-
-		bool disable(GLenum cap)
-		{
-			return enable(GL_FALSE, cap);
-		}
-
-		bool disablei(GLenum cap, u32 index)
-		{
-			return enablei(GL_FALSE, cap, index);
-		}
-
-		void depth_func(GLenum func)
-		{
-			if (!test_and_set_property(GL_DEPTH_FUNC, func))
-			{
-				glDepthFunc(func);
-			}
-		}
-
-		void depth_mask(GLboolean mask)
-		{
-			if (!test_and_set_property(GL_DEPTH_WRITEMASK, mask))
-			{
-				glDepthMask(mask);
-			}
-		}
-
-		void clear_depth(GLfloat depth)
-		{
-			const u32 value = std::bit_cast<u32>(depth);
-			if (!test_and_set_property(GL_DEPTH_CLEAR_VALUE, value))
-			{
-				glClearDepth(depth);
-			}
-		}
-
-		void stencil_mask(GLuint mask)
-		{
-			if (!test_and_set_property(GL_STENCIL_WRITEMASK, mask))
-			{
-				glStencilMask(mask);
-			}
-		}
-
-		void stencil_back_mask(GLuint mask)
-		{
-			if (!test_and_set_property(STENCIL_BACK_MASK, mask))
-			{
-				glStencilMaskSeparate(GL_BACK, mask);
-			}
-		}
-
-		void clear_stencil(GLint stencil)
-		{
-			const u32 value = std::bit_cast<u32>(stencil);
-			if (!test_and_set_property(GL_STENCIL_CLEAR_VALUE, value))
-			{
-				glClearStencil(stencil);
-			}
-		}
-
-		void stencil_func(GLenum func, GLint ref, GLuint mask)
-		{
-			const u32 value = func | ref << 16u | mask << 24;
-			if (!test_and_set_property(STENCIL_FRONT_FUNC, value))
-			{
-				glStencilFunc(func, ref, mask);
-			}
-		}
-
-		void stencil_back_func(GLenum func, GLint ref, GLuint mask)
-		{
-			const u32 value = func | ref << 16u | mask << 24;
-			if (!test_and_set_property(STENCIL_BACK_FUNC, value))
-			{
-				glStencilFunc(func, ref, mask);
-			}
-		}
-
-		void stencil_op(GLenum fail, GLenum zfail, GLenum zpass)
-		{
-			const u64 value = static_cast<u64>(fail) << 32 | static_cast<u64>(zfail) << 16 | static_cast<u64>(zpass);
-			if (!test_and_set_property(STENCIL_FRONT_OP, value))
-			{
-				glStencilOp(fail, zfail, zpass);
-			}
-		}
-
-		void stencil_back_op(GLenum fail, GLenum zfail, GLenum zpass)
-		{
-			const u64 value = static_cast<u64>(fail) << 32 | static_cast<u64>(zfail) << 16 | static_cast<u64>(zpass);
-			if (!test_and_set_property(STENCIL_BACK_OP, value))
-			{
-				glStencilOpSeparate(GL_BACK, fail, zfail, zpass);
-			}
-		}
-
-		void color_maski(GLint index, u32 mask)
-		{
-			if (!test_and_set_property(GL_COLOR_WRITEMASK, mask, index))
-			{
-				glColorMaski(index, ((mask & 0x10) ? 1 : 0), ((mask & 0x20) ? 1 : 0), ((mask & 0x40) ? 1 : 0), ((mask & 0x80) ? 1 : 0));
-			}
-		}
-
-		void color_maski(GLint index, bool r, bool g, bool b, bool a)
-		{
-			u32 mask = 0;
-			if (r) mask |= 0x10;
-			if (g) mask |= 0x20;
-			if (b) mask |= 0x40;
-			if (a) mask |= 0x80;
-
-			color_maski(index, mask);
-		}
-
-		void clear_color(u8 r, u8 g, u8 b, u8 a)
-		{
-			const u32 value = u32{ r } | u32{ g } << 8 | u32{ b } << 16 | u32{ a } << 24;
-			if (!test_and_set_property(GL_COLOR_CLEAR_VALUE, value))
-			{
-				glClearColor(r / 255.f, g / 255.f, b / 255.f, a / 255.f);
-			}
-		}
-
-		void clear_color(const color4f& color)
-		{
-			clear_color(static_cast<u8>(color.r * 255), static_cast<u8>(color.g * 255), static_cast<u8>(color.b * 255), static_cast<u8>(color.a * 255));
-		}
-
-		void depth_bounds(float min, float max)
-		{
-			const u64 value = (static_cast<u64>(std::bit_cast<u32>(max)) << 32) | std::bit_cast<u32>(min);
-			if (!test_and_set_property(DEPTH_BOUNDS, value))
-			{
-				if (get_driver_caps().NV_depth_buffer_float_supported)
-				{
-					glDepthBoundsdNV(min, max);
-				}
-				else
-				{
-					glDepthBoundsEXT(min, max);
-				}
-			}
-		}
-
-		void depth_range(float min, float max)
-		{
-			const u64 value = (static_cast<u64>(std::bit_cast<u32>(max)) << 32) | std::bit_cast<u32>(min);
-			if (!test_and_set_property(DEPTH_RANGE, value))
-			{
-				if (get_driver_caps().NV_depth_buffer_float_supported)
-				{
-					glDepthRangedNV(min, max);
-				}
-				else
-				{
-					glDepthRange(min, max);
-				}
-			}
-		}
-
-		void logic_op(GLenum op)
-		{
-			if (!test_and_set_property(GL_COLOR_LOGIC_OP, op))
-			{
-				glLogicOp(op);
-			}
-		}
-
-		void line_width(GLfloat width)
-		{
-			u32 value = std::bit_cast<u32>(width);
-			if (!test_and_set_property(GL_LINE_WIDTH, value))
-			{
-				glLineWidth(width);
-			}
-		}
-
-		void front_face(GLenum face)
-		{
-			if (!test_and_set_property(GL_FRONT_FACE, face))
-			{
-				glFrontFace(face);
-			}
-		}
-
-		void cull_face(GLenum mode)
-		{
-			if (!test_and_set_property(GL_CULL_FACE_MODE, mode))
-			{
-				glCullFace(mode);
-			}
-		}
-
-		void polygon_offset(float factor, float units)
-		{
-			const u64 value = (static_cast<u64>(std::bit_cast<u32>(units)) << 32) | std::bit_cast<u32>(factor);
-			if (!test_and_set_property(GL_POLYGON_OFFSET_FILL, value))
-			{
-				glPolygonOffset(factor, units);
-			}
-		}
-
-		void sample_mask(GLbitfield mask)
-		{
-			if (!test_and_set_property(GL_SAMPLE_MASK_VALUE, mask))
-			{
-				glSampleMaski(0, mask);
-			}
-		}
-
-		void sample_coverage(GLclampf coverage)
-		{
-			const u32 value = std::bit_cast<u32>(coverage);
-			if (!test_and_set_property(GL_SAMPLE_COVERAGE_VALUE, value))
-			{
-				glSampleCoverage(coverage, GL_FALSE);
-			}
-		}
-
-		void min_sample_shading_rate(GLclampf rate)
-		{
-			const u32 value = std::bit_cast<u32>(rate);
-			if (!test_and_set_property(GL_MIN_SAMPLE_SHADING_VALUE, value))
-			{
-				glMinSampleShading(rate);
-			}
-		}
-
-		void clip_planes(GLuint mask)
-		{
-			if (!test_and_set_property(CLIP_PLANES, mask))
-			{
-				for (u32 i = 0; i < 6; ++i)
-				{
-					if (mask & (1 << i))
-					{
-						glEnable(GL_CLIP_DISTANCE0 + i);
-					}
-					else
-					{
-						glDisable(GL_CLIP_DISTANCE0 + i);
-					}
-				}
-			}
-		}
-
-		void use_program(GLuint program)
-		{
-			if (current_program == program)
-			{
-				return;
-			}
-
-			current_program = program;
-			glUseProgram(program);
-		}
-
-		GLuint get_bound_texture(GLuint layer, GLenum target)
-		{
-			ensure(layer < 48);
-			return bound_textures[layer][target];
-		}
-
-		void bind_texture(GLuint layer, GLenum target, GLuint name, GLboolean force = GL_FALSE)
-		{
-			ensure(layer < 48);
-
-			auto& bound = bound_textures[layer][target];
-			if (bound != name || force)
-			{
-				glActiveTexture(GL_TEXTURE0 + layer);
-				glBindTexture(target, name);
-
-				bound = name;
-			}
-		}
-
-		void unbind_texture(GLenum target, GLuint name)
-		{
-			// To be called with glDeleteTextures.
-			// OpenGL internally unbinds the texture on delete, but then reuses the same ID when GenTextures is called again!
-			// This can also be avoided using unique internal names, such as 64-bit handles, but that involves changing a lot of code for little benefit
-			for (auto& layer : bound_textures)
-			{
-				if (layer.empty())
-				{
-					continue;
-				}
-
-				if (auto found = layer.find(target);
-					found != layer.end() && found->second == name)
-				{
-					// Actually still bound!
-					found->second = GL_NONE;
-					return;
-				}
-			}
-		}
-	};
-
-	class command_context
-	{
-		driver_state* drv;
-
-	public:
-		command_context()
-			: drv(nullptr)
-		{}
-
-		command_context(driver_state& drv_)
-			: drv(&drv_)
-		{}
-
-		driver_state* operator -> () {
-			return drv;
-		}
-	};
-
-	void set_command_context(gl::command_context& ctx);
-	void set_command_context(gl::driver_state& ctx);
-	gl::command_context get_command_context();
-
-	void set_primary_context_thread(bool = true);
-	bool is_primary_context_thread();
-
-	class fence;
-	void flush_command_queue(fence& fence_obj);
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/sync.hpp b/rpcs3/Emu/RSX/GL/glutils/sync.hpp
deleted file mode 100644
index 4a39bb6171..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/sync.hpp
+++ /dev/null
@@ -1,129 +0,0 @@
-#pragma once
-
-#include "common.h"
-
-namespace gl
-{
-	class fence
-	{
-		GLsync m_value = nullptr;
-		mutable GLenum flags = GL_SYNC_FLUSH_COMMANDS_BIT;
-		mutable bool signaled = false;
-
-	public:
-
-		fence() = default;
-		~fence() = default;
-
-		void create()
-		{
-			m_value = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-			flags = GL_SYNC_FLUSH_COMMANDS_BIT;
-		}
-
-		void destroy()
-		{
-			glDeleteSync(m_value);
-			m_value = nullptr;
-		}
-
-		void reset()
-		{
-			if (m_value != nullptr)
-				destroy();
-
-			create();
-		}
-
-		bool is_empty() const
-		{
-			return (m_value == nullptr);
-		}
-
-		bool check_signaled() const
-		{
-			ensure(m_value);
-
-			if (signaled)
-				return true;
-
-			if (flags)
-			{
-				GLenum err = glClientWaitSync(m_value, flags, 0);
-				flags = 0;
-
-				if (!(err == GL_ALREADY_SIGNALED || err == GL_CONDITION_SATISFIED))
-					return false;
-			}
-			else
-			{
-				GLint status = GL_UNSIGNALED;
-				GLint tmp;
-
-				glGetSynciv(m_value, GL_SYNC_STATUS, 4, &tmp, &status);
-
-				if (status != GL_SIGNALED)
-					return false;
-			}
-
-			signaled = true;
-			return true;
-		}
-
-		bool wait_for_signal()
-		{
-			ensure(m_value);
-
-			if (signaled == GL_FALSE)
-			{
-				GLenum err = GL_WAIT_FAILED;
-				bool done = false;
-
-				while (!done)
-				{
-					if (flags)
-					{
-						err = glClientWaitSync(m_value, flags, 0);
-						flags = 0;
-
-						switch (err)
-						{
-						default:
-							rsx_log.error("gl::fence sync returned unknown error 0x%X", err);
-							[[fallthrough]];
-						case GL_ALREADY_SIGNALED:
-						case GL_CONDITION_SATISFIED:
-							done = true;
-							break;
-						case GL_TIMEOUT_EXPIRED:
-							continue;
-						}
-					}
-					else
-					{
-						GLint status = GL_UNSIGNALED;
-						GLint tmp;
-
-						glGetSynciv(m_value, GL_SYNC_STATUS, 4, &tmp, &status);
-
-						if (status == GL_SIGNALED)
-							break;
-					}
-				}
-
-				signaled = (err == GL_ALREADY_SIGNALED || err == GL_CONDITION_SATISFIED);
-			}
-
-			glDeleteSync(m_value);
-			m_value = nullptr;
-
-			return signaled;
-		}
-
-		void server_wait_sync() const
-		{
-			ensure(m_value != nullptr);
-			glWaitSync(m_value, 0, GL_TIMEOUT_IGNORED);
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/GL/glutils/vao.hpp b/rpcs3/Emu/RSX/GL/glutils/vao.hpp
deleted file mode 100644
index 410d874df6..0000000000
--- a/rpcs3/Emu/RSX/GL/glutils/vao.hpp
+++ /dev/null
@@ -1,306 +0,0 @@
-#pragma once
-
-#include "common.h"
-#include "buffer_object.h"
-
-#include "Utilities/geometry.h"
-
-namespace gl
-{
-	class vao;
-
-	class buffer_pointer
-	{
-	public:
-		enum class type
-		{
-			s8 = GL_BYTE,
-			u8 = GL_UNSIGNED_BYTE,
-			s16 = GL_SHORT,
-			u16 = GL_UNSIGNED_SHORT,
-			s32 = GL_INT,
-			u32 = GL_UNSIGNED_INT,
-			f16 = GL_HALF_FLOAT,
-			f32 = GL_FLOAT,
-			f64 = GL_DOUBLE,
-			fixed = GL_FIXED,
-			s32_2_10_10_10_rev = GL_INT_2_10_10_10_REV,
-			u32_2_10_10_10_rev = GL_UNSIGNED_INT_2_10_10_10_REV,
-			u32_10f_11f_11f_rev = GL_UNSIGNED_INT_10F_11F_11F_REV
-		};
-
-	private:
-		vao* m_vao;
-		u32 m_offset;
-		u32 m_stride;
-		u32 m_size = 4;
-		type m_type = type::f32;
-		bool m_normalize = false;
-
-	public:
-		buffer_pointer(vao* vao, u32 offset = 0, u32 stride = 0)
-			: m_vao(vao)
-			, m_offset(offset)
-			, m_stride(stride)
-		{
-		}
-
-		const class ::gl::vao& get_vao() const
-		{
-			return *m_vao;
-		}
-
-		class ::gl::vao& get_vao()
-		{
-			return *m_vao;
-		}
-
-		buffer_pointer& offset(u32 value)
-		{
-			m_offset = value;
-			return *this;
-		}
-
-		u32 offset() const
-		{
-			return m_offset;
-		}
-
-		buffer_pointer& stride(u32 value)
-		{
-			m_stride = value;
-			return *this;
-		}
-
-		u32 stride() const
-		{
-			return m_stride;
-		}
-
-		buffer_pointer& size(u32 value)
-		{
-			m_size = value;
-			return *this;
-		}
-
-		u32 size() const
-		{
-			return m_size;
-		}
-
-		buffer_pointer& set_type(type value)
-		{
-			m_type = value;
-			return *this;
-		}
-
-		type get_type() const
-		{
-			return m_type;
-		}
-
-		buffer_pointer& normalize(bool value)
-		{
-			m_normalize = value;
-			return *this;
-		}
-
-		bool normalize() const
-		{
-			return m_normalize;
-		}
-
-		buffer_pointer& operator >> (u32 value)
-		{
-			return stride(value);
-		}
-
-		buffer_pointer& config(type type_ = type::f32, u32 size_ = 4, bool normalize_ = false)
-		{
-			return set_type(type_).size(size_).normalize(normalize_);
-		}
-	};
-
-	class attrib_t;
-
-	class vao
-	{
-		template<buffer::target BindId, uint GetStateId>
-		class entry
-		{
-			vao& m_parent;
-
-		public:
-			using save_binding_state = save_binding_state_base<entry, (static_cast<GLuint>(BindId)), GetStateId>;
-
-			entry(vao* parent) noexcept : m_parent(*parent)
-			{
-			}
-
-			entry& operator = (const buffer& buf) noexcept
-			{
-				m_parent.bind();
-				buf.bind(BindId);
-
-				return *this;
-			}
-		};
-
-		GLuint m_id = GL_NONE;
-
-	public:
-		entry<buffer::target::pixel_pack, GL_PIXEL_PACK_BUFFER_BINDING> pixel_pack_buffer{ this };
-		entry<buffer::target::pixel_unpack, GL_PIXEL_UNPACK_BUFFER_BINDING> pixel_unpack_buffer{ this };
-		entry<buffer::target::array, GL_ARRAY_BUFFER_BINDING> array_buffer{ this };
-		entry<buffer::target::element_array, GL_ELEMENT_ARRAY_BUFFER_BINDING> element_array_buffer{ this };
-
-		vao() = default;
-		vao(const vao&) = delete;
-
-		vao(vao&& vao_) noexcept
-		{
-			swap(vao_);
-		}
-		vao(GLuint id) noexcept
-		{
-			set_id(id);
-		}
-
-		~vao() noexcept
-		{
-			if (created())
-				remove();
-		}
-
-		void swap(vao& vao_) noexcept
-		{
-			auto my_old_id = id();
-			set_id(vao_.id());
-			vao_.set_id(my_old_id);
-		}
-
-		vao& operator = (const vao& rhs) = delete;
-		vao& operator = (vao&& rhs) noexcept
-		{
-			swap(rhs);
-			return *this;
-		}
-
-		void bind() const noexcept
-		{
-			glBindVertexArray(m_id);
-		}
-
-		void create() noexcept
-		{
-			glGenVertexArrays(1, &m_id);
-		}
-
-		void remove() noexcept
-		{
-			if (m_id != GL_NONE)
-			{
-				glDeleteVertexArrays(1, &m_id);
-				m_id = GL_NONE;
-			}
-		}
-
-		uint id() const noexcept
-		{
-			return m_id;
-		}
-
-		void set_id(uint id) noexcept
-		{
-			m_id = id;
-		}
-
-		bool created() const noexcept
-		{
-			return m_id != GL_NONE;
-		}
-
-		explicit operator bool() const noexcept
-		{
-			return created();
-		}
-
-		void enable_for_attributes(std::initializer_list<GLuint> indexes) noexcept
-		{
-			for (auto& index : indexes)
-			{
-				glEnableVertexAttribArray(index);
-			}
-		}
-
-		void disable_for_attributes(std::initializer_list<GLuint> indexes) noexcept
-		{
-			for (auto& index : indexes)
-			{
-				glDisableVertexAttribArray(index);
-			}
-		}
-
-		void enable_for_attribute(GLuint index) noexcept
-		{
-			enable_for_attributes({ index });
-		}
-
-		void disable_for_attribute(GLuint index) noexcept
-		{
-			disable_for_attributes({ index });
-		}
-
-		buffer_pointer operator + (u32 offset) noexcept
-		{
-			return{ this, offset };
-		}
-
-		buffer_pointer operator >> (u32 stride) noexcept
-		{
-			return{ this, {}, stride };
-		}
-
-		operator buffer_pointer() noexcept
-		{
-			return{ this };
-		}
-
-		attrib_t operator [] (u32 index) const noexcept;
-	};
-
-	class attrib_t
-	{
-		GLint m_location;
-
-	public:
-		attrib_t(GLint location)
-			: m_location(location)
-		{
-		}
-
-		GLint location() const
-		{
-			return m_location;
-		}
-
-		void operator = (float rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib1f(location(), rhs); }
-		void operator = (double rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib1d(location(), rhs); }
-
-		void operator = (const color1f& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib1f(location(), rhs.r); }
-		void operator = (const color1d& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib1d(location(), rhs.r); }
-		void operator = (const color2f& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib2f(location(), rhs.r, rhs.g); }
-		void operator = (const color2d& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib2d(location(), rhs.r, rhs.g); }
-		void operator = (const color3f& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib3f(location(), rhs.r, rhs.g, rhs.b); }
-		void operator = (const color3d& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib3d(location(), rhs.r, rhs.g, rhs.b); }
-		void operator = (const color4f& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib4f(location(), rhs.r, rhs.g, rhs.b, rhs.a); }
-		void operator = (const color4d& rhs) const { glDisableVertexAttribArray(location()); glVertexAttrib4d(location(), rhs.r, rhs.g, rhs.b, rhs.a); }
-
-		void operator = (buffer_pointer& pointer) const
-		{
-			pointer.get_vao().enable_for_attribute(m_location);
-			glVertexAttribPointer(location(), pointer.size(), static_cast<GLenum>(pointer.get_type()), pointer.normalize(),
-				pointer.stride(), reinterpret_cast<const void*>(u64{ pointer.offset() }));
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/GL/upscalers/bilinear_pass.hpp b/rpcs3/Emu/RSX/GL/upscalers/bilinear_pass.hpp
deleted file mode 100644
index 7172406b17..0000000000
--- a/rpcs3/Emu/RSX/GL/upscalers/bilinear_pass.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include "static_pass.hpp"
-
-namespace gl
-{
-	using bilinear_upscale_pass = static_upscale_pass<gl::filter::linear>;
-}
diff --git a/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp b/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp
deleted file mode 100644
index cfd7b1cc08..0000000000
--- a/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-#include "stdafx.h"
-
-#include "../../glutils/fbo.h"
-#include "../fsr_pass.h"
-
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wignored-qualifiers"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#pragma GCC diagnostic ignored "-Wunused-function"
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wignored-qualifiers"
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#pragma clang diagnostic ignored "-Wunused-function"
-#endif
-
-#define A_CPU 1
-#include "3rdparty/GPUOpen/include/ffx_a.h"
-#include "3rdparty/GPUOpen/include/ffx_fsr1.h"
-#undef A_CPU
-
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-namespace gl
-{
-	namespace FidelityFX
-	{
-		fsr_pass::fsr_pass(const std::string& config_definitions, u32 push_constants_size)
-		{
-			// Just use AMD-provided source with minimal modification
-			const char* shader_core =
-				#include "Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl"
-				;
-
-			// Replacements
-			const char* ffx_a_contents =
-				#include "Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_a_flattened.inc"
-				;
-
-			const char* ffx_fsr_contents =
-				#include "Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_fsr1_flattened.inc"
-				;
-
-			const std::pair<std::string_view, std::string> replacement_table[] =
-			{
-				{ "%FFX_DEFINITIONS%", config_definitions },
-				{ "%FFX_A_IMPORT%", ffx_a_contents },
-				{ "%FFX_FSR_IMPORT%", ffx_fsr_contents },
-				{ "layout(set=0,", "layout(" },
-				{ "%push_block%", fmt::format("binding=%d, std140", GL_COMPUTE_BUFFER_SLOT(0)) }
-			};
-
-			m_src = shader_core;
-			m_src = fmt::replace_all(m_src, replacement_table);
-
-			// Fill with 0 to avoid sending incomplete/unused variables to the GPU
-			m_constants_buf.resize(utils::rounded_div(push_constants_size, 4), 0);
-
-			create();
-
-			m_sampler.create();
-			m_sampler.apply_defaults(GL_LINEAR);
-		}
-
-		fsr_pass::~fsr_pass()
-		{
-			m_ubo.remove();
-			m_sampler.remove();
-		}
-
-		void fsr_pass::bind_resources()
-		{
-			// Bind relevant stuff
-			const u32 push_buffer_size = ::size32(m_constants_buf) * sizeof(m_constants_buf[0]);
-
-			if (!m_ubo)
-			{
-				ensure(compiled);
-				m_ubo.create(gl::buffer::target::uniform, push_buffer_size, nullptr, gl::buffer::memory_type::local, gl::buffer::usage::dynamic_update);
-
-				// Statically bind the image sources
-				m_program.uniforms["InputTexture"] = GL_TEMP_IMAGE_SLOT(0);
-				m_program.uniforms["OutputTexture"] = GL_COMPUTE_IMAGE_SLOT(0);
-			}
-
-			m_ubo.sub_data(0, push_buffer_size, m_constants_buf.data());
-			m_ubo.bind_range(GL_COMPUTE_BUFFER_SLOT(0), 0, push_buffer_size);
-		}
-
-		void fsr_pass::run(gl::command_context& cmd, gl::texture* src, gl::texture* dst, const size2u& input_size, const size2u& output_size)
-		{
-			m_input_image = src;
-			m_output_image = dst;
-			m_input_size = input_size;
-			m_output_size = output_size;
-
-			configure();
-
-			saved_sampler_state saved(GL_TEMP_IMAGE_SLOT(0), m_sampler);
-			cmd->bind_texture(GL_TEMP_IMAGE_SLOT(0), GL_TEXTURE_2D, src->id());
-
-			glBindImageTexture(GL_COMPUTE_IMAGE_SLOT(0), dst->id(), 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA8);
-
-			constexpr auto wg_size = 16;
-			const auto invocations_x = utils::aligned_div(output_size.width, wg_size);
-			const auto invocations_y = utils::aligned_div(output_size.height, wg_size);
-
-			ensure(invocations_x == (output_size.width + (wg_size - 1)) / wg_size);
-			ensure(invocations_y == (output_size.height + (wg_size - 1)) / wg_size);
-			compute_task::run(cmd, invocations_x, invocations_y);
-		}
-
-		easu_pass::easu_pass()
-			: fsr_pass(
-				"#define SAMPLE_EASU 1\n"
-				"#define SAMPLE_RCAS 0\n"
-				"#define SAMPLE_BILINEAR 0\n"
-				"#define SAMPLE_SLOW_FALLBACK 1",
-				80 // 5*VEC4
-			)
-		{}
-
-		void easu_pass::configure()
-		{
-			// NOTE: Configuration vector 4 is unused as we do not support HDR natively
-			auto con0 = &m_constants_buf[0];
-			auto con1 = &m_constants_buf[4];
-			auto con2 = &m_constants_buf[8];
-			auto con3 = &m_constants_buf[12];
-
-			FsrEasuCon(con0, con1, con2, con3,
-				static_cast<f32>(m_input_size.width), static_cast<f32>(m_input_size.height),     // Incoming viewport size to upscale (actual size)
-				static_cast<f32>(m_input_image->width()), static_cast<f32>(m_input_image->height()),     // Size of the raw image to upscale (in case viewport does not cover it all)
-				static_cast<f32>(m_output_size.width), static_cast<f32>(m_output_size.height));  // Size of output viewport (target size)
-		}
-
-		rcas_pass::rcas_pass()
-			: fsr_pass(
-				"#define SAMPLE_RCAS 1\n"
-				"#define SAMPLE_EASU 0\n"
-				"#define SAMPLE_BILINEAR 0\n"
-				"#define SAMPLE_SLOW_FALLBACK 1",
-				32 // 2*VEC4
-			)
-		{}
-
-		void rcas_pass::configure()
-		{
-			// 0 is actually the sharpest with 2 being the chosen limit. Each progressive unit 'halves' the sharpening intensity.
-			auto cas_attenuation = 2.f - (g_cfg.video.vk.rcas_sharpening_intensity / 50.f);
-			FsrRcasCon(&m_constants_buf[0], cas_attenuation);
-		}
-	}
-
-	fsr_upscale_pass::~fsr_upscale_pass()
-	{
-		dispose_images();
-	}
-
-	void fsr_upscale_pass::dispose_images()
-	{
-		m_output_left.reset();
-		m_output_right.reset();
-		m_intermediate_data.reset();
-		m_flip_fbo.remove();
-	}
-
-	void fsr_upscale_pass::initialize_image(u32 output_w, u32 output_h, rsx::flags32_t mode)
-	{
-		dispose_images();
-
-		const auto initialize_image_impl = [&]()
-		{
-			return std::make_unique<gl::viewable_image>(
-				GL_TEXTURE_2D,
-				output_w, output_h, 1, 1, 1,
-				GL_RGBA8, RSX_FORMAT_CLASS_COLOR);
-		};
-
-		if (mode & UPSCALE_LEFT_VIEW)
-		{
-			m_output_left = initialize_image_impl();
-		}
-
-		if (mode & UPSCALE_RIGHT_VIEW)
-		{
-			m_output_right = initialize_image_impl();
-		}
-
-		m_intermediate_data = initialize_image_impl();
-	}
-
-	gl::texture* fsr_upscale_pass::scale_output(
-		gl::command_context& cmd,
-		gl::texture* src,
-		const areai& src_region,
-		const areai& dst_region,
-		gl::flags32_t mode)
-	{
-		size2u input_size, output_size;
-		input_size.width = src_region.width();
-		input_size.height = src_region.height();
-		output_size.width = dst_region.width();
-		output_size.height = dst_region.height();
-
-		auto src_image = src;
-		auto input_region = src_region;
-
-		if (input_size.width < output_size.width && input_size.height < output_size.height)
-		{
-			// Cannot upscale both LEFT and RIGHT images at the same time.
-			// Default maps to LEFT for simplicity
-			ensure((mode & (UPSCALE_LEFT_VIEW | UPSCALE_RIGHT_VIEW)) != (UPSCALE_LEFT_VIEW | UPSCALE_RIGHT_VIEW));
-
-			auto& m_output_data = (mode & UPSCALE_LEFT_VIEW) ? m_output_left : m_output_right;
-			if (!m_output_data || m_output_data->width() != output_size.width || m_output_data->height() != output_size.height)
-			{
-				initialize_image(output_size.width, output_size.height, mode);
-			}
-
-			if (m_output_data)
-			{
-				// Execute the pass here
-				auto cs_easu_task = gl::get_compute_task<gl::FidelityFX::easu_pass>();
-				auto cs_rcas_task = gl::get_compute_task<gl::FidelityFX::rcas_pass>();
-
-				// EASU
-				cs_easu_task->run(cmd, src, m_intermediate_data.get(), input_size, output_size);
-
-				// RCAS
-				cs_rcas_task->run(cmd, m_intermediate_data.get(), m_output_data.get(), input_size, output_size);
-
-				// Swap input for FSR target
-				src_image = m_output_data.get();
-
-				input_region.x1 = 0;
-				input_region.x2 = src_image->width();
-				input_region.y1 = 0;
-				input_region.y2 = src_image->height();
-			}
-		}
-
-		if (mode & UPSCALE_AND_COMMIT)
-		{
-			m_flip_fbo.recreate();
-			m_flip_fbo.bind();
-			m_flip_fbo.color = src_image->id();
-			m_flip_fbo.read_buffer(m_flip_fbo.color);
-			m_flip_fbo.draw_buffer(m_flip_fbo.color);
-			m_flip_fbo.blit(gl::screen, input_region, dst_region, gl::buffers::color, gl::filter::linear);
-			return 0;
-		}
-
-		return src_image;
-	}
-}
diff --git a/rpcs3/Emu/RSX/GL/upscalers/fsr_pass.h b/rpcs3/Emu/RSX/GL/upscalers/fsr_pass.h
deleted file mode 100644
index 1d1975923a..0000000000
--- a/rpcs3/Emu/RSX/GL/upscalers/fsr_pass.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#pragma once
-
-#include "../glutils/buffer_object.h"
-#include "../glutils/state_tracker.hpp"
-
-#include "../GLCompute.h"
-#include "upscaling.h"
-
-namespace gl
-{
-	namespace FidelityFX
-	{
-		class fsr_pass : public compute_task
-		{
-		protected:
-			gl::texture* m_input_image = nullptr;
-			gl::texture* m_output_image = nullptr;
-			size2u m_input_size;
-			size2u m_output_size;
-
-			std::vector<u32> m_constants_buf;
-			gl::sampler_state m_sampler;
-			gl::buffer m_ubo;
-
-			void bind_resources() override;
-			virtual void configure() = 0;
-
-		public:
-			fsr_pass(const std::string& config_definitions, u32 push_constants_size);
-			virtual ~fsr_pass();
-
-			void run(gl::command_context& cmd, gl::texture* src, gl::texture* dst, const size2u& input_size, const size2u& output_size);
-		};
-
-		class easu_pass : public fsr_pass
-		{
-			void configure() override;
-
-		public:
-			easu_pass();
-		};
-
-		class rcas_pass : public fsr_pass
-		{
-			void configure() override;
-
-		public:
-			rcas_pass();
-		};
-	}
-
-	class fsr_upscale_pass : public upscaler
-	{
-	public:
-		fsr_upscale_pass() = default;
-		~fsr_upscale_pass();
-
-		gl::texture* scale_output(
-			gl::command_context& cmd,               // State
-			gl::texture* src,                       // Source input
-			const areai& src_region,                // Scaling request information
-			const areai& dst_region,                // Ditto
-			gl::flags32_t mode                      // Mode
-		) override;
-
-	private:
-		std::unique_ptr<gl::viewable_image> m_output_left;
-		std::unique_ptr<gl::viewable_image> m_output_right;
-		std::unique_ptr<gl::viewable_image> m_intermediate_data;
-
-		gl::fbo m_flip_fbo;
-
-		void dispose_images();
-		void initialize_image(u32 output_w, u32 output_h, rsx::flags32_t mode);
-	};
-}
diff --git a/rpcs3/Emu/RSX/GL/upscalers/nearest_pass.hpp b/rpcs3/Emu/RSX/GL/upscalers/nearest_pass.hpp
deleted file mode 100644
index 8027ca9c38..0000000000
--- a/rpcs3/Emu/RSX/GL/upscalers/nearest_pass.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include "static_pass.hpp"
-
-namespace gl
-{
-	using nearest_upscale_pass = static_upscale_pass<gl::filter::nearest>;
-}
diff --git a/rpcs3/Emu/RSX/GL/upscalers/static_pass.hpp b/rpcs3/Emu/RSX/GL/upscalers/static_pass.hpp
deleted file mode 100644
index 336b145d80..0000000000
--- a/rpcs3/Emu/RSX/GL/upscalers/static_pass.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include "../glutils/fbo.h"
-
-#include "upscaling.h"
-
-namespace gl
-{
-	template<gl::filter Filter>
-	class static_upscale_pass : public upscaler
-	{
-	public:
-		static_upscale_pass() = default;
-		~static_upscale_pass()
-		{
-			if (m_flip_fbo)
-			{
-				m_flip_fbo.remove();
-			}
-		}
-
-		gl::texture* scale_output(
-			gl::command_context& /*cmd*/,           // State
-			gl::texture*   src,                     // Source input
-			const areai& src_region,                // Scaling request information
-			const areai& dst_region,                // Ditto
-			gl::flags32_t mode                      // Mode
-		) override
-		{
-			if (mode & UPSCALE_AND_COMMIT)
-			{
-				m_flip_fbo.recreate();
-				m_flip_fbo.bind();
-				m_flip_fbo.color = src->id();
-				m_flip_fbo.read_buffer(m_flip_fbo.color);
-				m_flip_fbo.draw_buffer(m_flip_fbo.color);
-				m_flip_fbo.blit(gl::screen, src_region, dst_region, gl::buffers::color, Filter);
-				return nullptr;
-			}
-
-			// Upscaling source only is unsupported
-			return src;
-		}
-
-	private:
-		gl::fbo m_flip_fbo;
-	};
-}
diff --git a/rpcs3/Emu/RSX/GL/upscalers/upscaling.h b/rpcs3/Emu/RSX/GL/upscalers/upscaling.h
deleted file mode 100644
index 9c8eec6439..0000000000
--- a/rpcs3/Emu/RSX/GL/upscalers/upscaling.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "../glutils/image.h"
-#include "../glutils/state_tracker.hpp"
-
-namespace gl
-{
-	namespace upscaling_flags_
-	{
-		enum upscaling_flags
-		{
-			UPSCALE_DEFAULT_VIEW = (1 << 0),
-			UPSCALE_LEFT_VIEW = (1 << 0),
-			UPSCALE_RIGHT_VIEW = (1 << 1),
-			UPSCALE_AND_COMMIT = (1 << 2)
-		};
-	}
-
-	using namespace upscaling_flags_;
-
-	struct upscaler
-	{
-		virtual ~upscaler() {}
-
-		virtual gl::texture* scale_output(
-			gl::command_context& cmd,               // State
-			gl::texture* src,                       // Source input
-			const areai& src_region,                // Scaling request information
-			const areai& dst_region,                // Ditto
-			gl::flags32_t mode                      // Mode
-		) = 0;
-	};
-}
diff --git a/rpcs3/Emu/RSX/GSFrameBase.cpp b/rpcs3/Emu/RSX/GSFrameBase.cpp
deleted file mode 100644
index 32121bf06e..0000000000
--- a/rpcs3/Emu/RSX/GSFrameBase.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "stdafx.h"
-#include "GSFrameBase.h"
-#include "Emu/system_config.h"
-
-atomic_t<bool> g_game_window_focused = false;
-
-bool is_input_allowed()
-{
-	return g_game_window_focused || g_cfg.io.background_input_enabled;
-}
diff --git a/rpcs3/Emu/RSX/GSFrameBase.h b/rpcs3/Emu/RSX/GSFrameBase.h
index ef17378dd3..f68c6d4aa3 100644
--- a/rpcs3/Emu/RSX/GSFrameBase.h
+++ b/rpcs3/Emu/RSX/GSFrameBase.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "util/types.hpp"
+#include "util/atomic.hpp"
 #include <vector>
 
 #include "display.h"
@@ -13,7 +14,6 @@ public:
 	virtual ~GSFrameBase() = default;
 
 	virtual void close() = 0;
-	virtual void reset() = 0;
 	virtual bool shown() = 0;
 	virtual void hide() = 0;
 	virtual void show() = 0;
@@ -25,12 +25,10 @@ public:
 	virtual void flip(draw_context_t ctx, bool skip_frame = false) = 0;
 	virtual int client_width() = 0;
 	virtual int client_height() = 0;
-	virtual f64 client_display_rate() = 0;
-	virtual bool has_alpha() = 0;
+	virtual double client_device_pixel_ratio() const = 0;
 
 	virtual display_handle_t handle() const = 0;
 
-	virtual bool can_consume_frame() const = 0;
-	virtual void present_frame(std::vector<u8>& data, u32 pitch, u32 width, u32 height, bool is_bgra) const = 0;
-	virtual void take_screenshot(std::vector<u8>&& sshot_data, u32 sshot_width, u32 sshot_height, bool is_bgra) = 0;
+	atomic_t<bool> screenshot_toggle = false;
+	virtual void take_screenshot(const std::vector<u8> sshot_data, const u32 sshot_width, const u32 sshot_height, bool is_bgra) = 0;
 };
diff --git a/rpcs3/Emu/RSX/GSRender.cpp b/rpcs3/Emu/RSX/GSRender.cpp
index e9e859952e..1ee2c5ad2d 100644
--- a/rpcs3/Emu/RSX/GSRender.cpp
+++ b/rpcs3/Emu/RSX/GSRender.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 
-#include "Emu/System.h"
 #include "GSRender.h"
 
-GSRender::GSRender(utils::serial* ar) noexcept : rsx::thread(ar)
+GSRender::GSRender()
+	: m_context(nullptr)
 {
 	if (auto gs_frame = Emu.GetCallbacks().get_gs_frame())
 	{
@@ -19,7 +19,7 @@ GSRender::~GSRender()
 {
 	m_context = nullptr;
 
-	if (m_frame && !m_continuous_mode)
+	if (m_frame)
 	{
 		m_frame->close();
 	}
@@ -36,17 +36,13 @@ void GSRender::on_init_thread()
 
 void GSRender::on_exit()
 {
-	rsx::thread::on_exit();
-
 	if (m_frame)
 	{
-		if (!m_continuous_mode)
-		{
-			m_frame->hide();
-		}
 		m_frame->delete_context(m_context);
 		m_context = nullptr;
 	}
+
+	rsx::thread::on_exit();
 }
 
 void GSRender::flip(const rsx::display_flip_info_t&)
@@ -56,14 +52,3 @@ void GSRender::flip(const rsx::display_flip_info_t&)
 		m_frame->flip(m_context);
 	}
 }
-
-f64 GSRender::get_display_refresh_rate() const
-{
-	if (m_frame)
-	{
-		return m_frame->client_display_rate();
-	}
-
-	// Minimum
-	return 20.;
-}
diff --git a/rpcs3/Emu/RSX/GSRender.h b/rpcs3/Emu/RSX/GSRender.h
index d2a6fd9c5f..0d99decabd 100644
--- a/rpcs3/Emu/RSX/GSRender.h
+++ b/rpcs3/Emu/RSX/GSRender.h
@@ -20,21 +20,16 @@ class GSRender : public rsx::thread
 {
 protected:
 	GSFrameBase* m_frame;
-	draw_context_t m_context = nullptr;
-	bool m_continuous_mode = false;
+	draw_context_t m_context;
 
 public:
+	GSRender();
 	~GSRender() override;
 
-	GSRender(utils::serial* ar) noexcept;
-
-	void set_continuous_mode(bool continuous_mode) { m_continuous_mode = continuous_mode; }
-
 	void on_init_thread() override;
 	void on_exit() override;
 
 	void flip(const rsx::display_flip_info_t& info) override;
-	f64 get_display_refresh_rate() const override;
 
 	GSFrameBase* get_frame() const { return m_frame; }
 };
diff --git a/rpcs3/Emu/RSX/Host/MM.cpp b/rpcs3/Emu/RSX/Host/MM.cpp
deleted file mode 100644
index e1313cc13a..0000000000
--- a/rpcs3/Emu/RSX/Host/MM.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-#include "stdafx.h"
-#include "MM.h"
-#include <Emu/RSX/Common/simple_array.hpp>
-#include <Emu/RSX/RSXOffload.h>
-
-#include <Emu/Memory/vm.h>
-#include <Emu/IdManager.h>
-#include <Emu/system_config.h>
-#include <Utilities/address_range.h>
-#include <Utilities/mutex.h>
-
-namespace rsx
-{
-	rsx::simple_array<MM_block> g_deferred_mprotect_queue;
-	shared_mutex g_mprotect_queue_lock;
-
-	void mm_flush_mprotect_queue_internal()
-	{
-		for (const auto& block : g_deferred_mprotect_queue)
-		{
-			utils::memory_protect(reinterpret_cast<void*>(block.range.start), block.range.length(), block.prot);
-		}
-
-		g_deferred_mprotect_queue.clear();
-	}
-
-	void mm_defer_mprotect_internal(u64 start, u64 length, utils::protection prot)
-	{
-		// We could stack and merge requests here, but that is more trouble than it is truly worth.
-		// A fresh call to memory_protect only takes a few nanoseconds of setup overhead, it is not worth the risk of hanging because of conflicts.
-		g_deferred_mprotect_queue.push_back({ utils::address_range64::start_length(start, length), prot });
-	}
-
-	void mm_protect(void* ptr, u64 length, utils::protection prot)
-	{
-		if (g_cfg.video.disable_async_host_memory_manager)
-		{
-			utils::memory_protect(ptr, length, prot);
-			return;
-		}
-
-		// Naive merge. Eventually it makes more sense to do conflict resolution, but it's not as important.
-		const auto start = reinterpret_cast<u64>(ptr);
-		const auto range = utils::address_range64::start_length(start, length);
-
-		std::lock_guard lock(g_mprotect_queue_lock);
-
-		if (prot == utils::protection::rw || prot == utils::protection::wx)
-		{
-			// Basically an unlock op. Flush if any overlap is detected
-			for (const auto& block : g_deferred_mprotect_queue)
-			{
-				if (block.overlaps(range))
-				{
-					mm_flush_mprotect_queue_internal();
-					break;
-				}
-			}
-
-			utils::memory_protect(ptr, length, prot);
-			return;
-		}
-
-		// No, Ro, etc.
-		mm_defer_mprotect_internal(start, length, prot);
-	}
-
-	void mm_flush()
-	{
-		std::lock_guard lock(g_mprotect_queue_lock);
-		mm_flush_mprotect_queue_internal();
-	}
-
-	void mm_flush(u32 vm_address)
-	{
-		std::lock_guard lock(g_mprotect_queue_lock);
-		if (g_deferred_mprotect_queue.empty())
-		{
-			return;
-		}
-
-		const auto addr = reinterpret_cast<u64>(vm::base(vm_address));
-		for (const auto& block : g_deferred_mprotect_queue)
-		{
-			if (block.overlaps(addr))
-			{
-				mm_flush_mprotect_queue_internal();
-				return;
-			}
-		}
-	}
-
-	void mm_flush(const rsx::simple_array<utils::address_range64>& ranges)
-	{
-		std::lock_guard lock(g_mprotect_queue_lock);
-		if (g_deferred_mprotect_queue.empty())
-		{
-			return;
-		}
-
-		for (const auto& block : g_deferred_mprotect_queue)
-		{
-			if (ranges.any(FN(block.overlaps(x))))
-			{
-				mm_flush_mprotect_queue_internal();
-				return;
-			}
-		}
-	}
-
-	void mm_flush_lazy()
-	{
-		if (!g_cfg.video.multithreaded_rsx)
-		{
-			mm_flush();
-			return;
-		}
-
-		std::lock_guard lock(g_mprotect_queue_lock);
-		if (g_deferred_mprotect_queue.empty())
-		{
-			return;
-		}
-
-		auto& rsxdma = g_fxo->get<rsx::dma_manager>();
-		rsxdma.backend_ctrl(mm_backend_ctrl::cmd_mm_flush, nullptr);
-	}
-}
diff --git a/rpcs3/Emu/RSX/Host/MM.h b/rpcs3/Emu/RSX/Host/MM.h
deleted file mode 100644
index 43053cdd17..0000000000
--- a/rpcs3/Emu/RSX/Host/MM.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include <util/vm.hpp>
-
-#include "Emu/RSX/Common/simple_array.hpp"
-#include "Utilities/address_range.h"
-
-namespace rsx
-{
-	struct MM_block
-	{
-		utils::address_range64 range;
-		utils::protection prot;
-
-		inline bool overlaps(const utils::address_range64& test) const
-		{
-			return range.overlaps(test);
-		}
-
-		inline bool overlaps(u64 addr) const
-		{
-			return range.overlaps(addr);
-		}
-	};
-
-	enum mm_backend_ctrl : u32
-	{
-		cmd_mm_flush = 0x81000000,
-	};
-
-	void mm_protect(void* start, u64 length, utils::protection prot);
-	void mm_flush_lazy();
-	void mm_flush(u32 vm_address);
-	void mm_flush(const rsx::simple_array<utils::address_range64>& ranges);
-	void mm_flush();
-}
diff --git a/rpcs3/Emu/RSX/Host/RSXDMAWriter.cpp b/rpcs3/Emu/RSX/Host/RSXDMAWriter.cpp
deleted file mode 100644
index d86b03712a..0000000000
--- a/rpcs3/Emu/RSX/Host/RSXDMAWriter.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "stdafx.h"
-#include "RSXDMAWriter.h"
-
-#include "Utilities//Thread.h"
-#include <util/asm.hpp>
-
-namespace rsx
-{
-	void RSXDMAWriter::update()
-	{
-		if (m_dispatch_handlers.empty())
-		{
-			m_job_queue.clear();
-			return;
-		}
-
-		while (!m_job_queue.empty())
-		{
-			const auto job = m_job_queue.front();
-
-			if (const auto dispatch = m_dispatch_handlers.find(job.dispatch_class);
-				dispatch == m_dispatch_handlers.end() || dispatch->second.handler(m_host_context_ptr, &job))
-			{
-				// No handler registered, or callback consumed the job
-				m_job_queue.pop_front();
-				continue;
-			}
-
-			// Dispatcher found and rejected the job. Stop, we'll try again later.
-			break;
-		}
-	}
-
-	void RSXDMAWriter::register_handler(host_dispatch_handler_t handler)
-	{
-		m_dispatch_handlers[handler.dispatch_class] = handler;
-	}
-
-	void RSXDMAWriter::deregister_handler(int dispatch_class)
-	{
-		m_dispatch_handlers.erase(dispatch_class);
-	}
-
-	void RSXDMAWriter::enqueue(const host_gpu_write_op_t& request)
-	{
-		m_job_queue.push_back(request);
-	}
-
-	void RSXDMAWriter::drain_label_queue()
-	{
-		if (!m_host_context_ptr)
-		{
-			return;
-		}
-
-		// FIXME: This is a busy wait, consider yield to improve responsiveness on weak devices.
-		while (!m_host_context_ptr->in_flight_commands_completed())
-		{
-			utils::pause();
-
-			if (thread_ctrl::state() == thread_state::aborting)
-			{
-				break;
-			}
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/Host/RSXDMAWriter.h b/rpcs3/Emu/RSX/Host/RSXDMAWriter.h
deleted file mode 100644
index aeae34080e..0000000000
--- a/rpcs3/Emu/RSX/Host/RSXDMAWriter.h
+++ /dev/null
@@ -1,115 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-
-#include <unordered_map>
-#include <functional>
-#include <deque>
-
-namespace rsx
-{
-	struct host_gpu_context_t
-	{
-		u64 magic = 0xCAFEBABE;
-		u64 event_counter = 0;
-		u64 texture_load_request_event = 0;
-		u64 texture_load_complete_event = 0;
-		u64 last_label_acquire_event = 0;
-		u64 last_label_release2_event = 0;
-		u64 commands_complete_event = 0;
-
-		inline u64 inc_counter() volatile
-		{
-			// Workaround for volatile increment warning. GPU can see this value directly, but currently we do not modify it on the device.
-			event_counter = event_counter + 1;
-			return event_counter;
-		}
-
-		inline bool in_flight_commands_completed() const volatile
-		{
-			return last_label_release2_event <= commands_complete_event;
-		}
-
-		inline bool texture_loads_completed() const volatile
-		{
-			// Return true if all texture load requests are done.
-			return texture_load_complete_event == texture_load_request_event;
-		}
-
-		inline bool has_unflushed_texture_loads() const volatile
-		{
-			return texture_load_request_event > last_label_release2_event;
-		}
-
-		inline u64 on_texture_load_acquire() volatile
-		{
-			texture_load_request_event = inc_counter();
-			return texture_load_request_event;
-		}
-
-		inline void on_texture_load_release() volatile
-		{
-			// Normally released by the host device, but implemented nonetheless for software fallback
-			texture_load_complete_event = texture_load_request_event;
-		}
-
-		inline u64 on_label_acquire() volatile
-		{
-			last_label_acquire_event = inc_counter();
-			return last_label_acquire_event;
-		}
-
-		inline void on_label_release() volatile
-		{
-			last_label_release2_event = last_label_acquire_event;
-		}
-
-		inline bool needs_label_release() const volatile
-		{
-			return last_label_acquire_event > last_label_release2_event;
-		}
-	};
-
-	struct host_gpu_write_op_t
-	{
-		int dispatch_class = 0;
-		void* userdata = nullptr;
-	};
-
-	struct host_dispatch_handler_t
-	{
-		int dispatch_class = 0;
-		std::function<bool(const volatile host_gpu_context_t*, const host_gpu_write_op_t*)> handler;
-	};
-
-	class RSXDMAWriter
-	{
-	public:
-		RSXDMAWriter(void* mem)
-			: m_host_context_ptr(new (mem)host_gpu_context_t)
-		{}
-
-		RSXDMAWriter(host_gpu_context_t* pctx)
-			: m_host_context_ptr(pctx)
-		{}
-
-		void update();
-
-		void register_handler(host_dispatch_handler_t handler);
-		void deregister_handler(int dispatch_class);
-
-		void enqueue(const host_gpu_write_op_t& request);
-		void drain_label_queue();
-
-		volatile host_gpu_context_t* host_ctx() const
-		{
-			return m_host_context_ptr;
-		}
-
-	private:
-		std::unordered_map<int, host_dispatch_handler_t> m_dispatch_handlers;
-		volatile host_gpu_context_t* m_host_context_ptr = nullptr;
-
-		std::deque<host_gpu_write_op_t> m_job_queue;
-	};
-}
diff --git a/rpcs3/Emu/RSX/NV47/FW/GRAPH_backend.h b/rpcs3/Emu/RSX/NV47/FW/GRAPH_backend.h
deleted file mode 100644
index 21c78cdaa5..0000000000
--- a/rpcs3/Emu/RSX/NV47/FW/GRAPH_backend.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "../HW/context.h"
-
-namespace rsx
-{
-	// GRAPH backend class. Wraps RSX acceleration capabilities for the host.
-	// TODO: Flesh this out.
-	// TODO: Replace the virtuals with something faster
-	class GRAPH_backend
-	{
-	public:
-		// virtual void begin() = 0;
-		// virtual void end() = 0;
-
-		// Patch transform constants. Units are in 32x4 units
-		virtual void patch_transform_constants(context* /*ctx*/, u32 /*index*/, u32 /*count*/) {};
-	};
-}
diff --git a/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp b/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp
deleted file mode 100644
index d7533b245d..0000000000
--- a/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-#include "stdafx.h"
-#include "draw_call.hpp"
-
-#include "Emu/RSX/rsx_methods.h" // FIXME
-#include "Emu/RSX/rsx_utils.h"
-#include "Emu/RSX/RSXThread.h"
-#include "Emu/RSX/Common/BufferUtils.h"
-#include "Emu/RSX/NV47/HW/context.h"
-#include "Emu/RSX/NV47/HW/nv4097.h"
-
-// Always import this after other HW definitions
-#include "Emu/RSX/NV47/HW/context_accessors.define.h"
-
-#include <util/serialization.hpp>
-
-namespace rsx
-{
-	void draw_clause::operator()(utils::serial& ar)
-	{
-		ar(draw_command_ranges, draw_command_barriers, current_range_index, primitive, command, is_immediate_draw, is_disjoint_primitive, primitive_barrier_enable, inline_vertex_array);
-	}
-
-	void draw_clause::insert_command_barrier(command_barrier_type type, u32 arg0, u32 arg1, u32 index)
-	{
-		ensure(!draw_command_ranges.empty());
-
-		auto _do_barrier_insert = [this](barrier_t&& val)
-		{
-			if (draw_command_barriers.empty() || draw_command_barriers.back() < val)
-			{
-				draw_command_barriers.push_back(val);
-				return;
-			}
-
-			for (auto it = draw_command_barriers.begin(); it != draw_command_barriers.end(); it++)
-			{
-				if (*it < val)
-				{
-					continue;
-				}
-
-				draw_command_barriers.insert(it, val);
-				break;
-			}
-		};
-
-		draw_command_barrier_mask |= (1u << type);
-
-		if (type == primitive_restart_barrier)
-		{
-			// Rasterization flow barrier
-			const auto& last = draw_command_ranges[current_range_index];
-			const auto address = last.first + last.count;
-
-			_do_barrier_insert({
-				.draw_id = current_range_index,
-				.timestamp = 0,
-				.address = address,
-				.index = index,
-				.arg0 = arg0,
-				.arg1 = arg1,
-				.flags = 0,
-				.type = type
-			});
-		}
-		else
-		{
-			// Execution dependency barrier. Requires breaking the current draw call sequence and start another.
-			if (draw_command_ranges.back().count > 0)
-			{
-				append_draw_command({});
-			}
-			else
-			{
-				// In case of back-to-back modifiers, do not add duplicates
-				current_range_index = draw_command_ranges.size() - 1;
-			}
-
-			_do_barrier_insert({
-				.draw_id = current_range_index,
-				.timestamp = rsx::get_shared_tag(),
-				.address = ~0u,
-				.index = index,
-				.arg0 = arg0,
-				.arg1 = arg1,
-				.flags = 0,
-				.type = type
-			});
-
-			last_execution_barrier_index = current_range_index;
-		}
-	}
-
-	bool draw_clause::check_trivially_instanced() const
-	{
-		if (pass_count() <= 1)
-		{
-			// Cannot instance one draw call or less
-			return false;
-		}
-
-		if (draw_command_barriers.empty())
-		{
-			return false;
-		}
-
-		// Barriers must exist, but can only involve updating transform constants (for now)
-		const u32 compatible_barrier_mask =
-			(1u << rsx::transform_constant_load_modifier_barrier) |
-			(1u << rsx::transform_constant_update_barrier);
-
-		if (draw_command_barrier_mask & ~compatible_barrier_mask)
-		{
-			return false;
-		}
-
-		// For instancing all draw calls must be identical
-		// FIXME: This requirement can be easily lifted by chunking contiguous chunks.
-		const auto& ref = draw_command_ranges.front();
-		return !draw_command_ranges.any(FN(x.first != ref.first || x.count != ref.count));
-	}
-
-	void draw_clause::reset(primitive_type type)
-	{
-		current_range_index = ~0u;
-		last_execution_barrier_index = 0;
-		draw_command_barrier_mask = 0;
-
-		command = draw_command::none;
-		primitive = type;
-		primitive_barrier_enable = false;
-		is_trivial_instanced_draw = false;
-
-		draw_command_ranges.clear();
-		draw_command_barriers.clear();
-		inline_vertex_array.clear();
-
-		is_disjoint_primitive = is_primitive_disjointed(primitive);
-	}
-
-	const simple_array<draw_range_t>& draw_clause::get_subranges() const
-	{
-		ensure(!is_single_draw());
-
-		const auto range = get_range();
-		const auto limit = range.first + range.count;
-		const auto _pass_count = pass_count();
-
-		auto &ret = subranges_store;
-		ret.clear();
-		ret.reserve(_pass_count);
-
-		u32 previous_barrier = range.first;
-		u32 vertex_counter = 0;
-
-		for (auto it = current_barrier_it;
-			it != draw_command_barriers.end() && it->draw_id == current_range_index;
-			it++)
-		{
-			const auto& barrier = *it;
-			if (barrier.type != primitive_restart_barrier)
-				continue;
-
-			if (barrier.address <= range.first)
-				continue;
-
-			if (barrier.address >= limit)
-				break;
-
-			const u32 count = barrier.address - previous_barrier;
-			ret.push_back({ 0, vertex_counter, count });
-			previous_barrier = barrier.address;
-			vertex_counter += count;
-		}
-
-		ensure(!ret.empty());
-		ensure(previous_barrier < limit);
-		ret.push_back({ 0, vertex_counter, limit - previous_barrier });
-
-		return ret;
-	}
-
-	u32 draw_clause::execute_pipeline_dependencies(context* ctx, instanced_draw_config_t* instance_config) const
-	{
-		u32 result = 0u;
-		for (auto it = current_barrier_it;
-			it != draw_command_barriers.end() && it->draw_id == current_range_index;
-			it++)
-		{
-			const auto& barrier = *it;
-			switch (barrier.type)
-			{
-			case primitive_restart_barrier:
-			{
-				break;
-			}
-			case index_base_modifier_barrier:
-			{
-				// Change index base offset
-				REGS(ctx)->decode(NV4097_SET_VERTEX_DATA_BASE_INDEX, barrier.arg0);
-				result |= index_base_changed;
-				break;
-			}
-			case vertex_base_modifier_barrier:
-			{
-				// Change vertex base offset
-				REGS(ctx)->decode(NV4097_SET_VERTEX_DATA_BASE_OFFSET, barrier.arg0);
-				result |= vertex_base_changed;
-				break;
-			}
-			case vertex_array_offset_modifier_barrier:
-			{
-				// Change vertex array offset
-				REGS(ctx)->decode(NV4097_SET_VERTEX_DATA_ARRAY_OFFSET + barrier.index, barrier.arg0);
-				result |= vertex_arrays_changed;
-				break;
-			}
-			case transform_constant_load_modifier_barrier:
-			{
-				// Change the transform load target. Does not change result mask.
-				REGS(ctx)->decode(NV4097_SET_TRANSFORM_PROGRAM_LOAD, barrier.arg0);
-				break;
-			}
-			case transform_constant_update_barrier:
-			{
-				// Update transform constants
-				auto ptr = RSX(ctx)->fifo_ctrl->translate_address(barrier.arg0);
-				auto buffer = std::span<const u32>(static_cast<const u32*>(vm::base(ptr)), barrier.arg1);
-				auto notify = [&](rsx::context*, u32 load, u32 count)
-				{
-					if (!instance_config)
-					{
-						return false;
-					}
-
-					instance_config->transform_constants_data_changed = true;
-					instance_config->patch_load_offset = load;
-					instance_config->patch_load_count = count;
-					return true;
-				};
-
-				nv4097::set_transform_constant::batch_decode(ctx, NV4097_SET_TRANSFORM_CONSTANT + barrier.index, buffer, notify);
-				result |= transform_constants_changed;
-				break;
-			}
-			default:
-				fmt::throw_exception("Unreachable");
-			}
-		}
-
-		return result;
-	}
-}
-
diff --git a/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp b/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp
deleted file mode 100644
index 7753f7b280..0000000000
--- a/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp
+++ /dev/null
@@ -1,312 +0,0 @@
-#pragma once
-
-#include "draw_call.inc.h"
-
-#include "Emu/RSX/Common/simple_array.hpp"
-#include "Emu/RSX/gcm_enums.h"
-
-namespace rsx
-{
-	struct instanced_draw_config_t
-	{
-		bool transform_constants_data_changed;
-
-		u32 patch_load_offset;
-		u32 patch_load_count;
-	};
-
-	class draw_clause
-	{
-		// Stores the first and count argument from draw/draw indexed parameters between begin/end clauses.
-		simple_array<draw_range_t> draw_command_ranges{};
-
-		// Stores rasterization barriers for primitive types sensitive to adjacency
-		simple_array<barrier_t> draw_command_barriers{};
-
-		// Counter used to parse the commands in order
-		u32 current_range_index{};
-
-		// Location of last execution barrier
-		u32 last_execution_barrier_index{};
-
-		// Mask of all active barriers
-		u32 draw_command_barrier_mask = 0;
-
-		// Draw-time iterator to the draw_command_barriers struct
-		mutable simple_array<barrier_t>::iterator current_barrier_it;
-
-		// Subranges memory cache
-		mutable rsx::simple_array<draw_range_t> subranges_store;
-
-		// Helper functions
-		// Add a new draw command
-		void append_draw_command(const draw_range_t& range)
-		{
-			current_range_index = draw_command_ranges.size();
-			draw_command_ranges.push_back(range);
-		}
-
-		// Insert a new draw command within the others
-		void insert_draw_command(u32 index, const draw_range_t& range)
-		{
-			auto range_It = draw_command_ranges.begin();
-			std::advance(range_It, index);
-
-			current_range_index = index;
-			draw_command_ranges.insert(range_It, range);
-
-			// Update all barrier draw ids after this one
-			for (auto& barrier : draw_command_barriers)
-			{
-				if (barrier.draw_id >= index)
-				{
-					barrier.draw_id++;
-				}
-			}
-		}
-
-		bool check_trivially_instanced() const;
-
-	public:
-		primitive_type primitive{};
-		draw_command command{};
-
-		bool is_immediate_draw{};          // Set if part of the draw is submitted via push registers
-		bool is_disjoint_primitive{};      // Set if primitive type does not rely on adjacency information
-		bool primitive_barrier_enable{};   // Set once to signal that a primitive restart barrier can be inserted
-		bool is_rendering{};               // Set while we're actually pushing the draw calls to host GPU
-		bool is_trivial_instanced_draw{};  // Set if the draw call can be executed on the host GPU as a single instanced draw.
-
-		simple_array<u32> inline_vertex_array{};
-
-		void operator()(utils::serial& ar);
-
-		void insert_command_barrier(command_barrier_type type, u32 arg0, u32 arg1 = 0, u32 register_index = 0);
-
-		/**
-		 * Optimize commands for rendering
-		 */
-		void compile()
-		{
-			// End draw call append mode
-			current_range_index = ~0u;
-			// Check if we can instance on host
-			is_trivial_instanced_draw = check_trivially_instanced();
-		}
-
-		/**
-		 * Insert one command range
-		 */
-
-		void append(u32 first, u32 count)
-		{
-			const bool barrier_enable_flag = primitive_barrier_enable;
-			primitive_barrier_enable = false;
-
-			if (!draw_command_ranges.empty())
-			{
-				auto& last = draw_command_ranges[current_range_index];
-
-				if (last.count == 0)
-				{
-					// Special case, usually indicates an execution barrier
-					last.first = first;
-					last.count = count;
-					return;
-				}
-
-				if (last.first + last.count == first)
-				{
-					if (!is_disjoint_primitive && barrier_enable_flag)
-					{
-						// Insert barrier
-						insert_command_barrier(primitive_restart_barrier, 0);
-					}
-
-					last.count += count;
-					return;
-				}
-
-				for (auto index = last_execution_barrier_index; index < draw_command_ranges.size(); ++index)
-				{
-					if (draw_command_ranges[index].first == first &&
-						draw_command_ranges[index].count == count)
-					{
-						// Duplicate entry. Usually this indicates a botched instancing setup.
-						rsx_log.error("Duplicate draw request. Start=%u, Count=%u", first, count);
-						return;
-					}
-
-					if (draw_command_ranges[index].first > first)
-					{
-						insert_draw_command(index, { 0, first, count });
-						return;
-					}
-				}
-			}
-
-			append_draw_command({ 0, first, count });
-		}
-
-		/**
-		 * Returns how many vertex or index will be consumed by the draw clause.
-		 */
-		u32 get_elements_count() const
-		{
-			if (draw_command_ranges.empty())
-			{
-				ensure(command == rsx::draw_command::inlined_array);
-				return 0;
-			}
-
-			return get_range().count;
-		}
-
-		u32 min_index() const
-		{
-			if (draw_command_ranges.empty())
-			{
-				ensure(command == rsx::draw_command::inlined_array);
-				return 0;
-			}
-
-			return get_range().first;
-		}
-
-		bool is_single_draw() const
-		{
-			if (is_disjoint_primitive)
-				return true;
-
-			if (draw_command_ranges.empty())
-			{
-				ensure(!inline_vertex_array.empty());
-				return true;
-			}
-
-			ensure(current_range_index != ~0u);
-			for (const auto& barrier : draw_command_barriers)
-			{
-				if (barrier.draw_id != current_range_index)
-					continue;
-
-				if (barrier.type == primitive_restart_barrier)
-					return false;
-			}
-
-			return true;
-		}
-
-		bool empty() const
-		{
-			return (command == rsx::draw_command::inlined_array) ? inline_vertex_array.empty() : draw_command_ranges.empty();
-		}
-
-		u32 pass_count() const
-		{
-			if (draw_command_ranges.empty())
-			{
-				ensure(!inline_vertex_array.empty());
-				return 1u;
-			}
-
-			u32 count = ::size32(draw_command_ranges);
-			if (draw_command_ranges.back().count == 0)
-			{
-				// Dangling barrier
-				ensure(count > 1);
-				count--;
-			}
-
-			return count;
-		}
-
-		primitive_class classify_mode() const
-		{
-			return primitive >= rsx::primitive_type::triangles
-				? primitive_class::polygon
-				: primitive_class::non_polygon;
-		}
-
-		void reset(rsx::primitive_type type);
-
-		void begin()
-		{
-			current_range_index = 0;
-			current_barrier_it = draw_command_barriers.begin();
-			is_rendering = true;
-		}
-
-		void end()
-		{
-			current_range_index = draw_command_ranges.size() - 1;
-		}
-
-		bool next()
-		{
-			current_range_index++;
-			if (current_range_index >= draw_command_ranges.size())
-			{
-				current_range_index = 0;
-				is_rendering = false;
-				return false;
-			}
-
-			// Advance barrier iterator so it always points to the current draw
-			for (;
-				current_barrier_it != draw_command_barriers.end() &&
-				current_barrier_it->draw_id < current_range_index;
-				++current_barrier_it);
-
-			if (draw_command_ranges[current_range_index].count == 0)
-			{
-				// Dangling execution barrier
-				ensure(current_range_index > 0 && (current_range_index + 1) == draw_command_ranges.size());
-				current_range_index = 0;
-				is_rendering = false;
-				return false;
-			}
-
-			return true;
-		}
-
-		/**
-		 * Only call this once after the draw clause has been fully consumed to reconcile any conflicts
-		 */
-		void post_execute_cleanup(struct context* ctx)
-		{
-			ensure(current_range_index == 0);
-
-			if (draw_command_ranges.size() > 1)
-			{
-				if (draw_command_ranges.back().count == 0)
-				{
-					// Dangling execution barrier
-					current_range_index = draw_command_ranges.size() - 1;
-					execute_pipeline_dependencies(ctx);
-					current_range_index = 0;
-				}
-			}
-		}
-
-		/**
-		 * Executes commands reqiured to make the current draw state valid
-		 */
-		u32 execute_pipeline_dependencies(struct context* ctx, instanced_draw_config_t* instance_config = nullptr) const;
-
-		/**
-		 * Returns the first-count data for the current subdraw
-		 */
-		const draw_range_t& get_range() const
-		{
-			ensure(current_range_index < draw_command_ranges.size());
-			return draw_command_ranges[current_range_index];
-		}
-
-		/*
-		 * Returns a compiled list of all subdraws.
-		 * NOTE: This is a non-trivial operation as it takes disjoint primitive boundaries into account.
-		 */
-		const simple_array<draw_range_t>& get_subranges() const;
-	};
-}
diff --git a/rpcs3/Emu/RSX/NV47/FW/draw_call.inc.h b/rpcs3/Emu/RSX/NV47/FW/draw_call.inc.h
deleted file mode 100644
index 9332a21c11..0000000000
--- a/rpcs3/Emu/RSX/NV47/FW/draw_call.inc.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-
-namespace rsx
-{
-	enum class draw_command
-	{
-		none,
-		array,
-		inlined_array,
-		indexed,
-	};
-
-	enum command_barrier_type : u32
-	{
-		primitive_restart_barrier,
-		vertex_base_modifier_barrier,
-		index_base_modifier_barrier,
-		vertex_array_offset_modifier_barrier,
-		transform_constant_load_modifier_barrier,
-		transform_constant_update_barrier
-	};
-
-	enum command_execution_flags : u32
-	{
-		vertex_base_changed = (1 << 0),
-		index_base_changed = (1 << 1),
-		vertex_arrays_changed = (1 << 2),
-		transform_constants_changed = (1 << 3)
-	};
-
-	enum class primitive_class
-	{
-		polygon,
-		non_polygon
-	};
-
-	struct barrier_t
-	{
-		u32 draw_id;
-		u64 timestamp;
-
-		u32 address;
-		u32 index;
-		u32 arg0;
-		u32 arg1;
-		u32 flags;
-		command_barrier_type type;
-
-		bool operator < (const barrier_t& other) const
-		{
-			if (address != ~0u)
-			{
-				return address < other.address;
-			}
-
-			return timestamp < other.timestamp;
-		}
-
-		ENABLE_BITWISE_SERIALIZATION;
-	};
-
-	struct draw_range_t
-	{
-		u32 command_data_offset = 0;
-		u32 first = 0;
-		u32 count = 0;
-
-		ENABLE_BITWISE_SERIALIZATION;
-	};
-}
diff --git a/rpcs3/Emu/RSX/NV47/FW/reg_context.cpp b/rpcs3/Emu/RSX/NV47/FW/reg_context.cpp
deleted file mode 100644
index a27b824da7..0000000000
--- a/rpcs3/Emu/RSX/NV47/FW/reg_context.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "stdafx.h"
diff --git a/rpcs3/Emu/RSX/NV47/FW/reg_context.h b/rpcs3/Emu/RSX/NV47/FW/reg_context.h
deleted file mode 100644
index 8f0477022f..0000000000
--- a/rpcs3/Emu/RSX/NV47/FW/reg_context.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-
-namespace rsx
-{
-	// TODO: Basically replaces parts of the current "rsx_state" object
-	struct reg_context
-	{
-		u32 registers[1];
-	};
-}
diff --git a/rpcs3/Emu/RSX/NV47/HW/common.cpp b/rpcs3/Emu/RSX/NV47/HW/common.cpp
deleted file mode 100644
index 45e7b001a1..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/common.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-#include "stdafx.h"
-#include "common.h"
-
-#include "Emu/RSX/Common/TextureUtils.h"
-#include "Emu/RSX/RSXThread.h"
-
-#define RSX(ctx) ctx->rsxthr
-#define REGS(ctx) (&rsx::method_registers)
-
-namespace rsx
-{
-	namespace util
-	{
-		bool is_volatile_TIU(rsx::context* ctx, u32 index)
-		{
-			if (!RSX(ctx)->fs_sampler_state[index])
-			{
-				return false;
-			}
-
-			return RSX(ctx)->fs_sampler_state[index]->upload_context != rsx::texture_upload_context::shader_read;
-		}
-
-		void push_vertex_data(rsx::context* ctx, u32 attrib_index, u32 channel_select, int count, rsx::vertex_base_type vtype, u32 value)
-		{
-			if (RSX(ctx)->in_begin_end)
-			{
-				// Update to immediate mode register/array
-				// NOTE: Push buffers still behave like register writes.
-				// You do not need to specify each attribute for each vertex, the register is referenced instead.
-				// This is classic OpenGL 1.x behavior as I remember.
-				RSX(ctx)->GRAPH_frontend().append_to_push_buffer(attrib_index, count, channel_select, vtype, value);
-			}
-
-			auto& info = REGS(ctx)->register_vertex_info[attrib_index];
-
-			info.type = vtype;
-			info.size = count;
-			info.frequency = 0;
-			info.stride = 0;
-			REGS(ctx)->register_vertex_info[attrib_index].data[channel_select] = value;
-		}
-
-		void push_draw_parameter_change(rsx::context* ctx, rsx::command_barrier_type type, u32 reg, u32 arg0, u32 arg1, u32 index)
-		{
-			// NOTE: We can't test against latch here, since a previous change may be buffered in a pending barrier.
-			if (!RSX(ctx)->in_begin_end || REGS(ctx)->current_draw_clause.empty())
-			{
-				return;
-			}
-
-			// Defer the change. Rollback...
-			REGS(ctx)->decode(reg, REGS(ctx)->latch);
-
-			// Insert barrier to reinsert the value later
-			REGS(ctx)->current_draw_clause.insert_command_barrier(type, arg0, arg1, index);
-		}
-
-		u32 get_report_data_impl([[maybe_unused]] rsx::context* ctx, u32 offset)
-		{
-			u32 location = 0;
-			blit_engine::context_dma report_dma = REGS(ctx)->context_dma_report();
-
-			switch (report_dma)
-			{
-			case blit_engine::context_dma::to_memory_get_report: location = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL; break;
-			case blit_engine::context_dma::report_location_main: location = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN; break;
-			case blit_engine::context_dma::memory_host_buffer: location = CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER; break;
-			default:
-				return vm::addr_t(0);
-			}
-
-			return vm::cast(get_address(offset, location));
-		}
-
-		void set_fragment_texture_dirty_bit(rsx::context* ctx, u32 arg, u32 index)
-		{
-			if (REGS(ctx)->latch == arg && !is_volatile_TIU(ctx, index))
-			{
-				return;
-			}
-
-			RSX(ctx)->m_textures_dirty[index] = true;
-
-			if (RSX(ctx)->current_fp_metadata.referenced_textures_mask & (1 << index))
-			{
-				RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_state_dirty;
-			}
-		}
-
-		void set_vertex_texture_dirty_bit(rsx::context* ctx, u32 index)
-		{
-			RSX(ctx)->m_vertex_textures_dirty[index] = true;
-
-			if (RSX(ctx)->current_vp_metadata.referenced_textures_mask & (1 << index))
-			{
-				RSX(ctx)->m_graphics_state |= rsx::pipeline_state::vertex_program_state_dirty;
-			}
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/NV47/HW/common.h b/rpcs3/Emu/RSX/NV47/HW/common.h
deleted file mode 100644
index 881985c086..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/common.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include "context.h"
-#include "context_accessors.define.h"
-
-namespace rsx
-{
-	enum command_barrier_type : u32;
-	enum class vertex_base_type : u8;
-
-	namespace util
-	{
-		u32 get_report_data_impl(rsx::context* ctx, u32 offset);
-
-		void push_vertex_data(rsx::context* ctx, u32 attrib_index, u32 channel_select, int count, rsx::vertex_base_type vtype, u32 value);
-
-		void push_draw_parameter_change(rsx::context* ctx, rsx::command_barrier_type type, u32 reg, u32 arg0, u32 arg1 = 0u, u32 index = 0u);
-
-		void set_fragment_texture_dirty_bit(rsx::context* ctx, u32 arg, u32 index);
-
-		void set_vertex_texture_dirty_bit(rsx::context* ctx, u32 index);
-	}
-}
- 
-#include "context_accessors.undef.h"
diff --git a/rpcs3/Emu/RSX/NV47/HW/context.h b/rpcs3/Emu/RSX/NV47/HW/context.h
deleted file mode 100644
index 761ad2be5f..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/context.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-
-namespace rsx
-{
-	class thread;
-	struct rsx_state;
-
-#if 0
-	// TODO: Separate GRAPH context from RSX state
-	struct GRAPH_context
-	{
-		u32 id;
-		std::array<u32, 0x10000 / 4> registers;
-
-		GRAPH_context(u32 ctx_id)
-			: id(ctx_id)
-		{
-			std::fill(registers.begin(), registers.end(), 0);
-		}
-	};
-#endif
-
-	struct context
-	{
-		thread* rsxthr;
-		// GRAPH_context* graph;
-		rsx_state* register_state;
-	};
-}
diff --git a/rpcs3/Emu/RSX/NV47/HW/context_accessors.define.h b/rpcs3/Emu/RSX/NV47/HW/context_accessors.define.h
deleted file mode 100644
index b423f11cd9..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/context_accessors.define.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define RSX(ctx) ctx->rsxthr
-#define REGS(ctx) ctx->register_state
-#define RSX_CAPTURE_EVENT(name) if (RSX(ctx)->capture_current_frame) { RSX(ctx)->capture_frame(name); }
diff --git a/rpcs3/Emu/RSX/NV47/HW/context_accessors.undef.h b/rpcs3/Emu/RSX/NV47/HW/context_accessors.undef.h
deleted file mode 100644
index 4fd31eec4e..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/context_accessors.undef.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#undef RSX
-#undef REGS
-#undef RSX_CAPTURE_EVENT
diff --git a/rpcs3/Emu/RSX/NV47/HW/nv0039.cpp b/rpcs3/Emu/RSX/NV47/HW/nv0039.cpp
deleted file mode 100644
index a41fae11dc..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/nv0039.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-#include "stdafx.h"
-#include "nv0039.h"
-
-#include "Emu/RSX/RSXThread.h"
-#include "Emu/RSX/Core/RSXReservationLock.hpp"
-#include "Emu/RSX/Host/MM.h"
-
-#include "context_accessors.define.h"
-
-namespace rsx
-{
-	namespace nv0039
-	{
-		void buffer_notify(context* ctx, u32, u32 arg)
-		{
-			s32 in_pitch = REGS(ctx)->nv0039_input_pitch();
-			s32 out_pitch = REGS(ctx)->nv0039_output_pitch();
-			const u32 line_length = REGS(ctx)->nv0039_line_length();
-			const u32 line_count = REGS(ctx)->nv0039_line_count();
-			const u8 out_format = REGS(ctx)->nv0039_output_format();
-			const u8 in_format = REGS(ctx)->nv0039_input_format();
-			const u32 notify = arg;
-
-			if (!line_count || !line_length)
-			{
-				rsx_log.warning("NV0039_BUFFER_NOTIFY NOPed out: pitch(in=0x%x, out=0x%x), line(len=0x%x, cnt=0x%x), fmt(in=0x%x, out=0x%x), notify=0x%x",
-					in_pitch, out_pitch, line_length, line_count, in_format, out_format, notify);
-				return;
-			}
-
-			rsx_log.trace("NV0039_BUFFER_NOTIFY: pitch(in=0x%x, out=0x%x), line(len=0x%x, cnt=0x%x), fmt(in=0x%x, out=0x%x), notify=0x%x",
-				in_pitch, out_pitch, line_length, line_count, in_format, out_format, notify);
-
-			u32 src_offset = REGS(ctx)->nv0039_input_offset();
-			u32 src_dma = REGS(ctx)->nv0039_input_location();
-
-			u32 dst_offset = REGS(ctx)->nv0039_output_offset();
-			u32 dst_dma = REGS(ctx)->nv0039_output_location();
-
-			const bool is_block_transfer = (in_pitch == out_pitch && out_pitch + 0u == line_length);
-			const auto read_address = get_address(src_offset, src_dma);
-			const auto write_address = get_address(dst_offset, dst_dma);
-			const auto read_length = in_pitch * (line_count - 1) + line_length;
-			const auto write_length = out_pitch * (line_count - 1) + line_length;
-
-			RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, write_length);
-
-			if (const auto result = RSX(ctx)->read_barrier(read_address, read_length, !is_block_transfer);
-				result == rsx::result_zcull_intr)
-			{
-				// This transfer overlaps will zcull data pool
-				if (RSX(ctx)->copy_zcull_stats(read_address, read_length, write_address) == write_length)
-				{
-					// All writes deferred
-					return;
-				}
-			}
-
-			auto res = ::rsx::reservation_lock<true>(write_address, write_length, read_address, read_length);
-
-			u8* dst = vm::_ptr<u8>(write_address);
-			const u8* src = vm::_ptr<u8>(read_address);
-
-			rsx::simple_array<utils::address_range64> flush_mm_ranges =
-			{
-				utils::address_range64::start_length(reinterpret_cast<u64>(dst), write_length),
-				utils::address_range64::start_length(reinterpret_cast<u64>(src), read_length)
-			};
-			rsx::mm_flush(flush_mm_ranges);
-
-			const bool is_overlapping = dst_dma == src_dma && [&]() -> bool
-			{
-				const u32 src_max = src_offset + read_length;
-				const u32 dst_max = dst_offset + (out_pitch * (line_count - 1) + line_length);
-				return (src_offset >= dst_offset && src_offset < dst_max) ||
-				 (dst_offset >= src_offset && dst_offset < src_max);
-			}();
-
-			if (in_format > 1 || out_format > 1) [[ unlikely ]]
-			{
-				// The formats are just input channel strides. You can use this to do cool tricks like gathering channels
-				// Very rare, only seen in use by Destiny
-				// TODO: Hw accel
-				for (u32 row = 0; row < line_count; ++row)
-				{
-					auto dst_ptr = dst;
-					auto src_ptr = src;
-					while (src_ptr < src + line_length)
-					{
-						*dst_ptr = *src_ptr;
-
-						src_ptr += in_format;
-						dst_ptr += out_format;
-					}
-
-					dst += out_pitch;
-					src += in_pitch;
-				}
-			}
-			else if (is_overlapping) [[ unlikely ]]
-			{
-				if (is_block_transfer)
-				{
-					std::memmove(dst, src, read_length);
-				}
-				else
-				{
-					std::vector<u8> temp(line_length * line_count);
-					u8* buf = temp.data();
-
-					for (u32 y = 0; y < line_count; ++y)
-					{
-						std::memcpy(buf, src, line_length);
-						buf += line_length;
-						src += in_pitch;
-					}
-
-					buf = temp.data();
-
-					for (u32 y = 0; y < line_count; ++y)
-					{
-						std::memcpy(dst, buf, line_length);
-						buf += line_length;
-						dst += out_pitch;
-					}
-				}
-			}
-			else
-			{
-				if (is_block_transfer)
-				{
-					std::memcpy(dst, src, read_length);
-				}
-				else
-				{
-					for (u32 i = 0; i < line_count; ++i)
-					{
-						std::memcpy(dst, src, line_length);
-						dst += out_pitch;
-						src += in_pitch;
-					}
-				}
-			}
-
-			//res->release(0);
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/NV47/HW/nv0039.h b/rpcs3/Emu/RSX/NV47/HW/nv0039.h
deleted file mode 100644
index 9168f76ede..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/nv0039.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// NV47 Buffer Management
-#pragma once
-
-#include "context.h"
-
-namespace rsx
-{
-	namespace nv0039
-	{
-		void buffer_notify(context* ctx, u32 reg, u32 arg);
-	}
-}
diff --git a/rpcs3/Emu/RSX/NV47/HW/nv3089.cpp b/rpcs3/Emu/RSX/NV47/HW/nv3089.cpp
deleted file mode 100644
index cbc2e54296..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/nv3089.cpp
+++ /dev/null
@@ -1,667 +0,0 @@
-#include "stdafx.h"
-#include "nv3089.h"
-
-#include "Emu/RSX/RSXThread.h"
-#include "Emu/RSX/Core/RSXReservationLock.hpp"
-#include "Emu/RSX/Common/tiled_dma_copy.hpp"
-
-#include "context_accessors.define.h"
-
-namespace rsx
-{
-	namespace nv3089
-	{
-		static std::tuple<bool, blit_src_info, blit_dst_info> decode_transfer_registers(context* ctx)
-		{
-			blit_src_info src_info = {};
-			blit_dst_info dst_info = {};
-
-			const rsx::blit_engine::transfer_operation operation = REGS(ctx)->blit_engine_operation();
-
-			const u16 out_x = REGS(ctx)->blit_engine_output_x();
-			const u16 out_y = REGS(ctx)->blit_engine_output_y();
-			const u16 out_w = REGS(ctx)->blit_engine_output_width();
-			const u16 out_h = REGS(ctx)->blit_engine_output_height();
-
-			const u16 in_w = REGS(ctx)->blit_engine_input_width();
-			const u16 in_h = REGS(ctx)->blit_engine_input_height();
-
-			const blit_engine::transfer_origin in_origin = REGS(ctx)->blit_engine_input_origin();
-			auto src_color_format = REGS(ctx)->blit_engine_src_color_format();
-
-			const f32 scale_x = REGS(ctx)->blit_engine_ds_dx();
-			const f32 scale_y = REGS(ctx)->blit_engine_dt_dy();
-
-			// Clipping
-			// Validate that clipping rect will fit onto both src and dst regions
-			const u16 clip_w = std::min(REGS(ctx)->blit_engine_clip_width(), out_w);
-			const u16 clip_h = std::min(REGS(ctx)->blit_engine_clip_height(), out_h);
-
-			// Check both clip dimensions and dst dimensions
-			if (clip_w == 0 || clip_h == 0)
-			{
-				rsx_log.warning("NV3089_IMAGE_IN: Operation NOPed out due to empty regions");
-				return { false, src_info, dst_info };
-			}
-
-			if (in_w == 0 || in_h == 0)
-			{
-				// Input cant be an empty region
-				fmt::throw_exception("NV3089_IMAGE_IN_SIZE: Invalid blit dimensions passed (in_w=%d, in_h=%d)", in_w, in_h);
-			}
-
-			u16 clip_x = REGS(ctx)->blit_engine_clip_x();
-			u16 clip_y = REGS(ctx)->blit_engine_clip_y();
-
-			//Fit onto dst
-			if (clip_x && (out_x + clip_x + clip_w) > out_w) clip_x = 0;
-			if (clip_y && (out_y + clip_y + clip_h) > out_h) clip_y = 0;
-
-			u16 in_pitch = REGS(ctx)->blit_engine_input_pitch();
-
-			switch (in_origin)
-			{
-			case blit_engine::transfer_origin::corner:
-			case blit_engine::transfer_origin::center:
-				break;
-			default:
-				rsx_log.warning("NV3089_IMAGE_IN_SIZE: unknown origin (%d)", static_cast<u8>(in_origin));
-			}
-
-			if (operation != rsx::blit_engine::transfer_operation::srccopy)
-			{
-				rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown operation (0x%x)", REGS(ctx)->registers[NV3089_SET_OPERATION]);
-				RSX(ctx)->recover_fifo();
-				return { false, src_info, dst_info };
-			}
-
-			if (!src_color_format)
-			{
-				rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown src color format (0x%x)", REGS(ctx)->registers[NV3089_SET_COLOR_FORMAT]);
-				RSX(ctx)->recover_fifo();
-				return { false, src_info, dst_info };
-			}
-
-			const u32 src_offset = REGS(ctx)->blit_engine_input_offset();
-			const u32 src_dma = REGS(ctx)->blit_engine_input_location();
-
-			u32 dst_offset;
-			u32 dst_dma = 0;
-			rsx::blit_engine::transfer_destination_format dst_color_format;
-			u32 out_pitch = 0;
-			[[maybe_unused]] u32 out_alignment = 64;
-			bool is_block_transfer = false;
-
-			switch (REGS(ctx)->blit_engine_context_surface())
-			{
-			case blit_engine::context_surface::surface2d:
-			{
-				dst_dma = REGS(ctx)->blit_engine_output_location_nv3062();
-				dst_offset = REGS(ctx)->blit_engine_output_offset_nv3062();
-				out_pitch = REGS(ctx)->blit_engine_output_pitch_nv3062();
-				out_alignment = REGS(ctx)->blit_engine_output_alignment_nv3062();
-				is_block_transfer = fcmp(scale_x, 1.f) && fcmp(scale_y, 1.f);
-
-				if (auto dst_fmt = REGS(ctx)->blit_engine_nv3062_color_format(); !dst_fmt)
-				{
-					rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown NV3062 dst color format (0x%x)", REGS(ctx)->registers[NV3062_SET_COLOR_FORMAT]);
-					RSX(ctx)->recover_fifo();
-					return { false, src_info, dst_info };
-				}
-				else
-				{
-					dst_color_format = dst_fmt;
-				}
-
-				break;
-			}
-			case blit_engine::context_surface::swizzle2d:
-			{
-				dst_dma = REGS(ctx)->blit_engine_nv309E_location();
-				dst_offset = REGS(ctx)->blit_engine_nv309E_offset();
-
-				if (auto dst_fmt = REGS(ctx)->blit_engine_output_format_nv309E(); !dst_fmt)
-				{
-					rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown NV309E dst color format (0x%x)", REGS(ctx)->registers[NV309E_SET_FORMAT]);
-					RSX(ctx)->recover_fifo();
-					return { false, src_info, dst_info };
-				}
-				else
-				{
-					dst_color_format = dst_fmt;
-				}
-
-				break;
-			}
-			default:
-				rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown m_context_surface (0x%x)", static_cast<u8>(REGS(ctx)->blit_engine_context_surface()));
-				return { false, src_info, dst_info };
-			}
-
-			const u32 in_bpp = (src_color_format == rsx::blit_engine::transfer_source_format::r5g6b5) ? 2 : 4; // bytes per pixel
-			const u32 out_bpp = (dst_color_format == rsx::blit_engine::transfer_destination_format::r5g6b5) ? 2 : 4;
-
-			if (out_pitch == 0)
-			{
-				out_pitch = out_bpp * out_w;
-			}
-
-			if (in_pitch == 0)
-			{
-				in_pitch = in_bpp * in_w;
-			}
-
-			if (in_bpp != out_bpp)
-			{
-				is_block_transfer = false;
-			}
-
-			u16 in_x, in_y;
-			if (in_origin == blit_engine::transfer_origin::center)
-			{
-				// Convert to normal u,v addressing. Under this scheme offset of 1 is actually half-way inside pixel 0
-				const float x = std::max(REGS(ctx)->blit_engine_in_x(), 0.5f);
-				const float y = std::max(REGS(ctx)->blit_engine_in_y(), 0.5f);
-				in_x = static_cast<u16>(std::floor(x - 0.5f));
-				in_y = static_cast<u16>(std::floor(y - 0.5f));
-			}
-			else
-			{
-				in_x = static_cast<u16>(std::floor(REGS(ctx)->blit_engine_in_x()));
-				in_y = static_cast<u16>(std::floor(REGS(ctx)->blit_engine_in_y()));
-			}
-
-			// Check for subpixel addressing
-			if (scale_x < 1.f)
-			{
-				float dst_x = in_x * scale_x;
-				in_x = static_cast<u16>(std::floor(dst_x) / scale_x);
-			}
-
-			if (scale_y < 1.f)
-			{
-				float dst_y = in_y * scale_y;
-				in_y = static_cast<u16>(std::floor(dst_y) / scale_y);
-			}
-
-			const u32 in_offset = in_x * in_bpp + in_pitch * in_y;
-			const u32 out_offset = out_x * out_bpp + out_pitch * out_y;
-
-			const u32 src_line_length = (in_w * in_bpp);
-
-			u32 src_address = 0;
-			const u32 dst_address = get_address(dst_offset, dst_dma, 1); // TODO: Add size
-
-			if (is_block_transfer && (clip_h == 1 || (in_pitch == out_pitch && src_line_length == in_pitch)))
-			{
-				const u32 nb_lines = std::min(clip_h, in_h);
-				const u32 data_length = nb_lines * src_line_length;
-
-				if (src_address = get_address(src_offset, src_dma, data_length);
-					!src_address || !dst_address)
-				{
-					RSX(ctx)->recover_fifo();
-					return { false, src_info, dst_info };
-				}
-
-				RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, data_length);
-
-				if (const auto result = RSX(ctx)->read_barrier(src_address, data_length, false);
-					result == rsx::result_zcull_intr)
-				{
-					if (RSX(ctx)->copy_zcull_stats(src_address, data_length, dst_address) == data_length)
-					{
-						// All writes deferred
-						return { false, src_info, dst_info };
-					}
-				}
-			}
-			else
-			{
-				const u16 read_h = std::min(static_cast<u16>(clip_h / scale_y), in_h);
-				const u32 data_length = in_pitch * (read_h - 1) + src_line_length;
-
-				if (src_address = get_address(src_offset, src_dma, data_length);
-					!src_address || !dst_address)
-				{
-					RSX(ctx)->recover_fifo();
-					return { false, src_info, dst_info };
-				}
-
-				RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, data_length);
-				RSX(ctx)->read_barrier(src_address, data_length, true);
-			}
-
-			if (src_address == dst_address &&
-				in_w == clip_w && in_h == clip_h &&
-				in_pitch == out_pitch &&
-				rsx::fcmp(scale_x, 1.f) && rsx::fcmp(scale_y, 1.f))
-			{
-				// NULL operation
-				rsx_log.warning("NV3089_IMAGE_IN: Operation writes memory onto itself with no modification (move-to-self). Will ignore.");
-				return { false, src_info, dst_info };
-			}
-
-			u8* pixels_src = vm::_ptr<u8>(src_address + in_offset);
-			u8* pixels_dst = vm::_ptr<u8>(dst_address + out_offset);
-
-			if (dst_color_format != rsx::blit_engine::transfer_destination_format::r5g6b5 &&
-				dst_color_format != rsx::blit_engine::transfer_destination_format::a8r8g8b8)
-			{
-				fmt::throw_exception("NV3089_IMAGE_IN_SIZE: unknown dst_color_format (%d)", static_cast<u8>(dst_color_format));
-			}
-
-			if (src_color_format != rsx::blit_engine::transfer_source_format::r5g6b5 &&
-				src_color_format != rsx::blit_engine::transfer_source_format::a8r8g8b8)
-			{
-				// Alpha has no meaning in both formats
-				if (src_color_format == rsx::blit_engine::transfer_source_format::x8r8g8b8)
-				{
-					src_color_format = rsx::blit_engine::transfer_source_format::a8r8g8b8;
-				}
-				else
-				{
-					// TODO: Support more formats
-					fmt::throw_exception("NV3089_IMAGE_IN_SIZE: unknown src_color_format (%d)", static_cast<u8>(*src_color_format));
-				}
-			}
-
-			u32 convert_w = static_cast<u32>(std::abs(scale_x) * in_w);
-			u32 convert_h = static_cast<u32>(std::abs(scale_y) * in_h);
-
-			if (convert_w == 0 || convert_h == 0)
-			{
-				rsx_log.error("NV3089_IMAGE_IN: Invalid dimensions or scaling factor. Request ignored (ds_dx=%f, dt_dy=%f)",
-					REGS(ctx)->blit_engine_ds_dx(), REGS(ctx)->blit_engine_dt_dy());
-				return { false, src_info, dst_info };
-			}
-
-			src_info.format = src_color_format;
-			src_info.origin = in_origin;
-			src_info.width = in_w;
-			src_info.height = in_h;
-			src_info.pitch = in_pitch;
-			src_info.bpp = in_bpp;
-			src_info.offset_x = in_x;
-			src_info.offset_y = in_y;
-			src_info.dma = src_dma;
-			src_info.rsx_address = src_address;
-			src_info.pixels = pixels_src;
-
-			dst_info.format = dst_color_format;
-			dst_info.width = convert_w;
-			dst_info.height = convert_h;
-			dst_info.clip_x = clip_x;
-			dst_info.clip_y = clip_y;
-			dst_info.clip_width = clip_w;
-			dst_info.clip_height = clip_h;
-			dst_info.offset_x = out_x;
-			dst_info.offset_y = out_y;
-			dst_info.pitch = out_pitch;
-			dst_info.bpp = out_bpp;
-			dst_info.scale_x = scale_x;
-			dst_info.scale_y = scale_y;
-			dst_info.dma = dst_dma;
-			dst_info.rsx_address = dst_address;
-			dst_info.pixels = pixels_dst;
-			dst_info.swizzled = (REGS(ctx)->blit_engine_context_surface() == blit_engine::context_surface::swizzle2d);
-
-			return { true, src_info, dst_info };
-		}
-
-		void linear_copy(
-			const blit_dst_info& dst,
-			const blit_src_info& src,
-			u16 out_w,
-			u16 out_h,
-			u32 slice_h,
-			AVPixelFormat ffmpeg_src_format,
-			AVPixelFormat ffmpeg_dst_format,
-			bool need_convert,
-			bool need_clip,
-			bool src_is_modified,
-			bool interpolate)
-		{
-			std::vector<u8> temp2;
-
-			if (!need_convert) [[ likely ]]
-			{
-				const bool is_overlapping = !src_is_modified && dst.dma == src.dma && [&]() -> bool
-				{
-					const auto src_range = utils::address_range32::start_length(src.rsx_address, src.pitch * (src.height - 1) + (src.bpp * src.width));
-					const auto dst_range = utils::address_range32::start_length(dst.rsx_address, dst.pitch * (dst.clip_height - 1) + (dst.bpp * dst.clip_width));
-					return src_range.overlaps(dst_range);
-				}();
-
-					if (is_overlapping) [[ unlikely ]]
-					{
-						if (need_clip)
-						{
-							temp2.resize(dst.pitch * dst.clip_height);
-							clip_image_may_overlap(dst.pixels, src.pixels, dst.clip_x, dst.clip_y, dst.clip_width, dst.clip_height, dst.bpp, src.pitch, dst.pitch, temp2.data());
-							return;
-						}
-
-						if (dst.pitch != src.pitch || dst.pitch != dst.bpp * out_w)
-						{
-							const u32 buffer_pitch = dst.bpp * out_w;
-							temp2.resize(buffer_pitch * out_h);
-							std::add_pointer_t<u8> buf = temp2.data(), pixels = src.pixels;
-
-							// Read the whole buffer from source
-							for (u32 y = 0; y < out_h; ++y)
-							{
-								std::memcpy(buf, pixels, buffer_pitch);
-								pixels += src.pitch;
-								buf += buffer_pitch;
-							}
-
-							buf = temp2.data(), pixels = dst.pixels;
-
-							// Write to destination
-							for (u32 y = 0; y < out_h; ++y)
-							{
-								std::memcpy(pixels, buf, buffer_pitch);
-								pixels += dst.pitch;
-								buf += buffer_pitch;
-							}
-
-							return;
-						}
-
-						std::memmove(dst.pixels, src.pixels, dst.pitch * out_h);
-						return;
-					}
-
-					if (need_clip) [[ unlikely ]]
-					{
-						clip_image(dst.pixels, src.pixels, dst.clip_x, dst.clip_y, dst.clip_width, dst.clip_height, dst.bpp, src.pitch, dst.pitch);
-						return;
-					}
-
-					if (dst.pitch != src.pitch || dst.pitch != dst.bpp * out_w) [[ unlikely ]]
-					{
-						u8* dst_pixels = dst.pixels, * src_pixels = src.pixels;
-
-						for (u32 y = 0; y < out_h; ++y)
-						{
-							std::memcpy(dst_pixels, src_pixels, out_w * dst.bpp);
-							dst_pixels += dst.pitch;
-							src_pixels += src.pitch;
-						}
-
-						return;
-					}
-
-					std::memcpy(dst.pixels, src.pixels, dst.pitch * out_h);
-					return;
-			}
-
-			if (need_clip) [[ unlikely ]]
-			{
-				temp2.resize(dst.pitch * std::max<u32>(dst.height, dst.clip_height));
-
-				convert_scale_image(temp2.data(), ffmpeg_dst_format, dst.width, dst.height, dst.pitch,
-					src.pixels, ffmpeg_src_format, src.width, src.height, src.pitch, slice_h, interpolate);
-
-				clip_image(dst.pixels, temp2.data(), dst.clip_x, dst.clip_y, dst.clip_width, dst.clip_height, dst.bpp, dst.pitch, dst.pitch);
-				return;
-			}
-
-			convert_scale_image(dst.pixels, ffmpeg_dst_format, out_w, out_h, dst.pitch,
-				src.pixels, ffmpeg_src_format, src.width, src.height, src.pitch, slice_h,
-				interpolate);
-		}
-
-		std::vector<u8> swizzled_copy_1(
-			const blit_dst_info& dst,
-			const blit_src_info& src,
-			u16 out_w,
-			u16 out_h,
-			u32 slice_h,
-			AVPixelFormat ffmpeg_src_format,
-			AVPixelFormat ffmpeg_dst_format,
-			bool need_convert,
-			bool need_clip,
-			bool interpolate)
-		{
-			std::vector<u8> temp2, temp3;
-
-			if (need_clip)
-			{
-				temp3.resize(dst.pitch * dst.clip_height);
-
-				if (need_convert)
-				{
-					temp2.resize(dst.pitch * std::max<u32>(dst.height, dst.clip_height));
-
-					convert_scale_image(temp2.data(), ffmpeg_dst_format, dst.width, dst.height, dst.pitch,
-						src.pixels, ffmpeg_src_format, src.width, src.height, src.pitch, slice_h,
-						interpolate);
-
-					clip_image(temp3.data(), temp2.data(), dst.clip_x, dst.clip_y, dst.clip_width, dst.clip_height, dst.bpp, dst.pitch, dst.pitch);
-					return temp3;
-				}
-
-				clip_image(temp3.data(), src.pixels, dst.clip_x, dst.clip_y, dst.clip_width, dst.clip_height, dst.bpp, src.pitch, dst.pitch);
-				return temp3;
-			}
-
-			if (need_convert)
-			{
-				temp3.resize(dst.pitch * out_h);
-
-				convert_scale_image(temp3.data(), ffmpeg_dst_format, out_w, out_h, dst.pitch,
-					src.pixels, ffmpeg_src_format, src.width, src.height, src.pitch, slice_h,
-					interpolate);
-
-				return temp3;
-			}
-
-			return {};
-		}
-
-		void swizzled_copy_2(
-			const u8* linear_pixels,
-			u8* swizzled_pixels,
-			u32 linear_pitch,
-			u16 out_w,
-			u16 out_h,
-			u8 out_bpp)
-		{
-			// TODO: Validate these claims. Are the registers always correctly initialized? Should we trust them at all?
-			// It looks like rsx may ignore the requested swizzle size and just always
-			// round up to nearest power of 2
-			/*
-			u8 sw_width_log2 = REGS(ctx)->nv309e_sw_width_log2();
-			u8 sw_height_log2 = REGS(ctx)->nv309e_sw_height_log2();
-
-			// 0 indicates height of 1 pixel
-			sw_height_log2 = sw_height_log2 == 0 ? 1 : sw_height_log2;
-
-			// swizzle based on destination size
-			const u16 sw_width = 1 << sw_width_log2;
-			const u16 sw_height = 1 << sw_height_log2;
-			*/
-
-			std::vector<u8> sw_temp;
-
-			const u32 sw_width = next_pow2(out_w);
-			const u32 sw_height = next_pow2(out_h);
-
-			// Check and pad texture out if we are given non power of 2 output
-			if (sw_width != out_w || sw_height != out_h)
-			{
-				sw_temp.resize(out_bpp * sw_width * sw_height);
-
-				switch (out_bpp)
-				{
-				case 1:
-					pad_texture<u8>(linear_pixels, sw_temp.data(), out_w, out_h, sw_width, sw_height);
-					break;
-				case 2:
-					pad_texture<u16>(linear_pixels, sw_temp.data(), out_w, out_h, sw_width, sw_height);
-					break;
-				case 4:
-					pad_texture<u32>(linear_pixels, sw_temp.data(), out_w, out_h, sw_width, sw_height);
-					break;
-				}
-
-				linear_pixels = sw_temp.data();
-			}
-
-			switch (out_bpp)
-			{
-			case 1:
-				convert_linear_swizzle<u8, false>(linear_pixels, swizzled_pixels, sw_width, sw_height, linear_pitch);
-				break;
-			case 2:
-				convert_linear_swizzle<u16, false>(linear_pixels, swizzled_pixels, sw_width, sw_height, linear_pitch);
-				break;
-			case 4:
-				convert_linear_swizzle<u32, false>(linear_pixels, swizzled_pixels, sw_width, sw_height, linear_pitch);
-				break;
-			}
-		}
-
-		std::vector<u8> _mirror_transform(const blit_src_info& src, bool flip_x, bool flip_y)
-		{
-			std::vector<u8> temp1;
-			if (!flip_x && !flip_y)
-			{
-				return temp1;
-			}
-
-			const u32 packed_pitch = src.width * src.bpp;
-			temp1.resize(packed_pitch * src.height);
-
-			const s32 stride_y = (flip_y ? -1 : 1) * static_cast<s32>(src.pitch);
-
-			for (u32 y = 0; y < src.height; ++y)
-			{
-				u8* dst_pixels = temp1.data() + (packed_pitch * y);
-				u8* src_pixels = src.pixels + (static_cast<s32>(y) * stride_y);
-
-				if (flip_x)
-				{
-					if (src.bpp == 4) [[ likely ]]
-					{
-						rsx::memcpy_r<u32>(dst_pixels, src_pixels, src.width);
-						continue;
-					}
-
-					rsx::memcpy_r<u16>(dst_pixels, src_pixels, src.width);
-					continue;
-				}
-
-				std::memcpy(dst_pixels, src_pixels, packed_pitch);
-			}
-
-			return temp1;
-		}
-
-		void image_in(context* ctx, u32 /*reg*/, u32 /*arg*/)
-		{
-			auto [success, src, dst] = decode_transfer_registers(ctx);
-			if (!success)
-			{
-				return;
-			}
-
-			// Decode extra params before locking
-			const blit_engine::transfer_interpolator in_inter = REGS(ctx)->blit_engine_input_inter();
-			const u16 out_w = REGS(ctx)->blit_engine_output_width();
-			const u16 out_h = REGS(ctx)->blit_engine_output_height();
-
-			// Lock here. RSX cannot execute any locking operations from this point, including ZCULL read barriers
-			auto res = ::rsx::reservation_lock<true>(
-				dst.rsx_address, dst.pitch * dst.clip_height,
-				src.rsx_address, src.pitch * src.height);
-
-			if (!g_cfg.video.force_cpu_blit_processing &&
-				(dst.dma == CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER || src.dma == CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER) &&
-				RSX(ctx)->scaled_image_from_memory(src, dst, in_inter == blit_engine::transfer_interpolator::foh))
-			{
-				// HW-accelerated blit
-				return;
-			}
-
-			std::vector<u8> mirror_tmp;
-			bool src_is_temp = false;
-
-			// Flip source if needed
-			if (dst.scale_y < 0 || dst.scale_x < 0)
-			{
-				mirror_tmp = _mirror_transform(src, dst.scale_x < 0, dst.scale_y < 0);
-				src.pixels = mirror_tmp.data();
-				src.pitch = src.width * src.bpp;
-				src_is_temp = true;
-			}
-
-			const AVPixelFormat in_format = (src.format == rsx::blit_engine::transfer_source_format::r5g6b5) ? AV_PIX_FMT_RGB565BE : AV_PIX_FMT_ARGB;
-			const AVPixelFormat out_format = (dst.format == rsx::blit_engine::transfer_destination_format::r5g6b5) ? AV_PIX_FMT_RGB565BE : AV_PIX_FMT_ARGB;
-
-			const bool need_clip =
-				dst.clip_width != src.width ||
-				dst.clip_height != src.height ||
-				dst.clip_x > 0 || dst.clip_y > 0 ||
-				dst.width != out_w || dst.height != out_h;
-
-			const bool need_convert = out_format != in_format || !rsx::fcmp(fabsf(dst.scale_x), 1.f) || !rsx::fcmp(fabsf(dst.scale_y), 1.f);
-			const u32 slice_h = static_cast<u32>(std::ceil(static_cast<f32>(dst.clip_height + dst.clip_y) / dst.scale_y));
-			const bool interpolate = in_inter == blit_engine::transfer_interpolator::foh;
-
-			auto real_dst = dst.pixels;
-			const auto tiled_region = RSX(ctx)->get_tiled_memory_region(utils::address_range32::start_length(dst.rsx_address, dst.pitch * dst.clip_height));
-			std::vector<u8> tmp;
-
-			if (tiled_region)
-			{
-				tmp.resize(tiled_region.tile->size);
-				real_dst = dst.pixels;
-				dst.pixels = tmp.data();
-			}
-
-			if (REGS(ctx)->blit_engine_context_surface() != blit_engine::context_surface::swizzle2d)
-			{
-				linear_copy(dst, src, out_w, out_h, slice_h, in_format, out_format, need_convert, need_clip, src_is_temp, interpolate);
-			}
-			else
-			{
-				// Swizzle_copy_1 prepares usable output buffer from our original source. It mostly deals with cropping and scaling the input pixels so that the final swizzle does not need to apply that.
-				const auto swz_temp = swizzled_copy_1(dst, src, out_w, out_h, slice_h, in_format, out_format, need_convert, need_clip, interpolate);
-				const u8* pixels_src = src.pixels;
-				auto src_pitch = src.pitch;
-
-				// NOTE: Swizzled copy routine creates temp output buffer that uses dst pitch, not source pitch. We need to account for this if using that output as intermediary buffer.
-				if (!swz_temp.empty())
-				{
-					pixels_src = swz_temp.data();
-					src_pitch = dst.pitch;
-				}
-
-				// Swizzle_copy_2 only pads the data and encodes it as a swizzled output. Transformation (scaling, rotation, etc) is done in swizzle_copy_1
-				swizzled_copy_2(pixels_src, dst.pixels, src_pitch, out_w, out_h, dst.bpp);
-			}
-
-			if (tiled_region)
-			{
-				const auto tile_func = dst.bpp == 4
-					? rsx::tile_texel_data32
-					: rsx::tile_texel_data16;
-
-				tile_func(
-					real_dst,
-					dst.pixels,
-					tiled_region.base_address,
-					dst.rsx_address - tiled_region.base_address,
-					tiled_region.tile->size,
-					tiled_region.tile->bank,
-					tiled_region.tile->pitch,
-					dst.clip_width,
-					dst.clip_height
-				);
-			}
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/NV47/HW/nv3089.h b/rpcs3/Emu/RSX/NV47/HW/nv3089.h
deleted file mode 100644
index 89b526b9d4..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/nv3089.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// NV47 2D Blit Engine
-#pragma once
-
-#include "context.h"
-
-namespace rsx
-{
-	namespace nv3089
-	{
-		void image_in(context* ctx, u32 reg, u32 arg);
-	}
-}
diff --git a/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp b/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp
deleted file mode 100644
index 163ddb9a4c..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-#include "stdafx.h"
-#include "nv308a.h"
-
-#include "Emu/RSX/RSXThread.h"
-#include "Emu/RSX/Core/RSXReservationLock.hpp"
-
-#include "context_accessors.define.h"
-
-namespace rsx
-{
-	namespace nv308a
-	{
-		void color::impl(context* ctx, u32 reg, u32)
-		{
-			const u32 out_x_max = REGS(ctx)->nv308a_size_out_x();
-			const u32 index = reg - NV308A_COLOR;
-
-			if (index >= out_x_max)
-			{
-				// Skip
-				return;
-			}
-
-			// Get position of the current command arg
-			[[maybe_unused]] const u32 src_offset = RSX(ctx)->fifo_ctrl->get_pos();
-
-			// FIFO args count including this one
-			const u32 fifo_args_cnt = RSX(ctx)->fifo_ctrl->get_remaining_args_count() + 1;
-
-			// The range of methods this function resposible to
-			const u32 method_range = std::min<u32>(0x700 - index, out_x_max - index);
-
-			// Get limit imposed by FIFO PUT (if put is behind get it will result in a number ignored by min)
-			const u32 fifo_read_limit = static_cast<u32>(((RSX(ctx)->ctrl->put & ~3ull) - (RSX(ctx)->fifo_ctrl->get_pos())) / 4);
-
-			u32 count = std::min<u32>({ fifo_args_cnt, fifo_read_limit, method_range });
-
-			if (!count)
-			{
-				rsx_log.error("nv308a::color - No data to read/write.");
-				RSX(ctx)->fifo_ctrl->skip_methods(fifo_args_cnt - 1);
-				return;
-			}
-
-			const u32 dst_dma = REGS(ctx)->blit_engine_output_location_nv3062();
-			const u32 dst_offset = REGS(ctx)->blit_engine_output_offset_nv3062();
-			const u32 out_pitch = REGS(ctx)->blit_engine_output_pitch_nv3062();
-
-			const u32 x = REGS(ctx)->nv308a_x() + index;
-			const u32 y = REGS(ctx)->nv308a_y();
-
-			const auto fifo_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(count);
-
-			if (fifo_span.size() < count)
-			{
-				count = ::size32(fifo_span);
-			}
-
-			// Skip "handled methods"
-			RSX(ctx)->fifo_ctrl->skip_methods(count - 1);
-
-			// 308A::COLOR can be used to create custom sync primitives.
-			// Hide this behind strict mode due to the potential performance implications.
-			if (count == 1 && g_cfg.video.strict_rendering_mode && !g_cfg.video.relaxed_zcull_sync)
-			{
-				RSX(ctx)->sync();
-			}
-
-			switch (*REGS(ctx)->blit_engine_nv3062_color_format())
-			{
-			case blit_engine::transfer_destination_format::a8r8g8b8:
-			case blit_engine::transfer_destination_format::y32:
-			{
-				// Bit cast - optimize to mem copy
-
-				const u32 data_length = count * 4;
-
-				const auto dst_address = get_address(dst_offset + (x * 4) + (out_pitch * y), dst_dma, data_length);
-
-				if (!dst_address)
-				{
-					RSX(ctx)->recover_fifo();
-					return;
-				}
-
-				const auto dst = vm::_ptr<u8>(dst_address);
-				const auto src = reinterpret_cast<const u8*>(fifo_span.data());
-
-				rsx::reservation_lock<true> rsx_lock(dst_address, data_length);
-
-				if (RSX(ctx)->fifo_ctrl->last_cmd() & RSX_METHOD_NON_INCREMENT_CMD_MASK) [[unlikely]]
-					{
-						// Move last 32 bits
-						reinterpret_cast<u32*>(dst)[0] = reinterpret_cast<const u32*>(src)[count - 1];
-						RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, 4);
-					}
-				else
-				{
-					if (dst_dma & CELL_GCM_LOCATION_MAIN)
-					{
-						// May overlap
-						std::memmove(dst, src, data_length);
-					}
-					else
-					{
-						// Never overlaps
-						std::memcpy(dst, src, data_length);
-					}
-
-					RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, count * 4);
-				}
-
-				break;
-			}
-			case blit_engine::transfer_destination_format::r5g6b5:
-			{
-				const auto data_length = count * 2;
-
-				const auto dst_address = get_address(dst_offset + (x * 2) + (y * out_pitch), dst_dma, data_length);
-				const auto dst = vm::_ptr<u16>(dst_address);
-				const auto src = utils::bless<const be_t<u32>>(fifo_span.data());
-
-				if (!dst_address)
-				{
-					RSX(ctx)->recover_fifo();
-					return;
-				}
-
-				rsx::reservation_lock<true> rsx_lock(dst_address, data_length);
-
-				auto convert = [](u32 input) -> u16
-					{
-						// Input is considered to be ARGB8
-						u32 r = (input >> 16) & 0xFF;
-						u32 g = (input >> 8) & 0xFF;
-						u32 b = input & 0xFF;
-
-						r = (r * 32) / 255;
-						g = (g * 64) / 255;
-						b = (b * 32) / 255;
-						return static_cast<u16>((r << 11) | (g << 5) | b);
-					};
-
-				if (RSX(ctx)->fifo_ctrl->last_cmd() & RSX_METHOD_NON_INCREMENT_CMD_MASK) [[unlikely]]
-					{
-						// Move last 16 bits
-						dst[0] = convert(src[count - 1]);
-						RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, 2);
-						break;
-					}
-
-					for (u32 i = 0; i < count; i++)
-					{
-						dst[i] = convert(src[i]);
-					}
-
-					RSX(ctx)->invalidate_fragment_program(dst_dma, dst_offset, count * 2);
-					break;
-			}
-			default:
-			{
-				fmt::throw_exception("Unreachable");
-			}
-			}
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/NV47/HW/nv308a.h b/rpcs3/Emu/RSX/NV47/HW/nv308a.h
deleted file mode 100644
index 5b14e6d3a5..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/nv308a.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// NV47 Format Conversion
-#pragma once
-
-#include "context.h"
-
-namespace rsx
-{
-	namespace nv308a
-	{
-		struct color
-		{
-			static void impl(context* ctx, u32 reg, u32 arg);
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp b/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp
deleted file mode 100644
index cbb04d140a..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-#include "stdafx.h"
-#include "nv406e.h"
-#include "nv47_sync.hpp"
-
-#include "Emu/RSX/RSXThread.h"
-
-#include "context_accessors.define.h"
-
-namespace rsx
-{
-	namespace nv406e
-	{
-		void set_reference(context* ctx, u32 /*reg*/, u32 arg)
-		{
-			RSX(ctx)->sync();
-
-			// Write ref+get (get will be written again with the same value at command end)
-			auto& dma = *vm::_ptr<RsxDmaControl>(RSX(ctx)->dma_address);
-			dma.get.release(RSX(ctx)->fifo_ctrl->get_pos());
-			dma.ref.store(arg);
-		}
-
-		void semaphore_acquire(context* ctx, u32 /*reg*/, u32 arg)
-		{
-			RSX(ctx)->sync_point_request.release(true);
-			const u32 addr = get_address(REGS(ctx)->semaphore_offset_406e(), REGS(ctx)->semaphore_context_dma_406e());
-
-			// Syncronization point, may be associated with memory changes without actually changing addresses
-			RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_needs_rehash;
-
-			const auto& sema = vm::_ref<RsxSemaphore>(addr);
-
-			if (sema == arg)
-			{
-				// Flip semaphore doesnt need wake-up delay
-				if (addr != RSX(ctx)->label_addr + 0x10)
-				{
-					RSX(ctx)->flush_fifo();
-					RSX(ctx)->fifo_wake_delay(2);
-				}
-
-				return;
-			}
-			else
-			{
-				RSX(ctx)->flush_fifo();
-			}
-
-			u64 start = get_system_time();
-			u64 last_check_val = start;
-
-			while (sema != arg)
-			{
-				if (RSX(ctx)->test_stopped())
-				{
-					RSX(ctx)->state += cpu_flag::again;
-					return;
-				}
-
-				if (const auto tdr = static_cast<u64>(g_cfg.video.driver_recovery_timeout))
-				{
-					const u64 current = get_system_time();
-
-					if (current - last_check_val > 20'000)
-					{
-						// Suspicious amnount of time has passed
-						// External pause such as debuggers' pause or operating system sleep may have taken place
-						// Ignore it
-						start += current - last_check_val;
-					}
-
-					last_check_val = current;
-
-					if ((current - start) > tdr)
-					{
-						// If longer than driver timeout force exit
-						rsx_log.error("nv406e::semaphore_acquire has timed out. semaphore_address=0x%X", addr);
-						break;
-					}
-				}
-
-				RSX(ctx)->cpu_wait({});
-			}
-
-			RSX(ctx)->fifo_wake_delay();
-			RSX(ctx)->performance_counters.idle_time += (get_system_time() - start);
-		}
-
-		void semaphore_release(context* ctx, u32 /*reg*/, u32 arg)
-		{
-			const u32 offset = REGS(ctx)->semaphore_offset_406e();
-
-			if (offset % 4)
-			{
-				rsx_log.warning("NV406E semaphore release is using unaligned semaphore, ignoring. (offset=0x%x)", offset);
-				return;
-			}
-
-			const u32 ctxt = REGS(ctx)->semaphore_context_dma_406e();
-
-			// By avoiding doing this on flip's semaphore release
-			// We allow last gcm's registers reset to occur in case of a crash
-			if (const bool is_flip_sema = (offset == 0x10 && ctxt == CELL_GCM_CONTEXT_DMA_SEMAPHORE_R);
-				!is_flip_sema)
-			{
-				RSX(ctx)->sync_point_request.release(true);
-			}
-
-			const u32 addr = get_address(offset, ctxt);
-
-			// TODO: Check if possible to write on reservations
-			if (RSX(ctx)->label_addr >> 28 != addr >> 28)
-			{
-				rsx_log.error("NV406E semaphore unexpected address. Please report to the developers. (offset=0x%x, addr=0x%x)", offset, addr);
-				RSX(ctx)->recover_fifo();
-				return;
-			}
-
-			if (addr == RSX(ctx)->device_addr + 0x30 && !arg)
-			{
-				// HW flip synchronization related, 1 is not written without display queue command (TODO: make it behave as real hw)
-				arg = 1;
-			}
-
-			util::write_gcm_label<false, true>(ctx, addr, arg);
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/NV47/HW/nv406e.h b/rpcs3/Emu/RSX/NV47/HW/nv406e.h
deleted file mode 100644
index 4fd7200f32..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/nv406e.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// NV47 Sync Objects
-#pragma once
-
-#include "context.h"
-
-namespace rsx
-{
-	namespace nv406e
-	{
-		void set_reference(context* ctx, u32 reg, u32 arg);
-
-		void semaphore_acquire(context* ctx, u32 reg, u32 arg);
-
-		void semaphore_release(context* ctx, u32 reg, u32 arg);
-	}
-}
diff --git a/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp b/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp
deleted file mode 100644
index d0298cf359..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp
+++ /dev/null
@@ -1,723 +0,0 @@
-#include "stdafx.h"
-#include "nv4097.h"
-#include "nv47_sync.hpp"
-
-#include "Emu/RSX/RSXThread.h"
-#include "Emu/RSX/Common/BufferUtils.h"
-
-#define RSX(ctx) ctx->rsxthr
-#define REGS(ctx) (&rsx::method_registers)
-#define RSX_CAPTURE_EVENT(name) if (RSX(ctx)->capture_current_frame) { RSX(ctx)->capture_frame(name); }
-
-namespace rsx
-{
-	namespace nv4097
-	{
-		///// Program management
-
-		void set_shader_program_dirty(context* ctx, u32, u32)
-		{
-			RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_ucode_dirty;
-		}
-
-		void set_transform_constant::decode_one([[maybe_unused]] context* ctx, u32 reg, u32 arg)
-		{
-			const u32 index = reg - NV4097_SET_TRANSFORM_CONSTANT;
-			const u32 constant_id = index / 4;
-			const u8 subreg = index % 4;
-			const u32 load = REGS(ctx)->transform_constant_load();
-
-			REGS(ctx)->transform_constants[load + constant_id][subreg] = arg;
-		}
-
-		void set_transform_constant::batch_decode(context* ctx, u32 reg, const std::span<const u32>& args, const std::function<bool(context*, u32, u32)>& notify)
-		{
-			const u32 index = reg - NV4097_SET_TRANSFORM_CONSTANT;
-			const u32 constant_id = index / 4;
-			const u8 subreg = index % 4;
-			const u32 load = REGS(ctx)->transform_constant_load();
-
-			auto dst = &REGS(ctx)->transform_constants[load + constant_id][subreg];
-			copy_data_swap_u32(dst, args.data(), ::size32(args));
-
-			// Notify
-			const u32 last_constant_id = ((reg + ::size32(args) + 3) - NV4097_SET_TRANSFORM_CONSTANT) / 4; // Aligned div
-			const u32 load_index = load + constant_id;
-			const u32 load_count = last_constant_id - constant_id;
-
-			if (!notify || !notify(ctx, load_index, load_count))
-			{
-				RSX(ctx)->patch_transform_constants(ctx, load_index, load_count);
-			}
-		}
-
-		void set_transform_constant::impl(context* ctx, u32 reg, [[maybe_unused]] u32 arg)
-		{
-			const u32 index = reg - NV4097_SET_TRANSFORM_CONSTANT;
-			const u32 constant_id = index / 4;
-			const u8 subreg = index % 4;
-
-			// FIFO args count including this one
-			const u32 fifo_args_cnt = RSX(ctx)->fifo_ctrl->get_remaining_args_count() + 1;
-
-			// The range of methods this function resposible to
-			const u32 method_range = 32 - index;
-
-			// Get limit imposed by FIFO PUT (if put is behind get it will result in a number ignored by min)
-			const u32 fifo_read_limit = static_cast<u32>(((RSX(ctx)->ctrl->put & ~3ull) - (RSX(ctx)->fifo_ctrl->get_pos())) / 4);
-
-			const u32 count = std::min<u32>({ fifo_args_cnt, fifo_read_limit, method_range });
-
-			const u32 load = REGS(ctx)->transform_constant_load();
-
-			u32 rcount = count;
-			if (const u32 max = (load + constant_id) * 4 + count + subreg, limit = 468 * 4; max > limit)
-			{
-				// Ignore addresses outside the usable [0, 467] range
-				rsx_log.warning("Invalid transform register index (load=%u, index=%u, count=%u)", load, index, count);
-
-				if ((max - count) < limit)
-					rcount -= max - limit;
-				else
-					rcount = 0;
-			}
-
-			if (rcount == 0)
-			{
-				// Out-of-bounds write is a NOP
-				rsx_log.trace("Out of bounds write for transform constant block.");
-				RSX(ctx)->fifo_ctrl->skip_methods(fifo_args_cnt - 1);
-				return;
-			}
-
-			if (RSX(ctx)->in_begin_end && !REGS(ctx)->current_draw_clause.empty())
-			{
-				// Updating constants mid-draw is messy. Defer the writes
-				REGS(ctx)->current_draw_clause.insert_command_barrier(
-					rsx::transform_constant_update_barrier,
-					RSX(ctx)->fifo_ctrl->get_pos(),
-					rcount,
-					reg - NV4097_SET_TRANSFORM_CONSTANT
-				);
-
-				RSX(ctx)->fifo_ctrl->skip_methods(rcount - 1);
-				return;
-			}
-
-			const auto values = &REGS(ctx)->transform_constants[load + constant_id][subreg];
-
-			const auto fifo_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(rcount);
-
-			if (fifo_span.size() < rcount)
-			{
-				rcount = ::size32(fifo_span);
-			}
-
-			if (RSX(ctx)->m_graphics_state & rsx::pipeline_state::transform_constants_dirty)
-			{
-				// Minor optimization: don't compare values if we already know we need invalidation
-				copy_data_swap_u32(values, fifo_span.data(), rcount);
-			}
-			else
-			{
-				if (copy_data_swap_u32_cmp(values, fifo_span.data(), rcount))
-				{
-					// Transform constants invalidation is expensive (~8k bytes per update)
-					RSX(ctx)->m_graphics_state |= rsx::pipeline_state::transform_constants_dirty;
-				}
-			}
-
-			RSX(ctx)->fifo_ctrl->skip_methods(rcount - 1);
-		}
-
-		void set_transform_program::impl(context* ctx, u32 reg, u32 /*arg*/)
-		{
-			const u32 index = reg - NV4097_SET_TRANSFORM_PROGRAM;
-
-			// FIFO args count including this one
-			const u32 fifo_args_cnt = RSX(ctx)->fifo_ctrl->get_remaining_args_count() + 1;
-
-			// The range of methods this function resposible to
-			const u32 method_range = 32 - index;
-
-			// Get limit imposed by FIFO PUT (if put is behind get it will result in a number ignored by min)
-			const u32 fifo_read_limit = static_cast<u32>(((RSX(ctx)->ctrl->put & ~3ull) - (RSX(ctx)->fifo_ctrl->get_pos())) / 4);
-
-			const u32 count = std::min<u32>({ fifo_args_cnt, fifo_read_limit, method_range });
-
-			const u32 load_pos = REGS(ctx)->transform_program_load();
-
-			u32 rcount = count;
-
-			if (const u32 max = load_pos * 4 + rcount + (index % 4);
-				max > max_vertex_program_instructions * 4)
-			{
-				rsx_log.warning("Program buffer overflow! Attempted to write %u VP instructions.", max / 4);
-				rcount -= max - (max_vertex_program_instructions * 4);
-			}
-
-			if (!rcount)
-			{
-				// Out-of-bounds write is a NOP
-				rsx_log.trace("Out of bounds write for transform program block.");
-				RSX(ctx)->fifo_ctrl->skip_methods(fifo_args_cnt - 1);
-				return;
-			}
-
-			const auto fifo_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(rcount);
-
-			if (fifo_span.size() < rcount)
-			{
-				rcount = ::size32(fifo_span);
-			}
-
-			const auto out_ptr = &REGS(ctx)->transform_program[load_pos * 4 + index % 4];
-
-			pipeline_state to_set_dirty = rsx::pipeline_state::vertex_program_ucode_dirty;
-
-			if (rcount >= 4 && !RSX(ctx)->m_graphics_state.test(rsx::pipeline_state::vertex_program_ucode_dirty))
-			{
-				// Assume clean
-				to_set_dirty = {};
-
-				const usz first_index_off = 0;
-				const usz second_index_off = (((rcount / 4) - 1) / 2) * 4;
-
-				const u64 src_op1_2 = read_from_ptr<be_t<u64>>(fifo_span.data() + first_index_off);
-				const u64 src_op2_2 = read_from_ptr<be_t<u64>>(fifo_span.data() + second_index_off);
-
-				// Fast comparison
-				if (src_op1_2 != read_from_ptr<u64>(out_ptr + first_index_off) || src_op2_2 != read_from_ptr<u64>(out_ptr + second_index_off))
-				{
-					to_set_dirty = rsx::pipeline_state::vertex_program_ucode_dirty;
-				}
-			}
-
-			if (to_set_dirty)
-			{
-				copy_data_swap_u32(out_ptr, fifo_span.data(), rcount);
-			}
-			else if (copy_data_swap_u32_cmp(out_ptr, fifo_span.data(), rcount))
-			{
-				to_set_dirty = rsx::pipeline_state::vertex_program_ucode_dirty;
-			}
-
-			RSX(ctx)->m_graphics_state |= to_set_dirty;
-			REGS(ctx)->transform_program_load_set(load_pos + ((rcount + index % 4) / 4));
-			RSX(ctx)->fifo_ctrl->skip_methods(rcount - 1);
-		}
-
-		///// Texture management
-
-		///// Surface management
-
-		void set_surface_dirty_bit(context* ctx, u32 reg, u32 arg)
-		{
-			if (arg == REGS(ctx)->latch)
-			{
-				return;
-			}
-
-			switch (reg)
-			{
-			case NV4097_SET_SURFACE_COLOR_TARGET:
-				RSX(ctx)->m_graphics_state |= rsx::pipeline_state::pipeline_config_dirty;
-				break;
-			case NV4097_SET_SURFACE_CLIP_VERTICAL:
-			case NV4097_SET_SURFACE_CLIP_HORIZONTAL:
-				RSX(ctx)->m_graphics_state |= rsx::pipeline_state::vertex_state_dirty;
-				break;
-			default:
-				break;
-			}
-
-			RSX(ctx)->m_graphics_state.set(rtt_config_dirty);
-			RSX(ctx)->m_graphics_state.clear(rtt_config_contested);
-		}
-
-		void set_surface_format(context* ctx, u32 reg, u32 arg)
-		{
-			// The high bits of this register are just log2(dimension), ignore them
-			if ((arg & 0xFFFF) == (REGS(ctx)->latch & 0xFFFF))
-			{
-				return;
-			}
-
-			// The important parameters have changed (format, type, antialias)
-			RSX(ctx)->m_graphics_state |= rsx::pipeline_state::pipeline_config_dirty;
-
-			// Check if we need to also update fragment state
-			const auto current = REGS(ctx)->decode<NV4097_SET_SURFACE_FORMAT>(arg);
-			const auto previous = REGS(ctx)->decode<NV4097_SET_SURFACE_FORMAT>(REGS(ctx)->latch);
-
-			if (*current.antialias() != *previous.antialias() ||                         // Antialias control has changed, update ROP parameters
-				current.is_integer_color_format() != previous.is_integer_color_format()) // The type of color format also requires ROP control update
-			{
-				RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_state_dirty;
-			}
-
-			set_surface_dirty_bit(ctx, reg, arg);
-		}
-
-		void set_surface_options_dirty_bit(context* ctx, u32 reg, u32 arg)
-		{
-			if (arg != REGS(ctx)->latch)
-			{
-				RSX(ctx)->on_framebuffer_options_changed(reg);
-				RSX(ctx)->m_graphics_state |= rsx::pipeline_config_dirty;
-			}
-		}
-
-		void set_color_mask(context* ctx, u32 reg, u32 arg)
-		{
-			if (arg == REGS(ctx)->latch)
-			{
-				return;
-			}
-
-			if (REGS(ctx)->decode<NV4097_SET_COLOR_MASK>(arg).is_invalid()) [[ unlikely ]]
-			{
-				// Rollback
-				REGS(ctx)->decode(reg, REGS(ctx)->latch);
-				return;
-			}
-
-			set_surface_options_dirty_bit(ctx, reg, arg);
-		}
-
-		void set_stencil_op(context* ctx, u32 reg, u32 arg)
-		{
-			if (arg == REGS(ctx)->latch)
-			{
-				return;
-			}
-
-			if (to_stencil_op(arg)) [[ likely ]]
-			{
-				set_surface_options_dirty_bit(ctx, reg, arg);
-				return;
-			}
-
-			// Rollback
-			REGS(ctx)->decode(reg, REGS(ctx)->latch);
-		}
-
-		///// Draw call setup (vertex, etc)
-
-		void set_array_element16(context* ctx, u32, u32 arg)
-		{
-			if (RSX(ctx)->in_begin_end)
-			{
-				RSX(ctx)->GRAPH_frontend().append_array_element(arg & 0xFFFF);
-				RSX(ctx)->GRAPH_frontend().append_array_element(arg >> 16);
-			}
-		}
-
-		void set_array_element32(context* ctx, u32, u32 arg)
-		{
-			if (RSX(ctx)->in_begin_end)
-				RSX(ctx)->GRAPH_frontend().append_array_element(arg);
-		}
-
-		void draw_arrays(context* /*rsx*/, u32 /*reg*/, u32 arg)
-		{
-			REGS(ctx)->current_draw_clause.command = rsx::draw_command::array;
-			rsx::registers_decoder<NV4097_DRAW_ARRAYS>::decoded_type v(arg);
-
-			REGS(ctx)->current_draw_clause.append(v.start(), v.count());
-		}
-
-		void draw_index_array(context* /*rsx*/, u32 /*reg*/, u32 arg)
-		{
-			REGS(ctx)->current_draw_clause.command = rsx::draw_command::indexed;
-			rsx::registers_decoder<NV4097_DRAW_INDEX_ARRAY>::decoded_type v(arg);
-
-			REGS(ctx)->current_draw_clause.append(v.start(), v.count());
-		}
-
-		void draw_inline_array(context* /*rsx*/, u32 /*reg*/, u32 arg)
-		{
-			arg = std::bit_cast<u32, be_t<u32>>(arg);
-			REGS(ctx)->current_draw_clause.command = rsx::draw_command::inlined_array;
-			REGS(ctx)->current_draw_clause.inline_vertex_array.push_back(arg);
-		}
-
-		void set_transform_program_start(context* ctx, u32 reg, u32)
-		{
-			if (REGS(ctx)->registers[reg] != REGS(ctx)->latch)
-			{
-				RSX(ctx)->m_graphics_state |= rsx::pipeline_state::vertex_program_ucode_dirty;
-			}
-		}
-
-		void set_vertex_attribute_output_mask(context* ctx, u32 reg, u32)
-		{
-			if (REGS(ctx)->registers[reg] != REGS(ctx)->latch)
-			{
-				RSX(ctx)->m_graphics_state |= rsx::pipeline_state::vertex_program_state_dirty;
-			}
-		}
-
-		void set_vertex_base_offset(context* ctx, u32 reg, u32 arg)
-		{
-			util::push_draw_parameter_change(ctx, vertex_base_modifier_barrier, reg, arg);
-		}
-
-		void set_index_base_offset(context* ctx, u32 reg, u32 arg)
-		{
-			util::push_draw_parameter_change(ctx, index_base_modifier_barrier, reg, arg);
-		}
-
-		void check_index_array_dma(context* ctx, u32 reg, u32 arg)
-		{
-			// Check if either location or index type are invalid
-			if (arg & ~(CELL_GCM_LOCATION_MAIN | (CELL_GCM_DRAW_INDEX_ARRAY_TYPE_16 << 4)))
-			{
-				// Ignore invalid value, recover
-				REGS(ctx)->registers[reg] = REGS(ctx)->latch;
-				RSX(ctx)->recover_fifo();
-
-				rsx_log.error("Invalid NV4097_SET_INDEX_ARRAY_DMA value: 0x%x", arg);
-			}
-		}
-
-		///// Drawing
-
-		void set_begin_end(context* ctx, u32 /*reg*/, u32 arg)
-		{
-			// Ignore upper bits
-			if (const u8 prim = static_cast<u8>(arg))
-			{
-				const auto primitive_type = to_primitive_type(prim);
-				if (!primitive_type)
-				{
-					RSX(ctx)->in_begin_end = true;
-
-					rsx_log.warning("Invalid NV4097_SET_BEGIN_END value: 0x%x", arg);
-					return;
-				}
-
-				REGS(ctx)->current_draw_clause.reset(primitive_type);
-				RSX(ctx)->begin();
-				return;
-			}
-
-			// Check if we have immediate mode vertex data in a driver-local buffer
-			if (REGS(ctx)->current_draw_clause.command == rsx::draw_command::none)
-			{
-				const u32 push_buffer_vertices_count = RSX(ctx)->GRAPH_frontend().get_push_buffer_vertex_count();
-				const u32 push_buffer_index_count = RSX(ctx)->GRAPH_frontend().get_push_buffer_index_count();
-
-				// Need to set this flag since it overrides some register contents
-				REGS(ctx)->current_draw_clause.is_immediate_draw = true;
-
-				if (push_buffer_index_count)
-				{
-					REGS(ctx)->current_draw_clause.command = rsx::draw_command::indexed;
-					REGS(ctx)->current_draw_clause.append(0, push_buffer_index_count);
-				}
-				else if (push_buffer_vertices_count)
-				{
-					REGS(ctx)->current_draw_clause.command = rsx::draw_command::array;
-					REGS(ctx)->current_draw_clause.append(0, push_buffer_vertices_count);
-				}
-			}
-			else
-			{
-				REGS(ctx)->current_draw_clause.is_immediate_draw = false;
-			}
-
-			if (!REGS(ctx)->current_draw_clause.empty())
-			{
-				REGS(ctx)->current_draw_clause.compile();
-
-				if (g_cfg.video.disable_video_output)
-				{
-					RSX(ctx)->execute_nop_draw();
-					RSX(ctx)->rsx::thread::end();
-					return;
-				}
-
-				// Notify the backend if the drawing style changes (instanced vs non-instanced)
-				if (REGS(ctx)->current_draw_clause.is_trivial_instanced_draw != RSX(ctx)->is_current_vertex_program_instanced())
-				{
-					RSX(ctx)->m_graphics_state |= rsx::pipeline_state::xform_instancing_state_dirty;
-				}
-
-				RSX(ctx)->end();
-			}
-			else
-			{
-				RSX(ctx)->in_begin_end = false;
-			}
-
-			if (RSX(ctx)->pause_on_draw && RSX(ctx)->pause_on_draw.exchange(false))
-			{
-				RSX(ctx)->state -= cpu_flag::dbg_step;
-				RSX(ctx)->state += cpu_flag::dbg_pause;
-				RSX(ctx)->check_state();
-			}
-		}
-
-		void clear(context* ctx, u32 /*reg*/, u32 arg)
-		{
-			RSX(ctx)->clear_surface(arg);
-
-			RSX_CAPTURE_EVENT("clear");
-		}
-
-		void clear_zcull(context* ctx, u32 /*reg*/, u32 /*arg*/)
-		{
-			RSX_CAPTURE_EVENT("clear zcull memory");
-		}
-
-		void set_face_property(context* ctx, u32 reg, u32 arg)
-		{
-			if (arg == REGS(ctx)->latch)
-			{
-				return;
-			}
-
-			bool valid;
-			switch (reg)
-			{
-			case NV4097_SET_CULL_FACE:
-				valid = !!to_cull_face(arg); break;
-			case NV4097_SET_FRONT_FACE:
-				valid = !!to_front_face(arg); break;
-			default:
-				valid = false; break;
-			}
-
-			if (valid) [[ likely ]]
-			{
-				RSX(ctx)->m_graphics_state |= rsx::pipeline_config_dirty;
-			}
-			else
-			{
-				REGS(ctx)->registers[reg] = REGS(ctx)->latch;
-			}
-		}
-
-		void set_blend_equation(context* ctx, u32 reg, u32 arg)
-		{
-			if (arg == REGS(ctx)->latch)
-			{
-				return;
-			}
-
-			if (to_blend_equation(arg & 0xFFFF) &&
-				to_blend_equation((arg >> 16) & 0xFFFF)) [[ likely ]]
-			{
-				RSX(ctx)->m_graphics_state |= rsx::pipeline_config_dirty;
-				return;
-			}
-
-			// Rollback
-			REGS(ctx)->decode(reg, REGS(ctx)->latch);
-		}
-
-		void set_blend_factor(context* ctx, u32 reg, u32 arg)
-		{
-			if (arg == REGS(ctx)->latch)
-			{
-				return;
-			}
-
-			if (to_blend_factor(arg & 0xFFFF) &&
-				to_blend_factor((arg >> 16) & 0xFFFF)) [[ likely ]]
-			{
-				RSX(ctx)->m_graphics_state |= rsx::pipeline_config_dirty;
-				return;
-			}
-
-			// Rollback
-			REGS(ctx)->decode(reg, REGS(ctx)->latch);
-		}
-
-		void set_transform_constant_load(context* ctx, u32 reg, u32 arg)
-		{
-			util::push_draw_parameter_change(ctx, rsx::transform_constant_load_modifier_barrier, reg, arg);
-		}
-
-		///// Reports
-
-		void get_report(context* ctx, u32 /*reg*/, u32 arg)
-		{
-			u8 type = arg >> 24;
-			u32 offset = arg & 0xffffff;
-
-			auto address_ptr = util::get_report_data_impl(ctx, offset);
-			if (!address_ptr)
-			{
-				rsx_log.error("Bad argument passed to NV4097_GET_REPORT, arg=0x%X", arg);
-				return;
-			}
-
-			switch (type)
-			{
-			case CELL_GCM_ZPASS_PIXEL_CNT:
-			case CELL_GCM_ZCULL_STATS:
-			case CELL_GCM_ZCULL_STATS1:
-			case CELL_GCM_ZCULL_STATS2:
-			case CELL_GCM_ZCULL_STATS3:
-				RSX(ctx)->get_zcull_stats(type, vm::cast(address_ptr));
-				break;
-			default:
-				rsx_log.error("NV4097_GET_REPORT: Bad type %d", type);
-
-				vm::_ptr<atomic_t<CellGcmReportData>>(address_ptr)->atomic_op([&](CellGcmReportData& data)
-				{
-					data.timer = RSX(ctx)->timestamp();
-					data.padding = 0;
-				});
-				break;
-			}
-		}
-
-		void clear_report_value(context* ctx, u32 /*reg*/, u32 arg)
-		{
-			switch (arg)
-			{
-			case CELL_GCM_ZPASS_PIXEL_CNT:
-			case CELL_GCM_ZCULL_STATS:
-				break;
-			default:
-				rsx_log.error("NV4097_CLEAR_REPORT_VALUE: Bad type: %d", arg);
-				break;
-			}
-
-			RSX(ctx)->clear_zcull_stats(arg);
-		}
-
-		void set_render_mode(context* ctx, u32, u32 arg)
-		{
-			const u32 mode = arg >> 24;
-			switch (mode)
-			{
-			case 1:
-				RSX(ctx)->disable_conditional_rendering();
-				return;
-			case 2:
-				break;
-			default:
-				rsx_log.error("Unknown render mode %d", mode);
-				return;
-			}
-
-			const u32 offset = arg & 0xffffff;
-			auto address_ptr = util::get_report_data_impl(ctx, offset);
-
-			if (!address_ptr)
-			{
-				rsx_log.error("Bad argument passed to NV4097_SET_RENDER_ENABLE, arg=0x%X", arg);
-				return;
-			}
-
-			// Defer conditional render evaluation
-			RSX(ctx)->enable_conditional_rendering(vm::cast(address_ptr));
-		}
-
-		void set_zcull_render_enable(context* ctx, u32, u32)
-		{
-			RSX(ctx)->notify_zcull_info_changed();
-		}
-
-		void set_zcull_stats_enable(context* ctx, u32, u32)
-		{
-			RSX(ctx)->notify_zcull_info_changed();
-		}
-
-		void set_zcull_pixel_count_enable(context* ctx, u32, u32)
-		{
-			RSX(ctx)->notify_zcull_info_changed();
-		}
-
-		///// Misc (sync objects, etc)
-
-		void set_notify(context* ctx, u32 /*reg*/, u32 /*arg*/)
-		{
-			const u32 location = REGS(ctx)->context_dma_notify();
-			const u32 index = (location & 0x7) ^ 0x7;
-
-			if ((location & ~7) != (CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0 & ~7))
-			{
-				if (rsx_log.trace)
-					rsx_log.trace("NV4097_NOTIFY: invalid context = 0x%x", REGS(ctx)->context_dma_notify());
-				return;
-			}
-
-			const u32 addr = RSX(ctx)->iomap_table.get_addr(0xf100000 + (index * 0x40));
-
-			ensure(addr != umax);
-
-			vm::_ptr<atomic_t<RsxNotify>>(addr)->store(
-			{
-				RSX(ctx)->timestamp(),
-				0
-			});
-		}
-
-		void texture_read_semaphore_release(context* ctx, u32 /*reg*/, u32 arg)
-		{
-			// Pipeline barrier seems to be equivalent to a SHADER_READ stage barrier.
-			// Ideally the GPU only needs to have cached all textures declared up to this point before writing the label.
-
-			// lle-gcm likes to inject system reserved semaphores, presumably for system/vsh usage
-			// Avoid calling render to avoid any havoc(flickering) they may cause from invalid flush/write
-			const u32 offset = REGS(ctx)->semaphore_offset_4097();
-
-			if (offset % 16)
-			{
-				rsx_log.error("NV4097 semaphore using unaligned offset, recovering. (offset=0x%x)", offset);
-				RSX(ctx)->recover_fifo();
-				return;
-			}
-
-			const u32 addr = get_address(offset, REGS(ctx)->semaphore_context_dma_4097());
-
-			if (RSX(ctx)->label_addr >> 28 != addr >> 28)
-			{
-				rsx_log.error("NV4097 semaphore unexpected address. Please report to the developers. (offset=0x%x, addr=0x%x)", offset, addr);
-			}
-
-			if (g_cfg.video.strict_rendering_mode) [[ unlikely ]]
-			{
-				util::write_gcm_label<true, true>(ctx, addr, arg);
-			}
-			else
-			{
-				util::write_gcm_label<true, false>(ctx, addr, arg);
-			}
-		}
-
-		void back_end_write_semaphore_release(context* ctx, u32 /*reg*/, u32 arg)
-		{
-			// Full pipeline barrier. GPU must flush pipeline before writing the label
-
-			const u32 offset = REGS(ctx)->semaphore_offset_4097();
-
-			if (offset % 16)
-			{
-				rsx_log.error("NV4097 semaphore using unaligned offset, recovering. (offset=0x%x)", offset);
-				RSX(ctx)->recover_fifo();
-				return;
-			}
-
-			const u32 addr = get_address(offset, REGS(ctx)->semaphore_context_dma_4097());
-
-			if (RSX(ctx)->label_addr >> 28 != addr >> 28)
-			{
-				rsx_log.error("NV4097 semaphore unexpected address. Please report to the developers. (offset=0x%x, addr=0x%x)", offset, addr);
-			}
-
-			const u32 val = (arg & 0xff00ff00) | ((arg & 0xff) << 16) | ((arg >> 16) & 0xff);
-			util::write_gcm_label<true, true>(ctx, addr, val);
-		}
-
-		void sync(context* ctx, u32, u32)
-		{
-			RSX(ctx)->sync();
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/NV47/HW/nv4097.h b/rpcs3/Emu/RSX/NV47/HW/nv4097.h
deleted file mode 100644
index db736396b9..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/nv4097.h
+++ /dev/null
@@ -1,245 +0,0 @@
-// NV47 3D Engine
-#pragma once
-
-#include "common.h"
-
-#include "Emu/RSX/gcm_enums.h"
-#include "Emu/RSX/NV47/FW/draw_call.inc.h"
-
-#include <span>
-
-namespace rsx
-{
-	enum command_barrier_type : u32;
-
-	namespace nv4097
-	{
-		template<typename Type> struct vertex_data_type_from_element_type;
-		template<> struct vertex_data_type_from_element_type<float> { static const vertex_base_type type = vertex_base_type::f; };
-		template<> struct vertex_data_type_from_element_type<f16> { static const vertex_base_type type = vertex_base_type::sf; };
-		template<> struct vertex_data_type_from_element_type<u8> { static const vertex_base_type type = vertex_base_type::ub; };
-		template<> struct vertex_data_type_from_element_type<u16> { static const vertex_base_type type = vertex_base_type::s32k; };
-		template<> struct vertex_data_type_from_element_type<s16> { static const vertex_base_type type = vertex_base_type::s1; };
-
-		void clear(context* ctx, u32 reg, u32 arg);
-
-		void clear_zcull(context* ctx, u32 reg, u32 arg);
-
-		void set_face_property(context* ctx, u32 reg, u32 arg);
-
-		void set_notify(context* ctx, u32 reg, u32 arg);
-
-		void texture_read_semaphore_release(context* ctx, u32 reg, u32 arg);
-
-		void back_end_write_semaphore_release(context* ctx, u32 reg, u32 arg);
-
-		void set_array_element16(context* ctx, u32, u32 arg);
-
-		void set_array_element32(context* ctx, u32, u32 arg);
-
-		void draw_arrays(context* /*rsx*/, u32 reg, u32 arg);
-
-		void draw_index_array(context* /*rsx*/, u32 reg, u32 arg);
-
-		void draw_inline_array(context* /*rsx*/, u32 reg, u32 arg);
-
-		void set_transform_program_start(context* ctx, u32 reg, u32);
-
-		void set_vertex_attribute_output_mask(context* ctx, u32 reg, u32);
-
-		void set_begin_end(context* ctxthr, u32 reg, u32 arg);
-
-		void get_report(context* ctx, u32 reg, u32 arg);
-
-		void clear_report_value(context* ctx, u32 reg, u32 arg);
-
-		void set_render_mode(context* ctx, u32, u32 arg);
-
-		void set_zcull_render_enable(context* ctx, u32, u32);
-
-		void set_zcull_stats_enable(context* ctx, u32, u32);
-
-		void set_zcull_pixel_count_enable(context* ctx, u32, u32);
-
-		void sync(context* ctx, u32, u32);
-
-		void set_shader_program_dirty(context* ctx, u32, u32);
-
-		void set_surface_dirty_bit(context* ctx, u32 reg, u32 arg);
-
-		void set_surface_format(context* ctx, u32 reg, u32 arg);
-
-		void set_surface_options_dirty_bit(context* ctx, u32 reg, u32 arg);
-
-		void set_color_mask(context* ctx, u32 reg, u32 arg);
-
-		void set_stencil_op(context* ctx, u32 reg, u32 arg);
-
-		void set_vertex_base_offset(context* ctx, u32 reg, u32 arg);
-
-		void set_index_base_offset(context* ctx, u32 reg, u32 arg);
-
-		void check_index_array_dma(context* ctx, u32 reg, u32 arg);
-
-		void set_blend_equation(context* ctx, u32 reg, u32 arg);
-
-		void set_blend_factor(context* ctx, u32 reg, u32 arg);
-
-		void set_transform_constant_load(context* ctx, u32 reg, u32 arg);
-
-#define RSX(ctx) ctx->rsxthr
-#define REGS(ctx) (&rsx::method_registers)
-
-		/**
-		* id = base method register
-		* index = register index in method
-		* count = element count per attribute
-		* register_count = number of registers consumed per attribute. E.g 3-element methods have padding
-		*/
-		template<u32 id, u32 index, int count, int register_count, typename type>
-		void set_vertex_data_impl(context* ctx, u32 arg)
-		{
-			static constexpr usz increment_per_array_index = (register_count * sizeof(type)) / sizeof(u32);
-
-			static constexpr usz attribute_index = index / increment_per_array_index;
-			static constexpr usz vertex_subreg = index % increment_per_array_index;
-
-			constexpr auto vtype = vertex_data_type_from_element_type<type>::type;
-			static_assert(vtype != rsx::vertex_base_type::cmp);
-			static_assert(vtype != rsx::vertex_base_type::ub256);
-
-			// Convert LE data to BE layout
-			if constexpr (sizeof(type) == 4)
-			{
-				arg = std::bit_cast<u32, be_t<u32>>(arg);
-			}
-			else if constexpr (sizeof(type) == 2)
-			{
-				// 2 16-bit values packed in 1 32-bit word
-				const auto be_data = std::bit_cast<u32, be_t<u32>>(arg);
-
-				// After u32 swap, the components are in the wrong position
-				arg = (be_data << 16) | (be_data >> 16);
-			}
-
-			util::push_vertex_data(ctx, attribute_index, vertex_subreg, count, vtype, arg);
-		}
-
-		template<u32 index>
-		struct set_vertex_data4ub_m
-		{
-			static void impl(context* ctx, u32 /*reg*/, u32 arg)
-			{
-				set_vertex_data_impl<NV4097_SET_VERTEX_DATA4UB_M, index, 4, 4, u8>(ctx, arg);
-			}
-		};
-
-		template<u32 index>
-		struct set_vertex_data1f_m
-		{
-			static void impl(context* ctx, u32 /*reg*/, u32 arg)
-			{
-				set_vertex_data_impl<NV4097_SET_VERTEX_DATA1F_M, index, 1, 1, f32>(ctx, arg);
-			}
-		};
-
-		template<u32 index>
-		struct set_vertex_data2f_m
-		{
-			static void impl(context* ctx, u32 /*reg*/, u32 arg)
-			{
-				set_vertex_data_impl<NV4097_SET_VERTEX_DATA2F_M, index, 2, 2, f32>(ctx, arg);
-			}
-		};
-
-		template<u32 index>
-		struct set_vertex_data3f_m
-		{
-			static void impl(context* ctx, u32 /*reg*/, u32 arg)
-			{
-				//Register alignment is only 1, 2, or 4 (Rachet & Clank 2)
-				set_vertex_data_impl<NV4097_SET_VERTEX_DATA3F_M, index, 3, 4, f32>(ctx, arg);
-			}
-		};
-
-		template<u32 index>
-		struct set_vertex_data4f_m
-		{
-			static void impl(context* ctx, u32 /*reg*/, u32 arg)
-			{
-				set_vertex_data_impl<NV4097_SET_VERTEX_DATA4F_M, index, 4, 4, f32>(ctx, arg);
-			}
-		};
-
-		template<u32 index>
-		struct set_vertex_data2s_m
-		{
-			static void impl(context* ctx, u32 /*reg*/, u32 arg)
-			{
-				set_vertex_data_impl<NV4097_SET_VERTEX_DATA2S_M, index, 2, 2, u16>(ctx, arg);
-			}
-		};
-
-		template<u32 index>
-		struct set_vertex_data4s_m
-		{
-			static void impl(context* ctx, u32 /*reg*/, u32 arg)
-			{
-				set_vertex_data_impl<NV4097_SET_VERTEX_DATA4S_M, index, 4, 4, u16>(ctx, arg);
-			}
-		};
-
-		template<u32 index>
-		struct set_vertex_data_scaled4s_m
-		{
-			static void impl(context* ctx, u32 /*reg*/, u32 arg)
-			{
-				set_vertex_data_impl<NV4097_SET_VERTEX_DATA_SCALED4S_M, index, 4, 4, s16>(ctx, arg);
-			}
-		};
-
-		struct set_transform_constant
-		{
-			static void impl(context* ctx, u32 reg, u32 arg);
-
-			static void decode_one(context* ctx, u32 reg, u32 arg);
-
-			static void batch_decode(context* ctx, u32 reg, const std::span<const u32>& args, const std::function<bool(context*, u32, u32)>& notify = {});
-		};
-
-		struct set_transform_program
-		{
-			static void impl(context* ctx, u32 reg, u32 arg);
-		};
-
-		template<u32 index>
-		struct set_vertex_array_offset
-		{
-			static void impl(context* ctx, u32 reg, u32 arg)
-			{
-				util::push_draw_parameter_change(ctx, vertex_array_offset_modifier_barrier, reg, arg, 0, index);
-			}
-		};
-
-		template <u32 index>
-		struct set_fragment_texture_dirty_bit
-		{
-			static void impl(context* ctx, u32 /*reg*/, u32 arg)
-			{
-				util::set_fragment_texture_dirty_bit(ctx, arg, index);
-			}
-		};
-
-		template<u32 index>
-		struct set_vertex_texture_dirty_bit
-		{
-			static void impl(context* ctx, u32 /*reg*/, u32 /*arg*/)
-			{
-				util::set_vertex_texture_dirty_bit(ctx, index);
-			}
-		};
-
-#undef RSX
-#undef REGS
-	}
-}
diff --git a/rpcs3/Emu/RSX/NV47/HW/nv47.h b/rpcs3/Emu/RSX/NV47/HW/nv47.h
deleted file mode 100644
index 56395f6c28..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/nv47.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// RSX Hardware definitions
-#pragma once
-
-#include "nv0039.h" // Buffer objects
-#include "nv3089.h" // Blit engine (2D)
-#include "nv308a.h" // Format conversion
-#include "nv406e.h" // Sync objects
-#include "nv4097.h" // 3D engine (GRAPH)
diff --git a/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp b/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp
deleted file mode 100644
index 9f39f84c00..0000000000
--- a/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include "Emu/RSX/RSXThread.h"
-
-#include "context_accessors.define.h"
-
-namespace rsx
-{
-	void mm_flush_lazy();
-	void mm_flush();
-
-	namespace util
-	{
-		template <bool FlushDMA, bool FlushPipe>
-		static void write_gcm_label(context* ctx, u32 address, u32 data)
-		{
-			const bool is_flip_sema = (address == (RSX(ctx)->label_addr + 0x10) || address == (RSX(ctx)->device_addr + 0x30));
-			if (!is_flip_sema)
-			{
-				// First, queue the GPU work. If it flushes the queue for us, the following routines will be faster.
-				const bool handled = RSX(ctx)->get_backend_config().supports_host_gpu_labels && RSX(ctx)->release_GCM_label(address, data);
-
-				if (vm::_ref<RsxSemaphore>(address) == data)
-				{
-					// It's a no-op to write the same value (although there is a delay in real-hw so it's more accurate to allow GPU label in this case)
-					return;
-				}
-
-				if constexpr (FlushDMA || FlushPipe)
-				{
-					// Release op must be acoompanied by MM flush.
-					// FlushPipe implicitly does a MM flush but FlushDMA does not. Trigger the flush here
-					rsx::mm_flush();
-
-					if constexpr (FlushDMA)
-					{
-						// If the backend handled the request, this call will basically be a NOP
-						g_fxo->get<rsx::dma_manager>().sync();
-					}
-
-					if constexpr (FlushPipe)
-					{
-						// Syncronization point, may be associated with memory changes without actually changing addresses
-						RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_needs_rehash;
-
-						// Manually flush the pipeline.
-						// It is possible to stream report writes using the host GPU, but that generates too much submit traffic.
-						RSX(ctx)->sync();
-					}
-				}
-
-				if (handled)
-				{
-					// Backend will handle it, nothing to write.
-					return;
-				}
-			}
-
-			vm::write<atomic_t<RsxSemaphore>>(address, data);
-		}
-	}
-}
-
-#include "context_accessors.undef.h"
diff --git a/rpcs3/Emu/RSX/Null/NullGSRender.cpp b/rpcs3/Emu/RSX/Null/NullGSRender.cpp
index 38d1fd46da..43eefb9499 100644
--- a/rpcs3/Emu/RSX/Null/NullGSRender.cpp
+++ b/rpcs3/Emu/RSX/Null/NullGSRender.cpp
@@ -6,7 +6,7 @@ u64 NullGSRender::get_cycles()
 	return thread_ctrl::get_cycles(static_cast<named_thread<NullGSRender>&>(*this));
 }
 
-NullGSRender::NullGSRender(utils::serial* ar) noexcept : GSRender(ar)
+NullGSRender::NullGSRender() : GSRender()
 {
 }
 
diff --git a/rpcs3/Emu/RSX/Null/NullGSRender.h b/rpcs3/Emu/RSX/Null/NullGSRender.h
index 16a2512e75..4a34121058 100644
--- a/rpcs3/Emu/RSX/Null/NullGSRender.h
+++ b/rpcs3/Emu/RSX/Null/NullGSRender.h
@@ -5,9 +5,7 @@ class NullGSRender : public GSRender
 {
 public:
 	u64 get_cycles() final;
-
-	NullGSRender(utils::serial* ar) noexcept;
-	NullGSRender() noexcept : NullGSRender(nullptr) {}
+	NullGSRender();
 
 private:
 	void end() override;
diff --git a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp
deleted file mode 100644
index 2df72329bf..0000000000
--- a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp
+++ /dev/null
@@ -1,695 +0,0 @@
-#include "stdafx.h"
-#include "../overlay_manager.h"
-#include "overlay_friends_list_dialog.h"
-#include "Emu/System.h"
-#include "Emu/NP/rpcn_config.h"
-#include "Emu/vfs_config.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		void friend_callback(void* param, rpcn::NotificationType ntype, const std::string& username, bool status)
-		{
-			auto* dlg = static_cast<friends_list_dialog*>(param);
-			dlg->callback_handler(ntype, username, status);
-		}
-
-		friends_list_dialog::friends_list_entry::friends_list_entry(friends_list_dialog_page page, const std::string& username, const rpcn::friend_online_data& data)
-		{
-			std::unique_ptr<overlay_element> image = std::make_unique<image_view>();
-			image->set_size(160, 110);
-			image->set_padding(36, 36, 11, 11); // Square image, 88x88
-
-			std::string avatar_path = g_cfg_vfs.get_dev_flash() + "vsh/resource/explore/user/";
-			std::string text;
-
-			switch (page)
-			{
-			case friends_list_dialog_page::friends:
-			{
-				avatar_path += data.online ? "013.png" : "009.png";
-				text = get_localized_string(data.online ? localized_string_id::HOME_MENU_FRIENDS_STATUS_ONLINE : localized_string_id::HOME_MENU_FRIENDS_STATUS_OFFLINE);
-
-				if (data.online)
-				{
-					if (!data.pr_title.empty())
-					{
-						fmt::append(text, " - %s", data.pr_title);
-					}
-
-					if (!data.pr_status.empty())
-					{
-						fmt::append(text, " - %s", data.pr_status);
-					}
-				}
-				break;
-			}
-			case friends_list_dialog_page::invites:
-			{
-				// We use "online" to show whether an invite was sent or received
-				avatar_path += data.online ? "012.png" : "011.png";
-				text = get_localized_string(data.online ? localized_string_id::HOME_MENU_FRIENDS_REQUEST_RECEIVED : localized_string_id::HOME_MENU_FRIENDS_REQUEST_SENT);
-				break;
-			}
-			case friends_list_dialog_page::blocked:
-			{
-				avatar_path += "010.png";
-				text = get_localized_string(localized_string_id::HOME_MENU_FRIENDS_STATUS_BLOCKED);
-				break;
-			}
-			}
-
-			if (fs::exists(avatar_path))
-			{
-				icon_data = std::make_unique<image_info>(avatar_path);
-				static_cast<image_view*>(image.get())->set_raw_image(icon_data.get());
-			}
-			else
-			{
-				// Fallback
-				// TODO: use proper icon
-				static_cast<image_view*>(image.get())->set_image_resource(resource_config::standard_image_resource::square);
-			}
-
-			std::unique_ptr<overlay_element> text_stack  = std::make_unique<vertical_layout>();
-			std::unique_ptr<overlay_element> padding     = std::make_unique<spacer>();
-			std::unique_ptr<overlay_element> header_text = std::make_unique<label>(username);
-			std::unique_ptr<overlay_element> subtext     = std::make_unique<label>(text);
-
-			padding->set_size(1, 1);
-			header_text->set_size(800, 40);
-			header_text->set_font("Arial", 16);
-			header_text->set_wrap_text(true);
-
-			subtext->set_size(800, 0);
-			subtext->set_font("Arial", 14);
-			subtext->set_wrap_text(true);
-			static_cast<label*>(subtext.get())->auto_resize(true);
-
-			// Make back color transparent for text
-			header_text->back_color.a = 0.f;
-			subtext->back_color.a     = 0.f;
-
-			static_cast<vertical_layout*>(text_stack.get())->pack_padding = 5;
-			static_cast<vertical_layout*>(text_stack.get())->add_element(padding);
-			static_cast<vertical_layout*>(text_stack.get())->add_element(header_text);
-			static_cast<vertical_layout*>(text_stack.get())->add_element(subtext);
-
-			if (text_stack->h > image->h)
-			{
-				std::unique_ptr<overlay_element> padding2 = std::make_unique<spacer>();
-				padding2->set_size(1, 5);
-				static_cast<vertical_layout*>(text_stack.get())->add_element(padding2);
-			}
-
-			// Pack
-			this->pack_padding = 15;
-			add_element(image);
-			add_element(text_stack);
-		}
-
-		friends_list_dialog::friends_list_dialog()
-			: m_page_btn(120, 30)
-			, m_extra_btn(120, 30)
-		{
-			m_allow_input_on_pause = true;
-
-			m_dim_background = std::make_unique<overlay_element>();
-			m_dim_background->set_size(virtual_width, virtual_height);
-			m_dim_background->back_color.a = 0.5f;
-
-			m_list = std::make_unique<list_view>(virtual_width - 2 * 20, 540);
-			m_list->set_pos(20, 85);
-
-			m_message_box = std::make_shared<home_menu_message_box>(20, 85, virtual_width - 2 * 20, 540);
-			m_message_box->visible = false;
-
-			m_description = std::make_unique<label>();
-			m_description->set_font("Arial", 20);
-			m_description->set_pos(20, 37);
-			m_description->set_text("Select user"); // Fallback. I don't think this will ever be used, so I won't localize it.
-			m_description->auto_resize();
-			m_description->back_color.a = 0.f;
-
-			fade_animation.duration_sec = 0.15f;
-
-			return_code = selection_code::canceled;
-
-			m_extra_btn.set_image_resource(resource_config::standard_image_resource::triangle);
-			m_extra_btn.set_pos(330, m_list->y + m_list->h + 20);
-			m_extra_btn.set_text("");
-			m_extra_btn.set_font("Arial", 16);
-
-			m_page_btn.set_image_resource(resource_config::standard_image_resource::square);
-			m_page_btn.set_pos(m_list->x + m_list->w - (30 + 120), m_list->y + m_list->h + 20);
-			m_page_btn.set_text(get_localized_string(localized_string_id::HOME_MENU_FRIENDS_NEXT_LIST));
-			m_page_btn.set_font("Arial", 16);
-		}
-
-		void friends_list_dialog::update(u64 timestamp_us)
-		{
-			if (fade_animation.active)
-			{
-				fade_animation.update(timestamp_us);
-			}
-		}
-
-		void friends_list_dialog::on_button_pressed(pad_button button_press, bool is_auto_repeat)
-		{
-			if (fade_animation.active) return;
-
-			if (m_message_box && m_message_box->visible)
-			{
-				const page_navigation navigation = m_message_box->handle_button_press(button_press);
-				if (navigation != page_navigation::stay)
-				{
-					m_message_box->hide();
-					refresh();
-				}
-				return;
-			}
-
-			std::lock_guard lock(m_list_mutex);
-			bool close_dialog = false;
-
-			switch (button_press)
-			{
-			case pad_button::cross:
-			case pad_button::triangle:
-			{
-				if (!m_list || m_list->m_items.empty())
-					break;
-
-				if (button_press == pad_button::triangle && m_current_page != friends_list_dialog_page::invites)
-					break;
-
-				const usz index = static_cast<usz>(m_list->get_selected_index());
-
-				switch (m_current_page)
-				{
-				case friends_list_dialog_page::friends:
-				{
-					// Get selected user
-					usz user_index = 0;
-					std::string selected_username;
-					for (const auto& [username, data] : m_friend_data.friends)
-					{
-						if (data.online && user_index++ == index)
-						{
-							selected_username = username;
-							break;
-						}
-					}
-					for (const auto& [username, data] : m_friend_data.friends)
-					{
-						if (!selected_username.empty())
-							break;
-
-						if (!data.online && user_index++ == index)
-						{
-							selected_username = username;
-							break;
-						}
-					}
-
-					if (!selected_username.empty() && m_message_box && !m_message_box->visible)
-					{
-						m_message_box->show(get_localized_string(localized_string_id::HOME_MENU_FRIENDS_REMOVE_USER_MSG, selected_username.c_str()), [this, selected_username]()
-						{
-							m_rpcn->remove_friend(selected_username);
-						});
-						refresh();
-					}
-					break;
-				}
-				case friends_list_dialog_page::invites:
-				{
-					// Get selected user
-					usz user_index = 0;
-					std::string selected_username;
-					for (const std::string& username : m_friend_data.requests_received)
-					{
-						if (user_index == index)
-						{
-							selected_username = username;
-							break;
-						}
-						user_index++;
-					}
-					for (const std::string& username : m_friend_data.requests_sent)
-					{
-						if (!selected_username.empty())
-							break;
-
-						if (user_index == index)
-						{
-							selected_username = username;
-							break;
-						}
-						user_index++;
-					}
-
-					if (!selected_username.empty() && m_message_box && !m_message_box->visible)
-					{
-						if (user_index < m_friend_data.requests_received.size())
-						{
-							if (button_press == pad_button::triangle)
-							{
-								m_message_box->show(get_localized_string(localized_string_id::HOME_MENU_FRIENDS_REJECT_REQUEST_MSG, selected_username.c_str()), [this, selected_username]()
-								{
-									m_rpcn->remove_friend(selected_username);
-								});
-							}
-							else
-							{
-								m_message_box->show(get_localized_string(localized_string_id::HOME_MENU_FRIENDS_ACCEPT_REQUEST_MSG, selected_username.c_str()), [this, selected_username]()
-								{
-									m_rpcn->add_friend(selected_username);
-								});
-							}
-						}
-						else
-						{
-							m_message_box->show(get_localized_string(localized_string_id::HOME_MENU_FRIENDS_CANCEL_REQUEST_MSG, selected_username.c_str()), [this, selected_username]()
-							{
-								m_rpcn->remove_friend(selected_username);
-							});
-						}
-						refresh();
-					}
-					break;
-				}
-				case friends_list_dialog_page::blocked:
-				{
-					// Get selected user
-					usz user_index = 0;
-					std::string selected_username;
-					for (const std::string& username : m_friend_data.blocked)
-					{
-						if (user_index++ == index)
-						{
-							selected_username = username;
-							break;
-						}
-					}
-
-					if (!selected_username.empty() && m_message_box && !m_message_box->visible)
-					{
-						m_message_box->show(get_localized_string(localized_string_id::HOME_MENU_FRIENDS_UNBLOCK_USER_MSG, selected_username.c_str()), []()
-						{
-							// TODO
-						});
-						refresh();
-					}
-					break;
-				}
-				}
-
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_decide.wav");
-				return;
-			}
-			case pad_button::circle:
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cancel.wav");
-				close_dialog = true;
-				break;
-			case pad_button::square:
-				switch (m_current_page)
-				{
-				case friends_list_dialog_page::friends: m_current_page = friends_list_dialog_page::invites; break;
-				case friends_list_dialog_page::invites: m_current_page = friends_list_dialog_page::blocked; break;
-				case friends_list_dialog_page::blocked: m_current_page = friends_list_dialog_page::friends; break;
-				}
-				m_list_dirty = true;
-				break;
-			case pad_button::dpad_up:
-			case pad_button::ls_up:
-				if (m_list)
-					m_list->select_previous();
-				break;
-			case pad_button::dpad_down:
-			case pad_button::ls_down:
-				if (m_list)
-					m_list->select_next();
-				break;
-			case pad_button::L1:
-				if (m_list)
-					m_list->select_previous(10);
-				break;
-			case pad_button::R1:
-				if (m_list)
-					m_list->select_next(10);
-				break;
-			default:
-				rsx_log.trace("[ui] Button %d pressed", static_cast<u8>(button_press));
-				break;
-			}
-
-			if (close_dialog)
-			{
-				fade_animation.current = color4f(1.f);
-				fade_animation.end = color4f(0.f);
-				fade_animation.active = true;
-
-				fade_animation.on_finish = [this]
-				{
-					close(true, true);
-				};
-			}
-			// Play a sound unless this is a fast auto repeat which would induce a nasty noise
-			else if (!is_auto_repeat || m_auto_repeat_ms_interval >= m_auto_repeat_ms_interval_default)
-			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cursor.wav");
-			}
-		}
-
-		compiled_resource friends_list_dialog::get_compiled()
-		{
-			if (!visible)
-			{
-				return {};
-			}
-
-			compiled_resource result;
-			result.add(m_dim_background->get_compiled());
-			{
-				std::lock_guard lock(m_list_mutex);
-
-				if (m_list_dirty.exchange(false))
-				{
-					if (m_current_page != m_last_page)
-					{
-						localized_string_id title_id = localized_string_id::INVALID;
-						switch (m_current_page)
-						{
-						case friends_list_dialog_page::friends: title_id = localized_string_id::HOME_MENU_FRIENDS; break;
-						case friends_list_dialog_page::invites: title_id = localized_string_id::HOME_MENU_FRIENDS_REQUESTS; break;
-						case friends_list_dialog_page::blocked: title_id = localized_string_id::HOME_MENU_FRIENDS_BLOCKED; break;
-						}
-						m_description->set_text(get_localized_string(title_id));
-						m_description->auto_resize();
-					}
-
-					reload();
-
-					m_last_page.store(m_current_page);
-				}
-
-				if (m_message_box && m_message_box->visible)
-				{
-					result.add(m_message_box->get_compiled());
-				}
-				else
-				{
-					if (m_list)
-					{
-						result.add(m_list->get_compiled());
-
-						if (!m_list->m_items.empty() && m_current_page == friends_list_dialog_page::invites)
-						{
-							// Get selected user
-							const usz index = static_cast<usz>(m_list->get_selected_index());
-
-							if (index < m_friend_data.requests_received.size())
-							{
-								m_extra_btn.set_text(get_localized_string(localized_string_id::HOME_MENU_FRIENDS_REJECT_REQUEST));
-								result.add(m_extra_btn.get_compiled());
-							}
-						}
-					}
-					result.add(m_page_btn.get_compiled());
-				}
-			}
-			result.add(m_description->get_compiled());
-
-			fade_animation.apply(result);
-
-			return result;
-		}
-
-		void friends_list_dialog::callback_handler(rpcn::NotificationType ntype, const std::string& /*username*/, bool /*status*/)
-		{
-			switch (ntype)
-			{
-			case rpcn::NotificationType::FriendNew: // Add a friend to the friendlist(either accepted a friend request or friend accepted it)
-			case rpcn::NotificationType::FriendStatus: // Set status of friend to Offline or Online
-			case rpcn::NotificationType::FriendQuery: // Other user sent a friend request
-			case rpcn::NotificationType::FriendLost: // Remove friend from the friendlist(user removed friend or friend removed friend)
-			case rpcn::NotificationType::FriendPresenceChanged:
-			{
-				m_list_dirty = true;
-				break;
-			}
-			default:
-			{
-				rsx_log.fatal("An unhandled notification type was received by the RPCN friends dialog callback!");
-				break;
-			}
-			}
-		}
-
-		void friends_list_dialog::reload()
-		{
-			std::vector<std::unique_ptr<overlay_element>> entries;
-			std::string selected_user;
-			s32 selected_index = 0;
-			bool rpcn_connected = true;
-
-			// Get selected user name
-			if (m_list && m_current_page == m_last_page)
-			{
-				const s32 old_index = m_list->get_selected_index();
-				s32 i = 0;
-
-				switch (m_current_page)
-				{
-				case friends_list_dialog_page::friends:
-				{
-					for (const auto& [username, data] : m_friend_data.friends)
-					{
-						if (i++ == old_index)
-						{
-							selected_user = username;
-							break;
-						}
-					}
-					break;
-				}
-				case friends_list_dialog_page::invites:
-				{
-					for (const std::string& username : m_friend_data.requests_received)
-					{
-						if (i++ == old_index)
-						{
-							selected_user = username;
-							break;
-						}
-					}
-					for (const std::string& username : m_friend_data.requests_sent)
-					{
-						if (!selected_user.empty())
-							break;
-
-						if (i++ == old_index)
-						{
-							selected_user = username;
-							break;
-						}
-					}
-					break;
-				}
-				case friends_list_dialog_page::blocked:
-				{
-					for (const std::string& username : m_friend_data.blocked)
-					{
-						if (i++ == old_index)
-						{
-							selected_user = username;
-							break;
-						}
-					}
-					break;
-				}
-				}
-			}
-
-			if (auto res = m_rpcn->wait_for_connection(); res != rpcn::rpcn_state::failure_no_failure)
-			{
-				rsx_log.error("Failed to connect to RPCN: %s", rpcn::rpcn_state_to_string(res));
-				status_flags |= status_bits::invalidate_image_cache;
-				rpcn_connected = false;
-			}
-
-			if (auto res = m_rpcn->wait_for_authentified(); res != rpcn::rpcn_state::failure_no_failure)
-			{
-				rsx_log.error("Failed to authentify to RPCN: %s", rpcn::rpcn_state_to_string(res));
-				status_flags |= status_bits::invalidate_image_cache;
-				rpcn_connected = false;
-			}
-
-			// Get friends
-			if (rpcn_connected)
-			{
-				m_rpcn->get_friends(m_friend_data);
-			}
-			else
-			{
-				m_friend_data = {};
-			}
-
-			switch (m_current_page)
-			{
-			case friends_list_dialog_page::friends:
-			{
-				// Sort users by online status
-				std::vector<std::pair<const std::string&, const rpcn::friend_online_data&>> friends_online;
-				std::vector<std::pair<const std::string&, const rpcn::friend_online_data&>> friends_offline;
-				for (const auto& [username, data] : m_friend_data.friends)
-				{
-					if (data.online)
-					{
-						friends_online.push_back({ username, data });
-					}
-					else
-					{
-						friends_offline.push_back({ username, data });
-					}
-				}
-
-				// Add users and try to find the old selected user again
-				for (const auto& [username, data] : friends_online)
-				{
-					if (username == selected_user)
-					{
-						selected_index = ::size32(entries);
-					}
-
-					std::unique_ptr<overlay_element> entry = std::make_unique<friends_list_entry>(m_current_page, username, data);
-					entries.emplace_back(std::move(entry));
-				}
-				for (const auto& [username, data] : friends_offline)
-				{
-					if (username == selected_user)
-					{
-						selected_index = ::size32(entries);
-					}
-
-					std::unique_ptr<overlay_element> entry = std::make_unique<friends_list_entry>(m_current_page, username, data);
-					entries.emplace_back(std::move(entry));
-				}
-				break;
-			}
-			case friends_list_dialog_page::invites:
-			{
-				for (const std::string& username : m_friend_data.requests_received)
-				{
-					if (username == selected_user)
-					{
-						selected_index = ::size32(entries);
-					}
-
-					std::unique_ptr<overlay_element> entry = std::make_unique<friends_list_entry>(m_current_page, username, rpcn::friend_online_data(true, 0));
-					entries.emplace_back(std::move(entry));
-				}
-				for (const std::string& username : m_friend_data.requests_sent)
-				{
-					if (username == selected_user)
-					{
-						selected_index = ::size32(entries);
-					}
-
-					std::unique_ptr<overlay_element> entry = std::make_unique<friends_list_entry>(m_current_page, username, rpcn::friend_online_data(false, 0));
-					entries.emplace_back(std::move(entry));
-				}
-				break;
-			}
-			case friends_list_dialog_page::blocked:
-			{
-				for (const std::string& username : m_friend_data.blocked)
-				{
-					if (username == selected_user)
-					{
-						selected_index = ::size32(entries);
-					}
-
-					std::unique_ptr<overlay_element> entry = std::make_unique<friends_list_entry>(m_current_page, username, rpcn::friend_online_data(false, 0));
-					entries.emplace_back(std::move(entry));
-				}
-				break;
-			}
-			}
-
-			// Recreate list
-			if (m_list)
-			{
-				status_flags |= status_bits::invalidate_image_cache;
-			}
-
-			m_list = std::make_unique<list_view>(virtual_width - 2 * 20, 540);
-			m_list->set_pos(20, 85);
-
-			for (auto& entry : entries)
-			{
-				m_list->add_entry(entry);
-			}
-
-			if (!m_list->m_items.empty())
-			{
-				// Only select an entry if there are entries available
-				m_list->select_entry(selected_index);
-			}
-		}
-
-		error_code friends_list_dialog::show(bool enable_overlay, std::function<void(s32 status)> on_close)
-		{
-			visible = false;
-
-			if (enable_overlay)
-			{
-				m_dim_background->back_color.a = 0.9f;
-			}
-			else
-			{
-				m_dim_background->back_color.a = 0.5f;
-			}
-
-			g_cfg_rpcn.load(); // Ensures config is loaded even if rpcn is not running for simulated
-
-			m_rpcn = rpcn::rpcn_client::get_instance(0);
-
-			m_rpcn->register_friend_cb(friend_callback, this);
-
-			m_description->set_text(get_localized_string(localized_string_id::HOME_MENU_FRIENDS));
-			m_description->auto_resize();
-
-			fade_animation.current = color4f(0.f);
-			fade_animation.end = color4f(1.f);
-			fade_animation.active = true;
-
-			this->on_close = std::move(on_close);
-			visible = true;
-
-			const auto notify = std::make_shared<atomic_t<u32>>(0);
-			auto& overlayman = g_fxo->get<display_manager>();
-
-			overlayman.attach_thread_input(
-				uid, "Friends list dialog",
-				[notify]() { *notify = true; notify->notify_one(); }
-			);
-
-			while (!Emu.IsStopped() && !*notify)
-			{
-				notify->wait(0, atomic_wait_timeout{1'000'000});
-			}
-
-			return CELL_OK;
-		}
-
-		bool friends_list_dialog::rpcn_configured()
-		{
-			cfg_rpcn cfg;
-			cfg.load();
-			return !cfg.get_npid().empty() && !cfg.get_password().empty();
-		}
-	} // namespace overlays
-} // namespace RSX
diff --git a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h
deleted file mode 100644
index 3d5ec9dbe2..0000000000
--- a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#pragma once
-
-#include "../overlays.h"
-#include "../overlay_list_view.hpp"
-#include "../HomeMenu/overlay_home_menu_message_box.h"
-#include "Emu/Cell/ErrorCodes.h"
-#include "Emu/NP/rpcn_client.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		enum class friends_list_dialog_page
-		{
-			friends,
-			invites,
-			blocked
-		};
-
-		struct friends_list_dialog : public user_interface
-		{
-		private:
-			struct friends_list_entry : horizontal_layout
-			{
-			private:
-				std::unique_ptr<image_info> icon_data;
-
-			public:
-				friends_list_entry(friends_list_dialog_page page, const std::string& username, const rpcn::friend_online_data& data);
-			};
-
-			std::mutex m_list_mutex;
-			std::vector<u32> m_entry_ids;
-			std::unique_ptr<overlay_element> m_dim_background;
-			std::unique_ptr<list_view> m_list;
-			std::unique_ptr<label> m_description;
-			image_button m_page_btn;
-			image_button m_extra_btn;
-			std::shared_ptr<home_menu_message_box> m_message_box;
-
-			animation_color_interpolate fade_animation;
-
-			std::shared_ptr<rpcn::rpcn_client> m_rpcn;
-			rpcn::friend_data m_friend_data;
-			atomic_t<bool> m_list_dirty { true };
-			atomic_t<friends_list_dialog_page> m_current_page { friends_list_dialog_page::friends };
-			atomic_t<friends_list_dialog_page> m_last_page { friends_list_dialog_page::friends };
-
-			void reload();
-
-		public:
-			friends_list_dialog();
-
-			void update(u64 timestamp_us) override;
-			void on_button_pressed(pad_button button_press, bool is_auto_repeat) override;
-
-			compiled_resource get_compiled() override;
-
-			error_code show(bool enable_overlay, std::function<void(s32 status)> on_close);
-
-			void callback_handler(rpcn::NotificationType ntype, const std::string& username, bool status);
-
-			static bool rpcn_configured();
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp
deleted file mode 100644
index 1938404c36..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-#include "stdafx.h"
-#include "overlay_home_menu.h"
-#include "../overlay_manager.h"
-#include "Emu/system_config.h"
-#include "Utilities/date_time.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		std::string get_time_string()
-		{
-			return date_time::fmt_time("%Y/%m/%d %H:%M:%S", time(nullptr));
-		}
-
-		home_menu_dialog::home_menu_dialog()
-			: m_main_menu(20, 85, virtual_width - 2 * 20, 540, false, nullptr)
-		{
-			m_allow_input_on_pause = true;
-
-			m_dim_background.set_size(virtual_width, virtual_height);
-			m_dim_background.back_color.a = 0.5f;
-
-			m_description.set_font("Arial", 20);
-			m_description.set_pos(20, 37);
-			m_description.set_text(m_main_menu.title);
-			m_description.auto_resize();
-			m_description.back_color.a = 0.f;
-
-			m_time_display.set_font("Arial", 14);
-			m_time_display.set_text(get_time_string());
-			m_time_display.auto_resize();
-			m_time_display.set_pos(virtual_width - (20 + m_time_display.w), (m_description.y + m_description.h) - m_time_display.h);
-			m_time_display.back_color.a = 0.f;
-
-			fade_animation.duration_sec = 0.15f;
-
-			return_code = selection_code::canceled;
-		}
-
-		void home_menu_dialog::update(u64 timestamp_us)
-		{
-			if (fade_animation.active)
-			{
-				fade_animation.update(timestamp_us);
-			}
-
-			static std::string last_time;
-			std::string new_time = get_time_string();
-
-			if (last_time != new_time)
-			{
-				m_time_display.set_text(new_time);
-				m_time_display.auto_resize();
-				last_time = std::move(new_time);
-			}
-		}
-
-		void home_menu_dialog::on_button_pressed(pad_button button_press, bool is_auto_repeat)
-		{
-			if (fade_animation.active) return;
-
-			// Increase auto repeat interval for some buttons
-			switch (button_press)
-			{
-			case pad_button::dpad_left:
-			case pad_button::dpad_right:
-			case pad_button::ls_left:
-			case pad_button::ls_right:
-				m_auto_repeat_ms_interval = 10;
-				break;
-			default:
-				m_auto_repeat_ms_interval = m_auto_repeat_ms_interval_default;
-				break;
-			}
-
-			const page_navigation navigation = m_main_menu.handle_button_press(button_press, is_auto_repeat, m_auto_repeat_ms_interval);
-
-			switch (navigation)
-			{
-			case page_navigation::back:
-			case page_navigation::next:
-			{
-				if (home_menu_page* page = m_main_menu.get_current_page(true))
-				{
-					std::string path = page->title;
-					for (home_menu_page* parent = page->parent; parent; parent = parent->parent)
-					{
-						path = parent->title + "  >  " + path;
-					}
-					m_description.set_text(path);
-					m_description.auto_resize();
-				}
-				break;
-			}
-			case page_navigation::exit:
-			{
-				fade_animation.current = color4f(1.f);
-				fade_animation.end = color4f(0.f);
-				fade_animation.active = true;
-
-				fade_animation.on_finish = [this]
-				{
-					close(true, true);
-
-					if (g_cfg.misc.pause_during_home_menu)
-					{
-						Emu.BlockingCallFromMainThread([]()
-						{
-							Emu.Resume();
-						});
-					}
-				};
-				break;
-			}
-			case page_navigation::stay:
-			{
-				break;
-			}
-			}
-		}
-
-		compiled_resource home_menu_dialog::get_compiled()
-		{
-			if (!visible)
-			{
-				return {};
-			}
-
-			compiled_resource result;
-			result.add(m_dim_background.get_compiled());
-			result.add(m_main_menu.get_compiled());
-			result.add(m_description.get_compiled());
-			result.add(m_time_display.get_compiled());
-
-			fade_animation.apply(result);
-
-			return result;
-		}
-
-		error_code home_menu_dialog::show(std::function<void(s32 status)> on_close)
-		{
-			visible = false;
-
-			fade_animation.current = color4f(0.f);
-			fade_animation.end = color4f(1.f);
-			fade_animation.active = true;
-
-			this->on_close = std::move(on_close);
-			visible = true;
-
-			const auto notify = std::make_shared<atomic_t<u32>>(0);
-			auto& overlayman = g_fxo->get<display_manager>();
-
-			overlayman.attach_thread_input(
-				uid, "Home menu",
-				[notify]() { *notify = true; notify->notify_one(); }
-			);
-
-			if (g_cfg.misc.pause_during_home_menu)
-			{
-				Emu.BlockingCallFromMainThread([]()
-				{
-					Emu.Pause(false, false);
-				});
-			}
-
-			while (!Emu.IsStopped() && !*notify)
-			{
-				notify->wait(false, atomic_wait_timeout{1'000'000});
-			}
-
-			return CELL_OK;
-		}
-	} // namespace overlays
-} // namespace RSX
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.h
deleted file mode 100644
index ddd002989d..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "Emu/RSX/Overlays/overlays.h"
-#include "Emu/Cell/ErrorCodes.h"
-#include "overlay_home_menu_main_menu.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		struct home_menu_dialog : public user_interface
-		{
-		public:
-			home_menu_dialog();
-
-			void update(u64 timestamp_us) override;
-			void on_button_pressed(pad_button button_press, bool is_auto_repeat) override;
-
-			compiled_resource get_compiled() override;
-
-			error_code show(std::function<void(s32 status)> on_close);
-
-		private:
-			home_menu_main_menu m_main_menu;
-			overlay_element m_dim_background{};
-			label m_description{};
-			label m_time_display{};
-
-			animation_color_interpolate fade_animation{};
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp
deleted file mode 100644
index d0ed9dc460..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "stdafx.h"
-#include "overlay_home_menu_components.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		home_menu_entry::home_menu_entry(const std::string& text)
-		{
-			std::unique_ptr<overlay_element> text_stack = std::make_unique<vertical_layout>();
-			std::unique_ptr<overlay_element> padding    = std::make_unique<spacer>();
-			std::unique_ptr<overlay_element> title      = std::make_unique<label>(text);
-
-			padding->set_size(1, 1);
-			title->set_size(overlay::virtual_width - 2 * menu_entry_margin, menu_entry_height);
-			title->set_font("Arial", 16);
-			title->set_wrap_text(true);
-			title->align_text(text_align::center);
-
-			// Make back color transparent for text
-			title->back_color.a = 0.f;
-
-			static_cast<vertical_layout*>(text_stack.get())->pack_padding = 5;
-			static_cast<vertical_layout*>(text_stack.get())->add_element(padding);
-			static_cast<vertical_layout*>(text_stack.get())->add_element(title);
-
-			add_element(text_stack);
-		}
-
-		home_menu_checkbox::home_menu_checkbox(cfg::_bool* setting, const std::string& text) : home_menu_setting(setting, text)
-		{
-			m_background.set_size(menu_entry_margin, menu_entry_margin);
-			m_background.set_pos(overlay::virtual_width / 2 + menu_entry_margin, 0);
-
-			m_checkbox.set_size(m_background.w - 2, m_background.h - 2);
-			m_checkbox.set_pos(m_background.x, m_background.y);
-		}
-
-		compiled_resource& home_menu_checkbox::get_compiled()
-		{
-			update_value();
-
-			if (!is_compiled())
-			{
-				const f32 col = m_last_value ? 1.0f : 0.3f;
-				const f32 bkg = m_last_value ? 0.3f : 1.0f;
-				m_background.back_color.r = bkg;
-				m_background.back_color.g = bkg;
-				m_background.back_color.b = bkg;
-				m_checkbox.back_color.r = col;
-				m_checkbox.back_color.g = col;
-				m_checkbox.back_color.b = col;
-
-				m_background.set_pos(m_background.x, y + (h - m_background.h) / 2);
-				m_checkbox.set_pos(m_background.x + 1, m_background.y + 1);
-
-				compiled_resources = horizontal_layout::get_compiled();
-				compiled_resources.add(m_background.get_compiled());
-				compiled_resources.add(m_checkbox.get_compiled());
-			}
-
-			return compiled_resources;
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h
deleted file mode 100644
index 7a54acddd8..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h
+++ /dev/null
@@ -1,223 +0,0 @@
-#pragma once
-
-#include "Emu/RSX/Overlays/overlays.h"
-#include "Emu/System.h"
-#include "Utilities/Config.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		static constexpr u16 menu_entry_height = 40;
-		static constexpr u16 menu_entry_margin = 20;
-		static constexpr u16 available_side_width = (overlay::virtual_width - 6 * menu_entry_margin) / 2;
-		static constexpr u16 element_height = 25;
-
-		enum class page_navigation
-		{
-			stay,
-			back,
-			next,
-			exit
-		};
-
-		struct home_menu_entry : horizontal_layout
-		{
-		public:
-			home_menu_entry(const std::string& text);
-		};
-
-		template <typename T, typename C>
-		struct home_menu_setting : horizontal_layout
-		{
-		public:
-			home_menu_setting(C* setting, const std::string& text) : m_setting(setting)
-			{
-				std::unique_ptr<overlay_element> layout  = std::make_unique<vertical_layout>();
-				std::unique_ptr<overlay_element> padding = std::make_unique<spacer>();
-				std::unique_ptr<overlay_element> title   = std::make_unique<label>(text);
-
-				padding->set_size(1, 1);
-				title->set_size(available_side_width, menu_entry_height);
-				title->set_font("Arial", 16);
-				title->set_wrap_text(true);
-				title->align_text(text_align::right);
-
-				// Make back color transparent for text
-				title->back_color.a = 0.f;
-
-				static_cast<vertical_layout*>(layout.get())->pack_padding = 5;
-				static_cast<vertical_layout*>(layout.get())->add_element(padding);
-				static_cast<vertical_layout*>(layout.get())->add_element(title);
-
-				// Pack
-				this->pack_padding = 15;
-				add_element(layout);
-
-				update_value(true);
-			}
-
-			void update_value(bool initializing = false)
-			{
-				if (m_setting)
-				{
-					if (const T new_value = m_setting->get(); new_value != m_last_value || initializing)
-					{
-						m_last_value = new_value;
-						m_is_compiled = false;
-					}
-				}
-			}
-
-		protected:
-			T m_last_value = {};
-			C* m_setting = nullptr;
-		};
-
-		struct home_menu_checkbox : public home_menu_setting<bool, cfg::_bool>
-		{
-		public:
-			home_menu_checkbox(cfg::_bool* setting, const std::string& text);
-			compiled_resource& get_compiled() override;
-		private:
-			overlay_element m_background;
-			overlay_element m_checkbox;
-		};
-
-		template <typename T>
-		struct home_menu_dropdown : public home_menu_setting<T, cfg::_enum<T>>
-		{
-		public:
-			home_menu_dropdown(cfg::_enum<T>* setting, const std::string& text) : home_menu_setting<T, cfg::_enum<T>>(setting, text)
-			{
-				m_dropdown.set_size(available_side_width / 2, element_height);
-				m_dropdown.set_pos(overlay::virtual_width / 2 + menu_entry_margin, 0);
-				m_dropdown.set_font("Arial", 14);
-				m_dropdown.align_text(home_menu_dropdown<T>::text_align::center);
-				m_dropdown.back_color = { 0.3f, 0.3f, 0.3f, 1.0f };
-			}
-
-			compiled_resource& get_compiled() override
-			{
-				this->update_value();
-
-				if (!this->is_compiled())
-				{
-					const std::string value_text = Emu.GetCallbacks().get_localized_setting(home_menu_setting<T, cfg::_enum<T>>::m_setting, static_cast<u32>(this->m_last_value));
-					m_dropdown.set_text(value_text);
-					m_dropdown.set_pos(m_dropdown.x, this->y + (this->h - m_dropdown.h) / 2);
-
-					this->compiled_resources = horizontal_layout::get_compiled();
-					this->compiled_resources.add(m_dropdown.get_compiled());
-				}
-
-				return this->compiled_resources;
-			}
-
-		private:
-			label m_dropdown;
-		};
-
-		template <typename T, typename C>
-		struct home_menu_slider : public home_menu_setting<T, C>
-		{
-		public:
-			home_menu_slider(C* setting, const std::string& text, const std::string& suffix, std::map<T, std::string> special_labels = {}, T minimum = C::min, T maximum = C::max)
-				: home_menu_setting<T, C>(setting, text)
-				, m_suffix(suffix)
-				, m_special_labels(std::move(special_labels))
-				, m_minimum(minimum)
-				, m_maximum(maximum)
-			{
-				m_slider.set_size(available_side_width / 2, element_height);
-				m_slider.set_pos(overlay::virtual_width / 2 + menu_entry_margin, 0);
-				m_slider.back_color = { 0.3f, 0.3f, 0.3f, 1.0f };
-
-				m_handle.set_size(element_height / 2, element_height);
-				m_handle.set_pos(m_slider.x, 0);
-				m_handle.back_color = { 1.0f, 1.0f, 1.0f, 1.0f };
-
-				m_value_label.back_color = m_slider.back_color;
-				m_value_label.set_font("Arial", 14);
-			}
-
-			compiled_resource& get_compiled() override
-			{
-				this->update_value();
-
-				if (!this->is_compiled())
-				{
-					const f64 percentage = std::clamp((this->m_last_value - static_cast<T>(m_minimum)) / std::fabs(m_maximum - m_minimum), 0.0, 1.0);
-					m_slider.set_pos(m_slider.x, this->y + (this->h - m_slider.h) / 2);
-					m_handle.set_pos(m_slider.x + static_cast<s16>(percentage * (m_slider.w - m_handle.w)), this->y + (this->h - m_handle.h) / 2);
-
-					const auto set_label_text = [this]() -> void
-					{
-						if (const auto it = m_special_labels.find(this->m_last_value); it != m_special_labels.cend())
-						{
-							m_value_label.set_text(it->second);
-							return;
-						}
-
-						if constexpr (std::is_floating_point_v<T>)
-						{
-							m_value_label.set_text(fmt::format("%.2f%s", this->m_last_value, m_suffix));
-						}
-						else
-						{
-							m_value_label.set_text(fmt::format("%d%s", this->m_last_value, m_suffix));
-						}
-					};
-
-					set_label_text();
-					m_value_label.auto_resize();
-
-					constexpr u16 handle_margin = 10;
-
-					if ((m_handle.x - m_slider.x) > (m_slider.w - (m_handle.w + 2 * handle_margin + m_value_label.w)))
-					{
-						m_value_label.set_pos(m_handle.x - (handle_margin + m_value_label.w), m_handle.y);
-					}
-					else
-					{
-						m_value_label.set_pos(m_handle.x + m_handle.w + handle_margin, m_handle.y);
-					}
-
-					this->compiled_resources = horizontal_layout::get_compiled();
-					this->compiled_resources.add(m_slider.get_compiled());
-					this->compiled_resources.add(m_handle.get_compiled());
-					this->compiled_resources.add(m_value_label.get_compiled());
-				}
-
-				return this->compiled_resources;
-			}
-
-		private:
-			overlay_element m_slider;
-			overlay_element m_handle;
-			label m_value_label;
-			std::string m_suffix;
-			std::map<T, std::string> m_special_labels;
-			T m_minimum{};
-			T m_maximum{};
-		};
-
-		template <s64 Min, s64 Max>
-		struct home_menu_signed_slider : public home_menu_slider<s64, cfg::_int<Min, Max>>
-		{
-			using home_menu_slider<s64, cfg::_int<Min, Max>>::home_menu_slider;
-		};
-
-		template <u64 Min, u64 Max>
-		struct home_menu_unsigned_slider : public home_menu_slider<u64, cfg::uint<Min, Max>>
-		{
-			using home_menu_slider<u64, cfg::uint<Min, Max>>::home_menu_slider;
-		};
-
-		template <s32 Min, s32 Max>
-		struct home_menu_float_slider : public home_menu_slider<f64, cfg::_float<Min, Max>>
-		{
-			using home_menu_slider<f64, cfg::_float<Min, Max>>::home_menu_slider;
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp
deleted file mode 100644
index acd9f196f4..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-#include "stdafx.h"
-#include "overlay_home_menu_main_menu.h"
-#include "overlay_home_menu_components.h"
-#include "overlay_home_menu_settings.h"
-#include "overlay_home_menu_savestate.h"
-#include "Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h"
-#include "Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h"
-#include "Emu/RSX/Overlays/overlay_manager.h"
-#include "Emu/System.h"
-#include "Emu/system_config.h"
-#include "Emu/Cell/Modules/sceNpTrophy.h"
-
-extern atomic_t<bool> g_user_asked_for_recording;
-extern atomic_t<bool> g_user_asked_for_screenshot;
-
-namespace rsx
-{
-	namespace overlays
-	{
-		home_menu_main_menu::home_menu_main_menu(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
-			: home_menu_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_TITLE))
-		{
-			is_current_page = true;
-
-			m_message_box = std::make_shared<home_menu_message_box>(x, y, width, height);
-			m_message_box->visible = false;
-
-			m_config_changed = std::make_shared<bool>(g_backup_cfg.to_string() != g_cfg.to_string());
-
-			std::unique_ptr<overlay_element> resume = std::make_unique<home_menu_entry>(get_localized_string(localized_string_id::HOME_MENU_RESUME));
-			add_item(resume, [](pad_button btn) -> page_navigation
-			{
-				if (btn != pad_button::cross) return page_navigation::stay;
-
-				rsx_log.notice("User selected resume in home menu");
-				return page_navigation::exit;
-			});
-
-			add_page(std::make_shared<home_menu_settings>(x, y, width, height, use_separators, this));
-
-			if (rsx::overlays::friends_list_dialog::rpcn_configured())
-			{
-				std::unique_ptr<overlay_element> friends = std::make_unique<home_menu_entry>(get_localized_string(localized_string_id::HOME_MENU_FRIENDS));
-				add_item(friends, [](pad_button btn) -> page_navigation
-				{
-					if (btn != pad_button::cross) return page_navigation::stay;
-
-					rsx_log.notice("User selected friends in home menu");
-					Emu.CallFromMainThread([]()
-					{
-						if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
-						{
-							const error_code result = manager->create<rsx::overlays::friends_list_dialog>()->show(true, [](s32 status)
-							{
-								rsx_log.notice("Closing friends list with status %d", status);
-							});
-
-							(result ? rsx_log.error : rsx_log.notice)("Opened friends list with result %d", s32{result});
-						}
-					});
-					return page_navigation::stay;
-				});
-			}
-			else
-			{
-				rsx_log.notice("Friends list hidden in home menu. RPCN is not configured.");
-			}
-
-			// get current trophy name for trophy list overlay
-			std::string trop_name;
-			{
-				current_trophy_name& current_id = g_fxo->get<current_trophy_name>();
-				std::lock_guard lock(current_id.mtx);
-				trop_name = current_id.name;
-			}
-			if (!trop_name.empty())
-			{
-				std::unique_ptr<overlay_element> trophies = std::make_unique<home_menu_entry>(get_localized_string(localized_string_id::HOME_MENU_TROPHIES));
-				add_item(trophies, [trop_name = std::move(trop_name)](pad_button btn) -> page_navigation
-				{
-					if (btn != pad_button::cross) return page_navigation::stay;
-
-					rsx_log.notice("User selected trophies in home menu");
-					Emu.CallFromMainThread([trop_name = std::move(trop_name)]()
-					{
-						if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
-						{
-							manager->create<rsx::overlays::trophy_list_dialog>()->show(trop_name);
-						}
-					});
-					return page_navigation::stay;
-				});
-			}
-
-			std::unique_ptr<overlay_element> screenshot = std::make_unique<home_menu_entry>(get_localized_string(localized_string_id::HOME_MENU_SCREENSHOT));
-			add_item(screenshot, [](pad_button btn) -> page_navigation
-			{
-				if (btn != pad_button::cross) return page_navigation::stay;
-
-				rsx_log.notice("User selected screenshot in home menu");
-				g_user_asked_for_screenshot = true;
-				return page_navigation::exit;
-			});
-
-			std::unique_ptr<overlay_element> recording = std::make_unique<home_menu_entry>(get_localized_string(localized_string_id::HOME_MENU_RECORDING));
-			add_item(recording, [](pad_button btn) -> page_navigation
-			{
-				if (btn != pad_button::cross) return page_navigation::stay;
-
-				rsx_log.notice("User selected recording in home menu");
-				g_user_asked_for_recording = true;
-				return page_navigation::exit;
-			});
-
-			add_page(std::make_shared<home_menu_savestate>(x, y, width, height, use_separators, this));
-
-			std::unique_ptr<overlay_element> restart = std::make_unique<home_menu_entry>(get_localized_string(localized_string_id::HOME_MENU_RESTART));
-			add_item(restart, [](pad_button btn) -> page_navigation
-			{
-				if (btn != pad_button::cross) return page_navigation::stay;
-
-				rsx_log.notice("User selected restart in home menu");
-
-				Emu.CallFromMainThread([]()
-				{
-					// Make sure we keep the game window opened
-					Emu.SetContinuousMode(true);
-					Emu.Restart(false);
-				});
-				return page_navigation::exit;
-			});
-
-			std::unique_ptr<overlay_element> exit_game = std::make_unique<home_menu_entry>(get_localized_string(localized_string_id::HOME_MENU_EXIT_GAME));
-			add_item(exit_game, [](pad_button btn) -> page_navigation
-			{
-				if (btn != pad_button::cross) return page_navigation::stay;
-
-				rsx_log.notice("User selected exit game in home menu");
-				Emu.CallFromMainThread([]
-				{
-					Emu.GracefulShutdown(true, true);
-				});
-				return page_navigation::stay;
-			});
-
-			apply_layout();
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.h
deleted file mode 100644
index 25f71df919..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "overlay_home_menu_page.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		struct home_menu_main_menu : public home_menu_page
-		{
-			home_menu_main_menu(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp
deleted file mode 100644
index 4d9196ad07..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "stdafx.h"
-#include "overlay_home_menu_message_box.h"
-#include "Emu/System.h"
-#include "Emu/system_config.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		home_menu_message_box::home_menu_message_box(s16 x, s16 y, u16 width, u16 height)
-			: overlay_element()
-			, m_accept_btn(120, 30)
-			, m_cancel_btn(120, 30)
-		{
-			back_color = {0.15f, 0.15f, 0.15f, 0.95f};
-
-			set_size(width, height);
-			set_pos(x, y);
-
-			m_label.align_text(text_align::center);
-			m_label.set_font("Arial", 16);
-			m_label.back_color.a = 0.0f;
-
-			if (g_cfg.sys.enter_button_assignment == enter_button_assign::circle)
-			{
-				m_accept_btn.set_image_resource(resource_config::standard_image_resource::circle);
-				m_cancel_btn.set_image_resource(resource_config::standard_image_resource::cross);
-			}
-			else
-			{
-				m_accept_btn.set_image_resource(resource_config::standard_image_resource::cross);
-				m_cancel_btn.set_image_resource(resource_config::standard_image_resource::circle);
-			}
-
-			m_accept_btn.set_pos(x + 30, y + height + 20);
-			m_cancel_btn.set_pos(x + 180, y + height + 20);
-
-			m_accept_btn.set_text(localized_string_id::RSX_OVERLAYS_LIST_SELECT);
-			m_cancel_btn.set_text(localized_string_id::RSX_OVERLAYS_LIST_CANCEL);
-
-			m_accept_btn.set_font("Arial", 16);
-			m_cancel_btn.set_font("Arial", 16);
-		}
-
-		compiled_resource& home_menu_message_box::get_compiled()
-		{
-			if (!is_compiled())
-			{
-				compiled_resource& compiled = overlay_element::get_compiled();
-				compiled.add(m_label.get_compiled());
-				compiled.add(m_cancel_btn.get_compiled());
-				compiled.add(m_accept_btn.get_compiled());
-			}
-			return compiled_resources;
-		}
-
-		void home_menu_message_box::show(const std::string& text, std::function<void()> on_accept, std::function<void()> on_cancel)
-		{
-			m_on_accept = std::move(on_accept);
-			m_on_cancel = std::move(on_cancel);
-			m_label.set_text(text);
-			m_label.auto_resize();
-			m_label.set_pos(x + (w - m_label.w) / 2, y + (h - m_label.h) / 2);
-			visible = true;
-			refresh();
-		}
-
-		void home_menu_message_box::hide()
-		{
-			visible = false;
-			refresh();
-		}
-
-		page_navigation home_menu_message_box::handle_button_press(pad_button button_press)
-		{
-			switch (button_press)
-			{
-			case pad_button::cross:
-			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_decide.wav");
-				if (m_on_accept)
-				{
-					m_on_accept();
-				}
-				return page_navigation::next;
-			}
-			case pad_button::circle:
-			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cancel.wav");
-				if (m_on_cancel)
-				{
-					m_on_cancel();
-				}
-				return page_navigation::back;
-			}
-			default:
-			{
-				return page_navigation::stay;
-			}
-			}
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.h
deleted file mode 100644
index 4540484efc..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "overlay_home_menu_components.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		struct home_menu_message_box : public overlay_element
-		{
-		public:
-			home_menu_message_box(s16 x, s16 y, u16 width, u16 height);
-			compiled_resource& get_compiled() override;
-			void show(const std::string& text, std::function<void()> on_accept = nullptr, std::function<void()> on_cancel = nullptr);
-			void hide();
-			page_navigation handle_button_press(pad_button button_press);
-
-		private:
-			label m_label{};
-			image_button m_accept_btn;
-			image_button m_cancel_btn;
-			std::function<void()> m_on_accept;
-			std::function<void()> m_on_cancel;
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp
deleted file mode 100644
index f298de0a81..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-#include "stdafx.h"
-#include "overlay_home_menu_page.h"
-#include "Emu/System.h"
-#include "Emu/system_config.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		home_menu_page::home_menu_page(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent, const std::string& title)
-			: list_view(width, height, use_separators)
-			, parent(parent)
-			, title(title)
-			, m_save_btn(120, 30)
-			, m_discard_btn(120, 30)
-		{
-			if (parent)
-			{
-				m_message_box = parent->m_message_box;
-				m_config_changed = parent->m_config_changed;
-			}
-
-			m_save_btn.set_image_resource(resource_config::standard_image_resource::square);
-			m_discard_btn.set_image_resource(resource_config::standard_image_resource::triangle);
-
-			m_save_btn.set_pos(width - 2 * (30 + 120), height + 20);
-			m_discard_btn.set_pos(width - (30 + 120), height + 20);
-
-			m_save_btn.set_text(localized_string_id::HOME_MENU_SETTINGS_SAVE_BUTTON);
-			m_discard_btn.set_text(localized_string_id::HOME_MENU_SETTINGS_DISCARD_BUTTON);
-
-			m_save_btn.set_font("Arial", 16);
-			m_discard_btn.set_font("Arial", 16);
-
-			set_pos(x, y);
-		}
-
-		void home_menu_page::set_current_page(home_menu_page* page)
-		{
-			if (page)
-			{
-				is_current_page = false;
-				page->is_current_page = true;
-				rsx_log.notice("Home menu: changing current page from '%s' to '%s'", title, page->title);
-			}
-		}
-
-		home_menu_page* home_menu_page::get_current_page(bool include_this)
-		{
-			if (is_current_page)
-			{
-				if (include_this)
-				{
-					return this;
-				}
-			}
-			else
-			{
-				for (auto& page : m_pages)
-				{
-					if (page)
-					{
-						if (home_menu_page* p = page->get_current_page(true))
-						{
-							return p;
-						}
-					}
-				}
-			}
-
-			return nullptr;
-		}
-
-		void home_menu_page::add_page(std::shared_ptr<home_menu_page> page)
-		{
-			ensure(page);
-			std::unique_ptr<overlay_element> elem = std::make_unique<home_menu_entry>(page->title);
-			m_pages.push_back(page);
-
-			add_item(elem, [this, page](pad_button btn) -> page_navigation
-			{
-				if (btn != pad_button::cross) return page_navigation::stay;
-
-				rsx_log.notice("User selected '%s' in '%s'", page->title, title);
-				set_current_page(page.get());
-				return page_navigation::next;
-			});
-		}
-
-		void home_menu_page::add_item(std::unique_ptr<overlay_element>& element, std::function<page_navigation(pad_button)> callback)
-		{
-			m_callbacks.push_back(std::move(callback));
-			m_entries.push_back(std::move(element));
-		}
-
-		void home_menu_page::apply_layout(bool center_vertically)
-		{
-			// Center vertically if necessary
-			if (center_vertically)
-			{
-				usz total_height = 0;
-
-				for (auto& entry : m_entries)
-				{
-					total_height += entry->h;
-				}
-
-				if (total_height < h)
-				{
-					advance_pos = (h - ::narrow<u16>(total_height)) / 2;
-				}
-			}
-
-			for (auto& entry : m_entries)
-			{
-				add_entry(entry);
-			}
-		}
-
-		void home_menu_page::show_dialog(const std::string& text, std::function<void()> on_accept, std::function<void()> on_cancel)
-		{
-			if (m_message_box && !m_message_box->visible)
-			{
-				rsx_log.notice("home_menu_page::show_dialog: page='%s', text='%s'", title, text);
-				m_message_box->show(text, std::move(on_accept), std::move(on_cancel));
-				refresh();
-			}
-		}
-
-		page_navigation home_menu_page::handle_button_press(pad_button button_press, bool is_auto_repeat, u64 auto_repeat_interval_ms)
-		{
-			if (m_message_box && m_message_box->visible)
-			{
-				const page_navigation navigation = m_message_box->handle_button_press(button_press);
-				if (navigation != page_navigation::stay)
-				{
-					m_message_box->hide();
-					refresh();
-				}
-				return navigation;
-			}
-
-			if (home_menu_page* page = get_current_page(false))
-			{
-				return page->handle_button_press(button_press, is_auto_repeat, auto_repeat_interval_ms);
-			}
-
-			switch (button_press)
-			{
-			case pad_button::dpad_left:
-			case pad_button::dpad_right:
-			case pad_button::ls_left:
-			case pad_button::ls_right:
-			case pad_button::cross:
-			{
-				if (const usz index = static_cast<usz>(get_selected_index()); index < m_callbacks.size())
-				{
-					if (const std::function<page_navigation(pad_button)>& func = ::at32(m_callbacks, index))
-					{
-						// Play a sound unless this is a fast auto repeat which would induce a nasty noise
-						if (!is_auto_repeat || auto_repeat_interval_ms >= user_interface::m_auto_repeat_ms_interval_default)
-						{
-							Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_decide.wav");
-						}
-						return func(button_press);
-					}
-				}
-				break;
-			}
-			case pad_button::circle:
-			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cancel.wav");
-				if (parent)
-				{
-					set_current_page(parent);
-					return page_navigation::back;
-				}
-				return page_navigation::exit;
-			}
-			case pad_button::triangle:
-			{
-				if (m_config_changed && *m_config_changed)
-				{
-					show_dialog(get_localized_string(localized_string_id::HOME_MENU_SETTINGS_DISCARD), [this]()
-					{
-						rsx_log.notice("home_menu_page: discarding settings...");
-
-						if (m_config_changed && *m_config_changed)
-						{
-							g_cfg.from_string(g_backup_cfg.to_string());
-							Emu.GetCallbacks().update_emu_settings();
-							*m_config_changed = false;
-						}
-					});
-				}
-				break;
-			}
-			case pad_button::square:
-			{
-				if (m_config_changed && *m_config_changed)
-				{
-					show_dialog(get_localized_string(localized_string_id::HOME_MENU_SETTINGS_SAVE), [this]()
-					{
-						rsx_log.notice("home_menu_page: saving settings...");
-						Emu.GetCallbacks().save_emu_settings();
-
-						if (m_config_changed)
-						{
-							*m_config_changed = false;
-						}
-					});
-				}
-				break;
-			}
-			case pad_button::dpad_up:
-			case pad_button::ls_up:
-			{
-				select_previous();
-				break;
-			}
-			case pad_button::dpad_down:
-			case pad_button::ls_down:
-			{
-				select_next();
-				break;
-			}
-			case pad_button::L1:
-			{
-				select_previous(10);
-				break;
-			}
-			case pad_button::R1:
-			{
-				select_next(10);
-				break;
-			}
-			default:
-			{
-				rsx_log.trace("[ui] Button %d pressed", static_cast<u8>(button_press));
-				break;
-			}
-			}
-
-			// Play a sound unless this is a fast auto repeat which would induce a nasty noise
-			if (!is_auto_repeat || auto_repeat_interval_ms >= user_interface::m_auto_repeat_ms_interval_default)
-			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cursor.wav");
-			}
-			return page_navigation::stay;
-		}
-
-		void home_menu_page::translate(s16 _x, s16 _y)
-		{
-			list_view::translate(_x, _y);
-			m_save_btn.translate(_x, _y);
-			m_discard_btn.translate(_x, _y);
-		}
-
-		compiled_resource& home_menu_page::get_compiled()
-		{
-			if (!is_compiled() || (m_message_box && !m_message_box->is_compiled()))
-			{
-				m_is_compiled = false;
-
-				if (home_menu_page* page = get_current_page(false))
-				{
-					compiled_resources = page->get_compiled();
-				}
-				else
-				{
-					compiled_resources = list_view::get_compiled();
-
-					if (m_message_box && m_message_box->visible)
-					{
-						compiled_resources.add(m_message_box->get_compiled());
-					}
-					else if (m_config_changed && *m_config_changed)
-					{
-						compiled_resources.add(m_save_btn.get_compiled());
-						compiled_resources.add(m_discard_btn.get_compiled());
-					}
-				}
-
-				m_is_compiled = true;
-			}
-
-			return compiled_resources;
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.h
deleted file mode 100644
index 862baf5062..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-
-#include "Emu/RSX/Overlays/overlay_list_view.hpp"
-#include "Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h"
-#include "Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		struct home_menu_page : public list_view
-		{
-		public:
-			home_menu_page(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent, const std::string& text);
-
-			void set_current_page(home_menu_page* page);
-			home_menu_page* get_current_page(bool include_this);
-			page_navigation handle_button_press(pad_button button_press, bool is_auto_repeat, u64 auto_repeat_interval_ms);
-
-			void translate(s16 _x, s16 _y) override;
-			compiled_resource& get_compiled() override;
-
-			bool is_current_page = false;
-			home_menu_page* parent = nullptr;
-			std::string title;
-
-			std::shared_ptr<home_menu_message_box> m_message_box;
-			std::shared_ptr<bool> m_config_changed;
-
-		protected:
-			void add_page(std::shared_ptr<home_menu_page> page);
-			void add_item(std::unique_ptr<overlay_element>& element, std::function<page_navigation(pad_button)> callback);
-			void apply_layout(bool center_vertically = true);
-			void show_dialog(const std::string& text, std::function<void()> on_accept = nullptr, std::function<void()> on_cancel = nullptr);
-
-			std::vector<std::shared_ptr<home_menu_page>> m_pages;
-
-		private:
-			image_button m_save_btn;
-			image_button m_discard_btn;
-			std::vector<std::unique_ptr<overlay_element>> m_entries;
-			std::vector<std::function<page_navigation(pad_button)>> m_callbacks;
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.cpp
deleted file mode 100644
index e224bc5727..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "stdafx.h"
-#include "overlay_home_menu_savestate.h"
-#include "overlay_home_menu_components.h"
-#include "Emu/system_config.h"
-
-extern bool boot_last_savestate(bool testing);
-
-namespace rsx
-{
-	namespace overlays
-	{
-		home_menu_savestate::home_menu_savestate(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
-			: home_menu_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SAVESTATE))
-		{
-			const bool suspend_mode = g_cfg.savestate.suspend_emu.get();
-
-			std::unique_ptr<overlay_element> save_state = std::make_unique<home_menu_entry>(
-				get_localized_string(suspend_mode ? localized_string_id::HOME_MENU_SAVESTATE_AND_EXIT : localized_string_id::HOME_MENU_SAVESTATE_SAVE));
-
-			add_item(save_state, [suspend_mode](pad_button btn) -> page_navigation
-			{
-				if (btn != pad_button::cross) return page_navigation::stay;
-				rsx_log.notice("User selected savestate in home menu");
-				Emu.CallFromMainThread([suspend_mode]()
-				{
-					if (!suspend_mode)
-					{
-						Emu.after_kill_callback = []() { Emu.Restart(); };
-
-						// Make sure we keep the game window opened
-						Emu.SetContinuousMode(true);
-					}
-					Emu.Kill(false, true);
-				});
-				return page_navigation::exit;
-			});
-
-			if (!suspend_mode && boot_last_savestate(true)) {
-				std::unique_ptr<overlay_element> reload_state = std::make_unique<home_menu_entry>(
-					get_localized_string(localized_string_id::HOME_MENU_RELOAD_SAVESTATE));
-
-				add_item(reload_state, [](pad_button btn) -> page_navigation
-				{
-					if (btn != pad_button::cross) return page_navigation::stay;
-					rsx_log.notice("User selected reload savestate in home menu");
-					Emu.CallFromMainThread([]() { boot_last_savestate(false); });
-					return page_navigation::exit;
-				});
-			}
-			apply_layout();
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.h
deleted file mode 100644
index ce83bc6797..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "overlay_home_menu_page.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		struct home_menu_savestate : public home_menu_page
-		{
-			home_menu_savestate(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp
deleted file mode 100644
index 119f411a24..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-#include "stdafx.h"
-#include "overlay_home_menu_settings.h"
-#include "Emu/system_config.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		home_menu_settings::home_menu_settings(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
-			: home_menu_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS))
-		{
-			add_page(std::make_shared<home_menu_settings_audio>(x, y, width, height, use_separators, this));
-			add_page(std::make_shared<home_menu_settings_video>(x, y, width, height, use_separators, this));
-			add_page(std::make_shared<home_menu_settings_input>(x, y, width, height, use_separators, this));
-			add_page(std::make_shared<home_menu_settings_advanced>(x, y, width, height, use_separators, this));
-			add_page(std::make_shared<home_menu_settings_overlays>(x, y, width, height, use_separators, this));
-			add_page(std::make_shared<home_menu_settings_performance_overlay>(x, y, width, height, use_separators, this));
-			add_page(std::make_shared<home_menu_settings_debug>(x, y, width, height, use_separators, this));
-
-			apply_layout();
-		}
-
-		home_menu_settings_audio::home_menu_settings_audio(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
-			: home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_AUDIO))
-		{
-			add_signed_slider(&g_cfg.audio.volume, localized_string_id::HOME_MENU_SETTINGS_AUDIO_MASTER_VOLUME, " %", 1);
-			add_dropdown(&g_cfg.audio.renderer, localized_string_id::HOME_MENU_SETTINGS_AUDIO_BACKEND);
-
-			add_checkbox(&g_cfg.audio.enable_buffering, localized_string_id::HOME_MENU_SETTINGS_AUDIO_BUFFERING);
-			add_signed_slider(&g_cfg.audio.desired_buffer_duration, localized_string_id::HOME_MENU_SETTINGS_AUDIO_BUFFER_DURATION, " ms", 1);
-
-			add_checkbox(&g_cfg.audio.enable_time_stretching, localized_string_id::HOME_MENU_SETTINGS_AUDIO_TIME_STRETCHING);
-			add_signed_slider(&g_cfg.audio.time_stretching_threshold, localized_string_id::HOME_MENU_SETTINGS_AUDIO_TIME_STRETCHING_THRESHOLD, " %", 1);
-
-			apply_layout();
-		}
-
-		home_menu_settings_video::home_menu_settings_video(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
-			: home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_VIDEO))
-		{
-			add_dropdown(&g_cfg.video.frame_limit, localized_string_id::HOME_MENU_SETTINGS_VIDEO_FRAME_LIMIT);
-			add_unsigned_slider(&g_cfg.video.anisotropic_level_override, localized_string_id::HOME_MENU_SETTINGS_VIDEO_ANISOTROPIC_OVERRIDE, "x", 2, {{0, "Auto"}}, {14});
-
-			add_dropdown(&g_cfg.video.output_scaling, localized_string_id::HOME_MENU_SETTINGS_VIDEO_OUTPUT_SCALING);
-			if (g_cfg.video.renderer == video_renderer::vulkan && g_cfg.video.output_scaling == output_scaling_mode::fsr)
-			{
-				add_unsigned_slider(&g_cfg.video.vk.rcas_sharpening_intensity, localized_string_id::HOME_MENU_SETTINGS_VIDEO_RCAS_SHARPENING, " %", 1);
-			}
-
-			add_checkbox(&g_cfg.video.stretch_to_display_area, localized_string_id::HOME_MENU_SETTINGS_VIDEO_STRETCH_TO_DISPLAY);
-
-			apply_layout();
-		}
-
-		home_menu_settings_advanced::home_menu_settings_advanced(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
-			: home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_ADVANCED))
-		{
-			add_signed_slider(&g_cfg.core.preferred_spu_threads, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_PREFERRED_SPU_THREADS, "", 1);
-			add_unsigned_slider(&g_cfg.core.max_cpu_preempt_count_per_frame, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_MAX_CPU_PREEMPTIONS, "", 1);
-			add_checkbox(&g_cfg.core.rsx_accurate_res_access, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_ACCURATE_RSX_RESERVATION_ACCESS);
-			add_dropdown(&g_cfg.core.sleep_timers_accuracy, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_SLEEP_TIMERS_ACCURACY);
-			add_signed_slider(&g_cfg.core.max_spurs_threads, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_MAX_SPURS_THREADS, "", 1);
-
-			add_unsigned_slider(&g_cfg.video.driver_wakeup_delay, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_DRIVER_WAKE_UP_DELAY, " µs", 20, {}, {}, g_cfg.video.driver_wakeup_delay.min, 800);
-			add_signed_slider(&g_cfg.video.vblank_rate, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_VBLANK_FREQUENCY, " Hz", 30);
-			add_checkbox(&g_cfg.video.vblank_ntsc, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_VBLANK_NTSC);
-
-			apply_layout();
-		}
-
-		home_menu_settings_input::home_menu_settings_input(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
-			: home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_INPUT))
-		{
-			add_checkbox(&g_cfg.io.background_input_enabled, localized_string_id::HOME_MENU_SETTINGS_INPUT_BACKGROUND_INPUT);
-			add_checkbox(&g_cfg.io.keep_pads_connected, localized_string_id::HOME_MENU_SETTINGS_INPUT_KEEP_PADS_CONNECTED);
-			add_checkbox(&g_cfg.io.show_move_cursor, localized_string_id::HOME_MENU_SETTINGS_INPUT_SHOW_PS_MOVE_CURSOR);
-
-			if (g_cfg.io.camera == camera_handler::qt)
-			{
-				add_dropdown(&g_cfg.io.camera_flip_option, localized_string_id::HOME_MENU_SETTINGS_INPUT_CAMERA_FLIP);
-			}
-
-			add_dropdown(&g_cfg.io.pad_mode, localized_string_id::HOME_MENU_SETTINGS_INPUT_PAD_MODE);
-			add_unsigned_slider(&g_cfg.io.pad_sleep, localized_string_id::HOME_MENU_SETTINGS_INPUT_PAD_SLEEP, " µs", 100);
-			add_unsigned_slider(&g_cfg.io.fake_move_rotation_cone_h, localized_string_id::HOME_MENU_SETTINGS_INPUT_FAKE_MOVE_ROTATION_CONE_H, "°", 1);
-			add_unsigned_slider(&g_cfg.io.fake_move_rotation_cone_v, localized_string_id::HOME_MENU_SETTINGS_INPUT_FAKE_MOVE_ROTATION_CONE_V, "°", 1);
-
-			apply_layout();
-		}
-
-		home_menu_settings_overlays::home_menu_settings_overlays(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
-			: home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_OVERLAYS))
-		{
-			add_checkbox(&g_cfg.misc.show_trophy_popups, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_TROPHY_POPUPS);
-			add_checkbox(&g_cfg.misc.show_rpcn_popups, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_RPCN_POPUPS);
-			add_checkbox(&g_cfg.misc.show_shader_compilation_hint, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_SHADER_COMPILATION_HINT);
-			add_checkbox(&g_cfg.misc.show_ppu_compilation_hint, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_PPU_COMPILATION_HINT);
-			add_checkbox(&g_cfg.misc.show_autosave_autoload_hint, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_AUTO_SAVE_LOAD_HINT);
-			add_checkbox(&g_cfg.misc.show_pressure_intensity_toggle_hint, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_PRESSURE_INTENSITY_TOGGLE_HINT);
-			add_checkbox(&g_cfg.misc.show_analog_limiter_toggle_hint, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_ANALOG_LIMITER_TOGGLE_HINT);
-			add_checkbox(&g_cfg.misc.show_mouse_and_keyboard_toggle_hint, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_MOUSE_AND_KB_TOGGLE_HINT);
-
-			apply_layout();
-		}
-
-		home_menu_settings_performance_overlay::home_menu_settings_performance_overlay(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
-			: home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY))
-		{
-			add_checkbox(&g_cfg.video.perf_overlay.perf_overlay_enabled, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE);
-			add_checkbox(&g_cfg.video.perf_overlay.framerate_graph_enabled, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE_FRAMERATE_GRAPH);
-			add_checkbox(&g_cfg.video.perf_overlay.frametime_graph_enabled, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE_FRAMETIME_GRAPH);
-
-			add_dropdown(&g_cfg.video.perf_overlay.level, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_DETAIL_LEVEL);
-			add_dropdown(&g_cfg.video.perf_overlay.framerate_graph_detail_level, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMERATE_DETAIL_LEVEL);
-			add_dropdown(&g_cfg.video.perf_overlay.frametime_graph_detail_level, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMETIME_DETAIL_LEVEL);
-
-			add_unsigned_slider(&g_cfg.video.perf_overlay.framerate_datapoint_count, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMERATE_DATAPOINT_COUNT, "", 1);
-			add_unsigned_slider(&g_cfg.video.perf_overlay.frametime_datapoint_count, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMETIME_DATAPOINT_COUNT, "", 1);
-			add_unsigned_slider(&g_cfg.video.perf_overlay.update_interval, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_UPDATE_INTERVAL, " ms", 1);
-
-			add_dropdown(&g_cfg.video.perf_overlay.position, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_POSITION);
-			add_checkbox(&g_cfg.video.perf_overlay.center_x, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_CENTER_X);
-			add_checkbox(&g_cfg.video.perf_overlay.center_y, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_CENTER_Y);
-			add_unsigned_slider(&g_cfg.video.perf_overlay.margin_x, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_MARGIN_X, " px", 1);
-			add_unsigned_slider(&g_cfg.video.perf_overlay.margin_y, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_MARGIN_Y, " px", 1);
-			add_unsigned_slider(&g_cfg.video.perf_overlay.font_size, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FONT_SIZE, " px", 1);
-			add_unsigned_slider(&g_cfg.video.perf_overlay.opacity, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_OPACITY, " %", 1);
-
-			apply_layout();
-		}
-
-		home_menu_settings_debug::home_menu_settings_debug(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
-			: home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_DEBUG))
-		{
-			add_checkbox(&g_cfg.video.debug_overlay, localized_string_id::HOME_MENU_SETTINGS_DEBUG_OVERLAY);
-			add_checkbox(&g_cfg.io.debug_overlay, localized_string_id::HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY);
-			add_checkbox(&g_cfg.video.disable_video_output, localized_string_id::HOME_MENU_SETTINGS_DEBUG_DISABLE_VIDEO_OUTPUT);
-			add_float_slider(&g_cfg.video.texture_lod_bias, localized_string_id::HOME_MENU_SETTINGS_DEBUG_TEXTURE_LOD_BIAS, "", 0.25f);
-
-			apply_layout();
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h
deleted file mode 100644
index 9e54cfd441..0000000000
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h
+++ /dev/null
@@ -1,262 +0,0 @@
-#pragma once
-
-#include "overlay_home_menu_page.h"
-#include "Emu/System.h"
-#include "Utilities/Config.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		struct home_menu_settings : public home_menu_page
-		{
-		public:
-			home_menu_settings(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
-
-		private:
-			std::vector<std::shared_ptr<home_menu_page>> m_settings_pages;
-		};
-
-		struct home_menu_settings_page : public home_menu_page
-		{
-			using home_menu_page::home_menu_page;
-
-			void add_checkbox(cfg::_bool* setting, localized_string_id loc_id)
-			{
-				ensure(setting && setting->get_is_dynamic());
-
-				const std::string localized_text = get_localized_string(loc_id);
-				std::unique_ptr<overlay_element> elem = std::make_unique<home_menu_checkbox>(setting, localized_text);
-
-				add_item(elem, [this, setting](pad_button btn) -> page_navigation
-				{
-					if (btn != pad_button::cross) return page_navigation::stay;
-
-					if (setting)
-					{
-						const bool value = !setting->get();
-						rsx_log.notice("User toggled checkbox in '%s'. Setting '%s' to %d", title, setting->get_name(), value);
-						setting->set(value);
-						Emu.GetCallbacks().update_emu_settings();
-						if (m_config_changed) *m_config_changed = true;
-						refresh();
-					}
-
-					return page_navigation::stay;
-				});
-			}
-
-			template <typename T>
-			void add_dropdown(cfg::_enum<T>* setting, localized_string_id loc_id)
-			{
-				ensure(setting && setting->get_is_dynamic());
-
-				const std::string localized_text = get_localized_string(loc_id);
-				std::unique_ptr<overlay_element> elem = std::make_unique<home_menu_dropdown<T>>(setting, localized_text);
-
-				add_item(elem, [this, setting](pad_button btn) -> page_navigation
-				{
-					if (btn != pad_button::cross) return page_navigation::stay;
-
-					if (setting)
-					{
-						usz new_index = 0;
-						const T value = setting->get();
-						const std::string val = fmt::format("%s", value);
-						const std::vector<std::string> list = setting->to_list();
-
-						for (usz i = 0; i < list.size(); i++)
-						{
-							const std::string& entry = list[i];
-							if (entry == val)
-							{
-								new_index = (i + 1) % list.size();
-								break;
-							}
-						}
-						if (const std::string& next_value = ::at32(list, new_index); setting->from_string(next_value))
-						{
-							rsx_log.notice("User toggled dropdown in '%s'. Setting '%s' to %s", title, setting->get_name(), next_value);
-						}
-						else
-						{
-							rsx_log.error("Can't toggle dropdown in '%s'. Setting '%s' to '%s' failed", title, setting->get_name(), next_value);
-						}
-						Emu.GetCallbacks().update_emu_settings();
-						if (m_config_changed) *m_config_changed = true;
-						refresh();
-					}
-
-					return page_navigation::stay;
-				});
-			}
-
-			template <s64 Min, s64 Max>
-			void add_signed_slider(cfg::_int<Min, Max>* setting, localized_string_id loc_id, const std::string& suffix, s64 step_size, std::map<s64, std::string> special_labels = {}, s64 minimum = Min, s64 maximum = Max)
-			{
-				ensure(setting && setting->get_is_dynamic());
-
-				const std::string localized_text = get_localized_string(loc_id);
-				std::unique_ptr<overlay_element> elem = std::make_unique<home_menu_signed_slider<Min, Max>>(setting, localized_text, suffix, special_labels, minimum, maximum);
-
-				add_item(elem, [this, setting, step_size, minimum, maximum](pad_button btn) -> page_navigation
-				{
-					if (setting)
-					{
-						s64 value = setting->get();
-						switch (btn)
-						{
-						case pad_button::dpad_left:
-						case pad_button::ls_left:
-							value = std::max(value - step_size, minimum);
-							break;
-						case pad_button::dpad_right:
-						case pad_button::ls_right:
-							value = std::min(value + step_size, maximum);
-							break;
-						default:
-							return page_navigation::stay;
-						}
-
-						if (value != setting->get())
-						{
-							rsx_log.notice("User toggled signed slider in '%s'. Setting '%s' to %d", title, setting->get_name(), value);
-							setting->set(value);
-							Emu.GetCallbacks().update_emu_settings();
-							if (m_config_changed) *m_config_changed = true;
-							refresh();
-						}
-					}
-
-					return page_navigation::stay;
-				});
-			}
-
-			template <u64 Min, u64 Max>
-			void add_unsigned_slider(cfg::uint<Min, Max>* setting, localized_string_id loc_id, const std::string& suffix, u64 step_size, std::map<u64, std::string> special_labels = {}, const std::set<u64>& exceptions = {}, u64 minimum = Min, u64 maximum = Max)
-			{
-				ensure(setting && setting->get_is_dynamic());
-				ensure(!exceptions.contains(minimum) && !exceptions.contains(maximum));
-
-				const std::string localized_text = get_localized_string(loc_id);
-				std::unique_ptr<overlay_element> elem = std::make_unique<home_menu_unsigned_slider<Min, Max>>(setting, localized_text, suffix, special_labels, minimum, maximum);
-
-				add_item(elem, [this, setting, step_size, minimum, maximum, exceptions](pad_button btn) -> page_navigation
-				{
-					if (setting)
-					{
-						u64 value = setting->get();
-						switch (btn)
-						{
-						case pad_button::dpad_left:
-						case pad_button::ls_left:
-							do
-							{
-								value = step_size > value ? minimum : std::max(value - step_size, minimum);
-							}
-							while (exceptions.contains(value));
-							break;
-						case pad_button::dpad_right:
-						case pad_button::ls_right:
-							do
-							{
-								value = std::min(value + step_size, maximum);
-							}
-							while (exceptions.contains(value));
-							break;
-						default:
-							return page_navigation::stay;
-						}
-
-						if (value != setting->get())
-						{
-							rsx_log.notice("User toggled unsigned slider in '%s'. Setting '%s' to %d", title, setting->get_name(), value);
-							setting->set(value);
-							Emu.GetCallbacks().update_emu_settings();
-							if (m_config_changed) *m_config_changed = true;
-							refresh();
-						}
-					}
-
-					return page_navigation::stay;
-				});
-			}
-
-			template <s32 Min, s32 Max>
-			void add_float_slider(cfg::_float<Min, Max>* setting, localized_string_id loc_id, const std::string& suffix, f32 step_size, std::map<f64, std::string> special_labels = {}, s32 minimum = Min, s32 maximum = Max)
-			{
-				ensure(setting && setting->get_is_dynamic());
-
-				const std::string localized_text = get_localized_string(loc_id);
-				std::unique_ptr<overlay_element> elem = std::make_unique<home_menu_float_slider<Min, Max>>(setting, localized_text, suffix, special_labels, minimum, maximum);
-
-				add_item(elem, [this, setting, step_size, minimum, maximum](pad_button btn) -> page_navigation
-				{
-					if (setting)
-					{
-						f64 value = setting->get();
-						switch (btn)
-						{
-						case pad_button::dpad_left:
-						case pad_button::ls_left:
-							value = std::max(value - step_size, static_cast<f64>(minimum));
-							break;
-						case pad_button::dpad_right:
-						case pad_button::ls_right:
-							value = std::min(value + step_size, static_cast<f64>(maximum));
-							break;
-						default:
-							return page_navigation::stay;
-						}
-
-						if (value != setting->get())
-						{
-							rsx_log.notice("User toggled float slider in '%s'. Setting '%s' to %.2f", title, setting->get_name(), value);
-							setting->set(value);
-							Emu.GetCallbacks().update_emu_settings();
-							if (m_config_changed) *m_config_changed = true;
-							refresh();
-						}
-					}
-
-					return page_navigation::stay;
-				});
-			}
-		};
-
-		struct home_menu_settings_audio : public home_menu_settings_page
-		{
-			home_menu_settings_audio(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
-		};
-
-		struct home_menu_settings_video : public home_menu_settings_page
-		{
-			home_menu_settings_video(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
-		};
-
-		struct home_menu_settings_advanced : public home_menu_settings_page
-		{
-			home_menu_settings_advanced(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
-		};
-
-		struct home_menu_settings_input : public home_menu_settings_page
-		{
-			home_menu_settings_input(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
-		};
-
-		struct home_menu_settings_overlays : public home_menu_settings_page
-		{
-			home_menu_settings_overlays(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
-		};
-
-		struct home_menu_settings_performance_overlay : public home_menu_settings_page
-		{
-			home_menu_settings_performance_overlay(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
-		};
-
-		struct home_menu_settings_debug : public home_menu_settings_page
-		{
-			home_menu_settings_debug(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp b/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp
deleted file mode 100644
index cb1837b78d..0000000000
--- a/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp
+++ /dev/null
@@ -1,339 +0,0 @@
-#include "stdafx.h"
-#include "../overlay_manager.h"
-#include "overlay_recvmessage_dialog.h"
-#include "Emu/System.h"
-#include "Emu/NP/rpcn_client.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		void recvmessage_callback(void* param, shared_ptr<std::pair<std::string, message_data>> new_msg, u64 msg_id)
-		{
-			auto* dlg = static_cast<recvmessage_dialog*>(param);
-			dlg->callback_handler(std::move(new_msg), msg_id);
-		}
-
-		recvmessage_dialog::list_entry::list_entry(const std::string& name, const std::string& subj, const std::string& body)
-		{
-			std::unique_ptr<overlay_element> prefix_stack = std::make_unique<vertical_layout>();
-			std::unique_ptr<overlay_element> text_stack = std::make_unique<vertical_layout>();
-			std::unique_ptr<overlay_element> name_label = std::make_unique<label>(name);
-			std::unique_ptr<overlay_element> subj_label = std::make_unique<label>(subj);
-			std::unique_ptr<overlay_element> body_label = std::make_unique<label>(body);
-			std::unique_ptr<overlay_element> name_prefix_label = std::make_unique<label>(get_localized_string(localized_string_id::CELL_NP_RECVMESSAGE_DIALOG_FROM));
-			std::unique_ptr<overlay_element> subj_prefix_label = std::make_unique<label>(get_localized_string(localized_string_id::CELL_NP_RECVMESSAGE_DIALOG_SUBJECT));
-
-			name_prefix_label->set_size(0, 40);
-			name_prefix_label->set_font("Arial", 16);
-			name_prefix_label->set_wrap_text(false);
-			static_cast<label*>(name_prefix_label.get())->auto_resize(true);
-
-			subj_prefix_label->set_size(0, 40);
-			subj_prefix_label->set_font("Arial", 16);
-			subj_prefix_label->set_wrap_text(false);
-			static_cast<label*>(subj_prefix_label.get())->auto_resize(true);
-
-			name_label->set_size(200, 40);
-			name_label->set_font("Arial", 16);
-			name_label->set_wrap_text(false);
-
-			subj_label->set_size(600, 40);
-			subj_label->set_font("Arial", 16);
-			subj_label->set_wrap_text(false);
-
-			body_label->set_size(800, 0);
-			body_label->set_font("Arial", 16);
-			body_label->set_wrap_text(true);
-			static_cast<label*>(body_label.get())->auto_resize(true);
-
-			// Make back color transparent for text
-			name_label->back_color.a = 0.f;
-			subj_label->back_color.a = 0.f;
-			body_label->back_color.a = 0.f;
-			name_prefix_label->back_color.a = 0.f;
-			subj_prefix_label->back_color.a = 0.f;
-
-			static_cast<vertical_layout*>(prefix_stack.get())->pack_padding = 5;
-			static_cast<vertical_layout*>(prefix_stack.get())->add_spacer();
-			static_cast<vertical_layout*>(prefix_stack.get())->add_element(name_prefix_label);
-			static_cast<vertical_layout*>(prefix_stack.get())->add_element(subj_prefix_label);
-
-			static_cast<vertical_layout*>(text_stack.get())->pack_padding = 5;
-			static_cast<vertical_layout*>(text_stack.get())->add_spacer();
-			static_cast<vertical_layout*>(text_stack.get())->add_element(name_label);
-			static_cast<vertical_layout*>(text_stack.get())->add_element(subj_label);
-			static_cast<vertical_layout*>(text_stack.get())->add_element(body_label);
-
-			// Add spacer to make the thing look a bit nicer at the bottom... should ideally not be necessary
-			static_cast<vertical_layout*>(text_stack.get())->pack_padding = 25;
-			static_cast<vertical_layout*>(text_stack.get())->add_spacer();
-
-			// Pack
-			pack_padding = 15;
-			add_element(prefix_stack);
-			add_element(text_stack);
-		}
-
-		recvmessage_dialog::recvmessage_dialog() : RecvMessageDialogBase()
-		{
-			m_dim_background = std::make_unique<overlay_element>();
-			m_dim_background->set_size(virtual_width, virtual_height);
-			m_dim_background->back_color.a = 0.5f;
-
-			m_list = std::make_unique<list_view>(virtual_width - 2 * 20, 540, true, true);
-			m_list->set_pos(20, 85);
-
-			m_description = std::make_unique<label>();
-			m_description->set_font("Arial", 20);
-			m_description->set_pos(20, 37);
-			m_description->set_text(get_localized_string(localized_string_id::CELL_NP_RECVMESSAGE_DIALOG_TITLE));
-			m_description->auto_resize();
-			m_description->back_color.a = 0.f;
-
-			fade_animation.duration_sec = 0.15f;
-
-			return_code = selection_code::canceled;
-		}
-
-		void recvmessage_dialog::update(u64 timestamp_us)
-		{
-			if (fade_animation.active)
-			{
-				fade_animation.update(timestamp_us);
-			}
-		}
-
-		void recvmessage_dialog::on_button_pressed(pad_button button_press, bool is_auto_repeat)
-		{
-			if (fade_animation.active) return;
-
-			bool close_dialog = false;
-
-			std::lock_guard lock(m_mutex);
-
-			switch (button_press)
-			{
-			case pad_button::cross:
-			case pad_button::triangle:
-				if (m_list->m_items.empty())
-					break;
-
-				if (const usz index = static_cast<usz>(m_list->get_selected_index()); index < m_entry_ids.size())
-				{
-					return_code = button_press == pad_button::cross ? selection_code::ok : selection_code::no;
-				}
-				else
-				{
-					return_code = selection_code::error;
-				}
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_decide.wav");
-				close_dialog = true;
-				break;
-			case pad_button::circle:
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cancel.wav");
-				close_dialog = true;
-				break;
-			case pad_button::dpad_up:
-			case pad_button::ls_up:
-				m_list->select_previous();
-				break;
-			case pad_button::dpad_down:
-			case pad_button::ls_down:
-				m_list->select_next();
-				break;
-			case pad_button::L1:
-				m_list->select_previous(10);
-				break;
-			case pad_button::R1:
-				m_list->select_next(10);
-				break;
-			default:
-				rsx_log.trace("[ui] Button %d pressed", static_cast<u8>(button_press));
-				break;
-			}
-
-			if (close_dialog)
-			{
-				fade_animation.current = color4f(1.f);
-				fade_animation.end = color4f(0.f);
-				fade_animation.active = true;
-
-				fade_animation.on_finish = [this]
-				{
-					close(true, true);
-				};
-			}
-			// Play a sound unless this is a fast auto repeat which would induce a nasty noise
-			else if (!is_auto_repeat || m_auto_repeat_ms_interval >= m_auto_repeat_ms_interval_default)
-			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cursor.wav");
-			}
-		}
-
-		compiled_resource recvmessage_dialog::get_compiled()
-		{
-			if (!visible)
-			{
-				return {};
-			}
-
-			compiled_resource result;
-			result.add(m_dim_background->get_compiled());
-			result.add(m_list->get_compiled());
-			result.add(m_description->get_compiled());
-
-			fade_animation.apply(result);
-
-			return result;
-		}
-
-		error_code recvmessage_dialog::Exec(SceNpBasicMessageMainType type, SceNpBasicMessageRecvOptions options, SceNpBasicMessageRecvAction& recv_result, u64& chosen_msg_id)
-		{
-			visible = false;
-
-			switch (type)
-			{
-			case SceNpBasicMessageMainType::SCE_NP_BASIC_MESSAGE_MAIN_TYPE_ADD_FRIEND:
-				m_description->set_text(get_localized_string(localized_string_id::CELL_NP_RECVMESSAGE_DIALOG_TITLE_ADD_FRIEND));
-				m_description->auto_resize();
-				break;
-			case SceNpBasicMessageMainType::SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE:
-				m_description->set_text(get_localized_string(localized_string_id::CELL_NP_RECVMESSAGE_DIALOG_TITLE_INVITE));
-				m_description->auto_resize();
-				break;
-			case SceNpBasicMessageMainType::SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT:
-			case SceNpBasicMessageMainType::SCE_NP_BASIC_MESSAGE_MAIN_TYPE_GENERAL:
-			case SceNpBasicMessageMainType::SCE_NP_BASIC_MESSAGE_MAIN_TYPE_CUSTOM_DATA:
-			case SceNpBasicMessageMainType::SCE_NP_BASIC_MESSAGE_MAIN_TYPE_URL_ATTACHMENT:
-			default:
-				break; // Title already set in constructor
-			}
-
-			const bool preserve         = options & SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_PRESERVE;
-			const bool include_bootable = options & SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_INCLUDE_BOOTABLE;
-
-			m_rpcn = rpcn::rpcn_client::get_instance(0, true);
-
-			// Get list of messages
-			const auto messages = m_rpcn->get_messages_and_register_cb(type, include_bootable, recvmessage_callback, this);
-			{
-				std::lock_guard lock(m_mutex);
-
-				for (const auto& [id, message] : messages)
-				{
-					ensure(message);
-					std::unique_ptr<overlay_element> entry = std::make_unique<list_entry>(message->first, message->second.subject, message->second.body);
-					m_entries.emplace_back(std::move(entry));
-					m_entry_ids.push_back(id);
-				}
-
-				for (auto& entry : m_entries)
-				{
-					m_list->add_entry(entry);
-				}
-
-				if (m_list->m_items.empty())
-				{
-					m_list->set_cancel_only(true);
-				}
-				else
-				{
-					// Only select an entry if there are entries available
-					m_list->select_entry(0);
-				}
-			}
-
-			fade_animation.current = color4f(0.f);
-			fade_animation.end = color4f(1.f);
-			fade_animation.active = true;
-
-			visible = true;
-
-			const auto notify = std::make_shared<atomic_t<u32>>(0);
-			auto& overlayman = g_fxo->get<display_manager>();
-			auto& nps = g_fxo->get<np_state>();
-
-			// Block until the user exits the dialog
-			overlayman.attach_thread_input(
-				uid, "Recvmessage dialog", nullptr,
-				[notify](s32) { *notify = true; notify->notify_one(); }
-			);
-
-			while (!Emu.IsStopped() && !*notify && !nps.abort_gui_flag)
-			{
-				notify->wait(0, atomic_wait_timeout{1'000'000});
-			}
-
-			m_rpcn->remove_message_cb(recvmessage_callback, this);
-
-			error_code result = CELL_CANCEL;
-
-			if (nps.abort_gui_flag.exchange(false))
-			{
-				rsx_log.warning("Recvmessage dialog aborted by sceNp!");
-				close(false, true);
-				return result;
-			}
-
-			auto accept_or_deny = [preserve, this, &result, &recv_result, &chosen_msg_id](SceNpBasicMessageRecvAction result_from_action)
-			{
-				{
-					std::lock_guard lock(m_mutex);
-					const int selected_index = m_list->get_selected_index();
-
-					if (selected_index < 0 || static_cast<usz>(selected_index) >= m_entry_ids.size())
-					{
-						rsx_log.error("recvmessage dialog exited with unexpected selection: index=%d, entries=%d", selected_index, m_entry_ids.size());
-						return;
-					}
-
-					chosen_msg_id = ::at32(m_entry_ids, selected_index);
-				}
-				recv_result   = result_from_action;
-				result        = CELL_OK;
-
-				if (!preserve)
-				{
-					m_rpcn->mark_message_used(chosen_msg_id);
-				}
-			};
-
-			switch (return_code)
-			{
-			case selection_code::ok:
-				accept_or_deny(SCE_NP_BASIC_MESSAGE_ACTION_ACCEPT);
-				break;
-			case selection_code::no:
-				accept_or_deny(SCE_NP_BASIC_MESSAGE_ACTION_DENY);
-				break;
-			case selection_code::canceled:
-				rsx_log.notice("recvmessage dialog was canceled");
-				break;
-			default:
-				rsx_log.error("recvmessage dialog exited with error: %d", return_code);
-				break;
-			}
-
-			return result;
-		}
-
-		void recvmessage_dialog::callback_handler(shared_ptr<std::pair<std::string, message_data>> new_msg, u64 msg_id)
-		{
-			ensure(new_msg);
-
-			std::lock_guard lock(m_mutex);
-
-			std::unique_ptr<overlay_element> entry = std::make_unique<list_entry>(new_msg->first, new_msg->second.subject, new_msg->second.body);
-			m_entries.emplace_back(std::move(entry));
-			m_entry_ids.push_back(msg_id);
-			m_list->add_entry(m_entries.back());
-
-			if (m_list->get_cancel_only())
-			{
-				m_list->set_cancel_only(false);
-				m_list->select_entry(0);
-			}
-		}
-	} // namespace overlays
-} // namespace RSX
diff --git a/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.h b/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.h
deleted file mode 100644
index 0c910e1311..0000000000
--- a/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include "../overlays.h"
-#include "../overlay_list_view.hpp"
-#include "Emu/Cell/ErrorCodes.h"
-#include "Emu/Cell/Modules/sceNp.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		struct recvmessage_dialog : public user_interface, public RecvMessageDialogBase
-		{
-		private:
-			struct list_entry : horizontal_layout
-			{
-			public:
-				list_entry(const std::string& name, const std::string& subj, const std::string& body);
-			};
-
-			shared_mutex m_mutex;
-			std::vector<std::unique_ptr<overlay_element>> m_entries;
-			std::vector<u64> m_entry_ids;
-			std::unique_ptr<overlay_element> m_dim_background;
-			std::unique_ptr<list_view> m_list;
-			std::unique_ptr<label> m_description;
-
-			animation_color_interpolate fade_animation;
-
-		public:
-			recvmessage_dialog();
-
-			void update(u64 timestamp_us) override;
-			void on_button_pressed(pad_button button_press, bool is_auto_repeat) override;
-
-			compiled_resource get_compiled() override;
-
-			error_code Exec(SceNpBasicMessageMainType type, SceNpBasicMessageRecvOptions options, SceNpBasicMessageRecvAction& recv_result, u64& chosen_msg_id) override;
-			void callback_handler(const shared_ptr<std::pair<std::string, message_data>> new_msg, u64 msg_id) override;
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp b/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp
deleted file mode 100644
index 5369afb097..0000000000
--- a/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp
+++ /dev/null
@@ -1,449 +0,0 @@
-#include "stdafx.h"
-#include "../overlay_manager.h"
-#include "overlay_sendmessage_dialog.h"
-#include "Emu/System.h"
-#include "Emu/NP/rpcn_client.h"
-#include "Emu/Cell/Modules/cellMsgDialog.h"
-#include "Emu/Cell/PPUThread.h" // for vm_var
-#include "Emu/Memory/vm_var.h"
-#include "Emu/Io/interception.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		void sendmessage_friend_callback(void* param, rpcn::NotificationType ntype, const std::string& username, bool status)
-		{
-			auto* dlg = static_cast<sendmessage_dialog*>(param);
-			dlg->callback_handler(ntype, username, status);
-		}
-
-		sendmessage_dialog::list_entry::list_entry(const std::string& msg)
-		{
-			std::unique_ptr<overlay_element> text_stack  = std::make_unique<vertical_layout>();
-			std::unique_ptr<overlay_element> padding     = std::make_unique<spacer>();
-			std::unique_ptr<overlay_element> text_label  = std::make_unique<label>(msg);
-
-			padding->set_size(1, 1);
-			text_label->set_size(800, 40);
-			text_label->set_font("Arial", 16);
-			text_label->set_wrap_text(true);
-
-			// Make back color transparent for text
-			text_label->back_color.a = 0.f;
-
-			static_cast<vertical_layout*>(text_stack.get())->pack_padding = 5;
-			static_cast<vertical_layout*>(text_stack.get())->add_element(padding);
-			static_cast<vertical_layout*>(text_stack.get())->add_element(text_label);
-
-			// Pack
-			pack_padding = 15;
-			add_element(text_stack);
-		}
-
-		sendmessage_dialog::sendmessage_dialog() : SendMessageDialogBase()
-		{
-			m_dim_background = std::make_unique<overlay_element>();
-			m_dim_background->set_size(virtual_width, virtual_height);
-			m_dim_background->back_color.a = 0.5f;
-
-			m_description = std::make_unique<label>();
-			m_description->set_font("Arial", 20);
-			m_description->set_pos(20, 37);
-			m_description->set_text(get_localized_string(localized_string_id::CELL_NP_SENDMESSAGE_DIALOG_TITLE));
-			m_description->auto_resize();
-			m_description->back_color.a = 0.f;
-
-			fade_animation.duration_sec = 0.15f;
-
-			return_code = selection_code::canceled;
-		}
-
-		void sendmessage_dialog::update(u64 timestamp_us)
-		{
-			if (fade_animation.active)
-			{
-				fade_animation.update(timestamp_us);
-			}
-		}
-
-		void sendmessage_dialog::on_button_pressed(pad_button button_press, bool is_auto_repeat)
-		{
-			if (fade_animation.active) return;
-			if (m_confirmation_dialog_open) return; // Ignore input while the confirmation dialog is open
-
-			bool close_dialog = false;
-
-			std::lock_guard lock(m_mutex);
-
-			switch (button_press)
-			{
-			case pad_button::cross:
-				if (m_list->m_items.empty() || is_auto_repeat)
-					break;
-
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_decide.wav");
-
-				if (!get_current_selection().empty())
-				{
-					m_open_confirmation_dialog = true;
-					m_confirmation_dialog_open = true; // Ignore input while the confirmation dialog is open. Set this here due to avoid a race condition.
-					break;
-				}
-
-				return_code = selection_code::error;
-				close_dialog = true;
-				break;
-			case pad_button::circle:
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cancel.wav");
-				close_dialog = true;
-				break;
-			case pad_button::dpad_up:
-			case pad_button::ls_up:
-				m_list->select_previous();
-				break;
-			case pad_button::dpad_down:
-			case pad_button::ls_down:
-				m_list->select_next();
-				break;
-			case pad_button::L1:
-				m_list->select_previous(10);
-				break;
-			case pad_button::R1:
-				m_list->select_next(10);
-				break;
-			default:
-				rsx_log.trace("[ui] Button %d pressed", static_cast<u8>(button_press));
-				break;
-			}
-
-			if (close_dialog)
-			{
-				fade_animation.current = color4f(1.f);
-				fade_animation.end = color4f(0.f);
-				fade_animation.active = true;
-
-				fade_animation.on_finish = [this]
-				{
-					close(true, true);
-				};
-			}
-			// Play a sound unless this is a fast auto repeat which would induce a nasty noise
-			else if (!is_auto_repeat || m_auto_repeat_ms_interval >= m_auto_repeat_ms_interval_default)
-			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cursor.wav");
-			}
-		}
-
-		compiled_resource sendmessage_dialog::get_compiled()
-		{
-			if (!visible)
-			{
-				return {};
-			}
-
-			compiled_resource result;
-			result.add(m_dim_background->get_compiled());
-
-			if (m_list)
-			{
-				result.add(m_list->get_compiled());
-			}
-
-			result.add(m_description->get_compiled());
-
-			fade_animation.apply(result);
-
-			return result;
-		}
-
-		error_code sendmessage_dialog::Exec(message_data& msg_data, std::set<std::string>& npids)
-		{
-			visible = false;
-
-			localized_string_id confirmation_loc_id = localized_string_id::CELL_NP_SENDMESSAGE_DIALOG_CONFIRMATION;
-
-			switch (msg_data.mainType)
-			{
-			case SceNpBasicMessageMainType::SCE_NP_BASIC_MESSAGE_MAIN_TYPE_ADD_FRIEND:
-				m_description->set_text(get_localized_string(localized_string_id::CELL_NP_SENDMESSAGE_DIALOG_TITLE_ADD_FRIEND));
-				m_description->auto_resize();
-				confirmation_loc_id = localized_string_id::CELL_NP_SENDMESSAGE_DIALOG_CONFIRMATION_ADD_FRIEND;
-				break;
-			case SceNpBasicMessageMainType::SCE_NP_BASIC_MESSAGE_MAIN_TYPE_INVITE:
-				m_description->set_text(get_localized_string(localized_string_id::CELL_NP_SENDMESSAGE_DIALOG_TITLE_INVITE));
-				m_description->auto_resize();
-				confirmation_loc_id = localized_string_id::CELL_NP_SENDMESSAGE_DIALOG_CONFIRMATION_INVITE;
-				break;
-			case SceNpBasicMessageMainType::SCE_NP_BASIC_MESSAGE_MAIN_TYPE_DATA_ATTACHMENT:
-			case SceNpBasicMessageMainType::SCE_NP_BASIC_MESSAGE_MAIN_TYPE_GENERAL:
-			case SceNpBasicMessageMainType::SCE_NP_BASIC_MESSAGE_MAIN_TYPE_CUSTOM_DATA:
-			case SceNpBasicMessageMainType::SCE_NP_BASIC_MESSAGE_MAIN_TYPE_URL_ATTACHMENT:
-			default:
-				break; // Title already set in constructor
-			}
-
-			m_rpcn = rpcn::rpcn_client::get_instance(0, true);
-
-			// Get list of messages
-			rpcn::friend_data data;
-			m_rpcn->get_friends_and_register_cb(data, sendmessage_friend_callback, this);
-			{
-				std::lock_guard lock(m_mutex);
-
-				for (const auto& [name, online_data] : data.friends)
-				{
-					// Only add online friends to the list
-					if (online_data.online)
-					{
-						if (std::any_of(m_entry_names.cbegin(), m_entry_names.cend(), [&name](const std::string& entry){ return entry == name; }))
-							continue;
-
-						m_entry_names.push_back(name);
-					}
-				}
-
-				reload({});
-			}
-
-			fade_animation.current = color4f(0.f);
-			fade_animation.end = color4f(1.f);
-			fade_animation.active = true;
-
-			visible = true;
-
-			const auto notify = std::make_shared<atomic_t<u32>>(0);
-			auto& overlayman = g_fxo->get<display_manager>();
-			auto& nps = g_fxo->get<np_state>();
-
-			// Block until the user exits the dialog
-			overlayman.attach_thread_input(
-				uid, "Sendmessage dialog", nullptr,
-				[notify](s32) { *notify = true; notify->notify_one(); }
-			);
-
-			bool confirmation_error = false;
-
-			while (!Emu.IsStopped() && !*notify && !nps.abort_gui_flag)
-			{
-				if (m_open_confirmation_dialog.exchange(false))
-				{
-					// Get user confirmation by opening a blocking dialog
-					const std::string npid = get_current_selection();
-					if (npid.empty())
-					{
-						rsx_log.fatal("sendmessage dialog can't open confirmation dialog with empty npid");
-						confirmation_error = true;
-						break;
-					}
-
-					rsx_log.notice("sendmessage dialog about to open confirmation dialog");
-
-					const std::string loc_msg = get_localized_string(confirmation_loc_id, npid.c_str());
-					const std::string confirmation_msg = fmt::format("%s %s\n\n%s", loc_msg, msg_data.subject, msg_data.body);
-					s32 confirmation_code = CELL_MSGDIALOG_BUTTON_NO;
-
-					// Hide list
-					visible = false;
-
-					error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_BUTTON_TYPE_YESNO, vm::make_str(confirmation_msg), msg_dialog_source::_sceNp, vm::null, vm::null, vm::null, &confirmation_code);
-					if (res != CELL_OK)
-					{
-						rsx_log.fatal("sendmessage dialog failed to open confirmation dialog (error=%d)", +res);
-						confirmation_error = true;
-						break;
-					}
-
-					rsx_log.notice("sendmessage dialog received confirmation dialog result %d", confirmation_code);
-
-					if (confirmation_code == CELL_MSGDIALOG_BUTTON_YES)
-					{
-						return_code = selection_code::ok;
-						close(false, true);
-						break;
-					}
-
-					// Show list again
-					visible = true;
-
-					// Allow input again
-					m_confirmation_dialog_open = false;
-
-					// Intercept pads again (Only needed because we currently don't have an interception stack and the confirmation dialog disables it on close)
-					input::SetIntercepted(true);
-				}
-
-				notify->wait(0, atomic_wait_timeout{1'000'000});
-			}
-
-			m_rpcn->remove_friend_cb(sendmessage_friend_callback, this);
-
-			error_code result = CELL_CANCEL;
-
-			if (confirmation_error)
-			{
-				rsx_log.error("Sendmessage dialog aborted internally!");
-				close(false, true);
-				return result;
-			}
-
-			if (nps.abort_gui_flag.exchange(false))
-			{
-				rsx_log.warning("Sendmessage dialog aborted by sceNp!");
-				close(false, true);
-				return result;
-			}
-
-			switch (return_code)
-			{
-			case selection_code::ok:
-			{
-				const std::string current_selection = get_current_selection();
-
-				if (current_selection.empty())
-				{
-					rsx_log.fatal("sendmessage dialog can't send message to empty npid");
-					break;
-				}
-
-				npids.insert(current_selection);
-
-				// Send the message
-				if (m_rpcn->send_message(msg_data, npids))
-				{
-					result = CELL_OK;
-				}
-				break;
-			}
-			case selection_code::canceled:
-				rsx_log.notice("sendmessage dialog was canceled");
-				break;
-			default:
-				rsx_log.error("sendmessage dialog exited with error: %d", return_code);
-				break;
-			}
-
-			return result;
-		}
-
-		std::string sendmessage_dialog::get_current_selection() const
-		{
-			if (const s32 index = m_list->get_selected_index(); index >= 0 && static_cast<usz>(index) < m_entry_names.size())
-			{
-				return m_entry_names[index];
-			}
-
-			return {};
-		}
-
-		void sendmessage_dialog::reload(const std::string& previous_selection)
-		{
-			if (m_list)
-			{
-				status_flags |= status_bits::invalidate_image_cache;
-			}
-			
-			m_list = std::make_unique<list_view>(virtual_width - 2 * 20, 540, false);
-			m_list->set_pos(20, 85);
-
-			for (const std::string& name : m_entry_names)
-			{
-				std::unique_ptr<overlay_element> entry = std::make_unique<list_entry>(name);
-				m_list->add_entry(entry);
-			}
-
-			if (m_list->m_items.empty())
-			{
-				m_list->set_cancel_only(true);
-			}
-			else if (m_list->get_cancel_only())
-			{
-				m_list->set_cancel_only(false);
-				m_list->select_entry(0);
-			}
-			else
-			{
-				// Only select an entry if there are entries available
-				s32 selected_index = 0;
-
-				// Try to select the previous selection
-				if (!previous_selection.empty())
-				{
-					for (s32 i = 0; i < ::narrow<s32>(m_entry_names.size()); i++)
-					{
-						if (m_entry_names[i] == previous_selection)
-						{
-							selected_index = i;
-							break;
-						}
-					}
-				}
-
-				m_list->select_entry(selected_index);
-			}
-		}
-
-		void sendmessage_dialog::callback_handler(rpcn::NotificationType ntype, const std::string& username, bool status)
-		{
-			std::lock_guard lock(m_mutex);
-
-			const auto add_friend = [&]()
-			{
-				if (std::any_of(m_entry_names.cbegin(), m_entry_names.cend(), [&username](const std::string& entry){ return entry == username; }))
-					return;
-
-				const std::string current_selection = get_current_selection();
-				m_entry_names.push_back(username);
-				reload(current_selection);
-			};
-
-			const auto remove_friend = [&]()
-			{
-				const auto it = std::find(m_entry_names.cbegin(), m_entry_names.cend(), username);
-				if (it == m_entry_names.cend())
-					return;
-
-				const std::string current_selection = get_current_selection();
-				m_entry_names.erase(it);
-				reload(current_selection);
-			};
-
-			switch (ntype)
-			{
-			case rpcn::NotificationType::FriendQuery: // Other user sent a friend request
-			case rpcn::NotificationType::FriendPresenceChanged:
-				break;
-			case rpcn::NotificationType::FriendNew: // Add a friend to the friendlist(either accepted a friend request or friend accepted it)
-			{
-				if (status)
-				{
-					add_friend();
-				}
-				break;
-			}
-			case rpcn::NotificationType::FriendLost: // Remove friend from the friendlist(user removed friend or friend removed friend)
-			{
-				remove_friend();
-				break;
-			}
-			case rpcn::NotificationType::FriendStatus: // Set status of friend to Offline or Online
-			{
-				if (status)
-				{
-					add_friend();
-				}
-				else
-				{
-					remove_friend();
-				}
-				break;
-			}
-			default:
-			{
-				rsx_log.fatal("An unhandled notification type was received by the sendmessage dialog callback!");
-				break;
-			}
-			}
-		}
-	} // namespace overlays
-} // namespace RSX
diff --git a/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.h b/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.h
deleted file mode 100644
index 508d296fc4..0000000000
--- a/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#include "../overlays.h"
-#include "../overlay_list_view.hpp"
-#include "Emu/Cell/ErrorCodes.h"
-#include "Emu/Cell/Modules/sceNp.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		struct sendmessage_dialog : public user_interface, public SendMessageDialogBase
-		{
-		private:
-			struct list_entry : horizontal_layout
-			{
-			public:
-				list_entry(const std::string& msg);
-			};
-
-			shared_mutex m_mutex;
-			std::vector<std::string> m_entry_names;
-			std::unique_ptr<overlay_element> m_dim_background;
-			std::unique_ptr<list_view> m_list;
-			std::unique_ptr<label> m_description;
-			atomic_t<bool> m_open_confirmation_dialog = false;
-			atomic_t<bool> m_confirmation_dialog_open = false;
-
-			animation_color_interpolate fade_animation;
-
-			std::string get_current_selection() const;
-			void reload(const std::string& previous_selection);
-
-		public:
-			sendmessage_dialog();
-
-			void update(u64 timestamp_us) override;
-			void on_button_pressed(pad_button button_press, bool is_auto_repeat) override;
-
-			compiled_resource get_compiled() override;
-
-			error_code Exec(message_data& msg_data, std::set<std::string>& npids) override;
-			void callback_handler(rpcn::NotificationType ntype, const std::string& username, bool status) override;
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.cpp b/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.cpp
index d6a9f74f6b..ff9e35369a 100644
--- a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.cpp
@@ -16,18 +16,11 @@ namespace rsx
 			dlg->type.bg_invisible = true;
 			dlg->type.progress_bar_count = 2;
 			dlg->ProgressBarSetTaskbarIndex(-1); // -1 to combine all progressbars in the taskbar progress
-			dlg->on_close = [](s32 /*status*/)
-			{
-				Emu.CallFromMainThread([]()
-				{
-					rsx_log.notice("Aborted shader loading dialog");
-					Emu.Kill(false);
-				});
-			};
+			dlg->on_close = [](s32 /*status*/) { Emu.CallAfter([]() { Emu.Stop(); }); };
 
 			ref_cnt++;
 
-			Emu.CallFromMainThread([&]()
+			Emu.CallAfter([&]()
 			{
 				dlg->Create(msg, title);
 				ref_cnt--;
@@ -40,7 +33,7 @@ namespace rsx
 		}
 	}
 
-	void shader_loading_dialog::update_msg(u32 index, std::string msg)
+	void shader_loading_dialog::update_msg(u32 index, const std::string& msg)
 	{
 		if (!dlg)
 		{
@@ -49,9 +42,9 @@ namespace rsx
 
 		ref_cnt++;
 
-		Emu.CallFromMainThread([&, index, message = std::move(msg)]()
+		Emu.CallAfter([&, index, msg]()
 		{
-			dlg->ProgressBarSetMsg(index, message);
+			dlg->ProgressBarSetMsg(index, msg);
 			ref_cnt--;
 		});
 	}
@@ -65,7 +58,7 @@ namespace rsx
 
 		ref_cnt++;
 
-		Emu.CallFromMainThread([&, index, value]()
+		Emu.CallAfter([&, index, value]()
 		{
 			dlg->ProgressBarInc(index, value);
 			ref_cnt--;
@@ -81,7 +74,7 @@ namespace rsx
 
 		ref_cnt++;
 
-		Emu.CallFromMainThread([&, index, value]()
+		Emu.CallAfter([&, index, value]()
 		{
 			dlg->ProgressBarSetValue(index, value);
 			ref_cnt--;
@@ -97,7 +90,7 @@ namespace rsx
 
 		ref_cnt++;
 
-		Emu.CallFromMainThread([&, index, limit]()
+		Emu.CallAfter([&, index, limit]()
 		{
 			dlg->ProgressBarSetLimit(index, limit);
 			ref_cnt--;
diff --git a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.h b/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.h
index ae95b4bda8..7d141c49d2 100644
--- a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.h
+++ b/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.h
@@ -11,7 +11,7 @@ namespace rsx
 
 		virtual ~shader_loading_dialog() = default;
 		virtual void create(const std::string& msg, const std::string& title);
-		virtual void update_msg(u32 index, std::string msg);
+		virtual void update_msg(u32 index, const std::string& msg);
 		virtual void inc_value(u32 index, u32 value);
 		virtual void set_value(u32 index, u32 value);
 		virtual void set_limit(u32 index, u32 limit);
diff --git a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp b/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp
index d3e522df2d..78f2952ffd 100644
--- a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp
+++ b/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp
@@ -1,9 +1,7 @@
 #include "stdafx.h"
 #include "shader_loading_dialog_native.h"
-#include "../overlay_manager.h"
 #include "../overlay_message_dialog.h"
 #include "../../GSRender.h"
-#include "Emu/System.h"
 #include "Emu/Cell/ErrorCodes.h"
 
 namespace rsx
@@ -16,25 +14,21 @@ namespace rsx
 	void shader_loading_dialog_native::create(const std::string& msg, const std::string&/* title*/)
 	{
 		MsgDialogType type = {};
-		type.se_mute_on     = true;
 		type.disable_cancel = true;
 		type.progress_bar_count = 2;
 
 		dlg = g_fxo->get<rsx::overlays::display_manager>().create<rsx::overlays::message_dialog>(true);
 		dlg->progress_bar_set_taskbar_index(-1);
-		dlg->show(false, msg, type, msg_dialog_source::shader_loading, [](s32 status)
+		dlg->show(false, msg, type, [](s32 status)
 		{
 			if (status != CELL_OK)
-			{
-				rsx_log.notice("Aborted shader loading dialog");
-				Emu.Kill(false);
-			}
+				Emu.Stop();
 		});
 	}
 
-	void shader_loading_dialog_native::update_msg(u32 index, std::string msg)
+	void shader_loading_dialog_native::update_msg(u32 index, const std::string& msg)
 	{
-		dlg->progress_bar_set_message(index, std::move(msg));
+		dlg->progress_bar_set_message(index, msg);
 		owner->flip({});
 	}
 
diff --git a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.h b/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.h
index 0d73324562..08ad43bfcf 100644
--- a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.h
+++ b/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.h
@@ -21,7 +21,7 @@ namespace rsx
 		shader_loading_dialog_native(GSRender* ptr);
 
 		void create(const std::string& msg, const std::string&/* title*/) override;
-		void update_msg(u32 index, std::string msg) override;
+		void update_msg(u32 index, const std::string& msg) override;
 		void inc_value(u32 index, u32 value) override;
 		void set_value(u32 index, u32 value) override;
 		void set_limit(u32 index, u32 limit) override;
diff --git a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp
deleted file mode 100644
index 13db1dff1e..0000000000
--- a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp
+++ /dev/null
@@ -1,428 +0,0 @@
-#include "stdafx.h"
-#include "../overlay_manager.h"
-#include "overlay_trophy_list_dialog.h"
-#include "Emu/Cell/Modules/sceNpTrophy.h"
-#include "Emu/System.h"
-#include "Emu/VFS.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		static constexpr u16 trophy_list_y = 85;
-		static constexpr u16 trophy_list_h = 540;
-
-		struct trophy_list_entry : horizontal_layout
-		{
-		private:
-			std::unique_ptr<image_info> icon_data;
-
-		public:
-			trophy_list_entry(const SceNpTrophyDetails& details, const std::string& icon_path, bool locked, bool platinum_relevant);
-			s32 trophy_id = 0;
-		};
-
-		trophy_list_entry::trophy_list_entry(const SceNpTrophyDetails& details, const std::string& icon_path, bool locked, bool platinum_relevant)
-			: trophy_id(details.trophyId)
-		{
-			std::unique_ptr<overlay_element> image = std::make_unique<image_view>();
-			image->set_size(160, 110);
-			image->set_padding(36, 36, 11, 11); // Square image, 88x88
-
-			if (fs::exists(icon_path))
-			{
-				icon_data = std::make_unique<image_info>(icon_path, locked);
-				static_cast<image_view*>(image.get())->set_raw_image(icon_data.get());
-			}
-			else
-			{
-				// Fallback
-				// TODO: use proper icon
-				static_cast<image_view*>(image.get())->set_image_resource(resource_config::standard_image_resource::square);
-			}
-
-			std::string trophy_type;
-			switch (details.trophyGrade)
-			{
-			case SCE_NP_TROPHY_GRADE_BRONZE:   trophy_type = get_localized_string(localized_string_id::HOME_MENU_TROPHY_GRADE_BRONZE); break;
-			case SCE_NP_TROPHY_GRADE_SILVER:   trophy_type = get_localized_string(localized_string_id::HOME_MENU_TROPHY_GRADE_SILVER); break;
-			case SCE_NP_TROPHY_GRADE_GOLD:     trophy_type = get_localized_string(localized_string_id::HOME_MENU_TROPHY_GRADE_GOLD); break;
-			case SCE_NP_TROPHY_GRADE_PLATINUM: trophy_type = get_localized_string(localized_string_id::HOME_MENU_TROPHY_GRADE_PLATINUM); break;
-			default: trophy_type = "?"; break;
-			}
-
-			std::unique_ptr<overlay_element> text_stack  = std::make_unique<vertical_layout>();
-			std::unique_ptr<overlay_element> padding     = std::make_unique<spacer>();
-			std::unique_ptr<overlay_element> header_text = std::make_unique<label>(fmt::format("%s (%s%s)", locked ? get_localized_string(localized_string_id::HOME_MENU_TROPHY_LOCKED_TITLE, details.name) : details.name, trophy_type, platinum_relevant ? " - " + get_localized_string(localized_string_id::HOME_MENU_TROPHY_PLATINUM_RELEVANT) : ""));
-			std::unique_ptr<overlay_element> subtext     = std::make_unique<label>(details.description);
-
-			padding->set_size(1, 1);
-			header_text->set_size(800, 40);
-			header_text->set_font("Arial", 16);
-			header_text->set_wrap_text(true);
-
-			subtext->set_size(800, 0);
-			subtext->set_font("Arial", 14);
-			subtext->set_wrap_text(true);
-			static_cast<label*>(subtext.get())->auto_resize(true);
-
-			// Make back color transparent for text
-			header_text->back_color.a = 0.f;
-			subtext->back_color.a     = 0.f;
-
-			static_cast<vertical_layout*>(text_stack.get())->pack_padding = 5;
-			static_cast<vertical_layout*>(text_stack.get())->add_element(padding);
-			static_cast<vertical_layout*>(text_stack.get())->add_element(header_text);
-			static_cast<vertical_layout*>(text_stack.get())->add_element(subtext);
-
-			if (text_stack->h > image->h)
-			{
-				std::unique_ptr<overlay_element> padding2 = std::make_unique<spacer>();
-				padding2->set_size(1, 5);
-				static_cast<vertical_layout*>(text_stack.get())->add_element(padding2);
-			}
-
-			// Pack
-			this->pack_padding = 15;
-			add_element(image);
-			add_element(text_stack);
-		}
-
-		trophy_list_dialog::trophy_list_dialog()
-		{
-			m_allow_input_on_pause = true;
-
-			m_dim_background = std::make_unique<overlay_element>();
-			m_dim_background->set_size(virtual_width, virtual_height);
-			m_dim_background->back_color.a = 0.9f;
-
-			m_description = std::make_unique<label>();
-			m_description->set_font("Arial", 20);
-			m_description->set_pos(20, 37);
-			m_description->set_text("Select trophy"); // Fallback. I don't think this will ever be used, so I won't localize it.
-			m_description->auto_resize();
-			m_description->back_color.a = 0.f;
-
-			m_show_hidden_trophies_button = std::make_unique<image_button>();
-			m_show_hidden_trophies_button->set_text(m_show_hidden_trophies ? localized_string_id::HOME_MENU_TROPHY_HIDE_HIDDEN_TROPHIES : localized_string_id::HOME_MENU_TROPHY_SHOW_HIDDEN_TROPHIES);
-			m_show_hidden_trophies_button->set_image_resource(resource_config::standard_image_resource::square);
-			m_show_hidden_trophies_button->set_size(120, 30);
-			m_show_hidden_trophies_button->set_pos(180, trophy_list_y + trophy_list_h + 20);
-			m_show_hidden_trophies_button->set_font("Arial", 16);
-
-			fade_animation.duration_sec = 0.15f;
-
-			return_code = selection_code::canceled;
-		}
-
-		void trophy_list_dialog::update(u64 timestamp_us)
-		{
-			if (fade_animation.active)
-			{
-				fade_animation.update(timestamp_us);
-			}
-		}
-
-		void trophy_list_dialog::on_button_pressed(pad_button button_press, bool is_auto_repeat)
-		{
-			if (fade_animation.active) return;
-
-			bool close_dialog = false;
-
-			switch (button_press)
-			{
-			case pad_button::circle:
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cancel.wav");
-				close_dialog = true;
-				break;
-			case pad_button::square:
-				m_show_hidden_trophies = !m_show_hidden_trophies;
-				m_list_dirty = true;
-				break;
-			case pad_button::dpad_up:
-			case pad_button::ls_up:
-				m_list->select_previous();
-				break;
-			case pad_button::dpad_down:
-			case pad_button::ls_down:
-				m_list->select_next();
-				break;
-			case pad_button::L1:
-				m_list->select_previous(10);
-				break;
-			case pad_button::R1:
-				m_list->select_next(10);
-				break;
-			default:
-				rsx_log.trace("[ui] Button %d pressed", static_cast<u8>(button_press));
-				break;
-			}
-
-			if (close_dialog)
-			{
-				fade_animation.current = color4f(1.f);
-				fade_animation.end = color4f(0.f);
-				fade_animation.active = true;
-
-				fade_animation.on_finish = [this]
-				{
-					close(true, true);
-				};
-			}
-			// Play a sound unless this is a fast auto repeat which would induce a nasty noise
-			else if (!is_auto_repeat || m_auto_repeat_ms_interval >= m_auto_repeat_ms_interval_default)
-			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cursor.wav");
-			}
-		}
-
-		compiled_resource trophy_list_dialog::get_compiled()
-		{
-			if (!visible)
-			{
-				return {};
-			}
-
-			if (m_show_hidden_trophies_last != m_show_hidden_trophies)
-			{
-				m_show_hidden_trophies_button->set_text(m_show_hidden_trophies ? localized_string_id::HOME_MENU_TROPHY_HIDE_HIDDEN_TROPHIES : localized_string_id::HOME_MENU_TROPHY_SHOW_HIDDEN_TROPHIES);
-				m_show_hidden_trophies_last = m_show_hidden_trophies;
-			}
-
-			compiled_resource result;
-			result.add(m_dim_background->get_compiled());
-			if (m_list_dirty.exchange(false))
-			{
-				reload();
-			}
-			if (m_list)
-			{
-				result.add(m_list->get_compiled());
-			}
-			result.add(m_description->get_compiled());
-			result.add(m_show_hidden_trophies_button->get_compiled());
-
-			fade_animation.apply(result);
-
-			return result;
-		}
-
-		void trophy_list_dialog::show(const std::string& trop_name)
-		{
-			visible = false;
-			
-			m_trophy_data = load_trophies(trop_name);
-			ensure(m_trophy_data && m_trophy_data->trop_usr);
-
-			fade_animation.current = color4f(0.f);
-			fade_animation.end = color4f(1.f);
-			fade_animation.active = true;
-
-			visible = true;
-
-			const auto notify = std::make_shared<atomic_t<u32>>(0);
-			auto& overlayman = g_fxo->get<display_manager>();
-
-			overlayman.attach_thread_input(
-				uid, "Trophy list dialog",
-				[notify]() { *notify = true; notify->notify_one(); }
-			);
-
-			while (!Emu.IsStopped() && !*notify)
-			{
-				notify->wait(0, atomic_wait_timeout{1'000'000});
-			}
-		}
-
-		std::unique_ptr<trophy_data> trophy_list_dialog::load_trophies(const std::string& trop_name) const
-		{
-			// Populate GameTrophiesData
-			std::unique_ptr<trophy_data> game_trophy_data = std::make_unique<trophy_data>();
-			game_trophy_data->trop_usr = std::make_unique<TROPUSRLoader>();
-
-			const std::string trophy_path = "/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + trop_name;
-			const std::string vfs_path = vfs::get(trophy_path + "/");
-
-			if (vfs_path.empty())
-			{
-				rsx_log.error("Failed to load trophy database for %s. Path empty!", trop_name);
-				return game_trophy_data;
-			}
-
-			game_trophy_data->path = vfs_path;
-			const std::string tropusr_path = trophy_path + "/TROPUSR.DAT";
-			const std::string tropconf_path = trophy_path + "/TROPCONF.SFM";
-			const bool success = game_trophy_data->trop_usr->Load(tropusr_path, tropconf_path).success;
-
-			fs::file config(vfs::get(tropconf_path));
-
-			if (!success || !config)
-			{
-				rsx_log.error("Failed to load trophy database for %s", trop_name);
-				return game_trophy_data;
-			}
-
-			const u32 trophy_count = game_trophy_data->trop_usr->GetTrophiesCount();
-
-			if (trophy_count == 0)
-			{
-				rsx_log.error("Warning game %s in trophy folder %s usr file reports zero trophies. Cannot load in trophy manager.", game_trophy_data->game_name, game_trophy_data->path);
-				return game_trophy_data;
-			}
-
-			for (u32 trophy_id = 0; trophy_id < trophy_count; ++trophy_id)
-			{
-				// A trophy icon has 3 digits from 000 to 999, for example TROP001.PNG
-				game_trophy_data->trophy_image_paths[trophy_id] = fmt::format("%sTROP%03d.PNG", game_trophy_data->path, trophy_id);
-			}
-
-			// Get game name
-			pugi::xml_parse_result res = game_trophy_data->trop_config.Read(config.to_string());
-			if (!res)
-			{
-				rsx_log.error("Failed to read trophy xml: %s", tropconf_path);
-				return game_trophy_data;
-			}
-
-			std::shared_ptr<rXmlNode> trophy_base = game_trophy_data->trop_config.GetRoot();
-			if (!trophy_base)
-			{
-				rsx_log.error("Failed to read trophy xml (root is null): %s", tropconf_path);
-				return game_trophy_data;
-			}
-
-			for (std::shared_ptr<rXmlNode> n = trophy_base->GetChildren(); n; n = n->GetNext())
-			{
-				if (n->GetName() == "title-name")
-				{
-					game_trophy_data->game_name = n->GetNodeContent();
-					break;
-				}
-			}
-
-			config.release();
-
-			return game_trophy_data;
-		}
-
-		void trophy_list_dialog::reload()
-		{
-			ensure(m_trophy_data);
-
-			rsx_log.trace("Reloading Trophy List Overlay with %s %s", m_trophy_data->game_name, m_trophy_data->path);
-
-			std::string selected_trophy;
-			s32 selected_index = 0;
-			const overlay_element* old_trophy = m_list ? m_list->get_selected_entry() : nullptr;
-			const s32 old_trophy_id = old_trophy ? static_cast<const trophy_list_entry*>(old_trophy)->trophy_id : 0;
-
-			std::vector<std::unique_ptr<overlay_element>> entries;
-
-			const int all_trophies = m_trophy_data->trop_usr->GetTrophiesCount();
-			const int unlocked_trophies = m_trophy_data->trop_usr->GetUnlockedTrophiesCount();
-			const int percentage = (all_trophies > 0) ? (100 * unlocked_trophies / all_trophies) : 0;
-
-			std::shared_ptr<rXmlNode> trophy_base = m_trophy_data->trop_config.GetRoot();
-			if (!trophy_base)
-			{
-				rsx_log.error("Populating Trophy List Overlay failed (root is null): %s %s", m_trophy_data->game_name, m_trophy_data->path);
-			}
-
-			const std::string hidden_title = get_localized_string(localized_string_id::HOME_MENU_TROPHY_HIDDEN_TITLE);
-			const std::string hidden_description = get_localized_string(localized_string_id::HOME_MENU_TROPHY_HIDDEN_DESCRIPTION);
-
-			for (std::shared_ptr<rXmlNode> n = trophy_base ? trophy_base->GetChildren() : nullptr; n; n = n->GetNext())
-			{
-				// Only show trophies.
-				if (n->GetName() != "trophy")
-				{
-					continue;
-				}
-
-				// Get data (stolen graciously from sceNpTrophy.cpp)
-				SceNpTrophyDetails details{};
-				details.trophyId = atoi(n->GetAttribute("id").c_str());
-				details.hidden = n->GetAttribute("hidden")[0] == 'y';
-
-				const bool unlocked = m_trophy_data->trop_usr->GetTrophyUnlockState(details.trophyId);
-				const bool hide_trophy = details.hidden && !unlocked && !m_show_hidden_trophies;
-
-				if (details.trophyId == old_trophy_id)
-				{
-					// Select this entry if the trophy is visible. Use the previous index otherwise.
-					const s32 index = static_cast<s32>(entries.size());
-					selected_index = hide_trophy ? std::max(0, index - 1) : index;
-				}
-
-				if (hide_trophy)
-				{
-					continue;
-				}
-
-				// Get platinum link id (we assume there only exists one platinum trophy per game for now)
-				const s32 platinum_link_id = atoi(n->GetAttribute("pid").c_str());
-				const bool platinum_relevant = platinum_link_id >= 0;
-
-				// Get trophy type
-				switch (n->GetAttribute("ttype")[0])
-				{
-				case 'B': details.trophyGrade = SCE_NP_TROPHY_GRADE_BRONZE; break;
-				case 'S': details.trophyGrade = SCE_NP_TROPHY_GRADE_SILVER; break;
-				case 'G': details.trophyGrade = SCE_NP_TROPHY_GRADE_GOLD; break;
-				case 'P': details.trophyGrade = SCE_NP_TROPHY_GRADE_PLATINUM; break;
-				default: rsx_log.warning("Unknown trophy grade %s", n->GetAttribute("ttype")); break;
-				}
-
-				// Get name and detail
-				if (details.hidden && !unlocked)
-				{
-					strcpy_trunc(details.name, hidden_title);
-					strcpy_trunc(details.description, hidden_description);
-				}
-				else
-				{
-					for (std::shared_ptr<rXmlNode> n2 = n->GetChildren(); n2; n2 = n2->GetNext())
-					{
-						const std::string name = n2->GetName();
-						if (name == "name")
-						{
-							strcpy_trunc(details.name, n2->GetNodeContent());
-						}
-						else if (name == "detail")
-						{
-							strcpy_trunc(details.description, n2->GetNodeContent());
-						}
-					}
-				}
-
-				const auto icon_path_it = m_trophy_data->trophy_image_paths.find(details.trophyId);
-
-				std::unique_ptr<overlay_element> entry = std::make_unique<trophy_list_entry>(details, icon_path_it != m_trophy_data->trophy_image_paths.cend() ? icon_path_it->second : "", !unlocked, platinum_relevant);
-				entries.emplace_back(std::move(entry));
-			}
-
-			// Recreate list
-			if (m_list)
-			{
-				status_flags |= status_bits::invalidate_image_cache;
-			}
-
-			m_list = std::make_unique<list_view>(virtual_width - 2 * 20, trophy_list_h);
-			m_list->set_pos(20, trophy_list_y);
-			m_list->set_cancel_only(true);
-
-			for (auto& entry : entries)
-			{
-				m_list->add_entry(entry);
-			}
-
-			if (!m_list->m_items.empty())
-			{
-				m_list->select_entry(selected_index);
-			}
-
-			m_description->set_text(get_localized_string(localized_string_id::HOME_MENU_TROPHY_LIST_TITLE, fmt::format("%d%% (%d/%d)", percentage, unlocked_trophies, all_trophies).c_str()));
-			m_description->auto_resize();
-		}
-	} // namespace overlays
-} // namespace RSX
diff --git a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h b/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h
deleted file mode 100644
index 62be384817..0000000000
--- a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-
-#include "../overlays.h"
-#include "../overlay_list_view.hpp"
-
-#include "Loader/TROPUSR.h"
-
-class TROPUSRLoader;
-
-namespace rsx
-{
-	namespace overlays
-	{
-		struct trophy_data
-		{
-			std::unique_ptr<TROPUSRLoader> trop_usr;
-			trophy_xml_document trop_config;
-			std::unordered_map<int, std::string> trophy_image_paths;
-			std::string game_name;
-			std::string path;
-		};
-
-		struct trophy_list_dialog : public user_interface
-		{
-		private:
-			std::unique_ptr<trophy_data> load_trophies(const std::string& trop_name) const;
-			void reload();
-
-			std::unique_ptr<overlay_element> m_dim_background;
-			std::unique_ptr<list_view> m_list;
-			std::unique_ptr<label> m_description;
-			std::unique_ptr<image_button> m_show_hidden_trophies_button;
-
-			animation_color_interpolate fade_animation;
-
-			std::unique_ptr<trophy_data> m_trophy_data;
-			atomic_t<bool> m_list_dirty { true };
-			bool m_show_hidden_trophies = false;
-			bool m_show_hidden_trophies_last = false;
-
-		public:
-			trophy_list_dialog();
-
-			void update(u64 timestamp_us) override;
-			void on_button_pressed(pad_button button_press, bool is_auto_repeat) override;
-
-			compiled_resource get_compiled() override;
-
-			void show(const std::string& trop_name);
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp b/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp
deleted file mode 100644
index 7361856976..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include "stdafx.h"
-#include "overlay_animated_icon.h"
-
-#include "Utilities/File.h"
-
-#include "Emu/Cell/timers.hpp"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		animated_icon::animated_icon(const char* icon_name)
-		{
-			const std::string image_path = fmt::format("%s/Icons/ui/%s", fs::get_config_dir(), icon_name);
-			m_icon = std::make_unique<image_info>(image_path);
-			set_raw_image(m_icon.get());
-		}
-
-		animated_icon::animated_icon(const std::vector<u8>& icon_data)
-		{
-			m_icon = std::make_unique<image_info>(icon_data);
-			set_raw_image(m_icon.get());
-		}
-
-		void animated_icon::update_animation_frame(compiled_resource& result)
-		{
-			if (m_last_update_timestamp_us == 0)
-			{
-				m_last_update_timestamp_us = get_system_time();
-			}
-			else
-			{
-				const auto now = get_system_time();
-				m_current_frame_duration_us += (now - m_last_update_timestamp_us);
-				m_last_update_timestamp_us = now;
-			}
-
-			if (m_current_frame_duration_us > m_frame_duration_us)
-			{
-				m_current_frame = (m_current_frame + 1) % m_total_frames;
-				m_current_frame_duration_us = 0;
-			}
-
-			// We only care about the uvs (zw) components
-			const float x = f32(m_frame_width + m_spacing_x) * (m_current_frame % m_row_length) + m_start_x;
-			const float y = f32(m_frame_height + m_spacing_y) * (m_current_frame / m_row_length) + m_start_y;
-
-			auto& cmd = result.draw_commands[0];
-			cmd.verts[0].z() = x / m_icon->w;
-			cmd.verts[0].w() = y / m_icon->h;
-			cmd.verts[1].z() = (x + m_frame_width) / m_icon->w;
-			cmd.verts[1].w() = y / m_icon->h;
-			cmd.verts[2].z() = x / m_icon->w;
-			cmd.verts[2].w() = ((y + m_frame_height) / m_icon->h);
-			cmd.verts[3].z() = (x + m_frame_width) / m_icon->w;
-			cmd.verts[3].w() = ((y + m_frame_height) / m_icon->h);
-		}
-
-		compiled_resource& animated_icon::get_compiled()
-		{
-			if (!is_compiled())
-			{
-				compiled_resources = image_view::get_compiled();
-			}
-
-			update_animation_frame(compiled_resources);
-			return compiled_resources;
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.h b/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.h
deleted file mode 100644
index b4a864d047..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include "Emu/RSX/Overlays/overlay_controls.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		class animated_icon : public image_view
-		{
-		public:
-			animated_icon(const char* icon_name);
-			animated_icon(const std::vector<u8>& icon_data);
-
-			void update_animation_frame(compiled_resource& result);
-			compiled_resource& get_compiled() override;
-
-		protected:
-			// Some layout and frame data
-			u16 m_start_x = 0; // X and Y offset of frame 0
-			u16 m_start_y = 0;
-			u16 m_frame_width = 32;  // W and H of each animation frame
-			u16 m_frame_height = 32;
-			u16 m_spacing_x = 8;     // Spacing between frames in X and Y
-			u16 m_spacing_y = 8;
-			u16 m_row_length = 12;   // Number of animation frames in the X direction in case of a 2D grid of frames
-			u16 m_total_frames = 12; // Total number of available frames
-			u64 m_frame_duration_us = 100'000; // Hold duration for each frame
-
-			// Animation playback variables
-			int m_current_frame = 0;
-			u64 m_current_frame_duration_us = 0;
-			u64 m_last_update_timestamp_us = 0;
-
-		private:
-			std::unique_ptr<image_info> m_icon;
-		};
-	}
-}
-
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animation.cpp b/rpcs3/Emu/RSX/Overlays/overlay_animation.cpp
index 0d5d8f3baa..d1055f433f 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_animation.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_animation.cpp
@@ -1,180 +1,147 @@
 #include "stdafx.h"
 #include "overlay_animation.h"
 #include "overlay_controls.h"
+#include "Emu/system_config.h"
 
 namespace rsx
 {
-	namespace overlays
-	{
-		void animation_base::begin_animation(u64 timestamp_us)
-		{
-			timestamp_start_us = timestamp_us;
-			timestamp_end_us = timestamp_us + get_total_duration_us();
-		}
+    namespace overlays
+    {
+        void animation_base::begin_animation(u64 frame)
+        {
+            frame_start = frame;
+            frame_end = u64(frame + duration * g_cfg.video.vblank_rate);
+        }
 
-		u64 animation_base::get_total_duration_us() const
-		{
-			return u64(duration_sec * 1'000'000.f);
-		}
+        f32 animation_base::get_progress_ratio(u64 frame) const
+        {
+            if (!frame_start)
+            {
+                return 0.f;
+            }
 
-		u64 animation_base::get_remaining_duration_us(u64 timestamp_us) const
-		{
-			return timestamp_us >= timestamp_end_us ? 0 : (timestamp_end_us - timestamp_us);
-		}
+            f32 t = f32(frame - frame_start) / (frame_end - frame_start);
 
-		f32 animation_base::get_progress_ratio(u64 timestamp_us) const
-		{
-			if (!timestamp_start_us)
-			{
-				return 0.f;
-			}
+            switch (type) {
+            case animation_type::linear:
+                break;
+            case animation_type::ease_in_quad:
+                t = t * t;
+                break;
+            case animation_type::ease_out_quad:
+                t = t * (2.0f - t);
+                break;
+            case animation_type::ease_in_out_cubic:
+                t = t > 0.5f ? 4.0f * std::pow((t - 1.0f), 3.0f) + 1.0f : 4.0f * std::pow(t, 3.0f);
+                break;
+            }
 
-			f32 t = f32(timestamp_us - timestamp_start_us) / (timestamp_end_us - timestamp_start_us);
+            return t;
+        }
 
-			switch (type) {
-			case animation_type::linear:
-				break;
-			case animation_type::ease_in_quad:
-				t = t * t;
-				break;
-			case animation_type::ease_out_quad:
-				t = t * (2.0f - t);
-				break;
-			case animation_type::ease_in_out_cubic:
-				t = t > 0.5f ? 4.0f * std::pow((t - 1.0f), 3.0f) + 1.0f : 4.0f * std::pow(t, 3.0f);
-				break;
-			}
+        void animation_translate::apply(compiled_resource& resource)
+        {
+            if (!active)
+            {
+                return;
+            }
 
-			return t;
-		}
+            const vertex delta = { current.x, current.y, current.z, 0.f };
+            for (auto& cmd : resource.draw_commands)
+            {
+                for (auto& v : cmd.verts)
+                {
+                    v += delta;
+                }
+            }
+        }
 
-		void animation_translate::reset(u64 start_timestamp_us)
-		{
-			active = false;
-			current = start;
-			timestamp_start_us = start_timestamp_us;
+        void animation_translate::update(u64 frame)
+        {
+            if (!active)
+            {
+                return;
+            }
 
-			if (timestamp_start_us > 0)
-			{
-				timestamp_end_us = timestamp_start_us + get_total_duration_us();
-			}
-		}
+            if (frame_start == 0)
+            {
+                start = current;
+                begin_animation(frame);
+                return;
+            }
 
-		void animation_translate::apply(compiled_resource& resource)
-		{
-			if (!active)
-			{
-				return;
-			}
+            if (frame >= frame_end)
+            {
+                // Exit condition
+                finish();
+                return;
+            }
 
-			const vertex delta = { current.x, current.y, current.z, 0.f };
-			for (auto& cmd : resource.draw_commands)
-			{
-				for (auto& v : cmd.verts)
-				{
-					v += delta;
-				}
-			}
-		}
+            f32 t = get_progress_ratio(frame);
+            current = lerp(start, end, t);
+        }
 
-		void animation_translate::update(u64 timestamp_us)
-		{
-			if (!active)
-			{
-				return;
-			}
+        void animation_translate::finish()
+        {
+            active = false;
+            frame_start = 0;
+            frame_end = 0;
+            current = end; // Snap current to limit in case we went over
 
-			if (timestamp_start_us == 0)
-			{
-				start = current;
-				begin_animation(timestamp_us);
-				return;
-			}
+            if (on_finish)
+            {
+                on_finish();
+            }
+        }
 
-			if (timestamp_us >= timestamp_end_us)
-			{
-				// Exit condition
-				finish();
-				return;
-			}
+        void animation_color_interpolate::apply(compiled_resource& data)
+        {
+            if (!active)
+            {
+                return;
+            }
 
-			f32 t = get_progress_ratio(timestamp_us);
-			current = lerp(start, end, t);
-		}
+            for (auto& cmd : data.draw_commands)
+            {
+                cmd.config.color *= current;
+            }
+        }
 
-		void animation_translate::finish()
-		{
-			active = false;
-			timestamp_start_us = 0;
-			timestamp_end_us = 0;
-			current = end; // Snap current to limit in case we went over
+        void animation_color_interpolate::update(u64 frame)
+        {
+            if (!active)
+            {
+                return;
+            }
 
-			if (on_finish)
-			{
-				on_finish();
-			}
-		}
+            if (frame_start == 0)
+            {
+                start = current;
+                begin_animation(frame);
+                return;
+            }
 
-		void animation_color_interpolate::reset(u64 start_timestamp_us)
-		{
-			active = false;
-			current = start;
-			timestamp_start_us = start_timestamp_us;
+            if (frame >= frame_end)
+            {
+                finish();
+                return;
+            }
 
-			if (timestamp_start_us > 0)
-			{
-				timestamp_end_us = timestamp_start_us + get_total_duration_us();
-			}
-		}
+            f32 t = get_progress_ratio(frame);
+            current = lerp(start, end, t);
+        }
 
-		void animation_color_interpolate::apply(compiled_resource& data)
-		{
-			if (!active)
-			{
-				return;
-			}
+        void animation_color_interpolate::finish()
+        {
+            active = false;
+            frame_start = 0;
+            frame_end = 0;
+            current = end;
 
-			for (auto& cmd : data.draw_commands)
-			{
-				cmd.config.color *= current;
-			}
-		}
-
-		void animation_color_interpolate::update(u64 timestamp_us)
-		{
-			if (!active)
-			{
-				return;
-			}
-
-			if (timestamp_start_us == 0)
-			{
-				start = current;
-				begin_animation(timestamp_us);
-				return;
-			}
-
-			if (timestamp_us >= timestamp_end_us)
-			{
-				finish();
-				return;
-			}
-
-			f32 t = get_progress_ratio(timestamp_us);
-			current = lerp(start, end, t);
-		}
-
-		void animation_color_interpolate::finish()
-		{
-			active = false;
-			timestamp_start_us = 0;
-			timestamp_end_us = 0;
-			current = end;
-
-			if (on_finish)
-			{
-				on_finish();
-			}
-		}
-	};
+            if (on_finish)
+            {
+                on_finish();
+            }
+        }
+    };
 }
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animation.h b/rpcs3/Emu/RSX/Overlays/overlay_animation.h
index d8c3b67eac..7f3b541e31 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_animation.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_animation.h
@@ -8,77 +8,71 @@
 
 namespace rsx
 {
-	namespace overlays
-	{
-		struct compiled_resource;
+    namespace overlays
+    {
+        struct compiled_resource;
 
-		enum class animation_type
-		{
-			linear,
-			ease_in_quad,
-			ease_out_quad,
-			ease_in_out_cubic,
-		};
+        enum class animation_type
+        {
+            linear,
+            ease_in_quad,
+            ease_out_quad,
+            ease_in_out_cubic,
+        };
 
-		struct animation_base
-		{
-		protected:
-			u64 timestamp_start_us = 0;
-			u64 timestamp_end_us = 0;
+        struct animation_base
+        {
+        protected:
+            u64 frame_start = 0;
+            u64 frame_end = 0;
 
-			void begin_animation(u64 timestamp_us);
-			f32 get_progress_ratio(u64 timestamp_us) const;
+            void begin_animation(u64 frame);
+            f32 get_progress_ratio(u64 frame) const;
 
-			template<typename T>
-			static T lerp(const T& a, const T& b, f32 t)
-			{
-				return (a * (1.f - t)) + (b * t);
-			}
+            template<typename T>
+            static T lerp(const T& a, const T& b, f32 t)
+            {
+                return (a * (1.f - t)) + (b * t);
+            }
 
-		public:
-			bool active = false;
-			animation_type type { animation_type::linear };
-			f32 duration_sec = 1.f; // in seconds
+        public:
+            bool active = false;
+            animation_type type { animation_type::linear };
+            f32 duration = 1.f; // in seconds
 
-			std::function<void()> on_finish;
+            std::function<void()> on_finish;
 
-			u64 get_total_duration_us() const;
-			u64 get_remaining_duration_us(u64 timestamp_us) const;
+            virtual void apply(compiled_resource&) = 0;
+            virtual void update(u64 frame) = 0;
+        };
 
-			virtual void apply(compiled_resource&) = 0;
-			virtual void reset(u64 start_timestamp_us) = 0;
-			virtual void update(u64 timestamp_us) = 0;
-		};
+        struct animation_translate : animation_base
+        {
+        private:
+            vector3f start{}; // Set `current` instead of this
+                              // NOTE: Necessary because update() is called after rendering,
+                              //       resulting in one frame of incorrect translation
+        public:
+            vector3f current{};
+            vector3f end{};
 
-		struct animation_translate : animation_base
-		{
-		private:
-			vector3f start{}; // Set `current` instead of this
-			                  // NOTE: Necessary because update() is called after rendering,
-			                  //       resulting in one frame of incorrect translation
-		public:
-			vector3f current{};
-			vector3f end{};
+            void apply(compiled_resource& data) override;
+            void update(u64 frame) override;
+            void finish();
+        };
 
-			void apply(compiled_resource& data) override;
-			void reset(u64 start_timestamp_us = 0) override;
-			void update(u64 timestamp_us) override;
-			void finish();
-		};
+        struct animation_color_interpolate : animation_translate
+        {
+        private:
+            color4f start{};
 
-		struct animation_color_interpolate : animation_translate
-		{
-		private:
-			color4f start{};
+        public:
+            color4f current{};
+            color4f end{};
 
-		public:
-			color4f current{};
-			color4f end{};
-
-			void apply(compiled_resource& data) override;
-			void reset(u64 start_timestamp_us = 0) override;
-			void update(u64 timestamp_us) override;
-			void finish();
-		};
-	}
+            void apply(compiled_resource& data) override;
+            void update(u64 frame) override;
+            void finish();
+        };
+    }
 }
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.cpp b/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.cpp
deleted file mode 100644
index 434226bfa5..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "stdafx.h"
-#include "overlay_message.h"
-#include "overlay_loading_icon.hpp"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		static std::shared_ptr<loading_icon24> s_shader_loading_icon24;
-		static std::shared_ptr<loading_icon24> s_ppu_loading_icon24;
-
-		void show_shader_compile_notification()
-		{
-			if (!s_shader_loading_icon24)
-			{
-				// Creating the icon requires FS read, so it is important to cache it
-				s_shader_loading_icon24 = std::make_shared<loading_icon24>();
-			}
-
-			queue_message(
-				localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS,
-				5'000'000,
-				{},
-				message_pin_location::bottom_left,
-				s_shader_loading_icon24,
-				true);
-		}
-
-		std::shared_ptr<atomic_t<u32>> show_ppu_compile_notification()
-		{
-			if (!s_ppu_loading_icon24)
-			{
-				// Creating the icon requires FS read, so it is important to cache it
-				s_ppu_loading_icon24 = std::make_shared<loading_icon24>();
-			}
-
-			std::shared_ptr<atomic_t<u32>> refs = std::make_shared<atomic_t<u32>>(1);
-
-			queue_message(
-				localized_string_id::RSX_OVERLAYS_COMPILING_PPU_MODULES,
-				20'000'000,
-				refs,
-				message_pin_location::bottom_left,
-				s_ppu_loading_icon24,
-				true);
-
-			return refs;
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.h b/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.h
deleted file mode 100644
index 026770b7a4..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-#include "util/atomic.hpp"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		void show_shader_compile_notification();
-		std::shared_ptr<atomic_t<u32>> show_ppu_compile_notification();
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp
index 23e7fccb55..f60e37db33 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp
@@ -5,7 +5,6 @@
 #include "util/logs.hpp"
 #include "Utilities/geometry.h"
 #include "Utilities/File.h"
-#include "Emu/Cell/timers.hpp"
 
 #ifndef _WIN32
 #include <unistd.h>
@@ -26,138 +25,71 @@ namespace rsx
 {
 	namespace overlays
 	{
-		static std::vector<vertex> generate_unit_quadrant(int num_patch_points, const float offset[2], const float scale[2])
+		image_info::image_info(const char* filename)
 		{
-			ensure(num_patch_points >= 3);
-			std::vector<vertex> result(num_patch_points + 1);
-
-			// Set root vertex
-			result[0].vec2(offset[0], offset[1]);
-
-			// Set the 0th and Nth outer vertices which lie flush with the axes
-			result[1].vec2(offset[0] + scale[0], offset[1]);
-			result[num_patch_points].vec2(offset[0], offset[1] + scale[1]);
-
-			constexpr float degrees_to_radians = 0.0174533f;
-			for (int i = 1; i < num_patch_points - 1; i++)
+			if (!fs::is_file(filename))
 			{
-				// If we keep a unit circle, 2 of the 4 components of the rotation matrix become 0
-				// We end up with a simple vec2(cos_theta, sin_theta) as the output
-				// The final scaling and translation can then be done with fmad
-				const auto angle = degrees_to_radians * ((i * 90) / (num_patch_points - 1));
-				result[i + 1].vec2(
-					std::fmaf(std::cos(angle), scale[0], offset[0]),
-					std::fmaf(std::sin(angle), scale[1], offset[1])
-				);
-			}
-
-			return result;
-		}
-
-		image_info::image_info(const std::string& filename, bool grayscaled)
-		{
-			fs::file f(filename, fs::read + fs::isfile);
-
-			if (!f)
-			{
-				rsx_log.error("Image resource file `%s' could not be opened (%s)", filename, fs::g_tls_error);
+				rsx_log.error("Image resource file `%s' not found", filename);
 				return;
 			}
 
-			const std::vector<u8> bytes = f.to_vector<u8>();
-			load_data(bytes, grayscaled);
+			std::vector<u8> bytes;
+			fs::file f(filename);
+			f.read(bytes, f.size());
+			data = stbi_load_from_memory(bytes.data(), ::narrow<int>(f.size()), &w, &h, &bpp, STBI_rgb_alpha);
 		}
 
-		image_info::image_info(const std::vector<u8>& bytes, bool grayscaled)
+		image_info::image_info(const std::vector<u8>& bytes)
 		{
-			load_data(bytes, grayscaled);
+			data = stbi_load_from_memory(bytes.data(), ::narrow<int>(bytes.size()), &w, &h, &bpp, STBI_rgb_alpha);
 		}
 
 		image_info::~image_info()
 		{
-			if (data) stbi_image_free(data);
-		}
-
-		void image_info::load_data(const std::vector<u8>& bytes, bool grayscaled)
-		{
-			data = stbi_load_from_memory(bytes.data(), ::narrow<int>(bytes.size()), &w, &h, &bpp, grayscaled ? STBI_grey_alpha : STBI_rgb_alpha);
-			channels = grayscaled ? 2 : 4;
-
-			if (data && grayscaled)
-			{
-				data_grey.resize(4 * w * h);
-
-				for (usz i = 0, n = 0; i < data_grey.size(); i += 4, n += 2)
-				{
-					const u8 grey = data[n];
-					const u8 alpha = data[n + 1];
-
-					data_grey[i + 0] = grey;
-					data_grey[i + 1] = grey;
-					data_grey[i + 2] = grey;
-					data_grey[i + 3] = alpha;
-				}
-			}
-			else
-			{
-				data_grey.clear();
-			}
+			stbi_image_free(data);
+			data = nullptr;
+			w = h = bpp = 0;
 		}
 
 		resource_config::resource_config()
 		{
+			texture_resource_files.emplace_back("fade_top.png");
+			texture_resource_files.emplace_back("fade_bottom.png");
+			texture_resource_files.emplace_back("select.png");
+			texture_resource_files.emplace_back("start.png");
+			texture_resource_files.emplace_back("cross.png");
+			texture_resource_files.emplace_back("circle.png");
+			texture_resource_files.emplace_back("triangle.png");
+			texture_resource_files.emplace_back("square.png");
+			texture_resource_files.emplace_back("L1.png");
+			texture_resource_files.emplace_back("R1.png");
+			texture_resource_files.emplace_back("L2.png");
+			texture_resource_files.emplace_back("R2.png");
+			texture_resource_files.emplace_back("save.png");
+			texture_resource_files.emplace_back("new.png");
 		}
 
 		void resource_config::load_files()
 		{
-			const std::array<std::string, 15> texture_resource_files
-			{
-				"fade_top.png",
-				"fade_bottom.png",
-				"select.png",
-				"start.png",
-				"cross.png",
-				"circle.png",
-				"triangle.png",
-				"square.png",
-				"L1.png",
-				"R1.png",
-				"L2.png",
-				"R2.png",
-				"save.png",
-				"new.png",
-				"spinner-24.png"
-			};
-			for (const std::string& res : texture_resource_files)
+			for (const auto &res : texture_resource_files)
 			{
 				// First check the global config dir
-				const std::string image_path = fs::get_config_dir() + "Icons/ui/" + res;
-				auto info = std::make_unique<image_info>(image_path);
+				auto info = std::make_unique<image_info>((fs::get_config_dir() + "Icons/ui/" + res).c_str());
 
-#if !defined(_WIN32) && !defined(__APPLE__) && defined(DATADIR)
-				// Check the DATADIR if defined
-				if (info->get_data() == nullptr)
+				if (info->data == nullptr)
 				{
-					const std::string data_dir (DATADIR);
-					const std::string image_data = data_dir + "/Icons/ui/" + res;
-					info = std::make_unique<image_info>(image_data);
-				}
-#endif
-
-				if (info->get_data() == nullptr)
-				{
-					// Resource was not found in the DATADIR or config dir, try and grab from relative path (linux)
-					std::string src = "Icons/ui/" + res;
-					info = std::make_unique<image_info>(src);
+					// Resource was not found in config dir, try and grab from relative path (linux)
+					auto src = "Icons/ui/" + res;
+					info = std::make_unique<image_info>(src.c_str());
 #ifndef _WIN32
 					// Check for Icons in ../share/rpcs3 for AppImages,
 					// in rpcs3.app/Contents/Resources for App Bundles, and /usr/bin.
-					if (info->get_data() == nullptr)
+					if (info->data == nullptr)
 					{
 						char result[ PATH_MAX ];
 #if defined(__APPLE__)
 						u32 bufsize = PATH_MAX;
-						const bool success = _NSGetExecutablePath( result, &bufsize ) == 0;
+						bool success = _NSGetExecutablePath( result, &bufsize ) == 0;
 #elif defined(KERN_PROC_PATHNAME)
 						usz bufsize = PATH_MAX;
 						int mib[] = {
@@ -172,13 +104,13 @@ namespace rsx
 							-1,
 #endif
 						};
-						const bool success = sysctl(mib, sizeof(mib)/sizeof(mib[0]), result, &bufsize, NULL, 0) >= 0;
+						bool success = sysctl(mib, sizeof(mib)/sizeof(mib[0]), result, &bufsize, NULL, 0) >= 0;
 #elif defined(__linux__)
-						const bool success = readlink( "/proc/self/exe", result, PATH_MAX ) >= 0;
+						bool success = readlink( "/proc/self/exe", result, PATH_MAX ) >= 0;
 #elif defined(__sun)
-						const bool success = readlink( "/proc/self/path/a.out", result, PATH_MAX ) >= 0;
+						bool success = readlink( "/proc/self/path/a.out", result, PATH_MAX ) >= 0;
 #else
-						const bool success = readlink( "/proc/curproc/file", result, PATH_MAX ) >= 0;
+						bool success = readlink( "/proc/curproc/file", result, PATH_MAX ) >= 0;
 #endif
 						if (success)
 						{
@@ -188,21 +120,32 @@ namespace rsx
 #else
 							src = executablePath + "/../share/rpcs3/Icons/ui/" + res;
 #endif
-							info = std::make_unique<image_info>(src);
+							info = std::make_unique<image_info>(src.c_str());
 							// Check if the icons are in the same directory as the executable (local builds)
-							if (info->get_data() == nullptr)
+							if (info->data == nullptr)
 							{
 								src = executablePath + "/Icons/ui/" + res;
-								info = std::make_unique<image_info>(src);
+								info = std::make_unique<image_info>(src.c_str());
 							}
 						}
 					}
 #endif
-					if (info->get_data())
+					if (info->data != nullptr)
 					{
 						// Install the image to config dir
-						fs::create_path(fs::get_parent_dir(image_path));
-						fs::copy_file(src, image_path, true);
+						auto dst_dir = fs::get_config_dir() + "Icons/ui/";
+						auto dst = dst_dir + res;
+
+						if (!fs::is_dir(dst_dir))
+						{
+							auto root_folder = fs::get_config_dir() + "Icons/";
+							if (!fs::is_dir(root_folder))
+								fs::create_dir(root_folder);
+
+							fs::create_dir(dst_dir);
+						}
+
+						fs::copy_file(src, dst, true);
 					}
 				}
 
@@ -293,7 +236,7 @@ namespace rsx
 		{
 			if (sinus_modifier >= 0)
 			{
-				static constexpr f32 PI = 3.14159265f;
+				static const f32 PI = 3.14159265f;
 				const f32 pulse_sinus_x = static_cast<f32>(get_system_time() / 1000) * pulse_speed_modifier;
 				pulse_sinus_offset = fmod(pulse_sinus_x + sinus_modifier * PI, 2.0f * PI);
 			}
@@ -302,37 +245,37 @@ namespace rsx
 		void overlay_element::refresh()
 		{
 			// Just invalidate for draw when get_compiled() is called
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
 		void overlay_element::translate(s16 _x, s16 _y)
 		{
-			x += _x;
-			y += _y;
+			x = static_cast<u16>(x + _x);
+			y = static_cast<u16>(y + _y);
 
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
 		void overlay_element::scale(f32 _x, f32 _y, bool origin_scaling)
 		{
 			if (origin_scaling)
 			{
-				x = static_cast<s16>(_x * x);
-				y = static_cast<s16>(_y * y);
+				x = static_cast<u16>(_x * x);
+				y = static_cast<u16>(_y * y);
 			}
 
 			w = static_cast<u16>(_x * w);
 			h = static_cast<u16>(_y * h);
 
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
-		void overlay_element::set_pos(s16 _x, s16 _y)
+		void overlay_element::set_pos(u16 _x, u16 _y)
 		{
 			x = _x;
 			y = _y;
 
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
 		void overlay_element::set_size(u16 _w, u16 _h)
@@ -340,7 +283,7 @@ namespace rsx
 			w = _w;
 			h = _h;
 
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
 		void overlay_element::set_padding(u16 left, u16 right, u16 top, u16 bottom)
@@ -350,13 +293,13 @@ namespace rsx
 			padding_top = top;
 			padding_bottom = bottom;
 
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
 		void overlay_element::set_padding(u16 padding)
 		{
 			padding_left = padding_right = padding_top = padding_bottom = padding;
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
 		// NOTE: Functions as a simple position offset. Top left corner is the anchor.
@@ -365,36 +308,25 @@ namespace rsx
 			margin_left = left;
 			margin_top = top;
 
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
 		void overlay_element::set_margin(u16 margin)
 		{
 			margin_left = margin_top = margin;
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
 		void overlay_element::set_text(const std::string& text)
 		{
-			std::u32string new_text = utf8_to_u32string(text);
-			const bool is_dirty = this->text != new_text;
-			this->text = std::move(new_text);
-
-			if (is_dirty)
-			{
-				m_is_compiled = false;
-			}
+			this->text = utf8_to_u32string(text);
+			is_compiled = false;
 		}
 
 		void overlay_element::set_unicode_text(const std::u32string& text)
 		{
-			const bool is_dirty = this->text != text;
 			this->text = text;
-
-			if (is_dirty)
-			{
-				m_is_compiled = false;
-			}
+			is_compiled = false;
 		}
 
 		void overlay_element::set_text(localized_string_id id)
@@ -405,19 +337,19 @@ namespace rsx
 		void overlay_element::set_font(const char* font_name, u16 font_size)
 		{
 			font_ref = fontmgr::get(font_name, font_size);
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
 		void overlay_element::align_text(text_align align)
 		{
 			alignment = align;
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
 		void overlay_element::set_wrap_text(bool state)
 		{
 			wrap_text = state;
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
 		font* overlay_element::get_font() const
@@ -425,144 +357,72 @@ namespace rsx
 			return font_ref ? font_ref : fontmgr::get("Arial", 12);
 		}
 
-		std::vector<vertex> overlay_element::render_text(const char32_t* string, f32 x, f32 y)
+		std::vector<vertex> overlay_element::render_text(const char32_t *string, f32 x, f32 y)
 		{
 			auto renderer = get_font();
 
-			const u16 clip_width = clip_text ? w : umax;
+			f32 text_extents_w = 0.f;
+			u16 clip_width = clip_text ? w : umax;
 			std::vector<vertex> result = renderer->render_text(string, clip_width, wrap_text);
 
 			if (!result.empty())
 			{
-				const auto apply_transform = [&]()
+				for (auto &v : result)
 				{
-					const f32 size_px = renderer->get_size_px();
+					// Check for real text region extent
+					// TODO: Ellipsis
+					text_extents_w = std::max(v.values[0], text_extents_w);
 
-					for (vertex& v : result)
-					{
-						// Apply transform.
-						// (0, 0) has text sitting one line off the top left corner (text is outside the rect) hence the offset by text height
-						v.x() += x + padding_left;
-						v.y() += y + padding_top + size_px;
-					}
-				};
-
-				if (alignment == text_align::left)
-				{
-					apply_transform();
+					// Apply transform.
+					// (0, 0) has text sitting one line off the top left corner (text is outside the rect) hence the offset by text height
+					v.values[0] += x + padding_left;
+					v.values[1] += y + padding_top + static_cast<f32>(renderer->get_size_px());
 				}
-				else
+
+				if (alignment != text_align::left)
 				{
 					// Scan for lines and measure them
 					// Reposition them to the center or right depending on the alignment
-					std::vector<std::tuple<u32, u32, f32>> lines;
+					std::vector<std::pair<u32, u32>> lines;
 					u32 line_begin = 0;
-					u32 line_end = 0;
-					u32 word_end = 0;
 					u32 ctr = 0;
-					f32 text_extents_w = w;
 
-					for (const auto& c : text)
+					for (auto c : text)
 					{
 						switch (c)
 						{
 						case '\r':
-						{
 							continue;
-						}
 						case '\n':
-						{
-							lines.emplace_back(line_begin, std::min(word_end, line_end), text_extents_w);
-							word_end = line_end = line_begin = ctr;
-							text_extents_w = w;
+							lines.emplace_back(line_begin, ctr);
+							line_begin = ctr;
 							continue;
-						}
 						default:
-						{
 							ctr += 4;
-
-							if (c == ' ')
-							{
-								if (line_end == line_begin)
-								{
-									// Ignore leading whitespace
-									word_end = line_end = line_begin = ctr;
-								}
-								else
-								{
-									line_end = ctr;
-								}
-							}
-							else
-							{
-								word_end = line_end = ctr;
-
-								// Check for real text region extent
-								text_extents_w = std::max(result[ctr - 1].x(), text_extents_w);
-							}
-							continue;
-						}
 						}
 					}
 
-					// Add final line
-					lines.emplace_back(line_begin, std::min(word_end, line_end), std::max<f32>(text_extents_w, w));
-
+					lines.emplace_back(line_begin, ctr);
+					const auto max_region_w = std::max<f32>(text_extents_w, w);
 					const f32 offset_extent = (alignment == text_align::center ? 0.5f : 1.0f);
-					const f32 size_px = renderer->get_size_px() * 0.5f;
 
-					// Apply padding
-					apply_transform();
-
-					// Moves all glyphs of a line by the correct amount to get a nice alignment.
-					const auto move_line = [&result, &offset_extent](u32 begin, u32 end, f32 max_region_w)
+					for (auto p : lines)
 					{
-						const f32 line_length = result[end - 1].x() - result[begin].x();
+						if (p.first >= p.second)
+							continue;
+
+						const f32 line_length = result[p.second - 1].values[0] - result[p.first].values[0];
+						const bool wrapped = std::fabs(result[p.second - 1].values[1] - result[p.first + 3].values[1]) >= (renderer->get_size_px() * 0.5f);
+
+						if (wrapped)
+							continue;
 
 						if (line_length < max_region_w)
 						{
 							const f32 offset = (max_region_w - line_length) * offset_extent;
-							for (auto n = begin; n < end; ++n)
+							for (auto n = p.first; n < p.second; ++n)
 							{
-								result[n].x() += offset;
-							}
-						}
-					};
-
-					// Properly place all lines individually
-					for (const auto& [begin, end, max_region_w] : lines)
-					{
-						if (begin >= end)
-							continue;
-
-						// Check if there's any wrapped text
-						if (std::fabs(result[end - 1].y() - result[begin + 3].y()) < size_px)
-						{
-							// No wrapping involved. We can just move the entire line.
-							move_line(begin, end, max_region_w);
-							continue;
-						}
-
-						// Wrapping involved. We have to search for the line breaks and move each line seperately.
-						for (u32 i_begin = begin, i_next = begin + 4;; i_next += 4)
-						{
-							// Check if this is the last glyph in the line of text.
-							const bool is_last_glyph = i_next >= end;
-
-							// The line may be wrapped, so we need to check if the next glyph's position is below the current position.
-							if (is_last_glyph || (result[i_next - 1].y() - result[i_begin + 3].y() >= size_px))
-							{
-								// Whenever we reached the end of a visual line we need to move its glyphs accordingly.
-								const u32 i_end = i_next - (is_last_glyph ? 0 : 4);
-
-								move_line(i_begin, i_end, max_region_w);
-
-								i_begin = i_end;
-
-								if (is_last_glyph)
-								{
-									break;
-								}
+								result[n].values[0] += offset;
 							}
 						}
 					}
@@ -574,7 +434,7 @@ namespace rsx
 
 		compiled_resource& overlay_element::get_compiled()
 		{
-			if (!is_compiled())
+			if (!is_compiled)
 			{
 				compiled_resources.clear();
 
@@ -607,10 +467,10 @@ namespace rsx
 					cmd_text.verts = render_text(text.c_str(), static_cast<f32>(x), static_cast<f32>(y));
 
 					if (!cmd_text.verts.empty())
-						compiled_resources.add(std::move(compiled_resources_temp), margin_left - horizontal_scroll_offset, margin_top - vertical_scroll_offset);
+						compiled_resources.add(std::move(compiled_resources_temp), margin_left, margin_top);
 				}
 
-				m_is_compiled = true;
+				is_compiled = true;
 			}
 
 			return compiled_resources;
@@ -675,34 +535,24 @@ namespace rsx
 		{
 			overlay_element::translate(_x, _y);
 
-			for (auto& itm : m_items)
+			for (auto &itm : m_items)
 				itm->translate(_x, _y);
 		}
 
-		void layout_container::set_pos(s16 _x, s16 _y)
+		void layout_container::set_pos(u16 _x, u16 _y)
 		{
-			const s16 dx = _x - x;
-			const s16 dy = _y - y;
+			s16 dx = static_cast<s16>(_x - x);
+			s16 dy = static_cast<s16>(_y - y);
 			translate(dx, dy);
 		}
 
-		bool layout_container::is_compiled()
-		{
-			if (m_is_compiled && std::any_of(m_items.cbegin(), m_items.cend(), [](const auto& item){ return item && !item->is_compiled(); }))
-			{
-				m_is_compiled = false;
-			}
-
-			return m_is_compiled;
-		}
-
 		compiled_resource& layout_container::get_compiled()
 		{
-			if (!is_compiled())
+			if (!is_compiled)
 			{
 				compiled_resource result = overlay_element::get_compiled();
 
-				for (auto& itm : m_items)
+				for (auto &itm : m_items)
 					result.add(itm->get_compiled());
 
 				compiled_resources = result;
@@ -711,12 +561,6 @@ namespace rsx
 			return compiled_resources;
 		}
 
-		void layout_container::add_spacer()
-		{
-			std::unique_ptr<overlay_element> spacer_element = std::make_unique<spacer>();
-			add_element(spacer_element);
-		}
-
 		overlay_element* vertical_layout::add_element(std::unique_ptr<overlay_element>& item, int offset)
 		{
 			if (auto_resize)
@@ -736,10 +580,12 @@ namespace rsx
 				m_items.push_back(std::move(item));
 				return m_items.back().get();
 			}
-
-			overlay_element* result = item.get();
-			m_items.insert(m_items.begin() + offset, std::move(item));
-			return result;
+			else
+			{
+				auto result = item.get();
+				m_items.insert(m_items.begin() + offset, std::move(item));
+				return result;
+			}
 		}
 
 		compiled_resource& vertical_layout::get_compiled()
@@ -747,35 +593,22 @@ namespace rsx
 			if (scroll_offset_value == 0 && auto_resize)
 				return layout_container::get_compiled();
 
-			if (!is_compiled())
+			if (!is_compiled)
 			{
 				compiled_resource result = overlay_element::get_compiled();
 				const f32 global_y_offset = static_cast<f32>(-scroll_offset_value);
 
-				for (auto& item : m_items)
+				for (auto &item : m_items)
 				{
-					if (!item)
-					{
-						rsx_log.error("Found null item in overlay_controls::vertical_layout");
-						continue;
-					}
-
 					const s32 item_y_limit = s32{item->y} + item->h - scroll_offset_value - y;
 					const s32 item_y_base = s32{item->y} - scroll_offset_value - y;
 
-					if (item_y_base > h)
-					{
-						// Out of bounds. The following items will be too.
-						break;
-					}
-
-					if (item_y_limit < 0)
+					if (item_y_limit < 0 || item_y_base > h)
 					{
 						// Out of bounds
 						continue;
 					}
-
-					if (item_y_limit > h || item_y_base < 0)
+					else if (item_y_limit > h || item_y_base < 0)
 					{
 						// Partial render
 						areaf clip_rect = static_cast<areaf>(areai{x, y, (x + w), (y + h)});
@@ -818,10 +651,12 @@ namespace rsx
 				m_items.push_back(std::move(item));
 				return m_items.back().get();
 			}
-
-			auto result = item.get();
-			m_items.insert(m_items.begin() + offset, std::move(item));
-			return result;
+			else
+			{
+				auto result = item.get();
+				m_items.insert(m_items.begin() + offset, std::move(item));
+				return result;
+			}
 		}
 
 		compiled_resource& horizontal_layout::get_compiled()
@@ -829,35 +664,22 @@ namespace rsx
 			if (scroll_offset_value == 0 && auto_resize)
 				return layout_container::get_compiled();
 
-			if (!is_compiled())
+			if (!is_compiled)
 			{
 				compiled_resource result = overlay_element::get_compiled();
 				const f32 global_x_offset = static_cast<f32>(-scroll_offset_value);
 
 				for (auto &item : m_items)
 				{
-					if (!item)
-					{
-						rsx_log.error("Found null item in overlay_controls::horizontal_layout");
-						continue;
-					}
-
 					const s32 item_x_limit = s32{item->x} + item->w - scroll_offset_value - w;
 					const s32 item_x_base = s32{item->x} - scroll_offset_value - w;
 
-					if (item_x_base > w)
-					{
-						// Out of bounds. The following items will be too.
-						break;
-					}
-
-					if (item_x_limit < 0)
+					if (item_x_limit < 0 || item_x_base > h)
 					{
 						// Out of bounds
 						continue;
 					}
-
-					if (item_x_limit > w || item_x_base < 0)
+					else if (item_x_limit > h || item_x_base < 0)
 					{
 						// Partial render
 						areaf clip_rect = static_cast<areaf>(areai{x, y, (x + w), (y + h)});
@@ -883,7 +705,7 @@ namespace rsx
 
 		compiled_resource& image_view::get_compiled()
 		{
-			if (!is_compiled())
+			if (!is_compiled)
 			{
 				auto& result  = overlay_element::get_compiled();
 				auto& cmd_img = result.draw_commands.front();
@@ -891,6 +713,7 @@ namespace rsx
 				cmd_img.config.set_image_resource(image_resource_ref);
 				cmd_img.config.color = fore_color;
 				cmd_img.config.external_data_ref = external_ref;
+
 				cmd_img.config.blur_strength = blur_strength;
 
 				// Make padding work for images (treat them as the content instead of the 'background')
@@ -901,7 +724,7 @@ namespace rsx
 				verts[2] += vertex(padding_left, -padding_top, 0, 0);
 				verts[3] += vertex(-padding_right, -padding_top, 0, 0);
 
-				m_is_compiled = true;
+				is_compiled = true;
 			}
 
 			return compiled_resources;
@@ -913,7 +736,7 @@ namespace rsx
 			external_ref = nullptr;
 		}
 
-		void image_view::set_raw_image(image_info_base* raw_image)
+		void image_view::set_raw_image(image_info* raw_image)
 		{
 			image_resource_ref = image_resource_id::raw_image;
 			external_ref = raw_image;
@@ -956,7 +779,7 @@ namespace rsx
 
 		compiled_resource& image_button::get_compiled()
 		{
-			if (!is_compiled())
+			if (!is_compiled)
 			{
 				auto& compiled = image_view::get_compiled();
 				for (auto& cmd : compiled.draw_commands)
@@ -1005,94 +828,5 @@ namespace rsx
 			bool size_changed = old_width != new_width || old_height != new_height;
 			return size_changed;
 		}
-
-		compiled_resource& rounded_rect::get_compiled()
-		{
-			if (!is_compiled())
-			{
-				compiled_resources.clear();
-
-#ifdef __APPLE__
-				if (true)
-#else
-				if (radius == 0 || radius > (w / 2))
-#endif
-				{
-					// Invalid radius
-					compiled_resources = overlay_element::get_compiled();
-				}
-				else
-				{
-					compiled_resource compiled_resources_temp = {};
-					compiled_resources_temp.append({}); // Bg horizontal mid
-					compiled_resources_temp.append({}); // Bg horizontal top
-					compiled_resources_temp.append({}); // Bg horizontal bottom
-					compiled_resources_temp.append({}); // Bg upper-left
-					compiled_resources_temp.append({}); // Bg lower-left
-					compiled_resources_temp.append({}); // Bg upper-right
-					compiled_resources_temp.append({}); // Bg lower-right
-
-					for (auto& draw_cmd : compiled_resources_temp.draw_commands)
-					{
-						auto& config = draw_cmd.config;
-						config.color = back_color;
-						config.disable_vertex_snap = true;
-						config.pulse_glow = pulse_effect_enabled;
-						config.pulse_sinus_offset = pulse_sinus_offset;
-						config.pulse_speed_modifier = pulse_speed_modifier;
-					}
-
-					auto& bg0 = compiled_resources_temp.draw_commands[0];
-					auto& bg1 = compiled_resources_temp.draw_commands[1];
-					auto& bg2 = compiled_resources_temp.draw_commands[2];
-
-					bg0.verts.emplace_back(f32(x), f32(y + radius), 0.f, 0.f);
-					bg0.verts.emplace_back(f32(x + w), f32(y + radius), 0.f, 0.f);
-					bg0.verts.emplace_back(f32(x), f32(y + h) - radius, 0.f, 0.f);
-					bg0.verts.emplace_back(f32(x + w), f32(y + h) - radius, 0.f, 0.f);
-
-					bg1.verts.emplace_back(f32(x + radius), f32(y), 0.f, 0.f);
-					bg1.verts.emplace_back(f32(x + w) - radius, f32(y), 0.f, 0.f);
-					bg1.verts.emplace_back(f32(x + radius), f32(y + radius), 0.f, 0.f);
-					bg1.verts.emplace_back(f32(x + w) - radius, f32(y + radius), 0.f, 0.f);
-
-					bg2.verts.emplace_back(f32(x + radius), f32(y + h) - radius, 0.f, 0.f);
-					bg2.verts.emplace_back(f32(x + w) - radius, f32(y + h) - radius, 0.f, 0.f);
-					bg2.verts.emplace_back(f32(x + radius), f32(y + h), 0.f, 0.f);
-					bg2.verts.emplace_back(f32(x + w) - radius, f32(y + h), 0.f, 0.f);
-
-					// Generate the quadrants
-					const f32 corners[4][2] =
-					{
-						{ f32(x + radius), f32(y + radius) },
-						{ f32(x + radius), f32(y + h) - radius },
-						{ f32(x + w) - radius, f32(y + radius) },
-						{ f32(x + w) - radius, f32(y + h) - radius }
-					};
-
-					const f32 radius_f = static_cast<f32>(radius);
-					const f32 scale[4][2] =
-					{
-						{ -radius_f, -radius_f },
-						{ -radius_f, +radius_f },
-						{ +radius_f, -radius_f },
-						{ +radius_f, +radius_f }
-					};
-
-					for (int i = 0; i < 4; ++i)
-					{
-						auto& command = compiled_resources_temp.draw_commands[i + 3];
-						command.config.primitives = rsx::overlays::primitive_type::triangle_fan;
-						command.verts = generate_unit_quadrant(num_control_points, corners[i], scale[i]);
-					}
-
-					compiled_resources.add(std::move(compiled_resources_temp), margin_left, margin_top);
-				}
-
-				m_is_compiled = true;
-			}
-
-			return compiled_resources;
-		}
 	}
 }
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h
index f39a25f2a4..6570379ba8 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h
@@ -3,6 +3,7 @@
 #include "overlay_fonts.h"
 
 #include "Emu/localized_string.h"
+#include "Emu/Cell/timers.hpp"
 
 #include <memory>
 
@@ -26,36 +27,19 @@ namespace rsx
 			quad_list = 0,
 			triangle_strip = 1,
 			line_list = 2,
-			line_strip = 3,
-			triangle_fan = 4
+			line_strip = 3
 		};
 
-		struct image_info_base
+		struct image_info
 		{
-			int w = 0, h = 0, channels = 0;
+			int w = 0, h = 0;
 			int bpp = 0;
-			bool dirty = false;
-
-			image_info_base() {}
-			virtual ~image_info_base() {}
-			virtual const u8* get_data() const = 0;
-		};
-
-		struct image_info : public image_info_base
-		{
-		private:
 			u8* data = nullptr;
-			std::vector<u8> data_grey;
 
-		public:
-			using image_info_base::image_info_base;
 			image_info(image_info&) = delete;
-			image_info(const std::string& filename, bool grayscaled = false);
-			image_info(const std::vector<u8>& bytes, bool grayscaled = false);
-			virtual ~image_info();
-
-			void load_data(const std::vector<u8>& bytes, bool grayscaled = false);
-			const u8* get_data() const override { return channels == 4 ? data : data_grey.empty() ? nullptr : data_grey.data(); }
+			image_info(const char* filename);
+			image_info(const std::vector<u8>& bytes);
+			~image_info();
 		};
 
 		struct resource_config
@@ -79,6 +63,7 @@ namespace rsx
 			};
 
 			// Define resources
+			std::vector<std::string> texture_resource_files;
 			std::vector<std::unique_ptr<image_info>> texture_raw_data;
 
 			resource_config();
@@ -95,7 +80,6 @@ namespace rsx
 
 				color4f color = { 1.f, 1.f, 1.f, 1.f };
 				bool pulse_glow = false;
-				bool disable_vertex_snap = false;
 				f32 pulse_sinus_offset = 0.0f; // The current pulse offset
 				f32 pulse_speed_modifier = 0.005f;
 
@@ -103,8 +87,8 @@ namespace rsx
 				bool clip_region = false;
 
 				u8 texture_ref = image_resource_id::none;
-				font* font_ref = nullptr;
-				void* external_data_ref = nullptr;
+				font *font_ref = nullptr;
+				void *external_data_ref = nullptr;
 
 				u8 blur_strength = 0;
 
@@ -148,8 +132,8 @@ namespace rsx
 				right
 			};
 
-			s16 x = 0;
-			s16 y = 0;
+			u16 x = 0;
+			u16 y = 0;
 			u16 w = 0;
 			u16 h = 0;
 
@@ -174,8 +158,7 @@ namespace rsx
 			void set_sinus_offset(f32 sinus_modifier);
 
 			compiled_resource compiled_resources;
-
-			bool visible = true;
+			bool is_compiled = false;
 
 			u16 padding_left = 0;
 			u16 padding_right = 0;
@@ -185,18 +168,14 @@ namespace rsx
 			u16 margin_left = 0;
 			u16 margin_top = 0;
 
-			f32 horizontal_scroll_offset = 0.0f;
-			f32 vertical_scroll_offset = 0.0f;
-
 			overlay_element() = default;
 			overlay_element(u16 _w, u16 _h) : w(_w), h(_h) {}
 			virtual ~overlay_element() = default;
 
 			virtual void refresh();
-			virtual bool is_compiled() { return m_is_compiled; }
 			virtual void translate(s16 _x, s16 _y);
 			virtual void scale(f32 _x, f32 _y, bool origin_scaling);
-			virtual void set_pos(s16 _x, s16 _y);
+			virtual void set_pos(u16 _x, u16 _y);
 			virtual void set_size(u16 _w, u16 _h);
 			virtual void set_padding(u16 left, u16 right, u16 top, u16 bottom);
 			virtual void set_padding(u16 padding);
@@ -210,13 +189,9 @@ namespace rsx
 			virtual void align_text(text_align align);
 			virtual void set_wrap_text(bool state);
 			virtual font* get_font() const;
-			virtual std::vector<vertex> render_text(const char32_t* string, f32 x, f32 y);
+			virtual std::vector<vertex> render_text(const char32_t *string, f32 x, f32 y);
 			virtual compiled_resource& get_compiled();
 			void measure_text(u16& width, u16& height, bool ignore_word_wrap = false) const;
-			virtual void set_selected(bool selected) { static_cast<void>(selected); }
-
-		protected:
-			bool m_is_compiled = false; // Only use m_is_compiled as a getter in is_compiled() if possible
 		};
 
 		struct layout_container : public overlay_element
@@ -232,14 +207,11 @@ namespace rsx
 			layout_container();
 
 			void translate(s16 _x, s16 _y) override;
-			void set_pos(s16 _x, s16 _y) override;
-
-			bool is_compiled() override;
+			void set_pos(u16 _x, u16 _y) override;
 
 			compiled_resource& get_compiled() override;
 
 			virtual u16 get_scroll_offset_px() = 0;
-			void add_spacer();
 		};
 
 		struct vertical_layout : public layout_container
@@ -263,25 +235,15 @@ namespace rsx
 			compiled_resource& get_compiled() override
 			{
 				// No draw
-				m_is_compiled = true;
 				return compiled_resources;
 			}
 		};
 
-		struct rounded_rect : public overlay_element
-		{
-			u8 radius = 5;
-			u8 num_control_points = 8; // Smoothness control
-
-			using overlay_element::overlay_element;
-			compiled_resource& get_compiled() override;
-		};
-
 		struct image_view : public overlay_element
 		{
-		protected:
+		private:
 			u8 image_resource_ref = image_resource_id::none;
-			void* external_ref = nullptr;
+			void *external_ref = nullptr;
 
 			// Strength of blur effect
 			u8 blur_strength = 0;
@@ -292,14 +254,14 @@ namespace rsx
 			compiled_resource& get_compiled() override;
 
 			void set_image_resource(u8 resource_id);
-			void set_raw_image(image_info_base* raw_image);
+			void set_raw_image(image_info* raw_image);
 			void clear_image();
 			void set_blur_strength(u8 strength);
 		};
 
 		struct image_button : public image_view
 		{
-			u16 text_horizontal_offset = 25;
+			const u16 text_horizontal_offset = 25;
 			u16 m_text_offset_x = 0;
 			s16 m_text_offset_y = 0;
 
@@ -340,7 +302,7 @@ namespace rsx
 
 		public:
 			graph();
-			void set_pos(s16 _x, s16 _y) override;
+			void set_pos(u16 _x, u16 _y) override;
 			void set_size(u16 _w, u16 _h) override;
 			void set_title(const char* title);
 			void set_font(const char* font_name, u16 font_size) override;
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp b/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp
deleted file mode 100644
index e20074d1b8..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-#include "stdafx.h"
-#include "overlay_cursor.h"
-#include "overlay_manager.h"
-#include "Emu/Cell/timers.hpp"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		cursor_item::cursor_item()
-		{
-			m_cross_h.set_size(15, 1);
-			m_cross_v.set_size(1, 15);
-		}
-
-		bool cursor_item::set_position(s16 x, s16 y)
-		{
-			if (m_x == x && m_y == y)
-			{
-				return false;
-			}
-
-			m_x = x;
-			m_y = y;
-
-			m_cross_h.set_pos(m_x - m_cross_h.w / 2, m_y - m_cross_h.h / 2);
-			m_cross_v.set_pos(m_x - m_cross_v.w / 2, m_y - m_cross_v.h / 2);
-
-			return true;
-		}
-
-		bool cursor_item::set_color(color4f color)
-		{
-			if (m_cross_h.back_color == color && m_cross_v.back_color == color)
-			{
-				return false;
-			}
-
-			m_cross_h.back_color = color;
-			m_cross_h.refresh();
-
-			m_cross_v.back_color = color;
-			m_cross_v.refresh();
-
-			return true;
-		}
-
-		void cursor_item::set_expiration(u64 expiration_time)
-		{
-			m_expiration_time = expiration_time;
-		}
-
-		bool cursor_item::update_visibility(u64 time)
-		{
-			m_visible = time <= m_expiration_time;
-
-			return m_visible;
-		}
-
-		bool cursor_item::visible() const
-		{
-			return m_visible;
-		}
-
-		compiled_resource cursor_item::get_compiled()
-		{
-			if (!m_visible)
-			{
-				return {};
-			}
-
-			compiled_resource cr = m_cross_h.get_compiled();
-			cr.add(m_cross_v.get_compiled());
-
-			return cr;
-		}
-
-		void cursor_manager::update(u64 timestamp_us)
-		{
-			if (!visible)
-			{
-				return;
-			}
-
-			std::lock_guard lock(m_mutex);
-
-			bool any_cursor_visible = false;
-
-			for (auto& entry : m_cursors)
-			{
-				any_cursor_visible |= entry.second.update_visibility(timestamp_us);
-			}
-
-			if (!any_cursor_visible)
-			{
-				visible = false;
-			}
-		}
-
-		compiled_resource cursor_manager::get_compiled()
-		{
-			if (!visible)
-			{
-				return {};
-			}
-
-			std::lock_guard lock(m_mutex);
-
-			compiled_resource cr{};
-
-			for (auto& entry : m_cursors)
-			{
-				cr.add(entry.second.get_compiled());
-			}
-
-			return cr;
-		}
-
-		void cursor_manager::update_cursor(u32 id, s16 x, s16 y, const color4f& color, u64 duration_us, bool force_update)
-		{
-			std::lock_guard lock(m_mutex);
-
-			cursor_item& cursor = m_cursors[id];
-
-			bool is_dirty = cursor.set_position(x, y);
-			is_dirty |= cursor.set_color(color);
-
-			if (is_dirty || force_update)
-			{
-				const u64 expiration_time = get_system_time() + duration_us;
-				cursor.set_expiration(expiration_time);
-
-				if (cursor.update_visibility(expiration_time))
-				{
-					visible = true;
-				}
-			}
-		}
-
-		void set_cursor(u32 id, s16 x, s16 y, const color4f& color, u64 duration_us, bool force_update)
-		{
-			if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
-			{
-				auto cursor_overlay = manager->get<rsx::overlays::cursor_manager>();
-				if (!cursor_overlay)
-				{
-					cursor_overlay = std::make_shared<rsx::overlays::cursor_manager>();
-					cursor_overlay = manager->add(cursor_overlay);
-				}
-				cursor_overlay->update_cursor(id, x, y, color, duration_us, force_update);
-			}
-		}
-
-	} // namespace overlays
-} // namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_cursor.h b/rpcs3/Emu/RSX/Overlays/overlay_cursor.h
deleted file mode 100644
index d464c509fe..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_cursor.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#pragma once
-
-#include "overlays.h"
-#include "Utilities/mutex.h"
-#include <map>
-
-namespace rsx
-{
-	namespace overlays
-	{
-		enum cursor_offset : u32
-		{
-			cell_gem = 0, // CELL_GEM_MAX_NUM = 4 Move controllers
-			last = 4
-		};
-
-		class cursor_item
-		{
-		public:
-			cursor_item();
-
-			void set_expiration(u64 expiration_time);
-			bool set_position(s16 x, s16 y);
-			bool set_color(color4f color);
-
-			bool update_visibility(u64 time);
-			bool visible() const;
-
-			compiled_resource get_compiled();
-
-		private:
-			bool m_visible = false;
-			overlay_element m_cross_h{};
-			overlay_element m_cross_v{};
-			u64 m_expiration_time = 0;
-			s16 m_x = 0;
-			s16 m_y = 0;
-		};
-
-		class cursor_manager final : public overlay
-		{
-		public:
-			void update(u64 timestamp_us) override;
-			compiled_resource get_compiled() override;
-
-			void update_cursor(u32 id, s16 x, s16 y, const color4f& color, u64 duration_us, bool force_update);
-
-		private:
-			shared_mutex m_mutex;
-			std::map<u32, cursor_item> m_cursors;
-		};
-
-		void set_cursor(u32 id, s16 x, s16 y, const color4f& color, u64 duration_us, bool force_update);
-
-	} // namespace overlays
-} // namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.cpp b/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.cpp
deleted file mode 100644
index d616737b16..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "stdafx.h"
-#include "overlay_manager.h"
-#include "overlay_debug_overlay.h"
-#include "Emu/system_config.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		debug_overlay::debug_overlay()
-		{
-			text_display.set_size(1260, 40);
-			text_display.set_pos(10, 10);
-			text_display.set_font("n023055ms.ttf", 10);
-			text_display.align_text(overlay_element::text_align::left);
-			text_display.set_wrap_text(true);
-			text_display.fore_color = { 0.3f, 1.f, 0.3f, 1.f };
-			text_display.back_color.a = 0.f;
-		}
-
-		compiled_resource debug_overlay::get_compiled()
-		{
-			if (!visible)
-			{
-				return {};
-			}
-
-			if (const auto [dirty, text] = text_guard.get_text(); dirty)
-			{
-				text_display.set_text(text);
-			}
-
-			compiled_resource result;
-			result.add(text_display.get_compiled());
-			return result;
-		}
-
-		void debug_overlay::set_text(std::string&& text)
-		{
-			text_guard.set_text(std::move(text));
-			visible = true;
-		}
-
-		extern void reset_debug_overlay()
-		{
-			if (!g_cfg.misc.use_native_interface)
-				return;
-
-			if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
-			{
-				auto overlay = manager->get<rsx::overlays::debug_overlay>();
-
-				if (g_cfg.video.debug_overlay || g_cfg.io.debug_overlay)
-				{
-					if (!overlay)
-					{
-						overlay = manager->create<rsx::overlays::debug_overlay>();
-					}
-				}
-				else if (overlay)
-				{
-					manager->remove<rsx::overlays::debug_overlay>();
-				}
-			}
-		}
-
-		extern void set_debug_overlay_text(std::string&& text)
-		{
-			if (!g_cfg.misc.use_native_interface || (!g_cfg.video.debug_overlay && !g_cfg.io.debug_overlay))
-				return;
-
-			if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
-			{
-				if (auto overlay = manager->get<rsx::overlays::debug_overlay>())
-				{
-					overlay->set_text(std::move(text));
-				}
-			}
-		}
-	} // namespace overlays
-} // namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.h b/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.h
deleted file mode 100644
index 202aeea2c5..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "overlays.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		class debug_overlay : public user_interface
-		{
-			label text_display;
-			text_guard_t text_guard{};
-
-		public:
-			debug_overlay();
-
-			compiled_resource get_compiled() override;
-
-			void set_text(std::string&& text);
-		};
-
-		void reset_debug_overlay();
-		void set_debug_overlay_text(std::string&& text);
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp b/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp
index ce2b685046..4447e7a8ad 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp
@@ -5,24 +5,24 @@ namespace rsx
 {
 	namespace overlays
 	{
-		static usz get_line_start(std::u32string_view text, usz pos)
+		static usz get_line_start(const std::u32string& text, usz pos)
 		{
 			if (pos == 0)
 			{
 				return 0;
 			}
 			const usz line_start = text.rfind('\n', pos - 1);
-			if (line_start == umax)
+			if (line_start == std::string::npos)
 			{
 				return 0;
 			}
 			return line_start + 1;
 		}
 
-		static usz get_line_end(std::u32string_view text, usz pos)
+		static usz get_line_end(const std::u32string& text, usz pos)
 		{
 			const usz line_end = text.find('\n', pos);
-			if (line_end == umax)
+			if (line_end == std::string::npos)
 			{
 				return text.length();
 			}
@@ -141,7 +141,7 @@ namespace rsx
 				value.insert(caret_position, str);
 			}
 
-			caret_position += str.length();
+			caret_position += ::narrow<u16>(str.length());
 			m_reset_caret_pulse = true;
 			set_unicode_text(value);
 			refresh();
@@ -173,36 +173,17 @@ namespace rsx
 			refresh();
 		}
 
-		void edit_text::del()
-		{
-			if (caret_position >= text.length())
-			{
-				return;
-			}
-
-			if (caret_position == 0)
-			{
-				value = value.length() > 1 ? value.substr(1) : U"";
-			}
-			else
-			{
-				value = value.substr(0, caret_position) + value.substr(caret_position + 1);
-			}
-
-			m_reset_caret_pulse = true;
-			set_unicode_text(value);
-			refresh();
-		}
-
 		compiled_resource& edit_text::get_compiled()
 		{
-			if (!is_compiled())
+			if (!is_compiled)
 			{
-				auto renderer = get_font();
-				const auto [caret_x, caret_y] = renderer->get_char_offset(text.c_str(), caret_position, clip_text ? w : -1, wrap_text);
+				auto& compiled = label::get_compiled();
 
 				overlay_element caret;
-				caret.set_pos(static_cast<u16>(caret_x) + padding_left + x, static_cast<u16>(caret_y) + padding_top + y);
+				auto renderer        = get_font();
+				const auto caret_loc = renderer->get_char_offset(text.c_str(), caret_position, clip_text ? w : -1, wrap_text);
+
+				caret.set_pos(static_cast<u16>(caret_loc.first) + padding_left + x, static_cast<u16>(caret_loc.second) + padding_top + y);
 				caret.set_size(1, static_cast<u16>(renderer->get_size_px() + 2));
 				caret.fore_color           = fore_color;
 				caret.back_color           = fore_color;
@@ -215,44 +196,16 @@ namespace rsx
 					m_reset_caret_pulse = false;
 				}
 
-				// Check if we have to scroll horizontally
-				// TODO: Vertical scrolling
-				const s32 available_width = w - padding_left - padding_right;
-				const f32 offset_right = caret_x + caret.w - available_width;
-
-				if (text.empty())
-				{
-					// Scroll to the beginning
-					horizontal_scroll_offset = 0.0f;
-				}
-				else if (horizontal_scroll_offset >= caret_x)
-				{
-					// Scroll to the left so that the entire caret is visible
-					horizontal_scroll_offset = caret_x;
-				}
-				else if (horizontal_scroll_offset <= offset_right && offset_right > 0.0f)
-				{
-					// Scroll to the right so that the entire caret is visible
-					horizontal_scroll_offset = offset_right;
-				}
-				else if (horizontal_scroll_offset > 0.0f && offset_right > 0.0f && caret_position >= text.size())
-				{
-					// Scroll to the left so that the entire caret is visible and reveal preceding text
-					horizontal_scroll_offset = offset_right;
-				}
-
-				horizontal_scroll_offset = std::max(0.0f, horizontal_scroll_offset);
-
-				auto& compiled = label::get_compiled();
-				compiled.add(caret.get_compiled(), -horizontal_scroll_offset, -vertical_scroll_offset);
+				compiled.add(caret.get_compiled());
 
 				for (auto& cmd : compiled.draw_commands)
 				{
+					// TODO: Scrolling by using scroll offset
 					cmd.config.clip_region = true;
 					cmd.config.clip_rect   = {static_cast<f32>(x), static_cast<f32>(y), static_cast<f32>(x + w), static_cast<f32>(y + h)};
 				}
 
-				m_is_compiled = true;
+				is_compiled = true;
 			}
 
 			return compiled_resources;
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp b/rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp
index 624580e4f4..a249343474 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "overlay_controls.h"
 
 namespace rsx
@@ -16,7 +14,8 @@ namespace rsx
 				right
 			};
 
-			usz caret_position = 0;
+			u16 caret_position = 0;
+			u16 vertical_scroll_offset = 0;
 
 			bool m_reset_caret_pulse = false;
 			bool password_mode = false;
@@ -34,7 +33,6 @@ namespace rsx
 			void move_caret(direction dir);
 			void insert_text(const std::u32string& str);
 			void erase();
-			void del();
 
 			compiled_resource& get_compiled() override;
 		};
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp b/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp
index f1df35125c..0b325fbee7 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp
@@ -1,7 +1,6 @@
 #include "stdafx.h"
-#include "overlay_fonts.h"
-#include "Emu/System.h"
-#include "Emu/vfs_config.h"
+#include "overlay_controls.h"
+#include "Emu/system_config.h"
 
 #ifndef _WIN32
 #include <unistd.h>
@@ -108,11 +107,22 @@ namespace rsx
 			glyph_load_setup result;
 			result.font_names.push_back(font_name);
 
-			const std::vector<std::string> font_dirs = Emu.GetCallbacks().get_font_dirs();
-			result.lookup_font_dirs.insert(result.lookup_font_dirs.end(), font_dirs.begin(), font_dirs.end());
+#ifdef _WIN32
+			result.lookup_font_dirs.emplace_back("C:/Windows/Fonts/");
+#else
+			char* home = getenv("HOME");
+			if (home == nullptr)
+				home = getpwuid(getuid())->pw_dir;
+
+			result.lookup_font_dirs.emplace_back(home);
+			if (home[result.lookup_font_dirs[0].length() - 1] == '/')
+				result.lookup_font_dirs[0] += ".fonts/";
+			else
+				result.lookup_font_dirs[0] += "/.fonts/";
+#endif
 			// Search dev_flash for the font too
-			result.lookup_font_dirs.push_back(g_cfg_vfs.get_dev_flash() + "data/font/");
-			result.lookup_font_dirs.push_back(g_cfg_vfs.get_dev_flash() + "data/font/SONY-CC/");
+			result.lookup_font_dirs.push_back(g_cfg.vfs.get_dev_flash() + "data/font/");
+			result.lookup_font_dirs.push_back(g_cfg.vfs.get_dev_flash() + "data/font/SONY-CC/");
 
 			switch (class_)
 			{
@@ -273,158 +283,166 @@ namespace rsx
 			}
 		}
 
-		std::vector<vertex> font::render_text_ex(f32& x_advance, f32& y_advance, const char32_t* text, usz char_limit, u16 max_width, bool wrap)
+		void font::render_text_ex(std::vector<vertex>& result, f32& x_advance, f32& y_advance, const char32_t* text, u32 char_limit, u16 max_width, bool wrap)
 		{
 			x_advance = 0.f;
 			y_advance = 0.f;
-			std::vector<vertex> result;
+			result.clear();
 
 			if (!initialized)
 			{
-				return result;
+				return;
 			}
 
-			// Render as many characters as possible as glyphs.
-			for (usz i = 0u, begin_of_word = 0u; i < char_limit; i++)
-			{
-				switch (const auto& c = text[i])
-				{
-				case '\0':
-				{
-					// We're done.
-					return result;
-				}
-				case '\n':
-				{
-					// Reset x to 0 and increase y to advance to the new line.
-					x_advance = 0.f;
-					y_advance += size_px + 2.f;
-					begin_of_word = result.size();
-					continue;
-				}
-				case '\r':
-				{
-					// Reset x to 0.
-					x_advance = 0.f;
-					begin_of_word = result.size();
-					continue;
-				}
-				default:
-				{
-					const bool is_whitespace = c == ' ';
-					stbtt_aligned_quad quad{};
+			u32 i                = 0u;
+			bool skip_whitespace = false;
 
-					if (is_whitespace)
+			while (true)
+			{
+				if (auto c = text[i++]; c && (i <= char_limit))
+				{
+					switch (c)
 					{
-						// Skip whitespace if we are at the start of a line.
-						if (x_advance <= 0.f)
+					case '\n':
+					{
+						y_advance += size_px + 2.f;
+						x_advance = 0.f;
+						continue;
+					}
+					case '\r':
+					{
+						x_advance = 0.f;
+						continue;
+					}
+					default:
+					{
+						stbtt_aligned_quad quad;
+						if (skip_whitespace && text[i - 1] == ' ')
 						{
-							// Set the glyph to the current position.
-							// This is necessary for downstream linewidth calculations.
-							quad.x0 = quad.x1 = x_advance;
-							quad.y0 = quad.y1 = y_advance;
+							quad = {};
 						}
 						else
 						{
-							const f32 x_advance_old = x_advance;
-							const f32 y_advance_old = y_advance;
-
-							// Get the glyph size.
-							quad = get_char(c, x_advance, y_advance);
-
-							// Reset the result if the glyph would protrude out of the given space anyway.
-							if (x_advance > max_width)
-							{
-								// Set the glyph to the previous position.
-								// This is necessary for downstream linewidth calculations.
-								quad.x0 = quad.x1 = x_advance_old;
-								quad.y0 = quad.y1 = y_advance_old;
-							}
+							quad            = get_char(c, x_advance, y_advance);
+							skip_whitespace = false;
 						}
-					}
-					else
-					{
-						// No whitespace. Get the glyph size.
-						quad = get_char(c, x_advance, y_advance);
-					}
 
-					// Add the glyph's vertices.
-					result.emplace_back(quad.x0, quad.y0, quad.s0, quad.t0);
-					result.emplace_back(quad.x1, quad.y0, quad.s1, quad.t0);
-					result.emplace_back(quad.x0, quad.y1, quad.s0, quad.t1);
-					result.emplace_back(quad.x1, quad.y1, quad.s1, quad.t1);
-
-					// The next word will begin after any whitespaces.
-					if (is_whitespace)
-					{
-						begin_of_word = result.size();
-					}
-
-					// Check if we reached the end of the available space.
-					if (x_advance > max_width)
-					{
-						// Try to wrap the protruding text
-						if (wrap)
+						if (x_advance > max_width)
 						{
-							// Increase y to advance to the next line.
-							y_advance += size_px + 2.f;
+							bool wrapped              = false;
+							bool non_whitespace_break = false;
 
-							// We can just reset x and move on to the next character if this is a whitespace.
-							if (is_whitespace)
+							if (wrap)
 							{
-								x_advance = 0.f;
+								// scan previous chars
+								for (int j = i - 1, nb_chars = 0; j > 0; j--, nb_chars++)
+								{
+									if (text[j] == '\n')
+										break;
+
+									if (text[j] == ' ')
+									{
+										non_whitespace_break = true;
+										continue;
+									}
+
+									if (non_whitespace_break)
+									{
+										if (nb_chars > 1)
+										{
+											nb_chars--;
+
+											auto first_affected = result.size() - (nb_chars * 4);
+											f32 base_x          = result[first_affected].values[0];
+
+											for (usz n = first_affected; n < result.size(); ++n)
+											{
+												auto char_index = n / 4;
+												if (text[char_index] == ' ')
+												{
+													// Skip character
+													result[n++].vec2(0.f, 0.f);
+													result[n++].vec2(0.f, 0.f);
+													result[n++].vec2(0.f, 0.f);
+													result[n].vec2(0.f, 0.f);
+													continue;
+												}
+
+												result[n].values[0] -= base_x;
+												result[n].values[1] += size_px + 2.f;
+											}
+
+											x_advance = result.back().values[0];
+										}
+										else
+										{
+											x_advance = 0.f;
+										}
+
+										wrapped = true;
+										y_advance += size_px + 2.f;
+
+										if (text[i - 1] == ' ')
+										{
+											quad            = {};
+											skip_whitespace = true;
+										}
+										else
+										{
+											quad = get_char(c, x_advance, y_advance);
+										}
+
+										break;
+									}
+								}
+							}
+
+							if (!wrapped)
+							{
+								// TODO: Ellipsize
 								break;
 							}
-
-							// Get the leftmost offset of the current word.
-							const f32 base_x = result[begin_of_word].x();
-
-							// Move all characters of the current word one line down and to the left.
-							for (usz n = begin_of_word; n < result.size(); ++n)
-							{
-								result[n].x() -= base_x;
-								result[n].y() += size_px + 2.f;
-							}
-
-							// Set x offset to the rightmost position of the current word
-							x_advance = result.back().x();
-						}
-						else
-						{
-							// TODO: Ellipsize
 						}
+
+						result.emplace_back(quad.x0, quad.y0, quad.s0, quad.t0);
+						result.emplace_back(quad.x1, quad.y0, quad.s1, quad.t0);
+						result.emplace_back(quad.x0, quad.y1, quad.s0, quad.t1);
+						result.emplace_back(quad.x1, quad.y1, quad.s1, quad.t1);
+						break;
 					}
-
+					} // switch
+				}
+				else
+				{
 					break;
 				}
-				} // switch
 			}
-			return result;
 		}
 
 		std::vector<vertex> font::render_text(const char32_t* text, u16 max_width, bool wrap)
 		{
+			std::vector<vertex> result;
 			f32 unused_x, unused_y;
 
-			return render_text_ex(unused_x, unused_y, text, -1, max_width, wrap);
+			render_text_ex(result, unused_x, unused_y, text, -1, max_width, wrap);
+			return result;
 		}
 
-		std::pair<f32, f32> font::get_char_offset(const char32_t* text, usz max_length, u16 max_width, bool wrap)
+		std::pair<f32, f32> font::get_char_offset(const char32_t* text, u16 max_length, u16 max_width, bool wrap)
 		{
+			std::vector<vertex> unused;
 			f32 loc_x, loc_y;
 
-			render_text_ex(loc_x, loc_y, text, max_length, max_width, wrap);
+			render_text_ex(unused, loc_x, loc_y, text, max_length, max_width, wrap);
 			return {loc_x, loc_y};
 		}
 
-		const std::vector<u8>& font::get_glyph_data() const
+		void font::get_glyph_data(std::vector<u8>& bytes) const
 		{
-			constexpr u32 page_size = codepage::bitmap_width * codepage::bitmap_height;
+			const u32 page_size = codepage::bitmap_width * codepage::bitmap_height;
 			const auto size = page_size * m_glyph_map.size();
 
-			static thread_local std::vector<u8> bytes;
 			bytes.resize(size);
-
 			u8* data = bytes.data();
 
 			for (const auto& e : m_glyph_map)
@@ -432,7 +450,6 @@ namespace rsx
 				std::memcpy(data, e.second->glyph_data.data(), page_size);
 				data += page_size;
 			}
-			return bytes;
 		}
 	} // namespace overlays
 } // namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_fonts.h b/rpcs3/Emu/RSX/Overlays/overlay_fonts.h
index c673c60ab2..717374a5ac 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_fonts.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_fonts.h
@@ -73,13 +73,13 @@ namespace rsx
 
 			stbtt_aligned_quad get_char(char32_t c, f32& x_advance, f32& y_advance);
 
-			std::vector<vertex> render_text_ex(f32& x_advance, f32& y_advance, const char32_t* text, usz char_limit, u16 max_width, bool wrap);
+			void render_text_ex(std::vector<vertex>& result, f32& x_advance, f32& y_advance, const char32_t* text, u32 char_limit, u16 max_width, bool wrap);
 
 			std::vector<vertex> render_text(const char32_t* text, u16 max_width = -1, bool wrap = false);
 
-			std::pair<f32, f32> get_char_offset(const char32_t* text, usz max_length, u16 max_width = -1, bool wrap = false);
+			std::pair<f32, f32> get_char_offset(const char32_t* text, u16 max_length, u16 max_width = -1, bool wrap = false);
 
-			bool matches(const char* name, int size) const { return static_cast<int>(size_pt) == size && font_name == name; }
+			bool matches(const char* name, int size) const { return font_name == name && static_cast<int>(size_pt) == size; }
 			std::string_view get_name() const { return font_name; }
 			f32 get_size_pt() const { return size_pt; }
 			f32 get_size_px() const { return size_px; }
@@ -87,7 +87,7 @@ namespace rsx
 
 			// Renderer info
 			size3u get_glyph_data_dimensions() const { return { codepage::bitmap_width, codepage::bitmap_height, ::size32(m_glyph_map) }; }
-			const std::vector<u8>& get_glyph_data() const;
+			void get_glyph_data(std::vector<u8>& bytes) const;
 		};
 
 		// TODO: Singletons are cancer
@@ -99,7 +99,7 @@ namespace rsx
 
 			font* find(const char* name, int size)
 			{
-				for (const auto& f : fonts)
+				for (auto& f : fonts)
 				{
 					if (f->matches(name, size))
 						return f.get();
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp b/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp
index 093902dbe3..808ba3ad88 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp
@@ -6,8 +6,7 @@ namespace rsx
 {
 	namespace overlays
 	{
-		list_view::list_view(u16 width, u16 height, bool use_separators, bool can_deny)
-			: m_use_separators(use_separators)
+		list_view::list_view(u16 width, u16 height)
 		{
 			w = width;
 			h = height;
@@ -39,22 +38,7 @@ namespace rsx
 
 			m_scroll_indicator_bottom->set_pos(0, height - 40);
 			m_accept_btn->set_pos(30, height + 20);
-
-			if (can_deny)
-			{
-				m_deny_btn = std::make_unique<image_button>(120, 20);
-				m_deny_btn->set_size(120, 30);
-				m_deny_btn->set_image_resource(resource_config::standard_image_resource::triangle);
-				m_deny_btn->set_pos(180, height + 20);
-				m_deny_btn->set_text(localized_string_id::RSX_OVERLAYS_LIST_DENY);
-				m_deny_btn->set_font("Arial", 16);
-
-				m_cancel_btn->set_pos(330, height + 20);
-			}
-			else
-			{
-				m_cancel_btn->set_pos(180, height + 20);
-			}
+			m_cancel_btn->set_pos(180, height + 20);
 
 			m_accept_btn->set_text(localized_string_id::RSX_OVERLAYS_LIST_SELECT);
 			m_cancel_btn->set_text(localized_string_id::RSX_OVERLAYS_LIST_CANCEL);
@@ -71,43 +55,25 @@ namespace rsx
 			m_scroll_indicator_bottom->fore_color.a = 0.f;
 		}
 
-		const overlay_element* list_view::get_selected_entry() const
-		{
-			if (m_selected_entry < 0)
-			{
-				return nullptr; // Ideally unreachable but it should still be possible to recover by user interaction.
-			}
-
-			const usz current_index = static_cast<usz>(m_selected_entry) * (m_use_separators ? 2 : 1);
-
-			if (current_index >= m_items.size())
-			{
-				return nullptr; // Ideally unreachable but it should still be possible to recover by user interaction.
-			}
-
-			return m_items[current_index].get();
-		}
-
 		void list_view::update_selection()
 		{
-			const overlay_element* current_element = get_selected_entry();
-
-			for (auto& item : m_items)
-			{
-				if (item)
-				{
-					item->set_selected(item.get() == current_element);
-				}
-			}
-
-			if (!current_element)
+			if (m_selected_entry < 0)
 			{
 				return; // Ideally unreachable but it should still be possible to recover by user interaction.
 			}
 
+			const usz current_index = static_cast<usz>(m_selected_entry) * 2;
+
+			if (m_items.size() <= current_index)
+			{
+				return; // Ideally unreachable but it should still be possible to recover by user interaction.
+			}
+
+			auto current_element = m_items[current_index].get();
+
 			// Calculate bounds
-			const auto min_y = current_element->y - y;
-			const auto max_y = current_element->y + current_element->h + pack_padding + 2 - y;
+			auto min_y = current_element->y - y;
+			auto max_y = current_element->y + current_element->h + pack_padding + 2 - y;
 
 			if (min_y < scroll_offset_value)
 			{
@@ -173,14 +139,11 @@ namespace rsx
 			m_elements_count++;
 
 			// Add separator
-			if (m_use_separators)
-			{
-				auto separator        = std::make_unique<overlay_element>();
-				separator->back_color = fore_color;
-				separator->w          = w;
-				separator->h          = 2;
-				add_element(separator);
-			}
+			auto separator        = std::make_unique<overlay_element>();
+			separator->back_color = fore_color;
+			separator->w          = w;
+			separator->h          = 2;
+			add_element(separator);
 
 			if (m_selected_entry < 0)
 				m_selected_entry = 0;
@@ -194,22 +157,23 @@ namespace rsx
 			return m_selected_entry;
 		}
 
+		std::u32string list_view::get_selected_item()
+		{
+			if (m_selected_entry < 0)
+				return {};
+
+			return m_items[m_selected_entry]->text;
+		}
+
 		void list_view::set_cancel_only(bool cancel_only)
 		{
 			if (cancel_only)
 				m_cancel_btn->set_pos(x + 30, y + h + 20);
-			else if (m_deny_btn)
-				m_cancel_btn->set_pos(x + 330, y + h + 20);
 			else
 				m_cancel_btn->set_pos(x + 180, y + h + 20);
 
 			m_cancel_only = cancel_only;
-			m_is_compiled = false;
-		}
-
-		bool list_view::get_cancel_only() const
-		{
-			return m_cancel_only;
+			is_compiled   = false;
 		}
 
 		void list_view::translate(s16 _x, s16 _y)
@@ -219,33 +183,21 @@ namespace rsx
 			m_scroll_indicator_bottom->translate(_x, _y);
 			m_accept_btn->translate(_x, _y);
 			m_cancel_btn->translate(_x, _y);
-
-			if (m_deny_btn)
-			{
-				m_deny_btn->translate(_x, _y);
-			}
 		}
 
 		compiled_resource& list_view::get_compiled()
 		{
-			if (!is_compiled())
+			if (!is_compiled)
 			{
-				auto& compiled = vertical_layout::get_compiled();
+				auto compiled = vertical_layout::get_compiled();
 				compiled.add(m_highlight_box->get_compiled());
 				compiled.add(m_scroll_indicator_top->get_compiled());
 				compiled.add(m_scroll_indicator_bottom->get_compiled());
 				compiled.add(m_cancel_btn->get_compiled());
 
 				if (!m_cancel_only)
-				{
 					compiled.add(m_accept_btn->get_compiled());
 
-					if (m_deny_btn)
-					{
-						compiled.add(m_deny_btn->get_compiled());
-					}
-				}
-
 				compiled_resources = compiled;
 			}
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_list_view.hpp b/rpcs3/Emu/RSX/Overlays/overlay_list_view.hpp
index c2378c5319..8629b0ef86 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_list_view.hpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_list_view.hpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "overlay_controls.h"
 
 namespace rsx
@@ -13,18 +11,16 @@ namespace rsx
 			std::unique_ptr<image_view> m_scroll_indicator_bottom;
 			std::unique_ptr<image_button> m_cancel_btn;
 			std::unique_ptr<image_button> m_accept_btn;
-			std::unique_ptr<image_button> m_deny_btn;
 			std::unique_ptr<overlay_element> m_highlight_box;
 
 			u16 m_elements_height = 0;
 			s32 m_selected_entry = -1;
 			u16 m_elements_count = 0;
 
-			bool m_use_separators = false;
 			bool m_cancel_only = false;
 
 		public:
-			list_view(u16 width, u16 height, bool use_separators = true, bool can_deny = false);
+			list_view(u16 width, u16 height);
 
 			void update_selection();
 
@@ -35,8 +31,8 @@ namespace rsx
 			void add_entry(std::unique_ptr<overlay_element>& entry);
 
 			int get_selected_index() const;
-			bool get_cancel_only() const;
-			const overlay_element* get_selected_entry() const;
+
+			std::u32string get_selected_item();
 
 			void set_cancel_only(bool cancel_only);
 			void translate(s16 _x, s16 _y) override;
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_loading_icon.hpp b/rpcs3/Emu/RSX/Overlays/overlay_loading_icon.hpp
deleted file mode 100644
index 28db156e02..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_loading_icon.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include "overlay_animated_icon.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		class loading_icon24 : public animated_icon
-		{
-		public:
-			loading_icon24()
-				: animated_icon("spinner-24.png")
-			{
-				init_params();
-			}
-
-			loading_icon24(const std::vector<u8>& icon_data)
-				: animated_icon(icon_data)
-			{
-				init_params();
-			}
-
-		private:
-			void init_params()
-			{
-				m_frame_width = m_frame_height = 24;
-				m_spacing_x = m_spacing_y = 6;
-
-				set_size(24, 30);
-				set_padding(4, 0, 2, 8);
-			}
-		};
-	}
-}
-
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_manager.cpp b/rpcs3/Emu/RSX/Overlays/overlay_manager.cpp
deleted file mode 100644
index 485a59443e..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_manager.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-#include "stdafx.h"
-#include "overlay_manager.h"
-#include "Emu/System.h"
-#include <util/asm.hpp>
-
-namespace rsx
-{
-	namespace overlays
-	{
-		display_manager::display_manager(int) noexcept
-		{
-			m_input_thread = std::make_shared<named_thread<overlay_input_thread>>();
-			(*m_input_thread)([this]()
-			{
-				input_thread_loop();
-			});
-		}
-
-		display_manager::~display_manager()
-		{
-			if (m_input_thread)
-			{
-				// This keeps the input thread from looping again
-				m_input_thread_abort.store(true);
-
-				// Wake it if it is asleep
-				const input_thread_context_t wakeup_node =
-				{
-					"stop_node",
-					nullptr,
-					nullptr,
-					nullptr,
-					nullptr
-				};
-				m_input_token_stack.push(wakeup_node);
-
-				// Wait for join
-				*m_input_thread = thread_state::aborting;
-				while (*m_input_thread <= thread_state::aborting)
-				{
-					utils::pause();
-				}
-			}
-		}
-
-		void display_manager::lock()
-		{
-			m_list_mutex.lock();
-		}
-
-		void display_manager::unlock()
-		{
-			if (m_pending_removals_count > 0)
-			{
-				cleanup_internal();
-			}
-
-			m_list_mutex.unlock();
-		}
-
-		void display_manager::lock_shared()
-		{
-			m_list_mutex.lock_shared();
-		}
-
-		void display_manager::unlock_shared()
-		{
-			m_list_mutex.unlock_shared();
-		}
-
-		std::shared_ptr<overlay> display_manager::get(u32 uid)
-		{
-			reader_lock lock(m_list_mutex);
-
-			for (const auto& iface : m_iface_list)
-			{
-				if (iface->uid == uid)
-					return iface;
-			}
-
-			return {};
-		}
-
-		void display_manager::remove(u32 uid)
-		{
-			if (m_list_mutex.try_lock())
-			{
-				remove_uid(uid);
-				m_list_mutex.unlock();
-				return;
-			}
-
-			// Enqueue
-			m_uids_to_remove.push(uid);
-			m_pending_removals_count++;
-		}
-
-		void display_manager::dispose(const std::vector<u32>& uids)
-		{
-			std::lock_guard lock(m_list_mutex);
-
-			if (m_pending_removals_count > 0)
-			{
-				cleanup_internal();
-			}
-
-			m_dirty_list.erase
-			(
-				std::remove_if(m_dirty_list.begin(), m_dirty_list.end(), [&uids](std::shared_ptr<overlay>& e)
-				{
-					return std::find(uids.begin(), uids.end(), e->uid) != uids.end();
-				}),
-				m_dirty_list.end()
-			);
-		}
-
-		bool display_manager::remove_type(u32 type_id)
-		{
-			bool found = false;
-			for (auto It = m_iface_list.begin(); It != m_iface_list.end();)
-			{
-				if (It->get()->type_index == type_id)
-				{
-					on_overlay_removed(*It);
-					m_dirty_list.push_back(std::move(*It));
-					It = m_iface_list.erase(It);
-					found = true;
-				}
-				else
-				{
-					++It;
-				}
-			}
-
-			return found;
-		}
-
-		bool display_manager::remove_uid(u32 uid)
-		{
-			for (auto It = m_iface_list.begin(); It != m_iface_list.end(); It++)
-			{
-				const auto e = It->get();
-				if (e->uid == uid)
-				{
-					on_overlay_removed(*It);
-					m_dirty_list.push_back(std::move(*It));
-					m_iface_list.erase(It);
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		void display_manager::cleanup_internal()
-		{
-			for (auto&& uid : m_uids_to_remove.pop_all())
-			{
-				remove_uid(uid);
-				m_pending_removals_count--;
-			}
-
-			for (auto&& type_id : m_type_ids_to_remove.pop_all())
-			{
-				remove_type(type_id);
-				m_pending_removals_count--;
-			}
-		}
-
-		void display_manager::on_overlay_activated(const std::shared_ptr<overlay>& /*item*/)
-		{
-			// TODO: Internal management, callbacks, etc
-		}
-
-		void display_manager::attach_thread_input(
-			u32 uid,
-			const std::string_view& name,
-			std::function<void()> on_input_loop_enter,
-			std::function<void(s32)> on_input_loop_exit,
-			std::function<s32()> input_loop_override)
-		{
-			if (auto iface = std::dynamic_pointer_cast<user_interface>(get(uid)))
-			{
-				std::lock_guard lock(m_input_stack_guard);
-
-				// Add our interface to the queue
-				m_input_token_stack.push(
-					name,
-					std::move(iface),
-					on_input_loop_enter,
-					on_input_loop_exit,
-					input_loop_override);
-
-				// Signal input thread loop after pushing to avoid a race.
-				m_input_thread_interrupted = true;
-			}
-		}
-
-		void display_manager::on_overlay_removed(const std::shared_ptr<overlay>& item)
-		{
-			auto iface = std::dynamic_pointer_cast<user_interface>(item);
-			if (!iface)
-			{
-				// Not instance of UI, ignore
-				return;
-			}
-
-			iface->detach_input();
-		}
-
-		void display_manager::input_thread_loop()
-		{
-			// Avoid tail recursion by reinserting pushed-down items
-			std::vector<input_thread_context_t> interrupted_items;
-
-			while (!m_input_thread_abort)
-			{
-				// We're about to load the whole list, interruption makes no sense before this point
-				m_input_thread_interrupted = false;
-
-				for (auto&& input_context : m_input_token_stack.pop_all_reversed())
-				{
-					if (!input_context.target || input_context.target->is_detached())
-					{
-						continue;
-					}
-
-					if (m_input_thread_interrupted)
-					{
-						// Someone just pushed something onto the stack. Check if we already saw it.
-						if (m_input_token_stack)
-						{
-							// We actually have new items to read out. Skip the remaining list.
-							interrupted_items.push_back(input_context);
-							continue;
-						}
-
-						// False alarm, we already saw it.
-						m_input_thread_interrupted = false;
-					}
-
-					if (input_context.input_loop_prologue &&
-						!input_context.prologue_completed)
-					{
-						input_context.input_loop_prologue();
-						input_context.prologue_completed = true;
-					}
-
-					s32 result = 0;
-
-					if (!input_context.input_loop_override) [[ likely ]]
-					{
-						result = input_context.target->run_input_loop([this]()
-						{
-							// Stop if interrupt status is set or input stack is empty
-							return !m_input_thread_interrupted || !m_input_token_stack;
-						});
-					}
-					else
-					{
-						result = input_context.input_loop_override();
-					}
-
-					if (result == user_interface::selection_code::interrupted)
-					{
-						// This dialog was exited prematurely, so we must re-run it's input routine later.
-						ensure(m_input_thread_interrupted);
-						ensure(m_input_token_stack);
-						interrupted_items.push_back(input_context);
-						continue;
-					}
-
-					if (input_context.input_loop_epilogue)
-					{
-						input_context.input_loop_epilogue(result);
-					}
-					else if (result && result != user_interface::selection_code::canceled)
-					{
-						rsx_log.error("%s exited with error code=%d", input_context.name, result);
-					}
-				}
-
-				if (!interrupted_items.empty())
-				{
-					std::lock_guard lock(m_input_stack_guard);
-
-					// We need to rebuild the stack in reverse order here
-					const auto current_stack = m_input_token_stack.pop_all();
-
-					// Re-insert interrupted list
-					for (auto it = interrupted_items.crbegin(); it != interrupted_items.crend(); ++it)
-					{
-						m_input_token_stack.push(*it);
-					}
-
-					// Re-insert the 'new' list oldest-first
-					for (const auto& iface : current_stack)
-					{
-						m_input_token_stack.push(iface);
-					}
-
-					// Clear
-					interrupted_items.clear();
-				}
-				else if (!m_input_thread_abort)
-				{
-					thread_ctrl::wait_on(m_input_token_stack);
-				}
-			}
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_manager.h b/rpcs3/Emu/RSX/Overlays/overlay_manager.h
deleted file mode 100644
index 7146be3dda..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_manager.h
+++ /dev/null
@@ -1,213 +0,0 @@
-#pragma once
-
-#include "overlays.h"
-
-#include "Emu/IdManager.h"
-#include "Utilities/mutex.h"
-#include "Utilities/Thread.h"
-#include "Utilities/lockless.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		struct overlay;
-
-		class display_manager
-		{
-		private:
-			atomic_t<u32> m_uid_ctr = 0;
-			std::vector<std::shared_ptr<overlay>> m_iface_list;
-			std::vector<std::shared_ptr<overlay>> m_dirty_list;
-
-			shared_mutex m_list_mutex;
-			lf_queue<u32> m_uids_to_remove;
-			lf_queue<u32> m_type_ids_to_remove;
-			atomic_t<u32> m_pending_removals_count = 0;
-
-			bool remove_type(u32 type_id);
-
-			bool remove_uid(u32 uid);
-
-			void cleanup_internal();
-
-			void on_overlay_activated(const std::shared_ptr<overlay>& item);
-
-			void on_overlay_removed(const std::shared_ptr<overlay>& item);
-
-		public:
-			// Disable default construction to make it conditionally available in g_fxo
-			explicit display_manager(int) noexcept;
-
-			~display_manager();
-
-			// Adds an object to the internal list. Optionally removes other objects of the same type.
-			// Original handle loses ownership but a usable pointer is returned
-			template <typename T>
-			std::shared_ptr<T> add(std::shared_ptr<T>& entry, bool remove_existing = true)
-			{
-				std::lock_guard lock(m_list_mutex);
-
-				entry->uid = m_uid_ctr.fetch_add(1);
-				entry->type_index = stx::typeindex<id_manager::typeinfo, T>();
-
-				if (remove_existing)
-				{
-					for (auto It = m_iface_list.begin(); It != m_iface_list.end(); It++)
-					{
-						if (It->get()->type_index == entry->type_index)
-						{
-							// Replace
-							m_dirty_list.push_back(std::move(*It));
-							*It = std::move(entry);
-							return std::static_pointer_cast<T>(*It);
-						}
-					}
-				}
-
-				m_iface_list.push_back(std::move(entry));
-				on_overlay_activated(m_iface_list.back());
-				return std::static_pointer_cast<T>(m_iface_list.back());
-			}
-
-			// Allocates object and adds to internal list. Returns pointer to created object
-			template <typename T, typename ...Args>
-			std::shared_ptr<T> create(Args&&... args)
-			{
-				auto object = std::make_shared<T>(std::forward<Args>(args)...);
-				return add(object);
-			}
-
-			// Removes item from list if it matches the uid
-			void remove(u32 uid);
-
-			// Removes all objects of this type from the list
-			template <typename T>
-			void remove()
-			{
-				const auto type_id = stx::typeindex<id_manager::typeinfo, T>();
-				if (m_list_mutex.try_lock())
-				{
-					remove_type(type_id);
-					m_list_mutex.unlock();
-					return;
-				}
-
-				// Enqueue
-				m_type_ids_to_remove.push(type_id);
-				m_pending_removals_count++;
-			}
-
-			// True if any visible elements to draw exist
-			bool has_visible() const
-			{
-				return !m_iface_list.empty();
-			}
-
-			// True if any elements have been deleted but their resources may not have been cleaned up
-			bool has_dirty() const
-			{
-				return !m_dirty_list.empty();
-			}
-
-			// Returns current list for reading. Caller must ensure synchronization by first locking the list
-			const std::vector<std::shared_ptr<overlay>>& get_views() const
-			{
-				return m_iface_list;
-			}
-
-			// Returns current list of removed objects not yet deallocated for reading.
-			// Caller must ensure synchronization by first locking the list
-			const std::vector<std::shared_ptr<overlay>>& get_dirty() const
-			{
-				return m_dirty_list;
-			}
-
-			// Deallocate object. Object must first be removed via the remove() functions
-			void dispose(const std::vector<u32>& uids);
-
-			// Returns pointer to the object matching the given uid
-			std::shared_ptr<overlay> get(u32 uid);
-
-			// Returns pointer to the first object matching the given type
-			template <typename T>
-			std::shared_ptr<T> get()
-			{
-				reader_lock lock(m_list_mutex);
-
-				const auto type_id = stx::typeindex<id_manager::typeinfo, T>();
-				for (const auto& iface : m_iface_list)
-				{
-					if (iface->type_index == type_id)
-					{
-						return std::static_pointer_cast<T>(iface);
-					}
-				}
-
-				return {};
-			}
-
-			// Lock for exclusive access (BasicLockable)
-			void lock();
-
-			// Release lock (BasicLockable). May perform internal cleanup before returning
-			void unlock();
-
-			// Lock for shared access (reader-lock)
-			void lock_shared();
-
-			// Unlock for shared access (reader-lock)
-			void unlock_shared();
-
-			// Enable input thread attach to the specified interface
-			void attach_thread_input(
-				u32 uid,                                                 // The input target
-				const std::string_view& name,                            // The name of the target
-				std::function<void()> on_input_loop_enter = nullptr,     // [optional] What to do before running the input routine
-				std::function<void(s32)> on_input_loop_exit = nullptr,   // [optional] What to do with the result if any
-				std::function<s32()> input_loop_override = nullptr);     // [optional] What to do during the input loop. By default calls user_interface::run_input_loop
-
-		private:
-			struct overlay_input_thread
-			{
-				static constexpr auto thread_name = "Overlay Input Thread"sv;
-			};
-
-			struct input_thread_context_t
-			{
-				// Ctor
-				input_thread_context_t(
-					const std::string_view& name,
-					std::shared_ptr<user_interface> iface,
-					std::function<void()> on_input_loop_enter,
-					std::function<void(s32)> on_input_loop_exit,
-					std::function<s32()> input_loop_override)
-					: name(name)
-					, target(iface)
-					, input_loop_prologue(on_input_loop_enter)
-					, input_loop_epilogue(on_input_loop_exit)
-					, input_loop_override(input_loop_override)
-					, prologue_completed(false)
-				{}
-
-				// Attributes
-				std::string_view name;
-				std::shared_ptr<user_interface> target;
-				std::function<void()> input_loop_prologue;
-				std::function<void(s32)> input_loop_epilogue;
-				std::function<s32()> input_loop_override;
-
-				// Runtime stats
-				bool prologue_completed;
-			};
-
-			lf_queue<input_thread_context_t> m_input_token_stack;
-			atomic_t<bool> m_input_thread_abort = false;
-			atomic_t<bool> m_input_thread_interrupted = false;
-			shared_mutex m_input_stack_guard;
-
-			std::shared_ptr<named_thread<overlay_input_thread>> m_input_thread;
-			void input_thread_loop();
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp
deleted file mode 100644
index 2cf113243a..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp
+++ /dev/null
@@ -1,437 +0,0 @@
-#include "stdafx.h"
-#include "overlays.h"
-#include "overlay_manager.h"
-#include "overlay_media_list_dialog.h"
-
-#include "Emu/Cell/Modules/cellMusic.h"
-#include "Emu/System.h"
-#include "Emu/VFS.h"
-#include "Utilities/StrUtil.h"
-#include "Utilities/Thread.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		media_list_dialog::media_list_entry::media_list_entry(const media_list_dialog::media_entry& entry)
-		{
-			std::unique_ptr<overlay_element> image = std::make_unique<image_view>();
-			image->set_size(160, 110);
-			image->set_padding(36, 36, 11, 11); // Square image, 88x88
-
-			switch (entry.type)
-			{
-			case media_list_dialog::media_type::audio:
-			{
-				// TODO: use thumbnail or proper icon
-				static_cast<image_view*>(image.get())->set_image_resource(resource_config::standard_image_resource::new_entry);
-				break;
-			}
-			case media_list_dialog::media_type::video:
-			{
-				// TODO: use thumbnail or proper icon
-				static_cast<image_view*>(image.get())->set_image_resource(resource_config::standard_image_resource::new_entry);
-				break;
-			}
-			case media_list_dialog::media_type::photo:
-			{
-				if (fs::exists(entry.info.path))
-				{
-					// Fit the new image into the available space
-					if (entry.info.width > 0 && entry.info.height > 0)
-					{
-						const u16 target_width = image->w - (image->padding_left + image->padding_right);
-						const u16 target_height = image->h - (image->padding_top + image->padding_bottom);
-						const f32 target_ratio = target_width / static_cast<f32>(target_height);
-						const f32 image_ratio = entry.info.width / static_cast<f32>(entry.info.height);
-						const f32 convert_ratio = image_ratio / target_ratio;
-
-						if (convert_ratio > 1.0f)
-						{
-							const u16 new_padding = static_cast<u16>(target_height - target_height / convert_ratio) / 2;
-							image->set_padding(image->padding_left, image->padding_right, new_padding + image->padding_top, new_padding + image->padding_bottom);
-						}
-						else if (convert_ratio < 1.0f)
-						{
-							const u16 new_padding = static_cast<u16>(target_width - target_width * convert_ratio) / 2;
-							image->set_padding(image->padding_left + new_padding, image->padding_right + new_padding, image->padding_top, image->padding_bottom);
-						}
-					}
-
-					icon_data = std::make_unique<image_info>(entry.info.path);
-					static_cast<image_view*>(image.get())->set_raw_image(icon_data.get());
-				}
-				else
-				{
-					// Fallback
-					// TODO: use proper icon
-					static_cast<image_view*>(image.get())->set_image_resource(resource_config::standard_image_resource::new_entry);
-				}
-				break;
-			}
-			case media_list_dialog::media_type::directory:
-			{
-				static_cast<image_view*>(image.get())->set_image_resource(resource_config::standard_image_resource::save);
-				break;
-			}
-			case media_list_dialog::media_type::invalid:
-				fmt::throw_exception("Unexpected media type");
-			}
-
-			char title[384]{}; // CELL_SEARCH_TITLE_LEN_MAX
-			char artist[384]{}; // CELL_SEARCH_TITLE_LEN_MAX
-
-			if (entry.type == media_type::directory)
-			{
-				strcpy_trunc(title, entry.name);
-			}
-			else
-			{
-				utils::parse_metadata(title, entry.info, "title", entry.name.substr(0, entry.name.find_last_of('.')), 384); // CELL_SEARCH_TITLE_LEN_MAX
-				utils::parse_metadata(artist, entry.info, "artist", "Unknown Artist", 384); // CELL_SEARCH_TITLE_LEN_MAX
-			}
-
-			std::unique_ptr<overlay_element> text_stack  = std::make_unique<vertical_layout>();
-			std::unique_ptr<overlay_element> padding     = std::make_unique<spacer>();
-			std::unique_ptr<overlay_element> header_text = std::make_unique<label>(title);
-			std::unique_ptr<overlay_element> subtext     = std::make_unique<label>(artist);
-
-			padding->set_size(1, 1);
-			header_text->set_size(800, 40);
-			header_text->set_font("Arial", 16);
-			header_text->set_wrap_text(true);
-
-			subtext->set_size(800, 0);
-			subtext->set_font("Arial", 14);
-			subtext->set_wrap_text(true);
-			static_cast<label*>(subtext.get())->auto_resize(true);
-
-			// Make back color transparent for text
-			header_text->back_color.a = 0.f;
-			subtext->back_color.a     = 0.f;
-
-			static_cast<vertical_layout*>(text_stack.get())->pack_padding = 5;
-			static_cast<vertical_layout*>(text_stack.get())->add_element(padding);
-			static_cast<vertical_layout*>(text_stack.get())->add_element(header_text);
-			static_cast<vertical_layout*>(text_stack.get())->add_element(subtext);
-
-			if (text_stack->h > image->h)
-			{
-				std::unique_ptr<overlay_element> padding2 = std::make_unique<spacer>();
-				padding2->set_size(1, 5);
-				static_cast<vertical_layout*>(text_stack.get())->add_element(padding2);
-			}
-
-			// Pack
-			pack_padding = 15;
-			add_element(image);
-			add_element(text_stack);
-		}
-
-		media_list_dialog::media_list_dialog()
-		{
-			m_dim_background = std::make_unique<overlay_element>();
-			m_dim_background->set_size(virtual_width, virtual_height);
-			m_dim_background->back_color.a = 0.5f;
-
-			m_description = std::make_unique<label>();
-			m_description->set_font("Arial", 20);
-			m_description->set_pos(20, 37);
-			m_description->set_text("Select media"); // Fallback. I don't think this will ever be used, so I won't localize it.
-			m_description->auto_resize();
-			m_description->back_color.a = 0.f;
-		}
-
-		void media_list_dialog::on_button_pressed(pad_button button_press, bool is_auto_repeat)
-		{
-			bool play_cursor_sound = true;
-
-			switch (button_press)
-			{
-			case pad_button::cross:
-				if (m_no_media_text)
-					break;
-				return_code = m_list->get_selected_index();
-				m_stop_input_loop = true;
-				play_cursor_sound = false;
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_decide.wav");
-				break;
-			case pad_button::circle:
-				return_code = selection_code::canceled;
-				m_stop_input_loop = true;
-				play_cursor_sound = false;
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cancel.wav");
-				break;
-			case pad_button::dpad_up:
-				m_list->select_previous();
-				break;
-			case pad_button::dpad_down:
-				m_list->select_next();
-				break;
-			case pad_button::L1:
-				m_list->select_previous(10);
-				break;
-			case pad_button::R1:
-				m_list->select_next(10);
-				break;
-			default:
-				rsx_log.trace("[ui] Button %d pressed", static_cast<u8>(button_press));
-				break;
-			}
-
-			// Play a sound unless this is a fast auto repeat which would induce a nasty noise
-			if (play_cursor_sound && (!is_auto_repeat || m_auto_repeat_ms_interval >= m_auto_repeat_ms_interval_default))
-			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cursor.wav");
-			}
-		}
-
-		compiled_resource media_list_dialog::get_compiled()
-		{
-			if (!visible)
-			{
-				return {};
-			}
-
-			compiled_resource result;
-			result.add(m_dim_background->get_compiled());
-			result.add(m_list->get_compiled());
-			result.add(m_description->get_compiled());
-
-			if (m_no_media_text)
-				result.add(m_no_media_text->get_compiled());
-
-			return result;
-		}
-
-		s32 media_list_dialog::show(media_entry* root, media_entry& result, const std::string& title, u32 focused, bool enable_overlay)
-		{
-			auto ref = g_fxo->get<display_manager>().get(uid);
-
-			m_media = root;
-			result = {};
-
-			if (enable_overlay)
-			{
-				m_dim_background->back_color.a = 0.9f;
-			}
-			else
-			{
-				m_dim_background->back_color.a = 0.5f;
-			}
-
-			while (thread_ctrl::state() != thread_state::aborting && return_code >= 0 && m_media && m_media->type == media_list_dialog::media_type::directory)
-			{
-				reload(title, focused);
-				m_stop_input_loop = false;
-
-				if (const auto error = run_input_loop())
-				{
-					if (error != selection_code::canceled)
-					{
-						rsx_log.error("Media list dialog input loop exited with error code=%d", error);
-					}
-					return error;
-				}
-
-				if (return_code >= 0)
-				{
-					focused = 0;
-					ensure(static_cast<size_t>(return_code) < m_media->children.size());
-					m_media = &m_media->children[return_code];
-					rsx_log.notice("Media dialog: selected entry: %d ('%s')", return_code, m_media->path);
-					continue;
-				}
-
-				if (return_code == user_interface::selection_code::canceled)
-				{
-					if (m_media == root)
-					{
-						rsx_log.notice("Media list dialog canceled");
-						break;
-					}
-
-					focused = m_media->index;
-					m_media = m_media->parent;
-					return_code = 0;
-					rsx_log.notice("Media list dialog moving to parent directory (focused=%d)", focused);
-					continue;
-				}
-
-				rsx_log.error("Left media list dialog with error: %d", return_code);
-				break;
-			}
-
-			m_interactive = false; // KLUDGE: Set interactive to false in order to stop pad interaction properly in close.
-			close(false, true);
-
-			if (return_code >= 0 && m_media && m_media->type != media_list_dialog::media_type::directory)
-			{
-				result = *m_media;
-				rsx_log.notice("Left media list dialog: return_code=%d, type=%d, path=%s", return_code, static_cast<s32>(result.type), result.info.path);
-			}
-
-			return return_code;
-		}
-
-		void media_list_dialog::reload(const std::string& title, u32 focused)
-		{
-			ensure(m_media);
-
-			rsx_log.notice("Media dialog: showing entry '%s' ('%s')", m_media->name, m_media->path);
-
-			if (m_list)
-			{
-				status_flags |= status_bits::invalidate_image_cache;
-			}
-
-			m_list = std::make_unique<list_view>(virtual_width - 2 * 20, 540);
-			m_list->set_pos(20, 85);
-
-			for (const media_entry& child : m_media->children)
-			{
-				std::unique_ptr<overlay_element> entry = std::make_unique<media_list_entry>(child);
-				m_list->add_entry(entry);
-			}
-
-			if (m_list->m_items.empty())
-			{
-				m_no_media_text = std::make_unique<label>(get_localized_string(localized_string_id::RSX_OVERLAYS_MEDIA_DIALOG_EMPTY));
-				m_no_media_text->set_font("Arial", 20);
-				m_no_media_text->align_text(overlay_element::text_align::center);
-				m_no_media_text->set_pos(m_list->x, m_list->y + m_list->h / 2);
-				m_no_media_text->set_size(m_list->w, 30);
-				m_no_media_text->back_color.a = 0;
-
-				m_list->set_cancel_only(true);
-			}
-			else
-			{
-				// Only select an entry if there are entries available
-				m_list->select_entry(focused);
-			}
-
-			m_description->set_text(title);
-			m_description->auto_resize();
-
-			visible = true;
-		}
-
-		struct media_list_dialog_thread
-		{
-			static constexpr auto thread_name = "MediaList Thread"sv;
-		};
-
-		void parse_media_recursive(u32 depth, const std::string& media_path, const std::string& name, media_list_dialog::media_type type, media_list_dialog::media_entry& current_entry)
-		{
-			if (depth++ > music_selection_context::max_depth)
-			{
-				return;
-			}
-
-			if (fs::is_dir(media_path))
-			{
-				for (auto&& dir_entry : fs::dir{media_path})
-				{
-					if (dir_entry.name == "." || dir_entry.name == "..")
-					{
-						continue;
-					}
-
-					const std::string unescaped_name = vfs::unescape(dir_entry.name);
-
-					media_list_dialog::media_entry new_entry{};
-					parse_media_recursive(depth, media_path + "/" + dir_entry.name, unescaped_name, type, new_entry);
-					if (new_entry.type != media_list_dialog::media_type::invalid)
-					{
-						new_entry.parent = &current_entry;
-						new_entry.index = ::narrow<u32>(current_entry.children.size());
-						current_entry.children.emplace_back(std::move(new_entry));
-					}
-				}
-
-				// Only keep directories that contain valid entries
-				if (current_entry.children.empty())
-				{
-					rsx_log.notice("parse_media_recursive: No matches in directory '%s'", media_path);
-				}
-				else
-				{
-					rsx_log.notice("parse_media_recursive: Found %d matches in directory '%s'", current_entry.children.size(), media_path);
-					current_entry.type = media_list_dialog::media_type::directory;
-					current_entry.info.path = media_path;
-				}
-			}
-			else
-			{
-				// Try to peek into the file
-				const s32 av_media_type = type == media_list_dialog::media_type::photo ? -1
-				                        : type == media_list_dialog::media_type::video ? 0 /*AVMEDIA_TYPE_VIDEO*/
-				                        : 1 /*AVMEDIA_TYPE_AUDIO*/;
-				auto [success, info] = utils::get_media_info(media_path, av_media_type);
-				if (success)
-				{
-					current_entry.type = type;
-					current_entry.info = std::move(info);
-					rsx_log.notice("parse_media_recursive: Found media '%s'", media_path);
-				}
-			}
-
-			if (current_entry.type != media_list_dialog::media_type::invalid)
-			{
-				current_entry.path = media_path;
-				current_entry.name = name;
-			}
-		}
-
-		error_code show_media_list_dialog(media_list_dialog::media_type type, const std::string& path, const std::string& title, std::function<void(s32 status, utils::media_info info)> on_finished)
-		{
-			rsx_log.todo("show_media_list_dialog(type=%d, path='%s', title='%s', on_finished=%d)", static_cast<s32>(type), path, title, !!on_finished);
-
-			if (!on_finished)
-			{
-				return CELL_CANCEL;
-			}
-
-			g_fxo->get<named_thread<media_list_dialog_thread>>()([=]()
-			{
-				media_list_dialog::media_entry root_media_entry{};
-				root_media_entry.type = media_list_dialog::media_type::directory;
-
-				if (fs::is_dir(path))
-				{
-					parse_media_recursive(0, path, title, type, root_media_entry);
-				}
-				else
-				{
-					rsx_log.error("Media list: Failed to open path: '%s'", path);
-				}
-
-				media_list_dialog::media_entry media{};
-				s32 result = 0;
-				u32 focused = 0;
-
-				if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
-				{
-					result = manager->create<rsx::overlays::media_list_dialog>()->show(&root_media_entry, media, title, focused, true);
-				}
-				else
-				{
-					result = user_interface::selection_code::canceled;
-					rsx_log.error("Media selection is only possible when the native user interface is enabled in the settings. The action will be canceled.");
-				}
-
-				if (result >= 0 && media.type == type)
-				{
-					on_finished(CELL_OK, media.info);
-				}
-				else
-				{
-					on_finished(result, {});
-				}
-			});
-
-			return CELL_OK;
-		}
-	} // namespace overlays
-} // namespace RSX
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.h b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.h
deleted file mode 100644
index 6a5d39b3fa..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#pragma once
-
-#include "overlays.h"
-#include "overlay_list_view.hpp"
-#include "Emu/Cell/ErrorCodes.h"
-#include "util/media_utils.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		struct media_list_dialog : public user_interface
-		{
-		public:
-			enum class media_type
-			{
-				invalid,   // For internal use only
-				directory, // For internal use only
-				audio,
-				video,
-				photo,
-			};
-
-			struct media_entry
-			{
-				media_type type = media_type::invalid;
-				std::string name;
-				std::string path;
-				utils::media_info info;
-				u32 index = 0;
-
-				media_entry* parent = nullptr;
-				std::vector<media_entry> children;
-			};
-
-			media_list_dialog();
-
-			void on_button_pressed(pad_button button_press, bool is_auto_repeat) override;
-
-			compiled_resource get_compiled() override;
-
-			s32 show(media_entry* root, media_entry& result, const std::string& title, u32 focused, bool enable_overlay);
-
-		private:
-			void reload(const std::string& title, u32 focused);
-
-			struct media_list_entry : horizontal_layout
-			{
-			public:
-				media_list_entry(const media_entry& entry);
-
-			private:
-				std::unique_ptr<image_info> icon_data;
-			};
-
-			media_entry* m_media = nullptr;
-
-			std::unique_ptr<overlay_element> m_dim_background;
-			std::unique_ptr<list_view> m_list;
-			std::unique_ptr<label> m_description;
-			std::unique_ptr<label> m_no_media_text;
-		};
-
-		error_code show_media_list_dialog(media_list_dialog::media_type type, const std::string& path, const std::string& title, std::function<void(s32 status, utils::media_info info)> on_finished);
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message.cpp
deleted file mode 100644
index 218f7a2a3a..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_message.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-#include "stdafx.h"
-#include "overlay_message.h"
-#include "Emu/Cell/timers.hpp"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		static u64 get_expiration_time(u64 duration)
-		{
-			if (duration == umax)
-			{
-				return duration;
-			}
-
-			return get_system_time() + duration;
-		}
-
-		template <typename T>
-		message_item::message_item(const T& msg_id, u64 expiration, std::shared_ptr<atomic_t<u32>> refs, std::shared_ptr<overlay_element> icon)
-		{
-			m_visible_duration = expiration;
-			m_refs = std::move(refs);
-
-			m_text.set_font("Arial", 14);
-			m_text.set_text(msg_id);
-			m_text.set_padding(4, 8, 4, 8);
-			m_text.auto_resize();
-			m_text.back_color.a = 0.f;
-
-			m_fade_in_animation.current = color4f(1.f, 1.f, 1.f, 0.f);
-			m_fade_in_animation.end = color4f(1.0f);
-			m_fade_in_animation.duration_sec = 1.f;
-			m_fade_in_animation.active = true;
-
-			m_fade_out_animation.current = color4f(1.f);
-			m_fade_out_animation.end = color4f(1.f, 1.f, 1.f, 0.f);
-			m_fade_out_animation.duration_sec = 1.f;
-			m_fade_out_animation.active = false;
-
-			back_color = color4f(0.25f, 0.25f, 0.25f, 0.85f);
-
-			if (icon)
-			{
-				m_icon = icon;
-				m_icon->set_pos(m_text.x + m_text.w + 8, m_text.y);
-
-				set_size(m_margin + m_text.w + m_icon->w + m_margin, m_margin + std::max(m_text.h, m_icon->h) + m_margin);
-			}
-			else
-			{
-				set_size(m_text.w + m_margin + m_margin, m_text.h + m_margin + m_margin);
-			}
-		}
-		template message_item::message_item(const std::string& msg_id, u64, std::shared_ptr<atomic_t<u32>>, std::shared_ptr<overlay_element>);
-		template message_item::message_item(const localized_string_id& msg_id, u64, std::shared_ptr<atomic_t<u32>>, std::shared_ptr<overlay_element>);
-
-		void message_item::reset_expiration()
-		{
-			m_expiration_time = get_expiration_time(m_visible_duration);
-		}
-
-		u64 message_item::get_expiration() const
-		{
-			// If reference counting is enabled and reached 0 consider it expired
-			return m_refs && *m_refs == 0 ? 0 : m_expiration_time;
-		}
-
-		void message_item::ensure_expired()
-		{
-			// If reference counting is enabled and reached 0 consider it expired
-			if (m_refs)
-			{
-				*m_refs = 0;
-			}
-		}
-
-		bool message_item::text_matches(const std::u32string& text) const
-		{
-			return m_text.text == text;
-		}
-
-		void message_item::set_pos(s16 _x, s16 _y)
-		{
-			rounded_rect::set_pos(_x, _y);
-			m_text.set_pos(_x + m_margin, y + m_margin);
-
-			if (m_icon)
-			{
-				m_icon->set_pos(m_icon->x, m_text.y);
-			}
-		}
-
-		compiled_resource& message_item::get_compiled()
-		{
-			if (!m_processed)
-			{
-				compiled_resources = {};
-				return compiled_resources;
-			}
-
-			// Disable caching
-			m_is_compiled = false;
-
-			compiled_resources = rounded_rect::get_compiled();
-			compiled_resources.add(m_text.get_compiled());
-			if (m_icon)
-			{
-				compiled_resources.add(m_icon->get_compiled());
-			}
-
-			auto& current_animation = m_fade_in_animation.active
-				? m_fade_in_animation
-				: m_fade_out_animation;
-
-			current_animation.apply(compiled_resources);
-			return compiled_resources;
-		}
-
-		void message_item::update(usz index, u64 timestamp_us, s16 x_offset, s16 y_offset)
-		{
-			if (m_cur_pos != index)
-			{
-				m_cur_pos = index;
-				set_pos(x_offset, y_offset);
-			}
-
-			if (!m_processed)
-			{
-				m_expiration_time = get_expiration_time(m_visible_duration);
-			}
-
-			if (m_fade_in_animation.active)
-			{
-				// We are fading in.
-				m_fade_in_animation.update(timestamp_us);
-			}
-			else if (timestamp_us + u64(m_fade_out_animation.duration_sec * 1'000'000) > get_expiration())
-			{
-				// We are fading out.
-
-				// Only activate the animation if the message hasn't expired yet (prevents glitches afterwards).
-				if (timestamp_us <= get_expiration())
-				{
-					m_fade_out_animation.active = true;
-				}
-
-				m_fade_out_animation.update(timestamp_us);
-			}
-			else if (m_fade_out_animation.active)
-			{
-				// We are fading out, but the expiration was extended.
-
-				// Reset the fade in animation to the state of the fade out animation to prevent opacity pop.
-				const f32 fade_out_progress = static_cast<f32>(m_fade_out_animation.get_remaining_duration_us(timestamp_us)) / static_cast<f32>(m_fade_out_animation.get_total_duration_us());
-				const u64 fade_in_us_done = u64(fade_out_progress * m_fade_in_animation.get_total_duration_us());
-
-				m_fade_in_animation.reset(timestamp_us - fade_in_us_done);
-				m_fade_in_animation.active = true;
-				m_fade_in_animation.update(timestamp_us);
-
-				// Reset the fade out animation.
-				m_fade_out_animation.reset();
-			}
-
-			m_processed = true;
-		}
-
-		void message::update_queue(std::deque<message_item>& vis_set, std::deque<message_item>& ready_set, message_pin_location origin)
-		{
-			const u64 cur_time = get_system_time();
-
-			for (auto it = vis_set.begin(); it != vis_set.end();)
-			{
-				if (it->get_expiration() < cur_time)
-				{
-					// Enusre reference counter is updated on timeout
-					it->ensure_expired();
-					it = vis_set.erase(it);
-				}
-				else
-				{
-					it++;
-				}
-			}
-
-			while (vis_set.size() < max_visible_items && !ready_set.empty())
-			{
-				vis_set.emplace_back(std::move(ready_set.front()));
-				ready_set.pop_front();
-			}
-
-			if (vis_set.empty())
-			{
-				return;
-			}
-
-			// Render reversed list. Oldest entries are furthest from the border
-			constexpr u16 spacing = 4;
-			s16 x_offset = 10;
-			s16 y_offset = 8;
-			usz index = 0;
-
-			for (auto it = vis_set.rbegin(); it != vis_set.rend(); ++it, ++index)
-			{
-				switch (origin)
-				{
-				case message_pin_location::bottom_right:
-					y_offset += (spacing + it->h);
-					it->update(index, cur_time, virtual_width - x_offset - it->w, virtual_height - y_offset);
-					break;
-				case message_pin_location::bottom_left:
-					y_offset += (spacing + it->h);
-					it->update(index, cur_time, x_offset, virtual_height - y_offset);
-					break;
-				case message_pin_location::top_right:
-					it->update(index, cur_time, virtual_width - x_offset - it->w, y_offset);
-					y_offset += (spacing + it->h);
-					break;
-				case message_pin_location::top_left:
-					it->update(index, cur_time, x_offset, y_offset);
-					y_offset += (spacing + it->h);
-					break;
-				}
-			}
-		}
-
-		void message::update(u64 /*timestamp_us*/)
-		{
-			if (!visible)
-			{
-				return;
-			}
-
-			std::lock_guard lock(m_mutex_queue);
-
-			update_queue(m_visible_items_bottom_right, m_ready_queue_bottom_right, message_pin_location::bottom_right);
-			update_queue(m_visible_items_bottom_left, m_ready_queue_bottom_left, message_pin_location::bottom_left);
-			update_queue(m_visible_items_top_right, m_ready_queue_top_right, message_pin_location::top_right);
-			update_queue(m_visible_items_top_left, m_ready_queue_top_left, message_pin_location::top_left);
-
-			visible = !m_visible_items_bottom_right.empty() || !m_visible_items_bottom_left.empty() ||
-			          !m_visible_items_top_right.empty() || !m_visible_items_top_left.empty();
-		}
-
-		compiled_resource message::get_compiled()
-		{
-			if (!visible)
-			{
-				return {};
-			}
-
-			std::lock_guard lock(m_mutex_queue);
-
-			compiled_resource cr{};
-
-			for (auto& item : m_visible_items_bottom_right)
-			{
-				cr.add(item.get_compiled());
-			}
-
-			for (auto& item : m_visible_items_bottom_left)
-			{
-				cr.add(item.get_compiled());
-			}
-
-			for (auto& item : m_visible_items_top_right)
-			{
-				cr.add(item.get_compiled());
-			}
-
-			for (auto& item : m_visible_items_top_left)
-			{
-				cr.add(item.get_compiled());
-			}
-
-			return cr;
-		}
-
-		bool message::message_exists(message_pin_location location, localized_string_id id, bool allow_refresh)
-		{
-			return message_exists(location, get_localized_u32string(id), allow_refresh);
-		}
-
-		bool message::message_exists(message_pin_location location, const std::string& msg, bool allow_refresh)
-		{
-			return message_exists(location, utf8_to_u32string(msg), allow_refresh);
-		}
-
-		bool message::message_exists(message_pin_location location, const std::u32string& msg, bool allow_refresh)
-		{
-			auto check_list = [&](std::deque<message_item>& list)
-			{
-				return std::any_of(list.begin(), list.end(), [&](message_item& item)
-				{
-					if (item.text_matches(msg))
-					{
-						if (allow_refresh)
-						{
-							item.reset_expiration();
-						}
-						return true;
-					}
-					return false;
-				});
-			};
-
-			switch (location)
-			{
-			case message_pin_location::bottom_right:
-				return check_list(m_ready_queue_bottom_right) || check_list(m_visible_items_bottom_right);
-			case message_pin_location::bottom_left:
-				return check_list(m_ready_queue_bottom_left) || check_list(m_visible_items_bottom_left);
-			case message_pin_location::top_right:
-				return check_list(m_ready_queue_top_right) || check_list(m_visible_items_top_right);
-			case message_pin_location::top_left:
-				return check_list(m_ready_queue_top_left) || check_list(m_visible_items_top_left);
-			}
-
-			return false;
-		}
-
-		void refresh_message_queue()
-		{
-			if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
-			{
-				if (auto msg_overlay = manager->get<rsx::overlays::message>())
-				{
-					msg_overlay->refresh();
-				}
-			}
-		}
-
-	} // namespace overlays
-} // namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message.h b/rpcs3/Emu/RSX/Overlays/overlay_message.h
deleted file mode 100644
index 9d3e10d358..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_message.h
+++ /dev/null
@@ -1,151 +0,0 @@
-#pragma once
-
-#include "overlays.h"
-#include "overlay_manager.h"
-
-#include <deque>
-
-namespace rsx
-{
-	namespace overlays
-	{
-		enum class message_pin_location
-		{
-			bottom_right,
-			bottom_left,
-			top_right,
-			top_left
-		};
-
-		class message_item : public rounded_rect
-		{
-		public:
-			template <typename T>
-			message_item(const T& msg_id, u64 expiration, std::shared_ptr<atomic_t<u32>> refs, std::shared_ptr<overlay_element> icon = {});
-			void update(usz index, u64 timestamp_us, s16 x_offset, s16 y_offset);
-			void set_pos(s16 _x, s16 _y) override;
-
-			void reset_expiration();
-			u64 get_expiration() const;
-			void ensure_expired();
-			compiled_resource& get_compiled() override;
-
-			bool text_matches(const std::u32string& text) const;
-
-		private:
-			label m_text{};
-			std::shared_ptr<overlay_element> m_icon{};
-			animation_color_interpolate m_fade_in_animation;
-			animation_color_interpolate m_fade_out_animation;
-
-			u64 m_expiration_time = 0;
-			u64 m_visible_duration = 0;
-			std::shared_ptr<atomic_t<u32>> m_refs;
-			bool m_processed = false;
-			usz m_cur_pos = umax;
-			static constexpr u16 m_margin = 6;
-		};
-
-		class message final : public overlay
-		{
-		public:
-			void update(u64 timestamp_us) override;
-			compiled_resource get_compiled() override;
-
-			template <typename T>
-			void queue_message(
-				T msg_id,
-				u64 expiration,
-				std::shared_ptr<atomic_t<u32>> refs,
-				message_pin_location location = message_pin_location::top_left,
-				std::shared_ptr<overlay_element> icon = {},
-				bool allow_refresh = false)
-			{
-				std::lock_guard lock(m_mutex_queue);
-
-				auto* queue = &m_ready_queue_top_left;
-
-				switch (location)
-				{
-				case message_pin_location::bottom_right:
-					queue = &m_ready_queue_bottom_right;
-					break;
-				case message_pin_location::bottom_left:
-					queue = &m_ready_queue_bottom_left;
-					break;
-				case message_pin_location::top_right:
-					queue = &m_ready_queue_top_right;
-					break;
-				case message_pin_location::top_left:
-					queue = &m_ready_queue_top_left;
-					break;
-				}
-
-				if constexpr (std::is_same_v<T, std::initializer_list<localized_string_id>>)
-				{
-					for (auto id : msg_id)
-					{
-						if (!message_exists(location, id, allow_refresh))
-						{
-							queue->emplace_back(id, expiration, refs, icon);
-						}
-					}
-				}
-				else if (!message_exists(location, msg_id, allow_refresh))
-				{
-					queue->emplace_back(msg_id, expiration, std::move(refs), icon);
-				}
-
-				visible = true;
-				refresh();
-			}
-
-		private:
-			const u32 max_visible_items = 3;
-			shared_mutex m_mutex_queue;
-
-			// Top and bottom enqueued sets
-			std::deque<message_item> m_ready_queue_bottom_right;
-			std::deque<message_item> m_ready_queue_bottom_left;
-			std::deque<message_item> m_ready_queue_top_right;
-			std::deque<message_item> m_ready_queue_top_left;
-
-			// Top and bottom visible sets
-			std::deque<message_item> m_visible_items_bottom_right;
-			std::deque<message_item> m_visible_items_bottom_left;
-			std::deque<message_item> m_visible_items_top_right;
-			std::deque<message_item> m_visible_items_top_left;
-
-			void update_queue(std::deque<message_item>& vis_set, std::deque<message_item>& ready_set, message_pin_location origin);
-
-			// Stacking. Extends the lifetime of a message instead of inserting a duplicate
-			bool message_exists(message_pin_location location, localized_string_id id, bool allow_refresh);
-			bool message_exists(message_pin_location location, const std::string& msg, bool allow_refresh);
-			bool message_exists(message_pin_location location, const std::u32string& msg, bool allow_refresh);
-		};
-
-		template <typename T>
-		void queue_message(
-			T msg_id,
-			u64 expiration = 5'000'000,
-			std::shared_ptr<atomic_t<u32>> refs = {},
-			message_pin_location location = message_pin_location::top_left,
-			std::shared_ptr<overlay_element> icon = {},
-			bool allow_refresh = false)
-		{
-			if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
-			{
-				auto msg_overlay = manager->get<rsx::overlays::message>();
-				if (!msg_overlay)
-				{
-					msg_overlay = std::make_shared<rsx::overlays::message>();
-					msg_overlay = manager->add(msg_overlay);
-				}
-				msg_overlay->queue_message(msg_id, expiration, std::move(refs), location, std::move(icon), allow_refresh);
-			}
-		}
-
-		void refresh_message_queue();
-
-	} // namespace overlays
-} // namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
index 578967de1a..1b45c64b78 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
@@ -1,9 +1,7 @@
 #include "stdafx.h"
-#include "overlay_manager.h"
 #include "overlay_message_dialog.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"
-#include "Emu/system_utils.hpp"
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/IdManager.h"
 #include "Utilities/Thread.h"
@@ -17,7 +15,7 @@ namespace rsx
 		message_dialog::message_dialog(bool allow_custom_background)
 			: custom_background_allowed(allow_custom_background)
 		{
-			background.set_size(virtual_width, virtual_height);
+			background.set_size(1280, 720);
 			background.back_color.a = 0.85f;
 
 			text_display.set_size(1100, 40);
@@ -31,11 +29,10 @@ namespace rsx
 			bottom_bar.set_size(1200, 2);
 			bottom_bar.set_pos(40, 400);
 
-			for (progress_bar& bar : progress_bars)
-			{
-				bar.set_size(800, 4);
-				bar.back_color = color4f(0.25f, 0.f, 0.f, 0.85f);
-			}
+			progress_1.set_size(800, 4);
+			progress_2.set_size(800, 4);
+			progress_1.back_color = color4f(0.25f, 0.f, 0.f, 0.85f);
+			progress_2.back_color = color4f(0.25f, 0.f, 0.f, 0.85f);
 
 			btn_ok.set_text(localized_string_id::RSX_OVERLAYS_MSG_DIALOG_YES);
 			btn_ok.set_size(140, 30);
@@ -58,8 +55,6 @@ namespace rsx
 				btn_cancel.set_image_resource(resource_config::standard_image_resource::circle);
 			}
 
-			fade_animation.duration_sec = 0.15f;
-
 			update_custom_background();
 
 			return_code = CELL_MSGDIALOG_BUTTON_NONE;
@@ -72,35 +67,13 @@ namespace rsx
 				return {};
 			}
 
-			if (const auto [dirty, text] = text_guard.get_text(); dirty)
-			{
-				u16 text_w, text_h;
-				text_display.set_pos(90, 364);
-				text_display.set_text(text);
-				text_display.measure_text(text_w, text_h);
-				text_display.translate(0, -(text_h - 16));
-			}
-
-			for (u32 i = 0; i < progress_bars.size(); i++)
-			{
-				if (const auto [dirty, text] = ::at32(bar_text_guard, i).get_text(); dirty)
-				{
-					::at32(progress_bars, i).set_text(text);
-				}
-			}
-
 			compiled_resource result;
 
 			update_custom_background();
 
-			if (background_image && background_image->get_data())
+			if (background_image && background_image->data)
 			{
 				result.add(background_poster.get_compiled());
-
-				if (background_overlay_image && background_overlay_image->get_data())
-				{
-					result.add(background_overlay_poster.get_compiled());
-				}
 			}
 
 			result.add(background.get_compiled());
@@ -108,12 +81,12 @@ namespace rsx
 
 			if (num_progress_bars > 0)
 			{
-				result.add(::at32(progress_bars, 0).get_compiled());
+				result.add(progress_1.get_compiled());
 			}
 
 			if (num_progress_bars > 1)
 			{
-				result.add(::at32(progress_bars, 1).get_compiled());
+				result.add(progress_2.get_compiled());
 			}
 
 			if (interactive)
@@ -128,15 +101,11 @@ namespace rsx
 					result.add(btn_cancel.get_compiled());
 			}
 
-			fade_animation.apply(result);
-
 			return result;
 		}
 
-		void message_dialog::on_button_pressed(pad_button button_press, bool /*is_auto_repeat*/)
+		void message_dialog::on_button_pressed(pad_button button_press)
 		{
-			if (fade_animation.active) return;
-
 			switch (button_press)
 			{
 			case pad_button::cross:
@@ -155,7 +124,6 @@ namespace rsx
 					return_code = CELL_MSGDIALOG_BUTTON_YES;
 				}
 
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_decide.wav");
 				break;
 			}
 			case pad_button::circle:
@@ -175,20 +143,12 @@ namespace rsx
 					return_code = CELL_MSGDIALOG_BUTTON_NO;
 				}
 
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cancel.wav");
 				break;
 			}
 			default: return;
 			}
 
-			fade_animation.current = color4f(1.f);
-			fade_animation.end = color4f(0.f);
-			fade_animation.active = true;
-
-			fade_animation.on_finish = [this]
-			{
-				close(true, true);
-			};
+			close(true, true);
 		}
 
 		void message_dialog::close(bool use_callback, bool stop_pad_interception)
@@ -201,26 +161,24 @@ namespace rsx
 			user_interface::close(use_callback, stop_pad_interception);
 		}
 
-		void message_dialog::update(u64 timestamp_us)
+		struct msg_dialog_thread
 		{
-			if (fade_animation.active)
-				fade_animation.update(timestamp_us);
-		}
+			static constexpr auto thread_name = "MsgDialog Thread"sv;
+		};
 
-		error_code message_dialog::show(bool is_blocking, const std::string& text, const MsgDialogType& type, msg_dialog_source source, std::function<void(s32 status)> on_close)
+		error_code message_dialog::show(bool is_blocking, const std::string& text, const MsgDialogType& type, std::function<void(s32 status)> on_close)
 		{
 			visible = false;
-			m_source = source;
 
 			num_progress_bars = type.progress_bar_count;
 			if (num_progress_bars)
 			{
-				s16 offset = 58;
-				::at32(progress_bars, 0).set_pos(240, 412);
+				u16 offset = 58;
+				progress_1.set_pos(240, 412);
 
 				if (num_progress_bars > 1)
 				{
-					::at32(progress_bars, 1).set_pos(240, 462);
+					progress_2.set_pos(240, 462);
 					offset = 98;
 				}
 
@@ -229,20 +187,6 @@ namespace rsx
 				btn_ok.translate(0, offset);
 				btn_cancel.translate(0, offset);
 			}
-			else
-			{
-				fade_animation.current = color4f(0.f);
-				fade_animation.end = color4f(1.f);
-				fade_animation.active = true;
-			}
-
-			if (!type.se_mute_on)
-			{
-				if (type.se_normal)
-					Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_system_ok.wav");
-				else
-					Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_system_ng.wav");
-			}
 
 			set_text(text);
 
@@ -279,16 +223,13 @@ namespace rsx
 				{
 					if (const auto error = run_input_loop())
 					{
-						if (error != selection_code::canceled)
-						{
-							rsx_log.error("Message dialog input loop exited with error code=%d", error);
-						}
+						rsx_log.error("Dialog input loop exited with error code=%d", error);
 						return error;
 					}
 				}
 				else
 				{
-					while (!m_stop_input_loop)
+					while (!exit)
 					{
 						refresh();
 
@@ -299,58 +240,54 @@ namespace rsx
 			}
 			else
 			{
-				if (!m_stop_input_loop)
+				if (!exit)
 				{
-					const auto notify = std::make_shared<atomic_t<u32>>(0);
-					auto& overlayman = g_fxo->get<display_manager>();
+					g_fxo->get<named_thread<msg_dialog_thread>>()([&, tbit = alloc_thread_bit()]()
+					{
+						g_thread_bit = tbit;
 
-					if (interactive)
-					{
-						overlayman.attach_thread_input(
-							uid, "Message dialog",
-							[notify]() { *notify = true; notify->notify_one(); }
-						);
-					}
-					else
-					{
-						overlayman.attach_thread_input(
-							uid, "Message dialog",
-							[notify]() { *notify = true; notify->notify_one(); },
-							nullptr,
-							[&]()
+						if (interactive)
+						{
+							auto ref = g_fxo->get<display_manager>().get(uid);
+
+							if (const auto error = run_input_loop())
 							{
-								while (!m_stop_input_loop && thread_ctrl::state() != thread_state::aborting)
-								{
-									refresh();
-
-									// Only update the screen at about 60fps since updating it everytime slows down the process
-									std::this_thread::sleep_for(16ms);
-
-									if (!g_fxo->is_init<display_manager>())
-									{
-										rsx_log.fatal("display_manager was improperly destroyed");
-										break;
-									}
-								}
-
-								return 0;
+								rsx_log.error("Dialog input loop exited with error code=%d", error);
 							}
-						);
-					}
+						}
+						else
+						{
+							while (!exit && thread_ctrl::state() != thread_state::aborting)
+							{
+								refresh();
 
-					while (!Emu.IsStopped() && !*notify)
-					{
-						notify->wait(false, atomic_wait_timeout{1'000'000});
-					}
+								// Only update the screen at about 60fps since updating it everytime slows down the process
+								std::this_thread::sleep_for(16ms);
+
+								if (!g_fxo->is_init<display_manager>())
+								{
+									rsx_log.fatal("display_manager was improperly destroyed");
+									break;
+								}
+							}
+						}
+
+						thread_bits &= ~tbit;
+						thread_bits.notify_all();
+					});
 				}
 			}
 
 			return CELL_OK;
 		}
 
-		void message_dialog::set_text(std::string text)
+		void message_dialog::set_text(const std::string& text)
 		{
-			text_guard.set_text(std::move(text));
+			u16 text_w, text_h;
+			text_display.set_pos(90, 364);
+			text_display.set_text(text);
+			text_display.measure_text(text_w, text_h);
+			text_display.translate(0, -(text_h - 16));
 		}
 
 		void message_dialog::update_custom_background()
@@ -362,38 +299,20 @@ namespace rsx
 
 				if (!background_image)
 				{
-					// Search for any useable background picture in the given order
-					game_content_type content_type = game_content_type::background_picture;
-
-					for (game_content_type type : { game_content_type::background_picture, game_content_type::overlay_picture, game_content_type::content_icon })
+					if (const auto picture_path = Emu.GetBackgroundPicturePath(); fs::exists(picture_path))
 					{
-						if (const std::string picture_path = rpcs3::utils::get_game_content_path(type); !picture_path.empty())
-						{
-							content_type = type;
-							background_image = std::make_unique<image_info>(picture_path);
-							dirty |= !!background_image->get_data();
-							break;
-						}
-					}
-
-					// Search for an overlay picture in the same dir in case we found a real background picture
-					if (background_image && !background_overlay_image && content_type == game_content_type::background_picture)
-					{
-						if (const std::string picture_path = rpcs3::utils::get_game_content_path(game_content_type::overlay_picture); !picture_path.empty())
-						{
-							background_overlay_image = std::make_unique<image_info>(picture_path);
-							dirty |= !!background_overlay_image->get_data();
-						}
+						background_image = std::make_unique<image_info>(picture_path.c_str());
+						dirty |= !!background_image->data;
 					}
 				}
 
-				if (dirty && background_image && background_image->get_data())
+				if (dirty && background_image && background_image->data)
 				{
 					const f32 color              = (100 - background_darkening_strength) / 100.f;
 					background_poster.fore_color = color4f(color, color, color, 1.);
 					background.back_color.a      = 0.f;
 
-					background_poster.set_size(virtual_width, virtual_height);
+					background_poster.set_size(1280, 720);
 					background_poster.set_raw_image(background_image.get());
 					background_poster.set_blur_strength(static_cast<u8>(background_blur_strength));
 
@@ -412,23 +331,6 @@ namespace rsx
 						const int padding = (background_poster.w - static_cast<int>(background_image->w * (background_poster.h / static_cast<double>(background_image->h)))) / 2;
 						background_poster.set_padding(padding, padding, 0, 0);
 					}
-
-					if (background_overlay_image && background_overlay_image->get_data())
-					{
-						constexpr f32 reference_factor = 2.0f / 3.0f;
-						const f32 image_aspect = background_overlay_image->w / static_cast<f32>(background_overlay_image->h);
-						const f32 overlay_width = background_overlay_image->w * reference_factor;
-						const f32 overlay_height = overlay_width / image_aspect;
-						const u16 overlay_x = static_cast<u16>(std::min(virtual_width - overlay_width, (virtual_width * reference_factor) - (overlay_width / 2.0f)));
-						const u16 overlay_y = static_cast<u16>(std::min(virtual_height - overlay_height, (virtual_height * reference_factor) - (overlay_height / 2.0f)));
-						const f32 color = (100 - background_darkening_strength) / 100.f;
-
-						background_overlay_poster.fore_color = color4f(color, color, color, 1.);
-						background_overlay_poster.set_size(static_cast<u16>(overlay_width), static_cast<u16>(overlay_height));
-						background_overlay_poster.set_pos(overlay_x, overlay_y);
-						background_overlay_poster.set_raw_image(background_overlay_image.get());
-						background_overlay_poster.set_blur_strength(static_cast<u8>(background_blur_strength));
-					}
 				}
 			}
 			else
@@ -438,13 +340,6 @@ namespace rsx
 					background_poster.clear_image();
 					background_image.reset();
 				}
-
-				if (background_overlay_image)
-				{
-					background_overlay_poster.clear_image();
-					background_overlay_image.reset();
-				}
-
 				background.back_color.a = 0.85f;
 			}
 		}
@@ -459,12 +354,15 @@ namespace rsx
 			taskbar_index = index;
 		}
 
-		error_code message_dialog::progress_bar_set_message(u32 index, std::string msg)
+		error_code message_dialog::progress_bar_set_message(u32 index, const std::string& msg)
 		{
 			if (index >= num_progress_bars)
 				return CELL_MSGDIALOG_ERROR_PARAM;
 
-			::at32(bar_text_guard, index).set_text(std::move(msg));
+			if (index == 0)
+				progress_1.set_text(msg);
+			else
+				progress_2.set_text(msg);
 
 			return CELL_OK;
 		}
@@ -474,7 +372,10 @@ namespace rsx
 			if (index >= num_progress_bars)
 				return CELL_MSGDIALOG_ERROR_PARAM;
 
-			::at32(progress_bars, index).inc(value);
+			if (index == 0)
+				progress_1.inc(value);
+			else
+				progress_2.inc(value);
 
 			if (index == static_cast<u32>(taskbar_index) || taskbar_index == -1)
 				Emu.GetCallbacks().handle_taskbar_progress(1, static_cast<s32>(value));
@@ -487,7 +388,10 @@ namespace rsx
 			if (index >= num_progress_bars)
 				return CELL_MSGDIALOG_ERROR_PARAM;
 
-			::at32(progress_bars, index).set_value(value);
+			if (index == 0)
+				progress_1.set_value(value);
+			else
+				progress_2.set_value(value);
 
 			if (index == static_cast<u32>(taskbar_index) || taskbar_index == -1)
 				Emu.GetCallbacks().handle_taskbar_progress(3, static_cast<s32>(value));
@@ -500,7 +404,10 @@ namespace rsx
 			if (index >= num_progress_bars)
 				return CELL_MSGDIALOG_ERROR_PARAM;
 
-			::at32(progress_bars, index).set_value(0.f);
+			if (index == 0)
+				progress_1.set_value(0.f);
+			else
+				progress_2.set_value(0.f);
 
 			Emu.GetCallbacks().handle_taskbar_progress(0, 0);
 
@@ -512,7 +419,10 @@ namespace rsx
 			if (index >= num_progress_bars)
 				return CELL_MSGDIALOG_ERROR_PARAM;
 
-			::at32(progress_bars, index).set_limit(static_cast<f32>(limit));
+			if (index == 0)
+				progress_1.set_limit(static_cast<f32>(limit));
+			else
+				progress_2.set_limit(static_cast<f32>(limit));
 
 			if (index == static_cast<u32>(taskbar_index))
 			{
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.h b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.h
index 171dd80fac..21ebe2ff12 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.h
@@ -10,17 +10,13 @@ namespace rsx
 	{
 		class message_dialog : public user_interface
 		{
-			msg_dialog_source m_source = msg_dialog_source::_cellMsgDialog;
-
 			label text_display;
 			image_button btn_ok;
 			image_button btn_cancel;
 
-			overlay_element bottom_bar;
-			overlay_element background;
+			overlay_element bottom_bar, background;
 			image_view background_poster;
-			image_view background_overlay_poster;
-			std::array<progress_bar, 2> progress_bars{};
+			progress_bar progress_1, progress_2;
 			u8 num_progress_bars = 0;
 			s32 taskbar_index = 0;
 			s32 taskbar_limit = 0;
@@ -33,36 +29,27 @@ namespace rsx
 			u32 background_blur_strength = 0;
 			u32 background_darkening_strength = 0;
 			std::unique_ptr<image_info> background_image;
-			std::unique_ptr<image_info> background_overlay_image;
-
-			animation_color_interpolate fade_animation;
-
-			text_guard_t text_guard{};
-			std::array<text_guard_t, 2> bar_text_guard{};
 
 		public:
 			message_dialog(bool allow_custom_background = false);
 
 			compiled_resource get_compiled() override;
 
-			void update(u64 timestamp_us) override;
-			void on_button_pressed(pad_button button_press, bool is_auto_repeat) override;
+			void on_button_pressed(pad_button button_press) override;
 			void close(bool use_callback, bool stop_pad_interception) override;
 
-			error_code show(bool is_blocking, const std::string& text, const MsgDialogType& type, msg_dialog_source source, std::function<void(s32 status)> on_close);
+			error_code show(bool is_blocking, const std::string& text, const MsgDialogType& type, std::function<void(s32 status)> on_close);
 
-			void set_text(std::string text);
+			void set_text(const std::string& text);
 			void update_custom_background();
 
 			u32 progress_bar_count() const;
 			void progress_bar_set_taskbar_index(s32 index);
-			error_code progress_bar_set_message(u32 index, std::string msg);
+			error_code progress_bar_set_message(u32 index, const std::string& msg);
 			error_code progress_bar_increment(u32 index, f32 value);
 			error_code progress_bar_set_value(u32 index, f32 value);
 			error_code progress_bar_reset(u32 index);
 			error_code progress_bar_set_limit(u32 index, u32 limit);
-
-			msg_dialog_source source() const { return m_source; }
 		};
 	}
 }
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
index 82047a72bd..947e317d88 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
@@ -1,11 +1,8 @@
 #include "stdafx.h"
-#include "overlay_manager.h"
 #include "overlay_osk.h"
+#include "Emu/RSX/RSXThread.h"
 #include "Emu/Cell/Modules/cellSysutil.h"
-#include "Emu/Io/Keyboard.h"
-#include "Emu/System.h"
-#include "Emu/system_config.h"
-#include "Emu/Cell/timers.hpp"
+#include "Emu/Cell/Modules/cellMsgDialog.h"
 
 LOG_CHANNEL(osk, "OSK");
 
@@ -15,144 +12,36 @@ namespace rsx
 	{
 		osk_dialog::osk_dialog()
 		{
-			m_auto_repeat_buttons.insert(pad_button::L1);
-			m_auto_repeat_buttons.insert(pad_button::R1);
-			m_auto_repeat_buttons.insert(pad_button::cross);
-			m_auto_repeat_buttons.insert(pad_button::triangle);
-			m_auto_repeat_buttons.insert(pad_button::square);
-
-			m_keyboard_input_enabled = true;
+			auto_repeat_buttons.insert(pad_button::L1);
+			auto_repeat_buttons.insert(pad_button::R1);
+			auto_repeat_buttons.insert(pad_button::cross);
+			auto_repeat_buttons.insert(pad_button::triangle);
+			auto_repeat_buttons.insert(pad_button::square);
 		}
 
-		void osk_dialog::Close(s32 status)
+		void osk_dialog::Close(bool ok)
 		{
-			osk.notice("Closing osk (status=%d)", status);
-
-			if (status == FAKE_CELL_OSKDIALOG_CLOSE_TERMINATE)
-			{
-				close(false, true);
-				return;
-			}
-
-			if (status != FAKE_CELL_OSKDIALOG_CLOSE_ABORT && m_use_separate_windows && continuous_mode == CELL_OSKDIALOG_CONTINUOUS_MODE_REMAIN_OPEN)
-			{
-				// Just call the on_osk_close and don't actually close the dialog.
-				if (on_osk_close)
-				{
-					Emu.CallFromMainThread([this, status]()
-					{
-						on_osk_close(status);
-					});
-				}
-				return;
-			}
-
 			fade_animation.current = color4f(1.f);
 			fade_animation.end = color4f(0.f);
-			fade_animation.duration_sec = 0.5f;
+			fade_animation.duration = 0.5f;
 
-			fade_animation.on_finish = [this, status]
+			fade_animation.on_finish = [this, ok]
 			{
 				if (on_osk_close)
 				{
-					Emu.CallFromMainThread([this, status]()
+					Emu.CallAfter([this, ok]()
 					{
-						on_osk_close(status);
+						on_osk_close(ok ? CELL_MSGDIALOG_BUTTON_OK : CELL_MSGDIALOG_BUTTON_ESCAPE);
 					});
 				}
 
-				set_visible(false);
-
-				// Only really close the dialog if we aren't in the continuous separate window mode
-				if (!m_use_separate_windows || continuous_mode == CELL_OSKDIALOG_CONTINUOUS_MODE_NONE)
-				{
-					close(true, true);
-					return;
-				}
+				visible = false;
+				close(true, true);
 			};
 
 			fade_animation.active = true;
 		}
 
-		void osk_dialog::Clear(bool clear_all_data)
-		{
-			// Try to lock. Clear might be called recursively.
-			const bool locked = m_preview_mutex.try_lock();
-
-			osk.notice("Clearing osk (clear_all_data=%d)", clear_all_data);
-
-			m_preview.caret_position = 0;
-			m_preview.set_text({});
-
-			if (clear_all_data)
-			{
-				on_text_changed();
-			}
-
-			if (locked)
-			{
-				m_preview_mutex.unlock();
-			}
-
-			m_update = true;
-		}
-
-		void osk_dialog::SetText(const std::u16string& text)
-		{
-			// Try to lock. Insert might be called recursively.
-			const bool locked = m_preview_mutex.try_lock();
-
-			const std::u16string new_str = text.length() <= char_limit ? text : text.substr(0, char_limit);
-
-			osk.notice("Setting osk text (text='%s', new_str='%s', char_limit=%d)", utf16_to_ascii8(text), utf16_to_ascii8(new_str), char_limit);
-
-			m_preview.caret_position = new_str.length();
-			m_preview.set_unicode_text(utf16_to_u32string(new_str));
-
-			on_text_changed();
-
-			if (locked)
-			{
-				m_preview_mutex.unlock();
-			}
-
-			m_update = true;
-		}
-
-		void osk_dialog::Insert(const std::u16string& text)
-		{
-			// Try to lock. Insert might be called recursively.
-			const bool locked = m_preview_mutex.try_lock();
-
-			osk.notice("Inserting into osk at position %d (text='%s', char_limit=%d)", m_preview.caret_position, utf16_to_ascii8(text), char_limit);
-
-			// Append to output text
-			if (m_preview.value.empty())
-			{
-				const std::u16string new_str = text.length() <= char_limit ? text : text.substr(0, char_limit);
-
-				m_preview.caret_position = new_str.length();
-				m_preview.set_unicode_text(utf16_to_u32string(new_str));
-			}
-			else if ((m_preview.value.length() + text.length()) <= char_limit)
-			{
-				m_preview.insert_text(utf16_to_u32string(text));
-			}
-			else
-			{
-				osk.notice("Can't insert into osk: Character limit reached.");
-			}
-
-			on_text_changed();
-
-			if (locked)
-			{
-				m_preview_mutex.unlock();
-			}
-
-			m_update = true;
-		}
-
 		void osk_dialog::add_panel(const osk_panel& panel)
 		{
 			// On PS3 apparently only 7 panels are added, the rest is ignored
@@ -197,8 +86,8 @@ namespace rsx
 
 			num_rows = panel.num_rows;
 			num_columns = panel.num_columns;
-			cell_size_x = get_scaled(panel.cell_size_x);
-			cell_size_y = get_scaled(panel.cell_size_y);
+			cell_size_x = panel.cell_size_x;
+			cell_size_y = panel.cell_size_y;
 
 			update_layout();
 
@@ -207,7 +96,7 @@ namespace rsx
 			m_grid.resize(cell_count);
 			num_shift_layers_by_charset.clear();
 
-			const position2u grid_origin(m_panel_frame.x, m_panel_frame.y);
+			const position2u grid_origin = { m_frame.x, m_frame.y + 30u + m_preview.h };
 
 			const u32 old_index = (selected_y * num_columns) + selected_x;
 
@@ -323,171 +212,66 @@ namespace rsx
 
 		void osk_dialog::update_layout()
 		{
-			const bool show_panel = m_show_panel || !m_use_separate_windows;
-
-			// The title is omitted in separate window mode
-			const u16 title_height = m_use_separate_windows ? 0 : get_scaled(30);
-			const u16 preview_height = get_scaled((flags & CELL_OSKDIALOG_NO_RETURN) ? 40 : 90);
+			const u16 preview_height = (flags & CELL_OSKDIALOG_NO_RETURN) ? 40 : 90;
 
 			// Place elements with absolute positioning
-			const u16 button_margin = get_scaled(30);
-			const u16 button_height = get_scaled(30);
-			const u16 panel_w = show_panel ? (num_columns * cell_size_x) : 0;
-			const u16 panel_h = show_panel ? (num_rows * cell_size_y) : 0;
-			const u16 input_w = m_use_separate_windows ? m_input_field_window_width : panel_w;
-			const u16 input_h = title_height + preview_height;
-			const u16 button_h = show_panel ? (button_height + button_margin) : 0;
-			const u16 total_w = std::max(input_w, panel_w);
-			const u16 total_h = input_h + panel_h + button_h;
+			const u16 frame_w = static_cast<u16>(num_columns * cell_size_x);
+			const u16 frame_h = static_cast<u16>(num_rows * cell_size_y) + 30 + preview_height;
+			const u16 frame_x = (1280 - frame_w) / 2;
+			const u16 frame_y = (720 - frame_h) / 2;
 
-			// The cellOskDialog's origin is at the center of the screen with positive values increasing toward the right and upper directions.
-			// The layout mode tells us which corner of the dialog we should use for positioning.
-			// With CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT and CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP and a point (0,0) the dialog's top left corner would be in the center of the screen.
-			// With CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_CENTER and CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_CENTER and a point (0,0) the dialog would be exactly in the center of the screen.
+			m_frame.set_pos(frame_x, frame_y);
+			m_frame.set_size(frame_w, frame_h);
 
-			// TODO: Make sure separate windows don't overlap.
+			m_title.set_pos(frame_x, frame_y);
+			m_title.set_size(frame_w, 30);
+			m_title.set_padding(15, 0, 5, 0);
 
-			// Calculate initial position and analog movement range.
-			constexpr f32 margin = 50.0f; // Let's add a minimal margin on all sides
-			const s16 x_min = static_cast<s16>(margin);
-			const s16 x_max = static_cast<s16>(static_cast<f32>(virtual_width - total_w) - margin);
-			const s16 y_min = static_cast<s16>(margin);
-			const s16 y_max = static_cast<s16>(static_cast<f32>(virtual_height - total_h) - margin);
-			s16 input_x = 0;
-			s16 input_y = 0;
-			s16 panel_x = 0;
-			s16 panel_y = 0;
+			m_preview.set_pos(frame_x, frame_y + 30);
+			m_preview.set_size(frame_w, preview_height);
+			m_preview.set_padding(15, 0, 10, 0);
 
-			// x pos should only be 0 the first time, because we always add a margin
-			if (m_x_input_pos == 0)
-			{
-				const auto get_x = [](const osk_window_layout& layout, const u16& width) -> f32
-				{
-					constexpr f32 origin_x = virtual_width / 2.0f;
-					const f32 x = origin_x + layout.x_offset;
-
-					switch (layout.x_align)
-					{
-					case CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_RIGHT:
-						return x - width;
-					case CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_CENTER:
-						return x - (width / 2.0f);
-					case CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT:
-					default:
-						return x;
-					}
-				};
-
-				const auto get_y = [](const osk_window_layout& layout, const u16& height) -> f32
-				{
-					constexpr f32 origin_y = virtual_height / 2.0f;
-					const f32 y = origin_y - layout.y_offset; // Negative because we increase y towards the bottom and cellOsk increases y towards the top.
-
-					switch (layout.y_align)
-					{
-					case CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_BOTTOM:
-						return y - height;
-					case CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_CENTER:
-						return y - (height / 2.0f);
-					case CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP:
-					default:
-						return y;
-					}
-				};
-
-				if (m_use_separate_windows)
-				{
-					input_x = m_x_input_pos = static_cast<s16>(std::clamp<f32>(get_x(m_input_layout, input_w), x_min, x_max));
-					input_y = m_y_input_pos = static_cast<s16>(std::clamp<f32>(get_y(m_input_layout, input_h), y_min, y_max));
-					panel_x = m_x_panel_pos = static_cast<s16>(std::clamp<f32>(get_x(m_panel_layout, panel_w), x_min, x_max));
-					panel_y = m_y_panel_pos = static_cast<s16>(std::clamp<f32>(get_y(m_panel_layout, panel_h), static_cast<f32>(y_min + input_h), static_cast<f32>(y_max + input_h)));
-				}
-				else
-				{
-					input_x = panel_x = m_x_input_pos = m_x_panel_pos = static_cast<u16>(std::clamp<f32>(get_x(m_layout, total_w), x_min, x_max));
-					input_y = m_y_input_pos = static_cast<s16>(std::clamp<f32>(get_y(m_layout, total_h), y_min, y_max));
-					panel_y = m_y_panel_pos = input_y + input_h;
-				}
-			}
-			else if (m_use_separate_windows)
-			{
-				input_x = m_x_input_pos = std::clamp(m_x_input_pos, x_min, x_max);
-				input_y = m_y_input_pos = std::clamp(m_y_input_pos, y_min, y_max);
-				panel_x = m_x_panel_pos = std::clamp(m_x_panel_pos, x_min, x_max);
-				panel_y = m_y_panel_pos = std::clamp<s16>(m_y_panel_pos, y_min + input_h, y_max + input_h);
-			}
-			else
-			{
-				input_x = panel_x = m_x_input_pos = m_x_panel_pos = std::clamp(m_x_input_pos, x_min, x_max);
-				input_y = m_y_input_pos = std::clamp(m_y_input_pos, y_min, y_max);
-				panel_y = m_y_panel_pos = input_y + input_h;
-			}
-
-			m_input_frame.set_pos(input_x, input_y);
-			m_input_frame.set_size(input_w, input_h);
-
-			m_panel_frame.set_pos(panel_x, panel_y);
-			m_panel_frame.set_size(panel_w, panel_h);
-
-			m_title.set_pos(input_x, input_y);
-			m_title.set_size(input_w, title_height);
-			m_title.set_padding(get_scaled(15), 0, get_scaled(5), 0);
-
-			m_preview.set_pos(input_x, input_y + title_height);
-			m_preview.set_size(input_w, preview_height);
-			m_preview.set_padding(get_scaled(15), get_scaled(15), get_scaled(10), 0);
-
-			const s16 button_y = panel_y + panel_h + button_margin;
-
-			m_btn_cancel.set_pos(panel_x, button_y);
-			m_btn_cancel.set_size(get_scaled(140), button_height);
+			m_btn_cancel.set_pos(frame_x, frame_y + frame_h + 10);
+			m_btn_cancel.set_size(140, 30);
 			m_btn_cancel.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_CANCEL);
-			m_btn_cancel.set_text_vertical_adjust(get_scaled(5));
+			m_btn_cancel.set_text_vertical_adjust(5);
 
-			m_btn_space.set_pos(panel_x + get_scaled(100), button_y);
-			m_btn_space.set_size(get_scaled(100), button_height);
+			m_btn_space.set_pos(frame_x + 100, frame_y + frame_h + 10);
+			m_btn_space.set_size(100, 30);
 			m_btn_space.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_SPACE);
-			m_btn_space.set_text_vertical_adjust(get_scaled(5));
+			m_btn_space.set_text_vertical_adjust(5);
 
-			m_btn_delete.set_pos(panel_x + get_scaled(200), button_y);
-			m_btn_delete.set_size(get_scaled(100), button_height);
+			m_btn_delete.set_pos(frame_x + 200, frame_y + frame_h + 10);
+			m_btn_delete.set_size(100, 30);
 			m_btn_delete.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_BACKSPACE);
-			m_btn_delete.set_text_vertical_adjust(get_scaled(5));
+			m_btn_delete.set_text_vertical_adjust(5);
 
-			m_btn_shift.set_pos(panel_x + get_scaled(320), button_y);
-			m_btn_shift.set_size(get_scaled(80), button_height);
+			m_btn_shift.set_pos(frame_x + 320, frame_y + frame_h + 10);
+			m_btn_shift.set_size(80, 30);
 			m_btn_shift.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_SHIFT);
-			m_btn_shift.set_text_vertical_adjust(get_scaled(5));
+			m_btn_shift.set_text_vertical_adjust(5);
 
-			m_btn_accept.set_pos(panel_x + get_scaled(400), button_y);
-			m_btn_accept.set_size(get_scaled(100), button_height);
+			m_btn_accept.set_pos(frame_x + 400, frame_y + frame_h + 10);
+			m_btn_accept.set_size(100, 30);
 			m_btn_accept.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_ACCEPT);
-			m_btn_accept.set_text_vertical_adjust(get_scaled(5));
+			m_btn_accept.set_text_vertical_adjust(5);
 
 			m_update = true;
 		}
 
 		void osk_dialog::initialize_layout(const std::u32string& title, const std::u32string& initial_text)
 		{
-			const auto scale_font = [this](overlay_element& elem)
-			{
-				if (const font* fnt = elem.get_font())
-				{
-					elem.set_font(fnt->get_name().data(), get_scaled(fnt->get_size_pt()));
-				}
-			};
+			m_background.set_size(1280, 720);
+			m_background.back_color.a = 0.8f;
 
-			m_pointer.set_color(color4f{ 1.f, 1.f, 1.f, 1.f });
-
-			m_background.set_size(virtual_width, virtual_height);
+			m_frame.back_color = { 0.2f, 0.2f, 0.2f, 1.f };
 
 			m_title.set_unicode_text(title);
-			scale_font(m_title);
+			m_title.back_color.a = 0.f;
 
 			m_preview.password_mode = m_password_mode;
 			m_preview.set_placeholder(get_placeholder());
 			m_preview.set_unicode_text(initial_text);
-			scale_font(m_preview);
 
 			if (m_preview.value.empty())
 			{
@@ -496,22 +280,10 @@ namespace rsx
 			}
 			else
 			{
-				m_preview.caret_position = m_preview.value.length();
+				m_preview.caret_position = ::narrow<u16>(m_preview.value.length());
 				m_preview.fore_color.a = 1.f;
 			}
 
-			scale_font(m_btn_shift);
-			scale_font(m_btn_accept);
-			scale_font(m_btn_space);
-			scale_font(m_btn_delete);
-			scale_font(m_btn_cancel);
-
-			m_btn_shift.text_horizontal_offset = get_scaled(m_btn_shift.text_horizontal_offset);
-			m_btn_accept.text_horizontal_offset = get_scaled(m_btn_accept.text_horizontal_offset);
-			m_btn_space.text_horizontal_offset = get_scaled(m_btn_space.text_horizontal_offset);
-			m_btn_delete.text_horizontal_offset = get_scaled(m_btn_delete.text_horizontal_offset);
-			m_btn_cancel.text_horizontal_offset = get_scaled(m_btn_cancel.text_horizontal_offset);
-
 			m_btn_shift.set_image_resource(resource_config::standard_image_resource::select);
 			m_btn_accept.set_image_resource(resource_config::standard_image_resource::start);
 			m_btn_space.set_image_resource(resource_config::standard_image_resource::triangle);
@@ -527,13 +299,12 @@ namespace rsx
 			}
 
 			m_update = true;
-			set_visible(continuous_mode != CELL_OSKDIALOG_CONTINUOUS_MODE_HIDE);
-
-			m_stop_input_loop = false;
+			visible = true;
+			exit = false;
 
 			fade_animation.current = color4f(0.f);
 			fade_animation.end = color4f(1.f);
-			fade_animation.duration_sec = 0.5f;
+			fade_animation.duration = 0.5f;
 			fade_animation.active = true;
 		}
 
@@ -562,11 +333,11 @@ namespace rsx
 
 		std::pair<u32, u32> osk_dialog::get_cell_geometry(u32 index)
 		{
-			const u32 grid_size = num_columns * num_rows;
+			const auto index_limit = (num_columns * num_rows) - 1;
 			u32 start_index = index;
 			u32 count = 0;
 
-			while (start_index >= grid_size && start_index >= num_columns)
+			while (start_index > index_limit && start_index >= num_columns)
 			{
 				// Try one row above
 				start_index -= num_columns;
@@ -581,8 +352,8 @@ namespace rsx
 			// Find last cell
 			while (true)
 			{
-				const u32 current_index = (start_index + count);
-				ensure(current_index < grid_size);
+				const auto current_index = (start_index + count);
+				ensure(current_index <= index_limit);
 				++count;
 
 				if (m_grid[current_index].flags & border_flags::right)
@@ -617,61 +388,9 @@ namespace rsx
 			select_cell(index, true);
 		}
 
-		void osk_dialog::set_visible(bool visible)
+		void osk_dialog::on_button_pressed(pad_button button_press)
 		{
-			if (m_use_separate_windows)
-			{
-				if (visible && continuous_mode == CELL_OSKDIALOG_CONTINUOUS_MODE_HIDE)
-				{
-					continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_SHOW;
-				}
-				else if (!visible && continuous_mode == CELL_OSKDIALOG_CONTINUOUS_MODE_SHOW)
-				{
-					continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_HIDE;
-				}
-			}
-
-			if (this->visible != visible)
-			{
-				this->visible = visible;
-
-				if (m_use_separate_windows)
-				{
-					osk.notice("set_visible: sending CELL_SYSUTIL_OSKDIALOG_DISPLAY_CHANGED with %s", visible ? "CELL_OSKDIALOG_DISPLAY_STATUS_SHOW" : "CELL_OSKDIALOG_DISPLAY_STATUS_HIDE");
-					sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_DISPLAY_CHANGED, visible ? CELL_OSKDIALOG_DISPLAY_STATUS_SHOW : CELL_OSKDIALOG_DISPLAY_STATUS_HIDE);
-				}
-			}
-		}
-
-		void osk_dialog::on_button_pressed(pad_button button_press, bool is_auto_repeat)
-		{
-			if (!pad_input_enabled || ignore_device_events)
-				return;
-
-			if (input_device.exchange(CELL_OSKDIALOG_INPUT_DEVICE_PAD) != CELL_OSKDIALOG_INPUT_DEVICE_PAD)
-			{
-				osk.notice("on_button_pressed: sending CELL_SYSUTIL_OSKDIALOG_INPUT_DEVICE_CHANGED with CELL_OSKDIALOG_INPUT_DEVICE_PAD");
-				sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_INPUT_DEVICE_CHANGED, CELL_OSKDIALOG_INPUT_DEVICE_PAD);
-			}
-
-			if (input_device != CELL_OSKDIALOG_INPUT_DEVICE_PAD)
-			{
-				return;
-			}
-
-			// Always show the pad input panel if the pad is enabled and in use.
-			if (!m_show_panel)
-			{
-				m_show_panel = true;
-				update_panel();
-			}
-
-			// Make sure to show the dialog and send necessary events
-			set_visible(true);
-
-			std::lock_guard lock(m_preview_mutex);
-
-			const u32 grid_size = num_columns * num_rows;
+			const auto index_limit = (num_columns * num_rows) - 1;
 
 			const auto on_accept = [this]()
 			{
@@ -701,22 +420,6 @@ namespace rsx
 				}
 			};
 
-			// Increase auto repeat interval for some buttons
-			switch (button_press)
-			{
-			case pad_button::rs_left:
-			case pad_button::rs_right:
-			case pad_button::rs_down:
-			case pad_button::rs_up:
-				m_auto_repeat_ms_interval = 10;
-				break;
-			default:
-				m_auto_repeat_ms_interval = m_auto_repeat_ms_interval_default;
-				break;
-			}
-
-			bool play_cursor_sound = true;
-
 			switch (button_press)
 			{
 			case pad_button::L1:
@@ -732,7 +435,6 @@ namespace rsx
 				break;
 			}
 			case pad_button::dpad_right:
-			case pad_button::ls_right:
 			{
 				u32 current_index = (selected_y * num_columns) + selected_x;
 				while (true)
@@ -740,7 +442,7 @@ namespace rsx
 					const auto current = get_cell_geometry(current_index);
 					current_index = current.first + current.second;
 
-					if (current_index >= grid_size)
+					if (current_index > index_limit)
 					{
 						break;
 					}
@@ -755,7 +457,6 @@ namespace rsx
 				break;
 			}
 			case pad_button::dpad_left:
-			case pad_button::ls_left:
 			{
 				u32 current_index = (selected_y * num_columns) + selected_x;
 				while (current_index > 0)
@@ -780,13 +481,12 @@ namespace rsx
 				break;
 			}
 			case pad_button::dpad_down:
-			case pad_button::ls_down:
 			{
 				u32 current_index = (selected_y * num_columns) + selected_x;
 				while (true)
 				{
 					current_index += num_columns;
-					if (current_index >= grid_size)
+					if (current_index > index_limit)
 					{
 						break;
 					}
@@ -801,7 +501,6 @@ namespace rsx
 				break;
 			}
 			case pad_button::dpad_up:
-			case pad_button::ls_up:
 			{
 				u32 current_index = (selected_y * num_columns) + selected_x;
 				while (current_index >= num_columns)
@@ -823,9 +522,7 @@ namespace rsx
 			}
 			case pad_button::start:
 			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_oskenter.wav");
-				Close(CELL_OSKDIALOG_CLOSE_CONFIRM);
-				play_cursor_sound = false;
+				Close(true);
 				break;
 			}
 			case pad_button::triangle:
@@ -840,17 +537,13 @@ namespace rsx
 			}
 			case pad_button::cross:
 			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_oskenter.wav");
 				on_accept();
 				m_reset_pulse = true;
-				play_cursor_sound = false;
 				break;
 			}
 			case pad_button::circle:
 			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_oskcancel.wav");
-				Close(CELL_OSKDIALOG_CLOSE_CANCEL);
-				play_cursor_sound = false;
+				Close(false);
 				break;
 			}
 			case pad_button::L2:
@@ -863,203 +556,26 @@ namespace rsx
 				step_panel(true);
 				break;
 			}
-			case pad_button::rs_left:
-			case pad_button::rs_right:
-			case pad_button::rs_down:
-			case pad_button::rs_up:
-			{
-				if (!(flags & CELL_OSKDIALOG_NO_INPUT_ANALOG))
-				{
-					switch (button_press)
-					{
-					case pad_button::rs_left:  m_x_input_pos -= 5; m_x_panel_pos -= 5; break;
-					case pad_button::rs_right: m_x_input_pos += 5; m_x_panel_pos += 5; break;
-					case pad_button::rs_down:  m_y_input_pos += 5; m_y_panel_pos += 5; break;
-					case pad_button::rs_up:    m_y_input_pos -= 5; m_y_panel_pos -= 5; break;
-					default: break;
-					}
-					update_panel();
-				}
-				play_cursor_sound = false;
-				break;
-			}
 			default:
 				break;
 			}
 
-			// Play a sound unless this is a fast auto repeat which would induce a nasty noise
-			if (play_cursor_sound && (!is_auto_repeat || m_auto_repeat_ms_interval >= m_auto_repeat_ms_interval_default))
-			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cursor.wav");
-			}
-
 			if (m_reset_pulse)
 			{
 				m_update = true;
 			}
 		}
 
-		void osk_dialog::on_key_pressed(u32 led, u32 mkey, u32 key_code, u32 out_key_code, bool pressed, std::u32string key)
-		{
-			if (!pressed || !keyboard_input_enabled || ignore_device_events)
-				return;
-
-			if (input_device.exchange(CELL_OSKDIALOG_INPUT_DEVICE_KEYBOARD) != CELL_OSKDIALOG_INPUT_DEVICE_KEYBOARD)
-			{
-				osk.notice("on_key_pressed: sending CELL_SYSUTIL_OSKDIALOG_INPUT_DEVICE_CHANGED with CELL_OSKDIALOG_INPUT_DEVICE_KEYBOARD");
-				sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_INPUT_DEVICE_CHANGED, CELL_OSKDIALOG_INPUT_DEVICE_KEYBOARD);
-			}
-
-			if (input_device != CELL_OSKDIALOG_INPUT_DEVICE_KEYBOARD)
-			{
-				return;
-			}
-
-			if (m_use_separate_windows && m_show_panel)
-			{
-				// Hide the pad input panel if the keyboard is in use during separate windows.
-				m_show_panel = false;
-				update_panel();
-			}
-
-			// Make sure to show the dialog and send necessary events
-			set_visible(true);
-
-			std::lock_guard lock(m_preview_mutex);
-
-			// The key should normally be empty unless the backend couldn't find a match.
-			const bool is_key_string_fallback = !key.empty();
-
-			// Pure meta keys need to be treated with care, as their out key code contains the meta key code instead of the normal key code.
-			const bool is_meta_key = mkey != 0 && key_code == CELL_KEYC_NO_EVENT && key.empty();
-
-			osk.notice("osk_dialog::on_key_pressed(led=%d, mkey=%d, key_code=%d, out_key_code=%d, pressed=%d, is_key_string_fallback=%d, is_meta_key=%d)", led, mkey, key_code, out_key_code, pressed, is_key_string_fallback, is_meta_key);
-
-			// Find matching key in the OSK
-			const auto find_key = [&]() -> bool
-			{
-				if (is_meta_key)
-				{
-					// We don't need to process meta keys in the grid at the moment.
-					// The key is valid either way, so we return true.
-					// Only on_osk_key_input_entered is called later.
-					return true;
-				}
-
-				// Get the string representation of this key (unless it's already set by the backend)
-				if (key.empty())
-				{
-					// Get keyboard layout
-					const u32 kb_mapping = static_cast<u32>(g_cfg.sys.keyboard_type.get());
-
-					// Convert key to its u32string presentation
-					const u16 converted_out_key = cellKbCnvRawCode(kb_mapping, mkey, led, out_key_code);
-					std::u16string utf16_string;
-					utf16_string.push_back(converted_out_key);
-					key = utf16_to_u32string(utf16_string);
-				}
-
-				if (key.empty())
-				{
-					return false;
-				}
-
-				for (const cell& current_cell : m_grid)
-				{
-					for (const auto& output : current_cell.outputs)
-					{
-						for (const auto& str : output)
-						{
-							if (str == key)
-							{
-								// Apply key press
-								if (current_cell.callback)
-								{
-									current_cell.callback(str);
-								}
-								else
-								{
-									on_default_callback(str);
-								}
-
-								return true;
-							}
-						}
-					}
-				}
-
-				return false;
-			};
-
-			const bool found_key = find_key();
-
-			if (is_key_string_fallback)
-			{
-				// We don't have a keycode, so we can't process any of the following code anyway
-				return;
-			}
-
-			// Handle special input
-			if (!found_key)
-			{
-				switch (out_key_code)
-				{
-				case CELL_KEYC_SPACE:
-					on_space(key);
-					break;
-				case CELL_KEYC_BS:
-					on_backspace(key);
-					break;
-				case CELL_KEYC_DELETE:
-					on_delete(key);
-					break;
-				case CELL_KEYC_ESCAPE:
-					Close(CELL_OSKDIALOG_CLOSE_CANCEL);
-					break;
-				case CELL_KEYC_RIGHT_ARROW:
-					on_move_cursor(key, edit_text::direction::right);
-					break;
-				case CELL_KEYC_LEFT_ARROW:
-					on_move_cursor(key, edit_text::direction::left);
-					break;
-				case CELL_KEYC_DOWN_ARROW:
-					on_move_cursor(key, edit_text::direction::down);
-					break;
-				case CELL_KEYC_UP_ARROW:
-					on_move_cursor(key, edit_text::direction::up);
-					break;
-				case CELL_KEYC_ENTER:
-					if ((flags & CELL_OSKDIALOG_NO_RETURN))
-					{
-						Close(CELL_OSKDIALOG_CLOSE_CONFIRM);
-					}
-					else
-					{
-						on_enter(key);
-					}
-					break;
-				default:
-					break;
-				}
-			}
-
-			if (on_osk_key_input_entered)
-			{
-				CellOskDialogKeyMessage key_message{};
-				key_message.led = led;
-				key_message.mkey = mkey;
-				key_message.keycode = out_key_code;
-				on_osk_key_input_entered(key_message);
-			}
-		}
-
 		void osk_dialog::on_text_changed()
 		{
-			const std::u16string ws = u32string_to_utf16(m_preview.value);
-			const usz length = std::min(osk_text.size(), ws.length() + 1) * sizeof(char16_t);
-			memcpy(osk_text.data(), ws.c_str(), length);
+			const auto ws = u32string_to_utf16(m_preview.value);
+			const auto length = (ws.length() + 1) * sizeof(char16_t);
+			memcpy(osk_text, ws.c_str(), length);
 
-			osk.notice("on_text_changed: osk_text='%s'", utf16_to_ascii8(ws));
+			if (on_osk_input_entered)
+			{
+				on_osk_input_entered();
+			}
 
 			// Muted contrast for placeholder text
 			m_preview.fore_color.a = m_preview.value.empty() ? 0.5f : 1.f;
@@ -1077,17 +593,18 @@ namespace rsx
 			// Append to output text
 			if (m_preview.value.empty())
 			{
-				m_preview.caret_position = str.length();
+				m_preview.caret_position = ::narrow<u16>(str.length());
 				m_preview.set_unicode_text(str);
 			}
 			else
 			{
-				if (m_preview.value.length() >= char_limit)
+				if (m_preview.value.length() == char_limit)
 				{
 					return;
 				}
 
-				if ((m_preview.value.length() + str.length()) <= char_limit)
+				const auto new_str = m_preview.value + str;
+				if (new_str.length() <= char_limit)
 				{
 					m_preview.insert_text(str);
 				}
@@ -1138,12 +655,6 @@ namespace rsx
 			on_text_changed();
 		}
 
-		void osk_dialog::on_delete(const std::u32string&)
-		{
-			m_preview.del();
-			on_text_changed();
-		}
-
 		void osk_dialog::on_enter(const std::u32string&)
 		{
 			if (!(flags & CELL_OSKDIALOG_NO_RETURN))
@@ -1156,12 +667,6 @@ namespace rsx
 			}
 		}
 
-		void osk_dialog::on_move_cursor(const std::u32string&, edit_text::direction dir)
-		{
-			m_preview.move_caret(dir);
-			m_update = true;
-		}
-
 		std::u32string osk_dialog::get_placeholder() const
 		{
 			const localized_string_id id = m_password_mode
@@ -1170,25 +675,11 @@ namespace rsx
 			return get_localized_u32string(id);
 		}
 
-		void osk_dialog::update(u64 timestamp_us)
+		void osk_dialog::update()
 		{
 			if (fade_animation.active)
 			{
-				fade_animation.update(timestamp_us);
-				m_update = true;
-			}
-
-			osk_info& info = g_fxo->get<osk_info>();
-
-			if (const bool pointer_enabled = info.pointer_enabled; pointer_enabled != m_pointer.visible())
-			{
-				m_pointer.set_expiration(pointer_enabled ? u64{umax} : 0);
-				m_pointer.update_visibility(get_system_time());
-				m_update = true;
-			}
-
-			if (m_pointer.visible() && m_pointer.set_position(static_cast<s16>(info.pointer_x), static_cast<s16>(info.pointer_y)))
-			{
+				fade_animation.update(rsx::get_current_renderer()->vblank_count);
 				m_update = true;
 			}
 		}
@@ -1200,34 +691,13 @@ namespace rsx
 				return {};
 			}
 
-			if (!m_update)
+			if (m_update)
 			{
-				fade_animation.apply(m_cached_resource);
-				return m_cached_resource;
-			}
-
-			m_cached_resource.clear();
-			m_cached_resource.add(m_background.get_compiled());
-
-			if (m_use_separate_windows && !m_show_panel)
-			{
-				std::lock_guard lock(m_preview_mutex);
+				m_cached_resource.clear();
+				m_cached_resource.add(m_background.get_compiled());
+				m_cached_resource.add(m_frame.get_compiled());
+				m_cached_resource.add(m_title.get_compiled());
 				m_cached_resource.add(m_preview.get_compiled());
-			}
-			else
-			{
-				m_cached_resource.add(m_panel_frame.get_compiled());
-
-				if (!m_use_separate_windows)
-				{
-					// The title is omitted in separate window mode
-					m_cached_resource.add(m_input_frame.get_compiled());
-					m_cached_resource.add(m_title.get_compiled());
-				}
-				{
-					std::lock_guard lock(m_preview_mutex);
-					m_cached_resource.add(m_preview.get_compiled());
-				}
 				m_cached_resource.add(m_btn_accept.get_compiled());
 				m_cached_resource.add(m_btn_cancel.get_compiled());
 				m_cached_resource.add(m_btn_shift.get_compiled());
@@ -1235,25 +705,16 @@ namespace rsx
 				m_cached_resource.add(m_btn_delete.get_compiled());
 
 				overlay_element tmp;
-				u16 buffered_cell_count = 0;
-				bool render_label = false;
+				label m_label;
+				u16   buffered_cell_count = 0;
+				bool  render_label = false;
 
 				const color4f disabled_back_color = { 0.3f, 0.3f, 0.3f, 1.f };
 				const color4f disabled_fore_color = { 0.8f, 0.8f, 0.8f, 1.f };
 				const color4f normal_fore_color = { 0.f, 0.f, 0.f, 1.f };
 
-				label label;
-				label.back_color = { 0.f, 0.f, 0.f, 0.f };
-				label.set_padding(0, 0, get_scaled(10), 0);
-
-				const auto scale_font = [this](overlay_element& elem)
-				{
-					if (const font* fnt = elem.get_font())
-					{
-						elem.set_font(fnt->get_name().data(), get_scaled(fnt->get_size_pt()));
-					}
-				};
-				scale_font(label);
+				m_label.back_color = { 0.f, 0.f, 0.f, 0.f };
+				m_label.set_padding(0, 0, 10, 0);
 
 				if (m_reset_pulse)
 				{
@@ -1263,8 +724,8 @@ namespace rsx
 
 				for (const auto& c : m_grid)
 				{
-					s16 x = static_cast<s16>(c.pos.x);
-					s16 y = static_cast<s16>(c.pos.y);
+					u16 x = static_cast<u16>(c.pos.x);
+					u16 y = static_cast<u16>(c.pos.y);
 					u16 w = cell_size_x;
 					u16 h = cell_size_y;
 
@@ -1288,16 +749,16 @@ namespace rsx
 
 						if (output_count)
 						{
-							const s16 offset_x = static_cast<s16>(buffered_cell_count * cell_size_x);
+							const u16 offset_x = static_cast<u16>(buffered_cell_count * cell_size_x);
 							const u16 full_width = static_cast<u16>(offset_x + cell_size_x);
 
-							label.set_pos(x - offset_x, y);
-							label.set_size(full_width, cell_size_y);
-							label.fore_color = c.enabled ? normal_fore_color : disabled_fore_color;
+							m_label.set_pos(x - offset_x, y);
+							m_label.set_size(full_width, cell_size_y);
+							m_label.fore_color = c.enabled ? normal_fore_color : disabled_fore_color;
 
 							const auto _z = (selected_z < output_count) ? selected_z : output_count - 1u;
-							label.set_unicode_text(c.outputs[m_selected_charset][_z]);
-							label.align_text(rsx::overlays::overlay_element::text_align::center);
+							m_label.set_unicode_text(c.outputs[m_selected_charset][_z]);
+							m_label.align_text(rsx::overlays::overlay_element::text_align::center);
 							render_label = true;
 						}
 					}
@@ -1325,51 +786,30 @@ namespace rsx
 
 					if (render_label)
 					{
-						label.pulse_effect_enabled = c.selected;
-						label.pulse_sinus_offset = m_key_pulse_cache.pulse_sinus_offset;
-						m_cached_resource.add(label.get_compiled());
+						m_label.pulse_effect_enabled = c.selected;
+						m_label.pulse_sinus_offset = m_key_pulse_cache.pulse_sinus_offset;
+						m_cached_resource.add(m_label.get_compiled());
 					}
 				}
 
-				m_cached_resource.add(m_pointer.get_compiled());
 				m_reset_pulse = false;
+				m_update = false;
 			}
 
-			m_update = false;
-
 			fade_animation.apply(m_cached_resource);
 			return m_cached_resource;
 		}
 
-		void osk_dialog::Create(const osk_params& params)
+		struct osk_dialog_thread
+		{
+			static constexpr auto thread_name = "OSK Thread"sv;
+		};
+
+		void osk_dialog::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)
 		{
 			state = OskDialogState::Open;
-			flags = params.prohibit_flags;
-			char_limit = params.charlimit;
-			m_layout = params.layout;
-			m_input_layout = params.input_layout;
-			m_panel_layout = params.panel_layout;
-			m_input_field_window_width = params.input_field_window_width;
-			m_scaling = params.initial_scale;
-			m_input_frame.back_color.r = params.base_color.r;
-			m_input_frame.back_color.g = params.base_color.g;
-			m_input_frame.back_color.b = params.base_color.b;
-			m_input_frame.back_color.a = params.base_color.a;
-			m_panel_frame.back_color = m_input_frame.back_color;
-			m_background.back_color.a = params.dimmer_enabled ? 0.8f : 0.0f;
-			m_start_pad_interception = params.intercept_input;
-			m_use_separate_windows = params.use_separate_windows;
-
-			if (m_use_separate_windows)
-			{
-				// When using separate windows, we show the text field, but hide the pad input panel if the input device is a pad.
-				m_show_panel = pad_input_enabled && input_device == CELL_OSKDIALOG_INPUT_DEVICE_PAD;
-				m_preview.back_color.a = std::clamp(params.input_field_background_transparency, 0.0f, 1.0f);
-			}
-			else
-			{
-				m_title.back_color.a = 0.7f; // Uses the dimmed color of the frame background
-			}
+			flags = prohibit_flags;
+			char_limit = charlimit;
 
 			const callback_t shift_cb  = [this](const std::u32string& text){ on_shift(text); };
 			const callback_t layer_cb  = [this](const std::u32string& text){ on_layer(text); };
@@ -1377,45 +817,7 @@ namespace rsx
 			const callback_t delete_cb = [this](const std::u32string& text){ on_backspace(text); };
 			const callback_t enter_cb  = [this](const std::u32string& text){ on_enter(text); };
 
-			const auto is_supported = [&](u32 mode) -> bool
-			{
-				switch (mode)
-				{
-				case CELL_OSKDIALOG_PANELMODE_POLISH:
-				case CELL_OSKDIALOG_PANELMODE_KOREAN:
-				case CELL_OSKDIALOG_PANELMODE_TURKEY:
-				case CELL_OSKDIALOG_PANELMODE_TRADITIONAL_CHINESE:
-				case CELL_OSKDIALOG_PANELMODE_SIMPLIFIED_CHINESE:
-				case CELL_OSKDIALOG_PANELMODE_PORTUGUESE_BRAZIL:
-				case CELL_OSKDIALOG_PANELMODE_DANISH:
-				case CELL_OSKDIALOG_PANELMODE_SWEDISH:
-				case CELL_OSKDIALOG_PANELMODE_NORWEGIAN:
-				case CELL_OSKDIALOG_PANELMODE_FINNISH:
-					return (params.panel_flag & mode) && (params.support_language & mode);
-				default:
-					return (params.panel_flag & mode);
-				}
-			};
-
-			const auto has_language_support = [&](CellSysutilLang language)
-			{
-				switch (language)
-				{
-				case CELL_SYSUTIL_LANG_KOREAN: return is_supported(CELL_OSKDIALOG_PANELMODE_KOREAN);
-				case CELL_SYSUTIL_LANG_FINNISH: return is_supported(CELL_OSKDIALOG_PANELMODE_FINNISH);
-				case CELL_SYSUTIL_LANG_SWEDISH: return is_supported(CELL_OSKDIALOG_PANELMODE_SWEDISH);
-				case CELL_SYSUTIL_LANG_DANISH: return is_supported(CELL_OSKDIALOG_PANELMODE_DANISH);
-				case CELL_SYSUTIL_LANG_NORWEGIAN: return is_supported(CELL_OSKDIALOG_PANELMODE_NORWEGIAN);
-				case CELL_SYSUTIL_LANG_POLISH: return is_supported(CELL_OSKDIALOG_PANELMODE_POLISH);
-				case CELL_SYSUTIL_LANG_PORTUGUESE_BR: return is_supported(CELL_OSKDIALOG_PANELMODE_PORTUGUESE_BRAZIL);
-				case CELL_SYSUTIL_LANG_TURKISH: return is_supported(CELL_OSKDIALOG_PANELMODE_TURKEY);
-				case CELL_SYSUTIL_LANG_CHINESE_T: return is_supported(CELL_OSKDIALOG_PANELMODE_TRADITIONAL_CHINESE);
-				case CELL_SYSUTIL_LANG_CHINESE_S: return is_supported(CELL_OSKDIALOG_PANELMODE_SIMPLIFIED_CHINESE);
-				default: return true;
-				}
-			};
-
-			if (params.panel_flag & CELL_OSKDIALOG_PANELMODE_PASSWORD)
+			if (panel_flag & CELL_OSKDIALOG_PANELMODE_PASSWORD)
 			{
 				// If password was requested, then password has to be the only osk panel mode available to the user
 				// first_view_panel can be ignored
@@ -1424,23 +826,15 @@ namespace rsx
 
 				m_password_mode = true;
 			}
-			else if (params.panel_flag == CELL_OSKDIALOG_PANELMODE_DEFAULT || params.panel_flag == CELL_OSKDIALOG_PANELMODE_DEFAULT_NO_JAPANESE)
+			else if (panel_flag == CELL_OSKDIALOG_PANELMODE_DEFAULT || panel_flag == CELL_OSKDIALOG_PANELMODE_DEFAULT_NO_JAPANESE)
 			{
 				// Prefer the systems settings
 				// first_view_panel is ignored
 
-				CellSysutilLang language = g_cfg.sys.language;
-
-				// Fall back to english if the panel is not supported
-				if (!has_language_support(language))
-				{
-					language = CELL_SYSUTIL_LANG_ENGLISH_US;
-				}
-
 				switch (g_cfg.sys.language)
 				{
 				case CELL_SYSUTIL_LANG_JAPANESE:
-					if (params.panel_flag == CELL_OSKDIALOG_PANELMODE_DEFAULT_NO_JAPANESE)
+					if (panel_flag == CELL_OSKDIALOG_PANELMODE_DEFAULT_NO_JAPANESE)
 						add_panel(osk_panel_english(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 					else
 						add_panel(osk_panel_japanese(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
@@ -1509,111 +903,111 @@ namespace rsx
 
 				// TODO: find out the exact order
 
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_LATIN))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_LATIN)
 				{
 					add_panel(osk_panel_latin(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_ENGLISH))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_ENGLISH)
 				{
 					add_panel(osk_panel_english(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_FRENCH))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_FRENCH)
 				{
 					add_panel(osk_panel_french(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_SPANISH))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_SPANISH)
 				{
 					add_panel(osk_panel_spanish(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_ITALIAN))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_ITALIAN)
 				{
 					add_panel(osk_panel_italian(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_GERMAN))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_GERMAN)
 				{
 					add_panel(osk_panel_german(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_TURKEY))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_TURKEY)
 				{
 					add_panel(osk_panel_turkey(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_POLISH))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_POLISH)
 				{
 					add_panel(osk_panel_polish(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_RUSSIAN))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_RUSSIAN)
 				{
 					add_panel(osk_panel_russian(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_DANISH))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_DANISH)
 				{
 					add_panel(osk_panel_danish(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_NORWEGIAN))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_NORWEGIAN)
 				{
 					add_panel(osk_panel_norwegian(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_DUTCH))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_DUTCH)
 				{
 					add_panel(osk_panel_dutch(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_SWEDISH))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_SWEDISH)
 				{
 					add_panel(osk_panel_swedish(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_FINNISH))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_FINNISH)
 				{
 					add_panel(osk_panel_finnish(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_PORTUGUESE))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_PORTUGUESE)
 				{
 					add_panel(osk_panel_portuguese_pt(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_PORTUGUESE_BRAZIL))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_PORTUGUESE_BRAZIL)
 				{
 					add_panel(osk_panel_portuguese_br(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_KOREAN))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_KOREAN)
 				{
 					add_panel(osk_panel_korean(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_TRADITIONAL_CHINESE))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_TRADITIONAL_CHINESE)
 				{
 					add_panel(osk_panel_traditional_chinese(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_SIMPLIFIED_CHINESE))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_SIMPLIFIED_CHINESE)
 				{
 					add_panel(osk_panel_simplified_chinese(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_JAPANESE))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_JAPANESE)
 				{
 					add_panel(osk_panel_japanese(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_JAPANESE_HIRAGANA))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_JAPANESE_HIRAGANA)
 				{
 					add_panel(osk_panel_japanese_hiragana(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_JAPANESE_KATAKANA))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_JAPANESE_KATAKANA)
 				{
 					add_panel(osk_panel_japanese_katakana(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_ALPHABET))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_ALPHABET)
 				{
 					add_panel(osk_panel_alphabet_half_width(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_ALPHABET_FULL_WIDTH))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_ALPHABET_FULL_WIDTH)
 				{
 					add_panel(osk_panel_alphabet_full_width(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_NUMERAL))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_NUMERAL)
 				{
 					add_panel(osk_panel_numeral_half_width(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_NUMERAL_FULL_WIDTH))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_NUMERAL_FULL_WIDTH)
 				{
 					add_panel(osk_panel_numeral_full_width(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
-				if (is_supported(CELL_OSKDIALOG_PANELMODE_URL))
+				if (panel_flag & CELL_OSKDIALOG_PANELMODE_URL)
 				{
 					add_panel(osk_panel_url(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 				}
@@ -1621,7 +1015,7 @@ namespace rsx
 				// Get initial panel based on first_view_panel
 				for (usz i = 0; i < m_panels.size(); ++i)
 				{
-					if (params.first_view_panel == m_panels[i].osk_panel_mode)
+					if (first_view_panel == m_panels[i].osk_panel_mode)
 					{
 						m_panel_index = i;
 						break;
@@ -1636,22 +1030,22 @@ namespace rsx
 				add_panel(osk_panel_english(shift_cb, layer_cb, space_cb, delete_cb, enter_cb));
 			}
 
-			initialize_layout(utf16_to_u32string(params.message), utf16_to_u32string(params.init_text));
+			initialize_layout(utf16_to_u32string(message), utf16_to_u32string(init_text));
 
 			update_panel();
 
-			const auto notify = std::make_shared<atomic_t<u32>>(0);
-			auto& overlayman = g_fxo->get<display_manager>();
-
-			overlayman.attach_thread_input(
-				uid, "OSK",
-				[notify]() { *notify = true; notify->notify_one(); }
-			);
-
-			while (!Emu.IsStopped() && !*notify)
+			g_fxo->get<named_thread<osk_dialog_thread>>()([this, tbit = alloc_thread_bit()]
 			{
-				notify->wait(0, atomic_wait_timeout{1'000'000});
-			}
+				g_thread_bit = tbit;
+
+				if (const auto error = run_input_loop())
+				{
+					rsx_log.error("Osk input loop exited with error code=%d", error);
+				}
+
+				thread_bits &= ~tbit;
+				thread_bits.notify_all();
+			});
 		}
 	}
 }
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk.h b/rpcs3/Emu/RSX/Overlays/overlay_osk.h
index 2d5fa294ab..7b0e70e707 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_osk.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_osk.h
@@ -2,7 +2,6 @@
 
 #include "overlays.h"
 #include "overlay_edit_text.hpp"
-#include "overlay_cursor.h"
 #include "overlay_osk_panel.h"
 #include "Emu/Cell/Modules/cellOskDialog.h"
 
@@ -38,21 +37,8 @@ namespace rsx
 				callback_t callback;
 			};
 
-			// Mutex for interaction between overlay and cellOskDialog
-			shared_mutex m_preview_mutex;
-
-			// Base UI configuration
-			bool m_use_separate_windows = false;
-			bool m_show_panel = true;
-			osk_window_layout m_layout = {};
-			osk_window_layout m_input_layout = {}; // Only used with separate windows
-			osk_window_layout m_panel_layout = {}; // Only used with separate windows
-			u32 m_input_field_window_width = 0; // Only used with separate windows
-			f32 m_scaling = 1.0f;
-
 			// Base UI
-			overlay_element m_input_frame;
-			overlay_element m_panel_frame;
+			overlay_element m_frame;
 			overlay_element m_background;
 			label m_title;
 			edit_text m_preview;
@@ -62,20 +48,11 @@ namespace rsx
 			image_button m_btn_space;
 			image_button m_btn_delete;
 
-			// Pointer
-			cursor_item m_pointer{};
-
-			// Analog movement
-			s16 m_x_input_pos = 0;
-			s16 m_y_input_pos = 0;
-			s16 m_x_panel_pos = 0;
-			s16 m_y_panel_pos = 0;
-
 			// Grid
-			u16 cell_size_x = 0;
-			u16 cell_size_y = 0;
-			u16 num_columns = 0;
-			u16 num_rows = 0;
+			u32 cell_size_x = 0;
+			u32 cell_size_y = 0;
+			u32 num_columns = 0;
+			u32 num_rows = 0;
 			std::vector<u32> num_shift_layers_by_charset;
 			u32 selected_x = 0;
 			u32 selected_y = 0;
@@ -105,26 +82,20 @@ namespace rsx
 			osk_dialog();
 			~osk_dialog() override = default;
 
-			void Create(const osk_params& params) override;
-			void Close(s32 status) override;
-			void Clear(bool clear_all_data) override;
-			void SetText(const std::u16string& text) override;
-			void Insert(const std::u16string& text) override;
+			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) override;
+			void Close(bool ok) override;
 
 			void initialize_layout(const std::u32string& title, const std::u32string& initial_text);
 			void add_panel(const osk_panel& panel);
 			void step_panel(bool next_panel);
 			void update_panel();
 			void update_layout();
-			void update(u64 timestamp_us) override;
+			void update() override;
 
 			void update_controls();
 			void update_selection_by_index(u32 index);
 
-			void set_visible(bool visible);
-
-			void on_button_pressed(pad_button button_press, bool is_auto_repeat) override;
-			void on_key_pressed(u32 led, u32 mkey, u32 key_code, u32 out_key_code, bool pressed, std::u32string key) override;
+			void on_button_pressed(pad_button button_press) override;
 			void on_text_changed();
 
 			void on_default_callback(const std::u32string& str);
@@ -132,20 +103,12 @@ namespace rsx
 			void on_layer(const std::u32string&);
 			void on_space(const std::u32string&);
 			void on_backspace(const std::u32string&);
-			void on_delete(const std::u32string&);
 			void on_enter(const std::u32string&);
-			void on_move_cursor(const std::u32string&, edit_text::direction dir);
 
 			std::u32string get_placeholder() const;
 
 			std::pair<u32, u32> get_cell_geometry(u32 index);
 
-			template <typename T>
-			s16 get_scaled(T val)
-			{
-				return static_cast<s16>(static_cast<f32>(val) * m_scaling);
-			}
-
 			compiled_resource get_compiled() override;
 		};
 	}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.h b/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.h
index 7dbf247a64..eb6876d45a 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.h
@@ -35,10 +35,10 @@ namespace rsx
 			const color4f special2_bg = { 0.83f, 0.81f, 0.57f, 1.f };
 
 			u32 osk_panel_mode = 0;
-			u16 num_rows = 0;
-			u16 num_columns = 0;
-			u16 cell_size_x = 0;
-			u16 cell_size_y = 0;
+			u32 num_rows = 0;
+			u32 num_columns = 0;
+			u32 cell_size_x = 0;
+			u32 cell_size_y = 0;
 
 			std::vector<grid_entry_ctor> layout;
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp b/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp
index 8b68357208..0b8a3c97ac 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "overlay_manager.h"
 #include "overlay_perf_metrics.h"
 #include "Emu/RSX/RSXThread.h"
 #include "Emu/Cell/SPUThread.h"
@@ -7,6 +6,7 @@
 
 #include <algorithm>
 #include <utility>
+#include <charconv>
 
 #include "util/cpu_stats.hpp"
 
@@ -89,32 +89,17 @@ namespace rsx
 			return color4f(r / 255.f, g / 255.f, b / 255.f, a / 255.f * opacity);
 		}
 
-		void perf_metrics_overlay::reset_transform(label& elm) const
+		void perf_metrics_overlay::reset_transform(label& elm, u16 bottom_margin) const
 		{
+			const u32 text_padding = m_font_size / 2;
+
 			// left, top, right, bottom
-			const areau padding { m_padding, m_padding - std::min<u32>(4, m_padding), m_padding, m_padding };
+			const areau padding { text_padding, text_padding - 4, text_padding, text_padding };
 			const positionu margin { m_margin_x, m_margin_y };
 			positionu pos;
 
-			u16 graph_width = 0;
-			u16 graph_height = 0;
-
-			if (m_framerate_graph_enabled)
-			{
-				graph_width = std::max(graph_width, m_fps_graph.w);
-				graph_height += m_fps_graph.get_height();
-			}
-
-			if (m_frametime_graph_enabled)
-			{
-				graph_width = std::max(graph_width, m_frametime_graph.w);
-				graph_height += m_frametime_graph.get_height();
-			}
-
-			if (graph_height > 0 && m_body.h > 0)
-			{
-				graph_height += m_padding;
-			}
+			const auto overlay_width = m_body.w + margin.x;
+			const auto overlay_height = m_body.h + margin.y;
 
 			switch (m_quadrant)
 			{
@@ -123,27 +108,27 @@ namespace rsx
 				pos.y = margin.y;
 				break;
 			case screen_quadrant::top_right:
-				pos.x = virtual_width - std::max(m_body.w, graph_width) - margin.x;
+				pos.x = virtual_width - overlay_width;
 				pos.y = margin.y;
 				break;
 			case screen_quadrant::bottom_left:
 				pos.x = margin.x;
-				pos.y = virtual_height - m_body.h - graph_height - margin.y;
+				pos.y = virtual_height - overlay_height - bottom_margin;
 				break;
 			case screen_quadrant::bottom_right:
-				pos.x = virtual_width - std::max(m_body.w, graph_width) - margin.x;
-				pos.y = virtual_height - m_body.h - graph_height - margin.y;
+				pos.x = virtual_width - overlay_width;
+				pos.y = virtual_height - overlay_height - bottom_margin;
 				break;
 			}
 
 			if (m_center_x)
 			{
-				pos.x = (virtual_width - std::max(m_body.w, graph_width)) / 2;
+				pos.x = (virtual_width - m_body.w) / 2;
 			}
 
 			if (m_center_y)
 			{
-				pos.y = (virtual_height - m_body.h - graph_height) / 2;
+				pos.y = (virtual_height - m_body.h - bottom_margin) / 2;
 			}
 
 			elm.set_pos(pos.x, pos.y);
@@ -152,29 +137,42 @@ namespace rsx
 
 		void perf_metrics_overlay::reset_transforms()
 		{
+			const u16 perf_overlay_padding = m_font_size / 2;
+
 			const u16 fps_graph_h = 60;
 			const u16 frametime_graph_h = 45;
 
-			if (m_framerate_graph_enabled)
-			{
-				m_fps_graph.set_size(m_fps_graph.w, fps_graph_h);
-			}
+			u16 bottom_margin{};
 
-			if (m_frametime_graph_enabled)
+			if (m_framerate_graph_enabled || m_frametime_graph_enabled)
 			{
-				m_frametime_graph.set_size(m_frametime_graph.w, frametime_graph_h);
+				// Adjust body size to account for the graphs
+				// TODO: Bit hacky, could do this with margins if overlay_element had bottom margin (or negative top at least)
+				bottom_margin = perf_overlay_padding;
+
+				if (m_framerate_graph_enabled)
+				{
+					m_fps_graph.set_size(m_fps_graph.w, fps_graph_h);
+					bottom_margin += m_fps_graph.get_height();
+				}
+
+				if (m_frametime_graph_enabled)
+				{
+					m_frametime_graph.set_size(m_frametime_graph.w, frametime_graph_h);
+					bottom_margin += m_frametime_graph.get_height();
+				}
 			}
 
 			// Set body/titles transform
 			if (m_force_repaint)
 			{
-				reset_body();
-				reset_titles();
+				reset_body(bottom_margin);
+				reset_titles(bottom_margin);
 			}
 			else
 			{
-				reset_transform(m_body);
-				reset_transform(m_titles);
+				reset_transform(m_body, bottom_margin);
+				reset_transform(m_titles, bottom_margin);
 			}
 
 			if (m_framerate_graph_enabled || m_frametime_graph_enabled)
@@ -182,11 +180,11 @@ namespace rsx
 				// Position the graphs within the body
 				const u16 graphs_width = m_body.w;
 				const u16 body_left = m_body.x;
-				s16 y_offset = m_body.y;
+				u16 y_offset = m_body.y;
 
 				if (m_body.h > 0)
 				{
-					y_offset += static_cast<s16>(m_body.h + m_padding);
+					y_offset += m_body.h + perf_overlay_padding;
 				}
 
 				if (m_framerate_graph_enabled)
@@ -217,20 +215,20 @@ namespace rsx
 			m_force_repaint = false;
 		}
 
-		void perf_metrics_overlay::reset_body()
+		void perf_metrics_overlay::reset_body(u16 bottom_margin)
 		{
 			m_body.set_font(m_font.c_str(), m_font_size);
 			m_body.fore_color = convert_color_code(m_color_body, m_opacity);
 			m_body.back_color = convert_color_code(m_background_body, m_opacity);
-			reset_transform(m_body);
+			reset_transform(m_body, bottom_margin);
 		}
 
-		void perf_metrics_overlay::reset_titles()
+		void perf_metrics_overlay::reset_titles(u16 bottom_margin)
 		{
 			m_titles.set_font(m_font.c_str(), m_font_size);
 			m_titles.fore_color = convert_color_code(m_color_title, m_opacity);
 			m_titles.back_color = convert_color_code(m_background_title, m_opacity);
-			reset_transform(m_titles);
+			reset_transform(m_titles, bottom_margin);
 
 			switch (m_detail)
 			{
@@ -246,23 +244,22 @@ namespace rsx
 
 		void perf_metrics_overlay::init()
 		{
-			m_padding = m_font_size / 2;
 			m_fps_graph.set_one_percent_sort_high(false);
 			m_frametime_graph.set_one_percent_sort_high(true);
 
 			reset_transforms();
 			force_next_update();
 
-			if (!m_is_initialised)
+			if (m_is_initialised)
 			{
-				m_update_timer.Start();
-				m_frametime_timer.Start();
+				update();
+				return;
 			}
 
-			update(get_system_time());
+			m_update_timer.Start();
+			m_frametime_timer.Start();
 
-			// The text might have changed during the update. Recalculate positions.
-			reset_transforms();
+			update();
 
 			m_is_initialised = true;
 			visible = true;
@@ -376,7 +373,6 @@ namespace rsx
 				return;
 
 			m_font_size = font_size;
-			m_padding = m_font_size / 2;
 
 			m_force_repaint = true;
 		}
@@ -431,7 +427,7 @@ namespace rsx
 			m_force_update = true;
 		}
 
-		void perf_metrics_overlay::update(u64 /*timestamp_us*/)
+		void perf_metrics_overlay::update()
 		{
 			const auto elapsed_update = m_update_timer.GetElapsedTimeInMilliSec();
 			const bool do_update = m_force_update || elapsed_update >= m_update_interval;
@@ -474,7 +470,7 @@ namespace rsx
 
 						m_rsx_load = rsx_thread.get_load();
 
-						m_total_threads = utils::cpu_stats::get_current_thread_count();
+						m_total_threads = utils::cpu_stats::get_thread_count();
 
 						[[fallthrough]];
 					}
@@ -536,19 +532,19 @@ namespace rsx
 				}
 				case detail_level::minimal:
 				{
-					fmt::append(perf_text, "FPS : %05.2f", m_fps);
+					perf_text += fmt::format("FPS : %05.2f", m_fps);
 					break;
 				}
 				case detail_level::low:
 				{
-					fmt::append(perf_text, "FPS : %05.2f\n"
+					perf_text += fmt::format("FPS : %05.2f\n"
 					                         "CPU : %04.1f %%",
 					    m_fps, m_cpu_usage);
 					break;
 				}
 				case detail_level::medium:
 				{
-					fmt::append(perf_text, "FPS : %05.2f\n\n"
+					perf_text += fmt::format("FPS : %05.2f\n\n"
 					                         "%s\n"
 					                         " PPU   : %04.1f %%\n"
 					                         " SPU   : %04.1f %%\n"
@@ -559,7 +555,7 @@ namespace rsx
 				}
 				case detail_level::high:
 				{
-					fmt::append(perf_text, "FPS : %05.2f (%03.1fms)\n\n"
+					perf_text += fmt::format("FPS : %05.2f (%03.1fms)\n\n"
 					                         "%s\n"
 					                         " PPU   : %04.1f %% (%2u)\n"
 					                         " SPU   : %04.1f %% (%2u)\n"
@@ -638,14 +634,13 @@ namespace rsx
 		graph::graph()
 		{
 			m_label.set_font("e046323ms.ttf", 8);
-			m_label.alignment = text_align::center;
 			m_label.fore_color = { 1.f, 1.f, 1.f, 1.f };
 			m_label.back_color = { 0.f, 0.f, 0.f, .7f };
 
 			back_color = { 0.f, 0.f, 0.f, 0.5f };
 		}
 
-		void graph::set_pos(s16 _x, s16 _y)
+		void graph::set_pos(u16 _x, u16 _y)
 		{
 			m_label.set_pos(_x, _y);
 			overlay_element::set_pos(_x, _y + m_label.h);
@@ -653,8 +648,11 @@ namespace rsx
 
 		void graph::set_size(u16 _w, u16 _h)
 		{
-			m_label.set_size(_w, m_label.h);
 			overlay_element::set_size(_w, _h);
+
+			// Place label horizontally in the middle of the graph rect
+			const u16 label_x = std::max(x, u16(x + (w / 2) - (m_label.w / 2)));
+			m_label.set_pos(label_x, m_label.y);
 		}
 
 		void graph::set_title(const char* title)
@@ -744,47 +742,52 @@ namespace rsx
 				return;
 			}
 
-			m_min = max_v<f32>;
 			m_max = 0.0f;
 			m_avg = 0.0f;
 			m_1p = 0.0f;
 
-			std::vector<f32> valid_datapoints;
-
-			// Make sure min/max reflects the data being displayed, not the entire datapoints vector
-			for (usz i = m_datapoints.size() - m_datapoint_count; i < m_datapoints.size(); i++)
+			if (m_show_min_max || m_show_1p_avg)
 			{
-				const f32& dp = m_datapoints[i];
+				m_min = max_v<f32>;
 
-				if (dp < 0) continue; // Skip initial negative values. They don't count.
+				std::vector<f32> valid_datapoints;
 
-				m_min = std::min(m_min, dp);
-				m_max = std::max(m_max, dp);
-				m_avg += dp;
-
-				if (m_show_1p_avg)
+				// Make sure min/max reflects the data being displayed, not the entire datapoints vector
+				for (usz i = m_datapoints.size() - m_datapoint_count; i < m_datapoints.size(); i++)
 				{
+					const f32& dp = m_datapoints[i];
+
+					if (dp < 0) continue; // Skip initial negative values. They don't count.
+
+					m_min = std::min(m_min, dp);
+					m_max = std::max(m_max, dp);
+					m_avg += dp;
+
 					valid_datapoints.push_back(dp);
 				}
+
+				// Sanitize min value
+				m_min = std::min(m_min, m_max);
+
+				if (m_show_1p_avg && !valid_datapoints.empty())
+				{
+					// Sort datapoints (we are only interested in the lowest/highest 1%)
+					const usz i_1p = valid_datapoints.size() / 100;
+					const usz n_1p = i_1p + 1;
+
+					if (m_1p_sort_high)
+						std::nth_element(valid_datapoints.begin(), valid_datapoints.begin() + i_1p, valid_datapoints.end(), std::greater<f32>());
+					else
+						std::nth_element(valid_datapoints.begin(), valid_datapoints.begin() + i_1p, valid_datapoints.end());
+
+					// Calculate statistics
+					m_avg /= valid_datapoints.size();
+					m_1p = std::accumulate(valid_datapoints.begin(), valid_datapoints.begin() + n_1p, 0.0f) / static_cast<float>(n_1p);
+				}
 			}
-
-			// Sanitize min value
-			m_min = std::min(m_min, m_max);
-
-			if (m_show_1p_avg && !valid_datapoints.empty())
+			else
 			{
-				// Sort datapoints (we are only interested in the lowest/highest 1%)
-				const usz i_1p = valid_datapoints.size() / 100;
-				const usz n_1p = i_1p + 1;
-
-				if (m_1p_sort_high)
-					std::nth_element(valid_datapoints.begin(), valid_datapoints.begin() + i_1p, valid_datapoints.end(), std::greater<f32>());
-				else
-					std::nth_element(valid_datapoints.begin(), valid_datapoints.begin() + i_1p, valid_datapoints.end());
-
-				// Calculate statistics
-				m_avg /= valid_datapoints.size();
-				m_1p = std::accumulate(valid_datapoints.begin(), valid_datapoints.begin() + n_1p, 0.0f) / static_cast<float>(n_1p);
+				m_min = 0.0f;
 			}
 		}
 
@@ -814,7 +817,7 @@ namespace rsx
 
 		compiled_resource& graph::get_compiled()
 		{
-			if (is_compiled())
+			if (is_compiled)
 			{
 				return compiled_resources;
 			}
@@ -872,24 +875,26 @@ namespace rsx
 			return compiled_resources;
 		}
 
-		extern void reset_performance_overlay()
+		void reset_performance_overlay()
 		{
 			if (!g_cfg.misc.use_native_interface)
 				return;
 
-			if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
+			if (auto& manager = g_fxo->get<rsx::overlays::display_manager>(); g_fxo->is_init<rsx::overlays::display_manager>())
 			{
 				auto& perf_settings = g_cfg.video.perf_overlay;
-				auto perf_overlay = manager->get<rsx::overlays::perf_metrics_overlay>();
+				auto perf_overlay = manager.get<rsx::overlays::perf_metrics_overlay>();
 
 				if (perf_settings.perf_overlay_enabled)
 				{
-					if (!perf_overlay)
+					const bool existed = !!perf_overlay;
+
+					if (!existed)
 					{
-						perf_overlay = manager->create<rsx::overlays::perf_metrics_overlay>();
+						perf_overlay = manager.create<rsx::overlays::perf_metrics_overlay>();
 					}
 
-					std::lock_guard lock(*manager);
+					std::lock_guard lock(manager);
 
 					perf_overlay->set_detail_level(perf_settings.level);
 					perf_overlay->set_position(perf_settings.position);
@@ -909,7 +914,7 @@ namespace rsx
 				}
 				else if (perf_overlay)
 				{
-					manager->remove<rsx::overlays::perf_metrics_overlay>();
+					manager.remove<rsx::overlays::perf_metrics_overlay>();
 				}
 			}
 		}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.h b/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.h
index 4a121b5231..587f153332 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.h
@@ -39,7 +39,6 @@ namespace rsx
 			u16 m_font_size{};
 			u32 m_margin_x{}; // horizontal distance to the screen border relative to the screen_quadrant in px
 			u32 m_margin_y{}; // vertical distance to the screen border relative to the screen_quadrant in px
-			u32 m_padding{};  // space between overlay elements
 			f32 m_opacity{};  // 0..1
 
 			bool m_center_x{}; // center the overlay horizontally
@@ -78,10 +77,10 @@ namespace rsx
 			f32 m_rsx_usage{0};
 			u32 m_rsx_load{0};
 
-			void reset_transform(label& elm) const;
+			void reset_transform(label& elm, u16 bottom_margin = 0) const;
 			void reset_transforms();
-			void reset_body();
-			void reset_titles();
+			void reset_body(u16 bottom_margin);
+			void reset_titles(u16 bottom_margin);
 
 		public:
 			void init();
@@ -102,7 +101,7 @@ namespace rsx
 			void set_title_colors(std::string color, std::string background);
 			void force_next_update();
 
-			void update(u64 timestamp_us) override;
+			void update() override;
 
 			compiled_resource get_compiled() override;
 		};
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.cpp b/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.cpp
index 860f54544a..c21b30c36b 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.cpp
@@ -23,7 +23,7 @@ namespace rsx
 		void progress_bar::set_limit(f32 limit)
 		{
 			m_limit     = limit;
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
 		void progress_bar::set_value(f32 value)
@@ -32,10 +32,10 @@ namespace rsx
 
 			f32 indicator_width = (w * m_value) / m_limit;
 			indicator.set_size(static_cast<u16>(indicator_width), h);
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
-		void progress_bar::set_pos(s16 _x, s16 _y)
+		void progress_bar::set_pos(u16 _x, u16 _y)
 		{
 			u16 text_w, text_h;
 			text_view.measure_text(text_w, text_h);
@@ -68,12 +68,12 @@ namespace rsx
 			text_view.set_size(w, text_h);
 
 			set_pos(text_view.x, text_view.y);
-			m_is_compiled = false;
+			is_compiled = false;
 		}
 
 		compiled_resource& progress_bar::get_compiled()
 		{
-			if (!is_compiled())
+			if (!is_compiled)
 			{
 				auto& compiled = overlay_element::get_compiled();
 				compiled.add(text_view.get_compiled());
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.hpp b/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.hpp
index 6ed6b73c77..716d601f23 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.hpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.hpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "overlay_controls.h"
 
 namespace rsx
@@ -21,7 +19,7 @@ namespace rsx
 			void dec(f32 value);
 			void set_limit(f32 limit);
 			void set_value(f32 value);
-			void set_pos(s16 _x, s16 _y) override;
+			void set_pos(u16 _x, u16 _y) override;
 			void set_size(u16 _w, u16 _h) override;
 			void translate(s16 dx, s16 dy) override;
 			void set_text(const std::string& str) override;
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
index 86e9905f2f..754a563ead 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
@@ -1,25 +1,31 @@
 #include "stdafx.h"
 #include "overlay_save_dialog.h"
-#include "overlay_video.h"
 #include "Utilities/date_time.h"
-#include "Emu/System.h"
 
 namespace rsx
 {
 	namespace overlays
 	{
-		save_dialog::save_dialog_entry::save_dialog_entry(const std::string& text1, const std::string& text2, const std::string& text3, u8 resource_id, const std::vector<u8>& icon_buf, const std::string& video_path)
+		save_dialog::save_dialog_entry::save_dialog_entry(const std::string& text1, const std::string& text2, const std::string& text3, u8 resource_id, const std::vector<u8>& icon_buf)
 		{
-			std::unique_ptr<overlay_element> image = resource_id != image_resource_id::raw_image
-				? std::make_unique<video_view>(video_path, resource_id)
-				: !icon_buf.empty() ? std::make_unique<video_view>(video_path, icon_buf)
-				                    : std::make_unique<video_view>(video_path, resource_config::standard_image_resource::save); // Fallback
+			std::unique_ptr<overlay_element> image = std::make_unique<image_view>();
 			image->set_size(160, 110);
 			image->set_padding(36, 36, 11, 11); // Square image, 88x88
 
-			if (resource_id == image_resource_id::raw_image && !icon_buf.empty())
+			if (resource_id != image_resource_id::raw_image)
+			{
+				static_cast<image_view*>(image.get())->set_image_resource(resource_id);
+			}
+			else if (!icon_buf.empty())
 			{
 				image->set_padding(0, 0, 11, 11); // Half sized icon, 320x176->160x88
+				icon_data = std::make_unique<image_info>(icon_buf);
+				static_cast<image_view*>(image.get())->set_raw_image(icon_data.get());
+			}
+			else
+			{
+				// Fallback
+				static_cast<image_view*>(image.get())->set_image_resource(resource_config::standard_image_resource::save);
 			}
 
 			std::unique_ptr<overlay_element> text_stack  = std::make_unique<vertical_layout>();
@@ -67,24 +73,16 @@ namespace rsx
 
 			// Pack
 			this->pack_padding = 15;
-			m_image = add_element(image);
+			add_element(image);
 			add_element(text_stack);
 		}
 
-		void save_dialog::save_dialog_entry::set_selected(bool selected)
-		{
-			if (m_image)
-			{
-				static_cast<video_view*>(m_image)->set_active(selected);
-			}
-		}
-
 		save_dialog::save_dialog()
 		{
 			m_dim_background = std::make_unique<overlay_element>();
-			m_dim_background->set_size(virtual_width, virtual_height);
+			m_dim_background->set_size(1280, 720);
 
-			m_list        = std::make_unique<list_view>(virtual_width - 2 * 20, 540);
+			m_list        = std::make_unique<list_view>(1240, 540);
 			m_description = std::make_unique<label>();
 			m_time_thingy = std::make_unique<label>();
 
@@ -105,47 +103,31 @@ namespace rsx
 			m_description->back_color.a    = 0.f;
 			m_time_thingy->back_color.a    = 0.f;
 
-			fade_animation.duration_sec = 0.15f;
-
 			return_code = selection_code::canceled;
 		}
 
-		void save_dialog::update(u64 timestamp_us)
+		void save_dialog::update()
 		{
 			m_time_thingy->set_text(date_time::current_time());
 			m_time_thingy->auto_resize();
-
-			if (fade_animation.active)
-			{
-				fade_animation.update(timestamp_us);
-			}
 		}
 
-		void save_dialog::on_button_pressed(pad_button button_press, bool is_auto_repeat)
+		void save_dialog::on_button_pressed(pad_button button_press)
 		{
-			if (fade_animation.active) return;
-
-			bool close_dialog = false;
-
 			switch (button_press)
 			{
 			case pad_button::cross:
 				if (m_no_saves)
 					break;
 				return_code = m_list->get_selected_index();
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_decide.wav");
-				close_dialog = true;
-				break;
+				[[fallthrough]];
 			case pad_button::circle:
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cancel.wav");
-				close_dialog = true;
+				close(true, true);
 				break;
 			case pad_button::dpad_up:
-			case pad_button::ls_up:
 				m_list->select_previous();
 				break;
 			case pad_button::dpad_down:
-			case pad_button::ls_down:
 				m_list->select_next();
 				break;
 			case pad_button::L1:
@@ -158,23 +140,6 @@ namespace rsx
 				rsx_log.trace("[ui] Button %d pressed", static_cast<u8>(button_press));
 				break;
 			}
-
-			if (close_dialog)
-			{
-				fade_animation.current = color4f(1.f);
-				fade_animation.end = color4f(0.f);
-				fade_animation.active = true;
-
-				fade_animation.on_finish = [this]
-				{
-					close(true, true);
-				};
-			}
-			// Play a sound unless this is a fast auto repeat which would induce a nasty noise
-			else if (!is_auto_repeat || m_auto_repeat_ms_interval >= m_auto_repeat_ms_interval_default)
-			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cursor.wav");
-			}
 		}
 
 		compiled_resource save_dialog::get_compiled()
@@ -193,15 +158,11 @@ namespace rsx
 			if (m_no_saves)
 				result.add(m_no_saves_text->get_compiled());
 
-			fade_animation.apply(result);
-
 			return result;
 		}
 
-		s32 save_dialog::show(const std::string& base_dir, std::vector<SaveDataEntry>& save_entries, u32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet, bool enable_overlay)
+		s32 save_dialog::show(std::vector<SaveDataEntry>& save_entries, u32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet, bool enable_overlay)
 		{
-			rsx_log.notice("Showing native UI save_dialog (save_entries=%d, focused=%d, op=0x%x, listSet=*0x%x, enable_overlay=%d)", save_entries.size(), focused, op, listSet, enable_overlay);
-
 			visible = false;
 
 			if (enable_overlay)
@@ -219,7 +180,7 @@ namespace rsx
 			{
 				const std::string date_and_size = fmt::format("%s   %s", entry.date(), entry.data_size());
 				std::unique_ptr<overlay_element> e;
-				e = std::make_unique<save_dialog_entry>(entry.subtitle, date_and_size, entry.details, image_resource_id::raw_image, entry.iconBuf, base_dir + entry.dirName + "/ICON1.PAM");
+				e = std::make_unique<save_dialog_entry>(entry.subtitle, date_and_size, entry.details, image_resource_id::raw_image, entry.iconBuf);
 				entries.emplace_back(std::move(e));
 			}
 
@@ -271,7 +232,7 @@ namespace rsx
 					id = image_resource_id::raw_image;
 				}
 
-				std::unique_ptr<overlay_element> new_stub = std::make_unique<save_dialog_entry>(title, get_localized_string(localized_string_id::CELL_SAVEDATA_NEW_SAVED_DATA_SUB_TITLE), "", id, icon, "");
+				std::unique_ptr<overlay_element> new_stub = std::make_unique<save_dialog_entry>(title, get_localized_string(localized_string_id::CELL_SAVEDATA_NEW_SAVED_DATA_SUB_TITLE), "", id, icon);
 
 				m_list->add_entry(new_stub);
 			}
@@ -303,21 +264,10 @@ namespace rsx
 			}
 
 			m_description->auto_resize();
-
-			fade_animation.current = color4f(0.f);
-			fade_animation.end = color4f(1.f);
-			fade_animation.active = true;
-
 			visible = true;
 
-			if (const auto error = run_input_loop())
-			{
-				if (error != selection_code::canceled)
-				{
-					rsx_log.error("Save dialog input loop exited with error code=%d", error);
-				}
-				return error;
-			}
+			if (const auto err = run_input_loop())
+				return err;
 
 			if (return_code >= 0)
 			{
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.h b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.h
index 0c65379153..ef6660c02b 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.h
@@ -13,12 +13,11 @@ namespace rsx
 		private:
 			struct save_dialog_entry : horizontal_layout
 			{
-			public:
-				save_dialog_entry(const std::string& text1, const std::string& text2, const std::string& text3, u8 resource_id, const std::vector<u8>& icon_buf, const std::string& video_path);
-				void set_selected(bool selected) override;
-
 			private:
-				overlay_element* m_image = nullptr;
+				std::unique_ptr<image_info> icon_data;
+
+			public:
+				save_dialog_entry(const std::string& text1, const std::string& text2, const std::string& text3, u8 resource_id, const std::vector<u8>& icon_buf);
 			};
 
 			std::unique_ptr<overlay_element> m_dim_background;
@@ -29,17 +28,15 @@ namespace rsx
 
 			bool m_no_saves = false;
 
-			animation_color_interpolate fade_animation;
-
 		public:
 			save_dialog();
 
-			void update(u64 timestamp_us) override;
-			void on_button_pressed(pad_button button_press, bool is_auto_repeat) override;
+			void update() override;
+			void on_button_pressed(pad_button button_press) override;
 
 			compiled_resource get_compiled() override;
 
-			s32 show(const std::string& base_dir, std::vector<SaveDataEntry>& save_entries, u32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet, bool enable_overlay);
+			s32 show(std::vector<SaveDataEntry>& save_entries, u32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet, bool enable_overlay);
 		};
 	}
 }
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_shader_compile_notification.cpp b/rpcs3/Emu/RSX/Overlays/overlay_shader_compile_notification.cpp
new file mode 100644
index 0000000000..4d532437b3
--- /dev/null
+++ b/rpcs3/Emu/RSX/Overlays/overlay_shader_compile_notification.cpp
@@ -0,0 +1,98 @@
+#include "stdafx.h"
+#include "overlay_shader_compile_notification.h"
+#include "Emu/system_config.h"
+
+namespace rsx
+{
+	namespace overlays
+	{
+		shader_compile_notification::shader_compile_notification()
+		{
+			const u16 pos_x = g_cfg.video.shader_compilation_hint.pos_x;
+			const u16 pos_y = g_cfg.video.shader_compilation_hint.pos_y;
+
+			m_text.set_font("Arial", 16);
+			m_text.set_text(localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS);
+			m_text.auto_resize();
+			m_text.set_pos(pos_x, pos_y);
+
+			m_text.back_color.a = 0.f;
+
+			for (int n = 0; n < 3; ++n)
+			{
+				dots[n].set_size(2, 2);
+				dots[n].back_color = color4f(1.f, 1.f, 1.f, 1.f);
+				dots[n].set_pos(m_text.w + pos_x + 5 + (6 * n), pos_y + 20);
+			}
+
+			creation_time = get_system_time();
+			expire_time   = creation_time + 1000000;
+
+			// Disable forced refresh unless fps dips below 4
+			min_refresh_duration_us = 250000;
+			visible = true;
+		}
+
+		void shader_compile_notification::update_animation(u64 t)
+		{
+			// Update rate is twice per second
+			auto elapsed = t - creation_time;
+			elapsed /= 500000;
+
+			auto old_dot = current_dot;
+			current_dot  = elapsed % 3;
+
+			if (old_dot != current_dot)
+			{
+				if (old_dot != 255)
+				{
+					dots[old_dot].set_size(2, 2);
+					dots[old_dot].translate(0, 1);
+				}
+
+				dots[current_dot].translate(0, -1);
+				dots[current_dot].set_size(3, 3);
+			}
+		}
+
+		// Extends visible time by half a second. Also updates the screen
+		void shader_compile_notification::touch()
+		{
+			if (urgency_ctr == 0 || urgency_ctr > 8)
+			{
+				refresh();
+				urgency_ctr = 0;
+			}
+
+			expire_time = get_system_time() + 500000;
+			urgency_ctr++;
+		}
+
+		void shader_compile_notification::update()
+		{
+			auto current_time = get_system_time();
+			if (current_time > expire_time)
+				close(false, false);
+
+			update_animation(current_time);
+
+			// Usually this method is called during a draw-to-screen operation. Reset urgency ctr
+			urgency_ctr = 1;
+		}
+
+		compiled_resource shader_compile_notification::get_compiled()
+		{
+			if (!visible)
+			{
+				return {};
+			}
+
+			auto compiled = m_text.get_compiled();
+			compiled.add(dots[0].get_compiled());
+			compiled.add(dots[1].get_compiled());
+			compiled.add(dots[2].get_compiled());
+
+			return compiled;
+		}
+	} // namespace overlays
+} // namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_shader_compile_notification.h b/rpcs3/Emu/RSX/Overlays/overlay_shader_compile_notification.h
new file mode 100644
index 0000000000..fec0cfb2c7
--- /dev/null
+++ b/rpcs3/Emu/RSX/Overlays/overlay_shader_compile_notification.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "overlays.h"
+
+namespace rsx
+{
+	namespace overlays
+	{
+		struct shader_compile_notification : user_interface
+		{
+			label m_text;
+
+			overlay_element dots[3];
+			u8 current_dot = 255;
+
+			u64 creation_time = 0;
+			u64 expire_time = 0; // Time to end the prompt
+			u64 urgency_ctr = 0; // How critical it is to show to the user
+
+			shader_compile_notification();
+
+			void update_animation(u64 t);
+			void touch();
+			void update() override;
+
+			compiled_resource get_compiled() override;
+		};
+	}
+}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp b/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp
index 595828afd9..0067187a1b 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "overlay_trophy_notification.h"
 #include "Emu/Cell/ErrorCodes.h"
-#include "Emu/System.h"
+#include "Emu/RSX/RSXThread.h"
 
 namespace rsx
 {
@@ -40,6 +40,7 @@ namespace rsx
 			frame.back_color.g = 0.250980f;
 			frame.back_color.b = 0.247059f;
 			frame.back_color.a = 0.88f;
+			
 
 			image.set_pos(78, 64);
 			image.set_size(53, 53);
@@ -51,14 +52,14 @@ namespace rsx
 			text_view.align_text(overlay_element::text_align::center);
 			text_view.back_color.a = 0.f;
 
-			sliding_animation.duration_sec = 1.5f;
+			sliding_animation.duration = 1.5f;
 			sliding_animation.type = animation_type::ease_in_out_cubic;
-
-			// Make the fade animation a bit shorter to see the trophy better.
-			fade_animation.duration_sec = 1.0f;
+			sliding_animation.current = { -f32(frame.w), 0, 0 };
+			sliding_animation.end = { 0, 0, 0};
+			sliding_animation.active = true;
 		}
 
-		void trophy_notification::update(u64 timestamp_us)
+		void trophy_notification::update()
 		{
 			if (!s_trophy_semaphore.try_acquire(display_sched_id))
 			{
@@ -66,22 +67,19 @@ namespace rsx
 				return;
 			}
 
-			if (!creation_time_us)
+			const u64 t = get_system_time();
+			if (!creation_time)
 			{
 				// First tick
-				creation_time_us = timestamp_us;
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_trophy.wav");
+				creation_time = t;
 				return;
 			}
 
-			const u64 time_since_creation_us = timestamp_us - creation_time_us;
-			u64 end_animation_begin_us = 5'000'000;
-
-			if (time_since_creation_us > end_animation_begin_us)
+			if (((t - creation_time) / 1000) > 5000)
 			{
 				if (!sliding_animation.active)
 				{
-					sliding_animation.end = { -f32(frame.x + frame.w), 0, 0 };
+					sliding_animation.end = { -f32(frame.w), 0, 0 };
 					sliding_animation.on_finish = [this]
 					{
 						s_trophy_semaphore.release();
@@ -92,37 +90,15 @@ namespace rsx
 				}
 			}
 
-			// Match both animation ends based on their durations
-			if (sliding_animation.duration_sec > fade_animation.duration_sec)
-			{
-				end_animation_begin_us += static_cast<u64>((sliding_animation.duration_sec - fade_animation.duration_sec) * 1'000'000);
-			}
-
-			if (time_since_creation_us > end_animation_begin_us)
-			{
-				if (!fade_animation.active)
-				{
-					fade_animation.current = color4f(1.f);
-					fade_animation.end = color4f(0.f);
-
-					fade_animation.active = true;
-				}
-			}
-
 			if (sliding_animation.active)
 			{
-				sliding_animation.update(timestamp_us);
-			}
-
-			if (fade_animation.active)
-			{
-				fade_animation.update(timestamp_us);
+				sliding_animation.update(rsx::get_current_renderer()->vblank_count);
 			}
 		}
 
 		compiled_resource trophy_notification::get_compiled()
 		{
-			if (!creation_time_us || !visible)
+			if (!creation_time || !visible)
 			{
 				return {};
 			}
@@ -132,8 +108,6 @@ namespace rsx
 			result.add(text_view.get_compiled());
 
 			sliding_animation.apply(result);
-			fade_animation.apply(result);
-
 			return result;
 		}
 
@@ -163,19 +137,10 @@ namespace rsx
 			text_view.auto_resize();
 
 			// Resize background to cover the text
-			constexpr u16 margin_sz = 9;
-			frame.w = margin_sz * 3 + image.w + text_view.w;
-
-			sliding_animation.current = { -f32(frame.x + frame.w), 0, 0 };
-			sliding_animation.end = { 0, 0, 0 };
-			sliding_animation.active = true;
-
-			fade_animation.current = color4f(0.f);
-			fade_animation.end = color4f(1.f);
-			fade_animation.active = true;
+			u16 margin_sz = 9;
+			frame.w       = margin_sz * 3 + image.w + text_view.w;
 
 			visible = true;
-
 			return CELL_OK;
 		}
 	} // namespace overlays
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.h b/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.h
index f869b76c2a..ff17533b60 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.h
@@ -15,16 +15,15 @@ namespace rsx
 			label text_view;
 
 			u64 display_sched_id = 0;
-			u64 creation_time_us = 0;
+			u64 creation_time = 0;
 			std::unique_ptr<image_info> icon_info;
 
 			animation_translate sliding_animation;
-			animation_color_interpolate fade_animation;
 
 		public:
 			trophy_notification();
 
-			void update(u64 timestamp_us) override;
+			void update() override;
 
 			compiled_resource get_compiled() override;
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp
index 186ac0ee83..86a05fedfb 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "overlay_manager.h"
 #include "overlay_user_list_dialog.h"
-#include "Emu/vfs_config.h"
+#include "Emu/system_config.h"
 #include "Emu/system_utils.hpp"
-#include "Emu/System.h"
+#include "Utilities/StrUtil.h"
+#include "Utilities/Thread.h"
 
 namespace rsx
 {
@@ -17,13 +17,12 @@ namespace rsx
 
 			if (fs::exists(avatar_path))
 			{
-				icon_data = std::make_unique<image_info>(avatar_path);
+				icon_data = std::make_unique<image_info>(avatar_path.c_str());
 				static_cast<image_view*>(image.get())->set_raw_image(icon_data.get());
 			}
 			else
 			{
 				// Fallback
-				// TODO: use proper icon
 				static_cast<image_view*>(image.get())->set_image_resource(resource_config::standard_image_resource::square);
 			}
 
@@ -67,10 +66,10 @@ namespace rsx
 		user_list_dialog::user_list_dialog()
 		{
 			m_dim_background = std::make_unique<overlay_element>();
-			m_dim_background->set_size(virtual_width, virtual_height);
+			m_dim_background->set_size(1280, 720);
 			m_dim_background->back_color.a = 0.5f;
 
-			m_list = std::make_unique<list_view>(virtual_width - 2 * 20, 540);
+			m_list = std::make_unique<list_view>(1240, 540);
 			m_list->set_pos(20, 85);
 
 			m_description = std::make_unique<label>();
@@ -78,27 +77,13 @@ namespace rsx
 			m_description->set_pos(20, 37);
 			m_description->set_text("Select user"); // Fallback. I don't think this will ever be used, so I won't localize it.
 			m_description->auto_resize();
-			m_description->back_color.a = 0.f;
-
-			fade_animation.duration_sec = 0.15f;
+			m_description->back_color.a	= 0.f;
 
 			return_code = selection_code::canceled;
 		}
 
-		void user_list_dialog::update(u64 timestamp_us)
+		void user_list_dialog::on_button_pressed(pad_button button_press)
 		{
-			if (fade_animation.active)
-			{
-				fade_animation.update(timestamp_us);
-			}
-		}
-
-		void user_list_dialog::on_button_pressed(pad_button button_press, bool is_auto_repeat)
-		{
-			if (fade_animation.active) return;
-
-			bool close_dialog = false;
-
 			switch (button_press)
 			{
 			case pad_button::cross:
@@ -113,19 +98,14 @@ namespace rsx
 				{
 					return_code = selection_code::error;
 				}
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_decide.wav");
-				close_dialog = true;
-				break;
+				[[fallthrough]];
 			case pad_button::circle:
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cancel.wav");
-				close_dialog = true;
+				close(true, true);
 				break;
 			case pad_button::dpad_up:
-			case pad_button::ls_up:
 				m_list->select_previous();
 				break;
 			case pad_button::dpad_down:
-			case pad_button::ls_down:
 				m_list->select_next();
 				break;
 			case pad_button::L1:
@@ -138,23 +118,6 @@ namespace rsx
 				rsx_log.trace("[ui] Button %d pressed", static_cast<u8>(button_press));
 				break;
 			}
-
-			if (close_dialog)
-			{
-				fade_animation.current = color4f(1.f);
-				fade_animation.end = color4f(0.f);
-				fade_animation.active = true;
-
-				fade_animation.on_finish = [this]
-				{
-					close(true, true);
-				};
-			}
-			// Play a sound unless this is a fast auto repeat which would induce a nasty noise
-			else if (!is_auto_repeat || m_auto_repeat_ms_interval >= m_auto_repeat_ms_interval_default)
-			{
-				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cursor.wav");
-			}
 		}
 
 		compiled_resource user_list_dialog::get_compiled()
@@ -168,12 +131,14 @@ namespace rsx
 			result.add(m_dim_background->get_compiled());
 			result.add(m_list->get_compiled());
 			result.add(m_description->get_compiled());
-
-			fade_animation.apply(result);
-
 			return result;
 		}
 
+		struct user_list_dialog_thread
+		{
+			static constexpr auto thread_name = "UserList Thread"sv;
+		};
+
 		error_code user_list_dialog::show(const std::string& title, u32 focused, const std::vector<u32>& user_ids, bool enable_overlay, std::function<void(s32 status)> on_close)
 		{
 			visible = false;
@@ -187,6 +152,7 @@ namespace rsx
 				m_dim_background->back_color.a = 0.5f;
 			}
 
+			std::vector<u8> icon;
 			std::vector<std::unique_ptr<overlay_element>> entries;
 
 			const std::string home_dir = rpcs3::utils::get_hdd0_dir() + "home/";
@@ -204,7 +170,7 @@ namespace rsx
 					}
 
 					// Let's assume there are 26 avatar pngs (like in my installation)
-					const std::string avatar_path = g_cfg_vfs.get_dev_flash() + fmt::format("vsh/resource/explore/user/%03d.png", id % 26);
+					const std::string avatar_path = g_cfg.vfs.get_dev_flash() + fmt::format("vsh/resource/explore/user/%03d.png", id % 26);
 					const std::string username = file.to_string();
 					std::unique_ptr<overlay_element> entry = std::make_unique<user_list_entry>(username, user_id, avatar_path);
 					entries.emplace_back(std::move(entry));
@@ -230,25 +196,23 @@ namespace rsx
 			m_description->set_text(title);
 			m_description->auto_resize();
 
-			fade_animation.current = color4f(0.f);
-			fade_animation.end = color4f(1.f);
-			fade_animation.active = true;
-
 			this->on_close = std::move(on_close);
 			visible = true;
 
-			const auto notify = std::make_shared<atomic_t<u32>>(0);
-			auto& overlayman = g_fxo->get<display_manager>();
-
-			overlayman.attach_thread_input(
-				uid, "User list dialog",
-				[notify]() { *notify = true; notify->notify_one(); }
-			);
-
-			while (!Emu.IsStopped() && !*notify)
+			g_fxo->get<named_thread<user_list_dialog_thread>>()([&, tbit = alloc_thread_bit()]()
 			{
-				notify->wait(0, atomic_wait_timeout{1'000'000});
-			}
+				g_thread_bit = tbit;
+
+				auto ref = g_fxo->get<display_manager>().get(uid);
+
+				if (const auto error = run_input_loop())
+				{
+					rsx_log.error("Dialog input loop exited with error code=%d", error);
+				}
+
+				thread_bits &= ~tbit;
+				thread_bits.notify_all();
+			});
 
 			return CELL_OK;
 		}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.h b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.h
index eb2498a032..2bc4cdb948 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.h
@@ -25,13 +25,10 @@ namespace rsx
 			std::unique_ptr<list_view> m_list;
 			std::unique_ptr<label> m_description;
 
-			animation_color_interpolate fade_animation;
-
 		public:
 			user_list_dialog();
 
-			void update(u64 timestamp_us) override;
-			void on_button_pressed(pad_button button_press, bool is_auto_repeat) override;
+			void on_button_pressed(pad_button button_press) override;
 
 			compiled_resource get_compiled() override;
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_utils.cpp b/rpcs3/Emu/RSX/Overlays/overlay_utils.cpp
index 65dde9a8a7..4be5d07c79 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_utils.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_utils.cpp
@@ -60,10 +60,10 @@ static auto s_ascii_lowering_map = []()
 }();
 
 template<typename F>
-void process_multibyte(const std::string& s, F&& func)
+void process_multibyte(const std::string s, F&& func)
 {
-	const usz end = s.length();
-	for (usz index = 0; index < end; ++index)
+	const auto end = s.length();
+	for (u32 index = 0; index < end; ++index)
 	{
 		const u8 code = static_cast<u8>(s[index]);
 
@@ -78,7 +78,7 @@ void process_multibyte(const std::string& s, F&& func)
 			continue;
 		}
 
-		const u32 extra_bytes = (code <= 0xDF) ? 1u : (code <= 0xEF) ? 2u : 3u;
+		const auto extra_bytes = (code <= 0xDF) ? 1u : (code <= 0xEF) ? 2u : 3u;
 		if ((index + extra_bytes) > end)
 		{
 			// Malformed string, abort
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_utils.h b/rpcs3/Emu/RSX/Overlays/overlay_utils.h
index cab0e1a598..2c828ba293 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_utils.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_utils.h
@@ -36,26 +36,6 @@ struct vertex
 		return values[index];
 	}
 
-	float& x()
-	{
-		return values[0];
-	}
-
-	float& y()
-	{
-		return values[1];
-	}
-
-	float& z()
-	{
-		return values[2];
-	}
-
-	float& w()
-	{
-		return values[3];
-	}
-
 	void vec2(float x, float y)
 	{
 		values[0] = x;
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_video.cpp b/rpcs3/Emu/RSX/Overlays/overlay_video.cpp
deleted file mode 100644
index ac6017d35f..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_video.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-#include "stdafx.h"
-#include "overlay_video.h"
-#include "Emu/System.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		video_view::video_view(const std::string& video_path, const std::string& thumbnail_path)
-		{
-			init_video(video_path);
-
-			if (!thumbnail_path.empty())
-			{
-				m_thumbnail_info = std::make_unique<image_info>(thumbnail_path);
-				set_raw_image(m_thumbnail_info.get());
-			}
-		}
-
-		video_view::video_view(const std::string& video_path, const std::vector<u8>& thumbnail_buf)
-		{
-			init_video(video_path);
-
-			if (!thumbnail_buf.empty())
-			{
-				m_thumbnail_info = std::make_unique<image_info>(thumbnail_buf);
-				set_raw_image(m_thumbnail_info.get());
-			}
-		}
-
-		video_view::video_view(const std::string& video_path, u8 thumbnail_id)
-			: m_thumbnail_id(thumbnail_id)
-		{
-			init_video(video_path);
-			set_image_resource(thumbnail_id);
-		}
-
-		video_view::~video_view()
-		{
-		}
-
-		void video_view::init_video(const std::string& video_path)
-		{
-			if (video_path.empty()) return;
-
-			m_video_source = Emu.GetCallbacks().make_video_source();
-			ensure(!!m_video_source);
-
-			m_video_source->set_update_callback([this]()
-			{
-				if (m_video_active)
-				{
-					m_is_compiled = false;
-				}
-			});
-			m_video_source->set_video_path(video_path);
-		}
-
-		void video_view::set_active(bool active)
-		{
-			if (m_video_source)
-			{
-				m_video_source->set_active(active);
-				m_video_active = active;
-				m_is_compiled = false;
-			}
-		}
-
-		void video_view::update()
-		{
-			if (m_video_active && m_video_source && m_video_source->get_active())
-			{
-				if (!m_video_source->has_new())
-				{
-					return;
-				}
-
-				m_buffer_index = (m_buffer_index + 1) % m_video_info.size();
-
-				auto& info = m_video_info.at(m_buffer_index);
-				if (!info)
-				{
-					info = std::make_unique<video_info>();
-				}
-
-				m_video_source->get_image(info->data, info->w, info->h, info->channels, info->bpp);
-				info->dirty = true;
-
-				set_raw_image(info.get());
-				m_is_compiled = false;
-				return;
-			}
-
-			if (m_thumbnail_info && m_thumbnail_info.get() != external_ref)
-			{
-				set_raw_image(m_thumbnail_info.get());
-				m_is_compiled = false;
-				return;
-			}
-
-			if (m_thumbnail_id != image_resource_id::none && m_thumbnail_id != image_resource_ref)
-			{
-				set_image_resource(m_thumbnail_id);
-				m_is_compiled = false;
-				return;
-			}
-		}
-
-		compiled_resource& video_view::get_compiled()
-		{
-			update();
-
-			return external_ref ? image_view::get_compiled() : overlay_element::get_compiled();
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_video.h b/rpcs3/Emu/RSX/Overlays/overlay_video.h
deleted file mode 100644
index 92297dee42..0000000000
--- a/rpcs3/Emu/RSX/Overlays/overlay_video.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include "overlay_controls.h"
-#include "util/video_source.h"
-
-namespace rsx
-{
-	namespace overlays
-	{
-		struct video_info : public image_info_base
-		{
-			using image_info_base::image_info_base;
-			virtual ~video_info() {}
-			const u8* get_data() const override { return data.empty() ? nullptr : data.data(); }
-
-			std::vector<u8> data;
-		};
-
-		class video_view final : public image_view
-		{
-		public:
-			video_view(const std::string& video_path, const std::string& thumbnail_path);
-			video_view(const std::string& video_path, const std::vector<u8>& thumbnail_buf);
-			video_view(const std::string& video_path, u8 thumbnail_id);
-			virtual ~video_view();
-
-			void set_active(bool active);
-
-			void update();
-			compiled_resource& get_compiled() override;
-
-		private:
-			void init_video(const std::string& video_path);
-
-			usz m_buffer_index = 0;
-			std::array<std::unique_ptr<video_info>, 2> m_video_info; // double buffer
-			std::unique_ptr<video_source> m_video_source;
-			std::unique_ptr<image_info> m_thumbnail_info;
-			u8 m_thumbnail_id = image_resource_id::none;
-			bool m_video_active = false; // This is the expected state. The actual state is found in the video source.
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Overlays/overlays.cpp b/rpcs3/Emu/RSX/Overlays/overlays.cpp
index d24c8550f3..6889b4d834 100644
--- a/rpcs3/Emu/RSX/Overlays/overlays.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlays.cpp
@@ -1,25 +1,21 @@
 #include "stdafx.h"
 #include "overlays.h"
-#include "overlay_manager.h"
+#include "overlay_message_dialog.h"
 #include "Input/pad_thread.h"
 #include "Emu/Io/interception.h"
-#include "Emu/Io/KeyboardHandler.h"
 #include "Emu/RSX/RSXThread.h"
-#include "Emu/System.h"
 
 LOG_CHANNEL(overlays);
 
-extern bool is_input_allowed();
-
 namespace rsx
 {
 	namespace overlays
 	{
 		thread_local DECLARE(user_interface::g_thread_bit) = 0;
 
-		u32 user_interface::alloc_thread_bit()
+		u64 user_interface::alloc_thread_bit()
 		{
-			auto [_old, ok] = this->thread_bits.fetch_op([](u32& bits)
+			auto [_old, ok] = this->thread_bits.fetch_op([](u64& bits)
 			{
 				if (~bits)
 				{
@@ -37,7 +33,7 @@ namespace rsx
 				return 0;
 			}
 
-			const u32 r = u32{1} << std::countr_one(_old);
+			const u64 r = u64{1} << std::countr_one(_old);
 			::overlays.trace("Bit allocated (%u)", r);
 			return r;
 		}
@@ -45,167 +41,54 @@ namespace rsx
 		// Singleton instance declaration
 		fontmgr* fontmgr::m_instance = nullptr;
 
-		s32 user_interface::run_input_loop(std::function<bool()> check_state)
+		s32 user_interface::run_input_loop()
 		{
-			user_interface::thread_bits_allocator thread_bits_alloc(this);
-
 			m_interactive = true;
 
+			const u64 ms_interval = 200;
 			std::array<steady_clock::time_point, CELL_PAD_MAX_PORT_NUM> timestamp;
 			timestamp.fill(steady_clock::now());
 
-			constexpr u64 ms_threshold = 500;
+			const u64 ms_threshold = 500;
 			std::array<steady_clock::time_point, CELL_PAD_MAX_PORT_NUM> initial_timestamp;
 			initial_timestamp.fill(steady_clock::now());
 
-			std::array<pad_button, CELL_PAD_MAX_PORT_NUM> last_auto_repeat_button;
+			std::array<u8, CELL_PAD_MAX_PORT_NUM> last_auto_repeat_button;
 			last_auto_repeat_button.fill(pad_button::pad_button_max_enum);
 
-			std::array<std::array<bool, static_cast<u32>(pad_button::pad_button_max_enum)>, CELL_PAD_MAX_PORT_NUM> last_button_state;
+			std::array<std::array<bool, pad_button::pad_button_max_enum>, CELL_PAD_MAX_PORT_NUM> last_button_state;
 			for (auto& state : last_button_state)
 			{
 				// Initialize last button states as pressed to avoid unwanted button presses when entering the dialog.
 				state.fill(true);
 			}
 
-			m_input_timer.Start();
+			input_timer.Start();
 
-			// Only start intercepting input if the the overlay allows it (enabled by default)
-			if (m_start_pad_interception)
+			input::SetIntercepted(true);
+
+			while (!exit)
 			{
-				input::SetIntercepted(true);
-			}
-
-			const auto handle_button_press = [&](pad_button button_id, bool pressed, int pad_index)
-			{
-				if (button_id >= pad_button::pad_button_max_enum)
-				{
-					return;
-				}
-
-				bool& last_state = last_button_state[pad_index][static_cast<u32>(button_id)];
-
-				if (pressed)
-				{
-					const bool is_auto_repeat_button = m_auto_repeat_buttons.contains(button_id);
-
-					if (!last_state)
-					{
-						// The button was not pressed before, so this is a new button press. Reset auto-repeat.
-						timestamp[pad_index] = steady_clock::now();
-						initial_timestamp[pad_index] = timestamp[pad_index];
-						last_auto_repeat_button[pad_index] = is_auto_repeat_button ? button_id : pad_button::pad_button_max_enum;
-						on_button_pressed(static_cast<pad_button>(button_id), false);
-					}
-					else if (is_auto_repeat_button)
-					{
-						if (last_auto_repeat_button[pad_index] == button_id
-						    && m_input_timer.GetMsSince(initial_timestamp[pad_index]) > ms_threshold
-						    && m_input_timer.GetMsSince(timestamp[pad_index]) > m_auto_repeat_ms_interval)
-						{
-							// The auto-repeat button was pressed for at least the given threshold in ms and will trigger at an interval.
-							timestamp[pad_index] = steady_clock::now();
-							on_button_pressed(static_cast<pad_button>(button_id), true);
-						}
-						else if (last_auto_repeat_button[pad_index] == pad_button::pad_button_max_enum)
-						{
-							// An auto-repeat button was already pressed before and will now start triggering again after the next threshold.
-							last_auto_repeat_button[pad_index] = button_id;
-						}
-					}
-				}
-				else if (last_state && last_auto_repeat_button[pad_index] == button_id)
-				{
-					// We stopped pressing an auto-repeat button, so re-enable auto-repeat for other buttons.
-					last_auto_repeat_button[pad_index] = pad_button::pad_button_max_enum;
-				}
-
-				last_state = pressed;
-			};
-
-			while (!m_stop_input_loop)
-			{
-				if (check_state && !check_state())
-				{
-					// Interrupted externally.
-					break;
-				}
-
 				if (Emu.IsStopped())
-				{
 					return selection_code::canceled;
-				}
 
-				if (Emu.IsPaused() && !m_allow_input_on_pause)
-				{
-					thread_ctrl::wait_for(10000);
-					continue;
-				}
+				std::this_thread::sleep_for(1ms);
 
-				thread_ctrl::wait_for(1000);
-
-				if (!is_input_allowed())
-				{
-					refresh();
-					continue;
-				}
-
-				// Get keyboard input if supported by the overlay and activated by the game.
-				// Ignored if a keyboard pad handler is active in order to prevent double input.
-				if (m_keyboard_input_enabled && !m_keyboard_pad_handler_active && input::g_keyboards_intercepted)
-				{
-					auto& kb_handler = g_fxo->get<KeyboardHandlerBase>();
-					std::lock_guard<std::mutex> lock(kb_handler.m_mutex);
-
-					// Add and get consumer
-					keyboard_consumer& kb_consumer = kb_handler.AddConsumer(keyboard_consumer::identifier::overlays, 1);
-					std::vector<Keyboard>& keyboards = kb_consumer.GetKeyboards();
-
-					if (!keyboards.empty() && kb_consumer.GetInfo().status[0] == CELL_KB_STATUS_CONNECTED)
-					{
-						KbData& current_data = kb_consumer.GetData(0);
-						KbExtraData& extra_data = kb_consumer.GetExtraData(0);
-
-						if (current_data.len > 0 || !extra_data.pressed_keys.empty())
-						{
-							for (s32 i = 0; i < current_data.len; i++)
-							{
-								const KbButton& key = current_data.buttons[i];
-								on_key_pressed(current_data.led, current_data.mkey, key.m_keyCode, key.m_outKeyCode, key.m_pressed, {});
-							}
-
-							for (const std::u32string& key : extra_data.pressed_keys)
-							{
-								on_key_pressed(0, 0, 0, 0, true, key);
-							}
-
-							// Flush buffer unconditionally. Otherwise we get a flood of key events.
-							current_data.len = 0;
-							extra_data.pressed_keys.clear();
-
-							// Ignore gamepad input if a key was recognized
-							refresh();
-							continue;
-						}
-					}
-				}
-
-				// Get gamepad input
 				std::lock_guard lock(pad::g_pad_mutex);
-				const auto handler = pad::get_pad_thread();
+
+				const auto handler = pad::get_current_handler();
+
 				const PadInfo& rinfo = handler->GetInfo();
 
-				const bool ignore_gamepad_input = (!rinfo.now_connect || !input::g_pads_intercepted);
-
-				const pad_button cross_button  = g_cfg.sys.enter_button_assignment == enter_button_assign::circle ? pad_button::circle : pad_button::cross;
-				const pad_button circle_button = g_cfg.sys.enter_button_assignment == enter_button_assign::circle ? pad_button::cross : pad_button::circle;
-
-				m_keyboard_pad_handler_active = false;
+				if (Emu.IsPaused() || !rinfo.now_connect)
+				{
+					continue;
+				}
 
 				int pad_index = -1;
-				for (const auto& pad : handler->GetPads())
+				for (const auto &pad : handler->GetPads())
 				{
-					if (m_stop_input_loop)
+					if (exit)
 						break;
 
 					if (++pad_index >= CELL_PAD_MAX_PORT_NUM)
@@ -214,109 +97,9 @@ namespace rsx
 						continue;
 					}
 
-					if (pad_index > 0 && g_cfg.io.lock_overlay_input_to_player_one)
+					for (auto &button : pad->m_buttons)
 					{
-						continue;
-					}
-
-					if (!pad)
-					{
-						rsx_log.fatal("Pad %d is nullptr", pad_index);
-						continue;
-					}
-
-					if (!pad->is_connected() || pad->is_copilot())
-					{
-						continue;
-					}
-
-					if (pad->m_pad_handler == pad_handler::keyboard)
-					{
-						m_keyboard_pad_handler_active = true;
-					}
-
-					if (ignore_gamepad_input)
-					{
-						if (m_keyboard_pad_handler_active)
-						{
-							break;
-						}
-
-						continue;
-					}
-
-					if (pad->ldd)
-					{
-						// LDD pads get passed input data from the game itself.
-
-						// NOTE: Rock Band 3 doesn't seem to care about the len. It's always 0.
-						//if (pad->ldd_data.len > CELL_PAD_BTN_OFFSET_DIGITAL1)
-						{
-							const u16 digital1 = pad->ldd_data.button[CELL_PAD_BTN_OFFSET_DIGITAL1];
-
-							handle_button_press(pad_button::dpad_left,  !!(digital1 & CELL_PAD_CTRL_LEFT),     pad_index);
-							handle_button_press(pad_button::dpad_right, !!(digital1 & CELL_PAD_CTRL_RIGHT),    pad_index);
-							handle_button_press(pad_button::dpad_down,  !!(digital1 & CELL_PAD_CTRL_DOWN),     pad_index);
-							handle_button_press(pad_button::dpad_up,    !!(digital1 & CELL_PAD_CTRL_UP),       pad_index);
-							handle_button_press(pad_button::L3,         !!(digital1 & CELL_PAD_CTRL_L3),       pad_index);
-							handle_button_press(pad_button::R3,         !!(digital1 & CELL_PAD_CTRL_R3),       pad_index);
-							handle_button_press(pad_button::select,     !!(digital1 & CELL_PAD_CTRL_SELECT),   pad_index);
-							handle_button_press(pad_button::start,      !!(digital1 & CELL_PAD_CTRL_START),    pad_index);
-						}
-
-						//if (pad->ldd_data.len > CELL_PAD_BTN_OFFSET_DIGITAL2)
-						{
-							const u16 digital2 = pad->ldd_data.button[CELL_PAD_BTN_OFFSET_DIGITAL2];
-
-							handle_button_press(pad_button::triangle,   !!(digital2 & CELL_PAD_CTRL_TRIANGLE), pad_index);
-							handle_button_press(circle_button,          !!(digital2 & CELL_PAD_CTRL_CIRCLE),   pad_index);
-							handle_button_press(pad_button::square,     !!(digital2 & CELL_PAD_CTRL_SQUARE),   pad_index);
-							handle_button_press(cross_button,           !!(digital2 & CELL_PAD_CTRL_CROSS),    pad_index);
-							handle_button_press(pad_button::L1,         !!(digital2 & CELL_PAD_CTRL_L1),       pad_index);
-							handle_button_press(pad_button::R1,         !!(digital2 & CELL_PAD_CTRL_R1),       pad_index);
-							handle_button_press(pad_button::L2,         !!(digital2 & CELL_PAD_CTRL_L2),       pad_index);
-							handle_button_press(pad_button::R2,         !!(digital2 & CELL_PAD_CTRL_R2),       pad_index);
-							handle_button_press(pad_button::ps,         !!(digital2 & CELL_PAD_CTRL_PS),       pad_index);
-						}
-
-						const auto handle_ldd_stick_input = [&](s32 offset, pad_button id_small, pad_button id_large)
-						{
-							//if (pad->ldd_data.len <= offset) return;
-
-							constexpr u16 threshold = 20; // Let's be careful and use some threshold here
-							const u16 value = pad->ldd_data.button[offset];
-
-							if (value <= (128 - threshold))
-							{
-								// Release other direction on the same axis first
-								handle_button_press(id_large, false, pad_index);
-								handle_button_press(id_small, true, pad_index);
-							}
-							else if (value > (128 + threshold))
-							{
-								// Release other direction on the same axis first
-								handle_button_press(id_small, false, pad_index);
-								handle_button_press(id_large, true, pad_index);
-							}
-							else
-							{
-								// Release both directions on the same axis
-								handle_button_press(id_small, false, pad_index);
-								handle_button_press(id_large, false, pad_index);
-							}
-						};
-
-						handle_ldd_stick_input(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X, pad_button::rs_left, pad_button::rs_right);
-						handle_ldd_stick_input(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y, pad_button::rs_down, pad_button::rs_up);
-						handle_ldd_stick_input(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X, pad_button::ls_left, pad_button::ls_right);
-						handle_ldd_stick_input(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y, pad_button::ls_down, pad_button::ls_up);
-
-						continue;
-					}
-
-					for (const Button& button : pad->m_buttons_external)
-					{
-						pad_button button_id = pad_button::pad_button_max_enum;
+						u8 button_id = pad_button::pad_button_max_enum;
 						if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
 						{
 							switch (button.m_outKeyCode)
@@ -333,20 +116,13 @@ namespace rsx
 							case CELL_PAD_CTRL_UP:
 								button_id = pad_button::dpad_up;
 								break;
-							case CELL_PAD_CTRL_L3:
-								button_id = pad_button::L3;
-								break;
-							case CELL_PAD_CTRL_R3:
-								button_id = pad_button::R3;
-								break;
 							case CELL_PAD_CTRL_SELECT:
 								button_id = pad_button::select;
 								break;
 							case CELL_PAD_CTRL_START:
 								button_id = pad_button::start;
 								break;
-							default:
-								break;
+							default: break;
 							}
 						}
 						else if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2)
@@ -357,13 +133,13 @@ namespace rsx
 								button_id = pad_button::triangle;
 								break;
 							case CELL_PAD_CTRL_CIRCLE:
-								button_id = circle_button;
+								button_id = g_cfg.sys.enter_button_assignment == enter_button_assign::circle ? pad_button::cross : pad_button::circle;
 								break;
 							case CELL_PAD_CTRL_SQUARE:
 								button_id = pad_button::square;
 								break;
 							case CELL_PAD_CTRL_CROSS:
-								button_id = cross_button;
+								button_id = g_cfg.sys.enter_button_assignment == enter_button_assign::circle ? pad_button::circle : pad_button::cross;
 								break;
 							case CELL_PAD_CTRL_L1:
 								button_id = pad_button::L1;
@@ -377,57 +153,51 @@ namespace rsx
 							case CELL_PAD_CTRL_R2:
 								button_id = pad_button::R2;
 								break;
-							case CELL_PAD_CTRL_PS:
-								button_id = pad_button::ps;
-								break;
-							default:
-								break;
+							default: break;
 							}
 						}
 
-						handle_button_press(button_id, button.m_pressed, pad_index);
-
-						if (m_stop_input_loop)
-							break;
-					}
-
-					for (const AnalogStick& stick : pad->m_sticks_external)
-					{
-						pad_button button_id = pad_button::pad_button_max_enum;
-						pad_button release_id = pad_button::pad_button_max_enum;
-
-						// Let's say sticks are only pressed if they are almost completely tilted. Otherwise navigation feels really wacky.
-						const bool pressed = stick.m_value < 30 || stick.m_value > 225;
-
-						switch (stick.m_offset)
+						if (button_id < pad_button::pad_button_max_enum)
 						{
-						case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X:
-							button_id = (stick.m_value <= 128) ? pad_button::ls_left : pad_button::ls_right;
-							release_id = (stick.m_value > 128) ? pad_button::ls_left : pad_button::ls_right;
-							break;
-						case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y:
-							button_id = (stick.m_value <= 128) ? pad_button::ls_up : pad_button::ls_down;
-							release_id = (stick.m_value > 128) ? pad_button::ls_up : pad_button::ls_down;
-							break;
-						case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X:
-							button_id = (stick.m_value <= 128) ? pad_button::rs_left : pad_button::rs_right;
-							release_id = (stick.m_value > 128) ? pad_button::rs_left : pad_button::rs_right;
-							break;
-						case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y:
-							button_id = (stick.m_value <= 128) ? pad_button::rs_up : pad_button::rs_down;
-							release_id = (stick.m_value > 128) ? pad_button::rs_up : pad_button::rs_down;
-							break;
-						default:
-							break;
+							if (button.m_pressed)
+							{
+								const bool is_auto_repeat_button = auto_repeat_buttons.contains(button_id);
+
+								if (!last_button_state[pad_index][button_id])
+								{
+									// The button was not pressed before, so this is a new button press. Reset auto-repeat.
+									timestamp[pad_index] = steady_clock::now();
+									initial_timestamp[pad_index] = timestamp[pad_index];
+									last_auto_repeat_button[pad_index] = is_auto_repeat_button ? button_id : pad_button::pad_button_max_enum;
+									on_button_pressed(static_cast<pad_button>(button_id));
+								}
+								else if (is_auto_repeat_button)
+								{
+									if (last_auto_repeat_button[pad_index] == button_id
+									    && input_timer.GetMsSince(initial_timestamp[pad_index]) > ms_threshold
+									    && input_timer.GetMsSince(timestamp[pad_index]) > ms_interval)
+									{
+										// The auto-repeat button was pressed for at least the given threshold in ms and will trigger at an interval.
+										timestamp[pad_index] = steady_clock::now();
+										on_button_pressed(static_cast<pad_button>(button_id));
+									}
+									else if (last_auto_repeat_button[pad_index] == pad_button::pad_button_max_enum)
+									{
+										// An auto-repeat button was already pressed before and will now start triggering again after the next threshold.
+										last_auto_repeat_button[pad_index] = button_id;
+									}
+								}
+							}
+							else if (last_button_state[pad_index][button_id] && last_auto_repeat_button[pad_index] == button_id)
+							{
+								// We stopped pressing an auto-repeat button, so re-enable auto-repeat for other buttons.
+								last_auto_repeat_button[pad_index] = pad_button::pad_button_max_enum;
+							}
+
+							last_button_state[pad_index][button_id] = button.m_pressed;
 						}
 
-						// Release other direction on the same axis first
-						handle_button_press(release_id, false, pad_index);
-
-						// Handle currently pressed stick direction
-						handle_button_press(button_id, pressed, pad_index);
-
-						if (m_stop_input_loop)
+						if (exit)
 							break;
 					}
 				}
@@ -435,13 +205,6 @@ namespace rsx
 				refresh();
 			}
 
-			// Remove keyboard consumer. We don't need it anymore.
-			{
-				auto& kb_handler = g_fxo->get<KeyboardHandlerBase>();
-				std::lock_guard<std::mutex> lock(kb_handler.m_mutex);
-				kb_handler.RemoveConsumer(keyboard_consumer::identifier::overlays);
-			}
-
 			// Disable pad interception since this user interface has to be interactive.
 			// Non-interactive user intefaces handle this in close in order to prevent a g_pad_mutex deadlock.
 			if (m_stop_pad_interception)
@@ -449,18 +212,18 @@ namespace rsx
 				input::SetIntercepted(false);
 			}
 
-			return !m_stop_input_loop
-				? selection_code::interrupted
-				: selection_code::ok;
+			m_interactive = false;
+
+			return 0;
 		}
 
 		void user_interface::close(bool use_callback, bool stop_pad_interception)
 		{
 			// Force unload
 			m_stop_pad_interception.release(stop_pad_interception);
-			m_stop_input_loop.release(true);
+			exit.release(true);
 
-			while (u32 b = thread_bits)
+			while (u64 b = thread_bits)
 			{
 				if (b == g_thread_bit)
 				{
@@ -480,6 +243,7 @@ namespace rsx
 
 			if (on_close && use_callback)
 			{
+				g_last_user_response = return_code;
 				on_close(return_code);
 			}
 
@@ -492,15 +256,13 @@ namespace rsx
 
 		void overlay::refresh() const
 		{
-			if (!visible)
+			if (auto rsxthr = rsx::get_current_renderer())
 			{
-				return;
-			}
-
-			if (auto rsxthr = rsx::get_current_renderer(); rsxthr &&
-				(min_refresh_duration_us + rsxthr->last_host_flip_timestamp) < get_system_time())
-			{
-				rsxthr->async_flip_requested |= rsx::thread::flip_request::native_ui;
+				const auto now = get_system_time() - 1000000;
+				if ((now - rsxthr->last_flip_time) > min_refresh_duration_us)
+				{
+					rsxthr->async_flip_requested |= rsx::thread::flip_request::native_ui;
+				}
 			}
 		}
 	} // namespace overlays
diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/Emu/RSX/Overlays/overlays.h
index 9bcef52482..b58493f919 100644
--- a/rpcs3/Emu/RSX/Overlays/overlays.h
+++ b/rpcs3/Emu/RSX/Overlays/overlays.h
@@ -2,12 +2,11 @@
 #include "overlay_animation.h"
 #include "overlay_controls.h"
 
-#include "Emu/Io/pad_types.h"
+#include "Emu/IdManager.h"
 
+#include "Utilities/mutex.h"
 #include "Utilities/Timer.h"
 
-#include "../Common/bitfield.hpp"
-
 #include <mutex>
 #include <set>
 
@@ -17,28 +16,21 @@ namespace rsx
 {
 	namespace overlays
 	{
-		// Bitfield of UI signals to overlay manager
-		enum status_bits : u32
-		{
-			invalidate_image_cache = 0x0001, // Flush the address-based image cache
-		};
-
 		// Non-interactable UI element
 		struct overlay
 		{
 			u32 uid = umax;
 			u32 type_index = umax;
 
-			static constexpr u16 virtual_width = 1280;
-			static constexpr u16 virtual_height = 720;
+			u16 virtual_width = 1280;
+			u16 virtual_height = 720;
 
 			u32 min_refresh_duration_us = 16600;
 			atomic_t<bool> visible = false;
-			atomic_bitmask_t<status_bits> status_flags = {};
 
 			virtual ~overlay() = default;
 
-			virtual void update(u64 /*timestamp_us*/) {}
+			virtual void update() {}
 			virtual compiled_resource get_compiled() = 0;
 
 			void refresh() const;
@@ -51,109 +43,287 @@ namespace rsx
 			// Move this somewhere to avoid duplication
 			enum selection_code
 			{
-				ok = 0,
 				new_save = -1,
 				canceled = -2,
-				error = -3,
-				interrupted = -4,
-				no = -5
+				error = -3
 			};
 
-			static constexpr u64 m_auto_repeat_ms_interval_default = 200;
+			enum pad_button : u8
+			{
+				dpad_up = 0,
+				dpad_down,
+				dpad_left,
+				dpad_right,
+				select,
+				start,
+				triangle,
+				circle,
+				square,
+				cross,
+				L1,
+				R1,
+				L2,
+				R2,
+
+				pad_button_max_enum
+			};
 
 		protected:
-			Timer m_input_timer;
-			u64 m_auto_repeat_ms_interval = m_auto_repeat_ms_interval_default;
-			std::set<pad_button> m_auto_repeat_buttons = {
-				pad_button::dpad_up,
-				pad_button::dpad_down,
-				pad_button::dpad_left,
-				pad_button::dpad_right,
-				pad_button::rs_up,
-				pad_button::rs_down,
-				pad_button::rs_left,
-				pad_button::rs_right,
-				pad_button::ls_up,
-				pad_button::ls_down,
-				pad_button::ls_left,
-				pad_button::ls_right
-			};
-
-			atomic_t<bool> m_stop_input_loop = false;
+			Timer input_timer;
+			std::set<u8> auto_repeat_buttons = { pad_button::dpad_up, pad_button::dpad_down, pad_button::dpad_left, pad_button::dpad_right };
+			atomic_t<bool> exit = false;
 			atomic_t<bool> m_interactive = false;
-			bool m_start_pad_interception = true;
 			atomic_t<bool> m_stop_pad_interception = false;
-			atomic_t<bool> m_input_thread_detached = false;
-			atomic_t<u32> thread_bits = 0;
-			bool m_keyboard_input_enabled = false; // Allow keyboard input
-			bool m_keyboard_pad_handler_active = true; // Initialized as true to prevent keyboard input until proven otherwise.
-			bool m_allow_input_on_pause = false;
+			atomic_t<u64> thread_bits = 0;
 
-			static thread_local u32 g_thread_bit;
+			static thread_local u64 g_thread_bit;
 
-			u32 alloc_thread_bit();
+			u64 alloc_thread_bit();
 
-			std::function<void(s32 status)> on_close = nullptr;
+			std::function<void(s32 status)> on_close;
 
-			class thread_bits_allocator
-			{
-			public:
-				thread_bits_allocator(user_interface* parent)
-					: m_parent(parent)
-				{
-					m_thread_bit = m_parent->alloc_thread_bit();
-					g_thread_bit = m_thread_bit;
-				}
-
-				~thread_bits_allocator()
-				{
-					m_parent->thread_bits &= ~m_thread_bit;
-					m_parent->thread_bits.notify_all();
-				}
-
-			private:
-				user_interface* m_parent;
-				u32 m_thread_bit;
-			};
 		public:
 			s32 return_code = 0; // CELL_OK
 
-			bool is_detached() const { return m_input_thread_detached; }
-			void detach_input() { m_input_thread_detached.store(true); }
+			void update() override {}
 
 			compiled_resource get_compiled() override = 0;
 
-			virtual void on_button_pressed(pad_button /*button_press*/, bool /*is_auto_repeat*/) {}
-			virtual void on_key_pressed(u32 /*led*/, u32 /*mkey*/, u32 /*key_code*/, u32 /*out_key_code*/, bool /*pressed*/, std::u32string /*key*/) {}
+			virtual void on_button_pressed(pad_button /*button_press*/) {}
 
 			virtual void close(bool use_callback, bool stop_pad_interception);
 
-			s32 run_input_loop(std::function<bool()> check_state = nullptr);
+			s32 run_input_loop();
 		};
 
-		struct text_guard_t
+		class display_manager
 		{
-			std::mutex mutex;
-			std::string text;
-			bool dirty{false};
+		private:
+			atomic_t<u32> m_uid_ctr = 0;
+			std::vector<std::shared_ptr<overlay>> m_iface_list;
+			std::vector<std::shared_ptr<overlay>> m_dirty_list;
 
-			void set_text(std::string t)
-			{
-				std::lock_guard lock(mutex);
-				text = std::move(t);
-				dirty = true;
-			}
+			shared_mutex m_list_mutex;
+			std::vector<u32> m_uids_to_remove;
+			std::vector<u32> m_type_ids_to_remove;
 
-			std::pair<bool, std::string> get_text()
+			bool remove_type(u32 type_id)
 			{
-				if (dirty)
+				bool found = false;
+				for (auto It = m_iface_list.begin(); It != m_iface_list.end();)
 				{
-					std::lock_guard lock(mutex);
-					dirty = false;
-					return { true, std::move(text) };
+					if (It->get()->type_index == type_id)
+					{
+						m_dirty_list.push_back(std::move(*It));
+						It = m_iface_list.erase(It);
+						found = true;
+					}
+					else
+					{
+						++It;
+					}
 				}
 
-				return { false, {} };
+				return found;
+			}
+
+			bool remove_uid(u32 uid)
+			{
+				for (auto It = m_iface_list.begin(); It != m_iface_list.end(); It++)
+				{
+					const auto e = It->get();
+					if (e->uid == uid)
+					{
+						m_dirty_list.push_back(std::move(*It));
+						m_iface_list.erase(It);
+						return true;
+					}
+				}
+
+				return false;
+			}
+
+			void cleanup_internal()
+			{
+				for (const auto &uid : m_uids_to_remove)
+				{
+					remove_uid(uid);
+				}
+
+				for (const auto &type_id : m_type_ids_to_remove)
+				{
+					remove_type(type_id);
+				}
+
+				m_uids_to_remove.clear();
+				m_type_ids_to_remove.clear();
+			}
+
+		public:
+			// Disable default construction to make it conditionally available in g_fxo
+			explicit display_manager(int) noexcept
+			{
+			}
+
+			// Adds an object to the internal list. Optionally removes other objects of the same type.
+			// Original handle loses ownership but a usable pointer is returned
+			template <typename T>
+			std::shared_ptr<T> add(std::shared_ptr<T>& entry, bool remove_existing = true)
+			{
+				std::lock_guard lock(m_list_mutex);
+
+				entry->uid = m_uid_ctr.fetch_add(1);
+				entry->type_index = id_manager::typeinfo::get_index<T>();
+
+				if (remove_existing)
+				{
+					for (auto It = m_iface_list.begin(); It != m_iface_list.end(); It++)
+					{
+						if (It->get()->type_index == entry->type_index)
+						{
+							// Replace
+							m_dirty_list.push_back(std::move(*It));
+							*It = std::move(entry);
+							return std::static_pointer_cast<T>(*It);
+						}
+					}
+				}
+
+				m_iface_list.push_back(std::move(entry));
+				return std::static_pointer_cast<T>(m_iface_list.back());
+			}
+
+			// Allocates object and adds to internal list. Returns pointer to created object
+			template <typename T, typename ...Args>
+			std::shared_ptr<T> create(Args&&... args)
+			{
+				auto object = std::make_shared<T>(std::forward<Args>(args)...);
+				return add(object);
+			}
+
+			// Removes item from list if it matches the uid
+			void remove(u32 uid)
+			{
+				if (m_list_mutex.try_lock())
+				{
+					remove_uid(uid);
+					m_list_mutex.unlock();
+				}
+				else
+				{
+					m_uids_to_remove.push_back(uid);
+				}
+			}
+
+			// Removes all objects of this type from the list
+			template <typename T>
+			void remove()
+			{
+				const auto type_id = id_manager::typeinfo::get_index<T>();
+				if (m_list_mutex.try_lock())
+				{
+					remove_type(type_id);
+					m_list_mutex.unlock();
+				}
+				else
+				{
+					m_type_ids_to_remove.push_back(type_id);
+				}
+			}
+
+			// True if any visible elements to draw exist
+			bool has_visible() const
+			{
+				return !m_iface_list.empty();
+			}
+
+			// True if any elements have been deleted but their resources may not have been cleaned up
+			bool has_dirty() const
+			{
+				return !m_dirty_list.empty();
+			}
+
+			// Returns current list for reading. Caller must ensure synchronization by first locking the list
+			const std::vector<std::shared_ptr<overlay>>& get_views() const
+			{
+				return m_iface_list;
+			}
+
+			// Returns current list of removed objects not yet deallocated for reading.
+			// Caller must ensure synchronization by first locking the list
+			const std::vector<std::shared_ptr<overlay>>& get_dirty() const
+			{
+				return m_dirty_list;
+			}
+
+			// Deallocate object. Object must first be removed via the remove() functions
+			void dispose(const std::vector<u32>& uids)
+			{
+				std::lock_guard lock(m_list_mutex);
+
+				if (!m_uids_to_remove.empty() || !m_type_ids_to_remove.empty())
+				{
+					cleanup_internal();
+				}
+
+				m_dirty_list.erase
+				(
+					std::remove_if(m_dirty_list.begin(), m_dirty_list.end(), [&uids](std::shared_ptr<overlay>& e)
+					{
+						return std::find(uids.begin(), uids.end(), e->uid) != uids.end();
+					}),
+					m_dirty_list.end()
+				);
+			}
+
+			// Returns pointer to the object matching the given uid
+			std::shared_ptr<overlay> get(u32 uid)
+			{
+				reader_lock lock(m_list_mutex);
+
+				for (const auto& iface : m_iface_list)
+				{
+					if (iface->uid == uid)
+						return iface;
+				}
+
+				return {};
+			}
+
+			// Returns pointer to the first object matching the given type
+			template <typename T>
+			std::shared_ptr<T> get()
+			{
+				reader_lock lock(m_list_mutex);
+
+				const auto type_id = id_manager::typeinfo::get_index<T>();
+				for (const auto& iface : m_iface_list)
+				{
+					if (iface->type_index == type_id)
+					{
+						return std::static_pointer_cast<T>(iface);
+					}
+				}
+
+				return {};
+			}
+
+			// Lock for read-only access (BasicLockable)
+			void lock()
+			{
+				m_list_mutex.lock_shared();
+			}
+
+			// Release read-only lock (BasicLockable). May perform internal cleanup before returning
+			void unlock()
+			{
+				m_list_mutex.unlock_shared();
+
+				if (!m_uids_to_remove.empty() || !m_type_ids_to_remove.empty())
+				{
+					std::lock_guard lock(m_list_mutex);
+					cleanup_internal();
+				}
 			}
 		};
 	}
diff --git a/rpcs3/Emu/RSX/Program/CgBinaryFragmentProgram.cpp b/rpcs3/Emu/RSX/Program/CgBinaryFragmentProgram.cpp
index a06818de10..eff0619460 100644
--- a/rpcs3/Emu/RSX/Program/CgBinaryFragmentProgram.cpp
+++ b/rpcs3/Emu/RSX/Program/CgBinaryFragmentProgram.cpp
@@ -12,12 +12,13 @@ void CgBinaryDisasm::AddCodeAsm(const std::string& code)
 
 	if (dst.dest_reg == 63)
 	{
-		m_dst_reg_name = fmt::format("RC%s, ", GetMask());
+		m_dst_reg_name = fmt::format("RC%s, ", GetMask().c_str());
 		op_name = rsx_fp_op_names[m_opcode] + "XC";
 	}
+
 	else
 	{
-		m_dst_reg_name = fmt::format("%s%d%s, ", dst.fp16 ? "H" : "R", dst.dest_reg, GetMask());
+		m_dst_reg_name = fmt::format("%s%d%s, ", dst.fp16 ? "H" : "R", dst.dest_reg, GetMask().c_str());
 		op_name = rsx_fp_op_names[m_opcode] + std::string(dst.fp16 ? "H" : "R");
 	}
 
@@ -61,7 +62,7 @@ std::string CgBinaryDisasm::GetMask() const
 
 std::string CgBinaryDisasm::AddRegDisAsm(u32 index, int fp16) const
 {
-	return (fp16 ? 'H' : 'R') + std::to_string(index);
+	return std::string(fp16 ? "H" : "R") + std::to_string(index);
 }
 
 std::string CgBinaryDisasm::AddConstDisAsm()
@@ -138,7 +139,7 @@ std::string CgBinaryDisasm::GetCondDisAsm() const
 
 std::string CgBinaryDisasm::FormatDisAsm(const std::string& code)
 {
-	const std::pair<std::string_view, std::function<std::string()>> repl_list[] =
+	const std::pair<std::string, std::function<std::string()>> repl_list[] =
 	{
 		{ "$$",    []() -> std::string { return "$"; } },
 		{ "$0",    [this]{ return GetSrcDisAsm<SRC0>(src0); } },
@@ -180,7 +181,7 @@ template<typename T> std::string CgBinaryDisasm::GetSrcDisAsm(T src)
 			{
 				const std::string perspective_correction = src2.perspective_corr ? "g" : "f";
 				const std::string input_attr_reg         = reg_table[dst.src_attr_reg_num];
-				fmt::append(ret, "%s[%s]", perspective_correction, input_attr_reg);
+				ret += fmt::format("%s[%s]", perspective_correction.c_str(), input_attr_reg.c_str());
 			}
 			else
 			{
@@ -188,8 +189,8 @@ template<typename T> std::string CgBinaryDisasm::GetSrcDisAsm(T src)
 			}
 			break;
 		}
-		break;
 	}
+	break;
 
 	case 2: //const
 		ret += AddConstDisAsm();
@@ -230,7 +231,12 @@ void CgBinaryDisasm::TaskFP()
 {
 	m_size = 0;
 	u32* data = reinterpret_cast<u32*>(&m_buffer[m_offset]);
-	ensure((m_buffer.size() - m_offset) % sizeof(u32) == 0);
+	ensure((m_buffer_size - m_offset) % sizeof(u32) == 0);
+	for (u32 i = 0; i < (m_buffer_size - m_offset) / sizeof(u32); i++)
+	{
+		// Get BE data
+		data[i] = std::bit_cast<u32, be_t<u32>>(data[i]);
+	}
 
 	enum
 	{
diff --git a/rpcs3/Emu/RSX/Program/CgBinaryProgram.cpp b/rpcs3/Emu/RSX/Program/CgBinaryProgram.cpp
deleted file mode 100644
index d9c090addb..0000000000
--- a/rpcs3/Emu/RSX/Program/CgBinaryProgram.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-#include "stdafx.h"
-#include "CgBinaryProgram.h"
-
-#ifndef WITHOUT_OPENGL
-#include "Emu/RSX/GL/GLVertexProgram.h"
-#include "Emu/RSX/GL/GLFragmentProgram.h"
-#endif
-
-CgBinaryDisasm::CgBinaryDisasm(const std::string& path)
-	: m_path(path)
-{
-	fs::file f(path);
-	if (!f)
-	{
-		return;
-	}
-
-	usz buffer_size = f.size();
-	m_buffer.resize(buffer_size);
-	f.read(m_buffer, buffer_size);
-	fmt::append(m_arb_shader, "Loading... [%s]\n", path.c_str());
-}
-
-std::string CgBinaryDisasm::GetCgParamType(u32 type)
-{
-	switch (type)
-	{
-	case 1045: return "float";
-	case 1046:
-	case 1047:
-	case 1048: return fmt::format("float%d", type - 1044);
-	case 1064: return "float4x4";
-	case 1066: return "sampler2D";
-	case 1069: return "samplerCUBE";
-	case 1091: return "float1";
-
-	default: return fmt::format("!UnkCgType(%d)", type);
-	}
-}
-
-std::string CgBinaryDisasm::GetCgParamName(u32 offset) const
-{
-	return std::string(&m_buffer[offset]);
-}
-
-std::string CgBinaryDisasm::GetCgParamRes(u32 /*offset*/) const
-{
-	// rsx_log.warning("GetCgParamRes offset 0x%x", offset);
-	// TODO
-	return "";
-}
-
-std::string CgBinaryDisasm::GetCgParamSemantic(u32 offset) const
-{
-	return std::string(&m_buffer[offset]);
-}
-
-std::string CgBinaryDisasm::GetCgParamValue(u32 offset, u32 end_offset) const
-{
-	std::string offsets = "offsets:";
-
-	u32 num = 0;
-	offset += 6;
-	while (offset < end_offset)
-	{
-		fmt::append(offsets, " %d,", m_buffer[offset] << 8 | m_buffer[offset + 1]);
-		offset += 4;
-		num++;
-	}
-
-	if (num > 4)
-	{
-		return "";
-	}
-
-	offsets.pop_back();
-	return fmt::format("num %d ", num) + offsets;
-}
-
-void CgBinaryDisasm::ConvertToLE(CgBinaryProgram& prog)
-{
-	// BE payload, requires that data be swapped
-	const auto be_profile = prog.profile;
-
-	auto swap_be32 = [&](u32 start_offset, size_t size_bytes)
-	{
-		auto start = reinterpret_cast<u32*>(m_buffer.data() + start_offset);
-		auto end = reinterpret_cast<u32*>(m_buffer.data() + start_offset + size_bytes);
-
-		for (auto data = start; data < end; ++data)
-		{
-			*data = std::bit_cast<be_t<u32>>(*data);
-		}
-	};
-
-	// 1. Swap the header
-	swap_be32(0, sizeof(CgBinaryProgram));
-
-	// 2. Swap parameters
-	swap_be32(prog.parameterArray, sizeof(CgBinaryParameter) * prog.parameterCount);
-
-	// 3. Swap the ucode
-	swap_be32(prog.ucode, m_buffer.size() - prog.ucode);
-
-	// 4. Swap the domain header
-	if (be_profile == 7004u)
-	{
-		// Need to swap each field individually
-		auto& fprog = GetCgRef<CgBinaryFragmentProgram>(prog.program);
-		fprog.instructionCount = std::bit_cast<be_t<u32>>(fprog.instructionCount);
-		fprog.attributeInputMask = std::bit_cast<be_t<u32>>(fprog.attributeInputMask);
-		fprog.partialTexType = std::bit_cast<be_t<u32>>(fprog.partialTexType);
-		fprog.texCoordsInputMask = std::bit_cast<be_t<u16>>(fprog.texCoordsInputMask);
-		fprog.texCoords2D = std::bit_cast<be_t<u16>>(fprog.texCoords2D);
-		fprog.texCoordsCentroid = std::bit_cast<be_t<u16>>(fprog.texCoordsCentroid);
-	}
-	else
-	{
-		// Swap entire header block as all fields are u32
-		swap_be32(prog.program, sizeof(CgBinaryVertexProgram));
-	}
-}
-
-void CgBinaryDisasm::BuildShaderBody(bool include_glsl)
-{
-	ParamArray param_array;
-
-	auto& prog = GetCgRef<CgBinaryProgram>(0);
-
-	if (const u32 be_profile = std::bit_cast<be_t<u32>>(prog.profile);
-		be_profile == 7003u || be_profile == 7004u)
-	{
-		ConvertToLE(prog);
-		ensure(be_profile == prog.profile);
-	}
-
-	if (prog.profile == 7004u)
-	{
-		auto& fprog = GetCgRef<CgBinaryFragmentProgram>(prog.program);
-		m_arb_shader += "\n";
-		fmt::append(m_arb_shader, "# binaryFormatRevision 0x%x\n", prog.binaryFormatRevision);
-		fmt::append(m_arb_shader, "# profile sce_fp_rsx\n");
-		fmt::append(m_arb_shader, "# parameterCount %d\n", prog.parameterCount);
-		fmt::append(m_arb_shader, "# instructionCount %d\n", fprog.instructionCount);
-		fmt::append(m_arb_shader, "# attributeInputMask 0x%x\n", fprog.attributeInputMask);
-		fmt::append(m_arb_shader, "# registerCount %d\n\n", fprog.registerCount);
-
-		CgBinaryParameterOffset offset = prog.parameterArray;
-		for (u32 i = 0; i < prog.parameterCount; i++)
-		{
-			auto& fparam = GetCgRef<CgBinaryParameter>(offset);
-
-			std::string param_type = GetCgParamType(fparam.type) + " ";
-			std::string param_name = GetCgParamName(fparam.name) + " ";
-			std::string param_res = GetCgParamRes(fparam.res) + " ";
-			std::string param_semantic = GetCgParamSemantic(fparam.semantic) + " ";
-			std::string param_const = GetCgParamValue(fparam.embeddedConst, fparam.name);
-
-			fmt::append(m_arb_shader, "#%d%s%s%s%s\n", i, param_type, param_name, param_semantic, param_const);
-
-			offset += u32{sizeof(CgBinaryParameter)};
-		}
-
-		m_arb_shader += "\n";
-		m_offset = prog.ucode;
-		TaskFP();
-
-		if (!include_glsl)
-		{
-			return;
-		}
-
-		u32 unused;
-		std::vector<u32> be_data;
-
-		// Swap bytes. FP decompiler expects input in BE
-		for (u32* ptr = reinterpret_cast<u32*>(m_buffer.data() + m_offset),
-			*end = reinterpret_cast<u32*>(m_buffer.data() + m_buffer.size());
-			ptr < end; ++ptr)
-		{
-			be_data.push_back(std::bit_cast<be_t<u32>>(*ptr));
-		}
-
-		RSXFragmentProgram rsx_prog;
-		auto metadata = program_hash_util::fragment_program_utils::analyse_fragment_program(be_data.data());
-		rsx_prog.ctrl = (fprog.outputFromH0 ? 0 : 0x40) | (fprog.depthReplace ? 0xe : 0);
-		rsx_prog.offset = metadata.program_start_offset;
-		rsx_prog.ucode_length = metadata.program_ucode_length;
-		rsx_prog.total_length = metadata.program_ucode_length + metadata.program_start_offset;
-		rsx_prog.data = reinterpret_cast<u8*>(be_data.data()) + metadata.program_start_offset;
-		for (u32 i = 0; i < 16; ++i) rsx_prog.texture_state.set_dimension(rsx::texture_dimension_extended::texture_dimension_2d, i);
-#ifndef WITHOUT_OPENGL
-		GLFragmentDecompilerThread(m_glsl_shader, param_array, rsx_prog, unused).Task();
-#endif
-	}
-
-	else
-	{
-		const auto& vprog = GetCgRef<CgBinaryVertexProgram>(prog.program);
-		m_arb_shader += "\n";
-		fmt::append(m_arb_shader, "# binaryFormatRevision 0x%x\n", prog.binaryFormatRevision);
-		fmt::append(m_arb_shader, "# profile sce_vp_rsx\n");
-		fmt::append(m_arb_shader, "# parameterCount %d\n", prog.parameterCount);
-		fmt::append(m_arb_shader, "# instructionCount %d\n", vprog.instructionCount);
-		fmt::append(m_arb_shader, "# registerCount %d\n", vprog.registerCount);
-		fmt::append(m_arb_shader, "# attributeInputMask 0x%x\n", vprog.attributeInputMask);
-		fmt::append(m_arb_shader, "# attributeOutputMask 0x%x\n\n", vprog.attributeOutputMask);
-
-		CgBinaryParameterOffset offset = prog.parameterArray;
-		for (u32 i = 0; i < prog.parameterCount; i++)
-		{
-			auto& vparam = GetCgRef<CgBinaryParameter>(offset);
-
-			std::string param_type = GetCgParamType(vparam.type) + " ";
-			std::string param_name = GetCgParamName(vparam.name) + " ";
-			std::string param_res = GetCgParamRes(vparam.res) + " ";
-			std::string param_semantic = GetCgParamSemantic(vparam.semantic) + " ";
-			std::string param_const = GetCgParamValue(vparam.embeddedConst, vparam.name);
-
-			fmt::append(m_arb_shader, "#%d%s%s%s%s\n", i, param_type, param_name, param_semantic, param_const);
-
-			offset += u32{sizeof(CgBinaryParameter)};
-		}
-
-		m_arb_shader += "\n";
-		m_offset = prog.ucode;
-		ensure((m_buffer.size() - m_offset) % sizeof(u32) == 0);
-
-		u32* vdata = reinterpret_cast<u32*>(&m_buffer[m_offset]);
-		m_data.resize(prog.ucodeSize / sizeof(u32));
-		std::memcpy(m_data.data(), vdata, prog.ucodeSize);
-		TaskVP();
-
-		if (!include_glsl)
-		{
-			return;
-		}
-
-		RSXVertexProgram rsx_prog;
-		program_hash_util::vertex_program_utils::analyse_vertex_program(vdata, 0, rsx_prog);
-		for (u32 i = 0; i < 4; ++i) rsx_prog.texture_state.set_dimension(rsx::texture_dimension_extended::texture_dimension_2d, i);
-#ifndef WITHOUT_OPENGL
-		GLVertexDecompilerThread(rsx_prog, m_glsl_shader, param_array).Task();
-#endif
-	}
-}
diff --git a/rpcs3/Emu/RSX/Program/CgBinaryProgram.h b/rpcs3/Emu/RSX/Program/CgBinaryProgram.h
index f956c93035..0c6554b89c 100644
--- a/rpcs3/Emu/RSX/Program/CgBinaryProgram.h
+++ b/rpcs3/Emu/RSX/Program/CgBinaryProgram.h
@@ -1,24 +1,17 @@
 #pragma once
 
-#include "util/endian.hpp"
-#include "Emu/RSX/Program/RSXVertexProgram.h"
-#include "Emu/RSX/Program/RSXFragmentProgram.h"
-#include "Emu/RSX/Program/ProgramStateCache.h"
-#include "Emu/RSX/Program/ShaderParam.h"
+#include "Emu/Memory/vm.h"
+#include "Emu/RSX/GL/GLVertexProgram.h"
+#include "Emu/RSX/GL/GLFragmentProgram.h"
 #include "Utilities/File.h"
 
-using CGprofile = u32;
-using CGbool = s32;
-using CGresource = u32;
-using CGenum = u32;
-using CGtype = u32;
-using CGbitfield = u32;
-using CGbitfield16 = u16;
-using CGint = s32;
-using CGuint = u32;
+using CGprofile = be_t<u32>;
+using CGbool = be_t<s32>;
+using CGresource = be_t<u32>;
+using CGenum = be_t<u32>;
+using CGtype = be_t<u32>;
 
-using CgBinaryOffset = CGuint;
-using CgBinarySize = CgBinaryOffset;
+using CgBinaryOffset = be_t<u32>;
 using CgBinaryEmbeddedConstantOffset = CgBinaryOffset;
 using CgBinaryFloatOffset = CgBinaryOffset;
 using CgBinaryStringOffset = CgBinaryOffset;
@@ -43,13 +36,13 @@ struct CgBinaryParameter
 	CGtype                          type;          // cgGetParameterType()
 	CGresource                      res;           // cgGetParameterResource()
 	CGenum                          var;           // cgGetParameterVariability()
-	CGint                           resIndex;      // cgGetParameterResourceIndex()
+	be_t<s32>                       resIndex;      // cgGetParameterResourceIndex()
 	CgBinaryStringOffset            name;          // cgGetParameterName()
 	CgBinaryFloatOffset             defaultValue;  // default constant value
 	CgBinaryEmbeddedConstantOffset  embeddedConst; // embedded constant information
 	CgBinaryStringOffset            semantic;      // cgGetParameterSemantic()
 	CGenum                          direction;     // cgGetParameterDirection()
-	CGint                           paramno;       // 0..n: cgGetParameterIndex() -1: globals
+	be_t<s32>                       paramno;       // 0..n: cgGetParameterIndex() -1: globals
 	CGbool                          isReferenced;  // cgIsParameterReferenced()
 	CGbool                          isShared;	   // cgIsParameterShared()
 };
@@ -57,12 +50,12 @@ struct CgBinaryParameter
 // attributes needed for vshaders
 struct CgBinaryVertexProgram
 {
-	CgBinarySize  instructionCount;       // #instructions
-	CgBinarySize  instructionSlot;        // load address (indexed reads!)
-	CgBinarySize  registerCount;          // R registers count
-	CGbitfield  attributeInputMask;       // attributes vs reads from
-	CGbitfield  attributeOutputMask;      // attributes vs writes (uses SET_VERTEX_ATTRIB_OUTPUT_MASK bits)
-	CGbitfield  userClipMask;             // user clip plane enables (for SET_USER_CLIP_PLANE_CONTROL)
+	be_t<u32>  instructionCount;         // #instructions
+	be_t<u32>  instructionSlot;          // load address (indexed reads!)
+	be_t<u32>  registerCount;            // R registers count
+	be_t<u32>  attributeInputMask;       // attributes vs reads from
+	be_t<u32>  attributeOutputMask;      // attributes vs writes (uses SET_VERTEX_ATTRIB_OUTPUT_MASK bits)
+	be_t<u32>  userClipMask;             // user clip plane enables (for SET_USER_CLIP_PLANE_CONTROL)
 };
 
 typedef enum
@@ -75,16 +68,16 @@ typedef enum
 // attributes needed for pshaders
 struct CgBinaryFragmentProgram
 {
-	CgBinarySize instructionCount;        // #instructions
-	CGbitfield   attributeInputMask;      // attributes fp reads (uses SET_VERTEX_ATTRIB_OUTPUT_MASK bits)
-	CGbitfield   partialTexType;          // texid 0..15 use two bits each marking whether the texture format requires partial load: see CgBinaryPartialTexType
-	CGbitfield16 texCoordsInputMask;      // tex coords used by frag prog. (tex<n> is bit n)
-	CGbitfield16 texCoords2D;             // tex coords that are 2d        (tex<n> is bit n)
-	CGbitfield16 texCoordsCentroid;       // tex coords that are centroid  (tex<n> is bit n)
-	u8           registerCount;           // R registers count
-	u8           outputFromH0;            // final color from R0 or H0
-	u8           depthReplace;            // fp generated z depth value
-	u8           pixelKill;               // fp uses kill operations
+	be_t<u32> instructionCount;        // #instructions
+	be_t<u32> attributeInputMask;      // attributes fp reads (uses SET_VERTEX_ATTRIB_OUTPUT_MASK bits)
+	be_t<u32> partialTexType;          // texid 0..15 use two bits each marking whether the texture format requires partial load: see CgBinaryPartialTexType
+	be_t<u16> texCoordsInputMask;      // tex coords used by frag prog. (tex<n> is bit n)
+	be_t<u16> texCoords2D;             // tex coords that are 2d        (tex<n> is bit n)
+	be_t<u16> texCoordsCentroid;       // tex coords that are centroid  (tex<n> is bit n)
+	u8        registerCount;           // R registers count
+	u8        outputFromH0;            // final color from R0 or H0
+	u8        depthReplace;            // fp generated z depth value
+	u8        pixelKill;               // fp uses kill operations
 };
 
 struct CgBinaryProgram
@@ -93,20 +86,20 @@ struct CgBinaryProgram
 	CGprofile profile;
 
 	// binary revision (used to verify binary and driver structs match)
-	CgBinarySize binaryFormatRevision;
+	be_t<u32> binaryFormatRevision;
 
 	// total size of this struct including profile and totalSize field
-	CgBinarySize totalSize;
+	be_t<u32> totalSize;
 
 	// parameter usually queried using cgGet[First/Next]LeafParameter
-	CgBinarySize parameterCount;
+	be_t<u32> parameterCount;
 	CgBinaryParameterOffset parameterArray;
 
 	// depending on profile points to a CgBinaryVertexProgram or CgBinaryFragmentProgram struct
 	CgBinaryOffset program;
 
 	// raw ucode data
-	CgBinarySize    ucodeSize;
+	be_t<u32>    ucodeSize;
 	CgBinaryOffset  ucode;
 
 	// variable length data follows
@@ -128,7 +121,8 @@ class CgBinaryDisasm
 
 	std::string m_path; // used for FP decompiler thread, delete this later
 
-	std::vector<char> m_buffer;
+	u8* m_buffer = nullptr;
+	usz m_buffer_size = 0;
 	std::string m_arb_shader;
 	std::string m_glsl_shader;
 	std::string m_dst_reg_name;
@@ -143,10 +137,10 @@ class CgBinaryDisasm
 	std::vector<u32> m_loop_end_offsets;
 
 	// VP members
-	u32 m_sca_opcode = 0;
-	u32 m_vec_opcode = 0;
-	static constexpr usz m_max_instr_count = 512;
-	usz m_instr_count = 0;
+	u32 m_sca_opcode;
+	u32 m_vec_opcode;
+	static const usz m_max_instr_count = 512;
+	usz m_instr_count;
 	std::vector<u32> m_data;
 
 public:
@@ -165,16 +159,16 @@ public:
 
 	// VP functions
 	std::string GetMaskDisasm(bool is_sca) const;
-	std::string GetVecMaskDisasm() const;
-	std::string GetScaMaskDisasm() const;
-	std::string GetDSTDisasm(bool is_sca = false) const;
-	std::string GetSRCDisasm(u32 n) const;
+	std::string GetVecMaskDisasm();
+	std::string GetScaMaskDisasm();
+	std::string GetDSTDisasm(bool is_sca = false);
+	std::string GetSRCDisasm(u32 n);
 	static std::string GetTexDisasm();
 	std::string GetCondDisasm() const;
 	std::string AddAddrMaskDisasm() const;
-	std::string AddAddrRegDisasm() const;
+	std::string AddAddrRegDisasm();
 	u32 GetAddrDisasm() const;
-	std::string FormatDisasm(const std::string& code) const;
+	std::string FormatDisasm(const std::string& code);
 	void AddScaCodeDisasm(const std::string& code = "");
 	void AddVecCodeDisasm(const std::string& code = "");
 	void AddCodeCondDisasm(const std::string& dst, const std::string& src);
@@ -184,17 +178,76 @@ public:
 	void SetDSTScaDisasm(const std::string& code);
 
 
-	CgBinaryDisasm(const std::string& path);
-
-	template <typename T>
-	CgBinaryDisasm(const std::span<T>& data)
-		: m_path("<raw>")
+	CgBinaryDisasm(const std::string& path)
+		: m_path(path)
 	{
-		m_buffer.resize(data.size_bytes());
-		std::memcpy(m_buffer.data(), data.data(), data.size_bytes());
+		fs::file f(path);
+		if (!f) return;
+
+		m_buffer_size = f.size();
+		m_buffer = new u8[m_buffer_size];
+		f.read(m_buffer, m_buffer_size);
+		m_arb_shader += fmt::format("Loading... [%s]\n", path.c_str());
 	}
 
-	~CgBinaryDisasm() = default;
+	~CgBinaryDisasm()
+	{
+		delete[] m_buffer;
+	}
+
+	static std::string GetCgParamType(u32 type)
+	{
+		switch (type)
+		{
+		case 1045: return "float";
+		case 1046:
+		case 1047:
+		case 1048: return fmt::format("float%d", type - 1044);
+		case 1064: return "float4x4";
+		case 1066: return "sampler2D";
+		case 1069: return "samplerCUBE";
+		case 1091: return "float1";
+
+		default: return fmt::format("!UnkCgType(%d)", type);
+		}
+	}
+
+	std::string GetCgParamName(u32 offset) const
+	{
+		return std::string(reinterpret_cast<char*>(&m_buffer[offset]));
+	}
+
+	std::string GetCgParamRes(u32 /*offset*/) const
+	{
+		// rsx_log.warning("GetCgParamRes offset 0x%x", offset);
+		// TODO
+		return "";
+	}
+
+	std::string GetCgParamSemantic(u32 offset) const
+	{
+		return std::string(reinterpret_cast<char*>(&m_buffer[offset]));
+	}
+
+	std::string GetCgParamValue(u32 offset, u32 end_offset) const
+	{
+		std::string offsets = "offsets:";
+
+		u32 num = 0;
+		offset += 6;
+		while (offset < end_offset)
+		{
+			offsets += fmt::format(" %d,", m_buffer[offset] << 8 | m_buffer[offset + 1]);
+			offset += 4;
+			num++;
+		}
+
+		if (num > 4)
+			return "";
+
+		offsets.pop_back();
+		return fmt::format("num %d ", num) + offsets;
+	}
 
 	template<typename T>
 	T& GetCgRef(const u32 offset)
@@ -202,14 +255,117 @@ public:
 		return reinterpret_cast<T&>(m_buffer[offset]);
 	}
 
-	static std::string GetCgParamType(u32 type);
-	std::string GetCgParamName(u32 offset) const;
-	std::string GetCgParamRes(u32 /*offset*/) const;
-	std::string GetCgParamSemantic(u32 offset) const;
-	std::string GetCgParamValue(u32 offset, u32 end_offset) const;
+	void BuildShaderBody()
+	{
+		ParamArray param_array;
 
-	void ConvertToLE(CgBinaryProgram& prog);
-	void BuildShaderBody(bool include_glsl = true);
+		auto& prog = GetCgRef<CgBinaryProgram>(0);
+
+		if (prog.profile == 7004u)
+		{
+			auto& fprog = GetCgRef<CgBinaryFragmentProgram>(prog.program);
+			m_arb_shader += "\n";
+			m_arb_shader += fmt::format("# binaryFormatRevision 0x%x\n", prog.binaryFormatRevision);
+			m_arb_shader += fmt::format("# profile sce_fp_rsx\n");
+			m_arb_shader += fmt::format("# parameterCount %d\n", prog.parameterCount);
+			m_arb_shader += fmt::format("# instructionCount %d\n", fprog.instructionCount);
+			m_arb_shader += fmt::format("# attributeInputMask 0x%x\n", fprog.attributeInputMask);
+			m_arb_shader += fmt::format("# registerCount %d\n\n", fprog.registerCount);
+
+			CgBinaryParameterOffset offset = prog.parameterArray;
+			for (u32 i = 0; i < prog.parameterCount; i++)
+			{
+				auto& fparam = GetCgRef<CgBinaryParameter>(offset);
+
+				std::string param_type = GetCgParamType(fparam.type) + " ";
+				std::string param_name = GetCgParamName(fparam.name) + " ";
+				std::string param_res = GetCgParamRes(fparam.res) + " ";
+				std::string param_semantic = GetCgParamSemantic(fparam.semantic) + " ";
+				std::string param_const = GetCgParamValue(fparam.embeddedConst, fparam.name);
+
+				m_arb_shader += fmt::format("#%d ", i) + param_type + param_name + param_semantic + param_const + "\n";
+
+				offset += u32{sizeof(CgBinaryParameter)};
+			}
+
+			m_arb_shader += "\n";
+			m_offset = prog.ucode;
+			TaskFP();
+
+			// reload binary data in the virtual memory, temporary solution
+			{
+				u32 ptr;
+				{
+					fs::file f(m_path);
+					if (!f) return;
+
+					usz size = f.size();
+					vm::init();
+					ptr = vm::alloc(static_cast<u32>(size), vm::main);
+					f.read(vm::base(ptr), size);
+				}
+
+				auto& vmprog = vm::_ref<CgBinaryProgram>(ptr);
+				auto& vmfprog = vm::_ref<CgBinaryFragmentProgram>(ptr + vmprog.program);
+				u32 size;
+				u32 ctrl = (vmfprog.outputFromH0 ? 0 : 0x40) | (vmfprog.depthReplace ? 0xe : 0);
+				std::vector<rsx::texture_dimension_extended> td;
+				RSXFragmentProgram prog;
+				prog.ucode_length = 0, prog.data = vm::base(ptr + vmprog.ucode), prog.offset = 0, prog.ctrl = ctrl;
+				GLFragmentDecompilerThread(m_glsl_shader, param_array, prog, size).Task();
+				vm::close();
+			}
+		}
+
+		else
+		{
+			auto& vprog = GetCgRef<CgBinaryVertexProgram>(prog.program);
+			m_arb_shader += "\n";
+			m_arb_shader += fmt::format("# binaryFormatRevision 0x%x\n", prog.binaryFormatRevision);
+			m_arb_shader += fmt::format("# profile sce_vp_rsx\n");
+			m_arb_shader += fmt::format("# parameterCount %d\n", prog.parameterCount);
+			m_arb_shader += fmt::format("# instructionCount %d\n", vprog.instructionCount);
+			m_arb_shader += fmt::format("# registerCount %d\n", vprog.registerCount);
+			m_arb_shader += fmt::format("# attributeInputMask 0x%x\n", vprog.attributeInputMask);
+			m_arb_shader += fmt::format("# attributeOutputMask 0x%x\n\n", vprog.attributeOutputMask);
+
+			CgBinaryParameterOffset offset = prog.parameterArray;
+			for (u32 i = 0; i < prog.parameterCount; i++)
+			{
+				auto& vparam = GetCgRef<CgBinaryParameter>(offset);
+
+				std::string param_type = GetCgParamType(vparam.type) + " ";
+				std::string param_name = GetCgParamName(vparam.name) + " ";
+				std::string param_res = GetCgParamRes(vparam.res) + " ";
+				std::string param_semantic = GetCgParamSemantic(vparam.semantic) + " ";
+				std::string param_const = GetCgParamValue(vparam.embeddedConst, vparam.name);
+
+				m_arb_shader += fmt::format("#%d ", i) + param_type + param_name + param_semantic + param_const + "\n";
+
+				offset += u32{sizeof(CgBinaryParameter)};
+			}
+
+			m_arb_shader += "\n";
+			m_offset = prog.ucode;
+
+			u32* vdata = reinterpret_cast<u32*>(&m_buffer[m_offset]);
+			ensure((m_buffer_size - m_offset) % sizeof(u32) == 0);
+			for (u32 i = 0; i < (m_buffer_size - m_offset) / sizeof(u32); i++)
+			{
+				vdata[i] = std::bit_cast<u32, be_t<u32>>(vdata[i]);
+			}
+
+			for (u32 i = 0; i < prog.ucodeSize / sizeof(u32); i++)
+			{
+				m_data.push_back(vdata[i]);
+			}
+
+			TaskVP();
+			RSXVertexProgram prog;
+			prog.data = m_data;
+			GLVertexDecompilerThread(prog, m_glsl_shader, param_array).Task();
+		}
+	}
 
 	static u32 GetData(const u32 d) { return d << 16 | d >> 16; }
 	void TaskFP();
diff --git a/rpcs3/Emu/RSX/Program/CgBinaryVertexProgram.cpp b/rpcs3/Emu/RSX/Program/CgBinaryVertexProgram.cpp
index c37fcd5a59..e02066b754 100644
--- a/rpcs3/Emu/RSX/Program/CgBinaryVertexProgram.cpp
+++ b/rpcs3/Emu/RSX/Program/CgBinaryVertexProgram.cpp
@@ -1,5 +1,7 @@
 #include "stdafx.h"
 #include "CgBinaryProgram.h"
+
+#include "Emu/System.h"
 #include "RSXVertexProgram.h"
 
 void CgBinaryDisasm::AddScaCodeDisasm(const std::string& code)
@@ -38,47 +40,21 @@ std::string CgBinaryDisasm::GetMaskDisasm(bool is_sca) const
 	return ret == "."sv || ret == ".xyzw"sv ? "" : (ret);
 }
 
-std::string CgBinaryDisasm::GetVecMaskDisasm() const
+std::string CgBinaryDisasm::GetVecMaskDisasm()
 {
 	return GetMaskDisasm(false);
 }
 
-std::string CgBinaryDisasm::GetScaMaskDisasm() const
+std::string CgBinaryDisasm::GetScaMaskDisasm()
 {
 	return GetMaskDisasm(true);
 }
 
-std::string CgBinaryDisasm::GetDSTDisasm(bool is_sca) const
+std::string CgBinaryDisasm::GetDSTDisasm(bool is_sca)
 {
 	std::string ret;
 	std::string mask = GetMaskDisasm(is_sca);
 
-	static constexpr std::array<std::string_view, 22> output_names =
-	{
-		"out_diffuse_color",
-		"out_specular_color",
-		"out_back_diffuse_color",
-		"out_back_specular_color",
-		"out_fog",
-		"out_point_size",
-		"out_clip_distance[0]",
-		"out_clip_distance[1]",
-		"out_clip_distance[2]",
-		"out_clip_distance[3]",
-		"out_clip_distance[4]",
-		"out_clip_distance[5]",
-		"out_tc8",
-		"out_tc9",
-		"out_tc0",
-		"out_tc1",
-		"out_tc2",
-		"out_tc3",
-		"out_tc4",
-		"out_tc5",
-		"out_tc6",
-		"out_tc7"
-	};
-
 	switch ((is_sca && d3.sca_dst_tmp != 0x3f) ? 0x1f : d3.dst)
 	{
 	case 0x1f:
@@ -86,56 +62,37 @@ std::string CgBinaryDisasm::GetDSTDisasm(bool is_sca) const
 		break;
 
 	default:
-		if (d3.dst < output_names.size())
-		{
-			fmt::append(ret, "%s%s", output_names[d3.dst], mask);
-		}
-		else
-		{
+		if (d3.dst > 15)
 			rsx_log.error("dst index out of range: %u", d3.dst);
-			fmt::append(ret, "(bad out index) o[%d]", d3.dst);
-		}
 
+		ret += fmt::format("o[%d]", d3.dst) + mask;
 		// Vertex Program supports double destinations, notably in MOV
 		if (d0.dst_tmp != 0x3f)
-			fmt::append(ret, " R%d%s", d0.dst_tmp, mask);
+			ret += fmt::format(" R%d", d0.dst_tmp) + mask;
 		break;
 	}
 
 	return ret;
 }
 
-std::string CgBinaryDisasm::GetSRCDisasm(const u32 n) const
+std::string CgBinaryDisasm::GetSRCDisasm(const u32 n)
 {
-	ensure(n < 3);
-
 	std::string ret;
 
-	static constexpr std::array<std::string_view, 16> reg_table =
-	{
-		"in_pos", "in_weight", "in_normal",
-		"in_diff_color", "in_spec_color",
-		"in_fog",
-		"in_point_size", "in_7",
-		"in_tc0", "in_tc1", "in_tc2", "in_tc3",
-		"in_tc4", "in_tc5", "in_tc6", "in_tc7"
-	};
-
 	switch (src[n].reg_type)
 	{
 	case 1: //temp
-		ret += 'R';
-		ret += std::to_string(src[n].tmp_src);
+		ret += "R" + std::to_string(src[n].tmp_src);
 		break;
 	case 2: //input
-		if (d1.input_src < reg_table.size())
+		if (d1.input_src < 16)
 		{
-			fmt::append(ret, "%s", reg_table[d1.input_src]);
+			ret += fmt::format("v[%d]", d1.input_src);
 		}
 		else
 		{
 			rsx_log.error("Bad input src num: %d", u32{ d1.input_src });
-			fmt::append(ret, "v[%d] # bad src", d1.input_src);
+			ret += fmt::format("v[%d] # bad src", d1.input_src);
 		}
 		break;
 	case 3: //const
@@ -171,7 +128,6 @@ std::string CgBinaryDisasm::GetSRCDisasm(const u32 n) const
 
 	switch (n)
 	{
-	default:
 	case 0: abs = d0.src0_abs; break;
 	case 1: abs = d0.src1_abs; break;
 	case 2: abs = d0.src2_abs; break;
@@ -222,9 +178,9 @@ std::string CgBinaryDisasm::GetTexDisasm()
 	return fmt::format("TEX%d", 0);
 }
 
-std::string CgBinaryDisasm::FormatDisasm(const std::string& code) const
+std::string CgBinaryDisasm::FormatDisasm(const std::string& code)
 {
-	const std::pair<std::string_view, std::function<std::string()>> repl_list[] =
+	const std::pair<std::string, std::function<std::string()>> repl_list[] =
 	{
 		{ "$$",  []() -> std::string { return "$"; } },
 		{ "$0",  [this]{ return GetSRCDisasm(0); } },
@@ -353,7 +309,7 @@ std::string CgBinaryDisasm::AddAddrMaskDisasm() const
 	return std::string(".") + f[d0.addr_swz];
 }
 
-std::string CgBinaryDisasm::AddAddrRegDisasm() const
+std::string CgBinaryDisasm::AddAddrRegDisasm()
 {
 	//static constexpr std::string_view f = "xyzw";
 	return fmt::format("A%d", d0.addr_reg_sel_1) + AddAddrMaskDisasm();
diff --git a/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp b/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp
index 43e4d866a5..25f468614b 100644
--- a/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp
+++ b/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp
@@ -1,4 +1,6 @@
 #include "stdafx.h"
+#include "Emu/System.h"
+#include "../rsx_methods.h"
 #include "FragmentProgramDecompiler.h"
 
 #include <algorithm>
@@ -20,15 +22,6 @@ namespace rsx
 
 using namespace rsx::fragment_program;
 
-// SIMD vector lanes
-enum VectorLane : u8
-{
-	X = 0,
-	Y = 1,
-	Z = 2,
-	W = 3,
-};
-
 FragmentProgramDecompiler::FragmentProgramDecompiler(const RSXFragmentProgram &prog, u32& size)
 	: m_size(size)
 	, m_prog(prog)
@@ -75,12 +68,12 @@ void FragmentProgramDecompiler::SetDst(std::string code, u32 flags)
 		if (dst.fp16 && device_props.has_native_half_support && !(flags & OPFLAGS::skip_type_cast))
 		{
 			// Cast to native data type
-			code = ClampValue(code, RSX_FP_PRECISION_HALF);
+			code = ClampValue(code, 1);
 		}
 
 		if (dst.saturate)
 		{
-			code = ClampValue(code, RSX_FP_PRECISION_SATURATE);
+			code = ClampValue(code, 4);
 		}
 		else if (dst.prec)
 		{
@@ -148,7 +141,8 @@ void FragmentProgramDecompiler::SetDst(std::string code, u32 flags)
 		AddCode(m_parr.AddParam(PF_PARAM_NONE, getFloatTypeName(4), "cc" + std::to_string(src0.cond_mod_reg_index)) + "$m = " + dest + ";");
 	}
 
-	const u32 reg_index = dst.fp16 ? (dst.dest_reg >> 1) : dst.dest_reg;
+	u32 reg_index = dst.fp16 ? dst.dest_reg >> 1 : dst.dest_reg;
+
 	ensure(reg_index < temp_registers.size());
 
 	if (dst.opcode == RSX_FP_OPCODE_MOV &&
@@ -259,19 +253,15 @@ std::string FragmentProgramDecompiler::AddTex()
 	switch (m_prog.get_texture_dimension(dst.tex_num))
 	{
 	case rsx::texture_dimension_extended::texture_dimension_1d:
-		properties.has_tex1D = true;
 		sampler = "sampler1D";
 		break;
 	case rsx::texture_dimension_extended::texture_dimension_cubemap:
-		properties.has_tex3D = true;
 		sampler = "samplerCube";
 		break;
 	case rsx::texture_dimension_extended::texture_dimension_2d:
-		properties.has_tex2D = true;
 		sampler = "sampler2D";
 		break;
 	case rsx::texture_dimension_extended::texture_dimension_3d:
-		properties.has_tex3D = true;
 		sampler = "sampler3D";
 		break;
 	}
@@ -280,6 +270,11 @@ std::string FragmentProgramDecompiler::AddTex()
 	return m_parr.AddParam(PF_PARAM_UNIFORM, sampler, std::string("tex") + std::to_string(dst.tex_num));
 }
 
+std::string FragmentProgramDecompiler::AddType3()
+{
+	return m_parr.AddParam(PF_PARAM_NONE, getFloatTypeName(4), "src3", getFloatTypeName(4) + "(1.)");
+}
+
 std::string FragmentProgramDecompiler::AddX2d()
 {
 	return m_parr.AddParam(PF_PARAM_NONE, getFloatTypeName(4), "x2d", getFloatTypeName(4) + "(0.)");
@@ -335,7 +330,7 @@ bool FragmentProgramDecompiler::DstExpectsSca() const
 
 std::string FragmentProgramDecompiler::Format(const std::string& code, bool ignore_redirects)
 {
-	const std::pair<std::string_view, std::function<std::string()>> repl_list[] =
+	const std::pair<std::string, std::function<std::string()>> repl_list[] =
 	{
 		{ "$$", []() -> std::string { return "$"; } },
 		{ "$0", [this]() -> std::string {return GetSRC<SRC0>(src0);} },
@@ -374,7 +369,7 @@ std::string FragmentProgramDecompiler::Format(const std::string& code, bool igno
 		{
 			//Redirect parameter 0 to the x2d temp register for TEXBEM
 			//TODO: Organize this a little better
-			std::pair<std::string_view, std::string> repl[] = { { "$0", "x2d" } };
+			std::pair<std::string, std::string> repl[] = { { "$0", "x2d" } };
 			std::string result = fmt::replace_all(code, repl);
 
 			return fmt::replace_all(result, repl_list);
@@ -404,17 +399,17 @@ std::string FragmentProgramDecompiler::GetRawCond()
 	}
 
 	if (src0.exec_if_gr && src0.exec_if_eq)
-		cond = compareFunction(COMPARE::SGE, AddCond() + swizzle, zero);
+		cond = compareFunction(COMPARE::FUNCTION_SGE, AddCond() + swizzle, zero);
 	else if (src0.exec_if_lt && src0.exec_if_eq)
-		cond = compareFunction(COMPARE::SLE, AddCond() + swizzle, zero);
+		cond = compareFunction(COMPARE::FUNCTION_SLE, AddCond() + swizzle, zero);
 	else if (src0.exec_if_gr && src0.exec_if_lt)
-		cond = compareFunction(COMPARE::SNE, AddCond() + swizzle, zero);
+		cond = compareFunction(COMPARE::FUNCTION_SNE, AddCond() + swizzle, zero);
 	else if (src0.exec_if_gr)
-		cond = compareFunction(COMPARE::SGT, AddCond() + swizzle, zero);
+		cond = compareFunction(COMPARE::FUNCTION_SGT, AddCond() + swizzle, zero);
 	else if (src0.exec_if_lt)
-		cond = compareFunction(COMPARE::SLT, AddCond() + swizzle, zero);
+		cond = compareFunction(COMPARE::FUNCTION_SLT, AddCond() + swizzle, zero);
 	else //if(src0.exec_if_eq)
-		cond = compareFunction(COMPARE::SEQ, AddCond() + swizzle, zero);
+		cond = compareFunction(COMPARE::FUNCTION_SEQ, AddCond() + swizzle, zero);
 
 	return cond;
 }
@@ -503,15 +498,15 @@ template<typename T> std::string FragmentProgramDecompiler::GetSRC(T src)
 	std::string ret;
 	u32 precision_modifier = 0;
 
-	if constexpr (std::is_same_v<T, SRC0>)
+	if constexpr (std::is_same<T, SRC0>::value)
 	{
 		precision_modifier = src1.src0_prec_mod;
 	}
-	else if constexpr (std::is_same_v<T, SRC1>)
+	else if constexpr (std::is_same<T, SRC1>::value)
 	{
 		precision_modifier = src1.src1_prec_mod;
 	}
-	else if constexpr (std::is_same_v<T, SRC2>)
+	else if constexpr (std::is_same<T, SRC2>::value)
 	{
 		precision_modifier = src1.src2_prec_mod;
 	}
@@ -567,12 +562,6 @@ template<typename T> std::string FragmentProgramDecompiler::GetSRC(T src)
 		const std::string reg_var = (register_id < std::size(reg_table))? reg_table[register_id] : "unk";
 		bool insert = true;
 
-		if (reg_var == "unk")
-		{
-			m_is_valid_ucode = false;
-			insert = false;
-		}
-
 		if (src2.use_index_reg && m_loop_count)
 		{
 			// Dynamically load the input
@@ -715,10 +704,7 @@ template<typename T> std::string FragmentProgramDecompiler::GetSRC(T src)
 		rsx_log.error("Src type 3 used, opcode=0x%X, dst=0x%X s0=0x%X s1=0x%X s2=0x%X",
 				dst.opcode, dst.HEX, src0.HEX, src1.HEX, src2.HEX);
 
-		// This is not some special type, it is a bug indicating memory corruption
-		// Shaders that are even slightly off do not execute on realhw to any meaningful degree
-		m_is_valid_ucode = false;
-		ret += "src3";
+		ret += AddType3();
 		precision_modifier = RSX_FP_PRECISION_REAL;
 		break;
 
@@ -760,26 +746,14 @@ std::string FragmentProgramDecompiler::BuildCode()
 	const std::string init_value = float4_type + "(0.)";
 	std::array<std::string, 4> output_register_names;
 	std::array<u32, 4> ouput_register_indices = { 0, 2, 3, 4 };
-
-	// Holder for any "cleanup" before exiting main
-	std::stringstream main_epilogue;
+	bool shader_is_valid = false;
 
 	// Check depth export
 	if (m_ctrl & CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT)
 	{
 		// Hw tests show that the depth export register is default-initialized to 0 and not wpos.z!!
 		m_parr.AddParam(PF_PARAM_NONE, getFloatTypeName(4), "r1", init_value);
-
-		auto& r1 = temp_registers[1];
-		if (r1.requires_gather(VectorLane::Z))
-		{
-			// r1.zw was not written to
-			properties.has_gather_op = true;
-			main_epilogue << "	r1.z = " << float4_type << r1.gather_r() << ".z;\n";
-
-			// Emit debug warning. Useful to diagnose regressions, but should be removed in future.
-			rsx_log.warning("ROP reads from shader depth without writing to it. Final value will be gathered.");
-		}
+		shader_is_valid = (!!temp_registers[1].h1_writes);
 	}
 
 	// Add the color output registers. They are statically written to and have guaranteed initialization (except r1.z which == wpos.z)
@@ -793,49 +767,28 @@ std::string FragmentProgramDecompiler::BuildCode()
 		output_register_names = { "h0", "h4", "h6", "h8" };
 	}
 
-	for (u32 n = 0; n < 4; ++n)
+	for (int n = 0; n < 4; ++n)
 	{
-		const auto& reg_name = output_register_names[n];
-		if (!m_parr.HasParam(PF_PARAM_NONE, float4_type, reg_name))
+		if (!m_parr.HasParam(PF_PARAM_NONE, float4_type, output_register_names[n]))
 		{
-			m_parr.AddParam(PF_PARAM_NONE, float4_type, reg_name, init_value);
-		}
-
-		if (n >= m_prog.mrt_buffers_count)
-		{
-			// Skip gather
+			m_parr.AddParam(PF_PARAM_NONE, float4_type, output_register_names[n], init_value);
 			continue;
 		}
 
 		const auto block_index = ouput_register_indices[n];
-		auto& r = temp_registers[block_index];
+		shader_is_valid |= (!!temp_registers[block_index].h0_writes);
+	}
 
-		if (fp16_out)
+	if (!shader_is_valid)
+	{
+		properties.has_no_output = true;
+
+		if (!properties.has_discard_op)
 		{
-			// Check if we need a split/extract op
-			if (r.requires_split(0))
-			{
-				main_epilogue << "	" << reg_name << " = " << float4_type << r.split_h0() << ";\n";
-
-				// Emit debug warning. Useful to diagnose regressions, but should be removed in future.
-				rsx_log.warning("ROP reads from %s without writing to it. Final value will be extracted from the 32-bit register.", reg_name);
-			}
-
-			continue;
+			// NOTE: Discard operation overrides output
+			rsx_log.warning("Shader does not write to any output register and will be NOPed");
+			main = "/*" + main + "*/";
 		}
-
-		if (!r.requires_gather128())
-		{
-			// Nothing to do
-			continue;
-		}
-
-		// We need to gather the data from existing registers
-		main_epilogue << "	" << reg_name << " = " << float4_type << r.gather_r() << ";\n";
-		properties.has_gather_op = true;
-
-		// Emit debug warning. Useful to diagnose regressions, but should be removed in future.
-		rsx_log.warning("ROP reads from %s without writing to it. Final value will be gathered.", reg_name);
 	}
 
 	if (properties.has_dynamic_register_load)
@@ -848,25 +801,6 @@ std::string FragmentProgramDecompiler::BuildCode()
 	}
 
 	std::stringstream OS;
-
-	if (!m_is_valid_ucode)
-	{
-		// If the code is broken, do not compile. Simply NOP main and write empty outputs
-		insertHeader(OS);
-		OS << "\n";
-		OS << "void main()\n";
-		OS << "{\n";
-		OS << "#if 0\n";
-		OS << main << "\n";
-		OS << "#endif\n";
-		OS << "	discard;\n";
-		OS << "}\n";
-
-		// Don't consume any args
-		m_parr.Clear();
-		return OS.str();
-	}
-
 	insertHeader(OS);
 	OS << "\n";
 	insertConstants(OS);
@@ -1061,12 +995,6 @@ std::string FragmentProgramDecompiler::BuildCode()
 
 	insertMainStart(OS);
 	OS << main << std::endl;
-
-	if (const auto epilogue = main_epilogue.str(); !epilogue.empty())
-	{
-		OS << "	// Epilogue\n";
-		OS << epilogue << std::endl;
-	}
 	insertMainEnd(OS);
 
 	return OS.str();
@@ -1090,10 +1018,10 @@ bool FragmentProgramDecompiler::handle_sct_scb(u32 opcode)
 		SetDst("_builtin_divsq($0, $1.x)");
 		properties.has_divsq = true;
 		return true;
-	case RSX_FP_OPCODE_DP2: SetDst(getFunction(FUNCTION::DP2), OPFLAGS::op_extern); return true;
-	case RSX_FP_OPCODE_DP3: SetDst(getFunction(FUNCTION::DP3), OPFLAGS::op_extern); return true;
-	case RSX_FP_OPCODE_DP4: SetDst(getFunction(FUNCTION::DP4), OPFLAGS::op_extern); return true;
-	case RSX_FP_OPCODE_DP2A: SetDst(getFunction(FUNCTION::DP2A), OPFLAGS::op_extern); return true;
+	case RSX_FP_OPCODE_DP2: SetDst(getFunction(FUNCTION::FUNCTION_DP2), OPFLAGS::op_extern); return true;
+	case RSX_FP_OPCODE_DP3: SetDst(getFunction(FUNCTION::FUNCTION_DP3), OPFLAGS::op_extern); return true;
+	case RSX_FP_OPCODE_DP4: SetDst(getFunction(FUNCTION::FUNCTION_DP4), OPFLAGS::op_extern); return true;
+	case RSX_FP_OPCODE_DP2A: SetDst(getFunction(FUNCTION::FUNCTION_DP2A), OPFLAGS::op_extern); return true;
 	case RSX_FP_OPCODE_MAD: SetDst("fma($0, $1, $2)", OPFLAGS::src_cast_f32); return true;
 	case RSX_FP_OPCODE_MAX: SetDst("max($0, $1)", OPFLAGS::src_cast_f32); return true;
 	case RSX_FP_OPCODE_MIN: SetDst("min($0, $1)", OPFLAGS::src_cast_f32); return true;
@@ -1101,27 +1029,27 @@ bool FragmentProgramDecompiler::handle_sct_scb(u32 opcode)
 	case RSX_FP_OPCODE_MUL: SetDst("($0 * $1)"); return true;
 	case RSX_FP_OPCODE_RCP: SetDst("_builtin_rcp($0.x).xxxx"); return true;
 	case RSX_FP_OPCODE_RSQ: SetDst("_builtin_rsq($0.x).xxxx"); return true;
-	case RSX_FP_OPCODE_SEQ: SetDst("$Ty(" + compareFunction(COMPARE::SEQ, "$0", "$1") + ")", OPFLAGS::op_extern); return true;
-	case RSX_FP_OPCODE_SFL: SetDst(getFunction(FUNCTION::SFL), OPFLAGS::skip_type_cast); return true;
-	case RSX_FP_OPCODE_SGE: SetDst("$Ty(" + compareFunction(COMPARE::SGE, "$0", "$1") + ")", OPFLAGS::op_extern); return true;
-	case RSX_FP_OPCODE_SGT: SetDst("$Ty(" + compareFunction(COMPARE::SGT, "$0", "$1") + ")", OPFLAGS::op_extern); return true;
-	case RSX_FP_OPCODE_SLE: SetDst("$Ty(" + compareFunction(COMPARE::SLE, "$0", "$1") + ")", OPFLAGS::op_extern); return true;
-	case RSX_FP_OPCODE_SLT: SetDst("$Ty(" + compareFunction(COMPARE::SLT, "$0", "$1") + ")", OPFLAGS::op_extern); return true;
-	case RSX_FP_OPCODE_SNE: SetDst("$Ty(" + compareFunction(COMPARE::SNE, "$0", "$1") + ")", OPFLAGS::op_extern); return true;
-	case RSX_FP_OPCODE_STR: SetDst(getFunction(FUNCTION::STR), OPFLAGS::skip_type_cast); return true;
+	case RSX_FP_OPCODE_SEQ: SetDst("$Ty(" + compareFunction(COMPARE::FUNCTION_SEQ, "$0", "$1") + ")", OPFLAGS::op_extern); return true;
+	case RSX_FP_OPCODE_SFL: SetDst(getFunction(FUNCTION::FUNCTION_SFL), OPFLAGS::skip_type_cast); return true;
+	case RSX_FP_OPCODE_SGE: SetDst("$Ty(" + compareFunction(COMPARE::FUNCTION_SGE, "$0", "$1") + ")", OPFLAGS::op_extern); return true;
+	case RSX_FP_OPCODE_SGT: SetDst("$Ty(" + compareFunction(COMPARE::FUNCTION_SGT, "$0", "$1") + ")", OPFLAGS::op_extern); return true;
+	case RSX_FP_OPCODE_SLE: SetDst("$Ty(" + compareFunction(COMPARE::FUNCTION_SLE, "$0", "$1") + ")", OPFLAGS::op_extern); return true;
+	case RSX_FP_OPCODE_SLT: SetDst("$Ty(" + compareFunction(COMPARE::FUNCTION_SLT, "$0", "$1") + ")", OPFLAGS::op_extern); return true;
+	case RSX_FP_OPCODE_SNE: SetDst("$Ty(" + compareFunction(COMPARE::FUNCTION_SNE, "$0", "$1") + ")", OPFLAGS::op_extern); return true;
+	case RSX_FP_OPCODE_STR: SetDst(getFunction(FUNCTION::FUNCTION_STR), OPFLAGS::skip_type_cast); return true;
 
 	// SCB-only ops
 	case RSX_FP_OPCODE_COS: SetDst("cos($0.xxxx)"); return true;
 	case RSX_FP_OPCODE_DST: SetDst("$Ty(1.0, $0.y * $1.y, $0.z, $1.w)", OPFLAGS::op_extern); return true;
-	case RSX_FP_OPCODE_REFL: SetDst(getFunction(FUNCTION::REFL), OPFLAGS::op_extern); return true;
+	case RSX_FP_OPCODE_REFL: SetDst(getFunction(FUNCTION::FUNCTION_REFL), OPFLAGS::op_extern); return true;
 	case RSX_FP_OPCODE_EX2: SetDst("exp2($0.xxxx)"); return true;
 	case RSX_FP_OPCODE_FLR: SetDst("_builtin_floor($0)"); return true;
-	case RSX_FP_OPCODE_FRC: SetDst(getFunction(FUNCTION::FRACT)); return true;
+	case RSX_FP_OPCODE_FRC: SetDst(getFunction(FUNCTION::FUNCTION_FRACT)); return true;
 	case RSX_FP_OPCODE_LIT:
 		SetDst("_builtin_lit($0)");
 		properties.has_lit_op = true;
 		return true;
-	case RSX_FP_OPCODE_LIF: SetDst("$Ty(1.0, $0.y, ($0.y > 0 ? exp2($0.w) : 0.0), 1.0)", OPFLAGS::op_extern); return true;
+	case RSX_FP_OPCODE_LIF: SetDst("$Ty(1.0, $0.y, ($0.y > 0 ? pow(2.0, $0.w) : 0.0), 1.0)", OPFLAGS::op_extern); return true;
 	case RSX_FP_OPCODE_LRP: SetDst("$Ty($2 * (1 - $0) + $1 * $0)", OPFLAGS::skip_type_cast); return true;
 	case RSX_FP_OPCODE_LG2: SetDst("_builtin_log2($0.x).xxxx"); return true;
 	// Pack operations. See https://www.khronos.org/registry/OpenGL/extensions/NV/NV_fragment_program.txt
@@ -1146,45 +1074,30 @@ bool FragmentProgramDecompiler::handle_sct_scb(u32 opcode)
 
 bool FragmentProgramDecompiler::handle_tex_srb(u32 opcode)
 {
-	auto insert_texture_fetch = [this](FUNCTION base_func)
+	auto insert_texture_fetch = [this](const std::array<FUNCTION, 6>& functions)
 	{
 		const auto type = m_prog.get_texture_dimension(dst.tex_num);
 		const auto ref_mask = (1 << dst.tex_num);
 		std::string swz_mask = "";
+		auto select = static_cast<u8>(type);
 
-		auto func_id = base_func;
-
-		if (m_prog.texture_state.shadow_textures & ref_mask)
+		if (type != rsx::texture_dimension_extended::texture_dimension_3d)
 		{
-			properties.shadow_sampler_mask |= ref_mask;
-			swz_mask = ".xxxx";
-
-			func_id = (base_func == FUNCTION::TEXTURE_SAMPLE_PROJ_BASE) ? FUNCTION::TEXTURE_SAMPLE_SHADOW_PROJ_BASE : FUNCTION::TEXTURE_SAMPLE_SHADOW_BASE;
-		}
-		else
-		{
-			properties.common_access_sampler_mask |= ref_mask;
-			if (m_prog.texture_state.redirected_textures & ref_mask)
+			if (m_prog.texture_state.shadow_textures & ref_mask)
 			{
-				properties.redirected_sampler_mask |= ref_mask;
-				func_id = (base_func == FUNCTION::TEXTURE_SAMPLE_PROJ_BASE) ? FUNCTION::TEXTURE_SAMPLE_DEPTH_RGBA_PROJ_BASE : FUNCTION::TEXTURE_SAMPLE_DEPTH_RGBA_BASE;
+				properties.shadow_sampler_mask |= ref_mask;
+				select = 4;
+				swz_mask = ".xxxx";
+			}
+			else
+			{
+				properties.common_access_sampler_mask |= ref_mask;
+				if (m_prog.texture_state.redirected_textures & ref_mask)
+				{
+					properties.redirected_sampler_mask |= ref_mask;
+					select = 5;
+				}
 			}
-		}
-
-		ensure(func_id <= FUNCTION::TEXTURE_SAMPLE_MAX_BASE_ENUM && func_id >= FUNCTION::TEXTURE_SAMPLE_BASE);
-
-		if (!(m_prog.texture_state.multisampled_textures & ref_mask)) [[ likely ]]
-		{
-			// Clamp type to 3 types (1d, 2d, cube+3d) and offset into sampling redirection table
-			const auto type_offset = (std::min(static_cast<int>(type), 2) + 1) * static_cast<int>(FUNCTION::TEXTURE_SAMPLE_BASE_ENUM_COUNT);
-			func_id = static_cast<FUNCTION>(static_cast<int>(func_id) + type_offset);
-		}
-		else
-		{
-			// Map to multisample op
-			ensure(type <= rsx::texture_dimension_extended::texture_dimension_2d);
-			properties.multisampled_sampler_mask |= ref_mask;
-			func_id = static_cast<FUNCTION>(static_cast<int>(func_id) - static_cast<int>(FUNCTION::TEXTURE_SAMPLE_BASE) + static_cast<int>(FUNCTION::TEXTURE_SAMPLE2DMS));
 		}
 
 		if (dst.exp_tex)
@@ -1193,20 +1106,16 @@ bool FragmentProgramDecompiler::handle_tex_srb(u32 opcode)
 			AddCode("_enable_texture_expand();");
 		}
 
-		// Shadow proj
-		switch (func_id)
+		auto function = functions[select];
+
+		if (function == FUNCTION::FUNCTION_TEXTURE_SHADOW2D &&
+			type == rsx::texture_dimension_extended::texture_dimension_cubemap)
 		{
-		case FUNCTION::TEXTURE_SAMPLE1D_SHADOW_PROJ:
-		case FUNCTION::TEXTURE_SAMPLE2D_SHADOW_PROJ:
-		case FUNCTION::TEXTURE_SAMPLE2DMS_SHADOW_PROJ:
-		case FUNCTION::TEXTURE_SAMPLE3D_SHADOW_PROJ:
-			properties.has_texShadowProj = true;
-			break;
-		default:
-			break;
+			// Cubemap shadow override
+			function = FUNCTION::FUNCTION_TEXTURE_SHADOWCUBE;
 		}
 
-		SetDst(getFunction(func_id) + swz_mask);
+		SetDst(getFunction(function) + swz_mask);
 
 		if (dst.exp_tex)
 		{
@@ -1217,8 +1126,8 @@ bool FragmentProgramDecompiler::handle_tex_srb(u32 opcode)
 
 	switch (opcode)
 	{
-	case RSX_FP_OPCODE_DDX: SetDst(getFunction(FUNCTION::DFDX)); return true;
-	case RSX_FP_OPCODE_DDY: SetDst(getFunction(FUNCTION::DFDY)); return true;
+	case RSX_FP_OPCODE_DDX: SetDst(getFunction(FUNCTION::FUNCTION_DFDX)); return true;
+	case RSX_FP_OPCODE_DDY: SetDst(getFunction(FUNCTION::FUNCTION_DFDY)); return true;
 	case RSX_FP_OPCODE_NRM: SetDst("_builtin_normalize($0.xyz).xyzz", OPFLAGS::src_cast_f32); return true;
 	case RSX_FP_OPCODE_BEM: SetDst("$0.xyxy + $1.xxxx * $2.xzxz + $1.yyyy * $2.ywyw"); return true;
 	case RSX_FP_OPCODE_TEXBEM:
@@ -1231,7 +1140,15 @@ bool FragmentProgramDecompiler::handle_tex_srb(u32 opcode)
 	case RSX_FP_OPCODE_TEX:
 	{
 		AddTex();
-		insert_texture_fetch(FUNCTION::TEXTURE_SAMPLE_BASE);
+		insert_texture_fetch({
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE1D,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE2D,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE3D,
+			FUNCTION::FUNCTION_TEXTURE_SHADOW2D,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_DEPTH_RGBA
+		});
+
 		return true;
 	}
 	case RSX_FP_OPCODE_TXPBEM:
@@ -1244,25 +1161,65 @@ bool FragmentProgramDecompiler::handle_tex_srb(u32 opcode)
 	case RSX_FP_OPCODE_TXP:
 	{
 		AddTex();
-		insert_texture_fetch(FUNCTION::TEXTURE_SAMPLE_PROJ_BASE);
+		insert_texture_fetch({
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_PROJ,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_PROJ,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_PROJ,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_PROJ,
+			FUNCTION::FUNCTION_TEXTURE_SHADOW2D_PROJ,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_DEPTH_RGBA_PROJ
+		});
+
 		return true;
 	}
 	case RSX_FP_OPCODE_TXD:
 	{
 		AddTex();
-		insert_texture_fetch(FUNCTION::TEXTURE_SAMPLE_GRAD_BASE);
+
+		if (m_prog.texture_state.redirected_textures & (1 << dst.tex_num) ||
+			m_prog.texture_state.shadow_textures & (1 << dst.tex_num))
+		{
+			// Doesn't make sense to sample with derivates for these types
+			rsx_log.error("[Unimplemented warning] TXD operation performed on shadow/redirected texture!");
+		}
+
+		insert_texture_fetch({
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_GRAD,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_GRAD,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_GRAD,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_GRAD,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_GRAD,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_GRAD
+		});
+
 		return true;
 	}
 	case RSX_FP_OPCODE_TXB:
 	{
 		AddTex();
-		insert_texture_fetch(FUNCTION::TEXTURE_SAMPLE_BIAS_BASE);
+		insert_texture_fetch({
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_BIAS,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_BIAS,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_BIAS,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_BIAS,
+			FUNCTION::FUNCTION_TEXTURE_SHADOW2D,              // Shadow and depth_rgba variants are generated for framebuffers where only LOD0 exists
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_DEPTH_RGBA
+		});
+
 		return true;
 	}
 	case RSX_FP_OPCODE_TXL:
 	{
 		AddTex();
-		insert_texture_fetch(FUNCTION::TEXTURE_SAMPLE_LOD_BASE);
+		insert_texture_fetch({
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_LOD,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_LOD,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_LOD,
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_LOD,
+			FUNCTION::FUNCTION_TEXTURE_SHADOW2D,              // Shadow and depth_rgba variants are generated for framebuffers where only LOD0 exists
+			FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_DEPTH_RGBA
+		});
+
 		return true;
 	}
 	// Unpack operations. See https://www.khronos.org/registry/OpenGL/extensions/NV/NV_fragment_program.txt
@@ -1291,7 +1248,6 @@ std::string FragmentProgramDecompiler::Decompile()
 	m_location = 0;
 	m_loop_count = 0;
 	m_code_level = 1;
-	m_is_valid_ucode = true;
 
 	enum
 	{
@@ -1408,12 +1364,12 @@ std::string FragmentProgramDecompiler::Decompile()
 
 		switch (opcode)
 		{
-		case RSX_FP_OPCODE_NOP:
-			break;
+		case RSX_FP_OPCODE_NOP: break;
 		case RSX_FP_OPCODE_KIL:
 			properties.has_discard_op = true;
 			AddFlowOp("_kill()");
 			break;
+
 		default:
 			int prev_force_unit = forced_unit;
 
diff --git a/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h b/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h
index dab539f9da..e55f6fc42d 100644
--- a/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h
+++ b/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h
@@ -1,10 +1,116 @@
 #pragma once
 #include "ShaderParam.h"
-#include "FragmentProgramRegister.h"
 #include "RSXFragmentProgram.h"
-
 #include <sstream>
 
+// Helper for GPR occupancy tracking
+struct temp_register
+{
+	bool aliased_r0 = false;
+	bool aliased_h0 = false;
+	bool aliased_h1 = false;
+	bool last_write_half[4] = { false, false, false, false };
+
+	u32 real_index = -1;
+
+	u32 h0_writes = 0u;   // Number of writes to the first 64-bits of the register
+	u32 h1_writes = 0u;   // Number of writes to the last 64-bits of the register
+
+	void tag(u32 index, bool half_register, bool x, bool y, bool z, bool w)
+	{
+		if (half_register)
+		{
+			if (index & 1)
+			{
+				if (x) last_write_half[2] = true;
+				if (y) last_write_half[2] = true;
+				if (z) last_write_half[3] = true;
+				if (w) last_write_half[3] = true;
+
+				aliased_h1 = true;
+				h1_writes++;
+			}
+			else
+			{
+				if (x) last_write_half[0] = true;
+				if (y) last_write_half[0] = true;
+				if (z) last_write_half[1] = true;
+				if (w) last_write_half[1] = true;
+
+				aliased_h0 = true;
+				h0_writes++;
+			}
+		}
+		else
+		{
+			if (x) last_write_half[0] = false;
+			if (y) last_write_half[1] = false;
+			if (z) last_write_half[2] = false;
+			if (w) last_write_half[3] = false;
+
+			aliased_r0 = true;
+
+			h0_writes++;
+			h1_writes++;
+		}
+
+		if (real_index == umax)
+		{
+			if (half_register)
+				real_index = index >> 1;
+			else
+				real_index = index;
+		}
+	}
+
+	bool requires_gather(u8 channel) const
+	{
+		//Data fetched from the single precision register requires merging of the two half registers
+		ensure(channel < 4);
+		if (aliased_h0 && channel < 2)
+		{
+			return last_write_half[channel];
+		}
+
+		if (aliased_h1 && channel > 1)
+		{
+			return last_write_half[channel];
+		}
+
+		return false;
+	}
+
+	bool requires_split(u32 /*index*/) const
+	{
+		//Data fetched from any of the two half registers requires sync with the full register
+		if (!(last_write_half[0] || last_write_half[1]) && aliased_r0)
+		{
+			//r0 has been written to
+			//TODO: Check for specific elements in real32 register
+			return true;
+		}
+
+		return false;
+	}
+
+	std::string gather_r() const
+	{
+		std::string h0 = "h" + std::to_string(real_index << 1);
+		std::string h1 = "h" + std::to_string(real_index << 1 | 1);
+		std::string reg = "r" + std::to_string(real_index);
+		std::string ret = "//Invalid gather";
+
+		if (aliased_h0 && aliased_h1)
+			ret = "(gather(" + h0 + ", " + h1 + "))";
+		else if (aliased_h0)
+			ret = "(gather(" + h0 + "), " + reg + ".zw)";
+		else if (aliased_h1)
+			ret = "(" + reg + ".xy, gather(" + h1 + "))";
+
+		return ret;
+	}
+};
+
 /**
  * This class is used to translate RSX Fragment program to GLSL/HLSL code
  * Backend with text based shader can subclass this class and implement :
@@ -49,9 +155,7 @@ class FragmentProgramDecompiler
 	std::vector<u32> m_end_offsets;
 	std::vector<u32> m_else_offsets;
 
-	bool m_is_valid_ucode = true;
-
-	std::array<rsx::MixedPrecisionRegister, 64> temp_registers;
+	std::array<temp_register, 64> temp_registers;
 
 	std::string GetMask() const;
 
@@ -65,10 +169,13 @@ class FragmentProgramDecompiler
 	void AddFlowOp(const std::string& code);
 	std::string Format(const std::string& code, bool ignore_redirects = false);
 
-	// Support the transform-2d temp result for use with TEXBEM
+	//Technically a temporary workaround until we know what type3 is
+	std::string AddType3();
+
+	//Support the transform-2d temp result for use with TEXBEM
 	std::string AddX2d();
 
-	// Prevents operations from overflowing the desired range (tested with fp_dynamic3 autotest sample, DS2 for src1.input_prec_mod)
+	//Prevents operations from overflowing the desired range (tested with fp_dynamic3 autotest sample, DS2 for src1.input_prec_mod)
 	std::string ClampValue(const std::string& code, u32 precision);
 
 	/**
@@ -163,15 +270,12 @@ public:
 
 	struct
 	{
-		// Configuration properties (in)
 		u16 in_register_mask = 0;
 
 		u16 common_access_sampler_mask = 0;
 		u16 shadow_sampler_mask = 0;
 		u16 redirected_sampler_mask = 0;
-		u16 multisampled_sampler_mask = 0;
 
-		// Decoded properties (out)
 		bool has_lit_op = false;
 		bool has_gather_op = false;
 		bool has_no_output = false;
@@ -184,11 +288,6 @@ public:
 		bool has_pkg = false;
 		bool has_upg = false;
 		bool has_dynamic_register_load = false;
-
-		bool has_tex1D = false;
-		bool has_tex2D = false;
-		bool has_tex3D = false;
-		bool has_texShadowProj = false;
 	}
 	properties;
 
diff --git a/rpcs3/Emu/RSX/Program/FragmentProgramRegister.cpp b/rpcs3/Emu/RSX/Program/FragmentProgramRegister.cpp
deleted file mode 100644
index a14b142df6..0000000000
--- a/rpcs3/Emu/RSX/Program/FragmentProgramRegister.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-#include "stdafx.h"
-#include "FragmentProgramRegister.h"
-
-namespace rsx
-{
-	MixedPrecisionRegister::MixedPrecisionRegister()
-	{
-		std::fill(content_mask.begin(), content_mask.end(), data_type_bits::undefined);
-	}
-
-	void MixedPrecisionRegister::tag_h0(bool x, bool y, bool z, bool w)
-	{
-		if (x) content_mask[0] = data_type_bits::f16;
-		if (y) content_mask[1] = data_type_bits::f16;
-		if (z) content_mask[2] = data_type_bits::f16;
-		if (w) content_mask[3] = data_type_bits::f16;
-	}
-
-	void MixedPrecisionRegister::tag_h1(bool x, bool y, bool z, bool w)
-	{
-		if (x) content_mask[4] = data_type_bits::f16;
-		if (y) content_mask[5] = data_type_bits::f16;
-		if (z) content_mask[6] = data_type_bits::f16;
-		if (w) content_mask[7] = data_type_bits::f16;
-	}
-
-	void MixedPrecisionRegister::tag_r(bool x, bool y, bool z, bool w)
-	{
-		if (x) content_mask[0] = content_mask[1] = data_type_bits::f32;
-		if (y) content_mask[2] = content_mask[3] = data_type_bits::f32;
-		if (z) content_mask[4] = content_mask[5] = data_type_bits::f32;
-		if (w) content_mask[6] = content_mask[7] = data_type_bits::f32;
-	}
-
-	void MixedPrecisionRegister::tag(u32 index, bool is_fp16, bool x, bool y, bool z, bool w)
-	{
-		if (file_index == umax)
-		{
-			// First-time use. Initialize...
-			const u32 real_index = is_fp16 ? (index >> 1) : index;
-			file_index = real_index;
-		}
-
-		if (is_fp16)
-		{
-			ensure((index / 2) == file_index);
-
-			if (index & 1)
-			{
-				tag_h1(x, y, z, w);
-				return;
-			}
-
-			tag_h0(x, y, z, w);
-			return;
-		}
-
-		tag_r(x, y, z, w);
-	}
-
-	std::string MixedPrecisionRegister::gather_r() const
-	{
-		const auto half_index = file_index << 1;
-		const std::string reg = "r" + std::to_string(file_index);
-		const std::string gather_half_regs[] = {
-			"gather(h" + std::to_string(half_index) + ")",
-			"gather(h" + std::to_string(half_index + 1) + ")"
-		};
-
-		std::string outputs[4];
-		for (int ch = 0; ch < 4; ++ch)
-		{
-			// FIXME: This approach ignores mixed register bits. Not ideal!!!!
-			const auto channel0 = content_mask[ch * 2];
-			const auto is_fp16_ch = channel0 == content_mask[ch * 2 + 1] && channel0 == data_type_bits::f16;
-			outputs[ch] = is_fp16_ch ? gather_half_regs[ch / 2] : reg;
-		}
-
-		// Grouping. Only replace relevant bits...
-		if (outputs[0] == outputs[1]) outputs[0] = "";
-		if (outputs[2] == outputs[3]) outputs[2] = "";
-
-		// Assemble
-		bool group = false;
-		std::string result = "";
-		constexpr std::string_view swz_mask = "xyzw";
-
-		for (int ch = 0; ch < 4; ++ch)
-		{
-			if (outputs[ch].empty())
-			{
-				group = true;
-				continue;
-			}
-
-			if (!result.empty())
-			{
-				result += ", ";
-			}
-
-			if (group)
-			{
-				ensure(ch > 0);
-				group = false;
-
-				if (outputs[ch] == reg)
-				{
-					result += reg + "." + swz_mask[ch - 1] + swz_mask[ch];
-					continue;
-				}
-
-				result += outputs[ch];
-				continue;
-			}
-
-			const int subch = outputs[ch] == reg ? ch : (ch % 2); // Avoid .xyxy.z and other such ugly swizzles
-			result += outputs[ch] + "." + swz_mask[subch];
-		}
-
-		// Optimize dual-gather (128-bit gather) to use special function
-		const std::string double_gather = gather_half_regs[0] + ", " + gather_half_regs[1];
-		if (result == double_gather)
-		{
-			result = "gather(h" + std::to_string(half_index) + ", h" + std::to_string(half_index + 1) + ")";
-		}
-
-		return "(" + result + ")";
-	}
-
-	std::string MixedPrecisionRegister::fetch_halfreg(u32 word_index) const
-	{
-		// Reads half-word 0 (H16x4) from a full real (R32x4) register
-		constexpr std::string_view swz_mask = "xyzw";
-		const std::string reg = "r" + std::to_string(file_index);
-		const std::string hreg = "h" + std::to_string(file_index * 2 + word_index);
-
-		const std::string word0_bits = "floatBitsToUint(" + reg + "." + swz_mask[word_index * 2] + ")";
-		const std::string word1_bits = "floatBitsToUint(" + reg + "." + swz_mask[word_index * 2 + 1] + ")";
-		const std::string words[] = {
-			"unpackHalf2x16(" + word0_bits + ")",
-			"unpackHalf2x16(" + word1_bits + ")"
-		};
-
-		// Assemble
-		std::string outputs[4];
-
-		ensure(word_index <= 1);
-		const int word_offset = word_index * 4;
-		for (int ch = 0; ch < 4; ++ch)
-		{
-			outputs[ch] = content_mask[ch + word_offset] == data_type_bits::f32
-				? words[ch / 2]
-				: hreg;
-		}
-
-		// Grouping. Only replace relevant bits...
-		if (outputs[0] == outputs[1]) outputs[0] = "";
-		if (outputs[2] == outputs[3]) outputs[2] = "";
-
-		// Assemble
-		bool group = false;
-		std::string result = "";
-
-		for (int ch = 0; ch < 4; ++ch)
-		{
-			if (outputs[ch].empty())
-			{
-				group = true;
-				continue;
-			}
-
-			if (!result.empty())
-			{
-				result += ", ";
-			}
-
-			if (group)
-			{
-				ensure(ch > 0);
-				group = false;
-				result += outputs[ch];
-
-				if (outputs[ch] == hreg)
-				{
-					result += std::string(".") + swz_mask[ch - 1] + swz_mask[ch];
-				}
-				continue;
-			}
-
-			const int subch = outputs[ch] == hreg ? ch : (ch % 2); // Avoid .xyxy.z and other such ugly swizzles
-			result += outputs[ch] + "." + swz_mask[subch];
-		}
-
-		return "(" + result + ")";
-	}
-}
diff --git a/rpcs3/Emu/RSX/Program/FragmentProgramRegister.h b/rpcs3/Emu/RSX/Program/FragmentProgramRegister.h
deleted file mode 100644
index 6cfc8e76c3..0000000000
--- a/rpcs3/Emu/RSX/Program/FragmentProgramRegister.h
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-
-namespace rsx
-{
-	class MixedPrecisionRegister
-	{
-		enum data_type_bits
-		{
-			undefined = 0,
-			f16 = 1,
-			f32 = 2
-		};
-
-		std::array<data_type_bits, 8> content_mask; // Content details for each half-word
-		u32 file_index = umax;
-
-		void tag_h0(bool x, bool y, bool z, bool w);
-
-		void tag_h1(bool x, bool y, bool z, bool w);
-
-		void tag_r(bool x, bool y, bool z, bool w);
-
-		std::string fetch_halfreg(u32 word_index) const;
-
-	public:
-		MixedPrecisionRegister();
-
-		void tag(u32 index, bool is_fp16, bool x, bool y, bool z, bool w);
-
-		std::string gather_r() const;
-
-		std::string split_h0() const
-		{
-			return fetch_halfreg(0);
-		}
-
-		std::string split_h1() const
-		{
-			return fetch_halfreg(1);
-		}
-
-		// Getters
-
-		// Return true if all values are unwritten to (undefined)
-		bool floating() const
-		{
-			return file_index == umax;
-		}
-
-		// Return true if the first half register is all undefined
-		bool floating_h0() const
-		{
-			return content_mask[0] == content_mask[1] &&
-				content_mask[1] == content_mask[2] &&
-				content_mask[2] == content_mask[3] &&
-				content_mask[3] == data_type_bits::undefined;
-		}
-
-		// Return true if the second half register is all undefined
-		bool floating_h1() const
-		{
-			return content_mask[4] == content_mask[5] &&
-				content_mask[5] == content_mask[6] &&
-				content_mask[6] == content_mask[7] &&
-				content_mask[7] == data_type_bits::undefined;
-		}
-
-		// Return true if any of the half-words are 16-bit
-		bool requires_gather(u8 channel) const
-		{
-			// Data fetched from the single precision register requires merging of the two half registers
-			const auto channel_offset = channel * 2;
-			ensure(channel_offset <= 6);
-
-			return (content_mask[channel_offset] == data_type_bits::f16 || content_mask[channel_offset + 1] == data_type_bits::f16);
-		}
-
-		// Return true if the entire 128-bit register is filled with 2xfp16x4 data words
-		bool requires_gather128() const
-		{
-			// Full 128-bit check
-			for (const auto& ch : content_mask)
-			{
-				if (ch == data_type_bits::f16)
-				{
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		// Return true if the half-register is polluted with fp32 data
-		bool requires_split(u32 word_index) const
-		{
-			const u32 content_offset = word_index * 4;
-			for (u32 i = 0; i < 4; ++i)
-			{
-				if (content_mask[content_offset + i] == data_type_bits::f32)
-				{
-					return true;
-				}
-			}
-
-			return false;
-		}
-	};
-}
-
diff --git a/rpcs3/Emu/RSX/Program/GLSLCommon.cpp b/rpcs3/Emu/RSX/Program/GLSLCommon.cpp
index 0a1005eb46..f2f627ad34 100644
--- a/rpcs3/Emu/RSX/Program/GLSLCommon.cpp
+++ b/rpcs3/Emu/RSX/Program/GLSLCommon.cpp
@@ -1,39 +1,132 @@
 #include "stdafx.h"
+#include "Utilities/StrFmt.h"
 
 #include "GLSLCommon.h"
-#include "RSXFragmentProgram.h"
-
-#include "Emu/RSX/gcm_enums.h"
-#include "Utilities/StrFmt.h"
 
 namespace program_common
 {
-	template <typename T>
-	void define_glsl_constants(std::ostream& OS, std::initializer_list<std::pair<const char*, T>> enums)
+	void insert_compare_op(std::ostream& OS, bool low_precision)
 	{
-		for (const auto& e : enums)
+		if (low_precision)
 		{
-			if constexpr (std::is_enum_v<T> || std::is_integral_v<T>)
-			{
-				OS << "#define " << e.first << " " << static_cast<int>(e.second) << "\n";
-			}
-			else
-			{
-				OS << "#define " << e.first << " " << e.second << "\n";
-			}
-		}
+			OS <<
+				"int compare(const in float a, const in float b)\n"
+				"{\n"
+				"	if (abs(a - b) < 0.000001) return 2;\n"
+				"	return (a > b)? 4 : 1;\n"
+				"}\n\n"
 
-		OS << "\n";
+				"bool comparison_passes(const in float a, const in float b, const in uint func)\n"
+				"{\n"
+				"	if (func == 0) return false; // never\n"
+				"	if (func == 7) return true;  // always\n\n"
+
+				"	int op = compare(a, b);\n"
+				"	switch (func)\n"
+				"	{\n"
+				"		case 1: return op == 1; // less\n"
+				"		case 2: return op == 2; // equal\n"
+				"		case 3: return op <= 2; // lequal\n"
+				"		case 4: return op == 4; // greater\n"
+				"		case 5: return op != 2; // nequal\n"
+				"		case 6: return (op == 4 || op == 2); // gequal\n"
+				"	}\n\n"
+
+				"	return false; // unreachable\n"
+				"}\n\n";
+		}
+		else
+		{
+			OS <<
+			"bool comparison_passes(const in float a, const in float b, const in uint func)\n"
+			"{\n"
+			"	switch (func)\n"
+			"	{\n"
+			"		default:\n"
+			"		case 0: return false; //never\n"
+			"		case 1: return (a < b); //less\n"
+			"		case 2: return (a == b); //equal\n"
+			"		case 3: return (a <= b); //lequal\n"
+			"		case 4: return (a > b); //greater\n"
+			"		case 5: return (a != b); //nequal\n"
+			"		case 6: return (a >= b); //gequal\n"
+			"		case 7: return true; //always\n"
+			"	}\n"
+			"}\n\n";
+		}
 	}
 
-	void define_glsl_switches(std::ostream& OS, std::vector<std::string_view>& enums)
+	void insert_compare_op_vector(std::ostream& OS)
 	{
-		for (const auto& e : enums)
-		{
-			OS << "#define " << e << "\n";
-		}
+		OS <<
+		"bvec4 comparison_passes(const in vec4 a, const in vec4 b, const in uint func)\n"
+		"{\n"
+		"	switch (func)\n"
+		"	{\n"
+		"		default:\n"
+		"		case 0: return bvec4(false); //never\n"
+		"		case 1: return lessThan(a, b); //less\n"
+		"		case 2: return equal(a, b); //equal\n"
+		"		case 3: return lessThanEqual(a, b); //lequal\n"
+		"		case 4: return greaterThan(a, b); //greater\n"
+		"		case 5: return notEqual(a, b); //nequal\n"
+		"		case 6: return greaterThanEqual(a, b); //gequal\n"
+		"		case 7: return bvec4(true); //always\n"
+		"	}\n"
+		"}\n\n";
+	}
 
-		OS << "\n";
+	void insert_fog_declaration(std::ostream& OS, const std::string& wide_vector_type, const std::string& input_coord, bool declare)
+	{
+		std::string template_body;
+
+		if (!declare)
+			template_body += "$T fetch_fog_value(const in uint mode)\n";
+		else
+			template_body += "$T fetch_fog_value(const in uint mode, const in $T $I)\n";
+
+		template_body +=
+		"{\n"
+		"	$T result = $T($I.x, 0., 0., 0.);\n"
+		"	switch(mode)\n"
+		"	{\n"
+		"	default:\n"
+		"		return result;\n"
+		"	case 0:\n"
+		"		//linear\n"
+		"		result.y = fog_param1 * $I.x + (fog_param0 - 1.);\n"
+		"		break;\n"
+		"	case 1:\n"
+		"		//exponential\n"
+		"		result.y = exp(11.084 * (fog_param1 * $I.x + fog_param0 - 1.5));\n"
+		"		break;\n"
+		"	case 2:\n"
+		"		//exponential2\n"
+		"		result.y = exp(-pow(4.709 * (fog_param1 * $I.x + fog_param0 - 1.5), 2.));\n"
+		"		break;\n"
+		"	case 3:\n"
+		"		//exponential_abs\n"
+		"		result.y = exp(11.084 * (fog_param1 * abs($I.x) + fog_param0 - 1.5));\n"
+		"		break;\n"
+		"	case 4:\n"
+		"		//exponential2_abs\n"
+		"		result.y = exp(-pow(4.709 * (fog_param1 * abs($I.x) + fog_param0 - 1.5), 2.));\n"
+		"		break;\n"
+		" case 5:\n"
+		"		//linear_abs\n"
+		"		result.y = fog_param1 * abs($I.x) + (fog_param0 - 1.);\n"
+		"		break;\n"
+		"	}\n"
+		"\n"
+		"	result.y = clamp(result.y, 0., 1.);\n"
+		"	return result;\n"
+		"}\n\n";
+
+		std::pair<std::string, std::string> replacements[] =
+			{std::make_pair("$T", wide_vector_type),
+			 std::make_pair("$I", input_coord)};
+
+		OS << fmt::replace_all(template_body, replacements);
 	}
 }
 
@@ -79,36 +172,36 @@ namespace glsl
 		{
 			switch (f)
 			{
-			case COMPARE::SEQ:
-				return fmt::format("CMP_FIXUP(%s) == CMP_FIXUP(%s)", Op0, Op1);
-			case COMPARE::SGE:
-				return fmt::format("CMP_FIXUP(%s) >= CMP_FIXUP(%s)", Op0, Op1);
-			case COMPARE::SGT:
-				return fmt::format("CMP_FIXUP(%s) > CMP_FIXUP(%s)", Op0, Op1);
-			case COMPARE::SLE:
-				return fmt::format("CMP_FIXUP(%s) <= CMP_FIXUP(%s)", Op0, Op1);
-			case COMPARE::SLT:
-				return fmt::format("CMP_FIXUP(%s) < CMP_FIXUP(%s)", Op0, Op1);
-			case COMPARE::SNE:
-				return fmt::format("CMP_FIXUP(%s) != CMP_FIXUP(%s)", Op0, Op1);
+			case COMPARE::FUNCTION_SEQ:
+				return Op0 + " == " + Op1;
+			case COMPARE::FUNCTION_SGE:
+				return Op0 + " >= " + Op1;
+			case COMPARE::FUNCTION_SGT:
+				return Op0 + " > " + Op1;
+			case COMPARE::FUNCTION_SLE:
+				return Op0 + " <= " + Op1;
+			case COMPARE::FUNCTION_SLT:
+				return Op0 + " < " + Op1;
+			case COMPARE::FUNCTION_SNE:
+				return Op0 + " != " + Op1;
 			}
 		}
 		else
 		{
 			switch (f)
 			{
-			case COMPARE::SEQ:
-				return fmt::format("equal(CMP_FIXUP(%s), CMP_FIXUP(%s))", Op0, Op1);
-			case COMPARE::SGE:
-				return fmt::format("greaterThanEqual(CMP_FIXUP(%s), CMP_FIXUP(%s))", Op0, Op1);
-			case COMPARE::SGT:
-				return fmt::format("greaterThan(CMP_FIXUP(%s), CMP_FIXUP(%s))", Op0, Op1);
-			case COMPARE::SLE:
-				return fmt::format("lessThanEqual(CMP_FIXUP(%s), CMP_FIXUP(%s))", Op0, Op1);
-			case COMPARE::SLT:
-				return fmt::format("lessThan(CMP_FIXUP(%s), CMP_FIXUP(%s))", Op0, Op1);
-			case COMPARE::SNE:
-				return fmt::format("notEqual(CMP_FIXUP(%s), CMP_FIXUP(%s))", Op0, Op1);
+			case COMPARE::FUNCTION_SEQ:
+				return "equal(" + Op0 + ", " + Op1 + ")";
+			case COMPARE::FUNCTION_SGE:
+				return "greaterThanEqual(" + Op0 + ", " + Op1 + ")";
+			case COMPARE::FUNCTION_SGT:
+				return "greaterThan(" + Op0 + ", " + Op1 + ")";
+			case COMPARE::FUNCTION_SLE:
+				return "lessThanEqual(" + Op0 + ", " + Op1 + ")";
+			case COMPARE::FUNCTION_SLT:
+				return "lessThan(" + Op0 + ", " + Op1 + ")";
+			case COMPARE::FUNCTION_SNE:
+				return "notEqual(" + Op0 + ", " + Op1 + ")";
 			}
 		}
 
@@ -117,66 +210,336 @@ namespace glsl
 
 	void insert_vertex_input_fetch(std::stringstream& OS, glsl_rules rules, bool glsl4_compliant)
 	{
-		std::string vertex_id_name = (rules != glsl_rules_vulkan) ? "gl_VertexID" : "gl_VertexIndex";
+		std::string vertex_id_name = (rules != glsl_rules_spirv) ? "gl_VertexID" : "gl_VertexIndex";
 
-		// Actually decode a vertex attribute from a raw byte stream
-		program_common::define_glsl_constants<int>(OS,
-		{
-			{ "VTX_FMT_SNORM16", RSX_VERTEX_BASE_TYPE_SNORM16 },
-			{ "VTX_FMT_FLOAT32", RSX_VERTEX_BASE_TYPE_FLOAT },
-			{ "VTX_FMT_FLOAT16", RSX_VERTEX_BASE_TYPE_HALF_FLOAT },
-			{ "VTX_FMT_UNORM8 ", RSX_VERTEX_BASE_TYPE_UNORM8 },
-			{ "VTX_FMT_SINT16 ", RSX_VERTEX_BASE_TYPE_SINT16 },
-			{ "VTX_FMT_COMP32 ", RSX_VERTEX_BASE_TYPE_CMP32 },
-			{ "VTX_FMT_UINT8  ", RSX_VERTEX_BASE_TYPE_UINT8 }
-		});
+		//Actually decode a vertex attribute from a raw byte stream
+		OS <<
+		"#define VTX_FMT_SNORM16 0\n"
+		"#define VTX_FMT_FLOAT32 1\n"
+		"#define VTX_FMT_FLOAT16 2\n"
+		"#define VTX_FMT_UNORM8  3\n"
+		"#define VTX_FMT_SINT16  4\n"
+		"#define VTX_FMT_COMP32  5\n"
+		"#define VTX_FMT_UINT8   6\n\n";
 
 		// For intel GPUs which cannot access vectors in indexed mode (driver bug? or glsl version too low?)
 		// Note: Tested on Mesa iris with HD 530 and compilant path works fine, may be a bug on Windows proprietary drivers
 		if (!glsl4_compliant)
 		{
-			OS << "#define _INTEL_GLSL\n";
+			OS <<
+			"void mov(inout uvec4 vector, const in int index, const in uint scalar)\n"
+			"{\n"
+			"	switch(index)\n"
+			"	{\n"
+			"		case 0: vector.x = scalar; return;\n"
+			"		case 1: vector.y = scalar; return;\n"
+			"		case 2: vector.z = scalar; return;\n"
+			"		case 3: vector.w = scalar; return;\n"
+			"	}\n"
+			"}\n\n"
+
+			"uint ref(const in uvec4 vector, const in int index)\n"
+			"{\n"
+			"	switch(index)\n"
+			"	{\n"
+			"		case 0: return vector.x;\n"
+			"		case 1: return vector.y;\n"
+			"		case 2: return vector.z;\n"
+			"		case 3: return vector.w;\n"
+			"	}\n"
+			"}\n\n";
+		}
+		else
+		{
+			OS <<
+			"#define mov(v, i, s) v[i] = s\n"
+			"#define ref(v, i) v[i]\n\n";
 		}
 
 		OS <<
-			#include "GLSLSnippets/RSXProg/RSXVertexFetch.glsl"
-		;
-	}
+		"struct attribute_desc\n"
+		"{\n"
+		"	uint type;\n"
+		"	uint attribute_size;\n"
+		"	uint starting_offset;\n"
+		"	uint stride;\n"
+		"	uint frequency;\n"
+		"	bool swap_bytes;\n"
+		"	bool is_volatile;\n"
+		"	bool modulo;\n"
+		"};\n\n"
+
+		"uint gen_bits(const in uint x, const in uint y, const in uint z, const in uint w, const in bool swap)\n"
+		"{\n"
+		"	return (swap) ?\n"
+		"		_set_bits(_set_bits(_set_bits(w, z, 8, 8), y, 16, 8), x, 24, 8) :\n"
+		"		_set_bits(_set_bits(_set_bits(x, y, 8, 8), z, 16, 8), w, 24, 8);\n"
+		"}\n\n"
+
+		"uint gen_bits(const in uint x, const in uint y, const in bool swap)\n"
+		"{\n"
+		"	return (swap)? _set_bits(y, x, 8, 8) : _set_bits(x, y, 8, 8);\n"
+		"}\n\n"
+
+		// NOTE: (int(n) or int(n)) is broken on some NVIDIA and INTEL hardware when the sign bit is involved.
+		// See https://github.com/RPCS3/rpcs3/issues/8990
+		"vec4 sext(const in ivec4 bits)\n"
+		"{\n"
+		"	// convert raw 16 bit values into signed 32-bit float4 counterpart\n"
+		"	bvec4 sign_check = lessThan(bits, ivec4(0x8000));\n"
+		"	return _select(bits - 65536, bits, sign_check);\n"
+		"}\n\n"
+
+		"float sext(const in int bits)\n"
+		"{\n"
+		"	return (bits < 0x8000) ? float(bits) : float(bits - 65536); \n"
+		"}\n\n"
+
+		"vec4 fetch_attribute(const in attribute_desc desc, const in int vertex_id, usamplerBuffer input_stream)\n"
+		"{\n"
+		"	const int elem_size_table[] = { 2, 4, 2, 1, 2, 4, 1 };\n"
+		"	const float scaling_table[] = { 32768., 1., 1., 255., 1., 32767., 1. };\n"
+		"	const int elem_size = elem_size_table[desc.type];\n"
+		"	const vec4 scale = scaling_table[desc.type].xxxx;\n\n"
+
+		"	uvec4 tmp, result = uvec4(0u);\n"
+		"	vec4 ret;\n"
+		"	int n, i = int((vertex_id * desc.stride) + desc.starting_offset);\n\n"
+
+		"	for (n = 0; n < desc.attribute_size; n++)\n"
+		"	{\n"
+		"		tmp.x = texelFetch(input_stream, i++).x;\n"
+		"		if (elem_size == 2)\n"
+		"		{\n"
+		"			tmp.y = texelFetch(input_stream, i++).x;\n"
+		"			tmp.x = gen_bits(tmp.x, tmp.y, desc.swap_bytes);\n"
+		"		}\n"
+		"		else if (elem_size == 4)\n"
+		"		{\n"
+		"			tmp.y = texelFetch(input_stream, i++).x;\n"
+		"			tmp.z = texelFetch(input_stream, i++).x;\n"
+		"			tmp.w = texelFetch(input_stream, i++).x;\n"
+		"			tmp.x = gen_bits(tmp.x, tmp.y, tmp.z, tmp.w, desc.swap_bytes);\n"
+		"		}\n\n"
+
+		"		mov(result, n, tmp.x);\n"
+		"	}\n\n"
+
+		"	// Actual decoding step is done in vector space, outside the loop\n"
+		"	if (desc.type == VTX_FMT_SNORM16 || desc.type == VTX_FMT_SINT16)\n"
+		"	{\n"
+		"		ret = sext(ivec4(result));\n"
+		"	}\n"
+		"	else if (desc.type == VTX_FMT_FLOAT32)\n"
+		"	{\n"
+		"		ret = uintBitsToFloat(result);\n"
+		"	}\n"
+		"	else if (desc.type == VTX_FMT_FLOAT16)\n"
+		"	{\n"
+		"		tmp.x = _set_bits(result.x, result.y, 16, 16);\n"
+		"		tmp.y = _set_bits(result.z, result.w, 16, 16);\n"
+		"		ret.xy = unpackHalf2x16(tmp.x);\n"
+		"		ret.zw = unpackHalf2x16(tmp.y);\n"
+		"	}\n"
+		"	else if (elem_size == 1) //(desc.type == VTX_FMT_UINT8 || desc.type == VTX_FMT_UNORM8)\n"
+		"	{\n"
+		"		// Ignore bswap on single byte channels\n"
+		"		ret = vec4(result);\n"
+		"	}\n"
+		"	else //if (desc.type == VTX_FMT_COMP32)\n"
+		"	{\n"
+		"		result = uvec4(_get_bits(result.x, 0, 11),\n"
+		"			_get_bits(result.x, 11, 11),\n"
+		"			_get_bits(result.x, 22, 10),\n"
+		"			uint(scale.x));\n"
+		"		ret = sext(ivec4(result) << ivec4(5, 5, 6, 0));\n"
+		"	}\n\n"
+
+		"	if (desc.attribute_size < 4)\n"
+		"	{\n"
+		"		ret.w = scale.x;\n"
+		"	}\n\n"
+
+		"	return ret / scale; \n"
+		"}\n\n"
+
+		"attribute_desc fetch_desc(const in int location)\n"
+		"{\n"
+		"	// Each descriptor is 64 bits wide\n"
+		"	// [0-8] attribute stride\n"
+		"	// [8-24] attribute divisor\n"
+		"	// [24-27] attribute type\n"
+		"	// [27-30] attribute size\n"
+		"	// [30-31] reserved\n"
+		"	// [32-60] starting offset\n"
+		"	// [60-61] swap bytes flag\n"
+		"	// [61-62] volatile flag\n"
+		"	// [62-63] modulo enable flag\n\n";
+
+		if (rules == glsl_rules_opengl4)
+		{
+			// Data is packed into a ubo
+			OS <<
+			"	int block = (location >> 1);\n"
+			"	int sub_block = (location & 1) << 1;\n"
+			"	uvec2 attrib = uvec2(\n"
+			"		ref(input_attributes_blob[block], sub_block + 0),\n"
+			"		ref(input_attributes_blob[block], sub_block + 1));\n\n";
+		}
+		else
+		{
+			// Fetch parameters streamed separately from draw parameters
+			OS <<
+			"	uvec2 attrib = texelFetch(vertex_layout_stream, location + int(layout_ptr_offset)).xy;\n\n";
+		}
 
-	void insert_blend_prologue(std::ostream& OS)
-	{
 		OS <<
-			#include "GLSLSnippets/RSXProg/RSXProgrammableBlendPrologue.glsl"
-			;
+		"	attribute_desc result;\n"
+		"	result.stride = _get_bits(attrib.x, 0, 8);\n"
+		"	result.frequency = _get_bits(attrib.x, 8, 16);\n"
+		"	result.type = _get_bits(attrib.x, 24, 3);\n"
+		"	result.attribute_size = _get_bits(attrib.x, 27, 3);\n"
+		"	result.starting_offset = _get_bits(attrib.y, 0, 29);\n"
+		"	result.swap_bytes = _test_bit(attrib.y, 29);\n"
+		"	result.is_volatile = _test_bit(attrib.y, 30);\n"
+		"	result.modulo = _test_bit(attrib.y, 31);\n"
+		"	return result;\n"
+		"}\n\n"
+
+		"vec4 read_location(const in int location)\n"
+		"{\n"
+		"	attribute_desc desc = fetch_desc(location);\n"
+		"	int vertex_id = " << vertex_id_name << " - int(vertex_base_index);\n"
+		"	if (desc.frequency == 0)\n"
+		"	{\n"
+		"		vertex_id = 0;\n"
+		"	}\n"
+		"	else if (desc.modulo)\n"
+		"	{\n"
+		"		//if a vertex modifier is active; vertex_base must be 0 and is ignored\n"
+		"		vertex_id = (" << vertex_id_name << " + int(vertex_index_offset)) % int(desc.frequency);\n"
+		"	}\n"
+		"	else\n"
+		"	{\n"
+		"		vertex_id /= int(desc.frequency); \n"
+		"	}\n\n"
+
+		"	if (desc.is_volatile)\n"
+		"		return fetch_attribute(desc, vertex_id, volatile_input_stream);\n"
+		"	else\n"
+		"		return fetch_attribute(desc, vertex_id, persistent_input_stream);\n"
+		"}\n\n";
 	}
 
 	void insert_rop_init(std::ostream& OS)
 	{
 		OS <<
-			#include "GLSLSnippets/RSXProg/RSXROPPrologue.glsl"
-			;
+		"	if (_test_bit(rop_control, 9))\n"
+		"	{\n"
+		"		// Convert x,y to linear address\n"
+		"		const uvec2 stipple_coord = uvec2(gl_FragCoord.xy) % uvec2(32, 32);\n"
+		"		const uint address = stipple_coord.y * 32u + stipple_coord.x;\n"
+		"		const uint bit_offset = (address & 31u);\n"
+		"		const uint word_index = _get_bits(address, 7, 3);\n"
+		"		const uint sub_index = _get_bits(address, 5, 2);\n\n"
+
+		"		if (!_test_bit(stipple_pattern[word_index][sub_index], int(bit_offset)))\n"
+		"		{\n"
+		"			_kill();\n"
+		"		}\n"
+		"	}\n\n";
 	}
 
-	void insert_rop(std::ostream& OS, const shader_properties& /*props*/)
+	void insert_rop(std::ostream& OS, const shader_properties& props)
 	{
+		const std::string reg0 = props.fp32_outputs ? "r0" : "h0";
+		const std::string reg1 = props.fp32_outputs ? "r2" : "h4";
+		const std::string reg2 = props.fp32_outputs ? "r3" : "h6";
+		const std::string reg3 = props.fp32_outputs ? "r4" : "h8";
+
+		//TODO: Implement all ROP options like CSAA and ALPHA_TO_ONE here
+		if (props.disable_early_discard)
+		{
+			OS <<
+			"	if (_fragment_discard)\n"
+			"	{\n"
+			"		discard;\n"
+			"	}\n"
+			"	else if (_get_bits(rop_control, 0, 8) != 0)\n";
+		}
+		else
+		{
+			OS << "	if (_get_bits(rop_control, 0, 8) != 0)\n";
+		}
+
 		OS <<
-			#include "GLSLSnippets/RSXProg/RSXROPEpilogue.glsl"
-			;
+		"	{\n"
+		"		const bool alpha_test = _test_bit(rop_control, 0);\n"
+		"		const uint alpha_func = _get_bits(rop_control, 16, 3);\n";
+
+		if (!props.fp32_outputs)
+		{
+			OS << "		const bool srgb_convert = _test_bit(rop_control, 1);\n\n";
+		}
+
+		if (props.emulate_coverage_tests)
+		{
+			OS << "		const bool a2c_enabled = _test_bit(rop_control, 4);\n";
+		}
+
+		OS <<
+		"		if (alpha_test && !comparison_passes(" << reg0 << ".a, alpha_ref, alpha_func))\n"
+		"		{\n"
+		"			discard;\n"
+		"		}\n";
+
+		if (props.emulate_coverage_tests)
+		{
+			OS <<
+			"		else if (a2c_enabled && !coverage_test_passes(" << reg0 << ", rop_control >> 5))\n"
+			"		{\n"
+			"			discard;\n"
+			"		}\n";
+		}
+
+		if (!props.fp32_outputs)
+		{
+			// Tested using NPUB90375; some shaders (32-bit output only?) do not obey srgb flags
+			if (props.supports_native_fp16)
+			{
+				OS <<
+				"		else if (srgb_convert)\n"
+				"		{\n"
+				"			" << reg0 << ".rgb = clamp16(linear_to_srgb(" << reg0 << ")).rgb;\n"
+				"			" << reg1 << ".rgb = clamp16(linear_to_srgb(" << reg1 << ")).rgb;\n"
+				"			" << reg2 << ".rgb = clamp16(linear_to_srgb(" << reg2 << ")).rgb;\n"
+				"			" << reg3 << ".rgb = clamp16(linear_to_srgb(" << reg3 << ")).rgb;\n"
+				"		}\n";
+			}
+			else
+			{
+				OS <<
+				"		else if (srgb_convert)\n"
+				"		{\n"
+				"			" << reg0 << ".rgb = linear_to_srgb(" << reg0 << ").rgb;\n"
+				"			" << reg1 << ".rgb = linear_to_srgb(" << reg1 << ").rgb;\n"
+				"			" << reg2 << ".rgb = linear_to_srgb(" << reg2 << ").rgb;\n"
+				"			" << reg3 << ".rgb = linear_to_srgb(" << reg3 << ").rgb;\n"
+				"		}\n";
+			}
+		}
+
+		OS <<
+		"	}\n\n"
+
+		"	ocol0 = " << reg0 << ";\n"
+		"	ocol1 = " << reg1 << ";\n"
+		"	ocol2 = " << reg2 << ";\n"
+		"	ocol3 = " << reg3 << ";\n\n";
 	}
 
 	void insert_glsl_legacy_function(std::ostream& OS, const shader_properties& props)
 	{
-		std::vector<std::string_view> enabled_options;
-		if (props.low_precision_tests)
-		{
-			enabled_options.push_back("_GPU_LOW_PRECISION_COMPARE");
-		}
-
-		if (props.require_lit_emulation)
-		{
-			enabled_options.push_back("_ENABLE_LIT_EMULATION");
-		}
-
 		OS << "#define _select mix\n";
 		OS << "#define _saturate(x) clamp(x, 0., 1.)\n";
 		OS << "#define _get_bits(x, off, count) bitfieldExtract(x, off, count)\n";
@@ -184,354 +547,453 @@ namespace glsl
 		OS << "#define _test_bit(x, y) (_get_bits(x, y, 1) != 0)\n";
 		OS << "#define _rand(seed) fract(sin(dot(seed.xy, vec2(12.9898f, 78.233f))) * 43758.5453f)\n\n";
 
-
 		if (props.domain == glsl::program_domain::glsl_fragment_program)
 		{
-			OS << "// ROP control\n";
-			program_common::define_glsl_constants<rsx::ROP_control_bits>(OS,
-			{
-				{ "ALPHA_TEST_ENABLE_BIT       ", rsx::ROP_control_bits::ALPHA_TEST_ENABLE_BIT },
-				{ "SRGB_FRAMEBUFFER_BIT        ", rsx::ROP_control_bits::SRGB_FRAMEBUFFER_BIT },
-				{ "ALPHA_TO_COVERAGE_ENABLE_BIT", rsx::ROP_control_bits::ALPHA_TO_COVERAGE_ENABLE_BIT },
-				{ "MSAA_WRITE_ENABLE_BIT       ", rsx::ROP_control_bits::MSAA_WRITE_ENABLE_BIT },
-				{ "INT_FRAMEBUFFER_BIT         ", rsx::ROP_control_bits::INT_FRAMEBUFFER_BIT },
-				{ "POLYGON_STIPPLE_ENABLE_BIT  ", rsx::ROP_control_bits::POLYGON_STIPPLE_ENABLE_BIT },
-				{ "ALPHA_TEST_FUNC_OFFSET      ", rsx::ROP_control_bits::ALPHA_FUNC_OFFSET },
-				{ "ALPHA_TEST_FUNC_LENGTH      ", rsx::ROP_control_bits::ALPHA_FUNC_NUM_BITS },
-				{ "MSAA_SAMPLE_CTRL_OFFSET     ", rsx::ROP_control_bits::MSAA_SAMPLE_CTRL_OFFSET },
-				{ "MSAA_SAMPLE_CTRL_LENGTH     ", rsx::ROP_control_bits::MSAA_SAMPLE_CTRL_NUM_BITS },
-				{ "ROP_CMD_MASK                ", rsx::ROP_control_bits::ROP_CMD_MASK }
-			});
-
-			program_common::define_glsl_constants<const char*>(OS,
-			{
-				{ "col0", props.fp32_outputs ? "r0" : "h0" },
-				{ "col1", props.fp32_outputs ? "r2" : "h4" },
-				{ "col2", props.fp32_outputs ? "r3" : "h6" },
-				{ "col3", props.fp32_outputs ? "r4" : "h8" }
-			});
-
-			if (props.fp32_outputs || !props.supports_native_fp16)
-			{
-				enabled_options.push_back("_32_BIT_OUTPUT");
-			}
-
-			if (!props.fp32_outputs)
-			{
-				enabled_options.push_back("_ENABLE_FRAMEBUFFER_SRGB");
-			}
+			OS << "// Workaround for broken early discard in some drivers\n";
 
 			if (props.disable_early_discard)
 			{
-				enabled_options.push_back("_DISABLE_EARLY_DISCARD");
+				OS << "bool _fragment_discard = false;\n";
+				OS << "#define _kill() _fragment_discard = true\n\n";
 			}
-
-			if (props.ROP_output_rounding)
+			else
 			{
-				enabled_options.push_back("_ENABLE_ROP_OUTPUT_ROUNDING");
+				OS << "#define _kill() discard\n\n";
 			}
 
-			enabled_options.push_back("_ENABLE_POLYGON_STIPPLE");
+			if (props.require_texture_ops)
+			{
+				OS <<
+				// Declare special texture control flags
+				"#define GAMMA_R_MASK  (1 << " << rsx::texture_control_bits::GAMMA_R << ")\n"
+				"#define GAMMA_G_MASK  (1 << " << rsx::texture_control_bits::GAMMA_G << ")\n"
+				"#define GAMMA_B_MASK  (1 << " << rsx::texture_control_bits::GAMMA_B << ")\n"
+				"#define GAMMA_A_MASK  (1 << " << rsx::texture_control_bits::GAMMA_A << ")\n"
+				"#define EXPAND_R_MASK (1 << " << rsx::texture_control_bits::EXPAND_R << ")\n"
+				"#define EXPAND_G_MASK (1 << " << rsx::texture_control_bits::EXPAND_G << ")\n"
+				"#define EXPAND_B_MASK (1 << " << rsx::texture_control_bits::EXPAND_B << ")\n"
+				"#define EXPAND_A_MASK (1 << " << rsx::texture_control_bits::EXPAND_A << ")\n\n"
+
+				"#define ALPHAKILL    " << rsx::texture_control_bits::ALPHAKILL << "\n"
+				"#define RENORMALIZE  " << rsx::texture_control_bits::RENORMALIZE << "\n"
+				"#define DEPTH_FLOAT    " << rsx::texture_control_bits::DEPTH_FLOAT << "\n"
+				"#define GAMMA_CTRL_MASK  (GAMMA_R_MASK|GAMMA_G_MASK|GAMMA_B_MASK|GAMMA_A_MASK)\n"
+				"#define SIGN_EXPAND_MASK (EXPAND_R_MASK|EXPAND_G_MASK|EXPAND_B_MASK|EXPAND_A_MASK)\n\n";
+			}
 		}
 
-		// Import common header
-		program_common::define_glsl_switches(OS, enabled_options);
-		enabled_options.clear();
-
-		OS <<
-			#include "GLSLSnippets/RSXProg/RSXProgramCommon.glsl"
-		;
-
-		if (props.domain == glsl::program_domain::glsl_vertex_program)
+		if (props.require_lit_emulation)
 		{
-			if (props.require_explicit_invariance)
-			{
-				enabled_options.push_back("_FORCE_POSITION_INVARIANCE");
-			}
-
-			if (props.emulate_zclip_transform)
-			{
-				if (props.emulate_depth_clip_only)
-				{
-					enabled_options.push_back("_EMULATE_ZCLIP_XFORM_STANDARD");
-				}
-				else
-				{
-					enabled_options.push_back("_EMULATE_ZCLIP_XFORM_FALLBACK");
-				}
-			}
-
-			if (props.require_instanced_render)
-			{
-				enabled_options.push_back("_ENABLE_INSTANCED_CONSTANTS");
-			}
-
-			// Import vertex header
-			program_common::define_glsl_switches(OS, enabled_options);
-
 			OS <<
-				#include "GLSLSnippets/RSXProg/RSXVertexPrologue.glsl"
-			;
+			"vec4 lit_legacy(const in vec4 val)"
+			"{\n"
+			"	vec4 clamped_val = val;\n"
+			"	clamped_val.x = max(val.x, 0.);\n"
+			"	clamped_val.y = max(val.y, 0.);\n"
+			"	vec4 result;\n"
+			"	result.x = 1.;\n"
+			"	result.w = 1.;\n"
+			"	result.y = clamped_val.x;\n"
+			"	result.z = clamped_val.x > 0. ? exp(clamped_val.w * log(max(clamped_val.y, 0.0000000001))) : 0.;\n"
+			"	return result;\n"
+			"}\n\n";
+		}
+
+		if (props.domain == glsl::program_domain::glsl_vertex_program && props.emulate_zclip_transform)
+		{
+			if (props.emulate_depth_clip_only)
+			{
+				// Declare rcp_precise. Requires f64 support in the drivers.
+				// This is required to handle precision drift during division for extended depth range.
+				OS <<
+				"double rcp_precise(double x)\n"
+				"{\n"
+				"	double scaled = x * 0.0009765625;\n"
+				"	double inv = 1.0 / scaled;\n"
+				"	return inv * 0.0009765625;\n"
+				"}\n"
+				"\n"
+				// Technically the depth value here is the 'final' depth that should be stored in the Z buffer.
+				// Forward mapping eqn is d' = d * (f - n) + n, where d' is the stored Z value (this) and d is the normalized API value.
+				"vec4 apply_zclip_xform(const in vec4 pos, const in float near_plane, const in float far_plane)\n"
+				"{\n"
+				"	if (far_plane != 0.0 && pos.w != 0.0)\n"
+				"	{\n"
+				"		double z_range = (far_plane > near_plane)? (far_plane - near_plane) : far_plane;\n"
+				"		double inv_range = rcp_precise(z_range);\n"
+				"		float d = float(pos.z * rcp_precise(pos.w));\n"
+				"		float new_d = (d - near_plane) * float(inv_range);\n"
+				"		return vec4(pos.x, pos.y, (new_d * pos.w), pos.w);\n"
+				"	}\n"
+				"	else\n"
+				"	{\n"
+				"		return pos;\n" // Only values where Z=0 can ever pass this clip
+				"	}\n"
+				"}\n\n";
+			}
+			else
+			{
+				OS <<
+				"vec4 apply_zclip_xform(const in vec4 pos, const in float near_plane, const in float far_plane)\n"
+				"{\n"
+				"	float d = float(pos.z / pos.w);\n"
+				"	if (d < 0.f && d >= near_plane)\n"
+				"	{\n"
+				"		// Clamp\n"
+				"		d = 0.f;\n"
+				"	}\n"
+				"	else if (d > 1.f && d <= far_plane)\n"
+				"	{\n"
+				"		// Compress Z and store towards highest end of the range\n"
+				"		d = min(1., 0.99 + (0.01 * (pos.z - near_plane) / (far_plane - near_plane)));\n"
+				"	}\n"
+				"	else\n" // This catch-call also handles w=0 since d=inf
+				"	{\n"
+				"		return pos;\n"
+				"	}\n"
+				"\n"
+				"	return vec4(pos.x, pos.y, d * pos.w, pos.w);\n"
+				"}\n\n";
+			}
 
 			return;
 		}
 
+		program_common::insert_compare_op(OS, props.low_precision_tests);
+
 		if (props.emulate_coverage_tests)
 		{
-			enabled_options.push_back("_EMULATE_COVERAGE_TEST");
+			// Purely stochastic
+			OS <<
+			"bool coverage_test_passes(const in vec4 _sample, const in uint control)\n"
+			"{\n"
+			"	if (!_test_bit(control, 0)) return false;\n"
+			"\n"
+			"	float random  = _rand(gl_FragCoord);\n"
+			"	return (_sample.a > random);\n"
+			"}\n\n";
 		}
 
 		if (!props.fp32_outputs || props.require_linear_to_srgb)
 		{
-			enabled_options.push_back("_ENABLE_LINEAR_TO_SRGB");
+			OS <<
+			"vec4 linear_to_srgb(const in vec4 cl)\n"
+			"{\n"
+			"	vec4 low = cl * 12.92;\n"
+			"	vec4 high = 1.055 * pow(cl, vec4(1. / 2.4)) - 0.055;\n"
+			"	bvec4 select = lessThan(cl, vec4(0.0031308));\n"
+			"	return clamp(mix(high, low, select), 0., 1.);\n"
+			"}\n\n";
 		}
 
 		if (props.require_texture_ops || props.require_srgb_to_linear)
 		{
-			enabled_options.push_back("_ENABLE_SRGB_TO_LINEAR");
+			OS <<
+			"vec4 srgb_to_linear(const in vec4 cs)\n"
+			"{\n"
+			"	vec4 a = cs / 12.92;\n"
+			"	vec4 b = pow((cs + 0.055) / 1.055, vec4(2.4));\n"
+			"	return _select(a, b, greaterThan(cs, vec4(0.04045)));\n"
+			"}\n\n";
+		}
+
+		if (props.require_depth_conversion)
+		{
+			ensure(props.require_texture_ops);
+
+			//NOTE: Memory layout is fetched as byteswapped BGRA [GBAR] (GOW collection, DS2, DeS)
+			//The A component (Z) is useless (should contain stencil8 or just 1)
+			OS <<
+			"vec4 decode_depth24(const in float depth_value, const in bool depth_float)\n"
+			"{\n"
+			"	uint value;\n"
+			"	if (!depth_float)\n"
+			"		value = uint(depth_value * 16777215.);\n"
+			"	else\n"
+			"		value = _get_bits(floatBitsToUint(depth_value), 7, 24);\n"
+			"\n"
+			"	uint b = _get_bits(value, 0, 8);\n"
+			"	uint g = _get_bits(value, 8, 8);\n"
+			"	uint r = _get_bits(value, 16, 8);\n"
+			"	return vec4(float(g)/255., float(b)/255., 1., float(r)/255.);\n"
+			"}\n\n"
+
+			"vec4 remap_vector(const in vec4 color, const in uint remap)\n"
+			"{\n"
+			"	vec4 result;\n"
+			"	if (_get_bits(remap, 0, 8) == 0xE4)\n"
+			"	{\n"
+			"		result = color;\n"
+			"	}\n"
+			"	else\n"
+			"	{\n"
+			"		uvec4 remap_channel = uvec4(remap) >> uvec4(2, 4, 6, 0);\n"
+			"		remap_channel &= 3;\n"
+			"		remap_channel = (remap_channel + 3) % 4; // Map A-R-G-B to R-G-B-A\n\n"
+
+			"		// Generate remapped result\n"
+			"		result.a = color[remap_channel.a];\n"
+			"		result.r = color[remap_channel.r];\n"
+			"		result.g = color[remap_channel.g];\n"
+			"		result.b = color[remap_channel.b];\n"
+			"	}\n\n"
+
+			"	if (_get_bits(remap, 8, 8) == 0xAA)\n"
+			"		return result;\n\n"
+
+			"	uvec4 remap_select = uvec4(remap) >> uvec4(10, 12, 14, 8);\n"
+			"	remap_select &= 3;\n"
+			"	bvec4 choice = lessThan(remap_select, uvec4(2));\n"
+			"	return _select(result, vec4(remap_select), choice);\n"
+			"}\n\n"
+
+			"vec4 texture2DReconstruct(sampler2D tex, usampler2D stencil_tex, const in vec2 coord, const in uint remap, const in uint flags)\n"
+			"{\n"
+			"	vec4 result = decode_depth24(texture(tex, coord.xy).r, _test_bit(flags, DEPTH_FLOAT));\n"
+			"	result.z = float(texture(stencil_tex, coord.xy).x) / 255.f;\n\n"
+
+			"	if (remap == 0xAAE4)\n"
+			" 		return result;\n\n"
+
+			"	return remap_vector(result, remap);\n"
+			"}\n\n";
+		}
+
+		if (props.require_texture_ops)
+		{
+			OS <<
+
+#ifdef __APPLE__
+			"vec4 remap_vector(const in vec4 rgba, const in uint remap_bits)\n"
+			"{\n"
+			"	uvec4 selector = (uvec4(remap_bits) >> uvec4(3, 6, 9, 0)) & 0x7;\n"
+			"	bvec4 choice = greaterThan(selector, uvec4(1));\n"
+			"\n"
+			"	vec4 direct = vec4(selector);\n"
+			"	selector = min(selector - 2, selector);\n"
+			"	vec4 indexed = vec4(rgba[selector.r], rgba[selector.g], rgba[selector.b], rgba[selector.a]);\n"
+			"	return mix(direct, indexed, choice);\n"
+			"}\n\n"
+#endif
+
+			//TODO: Move all the texture read control operations here
+			"vec4 process_texel(in vec4 rgba, const in uint control_bits)\n"
+			"{\n"
+#ifdef __APPLE__
+			"	uint remap_bits = (control_bits >> 16) & 0xFFFF;\n"
+			"	if (remap_bits != 0x8D5) rgba = remap_vector(rgba, remap_bits);\n\n"
+#endif
+			"	if (control_bits == 0)\n"
+			"	{\n"
+			"		return rgba;\n"
+			"	}\n"
+			"\n"
+			"	if (_test_bit(control_bits, ALPHAKILL))\n"
+			"	{\n"
+			"		// Alphakill\n"
+			"		if (rgba.a < 0.000001)\n"
+			"		{\n"
+			"			_kill();\n"
+			"			return rgba;\n"
+			"		}\n"
+			"	}\n"
+			"\n"
+			"	if (_test_bit(control_bits, RENORMALIZE))\n"
+			"	{\n"
+			"		// Renormalize to 8-bit (PS3) accuracy\n"
+			"		rgba = floor(rgba * 255.);\n"
+			"		rgba /= 255.;"
+			"	}\n"
+			"\n"
+			"	uvec4 mask;\n"
+			"	vec4 convert;\n"
+			"	uint op_mask = control_bits & SIGN_EXPAND_MASK;\n"
+			"\n"
+			"	if (op_mask != 0)\n"
+			"	{\n"
+			"		// Expand to signed normalized\n"
+			"		mask = uvec4(op_mask) & uvec4(EXPAND_R_MASK, EXPAND_G_MASK, EXPAND_B_MASK, EXPAND_A_MASK);\n"
+			"		convert = (rgba * 2.f - 1.f);\n"
+			"		rgba = _select(rgba, convert, notEqual(mask, uvec4(0)));\n"
+			"	}\n"
+			"\n"
+			"	op_mask = control_bits & GAMMA_CTRL_MASK;\n"
+			"	if (op_mask != 0u)\n"
+			"	{\n"
+			"		// Gamma correction\n"
+			"		mask = uvec4(op_mask) & uvec4(GAMMA_R_MASK, GAMMA_G_MASK, GAMMA_B_MASK, GAMMA_A_MASK);\n"
+			"		convert = srgb_to_linear(rgba);\n"
+			"		return _select(rgba, convert, notEqual(mask, uvec4(0)));\n"
+			"	}\n"
+			"\n"
+			"	return rgba;\n"
+			"}\n\n";
+
+			if (props.require_texture_expand)
+			{
+				OS <<
+				"uint _texture_flag_override = 0;\n"
+				"#define _enable_texture_expand() _texture_flag_override = SIGN_EXPAND_MASK\n"
+				"#define _disable_texture_expand() _texture_flag_override = 0\n"
+				"#define TEX_FLAGS(index) (texture_parameters[index].flags | _texture_flag_override)\n";
+			}
+			else
+			{
+				OS <<
+				"#define TEX_FLAGS(index) texture_parameters[index].flags\n";
+			}
+
+			OS <<
+			"#define TEX_NAME(index) tex##index\n"
+			"#define TEX_NAME_STENCIL(index) tex##index##_stencil\n\n"
+
+			"#define COORD_SCALE1(index, coord1) ((coord1 + texture_parameters[index].scale_bias.w) * texture_parameters[index].scale_bias.x)\n"
+			"#define COORD_SCALE2(index, coord2) ((coord2 + texture_parameters[index].scale_bias.w) * texture_parameters[index].scale_bias.xy)\n"
+			"#define COORD_SCALE3(index, coord3) ((coord3 + texture_parameters[index].scale_bias.w) * texture_parameters[index].scale_bias.xyz)\n\n"
+
+			"#define TEX1D(index, coord1) process_texel(texture(TEX_NAME(index), COORD_SCALE1(index, coord1)), TEX_FLAGS(index))\n"
+			"#define TEX1D_BIAS(index, coord1, bias) process_texel(texture(TEX_NAME(index), COORD_SCALE1(index, coord1), bias), TEX_FLAGS(index))\n"
+			"#define TEX1D_LOD(index, coord1, lod) process_texel(textureLod(TEX_NAME(index), COORD_SCALE1(index, coord1), lod), TEX_FLAGS(index))\n"
+			"#define TEX1D_GRAD(index, coord1, dpdx, dpdy) process_texel(textureGrad(TEX_NAME(index), COORD_SCALE1(index, coord1), dpdx, dpdy), TEX_FLAGS(index))\n"
+			"#define TEX1D_PROJ(index, coord2) process_texel(textureProj(TEX_NAME(index), vec2(COORD_SCALE1(index, coord2.x), coord2.y)), TEX_FLAGS(index))\n"
+
+			"#define TEX2D(index, coord2) process_texel(texture(TEX_NAME(index), COORD_SCALE2(index, coord2)), TEX_FLAGS(index))\n"
+			"#define TEX2D_BIAS(index, coord2, bias) process_texel(texture(TEX_NAME(index), COORD_SCALE2(index, coord2), bias), TEX_FLAGS(index))\n"
+			"#define TEX2D_LOD(index, coord2, lod) process_texel(textureLod(TEX_NAME(index), COORD_SCALE2(index, coord2), lod), TEX_FLAGS(index))\n"
+			"#define TEX2D_GRAD(index, coord2, dpdx, dpdy) process_texel(textureGrad(TEX_NAME(index), COORD_SCALE2(index, coord2), dpdx, dpdy), TEX_FLAGS(index))\n"
+			"#define TEX2D_PROJ(index, coord4) process_texel(textureProj(TEX_NAME(index), vec4(COORD_SCALE2(index, coord4.xy), coord4.z, coord4.w)), TEX_FLAGS(index))\n"
+
+			"#define TEX2D_DEPTH_RGBA8(index, coord2) process_texel(texture2DReconstruct(TEX_NAME(index), TEX_NAME_STENCIL(index), COORD_SCALE2(index, coord2), texture_parameters[index].remap, TEX_FLAGS(index)), TEX_FLAGS(index))\n";
+
+			if (props.emulate_shadow_compare)
+			{
+				OS <<
+				"#define SHADOW_COORD(index, coord3) vec3(COORD_SCALE2(index, coord3.xy), _test_bit(TEX_FLAGS(index), DEPTH_FLOAT)? coord3.z : min(float(coord3.z), 1.0))\n"
+				"#define SHADOW_COORD4(index, coord4) vec4(SHADOW_COORD(index, coord4.xyz), coord4.w)\n"
+				"#define SHADOW_COORD_PROJ(index, coord4) vec4(COORD_SCALE2(index, coord4.xy), _test_bit(TEX_FLAGS(index), DEPTH_FLOAT)? coord4.z : min(coord4.z, coord4.w), coord4.w)\n\n"
+
+				"#define TEX2D_SHADOW(index, coord3) texture(TEX_NAME(index), SHADOW_COORD(index, coord3))\n"
+				"#define TEX2D_SHADOWCUBE(index, coord4) texture(TEX_NAME(index), SHADOW_COORD4(index, coord4))\n"
+				"#define TEX2D_SHADOWPROJ(index, coord4) textureProj(TEX_NAME(index), SHADOW_COORD_PROJ(index, coord4))\n";
+			}
+			else
+			{
+				OS <<
+				"#define TEX2D_SHADOW(index, coord3) texture(TEX_NAME(index), vec3(COORD_SCALE2(index, coord3.xy), coord3.z))\n"
+				"#define TEX2D_SHADOWCUBE(index, coord4) texture(TEX_NAME(index), vec4(COORD_SCALE3(index, coord4.xyz), coord4.w))\n"
+				"#define TEX2D_SHADOWPROJ(index, coord4) textureProj(TEX_NAME(index), vec4(COORD_SCALE2(index, coord4.xy), coord4.zw))\n";
+			}
+
+			OS <<
+			"#define TEX3D(index, coord3) process_texel(texture(TEX_NAME(index), COORD_SCALE3(index, coord3)), TEX_FLAGS(index))\n"
+			"#define TEX3D_BIAS(index, coord3, bias) process_texel(texture(TEX_NAME(index), COORD_SCALE3(index, coord3), bias), TEX_FLAGS(index))\n"
+			"#define TEX3D_LOD(index, coord3, lod) process_texel(textureLod(TEX_NAME(index), COORD_SCALE3(index, coord3), lod), TEX_FLAGS(index))\n"
+			"#define TEX3D_GRAD(index, coord3, dpdx, dpdy) process_texel(textureGrad(TEX_NAME(index), COORD_SCALE3(index, coord3), dpdx, dpdy), TEX_FLAGS(index))\n"
+			"#define TEX3D_PROJ(index, coord4) process_texel(textureProj(TEX_NAME(index), vec4(COORD_SCALE3(index, coord4.xyz), coord4.w)), TEX_FLAGS(index))\n\n";
 		}
 
 		if (props.require_wpos)
 		{
-			enabled_options.push_back("_ENABLE_WPOS");
-		}
-
-		if (props.require_fog_read)
-		{
-			program_common::define_glsl_constants<rsx::fog_mode>(OS,
-			{
-				{ "FOG_LINEAR    ", rsx::fog_mode::linear },
-				{ "FOG_EXP       ", rsx::fog_mode::exponential },
-				{ "FOG_EXP2      ", rsx::fog_mode::exponential2 },
-				{ "FOG_LINEAR_ABS", rsx::fog_mode::linear_abs },
-				{ "FOG_EXP_ABS   ", rsx::fog_mode::exponential_abs },
-				{ "FOG_EXP2_ABS  ", rsx::fog_mode::exponential2_abs },
-			});
-
-			enabled_options.push_back("_ENABLE_FOG_READ");
-		}
-
-		// Import fragment header
-		program_common::define_glsl_switches(OS, enabled_options);
-		enabled_options.clear();
-
-		OS <<
-			#include "GLSLSnippets/RSXProg/RSXFragmentPrologue.glsl"
-		;
-
-		if (props.require_texture_ops)
-		{
-			// Declare special texture control flags
-			program_common::define_glsl_constants<rsx::texture_control_bits>(OS,
-			{
-				{ "GAMMA_R_BIT " , rsx::texture_control_bits::GAMMA_R },
-				{ "GAMMA_G_BIT " , rsx::texture_control_bits::GAMMA_G },
-				{ "GAMMA_B_BIT " , rsx::texture_control_bits::GAMMA_B },
-				{ "GAMMA_A_BIT " , rsx::texture_control_bits::GAMMA_A },
-				{ "EXPAND_R_BIT" , rsx::texture_control_bits::EXPAND_R },
-				{ "EXPAND_G_BIT" , rsx::texture_control_bits::EXPAND_G },
-				{ "EXPAND_B_BIT" , rsx::texture_control_bits::EXPAND_B },
-				{ "EXPAND_A_BIT" , rsx::texture_control_bits::EXPAND_A },
-				{ "SEXT_R_BIT" , rsx::texture_control_bits::SEXT_R },
-				{ "SEXT_G_BIT" , rsx::texture_control_bits::SEXT_G },
-				{ "SEXT_B_BIT" , rsx::texture_control_bits::SEXT_B },
-				{ "SEXT_A_BIT" , rsx::texture_control_bits::SEXT_A },
-				{ "WRAP_S_BIT", rsx::texture_control_bits::WRAP_S },
-				{ "WRAP_T_BIT", rsx::texture_control_bits::WRAP_T },
-				{ "WRAP_R_BIT", rsx::texture_control_bits::WRAP_R },
-
-				{ "ALPHAKILL    ", rsx::texture_control_bits::ALPHAKILL },
-				{ "RENORMALIZE  ", rsx::texture_control_bits::RENORMALIZE },
-				{ "DEPTH_FLOAT  ", rsx::texture_control_bits::DEPTH_FLOAT },
-				{ "DEPTH_COMPARE", rsx::texture_control_bits::DEPTH_COMPARE_OP },
-				{ "FILTERED_MAG_BIT", rsx::texture_control_bits::FILTERED_MAG },
-				{ "FILTERED_MIN_BIT", rsx::texture_control_bits::FILTERED_MIN },
-				{ "INT_COORDS_BIT  ", rsx::texture_control_bits::UNNORMALIZED_COORDS },
-				{ "CLAMP_COORDS_BIT", rsx::texture_control_bits::CLAMP_TEXCOORDS_BIT }
-			});
-
-			if (props.require_texture_expand)
-			{
-				enabled_options.push_back("_ENABLE_TEXTURE_EXPAND");
-			}
-
-			if (props.emulate_shadow_compare)
-			{
-				enabled_options.push_back("_EMULATED_TEXSHADOW");
-			}
-
-			if (props.require_tex_shadow_ops)
-			{
-				enabled_options.push_back("_ENABLE_SHADOW");
-			}
-
-			if (props.require_tex1D_ops)
-			{
-				enabled_options.push_back("_ENABLE_TEX1D");
-			}
-
-			if (props.require_tex2D_ops)
-			{
-				enabled_options.push_back("_ENABLE_TEX2D");
-			}
-
-			if (props.require_tex3D_ops)
-			{
-				enabled_options.push_back("_ENABLE_TEX3D");
-			}
-
-			if (props.require_shadowProj_ops)
-			{
-				enabled_options.push_back("_ENABLE_SHADOWPROJ");
-			}
-
-			program_common::define_glsl_switches(OS, enabled_options);
-			enabled_options.clear();
-
 			OS <<
-				#include "GLSLSnippets/RSXProg/RSXFragmentTextureOps.glsl"
-			;
-
-			if (props.require_depth_conversion)
-			{
-				OS <<
-					#include "GLSLSnippets/RSXProg/RSXFragmentTextureDepthConversion.glsl"
-				;
-			}
-
-			if (props.require_msaa_ops)
-			{
-				OS <<
-					#include "GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOps.glsl"
-				;
-
-				// Generate multiple versions of the actual sampler code.
-				// We could use defines to generate these, but I don't trust some OpenGL compilers to do the right thing.
-				const std::string_view msaa_sampling_impl =
-					#include "GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOpsInternal.glsl"
-				;
-
-				OS << fmt::replace_all(msaa_sampling_impl, "_MSAA_SAMPLER_TYPE_", "sampler2DMS");
-				if (props.require_depth_conversion)
-				{
-					OS << fmt::replace_all(msaa_sampling_impl, "_MSAA_SAMPLER_TYPE_", "usampler2DMS");
-				}
-			}
+			"vec4 get_wpos()\n"
+			"{\n"
+			"	float abs_scale = abs(wpos_scale);\n"
+			"	return (gl_FragCoord * vec4(abs_scale, wpos_scale, 1., 1.)) + vec4(0., wpos_bias, 0., 0.);\n"
+			"}\n\n";
 		}
 	}
 
+	void insert_fog_declaration(std::ostream& OS)
+	{
+		program_common::insert_fog_declaration(OS, "vec4", "fog_c");
+	}
+
 	std::string getFunctionImpl(FUNCTION f)
 	{
 		switch (f)
 		{
 		default:
 			abort();
-		case FUNCTION::DP2:
+		case FUNCTION::FUNCTION_DP2:
 			return "$Ty(dot($0.xy, $1.xy))";
-		case FUNCTION::DP2A:
+		case FUNCTION::FUNCTION_DP2A:
 			return "$Ty(dot($0.xy, $1.xy) + $2.x)";
-		case FUNCTION::DP3:
+		case FUNCTION::FUNCTION_DP3:
 			return "$Ty(dot($0.xyz, $1.xyz))";
-		case FUNCTION::DP4:
+		case FUNCTION::FUNCTION_DP4:
 			return "$Ty(dot($0, $1))";
-		case FUNCTION::DPH:
+		case FUNCTION::FUNCTION_DPH:
 			return "$Ty(dot(vec4($0.xyz, 1.0), $1))";
-		case FUNCTION::SFL:
+		case FUNCTION::FUNCTION_SFL:
 			return "$Ty(0.)";
-		case FUNCTION::STR:
+		case FUNCTION::FUNCTION_STR:
 			return "$Ty(1.)";
-		case FUNCTION::FRACT:
+		case FUNCTION::FUNCTION_FRACT:
 			return "fract($0)";
-		case FUNCTION::REFL:
+		case FUNCTION::FUNCTION_REFL:
 			return "reflect($0, $1)";
-		case FUNCTION::TEXTURE_SAMPLE1D:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D:
 			return "TEX1D($_i, $0.x)";
-		case FUNCTION::TEXTURE_SAMPLE1D_BIAS:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_BIAS:
 			return "TEX1D_BIAS($_i, $0.x, $1.x)";
-		case FUNCTION::TEXTURE_SAMPLE1D_PROJ:
-			return "TEX1D_PROJ($_i, $0)";
-		case FUNCTION::TEXTURE_SAMPLE1D_LOD:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_PROJ:
+			return "TEX1D_PROJ($_i, $0.xy)";
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_LOD:
 			return "TEX1D_LOD($_i, $0.x, $1.x)";
-		case FUNCTION::TEXTURE_SAMPLE1D_GRAD:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_GRAD:
 			return "TEX1D_GRAD($_i, $0.x, $1.x, $2.x)";
-		case FUNCTION::TEXTURE_SAMPLE1D_SHADOW:
-		case FUNCTION::TEXTURE_SAMPLE1D_SHADOW_PROJ:
-			// Unimplemented
-			break;
-		case FUNCTION::TEXTURE_SAMPLE1D_DEPTH_RGBA:
-			return "TEX1D_Z24X8_RGBA8($_i, $0.x)";
-		case FUNCTION::TEXTURE_SAMPLE1D_DEPTH_RGBA_PROJ:
-			return "TEX1D_Z24X8_RGBA8($_i, ($0.x / $0.w))";
-		case FUNCTION::TEXTURE_SAMPLE2D:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D:
 			return "TEX2D($_i, $0.xy)";
-		case FUNCTION::TEXTURE_SAMPLE2D_BIAS:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_BIAS:
 			return "TEX2D_BIAS($_i, $0.xy, $1.x)";
-		case FUNCTION::TEXTURE_SAMPLE2D_PROJ:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_PROJ:
 			return "TEX2D_PROJ($_i, $0)";
-		case FUNCTION::TEXTURE_SAMPLE2D_LOD:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_LOD:
 			return "TEX2D_LOD($_i, $0.xy, $1.x)";
-		case FUNCTION::TEXTURE_SAMPLE2D_GRAD:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_GRAD:
 			return "TEX2D_GRAD($_i, $0.xy, $1.xy, $2.xy)";
-		case FUNCTION::TEXTURE_SAMPLE2D_SHADOW:
+		case FUNCTION::FUNCTION_TEXTURE_SHADOW2D:
 			return "TEX2D_SHADOW($_i, $0.xyz)";
-		case FUNCTION::TEXTURE_SAMPLE2D_SHADOW_PROJ:
+		case FUNCTION::FUNCTION_TEXTURE_SHADOWCUBE:
+			return "TEX2D_SHADOWCUBE($_i, $0)";
+		case FUNCTION::FUNCTION_TEXTURE_SHADOW2D_PROJ:
 			return "TEX2D_SHADOWPROJ($_i, $0)";
-		case FUNCTION::TEXTURE_SAMPLE2D_DEPTH_RGBA:
-			return "TEX2D_Z24X8_RGBA8($_i, $0.xy)";
-		case FUNCTION::TEXTURE_SAMPLE2D_DEPTH_RGBA_PROJ:
-			return "TEX2D_Z24X8_RGBA8($_i, ($0.xy / $0.w))";
-		case FUNCTION::TEXTURE_SAMPLE3D:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE:
 			return "TEX3D($_i, $0.xyz)";
-		case FUNCTION::TEXTURE_SAMPLE3D_BIAS:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_BIAS:
 			return "TEX3D_BIAS($_i, $0.xyz, $1.x)";
-		case FUNCTION::TEXTURE_SAMPLE3D_PROJ:
-			return "TEX3D_PROJ($_i, $0)";
-		case FUNCTION::TEXTURE_SAMPLE3D_LOD:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_PROJ:
+			return "TEX3D($_i, ($0.xyz / $0.w))";
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_LOD:
 			return "TEX3D_LOD($_i, $0.xyz, $1.x)";
-		case FUNCTION::TEXTURE_SAMPLE3D_GRAD:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_GRAD:
 			return "TEX3D_GRAD($_i, $0.xyz, $1.xyz, $2.xyz)";
-		case FUNCTION::TEXTURE_SAMPLE3D_SHADOW:
-			return "TEX3D_SHADOW($_i, $0)";
-		case FUNCTION::TEXTURE_SAMPLE3D_SHADOW_PROJ:
-			// Impossible
-			break;
-		case FUNCTION::TEXTURE_SAMPLE3D_DEPTH_RGBA:
-			return "TEX3D_Z24X8_RGBA8($_i, $0.xyz)";
-		case FUNCTION::TEXTURE_SAMPLE3D_DEPTH_RGBA_PROJ:
-			return "TEX3D_Z24X8_RGBA8($_i, ($0.xyz / $0.w))";
-		case FUNCTION::TEXTURE_SAMPLE2DMS:
-		case FUNCTION::TEXTURE_SAMPLE2DMS_BIAS:
-			return "TEX2D_MS($_i, $0.xy)";
-		case FUNCTION::TEXTURE_SAMPLE2DMS_PROJ:
-			return "TEX2D_MS($_i, $0.xy / $0.w)";
-		case FUNCTION::TEXTURE_SAMPLE2DMS_LOD:
-		case FUNCTION::TEXTURE_SAMPLE2DMS_GRAD:
-			return "TEX2D_MS($_i, $0.xy)";
-		case FUNCTION::TEXTURE_SAMPLE2DMS_SHADOW:
-			return "TEX2D_SHADOW_MS($_i, $0.xyz)";
-		case FUNCTION::TEXTURE_SAMPLE2DMS_SHADOW_PROJ:
-			return "TEX2D_SHADOWPROJ_MS($_i, $0)";
-		case FUNCTION::TEXTURE_SAMPLE2DMS_DEPTH_RGBA:
-			return "TEX2D_Z24X8_RGBA8_MS($_i, $0.xy)";
-		case FUNCTION::TEXTURE_SAMPLE2DMS_DEPTH_RGBA_PROJ:
-			return "TEX2D_Z24X8_RGBA8_MS($_i, ($0.xy / $0.w))";
-		case FUNCTION::DFDX:
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D:
+			return "TEX3D($_i, $0.xyz)";
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_BIAS:
+			return "TEX3D_BIAS($_i, $0.xyz, $1.x)";
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_PROJ:
+			return "TEX3D_PROJ($_i, $0)";
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_LOD:
+			return "TEX3D_LOD($_i, $0.xyz, $1.x)";
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_GRAD:
+			return "TEX3D_GRAD($_i, $0.xyz, $1.xyz, $2.xyz)";
+		case FUNCTION::FUNCTION_DFDX:
 			return "dFdx($0)";
-		case FUNCTION::DFDY:
+		case FUNCTION::FUNCTION_DFDY:
 			return "dFdy($0)";
-		case FUNCTION::VERTEX_TEXTURE_FETCH1D:
+		case FUNCTION::FUNCTION_VERTEX_TEXTURE_FETCH1D:
 			return "textureLod($t, $0.x, 0)";
-		case FUNCTION::VERTEX_TEXTURE_FETCH2D:
+		case FUNCTION::FUNCTION_VERTEX_TEXTURE_FETCH2D:
 			return "textureLod($t, $0.xy, 0)";
-		case FUNCTION::VERTEX_TEXTURE_FETCH3D:
-		case FUNCTION::VERTEX_TEXTURE_FETCHCUBE:
+		case FUNCTION::FUNCTION_VERTEX_TEXTURE_FETCH3D:
+		case FUNCTION::FUNCTION_VERTEX_TEXTURE_FETCHCUBE:
 			return "textureLod($t, $0.xyz, 0)";
-		case FUNCTION::VERTEX_TEXTURE_FETCH2DMS:
-			return "texelFetch($t, ivec2($0.xy * textureSize($t)), 0)";
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_DEPTH_RGBA:
+			return "TEX2D_DEPTH_RGBA8($_i, $0.xy)";
+		case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_DEPTH_RGBA_PROJ:
+			return "TEX2D_DEPTH_RGBA8($_i, ($0.xy / $0.w))";
 		}
-
-		rsx_log.error("Unexpected function request: %d", static_cast<int>(f));
-		return "$Ty(0.)";
 	}
 
 	void insert_subheader_block(std::ostream& OS)
@@ -539,113 +1001,12 @@ namespace glsl
 		// Global types and stuff
 		// Must be compatible with std140 packing rules
 		OS <<
-			#include "GLSLSnippets/RSXProg/RSXDefines2.glsl"
-		;
-	}
-
-	void insert_fragment_shader_inputs_block(
-		std::stringstream& OS,
-		const std::string_view ext_flavour,
-		const RSXFragmentProgram& prog,
-		const std::vector<ParamType>& params,
-		const two_sided_lighting_config& _2sided_lighting,
-		std::function<int(std::string_view)> varying_location)
-	{
-		struct _varying_register_config
-		{
-			int location;
-			std::string name;
-			std::string type;
-		};
-
-		std::vector<_varying_register_config> varying_list;
-
-		for (const ParamType& PT : params)
-		{
-			for (const ParamItem& PI : PT.items)
-			{
-				// ssa is defined in the program body and is not a varying type
-				if (PI.name == "ssa") continue;
-
-				const auto reg_location = varying_location(PI.name);
-				std::string var_name = PI.name;
-
-				if (var_name == "fogc")
-				{
-					var_name = "fog_c";
-				}
-				else if (prog.two_sided_lighting)
-				{
-					if (var_name == "diff_color")
-					{
-						var_name = "diff_color0";
-					}
-					else if (var_name == "spec_color")
-					{
-						var_name = "spec_color0";
-					}
-				}
-
-				varying_list.push_back({ reg_location, var_name, PT.type });
-			}
-		}
-
-		if (prog.two_sided_lighting)
-		{
-			if (_2sided_lighting.two_sided_color)
-			{
-				varying_list.push_back({ varying_location("diff_color1"), "diff_color1", "vec4" });
-			}
-
-			if (_2sided_lighting.two_sided_specular)
-			{
-				varying_list.push_back({ varying_location("spec_color1"), "spec_color1", "vec4" });
-			}
-		}
-
-		if (varying_list.empty())
-		{
-			return;
-		}
-
-		// Make the output a little nicer
-		std::sort(varying_list.begin(), varying_list.end(), FN(x.location < y.location));
-
-		if (!(prog.ctrl & RSX_SHADER_CONTROL_ATTRIBUTE_INTERPOLATION))
-		{
-			for (const auto& reg : varying_list)
-			{
-				OS << "layout(location=" << reg.location << ") in " << reg.type << " " << reg.name << ";\n";
-			}
-
-			OS << "\n";
-			return;
-		}
-
-		for (const auto& reg : varying_list)
-		{
-			OS << "layout(location=" << reg.location << ") pervertex" << ext_flavour << " in " << reg.type << " " << reg.name << "_raw[3];\n";
-		}
-
-		// Interpolate the input attributes manually.
-		// Matches AMD behavior where gl_BaryCoordSmoothAMD only provides x and y with z being autogenerated.
-		std::string interpolate_function_block =
-			"\n"
-			"vec4 _interpolate_varying3(const in vec4[3] v)\n"
-			"{\n"
-			// In the corner case where v[0] == v[1] == v[2], this algorithm generates a perfect result vs alternatives that use weighted multiply + add.
-			// Due to the finite precision of floating point arithmetic, adding together the result of different multiplies yeields a slightly inaccurate result which breaks things.
-			"	const vec4 p10 = v[1] - v[0];\n"
-			"	const vec4 p20 = v[2] - v[0];\n"
-			"	return v[0] + p10 * $gl_BaryCoord.y + p20 * $gl_BaryCoord.z;\n"
-			"}\n\n";
-		OS << fmt::replace_all(interpolate_function_block, {{ "$gl_BaryCoord", "gl_BaryCoord"s + std::string(ext_flavour) }});
-
-		for (const auto& reg : varying_list)
-		{
-			OS << "vec4 " << reg.name << " = _interpolate_varying3(" << reg.name << "_raw);\n";
-		}
-
-		OS << "\n";
+		"struct sampler_info\n"
+		"{\n"
+		"	vec4 scale_bias;\n"
+		"	uint remap;\n"
+		"	uint flags;\n"
+		"};\n"
+		"\n";
 	}
 }
diff --git a/rpcs3/Emu/RSX/Program/GLSLCommon.h b/rpcs3/Emu/RSX/Program/GLSLCommon.h
index 942374436e..292912b063 100644
--- a/rpcs3/Emu/RSX/Program/GLSLCommon.h
+++ b/rpcs3/Emu/RSX/Program/GLSLCommon.h
@@ -1,12 +1,9 @@
 #pragma once
 #include <sstream>
-#include <string_view>
 
 #include "GLSLTypes.h"
 #include "ShaderParam.h"
 
-struct RSXFragmentProgram;
-
 namespace rsx
 {
 	// TODO: Move this somewhere else once more compilers are supported other than glsl
@@ -22,86 +19,23 @@ namespace rsx
 		EXPAND_R,
 		EXPAND_G,
 		EXPAND_B,
-		SEXT_A,
-		SEXT_R,
-		SEXT_G,
-		SEXT_B,
 		DEPTH_FLOAT,
-		DEPTH_COMPARE_OP,
-		DEPTH_COMPARE_1,
-		DEPTH_COMPARE_2,
-		FILTERED_MAG,
-		FILTERED_MIN,
-		UNNORMALIZED_COORDS,
-		CLAMP_TEXCOORDS_BIT,
-		WRAP_S,
-		WRAP_T,
-		WRAP_R,
 
 		GAMMA_CTRL_MASK = (1 << GAMMA_R) | (1 << GAMMA_G) | (1 << GAMMA_B) | (1 << GAMMA_A),
 		EXPAND_MASK = (1 << EXPAND_R) | (1 << EXPAND_G) | (1 << EXPAND_B) | (1 << EXPAND_A),
-		EXPAND_OFFSET = EXPAND_A,
-		SEXT_MASK = (1 << SEXT_R) | (1 << SEXT_G) | (1 << SEXT_B) | (1 << SEXT_A),
-		SEXT_OFFSET = SEXT_A
+		EXPAND_OFFSET = EXPAND_A
 	};
+}
 
-	enum ROP_control_bits : u32
-	{
-		// Commands. These trigger explicit action.
-		ALPHA_TEST_ENABLE_BIT        = 0,
-		SRGB_FRAMEBUFFER_BIT         = 1,
-		ALPHA_TO_COVERAGE_ENABLE_BIT = 2,
-		POLYGON_STIPPLE_ENABLE_BIT   = 3,
-
-		// Auxilliary config
-		INT_FRAMEBUFFER_BIT          = 16,
-		MSAA_WRITE_ENABLE_BIT        = 17,
-
-		// Data
-		ALPHA_FUNC_OFFSET            = 18,
-		MSAA_SAMPLE_CTRL_OFFSET      = 21,
-
-		// Data lengths
-		ALPHA_FUNC_NUM_BITS          = 3,
-		MSAA_SAMPLE_CTRL_NUM_BITS    = 2,
-
-		// Meta
-		ROP_CMD_MASK                 = 0xF // Commands are encoded in the lower 16 bits
-	};
-
-	struct ROP_control_t
-	{
-		u32 value = 0;
-
-		void enable_alpha_test() { value |= (1u << ROP_control_bits::ALPHA_TEST_ENABLE_BIT); }
-		void enable_framebuffer_sRGB() { value |= (1u << ROP_control_bits::SRGB_FRAMEBUFFER_BIT); }
-		void enable_alpha_to_coverage() { value |= (1u << ROP_control_bits::ALPHA_TO_COVERAGE_ENABLE_BIT); }
-		void enable_polygon_stipple() { value |= (1u << ROP_control_bits::POLYGON_STIPPLE_ENABLE_BIT); }
-
-		void enable_framebuffer_INT() { value |= (1u << ROP_control_bits::INT_FRAMEBUFFER_BIT); }
-		void enable_MSAA_writes() { value |= (1u << ROP_control_bits::MSAA_WRITE_ENABLE_BIT); }
-
-		void set_alpha_test_func(uint func) { value |= (func << ROP_control_bits::ALPHA_FUNC_OFFSET); }
-		void set_msaa_control(uint ctrl) { value |= (ctrl << ROP_control_bits::MSAA_SAMPLE_CTRL_OFFSET); }
-	};
+namespace program_common
+{
+	void insert_compare_op(std::ostream& OS, bool low_precision);
+	void insert_compare_op_vector(std::ostream& OS);
+	void insert_fog_declaration(std::ostream& OS, const std::string& wide_vector_type, const std::string& input_coord, bool declare = false);
 }
 
 namespace glsl
 {
-	struct two_sided_lighting_config
-	{
-		bool two_sided_color;
-		bool two_sided_specular;
-	};
-
-	struct extension_flavour
-	{
-		static constexpr std::string_view
-			EXT = "EXT",
-			KHR = "KHR",
-			NV = "NV";
-	};
-
 	std::string getFloatTypeNameImpl(usz elementCount);
 	std::string getHalfTypeNameImpl(usz elementCount);
 	std::string compareFunctionImpl(COMPARE f, const std::string &Op0, const std::string &Op1, bool scalar = false);
@@ -109,14 +43,7 @@ namespace glsl
 	void insert_rop_init(std::ostream& OS);
 	void insert_rop(std::ostream& OS, const shader_properties& props);
 	void insert_glsl_legacy_function(std::ostream& OS, const shader_properties& props);
+	void insert_fog_declaration(std::ostream& OS);
 	std::string getFunctionImpl(FUNCTION f);
 	void insert_subheader_block(std::ostream& OS);
-
-	void insert_fragment_shader_inputs_block(
-		std::stringstream& OS,
-		const std::string_view bary_coords_extenstion_type,
-		const RSXFragmentProgram& prog,
-		const std::vector<ParamType>& params,
-		const two_sided_lighting_config& _2sided_lighting,
-		std::function<int(std::string_view)> varying_location);
 }
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToColorImage.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToColorImage.glsl
deleted file mode 100644
index 6be7ad3984..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToColorImage.glsl
+++ /dev/null
@@ -1,188 +0,0 @@
-R"(
-#version 450
-layout(local_size_x = %ws, local_size_y = 1, local_size_z = 1) in;
-
-#define IMAGE_LOCATION(x) (x + %image_slot)
-#define SSBO_LOCATION(x)  (x + %ssbo_slot)
-
-layout(%set, binding=IMAGE_LOCATION(0)) uniform writeonly restrict image2D output2D;
-
-#define FMT_GL_RGBA8                  0x8058
-#define FMT_GL_BGRA8                  0x80E1
-#define FMT_GL_R8                     0x8229
-#define FMT_GL_R16                    0x822A
-#define FMT_GL_R32F                   0x822E
-#define FMT_GL_RG8                    0x822B
-#define FMT_GL_RG8_SNORM              0x8F95
-#define FMT_GL_RG16                   0x822C
-#define FMT_GL_RG16F                  0x822F
-#define FMT_GL_RGBA16F                0x881A
-#define FMT_GL_RGBA32F                0x8814
-
-#define bswap_u16(bits) (bits & 0xFF) << 8 | (bits & 0xFF00) >> 8 | (bits & 0xFF0000) << 8 | (bits & 0xFF000000) >> 8
-#define bswap_u32(bits) (bits & 0xFF) << 24 | (bits & 0xFF00) << 8 | (bits & 0xFF0000) >> 8 | (bits & 0xFF000000) >> 24
-
-layout(%set, binding=SSBO_LOCATION(0), std430) readonly restrict buffer RawDataBlock
-{
-	uint data[];
-};
-
-#if USE_UBO
-layout(%push_block) uniform UnpackConfiguration
-{
-	uint swap_bytes;
-	uint src_pitch;
-	uint format;
-	uint reserved;
-	ivec2 region_offset;
-	ivec2 region_size;
-};
-#else
-	uniform uint swap_bytes;
-	uniform uint src_pitch;
-	uniform uint format;
-	uniform ivec2 region_offset;
-	uniform ivec2 region_size;
-#endif
-
-uint linear_invocation_id()
-{
-	uint size_in_x = (gl_NumWorkGroups.x * gl_WorkGroupSize.x);
-	return (gl_GlobalInvocationID.y * size_in_x) + gl_GlobalInvocationID.x;
-}
-
-ivec2 linear_id_to_output_coord(uint index)
-{
-	return ivec2(int(index % src_pitch), int(index / src_pitch));
-}
-
-// Decoders. Beware of multi-wide swapped types (e.g swap(16x2) != swap(32x1))
-uint readUint8(const in uint address)
-{
-	const uint block = address / 4;
-	const uint offset = address % 4;
-	return bitfieldExtract(data[block], int(offset) * 8, 8);
-}
-
-uint readUint16(const in uint address)
-{
-	const uint block = address / 2;
-	const uint offset = address % 2;
-	const uint value = bitfieldExtract(data[block], int(offset) * 16, 16);
-
-	if (swap_bytes != 0)
-	{
-		return bswap_u16(value);
-	}
-
-	return value;
-}
-
-uint readUint32(const in uint address)
-{
-	const uint value = data[address];
-	return (swap_bytes != 0) ? bswap_u32(value) : value;
-}
-
-uvec2 readUint8x2(const in uint address)
-{
-	const uint raw = readUint16(address);
-	return uvec2(bitfieldExtract(raw, 0, 8), bitfieldExtract(raw, 8, 8));
-}
-
-ivec2 readInt8x2(const in uint address)
-{
-	const ivec2 raw = ivec2(readUint8x2(address));
-	return raw - (ivec2(greaterThan(raw, ivec2(127))) * 256);
-}
-
-#define readFixed8(address) readUint8(address) / 255.f
-#define readFixed8x2(address) readUint8x2(address) / 255.f
-#define readFixed8x2Snorm(address) readInt8x2(address) / 127.f
-
-vec4 readFixed8x4(const in uint address)
-{
-	const uint raw = readUint32(address);
-	return uvec4(
-		bitfieldExtract(raw, 0, 8),
-		bitfieldExtract(raw, 8, 8),
-		bitfieldExtract(raw, 16, 8),
-		bitfieldExtract(raw, 24, 8)
-	) / 255.f;
-}
-
-#define readFixed16(address) readUint16(uint(address)) / 65535.f
-#define readFixed16x2(address) vec2(readFixed16(address * 2 + 0), readFixed16(address * 2 + 1))
-#define readFixed16x4(address) vec4(readFixed16(address * 4 + 0), readFixed16(address * 4 + 1), readFixed16(address * 4 + 2), readFixed16(address * 4 + 3))
-
-#define readFloat16(address) unpackHalf2x16(readUint16(uint(address))).x
-#define readFloat16x2(address) vec2(readFloat16(address * 2 + 0), readFloat16(address * 2 + 1))
-#define readFloat16x4(address) vec4(readFloat16(address * 4 + 0), readFloat16(address * 4 + 1), readFloat16(address * 4 + 2), readFloat16(address * 4 + 3))
-
-#define readFloat32(address) uintBitsToFloat(readUint32(address))
-#define readFloat32x4(address) uintBitsToFloat(uvec4(readUint32(address * 4 + 0), readUint32(address * 4 + 1), readUint32(address * 4 + 2), readUint32(address * 4 + 3)))
-
-#define KERNEL_SIZE %wks
-
-void write_output(const in uint invocation_id)
-{
-	vec4 outColor;
-	uint utmp;
-
-	switch (format)
-	{
-	// Simple color
-	case FMT_GL_RGBA8:
-		outColor = readFixed8x4(invocation_id);
-		break;
-	case FMT_GL_BGRA8:
-		outColor = readFixed8x4(invocation_id).bgra;
-		break;
-	case FMT_GL_R8:
-		outColor.r = readFixed8(invocation_id);
-		break;
-	case FMT_GL_R16:
-		outColor.r = readFixed16(invocation_id);
-		break;
-	case FMT_GL_R32F:
-		outColor.r = readFloat32(invocation_id);
-		break;
-	case FMT_GL_RG8:
-		outColor.rg = readFixed8x2(invocation_id);
-		break;
-	case FMT_GL_RG8_SNORM:
-		outColor.rg = readFixed8x2Snorm(invocation_id);
-		break;
-	case FMT_GL_RG16:
-		outColor.rg = readFixed16x2(invocation_id);
-		break;
-	case FMT_GL_RG16F:
-		outColor.rg = readFloat16x2(invocation_id);
-		break;
-	case FMT_GL_RGBA16F:
-		outColor = readFloat16x4(invocation_id);
-		break;
-	case FMT_GL_RGBA32F:
-		outColor = readFloat32x4(invocation_id);
-		break;
-	}
-
-	const ivec2 coord = linear_id_to_output_coord(invocation_id);
-	if (any(greaterThan(coord, region_size)))
-	{
-		return;
-	}
-
-	imageStore(output2D, coord + region_offset, outColor);
-}
-
-void main()
-{
-	uint index = linear_invocation_id() * KERNEL_SIZE;
-
-	for (int loop = 0; loop < KERNEL_SIZE; ++loop, ++index)
-	{
-		write_output(index);
-	}
-}
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToGenericImage.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToGenericImage.glsl
deleted file mode 100644
index 1dc3d520a0..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToGenericImage.glsl
+++ /dev/null
@@ -1,233 +0,0 @@
-R"(
-#version 430
-#extension GL_ARB_shader_stencil_export : enable
-
-#define ENABLE_DEPTH_STENCIL_LOAD %stencil_export_supported
-#define LEGACY_FORMAT_SUPPORT %legacy_format_support
-
-#define FMT_GL_DEPTH_COMPONENT16      0x81A5
-#define FMT_GL_DEPTH_COMPONENT32F     0x8CAC
-#define FMT_GL_DEPTH24_STENCIL8       0x88F0
-#define FMT_GL_DEPTH32F_STENCIL8      0x8CAD
-
-#if LEGACY_FORMAT_SUPPORT
-  #define FMT_GL_RGBA8                  0x8058
-  #define FMT_GL_BGRA8                  0x80E1
-  #define FMT_GL_R8                     0x8229
-  #define FMT_GL_R16                    0x822A
-  #define FMT_GL_R32F                   0x822E
-  #define FMT_GL_RG8                    0x822B
-  #define FMT_GL_RG8_SNORM              0x8F95
-  #define FMT_GL_RG16                   0x822C
-  #define FMT_GL_RG16F                  0x822F
-  #define FMT_GL_RGBA16F                0x881A
-  #define FMT_GL_RGBA32F                0x8814
-#endif
-
-#define FMT_GL_RGB565                 0x8D62
-#define FMT_GL_RGB5_A1                0x8057
-#define FMT_GL_BGR5_A1                0x99F0
-#define FMT_GL_RGBA4                  0x8056
-
-#define bswap_u16(bits) (bits & 0xFFu) << 8u | (bits & 0xFF00u) >> 8u | (bits & 0xFF0000u) << 8u | (bits & 0xFF000000u) >> 8u
-#define bswap_u32(bits) (bits & 0xFFu) << 24u | (bits & 0xFF00u) << 8u | (bits & 0xFF0000u) >> 8u | (bits & 0xFF000000u) >> 24u
-
-layout(location=0) out vec4 outColor;
-
-layout(%set, binding=%loc, std430) readonly restrict buffer RawDataBlock
-{
-	uint data[];
-};
-
-#if USE_UBO
-layout(%push_block) uniform UnpackConfiguration
-{
-	uint swap_bytes;
-	uint src_pitch;
-	uint format;
-};
-#else
-	uniform uint swap_bytes;
-	uniform uint src_pitch;
-	uniform uint format;
-#endif
-
-uint getTexelOffset()
-{
-	const ivec2 coords = ivec2(gl_FragCoord.xy);
-	return coords.y * src_pitch + coords.x;
-}
-
-// Decoders. Beware of multi-wide swapped types (e.g swap(16x2) != swap(32x1))
-uint readUint8(const in uint address)
-{
-	const uint block = address / 4;
-	const uint offset = address % 4;
-	return bitfieldExtract(data[block], int(offset) * 8, 8);
-}
-
-uint readUint16(const in uint address)
-{
-	const uint block = address / 2;
-	const uint offset = address % 2;
-	const uint value = bitfieldExtract(data[block], int(offset) * 16, 16);
-
-	if (swap_bytes != 0)
-	{
-		return bswap_u16(value);
-	}
-
-	return value;
-}
-
-uint readUint32(const in uint address)
-{
-	const uint value = data[address];
-	return (swap_bytes != 0) ? bswap_u32(value) : value;
-}
-
-uvec2 readUint24_8(const in uint address)
-{
-	const uint raw_value = readUint32(address);
-	return uvec2(
-		bitfieldExtract(raw_value, 8, 24),
-		bitfieldExtract(raw_value, 0, 8)
-	);
-}
-
-uvec2 readUint8x2(const in uint address)
-{
-	const uint raw = readUint16(address);
-	return uvec2(bitfieldExtract(raw, 0, 8), bitfieldExtract(raw, 8, 8));
-}
-
-ivec2 readInt8x2(const in uint address)
-{
-	const ivec2 raw = ivec2(readUint8x2(address));
-	return raw - (ivec2(greaterThan(raw, ivec2(127))) * 256);
-}
-
-#define readFixed8(address) readUint8(address) / 255.f
-#define readFixed8x2(address) readUint8x2(address) / 255.f
-#define readFixed8x2Snorm(address) readInt8x2(address) / 127.f
-
-vec4 readFixed8x4(const in uint address)
-{
-	const uint raw = readUint32(address);
-	return uvec4(
-		bitfieldExtract(raw, 0, 8),
-		bitfieldExtract(raw, 8, 8),
-		bitfieldExtract(raw, 16, 8),
-		bitfieldExtract(raw, 24, 8)
-	) / 255.f;
-}
-
-#define readFixed16(address) readUint16(uint(address)) / 65535.f
-#define readFixed16x2(address) vec2(readFixed16(address * 2 + 0), readFixed16(address * 2 + 1))
-#define readFixed16x4(address) vec4(readFixed16(address * 4 + 0), readFixed16(address * 4 + 1), readFixed16(address * 4 + 2), readFixed16(address * 4 + 3))
-
-#define readFloat16(address) unpackHalf2x16(readUint16(uint(address))).x
-#define readFloat16x2(address) vec2(readFloat16(address * 2 + 0), readFloat16(address * 2 + 1))
-#define readFloat16x4(address) vec4(readFloat16(address * 4 + 0), readFloat16(address * 4 + 1), readFloat16(address * 4 + 2), readFloat16(address * 4 + 3))
-
-#define readFloat32(address) uintBitsToFloat(readUint32(address))
-#define readFloat32x4(address) uintBitsToFloat(uvec4(readUint32(address * 4 + 0), readUint32(address * 4 + 1), readUint32(address * 4 + 2), readUint32(address * 4 + 3)))
-
-void main()
-{
-	const uint texel_address = getTexelOffset();
-	uint utmp;
-	uvec2 utmp2;
-
-	switch (format)
-	{
-	// Depth formats
-	case FMT_GL_DEPTH_COMPONENT16:
-		gl_FragDepth = readFixed16(texel_address);
-		break;
-	case FMT_GL_DEPTH_COMPONENT32F:
-		gl_FragDepth = readFloat16(texel_address);
-		break;
-
-#if ENABLE_DEPTH_STENCIL_LOAD
-
-	// Depth-stencil formats. Unsupported on NVIDIA due to missing extensions.
-	case FMT_GL_DEPTH24_STENCIL8:
-	case FMT_GL_DEPTH32F_STENCIL8:
-		utmp2 = readUint24_8(texel_address);
-		gl_FragDepth = float(utmp2.x) / 0xffffff;
-		gl_FragStencilRefARB = int(utmp2.y);
-		break;
-
-#endif
-
-#if LEGACY_FORMAT_SUPPORT
-
-	// Simple color. Provided for compatibility with old drivers.
-	case FMT_GL_RGBA8:
-		outColor = readFixed8x4(texel_address);
-		break;
-	case FMT_GL_BGRA8:
-		outColor = readFixed8x4(texel_address).bgra;
-		break;
-	case FMT_GL_R8:
-		outColor.r = readFixed8(texel_address);
-		break;
-	case FMT_GL_R16:
-		outColor.r = readFixed16(texel_address);
-		break;
-	case FMT_GL_R32F:
-		outColor.r = readFloat32(texel_address);
-		break;
-	case FMT_GL_RG8:
-		outColor.rg = readFixed8x2(texel_address);
-		break;
-	case FMT_GL_RG8_SNORM:
-		outColor.rg = readFixed8x2Snorm(texel_address);
-		break;
-	case FMT_GL_RG16:
-		outColor.rg = readFixed16x2(texel_address);
-		break;
-	case FMT_GL_RG16F:
-		outColor.rg = readFloat16x2(texel_address);
-		break;
-	case FMT_GL_RGBA16F:
-		outColor = readFloat16x4(texel_address);
-		break;
-	case FMT_GL_RGBA32F:
-		outColor = readFloat32x4(texel_address);
-		break;
-
-#endif
-
-	// Packed color
-	case FMT_GL_RGB565:
-		utmp = readUint16(texel_address);
-		outColor.b = bitfieldExtract(utmp, 0, 5) / 31.f;
-		outColor.g = bitfieldExtract(utmp, 5, 6) / 63.f;
-		outColor.r = bitfieldExtract(utmp, 11, 5) / 31.f;
-		break;
-	case FMT_GL_BGR5_A1:
-		utmp = readUint16(texel_address);
-		outColor.b = bitfieldExtract(utmp, 0, 5) / 31.f;
-		outColor.g = bitfieldExtract(utmp, 5, 5) / 31.f;
-		outColor.r = bitfieldExtract(utmp, 10, 5) / 31.f;
-		outColor.a = bitfieldExtract(utmp, 15, 1) * 1.f;
-		break;
-	case FMT_GL_RGB5_A1:
-		utmp = readUint16(texel_address);
-		outColor.a = bitfieldExtract(utmp, 0, 1) * 1.f;
-		outColor.b = bitfieldExtract(utmp, 1, 5) / 31.f;
-		outColor.g = bitfieldExtract(utmp, 6, 5) / 31.f;
-		outColor.r = bitfieldExtract(utmp, 11, 5) / 31.f;
-		break;
-	case FMT_GL_RGBA4:
-		utmp = readUint16(texel_address);
-		outColor.b = bitfieldExtract(utmp, 0, 4) / 15.f;
-		outColor.g = bitfieldExtract(utmp, 4, 4) / 15.f;
-		outColor.r = bitfieldExtract(utmp, 8, 4) / 15.f;
-		outColor.a = bitfieldExtract(utmp, 12, 4) / 15.f;
-		break;
-	}
-}
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyD24x8ToBuffer.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyD24x8ToBuffer.glsl
deleted file mode 100644
index afcac4b38e..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyD24x8ToBuffer.glsl
+++ /dev/null
@@ -1,78 +0,0 @@
-R"(
-#version 450
-layout(local_size_x = %ws, local_size_y = 1, local_size_z = 1) in;
-
-#define IMAGE_LOCATION(x) (x + %loc)
-#define SSBO_LOCATION IMAGE_LOCATION(2)
-
-#define bswap_u32(bits) (bits & 0xFFu) << 24u | (bits & 0xFF00u) << 8u | (bits & 0xFF0000u) >> 8u | (bits & 0xFF000000u) >> 24u
-
-layout(%set, binding=IMAGE_LOCATION(0)) uniform sampler2D depthData;
-layout(%set, binding=IMAGE_LOCATION(1)) uniform usampler2D stencilData;
-
-layout(%set, binding=SSBO_LOCATION, std430) writeonly restrict buffer OutputBlock
-{
-	uint data[];
-};
-
-#if USE_UBO
-layout(%push_block) uniform Configuration
-{
-	uint swap_bytes;
-	uint output_pitch;
-	ivec2 region_offset;
-	ivec2 region_size;
-};
-#else
-	uniform uint swap_bytes;
-	uniform uint output_pitch;
-	uniform ivec2 region_offset;
-	uniform ivec2 region_size;
-#endif
-
-#define KERNEL_SIZE %wks
-
-uint linear_invocation_id()
-{
-	uint size_in_x = (gl_NumWorkGroups.x * gl_WorkGroupSize.x);
-	return (gl_GlobalInvocationID.y * size_in_x) + gl_GlobalInvocationID.x;
-}
-
-ivec2 linear_id_to_input_coord(uint index)
-{
-	return ivec2(int(index % region_size.x), int(index / output_pitch)) + region_offset;
-}
-
-uint input_coord_to_output_id(ivec2 coord)
-{
-	coord -= region_offset;
-	return coord.y * output_pitch + coord.x;
-}
-
-void main()
-{
-	uint index = linear_invocation_id() * KERNEL_SIZE;
-
-	for (int loop = 0; loop < KERNEL_SIZE; ++loop, ++index)
-	{
-		if (index > (region_size.x * region_size.y))
-		{
-			return;
-		}
-
-		ivec2 coord = linear_id_to_input_coord(index);
-		float depth = texelFetch(depthData, coord, 0).x;
-		uint stencil = texelFetch(stencilData, coord, 0).x;
-		uint depth_bytes = uint(depth * 0xffffff);
-		uint value = (depth_bytes << 8) | stencil;
-
-		if (swap_bytes != 0)
-		{
-			// PS3-style byteswap (full word). PC byteswap is slightly different.
-			value = bswap_u32(value);
-		}
-
-		data[input_coord_to_output_id(coord)] = value;
-	}
-}
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyRGBA8ToBuffer.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyRGBA8ToBuffer.glsl
deleted file mode 100644
index ceb1e2f432..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyRGBA8ToBuffer.glsl
+++ /dev/null
@@ -1,86 +0,0 @@
-R"(
-#version 450
-layout(local_size_x = %ws, local_size_y = 1, local_size_z = 1) in;
-
-#define IMAGE_LOCATION(x) (x + %loc)
-#define SSBO_LOCATION IMAGE_LOCATION(1)
-
-layout(%set, binding=IMAGE_LOCATION(0)) uniform sampler2D colorData;
-layout(%set, binding=SSBO_LOCATION, std430) writeonly restrict buffer OutputBlock
-{
-	uint data[];
-};
-
-#if USE_UBO
-layout(%push_block) uniform Configuration
-{
-	uint swap_bytes;
-	uint output_pitch;
-	uint block_width;
-	uint is_bgra;
-	ivec2 region_offset;
-	ivec2 region_size;
-};
-#else
-	uniform uint swap_bytes;
-	uniform uint output_pitch;
-	uniform uint block_width;
-	uniform uint is_bgra;
-	uniform ivec2 region_offset;
-	uniform ivec2 region_size;
-#endif
-
-#define KERNEL_SIZE %wks
-
-uint linear_invocation_id()
-{
-	uint size_in_x = (gl_NumWorkGroups.x * gl_WorkGroupSize.x);
-	return (gl_GlobalInvocationID.y * size_in_x) + gl_GlobalInvocationID.x;
-}
-
-ivec2 linear_id_to_input_coord(uint index)
-{
-	return ivec2(int(index % region_size.x), int(index / output_pitch)) + region_offset;
-}
-
-uint input_coord_to_output_id(ivec2 coord)
-{
-	coord -= region_offset;
-	return coord.y * output_pitch + coord.x;
-}
-
-void main()
-{
-	uint index = linear_invocation_id() * KERNEL_SIZE;
-
-	for (int loop = 0; loop < KERNEL_SIZE; ++loop, ++index)
-	{
-		if (index > uint(region_size.x * region_size.y))
-		{
-			return;
-		}
-
-		ivec2 coord = linear_id_to_input_coord(index);
-		vec4 color = texelFetch(colorData, coord, 0);
-
-		if (is_bgra != 0)
-		{
-			color = color.bgra;
-		}
-
-		// Specific to 8-bit color in ARGB8 format. Need to generalize later
-		if (swap_bytes != 0 && block_width > 1)
-		{
-			color = (block_width == 4) ?
-				color.wzyx :
-				color.yxwz;
-		}
-
-		uvec4 bytes = uvec4(color * 255);
-		uint result = bytes.x | (bytes.y << 8u) | (bytes.z << 16u) | (bytes.w << 24u); // UINT_8_8_8_8_REV
-
-		uint output_id = input_coord_to_output_id(coord);
-		data[output_id] = result;
-	}
-}
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/GPUDeswizzle.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/GPUDeswizzle.glsl
deleted file mode 100644
index c2d679db6e..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/GPUDeswizzle.glsl
+++ /dev/null
@@ -1,129 +0,0 @@
-R"(
-#version 450
-
-#define SSBO_LOCATION(x) (x + %loc)
-
-layout(local_size_x = %ws, local_size_y = 1, local_size_z = 1) in;
-
-layout(%set, binding=SSBO_LOCATION(0), std430) buffer ssbo0{ uint data_in[]; };
-layout(%set, binding=SSBO_LOCATION(1), std430) buffer ssbo1{ uint data_out[]; };
-layout(%push_block) uniform parameters
-{
-	uint image_width;
-	uint image_height;
-	uint image_depth;
-	uint image_logw;
-	uint image_logh;
-	uint image_logd;
-	uint lod_count;
-};
-
-struct invocation_properties
-{
-	uint data_offset;
-	uvec3 size;
-	uvec3 size_log2;
-};
-
-#define bswap_u16(bits) (bits & 0xFF) << 8 | (bits & 0xFF00) >> 8 | (bits & 0xFF0000) << 8 | (bits & 0xFF000000) >> 8
-#define bswap_u32(bits) (bits & 0xFF) << 24 | (bits & 0xFF00) << 8 | (bits & 0xFF0000) >> 8 | (bits & 0xFF000000) >> 24
-
-invocation_properties invocation;
-
-bool init_invocation_properties(const in uint offset)
-{
-	invocation.data_offset = 0;
-	invocation.size.x = image_width;
-	invocation.size.y = image_height;
-	invocation.size.z = image_depth;
-	invocation.size_log2.x = image_logw;
-	invocation.size_log2.y = image_logh;
-	invocation.size_log2.z = image_logd;
-	uint level_end = image_width * image_height * image_depth;
-	uint level = 1;
-
-	while (offset >= level_end && level < lod_count)
-	{
-		invocation.data_offset = level_end;
-		invocation.size.xy /= 2;
-		invocation.size.xy = max(invocation.size.xy, uvec2(1));
-		invocation.size_log2.xy = max(invocation.size_log2.xy, uvec2(1));
-		invocation.size_log2.xy --;
-		level_end += (invocation.size.x * invocation.size.y * image_depth);
-		level++;
-	}
-
-	return (offset < level_end);
-}
-
-uint get_z_index(const in uint x_, const in uint y_, const in uint z_)
-{
-	uint offset = 0;
-	uint shift = 0;
-	uint x = x_;
-	uint y = y_;
-	uint z = z_;
-	uint log2w = invocation.size_log2.x;
-	uint log2h = invocation.size_log2.y;
-	uint log2d = invocation.size_log2.z;
-
-	do
-	{
-		if (log2w > 0)
-		{
-			offset |= (x & 1) << shift;
-			shift++;
-			x >>= 1;
-			log2w--;
-		}
-
-		if (log2h > 0)
-		{
-			offset |= (y & 1) << shift;
-			shift++;
-			y >>= 1;
-			log2h--;
-		}
-
-		if (log2d > 0)
-		{
-			offset |= (z & 1) << shift;
-			shift++;
-			z >>= 1;
-			log2d--;
-		}
-	}
-	while(x > 0 || y > 0 || z > 0);
-
-	return offset;
-}
-
-void main()
-{
-	uint invocations_x = (gl_NumWorkGroups.x * gl_WorkGroupSize.x);
-	uint texel_id = (gl_GlobalInvocationID.y * invocations_x) + gl_GlobalInvocationID.x;
-	uint word_count = %_wordcount;
-
-	if (!init_invocation_properties(texel_id))
-		return;
-
-	// Calculations done in texels, not bytes
-	uint row_length = invocation.size.x;
-	uint slice_length = (invocation.size.y * row_length);
-	uint level_offset = (texel_id - invocation.data_offset);
-	uint slice_offset = (level_offset % slice_length);
-	uint z = (level_offset / slice_length);
-	uint y = (slice_offset / row_length);
-	uint x = (slice_offset % row_length);
-
-	uint src_texel_id = get_z_index(x, y, z);
-	uint dst_id = (texel_id * word_count);
-	uint src_id = (src_texel_id + invocation.data_offset) * word_count;
-
-	for (uint i = 0; i < word_count; ++i)
-	{
-		uint value = data_in[src_id++];
-		data_out[dst_id++] = %f(value);
-	}
-}
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/GenericVSPassthrough.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/GenericVSPassthrough.glsl
deleted file mode 100644
index b57ad58cbc..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/GenericVSPassthrough.glsl
+++ /dev/null
@@ -1,26 +0,0 @@
-R"(
-#version 420
-#extension GL_ARB_separate_shader_objects: enable
-
-layout(location=0) out vec2 tc0;
-
-#ifdef VULKAN
-#define gl_VertexID gl_VertexIndex
-#endif
-
-void main()
-{
-	vec2 positions[] = {vec2(-1., -1.), vec2(1., -1.), vec2(-1., 1.), vec2(1., 1.)};
-#ifdef VULKAN
-	// Origin at top left
-	vec2 coords[] = {vec2(0., 0.), vec2(1., 0.), vec2(0., 1.), vec2(1., 1.)};
-#else
-	// Origin at bottom left. Flip Y coordinate.
-	vec2 coords[] = {vec2(0., 1.), vec2(1., 1.), vec2(0., 0.), vec2(1., 0.)};
-#endif
-
-	tc0 = coords[gl_VertexID % 4];
-	vec2 pos = positions[gl_VertexID % 4];
-	gl_Position = vec4(pos, 0., 1.);
-}
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl
deleted file mode 100644
index 84fdfdb8b7..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl
+++ /dev/null
@@ -1,149 +0,0 @@
-R"(
-#version 420
-#extension GL_ARB_separate_shader_objects : enable
-
-%preprocessor
-
-#ifdef VULKAN
-#define USE_UBO 1
-#endif
-
-#define SAMPLER_MODE_NONE      0
-#define SAMPLER_MODE_FONT2D    1
-#define SAMPLER_MODE_FONT3D    2
-#define SAMPLER_MODE_TEXTURE2D 3
-
-#ifdef VULKAN
-	layout(set=0, binding=0) uniform sampler2D fs0;
-	layout(set=0, binding=1) uniform sampler2DArray fs1;
-#else
-	layout(binding=31) uniform sampler2D fs0;
-	layout(binding=30) uniform sampler2DArray fs1;
-#endif
-
-layout(location=0) in vec2 tc0;
-layout(location=1) in vec4 color;
-layout(location=2) in vec4 clip_rect;
-
-layout(location=0) out vec4 ocol;
-
-#if USE_UBO
-layout(%push_block) uniform FragmentConfiguration
-{
-	%push_block_offset
-	uint fragment_config;
-	float timestamp;
-	float blur_intensity;
-};
-#else
-	uniform uint fragment_config;
-	uniform float timestamp;
-	uniform float blur_intensity;
-#endif
-
-struct config_t
-{
-	bool clip_fragments;
-	bool use_pulse_glow;
-	uint sampler_mode;
-};
-
-config_t unpack_fragment_options()
-{
-	config_t result;
-	result.clip_fragments = bitfieldExtract(fragment_config, 0, 1) != 0;
-	result.use_pulse_glow = bitfieldExtract(fragment_config, 1, 1) != 0;
-	result.sampler_mode = bitfieldExtract(fragment_config, 2, 2);
-	return result;
-}
-
-vec4 blur_sample(sampler2D tex, vec2 coord, vec2 tex_offset)
-{
-	vec2 coords[9];
-	coords[0] = coord - tex_offset;
-	coords[1] = coord + vec2(0., -tex_offset.y);
-	coords[2] = coord + vec2(tex_offset.x, -tex_offset.y);
-	coords[3] = coord + vec2(-tex_offset.x, 0.);
-	coords[4] = coord;
-	coords[5] = coord + vec2(tex_offset.x, 0.);
-	coords[6] = coord + vec2(-tex_offset.x, tex_offset.y);
-	coords[7] = coord + vec2(0., tex_offset.y);
-	coords[8] = coord + tex_offset;
-
-	float weights[9] =
-	{
-		1., 2., 1.,
-		2., 4., 2.,
-		1., 2., 1.
-	};
-
-	vec4 blurred = vec4(0.);
-	for (int n = 0; n < 9; ++n)
-	{
-		blurred += texture(tex, coords[n]) * weights[n];
-	}
-
-	return blurred / 16.f;
-}
-
-vec4 sample_image(sampler2D tex, vec2 coord, float blur_strength)
-{
-	vec4 original = texture(tex, coord);
-	if (blur_strength == 0) return original;
-
-	vec2 constraints = 1.f / vec2(640, 360);
-	vec2 res_offset = 1.f / textureSize(fs0, 0);
-	vec2 tex_offset = max(res_offset, constraints);
-
-	// Sample triangle pattern and average
-	// TODO: Nicer looking gaussian blur with less sampling
-	vec4 blur0 = blur_sample(tex, coord + vec2(-res_offset.x, 0.), tex_offset);
-	vec4 blur1 = blur_sample(tex, coord + vec2(res_offset.x, 0.), tex_offset);
-	vec4 blur2 = blur_sample(tex, coord + vec2(0., res_offset.y), tex_offset);
-
-	vec4 blurred = blur0 + blur1 + blur2;
-	blurred /= 3.;
-	return mix(original, blurred, blur_strength);
-}
-
-void main()
-{
-	config_t config = unpack_fragment_options();
-	if (config.clip_fragments)
-	{
-		if (gl_FragCoord.x < clip_rect.x || gl_FragCoord.x > clip_rect.z ||
-			gl_FragCoord.y < clip_rect.y || gl_FragCoord.y > clip_rect.w)
-		{
-			discard;
-			return;
-		}
-	}
-
-	vec4 diff_color = color;
-	if (config.use_pulse_glow)
-	{
-		diff_color.a *= (sin(timestamp) + 1.f) * 0.5f;
-	}
-
-	switch (config.sampler_mode)
-	{
-	default:
-	case SAMPLER_MODE_NONE:
-		ocol = diff_color;
-		break;
-	case SAMPLER_MODE_FONT2D:
-		ocol = texture(fs0, tc0).rrrr * diff_color;
-		break;
-	case SAMPLER_MODE_FONT3D:
-		ocol = texture(fs1, vec3(tc0.x, fract(tc0.y), trunc(tc0.y))).rrrr * diff_color;
-		break;
-	case SAMPLER_MODE_TEXTURE2D:
-#ifdef VULKAN
-		ocol = sample_image(fs0, tc0, blur_intensity).bgra * diff_color;
-#else
-		ocol = sample_image(fs0, tc0, blur_intensity).rgba * diff_color;
-#endif
-		break;
-	}
-}
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderVS.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderVS.glsl
deleted file mode 100644
index f0c4844aa0..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderVS.glsl
+++ /dev/null
@@ -1,81 +0,0 @@
-R"(
-#version 450
-#extension GL_ARB_separate_shader_objects : enable
-
-%preprocessor
-
-#ifdef VULKAN
-	#define USE_UBO 1
-#endif
-
-layout(location=0) in vec4 in_pos;
-layout(location=0) out vec2 tc0;
-layout(location=1) out vec4 color;
-layout(location=2) out vec4 clip_rect;
-
-#if USE_UBO
-layout(%push_block) uniform Configuration
-{
-	vec4 ui_scale;
-	vec4 albedo;
-	vec4 viewport;
-	vec4 clip_bounds;
-	uint vertex_config;
-};
-#else
-	uniform vec4 ui_scale;
-	uniform vec4 albedo;
-	uniform vec4 viewport;
-	uniform vec4 clip_bounds;
-	uniform uint vertex_config;
-#endif
-
-struct config_t
-{
-	bool no_vertex_snap;
-};
-
-config_t unpack_vertex_options()
-{
-	config_t result;
-	result.no_vertex_snap = bitfieldExtract(vertex_config, 0, 1) != 0;
-	return result;
-}
-
-vec2 snap_to_grid(const in vec2 normalized)
-{
-	return floor(fma(normalized, viewport.xy, vec2(0.5))) / viewport.xy;
-}
-
-vec4 clip_to_ndc(const in vec4 coord)
-{
-	vec4 ret = (coord * ui_scale.zwzw) / ui_scale.xyxy;
-#ifndef VULKAN
-	// Flip Y for OpenGL
-	ret.yw = 1. - ret.yw;
-#endif
-	return ret;
-}
-
-vec4 ndc_to_window(const in vec4 coord)
-{
-	return fma(coord, viewport.xyxy, viewport.zwzw);
-}
-
-void main()
-{
-	tc0.xy = in_pos.zw;
-	color = albedo;
-	clip_rect = ndc_to_window(clip_to_ndc(clip_bounds));
-
-	vec4 pos = vec4(clip_to_ndc(in_pos).xy, 0.5, 1.);
-	config_t config = unpack_vertex_options();
-
-	if (!config.no_vertex_snap)
-	{
-		pos.xy = snap_to_grid(pos.xy);
-	}
-
-	gl_Position = (pos + pos) - 1.;
-}
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXMemoryTiling.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXMemoryTiling.glsl
deleted file mode 100644
index 9960bde3cd..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXMemoryTiling.glsl
+++ /dev/null
@@ -1,354 +0,0 @@
-R"(
-#version 450
-layout(local_size_x = %ws, local_size_y = 1, local_size_z = 1) in;
-
-#define SSBO_LOCATION(x) (x + %loc)
-
-#define MEMORY_OP %op
-#define MEMORY_OP_DETILE 0
-#define MEMORY_OP_TILE   1
-
-#if (MEMORY_OP == MEMORY_OP_TILE)
-  #define TILED_DATA_MODIFIER
-  #define LINEAR_DATA_MODIFIER readonly
-#else
-  #define TILED_DATA_MODIFIER readonly
-  #define LINEAR_DATA_MODIFIER
-#endif
-
-layout(%set, binding=SSBO_LOCATION(0), std430) TILED_DATA_MODIFIER restrict buffer TiledDataBlock
-{
-	uint tiled_data[];
-};
-
-layout(%set, binding=SSBO_LOCATION(1), std430) LINEAR_DATA_MODIFIER restrict buffer LinearDataBlock
-{
-	uint linear_data[];
-};
-
-#ifdef VULKAN
-layout(%push_block) uniform Configuration
-{
-	uint prime;                       /* Prime factor derived from the number of tiles per row */
-	uint factor;                      /* Counterpart to the prime value. prime * factor = tiles per row. */
-	uint num_tiles_per_row;           /* Pitch / tile-width. Each "tile" is 256 bytes long */
-	uint tile_base_address;           /* Base address for this tile. */
-	uint tile_size;                   /* Size of the whole tile. */
-	uint tile_address_offset;         /* Address offset where the texture region sits. */
-	uint tile_rw_offset;              /* Access offset. If we load the entire tile then this is 0, but can be a multiple of pitch if we skip some rows for performance reasons. */
-	uint tile_pitch;                  /* Row length in bytes for every line in the tile and consequently the image. */
-	uint tile_bank;                   /* Bank sense offset. Acts as a memory-subsystem bias so that different FBOS can make use of different parts of the circuitry */
-	uint image_width;                 /* Width of the linear 2D region we're encoding/decoding */
-	uint image_height;                /* Height of the linear 2D region to encode/decode */
-	uint image_pitch;                 /* Image pitch. The incoming data may be from a GPU operation with packed pixels which can have a different pitch than the tile we're writing from/to */
-	uint image_bpp;                   /* Texel width of the image format. */
-};
-#else
-	uniform uint prime;               /* Prime factor derived from the number of tiles per row */
-	uniform uint factor;              /* Counterpart to the prime value. prime * factor = tiles per row. */
-	uniform uint num_tiles_per_row;   /* Pitch / tile-width. Each "tile" is 256 bytes long */
-	uniform uint tile_base_address;   /* Base address for this tile. */
-	uniform uint tile_size;           /* Size of the whole tile. */
-	uniform uint tile_address_offset; /* Address offset where the texture region sits. */
-	uniform uint tile_rw_offset;      /* Access offset. If we load the entire tile then this is 0, but can be a multiple of pitch if we skip some rows for performance reasons. */
-	uniform uint tile_pitch;          /* Row length in bytes for every line in the tile and consequently the image. */
-	uniform uint tile_bank;           /* Bank sense offset. Acts as a memory-subsystem bias so that different FBOS can make use of different parts of the circuitry */
-	uniform uint image_width;         /* Width of the linear 2D region we're encoding/decoding */
-	uniform uint image_height;        /* Height of the linear 2D region to encode/decode */
-	uniform uint image_pitch;         /* Image pitch. The incoming data may be from a GPU operation with packed pixels which can have a different pitch than the tile we're writing from/to */
-	uniform uint image_bpp;           /* Texel width of the image format. */
-#endif
-
-// Hard constants, set by hardware
-#define RSX_TILE_WIDTH  256
-#define RSX_TILE_HEIGHT 64
-
-#if (MEMORY_OP == MEMORY_OP_TILE)
-
-uvec4 read_linear(const in uint offset)
-{
-	switch (image_bpp)
-	{
-	case 16:
-	{
-		return uvec4(
-			linear_data[offset * 4],
-			linear_data[offset * 4 + 1],
-			linear_data[offset * 4 + 2],
-			linear_data[offset * 4 + 3]);
-	}
-	case 8:
-	{
-		return uvec4(
-			linear_data[offset * 2],
-			linear_data[offset * 2 + 1],
-			0,
-			0);
-	}
-	case 4:
-	{
-		return uvec4(linear_data[offset], 0, 0, 0);
-	}
-	case 2:
-	{
-		const uint word = linear_data[offset >> 1];
-		const int shift = int(offset & 1) << 4;
-		return uvec4(bitfieldExtract(word, shift, 16), 0, 0, 0);
-	}
-	case 1:
-	{
-		const uint word = linear_data[offset >> 2];
-		const int shift = int(offset & 3) << 3;
-		return uvec4(bitfieldExtract(word, shift, 8), 0, 0, 0);
-	}
-	default:
-		return uvec4(0);
-	}
-}
-
-void write_tiled(const in uint offset, const in uvec4 value)
-{
-	switch (image_bpp)
-	{
-	case 16:
-	{
-		tiled_data[offset * 4] = value.x;
-		tiled_data[offset * 4 + 1] = value.y;
-		tiled_data[offset * 4 + 2] = value.z;
-		tiled_data[offset * 4 + 3] = value.w;
-		break;
-	}
-	case 8:
-	{
-		tiled_data[offset * 2] = value.x;
-		tiled_data[offset * 2 + 1] = value.y;
-		break;
-	}
-	case 4:
-	{
-		tiled_data[offset] = value.x;
-		break;
-	}
-	case 2:
-	{
-		const uint word_offset = offset >> 1;
-		const uint word = tiled_data[word_offset];
-		const int shift = int(offset & 1) << 4;
-		tiled_data[word_offset] = bitfieldInsert(word, value.x, shift, 16);
-		break;
-	}
-	case 1:
-	{
-		const uint word_offset = offset >> 2;
-		const uint word = tiled_data[word_offset];
-		const int shift = int(offset & 3) << 3;
-		tiled_data[word_offset] = bitfieldInsert(word, value.x, shift, 8);
-		break;
-	}
-	default:
-		break;
-	}
-}
-
-#else
-
-uvec4 read_tiled(const in uint offset)
-{
-	switch (image_bpp)
-	{
-	case 16:
-	{
-		return uvec4(
-			tiled_data[offset * 4],
-			tiled_data[offset * 4 + 1],
-			tiled_data[offset * 4 + 2],
-			tiled_data[offset * 4 + 3]);
-	}
-	case 8:
-	{
-		return uvec4(
-			tiled_data[offset * 2],
-			tiled_data[offset * 2 + 1],
-			0,
-			0);
-	}
-	case 4:
-	{
-		return uvec4(tiled_data[offset], 0, 0, 0);
-	}
-	case 2:
-	{
-		const uint word = tiled_data[offset >> 1];
-		const int shift = int(offset & 1) << 4;
-		return uvec4(bitfieldExtract(word, shift, 16), 0, 0, 0);
-	}
-	case 1:
-	{
-		const uint word = tiled_data[offset >> 2];
-		const int shift = int(offset & 3) << 3;
-		return uvec4(bitfieldExtract(word, shift, 8), 0, 0, 0);
-	}
-	default:
-		return uvec4(0);
-	}
-}
-
-void write_linear(const in uint offset, const in uvec4 value)
-{
-	switch (image_bpp)
-	{
-	case 16:
-	{
-		linear_data[offset * 4] = value.x;
-		linear_data[offset * 4 + 1] = value.y;
-		linear_data[offset * 4 + 2] = value.z;
-		linear_data[offset * 4 + 3] = value.w;
-		break;
-	}
-	case 8:
-	{
-		linear_data[offset * 2] = value.x;
-		linear_data[offset * 2 + 1] = value.y;
-		break;
-	}
-	case 4:
-	{
-		linear_data[offset] = value.x;
-		break;
-	}
-	case 2:
-	{
-		const uint word_offset = offset >> 1;
-		const uint word = linear_data[word_offset];
-		const int shift = int(offset & 1) << 4;
-		linear_data[word_offset] = bitfieldInsert(word, value.x, shift, 16);
-		break;
-	}
-	case 1:
-	{
-		const uint word_offset = offset >> 2;
-		const uint word = linear_data[word_offset];
-		const int shift = int(offset & 3) << 3;
-		linear_data[word_offset] = bitfieldInsert(word, value.x, shift, 8);
-		break;
-	}
-	default:
-		break;
-	}
-}
-
-#endif
-
-void do_memory_op(const in uint row, const in uint col)
-{
-	const uint row_offset = (row * tile_pitch) + tile_base_address + tile_address_offset;
-	const uint this_address = row_offset + (col * image_bpp);
-
-	// 1. Calculate row_addr
-	const uint texel_offset = (this_address - tile_base_address) / RSX_TILE_WIDTH;
-	// Calculate coordinate of the tile grid we're supposed to be in
-	const uint tile_x = texel_offset % num_tiles_per_row;
-	const uint tile_y = (texel_offset / num_tiles_per_row) / RSX_TILE_HEIGHT;
-	// Calculate the grid offset for the tile selected and add the base offset. It's supposed to affect the bank stuff in the next step
-	const uint tile_id = tile_y * num_tiles_per_row + tile_x;
-	const uint tile_selector = (tile_id + (tile_base_address >> 14)) & 0x3ffff;
-	// Calculate row address
-	const uint row_address = (tile_selector >> 2) & 0xffff;
-
-	// 2. Calculate bank selector
-	// There's a lot of weird math here, but it's just a variant of (tile_selector % 4) to pick a value between [0..3]
-	uint bank_selector = 0;
-	const uint bank_distribution_lookup[16] = { 0, 1, 2, 3, 2, 3, 0, 1, 1, 2, 3, 0, 3, 0, 1, 2 };
-
-	if (factor == 1)
-	{
-		bank_selector = (tile_selector & 3);
-	}
-	else if (factor == 2)
-	{
-		const uint idx = ((tile_selector + ((tile_y & 1) << 1)) & 3) * 4 + (tile_y & 3);
-		bank_selector = bank_distribution_lookup[idx];
-	}
-	else if (factor >= 4)
-	{
-		const uint idx = (tile_selector & 3) * 4 + (tile_y & 3);
-		bank_selector = bank_distribution_lookup[idx];
-	}
-	bank_selector = (bank_selector + tile_bank) % 4;
-
-	// 3. Calculate column selector
-	uint column_selector = 0;
-	const uint line_offset_in_tile = (texel_offset / num_tiles_per_row) % RSX_TILE_HEIGHT;
-	// Calculate column_selector by bit-twiddling line offset and the other calculated parameter bits:
-	// column_selector[9:7] = line_offset_in_tile[5:3]
-	// column_selector[6:4] = this_address[7:5]
-	// column_selector[3:2] = line_offset_in_tile[1:0]
-	// column_selector[1:0] = 0
-	column_selector |= ((line_offset_in_tile >> 3) & 0x7) << 7;
-	column_selector |= ((this_address >> 5) & 0x7) << 4;
-	column_selector |= ((line_offset_in_tile >> 0) & 0x3) << 2;
-
-	// 4. Calculate partition selector (0 or 1)
-	const uint partition_selector = (((line_offset_in_tile >> 2) & 1) + ((this_address >> 6) & 1)) & 1;
-
-	// 5. Build tiled address
-	uint tile_address = 0;
-	// tile_address[31:16] = row_adr[15:0]
-	// tile_address[15:14] = bank_sel[1:0]
-	// tile_address[13:8] = column_sel[9:4]
-	// tile_address[7:7] = partition_sel[0:0]
-	// tile_address[6:5] = column_sel[3:2]
-	// tile_address[4:0] = this_address[4:0]
-	tile_address |= ((row_address >> 0) & 0xFFFF) << 16;
-	tile_address |= ((bank_selector >> 0) & 0x3) << 14;
-	tile_address |= ((column_selector >> 4) & 0x3F) << 8;
-	tile_address |= ((partition_selector >> 0) & 0x1) << 7;
-	tile_address |= ((column_selector >> 2) & 0x3) << 5;
-	tile_address |= ((this_address >> 0) & 0x1F) << 0;
-	// Twiddle bits 9 and 10
-	tile_address ^= (((tile_address >> 12) ^ ((bank_selector ^ tile_selector) & 1) ^ (tile_address >> 14)) & 1) << 9;
-	tile_address ^= ((tile_address >> 11) & 1) << 10;
-
-	// Calculate relative addresses and sample
-	uint linear_image_offset = (row * image_pitch) + (col * image_bpp);
-	uint tile_base_offset = tile_address - tile_base_address;  // Distance from tile base address
-	uint tile_data_offset = tile_base_offset - tile_rw_offset; // Distance from data base address
-
-	if (tile_base_offset >= tile_size)
-	{
-		// Do not touch anything out of bounds
-		return;
-	}
-
-	// Convert to texel addresses for data access
-	linear_image_offset /= image_bpp;
-	tile_data_offset /= image_bpp;
-
-#if (MEMORY_OP == MEMORY_OP_DETILE)
-	// Write to linear from tiled
-	write_linear(linear_image_offset, read_tiled(tile_data_offset));
-#else
-	// Opposite. Write to tile from linear
-	write_tiled(tile_data_offset, read_linear(linear_image_offset));
-#endif
-}
-
-void main()
-{
-	// The 2D coordinates are retrieved from gl_GlobalInvocationID
-	const uint num_iterations = (image_bpp < 4) ? (4 / image_bpp) : 1;
-	const uint row = gl_GlobalInvocationID.y;
-	const uint col0 = gl_GlobalInvocationID.x;
-	
-	for (uint col = col0; col < (col0 + num_iterations); ++col)
-	{
-		if (row >= image_height || col0 >= image_width)
-		{
-			// Out of bounds
-			return;
-		}
-
-		do_memory_op(row, col0);
-	}
-}
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXDefines2.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXDefines2.glsl
deleted file mode 100644
index 2b07c25f6f..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXDefines2.glsl
+++ /dev/null
@@ -1,14 +0,0 @@
-R"(
-// Small structures that should be defined before any backend logic
-// Avoid arrays and sub-vec4 members because of std140 padding constraints
-struct sampler_info
-{
-	float scale_x, scale_y, scale_z;  // 12
-	float bias_x, bias_y, bias_z;     // 24
-	float clamp_min_x, clamp_min_y;   // 32
-	float clamp_max_x, clamp_max_y;   // 40
-	uint remap;                       // 44
-	uint flags;                       // 48
-};
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentPrologue.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentPrologue.glsl
deleted file mode 100644
index de133b3a22..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentPrologue.glsl
+++ /dev/null
@@ -1,129 +0,0 @@
-R"(
-
-#ifdef _32_BIT_OUTPUT
-// Everything is fp32 on ouput channels
-#define _mrt_color_t(expr) expr
-#else
-// Mixed types. We have fp16 outputs
-#define _mrt_color_t f16vec4
-#endif
-
-#if defined(_ENABLE_ROP_OUTPUT_ROUNDING) || defined(_ENABLE_PROGRAMMABLE_BLENDING)
-// Truncate float by discarding lower 12-bits of the mantissa
-#define _fx12_truncate(x) uintBitsToFloat(floatBitsToUint(x) & 0xfffff000u)
-
-// Default. Used when we're not utilizing native fp16
-vec4 round_to_8bit(const in vec4 v4)
-{
-	uvec4 raw = uvec4(floor(fma(_fx12_truncate(v4), vec4(255.), vec4(0.5))));
-	return vec4(raw) / vec4(255.);
-}
-#ifndef _32_BIT_OUTPUT
-f16vec4 round_to_8bit(const in f16vec4 v4)
-{
-	uvec4 raw = uvec4(floor(fma(_fx12_truncate(vec4(v4)), f16vec4(255.), f16vec4(0.5))));
-	return f16vec4(raw) / f16vec4(255.);
-}
-#endif
-#endif
-
-#ifdef _DISABLE_EARLY_DISCARD
-bool _fragment_discard = false;
-#define _kill() _fragment_discard = true
-#else
-#define _kill() discard
-#endif
-
-#ifdef _ENABLE_WPOS
-vec4 get_wpos()
-{
-	float abs_scale = abs(wpos_scale);
-	return (gl_FragCoord * vec4(abs_scale, wpos_scale, 1., 1.)) + vec4(0., wpos_bias, 0., 0.);
-}
-#endif
-
-#ifdef _ENABLE_FOG_READ
-vec4 fetch_fog_value(const in uint mode)
-{
-	vec4 result = vec4(fog_c.x, 0., 0., 0.);
-	switch(mode)
-	{
-	default:
-		return result;
-	case FOG_LINEAR:
-		// linear
-		result.y = fog_param1 * fog_c.x + (fog_param0 - 1.);
-		break;
-	case FOG_EXP:
-		// exponential
-		result.y = exp(11.084 * (fog_param1 * fog_c.x + fog_param0 - 1.5));
-		break;
-	case FOG_EXP2:
-		// exponential2
-		result.y = exp(-pow(4.709 * (fog_param1 * fog_c.x + fog_param0 - 1.5), 2.));
-		break;
-	case FOG_EXP_ABS:
-		// exponential_abs
-		result.y = exp(11.084 * (fog_param1 * abs(fog_c.x) + fog_param0 - 1.5));
-		break;
-	case FOG_EXP2_ABS:
-		// exponential2_abs
-		result.y = exp(-pow(4.709 * (fog_param1 * abs(fog_c.x) + fog_param0 - 1.5), 2.));
-		break;
-	case FOG_LINEAR_ABS:
-		// linear_abs
-		result.y = fog_param1 * abs(fog_c.x) + (fog_param0 - 1.);
-		break;
-	}
-
-	result.y = clamp(result.y, 0., 1.);
-	return result;
-}
-#endif
-
-#ifdef _EMULATE_COVERAGE_TEST
-// Purely stochastic
-bool coverage_test_passes(const in vec4 _sample)
-{
-	float random_val = _rand(gl_FragCoord);
-	return (_sample.a > random_val);
-}
-#endif
-
-#ifdef _ENABLE_LINEAR_TO_SRGB
-vec4 linear_to_srgb(const in vec4 cl)
-{
-	vec4 low = cl * 12.92;
-	vec4 high = 1.055 * pow(cl, vec4(1. / 2.4)) - 0.055;
-	bvec4 selection = lessThan(cl, vec4(0.0031308));
-	return clamp(mix(high, low, selection), 0., 1.);
-}
-#endif
-
-#ifdef _ENABLE_SRGB_TO_LINEAR
-vec4 srgb_to_linear(const in vec4 cs)
-{
-	vec4 a = cs / 12.92;
-	vec4 b = pow((cs + 0.055) / 1.055, vec4(2.4));
-	return _select(a, b, greaterThan(cs, vec4(0.04045)));
-}
-#endif
-
-// Required by all fragment shaders for alpha test
-bool comparison_passes(const in float a, const in float b, const in uint func)
-{
-	switch (func)
-	{
-		default:
-		case 0: return false; //never
-		case 1: return (CMP_FIXUP(a) < CMP_FIXUP(b)); //less
-		case 2: return (CMP_FIXUP(a) == CMP_FIXUP(b)); //equal
-		case 3: return (CMP_FIXUP(a) <= CMP_FIXUP(b)); //lequal
-		case 4: return (CMP_FIXUP(a) > CMP_FIXUP(b)); //greater
-		case 5: return (CMP_FIXUP(a) != CMP_FIXUP(b)); //nequal
-		case 6: return (CMP_FIXUP(a) >= CMP_FIXUP(b)); //gequal
-		case 7: return true; //always
-	}
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureDepthConversion.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureDepthConversion.glsl
deleted file mode 100644
index 01eb79803f..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureDepthConversion.glsl
+++ /dev/null
@@ -1,69 +0,0 @@
-R"(
-#define ZS_READ(index, coord) vec2(texture(TEX_NAME(index), coord).r, float(texture(TEX_NAME_STENCIL(index), coord).x))
-#define TEX1D_Z24X8_RGBA8(index, coord1) _process_texel(convert_z24x8_to_rgba8(ZS_READ(index, COORD_SCALE1(index, coord1)), texture_parameters[index].remap, TEX_FLAGS(index)), TEX_FLAGS(index))
-#define TEX2D_Z24X8_RGBA8(index, coord2) _process_texel(convert_z24x8_to_rgba8(ZS_READ(index, COORD_SCALE2(index, coord2)), texture_parameters[index].remap, TEX_FLAGS(index)), TEX_FLAGS(index))
-#define TEX3D_Z24X8_RGBA8(index, coord3) _process_texel(convert_z24x8_to_rgba8(ZS_READ(index, COORD_SCALE3(index, coord3)), texture_parameters[index].remap, TEX_FLAGS(index)), TEX_FLAGS(index))
-
-// NOTE: Memory layout is fetched as byteswapped BGRA [GBAR] (GOW collection, DS2, DeS)
-// The A component (Z) is useless (should contain stencil8 or just 1)
-vec4 decode_depth24(const in float depth_value, const in bool depth_float)
-{
-	uint value;
-	if (!depth_float)
-	{
-		value = uint(depth_value * 16777215.);
-	}
-	else
-	{
-		value = _get_bits(floatBitsToUint(depth_value), 7, 24);
-	}
-
-	uint b = _get_bits(value, 0, 8);
-	uint g = _get_bits(value, 8, 8);
-	uint r = _get_bits(value, 16, 8);
-	const vec4 color = vec4(float(g), float(b) , 1., float(r));
-	const vec4 scale = vec4(255., 255., 1., 255.);
-	return color / scale;
-}
-
-vec4 remap_vector(const in vec4 color, const in uint remap)
-{
-	vec4 result;
-	if (_get_bits(remap, 0, 8) == 0xE4)
-	{
-		result = color;
-	}
-	else
-	{
-		uvec4 remap_channel = uvec4(remap) >> uvec4(2, 4, 6, 0);
-		remap_channel &= 3;
-		remap_channel = (remap_channel + 3) % 4; // Map A-R-G-B to R-G-B-A
-
-		// Generate remapped result
-		result.a = color[remap_channel.a];
-		result.r = color[remap_channel.r];
-		result.g = color[remap_channel.g];
-		result.b = color[remap_channel.b];
-	}
-
-	if (_get_bits(remap, 8, 8) == 0xAA)
-		return result;
-
-	uvec4 remap_select = uvec4(remap) >> uvec4(10, 12, 14, 8);
-	remap_select &= 3;
-	bvec4 choice = lessThan(remap_select, uvec4(2));
-	return _select(result, vec4(remap_select), choice);
-}
-
-vec4 convert_z24x8_to_rgba8(const in vec2 depth_stencil, const in uint remap, const in uint flags)
-{
-	vec4 result = decode_depth24(depth_stencil.x, _test_bit(flags, DEPTH_FLOAT));
-	result.z = depth_stencil.y / 255.;
-
-	if (remap == 0xAAE4)
-		return result;
-
-	return remap_vector(result, remap);
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOps.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOps.glsl
deleted file mode 100644
index 8575508f54..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOps.glsl
+++ /dev/null
@@ -1,43 +0,0 @@
-R"(
-#define ZCOMPARE_FUNC(index) _get_bits(TEX_FLAGS(index), DEPTH_COMPARE, 3)
-#define ZS_READ_MS(index, coord) vec2(sampleTexture2DMS(TEX_NAME(index), coord, index).r, float(sampleTexture2DMS(TEX_NAME_STENCIL(index), coord, index).x))
-#define TEX2D_MS(index, coord2) _process_texel(sampleTexture2DMS(TEX_NAME(index), coord2, index), TEX_FLAGS(index))
-#define TEX2D_SHADOW_MS(index, coord3) vec4(comparison_passes(sampleTexture2DMS(TEX_NAME(index), coord3.xy, index).x, coord3.z, ZCOMPARE_FUNC(index)))
-#define TEX2D_SHADOWPROJ_MS(index, coord4) TEX2D_SHADOW_MS(index, (coord4.xyz / coord4.w))
-#define TEX2D_Z24X8_RGBA8_MS(index, coord2) _process_texel(convert_z24x8_to_rgba8(ZS_READ_MS(index, coord2), texture_parameters[index].remap, TEX_FLAGS(index)), TEX_FLAGS(index))
-
-vec3 compute2x2DownsampleWeights(const in float coord, const in float uv_step, const in float actual_step)
-{
-	const float next_sample_point = coord + actual_step;
-	const float next_coord_step = fma(floor(coord / uv_step), uv_step, uv_step);
-	const float next_coord_step_plus_one = next_coord_step + uv_step;
-
-	// We calculate the weights by getting the distances of our sample points from the 'texel centers' and scaling by the actual step
-	// However, since our weights must add up to exactly 1.0, we can skip one term and just get the remainder for a more accurate result
-	// Let's allot the overflow to the original texel in this case (a)
-	// const float a0 = next_coord_step;
-	const float b0 = min(next_coord_step_plus_one, next_sample_point);
-	const float c0 = max(next_coord_step_plus_one, next_sample_point);
-
-	// const float a1 = coord;
-	const float b1 = next_coord_step;
-	const float c1 = next_coord_step_plus_one;
-
-	const vec2 computed_weights = vec2(b0 - b1, c0 - c1) / actual_step;
-	return vec3(1.0 - (computed_weights.x + computed_weights.y), computed_weights.xy);
-}
-
-vec2 texture2DMSCoord(const in vec2 coords, const in uint flags)
-{
-	if (0u == (flags & (WRAP_S_MASK | WRAP_T_MASK)))
-	{
-		return coords;
-	}
-
-	const vec2 wrapped_coords_raw = mod(coords, vec2(1.0));
-	const vec2 wrapped_coords = mod(wrapped_coords_raw + vec2(1.0), vec2(1.0));
-	const bvec2 wrap_control_mask = bvec2(uvec2(flags) & uvec2(WRAP_S_MASK, WRAP_T_MASK));
-	return _select(coords, wrapped_coords, wrap_control_mask);
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOpsInternal.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOpsInternal.glsl
deleted file mode 100644
index 0bf734ab35..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOpsInternal.glsl
+++ /dev/null
@@ -1,95 +0,0 @@
-R"(
-vec4 texelFetch2DMS(in _MSAA_SAMPLER_TYPE_ tex, const in vec2 sample_count, const in ivec2 icoords, const in int index, const in ivec2 offset)
-{
-	const vec2 resolve_coords = vec2(icoords + offset);
-	const vec2 aa_coords = floor(resolve_coords / sample_count);               // AA coords = real_coords / sample_count
-	const vec2 sample_loc = fma(aa_coords, -sample_count, resolve_coords);     // Sample ID = real_coords % sample_count
-	const float sample_index = fma(sample_loc.y, sample_count.y, sample_loc.x);
-	return texelFetch(tex, ivec2(aa_coords), int(sample_index));
-}
-
-vec4 sampleTexture2DMS(in _MSAA_SAMPLER_TYPE_ tex, const in vec2 coords, const in int index)
-{
-	const uint flags = TEX_FLAGS(index);
-	const vec2 scaled_coords = COORD_SCALE2(index, coords);
-	const vec2 normalized_coords = texture2DMSCoord(scaled_coords, flags);
-	const vec2 sample_count = vec2(2., textureSamples(tex) * 0.5);
-	const vec2 image_size = textureSize(tex) * sample_count;
-	const ivec2 icoords = ivec2(normalized_coords * image_size);
-	const vec4 sample0 = texelFetch2DMS(tex, sample_count, icoords, index, ivec2(0));
-
-	if (_get_bits(flags, FILTERED_MAG_BIT, 2) == 0)
-	{
-		return sample0;
-	}
-
-	// Bilinear scaling, with upto 2x2 downscaling with simple weights
-	const vec2 uv_step = 1.0 / vec2(image_size);
-	const vec2 actual_step = vec2(dFdx(normalized_coords.x), dFdy(normalized_coords.y));
-
-	const bvec2 no_filter = lessThan(abs(uv_step - actual_step), vec2(0.000001));
-	if (no_filter.x && no_filter.y)
-	{
-		return sample0;
-	}
-
-	vec4 a, b;
-	float factor;
-	const vec4 sample2 = texelFetch2DMS(tex, sample_count, icoords, index, ivec2(0, 1));     // Top left
-
-	if (no_filter.x)
-	{
-		// No scaling, 1:1
-		a = sample0;
-		b = sample2;
-	}
-	else
-	{
-		// Filter required, sample more data
-		const vec4 sample1 = texelFetch2DMS(tex, sample_count, icoords, index, ivec2(1, 0));     // Bottom right
-		const vec4 sample3 = texelFetch2DMS(tex, sample_count, icoords, index, ivec2(1, 1));     // Top right
-
-		if (actual_step.x > uv_step.x)
-		{
-		    // Downscale in X, centered
-		    const vec3 weights = compute2x2DownsampleWeights(normalized_coords.x, uv_step.x, actual_step.x);
-
-		    const vec4 sample4 = texelFetch2DMS(tex, sample_count, icoords, index, ivec2(2, 0));    // Further bottom right
-		    a = fma(sample0, weights.xxxx, sample1 * weights.y) + (sample4 * weights.z);            // Weighted sum
-
-		    if (!no_filter.y)
-		    {
-		        const vec4 sample5 = texelFetch2DMS(tex, sample_count, icoords, index, ivec2(2, 1));    // Further top right
-		        b = fma(sample2, weights.xxxx, sample3 * weights.y) + (sample5 * weights.z);            // Weighted sum
-		    }
-		}
-		else if (actual_step.x < uv_step.x)
-		{
-		    // Upscale in X
-		    factor = fract(normalized_coords.x * image_size.x);
-		    a = mix(sample0, sample1, factor);
-		    b = mix(sample2, sample3, factor);
-		}
-	}
-
-	if (no_filter.y)
-	{
-		// 1:1 no scale
-		return a;
-	}
-	else if (actual_step.y > uv_step.y)
-	{
-		// Downscale in Y
-		const vec3 weights = compute2x2DownsampleWeights(normalized_coords.y, uv_step.y, actual_step.y);
-		// We only have 2 rows computed for performance reasons, so combine rows 1 and 2
-		return a * weights.x + b * (weights.y + weights.z);
-	}
-	else if (actual_step.y < uv_step.y)
-	{
-		// Upscale in Y
-		factor = fract(normalized_coords.y * image_size.y);
-		return mix(a, b, factor);
-	}
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureOps.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureOps.glsl
deleted file mode 100644
index 16e420d547..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureOps.glsl
+++ /dev/null
@@ -1,241 +0,0 @@
-R"(
-#define GAMMA_R_MASK  (1 << GAMMA_R_BIT)
-#define GAMMA_G_MASK  (1 << GAMMA_G_BIT)
-#define GAMMA_B_MASK  (1 << GAMMA_B_BIT)
-#define GAMMA_A_MASK  (1 << GAMMA_A_BIT)
-#define EXPAND_R_MASK (1 << EXPAND_R_BIT)
-#define EXPAND_G_MASK (1 << EXPAND_G_BIT)
-#define EXPAND_B_MASK (1 << EXPAND_B_BIT)
-#define EXPAND_A_MASK (1 << EXPAND_A_BIT)
-#define SEXT_R_MASK   (1 << SEXT_R_BIT)
-#define SEXT_G_MASK   (1 << SEXT_G_BIT)
-#define SEXT_B_MASK   (1 << SEXT_B_BIT)
-#define SEXT_A_MASK   (1 << SEXT_A_BIT)
-#define WRAP_S_MASK   (1 << WRAP_S_BIT)
-#define WRAP_T_MASK   (1 << WRAP_T_BIT)
-#define WRAP_R_MASK   (1 << WRAP_R_BIT)
-
-#define GAMMA_CTRL_MASK  (GAMMA_R_MASK | GAMMA_G_MASK | GAMMA_B_MASK | GAMMA_A_MASK)
-#define SIGN_EXPAND_MASK (EXPAND_R_MASK | EXPAND_G_MASK | EXPAND_B_MASK | EXPAND_A_MASK)
-#define SEXT_MASK        (SEXT_R_MASK | SEXT_G_MASK | SEXT_B_MASK | SEXT_A_MASK)
-#define FILTERED_MASK    (FILTERED_MAG_BIT | FILTERED_MIN_BIT)
-
-#ifdef _ENABLE_TEXTURE_EXPAND
-	uint _texture_flag_override = 0;
-	#define _enable_texture_expand() _texture_flag_override = SIGN_EXPAND_MASK
-	#define _disable_texture_expand() _texture_flag_override = 0
-	#define TEX_FLAGS(index) (texture_parameters[index].flags | _texture_flag_override)
-#else
-	#define TEX_FLAGS(index) texture_parameters[index].flags
-#endif
-
-#define TEX_NAME(index) tex##index
-#define TEX_NAME_STENCIL(index) tex##index##_stencil
-
-#define COORD_SCALE1(index, coord1) _texcoord_xform(coord1, texture_parameters[index])
-#define COORD_SCALE2(index, coord2) _texcoord_xform(coord2, texture_parameters[index])
-#define COORD_SCALE3(index, coord3) _texcoord_xform(coord3, texture_parameters[index])
-#define COORD_PROJ1(index, coord2) COORD_SCALE1(index, coord2.x / coord2.y)
-#define COORD_PROJ2(index, coord3) COORD_SCALE2(index, coord3.xy / coord3.z)
-#define COORD_PROJ3(index, coord4) COORD_SCALE3(index, coord4.xyz / coord4.w)
-
-#ifdef _ENABLE_TEX1D
-#define TEX1D(index, coord1) _process_texel(texture(TEX_NAME(index), COORD_SCALE1(index, coord1)), TEX_FLAGS(index))
-#define TEX1D_BIAS(index, coord1, bias) _process_texel(texture(TEX_NAME(index), COORD_SCALE1(index, coord1), bias), TEX_FLAGS(index))
-#define TEX1D_LOD(index, coord1, lod) _process_texel(textureLod(TEX_NAME(index), COORD_SCALE1(index, coord1), lod), TEX_FLAGS(index))
-#define TEX1D_GRAD(index, coord1, dpdx, dpdy) _process_texel(textureGrad(TEX_NAME(index), COORD_SCALE1(index, coord1), dpdx, dpdy), TEX_FLAGS(index))
-#define TEX1D_PROJ(index, coord4) _process_texel(texture(TEX_NAME(index), COORD_PROJ1(index, coord4.xw)), TEX_FLAGS(index))
-#endif
-
-#ifdef _ENABLE_TEX2D
-#define TEX2D(index, coord2) _process_texel(texture(TEX_NAME(index), COORD_SCALE2(index, coord2)), TEX_FLAGS(index))
-#define TEX2D_BIAS(index, coord2, bias) _process_texel(texture(TEX_NAME(index), COORD_SCALE2(index, coord2), bias), TEX_FLAGS(index))
-#define TEX2D_LOD(index, coord2, lod) _process_texel(textureLod(TEX_NAME(index), COORD_SCALE2(index, coord2), lod), TEX_FLAGS(index))
-#define TEX2D_GRAD(index, coord2, dpdx, dpdy) _process_texel(textureGrad(TEX_NAME(index), COORD_SCALE2(index, coord2), dpdx, dpdy), TEX_FLAGS(index))
-#define TEX2D_PROJ(index, coord4) _process_texel(texture(TEX_NAME(index), COORD_PROJ2(index, coord4.xyw)), TEX_FLAGS(index))
-#endif
-
-#ifdef _ENABLE_SHADOW
-#ifdef _EMULATED_TEXSHADOW
-	#define SHADOW_COORD(index, coord3) _texcoord_xform_shadow(coord3, texture_parameters[index])
-	#define SHADOW_COORD4(index, coord4) _texcoord_xform_shadow(coord4, texture_parameters[index])
-	#define SHADOW_COORD_PROJ(index, coord4) _texcoord_xform_shadow(coord4.xyz / coord4.w, texture_parameters[index])
-
-	#define TEX2D_SHADOW(index, coord3) texture(TEX_NAME(index), SHADOW_COORD(index, coord3))
-	#define TEX3D_SHADOW(index, coord4) texture(TEX_NAME(index), SHADOW_COORD4(index, coord4))
-	#define TEX2D_SHADOWPROJ(index, coord4) texture(TEX_NAME(index), SHADOW_COORD_PROJ(index, coord4))
-#else
-	#define COORD_PROJ3_SHADOW(index, coord4) vec3(COORD_PROJ2(index, coord4.xyw), coord4.z / coord4.w)
-	#define TEX2D_SHADOW(index, coord3) texture(TEX_NAME(index), vec3(COORD_SCALE2(index, coord3.xy), coord3.z))
-	#define TEX3D_SHADOW(index, coord4) texture(TEX_NAME(index), vec4(COORD_SCALE3(index, coord4.xyz), coord4.w))
-	#define TEX2D_SHADOWPROJ(index, coord4) texture(TEX_NAME(index), COORD_PROJ3_SHADOW(index, coord4))
-#endif
-#endif
-
-#ifdef _ENABLE_TEX3D
-#define TEX3D(index, coord3) _process_texel(texture(TEX_NAME(index), COORD_SCALE3(index, coord3)), TEX_FLAGS(index))
-#define TEX3D_BIAS(index, coord3, bias) _process_texel(texture(TEX_NAME(index), COORD_SCALE3(index, coord3), bias), TEX_FLAGS(index))
-#define TEX3D_LOD(index, coord3, lod) _process_texel(textureLod(TEX_NAME(index), COORD_SCALE3(index, coord3), lod), TEX_FLAGS(index))
-#define TEX3D_GRAD(index, coord3, dpdx, dpdy) _process_texel(textureGrad(TEX_NAME(index), COORD_SCALE3(index, coord3), dpdx, dpdy), TEX_FLAGS(index))
-#define TEX3D_PROJ(index, coord4) _process_texel(texture(TEX_NAME(index), COORD_PROJ3(index, coord4).xyz), TEX_FLAGS(index))
-#endif
-
-#ifdef _ENABLE_TEX1D
-float _texcoord_xform(const in float coord, const in sampler_info params)
-{
-	float result = fma(coord, params.scale_x, params.bias_x);
-	if (_test_bit(params.flags, CLAMP_COORDS_BIT))
-	{
-		result = clamp(result, params.clamp_min_x, params.clamp_max_x);
-	}
-
-	return result;
-}
-#endif
-
-#ifdef _ENABLE_TEX2D
-vec2 _texcoord_xform(const in vec2 coord, const in sampler_info params)
-{
-	vec2 result = fma(
-		coord,
-		vec2(params.scale_x, params.scale_y),
-		vec2(params.bias_x, params.bias_y)
-	);
-
-	if (_test_bit(params.flags, CLAMP_COORDS_BIT))
-	{
-		result = clamp(
-			result,
-			vec2(params.clamp_min_x, params.clamp_min_y),
-			vec2(params.clamp_max_x, params.clamp_max_y)
-		);
-	}
-
-	return result;
-}
-#endif
-
-#if defined(_ENABLE_TEX3D) || defined(_ENABLE_SHADOWPROJ)
-vec3 _texcoord_xform(const in vec3 coord, const in sampler_info params)
-{
-	vec3 result = fma(
-		coord,
-		vec3(params.scale_x, params.scale_y, params.scale_z),
-		vec3(params.bias_x, params.bias_y, params.bias_z)
-	);
-
-	// NOTE: Coordinate clamping not supported for CUBE and 3D textures
-	return result;
-}
-#endif
-
-#if defined(_ENABLE_SHADOW) && defined(_EMULATED_TEXSHADOW)
-#ifdef _ENABLE_TEX2D
-vec3 _texcoord_xform_shadow(const in vec3 coord3, const in sampler_info params)
-{
-	vec3 result;
-	if (_test_bit(params.flags, DEPTH_FLOAT))
-	{
-		// Depth-float buffer, extended range supported
-		result.z = coord3.z;
-	}
-	else
-	{
-		// Clamp to MAX_DEPTH simulate UINT buffer behavior
-		result.z = min(coord3.z, 1.);
-	}
-
-	result.xy = _texcoord_xform(coord3.xy, params);
-	return result;
-}
-#endif // TEX2D
-
-#ifdef _ENABLE_TEX3D
-vec4 _texcoord_xform_shadow(const in vec4 coord4, const in sampler_info params)
-{
-	vec4 result;
-	if (_test_bit(params.flags, DEPTH_FLOAT))
-	{
-		// Depth-float buffer, extended range supported
-		result.w = coord4.w;
-	}
-	else
-	{
-		// Clamp to MAX_DEPTH to simulate UINT buffer behavior
-		result.w = min(coord4.w, 1.);
-	}
-
-	result.xyz = _texcoord_xform(coord4.xyz, params);
-	return result;
-}
-#endif // TEX3D
-
-#endif // _EMULATE_SHADOW
-
-vec4 _sext_unorm8x4(const in vec4 x)
-{
-	// TODO: Handle clamped sign-extension
-	const vec4 bits = floor(fma(x, vec4(255.f), vec4(0.5f)));
-	const bvec4 sign_check = lessThan(bits, vec4(128.f));
-	const vec4 ret = _select(bits - 256.f, bits, sign_check);
-	return ret / 127.f;
-}
-
-vec4 _process_texel(in vec4 rgba, const in uint control_bits)
-{
-	if (control_bits == 0)
-	{
-		return rgba;
-	}
-
-	if (_test_bit(control_bits, ALPHAKILL))
-	{
-		// Alphakill
-		if (rgba.a < 0.000001)
-		{
-			_kill();
-			return rgba;
-		}
-	}
-
-	if (_test_bit(control_bits, RENORMALIZE))
-	{
-		// Renormalize to 8-bit (PS3) accuracy
-		rgba = floor(rgba * 255.);
-		rgba /= 255.;
-	}
-
-	uvec4 mask;
-	vec4 convert;
-
-	uint op_mask = control_bits & uint(SIGN_EXPAND_MASK);
-	if (op_mask != 0u)
-	{
-		// Expand to signed normalized by decompressing the signal
-		mask = uvec4(op_mask) & uvec4(EXPAND_R_MASK, EXPAND_G_MASK, EXPAND_B_MASK, EXPAND_A_MASK);
-		convert = (rgba * 2.f - 1.f);
-		rgba = _select(rgba, convert, notEqual(mask, uvec4(0)));
-	}
-
-	op_mask = control_bits & uint(SEXT_MASK);
-	if (op_mask != 0u)
-	{
-		// Sign-extend the input signal
-		mask = uvec4(op_mask) & uvec4(SEXT_R_MASK, SEXT_G_MASK, SEXT_B_MASK, SEXT_A_MASK);
-		convert = _sext_unorm8x4(rgba);
-		rgba = _select(rgba, convert, notEqual(mask, uvec4(0)));
-	}
-
-	op_mask = control_bits & uint(GAMMA_CTRL_MASK);
-	if (op_mask != 0u)
-	{
-		// Gamma correction
-		mask = uvec4(op_mask) & uvec4(GAMMA_R_MASK, GAMMA_G_MASK, GAMMA_B_MASK, GAMMA_A_MASK);
-		convert = srgb_to_linear(rgba);
-		return _select(rgba, convert, notEqual(mask, uvec4(0)));
-	}
-
-	return rgba;
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgramCommon.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgramCommon.glsl
deleted file mode 100644
index 4e9574a4e5..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgramCommon.glsl
+++ /dev/null
@@ -1,27 +0,0 @@
-R"(
-#define _select mix
-#define _saturate(x) clamp(x, 0., 1.)
-#define _get_bits(x, off, count) bitfieldExtract(x, off, count)
-#define _set_bits(x, y, off, count) bitfieldInsert(x, y, off, count)
-#define _test_bit(x, y) (_get_bits(x, y, 1) != 0)
-#define _rand(seed) fract(sin(dot(seed.xy, vec2(12.9898f, 78.233f))) * 43758.5453f)
-
-#ifdef _GPU_LOW_PRECISION_COMPARE
-#define CMP_FIXUP(a) (sign(a) * 16. + a)
-#else
-#define CMP_FIXUP(a) (a)
-#endif
-
-#ifdef _ENABLE_LIT_EMULATION
-vec4 lit_legacy(const in vec4 val)
-{
-	vec4 clamped_val = vec4(max(val.xy, vec2(0.)), val.zw);
-	return vec4(
-		1.,
-		clamped_val.x,
-		exp2(clamped_val.w * log2(max(clamped_val.y, 0.0000000001))) * sign(clamped_val.x),
-		1.);
-}
-#endif
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgrammableBlendPrologue.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgrammableBlendPrologue.glsl
deleted file mode 100644
index 0cb33fe4d6..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgrammableBlendPrologue.glsl
+++ /dev/null
@@ -1,152 +0,0 @@
-R"(
-
-/**
- * Required register definitions from ROP config
- struct {
- 	vec4 blend_constants;    // fp32x4
-	uint blend_func;         // rgb16, a16
-	uint blend_factors_a;    // src16, dst16
-	uint blend_factors_rgb;  // src16, dst16
- }
-*/
-
-#define BLEND_FACTOR_ZERO 0
-#define BLEND_FACTOR_ONE  1
-#define BLEND_FACTOR_SRC_COLOR 0x0300
-#define BLEND_FACTOR_ONE_MINUS_SRC_COLOR 0x0301
-#define BLEND_FACTOR_SRC_ALPHA 0x0302
-#define BLEND_FACTOR_ONE_MINUS_SRC_ALPHA 0x0303
-#define BLEND_FACTOR_DST_ALPHA 0x0304
-#define BLEND_FACTOR_ONE_MINUS_DST_ALPHA 0x0305
-#define BLEND_FACTOR_DST_COLOR 0x0306
-#define BLEND_FACTOR_ONE_MINUS_DST_COLOR 0x0307
-#define BLEND_FACTOR_SRC_ALPHA_SATURATE 0x0308
-#define BLEND_FACTOR_CONSTANT_COLOR 0x8001
-#define BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR 0x8002
-#define BLEND_FACTOR_CONSTANT_ALPHA 0x8003
-#define BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA 0x8004
-
-#define BLEND_FUNC_ADD 0x8006
-#define BLEND_MIN 0x8007
-#define BLEND_MAX 0x8008
-#define BLEND_FUNC_SUBTRACT 0x800A
-#define BLEND_FUNC_REVERSE_SUBTRACT 0x800B
-#define BLEND_FUNC_REVERSE_SUBTRACT_SIGNED 0x0000F005
-#define BLEND_FUNC_ADD_SIGNED 0x0000F006
-#define BLEND_FUNC_REVERSE_ADD_SIGNED 0x0000F007
-
-float get_blend_factor_a(const in uint op, const in vec4 src, const in vec4 dst)
-{
-	switch (op)
-	{
-	case BLEND_FACTOR_ZERO: return 0.;
-	case BLEND_FACTOR_ONE: return 1.;
-	case BLEND_FACTOR_SRC_COLOR:
-	case BLEND_FACTOR_SRC_ALPHA: return src.a;
-	case BLEND_FACTOR_ONE_MINUS_SRC_COLOR:
-	case BLEND_FACTOR_ONE_MINUS_SRC_ALPHA: return 1. - src.a;
-	case BLEND_FACTOR_DST_ALPHA:
-	case BLEND_FACTOR_DST_COLOR: return dst.a;
-	case BLEND_FACTOR_ONE_MINUS_DST_ALPHA:
-	case BLEND_FACTOR_ONE_MINUS_DST_COLOR: return 1. - dst.a;
-	case BLEND_FACTOR_SRC_ALPHA_SATURATE: return 1;
-	case BLEND_FACTOR_CONSTANT_COLOR:
-	case BLEND_FACTOR_CONSTANT_ALPHA: return constants.a;
-	case BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR:
-	case BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA: return 1. - constants.a;
-	}
-	return 0.;
-}
-
-vec3 get_blend_factor_rgb(const in uint op, const in vec4 src, const in vec4 dst)
-{
-	switch (op)
-	{
-	case BLEND_FACTOR_ZERO: return vec3(0.);
-	case BLEND_FACTOR_ONE: return vec3(1.);
-	case BLEND_FACTOR_SRC_COLOR: return src.rgb;
-	case BLEND_FACTOR_SRC_ALPHA: return src.aaa;
-	case BLEND_FACTOR_ONE_MINUS_SRC_COLOR: return 1. - src.rgb;
-	case BLEND_FACTOR_ONE_MINUS_SRC_ALPHA: return 1. - src.aaa;
-	case BLEND_FACTOR_DST_COLOR: return dst.rgb;
-	case BLEND_FACTOR_DST_ALPHA: return dst.a;
-	case BLEND_FACTOR_ONE_MINUS_DST_COLOR: return 1. - dst.rgb;
-	case BLEND_FACTOR_ONE_MINUS_DST_ALPHA: return 1. - dst.a;
-	case BLEND_FACTOR_SRC_ALPHA_SATURATE: return src.rgb;
-	case BLEND_FACTOR_CONSTANT_COLOR: return blend_constants.rgb;
-	case BLEND_FACTOR_CONSTANT_ALPHA: return blend_constants.aaa;
-	case BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR: return 1. - blend_constants.rgb;
-	case BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA: return 1. - blend_constants.aaa;
-	}
-	return vec3(0.);
-}
-
-float apply_blend_func_a(const in vec4 src, const in vec4 dst)
-{
-	uint blend_factor_a_s = _get_bits(blend_factors_a, 0, 16);
-	uint blend_factor_a_d = _get_bits(blend_factors_a, 16, 16);
-	uint func = _get_bits(blend_func, 16, 16);
-
-	const float src_factor_a = get_blend_factor_a(blend_factor_a_s, src, dst);
-	const float dst_factor_a = get_blend_factor_a(blend_factor_a_d, src, dst);
-
-	// NOTE: Destination data is already saturated due to encoding.
-	const float s = src.a * src_factor_a;
-	const float d = dst.a * dst_factor_a;
-
-	switch (func)
-	{
-	case BLEND_FUNC_ADD: return _saturate(s) + d;
-	case BLEND_MIN: return min(_saturate(s), d);
-	case BLEND_MAX: return max(_saturate(s), d);
-	case BLEND_FUNC_SUBTRACT: return _saturate(s) - d;
-	case BLEND_FUNC_REVERSE_SUBTRACT: return d - _saturate(s);
-	case BLEND_FUNC_REVERSE_SUBTRACT_SIGNED: return d - s;
-	case BLEND_FUNC_ADD_SIGNED: return s + d;
-	case BLEND_FUNC_REVERSE_ADD_SIGNED: return s + d;
-	}
-
-	return vec3(0.);
-}
-
-vec3 apply_blend_func_rgb(const in vec4 src, const in vec4 dst)
-{
-	uint blend_factor_rgb_s = _get_bits(blend_factors_rgb, 0, 16);
-	uint blend_factor_rgb_d = _get_bits(blend_factors_rgb, 16, 16);
-	uint func = _get_bits(blend_func, 0, 16);
-
-	const vec3 src_factor_rgb = get_blend_factor_rgb(blend_factor_rgb_s, src, dst);
-	const vec3 dst_factor_rgb = get_blend_factor_rgb(blend_factor_rgb_d, src, dst);
-
-	// NOTE: Destination data is already saturated due to encoding.
-	const vec3 s = src.rgb * src_factor_rgb;
-	const vec3 d = dst.rgb * dst_factor_rgb;
-
-	switch (func)
-	{
-	case BLEND_FUNC_ADD: return _saturate(s) + d;
-	case BLEND_MIN: return min(_saturate(s), d);
-	case BLEND_MAX: return max(_saturate(s), d);
-	case BLEND_FUNC_SUBTRACT: return _saturate(s) - d;
-	case BLEND_FUNC_REVERSE_SUBTRACT: return d - _saturate(s);
-	case BLEND_FUNC_REVERSE_SUBTRACT_SIGNED: return d - s;
-	case BLEND_FUNC_ADD_SIGNED: return s + d;
-	case BLEND_FUNC_REVERSE_ADD_SIGNED: return s + d;
-	}
-
-	return vec3(0.);
-}
-
-vec4 do_blend(const in vec4 src, const in vec4 dst)
-{
-	// Read blend_constants from config and apply blend op
-	const vec4 result = vec4(
-		apply_blend_func_rgb(src, dst),
-		apply_blend_func_a(src, dst)
-	);
-
-	// Accurate int conversion with wrapping
-	return round_to_8bit(result);
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPEpilogue.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPEpilogue.glsl
deleted file mode 100644
index aaaaa559ca..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPEpilogue.glsl
+++ /dev/null
@@ -1,74 +0,0 @@
-R"(
-
-#ifdef _DISABLE_EARLY_DISCARD
-	if (_fragment_discard)
-	{
-		discard;
-	}
-#endif
-
-#ifdef _ENABLE_FRAMEBUFFER_SRGB
-	if (_test_bit(rop_control, SRGB_FRAMEBUFFER_BIT))
-	{
-		col0.rgb = _mrt_color_t(linear_to_srgb(col0)).rgb;
-		col1.rgb = _mrt_color_t(linear_to_srgb(col1)).rgb;
-		col2.rgb = _mrt_color_t(linear_to_srgb(col2)).rgb;
-		col3.rgb = _mrt_color_t(linear_to_srgb(col3)).rgb;
-	}
-#endif
-
-#ifdef _ENABLE_ROP_OUTPUT_ROUNDING
-	if (_test_bit(rop_control, INT_FRAMEBUFFER_BIT))
-	{
-		col0 = round_to_8bit(col0);
-		col1 = round_to_8bit(col1);
-		col2 = round_to_8bit(col2);
-		col3 = round_to_8bit(col3);
-	}
-#endif
-
-	// Post-output stages
-	// Alpha Testing
-	if (_test_bit(rop_control, ALPHA_TEST_ENABLE_BIT))
-	{
-		const uint alpha_func = _get_bits(rop_control, ALPHA_TEST_FUNC_OFFSET, ALPHA_TEST_FUNC_LENGTH);
-		if (!comparison_passes(col0.a, alpha_ref, alpha_func))
-		{
-			discard;
-		}
-	}
-
-#ifdef _EMULATE_COVERAGE_TEST
-	if (_test_bit(rop_control, ALPHA_TO_COVERAGE_ENABLE_BIT))
-	{
-		if (!_test_bit(rop_control, MSAA_WRITE_ENABLE_BIT) || !coverage_test_passes(col0))
-		{
-			discard;
-		}
-	}
-#endif
-
-#ifdef _ENABLE_PROGRAMMABLE_BLENDING
-	switch (framebufferCount)
-	{
-		case 4:
-			col3 = do_blend(col3, mrt_color[3]);
-			// Fallthrough
-		case 3:
-			col2 = do_blend(col2, mrt_color[2]);
-			// Fallthrough
-		case 2:
-			col1 = do_blend(col1, mrt_color[1]);
-			// Fallthrough
-		default:
-			col0 = do_blend(col0, mrt_color[0]);
-			break;
-	}
-#endif
-
-	// Commit
-	ocol0 = col0;
-	ocol1 = col1;
-	ocol2 = col2;
-	ocol3 = col3;
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPPrologue.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPPrologue.glsl
deleted file mode 100644
index e39f3481c8..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPPrologue.glsl
+++ /dev/null
@@ -1,27 +0,0 @@
-R"(
-
-#ifdef _ENABLE_POLYGON_STIPPLE
-	if (_test_bit(rop_control, POLYGON_STIPPLE_ENABLE_BIT))
-	{
-		// Convert x,y to linear address
-		const uvec2 stipple_coord = uvec2(gl_FragCoord.xy) % uvec2(32, 32);
-		const uint address = stipple_coord.y * 32u + stipple_coord.x;
-		const uint bit_offset = (address & 31u);
-		const uint word_index = _get_bits(address, 7, 3);
-		const uint sub_index = _get_bits(address, 5, 2);
-
-		if (!_test_bit(stipple_pattern[word_index][sub_index], int(bit_offset)))
-		{
-			_kill();
-		}
-	}
-#endif
-
-#ifdef _ENABLE_PROGRAMMABLE_BLENDING
-	vec4 mrt_color[4];
-	for (int n = 0; n < framebufferCount; ++n)
-	{
-		mrt_color[n] = subPassLoad(mrtAttachments[n]);
-	}
-#endif
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexFetch.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexFetch.glsl
deleted file mode 100644
index 66c4a6072b..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexFetch.glsl
+++ /dev/null
@@ -1,210 +0,0 @@
-R"(
-#ifdef _INTEL_GLSL
-// For intel GPUs which cannot access vectors in indexed mode (driver bug? or glsl version too low?)
-// Note: Tested on Mesa iris with HD 530 and compilant path works fine, may be a bug on Windows proprietary drivers
-void mov(inout uvec4 vector, const in int index, const in uint scalar)
-{
-	switch(index)
-	{
-		case 0: vector.x = scalar; return;
-		case 1: vector.y = scalar; return;
-		case 2: vector.z = scalar; return;
-		case 3: vector.w = scalar; return;
-	}
-}
-
-uint ref(const in uvec4 vector, const in int index)
-{
-	switch(index)
-	{
-		case 0: return vector.x;
-		case 1: return vector.y;
-		case 2: return vector.z;
-		case 3: return vector.w;
-	}
-}
-#else
-#define mov(v, i, s) v[i] = s
-#define ref(v, i) v[i]
-#endif
-
-#ifdef VULKAN
-#define _gl_VertexID gl_VertexIndex
-#else
-#define _gl_VertexID gl_VertexID
-#endif
-
-struct attribute_desc
-{
-	uint type;
-	uint attribute_size;
-	uint starting_offset;
-	uint stride;
-	uint frequency;
-	bool swap_bytes;
-	bool is_volatile;
-	bool modulo;
-};
-
-uint gen_bits(const in uint x, const in uint y, const in uint z, const in uint w, const in bool swap)
-{
-	return (swap) ?
-		_set_bits(_set_bits(_set_bits(w, z, 8, 8), y, 16, 8), x, 24, 8) :
-		_set_bits(_set_bits(_set_bits(x, y, 8, 8), z, 16, 8), w, 24, 8);
-}
-
-uint gen_bits(const in uint x, const in uint y, const in bool swap)
-{
-	return (swap) ? _set_bits(y, x, 8, 8) : _set_bits(x, y, 8, 8);
-}
-
-// NOTE: (int(n) or int(n)) is broken on some NVIDIA and INTEL hardware when the sign bit is involved.
-// See https://github.com/RPCS3/rpcs3/issues/8990
-vec4 sext(const in ivec4 bits)
-{
-	// convert raw 16 bit values into signed 32-bit float4 counterpart
-	bvec4 sign_check = lessThan(bits, ivec4(0x8000));
-	return _select(bits - 65536, bits, sign_check);
-}
-
-float sext(const in int bits)
-{
-	return (bits < 0x8000) ? float(bits) : float(bits - 65536); 
-}
-
-vec4 fetch_attribute(const in attribute_desc desc, const in int vertex_id, usamplerBuffer input_stream)
-{
-	const int elem_size_table[] = { 0, 2, 4, 2, 1, 2, 4, 1 };
-	const float scaling_table[] = { 1., 32767.5, 1., 1., 255., 1., 32767., 1. };
-	const int elem_size = elem_size_table[desc.type];
-	const vec4 scale = scaling_table[desc.type].xxxx;
-
-	uvec4 tmp, result = uvec4(0u);
-	vec4 ret;
-	int n, i = int((vertex_id * desc.stride) + desc.starting_offset);
-
-	for (n = 0; n < desc.attribute_size; n++)
-	{
-		tmp.x = texelFetch(input_stream, i++).x;
-		if (elem_size == 2)
-		{
-			tmp.y = texelFetch(input_stream, i++).x;
-			tmp.x = gen_bits(tmp.x, tmp.y, desc.swap_bytes);
-		}
-		else if (elem_size == 4)
-		{
-			tmp.y = texelFetch(input_stream, i++).x;
-			tmp.z = texelFetch(input_stream, i++).x;
-			tmp.w = texelFetch(input_stream, i++).x;
-			tmp.x = gen_bits(tmp.x, tmp.y, tmp.z, tmp.w, desc.swap_bytes);
-		}
-
-		mov(result, n, tmp.x);
-	}
-
-	// Actual decoding step is done in vector space, outside the loop
-	if (desc.type == VTX_FMT_SNORM16 || desc.type == VTX_FMT_SINT16)
-	{
-		ret = sext(ivec4(result));
-		ret = fma(vec4(0.5), vec4(desc.type == VTX_FMT_SNORM16), ret);
-	}
-	else if (desc.type == VTX_FMT_FLOAT32)
-	{
-		ret = uintBitsToFloat(result);
-	}
-	else if (desc.type == VTX_FMT_FLOAT16)
-	{
-		tmp.x = _set_bits(result.x, result.y, 16, 16);
-		tmp.y = _set_bits(result.z, result.w, 16, 16);
-		ret.xy = unpackHalf2x16(tmp.x);
-		ret.zw = unpackHalf2x16(tmp.y);
-	}
-	else if (elem_size == 1) // (desc.type == VTX_FMT_UINT8 || desc.type == VTX_FMT_UNORM8)
-	{
-		// Ignore bswap on single byte channels
-		ret = vec4(result);
-	}
-	else // if (desc.type == VTX_FMT_COMP32)
-	{
-		result = uvec4(_get_bits(result.x, 0, 11),
-			_get_bits(result.x, 11, 11),
-			_get_bits(result.x, 22, 10),
-			uint(scale.x));
-		ret = sext(ivec4(result) << ivec4(5, 5, 6, 0));
-	}
-
-	if (desc.attribute_size < 4)
-	{
-		ret.w = scale.x;
-	}
-
-	return ret / scale; 
-}
-
-attribute_desc fetch_desc(const in int location)
-{
-	// Each descriptor is 64 bits wide
-	// [0-8] attribute stride
-	// [8-24] attribute divisor
-	// [24-27] attribute type
-	// [27-30] attribute size
-	// [30-31] reserved
-	// [32-60] starting offset
-	// [60-61] swap bytes flag
-	// [61-62] volatile flag
-	// [62-63] modulo enable flag;
-
-#ifdef VULKAN
-	// Fetch parameters streamed separately from draw parameters
-	uvec2 attrib = texelFetch(vertex_layout_stream, location + int(layout_ptr_offset)).xy;
-#else
-	// Data is packed into a ubo
-	const int block = (location >> 1);
-	const int sub_block = (location & 1) << 1;
-	uvec2 attrib = uvec2(
-		ref(input_attributes_blob[block], sub_block + 0),
-		ref(input_attributes_blob[block], sub_block + 1));
-#endif
-
-	attribute_desc result;
-	result.stride = _get_bits(attrib.x, 0, 8);
-	result.frequency = _get_bits(attrib.x, 8, 16);
-	result.type = _get_bits(attrib.x, 24, 3);
-	result.attribute_size = _get_bits(attrib.x, 27, 3);
-	result.starting_offset = _get_bits(attrib.y, 0, 29);
-	result.swap_bytes = _test_bit(attrib.y, 29);
-	result.is_volatile = _test_bit(attrib.y, 30);
-	result.modulo = _test_bit(attrib.y, 31);
-	return result;
-}
-
-vec4 read_location(const in int location)
-{
-	int vertex_id;
-	attribute_desc desc = fetch_desc(location);
-
-	if (desc.frequency == 0)
-	{
-		vertex_id = 0;
-	}
-	else if (desc.modulo)
-	{
-		// if a vertex modifier is active; vertex_base must be 0 and is ignored
-		vertex_id = (_gl_VertexID + int(vertex_index_offset)) % int(desc.frequency);
-	}
-	else
-	{
-		vertex_id = (_gl_VertexID - int(vertex_base_index)) / int(desc.frequency); 
-	}
-
-	if (desc.is_volatile)
-	{
-		return fetch_attribute(desc, vertex_id, volatile_input_stream);
-	}
-	else
-	{
-		return fetch_attribute(desc, vertex_id, persistent_input_stream);
-	}
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl
deleted file mode 100644
index f43b03ee3a..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl
+++ /dev/null
@@ -1,85 +0,0 @@
-R"(
-#ifdef _FORCE_POSITION_INVARIANCE
-// PS3 has shader invariance, but we don't really care about most attributes outside ATTR0
-invariant gl_Position;
-#endif
-
-#ifdef _EMULATE_ZCLIP_XFORM_STANDARD
-// Technically the depth value here is the 'final' depth that should be stored in the Z buffer.
-// Forward mapping eqn is d' = d * (f - n) + n, where d' is the stored Z value (this) and d is the normalized API value.
-vec4 apply_zclip_xform(
-	const in vec4 pos,
-	const in float near_plane,
-	const in float far_plane)
-{
-	if (pos.w != 0.0)
-	{
-		const float real_n = min(far_plane, near_plane);
-		const float real_f = max(far_plane, near_plane);
-		const double depth_range = double(real_f - real_n);
-		const double inv_range = (depth_range > 0.000001) ? (1.0 / (depth_range * pos.w)) : 0.0;
-		const double actual_d = (double(pos.z) - double(real_n * pos.w)) * inv_range;
-		const double nearest_d = floor(actual_d + 0.5);
-		const double epsilon = (inv_range * pos.w) / 16777215.;     // Epsilon value is the minimum discernable change in Z that should affect the stored Z
-		const double d = _select(actual_d, nearest_d, abs(actual_d - nearest_d) < epsilon);
-		return vec4(pos.xy, float(d * pos.w), pos.w);
-	}
-	else
-	{
-		return pos; // Only values where Z=0 can ever pass this clip
-	}
-}
-#elif defined(_EMULATE_ZCLIP_XFORM_FALLBACK)
-vec4 apply_zclip_xform(
-	const in vec4 pos,
-	const in float near_plane,
-	const in float far_plane)
-{
-	float d = float(pos.z / pos.w);
-	if (d < 0.f && d >= near_plane)
-	{
-		// Clamp
-		d = 0.f;
-	}
-	else if (d > 1.f && d <= far_plane)
-	{
-		// Compress Z and store towards highest end of the range
-		d = min(1., 0.99 + (0.01 * (pos.z - near_plane) / (far_plane - near_plane)));
-	}
-	else // This catch-call also handles w=0 since d=inf
-	{
-		return pos;
-	}
-
-	return vec4(pos.x, pos.y, d * pos.w, pos.w);
-}
-#endif
-
-#if defined(_ENABLE_INSTANCED_CONSTANTS)
-// Workaround for GL vs VK builtin variable naming
-#ifdef VULKAN
-#define _gl_InstanceID gl_InstanceIndex
-#else
-#define _gl_InstanceID gl_InstanceID
-#endif
-
-vec4 _fetch_constant(const in int base_offset)
-{
-	// Get virtual draw/instance id. Normally will be 1:1 based on instance index
-	const int indirection_offset = (_gl_InstanceID * CONSTANTS_ARRAY_LENGTH) + base_offset;
-	const int corrected_offset = constants_addressing_lookup[indirection_offset];
-	return instanced_constants_array[corrected_offset];
-}
-
-vec4 _fetch_constant(const in uint base_offset)
-{
-	// uint override
-	return _fetch_constant(int(base_offset));
-}
-#elif defined(VULKAN)
-#define _fetch_constant(x) vc[x + xform_constants_offset]
-#else
-#define _fetch_constant(x) vc[x]
-#endif
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/ShuffleBytes.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/ShuffleBytes.glsl
deleted file mode 100644
index 9e0b41d57c..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/ShuffleBytes.glsl
+++ /dev/null
@@ -1,37 +0,0 @@
-R"(
-#version 430
-layout(local_size_x=%ws, local_size_y=1, local_size_z=1) in;
-layout(%set, binding=%loc, std430) buffer ssbo{ uint data[]; };
-%ub
-
-#define KERNEL_SIZE %ks
-
-// Generic swap routines
-#define bswap_u16(bits)     (bits & 0xFF) << 8 | (bits & 0xFF00) >> 8 | (bits & 0xFF0000) << 8 | (bits & 0xFF000000) >> 8
-#define bswap_u32(bits)     (bits & 0xFF) << 24 | (bits & 0xFF00) << 8 | (bits & 0xFF0000) >> 8 | (bits & 0xFF000000) >> 24
-#define bswap_u16_u32(bits) (bits & 0xFFFF) << 16 | (bits & 0xFFFF0000) >> 16
-
-// Depth format conversions
-#define d24_to_f32(bits)             floatBitsToUint(float(bits) / 16777215.f)
-#define f32_to_d24(bits)             uint(uintBitsToFloat(bits) * 16777215.f)
-#define d24f_to_f32(bits)            (bits << 7)
-#define f32_to_d24f(bits)            (bits >> 7)
-#define d24x8_to_f32(bits)           d24_to_f32(bits >> 8)
-#define d24x8_to_d24x8_swapped(bits) (bits & 0xFF00) | (bits & 0xFF0000) >> 16 | (bits & 0xFF) << 16
-#define f32_to_d24x8_swapped(bits)   d24x8_to_d24x8_swapped(f32_to_d24(bits))
-
-uint linear_invocation_id()
-{
-	uint size_in_x = (gl_NumWorkGroups.x * gl_WorkGroupSize.x);
-	return (gl_GlobalInvocationID.y * size_in_x) + gl_GlobalInvocationID.x;
-}
-
-%md
-void main()
-{
-	uint invocation_id = linear_invocation_id();
-	uint index = invocation_id * KERNEL_SIZE;
-	uint value;
-	%vars
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/VideoOutCalibrationPass.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/VideoOutCalibrationPass.glsl
deleted file mode 100644
index f33dbd6aa5..0000000000
--- a/rpcs3/Emu/RSX/Program/GLSLSnippets/VideoOutCalibrationPass.glsl
+++ /dev/null
@@ -1,154 +0,0 @@
-R"(
-#version 440
-
-#define SAMPLER_BINDING(x) %sampler_binding
-
-layout(%set_decorator, binding=SAMPLER_BINDING(0)) uniform sampler2D fs0;
-layout(%set_decorator, binding=SAMPLER_BINDING(1)) uniform sampler2D fs1;
-
-layout(location=0) in vec2 tc0;
-layout(location=0) out vec4 ocol;
-
-#define STEREO_MODE_DISABLED 0
-#define STEREO_MODE_SIDE_BY_SIDE 1
-#define STEREO_MODE_OVER_UNDER 2
-#define STEREO_MODE_INTERLACED 3
-#define STEREO_MODE_ANAGLYPH_RED_GREEN 4
-#define STEREO_MODE_ANAGLYPH_RED_BLUE 5
-#define STEREO_MODE_ANAGLYPH_RED_CYAN 6
-#define STEREO_MODE_ANAGLYPH_MAGENTA_CYAN 7
-#define STEREO_MODE_ANAGLYPH_TRIOSCOPIC 8
-#define STEREO_MODE_ANAGLYPH_AMBER_BLUE 9
-
-#define TRUE 1
-#define FALSE 0
-
-const vec2 left_single_matrix  = vec2(1.f, 0.4898f);
-const vec2 right_single_matrix = vec2(0.f, 0.510204f);
-const vec2 sbs_single_matrix   = vec2(2.0, 0.4898f);
-const vec2 sbs_multi_matrix    = vec2(2.0, 1.0);
-const vec2 ou_single_matrix    = vec2(1.0, 0.9796f);
-const vec2 ou_multi_matrix     = vec2(1.0, 2.0);
-
-#ifdef VULKAN
-layout(push_constant) uniform static_data
-{
-	float gamma;
-	int limit_range;
-	int stereo_display_mode;
-	int stereo_image_count;
-};
-#else
-uniform float gamma;
-uniform int limit_range;
-uniform int stereo_display_mode;
-uniform int stereo_image_count;
-#endif
-
-vec4 anaglyph(const in vec4 left, const in vec4 right)
-{
-	switch (stereo_display_mode)
-	{
-	case STEREO_MODE_ANAGLYPH_RED_GREEN:    return vec4(left.r, right.g, 0.f, 1.f);
-	case STEREO_MODE_ANAGLYPH_RED_BLUE:     return vec4(left.r, 0.f, right.b, 1.f);
-	case STEREO_MODE_ANAGLYPH_RED_CYAN:     return vec4(left.r, right.g, right.b, 1.f);
-	case STEREO_MODE_ANAGLYPH_MAGENTA_CYAN: return vec4(left.r, right.g, (left.b + right.b) / 2.f, 1.f);
-	case STEREO_MODE_ANAGLYPH_TRIOSCOPIC:   return vec4(right.r, left.g, right.b, 1.f);
-	case STEREO_MODE_ANAGLYPH_AMBER_BLUE:   return vec4(left.r, left.g, (right.r + right.g + right.b) / 3.f, 1.f);
-	default:                                return texture(fs0, tc0);
-	}
-}
-
-vec4 anaglyph_single_image()
-{
-	const vec4 left  = texture(fs0, tc0 * left_single_matrix);
-	const vec4 right = texture(fs0, (tc0 * left_single_matrix) + right_single_matrix);
-
-	return anaglyph(left, right);
-}
-
-vec4 anaglyph_stereo_image()
-{
-	const vec4 left = texture(fs0, tc0);
-	const vec4 right = texture(fs1, tc0);
-	
-	return anaglyph(left, right);
-}
-
-vec4 read_source()
-{
-	if (stereo_display_mode == STEREO_MODE_DISABLED)
-	{
-		return texture(fs0, tc0);
-	}
-
-	if (stereo_image_count == 1)
-	{
-		switch (stereo_display_mode)
-		{
-			case STEREO_MODE_ANAGLYPH_RED_GREEN:
-			case STEREO_MODE_ANAGLYPH_RED_BLUE:
-			case STEREO_MODE_ANAGLYPH_RED_CYAN:
-			case STEREO_MODE_ANAGLYPH_MAGENTA_CYAN:
-			case STEREO_MODE_ANAGLYPH_TRIOSCOPIC:
-			case STEREO_MODE_ANAGLYPH_AMBER_BLUE:
-				return anaglyph_single_image();
-			case STEREO_MODE_SIDE_BY_SIDE:
-				return (tc0.x < 0.5)
-					? texture(fs0, tc0 * sbs_single_matrix)
-					: texture(fs0, (tc0 * sbs_single_matrix) + vec2(-1.f, 0.510204f));
-			case STEREO_MODE_OVER_UNDER:
-				return (tc0.y < 0.5)
-					? texture(fs0, tc0 * ou_single_matrix)
-					: texture(fs0, (tc0 * ou_single_matrix) + vec2(0.f, 0.020408f));
-			case STEREO_MODE_INTERLACED:
-				return ((int(gl_FragCoord.y) & 1) > 0)
-					? texture(fs0, tc0 * left_single_matrix)
-					: texture(fs0, (tc0 * left_single_matrix) + right_single_matrix);
-			default: // undefined behavior
-				return texture(fs0, tc0);
-		}
-	}
-
-	if (stereo_image_count == 2)
-	{
-		switch (stereo_display_mode)
-		{
-			case STEREO_MODE_ANAGLYPH_RED_GREEN:
-			case STEREO_MODE_ANAGLYPH_RED_BLUE:
-			case STEREO_MODE_ANAGLYPH_RED_CYAN:
-			case STEREO_MODE_ANAGLYPH_MAGENTA_CYAN:
-			case STEREO_MODE_ANAGLYPH_TRIOSCOPIC:
-			case STEREO_MODE_ANAGLYPH_AMBER_BLUE:
-				return anaglyph_stereo_image();
-			case STEREO_MODE_SIDE_BY_SIDE:
-				return (tc0.x < 0.5)
-					? texture(fs0, (tc0 * sbs_multi_matrix))
-					: texture(fs1, (tc0 * sbs_multi_matrix) + vec2(-1.f, 0.f));
-			case STEREO_MODE_OVER_UNDER:
-				return (tc0.y < 0.5)
-					? texture(fs0, (tc0 * ou_multi_matrix))
-					: texture(fs1, (tc0 * ou_multi_matrix) + vec2(0.f, -1.f));
-			case STEREO_MODE_INTERLACED:
-				return ((int(gl_FragCoord.y) & 1) > 0)
-					? texture(fs0, tc0)
-					: texture(fs1, tc0);
-			default: // undefined behavior
-				return texture(fs0, tc0);
-		}
-	}
-
-	// Unreachable. Return debug color fill
-	return vec4(1., 0., 0., 1.);
-}
-
-void main()
-{
-	vec4 color = read_source();
-	color.rgb = pow(color.rgb, vec3(gamma));
-	ocol = (limit_range == FALSE)
-		? color
-		: ((color * 220.) + 16.) / 255.;
-	ocol.a = 1.f;
-}
-)"
diff --git a/rpcs3/Emu/RSX/Program/GLSLTypes.h b/rpcs3/Emu/RSX/Program/GLSLTypes.h
index 8967dd7598..8c443a19bd 100644
--- a/rpcs3/Emu/RSX/Program/GLSLTypes.h
+++ b/rpcs3/Emu/RSX/Program/GLSLTypes.h
@@ -2,52 +2,40 @@
 
 namespace glsl
 {
-	enum program_domain : unsigned char
+	enum program_domain
 	{
 		glsl_vertex_program = 0,
 		glsl_fragment_program = 1,
 		glsl_compute_program = 2
 	};
 
-	enum glsl_rules : unsigned char
+	enum glsl_rules
 	{
 		glsl_rules_opengl4,
-		glsl_rules_vulkan
+		glsl_rules_spirv
 	};
 
 	struct shader_properties
 	{
-		glsl::program_domain domain : 3;
-
+		glsl::program_domain domain;
 		// Applicable in vertex stage
-		bool require_lit_emulation : 1;
-		bool require_explicit_invariance : 1;
-		bool require_instanced_render : 1;
-		bool emulate_zclip_transform : 1;
-		bool emulate_depth_clip_only : 1;
+		bool require_lit_emulation;
 
 		// Only relevant for fragment programs
-		bool fp32_outputs : 1;
-		bool require_wpos : 1;
-		bool require_srgb_to_linear : 1;
-		bool require_linear_to_srgb : 1;
-		bool require_fog_read : 1;
-		bool emulate_coverage_tests : 1;
-		bool emulate_shadow_compare : 1;
-		bool low_precision_tests : 1;
-		bool disable_early_discard : 1;
-		bool supports_native_fp16 : 1;
-		bool ROP_output_rounding : 1;
-
-		// Texturing spec
-		bool require_texture_ops : 1;           // Global switch to enable/disable all texture code
-		bool require_depth_conversion : 1;      // Include DSV<->RTV bitcast emulation
-		bool require_tex_shadow_ops : 1;        // Include shadow compare emulation
-		bool require_msaa_ops : 1;              // Include MSAA<->Resolved bitcast emulation
-		bool require_texture_expand : 1;        // Include sign-expansion emulation
-		bool require_tex1D_ops : 1;             // Include 1D texture stuff
-		bool require_tex2D_ops : 1;             // Include 2D texture stuff
-		bool require_tex3D_ops : 1;             // Include 3D texture stuff (including cubemap)
-		bool require_shadowProj_ops : 1;        // Include shadow2DProj projection textures (1D is unsupported anyway)
+		bool fp32_outputs;
+		bool require_wpos;
+		bool require_depth_conversion;
+		bool require_texture_ops;
+		bool require_shadow_ops;
+		bool require_texture_expand;
+		bool require_srgb_to_linear;
+		bool require_linear_to_srgb;
+		bool emulate_coverage_tests;
+		bool emulate_shadow_compare;
+		bool emulate_zclip_transform;
+		bool emulate_depth_clip_only;
+		bool low_precision_tests;
+		bool disable_early_discard;
+		bool supports_native_fp16;
 	};
 };
diff --git a/rpcs3/Emu/RSX/Program/MSAA/ColorResolvePass.glsl b/rpcs3/Emu/RSX/Program/MSAA/ColorResolvePass.glsl
deleted file mode 100644
index d2e1c25b60..0000000000
--- a/rpcs3/Emu/RSX/Program/MSAA/ColorResolvePass.glsl
+++ /dev/null
@@ -1,37 +0,0 @@
-R"(
-#version 430
-
-layout(local_size_x=%WORKGROUP_SIZE_X, local_size_y=%WORKGROUP_SIZE_Y, local_size_z=1) in;
-
-#ifdef VULKAN
-layout(set=0, binding=0, %IMAGE_FORMAT) uniform readonly restrict image2DMS multisampled;
-layout(set=0, binding=1) uniform writeonly restrict image2D resolve;
-#else
-layout(binding=0, %IMAGE_FORMAT) uniform readonly restrict image2DMS multisampled;
-layout(binding=1) uniform writeonly restrict image2D resolve;
-#endif
-
-#if %BGRA_SWAP
-#define shuffle(x) (x.bgra)
-#else
-#define shuffle(x) (x)
-#endif
-
-void main()
-{
-	ivec2 resolve_size = imageSize(resolve);
-	ivec2 aa_size = imageSize(multisampled);
-	ivec2 sample_count = resolve_size / aa_size;
-
-	if (any(greaterThanEqual(gl_GlobalInvocationID.xy, uvec2(resolve_size)))) return;
-
-	ivec2 resolve_coords = ivec2(gl_GlobalInvocationID.xy);
-	ivec2 aa_coords = resolve_coords / sample_count;
-	ivec2 sample_loc = ivec2(resolve_coords % sample_count);
-	int sample_index = sample_loc.x + (sample_loc.y * sample_count.y);
-
-	vec4 aa_sample = imageLoad(multisampled, aa_coords, sample_index);
-	imageStore(resolve, resolve_coords, shuffle(aa_sample));
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/MSAA/ColorUnresolvePass.glsl b/rpcs3/Emu/RSX/Program/MSAA/ColorUnresolvePass.glsl
deleted file mode 100644
index 56ed52b402..0000000000
--- a/rpcs3/Emu/RSX/Program/MSAA/ColorUnresolvePass.glsl
+++ /dev/null
@@ -1,37 +0,0 @@
-R"(
-#version 430
-
-layout(local_size_x=%WORKGROUP_SIZE_X, local_size_y=%WORKGROUP_SIZE_Y, local_size_z=1) in;
-
-#ifdef VULKAN
-layout(set=0, binding=0) uniform writeonly restrict image2DMS multisampled;
-layout(set=0, binding=1, %IMAGE_FORMAT) uniform readonly restrict image2D resolve;
-#else
-layout(binding=0) uniform writeonly restrict image2DMS multisampled;
-layout(binding=1, %IMAGE_FORMAT) uniform readonly restrict image2D resolve;
-#endif
-
-#if %BGRA_SWAP
-#define shuffle(x) (x.bgra)
-#else
-#define shuffle(x) (x)
-#endif
-
-void main()
-{
-	ivec2 resolve_size = imageSize(resolve);
-	ivec2 aa_size = imageSize(multisampled);
-	ivec2 sample_count = resolve_size / aa_size;
-
-	if (any(greaterThanEqual(gl_GlobalInvocationID.xy, uvec2(resolve_size)))) return;
-
-	ivec2 resolve_coords = ivec2(gl_GlobalInvocationID.xy);
-	ivec2 aa_coords = resolve_coords / sample_count;
-	ivec2 sample_loc = ivec2(resolve_coords % sample_count);
-	int sample_index = sample_loc.x + (sample_loc.y * sample_count.y);
-
-	vec4 resolved_sample = imageLoad(resolve, resolve_coords);
-	imageStore(multisampled, aa_coords, sample_index, shuffle(resolved_sample));
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/MSAA/DepthResolvePass.glsl b/rpcs3/Emu/RSX/Program/MSAA/DepthResolvePass.glsl
deleted file mode 100644
index cc957aa0ac..0000000000
--- a/rpcs3/Emu/RSX/Program/MSAA/DepthResolvePass.glsl
+++ /dev/null
@@ -1,23 +0,0 @@
-R"(
-#version 420
-#extension GL_ARB_separate_shader_objects: enable
-
-#ifdef VULKAN
-layout(set=0, binding=0) uniform sampler2DMS fs0;
-layout(push_constant) uniform static_data { ivec2 sample_count; };
-#else
-layout(binding=31) uniform sampler2DMS fs0;
-uniform ivec2 sample_count;
-#endif
-
-void main()
-{
-	ivec2 out_coord = ivec2(gl_FragCoord.xy);
-	ivec2 in_coord = (out_coord / sample_count.xy);
-	ivec2 sample_loc = out_coord % sample_count.xy;
-	int sample_index = sample_loc.x + (sample_loc.y * sample_count.y);
-	float frag_depth = texelFetch(fs0, in_coord, sample_index).x;
-	gl_FragDepth = frag_depth;
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/MSAA/DepthStencilResolvePass.glsl b/rpcs3/Emu/RSX/Program/MSAA/DepthStencilResolvePass.glsl
deleted file mode 100644
index c547cc46b8..0000000000
--- a/rpcs3/Emu/RSX/Program/MSAA/DepthStencilResolvePass.glsl
+++ /dev/null
@@ -1,28 +0,0 @@
-R"(
-#version 420
-#extension GL_ARB_separate_shader_objects: enable
-#extension GL_ARB_shader_stencil_export : enable
-
-#ifdef VULKAN
-layout(set=0, binding=0) uniform sampler2DMS fs0;
-layout(set=0, binding=1) uniform usampler2DMS fs1;
-layout(push_constant) uniform static_data { ivec2 sample_count; };
-#else
-layout(binding=31) uniform sampler2DMS fs0;
-layout(binding=30) uniform usampler2DMS fs1;
-uniform ivec2 sample_count;
-#endif
-
-void main()
-{
-	ivec2 out_coord = ivec2(gl_FragCoord.xy);
-	ivec2 in_coord = (out_coord / sample_count.xy);
-	ivec2 sample_loc = out_coord % ivec2(sample_count.xy);
-	int sample_index = sample_loc.x + (sample_loc.y * sample_count.y);
-	float frag_depth = texelFetch(fs0, in_coord, sample_index).x;
-	uint frag_stencil = texelFetch(fs1, in_coord, sample_index).x;
-	gl_FragDepth = frag_depth;
-	gl_FragStencilRefARB = int(frag_stencil);
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/MSAA/DepthStencilUnresolvePass.glsl b/rpcs3/Emu/RSX/Program/MSAA/DepthStencilUnresolvePass.glsl
deleted file mode 100644
index de10cc351b..0000000000
--- a/rpcs3/Emu/RSX/Program/MSAA/DepthStencilUnresolvePass.glsl
+++ /dev/null
@@ -1,28 +0,0 @@
-R"(
-#version 420
-#extension GL_ARB_separate_shader_objects: enable
-#extension GL_ARB_shader_stencil_export : enable
-
-#ifdef VULKAN
-layout(set=0, binding=0) uniform sampler2D fs0;
-layout(set=0, binding=1) uniform usampler2D fs1;
-layout(push_constant) uniform static_data { ivec2 sample_count; };
-#else
-layout(binding=31) uniform sampler2D fs0;
-layout(binding=30) uniform usampler2D fs1;
-uniform ivec2 sample_count;
-#endif
-
-void main()
-{
-	ivec2 pixel_coord = ivec2(gl_FragCoord.xy);
-	pixel_coord *= sample_count.xy;
-	pixel_coord.x += (gl_SampleID % sample_count.x);
-	pixel_coord.y += (gl_SampleID / sample_count.x);
-	float frag_depth = texelFetch(fs0, pixel_coord, 0).x;
-	uint frag_stencil = texelFetch(fs1, pixel_coord, 0).x;
-	gl_FragDepth = frag_depth;
-	gl_FragStencilRefARB = int(frag_stencil);
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/MSAA/DepthUnresolvePass.glsl b/rpcs3/Emu/RSX/Program/MSAA/DepthUnresolvePass.glsl
deleted file mode 100644
index c4e5ee2f63..0000000000
--- a/rpcs3/Emu/RSX/Program/MSAA/DepthUnresolvePass.glsl
+++ /dev/null
@@ -1,23 +0,0 @@
-R"(
-#version 420
-#extension GL_ARB_separate_shader_objects: enable
-
-#ifdef VULKAN
-layout(set=0, binding=0) uniform sampler2D fs0;
-layout(push_constant) uniform static_data { ivec2 sample_count; };
-#else
-layout(binding=31) uniform sampler2D fs0;
-uniform ivec2 sample_count;
-#endif
-
-void main()
-{
-	ivec2 pixel_coord = ivec2(gl_FragCoord.xy);
-	pixel_coord *= sample_count.xy;
-	pixel_coord.x += (gl_SampleID % sample_count.x);
-	pixel_coord.y += (gl_SampleID / sample_count.x);
-	float frag_depth = texelFetch(fs0, pixel_coord, 0).x;
-	gl_FragDepth = frag_depth;
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/MSAA/StencilResolvePass.glsl b/rpcs3/Emu/RSX/Program/MSAA/StencilResolvePass.glsl
deleted file mode 100644
index 5d954d7a5e..0000000000
--- a/rpcs3/Emu/RSX/Program/MSAA/StencilResolvePass.glsl
+++ /dev/null
@@ -1,28 +0,0 @@
-R"(
-#version 420
-#extension GL_ARB_separate_shader_objects: enable
-
-#ifdef VULKAN
-layout(set=0, binding=0) uniform usampler2DMS fs0;
-layout(push_constant) uniform static_data
-{
-	layout(offset=0) ivec2 sample_count;
-	layout(offset=8) int stencil_mask;
-};
-#else
-layout(binding=31) uniform usampler2DMS fs0;
-uniform ivec2 sample_count;
-uniform int stencil_mask;
-#endif
-
-void main()
-{
-	ivec2 out_coord = ivec2(gl_FragCoord.xy);
-	ivec2 in_coord = (out_coord / sample_count.xy);
-	ivec2 sample_loc = out_coord % sample_count.xy;
-	int sample_index = sample_loc.x + (sample_loc.y * sample_count.y);
-	uint frag_stencil = texelFetch(fs0, in_coord, sample_index).x;
-	if ((frag_stencil & uint(stencil_mask)) == 0) discard;
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/MSAA/StencilUnresolvePass.glsl b/rpcs3/Emu/RSX/Program/MSAA/StencilUnresolvePass.glsl
deleted file mode 100644
index c3a0f65be1..0000000000
--- a/rpcs3/Emu/RSX/Program/MSAA/StencilUnresolvePass.glsl
+++ /dev/null
@@ -1,28 +0,0 @@
-R"(
-#version 420
-#extension GL_ARB_separate_shader_objects: enable
-
-#ifdef VULKAN
-layout(set=0, binding=0) uniform usampler2D fs0;
-layout(push_constant) uniform static_data
-{
-	layout(offset=0) ivec2 sample_count;
-	layout(offset=8) int stencil_mask;
-};
-#else
-layout(binding=31) uniform usampler2D fs0;
-uniform ivec2 sample_count;
-uniform int stencil_mask;
-#endif
-
-void main()
-{
-	ivec2 pixel_coord = ivec2(gl_FragCoord.xy);
-	pixel_coord *= sample_count.xy;
-	pixel_coord.x += (gl_SampleID % sample_count.x);
-	pixel_coord.y += (gl_SampleID / sample_count.x);
-	uint frag_stencil = texelFetch(fs0, pixel_coord, 0).x;
-	if ((frag_stencil & uint(stencil_mask)) == 0) discard;
-}
-
-)"
diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp
index 67cd710a2c..6dafaf2bd7 100644
--- a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp
+++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp
@@ -1,137 +1,34 @@
 #include "stdafx.h"
 #include "ProgramStateCache.h"
 #include "Emu/system_config.h"
-#include "Emu/RSX/Core/RSXDriverState.h"
-#include "util/sysinfo.hpp"
 
 #include <stack>
-
-#if defined(ARCH_X64)
-#include "emmintrin.h"
-#include "immintrin.h"
-#endif
-
-#ifdef ARCH_ARM64
-#ifndef _MSC_VER
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include "Emu/CPU/sse2neon.h"
-#ifndef _MSC_VER
-#pragma GCC diagnostic pop
-#endif
-#endif
-
-#ifdef _MSC_VER
-#define AVX512_ICL_FUNC
-#else
-#define AVX512_ICL_FUNC __attribute__((__target__("avx512f,avx512bw,avx512dq,avx512cd,avx512vl,avx512bitalg,avx512ifma,avx512vbmi,avx512vbmi2,avx512vnni,avx512vpopcntdq")))
-#endif
-
+#include "util/v128.hpp"
 
 using namespace program_hash_util;
 
-#ifdef ARCH_X64
-AVX512_ICL_FUNC usz get_vertex_program_ucode_hash_512(const RSXVertexProgram &program)
+usz vertex_program_utils::get_vertex_program_ucode_hash(const RSXVertexProgram &program)
 {
-	// Load all elements of the instruction_mask bitset
-	const __m512i* instMask512 = utils::bless<const __m512i>(&program.instruction_mask);
-	const __m128i* instMask128 = utils::bless<const __m128i>(&program.instruction_mask);
+	// 64-bit Fowler/Noll/Vo FNV-1a hash code
+	usz hash = 0xCBF29CE484222325ULL;
+	const void* instbuffer = program.data.data();
+	usz instIndex = 0;
 
-	const __m512i lowerMask = _mm512_loadu_si512(instMask512);
-	const __m128i upper128 = _mm_loadu_si128(instMask128 + 4);
-	const __m512i upperMask = _mm512_zextsi128_si512(upper128);
-	
-	__m512i maskIndex = _mm512_setzero_si512();
-	const __m512i negativeOnes = _mm512_set1_epi64(-1);
-
-	// Special masks to test against bitset 
-	const __m512i testMask0 = _mm512_set_epi64(
-	0x0808080808080808,
-	0x0808080808080808,
-	0x0404040404040404,
-	0x0404040404040404,
-	0x0202020202020202,
-	0x0202020202020202,
-	0x0101010101010101,
-	0x0101010101010101);
-
-	const __m512i testMask1 = _mm512_set_epi64(
-	0x8080808080808080,
-	0x8080808080808080,
-	0x4040404040404040,
-	0x4040404040404040,
-	0x2020202020202020,
-	0x2020202020202020,
-	0x1010101010101010,
-	0x1010101010101010);
-
-	const __m512i* instBuffer = reinterpret_cast<const __m512i*>(program.data.data());
-	__m512i acc0 = _mm512_setzero_si512();
-	__m512i acc1 = _mm512_setzero_si512();
-
-	__m512i rotMask0 = _mm512_set_epi64(7, 6, 5, 4, 3, 2, 1, 0);
-	__m512i rotMask1 = _mm512_set_epi64(15, 14, 13, 12, 11, 10, 9, 8);
-	const __m512i rotMaskAdd = _mm512_set_epi64(16, 16, 16, 16, 16, 16, 16, 16);
-
-	u32 instIndex = 0;
-
-	// If there is remainder, add an extra (masked) iteration
-	const u32 extraIteration = (program.data.size() % 32 != 0) ? 1 : 0;
-	const u32 length = static_cast<u32>(program.data.size() / 32) + extraIteration;
-
-	// The instruction mask will prevent us from reading out of bounds, we do not need a seperate masked loop
-	// for the remainder, or a scalar loop.
-	while (instIndex < (length))
+	for (unsigned i = 0; i < program.data.size() / 4; i++)
 	{
-		const __m512i masks = _mm512_permutex2var_epi8(lowerMask, maskIndex, upperMask);
-		const __mmask8 result0 = _mm512_test_epi64_mask(masks, testMask0);
-		const __mmask8 result1 = _mm512_test_epi64_mask(masks, testMask1);
-		const __m512i load0 = _mm512_maskz_loadu_epi64(result0, (instBuffer + instIndex * 2));
-		const __m512i load1 = _mm512_maskz_loadu_epi64(result1, (instBuffer + (instIndex * 2)+ 1));
-
-		const __m512i rotated0 = _mm512_rorv_epi64(load0, rotMask0);
-		const __m512i rotated1 = _mm512_rorv_epi64(load1, rotMask1);
-
-		acc0 = _mm512_add_epi64(acc0, rotated0);
-		acc1 = _mm512_add_epi64(acc1, rotated1);
-
-		rotMask0 = _mm512_add_epi64(rotMask0, rotMaskAdd);
-		rotMask1 = _mm512_add_epi64(rotMask1, rotMaskAdd);
-		maskIndex = _mm512_sub_epi8(maskIndex, negativeOnes);
+		if (program.instruction_mask[i])
+		{
+			const auto inst = v128::loadu(instbuffer, instIndex);
+			hash ^= inst._u64[0];
+			hash += (hash << 1) + (hash << 4) + (hash << 5) + (hash << 7) + (hash << 8) + (hash << 40);
+			hash ^= inst._u64[1];
+			hash += (hash << 1) + (hash << 4) + (hash << 5) + (hash << 7) + (hash << 8) + (hash << 40);
+		}
 
 		instIndex++;
 	}
-
-	const __m512i result = _mm512_add_epi64(acc0, acc1);
-	return _mm512_reduce_add_epi64(result);
+	return hash;
 }
-#endif
-
-usz vertex_program_utils::get_vertex_program_ucode_hash(const RSXVertexProgram &program)
-{
- 	// Checksum as hash with rotated data
- 	const void* instbuffer = program.data.data();
- 	u32 instIndex = 0;
- 	usz acc0 = 0;
- 	usz acc1 = 0;
-
- 	do
- 	{
- 		if (program.instruction_mask[instIndex])
- 		{
- 			const auto inst = v128::loadu(instbuffer, instIndex);
- 			const usz tmp0 = std::rotr(inst._u64[0], instIndex * 2);
- 			acc0 += tmp0;
- 			const usz tmp1 = std::rotr(inst._u64[1], (instIndex * 2) + 1);
- 			acc1 += tmp1;
- 		}
-
- 		instIndex++;
- 	} while (instIndex < (program.data.size() / 4));
-	return acc0 + acc1;
- }
 
 vertex_program_utils::vertex_program_metadata vertex_program_utils::analyse_vertex_program(const u32* data, u32 entry, RSXVertexProgram& dst_prog)
 {
@@ -144,15 +41,16 @@ vertex_program_utils::vertex_program_metadata vertex_program_utils::analyse_vert
 	bool has_branch_instruction = false;
 	std::stack<u32> call_stack;
 
-	D3 d3{};
-	D2 d2{};
-	D1 d1{};
-	D0 d0{};
+	D3  d3;
+	D2  d2;
+	D1  d1;
+	D0  d0;
 
 	std::function<void(u32, bool)> walk_function = [&](u32 start, bool fast_exit)
 	{
 		u32 current_instruction = start;
 		std::set<u32> conditional_targets;
+		bool has_printed_error = false;
 
 		while (true)
 		{
@@ -162,18 +60,24 @@ vertex_program_utils::vertex_program_metadata vertex_program_utils::analyse_vert
 			{
 				if (!fast_exit)
 				{
-					// This can be harmless if a dangling RET was encountered before.
-					// This can also be legal in case of BRB...BRI loops since BRIs are conditional. Might just be a loop with exit cond.
-					rsx_log.warning("vp_analyser: Possible infinite loop detected");
+					if (!has_printed_error)
+					{
+						// This can be harmless if a dangling RET was encountered before
+						rsx_log.error("vp_analyser: Possible infinite loop detected");
+						has_printed_error = true;
+					}
+					current_instruction++;
+					continue;
+				}
+				else
+				{
+					// Block walk, looking for earliest exit
+					break;
 				}
-
-				// There is never any reason to continue scanning after self-intersecting on the control-flow tree.
-				break;
 			}
 
 			const auto instruction = v128::loadu(&data[current_instruction * 4]);
 			d1.HEX = instruction._u32[1];
-			d2.HEX = instruction._u32[2];
 			d3.HEX = instruction._u32[3];
 
 			// Touch current instruction
@@ -181,55 +85,15 @@ vertex_program_utils::vertex_program_metadata vertex_program_utils::analyse_vert
 			instruction_range.first = std::min(current_instruction, instruction_range.first);
 			instruction_range.second = std::max(current_instruction, instruction_range.second);
 
-			// Whether to check if the current instruction references an input stream
-			auto input_attribute_ref = [&]()
-			{
-				if (!d1.input_src)
-				{
-					// It is possible to reference ATTR0, but this is mandatory anyway. No need to explicitly test for it
-					return;
-				}
-
-				const auto ref_mask = (1u << d1.input_src);
-				if ((result.referenced_inputs_mask & ref_mask) == 0)
-				{
-					// Type is encoded in the first 2 bits of each block
-					const auto src0 = d2.src0l & 0x3;
-					const auto src1 = d2.src1  & 0x3;
-					const auto src2 = d3.src2l & 0x3;
-
-					if ((src0 == RSX_VP_REGISTER_TYPE_INPUT) ||
-						(src1 == RSX_VP_REGISTER_TYPE_INPUT) ||
-						(src2 == RSX_VP_REGISTER_TYPE_INPUT))
-					{
-						result.referenced_inputs_mask |= ref_mask;
-					}
-				}
-			};
-
-			auto branch_to = [&](const u32 target)
-			{
-				input_attribute_ref();
-				current_instruction = target;
-			};
-
 			// Basic vec op analysis, must be done before flow analysis
 			switch (d1.vec_opcode)
 			{
-			case RSX_VEC_OPCODE_NOP:
-			{
-				break;
-			}
 			case RSX_VEC_OPCODE_TXL:
 			{
+				d2.HEX = instruction._u32[2];
 				result.referenced_textures_mask |= (1 << d2.tex_num);
 				break;
 			}
-			default:
-			{
-				input_attribute_ref();
-				break;
-			}
 			}
 
 			bool static_jump = false;
@@ -237,10 +101,6 @@ vertex_program_utils::vertex_program_metadata vertex_program_utils::analyse_vert
 
 			switch (d1.sca_opcode)
 			{
-			case RSX_SCA_OPCODE_NOP:
-			{
-				break;
-			}
 			case RSX_SCA_OPCODE_BRI:
 			{
 				d0.HEX = instruction._u32[0];
@@ -261,18 +121,19 @@ vertex_program_utils::vertex_program_metadata vertex_program_utils::analyse_vert
 				has_branch_instruction = true;
 
 				d0.HEX = instruction._u32[0];
+				d2.HEX = instruction._u32[2];
 				const u32 jump_address = (d0.iaddrh2 << 9) | (d2.iaddrh << 3) | d3.iaddrl;
 
 				if (function_call)
 				{
 					call_stack.push(current_instruction + 1);
-					branch_to(jump_address);
+					current_instruction = jump_address;
 					continue;
 				}
 				else if (static_jump)
 				{
 					// NOTE: This will skip potential jump target blocks between current->target
-					branch_to(jump_address);
+					current_instruction = jump_address;
 					continue;
 				}
 				else
@@ -292,37 +153,18 @@ vertex_program_utils::vertex_program_metadata vertex_program_utils::analyse_vert
 				}
 				else
 				{
-					branch_to(call_stack.top());
+					current_instruction = call_stack.top();
 					call_stack.pop();
 					continue;
 				}
 
 				break;
 			}
-			default:
-			{
-				input_attribute_ref();
-				break;
-			}
 			}
 
-			// Check exit conditions...
-			if (d3.end)
+			if ((d3.end && (fast_exit || current_instruction >= instruction_range.second)) ||
+				(current_instruction + 1) == rsx::max_vertex_program_instructions)
 			{
-				// We have seen an end of instructions marker.
-				// Multiple exits may exist, usually skipped over by branching. Do not exit on end unless there is no branching.
-				if (!has_branch_instruction || fast_exit || current_instruction >= instruction_range.second)
-				{
-					// Conditions:
-					// 1. No branching so far. This will always be the exit.
-					// 2. Fast exit flag is set. This happens when walking through subroutines.
-					// 3. We've gone beyond the known instruction range. In this scenario, this is the furthest end marker seen so far. It has to be reached by some earlier branch.
-					break;
-				}
-			}
-			else if ((current_instruction + 1) == rsx::max_vertex_program_instructions)
-			{
-				// No more instructions to read.
 				break;
 			}
 
@@ -397,17 +239,6 @@ vertex_program_utils::vertex_program_metadata vertex_program_utils::analyse_vert
 			}
 		}
 
-		// Typical ubershaders have the dispatch at the top with subroutines following. However...
-		// some games have the dispatch block at the end and the subroutines above them.
-		// We need to simulate a jump-to-entry in this situation
-		// Normally this condition is handled by the conditional_targets walk, but sometimes this doesn't work due to cyclic branches
-		if (instruction_range.first < dst_prog.entry)
-		{
-			// Is there a subroutine that jumps into the entry? If not, add to jump table
-			const auto target = dst_prog.entry - instruction_range.first;
-			dst_prog.jump_table.insert(target);
-		}
-
 		// Verification
 		for (const u32 target : dst_prog.jump_table)
 		{
@@ -418,141 +249,42 @@ vertex_program_utils::vertex_program_metadata vertex_program_utils::analyse_vert
 		}
 	}
 
-	result.referenced_inputs_mask |= 1u; // VPOS is always enabled, else no rendering can happen
 	return result;
 }
 
 usz vertex_program_storage_hash::operator()(const RSXVertexProgram &program) const
 {
-#ifdef ARCH_X64
-	usz ucode_hash;
-
-		if (utils::has_avx512_icl())
-		{
-			ucode_hash = get_vertex_program_ucode_hash_512(program);
-		}
-		else
-		{
-			ucode_hash = vertex_program_utils::get_vertex_program_ucode_hash(program);
-		}
-#else
-	const usz ucode_hash = vertex_program_utils::get_vertex_program_ucode_hash(program);
-#endif
-	const u32 state_params[] =
-	{
-		program.ctrl,
-		program.output_mask,
-		program.texture_state.texture_dimensions,
-		program.texture_state.multisampled_textures,
-	};
-	const usz metadata_hash = rpcs3::hash_array(state_params);
-	return rpcs3::hash64(ucode_hash, metadata_hash);
+	usz hash = vertex_program_utils::get_vertex_program_ucode_hash(program);
+	hash ^= program.output_mask;
+	hash ^= program.texture_state.texture_dimensions;
+	return hash;
 }
 
-#ifdef ARCH_X64
-AVX512_ICL_FUNC bool vertex_program_compare_512(const RSXVertexProgram &binary1, const RSXVertexProgram &binary2)
-	{
-		// Load all elements of the instruction_mask bitset
-		const __m512i* instMask512 = utils::bless<const __m512i>(&binary1.instruction_mask);
-		const __m128i* instMask128 = utils::bless<const __m128i>(&binary1.instruction_mask);
-
-		const __m512i lowerMask = _mm512_loadu_si512(instMask512);
-		const __m128i upper128 = _mm_loadu_si128(instMask128 + 4);
-		const __m512i upperMask = _mm512_zextsi128_si512(upper128);
-		
-		__m512i maskIndex = _mm512_setzero_si512();
-		const __m512i negativeOnes = _mm512_set1_epi64(-1);
-
-		// Special masks to test against bitset 
-		const __m512i testMask0 = _mm512_set_epi64(
-		0x0808080808080808,
-		0x0808080808080808,
-		0x0404040404040404,
-		0x0404040404040404,
-		0x0202020202020202,
-		0x0202020202020202,
-		0x0101010101010101,
-		0x0101010101010101);
-
-		const __m512i testMask1 = _mm512_set_epi64(
-		0x8080808080808080,
-		0x8080808080808080,
-		0x4040404040404040,
-		0x4040404040404040,
-		0x2020202020202020,
-		0x2020202020202020,
-		0x1010101010101010,
-		0x1010101010101010);
-
-		const __m512i* instBuffer1 = reinterpret_cast<const __m512i*>(binary1.data.data());
-		const __m512i* instBuffer2 = reinterpret_cast<const __m512i*>(binary2.data.data());
-
-		// If there is remainder, add an extra (masked) iteration
-		const u32 extraIteration = (binary1.data.size() % 32 != 0) ? 1 : 0;
-		const u32 length = static_cast<u32>(binary1.data.size() / 32) + extraIteration;
-
-		u32 instIndex = 0;
-
-		// The instruction mask will prevent us from reading out of bounds, we do not need a seperate masked loop
-		// for the remainder, or a scalar loop.
-		while (instIndex < (length))
-		{
-			const __m512i masks = _mm512_permutex2var_epi8(lowerMask, maskIndex, upperMask);
-
-			const __mmask8 result0 = _mm512_test_epi64_mask(masks, testMask0);
-			const __mmask8 result1 = _mm512_test_epi64_mask(masks, testMask1);
-
-			const __m512i load0 = _mm512_maskz_loadu_epi64(result0, (instBuffer1 + (instIndex * 2)));
-			const __m512i load1 = _mm512_maskz_loadu_epi64(result0, (instBuffer2 + (instIndex * 2)));
-			const __m512i load2 = _mm512_maskz_loadu_epi64(result1, (instBuffer1 + (instIndex * 2) + 1));
-			const __m512i load3 = _mm512_maskz_loadu_epi64(result1, (instBuffer2 + (instIndex * 2)+ 1));
-
-			const __mmask8 res0 = _mm512_cmpneq_epi64_mask(load0, load1);
-			const __mmask8 res1 = _mm512_cmpneq_epi64_mask(load2, load3);
-
-			const u8 result = _kortestz_mask8_u8(res0, res1);
-
-			//kortestz will set result to 1 if all bits are zero, so invert the check for result
-			if (!result)
-			{
-				return false;
-			}
-
-			maskIndex = _mm512_sub_epi8(maskIndex, negativeOnes);
-
-			instIndex++;
-		}
-
-		return true;
-	}
-#endif
-
 bool vertex_program_compare::operator()(const RSXVertexProgram &binary1, const RSXVertexProgram &binary2) const
 {
-	if (!compare_properties(binary1, binary2))
-	{
+	if (binary1.output_mask != binary2.output_mask)
 		return false;
-	}
-
-	if (binary1.data.size() != binary2.data.size() ||
-		binary1.jump_table != binary2.jump_table)
-	{
+	if (binary1.texture_state != binary2.texture_state)
+		return false;
+	if (binary1.data.size() != binary2.data.size())
+		return false;
+	if (binary1.jump_table != binary2.jump_table)
+		return false;
+	if (!binary1.skip_vertex_input_check && !binary2.skip_vertex_input_check && binary1.rsx_vertex_inputs != binary2.rsx_vertex_inputs)
 		return false;
-	}
-
-#ifdef ARCH_X64
-	if (utils::has_avx512_icl())
-	{
-		return vertex_program_compare_512(binary1, binary2);
-	}
-#endif
 
 	const void* instBuffer1 = binary1.data.data();
 	const void* instBuffer2 = binary2.data.data();
 	usz instIndex = 0;
-	while (instIndex < (binary1.data.size() / 4))
+	for (unsigned i = 0; i < binary1.data.size() / 4; i++)
 	{
-		if (binary1.instruction_mask[instIndex])
+		const auto active = binary1.instruction_mask[instIndex];
+		if (active != binary2.instruction_mask[instIndex])
+		{
+			return false;
+		}
+
+		if (active)
 		{
 			const auto inst1 = v128::loadu(instBuffer1, instIndex);
 			const auto inst2 = v128::loadu(instBuffer2, instIndex);
@@ -568,17 +300,10 @@ bool vertex_program_compare::operator()(const RSXVertexProgram &binary1, const R
 	return true;
 }
 
-bool vertex_program_compare::compare_properties(const RSXVertexProgram& binary1, const RSXVertexProgram& binary2)
-{
-	return binary1.output_mask == binary2.output_mask &&
-		binary1.ctrl == binary2.ctrl &&
-		binary1.texture_state == binary2.texture_state;
-}
 
-bool fragment_program_utils::is_any_src_constant(v128 sourceOperand)
+bool fragment_program_utils::is_constant(u32 sourceOperand)
 {
-	const u64 masked = sourceOperand._u64[1] & 0x30000000300;
-	return (sourceOperand._u32[1] & 0x300) == 0x200 || (static_cast<u32>(masked) == 0x200 || static_cast<u32>(masked >> 32) == 0x200);
+	return ((sourceOperand >> 8) & 0x3) == 2;
 }
 
 usz fragment_program_utils::get_fragment_program_ucode_size(const void* ptr)
@@ -588,9 +313,12 @@ usz fragment_program_utils::get_fragment_program_ucode_size(const void* ptr)
 	while (true)
 	{
 		const v128 inst = v128::loadu(instBuffer, instIndex);
-		const bool end = (inst._u32[0] >> 8) & 0x1;
+		bool isSRC0Constant = is_constant(inst._u32[1]);
+		bool isSRC1Constant = is_constant(inst._u32[2]);
+		bool isSRC2Constant = is_constant(inst._u32[3]);
+		bool end = (inst._u32[0] >> 8) & 0x1;
 
-		if (is_any_src_constant(inst))
+		if (isSRC0Constant || isSRC1Constant || isSRC2Constant)
 		{
 			instIndex += 2;
 			if (end)
@@ -610,30 +338,6 @@ fragment_program_utils::fragment_program_metadata fragment_program_utils::analys
 	const auto instBuffer = ptr;
 	s32 index = 0;
 
-	// Find the start of the program
-	while (true)
-	{
-		const auto inst = v128::loadu(instBuffer, index);
-
-		const u32 opcode = (inst._u32[0] >> 16) & 0x3F;
-		if (opcode)
-		{
-			// We found the start of the program, don't advance the index
-			result.program_start_offset = index * 16;
-			break;
-		}
-
-		if ((inst._u32[0] >> 8) & 0x1)
-		{
-			result.program_start_offset = index * 16;
-			result.program_ucode_length = 16;
-			result.is_nop_shader = true;
-			return result;
-		}
-
-		index++;
-	}
-
 	while (true)
 	{
 		const auto inst = v128::loadu(instBuffer, index);
@@ -650,6 +354,11 @@ fragment_program_utils::fragment_program_metadata fragment_program_utils::analys
 			const u32 opcode = (inst._u32[0] >> 16) & 0x3F;
 			if (opcode)
 			{
+				if (result.program_start_offset == umax)
+				{
+					result.program_start_offset = index * 16;
+				}
+
 				switch (opcode)
 				{
 				case RSX_FP_OPCODE_TEX:
@@ -683,235 +392,106 @@ fragment_program_utils::fragment_program_metadata fragment_program_utils::analys
 				}
 			}
 
-			if (is_any_src_constant(inst))
+			if (is_constant(inst._u32[1]) || is_constant(inst._u32[2]) || is_constant(inst._u32[3]))
 			{
 				//Instruction references constant, skip one slot occupied by data
 				index++;
+				result.program_ucode_length += 16;
 				result.program_constants_buffer_length += 16;
 			}
 		}
 
-		index++;
+		if (result.program_start_offset != umax)
+		{
+			result.program_ucode_length += 16;
+		}
 
 		if ((inst._u32[0] >> 8) & 0x1)
 		{
+			if (result.program_start_offset == umax)
+			{
+				result.program_start_offset = index * 16;
+				result.program_ucode_length = 16;
+				result.is_nop_shader = true;
+			}
+
 			break;
 		}
+
+		index++;
 	}
 
-	result.program_ucode_length = (index - (result.program_start_offset / 16)) * 16;
 	return result;
 }
 
 usz fragment_program_utils::get_fragment_program_ucode_hash(const RSXFragmentProgram& program)
 {
-	// Checksum as hash with rotated data
+	// 64-bit Fowler/Noll/Vo FNV-1a hash code
+	usz hash = 0xCBF29CE484222325ULL;
 	const void* instbuffer = program.get_data();
-	usz acc0 = 0;
-	usz acc1 = 0;
-	for (int instIndex = 0; instIndex < static_cast<int>(program.ucode_length / 16); instIndex++)
+	usz instIndex = 0;
+	while (true)
 	{
 		const auto inst = v128::loadu(instbuffer, instIndex);
-		const usz tmp0 = std::rotr(inst._u64[0], instIndex * 2);
-		acc0 += tmp0;
-		const usz tmp1 = std::rotr(inst._u64[1], (instIndex * 2) + 1);
-		acc1 += tmp1;
+		hash ^= inst._u64[0];
+		hash += (hash << 1) + (hash << 4) + (hash << 5) + (hash << 7) + (hash << 8) + (hash << 40);
+		hash ^= inst._u64[1];
+		hash += (hash << 1) + (hash << 4) + (hash << 5) + (hash << 7) + (hash << 8) + (hash << 40);
+		instIndex++;
 		// Skip constants
-		if (fragment_program_utils::is_any_src_constant(inst))
+		if (fragment_program_utils::is_constant(inst._u32[1]) ||
+			fragment_program_utils::is_constant(inst._u32[2]) ||
+			fragment_program_utils::is_constant(inst._u32[3]))
 			instIndex++;
 
+		bool end = (inst._u32[0] >> 8) & 0x1;
+		if (end)
+			return hash;
 	}
-	return acc0 + acc1;
+	return 0;
 }
 
 usz fragment_program_storage_hash::operator()(const RSXFragmentProgram& program) const
 {
-	const usz ucode_hash = fragment_program_utils::get_fragment_program_ucode_hash(program);
-	const u32 state_params[] =
-	{
-		program.ctrl,
-		program.two_sided_lighting ? 1u : 0u,
-		program.texture_state.texture_dimensions,
-		program.texture_state.shadow_textures,
-		program.texture_state.redirected_textures,
-		program.texture_state.multisampled_textures,
-		program.texcoord_control_mask,
-		program.mrt_buffers_count
-	};
-	const usz metadata_hash = rpcs3::hash_array(state_params);
-	return rpcs3::hash64(ucode_hash, metadata_hash);
+	usz hash = fragment_program_utils::get_fragment_program_ucode_hash(program);
+	hash ^= program.ctrl;
+	hash ^= +program.two_sided_lighting;
+	hash ^= program.texture_state.texture_dimensions;
+	hash ^= program.texture_state.unnormalized_coords;
+	hash ^= program.texture_state.shadow_textures;
+	hash ^= program.texture_state.redirected_textures;
+	hash ^= program.texcoord_control_mask;
+
+	return hash;
 }
 
 bool fragment_program_compare::operator()(const RSXFragmentProgram& binary1, const RSXFragmentProgram& binary2) const
 {
-	if (!compare_properties(binary1, binary2))
-	{
+	if (binary1.ctrl != binary2.ctrl || binary1.texture_state != binary2.texture_state ||
+		binary1.texcoord_control_mask != binary2.texcoord_control_mask ||
+		binary1.two_sided_lighting != binary2.two_sided_lighting)
 		return false;
-	}
 
 	const void* instBuffer1 = binary1.get_data();
 	const void* instBuffer2 = binary2.get_data();
-	for (usz instIndex = 0; instIndex < (binary1.ucode_length / 16); instIndex++)
+	usz instIndex = 0;
+	while (true)
 	{
 		const auto inst1 = v128::loadu(instBuffer1, instIndex);
 		const auto inst2 = v128::loadu(instBuffer2, instIndex);
 
 		if (inst1._u ^ inst2._u)
-		{
 			return false;
-		}
 
+		instIndex++;
 		// Skip constants
-		if (fragment_program_utils::is_any_src_constant(inst1))
+		if (fragment_program_utils::is_constant(inst1._u32[1]) ||
+			fragment_program_utils::is_constant(inst1._u32[2]) ||
+			fragment_program_utils::is_constant(inst1._u32[3]))
 			instIndex++;
+
+		bool end = ((inst1._u32[0] >> 8) & 0x1) && ((inst2._u32[0] >> 8) & 0x1);
+		if (end)
+			return true;
 	}
-	
-	return true;
-}
-
-bool fragment_program_compare::compare_properties(const RSXFragmentProgram& binary1, const RSXFragmentProgram& binary2)
-{
-	return binary1.ucode_length == binary2.ucode_length &&
-		binary1.ctrl == binary2.ctrl &&
-		binary1.texture_state == binary2.texture_state &&
-		binary1.texcoord_control_mask == binary2.texcoord_control_mask &&
-		binary1.two_sided_lighting == binary2.two_sided_lighting &&
-		binary1.mrt_buffers_count == binary2.mrt_buffers_count;
-}
-
-namespace rsx
-{
-#if defined(ARCH_X64) || defined(ARCH_ARM64)
-	static inline void write_fragment_constants_to_buffer_sse2(const std::span<f32>& buffer, const RSXFragmentProgram& rsx_prog, const std::vector<usz>& offsets_cache, bool sanitize)
-	{
-		f32* dst = buffer.data();
-		for (usz offset_in_fragment_program : offsets_cache)
-		{
-			const char* data = static_cast<const char*>(rsx_prog.get_data()) + offset_in_fragment_program;
-
-			const __m128i vector = _mm_loadu_si128(reinterpret_cast<const __m128i*>(data));
-			const __m128i shuffled_vector = _mm_or_si128(_mm_slli_epi16(vector, 8), _mm_srli_epi16(vector, 8));
-
-			if (sanitize)
-			{
-				//Convert NaNs and Infs to 0
-				const auto masked = _mm_and_si128(shuffled_vector, _mm_set1_epi32(0x7fffffff));
-				const auto valid = _mm_cmplt_epi32(masked, _mm_set1_epi32(0x7f800000));
-				const auto result = _mm_and_si128(shuffled_vector, valid);
-				_mm_stream_si128(utils::bless<__m128i>(dst), result);
-			}
-			else
-			{
-				_mm_stream_si128(utils::bless<__m128i>(dst), shuffled_vector);
-			}
-
-			dst += 4;
-		}
-	}
-#else
-	static inline void write_fragment_constants_to_buffer_fallback(const std::span<f32>& buffer, const RSXFragmentProgram& rsx_prog, const std::vector<usz>& offsets_cache, bool sanitize)
-	{
-		f32* dst = buffer.data();
-
-		for (usz offset_in_fragment_program : offsets_cache)
-		{
-			const char* data = static_cast<const char*>(rsx_prog.get_data()) + offset_in_fragment_program;
-
-			for (u32 i = 0; i < 4; i++)
-			{
-				const u32 value = reinterpret_cast<const u32*>(data)[i];
-				const u32 shuffled = ((value >> 8) & 0xff00ff) | ((value << 8) & 0xff00ff00);
-
-				if (sanitize && (shuffled & 0x7fffffff) >= 0x7f800000)
-				{
-					dst[i] = 0.f;
-				}
-				else
-				{
-					dst[i] = std::bit_cast<f32>(shuffled);
-				}
-			}
-
-			dst += 4;
-		}
-	}
-#endif
-
-	void write_fragment_constants_to_buffer(const std::span<f32>& buffer, const RSXFragmentProgram& rsx_prog, const std::vector<usz>& offsets_cache, bool sanitize)
-	{
-#if defined(ARCH_X64) || defined(ARCH_ARM64)
-		write_fragment_constants_to_buffer_sse2(buffer, rsx_prog, offsets_cache, sanitize);
-#else
-		write_fragment_constants_to_buffer_fallback(buffer, rsx_prog, offsets_cache, sanitize);
-#endif
-	}
-
-	void program_cache_hint_t::invalidate(u32 flags)
-	{
-		if (flags & rsx::vertex_program_dirty)
-		{
-			m_cached_vertex_program = nullptr;
-		}
-
-		if (flags & rsx::fragment_program_dirty)
-		{
-			m_cached_fragment_program = nullptr;
-		}
-	}
-
-	void program_cache_hint_t::invalidate_vertex_program(const RSXVertexProgram& p)
-	{
-		if (!m_cached_vertex_program)
-		{
-			return;
-		}
-
-		if (!vertex_program_compare::compare_properties(m_cached_vp_properties, p))
-		{
-			m_cached_vertex_program = nullptr;
-		}
-	}
-
-	void program_cache_hint_t::invalidate_fragment_program(const RSXFragmentProgram& p)
-	{
-		if (!m_cached_fragment_program)
-		{
-			return;
-		}
-
-		if (!fragment_program_compare::compare_properties(m_cached_fp_properties, p))
-		{
-			m_cached_fragment_program = nullptr;
-		}
-	}
-
-	void program_cache_hint_t::cache_vertex_program(program_cache_hint_t* cache, const RSXVertexProgram& ref, void* vertex_program)
-	{
-		if (!cache)
-		{
-			return;
-		}
-
-		cache->m_cached_vertex_program = vertex_program;
-		cache->m_cached_vp_properties.output_mask = ref.output_mask;
-		cache->m_cached_vp_properties.ctrl = ref.ctrl;
-		cache->m_cached_vp_properties.texture_state = ref.texture_state;
-	}
-
-	void program_cache_hint_t::cache_fragment_program(program_cache_hint_t* cache, const RSXFragmentProgram& ref, void* fragment_program)
-	{
-		if (!cache)
-		{
-			return;
-		}
-
-		cache->m_cached_fragment_program = fragment_program;
-		cache->m_cached_fp_properties.ucode_length = ref.ucode_length;
-		cache->m_cached_fp_properties.ctrl = ref.ctrl;
-		cache->m_cached_fp_properties.texture_state = ref.texture_state;
-		cache->m_cached_fp_properties.texcoord_control_mask = ref.texcoord_control_mask;
-		cache->m_cached_fp_properties.two_sided_lighting = ref.two_sided_lighting;
-		cache->m_cached_fp_properties.mrt_buffers_count = ref.mrt_buffers_count;
-	}
-
 }
diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.h b/rpcs3/Emu/RSX/Program/ProgramStateCache.h
index 6007ac7f2d..235ff6e9ca 100644
--- a/rpcs3/Emu/RSX/Program/ProgramStateCache.h
+++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.h
@@ -6,8 +6,6 @@
 #include "Utilities/mutex.h"
 #include "util/logs.hpp"
 #include "util/fnv_hash.hpp"
-#include "util/v128.hpp"
-#include <util/bless.hpp>
 
 #include <span>
 #include <unordered_map>
@@ -27,8 +25,6 @@ namespace program_hash_util
 			std::bitset<rsx::max_vertex_program_instructions> instruction_mask;
 			u32 ucode_length;
 			u32 referenced_textures_mask;
-			u16 referenced_inputs_mask;
-			u16 reserved;
 		};
 
 		static usz get_vertex_program_ucode_hash(const RSXVertexProgram &program);
@@ -43,8 +39,6 @@ namespace program_hash_util
 
 	struct vertex_program_compare
 	{
-		static bool compare_properties(const RSXVertexProgram& binary1, const RSXVertexProgram& binary2);
-
 		bool operator()(const RSXVertexProgram &binary1, const RSXVertexProgram &binary2) const;
 	};
 
@@ -65,8 +59,7 @@ namespace program_hash_util
 		/**
 		* returns true if the given source Operand is a constant
 		*/
-
-		static bool is_any_src_constant(v128 sourceOperand);
+		static bool is_constant(u32 sourceOperand);
 
 		static usz get_fragment_program_ucode_size(const void* ptr);
 
@@ -82,64 +75,10 @@ namespace program_hash_util
 
 	struct fragment_program_compare
 	{
-		static bool compare_properties(const RSXFragmentProgram& binary1, const RSXFragmentProgram& binary2);
-
 		bool operator()(const RSXFragmentProgram &binary1, const RSXFragmentProgram &binary2) const;
 	};
 }
 
-namespace rsx
-{
-	struct program_cache_hint_t
-	{
-		template <typename T>
-		T* get_fragment_program() const
-		{
-			return utils::bless<T>(m_cached_fragment_program);
-		}
-
-		template <typename T>
-		T* get_vertex_program() const
-		{
-			return utils::bless<T>(m_cached_vertex_program);
-		}
-
-		bool has_vertex_program() const
-		{
-			return m_cached_vertex_program != nullptr;
-		}
-
-		bool has_fragment_program() const
-		{
-			return m_cached_fragment_program != nullptr;
-		}
-
-		// Invalidate caches if the renderer state shows they are out of date
-		void invalidate(u32 flags);
-
-		// Invalidate vertex program if the cached program is not compatible with the incoming
-		void invalidate_vertex_program(const RSXVertexProgram& p);
-
-		// Invalidate fragment program if the cached program is not compatible with the incoming
-		void invalidate_fragment_program(const RSXFragmentProgram& p);
-
-		// Helper - optionally cache the vertex program if possible
-		static void cache_vertex_program(program_cache_hint_t* cache, const RSXVertexProgram& ref, void* vertex_program);
-
-		// Helper - optionally cache the fragment program if possible
-		static void cache_fragment_program(program_cache_hint_t* cache, const RSXFragmentProgram& ref, void* fragment_program);
-
-	protected:
-		void* m_cached_fragment_program = nullptr;
-		void* m_cached_vertex_program = nullptr;
-
-		RSXFragmentProgram m_cached_fp_properties;
-		RSXVertexProgram m_cached_vp_properties;
-	};
-
-	void write_fragment_constants_to_buffer(const std::span<f32>& buffer, const RSXFragmentProgram& rsx_prog, const std::vector<usz>& offsets_cache, bool sanitize = true);
-}
-
 
 /**
 * Cache for program help structure (blob, string...)
@@ -148,13 +87,13 @@ namespace rsx
 * - a typedef VertexProgramData to a type that encapsulate vertex program info. It should provide an Id member.
 * - a typedef FragmentProgramData to a types that encapsulate fragment program info. It should provide an Id member and a fragment constant offset vector.
 * - a typedef PipelineData encapsulating monolithic program.
-* - a typedef pipeline_properties to a type that encapsulate various state info relevant to program compilation (alpha test, primitive type,...)
+* - a typedef PipelineProperties to a type that encapsulate various state info relevant to program compilation (alpha test, primitive type,...)
 * - a	typedef ExtraData type that will be passed to the buildProgram function.
 * It should also contains the following function member :
 * - static void recompile_fragment_program(RSXFragmentProgram *RSXFP, FragmentProgramData& fragmentProgramData, usz ID);
 * - static void recompile_vertex_program(RSXVertexProgram *RSXVP, VertexProgramData& vertexProgramData, usz ID);
-* - static PipelineData build_program(VertexProgramData &vertexProgramData, FragmentProgramData &fragmentProgramData, const pipeline_properties &pipeline_properties, const ExtraData& extraData);
-* - static void validate_pipeline_properties(const VertexProgramData &vertexProgramData, const FragmentProgramData &fragmentProgramData, pipeline_properties& props);
+* - static PipelineData build_program(VertexProgramData &vertexProgramData, FragmentProgramData &fragmentProgramData, const PipelineProperties &pipelineProperties, const ExtraData& extraData);
+* - static void validate_pipeline_properties(const VertexProgramData &vertexProgramData, const FragmentProgramData &fragmentProgramData, PipelineProperties& props);
 */
 template<typename backend_traits>
 class program_state_cache
@@ -168,8 +107,6 @@ class program_state_cache
 	using binary_to_vertex_program = std::unordered_map<RSXVertexProgram, vertex_program_type, program_hash_util::vertex_program_storage_hash, program_hash_util::vertex_program_compare> ;
 	using binary_to_fragment_program = std::unordered_map<RSXFragmentProgram, fragment_program_type, program_hash_util::fragment_program_storage_hash, program_hash_util::fragment_program_compare>;
 
-	using pipeline_data_type = std::tuple<pipeline_type*, const vertex_program_type*, const fragment_program_type*>;
-
 	struct pipeline_key
 	{
 		u32 vertex_program_id;
@@ -219,16 +156,8 @@ protected:
 	pipeline_storage_type __null_pipeline_handle;
 
 	/// bool here to inform that the program was preexisting.
-	std::tuple<const vertex_program_type&, bool> search_vertex_program(
-		rsx::program_cache_hint_t* cache_hint,
-		const RSXVertexProgram& rsx_vp)
+	std::tuple<const vertex_program_type&, bool> search_vertex_program(const RSXVertexProgram& rsx_vp, bool force_load = true)
 	{
-		if (cache_hint && cache_hint->has_vertex_program())
-		{
-			// The caller guarantees that the cached vertex program is correct.
-			return std::forward_as_tuple(*cache_hint->get_vertex_program<vertex_program_type>(), true);
-		}
-
 		bool recompile = false;
 		vertex_program_type* new_shader;
 		{
@@ -237,11 +166,15 @@ protected:
 			const auto& I = m_vertex_shader_cache.find(rsx_vp);
 			if (I != m_vertex_shader_cache.end())
 			{
-				rsx::program_cache_hint_t::cache_vertex_program(cache_hint, rsx_vp, &(I->second));
 				return std::forward_as_tuple(I->second, true);
 			}
 
-			rsx_log.trace("VP not found in buffer!");
+			if (!force_load)
+			{
+				return std::forward_as_tuple(__null_vertex_program, false);
+			}
+
+			rsx_log.notice("VP not found in buffer!");
 
 			lock.upgrade();
 			auto [it, inserted] = m_vertex_shader_cache.try_emplace(rsx_vp);
@@ -254,33 +187,31 @@ protected:
 			backend_traits::recompile_vertex_program(rsx_vp, *new_shader, m_next_id++);
 		}
 
-		rsx::program_cache_hint_t::cache_vertex_program(cache_hint, rsx_vp, new_shader);
 		return std::forward_as_tuple(*new_shader, false);
 	}
 
 	/// bool here to inform that the program was preexisting.
-	std::tuple<const fragment_program_type&, bool> search_fragment_program(rsx::program_cache_hint_t* cache_hint, const RSXFragmentProgram& rsx_fp)
+	std::tuple<const fragment_program_type&, bool> search_fragment_program(const RSXFragmentProgram& rsx_fp, bool force_load = true)
 	{
-		if (cache_hint && cache_hint->has_fragment_program())
-		{
-			// The caller guarantees that the cached fragemnt program is correct.
-			return std::forward_as_tuple(*cache_hint->get_fragment_program<fragment_program_type>(), true);
-		}
-
 		bool recompile = false;
 		typename binary_to_fragment_program::iterator it;
 		fragment_program_type* new_shader;
+
 		{
 			reader_lock lock(m_fragment_mutex);
 
 			const auto& I = m_fragment_shader_cache.find(rsx_fp);
 			if (I != m_fragment_shader_cache.end())
 			{
-				rsx::program_cache_hint_t::cache_fragment_program(cache_hint, rsx_fp, &(I->second));
 				return std::forward_as_tuple(I->second, true);
 			}
 
-			rsx_log.trace("FP not found in buffer!");
+			if (!force_load)
+			{
+				return std::forward_as_tuple(__null_fragment_program, false);
+			}
+
+			rsx_log.notice("FP not found in buffer!");
 
 			lock.upgrade();
 			std::tie(it, recompile) = m_fragment_shader_cache.try_emplace(rsx_fp);
@@ -293,7 +224,6 @@ protected:
 			backend_traits::recompile_fragment_program(rsx_fp, *new_shader, m_next_id++);
 		}
 
-		rsx::program_cache_hint_t::cache_fragment_program(cache_hint, rsx_fp, new_shader);
 		return std::forward_as_tuple(*new_shader, false);
 	}
 
@@ -315,13 +245,13 @@ public:
 
 		program_buffer_patch_entry() = default;
 
-		program_buffer_patch_entry(f32 key, f32 value)
+		program_buffer_patch_entry(f32& key, f32& value)
 		{
 			fp_key = key;
 			fp_value = value;
 		}
 
-		program_buffer_patch_entry(u32 key, u32 value)
+		program_buffer_patch_entry(u32& key, u32& value)
 		{
 			hex_key = key;
 			hex_value = value;
@@ -341,43 +271,68 @@ public:
 		}
 	};
 
+	struct
+	{
+		std::unordered_map<f32, program_buffer_patch_entry> db;
+
+		void add(program_buffer_patch_entry& e)
+		{
+			db[e.fp_key] = e;
+		}
+
+		void add(f32& key, f32& value)
+		{
+			db[key] = { key, value };
+		}
+
+		void clear()
+		{
+			db.clear();
+		}
+
+		bool is_empty() const
+		{
+			return db.empty();
+		}
+	}
+	patch_table;
+
 public:
 	program_state_cache() = default;
 	~program_state_cache()
 	{}
 
 	template<typename... Args>
-	pipeline_data_type get_graphics_pipeline(
-		rsx::program_cache_hint_t* cache_hint,
-		const RSXVertexProgram& vertex_shader,
-		const RSXFragmentProgram& fragment_shader,
-		pipeline_properties& pipeline_properties,
+	pipeline_type* get_graphics_pipeline(
+		const RSXVertexProgram& vertexShader,
+		const RSXFragmentProgram& fragmentShader,
+		pipeline_properties& pipelineProperties,
 		bool compile_async,
 		bool allow_notification,
 		Args&& ...args
-	)
+		)
 	{
-		const auto& vp_search = search_vertex_program(cache_hint, vertex_shader);
-		const auto& fp_search = search_fragment_program(cache_hint, fragment_shader);
+		const auto &vp_search = search_vertex_program(vertexShader);
+		const auto &fp_search = search_fragment_program(fragmentShader);
 
 		const bool already_existing_fragment_program = std::get<1>(fp_search);
 		const bool already_existing_vertex_program = std::get<1>(vp_search);
 		const vertex_program_type& vertex_program = std::get<0>(vp_search);
 		const fragment_program_type& fragment_program = std::get<0>(fp_search);
-		const pipeline_key key = { vertex_program.id, fragment_program.id, pipeline_properties };
+		const pipeline_key key = { vertex_program.id, fragment_program.id, pipelineProperties };
 
 		m_cache_miss_flag = true;
 
 		if (already_existing_vertex_program && already_existing_fragment_program)
 		{
 			// There is a high chance the pipeline object was compiled if the two shaders already existed before
-			backend_traits::validate_pipeline_properties(vertex_program, fragment_program, pipeline_properties);
+			backend_traits::validate_pipeline_properties(vertex_program, fragment_program, pipelineProperties);
 
 			reader_lock lock(m_pipeline_mutex);
 			if (const auto I = m_storage.find(key); I != m_storage.end())
 			{
 				m_cache_miss_flag = (I->second == __null_pipeline_handle);
-				return { I->second.get(), &vertex_program, &fragment_program };
+				return I->second.get();
 			}
 		}
 
@@ -388,7 +343,7 @@ public:
 			if (const auto I = m_storage.find(key); I != m_storage.end())
 			{
 				m_cache_miss_flag = (I->second == __null_pipeline_handle);
-				return { I->second.get(), &vertex_program, &fragment_program };
+				return I->second.get();
 			}
 
 			// Insert a placeholder if the key still doesn't exist to avoid re-linking of the same pipeline
@@ -401,7 +356,7 @@ public:
 
 		if (allow_notification)
 		{
-			callback = [this, vertex_shader, fragment_shader_ = RSXFragmentProgram::clone(fragment_shader), key]
+			callback = [this, vertexShader, fragmentShader_ = RSXFragmentProgram::clone(fragmentShader), key]
 			(pipeline_storage_type& pipeline) -> pipeline_type*
 			{
 				if (!pipeline)
@@ -410,7 +365,7 @@ public:
 				}
 
 				rsx_log.success("Program compiled successfully");
-				notify_pipeline_compiled(key.properties, vertex_shader, fragment_shader_);
+				notify_pipeline_compiled(key.properties, vertexShader, fragmentShader_);
 
 				std::lock_guard lock(m_pipeline_mutex);
 				auto& pipe_result = m_storage[key];
@@ -434,28 +389,16 @@ public:
 			};
 		}
 
-		auto result = backend_traits::build_pipeline(
+		return backend_traits::build_pipeline(
 			vertex_program,                 // VS, must already be decompiled and recompiled above
 			fragment_program,               // FS, must already be decompiled and recompiled above
-			pipeline_properties,             // Pipeline state
+			pipelineProperties,             // Pipeline state
 			compile_async,                  // Allow asynchronous compilation
 			callback,                       // Insertion and notification callback
 			std::forward<Args>(args)...);   // Other arguments
-
-		return { result, &vertex_program, &fragment_program };
 	}
 
-	void fill_fragment_constants_buffer(std::span<f32> dst_buffer, const fragment_program_type& fragment_program, const RSXFragmentProgram& rsx_prog, bool sanitize = false) const
-	{
-		if (dst_buffer.size_bytes() < (fragment_program.FragmentConstantOffsetCache.size() * 16))
-		{
-			// This can happen if CELL alters the shader after it has been loaded by RSX.
-			rsx_log.error("Insufficient constants buffer size passed to fragment program! Corrupt shader?");
-			return;
-		}
-
-		rsx::write_fragment_constants_to_buffer(dst_buffer, rsx_prog, fragment_program.FragmentConstantOffsetCache, sanitize);
-	}
+	void fill_fragment_constants_buffer(std::span<f32> dst_buffer, const RSXFragmentProgram& fragment_program, bool sanitize = false) const;
 
 	void clear()
 	{
diff --git a/rpcs3/Emu/RSX/Program/RSXFragmentProgram.h b/rpcs3/Emu/RSX/Program/RSXFragmentProgram.h
index f834b7c7f5..b860a5d681 100644
--- a/rpcs3/Emu/RSX/Program/RSXFragmentProgram.h
+++ b/rpcs3/Emu/RSX/Program/RSXFragmentProgram.h
@@ -248,7 +248,7 @@ struct RSXFragmentProgram
 			this->operator=(other);
 		}
 
-		data_storage_helper(data_storage_helper&& other) noexcept
+		data_storage_helper(data_storage_helper&& other)
 			: data_ptr(other.data_ptr)
 			, local_storage(std::move(other.local_storage))
 		{
@@ -273,7 +273,7 @@ struct RSXFragmentProgram
 			return *this;
 		}
 
-		data_storage_helper& operator=(data_storage_helper&& other) noexcept
+		data_storage_helper& operator=(data_storage_helper&& other)
 		{
 			if (this == &other) return *this;
 
@@ -300,18 +300,14 @@ struct RSXFragmentProgram
 	u32 ucode_length = 0;
 	u32 total_length = 0;
 	u32 ctrl = 0;
-	u32 texcoord_control_mask = 0;
-	u32 mrt_buffers_count = 0;
-
 	bool two_sided_lighting = false;
+	u32 texcoord_control_mask = 0;
 
 	rsx::fragment_program_texture_state texture_state;
 	rsx::fragment_program_texture_config texture_params;
 
 	bool valid = false;
 
-	RSXFragmentProgram() = default;
-
 	rsx::texture_dimension_extended get_texture_dimension(u8 id) const
 	{
 		return rsx::texture_dimension_extended{static_cast<u8>((texture_state.texture_dimensions >> (id * 2)) & 0x3)};
@@ -328,9 +324,13 @@ struct RSXFragmentProgram
 		return !!(texcoord_control_mask & (1u << index));
 	}
 
+	RSXFragmentProgram()
+	{
+	}
+
 	static RSXFragmentProgram clone(const RSXFragmentProgram& prog)
 	{
-		RSXFragmentProgram result = prog;
+		auto result = prog;
 		result.clone_data();
 		return result;
 	}
diff --git a/rpcs3/Emu/RSX/Program/RSXOverlay.h b/rpcs3/Emu/RSX/Program/RSXOverlay.h
deleted file mode 100644
index 99c51a5e92..0000000000
--- a/rpcs3/Emu/RSX/Program/RSXOverlay.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-
-namespace rsx
-{
-	namespace overlays
-	{
-		// This is overlay common code meant only for render backends
-		enum class texture_sampling_mode : s32
-		{
-			none = 0,
-			font2D = 1,
-			font3D = 2,
-			texture2D = 3
-		};
-
-		class fragment_options
-		{
-			u32 value = 0;
-
-			enum e_offsets: s32
-			{
-				fragment_clip_bit = 0,
-				pulse_glow_bit = 1,
-				sampling_mode_bit = 2
-			};
-
-		public:
-			fragment_options& texture_mode(texture_sampling_mode mode)
-			{
-				value |= static_cast<s32>(mode) << e_offsets::sampling_mode_bit;
-				return *this;
-			}
-
-			fragment_options& pulse_glow(bool enable = true)
-			{
-				if (enable)
-				{
-					value |= (1 << e_offsets::pulse_glow_bit);
-				}
-				return *this;
-			}
-
-			fragment_options& clip_fragments(bool enable = true)
-			{
-				if (enable)
-				{
-					value |= (1 << e_offsets::fragment_clip_bit);
-				}
-				return *this;
-			}
-
-			u32 get() const
-			{
-				return value;
-			}
-		};
-
-		class vertex_options
-		{
-			u32 value = 0;
-
-		public:
-			vertex_options& disable_vertex_snap(bool enable)
-			{
-				value = enable ? 1 : 0;
-				return *this;
-			}
-
-			u32 get() const
-			{
-				return value;
-			}
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/Program/RSXVertexProgram.h b/rpcs3/Emu/RSX/Program/RSXVertexProgram.h
index 1277250b56..df7e243e07 100644
--- a/rpcs3/Emu/RSX/Program/RSXVertexProgram.h
+++ b/rpcs3/Emu/RSX/Program/RSXVertexProgram.h
@@ -219,14 +219,33 @@ static const std::string rsx_vp_vec_op_names[] =
 	"SEQ", "SFL", "SGT", "SLE", "SNE", "STR", "SSG", "NULL", "NULL", "TXL"
 };
 
+struct rsx_vertex_input
+{
+	u8 location; // between 0 and 15
+	u8 size; // between 1 and 4
+	u16 frequency;
+	bool is_modulo; // either modulo frequency or divide frequency
+	bool is_array; // false if "reg value"
+	bool int_type;
+	u32 flags;		//Initially zero, to be optionally filled by the backend
+
+	bool operator==(const rsx_vertex_input& other) const
+	{
+		return location == other.location && size == other.size && frequency == other.frequency && is_modulo == other.is_modulo &&
+			is_array == other.is_array && int_type == other.int_type && flags == other.flags;
+	}
+};
+
 struct RSXVertexProgram
 {
 	std::vector<u32> data;
+	std::vector<rsx_vertex_input> rsx_vertex_inputs;
+	u32 output_mask;
+	bool skip_vertex_input_check;
 	rsx::vertex_program_texture_state texture_state;
-	u32 ctrl = 0;
-	u32 output_mask = 0;
-	u32 base_address = 0;
-	u32 entry = 0;
+
+	u32 base_address;
+	u32 entry;
 	std::bitset<rsx::max_vertex_program_instructions> instruction_mask;
 	std::set<u32> jump_table;
 
diff --git a/rpcs3/Emu/RSX/Program/SPIRVCommon.cpp b/rpcs3/Emu/RSX/Program/SPIRVCommon.cpp
deleted file mode 100644
index 501c0e6b51..0000000000
--- a/rpcs3/Emu/RSX/Program/SPIRVCommon.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-#include "stdafx.h"
-
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#pragma GCC diagnostic ignored "-Wsuggest-override"
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Winconsistent-missing-override"
-#endif
-#endif
-#include "3rdparty/glslang/glslang/SPIRV/GlslangToSpv.h"
-#include "3rdparty/glslang/glslang/glslang/Include/ResourceLimits.h"
-#include "3rdparty/glslang/glslang/glslang/Public/ShaderLang.h"
-#ifdef _MSC_VER
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
-
-#include "SPIRVCommon.h"
-#include "Emu/RSX/Program/GLSLTypes.h"
-
-namespace spirv
-{
-	static TBuiltInResource g_default_config;
-
-	void init_default_resources(TBuiltInResource& rsc)
-	{
-		rsc.maxLights = 32;
-		rsc.maxClipPlanes = 6;
-		rsc.maxTextureUnits = 32;
-		rsc.maxTextureCoords = 32;
-		rsc.maxVertexAttribs = 64;
-		rsc.maxVertexUniformComponents = 4096;
-		rsc.maxVaryingFloats = 64;
-		rsc.maxVertexTextureImageUnits = 32;
-		rsc.maxCombinedTextureImageUnits = 80;
-		rsc.maxTextureImageUnits = 32;
-		rsc.maxFragmentUniformComponents = 4096;
-		rsc.maxDrawBuffers = 32;
-		rsc.maxVertexUniformVectors = 128;
-		rsc.maxVaryingVectors = 8;
-		rsc.maxFragmentUniformVectors = 16;
-		rsc.maxVertexOutputVectors = 16;
-		rsc.maxFragmentInputVectors = 15;
-		rsc.minProgramTexelOffset = -8;
-		rsc.maxProgramTexelOffset = 7;
-		rsc.maxClipDistances = 8;
-		rsc.maxComputeWorkGroupCountX = 65535;
-		rsc.maxComputeWorkGroupCountY = 65535;
-		rsc.maxComputeWorkGroupCountZ = 65535;
-		rsc.maxComputeWorkGroupSizeX = 1024;
-		rsc.maxComputeWorkGroupSizeY = 1024;
-		rsc.maxComputeWorkGroupSizeZ = 64;
-		rsc.maxComputeUniformComponents = 1024;
-		rsc.maxComputeTextureImageUnits = 16;
-		rsc.maxComputeImageUniforms = 8;
-		rsc.maxComputeAtomicCounters = 8;
-		rsc.maxComputeAtomicCounterBuffers = 1;
-		rsc.maxVaryingComponents = 60;
-		rsc.maxVertexOutputComponents = 64;
-		rsc.maxGeometryInputComponents = 64;
-		rsc.maxGeometryOutputComponents = 128;
-		rsc.maxFragmentInputComponents = 128;
-		rsc.maxImageUnits = 8;
-		rsc.maxCombinedImageUnitsAndFragmentOutputs = 8;
-		rsc.maxCombinedShaderOutputResources = 8;
-		rsc.maxImageSamples = 0;
-		rsc.maxVertexImageUniforms = 0;
-		rsc.maxTessControlImageUniforms = 0;
-		rsc.maxTessEvaluationImageUniforms = 0;
-		rsc.maxGeometryImageUniforms = 0;
-		rsc.maxFragmentImageUniforms = 8;
-		rsc.maxCombinedImageUniforms = 8;
-		rsc.maxGeometryTextureImageUnits = 16;
-		rsc.maxGeometryOutputVertices = 256;
-		rsc.maxGeometryTotalOutputComponents = 1024;
-		rsc.maxGeometryUniformComponents = 1024;
-		rsc.maxGeometryVaryingComponents = 64;
-		rsc.maxTessControlInputComponents = 128;
-		rsc.maxTessControlOutputComponents = 128;
-		rsc.maxTessControlTextureImageUnits = 16;
-		rsc.maxTessControlUniformComponents = 1024;
-		rsc.maxTessControlTotalOutputComponents = 4096;
-		rsc.maxTessEvaluationInputComponents = 128;
-		rsc.maxTessEvaluationOutputComponents = 128;
-		rsc.maxTessEvaluationTextureImageUnits = 16;
-		rsc.maxTessEvaluationUniformComponents = 1024;
-		rsc.maxTessPatchComponents = 120;
-		rsc.maxPatchVertices = 32;
-		rsc.maxTessGenLevel = 64;
-		rsc.maxViewports = 16;
-		rsc.maxVertexAtomicCounters = 0;
-		rsc.maxTessControlAtomicCounters = 0;
-		rsc.maxTessEvaluationAtomicCounters = 0;
-		rsc.maxGeometryAtomicCounters = 0;
-		rsc.maxFragmentAtomicCounters = 8;
-		rsc.maxCombinedAtomicCounters = 8;
-		rsc.maxAtomicCounterBindings = 1;
-		rsc.maxVertexAtomicCounterBuffers = 0;
-		rsc.maxTessControlAtomicCounterBuffers = 0;
-		rsc.maxTessEvaluationAtomicCounterBuffers = 0;
-		rsc.maxGeometryAtomicCounterBuffers = 0;
-		rsc.maxFragmentAtomicCounterBuffers = 1;
-		rsc.maxCombinedAtomicCounterBuffers = 1;
-		rsc.maxAtomicCounterBufferSize = 16384;
-		rsc.maxTransformFeedbackBuffers = 4;
-		rsc.maxTransformFeedbackInterleavedComponents = 64;
-		rsc.maxCullDistances = 8;
-		rsc.maxCombinedClipAndCullDistances = 8;
-		rsc.maxSamples = 4;
-
-		rsc.limits.nonInductiveForLoops = true;
-		rsc.limits.whileLoops = true;
-		rsc.limits.doWhileLoops = true;
-		rsc.limits.generalUniformIndexing = true;
-		rsc.limits.generalAttributeMatrixVectorIndexing = true;
-		rsc.limits.generalVaryingIndexing = true;
-		rsc.limits.generalSamplerIndexing = true;
-		rsc.limits.generalVariableIndexing = true;
-		rsc.limits.generalConstantMatrixVectorIndexing = true;
-	}
-
-	bool compile_glsl_to_spv(std::vector<u32>& spv, std::string& shader, ::glsl::program_domain domain, ::glsl::glsl_rules rules)
-	{
-		EShLanguage lang = (domain == ::glsl::glsl_fragment_program)
-			? EShLangFragment
-			: (domain == ::glsl::glsl_vertex_program)
-				? EShLangVertex
-				: EShLangCompute;
-
-		glslang::EShClient client;
-		glslang::EShTargetClientVersion target_version;
-		EShMessages msg;
-
-		if (rules == ::glsl::glsl_rules_vulkan)
-		{
-			client = glslang::EShClientVulkan;
-			target_version = glslang::EShTargetClientVersion::EShTargetVulkan_1_0;
-			msg = static_cast<EShMessages>(EShMsgVulkanRules | EShMsgSpvRules | EShMsgEnhanced);
-		}
-		else
-		{
-			client = glslang::EShClientOpenGL;
-			target_version = glslang::EShTargetClientVersion::EShTargetOpenGL_450;
-			msg = static_cast<EShMessages>(EShMsgDefault | EShMsgSpvRules | EShMsgEnhanced);
-		}
-
-		glslang::TProgram program;
-		glslang::TShader shader_object(lang);
-
-		shader_object.setEnvInput(glslang::EShSourceGlsl, lang, client, 100);
-		shader_object.setEnvClient(client, target_version);
-		shader_object.setEnvTarget(glslang::EshTargetSpv, glslang::EShTargetLanguageVersion::EShTargetSpv_1_0);
-
-		bool success = false;
-		const char* shader_text = shader.data();
-		shader_object.setStrings(&shader_text, 1);
-
-		if (shader_object.parse(&g_default_config, 430, EProfile::ECoreProfile, false, true, msg))
-		{
-			program.addShader(&shader_object);
-			success = program.link(msg);
-			if (success)
-			{
-				glslang::SpvOptions options;
-				options.disableOptimizer = true;
-				options.optimizeSize = true;
-				glslang::GlslangToSpv(*program.getIntermediate(lang), spv, &options);
-
-				// Now we optimize
-				//spvtools::Optimizer optimizer(SPV_ENV_VULKAN_1_0);
-				//optimizer.RegisterPass(spvtools::CreateUnifyConstantPass());      // Remove duplicate constants
-				//optimizer.RegisterPass(spvtools::CreateMergeReturnPass());        // Huge savings in vertex interpreter and likely normal vertex shaders
-				//optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());      // Remove dead code
-				//optimizer.Run(spv.data(), spv.size(), &spv);
-			}
-		}
-		else
-		{
-			rsx_log.error("%s", shader_object.getInfoLog());
-			rsx_log.error("%s", shader_object.getInfoDebugLog());
-		}
-
-		return success;
-	}
-
-	void initialize_compiler_context()
-	{
-		glslang::InitializeProcess();
-		init_default_resources(g_default_config);
-	}
-
-	void finalize_compiler_context()
-	{
-		glslang::FinalizeProcess();
-	}
-}
diff --git a/rpcs3/Emu/RSX/Program/SPIRVCommon.h b/rpcs3/Emu/RSX/Program/SPIRVCommon.h
deleted file mode 100644
index b4dd3364a7..0000000000
--- a/rpcs3/Emu/RSX/Program/SPIRVCommon.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-namespace glsl
-{
-	enum program_domain : unsigned char;
-	enum glsl_rules : unsigned char;
-}
-
-namespace spirv
-{
-	bool compile_glsl_to_spv(std::vector<u32>& spv, std::string& shader, ::glsl::program_domain domain, ::glsl::glsl_rules rules);
-
-	void initialize_compiler_context();
-	void finalize_compiler_context();
-}
diff --git a/rpcs3/Emu/RSX/Program/ShaderInterpreter.h b/rpcs3/Emu/RSX/Program/ShaderInterpreter.h
index f89c058dec..06a81501a7 100644
--- a/rpcs3/Emu/RSX/Program/ShaderInterpreter.h
+++ b/rpcs3/Emu/RSX/Program/ShaderInterpreter.h
@@ -6,29 +6,25 @@ namespace program_common
 	{
 		enum compiler_option
 		{
-			COMPILER_OPT_ENABLE_TEXTURES       = (1 << 0),
-			COMPILER_OPT_ENABLE_DEPTH_EXPORT   = (1 << 1),
-			COMPILER_OPT_ENABLE_F32_EXPORT     = (1 << 2),
-			COMPILER_OPT_ENABLE_ALPHA_TEST_GE  = (1 << 3),
-			COMPILER_OPT_ENABLE_ALPHA_TEST_G   = (1 << 4),
-			COMPILER_OPT_ENABLE_ALPHA_TEST_LE  = (1 << 5),
-			COMPILER_OPT_ENABLE_ALPHA_TEST_L   = (1 << 6),
-			COMPILER_OPT_ENABLE_ALPHA_TEST_EQ  = (1 << 7),
-			COMPILER_OPT_ENABLE_ALPHA_TEST_NE  = (1 << 8),
-			COMPILER_OPT_ENABLE_FLOW_CTRL      = (1 << 9),
-			COMPILER_OPT_ENABLE_PACKING        = (1 << 10),
-			COMPILER_OPT_ENABLE_KIL            = (1 << 11),
-			COMPILER_OPT_ENABLE_STIPPLING      = (1 << 12),
-			COMPILER_OPT_ENABLE_INSTANCING     = (1 << 13),
-			COMPILER_OPT_ENABLE_VTX_TEXTURES   = (1 << 14),
-
-			COMPILER_OPT_MAX                   = COMPILER_OPT_ENABLE_VTX_TEXTURES
+			COMPILER_OPT_ENABLE_TEXTURES = 1,
+			COMPILER_OPT_ENABLE_DEPTH_EXPORT = 2,
+			COMPILER_OPT_ENABLE_F32_EXPORT = 4,
+			COMPILER_OPT_ENABLE_ALPHA_TEST_GE = 8,
+			COMPILER_OPT_ENABLE_ALPHA_TEST_G = 16,
+			COMPILER_OPT_ENABLE_ALPHA_TEST_LE = 32,
+			COMPILER_OPT_ENABLE_ALPHA_TEST_L = 64,
+			COMPILER_OPT_ENABLE_ALPHA_TEST_EQ = 128,
+			COMPILER_OPT_ENABLE_ALPHA_TEST_NE = 256,
+			COMPILER_OPT_ENABLE_FLOW_CTRL = 512,
+			COMPILER_OPT_ENABLE_PACKING = 1024,
+			COMPILER_OPT_ENABLE_KIL = 2048,
+			COMPILER_OPT_ENABLE_STIPPLING = 4096
 		};
 
 		static std::string get_vertex_interpreter()
 		{
 			const char* s =
-			#include "../Program/GLSLInterpreter/VertexInterpreter.glsl"
+			#include "../Common/Interpreter/VertexInterpreter.glsl"
 			;
 			return s;
 		}
@@ -36,7 +32,7 @@ namespace program_common
 		static std::string get_fragment_interpreter()
 		{
 			const char* s =
-			#include "../Program/GLSLInterpreter/FragmentInterpreter.glsl"
+			#include "../Common/Interpreter/FragmentInterpreter.glsl"
 			;
 			return s;
 		}
diff --git a/rpcs3/Emu/RSX/Program/ShaderParam.h b/rpcs3/Emu/RSX/Program/ShaderParam.h
index 266ab51cbd..9814a11c50 100644
--- a/rpcs3/Emu/RSX/Program/ShaderParam.h
+++ b/rpcs3/Emu/RSX/Program/ShaderParam.h
@@ -10,89 +10,56 @@
 
 enum class FUNCTION
 {
-	NOP,
-	DP2,
-	DP2A,
-	DP3,
-	DP4,
-	DPH,
-	SFL, // Set zero
-	STR, // Set One
-	FRACT,
-	DFDX,
-	DFDY,
-	REFL,
-
-	// Samplers. Must be clustered in order 1D-2D-3D; CUBE maps as a 3D texture here
-	TEXTURE_SAMPLE_BASE,
-	TEXTURE_SAMPLE_BIAS_BASE,
-	TEXTURE_SAMPLE_PROJ_BASE,
-	TEXTURE_SAMPLE_LOD_BASE,
-	TEXTURE_SAMPLE_GRAD_BASE,
-	TEXTURE_SAMPLE_SHADOW_BASE,
-	TEXTURE_SAMPLE_SHADOW_PROJ_BASE,
-	TEXTURE_SAMPLE_DEPTH_RGBA_BASE,
-	TEXTURE_SAMPLE_DEPTH_RGBA_PROJ_BASE,
-
-	TEXTURE_SAMPLE1D,
-	TEXTURE_SAMPLE1D_BIAS,
-	TEXTURE_SAMPLE1D_PROJ,
-	TEXTURE_SAMPLE1D_LOD,
-	TEXTURE_SAMPLE1D_GRAD,
-	TEXTURE_SAMPLE1D_SHADOW,
-	TEXTURE_SAMPLE1D_SHADOW_PROJ,
-	TEXTURE_SAMPLE1D_DEPTH_RGBA,
-	TEXTURE_SAMPLE1D_DEPTH_RGBA_PROJ,
-
-	TEXTURE_SAMPLE2D,
-	TEXTURE_SAMPLE2D_BIAS,
-	TEXTURE_SAMPLE2D_PROJ,
-	TEXTURE_SAMPLE2D_LOD,
-	TEXTURE_SAMPLE2D_GRAD,
-	TEXTURE_SAMPLE2D_SHADOW,
-	TEXTURE_SAMPLE2D_SHADOW_PROJ,
-	TEXTURE_SAMPLE2D_DEPTH_RGBA,
-	TEXTURE_SAMPLE2D_DEPTH_RGBA_PROJ,
-
-	TEXTURE_SAMPLE3D,
-	TEXTURE_SAMPLE3D_BIAS,
-	TEXTURE_SAMPLE3D_PROJ,
-	TEXTURE_SAMPLE3D_LOD,
-	TEXTURE_SAMPLE3D_GRAD,
-	TEXTURE_SAMPLE3D_SHADOW,
-	TEXTURE_SAMPLE3D_SHADOW_PROJ,
-	TEXTURE_SAMPLE3D_DEPTH_RGBA,
-	TEXTURE_SAMPLE3D_DEPTH_RGBA_PROJ,
-
-	TEXTURE_SAMPLE2DMS,
-	TEXTURE_SAMPLE2DMS_BIAS,
-	TEXTURE_SAMPLE2DMS_PROJ,
-	TEXTURE_SAMPLE2DMS_LOD,
-	TEXTURE_SAMPLE2DMS_GRAD,
-	TEXTURE_SAMPLE2DMS_SHADOW,
-	TEXTURE_SAMPLE2DMS_SHADOW_PROJ,
-	TEXTURE_SAMPLE2DMS_DEPTH_RGBA,
-	TEXTURE_SAMPLE2DMS_DEPTH_RGBA_PROJ,
-
-	VERTEX_TEXTURE_FETCH1D,
-	VERTEX_TEXTURE_FETCH2D,
-	VERTEX_TEXTURE_FETCH3D,
-	VERTEX_TEXTURE_FETCHCUBE,
-	VERTEX_TEXTURE_FETCH2DMS,
-
-	// Meta
-	TEXTURE_SAMPLE_MAX_BASE_ENUM = TEXTURE_SAMPLE_DEPTH_RGBA_PROJ_BASE, // Update if more base enums are added
-	TEXTURE_SAMPLE_BASE_ENUM_COUNT = (TEXTURE_SAMPLE_MAX_BASE_ENUM - TEXTURE_SAMPLE_BASE + 1),
+	FUNCTION_DP2,
+	FUNCTION_DP2A,
+	FUNCTION_DP3,
+	FUNCTION_DP4,
+	FUNCTION_DPH,
+	FUNCTION_SFL, // Set zero
+	FUNCTION_STR, // Set One
+	FUNCTION_FRACT,
+	FUNCTION_DFDX,
+	FUNCTION_DFDY,
+	FUNCTION_REFL,
+	FUNCTION_TEXTURE_SAMPLE1D,
+	FUNCTION_TEXTURE_SAMPLE1D_BIAS,
+	FUNCTION_TEXTURE_SAMPLE1D_PROJ,
+	FUNCTION_TEXTURE_SAMPLE1D_LOD,
+	FUNCTION_TEXTURE_SAMPLE1D_GRAD,
+	FUNCTION_TEXTURE_SAMPLE2D,
+	FUNCTION_TEXTURE_SAMPLE2D_BIAS,
+	FUNCTION_TEXTURE_SAMPLE2D_PROJ,
+	FUNCTION_TEXTURE_SAMPLE2D_LOD,
+	FUNCTION_TEXTURE_SAMPLE2D_GRAD,
+	FUNCTION_TEXTURE_SHADOW2D,
+	FUNCTION_TEXTURE_SHADOWCUBE,
+	FUNCTION_TEXTURE_SHADOW2D_PROJ,
+	FUNCTION_TEXTURE_SAMPLECUBE,
+	FUNCTION_TEXTURE_SAMPLECUBE_BIAS,
+	FUNCTION_TEXTURE_SAMPLECUBE_PROJ,
+	FUNCTION_TEXTURE_SAMPLECUBE_LOD,
+	FUNCTION_TEXTURE_SAMPLECUBE_GRAD,
+	FUNCTION_TEXTURE_SAMPLE3D,
+	FUNCTION_TEXTURE_SAMPLE3D_BIAS,
+	FUNCTION_TEXTURE_SAMPLE3D_PROJ,
+	FUNCTION_TEXTURE_SAMPLE3D_LOD,
+	FUNCTION_TEXTURE_SAMPLE3D_GRAD,
+	FUNCTION_VERTEX_TEXTURE_FETCH1D,
+	FUNCTION_VERTEX_TEXTURE_FETCH2D,
+	FUNCTION_VERTEX_TEXTURE_FETCH3D,
+	FUNCTION_VERTEX_TEXTURE_FETCHCUBE,
+	FUNCTION_TEXTURE_SAMPLE2D_DEPTH_RGBA,
+	FUNCTION_TEXTURE_SAMPLE2D_DEPTH_RGBA_PROJ
 };
 
 enum class COMPARE
 {
-	SEQ,
-	SGE,
-	SGT,
-	SLE,
-	SLT,
-	SNE,
+	FUNCTION_SEQ,
+	FUNCTION_SGE,
+	FUNCTION_SGT,
+	FUNCTION_SLE,
+	FUNCTION_SLT,
+	FUNCTION_SNE,
 };
 
 enum ParamFlag
@@ -130,38 +97,13 @@ struct ParamType
 	{
 	}
 
-	bool HasItem(const std::string& name) const
+	bool SearchName(const std::string& name) const
 	{
 		return std::any_of(items.cbegin(), items.cend(), [&name](const auto& item)
 		{
 			return item.name == name;
 		});
 	}
-
-	bool ReplaceOrInsert(const std::string& name, const ParamItem& item)
-	{
-		if (HasItem(name))
-		{
-			std::vector<ParamItem> new_list;
-			for (const auto& it : items)
-			{
-				if (it.name != name)
-				{
-					new_list.emplace_back(it.name, it.location, it.value);
-				}
-				else
-				{
-					new_list.emplace_back(item.name, item.location, item.value);
-				}
-			}
-
-			std::swap(items, new_list);
-			return true;
-		}
-
-		items.push_back(item);
-		return false;
-	}
 };
 
 struct ParamArray
@@ -179,19 +121,19 @@ struct ParamArray
 		return nullptr;
 	}
 
-	bool HasParamTypeless(const ParamFlag flag, const std::string& name) const
+	bool HasParamTypeless(const ParamFlag flag, const std::string& name)
 	{
 		const auto& p = params[flag];
 		return std::any_of(p.cbegin(), p.cend(), [&name](const auto& param)
 		{
-			return param.HasItem(name);
+			return param.SearchName(name);
 		});
 	}
 
 	bool HasParam(const ParamFlag flag, const std::string& type, const std::string& name)
 	{
-		const ParamType* t = SearchParam(flag, type);
-		return t && t->HasItem(name);
+		ParamType* t = SearchParam(flag, type);
+		return t && t->SearchName(name);
 	}
 
 	std::string AddParam(const ParamFlag flag, const std::string& type, const std::string& name, const std::string& value)
@@ -200,7 +142,7 @@ struct ParamArray
 
 		if (t)
 		{
-			if (!t->HasItem(name)) t->items.emplace_back(name, -1, value);
+			if (!t->SearchName(name)) t->items.emplace_back(name, -1, value);
 		}
 		else
 		{
@@ -217,7 +159,7 @@ struct ParamArray
 
 		if (t)
 		{
-			if (!t->HasItem(name)) t->items.emplace_back(name, location);
+			if (!t->SearchName(name)) t->items.emplace_back(name, location);
 		}
 		else
 		{
@@ -227,14 +169,6 @@ struct ParamArray
 
 		return name;
 	}
-
-	void Clear()
-	{
-		for (auto& param : params)
-		{
-			param.clear();
-		}
-	}
 };
 
 class ShaderVariable
@@ -300,7 +234,7 @@ public:
 			{ 3, 'w' }
 		};
 
-		for (const auto& p : pos_to_swizzle)
+		for (auto& p : pos_to_swizzle)
 		{
 			swizzle[p.second] = swizzles[0].length() > p.first ? swizzles[0][p.first] : 0;
 		}
@@ -309,7 +243,7 @@ public:
 		{
 			std::unordered_map<char, char> new_swizzle;
 
-			for (const auto& p : pos_to_swizzle)
+			for (auto& p : pos_to_swizzle)
 			{
 				new_swizzle[p.second] = swizzle[swizzles[i].length() <= p.first ? '\0' : swizzles[i][p.first]];
 			}
@@ -320,7 +254,7 @@ public:
 		swizzles.clear();
 		std::string new_swizzle;
 
-		for (const auto& p : pos_to_swizzle)
+		for (auto& p : pos_to_swizzle)
 		{
 			if (swizzle[p.second] != '\0')
 				new_swizzle += swizzle[p.second];
diff --git a/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.cpp b/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.cpp
index dc9a034995..a716a66bf6 100644
--- a/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.cpp
+++ b/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.cpp
@@ -1,4 +1,6 @@
 #include "stdafx.h"
+#include "Emu/System.h"
+
 #include "VertexProgramDecompiler.h"
 
 #include <sstream>
@@ -79,8 +81,8 @@ std::string VertexProgramDecompiler::GetDST(bool is_sca)
 		}
 
 		const std::string reg_type = (is_address_reg) ? getIntTypeName(4) : getFloatTypeName(4);
-		const std::string reg_sel = (is_address_reg) ? "a" : "r";
-		ret += m_parr.AddParam(PF_PARAM_NONE, reg_type, reg_sel + std::to_string(tmp_index), reg_type + "(0.)") + mask;
+		const std::string reg_sel = (is_address_reg) ? "a" : "tmp";
+		ret += m_parr.AddParam(PF_PARAM_NONE, reg_type, reg_sel + std::to_string(tmp_index)) + mask;
 	}
 	else if (!is_result)
 	{
@@ -94,8 +96,6 @@ std::string VertexProgramDecompiler::GetDST(bool is_sca)
 
 std::string VertexProgramDecompiler::GetSRC(const u32 n)
 {
-	ensure(n < 3);
-
 	static const std::string reg_table[] =
 	{
 		"in_pos", "in_weight", "in_normal",
@@ -107,29 +107,26 @@ std::string VertexProgramDecompiler::GetSRC(const u32 n)
 	};
 
 	std::string ret;
-	const auto float4 = getFloatTypeName(4);
 
 	switch (src[n].reg_type)
 	{
 	case RSX_VP_REGISTER_TYPE_TEMP:
-		ret += m_parr.AddParam(PF_PARAM_NONE, float4, "r" + std::to_string(src[n].tmp_src), float4 + "(0.)");
+		ret += m_parr.AddParam(PF_PARAM_NONE, getFloatTypeName(4), "tmp" + std::to_string(src[n].tmp_src));
 		break;
 	case RSX_VP_REGISTER_TYPE_INPUT:
 		if (d1.input_src < std::size(reg_table))
 		{
-			ret += m_parr.AddParam(PF_PARAM_IN, float4, reg_table[d1.input_src], d1.input_src);
+			ret += m_parr.AddParam(PF_PARAM_IN, getFloatTypeName(4), reg_table[d1.input_src], d1.input_src);
 		}
 		else
 		{
 			rsx_log.error("Bad input src num: %d", u32{ d1.input_src });
-			ret += m_parr.AddParam(PF_PARAM_IN, float4, "in_unk", d1.input_src);
+			ret += m_parr.AddParam(PF_PARAM_IN, getFloatTypeName(4), "in_unk", d1.input_src);
 		}
 		break;
 	case RSX_VP_REGISTER_TYPE_CONSTANT:
-		m_parr.AddParam(PF_PARAM_UNIFORM, float4, std::string("vc[468]"));
-		properties.has_indexed_constants |= !!d3.index_const;
-		m_constant_ids.insert(static_cast<u16>(d1.const_src));
-		fmt::append(ret, "_fetch_constant(%u%s)", d1.const_src, (d3.index_const ? " + " + AddAddrReg() : ""));
+		m_parr.AddParam(PF_PARAM_UNIFORM, getFloatTypeName(4), std::string("vc[468]"));
+		ret += std::string("vc[") + std::to_string(d1.const_src) + (d3.index_const ? " + " + AddAddrReg() : "") + "]";
 		break;
 
 	default:
@@ -152,7 +149,6 @@ std::string VertexProgramDecompiler::GetSRC(const u32 n)
 
 	switch (n)
 	{
-	default:
 	case 0: abs = d0.src0_abs; break;
 	case 1: abs = d0.src1_abs; break;
 	case 2: abs = d0.src2_abs; break;
@@ -226,7 +222,7 @@ std::string VertexProgramDecompiler::GetTex()
 
 std::string VertexProgramDecompiler::Format(const std::string& code)
 {
-	const std::pair<std::string_view, std::function<std::string()>> repl_list[] =
+	const std::pair<std::string, std::function<std::string()>> repl_list[] =
 	{
 		{ "$$", []() -> std::string { return "$"; } },
 		{ "$0", std::bind(std::mem_fn(&VertexProgramDecompiler::GetSRC), this, 0) },
@@ -254,13 +250,13 @@ std::string VertexProgramDecompiler::GetRawCond()
 {
 	static const COMPARE cond_string_table[(lt | gt | eq) + 1] =
 	{
-		COMPARE::SLT, // "error"
-		COMPARE::SLT,
-		COMPARE::SEQ,
-		COMPARE::SLE,
-		COMPARE::SGT,
-		COMPARE::SNE,
-		COMPARE::SGE,
+		COMPARE::FUNCTION_SLT, // "error"
+		COMPARE::FUNCTION_SLT,
+		COMPARE::FUNCTION_SEQ,
+		COMPARE::FUNCTION_SLE,
+		COMPARE::FUNCTION_SGT,
+		COMPARE::FUNCTION_SNE,
+		COMPARE::FUNCTION_SGE,
 	};
 
 	static const char f[4] = { 'x', 'y', 'z', 'w' };
@@ -360,13 +356,14 @@ std::string VertexProgramDecompiler::NotZeroPositive(const std::string& code)
 std::string VertexProgramDecompiler::BuildCode()
 {
 	std::string main_body;
-	for (int i = 0, lvl = 1; i < static_cast<int>(m_instr_count); i++)
+	for (uint i = 0, lvl = 1; i < m_instr_count; i++)
 	{
-		lvl = std::max<int>(lvl - m_instructions[i].close_scopes, 0);
-
+		lvl -= m_instructions[i].close_scopes;
+		if (lvl < 1) lvl = 1;
 		for (int j = 0; j < m_instructions[i].put_close_scopes; ++j)
 		{
-			if (lvl > 1) --lvl;
+			--lvl;
+			if (lvl < 1) lvl = 1;
 			main_body.append(lvl, '\t') += "}\n";
 		}
 
@@ -377,8 +374,6 @@ std::string VertexProgramDecompiler::BuildCode()
 			lvl++;
 		}
 
-		ensure(lvl >= 0); // Underflow of indent level will cause crashes!!
-
 		for (const auto& instruction_body : m_instructions[i].body)
 		{
 			main_body.append(lvl, '\t') += instruction_body + "\n";
@@ -396,30 +391,6 @@ std::string VertexProgramDecompiler::BuildCode()
 		m_parr.AddParam(PF_PARAM_OUT, float4_type, "dst_reg0", float4_type + "(0., 0., 0., 1.)");
 	}
 
-	if (!properties.has_indexed_constants && !m_constant_ids.empty())
-	{
-		// Relocate transform constants
-		std::vector<std::pair<std::string, std::string>> reloc_table;
-		reloc_table.reserve(m_constant_ids.size());
-
-		// Build the string lookup table
-		int offset = 0;
-		for (const auto& index : m_constant_ids)
-		{
-			const auto i = offset++;
-			if (i == index) continue; // Replace with self
-			reloc_table.emplace_back(fmt::format("_fetch_constant(%d)", index), fmt::format("_fetch_constant(%d)", i));
-		}
-
-		// One-time patch
-		main_body = fmt::replace_all(main_body, reloc_table);
-
-		// Rename the array type
-		auto type_list = ensure(m_parr.SearchParam(PF_PARAM_UNIFORM, getFloatTypeName(4)));
-		const auto item = ParamItem(fmt::format("vc[%llu]", m_constant_ids.size()), -1);
-		type_list->ReplaceOrInsert("vc[468]", item);
-	}
-
 	std::stringstream OS;
 	insertHeader(OS);
 
@@ -447,7 +418,7 @@ std::string VertexProgramDecompiler::Decompile()
 	const auto& data = m_prog.data;
 	m_instr_count = data.size() / 4;
 
-	bool has_BRA = false;
+	bool is_has_BRA = false;
 	bool program_end = false;
 	u32 i = 1;
 	u32 last_label_addr = 0;
@@ -529,7 +500,7 @@ std::string VertexProgramDecompiler::Decompile()
 		}
 	};
 
-	if (has_BRA || !m_prog.jump_table.empty())
+	if (is_has_BRA || !m_prog.jump_table.empty())
 	{
 		m_cur_instr = &m_instructions[0];
 
@@ -575,7 +546,7 @@ std::string VertexProgramDecompiler::Decompile()
 		{
 			//TODO: Subroutines can also have arbitrary jumps!
 			u32 jump_position = find_jump_lvl(i);
-			if (has_BRA || jump_position != umax)
+			if (is_has_BRA || jump_position != umax)
 			{
 				m_cur_instr->close_scopes++;
 				AddCode("}");
@@ -601,42 +572,40 @@ std::string VertexProgramDecompiler::Decompile()
 		case RSX_VEC_OPCODE_MUL: SetDSTVec("($0 * $1)"); break;
 		case RSX_VEC_OPCODE_ADD: SetDSTVec("($0 + $2)"); break;
 		case RSX_VEC_OPCODE_MAD: SetDSTVec("fma($0, $1, $2)"); break;
-		case RSX_VEC_OPCODE_DP3: SetDSTVec(getFunction(FUNCTION::DP3)); break;
-		case RSX_VEC_OPCODE_DPH: SetDSTVec(getFunction(FUNCTION::DPH)); break;
-		case RSX_VEC_OPCODE_DP4: SetDSTVec(getFunction(FUNCTION::DP4)); break;
+		case RSX_VEC_OPCODE_DP3: SetDSTVec(getFunction(FUNCTION::FUNCTION_DP3)); break;
+		case RSX_VEC_OPCODE_DPH: SetDSTVec(getFunction(FUNCTION::FUNCTION_DPH)); break;
+		case RSX_VEC_OPCODE_DP4: SetDSTVec(getFunction(FUNCTION::FUNCTION_DP4)); break;
 		case RSX_VEC_OPCODE_DST: SetDSTVec("vec4(1.0, $0.y * $1.y, $0.z, $1.w)"); break;
 		case RSX_VEC_OPCODE_MIN: SetDSTVec("min($0, $1)"); break;
 		case RSX_VEC_OPCODE_MAX: SetDSTVec("max($0, $1)"); break;
-		case RSX_VEC_OPCODE_SLT: SetDSTVec(getFloatTypeName(4) + "(" + compareFunction(COMPARE::SLT, "$0", "$1") + ")"); break;
-		case RSX_VEC_OPCODE_SGE: SetDSTVec(getFloatTypeName(4) + "(" + compareFunction(COMPARE::SGE, "$0", "$1") + ")"); break;
+		case RSX_VEC_OPCODE_SLT: SetDSTVec(getFloatTypeName(4) + "(" + compareFunction(COMPARE::FUNCTION_SLT, "$0", "$1") + ")"); break;
+		case RSX_VEC_OPCODE_SGE: SetDSTVec(getFloatTypeName(4) + "(" + compareFunction(COMPARE::FUNCTION_SGE, "$0", "$1") + ")"); break;
 		case RSX_VEC_OPCODE_ARL: SetDSTVec(getIntTypeName(4) + "($0)");  break;
-		case RSX_VEC_OPCODE_FRC: SetDSTVec(getFunction(FUNCTION::FRACT)); break;
+		case RSX_VEC_OPCODE_FRC: SetDSTVec(getFunction(FUNCTION::FUNCTION_FRACT)); break;
 		case RSX_VEC_OPCODE_FLR: SetDSTVec("floor($0)"); break;
-		case RSX_VEC_OPCODE_SEQ: SetDSTVec(getFloatTypeName(4) + "(" + compareFunction(COMPARE::SEQ, "$0", "$1") + ")"); break;
-		case RSX_VEC_OPCODE_SFL: SetDSTVec(getFunction(FUNCTION::SFL)); break;
-		case RSX_VEC_OPCODE_SGT: SetDSTVec(getFloatTypeName(4) + "(" + compareFunction(COMPARE::SGT, "$0", "$1") + ")"); break;
-		case RSX_VEC_OPCODE_SLE: SetDSTVec(getFloatTypeName(4) + "(" + compareFunction(COMPARE::SLE, "$0", "$1") + ")"); break;
-		case RSX_VEC_OPCODE_SNE: SetDSTVec(getFloatTypeName(4) + "(" + compareFunction(COMPARE::SNE, "$0", "$1") + ")"); break;
-		case RSX_VEC_OPCODE_STR: SetDSTVec(getFunction(FUNCTION::STR)); break;
+		case RSX_VEC_OPCODE_SEQ: SetDSTVec(getFloatTypeName(4) + "(" + compareFunction(COMPARE::FUNCTION_SEQ, "$0", "$1") + ")"); break;
+		case RSX_VEC_OPCODE_SFL: SetDSTVec(getFunction(FUNCTION::FUNCTION_SFL)); break;
+		case RSX_VEC_OPCODE_SGT: SetDSTVec(getFloatTypeName(4) + "(" + compareFunction(COMPARE::FUNCTION_SGT, "$0", "$1") + ")"); break;
+		case RSX_VEC_OPCODE_SLE: SetDSTVec(getFloatTypeName(4) + "(" + compareFunction(COMPARE::FUNCTION_SLE, "$0", "$1") + ")"); break;
+		case RSX_VEC_OPCODE_SNE: SetDSTVec(getFloatTypeName(4) + "(" + compareFunction(COMPARE::FUNCTION_SNE, "$0", "$1") + ")"); break;
+		case RSX_VEC_OPCODE_STR: SetDSTVec(getFunction(FUNCTION::FUNCTION_STR)); break;
 		case RSX_VEC_OPCODE_SSG: SetDSTVec("sign($0)"); break;
 		case RSX_VEC_OPCODE_TXL:
 		{
 			GetTex();
-			const bool is_multisampled = m_prog.texture_state.multisampled_textures & (1 << d2.tex_num);
-
 			switch (m_prog.get_texture_dimension(d2.tex_num))
 			{
 			case rsx::texture_dimension_extended::texture_dimension_1d:
-				SetDSTVec(is_multisampled ? getFunction(FUNCTION::VERTEX_TEXTURE_FETCH2DMS) : getFunction(FUNCTION::VERTEX_TEXTURE_FETCH1D));
+				SetDSTVec(getFunction(FUNCTION::FUNCTION_VERTEX_TEXTURE_FETCH1D));
 				break;
 			case rsx::texture_dimension_extended::texture_dimension_2d:
-				SetDSTVec(getFunction(is_multisampled ? FUNCTION::VERTEX_TEXTURE_FETCH2DMS : FUNCTION::VERTEX_TEXTURE_FETCH2D));
+				SetDSTVec(getFunction(FUNCTION::FUNCTION_VERTEX_TEXTURE_FETCH2D));
 				break;
 			case rsx::texture_dimension_extended::texture_dimension_3d:
-				SetDSTVec(getFunction(FUNCTION::VERTEX_TEXTURE_FETCH3D));
+				SetDSTVec(getFunction(FUNCTION::FUNCTION_VERTEX_TEXTURE_FETCH3D));
 				break;
 			case rsx::texture_dimension_extended::texture_dimension_cubemap:
-				SetDSTVec(getFunction(FUNCTION::VERTEX_TEXTURE_FETCHCUBE));
+				SetDSTVec(getFunction(FUNCTION::FUNCTION_VERTEX_TEXTURE_FETCHCUBE));
 				break;
 			}
 
@@ -784,7 +753,7 @@ std::string VertexProgramDecompiler::Decompile()
 		}
 	}
 
-	if (has_BRA || !m_prog.jump_table.empty())
+	if (is_has_BRA || !m_prog.jump_table.empty())
 	{
 		m_cur_instr = &m_instructions[m_instr_count - 1];
 		m_cur_instr->close_scopes++;
diff --git a/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.h b/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.h
index 94b25f8076..35a3c69f24 100644
--- a/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.h
+++ b/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.h
@@ -63,8 +63,6 @@ struct VertexProgramDecompiler
 	const RSXVertexProgram& m_prog;
 	ParamArray m_parr;
 
-	std::set<u16> m_constant_ids;
-
 	static std::string NotZeroPositive(const std::string& code);
 	std::string GetMask(bool is_sca) const;
 	std::string GetVecMask();
@@ -132,15 +130,10 @@ protected:
 public:
 	struct
 	{
-		// Configuration properties (in)
-		// None
-
-		// Decoded properties (out)
 		bool has_lit_op = false;
-		bool has_indexed_constants = false;
 	}
 	properties;
 
 	VertexProgramDecompiler(const RSXVertexProgram& prog);
 	std::string Decompile();
-};
+};
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/Program/program_state_cache2.hpp b/rpcs3/Emu/RSX/Program/program_state_cache2.hpp
new file mode 100644
index 0000000000..9dc1e4f132
--- /dev/null
+++ b/rpcs3/Emu/RSX/Program/program_state_cache2.hpp
@@ -0,0 +1,63 @@
+#pragma once
+
+#include "ProgramStateCache.h"
+
+#include "emmintrin.h"
+#include "util/asm.hpp"
+
+template <typename Traits>
+void program_state_cache<Traits>::fill_fragment_constants_buffer(std::span<f32> dst_buffer, const RSXFragmentProgram &fragment_program, bool sanitize) const
+{
+	const auto I = m_fragment_shader_cache.find(fragment_program);
+	if (I == m_fragment_shader_cache.end())
+		return;
+
+	ensure((dst_buffer.size_bytes() >= ::narrow<int>(I->second.FragmentConstantOffsetCache.size()) * 16u));
+
+	f32* dst = dst_buffer.data();
+	alignas(16) f32 tmp[4];
+	for (usz offset_in_fragment_program : I->second.FragmentConstantOffsetCache)
+	{
+		char* data = static_cast<char*>(fragment_program.get_data()) + offset_in_fragment_program;
+		const __m128i vector = _mm_loadu_si128(reinterpret_cast<__m128i*>(data));
+		const __m128i shuffled_vector = _mm_or_si128(_mm_slli_epi16(vector, 8), _mm_srli_epi16(vector, 8));
+
+		if (!patch_table.is_empty())
+		{
+			_mm_store_ps(tmp, _mm_castsi128_ps(shuffled_vector));
+
+			for (int i = 0; i < 4; ++i)
+			{
+				bool patched = false;
+				for (auto& e : patch_table.db)
+				{
+					//TODO: Use fp comparison with fabsf without hurting performance
+					patched = e.second.test_and_set(tmp[i], &dst[i]);
+					if (patched)
+					{
+						break;
+					}
+				}
+
+				if (!patched)
+				{
+					dst[i] = tmp[i];
+				}
+			}
+		}
+		else if (sanitize)
+		{
+			//Convert NaNs and Infs to 0
+			const auto masked = _mm_and_si128(shuffled_vector, _mm_set1_epi32(0x7fffffff));
+			const auto valid = _mm_cmplt_epi32(masked, _mm_set1_epi32(0x7f800000));
+			const auto result = _mm_and_si128(shuffled_vector, valid);
+			_mm_stream_si128(utils::bless<__m128i>(dst), result);
+		}
+		else
+		{
+			_mm_stream_si128(utils::bless<__m128i>(dst), shuffled_vector);
+		}
+
+		dst += 4;
+	}
+}
diff --git a/rpcs3/Emu/RSX/Program/program_util.cpp b/rpcs3/Emu/RSX/Program/program_util.cpp
index e5daf319fc..80d8a2237a 100644
--- a/rpcs3/Emu/RSX/Program/program_util.cpp
+++ b/rpcs3/Emu/RSX/Program/program_util.cpp
@@ -42,7 +42,7 @@ namespace rsx
 		std::memcpy(static_cast<u8*>(dst) + mem_offset, reinterpret_cast<const u8*>(src) + mem_offset, mem_size);
 	}
 
-	void fragment_program_texture_config::write_to(void* dst, u16 mask) const
+	void fragment_program_texture_config::write_to(void* dst, u16 mask)
 	{
 		masked_transfer(dst, slots_, mask);
 	}
@@ -55,16 +55,16 @@ namespace rsx
 	void fragment_program_texture_state::clear(u32 index)
 	{
 		const u16 clear_mask = ~(static_cast<u16>(1 << index));
+		unnormalized_coords &= clear_mask;
 		redirected_textures &= clear_mask;
 		shadow_textures &= clear_mask;
-		multisampled_textures &= clear_mask;
 	}
 
 	void fragment_program_texture_state::import(const fragment_program_texture_state& other, u16 mask)
 	{
+		unnormalized_coords = other.unnormalized_coords & mask;
 		redirected_textures = other.redirected_textures & mask;
 		shadow_textures = other.shadow_textures & mask;
-		multisampled_textures = other.multisampled_textures & mask;
 		texture_dimensions = other.texture_dimensions & duplicate_and_extend(mask);
 	}
 
@@ -81,18 +81,16 @@ namespace rsx
 		return texture_dimensions == other.texture_dimensions &&
 			redirected_textures == other.redirected_textures &&
 			shadow_textures == other.shadow_textures &&
-			multisampled_textures == other.multisampled_textures;
+			unnormalized_coords == other.unnormalized_coords;
 	}
 
-	void vertex_program_texture_state::clear(u32 index)
+	void vertex_program_texture_state::clear(u32 /*index*/)
 	{
-		const u16 clear_mask = ~(static_cast<u16>(1 << index));
-		multisampled_textures &= clear_mask;
+		// Nothing to do yet
 	}
 
 	void vertex_program_texture_state::import(const vertex_program_texture_state& other, u16 mask)
 	{
-		multisampled_textures = other.multisampled_textures & mask;
 		texture_dimensions = other.texture_dimensions & duplicate_and_extend(mask);
 	}
 
@@ -106,82 +104,6 @@ namespace rsx
 
 	bool vertex_program_texture_state::operator == (const vertex_program_texture_state& other) const
 	{
-		return texture_dimensions == other.texture_dimensions &&
-			multisampled_textures == other.multisampled_textures;
-	}
-
-	int VertexProgramBase::translate_constants_range(int first_index, int count) const
-	{
-		// The constant ids should be sorted, so just find the first one and check for continuity
-		int index = -1;
-		int next = first_index;
-		int last = first_index + count - 1;
-
-		// Early rejection test
-		if (constant_ids.empty() || first_index > constant_ids.back() || last < first_index)
-		{
-			return -1;
-		}
-
-		for (size_t i = 0; i < constant_ids.size(); ++i)
-		{
-			if (constant_ids[i] > first_index && index < 0)
-			{
-				// No chance of a match
-				return -1;
-			}
-
-			if (constant_ids[i] == next)
-			{
-				// Index matched
-				if (index < 0)
-				{
-					index = static_cast<int>(i);
-				}
-
-				if (last == next++)
-				{
-					return index;
-				}
-
-				continue;
-			}
-
-			if (index >= 0)
-			{
-				// Previously matched but no more
-				return -1;
-			}
-		}
-
-		// OOB or partial match
-		return -1;
-	}
-
-	bool VertexProgramBase::overlaps_constants_range(int first_index, int count) const
-	{
-		if (has_indexed_constants)
-		{
-			return true;
-		}
-
-		const int last_index = first_index + count - 1;
-
-		// Early rejection test
-		if (constant_ids.empty() || first_index > constant_ids.back() || last_index < first_index)
-		{
-			return false;
-		}
-
-		// Check for any hits
-		for (auto& idx : constant_ids)
-		{
-			if (idx >= first_index && idx <= last_index)
-			{
-				return true;
-			}
-		}
-
-		return false;
+		return texture_dimensions == other.texture_dimensions;
 	}
 }
diff --git a/rpcs3/Emu/RSX/Program/program_util.h b/rpcs3/Emu/RSX/Program/program_util.h
index 8159b27845..dc149f9383 100644
--- a/rpcs3/Emu/RSX/Program/program_util.h
+++ b/rpcs3/Emu/RSX/Program/program_util.h
@@ -17,17 +17,16 @@ namespace rsx
 		struct TIU_slot
 		{
 			float scale[3];
-			float bias[3];
-			float clamp_min[2];
-			float clamp_max[2];
+			float subpixel_bias;
 			u32 remap;
 			u32 control;
+			u32 padding[2];
 		}
 		slots_[16]; // QT headers will collide with any variable named 'slots' because reasons
 
 		TIU_slot& operator[](u32 index) { return slots_[index]; }
 
-		void write_to(void* dst, u16 mask) const;
+		void write_to(void* dst, u16 mask);
 		void load_from(const void* src, u16 mask);
 
 		static void masked_transfer(void* dst, const void* src, u16 mask);
@@ -37,9 +36,10 @@ namespace rsx
 	struct fragment_program_texture_state
 	{
 		u32 texture_dimensions = 0;
+		u16 unnormalized_coords = 0;
 		u16 redirected_textures = 0;
 		u16 shadow_textures = 0;
-		u16 multisampled_textures = 0;
+		u16 reserved = 0;
 
 		void clear(u32 index);
 		void import(const fragment_program_texture_state& other, u16 mask);
@@ -50,26 +50,10 @@ namespace rsx
 	struct vertex_program_texture_state
 	{
 		u32 texture_dimensions = 0;
-		u16 multisampled_textures = 0;
 
 		void clear(u32 index);
 		void import(const vertex_program_texture_state& other, u16 mask);
 		void set_dimension(texture_dimension_extended type, u32 index);
 		bool operator == (const vertex_program_texture_state& other) const;
 	};
-
-	struct VertexProgramBase
-	{
-		u32 id = 0;
-		std::vector<u16> constant_ids;
-		bool has_indexed_constants = false;
-
-		// Translates an incoming range of constants against our mapping.
-		// If there is no linear mapping available, return -1, otherwise returns the translated index of the first slot
-		// TODO: Move this somewhere else during refactor
-		int translate_constants_range(int first_index, int count) const;
-
-		// Returns true if this program consumes any constants in the range [first, first + count - 1]
-		bool overlaps_constants_range(int first_index, int count) const;
-	};
 }
diff --git a/rpcs3/Emu/RSX/RSXDisAsm.cpp b/rpcs3/Emu/RSX/RSXDisAsm.cpp
index e1ac01c001..3e88e5cce1 100644
--- a/rpcs3/Emu/RSX/RSXDisAsm.cpp
+++ b/rpcs3/Emu/RSX/RSXDisAsm.cpp
@@ -8,44 +8,25 @@
 
 namespace rsx
 {
-	void invalid_method(context*, u32, u32);
+	void invalid_method(thread*, u32, u32);
 }
 
 u32 RSXDisAsm::disasm(u32 pc)
 {
 	last_opcode.clear();
 
-	auto try_read_op = [this](u32 pc) -> bool
-	{
-		if (pc < m_start_pc)
-		{
-			return false;
-		}
+	u32 addr = static_cast<const rsx::thread*>(m_cpu)->iomap_table.get_addr(pc);
 
-		if (m_offset == vm::g_sudo_addr)
-		{
-			// Translation needed
-			pc = static_cast<const rsx::thread*>(m_cpu)->iomap_table.get_addr(pc);
-
-			if (pc == umax) return false;
-		}
-
-		m_op = *reinterpret_cast<const atomic_be_t<u32>*>(m_offset + pc);
-		return true;
-	};
-
-	if (!try_read_op(pc))
-	{
-		return 0;
-	}
+	if (addr == umax) return 0;
 
+	m_op = *reinterpret_cast<const atomic_be_t<u32>*>(m_offset + addr);
 	dump_pc = pc;
 
 	if (m_op & RSX_METHOD_NON_METHOD_CMD_MASK)
 	{
-		if (m_mode == cpu_disasm_mode::survey_cmd_size)
+		if (m_mode == cpu_disasm_mode::list)
 		{
-			return 4;
+			return 0;
 		}
 
 		if ((m_op & RSX_METHOD_OLD_JUMP_CMD_MASK) == RSX_METHOD_OLD_JUMP_CMD)
@@ -69,35 +50,41 @@ u32 RSXDisAsm::disasm(u32 pc)
 		}
 		else
 		{
-			Write(fmt::format("?? ?? (0x%x)", m_op), -1);
+			Write("?? ??", -1);
 		}
 
 		return 4;
 	}
 	else if ((m_op & RSX_METHOD_NOP_MASK) == RSX_METHOD_NOP_CMD)
 	{
+		if (m_mode == cpu_disasm_mode::list)
+		{
+			return 0;
+		}
+
 		u32 i = 1;
 
-		for (pc += 4; m_mode != cpu_disasm_mode::list && pc % (4096 * 4); i++, pc += 4)
+		for (pc += 4; i < 4096; i++, pc += 4)
 		{
-			if (!try_read_op(pc))
+			addr = static_cast<const rsx::thread*>(m_cpu)->iomap_table.get_addr(pc);
+
+			if (addr == umax)
 			{
 				break;
 			}
 
+			m_op = *reinterpret_cast<const atomic_be_t<u32>*>(m_offset + addr);
+
 			if ((m_op & RSX_METHOD_NOP_MASK) != RSX_METHOD_NOP_CMD)
 			{
 				break;
 			}
 		}
 
-		if (m_mode != cpu_disasm_mode::survey_cmd_size)
-		{
-			if (i == 1)
-				Write("nop", 0);
-			else
-				Write(fmt::format("nop x%u", i), 0);
-		}
+		if (i == 1)
+			Write("nop", 0);
+		else
+			Write(fmt::format("nop x%u", i), 0);
 
 		return i * 4;
 	}
@@ -111,45 +98,35 @@ u32 RSXDisAsm::disasm(u32 pc)
 		{
 			// Hack: 0 method with large count is unlikely to be a command
 			// But is very common in floating point args, messing up debugger's code-flow
-			Write(fmt::format("?? ?? (0x%x)", m_op), -1);
+			Write("?? ??", -1);
 			return 4;
 		}
 
 		pc += 4;
 
-		std::string str;
-
-		for (u32 i = 0; i < count; i++, pc += 4)
+		for (u32 i = 0; i < (m_mode == cpu_disasm_mode::list ? count : 1); i++, pc += 4)
 		{
-			if (!try_read_op(pc))
+			addr = static_cast<const rsx::thread*>(m_cpu)->iomap_table.get_addr(pc);
+
+			if (addr == umax)
 			{
 				last_opcode.clear();
-				Write(fmt::format("?? ?? (0x%08x:unmapped)", m_op), -1);
+				Write("?? ??", -1);
 				return 4;
 			}
 
+			m_op = *reinterpret_cast<const atomic_be_t<u32>*>(m_offset + addr);
+
 			const u32 id = id_start + (non_inc ? 0 : i);
 
 			if (rsx::methods[id] == &rsx::invalid_method)
 			{
 				last_opcode.clear();
-				Write(fmt::format("?? ?? (0x%08x:method)", m_op), -1);
+				Write("?? ??", -1);
 				return 4;
 			}
 
-			if (m_mode == cpu_disasm_mode::survey_cmd_size)
-			{
-				continue;
-			}
-
-			if (m_mode != cpu_disasm_mode::list && !last_opcode.empty())
-			{
-				continue;
-			}
-
-			str.clear();
-			rsx::get_pretty_printing_function(id)(str, id, m_op);
-
+			std::string str = rsx::get_pretty_printing_function(id)(id, m_op);
 			Write(str, m_mode == cpu_disasm_mode::list ? i : count, non_inc, id);
 		}
 
@@ -157,40 +134,19 @@ u32 RSXDisAsm::disasm(u32 pc)
 	}
 }
 
-std::pair<const void*, usz> RSXDisAsm::get_memory_span() const
-{
-	return {m_offset + m_start_pc, (1ull << 32) - m_start_pc};
-}
-
-std::unique_ptr<CPUDisAsm> RSXDisAsm::copy_type_erased() const
-{
-	return std::make_unique<RSXDisAsm>(*this);
-}
-
-void RSXDisAsm::Write(std::string_view str, s32 count, bool is_non_inc, u32 id)
+void RSXDisAsm::Write(const std::string& str, s32 count, bool is_non_inc, u32 id)
 {
 	switch (m_mode)
 	{
 	case cpu_disasm_mode::interpreter:
 	{
-		last_opcode.clear();
-
-		if (count == 1 && !is_non_inc)
-		{
-			fmt::append(last_opcode, "[%08x] ( )", dump_pc);
-		}
-		else if (count >= 0)
-		{
-			fmt::append(last_opcode, "[%08x] (%s%u)", dump_pc, is_non_inc ? "+" : "", count);
-		}
-		else
-		{
-			fmt::append(last_opcode, "[%08x] (x)", dump_pc);
-		}
+		last_opcode = count >= 0 ? fmt::format("[%08x] (%s%u)", dump_pc, is_non_inc ? "+" : "", count) : 
+			fmt::format("[%08x] (x)", dump_pc);
 
 		auto& res = last_opcode;
 
-		res.resize(7 + 11, ' ');
+		res.resize(7 + 11);
+		std::replace(res.begin(), res.end(), '\0', ' ');
 
 		res += str;
 		break;
diff --git a/rpcs3/Emu/RSX/RSXDisAsm.h b/rpcs3/Emu/RSX/RSXDisAsm.h
index 445e5290bf..46eb401c93 100644
--- a/rpcs3/Emu/RSX/RSXDisAsm.h
+++ b/rpcs3/Emu/RSX/RSXDisAsm.h
@@ -1,19 +1,17 @@
 #pragma once
 
-#include "Emu/CPU/CPUDisAsm.h"
+#include "Emu/Cell/PPCDisAsm.h"
 
 class RSXDisAsm final : public CPUDisAsm
 {
 public:
-	RSXDisAsm(cpu_disasm_mode mode, const u8* offset, u32 start_pc, const cpu_thread* cpu) : CPUDisAsm(mode, offset, start_pc, cpu)
+	RSXDisAsm(cpu_disasm_mode mode, const u8* offset, const cpu_thread* cpu) : CPUDisAsm(mode, offset, cpu)
 	{
 	}
 
 private:
-	void Write(std::string_view str, s32 count, bool is_non_inc = false, u32 id = 0);
+	void Write(const std::string& str, s32 count, bool is_non_inc = false, u32 id = 0);
 
 public:
 	u32 disasm(u32 pc) override;
-	std::pair<const void*, usz> get_memory_span() const override;
-	std::unique_ptr<CPUDisAsm> copy_type_erased() const override;
 };
diff --git a/rpcs3/Emu/RSX/RSXFIFO.cpp b/rpcs3/Emu/RSX/RSXFIFO.cpp
index 28cd0c286d..9829847b73 100644
--- a/rpcs3/Emu/RSX/RSXFIFO.cpp
+++ b/rpcs3/Emu/RSX/RSXFIFO.cpp
@@ -1,23 +1,9 @@
 #include "stdafx.h"
 
-#include "Emu/System.h"
 #include "RSXFIFO.h"
 #include "RSXThread.h"
 #include "Capture/rsx_capture.h"
-#include "Core/RSXReservationLock.hpp"
-#include "Emu/Memory/vm_reservation.h"
 #include "Emu/Cell/lv2/sys_rsx.h"
-#include "NV47/HW/context.h"
-
-#include "util/asm.hpp"
-
-#include <thread>
-#include <bitset>
-
-using spu_rdata_t = std::byte[128];
-
-extern void mov_rdata(spu_rdata_t& _dst, const spu_rdata_t& _src);
-extern bool cmp_rdata(const spu_rdata_t& _lhs, const spu_rdata_t& _rhs);
 
 namespace rsx
 {
@@ -25,31 +11,15 @@ namespace rsx
 	{
 		FIFO_control::FIFO_control(::rsx::thread* pctrl)
 		{
-			m_thread = pctrl;
 			m_ctrl = pctrl->ctrl;
 			m_iotable = &pctrl->iomap_table;
 		}
 
-		u32 FIFO_control::translate_address(u32 address) const
-		{
-			return m_iotable->get_addr(address);
-		}
-
 		void FIFO_control::sync_get() const
 		{
 			m_ctrl->get.release(m_internal_get);
 		}
 
-		void FIFO_control::restore_state(u32 cmd, u32 count)
-		{
-			m_cmd = cmd;
-			m_command_inc = ((m_cmd & RSX_METHOD_NON_INCREMENT_CMD_MASK) == RSX_METHOD_NON_INCREMENT_CMD) ? 0 : 4;
-			m_remaining_commands = count;
-			m_internal_get = m_ctrl->get - 4;
-			m_args_ptr = m_iotable->get_addr(m_internal_get);
-			m_command_reg = (m_cmd & 0xffff) + m_command_inc * (((m_cmd >> 18) - count) & 0x7ff) - m_command_inc;
-		}
-
 		void FIFO_control::inc_get(bool wait)
 		{
 			m_internal_get += 4;
@@ -59,19 +29,18 @@ namespace rsx
 				// NOTE: Only supposed to be invoked to wait for a single arg on command[0] (4 bytes)
 				// Wait for put to allow us to procceed execution
 				sync_get();
-				invalidate_cache();
 
 				while (read_put() == m_internal_get && !Emu.IsStopped())
 				{
-					m_thread->cpu_wait({});
+					std::this_thread::yield();
 				}
 			}
 		}
 
-		template <bool Full>
+		template <bool full>
 		inline u32 FIFO_control::read_put() const
 		{
-			if constexpr (!Full)
+			if constexpr (!full)
 			{
 				return m_ctrl->put & ~3;
 			}
@@ -86,232 +55,42 @@ namespace rsx
 			}
 		}
 
-		std::pair<bool, u32> FIFO_control::fetch_u32(u32 addr)
+		void FIFO_control::set_get(u32 get)
 		{
-			if (addr - m_cache_addr >= m_cache_size)
+			if (m_ctrl->get == get)
 			{
-				const u32 put = read_put();
-
-				if (put == addr)
+				if (const u32 addr = m_iotable->get_addr(m_memwatch_addr); addr + 1)
 				{
-					return {false, FIFO_EMPTY};
+					m_memwatch_addr = get;
+					m_memwatch_cmp = vm::read32(addr);
 				}
 
-				m_cache_addr = addr & -128;
-
-				const u32 addr1 = m_iotable->get_addr(m_cache_addr);
-
-				if (addr1 == umax)
-				{
-					m_cache_size = 0;
-					return {false, FIFO_ERROR};
-				}
-
-				m_cache_size = std::min<u32>((put | 0x7f) - m_cache_addr, u32{sizeof(m_cache)} - 1) + 1;
-
-				if (0x100000 - (m_cache_addr & 0xfffff) < m_cache_size)
-				{
-					// Check if memory layout changes in the next 1MB page boundary
-					if ((addr1 >> 20) + 1 != (m_iotable->get_addr(m_cache_addr + 0x100000) >> 20))
-					{
-						// Trim cache as needed if memory layout changes
-						m_cache_size = 0x100000 - (m_cache_addr & 0xfffff);
-					}
-				}
-
-				// Make mask of cache lines to fetch
-				u8 to_fetch = static_cast<u8>((1u << (m_cache_size / 128)) - 1);
-
-				if (addr < put && put < m_cache_addr + m_cache_size)
-				{
-					// Adjust to knownly-prepared FIFO buffer bounds
-					m_cache_size = put - m_cache_addr;
-				}
-
-				// Atomic FIFO debug options
-				const bool force_cache_fill = g_cfg.core.rsx_fifo_accuracy == rsx_fifo_mode::atomic_ordered;
-				const bool strict_fetch_ordering = g_cfg.core.rsx_fifo_accuracy >= rsx_fifo_mode::atomic_ordered;
-
-				rsx::reservation_lock<true, 1> rsx_lock(addr1, m_cache_size, true);
-				const auto src = vm::_ptr<spu_rdata_t>(addr1);
-
-				u64 start_time = 0;
-				u32 bytes_read = 0;
-
-				// Find the next set bit after every iteration
-				for (int i = 0;; i = (std::countr_zero<u32>(utils::rol8(to_fetch, 0 - i - 1)) + i + 1) % 8)
-				{
-					// If a reservation is being updated, try to load another
-					const auto& res = vm::reservation_acquire(addr1 + i * 128);
-					const u64 time0 = res;
-
-					if (!(time0 & 127))
-					{
-						mov_rdata(m_cache[i], src[i]);
-
-						if (time0 == res && cmp_rdata(m_cache[i], src[i]))
-						{
-							// The fetch of the cache line content has been successful, unset its bit
-							to_fetch &= ~(1u << i);
-
-							if (!to_fetch)
-							{
-								break;
-							}
-
-							bytes_read += 128;
-							continue;
-						}
-					}
-
-					if (!start_time)
-					{
-						if (bytes_read >= 256 && !force_cache_fill)
-						{
-							// Cut our losses if we have something to work with.
-							// This is the first time falling out of the reservation loop above, so we have clean data with no holes.
-							m_cache_size = bytes_read;
-							break;
-						}
-
-						start_time = get_system_time();
-					}
-
-					auto now = get_system_time();
-					if (now - start_time >= 50u)
-					{
-						if (m_thread->is_stopped())
-						{
-							return {};
-						}
-
-						m_thread->cpu_wait({});
-
-						const auto then = std::exchange(now, get_system_time());
-						start_time = now;
-						m_thread->performance_counters.idle_time += now - then;
-					}
-					else
-					{
-						busy_wait(200);
-					}
-
-					if (strict_fetch_ordering)
-					{
-						i = (i - 1) % 8;
-					}
-				}
-			}
-
-			const auto ret = read_from_ptr<be_t<u32>>(+m_cache[0], addr - m_cache_addr);
-			return {true, ret};
-		}
-
-		void FIFO_control::set_get(u32 get, u32 spin_cmd)
-		{
-			invalidate_cache();
-
-			if (spin_cmd && m_ctrl->get == get)
-			{
-				m_memwatch_addr = get;
-				m_memwatch_cmp = spin_cmd;
 				return;
 			}
 
 			// Update ctrl registers
 			m_ctrl->get.release(m_internal_get = get);
 			m_remaining_commands = 0;
-		}
 
-		std::span<const u32> FIFO_control::get_current_arg_ptr(u32 length_in_words) const
-		{
-			if (!length_in_words)
-			{
-				// This means the caller is doing something stupid
-				rsx_log.error("Invalid access to FIFO args data, requested length = 0");
-				return {};
-			}
-
-			if (g_cfg.core.rsx_fifo_accuracy)
-			{
-				// Return a pointer to the cache storage with confined access
-				const u32 cache_offset_in_words = (m_internal_get - m_cache_addr) / 4;
-				const u32 cache_size_in_words = m_cache_size / 4;
-				return {reinterpret_cast<const u32*>(&m_cache) + cache_offset_in_words, cache_size_in_words - cache_offset_in_words};
-			}
-
-			// Return a raw pointer to contiguous memory
-			constexpr u32 _1M = 0x100000;
-			const u32 size = length_in_words * sizeof(u32);
-			const u32 from = m_iotable->get_addr(m_internal_get);
-
-			for (u32 remaining = size, addr = m_internal_get, ptr = from; remaining > 0;)
-			{
-				const u32 next_block = utils::align(addr + 1, _1M);
-				const u32 available = (next_block - addr);
-				if (remaining <= available)
-				{
-					return { static_cast<const u32*>(vm::base(from)), length_in_words };
-				}
-
-				remaining -= available;
-				const u32 next_ptr = m_iotable->get_addr(next_block);
-				if (next_ptr != (ptr + available))
-				{
-					return { static_cast<const u32*>(vm::base(from)), (size - remaining) / sizeof(u32)};
-				}
-
-				ptr = next_ptr;
-				addr = next_block;
-			}
-
-			fmt::throw_exception("Unreachable");
+			// Clear memwatch spinner
+			m_memwatch_addr = 0;
 		}
 
 		bool FIFO_control::read_unsafe(register_pair& data)
 		{
 			// Fast read with no processing, only safe inside a PACKET_BEGIN+count block
-			if (m_remaining_commands)
+			if (m_remaining_commands &&
+				m_internal_get != read_put<false>())
 			{
-				bool ok{};
-				u32 arg = 0;
-
-				if (g_cfg.core.rsx_fifo_accuracy) [[ unlikely ]]
-				{
-					std::tie(ok, arg) = fetch_u32(m_internal_get + 4);
-
-					if (!ok)
-					{
-						if (arg == FIFO_ERROR)
-						{
-							m_thread->recover_fifo();
-						}
-
-						return false;
-					}
-				}
-				else
-				{
-					if (m_internal_get + 4 == read_put<false>())
-					{
-						return false;
-					}
-
-					m_args_ptr += 4;
-					arg = vm::read32(m_args_ptr);
-				}
-
+				m_command_reg += m_command_inc;
+				m_args_ptr += 4;
+				m_remaining_commands--;
 				m_internal_get += 4;
 
-				m_command_reg += m_command_inc;
-
-				--m_remaining_commands;
-
-				data.set(m_command_reg, arg);
+				data.set(m_command_reg, vm::read32(m_args_ptr));
 				return true;
 			}
 
-			m_internal_get += 4;
 			return false;
 		}
 
@@ -322,9 +101,10 @@ namespace rsx
 			if (m_remaining_commands > count)
 			{
 				m_command_reg += m_command_inc * count;
+				m_args_ptr += 4 * count;
 				m_remaining_commands -= count;
 				m_internal_get += 4 * count;
-				m_args_ptr += 4 * count;
+
 				return true;
 			}
 
@@ -340,10 +120,19 @@ namespace rsx
 
 		void FIFO_control::read(register_pair& data)
 		{
-			if (m_remaining_commands)
+			const u32 put = read_put();
+			m_internal_get = m_ctrl->get;
+
+			if (put == m_internal_get)
+			{
+				// Nothing to do
+				data.reg = FIFO_EMPTY;
+				return;
+			}
+
+			if (m_remaining_commands && read_unsafe(data))
 			{
 				// Previous block aborted to wait for PUT pointer
-				read_unsafe(data);
 				return;
 			}
 
@@ -366,38 +155,15 @@ namespace rsx
 				m_memwatch_cmp = 0;
 			}
 
-			if (!g_cfg.core.rsx_fifo_accuracy) [[ likely ]]
+			if (const u32 addr = m_iotable->get_addr(m_internal_get); addr + 1)
 			{
-				const u32 put = read_put();
-
-				if (put == m_internal_get)
-				{
-					// Nothing to do
-					data.reg = FIFO_EMPTY;
-					return;
-				}
-
-				if (const u32 addr = m_iotable->get_addr(m_internal_get); addr + 1)
-				{
-					m_cmd = vm::read32(addr);
-				}
-				else
-				{
-					data.reg = FIFO_ERROR;
-					return;
-				}
+				m_cmd = vm::read32(addr);
 			}
 			else
 			{
-				if (auto [ok, arg] = fetch_u32(m_internal_get); ok)
-				{
-					m_cmd = arg;
-				}
-				else
-				{
-					data.reg = arg;
-					return;
-				}
+				// TODO: Optional recovery
+				data.reg = FIFO_ERROR;
+				return;
 			}
 
 			if (m_cmd & RSX_METHOD_NON_METHOD_CMD_MASK) [[unlikely]]
@@ -422,11 +188,20 @@ namespace rsx
 
 			if (!count)
 			{
-				m_ctrl->get.release(m_internal_get += 4);
+				m_ctrl->get.release(m_internal_get + 4);
 				data.reg = FIFO_NOP;
 				return;
 			}
 
+			// Validate the args ptr if the command attempts to read from it
+			m_args_ptr = m_iotable->get_addr(m_internal_get + 4);
+			if (m_args_ptr == umax) [[unlikely]]
+			{
+				// Optional recovery
+				data.reg = FIFO_ERROR;
+				return;
+			}
+
 			if (count > 1)
 			{
 				// Set up readback parameters
@@ -435,43 +210,8 @@ namespace rsx
 				m_remaining_commands = count - 1;
 			}
 
-			if (g_cfg.core.rsx_fifo_accuracy)
-			{
-				m_internal_get += 4;
-
-				auto [ok, arg] = fetch_u32(m_internal_get);
-
-				if (!ok)
-				{
-					// Optional recovery
-					if (arg == FIFO_ERROR)
-					{
-						data.reg = FIFO_ERROR;
-					}
-					else
-					{
-						data.reg = FIFO_EMPTY;
-						m_command_reg = m_cmd & 0xfffc;
-						m_remaining_commands++;
-					}
-
-					return;
-				}
-
-				data.set(m_cmd & 0xfffc, arg);
-				return;
-			}
-
 			inc_get(true); // Wait for data block to become available
-
-			// Validate the args ptr if the command attempts to read from it
-			m_args_ptr = m_iotable->get_addr(m_internal_get);
-			if (m_args_ptr == umax) [[unlikely]]
-			{
-				// Optional recovery
-				data.reg = FIFO_ERROR;
-				return;
-			}
+			m_internal_get += 4;
 
 			data.set(m_cmd & 0xfffc, vm::read32(m_args_ptr));
 		}
@@ -480,7 +220,7 @@ namespace rsx
 		{
 			enabled = _enabled;
 			num_collapsed = 0;
-			in_begin_end = false;
+			begin_end_ctr = 0;
 		}
 
 		void flattening_helper::force_disable()
@@ -546,7 +286,7 @@ namespace rsx
 				{
 					// If its set to unoptimizable, we already tried and it did not work
 					// If it resets to load low (usually after some kind of loading screen) we can try again
-					ensure(in_begin_end == false); // "Incorrect initial state"
+					ensure(begin_end_ctr == 0); // "Incorrect initial state"
 					ensure(num_collapsed == 0);
 					enabled = true;
 				}
@@ -560,7 +300,7 @@ namespace rsx
 			{
 			case NV4097_SET_BEGIN_END:
 			{
-				in_begin_end = !!command.value;
+				begin_end_ctr ^= 1;
 
 				if (command.value)
 				{
@@ -590,7 +330,7 @@ namespace rsx
 				else
 				{
 					rsx_log.error("Fifo flattener misalignment, disable FIFO reordering and report to developers");
-					in_begin_end = false;
+					begin_end_ctr = 0;
 					flush_cmd = 0u;
 				}
 
@@ -614,7 +354,7 @@ namespace rsx
 					else
 					{
 						// Flush
-						flush_cmd = (in_begin_end) ? deferred_primitive : 0u;
+						flush_cmd = (begin_end_ctr) ? deferred_primitive : 0u;
 					}
 				}
 				else
@@ -633,7 +373,7 @@ namespace rsx
 				draw_count = 0;
 				deferred_primitive = flush_cmd;
 
-				return in_begin_end ? EMIT_BARRIER : EMIT_END;
+				return (begin_end_ctr == 1)? EMIT_BARRIER : EMIT_END;
 			}
 
 			return NOTHING;
@@ -653,20 +393,20 @@ namespace rsx
 			{
 			case FIFO::FIFO_NOP:
 			{
-				if (performance_counters.state == FIFO::state::running)
+				if (performance_counters.state == FIFO_state::running)
 				{
 					performance_counters.FIFO_idle_timestamp = get_system_time();
-					performance_counters.state = FIFO::state::nop;
+					performance_counters.state = FIFO_state::nop;
 				}
 
 				return;
 			}
 			case FIFO::FIFO_EMPTY:
 			{
-				if (performance_counters.state == FIFO::state::running)
+				if (performance_counters.state == FIFO_state::running)
 				{
 					performance_counters.FIFO_idle_timestamp = get_system_time();
-					performance_counters.state = FIFO::state::empty;
+					performance_counters.state = FIFO_state::empty;
 				}
 				else
 				{
@@ -689,30 +429,42 @@ namespace rsx
 			}
 
 			// Check for flow control
-			if (std::bitset<2> jump_type; jump_type
-				.set(0, (cmd & RSX_METHOD_OLD_JUMP_CMD_MASK) == RSX_METHOD_OLD_JUMP_CMD)
-				.set(1, (cmd & RSX_METHOD_NEW_JUMP_CMD_MASK) == RSX_METHOD_NEW_JUMP_CMD)
-				.any())
+			if ((cmd & RSX_METHOD_OLD_JUMP_CMD_MASK) == RSX_METHOD_OLD_JUMP_CMD)
 			{
-				const u32 offs = cmd & (jump_type.test(0) ? RSX_METHOD_OLD_JUMP_OFFSET_MASK : RSX_METHOD_NEW_JUMP_OFFSET_MASK);
+				const u32 offs = cmd & RSX_METHOD_OLD_JUMP_OFFSET_MASK;
 				if (offs == fifo_ctrl->get_pos())
 				{
 					//Jump to self. Often preceded by NOP
-					if (performance_counters.state == FIFO::state::running)
+					if (performance_counters.state == FIFO_state::running)
 					{
 						performance_counters.FIFO_idle_timestamp = get_system_time();
 						sync_point_request.release(true);
 					}
 
-					performance_counters.state = FIFO::state::spinning;
-				}
-				else
-				{
-					last_known_code_start = offs;
+					performance_counters.state = FIFO_state::spinning;
 				}
 
 				//rsx_log.warning("rsx jump(0x%x) #addr=0x%x, cmd=0x%x, get=0x%x, put=0x%x", offs, m_ioAddress + get, cmd, get, put);
-				fifo_ctrl->set_get(offs, cmd);
+				fifo_ctrl->set_get(offs);
+				return;
+			}
+			if ((cmd & RSX_METHOD_NEW_JUMP_CMD_MASK) == RSX_METHOD_NEW_JUMP_CMD)
+			{
+				const u32 offs = cmd & RSX_METHOD_NEW_JUMP_OFFSET_MASK;
+				if (offs == fifo_ctrl->get_pos())
+				{
+					//Jump to self. Often preceded by NOP
+					if (performance_counters.state == FIFO_state::running)
+					{
+						performance_counters.FIFO_idle_timestamp = get_system_time();
+						sync_point_request.release(true);
+					}
+
+					performance_counters.state = FIFO_state::spinning;
+				}
+
+				//rsx_log.warning("rsx jump(0x%x) #addr=0x%x, cmd=0x%x, get=0x%x, put=0x%x", offs, m_ioAddress + get, cmd, get, put);
+				fifo_ctrl->set_get(offs);
 				return;
 			}
 			if ((cmd & RSX_METHOD_CALL_CMD_MASK) == RSX_METHOD_CALL_CMD)
@@ -728,7 +480,6 @@ namespace rsx
 				const u32 offs = cmd & RSX_METHOD_CALL_OFFSET_MASK;
 				fifo_ret_addr = fifo_ctrl->get_pos() + 4;
 				fifo_ctrl->set_get(offs);
-				last_known_code_start = offs;
 				return;
 			}
 			if ((cmd & RSX_METHOD_RETURN_MASK) == RSX_METHOD_RETURN_CMD)
@@ -740,42 +491,23 @@ namespace rsx
 					return;
 				}
 
-				// Optimize returning to another CALL
-				if ((ctrl->put & ~3) != fifo_ret_addr)
-				{
-					if (u32 addr = iomap_table.get_addr(fifo_ret_addr); addr != umax)
-					{
-						const u32 cmd0 = vm::read32(addr);
-
-						// Check for missing step flags, in case the user is single-stepping in the debugger
-						if ((cmd0 & RSX_METHOD_CALL_CMD_MASK) == RSX_METHOD_CALL_CMD && cpu_flag::dbg_step - state)
-						{
-							fifo_ctrl->set_get(cmd0 & RSX_METHOD_CALL_OFFSET_MASK);
-							last_known_code_start = ctrl->get;
-							fifo_ret_addr += 4;
-							return;
-						}
-					}
-				}
-
 				fifo_ctrl->set_get(std::exchange(fifo_ret_addr, RSX_CALL_STACK_EMPTY));
-				last_known_code_start = ctrl->get;
 				return;
 			}
 
 			// If we reached here, this is likely an error
-			fmt::throw_exception("Unexpected command 0x%x (last cmd: 0x%x)", cmd, fifo_ctrl->last_cmd());
+			fmt::throw_exception("Unexpected command 0x%x", cmd);
 		}
 
 		if (const auto state = performance_counters.state;
-			state != FIFO::state::running)
+			state != FIFO_state::running)
 		{
-			performance_counters.state = FIFO::state::running;
+			performance_counters.state = FIFO_state::running;
 
 			// Hack: Delay FIFO wake-up according to setting
 			// NOTE: The typical spin setup is a NOP followed by a jump-to-self
 			// NOTE: There is a small delay when the jump address is dynamically edited by cell
-			if (state != FIFO::state::nop)
+			if (state != FIFO_state::nop)
 			{
 				fifo_wake_delay();
 			}
@@ -830,9 +562,9 @@ namespace rsx
 
 								commands.back().rsx_command.first = (fifo_ctrl->last_cmd() & RSX_METHOD_NON_INCREMENT_CMD_MASK) | (reg << 2) | (remaining << 18);
 
-								for (u32 i = 1; i < remaining && fifo_ctrl->get_pos() + i * 4 != (ctrl->put & ~3); i++)
+								for (u32 i = 1; i < remaining && fifo_ctrl->get_pos() + (i - 1) * 4 != (ctrl->put & ~3); i++)
 								{
-									replay_cmd.rsx_command = std::make_pair(0, vm::read32(iomap_table.get_addr(fifo_ctrl->get_pos()) + (i * 4)));
+									replay_cmd.rsx_command = std::make_pair(0, vm::read32(fifo_ctrl->get_current_arg_ptr() + (i * 4)));
 
 									commands.push_back(replay_cmd);
 								}
@@ -858,15 +590,15 @@ namespace rsx
 				case FIFO::EMIT_END:
 				{
 					// Emit end command to close existing scope
-					AUDIT(in_begin_end);
-					methods[NV4097_SET_BEGIN_END](m_ctx, NV4097_SET_BEGIN_END, 0);
+					//ensure(in_begin_end);
+					methods[NV4097_SET_BEGIN_END](this, NV4097_SET_BEGIN_END, 0);
 					break;
 				}
 				case FIFO::EMIT_BARRIER:
 				{
-					AUDIT(in_begin_end);
-					methods[NV4097_SET_BEGIN_END](m_ctx, NV4097_SET_BEGIN_END, 0);
-					methods[NV4097_SET_BEGIN_END](m_ctx, NV4097_SET_BEGIN_END, m_flattener.get_primitive());
+					//ensure(in_begin_end);
+					methods[NV4097_SET_BEGIN_END](this, NV4097_SET_BEGIN_END, 0);
+					methods[NV4097_SET_BEGIN_END](this, NV4097_SET_BEGIN_END, m_flattener.get_primitive());
 					break;
 				}
 				default:
@@ -885,22 +617,11 @@ namespace rsx
 			const u32 reg = (command.reg & 0xffff) >> 2;
 			const u32 value = command.value;
 
-			m_ctx->register_state->decode(reg, value);
+			method_registers.decode(reg, value);
 
 			if (auto method = methods[reg])
 			{
-				method(m_ctx, reg, value);
-
-				if (state & cpu_flag::again)
-				{
-					m_ctx->register_state->decode(reg, m_ctx->register_state->latch);
-					break;
-				}
-			}
-			else if (m_ctx->register_state->latch != value)
-			{
-				// Something changed, set signal flags if any specified
-				m_graphics_state |= state_signals[reg];
+				method(this, reg, value);
 			}
 		}
 		while (fifo_ctrl->read_unsafe(command));
diff --git a/rpcs3/Emu/RSX/RSXFIFO.h b/rpcs3/Emu/RSX/RSXFIFO.h
index 91f7ffb050..dc00ac1446 100644
--- a/rpcs3/Emu/RSX/RSXFIFO.h
+++ b/rpcs3/Emu/RSX/RSXFIFO.h
@@ -3,8 +3,6 @@
 #include "util/types.hpp"
 #include "Emu/RSX/gcm_enums.h"
 
-#include <span>
-
 struct RsxDmaControl;
 
 namespace rsx
@@ -32,22 +30,6 @@ namespace rsx
 			EMIT_BARRIER = 2
 		};
 
-		enum class state : u8
-		{
-			running = 0,
-			empty = 1,    // PUT == GET
-			spinning = 2, // Puller continuously jumps to self addr (synchronization technique)
-			nop = 3,      // Puller is processing a NOP command
-			lock_wait = 4,// Puller is processing a lock acquire
-			paused = 5,   // Puller is paused externallly
-		};
-
-		enum class interrupt_hint : u8
-		{
-			conditional_render_eval = 1,
-			zcull_sync = 2
-		};
-
 		struct register_pair
 		{
 			u32 reg;
@@ -93,7 +75,7 @@ namespace rsx
 
 				std::array<u8, 0x10000 / 4> register_properties{};
 
-				for (const auto& method : ignorable_ranges)
+				for (const auto &method : ignorable_ranges)
 				{
 					for (u32 i = 0; i < method.second; ++i)
 					{
@@ -106,7 +88,7 @@ namespace rsx
 
 			u32 deferred_primitive = 0;
 			u32 draw_count = 0;
-			bool in_begin_end = false;
+			u32 begin_end_ctr = 0;
 
 			bool enabled = false;
 			u32  num_collapsed = 0;
@@ -129,7 +111,6 @@ namespace rsx
 		class FIFO_control
 		{
 		private:
-			mutable rsx::thread* m_thread;
 			RsxDmaControl* m_ctrl = nullptr;
 			const rsx::rsx_iomap_table* m_iotable;
 			u32 m_internal_get = 0;
@@ -143,28 +124,17 @@ namespace rsx
 			u32 m_args_ptr = 0;
 			u32 m_cmd = ~0u;
 
-			u32 m_cache_addr = 0;
-			u32 m_cache_size = 0;
-			alignas(64) std::byte m_cache[8][128];
-
 		public:
 			FIFO_control(rsx::thread* pctrl);
 			~FIFO_control() = default;
 
-			u32 translate_address(u32 addr) const;
-
-			std::pair<bool, u32> fetch_u32(u32 addr);
-			void invalidate_cache() { m_cache_size = 0; }
-
 			u32 get_pos() const { return m_internal_get; }
 			u32 last_cmd() const { return m_cmd; }
 			void sync_get() const;
-			std::span<const u32> get_current_arg_ptr(u32 length_in_words) const;
+			u32 get_current_arg_ptr() const { return m_args_ptr; }
 			u32 get_remaining_args_count() const { return m_remaining_commands; }
-			void restore_state(u32 cmd, u32 count);
 			void inc_get(bool wait);
-
-			void set_get(u32 get, u32 spin_cmd = 0);
+			void set_get(u32 get);
 			void abort();
 
 			template <bool = true>
@@ -175,4 +145,4 @@ namespace rsx
 			bool skip_methods(u32 count);
 		};
 	}
-}
+}
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/RSXOffload.cpp b/rpcs3/Emu/RSX/RSXOffload.cpp
index f306784d59..ed911aa9c3 100644
--- a/rpcs3/Emu/RSX/RSXOffload.cpp
+++ b/rpcs3/Emu/RSX/RSXOffload.cpp
@@ -1,12 +1,9 @@
 #include "stdafx.h"
 
-#include "Emu/Memory/vm.h"
 #include "Common/BufferUtils.h"
-#include "Core/RSXReservationLock.hpp"
 #include "RSXOffload.h"
 #include "RSXThread.h"
-
-#include "Utilities/lockless.h"
+#include "rsx_utils.h"
 
 #include <thread>
 #include "util/asm.hpp"
@@ -20,7 +17,7 @@ namespace rsx
 		atomic_t<u64> m_processed_count = 0;
 		transport_packet* m_current_job = nullptr;
 
-		thread_base* current_thread_ = nullptr;
+		std::thread::id m_thread_id;
 
 		void operator ()()
 		{
@@ -30,8 +27,7 @@ namespace rsx
 				return;
 			}
 
-			current_thread_ = thread_ctrl::get_current();
-			ensure(current_thread_);
+			m_thread_id = std::this_thread::get_id();
 
 			if (g_cfg.core.thread_scheduler != thread_scheduler_mode::os)
 			{
@@ -48,8 +44,6 @@ namespace rsx
 					{
 					case raw_copy:
 					{
-						const u32 vm_addr = vm::try_get_addr(job.src).first;
-						rsx::reservation_lock<true, 1> rsx_lock(vm_addr, job.length, g_cfg.video.strict_rendering_mode && vm_addr);
 						std::memcpy(job.dst, job.src, job.length);
 						break;
 					}
@@ -90,10 +84,14 @@ namespace rsx
 		static constexpr auto thread_name = "RSX Offloader"sv;
 	};
 
+
+	using dma_thread = named_thread<dma_manager::offload_thread>;
+
+	static_assert(std::is_default_constructible_v<dma_thread>);
+
 	// initialization
 	void dma_manager::init()
 	{
-		m_thread = std::make_shared<named_thread<offload_thread>>();
 	}
 
 	// General transport
@@ -105,8 +103,8 @@ namespace rsx
 		}
 		else
 		{
-			m_thread->m_enqueued_count++;
-			m_thread->m_work_queue.push(dst, src, length);
+			g_fxo->get<dma_thread>().m_enqueued_count++;
+			g_fxo->get<dma_thread>().m_work_queue.push(dst, src, length);
 		}
 	}
 
@@ -114,14 +112,12 @@ namespace rsx
 	{
 		if (length <= max_immediate_transfer_size || !g_cfg.video.multithreaded_rsx)
 		{
-			const u32 vm_addr = vm::try_get_addr(src).first;
-			rsx::reservation_lock<true, 1> rsx_lock(vm_addr, length, g_cfg.video.strict_rendering_mode && vm_addr);
 			std::memcpy(dst, src, length);
 		}
 		else
 		{
-			m_thread->m_enqueued_count++;
-			m_thread->m_work_queue.push(dst, src, length);
+			g_fxo->get<dma_thread>().m_enqueued_count++;
+			g_fxo->get<dma_thread>().m_work_queue.push(dst, src, length);
 		}
 	}
 
@@ -135,8 +131,8 @@ namespace rsx
 		}
 		else
 		{
-			m_thread->m_enqueued_count++;
-			m_thread->m_work_queue.push(dst, primitive, count);
+			g_fxo->get<dma_thread>().m_enqueued_count++;
+			g_fxo->get<dma_thread>().m_work_queue.push(dst, primitive, count);
 		}
 	}
 
@@ -145,24 +141,19 @@ namespace rsx
 	{
 		ensure(g_cfg.video.multithreaded_rsx);
 
-		m_thread->m_enqueued_count++;
-		m_thread->m_work_queue.push(request_code, args);
+		g_fxo->get<dma_thread>().m_enqueued_count++;
+		g_fxo->get<dma_thread>().m_work_queue.push(request_code, args);
 	}
 
 	// Synchronization
-	bool dma_manager::is_current_thread() const
+	bool dma_manager::is_current_thread()
 	{
-		if (auto cpu = thread_ctrl::get_current())
-		{
-			return m_thread->current_thread_ == cpu;
-		}
-
-		return false;
+		return std::this_thread::get_id() == g_fxo->get<dma_thread>().m_thread_id;
 	}
 
 	bool dma_manager::sync() const
 	{
-		auto& _thr = *m_thread;
+		auto& _thr = g_fxo->get<dma_thread>();
 
 		if (_thr.m_enqueued_count.load() <= _thr.m_processed_count.load()) [[likely]]
 		{
@@ -195,8 +186,8 @@ namespace rsx
 
 	void dma_manager::join()
 	{
+		g_fxo->get<dma_thread>() = thread_state::aborting;
 		sync();
-		*m_thread = thread_state::aborting;
 	}
 
 	void dma_manager::set_mem_fault_flag()
@@ -212,9 +203,9 @@ namespace rsx
 	}
 
 	// Fault recovery
-	utils::address_range32 dma_manager::get_fault_range(bool writing) const
+	utils::address_range dma_manager::get_fault_range(bool writing)
 	{
-		const auto m_current_job = ensure(m_thread->m_current_job);
+		const auto m_current_job = ensure(g_fxo->get<dma_thread>().m_current_job);
 
 		void *address = nullptr;
 		u32 range = m_current_job->length;
@@ -237,6 +228,6 @@ namespace rsx
 			fmt::throw_exception("Unreachable");
 		}
 
-		return utils::address_range32::start_length(vm::get_addr(address), range);
+		return utils::address_range::start_length(vm::get_addr(address), range);
 	}
 }
diff --git a/rpcs3/Emu/RSX/RSXOffload.h b/rpcs3/Emu/RSX/RSXOffload.h
index 6e1e5d7476..f8b12194ce 100644
--- a/rpcs3/Emu/RSX/RSXOffload.h
+++ b/rpcs3/Emu/RSX/RSXOffload.h
@@ -6,9 +6,6 @@
 
 #include <vector>
 
-template <typename T>
-class named_thread;
-
 namespace rsx
 {
 	class dma_manager
@@ -53,9 +50,6 @@ namespace rsx
 
 		atomic_t<bool> m_mem_fault_flag = false;
 
-		struct offload_thread;
-		std::shared_ptr<named_thread<offload_thread>> m_thread;
-
 		// TODO: Improved benchmarks here; value determined by profiling on a Ryzen CPU, rounded to the nearest 512 bytes
 		const u32 max_immediate_transfer_size = 3584;
 
@@ -70,19 +64,21 @@ namespace rsx
 		void copy(void *dst, void *src, u32 length) const;
 
 		// Vertex utilities
-		void emulate_as_indexed(void *dst, rsx::primitive_type primitive, u32 count);
+		static void emulate_as_indexed(void *dst, rsx::primitive_type primitive, u32 count);
 
 		// Renderer callback
-		void backend_ctrl(u32 request_code, void* args);
+		static void backend_ctrl(u32 request_code, void* args);
 
 		// Synchronization
-		bool is_current_thread() const;
+		static bool is_current_thread();
 		bool sync() const;
 		void join();
 		void set_mem_fault_flag();
 		void clear_mem_fault_flag();
 
 		// Fault recovery
-		utils::address_range32 get_fault_range(bool writing) const;
+		static utils::address_range get_fault_range(bool writing);
+
+		struct offload_thread;
 	};
 }
diff --git a/rpcs3/Emu/RSX/RSXTexture.cpp b/rpcs3/Emu/RSX/RSXTexture.cpp
index 9b8f4bfb2e..96e5b51a86 100644
--- a/rpcs3/Emu/RSX/RSXTexture.cpp
+++ b/rpcs3/Emu/RSX/RSXTexture.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "RSXTexture.h"
 
+#include "rsx_methods.h"
 #include "rsx_utils.h"
 
 #include "Emu/system_config.h"
@@ -96,7 +97,7 @@ namespace rsx
 
 	rsx::comparison_function fragment_texture::zfunc() const
 	{
-		return rsx::to_comparison_function((registers[NV4097_SET_TEXTURE_ADDRESS + (m_index * 8)] >> 28) & 0xf);
+		return static_cast<rsx::comparison_function>((registers[NV4097_SET_TEXTURE_ADDRESS + (m_index * 8)] >> 28) & 0xf);
 	}
 
 	u8 fragment_texture::unsigned_remap() const
@@ -150,7 +151,7 @@ namespace rsx
 		case 16: return rsx::texture_max_anisotropy::x16;
 		default: break;
 		}
-
+	
 		return rsx::to_texture_max_anisotropy((registers[NV4097_SET_TEXTURE_CONTROL0 + (m_index * 8)] >> 4) & 0x7);
 	}
 
@@ -164,7 +165,7 @@ namespace rsx
 		return (registers[NV4097_SET_TEXTURE_CONTROL1 + (m_index * 8)]);
 	}
 
-	rsx::texture_channel_remap_t fragment_texture::decoded_remap() const
+	std::pair<std::array<u8, 4>, std::array<u8, 4>> fragment_texture::decoded_remap() const
 	{
 		u32 remap_ctl = registers[NV4097_SET_TEXTURE_CONTROL1 + (m_index * 8)];
 		u32 remap_override = (remap_ctl >> 16) & 0xFFFF;
@@ -226,17 +227,47 @@ namespace rsx
 			remap_ctl |= lo_word;
 			break;
 		}
+		case CELL_GCM_TEXTURE_B8:
+		{
+			// Low bit in remap control seems to affect whether the A component is forced to 1
+			// Only seen in BLUS31604
+			if (remap_override)
+			{
+				// Set remap lookup for A component to FORCE_ONE
+				remap_ctl = (remap_ctl & ~(3 << 8)) | (1 << 8);
+			}
+			break;
+		}
 		default:
 			break;
 		}
 
-		return decode_remap_encoding(remap_ctl);
+		//Remapping tables; format is A-R-G-B
+		//Remap input table. Contains channel index to read color from
+		const std::array<u8, 4> remap_inputs =
+		{
+			static_cast<u8>(remap_ctl & 0x3),
+			static_cast<u8>((remap_ctl >> 2) & 0x3),
+			static_cast<u8>((remap_ctl >> 4) & 0x3),
+			static_cast<u8>((remap_ctl >> 6) & 0x3),
+		};
+
+		//Remap control table. Controls whether the remap value is used, or force either 0 or 1
+		const std::array<u8, 4> remap_lookup =
+		{
+			static_cast<u8>((remap_ctl >> 8) & 0x3),
+			static_cast<u8>((remap_ctl >> 10) & 0x3),
+			static_cast<u8>((remap_ctl >> 12) & 0x3),
+			static_cast<u8>((remap_ctl >> 14) & 0x3),
+		};
+
+		return std::make_pair(remap_inputs, remap_lookup);
 	}
 
 	f32 fragment_texture::bias() const
 	{
 		const f32 bias = rsx::decode_fxp<4, 8>((registers[NV4097_SET_TEXTURE_FILTER + (m_index * 8)]) & 0x1fff);
-		return std::clamp<f32>(bias + static_cast<f32>(g_cfg.video.texture_lod_bias.get()), -16.f, 16.f - 1.f / 256);
+		return std::clamp<f32>(bias + g_cfg.video.texture_lod_bias, -16.f, 16.f - 1.f / 256);
 	}
 
 	rsx::texture_minify_filter fragment_texture::min_filter() const
@@ -294,16 +325,6 @@ namespace rsx
 		return registers[NV4097_SET_TEXTURE_BORDER_COLOR + (m_index * 8)];
 	}
 
-	color4f fragment_texture::remapped_border_color() const
-	{
-		color4f base_color = rsx::decode_border_color(border_color());
-		if (remap() == RSX_TEXTURE_REMAP_IDENTITY)
-		{
-			return base_color;
-		}
-		return decoded_remap().remap(base_color);
-	}
-
 	u16 fragment_texture::depth() const
 	{
 		return dimension() == rsx::texture_dimension::dimension3d ? (registers[NV4097_SET_TEXTURE_CONTROL3 + m_index] >> 20) : 1;
@@ -368,15 +389,19 @@ namespace rsx
 		return std::min(ensure(mipmap()), max_mipmap_count);
 	}
 
-	rsx::texture_channel_remap_t vertex_texture::decoded_remap() const
+	std::pair<std::array<u8, 4>, std::array<u8, 4>> vertex_texture::decoded_remap() const
 	{
-		return rsx::default_remap_vector;
+		return
+		{
+			{ CELL_GCM_TEXTURE_REMAP_FROM_A, CELL_GCM_TEXTURE_REMAP_FROM_R, CELL_GCM_TEXTURE_REMAP_FROM_G, CELL_GCM_TEXTURE_REMAP_FROM_B },
+			{ CELL_GCM_TEXTURE_REMAP_REMAP, CELL_GCM_TEXTURE_REMAP_REMAP, CELL_GCM_TEXTURE_REMAP_REMAP, CELL_GCM_TEXTURE_REMAP_REMAP }
+		};
 	}
 
 	u32 vertex_texture::remap() const
 	{
-		// disabled
-		return RSX_TEXTURE_REMAP_IDENTITY;
+		//disabled
+		return 0xAAE4;
 	}
 
 	bool vertex_texture::enabled() const
@@ -397,7 +422,7 @@ namespace rsx
 	f32 vertex_texture::bias() const
 	{
 		const f32 bias = rsx::decode_fxp<4, 8>((registers[NV4097_SET_VERTEX_TEXTURE_FILTER + (m_index * 8)]) & 0x1fff);
-		return std::clamp<f32>(bias + static_cast<f32>(g_cfg.video.texture_lod_bias.get()), -16.f, 16.f - 1.f / 256);
+		return std::clamp<f32>(bias + g_cfg.video.texture_lod_bias, -16.f, 16.f - 1.f / 256);
 	}
 
 	rsx::texture_minify_filter vertex_texture::min_filter() const
@@ -440,11 +465,6 @@ namespace rsx
 		return registers[NV4097_SET_VERTEX_TEXTURE_BORDER_COLOR + (m_index * 8)];
 	}
 
-	color4f vertex_texture::remapped_border_color() const
-	{
-		return rsx::decode_border_color(border_color());
-	}
-
 	u16 vertex_texture::depth() const
 	{
 		return dimension() == rsx::texture_dimension::dimension3d ? (registers[NV4097_SET_VERTEX_TEXTURE_CONTROL3 + (m_index * 8)] >> 20) : 1;
diff --git a/rpcs3/Emu/RSX/RSXTexture.h b/rpcs3/Emu/RSX/RSXTexture.h
index 5517a39e3f..e4d58cec6d 100644
--- a/rpcs3/Emu/RSX/RSXTexture.h
+++ b/rpcs3/Emu/RSX/RSXTexture.h
@@ -1,6 +1,5 @@
 #pragma once
 #include "gcm_enums.h"
-#include "color_utils.h"
 
 namespace rsx
 {
@@ -59,7 +58,14 @@ namespace rsx
 
 		// Control1
 		u32 remap() const;
-		rsx::texture_channel_remap_t decoded_remap() const;
+
+		/**
+		 * returns a pair of arrays
+		 * First array is a redirection table into the channel indices
+		 * Second array is a lookup reference deciding whether to use the redirection table or use constants 0 and 1
+		 * Both arrays have components in A-R-G-B format
+		 */
+		std::pair<std::array<u8, 4>, std::array<u8, 4>> decoded_remap() const;
 
 		// Filter
 		f32 bias() const;
@@ -78,8 +84,6 @@ namespace rsx
 
 		// Border Color
 		u32 border_color() const;
-		color4f remapped_border_color() const;
-
 		u16 depth() const;
 		u32 pitch() const;
 	};
@@ -115,7 +119,7 @@ namespace rsx
 		rsx::texture_wrap_mode wrap_t() const;
 		rsx::texture_wrap_mode wrap_r() const;
 
-		rsx::texture_channel_remap_t decoded_remap() const;
+		std::pair<std::array<u8, 4>, std::array<u8, 4>> decoded_remap() const;
 		u32 remap() const;
 
 		// Control0
@@ -134,15 +138,10 @@ namespace rsx
 
 		// Border Color
 		u32 border_color() const;
-		color4f remapped_border_color() const;
-
 		u16 depth() const;
 		u32 pitch() const;
 
 		rsx::texture_dimension_extended get_extended_texture_dimension() const;
 		u16 get_exact_mipmap_count() const;
 	};
-
-	template<typename T>
-	concept Texture = std::is_same_v<T, fragment_texture> || std::is_same_v<T, vertex_texture>;
 }
diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp
index f0a72c05fc..3726b81fc9 100644
--- a/rpcs3/Emu/RSX/RSXThread.cpp
+++ b/rpcs3/Emu/RSX/RSXThread.cpp
@@ -1,70 +1,48 @@
 #include "stdafx.h"
 #include "RSXThread.h"
 
-#include "Capture/rsx_capture.h"
-#include "Common/surface_store.h"
-#include "Core/RSXReservationLock.hpp"
-#include "Core/RSXEngLock.hpp"
-#include "Host/MM.h"
-#include "Host/RSXDMAWriter.h"
-#include "NV47/HW/context.h"
-#include "Program/GLSLCommon.h"
-#include "rsx_methods.h"
-
-#include "gcm_printing.h"
-#include "RSXDisAsm.h"
-
-#include "Emu/System.h"
-#include "Emu/Cell/PPUThread.h"
+#include "Emu/Cell/PPUCallback.h"
 #include "Emu/Cell/timers.hpp"
+
+#include "Common/BufferUtils.h"
+#include "Common/texture_cache.h"
+#include "Common/surface_store.h"
+#include "Capture/rsx_capture.h"
+#include "rsx_methods.h"
+#include "rsx_utils.h"
+#include "gcm_printing.h"
 #include "Emu/Cell/lv2/sys_event.h"
 #include "Emu/Cell/lv2/sys_time.h"
 #include "Emu/Cell/Modules/cellGcmSys.h"
-#include "util/serialization_ext.hpp"
 #include "Overlays/overlay_perf_metrics.h"
-#include "Overlays/overlay_debug_overlay.h"
-#include "Overlays/overlay_manager.h"
-
+#include "Program/GLSLCommon.h"
 #include "Utilities/date_time.h"
+#include "Utilities/StrUtil.h"
 
+#include "util/serialization.hpp"
 #include "util/asm.hpp"
 
 #include <span>
+#include <sstream>
 #include <thread>
 #include <unordered_set>
+#include <cfenv>
 
 class GSRender;
 
 #define CMD_DEBUG 0
 
-atomic_t<bool> g_user_asked_for_recording = false;
-atomic_t<bool> g_user_asked_for_screenshot = false;
 atomic_t<bool> g_user_asked_for_frame_capture = false;
-atomic_t<bool> g_disable_frame_limit = false;
 rsx::frame_trace_data frame_debug;
 rsx::frame_capture_data frame_capture;
 
 extern CellGcmOffsetTable offsetTable;
 extern thread_local std::string(*g_tls_log_prefix)();
-extern atomic_t<u32> g_lv2_preempts_taken;
-
-LOG_CHANNEL(perf_log, "PERF");
 
 template <>
 bool serialize<rsx::rsx_state>(utils::serial& ar, rsx::rsx_state& o)
 {
-	ar(o.transform_program);
-
-	// Work around for old RSX captures.
-	// RSX capture and savestates both call this method.
-	// We do not want to grab transform constants if it is not savestate capture.
-	const bool is_savestate_capture = thread_ctrl::get_current() && thread_ctrl::get_name() == "Emu State Capture Thread";
-	if (GET_SERIALIZATION_VERSION(global_version) || is_savestate_capture)
-	{
-		ar(o.transform_constants);
-	}
-
-	return ar(o.registers);
+	return ar(o.transform_program, /*o.transform_constants,*/ o.registers);
 }
 
 template <>
@@ -72,7 +50,7 @@ bool serialize<rsx::frame_capture_data>(utils::serial& ar, rsx::frame_capture_da
 {
 	ar(o.magic, o.version, o.LE_format);
 
-	if (o.magic != rsx::c_fc_magic || o.version != rsx::c_fc_version || o.LE_format != u32{std::endian::little == std::endian::native})
+	if (o.magic != rsx::c_fc_magic || o.version != rsx::c_fc_version || o.LE_format != (std::endian::little == std::endian::native))
 	{
 		return false;
 	}
@@ -92,43 +70,11 @@ bool serialize<rsx::frame_capture_data::replay_command>(utils::serial& ar, rsx::
 	return ar(o.rsx_command, o.memory_state, o.tile_state, o.display_buffer_state);
 }
 
-template <>
-bool serialize<rsx::rsx_iomap_table>(utils::serial& ar, rsx::rsx_iomap_table& o)
-{
-	// We do not need more than that
-	ar(std::span(o.ea.data(), 512));
-
-	if (!ar.is_writing())
-	{
-		// Populate o.io
-		for (const atomic_t<u32>& ea_addr : o.ea)
-		{
-			const u32& addr = ea_addr.raw();
-
-			if (addr != umax)
-			{
-				o.io[addr >> 20].raw() = static_cast<u32>(&ea_addr - o.ea.data()) << 20;
-			}
-		}
-	}
-
-	return true;
-}
-
 namespace rsx
 {
 	std::function<bool(u32 addr, bool is_writing)> g_access_violation_handler;
 
-	// TODO: Proper context manager
-	static rsx::context s_ctx{ .rsxthr = nullptr, .register_state = &method_registers };
-
-	rsx_iomap_table::rsx_iomap_table() noexcept
-		: ea(fill_array(-1))
-		, io(fill_array(-1))
-	{
-	}
-
-	u32 get_address(u32 offset, u32 location, u32 size_to_check, std::source_location src_loc)
+	u32 get_address(u32 offset, u32 location, u32 size_to_check, u32 line, u32 col, const char* file, const char* func)
 	{
 		const auto render = get_current_renderer();
 		std::string_view msg;
@@ -245,40 +191,15 @@ namespace rsx
 		{
 			// Allow failure if specified size
 			// This is to allow accurate recovery for failures
-			rsx_log.warning("rsx::get_address(offset=0x%x, location=0x%x, size=0x%x): %s%s", offset, location, size_to_check, msg, src_loc);
+			rsx_log.warning("rsx::get_address(offset=0x%x, location=0x%x, size=0x%x): %s%s", offset, location, size_to_check, msg, src_loc{line, col, file, func});
 			return 0;
 		}
 
-		fmt::throw_exception("rsx::get_address(offset=0x%x, location=0x%x): %s%s", offset, location, msg, src_loc);
+		fmt::throw_exception("rsx::get_address(offset=0x%x, location=0x%x): %s%s", offset, location, msg, src_loc{line, col, file, func});
 	}
 
-	extern void set_rsx_yield_flag() noexcept
+	std::pair<u32, u32> interleaved_range_info::calculate_required_range(u32 first, u32 count) const
 	{
-		if (auto rsx = get_current_renderer())
-		{
-			if (g_cfg.core.allow_rsx_cpu_preempt)
-			{
-				rsx->state += cpu_flag::yield;
-			}
-		}
-	}
-
-	extern void set_native_ui_flip()
-	{
-		if (auto rsxthr = rsx::get_current_renderer())
-		{
-			rsxthr->async_flip_requested |= rsx::thread::flip_request::native_ui;
-		}
-	}
-
-	std::pair<u32, u32> interleaved_range_info::calculate_required_range(u32 first, u32 count)
-	{
-		if (vertex_range.second)
-		{
-			// Cached result
-			return vertex_range;
-		}
-
 		if (single_vertex)
 		{
 			return { 0, 1 };
@@ -288,15 +209,10 @@ namespace rsx
 		u32 _max_index = 0;
 		u32 _min_index = first;
 
-		u32 frequencies[rsx::limits::vertex_count];
-		u32 freq_count = rsx::method_registers.current_draw_clause.command == rsx::draw_command::indexed ? 0 : u32{umax};
-		u32 max_result_by_division = 0; // Guaranteed maximum
-
 		for (const auto &attrib : locations)
 		{
 			if (attrib.frequency <= 1) [[likely]]
 			{
-				freq_count = umax;
 				_max_index = max_index;
 			}
 			else
@@ -307,24 +223,12 @@ namespace rsx
 					{
 						// Actually uses the modulo operator
 						_min_index = 0;
-						_max_index = std::max<u32>(_max_index, attrib.frequency - 1);
-
-						if (max_result_by_division < _max_index)
-						{
-							if (freq_count != umax)
-							{
-								if (std::find(frequencies, frequencies + freq_count, attrib.frequency) == frequencies + freq_count)
-								{
-									frequencies[freq_count++] = attrib.frequency;
-								}
-							}
-						}
+						_max_index = attrib.frequency - 1;
 					}
 					else
 					{
 						// Same as having no modulo
 						_max_index = max_index;
-						freq_count = umax;
 					}
 				}
 				else
@@ -332,109 +236,12 @@ namespace rsx
 					// Division operator
 					_min_index = std::min(_min_index, first / attrib.frequency);
 					_max_index = std::max<u32>(_max_index, utils::aligned_div(max_index, attrib.frequency));
-
-					if (freq_count > 0 && freq_count != umax)
-					{
-						const u32 max = utils::aligned_div(max_index, attrib.frequency);
-						max_result_by_division = std::max<u32>(max_result_by_division, max);
-
-						// Discard lower frequencies because it has been proven that there are indices higher than them
-						const usz discard_cnt = frequencies + freq_count - std::remove_if(frequencies, frequencies + freq_count, [&max_result_by_division](u32 freq)
-						{
-							return freq <= max_result_by_division;
-						});
-
-						freq_count -= static_cast<u32>(discard_cnt);
-					}
 				}
 			}
 		}
 
-		while (freq_count > 0 && freq_count != umax)
-		{
-			const rsx::index_array_type index_type = rsx::method_registers.current_draw_clause.is_immediate_draw ?
-				rsx::index_array_type::u32 :
-				rsx::method_registers.index_type();
-
-			const u32 index_size = index_type == rsx::index_array_type::u32 ? 4 : 2;
-
-			const auto render = rsx::get_current_renderer();
-
-			// If we can access a bit a more memory than required - do it
-			// The alternative would be re-iterating again over all of them
-			if (get_location(real_offset_address) == CELL_GCM_LOCATION_LOCAL)
-			{
-				if (utils::add_saturate<u32>(real_offset_address - rsx::constants::local_mem_base, (_max_index + 1) * attribute_stride) <= render->local_mem_size)
-				{
-					break;
-				}
-			}
-			else if (real_offset_address % 0x100000 + (_max_index + 1) * attribute_stride <= 0x100000)//(vm::check_addr(real_offset_address, vm::page_readable, (_max_index + 1) * attribute_stride))
-			{
-				break;
-			}
-
-			_max_index = 0;
-
-			auto re_evaluate = [&] <typename T> (const std::byte* ptr, T)
-			{
-				const u64 restart = rsx::method_registers.restart_index_enabled() ? rsx::method_registers.restart_index() : u64{umax};
-
-				for (u32 _index = first; _index < first + count; _index++)
-				{
-					const auto value = read_from_ptr<be_t<T>>(ptr, _index * sizeof(T));
-
-					if (value == restart)
-					{
-						continue;
-					}
-
-					for (u32 freq_it = 0; freq_it < freq_count; freq_it++)
-					{
-						const auto res = value % frequencies[freq_it];
-
-						if (res > _max_index)
-						{
-							_max_index = res;
-						}
-					}
-				}
-			};
-
-			const auto element_push_buffer = render->draw_processor()->element_push_buffer();
-			if (index_size == 4)
-			{
-				if (!element_push_buffer.empty()) [[unlikely]]
-				{
-					// Indices provided via immediate mode
-					re_evaluate(reinterpret_cast<const std::byte*>(element_push_buffer.data()), u32{});
-				}
-				else
-				{
-					const u32 address = (0 - index_size) & get_address(rsx::method_registers.index_array_address(), rsx::method_registers.index_array_location());
-					re_evaluate(vm::get_super_ptr<std::byte>(address), u32{});
-				}
-			}
-			else
-			{
-				if (!element_push_buffer.empty()) [[unlikely]]
-				{
-					// Indices provided via immediate mode
-					re_evaluate(reinterpret_cast<const std::byte*>(element_push_buffer.data()), u16{});
-				}
-				else
-				{
-					const u32 address = (0 - index_size) & get_address(rsx::method_registers.index_array_address(), rsx::method_registers.index_array_location());
-					re_evaluate(vm::get_super_ptr<std::byte>(address), u16{});
-				}
-			}
-
-			break;
-		}
-
 		ensure(_max_index >= _min_index);
-		vertex_range = { _min_index, (_max_index - _min_index) + 1 };
-		return vertex_range;
+		return { _min_index, (_max_index - _min_index) + 1 };
 	}
 
 	u32 get_vertex_type_size_on_host(vertex_base_type type, u32 size)
@@ -487,7 +294,7 @@ namespace rsx
 		default:
 			break;
 		}
-		fmt::throw_exception("Bad vertex data type (%d)!", static_cast<u8>(type));
+		fmt::throw_exception("RSXVertexData::GetTypeSize: Bad vertex data type (%d)!", static_cast<u8>(type));
 	}
 
 	void tiled_region::write(const void *src, u32 width, u32 height, u32 pitch)
@@ -498,8 +305,8 @@ namespace rsx
 			return;
 		}
 
-		const u32 offset_x = base % tile->pitch;
-		const u32 offset_y = base / tile->pitch;
+		u32 offset_x = base % tile->pitch;
+		u32 offset_y = base / tile->pitch;
 
 		switch (tile->comp)
 		{
@@ -514,15 +321,12 @@ namespace rsx
 		case CELL_GCM_COMPMODE_C32_2X1:
 			for (u32 y = 0; y < height; ++y)
 			{
-				const u32* src_line = reinterpret_cast<const u32*>(static_cast<const u8*>(src) + pitch * y);
-				u32* dst_line = reinterpret_cast<u32*>(ptr + (offset_y + y) * tile->pitch + offset_x);
-
 				for (u32 x = 0; x < width; ++x)
 				{
-					u32 value = src_line[x];
+					u32 value = *(u32*)((u8*)src + pitch * y + x * sizeof(u32));
 
-					dst_line[x * 2 + 0] = value;
-					dst_line[x * 2 + 1] = value;
+					*(u32*)(ptr + (offset_y + y) * tile->pitch + offset_x + (x * 2 + 0) * sizeof(u32)) = value;
+					*(u32*)(ptr + (offset_y + y) * tile->pitch + offset_x + (x * 2 + 1) * sizeof(u32)) = value;
 				}
 			}
 			break;
@@ -530,23 +334,19 @@ namespace rsx
 		case CELL_GCM_COMPMODE_C32_2X2:
 			for (u32 y = 0; y < height; ++y)
 			{
-				const u32* src_line = reinterpret_cast<const u32*>(static_cast<const u8*>(src) + pitch * y);
-				u32* line_0 = reinterpret_cast<u32*>(ptr + (offset_y + y * 2 + 0) * tile->pitch + offset_x);
-				u32* line_1 = reinterpret_cast<u32*>(ptr + (offset_y + y * 2 + 1) * tile->pitch + offset_x);
-
 				for (u32 x = 0; x < width; ++x)
 				{
-					u32 value = src_line[x];
+					u32 value = *reinterpret_cast<const u32*>(static_cast<const u8*>(src) + pitch * y + x * sizeof(u32));
 
-					line_0[x * 2 + 0] = value;
-					line_0[x * 2 + 1] = value;
-					line_1[x * 2 + 0] = value;
-					line_1[x * 2 + 1] = value;
+					*reinterpret_cast<u32*>(ptr + (offset_y + y * 2 + 0) * tile->pitch + offset_x + (x * 2 + 0) * sizeof(u32)) = value;
+					*reinterpret_cast<u32*>(ptr + (offset_y + y * 2 + 0) * tile->pitch + offset_x + (x * 2 + 1) * sizeof(u32)) = value;
+					*reinterpret_cast<u32*>(ptr + (offset_y + y * 2 + 1) * tile->pitch + offset_x + (x * 2 + 0) * sizeof(u32)) = value;
+					*reinterpret_cast<u32*>(ptr + (offset_y + y * 2 + 1) * tile->pitch + offset_x + (x * 2 + 1) * sizeof(u32)) = value;
 				}
 			}
 			break;
 		default:
-			fmt::throw_exception("Bad tile compression type (%d)!", tile->comp);
+			::narrow(tile->comp);
 		}
 	}
 
@@ -574,12 +374,11 @@ namespace rsx
 		case CELL_GCM_COMPMODE_C32_2X1:
 			for (u32 y = 0; y < height; ++y)
 			{
-				const u32* src_line = reinterpret_cast<const u32*>(ptr + (offset_y + y) * tile->pitch + offset_x);
-				u32* dst_line = reinterpret_cast<u32*>(static_cast<u8*>(dst) + pitch * y);
-
 				for (u32 x = 0; x < width; ++x)
 				{
-					dst_line[x] = src_line[x * 2 + 0];
+					u32 value = *(u32*)(ptr + (offset_y + y) * tile->pitch + offset_x + (x * 2 + 0) * sizeof(u32));
+
+					*(u32*)((u8*)dst + pitch * y + x * sizeof(u32)) = value;
 				}
 			}
 			break;
@@ -587,17 +386,16 @@ namespace rsx
 		case CELL_GCM_COMPMODE_C32_2X2:
 			for (u32 y = 0; y < height; ++y)
 			{
-				const u32* src_line = reinterpret_cast<const u32*>(ptr + (offset_y + y * 2 + 0) * tile->pitch + offset_x);
-				u32* dst_line = reinterpret_cast<u32*>(static_cast<u8*>(dst) + pitch * y);
-
 				for (u32 x = 0; x < width; ++x)
 				{
-					dst_line[x] = src_line[x * 2 + 0];
+					u32 value = *reinterpret_cast<u32*>(ptr + (offset_y + y * 2 + 0) * tile->pitch + offset_x + (x * 2 + 0) * sizeof(u32));
+
+					*reinterpret_cast<u32*>(static_cast<u8*>(dst) + pitch * y + x * sizeof(u32)) = value;
 				}
 			}
 			break;
 		default:
-			fmt::throw_exception("Bad tile compression type (%d)!", tile->comp);
+			::narrow(tile->comp);
 		}
 	}
 
@@ -606,71 +404,7 @@ namespace rsx
 		g_access_violation_handler = nullptr;
 	}
 
-	void thread::save(utils::serial& ar)
-	{
-		[[maybe_unused]] const s32 version = GET_OR_USE_SERIALIZATION_VERSION(ar.is_writing(), rsx);
-
-		ar(rsx::method_registers);
-
-		for (auto& v : m_draw_processor.m_vertex_push_buffers)
-		{
-			ar(v.attr, v.size, v.type, v.vertex_count, v.dword_count, v.data);
-		}
-
-		ar(m_draw_processor.m_element_push_buffer, fifo_ret_addr, saved_fifo_ret, zcull_surface_active, m_surface_info, m_depth_surface_info, m_framebuffer_layout);
-		ar(dma_address, iomap_table, restore_point, tiles, zculls, display_buffers, display_buffers_count, current_display_buffer);
-		ar(enable_second_vhandler, requested_vsync);
-		ar(device_addr, label_addr, main_mem_size, local_mem_size, rsx_event_port, driver_info);
-		ar(in_begin_end);
-		ar(display_buffers, display_buffers_count, current_display_buffer);
-		ar(unsent_gcm_events, rsx::method_registers.current_draw_clause);
-
-		if (ar.is_writing() || version >= 2)
-		{
-			ar(vblank_count);
-
-			b8 flip_pending{};
-
-			if (ar.is_writing())
-			{
-				flip_pending = !!(async_flip_requested & flip_request::emu_requested);
-			}
-
-			ar(flip_pending);
-
-			if (flip_pending)
-			{
-				ar(vblank_at_flip);
-				ar(async_flip_buffer);
-
-				if (!ar.is_writing())
-				{
-					async_flip_requested |= flip_request::emu_requested;
-					flip_notification_count = 1;
-				}
-			}
-		}
-
-		if (ar.is_writing())
-		{
-			if (fifo_ctrl && state & cpu_flag::again)
-			{
-				ar(fifo_ctrl->get_remaining_args_count() + 1);
-				ar(fifo_ctrl->last_cmd());
-			}
-			else
-			{
-				ar(u32{0});
-			}
-		}
-		else if (u32 count = ar)
-		{
-			restore_fifo_count = count;
-			ar(restore_fifo_cmd);
-		}
-	}
-
-	thread::thread(utils::serial* _ar)
+	thread::thread()
 		: cpu_thread(0x5555'5555)
 	{
 		g_access_violation_handler = [this](u32 address, bool is_writing)
@@ -678,69 +412,23 @@ namespace rsx
 			return on_access_violation(address, is_writing);
 		};
 
+		m_rtts_dirty = true;
 		m_textures_dirty.fill(true);
 		m_vertex_textures_dirty.fill(true);
 
-		m_graphics_state |= pipeline_state::all_dirty;
+		m_graphics_state = pipeline_state::all_dirty;
 
 		g_user_asked_for_frame_capture = false;
 
-		// TODO: Proper context management in the driver
-		s_ctx.rsxthr = this;
-		m_ctx = &s_ctx;
-
-		m_draw_processor.init(m_ctx);
-
 		if (g_cfg.misc.use_native_interface && (g_cfg.video.renderer == video_renderer::opengl || g_cfg.video.renderer == video_renderer::vulkan))
 		{
 			m_overlay_manager = g_fxo->init<rsx::overlays::display_manager>(0);
 		}
 
-		if (!_ar)
-		{
-			add_remove_flags({}, cpu_flag::stop); // TODO: Remove workaround
-			return;
-		}
-
-		add_remove_flags(cpu_flag::suspend, cpu_flag::stop);
-
-		serialized = true;
-		save(*_ar);
-
-		if (dma_address)
-		{
-			ctrl = vm::_ptr<RsxDmaControl>(dma_address);
-			rsx_thread_running = true;
-		}
-
-		if (g_cfg.savestate.start_paused)
-		{
-			// Allow to render a whole frame within this emulation session so there won't be missing graphics
-			m_pause_after_x_flips = 2;
-		}
+		state -= cpu_flag::stop + cpu_flag::wait; // TODO: Remove workaround
 	}
 
-	avconf::avconf(utils::serial& ar)
-	{
-		save(ar);
-	}
-
-	void avconf::save(utils::serial& ar)
-	{
-		[[maybe_unused]] const s32 version = GET_OR_USE_SERIALIZATION_VERSION(ar.is_writing(), rsx);
-
-		if (!ar.is_writing() && version < 3)
-		{
-			// Be compatible with previous bitwise serialization
-			ar(std::span<u8>(reinterpret_cast<u8*>(this), ::offset32(&avconf::scan_mode)));
-			ar.pos += utils::align<usz>(::offset32(&avconf::scan_mode), alignof(avconf)) - ::offset32(&avconf::scan_mode);
-			return;
-		}
-
-		ar(stereo_mode, format, aspect, resolution_id, scanline_pitch, gamma, resolution_x, resolution_y, state, scan_mode);
-	}
-
-	void thread::capture_frame(const std::string& name)
+	void thread::capture_frame(const std::string &name)
 	{
 		frame_trace_data::draw_state draw_state{};
 
@@ -781,38 +469,61 @@ namespace rsx
 			}
 		}
 
-		if (!backend_config.supports_normalized_barycentrics)
+		in_begin_end = true;
+	}
+
+	void thread::append_to_push_buffer(u32 attribute, u32 size, u32 subreg_index, vertex_base_type type, u32 value)
+	{
+		vertex_push_buffers[attribute].size = size;
+		vertex_push_buffers[attribute].append_vertex_data(subreg_index, type, value);
+	}
+
+	u32 thread::get_push_buffer_vertex_count() const
+	{
+		//There's no restriction on which attrib shall hold vertex data, so we check them all
+		u32 max_vertex_count = 0;
+		for (auto &buf: vertex_push_buffers)
 		{
-			// Check for mode change between rasterized polys vs lines and points
-			// Luckily this almost never happens in real games
-			const auto current_mode = rsx::method_registers.current_draw_clause.classify_mode();
-			if (current_mode != m_current_draw_mode)
-			{
-				m_graphics_state |= (rsx::vertex_program_state_dirty | rsx::fragment_program_state_dirty);
-				m_current_draw_mode = current_mode;
-			}
+			max_vertex_count = std::max(max_vertex_count, buf.vertex_count);
 		}
 
-		in_begin_end = true;
+		return max_vertex_count;
+	}
+
+	void thread::append_array_element(u32 index)
+	{
+		//Endianness is swapped because common upload code expects input in BE
+		//TODO: Implement fast upload path for LE inputs and do away with this
+		element_push_buffer.push_back(std::bit_cast<u32, be_t<u32>>(index));
+	}
+
+	u32 thread::get_push_buffer_index_count() const
+	{
+		return ::size32(element_push_buffer);
 	}
 
 	void thread::end()
 	{
 		if (capture_current_frame)
-		{
 			capture::capture_draw_memory(this);
-		}
 
 		in_begin_end = false;
 		m_frame_stats.draw_calls++;
 
-		method_registers.current_draw_clause.post_execute_cleanup(m_ctx);
+		method_registers.current_draw_clause.post_execute_cleanup();
 
 		m_graphics_state |= rsx::pipeline_state::framebuffer_reads_dirty;
-		m_eng_interrupt_mask |= rsx::backend_interrupt;
-		ROP_sync_timestamp = rsx::get_shared_tag();
+		ROP_sync_timestamp = get_system_time();
 
-		m_draw_processor.clear_push_buffers();
+		for (auto & push_buf : vertex_push_buffers)
+		{
+			//Disabled, see https://github.com/RPCS3/rpcs3/issues/1932
+			//rsx::method_registers.register_vertex_info[index].size = 0;
+
+			push_buf.clear();
+		}
+
+		element_push_buffer.clear();
 
 		zcull_ctrl->on_draw();
 
@@ -828,7 +539,7 @@ namespace rsx
 		method_registers.current_draw_clause.begin();
 		do
 		{
-			method_registers.current_draw_clause.execute_pipeline_dependencies(m_ctx);
+			method_registers.current_draw_clause.execute_pipeline_dependencies();
 		}
 		while (method_registers.current_draw_clause.next());
 	}
@@ -840,121 +551,58 @@ namespace rsx
 			thread_ctrl::wait_for(1000);
 		}
 
-		do
-		{
-			on_task();
-
-			state -= cpu_flag::ret;
-		}
-		while (!is_stopped());
-
+		on_task();
 		on_exit();
 	}
 
-	void thread::cpu_wait(bs_t<cpu_flag> old)
+	void thread::cpu_wait(bs_t<cpu_flag>)
 	{
 		if (external_interrupt_lock)
 		{
 			wait_pause();
 		}
 
-		if ((state & (cpu_flag::dbg_global_pause + cpu_flag::exit)) == cpu_flag::dbg_global_pause)
-		{
-			// Wait 16ms during emulation pause. This reduces cpu load while still giving us the chance to render overlays.
-			do_local_task(rsx::FIFO::state::paused);
-			thread_ctrl::wait_on(state, old, 16000);
-		}
-		else
-		{
-			on_semaphore_acquire_wait();
-			std::this_thread::yield();
-		}
-	}
-
-	void thread::post_vblank_event(u64 post_event_time)
-	{
-		vblank_count++;
-
-		if (isHLE)
-		{
-			if (auto ptr = vblank_handler)
-			{
-				intr_thread->cmd_list
-				({
-					{ ppu_cmd::set_args, 1 }, u64{1},
-					{ ppu_cmd::lle_call, ptr },
-					{ ppu_cmd::sleep, 0 }
-				});
-
-				intr_thread->cmd_notify.store(1);
-				intr_thread->cmd_notify.notify_one();
-			}
-		}
-		else
-		{
-			sys_rsx_context_attribute(0x55555555, 0xFED, 1, get_guest_system_time(post_event_time), 0, 0);
-		}
-	}
-
-	namespace nv4097
-	{
-		void set_render_mode(context* rsx, u32, u32 arg);
+		on_semaphore_acquire_wait();
+		std::this_thread::yield();
 	}
 
 	void thread::on_task()
 	{
+		m_rsx_thread = std::this_thread::get_id();
+
 		g_tls_log_prefix = []
 		{
 			const auto rsx = get_current_renderer();
 			return fmt::format("RSX [0x%07x]", rsx->ctrl ? +rsx->ctrl->get : 0);
 		};
 
-		if (!serialized) method_registers.init();
+		method_registers.init();
 
 		rsx::overlays::reset_performance_overlay();
-		rsx::overlays::reset_debug_overlay();
 
-		if (!is_initialized)
-		{
-			g_fxo->get<rsx::dma_manager>().init();
-			on_init_thread();
+		g_fxo->get<rsx::dma_manager>().init();
+		on_init_thread();
 
-			if (in_begin_end)
-			{
-				// on_init_thread should have prepared the backend resources
-				// Run draw call warmup again if the savestate happened mid-draw
-				ensure(serialized);
-				begin();
-			}
-		}
-
-		is_initialized = true;
-		is_initialized.notify_all();
+		is_inited = true;
+		is_inited.notify_all();
 
 		if (!zcull_ctrl)
 		{
-			// Backend did not provide an implementation, provide NULL object
+			//Backend did not provide an implementation, provide NULL object
 			zcull_ctrl = std::make_unique<::rsx::reports::ZCULL_control>();
 		}
 
-		check_zcull_status(false);
-		nv4097::set_render_mode(m_ctx, 0, method_registers.registers[NV4097_SET_RENDER_ENABLE]);
-
-		performance_counters.state = FIFO::state::empty;
-
-		const u64 event_flags = unsent_gcm_events.exchange(0);
-
-		if (Emu.IsStarting())
-		{
-			Emu.CallFromMainThread([]
-			{
-				Emu.RunPPU();
-			});
-		}
+		performance_counters.state = FIFO_state::empty;
 
 		// Wait for startup (TODO)
-		while (!rsx_thread_running || Emu.IsPausedOrReady())
+		while (m_rsx_thread_exiting)
 		{
+			// Wait for external pause events
+			if (external_interrupt_lock)
+			{
+				wait_pause();
+			}
+
 			// Execute backend-local tasks first
 			do_local_task(performance_counters.state);
 
@@ -969,77 +617,56 @@ namespace rsx
 			thread_ctrl::wait_for(1000);
 		}
 
-		performance_counters.state = FIFO::state::running;
+		performance_counters.state = FIFO_state::running;
 
 		fifo_ctrl = std::make_unique<::rsx::FIFO::FIFO_control>(this);
-		fifo_ctrl->set_get(ctrl->get);
 
-		last_guest_flip_timestamp = get_system_time() - 1000000;
+		last_flip_time = get_system_time() - 1000000;
 
 		vblank_count = 0;
 
-		if (restore_fifo_count)
-		{
-			fifo_ctrl->restore_state(restore_fifo_cmd, restore_fifo_count);
-		}
-
-		if (!send_event(0, event_flags, 0))
-		{
-			return;
-		}
-
-		g_fxo->get<vblank_thread>().set_thread(std::shared_ptr<named_thread<std::function<void()>>>(new named_thread<std::function<void()>>("VBlank Thread"sv, [this]() -> void
+		g_fxo->init<named_thread>("VBlank Thread", [this]()
 		{
+			// See sys_timer_usleep for details
 #ifdef __linux__
-			constexpr u32 host_min_quantum = 10;
+			constexpr u32 host_min_quantum = 50;
 #else
 			constexpr u32 host_min_quantum = 500;
 #endif
 			u64 start_time = get_system_time();
 
-			u64 vblank_rate = g_cfg.video.vblank_rate;
-			u64 vblank_period = 1'000'000 + u64{g_cfg.video.vblank_ntsc.get()} * 1000;
-
-			u64 local_vblank_count = 0;
-
 			// TODO: exit condition
-			while (!is_stopped() && !unsent_gcm_events && thread_ctrl::state() != thread_state::aborting)
+			while (!is_stopped())
 			{
-				// Get current time
 				const u64 current = get_system_time();
-
-				// Calculate the time at which we need to send a new VBLANK signal
-				const u64 post_event_time = start_time + (local_vblank_count + 1) * vblank_period / vblank_rate;
-
-				// Calculate time remaining to that time (0 if we passed it)
-				const u64 wait_for = current >= post_event_time ? 0 : post_event_time - current;
-
-#ifdef __linux__
-				const u64 wait_sleep = wait_for;
-#else
-				// Substract host operating system min sleep quantom to get sleep time
+				const u64 period_time = 1000000 / g_cfg.video.vblank_rate;
+				const u64 wait_for = period_time - std::min<u64>(current - start_time, period_time);
 				const u64 wait_sleep = wait_for - u64{wait_for >= host_min_quantum} * host_min_quantum;
-#endif
 
 				if (!wait_for)
 				{
 					{
-						local_vblank_count++;
+						start_time += period_time;
+						vblank_count++;
 
-						if (local_vblank_count == vblank_rate)
+						if (isHLE)
 						{
-							// Advance start_time to the moment of the current VBLANK
-							// Which is the last VBLANK event in this period
-							// This is in order for multiplication by ratio above to use only small numbers
-							start_time += vblank_period;
-							local_vblank_count = 0;
+							if (vblank_handler)
+							{
+								intr_thread->cmd_list
+								({
+									{ ppu_cmd::set_args, 1 }, u64{1},
+									{ ppu_cmd::lle_call, vblank_handler },
+									{ ppu_cmd::sleep, 0 }
+								});
 
-							// We have a rare chance to update settings without losing precision whenever local_vblank_count is 0
-							vblank_rate = g_cfg.video.vblank_rate;
-							vblank_period = 1'000'000 + u64{g_cfg.video.vblank_ntsc.get()} * 1000;
+								intr_thread->cmd_notify.notify_one();
+							}
+						}
+						else
+						{
+							sys_rsx_context_attribute(0x55555555, 0xFED, 1, 0, 0, 0);
 						}
-
-						post_vblank_event(post_event_time);
 					}
 				}
 				else if (wait_sleep)
@@ -1058,23 +685,14 @@ namespace rsx
 
 					while (Emu.IsPaused() && !is_stopped())
 					{
-						thread_ctrl::wait_for(5'000);
+						thread_ctrl::wait_for(wait_sleep);
 					}
 
 					// Restore difference
 					start_time = get_system_time() - start_time;
 				}
 			}
-		})));
-
-		struct join_vblank
-		{
-			~join_vblank() noexcept
-			{
-				g_fxo->get<vblank_thread>() = thread_state::finished;
-			}
-
-		} join_vblank_obj{};
+		});
 
 		// Raise priority above other threads
 		thread_ctrl::scoped_priority high_prio(+1);
@@ -1090,11 +708,6 @@ namespace rsx
 			if (external_interrupt_lock)
 			{
 				wait_pause();
-
-				if (!rsx_thread_running)
-				{
-					return;
-				}
 			}
 
 			// Note a possible rollback address
@@ -1105,22 +718,11 @@ namespace rsx
 				sync_point_request.release(false);
 			}
 
-			// Update sub-units every 64 cycles. The local handler is invoked for other functions externally on-demand anyway.
-			// This avoids expensive calls to check timestamps which involves reading some values from TLS storage on windows.
-			// If something is going on in the backend that requires an update, set the interrupt bit explicitly.
-			if ((m_cycles_counter++ & 63) == 0 || m_eng_interrupt_mask)
-			{
-				// Execute backend-local tasks first
-				do_local_task(performance_counters.state);
+			// Execute backend-local tasks first
+			do_local_task(performance_counters.state);
 
-				// Update other sub-units
-				zcull_ctrl->update(this);
-
-				if (m_host_dma_ctrl)
-				{
-					m_host_dma_ctrl->update();
-				}
-			}
+			// Update sub-units
+			zcull_ctrl->update(this);
 
 			// Execute FIFO queue
 			run_FIFO();
@@ -1129,23 +731,172 @@ namespace rsx
 
 	void thread::on_exit()
 	{
-		if (zcull_ctrl)
-		{
-			zcull_ctrl->sync(this);
-		}
-
 		// Deregister violation handler
 		g_access_violation_handler = nullptr;
 
 		// Clear any pending flush requests to release threads
 		std::this_thread::sleep_for(10ms);
-		do_local_task(rsx::FIFO::state::lock_wait);
+		do_local_task(rsx::FIFO_state::lock_wait);
 
+		m_rsx_thread_exiting = true;
 		g_fxo->get<rsx::dma_manager>().join();
-		g_fxo->get<vblank_thread>() = thread_state::finished;
 		state += cpu_flag::exit;
 	}
 
+	void thread::fill_scale_offset_data(void *buffer, bool flip_y) const
+	{
+		int clip_w = rsx::method_registers.surface_clip_width();
+		int clip_h = rsx::method_registers.surface_clip_height();
+
+		float scale_x = rsx::method_registers.viewport_scale_x() / (clip_w / 2.f);
+		float offset_x = rsx::method_registers.viewport_offset_x() - (clip_w / 2.f);
+		offset_x /= clip_w / 2.f;
+
+		float scale_y = rsx::method_registers.viewport_scale_y() / (clip_h / 2.f);
+		float offset_y = (rsx::method_registers.viewport_offset_y() - (clip_h / 2.f));
+		offset_y /= clip_h / 2.f;
+		if (flip_y) scale_y *= -1;
+		if (flip_y) offset_y *= -1;
+
+		float scale_z = rsx::method_registers.viewport_scale_z();
+		float offset_z = rsx::method_registers.viewport_offset_z();
+		float one = 1.f;
+
+		stream_vector(buffer, std::bit_cast<u32>(scale_x), 0, 0, std::bit_cast<u32>(offset_x));
+		stream_vector(static_cast<char*>(buffer) + 16, 0, std::bit_cast<u32>(scale_y), 0, std::bit_cast<u32>(offset_y));
+		stream_vector(static_cast<char*>(buffer) + 32, 0, 0, std::bit_cast<u32>(scale_z), std::bit_cast<u32>(offset_z));
+		stream_vector(static_cast<char*>(buffer) + 48, 0, 0, 0, std::bit_cast<u32>(one));
+	}
+
+	void thread::fill_user_clip_data(void *buffer) const
+	{
+		const rsx::user_clip_plane_op clip_plane_control[6] =
+		{
+			rsx::method_registers.clip_plane_0_enabled(),
+			rsx::method_registers.clip_plane_1_enabled(),
+			rsx::method_registers.clip_plane_2_enabled(),
+			rsx::method_registers.clip_plane_3_enabled(),
+			rsx::method_registers.clip_plane_4_enabled(),
+			rsx::method_registers.clip_plane_5_enabled(),
+		};
+
+		u8 data_block[64];
+		s32* clip_enabled_flags = reinterpret_cast<s32*>(data_block);
+		f32* clip_distance_factors = reinterpret_cast<f32*>(data_block + 32);
+
+		for (int index = 0; index < 6; ++index)
+		{
+			switch (clip_plane_control[index])
+			{
+			default:
+				rsx_log.error("bad clip plane control (0x%x)", static_cast<u8>(clip_plane_control[index]));
+				[[fallthrough]];
+
+			case rsx::user_clip_plane_op::disable:
+				clip_enabled_flags[index] = 0;
+				clip_distance_factors[index] = 0.f;
+				break;
+
+			case rsx::user_clip_plane_op::greater_or_equal:
+				clip_enabled_flags[index] = 1;
+				clip_distance_factors[index] = 1.f;
+				break;
+
+			case rsx::user_clip_plane_op::less_than:
+				clip_enabled_flags[index] = 1;
+				clip_distance_factors[index] = -1.f;
+				break;
+			}
+		}
+
+		memcpy(buffer, data_block, 2 * 8 * sizeof(u32));
+	}
+
+	/**
+	* Fill buffer with vertex program constants.
+	* Buffer must be at least 512 float4 wide.
+	*/
+	void thread::fill_vertex_program_constants_data(void* buffer)
+	{
+		memcpy(buffer, rsx::method_registers.transform_constants.data(), 468 * 4 * sizeof(float));
+	}
+
+	void thread::fill_fragment_state_buffer(void* buffer, const RSXFragmentProgram& /*fragment_program*/)
+	{
+		u32 rop_control = 0u;
+
+		if (rsx::method_registers.alpha_test_enabled())
+		{
+			const u32 alpha_func = static_cast<u32>(rsx::method_registers.alpha_func());
+			rop_control |= (alpha_func << 16);
+			rop_control |= ROP_control::alpha_test_enable;
+		}
+
+		if (rsx::method_registers.polygon_stipple_enabled())
+		{
+			rop_control |= ROP_control::polygon_stipple_enable;
+		}
+
+		if (rsx::method_registers.msaa_alpha_to_coverage_enabled() && !backend_config.supports_hw_a2c)
+		{
+			// TODO: Properly support alpha-to-coverage and alpha-to-one behavior in shaders
+			// Alpha values generate a coverage mask for order independent blending
+			// Requires hardware AA to work properly (or just fragment sample stage in fragment shaders)
+			// Simulated using combined alpha blend and alpha test
+			if (rsx::method_registers.msaa_sample_mask()) rop_control |= ROP_control::msaa_mask_enable;
+			rop_control |= ROP_control::csaa_enable;
+
+			// Sample configuration bits
+			switch (rsx::method_registers.surface_antialias())
+			{
+				case rsx::surface_antialiasing::center_1_sample:
+					break;
+				case rsx::surface_antialiasing::diagonal_centered_2_samples:
+					rop_control |= 1u << 6;
+					break;
+				default:
+					rop_control |= 3u << 6;
+					break;
+			}
+		}
+
+		const f32 fog0 = rsx::method_registers.fog_params_0();
+		const f32 fog1 = rsx::method_registers.fog_params_1();
+		const u32 fog_mode = static_cast<u32>(rsx::method_registers.fog_equation());
+
+		if (rsx::method_registers.framebuffer_srgb_enabled())
+		{
+			// Check if framebuffer is actually an XRGB format and not a WZYX format
+			switch (rsx::method_registers.surface_color())
+			{
+			case rsx::surface_color_format::w16z16y16x16:
+			case rsx::surface_color_format::w32z32y32x32:
+			case rsx::surface_color_format::x32:
+				break;
+			default:
+				rop_control |= ROP_control::framebuffer_srgb_enable;
+				break;
+			}
+		}
+
+		// Generate wpos coefficients
+		// wpos equation is now as follows:
+		// wpos.y = (frag_coord / resolution_scale) * ((window_origin!=top)?-1.: 1.) + ((window_origin!=top)? window_height : 0)
+		// wpos.x = (frag_coord / resolution_scale)
+		// wpos.zw = frag_coord.zw
+
+		const auto window_origin = rsx::method_registers.shader_window_origin();
+		const u32 window_height = rsx::method_registers.shader_window_height();
+		const f32 resolution_scale = (window_height <= static_cast<u32>(g_cfg.video.min_scalable_dimension)) ? 1.f : rsx::get_resolution_scale();
+		const f32 wpos_scale = (window_origin == rsx::window_origin::top) ? (1.f / resolution_scale) : (-1.f / resolution_scale);
+		const f32 wpos_bias = (window_origin == rsx::window_origin::top) ? 0.f : window_height;
+		const f32 alpha_ref = rsx::method_registers.alpha_ref();
+
+		u32 *dst = static_cast<u32*>(buffer);
+		stream_vector(dst, std::bit_cast<u32>(fog0), std::bit_cast<u32>(fog1), rop_control, std::bit_cast<u32>(alpha_ref));
+		stream_vector(dst + 4, 0u, fog_mode, std::bit_cast<u32>(wpos_scale), std::bit_cast<u32>(wpos_bias));
+	}
+
 	u64 thread::timestamp()
 	{
 		const u64 freq = sys_time_get_timebase_frequency();
@@ -1184,10 +935,56 @@ namespace rsx
 		return t + timestamp_subvalue;
 	}
 
-	void thread::do_local_task(FIFO::state state)
+	std::span<const std::byte> thread::get_raw_index_array(const draw_clause& draw_indexed_clause) const
 	{
-		m_eng_interrupt_mask.clear(rsx::backend_interrupt);
+		if (!element_push_buffer.empty())
+		{
+			//Indices provided via immediate mode
+			return{reinterpret_cast<const std::byte*>(element_push_buffer.data()), ::narrow<u32>(element_push_buffer.size() * sizeof(u32))};
+		}
 
+		const rsx::index_array_type type = rsx::method_registers.index_type();
+		const u32 type_size = get_index_type_size(type);
+
+		// Force aligned indices as realhw
+		const u32 address = (0 - type_size) & get_address(rsx::method_registers.index_array_address(), rsx::method_registers.index_array_location());
+
+		//const bool is_primitive_restart_enabled = rsx::method_registers.restart_index_enabled();
+		//const u32 primitive_restart_index = rsx::method_registers.restart_index();
+
+		const u32 first = draw_indexed_clause.min_index();
+		const u32 count = draw_indexed_clause.get_elements_count();
+
+		const auto ptr = vm::_ptr<const std::byte>(address);
+		return{ ptr + first * type_size, count * type_size };
+	}
+
+	std::variant<draw_array_command, draw_indexed_array_command, draw_inlined_array>
+	thread::get_draw_command(const rsx::rsx_state& state) const
+	{
+		if (rsx::method_registers.current_draw_clause.command == rsx::draw_command::array)
+		{
+			return draw_array_command{};
+		}
+
+		if (rsx::method_registers.current_draw_clause.command == rsx::draw_command::indexed)
+		{
+			return draw_indexed_array_command
+			{
+				get_raw_index_array(state.current_draw_clause)
+			};
+		}
+
+		if (rsx::method_registers.current_draw_clause.command == rsx::draw_command::inlined_array)
+		{
+			return draw_inlined_array{};
+		}
+
+		fmt::throw_exception("ill-formed draw command");
+	}
+
+	void thread::do_local_task(FIFO_state state)
+	{
 		if (async_flip_requested & flip_request::emu_requested)
 		{
 			// NOTE: This has to be executed immediately
@@ -1195,9 +992,9 @@ namespace rsx
 			handle_emu_flip(async_flip_buffer);
 		}
 
-		if (state != FIFO::state::lock_wait)
+		if (!in_begin_end && state != FIFO_state::lock_wait)
 		{
-			if (!in_begin_end && atomic_storage<u32>::load(m_invalidated_memory_range.end) != 0)
+			if (atomic_storage<u32>::load(m_invalidated_memory_range.end) != 0)
 			{
 				std::lock_guard lock(m_mtx_task);
 
@@ -1206,35 +1003,6 @@ namespace rsx
 					handle_invalidated_memory_range();
 				}
 			}
-
-			if (m_eng_interrupt_mask & rsx::dma_control_interrupt && !is_stopped())
-			{
-				if (const u64 get_put = new_get_put.exchange(u64{umax});
-					get_put != umax)
-				{
-					vm::_ptr<atomic_be_t<u64>>(dma_address + ::offset32(&RsxDmaControl::put))->release(get_put);
-					fifo_ctrl->set_get(static_cast<u32>(get_put));
-					fifo_ctrl->abort();
-					fifo_ret_addr = RSX_CALL_STACK_EMPTY;
-					last_known_code_start = static_cast<u32>(get_put);
-					sync_point_request.release(true);
-				}
-
-				m_eng_interrupt_mask.clear(rsx::dma_control_interrupt);
-			}
-		}
-
-		if (m_eng_interrupt_mask & rsx::pipe_flush_interrupt)
-		{
-			sync();
-		}
-
-		if (is_stopped())
-		{
-			std::lock_guard lock(m_mtx_task);
-
-			m_invalidated_memory_range = utils::address_range32::start_end(0x2 << 28, constants::local_mem_base + local_mem_size - 1);
-			handle_invalidated_memory_range();
 		}
 	}
 
@@ -1278,7 +1046,8 @@ namespace rsx
 		layout.width = rsx::method_registers.surface_clip_width();
 		layout.height = rsx::method_registers.surface_clip_height();
 
-		m_graphics_state.clear(rsx::rtt_config_contested | rsx::rtt_config_valid);
+		framebuffer_status_valid = false;
+		m_framebuffer_state_contested = false;
 		m_current_framebuffer_context = context;
 
 		if (layout.width == 0 || layout.height == 0)
@@ -1399,10 +1168,7 @@ namespace rsx
 			}
 
 			color_buffer_unused = !color_write_enabled || layout.target == rsx::surface_target::none;
-			if (color_buffer_unused || depth_buffer_unused)
-			{
-				m_graphics_state.set(rsx::rtt_config_contested);
-			}
+			m_framebuffer_state_contested = color_buffer_unused || depth_buffer_unused;
 			break;
 		default:
 			fmt::throw_exception("Unknown framebuffer context 0x%x", static_cast<u32>(context));
@@ -1433,86 +1199,28 @@ namespace rsx
 
 			minimum_color_pitch = color_texel_size * write_limit_x;
 			minimum_zeta_pitch = depth_texel_size * write_limit_x;
-
-			// Check for size fit and attempt to correct incorrect inputs.
-			// BLUS30072 is misconfigured here and renders fine on PS3. The width fails to account for AA being active in that engine.
-			u16 corrected_width = umax;
-			std::vector<u32*> pitch_fixups;
-
-			if (!depth_buffer_unused)
-			{
-				if (layout.zeta_pitch < minimum_zeta_pitch)
-				{
-					// Observed in CoD3 where the depth buffer is clearly misconfigured.
-					if (layout.zeta_pitch > 64)
-					{
-						corrected_width = layout.zeta_pitch / depth_texel_size;
-						layout.zeta_pitch = depth_texel_size;
-						pitch_fixups.push_back(&layout.zeta_pitch);
-					}
-					else
-					{
-						rsx_log.warning("Misconfigured surface could not fit a depth buffer. Dropping.");
-						layout.zeta_address = 0;
-					}
-				}
-				else if (layout.width * depth_texel_size > layout.zeta_pitch)
-				{
-					// This is ok, misconfigured raster dimensions, but we're only writing the pitch as determined by the scissor
-					corrected_width = layout.zeta_pitch / depth_texel_size;
-				}
-			}
-
-			if (!color_buffer_unused)
-			{
-				for (const auto& index : rsx::utility::get_rtt_indexes(layout.target))
-				{
-					if (layout.color_pitch[index] < minimum_color_pitch)
-					{
-						if (layout.color_pitch[index] > 64)
-						{
-							corrected_width = std::min<u16>(corrected_width, layout.color_pitch[index] / color_texel_size);
-							layout.color_pitch[index] = color_texel_size;
-							pitch_fixups.push_back(&layout.color_pitch[index]);
-						}
-						else
-						{
-							rsx_log.warning("Misconfigured surface could not fit color buffer %d. Dropping.", index);
-							layout.color_addresses[index] = 0;
-						}
-
-						continue;
-					}
-
-					if (layout.width * color_texel_size > layout.color_pitch[index])
-					{
-						// This is ok, misconfigured raster dimensions, but we're only writing the pitch as determined by the scissor
-						corrected_width = std::min<u16>(corrected_width, layout.color_pitch[index] / color_texel_size);
-					}
-				}
-			}
-
-			if (corrected_width != umax)
-			{
-				layout.width = corrected_width;
-
-				for (auto& value : pitch_fixups)
-				{
-					*value = *value * layout.width;
-				}
-			}
 		}
 
 		if (depth_buffer_unused)
 		{
 			layout.zeta_address = 0;
 		}
+		else if (layout.zeta_pitch < minimum_zeta_pitch)
+		{
+			layout.zeta_address = 0;
+		}
 		else if (packed_render)
 		{
 			layout.actual_zeta_pitch = (layout.width * depth_texel_size);
 		}
 		else
 		{
+			const auto packed_zeta_pitch = (layout.width * depth_texel_size);
+			if (packed_zeta_pitch > layout.zeta_pitch)
+			{
+				layout.width = (layout.zeta_pitch / depth_texel_size);
+			}
+
 			layout.actual_zeta_pitch = layout.zeta_pitch;
 		}
 
@@ -1527,20 +1235,12 @@ namespace rsx
 			if (layout.color_pitch[index] < minimum_color_pitch)
 			{
 				// Unlike the depth buffer, when given a color target we know it is intended to be rendered to
-				rsx_log.warning("Framebuffer setup error: Color target failed pitch check, Pitch=[%d, %d, %d, %d] + %d, target=%d, context=%d",
+				rsx_log.error("Framebuffer setup error: Color target failed pitch check, Pitch=[%d, %d, %d, %d] + %d, target=%d, context=%d",
 					layout.color_pitch[0], layout.color_pitch[1], layout.color_pitch[2], layout.color_pitch[3],
 					layout.zeta_pitch, static_cast<u32>(layout.target), static_cast<u32>(context));
 
-				// Some games (COD4) are buggy and set incorrect width + AA + pitch combo. Force fit in such scenarios.
-				if (layout.color_pitch[index] > 64)
-				{
-					layout.width = layout.color_pitch[index] / color_texel_size;
-				}
-				else
-				{
-					layout.color_addresses[index] = 0;
-					continue;
-				}
+				// Do not remove this buffer for now as it implies something went horribly wrong anyway
+				break;
 			}
 
 			if (layout.color_addresses[index] == layout.zeta_address)
@@ -1548,7 +1248,7 @@ namespace rsx
 				rsx_log.warning("Framebuffer at 0x%X has aliasing color/depth targets, color_index=%d, zeta_pitch = %d, color_pitch=%d, context=%d",
 					layout.zeta_address, index, layout.zeta_pitch, layout.color_pitch[index], static_cast<u32>(context));
 
-				m_graphics_state.set(rsx::rtt_config_contested);
+				m_framebuffer_state_contested = true;
 
 				// TODO: Research clearing both depth AND color
 				// TODO: If context is creation_draw, deal with possibility of a lost buffer clear
@@ -1574,20 +1274,25 @@ namespace rsx
 			}
 			else
 			{
+				if (packed_pitch > layout.color_pitch[index])
+				{
+					layout.width = (layout.color_pitch[index] / color_texel_size);
+				}
+
 				layout.actual_color_pitch[index] = layout.color_pitch[index];
 			}
 
-			m_graphics_state.set(rsx::rtt_config_valid);
+			framebuffer_status_valid = true;
 		}
 
-		if (!m_graphics_state.test(rsx::rtt_config_valid) && !layout.zeta_address)
+		if (!framebuffer_status_valid && !layout.zeta_address)
 		{
 			rsx_log.warning("Framebuffer setup failed. Draw calls may have been lost");
 			return;
 		}
 
 		// At least one attachment exists
-		m_graphics_state.set(rsx::rtt_config_valid);
+		framebuffer_status_valid = true;
 
 		// Window (raster) offsets
 		const auto window_offset_x = rsx::method_registers.window_offset_x();
@@ -1629,13 +1334,6 @@ namespace rsx
 		layout.aa_factors[0] = aa_factor_u;
 		layout.aa_factors[1] = aa_factor_v;
 
-		// Log this to frame stats
-		if (layout.target != rsx::surface_target::none)
-		{
-			m_frame_stats.framebuffer_stats.add(layout.width, layout.height, aa_mode);
-		}
-
-		// Check if anything has changed
 		bool really_changed = false;
 
 		for (u8 i = 0; i < rsx::limits::color_buffers_count; ++i)
@@ -1675,12 +1373,6 @@ namespace rsx
 
 	void thread::on_framebuffer_options_changed(u32 opt)
 	{
-		if (m_graphics_state & rsx::rtt_config_dirty)
-		{
-			// Nothing to do
-			return;
-		}
-
 		auto evaluate_depth_buffer_state = [&]()
 		{
 			m_framebuffer_layout.zeta_write_enabled =
@@ -1718,7 +1410,7 @@ namespace rsx
 
 			for (uint i = 0; i < mrt_buffers.size(); ++i)
 			{
-				if (m_ctx->register_state->color_write_enabled(i))
+				if (rsx::method_registers.color_write_enabled(i))
 				{
 					const auto real_index = mrt_buffers[i];
 					m_framebuffer_layout.color_write_enabled[real_index] = true;
@@ -1726,14 +1418,6 @@ namespace rsx
 				}
 			}
 
-			if (::size32(mrt_buffers) != current_fragment_program.mrt_buffers_count &&
-				!m_graphics_state.test(rsx::pipeline_state::fragment_program_dirty) &&
-				!is_current_program_interpreted())
-			{
-				// Notify that we should recompile the FS
-				m_graphics_state |= rsx::pipeline_state::fragment_program_state_dirty;
-			}
-
 			return any_found;
 		};
 
@@ -1762,6 +1446,12 @@ namespace rsx
 			return false;
 		};
 
+		if (m_rtts_dirty)
+		{
+			// Nothing to do
+			return;
+		}
+
 		switch (opt)
 		{
 		case NV4097_SET_DEPTH_TEST_ENABLE:
@@ -1770,9 +1460,9 @@ namespace rsx
 		{
 			evaluate_depth_buffer_state();
 
-			if (m_graphics_state.test(rsx::rtt_config_contested) && evaluate_depth_buffer_contested())
+			if (m_framebuffer_state_contested)
 			{
-				m_graphics_state.set(rsx::rtt_config_dirty);
+				m_rtts_dirty |= evaluate_depth_buffer_contested();
 			}
 			break;
 		}
@@ -1795,16 +1485,16 @@ namespace rsx
 				evaluate_stencil_buffer_state();
 			}
 
-			if (m_graphics_state.test(rsx::rtt_config_contested) && evaluate_depth_buffer_contested())
+			if (m_framebuffer_state_contested)
 			{
-				m_graphics_state.set(rsx::rtt_config_dirty);
+				m_rtts_dirty |= evaluate_depth_buffer_contested();
 			}
 			break;
 		}
 		case NV4097_SET_COLOR_MASK:
 		case NV4097_SET_COLOR_MASK_MRT:
 		{
-			if (!m_graphics_state.test(rsx::rtt_config_contested)) [[likely]]
+			if (!m_framebuffer_state_contested) [[likely]]
 			{
 				// Update write masks and continue
 				evaluate_color_buffer_state();
@@ -1821,7 +1511,7 @@ namespace rsx
 				if (!old_state && new_state)
 				{
 					// Color buffers now in use
-					m_graphics_state.set(rsx::rtt_config_dirty);
+					m_rtts_dirty = true;
 				}
 			}
 			break;
@@ -1833,16 +1523,16 @@ namespace rsx
 
 	bool thread::get_scissor(areau& region, bool clip_viewport)
 	{
-		if (!m_graphics_state.test(rsx::pipeline_state::scissor_config_state_dirty))
+		if (!(m_graphics_state & rsx::pipeline_state::scissor_config_state_dirty))
 		{
-			if (clip_viewport == m_graphics_state.test(rsx::pipeline_state::scissor_setup_clipped))
+			if (clip_viewport == !!(m_graphics_state & rsx::pipeline_state::scissor_setup_clipped))
 			{
 				// Nothing to do
 				return false;
 			}
 		}
 
-		m_graphics_state.clear(rsx::pipeline_state::scissor_config_state_dirty | rsx::pipeline_state::scissor_setup_clipped);
+		m_graphics_state &= ~(rsx::pipeline_state::scissor_config_state_dirty | rsx::pipeline_state::scissor_setup_clipped);
 
 		u16 x1, x2, y1, y2;
 
@@ -1880,14 +1570,14 @@ namespace rsx
 			y1 >= rsx::method_registers.window_clip_vertical())
 		{
 			m_graphics_state |= rsx::pipeline_state::scissor_setup_invalid;
-			m_graphics_state.clear(rsx::rtt_config_valid);
+			framebuffer_status_valid = false;
 			return false;
 		}
 
 		if (m_graphics_state & rsx::pipeline_state::scissor_setup_invalid)
 		{
-			m_graphics_state.clear(rsx::pipeline_state::scissor_setup_invalid);
-			m_graphics_state.set(rsx::rtt_config_valid);
+			m_graphics_state &= ~rsx::pipeline_state::scissor_setup_invalid;
+			framebuffer_status_valid = true;
 		}
 
 		std::tie(region.x1, region.y1) = rsx::apply_resolution_scale<false>(x1, y1, m_framebuffer_layout.width, m_framebuffer_layout.height);
@@ -1898,19 +1588,12 @@ namespace rsx
 
 	void thread::prefetch_fragment_program()
 	{
-		if (!m_graphics_state.test(rsx::pipeline_state::fragment_program_ucode_dirty))
-		{
+		if (!(m_graphics_state & rsx::pipeline_state::fragment_program_ucode_dirty))
 			return;
-		}
 
-		m_graphics_state.clear(rsx::pipeline_state::fragment_program_ucode_dirty);
-
-		// Request for update of fragment constants if the program block is invalidated
-		m_graphics_state |= rsx::pipeline_state::fragment_constants_dirty;
+		m_graphics_state &= ~rsx::pipeline_state::fragment_program_ucode_dirty;
 
 		const auto [program_offset, program_location] = method_registers.shader_program_address();
-		const auto prev_textures_reference_mask = current_fp_metadata.referenced_textures_mask;
-
 		auto data_ptr = vm::base(rsx::get_address(program_offset, program_location));
 		current_fp_metadata = program_hash_util::fragment_program_utils::analyse_fragment_program(data_ptr);
 
@@ -1921,7 +1604,7 @@ namespace rsx
 		current_fragment_program.texture_state.import(current_fp_texture_state, current_fp_metadata.referenced_textures_mask);
 		current_fragment_program.valid = true;
 
-		if (!m_graphics_state.test(rsx::pipeline_state::fragment_program_state_dirty))
+		if (!(m_graphics_state & rsx::pipeline_state::fragment_program_state_dirty))
 		{
 			// Verify current texture state is valid
 			for (u32 textures_ref = current_fp_metadata.referenced_textures_mask, i = 0; textures_ref; textures_ref >>= 1, ++i)
@@ -1935,29 +1618,19 @@ namespace rsx
 				}
 			}
 		}
-
-		if (!m_graphics_state.test(rsx::pipeline_state::fragment_program_state_dirty) &&
-			(prev_textures_reference_mask != current_fp_metadata.referenced_textures_mask))
-		{
-			// If different textures are used, upload their coefficients.
-			// The texture parameters transfer routine is optimized and only writes data for textures consumed by the ucode.
-			m_graphics_state |= rsx::pipeline_state::fragment_texture_state_dirty;
-		}
 	}
 
 	void thread::prefetch_vertex_program()
 	{
-		if (!m_graphics_state.test(rsx::pipeline_state::vertex_program_ucode_dirty))
-		{
+		if (!(m_graphics_state & rsx::pipeline_state::vertex_program_ucode_dirty))
 			return;
-		}
 
-		m_graphics_state.clear(rsx::pipeline_state::vertex_program_ucode_dirty);
-
-		// Reload transform constants unconditionally for now
-		m_graphics_state |= rsx::pipeline_state::transform_constants_dirty;
+		m_graphics_state &= ~rsx::pipeline_state::vertex_program_ucode_dirty;
 
 		const u32 transform_program_start = rsx::method_registers.transform_program_start();
+		current_vertex_program.skip_vertex_input_check = true;
+
+		current_vertex_program.rsx_vertex_inputs.clear();
 		current_vertex_program.data.reserve(512 * 4);
 		current_vertex_program.jump_table.clear();
 
@@ -1970,7 +1643,7 @@ namespace rsx
 
 		current_vertex_program.texture_state.import(current_vp_texture_state, current_vp_metadata.referenced_textures_mask);
 
-		if (!m_graphics_state.test(rsx::pipeline_state::vertex_program_state_dirty))
+		if (!(m_graphics_state & rsx::pipeline_state::vertex_program_state_dirty))
 		{
 			// Verify current texture state is valid
 			for (u32 textures_ref = current_vp_metadata.referenced_textures_mask, i = 0; textures_ref; textures_ref >>= 1, ++i)
@@ -1988,7 +1661,11 @@ namespace rsx
 
 	void thread::analyse_current_rsx_pipeline()
 	{
-		m_program_cache_hint.invalidate(m_graphics_state.load());
+		if (m_graphics_state & rsx::pipeline_state::fragment_program_ucode_dirty)
+		{
+			// Request for update of fragment constants if the program block is invalidated
+			m_graphics_state |= rsx::pipeline_state::fragment_constants_dirty;
+		}
 
 		prefetch_vertex_program();
 		prefetch_fragment_program();
@@ -1996,26 +1673,10 @@ namespace rsx
 
 	void thread::get_current_vertex_program(const std::array<std::unique_ptr<rsx::sampled_image_descriptor_base>, rsx::limits::vertex_textures_count>& sampler_descriptors)
 	{
-		if (m_graphics_state.test(rsx::pipeline_state::xform_instancing_state_dirty))
-		{
-			current_vertex_program.ctrl = 0;
-			if (rsx::method_registers.current_draw_clause.is_trivial_instanced_draw)
-			{
-				current_vertex_program.ctrl |= RSX_SHADER_CONTROL_INSTANCED_CONSTANTS;
-			}
-
-			m_graphics_state.clear(rsx::pipeline_state::xform_instancing_state_dirty);
-
-			// Emit invalidate here in case ucode is actually clean
-			m_program_cache_hint.invalidate_vertex_program(current_vertex_program);
-		}
-
-		if (!m_graphics_state.test(rsx::pipeline_state::vertex_program_dirty))
-		{
+		if (!(m_graphics_state & rsx::pipeline_state::vertex_program_dirty))
 			return;
-		}
 
-		ensure(!m_graphics_state.test(rsx::pipeline_state::vertex_program_ucode_dirty));
+		ensure(!(m_graphics_state & rsx::pipeline_state::vertex_program_ucode_dirty));
 		current_vertex_program.output_mask = rsx::method_registers.vertex_attrib_output_mask();
 
 		for (u32 textures_ref = current_vp_metadata.referenced_textures_mask, i = 0; textures_ref; textures_ref >>= 1, ++i)
@@ -2027,45 +1688,193 @@ namespace rsx
 			{
 				current_vp_texture_state.clear(i);
 				current_vp_texture_state.set_dimension(sampler_descriptors[i]->image_type, i);
-
-				if (backend_config.supports_hw_msaa &&
-					sampler_descriptors[i]->samples > 1)
-				{
-					current_vp_texture_state.multisampled_textures |= (1 << i);
-				}
 			}
 		}
 
 		current_vertex_program.texture_state.import(current_vp_texture_state, current_vp_metadata.referenced_textures_mask);
+	}
 
-		m_program_cache_hint.invalidate_vertex_program(current_vertex_program);
+	void thread::analyse_inputs_interleaved(vertex_input_layout& result) const
+	{
+		const rsx_state& state = rsx::method_registers;
+		const u32 input_mask = state.vertex_attrib_input_mask();
+
+		result.clear();
+
+		if (state.current_draw_clause.command == rsx::draw_command::inlined_array)
+		{
+			interleaved_range_info info = {};
+			info.interleaved = true;
+			info.locations.reserve(8);
+
+			for (u8 index = 0; index < rsx::limits::vertex_count; ++index)
+			{
+				auto &vinfo = state.vertex_arrays_info[index];
+
+				if (vinfo.size() > 0)
+				{
+					// Stride must be updated even if the stream is disabled
+					info.attribute_stride += rsx::get_vertex_type_size_on_host(vinfo.type(), vinfo.size());
+					info.locations.push_back({ index, false, 1 });
+
+					if (input_mask & (1u << index))
+					{
+						result.attribute_placement[index] = attribute_buffer_placement::transient;
+					}
+				}
+				else if (state.register_vertex_info[index].size > 0 && input_mask & (1u << index))
+				{
+					//Reads from register
+					result.referenced_registers.push_back(index);
+					result.attribute_placement[index] = attribute_buffer_placement::transient;
+				}
+			}
+
+			if (info.attribute_stride)
+			{
+				// At least one array feed must be enabled for vertex input
+				result.interleaved_blocks.emplace_back(std::move(info));
+			}
+
+			return;
+		}
+
+		const u32 frequency_divider_mask = rsx::method_registers.frequency_divider_operation_mask();
+		result.interleaved_blocks.reserve(16);
+		result.referenced_registers.reserve(16);
+
+		for (u8 index = 0; index < rsx::limits::vertex_count; ++index)
+		{
+			// Check if vertex stream is enabled
+			if (!(input_mask & (1 << index)))
+				continue;
+
+			//Check for interleaving
+			const auto &info = state.vertex_arrays_info[index];
+			if (rsx::method_registers.current_draw_clause.is_immediate_draw &&
+				rsx::method_registers.current_draw_clause.command != rsx::draw_command::indexed)
+			{
+				// NOTE: In immediate rendering mode, all vertex setup is ignored
+				// Observed with GT5, immediate render bypasses array pointers completely, even falling back to fixed-function register defaults
+				if (vertex_push_buffers[index].vertex_count > 1)
+				{
+					// Read temp buffer (register array)
+					std::pair<u8, u32> volatile_range_info = std::make_pair(index, static_cast<u32>(vertex_push_buffers[index].data.size() * sizeof(u32)));
+					result.volatile_blocks.push_back(volatile_range_info);
+					result.attribute_placement[index] = attribute_buffer_placement::transient;
+				}
+				else if (state.register_vertex_info[index].size > 0)
+				{
+					// Reads from register
+					result.referenced_registers.push_back(index);
+					result.attribute_placement[index] = attribute_buffer_placement::transient;
+				}
+
+				// Fall back to the default register value if no source is specified via register
+				continue;
+			}
+
+			if (!info.size())
+			{
+				if (state.register_vertex_info[index].size > 0)
+				{
+					//Reads from register
+					result.referenced_registers.push_back(index);
+					result.attribute_placement[index] = attribute_buffer_placement::transient;
+					continue;
+				}
+			}
+			else
+			{
+				result.attribute_placement[index] = attribute_buffer_placement::persistent;
+				const u32 base_address = info.offset() & 0x7fffffff;
+				bool alloc_new_block = true;
+				bool modulo = !!(frequency_divider_mask & (1 << index));
+
+				for (auto &block : result.interleaved_blocks)
+				{
+					if (block.single_vertex)
+					{
+						//Single vertex definition, continue
+						continue;
+					}
+
+					if (block.attribute_stride != info.stride())
+					{
+						//Stride does not match, continue
+						continue;
+					}
+
+					if (base_address > block.base_offset)
+					{
+						const u32 diff = base_address - block.base_offset;
+						if (diff > info.stride())
+						{
+							//Not interleaved, continue
+							continue;
+						}
+					}
+					else
+					{
+						const u32 diff = block.base_offset - base_address;
+						if (diff > info.stride())
+						{
+							//Not interleaved, continue
+							continue;
+						}
+
+						//Matches, and this address is lower than existing
+						block.base_offset = base_address;
+					}
+
+					alloc_new_block = false;
+					block.locations.push_back({ index, modulo, info.frequency() });
+					block.interleaved = true;
+					break;
+				}
+
+				if (alloc_new_block)
+				{
+					interleaved_range_info block = {};
+					block.base_offset = base_address;
+					block.attribute_stride = info.stride();
+					block.memory_location = info.offset() >> 31;
+					block.locations.reserve(16);
+					block.locations.push_back({ index, modulo, info.frequency() });
+
+					if (block.attribute_stride == 0)
+					{
+						block.single_vertex = true;
+						block.attribute_stride = rsx::get_vertex_type_size_on_host(info.type(), info.size());
+					}
+
+					result.interleaved_blocks.emplace_back(std::move(block));
+				}
+			}
+		}
+
+		for (auto &info : result.interleaved_blocks)
+		{
+			//Calculate real data address to be used during upload
+			info.real_offset_address = rsx::get_address(rsx::get_vertex_offset_from_base(state.vertex_data_base_offset(), info.base_offset), info.memory_location);
+		}
 	}
 
 	void thread::get_current_fragment_program(const std::array<std::unique_ptr<rsx::sampled_image_descriptor_base>, rsx::limits::fragment_textures_count>& sampler_descriptors)
 	{
-		if (!m_graphics_state.test(rsx::pipeline_state::fragment_program_dirty))
-		{
+		if (!(m_graphics_state & rsx::pipeline_state::fragment_program_dirty))
 			return;
-		}
 
-		ensure(!m_graphics_state.test(rsx::pipeline_state::fragment_program_ucode_dirty));
+		ensure(!(m_graphics_state & rsx::pipeline_state::fragment_program_ucode_dirty));
 
-		m_graphics_state.clear(rsx::pipeline_state::fragment_program_dirty);
+		m_graphics_state &= ~(rsx::pipeline_state::fragment_program_dirty);
 
-		current_fragment_program.ctrl = m_ctx->register_state->shader_control() & (CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS | CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT);
-		current_fragment_program.texcoord_control_mask = m_ctx->register_state->texcoord_control_mask();
-		current_fragment_program.two_sided_lighting = m_ctx->register_state->two_side_light_en();
-		current_fragment_program.mrt_buffers_count = rsx::utility::get_mrt_buffers_count(m_ctx->register_state->surface_color_target());
+		current_fragment_program.ctrl = rsx::method_registers.shader_control() & (CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS | CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT);
+		current_fragment_program.texcoord_control_mask = rsx::method_registers.texcoord_control_mask();
+		current_fragment_program.two_sided_lighting = rsx::method_registers.two_side_light_en();
 
-		if (method_registers.current_draw_clause.classify_mode() == primitive_class::polygon)
-		{
-			if (!backend_config.supports_normalized_barycentrics)
-			{
-				current_fragment_program.ctrl |= RSX_SHADER_CONTROL_ATTRIBUTE_INTERPOLATION;
-			}
-		}
-		else if (method_registers.point_sprite_enabled() &&
-			method_registers.current_draw_clause.primitive == primitive_type::points)
+		if (method_registers.current_draw_clause.primitive == primitive_type::points &&
+			method_registers.point_sprite_enabled())
 		{
 			// Set high word of the control mask to store point sprite control
 			current_fragment_program.texcoord_control_mask |= u32(method_registers.point_sprite_control_mask()) << 16;
@@ -2076,24 +1885,20 @@ namespace rsx
 			if (!(textures_ref & 1)) continue;
 
 			auto &tex = rsx::method_registers.fragment_textures[i];
-			current_fp_texture_state.clear(i);
-
-			if (tex.enabled() && sampler_descriptors[i]->format_class != RSX_FORMAT_CLASS_UNDEFINED)
+			if (tex.enabled())
 			{
-				std::memcpy(current_fragment_program.texture_params[i].scale, sampler_descriptors[i]->texcoord_xform.scale, 6 * sizeof(f32));
+				current_fragment_program.texture_params[i].scale[0] = sampler_descriptors[i]->scale_x;
+				current_fragment_program.texture_params[i].scale[1] = sampler_descriptors[i]->scale_y;
+				current_fragment_program.texture_params[i].scale[2] = sampler_descriptors[i]->scale_z;
+				current_fragment_program.texture_params[i].subpixel_bias = 0.f;
 				current_fragment_program.texture_params[i].remap = tex.remap();
 
 				m_graphics_state |= rsx::pipeline_state::fragment_texture_state_dirty;
 
 				u32 texture_control = 0;
+				current_fp_texture_state.clear(i);
 				current_fp_texture_state.set_dimension(sampler_descriptors[i]->image_type, i);
 
-				if (sampler_descriptors[i]->texcoord_xform.clamp)
-				{
-					std::memcpy(current_fragment_program.texture_params[i].clamp_min, sampler_descriptors[i]->texcoord_xform.clamp_min, 4 * sizeof(f32));
-					texture_control |= (1 << rsx::texture_control_bits::CLAMP_TEXCOORDS_BIT);
-				}
-
 				if (tex.alpha_kill_enabled())
 				{
 					//alphakill can be ignored unless a valid comparison function is set
@@ -2106,40 +1911,14 @@ namespace rsx
 
 				if (raw_format & CELL_GCM_TEXTURE_UN)
 				{
+					current_fp_texture_state.unnormalized_coords |= (1 << i);
+
 					if (tex.min_filter() == rsx::texture_minify_filter::nearest ||
 						tex.mag_filter() == rsx::texture_magnify_filter::nearest)
 					{
 						// Subpixel offset so that (X + bias) * scale will round correctly.
 						// This is done to work around fdiv precision issues in some GPUs (NVIDIA)
-						// We apply the simplification where (x + bias) * z = xz + zbias here.
-						constexpr auto subpixel_bias = 0.01f;
-						current_fragment_program.texture_params[i].bias[0] += (subpixel_bias * current_fragment_program.texture_params[i].scale[0]);
-						current_fragment_program.texture_params[i].bias[1] += (subpixel_bias * current_fragment_program.texture_params[i].scale[1]);
-						current_fragment_program.texture_params[i].bias[2] += (subpixel_bias * current_fragment_program.texture_params[i].scale[2]);
-					}
-				}
-
-				if (backend_config.supports_hw_msaa && sampler_descriptors[i]->samples > 1)
-				{
-					current_fp_texture_state.multisampled_textures |= (1 << i);
-					texture_control |= (static_cast<u32>(tex.zfunc()) << texture_control_bits::DEPTH_COMPARE_OP);
-					texture_control |= (static_cast<u32>(tex.mag_filter() != rsx::texture_magnify_filter::nearest) << texture_control_bits::FILTERED_MAG);
-					texture_control |= (static_cast<u32>(tex.min_filter() != rsx::texture_minify_filter::nearest) << texture_control_bits::FILTERED_MIN);
-					texture_control |= (((tex.format() & CELL_GCM_TEXTURE_UN) >> 6) << texture_control_bits::UNNORMALIZED_COORDS);
-
-					if (rsx::is_texcoord_wrapping_mode(tex.wrap_s()))
-					{
-						texture_control |= (1 << texture_control_bits::WRAP_S);
-					}
-
-					if (rsx::is_texcoord_wrapping_mode(tex.wrap_t()))
-					{
-						texture_control |= (1 << texture_control_bits::WRAP_T);
-					}
-
-					if (rsx::is_texcoord_wrapping_mode(tex.wrap_r()))
-					{
-						texture_control |= (1 << texture_control_bits::WRAP_R);
+						current_fragment_program.texture_params[i].subpixel_bias = 0.01f;
 					}
 				}
 
@@ -2190,14 +1969,8 @@ namespace rsx
 						rsx_log.error("Depth texture bound to pipeline with unexpected format 0x%X", format);
 					}
 				}
-				else if (!backend_config.supports_hw_renormalization /* &&
-					tex.min_filter() == rsx::texture_minify_filter::nearest &&
-					tex.mag_filter() == rsx::texture_magnify_filter::nearest*/)
+				else if (!backend_config.supports_hw_renormalization)
 				{
-					// FIXME: This check should only apply to point-sampled textures. However, it severely regresses some games (id tech 5).
-					// This is because even when filtering is active, the error from the PS3 texture expansion still applies.
-					// A proper fix is to expand these formats into BGRA8 when high texture precision is required. That requires different GUI settings and inflation shaders, so it will be handled separately.
-
 					switch (format)
 					{
 					case CELL_GCM_TEXTURE_A1R5G5B5:
@@ -2213,57 +1986,63 @@ namespace rsx
 					}
 				}
 
-				if (rsx::is_int8_remapped_format(format))
+				// Special operations applied to 8-bit formats such as gamma correction and sign conversion
+				// NOTE: The unsigned_remap being set to anything other than 0 flags the texture as being signed (UE3)
+				// This is a separate method of setting the format to signed mode without doing so per-channel
+				// Precedence = SIGNED override > GAMMA > UNSIGNED_REMAP (See Resistance 3 for GAMMA/REMAP relationship, UE3 for REMAP effect)
+
+				const u32 argb8_signed = tex.argb_signed();
+				const u32 gamma = tex.gamma() & ~argb8_signed;
+				const u32 unsigned_remap = (tex.unsigned_remap() == CELL_GCM_TEXTURE_UNSIGNED_REMAP_NORMAL)? 0u : (~gamma & 0xF);
+				u32 argb8_convert = gamma;
+
+				if (const u32 sign_convert = (argb8_signed | unsigned_remap))
 				{
-					// Special operations applied to 8-bit formats such as gamma correction and sign conversion
-					// NOTE: The unsigned_remap=bias flag being set flags the texture as being compressed normal (2n-1 / BX2) (UE3)
-					// NOTE: The ARGB8_signed flag means to reinterpret the raw bytes as signed. This is different than unsigned_remap=bias which does range decompression.
-					// This is a separate method of setting the format to signed mode without doing so per-channel
-					// Precedence = SNORM > GAMMA > UNSIGNED_REMAP (See Resistance 3 for GAMMA/BX2 relationship, UE3 for BX2 effect)
-
-					const u32 argb8_signed = tex.argb_signed(); // _SNROM
-					const u32 gamma = tex.gamma() & ~argb8_signed; // _SRGB
-					const u32 unsigned_remap = (tex.unsigned_remap() == CELL_GCM_TEXTURE_UNSIGNED_REMAP_NORMAL)? 0u : (~(gamma | argb8_signed) & 0xF); // _BX2
-					u32 argb8_convert = gamma;
-
-					// The options are mutually exclusive
-					ensure((argb8_signed & gamma) == 0);
-					ensure((argb8_signed & unsigned_remap) == 0);
-					ensure((gamma & unsigned_remap) == 0);
-
-					// Helper function to apply a per-channel mask based on an input mask
-					const auto apply_sign_convert_mask = [&](u32 mask, u32 bit_offset)
+					// Apply remap to avoid mapping 1 to -1. Only the sign conversion needs this check
+					// TODO: Use actual remap mask to account for 0 and 1 overrides in default mapping
+					// TODO: Replace this clusterfuck of texture control with matrix transformation
+					const auto remap_ctrl = (tex.remap() >> 8) & 0xAA;
+					if (remap_ctrl == 0xAA)
 					{
-						// TODO: Use actual remap mask to account for 0 and 1 overrides in default mapping
-						// TODO: Replace this clusterfuck of texture control with matrix transformation
-						const auto remap_ctrl = (tex.remap() >> 8) & 0xAA;
-						if (remap_ctrl == 0xAA)
-						{
-							argb8_convert |= (mask & 0xFu) << bit_offset;
-							return;
-						}
-
-						if ((remap_ctrl & 0x03) == 0x02) argb8_convert |= (mask & 0x1u) << bit_offset;
-						if ((remap_ctrl & 0x0C) == 0x08) argb8_convert |= (mask & 0x2u) << bit_offset;
-						if ((remap_ctrl & 0x30) == 0x20) argb8_convert |= (mask & 0x4u) << bit_offset;
-						if ((remap_ctrl & 0xC0) == 0x80) argb8_convert |= (mask & 0x8u) << bit_offset;
-					};
-
-					if (argb8_signed)
-					{
-						// Apply integer sign extension from uint8 to sint8 and renormalize
-						apply_sign_convert_mask(argb8_signed, texture_control_bits::SEXT_OFFSET);
+						argb8_convert |= (sign_convert & 0xFu) << texture_control_bits::EXPAND_OFFSET;
 					}
-
-					if (unsigned_remap)
+					else
 					{
-						// Apply sign expansion, compressed normal-map style (2n - 1)
-						apply_sign_convert_mask(unsigned_remap, texture_control_bits::EXPAND_OFFSET);
+						if (remap_ctrl & 0x03) argb8_convert |= (sign_convert & 0x1u) << texture_control_bits::EXPAND_OFFSET;
+						if (remap_ctrl & 0x0C) argb8_convert |= (sign_convert & 0x2u) << texture_control_bits::EXPAND_OFFSET;
+						if (remap_ctrl & 0x30) argb8_convert |= (sign_convert & 0x4u) << texture_control_bits::EXPAND_OFFSET;
+						if (remap_ctrl & 0xC0) argb8_convert |= (sign_convert & 0x8u) << texture_control_bits::EXPAND_OFFSET;
 					}
-
-					texture_control |= argb8_convert;
 				}
 
+				if (argb8_convert)
+				{
+					switch (format)
+					{
+					case CELL_GCM_TEXTURE_DEPTH24_D8:
+					case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT:
+					case CELL_GCM_TEXTURE_DEPTH16:
+					case CELL_GCM_TEXTURE_DEPTH16_FLOAT:
+					case CELL_GCM_TEXTURE_X16:
+					case CELL_GCM_TEXTURE_Y16_X16:
+					case CELL_GCM_TEXTURE_COMPRESSED_HILO8:
+					case CELL_GCM_TEXTURE_COMPRESSED_HILO_S8:
+					case CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT:
+					case CELL_GCM_TEXTURE_W32_Z32_Y32_X32_FLOAT:
+					case CELL_GCM_TEXTURE_X32_FLOAT:
+					case CELL_GCM_TEXTURE_Y16_X16_FLOAT:
+						// Special data formats (XY, HILO, DEPTH) are not RGB formats
+						// Ignore gamma flags
+						break;
+					default:
+						texture_control |= argb8_convert;
+						break;
+					}
+				}
+
+#ifdef __APPLE__
+				texture_control |= (sampler_descriptors[i]->encoded_component_map() << 16);
+#endif
 				current_fragment_program.texture_params[i].control = texture_control;
 			}
 		}
@@ -2277,46 +2056,30 @@ namespace rsx
 			//Check that the depth stage is not disabled
 			if (!rsx::method_registers.depth_test_enabled())
 			{
-				rsx_log.trace("FS exports depth component but depth test is disabled (INVALID_OPERATION)");
+				rsx_log.error("FS exports depth component but depth test is disabled (INVALID_OPERATION)");
 			}
 		}
-
-		m_program_cache_hint.invalidate_fragment_program(current_fragment_program);
 	}
 
 	bool thread::invalidate_fragment_program(u32 dst_dma, u32 dst_offset, u32 size)
 	{
-		if (!current_fragment_program.total_length)
-		{
-			// No shader loaded
-			return false;
-		}
-
 		const auto [shader_offset, shader_dma] = rsx::method_registers.shader_program_address();
-		if ((dst_dma & CELL_GCM_LOCATION_MAIN) != shader_dma)
+
+		if ((dst_dma & CELL_GCM_LOCATION_MAIN) == shader_dma &&
+		address_range::start_length(shader_offset, current_fragment_program.total_length).overlaps(
+			address_range::start_length(dst_offset, size))) [[unlikely]]
 		{
-			// Shader not loaded in XDR memory
-			return false;
+			// Data overlaps
+			m_graphics_state |= rsx::pipeline_state::fragment_program_ucode_dirty;
+			return true;
 		}
 
-		const auto current_fragment_shader_range = address_range32::start_length(shader_offset, current_fragment_program.total_length);
-		if (!current_fragment_shader_range.overlaps(address_range32::start_length(dst_offset, size)))
-		{
-			// No range overlap
-			return false;
-		}
-
-		// Data overlaps. Force ucode reload.
-		m_graphics_state |= rsx::pipeline_state::fragment_program_ucode_dirty;
-		return true;
+		return false;
 	}
 
 	void thread::reset()
 	{
 		rsx::method_registers.reset();
-		check_zcull_status(false);
-		nv4097::set_render_mode(m_ctx, 0, method_registers.registers[NV4097_SET_RENDER_ENABLE]);
-		m_graphics_state |= pipeline_state::all_dirty;
 	}
 
 	void thread::init(u32 ctrlAddress)
@@ -2324,12 +2087,10 @@ namespace rsx
 		dma_address = ctrlAddress;
 		ctrl = vm::_ptr<RsxDmaControl>(ctrlAddress);
 		flip_status = CELL_GCM_DISPLAY_FLIP_STATUS_DONE;
-		fifo_ret_addr = RSX_CALL_STACK_EMPTY;
 
-		vm::write32(device_addr + 0x30, 1);
 		std::memset(display_buffers, 0, sizeof(display_buffers));
 
-		rsx_thread_running = true;
+		m_rsx_thread_exiting = false;
 	}
 
 	std::pair<u32, u32> thread::calculate_memory_requirements(const vertex_input_layout& layout, u32 first_vertex, u32 vertex_count)
@@ -2343,7 +2104,7 @@ namespace rsx
 		{
 			for (const auto &block : layout.interleaved_blocks)
 			{
-				volatile_memory_size += block->attribute_stride * vertex_count;
+				volatile_memory_size += block.attribute_stride * vertex_count;
 			}
 		}
 		else
@@ -2364,10 +2125,263 @@ namespace rsx
 		return std::make_pair(persistent_memory_size, volatile_memory_size);
 	}
 
+	void thread::fill_vertex_layout_state(const vertex_input_layout& layout, u32 first_vertex, u32 vertex_count, s32* buffer, u32 persistent_offset_base, u32 volatile_offset_base)
+	{
+		std::array<s32, 16> offset_in_block = {};
+		u32 volatile_offset = volatile_offset_base;
+		u32 persistent_offset = persistent_offset_base;
+
+		//NOTE: Order is important! Transient ayout is always push_buffers followed by register data
+		if (rsx::method_registers.current_draw_clause.is_immediate_draw)
+		{
+			for (const auto &info : layout.volatile_blocks)
+			{
+				offset_in_block[info.first] = volatile_offset;
+				volatile_offset += info.second;
+			}
+		}
+
+		for (u8 index : layout.referenced_registers)
+		{
+			offset_in_block[index] = volatile_offset;
+			volatile_offset += 16;
+		}
+
+		if (rsx::method_registers.current_draw_clause.command == rsx::draw_command::inlined_array)
+		{
+			const auto &block = layout.interleaved_blocks[0];
+			u32 inline_data_offset = volatile_offset;
+			for (const auto& attrib : block.locations)
+			{
+				auto &info = rsx::method_registers.vertex_arrays_info[attrib.index];
+
+				offset_in_block[attrib.index] = inline_data_offset;
+				inline_data_offset += rsx::get_vertex_type_size_on_host(info.type(), info.size());
+			}
+		}
+		else
+		{
+			for (const auto &block : layout.interleaved_blocks)
+			{
+				for (const auto& attrib : block.locations)
+				{
+					const u32 local_address = (rsx::method_registers.vertex_arrays_info[attrib.index].offset() & 0x7fffffff);
+					offset_in_block[attrib.index] = persistent_offset + (local_address - block.base_offset);
+				}
+
+				const auto range = block.calculate_required_range(first_vertex, vertex_count);
+				persistent_offset += block.attribute_stride * range.second;
+			}
+		}
+
+		// Fill the data
+		// Each descriptor field is 64 bits wide
+		// [0-8] attribute stride
+		// [8-24] attribute divisor
+		// [24-27] attribute type
+		// [27-30] attribute size
+		// [30-31] reserved
+		// [31-60] starting offset
+		// [60-21] swap bytes flag
+		// [61-22] volatile flag
+		// [62-63] modulo enable flag
+
+		const s32 default_frequency_mask = (1 << 8);
+		const s32 swap_storage_mask = (1 << 29);
+		const s32 volatile_storage_mask = (1 << 30);
+		const s32 modulo_op_frequency_mask = smin;
+
+		const u32 modulo_mask = rsx::method_registers.frequency_divider_operation_mask();
+		const auto max_index = (first_vertex + vertex_count) - 1;
+
+		for (u8 index = 0; index < rsx::limits::vertex_count; ++index)
+		{
+			if (layout.attribute_placement[index] == attribute_buffer_placement::none)
+			{
+				static constexpr u64 zero = 0;
+				std::memcpy(buffer + index * 2, &zero, sizeof(zero));
+				continue;
+			}
+
+			rsx::vertex_base_type type = {};
+			s32 size = 0;
+			s32 attrib0 = 0;
+			s32 attrib1 = 0;
+
+			if (layout.attribute_placement[index] == attribute_buffer_placement::transient)
+			{
+				if (rsx::method_registers.current_draw_clause.command == rsx::draw_command::inlined_array)
+				{
+					const auto &info = rsx::method_registers.vertex_arrays_info[index];
+
+					if (!info.size())
+					{
+						// Register
+						const auto& reginfo = rsx::method_registers.register_vertex_info[index];
+						type = reginfo.type;
+						size = reginfo.size;
+
+						attrib0 = rsx::get_vertex_type_size_on_host(type, size);
+					}
+					else
+					{
+						// Array
+						type = info.type();
+						size = info.size();
+
+						attrib0 = layout.interleaved_blocks[0].attribute_stride | default_frequency_mask;
+					}
+				}
+				else
+				{
+					// Data is either from an immediate render or register input
+					// Immediate data overrides register input
+
+					if (rsx::method_registers.current_draw_clause.is_immediate_draw &&
+						vertex_push_buffers[index].vertex_count > 1)
+					{
+						// Push buffer
+						const auto &info = vertex_push_buffers[index];
+						type = info.type;
+						size = info.size;
+
+						attrib0 = rsx::get_vertex_type_size_on_host(type, size) | default_frequency_mask;
+					}
+					else
+					{
+						// Register
+						const auto& info = rsx::method_registers.register_vertex_info[index];
+						type = info.type;
+						size = info.size;
+
+						attrib0 = rsx::get_vertex_type_size_on_host(type, size);
+					}
+				}
+
+				attrib1 |= volatile_storage_mask;
+			}
+			else
+			{
+				auto &info = rsx::method_registers.vertex_arrays_info[index];
+				type = info.type();
+				size = info.size();
+
+				auto stride = info.stride();
+				attrib0 = stride;
+
+				if (stride > 0) //when stride is 0, input is not an array but a single element
+				{
+					const u32 frequency = info.frequency();
+					switch (frequency)
+					{
+					case 0:
+					case 1:
+					{
+						attrib0 |= default_frequency_mask;
+						break;
+					}
+					default:
+					{
+						if (modulo_mask & (1 << index))
+						{
+							if (max_index >= frequency)
+							{
+								// Only set modulo mask if a modulo op is actually necessary!
+								// This requires that the uploaded range for this attr = [0, freq-1]
+								// Ignoring modulo op if the rendered range does not wrap allows for range optimization
+								attrib0 |= (frequency << 8);
+								attrib1 |= modulo_op_frequency_mask;
+							}
+							else
+							{
+								attrib0 |= default_frequency_mask;
+							}
+						}
+						else
+						{
+							// Division
+							attrib0 |= (frequency << 8);
+						}
+						break;
+					}
+					}
+				}
+			} //end attribute placement check
+
+			// Special compressed 4 components into one 4-byte value. Decoded as one value.
+			if (type == rsx::vertex_base_type::cmp)
+			{
+				size = 1;
+			}
+
+			// All data is passed in in PS3-native order (BE) so swap flag should be set
+			attrib1 |= swap_storage_mask;
+			attrib0 |= (static_cast<s32>(type) << 24);
+			attrib0 |= (size << 27);
+			attrib1 |= offset_in_block[index];
+
+			buffer[index * 2 + 0] = attrib0;
+			buffer[index * 2 + 1] = attrib1;
+		}
+	}
+
+	void thread::write_vertex_data_to_memory(const vertex_input_layout& layout, u32 first_vertex, u32 vertex_count, void *persistent_data, void *volatile_data)
+	{
+		auto transient = static_cast<char*>(volatile_data);
+		auto persistent = static_cast<char*>(persistent_data);
+
+		auto &draw_call = rsx::method_registers.current_draw_clause;
+
+		if (transient != nullptr)
+		{
+			if (draw_call.command == rsx::draw_command::inlined_array)
+			{
+				for (const u8 index : layout.referenced_registers)
+				{
+					memcpy(transient, rsx::method_registers.register_vertex_info[index].data.data(), 16);
+					transient += 16;
+				}
+
+				memcpy(transient, draw_call.inline_vertex_array.data(), draw_call.inline_vertex_array.size() * sizeof(u32));
+				//Is it possible to reference data outside of the inlined array?
+				return;
+			}
+
+			//NOTE: Order is important! Transient layout is always push_buffers followed by register data
+			if (draw_call.is_immediate_draw)
+			{
+				//NOTE: It is possible for immediate draw to only contain index data, so vertex data can be in persistent memory
+				for (const auto &info : layout.volatile_blocks)
+				{
+					memcpy(transient, vertex_push_buffers[info.first].data.data(), info.second);
+					transient += info.second;
+				}
+			}
+
+			for (const u8 index : layout.referenced_registers)
+			{
+				memcpy(transient, rsx::method_registers.register_vertex_info[index].data.data(), 16);
+				transient += 16;
+			}
+		}
+
+		if (persistent != nullptr)
+		{
+			for (const auto &block : layout.interleaved_blocks)
+			{
+				auto range = block.calculate_required_range(first_vertex, vertex_count);
+
+				const u32 data_size = range.second * block.attribute_stride;
+				const u32 vertex_base = range.first * block.attribute_stride;
+
+				g_fxo->get<rsx::dma_manager>().copy(persistent, vm::_ptr<char>(block.real_offset_address) + vertex_base, data_size);
+				persistent += data_size;
+			}
+		}
+	}
+
 	void thread::flip(const display_flip_info_t& info)
 	{
-		m_eng_interrupt_mask.clear(rsx::display_interrupt);
-
 		if (async_flip_requested & flip_request::any)
 		{
 			// Deferred flip
@@ -2384,22 +2398,11 @@ namespace rsx
 		if (info.emu_flip)
 		{
 			performance_counters.sampled_frames++;
-
-			if (m_pause_after_x_flips && m_pause_after_x_flips-- == 1)
-			{
-				Emu.Pause();
-			}
 		}
-
-		last_host_flip_timestamp = get_system_time();
 	}
 
 	void thread::check_zcull_status(bool framebuffer_swap)
 	{
-		const bool zcull_rendering_enabled = !!method_registers.registers[NV4097_SET_ZCULL_EN];
-		const bool zcull_stats_enabled = !!method_registers.registers[NV4097_SET_ZCULL_STATS_ENABLE];
-		const bool zcull_pixel_cnt_enabled = !!method_registers.registers[NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE];
-
 		if (framebuffer_swap)
 		{
 			zcull_surface_active = false;
@@ -2457,7 +2460,7 @@ namespace rsx
 		}
 
 		rsx::reservation_lock<true> lock(sink, 16);
-		vm::_ptr<atomic_t<CellGcmReportData>>(sink)->store({timestamp(), value, 0});
+		vm::_ref<atomic_t<CellGcmReportData>>(sink).store({ timestamp(), value, 0});
 	}
 
 	u32 thread::copy_zcull_stats(u32 memory_range_start, u32 memory_range, u32 destination)
@@ -2475,7 +2478,7 @@ namespace rsx
 			if (!result.queries.empty())
 			{
 				cond_render_ctrl.set_eval_sources(result.queries);
-				sync_hint(FIFO::interrupt_hint::conditional_render_eval, { .query = cond_render_ctrl.eval_sources.front(), .address = ref });
+				sync_hint(FIFO_hint::hint_conditional_render_eval, cond_render_ctrl.eval_sources.front());
 			}
 			else
 			{
@@ -2507,13 +2510,17 @@ namespace rsx
 
 	void thread::sync()
 	{
-		m_eng_interrupt_mask.clear(rsx::pipe_flush_interrupt);
-
-		mm_flush();
-
 		if (zcull_ctrl->has_pending())
 		{
-			zcull_ctrl->sync(this);
+			if (g_cfg.video.relaxed_zcull_sync)
+			{
+				// Emit zcull sync hint and update; guarantees results to be written shortly after this event
+				zcull_ctrl->update(this, 0, true);
+			}
+			else
+			{
+				zcull_ctrl->sync(this);
+			}
 		}
 
 		// Fragment constants may have been updated
@@ -2527,9 +2534,9 @@ namespace rsx
 		//ensure(async_tasks_pending.load() == 0);
 	}
 
-	void thread::sync_hint(FIFO::interrupt_hint /*hint*/, rsx::reports::sync_hint_payload_t payload)
+	void thread::sync_hint(FIFO_hint /*hint*/, void* args)
 	{
-		zcull_ctrl->on_sync_hint(payload);
+		zcull_ctrl->on_sync_hint(args);
 	}
 
 	bool thread::is_fifo_idle() const
@@ -2541,100 +2548,10 @@ namespace rsx
 	{
 		// Make sure GET value is exposed before sync points
 		fifo_ctrl->sync_get();
-		fifo_ctrl->invalidate_cache();
 	}
 
-	std::pair<u32, u32> thread::try_get_pc_of_x_cmds_backwards(s32 count, u32 get) const
+	void thread::recover_fifo(u32 line, u32 col, const char* file, const char* func)
 	{
-		if (!ctrl || state & cpu_flag::exit)
-		{
-			return {0, umax};
-		}
-
-		if (!count)
-		{
-			return {0, get};
-		}
-
-		u32 true_get = ctrl->get;
-		u32 start = last_known_code_start;
-
-		RSXDisAsm disasm(cpu_disasm_mode::survey_cmd_size, vm::g_sudo_addr, 0, this);
-
-		std::vector<u32> pcs_of_valid_cmds;
-
-		if (get > start)
-		{
-			pcs_of_valid_cmds.reserve(std::min<u32>((get - start) / 16, 0x4000)); // Rough estimation of final array size
-		}
-
-		auto probe_code_region = [&](u32 probe_start) -> std::pair<u32, u32>
-		{
-			if (probe_start > get)
-			{
-				return {0, get};
-			}
-
-			pcs_of_valid_cmds.clear();
-			pcs_of_valid_cmds.push_back(probe_start);
-
-			usz index_of_get = umax;
-			usz until = umax;
-
-			while (pcs_of_valid_cmds.size() < until)
-			{
-				if (u32 advance = disasm.disasm(pcs_of_valid_cmds.back()))
-				{
-					pcs_of_valid_cmds.push_back(utils::add_saturate<u32>(pcs_of_valid_cmds.back(), advance));
-				}
-				else
-				{
-					break;
-				}
-
-				if (index_of_get == umax && pcs_of_valid_cmds.back() >= get)
-				{
-					index_of_get = pcs_of_valid_cmds.size() - 1;
-					until = index_of_get + 1;
-
-					if (count < 0 && pcs_of_valid_cmds.back() == get)
-					{
-						until -= count;
-					}
-				}
-			}
-
-			if (index_of_get == umax || pcs_of_valid_cmds[index_of_get] != get)
-			{
-				return {0, get};
-			}
-
-			if (count < 0)
-			{
-				const u32 found_cmds_count = static_cast<u32>(std::min<s64>(-count, pcs_of_valid_cmds.size() - 1LL - index_of_get));
-
-				return {found_cmds_count, pcs_of_valid_cmds[index_of_get + found_cmds_count]};
-			}
-
-			const u32 found_cmds_count = std::min<u32>(count, ::size32(pcs_of_valid_cmds) - 1);
-
-			return {found_cmds_count, *(pcs_of_valid_cmds.end() - 1 - found_cmds_count)};
-		};
-
-		auto pair = probe_code_region(start);
-
-		if (!pair.first)
-		{
-			pair = probe_code_region(true_get);
-		}
-
-		return pair;
-	}
-
-	void thread::recover_fifo(std::source_location src_loc)
-	{
-		bool kill_itself = g_cfg.core.rsx_fifo_accuracy == rsx_fifo_mode::as_ps3;
-
 		const u64 current_time = get_system_time();
 
 		if (recovered_fifo_cmds_history.size() == 20u)
@@ -2646,19 +2563,13 @@ namespace rsx
 			if (current_time - cmd_info.timestamp < 2'000'000u - std::min<u32>(g_cfg.video.driver_wakeup_delay * 700, 1'400'000))
 			{
 				// Probably hopeless
-				kill_itself = true;
+				fmt::throw_exception("Dead FIFO commands queue state has been detected!\nTry increasing \"Driver Wake-Up Delay\" setting in Advanced settings. Called from %s", src_loc{line, col, file, func});
 			}
 
 			// Erase the last command from history, keep the size of the queue the same
 			recovered_fifo_cmds_history.pop();
 		}
 
-		if (kill_itself)
-		{
-			fmt::throw_exception("Dead FIFO commands queue state has been detected!"
-				"\nTry increasing \"Driver Wake-Up Delay\" setting or setting \"RSX FIFO Accuracy\" to \"%s\", both in Advanced settings. Called from %s", std::min<rsx_fifo_mode>(rsx_fifo_mode{static_cast<u32>(g_cfg.core.rsx_fifo_accuracy.get()) + 1}, rsx_fifo_mode::atomic_ordered), src_loc);
-		}
-
 		// Error. Should reset the queue
 		fifo_ctrl->set_get(restore_point);
 		fifo_ret_addr = saved_fifo_ret;
@@ -2674,25 +2585,6 @@ namespace rsx
 		recovered_fifo_cmds_history.push({fifo_ctrl->last_cmd(), current_time});
 	}
 
-	std::string thread::dump_misc() const
-	{
-		std::string ret = cpu_thread::dump_misc();
-
-		const auto flags = +state;
-
-		if (is_paused(flags) && flags & cpu_flag::wait)
-		{
-			fmt::append(ret, "\nFragment Program Hash: %X.fp", current_fragment_program.get_data() ? program_hash_util::fragment_program_utils::get_fragment_program_ucode_hash(current_fragment_program) : 0);
-			fmt::append(ret, "\nVertex Program Hash: %X.vp", current_vertex_program.data.empty() ? 0 : program_hash_util::vertex_program_utils::get_vertex_program_ucode_hash(current_vertex_program));
-		}
-		else
-		{
-			fmt::append(ret, "\n");
-		}
-
-		return ret;
-	}
-
 	std::vector<std::pair<u32, u32>> thread::dump_callstack_list() const
 	{
 		std::vector<std::pair<u32, u32>> result;
@@ -2723,7 +2615,7 @@ namespace rsx
 		{
 #ifdef __linux__
 			// NOTE: Assumption that timer initialization has succeeded
-			constexpr u64 host_min_quantum = 10;
+			u64 host_min_quantum = remaining <= 1000 ? 10 : 50;
 #else
 			// Host scheduler quantum for windows (worst case)
 			// NOTE: On ps3 this function has very high accuracy
@@ -2732,7 +2624,8 @@ namespace rsx
 			if (remaining >= host_min_quantum)
 			{
 #ifdef __linux__
-				thread_ctrl::wait_for(remaining, false);
+				// Do not wait for the last quantum to avoid loss of accuracy
+				thread_ctrl::wait_for(remaining - ((remaining % host_min_quantum) + host_min_quantum), false);
 #else
 				// Wait on multiple of min quantum for large durations to avoid overloading low thread cpus
 				thread_ctrl::wait_for(remaining - (remaining % host_min_quantum), false);
@@ -2765,10 +2658,12 @@ namespace rsx
 		return fifo_ctrl->last_cmd();
 	}
 
-	void invalid_method(context*, u32, u32);
+	void invalid_method(thread*, u32, u32);
 
-	void thread::dump_regs(std::string& result, std::any& /*custom_data*/) const
+	std::string thread::dump_regs() const
 	{
+		std::string result;
+
 		if (ctrl)
 		{
 			fmt::append(result, "FIFO: GET=0x%07x, PUT=0x%07x, REF=0x%08x\n", +ctrl->get, +ctrl->put, +ctrl->ref);
@@ -2793,21 +2688,21 @@ namespace rsx
 			case NV4097_ZCULL_SYNC:
 				continue;
 
-			case NV308A_COLOR:
-			{
-				i = NV3089_SET_OBJECT;
-				continue;
-			}
 			default:
 			{
+				if (i >= NV308A_COLOR && i < NV3089_SET_OBJECT)
+				{
+					continue;
+				}
+
 				break;
 			}
 			}
 
-			fmt::append(result, "[%04x] ", i);
-			ensure(rsx::get_pretty_printing_function(i))(result, i, method_registers.registers[i]);
-			result += '\n';
+			fmt::append(result, "[%04x] %s\n", i, ensure(rsx::get_pretty_printing_function(i))(i, method_registers.registers[i]));
 		}
+
+		return result;
 	}
 
 	flags32_t thread::read_barrier(u32 memory_address, u32 memory_range, bool unconditional)
@@ -2827,12 +2722,12 @@ namespace rsx
 		// we must block until RSX has invalidated the memory
 		// or lock m_mtx_task and do it ourselves
 
-		if (!rsx_thread_running)
+		if (m_rsx_thread_exiting)
 			return;
 
 		reader_lock lock(m_mtx_task);
 
-		const auto map_range = address_range32::start_length(address, size);
+		const auto map_range = address_range::start_length(address, size);
 
 		if (!m_invalidated_memory_range.valid())
 			return;
@@ -2844,81 +2739,62 @@ namespace rsx
 		}
 	}
 
-	void thread::on_notify_pre_memory_unmapped(u32 address, u32 size, std::vector<std::pair<u64, u64>>& event_data)
+	void thread::on_notify_memory_unmapped(u32 address, u32 size)
 	{
-		// Always flush MM if memory mapping is going to change.
-		rsx::mm_flush();
-
-		if (rsx_thread_running && address < rsx::constants::local_mem_base)
+		if (!m_rsx_thread_exiting && address < rsx::constants::local_mem_base)
 		{
-			// Each bit represents io entry to be unmapped
-			u64 unmap_status[512 / 64]{};
-
-			for (u32 ea = address >> 20, end = ea + (size >> 20); ea < end; ea++)
+			if (!isHLE)
 			{
-				const u32 io = utils::rol32(iomap_table.io[ea], 32 - 20);
+				// Each bit represents io entry to be unmapped
+				u64 unmap_status[512 / 64]{};
+
+				for (u32 ea = address >> 20, end = ea + (size >> 20); ea < end; ea++)
+				{
+					const u32 io = utils::rol32(iomap_table.io[ea], 32 - 20);
+
+					if (io + 1)
+					{
+						unmap_status[io / 64] |= 1ull << (io & 63);
+						iomap_table.ea[io].release(-1);
+						iomap_table.io[ea].release(-1);
+					}
+				}
+
+				for (u32 i = 0; i < std::size(unmap_status); i++)
+				{
+					// TODO: Check order when sending multiple events
+					if (u64 to_unmap = unmap_status[i])
+					{
+						// Each 64 entries are grouped by a bit
+						const u64 io_event = SYS_RSX_EVENT_UNMAPPED_BASE << i;
+						send_event(0, io_event, to_unmap);
+					}
+				}
+			}
+			else
+			{
+				// TODO: Fix this
+				u32 ea = address >> 20, io = iomap_table.io[ea];
 
 				if (io + 1)
 				{
-					unmap_status[io / 64] |= 1ull << (io & 63);
-					iomap_table.io[ea].release(-1);
-					iomap_table.ea[io].release(-1);
-				}
-			}
+					io >>= 20;
 
-			auto& cfg = g_fxo->get<gcm_config>();
+					auto& cfg = g_fxo->get<gcm_config>();
+					std::lock_guard lock(cfg.gcmio_mutex);
 
-			std::unique_lock<shared_mutex> hle_lock;
-
-			for (u32 i = 0; i < std::size(unmap_status); i++)
-			{
-				// TODO: Check order when sending multiple events
-				if (u64 to_unmap = unmap_status[i])
-				{
-					if (isHLE)
+					for (const u32 end = ea + (size >> 20); ea < end;)
 					{
-						if (!hle_lock)
-						{
-							hle_lock = std::unique_lock{cfg.gcmio_mutex};
-						}
-
-						int bit = 0;
-
-						while (to_unmap)
-						{
-							bit = (std::countr_zero<u64>(utils::rol64(to_unmap, 0 - bit)) + bit);
-							to_unmap &= ~(1ull << bit);
-
-							constexpr u16 null_entry = 0xFFFF;
-							const u32 ea = std::exchange(cfg.offsetTable.eaAddress[(i * 64 + bit)], null_entry);
-
-							if (ea < (rsx::constants::local_mem_base >> 20))
-							{
-								cfg.offsetTable.eaAddress[ea] = null_entry;
-							}
-						}
-
-						continue;
+						cfg.offsetTable.ioAddress[ea++] = 0xFFFF;
+						cfg.offsetTable.eaAddress[io++] = 0xFFFF;
 					}
-
-					// Each 64 entries are grouped by a bit
-					const u64 io_event = SYS_RSX_EVENT_UNMAPPED_BASE << i;
-					event_data.emplace_back(io_event, to_unmap);
 				}
 			}
 
-			if (hle_lock)
-			{
-				hle_lock.unlock();
-			}
-
-			// Pause RSX thread momentarily to handle unmapping
-			eng_lock elock(this);
-
 			// Queue up memory invalidation
 			std::lock_guard lock(m_mtx_task);
 			const bool existing_range_valid = m_invalidated_memory_range.valid();
-			const auto unmap_range = address_range32::start_length(address, size);
+			const auto unmap_range = address_range::start_length(address, size);
 
 			if (existing_range_valid && m_invalidated_memory_range.touches(unmap_range))
 			{
@@ -2936,62 +2812,29 @@ namespace rsx
 
 				m_invalidated_memory_range = unmap_range;
 			}
-
-			m_eng_interrupt_mask |= rsx::memory_config_interrupt;
-		}
-	}
-
-	void thread::on_notify_post_memory_unmapped(u64 event_data1, u64 event_data2)
-	{
-		if (!isHLE)
-		{
-			send_event(0, event_data1, event_data2);
 		}
 	}
 
 	// NOTE: m_mtx_task lock must be acquired before calling this method
 	void thread::handle_invalidated_memory_range()
 	{
-		AUDIT(!m_mtx_task.is_free());
-		m_eng_interrupt_mask.clear(rsx::memory_config_interrupt);
-
 		if (!m_invalidated_memory_range.valid())
-		{
 			return;
-		}
-
-		if (is_stopped())
-		{
-			// We only need to commit host-resident memory to the guest in case of savestates or captures.
-			on_invalidate_memory_range(m_invalidated_memory_range, rsx::invalidation_cause::read);
-		}
-
-		// Host sync
-		rsx::mm_flush();
 
 		on_invalidate_memory_range(m_invalidated_memory_range, rsx::invalidation_cause::unmap);
 		m_invalidated_memory_range.invalidate();
 	}
 
-	void thread::renderctl(u32 request_code, void* /*args*/)
-	{
-		switch (request_code)
-		{
-		case rsx::mm_backend_ctrl::cmd_mm_flush:
-			rsx::mm_flush();
-			break;
-		default:
-			fmt::throw_exception("Unknown backend request: 0x%x", request_code);
-		}
-	}
-
 	//Pause/cont wrappers for FIFO ctrl. Never call this from rsx thread itself!
 	void thread::pause()
 	{
 		external_interrupt_lock++;
 
-		while (!external_interrupt_ack && !is_stopped())
+		while (!external_interrupt_ack)
 		{
+			if (Emu.IsStopped())
+				break;
+
 			utils::pause();
 		}
 	}
@@ -3013,7 +2856,7 @@ namespace rsx
 
 			external_interrupt_ack.store(true);
 
-			while (external_interrupt_lock && (cpu_flag::ret - state))
+			while (external_interrupt_lock)
 			{
 				// TODO: Investigate non busy-spinning method
 				utils::pause();
@@ -3021,12 +2864,12 @@ namespace rsx
 
 			external_interrupt_ack.store(false);
 		}
-		while (external_interrupt_lock && (cpu_flag::ret - state));
+		while (external_interrupt_lock);
 	}
 
 	u32 thread::get_load()
 	{
-		// Average load over around 30 frames
+		//Average load over around 30 frames
 		if (!performance_counters.last_update_timestamp || performance_counters.sampled_frames > 30)
 		{
 			const auto timestamp = get_system_time();
@@ -3048,11 +2891,6 @@ namespace rsx
 
 	void thread::on_frame_end(u32 buffer, bool forced)
 	{
-		bool pause_emulator = false;
-
-		// MM sync. This is a pre-emptive operation, so we can use a deferred request.
-		rsx::mm_flush_lazy();
-
 		// Marks the end of a frame scope GPU-side
 		if (g_user_asked_for_frame_capture.exchange(false) && !capture_current_frame)
 		{
@@ -3073,34 +2911,27 @@ namespace rsx
 		{
 			capture_current_frame = false;
 
-			std::string file_path = fs::get_config_dir() + "captures/" + Emu.GetTitleID() + "_" + date_time::current_time_narrow() + "_capture.rrc.gz";
+			const std::string file_path = fs::get_config_dir() + "captures/" + Emu.GetTitleID() + "_" + date_time::current_time_narrow() + "_capture.rrc";
+
+			// todo: may want to compress this data?
+			utils::serial save_manager;
+			save_manager.reserve(0x800'0000); // 128MB
+
+			save_manager(frame_capture);
 
 			fs::pending_file temp(file_path);
 
-			utils::serial save_manager;
-
-			if (temp.file)
+			if (temp.file && (temp.file.write(save_manager.data), temp.commit(false)))
 			{
-				save_manager.m_file_handler = make_compressed_serialization_file_handler(temp.file);
-				save_manager(frame_capture);
-
-				save_manager.m_file_handler->finalize(save_manager);
-
-				if (temp.commit(false))
-				{
-					rsx_log.success("Capture successful: %s", file_path);
-					frame_capture.reset();
-					pause_emulator = true;
-				}
-				else
-				{
-					rsx_log.error("Capture failed: %s (%s)", file_path, fs::g_tls_error);
-				}
+				rsx_log.success("Capture successful: %s", file_path);
 			}
 			else
 			{
 				rsx_log.fatal("Capture failed: %s (%s)", file_path, fs::g_tls_error);
 			}
+
+			frame_capture.reset();
+			Emu.Pause();
 		}
 
 		if (zcull_ctrl->has_pending())
@@ -3150,51 +2981,12 @@ namespace rsx
 			}
 		}
 
-		if (pause_emulator)
-		{
-			Emu.Pause();
-			thread_ctrl::wait_for(30'000);
-		}
-
 		// Reset current stats
 		m_frame_stats = {};
-		m_profiler.enabled = !!g_cfg.video.debug_overlay;
+		m_profiler.enabled = !!g_cfg.video.overlay;
 	}
 
-	f64 thread::get_cached_display_refresh_rate()
-	{
-		constexpr u64 uses_per_query = 512;
-
-		f64 result = m_cached_display_rate;
-		u64 count = m_display_rate_fetch_count++;
-
-		while (true)
-		{
-			if (count % 512 == 0)
-			{
-				result = get_display_refresh_rate();
-				m_cached_display_rate.store(result);
-				m_display_rate_fetch_count += uses_per_query; // Notify users of the new value
-				break;
-			}
-
-			const u64 new_count = m_display_rate_fetch_count;
-			const f64 new_cached = m_cached_display_rate;
-
-			if (result == new_cached && count / uses_per_query == new_count / uses_per_query)
-			{
-				break;
-			}
-
-			// An update might have gone through
-			count = new_count;
-			result = new_cached;
-		}
-
-		return result;
-	}
-
-	bool thread::request_emu_flip(u32 buffer)
+	void thread::request_emu_flip(u32 buffer)
 	{
 		if (is_current_thread()) // requested through command buffer
 		{
@@ -3206,22 +2998,12 @@ namespace rsx
 			if (async_flip_requested & flip_request::emu_requested)
 			{
 				// ignore multiple requests until previous happens
-				return true;
+				return;
 			}
 
 			async_flip_buffer = buffer;
 			async_flip_requested |= flip_request::emu_requested;
-
-			m_eng_interrupt_mask |= rsx::display_interrupt;
-
-			if (state & cpu_flag::exit)
-			{
-				// Resubmit possibly-ignored flip on savestate load
-				return false;
-			}
 		}
-
-		return true;
 	}
 
 	void thread::handle_emu_flip(u32 buffer)
@@ -3240,334 +3022,906 @@ namespace rsx
 		}
 
 		double limit = 0.;
-		const auto frame_limit = g_disable_frame_limit ? frame_limit_type::none : g_cfg.video.frame_limit;
-
-		switch (frame_limit)
+		switch (g_cfg.video.frame_limit)
 		{
-		case frame_limit_type::none: limit = g_cfg.core.max_cpu_preempt_count_per_frame ? static_cast<double>(g_cfg.video.vblank_rate) : 0.; break;
-		case frame_limit_type::_30: limit = 30.; break;
+		case frame_limit_type::none: limit = 0.; break;
+		case frame_limit_type::_59_94: limit = 59.94; break;
 		case frame_limit_type::_50: limit = 50.; break;
 		case frame_limit_type::_60: limit = 60.; break;
- 		case frame_limit_type::_120: limit = 120.; break;
-		case frame_limit_type::display_rate: limit = get_cached_display_refresh_rate(); break;
+		case frame_limit_type::_30: limit = 30.; break;
 		case frame_limit_type::_auto: limit = static_cast<double>(g_cfg.video.vblank_rate); break;
-		case frame_limit_type::_ps3: limit = 0.; break;
-		case frame_limit_type::infinite: limit = 0.; break;
 		default:
 			break;
 		}
 
-		if (double limit2 = g_cfg.video.second_frame_limit; limit2 >= 0.1 && (limit2 < limit || !limit))
-		{
-			// Apply a second limit
-			limit = limit2;
-		}
-
 		if (limit)
 		{
+			const u64 time = get_system_time() - Emu.GetPauseTime();
 			const u64 needed_us = static_cast<u64>(1000000 / limit);
-			const u64 time = std::max<u64>(get_system_time(), target_rsx_flip_time > needed_us ? target_rsx_flip_time - needed_us : 0);
 
-			if (int_flip_index)
+			if (int_flip_index == 0)
 			{
+				target_rsx_flip_time = time;
+			}
+			else
+			{
+				do
+				{
+					target_rsx_flip_time += needed_us;
+				}
+				while (time >= target_rsx_flip_time + needed_us);
+
 				if (target_rsx_flip_time > time + 1000)
 				{
 					const auto delay_us = target_rsx_flip_time - time;
-					lv2_obj::wait_timeout(delay_us, nullptr, false);
+					lv2_obj::wait_timeout<false, false>(delay_us);
+
+					if (thread_ctrl::state() == thread_state::aborting)
+					{
+						return;
+					}
+
 					performance_counters.idle_time += delay_us;
 				}
 			}
-
-			target_rsx_flip_time = std::max(time, target_rsx_flip_time) + needed_us;
-			flip_notification_count = 1;
-		}
-		else if (frame_limit == frame_limit_type::_ps3)
-		{
-			bool exit = false;
-
-			if (vblank_at_flip == umax)
-			{
-				vblank_at_flip = +vblank_count;
-				flip_notification_count = 1;
-				exit = true;
-			}
-
-			if (requested_vsync && (exit || vblank_at_flip == vblank_count))
-			{
-				// Not yet signaled, handle it later
-				async_flip_requested |= flip_request::emu_requested;
-				async_flip_buffer = buffer;
-				return;
-			}
-
-			vblank_at_flip = umax;
-		}
-		else
-		{
-			flip_notification_count = 1;
 		}
 
-		int_flip_index += flip_notification_count;
+		int_flip_index++;
 
 		current_display_buffer = buffer;
 		m_queued_flip.emu_flip = true;
 		m_queued_flip.in_progress = true;
-		m_queued_flip.skip_frame |= g_cfg.video.disable_video_output && !g_cfg.video.perf_overlay.perf_overlay_enabled;
 
 		flip(m_queued_flip);
 
-		last_guest_flip_timestamp = get_system_time() - 1000000;
+		last_flip_time = get_system_time() - 1000000;
 		flip_status = CELL_GCM_DISPLAY_FLIP_STATUS_DONE;
 		m_queued_flip.in_progress = false;
 
-		while (flip_notification_count--)
+		if (!isHLE)
 		{
-			if (!isHLE)
-			{
-				sys_rsx_context_attribute(0x55555555, 0xFEC, buffer, 0, 0, 0);
-
-				if (unsent_gcm_events)
-				{
-					// TODO: A proper fix
-					return;
-				}
-
-				continue;
-			}
-
-			if (auto ptr = flip_handler)
-			{
-				intr_thread->cmd_list
-				({
-					{ ppu_cmd::set_args, 1 }, u64{ 1 },
-					{ ppu_cmd::lle_call, ptr },
-					{ ppu_cmd::sleep, 0 }
-				});
-
-				intr_thread->cmd_notify.store(1);
-				intr_thread->cmd_notify.notify_one();
-			}
-		}
-	}
-
-	void thread::evaluate_cpu_usage_reduction_limits()
-	{
-		const u64 max_preempt_count = g_cfg.core.max_cpu_preempt_count_per_frame;
-
-		if (!max_preempt_count)
-		{
-			frame_times.clear();
-			lv2_obj::set_yield_frequency(0, 0);
+			sys_rsx_context_attribute(0x55555555, 0xFEC, buffer, 0, 0, 0);
 			return;
 		}
 
-		const u64 current_time = get_system_time();
-		const u64 current_tsc = utils::get_tsc();
-		u64 preempt_count = 0;
-
-		if (frame_times.size() >= 60)
+		if (flip_handler)
 		{
-			u64 diffs = 0;
+			intr_thread->cmd_list
+			({
+				{ ppu_cmd::set_args, 1 }, u64{ 1 },
+				{ ppu_cmd::lle_call, flip_handler },
+				{ ppu_cmd::sleep, 0 }
+			});
 
-			for (usz i = 1; i < frame_times.size(); i++)
+			intr_thread->cmd_notify++;
+			intr_thread->cmd_notify.notify_one();
+		}
+	}
+
+
+	namespace reports
+	{
+		ZCULL_control::ZCULL_control()
+		{
+			for (auto& query : m_occlusion_query_data)
 			{
-				const u64 cur_diff = frame_times[i].timestamp - frame_times[i - 1].timestamp;
-				diffs += cur_diff;
+				m_free_occlusion_pool.push(&query);
 			}
+		}
 
-			const usz avg_frame_time = diffs / 59;
+		ZCULL_control::~ZCULL_control()
+		{}
 
-			u32 lowered_delay = 0;
-			u32 raised_delay = 0;
-			bool can_reevaluate = true;
-			u64 prev_preempt_count = umax;
-
-			for (usz i = frame_times.size() - 30; i < frame_times.size(); i++)
+		void ZCULL_control::set_active(class ::rsx::thread* ptimer, bool state, bool flush_queue)
+		{
+			if (state != host_queries_active)
 			{
-				if (prev_preempt_count == umax)
+				host_queries_active = state;
+
+				if (state)
 				{
-					prev_preempt_count = frame_times[i].preempt_count;
-					continue;
-				}
-
-				if (prev_preempt_count != frame_times[i].preempt_count)
-				{
-					if (prev_preempt_count > frame_times[i].preempt_count)
-					{
-						lowered_delay++;
-					}
-					else if (prev_preempt_count < frame_times[i].preempt_count)
-					{
-						raised_delay++;
-					}
-
-					if (i > frame_times.size() - 30)
-					{
-						// Slow preemption count increase
-						can_reevaluate = false;
-					}
-				}
-
-				prev_preempt_count = frame_times[i].preempt_count;
-			}
-
-			preempt_count = std::min<u64>(frame_times.back().preempt_count, max_preempt_count);
-
-			u32 fails = 0;
-			u32 hard_fails = 0;
-			bool is_last_frame_a_fail = false;
-
-			auto abs_dst = [](u64 a, u64 b)
-			{
-				return a >= b ? a - b : b - a;
-			};
-
-			for (u32 i = 1; i <= frame_times.size(); i++)
-			{
-				const u64 cur_diff = (i == frame_times.size() ? current_time : frame_times[i].timestamp) - frame_times[i - 1].timestamp;
-
-				if (const u64 diff_of_diff = abs_dst(cur_diff, avg_frame_time);
-					diff_of_diff >= avg_frame_time / 7)
-				{
-					if (diff_of_diff >= avg_frame_time / 3)
-					{
-						raised_delay++;
-						hard_fails++;
-
-						if (i == frame_times.size())
-						{
-							is_last_frame_a_fail = true;
-						}
-					}
-
-					if (fails != umax)
-					{
-						fails++;
-					}
-				}
-			}
-
-			bool hard_measures_taken = false;
-			const usz fps_10 = 10'000'000 / avg_frame_time;
-
-			auto lower_preemption_count = [&]()
-			{
-				if (preempt_count >= 10)
-				{
-					preempt_count -= 10;
+					ensure(unit_enabled && m_current_task == nullptr);
+					allocate_new_query(ptimer);
+					begin_occlusion_query(m_current_task);
 				}
 				else
 				{
-					preempt_count = 0;
-				}
-
-				if ((hard_fails > 2 || fails > 20) && is_last_frame_a_fail)
-				{
-					hard_measures_taken = preempt_count > 1;
-					preempt_count = preempt_count * 7 / 8;
-					prevent_preempt_increase_tickets = 10;
-				}
-				else
-				{
-					prevent_preempt_increase_tickets = std::max<u32>(7, prevent_preempt_increase_tickets);
-				}
-			};
-
-			const u64 vblank_rate_10 = g_cfg.video.vblank_rate * 10;
-
-			if (can_reevaluate)
-			{
-				const bool is_avg_fps_ok = (abs_dst(fps_10, 300) < 3 || abs_dst(fps_10, 600) < 4 || abs_dst(fps_10, vblank_rate_10) < 4 || abs_dst(fps_10, vblank_rate_10 / 2) < 3);
-
-				if (!hard_fails && fails < 6 && is_avg_fps_ok)
-				{
-					if (prevent_preempt_increase_tickets)
+					ensure(m_current_task);
+					if (m_current_task->num_draws)
 					{
-						prevent_preempt_increase_tickets--;
+						end_occlusion_query(m_current_task);
+						m_current_task->active = false;
+						m_current_task->pending = true;
+						m_current_task->sync_tag = m_timer++;
+						m_current_task->timestamp = m_tsc;
+
+						m_pending_writes.push_back({});
+						m_pending_writes.back().query = m_current_task;
+						ptimer->async_tasks_pending++;
 					}
 					else
 					{
-						preempt_count = std::min<u64>(preempt_count + 4, max_preempt_count);
+						discard_occlusion_query(m_current_task);
+						free_query(m_current_task);
+						m_current_task->active = false;
 					}
+
+					m_current_task = nullptr;
+					update(ptimer, 0u, flush_queue);
 				}
-				else
+			}
+		}
+
+		void ZCULL_control::check_state(class ::rsx::thread* ptimer, bool flush_queue)
+		{
+			// NOTE: Only enable host queries if pixel count is active to save on resources
+			// Can optionally be enabled for either stats enabled or zpass enabled for accuracy
+			const bool data_stream_available = write_enabled && (zpass_count_enabled /*|| stats_enabled*/);
+			if (host_queries_active && !data_stream_available)
+			{
+				// Stop
+				set_active(ptimer, false, flush_queue);
+			}
+			else if (!host_queries_active && data_stream_available && unit_enabled)
+			{
+				// Start
+				set_active(ptimer, true, flush_queue);
+			}
+		}
+
+		void ZCULL_control::set_enabled(class ::rsx::thread* ptimer, bool state, bool flush_queue)
+		{
+			if (state != unit_enabled)
+			{
+				unit_enabled = state;
+				check_state(ptimer, flush_queue);
+			}
+		}
+
+		void ZCULL_control::set_status(class ::rsx::thread* ptimer, bool surface_active, bool zpass_active, bool zcull_stats_active, bool flush_queue)
+		{
+			write_enabled = surface_active;
+			zpass_count_enabled = zpass_active;
+			stats_enabled = zcull_stats_active;
+
+			check_state(ptimer, flush_queue);
+
+			// Disabled since only ZPASS is implemented right now
+			if (false) //(m_current_task && m_current_task->active)
+			{
+				// Data check
+				u32 expected_type = 0;
+				if (zpass_active) expected_type |= CELL_GCM_ZPASS_PIXEL_CNT;
+				if (zcull_stats_active) expected_type |= CELL_GCM_ZCULL_STATS;
+
+				if (m_current_task->data_type != expected_type) [[unlikely]]
 				{
-					lower_preemption_count();
+					rsx_log.error("ZCULL queue interrupted by data type change!");
+
+					// Stop+start the current setup
+					set_active(ptimer, false, false);
+					set_active(ptimer, true, false);
 				}
 			}
-			// Sudden FPS drop detection
-			else if ((fails > 13 || hard_fails > 2 || !(abs_dst(fps_10, 300) < 20 || abs_dst(fps_10, 600) < 30 || abs_dst(fps_10, g_cfg.video.vblank_rate * 10) < 30 || abs_dst(fps_10, g_cfg.video.vblank_rate * 10 / 2) < 20)) && lowered_delay < raised_delay && is_last_frame_a_fail)
-			{
-				lower_preemption_count();
-			}
+		}
 
-			perf_log.trace("CPU preemption control: reeval=%d, preempt_count=%llu, fails=%u, hard=%u, avg_frame_time=%llu, highered=%u, lowered=%u, taken=%u", can_reevaluate, preempt_count, fails, hard_fails, avg_frame_time, raised_delay, lowered_delay, ::g_lv2_preempts_taken.load());
+		void ZCULL_control::read_report(::rsx::thread* ptimer, vm::addr_t sink, u32 type)
+		{
+			if (m_current_task && type == CELL_GCM_ZPASS_PIXEL_CNT)
+			{
+				m_current_task->owned = true;
+				end_occlusion_query(m_current_task);
+				m_pending_writes.push_back({});
 
-			if (hard_measures_taken)
-			{
-				preempt_fail_old_preempt_count = std::max<u64>(preempt_fail_old_preempt_count, std::min<u64>(frame_times.back().preempt_count, max_preempt_count));
-			}
-			else if (preempt_fail_old_preempt_count)
-			{
-				perf_log.error("Lowering current preemption count significantly due to a performance drop, if this issue persists frequently consider lowering max preemptions count to 'new-count' or lower. (old-count=%llu, new-count=%llu)", preempt_fail_old_preempt_count, preempt_count);
-				preempt_fail_old_preempt_count = 0;
-			}
+				m_current_task->active = false;
+				m_current_task->pending = true;
+				m_current_task->timestamp = m_tsc;
+				m_current_task->sync_tag = m_timer++;
+				m_pending_writes.back().query = m_current_task;
 
-			const u64 tsc_diff = (current_tsc - frame_times.back().tsc);
-			const u64 time_diff = (current_time - frame_times.back().timestamp);
-			const u64 preempt_diff = tsc_diff * (1'000'000 / 30) / (time_diff * std::max<u64>(preempt_count, 1ull));
-
-			if (!preempt_count)
-			{
-				lv2_obj::set_yield_frequency(0, 0);
-			}
-			else if (abs_dst(fps_10, 300) < 30)
-			{
-				// Set an upper limit so a backoff technique would be taken if there is a sudden performance drop
-				// Allow 4% of no yield to reduce significantly the risk of stutter
-				lv2_obj::set_yield_frequency(preempt_diff, current_tsc + (tsc_diff * (1'000'000 * 96 / (30 * 100)) / time_diff));
-			}
-			else if (abs_dst(fps_10, 600) < 40)
-			{
-				// 5% for 60fps
-				lv2_obj::set_yield_frequency(preempt_diff, current_tsc + (tsc_diff * (1'000'000 * 94 / (60 * 100)) / time_diff));
-			}
-			else if (abs_dst(fps_10, vblank_rate_10) < 40)
-			{
-				lv2_obj::set_yield_frequency(preempt_diff, current_tsc + (tsc_diff * (1'000'000 * 94 / (vblank_rate_10 * 10)) / time_diff));
-			}
-			else if (abs_dst(fps_10, vblank_rate_10 / 2) < 30)
-			{
-				lv2_obj::set_yield_frequency(preempt_diff, current_tsc + (tsc_diff * (1'000'000 * 96 / ((vblank_rate_10 / 2) * 10)) / time_diff));
+				allocate_new_query(ptimer);
+				begin_occlusion_query(m_current_task);
 			}
 			else
 			{
-				// Undetected case, last 12% is with no yield
-				lv2_obj::set_yield_frequency(preempt_diff, current_tsc + (tsc_diff * 88 / 100));
+				// Spam; send null query down the pipeline to copy the last result
+				// Might be used to capture a timestamp (verify)
+
+				if (m_pending_writes.empty())
+				{
+					// No need to queue this if there is no pending request in the pipeline anyway
+					write(sink, ptimer->timestamp(), type, m_statistics_map[m_statistics_tag_id]);
+					return;
+				}
+
+				m_pending_writes.push_back({});
 			}
 
-			frame_times.pop_front();
+			auto forwarder = &m_pending_writes.back();
+			for (auto It = m_pending_writes.rbegin(); It != m_pending_writes.rend(); It++)
+			{
+				if (!It->sink)
+				{
+					It->counter_tag = m_statistics_tag_id;
+					It->sink = sink;
+					It->type = type;
+
+					if (forwarder != &(*It))
+					{
+						// Not the last one in the chain, forward the writing operation to the last writer
+						// Usually comes from truncated queries caused by disabling the testing
+						ensure(It->query);
+
+						It->forwarder = forwarder;
+						It->query->owned = true;
+					}
+
+					continue;
+				}
+
+				break;
+			}
+
+			ptimer->async_tasks_pending++;
+
+			if (m_statistics_map[m_statistics_tag_id] != 0)
+			{
+				// Flush guaranteed results; only one positive is needed
+				update(ptimer);
+			}
 		}
-		else
+
+		void ZCULL_control::allocate_new_query(::rsx::thread* ptimer)
 		{
-			lv2_obj::set_yield_frequency(0, 0);
+			int retries = 0;
+			while (true)
+			{
+				if (!m_free_occlusion_pool.empty())
+				{
+					m_current_task = m_free_occlusion_pool.top();
+					m_free_occlusion_pool.pop();
+
+					m_current_task->data_type = 0;
+					m_current_task->num_draws = 0;
+					m_current_task->result = 0;
+					m_current_task->active = true;
+					m_current_task->owned = false;
+					m_current_task->sync_tag = 0;
+					m_current_task->timestamp = 0;
+
+					// Flags determine what kind of payload is carried by queries in the 'report'
+					if (zpass_count_enabled) m_current_task->data_type |= CELL_GCM_ZPASS_PIXEL_CNT;
+					if (stats_enabled) m_current_task->data_type |= CELL_GCM_ZCULL_STATS;
+
+					return;
+				}
+
+				if (retries > 0)
+				{
+					fmt::throw_exception("Allocation failed!");
+				}
+
+				// All slots are occupied, try to pop the earliest entry
+
+				if (!m_pending_writes.front().query)
+				{
+					// If this happens, the assert above will fire. There should never be a queue header with no work to be done
+					rsx_log.error("Close to our death.");
+				}
+
+				m_next_tsc = 0;
+				update(ptimer, m_pending_writes.front().sink);
+
+				retries++;
+			}
 		}
 
-		frame_times.push_back(frame_time_t{preempt_count, current_time, current_tsc});
-	}
-
-	void vblank_thread::set_thread(std::shared_ptr<named_thread<std::function<void()>>> thread)
-	{
-		std::swap(m_thread, thread);
-	}
-
-	vblank_thread& vblank_thread::operator=(thread_state state)
-	{
-		if (m_thread)
+		void ZCULL_control::free_query(occlusion_query_info* query)
 		{
-			*m_thread = state;
+			query->pending = false;
+			m_free_occlusion_pool.push(query);
 		}
 
-		return *this;
+		void ZCULL_control::clear(class ::rsx::thread* ptimer, u32 type)
+		{
+			if (!(type & CELL_GCM_ZPASS_PIXEL_CNT))
+			{
+				// Other types do not generate queries at the moment
+				return;
+			}
+
+			if (!m_pending_writes.empty())
+			{
+				//Remove any dangling/unclaimed queries as the information is lost anyway
+				auto valid_size = m_pending_writes.size();
+				for (auto It = m_pending_writes.rbegin(); It != m_pending_writes.rend(); ++It)
+				{
+					if (!It->sink)
+					{
+						discard_occlusion_query(It->query);
+						free_query(It->query);
+						valid_size--;
+						ptimer->async_tasks_pending--;
+						continue;
+					}
+
+					break;
+				}
+
+				m_pending_writes.resize(valid_size);
+			}
+
+			m_statistics_tag_id++;
+			m_statistics_map[m_statistics_tag_id] = 0;
+		}
+
+		void ZCULL_control::on_draw()
+		{
+			if (m_current_task)
+			{
+				m_current_task->num_draws++;
+				m_current_task->sync_tag = m_timer++;
+			}
+		}
+
+		void ZCULL_control::on_sync_hint(void* args)
+		{
+			auto query = static_cast<occlusion_query_info*>(args);
+			m_sync_tag = std::max(m_sync_tag, query->sync_tag);
+		}
+
+		void ZCULL_control::write(vm::addr_t sink, u64 timestamp, u32 type, u32 value)
+		{
+			ensure(sink);
+
+			switch (type)
+			{
+			case CELL_GCM_ZPASS_PIXEL_CNT:
+				value = value ? u16{umax} : 0;
+				break;
+			case CELL_GCM_ZCULL_STATS3:
+				value = value ? 0 : u16{umax};
+				break;
+			case CELL_GCM_ZCULL_STATS2:
+			case CELL_GCM_ZCULL_STATS1:
+			case CELL_GCM_ZCULL_STATS:
+			default:
+				//Not implemented
+				value = -1;
+				break;
+			}
+
+			rsx::reservation_lock<true> lock(sink, 16);
+			vm::_ref<atomic_t<CellGcmReportData>>(sink).store({ timestamp, value, 0});
+		}
+
+		void ZCULL_control::write(queued_report_write* writer, u64 timestamp, u32 value)
+		{
+			write(writer->sink, timestamp, writer->type, value);
+
+			for (auto &addr : writer->sink_alias)
+			{
+				write(addr, timestamp, writer->type, value);
+			}
+		}
+
+		void ZCULL_control::retire(::rsx::thread* ptimer, queued_report_write* writer, u32 result)
+		{
+			if (!writer->forwarder)
+			{
+				// No other queries in the chain, write result
+				const auto value = (writer->type == CELL_GCM_ZPASS_PIXEL_CNT) ? m_statistics_map[writer->counter_tag] : result;
+				write(writer, ptimer->timestamp(), value);
+			}
+
+			if (writer->query && writer->query->sync_tag == ptimer->cond_render_ctrl.eval_sync_tag)
+			{
+				bool eval_failed;
+				if (!writer->forwarder) [[likely]]
+				{
+					// Normal evaluation
+					eval_failed = (result == 0u);
+				}
+				else
+				{
+					// Eval was inserted while ZCULL was active but not enqueued to write to memory yet
+					// write(addr) -> enable_zpass_stats -> eval_condition -> write(addr)
+					// In this case, use what already exists in memory, not the current counter
+					eval_failed = (vm::_ref<CellGcmReportData>(writer->sink).value == 0u);
+				}
+
+				ptimer->cond_render_ctrl.set_eval_result(ptimer, eval_failed);
+			}
+		}
+
+		void ZCULL_control::sync(::rsx::thread* ptimer)
+		{
+			if (!m_pending_writes.empty())
+			{
+				// Quick reverse scan to push commands ahead of time
+				for (auto It = m_pending_writes.rbegin(); It != m_pending_writes.rend(); ++It)
+				{
+					if (It->query && It->query->num_draws)
+					{
+						if (It->query->sync_tag > m_sync_tag)
+						{
+							// rsx_log.trace("[Performance warning] Query hint emit during sync command.");
+							ptimer->sync_hint(FIFO_hint::hint_zcull_sync, It->query);
+						}
+
+						break;
+					}
+				}
+
+				u32 processed = 0;
+				const bool has_unclaimed = (m_pending_writes.back().sink == 0);
+
+				// Write all claimed reports unconditionally
+				for (auto &writer : m_pending_writes)
+				{
+					if (!writer.sink)
+						break;
+
+					auto query = writer.query;
+					u32 result = m_statistics_map[writer.counter_tag];
+
+					if (query)
+					{
+						ensure(query->pending);
+
+						const bool implemented = (writer.type == CELL_GCM_ZPASS_PIXEL_CNT || writer.type == CELL_GCM_ZCULL_STATS3);
+						if (implemented && !result && query->num_draws)
+						{
+							get_occlusion_query_result(query);
+
+							if (query->result)
+							{
+								result += query->result;
+								if (query->data_type & CELL_GCM_ZPASS_PIXEL_CNT)
+								{
+									m_statistics_map[writer.counter_tag] += query->result;
+								}
+							}
+						}
+						else
+						{
+							//Already have a hit, no need to retest
+							discard_occlusion_query(query);
+						}
+
+						free_query(query);
+					}
+
+					retire(ptimer, &writer, result);
+					processed++;
+				}
+
+				if (!has_unclaimed)
+				{
+					ensure(processed == m_pending_writes.size());
+					m_pending_writes.clear();
+				}
+				else
+				{
+					auto remaining = m_pending_writes.size() - processed;
+					ensure(remaining > 0);
+
+					if (remaining == 1)
+					{
+						m_pending_writes[0] = std::move(m_pending_writes.back());
+						m_pending_writes.resize(1);
+					}
+					else
+					{
+						std::move(m_pending_writes.begin() + processed, m_pending_writes.end(), m_pending_writes.begin());
+						m_pending_writes.resize(remaining);
+					}
+				}
+
+				//Delete all statistics caches but leave the current one
+				for (auto It = m_statistics_map.begin(); It != m_statistics_map.end(); )
+				{
+					if (It->first == m_statistics_tag_id)
+						++It;
+					else
+						It = m_statistics_map.erase(It);
+				}
+
+				//Decrement jobs counter
+				ptimer->async_tasks_pending -= processed;
+			}
+		}
+
+		void ZCULL_control::update(::rsx::thread* ptimer, u32 sync_address, bool hint)
+		{
+			if (m_pending_writes.empty())
+			{
+				return;
+			}
+
+			const auto& front = m_pending_writes.front();
+			if (!front.sink)
+			{
+				// No writables in queue, abort
+				return;
+			}
+
+			if (!sync_address)
+			{
+				if (hint || ptimer->async_tasks_pending + 0u >= max_safe_queue_depth)
+				{
+					// Prepare the whole queue for reading. This happens when zcull activity is disabled or queue is too long
+					for (auto It = m_pending_writes.rbegin(); It != m_pending_writes.rend(); ++It)
+					{
+						if (It->query)
+						{
+							if (It->query->num_draws && It->query->sync_tag > m_sync_tag)
+							{
+								ptimer->sync_hint(FIFO_hint::hint_zcull_sync, It->query);
+								ensure(It->query->sync_tag <= m_sync_tag);
+							}
+
+							break;
+						}
+					}
+				}
+
+				if (m_tsc = get_system_time(); m_tsc < m_next_tsc)
+				{
+					return;
+				}
+				else
+				{
+					// Schedule ahead
+					m_next_tsc = m_tsc + min_zcull_tick_us;
+
+					// Schedule a queue flush if needed
+					if (!g_cfg.video.relaxed_zcull_sync &&
+						front.query && front.query->num_draws && front.query->sync_tag > m_sync_tag)
+					{
+						const auto elapsed = m_tsc - front.query->timestamp;
+						if (elapsed > max_zcull_delay_us)
+						{
+							ptimer->sync_hint(FIFO_hint::hint_zcull_sync, front.query);
+							ensure(front.query->sync_tag <= m_sync_tag);
+						}
+
+						return;
+					}
+				}
+			}
+
+			u32 stat_tag_to_remove = m_statistics_tag_id;
+			u32 processed = 0;
+			for (auto &writer : m_pending_writes)
+			{
+				if (!writer.sink)
+					break;
+
+				if (writer.counter_tag != stat_tag_to_remove &&
+					stat_tag_to_remove != m_statistics_tag_id)
+				{
+					//If the stat id is different from this stat id and the queue is advancing,
+					//its guaranteed that the previous tag has no remaining writes as the queue is ordered
+					m_statistics_map.erase(stat_tag_to_remove);
+					stat_tag_to_remove = m_statistics_tag_id;
+				}
+
+				auto query = writer.query;
+				u32 result = m_statistics_map[writer.counter_tag];
+
+				const bool force_read = (sync_address != 0);
+				if (force_read && writer.sink == sync_address && !writer.forwarder)
+				{
+					// Forced reads end here
+					sync_address = 0;
+				}
+
+				if (query)
+				{
+					ensure(query->pending);
+
+					const bool implemented = (writer.type == CELL_GCM_ZPASS_PIXEL_CNT || writer.type == CELL_GCM_ZCULL_STATS3);
+					if (force_read)
+					{
+						if (implemented && !result && query->num_draws)
+						{
+							get_occlusion_query_result(query);
+
+							if (query->result)
+							{
+								result += query->result;
+								if (query->data_type & CELL_GCM_ZPASS_PIXEL_CNT)
+								{
+									m_statistics_map[writer.counter_tag] += query->result;
+								}
+							}
+						}
+						else
+						{
+							//No need to read this
+							discard_occlusion_query(query);
+						}
+					}
+					else
+					{
+						if (implemented && !result && query->num_draws)
+						{
+							//Maybe we get lucky and results are ready
+							if (check_occlusion_query_status(query))
+							{
+								get_occlusion_query_result(query);
+								if (query->result)
+								{
+									result += query->result;
+									if (query->data_type & CELL_GCM_ZPASS_PIXEL_CNT)
+									{
+										m_statistics_map[writer.counter_tag] += query->result;
+									}
+								}
+							}
+							else
+							{
+								//Too early; abort
+								break;
+							}
+						}
+						else
+						{
+							//Not necessary to read the result anymore
+							discard_occlusion_query(query);
+						}
+					}
+
+					free_query(query);
+				}
+
+				stat_tag_to_remove = writer.counter_tag;
+
+				retire(ptimer, &writer, result);
+				processed++;
+			}
+
+			if (stat_tag_to_remove != m_statistics_tag_id)
+				m_statistics_map.erase(stat_tag_to_remove);
+
+			if (processed)
+			{
+				auto remaining = m_pending_writes.size() - processed;
+				if (remaining == 1)
+				{
+					m_pending_writes[0] = std::move(m_pending_writes.back());
+					m_pending_writes.resize(1);
+				}
+				else if (remaining)
+				{
+					std::move(m_pending_writes.begin() + processed, m_pending_writes.end(), m_pending_writes.begin());
+					m_pending_writes.resize(remaining);
+				}
+				else
+				{
+					m_pending_writes.clear();
+				}
+
+				ptimer->async_tasks_pending -= processed;
+			}
+		}
+
+		flags32_t ZCULL_control::read_barrier(::rsx::thread* ptimer, u32 memory_address, u32 memory_range, flags32_t flags)
+		{
+			if (m_pending_writes.empty())
+				return result_none;
+
+			const auto memory_end = memory_address + memory_range;
+
+			AUDIT(memory_end >= memory_address);
+
+			u32 sync_address = 0;
+			occlusion_query_info* query = nullptr;
+
+			for (auto It = m_pending_writes.crbegin(); It != m_pending_writes.crend(); ++It)
+			{
+				if (sync_address)
+				{
+					if (It->query)
+					{
+						sync_address = It->sink;
+						query = It->query;
+						break;
+					}
+
+					continue;
+				}
+
+				if (It->sink >= memory_address && It->sink < memory_end)
+				{
+					sync_address = It->sink;
+
+					// NOTE: If application is spamming requests, there may be no query attached
+					if (It->query)
+					{
+						query = It->query;
+						break;
+					}
+				}
+			}
+
+			if (!sync_address || !query)
+				return result_none;
+
+			if (!(flags & sync_defer_copy))
+			{
+				if (!(flags & sync_no_notify))
+				{
+					if (query->sync_tag > m_sync_tag) [[unlikely]]
+					{
+						ptimer->sync_hint(FIFO_hint::hint_zcull_sync, query);
+						ensure(m_sync_tag >= query->sync_tag);
+					}
+				}
+
+				// There can be multiple queries all writing to the same address, loop to flush all of them
+				while (query->pending && !Emu.IsStopped())
+				{
+					update(ptimer, sync_address);
+				}
+				return result_none;
+			}
+
+			return result_zcull_intr;
+		}
+
+		flags32_t ZCULL_control::read_barrier(class ::rsx::thread* ptimer, u32 memory_address, occlusion_query_info* query)
+		{
+			while (query->pending && !Emu.IsStopped())
+			{
+				update(ptimer, memory_address);
+			}
+
+			return result_none;
+		}
+
+		query_search_result ZCULL_control::find_query(vm::addr_t sink_address, bool all)
+		{
+			query_search_result result{};
+			u32 stat_id = 0;
+
+			for (auto It = m_pending_writes.crbegin(); It != m_pending_writes.crend(); ++It)
+			{
+				if (stat_id) [[unlikely]]
+				{
+					if (It->counter_tag != stat_id)
+					{
+						if (result.found)
+						{
+							// Some result was found, return it instead
+							break;
+						}
+
+						// Zcull stats were cleared between this query and the required stats, result can only be 0
+						return { true, 0, {} };
+					}
+
+					if (It->query && It->query->num_draws)
+					{
+						result.found = true;
+						result.queries.push_back(It->query);
+
+						if (!all)
+						{
+							break;
+						}
+					}
+				}
+				else if (It->sink == sink_address)
+				{
+					if (It->query && It->query->num_draws)
+					{
+						result.found = true;
+						result.queries.push_back(It->query);
+
+						if (!all)
+						{
+							break;
+						}
+					}
+
+					stat_id = It->counter_tag;
+				}
+			}
+
+			return result;
+		}
+
+		u32 ZCULL_control::copy_reports_to(u32 start, u32 range, u32 dest)
+		{
+			u32 bytes_to_write = 0;
+			const auto memory_range = utils::address_range::start_length(start, range);
+			for (auto &writer : m_pending_writes)
+			{
+				if (!writer.sink)
+					break;
+
+				if (!writer.forwarder && memory_range.overlaps(writer.sink))
+				{
+					u32 address = (writer.sink - start) + dest;
+					writer.sink_alias.push_back(vm::cast(address));
+				}
+			}
+
+			return bytes_to_write;
+		}
+
+
+		// Conditional rendering helpers
+		void conditional_render_eval::reset()
+		{
+			eval_address = 0;
+			eval_sync_tag = 0;
+			eval_sources.clear();
+
+			eval_failed = false;
+		}
+
+		bool conditional_render_eval::disable_rendering() const
+		{
+			return (enabled && eval_failed);
+		}
+
+		bool conditional_render_eval::eval_pending() const
+		{
+			return (enabled && eval_address);
+		}
+
+		void conditional_render_eval::enable_conditional_render(::rsx::thread* pthr, u32 address)
+		{
+			if (hw_cond_active)
+			{
+				ensure(enabled);
+				pthr->end_conditional_rendering();
+			}
+
+			reset();
+
+			enabled = true;
+			eval_address = address;
+		}
+
+		void conditional_render_eval::disable_conditional_render(::rsx::thread* pthr)
+		{
+			if (hw_cond_active)
+			{
+				ensure(enabled);
+				pthr->end_conditional_rendering();
+			}
+
+			reset();
+			enabled = false;
+		}
+
+		void conditional_render_eval::set_eval_sources(std::vector<occlusion_query_info*>& sources)
+		{
+			eval_sources = std::move(sources);
+			eval_sync_tag = eval_sources.front()->sync_tag;
+		}
+
+		void conditional_render_eval::set_eval_result(::rsx::thread* pthr, bool failed)
+		{
+			if (hw_cond_active)
+			{
+				ensure(enabled);
+				pthr->end_conditional_rendering();
+			}
+
+			reset();
+			eval_failed = failed;
+		}
+
+		void conditional_render_eval::eval_result(::rsx::thread* pthr)
+		{
+			vm::ptr<CellGcmReportData> result = vm::cast(eval_address);
+			const bool failed = (result->value == 0u);
+			set_eval_result(pthr, failed);
+		}
 	}
-} // namespace rsx
+}
diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h
index 73aacf360a..2d0262f038 100644
--- a/rpcs3/Emu/RSX/RSXThread.h
+++ b/rpcs3/Emu/RSX/RSXThread.h
@@ -1,16 +1,18 @@
 #pragma once
 
+#include <thread>
 #include <queue>
 #include <deque>
+#include <variant>
+#include <stack>
+#include <unordered_map>
 
+#include "GCM.h"
+#include "rsx_cache.h"
 #include "RSXFIFO.h"
 #include "RSXOffload.h"
-#include "RSXZCULL.h"
 #include "rsx_utils.h"
-#include "Common/bitfield.hpp"
-#include "Common/profiling_timer.hpp"
 #include "Common/texture_cache_types.h"
-#include "Common/TextureUtils.h"
 #include "Program/RSXVertexProgram.h"
 #include "Program/RSXFragmentProgram.h"
 
@@ -21,32 +23,79 @@
 
 #include "Emu/Cell/lv2/sys_rsx.h"
 #include "Emu/IdManager.h"
-
-#include "Core/RSXDisplay.h"
-#include "Core/RSXDrawCommands.h"
-#include "Core/RSXDriverState.h"
-#include "Core/RSXFrameBuffer.h"
-#include "Core/RSXContext.h"
-#include "Core/RSXVertexTypes.h"
-
-#include "NV47/FW/GRAPH_backend.h"
+#include "Emu/system_config.h"
 
 extern atomic_t<bool> g_user_asked_for_frame_capture;
-extern atomic_t<bool> g_disable_frame_limit;
 extern rsx::frame_trace_data frame_debug;
 extern rsx::frame_capture_data frame_capture;
 
 namespace rsx
 {
-	class RSXDMAWriter;
-
-	struct context;
-
 	namespace overlays
 	{
 		class display_manager;
 	}
 
+	struct rsx_iomap_table
+	{
+		std::array<atomic_t<u32>, 4096> ea;
+		std::array<atomic_t<u32>, 4096> io;
+		std::array<shared_mutex, 4096> rs{};
+
+		rsx_iomap_table() noexcept
+			: ea(fill_array(-1))
+			, io(fill_array(-1))
+		{
+		}
+
+		// Try to get the real address given a mapped address
+		// Returns -1 on failure
+		u32 get_addr(u32 offs) const noexcept
+		{
+			return this->ea[offs >> 20] | (offs & 0xFFFFF);
+		}
+
+		template<bool IsFullLock>
+		bool lock(u32 addr, u32 len) noexcept
+		{
+			if (len <= 1) return false;
+			const u32 end = addr + len - 1;
+
+			for (u32 block = (addr >> 20); block <= (end >> 20); ++block)
+			{
+				if constexpr (IsFullLock)
+				{
+					rs[block].lock();
+				}
+				else
+				{
+					rs[block].lock_shared();
+				}
+			}
+
+			return true;
+		}
+
+		template<bool IsFullLock>
+		void unlock(u32 addr, u32 len) noexcept
+		{
+			ensure(len >= 1);
+			const u32 end = addr + len - 1;
+
+			for (u32 block = (addr >> 20); block <= (end >> 20); ++block)
+			{
+				if constexpr (IsFullLock)
+				{
+					rs[block].unlock();
+				}
+				else
+				{
+					rs[block].unlock_shared();
+				}
+			}
+		}
+	};
+
 	enum framebuffer_creation_context : u8
 	{
 		context_draw = 0,
@@ -55,15 +104,49 @@ namespace rsx
 		context_clear_all = context_clear_color | context_clear_depth
 	};
 
-	enum eng_interrupt_reason : u32
+	enum pipeline_state : u32
 	{
-		backend_interrupt       = 0x0001,        // Backend-related interrupt
-		memory_config_interrupt = 0x0002,        // Memory configuration changed
-		display_interrupt       = 0x0004,        // Display handling
-		pipe_flush_interrupt    = 0x0008,        // Flush pipelines
-		dma_control_interrupt   = 0x0010,        // DMA interrupt
+		fragment_program_ucode_dirty = 0x1,   // Fragment program ucode changed
+		vertex_program_ucode_dirty = 0x2,     // Vertex program ucode changed
+		fragment_program_state_dirty = 0x4,   // Fragment program state changed
+		vertex_program_state_dirty = 0x8,     // Vertex program state changed
+		fragment_state_dirty = 0x10,          // Fragment state changed (alpha test, etc)
+		vertex_state_dirty = 0x20,            // Vertex state changed (scale_offset, clip planes, etc)
+		transform_constants_dirty = 0x40,     // Transform constants changed
+		fragment_constants_dirty = 0x80,      // Fragment constants changed
+		framebuffer_reads_dirty = 0x100,      // Framebuffer contents changed
+		fragment_texture_state_dirty = 0x200, // Fragment texture parameters changed
+		vertex_texture_state_dirty = 0x400,   // Fragment texture parameters changed
+		scissor_config_state_dirty = 0x800,   // Scissor region changed
+		zclip_config_state_dirty = 0x1000,    // Viewport Z clip changed
 
-		all_interrupt_bits = memory_config_interrupt | backend_interrupt | display_interrupt | pipe_flush_interrupt
+		scissor_setup_invalid = 0x2000,       // Scissor configuration is broken
+		scissor_setup_clipped = 0x4000,       // Scissor region is cropped by viewport constraint
+
+		polygon_stipple_pattern_dirty = 0x8000,  // Rasterizer stippling pattern changed
+		line_stipple_pattern_dirty = 0x10000,    // Line stippling pattern changed
+
+		fragment_program_dirty = fragment_program_ucode_dirty | fragment_program_state_dirty,
+		vertex_program_dirty = vertex_program_ucode_dirty | vertex_program_state_dirty,
+		invalidate_pipeline_bits = fragment_program_dirty | vertex_program_dirty,
+		invalidate_zclip_bits = vertex_state_dirty | zclip_config_state_dirty,
+		memory_barrier_bits = framebuffer_reads_dirty,
+		all_dirty = ~0u
+	};
+
+	enum FIFO_state : u8
+	{
+		running = 0,
+		empty = 1,    // PUT == GET
+		spinning = 2, // Puller continuously jumps to self addr (synchronization technique)
+		nop = 3,      // Puller is processing a NOP command
+		lock_wait = 4 // Puller is processing a lock acquire
+	};
+
+	enum FIFO_hint : u8
+	{
+		hint_conditional_render_eval = 1,
+		hint_zcull_sync = 2
 	};
 
 	enum result_flags: u8
@@ -73,63 +156,471 @@ namespace rsx
 		result_zcull_intr = 2
 	};
 
+	enum ROP_control : u32
+	{
+		alpha_test_enable       = (1u << 0),
+		framebuffer_srgb_enable = (1u << 1),
+		csaa_enable             = (1u << 4),
+		msaa_mask_enable        = (1u << 5),
+		msaa_config_mask        = (3u << 6),
+		polygon_stipple_enable  = (1u << 9),
+		alpha_func_mask         = (7u << 16)
+	};
+
 	u32 get_vertex_type_size_on_host(vertex_base_type type, u32 size);
 
-	u32 get_address(u32 offset, u32 location, u32 size_to_check = 0, std::source_location src_loc = std::source_location::current());
+	u32 get_address(u32 offset, u32 location, u32 size_to_check = 0,
+		u32 line = __builtin_LINE(),
+		u32 col = __builtin_COLUMN(),
+		const char* file = __builtin_FILE(),
+		const char* func = __builtin_FUNCTION());
+
+	struct tiled_region
+	{
+		u32 address;
+		u32 base;
+		GcmTileInfo *tile;
+		u8 *ptr;
+
+		void write(const void *src, u32 width, u32 height, u32 pitch);
+		void read(void *dst, u32 width, u32 height, u32 pitch);
+	};
+
+	struct vertex_array_buffer
+	{
+		rsx::vertex_base_type type;
+		u8 attribute_size;
+		u8 stride;
+		std::span<const std::byte> data;
+		u8 index;
+		bool is_be;
+	};
+
+	struct vertex_array_register
+	{
+		rsx::vertex_base_type type;
+		u8 attribute_size;
+		std::array<u32, 4> data;
+		u8 index;
+	};
+
+	struct empty_vertex_array
+	{
+		u8 index;
+	};
+
+	struct draw_array_command
+	{
+		u32 __dummy;
+	};
+
+	struct draw_indexed_array_command
+	{
+		std::span<const std::byte> raw_index_buffer;
+	};
+
+	struct draw_inlined_array
+	{
+		u32 __dummy;
+		u32 __dummy2;
+	};
+
+	struct interleaved_attribute_t
+	{
+		u8 index;
+		bool modulo;
+		u16 frequency;
+	};
+
+	struct interleaved_range_info
+	{
+		bool interleaved = false;
+		bool single_vertex = false;
+		u32  base_offset = 0;
+		u32  real_offset_address = 0;
+		u8   memory_location = 0;
+		u8   attribute_stride = 0;
+
+		rsx::simple_array<interleaved_attribute_t> locations;
+
+		// Check if we need to upload a full unoptimized range, i.e [0-max_index]
+		std::pair<u32, u32> calculate_required_range(u32 first, u32 count) const;
+	};
+
+	enum attribute_buffer_placement : u8
+	{
+		none = 0,
+		persistent = 1,
+		transient = 2
+	};
+
+	struct vertex_input_layout
+	{
+		std::vector<interleaved_range_info> interleaved_blocks{};  // Interleaved blocks to be uploaded as-is
+		std::vector<std::pair<u8, u32>> volatile_blocks{};         // Volatile data blocks (immediate draw vertex data for example)
+		rsx::simple_array<u8> referenced_registers{};              // Volatile register data
+
+		std::array<attribute_buffer_placement, 16> attribute_placement = fill_array(attribute_buffer_placement::none);
+
+		vertex_input_layout() = default;
+
+		void clear()
+		{
+			interleaved_blocks.clear();
+			volatile_blocks.clear();
+			referenced_registers.clear();
+		}
+
+		bool validate() const
+		{
+			// Criteria: At least one array stream has to be defined to feed vertex positions
+			// This stream cannot be a const register as the vertices cannot create a zero-area primitive
+
+			if (!interleaved_blocks.empty() && interleaved_blocks.front().attribute_stride != 0)
+				return true;
+
+			if (!volatile_blocks.empty())
+				return true;
+
+			for (u8 index = 0; index < limits::vertex_count; ++index)
+			{
+				switch (attribute_placement[index])
+				{
+				case attribute_buffer_placement::transient:
+				{
+					// Ignore register reference
+					if (std::find(referenced_registers.begin(), referenced_registers.end(), index) != referenced_registers.end())
+						continue;
+
+					// The source is inline array or immediate draw push buffer
+					return true;
+				}
+				case attribute_buffer_placement::persistent:
+				{
+					return true;
+				}
+				case attribute_buffer_placement::none:
+				{
+					continue;
+				}
+				default:
+				{
+					fmt::throw_exception("Unreachable");
+				}
+				}
+			}
+
+			return false;
+		}
+
+		u32 calculate_interleaved_memory_requirements(u32 first_vertex, u32 vertex_count) const
+		{
+			u32 mem = 0;
+			for (auto &block : interleaved_blocks)
+			{
+				const auto range = block.calculate_required_range(first_vertex, vertex_count);
+				mem += range.second * block.attribute_stride;
+			}
+
+			return mem;
+		}
+	};
+
+	struct framebuffer_layout
+	{
+		u16 width;
+		u16 height;
+		std::array<u32, 4> color_addresses;
+		std::array<u32, 4> color_pitch;
+		std::array<u32, 4> actual_color_pitch;
+		std::array<bool, 4> color_write_enabled;
+		u32 zeta_address;
+		u32 zeta_pitch;
+		u32 actual_zeta_pitch;
+		bool zeta_write_enabled;
+		rsx::surface_target target;
+		rsx::surface_color_format color_format;
+		rsx::surface_depth_format2 depth_format;
+		rsx::surface_antialiasing aa_mode;
+		rsx::surface_raster_type raster_type;
+		u32 aa_factors[2];
+		bool ignore_change;
+	};
+
+	namespace reports
+	{
+		struct occlusion_query_info
+		{
+			u32 driver_handle;
+			u32 result;
+			u32 num_draws;
+			u32 data_type;
+			u64 sync_tag;
+			u64 timestamp;
+			bool pending;
+			bool active;
+			bool owned;
+		};
+
+		struct queued_report_write
+		{
+			u32 type = CELL_GCM_ZPASS_PIXEL_CNT;
+			u32 counter_tag;
+			occlusion_query_info* query;
+			queued_report_write* forwarder;
+
+			vm::addr_t sink;                      // Memory location of the report
+			std::vector<vm::addr_t> sink_alias;   // Aliased memory addresses
+		};
+
+		struct query_search_result
+		{
+			bool found;
+			u32  raw_zpass_result;
+			std::vector<occlusion_query_info*> queries;
+		};
+
+		enum sync_control
+		{
+			sync_none = 0,
+			sync_defer_copy = 1, // If set, return a zcull intr code instead of forcefully reading zcull data
+			sync_no_notify = 2   // If set, backend hint notifications will not be made
+		};
+
+		class ZCULL_control
+		{
+		protected:
+			// Delay before a report update operation is forced to retire
+			const u32 max_zcull_delay_us = 300;
+			const u32 min_zcull_tick_us = 100;
+
+			// Number of occlusion query slots available. Real hardware actually has far fewer units before choking
+			const u32 occlusion_query_count = 1024;
+			const u32 max_safe_queue_depth = 892;
+
+			bool unit_enabled = false;           // The ZCULL unit is on
+			bool write_enabled = false;          // A surface in the ZCULL-monitored tile region has been loaded for rasterization
+			bool stats_enabled = false;          // Collecting of ZCULL statistics is enabled (not same as pixels passing Z test!)
+			bool zpass_count_enabled = false;    // Collecting of ZPASS statistics is enabled. If this is off, the counter does not increment
+			bool host_queries_active = false;    // The backend/host is gathering Z data for the ZCULL unit
+
+			std::array<occlusion_query_info, 1024> m_occlusion_query_data = {};
+			std::stack<occlusion_query_info*> m_free_occlusion_pool{};
+
+			occlusion_query_info* m_current_task = nullptr;
+			u32 m_statistics_tag_id = 0;
+
+			// Scheduling clock. Granunlarity is min_zcull_tick value.
+			u64 m_tsc = 0;
+			u64 m_next_tsc = 0;
+
+			// Incremental tag used for tracking sync events. Hardware clock resolution is too low for the job.
+			u64 m_sync_tag = 0;
+			u64 m_timer = 0;
+
+			std::vector<queued_report_write> m_pending_writes{};
+			std::unordered_map<u32, u32> m_statistics_map{};
+
+			// Enables/disables the ZCULL unit
+			void set_active(class ::rsx::thread* ptimer, bool state, bool flush_queue);
+
+			// Checks current state of the unit and applies changes
+			void check_state(class ::rsx::thread* ptimer, bool flush_queue);
+
+			// Sets up a new query slot and sets it to the current task
+			void allocate_new_query(class ::rsx::thread* ptimer);
+
+			// Free a query slot in use
+			void free_query(occlusion_query_info* query);
+
+			// Write report to memory
+			void write(vm::addr_t sink, u64 timestamp, u32 type, u32 value);
+			void write(queued_report_write* writer, u64 timestamp, u32 value);
+
+			// Retire operation
+			void retire(class ::rsx::thread* ptimer, queued_report_write* writer, u32 result);
+
+		public:
+
+			ZCULL_control();
+			virtual ~ZCULL_control();
+
+			ZCULL_control(const ZCULL_control&) = delete;
+			ZCULL_control& operator=(const ZCULL_control&) = delete;
+
+			void set_enabled(class ::rsx::thread* ptimer, bool state, bool flush_queue = false);
+			void set_status(class ::rsx::thread* ptimer, bool surface_active, bool zpass_active, bool zcull_stats_active, bool flush_queue = false);
+
+			// Read current zcull statistics into the address provided
+			void read_report(class ::rsx::thread* ptimer, vm::addr_t sink, u32 type);
+
+			// Clears current stat block and increments stat_tag_id
+			void clear(class ::rsx::thread* ptimer, u32 type);
+
+			// Forcefully flushes all
+			void sync(class ::rsx::thread* ptimer);
+
+			// Conditionally sync any pending writes if range overlaps
+			flags32_t read_barrier(class ::rsx::thread* ptimer, u32 memory_address, u32 memory_range, flags32_t flags);
+			flags32_t read_barrier(class ::rsx::thread* ptimer, u32 memory_address, occlusion_query_info* query);
+
+			// Call once every 'tick' to update, optional address provided to partially sync until address is processed
+			void update(class ::rsx::thread* ptimer, u32 sync_address = 0, bool hint = false);
+
+			// Draw call notification
+			void on_draw();
+
+			// Sync hint notification
+			void on_sync_hint(void* args);
+
+			// Check for pending writes
+			bool has_pending() const { return !m_pending_writes.empty(); }
+
+			// Search for query synchronized at address
+			query_search_result find_query(vm::addr_t sink_address, bool all);
+
+			// Copies queries in range rebased from source range to destination range
+			u32 copy_reports_to(u32 start, u32 range, u32 dest);
+
+			// Backend methods (optional, will return everything as always visible by default)
+			virtual void begin_occlusion_query(occlusion_query_info* /*query*/) {}
+			virtual void end_occlusion_query(occlusion_query_info* /*query*/) {}
+			virtual bool check_occlusion_query_status(occlusion_query_info* /*query*/) { return true; }
+			virtual void get_occlusion_query_result(occlusion_query_info* query) { query->result = -1; }
+			virtual void discard_occlusion_query(occlusion_query_info* /*query*/) {}
+		};
+
+		// Helper class for conditional rendering
+		struct conditional_render_eval
+		{
+			bool enabled = false;
+			bool eval_failed = false;
+			bool hw_cond_active = false;
+			bool reserved = false;
+
+			std::vector<occlusion_query_info*> eval_sources;
+			u64 eval_sync_tag = 0;
+			u32 eval_address = 0;
+
+			// Resets common data
+			void reset();
+
+			// Returns true if rendering is disabled as per conditional render test
+			bool disable_rendering() const;
+
+			// Returns true if a conditional render is active but not yet evaluated
+			bool eval_pending() const;
+
+			// Enable conditional rendering
+			void enable_conditional_render(thread* pthr, u32 address);
+
+			// Disable conditional rendering
+			void disable_conditional_render(thread* pthr);
+
+			// Sets data sources for predicate evaluation
+			void set_eval_sources(std::vector<occlusion_query_info*>& sources);
+
+			// Sets evaluation result. Result is true if conditional evaluation failed
+			void set_eval_result(thread* pthr, bool failed);
+
+			// Evaluates the condition by accessing memory directly
+			void eval_result(thread* pthr);
+		};
+	}
+
+	struct frame_statistics_t
+	{
+		u32 draw_calls;
+		s64 setup_time;
+		s64 vertex_upload_time;
+		s64 textures_upload_time;
+		s64 draw_exec_time;
+		s64 flip_time;
+	};
+
+	struct display_flip_info_t
+	{
+		std::deque<u32> buffer_queue;
+		u32 buffer;
+		bool skip_frame;
+		bool emu_flip;
+		bool in_progress;
+		frame_statistics_t stats;
+
+		inline void push(u32 _buffer)
+		{
+			buffer_queue.push_back(_buffer);
+		}
+
+		inline bool pop(u32 _buffer)
+		{
+			if (buffer_queue.empty())
+			{
+				return false;
+			}
+
+			do
+			{
+				const auto index = buffer_queue.front();
+				buffer_queue.pop_front();
+
+				if (index == _buffer)
+				{
+					buffer = _buffer;
+					return true;
+				}
+			}
+			while (!buffer_queue.empty());
+
+			// Need to observe this happening in the wild
+			rsx_log.error("Display queue was discarded while not empty!");
+			return false;
+		}
+	};
 
 	struct backend_configuration
 	{
-		bool supports_multidraw;               // Draw call batching
-		bool supports_hw_a2c;                  // Alpha to coverage
-		bool supports_hw_a2c_1spp;             // Alpha to coverage at 1 sample per pixel
-		bool supports_hw_renormalization;      // Should be true on NV hardware which matches PS3 texture renormalization behaviour
-		bool supports_hw_msaa;                 // MSAA support
-		bool supports_hw_a2one;                // Alpha to one
-		bool supports_hw_conditional_render;   // Conditional render
-		bool supports_passthrough_dma;         // DMA passthrough
-		bool supports_asynchronous_compute;    // Async compute
-		bool supports_host_gpu_labels;         // Advanced host synchronization
-		bool supports_normalized_barycentrics; // Basically all GPUs except NVIDIA have properly normalized barycentrics
+		bool supports_multidraw;             // Draw call batching
+		bool supports_hw_a2c;                // Alpha to coverage
+		bool supports_hw_renormalization;    // Should be true on NV hardware which matches PS3 texture renormalization behaviour
+		bool supports_hw_a2one;              // Alpha to one
+		bool supports_hw_conditional_render; // Conditional render
+		bool supports_passthrough_dma;       // DMA passthrough
+		bool supports_asynchronous_compute;  // Async compute
 	};
 
-	struct desync_fifo_cmd_info
-	{
-		u32 cmd;
-		u64 timestamp;
-	};
+	struct sampled_image_descriptor_base;
 
-	// TODO: This class is a mess, this needs to be broken into smaller chunks, like I did for RSXFIFO and RSXZCULL (kd)
-	class thread : public cpu_thread, public GCM_context, public GRAPH_backend
+	class thread : public cpu_thread
 	{
 		u64 timestamp_ctrl = 0;
 		u64 timestamp_subvalue = 0;
-		u64 m_cycles_counter = 0;
 
 		display_flip_info_t m_queued_flip{};
 
 		void cpu_task() override;
 	protected:
+		std::thread::id m_rsx_thread;
+		atomic_t<bool> m_rsx_thread_exiting{ true };
+
+		std::array<push_buffer_vertex_info, 16> vertex_push_buffers;
+		std::vector<u32> element_push_buffer;
 
 		s32 m_skip_frame_ctr = 0;
 		bool skip_current_frame = false;
-
-		primitive_class m_current_draw_mode = primitive_class::polygon;
+		frame_statistics_t stats{};
 
 		backend_configuration backend_config{};
 
 		// FIFO
 	public:
 		std::unique_ptr<FIFO::FIFO_control> fifo_ctrl;
-		atomic_t<bool> rsx_thread_running{ false };
 		std::vector<std::pair<u32, u32>> dump_callstack_list() const override;
-		std::string dump_misc() const override;
 
 	protected:
 		FIFO::flattening_helper m_flattener;
 		u32 fifo_ret_addr = RSX_CALL_STACK_EMPTY;
 		u32 saved_fifo_ret = RSX_CALL_STACK_EMPTY;
-		u32 restore_fifo_cmd = 0;
-		u32 restore_fifo_count = 0;
 
 		// Occlusion query
 		bool zcull_surface_active = false;
@@ -139,55 +630,39 @@ namespace rsx
 		rsx::gcm_framebuffer_info m_surface_info[rsx::limits::color_buffers_count];
 		rsx::gcm_framebuffer_info m_depth_surface_info;
 		framebuffer_layout m_framebuffer_layout{};
+		bool framebuffer_status_valid = false;
 
 		// Overlays
 		rsx::overlays::display_manager* m_overlay_manager = nullptr;
 
-		atomic_t<u64> m_display_rate_fetch_count = 0;
-		atomic_t<f64> m_cached_display_rate = 60.;
-		f64 get_cached_display_refresh_rate();
-		virtual f64 get_display_refresh_rate() const = 0;
-
 		// Invalidated memory range
-		address_range32 m_invalidated_memory_range;
+		address_range m_invalidated_memory_range;
 
 		// Profiler
 		rsx::profiling_timer m_profiler;
-		frame_statistics_t m_frame_stats{};
-
-		// Savestates related
-		u32 m_pause_after_x_flips = 0;
-
-		// Context
-		context* m_ctx = nullptr;
-
-		// Host DMA
-		std::unique_ptr<RSXDMAWriter> m_host_dma_ctrl;
-
-		// Draw call management
-		draw_command_processor m_draw_processor;
+		frame_statistics_t m_frame_stats;
 
 	public:
-		atomic_t<u64> new_get_put = u64{umax};
+		RsxDmaControl* ctrl = nullptr;
+		u32 dma_address{0};
+		rsx_iomap_table iomap_table;
 		u32 restore_point = 0;
 		u32 dbg_step_pc = 0;
-		u32 last_known_code_start = 0;
 		atomic_t<u32> external_interrupt_lock{ 0 };
 		atomic_t<bool> external_interrupt_ack{ false };
-		atomic_t<u32> is_initialized{0};
-
+		atomic_t<bool> is_inited{ false };
 		bool is_fifo_idle() const;
 		void flush_fifo();
 
-		// Returns [count of found commands, PC of their start]
-		std::pair<u32, u32> try_get_pc_of_x_cmds_backwards(s32 count, u32 get) const;
-
-		void recover_fifo(std::source_location src_loc = std::source_location::current());
+		void recover_fifo(u32 line = __builtin_LINE(),
+			u32 col = __builtin_COLUMN(),
+			const char* file = __builtin_FILE(),
+			const char* func = __builtin_FUNCTION());
 
 		static void fifo_wake_delay(u64 div = 1);
 		u32 get_fifo_cmd() const;
 
-		void dump_regs(std::string&, std::any& custom_data) const override;
+		std::string dump_regs() const override;
 		void cpu_wait(bs_t<cpu_flag> old) override;
 
 		static constexpr u32 id_base = 0x5555'5555; // See get_current_cpu_thread()
@@ -198,7 +673,7 @@ namespace rsx
 			atomic_t<u64> idle_time{ 0 };  // Time spent idling in microseconds
 			u64 last_update_timestamp = 0; // Timestamp of last load update
 			u64 FIFO_idle_timestamp = 0;   // Timestamp of when FIFO queue becomes idle
-			FIFO::state state = FIFO::state::running;
+			FIFO_state state = FIFO_state::running;
 			u32 approximate_load = 0;
 			u32 sampled_frames = 0;
 		}
@@ -215,56 +690,68 @@ namespace rsx
 		atomic_bitmask_t<flip_request> async_flip_requested{};
 		u8 async_flip_buffer{ 0 };
 
-		void capture_frame(const std::string& name);
+		GcmTileInfo tiles[limits::tiles_count];
+		GcmZcullInfo zculls[limits::zculls_count];
+
+		void capture_frame(const std::string &name);
 		const backend_configuration& get_backend_config() const { return backend_config; }
 
-		const draw_command_processor* draw_processor() const { return &m_draw_processor; }
-
 	public:
-		shared_ptr<named_thread<ppu_thread>> intr_thread;
+		std::shared_ptr<named_thread<class ppu_thread>> intr_thread;
 
 		// I hate this flag, but until hle is closer to lle, its needed
 		bool isHLE{ false };
-		bool serialized = false;
 
-		u32 flip_status = CELL_GCM_DISPLAY_FLIP_STATUS_DONE;
-		int debug_level = CELL_GCM_DEBUG_LEVEL0;
+		u32 flip_status;
+		int debug_level;
 
-		atomic_t<bool> requested_vsync{true};
+		atomic_t<bool> requested_vsync{false};
 		atomic_t<bool> enable_second_vhandler{false};
 
-		bool send_event(u64, u64, u64);
+		RsxDisplayInfo display_buffers[8];
+		u32 display_buffers_count{0};
+		u32 current_display_buffer{0};
 
+		shared_mutex sys_rsx_mtx;
+		u32 device_addr{0};
+		u32 label_addr{0};
+		u32 main_mem_size{0};
+		u32 local_mem_size{0};
+		u32 rsx_event_port{0};
+		u32 driver_info{0};
+
+		void send_event(u64, u64, u64) const;
+
+		bool m_rtts_dirty = true;
 		std::array<bool, 16> m_textures_dirty;
 		std::array<bool, 4> m_vertex_textures_dirty;
+		bool m_framebuffer_state_contested = false;
 		rsx::framebuffer_creation_context m_current_framebuffer_context = rsx::framebuffer_creation_context::context_draw;
 
-		rsx::atomic_bitmask_t<rsx::eng_interrupt_reason> m_eng_interrupt_mask;
-		rsx::bitmask_t<rsx::pipeline_state> m_graphics_state;
-
+		u32 m_graphics_state = 0;
 		u64 ROP_sync_timestamp = 0;
 
 		program_hash_util::fragment_program_utils::fragment_program_metadata current_fp_metadata = {};
 		program_hash_util::vertex_program_utils::vertex_program_metadata current_vp_metadata = {};
 
-		std::array<std::unique_ptr<rsx::sampled_image_descriptor_base>, rsx::limits::fragment_textures_count> fs_sampler_state = {};
-		std::array<std::unique_ptr<rsx::sampled_image_descriptor_base>, rsx::limits::vertex_textures_count> vs_sampler_state = {};
-
+	protected:
 		std::array<u32, 4> get_color_surface_addresses() const;
 		u32 get_zeta_surface_address() const;
 
-	protected:
 		void get_framebuffer_layout(rsx::framebuffer_creation_context context, framebuffer_layout &layout);
 		bool get_scissor(areau& region, bool clip_viewport);
 
+		/**
+		 * Analyze vertex inputs and group all interleaved blocks
+		 */
+		void analyse_inputs_interleaved(vertex_input_layout&) const;
+
 		RSXVertexProgram current_vertex_program = {};
 		RSXFragmentProgram current_fragment_program = {};
 
 		vertex_program_texture_state current_vp_texture_state = {};
 		fragment_program_texture_state current_fp_texture_state = {};
 
-		program_cache_hint_t m_program_cache_hint;
-
 		// Runs shader prefetch and resolves pipeline status flags
 		void analyse_current_rsx_pipeline();
 
@@ -288,32 +775,31 @@ namespace rsx
 	public:
 		u64 target_rsx_flip_time = 0;
 		u64 int_flip_index = 0;
-		u64 last_guest_flip_timestamp = 0;
-		u64 last_host_flip_timestamp = 0;
-
+		u64 last_flip_time = 0;
 		vm::ptr<void(u32)> flip_handler = vm::null;
 		vm::ptr<void(u32)> user_handler = vm::null;
 		vm::ptr<void(u32)> vblank_handler = vm::null;
-		vm::ptr<void(u32)> queue_handler = vm::null;
 		atomic_t<u64> vblank_count{0};
 		bool capture_current_frame = false;
 
-		u64 vblank_at_flip = umax;
-		u64 flip_notification_count = 0;
-		void post_vblank_event(u64 post_event_time);
-
 	public:
 		atomic_t<bool> sync_point_request = false;
-		atomic_t<bool> pause_on_draw = false;
 		bool in_begin_end = false;
 
+		struct desync_fifo_cmd_info
+		{
+			u32 cmd;
+			u64 timestamp;
+		};
+
 		std::queue<desync_fifo_cmd_info> recovered_fifo_cmds_history;
-		std::deque<frame_time_t> frame_times;
-		u32 prevent_preempt_increase_tickets = 0;
-		u64 preempt_fail_old_preempt_count = 0;
 
 		atomic_t<s32> async_tasks_pending{ 0 };
 
+		bool zcull_stats_enabled = false;
+		bool zcull_rendering_enabled = false;
+		bool zcull_pixel_cnt_enabled = false;
+
 		reports::conditional_render_eval cond_render_ctrl;
 
 		virtual u64 get_cycles() = 0;
@@ -322,17 +808,14 @@ namespace rsx
 		static constexpr auto thread_name = "rsx::thread"sv;
 
 	protected:
-		thread(utils::serial* ar);
-
-		thread() : thread(static_cast<utils::serial*>(nullptr)) {}
-
+		thread();
 		virtual void on_task();
 		virtual void on_exit();
 
 		/**
 		 * Execute a backend local task queue
 		 */
-		virtual void do_local_task(FIFO::state state);
+		virtual void do_local_task(FIFO_state state);
 
 		virtual void emit_geometry(u32) {}
 
@@ -341,7 +824,6 @@ namespace rsx
 	public:
 		thread(const thread&) = delete;
 		thread& operator=(const thread&) = delete;
-		void save(utils::serial& ar);
 
 		virtual void clear_surface(u32 /*arg*/) {}
 		virtual void begin();
@@ -353,11 +835,11 @@ namespace rsx
 		virtual void flip(const display_flip_info_t& info) = 0;
 		virtual u64 timestamp();
 		virtual bool on_access_violation(u32 /*address*/, bool /*is_writing*/) { return false; }
-		virtual void on_invalidate_memory_range(const address_range32 & /*range*/, rsx::invalidation_cause) {}
+		virtual void on_invalidate_memory_range(const address_range & /*range*/, rsx::invalidation_cause) {}
 		virtual void notify_tile_unbound(u32 /*tile*/) {}
 
 		// control
-		virtual void renderctl(u32 request_code, void* args);
+		virtual void renderctl(u32 /*request_code*/, void* /*args*/) {}
 
 		// zcull
 		void notify_zcull_info_changed();
@@ -374,8 +856,22 @@ namespace rsx
 		// sync
 		void sync();
 		flags32_t read_barrier(u32 memory_address, u32 memory_range, bool unconditional);
-		virtual void sync_hint(FIFO::interrupt_hint hint, reports::sync_hint_payload_t payload);
-		virtual bool release_GCM_label(u32 /*address*/, u32 /*value*/) { return false; }
+		virtual void sync_hint(FIFO_hint hint, void* args);
+
+		std::span<const std::byte> get_raw_index_array(const draw_clause& draw_indexed_clause) const;
+
+		std::variant<draw_array_command, draw_indexed_array_command, draw_inlined_array>
+		get_draw_command(const rsx::rsx_state& state) const;
+
+		/**
+		* Immediate mode rendering requires a temp push buffer to hold attrib values
+		* Appends a value to the push buffer (currently only supports 32-wide types)
+		*/
+		void append_to_push_buffer(u32 attribute, u32 size, u32 subreg_index, vertex_base_type type, u32 value);
+		u32 get_push_buffer_vertex_count() const;
+
+		void append_array_element(u32 index);
+		u32 get_push_buffer_index_count() const;
 
 	protected:
 
@@ -386,7 +882,16 @@ namespace rsx
 		 */
 		std::pair<u32, u32> calculate_memory_requirements(const vertex_input_layout& layout, u32 first_vertex, u32 vertex_count);
 
-		void evaluate_cpu_usage_reduction_limits();
+		/**
+		 * Generates vertex input descriptors as an array of 16x4 s32s
+		 */
+		void fill_vertex_layout_state(const vertex_input_layout& layout, u32 first_vertex, u32 vertex_count, s32* buffer, u32 persistent_offset = 0, u32 volatile_offset = 0);
+
+		/**
+		 * Uploads vertex data described in the layout descriptor
+		 * Copies from local memory to the write-only output buffers provided in a sequential manner
+		 */
+		void write_vertex_data_to_memory(const vertex_input_layout& layout, u32 first_vertex, u32 vertex_count, void *persistent_data, void *volatile_data);
 
 	private:
 		shared_mutex m_mtx_task;
@@ -395,8 +900,29 @@ namespace rsx
 		void handle_invalidated_memory_range();
 
 	public:
+		/**
+		 * Fill buffer with 4x4 scale offset matrix.
+		 * Vertex shader's position is to be multiplied by this matrix.
+		 * if flip_y is set, the matrix is modified to use d3d convention.
+		 */
+		void fill_scale_offset_data(void *buffer, bool flip_y) const;
 
-		draw_command_processor& GRAPH_frontend() { return m_draw_processor; }
+		/**
+		 * Fill buffer with user clip information
+		 */
+		void fill_user_clip_data(void *buffer) const;
+
+		/**
+		* Fill buffer with vertex program constants.
+		* Buffer must be at least 512 float4 wide.
+		*/
+		void fill_vertex_program_constants_data(void* buffer);
+
+		/**
+		 * Fill buffer with fragment rasterization state.
+		 * Fills current fog values, alpha test parameters and texture scaling parameters
+		 */
+		void fill_fragment_state_buffer(void* buffer, const RSXFragmentProgram& fragment_program);
 
 		/**
 		 * Notify that a section of memory has been mapped
@@ -405,44 +931,27 @@ namespace rsx
 		 */
 		void on_notify_memory_mapped(u32 address_base, u32 size);
 
-		/**
-		 * Notify that a section of memory is to be unmapped
-		 * Any data held in the defined range is discarded
-		 * Sets optional unmap event data
-		 */
-		void on_notify_pre_memory_unmapped(u32 address_base, u32 size, std::vector<std::pair<u64, u64>>& event_data);
-
 		/**
 		 * Notify that a section of memory has been unmapped
 		 * Any data held in the defined range is discarded
 		 */
-		void on_notify_post_memory_unmapped(u64 event_data1, u64 event_data2);
+		void on_notify_memory_unmapped(u32 address_base, u32 size);
 
 		/**
 		 * Notify to check internal state during semaphore wait
 		 */
 		virtual void on_semaphore_acquire_wait() {}
 
-		/**
-		 * Load an image from memory with optional scaling and rotation.
-		 * Returns false to tell the HW decoder to perform the operation on the CPU as a fallback when the operation cannot be safely accelerated.
-		 */
-		virtual bool scaled_image_from_memory(const blit_src_info& /*src_info*/, const blit_dst_info& /*dst_info*/, bool /*interpolate*/) { return false; }
-
-
-		// Program public "get" handlers
 		virtual std::pair<std::string, std::string> get_programs() const { return std::make_pair("", ""); }
 
-		bool is_current_vertex_program_instanced() const { return !!(current_vertex_program.ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS); }
-
-		virtual bool is_current_program_interpreted() const { return false; }
+		virtual bool scaled_image_from_memory(blit_src_info& /*src_info*/, blit_dst_info& /*dst_info*/, bool /*interpolate*/) { return false; }
 
 	public:
 		void reset();
 		void init(u32 ctrlAddress);
 
 		// Emu App/Game flip, only immediately flips when called from rsxthread
-		bool request_emu_flip(u32 buffer);
+		void request_emu_flip(u32 buffer);
 
 		void pause();
 		void unpause();
@@ -451,14 +960,8 @@ namespace rsx
 		// Get RSX approximate load in %
 		u32 get_load();
 
-		// Get stats object
-		frame_statistics_t& get_stats() { return m_frame_stats; }
-
 		// Returns true if the current thread is the active RSX thread
-		inline bool is_current_thread() const
-		{
-			return !!cpu_thread::get_current<rsx::thread>();
-		}
+		bool is_current_thread() const { return std::this_thread::get_id() == m_rsx_thread; }
 	};
 
 	inline thread* get_current_renderer()
@@ -466,8 +969,64 @@ namespace rsx
 		return g_fxo->try_get<rsx::thread>();
 	}
 
-	inline const backend_configuration& get_renderer_backend_config()
+	template<bool IsFullLock = false>
+	class reservation_lock
 	{
-		return g_fxo->get<rsx::thread>().get_backend_config();
-	}
+		u32 addr = 0, length = 0;
+		bool locked = false;
+
+		inline void lock_range(u32 addr, u32 length)
+		{
+			this->addr = addr;
+			this->length = length;
+
+			auto renderer = get_current_renderer();
+			this->locked = renderer->iomap_table.lock<IsFullLock>(addr, length);
+		}
+
+	public:
+		reservation_lock(u32 addr, u32 length)
+		{
+			if (g_cfg.core.rsx_accurate_res_access &&
+				addr < constants::local_mem_base)
+			{
+				lock_range(addr, length);
+			}
+		}
+
+		// Multi-range lock. If ranges overlap, the combined range will be acquired.
+		// If ranges do not overlap, the first range that is in main memory will be acquired.
+		reservation_lock(u32 dst_addr, u32 dst_length, u32 src_addr, u32 src_length)
+		{
+			if (g_cfg.core.rsx_accurate_res_access)
+			{
+				const auto range1 = utils::address_range::start_length(dst_addr, dst_length);
+				const auto range2 = utils::address_range::start_length(src_addr, src_length);
+				utils::address_range target_range;
+
+				if (!range1.overlaps(range2)) [[likely]]
+				{
+					target_range = (dst_addr < constants::local_mem_base) ? range1 : range2;
+				}
+				else
+				{
+					// Very unlikely
+					target_range = range1.get_min_max(range2);
+				}
+
+				if (target_range.start < constants::local_mem_base)
+				{
+					lock_range(target_range.start, target_range.length());
+				}
+			}
+		}
+
+		~reservation_lock()
+		{
+			if (locked)
+			{
+				get_current_renderer()->iomap_table.unlock<IsFullLock>(addr, length);
+			}
+		}
+	};
 }
diff --git a/rpcs3/Emu/RSX/RSXZCULL.cpp b/rpcs3/Emu/RSX/RSXZCULL.cpp
deleted file mode 100644
index 3dd9d1a776..0000000000
--- a/rpcs3/Emu/RSX/RSXZCULL.cpp
+++ /dev/null
@@ -1,1010 +0,0 @@
-#include "stdafx.h"
-#include "Core/RSXEngLock.hpp"
-#include "Core/RSXReservationLock.hpp"
-#include "RSXThread.h"
-
-namespace rsx
-{
-	namespace reports
-	{
-		ZCULL_control::ZCULL_control()
-		{
-			for (auto& query : m_occlusion_query_data)
-			{
-				m_free_occlusion_pool.push(&query);
-			}
-
-			for (auto& stat : m_statistics_map)
-			{
-				stat.flags = stat.result = 0;
-			}
-		}
-
-		ZCULL_control::~ZCULL_control()
-		{
-			std::scoped_lock lock(m_pages_mutex);
-
-			for (auto& block : m_locked_pages)
-			{
-				for (auto& p : block)
-				{
-					if (p.second.prot != utils::protection::rw)
-					{
-						utils::memory_protect(vm::base(p.first), utils::get_page_size(), utils::protection::rw);
-					}
-				}
-
-				block.clear();
-			}
-		}
-
-		void ZCULL_control::set_active(class ::rsx::thread* ptimer, bool state, bool flush_queue)
-		{
-			if (state != host_queries_active)
-			{
-				host_queries_active = state;
-
-				if (state)
-				{
-					ensure(unit_enabled && m_current_task == nullptr);
-					allocate_new_query(ptimer);
-					begin_occlusion_query(m_current_task);
-				}
-				else
-				{
-					ensure(m_current_task);
-					if (m_current_task->num_draws)
-					{
-						end_occlusion_query(m_current_task);
-						m_current_task->active = false;
-						m_current_task->pending = true;
-						m_current_task->sync_tag = m_timer++;
-						m_current_task->timestamp = m_tsc;
-
-						m_pending_writes.push_back({});
-						m_pending_writes.back().query = m_current_task;
-						ptimer->async_tasks_pending++;
-					}
-					else
-					{
-						discard_occlusion_query(m_current_task);
-						free_query(m_current_task);
-						m_current_task->active = false;
-					}
-
-					m_current_task = nullptr;
-					update(ptimer, 0u, flush_queue);
-				}
-			}
-		}
-
-		void ZCULL_control::check_state(class ::rsx::thread* ptimer, bool flush_queue)
-		{
-			// NOTE: Only enable host queries if pixel count is active to save on resources
-			// Can optionally be enabled for either stats enabled or zpass enabled for accuracy
-			const bool data_stream_available = zpass_count_enabled; // write_enabled && (zpass_count_enabled || stats_enabled);
-			if (host_queries_active && !data_stream_available)
-			{
-				// Stop
-				set_active(ptimer, false, flush_queue);
-			}
-			else if (!host_queries_active && data_stream_available && unit_enabled)
-			{
-				// Start
-				set_active(ptimer, true, flush_queue);
-			}
-		}
-
-		void ZCULL_control::set_enabled(class ::rsx::thread* ptimer, bool state, bool flush_queue)
-		{
-			if (state != unit_enabled)
-			{
-				unit_enabled = state;
-				check_state(ptimer, flush_queue);
-			}
-		}
-
-		void ZCULL_control::set_status(class ::rsx::thread* ptimer, bool surface_active, bool zpass_active, bool zcull_stats_active, bool flush_queue)
-		{
-			write_enabled = surface_active;
-			zpass_count_enabled = zpass_active;
-			stats_enabled = zcull_stats_active;
-
-			check_state(ptimer, flush_queue);
-
-			// Disabled since only ZPASS is implemented right now
-			if (false) //(m_current_task && m_current_task->active)
-			{
-				// Data check
-				u32 expected_type = 0;
-				if (zpass_active) expected_type |= CELL_GCM_ZPASS_PIXEL_CNT;
-				if (zcull_stats_active) expected_type |= CELL_GCM_ZCULL_STATS;
-
-				if (m_current_task->data_type != expected_type) [[unlikely]]
-				{
-					rsx_log.error("ZCULL queue interrupted by data type change!");
-
-					// Stop+start the current setup
-					set_active(ptimer, false, false);
-					set_active(ptimer, true, false);
-				}
-			}
-		}
-
-		void ZCULL_control::read_report(::rsx::thread* ptimer, vm::addr_t sink, u32 type)
-		{
-			if (m_current_task && type == CELL_GCM_ZPASS_PIXEL_CNT)
-			{
-				m_current_task->owned = true;
-				end_occlusion_query(m_current_task);
-				m_pending_writes.push_back({});
-
-				m_current_task->active = false;
-				m_current_task->pending = true;
-				m_current_task->timestamp = m_tsc;
-				m_current_task->sync_tag = m_timer++;
-				m_pending_writes.back().query = m_current_task;
-
-				allocate_new_query(ptimer);
-				begin_occlusion_query(m_current_task);
-			}
-			else
-			{
-				// Spam; send null query down the pipeline to copy the last result
-				// Might be used to capture a timestamp (verify)
-
-				if (m_pending_writes.empty())
-				{
-					// No need to queue this if there is no pending request in the pipeline anyway
-					write(sink, ptimer->timestamp(), type, m_statistics_map[m_statistics_tag_id].result);
-					return;
-				}
-
-				m_pending_writes.push_back({});
-			}
-
-			auto forwarder = &m_pending_writes.back();
-			m_statistics_map[m_statistics_tag_id].flags |= 1;
-
-			for (auto It = m_pending_writes.rbegin(); It != m_pending_writes.rend(); It++)
-			{
-				if (!It->sink)
-				{
-					It->counter_tag = m_statistics_tag_id;
-					It->sink = sink;
-					It->type = type;
-
-					if (forwarder != &(*It))
-					{
-						// Not the last one in the chain, forward the writing operation to the last writer
-						// Usually comes from truncated queries caused by disabling the testing
-						ensure(It->query);
-
-						It->forwarder = forwarder;
-						It->query->owned = true;
-					}
-
-					continue;
-				}
-
-				break;
-			}
-
-			on_report_enqueued(sink);
-
-			ptimer->async_tasks_pending++;
-
-			if (m_statistics_map[m_statistics_tag_id].result != 0)
-			{
-				// Flush guaranteed results; only one positive is needed
-				update(ptimer);
-			}
-		}
-
-		void ZCULL_control::allocate_new_query(::rsx::thread* ptimer)
-		{
-			int retries = 0;
-			while (true)
-			{
-				if (!m_free_occlusion_pool.empty())
-				{
-					m_current_task = m_free_occlusion_pool.top();
-					m_free_occlusion_pool.pop();
-
-					m_current_task->data_type = 0;
-					m_current_task->num_draws = 0;
-					m_current_task->result = 0;
-					m_current_task->active = true;
-					m_current_task->owned = false;
-					m_current_task->sync_tag = 0;
-					m_current_task->timestamp = 0;
-
-					// Flags determine what kind of payload is carried by queries in the 'report'
-					if (zpass_count_enabled) m_current_task->data_type |= CELL_GCM_ZPASS_PIXEL_CNT;
-					if (stats_enabled) m_current_task->data_type |= CELL_GCM_ZCULL_STATS;
-
-					return;
-				}
-
-				if (retries > 0)
-				{
-					fmt::throw_exception("Allocation failed!");
-				}
-
-				// All slots are occupied, try to pop the earliest entry
-
-				if (!m_pending_writes.front().query)
-				{
-					// If this happens, the assert above will fire. There should never be a queue header with no work to be done
-					rsx_log.error("Close to our death.");
-				}
-
-				m_next_tsc = 0;
-				update(ptimer, m_pending_writes.front().sink);
-
-				retries++;
-			}
-		}
-
-		void ZCULL_control::free_query(occlusion_query_info* query)
-		{
-			query->pending = false;
-			m_free_occlusion_pool.push(query);
-		}
-
-		void ZCULL_control::clear(class ::rsx::thread* ptimer, u32 type)
-		{
-			if (!(type & CELL_GCM_ZPASS_PIXEL_CNT))
-			{
-				// Other types do not generate queries at the moment
-				return;
-			}
-
-			if (!m_pending_writes.empty())
-			{
-				//Remove any dangling/unclaimed queries as the information is lost anyway
-				auto valid_size = m_pending_writes.size();
-				for (auto It = m_pending_writes.rbegin(); It != m_pending_writes.rend(); ++It)
-				{
-					if (!It->sink)
-					{
-						discard_occlusion_query(It->query);
-						free_query(It->query);
-						valid_size--;
-						ptimer->async_tasks_pending--;
-						continue;
-					}
-
-					break;
-				}
-
-				m_pending_writes.resize(valid_size);
-			}
-
-			if (m_pending_writes.empty())
-			{
-				// Clear can be invoked from flip as a workaround to prevent query leakage.
-				m_statistics_map[m_statistics_tag_id].flags = 0;
-			}
-
-			if (m_statistics_map[m_statistics_tag_id].flags)
-			{
-				// Move to the next slot if this one is still in use.
-				m_statistics_tag_id = (m_statistics_tag_id + 1) % max_stat_registers;
-			}
-
-			auto& current_stats = m_statistics_map[m_statistics_tag_id];
-			if (current_stats.flags != 0)
-			{
-				// This shouldn't happen
-				rsx_log.error("Allocating a new ZCULL statistics slot %u overwrites previous data.", m_statistics_tag_id);
-			}
-
-			// Clear value before use
-			current_stats.result = 0;
-		}
-
-		void ZCULL_control::on_draw()
-		{
-			if (m_current_task)
-			{
-				m_current_task->num_draws++;
-				m_current_task->sync_tag = m_timer++;
-			}
-		}
-
-		void ZCULL_control::on_sync_hint(sync_hint_payload_t payload)
-		{
-			m_sync_tag = std::max(m_sync_tag, payload.query->sync_tag);
-		}
-
-		void ZCULL_control::write(vm::addr_t sink, u64 timestamp, u32 type, u32 value)
-		{
-			ensure(sink);
-
-			auto scale_result = [](u32 value)
-			{
-				const auto scale = rsx::get_resolution_scale_percent();
-				const auto result = (value * 10000ull) / (scale * scale);
-				return std::max(1u, static_cast<u32>(result));
-			};
-
-			switch (type)
-			{
-			case CELL_GCM_ZPASS_PIXEL_CNT:
-				if (value)
-				{
-					value = (g_cfg.video.precise_zpass_count) ?
-						scale_result(value) :
-						u16{ umax };
-				}
-				break;
-			case CELL_GCM_ZCULL_STATS3:
-				value = (value || !write_enabled || !stats_enabled) ? 0 : u16{ umax };
-				break;
-			case CELL_GCM_ZCULL_STATS2:
-			case CELL_GCM_ZCULL_STATS1:
-			case CELL_GCM_ZCULL_STATS:
-			default:
-				// Not implemented
-				value = (write_enabled && stats_enabled) ? -1 : 0;
-				break;
-			}
-
-			rsx::reservation_lock<true> lock(sink, 16);
-			auto report = vm::get_super_ptr<atomic_t<CellGcmReportData>>(sink);
-			report->store({timestamp, value, 0});
-		}
-
-		void ZCULL_control::write(queued_report_write* writer, u64 timestamp, u32 value)
-		{
-			write(writer->sink, timestamp, writer->type, value);
-			on_report_completed(writer->sink);
-
-			for (auto& addr : writer->sink_alias)
-			{
-				write(addr, timestamp, writer->type, value);
-			}
-		}
-
-		void ZCULL_control::retire(::rsx::thread* ptimer, queued_report_write* writer, u32 result)
-		{
-			if (!writer->forwarder)
-			{
-				// No other queries in the chain, write result
-				const auto value = (writer->type == CELL_GCM_ZPASS_PIXEL_CNT) ? m_statistics_map[writer->counter_tag].result : result;
-				write(writer, ptimer->timestamp(), value);
-			}
-
-			if (writer->query && writer->query->sync_tag == ptimer->cond_render_ctrl.eval_sync_tag)
-			{
-				bool eval_failed;
-				if (!writer->forwarder) [[likely]]
-				{
-					// Normal evaluation
-					eval_failed = (result == 0u);
-				}
-				else
-				{
-					// Eval was inserted while ZCULL was active but not enqueued to write to memory yet
-					// write(addr) -> enable_zpass_stats -> eval_condition -> write(addr)
-					// In this case, use what already exists in memory, not the current counter
-					eval_failed = (vm::_ref<CellGcmReportData>(writer->sink).value == 0u);
-				}
-
-				ptimer->cond_render_ctrl.set_eval_result(ptimer, eval_failed);
-			}
-		}
-
-		void ZCULL_control::sync(::rsx::thread* ptimer)
-		{
-			if (m_pending_writes.empty())
-			{
-				// Nothing to do
-				return;
-			}
-
-			if (!m_critical_reports_in_flight)
-			{
-				// Valid call, but nothing important queued up
-				return;
-			}
-
-			if (g_cfg.video.relaxed_zcull_sync)
-			{
-				update(ptimer, 0, true);
-				return;
-			}
-
-			// Quick reverse scan to push commands ahead of time
-			for (auto It = m_pending_writes.rbegin(); It != m_pending_writes.rend(); ++It)
-			{
-				if (It->sink && It->query && It->query->num_draws)
-				{
-					if (It->query->sync_tag > m_sync_tag)
-					{
-						// rsx_log.trace("[Performance warning] Query hint emit during sync command.");
-						ptimer->sync_hint(FIFO::interrupt_hint::zcull_sync, { .query = It->query });
-					}
-
-					break;
-				}
-			}
-
-			u32 processed = 0;
-			const bool has_unclaimed = (m_pending_writes.back().sink == 0);
-
-			// Write all claimed reports unconditionally
-			for (auto& writer : m_pending_writes)
-			{
-				if (!writer.sink)
-					break;
-
-				auto query = writer.query;
-				auto& counter = m_statistics_map[writer.counter_tag];
-
-				if (query)
-				{
-					ensure(query->pending);
-
-					const bool implemented = (writer.type == CELL_GCM_ZPASS_PIXEL_CNT || writer.type == CELL_GCM_ZCULL_STATS3);
-					const bool have_result = counter.result && !g_cfg.video.precise_zpass_count;
-
-					if (implemented && !have_result && query->num_draws)
-					{
-						get_occlusion_query_result(query);
-						counter.result += query->result;
-					}
-					else
-					{
-						// Already have a hit, no need to retest
-						discard_occlusion_query(query);
-					}
-
-					free_query(query);
-				}
-
-				retire(ptimer, &writer, counter.result);
-				processed++;
-			}
-
-			if (!has_unclaimed)
-			{
-				ensure(processed == m_pending_writes.size());
-				m_pending_writes.clear();
-			}
-			else
-			{
-				auto remaining = m_pending_writes.size() - processed;
-				ensure(remaining > 0);
-
-				if (remaining == 1)
-				{
-					m_pending_writes[0] = std::move(m_pending_writes.back());
-					m_pending_writes.resize(1);
-				}
-				else
-				{
-					std::move(m_pending_writes.begin() + processed, m_pending_writes.end(), m_pending_writes.begin());
-					m_pending_writes.resize(remaining);
-				}
-			}
-
-			// Delete all statistics caches but leave the current one
-			const u32 current_index = m_statistics_tag_id;
-			const u32 previous_index = (current_index + max_stat_registers - 1) % max_stat_registers;
-			for (u32 index = previous_index; index != current_index;)
-			{
-				if (m_statistics_map[index].flags == 0)
-				{
-					break;
-				}
-
-				m_statistics_map[index].flags = 0;
-				index = (index + max_stat_registers - 1) % max_stat_registers;
-			}
-
-			//Decrement jobs counter
-			ptimer->async_tasks_pending -= processed;
-		}
-
-		void ZCULL_control::update(::rsx::thread* ptimer, u32 sync_address, bool hint)
-		{
-			if (m_pending_writes.empty())
-			{
-				return;
-			}
-
-			const auto& front = m_pending_writes.front();
-			if (!front.sink)
-			{
-				// No writables in queue, abort
-				return;
-			}
-
-			if (!sync_address)
-			{
-				if (hint || ptimer->async_tasks_pending + 0u >= max_safe_queue_depth)
-				{
-					// Prepare the whole queue for reading. This happens when zcull activity is disabled or queue is too long
-					for (auto It = m_pending_writes.rbegin(); It != m_pending_writes.rend(); ++It)
-					{
-						if (It->query)
-						{
-							if (It->query->num_draws && It->query->sync_tag > m_sync_tag)
-							{
-								ptimer->sync_hint(FIFO::interrupt_hint::zcull_sync, { .query = It->query });
-								ensure(It->query->sync_tag <= m_sync_tag);
-							}
-
-							break;
-						}
-					}
-				}
-
-				if (m_tsc = get_system_time(); m_tsc < m_next_tsc)
-				{
-					return;
-				}
-				else
-				{
-					// Schedule ahead
-					m_next_tsc = m_tsc + min_zcull_tick_us;
-
-					// Schedule a queue flush if needed
-					if (!g_cfg.video.relaxed_zcull_sync && m_critical_reports_in_flight &&
-						front.query && front.query->num_draws && front.query->sync_tag > m_sync_tag)
-					{
-						const auto elapsed = m_tsc - front.query->timestamp;
-						if (elapsed > max_zcull_delay_us)
-						{
-							ptimer->sync_hint(FIFO::interrupt_hint::zcull_sync, { .query = front.query });
-							ensure(front.query->sync_tag <= m_sync_tag);
-						}
-
-						return;
-					}
-				}
-			}
-
-			u32 processed = 0;
-			for (auto& writer : m_pending_writes)
-			{
-				if (!writer.sink)
-					break;
-
-				auto query = writer.query;
-				auto& counter = m_statistics_map[writer.counter_tag];
-
-				const bool force_read = (sync_address != 0);
-				if (force_read && writer.sink == sync_address && !writer.forwarder)
-				{
-					// Forced reads end here
-					sync_address = 0;
-				}
-
-				if (query)
-				{
-					ensure(query->pending);
-
-					const bool implemented = (writer.type == CELL_GCM_ZPASS_PIXEL_CNT || writer.type == CELL_GCM_ZCULL_STATS3);
-					const bool have_result = counter.result && !g_cfg.video.precise_zpass_count;
-
-					if (!implemented || !query->num_draws || have_result)
-					{
-						discard_occlusion_query(query);
-					}
-					else if (force_read || check_occlusion_query_status(query))
-					{
-						get_occlusion_query_result(query);
-						counter.result += query->result;
-					}
-					else
-					{
-						// Too early; abort
-						ensure(!force_read && implemented);
-						break;
-					}
-
-					free_query(query);
-				}
-
-				// Release the stat tag for this object. Slots are all or nothing.
-				m_statistics_map[writer.counter_tag].flags = 0;
-
-				retire(ptimer, &writer, counter.result);
-				processed++;
-			}
-
-			if (processed)
-			{
-				auto remaining = m_pending_writes.size() - processed;
-				if (remaining == 1)
-				{
-					m_pending_writes[0] = std::move(m_pending_writes.back());
-					m_pending_writes.resize(1);
-				}
-				else if (remaining)
-				{
-					std::move(m_pending_writes.begin() + processed, m_pending_writes.end(), m_pending_writes.begin());
-					m_pending_writes.resize(remaining);
-				}
-				else
-				{
-					m_pending_writes.clear();
-				}
-
-				ptimer->async_tasks_pending -= processed;
-			}
-		}
-
-		flags32_t ZCULL_control::read_barrier(::rsx::thread* ptimer, u32 memory_address, u32 memory_range, flags32_t flags)
-		{
-			if (m_pending_writes.empty())
-				return result_none;
-
-			const auto memory_end = memory_address + memory_range;
-
-			AUDIT(memory_end >= memory_address);
-
-			u32 sync_address = 0;
-			occlusion_query_info* query = nullptr;
-
-			for (auto It = m_pending_writes.crbegin(); It != m_pending_writes.crend(); ++It)
-			{
-				if (sync_address)
-				{
-					if (It->query)
-					{
-						sync_address = It->sink;
-						query = It->query;
-						break;
-					}
-
-					continue;
-				}
-
-				if (It->sink >= memory_address && It->sink < memory_end)
-				{
-					sync_address = It->sink;
-
-					// NOTE: If application is spamming requests, there may be no query attached
-					if (It->query)
-					{
-						query = It->query;
-						break;
-					}
-				}
-			}
-
-			if (!sync_address || !query)
-			{
-				return result_none;
-			}
-
-			// Disable optimizations across the accessed range if reports reside within
-			{
-				std::scoped_lock lock(m_pages_mutex);
-
-				const auto location1 = rsx::classify_location(memory_address);
-				const auto location2 = rsx::classify_location(memory_end - 1);
-
-				if (!m_pages_accessed[location1])
-				{
-					disable_optimizations(ptimer, location1);
-				}
-
-				if (!m_pages_accessed[location2])
-				{
-					disable_optimizations(ptimer, location2);
-				}
-			}
-
-			if (!(flags & sync_defer_copy))
-			{
-				if (!(flags & sync_no_notify))
-				{
-					if (query->sync_tag > m_sync_tag) [[unlikely]]
-					{
-						ptimer->sync_hint(FIFO::interrupt_hint::zcull_sync, { .query = query });
-						ensure(m_sync_tag >= query->sync_tag);
-					}
-				}
-
-				// There can be multiple queries all writing to the same address, loop to flush all of them
-				while (query->pending)
-				{
-					update(ptimer, sync_address);
-				}
-				return result_none;
-			}
-
-			return result_zcull_intr;
-		}
-
-		flags32_t ZCULL_control::read_barrier(class ::rsx::thread* ptimer, u32 memory_address, occlusion_query_info* query)
-		{
-			// Called by cond render control. Internal RSX usage, do not disable optimizations
-			while (query->pending)
-			{
-				update(ptimer, memory_address);
-			}
-
-			return result_none;
-		}
-
-		query_search_result ZCULL_control::find_query(vm::addr_t sink_address, bool all)
-		{
-			query_search_result result{};
-			u32 stat_id = 0;
-
-			for (auto It = m_pending_writes.crbegin(); It != m_pending_writes.crend(); ++It)
-			{
-				if (stat_id) [[unlikely]]
-				{
-					if (It->counter_tag != stat_id)
-					{
-						if (result.found)
-						{
-							// Some result was found, return it instead
-							break;
-						}
-
-						// Zcull stats were cleared between this query and the required stats, result can only be 0
-						return { true, 0, {} };
-					}
-
-					if (It->query && It->query->num_draws)
-					{
-						result.found = true;
-						result.queries.push_back(It->query);
-
-						if (!all)
-						{
-							break;
-						}
-					}
-				}
-				else if (It->sink == sink_address)
-				{
-					if (It->query && It->query->num_draws)
-					{
-						result.found = true;
-						result.queries.push_back(It->query);
-
-						if (!all)
-						{
-							break;
-						}
-					}
-
-					stat_id = It->counter_tag;
-				}
-			}
-
-			return result;
-		}
-
-		u32 ZCULL_control::copy_reports_to(u32 start, u32 range, u32 dest)
-		{
-			u32 bytes_to_write = 0;
-			const auto memory_range = utils::address_range32::start_length(start, range);
-			for (auto& writer : m_pending_writes)
-			{
-				if (!writer.sink)
-					break;
-
-				if (!writer.forwarder && memory_range.overlaps(writer.sink))
-				{
-					u32 address = (writer.sink - start) + dest;
-					writer.sink_alias.push_back(vm::cast(address));
-				}
-			}
-
-			return bytes_to_write;
-		}
-
-		void ZCULL_control::on_report_enqueued(vm::addr_t address)
-		{
-			const auto location = rsx::classify_location(address);
-			std::scoped_lock lock(m_pages_mutex);
-
-			if (!m_pages_accessed[location]) [[ likely ]]
-			{
-				const auto page_address = utils::page_start(static_cast<u32>(address));
-				auto& page = m_locked_pages[location][page_address];
-				page.add_ref();
-
-				if (page.prot == utils::protection::rw)
-				{
-					utils::memory_protect(vm::base(page_address), utils::get_page_size(), utils::protection::no);
-					page.prot = utils::protection::no;
-				}
-			}
-			else
-			{
-				m_critical_reports_in_flight++;
-			}
-		}
-
-		void ZCULL_control::on_report_completed(vm::addr_t address)
-		{
-			const auto location = rsx::classify_location(address);
-			if (!m_pages_accessed[location])
-			{
-				const auto page_address = utils::page_start(static_cast<u32>(address));
-				std::scoped_lock lock(m_pages_mutex);
-
-				if (auto found = m_locked_pages[location].find(page_address);
-					found != m_locked_pages[location].end())
-				{
-					auto& page = found->second;
-
-					ensure(page.has_refs());
-					page.release();
-				}
-			}
-
-			if (m_pages_accessed[location])
-			{
-				m_critical_reports_in_flight--;
-			}
-		}
-
-		void ZCULL_control::disable_optimizations(::rsx::thread*, u32 location)
-		{
-			// Externally synchronized
-			rsx_log.warning("Reports area at location %s was accessed. ZCULL optimizations will be disabled.", location_tostring(location));
-			m_pages_accessed[location] = true;
-
-			// Unlock pages
-			for (auto& p : m_locked_pages[location])
-			{
-				const auto this_address = p.first;
-				auto& page = p.second;
-
-				if (page.prot != utils::protection::rw)
-				{
-					utils::memory_protect(vm::base(this_address), utils::get_page_size(), utils::protection::rw);
-					page.prot = utils::protection::rw;
-				}
-
-				while (page.has_refs())
-				{
-					m_critical_reports_in_flight++;
-					page.release();
-				}
-			}
-
-			m_locked_pages[location].clear();
-		}
-
-		bool ZCULL_control::on_access_violation(u32 address)
-		{
-			const auto page_address = utils::page_start(address);
-			const auto location = rsx::classify_location(address);
-
-			if (m_pages_accessed[location])
-			{
-				// Already faulted, no locks possible
-				return false;
-			}
-
-			bool need_disable_optimizations = false;
-			{
-				reader_lock lock(m_pages_mutex);
-
-				if (auto found = m_locked_pages[location].find(page_address);
-					found != m_locked_pages[location].end())
-				{
-					lock.upgrade();
-
-					auto& fault_page = m_locked_pages[location][page_address];
-					if (fault_page.prot != utils::protection::rw)
-					{
-						if (fault_page.has_refs())
-						{
-							// R/W to active block
-							need_disable_optimizations = true;    // Defer actual operation
-							m_pages_accessed[location] = true;
-						}
-						else
-						{
-							// R/W to stale block, unload it and move on
-							utils::memory_protect(vm::base(page_address), utils::get_page_size(), utils::protection::rw);
-							m_locked_pages[location].erase(page_address);
-
-							return true;
-						}
-					}
-				}
-			}
-
-			// Deadlock avoidance, do not pause RSX FIFO eng while holding the pages lock
-			if (need_disable_optimizations)
-			{
-				auto thr = rsx::get_current_renderer();
-				rsx::eng_lock rlock(thr);
-				std::scoped_lock lock(m_pages_mutex);
-				disable_optimizations(thr, location);
-
-				thr->m_eng_interrupt_mask |= rsx::pipe_flush_interrupt;
-				return true;
-			}
-
-			return false;
-		}
-
-
-		// Conditional rendering helpers
-		void conditional_render_eval::reset()
-		{
-			eval_address = 0;
-			eval_sync_tag = 0;
-			eval_sources.clear();
-
-			eval_failed = false;
-		}
-
-		bool conditional_render_eval::disable_rendering() const
-		{
-			return (enabled && eval_failed);
-		}
-
-		bool conditional_render_eval::eval_pending() const
-		{
-			return (enabled && eval_address);
-		}
-
-		void conditional_render_eval::enable_conditional_render(::rsx::thread* pthr, u32 address)
-		{
-			if (hw_cond_active)
-			{
-				ensure(enabled);
-				pthr->end_conditional_rendering();
-			}
-
-			reset();
-
-			enabled = true;
-			eval_address = address;
-		}
-
-		void conditional_render_eval::disable_conditional_render(::rsx::thread* pthr)
-		{
-			if (hw_cond_active)
-			{
-				ensure(enabled);
-				pthr->end_conditional_rendering();
-			}
-
-			reset();
-			enabled = false;
-		}
-
-		void conditional_render_eval::set_eval_sources(std::vector<occlusion_query_info*>& sources)
-		{
-			eval_sources = std::move(sources);
-			eval_sync_tag = eval_sources.front()->sync_tag;
-		}
-
-		void conditional_render_eval::set_eval_result(::rsx::thread* pthr, bool failed)
-		{
-			if (hw_cond_active)
-			{
-				ensure(enabled);
-				pthr->end_conditional_rendering();
-			}
-
-			reset();
-			eval_failed = failed;
-		}
-
-		void conditional_render_eval::eval_result(::rsx::thread* pthr)
-		{
-			vm::ptr<CellGcmReportData> result = vm::cast(eval_address);
-			const bool failed = (result->value == 0u);
-			set_eval_result(pthr, failed);
-		}
-	}
-}
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/RSXZCULL.h b/rpcs3/Emu/RSX/RSXZCULL.h
deleted file mode 100644
index 679357b457..0000000000
--- a/rpcs3/Emu/RSX/RSXZCULL.h
+++ /dev/null
@@ -1,246 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include <util/vm.hpp>
-#include <Emu/Memory/vm.h>
-
-#include "Utilities/mutex.h"
-
-#include "rsx_utils.h"
-
-#include <vector>
-#include <stack>
-#include <unordered_map>
-
-namespace rsx
-{
-	class thread;
-
-	static inline std::string_view location_tostring(u32 location)
-	{
-		constexpr const char* location_names[2] = { "CELL_GCM_LOCATION_LOCAL", "CELL_GCM_LOCATION_MAIN" };
-		return ::at32(location_names, location);
-	}
-
-	static inline u32 classify_location(u32 address)
-	{
-		return (address >= rsx::constants::local_mem_base) ? CELL_GCM_LOCATION_LOCAL : CELL_GCM_LOCATION_MAIN;
-	}
-
-	namespace reports
-	{
-		struct occlusion_query_info
-		{
-			u32 driver_handle;
-			u32 result;
-			u32 num_draws;
-			u32 data_type;
-			u64 sync_tag;
-			u64 timestamp;
-			bool pending;
-			bool active;
-			bool owned;
-		};
-
-		struct queued_report_write
-		{
-			u32 type = CELL_GCM_ZPASS_PIXEL_CNT;
-			u32 counter_tag;
-			occlusion_query_info* query;
-			queued_report_write* forwarder;
-
-			vm::addr_t sink;                      // Memory location of the report
-			std::vector<vm::addr_t> sink_alias;   // Aliased memory addresses
-		};
-
-		struct query_search_result
-		{
-			bool found;
-			u32  raw_zpass_result;
-			std::vector<occlusion_query_info*> queries;
-		};
-
-		struct query_stat_counter
-		{
-			u32 result;
-			u32 flags;
-		};
-
-		struct sync_hint_payload_t
-		{
-			occlusion_query_info* query;
-			vm::addr_t address;
-			void* other_params;
-		};
-
-		struct MMIO_page_data_t : public rsx::ref_counted
-		{
-			utils::protection prot = utils::protection::rw;
-		};
-
-		enum sync_control
-		{
-			sync_none = 0,
-			sync_defer_copy = 1, // If set, return a zcull intr code instead of forcefully reading zcull data
-			sync_no_notify = 2   // If set, backend hint notifications will not be made
-		};
-
-		enum constants
-		{
-			max_zcull_delay_us    = 300,   // Delay before a report update operation is forced to retire
-			min_zcull_tick_us     = 100,   // Default tick duration. To avoid hardware spam, we schedule peeks in multiples of this.
-			occlusion_query_count = 2048,  // Number of occlusion query slots available. Real hardware actually has far fewer units before choking
-			max_safe_queue_depth  = 1792,  // Number of in-flight queries before we start forcefully flushing data from the GPU device.
-			max_stat_registers    = 8192   // Size of the statistics cache
-		};
-
-		class ZCULL_control
-		{
-		private:
-			std::unordered_map<u32, MMIO_page_data_t> m_locked_pages[2];
-			atomic_t<bool> m_pages_accessed[2] = { false, false };
-			atomic_t<s32> m_critical_reports_in_flight = { 0 };
-			shared_mutex m_pages_mutex;
-
-			void on_report_enqueued(vm::addr_t address);
-			void on_report_completed(vm::addr_t address);
-			void disable_optimizations(class ::rsx::thread* ptimer, u32 location);
-
-		protected:
-
-			bool unit_enabled = false;           // The ZCULL unit is on
-			bool write_enabled = false;          // A surface in the ZCULL-monitored tile region has been loaded for rasterization
-			bool stats_enabled = false;          // Collecting of ZCULL statistics is enabled (not same as pixels passing Z test!)
-			bool zpass_count_enabled = false;    // Collecting of ZPASS statistics is enabled. If this is off, the counter does not increment
-			bool host_queries_active = false;    // The backend/host is gathering Z data for the ZCULL unit
-
-			std::array<occlusion_query_info, 2048> m_occlusion_query_data = {};
-			std::stack<occlusion_query_info*> m_free_occlusion_pool{};
-
-			occlusion_query_info* m_current_task = nullptr;
-			u32 m_statistics_tag_id = 0;
-
-			// Scheduling clock. Granunlarity is min_zcull_tick value.
-			u64 m_tsc = 0;
-			u64 m_next_tsc = 0;
-
-			// Incremental tag used for tracking sync events. Hardware clock resolution is too low for the job.
-			u64 m_sync_tag = 0;
-			u64 m_timer = 0;
-
-			std::vector<queued_report_write> m_pending_writes{};
-			std::array<query_stat_counter, max_stat_registers> m_statistics_map{};
-
-			// Enables/disables the ZCULL unit
-			void set_active(class ::rsx::thread* ptimer, bool state, bool flush_queue);
-
-			// Checks current state of the unit and applies changes
-			void check_state(class ::rsx::thread* ptimer, bool flush_queue);
-
-			// Sets up a new query slot and sets it to the current task
-			void allocate_new_query(class ::rsx::thread* ptimer);
-
-			// Free a query slot in use
-			void free_query(occlusion_query_info* query);
-
-			// Write report to memory
-			void write(vm::addr_t sink, u64 timestamp, u32 type, u32 value);
-			void write(queued_report_write* writer, u64 timestamp, u32 value);
-
-			// Retire operation
-			void retire(class ::rsx::thread* ptimer, queued_report_write* writer, u32 result);
-
-		public:
-
-			ZCULL_control();
-			virtual ~ZCULL_control();
-
-			ZCULL_control(const ZCULL_control&) = delete;
-			ZCULL_control& operator=(const ZCULL_control&) = delete;
-
-			void set_enabled(class ::rsx::thread* ptimer, bool state, bool flush_queue = false);
-			void set_status(class ::rsx::thread* ptimer, bool surface_active, bool zpass_active, bool zcull_stats_active, bool flush_queue = false);
-
-			// Read current zcull statistics into the address provided
-			void read_report(class ::rsx::thread* ptimer, vm::addr_t sink, u32 type);
-
-			// Clears current stat block and increments stat_tag_id
-			void clear(class ::rsx::thread* ptimer, u32 type);
-
-			// Forcefully flushes all
-			void sync(class ::rsx::thread* ptimer);
-
-			// Conditionally sync any pending writes if range overlaps
-			flags32_t read_barrier(class ::rsx::thread* ptimer, u32 memory_address, u32 memory_range, flags32_t flags);
-			flags32_t read_barrier(class ::rsx::thread* ptimer, u32 memory_address, occlusion_query_info* query);
-
-			// Call once every 'tick' to update, optional address provided to partially sync until address is processed
-			void update(class ::rsx::thread* ptimer, u32 sync_address = 0, bool hint = false);
-
-			// Draw call notification
-			void on_draw();
-
-			// Sync hint notification
-			void on_sync_hint(sync_hint_payload_t payload);
-
-			// Check for pending writes
-			bool has_pending() const { return !m_pending_writes.empty(); }
-
-			// Search for query synchronized at address
-			query_search_result find_query(vm::addr_t sink_address, bool all);
-
-			// Copies queries in range rebased from source range to destination range
-			u32 copy_reports_to(u32 start, u32 range, u32 dest);
-
-			// Check paging issues
-			bool on_access_violation(u32 address);
-
-			// Optimization check
-			bool is_query_result_urgent(u32 address) const { return m_pages_accessed[rsx::classify_location(address)]; }
-
-			// Backend methods (optional, will return everything as always visible by default)
-			virtual void begin_occlusion_query(occlusion_query_info* /*query*/) {}
-			virtual void end_occlusion_query(occlusion_query_info* /*query*/) {}
-			virtual bool check_occlusion_query_status(occlusion_query_info* /*query*/) { return true; }
-			virtual void get_occlusion_query_result(occlusion_query_info* query) { query->result = -1; }
-			virtual void discard_occlusion_query(occlusion_query_info* /*query*/) {}
-		};
-
-		// Helper class for conditional rendering
-		struct conditional_render_eval
-		{
-			bool enabled = false;
-			bool eval_failed = false;
-			bool hw_cond_active = false;
-			bool reserved = false;
-
-			std::vector<occlusion_query_info*> eval_sources;
-			u64 eval_sync_tag = 0;
-			u32 eval_address = 0;
-
-			// Resets common data
-			void reset();
-
-			// Returns true if rendering is disabled as per conditional render test
-			bool disable_rendering() const;
-
-			// Returns true if a conditional render is active but not yet evaluated
-			bool eval_pending() const;
-
-			// Enable conditional rendering
-			void enable_conditional_render(thread* pthr, u32 address);
-
-			// Disable conditional rendering
-			void disable_conditional_render(thread* pthr);
-
-			// Sets data sources for predicate evaluation
-			void set_eval_sources(std::vector<occlusion_query_info*>& sources);
-
-			// Sets evaluation result. Result is true if conditional evaluation failed
-			void set_eval_result(thread* pthr, bool failed);
-
-			// Evaluates the condition by accessing memory directly
-			void eval_result(thread* pthr);
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp
index fd4e667ef9..6e06490582 100644
--- a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp
+++ b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp
@@ -1,11 +1,16 @@
 #include "VKAsyncScheduler.h"
 #include "VKHelpers.h"
+#include "VKResourceManager.h"
+
+#include "Emu/IdManager.h"
+#include "Utilities/lockless.h"
+#include "Utilities/mutex.h"
 
 #include <vector>
 
 namespace vk
 {
-	AsyncTaskScheduler::AsyncTaskScheduler(vk_gpu_scheduler_mode mode, const VkDependencyInfoKHR& queue_dependency)
+	void AsyncTaskScheduler::operator()()
 	{
 		if (g_cfg.video.renderer != video_renderer::vulkan || !g_cfg.video.vk.asynchronous_texture_streaming)
 		{
@@ -15,7 +20,106 @@ namespace vk
 			return;
 		}
 
-		init_config_options(mode, queue_dependency);
+		init_config_options();
+		if (!m_use_host_scheduler)
+		{
+			// No need to keep the GPU alive using a CPU thread.
+			rsx_log.notice("Host scheduler is disabled. This thread will now exit.");
+			return;
+		}
+
+		// If this thread is unavailable for too long, your GPU will hard crash and force a full reset
+		// TODO: Investigate if this can be executed outside the application context. Attach a debugger to rpcs3 and boom - GPU reset. Not fun rebooting so often.
+		thread_ctrl::set_native_priority(1);
+
+		add_ref();
+
+		while (thread_ctrl::state() != thread_state::aborting)
+		{
+			for (auto&& job : m_event_queue.pop_all())
+			{
+				if (job->type == xqueue_event_type::barrier)
+				{
+					// Blocks the queue from progressing until the work items are actually submitted to the GPU
+					// Avoids spamming the GPU with event requests when the events have not even been submitted yet
+					while (job->completion_eid == m_submit_count.load())
+					{
+						thread_ctrl::wait_for(100);
+					}
+					continue;
+				}
+
+				vk::wait_for_event(job->queue1_signal.get(), GENERAL_WAIT_TIMEOUT);
+				job->queue2_signal->host_signal();
+			}
+		}
+
+		release();
+	}
+
+	void AsyncTaskScheduler::init_config_options()
+	{
+		std::lock_guard lock(m_config_mutex);
+		if (std::exchange(m_options_initialized, true))
+		{
+			// Nothing to do
+			return;
+		}
+
+		m_use_host_scheduler = g_cfg.video.vk.asynchronous_scheduler == vk_gpu_scheduler_mode::host || g_cfg.video.strict_rendering_mode;
+		rsx_log.notice("Asynchronous task scheduler is active running in %s mode", m_use_host_scheduler? "'Host'" : "'Device'");
+	}
+
+	void AsyncTaskScheduler::delayed_init()
+	{
+		init_config_options();
+
+		auto pdev = get_current_renderer();
+		m_command_pool.create(*const_cast<render_device*>(pdev), pdev->get_transfer_queue_family());
+
+		for (usz i = 0; i < events_pool_size; ++i)
+		{
+			auto ev1 = std::make_unique<event>(*get_current_renderer(), sync_domain::gpu);
+			auto ev2 = std::make_unique<event>(*get_current_renderer(), sync_domain::gpu);
+			m_events_pool.emplace_back(ev1, ev2, 0ull, i);
+		}
+
+		for (usz i = 0; i < VK_MAX_ASYNC_COMPUTE_QUEUES; ++i)
+		{
+			m_barriers_pool.emplace_back(0ull, 0xFFFF0000 + i);
+		}
+	}
+
+	void AsyncTaskScheduler::insert_sync_event()
+	{
+		ensure(m_current_cb);
+		ensure(m_next_event_id < events_pool_size);
+		auto sync_label = &m_events_pool[m_next_event_id];
+
+		if (++m_next_event_id == events_pool_size)
+		{
+			// Wrap
+			m_next_event_id = 0;
+		}
+
+		ensure(sync_label->completion_eid <= vk::last_completed_event_id());
+
+		m_sync_label_debug_uid = sync_label->uid;
+		sync_label->queue1_signal->reset();
+		sync_label->queue2_signal->reset();
+		sync_label->completion_eid = vk::current_event_id();
+
+		sync_label->queue1_signal->signal(*m_current_cb, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, 0);
+
+		if (m_use_host_scheduler)
+		{
+			m_event_queue.push(sync_label);
+			m_sync_label = sync_label->queue2_signal.get();
+		}
+		else
+		{
+			m_sync_label = sync_label->queue1_signal.get();
+		}
 	}
 
 	AsyncTaskScheduler::~AsyncTaskScheduler()
@@ -27,56 +131,6 @@ namespace vk
 		}
 	}
 
-	void AsyncTaskScheduler::init_config_options(vk_gpu_scheduler_mode mode, const VkDependencyInfoKHR& queue_dependency)
-	{
-		std::lock_guard lock(m_config_mutex);
-		if (std::exchange(m_options_initialized, true))
-		{
-			// Nothing to do
-			return;
-		}
-
-		m_use_host_scheduler = (mode == vk_gpu_scheduler_mode::safe) || g_cfg.video.strict_rendering_mode;
-		rsx_log.notice("Asynchronous task scheduler is active running in %s mode", m_use_host_scheduler? "'Safe'" : "'Fast'");
-
-		m_dependency_info = queue_dependency;
-	}
-
-	void AsyncTaskScheduler::delayed_init()
-	{
-		ensure(m_options_initialized);
-
-		auto pdev = get_current_renderer();
-		m_command_pool.create(*const_cast<render_device*>(pdev), pdev->get_transfer_queue_family());
-
-		if (m_use_host_scheduler)
-		{
-			for (usz i = 0; i < events_pool_size; ++i)
-			{
-				auto sema = std::make_unique<semaphore>(*pdev);
-				m_semaphore_pool.emplace_back(std::move(sema));
-			}
-
-			return;
-		}
-
-		for (usz i = 0; i < events_pool_size; ++i)
-		{
-			auto ev = std::make_unique<vk::event>(*pdev, sync_domain::gpu);
-			m_events_pool.emplace_back(std::move(ev));
-		}
-	}
-
-	void AsyncTaskScheduler::insert_sync_event()
-	{
-		ensure(m_current_cb);
-		auto& sync_label = m_events_pool[m_next_event_id++ % events_pool_size];
-
-		sync_label->reset();
-		sync_label->signal(*m_current_cb, m_dependency_info);
-		m_sync_label = sync_label.get();
-	}
-
 	command_buffer* AsyncTaskScheduler::get_current()
 	{
 		std::lock_guard lock(m_submit_mutex);
@@ -110,18 +164,21 @@ namespace vk
 			{
 				m_async_command_queue.emplace_back();
 				m_current_cb = &m_async_command_queue.back();
-				m_current_cb->create(m_command_pool);
+				m_current_cb->create(m_command_pool, true);
 			}
 		}
 
+		// 3. Insert a barrier for this CB. A job is about to be scheduled on it immediately.
+		auto barrier = &m_barriers_pool[m_next_cb_index];
+		barrier->completion_eid = m_submit_count;
+		m_event_queue.push(barrier);
+
 		m_next_cb_index++;
 		return m_current_cb;
 	}
 
 	event* AsyncTaskScheduler::get_primary_sync_label()
 	{
-		ensure(!m_use_host_scheduler);
-
 		if (m_sync_required) [[unlikely]]
 		{
 			std::lock_guard lock(m_submit_mutex); // For some reason this is inexplicably expensive. WTF!
@@ -133,45 +190,40 @@ namespace vk
 		return std::exchange(m_sync_label, nullptr);
 	}
 
-	semaphore* AsyncTaskScheduler::get_sema()
+	u64 AsyncTaskScheduler::get_primary_sync_label_debug_uid()
 	{
-		if (m_semaphore_pool.empty())
-		{
-			delayed_init();
-			ensure(!m_semaphore_pool.empty());
-		}
-
-		const u32 sema_id = static_cast<u32>(m_next_semaphore_id++ % m_semaphore_pool.size());
-		return m_semaphore_pool[sema_id].get();
+		return std::exchange(m_sync_label_debug_uid, ~0ull);
 	}
 
-	void AsyncTaskScheduler::flush(queue_submit_t& submit_info, VkBool32 force_flush)
+	void AsyncTaskScheduler::flush(VkBool32 force_flush, VkSemaphore wait_semaphore, VkPipelineStageFlags wait_dst_stage_mask)
 	{
 		if (!m_current_cb)
 		{
 			return;
 		}
 
-		submit_info.queue = get_current_renderer()->get_transfer_queue();
-
 		std::lock_guard lock(m_submit_mutex);
-		if (m_sync_required && !m_use_host_scheduler)
+		if (m_sync_required)
 		{
 			insert_sync_event();
 		}
 
 		m_current_cb->end();
-		m_current_cb->submit(submit_info, force_flush);
+		m_current_cb->submit(get_current_renderer()->get_transfer_queue(), wait_semaphore, VK_NULL_HANDLE, nullptr, wait_dst_stage_mask, force_flush);
 
 		m_submit_count++;
+		thread_ctrl::notify(g_fxo->get<async_scheduler_thread>());
 
 		m_last_used_cb = m_current_cb;
 		m_current_cb = nullptr;
 		m_sync_required = false;
 	}
 
-	void AsyncTaskScheduler::destroy()
+	void AsyncTaskScheduler::kill()
 	{
+		g_fxo->get<async_scheduler_thread>() = thread_state::aborting;
+		while (has_refs());
+
 		for (auto& cb : m_async_command_queue)
 		{
 			cb.destroy();
@@ -181,6 +233,5 @@ namespace vk
 		m_next_cb_index = 0;
 		m_command_pool.destroy();
 		m_events_pool.clear();
-		m_semaphore_pool.clear();
 	}
 }
diff --git a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h
index 0b00830804..b85370d959 100644
--- a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h
+++ b/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h
@@ -2,13 +2,43 @@
 
 #include "vkutils/commands.h"
 #include "vkutils/sync.h"
-#include "Utilities/mutex.h"
+
+#include "Utilities/Thread.h"
 
 #define VK_MAX_ASYNC_COMPUTE_QUEUES 256
 
 namespace vk
 {
-	class AsyncTaskScheduler
+	enum class xqueue_event_type
+	{
+		label,
+		barrier
+	};
+
+	struct xqueue_event
+	{
+		// Type
+		xqueue_event_type type;
+
+		// Payload
+		std::unique_ptr<event> queue1_signal;
+		std::unique_ptr<event> queue2_signal;
+
+		// Identifiers
+		u64 completion_eid;
+		u64 uid;
+
+		xqueue_event(u64 eid, u64 _uid)
+			: type(xqueue_event_type::barrier), completion_eid(eid), uid(_uid)
+		{}
+
+		xqueue_event(std::unique_ptr<event>& trigger, std::unique_ptr<event>& payload, u64 eid, u64 _uid)
+			: type(xqueue_event_type::label), queue1_signal(std::move(trigger)), queue2_signal(std::move(payload)),
+			  completion_eid(eid), uid(_uid)
+		{}
+	};
+
+	class AsyncTaskScheduler : private rsx::ref_counted
 	{
 		// Vulkan resources
 		std::vector<command_buffer> m_async_command_queue;
@@ -18,6 +48,7 @@ namespace vk
 		command_buffer* m_last_used_cb = nullptr;
 		command_buffer* m_current_cb = nullptr;
 		usz m_next_cb_index = 0;
+		std::vector<xqueue_event> m_barriers_pool;
 		atomic_t<u64> m_submit_count = 0;
 
 		// Scheduler
@@ -28,34 +59,35 @@ namespace vk
 		// Sync
 		event* m_sync_label = nullptr;
 		atomic_t<bool> m_sync_required = false;
-		VkDependencyInfoKHR m_dependency_info{};
+		u64 m_sync_label_debug_uid = 0;
 
 		static constexpr u32 events_pool_size = 16384;
-		std::vector<std::unique_ptr<vk::event>> m_events_pool;
-		atomic_t<u64> m_next_event_id = 0;
-
-		std::vector<std::unique_ptr<vk::semaphore>> m_semaphore_pool;
-		atomic_t<u64> m_next_semaphore_id = 0;
+		std::vector<xqueue_event> m_events_pool;
+		atomic_t<u32> m_next_event_id = 0;
 
+		lf_queue<xqueue_event*> m_event_queue;
 		shared_mutex m_submit_mutex;
 
-		void init_config_options(vk_gpu_scheduler_mode mode, const VkDependencyInfoKHR& queue_dependency);
+		void init_config_options();
 		void delayed_init();
 		void insert_sync_event();
 
 	public:
-		AsyncTaskScheduler(vk_gpu_scheduler_mode mode, const VkDependencyInfoKHR& queue_dependency);
+		AsyncTaskScheduler(const std::string_view& name) : thread_name(name) {} // This ctor stops default initialization by fxo
 		~AsyncTaskScheduler();
 
 		command_buffer* get_current();
 		event* get_primary_sync_label();
-		semaphore* get_sema();
+		u64 get_primary_sync_label_debug_uid();
 
-		void flush(queue_submit_t& submit_info, VkBool32 force_flush);
-		void destroy();
+		void flush(VkBool32 force_flush, VkSemaphore wait_semaphore = VK_NULL_HANDLE, VkPipelineStageFlags wait_dst_stage_mask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT);
+		void kill();
 
-		// Inline getters
-		inline bool is_recording() const { return m_current_cb != nullptr; }
-		inline bool is_host_mode() const { return m_use_host_scheduler; }
+		// Thread entry-point
+		void operator()();
+
+		const std::string_view thread_name;
 	};
+
+	using async_scheduler_thread = named_thread<AsyncTaskScheduler>;
 }
diff --git a/rpcs3/Emu/RSX/VK/VKCommandStream.cpp b/rpcs3/Emu/RSX/VK/VKCommandStream.cpp
index 9e2ae3f70c..3ca4256cd1 100644
--- a/rpcs3/Emu/RSX/VK/VKCommandStream.cpp
+++ b/rpcs3/Emu/RSX/VK/VKCommandStream.cpp
@@ -1,12 +1,9 @@
 #include "stdafx.h"
 #include "VKCommandStream.h"
-#include "vkutils/descriptors.h"
 #include "vkutils/sync.h"
-
 #include "Emu/IdManager.h"
-#include "Emu/RSX/RSXOffload.h"
-#include "Emu/RSX/RSXThread.h"
 #include "Emu/system_config.h"
+#include "Emu/RSX/RSXOffload.h"
 
 namespace vk
 {
@@ -23,53 +20,21 @@ namespace vk
 		g_submit_mutex.unlock();
 	}
 
-	FORCE_INLINE
-	static void queue_submit_impl(const queue_submit_t& submit_info)
+	void queue_submit(VkQueue queue, const VkSubmitInfo* info, fence* pfence, VkBool32 flush)
 	{
-		ensure(submit_info.pfence);
-		acquire_global_submit_lock();
-		VkSubmitInfo info
-		{
-			.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
-			.pNext = nullptr,
-			.waitSemaphoreCount = submit_info.wait_semaphores_count,
-			.pWaitSemaphores = submit_info.wait_semaphores.data(),
-			.pWaitDstStageMask = submit_info.wait_stages.data(),
-			.commandBufferCount = 1,
-			.pCommandBuffers = &submit_info.commands,
-			.signalSemaphoreCount = submit_info.signal_semaphores_count,
-			.pSignalSemaphores = submit_info.signal_semaphores.data()
-		};
-
-		vkQueueSubmit(submit_info.queue, 1, &info, submit_info.pfence->handle);
-		release_global_submit_lock();
-
-		// Signal fence
-		submit_info.pfence->signal_flushed();
-	}
-
-	void queue_submit(const queue_submit_t& submit_info, VkBool32 flush)
-	{
-		rsx::get_current_renderer()->get_stats().submit_count++;
-
-		// Access to this method must be externally synchronized.
-		// Offloader is guaranteed to never call this for async flushes.
-		vk::descriptors::flush();
-
 		if (!flush && g_cfg.video.multithreaded_rsx)
 		{
-			auto packet = new queue_submit_t(submit_info);
+			auto packet = new submit_packet(queue, pfence, info);
 			g_fxo->get<rsx::dma_manager>().backend_ctrl(rctrl_queue_submit, packet);
 		}
 		else
 		{
-			queue_submit_impl(submit_info);
+			acquire_global_submit_lock();
+			vkQueueSubmit(queue, 1, info, pfence->handle);
+			release_global_submit_lock();
+
+			// Signal fence
+			pfence->signal_flushed();
 		}
 	}
-
-	void queue_submit(const queue_submit_t* packet)
-	{
-		// Flush-only version used by asynchronous submit processing (MTRSX)
-		queue_submit_impl(*packet);
-	}
 }
diff --git a/rpcs3/Emu/RSX/VK/VKCommandStream.h b/rpcs3/Emu/RSX/VK/VKCommandStream.h
index 8287094dbd..e559a688f4 100644
--- a/rpcs3/Emu/RSX/VK/VKCommandStream.h
+++ b/rpcs3/Emu/RSX/VK/VKCommandStream.h
@@ -6,10 +6,10 @@ namespace vk
 {
 	struct fence;
 
-	enum rctrl_command : u32 // callback commands
+	enum // callback commands
 	{
 		rctrl_queue_submit = 0x80000000,
-		rctrl_run_gc       = 0x80000001,
+		rctrl_run_gc       = 0x80000001
 	};
 
 	struct submit_packet
diff --git a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp
index 815492caa3..f10ad0c6ba 100644
--- a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp
+++ b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp
@@ -1,10 +1,129 @@
 #include "stdafx.h"
 #include "VKCommonDecompiler.h"
 
+#ifdef _MSC_VER
+#pragma warning(push, 0)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wsuggest-override"
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Winconsistent-missing-override"
+#endif
+#endif
+#include "SPIRV/GlslangToSpv.h"
+#include "spirv-tools/optimizer.hpp"
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
+
 namespace vk
 {
+	static TBuiltInResource g_default_config;
+
+	void init_default_resources(TBuiltInResource &rsc)
+	{
+		rsc.maxLights = 32;
+		rsc.maxClipPlanes = 6;
+		rsc.maxTextureUnits = 32;
+		rsc.maxTextureCoords = 32;
+		rsc.maxVertexAttribs = 64;
+		rsc.maxVertexUniformComponents = 4096;
+		rsc.maxVaryingFloats = 64;
+		rsc.maxVertexTextureImageUnits = 32;
+		rsc.maxCombinedTextureImageUnits = 80;
+		rsc.maxTextureImageUnits = 32;
+		rsc.maxFragmentUniformComponents = 4096;
+		rsc.maxDrawBuffers = 32;
+		rsc.maxVertexUniformVectors = 128;
+		rsc.maxVaryingVectors = 8;
+		rsc.maxFragmentUniformVectors = 16;
+		rsc.maxVertexOutputVectors = 16;
+		rsc.maxFragmentInputVectors = 15;
+		rsc.minProgramTexelOffset = -8;
+		rsc.maxProgramTexelOffset = 7;
+		rsc.maxClipDistances = 8;
+		rsc.maxComputeWorkGroupCountX = 65535;
+		rsc.maxComputeWorkGroupCountY = 65535;
+		rsc.maxComputeWorkGroupCountZ = 65535;
+		rsc.maxComputeWorkGroupSizeX = 1024;
+		rsc.maxComputeWorkGroupSizeY = 1024;
+		rsc.maxComputeWorkGroupSizeZ = 64;
+		rsc.maxComputeUniformComponents = 1024;
+		rsc.maxComputeTextureImageUnits = 16;
+		rsc.maxComputeImageUniforms = 8;
+		rsc.maxComputeAtomicCounters = 8;
+		rsc.maxComputeAtomicCounterBuffers = 1;
+		rsc.maxVaryingComponents = 60;
+		rsc.maxVertexOutputComponents = 64;
+		rsc.maxGeometryInputComponents = 64;
+		rsc.maxGeometryOutputComponents = 128;
+		rsc.maxFragmentInputComponents = 128;
+		rsc.maxImageUnits = 8;
+		rsc.maxCombinedImageUnitsAndFragmentOutputs = 8;
+		rsc.maxCombinedShaderOutputResources = 8;
+		rsc.maxImageSamples = 0;
+		rsc.maxVertexImageUniforms = 0;
+		rsc.maxTessControlImageUniforms = 0;
+		rsc.maxTessEvaluationImageUniforms = 0;
+		rsc.maxGeometryImageUniforms = 0;
+		rsc.maxFragmentImageUniforms = 8;
+		rsc.maxCombinedImageUniforms = 8;
+		rsc.maxGeometryTextureImageUnits = 16;
+		rsc.maxGeometryOutputVertices = 256;
+		rsc.maxGeometryTotalOutputComponents = 1024;
+		rsc.maxGeometryUniformComponents = 1024;
+		rsc.maxGeometryVaryingComponents = 64;
+		rsc.maxTessControlInputComponents = 128;
+		rsc.maxTessControlOutputComponents = 128;
+		rsc.maxTessControlTextureImageUnits = 16;
+		rsc.maxTessControlUniformComponents = 1024;
+		rsc.maxTessControlTotalOutputComponents = 4096;
+		rsc.maxTessEvaluationInputComponents = 128;
+		rsc.maxTessEvaluationOutputComponents = 128;
+		rsc.maxTessEvaluationTextureImageUnits = 16;
+		rsc.maxTessEvaluationUniformComponents = 1024;
+		rsc.maxTessPatchComponents = 120;
+		rsc.maxPatchVertices = 32;
+		rsc.maxTessGenLevel = 64;
+		rsc.maxViewports = 16;
+		rsc.maxVertexAtomicCounters = 0;
+		rsc.maxTessControlAtomicCounters = 0;
+		rsc.maxTessEvaluationAtomicCounters = 0;
+		rsc.maxGeometryAtomicCounters = 0;
+		rsc.maxFragmentAtomicCounters = 8;
+		rsc.maxCombinedAtomicCounters = 8;
+		rsc.maxAtomicCounterBindings = 1;
+		rsc.maxVertexAtomicCounterBuffers = 0;
+		rsc.maxTessControlAtomicCounterBuffers = 0;
+		rsc.maxTessEvaluationAtomicCounterBuffers = 0;
+		rsc.maxGeometryAtomicCounterBuffers = 0;
+		rsc.maxFragmentAtomicCounterBuffers = 1;
+		rsc.maxCombinedAtomicCounterBuffers = 1;
+		rsc.maxAtomicCounterBufferSize = 16384;
+		rsc.maxTransformFeedbackBuffers = 4;
+		rsc.maxTransformFeedbackInterleavedComponents = 64;
+		rsc.maxCullDistances = 8;
+		rsc.maxCombinedClipAndCullDistances = 8;
+		rsc.maxSamples = 4;
+
+		rsc.limits.nonInductiveForLoops = true;
+		rsc.limits.whileLoops = true;
+		rsc.limits.doWhileLoops = true;
+		rsc.limits.generalUniformIndexing = true;
+		rsc.limits.generalAttributeMatrixVectorIndexing = true;
+		rsc.limits.generalVaryingIndexing = true;
+		rsc.limits.generalSamplerIndexing = true;
+		rsc.limits.generalVariableIndexing = true;
+		rsc.limits.generalConstantMatrixVectorIndexing = true;
+	}
+
 	static constexpr std::array<std::pair<std::string_view, int>, 18> varying_registers =
-	{ {
+	{{
 		{ "tc0", 0 },
 		{ "tc1", 1 },
 		{ "tc2", 2 },
@@ -21,7 +140,7 @@ namespace vk
 		{ "spec_color1", 13 },
 		{ "fog_c", 14 },
 		{ "fogc", 14 }
-	} };
+	}};
 
 	int get_varying_register_location(std::string_view varying_register_name)
 	{
@@ -36,30 +155,60 @@ namespace vk
 		fmt::throw_exception("Unknown register name: %s", varying_register_name);
 	}
 
-	int get_texture_index(std::string_view name)
+	bool compile_glsl_to_spv(std::string& shader, program_domain domain, std::vector<u32>& spv)
 	{
-		if (name.length() < 2)
-		{
-			fmt::throw_exception("Invalid texture name: '%s'", name);
-		}
+		EShLanguage lang = (domain == glsl_fragment_program) ? EShLangFragment :
+			(domain == glsl_vertex_program)? EShLangVertex : EShLangCompute;
 
-		constexpr int max_index_length = 2;
-		const int name_length = static_cast<int>(name.length());
-		std::string index;
+		glslang::TProgram program;
+		glslang::TShader shader_object(lang);
 
-		for (int char_idx = name_length - max_index_length; char_idx < name_length; ++char_idx)
+		shader_object.setEnvInput(glslang::EShSourceGlsl, lang, glslang::EShClientVulkan, 100);
+		shader_object.setEnvClient(glslang::EShClientVulkan, glslang::EShTargetClientVersion::EShTargetVulkan_1_0);
+		shader_object.setEnvTarget(glslang::EshTargetSpv, glslang::EShTargetLanguageVersion::EShTargetSpv_1_0);
+
+		bool success = false;
+		const char *shader_text = shader.data();
+
+		shader_object.setStrings(&shader_text, 1);
+
+		EShMessages msg = static_cast<EShMessages>(EShMsgVulkanRules | EShMsgSpvRules);
+		if (shader_object.parse(&g_default_config, 400, EProfile::ECoreProfile, false, true, msg))
 		{
-			if (std::isdigit(name[char_idx]))
+			program.addShader(&shader_object);
+			success = program.link(msg);
+			if (success)
 			{
-				index += name[char_idx];
+				glslang::SpvOptions options;
+				options.disableOptimizer = true;
+				options.optimizeSize = true;
+				glslang::GlslangToSpv(*program.getIntermediate(lang), spv, &options);
+
+				// Now we optimize
+				//spvtools::Optimizer optimizer(SPV_ENV_VULKAN_1_0);
+				//optimizer.RegisterPass(spvtools::CreateUnifyConstantPass());      // Remove duplicate constants
+				//optimizer.RegisterPass(spvtools::CreateMergeReturnPass());        // Huge savings in vertex interpreter and likely normal vertex shaders
+				//optimizer.RegisterPass(spvtools::CreateAggressiveDCEPass());      // Remove dead code
+				//optimizer.Run(spv.data(), spv.size(), &spv);
 			}
 		}
-
-		if (index.empty())
+		else
 		{
-			fmt::throw_exception("Invalid texture name: '%s'", name);
+			rsx_log.error("%s", shader_object.getInfoLog());
+			rsx_log.error("%s", shader_object.getInfoDebugLog());
 		}
 
-		return std::atoi(index.c_str());
+		return success;
+	}
+
+	void initialize_compiler_context()
+	{
+		glslang::InitializeProcess();
+		init_default_resources(g_default_config);
+	}
+
+	void finalize_compiler_context()
+	{
+		glslang::FinalizeProcess();
 	}
 }
diff --git a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.h b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.h
index b17eb83b11..5a28cfd86f 100644
--- a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.h
+++ b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.h
@@ -6,6 +6,8 @@ namespace vk
 	using namespace ::glsl;
 
 	int get_varying_register_location(std::string_view varying_register_name);
+	bool compile_glsl_to_spv(std::string& shader, program_domain domain, std::vector<u32> &spv);
 
-	int get_texture_index(std::string_view name);
+	void initialize_compiler_context();
+	void finalize_compiler_context();
 }
diff --git a/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp b/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp
deleted file mode 100644
index 76cda4d253..0000000000
--- a/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "stdafx.h"
-#include "vkutils/device.h"
-#include "vkutils/descriptors.h"
-#include "VKCommonPipelineLayout.h"
-#include "VKHelpers.h"
-
-#include "Emu/RSX/Common/simple_array.hpp"
-
-namespace vk
-{
-	rsx::simple_array<VkDescriptorPoolSize> get_descriptor_pool_sizes(const rsx::simple_array<VkDescriptorSetLayoutBinding>& bindings)
-	{
-		// Compile descriptor pool sizes
-		const u32 num_ubo = bindings.reduce(0, FN(x + (y.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER ? y.descriptorCount : 0)));
-		const u32 num_texel_buffers = bindings.reduce(0, FN(x + (y.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER ? y.descriptorCount : 0)));
-		const u32 num_combined_image_sampler = bindings.reduce(0, FN(x + (y.descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER ? y.descriptorCount : 0)));
-		const u32 num_ssbo = bindings.reduce(0, FN(x + (y.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER ? y.descriptorCount : 0)));
-
-		ensure(num_ubo > 0 && num_texel_buffers > 0 && num_combined_image_sampler > 0 && num_ssbo > 0);
-
-		return
-		{
-			{ VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER , num_ubo },
-			{ VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER , num_texel_buffers },
-			{ VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER , num_combined_image_sampler },
-			{ VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, num_ssbo }
-		};
-	}
-}
diff --git a/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.h b/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.h
deleted file mode 100644
index e5ada45bf8..0000000000
--- a/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "vkutils/shared.h"
-#include "Emu/RSX/Common/simple_array.hpp"
-
-namespace vk
-{
-	// Returns an array of pool sizes that can be used to generate a proper descriptor pool
-	rsx::simple_array<VkDescriptorPoolSize> get_descriptor_pool_sizes(const rsx::simple_array<VkDescriptorSetLayoutBinding>& bindings);
-}
diff --git a/rpcs3/Emu/RSX/VK/VKCompute.cpp b/rpcs3/Emu/RSX/VK/VKCompute.cpp
index 3df2c9695a..51e0fc1154 100644
--- a/rpcs3/Emu/RSX/VK/VKCompute.cpp
+++ b/rpcs3/Emu/RSX/VK/VKCompute.cpp
@@ -2,49 +2,75 @@
 #include "VKHelpers.h"
 #include "VKRenderPass.h"
 #include "vkutils/buffer_object.h"
-#include "VKPipelineCompiler.h"
 
-#define VK_MAX_COMPUTE_TASKS 8192   // Max number of jobs per frame
+#define VK_MAX_COMPUTE_TASKS 4096   // Max number of jobs per frame
 
 namespace vk
 {
-	std::vector<glsl::program_input> compute_task::get_inputs()
+	std::vector<std::pair<VkDescriptorType, u8>> compute_task::get_descriptor_layout()
 	{
-		std::vector<glsl::program_input> result;
-		for (unsigned i = 0; i < ssbo_count; ++i)
-		{
-			const auto input = glsl::program_input::make
-			(
-				::glsl::glsl_compute_program,
-				"ssbo" + std::to_string(i),
-				glsl::program_input_type::input_type_storage_buffer,
-				0,
-				i
-			);
-			result.push_back(input);
-		}
-
-		if (use_push_constants && push_constants_size > 0)
-		{
-			const auto input = glsl::program_input::make
-			(
-				::glsl::glsl_compute_program,
-				"push_constants",
-				glsl::program_input_type::input_type_push_constant,
-				0,
-				0,
-				glsl::push_constant_ref{ .offset = 0, .size = push_constants_size }
-			);
-			result.push_back(input);
-		}
-
+		std::vector<std::pair<VkDescriptorType, u8>> result;
+		result.emplace_back(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, ssbo_count);
 		return result;
 	}
 
+	void compute_task::init_descriptors()
+	{
+		std::vector<VkDescriptorPoolSize> descriptor_pool_sizes;
+		std::vector<VkDescriptorSetLayoutBinding> bindings;
+
+		const auto layout = get_descriptor_layout();
+		for (const auto &e : layout)
+		{
+			descriptor_pool_sizes.push_back({e.first, u32(VK_MAX_COMPUTE_TASKS * e.second)});
+
+			for (unsigned n = 0; n < e.second; ++n)
+			{
+				bindings.push_back
+				({
+					u32(bindings.size()),
+					e.first,
+					1,
+					VK_SHADER_STAGE_COMPUTE_BIT,
+					nullptr
+				});
+			}
+		}
+
+		// Reserve descriptor pools
+		m_descriptor_pool.create(*g_render_device, descriptor_pool_sizes.data(), ::size32(descriptor_pool_sizes), VK_MAX_COMPUTE_TASKS, 3);
+
+		VkDescriptorSetLayoutCreateInfo infos = {};
+		infos.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
+		infos.pBindings = bindings.data();
+		infos.bindingCount = ::size32(bindings);
+
+		CHECK_RESULT(vkCreateDescriptorSetLayout(*g_render_device, &infos, nullptr, &m_descriptor_layout));
+
+		VkPipelineLayoutCreateInfo layout_info = {};
+		layout_info.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
+		layout_info.setLayoutCount = 1;
+		layout_info.pSetLayouts = &m_descriptor_layout;
+
+		VkPushConstantRange push_constants{};
+		if (use_push_constants)
+		{
+			push_constants.size = push_constants_size;
+			push_constants.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT;
+
+			layout_info.pushConstantRangeCount = 1;
+			layout_info.pPushConstantRanges = &push_constants;
+		}
+
+		CHECK_RESULT(vkCreatePipelineLayout(*g_render_device, &layout_info, nullptr, &m_pipeline_layout));
+	}
+
 	void compute_task::create()
 	{
 		if (!initialized)
 		{
+			init_descriptors();
+
 			switch (vk::get_driver_vendor())
 			{
 			case vk::driver_vendor::unknown:
@@ -56,33 +82,19 @@ namespace vk
 				optimal_kernel_size = 1;
 				optimal_group_size = 128;
 				break;
-			case vk::driver_vendor::LAVAPIPE:
-			case vk::driver_vendor::V3DV:
-			case vk::driver_vendor::PANVK:
-			case vk::driver_vendor::ARM_MALI:
-				// TODO: Actually bench this. Using 32 for now to match other common configurations.
-			case vk::driver_vendor::DOZEN:
-				// Actual optimal size depends on the D3D device. Use 32 since it should work well on both AMD and NVIDIA
 			case vk::driver_vendor::NVIDIA:
-			case vk::driver_vendor::NVK:
 				// Warps are multiples of 32. Increasing kernel depth seems to hurt performance (Nier, Big Duck sample)
 				unroll_loops = true;
-				optimal_kernel_size = 1;
 				optimal_group_size = 32;
+				optimal_kernel_size = 1;
 				break;
 			case vk::driver_vendor::AMD:
 			case vk::driver_vendor::RADV:
-				// Wavefronts are multiples of 64. (RDNA also supports wave32)
+				// Wavefronts are multiples of 64
 				unroll_loops = false;
 				optimal_kernel_size = 1;
 				optimal_group_size = 64;
 				break;
-			case vk::driver_vendor::MVK:
-			case vk::driver_vendor::HONEYKRISP:
-				unroll_loops = true;
-				optimal_kernel_size = 1;
-				optimal_group_size = 256;
-				break;
 			}
 
 			const auto& gpu = vk::g_render_device->gpu();
@@ -100,11 +112,24 @@ namespace vk
 			m_program.reset();
 			m_param_buffer.reset();
 
+			vkDestroyDescriptorSetLayout(*g_render_device, m_descriptor_layout, nullptr);
+			vkDestroyPipelineLayout(*g_render_device, m_pipeline_layout, nullptr);
+			m_descriptor_pool.destroy();
+
 			initialized = false;
 		}
 	}
 
-	void compute_task::load_program(const vk::command_buffer& cmd)
+	void compute_task::free_resources()
+	{
+		if (m_used_descriptors == 0)
+			return;
+
+		m_descriptor_pool.reset(0);
+		m_used_descriptors = 0;
+	}
+
+	void compute_task::load_program(VkCommandBuffer cmd)
 	{
 		if (!m_program)
 		{
@@ -117,26 +142,36 @@ namespace vk
 			shader_stage.module = handle;
 			shader_stage.pName = "main";
 
-			VkComputePipelineCreateInfo create_info
-			{
-				.sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO,
-				.stage = {
-					.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
-					.stage = VK_SHADER_STAGE_COMPUTE_BIT,
-					.module = handle,
-					.pName = "main"
-				},
-			};
+			VkComputePipelineCreateInfo info{};
+			info.sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO;
+			info.stage = shader_stage;
+			info.layout = m_pipeline_layout;
+			info.basePipelineIndex = -1;
+			info.basePipelineHandle = VK_NULL_HANDLE;
 
 			auto compiler = vk::get_pipe_compiler();
-			m_program = compiler->compile(create_info, vk::pipe_compiler::COMPILE_INLINE, {}, get_inputs());
+			m_program = compiler->compile(info, m_pipeline_layout, vk::pipe_compiler::COMPILE_INLINE);
+			declare_inputs();
 		}
 
-		bind_resources(cmd);
-		m_program->bind(cmd, VK_PIPELINE_BIND_POINT_COMPUTE);
+		ensure(m_used_descriptors < VK_MAX_COMPUTE_TASKS);
+
+		VkDescriptorSetAllocateInfo alloc_info = {};
+		alloc_info.descriptorPool = m_descriptor_pool;
+		alloc_info.descriptorSetCount = 1;
+		alloc_info.pSetLayouts = &m_descriptor_layout;
+		alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+
+		CHECK_RESULT(vkAllocateDescriptorSets(*g_render_device, &alloc_info, &m_descriptor_set));
+		m_used_descriptors++;
+
+		bind_resources();
+
+		vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_COMPUTE, m_program->pipeline);
+		vkCmdBindDescriptorSets(cmd, VK_PIPELINE_BIND_POINT_COMPUTE, m_pipeline_layout, 0, 1, &m_descriptor_set, 0, nullptr);
 	}
 
-	void compute_task::run(const vk::command_buffer& cmd, u32 invocations_x, u32 invocations_y, u32 invocations_z)
+	void compute_task::run(VkCommandBuffer cmd, u32 invocations_x, u32 invocations_y, u32 invocations_z)
 	{
 		// CmdDispatch is outside renderpass scope only
 		if (vk::is_renderpass_open(cmd))
@@ -148,7 +183,7 @@ namespace vk
 		vkCmdDispatch(cmd, invocations_x, invocations_y, invocations_z);
 	}
 
-	void compute_task::run(const vk::command_buffer& cmd, u32 num_invocations)
+	void compute_task::run(VkCommandBuffer cmd, u32 num_invocations)
 	{
 		u32 invocations_x, invocations_y;
 		if (num_invocations > max_invocations_x)
@@ -190,14 +225,40 @@ namespace vk
 		kernel_size = _kernel_size? _kernel_size : optimal_kernel_size;
 
 		m_src =
-		#include "../Program/GLSLSnippets/ShuffleBytes.glsl"
-		;
+			"#version 430\n"
+			"layout(local_size_x=%ws, local_size_y=1, local_size_z=1) in;\n"
+			"layout(std430, set=0, binding=0) buffer ssbo{ uint data[]; };\n"
+			"%ub"
+			"\n"
+			"#define KERNEL_SIZE %ks\n"
+			"\n"
+			"// Generic swap routines\n"
+			"#define bswap_u16(bits)     (bits & 0xFF) << 8 | (bits & 0xFF00) >> 8 | (bits & 0xFF0000) << 8 | (bits & 0xFF000000) >> 8\n"
+			"#define bswap_u32(bits)     (bits & 0xFF) << 24 | (bits & 0xFF00) << 8 | (bits & 0xFF0000) >> 8 | (bits & 0xFF000000) >> 24\n"
+			"#define bswap_u16_u32(bits) (bits & 0xFFFF) << 16 | (bits & 0xFFFF0000) >> 16\n"
+			"\n"
+			"// Depth format conversions\n"
+			"#define d24_to_f32(bits)             floatBitsToUint(float(bits) / 16777215.f)\n"
+			"#define f32_to_d24(bits)             uint(uintBitsToFloat(bits) * 16777215.f)\n"
+			"#define d24f_to_f32(bits)            (bits << 7)\n"
+			"#define f32_to_d24f(bits)            (bits >> 7)\n"
+			"#define d24x8_to_f32(bits)           d24_to_f32(bits >> 8)\n"
+			"#define d24x8_to_d24x8_swapped(bits) (bits & 0xFF00) | (bits & 0xFF0000) >> 16 | (bits & 0xFF) << 16\n"
+			"#define f32_to_d24x8_swapped(bits)   d24x8_to_d24x8_swapped(f32_to_d24(bits))\n"
+			"\n"
+			"%md"
+			"void main()\n"
+			"{\n"
+			"	uint invocations_x = (gl_NumWorkGroups.x * gl_WorkGroupSize.x);"
+			"	uint invocation_id = (gl_GlobalInvocationID.y * invocations_x) + gl_GlobalInvocationID.x;\n"
+			"	uint index = invocation_id * KERNEL_SIZE;\n"
+			"	uint value;\n"
+			"%vars"
+			"\n";
 
 		const auto parameters_size = utils::align(push_constants_size, 16) / 16;
-		const std::pair<std::string_view, std::string> syntax_replace[] =
+		const std::pair<std::string, std::string> syntax_replace[] =
 		{
-			{ "%loc", "0" },
-			{ "%set", "set = 0"},
 			{ "%ws", std::to_string(optimal_group_size) },
 			{ "%ks", std::to_string(kernel_size) },
 			{ "%vars", variables },
@@ -243,22 +304,18 @@ namespace vk
 		m_src += suffix;
 	}
 
-	void cs_shuffle_base::bind_resources(const vk::command_buffer& cmd)
+	void cs_shuffle_base::bind_resources()
 	{
-		set_parameters(cmd);
-		m_program->bind_uniform({ m_data->value, m_data_offset, m_data_length }, 0, 0);
+		m_program->bind_buffer({ m_data->value, m_data_offset, m_data_length }, 0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, m_descriptor_set);
 	}
 
-	void cs_shuffle_base::set_parameters(const vk::command_buffer& cmd)
+	void cs_shuffle_base::set_parameters(VkCommandBuffer cmd, const u32* params, u8 count)
 	{
-		if (!m_params.empty())
-		{
-			ensure(use_push_constants);
-			vkCmdPushConstants(cmd, m_program->layout(), VK_SHADER_STAGE_COMPUTE_BIT, 0, m_params.size_bytes32(), m_params.data());
-		}
+		ensure(use_push_constants);
+		vkCmdPushConstants(cmd, m_pipeline_layout, VK_SHADER_STAGE_COMPUTE_BIT, 0, count * 4, params);
 	}
 
-	void cs_shuffle_base::run(const vk::command_buffer& cmd, const vk::buffer* data, u32 data_length, u32 data_offset)
+	void cs_shuffle_base::run(VkCommandBuffer cmd, const vk::buffer* data, u32 data_length, u32 data_offset)
 	{
 		m_data = data;
 		m_data_offset = data_offset;
@@ -293,15 +350,15 @@ namespace vk
 			"	uint stencil_offset;\n";
 	}
 
-	void cs_interleave_task::bind_resources(const vk::command_buffer& cmd)
+	void cs_interleave_task::bind_resources()
 	{
-		set_parameters(cmd);
-		m_program->bind_uniform({ m_data->value, m_data_offset, m_ssbo_length }, 0, 0);
+		m_program->bind_buffer({ m_data->value, m_data_offset, m_ssbo_length }, 0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, m_descriptor_set);
 	}
 
-	void cs_interleave_task::run(const vk::command_buffer& cmd, const vk::buffer* data, u32 data_offset, u32 data_length, u32 zeta_offset, u32 stencil_offset)
+	void cs_interleave_task::run(VkCommandBuffer cmd, const vk::buffer* data, u32 data_offset, u32 data_length, u32 zeta_offset, u32 stencil_offset)
 	{
-		m_params = { data_length, zeta_offset - data_offset, stencil_offset - data_offset, 0 };
+		u32 parameters[4] = { data_length, zeta_offset - data_offset, stencil_offset - data_offset, 0 };
+		set_parameters(cmd, parameters, 4);
 
 		ensure(stencil_offset > data_offset);
 		m_ssbo_length = stencil_offset + (data_length / 4) - data_offset;
@@ -345,7 +402,7 @@ namespace vk
 			"	}\n"
 			"}\n";
 
-		const std::pair<std::string_view, std::string> syntax_replace[] =
+		const std::pair<std::string, std::string> syntax_replace[] =
 		{
 			{ "%ws", std::to_string(optimal_group_size) },
 		};
@@ -353,13 +410,13 @@ namespace vk
 		m_src = fmt::replace_all(m_src, syntax_replace);
 	}
 
-	void cs_aggregator::bind_resources(const vk::command_buffer& /*cmd*/)
+	void cs_aggregator::bind_resources()
 	{
-		m_program->bind_uniform({ src->value, 0, block_length }, 0, 0);
-		m_program->bind_uniform({ dst->value, 0, 4 }, 0, 1);
+		m_program->bind_buffer({ src->value, 0, block_length }, 0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, m_descriptor_set);
+		m_program->bind_buffer({ dst->value, 0, 4 }, 1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, m_descriptor_set);
 	}
 
-	void cs_aggregator::run(const vk::command_buffer& cmd, const vk::buffer* dst, const vk::buffer* src, u32 num_words)
+	void cs_aggregator::run(VkCommandBuffer cmd, const vk::buffer* dst, const vk::buffer* src, u32 num_words)
 	{
 		this->dst = dst;
 		this->src = src;
diff --git a/rpcs3/Emu/RSX/VK/VKCompute.h b/rpcs3/Emu/RSX/VK/VKCompute.h
index 5d20a60391..ed58c5eef5 100644
--- a/rpcs3/Emu/RSX/VK/VKCompute.h
+++ b/rpcs3/Emu/RSX/VK/VKCompute.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "Emu/RSX/VK/VKProgramPipeline.h"
-#include "vkutils/descriptors.h"
+#include "VKPipelineCompiler.h"
+#include "vkutils/descriptors.hpp"
 #include "vkutils/buffer_object.h"
 
 #include "Emu/IdManager.h"
@@ -19,6 +19,12 @@ namespace vk
 		std::unique_ptr<vk::glsl::program> m_program;
 		std::unique_ptr<vk::buffer> m_param_buffer;
 
+		vk::descriptor_pool m_descriptor_pool;
+		VkDescriptorSet m_descriptor_set = nullptr;
+		VkDescriptorSetLayout m_descriptor_layout = nullptr;
+		VkPipelineLayout m_pipeline_layout = nullptr;
+		u32 m_used_descriptors = 0;
+
 		bool initialized = false;
 		bool unroll_loops = true;
 		bool use_push_constants = false;
@@ -31,16 +37,22 @@ namespace vk
 		compute_task() = default;
 		virtual ~compute_task() { destroy(); }
 
+		virtual std::vector<std::pair<VkDescriptorType, u8>> get_descriptor_layout();
+
+		void init_descriptors();
+
 		void create();
 		void destroy();
 
-		virtual std::vector<glsl::program_input> get_inputs();
-		virtual void bind_resources(const vk::command_buffer& /*cmd*/) {}
+		void free_resources();
 
-		void load_program(const vk::command_buffer& cmd);
+		virtual void bind_resources() {}
+		virtual void declare_inputs() {}
 
-		void run(const vk::command_buffer& cmd, u32 invocations_x, u32 invocations_y, u32 invocations_z);
-		void run(const vk::command_buffer& cmd, u32 num_invocations);
+		void load_program(VkCommandBuffer cmd);
+
+		void run(VkCommandBuffer cmd, u32 invocations_x, u32 invocations_y, u32 invocations_z);
+		void run(VkCommandBuffer cmd, u32 num_invocations);
 	};
 
 	struct cs_shuffle_base : compute_task
@@ -50,8 +62,6 @@ namespace vk
 		u32 m_data_length = 0;
 		u32 kernel_size = 1;
 
-		rsx::simple_array<u32> m_params;
-
 		std::string variables, work_kernel, loop_advance, suffix;
 		std::string method_declarations;
 
@@ -59,11 +69,11 @@ namespace vk
 
 		void build(const char* function_name, u32 _kernel_size = 0);
 
-		void bind_resources(const vk::command_buffer& cmd) override;
+		void bind_resources() override;
 
-		void set_parameters(const vk::command_buffer& cmd);
+		void set_parameters(VkCommandBuffer cmd, const u32* params, u8 count);
 
-		void run(const vk::command_buffer& cmd, const vk::buffer* data, u32 data_length, u32 data_offset = 0);
+		void run(VkCommandBuffer cmd, const vk::buffer* data, u32 data_length, u32 data_offset = 0);
 	};
 
 	struct cs_shuffle_16 : cs_shuffle_base
@@ -127,9 +137,9 @@ namespace vk
 
 		cs_interleave_task();
 
-		void bind_resources(const vk::command_buffer& cmd) override;
+		void bind_resources() override;
 
-		void run(const vk::command_buffer& cmd, const vk::buffer* data, u32 data_offset, u32 data_length, u32 zeta_offset, u32 stencil_offset);
+		void run(VkCommandBuffer cmd, const vk::buffer* data, u32 data_offset, u32 data_length, u32 zeta_offset, u32 stencil_offset);
 	};
 
 	template<bool _SwapBytes = false>
@@ -344,13 +354,12 @@ namespace vk
 			cs_shuffle_base::build("");
 		}
 
-		void bind_resources(const vk::command_buffer& cmd) override
+		void bind_resources() override
 		{
-			set_parameters(cmd);
-			m_program->bind_uniform({ m_data->value, m_data_offset, m_ssbo_length }, 0, 0);
+			m_program->bind_buffer({ m_data->value, m_data_offset, m_ssbo_length }, 0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, m_descriptor_set);
 		}
 
-		void run(const vk::command_buffer& cmd, const vk::buffer* data, u32 src_offset, u32 src_length, u32 dst_offset)
+		void run(VkCommandBuffer cmd, const vk::buffer* data, u32 src_offset, u32 src_length, u32 dst_offset)
 		{
 			u32 data_offset;
 			if (src_offset > dst_offset)
@@ -364,7 +373,8 @@ namespace vk
 				data_offset = src_offset;
 			}
 
-			m_params = { src_length, src_offset - data_offset, dst_offset - data_offset, 0 };
+			u32 parameters[4] = { src_length, src_offset - data_offset, dst_offset - data_offset, 0 };
+			set_parameters(cmd, parameters, 4);
 			cs_shuffle_base::run(cmd, data, src_length, data_offset);
 		}
 	};
@@ -372,7 +382,7 @@ namespace vk
 	// Reverse morton-order block arrangement
 	struct cs_deswizzle_base : compute_task
 	{
-		virtual void run(const vk::command_buffer& cmd, const vk::buffer* dst, u32 out_offset, const vk::buffer* src, u32 in_offset, u32 data_length, u32 width, u32 height, u32 depth, u32 mipmaps) = 0;
+		virtual void run(VkCommandBuffer cmd, const vk::buffer* dst, u32 out_offset, const vk::buffer* src, u32 in_offset, u32 data_length, u32 width, u32 height, u32 depth, u32 mipmaps) = 0;
 	};
 
 	template <typename _BlockType, typename _BaseType, bool _SwapBytes>
@@ -412,8 +422,131 @@ namespace vk
 			create();
 
 			m_src =
-			#include "../Program/GLSLSnippets/GPUDeswizzle.glsl"
-			;
+			"#version 450\n"
+			"layout(local_size_x = %ws, local_size_y = 1, local_size_z = 1) in;\n\n"
+
+			"layout(set=0, binding=0, std430) buffer ssbo0{ uint data_in[]; };\n"
+			"layout(set=0, binding=1, std430) buffer ssbo1{ uint data_out[]; };\n"
+			"layout(push_constant) uniform parameters\n"
+			"{\n"
+			"	uint image_width;\n"
+			"	uint image_height;\n"
+			"	uint image_depth;\n"
+			"	uint image_logw;\n"
+			"	uint image_logh;\n"
+			"	uint image_logd;\n"
+			"	uint lod_count;\n"
+			"};\n\n"
+
+			"struct invocation_properties\n"
+			"{\n"
+			"	uint data_offset;\n"
+			"	uvec3 size;\n"
+			"	uvec3 size_log2;\n"
+			"};\n\n"
+
+			"#define bswap_u16(bits) (bits & 0xFF) << 8 | (bits & 0xFF00) >> 8 | (bits & 0xFF0000) << 8 | (bits & 0xFF000000) >> 8\n"
+			"#define bswap_u32(bits) (bits & 0xFF) << 24 | (bits & 0xFF00) << 8 | (bits & 0xFF0000) >> 8 | (bits & 0xFF000000) >> 24\n\n"
+
+			"invocation_properties invocation;\n\n"
+
+			"bool init_invocation_properties(const in uint offset)\n"
+			"{\n"
+			"	invocation.data_offset = 0;\n"
+			"	invocation.size.x = image_width;\n"
+			"	invocation.size.y = image_height;\n"
+			"	invocation.size.z = image_depth;\n"
+			"	invocation.size_log2.x = image_logw;\n"
+			"	invocation.size_log2.y = image_logh;\n"
+			"	invocation.size_log2.z = image_logd;\n"
+			"	uint level_end = image_width * image_height * image_depth;\n"
+			"	uint level = 1;\n\n"
+
+			"	while (offset >= level_end && level < lod_count)\n"
+			"	{\n"
+			"		invocation.data_offset = level_end;\n"
+			"		invocation.size.xy /= 2;\n"
+			"		invocation.size.xy = max(invocation.size.xy, uvec2(1));\n"
+			"		invocation.size_log2.xy = max(invocation.size_log2.xy, uvec2(1));\n"
+			"		invocation.size_log2.xy --;\n"
+			"		level_end += (invocation.size.x * invocation.size.y * image_depth);\n"
+			"		level++;"
+			"	}\n\n"
+
+			"	return (offset < level_end);\n"
+			"}\n\n"
+
+			"uint get_z_index(const in uint x_, const in uint y_, const in uint z_)\n"
+			"{\n"
+			"	uint offset = 0;\n"
+			"	uint shift = 0;\n"
+			"	uint x = x_;\n"
+			"	uint y = y_;\n"
+			"	uint z = z_;\n"
+			"	uint log2w = invocation.size_log2.x;\n"
+			"	uint log2h = invocation.size_log2.y;\n"
+			"	uint log2d = invocation.size_log2.z;\n"
+			"\n"
+			"	do\n"
+			"	{\n"
+			"		if (log2w > 0)\n"
+			"		{\n"
+			"			offset |= (x & 1) << shift;\n"
+			"			shift++;\n"
+			"			x >>= 1;\n"
+			"			log2w--;\n"
+			"		}\n"
+			"\n"
+			"		if (log2h > 0)\n"
+			"		{\n"
+			"			offset |= (y & 1) << shift;\n"
+			"			shift++;\n"
+			"			y >>= 1;\n"
+			"			log2h--;\n"
+			"		}\n"
+			"\n"
+			"		if (log2d > 0)\n"
+			"		{\n"
+			"			offset |= (z & 1) << shift;\n"
+			"			shift++;\n"
+			"			z >>= 1;\n"
+			"			log2d--;\n"
+			"		}\n"
+			"	}\n"
+			"	while(x > 0 || y > 0 || z > 0);\n"
+			"\n"
+			"	return offset;\n"
+			"}\n\n"
+
+			"void main()\n"
+			"{\n"
+			"	uint invocations_x = (gl_NumWorkGroups.x * gl_WorkGroupSize.x);"
+			"	uint texel_id = (gl_GlobalInvocationID.y * invocations_x) + gl_GlobalInvocationID.x;\n"
+			"	uint word_count = %_wordcount;\n\n"
+
+			"	if (!init_invocation_properties(texel_id))\n"
+			"		return;\n\n"
+
+			"	// Calculations done in texels, not bytes\n"
+			"	uint row_length = invocation.size.x;\n"
+			"	uint slice_length = (invocation.size.y * row_length);\n"
+			"	uint level_offset = (texel_id - invocation.data_offset);\n"
+			"	uint slice_offset = (level_offset % slice_length);\n"
+			"	uint z = (level_offset / slice_length);\n"
+			"	uint y = (slice_offset / row_length);\n"
+			"	uint x = (slice_offset % row_length);\n\n"
+
+			"	uint src_texel_id = get_z_index(x, y, z);\n"
+			"	uint dst_id = (texel_id * word_count);\n"
+			"	uint src_id = (src_texel_id + invocation.data_offset) * word_count;\n\n"
+
+			"	for (uint i = 0; i < word_count; ++i)\n"
+			"	{\n"
+			"		uint value = data_in[src_id++];\n"
+			"		data_out[dst_id++] = %f(value);\n"
+			"	}\n\n"
+
+			"}\n";
 
 			std::string transform;
 			if constexpr (_SwapBytes)
@@ -432,11 +565,8 @@ namespace vk
 				}
 			}
 
-			const std::pair<std::string_view, std::string> syntax_replace[] =
+			const std::pair<std::string, std::string> syntax_replace[] =
 			{
-				{ "%loc", "0" },
-				{ "%set", "set = 0" },
-				{ "%push_block", "push_constant" },
 				{ "%ws", std::to_string(optimal_group_size) },
 				{ "%_wordcount", std::to_string(sizeof(_BlockType) / 4) },
 				{ "%f", transform }
@@ -445,20 +575,18 @@ namespace vk
 			m_src = fmt::replace_all(m_src, syntax_replace);
 		}
 
-		void bind_resources(const vk::command_buffer& cmd) override
+		void bind_resources() override
 		{
-			set_parameters(cmd);
-
-			m_program->bind_uniform({ src_buffer->value, in_offset, block_length }, 0, 0);
-			m_program->bind_uniform({ dst_buffer->value, out_offset, block_length }, 0, 1);
+			m_program->bind_buffer({ src_buffer->value, in_offset, block_length }, 0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, m_descriptor_set);
+			m_program->bind_buffer({ dst_buffer->value, out_offset, block_length }, 1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, m_descriptor_set);
 		}
 
-		void set_parameters(const vk::command_buffer& cmd)
+		void set_parameters(VkCommandBuffer cmd)
 		{
-			vkCmdPushConstants(cmd, m_program->layout(), VK_SHADER_STAGE_COMPUTE_BIT, 0, push_constants_size, params.data);
+			vkCmdPushConstants(cmd, m_pipeline_layout, VK_SHADER_STAGE_COMPUTE_BIT, 0, push_constants_size, params.data);
 		}
 
-		void run(const vk::command_buffer& cmd, const vk::buffer* dst, u32 out_offset, const vk::buffer* src, u32 in_offset, u32 data_length, u32 width, u32 height, u32 depth, u32 mipmaps) override
+		void run(VkCommandBuffer cmd, const vk::buffer* dst, u32 out_offset, const vk::buffer* src, u32 in_offset, u32 data_length, u32 width, u32 height, u32 depth, u32 mipmaps) override
 		{
 			dst_buffer = dst;
 			src_buffer = src;
@@ -474,6 +602,7 @@ namespace vk
 			params.logw = rsx::ceil_log2(width);
 			params.logh = rsx::ceil_log2(height);
 			params.logd = rsx::ceil_log2(depth);
+			set_parameters(cmd);
 
 			const u32 num_bytes_per_invocation = (sizeof(_BlockType) * optimal_group_size);
 			const u32 linear_invocations = utils::aligned_div(data_length, num_bytes_per_invocation);
@@ -490,170 +619,9 @@ namespace vk
 
 		cs_aggregator();
 
-		void bind_resources(const vk::command_buffer& cmd) override;
+		void bind_resources() override;
 
-		void run(const vk::command_buffer& cmd, const vk::buffer* dst, const vk::buffer* src, u32 num_words);
-	};
-
-	enum RSX_detiler_op
-	{
-		decode = 0,
-		encode = 1
-	};
-
-	struct RSX_detiler_config
-	{
-		u32 tile_base_address;
-		u32 tile_base_offset;
-		u32 tile_rw_offset;
-		u32 tile_size;
-		u32 tile_pitch;
-		u32 bank;
-
-		const vk::buffer* dst;
-		u32 dst_offset;
-		const vk::buffer* src;
-		u32 src_offset;
-
-		u16 image_width;
-		u16 image_height;
-		u32 image_pitch;
-		u8  image_bpp;
-	};
-
-	template <RSX_detiler_op Op>
-	struct cs_tile_memcpy : compute_task
-	{
-#pragma pack (push, 1)
-		struct
-		{
-			u32 prime;
-			u32 factor;
-			u32 num_tiles_per_row;
-			u32 tile_base_address;
-			u32 tile_size;
-			u32 tile_address_offset;
-			u32 tile_rw_offset;
-			u32 tile_pitch;
-			u32 tile_bank;
-			u32 image_width;
-			u32 image_height;
-			u32 image_pitch;
-			u32 image_bpp;
-		} params;
-#pragma pack (pop)
-
-		const vk::buffer* src_buffer = nullptr;
-		const vk::buffer* dst_buffer = nullptr;
-		u32 in_offset = 0;
-		u32 out_offset = 0;
-		u32 in_block_length = 0;
-		u32 out_block_length = 0;
-
-		cs_tile_memcpy()
-		{
-			ssbo_count = 2;
-			use_push_constants = true;
-			push_constants_size = sizeof(params);
-
-			create();
-
-			m_src =
-			#include "../Program/GLSLSnippets/RSXMemoryTiling.glsl"
-				;
-
-			const std::pair<std::string_view, std::string> syntax_replace[] =
-			{
-				{ "%loc", "0" },
-				{ "%set", "set = 0" },
-				{ "%push_block", "push_constant" },
-				{ "%ws", std::to_string(optimal_group_size) },
-				{ "%op", std::to_string(Op) }
-			};
-
-			m_src = fmt::replace_all(m_src, syntax_replace);
-		}
-
-		void bind_resources(const vk::command_buffer& cmd) override
-		{
-			set_parameters(cmd);
-
-			const auto op = static_cast<u32>(Op);
-			m_program->bind_uniform({ src_buffer->value, in_offset, in_block_length }, 0u, 0u ^ op);
-			m_program->bind_uniform({ dst_buffer->value, out_offset, out_block_length }, 0u, 1u ^ op);
-		}
-
-		void set_parameters(const vk::command_buffer& cmd)
-		{
-			vkCmdPushConstants(cmd, m_program->layout(), VK_SHADER_STAGE_COMPUTE_BIT, 0, push_constants_size, &params);
-		}
-
-		void run(const vk::command_buffer& cmd, const RSX_detiler_config& config)
-		{
-			dst_buffer = config.dst;
-			src_buffer = config.src;
-
-			this->in_offset = config.src_offset;
-			this->out_offset = config.dst_offset;
-
-			const auto tile_aligned_height = std::min(
-				utils::align<u32>(config.image_height, 64),
-				utils::aligned_div(config.tile_size - config.tile_base_offset, config.tile_pitch)
-			);
-
-			if constexpr (Op == RSX_detiler_op::decode)
-			{
-				this->in_block_length = tile_aligned_height * config.tile_pitch;
-				this->out_block_length = config.image_height * config.image_pitch;
-			}
-			else
-			{
-				this->in_block_length = config.image_height * config.image_pitch;
-				this->out_block_length = tile_aligned_height * config.tile_pitch;
-			}
-
-			auto get_prime_factor = [](u32 pitch) -> std::pair<u32, u32>
-			{
-				const u32 base = (pitch >> 8);
-				if ((pitch & (pitch - 1)) == 0)
-				{
-					return { 1u, base };
-				}
-
-				for (const auto prime : { 3, 5, 7, 11, 13 })
-				{
-					if ((base % prime) == 0)
-					{
-						return { prime, base / prime };
-					}
-				}
-
-				rsx_log.error("Unexpected pitch value 0x%x", pitch);
-				return {};
-			};
-
-			const auto [prime, factor] = get_prime_factor(config.tile_pitch);
-			const u32 tiles_per_row = prime * factor;
-
-			params.prime = prime;
-			params.factor = factor;
-			params.num_tiles_per_row = tiles_per_row;
-			params.tile_base_address = config.tile_base_address;
-			params.tile_rw_offset = config.tile_rw_offset;
-			params.tile_size = config.tile_size;
-			params.tile_address_offset = config.tile_base_offset;
-			params.tile_pitch = config.tile_pitch;
-			params.tile_bank = config.bank;
-			params.image_width = config.image_width;
-			params.image_height = (Op == RSX_detiler_op::decode) ? tile_aligned_height : config.image_height;
-			params.image_pitch = config.image_pitch;
-			params.image_bpp = config.image_bpp;
-
-			const u32 subtexels_per_invocation = (config.image_bpp < 4) ? (4 / config.image_bpp) : 1;
-			const u32 virtual_width = config.image_width / subtexels_per_invocation;
-			const u32 invocations_x = utils::aligned_div(virtual_width, optimal_group_size);
-			compute_task::run(cmd, invocations_x, config.image_height, 1);
-		}
+		void run(VkCommandBuffer cmd, const vk::buffer* dst, const vk::buffer* src, u32 num_words);
 	};
 
 	// TODO: Replace with a proper manager
@@ -662,7 +630,7 @@ namespace vk
 	template<class T>
 	T* get_compute_task()
 	{
-		u32 index = stx::typeindex<id_manager::typeinfo, T>();
+		u32 index = id_manager::typeinfo::get_index<T>();
 		auto &e = g_compute_tasks[index];
 
 		if (!e)
diff --git a/rpcs3/Emu/RSX/VK/VKDMA.cpp b/rpcs3/Emu/RSX/VK/VKDMA.cpp
index 09834d6f99..32c79b3d52 100644
--- a/rpcs3/Emu/RSX/VK/VKDMA.cpp
+++ b/rpcs3/Emu/RSX/VK/VKDMA.cpp
@@ -27,7 +27,7 @@ namespace vk
 		free();
 	}
 
-	void* dma_block::map_range(const utils::address_range32& range)
+	void* dma_block::map_range(const utils::address_range& range)
 	{
 		if (inheritance_info.parent)
 		{
@@ -70,34 +70,6 @@ namespace vk
 			VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, 0,
 			VMM_ALLOCATION_POOL_UNDEFINED);
 
-		// Initialize memory contents. This isn't something that happens often.
-		// Pre-loading the contents helps to avoid leakage when mixed types of allocations are in use (NVIDIA)
-		// TODO: Fix memory lost when old object goes out of use with in-flight data.
-		auto dst = static_cast<u8*>(allocated_memory->map(0, size));
-		auto src = vm::get_super_ptr<u8>(base_address);
-
-		if (rsx::get_location(base_address) == CELL_GCM_LOCATION_LOCAL ||
-			vm::check_addr(base_address, 0, static_cast<u32>(size))) [[ likely ]]
-		{
-			// Linear virtual memory space. Copy all at once.
-			std::memcpy(dst, src, size);
-		}
-		else
-		{
-			// Some games will have address holes in the range and page in data using faults.
-			// Copy page by page. Slow, but we only really have to do this a handful of times.
-			// Note that base_address is 16k aligned.
-			for (u32 address = base_address; address < (base_address + size); address += 4096, src += 4096, dst += 4096)
-			{
-				if (vm::check_addr(address, 0))
-				{
-					std::memcpy(dst, src, 4096);
-				}
-			}
-		}
-
-		allocated_memory->unmap();
-
 		s_allocated_dma_pool_size += allocated_memory->size();
 	}
 
@@ -142,7 +114,7 @@ namespace vk
 		inheritance_info.block_offset = (addr - parent->base_address);
 	}
 
-	void dma_block::flush(const utils::address_range32& range)
+	void dma_block::flush(const utils::address_range& range)
 	{
 		if (inheritance_info.parent)
 		{
@@ -158,7 +130,7 @@ namespace vk
 		// NOTE: Do not unmap. This can be extremely slow on some platforms.
 	}
 
-	void dma_block::load(const utils::address_range32& range)
+	void dma_block::load(const utils::address_range& range)
 	{
 		if (inheritance_info.parent)
 		{
@@ -174,7 +146,7 @@ namespace vk
 		// NOTE: Do not unmap. This can be extremely slow on some platforms.
 	}
 
-	dma_mapping_handle dma_block::get(const utils::address_range32& range)
+	std::pair<u32, buffer*> dma_block::get(const utils::address_range& range)
 	{
 		if (inheritance_info.parent)
 		{
@@ -264,7 +236,7 @@ namespace vk
 		s_allocated_dma_pool_size += allocated_memory->size();
 	}
 
-	void* dma_block_EXT::map_range(const utils::address_range32& range)
+	void* dma_block_EXT::map_range(const utils::address_range& range)
 	{
 		return vm::get_super_ptr<void>(range.start);
 	}
@@ -274,12 +246,12 @@ namespace vk
 		// NOP
 	}
 
-	void dma_block_EXT::flush(const utils::address_range32&)
+	void dma_block_EXT::flush(const utils::address_range&)
 	{
 		// NOP
 	}
 
-	void dma_block_EXT::load(const utils::address_range32&)
+	void dma_block_EXT::load(const utils::address_range&)
 	{
 		// NOP
 	}
@@ -290,7 +262,7 @@ namespace vk
 		MEMORY_BASIC_INFORMATION mem_info;
 		if (!::VirtualQuery(vm::get_super_ptr<const void>(base_address), &mem_info, sizeof(mem_info)))
 		{
-			rsx_log.error("VirtualQuery failed! LastError=%s", fmt::win_error{GetLastError(), nullptr});
+			rsx_log.error("VirtualQuery failed! LastError=0x%x", GetLastError());
 			return false;
 		}
 
@@ -331,12 +303,12 @@ namespace vk
 		block->init(*g_render_device, base_address, expected_length);
 	}
 
-	dma_mapping_handle map_dma(u32 local_address, u32 length)
+	std::pair<u32, vk::buffer*> map_dma(u32 local_address, u32 length)
 	{
 		// Not much contention expected here, avoid searching twice
 		std::lock_guard lock(g_dma_mutex);
 
-		const auto map_range = utils::address_range32::start_length(local_address, length);
+		const auto map_range = utils::address_range::start_length(local_address, length);
 		auto first_block = (local_address & s_dma_block_mask);
 
 		if (auto found = g_dma_pool.find(first_block); found != g_dma_pool.end())
@@ -413,7 +385,7 @@ namespace vk
 		std::lock_guard lock(g_dma_mutex);
 
 		const u32 start = (local_address & s_dma_block_mask);
-		const u32 end = utils::align(local_address + length, static_cast<u32>(s_dma_block_length));
+		const u32 end = utils::align(local_address + length, s_dma_block_length);
 
 		for (u32 block = start; block < end;)
 		{
@@ -454,7 +426,7 @@ namespace vk
 			if (auto found = g_dma_pool.find(block); found != g_dma_pool.end())
 			{
 				const auto sync_end = std::min(limit, found->second->end());
-				const auto range = utils::address_range32::start_end(local_address, sync_end);
+				const auto range = utils::address_range::start_end(local_address, sync_end);
 
 				if constexpr (load)
 				{
diff --git a/rpcs3/Emu/RSX/VK/VKDMA.h b/rpcs3/Emu/RSX/VK/VKDMA.h
index 3cc0855f57..35587c74c9 100644
--- a/rpcs3/Emu/RSX/VK/VKDMA.h
+++ b/rpcs3/Emu/RSX/VK/VKDMA.h
@@ -1,11 +1,10 @@
 #pragma once
 #include "vkutils/buffer_object.h"
+#include "vkutils/commands.h"
 
 namespace vk
 {
-	using dma_mapping_handle = std::pair<u32, vk::buffer*>;
-
-	dma_mapping_handle map_dma(u32 local_address, u32 length);
+	std::pair<u32, vk::buffer*> map_dma(u32 local_address, u32 length);
 	void load_dma(u32 local_address, u32 length);
 	void flush_dma(u32 local_address, u32 length);
 	void unmap_dma(u32 local_address, u32 length);
@@ -28,7 +27,7 @@ namespace vk
 
 		virtual void allocate(const render_device& dev, usz size);
 		virtual void free();
-		virtual void* map_range(const utils::address_range32& range);
+		virtual void* map_range(const utils::address_range& range);
 		virtual void unmap();
 
 	public:
@@ -38,9 +37,9 @@ namespace vk
 
 		virtual void init(const render_device& dev, u32 addr, usz size);
 		virtual void init(dma_block* parent, u32 addr, usz size);
-		virtual void flush(const utils::address_range32& range);
-		virtual void load(const utils::address_range32& range);
-		std::pair<u32, buffer*> get(const utils::address_range32& range);
+		virtual void flush(const utils::address_range& range);
+		virtual void load(const utils::address_range& range);
+		std::pair<u32, buffer*> get(const utils::address_range& range);
 
 		u32 start() const;
 		u32 end() const;
@@ -56,11 +55,11 @@ namespace vk
 	{
 	private:
 		void allocate(const render_device& dev, usz size) override;
-		void* map_range(const utils::address_range32& range) override;
+		void* map_range(const utils::address_range& range) override;
 		void unmap() override;
 
 	public:
-		void flush(const utils::address_range32& range) override;
-		void load(const utils::address_range32& range) override;
+		void flush(const utils::address_range& range) override;
+		void load(const utils::address_range& range) override;
 	};
 }
diff --git a/rpcs3/Emu/RSX/VK/VKDataHeapManager.cpp b/rpcs3/Emu/RSX/VK/VKDataHeapManager.cpp
deleted file mode 100644
index 109cb57bc9..0000000000
--- a/rpcs3/Emu/RSX/VK/VKDataHeapManager.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "stdafx.h"
-#include "VKDataHeapManager.h"
-
-#include "vkutils/data_heap.h"
-#include <unordered_set>
-
-namespace vk::data_heap_manager
-{
-	std::unordered_set<vk::data_heap*> g_managed_heaps;
-
-	void register_ring_buffer(vk::data_heap& heap)
-	{
-		g_managed_heaps.insert(&heap);
-	}
-
-	void register_ring_buffers(std::initializer_list<std::reference_wrapper<vk::data_heap>> heaps)
-	{
-		for (auto&& heap : heaps)
-		{
-			register_ring_buffer(heap);
-		}
-	}
-
-	managed_heap_snapshot_t get_heap_snapshot()
-	{
-		managed_heap_snapshot_t result{};
-		for (auto& heap : g_managed_heaps)
-		{
-			result[heap] = heap->get_current_put_pos_minus_one();
-		}
-		return result;
-	}
-
-	void restore_snapshot(const managed_heap_snapshot_t& snapshot)
-	{
-		for (auto& heap : g_managed_heaps)
-		{
-			const auto found = snapshot.find(heap);
-			if (found == snapshot.end())
-			{
-				continue;
-			}
-
-			heap->set_get_pos(found->second);
-			heap->notify();
-		}
-	}
-
-	void reset_heap_allocations()
-	{
-		for (auto& heap : g_managed_heaps)
-		{
-			heap->reset_allocation_stats();
-		}
-	}
-
-	void reset()
-	{
-		for (auto& heap : g_managed_heaps)
-		{
-			heap->destroy();
-		}
-
-		g_managed_heaps.clear();
-	}
-}
diff --git a/rpcs3/Emu/RSX/VK/VKDataHeapManager.h b/rpcs3/Emu/RSX/VK/VKDataHeapManager.h
deleted file mode 100644
index 14a140fefb..0000000000
--- a/rpcs3/Emu/RSX/VK/VKDataHeapManager.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-
-#include <unordered_map>
-
-namespace vk
-{
-	class data_heap;
-
-	namespace data_heap_manager
-	{
-		using managed_heap_snapshot_t = std::unordered_map<const vk::data_heap*, s64>;
-
-		// Submit ring buffer for management
-		void register_ring_buffer(vk::data_heap& heap);
-
-		// Bulk registration
-		void register_ring_buffers(std::initializer_list<std::reference_wrapper<vk::data_heap>> heaps);
-
-		// Capture managed ring buffers snapshot at current time
-		managed_heap_snapshot_t get_heap_snapshot();
-
-		// Synchronize heap with snapshot
-		void restore_snapshot(const managed_heap_snapshot_t& snapshot);
-
-		// Reset all managed heap allocations
-		void reset_heap_allocations();
-
-		// Cleanup
-		void reset();
-	}
-}
diff --git a/rpcs3/Emu/RSX/VK/VKDraw.cpp b/rpcs3/Emu/RSX/VK/VKDraw.cpp
index 2a6d195bef..629c67711e 100644
--- a/rpcs3/Emu/RSX/VK/VKDraw.cpp
+++ b/rpcs3/Emu/RSX/VK/VKDraw.cpp
@@ -5,8 +5,6 @@
 #include "VKAsyncScheduler.h"
 #include "VKGSRender.h"
 #include "vkutils/buffer_object.h"
-#include "vkutils/chip_class.h"
-#include <vulkan/vulkan_core.h>
 
 namespace vk
 {
@@ -42,64 +40,6 @@ namespace vk
 			fmt::throw_exception("Unknown compare op: 0x%x", static_cast<u32>(op));
 		}
 	}
-
-	void validate_image_layout_for_read_access(
-		vk::command_buffer& cmd,
-		vk::image_view* view,
-		VkPipelineStageFlags dst_stage,
-		const rsx::sampled_image_descriptor_base* sampler_state)
-	{
-		switch (auto raw = view->image(); +raw->current_layout)
-		{
-		default:
-			//case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL:
-			break;
-		case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:
-			//ensure(sampler_state->upload_context == rsx::texture_upload_context::blit_engine_dst);
-			raw->change_layout(cmd, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
-			break;
-		case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL:
-			ensure(sampler_state->upload_context == rsx::texture_upload_context::blit_engine_src);
-			raw->change_layout(cmd, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
-			break;
-		case VK_IMAGE_LAYOUT_GENERAL:
-		case VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT:
-			ensure(sampler_state->upload_context == rsx::texture_upload_context::framebuffer_storage);
-			if (!sampler_state->is_cyclic_reference)
-			{
-				// This was used in a cyclic ref before, but is missing a barrier
-				// No need for a full stall, use a custom barrier instead
-				VkPipelineStageFlags src_stage;
-				VkAccessFlags src_access;
-				if (raw->aspect() == VK_IMAGE_ASPECT_COLOR_BIT)
-				{
-					src_stage = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
-					src_access = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
-				}
-				else
-				{
-					src_stage = VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
-					src_access = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
-				}
-
-				vk::insert_image_memory_barrier(
-					cmd,
-					raw->value,
-					raw->current_layout, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
-					src_stage, dst_stage,
-					src_access, VK_ACCESS_SHADER_READ_BIT,
-					{ raw->aspect(), 0, 1, 0, 1 });
-
-				raw->current_layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
-			}
-			break;
-		case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL:
-		case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL:
-			ensure(sampler_state->upload_context == rsx::texture_upload_context::framebuffer_storage);
-			raw->change_layout(cmd, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
-			break;
-		}
-	}
 }
 
 void VKGSRender::begin_render_pass()
@@ -130,18 +70,26 @@ void VKGSRender::update_draw_state()
 {
 	m_profiler.start();
 
-	// Update conditional dynamic state
-	if (rsx::method_registers.current_draw_clause.primitive >= rsx::primitive_type::points &&   // AMD/AMDVLK driver does not like it if you render points without setting line width for some reason
-		rsx::method_registers.current_draw_clause.primitive <= rsx::primitive_type::line_strip)
+	const float actual_line_width =
+	    m_device->get_wide_lines_support() ? rsx::method_registers.line_width() * rsx::get_resolution_scale() : 1.f;
+	vkCmdSetLineWidth(*m_current_command_buffer, actual_line_width);
+
+	if (rsx::method_registers.poly_offset_fill_enabled())
 	{
-		const float actual_line_width =
-			m_device->get_wide_lines_support() ? rsx::method_registers.line_width() * rsx::get_resolution_scale() : 1.f;
-		vkCmdSetLineWidth(*m_current_command_buffer, actual_line_width);
+		//offset_bias is the constant factor, multiplied by the implementation factor R
+		//offst_scale is the slope factor, multiplied by the triangle slope factor M
+		vkCmdSetDepthBias(*m_current_command_buffer, rsx::method_registers.poly_offset_bias(), 0.f, rsx::method_registers.poly_offset_scale());
+	}
+	else
+	{
+		//Zero bias value - disables depth bias
+		vkCmdSetDepthBias(*m_current_command_buffer, 0.f, 0.f, 0.f);
 	}
 
+	//Update dynamic state
 	if (rsx::method_registers.blend_enabled())
 	{
-		// Update blend constants
+		//Update blend constants
 		auto blend_colors = rsx::get_constant_blend_colors();
 		vkCmdSetBlendConstants(*m_current_command_buffer, blend_colors.data());
 	}
@@ -163,41 +111,6 @@ void VKGSRender::update_draw_state()
 		}
 	}
 
-	// The remaining dynamic state should only be set once and we have signals to enable/disable mid-renderpass
-	if (!(m_current_command_buffer->flags & vk::command_buffer::cb_reload_dynamic_state))
-	{
-		// Dynamic state already set
-		m_frame_stats.setup_time += m_profiler.duration();
-		return;
-	}
-
-	if (rsx::method_registers.poly_offset_fill_enabled())
-	{
-		// offset_bias is the constant factor, multiplied by the implementation factor R
-		// offst_scale is the slope factor, multiplied by the triangle slope factor M
-		// R is implementation dependent and has to be derived empirically for supported implementations.
-		// Lucky for us, only NVIDIA currently supports fixed-point 24-bit depth buffers.
-
-		const auto polygon_offset_scale = rsx::method_registers.poly_offset_scale();
-		auto polygon_offset_bias = rsx::method_registers.poly_offset_bias();
-
-		if (m_draw_fbo->depth_format() == VK_FORMAT_D24_UNORM_S8_UINT && is_NVIDIA(vk::get_chip_family()))
-		{
-			// Empirically derived to be 0.5 * (2^24 - 1) for fixed type on Pascal. The same seems to apply for other NVIDIA GPUs.
-			// RSX seems to be using 2^24 - 1 instead making the biases twice as large when using fixed type Z-buffer on NVIDIA.
-			// Note, that the formula for floating point is complicated, but actually works out for us.
-			// Since the exponent range for a polygon is around 0, and we have 23 (+1) mantissa bits, R just works out to the same range by chance \o/.
-			polygon_offset_bias *= 0.5f;
-		}
-
-		vkCmdSetDepthBias(*m_current_command_buffer, polygon_offset_bias, 0.f, polygon_offset_scale);
-	}
-	else
-	{
-		// Zero bias value - disables depth bias
-		vkCmdSetDepthBias(*m_current_command_buffer, 0.f, 0.f, 0.f);
-	}
-
 	if (m_device->get_depth_bounds_support())
 	{
 		f32 bounds_min, bounds_max;
@@ -225,8 +138,8 @@ void VKGSRender::update_draw_state()
 
 	bind_viewport();
 
-	m_current_command_buffer->flags &= ~vk::command_buffer::cb_reload_dynamic_state;
-	m_graphics_state.clear(rsx::pipeline_state::polygon_offset_state_dirty | rsx::pipeline_state::depth_bounds_state_dirty);
+	//TODO: Set up other render-state parameters into the program pipeline
+
 	m_frame_stats.setup_time += m_profiler.duration();
 }
 
@@ -245,13 +158,7 @@ void VKGSRender::load_texture_env()
 		return false;
 	};
 
-	auto get_border_color = [&](const rsx::Texture auto& tex)
-	{
-		return  m_device->get_custom_border_color_support().require_border_color_remap
-			? tex.remapped_border_color()
-			: rsx::decode_border_color(tex.border_color());
-	};
-
+	vk::clear_status_interrupt(vk::out_of_memory);
 	std::lock_guard lock(m_sampler_mutex);
 
 	for (u32 textures_ref = current_fp_metadata.referenced_textures_mask, i = 0; textures_ref; textures_ref >>= 1, ++i)
@@ -264,32 +171,19 @@ void VKGSRender::load_texture_env()
 
 		auto sampler_state = static_cast<vk::texture_cache::sampled_image_descriptor*>(fs_sampler_state[i].get());
 		const auto& tex = rsx::method_registers.fragment_textures[i];
-		const auto previous_format_class = fs_sampler_state[i]->format_class;
 
 		if (m_samplers_dirty || m_textures_dirty[i] || !check_surface_cache_sampler(sampler_state, tex))
 		{
 			if (tex.enabled())
 			{
+				check_heap_status(VK_HEAP_CHECK_TEXTURE_UPLOAD_STORAGE);
 				*sampler_state = m_texture_cache.upload_texture(*m_current_command_buffer, tex, m_rtts);
-			}
-			else
-			{
-				*sampler_state = {};
-			}
 
-			if (sampler_state->validate())
-			{
 				if (sampler_state->is_cyclic_reference)
 				{
 					check_for_cyclic_refs |= true;
 				}
 
-				if (!m_textures_dirty[i] && sampler_state->format_class != previous_format_class)
-				{
-					// Host details changed but RSX is not aware
-					m_graphics_state |= rsx::fragment_program_state_dirty;
-				}
-
 				bool replace = !fs_sampler_handles[i];
 				VkFilter mag_filter;
 				vk::minification_filter min_filter;
@@ -310,12 +204,7 @@ void VKGSRender::load_texture_env()
 				const auto wrap_s = vk::vk_wrap_mode(tex.wrap_s());
 				const auto wrap_t = vk::vk_wrap_mode(tex.wrap_t());
 				const auto wrap_r = vk::vk_wrap_mode(tex.wrap_r());
-
-				// NOTE: In vulkan, the border color can bypass the sample swizzle stage.
-				// Check the device properties to determine whether to pre-swizzle the colors or not.
-				const auto border_color = rsx::is_border_clamped_texture(tex)
-					? vk::border_color_t(get_border_color(tex))
-					: vk::border_color_t(VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK);
+				const auto border_color = vk::get_border_color(tex.border_color());
 
 				// Check if non-point filtering can even be used on this format
 				bool can_sample_linear;
@@ -324,12 +213,6 @@ void VKGSRender::load_texture_env()
 					// Most PS3-like formats can be linearly filtered without problem
 					can_sample_linear = true;
 				}
-				else if (sampler_state->format_class != rsx::classify_format(texture_format) &&
-					(texture_format == CELL_GCM_TEXTURE_A8R8G8B8 || texture_format == CELL_GCM_TEXTURE_D8R8G8B8))
-				{
-					// Depth format redirected to BGRA8 resample stage. Do not filter to avoid bits leaking
-					can_sample_linear = false;
-				}
 				else
 				{
 					// Not all GPUs support linear filtering of depth formats
@@ -403,16 +286,14 @@ void VKGSRender::load_texture_env()
 
 				if (replace)
 				{
-					fs_sampler_handles[i] = vk::get_resource_manager()->get_sampler(
-						*m_device,
-						fs_sampler_handles[i],
-						wrap_s, wrap_t, wrap_r,
-						false,
-						lod_bias, af_level, min_lod, max_lod,
-						min_filter.filter, mag_filter, min_filter.mipmap_mode,
-						border_color, compare_enabled, depth_compare_mode);
+					fs_sampler_handles[i] = vk::get_resource_manager()->find_sampler(*m_device, wrap_s, wrap_t, wrap_r, false, lod_bias, af_level, min_lod, max_lod,
+						min_filter.filter, mag_filter, min_filter.mipmap_mode, border_color, compare_enabled, depth_compare_mode);
 				}
 			}
+			else
+			{
+				*sampler_state = {};
+			}
 
 			m_textures_dirty[i] = false;
 		}
@@ -428,48 +309,28 @@ void VKGSRender::load_texture_env()
 
 		auto sampler_state = static_cast<vk::texture_cache::sampled_image_descriptor*>(vs_sampler_state[i].get());
 		const auto& tex = rsx::method_registers.vertex_textures[i];
-		const auto previous_format_class = sampler_state->format_class;
 
 		if (m_samplers_dirty || m_vertex_textures_dirty[i] || !check_surface_cache_sampler(sampler_state, tex))
 		{
 			if (rsx::method_registers.vertex_textures[i].enabled())
 			{
+				check_heap_status(VK_HEAP_CHECK_TEXTURE_UPLOAD_STORAGE);
 				*sampler_state = m_texture_cache.upload_texture(*m_current_command_buffer, tex, m_rtts);
-			}
-			else
-			{
-				*sampler_state = {};
-			}
 
-			if (sampler_state->validate())
-			{
 				if (sampler_state->is_cyclic_reference || sampler_state->external_subresource_desc.do_not_cache)
 				{
 					check_for_cyclic_refs |= true;
 				}
 
-				if (!m_vertex_textures_dirty[i] && sampler_state->format_class != previous_format_class)
-				{
-					// Host details changed but RSX is not aware
-					m_graphics_state |= rsx::vertex_program_state_dirty;
-				}
-
 				bool replace = !vs_sampler_handles[i];
 				const VkBool32 unnormalized_coords = !!(tex.format() & CELL_GCM_TEXTURE_UN);
 				const auto min_lod = tex.min_lod();
 				const auto max_lod = tex.max_lod();
-				const auto wrap_s = vk::vk_wrap_mode(tex.wrap_s());
-				const auto wrap_t = vk::vk_wrap_mode(tex.wrap_t());
-
-				// NOTE: In vulkan, the border color can bypass the sample swizzle stage.
-				// Check the device properties to determine whether to pre-swizzle the colors or not.
-				const auto border_color = is_border_clamped_texture(tex)
-					? vk::border_color_t(get_border_color(tex))
-					: vk::border_color_t(VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK);
+				const auto border_color = vk::get_border_color(tex.border_color());
 
 				if (vs_sampler_handles[i])
 				{
-					if (!vs_sampler_handles[i]->matches(wrap_s, wrap_t, VK_SAMPLER_ADDRESS_MODE_REPEAT,
+					if (!vs_sampler_handles[i]->matches(VK_SAMPLER_ADDRESS_MODE_REPEAT, VK_SAMPLER_ADDRESS_MODE_REPEAT, VK_SAMPLER_ADDRESS_MODE_REPEAT,
 						unnormalized_coords, 0.f, 1.f, min_lod, max_lod, VK_FILTER_NEAREST, VK_FILTER_NEAREST, VK_SAMPLER_MIPMAP_MODE_NEAREST, border_color))
 					{
 						replace = true;
@@ -478,15 +339,16 @@ void VKGSRender::load_texture_env()
 
 				if (replace)
 				{
-					vs_sampler_handles[i] = vk::get_resource_manager()->get_sampler(
+					vs_sampler_handles[i] = vk::get_resource_manager()->find_sampler(
 						*m_device,
-						vs_sampler_handles[i],
-						wrap_s, wrap_t, VK_SAMPLER_ADDRESS_MODE_REPEAT,
+						VK_SAMPLER_ADDRESS_MODE_REPEAT, VK_SAMPLER_ADDRESS_MODE_REPEAT, VK_SAMPLER_ADDRESS_MODE_REPEAT,
 						unnormalized_coords,
 						0.f, 1.f, min_lod, max_lod,
 						VK_FILTER_NEAREST, VK_FILTER_NEAREST, VK_SAMPLER_MIPMAP_MODE_NEAREST, border_color);
 				}
 			}
+			else
+				*sampler_state = {};
 
 			m_vertex_textures_dirty[i] = false;
 		}
@@ -504,28 +366,10 @@ void VKGSRender::load_texture_env()
 			m_cached_renderpass = VK_NULL_HANDLE;
 		}
 	}
-
-	if (g_cfg.video.vk.asynchronous_texture_streaming)
-	{
-		// We have to do this here, because we have to assume the CB will be dumped
-		auto& async_task_scheduler = g_fxo->get<vk::AsyncTaskScheduler>();
-
-		if (async_task_scheduler.is_recording() &&
-			!async_task_scheduler.is_host_mode())
-		{
-			// Sync any async scheduler tasks
-			if (auto ev = async_task_scheduler.get_primary_sync_label())
-			{
-				ev->gpu_wait(*m_current_command_buffer, m_async_compute_dependency_info);
-			}
-		}
-	}
 }
 
-bool VKGSRender::bind_texture_env()
+void VKGSRender::bind_texture_env()
 {
-	bool out_of_memory = false;
-
 	for (u32 textures_ref = current_fp_metadata.referenced_textures_mask, i = 0; textures_ref; textures_ref >>= 1, ++i)
 	{
 		if (!(textures_ref & 1))
@@ -542,26 +386,75 @@ bool VKGSRender::bind_texture_env()
 				//Requires update, copy subresource
 				if (!(view = m_texture_cache.create_temporary_subresource(*m_current_command_buffer, sampler_state->external_subresource_desc)))
 				{
-					out_of_memory = true;
+					vk::raise_status_interrupt(vk::out_of_memory);
 				}
 			}
 			else
 			{
-				validate_image_layout_for_read_access(*m_current_command_buffer, view, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, sampler_state);
+				switch (auto raw = view->image(); raw->current_layout)
+				{
+				default:
+				//case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL:
+					break;
+				case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:
+					//ensure(sampler_state->upload_context == rsx::texture_upload_context::blit_engine_dst);
+					raw->change_layout(*m_current_command_buffer, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+					break;
+				case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL:
+					ensure(sampler_state->upload_context == rsx::texture_upload_context::blit_engine_src);
+					raw->change_layout(*m_current_command_buffer, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+					break;
+				case VK_IMAGE_LAYOUT_GENERAL:
+					ensure(sampler_state->upload_context == rsx::texture_upload_context::framebuffer_storage);
+					if (!sampler_state->is_cyclic_reference)
+					{
+						// This was used in a cyclic ref before, but is missing a barrier
+						// No need for a full stall, use a custom barrier instead
+						VkPipelineStageFlags src_stage;
+						VkAccessFlags src_access;
+						if (raw->aspect() == VK_IMAGE_ASPECT_COLOR_BIT)
+						{
+							src_stage = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+							src_access = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+						}
+						else
+						{
+							src_stage = VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
+							src_access = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
+						}
+
+						vk::insert_image_memory_barrier(
+							*m_current_command_buffer,
+							raw->value,
+							VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+							src_stage, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+							src_access, VK_ACCESS_SHADER_READ_BIT,
+							{ raw->aspect(), 0, 1, 0, 1 });
+
+						raw->current_layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+					}
+					break;
+				case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL:
+				case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL:
+					ensure(sampler_state->upload_context == rsx::texture_upload_context::framebuffer_storage);
+					raw->change_layout(*m_current_command_buffer, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+					break;
+				}
 			}
 		}
 
 		if (view) [[likely]]
 		{
 			m_program->bind_uniform({ fs_sampler_handles[i]->value, view->value, view->image()->current_layout },
-				vk::glsl::binding_set_index_fragment,
-				m_fs_binding_table->ftex_location[i]);
+				i,
+				::glsl::program_domain::glsl_fragment_program,
+				m_current_frame->descriptor_set);
 
 			if (current_fragment_program.texture_state.redirected_textures & (1 << i))
 			{
 				// Stencil mirror required
 				auto root_image = static_cast<vk::viewable_image*>(view->image());
-				auto stencil_view = root_image->get_view(rsx::default_remap_vector, VK_IMAGE_ASPECT_STENCIL_BIT);
+				auto stencil_view = root_image->get_view(0xAAE4, rsx::default_remap_vector, VK_IMAGE_ASPECT_STENCIL_BIT);
 
 				if (!m_stencil_mirror_sampler)
 				{
@@ -575,22 +468,27 @@ bool VKGSRender::bind_texture_env()
 				}
 
 				m_program->bind_uniform({ m_stencil_mirror_sampler->value, stencil_view->value, stencil_view->image()->current_layout },
-					vk::glsl::binding_set_index_fragment,
-					m_fs_binding_table->ftex_stencil_location[i]);
+					i,
+					::glsl::program_domain::glsl_fragment_program,
+					m_current_frame->descriptor_set,
+					true);
 			}
 		}
 		else
 		{
 			const VkImageViewType view_type = vk::get_view_type(current_fragment_program.get_texture_dimension(i));
 			m_program->bind_uniform({ vk::null_sampler(), vk::null_image_view(*m_current_command_buffer, view_type)->value, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
-				vk::glsl::binding_set_index_fragment,
-				m_fs_binding_table->ftex_location[i]);
+				i,
+				::glsl::program_domain::glsl_fragment_program,
+				m_current_frame->descriptor_set);
 
 			if (current_fragment_program.texture_state.redirected_textures & (1 << i))
 			{
 				m_program->bind_uniform({ vk::null_sampler(), vk::null_image_view(*m_current_command_buffer, view_type)->value, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
-					vk::glsl::binding_set_index_fragment,
-					m_fs_binding_table->ftex_stencil_location[i]);
+					i,
+					::glsl::program_domain::glsl_fragment_program,
+					m_current_frame->descriptor_set,
+					true);
 			}
 		}
 	}
@@ -604,8 +502,9 @@ bool VKGSRender::bind_texture_env()
 		{
 			const auto view_type = vk::get_view_type(current_vertex_program.get_texture_dimension(i));
 			m_program->bind_uniform({ vk::null_sampler(), vk::null_image_view(*m_current_command_buffer, view_type)->value, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
-				vk::glsl::binding_set_index_vertex,
-				m_vs_binding_table->vtex_location[i]);
+				i,
+				::glsl::program_domain::glsl_vertex_program,
+				m_current_frame->descriptor_set);
 
 			continue;
 		}
@@ -617,7 +516,7 @@ bool VKGSRender::bind_texture_env()
 		{
 			if (!(image_ptr = m_texture_cache.create_temporary_subresource(*m_current_command_buffer, sampler_state->external_subresource_desc)))
 			{
-				out_of_memory = true;
+				vk::raise_status_interrupt(vk::out_of_memory);
 			}
 		}
 
@@ -627,28 +526,75 @@ bool VKGSRender::bind_texture_env()
 			const auto view_type = vk::get_view_type(current_vertex_program.get_texture_dimension(i));
 
 			m_program->bind_uniform({ vk::null_sampler(), vk::null_image_view(*m_current_command_buffer, view_type)->value, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL },
-				vk::glsl::binding_set_index_vertex,
-				m_vs_binding_table->vtex_location[i]);
+				i,
+				::glsl::program_domain::glsl_vertex_program,
+				m_current_frame->descriptor_set);
 
 			continue;
 		}
 
-		validate_image_layout_for_read_access(*m_current_command_buffer, image_ptr, VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, sampler_state);
+		switch (auto raw = image_ptr->image(); raw->current_layout)
+		{
+		default:
+		//case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL:
+			break;
+		case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:
+			//ensure(sampler_state->upload_context == rsx::texture_upload_context::blit_engine_dst);
+			raw->change_layout(*m_current_command_buffer, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+			break;
+		case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL:
+			ensure(sampler_state->upload_context == rsx::texture_upload_context::blit_engine_src);
+			raw->change_layout(*m_current_command_buffer, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+			break;
+		case VK_IMAGE_LAYOUT_GENERAL:
+			ensure(sampler_state->upload_context == rsx::texture_upload_context::framebuffer_storage);
+			if (!sampler_state->is_cyclic_reference)
+			{
+				// Custom barrier, see similar block in FS stage
+				VkPipelineStageFlags src_stage;
+				VkAccessFlags src_access;
+				if (raw->aspect() == VK_IMAGE_ASPECT_COLOR_BIT)
+				{
+					src_stage = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+					src_access = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+				}
+				else
+				{
+					src_stage = VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
+					src_access = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
+				}
+
+				vk::insert_image_memory_barrier(
+					*m_current_command_buffer,
+					raw->value,
+					VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+					src_stage, VK_PIPELINE_STAGE_VERTEX_SHADER_BIT,
+					src_access, VK_ACCESS_SHADER_READ_BIT,
+					{ raw->aspect(), 0, 1, 0, 1 });
+
+				raw->current_layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+			}
+			break;
+		case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL:
+		case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL:
+			ensure(sampler_state->upload_context == rsx::texture_upload_context::framebuffer_storage);
+			raw->change_layout(*m_current_command_buffer, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+			break;
+		}
 
 		m_program->bind_uniform({ vs_sampler_handles[i]->value, image_ptr->value, image_ptr->image()->current_layout },
-			vk::glsl::binding_set_index_vertex,
-			m_vs_binding_table->vtex_location[i]);
+			i,
+			::glsl::program_domain::glsl_vertex_program,
+			m_current_frame->descriptor_set);
 	}
-
-	return out_of_memory;
 }
 
-bool VKGSRender::bind_interpreter_texture_env()
+void VKGSRender::bind_interpreter_texture_env()
 {
 	if (current_fp_metadata.referenced_textures_mask == 0)
 	{
 		// Nothing to do
-		return false;
+		return;
 	}
 
 	std::array<VkDescriptorImageInfo, 68> texture_env;
@@ -677,8 +623,6 @@ bool VKGSRender::bind_interpreter_texture_env()
 	std::advance(end, 16);
 	std::fill(start, end, fallback);
 
-	bool out_of_memory = false;
-
 	for (u32 textures_ref = current_fp_metadata.referenced_textures_mask, i = 0; textures_ref; textures_ref >>= 1, ++i)
 	{
 		if (!(textures_ref & 1))
@@ -695,12 +639,61 @@ bool VKGSRender::bind_interpreter_texture_env()
 				//Requires update, copy subresource
 				if (!(view = m_texture_cache.create_temporary_subresource(*m_current_command_buffer, sampler_state->external_subresource_desc)))
 				{
-					out_of_memory = true;
+					vk::raise_status_interrupt(vk::out_of_memory);
 				}
 			}
 			else
 			{
-				validate_image_layout_for_read_access(*m_current_command_buffer, view, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, sampler_state);
+				switch (auto raw = view->image(); raw->current_layout)
+				{
+				default:
+					//case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL:
+					break;
+				case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:
+					//ensure(sampler_state->upload_context == rsx::texture_upload_context::blit_engine_dst);
+					raw->change_layout(*m_current_command_buffer, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+					break;
+				case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL:
+					ensure(sampler_state->upload_context == rsx::texture_upload_context::blit_engine_src);
+					raw->change_layout(*m_current_command_buffer, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+					break;
+				case VK_IMAGE_LAYOUT_GENERAL:
+					ensure(sampler_state->upload_context == rsx::texture_upload_context::framebuffer_storage);
+					if (!sampler_state->is_cyclic_reference)
+					{
+						// This was used in a cyclic ref before, but is missing a barrier
+						// No need for a full stall, use a custom barrier instead
+						VkPipelineStageFlags src_stage;
+						VkAccessFlags src_access;
+						if (raw->aspect() == VK_IMAGE_ASPECT_COLOR_BIT)
+						{
+							src_stage = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+							src_access = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+						}
+						else
+						{
+							src_stage = VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
+							src_access = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
+						}
+
+						vk::insert_image_memory_barrier(
+							*m_current_command_buffer,
+							raw->value,
+							VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+							src_stage, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+							src_access, VK_ACCESS_SHADER_READ_BIT,
+							{ raw->aspect(), 0, 1, 0, 1 });
+
+						raw->current_layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+					}
+					break;
+				case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL:
+				case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL:
+					ensure(sampler_state->upload_context == rsx::texture_upload_context::framebuffer_storage);
+					ensure(!sampler_state->is_cyclic_reference);
+					raw->change_layout(*m_current_command_buffer, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+					break;
+				}
 			}
 		}
 
@@ -712,8 +705,7 @@ bool VKGSRender::bind_interpreter_texture_env()
 		}
 	}
 
-	m_shader_interpreter.update_fragment_textures(texture_env);
-	return out_of_memory;
+	m_shader_interpreter.update_fragment_textures(texture_env, m_current_frame->descriptor_set);
 }
 
 void VKGSRender::emit_geometry(u32 sub_index)
@@ -721,39 +713,30 @@ void VKGSRender::emit_geometry(u32 sub_index)
 	auto &draw_call = rsx::method_registers.current_draw_clause;
 	m_profiler.start();
 
-	const rsx::flags32_t vertex_state_mask = rsx::vertex_base_changed | rsx::vertex_arrays_changed;
-	const rsx::flags32_t state_flags = (sub_index == 0) ? rsx::vertex_arrays_changed : draw_call.execute_pipeline_dependencies(m_ctx);
+	const flags32_t vertex_state_mask = rsx::vertex_base_changed | rsx::vertex_arrays_changed;
+	const flags32_t vertex_state = (sub_index == 0) ? rsx::vertex_arrays_changed : draw_call.execute_pipeline_dependencies() & vertex_state_mask;
 
-	if (state_flags & rsx::vertex_arrays_changed)
+	if (vertex_state & rsx::vertex_arrays_changed)
 	{
-		m_draw_processor.analyse_inputs_interleaved(m_vertex_layout, current_vp_metadata);
+		analyse_inputs_interleaved(m_vertex_layout);
 	}
-	else if (state_flags & rsx::vertex_base_changed)
+	else if (vertex_state & rsx::vertex_base_changed)
 	{
 		// Rebase vertex bases instead of
 		for (auto& info : m_vertex_layout.interleaved_blocks)
 		{
-			info->vertex_range.second = 0;
 			const auto vertex_base_offset = rsx::method_registers.vertex_data_base_offset();
-			info->real_offset_address = rsx::get_address(rsx::get_vertex_offset_from_base(vertex_base_offset, info->base_offset), info->memory_location);
-		}
-	}
-	else
-	{
-		// Discard cached results
-		for (auto& info : m_vertex_layout.interleaved_blocks)
-		{
-			info->vertex_range.second = 0;
+			info.real_offset_address = rsx::get_address(rsx::get_vertex_offset_from_base(vertex_base_offset, info.base_offset), info.memory_location);
 		}
 	}
 
-	if ((state_flags & vertex_state_mask) && !m_vertex_layout.validate())
+	if (vertex_state && !m_vertex_layout.validate())
 	{
 		// No vertex inputs enabled
 		// Execute remainining pipeline barriers with NOP draw
 		do
 		{
-			draw_call.execute_pipeline_dependencies(m_ctx);
+			draw_call.execute_pipeline_dependencies();
 		}
 		while (draw_call.next());
 
@@ -761,6 +744,9 @@ void VKGSRender::emit_geometry(u32 sub_index)
 		return;
 	}
 
+	const auto old_persistent_buffer = m_persistent_attribute_storage ? m_persistent_attribute_storage->value : null_buffer_view->value;
+	const auto old_volatile_buffer = m_volatile_attribute_storage ? m_volatile_attribute_storage->value : null_buffer_view->value;
+
 	// Programs data is dependent on vertex state
 	auto upload_info = upload_vertex_data();
 	if (!upload_info.vertex_draw_count)
@@ -771,51 +757,13 @@ void VKGSRender::emit_geometry(u32 sub_index)
 
 	m_frame_stats.vertex_upload_time += m_profiler.duration();
 
-	// Faults are allowed during vertex upload. Ensure consistent CB state after uploads.
-	// Queries are spawned and closed outside render pass scope for consistency reasons.
-	if (m_current_command_buffer->flags & vk::command_buffer::cb_load_occluson_task)
-	{
-		u32 occlusion_id = m_occlusion_query_manager->allocate_query(*m_current_command_buffer);
-		if (occlusion_id == umax)
-		{
-			// Force flush
-			rsx_log.warning("[Performance Warning] Out of free occlusion slots. Forcing hard sync.");
-			ZCULL_control::sync(this);
-
-			occlusion_id = m_occlusion_query_manager->allocate_query(*m_current_command_buffer);
-			if (occlusion_id == umax)
-			{
-				//rsx_log.error("Occlusion pool overflow");
-				if (m_current_task) m_current_task->result = 1;
-			}
-		}
-
-		// Before starting a query, we need to match RP scope (VK_1_0 rules).
-		// We always want our queries to start outside a renderpass whenever possible.
-		// We ignore this for performance reasons whenever possible of course and only do this for sensitive drivers.
-		if (vk::use_strict_query_scopes() &&
-			vk::is_renderpass_open(*m_current_command_buffer))
-		{
-			vk::end_renderpass(*m_current_command_buffer);
-			emergency_query_cleanup(m_current_command_buffer);
-		}
-
-		// Begin query
-		m_occlusion_query_manager->begin_query(*m_current_command_buffer, occlusion_id);
-
-		auto& data = m_occlusion_map[m_active_query_info->driver_handle];
-		data.indices.push_back(occlusion_id);
-		data.set_sync_command_buffer(m_current_command_buffer);
-
-		m_current_command_buffer->flags &= ~vk::command_buffer::cb_load_occluson_task;
-		m_current_command_buffer->flags |= (vk::command_buffer::cb_has_occlusion_task | vk::command_buffer::cb_has_open_query);
-	}
-
 	auto persistent_buffer = m_persistent_attribute_storage ? m_persistent_attribute_storage->value : null_buffer_view->value;
 	auto volatile_buffer = m_volatile_attribute_storage ? m_volatile_attribute_storage->value : null_buffer_view->value;
 	bool update_descriptors = false;
 
-	if (m_current_draw.subdraw_id == 0)
+	const auto& binding_table = m_device->get_pipeline_binding_table();
+
+	if (sub_index == 0)
 	{
 		update_descriptors = true;
 
@@ -828,12 +776,39 @@ void VKGSRender::emit_geometry(u32 sub_index)
 			if (m_vertex_layout_storage &&
 				m_vertex_layout_storage->info.buffer != m_vertex_layout_ring_info.heap->value)
 			{
-				vk::get_resource_manager()->dispose(m_vertex_layout_storage);
+				m_current_frame->buffer_views_to_clean.push_back(std::move(m_vertex_layout_storage));
 			}
 
 			vk::clear_status_interrupt(vk::heap_changed);
 		}
 	}
+	else if (persistent_buffer != old_persistent_buffer || volatile_buffer != old_volatile_buffer)
+	{
+		// Need to update descriptors; make a copy for the next draw
+		VkDescriptorSet new_descriptor_set = allocate_descriptor_set();
+		std::vector<VkCopyDescriptorSet> copy_set(binding_table.total_descriptor_bindings);
+
+		for (u32 n = 0; n < binding_table.total_descriptor_bindings; ++n)
+		{
+			copy_set[n] =
+			{
+				VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET,   // sType
+				nullptr,                                 // pNext
+				m_current_frame->descriptor_set,         // srcSet
+				n,                                       // srcBinding
+				0u,                                      // srcArrayElement
+				new_descriptor_set,                      // dstSet
+				n,                                       // dstBinding
+				0u,                                      // dstArrayElement
+				1u                                       // descriptorCount
+			};
+		}
+
+		vkUpdateDescriptorSets(*m_device, 0, 0, binding_table.total_descriptor_bindings, copy_set.data());
+		m_current_frame->descriptor_set = new_descriptor_set;
+
+		update_descriptors = true;
+	}
 
 	// Update vertex fetch parameters
 	update_vertex_env(sub_index, upload_info);
@@ -841,13 +816,13 @@ void VKGSRender::emit_geometry(u32 sub_index)
 	ensure(m_vertex_layout_storage);
 	if (update_descriptors)
 	{
-		m_program->bind_uniform(persistent_buffer, vk::glsl::binding_set_index_vertex, m_vs_binding_table->vertex_buffers_location);
-		m_program->bind_uniform(volatile_buffer, vk::glsl::binding_set_index_vertex, m_vs_binding_table->vertex_buffers_location + 1);
-		m_program->bind_uniform(m_vertex_layout_storage->value, vk::glsl::binding_set_index_vertex, m_vs_binding_table->vertex_buffers_location + 2);
+		m_program->bind_uniform(persistent_buffer, binding_table.vertex_buffers_first_bind_slot, m_current_frame->descriptor_set);
+		m_program->bind_uniform(volatile_buffer, binding_table.vertex_buffers_first_bind_slot + 1, m_current_frame->descriptor_set);
+		m_program->bind_uniform(m_vertex_layout_storage->value, binding_table.vertex_buffers_first_bind_slot + 2, m_current_frame->descriptor_set);
 	}
 
-	bool reload_state = (!m_current_draw.subdraw_id++);
-	vk::renderpass_op(*m_current_command_buffer, [&](const vk::command_buffer& cmd, VkRenderPass pass, VkFramebuffer fbo)
+	bool reload_state = (!m_current_subdraw_id++);
+	vk::renderpass_op(*m_current_command_buffer, [&](VkCommandBuffer cmd, VkRenderPass pass, VkFramebuffer fbo)
 	{
 		if (get_render_pass() == pass && m_draw_fbo->value == fbo)
 		{
@@ -861,18 +836,13 @@ void VKGSRender::emit_geometry(u32 sub_index)
 			vk::end_renderpass(cmd);
 		}
 
-		// Starting a new renderpass should clobber dynamic state
-		m_current_command_buffer->flags |= vk::command_buffer::cb_reload_dynamic_state;
-
 		reload_state = true;
 	});
 
-	// Bind both pipe and descriptors in one go
-	// FIXME: We only need to rebind the pipeline when reload state is set. Flags?
-	m_program->bind(*m_current_command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS);
-
 	if (reload_state)
 	{
+		vkCmdBindPipeline(*m_current_command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, m_program->pipeline);
+
 		update_draw_state();
 		begin_render_pass();
 
@@ -884,30 +854,22 @@ void VKGSRender::emit_geometry(u32 sub_index)
 			info.sType = VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT;
 			info.buffer = m_cond_render_buffer->value;
 
-			_vkCmdBeginConditionalRenderingEXT(*m_current_command_buffer, &info);
+			m_device->_vkCmdBeginConditionalRenderingEXT(*m_current_command_buffer, &info);
 			m_current_command_buffer->flags |= vk::command_buffer::cb_has_conditional_render;
 		}
 	}
 
 	// Bind the new set of descriptors for use with this draw call
+	vkCmdBindDescriptorSets(*m_current_command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, m_program->pipeline_layout, 0, 1, &m_current_frame->descriptor_set, 0, nullptr);
+
 	m_frame_stats.setup_time += m_profiler.duration();
 
 	if (!upload_info.index_info)
 	{
-		if (draw_call.is_trivial_instanced_draw)
-		{
-			vkCmdDraw(*m_current_command_buffer, upload_info.vertex_draw_count, draw_call.pass_count(), 0, 0);
-		}
-		else if (draw_call.is_single_draw())
+		if (draw_call.is_single_draw())
 		{
 			vkCmdDraw(*m_current_command_buffer, upload_info.vertex_draw_count, 1, 0, 0);
 		}
-		else if (m_device->get_multidraw_support())
-		{
-			const auto subranges = draw_call.get_subranges();
-			auto ptr = utils::bless<const VkMultiDrawInfoEXT>(& subranges.front().first);
-			_vkCmdDrawMultiEXT(*m_current_command_buffer, ::size32(subranges), ptr, 1, 0, sizeof(rsx::draw_range_t));
-		}
 		else
 		{
 			u32 vertex_offset = 0;
@@ -926,37 +888,10 @@ void VKGSRender::emit_geometry(u32 sub_index)
 
 		vkCmdBindIndexBuffer(*m_current_command_buffer, m_index_buffer_ring_info.heap->value, offset, index_type);
 
-		if (draw_call.is_trivial_instanced_draw)
+		if (rsx::method_registers.current_draw_clause.is_single_draw())
 		{
-			vkCmdDrawIndexed(*m_current_command_buffer, upload_info.vertex_draw_count, draw_call.pass_count(), 0, 0, 0);
-		}
-		else if (rsx::method_registers.current_draw_clause.is_single_draw())
-		{
-			vkCmdDrawIndexed(*m_current_command_buffer, upload_info.vertex_draw_count, 1, 0, 0, 0);
-		}
-		else if (m_device->get_multidraw_support())
-		{
-			const auto subranges = draw_call.get_subranges();
-			const auto subranges_count = ::size32(subranges);
-			const auto allocation_size = subranges_count * sizeof(VkMultiDrawIndexedInfoEXT);
-
-			m_multidraw_parameters_buffer.resize(allocation_size);
-			auto base_ptr = utils::bless<VkMultiDrawIndexedInfoEXT>(m_multidraw_parameters_buffer.data());
-
-			u32 vertex_offset = 0;
-			auto _ptr = base_ptr;
-
-			for (const auto& range : subranges)
-			{
-				const auto count = get_index_count(draw_call.primitive, range.count);
-				_ptr->firstIndex = vertex_offset;
-				_ptr->indexCount = count;
-				_ptr->vertexOffset = 0;
-
-				_ptr++;
-				vertex_offset += count;
-			}
-			_vkCmdDrawMultiIndexedEXT(*m_current_command_buffer, subranges_count, base_ptr, 1, 0, sizeof(VkMultiDrawIndexedInfoEXT), nullptr);
+			const u32 index_count = upload_info.vertex_draw_count;
+			vkCmdDrawIndexed(*m_current_command_buffer, index_count, 1, 0, 0, 0);
 		}
 		else
 		{
@@ -977,30 +912,19 @@ void VKGSRender::emit_geometry(u32 sub_index)
 void VKGSRender::begin()
 {
 	// Save shader state now before prefetch and loading happens
-	m_interpreter_state = (m_graphics_state.load() & rsx::pipeline_state::invalidate_pipeline_bits);
+	m_interpreter_state = (m_graphics_state & rsx::pipeline_state::invalidate_pipeline_bits);
 
 	rsx::thread::begin();
 
-	if (skip_current_frame ||
-		swapchain_unavailable ||
-		cond_render_ctrl.disable_rendering())
-	{
+	if (skip_current_frame || swapchain_unavailable || cond_render_ctrl.disable_rendering())
 		return;
-	}
 
 	init_buffers(rsx::framebuffer_creation_context::context_draw);
-
-	if (m_graphics_state & rsx::pipeline_state::invalidate_pipeline_bits)
-	{
-		// Shaders need to be reloaded.
-		m_prev_program = m_program;
-		m_program = nullptr;
-	}
 }
 
 void VKGSRender::end()
 {
-	if (skip_current_frame || !m_graphics_state.test(rsx::rtt_config_valid) || swapchain_unavailable || cond_render_ctrl.disable_rendering())
+	if (skip_current_frame || !framebuffer_status_valid || swapchain_unavailable || cond_render_ctrl.disable_rendering())
 	{
 		execute_nop_draw();
 		rsx::thread::end();
@@ -1020,6 +944,11 @@ void VKGSRender::end()
 			m_aux_frame_context.grab_resources(*m_current_frame);
 			m_current_frame = &m_aux_frame_context;
 		}
+		else if (m_current_frame->used_descriptors)
+		{
+			m_current_frame->descriptor_pool.reset(0);
+			m_current_frame->used_descriptors = 0;
+		}
 
 		ensure(!m_current_frame->swap_command_buffer);
 
@@ -1027,7 +956,6 @@ void VKGSRender::end()
 	}
 
 	analyse_current_rsx_pipeline();
-
 	m_frame_stats.setup_time += m_profiler.duration();
 
 	load_texture_env();
@@ -1043,16 +971,93 @@ void VKGSRender::end()
 		return;
 	}
 
+	// Allocate descriptor set
+	check_descriptors();
+	m_current_frame->descriptor_set = allocate_descriptor_set();
+
 	// Load program execution environment
 	load_program_env();
 	m_frame_stats.setup_time += m_profiler.duration();
 
-	// Apply write memory barriers
-	if (auto ds = std::get<1>(m_rtts.m_bound_depth_stencil))
+	// Sync any async scheduler tasks
+	if (auto ev = g_fxo->get<vk::async_scheduler_thread>().get_primary_sync_label())
 	{
-		ds->write_barrier(*m_current_command_buffer);
+		ev->gpu_wait(*m_current_command_buffer);
 	}
 
+	int binding_attempts = 0;
+	while (binding_attempts++ < 3)
+	{
+		if (!m_shader_interpreter.is_interpreter(m_program)) [[likely]]
+		{
+			bind_texture_env();
+		}
+		else
+		{
+			bind_interpreter_texture_env();
+		}
+
+		// TODO: Replace OOO tracking with ref-counting to simplify the logic
+		if (!vk::test_status_interrupt(vk::out_of_memory))
+		{
+			break;
+		}
+
+		if (!on_vram_exhausted(rsx::problem_severity::fatal))
+		{
+			// It is not possible to free memory. Just use placeholder textures. Can cause graphics glitches but shouldn't crash otherwise
+			break;
+		}
+
+		if (m_samplers_dirty)
+		{
+			// Reload texture env if referenced objects were invalidated during OOO handling.
+			load_texture_env();
+		}
+		else
+		{
+			// Nothing to reload, only texture cache references held. Simply attempt to bind again.
+			vk::clear_status_interrupt(vk::out_of_memory);
+		}
+	}
+
+	m_texture_cache.release_uncached_temporary_subresources();
+	m_frame_stats.textures_upload_time += m_profiler.duration();
+
+	if (m_current_command_buffer->flags & vk::command_buffer::cb_load_occluson_task)
+	{
+		u32 occlusion_id = m_occlusion_query_manager->allocate_query(*m_current_command_buffer);
+		if (occlusion_id == umax)
+		{
+			// Force flush
+			rsx_log.error("[Performance Warning] Out of free occlusion slots. Forcing hard sync.");
+			ZCULL_control::sync(this);
+
+			occlusion_id = m_occlusion_query_manager->allocate_query(*m_current_command_buffer);
+			if (occlusion_id == umax)
+			{
+				//rsx_log.error("Occlusion pool overflow");
+				if (m_current_task) m_current_task->result = 1;
+			}
+		}
+
+		// Begin query
+		m_occlusion_query_manager->begin_query(*m_current_command_buffer, occlusion_id);
+
+		auto &data = m_occlusion_map[m_active_query_info->driver_handle];
+		data.indices.push_back(occlusion_id);
+		data.set_sync_command_buffer(m_current_command_buffer);
+
+		m_current_command_buffer->flags &= ~vk::command_buffer::cb_load_occluson_task;
+		m_current_command_buffer->flags |= (vk::command_buffer::cb_has_occlusion_task | vk::command_buffer::cb_has_open_query);
+	}
+
+	bool primitive_emulated = false;
+	vk::get_appropriate_topology(rsx::method_registers.current_draw_clause.primitive, primitive_emulated);
+
+	// Apply write memory barriers
+	if (auto ds = std::get<1>(m_rtts.m_bound_depth_stencil)) ds->write_barrier(*m_current_command_buffer);
+
 	for (auto &rtt : m_rtts.m_bound_render_targets)
 	{
 		if (auto surface = std::get<1>(rtt))
@@ -1061,73 +1066,26 @@ void VKGSRender::end()
 		}
 	}
 
-	m_frame_stats.setup_time += m_profiler.duration();
+	// Final heap check...
+	check_heap_status(VK_HEAP_CHECK_VERTEX_STORAGE | VK_HEAP_CHECK_VERTEX_LAYOUT_STORAGE);
 
-	// Now bind the shader resources. It is important that this takes place after the barriers so that we don't end up with stale descriptors
-	for (int retry = 0; retry < 3; ++retry)
-	{
-		if (retry > 0 && m_samplers_dirty) [[ unlikely ]]
-		{
-			// Reload texture env if referenced objects were invalidated during OOM handling.
-			load_texture_env();
+	u32 sub_index = 0;
+	m_current_subdraw_id = 0;
 
-			// Do not trust fragment/vertex texture state after a texture state reset.
-			// NOTE: We don't want to change the program - it's too late for that now. We just need to harmonize the state.
-			m_graphics_state |= rsx::vertex_program_state_dirty | rsx::fragment_program_state_dirty;
-			get_current_fragment_program(fs_sampler_state);
-			get_current_vertex_program(vs_sampler_state);
-			m_graphics_state.clear(rsx::pipeline_state::invalidate_pipeline_bits);
-		}
-
-		const bool out_of_memory = m_shader_interpreter.is_interpreter(m_program)
-			? bind_interpreter_texture_env()
-			: bind_texture_env();
-
-		if (!out_of_memory)
-		{
-			break;
-		}
-
-		// Handle OOM
-		if (!on_vram_exhausted(rsx::problem_severity::fatal))
-		{
-			// It is not possible to free memory. Just use placeholder textures. Can cause graphics glitches but shouldn't crash otherwise
-			break;
-		}
-	}
-
-	m_texture_cache.release_uncached_temporary_subresources();
-	m_frame_stats.textures_upload_time += m_profiler.duration();
-
-	u32 sub_index = 0;               // RSX subdraw ID
-	m_current_draw.subdraw_id = 0;   // Host subdraw ID. Invalid RSX subdraws do not increment this value
-
-	if (m_graphics_state & rsx::pipeline_state::invalidate_vk_dynamic_state)
-	{
-		m_current_command_buffer->flags |= vk::command_buffer::cb_reload_dynamic_state;
-	}
-
-	auto& draw_call = rsx::method_registers.current_draw_clause;
-	draw_call.begin();
+	rsx::method_registers.current_draw_clause.begin();
 	do
 	{
 		emit_geometry(sub_index++);
-
-		if (draw_call.is_trivial_instanced_draw)
-		{
-			// We already completed. End the draw.
-			draw_call.end();
-		}
 	}
-	while (draw_call.next());
+	while (rsx::method_registers.current_draw_clause.next());
 
 	if (m_current_command_buffer->flags & vk::command_buffer::cb_has_conditional_render)
 	{
-		_vkCmdEndConditionalRenderingEXT(*m_current_command_buffer);
+		m_device->_vkCmdEndConditionalRenderingEXT(*m_current_command_buffer);
 		m_current_command_buffer->flags &= ~(vk::command_buffer::cb_has_conditional_render);
 	}
 
-	m_rtts.on_write(m_framebuffer_layout.color_write_enabled, m_framebuffer_layout.zeta_write_enabled);
+	m_rtts.on_write(m_framebuffer_layout.color_write_enabled.data(), m_framebuffer_layout.zeta_write_enabled);
 
 	rsx::thread::end();
 }
diff --git a/rpcs3/Emu/RSX/VK/VKFormats.cpp b/rpcs3/Emu/RSX/VK/VKFormats.cpp
index f766a70e79..f94cc2e2fe 100644
--- a/rpcs3/Emu/RSX/VK/VKFormats.cpp
+++ b/rpcs3/Emu/RSX/VK/VKFormats.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "VKFormats.h"
-#include "VKHelpers.h"
 #include "vkutils/device.h"
 #include "vkutils/image.h"
 
@@ -79,7 +78,17 @@ namespace vk
 		}
 		default:
 		{
-			return VK_BORDER_COLOR_FLOAT_CUSTOM_EXT;
+			const auto color4 = rsx::decode_border_color(color);
+			if ((color4.r + color4.g + color4.b) > 1.35f)
+			{
+				//If color elements are brighter than roughly 0.5 average, use white border
+				return VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE;
+			}
+
+			if (color4.a > 0.5f)
+				return VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK;
+
+			return VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK;
 		}
 		}
 	}
@@ -194,31 +203,18 @@ namespace vk
 
 	VkFormat get_compatible_sampler_format(const gpu_formats_support& support, u32 format)
 	{
-		const bool supports_dxt = vk::get_current_renderer()->get_texture_compression_bc_support();
 		switch (format)
 		{
-#ifndef __APPLE__
-		case CELL_GCM_TEXTURE_R5G6B5: return VK_FORMAT_R5G6B5_UNORM_PACK16;
-		case CELL_GCM_TEXTURE_R6G5B5: return VK_FORMAT_R5G6B5_UNORM_PACK16; // Expand, discard high bit?
-		case CELL_GCM_TEXTURE_R5G5B5A1: return VK_FORMAT_R5G5B5A1_UNORM_PACK16;
-		case CELL_GCM_TEXTURE_D1R5G5B5: return VK_FORMAT_A1R5G5B5_UNORM_PACK16;
+		case CELL_GCM_TEXTURE_B8: return VK_FORMAT_R8_UNORM;
 		case CELL_GCM_TEXTURE_A1R5G5B5: return VK_FORMAT_A1R5G5B5_UNORM_PACK16;
 		case CELL_GCM_TEXTURE_A4R4G4B4: return VK_FORMAT_R4G4B4A4_UNORM_PACK16;
-#else
-		// assign B8G8R8A8_UNORM to formats that are not supported by Metal
-		case CELL_GCM_TEXTURE_R6G5B5: return VK_FORMAT_B8G8R8A8_UNORM;
-		case CELL_GCM_TEXTURE_R5G6B5: return VK_FORMAT_B8G8R8A8_UNORM;
-		case CELL_GCM_TEXTURE_R5G5B5A1: return VK_FORMAT_B8G8R8A8_UNORM;
-		case CELL_GCM_TEXTURE_D1R5G5B5: return VK_FORMAT_B8G8R8A8_UNORM;
-		case CELL_GCM_TEXTURE_A1R5G5B5: return VK_FORMAT_B8G8R8A8_UNORM;
-		case CELL_GCM_TEXTURE_A4R4G4B4: return VK_FORMAT_B8G8R8A8_UNORM;
-#endif
-		case CELL_GCM_TEXTURE_B8: return VK_FORMAT_R8_UNORM;
+		case CELL_GCM_TEXTURE_R5G6B5: return VK_FORMAT_R5G6B5_UNORM_PACK16;
 		case CELL_GCM_TEXTURE_A8R8G8B8: return VK_FORMAT_B8G8R8A8_UNORM;
-		case CELL_GCM_TEXTURE_COMPRESSED_DXT1: return supports_dxt ? VK_FORMAT_BC1_RGBA_UNORM_BLOCK : VK_FORMAT_B8G8R8A8_UNORM;
-		case CELL_GCM_TEXTURE_COMPRESSED_DXT23: return supports_dxt ? VK_FORMAT_BC2_UNORM_BLOCK : VK_FORMAT_B8G8R8A8_UNORM;
-		case CELL_GCM_TEXTURE_COMPRESSED_DXT45: return supports_dxt ? VK_FORMAT_BC3_UNORM_BLOCK : VK_FORMAT_B8G8R8A8_UNORM;
+		case CELL_GCM_TEXTURE_COMPRESSED_DXT1: return VK_FORMAT_BC1_RGBA_UNORM_BLOCK;
+		case CELL_GCM_TEXTURE_COMPRESSED_DXT23: return VK_FORMAT_BC2_UNORM_BLOCK;
+		case CELL_GCM_TEXTURE_COMPRESSED_DXT45: return VK_FORMAT_BC3_UNORM_BLOCK;
 		case CELL_GCM_TEXTURE_G8B8: return VK_FORMAT_R8G8_UNORM;
+		case CELL_GCM_TEXTURE_R6G5B5: return VK_FORMAT_R5G6B5_UNORM_PACK16; // Expand, discard high bit?
 		case CELL_GCM_TEXTURE_DEPTH24_D8: return support.d24_unorm_s8? VK_FORMAT_D24_UNORM_S8_UINT : VK_FORMAT_D32_SFLOAT_S8_UINT;
 		case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT:	return VK_FORMAT_D32_SFLOAT_S8_UINT;
 		case CELL_GCM_TEXTURE_DEPTH16: return VK_FORMAT_D16_UNORM;
@@ -226,9 +222,11 @@ namespace vk
 		case CELL_GCM_TEXTURE_X16: return VK_FORMAT_R16_UNORM;
 		case CELL_GCM_TEXTURE_Y16_X16: return VK_FORMAT_R16G16_UNORM;
 		case CELL_GCM_TEXTURE_Y16_X16_FLOAT: return VK_FORMAT_R16G16_SFLOAT;
+		case CELL_GCM_TEXTURE_R5G5B5A1: return VK_FORMAT_R5G5B5A1_UNORM_PACK16;
 		case CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT: return VK_FORMAT_R16G16B16A16_SFLOAT;
 		case CELL_GCM_TEXTURE_W32_Z32_Y32_X32_FLOAT: return VK_FORMAT_R32G32B32A32_SFLOAT;
 		case CELL_GCM_TEXTURE_X32_FLOAT: return VK_FORMAT_R32_SFLOAT;
+		case CELL_GCM_TEXTURE_D1R5G5B5: return VK_FORMAT_A1R5G5B5_UNORM_PACK16;
 		case CELL_GCM_TEXTURE_D8R8G8B8: return VK_FORMAT_B8G8R8A8_UNORM;
 		case CELL_GCM_TEXTURE_COMPRESSED_HILO8: return VK_FORMAT_R8G8_UNORM;
 		case CELL_GCM_TEXTURE_COMPRESSED_HILO_S8: return VK_FORMAT_R8G8_SNORM;
@@ -277,6 +275,7 @@ namespace vk
 		case VK_FORMAT_R32_SFLOAT:
 		case VK_FORMAT_R16G16_UNORM:
 		case VK_FORMAT_R16G16_SFLOAT:
+		case VK_FORMAT_A8B8G8R8_UNORM_PACK32:
 		case VK_FORMAT_R8G8B8A8_UNORM:
 		case VK_FORMAT_B8G8R8A8_UNORM:
 		case VK_FORMAT_B8G8R8A8_SRGB:
@@ -318,6 +317,7 @@ namespace vk
 		case VK_FORMAT_R8G8_UNORM:
 		case VK_FORMAT_R8G8_SNORM:
 			return{ 2, 1 }; //UNSIGNED_SHORT_8_8
+		case VK_FORMAT_A8B8G8R8_UNORM_PACK32:
 		case VK_FORMAT_R8G8B8A8_UNORM:
 		case VK_FORMAT_B8G8R8A8_UNORM:
 		case VK_FORMAT_B8G8R8A8_SRGB:
@@ -371,6 +371,7 @@ namespace vk
 		{
 			//8-bit
 		case VK_FORMAT_R8_UNORM:
+		case VK_FORMAT_A8B8G8R8_UNORM_PACK32:
 			return{ false, 1 };
 		case VK_FORMAT_B8G8R8A8_UNORM:
 		case VK_FORMAT_R8G8B8A8_UNORM:
diff --git a/rpcs3/Emu/RSX/VK/VKFormats.h b/rpcs3/Emu/RSX/VK/VKFormats.h
index 85b52ca56b..17d8834972 100644
--- a/rpcs3/Emu/RSX/VK/VKFormats.h
+++ b/rpcs3/Emu/RSX/VK/VKFormats.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "VulkanAPI.h"
 #include "../gcm_enums.h"
+#include <tuple>
 
 namespace vk
 {
@@ -22,6 +23,7 @@ namespace vk
 	u8 get_format_texel_width(VkFormat format);
 	std::pair<u8, u8> get_format_element_size(VkFormat format);
 	std::pair<bool, u32> get_format_convert_flags(VkFormat format);
+	bool formats_are_bitcast_compatible(VkFormat format1, VkFormat format2);
 	bool formats_are_bitcast_compatible(image* image1, image* image2);
 
 	minification_filter get_min_filter(rsx::texture_minify_filter min_filter);
@@ -29,5 +31,5 @@ namespace vk
 	VkSamplerAddressMode vk_wrap_mode(rsx::texture_wrap_mode gcm_wrap);
 	float max_aniso(rsx::texture_max_anisotropy gcm_aniso);
 	std::array<VkComponentSwizzle, 4> get_component_mapping(u32 format);
-	std::pair<VkPrimitiveTopology, bool> get_appropriate_topology(rsx::primitive_type mode);
+	VkPrimitiveTopology get_appropriate_topology(rsx::primitive_type mode, bool &requires_modification);
 }
diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp
index 040d528218..748caf8222 100644
--- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp
+++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp
@@ -5,6 +5,7 @@
 #include "vkutils/device.h"
 #include "Emu/system_config.h"
 #include "../Program/GLSLCommon.h"
+#include "../GCM.h"
 
 std::string VKFragmentDecompilerThread::getFloatTypeName(usz elementCount)
 {
@@ -26,106 +27,16 @@ std::string VKFragmentDecompilerThread::compareFunction(COMPARE f, const std::st
 	return glsl::compareFunctionImpl(f, Op0, Op1);
 }
 
-void VKFragmentDecompilerThread::prepareBindingTable()
-{
-	// First check if we have constants and textures as those need extra work
-	bool has_constants = false, has_textures = false;
-	for (const ParamType& PT : m_parr.params[PF_PARAM_UNIFORM])
-	{
-		if (has_constants && has_textures)
-		{
-			break;
-		}
-
-		if (PT.type.starts_with("sampler"))
-		{
-			has_textures = true;
-			continue;
-		}
-
-		ensure(PT.type.starts_with("vec"));
-		has_constants = true;
-	}
-
-	unsigned location = 0; // All bindings must be set from this var
-	vk_prog->binding_table.context_buffer_location = location++;
-	if (has_constants)
-	{
-		vk_prog->binding_table.cbuf_location = location++;
-	}
-
-	vk_prog->binding_table.tex_param_location = location++;
-	vk_prog->binding_table.polygon_stipple_params_location = location++;
-
-	std::memset(vk_prog->binding_table.ftex_location, 0xff, sizeof(vk_prog->binding_table.ftex_location));
-	std::memset(vk_prog->binding_table.ftex_stencil_location, 0xff, sizeof(vk_prog->binding_table.ftex_stencil_location));
-
-	if (has_textures) [[ likely ]]
-	{
-		for (const ParamType& PT : m_parr.params[PF_PARAM_UNIFORM])
-		{
-			if (!PT.type.starts_with("sampler"))
-			{
-				continue;
-			}
-
-			for (const ParamItem& PI : PT.items)
-			{
-				const auto texture_id = vk::get_texture_index(PI.name);
-				const auto mask = 1u << texture_id;
-
-				// Allocate real binding
-				vk_prog->binding_table.ftex_location[texture_id] = location++;
-
-				// Tag the stencil mirror if required
-				if (properties.redirected_sampler_mask & mask) [[ unlikely ]]
-				{
-					vk_prog->binding_table.ftex_stencil_location[texture_id] = 0;
-				}
-			}
-
-			// Normalize stencil offsets
-			if (properties.redirected_sampler_mask != 0) [[ unlikely ]]
-			{
-				for (auto& stencil_location : vk_prog->binding_table.ftex_stencil_location)
-				{
-					if (stencil_location != 0)
-					{
-						continue;
-					}
-
-					stencil_location = location++;
-				}
-			}
-		}
-	}
-}
-
 void VKFragmentDecompilerThread::insertHeader(std::stringstream & OS)
 {
-	prepareBindingTable();
-
-	std::vector<const char*> required_extensions;
-
 	if (device_props.has_native_half_support)
 	{
-		required_extensions.emplace_back("GL_EXT_shader_explicit_arithmetic_types_float16");
+		OS << "#version 450\n";
+		OS << "#extension GL_EXT_shader_explicit_arithmetic_types_float16: enable\n";
 	}
-
-	if (properties.multisampled_sampler_mask)
+	else
 	{
-		required_extensions.emplace_back("GL_ARB_shader_texture_image_samples");
-	}
-
-	if (m_prog.ctrl & RSX_SHADER_CONTROL_ATTRIBUTE_INTERPOLATION)
-	{
-		required_extensions.emplace_back("GL_EXT_fragment_shader_barycentric");
-	}
-
-	OS << "#version 450\n";
-	for (const auto ext : required_extensions)
-	{
-		OS << "#extension " << ext << ": require\n";
+		OS << "#version 420\n";
 	}
 
 	OS << "#extension GL_ARB_separate_shader_objects: enable\n\n";
@@ -135,17 +46,48 @@ void VKFragmentDecompilerThread::insertHeader(std::stringstream & OS)
 
 void VKFragmentDecompilerThread::insertInputs(std::stringstream & OS)
 {
-	glsl::insert_fragment_shader_inputs_block(
-		OS,
-		glsl::extension_flavour::EXT,
-		m_prog,
-		m_parr.params[PF_PARAM_IN],
+	for (const ParamType& PT : m_parr.params[PF_PARAM_IN])
+	{
+		for (const ParamItem& PI : PT.items)
 		{
-			.two_sided_color = !!(properties.in_register_mask & in_diff_color),
-			.two_sided_specular = !!(properties.in_register_mask & in_spec_color)
-		},
-		vk::get_varying_register_location
-	);
+			//ssa is defined in the program body and is not a varying type
+			if (PI.name == "ssa") continue;
+
+			const auto reg_location = vk::get_varying_register_location(PI.name);
+			std::string var_name = PI.name;
+
+			if (var_name == "fogc")
+			{
+				var_name = "fog_c";
+			}
+			else if (m_prog.two_sided_lighting)
+			{
+				if (var_name == "diff_color")
+				{
+					var_name = "diff_color0";
+				}
+				else if (var_name == "spec_color")
+				{
+					var_name = "spec_color0";
+				}
+			}
+
+			OS << "layout(location=" << reg_location << ") in " << PT.type << " " << var_name << ";\n";
+		}
+	}
+
+	if (m_prog.two_sided_lighting)
+	{
+		if (properties.in_register_mask & in_diff_color)
+		{
+			OS << "layout(location=" << vk::get_varying_register_location("diff_color1") << ") in vec4 diff_color1;\n";
+		}
+
+		if (properties.in_register_mask & in_spec_color)
+		{
+			OS << "layout(location=" << vk::get_varying_register_location("spec_color1") << ") in vec4 spec_color1;\n";
+		}
+	}
 }
 
 void VKFragmentDecompilerThread::insertOutputs(std::stringstream & OS)
@@ -174,30 +116,23 @@ void VKFragmentDecompilerThread::insertOutputs(std::stringstream & OS)
 
 void VKFragmentDecompilerThread::insertConstants(std::stringstream & OS)
 {
+	u32 location = m_binding_table.textures_first_bind_slot;
 	for (const ParamType& PT : m_parr.params[PF_PARAM_UNIFORM])
 	{
-		if (!PT.type.starts_with("sampler"))
-		{
+		if (PT.type != "sampler1D" &&
+			PT.type != "sampler2D" &&
+			PT.type != "sampler3D" &&
+			PT.type != "samplerCube")
 			continue;
-		}
 
 		for (const ParamItem& PI : PT.items)
 		{
 			std::string samplerType = PT.type;
+			int index = atoi(&PI.name[3]);
 
-			const int index = vk::get_texture_index(PI.name);
 			const auto mask = (1 << index);
 
-			if (properties.multisampled_sampler_mask & mask)
-			{
-				if (samplerType != "sampler1D" && samplerType != "sampler2D")
-				{
-					rsx_log.error("Unexpected multisampled image type '%s'", samplerType);
-				}
-
-				samplerType = "sampler2DMS";
-			}
-			else if (properties.shadow_sampler_mask & mask)
+			if (properties.shadow_sampler_mask & mask)
 			{
 				if (properties.common_access_sampler_mask & mask)
 				{
@@ -209,37 +144,39 @@ void VKFragmentDecompilerThread::insertConstants(std::stringstream & OS)
 				}
 			}
 
-			const int id = vk::get_texture_index(PI.name);
-			auto in = vk::glsl::program_input::make(
-				glsl::glsl_fragment_program,
-				PI.name,
-				vk::glsl::input_type_texture,
-				vk::glsl::binding_set_index_fragment,
-				vk_prog->binding_table.ftex_location[id]
-			);
+			vk::glsl::program_input in;
+			in.location = location;
+			in.domain = glsl::glsl_fragment_program;
+			in.name = PI.name;
+			in.type = vk::glsl::input_type_texture;
+
 			inputs.push_back(in);
 
-			OS << "layout(set=1, binding=" << in.location << ") uniform " << samplerType << " " << PI.name << ";\n";
+			OS << "layout(set=0, binding=" << location++ << ") uniform " << samplerType << " " << PI.name << ";\n";
 
 			if (properties.redirected_sampler_mask & mask)
 			{
 				// Insert stencil mirror declaration
 				in.name += "_stencil";
-				in.location = vk_prog->binding_table.ftex_stencil_location[id];
+				in.location = location;
+
 				inputs.push_back(in);
 
-				OS << "layout(set=1, binding=" << in.location << ") uniform u" << samplerType << " " << in.name << ";\n";
+				OS << "layout(set=0, binding=" << location++ << ") uniform u" << PT.type << " " << in.name << ";\n";
 			}
 		}
 	}
 
+	ensure(location <= m_binding_table.vertex_textures_first_bind_slot); // "Too many sampler descriptors!"
+
 	std::string constants_block;
 	for (const ParamType& PT : m_parr.params[PF_PARAM_UNIFORM])
 	{
-		if (PT.type.starts_with("sampler"))
-		{
+		if (PT.type == "sampler1D" ||
+			PT.type == "sampler2D" ||
+			PT.type == "sampler3D" ||
+			PT.type == "samplerCube")
 			continue;
-		}
 
 		for (const ParamItem& PI : PT.items)
 		{
@@ -249,13 +186,13 @@ void VKFragmentDecompilerThread::insertConstants(std::stringstream & OS)
 
 	if (!constants_block.empty())
 	{
-		OS << "layout(std140, set=1, binding=" << vk_prog->binding_table.cbuf_location << ") uniform FragmentConstantsBuffer\n";
+		OS << "layout(std140, set = 0, binding = 2) uniform FragmentConstantsBuffer\n";
 		OS << "{\n";
 		OS << constants_block;
 		OS << "};\n\n";
 	}
 
-	OS << "layout(std140, set=1, binding=" << vk_prog->binding_table.context_buffer_location << ") uniform FragmentStateBuffer\n";
+	OS << "layout(std140, set = 0, binding = 3) uniform FragmentStateBuffer\n";
 	OS << "{\n";
 	OS << "	float fog_param0;\n";
 	OS << "	float fog_param1;\n";
@@ -267,39 +204,32 @@ void VKFragmentDecompilerThread::insertConstants(std::stringstream & OS)
 	OS << "	float wpos_bias;\n";
 	OS << "};\n\n";
 
-	OS << "layout(std140, set=1, binding=" << vk_prog->binding_table.tex_param_location << ") uniform TextureParametersBuffer\n";
+	OS << "layout(std140, set = 0, binding = 4) uniform TextureParametersBuffer\n";
 	OS << "{\n";
 	OS << "	sampler_info texture_parameters[16];\n";
 	OS << "};\n\n";
 
-	OS << "layout(std140, set=1, binding=" << vk_prog->binding_table.polygon_stipple_params_location << ") uniform RasterizerHeap\n";
+	OS << "layout(std140, set = 0, binding = " << std::to_string(m_binding_table.rasterizer_env_bind_slot) << ") uniform RasterizerHeap\n";
 	OS << "{\n";
 	OS << "	uvec4 stipple_pattern[8];\n";
 	OS << "};\n\n";
 
-	vk::glsl::program_input in
-	{
-		.domain = glsl::glsl_fragment_program,
-		.type = vk::glsl::input_type_uniform_buffer,
-		.set = vk::glsl::binding_set_index_fragment
-	};
+	vk::glsl::program_input in;
+	in.location = m_binding_table.fragment_constant_buffers_bind_slot;
+	in.domain = glsl::glsl_fragment_program;
+	in.name = "FragmentConstantsBuffer";
+	in.type = vk::glsl::input_type_uniform_buffer;
+	inputs.push_back(in);
 
-	if (!constants_block.empty())
-	{
-		in.location = vk_prog->binding_table.cbuf_location;
-		in.name = "FragmentConstantsBuffer";
-		inputs.push_back(in);
-	}
-
-	in.location = vk_prog->binding_table.context_buffer_location;
+	in.location = m_binding_table.fragment_state_bind_slot;
 	in.name = "FragmentStateBuffer";
 	inputs.push_back(in);
 
-	in.location = vk_prog->binding_table.tex_param_location;
+	in.location = m_binding_table.fragment_texture_params_bind_slot;
 	in.name = "TextureParametersBuffer";
 	inputs.push_back(in);
 
-	in.location = vk_prog->binding_table.polygon_stipple_params_location;
+	in.location = m_binding_table.rasterizer_env_bind_slot;
 	in.name = "RasterizerHeap";
 	inputs.push_back(in);
 }
@@ -312,28 +242,24 @@ void VKFragmentDecompilerThread::insertGlobalFunctions(std::stringstream &OS)
 	m_shader_props.require_depth_conversion = properties.redirected_sampler_mask != 0;
 	m_shader_props.require_wpos = !!(properties.in_register_mask & in_wpos);
 	m_shader_props.require_texture_ops = properties.has_tex_op;
-	m_shader_props.require_tex_shadow_ops = properties.shadow_sampler_mask != 0;
-	m_shader_props.require_msaa_ops = m_prog.texture_state.multisampled_textures != 0;
+	m_shader_props.require_shadow_ops = properties.shadow_sampler_mask != 0;
 	m_shader_props.require_texture_expand = properties.has_exp_tex_op;
 	m_shader_props.require_srgb_to_linear = properties.has_upg;
 	m_shader_props.require_linear_to_srgb = properties.has_pkg;
-	m_shader_props.require_fog_read = properties.in_register_mask & in_fogc;
 	m_shader_props.emulate_coverage_tests = g_cfg.video.antialiasing_level == msaa_level::none;
 	m_shader_props.emulate_shadow_compare = device_props.emulate_depth_compare;
-	m_shader_props.low_precision_tests = device_props.has_low_precision_rounding && !(m_prog.ctrl & RSX_SHADER_CONTROL_ATTRIBUTE_INTERPOLATION);
-	m_shader_props.disable_early_discard = !vk::is_NVIDIA(vk::get_driver_vendor());
+	m_shader_props.low_precision_tests = device_props.has_low_precision_rounding;
+	m_shader_props.disable_early_discard = vk::get_driver_vendor() != vk::driver_vendor::NVIDIA;
 	m_shader_props.supports_native_fp16 = device_props.has_native_half_support;
-	m_shader_props.ROP_output_rounding = g_cfg.video.shader_precision != gpu_preset_level::low;
-	m_shader_props.require_tex1D_ops = properties.has_tex1D;
-	m_shader_props.require_tex2D_ops = properties.has_tex2D;
-	m_shader_props.require_tex3D_ops = properties.has_tex3D;
-	m_shader_props.require_shadowProj_ops = properties.shadow_sampler_mask != 0 && properties.has_texShadowProj;
 
 	glsl::insert_glsl_legacy_function(OS, m_shader_props);
 }
 
 void VKFragmentDecompilerThread::insertMainStart(std::stringstream & OS)
 {
+	if (properties.in_register_mask & in_fogc)
+		glsl::insert_fog_declaration(OS);
+
 	std::set<std::string> output_registers;
 	if (m_ctrl & CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS)
 	{
@@ -451,6 +377,7 @@ void VKFragmentDecompilerThread::insertMainEnd(std::stringstream & OS)
 
 void VKFragmentDecompilerThread::Task()
 {
+	m_binding_table = vk::g_render_device->get_pipeline_binding_table();
 	m_shader = Decompile();
 	vk_prog->SetInputs(inputs);
 }
@@ -469,13 +396,13 @@ void VKFragmentProgram::Decompile(const RSXFragmentProgram& prog)
 	VKFragmentDecompilerThread decompiler(source, parr, prog, size, *this);
 
 	const auto pdev = vk::get_current_renderer();
-	if (g_cfg.video.shader_precision == gpu_preset_level::low)
+	if (!g_cfg.video.disable_native_float16)
 	{
 		decompiler.device_props.has_native_half_support = pdev->get_shader_types_support().allow_float16;
 	}
 
 	decompiler.device_props.emulate_depth_compare = !pdev->get_formats_support().d24_unorm_s8;
-	decompiler.device_props.has_low_precision_rounding = vk::is_NVIDIA(vk::get_driver_vendor());
+	decompiler.device_props.has_low_precision_rounding = vk::get_driver_vendor() == vk::driver_vendor::NVIDIA;
 	decompiler.Task();
 
 	shader.create(::glsl::program_domain::glsl_fragment_program, source);
@@ -484,7 +411,10 @@ void VKFragmentProgram::Decompile(const RSXFragmentProgram& prog)
 	{
 		for (const ParamItem& PI : PT.items)
 		{
-			if (PT.type.starts_with("sampler"))
+			if (PT.type == "sampler1D" ||
+				PT.type == "sampler2D" ||
+				PT.type == "sampler3D" ||
+				PT.type == "samplerCube")
 				continue;
 
 			usz offset = atoi(PI.name.c_str() + 2);
@@ -496,7 +426,7 @@ void VKFragmentProgram::Decompile(const RSXFragmentProgram& prog)
 void VKFragmentProgram::Compile()
 {
 	if (g_cfg.video.log_programs)
-		fs::write_file(fs::get_cache_dir() + "shaderlog/FragmentProgram" + std::to_string(id) + ".spirv", fs::rewrite, shader.get_source());
+		fs::file(fs::get_cache_dir() + "shaderlog/FragmentProgram" + std::to_string(id) + ".spirv", fs::rewrite).write(shader.get_source());
 	handle = shader.compile();
 }
 
diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.h b/rpcs3/Emu/RSX/VK/VKFragmentProgram.h
index c51b81b8fc..787f38ec05 100644
--- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.h
+++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.h
@@ -10,7 +10,7 @@ namespace vk
 	class shader_interpreter;
 }
 
-class VKFragmentDecompilerThread : public FragmentProgramDecompiler
+struct VKFragmentDecompilerThread : public FragmentProgramDecompiler
 {
 	friend class vk::shader_interpreter;
 
@@ -19,8 +19,7 @@ class VKFragmentDecompilerThread : public FragmentProgramDecompiler
 	std::vector<vk::glsl::program_input> inputs;
 	class VKFragmentProgram *vk_prog;
 	glsl::shader_properties m_shader_props{};
-
-	void prepareBindingTable();
+	vk::pipeline_binding_table m_binding_table{};
 
 public:
 	VKFragmentDecompilerThread(std::string& shader, ParamArray& parr, const RSXFragmentProgram &prog, u32& size, class VKFragmentProgram& dst)
@@ -33,7 +32,6 @@ public:
 
 	void Task();
 	const std::vector<vk::glsl::program_input>& get_inputs() { return inputs; }
-
 protected:
 	std::string getFloatTypeName(usz elementCount) override;
 	std::string getHalfTypeName(usz elementCount) override;
@@ -65,19 +63,8 @@ public:
 	std::vector<usz> FragmentConstantOffsetCache;
 
 	std::array<u32, 4> output_color_masks{ {} };
+
 	std::vector<vk::glsl::program_input> uniforms;
-
-	struct
-	{
-		u32 context_buffer_location = umax;           // Rasterizer context
-		u32 cbuf_location = umax;                     // Constants register file
-		u32 tex_param_location = umax;                // Texture configuration data
-		u32 polygon_stipple_params_location = umax;   // Polygon stipple settings
-		u32 ftex_location[16];                        // Texture locations array
-		u32 ftex_stencil_location[16];                // Texture stencil mirror array
-
-	} binding_table;
-
 	void SetInputs(std::vector<vk::glsl::program_input>& inputs);
 	/**
 	 * Decompile a fragment shader located in the PS3's Memory.  This function operates synchronously.
diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp
index b2003f645c..3d71b51eec 100644
--- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp
+++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp
@@ -1,11 +1,10 @@
-#include "Emu/RSX/VK/vkutils/descriptors.h"
 #include "stdafx.h"
-#include "../Overlays/overlay_compile_notification.h"
+#include "../Overlays/overlay_shader_compile_notification.h"
 #include "../Overlays/Shaders/shader_loading_dialog_native.h"
 
 #include "VKAsyncScheduler.h"
 #include "VKCommandStream.h"
-#include "VKCommonPipelineLayout.h"
+#include "VKCommonDecompiler.h"
 #include "VKCompute.h"
 #include "VKGSRender.h"
 #include "VKHelpers.h"
@@ -16,15 +15,11 @@
 #include "vkutils/scratch.h"
 
 #include "Emu/RSX/rsx_methods.h"
-#include "Emu/RSX/Host/MM.h"
-#include "Emu/RSX/Host/RSXDMAWriter.h"
-#include "Emu/RSX/NV47/HW/context_accessors.define.h"
 #include "Emu/Memory/vm_locking.h"
 
-#include "../Program/SPIRVCommon.h"
+#include "../Program/program_state_cache2.hpp"
 
 #include "util/asm.hpp"
-#include <vulkan/vulkan_core.h>
 
 namespace vk
 {
@@ -37,26 +32,9 @@ namespace vk
 
 		switch (color_format)
 		{
-#ifndef __APPLE__
 		case rsx::surface_color_format::r5g6b5:
 			return std::make_pair(VK_FORMAT_R5G6B5_UNORM_PACK16, vk::default_component_map);
 
-		case rsx::surface_color_format::x1r5g5b5_o1r5g5b5:
-			return std::make_pair(VK_FORMAT_A1R5G5B5_UNORM_PACK16, o_rgb);
-
-		case rsx::surface_color_format::x1r5g5b5_z1r5g5b5:
-			return std::make_pair(VK_FORMAT_A1R5G5B5_UNORM_PACK16, z_rgb);
-#else
-		// assign B8G8R8A8_UNORM to formats that are not supported by Metal
-		case rsx::surface_color_format::r5g6b5:
-			return std::make_pair(VK_FORMAT_B8G8R8A8_UNORM, vk::default_component_map);
-
-		case rsx::surface_color_format::x1r5g5b5_o1r5g5b5:
-			return std::make_pair(VK_FORMAT_B8G8R8A8_UNORM, o_rgb);
-
-		case rsx::surface_color_format::x1r5g5b5_z1r5g5b5:
-			return std::make_pair(VK_FORMAT_B8G8R8A8_UNORM, z_rgb);
-#endif
 		case rsx::surface_color_format::a8r8g8b8:
 			return std::make_pair(VK_FORMAT_B8G8R8A8_UNORM, vk::default_component_map);
 
@@ -81,6 +59,12 @@ namespace vk
 		case rsx::surface_color_format::w32z32y32x32:
 			return std::make_pair(VK_FORMAT_R32G32B32A32_SFLOAT, vk::default_component_map);
 
+		case rsx::surface_color_format::x1r5g5b5_o1r5g5b5:
+			return std::make_pair(VK_FORMAT_A1R5G5B5_UNORM_PACK16, o_rgb);
+
+		case rsx::surface_color_format::x1r5g5b5_z1r5g5b5:
+			return std::make_pair(VK_FORMAT_A1R5G5B5_UNORM_PACK16, z_rgb);
+
 		case rsx::surface_color_format::b8:
 		{
 			const VkComponentMapping no_alpha = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_ONE };
@@ -163,11 +147,11 @@ namespace vk
 			[[fallthrough]];
 		case rsx::blend_equation::add:
 			return VK_BLEND_OP_ADD;
-		case rsx::blend_equation::subtract: return VK_BLEND_OP_SUBTRACT;
-		case rsx::blend_equation::reverse_subtract_signed:
+		case rsx::blend_equation::substract: return VK_BLEND_OP_SUBTRACT;
+		case rsx::blend_equation::reverse_substract_signed:
 			rsx_log.trace("blend equation reverse_subtract_signed used. Emulating using FUNC_REVERSE_SUBTRACT");
 			[[fallthrough]];
-		case rsx::blend_equation::reverse_subtract: return VK_BLEND_OP_REVERSE_SUBTRACT;
+		case rsx::blend_equation::reverse_substract: return VK_BLEND_OP_REVERSE_SUBTRACT;
 		case rsx::blend_equation::min: return VK_BLEND_OP_MIN;
 		case rsx::blend_equation::max: return VK_BLEND_OP_MAX;
 		default:
@@ -214,192 +198,127 @@ namespace vk
 			fmt::throw_exception("Unknown cull face value: 0x%x", static_cast<u32>(cfv));
 		}
 	}
+}
 
-	struct vertex_input_assembly_state
+namespace
+{
+	std::tuple<VkPipelineLayout, VkDescriptorSetLayout> get_shared_pipeline_layout(VkDevice dev)
 	{
-		VkPrimitiveTopology primitive;
-		VkBool32 restart_index_enabled;
-	};
+		const auto& binding_table = vk::get_current_renderer()->get_pipeline_binding_table();
+		std::vector<VkDescriptorSetLayoutBinding> bindings(binding_table.total_descriptor_bindings);
 
-	vertex_input_assembly_state decode_vertex_input_assembly_state()
-	{
-		vertex_input_assembly_state state{};
-		const auto& current_draw = rsx::method_registers.current_draw_clause;
-		const auto [primitive, emulated_primitive] = vk::get_appropriate_topology(current_draw.primitive);
+		usz idx = 0;
 
-		if (rsx::method_registers.restart_index_enabled() &&
-			!current_draw.is_disjoint_primitive &&
-			current_draw.command == rsx::draw_command::indexed &&
-			!emulated_primitive &&
-			!vk::emulate_primitive_restart(current_draw.primitive))
+		// Vertex stream, one stream for cacheable data, one stream for transient data
+		for (int i = 0; i < 3; i++)
 		{
-			state.restart_index_enabled = VK_TRUE;
+			bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
+			bindings[idx].descriptorCount = 1;
+			bindings[idx].stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+			bindings[idx].binding = binding_table.vertex_buffers_first_bind_slot + i;
+			idx++;
 		}
 
-		state.primitive = primitive;
-		return state;
-	}
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[idx].binding = binding_table.fragment_constant_buffers_bind_slot;
 
-	// TODO: This should be deprecated soon (kd)
-	vk::pipeline_props decode_rsx_state(
-		const vertex_input_assembly_state& vertex_input,
-		vk::render_target* ds,
-		const rsx::backend_configuration& backend_config,
-		u8 num_draw_buffers,
-		u8 num_rasterization_samples,
-		bool depth_bounds_support)
-	{
-		vk::pipeline_props properties{};
+		idx++;
 
-		// Input assembly
-		properties.state.set_primitive_type(vertex_input.primitive);
-		properties.state.enable_primitive_restart(vertex_input.restart_index_enabled);
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[idx].binding = binding_table.fragment_state_bind_slot;
 
-		// Rasterizer state
-		properties.state.set_attachment_count(num_draw_buffers);
-		properties.state.set_front_face(vk::get_front_face(rsx::method_registers.front_face_mode()));
-		properties.state.enable_depth_clamp(rsx::method_registers.depth_clamp_enabled() || !rsx::method_registers.depth_clip_enabled());
-		properties.state.enable_depth_bias(true);
-		properties.state.enable_depth_bounds_test(depth_bounds_support);
+		idx++;
 
-		if (rsx::method_registers.depth_test_enabled())
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[idx].binding = binding_table.fragment_texture_params_bind_slot;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+		bindings[idx].binding = binding_table.vertex_constant_buffers_bind_slot;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_ALL_GRAPHICS;
+		bindings[idx].binding = binding_table.vertex_params_bind_slot;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+		bindings[idx].binding = binding_table.conditional_render_predicate_slot;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[idx].binding = binding_table.rasterizer_env_bind_slot;
+
+		idx++;
+
+		for (auto binding = binding_table.textures_first_bind_slot;
+			 binding < binding_table.vertex_textures_first_bind_slot;
+			 binding++)
 		{
-			//NOTE: Like stencil, depth write is meaningless without depth test
-			properties.state.set_depth_mask(rsx::method_registers.depth_write_enabled());
-			properties.state.enable_depth_test(vk::get_compare_func(rsx::method_registers.depth_func()));
+			bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+			bindings[idx].descriptorCount = 1;
+			bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+			bindings[idx].binding = binding;
+			idx++;
 		}
 
-		if (rsx::method_registers.cull_face_enabled())
+		for (int i = 0; i < rsx::limits::vertex_textures_count; i++)
 		{
-			properties.state.enable_cull_face(vk::get_cull_face(rsx::method_registers.cull_face_mode()));
+			bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+			bindings[idx].descriptorCount = 1;
+			bindings[idx].stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+			bindings[idx].binding = binding_table.vertex_textures_first_bind_slot + i;
+			idx++;
 		}
 
-		const auto host_write_mask = rsx::get_write_output_mask(rsx::method_registers.surface_color());
-		for (uint index = 0; index < num_draw_buffers; ++index)
+		ensure(idx == binding_table.total_descriptor_bindings);
+
+		std::array<VkPushConstantRange, 1> push_constants;
+		push_constants[0].offset = 0;
+		push_constants[0].size = 16;
+		push_constants[0].stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+
+		if (vk::emulate_conditional_rendering())
 		{
-			bool color_mask_b = rsx::method_registers.color_mask_b(index);
-			bool color_mask_g = rsx::method_registers.color_mask_g(index);
-			bool color_mask_r = rsx::method_registers.color_mask_r(index);
-			bool color_mask_a = rsx::method_registers.color_mask_a(index);
-
-			switch (rsx::method_registers.surface_color())
-			{
-			case rsx::surface_color_format::b8:
-				rsx::get_b8_colormask(color_mask_r, color_mask_g, color_mask_b, color_mask_a);
-				break;
-			case rsx::surface_color_format::g8b8:
-				rsx::get_g8b8_r8g8_colormask(color_mask_r, color_mask_g, color_mask_b, color_mask_a);
-				break;
-			default:
-				break;
-			}
-
-			properties.state.set_color_mask(
-				index,
-				color_mask_r && host_write_mask[0],
-				color_mask_g && host_write_mask[1],
-				color_mask_b && host_write_mask[2],
-				color_mask_a && host_write_mask[3]);
+			// Conditional render toggle
+			push_constants[0].size = 20;
 		}
 
-		// LogicOp and Blend are mutually exclusive. If both are enabled, LogicOp takes precedence.
-		if (rsx::method_registers.logic_op_enabled())
-		{
-			properties.state.enable_logic_op(vk::get_logic_op(rsx::method_registers.logic_operation()));
-		}
-		else
-		{
-			bool mrt_blend_enabled[] =
-			{
-				rsx::method_registers.blend_enabled(),
-				rsx::method_registers.blend_enabled_surface_1(),
-				rsx::method_registers.blend_enabled_surface_2(),
-				rsx::method_registers.blend_enabled_surface_3()
-			};
+		VkDescriptorSetLayoutCreateInfo infos = {};
+		infos.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
+		infos.pBindings = bindings.data();
+		infos.bindingCount = static_cast<u32>(bindings.size());
 
-			VkBlendFactor sfactor_rgb, sfactor_a, dfactor_rgb, dfactor_a;
-			VkBlendOp equation_rgb, equation_a;
+		VkDescriptorSetLayout set_layout;
+		CHECK_RESULT(vkCreateDescriptorSetLayout(dev, &infos, nullptr, &set_layout));
 
-			if (mrt_blend_enabled[0] || mrt_blend_enabled[1] || mrt_blend_enabled[2] || mrt_blend_enabled[3])
-			{
-				sfactor_rgb = vk::get_blend_factor(rsx::method_registers.blend_func_sfactor_rgb());
-				sfactor_a = vk::get_blend_factor(rsx::method_registers.blend_func_sfactor_a());
-				dfactor_rgb = vk::get_blend_factor(rsx::method_registers.blend_func_dfactor_rgb());
-				dfactor_a = vk::get_blend_factor(rsx::method_registers.blend_func_dfactor_a());
-				equation_rgb = vk::get_blend_op(rsx::method_registers.blend_equation_rgb());
-				equation_a = vk::get_blend_op(rsx::method_registers.blend_equation_a());
+		VkPipelineLayoutCreateInfo layout_info = {};
+		layout_info.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
+		layout_info.setLayoutCount = 1;
+		layout_info.pSetLayouts = &set_layout;
+		layout_info.pushConstantRangeCount = 1;
+		layout_info.pPushConstantRanges = push_constants.data();
 
-				for (u8 idx = 0; idx < num_draw_buffers; ++idx)
-				{
-					if (mrt_blend_enabled[idx])
-					{
-						properties.state.enable_blend(idx, sfactor_rgb, sfactor_a, dfactor_rgb, dfactor_a, equation_rgb, equation_a);
-					}
-				}
-			}
-		}
-
-		if (rsx::method_registers.stencil_test_enabled())
-		{
-			if (!rsx::method_registers.two_sided_stencil_test_enabled())
-			{
-				properties.state.enable_stencil_test(
-					vk::get_stencil_op(rsx::method_registers.stencil_op_fail()),
-					vk::get_stencil_op(rsx::method_registers.stencil_op_zfail()),
-					vk::get_stencil_op(rsx::method_registers.stencil_op_zpass()),
-					vk::get_compare_func(rsx::method_registers.stencil_func()),
-					0xFF, 0xFF); //write mask, func_mask, ref are dynamic
-			}
-			else
-			{
-				properties.state.enable_stencil_test_separate(0,
-					vk::get_stencil_op(rsx::method_registers.stencil_op_fail()),
-					vk::get_stencil_op(rsx::method_registers.stencil_op_zfail()),
-					vk::get_stencil_op(rsx::method_registers.stencil_op_zpass()),
-					vk::get_compare_func(rsx::method_registers.stencil_func()),
-					0xFF, 0xFF); //write mask, func_mask, ref are dynamic
-
-				properties.state.enable_stencil_test_separate(1,
-					vk::get_stencil_op(rsx::method_registers.back_stencil_op_fail()),
-					vk::get_stencil_op(rsx::method_registers.back_stencil_op_zfail()),
-					vk::get_stencil_op(rsx::method_registers.back_stencil_op_zpass()),
-					vk::get_compare_func(rsx::method_registers.back_stencil_func()),
-					0xFF, 0xFF); //write mask, func_mask, ref are dynamic
-			}
-
-			if (ds && ds->samples() > 1 && !(ds->stencil_init_flags & 0xFF00))
-			{
-				if (properties.state.ds.front.failOp != VK_STENCIL_OP_KEEP ||
-					properties.state.ds.front.depthFailOp != VK_STENCIL_OP_KEEP ||
-					properties.state.ds.front.passOp != VK_STENCIL_OP_KEEP ||
-					properties.state.ds.back.failOp != VK_STENCIL_OP_KEEP ||
-					properties.state.ds.back.depthFailOp != VK_STENCIL_OP_KEEP ||
-					properties.state.ds.back.passOp != VK_STENCIL_OP_KEEP)
-				{
-					// Toggle bit 9 to signal require full bit-wise transfer
-					ds->stencil_init_flags |= (1 << 8);
-				}
-			}
-		}
-
-		if (backend_config.supports_hw_a2c || num_rasterization_samples > 1)
-		{
-			const bool alpha_to_one_enable = rsx::method_registers.msaa_alpha_to_one_enabled() && backend_config.supports_hw_a2one;
-
-			properties.state.set_multisample_state(
-				num_rasterization_samples,
-				rsx::method_registers.msaa_sample_mask(),
-				rsx::method_registers.msaa_enabled(),
-				rsx::method_registers.msaa_alpha_to_coverage_enabled(),
-				alpha_to_one_enable);
-
-			// A problem observed on multiple GPUs is that interior geometry edges can resolve 0 samples unless we force shading rate of 1.
-			// For whatever reason, the way MSAA images are 'resolved' on PS3 bypasses this issue.
-			// NOTE: We do not do image resolve at all, the output is merely 'exploded' and the guest application is responsible for doing the resolve in software as it is on real hardware.
-			properties.state.set_multisample_shading_rate(1.f);
-		}
-
-		return properties;
+		VkPipelineLayout result;
+		CHECK_RESULT(vkCreatePipelineLayout(dev, &layout_info, nullptr, &result));
+		return std::make_tuple(result, set_layout);
 	}
 }
 
@@ -408,24 +327,23 @@ u64 VKGSRender::get_cycles()
 	return thread_ctrl::get_cycles(static_cast<named_thread<VKGSRender>&>(*this));
 }
 
-VKGSRender::VKGSRender(utils::serial* ar) noexcept : GSRender(ar)
+VKGSRender::VKGSRender() : GSRender()
 {
-	// Initialize dependencies
-	g_fxo->need<rsx::dma_manager>();
-
-	if (!m_instance.create("RPCS3"))
+	if (m_instance.create("RPCS3"))
 	{
-		rsx_log.fatal("Could not find a Vulkan compatible GPU driver. Your GPU(s) may not support Vulkan, or you need to install the Vulkan runtime and drivers");
+		m_instance.bind();
+	}
+	else
+	{
+		rsx_log.fatal("Could not find a vulkan compatible GPU driver. Your GPU(s) may not support Vulkan, or you need to install the vulkan runtime and drivers");
 		m_device = VK_NULL_HANDLE;
 		return;
 	}
 
-	m_instance.bind();
-
 	std::vector<vk::physical_device>& gpus = m_instance.enumerate_devices();
 
-	// Actually confirm  that the loader found at least one compatible device
-	// This should not happen unless something is wrong with the driver setup on the target system
+	//Actually confirm  that the loader found at least one compatible device
+	//This should not happen unless something is wrong with the driver setup on the target system
 	if (gpus.empty())
 	{
 		//We can't throw in Emulator::Load, so we show error and return
@@ -473,7 +391,6 @@ VKGSRender::VKGSRender(utils::serial* ar) noexcept : GSRender(ar)
 
 	m_device = const_cast<vk::render_device*>(&m_swapchain->get_device());
 	vk::set_current_renderer(m_swapchain->get_device());
-	vk::init();
 
 	m_swapchain_dims.width = m_frame->client_width();
 	m_swapchain_dims.height = m_frame->client_height();
@@ -483,58 +400,58 @@ VKGSRender::VKGSRender(utils::serial* ar) noexcept : GSRender(ar)
 		swapchain_unavailable = true;
 	}
 
-	// create command buffer...
+	//create command buffer...
 	m_command_buffer_pool.create((*m_device), m_device->get_graphics_queue_family());
-	m_primary_cb_list.create(m_command_buffer_pool, vk::command_buffer::access_type_hint::flush_only);
-	m_current_command_buffer = m_primary_cb_list.get();
-	m_current_command_buffer->begin();
 
-	// Create secondary command_buffer for parallel operations
+	for (auto &cb : m_primary_cb_list)
+	{
+		cb.create(m_command_buffer_pool);
+		cb.init_fence(*m_device);
+	}
+
+	m_current_command_buffer = &m_primary_cb_list[0];
+
+	//Create secondary command_buffer for parallel operations
 	m_secondary_command_buffer_pool.create((*m_device), m_device->get_graphics_queue_family());
-	m_secondary_cb_list.create(m_secondary_command_buffer_pool, vk::command_buffer::access_type_hint::all);
+	m_secondary_command_buffer.create(m_secondary_command_buffer_pool, true);
+	m_secondary_command_buffer.access_hint = vk::command_buffer::access_type_hint::all;
+
+	//Precalculated stuff
+	std::tie(pipeline_layout, descriptor_layouts) = get_shared_pipeline_layout(*m_device);
 
 	//Occlusion
 	m_occlusion_query_manager = std::make_unique<vk::query_pool_manager>(*m_device, VK_QUERY_TYPE_OCCLUSION, OCCLUSION_MAX_POOL_SIZE);
-	m_occlusion_map.resize(rsx::reports::occlusion_query_count);
+	m_occlusion_map.resize(occlusion_query_count);
 
-	for (u32 n = 0; n < rsx::reports::occlusion_query_count; ++n)
+	for (u32 n = 0; n < occlusion_query_count; ++n)
 		m_occlusion_query_data[n].driver_handle = n;
 
-	if (g_cfg.video.precise_zpass_count)
-	{
-		m_occlusion_query_manager->set_control_flags(VK_QUERY_CONTROL_PRECISE_BIT, 0);
-	}
+	//Generate frame contexts
+	const auto& binding_table = m_device->get_pipeline_binding_table();
+	const u32 num_fs_samplers = binding_table.vertex_textures_first_bind_slot - binding_table.textures_first_bind_slot;
+
+	std::vector<VkDescriptorPoolSize> sizes;
+	sizes.push_back({ VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER , 6 * DESCRIPTOR_MAX_DRAW_CALLS });
+	sizes.push_back({ VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER , 3 * DESCRIPTOR_MAX_DRAW_CALLS });
+	sizes.push_back({ VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER , (num_fs_samplers + 4) * DESCRIPTOR_MAX_DRAW_CALLS });
+
+	// Conditional rendering predicate slot; refactor to allow skipping this when not needed
+	sizes.push_back({ VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1 * DESCRIPTOR_MAX_DRAW_CALLS });
 
 	VkSemaphoreCreateInfo semaphore_info = {};
 	semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
 
-	// VRAM allocation
+	//VRAM allocation
 	m_attrib_ring_info.create(VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT, VK_ATTRIB_RING_BUFFER_SIZE_M * 0x100000, "attrib buffer", 0x400000, VK_TRUE);
 	m_fragment_env_ring_info.create(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_UBO_RING_BUFFER_SIZE_M * 0x100000, "fragment env buffer");
 	m_vertex_env_ring_info.create(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_UBO_RING_BUFFER_SIZE_M * 0x100000, "vertex env buffer");
 	m_fragment_texture_params_ring_info.create(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_UBO_RING_BUFFER_SIZE_M * 0x100000, "fragment texture params buffer");
 	m_vertex_layout_ring_info.create(VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT, VK_UBO_RING_BUFFER_SIZE_M * 0x100000, "vertex layout buffer", 0x10000, VK_TRUE);
 	m_fragment_constants_ring_info.create(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_UBO_RING_BUFFER_SIZE_M * 0x100000, "fragment constants buffer");
-	m_transform_constants_ring_info.create(VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, VK_TRANSFORM_CONSTANTS_BUFFER_SIZE_M * 0x100000, "transform constants buffer");
+	m_transform_constants_ring_info.create(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_TRANSFORM_CONSTANTS_BUFFER_SIZE_M * 0x100000, "transform constants buffer");
 	m_index_buffer_ring_info.create(VK_BUFFER_USAGE_INDEX_BUFFER_BIT, VK_INDEX_RING_BUFFER_SIZE_M * 0x100000, "index buffer");
 	m_texture_upload_buffer_ring_info.create(VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_TEXTURE_UPLOAD_RING_BUFFER_SIZE_M * 0x100000, "texture upload buffer", 32 * 0x100000);
 	m_raster_env_ring_info.create(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_UBO_RING_BUFFER_SIZE_M * 0x100000, "raster env buffer");
-	m_instancing_buffer_ring_info.create(VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, VK_TRANSFORM_CONSTANTS_BUFFER_SIZE_M * 0x100000, "instancing data buffer");
-
-	vk::data_heap_manager::register_ring_buffers
-	({
-		std::ref(m_attrib_ring_info),
-		std::ref(m_fragment_env_ring_info),
-		std::ref(m_vertex_env_ring_info),
-		std::ref(m_fragment_texture_params_ring_info),
-		std::ref(m_vertex_layout_ring_info),
-		std::ref(m_fragment_constants_ring_info),
-		std::ref(m_transform_constants_ring_info),
-		std::ref(m_index_buffer_ring_info),
-		std::ref(m_texture_upload_buffer_ring_info),
-		std::ref(m_raster_env_ring_info),
-		std::ref(m_instancing_buffer_ring_info)
-	});
 
 	const auto shadermode = g_cfg.video.shadermode.get();
 
@@ -542,22 +459,12 @@ VKGSRender::VKGSRender(utils::serial* ar) noexcept : GSRender(ar)
 	{
 		m_vertex_instructions_buffer.create(VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, 64 * 0x100000, "vertex instructions buffer", 512 * 16);
 		m_fragment_instructions_buffer.create(VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, 64 * 0x100000, "fragment instructions buffer", 2048);
-
-		vk::data_heap_manager::register_ring_buffers
-		({
-			std::ref(m_vertex_instructions_buffer),
-			std::ref(m_fragment_instructions_buffer)
-		});
 	}
 
 	// Initialize optional allocation information with placeholders
-	m_vertex_env_buffer_info = { m_vertex_env_ring_info.heap->value, 0, 16 };
-	m_vertex_constants_buffer_info = { m_transform_constants_ring_info.heap->value, 0, 16 };
-	m_fragment_env_buffer_info = { m_fragment_env_ring_info.heap->value, 0, 16 };
-	m_fragment_texture_params_buffer_info = { m_fragment_texture_params_ring_info.heap->value, 0, 16 };
 	m_raster_env_buffer_info = { m_raster_env_ring_info.heap->value, 0, 128 };
 
-	const auto& limits = m_device->gpu().get_limits();
+	const auto limits = m_device->gpu().get_limits();
 	m_texbuffer_view_size = std::min(limits.maxTexelBufferElements, VK_ATTRIB_RING_BUFFER_SIZE_M * 0x100000u);
 
 	if (m_texbuffer_view_size < 0x800000)
@@ -570,13 +477,14 @@ VKGSRender::VKGSRender(utils::serial* ar) noexcept : GSRender(ar)
 	{
 		vkCreateSemaphore((*m_device), &semaphore_info, nullptr, &ctx.present_wait_semaphore);
 		vkCreateSemaphore((*m_device), &semaphore_info, nullptr, &ctx.acquire_signal_semaphore);
+		ctx.descriptor_pool.create(*m_device, sizes.data(), static_cast<u32>(sizes.size()), DESCRIPTOR_MAX_DRAW_CALLS, 1);
 	}
 
 	const auto& memory_map = m_device->get_memory_mapping();
 	null_buffer = std::make_unique<vk::buffer>(*m_device, 32, memory_map.device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT, 0, VMM_ALLOCATION_POOL_UNDEFINED);
 	null_buffer_view = std::make_unique<vk::buffer_view>(*m_device, null_buffer->value, VK_FORMAT_R8_UINT, 0, 32);
 
-	spirv::initialize_compiler_context();
+	vk::initialize_compiler_context();
 	vk::initialize_pipe_compiler(g_cfg.video.shader_compiler_threads_count);
 
 	m_prog_buffer = std::make_unique<vk::program_cache>
@@ -588,12 +496,14 @@ VKGSRender::VKGSRender(utils::serial* ar) noexcept : GSRender(ar)
 		}
 	);
 
-	if (g_cfg.video.disable_vertex_cache)
+	if (g_cfg.video.disable_vertex_cache || g_cfg.video.multithreaded_rsx)
 		m_vertex_cache = std::make_unique<vk::null_vertex_cache>();
 	else
 		m_vertex_cache = std::make_unique<vk::weak_vertex_cache>();
 
-	m_shaders_cache = std::make_unique<vk::shader_cache>(*m_prog_buffer, "vulkan", "v1.95");
+	m_shaders_cache = std::make_unique<vk::shader_cache>(*m_prog_buffer, "vulkan", "v1.92");
+
+	open_command_buffer();
 
 	for (u32 i = 0; i < m_swapchain->get_swap_image_count(); ++i)
 	{
@@ -622,41 +532,26 @@ VKGSRender::VKGSRender(utils::serial* ar) noexcept : GSRender(ar)
 
 	backend_config.supports_multidraw = true;
 
-	// NVIDIA has broken attribute interpolation
-	backend_config.supports_normalized_barycentrics = (
-		!vk::is_NVIDIA(vk::get_driver_vendor()) ||
-		!m_device->get_barycoords_support() ||
-		g_cfg.video.shader_precision == gpu_preset_level::low);
-
 	// NOTE: We do not actually need multiple sample support for A2C to work
 	// This is here for visual consistency - will be removed when AA problems due to mipmaps are fixed
 	if (g_cfg.video.antialiasing_level != msaa_level::none)
 	{
-		backend_config.supports_hw_msaa = true;
-		backend_config.supports_hw_a2c = true;
-		backend_config.supports_hw_a2c_1spp = true;
+		backend_config.supports_hw_a2c = VK_TRUE;
 		backend_config.supports_hw_a2one = m_device->get_alpha_to_one_support();
 	}
 
 	// NOTE: On NVIDIA cards going back decades (including the PS3) there is a slight normalization inaccuracy in compressed formats.
 	// Confirmed in BLES01916 (The Evil Within) which uses RGB565 for some virtual texturing data.
-	backend_config.supports_hw_renormalization = vk::is_NVIDIA(vk::get_driver_vendor());
+	backend_config.supports_hw_renormalization = (vk::get_driver_vendor() == vk::driver_vendor::NVIDIA);
 
-	// Conditional rendering support
-	// Do not use on MVK due to a speedhack we rely on (streaming results without stopping the current renderpass)
-	// If we break the renderpasses, MVK loses around 75% of its performance in troublesome spots compared to just doing a CPU sync
-	backend_config.supports_hw_conditional_render = (vk::get_driver_vendor() != vk::driver_vendor::MVK);
-
-	// Passthrough DMA
-	backend_config.supports_passthrough_dma = m_device->get_external_memory_host_support();
-
-	// Host sync
-	backend_config.supports_host_gpu_labels = !!g_cfg.video.host_label_synchronization;
+	// Relaxed query synchronization
+	backend_config.supports_hw_conditional_render = !!g_cfg.video.relaxed_zcull_sync;
 
 	// Async compute and related operations
 	if (g_cfg.video.vk.asynchronous_texture_streaming)
 	{
-		// Optimistic, enable async compute
+		// Optimistic, enable async compute and passthrough DMA
+		backend_config.supports_passthrough_dma = m_device->get_external_memory_host_support();
 		backend_config.supports_asynchronous_compute = true;
 
 		if (m_device->get_graphics_queue() == m_device->get_transfer_queue())
@@ -664,107 +559,47 @@ VKGSRender::VKGSRender(utils::serial* ar) noexcept : GSRender(ar)
 			rsx_log.error("Cannot run graphics and async transfer in the same queue. Async uploads are disabled. This is a limitation of your GPU");
 			backend_config.supports_asynchronous_compute = false;
 		}
-	}
 
-	// Sanity checks
-	switch (vk::get_driver_vendor())
-	{
-	case vk::driver_vendor::NVIDIA:
+		switch (vk::get_driver_vendor())
+		{
+		case vk::driver_vendor::NVIDIA:
+			if (auto chip_family = vk::get_chip_family();
+				chip_family == vk::chip_class::NV_kepler ||
+				chip_family == vk::chip_class::NV_maxwell)
+			{
+				rsx_log.error("Older NVIDIA cards do not meet requirements for asynchronous compute due to some driver fakery.");
+				backend_config.supports_asynchronous_compute = false;
+			}
+			else // Workaround. Remove once the async decoder is re-written
+			{
+				// NVIDIA 471 and newer are completely borked. Queue priority is not observed and any queue waiting on another just causes deadlock.
+				rsx_log.error("NVIDIA GPUs are incompatible with the current implementation of asynchronous texture decoding.");
+				backend_config.supports_asynchronous_compute = false;
+			}
+			break;
+#if !defined(_WIN32)
+			// Anything running on AMDGPU kernel driver will not work due to the check for fd-backed memory allocations
+		case vk::driver_vendor::RADV:
+		case vk::driver_vendor::AMD:
+#if !defined(__linux__)
+			// Intel chipsets would fail on BSD in most cases and DRM_IOCTL_i915_GEM_USERPTR unimplemented
+		case vk::driver_vendor::ANV:
+#endif
+			if (backend_config.supports_passthrough_dma)
+			{
+				rsx_log.error("AMDGPU kernel driver on linux and INTEL driver on some platforms cannot support passthrough DMA buffers.");
+				backend_config.supports_passthrough_dma = false;
+			}
+			break;
+#endif
+		default: break;
+		}
+
 		if (backend_config.supports_asynchronous_compute)
 		{
-			if (auto chip_family = vk::get_chip_family();
-				chip_family == vk::chip_class::NV_kepler || chip_family == vk::chip_class::NV_maxwell)
-			{
-				rsx_log.warning("Older NVIDIA cards do not meet requirements for true asynchronous compute due to some driver fakery.");
-			}
-
-			rsx_log.notice("Forcing safe async compute for NVIDIA device to avoid crashing.");
-			g_cfg.video.vk.asynchronous_scheduler.set(vk_gpu_scheduler_mode::safe);
+			// Run only if async compute can be used.
+			g_fxo->init<vk::async_scheduler_thread>("Vulkan Async Scheduler"sv);
 		}
-		break;
-	case vk::driver_vendor::NVK:
-		// TODO: Verify if this driver crashes or not
-		rsx_log.warning("NVK behavior with passthrough DMA is unknown. Proceed with caution.");
-		break;
-#if !defined(_WIN32)
-		// Anything running on AMDGPU kernel driver will not work due to the check for fd-backed memory allocations
-	case vk::driver_vendor::RADV:
-	case vk::driver_vendor::AMD:
-#if !defined(__linux__)
-		// Intel chipsets would fail on BSD in most cases and DRM_IOCTL_i915_GEM_USERPTR unimplemented
-	case vk::driver_vendor::ANV:
-#endif
-		if (backend_config.supports_passthrough_dma)
-		{
-			rsx_log.error("AMDGPU kernel driver on Linux and INTEL driver on some platforms cannot support passthrough DMA buffers.");
-			backend_config.supports_passthrough_dma = false;
-		}
-		break;
-#endif
-	case vk::driver_vendor::MVK:
-		// Async compute crashes immediately on Apple GPUs
-		rsx_log.error("Apple GPUs are incompatible with the current implementation of asynchronous texture decoding.");
-		backend_config.supports_asynchronous_compute = false;
-		break;
-	case vk::driver_vendor::INTEL:
-		// As expected host allocations won't work on INTEL despite the extension being present
-		if (backend_config.supports_passthrough_dma)
-		{
-			rsx_log.error("INTEL driver does not support passthrough DMA buffers");
-			backend_config.supports_passthrough_dma = false;
-		}
-		break;
-	default: break;
-	}
-
-	if (backend_config.supports_asynchronous_compute)
-	{
-		m_async_compute_memory_barrier =
-		{
-			.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR,
-			.pNext = nullptr,
-			.srcStageMask = VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR | VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT_KHR,
-			.srcAccessMask = VK_ACCESS_2_MEMORY_WRITE_BIT_KHR,
-			.dstStageMask = VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT_KHR | VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT_KHR,
-			.dstAccessMask = VK_ACCESS_2_SHADER_SAMPLED_READ_BIT_KHR
-		};
-
-		m_async_compute_dependency_info =
-		{
-			.sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR,
-			.memoryBarrierCount = 1,
-			.pMemoryBarriers = &m_async_compute_memory_barrier
-		};
-
-		// Run only if async compute can be used.
-		g_fxo->init<vk::AsyncTaskScheduler>(g_cfg.video.vk.asynchronous_scheduler, m_async_compute_dependency_info);
-	}
-
-	if (backend_config.supports_host_gpu_labels)
-	{
-		if (backend_config.supports_passthrough_dma)
-		{
-			m_host_object_data = std::make_unique<vk::buffer>(*m_device,
-				0x10000,
-				memory_map.host_visible_coherent, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
-				VK_BUFFER_USAGE_TRANSFER_DST_BIT, 0,
-				VMM_ALLOCATION_POOL_SYSTEM);
-
-			m_host_dma_ctrl = std::make_unique<rsx::RSXDMAWriter>(m_host_object_data->map(0, 0x10000));
-		}
-		else
-		{
-			rsx_log.error("Your GPU/driver does not support extensions required to enable passthrough DMA emulation. Host GPU labels will be disabled.");
-			backend_config.supports_host_gpu_labels = false;
-		}
-	}
-
-	if (!backend_config.supports_host_gpu_labels &&
-		!backend_config.supports_asynchronous_compute)
-	{
-		// Disable passthrough DMA unless we enable a feature that requires it.
-		// I'm avoiding an explicit checkbox for this until I figure out why host labels don't fix all problems with passthrough.
-		backend_config.supports_passthrough_dma = false;
 	}
 }
 
@@ -776,38 +611,25 @@ VKGSRender::~VKGSRender()
 		return;
 	}
 
-	// Flush DMA queue
-	while (!g_fxo->get<rsx::dma_manager>().sync())
+	// Globals. TODO: Refactor lifetime management
+	if (backend_config.supports_asynchronous_compute)
 	{
-		do_local_task(rsx::FIFO::state::lock_wait);
+		g_fxo->get<vk::async_scheduler_thread>().kill();
 	}
 
 	//Wait for device to finish up with resources
 	vkDeviceWaitIdle(*m_device);
 
-	// Globals. TODO: Refactor lifetime management
-	if (auto async_scheduler = g_fxo->try_get<vk::AsyncTaskScheduler>())
-	{
-		async_scheduler->destroy();
-	}
-
-	// GC cleanup
-	vk::get_resource_manager()->flush();
-
-	// Host data
-	if (m_host_object_data)
-	{
-		m_host_object_data->unmap();
-		m_host_object_data.reset();
-	}
-
 	// Clear flush requests
 	m_flush_requests.clear_pending_flag();
 
+	// Texture cache
+	m_texture_cache.destroy();
+
 	// Shaders
-	vk::destroy_pipe_compiler();        // Ensure no pending shaders being compiled
-	spirv::finalize_compiler_context(); // Shut down the glslang compiler
-	m_prog_buffer->clear();             // Delete shader objects
+	vk::destroy_pipe_compiler();      // Ensure no pending shaders being compiled
+	vk::finalize_compiler_context();  // Shut down the glslang compiler
+	m_prog_buffer->clear();           // Delete shader objects
 	m_shader_interpreter.destroy();
 
 	m_persistent_attribute_storage.reset();
@@ -817,8 +639,22 @@ VKGSRender::~VKGSRender()
 	// Upscaler (references some global resources)
 	m_upscaler.reset();
 
+	// Global resources
+	vk::destroy_global_resources();
+
 	// Heaps
-	vk::data_heap_manager::reset();
+	m_attrib_ring_info.destroy();
+	m_fragment_env_ring_info.destroy();
+	m_vertex_env_ring_info.destroy();
+	m_fragment_texture_params_ring_info.destroy();
+	m_vertex_layout_ring_info.destroy();
+	m_fragment_constants_ring_info.destroy();
+	m_transform_constants_ring_info.destroy();
+	m_index_buffer_ring_info.destroy();
+	m_texture_upload_buffer_ring_info.destroy();
+	m_vertex_instructions_buffer.destroy();
+	m_fragment_instructions_buffer.destroy();
+	m_raster_env_ring_info.destroy();
 
 	// Fallback bindables
 	null_buffer.reset();
@@ -828,14 +664,20 @@ VKGSRender::~VKGSRender()
 	{
 		// Return resources back to the owner
 		m_current_frame = &frame_context_storage[m_current_queue_index];
+		m_current_frame->swap_storage(m_aux_frame_context);
 		m_current_frame->grab_resources(m_aux_frame_context);
 	}
 
+	m_aux_frame_context.buffer_views_to_clean.clear();
+
 	// NOTE: aux_context uses descriptor pools borrowed from the main queues and any allocations will be automatically freed when pool is destroyed
 	for (auto &ctx : frame_context_storage)
 	{
 		vkDestroySemaphore((*m_device), ctx.present_wait_semaphore, nullptr);
 		vkDestroySemaphore((*m_device), ctx.acquire_signal_semaphore, nullptr);
+		ctx.descriptor_pool.destroy();
+
+		ctx.buffer_views_to_clean.clear();
 	}
 
 	// Textures
@@ -844,23 +686,26 @@ VKGSRender::~VKGSRender()
 
 	m_stencil_mirror_sampler.reset();
 
+	// Overlay text handler
+	m_text_writer.reset();
+
+	//Pipeline descriptors
+	vkDestroyPipelineLayout(*m_device, pipeline_layout, nullptr);
+	vkDestroyDescriptorSetLayout(*m_device, descriptor_layouts, nullptr);
+
 	// Queries
 	m_occlusion_query_manager.reset();
 	m_cond_render_buffer.reset();
 
 	// Command buffer
-	m_primary_cb_list.destroy();
-	m_secondary_cb_list.destroy();
+	for (auto &cb : m_primary_cb_list)
+		cb.destroy();
 
 	m_command_buffer_pool.destroy();
+
+	m_secondary_command_buffer.destroy();
 	m_secondary_command_buffer_pool.destroy();
 
-	// Descriptors
-	vk::descriptors::flush();
-
-	// Global resources
-	vk::destroy_global_resources();
-
 	// Device handles/contexts
 	m_swapchain->destroy();
 	m_instance.destroy();
@@ -873,12 +718,12 @@ VKGSRender::~VKGSRender()
 
 bool VKGSRender::on_access_violation(u32 address, bool is_writing)
 {
-	rsx::mm_flush(address);
-
 	vk::texture_cache::thrashed_set result;
 	{
+		std::lock_guard lock(m_secondary_cb_guard);
+
 		const rsx::invalidation_cause cause = is_writing ? rsx::invalidation_cause::deferred_write : rsx::invalidation_cause::deferred_read;
-		result = m_texture_cache.invalidate_address(*m_secondary_cb_list.get(), address, cause);
+		result = m_texture_cache.invalidate_address(m_secondary_command_buffer, address, cause);
 	}
 
 	if (result.invalidate_samplers)
@@ -889,7 +734,7 @@ bool VKGSRender::on_access_violation(u32 address, bool is_writing)
 
 	if (!result.violation_handled)
 	{
-		return zcull_ctrl->on_access_violation(address);
+		return false;
 	}
 
 	if (result.num_flushable > 0)
@@ -904,7 +749,6 @@ bool VKGSRender::on_access_violation(u32 address, bool is_writing)
 
 			g_fxo->get<rsx::dma_manager>().set_mem_fault_flag();
 			m_queue_status |= flush_queue_state::deadlock;
-			m_eng_interrupt_mask |= rsx::backend_interrupt;
 
 			// Wait for deadlock to clear
 			while (m_queue_status & flush_queue_state::deadlock)
@@ -917,17 +761,14 @@ bool VKGSRender::on_access_violation(u32 address, bool is_writing)
 		}
 
 		bool has_queue_ref = false;
-		std::function<void()> data_transfer_completed_callback{};
-
-		if (!is_current_thread()) [[likely]]
+		if (!is_current_thread())
 		{
-			// Always submit primary cb to ensure state consistency (flush pending changes such as image transitions)
+			//Always submit primary cb to ensure state consistency (flush pending changes such as image transitions)
 			vm::temporary_unlock();
 
 			std::lock_guard lock(m_flush_queue_mutex);
 
 			m_flush_requests.post(false);
-			m_eng_interrupt_mask |= rsx::backend_interrupt;
 			has_queue_ref = true;
 		}
 		else
@@ -937,27 +778,21 @@ bool VKGSRender::on_access_violation(u32 address, bool is_writing)
 				rsx_log.error("Fault in uninterruptible code!");
 			}
 
-			// Flush primary cb queue to sync pending changes (e.g image transitions!)
+			//Flush primary cb queue to sync pending changes (e.g image transitions!)
 			flush_command_queue();
 		}
 
 		if (has_queue_ref)
 		{
-			// Wait for the RSX thread to process request if it hasn't already
+			//Wait for the RSX thread to process request if it hasn't already
 			m_flush_requests.producer_wait();
-
-			data_transfer_completed_callback = [&]()
-			{
-				m_flush_requests.remove_one();
-				has_queue_ref = false;
-			};
 		}
 
-		m_texture_cache.flush_all(*m_secondary_cb_list.next(), result, data_transfer_completed_callback);
+		m_texture_cache.flush_all(m_secondary_command_buffer, result);
 
 		if (has_queue_ref)
 		{
-			// Release RSX thread if it's still locked
+			//Release RSX thread
 			m_flush_requests.remove_one();
 		}
 	}
@@ -965,11 +800,11 @@ bool VKGSRender::on_access_violation(u32 address, bool is_writing)
 	return true;
 }
 
-void VKGSRender::on_invalidate_memory_range(const utils::address_range32 &range, rsx::invalidation_cause cause)
+void VKGSRender::on_invalidate_memory_range(const utils::address_range &range, rsx::invalidation_cause cause)
 {
 	std::lock_guard lock(m_secondary_cb_guard);
 
-	auto data = m_texture_cache.invalidate_range(*m_secondary_cb_list.next(), range, cause);
+	auto data = m_texture_cache.invalidate_range(m_secondary_command_buffer, range, cause);
 	AUDIT(data.empty());
 
 	if (cause == rsx::invalidation_cause::unmap)
@@ -993,7 +828,7 @@ void VKGSRender::on_semaphore_acquire_wait()
 		(async_flip_requested & flip_request::emu_requested) ||
 		(m_queue_status & flush_queue_state::deadlock))
 	{
-		do_local_task(rsx::FIFO::state::lock_wait);
+		do_local_task(rsx::FIFO_state::lock_wait);
 	}
 }
 
@@ -1002,35 +837,28 @@ bool VKGSRender::on_vram_exhausted(rsx::problem_severity severity)
 	ensure(!vk::is_uninterruptible() && rsx::get_current_renderer()->is_current_thread());
 
 	bool texture_cache_relieved = false;
-	if (severity >= rsx::problem_severity::fatal)
+	if (severity >= rsx::problem_severity::fatal && m_texture_cache.is_overallocated())
 	{
-		// Hard sync before trying to evict anything. This guarantees no UAF crashes in the driver.
-		// As a bonus, we also get a free gc pass
-		flush_command_queue(true, true);
-
-		if (m_texture_cache.is_overallocated())
+		// Evict some unused textures. Do not evict any active references
+		std::set<u32> exclusion_list;
+		auto scan_array = [&](const auto& texture_array)
 		{
-			// Evict some unused textures. Do not evict any active references
-			std::set<u32> exclusion_list;
-			auto scan_array = [&](const auto& texture_array)
+			for (auto i = 0ull; i < texture_array.size(); ++i)
 			{
-				for (auto i = 0ull; i < texture_array.size(); ++i)
-				{
-					const auto& tex = texture_array[i];
-					const auto addr = rsx::get_address(tex.offset(), tex.location());
-					exclusion_list.insert(addr);
-				}
-			};
+				const auto& tex = texture_array[i];
+				const auto addr = rsx::get_address(tex.offset(), tex.location());
+				exclusion_list.insert(addr);
+			}
+		};
 
-			scan_array(rsx::method_registers.fragment_textures);
-			scan_array(rsx::method_registers.vertex_textures);
+		scan_array(rsx::method_registers.fragment_textures);
+		scan_array(rsx::method_registers.vertex_textures);
 
-			// Hold the secondary lock guard to prevent threads from trying to touch access violation handler stuff
-			std::lock_guard lock(m_secondary_cb_guard);
+		// Hold the secondary lock guard to prevent threads from trying to touch access violation handler stuff
+		std::lock_guard lock(m_secondary_cb_guard);
 
-			rsx_log.warning("Texture cache is overallocated. Will evict unnecessary textures.");
-			texture_cache_relieved = m_texture_cache.evict_unused(exclusion_list);
-		}
+		rsx_log.warning("Texture cache is overallocated. Will evict unnecessary textures.");
+		texture_cache_relieved = m_texture_cache.evict_unused(exclusion_list);
 	}
 
 	texture_cache_relieved |= m_texture_cache.handle_memory_pressure(severity);
@@ -1041,79 +869,58 @@ bool VKGSRender::on_vram_exhausted(rsx::problem_severity severity)
 	}
 
 	bool surface_cache_relieved = false;
-	const auto mem_info = m_device->get_memory_mapping();
-
-	// Check if we need to spill
-	if (severity >= rsx::problem_severity::fatal &&                // Only spill for fatal errors
-		mem_info.device_local != mem_info.host_visible_coherent && // Do not spill if it is an IGP, there is nowhere to spill to
-		m_rtts.is_overallocated())                                 // Surface cache must be over-allocated by the design quota
+	if (severity >= rsx::problem_severity::moderate)
 	{
-		// Queue a VRAM spill operation.
-		m_rtts.spill_unused_memory();
-	}
-
-	// Moderate severity and higher also starts removing stale render target objects
-	if (m_rtts.handle_memory_pressure(*m_current_command_buffer, severity))
-	{
-		surface_cache_relieved = true;
-		m_rtts.trim(*m_current_command_buffer, severity);
-	}
-
-	const bool any_cache_relieved = (texture_cache_relieved || surface_cache_relieved);
-	if (severity < rsx::problem_severity::fatal)
-	{
-		return any_cache_relieved;
-	}
-
-	if (surface_cache_relieved && !m_samplers_dirty)
-	{
-		// If surface cache was modified destructively, then we must reload samplers touching the surface cache.
-		bool invalidate_samplers = false;
-		auto scan_array = [&](const auto& texture_array, const auto& sampler_states)
+		// Check if we need to spill
+		const auto mem_info = m_device->get_memory_mapping();
+		if (severity >= rsx::problem_severity::fatal &&                // Only spill for fatal errors
+			mem_info.device_local != mem_info.host_visible_coherent && // Do not spill if it is an IGP, there is nowhere to spill to
+			m_rtts.is_overallocated())                                 // Surface cache must be over-allocated by the design quota
 		{
+			// Queue a VRAM spill operation.
+			m_rtts.spill_unused_memory();
+		}
+
+		// Moderate severity and higher also starts removing stale render target objects
+		if (m_rtts.handle_memory_pressure(*m_current_command_buffer, severity))
+		{
+			surface_cache_relieved = true;
+			m_rtts.free_invalidated(*m_current_command_buffer, severity);
+		}
+
+		if (severity >= rsx::problem_severity::fatal && surface_cache_relieved && !m_samplers_dirty)
+		{
+			// If surface cache was modified destructively, then we must reload samplers touching the surface cache.
+			bool invalidate_samplers = false;
+			auto scan_array = [&](const auto& texture_array, const auto& sampler_states)
+			{
+				for (auto i = 0ull; i < texture_array.size() && !invalidate_samplers; ++i)
+				{
+					if (texture_array[i].enabled() && sampler_states[i])
+					{
+						invalidate_samplers = (sampler_states[i]->upload_context == rsx::texture_upload_context::framebuffer_storage);
+					}
+				}
+			};
+
+			scan_array(rsx::method_registers.fragment_textures, fs_sampler_state);
+			scan_array(rsx::method_registers.vertex_textures, vs_sampler_state);
+
 			if (invalidate_samplers)
 			{
-				return;
+				m_samplers_dirty.store(true);
 			}
-
-			for (auto i = 0ull; i < texture_array.size(); ++i)
-			{
-				if (texture_array[i].enabled() &&
-					sampler_states[i] &&
-					sampler_states[i]->upload_context == rsx::texture_upload_context::framebuffer_storage)
-				{
-					invalidate_samplers = true;
-					break;
-				}
-			}
-		};
-
-		scan_array(rsx::method_registers.fragment_textures, fs_sampler_state);
-		scan_array(rsx::method_registers.vertex_textures, vs_sampler_state);
-
-		if (invalidate_samplers)
-		{
-			m_samplers_dirty.store(true);
 		}
 	}
 
-	// Imminent crash, full GPU sync is the least of our problems
-	flush_command_queue(true, true);
-
-	return any_cache_relieved;
-}
-
-void VKGSRender::on_descriptor_pool_fragmentation(bool is_fatal)
-{
-	if (!is_fatal)
+	const bool any_cache_relieved = (texture_cache_relieved || surface_cache_relieved);
+	if (any_cache_relieved && severity >= rsx::problem_severity::fatal)
 	{
-		// It is very likely that the release is simply in progress (enqueued)
-		m_primary_cb_list.wait_all();
-		return;
+		// Imminent crash, full GPU sync is the least of our problems
+		flush_command_queue(true, true);
 	}
 
-	// Just flush everything. Unless the hardware is very deficient, this should happen very rarely.
-	flush_command_queue(true, true);
+	return any_cache_relieved;
 }
 
 void VKGSRender::notify_tile_unbound(u32 tile)
@@ -1122,7 +929,7 @@ void VKGSRender::notify_tile_unbound(u32 tile)
 	if (false)
 	{
 		u32 addr = rsx::get_address(tiles[tile].offset, tiles[tile].location);
-		on_notify_pre_memory_unmapped(addr, tiles[tile].size, *std::make_unique<std::vector<std::pair<u64, u64>>>());
+		on_notify_memory_unmapped(addr, tiles[tile].size);
 		m_rtts.invalidate_surface_address(addr, false);
 	}
 
@@ -1132,17 +939,163 @@ void VKGSRender::notify_tile_unbound(u32 tile)
 	}
 }
 
+void VKGSRender::check_heap_status(u32 flags)
+{
+	ensure(flags);
+
+	bool heap_critical;
+	if (flags == VK_HEAP_CHECK_ALL)
+	{
+		heap_critical = m_attrib_ring_info.is_critical() ||
+			m_texture_upload_buffer_ring_info.is_critical() ||
+			m_fragment_env_ring_info.is_critical() ||
+			m_vertex_env_ring_info.is_critical() ||
+			m_fragment_texture_params_ring_info.is_critical() ||
+			m_vertex_layout_ring_info.is_critical() ||
+			m_fragment_constants_ring_info.is_critical() ||
+			m_transform_constants_ring_info.is_critical() ||
+			m_index_buffer_ring_info.is_critical() ||
+			m_raster_env_ring_info.is_critical();
+	}
+	else
+	{
+		heap_critical = false;
+		u32 test = 1u << std::countr_zero(flags);
+
+		do
+		{
+			switch (flags & test)
+			{
+			case 0:
+				break;
+			case VK_HEAP_CHECK_TEXTURE_UPLOAD_STORAGE:
+				heap_critical = m_texture_upload_buffer_ring_info.is_critical();
+				break;
+			case VK_HEAP_CHECK_VERTEX_STORAGE:
+				heap_critical = m_attrib_ring_info.is_critical() || m_index_buffer_ring_info.is_critical();
+				break;
+			case VK_HEAP_CHECK_VERTEX_ENV_STORAGE:
+				heap_critical = m_vertex_env_ring_info.is_critical();
+				break;
+			case VK_HEAP_CHECK_FRAGMENT_ENV_STORAGE:
+				heap_critical = m_fragment_env_ring_info.is_critical() || m_raster_env_ring_info.is_critical();
+				break;
+			case VK_HEAP_CHECK_TEXTURE_ENV_STORAGE:
+				heap_critical = m_fragment_texture_params_ring_info.is_critical();
+				break;
+			case VK_HEAP_CHECK_VERTEX_LAYOUT_STORAGE:
+				heap_critical = m_vertex_layout_ring_info.is_critical();
+				break;
+			case VK_HEAP_CHECK_TRANSFORM_CONSTANTS_STORAGE:
+				heap_critical = m_transform_constants_ring_info.is_critical();
+				break;
+			case VK_HEAP_CHECK_FRAGMENT_CONSTANTS_STORAGE:
+				heap_critical = m_fragment_constants_ring_info.is_critical();
+				break;
+			default:
+				fmt::throw_exception("Unexpected heap flag set! (0x%X)", test);
+			}
+
+			flags &= ~test;
+			test <<= 1;
+		}
+		while (flags && !heap_critical);
+	}
+
+	if (heap_critical)
+	{
+		m_profiler.start();
+
+		vk::frame_context_t *target_frame = nullptr;
+		if (!m_queued_frames.empty())
+		{
+			if (m_current_frame != &m_aux_frame_context)
+			{
+				target_frame = m_queued_frames.front();
+			}
+		}
+
+		if (target_frame == nullptr)
+		{
+			flush_command_queue(true);
+			m_vertex_cache->purge();
+
+			m_index_buffer_ring_info.reset_allocation_stats();
+			m_fragment_env_ring_info.reset_allocation_stats();
+			m_vertex_env_ring_info.reset_allocation_stats();
+			m_fragment_texture_params_ring_info.reset_allocation_stats();
+			m_vertex_layout_ring_info.reset_allocation_stats();
+			m_fragment_constants_ring_info.reset_allocation_stats();
+			m_transform_constants_ring_info.reset_allocation_stats();
+			m_attrib_ring_info.reset_allocation_stats();
+			m_texture_upload_buffer_ring_info.reset_allocation_stats();
+			m_raster_env_ring_info.reset_allocation_stats();
+			m_current_frame->reset_heap_ptrs();
+			m_last_heap_sync_time = get_system_time();
+		}
+		else
+		{
+			// Flush the frame context
+			frame_context_cleanup(target_frame, true);
+		}
+
+		m_frame_stats.flip_time += m_profiler.duration();
+	}
+}
+
 void VKGSRender::check_present_status()
 {
 	while (!m_queued_frames.empty())
 	{
 		auto ctx = m_queued_frames.front();
-		if (!ctx->swap_command_buffer->poke())
+		if (ctx->swap_command_buffer->pending)
 		{
-			return;
+			if (!ctx->swap_command_buffer->poke())
+			{
+				return;
+			}
 		}
 
-		frame_context_cleanup(ctx);
+		frame_context_cleanup(ctx, true);
+	}
+}
+
+void VKGSRender::check_descriptors()
+{
+	// Ease resource pressure if the number of draw calls becomes too high or we are running low on memory resources
+	const auto required_descriptors = rsx::method_registers.current_draw_clause.pass_count();
+	ensure(required_descriptors < DESCRIPTOR_MAX_DRAW_CALLS);
+	if ((required_descriptors + m_current_frame->used_descriptors) > DESCRIPTOR_MAX_DRAW_CALLS)
+	{
+		// Should hard sync before resetting descriptors for spec compliance
+		flush_command_queue(true);
+
+		m_current_frame->descriptor_pool.reset(0);
+		m_current_frame->used_descriptors = 0;
+	}
+}
+
+VkDescriptorSet VKGSRender::allocate_descriptor_set()
+{
+	if (!m_shader_interpreter.is_interpreter(m_program)) [[likely]]
+	{
+		ensure(m_current_frame->used_descriptors < DESCRIPTOR_MAX_DRAW_CALLS);
+
+		VkDescriptorSetAllocateInfo alloc_info = {};
+		alloc_info.descriptorPool = m_current_frame->descriptor_pool;
+		alloc_info.descriptorSetCount = 1;
+		alloc_info.pSetLayouts = &descriptor_layouts;
+		alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+
+		VkDescriptorSet new_descriptor_set;
+		CHECK_RESULT(vkAllocateDescriptorSets(*m_device, &alloc_info, &new_descriptor_set));
+		m_current_frame->used_descriptors++;
+
+		return new_descriptor_set;
+	}
+	else
+	{
+		return m_shader_interpreter.allocate_descriptor_set();
 	}
 }
 
@@ -1171,8 +1124,7 @@ void VKGSRender::set_viewport()
 		m_viewport.maxDepth = 1.f;
 	}
 
-	m_current_command_buffer->flags |= vk::command_buffer::cb_reload_dynamic_state;
-	m_graphics_state.clear(rsx::pipeline_state::zclip_config_state_dirty);
+	m_graphics_state &= ~(rsx::pipeline_state::zclip_config_state_dirty);
 }
 
 void VKGSRender::set_scissor(bool clip_viewport)
@@ -1184,8 +1136,6 @@ void VKGSRender::set_scissor(bool clip_viewport)
 		m_scissor.extent.width = scissor.width();
 		m_scissor.offset.x = scissor.x1;
 		m_scissor.offset.y = scissor.y1;
-
-		m_current_command_buffer->flags |= vk::command_buffer::cb_reload_dynamic_state;
 	}
 }
 
@@ -1199,7 +1149,7 @@ void VKGSRender::bind_viewport()
 			m_viewport.maxDepth = rsx::method_registers.clip_max();
 		}
 
-		m_graphics_state.clear(rsx::pipeline_state::zclip_config_state_dirty);
+		m_graphics_state &= ~(rsx::pipeline_state::zclip_config_state_dirty);
 	}
 
 	vkCmdSetViewport(*m_current_command_buffer, 0, 1, &m_viewport);
@@ -1210,7 +1160,7 @@ void VKGSRender::on_init_thread()
 {
 	if (m_device == VK_NULL_HANDLE)
 	{
-		fmt::throw_exception("No Vulkan device was created");
+		fmt::throw_exception("No vulkan device was created");
 	}
 
 	GSRender::on_init_thread();
@@ -1219,7 +1169,7 @@ void VKGSRender::on_init_thread()
 	if (!m_overlay_manager)
 	{
 		m_frame->hide();
-		m_shaders_cache->load(nullptr);
+		m_shaders_cache->load(nullptr, pipeline_layout);
 		m_frame->show();
 	}
 	else
@@ -1227,14 +1177,13 @@ void VKGSRender::on_init_thread()
 		rsx::shader_loading_dialog_native dlg(this);
 
 		// TODO: Handle window resize messages during loading on GPUs without OUT_OF_DATE_KHR support
-		m_shaders_cache->load(&dlg);
+		m_shaders_cache->load(&dlg, pipeline_layout);
 	}
 }
 
 void VKGSRender::on_exit()
 {
 	GSRender::on_exit();
-	vk::destroy_pipe_compiler(); // Ensure no pending shaders being compiled
 	zcull_ctrl.release();
 }
 
@@ -1243,20 +1192,17 @@ void VKGSRender::clear_surface(u32 mask)
 	if (skip_current_frame || swapchain_unavailable) return;
 
 	// If stencil write mask is disabled, remove clear_stencil bit
-	if (!rsx::method_registers.stencil_mask()) mask &= ~RSX_GCM_CLEAR_STENCIL_BIT;
+	if (!rsx::method_registers.stencil_mask()) mask &= ~0x2u;
 
 	// Ignore invalid clear flags
-	if (!(mask & RSX_GCM_CLEAR_ANY_MASK)) return;
+	if (!(mask & 0xF3)) return;
 
 	u8 ctx = rsx::framebuffer_creation_context::context_draw;
-	if (mask & RSX_GCM_CLEAR_COLOR_RGBA_MASK) ctx |= rsx::framebuffer_creation_context::context_clear_color;
-	if (mask & RSX_GCM_CLEAR_DEPTH_STENCIL_MASK) ctx |= rsx::framebuffer_creation_context::context_clear_depth;
+	if (mask & 0xF0) ctx |= rsx::framebuffer_creation_context::context_clear_color;
+	if (mask & 0x3) ctx |= rsx::framebuffer_creation_context::context_clear_depth;
 	init_buffers(rsx::framebuffer_creation_context{ctx});
 
-	if (!m_graphics_state.test(rsx::rtt_config_valid))
-	{
-		return;
-	}
+	if (!framebuffer_status_valid) return;
 
 	//float depth_clear = 1.f;
 	u32   stencil_clear = 0;
@@ -1281,9 +1227,9 @@ void VKGSRender::clear_surface(u32 mask)
 	bool update_color = false, update_z = false;
 	auto surface_depth_format = rsx::method_registers.surface_depth_fmt();
 
-	if (auto ds = std::get<1>(m_rtts.m_bound_depth_stencil); mask & RSX_GCM_CLEAR_DEPTH_STENCIL_MASK)
+	if (auto ds = std::get<1>(m_rtts.m_bound_depth_stencil); mask & 0x3)
 	{
-		if (mask & RSX_GCM_CLEAR_DEPTH_BIT)
+		if (mask & 0x1)
 		{
 			u32 max_depth_value = get_max_depth_value(surface_depth_format);
 
@@ -1298,7 +1244,7 @@ void VKGSRender::clear_surface(u32 mask)
 
 		if (is_depth_stencil_format(surface_depth_format))
 		{
-			if (mask & RSX_GCM_CLEAR_STENCIL_BIT)
+			if (mask & 0x2)
 			{
 				u8 clear_stencil = rsx::method_registers.stencil_clear_value();
 				depth_stencil_clear_values.depthStencil.stencil = clear_stencil;
@@ -1322,14 +1268,13 @@ void VKGSRender::clear_surface(u32 mask)
 				ds->old_contents.empty() && !g_cfg.video.read_depth_buffer) // No way to load data from memory, so no initialization given
 			{
 				// Only one aspect was cleared. Make sure to memory initialize the other before removing dirty flag
-				const auto ds_mask = (mask & RSX_GCM_CLEAR_DEPTH_STENCIL_MASK);
-				if (ds_mask == RSX_GCM_CLEAR_DEPTH_BIT && (ds->aspect() & VK_IMAGE_ASPECT_STENCIL_BIT))
+				if (mask == 1)
 				{
 					// Depth was cleared, initialize stencil
 					depth_stencil_clear_values.depthStencil.stencil = 0xFF;
 					depth_stencil_mask |= VK_IMAGE_ASPECT_STENCIL_BIT;
 				}
-				else if (ds_mask == RSX_GCM_CLEAR_STENCIL_BIT)
+				else
 				{
 					// Stencil was cleared, initialize depth
 					depth_stencil_clear_values.depthStencil.depth = 1.f;
@@ -1344,11 +1289,11 @@ void VKGSRender::clear_surface(u32 mask)
 		}
 	}
 
-	if (auto colormask = (mask & RSX_GCM_CLEAR_COLOR_RGBA_MASK))
+	if (auto colormask = (mask & 0xF0))
 	{
 		if (!m_draw_buffers.empty())
 		{
-			bool use_fast_clear = (colormask == RSX_GCM_CLEAR_COLOR_RGBA_MASK);;
+			bool use_fast_clear = false;
 			u8 clear_a = rsx::method_registers.clear_color_a();
 			u8 clear_r = rsx::method_registers.clear_color_r();
 			u8 clear_g = rsx::method_registers.clear_color_g();
@@ -1364,34 +1309,11 @@ void VKGSRender::clear_surface(u32 mask)
 				colormask = 0;
 				break;
 			}
-			case rsx::surface_color_format::b8:
-			{
-				rsx::get_b8_clear_color(clear_r, clear_g, clear_b, clear_a);
-				colormask = rsx::get_b8_clearmask(colormask);
-				use_fast_clear = (colormask & RSX_GCM_CLEAR_RED_BIT);
-				break;
-			}
 			case rsx::surface_color_format::g8b8:
 			{
 				rsx::get_g8b8_clear_color(clear_r, clear_g, clear_b, clear_a);
-				colormask = rsx::get_g8b8_r8g8_clearmask(colormask);
-				use_fast_clear = ((colormask & RSX_GCM_CLEAR_COLOR_RG_MASK) == RSX_GCM_CLEAR_COLOR_RG_MASK);
-				break;
-			}
-			case rsx::surface_color_format::r5g6b5:
-			{
-				rsx::get_rgb565_clear_color(clear_r, clear_g, clear_b, clear_a);
-				use_fast_clear = ((colormask & RSX_GCM_CLEAR_COLOR_RGB_MASK) == RSX_GCM_CLEAR_COLOR_RGB_MASK);
-				break;
-			}
-			case rsx::surface_color_format::x1r5g5b5_o1r5g5b5:
-			{
-				rsx::get_a1rgb555_clear_color(clear_r, clear_g, clear_b, clear_a, 255);
-				break;
-			}
-			case rsx::surface_color_format::x1r5g5b5_z1r5g5b5:
-			{
-				rsx::get_a1rgb555_clear_color(clear_r, clear_g, clear_b, clear_a, 0);
+				colormask = rsx::get_g8b8_r8g8_colormask(colormask);
+				use_fast_clear = (colormask == (0x10 | 0x20));
 				break;
 			}
 			case rsx::surface_color_format::a8b8g8r8:
@@ -1399,11 +1321,12 @@ void VKGSRender::clear_surface(u32 mask)
 			case rsx::surface_color_format::x8b8g8r8_z8b8g8r8:
 			{
 				rsx::get_abgr8_clear_color(clear_r, clear_g, clear_b, clear_a);
-				colormask = rsx::get_abgr8_clearmask(colormask);
-				break;
+				colormask = rsx::get_abgr8_colormask(colormask);
+				[[fallthrough]];
 			}
 			default:
 			{
+				use_fast_clear = (colormask == (0x10 | 0x20 | 0x40 | 0x80));
 				break;
 			}
 			}
@@ -1413,7 +1336,9 @@ void VKGSRender::clear_surface(u32 mask)
 				if (!use_fast_clear || !full_frame)
 				{
 					// If we're not clobber all the memory, a barrier is required
-					for (const auto& index : m_rtts.m_bound_render_target_ids)
+					for (u8 index = m_rtts.m_bound_render_targets_config.first, count = 0;
+						count < m_rtts.m_bound_render_targets_config.second;
+						++count, ++index)
 					{
 						m_rtts.m_bound_render_targets[index].second->write_barrier(*m_current_command_buffer);
 					}
@@ -1478,7 +1403,8 @@ void VKGSRender::clear_surface(u32 mask)
 
 	if (update_color || update_z)
 	{
-		m_rtts.on_write({ update_color, update_color, update_color, update_color }, update_z);
+		const bool write_all_mask[] = { true, true, true, true };
+		m_rtts.on_write(update_color ? write_all_mask : nullptr, update_z);
 	}
 
 	if (!clear_descriptors.empty())
@@ -1490,15 +1416,20 @@ void VKGSRender::clear_surface(u32 mask)
 
 void VKGSRender::flush_command_queue(bool hard_sync, bool do_not_switch)
 {
-	close_and_submit_command_buffer();
+	close_and_submit_command_buffer(m_current_command_buffer->submit_fence);
 
 	if (hard_sync)
 	{
 		// wait for the latest instruction to execute
+		m_current_command_buffer->pending = true;
 		m_current_command_buffer->reset();
 
 		// Clear all command buffer statuses
-		m_primary_cb_list.poke_all();
+		for (auto &cb : m_primary_cb_list)
+		{
+			if (cb.pending)
+				cb.poke();
+		}
 
 		// Drain present queue
 		while (!m_queued_frames.empty())
@@ -1508,12 +1439,24 @@ void VKGSRender::flush_command_queue(bool hard_sync, bool do_not_switch)
 
 		m_flush_requests.clear_pending_flag();
 	}
+	else
+	{
+		// Mark this queue as pending and proceed
+		m_current_command_buffer->pending = true;
+	}
 
 	if (!do_not_switch)
 	{
 		// Grab next cb in line and make it usable
 		// NOTE: Even in the case of a hard sync, this is required to free any waiters on the CB (ZCULL)
-		m_current_command_buffer = m_primary_cb_list.next();
+		m_current_cb_index = (m_current_cb_index + 1) % VK_MAX_ASYNC_CB_COUNT;
+		m_current_command_buffer = &m_primary_cb_list[m_current_cb_index];
+
+		if (!m_current_command_buffer->poke())
+		{
+			rsx_log.error("CB chain has run out of free entries!");
+		}
+
 		m_current_command_buffer->reset();
 	}
 	else
@@ -1530,140 +1473,43 @@ void VKGSRender::flush_command_queue(bool hard_sync, bool do_not_switch)
 		m_current_command_buffer->flags |= vk::command_buffer::cb_load_occluson_task;
 	}
 
-	m_current_command_buffer->begin();
+	open_command_buffer();
 }
 
-std::pair<volatile vk::host_data_t*, VkBuffer> VKGSRender::map_host_object_data() const
+void VKGSRender::sync_hint(rsx::FIFO_hint hint, void* args)
 {
-	return { m_host_dma_ctrl->host_ctx(), m_host_object_data->value };
-}
-
-bool VKGSRender::release_GCM_label(u32 address, u32 args)
-{
-	if (!backend_config.supports_host_gpu_labels)
-	{
-		return false;
-	}
-
-	auto host_ctx = ensure(m_host_dma_ctrl->host_ctx());
-
-	if (host_ctx->texture_loads_completed())
-	{
-		// All texture loads already seen by the host GPU
-		// Wait for all previously submitted labels to be flushed
-		m_host_dma_ctrl->drain_label_queue();
-		return false;
-	}
-
-	const auto mapping = vk::map_dma(address, 4);
-	const auto write_data = std::bit_cast<u32, be_t<u32>>(args);
-
-	if (!dynamic_cast<vk::memory_block_host*>(mapping.second->memory.get()))
-	{
-		// NVIDIA GPUs can disappoint when DMA blocks straddle VirtualAlloc boundaries.
-		// Take the L and try the fallback.
-		rsx_log.warning("Host label update at 0x%x was not possible.", address);
-		m_host_dma_ctrl->drain_label_queue();
-		return false;
-	}
-
-	const auto release_event_id = host_ctx->on_label_acquire();
-
-	if (host_ctx->has_unflushed_texture_loads())
-	{
-		if (vk::is_renderpass_open(*m_current_command_buffer))
-		{
-			vk::end_renderpass(*m_current_command_buffer);
-		}
-
-		vkCmdUpdateBuffer(*m_current_command_buffer, mapping.second->value, mapping.first, 4, &write_data);
-		flush_command_queue();
-	}
-	else
-	{
-		auto cmd = m_secondary_cb_list.next();
-		cmd->begin();
-		vkCmdUpdateBuffer(*cmd, mapping.second->value, mapping.first, 4, &write_data);
-		vkCmdUpdateBuffer(*cmd, m_host_object_data->value, ::offset32(&vk::host_data_t::commands_complete_event), 8, &release_event_id);
-		cmd->end();
-
-		vk::queue_submit_t submit_info = { m_device->get_graphics_queue(), nullptr };
-		cmd->submit(submit_info);
-
-		host_ctx->on_label_release();
-	}
-
-	return true;
-}
-
-void VKGSRender::on_guest_texture_read(const vk::command_buffer& cmd)
-{
-	if (!backend_config.supports_host_gpu_labels)
-	{
-		return;
-	}
-
-	// Queue a sync update on the CB doing the load
-	auto host_ctx = ensure(m_host_dma_ctrl->host_ctx());
-	const auto event_id = host_ctx->on_texture_load_acquire();
-	vkCmdUpdateBuffer(cmd, m_host_object_data->value, ::offset32(&vk::host_data_t::texture_load_complete_event), sizeof(u64), &event_id);
-}
-
-void VKGSRender::sync_hint(rsx::FIFO::interrupt_hint hint, rsx::reports::sync_hint_payload_t payload)
-{
-	rsx::thread::sync_hint(hint, payload);
+	ensure(args);
+	rsx::thread::sync_hint(hint, args);
 
+	// Occlusion queries not enabled, do nothing
 	if (!(m_current_command_buffer->flags & vk::command_buffer::cb_has_occlusion_task))
-	{
-		// Occlusion queries not enabled, do nothing
 		return;
-	}
+
+	// Check if the required report is synced to this CB
+	auto occlusion_info = static_cast<rsx::reports::occlusion_query_info*>(args);
+	auto& data = m_occlusion_map[occlusion_info->driver_handle];
+
+	// NOTE: Currently, a special condition exists where the indices can be empty even with active draw count.
+	// This is caused by async compiler and should be removed when ubershaders are added in
+	if (!data.is_current(m_current_command_buffer) || data.indices.empty())
+		return;
 
 	// Occlusion test result evaluation is coming up, avoid a hard sync
 	switch (hint)
 	{
-	case rsx::FIFO::interrupt_hint::conditional_render_eval:
+	case rsx::FIFO_hint::hint_conditional_render_eval:
 	{
 		// If a flush request is already enqueued, do nothing
 		if (m_flush_requests.pending())
-		{
 			return;
-		}
 
-		// If the result is not going to be read by CELL, do nothing
-		const auto ref_addr = static_cast<u32>(payload.address);
-		if (!zcull_ctrl->is_query_result_urgent(ref_addr))
-		{
-			// No effect on CELL behaviour, it will be faster to handle this in RSX code
-			return;
-		}
-
-		// OK, cell will be accessing the results, probably.
-		// Try to avoid flush spam, it is more costly to flush the CB than it is to just upload the vertex data
-		// This is supposed to be an optimization afterall.
-		const auto now = get_system_time();
-		if ((now - m_last_cond_render_eval_hint) > 50)
-		{
-			// Schedule a sync on the next loop iteration
-			m_flush_requests.post(false);
-			m_flush_requests.remove_one();
-		}
-
-		m_last_cond_render_eval_hint = now;
+		// Schedule a sync on the next loop iteration
+		m_flush_requests.post(false);
+		m_flush_requests.remove_one();
 		break;
 	}
-	case rsx::FIFO::interrupt_hint::zcull_sync:
+	case rsx::FIFO_hint::hint_zcull_sync:
 	{
-		// Check if the required report is synced to this CB
-		auto& data = m_occlusion_map[payload.query->driver_handle];
-
-		// NOTE: Currently, a special condition exists where the indices can be empty even with active draw count.
-		// This is caused by async compiler and should be removed when ubershaders are added in
-		if (!data.is_current(m_current_command_buffer) || data.indices.empty())
-		{
-			return;
-		}
-
 		// Unavoidable hard sync coming up, flush immediately
 		// This heavyweight hint should be used with caution
 		std::lock_guard lock(m_flush_queue_mutex);
@@ -1679,7 +1525,7 @@ void VKGSRender::sync_hint(rsx::FIFO::interrupt_hint hint, rsx::reports::sync_hi
 	}
 }
 
-void VKGSRender::do_local_task(rsx::FIFO::state state)
+void VKGSRender::do_local_task(rsx::FIFO_state state)
 {
 	if (m_queue_status & flush_queue_state::deadlock)
 	{
@@ -1709,14 +1555,14 @@ void VKGSRender::do_local_task(rsx::FIFO::state state)
 			m_flush_queue_mutex.unlock();
 		}
 	}
-	else if (!in_begin_end && state != rsx::FIFO::state::lock_wait)
+	else if (!in_begin_end && state != rsx::FIFO_state::lock_wait)
 	{
 		if (m_graphics_state & rsx::pipeline_state::framebuffer_reads_dirty)
 		{
 			//This will re-engage locks and break the texture cache if another thread is waiting in access violation handler!
 			//Only call when there are no waiters
 			m_texture_cache.do_update();
-			m_graphics_state.clear(rsx::pipeline_state::framebuffer_reads_dirty);
+			m_graphics_state &= ~rsx::pipeline_state::framebuffer_reads_dirty;
 		}
 	}
 
@@ -1724,11 +1570,11 @@ void VKGSRender::do_local_task(rsx::FIFO::state state)
 
 	switch (state)
 	{
-	case rsx::FIFO::state::lock_wait:
+	case rsx::FIFO_state::lock_wait:
 		// Critical check finished
 		return;
-	//case rsx::FIFO::state::spinning:
-	//case rsx::FIFO::state::empty:
+	//case rsx::FIFO_state::spinning:
+	//case rsx::FIFO_state::empty:
 		// We have some time, check the present queue
 		//check_present_status();
 		//break;
@@ -1738,8 +1584,7 @@ void VKGSRender::do_local_task(rsx::FIFO::state state)
 
 	if (m_overlay_manager)
 	{
-		const auto should_ignore = in_begin_end && state != rsx::FIFO::state::empty;
-		if ((async_flip_requested & flip_request::native_ui) && !should_ignore && !is_stopped())
+		if (!in_begin_end && async_flip_requested & flip_request::native_ui)
 		{
 			flush_command_queue(true);
 			rsx::display_flip_info_t info{};
@@ -1751,11 +1596,6 @@ void VKGSRender::do_local_task(rsx::FIFO::state state)
 
 bool VKGSRender::load_program()
 {
-	const auto shadermode = g_cfg.video.shadermode.get();
-
-	// TODO: EXT_dynamic_state should get rid of this sillyness soon (kd)
-	const auto vertex_state = vk::decode_vertex_input_assembly_state();
-
 	if (m_graphics_state & rsx::pipeline_state::invalidate_pipeline_bits)
 	{
 		get_current_fragment_program(fs_sampler_state);
@@ -1763,94 +1603,173 @@ bool VKGSRender::load_program()
 
 		get_current_vertex_program(vs_sampler_state);
 
-		m_graphics_state.clear(rsx::pipeline_state::invalidate_pipeline_bits);
-	}
-	else if (!(m_graphics_state & rsx::pipeline_state::pipeline_config_dirty) &&
-		m_program &&
-		m_pipeline_properties.state.ia.topology == vertex_state.primitive &&
-		m_pipeline_properties.state.ia.primitiveRestartEnable == vertex_state.restart_index_enabled)
-	{
-		if (!m_shader_interpreter.is_interpreter(m_program)) [[ likely ]]
-		{
-			return true;
-		}
-
-		if (shadermode == shader_mode::interpreter_only)
-		{
-			m_program = m_shader_interpreter.get(
-				m_pipeline_properties,
-				current_fp_metadata,
-				current_vp_metadata,
-				current_vertex_program.ctrl,
-				current_fragment_program.ctrl);
-
-			std::tie(m_vs_binding_table, m_fs_binding_table) = get_binding_table();
-			return true;
-		}
+		m_graphics_state &= ~rsx::pipeline_state::invalidate_pipeline_bits;
 	}
 
 	auto &vertex_program = current_vertex_program;
 	auto &fragment_program = current_fragment_program;
+	auto old_program = m_program;
 
-	if (m_graphics_state & rsx::pipeline_state::pipeline_config_dirty)
+	vk::pipeline_props properties{};
+
+	// Input assembly
+	bool emulated_primitive_type;
+	properties.state.set_primitive_type(vk::get_appropriate_topology(rsx::method_registers.current_draw_clause.primitive, emulated_primitive_type));
+
+	const bool restarts_valid = rsx::method_registers.current_draw_clause.command == rsx::draw_command::indexed && !emulated_primitive_type && !rsx::method_registers.current_draw_clause.is_disjoint_primitive;
+	if (rsx::method_registers.restart_index_enabled() && !vk::emulate_primitive_restart(rsx::method_registers.current_draw_clause.primitive) && restarts_valid)
+		properties.state.enable_primitive_restart();
+
+	// Rasterizer state
+	properties.state.set_attachment_count(::size32(m_draw_buffers));
+	properties.state.set_front_face(vk::get_front_face(rsx::method_registers.front_face_mode()));
+	properties.state.enable_depth_clamp(rsx::method_registers.depth_clamp_enabled() || !rsx::method_registers.depth_clip_enabled());
+	properties.state.enable_depth_bias(true);
+	properties.state.enable_depth_bounds_test(m_device->get_depth_bounds_support());
+
+	if (rsx::method_registers.depth_test_enabled())
 	{
-		vk::pipeline_props properties = vk::decode_rsx_state(
-			vertex_state,
-			m_rtts.m_bound_depth_stencil.second,
-			backend_config,
-			static_cast<u8>(m_draw_buffers.size()),
-			u8((m_current_renderpass_key >> 16) & 0xF),
-			m_device->get_depth_bounds_support()
-		);
+		//NOTE: Like stencil, depth write is meaningless without depth test
+		properties.state.set_depth_mask(rsx::method_registers.depth_write_enabled());
+		properties.state.enable_depth_test(vk::get_compare_func(rsx::method_registers.depth_func()));
+	}
 
-		properties.renderpass_key = m_current_renderpass_key;
-		if (m_program &&
-			!m_shader_interpreter.is_interpreter(m_program) &&
+	if (rsx::method_registers.logic_op_enabled())
+		properties.state.enable_logic_op(vk::get_logic_op(rsx::method_registers.logic_operation()));
+
+	if (rsx::method_registers.cull_face_enabled())
+		properties.state.enable_cull_face(vk::get_cull_face(rsx::method_registers.cull_face_mode()));
+
+	for (uint index = 0; index < m_draw_buffers.size(); ++index)
+	{
+		bool color_mask_b = rsx::method_registers.color_mask_b(index);
+		bool color_mask_g = rsx::method_registers.color_mask_g(index);
+		bool color_mask_r = rsx::method_registers.color_mask_r(index);
+		bool color_mask_a = rsx::method_registers.color_mask_a(index);
+
+		if (rsx::method_registers.surface_color() == rsx::surface_color_format::g8b8)
+			rsx::get_g8b8_r8g8_colormask(color_mask_r, color_mask_g, color_mask_b, color_mask_a);
+
+		properties.state.set_color_mask(index, color_mask_r, color_mask_g, color_mask_b, color_mask_a);
+	}
+
+	bool mrt_blend_enabled[] =
+	{
+		rsx::method_registers.blend_enabled(),
+		rsx::method_registers.blend_enabled_surface_1(),
+		rsx::method_registers.blend_enabled_surface_2(),
+		rsx::method_registers.blend_enabled_surface_3()
+	};
+
+	VkBlendFactor sfactor_rgb, sfactor_a, dfactor_rgb, dfactor_a;
+	VkBlendOp equation_rgb, equation_a;
+
+	if (mrt_blend_enabled[0] || mrt_blend_enabled[1] || mrt_blend_enabled[2] || mrt_blend_enabled[3])
+	{
+		sfactor_rgb = vk::get_blend_factor(rsx::method_registers.blend_func_sfactor_rgb());
+		sfactor_a = vk::get_blend_factor(rsx::method_registers.blend_func_sfactor_a());
+		dfactor_rgb = vk::get_blend_factor(rsx::method_registers.blend_func_dfactor_rgb());
+		dfactor_a = vk::get_blend_factor(rsx::method_registers.blend_func_dfactor_a());
+		equation_rgb = vk::get_blend_op(rsx::method_registers.blend_equation_rgb());
+		equation_a = vk::get_blend_op(rsx::method_registers.blend_equation_a());
+
+		for (u8 idx = 0; idx < m_draw_buffers.size(); ++idx)
+		{
+			if (mrt_blend_enabled[idx])
+			{
+				properties.state.enable_blend(idx, sfactor_rgb, sfactor_a, dfactor_rgb, dfactor_a, equation_rgb, equation_a);
+			}
+		}
+	}
+
+	if (rsx::method_registers.stencil_test_enabled())
+	{
+		if (!rsx::method_registers.two_sided_stencil_test_enabled())
+		{
+			properties.state.enable_stencil_test(
+				vk::get_stencil_op(rsx::method_registers.stencil_op_fail()),
+				vk::get_stencil_op(rsx::method_registers.stencil_op_zfail()),
+				vk::get_stencil_op(rsx::method_registers.stencil_op_zpass()),
+				vk::get_compare_func(rsx::method_registers.stencil_func()),
+				0xFF, 0xFF); //write mask, func_mask, ref are dynamic
+		}
+		else
+		{
+			properties.state.enable_stencil_test_separate(0,
+				vk::get_stencil_op(rsx::method_registers.stencil_op_fail()),
+				vk::get_stencil_op(rsx::method_registers.stencil_op_zfail()),
+				vk::get_stencil_op(rsx::method_registers.stencil_op_zpass()),
+				vk::get_compare_func(rsx::method_registers.stencil_func()),
+				0xFF, 0xFF); //write mask, func_mask, ref are dynamic
+
+			properties.state.enable_stencil_test_separate(1,
+				vk::get_stencil_op(rsx::method_registers.back_stencil_op_fail()),
+				vk::get_stencil_op(rsx::method_registers.back_stencil_op_zfail()),
+				vk::get_stencil_op(rsx::method_registers.back_stencil_op_zpass()),
+				vk::get_compare_func(rsx::method_registers.back_stencil_func()),
+				0xFF, 0xFF); //write mask, func_mask, ref are dynamic
+		}
+
+		if (auto ds = m_rtts.m_bound_depth_stencil.second;
+			ds && ds->samples() > 1 && !(ds->stencil_init_flags & 0xFF00))
+		{
+			if (properties.state.ds.front.failOp != VK_STENCIL_OP_KEEP ||
+				properties.state.ds.front.depthFailOp != VK_STENCIL_OP_KEEP ||
+				properties.state.ds.front.passOp != VK_STENCIL_OP_KEEP ||
+				properties.state.ds.back.failOp != VK_STENCIL_OP_KEEP ||
+				properties.state.ds.back.depthFailOp != VK_STENCIL_OP_KEEP ||
+				properties.state.ds.back.passOp != VK_STENCIL_OP_KEEP)
+			{
+				// Toggle bit 9 to signal require full bit-wise transfer
+				ds->stencil_init_flags |= (1 << 8);
+			}
+		}
+	}
+
+	const auto rasterization_samples = u8((m_current_renderpass_key >> 16) & 0xF);
+	if (backend_config.supports_hw_a2c || rasterization_samples > 1)
+	{
+		const bool alpha_to_one_enable = rsx::method_registers.msaa_alpha_to_one_enabled() && backend_config.supports_hw_a2one;
+
+		properties.state.set_multisample_state(
+			rasterization_samples,
+			rsx::method_registers.msaa_sample_mask(),
+			rsx::method_registers.msaa_enabled(),
+			rsx::method_registers.msaa_alpha_to_coverage_enabled(),
+			alpha_to_one_enable);
+
+		if (const auto chip_family = vk::get_chip_family();
+			chip_family == vk::chip_class::AMD_navi1x ||
+			chip_family == vk::chip_class::AMD_navi2x)
+		{
+			// NAVI family has a GPU bug with MSAA where shading rate is not correctly initialized if left disabled
+			// Manually initialize it and set it to spec default (full shading)
+			properties.state.set_multisample_shading_rate(1.f);
+		}
+	}
+
+	properties.renderpass_key = m_current_renderpass_key;
+	if (!m_interpreter_state && m_program) [[likely]]
+	{
+		if (!m_shader_interpreter.is_interpreter(m_program) &&
 			m_pipeline_properties == properties)
 		{
 			// Nothing changed
 			return true;
 		}
-
-		// Fallthrough
-		m_pipeline_properties = properties;
-		m_graphics_state.clear(rsx::pipeline_state::pipeline_config_dirty);
-	}
-	else
-	{
-		// Update primitive type and restart index. Note that this is not needed with EXT_dynamic_state
-		m_pipeline_properties.state.set_primitive_type(vertex_state.primitive);
-		m_pipeline_properties.state.enable_primitive_restart(vertex_state.restart_index_enabled);
-		m_pipeline_properties.renderpass_key = m_current_renderpass_key;
 	}
 
-	m_vertex_prog = nullptr;
-	m_fragment_prog = nullptr;
+	const auto shadermode = g_cfg.video.shadermode.get();
 
 	if (shadermode != shader_mode::interpreter_only) [[likely]]
 	{
 		vk::enter_uninterruptible();
 
-		if (g_cfg.video.debug_overlay)
-		{
-			m_frame_stats.program_cache_lookups_total += 2;
-			if (m_program_cache_hint.has_fragment_program())
-			{
-				m_frame_stats.program_cache_lookups_ellided++;
-			}
-			if (m_program_cache_hint.has_vertex_program())
-			{
-				m_frame_stats.program_cache_lookups_ellided++;
-			}
-		}
-
-		// Load current program from cache
-		std::tie(m_program, m_vertex_prog, m_fragment_prog) = m_prog_buffer->get_graphics_pipeline(
-			&m_program_cache_hint,
-			vertex_program,
-			fragment_program,
-			m_pipeline_properties,
-			shadermode != shader_mode::recompiler, true);
+		// Load current program from buffer
+		vertex_program.skip_vertex_input_check = true;
+		fragment_program.texture_state.unnormalized_coords = 0;
+		m_program = m_prog_buffer->get_graphics_pipeline(vertex_program, fragment_program, properties,
+			shadermode != shader_mode::recompiler, true, pipeline_layout);
 
 		vk::leave_uninterruptible();
 
@@ -1861,7 +1780,16 @@ bool VKGSRender::load_program()
 			{
 				if (m_overlay_manager)
 				{
-					rsx::overlays::show_shader_compile_notification();
+					if (auto dlg = m_overlay_manager->get<rsx::overlays::shader_compile_notification>())
+					{
+						// Extend duration
+						dlg->touch();
+					}
+					else
+					{
+						// Create dialog but do not show immediately
+						m_overlay_manager->create<rsx::overlays::shader_compile_notification>();
+					}
 				}
 			}
 		}
@@ -1871,49 +1799,17 @@ bool VKGSRender::load_program()
 		m_program = nullptr;
 	}
 
-	if (shadermode == shader_mode::async_with_interpreter || shadermode == shader_mode::interpreter_only)
+	if (!m_program && (shadermode == shader_mode::async_with_interpreter || shadermode == shader_mode::interpreter_only))
 	{
-		const bool is_interpreter = !m_program;
-		const bool was_interpreter = m_shader_interpreter.is_interpreter(m_prev_program);
-
-		// First load the next program if not available
-		if (!m_program)
+		if (!m_shader_interpreter.is_interpreter(old_program))
 		{
-			m_program = m_shader_interpreter.get(
-				m_pipeline_properties,
-				current_fp_metadata,
-				current_vp_metadata,
-				current_vertex_program.ctrl,
-				current_fragment_program.ctrl);
-
-			// Program has changed, reupload
 			m_interpreter_state = rsx::invalidate_pipeline_bits;
 		}
 
-		// If swapping between interpreter and recompiler, we need to adjust some flags to reupload data as needed.
-		if (is_interpreter != was_interpreter)
-		{
-			// Always reupload transform constants when going between interpreter and recompiler
-			m_graphics_state |= rsx::transform_constants_dirty;
-
-			// Always reload fragment constansts when moving from interpreter back to recompiler.
-			if (was_interpreter)
-			{
-				m_graphics_state |= rsx::fragment_constants_dirty;
-			}
-		}
-	}
-
-	if (m_program)
-	{
-		std::tie(m_vs_binding_table, m_fs_binding_table) = get_binding_table();
-	}
-	else
-	{
-		m_vs_binding_table = nullptr;
-		m_fs_binding_table = nullptr;
+		m_program = m_shader_interpreter.get(properties, current_fp_metadata);
 	}
 
+	m_pipeline_properties = properties;
 	return m_program != nullptr;
 }
 
@@ -1925,25 +1821,25 @@ void VKGSRender::load_program_env()
 	}
 
 	const u32 fragment_constants_size = current_fp_metadata.program_constants_buffer_length;
-	const bool is_interpreter = m_shader_interpreter.is_interpreter(m_program);
 
 	const bool update_transform_constants = !!(m_graphics_state & rsx::pipeline_state::transform_constants_dirty);
 	const bool update_fragment_constants = !!(m_graphics_state & rsx::pipeline_state::fragment_constants_dirty);
 	const bool update_vertex_env = !!(m_graphics_state & rsx::pipeline_state::vertex_state_dirty);
 	const bool update_fragment_env = !!(m_graphics_state & rsx::pipeline_state::fragment_state_dirty);
 	const bool update_fragment_texture_env = !!(m_graphics_state & rsx::pipeline_state::fragment_texture_state_dirty);
-	const bool update_instruction_buffers = (!!m_interpreter_state && is_interpreter);
+	const bool update_instruction_buffers = (!!m_interpreter_state && m_shader_interpreter.is_interpreter(m_program));
 	const bool update_raster_env = (rsx::method_registers.polygon_stipple_enabled() && !!(m_graphics_state & rsx::pipeline_state::polygon_stipple_pattern_dirty));
-	const bool update_instancing_data = rsx::method_registers.current_draw_clause.is_trivial_instanced_draw;
 
 	if (update_vertex_env)
 	{
+		check_heap_status(VK_HEAP_CHECK_VERTEX_ENV_STORAGE);
+
 		// Vertex state
-		const auto mem = m_vertex_env_ring_info.static_alloc<256>();
+		const auto mem = m_vertex_env_ring_info.alloc<256>(256);
 		auto buf = static_cast<u8*>(m_vertex_env_ring_info.map(mem, 148));
 
-		m_draw_processor.fill_scale_offset_data(buf, false);
-		m_draw_processor.fill_user_clip_data(buf + 64);
+		fill_scale_offset_data(buf, false);
+		fill_user_clip_data(buf + 64);
 		*(reinterpret_cast<u32*>(buf + 128)) = rsx::method_registers.transform_branch_bits();
 		*(reinterpret_cast<f32*>(buf + 132)) = rsx::method_registers.point_size() * rsx::get_resolution_scale();
 		*(reinterpret_cast<f32*>(buf + 136)) = rsx::method_registers.clip_min();
@@ -1953,56 +1849,23 @@ void VKGSRender::load_program_env()
 		m_vertex_env_buffer_info = { m_vertex_env_ring_info.heap->value, mem, 144 };
 	}
 
-	if (update_instancing_data)
+	if (update_transform_constants)
 	{
-		// Combines transform load + instancing lookup table
-		const auto alignment = m_device->gpu().get_limits().minStorageBufferOffsetAlignment;
-		usz indirection_table_offset = 0;
-		usz constants_data_table_offset = 0;
+		check_heap_status(VK_HEAP_CHECK_TRANSFORM_CONSTANTS_STORAGE);
 
-		rsx::io_buffer indirection_table_buf([&](usz size) -> std::pair<void*, usz>
-		{
-			indirection_table_offset = m_instancing_buffer_ring_info.alloc<1>(utils::align(size, alignment));
-			return std::make_pair(m_instancing_buffer_ring_info.map(indirection_table_offset, size), size);
-		});
-
-		rsx::io_buffer constants_array_buf([&](usz size) -> std::pair<void*, usz>
-		{
-			constants_data_table_offset = m_instancing_buffer_ring_info.alloc<1>(utils::align(size, alignment));
-			return std::make_pair(m_instancing_buffer_ring_info.map(constants_data_table_offset, size), size);
-		});
-
-		const auto bound_vertex_prog = m_shader_interpreter.is_interpreter(m_program) ? nullptr : m_vertex_prog;
-		m_draw_processor.fill_constants_instancing_buffer(indirection_table_buf, constants_array_buf, bound_vertex_prog);
-		m_instancing_buffer_ring_info.unmap();
-
-		m_instancing_indirection_buffer_info = { m_instancing_buffer_ring_info.heap->value, indirection_table_offset, indirection_table_buf.size() };
-		m_instancing_constants_array_buffer_info = { m_instancing_buffer_ring_info.heap->value, constants_data_table_offset, constants_array_buf.size() };
-	}
-	else if (update_transform_constants)
-	{
 		// Transform constants
-		usz mem_offset = 0;
-		auto alloc_storage = [&](usz size) -> std::pair<void*, usz>
-		{
-			const auto alignment = m_device->gpu().get_limits().minStorageBufferOffsetAlignment;
-			mem_offset = m_transform_constants_ring_info.alloc<1>(utils::align(size, alignment));
-			return std::make_pair(m_transform_constants_ring_info.map(mem_offset, size), size);
-		};
+		auto mem = m_transform_constants_ring_info.alloc<256>(8192);
+		auto buf = m_transform_constants_ring_info.map(mem, 8192);
 
-		auto io_buf = rsx::io_buffer(alloc_storage);
-		upload_transform_constants(io_buf);
-
-		if (!io_buf.empty())
-		{
-			m_transform_constants_ring_info.unmap();
-			m_vertex_constants_buffer_info = { m_transform_constants_ring_info.heap->value, 0, VK_WHOLE_SIZE };
-			m_xform_constants_dynamic_offset = mem_offset;
-		}
+		fill_vertex_program_constants_data(buf);
+		m_transform_constants_ring_info.unmap();
+		m_vertex_constants_buffer_info = { m_transform_constants_ring_info.heap->value, mem, 8192 };
 	}
 
-	if (update_fragment_constants && !m_shader_interpreter.is_interpreter(m_program))
+	if (update_fragment_constants && !update_instruction_buffers)
 	{
+		check_heap_status(VK_HEAP_CHECK_FRAGMENT_CONSTANTS_STORAGE);
+
 		// Fragment constants
 		if (fragment_constants_size)
 		{
@@ -2010,7 +1873,7 @@ void VKGSRender::load_program_env()
 			auto buf = m_fragment_constants_ring_info.map(mem, fragment_constants_size);
 
 			m_prog_buffer->fill_fragment_constants_buffer({ reinterpret_cast<float*>(buf), fragment_constants_size },
-				*ensure(m_fragment_prog), current_fragment_program, true);
+				current_fragment_program, true);
 
 			m_fragment_constants_ring_info.unmap();
 			m_fragment_constants_buffer_info = { m_fragment_constants_ring_info.heap->value, mem, fragment_constants_size };
@@ -2023,34 +1886,40 @@ void VKGSRender::load_program_env()
 
 	if (update_fragment_env)
 	{
-		auto mem = m_fragment_env_ring_info.static_alloc<256>();
+		check_heap_status(VK_HEAP_CHECK_FRAGMENT_ENV_STORAGE);
+
+		auto mem = m_fragment_env_ring_info.alloc<256>(256);
 		auto buf = m_fragment_env_ring_info.map(mem, 32);
 
-		m_draw_processor.fill_fragment_state_buffer(buf, current_fragment_program);
+		fill_fragment_state_buffer(buf, current_fragment_program);
 		m_fragment_env_ring_info.unmap();
 		m_fragment_env_buffer_info = { m_fragment_env_ring_info.heap->value, mem, 32 };
 	}
 
 	if (update_fragment_texture_env)
 	{
-		auto mem = m_fragment_texture_params_ring_info.static_alloc<256, 768>();
-		auto buf = m_fragment_texture_params_ring_info.map(mem, 768);
+		check_heap_status(VK_HEAP_CHECK_TEXTURE_ENV_STORAGE);
+
+		auto mem = m_fragment_texture_params_ring_info.alloc<256>(512);
+		auto buf = m_fragment_texture_params_ring_info.map(mem, 512);
 
 		current_fragment_program.texture_params.write_to(buf, current_fp_metadata.referenced_textures_mask);
 		m_fragment_texture_params_ring_info.unmap();
-		m_fragment_texture_params_buffer_info = { m_fragment_texture_params_ring_info.heap->value, mem, 768 };
+		m_fragment_texture_params_buffer_info = { m_fragment_texture_params_ring_info.heap->value, mem, 512 };
 	}
 
 	if (update_raster_env)
 	{
-		auto mem = m_raster_env_ring_info.static_alloc<256>();
+		check_heap_status(VK_HEAP_CHECK_FRAGMENT_ENV_STORAGE);
+
+		auto mem = m_raster_env_ring_info.alloc<256>(256);
 		auto buf = m_raster_env_ring_info.map(mem, 128);
 
 		std::memcpy(buf, rsx::method_registers.polygon_stipple_pattern(), 128);
 		m_raster_env_ring_info.unmap();
 		m_raster_env_buffer_info = { m_raster_env_ring_info.heap->value, mem, 128 };
 
-		m_graphics_state.clear(rsx::pipeline_state::polygon_stipple_pattern_dirty);
+		m_graphics_state &= ~(rsx::pipeline_state::polygon_stipple_pattern_dirty);
 	}
 
 	if (update_instruction_buffers)
@@ -2093,95 +1962,33 @@ void VKGSRender::load_program_env()
 		}
 	}
 
-	m_program->bind_uniform(m_vertex_env_buffer_info, vk::glsl::binding_set_index_vertex, m_vs_binding_table->context_buffer_location);
-	m_program->bind_uniform(m_fragment_env_buffer_info, vk::glsl::binding_set_index_fragment, m_fs_binding_table->context_buffer_location);
-	m_program->bind_uniform(m_fragment_texture_params_buffer_info, vk::glsl::binding_set_index_fragment, m_fs_binding_table->tex_param_location);
-	m_program->bind_uniform(m_raster_env_buffer_info, vk::glsl::binding_set_index_fragment, m_fs_binding_table->polygon_stipple_params_location);
+	const auto& binding_table = m_device->get_pipeline_binding_table();
 
-	if (m_vs_binding_table->cbuf_location != umax)
-	{
-		m_program->bind_uniform(m_vertex_constants_buffer_info, vk::glsl::binding_set_index_vertex, m_vs_binding_table->cbuf_location);
-	}
+	m_program->bind_uniform(m_vertex_env_buffer_info, binding_table.vertex_params_bind_slot, m_current_frame->descriptor_set);
+	m_program->bind_uniform(m_vertex_constants_buffer_info, binding_table.vertex_constant_buffers_bind_slot, m_current_frame->descriptor_set);
+	m_program->bind_uniform(m_fragment_env_buffer_info, binding_table.fragment_state_bind_slot, m_current_frame->descriptor_set);
+	m_program->bind_uniform(m_fragment_texture_params_buffer_info, binding_table.fragment_texture_params_bind_slot, m_current_frame->descriptor_set);
+	m_program->bind_uniform(m_raster_env_buffer_info, binding_table.rasterizer_env_bind_slot, m_current_frame->descriptor_set);
 
-	if (m_shader_interpreter.is_interpreter(m_program))
+	if (!m_shader_interpreter.is_interpreter(m_program))
 	{
-		m_program->bind_uniform(m_vertex_instructions_buffer_info, vk::glsl::binding_set_index_vertex, m_shader_interpreter.get_vertex_instruction_location());
-		m_program->bind_uniform(m_fragment_instructions_buffer_info, vk::glsl::binding_set_index_fragment, m_shader_interpreter.get_fragment_instruction_location());
+		m_program->bind_uniform(m_fragment_constants_buffer_info, binding_table.fragment_constant_buffers_bind_slot, m_current_frame->descriptor_set);
 	}
-	else if (m_fs_binding_table->cbuf_location != umax)
+	else
 	{
-		m_program->bind_uniform(m_fragment_constants_buffer_info, vk::glsl::binding_set_index_fragment, m_fs_binding_table->cbuf_location);
+		m_program->bind_buffer(m_vertex_instructions_buffer_info, m_shader_interpreter.get_vertex_instruction_location(), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, m_current_frame->descriptor_set);
+		m_program->bind_buffer(m_fragment_instructions_buffer_info, m_shader_interpreter.get_fragment_instruction_location(), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, m_current_frame->descriptor_set);
 	}
 
 	if (vk::emulate_conditional_rendering())
 	{
-		auto predicate = m_cond_render_buffer ? m_cond_render_buffer->value : vk::get_scratch_buffer(*m_current_command_buffer, 4)->value;
-		m_program->bind_uniform({ predicate, 0, 4 }, vk::glsl::binding_set_index_vertex, m_vs_binding_table->cr_pred_buffer_location);
+		auto predicate = m_cond_render_buffer ? m_cond_render_buffer->value : vk::get_scratch_buffer(4)->value;
+		m_program->bind_buffer({ predicate, 0, 4 }, binding_table.conditional_render_predicate_slot, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, m_current_frame->descriptor_set);
 	}
 
-	if (current_vertex_program.ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS)
-	{
-		m_program->bind_uniform(m_instancing_indirection_buffer_info, vk::glsl::binding_set_index_vertex, m_vs_binding_table->instanced_lut_buffer_location);
-		m_program->bind_uniform(m_instancing_constants_array_buffer_info, vk::glsl::binding_set_index_vertex, m_vs_binding_table->instanced_cbuf_location);
-	}
-
-	// Clear flags
-	rsx::flags32_t handled_flags =
-		rsx::pipeline_state::fragment_state_dirty |
-		rsx::pipeline_state::vertex_state_dirty |
-		rsx::pipeline_state::fragment_texture_state_dirty;
-
-	if (!update_instancing_data)
-	{
-		handled_flags |= rsx::pipeline_state::transform_constants_dirty;
-	}
-
-	if (update_fragment_constants && !m_shader_interpreter.is_interpreter(m_program))
-	{
-		handled_flags |= rsx::pipeline_state::fragment_constants_dirty;
-	}
-
-	if (m_shader_interpreter.is_interpreter(m_program))
-	{
-		ensure(m_vertex_constants_buffer_info.range >= 468 * 16);
-	}
-
-	m_graphics_state.clear(handled_flags);
-}
-
-std::pair<const vs_binding_table_t*, const fs_binding_table_t*> VKGSRender::get_binding_table() const
-{
-	ensure(m_program);
-
-	if (!m_shader_interpreter.is_interpreter(m_program))
-	{
-		return { &m_vertex_prog->binding_table, &m_fragment_prog->binding_table };
-	}
-
-	const auto& [vs, fs] = m_shader_interpreter.get_shaders();
-	return { &vs->binding_table, &fs->binding_table };
-}
-
-bool VKGSRender::is_current_program_interpreted() const
-{
-	return m_program && m_shader_interpreter.is_interpreter(m_program);
-}
-
-void VKGSRender::upload_transform_constants(const rsx::io_buffer& buffer)
-{
-	const bool is_interpreter = m_shader_interpreter.is_interpreter(m_program);
-	const usz transform_constants_size = (is_interpreter || m_vertex_prog->has_indexed_constants) ? 8192 : m_vertex_prog->constant_ids.size() * 16;
-
-	if (transform_constants_size)
-	{
-		buffer.reserve(transform_constants_size);
-		auto buf = buffer.data();
-
-		const auto constant_ids = (transform_constants_size == 8192)
-			? std::span<const u16>{}
-			: std::span<const u16>(m_vertex_prog->constant_ids);
-		m_draw_processor.fill_vertex_program_constants_data(buf, constant_ids);
-	}
+	//Clear flags
+	const u32 handled_flags = (rsx::pipeline_state::fragment_state_dirty | rsx::pipeline_state::vertex_state_dirty | rsx::pipeline_state::transform_constants_dirty | rsx::pipeline_state::fragment_constants_dirty | rsx::pipeline_state::fragment_texture_state_dirty);
+	m_graphics_state &= ~handled_flags;
 }
 
 void VKGSRender::update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_info)
@@ -2194,7 +2001,9 @@ void VKGSRender::update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_
 	if (!m_vertex_layout_storage || !m_vertex_layout_storage->in_range(offset32, range32, base_offset))
 	{
 		ensure(m_texbuffer_view_size >= m_vertex_layout_stream_info.range);
-		vk::get_resource_manager()->dispose(m_vertex_layout_storage);
+
+		if (m_vertex_layout_storage)
+			m_current_frame->buffer_views_to_clean.push_back(std::move(m_vertex_layout_storage));
 
 		const usz alloc_addr = m_vertex_layout_stream_info.offset;
 		const usz view_size = (alloc_addr + m_texbuffer_view_size) > m_vertex_layout_ring_info.size() ? m_vertex_layout_ring_info.size() - alloc_addr : m_texbuffer_view_size;
@@ -2202,74 +2011,31 @@ void VKGSRender::update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_
 		base_offset = 0;
 	}
 
-	const u32 vertex_layout_offset = (id * 16) + (base_offset / 8);
-	const u32 constant_id_offset = static_cast<u32>(m_xform_constants_dynamic_offset) / 16u;
+	u8 data_size = 16;
+	u32 draw_info[5];
 
-	u32 push_constants[6];
-	u32 data_length = 20;
-
-	push_constants[0] = vertex_info.vertex_index_base;
-	push_constants[1] = vertex_info.vertex_index_offset;
-	push_constants[2] = id;
-	push_constants[3] = vertex_layout_offset;
-	push_constants[4] = constant_id_offset;
+	draw_info[0] = vertex_info.vertex_index_base;
+	draw_info[1] = vertex_info.vertex_index_offset;
+	draw_info[2] = id;
+	draw_info[3] = (id * 16) + (base_offset / 8);
 
 	if (vk::emulate_conditional_rendering())
 	{
-		push_constants[5] = cond_render_ctrl.hw_cond_active ? 1 : 0;
-		data_length += 4;
+		draw_info[4] = cond_render_ctrl.hw_cond_active ? 1 : 0;
+		data_size = 20;
 	}
 
-	vkCmdPushConstants(
-		*m_current_command_buffer,
-		m_program->layout(),
-		VK_SHADER_STAGE_VERTEX_BIT,
-		0,
-		data_length,
-		push_constants);
+	vkCmdPushConstants(*m_current_command_buffer, pipeline_layout, VK_SHADER_STAGE_VERTEX_BIT, 0, data_size, draw_info);
 
 	const usz data_offset = (id * 128) + m_vertex_layout_stream_info.offset;
 	auto dst = m_vertex_layout_ring_info.map(data_offset, 128);
 
-	m_draw_processor.fill_vertex_layout_state(
-		m_vertex_layout,
-		current_vp_metadata,
-		vertex_info.first_vertex,
-		vertex_info.allocated_vertex_count,
-		static_cast<s32*>(dst),
-		vertex_info.persistent_window_offset,
-		vertex_info.volatile_window_offset);
+	fill_vertex_layout_state(m_vertex_layout, vertex_info.first_vertex, vertex_info.allocated_vertex_count, static_cast<s32*>(dst),
+		vertex_info.persistent_window_offset, vertex_info.volatile_window_offset);
 
 	m_vertex_layout_ring_info.unmap();
 }
 
-void VKGSRender::patch_transform_constants(rsx::context* /*ctx*/, u32 index, u32 count)
-{
-	if (!m_program || !m_vertex_prog)
-	{
-		// Shouldn't be reachable, but handle it correctly anyway
-		m_graphics_state |= rsx::pipeline_state::transform_constants_dirty;
-		return;
-	}
-
-	if (!m_vertex_prog->overlaps_constants_range(index, count))
-	{
-		// Nothing meaningful to us
-		return;
-	}
-
-	// Buffer updates mid-pass violate the spec and destroy performance on NVIDIA
-	auto allocate_mem = [&](usz size) -> std::pair<void*, usz>
-	{
-		const usz alignment = m_device->gpu().get_limits().minStorageBufferOffsetAlignment;
-		m_xform_constants_dynamic_offset = m_transform_constants_ring_info.alloc<1>(utils::align(size, alignment));
-		return std::make_pair(m_transform_constants_ring_info.map(m_xform_constants_dynamic_offset, size), size);
-	};
-
-	rsx::io_buffer iobuf(allocate_mem);
-	upload_transform_constants(iobuf);
-}
-
 void VKGSRender::init_buffers(rsx::framebuffer_creation_context context, bool)
 {
 	prepare_rtts(context);
@@ -2279,14 +2045,14 @@ void VKGSRender::close_and_submit_command_buffer(vk::fence* pFence, VkSemaphore
 {
 	ensure(!m_queue_status.test_and_set(flush_queue_state::flushing));
 
-	// Host MM sync before executing anything on the GPU
-	rsx::mm_flush();
-
 	// Workaround for deadlock occuring during RSX offloader fault
 	// TODO: Restructure command submission infrastructure to avoid this condition
 	const bool sync_success = g_fxo->get<rsx::dma_manager>().sync();
 	const VkBool32 force_flush = !sync_success;
 
+	// Flush any asynchronously scheduled jobs
+	g_fxo->get<vk::async_scheduler_thread>().flush(force_flush);
+
 	if (vk::test_status_interrupt(vk::heap_dirty))
 	{
 		if (m_attrib_ring_info.is_dirty() ||
@@ -2298,28 +2064,26 @@ void VKGSRender::close_and_submit_command_buffer(vk::fence* pFence, VkSemaphore
 			m_index_buffer_ring_info.is_dirty() ||
 			m_transform_constants_ring_info.is_dirty() ||
 			m_texture_upload_buffer_ring_info.is_dirty() ||
-			m_raster_env_ring_info.is_dirty() ||
-			m_instancing_buffer_ring_info.is_dirty())
+			m_raster_env_ring_info.is_dirty())
 		{
-			auto secondary_command_buffer = m_secondary_cb_list.next();
-			secondary_command_buffer->begin();
+			std::lock_guard lock(m_secondary_cb_guard);
+			m_secondary_command_buffer.begin();
 
-			m_attrib_ring_info.sync(*secondary_command_buffer);
-			m_fragment_env_ring_info.sync(*secondary_command_buffer);
-			m_vertex_env_ring_info.sync(*secondary_command_buffer);
-			m_fragment_texture_params_ring_info.sync(*secondary_command_buffer);
-			m_vertex_layout_ring_info.sync(*secondary_command_buffer);
-			m_fragment_constants_ring_info.sync(*secondary_command_buffer);
-			m_index_buffer_ring_info.sync(*secondary_command_buffer);
-			m_transform_constants_ring_info.sync(*secondary_command_buffer);
-			m_texture_upload_buffer_ring_info.sync(*secondary_command_buffer);
-			m_raster_env_ring_info.sync(*secondary_command_buffer);
-			m_instancing_buffer_ring_info.sync(*secondary_command_buffer);
+			m_attrib_ring_info.sync(m_secondary_command_buffer);
+			m_fragment_env_ring_info.sync(m_secondary_command_buffer);
+			m_vertex_env_ring_info.sync(m_secondary_command_buffer);
+			m_fragment_texture_params_ring_info.sync(m_secondary_command_buffer);
+			m_vertex_layout_ring_info.sync(m_secondary_command_buffer);
+			m_fragment_constants_ring_info.sync(m_secondary_command_buffer);
+			m_index_buffer_ring_info.sync(m_secondary_command_buffer);
+			m_transform_constants_ring_info.sync(m_secondary_command_buffer);
+			m_texture_upload_buffer_ring_info.sync(m_secondary_command_buffer);
+			m_raster_env_ring_info.sync(m_secondary_command_buffer);
 
-			secondary_command_buffer->end();
+			m_secondary_command_buffer.end();
 
-			vk::queue_submit_t submit_info{ m_device->get_graphics_queue(), nullptr };
-			secondary_command_buffer->submit(submit_info, force_flush);
+			m_secondary_command_buffer.submit(m_device->get_graphics_queue(),
+				VK_NULL_HANDLE, VK_NULL_HANDLE, VK_NULL_HANDLE, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, force_flush);
 		}
 
 		vk::clear_status_interrupt(vk::heap_dirty);
@@ -2329,7 +2093,7 @@ void VKGSRender::close_and_submit_command_buffer(vk::fence* pFence, VkSemaphore
 	if (m_current_command_buffer->flags & vk::command_buffer::cb_has_conditional_render)
 	{
 		ensure(m_render_pass_open);
-		_vkCmdEndConditionalRenderingEXT(*m_current_command_buffer);
+		m_device->_vkCmdEndConditionalRenderingEXT(*m_current_command_buffer);
 	}
 #endif
 
@@ -2347,60 +2111,29 @@ void VKGSRender::close_and_submit_command_buffer(vk::fence* pFence, VkSemaphore
 		m_current_command_buffer->flags &= ~vk::command_buffer::cb_has_open_query;
 	}
 
-	if (m_host_dma_ctrl && m_host_dma_ctrl->host_ctx()->needs_label_release())
-	{
-		vkCmdUpdateBuffer(*m_current_command_buffer,
-			m_host_object_data->value,
-			::offset32(&vk::host_data_t::commands_complete_event),
-			sizeof(u64),
-			const_cast<u64*>(&m_host_dma_ctrl->host_ctx()->last_label_acquire_event));
-
-		m_host_dma_ctrl->host_ctx()->on_label_release();
-	}
-
 	m_current_command_buffer->end();
 	m_current_command_buffer->tag();
 
-	// Supporting concurrent access vastly simplifies this logic.
-	// Instead of doing CB slice injection, we can just chain these together logically with the async stream going first
-	vk::queue_submit_t primary_submit_info{ m_device->get_graphics_queue(), pFence };
-	vk::queue_submit_t secondary_submit_info{};
+	m_current_command_buffer->submit(m_device->get_graphics_queue(),
+		wait_semaphore, signal_semaphore, pFence, pipeline_stage_flags, force_flush);
 
-	if (wait_semaphore)
+	if (force_flush)
 	{
-		primary_submit_info.wait_on(wait_semaphore, pipeline_stage_flags);
+		ensure(m_current_command_buffer->submit_fence->flushed);
 	}
 
-	if (auto async_scheduler = g_fxo->try_get<vk::AsyncTaskScheduler>();
-		async_scheduler && async_scheduler->is_recording())
-	{
-		if (async_scheduler->is_host_mode())
-		{
-			const VkSemaphore async_sema = *async_scheduler->get_sema();
-			secondary_submit_info.queue_signal(async_sema);
-			primary_submit_info.wait_on(async_sema, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
-
-			// Delay object destruction by one cycle
-			vk::get_resource_manager()->push_down_current_scope();
-		}
-
-		async_scheduler->flush(secondary_submit_info, force_flush);
-	}
-
-	if (signal_semaphore)
-	{
-		primary_submit_info.queue_signal(signal_semaphore);
-	}
-
-	m_current_command_buffer->submit(primary_submit_info, force_flush);
-
 	m_queue_status.clear(flush_queue_state::flushing);
 }
 
+void VKGSRender::open_command_buffer()
+{
+	m_current_command_buffer->begin();
+}
+
 void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
 {
 	const bool clipped_scissor = (context == rsx::framebuffer_creation_context::context_draw);
-	if (m_current_framebuffer_context == context && !m_graphics_state.test(rsx::rtt_config_dirty) && m_draw_fbo)
+	if (m_current_framebuffer_context == context && !m_rtts_dirty && m_draw_fbo)
 	{
 		// Fast path
 		// Framebuffer usage has not changed, framebuffer exists and config regs have not changed
@@ -2408,14 +2141,12 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
 		return;
 	}
 
-	m_graphics_state.clear(
-		rsx::rtt_config_dirty |
-		rsx::rtt_config_contested |
-		rsx::rtt_config_valid |
-		rsx::rtt_cache_state_dirty);
+	m_rtts_dirty = false;
+	framebuffer_status_valid = false;
+	m_framebuffer_state_contested = false;
 
 	get_framebuffer_layout(context, m_framebuffer_layout);
-	if (!m_graphics_state.test(rsx::rtt_config_valid))
+	if (!framebuffer_status_valid)
 	{
 		return;
 	}
@@ -2445,7 +2176,7 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
 		// Flush old address if we keep missing it
 		if (m_surface_info[i].pitch && g_cfg.video.write_color_buffers)
 		{
-			const utils::address_range32 rsx_range = m_surface_info[i].get_memory_range();
+			const utils::address_range rsx_range = m_surface_info[i].get_memory_range();
 			m_texture_cache.set_memory_read_flags(rsx_range, rsx::memory_read_flags::flush_once);
 			m_texture_cache.flush_if_cache_miss_likely(*m_current_command_buffer, rsx_range);
 		}
@@ -2462,7 +2193,7 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
 	{
 		if (m_depth_surface_info.pitch && g_cfg.video.write_depth_buffer)
 		{
-			const utils::address_range32 surface_range = m_depth_surface_info.get_memory_range();
+			const utils::address_range surface_range = m_depth_surface_info.get_memory_range();
 			m_texture_cache.set_memory_read_flags(surface_range, rsx::memory_read_flags::flush_once);
 			m_texture_cache.flush_if_cache_miss_likely(*m_current_command_buffer, surface_range);
 		}
@@ -2523,30 +2254,51 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
 		m_rtts.superseded_surfaces.clear();
 	}
 
+	const auto color_fmt_info = get_compatible_gcm_format(m_framebuffer_layout.color_format);
+	for (u8 index : m_draw_buffers)
+	{
+		if (!m_surface_info[index].address || !m_surface_info[index].pitch) continue;
+
+		const utils::address_range surface_range = m_surface_info[index].get_memory_range();
+		if (g_cfg.video.write_color_buffers)
+		{
+			m_texture_cache.lock_memory_region(
+				*m_current_command_buffer, m_rtts.m_bound_render_targets[index].second, surface_range, true,
+				m_surface_info[index].width, m_surface_info[index].height, m_framebuffer_layout.actual_color_pitch[index],
+				color_fmt_info.first, color_fmt_info.second);
+		}
+		else
+		{
+			m_texture_cache.commit_framebuffer_memory_region(*m_current_command_buffer, surface_range);
+		}
+	}
+
+	if (m_depth_surface_info.address && m_depth_surface_info.pitch)
+	{
+		const utils::address_range surface_range = m_depth_surface_info.get_memory_range();
+		if (g_cfg.video.write_depth_buffer)
+		{
+			const u32 gcm_format = (m_depth_surface_info.depth_format == rsx::surface_depth_format::z16) ? CELL_GCM_TEXTURE_DEPTH16 : CELL_GCM_TEXTURE_DEPTH24_D8;
+			m_texture_cache.lock_memory_region(
+				*m_current_command_buffer, m_rtts.m_bound_depth_stencil.second, surface_range, true,
+				m_depth_surface_info.width, m_depth_surface_info.height, m_framebuffer_layout.actual_zeta_pitch, gcm_format, true);
+		}
+		else
+		{
+			m_texture_cache.commit_framebuffer_memory_region(*m_current_command_buffer, surface_range);
+		}
+	}
+
 	if (!m_rtts.orphaned_surfaces.empty())
 	{
 		u32 gcm_format;
 		bool swap_bytes;
 
-		for (auto& [base_addr, surface] : m_rtts.orphaned_surfaces)
+		for (auto& surface : m_rtts.orphaned_surfaces)
 		{
-			bool lock = surface->is_depth_surface() ? !!g_cfg.video.write_depth_buffer :
+			const bool lock = surface->is_depth_surface() ? !!g_cfg.video.write_depth_buffer :
 				!!g_cfg.video.write_color_buffers;
 
-			if (lock &&
-#ifdef TEXTURE_CACHE_DEBUG
-				!m_texture_cache.is_protected(
-					base_addr,
-					surface->get_memory_range(),
-					rsx::texture_upload_context::framebuffer_storage)
-#else
-				!surface->is_locked()
-#endif
-				)
-			{
-				lock = false;
-			}
-
 			if (!lock) [[likely]]
 			{
 				m_texture_cache.commit_framebuffer_memory_region(*m_current_command_buffer, surface->get_memory_range());
@@ -2567,48 +2319,13 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
 
 			m_texture_cache.lock_memory_region(
 				*m_current_command_buffer, surface, surface->get_memory_range(), false,
-				surface->get_surface_width<rsx::surface_metrics::pixels>(), surface->get_surface_height<rsx::surface_metrics::pixels>(), surface->get_rsx_pitch(),
+				surface->get_surface_width(rsx::surface_metrics::pixels), surface->get_surface_height(rsx::surface_metrics::pixels), surface->get_rsx_pitch(),
 				gcm_format, swap_bytes);
 		}
 
 		m_rtts.orphaned_surfaces.clear();
 	}
 
-	const auto color_fmt_info = get_compatible_gcm_format(m_framebuffer_layout.color_format);
-	for (u8 index : m_draw_buffers)
-	{
-		if (!m_surface_info[index].address || !m_surface_info[index].pitch) continue;
-
-		const utils::address_range32 surface_range = m_surface_info[index].get_memory_range();
-		if (g_cfg.video.write_color_buffers)
-		{
-			m_texture_cache.lock_memory_region(
-				*m_current_command_buffer, m_rtts.m_bound_render_targets[index].second, surface_range, true,
-				m_surface_info[index].width, m_surface_info[index].height, m_framebuffer_layout.actual_color_pitch[index],
-				color_fmt_info.first, color_fmt_info.second);
-		}
-		else
-		{
-			m_texture_cache.commit_framebuffer_memory_region(*m_current_command_buffer, surface_range);
-		}
-	}
-
-	if (m_depth_surface_info.address && m_depth_surface_info.pitch)
-	{
-		const utils::address_range32 surface_range = m_depth_surface_info.get_memory_range();
-		if (g_cfg.video.write_depth_buffer)
-		{
-			const u32 gcm_format = (m_depth_surface_info.depth_format == rsx::surface_depth_format::z16) ? CELL_GCM_TEXTURE_DEPTH16 : CELL_GCM_TEXTURE_DEPTH24_D8;
-			m_texture_cache.lock_memory_region(
-				*m_current_command_buffer, m_rtts.m_bound_depth_stencil.second, surface_range, true,
-				m_depth_surface_info.width, m_depth_surface_info.height, m_framebuffer_layout.actual_zeta_pitch, gcm_format, true);
-		}
-		else
-		{
-			m_texture_cache.commit_framebuffer_memory_region(*m_current_command_buffer, surface_range);
-		}
-	}
-
 	m_current_renderpass_key = vk::get_renderpass_key(m_fbo_images);
 	m_cached_renderpass = vk::get_renderpass(*m_device, m_current_renderpass_key);
 
@@ -2636,8 +2353,8 @@ void VKGSRender::renderctl(u32 request_code, void* args)
 	{
 	case vk::rctrl_queue_submit:
 	{
-		const auto packet = reinterpret_cast<vk::queue_submit_t*>(args);
-		vk::queue_submit(packet);
+		auto packet = reinterpret_cast<vk::submit_packet*>(args);
+		vk::queue_submit(packet->queue, &packet->submit_info, packet->pfence, VK_TRUE);
 		free(packet);
 		break;
 	}
@@ -2648,15 +2365,18 @@ void VKGSRender::renderctl(u32 request_code, void* args)
 		break;
 	}
 	default:
-		rsx::thread::renderctl(request_code, args);
+		fmt::throw_exception("Unhandled request code 0x%x", request_code);
 	}
 }
 
-bool VKGSRender::scaled_image_from_memory(const rsx::blit_src_info& src, const rsx::blit_dst_info& dst, bool interpolate)
+bool VKGSRender::scaled_image_from_memory(rsx::blit_src_info& src, rsx::blit_dst_info& dst, bool interpolate)
 {
 	if (swapchain_unavailable)
 		return false;
 
+	// Verify enough memory exists before attempting to handle data transfer
+	check_heap_status(VK_HEAP_CHECK_TEXTURE_UPLOAD_STORAGE);
+
 	if (m_texture_cache.blit(src, dst, interpolate, m_rtts, *m_current_command_buffer))
 	{
 		m_samplers_dirty.store(true);
@@ -2692,14 +2412,6 @@ void VKGSRender::end_occlusion_query(rsx::reports::occlusion_query_info* query)
 	// NOTE: flushing the queue is very expensive, do not flush just because query stopped
 	if (m_current_command_buffer->flags & vk::command_buffer::cb_has_open_query)
 	{
-		// VK_1_0 rules dictate that query must match subpass behavior on begin/end query.
-		// This is slow, so only do this for drivers that care.
-		if (vk::use_strict_query_scopes() &&
-			vk::is_renderpass_open(*m_current_command_buffer))
-		{
-			vk::end_renderpass(*m_current_command_buffer);
-		}
-
 		// End query
 		auto open_query = m_occlusion_map[m_active_query_info->driver_handle].indices.back();
 		m_occlusion_query_manager->end_query(*m_current_command_buffer, open_query);
@@ -2725,7 +2437,7 @@ bool VKGSRender::check_occlusion_query_status(rsx::reports::occlusion_query_info
 	if (data.is_current(m_current_command_buffer))
 		return false;
 
-	const u32 oldest = data.indices.front();
+	u32 oldest = data.indices.front();
 	return m_occlusion_query_manager->check_query_status(oldest);
 }
 
@@ -2747,7 +2459,7 @@ void VKGSRender::get_occlusion_query_result(rsx::reports::occlusion_query_info*
 				m_flush_requests.clear_pending_flag();
 			}
 
-			rsx_log.warning("[Performance warning] Unexpected ZCULL read caused a hard sync");
+			rsx_log.error("[Performance warning] Unexpected ZCULL read caused a hard sync");
 			busy_wait();
 		}
 
@@ -2756,10 +2468,10 @@ void VKGSRender::get_occlusion_query_result(rsx::reports::occlusion_query_info*
 		// Gather data
 		for (const auto occlusion_id : data.indices)
 		{
-			query->result += m_occlusion_query_manager->get_query_result(occlusion_id);
-			if (query->result && !g_cfg.video.precise_zpass_count)
+			// We only need one hit
+			if (m_occlusion_query_manager->get_query_result(occlusion_id))
 			{
-				// We only need one hit unless precise zcull is requested
+				query->result = 1;
 				break;
 			}
 		}
@@ -2842,18 +2554,6 @@ void VKGSRender::begin_conditional_rendering(const std::vector<rsx::reports::occ
 
 	VkPipelineStageFlags dst_stage;
 	VkAccessFlags dst_access;
-	u32 dst_offset = 0;
-	u32 num_hw_queries = 0;
-	usz first = 0;
-	usz last = (!partial_eval) ? sources.size() : 1;
-
-	// Count number of queries available. This is an "opening" evaluation, if there is only one source, read it as-is.
-	// The idea is to avoid scheduling a compute task unless we have to.
-	for (usz i = first; i < last; ++i)
-	{
-		auto& query_info = m_occlusion_map[sources[i]->driver_handle];
-		num_hw_queries += ::size32(query_info.indices);
-	}
 
 	if (m_device->get_conditional_render_support())
 	{
@@ -2866,93 +2566,56 @@ void VKGSRender::begin_conditional_rendering(const std::vector<rsx::reports::occ
 		dst_access = VK_ACCESS_SHADER_READ_BIT;
 	}
 
-	if (num_hw_queries == 1 && !partial_eval) [[ likely ]]
+	if (sources.size() == 1)
 	{
-		// Accept the first available query handle as the source of truth. No aggregation is required.
-		for (usz i = first; i < last; ++i)
+		const auto query = sources.front();
+		const auto& query_info = m_occlusion_map[query->driver_handle];
+
+		if (query_info.indices.size() == 1)
 		{
-			auto& query_info = m_occlusion_map[sources[i]->driver_handle];
-			if (!query_info.indices.empty())
-			{
-				const auto& index = query_info.indices.front();
-				m_occlusion_query_manager->get_query_result_indirect(*m_current_command_buffer, index, 1, m_cond_render_buffer->value, 0);
+			const auto& index = query_info.indices.front();
+			m_occlusion_query_manager->get_query_result_indirect(*m_current_command_buffer, index, m_cond_render_buffer->value, 0);
 
-				vk::insert_buffer_memory_barrier(*m_current_command_buffer, m_cond_render_buffer->value, 0, 4,
-					VK_PIPELINE_STAGE_TRANSFER_BIT, dst_stage,
-					VK_ACCESS_TRANSFER_WRITE_BIT, dst_access);
+			vk::insert_buffer_memory_barrier(*m_current_command_buffer, m_cond_render_buffer->value, 0, 4,
+				VK_PIPELINE_STAGE_TRANSFER_BIT, dst_stage,
+				VK_ACCESS_TRANSFER_WRITE_BIT, dst_access);
 
-				rsx::thread::begin_conditional_rendering(sources);
-				return;
-			}
+			rsx::thread::begin_conditional_rendering(sources);
+			return;
 		}
-
-		// This is unreachable unless something went horribly wrong
-		fmt::throw_exception("Unreachable");
 	}
-	else if (num_hw_queries > 0)
+
+	auto scratch = vk::get_scratch_buffer(OCCLUSION_MAX_POOL_SIZE * 4);
+	u32 dst_offset = 0;
+	usz first = 0;
+	usz last;
+
+	if (!partial_eval) [[likely]]
 	{
-		// We'll need to do some result aggregation using a compute shader.
-		auto scratch = vk::get_scratch_buffer(*m_current_command_buffer, num_hw_queries * 4);
+		last = sources.size();
+	}
+	else
+	{
+		last = 1;
+	}
 
-		// Range latching. Because of how the query pool manages allocations using a stack, we get an inverse sequential set of handles/indices that we can easily group together.
-		// This drastically boosts performance on some drivers like the NVIDIA proprietary one that seems to have a rather high cost for every individual query transer command.
-		struct { u32 first, last; } query_range = { umax, 0 };
-
-		auto copy_query_range_impl = [&]()
+	for (usz i = first; i < last; ++i)
+	{
+		auto& query_info = m_occlusion_map[sources[i]->driver_handle];
+		for (const auto& index : query_info.indices)
 		{
-			const auto count = (query_range.last - query_range.first + 1);
-			m_occlusion_query_manager->get_query_result_indirect(*m_current_command_buffer, query_range.first, count, scratch->value, dst_offset);
-			dst_offset += count * 4;
-		};
-
-		for (usz i = first; i < last; ++i)
-		{
-			auto& query_info = m_occlusion_map[sources[i]->driver_handle];
-			for (const auto& index : query_info.indices)
-			{
-				// First iteration?
-				if (query_range.first == umax)
-				{
-					query_range = { index, index };
-					continue;
-				}
-
-				// Head?
-				if ((query_range.first - 1) == index)
-				{
-					query_range.first = index;
-					continue;
-				}
-
-				// Tail?
-				if ((query_range.last + 1) == index)
-				{
-					query_range.last = index;
-					continue;
-				}
-
-				// Flush pending queue. In practice, this is never reached and we fall out to the spill block outside the loops
-				copy_query_range_impl();
-
-				// Start a new range for the current index
-				query_range = { index, index };
-			}
+			m_occlusion_query_manager->get_query_result_indirect(*m_current_command_buffer, index, scratch->value, dst_offset);
+			dst_offset += 4;
 		}
+	}
 
-		if (query_range.first != umax)
-		{
-			// Dangling queries, flush
-			copy_query_range_impl();
-		}
-
-		// Sanity check
-		ensure(dst_offset <= scratch->size());
+	if (dst_offset)
+	{
+		// Fast path should have been caught above
+		ensure(dst_offset > 4);
 
 		if (!partial_eval)
 		{
-			// Fast path should have been caught above
-			ensure(dst_offset > 4);
-
 			// Clear result to zero
 			vkCmdFillBuffer(*m_current_command_buffer, m_cond_render_buffer->value, 0, 4, 0);
 
@@ -2974,7 +2637,7 @@ void VKGSRender::begin_conditional_rendering(const std::vector<rsx::reports::occ
 	else if (m_program)
 	{
 		// This can sometimes happen when shaders are compiling, only log if there is a program hit
-		rsx_log.warning("Dubious query data pushed to cond render! Please report to developers(q.pending=%d)", sources.front()->pending);
+		rsx_log.warning("Dubious query data pushed to cond render!, Please report to developers(q.pending=%d)", sources.front()->pending);
 	}
 
 	rsx::thread::begin_conditional_rendering(sources);
diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h
index 107da8ebf2..e6bfbd744f 100644
--- a/rpcs3/Emu/RSX/VK/VKGSRender.h
+++ b/rpcs3/Emu/RSX/VK/VKGSRender.h
@@ -1,42 +1,363 @@
 #pragma once
+#include "Emu/RSX/GSRender.h"
+#include "Emu/Cell/timers.hpp"
 
 #include "upscalers/upscaling.h"
 
-#include "vkutils/descriptors.h"
+#include "vkutils/descriptors.hpp"
 #include "vkutils/data_heap.h"
-#include "vkutils/instance.h"
+#include "vkutils/instance.hpp"
 #include "vkutils/sync.h"
-#include "vkutils/swapchain.h"
+#include "vkutils/swapchain.hpp"
 
-#include "VKGSRenderTypes.hpp"
 #include "VKTextureCache.h"
 #include "VKRenderTargets.h"
 #include "VKFormats.h"
+#include "VKTextOut.h"
 #include "VKOverlays.h"
 #include "VKProgramBuffer.h"
 #include "VKFramebuffer.h"
 #include "VKShaderInterpreter.h"
 #include "VKQueryPool.h"
+#include "../GCM.h"
 
-#include "Emu/RSX/GSRender.h"
-#include "Emu/RSX/Host/RSXDMAWriter.h"
-#include <functional>
-#include <initializer_list>
+#include <thread>
+#include <optional>
+
+namespace vk
+{
+	using vertex_cache = rsx::vertex_cache::default_vertex_cache<rsx::vertex_cache::uploaded_range<VkFormat>, VkFormat>;
+	using weak_vertex_cache = rsx::vertex_cache::weak_vertex_cache<VkFormat>;
+	using null_vertex_cache = vertex_cache;
+
+	using shader_cache = rsx::shaders_cache<vk::pipeline_props, vk::program_cache>;
+
+	struct vertex_upload_info
+	{
+		VkPrimitiveTopology primitive;
+		u32 vertex_draw_count;
+		u32 allocated_vertex_count;
+		u32 first_vertex;
+		u32 vertex_index_base;
+		u32 vertex_index_offset;
+		u32 persistent_window_offset;
+		u32 volatile_window_offset;
+		std::optional<std::tuple<VkDeviceSize, VkIndexType>> index_info;
+	};
+}
+
+// Initial heap allocation values. The heaps are growable and will automatically increase in size to accomodate demands
+#define VK_ATTRIB_RING_BUFFER_SIZE_M 64
+#define VK_TEXTURE_UPLOAD_RING_BUFFER_SIZE_M 64
+#define VK_UBO_RING_BUFFER_SIZE_M 16
+#define VK_TRANSFORM_CONSTANTS_BUFFER_SIZE_M 16
+#define VK_FRAGMENT_CONSTANTS_BUFFER_SIZE_M 16
+#define VK_INDEX_RING_BUFFER_SIZE_M 16
+
+#define VK_MAX_ASYNC_CB_COUNT 256
+#define VK_MAX_ASYNC_FRAMES 2
+
+using rsx::flags32_t;
+
+namespace vk
+{
+	struct buffer_view;
+
+	struct command_buffer_chunk: public vk::command_buffer
+	{
+		vk::fence* submit_fence = nullptr;
+		VkDevice m_device = VK_NULL_HANDLE;
+
+		atomic_t<bool> pending = { false };
+		u64 eid_tag = 0;
+		u64 reset_id = 0;
+		shared_mutex guard_mutex;
+
+		command_buffer_chunk() = default;
+
+		void init_fence(VkDevice dev)
+		{
+			m_device = dev;
+			submit_fence = new vk::fence(dev);
+		}
+
+		void destroy()
+		{
+			vk::command_buffer::destroy();
+			delete submit_fence;
+		}
+
+		void tag()
+		{
+			eid_tag = vk::get_event_id();
+		}
+
+		void reset()
+		{
+			if (pending)
+				poke();
+
+			if (pending)
+				wait(FRAME_PRESENT_TIMEOUT);
+
+			++reset_id;
+			CHECK_RESULT(vkResetCommandBuffer(commands, 0));
+		}
+
+		bool poke()
+		{
+			reader_lock lock(guard_mutex);
+
+			if (!pending)
+				return true;
+
+			if (!submit_fence->flushed)
+				return false;
+
+			if (vkGetFenceStatus(m_device, submit_fence->handle) == VK_SUCCESS)
+			{
+				lock.upgrade();
+
+				if (pending)
+				{
+					submit_fence->reset();
+					vk::on_event_completed(eid_tag);
+
+					pending = false;
+					eid_tag = 0;
+				}
+			}
+
+			return !pending;
+		}
+
+		VkResult wait(u64 timeout = 0ull)
+		{
+			reader_lock lock(guard_mutex);
+
+			if (!pending)
+				return VK_SUCCESS;
+
+			const auto ret = vk::wait_for_fence(submit_fence, timeout);
+
+			lock.upgrade();
+
+			if (pending)
+			{
+				submit_fence->reset();
+				vk::on_event_completed(eid_tag);
+
+				pending = false;
+				eid_tag = 0;
+			}
+
+			return ret;
+		}
+
+		void flush()
+		{
+			reader_lock lock(guard_mutex);
+
+			if (!pending)
+				return;
+
+			submit_fence->wait_flush();
+		}
+	};
+
+	struct occlusion_data
+	{
+		rsx::simple_array<u32> indices;
+		command_buffer_chunk* command_buffer_to_wait = nullptr;
+		u64 command_buffer_sync_id = 0;
+
+		bool is_current(command_buffer_chunk* cmd) const
+		{
+			return (command_buffer_to_wait == cmd && command_buffer_sync_id == cmd->reset_id);
+		}
+
+		void set_sync_command_buffer(command_buffer_chunk* cmd)
+		{
+			command_buffer_to_wait = cmd;
+			command_buffer_sync_id = cmd->reset_id;
+		}
+
+		void sync()
+		{
+			if (command_buffer_to_wait->reset_id == command_buffer_sync_id)
+			{
+				// Allocation stack is FIFO and very long so no need to actually wait for fence signal
+				command_buffer_to_wait->flush();
+			}
+		}
+	};
+
+	struct frame_context_t
+	{
+		VkSemaphore acquire_signal_semaphore = VK_NULL_HANDLE;
+		VkSemaphore present_wait_semaphore = VK_NULL_HANDLE;
+		VkDescriptorSet descriptor_set = VK_NULL_HANDLE;
+
+		vk::descriptor_pool descriptor_pool;
+		u32 used_descriptors = 0;
+
+		flags32_t flags = 0;
+
+		std::vector<std::unique_ptr<vk::buffer_view>> buffer_views_to_clean;
+
+		u32 present_image = -1;
+		command_buffer_chunk* swap_command_buffer = nullptr;
+
+		//Heap pointers
+		s64 attrib_heap_ptr = 0;
+		s64 vtx_env_heap_ptr = 0;
+		s64 frag_env_heap_ptr = 0;
+		s64 frag_const_heap_ptr = 0;
+		s64 vtx_const_heap_ptr = 0;
+		s64 vtx_layout_heap_ptr = 0;
+		s64 frag_texparam_heap_ptr = 0;
+		s64 index_heap_ptr = 0;
+		s64 texture_upload_heap_ptr = 0;
+		s64 rasterizer_env_heap_ptr = 0;
+
+		u64 last_frame_sync_time = 0;
+
+		//Copy shareable information
+		void grab_resources(frame_context_t &other)
+		{
+			present_wait_semaphore = other.present_wait_semaphore;
+			acquire_signal_semaphore = other.acquire_signal_semaphore;
+			descriptor_set = other.descriptor_set;
+			descriptor_pool = other.descriptor_pool;
+			used_descriptors = other.used_descriptors;
+			flags = other.flags;
+
+			attrib_heap_ptr = other.attrib_heap_ptr;
+			vtx_env_heap_ptr = other.vtx_env_heap_ptr;
+			frag_env_heap_ptr = other.frag_env_heap_ptr;
+			vtx_layout_heap_ptr = other.vtx_layout_heap_ptr;
+			frag_texparam_heap_ptr = other.frag_texparam_heap_ptr;
+			frag_const_heap_ptr = other.frag_const_heap_ptr;
+			vtx_const_heap_ptr = other.vtx_const_heap_ptr;
+			index_heap_ptr = other.index_heap_ptr;
+			texture_upload_heap_ptr = other.texture_upload_heap_ptr;
+			rasterizer_env_heap_ptr = other.rasterizer_env_heap_ptr;
+		}
+
+		//Exchange storage (non-copyable)
+		void swap_storage(frame_context_t &other)
+		{
+			std::swap(buffer_views_to_clean, other.buffer_views_to_clean);
+		}
+
+		void tag_frame_end(
+			s64 attrib_loc, s64 vtxenv_loc, s64 fragenv_loc, s64 vtxlayout_loc,
+			s64 fragtex_loc, s64 fragconst_loc,s64 vtxconst_loc, s64 index_loc,
+			s64 texture_loc, s64 rasterizer_loc)
+		{
+			attrib_heap_ptr = attrib_loc;
+			vtx_env_heap_ptr = vtxenv_loc;
+			frag_env_heap_ptr = fragenv_loc;
+			vtx_layout_heap_ptr = vtxlayout_loc;
+			frag_texparam_heap_ptr = fragtex_loc;
+			frag_const_heap_ptr = fragconst_loc;
+			vtx_const_heap_ptr = vtxconst_loc;
+			index_heap_ptr = index_loc;
+			texture_upload_heap_ptr = texture_loc;
+			rasterizer_env_heap_ptr = rasterizer_loc;
+
+			last_frame_sync_time = get_system_time();
+		}
+
+		void reset_heap_ptrs()
+		{
+			last_frame_sync_time = 0;
+		}
+	};
+
+	struct flush_request_task
+	{
+		atomic_t<bool> pending_state{ false };  //Flush request status; true if rsx::thread is yet to service this request
+		atomic_t<int> num_waiters{ 0 };  //Number of threads waiting for this request to be serviced
+		bool hard_sync = false;
+
+		flush_request_task() = default;
+
+		void post(bool _hard_sync)
+		{
+			hard_sync = (hard_sync || _hard_sync);
+			pending_state = true;
+			num_waiters++;
+		}
+
+		void remove_one()
+		{
+			num_waiters--;
+		}
+
+		void clear_pending_flag()
+		{
+			hard_sync = false;
+			pending_state.store(false);
+		}
+
+		bool pending() const
+		{
+			return pending_state.load();
+		}
+
+		void consumer_wait() const
+		{
+			while (num_waiters.load() != 0)
+			{
+#ifdef _MSC_VER
+				_mm_pause();
+#else
+				__builtin_ia32_pause();
+#endif
+			}
+		}
+
+		void producer_wait() const
+		{
+			while (pending_state.load())
+			{
+				std::this_thread::yield();
+			}
+		}
+	};
+
+	struct present_surface_info
+	{
+		u32 address;
+		u32 format;
+		u32 width;
+		u32 height;
+		u32 pitch;
+	};
+}
 
 using namespace vk::vmm_allocation_pool_; // clang workaround.
 using namespace vk::upscaling_flags_;     // ditto
 
-using vs_binding_table_t = decltype(VKVertexProgram::binding_table);
-using fs_binding_table_t = decltype(VKFragmentProgram::binding_table);
-
-namespace vk
-{
-	using host_data_t = rsx::host_gpu_context_t;
-}
-
 class VKGSRender : public GSRender, public ::rsx::reports::ZCULL_control
 {
 private:
+	enum
+	{
+		VK_HEAP_CHECK_TEXTURE_UPLOAD_STORAGE = 0x1,
+		VK_HEAP_CHECK_VERTEX_STORAGE = 0x2,
+		VK_HEAP_CHECK_VERTEX_ENV_STORAGE = 0x4,
+		VK_HEAP_CHECK_FRAGMENT_ENV_STORAGE = 0x8,
+		VK_HEAP_CHECK_TEXTURE_ENV_STORAGE = 0x10,
+		VK_HEAP_CHECK_VERTEX_LAYOUT_STORAGE = 0x20,
+		VK_HEAP_CHECK_TRANSFORM_CONSTANTS_STORAGE = 0x40,
+		VK_HEAP_CHECK_FRAGMENT_CONSTANTS_STORAGE = 0x80,
+
+		VK_HEAP_CHECK_MAX_ENUM = VK_HEAP_CHECK_FRAGMENT_CONSTANTS_STORAGE,
+		VK_HEAP_CHECK_ALL = 0xFF,
+	};
+
 	enum frame_context_state : u32
 	{
 		dirty = 1
@@ -50,23 +371,19 @@ private:
 	};
 
 private:
-	const VKFragmentProgram *m_fragment_prog = nullptr;
-	const VKVertexProgram *m_vertex_prog = nullptr;
+	VKFragmentProgram m_fragment_prog;
+	VKVertexProgram m_vertex_prog;
 	vk::glsl::program *m_program = nullptr;
-	vk::glsl::program *m_prev_program = nullptr;
 	vk::pipeline_props m_pipeline_properties;
 
-	const vs_binding_table_t* m_vs_binding_table = nullptr;
-	const fs_binding_table_t* m_fs_binding_table = nullptr;
-
 	vk::texture_cache m_texture_cache;
 	vk::surface_cache m_rtts;
 
 	std::unique_ptr<vk::buffer> null_buffer;
 	std::unique_ptr<vk::buffer_view> null_buffer_view;
 
+	std::unique_ptr<vk::text_writer> m_text_writer;
 	std::unique_ptr<vk::upscaler> m_upscaler;
-	output_scaling_mode m_output_scaling{output_scaling_mode::bilinear};
 
 	std::unique_ptr<vk::buffer> m_cond_render_buffer;
 	u64 m_cond_render_sync_tag = 0;
@@ -74,6 +391,8 @@ private:
 	shared_mutex m_sampler_mutex;
 	atomic_t<bool> m_samplers_dirty = { true };
 	std::unique_ptr<vk::sampler> m_stencil_mirror_sampler;
+	std::array<std::unique_ptr<rsx::sampled_image_descriptor_base>, rsx::limits::fragment_textures_count> fs_sampler_state = {};
+	std::array<std::unique_ptr<rsx::sampled_image_descriptor_base>, rsx::limits::vertex_textures_count> vs_sampler_state = {};
 	std::array<vk::sampler*, rsx::limits::fragment_textures_count> fs_sampler_handles{};
 	std::array<vk::sampler*, rsx::limits::vertex_textures_count> vs_sampler_handles{};
 
@@ -81,11 +400,6 @@ private:
 	std::unique_ptr<vk::buffer_view> m_volatile_attribute_storage;
 	std::unique_ptr<vk::buffer_view> m_vertex_layout_storage;
 
-	VkDependencyInfoKHR m_async_compute_dependency_info {};
-	VkMemoryBarrier2KHR m_async_compute_memory_barrier {};
-
-	std::pair<const vs_binding_table_t*, const fs_binding_table_t*> get_binding_table() const;
-
 public:
 	//vk::fbo draw_fbo;
 	std::unique_ptr<vk::vertex_cache> m_vertex_cache;
@@ -99,6 +413,7 @@ private:
 	vk::render_device *m_device;
 
 	//Vulkan internals
+	vk::command_pool m_command_buffer_pool;
 	std::unique_ptr<vk::query_pool_manager> m_occlusion_query_manager;
 	bool m_occlusion_query_active = false;
 	rsx::reports::occlusion_query_info *m_active_query_info = nullptr;
@@ -106,13 +421,15 @@ private:
 
 	shared_mutex m_secondary_cb_guard;
 	vk::command_pool m_secondary_command_buffer_pool;
-	vk::command_buffer_chain<VK_MAX_ASYNC_CB_COUNT> m_secondary_cb_list;
+	vk::command_buffer m_secondary_command_buffer;  //command buffer used for setup operations
 
-	vk::command_pool m_command_buffer_pool;
-	vk::command_buffer_chain<VK_MAX_ASYNC_CB_COUNT> m_primary_cb_list;
+	u32 m_current_cb_index = 0;
+	std::array<vk::command_buffer_chunk, VK_MAX_ASYNC_CB_COUNT> m_primary_cb_list;
 	vk::command_buffer_chunk* m_current_command_buffer = nullptr;
 
-	std::unique_ptr<vk::buffer> m_host_object_data;
+	VkDescriptorSetLayout descriptor_layouts;
+	VkPipelineLayout pipeline_layout;
+
 	vk::framebuffer_holder* m_draw_fbo = nullptr;
 
 	sizeu m_swapchain_dims{};
@@ -132,26 +449,20 @@ private:
 	vk::data_heap m_index_buffer_ring_info;            // Index data
 	vk::data_heap m_texture_upload_buffer_ring_info;   // Texture upload heap
 	vk::data_heap m_raster_env_ring_info;              // Raster control such as polygon and line stipple
-	vk::data_heap m_instancing_buffer_ring_info;       // Instanced rendering data (constants indirection table + instanced constants)
 
 	vk::data_heap m_fragment_instructions_buffer;
 	vk::data_heap m_vertex_instructions_buffer;
 
-	VkDescriptorBufferInfo m_vertex_env_buffer_info {};
-	VkDescriptorBufferInfo m_fragment_env_buffer_info {};
-	VkDescriptorBufferInfo m_vertex_layout_stream_info {};
-	VkDescriptorBufferInfo m_vertex_constants_buffer_info {};
-	VkDescriptorBufferInfo m_fragment_constants_buffer_info {};
-	VkDescriptorBufferInfo m_fragment_texture_params_buffer_info {};
-	VkDescriptorBufferInfo m_raster_env_buffer_info {};
-	VkDescriptorBufferInfo m_instancing_indirection_buffer_info {};
-	VkDescriptorBufferInfo m_instancing_constants_array_buffer_info{};
+	VkDescriptorBufferInfo m_vertex_env_buffer_info;
+	VkDescriptorBufferInfo m_fragment_env_buffer_info;
+	VkDescriptorBufferInfo m_vertex_layout_stream_info;
+	VkDescriptorBufferInfo m_vertex_constants_buffer_info;
+	VkDescriptorBufferInfo m_fragment_constants_buffer_info;
+	VkDescriptorBufferInfo m_fragment_texture_params_buffer_info;
+	VkDescriptorBufferInfo m_raster_env_buffer_info;
 
-	VkDescriptorBufferInfo m_vertex_instructions_buffer_info {};
-	VkDescriptorBufferInfo m_fragment_instructions_buffer_info {};
-
-	rsx::simple_array<u8> m_multidraw_parameters_buffer;
-	u64 m_xform_constants_dynamic_offset = 0;          // We manage transform_constants dynamic offset manually to alleviate performance penalty of doing a hot-patch of constants.
+	VkDescriptorBufferInfo m_vertex_instructions_buffer_info;
+	VkDescriptorBufferInfo m_fragment_instructions_buffer_info;
 
 	std::array<vk::frame_context_t, VK_MAX_ASYNC_FRAMES> frame_context_storage;
 	//Temp frame context to use if the real frame queue is overburdened. Only used for storage
@@ -161,22 +472,20 @@ private:
 	vk::frame_context_t* m_current_frame = nullptr;
 	std::deque<vk::frame_context_t*> m_queued_frames;
 
-	VkViewport m_viewport {};
-	VkRect2D m_scissor {};
+	VkViewport m_viewport{};
+	VkRect2D m_scissor{};
 
 	std::vector<u8> m_draw_buffers;
 
 	shared_mutex m_flush_queue_mutex;
 	vk::flush_request_task m_flush_requests;
 
-	ullong m_last_cond_render_eval_hint = 0;
-
 	// Offloader thread deadlock recovery
 	rsx::atomic_bitmask_t<flush_queue_state> m_queue_status;
-	utils::address_range32 m_offloader_fault_range;
+	utils::address_range m_offloader_fault_range;
 	rsx::invalidation_cause m_offloader_fault_cause;
 
-	vk::draw_call_t m_current_draw {};
+	u32 m_current_subdraw_id = 0;
 	u64 m_current_renderpass_key = 0;
 	VkRenderPass m_cached_renderpass = VK_NULL_HANDLE;
 	std::vector<vk::image*> m_fbo_images;
@@ -193,14 +502,13 @@ private:
 
 public:
 	u64 get_cycles() final;
+	VKGSRender();
 	~VKGSRender() override;
 
-	VKGSRender(utils::serial* ar) noexcept;
-	VKGSRender() noexcept : VKGSRender(nullptr) {}
-
 private:
 	void prepare_rtts(rsx::framebuffer_creation_context context);
 
+	void open_command_buffer();
 	void close_and_submit_command_buffer(
 		vk::fence* fence = nullptr,
 		VkSemaphore wait_semaphore = VK_NULL_HANDLE,
@@ -209,7 +517,7 @@ private:
 
 	void flush_command_queue(bool hard_sync = false, bool do_not_switch = false);
 	void queue_swap_request();
-	void frame_context_cleanup(vk::frame_context_t *ctx);
+	void frame_context_cleanup(vk::frame_context_t *ctx, bool free_resources = false);
 	void advance_queued_frames();
 	void present(vk::frame_context_t *ctx);
 	void reinitialize_swapchain();
@@ -221,19 +529,22 @@ private:
 	VkRenderPass get_render_pass();
 
 	void update_draw_state();
+
+	void check_heap_status(u32 flags = VK_HEAP_CHECK_ALL);
 	void check_present_status();
 
+	void check_descriptors();
+	VkDescriptorSet allocate_descriptor_set();
+
 	vk::vertex_upload_info upload_vertex_data();
-	rsx::simple_array<u8> m_scratch_mem;
 
 	bool load_program();
 	void load_program_env();
 	void update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_info);
-	void upload_transform_constants(const rsx::io_buffer& buffer);
 
 	void load_texture_env();
-	bool bind_texture_env();
-	bool bind_interpreter_texture_env();
+	void bind_texture_env();
+	void bind_interpreter_texture_env();
 
 public:
 	void init_buffers(rsx::framebuffer_creation_context context, bool skip_reading = false);
@@ -241,8 +552,7 @@ public:
 	void set_scissor(bool clip_viewport);
 	void bind_viewport();
 
-	void sync_hint(rsx::FIFO::interrupt_hint hint, rsx::reports::sync_hint_payload_t payload) override;
-	bool release_GCM_label(u32 address, u32 data) override;
+	void sync_hint(rsx::FIFO_hint hint, void* args) override;
 
 	void begin_occlusion_query(rsx::reports::occlusion_query_info* query) override;
 	void end_occlusion_query(rsx::reports::occlusion_query_info* query) override;
@@ -256,23 +566,10 @@ public:
 	// External callback to handle out of video memory problems
 	bool on_vram_exhausted(rsx::problem_severity severity);
 
-	// Handle pool creation failure due to fragmentation
-	void on_descriptor_pool_fragmentation(bool is_fatal);
-
 	// Conditional rendering
 	void begin_conditional_rendering(const std::vector<rsx::reports::occlusion_query_info*>& sources) override;
 	void end_conditional_rendering() override;
 
-	// Host sync object
-	std::pair<volatile vk::host_data_t*, VkBuffer> map_host_object_data() const;
-	void on_guest_texture_read(const vk::command_buffer& cmd);
-
-	// GRAPH backend
-	void patch_transform_constants(rsx::context* ctx, u32 index, u32 count) override;
-
-	// Misc
-	bool is_current_program_interpreted() const override;
-
 protected:
 	void clear_surface(u32 mask) override;
 	void begin() override;
@@ -285,11 +582,11 @@ protected:
 
 	void renderctl(u32 request_code, void* args) override;
 
-	void do_local_task(rsx::FIFO::state state) override;
-	bool scaled_image_from_memory(const rsx::blit_src_info& src, const rsx::blit_dst_info& dst, bool interpolate) override;
+	void do_local_task(rsx::FIFO_state state) override;
+	bool scaled_image_from_memory(rsx::blit_src_info& src, rsx::blit_dst_info& dst, bool interpolate) override;
 	void notify_tile_unbound(u32 tile) override;
 
 	bool on_access_violation(u32 address, bool is_writing) override;
-	void on_invalidate_memory_range(const utils::address_range32 &range, rsx::invalidation_cause cause) override;
+	void on_invalidate_memory_range(const utils::address_range &range, rsx::invalidation_cause cause) override;
 	void on_semaphore_acquire_wait() override;
 };
diff --git a/rpcs3/Emu/RSX/VK/VKGSRenderTypes.hpp b/rpcs3/Emu/RSX/VK/VKGSRenderTypes.hpp
deleted file mode 100644
index 8f38378f52..0000000000
--- a/rpcs3/Emu/RSX/VK/VKGSRenderTypes.hpp
+++ /dev/null
@@ -1,334 +0,0 @@
-#pragma once
-
-#include "vkutils/commands.h"
-#include "vkutils/descriptors.h"
-#include "VKDataHeapManager.h"
-#include "VKResourceManager.h"
-
-#include "Emu/RSX/Common/simple_array.hpp"
-#include "Emu/RSX/rsx_utils.h"
-#include "Emu/RSX/rsx_cache.h"
-#include "Utilities/mutex.h"
-#include "util/asm.hpp"
-
-#include <optional>
-#include <thread>
-
-// Initial heap allocation values. The heaps are growable and will automatically increase in size to accomodate demands
-#define VK_ATTRIB_RING_BUFFER_SIZE_M 64
-#define VK_TEXTURE_UPLOAD_RING_BUFFER_SIZE_M 64
-#define VK_UBO_RING_BUFFER_SIZE_M 16
-#define VK_TRANSFORM_CONSTANTS_BUFFER_SIZE_M 16
-#define VK_FRAGMENT_CONSTANTS_BUFFER_SIZE_M 16
-#define VK_INDEX_RING_BUFFER_SIZE_M 16
-
-#define VK_MAX_ASYNC_CB_COUNT 512
-#define VK_MAX_ASYNC_FRAMES 2
-
-#define FRAME_PRESENT_TIMEOUT 10000000ull // 10 seconds
-#define GENERAL_WAIT_TIMEOUT  2000000ull  // 2 seconds
-
-namespace vk
-{
-	struct buffer_view;
-	struct program_cache;
-	struct pipeline_props;
-
-	using vertex_cache = rsx::vertex_cache::default_vertex_cache<rsx::vertex_cache::uploaded_range>;
-	using weak_vertex_cache = rsx::vertex_cache::weak_vertex_cache;
-	using null_vertex_cache = vertex_cache;
-
-	using shader_cache = rsx::shaders_cache<vk::pipeline_props, vk::program_cache>;
-
-	struct vertex_upload_info
-	{
-		VkPrimitiveTopology primitive;
-		u32 vertex_draw_count;
-		u32 allocated_vertex_count;
-		u32 first_vertex;
-		u32 vertex_index_base;
-		u32 vertex_index_offset;
-		u32 persistent_window_offset;
-		u32 volatile_window_offset;
-		std::optional<std::tuple<VkDeviceSize, VkIndexType>> index_info;
-	};
-
-	struct command_buffer_chunk : public vk::command_buffer
-	{
-		u64 eid_tag = 0;
-		u64 reset_id = 0;
-		shared_mutex guard_mutex;
-
-		command_buffer_chunk() = default;
-
-		inline void tag()
-		{
-			eid_tag = vk::get_event_id();
-		}
-
-		void reset()
-		{
-			if (is_pending && !poke())
-			{
-				wait(FRAME_PRESENT_TIMEOUT);
-			}
-
-			++reset_id;
-			CHECK_RESULT(vkResetCommandBuffer(commands, 0));
-		}
-
-		bool poke()
-		{
-			reader_lock lock(guard_mutex);
-
-			if (!is_pending)
-			{
-				return true;
-			}
-
-			if (!m_submit_fence->flushed)
-			{
-				return false;
-			}
-
-			if (vkGetFenceStatus(pool->get_owner(), m_submit_fence->handle) == VK_SUCCESS)
-			{
-				lock.upgrade();
-
-				if (is_pending)
-				{
-					m_submit_fence->reset();
-					vk::on_event_completed(eid_tag);
-
-					is_pending = false;
-					eid_tag = 0;
-				}
-			}
-
-			return !is_pending;
-		}
-
-		VkResult wait(u64 timeout = 0ull)
-		{
-			reader_lock lock(guard_mutex);
-
-			if (!is_pending)
-			{
-				return VK_SUCCESS;
-			}
-
-			const auto ret = vk::wait_for_fence(m_submit_fence, timeout);
-
-			lock.upgrade();
-
-			if (is_pending)
-			{
-				m_submit_fence->reset();
-				vk::on_event_completed(eid_tag);
-
-				is_pending = false;
-				eid_tag = 0;
-			}
-
-			return ret;
-		}
-
-		void flush()
-		{
-			reader_lock lock(guard_mutex);
-
-			if (!is_pending)
-			{
-				return;
-			}
-
-			m_submit_fence->wait_flush();
-		}
-	};
-
-	struct occlusion_data
-	{
-		rsx::simple_array<u32> indices;
-		command_buffer_chunk* command_buffer_to_wait = nullptr;
-		u64 command_buffer_sync_id = 0;
-
-		bool is_current(command_buffer_chunk* cmd) const
-		{
-			return (command_buffer_to_wait == cmd && command_buffer_sync_id == cmd->reset_id);
-		}
-
-		void set_sync_command_buffer(command_buffer_chunk* cmd)
-		{
-			command_buffer_to_wait = cmd;
-			command_buffer_sync_id = cmd->reset_id;
-		}
-
-		void sync()
-		{
-			if (command_buffer_to_wait->reset_id == command_buffer_sync_id)
-			{
-				// Allocation stack is FIFO and very long so no need to actually wait for fence signal
-				command_buffer_to_wait->flush();
-			}
-		}
-	};
-
-	struct frame_context_t
-	{
-		VkSemaphore acquire_signal_semaphore = VK_NULL_HANDLE;
-		VkSemaphore present_wait_semaphore = VK_NULL_HANDLE;
-
-		rsx::flags32_t flags = 0;
-
-		u32 present_image = -1;
-		command_buffer_chunk* swap_command_buffer = nullptr;
-
-		data_heap_manager::managed_heap_snapshot_t heap_snapshot;
-		u64 last_frame_sync_time = 0;
-
-		// Copy shareable information
-		void grab_resources(frame_context_t& other)
-		{
-			present_wait_semaphore = other.present_wait_semaphore;
-			acquire_signal_semaphore = other.acquire_signal_semaphore;
-			flags = other.flags;
-			heap_snapshot = other.heap_snapshot;
-		}
-
-		void tag_frame_end()
-		{
-			heap_snapshot = data_heap_manager::get_heap_snapshot();
-			last_frame_sync_time = rsx::get_shared_tag();
-		}
-
-		void reset_heap_ptrs()
-		{
-			last_frame_sync_time = 0;
-			heap_snapshot.clear();
-		}
-	};
-
-	struct flush_request_task
-	{
-		atomic_t<bool> pending_state{ false };  //Flush request status; true if rsx::thread is yet to service this request
-		atomic_t<int> num_waiters{ 0 };  //Number of threads waiting for this request to be serviced
-		bool hard_sync = false;
-
-		flush_request_task() = default;
-
-		void post(bool _hard_sync)
-		{
-			hard_sync = (hard_sync || _hard_sync);
-			pending_state = true;
-			num_waiters++;
-		}
-
-		void remove_one()
-		{
-			num_waiters--;
-		}
-
-		void clear_pending_flag()
-		{
-			hard_sync = false;
-			pending_state.store(false);
-		}
-
-		bool pending() const
-		{
-			return pending_state.load();
-		}
-
-		void consumer_wait() const
-		{
-			while (num_waiters.load() != 0)
-			{
-				utils::pause();
-			}
-		}
-
-		void producer_wait() const
-		{
-			while (pending_state.load())
-			{
-				std::this_thread::yield();
-			}
-		}
-	};
-
-	struct present_surface_info
-	{
-		u32 address;
-		u32 format;
-		u32 width;
-		u32 height;
-		u32 pitch;
-		u8  eye;
-	};
-
-	struct draw_call_t
-	{
-		u32 subdraw_id;
-	};
-
-	template<int Count>
-	class command_buffer_chain
-	{
-		atomic_t<u32> m_current_index = 0;
-		std::array<vk::command_buffer_chunk, Count> m_cb_list;
-
-	public:
-		command_buffer_chain() = default;
-
-		void create(command_pool& pool, vk::command_buffer::access_type_hint access)
-		{
-			for (auto& cb : m_cb_list)
-			{
-				cb.create(pool);
-				cb.access_hint = access;
-			}
-		}
-
-		void destroy()
-		{
-			for (auto& cb : m_cb_list)
-			{
-				cb.destroy();
-			}
-		}
-
-		void poke_all()
-		{
-			for (auto& cb : m_cb_list)
-			{
-				cb.poke();
-			}
-		}
-
-		void wait_all()
-		{
-			for (auto& cb : m_cb_list)
-			{
-				cb.wait();
-			}
-		}
-
-		inline command_buffer_chunk* next()
-		{
-			const auto result_id = ++m_current_index % Count;
-			auto result = &m_cb_list[result_id];
-
-			if (!result->poke())
-			{
-				rsx_log.error("CB chain has run out of free entries!");
-			}
-
-			return result;
-		}
-
-		inline command_buffer_chunk* get()
-		{
-			return &m_cb_list[m_current_index % Count];
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.cpp b/rpcs3/Emu/RSX/VK/VKHelpers.cpp
index f59878ec18..e2bba0fd0e 100644
--- a/rpcs3/Emu/RSX/VK/VKHelpers.cpp
+++ b/rpcs3/Emu/RSX/VK/VKHelpers.cpp
@@ -7,10 +7,12 @@
 #include "VKResolveHelper.h"
 #include "VKResourceManager.h"
 #include "VKDMA.h"
+#include "VKCommandStream.h"
 #include "VKRenderPass.h"
 
 #include "vkutils/scratch.h"
 #include "vkutils/device.h"
+#include "Emu/RSX/rsx_methods.h"
 #include <unordered_map>
 
 namespace vk
@@ -29,12 +31,18 @@ namespace vk
 	bool g_drv_sanitize_fp_values = false;
 	bool g_drv_disable_fence_reset = false;
 	bool g_drv_emulate_cond_render = false;
-	bool g_drv_strict_query_scopes = false;
-	bool g_drv_force_reuse_query_pools = false;
 
 	u64 g_num_processed_frames = 0;
 	u64 g_num_total_frames = 0;
 
+	void reset_compute_tasks()
+	{
+		for (const auto &p : g_compute_tasks)
+		{
+			p.second->free_resources();
+		}
+	}
+
 	void reset_overlay_passes()
 	{
 		for (const auto& p : g_overlay_passes)
@@ -45,7 +53,7 @@ namespace vk
 
 	void reset_global_resources()
 	{
-		// FIXME: These two shouldn't exist
+		vk::reset_compute_tasks();
 		vk::reset_resolve_resources();
 		vk::reset_overlay_passes();
 
@@ -59,6 +67,7 @@ namespace vk
 		vk::clear_framebuffer_cache();
 		vk::clear_resolve_helpers();
 		vk::clear_dma_resources();
+		vk::vmm_reset();
 		vk::clear_scratch_resources();
 
 		vk::get_upload_heap()->destroy();
@@ -73,9 +82,6 @@ namespace vk
 
 		// This must be the last item destroyed
 		vk::get_resource_manager()->destroy();
-
-		// Statistics counter reset. Also verifies that everything was deleted.
-		vk::vmm_reset();
 	}
 
 	const vk::render_device *get_current_renderer()
@@ -118,36 +124,6 @@ namespace vk
 		case driver_vendor::ANV:
 			// INTEL vulkan drivers are mostly OK, workarounds are applied when creating the device
 			break;
-		case driver_vendor::MVK:
-			// Apple GPUs / moltenVK need more testing
-			break;
-		case driver_vendor::LAVAPIPE:
-			// This software device works well, with poor performance as the only downside
-			break;
-		case driver_vendor::V3DV:
-			// Broadcom GPUs need more testing, driver currently largely unstable
-			break;
-		case driver_vendor::DOZEN:
-			// This driver is often picked by mistake when the user meant to select something else. Complain loudly.
-#ifdef _WIN32
-			MessageBox(NULL,
-				L"You're attempting to run rpcs3 on Microsoft's Dozen driver that emulates vulkan on top of Direct3D12.\n"
-				"This driver is unsupported. You should use your vendor's vulkan driver whenever possible.",
-				L"Unsupported Driver",
-				MB_ICONWARNING | MB_OK);
-#else
-			rsx_log.error("Dozen is currently unsupported. How did you even get this to run outside windows?");
-#endif
-			break;
-		case driver_vendor::HONEYKRISP:
-			// Needs more testing
-			break;
-		case driver_vendor::PANVK:
-			// Needs more testing
-			break;
-		case driver_vendor::ARM_MALI:
-			// Needs more testing
-			break;
 		default:
 			rsx_log.warning("Unsupported device: %s", gpu_name);
 		}
@@ -191,8 +167,6 @@ namespace vk
 				vkDestroyBuffer(*g_render_device, tmp, nullptr);
 			}
 		}
-
-		descriptors::init();
 	}
 
 	VkFlags get_heap_compatible_buffer_types()
@@ -237,16 +211,6 @@ namespace vk
 		return g_drv_emulate_cond_render;
 	}
 
-	bool use_strict_query_scopes()
-	{
-		return g_drv_strict_query_scopes;
-	}
-
-	bool force_reuse_query_pools()
-	{
-		return g_drv_force_reuse_query_pools;
-	}
-
 	void raise_status_interrupt(runtime_state status)
 	{
 		g_runtime_state |= status;
@@ -305,12 +269,4 @@ namespace vk
 
 		renderer->emergency_query_cleanup(&cmd);
 	}
-
-	void on_descriptor_pool_fragmentation(bool is_fatal)
-	{
-		if (auto vkthr = dynamic_cast<VKGSRender*>(rsx::get_current_renderer()))
-		{
-			vkthr->on_descriptor_pool_fragmentation(is_fatal);
-		}
-	}
 }
diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h
index 9d07a4581e..b349094338 100644
--- a/rpcs3/Emu/RSX/VK/VKHelpers.h
+++ b/rpcs3/Emu/RSX/VK/VKHelpers.h
@@ -1,19 +1,26 @@
 #pragma once
 
 #include "util/types.hpp"
+#include <string>
+#include <functional>
 #include <vector>
+#include <memory>
+#include <unordered_map>
+#include <variant>
+#include <stack>
+#include <deque>
 
 #include "VulkanAPI.h"
+#include "vkutils/chip_class.h"
 #include "Utilities/geometry.h"
 #include "Emu/RSX/Common/TextureUtils.h"
 #include "Emu/RSX/rsx_utils.h"
 
+#define DESCRIPTOR_MAX_DRAW_CALLS 16384
 #define OCCLUSION_MAX_POOL_SIZE   DESCRIPTOR_MAX_DRAW_CALLS
 
-namespace rsx
-{
-	struct GCM_tile_reference;
-}
+#define FRAME_PRESENT_TIMEOUT 10000000ull // 10 seconds
+#define GENERAL_WAIT_TIMEOUT  2000000ull  // 2 seconds
 
 namespace vk
 {
@@ -25,43 +32,30 @@ namespace vk
 	class image;
 	class instance;
 	class render_device;
-	struct queue_submit_t;
 
+	//VkAllocationCallbacks default_callbacks();
 	enum runtime_state
 	{
 		uninterruptible = 1,
-		heap_dirty      = 2,
-		heap_changed    = 4,
-	};
-
-	struct image_readback_options_t
-	{
-		bool swap_bytes = false;
-		struct
-		{
-			u64 offset = 0;
-			u64 length = 0;
-
-			operator bool() const { return length != 0; }
-		} sync_region {};
+		heap_dirty = 2,
+		heap_changed = 3,
+		out_of_memory = 4
 	};
 
 	const vk::render_device *get_current_renderer();
 	void set_current_renderer(const vk::render_device &device);
 
-	// Compatibility workarounds
+	//Compatibility workarounds
 	bool emulate_primitive_restart(rsx::primitive_type type);
 	bool sanitize_fp_values();
 	bool fence_reset_disabled();
 	bool emulate_conditional_rendering();
-	bool use_strict_query_scopes();
-	bool force_reuse_query_pools();
 	VkFlags get_heap_compatible_buffer_types();
 
 	// Sync helpers around vkQueueSubmit
 	void acquire_global_submit_lock();
 	void release_global_submit_lock();
-	void queue_submit(const vk::queue_submit_t* packet);
+	void queue_submit(VkQueue queue, const VkSubmitInfo* info, fence* pfence, VkBool32 flush = VK_FALSE);
 
 	template<class T>
 	T* get_compute_task();
@@ -71,13 +65,12 @@ namespace vk
 
 	enum image_upload_options
 	{
-		upload_contents_async   = 1,
+		upload_contents_async = 1,
 		initialize_image_layout = 2,
-		preserve_image_layout   = 4,
-		source_is_gpu_resident  = 8,
+		preserve_image_layout = 4,
 
 		// meta-flags
-		upload_contents_inline    = 0,
+		upload_contents_inline = 0,
 		upload_heap_align_default = 0
 	};
 
@@ -85,13 +78,9 @@ namespace vk
 		const std::vector<rsx::subresource_layout>& subresource_layout, int format, bool is_swizzled, u16 layer_count,
 		VkImageAspectFlags flags, vk::data_heap &upload_heap, u32 heap_align, rsx::flags32_t image_setup_flags);
 
-	std::pair<buffer*, u32> detile_memory_block(
-		const vk::command_buffer& cmd, const rsx::GCM_tile_reference& tiled_region, const utils::address_range32& range,
-		u16 width, u16 height, u8 bpp);
-
-	// Other texture management helpers
-	void copy_image_to_buffer(const vk::command_buffer& cmd, const vk::image* src, const vk::buffer* dst, const VkBufferImageCopy& region, const image_readback_options_t& options = {});
-	void copy_buffer_to_image(const vk::command_buffer& cmd, const vk::buffer* src, const vk::image* dst, const VkBufferImageCopy& region);
+	//Other texture management helpers
+	void copy_image_to_buffer(VkCommandBuffer cmd, const vk::image* src, const vk::buffer* dst, const VkBufferImageCopy& region, bool swap_bytes = false);
+	void copy_buffer_to_image(VkCommandBuffer cmd, const vk::buffer* src, const vk::image* dst, const VkBufferImageCopy& region);
 	u64  calculate_working_buffer_size(u64 base_size, VkImageAspectFlags aspect);
 
 	void copy_image_typeless(const command_buffer &cmd, image *src, image *dst, const areai& src_rect, const areai& dst_rect,
diff --git a/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp b/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp
index 6f55268ffb..b25628cb08 100644
--- a/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp
+++ b/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp
@@ -1,5 +1,4 @@
 #define VMA_IMPLEMENTATION
-#define VMA_VULKAN_VERSION 1002000
 
 #include "util/atomic.hpp"
 #include "Utilities/mutex.h"
@@ -36,7 +35,7 @@ private:
 #define VMA_RW_MUTEX VmaRWMutex
 #define VMA_MUTEX VmaRWMutex
 
-#if defined(_MSC_VER) && !defined(__clang__)
+#ifdef _MSC_VER
 #pragma warning(push, 0)
 #else
 #pragma GCC diagnostic push
@@ -47,15 +46,11 @@ private:
 #pragma GCC diagnostic ignored "-Wsuggest-override"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #ifdef __clang__
 #pragma clang diagnostic ignored "-Winconsistent-missing-override"
-#pragma clang diagnostic ignored "-Wnullability-completeness"
-#else
-#pragma GCC diagnostic ignored "-Wsuggest-attribute=noreturn"
 #endif
 #endif
-#include "3rdparty/GPUOpen/VulkanMemoryAllocator/include/vk_mem_alloc.h"
+#include "3rdparty/GPUOpen/include/vk_mem_alloc.h"
 #ifdef _MSC_VER
 #pragma warning(pop)
 #else
diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.cpp b/rpcs3/Emu/RSX/VK/VKOverlays.cpp
index 34ca64ca66..2783ba68b6 100644
--- a/rpcs3/Emu/RSX/VK/VKOverlays.cpp
+++ b/rpcs3/Emu/RSX/VK/VKOverlays.cpp
@@ -11,11 +11,10 @@
 #include "vkutils/scratch.h"
 
 #include "../Overlays/overlays.h"
-#include "../Program/RSXOverlay.h"
 
 #include "util/fnv_hash.hpp"
 
-#include "Emu/Cell/timers.hpp"
+#define VK_OVERLAY_MAX_DRAW_CALLS 1024
 
 namespace vk
 {
@@ -43,46 +42,102 @@ namespace vk
 		if (!m_vao.heap)
 		{
 			m_vao.create(VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, 1 * 0x100000, "overlays VAO", 128);
-		}
-
-		if (!m_ubo.heap && m_num_uniform_buffers > 0)
-		{
 			m_ubo.create(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, 8 * 0x100000, "overlays UBO", 128);
 		}
 	}
 
+	void overlay_pass::init_descriptors()
+	{
+		std::vector<VkDescriptorPoolSize> descriptor_pool_sizes =
+		{
+			{ VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_OVERLAY_MAX_DRAW_CALLS }
+		};
+
+		if (m_num_usable_samplers)
+		{
+			descriptor_pool_sizes.push_back({ VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_OVERLAY_MAX_DRAW_CALLS * m_num_usable_samplers });
+		}
+
+		if (m_num_input_attachments)
+		{
+			descriptor_pool_sizes.push_back({ VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT, VK_OVERLAY_MAX_DRAW_CALLS * m_num_input_attachments });
+		}
+
+		// Reserve descriptor pools
+		m_descriptor_pool.create(*m_device, descriptor_pool_sizes.data(), ::size32(descriptor_pool_sizes), VK_OVERLAY_MAX_DRAW_CALLS, 2);
+
+		const auto num_bindings = 1 + m_num_usable_samplers + m_num_input_attachments;
+		std::vector<VkDescriptorSetLayoutBinding> bindings(num_bindings);
+
+		bindings[0].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		bindings[0].descriptorCount = 1;
+		bindings[0].stageFlags = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[0].binding = 0;
+		bindings[0].pImmutableSamplers = nullptr;
+
+		u32 descriptor_index = 1;
+		for (u32 n = 0; n < m_num_usable_samplers; ++n, ++descriptor_index)
+		{
+			bindings[descriptor_index].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+			bindings[descriptor_index].descriptorCount = 1;
+			bindings[descriptor_index].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+			bindings[descriptor_index].binding = descriptor_index;
+			bindings[descriptor_index].pImmutableSamplers = nullptr;
+		}
+
+		for (u32 n = 0; n < m_num_input_attachments; ++n, ++descriptor_index)
+		{
+			bindings[descriptor_index].descriptorType = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT;
+			bindings[descriptor_index].descriptorCount = 1;
+			bindings[descriptor_index].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+			bindings[descriptor_index].binding = descriptor_index;
+			bindings[descriptor_index].pImmutableSamplers = nullptr;
+		}
+
+		ensure(descriptor_index == num_bindings);
+
+		VkDescriptorSetLayoutCreateInfo infos = {};
+		infos.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
+		infos.pBindings = bindings.data();
+		infos.bindingCount = ::size32(bindings);
+
+		CHECK_RESULT(vkCreateDescriptorSetLayout(*m_device, &infos, nullptr, &m_descriptor_layout));
+
+		VkPipelineLayoutCreateInfo layout_info = {};
+		layout_info.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
+		layout_info.setLayoutCount = 1;
+		layout_info.pSetLayouts = &m_descriptor_layout;
+
+		std::vector<VkPushConstantRange> push_constants = get_push_constants();
+		if (!push_constants.empty())
+		{
+			layout_info.pushConstantRangeCount = u32(push_constants.size());
+			layout_info.pPushConstantRanges = push_constants.data();
+		}
+
+		CHECK_RESULT(vkCreatePipelineLayout(*m_device, &layout_info, nullptr, &m_pipeline_layout));
+	}
+
 	std::vector<vk::glsl::program_input> overlay_pass::get_vertex_inputs()
 	{
 		check_heap();
-		return {};
+		return{};
 	}
 
 	std::vector<vk::glsl::program_input> overlay_pass::get_fragment_inputs()
 	{
-		using namespace vk::glsl;
-
-		std::vector<program_input> fs_inputs;
-		u32 binding = 0;
-
-		for (u32 n = 0; n < m_num_uniform_buffers; ++n, ++binding)
-		{
-			const std::string name = std::string("static_data") + (n > 0 ? std::to_string(n) : "");
-			const auto input = program_input::make(::glsl::program_domain::glsl_fragment_program, name, program_input_type::input_type_uniform_buffer, 0, 0);
-			fs_inputs.push_back(input);
-		}
+		std::vector<vk::glsl::program_input> fs_inputs;
+		fs_inputs.push_back({ ::glsl::program_domain::glsl_fragment_program, vk::glsl::program_input_type::input_type_uniform_buffer,{},{}, 0, "static_data" });
 
+		u32 binding = 1;
 		for (u32 n = 0; n < m_num_usable_samplers; ++n, ++binding)
 		{
-			const std::string name = "fs" + std::to_string(n);
-			const auto input = program_input::make(::glsl::program_domain::glsl_fragment_program, name, program_input_type::input_type_texture, 0, binding);
-			fs_inputs.push_back(input);
+			fs_inputs.push_back({ ::glsl::program_domain::glsl_fragment_program, vk::glsl::program_input_type::input_type_texture,{},{}, binding, "fs" + std::to_string(n) });
 		}
 
 		for (u32 n = 0; n < m_num_input_attachments; ++n, ++binding)
 		{
-			const std::string name = "sp" + std::to_string(n);
-			const auto input = program_input::make(::glsl::program_domain::glsl_fragment_program, name, program_input_type::input_type_texture, 0, binding);
-			fs_inputs.push_back(input);
+			fs_inputs.push_back({ ::glsl::program_domain::glsl_fragment_program, vk::glsl::program_input_type::input_type_texture,{},{}, binding, "sp" + std::to_string(n) });
 		}
 
 		return fs_inputs;
@@ -148,20 +203,20 @@ namespace vk
 		info.stageCount = 2;
 		info.pStages = shader_stages;
 		info.pDynamicState = &dynamic_state_info;
-		info.layout = VK_NULL_HANDLE;
+		info.layout = m_pipeline_layout;
 		info.basePipelineIndex = -1;
 		info.basePipelineHandle = VK_NULL_HANDLE;
 		info.renderPass = render_pass;
 
 		auto compiler = vk::get_pipe_compiler();
-		auto program = compiler->compile(info, vk::pipe_compiler::COMPILE_INLINE, {}, get_vertex_inputs(), get_fragment_inputs());
+		auto program = compiler->compile(info, m_pipeline_layout, vk::pipe_compiler::COMPILE_INLINE, {}, get_vertex_inputs(), get_fragment_inputs());
 		auto result = program.get();
 		m_program_cache[storage_key] = std::move(program);
 
 		return result;
 	}
 
-	vk::glsl::program* overlay_pass::load_program(vk::command_buffer& cmd, VkRenderPass pass, const std::vector<vk::image_view*>& src)
+	void overlay_pass::load_program(vk::command_buffer& cmd, VkRenderPass pass, const std::vector<vk::image_view*>& src)
 	{
 		vk::glsl::program *program = nullptr;
 		const auto key = get_pipeline_key(pass);
@@ -172,6 +227,17 @@ namespace vk
 		else
 			program = build_pipeline(key, pass);
 
+		ensure(m_used_descriptors < VK_OVERLAY_MAX_DRAW_CALLS);
+
+		VkDescriptorSetAllocateInfo alloc_info = {};
+		alloc_info.descriptorPool = m_descriptor_pool;
+		alloc_info.descriptorSetCount = 1;
+		alloc_info.pSetLayouts = &m_descriptor_layout;
+		alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+
+		CHECK_RESULT(vkAllocateDescriptorSets(*m_device, &alloc_info, &m_descriptor_set));
+		m_used_descriptors++;
+
 		if (!m_sampler && !src.empty())
 		{
 			m_sampler = std::make_unique<vk::sampler>(*m_device,
@@ -181,25 +247,20 @@ namespace vk
 
 		update_uniforms(cmd, program);
 
-		if (m_num_uniform_buffers > 0)
-		{
-			program->bind_uniform({ m_ubo.heap->value, m_ubo_offset, std::max(m_ubo_length, 4u) }, 0, 0);
-		}
+		program->bind_uniform({ m_ubo.heap->value, m_ubo_offset, std::max(m_ubo_length, 4u) }, 0, m_descriptor_set);
 
 		for (uint n = 0; n < src.size(); ++n)
 		{
 			VkDescriptorImageInfo info = { m_sampler->value, src[n]->value, src[n]->image()->current_layout };
-			const auto [set, location] = program->get_uniform_location(::glsl::glsl_fragment_program, glsl::input_type_texture, "fs" + std::to_string(n));
-			program->bind_uniform(info, set, location);
+			program->bind_uniform(info, "fs" + std::to_string(n), VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, m_descriptor_set);
 		}
 
-		program->bind(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS);
+		vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, program->pipeline);
+		vkCmdBindDescriptorSets(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, m_pipeline_layout, 0, 1, &m_descriptor_set, 0, nullptr);
 
 		VkBuffer buffers = m_vao.heap->value;
 		VkDeviceSize offsets = m_vao_offset;
 		vkCmdBindVertexBuffers(cmd, 0, 1, &buffers, &offsets);
-
-		return program;
 	}
 
 	void overlay_pass::create(const vk::render_device& dev)
@@ -207,6 +268,8 @@ namespace vk
 		if (!initialized)
 		{
 			m_device = &dev;
+			init_descriptors();
+
 			initialized = true;
 		}
 	}
@@ -220,13 +283,22 @@ namespace vk
 			m_program_cache.clear();
 			m_sampler.reset();
 
+			vkDestroyDescriptorSetLayout(*m_device, m_descriptor_layout, nullptr);
+			vkDestroyPipelineLayout(*m_device, m_pipeline_layout, nullptr);
+			m_descriptor_pool.destroy();
+
 			initialized = false;
 		}
 	}
 
 	void overlay_pass::free_resources()
 	{
-		// FIXME: Allocation sizes are known, we don't need to use a data_heap structure
+		if (m_used_descriptors == 0)
+			return;
+
+		m_descriptor_pool.reset(0);
+		m_used_descriptors = 0;
+
 		m_vao.reset_allocation_stats();
 		m_ubo.reset_allocation_stats();
 	}
@@ -237,7 +309,7 @@ namespace vk
 		return vk::get_framebuffer(dev, target->width(), target->height(), m_num_input_attachments > 0, render_pass, { target });
 	}
 
-	void overlay_pass::emit_geometry(vk::command_buffer& cmd, glsl::program* /*program*/)
+	void overlay_pass::emit_geometry(vk::command_buffer& cmd)
 	{
 		vkCmdDraw(cmd, num_drawable_elements, 1, first_vertex, 0);
 	}
@@ -259,14 +331,11 @@ namespace vk
 
 	void overlay_pass::run(vk::command_buffer& cmd, const areau& viewport, vk::framebuffer* fbo, const std::vector<vk::image_view*>& src, VkRenderPass render_pass)
 	{
-		// This call clobbers dynamic state
-		cmd.flags |= vk::command_buffer::cb_reload_dynamic_state;
-
-		auto program = load_program(cmd, render_pass, src);
+		load_program(cmd, render_pass, src);
 		set_up_viewport(cmd, viewport.x1, viewport.y1, viewport.width(), viewport.height());
 
-		vk::begin_renderpass(cmd, render_pass, fbo->value, { positionu{0u, 0u}, sizeu{fbo->width(), fbo->height()} });
-		emit_geometry(cmd, program);
+		vk::begin_renderpass(cmd, render_pass, fbo->value, viewport);
+		emit_geometry(cmd);
 	}
 
 	void overlay_pass::run(vk::command_buffer& cmd, const areau& viewport, vk::image* target, const std::vector<vk::image_view*>& src, VkRenderPass render_pass)
@@ -285,50 +354,168 @@ namespace vk
 	}
 
 	ui_overlay_renderer::ui_overlay_renderer()
-		: m_texture_type(rsx::overlays::texture_sampling_mode::none)
 	{
 		vs_src =
-		#include "../Program/GLSLSnippets/OverlayRenderVS.glsl"
-		;
+			"#version 450\n"
+			"#extension GL_ARB_separate_shader_objects : enable\n"
+			"layout(location=0) in vec4 in_pos;\n"
+			"layout(std140, set=0, binding=0) uniform static_data{ vec4 regs[8]; };\n"
+			"layout(location=0) out vec2 tc0;\n"
+			"layout(location=1) out vec4 color;\n"
+			"layout(location=2) out vec4 parameters;\n"
+			"layout(location=3) out vec4 clip_rect;\n"
+			"layout(location=4) out vec4 parameters2;\n"
+			"\n"
+			"vec2 snap_to_grid(const in vec2 normalized)\n"
+			"{\n"
+			"	return (floor(normalized * regs[5].xy) + 0.5) / regs[5].xy;\n"
+			"}\n"
+			"\n"
+			"vec4 clip_to_ndc(const in vec4 coord)\n"
+			"{\n"
+			"	return (coord * regs[0].zwzw) / regs[0].xyxy;\n"
+			"}\n"
+			"\n"
+			"vec4 ndc_to_window(const in vec4 coord)\n"
+			"{\n"
+			"	return fma(coord, regs[5].xyxy, regs[5].zwzw);\n"
+			"}\n"
+			"\n"
+			"void main()\n"
+			"{\n"
+			"	tc0.xy = in_pos.zw;\n"
+			"	color = regs[1];\n"
+			"	parameters = regs[2];\n"
+			"	parameters2 = regs[4];\n"
+			"	clip_rect = ndc_to_window(clip_to_ndc(regs[3]));\n"
+			"	vec4 pos = vec4(clip_to_ndc(in_pos).xy, 0.5, 1.);\n"
+			"	pos.xy = snap_to_grid(pos.xy);\n"
+			"	gl_Position = (pos + pos) - 1.;\n"
+			"}\n";
 
 		fs_src =
-		#include "../Program/GLSLSnippets/OverlayRenderFS.glsl"
-		;
-
-		vs_src = fmt::replace_all(vs_src,
-		{
-			{ "%preprocessor", "// %preprocessor" },
-			{ "%push_block", "push_constant" }
-		});
-
-		fs_src = fmt::replace_all(fs_src,
-		{
-			{ "%preprocessor", "// %preprocessor" },
-			{ "%push_block_offset", "layout(offset=68)" },
-			{ "%push_block", "push_constant" }
-		});
+			"#version 420\n"
+			"#extension GL_ARB_separate_shader_objects : enable\n"
+			"layout(set=0, binding=1) uniform sampler2D fs0;\n"
+			"layout(set=0, binding=2) uniform sampler2DArray fs1;\n"
+			"layout(location=0) in vec2 tc0;\n"
+			"layout(location=1) in vec4 color;\n"
+			"layout(location=2) in vec4 parameters;\n"
+			"layout(location=3) in vec4 clip_rect;\n"
+			"layout(location=4) in vec4 parameters2;\n"
+			"layout(location=0) out vec4 ocol;\n"
+			"\n"
+			"vec4 blur_sample(sampler2D tex, vec2 coord, vec2 tex_offset)\n"
+			"{\n"
+			"	vec2 coords[9];\n"
+			"	coords[0] = coord - tex_offset\n;"
+			"	coords[1] = coord + vec2(0., -tex_offset.y);\n"
+			"	coords[2] = coord + vec2(tex_offset.x, -tex_offset.y);\n"
+			"	coords[3] = coord + vec2(-tex_offset.x, 0.);\n"
+			"	coords[4] = coord;\n"
+			"	coords[5] = coord + vec2(tex_offset.x, 0.);\n"
+			"	coords[6] = coord + vec2(-tex_offset.x, tex_offset.y);\n"
+			"	coords[7] = coord + vec2(0., tex_offset.y);\n"
+			"	coords[8] = coord + tex_offset;\n"
+			"\n"
+			"	float weights[9] =\n"
+			"	{\n"
+			"		1., 2., 1.,\n"
+			"		2., 4., 2.,\n"
+			"		1., 2., 1.\n"
+			"	};\n"
+			"\n"
+			"	vec4 blurred = vec4(0.);\n"
+			"	for (int n = 0; n < 9; ++n)\n"
+			"	{\n"
+			"		blurred += texture(tex, coords[n]) * weights[n];\n"
+			"	}\n"
+			"\n"
+			"	return blurred / 16.f;\n"
+			"}\n"
+			"\n"
+			"vec4 sample_image(sampler2D tex, vec2 coord, float blur_strength)\n"
+			"{\n"
+			"	vec4 original = texture(tex, coord);\n"
+			"	if (blur_strength == 0) return original;\n"
+			"	\n"
+			"	vec2 constraints = 1.f / vec2(640, 360);\n"
+			"	vec2 res_offset = 1.f / textureSize(fs0, 0);\n"
+			"	vec2 tex_offset = max(res_offset, constraints);\n"
+			"\n"
+			"	// Sample triangle pattern and average\n"
+			"	// TODO: Nicer looking gaussian blur with less sampling\n"
+			"	vec4 blur0 = blur_sample(tex, coord + vec2(-res_offset.x, 0.), tex_offset);\n"
+			"	vec4 blur1 = blur_sample(tex, coord + vec2(res_offset.x, 0.), tex_offset);\n"
+			"	vec4 blur2 = blur_sample(tex, coord + vec2(0., res_offset.y), tex_offset);\n"
+			"\n"
+			"	vec4 blurred = blur0 + blur1 + blur2;\n"
+			"	blurred /= 3.;\n"
+			"	return mix(original, blurred, blur_strength);\n"
+			"}\n"
+			"\n"
+			"void main()\n"
+			"{\n"
+			"	if (parameters.w != 0)\n"
+			"	{"
+			"		if (gl_FragCoord.x < clip_rect.x || gl_FragCoord.x > clip_rect.z ||\n"
+			"			gl_FragCoord.y < clip_rect.y || gl_FragCoord.y > clip_rect.w)\n"
+			"		{\n"
+			"			discard;\n"
+			"			return;\n"
+			"		}\n"
+			"	}\n"
+			"\n"
+			"	vec4 diff_color = color;\n"
+			"	if (parameters.y != 0)\n"
+			"		diff_color.a *= (sin(parameters.x) + 1.f) * 0.5f;\n"
+			"\n"
+			"	if (parameters.z < 1.)\n"
+			"	{\n"
+			"		ocol = diff_color;\n"
+			"	}\n"
+			"	else if (parameters.z > 2.)\n"
+			"	{\n"
+			"		ocol = texture(fs1, vec3(tc0.x, fract(tc0.y), trunc(tc0.y))).rrrr * diff_color;\n"
+			"	}\n"
+			"	else if (parameters.z > 1.)\n"
+			"	{\n"
+			"		ocol = texture(fs0, tc0).rrrr * diff_color;\n"
+			"	}\n"
+			"	else\n"
+			"	{\n"
+			"		ocol = sample_image(fs0, tc0, parameters2.x).bgra * diff_color;\n"
+			"	}\n"
+			"}\n";
 
 		// 2 input textures
 		m_num_usable_samplers = 2;
-		m_num_uniform_buffers = 0;
 
 		renderpass_config.set_attachment_count(1);
 		renderpass_config.set_color_mask(0, true, true, true, true);
 		renderpass_config.set_depth_mask(false);
 		renderpass_config.enable_blend(0,
-			VK_BLEND_FACTOR_SRC_ALPHA, VK_BLEND_FACTOR_ZERO,
-			VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA, VK_BLEND_FACTOR_ONE,
+			VK_BLEND_FACTOR_SRC_ALPHA, VK_BLEND_FACTOR_SRC_ALPHA,
+			VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA, VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA,
 			VK_BLEND_OP_ADD, VK_BLEND_OP_ADD);
 	}
 
-	void ui_overlay_renderer::upload_simple_texture(vk::image* tex, vk::command_buffer& cmd,
-		vk::data_heap& upload_heap, u32 w, u32 h, u32 layers, bool font, const void* pixel_src)
+	vk::image_view* ui_overlay_renderer::upload_simple_texture(vk::render_device& dev, vk::command_buffer& cmd,
+		vk::data_heap& upload_heap, u64 key, u32 w, u32 h, u32 layers, bool font, bool temp, void* pixel_src, u32 owner_uid)
 	{
+		const VkFormat format = (font) ? VK_FORMAT_R8_UNORM : VK_FORMAT_B8G8R8A8_UNORM;
 		const u32 pitch = (font) ? w : w * 4;
 		const u32 data_size = pitch * h * layers;
 		const auto offset = upload_heap.alloc<512>(data_size);
 		const auto addr = upload_heap.map(offset, data_size);
 
+		const VkImageSubresourceRange range = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, layers };
+
+		auto tex = std::make_unique<vk::image>(dev, dev.get_memory_mapping().device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+			VK_IMAGE_TYPE_2D, format, std::max(w, 1u), std::max(h, 1u), 1, 1, layers, VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
+			VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
+			0, VMM_ALLOCATION_POOL_UNDEFINED);
+
 		if (pixel_src && data_size)
 			std::memcpy(addr, pixel_src, data_size);
 		else if (data_size)
@@ -336,32 +523,17 @@ namespace vk
 
 		upload_heap.unmap();
 
-		const VkImageSubresourceRange range = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, layers };
-		VkBufferImageCopy region
-		{
-			.bufferOffset = offset,
-			.bufferRowLength = w,
-			.bufferImageHeight = h,
-			.imageSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, layers },
-			.imageOffset = {},
-			.imageExtent = { static_cast<u32>(w), static_cast<u32>(h), 1u }
-		};
-		change_image_layout(cmd, tex, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, range);
+		VkBufferImageCopy region;
+		region.imageSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, layers };
+		region.bufferOffset = offset;
+		region.bufferRowLength = w;
+		region.bufferImageHeight = h;
+		region.imageOffset = {};
+		region.imageExtent = { static_cast<u32>(w), static_cast<u32>(h), 1u };
+
+		change_image_layout(cmd, tex.get(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, range);
 		vkCmdCopyBufferToImage(cmd, upload_heap.heap->value, tex->value, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
-		change_image_layout(cmd, tex, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, range);
-	}
-
-	vk::image_view* ui_overlay_renderer::upload_simple_texture(vk::render_device& dev, vk::command_buffer& cmd,
-		vk::data_heap& upload_heap, u64 key, u32 w, u32 h, u32 layers, bool font, bool temp, const void* pixel_src, u32 owner_uid)
-	{
-		const VkFormat format = (font) ? VK_FORMAT_R8_UNORM : VK_FORMAT_B8G8R8A8_UNORM;
-
-		auto tex = std::make_unique<vk::image>(dev, dev.get_memory_mapping().device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
-			VK_IMAGE_TYPE_2D, format, std::max(w, 1u), std::max(h, 1u), 1, 1, layers, VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
-			VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
-			0, VMM_ALLOCATION_POOL_UNDEFINED);
-
-		upload_simple_texture(tex.get(), cmd, upload_heap, w, h, layers, font, pixel_src);
+		change_image_layout(cmd, tex.get(), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, range);
 
 		auto view = std::make_unique<vk::image_view>(dev, tex.get());
 
@@ -392,7 +564,7 @@ namespace vk
 
 		for (const auto &res : configuration.texture_raw_data)
 		{
-			upload_simple_texture(dev, cmd, upload_heap, storage_key++, res->w, res->h, 1, false, false, res->get_data(), -1);
+			upload_simple_texture(dev, cmd, upload_heap, storage_key++, res->w, res->h, 1, false, false, res->data, -1);
 		}
 
 		configuration.free_resources();
@@ -423,13 +595,6 @@ namespace vk
 
 		for (const auto& _key : keys_to_remove)
 		{
-			auto& img_data = temp_image_cache[_key];
-			auto& view_data = temp_view_cache[_key];
-
-			auto gc = vk::get_resource_manager();
-			gc->dispose(img_data.second);
-			gc->dispose(view_data);
-
 			temp_image_cache.erase(_key);
 			temp_view_cache.erase(_key);
 		}
@@ -450,121 +615,72 @@ namespace vk
 			{
 				return found->second.get();
 			}
-
-			auto gc = vk::get_resource_manager();
-			gc->dispose(font_cache[key]);
-			gc->dispose(view_cache[key]);
+			else
+			{
+				auto gc = vk::get_resource_manager();
+				gc->dispose(font_cache[key]);
+				gc->dispose(view_cache[key]);
+			}
 		}
 
 		// Create font resource
-		const std::vector<u8>& bytes = font->get_glyph_data();
+		std::vector<u8> bytes;
+		font->get_glyph_data(bytes);
 
 		return upload_simple_texture(cmd.get_command_pool().get_owner(), cmd, upload_heap, key, image_size.width, image_size.height, image_size.depth,
 				true, false, bytes.data(), -1);
 	}
 
-	vk::image_view* ui_overlay_renderer::find_temp_image(rsx::overlays::image_info_base* desc, vk::command_buffer& cmd, vk::data_heap& upload_heap, u32 owner_uid)
+	vk::image_view* ui_overlay_renderer::find_temp_image(rsx::overlays::image_info* desc, vk::command_buffer& cmd, vk::data_heap& upload_heap, u32 owner_uid)
 	{
-		const bool dirty = std::exchange(desc->dirty, false);
-		const u64 key = reinterpret_cast<u64>(desc);
-
-		auto cached = temp_view_cache.find(key);
-		if (cached != temp_view_cache.end())
-		{
-			vk::image_view* view = cached->second.get();
-
-			if (dirty)
-			{
-				upload_simple_texture(view->image(), cmd, upload_heap, desc->w, desc->h, 1, false, desc->get_data());
-			}
-
-			return view;
-		}
+		u64 key = reinterpret_cast<u64>(desc);
+		auto found = temp_view_cache.find(key);
+		if (found != temp_view_cache.end())
+			return found->second.get();
 
 		return upload_simple_texture(cmd.get_command_pool().get_owner(), cmd, upload_heap, key, desc->w, desc->h, 1,
-				false, true, desc->get_data(), owner_uid);
+				false, true, desc->data, owner_uid);
 	}
 
-	std::vector<vk::glsl::program_input> ui_overlay_renderer::get_vertex_inputs()
+	void ui_overlay_renderer::update_uniforms(vk::command_buffer& /*cmd*/, vk::glsl::program* /*program*/)
 	{
-		auto result = overlay_pass::get_vertex_inputs();
-		result.push_back(
-			glsl::program_input::make(
-				::glsl::glsl_vertex_program,
-				"push_constants",
-				glsl::input_type_push_constant,
-				0,
-				0,
-				glsl::push_constant_ref { .size = 68 }
-			)
-		);
-		return result;
-	}
+		m_ubo_offset = static_cast<u32>(m_ubo.alloc<256>(128));
+		auto dst = static_cast<f32*>(m_ubo.map(m_ubo_offset, 128));
 
-	std::vector<vk::glsl::program_input> ui_overlay_renderer::get_fragment_inputs()
-	{
-		auto result = overlay_pass::get_fragment_inputs();
-		result.push_back(
-			glsl::program_input::make(
-				::glsl::glsl_fragment_program,
-				"push_constants",
-				glsl::input_type_push_constant,
-				0,
-				0,
-				glsl::push_constant_ref {.offset = 68, .size = 12 }
-			)
-		);
-		return result;
-	}
+		// regs[0] = scaling parameters
+		dst[0] = m_scale_offset.r;
+		dst[1] = m_scale_offset.g;
+		dst[2] = m_scale_offset.b;
+		dst[3] = m_scale_offset.a;
 
-	void ui_overlay_renderer::update_uniforms(vk::command_buffer& cmd, vk::glsl::program* program)
-	{
-		// Byte Layout
-		// 00: vec4 ui_scale;
-		// 16: vec4 albedo;
-		// 32: vec4 viewport;
-		// 48: vec4 clip_bounds;
-		// 64: uint vertex_config;
-		// 68: uint fragment_config;
-		// 72: float timestamp;
-		// 76: float blur_intensity;
+		// regs[1] = color
+		dst[4] = m_color.r;
+		dst[5] = m_color.g;
+		dst[6] = m_color.b;
+		dst[7] = m_color.a;
 
-		f32 push_buf[32];
-		// 1. Vertex config (00 - 63)
-		std::memcpy(push_buf, m_scale_offset.rgba, 16);
-		std::memcpy(push_buf + 4, m_color.rgba, 16);
+		// regs[2] = fs config parameters
+		dst[8] = m_time;
+		dst[9] = m_pulse_glow? 1.f : 0.f;
+		dst[10] = m_skip_texture_read? 0.f : static_cast<f32>(m_texture_type);
+		dst[11] = m_clip_enabled ? 1.f : 0.f;
 
-		push_buf[8] = m_viewport.width;
-		push_buf[9] = m_viewport.height;
-		push_buf[10] = m_viewport.x;
-		push_buf[11] = m_viewport.y;
+		// regs[3] = clip rect
+		dst[12] = m_clip_region.x1;
+		dst[13] = m_clip_region.y1;
+		dst[14] = m_clip_region.x2;
+		dst[15] = m_clip_region.y2;
 
-		push_buf[12] = m_clip_region.x1;
-		push_buf[13] = m_clip_region.y1;
-		push_buf[14] = m_clip_region.x2;
-		push_buf[15] = m_clip_region.y2;
+		// regs[4] = fs config parameters 2
+		dst[16] = m_blur_strength;
 
-		rsx::overlays::vertex_options vert_opts;
-		const auto vert_config = vert_opts
-			.disable_vertex_snap(m_disable_vertex_snap)
-			.get();
-		push_buf[16] = std::bit_cast<f32>(vert_config);
+		// regs[5] = viewport
+		dst[20] = m_viewport.width;
+		dst[21] = m_viewport.height;
+		dst[22] = m_viewport.x;
+		dst[23] = m_viewport.y;
 
-		vkCmdPushConstants(cmd, program->layout(), VK_SHADER_STAGE_VERTEX_BIT, 0, 68, push_buf);
-
-		// 2. Fragment stuff
-		rsx::overlays::fragment_options frag_opts;
-		const auto frag_config = frag_opts
-			.texture_mode(m_texture_type)
-			.clip_fragments(m_clip_enabled)
-			.pulse_glow(m_pulse_glow)
-			.get();
-
-		push_buf[0] = std::bit_cast<f32>(frag_config);
-		push_buf[1] = m_time;
-		push_buf[2] = m_blur_strength;
-
-		vkCmdPushConstants(cmd, program->layout(), VK_SHADER_STAGE_FRAGMENT_BIT, 68, 12, push_buf);
+		m_ubo.unmap();
 	}
 
 	void ui_overlay_renderer::set_primitive_type(rsx::overlays::primitive_type type)
@@ -583,15 +699,12 @@ namespace vk
 			case rsx::overlays::primitive_type::line_strip:
 				renderpass_config.set_primitive_type(VK_PRIMITIVE_TOPOLOGY_LINE_STRIP);
 				break;
-			case rsx::overlays::primitive_type::triangle_fan:
-				renderpass_config.set_primitive_type(VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN);
-				break;
 			default:
 				fmt::throw_exception("Unexpected primitive type %d", static_cast<s32>(type));
 		}
 	}
 
-	void ui_overlay_renderer::emit_geometry(vk::command_buffer& cmd, glsl::program* program)
+	void ui_overlay_renderer::emit_geometry(vk::command_buffer& cmd)
 	{
 		if (m_current_primitive_type == rsx::overlays::primitive_type::quad_list)
 		{
@@ -607,7 +720,7 @@ namespace vk
 		}
 		else
 		{
-			overlay_pass::emit_geometry(cmd, program);
+			overlay_pass::emit_geometry(cmd);
 		}
 	}
 
@@ -623,12 +736,6 @@ namespace vk
 			vk::null_image_view(cmd, VK_IMAGE_VIEW_TYPE_2D_ARRAY)
 		};
 
-		if (ui.status_flags & rsx::overlays::status_bits::invalidate_image_cache)
-		{
-			remove_temp_resources(ui.uid);
-			ui.status_flags.clear(rsx::overlays::status_bits::invalidate_image_cache);
-		}
-
 		for (auto& command : ui.get_compiled().draw_commands)
 		{
 			num_drawable_elements = static_cast<u32>(command.verts.size());
@@ -637,13 +744,13 @@ namespace vk
 			set_primitive_type(command.config.primitives);
 
 			m_time = command.config.get_sinus_value();
-			m_texture_type = rsx::overlays::texture_sampling_mode::texture2D;
+			m_skip_texture_read = false;
 			m_color = command.config.color;
 			m_pulse_glow = command.config.pulse_glow;
 			m_blur_strength = static_cast<f32>(command.config.blur_strength) * 0.01f;
 			m_clip_enabled = command.config.clip_region;
 			m_clip_region = command.config.clip_rect;
-			m_disable_vertex_snap = command.config.disable_vertex_snap;
+			m_texture_type = 1;
 
 			vk::image_view* src = nullptr;
 			switch (command.config.texture_ref)
@@ -652,16 +759,14 @@ namespace vk
 			case rsx::overlays::image_resource_id::backbuffer:
 				// TODO
 			case rsx::overlays::image_resource_id::none:
-				m_texture_type = rsx::overlays::texture_sampling_mode::none;
+				m_skip_texture_read = true;
 				break;
 			case rsx::overlays::image_resource_id::font_file:
 				src = find_font(command.config.font_ref, cmd, upload_heap);
-				m_texture_type = src->image()->layers() == 1
-					? rsx::overlays::texture_sampling_mode::font2D
-					: rsx::overlays::texture_sampling_mode::font3D;
+				m_texture_type = src->image()->layers() == 1 ? 2 : 3;
 				break;
 			case rsx::overlays::image_resource_id::raw_image:
-				src = find_temp_image(static_cast<rsx::overlays::image_info_base*>(command.config.external_data_ref), cmd, upload_heap, ui.uid);
+				src = find_temp_image(static_cast<rsx::overlays::image_info*>(command.config.external_data_ref), cmd, upload_heap, ui.uid);
 				break;
 			default:
 				src = view_cache[command.config.texture_ref].get();
@@ -677,7 +782,7 @@ namespace vk
 			overlay_pass::run(cmd, viewport, target, image_views, render_pass);
 		}
 
-		ui.update(get_system_time());
+		ui.update();
 	}
 
 	attachment_clear_pass::attachment_clear_pass()
@@ -709,30 +814,22 @@ namespace vk
 		// Disable samplers
 		m_num_usable_samplers = 0;
 
-		// Disable UBOs
-		m_num_uniform_buffers = 0;
-
 		renderpass_config.set_depth_mask(false);
 		renderpass_config.set_color_mask(0, true, true, true, true);
 		renderpass_config.set_attachment_count(1);
 	}
 
-	std::vector<vk::glsl::program_input> attachment_clear_pass::get_vertex_inputs()
+	std::vector<VkPushConstantRange> attachment_clear_pass::get_push_constants()
 	{
-		check_heap();
-		return
-		{
-			vk::glsl::program_input::make(
-				::glsl::glsl_vertex_program,
-				"push_constants",
-				vk::glsl::input_type_push_constant,
-				0,
-				0,
-				glsl::push_constant_ref{ .size = 32 })
-		};
+		VkPushConstantRange constant;
+		constant.stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+		constant.offset = 0;
+		constant.size = 32;
+
+		return { constant };
 	}
 
-	void attachment_clear_pass::update_uniforms(vk::command_buffer& cmd, vk::glsl::program* program)
+	void attachment_clear_pass::update_uniforms(vk::command_buffer& cmd, vk::glsl::program* /*program*/)
 	{
 		f32 data[8];
 		data[0] = clear_color.r;
@@ -744,7 +841,7 @@ namespace vk
 		data[6] = colormask.b;
 		data[7] = colormask.a;
 
-		vkCmdPushConstants(cmd, program->layout(), VK_SHADER_STAGE_VERTEX_BIT, 0, 32, data);
+		vkCmdPushConstants(cmd, m_pipeline_layout, VK_SHADER_STAGE_VERTEX_BIT, 0, 32, data);
 	}
 
 	void attachment_clear_pass::set_up_viewport(vk::command_buffer& cmd, u32 x, u32 y, u32 w, u32 h)
@@ -808,9 +905,6 @@ namespace vk
 			"{\n"
 			"	out_color = vec4(0.);\n"
 			"}\n";
-
-		m_num_uniform_buffers = 0;
-		m_num_usable_samplers = 0;
 	}
 
 	void stencil_clear_pass::set_up_viewport(vk::command_buffer& cmd, u32 x, u32 y, u32 w, u32 h)
@@ -850,55 +944,92 @@ namespace vk
 	video_out_calibration_pass::video_out_calibration_pass()
 	{
 		vs_src =
-		#include "../Program/GLSLSnippets/GenericVSPassthrough.glsl"
-		;
+			"#version 450\n\n"
+			"layout(location=0) out vec2 tc0;\n"
+			"\n"
+			"void main()\n"
+			"{\n"
+			"	vec2 positions[] = {vec2(-1., -1.), vec2(1., -1.), vec2(-1., 1.), vec2(1., 1.)};\n"
+			"	vec2 coords[] = {vec2(0., 0.), vec2(1., 0.), vec2(0., 1.), vec2(1., 1.)};\n"
+			"	tc0 = coords[gl_VertexIndex % 4];\n"
+			"	vec2 pos = positions[gl_VertexIndex % 4];\n"
+			"	gl_Position = vec4(pos, 0., 1.);\n"
+			"}\n";
 
 		fs_src =
-		#include "../Program/GLSLSnippets/VideoOutCalibrationPass.glsl"
-		;
-
-		std::pair<std::string_view, std::string> repl_list[] =
-		{
-			{ "%sampler_binding", "x" },
-			{ "%set_decorator", "set=0" },
-		};
-		fs_src = fmt::replace_all(fs_src, repl_list);
+			"#version 420\n\n"
+			"layout(set=0, binding=1) uniform sampler2D fs0;\n"
+			"layout(set=0, binding=2) uniform sampler2D fs1;\n"
+			"layout(location=0) in vec2 tc0;\n"
+			"layout(location=0) out vec4 ocol;\n"
+			"\n"
+			"layout(push_constant) uniform static_data\n"
+			"{\n"
+			"	float gamma;\n"
+			"	int limit_range;\n"
+			"	int stereo;\n"
+			"	int stereo_image_count;\n"
+			"};\n"
+			"\n"
+			"vec4 read_source()\n"
+			"{\n"
+			"	if (stereo == 0) return texture(fs0, tc0);\n"
+			"\n"
+			"	vec4 left, right;\n"
+			"	if (stereo_image_count == 2)\n"
+			"	{\n"
+			"		left = texture(fs0, tc0);\n"
+			"		right = texture(fs1, tc0);\n"
+			"	}\n"
+			"	else\n"
+			"	{\n"
+			"		vec2 coord_left = tc0 * vec2(1.f, 0.4898f);\n"
+			"		vec2 coord_right = coord_left + vec2(0.f, 0.510204f);\n"
+			"		left = texture(fs0, coord_left);\n"
+			"		right = texture(fs0, coord_right);\n"
+			"	}\n"
+			"\n"
+			"	return vec4(left.r, right.g, right.b, 1.);\n"
+			"}\n"
+			"\n"
+			"void main()\n"
+			"{\n"
+			"	vec4 color = read_source();\n"
+			"	color.rgb = pow(color.rgb, vec3(gamma));\n"
+			"	if (limit_range > 0)\n"
+			"		ocol = ((color * 220.) + 16.) / 255.;\n"
+			"	else\n"
+			"		ocol = color;\n"
+			"}\n";
 
 		renderpass_config.set_depth_mask(false);
 		renderpass_config.set_color_mask(0, true, true, true, true);
 		renderpass_config.set_attachment_count(1);
 
 		m_num_usable_samplers = 2;
-		m_num_uniform_buffers = 0;
 	}
 
-	std::vector<vk::glsl::program_input> video_out_calibration_pass::get_fragment_inputs()
+	std::vector<VkPushConstantRange> video_out_calibration_pass::get_push_constants()
 	{
-		auto result = overlay_pass::get_fragment_inputs();
-		result.push_back(
-			vk::glsl::program_input::make(
-				::glsl::glsl_fragment_program,
-				"push_constants",
-				vk::glsl::input_type_push_constant,
-				0,
-				0,
-				glsl::push_constant_ref{ .size = 16 }
-			)
-		);
-		return result;
+		VkPushConstantRange constant;
+		constant.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		constant.offset = 0;
+		constant.size = 16;
+
+		return { constant };
 	}
 
-	void video_out_calibration_pass::update_uniforms(vk::command_buffer& cmd, vk::glsl::program* program)
+	void video_out_calibration_pass::update_uniforms(vk::command_buffer& cmd, vk::glsl::program* /*program*/)
 	{
-		vkCmdPushConstants(cmd, program->layout(), VK_SHADER_STAGE_FRAGMENT_BIT, 0, 16, config.data);
+		vkCmdPushConstants(cmd, m_pipeline_layout, VK_SHADER_STAGE_FRAGMENT_BIT, 0, 16, config.data);
 	}
 
 	void video_out_calibration_pass::run(vk::command_buffer& cmd, const areau& viewport, vk::framebuffer* target,
-		const rsx::simple_array<vk::viewable_image*>& src, f32 gamma, bool limited_rgb, stereo_render_mode_options stereo_mode, VkRenderPass render_pass)
+		const rsx::simple_array<vk::viewable_image*>& src, f32 gamma, bool limited_rgb, bool _3d, VkRenderPass render_pass)
 	{
 		config.gamma = gamma;
 		config.limit_range = limited_rgb? 1 : 0;
-		config.stereo_display_mode = static_cast<u8>(stereo_mode);
+		config.stereo = _3d? 1 : 0;
 		config.stereo_image_count = std::min(::size32(src), 2u);
 
 		std::vector<vk::image_view*> views;
@@ -907,7 +1038,7 @@ namespace vk
 		for (auto& img : src)
 		{
 			img->push_layout(cmd, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
-			views.push_back(img->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_IDENTITY)));
+			views.push_back(img->get_view(VK_REMAP_IDENTITY, rsx::default_remap_vector));
 		}
 
 		if (views.size() < 2)
diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.h b/rpcs3/Emu/RSX/VK/VKOverlays.h
index a968f706a1..b165f8af70 100644
--- a/rpcs3/Emu/RSX/VK/VKOverlays.h
+++ b/rpcs3/Emu/RSX/VK/VKOverlays.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#include "../Common/simple_array.hpp"
 #include "../Overlays/overlay_controls.h"
-
 #include "VKProgramPipeline.h"
 #include "VKHelpers.h"
 
 #include "vkutils/data_heap.h"
-#include "vkutils/descriptors.h"
+#include "vkutils/descriptors.hpp"
 #include "vkutils/graphics_pipeline_state.hpp"
 
 #include "Emu/IdManager.h"
@@ -18,7 +16,6 @@ namespace rsx
 {
 	namespace overlays
 	{
-		enum class texture_sampling_mode;
 		struct overlay;
 	}
 }
@@ -44,10 +41,15 @@ namespace vk
 		vk::glsl::shader m_vertex_shader;
 		vk::glsl::shader m_fragment_shader;
 
+		vk::descriptor_pool m_descriptor_pool;
+		VkDescriptorSet m_descriptor_set = nullptr;
+		VkDescriptorSetLayout m_descriptor_layout = nullptr;
+		VkPipelineLayout m_pipeline_layout = nullptr;
+		u32 m_used_descriptors = 0;
+
 		VkFilter m_sampler_filter = VK_FILTER_LINEAR;
 		u32 m_num_usable_samplers = 1;
 		u32 m_num_input_attachments = 0;
-		u32 m_num_uniform_buffers = 1;
 
 		std::unordered_map<u64, std::unique_ptr<vk::glsl::program>> m_program_cache;
 		std::unique_ptr<vk::sampler> m_sampler;
@@ -72,12 +74,14 @@ namespace vk
 		u32 m_vao_offset = 0;
 
 		overlay_pass();
-		virtual ~overlay_pass();
+		~overlay_pass();
 
 		u64 get_pipeline_key(VkRenderPass pass);
 
 		void check_heap();
 
+		void init_descriptors();
+
 		virtual void update_uniforms(vk::command_buffer& /*cmd*/, vk::glsl::program* /*program*/) {}
 
 		virtual std::vector<vk::glsl::program_input> get_vertex_inputs();
@@ -85,8 +89,10 @@ namespace vk
 
 		virtual void get_dynamic_state_entries(std::vector<VkDynamicState>& /*state_descriptors*/) {}
 
-		int sampler_location(int index) const { return 1 + index; }
-		int input_attachment_location(int index) const { return 1 + m_num_usable_samplers + index; }
+		virtual std::vector<VkPushConstantRange> get_push_constants()
+		{
+			return {};
+		}
 
 		template <typename T>
 		void upload_vertex_data(T* data, u32 count)
@@ -101,7 +107,8 @@ namespace vk
 		}
 
 		vk::glsl::program* build_pipeline(u64 storage_key, VkRenderPass render_pass);
-		vk::glsl::program* load_program(vk::command_buffer& cmd, VkRenderPass pass, const std::vector<vk::image_view*>& src);
+
+		void load_program(vk::command_buffer& cmd, VkRenderPass pass, const std::vector<vk::image_view*>& src);
 
 		virtual void create(const vk::render_device& dev);
 		virtual void destroy();
@@ -110,7 +117,7 @@ namespace vk
 
 		vk::framebuffer* get_framebuffer(vk::image* target, VkRenderPass render_pass);
 
-		virtual void emit_geometry(vk::command_buffer& cmd, glsl::program* program);
+		virtual void emit_geometry(vk::command_buffer& cmd);
 
 		virtual void set_up_viewport(vk::command_buffer& cmd, u32 x, u32 y, u32 w, u32 h);
 
@@ -126,9 +133,9 @@ namespace vk
 		color4f m_scale_offset;
 		color4f m_color;
 		bool m_pulse_glow = false;
+		bool m_skip_texture_read = false;
 		bool m_clip_enabled = false;
-		bool m_disable_vertex_snap = false;
-		rsx::overlays::texture_sampling_mode m_texture_type;
+		int  m_texture_type;
 		areaf m_clip_region;
 		coordf m_viewport;
 
@@ -141,11 +148,8 @@ namespace vk
 
 		ui_overlay_renderer();
 
-		void upload_simple_texture(vk::image* tex, vk::command_buffer& cmd,
-			vk::data_heap& upload_heap, u32 w, u32 h, u32 layers, bool font, const void* pixel_src);
-
 		vk::image_view* upload_simple_texture(vk::render_device& dev, vk::command_buffer& cmd,
-			vk::data_heap& upload_heap, u64 key, u32 w, u32 h, u32 layers, bool font, bool temp, const void* pixel_src, u32 owner_uid);
+			vk::data_heap& upload_heap, u64 key, u32 w, u32 h, u32 layers, bool font, bool temp, void* pixel_src, u32 owner_uid);
 
 		void init(vk::command_buffer& cmd, vk::data_heap& upload_heap);
 
@@ -154,16 +158,13 @@ namespace vk
 		void remove_temp_resources(u32 key);
 
 		vk::image_view* find_font(rsx::overlays::font* font, vk::command_buffer& cmd, vk::data_heap& upload_heap);
-		vk::image_view* find_temp_image(rsx::overlays::image_info_base* desc, vk::command_buffer& cmd, vk::data_heap& upload_heap, u32 owner_uid);
+		vk::image_view* find_temp_image(rsx::overlays::image_info* desc, vk::command_buffer& cmd, vk::data_heap& upload_heap, u32 owner_uid);
 
-		std::vector<vk::glsl::program_input> get_vertex_inputs() override;
-		std::vector<vk::glsl::program_input> get_fragment_inputs() override;
-
-		void update_uniforms(vk::command_buffer& cmd, vk::glsl::program* program) override;
+		void update_uniforms(vk::command_buffer& /*cmd*/, vk::glsl::program* /*program*/) override;
 
 		void set_primitive_type(rsx::overlays::primitive_type type);
 
-		void emit_geometry(vk::command_buffer& cmd, glsl::program* program) override;
+		void emit_geometry(vk::command_buffer& cmd) override;
 
 		void run(vk::command_buffer& cmd, const areau& viewport, vk::framebuffer* target, VkRenderPass render_pass,
 				vk::data_heap& upload_heap, rsx::overlays::overlay& ui);
@@ -177,7 +178,7 @@ namespace vk
 
 		attachment_clear_pass();
 
-		std::vector<vk::glsl::program_input> get_vertex_inputs() override;
+		std::vector<VkPushConstantRange> get_push_constants() override;
 
 		void update_uniforms(vk::command_buffer& cmd, vk::glsl::program* program) override;
 
@@ -205,22 +206,22 @@ namespace vk
 			{
 				float gamma;
 				int   limit_range;
-				int   stereo_display_mode;
+				int   stereo;
 				int   stereo_image_count;
 			};
 
 			float data[4];
 		}
-		config = {};
+		config;
 
 		video_out_calibration_pass();
 
-		std::vector<vk::glsl::program_input> get_fragment_inputs() override;
+		std::vector<VkPushConstantRange> get_push_constants() override;
 
 		void update_uniforms(vk::command_buffer& cmd, vk::glsl::program* /*program*/) override;
 
 		void run(vk::command_buffer& cmd, const areau& viewport, vk::framebuffer* target,
-			const rsx::simple_array<vk::viewable_image*>& src, f32 gamma, bool limited_rgb, stereo_render_mode_options stereo_mode, VkRenderPass render_pass);
+			const rsx::simple_array<vk::viewable_image*>& src, f32 gamma, bool limited_rgb, bool _3d, VkRenderPass render_pass);
 	};
 
 	// TODO: Replace with a proper manager
@@ -229,7 +230,7 @@ namespace vk
 	template<class T>
 	T* get_overlay_pass()
 	{
-		u32 index = stx::typeindex<id_manager::typeinfo, T>();
+		u32 index = id_manager::typeinfo::get_index<T>();
 		auto& e = g_overlay_passes[index];
 
 		if (!e)
diff --git a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp b/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp
index 26e0b64098..f83d564393 100644
--- a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp
+++ b/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp
@@ -4,6 +4,8 @@
 #include "vkutils/device.h"
 #include "Utilities/Thread.h"
 
+#include <thread>
+
 #include "util/sysinfo.hpp"
 
 namespace vk
@@ -36,47 +38,39 @@ namespace vk
 			{
 				if (job.is_graphics_job)
 				{
-					auto compiled = int_compile_graphics_pipe(job.graphics_data, job.graphics_modules, job.inputs, {}, job.flags);
+					auto compiled = int_compile_graphics_pipe(job.graphics_data, job.graphics_modules, job.pipe_layout, job.inputs, {});
 					job.callback_func(compiled);
 				}
 				else
 				{
-					auto compiled = int_compile_compute_pipe(job.compute_data, job.inputs, job.flags);
+					auto compiled = int_compile_compute_pipe(job.compute_data, job.pipe_layout);
 					job.callback_func(compiled);
 				}
 			}
 
-			thread_ctrl::wait_on(m_work_queue);
+			thread_ctrl::wait_on(m_work_queue, nullptr);
 		}
 	}
 
-	std::unique_ptr<glsl::program> pipe_compiler::int_compile_compute_pipe(
-		const VkComputePipelineCreateInfo& create_info,
-		const std::vector<glsl::program_input>& cs_inputs,
-		op_flags flags)
+	std::unique_ptr<glsl::program> pipe_compiler::int_compile_compute_pipe(const VkComputePipelineCreateInfo& create_info, VkPipelineLayout pipe_layout)
 	{
-		auto program = std::make_unique<glsl::program>(*m_device, create_info, cs_inputs);
-		program->link(flags & SEPARATE_SHADER_OBJECTS);
-		return program;
+		VkPipeline pipeline;
+		vkCreateComputePipelines(*g_render_device, nullptr, 1, &create_info, nullptr, &pipeline);
+		return std::make_unique<vk::glsl::program>(*m_device, pipeline, pipe_layout);
 	}
 
-	std::unique_ptr<glsl::program> pipe_compiler::int_compile_graphics_pipe(
-		const VkGraphicsPipelineCreateInfo& create_info,
-		const std::vector<glsl::program_input>& vs_inputs,
-		const std::vector<glsl::program_input>& fs_inputs,
-		op_flags flags)
+	std::unique_ptr<glsl::program> pipe_compiler::int_compile_graphics_pipe(const VkGraphicsPipelineCreateInfo& create_info, VkPipelineLayout pipe_layout,
+			const std::vector<glsl::program_input>& vs_inputs, const std::vector<glsl::program_input>& fs_inputs)
 	{
-		auto program = std::make_unique<glsl::program>(*m_device, create_info, vs_inputs, fs_inputs);
-		program->link(flags & SEPARATE_SHADER_OBJECTS);
-		return program;
+		VkPipeline pipeline;
+		CHECK_RESULT(vkCreateGraphicsPipelines(*m_device, nullptr, 1, &create_info, NULL, &pipeline));
+		auto result = std::make_unique<vk::glsl::program>(*m_device, pipeline, pipe_layout, vs_inputs, fs_inputs);
+		result->link();
+		return result;
 	}
 
-	std::unique_ptr<glsl::program> pipe_compiler::int_compile_graphics_pipe(
-		const vk::pipeline_props &create_info,
-		VkShaderModule modules[2],
-		const std::vector<glsl::program_input>& vs_inputs,
-		const std::vector<glsl::program_input>& fs_inputs,
-		op_flags flags)
+	std::unique_ptr<glsl::program> pipe_compiler::int_compile_graphics_pipe(const vk::pipeline_props &create_info, VkShaderModule modules[2], VkPipelineLayout pipe_layout,
+			const std::vector<glsl::program_input>& vs_inputs, const std::vector<glsl::program_input>& fs_inputs)
 	{
 		VkPipelineShaderStageCreateInfo shader_stages[2] = {};
 		shader_stages[0].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
@@ -165,54 +159,52 @@ namespace vk
 		info.stageCount = 2;
 		info.pStages = shader_stages;
 		info.pDynamicState = &dynamic_state_info;
-		info.layout = VK_NULL_HANDLE;
+		info.layout = pipe_layout;
 		info.basePipelineIndex = -1;
 		info.basePipelineHandle = VK_NULL_HANDLE;
 		info.renderPass = vk::get_renderpass(*m_device, create_info.renderpass_key);
 
-		return int_compile_graphics_pipe(info, vs_inputs, fs_inputs, flags);
+		return int_compile_graphics_pipe(info, pipe_layout, vs_inputs, fs_inputs);
 	}
 
 	std::unique_ptr<glsl::program> pipe_compiler::compile(
 		const VkComputePipelineCreateInfo& create_info,
-		op_flags flags, callback_t callback,
-		const std::vector<glsl::program_input>& cs_inputs)
+		VkPipelineLayout pipe_layout,
+		op_flags flags, callback_t callback)
 	{
-		if (flags & COMPILE_INLINE)
+		if (flags == COMPILE_INLINE)
 		{
-			return int_compile_compute_pipe(create_info, cs_inputs, flags);
+			return int_compile_compute_pipe(create_info, pipe_layout);
 		}
 
-		m_work_queue.push(create_info, cs_inputs, flags, callback);
+		m_work_queue.push(create_info, pipe_layout, callback);
 		return {};
 	}
 
 	std::unique_ptr<glsl::program> pipe_compiler::compile(
 		const VkGraphicsPipelineCreateInfo& create_info,
+		VkPipelineLayout pipe_layout,
 		op_flags flags, callback_t /*callback*/,
-		const std::vector<glsl::program_input>& vs_inputs,
-		const std::vector<glsl::program_input>& fs_inputs)
+		const std::vector<glsl::program_input>& vs_inputs, const std::vector<glsl::program_input>& fs_inputs)
 	{
 		// It is very inefficient to defer this as all pointers need to be saved
-		ensure(flags & COMPILE_INLINE);
-		return int_compile_graphics_pipe(create_info, vs_inputs, fs_inputs, flags);
+		ensure(flags == COMPILE_INLINE);
+		return int_compile_graphics_pipe(create_info, pipe_layout, vs_inputs, fs_inputs);
 	}
 
 	std::unique_ptr<glsl::program> pipe_compiler::compile(
-		const vk::pipeline_props &create_info,
-		VkShaderModule vs,
-		VkShaderModule fs,
+		const vk::pipeline_props& create_info,
+		VkShaderModule module_handles[2],
+		VkPipelineLayout pipe_layout,
 		op_flags flags, callback_t callback,
-		const std::vector<glsl::program_input>& vs_inputs,
-		const std::vector<glsl::program_input>& fs_inputs)
+		const std::vector<glsl::program_input>& vs_inputs, const std::vector<glsl::program_input>& fs_inputs)
 	{
-		VkShaderModule modules[] = { vs, fs };
-		if (flags & COMPILE_INLINE)
+		if (flags == COMPILE_INLINE)
 		{
-			return int_compile_graphics_pipe(create_info, modules, vs_inputs, fs_inputs, flags);
+			return int_compile_graphics_pipe(create_info, module_handles, pipe_layout, vs_inputs, fs_inputs);
 		}
 
-		m_work_queue.push(create_info, modules, vs_inputs, fs_inputs, flags, callback);
+		m_work_queue.push(create_info, pipe_layout, module_handles, vs_inputs, fs_inputs, callback);
 		return {};
 	}
 
diff --git a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h b/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h
index 762e8aadfc..5ed3c7b07f 100644
--- a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h
+++ b/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h
@@ -1,4 +1,5 @@
 #pragma once
+#include "../rsx_utils.h"
 #include "Utilities/lockless.h"
 #include "VKProgramPipeline.h"
 #include "vkutils/graphics_pipeline_state.hpp"
@@ -53,16 +54,13 @@ namespace vk
 	class pipe_compiler
 	{
 	public:
-		enum op_flag_bits
+		enum op_flags
 		{
 			COMPILE_DEFAULT = 0,
 			COMPILE_INLINE = 1,
-			COMPILE_DEFERRED = 2,
-			SEPARATE_SHADER_OBJECTS = 4
+			COMPILE_DEFERRED = 2
 		};
 
-		using op_flags = rsx::flags32_t;
-
 		using callback_t = std::function<void(std::unique_ptr<glsl::program>&)>;
 
 		pipe_compiler();
@@ -71,20 +69,21 @@ namespace vk
 		void initialize(const vk::render_device* pdev);
 
 		std::unique_ptr<glsl::program> compile(
-			const VkComputePipelineCreateInfo& cs,
-			op_flags flags, callback_t callback = {},
-			const std::vector<glsl::program_input>& cs_inputs = {});
+			const VkComputePipelineCreateInfo& create_info,
+			VkPipelineLayout pipe_layout,
+			op_flags flags, callback_t callback = {});
 
 		std::unique_ptr<glsl::program> compile(
 			const VkGraphicsPipelineCreateInfo& create_info,
+			VkPipelineLayout pipe_layout,
 			op_flags flags, callback_t callback = {},
 			const std::vector<glsl::program_input>& vs_inputs = {},
 			const std::vector<glsl::program_input>& fs_inputs = {});
 
 		std::unique_ptr<glsl::program> compile(
 			const vk::pipeline_props &create_info,
-			VkShaderModule vs,
-			VkShaderModule fs,
+			VkShaderModule module_handles[2],
+			VkPipelineLayout pipe_layout,
 			op_flags flags, callback_t callback = {},
 			const std::vector<glsl::program_input>& vs_inputs = {},
 			const std::vector<glsl::program_input>& fs_inputs = {});
@@ -114,25 +113,24 @@ namespace vk
 
 			vk::pipeline_props graphics_data;
 			compute_pipeline_props compute_data;
+			VkPipelineLayout pipe_layout;
 			VkShaderModule graphics_modules[2];
 			std::vector<glsl::program_input> inputs;
 
-			op_flags flags;
-
 			pipe_compiler_job(
 				const vk::pipeline_props& props,
+				VkPipelineLayout layout,
 				VkShaderModule modules[2],
 				const std::vector<glsl::program_input>& vs_in,
 				const std::vector<glsl::program_input>& fs_in,
-				op_flags flags_,
 				callback_t func)
 			{
 				callback_func = func;
 				graphics_data = props;
+				pipe_layout = layout;
 				graphics_modules[0] = modules[0];
 				graphics_modules[1] = modules[1];
 				is_graphics_job = true;
-				flags = flags_;
 
 				inputs.reserve(vs_in.size() + fs_in.size());
 				inputs.insert(inputs.end(), vs_in.begin(), vs_in.end());
@@ -141,42 +139,24 @@ namespace vk
 
 			pipe_compiler_job(
 				const VkComputePipelineCreateInfo& props,
-				const std::vector<glsl::program_input>& cs_in,
-				op_flags flags_,
+				VkPipelineLayout layout,
 				callback_t func)
 			{
 				callback_func = func;
 				compute_data = props;
+				pipe_layout = layout;
 				is_graphics_job = false;
-				flags = flags_;
-
-				graphics_modules[0] = VK_NULL_HANDLE;
-				graphics_modules[1] = VK_NULL_HANDLE;
-
-				inputs = cs_in;
 			}
 		};
 
 		const vk::render_device* m_device = nullptr;
 		lf_queue<pipe_compiler_job> m_work_queue;
 
-		std::unique_ptr<glsl::program> int_compile_compute_pipe(
-			const VkComputePipelineCreateInfo& create_info,
-			const std::vector<glsl::program_input>& cs_inputs,
-			op_flags flags);
-
-		std::unique_ptr<glsl::program> int_compile_graphics_pipe(
-			const VkGraphicsPipelineCreateInfo& create_info,
-			const std::vector<glsl::program_input>& vs_inputs,
-			const std::vector<glsl::program_input>& fs_inputs,
-			op_flags flags);
-
-		std::unique_ptr<glsl::program> int_compile_graphics_pipe(
-			const vk::pipeline_props &create_info,
-			VkShaderModule modules[2],
-			const std::vector<glsl::program_input>& vs_inputs,
-			const std::vector<glsl::program_input>& fs_inputs,
-			op_flags flags);
+		std::unique_ptr<glsl::program> int_compile_compute_pipe(const VkComputePipelineCreateInfo& create_info, VkPipelineLayout pipe_layout);
+		std::unique_ptr<glsl::program> int_compile_graphics_pipe(const VkGraphicsPipelineCreateInfo& create_info, VkPipelineLayout pipe_layout,
+			const std::vector<glsl::program_input>& vs_inputs, const std::vector<glsl::program_input>& fs_inputs);
+		std::unique_ptr<glsl::program> int_compile_graphics_pipe(const vk::pipeline_props &create_info, VkShaderModule modules[2], VkPipelineLayout pipe_layout,
+			const std::vector<glsl::program_input>& vs_inputs, const std::vector<glsl::program_input>& fs_inputs);
 	};
 
 	void initialize_pipe_compiler(int num_worker_threads = -1);
diff --git a/rpcs3/Emu/RSX/VK/VKPresent.cpp b/rpcs3/Emu/RSX/VK/VKPresent.cpp
index a685dbabaa..1741f0a895 100644
--- a/rpcs3/Emu/RSX/VK/VKPresent.cpp
+++ b/rpcs3/Emu/RSX/VK/VKPresent.cpp
@@ -1,37 +1,12 @@
 #include "stdafx.h"
 #include "VKGSRender.h"
 #include "vkutils/buffer_object.h"
-#include "Emu/RSX/Overlays/overlay_manager.h"
-#include "Emu/RSX/Overlays/overlay_debug_overlay.h"
+#include "Emu/RSX/Overlays/overlays.h"
 #include "Emu/Cell/Modules/cellVideoOut.h"
 
 #include "upscalers/bilinear_pass.hpp"
 #include "upscalers/fsr_pass.h"
-#include "upscalers/nearest_pass.hpp"
 #include "util/asm.hpp"
-#include "util/video_provider.h"
-
-extern atomic_t<bool> g_user_asked_for_screenshot;
-extern atomic_t<recording_mode> g_recording_mode;
-
-namespace
-{
-	VkFormat RSX_display_format_to_vk_format(u8 format)
-	{
-		switch (format)
-		{
-		default:
-			rsx_log.error("Unhandled video output format 0x%x", static_cast<s32>(format));
-			[[fallthrough]];
-		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8:
-			return VK_FORMAT_B8G8R8A8_UNORM;
-		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8B8G8R8:
-			return VK_FORMAT_R8G8B8A8_UNORM;
-		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_R16G16B16X16_FLOAT:
-			return VK_FORMAT_R16G16B16A16_SFLOAT;
-		}
-	}
-}
 
 void VKGSRender::reinitialize_swapchain()
 {
@@ -48,9 +23,9 @@ void VKGSRender::reinitialize_swapchain()
 	}
 
 	// NOTE: This operation will create a hard sync point
-	close_and_submit_command_buffer();
+	close_and_submit_command_buffer(m_current_command_buffer->submit_fence);
+	m_current_command_buffer->pending = true;
 	m_current_command_buffer->reset();
-	m_current_command_buffer->begin();
 
 	for (auto &ctx : frame_context_storage)
 	{
@@ -58,7 +33,7 @@ void VKGSRender::reinitialize_swapchain()
 			continue;
 
 		// Release present image by presenting it
-		frame_context_cleanup(&ctx);
+		frame_context_cleanup(&ctx, true);
 	}
 
 	// Discard the current upscaling pipeline if any
@@ -72,10 +47,13 @@ void VKGSRender::reinitialize_swapchain()
 	{
 		rsx_log.warning("Swapchain initialization failed. Request ignored [%dx%d]", m_swapchain_dims.width, m_swapchain_dims.height);
 		swapchain_unavailable = true;
+		open_command_buffer();
 		return;
 	}
 
 	// Prepare new swapchain images for use
+	open_command_buffer();
+
 	for (u32 i = 0; i < m_swapchain->get_swap_image_count(); ++i)
 	{
 		const auto target_layout = m_swapchain->get_optimal_present_layout();
@@ -96,7 +74,7 @@ void VKGSRender::reinitialize_swapchain()
 	vk::wait_for_fence(&resize_fence);
 
 	m_current_command_buffer->reset();
-	m_current_command_buffer->begin();
+	open_command_buffer();
 
 	swapchain_unavailable = false;
 	should_reinitialize_swapchain = false;
@@ -116,19 +94,13 @@ void VKGSRender::present(vk::frame_context_t *ctx)
 		case VK_SUCCESS:
 			break;
 		case VK_SUBOPTIMAL_KHR:
-#ifndef ANDROID
 			should_reinitialize_swapchain = true;
-#endif
 			break;
 		case VK_ERROR_OUT_OF_DATE_KHR:
 			swapchain_unavailable = true;
 			break;
 		default:
-			// Other errors not part of rpcs3. This can be caused by 3rd party injectors with bad code, of which we have no control over.
-			// Let the application attempt to recover instead of crashing outright.
-			rsx_log.error("VkPresent returned unexpected error code %lld. Will attempt to recreate the swapchain. Please disable 3rd party injector tools.", static_cast<s64>(error));
-			swapchain_unavailable = true;
-			break;
+			vk::die_with_error(error);
 		}
 	}
 
@@ -146,7 +118,7 @@ void VKGSRender::advance_queued_frames()
 	vk::vmm_check_memory_usage();
 
 	// m_rtts storage is double buffered and should be safe to tag on frame boundary
-	m_rtts.trim(*m_current_command_buffer, vk::vmm_determine_memory_load_severity());
+	m_rtts.free_invalidated(*m_current_command_buffer, vk::vmm_determine_memory_load_severity());
 
 	// Texture cache is also double buffered to prevent use-after-free
 	m_texture_cache.on_frame_end();
@@ -155,7 +127,16 @@ void VKGSRender::advance_queued_frames()
 	vk::remove_unused_framebuffers();
 
 	m_vertex_cache->purge();
-	m_current_frame->tag_frame_end();
+	m_current_frame->tag_frame_end(m_attrib_ring_info.get_current_put_pos_minus_one(),
+		m_vertex_env_ring_info.get_current_put_pos_minus_one(),
+		m_fragment_env_ring_info.get_current_put_pos_minus_one(),
+		m_vertex_layout_ring_info.get_current_put_pos_minus_one(),
+		m_fragment_texture_params_ring_info.get_current_put_pos_minus_one(),
+		m_fragment_constants_ring_info.get_current_put_pos_minus_one(),
+		m_transform_constants_ring_info.get_current_put_pos_minus_one(),
+		m_index_buffer_ring_info.get_current_put_pos_minus_one(),
+		m_texture_upload_buffer_ring_info.get_current_put_pos_minus_one(),
+		m_raster_env_ring_info.get_current_put_pos_minus_one());
 
 	m_queued_frames.push_back(m_current_frame);
 	ensure(m_queued_frames.size() <= VK_MAX_ASYNC_FRAMES);
@@ -175,21 +156,25 @@ void VKGSRender::queue_swap_request()
 	if (m_swapchain->is_headless())
 	{
 		m_swapchain->end_frame(*m_current_command_buffer, m_current_frame->present_image);
-		close_and_submit_command_buffer();
+		close_and_submit_command_buffer(m_current_command_buffer->submit_fence);
 	}
 	else
 	{
-		close_and_submit_command_buffer(nullptr,
+		close_and_submit_command_buffer(m_current_command_buffer->submit_fence,
 			m_current_frame->acquire_signal_semaphore,
 			m_current_frame->present_wait_semaphore,
 			VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | VK_PIPELINE_STAGE_TRANSFER_BIT);
 	}
 
+	// Signal pending state as the command queue is now closed
+	m_current_frame->swap_command_buffer->pending = true;
+
 	// Set up a present request for this frame as well
 	present(m_current_frame);
 
 	// Grab next cb in line and make it usable
-	m_current_command_buffer = m_primary_cb_list.next();
+	m_current_cb_index = (m_current_cb_index + 1) % VK_MAX_ASYNC_CB_COUNT;
+	m_current_command_buffer = &m_primary_cb_list[m_current_cb_index];
 	m_current_command_buffer->reset();
 	m_current_command_buffer->begin();
 
@@ -197,23 +182,33 @@ void VKGSRender::queue_swap_request()
 	advance_queued_frames();
 }
 
-void VKGSRender::frame_context_cleanup(vk::frame_context_t *ctx)
+void VKGSRender::frame_context_cleanup(vk::frame_context_t *ctx, bool free_resources)
 {
 	ensure(ctx->swap_command_buffer);
 
-	// Perform hard swap here
-	if (ctx->swap_command_buffer->wait(FRAME_PRESENT_TIMEOUT) != VK_SUCCESS)
+	if (ctx->swap_command_buffer->pending)
 	{
-		// Lost surface/device, release swapchain
-		swapchain_unavailable = true;
+		// Perform hard swap here
+		if (ctx->swap_command_buffer->wait(FRAME_PRESENT_TIMEOUT) != VK_SUCCESS)
+		{
+			// Lost surface/device, release swapchain
+			swapchain_unavailable = true;
+		}
+
+		free_resources = true;
 	}
 
-	// Resource cleanup.
+	if (free_resources)
 	{
+		if (m_text_writer)
+		{
+			m_text_writer->reset_descriptors();
+		}
+
 		if (m_overlay_manager && m_overlay_manager->has_dirty())
 		{
 			auto ui_renderer = vk::get_overlay_pass<vk::ui_overlay_renderer>();
-			m_overlay_manager->lock_shared();
+			m_overlay_manager->lock();
 
 			std::vector<u32> uids_to_dispose;
 			uids_to_dispose.reserve(m_overlay_manager->get_dirty().size());
@@ -224,20 +219,47 @@ void VKGSRender::frame_context_cleanup(vk::frame_context_t *ctx)
 				uids_to_dispose.push_back(view->uid);
 			}
 
-			m_overlay_manager->unlock_shared();
+			m_overlay_manager->unlock();
 			m_overlay_manager->dispose(uids_to_dispose);
 		}
 
-		vk::get_resource_manager()->trim();
-
 		vk::reset_global_resources();
 
+		ctx->buffer_views_to_clean.clear();
+
+		const auto shadermode = g_cfg.video.shadermode.get();
+
+		if (shadermode == shader_mode::async_with_interpreter || shadermode == shader_mode::interpreter_only)
+		{
+			// TODO: This is jank AF
+			m_vertex_instructions_buffer.reset_allocation_stats();
+			m_fragment_instructions_buffer.reset_allocation_stats();
+		}
+
 		if (ctx->last_frame_sync_time > m_last_heap_sync_time)
 		{
 			m_last_heap_sync_time = ctx->last_frame_sync_time;
 
 			// Heap cleanup; deallocates memory consumed by the frame if it is still held
-			vk::data_heap_manager::restore_snapshot(ctx->heap_snapshot);
+			m_attrib_ring_info.m_get_pos = ctx->attrib_heap_ptr;
+			m_vertex_env_ring_info.m_get_pos = ctx->vtx_env_heap_ptr;
+			m_fragment_env_ring_info.m_get_pos = ctx->frag_env_heap_ptr;
+			m_fragment_constants_ring_info.m_get_pos = ctx->frag_const_heap_ptr;
+			m_transform_constants_ring_info.m_get_pos = ctx->vtx_const_heap_ptr;
+			m_vertex_layout_ring_info.m_get_pos = ctx->vtx_layout_heap_ptr;
+			m_fragment_texture_params_ring_info.m_get_pos = ctx->frag_texparam_heap_ptr;
+			m_index_buffer_ring_info.m_get_pos = ctx->index_heap_ptr;
+			m_texture_upload_buffer_ring_info.m_get_pos = ctx->texture_upload_heap_ptr;
+
+			m_attrib_ring_info.notify();
+			m_vertex_env_ring_info.notify();
+			m_fragment_env_ring_info.notify();
+			m_fragment_constants_ring_info.notify();
+			m_transform_constants_ring_info.notify();
+			m_vertex_layout_ring_info.notify();
+			m_fragment_texture_params_ring_info.notify();
+			m_index_buffer_ring_info.notify();
+			m_texture_upload_buffer_ring_info.notify();
 		}
 	}
 
@@ -258,17 +280,14 @@ void VKGSRender::frame_context_cleanup(vk::frame_context_t *ctx)
 	vk::advance_completed_frame_counter();
 }
 
-vk::viewable_image* VKGSRender::get_present_source(/* inout */ vk::present_surface_info* info, const rsx::avconf& avconfig)
+vk::viewable_image* VKGSRender::get_present_source(vk::present_surface_info* info, const rsx::avconf& avconfig)
 {
 	vk::viewable_image* image_to_flip = nullptr;
 
-	// @FIXME: This entire function needs to be rewritten to go through the texture cache's "upload_texture" routine.
-	// That method is not a 1:1 replacement due to handling of insets that is done differently here.
-
 	// Check the surface store first
 	const auto format_bpp = rsx::get_format_block_size_in_bytes(info->format);
 	const auto overlap_info = m_rtts.get_merged_texture_memory_region(*m_current_command_buffer,
-		info->address, info->width, info->height, info->pitch, format_bpp, rsx::surface_access::transfer_read);
+		info->address, info->width, info->height, info->pitch, format_bpp, rsx::surface_access::shader_read);
 
 	if (!overlap_info.empty())
 	{
@@ -278,8 +297,8 @@ vk::viewable_image* VKGSRender::get_present_source(/* inout */ vk::present_surfa
 
 		if (section.base_address >= info->address)
 		{
-			const auto surface_width = surface->get_surface_width<rsx::surface_metrics::samples>();
-			const auto surface_height = surface->get_surface_height<rsx::surface_metrics::samples>();
+			const auto surface_width = surface->get_surface_width(rsx::surface_metrics::samples);
+			const auto surface_height = surface->get_surface_height(rsx::surface_metrics::samples);
 
 			if (section.base_address == info->address)
 			{
@@ -301,11 +320,12 @@ vk::viewable_image* VKGSRender::get_present_source(/* inout */ vk::present_surfa
 
 			if (viable)
 			{
-				image_to_flip = section.surface->get_surface(rsx::surface_access::transfer_read);
+				surface->read_barrier(*m_current_command_buffer);
+				image_to_flip = section.surface->get_surface(rsx::surface_access::shader_read);
 
 				std::tie(info->width, info->height) = rsx::apply_resolution_scale<true>(
-					std::min(surface_width, info->width),
-					std::min(surface_height, info->height));
+					std::min(surface_width, static_cast<u16>(info->width)),
+					std::min(surface_height, static_cast<u16>(info->height)));
 			}
 		}
 	}
@@ -317,15 +337,10 @@ vk::viewable_image* VKGSRender::get_present_source(/* inout */ vk::present_surfa
 		image_to_flip = dynamic_cast<vk::viewable_image*>(surface->get_raw_texture());
 	}
 
-	// The correct output format is determined by the AV configuration set in CellVideoOutConfigure by the game.
-	// 99.9% of the time, this will match the backbuffer fbo format used in rendering/compositing the output.
-	// But in some cases, let's just say some devs are creative.
-	const auto expected_format = RSX_display_format_to_vk_format(avconfig.format);
-
-	if (!image_to_flip) [[ unlikely ]]
+	if (!image_to_flip)
 	{
 		// Read from cell
-		const auto range = utils::address_range32::start_length(info->address, info->pitch * info->height);
+		const auto range = utils::address_range::start_length(info->address, info->pitch * info->height);
 		const u32  lookup_mask = rsx::texture_upload_context::blit_engine_dst | rsx::texture_upload_context::framebuffer_storage;
 		const auto overlap = m_texture_cache.find_texture_from_range<true>(range, 0, lookup_mask);
 
@@ -343,35 +358,22 @@ vk::viewable_image* VKGSRender::get_present_source(/* inout */ vk::present_surfa
 			flush_command_queue();
 		}
 
-		m_texture_cache.invalidate_range(*m_current_command_buffer, range, rsx::invalidation_cause::read);
-		image_to_flip = m_texture_cache.upload_image_simple(*m_current_command_buffer, expected_format, info->address, info->width, info->height, info->pitch);
-	}
-	else if (image_to_flip->format() != expected_format)
-	{
-		// Devs are being creative. Force-cast this to the proper pixel layout.
-		auto dst_img = m_texture_cache.create_temporary_subresource_storage(
-			RSX_FORMAT_CLASS_COLOR, expected_format, info->width, info->height, 1, 1, 1,
-			VK_IMAGE_TYPE_2D, 0, VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT);
-
-		if (dst_img)
+		VkFormat format;
+		switch (avconfig.format)
 		{
-			const areai src_rect = { 0, 0, static_cast<int>(info->width), static_cast<int>(info->height) };
-			const areai dst_rect = src_rect;
-
-			dst_img->change_layout(*m_current_command_buffer, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
-
-			if (vk::formats_are_bitcast_compatible(dst_img.get(), image_to_flip))
-			{
-				vk::copy_image(*m_current_command_buffer, image_to_flip, dst_img.get(), src_rect, dst_rect, 1);
-			}
-			else
-			{
-				vk::copy_image_typeless(*m_current_command_buffer, image_to_flip, dst_img.get(), src_rect, dst_rect, 1);
-			}
-
-			image_to_flip = dst_img.get();
-			m_texture_cache.dispose_reusable_image(dst_img);
+		default:
+			rsx_log.error("Unhandled video output format 0x%x", avconfig.format);
+			[[fallthrough]];
+		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8:
+			format = VK_FORMAT_B8G8R8A8_UNORM;
+			break;
+		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8B8G8R8:
+			format = VK_FORMAT_R8G8B8A8_UNORM;
+			break;
 		}
+
+		m_texture_cache.invalidate_range(*m_current_command_buffer, range, rsx::invalidation_cause::read);
+		image_to_flip = m_texture_cache.upload_image_simple(*m_current_command_buffer, format, info->address, info->width, info->height, info->pitch);
 	}
 
 	return image_to_flip;
@@ -402,10 +404,11 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 		if (m_current_frame->swap_command_buffer)
 		{
 			// Its possible this flip request is triggered by overlays and the flip queue is in undefined state
-			frame_context_cleanup(m_current_frame);
+			frame_context_cleanup(m_current_frame, true);
 		}
 
 		// Swap aux storage and current frame; aux storage should always be ready for use at all times
+		m_current_frame->swap_storage(m_aux_frame_context);
 		m_current_frame->grab_resources(m_aux_frame_context);
 	}
 	else if (m_current_frame->swap_command_buffer)
@@ -417,7 +420,7 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 		}
 
 		// There were no draws and back-to-back flips happened
-		frame_context_cleanup(m_current_frame);
+		frame_context_cleanup(m_current_frame, true);
 	}
 
 	if (info.skip_frame || swapchain_unavailable)
@@ -430,7 +433,7 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 			m_current_frame->swap_command_buffer = m_current_command_buffer;
 			flush_command_queue(true);
 			vk::advance_frame_counter();
-			frame_context_cleanup(m_current_frame);
+			frame_context_cleanup(m_current_frame, true);
 		}
 
 		m_frame->flip(m_context);
@@ -443,13 +446,7 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 	u32 buffer_pitch = display_buffers[info.buffer].pitch;
 
 	u32 av_format;
-	const auto& avconfig = g_fxo->get<rsx::avconf>();
-
-	if (!buffer_width)
-	{
-		buffer_width = avconfig.resolution_x;
-		buffer_height = avconfig.resolution_y;
-	}
+	auto& avconfig = g_fxo->get<rsx::avconf>();
 
 	if (avconfig.state)
 	{
@@ -457,7 +454,7 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 		if (!buffer_pitch)
 			buffer_pitch = buffer_width * avconfig.get_bpp();
 
-		const u32 video_frame_height = (avconfig.stereo_mode == stereo_render_mode_options::disabled ? avconfig.resolution_y : ((avconfig.resolution_y - 30) / 2));
+		const u32 video_frame_height = (!avconfig._3d? avconfig.resolution_y : (avconfig.resolution_y - 30) / 2);
 		buffer_width = std::min(buffer_width, avconfig.resolution_x);
 		buffer_height = std::min(buffer_height, video_frame_height);
 	}
@@ -472,18 +469,16 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 	vk::viewable_image *image_to_flip = nullptr, *image_to_flip2 = nullptr;
 	if (info.buffer < display_buffers_count && buffer_width && buffer_height)
 	{
-		vk::present_surface_info present_info
-		{
-			.address = rsx::get_address(display_buffers[info.buffer].offset, CELL_GCM_LOCATION_LOCAL),
-			.format = av_format,
-			.width = buffer_width,
-			.height = buffer_height,
-			.pitch = buffer_pitch,
-			.eye = 0
-		};
+		vk::present_surface_info present_info;
+		present_info.width = buffer_width;
+		present_info.height = buffer_height;
+		present_info.pitch = buffer_pitch;
+		present_info.format = av_format;
+		present_info.address = rsx::get_address(display_buffers[info.buffer].offset, CELL_GCM_LOCATION_LOCAL);
+
 		image_to_flip = get_present_source(&present_info, avconfig);
 
-		if (avconfig.stereo_mode != stereo_render_mode_options::disabled) [[unlikely]]
+		if (avconfig._3d) [[unlikely]]
 		{
 			const auto [unused, min_expected_height] = rsx::apply_resolution_scale<true>(RSX_SURFACE_DIMENSION_IGNORED, buffer_height + 30);
 			if (image_to_flip->height() < min_expected_height)
@@ -493,7 +488,6 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 				present_info.width = buffer_width;
 				present_info.height = buffer_height;
 				present_info.address = rsx::get_address(image_offset, CELL_GCM_LOCATION_LOCAL);
-				present_info.eye = 1;
 
 				image_to_flip2 = get_present_source(&present_info, avconfig);
 			}
@@ -509,11 +503,6 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 		buffer_height = present_info.height;
 	}
 
-	if (info.emu_flip)
-	{
-		evaluate_cpu_usage_reduction_limits();
-	}
-
 	// Prepare surface for new frame. Set no timeout here so that we wait for the next image if need be
 	ensure(m_current_frame->present_image == umax);
 	ensure(m_current_frame->swap_command_buffer == nullptr);
@@ -561,17 +550,30 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 	ensure(m_current_frame->present_image != umax);
 
 	// Calculate output dimensions. Done after swapchain acquisition in case it was recreated.
-	areai aspect_ratio;
+	coordi aspect_ratio;
+	sizei csize = static_cast<sizei>(m_swapchain_dims);
+	sizei new_size = csize;
+
 	if (!g_cfg.video.stretch_to_display_area)
 	{
-		const auto converted = avconfig.aspect_convert_region({ buffer_width, buffer_height }, m_swapchain_dims);
-		aspect_ratio = static_cast<areai>(converted);
-	}
-	else
-	{
-		aspect_ratio = { 0, 0, s32(m_swapchain_dims.width), s32(m_swapchain_dims.height) };
+		const double aq = 1. * buffer_width / buffer_height;
+		const double rq = 1. * new_size.width / new_size.height;
+		const double q = aq / rq;
+
+		if (q > 1.0)
+		{
+			new_size.height = static_cast<int>(new_size.height / q);
+			aspect_ratio.y = (csize.height - new_size.height) / 2;
+		}
+		else if (q < 1.0)
+		{
+			new_size.width = static_cast<int>(new_size.width * q);
+			aspect_ratio.x = (csize.width - new_size.width) / 2;
+		}
 	}
 
+	aspect_ratio.size = new_size;
+
 	// Blit contents to screen..
 	VkImage target_image = m_swapchain->get_image(m_current_frame->present_image);
 	const auto present_layout = m_swapchain->get_optimal_present_layout();
@@ -583,7 +585,7 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 	vk::framebuffer_holder* direct_fbo = nullptr;
 	rsx::simple_array<vk::viewable_image*> calibration_src;
 
-	if (!image_to_flip || aspect_ratio.x1 || aspect_ratio.y1)
+	if (!image_to_flip || aspect_ratio.width < csize.width || aspect_ratio.height < csize.height)
 	{
 		// Clear the window background to black
 		VkClearColorValue clear_black {};
@@ -593,17 +595,9 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 		target_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
 	}
 
-	const output_scaling_mode output_scaling = g_cfg.video.output_scaling.get();
-
-	if (!m_upscaler || m_output_scaling != output_scaling)
+	if (!m_upscaler)
 	{
-		m_output_scaling = output_scaling;
-
-		if (m_output_scaling == output_scaling_mode::nearest)
-		{
-			m_upscaler = std::make_unique<vk::nearest_upscale_pass>();
-		}
-		else if (m_output_scaling == output_scaling_mode::fsr)
+		if (g_cfg.video.vk.fsr_upscaling)
 		{
 			m_upscaler = std::make_unique<vk::fsr_upscale_pass>();
 		}
@@ -617,12 +611,12 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 	{
 		const bool use_full_rgb_range_output = g_cfg.video.full_rgb_range_output.get();
 
-		if (!use_full_rgb_range_output || !rsx::fcmp(avconfig.gamma, 1.f) || avconfig.stereo_mode != stereo_render_mode_options::disabled) [[unlikely]]
+		if (!use_full_rgb_range_output || !rsx::fcmp(avconfig.gamma, 1.f) || avconfig._3d) [[unlikely]]
 		{
 			if (image_to_flip) calibration_src.push_back(image_to_flip);
 			if (image_to_flip2) calibration_src.push_back(image_to_flip2);
 
-			if (m_output_scaling == output_scaling_mode::fsr && avconfig.stereo_mode == stereo_render_mode_options::disabled) // 3D will be implemented later
+			if (g_cfg.video.vk.fsr_upscaling && !avconfig._3d) // 3D will be implemented later
 			{
 				// Run upscaling pass before the rest of the output effects pipeline
 				// This can be done with all upscalers but we already get bilinear upscaling for free if we just out the filters directly
@@ -632,7 +626,7 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 				request.srcOffsets[0] = { 0, 0, 0 };
 				request.srcOffsets[1] = { s32(buffer_width), s32(buffer_height), 1 };
 				request.dstOffsets[0] = { 0, 0, 0 };
-				request.dstOffsets[1] = { aspect_ratio.width(), aspect_ratio.height(), 1 };
+				request.dstOffsets[1] = { aspect_ratio.width, aspect_ratio.height, 1 };
 
 				for (unsigned i = 0; i < calibration_src.size(); ++i)
 				{
@@ -653,20 +647,22 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 
 			vk::get_overlay_pass<vk::video_out_calibration_pass>()->run(
 				*m_current_command_buffer, areau(aspect_ratio), direct_fbo, calibration_src,
-				avconfig.gamma, !use_full_rgb_range_output, avconfig.stereo_mode, single_target_pass);
+				avconfig.gamma, !use_full_rgb_range_output, avconfig._3d, single_target_pass);
 
 			direct_fbo->release();
 		}
 		else
 		{
 			// Do raw transfer here as there is no image object associated with textures owned by the driver (TODO)
+			const areai dst_rect = aspect_ratio;
 			VkImageBlit rgn = {};
+
 			rgn.srcSubresource = { image_to_flip->aspect(), 0, 0, 1 };
 			rgn.dstSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 };
 			rgn.srcOffsets[0] = { 0, 0, 0 };
 			rgn.srcOffsets[1] = { s32(buffer_width), s32(buffer_height), 1 };
-			rgn.dstOffsets[0] = { aspect_ratio.x1, aspect_ratio.y1, 0 };
-			rgn.dstOffsets[1] = { aspect_ratio.x2, aspect_ratio.y2, 1 };
+			rgn.dstOffsets[0] = { dst_rect.x1, dst_rect.y1, 0 };
+			rgn.dstOffsets[1] = { dst_rect.x2, dst_rect.y2, 1 };
 
 			if (target_layout != VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL)
 			{
@@ -677,8 +673,10 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 			m_upscaler->scale_output(*m_current_command_buffer, image_to_flip, target_image, target_layout, rgn, UPSCALE_AND_COMMIT | UPSCALE_DEFAULT_VIEW);
 		}
 
-		if (g_user_asked_for_screenshot || (g_recording_mode != recording_mode::stopped && m_frame->can_consume_frame()))
+		if (m_frame->screenshot_toggle)
 		{
+			m_frame->screenshot_toggle = false;
+
 			const usz sshot_size = buffer_height * buffer_width * 4;
 
 			vk::buffer sshot_vkbuf(*m_device, utils::align(sshot_size, 0x100000), m_device->get_memory_mapping().host_visible_coherent,
@@ -710,20 +708,12 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 			sshot_vkbuf.unmap();
 
 			const bool is_bgra = image_to_flip->format() == VK_FORMAT_B8G8R8A8_UNORM;
-
-			if (g_user_asked_for_screenshot.exchange(false))
-			{
-				m_frame->take_screenshot(std::move(sshot_frame), buffer_width, buffer_height, is_bgra);
-			}
-			else
-			{
-				m_frame->present_frame(sshot_frame, buffer_width * 4, buffer_width, buffer_height, is_bgra);
-			}
+			m_frame->take_screenshot(std::move(sshot_frame), buffer_width, buffer_height, is_bgra);
 		}
 	}
 
 	const bool has_overlay = (m_overlay_manager && m_overlay_manager->has_visible());
-	if (g_cfg.video.debug_overlay || has_overlay)
+	if (g_cfg.video.overlay || has_overlay)
 	{
 		if (target_layout != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL)
 		{
@@ -766,8 +756,25 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 			}
 		}
 
-		if (g_cfg.video.debug_overlay)
+		if (g_cfg.video.overlay)
 		{
+			if (!m_text_writer)
+			{
+				auto key = vk::get_renderpass_key(m_swapchain->get_surface_format());
+				m_text_writer = std::make_unique<vk::text_writer>();
+				m_text_writer->init(*m_device, vk::get_renderpass(*m_device, key));
+			}
+
+			m_text_writer->set_scale(m_frame->client_device_pixel_ratio());
+
+			m_text_writer->print_text(*m_current_command_buffer, *direct_fbo, 4,   0, direct_fbo->width(), direct_fbo->height(), fmt::format("RSX Load:                 %3d%%", get_load()));
+			m_text_writer->print_text(*m_current_command_buffer, *direct_fbo, 4,  18, direct_fbo->width(), direct_fbo->height(), fmt::format("draw calls: %17d", info.stats.draw_calls));
+			m_text_writer->print_text(*m_current_command_buffer, *direct_fbo, 4,  36, direct_fbo->width(), direct_fbo->height(), fmt::format("draw call setup: %12dus", info.stats.setup_time));
+			m_text_writer->print_text(*m_current_command_buffer, *direct_fbo, 4,  54, direct_fbo->width(), direct_fbo->height(), fmt::format("vertex upload time: %9dus", info.stats.vertex_upload_time));
+			m_text_writer->print_text(*m_current_command_buffer, *direct_fbo, 4,  72, direct_fbo->width(), direct_fbo->height(), fmt::format("texture upload time: %8dus", info.stats.textures_upload_time));
+			m_text_writer->print_text(*m_current_command_buffer, *direct_fbo, 4,  90, direct_fbo->width(), direct_fbo->height(), fmt::format("draw call execution: %8dus", info.stats.draw_exec_time));
+			m_text_writer->print_text(*m_current_command_buffer, *direct_fbo, 4, 108, direct_fbo->width(), direct_fbo->height(), fmt::format("submit and flip: %12dus", info.stats.flip_time));
+
 			const auto num_dirty_textures = m_texture_cache.get_unreleased_textures_count();
 			const auto texture_memory_size = m_texture_cache.get_texture_memory_in_use() / (1024 * 1024);
 			const auto tmp_texture_memory_size = m_texture_cache.get_temporary_memory_in_use() / (1024 * 1024);
@@ -780,43 +787,11 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info)
 			const auto num_texture_upload = m_texture_cache.get_texture_upload_calls_this_frame();
 			const auto num_texture_upload_miss = m_texture_cache.get_texture_upload_misses_this_frame();
 			const auto texture_upload_miss_ratio = m_texture_cache.get_texture_upload_miss_percentage();
-			const auto texture_copies_ellided = m_texture_cache.get_texture_copies_ellided_this_frame();
-			const auto vertex_cache_hit_count = (info.stats.vertex_cache_request_count - info.stats.vertex_cache_miss_count);
-			const auto vertex_cache_hit_ratio = info.stats.vertex_cache_request_count
-				? (vertex_cache_hit_count * 100) / info.stats.vertex_cache_request_count
-				: 0;
-			const auto program_cache_lookups = info.stats.program_cache_lookups_total;
-			const auto program_cache_ellided = info.stats.program_cache_lookups_ellided;
-			const auto program_cache_ellision_rate = program_cache_lookups
-				? (program_cache_ellided * 100) / program_cache_lookups
-				: 0;
-
-			rsx::overlays::set_debug_overlay_text(fmt::format(
-				"Internal Resolution:      %s\n"
-				"RSX Load:                 %3d%%\n"
-				"draw calls: %17d\n"
-				"submits: %20d\n"
-				"draw call setup: %12dus\n"
-				"vertex upload time: %9dus\n"
-				"texture upload time: %8dus\n"
-				"draw call execution: %8dus\n"
-				"submit and flip: %12dus\n"
-				"Unreleased textures: %8d\n"
-				"Texture cache memory: %7dM\n"
-				"Temporary texture memory: %3dM\n"
-				"Flush requests: %13d  = %2d (%3d%%) hard faults, %2d unavoidable, %2d misprediction(s), %2d speculation(s)\n"
-				"Texture uploads: %12u (%u from CPU - %02u%%, %u copies avoided)\n"
-				"Vertex cache hits: %10u/%u (%u%%)\n"
-				"Program cache lookup ellision: %u/%u (%u%%)",
-				info.stats.framebuffer_stats.to_string(!backend_config.supports_hw_msaa),
-				get_load(), info.stats.draw_calls, info.stats.submit_count, info.stats.setup_time, info.stats.vertex_upload_time,
-				info.stats.textures_upload_time, info.stats.draw_exec_time, info.stats.flip_time,
-				num_dirty_textures, texture_memory_size, tmp_texture_memory_size,
-				num_flushes, num_misses, cache_miss_ratio, num_unavoidable, num_mispredict, num_speculate,
-				num_texture_upload, num_texture_upload_miss, texture_upload_miss_ratio, texture_copies_ellided,
-				vertex_cache_hit_count, info.stats.vertex_cache_request_count, vertex_cache_hit_ratio,
-				program_cache_ellided, program_cache_lookups, program_cache_ellision_rate)
-			);
+			m_text_writer->print_text(*m_current_command_buffer, *direct_fbo, 4, 144, direct_fbo->width(), direct_fbo->height(), fmt::format("Unreleased textures: %8d", num_dirty_textures));
+			m_text_writer->print_text(*m_current_command_buffer, *direct_fbo, 4, 162, direct_fbo->width(), direct_fbo->height(), fmt::format("Texture cache memory: %7dM", texture_memory_size));
+			m_text_writer->print_text(*m_current_command_buffer, *direct_fbo, 4, 180, direct_fbo->width(), direct_fbo->height(), fmt::format("Temporary texture memory: %3dM", tmp_texture_memory_size));
+			m_text_writer->print_text(*m_current_command_buffer, *direct_fbo, 4, 198, direct_fbo->width(), direct_fbo->height(), fmt::format("Flush requests: %13d  = %2d (%3d%%) hard faults, %2d unavoidable, %2d misprediction(s), %2d speculation(s)", num_flushes, num_misses, cache_miss_ratio, num_unavoidable, num_mispredict, num_speculate));
+			m_text_writer->print_text(*m_current_command_buffer, *direct_fbo, 4, 216, direct_fbo->width(), direct_fbo->height(), fmt::format("Texture uploads: %14u (%u from CPU - %02u%%)", num_texture_upload, num_texture_upload_miss, texture_upload_miss_ratio));
 		}
 
 		direct_fbo->release();
diff --git a/rpcs3/Emu/RSX/VK/VKProcTable.h b/rpcs3/Emu/RSX/VK/VKProcTable.h
deleted file mode 100644
index 91a9951ce5..0000000000
--- a/rpcs3/Emu/RSX/VK/VKProcTable.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Wrangler for Vulkan functions.
-// TODO: Eventually, we shall declare vulkan with NO_PROTOTYPES and wrap everything here for android multi-driver support.
-// For now, we just use it for extensions since we're on VK_1_0
-
-#define VK_DECL_EXTERN(func) extern PFN_##func _##func
-#define VK_DECL_LOCAL(func) PFN_##func _##func
-
-#if defined(DECLARE_VK_FUNCTION_HEADER)
-#define VK_FUNC VK_DECL_EXTERN
-#elif defined(DECLARE_VK_FUNCTION_BODY)
-#define VK_FUNC VK_DECL_LOCAL
-#elif !defined(VK_FUNC)
-#error "VK_FUNC is not defined"
-#endif
-
-// EXT_conditional_rendering
-VK_FUNC(vkCmdBeginConditionalRenderingEXT);
-VK_FUNC(vkCmdEndConditionalRenderingEXT);
-
-// EXT_debug_utils
-VK_FUNC(vkSetDebugUtilsObjectNameEXT);
-VK_FUNC(vkQueueInsertDebugUtilsLabelEXT);
-VK_FUNC(vkCmdInsertDebugUtilsLabelEXT);
-
-// KHR_synchronization2
-VK_FUNC(vkCmdSetEvent2KHR);
-VK_FUNC(vkCmdWaitEvents2KHR);
-VK_FUNC(vkCmdPipelineBarrier2KHR);
-
-// EXT_device_fault
-VK_FUNC(vkGetDeviceFaultInfoEXT);
-
-// EXT_multi_draw
-VK_FUNC(vkCmdDrawMultiEXT);
-VK_FUNC(vkCmdDrawMultiIndexedEXT);
-
-// EXT_external_memory_host
-VK_FUNC(vkGetMemoryHostPointerPropertiesEXT);
-
-#undef VK_FUNC
-#undef DECLARE_VK_FUNCTION_HEADER
-#undef DECLARE_VK_FUNCTION_BODY
-#undef VK_DECL_EXTERN
-#undef VK_DECL_LOCAL
diff --git a/rpcs3/Emu/RSX/VK/VKProgramBuffer.h b/rpcs3/Emu/RSX/VK/VKProgramBuffer.h
index 3e4ee000df..2b73de6faf 100644
--- a/rpcs3/Emu/RSX/VK/VKProgramBuffer.h
+++ b/rpcs3/Emu/RSX/VK/VKProgramBuffer.h
@@ -1,9 +1,12 @@
 #pragma once
 #include "VKVertexProgram.h"
 #include "VKFragmentProgram.h"
+#include "VKRenderPass.h"
 #include "VKPipelineCompiler.h"
 #include "../Program/ProgramStateCache.h"
 
+#include "util/fnv_hash.hpp"
+
 namespace vk
 {
 	struct VKTraits
@@ -46,16 +49,15 @@ namespace vk
 				const fragment_program_type& fragmentProgramData,
 				const vk::pipeline_props& pipelineProperties,
 				bool compile_async,
-				std::function<pipeline_type*(pipeline_storage_type&)> callback)
+				std::function<pipeline_type*(pipeline_storage_type&)> callback,
+				VkPipelineLayout common_pipeline_layout)
 		{
-			vk::pipe_compiler::op_flags compiler_flags = compile_async ? vk::pipe_compiler::COMPILE_DEFERRED : vk::pipe_compiler::COMPILE_INLINE;
-			compiler_flags |= vk::pipe_compiler::SEPARATE_SHADER_OBJECTS;
+			const auto compiler_flags = compile_async ? vk::pipe_compiler::COMPILE_DEFERRED : vk::pipe_compiler::COMPILE_INLINE;
+			VkShaderModule modules[2] = { vertexProgramData.handle, fragmentProgramData.handle };
 
 			auto compiler = vk::get_pipe_compiler();
 			auto result = compiler->compile(
-				pipelineProperties,
-				vertexProgramData.handle,
-				fragmentProgramData.handle,
+				pipelineProperties, modules, common_pipeline_layout,
 				compiler_flags, callback,
 				vertexProgramData.uniforms,
 				fragmentProgramData.uniforms);
@@ -89,13 +91,15 @@ namespace vk
 		template <typename... Args>
 		void add_pipeline_entry(RSXVertexProgram& vp, RSXFragmentProgram& fp, vk::pipeline_props& props, Args&& ...args)
 		{
-			get_graphics_pipeline(nullptr, vp, fp, props, false, false, std::forward<Args>(args)...);
+			vp.skip_vertex_input_check = true;
+			get_graphics_pipeline(vp, fp, props, false, false, std::forward<Args>(args)...);
 		}
 
-		void preload_programs(rsx::program_cache_hint_t* cache_hint, const RSXVertexProgram& vp, const RSXFragmentProgram& fp)
+		void preload_programs(RSXVertexProgram& vp, RSXFragmentProgram& fp)
 		{
-			search_vertex_program(cache_hint, vp);
-			search_fragment_program(cache_hint, fp);
+			vp.skip_vertex_input_check = true;
+			search_vertex_program(vp);
+			search_fragment_program(fp);
 		}
 
 		bool check_cache_missed() const
diff --git a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp
index aae8407103..38afcec690 100644
--- a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp
+++ b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp
@@ -1,92 +1,14 @@
 #include "stdafx.h"
 #include "VKProgramPipeline.h"
-#include "VKResourceManager.h"
-#include "vkutils/descriptors.h"
 #include "vkutils/device.h"
-
-#include "../Program/SPIRVCommon.h"
+#include <string>
 
 namespace vk
 {
-	extern const vk::render_device* get_current_renderer();
-
 	namespace glsl
 	{
 		using namespace ::glsl;
 
-		bool operator == (const descriptor_slot_t& a, const VkDescriptorImageInfo& b)
-		{
-			const auto ptr = std::get_if<VkDescriptorImageInfo>(&a);
-			return !!ptr &&
-				ptr->imageView == b.imageView &&
-				ptr->sampler == b.sampler &&
-				ptr->imageLayout == b.imageLayout;
-		}
-
-		bool operator == (const descriptor_slot_t& a, const VkDescriptorBufferInfo& b)
-		{
-			const auto ptr = std::get_if<VkDescriptorBufferInfo>(&a);
-			return !!ptr &&
-				ptr->buffer == b.buffer &&
-				ptr->offset == b.offset &&
-				ptr->range == b.range;
-		}
-
-		bool operator == (const descriptor_slot_t& a, const VkBufferView& b)
-		{
-			const auto ptr = std::get_if<VkBufferView>(&a);
-			return !!ptr && *ptr == b;
-		}
-
-		VkDescriptorType to_descriptor_type(program_input_type type)
-		{
-			switch (type)
-			{
-			case input_type_uniform_buffer:
-				return VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
-			case input_type_texel_buffer:
-				return VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
-			case input_type_texture:
-				return VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
-			case input_type_storage_buffer:
-				return VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
-			case input_type_storage_texture:
-				return VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
-			default:
-				fmt::throw_exception("Unexpected program input type %d", static_cast<int>(type));
-			}
-		}
-
-		VkShaderStageFlags to_shader_stage_flags(::glsl::program_domain domain)
-		{
-			switch (domain)
-			{
-			case glsl_vertex_program:
-				return VK_SHADER_STAGE_VERTEX_BIT;
-			case glsl_fragment_program:
-				return VK_SHADER_STAGE_FRAGMENT_BIT;
-			case glsl_compute_program:
-				return VK_SHADER_STAGE_COMPUTE_BIT;
-			default:
-				fmt::throw_exception("Unexpected domain %d", static_cast<int>(domain));
-			}
-		}
-
-		const char* to_string(::glsl::program_domain domain)
-		{
-			switch (domain)
-			{
-			case glsl_vertex_program:
-				return "vertex";
-			case glsl_fragment_program:
-				return "fragment";
-			case glsl_compute_program:
-				return "compute";
-			default:
-				fmt::throw_exception("Unexpected domain %d", static_cast<int>(domain));
-			}
-		}
-
 		void shader::create(::glsl::program_domain domain, const std::string& source)
 		{
 			type     = domain;
@@ -97,10 +19,13 @@ namespace vk
 		{
 			ensure(m_handle == VK_NULL_HANDLE);
 
-			if (!spirv::compile_glsl_to_spv(m_compiled, m_source, type, ::glsl::glsl_rules_vulkan))
+			if (!vk::compile_glsl_to_spv(m_source, type, m_compiled))
 			{
+				const std::string shader_type = type == ::glsl::program_domain::glsl_vertex_program ? "vertex" :
+					type == ::glsl::program_domain::glsl_fragment_program ? "fragment" : "compute";
+
 				rsx_log.notice("%s", m_source);
-				fmt::throw_exception("Failed to compile %s shader", to_string(type));
+				fmt::throw_exception("Failed to compile %s shader", shader_type);
 			}
 
 			VkShaderModuleCreateInfo vs_info;
@@ -142,505 +67,221 @@ namespace vk
 			return m_handle;
 		}
 
-		void program::init()
+		void program::create_impl()
 		{
-			m_linked = false;
+			linked = false;
+			attribute_location_mask = 0;
+			vertex_attributes_mask = 0;
+
+			fs_texture_bindings.fill(~0u);
+			fs_texture_mirror_bindings.fill(~0u);
+			vs_texture_bindings.fill(~0u);
 		}
 
-		program::program(VkDevice dev, const VkGraphicsPipelineCreateInfo& create_info, const std::vector<program_input> &vertex_inputs, const std::vector<program_input>& fragment_inputs)
-			: m_device(dev), m_info(create_info)
+		program::program(VkDevice dev, VkPipeline p, VkPipelineLayout layout, const std::vector<program_input> &vertex_input, const std::vector<program_input>& fragment_inputs)
+			: m_device(dev), pipeline(p), pipeline_layout(layout)
 		{
-			init();
-
-			load_uniforms(vertex_inputs);
+			create_impl();
+			load_uniforms(vertex_input);
 			load_uniforms(fragment_inputs);
 		}
 
-		program::program(VkDevice dev, const VkComputePipelineCreateInfo& create_info, const std::vector<program_input>& compute_inputs)
-			: m_device(dev), m_info(create_info)
+		program::program(VkDevice dev, VkPipeline p, VkPipelineLayout layout)
+			: m_device(dev), pipeline(p), pipeline_layout(layout)
 		{
-			init();
-
-			load_uniforms(compute_inputs);
+			create_impl();
 		}
 
 		program::~program()
 		{
-			vkDestroyPipeline(m_device, m_pipeline, nullptr);
-
-			if (m_pipeline_layout)
-			{
-				vkDestroyPipelineLayout(m_device, m_pipeline_layout, nullptr);
-
-				for (auto& set : m_sets)
-				{
-					set.destroy();
-				}
-			}
+			vkDestroyPipeline(m_device, pipeline, nullptr);
 		}
 
 		program& program::load_uniforms(const std::vector<program_input>& inputs)
 		{
-			ensure(!m_linked); // "Cannot change uniforms in already linked program!"
+			ensure(!linked); // "Cannot change uniforms in already linked program!"
 
 			for (auto &item : inputs)
 			{
-				ensure(item.set < binding_set_index_max_enum);                         // Ensure we have a valid set id
-				ensure(item.location < 128u || item.type == input_type_push_constant); // Arbitrary limit but useful to catch possibly uninitialized values
-				m_sets[item.set].m_inputs[item.type].push_back(item);
+				uniforms[item.type].push_back(item);
 			}
 
 			return *this;
 		}
 
-		program& program::link(bool separate_objects)
+		program& program::link()
 		{
-			auto p_graphics_info = std::get_if<VkGraphicsPipelineCreateInfo>(&m_info);
-			auto p_compute_info = !p_graphics_info ? std::get_if<VkComputePipelineCreateInfo>(&m_info) : nullptr;
-			const bool is_graphics_pipe = p_graphics_info != nullptr;
-
-			if (!is_graphics_pipe) [[ likely ]]
+			// Preprocess texture bindings
+			// Link step is only useful for rasterizer programs, compute programs do not need this
+			for (const auto &uniform : uniforms[program_input_type::input_type_texture])
 			{
-				// We only support compute and graphics, so disable this for compute
-				separate_objects = false;
-			}
-
-			if (!separate_objects)
-			{
-				// Collapse all sets into set 0 if validation passed
-				auto& sink = m_sets[0];
-				for (auto& set : m_sets)
+				if (const auto name_start = uniform.name.find("tex"); name_start != umax)
 				{
-					if (&set == &sink)
-					{
-						continue;
-					}
+					const auto name_end = uniform.name.find("_stencil");
+					const auto index_start = name_start + 3;  // Skip 'tex' part
+					const auto index_length = (name_end != umax) ? name_end - index_start : name_end;
+					const auto index_part = uniform.name.substr(index_start, index_length);
+					const auto index = std::stoi(index_part);
 
-					for (auto& type_arr : set.m_inputs)
+					if (name_start == 0)
 					{
-						if (type_arr.empty())
+						// Fragment texture (tex...)
+						if (name_end == umax)
 						{
-							continue;
+							// Normal texture
+							fs_texture_bindings[index] = uniform.location;
 						}
-
-						auto type = type_arr.front().type;
-						auto& dst = sink.m_inputs[type];
-						dst.insert(dst.end(), type_arr.begin(), type_arr.end());
-
-						// Clear
-						type_arr.clear();
-					}
-				}
-
-				sink.validate();
-				sink.init(m_device);
-			}
-			else
-			{
-				for (auto& set : m_sets)
-				{
-					for (auto& type_arr : set.m_inputs)
-					{
-						if (type_arr.empty())
+						else
 						{
-							continue;
+							// Stencil mirror
+							fs_texture_mirror_bindings[index] = uniform.location;
 						}
-
-						// Real set
-						set.validate();
-						set.init(m_device);
-						break;
+					}
+					else
+					{
+						// Vertex texture (vtex...)
+						vs_texture_bindings[index] = uniform.location;
 					}
 				}
 			}
 
-			create_pipeline_layout();
-			ensure(m_pipeline_layout);
-
-			if (is_graphics_pipe)
-			{
-				VkGraphicsPipelineCreateInfo create_info = *p_graphics_info;
-				create_info.layout = m_pipeline_layout;
-				CHECK_RESULT(vkCreateGraphicsPipelines(m_device, nullptr, 1, &create_info, nullptr, &m_pipeline));
-			}
-			else
-			{
-				VkComputePipelineCreateInfo create_info = *p_compute_info;
-				create_info.layout = m_pipeline_layout;
-				CHECK_RESULT(vkCreateComputePipelines(m_device, nullptr, 1, &create_info, nullptr, &m_pipeline));
-			}
-
-			m_linked = true;
+			linked = true;
 			return *this;
 		}
 
 		bool program::has_uniform(program_input_type type, const std::string& uniform_name)
 		{
-			for (auto& set : m_sets)
+			const auto& uniform = uniforms[type];
+			return std::any_of(uniform.cbegin(), uniform.cend(), [&uniform_name](const auto& u)
 			{
-				const auto& uniform = set.m_inputs[type];
-				return std::any_of(uniform.cbegin(), uniform.cend(), [&uniform_name](const auto& u)
-				{
-					return u.name == uniform_name;
-				});
-			}
-
-			return false;
+				return u.name == uniform_name;
+			});
 		}
 
-		std::pair<u32, u32> program::get_uniform_location(::glsl::program_domain domain, program_input_type type, const std::string& uniform_name)
+		void program::bind_uniform(const VkDescriptorImageInfo &image_descriptor, const std::string& uniform_name, VkDescriptorType type, VkDescriptorSet &descriptor_set)
 		{
-			for (unsigned i = 0; i < ::size32(m_sets); ++i)
+			for (const auto &uniform : uniforms[program_input_type::input_type_texture])
 			{
-				const auto& type_arr = m_sets[i].m_inputs[type];
-				const auto result = std::find_if(type_arr.cbegin(), type_arr.cend(), [&](const auto& u)
+				if (uniform.name == uniform_name)
 				{
-					return u.domain == domain && u.name == uniform_name;
-				});
-
-				if (result != type_arr.end())
-				{
-					return { i, result->location };
-				}
-			}
-
-			return { umax, umax };
-		}
-
-		void program::bind_uniform(const VkDescriptorImageInfo& image_descriptor, u32 set_id, u32 binding_point)
-		{
-			if (m_sets[set_id].m_descriptor_slots[binding_point] == image_descriptor)
-			{
-				return;
-			}
-
-			m_sets[set_id].notify_descriptor_slot_updated(binding_point, image_descriptor);
-		}
-
-		void program::bind_uniform(const VkDescriptorBufferInfo &buffer_descriptor, u32 set_id, u32 binding_point)
-		{
-			if (m_sets[set_id].m_descriptor_slots[binding_point] == buffer_descriptor)
-			{
-				return;
-			}
-
-			m_sets[set_id].notify_descriptor_slot_updated(binding_point, buffer_descriptor);
-		}
-
-		void program::bind_uniform(const VkBufferView &buffer_view, u32 set_id, u32 binding_point)
-		{
-			if (m_sets[set_id].m_descriptor_slots[binding_point] == buffer_view)
-			{
-				return;
-			}
-
-			m_sets[set_id].notify_descriptor_slot_updated(binding_point, buffer_view);
-		}
-
-		void program::bind_uniform_array(const VkDescriptorImageInfo* image_descriptors, int count, u32 set_id, u32 binding_point)
-		{
-			// Non-caching write
-			auto& set = m_sets[set_id];
-			auto& arr = set.m_scratch_images_array;
-
-			descriptor_array_ref_t data
-			{
-				.first = arr.size(),
-				.count = static_cast<u32>(count)
-			};
-
-			arr.reserve(arr.size() + static_cast<u32>(count));
-			for (int i = 0; i < count; ++i)
-			{
-				arr.push_back(image_descriptors[i]);
-			}
-
-			set.notify_descriptor_slot_updated(binding_point, data);
-		}
-
-		void program::create_pipeline_layout()
-		{
-			ensure(!m_linked);
-			ensure(m_pipeline_layout == VK_NULL_HANDLE);
-
-			rsx::simple_array<VkPushConstantRange> push_constants{};
-			rsx::simple_array<VkDescriptorSetLayout> set_layouts{};
-
-			for (auto& set : m_sets)
-			{
-				if (!set.m_device)
-				{
-					continue;
-				}
-
-				set.create_descriptor_set_layout();
-				set_layouts.push_back(set.m_descriptor_set_layout);
-
-				for (const auto& input : set.m_inputs[input_type_push_constant])
-				{
-					const auto& range = input.as_push_constant();
-					push_constants.push_back({
-						.stageFlags = to_shader_stage_flags(input.domain),
-						.offset = range.offset,
-						.size = range.size
-						});
-				}
-			}
-
-			VkPipelineLayoutCreateInfo create_info
-			{
-				.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
-				.flags = 0,
-				.setLayoutCount = set_layouts.size(),
-				.pSetLayouts = set_layouts.data(),
-				.pushConstantRangeCount = push_constants.size(),
-				.pPushConstantRanges = push_constants.data()
-			};
-			CHECK_RESULT(vkCreatePipelineLayout(m_device, &create_info, nullptr, &m_pipeline_layout));
-		}
-
-		program& program::bind(const vk::command_buffer& cmd, VkPipelineBindPoint bind_point)
-		{
-			VkDescriptorSet bind_sets[binding_set_index_max_enum];
-			unsigned count = 0;
-
-			for (auto& set : m_sets)
-			{
-				if (!set.m_device)
-				{
-					continue;
-				}
-
-				bind_sets[count++] = set.commit();   // Commit variable changes and return handle to the new set
-			}
-
-			vkCmdBindPipeline(cmd, bind_point, m_pipeline);
-			vkCmdBindDescriptorSets(cmd, bind_point, m_pipeline_layout, 0, count, bind_sets, 0, nullptr);
-			return *this;
-		}
-
-		void descriptor_table_t::destroy()
-		{
-			if (!m_device)
-			{
-				return;
-			}
-
-			if (m_descriptor_set_layout)
-			{
-				vkDestroyDescriptorSetLayout(m_device, m_descriptor_set_layout, nullptr);
-			}
-
-			if (m_descriptor_pool)
-			{
-				m_descriptor_pool->destroy();
-				m_descriptor_pool.reset();
-			}
-
-			m_device = VK_NULL_HANDLE;
-		}
-
-		void descriptor_table_t::init(VkDevice dev)
-		{
-			m_device = dev;
-
-			size_t bind_slots_count = 0;
-			for (auto& type_arr : m_inputs)
-			{
-				if (type_arr.empty() || type_arr.front().type == input_type_push_constant)
-				{
-					continue;
-				}
-
-				bind_slots_count += type_arr.size();
-			}
-
-			m_descriptor_slots.resize(bind_slots_count);
-			std::memset(m_descriptor_slots.data(), 0, sizeof(descriptor_slot_t) * bind_slots_count);
-
-			m_descriptors_dirty.resize(bind_slots_count);
-			std::fill(m_descriptors_dirty.begin(), m_descriptors_dirty.end(), false);
-		}
-
-		VkDescriptorSet descriptor_table_t::allocate_descriptor_set()
-		{
-			if (!m_descriptor_pool)
-			{
-				create_descriptor_pool();
-			}
-
-			return m_descriptor_pool->allocate(m_descriptor_set_layout);
-		}
-
-		VkDescriptorSet descriptor_table_t::commit()
-		{
-			if (!m_descriptor_set)
-			{
-				m_any_descriptors_dirty = true;
-				std::fill(m_descriptors_dirty.begin(), m_descriptors_dirty.end(), false);
-			}
-
-			// Check if we need to actually open a new set
-			if (!m_any_descriptors_dirty)
-			{
-				return m_descriptor_set.value();
-			}
-
-			auto push_descriptor_slot = [this](unsigned idx)
-			{
-				const auto& slot = m_descriptor_slots[idx];
-				const VkDescriptorType type = m_descriptor_types[idx];
-				if (auto ptr = std::get_if<VkDescriptorImageInfo>(&slot))
-				{
-					m_descriptor_set.push(*ptr, type, idx);
-					return;
-				}
-
-				if (auto ptr = std::get_if<VkDescriptorBufferInfo>(&slot))
-				{
-					m_descriptor_set.push(*ptr, type, idx);
-					return;
-				}
-
-				if (auto ptr = std::get_if<VkBufferView>(&slot))
-				{
-					m_descriptor_set.push(*ptr, type, idx);
-					return;
-				}
-
-				if (auto ptr = std::get_if<descriptor_array_ref_t>(&slot))
-				{
-					ensure(type == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER); // Only type supported at the moment
-					ensure((ptr->first + ptr->count) <= m_scratch_images_array.size());
-					m_descriptor_set.push(m_scratch_images_array.data() + ptr->first, ptr->count, type, idx);
-					return;
-				}
-
-				fmt::throw_exception("Unexpected descriptor structure at index %u", idx);
-			};
-
-			m_descriptor_set = allocate_descriptor_set();
-
-			for (unsigned i = 0; i < m_descriptor_slots.size(); ++i)
-			{
-				if (m_descriptors_dirty[i])
-				{
-					// Push
-					push_descriptor_slot(i);
-					m_descriptors_dirty[i] = false;
-					continue;
-				}
-
-				// We should copy here if possible.
-				// Without descriptor_buffer, the most efficient option is to just use the normal bind logic due to the pointer-based nature of the descriptor inputs and no stride.
-				push_descriptor_slot(i);
-			}
-
-			m_descriptor_set.on_bind();
-			m_any_descriptors_dirty = false;
-			m_scratch_images_array.clear();
-
-			return m_descriptor_set.value();
-		}
-
-		void descriptor_table_t::create_descriptor_set_layout()
-		{
-			ensure(m_descriptor_set_layout == VK_NULL_HANDLE);
-
-			rsx::simple_array<VkDescriptorSetLayoutBinding> bindings;
-			bindings.reserve(16);
-
-			m_descriptor_pool_sizes.clear();
-			m_descriptor_pool_sizes.reserve(input_type_max_enum);
-
-			std::unordered_map<u32, VkDescriptorType> descriptor_type_map;
-
-			auto descriptor_count = [](const std::string& name) -> u32
-			{
-				const auto start = name.find_last_of("[");
-				if (start == std::string::npos)
-				{
-					return 1;
-				}
-
-				const auto end = name.find_last_of("]");
-				ensure(end != std::string::npos && start < end, "Invalid variable name");
-
-				const std::string array_size = name.substr(start + 1, end - start - 1);
-				if (const auto count = std::atoi(array_size.c_str());
-					count > 0)
-				{
-					return count;
-				}
-
-				return 1;
-			};
-
-			for (const auto& type_arr : m_inputs)
-			{
-				if (type_arr.empty() || type_arr.front().type == input_type_push_constant)
-				{
-					continue;
-				}
-
-				VkDescriptorType type = to_descriptor_type(type_arr.front().type);
-				m_descriptor_pool_sizes.push_back({ .type = type });
-
-				for (const auto& input : type_arr)
-				{
-					VkDescriptorSetLayoutBinding binding
+					const VkWriteDescriptorSet descriptor_writer =
 					{
-						.binding = input.location,
-						.descriptorType = type,
-						.descriptorCount = descriptor_count(input.name),
-						.stageFlags = to_shader_stage_flags(input.domain)
+						VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,    // sType
+						nullptr,                                   // pNext
+						descriptor_set,                            // dstSet
+						uniform.location,                          // dstBinding
+						0,                                         // dstArrayElement
+						1,                                         // descriptorCount
+						type,                                      // descriptorType
+						&image_descriptor,                         // pImageInfo
+						nullptr,                                   // pBufferInfo
+						nullptr                                    // pTexelBufferView
 					};
-					bindings.push_back(binding);
 
-					descriptor_type_map[input.location] = type;
-					m_descriptor_pool_sizes.back().descriptorCount += binding.descriptorCount;
+					vkUpdateDescriptorSets(m_device, 1, &descriptor_writer, 0, nullptr);
+					attribute_location_mask |= (1ull << uniform.location);
+					return;
 				}
 			}
 
-			m_descriptor_types.resize(::size32(m_descriptors_dirty));
-
-			for (u32 i = 0; i < ::size32(m_descriptors_dirty); ++i)
-			{
-				if (descriptor_type_map.find(i) == descriptor_type_map.end())
-				{
-					fmt::throw_exception("Invalid input structure. Some input bindings were not declared!");
-				}
-				m_descriptor_types[i] = descriptor_type_map[i];
-			}
-
-			m_descriptor_set_layout = vk::descriptors::create_layout(bindings);
+			rsx_log.notice("texture not found in program: %s", uniform_name.c_str());
 		}
 
-		void descriptor_table_t::create_descriptor_pool()
+		void program::bind_uniform(const VkDescriptorImageInfo & image_descriptor, int texture_unit, ::glsl::program_domain domain, VkDescriptorSet &descriptor_set, bool is_stencil_mirror)
 		{
-			m_descriptor_pool = std::make_unique<descriptor_pool>();
-			m_descriptor_pool->create(*vk::get_current_renderer(), m_descriptor_pool_sizes);
+			ensure(domain != ::glsl::program_domain::glsl_compute_program);
+
+			u32 binding;
+			if (domain == ::glsl::program_domain::glsl_fragment_program)
+			{
+				binding = (is_stencil_mirror) ? fs_texture_mirror_bindings[texture_unit] : fs_texture_bindings[texture_unit];
+			}
+			else
+			{
+				binding = vs_texture_bindings[texture_unit];
+			}
+
+			if (binding != ~0u)
+			{
+				const VkWriteDescriptorSet descriptor_writer =
+				{
+					VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,    // sType
+					nullptr,                                   // pNext
+					descriptor_set,                            // dstSet
+					binding,                                   // dstBinding
+					0,                                         // dstArrayElement
+					1,                                         // descriptorCount
+					VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, // descriptorType
+					&image_descriptor,                         // pImageInfo
+					nullptr,                                   // pBufferInfo
+					nullptr                                    // pTexelBufferView
+				};
+
+				vkUpdateDescriptorSets(m_device, 1, &descriptor_writer, 0, nullptr);
+				attribute_location_mask |= (1ull << binding);
+				return;
+			}
+
+			rsx_log.notice("texture not found in program: %stex%u", (domain == ::glsl::program_domain::glsl_vertex_program)? "v" : "", texture_unit);
 		}
 
-		void descriptor_table_t::validate() const
+		void program::bind_uniform(const VkDescriptorBufferInfo &buffer_descriptor, u32 binding_point, VkDescriptorSet &descriptor_set)
 		{
-			// Check for overlapping locations
-			std::set<u32> taken_locations;
+			bind_buffer(buffer_descriptor, binding_point, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, descriptor_set);
+		}
 
-			for (auto& type_arr : m_inputs)
+		void program::bind_uniform(const VkBufferView &buffer_view, u32 binding_point, VkDescriptorSet &descriptor_set)
+		{
+			const VkWriteDescriptorSet descriptor_writer =
 			{
-				if (type_arr.empty() ||
-					type_arr.front().type == input_type_push_constant)
-				{
-					continue;
-				}
+				VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, // sType
+				nullptr,                                // pNext
+				descriptor_set,                         // dstSet
+				binding_point,                          // dstBinding
+				0,                                      // dstArrayElement
+				1,                                      // descriptorCount
+				VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER,// descriptorType
+				nullptr,                                // pImageInfo
+				nullptr,                                // pBufferInfo
+				&buffer_view                            // pTexelBufferView
+			};
 
-				for (const auto& input : type_arr)
+			vkUpdateDescriptorSets(m_device, 1, &descriptor_writer, 0, nullptr);
+			attribute_location_mask |= (1ull << binding_point);
+		}
+
+		void program::bind_uniform(const VkBufferView &buffer_view, program_input_type type, const std::string &binding_name, VkDescriptorSet &descriptor_set)
+		{
+			for (const auto &uniform : uniforms[type])
+			{
+				if (uniform.name == binding_name)
 				{
-					ensure(taken_locations.find(input.location) == taken_locations.end(), "Overlapping input locations found.");
-					taken_locations.insert(input.location);
+					bind_uniform(buffer_view, uniform.location, descriptor_set);
+					return;
 				}
 			}
+
+			rsx_log.notice("vertex buffer not found in program: %s", binding_name.c_str());
+		}
+
+		void program::bind_buffer(const VkDescriptorBufferInfo &buffer_descriptor, u32 binding_point, VkDescriptorType type, VkDescriptorSet &descriptor_set)
+		{
+			const VkWriteDescriptorSet descriptor_writer =
+			{
+				VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, // sType
+				nullptr,                                // pNext
+				descriptor_set,                         // dstSet
+				binding_point,                          // dstBinding
+				0,                                      // dstArrayElement
+				1,                                      // descriptorCount
+				type,                                   // descriptorType
+				nullptr,                                // pImageInfo
+				&buffer_descriptor,                     // pBufferInfo
+				nullptr                                 // pTexelBufferView
+			};
+
+			vkUpdateDescriptorSets(m_device, 1, &descriptor_writer, 0, nullptr);
+			attribute_location_mask |= (1ull << binding_point);
 		}
 	}
 }
diff --git a/rpcs3/Emu/RSX/VK/VKProgramPipeline.h b/rpcs3/Emu/RSX/VK/VKProgramPipeline.h
index c7faaa8c37..f6d8d94738 100644
--- a/rpcs3/Emu/RSX/VK/VKProgramPipeline.h
+++ b/rpcs3/Emu/RSX/VK/VKProgramPipeline.h
@@ -1,13 +1,11 @@
 #pragma once
 
 #include "VulkanAPI.h"
-#include "Emu/RSX/Program/GLSLTypes.h"
-
-#include "vkutils/descriptors.h"
+#include "VKCommonDecompiler.h"
+#include "../Program/GLSLTypes.h"
 
 #include <string>
 #include <vector>
-#include <variant>
 
 namespace vk
 {
@@ -16,20 +14,18 @@ namespace vk
 		enum program_input_type : u32
 		{
 			input_type_uniform_buffer = 0,
-			input_type_texel_buffer,
-			input_type_texture,
-			input_type_storage_buffer,
-			input_type_storage_texture,
-			input_type_push_constant,
+			input_type_texel_buffer = 1,
+			input_type_texture = 2,
+			input_type_storage_buffer = 3,
 
-			input_type_max_enum
+			input_type_max_enum = 4
 		};
 
 		struct bound_sampler
 		{
-			VkFormat format = VK_FORMAT_UNDEFINED;
-			VkImage image = VK_NULL_HANDLE;
-			VkComponentMapping mapping{};
+			VkFormat format;
+			VkImage image;
+			VkComponentMapping mapping;
 		};
 
 		struct bound_buffer
@@ -40,50 +36,16 @@ namespace vk
 			u64 size = 0;
 		};
 
-		struct push_constant_ref
-		{
-			u32 offset = 0;
-			u32 size = 0;
-		};
-
 		struct program_input
 		{
 			::glsl::program_domain domain;
 			program_input_type type;
 
-			using bound_data_t = std::variant<bound_buffer, bound_sampler, push_constant_ref>;
-			bound_data_t bound_data;
+			bound_buffer as_buffer;
+			bound_sampler as_sampler;
 
-			u32 set = 0;
-			u32 location = umax;
+			u32 location;
 			std::string name;
-
-			inline bound_buffer& as_buffer() { return *std::get_if<bound_buffer>(&bound_data); }
-			inline bound_sampler& as_sampler() { return *std::get_if<bound_sampler>(&bound_data); }
-			inline push_constant_ref& as_push_constant() { return *std::get_if<push_constant_ref>(&bound_data); }
-
-			inline const bound_buffer& as_buffer() const { return *std::get_if<bound_buffer>(&bound_data); }
-			inline const bound_sampler& as_sampler() const { return *std::get_if<bound_sampler>(&bound_data); }
-			inline const push_constant_ref& as_push_constant() const { return *std::get_if<push_constant_ref>(&bound_data); }
-
-			static program_input make(
-				::glsl::program_domain domain,
-				const std::string& name,
-				program_input_type type,
-				u32 set,
-				u32 location,
-				const bound_data_t& data = bound_buffer{})
-			{
-				return program_input
-				{
-					.domain = domain,
-					.type = type,
-					.bound_data = data,
-					.set = set,
-					.location = location,
-					.name = name
-				};
-			}
 		};
 
 		class shader
@@ -109,103 +71,42 @@ namespace vk
 			VkShaderModule get_handle() const;
 		};
 
-		struct descriptor_array_ref_t
-		{
-			u32 first = 0;
-			u32 count = 0;
-		};
-
-		using descriptor_slot_t = std::variant<VkDescriptorImageInfo, VkDescriptorBufferInfo, VkBufferView, descriptor_array_ref_t>;
-
-		struct descriptor_table_t
-		{
-			VkDevice m_device = VK_NULL_HANDLE;
-			std::array<std::vector<program_input>, input_type_max_enum> m_inputs;
-
-			std::unique_ptr<vk::descriptor_pool> m_descriptor_pool;
-			VkDescriptorSetLayout m_descriptor_set_layout = VK_NULL_HANDLE;
-			vk::descriptor_set m_descriptor_set{};
-			rsx::simple_array<VkDescriptorPoolSize> m_descriptor_pool_sizes;
-			rsx::simple_array<VkDescriptorType> m_descriptor_types;
-
-			std::vector<descriptor_slot_t> m_descriptor_slots;
-			std::vector<bool> m_descriptors_dirty;
-			bool m_any_descriptors_dirty = false;
-
-			rsx::simple_array< VkDescriptorImageInfo> m_scratch_images_array;
-
-			void init(VkDevice dev);
-			void destroy();
-
-			void validate() const;
-
-			void create_descriptor_set_layout();
-			void create_descriptor_pool();
-
-			VkDescriptorSet allocate_descriptor_set();
-			VkDescriptorSet commit();
-
-			template <typename T>
-			inline void notify_descriptor_slot_updated(u32 slot, const T& data)
-			{
-				m_descriptors_dirty[slot] = true;
-				m_descriptor_slots[slot] = data;
-				m_any_descriptors_dirty = true;
-			}
-		};
-
-		enum binding_set_index : u32
-		{
-			// For separate shader objects
-			binding_set_index_vertex = 0,
-			binding_set_index_fragment = 1,
-
-			// Aliases
-			binding_set_index_compute = 0,
-			binding_set_index_unified = 0,
-
-			// Meta
-			binding_set_index_max_enum = 2,
-		};
-
 		class program
 		{
-			VkDevice m_device = VK_NULL_HANDLE;
-			VkPipeline m_pipeline = VK_NULL_HANDLE;
-			VkPipelineLayout m_pipeline_layout = VK_NULL_HANDLE;
+			std::array<std::vector<program_input>, input_type_max_enum> uniforms;
+			VkDevice m_device;
 
-			std::variant<VkGraphicsPipelineCreateInfo, VkComputePipelineCreateInfo> m_info;
-			std::array<descriptor_table_t, binding_set_index_max_enum> m_sets;
-			bool m_linked = false;
+			std::array<u32, 16> fs_texture_bindings;
+			std::array<u32, 16> fs_texture_mirror_bindings;
+			std::array<u32, 4>  vs_texture_bindings;
+			bool linked;
 
-			void init();
-			void create_pipeline_layout();
-
-			program& load_uniforms(const std::vector<program_input>& inputs);
+			void create_impl();
 
 		public:
+			VkPipeline pipeline;
+			VkPipelineLayout pipeline_layout;
+			u64 attribute_location_mask;
+			u64 vertex_attributes_mask;
 
-			program(VkDevice dev, const VkGraphicsPipelineCreateInfo& create_info, const std::vector<program_input> &vertex_inputs, const std::vector<program_input>& fragment_inputs);
-			program(VkDevice dev, const VkComputePipelineCreateInfo& create_info, const std::vector<program_input>& compute_inputs);
+			program(VkDevice dev, VkPipeline p, VkPipelineLayout layout, const std::vector<program_input> &vertex_input, const std::vector<program_input>& fragment_inputs);
+			program(VkDevice dev, VkPipeline p, VkPipelineLayout layout);
 			program(const program&) = delete;
 			program(program&& other) = delete;
 			~program();
 
-			program& link(bool separate_stages);
-			program& bind(const vk::command_buffer& cmd, VkPipelineBindPoint bind_point);
+			program& load_uniforms(const std::vector<program_input>& inputs);
+			program& link();
 
 			bool has_uniform(program_input_type type, const std::string &uniform_name);
-			std::pair<u32, u32> get_uniform_location(::glsl::program_domain domain, program_input_type type, const std::string& uniform_name);
+			void bind_uniform(const VkDescriptorImageInfo &image_descriptor, const std::string &uniform_name, VkDescriptorType type, VkDescriptorSet &descriptor_set);
+			void bind_uniform(const VkDescriptorImageInfo &image_descriptor, int texture_unit, ::glsl::program_domain domain, VkDescriptorSet &descriptor_set, bool is_stencil_mirror = false);
+			void bind_uniform(const VkDescriptorBufferInfo &buffer_descriptor, u32 binding_point, VkDescriptorSet &descriptor_set);
+			void bind_uniform(const VkBufferView &buffer_view, u32 binding_point, VkDescriptorSet &descriptor_set);
+			void bind_uniform(const VkBufferView &buffer_view, program_input_type type, const std::string &binding_name, VkDescriptorSet &descriptor_set);
 
-			void bind_uniform(const VkDescriptorImageInfo &image_descriptor, u32 set_id, u32 binding_point);
-			void bind_uniform(const VkDescriptorBufferInfo &buffer_descriptor, u32 set_id, u32 binding_point);
-			void bind_uniform(const VkBufferView &buffer_view, u32 set_id, u32 binding_point);
-			void bind_uniform(const VkBufferView &buffer_view, ::glsl::program_domain domain, program_input_type type, const std::string &binding_name);
-
-			void bind_uniform_array(const VkDescriptorImageInfo* image_descriptors, int count, u32 set_id, u32 binding_point);
-
-			inline VkPipelineLayout layout() const { return m_pipeline_layout; }
-			inline VkPipeline value() const { return m_pipeline; }
+			void bind_buffer(const VkDescriptorBufferInfo &buffer_descriptor, u32 binding_point, VkDescriptorType type, VkDescriptorSet &descriptor_set);
+			void bind_descriptor_set(const VkCommandBuffer cmd, VkDescriptorSet descriptor_set);
 		};
 	}
 }
diff --git a/rpcs3/Emu/RSX/VK/VKQueryPool.cpp b/rpcs3/Emu/RSX/VK/VKQueryPool.cpp
index 28cb2c2272..4fc437e2c8 100644
--- a/rpcs3/Emu/RSX/VK/VKQueryPool.cpp
+++ b/rpcs3/Emu/RSX/VK/VKQueryPool.cpp
@@ -1,11 +1,7 @@
 #include "stdafx.h"
-#include "vkutils/query_pool.hpp"
-#include "VKHelpers.h"
 #include "VKQueryPool.h"
 #include "VKRenderPass.h"
 #include "VKResourceManager.h"
-#include "util/asm.hpp"
-#include "VKGSRender.h"
 
 namespace vk
 {
@@ -24,14 +20,12 @@ namespace vk
 			{
 				query.any_passed = true;
 				query.ready = true;
-				query.data = result[0];
 				return true;
 			}
 			else if (result[1])
 			{
 				query.any_passed = false;
 				query.ready = true;
-				query.data = 0;
 				return true;
 			}
 
@@ -39,10 +33,14 @@ namespace vk
 		}
 		case VK_NOT_READY:
 		{
-			query.any_passed = !!result[0];
-			query.ready = query.any_passed && !!(flags & VK_QUERY_RESULT_PARTIAL_BIT);
-			query.data = result[0];
-			return query.ready;
+			if (result[0])
+			{
+				query.any_passed = true;
+				query.ready = true;
+				return true;
+			}
+
+			return false;
 		}
 		default:
 			die_with_error(error);
@@ -77,20 +75,13 @@ namespace vk
 	{
 		ensure(!m_current_query_pool);
 
-		if (m_query_pool_cache.size() > 0)
-		{
-			m_current_query_pool = std::move(m_query_pool_cache.front());
-			m_query_pool_cache.pop_front();
-		}
-		else
-		{
-			const u32 count = ::size32(query_slot_status);
-			m_current_query_pool = std::make_unique<query_pool>(*owner, query_type, count);
-		}
+		const u32 count = ::size32(query_slot_status);
+		m_current_query_pool = std::make_unique<query_pool>(*owner, query_type, count);
 
 		// From spec: "After query pool creation, each query must be reset before it is used."
-		vkCmdResetQueryPool(cmd, *m_current_query_pool.get(), 0, m_current_query_pool->size());
-		m_pool_lifetime_counter = m_current_query_pool->size();
+		vkCmdResetQueryPool(cmd, *m_current_query_pool.get(), 0, count);
+
+		m_pool_lifetime_counter = count;
 	}
 
 	void query_pool_manager::reallocate_pool(vk::command_buffer& cmd)
@@ -99,8 +90,7 @@ namespace vk
 		{
 			if (!m_current_query_pool->has_refs())
 			{
-				auto ref = std::make_unique<query_pool_ref>(this, m_current_query_pool);
-				vk::get_resource_manager()->dispose(ref);
+				vk::get_resource_manager()->dispose(m_current_query_pool);
 			}
 			else
 			{
@@ -123,8 +113,7 @@ namespace vk
 		{
 			if (!(*It)->has_refs())
 			{
-				auto ref = std::make_unique<query_pool_ref>(this, *It);
-				vk::get_resource_manager()->dispose(ref);
+				vk::get_resource_manager()->dispose(*It);
 				It = m_consumed_pools.erase(It);
 			}
 			else
@@ -134,12 +123,6 @@ namespace vk
 		}
 	}
 
-	void query_pool_manager::set_control_flags(VkQueryControlFlags control_, VkQueryResultFlags result_)
-	{
-		control_flags = control_;
-		result_flags = result_;
-	}
-
 	void query_pool_manager::begin_query(vk::command_buffer& cmd, u32 index)
 	{
 		ensure(query_slot_status[index].active == false);
@@ -148,7 +131,7 @@ namespace vk
 		query_info.pool = m_current_query_pool.get();
 		query_info.active = true;
 
-		vkCmdBeginQuery(cmd, *query_info.pool, index, control_flags);
+		vkCmdBeginQuery(cmd, *query_info.pool, index, 0);//VK_QUERY_CONTROL_PRECISE_BIT);
 	}
 
 	void query_pool_manager::end_query(vk::command_buffer& cmd, u32 index)
@@ -158,7 +141,7 @@ namespace vk
 
 	bool query_pool_manager::check_query_status(u32 index)
 	{
-		return poke_query(query_slot_status[index], index, result_flags);
+		return poke_query(query_slot_status[index], index, VK_QUERY_RESULT_PARTIAL_BIT);
 	}
 
 	u32 query_pool_manager::get_query_result(u32 index)
@@ -166,25 +149,17 @@ namespace vk
 		// Check for cached result
 		auto& query_info = query_slot_status[index];
 
-		if (!query_info.ready)
+		while (!query_info.ready)
 		{
-			poke_query(query_info, index, result_flags);
-
-			while (!query_info.ready)
-			{
-				utils::pause();
-				poke_query(query_info, index, result_flags);
-			}
+			poke_query(query_info, index, VK_QUERY_RESULT_PARTIAL_BIT);
 		}
 
-		return query_info.data;
+		return query_info.any_passed ? 1 : 0;
 	}
 
-	void query_pool_manager::get_query_result_indirect(vk::command_buffer& cmd, u32 index, u32 count, VkBuffer dst, VkDeviceSize dst_offset)
+	void query_pool_manager::get_query_result_indirect(vk::command_buffer& cmd, u32 index, VkBuffer dst, VkDeviceSize dst_offset)
 	{
-		// We're technically supposed to stop any active renderpasses before streaming the results out, but that doesn't matter on IMR hw
-		// On TBDR setups like the apple M series, the stop is required (results are all 0 if you don't flush the RP), but this introduces a very heavy performance loss.
-		vkCmdCopyQueryPoolResults(cmd, *query_slot_status[index].pool, index, count, dst, dst_offset, 4, VK_QUERY_RESULT_WAIT_BIT);
+		vkCmdCopyQueryPoolResults(cmd, *query_slot_status[index].pool, index, 1, dst, dst_offset, 4, VK_QUERY_RESULT_WAIT_BIT);
 	}
 
 	void query_pool_manager::free_query(vk::command_buffer&/*cmd*/, u32 index)
@@ -231,21 +206,4 @@ namespace vk
 
 		return ~0u;
 	}
-
-	void query_pool_manager::on_query_pool_released(std::unique_ptr<vk::query_pool>& pool)
-	{
-		if (!vk::force_reuse_query_pools())
-		{
-			// Delete and let the driver recreate a new pool each time.
-			pool.reset();
-			return;
-		}
-
-		m_query_pool_cache.emplace_back(std::move(pool));
-	}
-
-	query_pool_manager::query_pool_ref::~query_pool_ref()
-	{
-		m_pool_man->on_query_pool_released(m_object);
-	}
 }
diff --git a/rpcs3/Emu/RSX/VK/VKQueryPool.h b/rpcs3/Emu/RSX/VK/VKQueryPool.h
index 009afca379..65b8838486 100644
--- a/rpcs3/Emu/RSX/VK/VKQueryPool.h
+++ b/rpcs3/Emu/RSX/VK/VKQueryPool.h
@@ -16,32 +16,13 @@ namespace vk
 			bool any_passed;
 			bool active;
 			bool ready;
-			u32 data;
-		};
-
-		class query_pool_ref
-		{
-			std::unique_ptr<query_pool> m_object;
-			query_pool_manager* m_pool_man;
-
-		public:
-			query_pool_ref(query_pool_manager* pool_man, std::unique_ptr<query_pool>& pool)
-				: m_object(std::move(pool))
-				, m_pool_man(pool_man)
-			{}
-
-			~query_pool_ref();
 		};
 
 		std::vector<std::unique_ptr<query_pool>> m_consumed_pools;
-		std::deque<std::unique_ptr<query_pool>> m_query_pool_cache;
 		std::unique_ptr<query_pool> m_current_query_pool;
 		std::deque<u32> m_available_slots;
 		u32 m_pool_lifetime_counter = 0;
-
 		VkQueryType query_type = VK_QUERY_TYPE_OCCLUSION;
-		VkQueryResultFlags result_flags = VK_QUERY_RESULT_PARTIAL_BIT;
-		VkQueryControlFlags control_flags = 0;
 
 		vk::render_device* owner = nullptr;
 		std::vector<query_slot_info> query_slot_status;
@@ -55,20 +36,16 @@ namespace vk
 		query_pool_manager(vk::render_device& dev, VkQueryType type, u32 num_entries);
 		~query_pool_manager();
 
-		void set_control_flags(VkQueryControlFlags control_flags, VkQueryResultFlags result_flags);
-
 		void begin_query(vk::command_buffer& cmd, u32 index);
 		void end_query(vk::command_buffer& cmd, u32 index);
 
 		bool check_query_status(u32 index);
 		u32  get_query_result(u32 index);
-		void get_query_result_indirect(vk::command_buffer& cmd, u32 index, u32 count, VkBuffer dst, VkDeviceSize dst_offset);
+		void get_query_result_indirect(vk::command_buffer& cmd, u32 index, VkBuffer dst, VkDeviceSize dst_offset);
 
 		u32 allocate_query(vk::command_buffer& cmd);
 		void free_query(vk::command_buffer&/*cmd*/, u32 index);
 
-		void on_query_pool_released(std::unique_ptr<vk::query_pool>& pool);
-
 		template<template<class> class _List>
 		void free_queries(vk::command_buffer& cmd, _List<u32>& list)
 		{
diff --git a/rpcs3/Emu/RSX/VK/VKRenderPass.cpp b/rpcs3/Emu/RSX/VK/VKRenderPass.cpp
index c9fe0665d9..129a806460 100644
--- a/rpcs3/Emu/RSX/VK/VKRenderPass.cpp
+++ b/rpcs3/Emu/RSX/VK/VKRenderPass.cpp
@@ -4,8 +4,6 @@
 #include "VKRenderPass.h"
 #include "vkutils/image.h"
 
-#include "Emu/RSX/Common/unordered_map.hpp"
-
 namespace vk
 {
 	struct active_renderpass_info_t
@@ -16,10 +14,10 @@ namespace vk
 
 	atomic_t<u64> g_cached_renderpass_key = 0;
 	VkRenderPass  g_cached_renderpass = VK_NULL_HANDLE;
-	rsx::unordered_map<VkCommandBuffer, active_renderpass_info_t>  g_current_renderpass;
+	std::unordered_map<VkCommandBuffer, active_renderpass_info_t>  g_current_renderpass;
 
 	shared_mutex g_renderpass_cache_mutex;
-	rsx::unordered_map<u64, VkRenderPass> g_renderpass_cache;
+	std::unordered_map<u64, VkRenderPass> g_renderpass_cache;
 
 	// Key structure
 	// 0-7 color_format
@@ -33,14 +31,12 @@ namespace vk
 		// Internal utils
 		static u64 encode_layout(VkImageLayout layout)
 		{
-			switch (+layout)
+			switch (layout)
 			{
 			case VK_IMAGE_LAYOUT_GENERAL:
 			case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL:
 			case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL:
 				return static_cast<u64>(layout);
-			case VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT:
-				return 4ull;
 			default:
 				fmt::throw_exception("Unsupported layout 0x%llx here", static_cast<usz>(layout));
 			}
@@ -54,8 +50,6 @@ namespace vk
 			case 2:
 			case 3:
 				return static_cast<VkImageLayout>(encoded);
-			case 4:
-				return VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT;
 			default:
 				fmt::throw_exception("Unsupported layout encoding 0x%llx here", encoded);
 			}
@@ -79,9 +73,8 @@ namespace vk
 		// Encoders
 		inline void set_layout(u32 index, VkImageLayout layout)
 		{
-			switch (+layout)
+			switch (layout)
 			{
-			case VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT:
 			case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL:
 			case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL:
 			case VK_IMAGE_LAYOUT_GENERAL:
@@ -155,9 +148,9 @@ namespace vk
 
 			for (u32 i = 0, layout_offset = 0; i < 5; ++i, layout_offset += 3)
 			{
-				if (const auto layout_encoding = (layout_blob >> layout_offset) & 0x7)
+				if (const auto layout = VkImageLayout((layout_blob >> layout_offset) & 0x7))
 				{
-					result.push_back(decode_layout(layout_encoding));
+					result.push_back(layout);
 				}
 				else
 				{
@@ -343,7 +336,7 @@ namespace vk
 		g_renderpass_cache.clear();
 	}
 
-	void begin_renderpass(const vk::command_buffer& cmd, VkRenderPass pass, VkFramebuffer target, const coordu& framebuffer_region)
+	void begin_renderpass(VkCommandBuffer cmd, VkRenderPass pass, VkFramebuffer target, const coordu& framebuffer_region)
 	{
 		auto& renderpass_info = g_current_renderpass[cmd];
 		if (renderpass_info.pass == pass && renderpass_info.fbo == target)
@@ -368,7 +361,7 @@ namespace vk
 		renderpass_info = { pass, target };
 	}
 
-	void begin_renderpass(VkDevice dev, const vk::command_buffer& cmd, u64 renderpass_key, VkFramebuffer target, const coordu& framebuffer_region)
+	void begin_renderpass(VkDevice dev, VkCommandBuffer cmd, u64 renderpass_key, VkFramebuffer target, const coordu& framebuffer_region)
 	{
 		if (renderpass_key != g_cached_renderpass_key)
 		{
@@ -379,18 +372,18 @@ namespace vk
 		begin_renderpass(cmd, g_cached_renderpass, target, framebuffer_region);
 	}
 
-	void end_renderpass(const vk::command_buffer& cmd)
+	void end_renderpass(VkCommandBuffer cmd)
 	{
 		vkCmdEndRenderPass(cmd);
 		g_current_renderpass[cmd] = {};
 	}
 
-	bool is_renderpass_open(const vk::command_buffer& cmd)
+	bool is_renderpass_open(VkCommandBuffer cmd)
 	{
 		return g_current_renderpass[cmd].pass != VK_NULL_HANDLE;
 	}
 
-	void renderpass_op(const vk::command_buffer& cmd, const renderpass_op_callback_t& op)
+	void renderpass_op(VkCommandBuffer cmd, const renderpass_op_callback_t& op)
 	{
 		const auto& active = g_current_renderpass[cmd];
 		op(cmd, active.pass, active.fbo);
diff --git a/rpcs3/Emu/RSX/VK/VKRenderPass.h b/rpcs3/Emu/RSX/VK/VKRenderPass.h
index 6b6718ef29..0753a3fb0e 100644
--- a/rpcs3/Emu/RSX/VK/VKRenderPass.h
+++ b/rpcs3/Emu/RSX/VK/VKRenderPass.h
@@ -6,7 +6,6 @@
 namespace vk
 {
 	class image;
-	class command_buffer;
 
 	u64 get_renderpass_key(const std::vector<vk::image*>& images, const std::vector<u8>& input_attachment_ids = {});
 	u64 get_renderpass_key(const std::vector<vk::image*>& images, u64 previous_key);
@@ -17,11 +16,11 @@ namespace vk
 
 	// Renderpass scope management helpers.
 	// NOTE: These are not thread safe by design.
-	void begin_renderpass(VkDevice dev, const vk::command_buffer& cmd, u64 renderpass_key, VkFramebuffer target, const coordu& framebuffer_region);
-	void begin_renderpass(const vk::command_buffer& cmd, VkRenderPass pass, VkFramebuffer target, const coordu& framebuffer_region);
-	void end_renderpass(const vk::command_buffer& cmd);
-	bool is_renderpass_open(const vk::command_buffer& cmd);
+	void begin_renderpass(VkDevice dev, VkCommandBuffer cmd, u64 renderpass_key, VkFramebuffer target, const coordu& framebuffer_region);
+	void begin_renderpass(VkCommandBuffer cmd, VkRenderPass pass, VkFramebuffer target, const coordu& framebuffer_region);
+	void end_renderpass(VkCommandBuffer cmd);
+	bool is_renderpass_open(VkCommandBuffer cmd);
 
-	using renderpass_op_callback_t = std::function<void(const vk::command_buffer&, VkRenderPass, VkFramebuffer)>;
-	void renderpass_op(const vk::command_buffer& cmd, const renderpass_op_callback_t& op);
+	using renderpass_op_callback_t = std::function<void(VkCommandBuffer, VkRenderPass, VkFramebuffer)>;
+	void renderpass_op(VkCommandBuffer cmd, const renderpass_op_callback_t& op);
 }
diff --git a/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp b/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp
index 0356a1c7d8..dad08ae73a 100644
--- a/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp
+++ b/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp
@@ -1,22 +1,8 @@
-#include "vkutils/data_heap.h"
 #include "VKRenderTargets.h"
 #include "VKResourceManager.h"
-#include "Emu/RSX/rsx_methods.h"
-#include "Emu/RSX/RSXThread.h"
-
-#include "Emu/RSX/Common/tiled_dma_copy.hpp"
 
 namespace vk
 {
-	namespace surface_cache_utils
-	{
-		void dispose(vk::buffer* buf)
-		{
-			auto obj = vk::disposable_t::make(buf);
-			vk::get_resource_manager()->dispose(obj);
-		}
-	}
-
 	void surface_cache::destroy()
 	{
 		invalidate_all();
@@ -34,7 +20,7 @@ namespace vk
 		}
 		else if (total_device_memory >= 1024)
 		{
-			quota = std::max<u64>(512, (total_device_memory * 30) / 100);
+			quota = 768;
 		}
 		else if (total_device_memory >= 768)
 		{
@@ -51,6 +37,12 @@ namespace vk
 
 	bool surface_cache::can_collapse_surface(const std::unique_ptr<vk::render_target>& surface, rsx::problem_severity severity)
 	{
+		if (surface->samples() == 1)
+		{
+			// No internal allocations needed for non-MSAA images
+			return true;
+		}
+
 		if (severity < rsx::problem_severity::fatal &&
 			vk::vmm_determine_memory_load_severity() < rsx::problem_severity::fatal)
 		{
@@ -59,21 +51,27 @@ namespace vk
 		}
 
 		// Check if we need to do any allocations. Do not collapse in such a situation otherwise
-		if (surface->samples() > 1 && !surface->resolve_surface)
+		if (!surface->resolve_surface)
 		{
 			return false;
 		}
-
-		// Resolve target does exist. Scan through the entire collapse chain
-		for (auto& region : surface->old_contents)
+		else
 		{
-			// FIXME: This is just lazy
-			auto proxy = std::unique_ptr<vk::render_target>(vk::as_rtt(region.source));
-			const bool collapsible = can_collapse_surface(proxy, severity);
-			proxy.release();
-
-			if (!collapsible)
+			// Resolve target does exist. Scan through the entire collapse chain
+			for (auto& region : surface->old_contents)
 			{
+				if (region.source->samples() == 1)
+				{
+					// Not MSAA
+					continue;
+				}
+
+				if (vk::as_rtt(region.source)->resolve_surface)
+				{
+					// Has a resolve target.
+					continue;
+				}
+
 				return false;
 			}
 		}
@@ -93,12 +91,12 @@ namespace vk
 
 			// Drop MSAA resolve/unresolve caches. Only trigger when a hard sync is guaranteed to follow else it will cause even more problems!
 			// 2-pass to ensure resources are available where they are most needed
-			auto relieve_memory_pressure = [&](auto& list, const utils::address_range32& range)
+			auto relieve_memory_pressure = [&](const auto& list)
 			{
-				for (auto it = list.begin_range(range); it != list.end(); ++it)
+				for (auto& surface : list)
 				{
-					auto& rtt = it->second;
-					if (!rtt->spill_request_tag || rtt->spill_request_tag < rtt->last_rw_access_tag)
+					auto& rtt = surface.second;
+					if (!rtt->spill_request_tag || rtt->spill_request_tag < surface.second->last_rw_access_tag)
 					{
 						// We're not going to be spilling into system RAM. If a MSAA resolve target exists, remove it to save memory.
 						if (rtt->resolve_surface)
@@ -127,9 +125,9 @@ namespace vk
 			// 1. Spill an strip any 'invalidated resources'. At this point it doesn't matter and we donate to the resolve cache which is a plus.
 			for (auto& surface : invalidated_resources)
 			{
-				if (!surface->value && !surface->resolve_surface)
+				if (!surface->value)
 				{
-					// Unspilled resources can have no value but have a resolve surface used for read
+					ensure(!surface->resolve_surface);
 					continue;
 				}
 
@@ -153,8 +151,8 @@ namespace vk
 			}
 
 			// 2. Scan the list and spill resources that can be spilled immediately if requested. Also gather resources from those that don't need it.
-			relieve_memory_pressure(m_render_targets_storage, m_render_targets_memory_range);
-			relieve_memory_pressure(m_depth_stencil_storage, m_depth_stencil_memory_range);
+			relieve_memory_pressure(m_render_targets_storage);
+			relieve_memory_pressure(m_depth_stencil_storage);
 
 			// 3. Write to system heap everything marked to spill
 			for (auto& surface : deferred_spills)
@@ -172,15 +170,20 @@ namespace vk
 		return any_released;
 	}
 
-	void surface_cache::trim(vk::command_buffer& cmd, rsx::problem_severity memory_pressure)
+	void surface_cache::free_invalidated(vk::command_buffer& cmd, rsx::problem_severity memory_pressure)
 	{
-		run_cleanup_internal(cmd, rsx::problem_severity::moderate, 300, [](vk::command_buffer& cmd)
+		// Do not allow more than 300M of RSX memory to be used by RTTs.
+		// The actual boundary is 256M but we need to give some overallocation for performance reasons.
+		if (check_memory_usage(300 * 0x100000))
 		{
 			if (!cmd.is_recording())
 			{
 				cmd.begin();
 			}
-		});
+
+			const auto severity = std::max(memory_pressure, rsx::problem_severity::moderate);
+			handle_memory_pressure(cmd, severity);
+		}
 
 		const u64 last_finished_frame = vk::get_last_completed_frame_id();
 		invalidated_resources.remove_if([&](std::unique_ptr<vk::render_target>& rtt)
@@ -194,24 +197,21 @@ namespace vk
 				return false;
 			}
 
+			if (memory_pressure >= rsx::problem_severity::severe)
+			{
+				if (rtt->resolve_surface)
+				{
+					// We do not need to keep resolve targets around if things are bad.
+					vk::get_resource_manager()->dispose(rtt->resolve_surface);
+				}
+			}
+
 			if (rtt->frame_tag >= last_finished_frame)
 			{
 				// RTT itself still in use by the frame.
 				return false;
 			}
 
-			if (!rtt->old_contents.empty())
-			{
-				rtt->clear_rw_barrier();
-			}
-
-			if (rtt->resolve_surface && memory_pressure >= rsx::problem_severity::moderate)
-			{
-				// We do not need to keep resolve targets around.
-				// TODO: We should surrender this to an image cache immediately for reuse.
-				vk::get_resource_manager()->dispose(rtt->resolve_surface);
-			}
-
 			switch (memory_pressure)
 			{
 			case rsx::problem_severity::low:
@@ -221,7 +221,6 @@ namespace vk
 			case rsx::problem_severity::severe:
 			case rsx::problem_severity::fatal:
 				// We're almost dead anyway. Remove forcefully.
-				vk::get_resource_manager()->dispose(rtt);
 				return true;
 			default:
 				fmt::throw_exception("Unreachable");
@@ -252,25 +251,27 @@ namespace vk
 
 		// Very slow, but should only be called when the situation is dire
 		std::vector<render_target*> sorted_list;
-		sorted_list.reserve(1024);
+		sorted_list.reserve(m_render_targets_storage.size() + m_depth_stencil_storage.size());
 
-		auto process_list_function = [&](auto& list, const utils::address_range32& range)
+		auto process_list_function = [&](const auto& list)
 		{
-			for (auto it = list.begin_range(range); it != list.end(); ++it)
+			for (auto& surface : list)
 			{
 				// NOTE: Check if memory is available instead of value in case we ran out of memory during unspill
-				auto& surface = it->second;
-				if (surface->memory && !surface->is_bound)
+				if (surface.second->memory && !surface.second->is_bound)
 				{
-					sorted_list.push_back(surface.get());
+					sorted_list.push_back(surface.second.get());
 				}
 			}
 		};
 
-		process_list_function(m_render_targets_storage, m_render_targets_memory_range);
-		process_list_function(m_depth_stencil_storage, m_depth_stencil_memory_range);
+		process_list_function(m_render_targets_storage);
+		process_list_function(m_depth_stencil_storage);
 
-		std::sort(sorted_list.begin(), sorted_list.end(), FN(x->last_rw_access_tag < y->last_rw_access_tag));
+		std::sort(sorted_list.begin(), sorted_list.end(), [](const auto& a, const auto& b)
+		{
+			return a->last_rw_access_tag < b->last_rw_access_tag;
+		});
 
 		// Remove upto target_memory bytes from VRAM
 		u64 bytes_spilled = 0;
@@ -336,6 +337,8 @@ namespace vk
 
 		if (!is_depth_surface()) [[likely]]
 		{
+			ensure(current_layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
+
 			// This is the source; finish writing before reading
 			vk::insert_image_memory_barrier(
 				cmd, this->value,
@@ -527,6 +530,8 @@ namespace vk
 
 	bool render_target::spill(vk::command_buffer& cmd, std::vector<std::unique_ptr<vk::viewable_image>>& resolve_cache)
 	{
+		ensure(value);
+
 		u64 element_size;
 		switch (const auto fmt = format())
 		{
@@ -545,7 +550,6 @@ namespace vk
 		vk::viewable_image* src = nullptr;
 		if (samples() == 1) [[likely]]
 		{
-			ensure(value);
 			src = this;
 		}
 		else if (resolve_surface)
@@ -682,50 +686,10 @@ namespace vk
 		subres.depth = 1;
 		subres.data = { vm::get_super_ptr<const std::byte>(base_addr), static_cast<std::span<const std::byte>::size_type>(rsx_pitch * surface_height * samples_y) };
 
-		const auto range = get_memory_range();
-		rsx::flags32_t upload_flags = upload_contents_inline;
-		u32 heap_align = rsx_pitch;
-
-#if DEBUG_DMA_TILING
-		std::vector<u8> ext_data;
-#endif
-
-		if (auto tiled_region = rsx::get_current_renderer()->get_tiled_memory_region(range))
-		{
-#if DEBUG_DMA_TILING
-			auto real_data = vm::get_super_ptr<u8>(range.start);
-			ext_data.resize(tiled_region.tile->size);
-			auto detile_func = get_bpp() == 4
-				? rsx::detile_texel_data32
-				: rsx::detile_texel_data16;
-
-			detile_func(
-				ext_data.data(),
-				real_data,
-				tiled_region.base_address,
-				range.start - tiled_region.base_address,
-				tiled_region.tile->size,
-				tiled_region.tile->bank,
-				tiled_region.tile->pitch,
-				subres.width_in_block,
-				subres.height_in_block
-			);
-			subres.data = std::span(ext_data);
-#else
-			const auto [scratch_buf, linear_data_scratch_offset] = vk::detile_memory_block(cmd, tiled_region, range, subres.width_in_block, subres.height_in_block, get_bpp());
-
-			// FIXME: !!EVIL!!
-			subres.data = { scratch_buf, linear_data_scratch_offset };
-			subres.pitch_in_block = subres.width_in_block;
-			upload_flags |= source_is_gpu_resident;
-			heap_align = subres.width_in_block * get_bpp();
-#endif
-		}
-
 		if (g_cfg.video.resolution_scale_percent == 100 && spp == 1) [[likely]]
 		{
 			push_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
-			vk::upload_image(cmd, this, { subres }, get_gcm_format(), is_swizzled, 1, aspect(), upload_heap, heap_align, upload_flags);
+			vk::upload_image(cmd, this, { subres }, get_gcm_format(), is_swizzled, 1, aspect(), upload_heap, rsx_pitch, upload_contents_inline);
 			pop_layout(cmd);
 		}
 		else
@@ -746,29 +710,22 @@ namespace vk
 			else
 			{
 				content = vk::get_typeless_helper(format(), format_class(), subres.width_in_block, subres.height_in_block);
-				if (content->current_layout == VK_IMAGE_LAYOUT_UNDEFINED)
-				{
-					content->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
-				}
-				content->push_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
+				content->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
 			}
 
 			// Load Cell data into temp buffer
-			vk::upload_image(cmd, content, { subres }, get_gcm_format(), is_swizzled, 1, aspect(), upload_heap, heap_align, upload_flags);
+			vk::upload_image(cmd, content, { subres }, get_gcm_format(), is_swizzled, 1, aspect(), upload_heap, rsx_pitch, upload_contents_inline);
 
 			// Write into final image
 			if (content != final_dst)
 			{
 				// Avoid layout push/pop on scratch memory by setting explicit layout here
-				content->pop_layout(cmd);
-				content->push_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
+				content->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
 
 				vk::copy_scaled_image(cmd, content, final_dst,
 					{ 0, 0, subres.width_in_block, subres.height_in_block },
 					{ 0, 0, static_cast<s32>(final_dst->width()), static_cast<s32>(final_dst->height()) },
 					1, true, aspect() == VK_IMAGE_ASPECT_COLOR_BIT ? VK_FILTER_LINEAR : VK_FILTER_NEAREST);
-
-				content->pop_layout(cmd);
 			}
 
 			final_dst->pop_layout(cmd);
@@ -810,7 +767,7 @@ namespace vk
 	{
 		last_rw_access_tag = rsx::get_shared_tag();
 
-		if (samples() == 1 || !access_type.is_transfer())
+		if (samples() == 1 || access_type == rsx::surface_access::shader_write)
 		{
 			return this;
 		}
@@ -826,6 +783,11 @@ namespace vk
 		return !!(aspect() & VK_IMAGE_ASPECT_DEPTH_BIT);
 	}
 
+	void render_target::release_ref(vk::viewable_image* t) const
+	{
+		static_cast<vk::render_target*>(t)->release();
+	}
+
 	bool render_target::matches_dimensions(u16 _width, u16 _height) const
 	{
 		// Use forward scaling to account for rounding and clamping errors
@@ -835,78 +797,37 @@ namespace vk
 
 	void render_target::texture_barrier(vk::command_buffer& cmd)
 	{
-		const auto is_framebuffer_read_only = is_depth_surface() && !rsx::method_registers.depth_write_enabled();
-		const auto supports_fbo_loops = cmd.get_command_pool().get_owner().get_framebuffer_loops_support();
-		const auto optimal_layout = supports_fbo_loops ? VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT
-			: VK_IMAGE_LAYOUT_GENERAL;
-
-		if (m_cyclic_ref_tracker.can_skip() && current_layout == optimal_layout && is_framebuffer_read_only)
+		if (samples() == 1)
 		{
-			// If we have back-to-back depth-read barriers, skip subsequent ones
-			// If an actual write is happening, this flag will be automatically reset
-			return;
+			if (!write_barrier_sync_tag) write_barrier_sync_tag++; // Activate barrier sync
+			cyclic_reference_sync_tag = write_barrier_sync_tag;    // Match tags
 		}
 
-		vk::insert_texture_barrier(cmd, this, optimal_layout);
-		m_cyclic_ref_tracker.on_insert_texture_barrier();
-
-		if (is_framebuffer_read_only)
-		{
-			m_cyclic_ref_tracker.allow_skip();
-		}
-	}
-
-	void render_target::post_texture_barrier(vk::command_buffer& cmd)
-	{
-		// This is a fall-out barrier after a cyclic ref when the same surface is still bound.
-		// In this case, we're just checking that the previous read completes before the next write.
-		const bool is_framebuffer_read_only = is_depth_surface() && !rsx::method_registers.depth_write_enabled();
-		if (m_cyclic_ref_tracker.can_skip() && is_framebuffer_read_only)
-		{
-			// Barrier ellided if triggered by a chain of cyclic references with no actual writes
-			m_cyclic_ref_tracker.reset();
-			return;
-		}
-
-		VkPipelineStageFlags src_stage, dst_stage;
-		VkAccessFlags src_access, dst_access;
-
-		if (!is_depth_surface()) [[likely]]
-		{
-			src_stage = VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
-			dst_stage = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
-			src_access = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
-			dst_access = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
-		}
-		else
-		{
-			src_stage = VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
-			dst_stage = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
-			src_access = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
-			dst_access = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
-		}
-
-		vk::insert_image_memory_barrier(cmd, value, current_layout, current_layout,
-			src_stage, dst_stage, src_access, dst_access, { aspect(), 0, 1, 0, 1 });
-
-		m_cyclic_ref_tracker.reset();
+		vk::insert_texture_barrier(cmd, this, VK_IMAGE_LAYOUT_GENERAL);
 	}
 
 	void render_target::reset_surface_counters()
 	{
 		frame_tag = 0;
-		m_cyclic_ref_tracker.reset();
+		write_barrier_sync_tag = 0;
 	}
 
-	image_view* render_target::get_view(const rsx::texture_channel_remap_t& remap, VkImageAspectFlags mask)
+	image_view* render_target::get_view(u32 remap_encoding, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap, VkImageAspectFlags mask)
 	{
-		if (remap.encoded == VK_REMAP_VIEW_MULTISAMPLED)
+		if (remap_encoding == VK_REMAP_VIEW_MULTISAMPLED)
 		{
 			// Special remap flag, intercept here
-			return vk::viewable_image::get_view(remap.with_encoding(VK_REMAP_IDENTITY), mask);
+			return vk::viewable_image::get_view(VK_REMAP_IDENTITY, remap, mask);
 		}
 
-		return vk::viewable_image::get_view(remap, mask);
+		if (!resolve_surface) [[likely]]
+		{
+			return vk::viewable_image::get_view(remap_encoding, remap, mask);
+		}
+		else
+		{
+			return resolve_surface->get_view(remap_encoding, remap, mask);
+		}
 	}
 
 	void render_target::memory_barrier(vk::command_buffer& cmd, rsx::surface_access access)
@@ -944,23 +865,46 @@ namespace vk
 			unspill(cmd);
 		}
 
-		if (access == rsx::surface_access::shader_write && m_cyclic_ref_tracker.is_enabled())
+		if (access == rsx::surface_access::shader_write && write_barrier_sync_tag != 0)
 		{
-			if (current_layout == VK_IMAGE_LAYOUT_GENERAL || current_layout == VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT)
+			if (current_layout == VK_IMAGE_LAYOUT_GENERAL)
 			{
-				// Flag draw barrier observed
-				m_cyclic_ref_tracker.on_insert_draw_barrier();
-
-				// Check if we've had more draws than barriers so far (fall-out condition)
-				if (m_cyclic_ref_tracker.requires_post_loop_barrier())
+				if (write_barrier_sync_tag != cyclic_reference_sync_tag)
 				{
-					post_texture_barrier(cmd);
+					// This barrier catches a very specific case where 2 draw calls are executed with general layout (cyclic ref) but no texture barrier in between.
+					// This happens when a cyclic ref is broken. In this case previous draw must finish drawing before the new one renders to avoid current draw breaking previous one.
+					VkPipelineStageFlags src_stage, dst_stage;
+					VkAccessFlags src_access, dst_access;
+
+					if (!is_depth_surface()) [[likely]]
+					{
+						src_stage = VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+						dst_stage = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+						src_access = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+						dst_access = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+					}
+					else
+					{
+						src_stage = VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
+						dst_stage = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
+						src_access = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
+						dst_access = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
+					}
+
+					vk::insert_image_memory_barrier(cmd, value, VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_GENERAL,
+						src_stage, dst_stage, src_access, dst_access, { aspect(), 0, 1, 0, 1 });
+
+					write_barrier_sync_tag = 0; // Disable for next draw
+				}
+				else
+				{
+					// Synced externally for this draw
+					write_barrier_sync_tag++;
 				}
 			}
 			else
 			{
-				// Layouts changed elsewhere. Reset.
-				m_cyclic_ref_tracker.reset();
+				write_barrier_sync_tag = 0; // Disable
 			}
 		}
 
@@ -977,7 +921,7 @@ namespace vk
 
 			if (msaa_flags & rsx::surface_state_flags::require_resolve)
 			{
-				if (access.is_transfer())
+				if (access.is_transfer_or_read())
 				{
 					// Only do this step when read access is required
 					get_resolve_target_safe(cmd);
@@ -997,7 +941,7 @@ namespace vk
 			return;
 		}
 
-		// Memory transfers
+			// Memory transfers
 		vk::image* target_image = (samples() > 1) ? get_resolve_target_safe(cmd) : this;
 		vk::blitter hw_blitter;
 		const auto dst_bpp = get_bpp();
@@ -1011,7 +955,7 @@ namespace vk
 		{
 			auto& section = old_contents[i];
 			auto src_texture = static_cast<vk::render_target*>(section.source);
-			src_texture->memory_barrier(cmd, rsx::surface_access::transfer_read);
+			src_texture->read_barrier(cmd);
 
 			if (!accept_all && !src_texture->test()) [[likely]]
 			{
diff --git a/rpcs3/Emu/RSX/VK/VKRenderTargets.h b/rpcs3/Emu/RSX/VK/VKRenderTargets.h
index 3c3ef0acbd..4dad8ba826 100644
--- a/rpcs3/Emu/RSX/VK/VKRenderTargets.h
+++ b/rpcs3/Emu/RSX/VK/VKRenderTargets.h
@@ -7,70 +7,22 @@
 #include "VKHelpers.h"
 #include "vkutils/barriers.h"
 #include "vkutils/buffer_object.h"
+#include "vkutils/data_heap.h"
 #include "vkutils/device.h"
 #include "vkutils/image.h"
 #include "vkutils/scratch.h"
 
+#include <span>
+
 namespace vk
 {
-	namespace surface_cache_utils
-	{
-		void dispose(vk::buffer* buf);
-	}
-
 	void resolve_image(vk::command_buffer& cmd, vk::viewable_image* dst, vk::viewable_image* src);
 	void unresolve_image(vk::command_buffer& cmd, vk::viewable_image* dst, vk::viewable_image* src);
 
-	class image_reference_sync_barrier
+	class render_target : public viewable_image, public rsx::ref_counted, public rsx::render_target_descriptor<vk::viewable_image*>
 	{
-		u32 m_texture_barrier_count = 0;
-		u32 m_draw_barrier_count = 0;
-		bool m_allow_skip_barrier = true;
-
-	public:
-		void on_insert_texture_barrier()
-		{
-			m_texture_barrier_count++;
-			m_allow_skip_barrier = false;
-		}
-
-		void on_insert_draw_barrier()
-		{
-			// Account for corner case where the same texture can be bound to more than 1 slot
-			m_draw_barrier_count = std::max(m_draw_barrier_count + 1, m_texture_barrier_count);
-		}
-
-		void allow_skip()
-		{
-			m_allow_skip_barrier = true;
-		}
-
-		void reset()
-		{
-			m_texture_barrier_count = m_draw_barrier_count = 0ull;
-			m_allow_skip_barrier = false;
-		}
-
-		bool can_skip() const
-		{
-			return m_allow_skip_barrier;
-		}
-
-		bool is_enabled() const
-		{
-			return !!m_texture_barrier_count;
-		}
-
-		bool requires_post_loop_barrier() const
-		{
-			return is_enabled() && m_texture_barrier_count < m_draw_barrier_count;
-		}
-	};
-
-	class render_target : public viewable_image, public rsx::render_target_descriptor<vk::viewable_image*>
-	{
-		// Cyclic reference hazard tracking
-		image_reference_sync_barrier m_cyclic_ref_tracker;
+		u64 cyclic_reference_sync_tag = 0;
+		u64 write_barrier_sync_tag = 0;
 
 		// Memory spilling support
 		std::unique_ptr<vk::buffer> m_spilled_mem;
@@ -107,10 +59,11 @@ namespace vk
 
 		vk::viewable_image* get_surface(rsx::surface_access access_type) override;
 		bool is_depth_surface() const override;
+		void release_ref(vk::viewable_image* t) const override;
 		bool matches_dimensions(u16 _width, u16 _height) const;
 		void reset_surface_counters();
 
-		image_view* get_view(const rsx::texture_channel_remap_t& remap,
+		image_view* get_view(u32 remap_encoding, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap,
 			VkImageAspectFlags mask = VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT) override;
 
 		// Memory management
@@ -118,7 +71,6 @@ namespace vk
 
 		// Synchronization
 		void texture_barrier(vk::command_buffer& cmd);
-		void post_texture_barrier(vk::command_buffer& cmd);
 		void memory_barrier(vk::command_buffer& cmd, rsx::surface_access access);
 		void read_barrier(vk::command_buffer& cmd) { memory_barrier(cmd, rsx::surface_access::shader_read); }
 		void write_barrier(vk::command_buffer& cmd) { memory_barrier(cmd, rsx::surface_access::shader_write); }
@@ -129,46 +81,27 @@ namespace vk
 		return ensure(dynamic_cast<vk::render_target*>(t));
 	}
 
-	static inline const vk::render_target* as_rtt(const vk::image* t)
-	{
-		return ensure(dynamic_cast<const vk::render_target*>(t));
-	}
-
 	struct surface_cache_traits
 	{
 		using surface_storage_type = std::unique_ptr<vk::render_target>;
 		using surface_type = vk::render_target*;
-		using buffer_object_storage_type = std::unique_ptr<vk::buffer>;
-		using buffer_object_type = vk::buffer*;
 		using command_list_type = vk::command_buffer&;
 		using download_buffer_object = void*;
 		using barrier_descriptor_t = rsx::deferred_clipped_region<vk::render_target*>;
 
-		static std::pair<VkImageUsageFlags, VkImageCreateFlags> get_attachment_create_flags(VkFormat format, [[maybe_unused]] u8 samples)
+		static std::pair<VkImageUsageFlags, VkImageCreateFlags> get_attachment_create_flags(u8 samples)
 		{
-			if (g_cfg.video.strict_rendering_mode)
+			if (g_cfg.video.strict_rendering_mode || samples > 1)
 			{
 				return {};
 			}
 
-			// If we have driver support for FBO loops, set the usage flag for it.
-			if (vk::get_current_renderer()->get_framebuffer_loops_support())
-			{
-				return { VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT, VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT };
-			}
-
 			// Workarounds to force transition to GENERAL to decompress.
 			// Fixes corruption in FBO loops for ANV and RADV.
 			switch (vk::get_driver_vendor())
 			{
 			case driver_vendor::ANV:
-				if (const auto format_features = vk::get_current_renderer()->get_format_properties(format);
-					format_features.optimalTilingFeatures & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT)
-				{
-					// Only set if supported by hw
-					return { VK_IMAGE_USAGE_STORAGE_BIT, 0 };
-				}
-				break;
+				return { VK_IMAGE_USAGE_STORAGE_BIT, 0 };
 			case driver_vendor::AMD:
 			case driver_vendor::RADV:
 				if (vk::get_chip_family() >= chip_class::AMD_navi1x)
@@ -182,13 +115,6 @@ namespace vk
 				[[ fallthrough ]];
 			case driver_vendor::NVIDIA:
 			case driver_vendor::INTEL:
-			case driver_vendor::MVK:
-			case driver_vendor::DOZEN:
-			case driver_vendor::LAVAPIPE:
-			case driver_vendor::V3DV:
-			case driver_vendor::HONEYKRISP:
-			case driver_vendor::PANVK:
-			case driver_vendor::ARM_MALI:
 				break;
 			}
 
@@ -218,12 +144,12 @@ namespace vk
 				sample_layout = rsx::surface_sample_layout::null;
 			}
 
-			auto [usage_flags, create_flags] = get_attachment_create_flags(requested_format, samples);
-			usage_flags |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
+			auto [usage_flags, create_flags] = get_attachment_create_flags(samples);
+			usage_flags |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
 
 			if (samples == 1) [[likely]]
 			{
-				usage_flags |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+				usage_flags |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
 			}
 			else
 			{
@@ -246,7 +172,7 @@ namespace vk
 				VMM_ALLOCATION_POOL_SURFACE_CACHE,
 				RSX_FORMAT_CLASS_COLOR);
 
-			rtt->set_debug_name(fmt::format("RTV @0x%x, fmt=0x%x", address, static_cast<int>(format)));
+			rtt->set_debug_name(fmt::format("RTV @0x%x", address));
 			rtt->change_layout(cmd, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
 
 			rtt->set_format(format);
@@ -255,8 +181,8 @@ namespace vk
 			rtt->memory_usage_flags = rsx::surface_usage_flags::attachment;
 			rtt->state_flags = rsx::surface_state_flags::erase_bkgnd;
 			rtt->native_component_map = fmt.second;
-			rtt->rsx_pitch = static_cast<u32>(pitch);
-			rtt->native_pitch = static_cast<u32>(width) * get_format_block_size_in_bytes(format) * rtt->samples_x;
+			rtt->rsx_pitch = static_cast<u16>(pitch);
+			rtt->native_pitch = static_cast<u16>(width) * get_format_block_size_in_bytes(format) * rtt->samples_x;
 			rtt->surface_width = static_cast<u16>(width);
 			rtt->surface_height = static_cast<u16>(height);
 			rtt->queue_tag(address);
@@ -287,7 +213,7 @@ namespace vk
 				sample_layout = rsx::surface_sample_layout::null;
 			}
 
-			auto [usage_flags, create_flags] = get_attachment_create_flags(requested_format, samples);
+			auto [usage_flags, create_flags] = get_attachment_create_flags(samples);
 			usage_flags |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
 
 			if (samples == 1) [[likely]]
@@ -320,8 +246,8 @@ namespace vk
 			ds->memory_usage_flags = rsx::surface_usage_flags::attachment;
 			ds->state_flags = rsx::surface_state_flags::erase_bkgnd;
 			ds->native_component_map = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R };
-			ds->native_pitch = static_cast<u32>(width) * get_format_block_size_in_bytes(format) * ds->samples_x;
-			ds->rsx_pitch = static_cast<u32>(pitch);
+			ds->native_pitch = static_cast<u16>(width) * get_format_block_size_in_bytes(format) * ds->samples_x;
+			ds->rsx_pitch = static_cast<u16>(pitch);
 			ds->surface_width = static_cast<u16>(width);
 			ds->surface_height = static_cast<u16>(height);
 			ds->queue_tag(address);
@@ -338,7 +264,7 @@ namespace vk
 			if (!sink)
 			{
 				const auto [new_w, new_h] = rsx::apply_resolution_scale<true>(prev.width, prev.height,
-					ref->get_surface_width<rsx::surface_metrics::pixels>(), ref->get_surface_height<rsx::surface_metrics::pixels>());
+					ref->get_surface_width(rsx::surface_metrics::pixels), ref->get_surface_height(rsx::surface_metrics::pixels));
 
 				auto& dev = cmd.get_command_pool().get_owner();
 				sink = std::make_unique<vk::render_target>(dev, dev.get_memory_mapping().device_local,
@@ -362,7 +288,7 @@ namespace vk
 				sink->native_component_map = ref->native_component_map;
 				sink->sample_layout = ref->sample_layout;
 				sink->stencil_init_flags = ref->stencil_init_flags;
-				sink->native_pitch = static_cast<u32>(prev.width) * ref->get_bpp() * ref->samples_x;
+				sink->native_pitch = u16(prev.width * ref->get_bpp() * ref->samples_x);
 				sink->rsx_pitch = ref->get_rsx_pitch();
 				sink->surface_width = prev.width;
 				sink->surface_height = prev.height;
@@ -375,7 +301,7 @@ namespace vk
 				sink->change_layout(cmd, best_layout);
 			}
 
-			sink->on_clone_from(ref);
+			prev.target = sink.get();
 
 			if (!sink->old_contents.empty())
 			{
@@ -390,26 +316,18 @@ namespace vk
 				}
 			}
 
-			prev.target = sink.get();
+			sink->rsx_pitch = ref->get_rsx_pitch();
 			sink->set_old_contents_region(prev, false);
-		}
-
-		static std::unique_ptr<vk::render_target> convert_pitch(
-			vk::command_buffer& /*cmd*/,
-			std::unique_ptr<vk::render_target>& src,
-			usz /*out_pitch*/)
-		{
-			// TODO
-			src->state_flags = rsx::surface_state_flags::erase_bkgnd;
-			return {};
+			sink->last_use_tag = ref->last_use_tag;
+			sink->raster_type = ref->raster_type;     // Can't actually cut up swizzled data
 		}
 
 		static bool is_compatible_surface(const vk::render_target* surface, const vk::render_target* ref, u16 width, u16 height, u8 sample_count)
 		{
 			return (surface->format() == ref->format() &&
 				surface->get_spp() == sample_count &&
-				surface->get_surface_width() == width &&
-				surface->get_surface_height() == height);
+				surface->get_surface_width() >= width &&
+				surface->get_surface_height() >= height);
 		}
 
 		static void prepare_surface_for_drawing(vk::command_buffer& cmd, vk::render_target* surface)
@@ -441,13 +359,9 @@ namespace vk
 			return surface->rsx_pitch == pitch;
 		}
 
-		static void int_invalidate_surface_contents(
-			vk::command_buffer& /*cmd*/,
-			vk::render_target* surface,
-			u32 address,
-			usz pitch)
+		static void invalidate_surface_contents(vk::command_buffer& /*cmd*/, vk::render_target* surface, u32 address, usz pitch)
 		{
-			surface->rsx_pitch = static_cast<u32>(pitch);
+			surface->rsx_pitch = static_cast<u16>(pitch);
 			surface->queue_tag(address);
 			surface->last_use_tag = 0;
 			surface->stencil_init_flags = 0;
@@ -455,34 +369,6 @@ namespace vk
 			surface->raster_type = rsx::surface_raster_type::linear;
 		}
 
-		static void invalidate_surface_contents(
-			vk::command_buffer& cmd,
-			vk::render_target* surface,
-			rsx::surface_color_format format,
-			u32 address,
-			usz pitch)
-		{
-			const auto fmt = vk::get_compatible_surface_format(format);
-			surface->set_format(format);
-			surface->set_native_component_layout(fmt.second);
-			surface->set_debug_name(fmt::format("RTV @0x%x, fmt=0x%x", address, static_cast<int>(format)));
-
-			int_invalidate_surface_contents(cmd, surface, address, pitch);
-		}
-
-		static void invalidate_surface_contents(
-			vk::command_buffer& cmd,
-			vk::render_target* surface,
-			rsx::surface_depth_format2 format,
-			u32 address,
-			usz pitch)
-		{
-			surface->set_format(format);
-			surface->set_debug_name(fmt::format("DSV @0x%x", address));
-
-			int_invalidate_surface_contents(cmd, surface, address, pitch);
-		}
-
 		static void notify_surface_invalidated(const std::unique_ptr<vk::render_target>& surface)
 		{
 			surface->frame_tag = vk::get_current_frame_id();
@@ -547,125 +433,9 @@ namespace vk
 			return int_surface_matches_properties(surface, vk_format, width, height, antialias, check_refs);
 		}
 
-		static void spill_buffer(std::unique_ptr<vk::buffer>& /*bo*/)
+		static vk::render_target* get(const std::unique_ptr<vk::render_target>& tex)
 		{
-			// TODO
-		}
-
-		static void unspill_buffer(std::unique_ptr<vk::buffer>& /*bo*/)
-		{
-			// TODO
-		}
-
-		static void write_render_target_to_memory(
-			vk::command_buffer& cmd,
-			vk::buffer* bo,
-			vk::render_target* surface,
-			u64 dst_offset_in_buffer,
-			u64 src_offset_in_buffer,
-			u64 max_copy_length)
-		{
-			surface->read_barrier(cmd);
-			vk::image* source = surface->get_surface(rsx::surface_access::transfer_read);
-			const bool is_scaled = surface->width() != surface->surface_width;
-			if (is_scaled)
-			{
-				const areai src_rect = { 0, 0, static_cast<int>(source->width()), static_cast<int>(source->height()) };
-				const areai dst_rect = { 0, 0, surface->get_surface_width<rsx::surface_metrics::samples, int>(), surface->get_surface_height<rsx::surface_metrics::samples, int>() };
-
-				auto scratch = vk::get_typeless_helper(source->format(), source->format_class(), dst_rect.x2, dst_rect.y2);
-				vk::copy_scaled_image(cmd, source, scratch, src_rect, dst_rect, 1, true, VK_FILTER_NEAREST);
-
-				source = scratch;
-			}
-
-			auto dest = bo;
-			const auto transfer_size = surface->get_memory_range().length();
-			if (transfer_size > max_copy_length || src_offset_in_buffer || surface->is_depth_surface())
-			{
-				auto scratch = vk::get_scratch_buffer(cmd, transfer_size * 4);
-				dest = scratch;
-			}
-
-			VkBufferImageCopy region =
-			{
-				.bufferOffset = (dest == bo) ? dst_offset_in_buffer : 0,
-				.bufferRowLength = surface->rsx_pitch / surface->get_bpp(),
-				.bufferImageHeight = 0,
-				.imageSubresource = { source->aspect(), 0, 0, 1 },
-				.imageOffset = {},
-				.imageExtent = {
-					.width = source->width(),
-					.height = source->height(),
-					.depth = 1
-				}
-			};
-
-			// inject post-transfer barrier
-			image_readback_options_t options{};
-			options.sync_region =
-			{
-				.offset = src_offset_in_buffer,
-				.length = max_copy_length
-			};
-			vk::copy_image_to_buffer(cmd, source, dest, region, options);
-
-			if (dest != bo)
-			{
-				VkBufferCopy copy = { src_offset_in_buffer, dst_offset_in_buffer, max_copy_length };
-				vkCmdCopyBuffer(cmd, dest->value, bo->value, 1, &copy);
-
-				vk::insert_buffer_memory_barrier(cmd,
-					bo->value, dst_offset_in_buffer, max_copy_length,
-					VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
-					VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
-			}
-		}
-
-		template <int BlockSize>
-		static vk::buffer* merge_bo_list(vk::command_buffer& cmd, std::vector<vk::buffer*>& list)
-		{
-			u32 required_bo_size = 0;
-			for (auto& bo : list)
-			{
-				required_bo_size += (bo ? bo->size() : BlockSize);
-			}
-
-			// Create dst
-			auto& dev = cmd.get_command_pool().get_owner();
-			auto dst = new vk::buffer(dev,
-				required_bo_size,
-				dev.get_memory_mapping().device_local, 0,
-				VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
-				0, VMM_ALLOCATION_POOL_SURFACE_CACHE);
-
-			// TODO: Initialize the buffer with system RAM contents
-
-			// Copy all the data over from the sub-blocks
-			u32 offset = 0;
-			for (auto& bo : list)
-			{
-				if (!bo)
-				{
-					offset += BlockSize;
-					continue;
-				}
-
-				VkBufferCopy copy = { 0, offset, ::size32(*bo) };
-				offset += ::size32(*bo);
-				vkCmdCopyBuffer(cmd, bo->value, dst->value, 1, &copy);
-
-				// Cleanup
-				vk::surface_cache_utils::dispose(bo);
-			}
-
-			return dst;
-		}
-
-		template <typename T>
-		static T* get(const std::unique_ptr<T>& obj)
-		{
-			return obj.get();
+			return tex.get();
 		}
 	};
 
@@ -680,6 +450,7 @@ namespace vk
 		bool is_overallocated();
 		bool can_collapse_surface(const std::unique_ptr<vk::render_target>& surface, rsx::problem_severity severity) override;
 		bool handle_memory_pressure(vk::command_buffer& cmd, rsx::problem_severity severity) override;
-		void trim(vk::command_buffer& cmd, rsx::problem_severity memory_pressure);
+		void free_invalidated(vk::command_buffer& cmd, rsx::problem_severity memory_pressure);
 	};
 }
+//h
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/VK/VKResolveHelper.cpp b/rpcs3/Emu/RSX/VK/VKResolveHelper.cpp
index 75a013ddfd..dae2148401 100644
--- a/rpcs3/Emu/RSX/VK/VKResolveHelper.cpp
+++ b/rpcs3/Emu/RSX/VK/VKResolveHelper.cpp
@@ -11,7 +11,7 @@ namespace
 		switch (format)
 		{
 			case VK_FORMAT_R5G6B5_UNORM_PACK16:
-				return "r16";
+				return "r16ui";
 			case VK_FORMAT_R8G8B8A8_UNORM:
 			case VK_FORMAT_B8G8R8A8_UNORM:
 				return "rgba8";
@@ -20,7 +20,7 @@ namespace
 			case VK_FORMAT_R32G32B32A32_SFLOAT:
 				return "rgba32f";
 			case VK_FORMAT_A1R5G5B5_UNORM_PACK16:
-				return "r16";
+				return "r16ui";
 			case VK_FORMAT_R8_UNORM:
 				return "r8";
 			case VK_FORMAT_R8G8_UNORM:
@@ -246,6 +246,9 @@ namespace vk
 
 	void reset_resolve_resources()
 	{
+		for (auto &e : g_resolve_helpers) e.second->free_resources();
+		for (auto &e : g_unresolve_helpers) e.second->free_resources();
+
 		if (g_depth_resolver) g_depth_resolver->free_resources();
 		if (g_depth_unresolver) g_depth_unresolver->free_resources();
 		if (g_stencil_resolver) g_stencil_resolver->free_resources();
@@ -253,90 +256,4 @@ namespace vk
 		if (g_depthstencil_resolver) g_depthstencil_resolver->free_resources();
 		if (g_depthstencil_unresolver) g_depthstencil_unresolver->free_resources();
 	}
-
-
-	void cs_resolve_base::build(const std::string& format_prefix, bool unresolve, bool bgra_swap)
-	{
-		create();
-
-		switch (optimal_group_size)
-		{
-		default:
-		case 64:
-			cs_wave_x = 8;
-			cs_wave_y = 8;
-			break;
-		case 32:
-			cs_wave_x = 8;
-			cs_wave_y = 4;
-			break;
-		}
-
-		static const char* resolve_kernel =
-			#include "Emu/RSX/Program/MSAA/ColorResolvePass.glsl"
-			;
-
-		static const char* unresolve_kernel =
-			#include "Emu/RSX/Program/MSAA/ColorUnresolvePass.glsl"
-			;
-
-		const std::pair<std::string_view, std::string> syntax_replace[] =
-		{
-			{ "%WORKGROUP_SIZE_X", std::to_string(cs_wave_x) },
-			{ "%WORKGROUP_SIZE_Y", std::to_string(cs_wave_y) },
-			{ "%IMAGE_FORMAT", format_prefix },
-			{ "%BGRA_SWAP", bgra_swap ? "1" : "0" }
-		};
-
-		m_src = unresolve ? unresolve_kernel : resolve_kernel;
-		m_src = fmt::replace_all(m_src, syntax_replace);
-
-		rsx_log.notice("Compute shader:\n%s", m_src);
-	}
-
-	void depth_resolve_base::build(bool resolve_depth, bool resolve_stencil, bool is_unresolve)
-	{
-		vs_src =
-			#include "Emu/RSX/Program/GLSLSnippets/GenericVSPassthrough.glsl"
-			;
-
-		static const char* depth_resolver =
-			#include "Emu/RSX/Program/MSAA/DepthResolvePass.glsl"
-			;
-
-		static const char* depth_unresolver =
-			#include "Emu/RSX/Program/MSAA/DepthUnresolvePass.glsl"
-			;
-
-		static const char* stencil_resolver =
-			#include "Emu/RSX/Program/MSAA/StencilResolvePass.glsl"
-			;
-
-		static const char* stencil_unresolver =
-			#include "Emu/RSX/Program/MSAA/StencilUnresolvePass.glsl"
-			;
-
-		static const char* depth_stencil_resolver =
-			#include "Emu/RSX/Program/MSAA/DepthStencilResolvePass.glsl"
-			;
-
-		static const char* depth_stencil_unresolver =
-			#include "Emu/RSX/Program/MSAA/DepthStencilUnresolvePass.glsl"
-			;
-
-		if (resolve_depth && resolve_stencil)
-		{
-			fs_src = is_unresolve ? depth_stencil_unresolver : depth_stencil_resolver;
-		}
-		else if (resolve_depth)
-		{
-			fs_src = is_unresolve ? depth_unresolver : depth_resolver;
-		}
-		else if (resolve_stencil)
-		{
-			fs_src = is_unresolve ? stencil_unresolver : stencil_resolver;
-		}
-
-		rsx_log.notice("Resolve shader:\n%s", fs_src);
-	}
 }
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/VK/VKResolveHelper.h b/rpcs3/Emu/RSX/VK/VKResolveHelper.h
index 23d243b032..4a59127f11 100644
--- a/rpcs3/Emu/RSX/VK/VKResolveHelper.h
+++ b/rpcs3/Emu/RSX/VK/VKResolveHelper.h
@@ -16,50 +16,115 @@ namespace vk
 		u32 cs_wave_y = 1;
 
 		cs_resolve_base()
-		{
-			ssbo_count = 0;
-		}
+		{}
 
 		virtual ~cs_resolve_base()
 		{}
 
-		void build(const std::string& format_prefix, bool unresolve, bool bgra_swap);
+		void build(const std::string& kernel, const std::string& format_prefix, int direction)
+		{
+			create();
 
-		std::vector<glsl::program_input> get_inputs() override
+			// TODO: Tweak occupancy
+			switch (optimal_group_size)
+			{
+			default:
+			case 64:
+				cs_wave_x = 8;
+				cs_wave_y = 8;
+				break;
+			case 32:
+				cs_wave_x = 8;
+				cs_wave_y = 4;
+				break;
+			}
+
+			const std::pair<std::string, std::string> syntax_replace[] =
+			{
+				{ "%wx", std::to_string(cs_wave_x) },
+				{ "%wy", std::to_string(cs_wave_y) },
+			};
+
+			m_src =
+			"#version 430\n"
+			"layout(local_size_x=%wx, local_size_y=%wy, local_size_z=1) in;\n"
+			"\n";
+
+			m_src = fmt::replace_all(m_src, syntax_replace);
+
+			if (direction == 0)
+			{
+				m_src +=
+				"layout(set=0, binding=0, " + format_prefix + ") uniform readonly restrict image2DMS multisampled;\n"
+				"layout(set=0, binding=1) uniform writeonly restrict image2D resolve;\n";
+			}
+			else
+			{
+				m_src +=
+				"layout(set=0, binding=0) uniform writeonly restrict image2DMS multisampled;\n"
+				"layout(set=0, binding=1, " + format_prefix + ") uniform readonly restrict image2D resolve;\n";
+			}
+
+			m_src +=
+			"\n"
+			"void main()\n"
+			"{\n"
+			"	ivec2 resolve_size = imageSize(resolve);\n"
+			"	ivec2 aa_size = imageSize(multisampled);\n"
+			"	ivec2 sample_count = resolve_size / aa_size;\n"
+			"\n"
+			"	if (any(greaterThanEqual(gl_GlobalInvocationID.xy, uvec2(resolve_size)))) return;"
+			"\n"
+			"	ivec2 resolve_coords = ivec2(gl_GlobalInvocationID.xy);\n"
+			"	ivec2 aa_coords = resolve_coords / sample_count;\n"
+			"	ivec2 sample_loc = ivec2(resolve_coords % sample_count);\n"
+			"	int sample_index = sample_loc.x + (sample_loc.y * sample_count.y);\n"
+			+ kernel +
+			"}\n";
+
+			rsx_log.notice("Compute shader:\n%s", m_src);
+		}
+
+		std::vector<std::pair<VkDescriptorType, u8>> get_descriptor_layout() override
+		{
+			return
+			{
+				{ VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 2 }
+			};
+		}
+
+		void declare_inputs() override
 		{
 			std::vector<vk::glsl::program_input> inputs =
 			{
-				glsl::program_input::make(
+				{
 					::glsl::program_domain::glsl_compute_program,
-					"multisampled",
-					glsl::input_type_storage_texture,
+					vk::glsl::program_input_type::input_type_texture,
+					{}, {},
 					0,
-					0
-				),
-
-				glsl::program_input::make(
+					"multisampled"
+				},
+				{
 					::glsl::program_domain::glsl_compute_program,
-					"resolve",
-					glsl::input_type_storage_texture,
-					0,
-					1
-				),
+					vk::glsl::program_input_type::input_type_texture,
+					{}, {},
+					1,
+					"resolve"
+				}
 			};
 
-			auto result = compute_task::get_inputs();
-			result.insert(result.end(), inputs.begin(), inputs.end());
-			return result;
+			m_program->load_uniforms(inputs);
 		}
 
-		void bind_resources(const vk::command_buffer& /*cmd*/) override
+		void bind_resources() override
 		{
-			auto msaa_view = multisampled->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_VIEW_MULTISAMPLED));
-			auto resolved_view = resolve->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_IDENTITY));
-			m_program->bind_uniform({ VK_NULL_HANDLE, msaa_view->value, multisampled->current_layout }, 0, 0);
-			m_program->bind_uniform({ VK_NULL_HANDLE, resolved_view->value, resolve->current_layout }, 0, 1);
+			auto msaa_view = multisampled->get_view(VK_REMAP_VIEW_MULTISAMPLED, rsx::default_remap_vector);
+			auto resolved_view = resolve->get_view(VK_REMAP_IDENTITY, rsx::default_remap_vector);
+			m_program->bind_uniform({ VK_NULL_HANDLE, msaa_view->value, multisampled->current_layout }, "multisampled", VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, m_descriptor_set);
+			m_program->bind_uniform({ VK_NULL_HANDLE, resolved_view->value, resolve->current_layout }, "resolve", VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, m_descriptor_set);
 		}
 
-		void run(const vk::command_buffer& cmd, vk::viewable_image* msaa_image, vk::viewable_image* resolve_image)
+		void run(VkCommandBuffer cmd, vk::viewable_image* msaa_image, vk::viewable_image* resolve_image)
 		{
 			ensure(msaa_image->samples() > 1);
 			ensure(resolve_image->samples() == 1);
@@ -78,8 +143,14 @@ namespace vk
 	{
 		cs_resolve_task(const std::string& format_prefix, bool bgra_swap = false)
 		{
-			// BGRA-swap flag is a workaround to swap channels for old GeForce cards with broken compute image handling
-			build(format_prefix, false, bgra_swap);
+			// Allow rgba->bgra transformation for old GeForce cards
+			const std::string swizzle = bgra_swap? ".bgra" : "";
+
+			std::string kernel =
+			"	vec4 aa_sample = imageLoad(multisampled, aa_coords, sample_index);\n"
+			"	imageStore(resolve, resolve_coords, aa_sample" + swizzle + ");\n";
+
+			build(kernel, format_prefix, 0);
 		}
 	};
 
@@ -87,8 +158,14 @@ namespace vk
 	{
 		cs_unresolve_task(const std::string& format_prefix, bool bgra_swap = false)
 		{
-			// BGRA-swap flag is a workaround to swap channels for old GeForce cards with broken compute image handling
-			build(format_prefix, true, bgra_swap);
+			// Allow rgba->bgra transformation for old GeForce cards
+			const std::string swizzle = bgra_swap? ".bgra" : "";
+
+			std::string kernel =
+			"	vec4 resolved_sample = imageLoad(resolve, resolve_coords);\n"
+			"	imageStore(multisampled, aa_coords, sample_index, resolved_sample" + swizzle + ");\n";
+
+			build(kernel, format_prefix, 1);
 		}
 	};
 
@@ -106,30 +183,57 @@ namespace vk
 
 			// Depth-stencil buffers are almost never filterable, and we do not need it here (1:1 mapping)
 			m_sampler_filter = VK_FILTER_NEAREST;
-
-			// Do not use UBOs
-			m_num_uniform_buffers = 0;
 		}
 
-		void build(bool resolve_depth, bool resolve_stencil, bool unresolve);
-
-		std::vector<glsl::program_input> get_fragment_inputs() override
+		void build(const std::string& kernel, const std::string& extensions, const std::vector<const char*>& inputs)
 		{
-			auto result = overlay_pass::get_fragment_inputs();
-			result.push_back(glsl::program_input::make(
-				::glsl::glsl_fragment_program,
-				"push_constants",
-				glsl::input_type_push_constant,
-				0,
-				umax,
-				glsl::push_constant_ref{ .size = 16 }
-			));
-			return result;
+			vs_src =
+				"#version 450\n"
+				"#extension GL_ARB_separate_shader_objects : enable\n\n"
+				"\n"
+				"void main()\n"
+				"{\n"
+				"	vec2 positions[] = {vec2(-1., -1.), vec2(1., -1.), vec2(-1., 1.), vec2(1., 1.)};\n"
+				"	gl_Position = vec4(positions[gl_VertexIndex % 4], 0., 1.);\n"
+				"}\n";
+
+			fs_src =
+				"#version 420\n"
+				"#extension GL_ARB_separate_shader_objects : enable\n";
+			fs_src += extensions +
+				"\n"
+				"layout(push_constant) uniform static_data{ ivec" + std::to_string(static_parameters_width) + " regs[1]; };\n";
+
+				int binding = 1;
+				for (const auto& input : inputs)
+				{
+					fs_src += "layout(set=0, binding=" + std::to_string(binding++) + ") uniform " + input + ";\n";
+				}
+
+				fs_src +=
+				"//layout(pixel_center_integer) in vec4 gl_FragCoord;\n"
+				"\n"
+				"void main()\n"
+				"{\n";
+					fs_src += kernel +
+				"}\n";
+
+			rsx_log.notice("Resolve shader:\n%s", fs_src);
 		}
 
-		void update_uniforms(vk::command_buffer& cmd, vk::glsl::program* program) override
+		std::vector<VkPushConstantRange> get_push_constants() override
 		{
-			vkCmdPushConstants(cmd, program->layout(), VK_SHADER_STAGE_FRAGMENT_BIT, 0, static_parameters_width * 4, static_parameters);
+			VkPushConstantRange constant;
+			constant.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+			constant.offset = 0;
+			constant.size = 16;
+
+			return { constant };
+		}
+
+		void update_uniforms(vk::command_buffer& cmd, vk::glsl::program* /*program*/) override
+		{
+			vkCmdPushConstants(cmd, m_pipeline_layout, VK_SHADER_STAGE_FRAGMENT_BIT, 0, static_parameters_width * 4, static_parameters);
 		}
 
 		void update_sample_configuration(vk::image* msaa_image)
@@ -158,13 +262,21 @@ namespace vk
 	{
 		depthonly_resolve()
 		{
-			build(true, false, false);
+			build(
+				"	ivec2 out_coord = ivec2(gl_FragCoord.xy);\n"
+				"	ivec2 in_coord = (out_coord / regs[0].xy);\n"
+				"	ivec2 sample_loc = out_coord % regs[0].xy;\n"
+				"	int sample_index = sample_loc.x + (sample_loc.y * regs[0].y);\n"
+				"	float frag_depth = texelFetch(fs0, in_coord, sample_index).x;\n"
+				"	gl_FragDepth = frag_depth;\n",
+				"",
+				{ "sampler2DMS fs0" });
 		}
 
 		void run(vk::command_buffer& cmd, vk::viewable_image* msaa_image, vk::viewable_image* resolve_image, VkRenderPass render_pass)
 		{
 			update_sample_configuration(msaa_image);
-			auto src_view = msaa_image->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_VIEW_MULTISAMPLED));
+			auto src_view = msaa_image->get_view(VK_REMAP_VIEW_MULTISAMPLED, rsx::default_remap_vector);
 
 			overlay_pass::run(
 				cmd,
@@ -178,7 +290,15 @@ namespace vk
 	{
 		depthonly_unresolve()
 		{
-			build(true, false, true);
+			build(
+				"	ivec2 pixel_coord = ivec2(gl_FragCoord.xy);\n"
+				"	pixel_coord *= regs[0].xy;\n"
+				"	pixel_coord.x += (gl_SampleID % regs[0].x);\n"
+				"	pixel_coord.y += (gl_SampleID / regs[0].x);\n"
+				"	float frag_depth = texelFetch(fs0, pixel_coord, 0).x;\n"
+				"	gl_FragDepth = frag_depth;\n",
+				"",
+				{ "sampler2D fs0" });
 		}
 
 		void run(vk::command_buffer& cmd, vk::viewable_image* msaa_image, vk::viewable_image* resolve_image, VkRenderPass render_pass)
@@ -187,7 +307,7 @@ namespace vk
 			renderpass_config.set_multisample_shading_rate(1.f);
 			update_sample_configuration(msaa_image);
 
-			auto src_view = resolve_image->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_IDENTITY));
+			auto src_view = resolve_image->get_view(VK_REMAP_IDENTITY, rsx::default_remap_vector);
 
 			overlay_pass::run(
 				cmd,
@@ -219,7 +339,15 @@ namespace vk
 
 			static_parameters_width = 3;
 
-			build(false, true, false);
+			build(
+				"	ivec2 out_coord = ivec2(gl_FragCoord.xy);\n"
+				"	ivec2 in_coord = (out_coord / regs[0].xy);\n"
+				"	ivec2 sample_loc = out_coord % regs[0].xy;\n"
+				"	int sample_index = sample_loc.x + (sample_loc.y * regs[0].y);\n"
+				"	uint frag_stencil = texelFetch(fs0, in_coord, sample_index).x;\n"
+				"	if ((frag_stencil & uint(regs[0].z)) == 0) discard;\n",
+				"",
+				{"usampler2DMS fs0"});
 		}
 
 		void get_dynamic_state_entries(std::vector<VkDynamicState>& state_descriptors) override
@@ -227,23 +355,23 @@ namespace vk
 			state_descriptors.push_back(VK_DYNAMIC_STATE_STENCIL_WRITE_MASK);
 		}
 
-		void emit_geometry(vk::command_buffer& cmd, glsl::program* program) override
+		void emit_geometry(vk::command_buffer& cmd) override
 		{
 			vkCmdClearAttachments(cmd, 1, &clear_info, 1, &region);
 
 			for (s32 write_mask = 0x1; write_mask <= 0x80; write_mask <<= 1)
 			{
 				vkCmdSetStencilWriteMask(cmd, VK_STENCIL_FRONT_AND_BACK, write_mask);
-				vkCmdPushConstants(cmd, program->layout(), VK_SHADER_STAGE_FRAGMENT_BIT, 8, 4, &write_mask);
+				vkCmdPushConstants(cmd, m_pipeline_layout, VK_SHADER_STAGE_FRAGMENT_BIT, 8, 4, &write_mask);
 
-				overlay_pass::emit_geometry(cmd, program);
+				overlay_pass::emit_geometry(cmd);
 			}
 		}
 
 		void run(vk::command_buffer& cmd, vk::viewable_image* msaa_image, vk::viewable_image* resolve_image, VkRenderPass render_pass)
 		{
 			update_sample_configuration(msaa_image);
-			auto stencil_view = msaa_image->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_VIEW_MULTISAMPLED), VK_IMAGE_ASPECT_STENCIL_BIT);
+			auto stencil_view = msaa_image->get_view(VK_REMAP_VIEW_MULTISAMPLED, rsx::default_remap_vector, VK_IMAGE_ASPECT_STENCIL_BIT);
 
 			region.rect.extent.width = resolve_image->width();
 			region.rect.extent.height = resolve_image->height();
@@ -258,7 +386,7 @@ namespace vk
 
 	struct stencilonly_unresolve : depth_resolve_base
 	{
-		VkClearRect clear_region{};
+		VkClearRect region{};
 		VkClearAttachment clear_info{};
 
 		stencilonly_unresolve()
@@ -273,12 +401,20 @@ namespace vk
 			renderpass_config.set_depth_mask(false);
 
 			clear_info.aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT;
-			clear_region.baseArrayLayer = 0;
-			clear_region.layerCount = 1;
+			region.baseArrayLayer = 0;
+			region.layerCount = 1;
 
 			static_parameters_width = 3;
 
-			build(false, true, true);
+			build(
+				"	ivec2 pixel_coord = ivec2(gl_FragCoord.xy);\n"
+				"	pixel_coord *= regs[0].xy;\n"
+				"	pixel_coord.x += (gl_SampleID % regs[0].x);\n"
+				"	pixel_coord.y += (gl_SampleID / regs[0].x);\n"
+				"	uint frag_stencil = texelFetch(fs0, pixel_coord, 0).x;\n"
+				"	if ((frag_stencil & uint(regs[0].z)) == 0) discard;\n",
+				"",
+				{ "usampler2D fs0" });
 		}
 
 		void get_dynamic_state_entries(std::vector<VkDynamicState>& state_descriptors) override
@@ -286,16 +422,16 @@ namespace vk
 			state_descriptors.push_back(VK_DYNAMIC_STATE_STENCIL_WRITE_MASK);
 		}
 
-		void emit_geometry(vk::command_buffer& cmd, glsl::program* program) override
+		void emit_geometry(vk::command_buffer& cmd) override
 		{
-			vkCmdClearAttachments(cmd, 1, &clear_info, 1, &clear_region);
+			vkCmdClearAttachments(cmd, 1, &clear_info, 1, &region);
 
 			for (s32 write_mask = 0x1; write_mask <= 0x80; write_mask <<= 1)
 			{
 				vkCmdSetStencilWriteMask(cmd, VK_STENCIL_FRONT_AND_BACK, write_mask);
-				vkCmdPushConstants(cmd, program->layout(), VK_SHADER_STAGE_FRAGMENT_BIT, 8, 4, &write_mask);
+				vkCmdPushConstants(cmd, m_pipeline_layout, VK_SHADER_STAGE_FRAGMENT_BIT, 8, 4, &write_mask);
 
-				overlay_pass::emit_geometry(cmd, program);
+				overlay_pass::emit_geometry(cmd);
 			}
 		}
 
@@ -305,10 +441,10 @@ namespace vk
 			renderpass_config.set_multisample_shading_rate(1.f);
 			update_sample_configuration(msaa_image);
 
-			auto stencil_view = resolve_image->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_IDENTITY), VK_IMAGE_ASPECT_STENCIL_BIT);
+			auto stencil_view = resolve_image->get_view(VK_REMAP_IDENTITY, rsx::default_remap_vector, VK_IMAGE_ASPECT_STENCIL_BIT);
 
-			clear_region.rect.extent.width = msaa_image->width();
-			clear_region.rect.extent.height = msaa_image->height();
+			region.rect.extent.width = resolve_image->width();
+			region.rect.extent.height = resolve_image->height();
 
 			overlay_pass::run(
 				cmd,
@@ -331,14 +467,26 @@ namespace vk
 			renderpass_config.set_stencil_mask(0xFF);
 			m_num_usable_samplers = 2;
 
-			build(true, true, false);
+			build(
+				"	ivec2 out_coord = ivec2(gl_FragCoord.xy);\n"
+				"	ivec2 in_coord = (out_coord / regs[0].xy);\n"
+				"	ivec2 sample_loc = out_coord % ivec2(regs[0].xy);\n"
+				"	int sample_index = sample_loc.x + (sample_loc.y * regs[0].y);\n"
+				"	float frag_depth = texelFetch(fs0, in_coord, sample_index).x;\n"
+				"	uint frag_stencil = texelFetch(fs1, in_coord, sample_index).x;\n"
+				"	gl_FragDepth = frag_depth;\n"
+				"	gl_FragStencilRefARB = int(frag_stencil);\n",
+
+				"#extension GL_ARB_shader_stencil_export : enable\n",
+
+				{ "sampler2DMS fs0", "usampler2DMS fs1" });
 		}
 
 		void run(vk::command_buffer& cmd, vk::viewable_image* msaa_image, vk::viewable_image* resolve_image, VkRenderPass render_pass)
 		{
 			update_sample_configuration(msaa_image);
-			auto depth_view = msaa_image->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_VIEW_MULTISAMPLED), VK_IMAGE_ASPECT_DEPTH_BIT);
-			auto stencil_view = msaa_image->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_VIEW_MULTISAMPLED), VK_IMAGE_ASPECT_STENCIL_BIT);
+			auto depth_view = msaa_image->get_view(VK_REMAP_VIEW_MULTISAMPLED, rsx::default_remap_vector, VK_IMAGE_ASPECT_DEPTH_BIT);
+			auto stencil_view = msaa_image->get_view(VK_REMAP_VIEW_MULTISAMPLED, rsx::default_remap_vector, VK_IMAGE_ASPECT_STENCIL_BIT);
 
 			overlay_pass::run(
 				cmd,
@@ -361,7 +509,19 @@ namespace vk
 			renderpass_config.set_stencil_mask(0xFF);
 			m_num_usable_samplers = 2;
 
-			build(true, true, true);
+			build(
+				"	ivec2 pixel_coord = ivec2(gl_FragCoord.xy);\n"
+				"	pixel_coord *= regs[0].xy;\n"
+				"	pixel_coord.x += (gl_SampleID % regs[0].x);\n"
+				"	pixel_coord.y += (gl_SampleID / regs[0].x);\n"
+				"	float frag_depth = texelFetch(fs0, pixel_coord, 0).x;\n"
+				"	uint frag_stencil = texelFetch(fs1, pixel_coord, 0).x;\n"
+				"	gl_FragDepth = frag_depth;\n"
+				"	gl_FragStencilRefARB = int(frag_stencil);\n",
+
+				"#extension GL_ARB_shader_stencil_export : enable\n",
+
+				{ "sampler2D fs0", "usampler2D fs1" });
 		}
 
 		void run(vk::command_buffer& cmd, vk::viewable_image* msaa_image, vk::viewable_image* resolve_image, VkRenderPass render_pass)
@@ -370,8 +530,8 @@ namespace vk
 			renderpass_config.set_multisample_shading_rate(1.f);
 			update_sample_configuration(msaa_image);
 
-			auto depth_view = resolve_image->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_IDENTITY), VK_IMAGE_ASPECT_DEPTH_BIT);
-			auto stencil_view = resolve_image->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_IDENTITY), VK_IMAGE_ASPECT_STENCIL_BIT);
+			auto depth_view = resolve_image->get_view(VK_REMAP_IDENTITY, rsx::default_remap_vector, VK_IMAGE_ASPECT_DEPTH_BIT);
+			auto stencil_view = resolve_image->get_view(VK_REMAP_IDENTITY, rsx::default_remap_vector, VK_IMAGE_ASPECT_STENCIL_BIT);
 
 			overlay_pass::run(
 				cmd,
diff --git a/rpcs3/Emu/RSX/VK/VKResourceManager.cpp b/rpcs3/Emu/RSX/VK/VKResourceManager.cpp
index 9d34509a09..58c9198725 100644
--- a/rpcs3/Emu/RSX/VK/VKResourceManager.cpp
+++ b/rpcs3/Emu/RSX/VK/VKResourceManager.cpp
@@ -13,16 +13,6 @@ namespace vk
 
 		void clear()
 		{
-			if (!allocations.empty())
-			{
-				rsx_log.error("Leaking memory allocations!");
-				for (auto& leak : allocations)
-				{
-					rsx_log.error("Memory handle 0x%llx (%llu bytes) allocated from pool %d was not freed.",
-						leak.first, leak.second.size, static_cast<int>(leak.second.pool));
-				}
-			}
-
 			allocations.clear();
 			memory_usage.clear();
 			pool_usage.clear();
@@ -41,37 +31,6 @@ namespace vk
 		return &g_resource_manager;
 	}
 
-	garbage_collector* get_gc()
-	{
-		return &g_resource_manager;
-	}
-
-	void resource_manager::trim()
-	{
-		// For any managed resources, try to keep the number of unused/idle resources as low as possible.
-		// Improves search times as well as keeping us below the hardware limit.
-		const auto& limits = get_current_renderer()->gpu().get_limits();
-		const auto allocated_sampler_count = vmm_get_application_pool_usage(VMM_ALLOCATION_POOL_SAMPLER);
-		const auto max_allowed_samplers = std::min((limits.maxSamplerAllocationCount * 3u) / 4u, 2048u);
-
-		if (allocated_sampler_count > max_allowed_samplers)
-		{
-			ensure(max_allowed_samplers);
-			rsx_log.warning("Trimming allocated samplers. Allocated = %u, Max = %u", allocated_sampler_count, limits.maxSamplerAllocationCount);
-
-			auto filter_expr = [](const cached_sampler_object_t& sampler)
-			{
-				// Pick only where we have no ref
-				return !sampler.has_refs();
-			};
-
-			for (auto& object : m_sampler_pool.collect(filter_expr))
-			{
-				dispose(object);
-			}
-		}
-	}
-
 	u64 get_event_id()
 	{
 		return g_event_ctr++;
@@ -102,14 +61,6 @@ namespace vk
 		g_last_completed_event = std::max(event_id, g_last_completed_event.load());
 	}
 
-	void print_debug_markers()
-	{
-		for (const auto marker : g_resource_manager.gather_debug_markers())
-		{
-			marker->dump();
-		}
-	}
-
 	static constexpr f32 size_in_GiB(u64 size)
 	{
 		return size / (1024.f * 1024.f * 1024.f);
@@ -261,16 +212,4 @@ namespace vk
 			vmm_handle_memory_pressure(load_severity);
 		}
 	}
-
-	void vmm_notify_object_allocated(vmm_allocation_pool pool)
-	{
-		ensure(pool >= VMM_ALLOCATION_POOL_SAMPLER);
-		g_vmm_stats.pool_usage[pool]++;
-	}
-
-	void vmm_notify_object_freed(vmm_allocation_pool pool)
-	{
-		ensure(pool >= VMM_ALLOCATION_POOL_SAMPLER);
-		g_vmm_stats.pool_usage[pool]--;
-	}
 }
diff --git a/rpcs3/Emu/RSX/VK/VKResourceManager.h b/rpcs3/Emu/RSX/VK/VKResourceManager.h
index 30d838d065..9c194ce4d8 100644
--- a/rpcs3/Emu/RSX/VK/VKResourceManager.h
+++ b/rpcs3/Emu/RSX/VK/VKResourceManager.h
@@ -1,11 +1,9 @@
 #pragma once
-#include "Emu/RSX/VK/vkutils/sync.h"
-#include "vkutils/garbage_collector.h"
+#include "vkutils/image.h"
 #include "vkutils/query_pool.hpp"
 #include "vkutils/sampler.h"
 
-#include "Utilities/mutex.h"
-
+#include <unordered_map>
 #include <deque>
 #include <memory>
 
@@ -20,8 +18,11 @@ namespace vk
 	{
 		u64 eid;
 		const vk::render_device* m_device;
-		std::vector<disposable_t> m_disposables;
-		std::vector<std::unique_ptr<gpu_debug_marker>> m_debug_markers;
+		std::vector<std::unique_ptr<vk::buffer>> m_disposed_buffers;
+		std::vector<std::unique_ptr<vk::image_view>> m_disposed_image_views;
+		std::vector<std::unique_ptr<vk::image>> m_disposed_images;
+		std::vector<std::unique_ptr<vk::event>> m_disposed_events;
+		std::vector<std::unique_ptr<vk::query_pool>> m_disposed_query_pools;
 
 		eid_scope_t(u64 _eid):
 			eid(_eid), m_device(g_render_device)
@@ -32,164 +33,150 @@ namespace vk
 			discard();
 		}
 
-		void swap(eid_scope_t& other)
-		{
-			std::swap(eid, other.eid);
-			std::swap(m_device, other.m_device);
-			std::swap(m_disposables, other.m_disposables);
-			std::swap(m_debug_markers, other.m_debug_markers);
-		}
-
 		void discard()
 		{
-			m_disposables.clear();
-			m_debug_markers.clear();
+			m_disposed_buffers.clear();
+			m_disposed_events.clear();
+			m_disposed_image_views.clear();
+			m_disposed_images.clear();
+			m_disposed_query_pools.clear();
 		}
 	};
 
-	class resource_manager : public garbage_collector
+	class resource_manager
 	{
 	private:
-		sampler_pool_t m_sampler_pool;
-
+		std::unordered_map<u64, std::unique_ptr<vk::sampler>> m_sampler_pool;
 		std::deque<eid_scope_t> m_eid_map;
-		shared_mutex m_eid_map_lock;
 
-		std::vector<std::function<void()>> m_exit_handlers;
-
-		inline eid_scope_t& get_current_eid_scope()
+		eid_scope_t& get_current_eid_scope()
 		{
 			const auto eid = current_event_id();
+			if (!m_eid_map.empty())
 			{
-				std::lock_guard lock(m_eid_map_lock);
-				if (m_eid_map.empty() || m_eid_map.back().eid != eid)
+				// Elements are insterted in order, so just check the last entry for a match
+				if (auto &old = m_eid_map.back(); old.eid == eid)
 				{
-					m_eid_map.emplace_back(eid);
+					return old;
 				}
 			}
+
+			m_eid_map.emplace_back(eid);
 			return m_eid_map.back();
 		}
 
+		template<bool _signed = false>
+		u16 encode_fxp(f32 value)
+		{
+			u16 raw = u16(std::abs(value) * 256.);
+
+			if constexpr (!_signed)
+			{
+				return raw;
+			}
+			else
+			{
+				if (value >= 0.f) [[likely]]
+				{
+					return raw;
+				}
+				else
+				{
+					return u16(0 - raw) & 0x1fff;
+				}
+			}
+		}
+
 	public:
 
 		resource_manager() = default;
 		~resource_manager() = default;
 
 		void destroy()
-		{
-			flush();
-
-			// Run the on-exit callbacks
-			for (const auto& callback : m_exit_handlers)
-			{
-				callback();
-			}
-		}
-
-		void flush()
 		{
 			m_eid_map.clear();
 			m_sampler_pool.clear();
 		}
 
-		vk::sampler* get_sampler(const vk::render_device& dev, vk::sampler* previous,
-			VkSamplerAddressMode clamp_u, VkSamplerAddressMode clamp_v, VkSamplerAddressMode clamp_w,
+		vk::sampler* find_sampler(const vk::render_device& dev, VkSamplerAddressMode clamp_u, VkSamplerAddressMode clamp_v, VkSamplerAddressMode clamp_w,
 			VkBool32 unnormalized_coordinates, float mipLodBias, float max_anisotropy, float min_lod, float max_lod,
-			VkFilter min_filter, VkFilter mag_filter, VkSamplerMipmapMode mipmap_mode, const vk::border_color_t& border_color,
+			VkFilter min_filter, VkFilter mag_filter, VkSamplerMipmapMode mipmap_mode, VkBorderColor border_color,
 			VkBool32 depth_compare = VK_FALSE, VkCompareOp depth_compare_mode = VK_COMPARE_OP_NEVER)
 		{
-			const auto key = m_sampler_pool.compute_storage_key(
-				clamp_u, clamp_v, clamp_w,
-				unnormalized_coordinates, mipLodBias, max_anisotropy, min_lod, max_lod,
-				min_filter, mag_filter, mipmap_mode, border_color,
-				depth_compare, depth_compare_mode);
+			u64 key = u16(clamp_u) | u64(clamp_v) << 3 | u64(clamp_w) << 6;
+			key |= u64(unnormalized_coordinates) << 9;            // 1 bit
+			key |= u64(min_filter) << 10 | u64(mag_filter) << 11; // 1 bit each
+			key |= u64(mipmap_mode) << 12;   // 1 bit
+			key |= u64(border_color) << 13;  // 3 bits
+			key |= u64(depth_compare) << 16; // 1 bit
+			key |= u64(depth_compare_mode) << 17;  // 3 bits
+			key |= u64(encode_fxp(min_lod)) << 20; // 12 bits
+			key |= u64(encode_fxp(max_lod)) << 32; // 12 bits
+			key |= u64(encode_fxp<true>(mipLodBias)) << 44; // 13 bits
+			key |= u64(max_anisotropy) << 57;               // 4 bits
 
-			if (previous)
+			if (const auto found = m_sampler_pool.find(key);
+				found != m_sampler_pool.end())
 			{
-				auto as_cached_object = static_cast<cached_sampler_object_t*>(previous);
-				ensure(as_cached_object->has_refs());
-				as_cached_object->release();
+				return found->second.get();
 			}
 
-			if (const auto found = m_sampler_pool.find(key))
-			{
-				found->add_ref();
-				return found;
-			}
-
-			auto result = std::make_unique<cached_sampler_object_t>(
+			auto result = std::make_unique<vk::sampler>(
 				dev, clamp_u, clamp_v, clamp_w, unnormalized_coordinates,
 				mipLodBias, max_anisotropy, min_lod, max_lod,
 				min_filter, mag_filter, mipmap_mode, border_color,
 				depth_compare, depth_compare_mode);
 
-			auto ret = m_sampler_pool.emplace(key, result);
-			ret->add_ref();
-			return ret;
+			auto It = m_sampler_pool.emplace(key, std::move(result));
+			return It.first->second.get();
 		}
 
-		void add_exit_callback(std::function<void()> callback) override
+		void dispose(std::unique_ptr<vk::buffer>& buf)
 		{
-			m_exit_handlers.push_back(callback);
+			get_current_eid_scope().m_disposed_buffers.emplace_back(std::move(buf));
 		}
 
-		void dispose(vk::disposable_t& disposable) override
+		void dispose(std::unique_ptr<vk::image_view>& view)
 		{
-			get_current_eid_scope().m_disposables.emplace_back(std::move(disposable));
+			get_current_eid_scope().m_disposed_image_views.emplace_back(std::move(view));
 		}
 
-		inline void dispose(std::unique_ptr<vk::gpu_debug_marker>& object)
+		void dispose(std::unique_ptr<vk::image>& img)
 		{
-			// Special case as we may need to read these out.
-			// FIXME: We can manage these markers better and remove this exception.
-			get_current_eid_scope().m_debug_markers.emplace_back(std::move(object));
+			get_current_eid_scope().m_disposed_images.emplace_back(std::move(img));
 		}
 
-		template<typename T>
-		inline void dispose(std::unique_ptr<T>& object)
+		void dispose(std::unique_ptr<vk::viewable_image>& img)
 		{
-			auto ptr = vk::disposable_t::make(object.release());
-			dispose(ptr);
+			get_current_eid_scope().m_disposed_images.emplace_back(std::move(img));
 		}
 
-		void push_down_current_scope()
+		void dispose(std::unique_ptr<vk::event>& event)
 		{
-			get_current_eid_scope().eid++;
+			get_current_eid_scope().m_disposed_events.emplace_back(std::move(event));
+			event = VK_NULL_HANDLE;
+		}
+
+		void dispose(std::unique_ptr<vk::query_pool>& pool)
+		{
+			get_current_eid_scope().m_disposed_query_pools.emplace_back(std::move(pool));
 		}
 
 		void eid_completed(u64 eid)
 		{
 			while (!m_eid_map.empty())
 			{
-				const auto& scope = m_eid_map.front();
+				auto& scope = m_eid_map.front();
 				if (scope.eid > eid)
 				{
 					break;
 				}
-
-				eid_scope_t tmp(0);
+				else
 				{
-					std::lock_guard lock(m_eid_map_lock);
-					m_eid_map.front().swap(tmp);
 					m_eid_map.pop_front();
 				}
 			}
 		}
-
-		void trim();
-
-		std::vector<const gpu_debug_marker*> gather_debug_markers() const
-		{
-			std::vector<const gpu_debug_marker*> result;
-			for (const auto& scope : m_eid_map)
-			{
-				for (const auto& item : scope.m_debug_markers)
-				{
-					result.push_back(item.get());
-				}
-			}
-			return result;
-		}
 	};
 
 	struct vmm_allocation_t
diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp
index c80fb7873d..f39aca242a 100644
--- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp
+++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp
@@ -1,91 +1,32 @@
 #include "stdafx.h"
-
 #include "VKShaderInterpreter.h"
-#include "VKCommonPipelineLayout.h"
 #include "VKVertexProgram.h"
 #include "VKFragmentProgram.h"
+#include "VKGSRender.h"
+
 #include "../Program/GLSLCommon.h"
 #include "../Program/ShaderInterpreter.h"
 #include "../rsx_methods.h"
-#include "VKHelpers.h"
-#include "VKRenderPass.h"
 
 namespace vk
 {
-	u32 shader_interpreter::init(VKVertexProgram* vk_prog, u64 compiler_options) const
-	{
-		std::memset(&vk_prog->binding_table, 0xff, sizeof(vk_prog->binding_table));
-
-		u32 location = 0;
-		vk_prog->binding_table.vertex_buffers_location = location;
-		location += 3;
-
-		vk_prog->binding_table.context_buffer_location = location++;
-
-		if (vk::emulate_conditional_rendering())
-		{
-			vk_prog->binding_table.cr_pred_buffer_location = location++;
-		}
-
-		if (compiler_options & program_common::interpreter::COMPILER_OPT_ENABLE_INSTANCING)
-		{
-			vk_prog->binding_table.instanced_lut_buffer_location = location++;
-			vk_prog->binding_table.instanced_cbuf_location = location++;
-		}
-		else
-		{
-			vk_prog->binding_table.cbuf_location = location++;
-		}
-
-		if (vk::emulate_conditional_rendering())
-		{
-			vk_prog->binding_table.cr_pred_buffer_location = location++;
-		}
-
-		// Return next index
-		return location;
-	}
-
-	u32 shader_interpreter::init(VKFragmentProgram* vk_prog, u64 /*compiler_opt*/) const
-	{
-		std::memset(&vk_prog->binding_table, 0xff, sizeof(vk_prog->binding_table));
-
-		vk_prog->binding_table.context_buffer_location = 0;
-		vk_prog->binding_table.tex_param_location = 1;
-		vk_prog->binding_table.polygon_stipple_params_location = 2;
-
-		// Return next index
-		return 3;
-	}
-
-	VKVertexProgram* shader_interpreter::build_vs(u64 compiler_options)
+	void shader_interpreter::build_vs()
 	{
 		::glsl::shader_properties properties{};
 		properties.domain = ::glsl::program_domain::glsl_vertex_program;
 		properties.require_lit_emulation = true;
 
+		// TODO: Extend decompiler thread
+		// TODO: Rename decompiler thread, it no longer spawns a thread
 		RSXVertexProgram null_prog;
 		std::string shader_str;
 		ParamArray arr;
-
-		// Initialize binding layout
-		auto vk_prog = std::make_unique<VKVertexProgram>();
-		m_vertex_instruction_start = init(vk_prog.get(), compiler_options);
-
-		null_prog.ctrl = (compiler_options & program_common::interpreter::COMPILER_OPT_ENABLE_INSTANCING)
-			? RSX_SHADER_CONTROL_INSTANCED_CONSTANTS
-			: 0;
-		VKVertexDecompilerThread comp(null_prog, shader_str, arr, *vk_prog);
-
-		// Initialize compiler properties
-		comp.properties.has_indexed_constants = true;
-
-		ParamType uniforms = { PF_PARAM_UNIFORM, "vec4" };
-		uniforms.items.emplace_back("vc[468]", -1);
+		VKVertexProgram vk_prog;
+		VKVertexDecompilerThread comp(null_prog, shader_str, arr, vk_prog);
 
 		std::stringstream builder;
 		comp.insertHeader(builder);
-		comp.insertConstants(builder, { uniforms });
+		comp.insertConstants(builder, {});
 		comp.insertInputs(builder, {});
 
 		// Insert vp stream input
@@ -99,51 +40,49 @@ namespace vk
 		"	uvec4 vp_instructions[];\n"
 		"};\n\n";
 
-		if (compiler_options & program_common::interpreter::COMPILER_OPT_ENABLE_VTX_TEXTURES)
-		{
-			// FIXME: Unimplemented
-			rsx_log.todo("Vertex textures are currently not implemented for the shader interpreter.");
-		}
-
-		if (compiler_options & program_common::interpreter::COMPILER_OPT_ENABLE_INSTANCING)
-		{
-			builder << "#define _ENABLE_INSTANCED_CONSTANTS\n";
-		}
-
-		if (compiler_options)
-		{
-			builder << "\n";
-		}
-
 		::glsl::insert_glsl_legacy_function(builder, properties);
-		::glsl::insert_vertex_input_fetch(builder, ::glsl::glsl_rules::glsl_rules_vulkan);
+		::glsl::insert_vertex_input_fetch(builder, ::glsl::glsl_rules::glsl_rules_spirv);
 
 		builder << program_common::interpreter::get_vertex_interpreter();
 		const std::string s = builder.str();
 
-		auto vs = &vk_prog->shader;
-		vs->create(::glsl::program_domain::glsl_vertex_program, s);
-		vs->compile();
-
-		// Declare local inputs
-		auto vs_inputs = comp.get_inputs();
+		m_vs.create(::glsl::program_domain::glsl_vertex_program, s);
+		m_vs.compile();
 
+		// Prepare input table
+		const auto& binding_table = vk::get_current_renderer()->get_pipeline_binding_table();
 		vk::glsl::program_input in;
-		in.set = 0;
+
+		in.location = binding_table.vertex_params_bind_slot;
 		in.domain = ::glsl::glsl_vertex_program;
-		in.location = m_vertex_instruction_start;
-		in.type = glsl::input_type_storage_buffer;
-		in.name = "VertexInstructionBlock";
-		vs_inputs.push_back(in);
+		in.name = "VertexContextBuffer";
+		in.type = vk::glsl::input_type_uniform_buffer;
+		m_vs_inputs.push_back(in);
 
-		vk_prog->SetInputs(vs_inputs);
+		in.location = binding_table.vertex_buffers_first_bind_slot;
+		in.name = "persistent_input_stream";
+		in.type = vk::glsl::input_type_texel_buffer;
+		m_vs_inputs.push_back(in);
 
-		auto ret = vk_prog.get();
-		m_shader_cache[compiler_options].m_vs = std::move(vk_prog);
-		return ret;
+		in.location = binding_table.vertex_buffers_first_bind_slot + 1;
+		in.name = "volatile_input_stream";
+		in.type = vk::glsl::input_type_texel_buffer;
+		m_vs_inputs.push_back(in);
+
+		in.location = binding_table.vertex_buffers_first_bind_slot + 2;
+		in.name = "vertex_layout_stream";
+		in.type = vk::glsl::input_type_texel_buffer;
+		m_vs_inputs.push_back(in);
+
+		in.location = binding_table.vertex_constant_buffers_bind_slot;
+		in.name = "VertexConstantsBuffer";
+		in.type = vk::glsl::input_type_uniform_buffer;
+		m_vs_inputs.push_back(in);
+
+		// TODO: Bind textures if needed
 	}
 
-	VKFragmentProgram* shader_interpreter::build_fs(u64 compiler_options)
+	glsl::shader* shader_interpreter::build_fs(u64 compiler_options)
 	{
 		[[maybe_unused]] ::glsl::shader_properties properties{};
 		properties.domain = ::glsl::program_domain::glsl_fragment_program;
@@ -154,13 +93,10 @@ namespace vk
 		ParamArray arr;
 		std::string shader_str;
 		RSXFragmentProgram frag;
+		VKFragmentProgram vk_prog;
+		VKFragmentDecompilerThread comp(shader_str, arr, frag, len, vk_prog);
 
-		auto vk_prog = std::make_unique<VKFragmentProgram>();
-		m_fragment_instruction_start = init(vk_prog.get(), compiler_options);
-		m_fragment_textures_start = m_fragment_instruction_start + 1;
-
-		VKFragmentDecompilerThread comp(shader_str, arr, frag, len, *vk_prog);
-
+		const auto& binding_table = vk::get_current_renderer()->get_pipeline_binding_table();
 		std::stringstream builder;
 		builder <<
 		"#version 450\n"
@@ -236,7 +172,7 @@ namespace vk
 
 			for (int i = 0, bind_location = m_fragment_textures_start; i < 4; ++i)
 			{
-				builder << "layout(set=1, binding=" << bind_location++ << ") " << "uniform " << type_names[i] << " " << type_names[i] << "_array[16];\n";
+				builder << "layout(set=0, binding=" << bind_location++ << ") " << "uniform " << type_names[i] << " " << type_names[i] << "_array[16];\n";
 			}
 
 			builder << "\n"
@@ -248,7 +184,7 @@ namespace vk
 		}
 
 		builder <<
-		"layout(std430, set=1, binding=" << m_fragment_instruction_start << ") readonly restrict buffer FragmentInstructionBlock\n"
+		"layout(std430, binding=" << m_fragment_instruction_start << ") readonly restrict buffer FragmentInstructionBlock\n"
 		"{\n"
 		"	uint shader_control;\n"
 		"	uint texture_control;\n"
@@ -260,88 +196,266 @@ namespace vk
 		builder << program_common::interpreter::get_fragment_interpreter();
 		const std::string s = builder.str();
 
-		auto fs = &vk_prog->shader;
+		auto fs = new glsl::shader();
 		fs->create(::glsl::program_domain::glsl_fragment_program, s);
 		fs->compile();
 
-		// Declare local inputs
-		auto inputs = comp.get_inputs();
-
+		// Prepare input table
 		vk::glsl::program_input in;
-		in.set = 1;
+		in.location = binding_table.fragment_constant_buffers_bind_slot;
 		in.domain = ::glsl::glsl_fragment_program;
-		in.location = m_fragment_instruction_start;
-		in.type = glsl::input_type_storage_buffer;
-		in.name = "FragmentInstructionBlock";
-		inputs.push_back(in);
+		in.name = "FragmentConstantsBuffer";
+		in.type = vk::glsl::input_type_uniform_buffer;
+		m_fs_inputs.push_back(in);
 
-		if (compiler_options & program_common::interpreter::COMPILER_OPT_ENABLE_TEXTURES)
+		in.location = binding_table.fragment_state_bind_slot;
+		in.name = "FragmentStateBuffer";
+		m_fs_inputs.push_back(in);
+
+		in.location = binding_table.fragment_texture_params_bind_slot;
+		in.name = "TextureParametersBuffer";
+		m_fs_inputs.push_back(in);
+
+		for (int i = 0, location = m_fragment_textures_start; i < 4; ++i, ++location)
 		{
-			for (int i = 0, location = m_fragment_textures_start; i < 4; ++i, ++location)
-			{
-				in.location = location;
-				in.name = std::string(type_names[i]) + "_array[16]";
-				in.type = glsl::input_type_texture;
-				inputs.push_back(in);
-			}
+			in.location = location;
+			in.name = std::string(type_names[i]) + "_array[16]";
+			m_fs_inputs.push_back(in);
 		}
 
-		vk_prog->SetInputs(inputs);
+		m_fs_cache[compiler_options].reset(fs);
+		return fs;
+	}
 
-		auto ret = vk_prog.get();
-		m_shader_cache[compiler_options].m_fs = std::move(vk_prog);
-		return ret;
+	std::pair<VkDescriptorSetLayout, VkPipelineLayout> shader_interpreter::create_layout(VkDevice dev)
+	{
+		const auto& binding_table = vk::get_current_renderer()->get_pipeline_binding_table();
+		std::vector<VkDescriptorSetLayoutBinding> bindings(binding_table.total_descriptor_bindings);
+
+		u32 idx = 0;
+
+		// Vertex stream, one stream for cacheable data, one stream for transient data. Third stream contains vertex layout info
+		for (int i = 0; i < 3; i++)
+		{
+			bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
+			bindings[idx].descriptorCount = 1;
+			bindings[idx].stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+			bindings[idx].binding = binding_table.vertex_buffers_first_bind_slot + i;
+			idx++;
+		}
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[idx].binding = binding_table.fragment_constant_buffers_bind_slot;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[idx].binding = binding_table.fragment_state_bind_slot;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[idx].binding = binding_table.fragment_texture_params_bind_slot;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+		bindings[idx].binding = binding_table.vertex_constant_buffers_bind_slot;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_ALL_GRAPHICS;
+		bindings[idx].binding = binding_table.vertex_params_bind_slot;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+		bindings[idx].binding = binding_table.conditional_render_predicate_slot;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[idx].binding = binding_table.rasterizer_env_bind_slot;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+		bindings[idx].descriptorCount = 16;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[idx].binding = binding_table.textures_first_bind_slot;
+
+		m_fragment_textures_start = bindings[idx].binding;
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+		bindings[idx].descriptorCount = 16;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[idx].binding = binding_table.textures_first_bind_slot + 1;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+		bindings[idx].descriptorCount = 16;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[idx].binding = binding_table.textures_first_bind_slot + 2;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+		bindings[idx].descriptorCount = 16;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[idx].binding = binding_table.textures_first_bind_slot + 3;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+		bindings[idx].descriptorCount = 4;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+		bindings[idx].binding = binding_table.textures_first_bind_slot + 4;
+
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+		bindings[idx].binding = binding_table.textures_first_bind_slot + 5;
+
+		m_vertex_instruction_start = bindings[idx].binding;
+		idx++;
+
+		bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
+		bindings[idx].descriptorCount = 1;
+		bindings[idx].stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+		bindings[idx].binding = binding_table.textures_first_bind_slot + 6;
+
+		m_fragment_instruction_start = bindings[idx].binding;
+		idx++;
+		bindings.resize(idx);
+
+		std::array<VkPushConstantRange, 1> push_constants;
+		push_constants[0].offset = 0;
+		push_constants[0].size = 16;
+		push_constants[0].stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+
+		if (vk::emulate_conditional_rendering())
+		{
+			// Conditional render toggle
+			push_constants[0].size = 20;
+		}
+
+		VkDescriptorSetLayoutCreateInfo infos = {};
+		infos.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
+		infos.pBindings = bindings.data();
+		infos.bindingCount = static_cast<u32>(bindings.size());
+
+		VkDescriptorSetLayout set_layout;
+		CHECK_RESULT(vkCreateDescriptorSetLayout(dev, &infos, nullptr, &set_layout));
+
+		VkPipelineLayoutCreateInfo layout_info = {};
+		layout_info.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
+		layout_info.setLayoutCount = 1;
+		layout_info.pSetLayouts = &set_layout;
+		layout_info.pushConstantRangeCount = 1;
+		layout_info.pPushConstantRanges = push_constants.data();
+
+		VkPipelineLayout result;
+		CHECK_RESULT(vkCreatePipelineLayout(dev, &layout_info, nullptr, &result));
+		return { set_layout, result };
+	}
+
+	void shader_interpreter::create_descriptor_pools(const vk::render_device& dev)
+	{
+		std::vector<VkDescriptorPoolSize> sizes;
+		sizes.push_back({ VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER , 6 * DESCRIPTOR_MAX_DRAW_CALLS });
+		sizes.push_back({ VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER , 3 * DESCRIPTOR_MAX_DRAW_CALLS });
+		sizes.push_back({ VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER , 68 * DESCRIPTOR_MAX_DRAW_CALLS });
+		sizes.push_back({ VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 3 * DESCRIPTOR_MAX_DRAW_CALLS });
+
+		m_descriptor_pool.create(dev, sizes.data(), ::size32(sizes), DESCRIPTOR_MAX_DRAW_CALLS, 2);
 	}
 
 	void shader_interpreter::init(const vk::render_device& dev)
 	{
 		m_device = dev;
+		std::tie(m_shared_descriptor_layout, m_shared_pipeline_layout) = create_layout(dev);
+		create_descriptor_pools(dev);
+
+		build_vs();
+		// TODO: Seed the cache
 	}
 
 	void shader_interpreter::destroy()
 	{
 		m_program_cache.clear();
-		m_shader_cache.clear();
+		m_descriptor_pool.destroy();
+
+		for (auto &fs : m_fs_cache)
+		{
+			fs.second->destroy();
+		}
+
+		m_vs.destroy();
+		m_fs_cache.clear();
+
+		if (m_shared_pipeline_layout)
+		{
+			vkDestroyPipelineLayout(m_device, m_shared_pipeline_layout, nullptr);
+			m_shared_pipeline_layout = VK_NULL_HANDLE;
+		}
+
+		if (m_shared_descriptor_layout)
+		{
+			vkDestroyDescriptorSetLayout(m_device, m_shared_descriptor_layout, nullptr);
+			m_shared_descriptor_layout = VK_NULL_HANDLE;
+		}
 	}
 
 	glsl::program* shader_interpreter::link(const vk::pipeline_props& properties, u64 compiler_opt)
 	{
-		VKVertexProgram* vs;
-		VKFragmentProgram* fs;
-
-		if (auto found = m_shader_cache.find(compiler_opt); found != m_shader_cache.end())
+		glsl::shader* fs;
+		if (auto found = m_fs_cache.find(compiler_opt); found != m_fs_cache.end())
 		{
-			fs = found->second.m_fs.get();
-			vs = found->second.m_vs.get();
+			fs = found->second.get();
 		}
 		else
 		{
 			fs = build_fs(compiler_opt);
-			vs = build_vs(compiler_opt);
 		}
 
 		VkPipelineShaderStageCreateInfo shader_stages[2] = {};
 		shader_stages[0].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
 		shader_stages[0].stage = VK_SHADER_STAGE_VERTEX_BIT;
-		shader_stages[0].module = vs->shader.get_handle();
+		shader_stages[0].module = m_vs.get_handle();
 		shader_stages[0].pName = "main";
 
 		shader_stages[1].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
 		shader_stages[1].stage = VK_SHADER_STAGE_FRAGMENT_BIT;
-		shader_stages[1].module = fs->shader.get_handle();
+		shader_stages[1].module = fs->get_handle();
 		shader_stages[1].pName = "main";
 
-		std::vector<VkDynamicState> dynamic_state_descriptors =
-		{
-			VK_DYNAMIC_STATE_VIEWPORT,
-			VK_DYNAMIC_STATE_SCISSOR,
-			VK_DYNAMIC_STATE_LINE_WIDTH,
-			VK_DYNAMIC_STATE_BLEND_CONSTANTS,
-			VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK,
-			VK_DYNAMIC_STATE_STENCIL_WRITE_MASK,
-			VK_DYNAMIC_STATE_STENCIL_REFERENCE,
-			VK_DYNAMIC_STATE_DEPTH_BIAS
-		};
+		std::vector<VkDynamicState> dynamic_state_descriptors;
+		dynamic_state_descriptors.push_back(VK_DYNAMIC_STATE_VIEWPORT);
+		dynamic_state_descriptors.push_back(VK_DYNAMIC_STATE_SCISSOR);
+		dynamic_state_descriptors.push_back(VK_DYNAMIC_STATE_LINE_WIDTH);
+		dynamic_state_descriptors.push_back(VK_DYNAMIC_STATE_BLEND_CONSTANTS);
+		dynamic_state_descriptors.push_back(VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK);
+		dynamic_state_descriptors.push_back(VK_DYNAMIC_STATE_STENCIL_WRITE_MASK);
+		dynamic_state_descriptors.push_back(VK_DYNAMIC_STATE_STENCIL_REFERENCE);
+		dynamic_state_descriptors.push_back(VK_DYNAMIC_STATE_DEPTH_BIAS);
 
 		if (vk::get_current_renderer()->get_depth_bounds_support())
 		{
@@ -372,9 +486,6 @@ namespace vk
 		VkPipelineColorBlendStateCreateInfo cs = properties.state.cs;
 		cs.pAttachments = properties.state.att_state;
 
-		VkPipelineTessellationStateCreateInfo ts = {};
-		ts.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO;
-
 		VkGraphicsPipelineCreateInfo info = {};
 		info.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
 		info.pVertexInputState = &vi;
@@ -384,48 +495,64 @@ namespace vk
 		info.pMultisampleState = &ms;
 		info.pViewportState = &vp;
 		info.pDepthStencilState = &properties.state.ds;
-		info.pTessellationState = &ts;
 		info.stageCount = 2;
 		info.pStages = shader_stages;
 		info.pDynamicState = &dynamic_state_info;
-		info.layout = VK_NULL_HANDLE;
+		info.layout = m_shared_pipeline_layout;
 		info.basePipelineIndex = -1;
 		info.basePipelineHandle = VK_NULL_HANDLE;
 		info.renderPass = vk::get_renderpass(m_device, properties.renderpass_key);
 
 		auto compiler = vk::get_pipe_compiler();
-		auto program = compiler->compile(
-			info,
-			vk::pipe_compiler::COMPILE_INLINE | vk::pipe_compiler::SEPARATE_SHADER_OBJECTS,
-			{},
-			vs->uniforms,
-			fs->uniforms);
-
+		auto program = compiler->compile(info, m_shared_pipeline_layout, vk::pipe_compiler::COMPILE_INLINE, {}, m_vs_inputs, m_fs_inputs);
 		return program.release();
 	}
 
-	void shader_interpreter::update_fragment_textures(const std::array<VkDescriptorImageInfo, 68>& sampled_images)
+	void shader_interpreter::update_fragment_textures(const std::array<VkDescriptorImageInfo, 68>& sampled_images, VkDescriptorSet descriptor_set)
 	{
-		// FIXME: Cannot use m_fragment_textures.start now since each interpreter has its own binding layout
-		auto [set, binding] = m_current_interpreter->get_uniform_location(::glsl::glsl_fragment_program, glsl::input_type_texture, "sampler1D_array[16]");
-		if (binding == umax)
-		{
-			return;
-		}
-
 		const VkDescriptorImageInfo* texture_ptr = sampled_images.data();
-		for (u32 i = 0; i < 4; ++i, ++binding, texture_ptr += 16)
+		for (u32 i = 0, binding = m_fragment_textures_start; i < 4; ++i, ++binding, texture_ptr += 16)
 		{
-			m_current_interpreter->bind_uniform_array(texture_ptr, 16, set, binding);
+			const VkWriteDescriptorSet descriptor_writer =
+			{
+				VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,    // sType
+				nullptr,                                   // pNext
+				descriptor_set,                            // dstSet
+				binding,                                   // dstBinding
+				0,                                         // dstArrayElement
+				16,                                        // descriptorCount
+				VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, // descriptorType
+				texture_ptr,                               // pImageInfo
+				nullptr,                                   // pBufferInfo
+				nullptr                                    // pTexelBufferView
+			};
+
+			vkUpdateDescriptorSets(m_device, 1, &descriptor_writer, 0, nullptr);
 		}
 	}
 
-	glsl::program* shader_interpreter::get(
-		const vk::pipeline_props& properties,
-		const program_hash_util::fragment_program_utils::fragment_program_metadata& fp_metadata,
-		const program_hash_util::vertex_program_utils::vertex_program_metadata& vp_metadata,
-		u32 vp_ctrl,
-		u32 fp_ctrl)
+	VkDescriptorSet shader_interpreter::allocate_descriptor_set()
+	{
+		if (m_used_descriptors == DESCRIPTOR_MAX_DRAW_CALLS)
+		{
+			m_descriptor_pool.reset(0);
+			m_used_descriptors = 0;
+		}
+
+		VkDescriptorSetAllocateInfo alloc_info = {};
+		alloc_info.descriptorPool = m_descriptor_pool;
+		alloc_info.descriptorSetCount = 1;
+		alloc_info.pSetLayouts = &m_shared_descriptor_layout;
+		alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+
+		VkDescriptorSet new_descriptor_set;
+		CHECK_RESULT(vkAllocateDescriptorSets(m_device, &alloc_info, &new_descriptor_set));
+
+		m_used_descriptors++;
+		return new_descriptor_set;
+	}
+
+	glsl::program* shader_interpreter::get(const vk::pipeline_props& properties, const program_hash_util::fragment_program_utils::fragment_program_metadata& metadata)
 	{
 		pipeline_key key;
 		key.compiler_opt = 0;
@@ -460,15 +587,13 @@ namespace vk
 			}
 		}
 
-		if (fp_ctrl & CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_DEPTH_EXPORT;
-		if (fp_ctrl & CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_F32_EXPORT;
-		if (fp_ctrl & RSX_SHADER_CONTROL_USES_KIL) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_KIL;
-		if (fp_metadata.referenced_textures_mask) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_TEXTURES;
-		if (fp_metadata.has_branch_instructions) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_FLOW_CTRL;
-		if (fp_metadata.has_pack_instructions) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_PACKING;
+		if (rsx::method_registers.shader_control() & CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_DEPTH_EXPORT;
+		if (rsx::method_registers.shader_control() & CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_F32_EXPORT;
+		if (rsx::method_registers.shader_control() & RSX_SHADER_CONTROL_USES_KIL) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_KIL;
+		if (metadata.referenced_textures_mask) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_TEXTURES;
+		if (metadata.has_branch_instructions) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_FLOW_CTRL;
+		if (metadata.has_pack_instructions) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_PACKING;
 		if (rsx::method_registers.polygon_stipple_enabled()) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_STIPPLING;
-		if (vp_ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_INSTANCING;
-		if (vp_metadata.referenced_textures_mask) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_VTX_TEXTURES;
 
 		if (m_current_key == key) [[likely]]
 		{
@@ -505,16 +630,4 @@ namespace vk
 	{
 		return m_fragment_instruction_start;
 	}
-
-	std::pair<VKVertexProgram*, VKFragmentProgram*> shader_interpreter::get_shaders() const
-	{
-		if (auto found = m_shader_cache.find(m_current_key.compiler_opt); found != m_shader_cache.end())
-		{
-			auto fs = found->second.m_fs.get();
-			auto vs = found->second.m_vs.get();
-			return { vs, fs };
-		}
-
-		return { nullptr, nullptr };
-	}
 };
diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h
index 9d934b3ffa..75a29579e5 100644
--- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h
+++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h
@@ -1,13 +1,8 @@
 #pragma once
-#include "Emu/RSX/VK/VKProgramPipeline.h"
-#include "Emu/RSX/Program/ProgramStateCache.h"
-#include "Emu/RSX/VK/VKPipelineCompiler.h"
-#include "vkutils/descriptors.h"
+#include "VKProgramBuffer.h"
+#include "vkutils/descriptors.hpp"
 #include <unordered_map>
 
-class VKVertexProgram;
-class VKFragmentProgram;
-
 namespace vk
 {
 	using ::program_hash_util::fragment_program_utils;
@@ -15,7 +10,14 @@ namespace vk
 
 	class shader_interpreter
 	{
+		glsl::shader m_vs;
+
+		std::vector<glsl::program_input> m_vs_inputs;
+		std::vector<glsl::program_input> m_fs_inputs;
+
 		VkDevice m_device = VK_NULL_HANDLE;
+		VkDescriptorSetLayout m_shared_descriptor_layout = VK_NULL_HANDLE;
+		VkPipelineLayout m_shared_pipeline_layout = VK_NULL_HANDLE;
 		glsl::program* m_current_interpreter = nullptr;
 
 		struct pipeline_key
@@ -37,14 +39,10 @@ namespace vk
 			}
 		};
 
-		struct shader_cache_entry_t
-		{
-			std::unique_ptr<VKFragmentProgram> m_fs;
-			std::unique_ptr<VKVertexProgram> m_vs;
-		};
-
 		std::unordered_map<pipeline_key, std::unique_ptr<glsl::program>, key_hasher> m_program_cache;
-		std::unordered_map<u64, shader_cache_entry_t> m_shader_cache;
+		std::unordered_map<u64, std::unique_ptr<glsl::shader>> m_fs_cache;
+		vk::descriptor_pool m_descriptor_pool;
+		usz m_used_descriptors = 0;
 
 		u32 m_vertex_instruction_start = 0;
 		u32 m_fragment_instruction_start = 0;
@@ -52,32 +50,24 @@ namespace vk
 
 		pipeline_key m_current_key{};
 
-		VKVertexProgram* build_vs(u64 compiler_opt);
-		VKFragmentProgram* build_fs(u64 compiler_opt);
-		glsl::program* link(const vk::pipeline_props& properties, u64 compiler_opt);
+		std::pair<VkDescriptorSetLayout, VkPipelineLayout> create_layout(VkDevice dev);
+		void create_descriptor_pools(const vk::render_device& dev);
 
-		u32 init(VKVertexProgram* vk_prog, u64 compiler_opt) const;
-		u32 init(VKFragmentProgram* vk_prog, u64 compiler_opt) const;
+		void build_vs();
+		glsl::shader* build_fs(u64 compiler_opt);
+		glsl::program* link(const vk::pipeline_props& properties, u64 compiler_opt);
 
 	public:
 		void init(const vk::render_device& dev);
 		void destroy();
 
-		glsl::program* get(
-			const vk::pipeline_props& properties,
-			const program_hash_util::fragment_program_utils::fragment_program_metadata& fp_metadata,
-			const program_hash_util::vertex_program_utils::vertex_program_metadata& vp_metadata,
-			u32 vp_ctrl,
-			u32 fp_ctrl);
-
-		// Retrieve the shader components that make up the current interpreter
-		std::pair<VKVertexProgram*, VKFragmentProgram*> get_shaders() const;
-
+		glsl::program* get(const vk::pipeline_props& properties, const program_hash_util::fragment_program_utils::fragment_program_metadata& metadata);
 		bool is_interpreter(const glsl::program* prog) const;
 
 		u32 get_vertex_instruction_location() const;
 		u32 get_fragment_instruction_location() const;
 
-		void update_fragment_textures(const std::array<VkDescriptorImageInfo, 68>& sampled_images);
+		void update_fragment_textures(const std::array<VkDescriptorImageInfo, 68>& sampled_images, VkDescriptorSet descriptor_set);
+		VkDescriptorSet allocate_descriptor_set();
 	};
 }
diff --git a/rpcs3/Emu/RSX/VK/VKTextOut.h b/rpcs3/Emu/RSX/VK/VKTextOut.h
new file mode 100644
index 0000000000..09aef0e1f4
--- /dev/null
+++ b/rpcs3/Emu/RSX/VK/VKTextOut.h
@@ -0,0 +1,380 @@
+#pragma once
+#include "VKVertexProgram.h"
+#include "VKFragmentProgram.h"
+#include "VKRenderPass.h"
+#include "VKPipelineCompiler.h"
+
+#include "vkutils/framebuffer_object.hpp"
+
+#include "../Common/TextGlyphs.h"
+#include <unordered_map>
+
+namespace vk
+{
+	class text_writer
+	{
+	private:
+		std::unique_ptr<vk::buffer> m_vertex_buffer;
+		std::unique_ptr<vk::buffer> m_uniforms_buffer;
+
+		std::unique_ptr<vk::glsl::program> m_program;
+		vk::glsl::shader m_vertex_shader;
+		vk::glsl::shader m_fragment_shader;
+
+		vk::descriptor_pool m_descriptor_pool;
+		VkDescriptorSet m_descriptor_set = nullptr;
+		VkDescriptorSetLayout m_descriptor_layout = nullptr;
+		VkPipelineLayout m_pipeline_layout = nullptr;
+		u32 m_used_descriptors = 0;
+
+		VkRenderPass m_render_pass;
+		VkDevice device = nullptr;
+
+		u32 m_uniform_buffer_offset = 0;
+		u32 m_uniform_buffer_size = 0;
+
+		f32 m_scale = 1.0f;
+
+		bool initialized = false;
+		std::unordered_map<u8, std::pair<u32, u32>> m_offsets;
+
+		void init_descriptor_set(vk::render_device &dev)
+		{
+			VkDescriptorPoolSize descriptor_pools[1] =
+			{
+				{ VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 120 },
+			};
+
+			//Reserve descriptor pools
+			m_descriptor_pool.create(dev, descriptor_pools, 1, 120, 2);
+
+			VkDescriptorSetLayoutBinding bindings[1] = {};
+
+			//Scale and offset data plus output color
+			bindings[0].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+			bindings[0].descriptorCount = 1;
+			bindings[0].stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+			bindings[0].binding = 0;
+
+			VkDescriptorSetLayoutCreateInfo infos = {};
+			infos.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
+			infos.pBindings = bindings;
+			infos.bindingCount = 1;
+
+			CHECK_RESULT(vkCreateDescriptorSetLayout(dev, &infos, nullptr, &m_descriptor_layout));
+
+			VkPipelineLayoutCreateInfo layout_info = {};
+			layout_info.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
+			layout_info.setLayoutCount = 1;
+			layout_info.pSetLayouts = &m_descriptor_layout;
+
+			CHECK_RESULT(vkCreatePipelineLayout(dev, &layout_info, nullptr, &m_pipeline_layout));
+		}
+
+		void init_program()
+		{
+			std::string vs =
+			{
+				"#version 450\n"
+				"#extension GL_ARB_separate_shader_objects : enable\n"
+				"layout(location=0) in vec2 pos;\n"
+				"layout(std140, set=0, binding=0) uniform scale_offset_buffer\n"
+				"{\n"
+				"	vec4 offsets[510];\n"
+				"	vec4 scale;\n"
+				"	vec4 text_color;\n"
+				"};\n"
+				"\n"
+				"layout(location=1) out vec4 draw_color;\n"
+				"\n"
+				"void main()\n"
+				"{\n"
+				"	vec2 offset = offsets[gl_InstanceIndex].xy;\n"
+				"	gl_Position = vec4(pos, 0., 1.);\n"
+				"	gl_Position.xy = gl_Position.xy * scale.xy + offset;\n"
+				"	draw_color = text_color;\n"
+				"}\n"
+			};
+
+			std::string fs =
+			{
+				"#version 420\n"
+				"#extension GL_ARB_separate_shader_objects : enable\n"
+				"layout(location=1) in vec4 draw_color;\n"
+				"layout(location=0) out vec4 col0;\n"
+				"\n"
+				"void main()\n"
+				"{\n"
+				"	col0 = draw_color;\n"
+				"}\n"
+			};
+
+			m_vertex_shader.create(::glsl::program_domain::glsl_vertex_program, vs);
+			m_vertex_shader.compile();
+
+			m_fragment_shader.create(::glsl::program_domain::glsl_fragment_program, fs);
+			m_fragment_shader.compile();
+
+			VkPipelineShaderStageCreateInfo shader_stages[2] = {};
+			shader_stages[0].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
+			shader_stages[0].stage = VK_SHADER_STAGE_VERTEX_BIT;
+			shader_stages[0].module = m_vertex_shader.get_handle();
+			shader_stages[0].pName = "main";
+
+			shader_stages[1].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
+			shader_stages[1].stage = VK_SHADER_STAGE_FRAGMENT_BIT;
+			shader_stages[1].module = m_fragment_shader.get_handle();
+			shader_stages[1].pName = "main";
+
+			std::vector<VkDynamicState> dynamic_state_descriptors;
+			VkPipelineDynamicStateCreateInfo dynamic_state_info = {};
+			dynamic_state_info.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
+			dynamic_state_descriptors.push_back(VK_DYNAMIC_STATE_VIEWPORT);
+			dynamic_state_descriptors.push_back(VK_DYNAMIC_STATE_SCISSOR);
+			dynamic_state_info.pDynamicStates = dynamic_state_descriptors.data();
+			dynamic_state_info.dynamicStateCount = ::size32(dynamic_state_descriptors);
+
+			VkVertexInputAttributeDescription vdesc;
+			VkVertexInputBindingDescription vbind;
+
+			vdesc.binding = 0;
+			vdesc.format = VK_FORMAT_R32G32_SFLOAT;
+			vdesc.location = 0;
+			vdesc.offset = 0;
+
+			vbind.binding = 0;
+			vbind.inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
+			vbind.stride = 8;
+
+			VkPipelineVertexInputStateCreateInfo vi = {};
+			vi.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
+			vi.vertexAttributeDescriptionCount = 1;
+			vi.vertexBindingDescriptionCount = 1;
+			vi.pVertexAttributeDescriptions = &vdesc;
+			vi.pVertexBindingDescriptions = &vbind;
+
+			VkPipelineViewportStateCreateInfo vp = {};
+			vp.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
+			vp.scissorCount = 1;
+			vp.viewportCount = 1;
+
+			VkPipelineMultisampleStateCreateInfo ms = {};
+			ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
+			ms.pSampleMask = NULL;
+			ms.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT;
+
+			VkPipelineInputAssemblyStateCreateInfo ia = {};
+			ia.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
+			ia.topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
+
+			VkPipelineRasterizationStateCreateInfo rs = {};
+			rs.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
+			rs.lineWidth = 1.f;
+
+			VkPipelineColorBlendAttachmentState att = {};
+			att.colorWriteMask = 0xf;
+
+			VkPipelineColorBlendStateCreateInfo cs = {};
+			cs.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
+			cs.attachmentCount = 1;
+			cs.pAttachments = &att;
+
+			VkPipelineDepthStencilStateCreateInfo ds = {};
+			ds.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
+
+			VkGraphicsPipelineCreateInfo info = {};
+			info.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
+			info.pVertexInputState = &vi;
+			info.pInputAssemblyState = &ia;
+			info.pRasterizationState = &rs;
+			info.pColorBlendState = &cs;
+			info.pMultisampleState = &ms;
+			info.pViewportState = &vp;
+			info.pDepthStencilState = &ds;
+			info.stageCount = 2;
+			info.pStages = shader_stages;
+			info.pDynamicState = &dynamic_state_info;
+			info.layout = m_pipeline_layout;
+			info.basePipelineIndex = -1;
+			info.basePipelineHandle = VK_NULL_HANDLE;
+			info.renderPass = m_render_pass;
+
+			auto compiler = vk::get_pipe_compiler();
+			m_program = compiler->compile(info, m_pipeline_layout, vk::pipe_compiler::COMPILE_INLINE);
+		}
+
+		void load_program(vk::command_buffer &cmd, float scale_x, float scale_y, const float *offsets, usz nb_offsets, std::array<float, 4> color)
+		{
+			ensure(m_used_descriptors < 120);
+
+			VkDescriptorSetAllocateInfo alloc_info = {};
+			alloc_info.descriptorPool = m_descriptor_pool;
+			alloc_info.descriptorSetCount = 1;
+			alloc_info.pSetLayouts = &m_descriptor_layout;
+			alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+
+			CHECK_RESULT(vkAllocateDescriptorSets(device, &alloc_info, &m_descriptor_set));
+			m_used_descriptors++;
+
+			float scale[] = { scale_x, scale_y };
+			float colors[] = { color[0], color[1], color[2], color[3] };
+			float* dst = static_cast<float*>(m_uniforms_buffer->map(m_uniform_buffer_offset, 8192));
+
+			//std140 spec demands that arrays be multiples of 16 bytes
+			for (usz i = 0; i < nb_offsets; ++i)
+			{
+				dst[i * 4] = offsets[i * 2];
+				dst[i * 4 + 1] = offsets[i * 2 + 1];
+			}
+
+			memcpy(&dst[510*4], scale, 8);
+			memcpy(&dst[511*4], colors, 16);
+
+			m_uniforms_buffer->unmap();
+
+			m_program->bind_uniform({ m_uniforms_buffer->value, m_uniform_buffer_offset, 8192 }, 0, m_descriptor_set);
+			m_uniform_buffer_offset = (m_uniform_buffer_offset + 8192) % m_uniform_buffer_size;
+
+			vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, m_program->pipeline);
+			vkCmdBindDescriptorSets(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, m_pipeline_layout, 0, 1, &m_descriptor_set, 0, nullptr);
+
+			VkDeviceSize zero = 0;
+			vkCmdBindVertexBuffers(cmd, 0, 1, &m_vertex_buffer->value, &zero);
+		}
+
+	public:
+
+		text_writer() = default;
+		~text_writer()
+		{
+			if (initialized)
+			{
+				m_vertex_shader.destroy();
+				m_fragment_shader.destroy();
+
+				vkDestroyDescriptorSetLayout(device, m_descriptor_layout, nullptr);
+				vkDestroyPipelineLayout(device, m_pipeline_layout, nullptr);
+				m_descriptor_pool.destroy();
+			}
+		}
+
+		void init(vk::render_device &dev, VkRenderPass render_pass)
+		{
+			ensure(render_pass != VK_NULL_HANDLE);
+
+			//At worst case, 1 char = 16*16*8 bytes (average about 24*8), so ~256K for 128 chars. Allocating 512k for verts
+			//uniform params are 8k in size, allocating for 120 lines (max lines at 4k, one column per row. Can be expanded
+			m_vertex_buffer = std::make_unique<vk::buffer>(dev, 524288, dev.get_memory_mapping().host_visible_coherent,
+					VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, 0, VMM_ALLOCATION_POOL_UNDEFINED);
+			m_uniforms_buffer = std::make_unique<vk::buffer>(dev, 983040, dev.get_memory_mapping().host_visible_coherent,
+					VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, 0, VMM_ALLOCATION_POOL_UNDEFINED);
+
+			m_render_pass = render_pass;
+			m_uniform_buffer_size = 983040;
+
+			init_descriptor_set(dev);
+			init_program();
+
+			GlyphManager glyph_source;
+			auto points = glyph_source.generate_point_map();
+			const usz buffer_size = points.size() * sizeof(GlyphManager::glyph_point);
+
+			u8* dst = static_cast<u8*>(m_vertex_buffer->map(0, buffer_size));
+			memcpy(dst, points.data(), buffer_size);
+			m_vertex_buffer->unmap();
+
+			m_offsets = glyph_source.get_glyph_offsets();
+
+			device = dev;
+			initialized = true;
+		}
+
+		void print_text(vk::command_buffer &cmd, vk::framebuffer &target, int x, int y, int target_w, int target_h, const std::string &text, std::array<float, 4> color = { 0.3f, 1.f, 0.3f, 1.f })
+		{
+			std::vector<u32> offsets;
+			std::vector<u32> counts;
+			std::vector<float> shader_offsets;
+			char *s = const_cast<char *>(text.c_str());
+
+			//Y is in raster coordinates: convert to bottom-left origin
+			y = (static_cast<int>(target_h / m_scale) - y - 16);
+
+			//Compress [0, w] and [0, h] into range [-1, 1]
+			//Flip Y scaling
+			float scale_x = m_scale * +2.f / target_w;
+			float scale_y = m_scale * -2.f / target_h;
+
+			float base_offset = 0.f;
+			shader_offsets.reserve(text.length() * 2);
+
+			while (*s)
+			{
+				u8 offset = static_cast<u8>(*s);
+				bool to_draw = false;	//Can be false for space or unsupported characters
+
+				auto o = m_offsets.find(offset);
+				if (o != m_offsets.end())
+				{
+					if (o->second.second > 0)
+					{
+						to_draw = true;
+						offsets.push_back(o->second.first);
+						counts.push_back(o->second.second);
+					}
+				}
+
+				if (to_draw)
+				{
+					//Generate a scale_offset pair for this entry
+					float offset_x = scale_x * (x + base_offset);
+					offset_x -= 1.f;
+
+					float offset_y = scale_y * y;
+					offset_y += 1.f;
+
+					shader_offsets.push_back(offset_x);
+					shader_offsets.push_back(offset_y);
+				}
+
+				base_offset += 9.f;
+				s++;
+			}
+
+			VkViewport vp{};
+			vp.width = static_cast<f32>(target_w);
+			vp.height = static_cast<f32>(target_h);
+			vp.minDepth = 0.f;
+			vp.maxDepth = 1.f;
+			vkCmdSetViewport(cmd, 0, 1, &vp);
+
+			VkRect2D vs = { {0, 0}, {0u+target_w, 0u+target_h} };
+			vkCmdSetScissor(cmd, 0, 1, &vs);
+
+			//TODO: Add drop shadow if deemed necessary for visibility
+			load_program(cmd, scale_x, scale_y, shader_offsets.data(), counts.size(), color);
+
+			const coordu viewport = { positionu{0u, 0u}, sizeu{target.width(), target.height() } };
+			vk::begin_renderpass(cmd, m_render_pass, target.value, viewport);
+
+			for (uint i = 0; i < counts.size(); ++i)
+			{
+				vkCmdDraw(cmd, counts[i], 1, offsets[i], i);
+			}
+		}
+
+		void reset_descriptors()
+		{
+			if (m_used_descriptors == 0)
+				return;
+
+			m_descriptor_pool.reset(0);
+			m_used_descriptors = 0;
+		}
+
+		void set_scale(double scale)
+		{
+			// Restrict scale to 2. The dots are gonna be too sparse otherwise.
+			m_scale = std::min(static_cast<f32>(scale), 2.0f);
+		}
+	};
+}
diff --git a/rpcs3/Emu/RSX/VK/VKTexture.cpp b/rpcs3/Emu/RSX/VK/VKTexture.cpp
index 23b76df52b..c0a047bd66 100644
--- a/rpcs3/Emu/RSX/VK/VKTexture.cpp
+++ b/rpcs3/Emu/RSX/VK/VKTexture.cpp
@@ -5,10 +5,10 @@
 #include "VKHelpers.h"
 #include "VKFormats.h"
 #include "VKRenderPass.h"
+#include "VKRenderTargets.h"
 
 #include "vkutils/data_heap.h"
 #include "vkutils/image_helpers.h"
-#include "VKGSRender.h"
 
 #include "../GCM.h"
 #include "../rsx_utils.h"
@@ -35,9 +35,13 @@ namespace vk
 
 	u64 calculate_working_buffer_size(u64 base_size, VkImageAspectFlags aspect)
 	{
-		if (aspect & (VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_DEPTH_BIT))
+		if (aspect & VK_IMAGE_ASPECT_STENCIL_BIT)
 		{
-			return (base_size * 3);
+			return (base_size * 9) / 4;
+		}
+		else if (aspect & VK_IMAGE_ASPECT_DEPTH_BIT)
+		{
+			return base_size * 2;
 		}
 		else
 		{
@@ -45,12 +49,7 @@ namespace vk
 		}
 	}
 
-	void copy_image_to_buffer(
-		const vk::command_buffer& cmd,
-		const vk::image* src,
-		const vk::buffer* dst,
-		const VkBufferImageCopy& region,
-		const image_readback_options_t& options)
+	void copy_image_to_buffer(VkCommandBuffer cmd, const vk::image* src, const vk::buffer* dst, const VkBufferImageCopy& region, bool swap_bytes)
 	{
 		// Always validate
 		ensure(src->current_layout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL || src->current_layout == VK_IMAGE_LAYOUT_GENERAL);
@@ -60,24 +59,12 @@ namespace vk
 			vk::end_renderpass(cmd);
 		}
 
-		ensure((region.imageExtent.width + region.imageOffset.x) <= src->width());
-		ensure((region.imageExtent.height + region.imageOffset.y) <= src->height());
-
 		switch (src->format())
 		{
 		default:
 		{
-			ensure(!options.swap_bytes); // "Implicit byteswap option not supported for speficied format"
+			ensure(!swap_bytes); // "Implicit byteswap option not supported for speficied format"
 			vkCmdCopyImageToBuffer(cmd, src->value, src->current_layout, dst->value, 1, &region);
-
-			if (options.sync_region)
-			{
-				// Post-Transfer barrier
-				vk::insert_buffer_memory_barrier(cmd, dst->value,
-					options.sync_region.offset, options.sync_region.length,
-					VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
-					VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
-			}
 			break;
 		}
 		case VK_FORMAT_D32_SFLOAT:
@@ -108,7 +95,7 @@ namespace vk
 				VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT);
 
 			// 3. Do conversion with byteswap [D32->D16F]
-			if (!options.swap_bytes) [[likely]]
+			if (!swap_bytes) [[likely]]
 			{
 				auto job = vk::get_compute_task<vk::cs_fconvert_task<f32, f16>>();
 				job->run(cmd, dst, z32_offset, packed32_length, data_offset);
@@ -119,18 +106,10 @@ namespace vk
 				job->run(cmd, dst, z32_offset, packed32_length, data_offset);
 			}
 
-			if (options.sync_region)
-			{
-				const u64 sync_end = options.sync_region.offset + options.sync_region.length;
-				const u64 write_end = region.bufferOffset + packed16_length;
-				const u64 sync_offset = std::min<u64>(region.bufferOffset, options.sync_region.offset);
-				const u64 sync_length = std::max<u64>(sync_end, write_end) - sync_offset;
-
-				// 4. Post-compute barrier
-				vk::insert_buffer_memory_barrier(cmd, dst->value, sync_offset, sync_length,
-					VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
-					VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
-			}
+			// 4. Post-compute barrier
+			vk::insert_buffer_memory_barrier(cmd, dst->value, region.bufferOffset, packed16_length,
+				VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
+				VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
 			break;
 		}
 		case VK_FORMAT_D24_UNORM_S8_UINT:
@@ -162,7 +141,7 @@ namespace vk
 
 			// 2. Interleave the separated data blocks with a compute job
 			vk::cs_interleave_task *job;
-			if (!options.swap_bytes) [[likely]]
+			if (!swap_bytes) [[likely]]
 			{
 				if (src->format() == VK_FORMAT_D24_UNORM_S8_UINT)
 				{
@@ -199,23 +178,15 @@ namespace vk
 
 			job->run(cmd, dst, data_offset, packed_length, z_offset, s_offset);
 
-			if (options.sync_region)
-			{
-				const u64 sync_end = options.sync_region.offset + options.sync_region.length;
-				const u64 write_end = region.bufferOffset + packed_length;
-				const u64 sync_offset = std::min<u64>(region.bufferOffset, options.sync_region.offset);
-				const u64 sync_length = std::max<u64>(sync_end, write_end) - sync_offset;
-
-				vk::insert_buffer_memory_barrier(cmd, dst->value, sync_offset, sync_length,
-					VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
-					VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
-			}
+			vk::insert_buffer_memory_barrier(cmd, dst->value, region.bufferOffset, packed_length,
+				VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
+				VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
 			break;
 		}
 		}
 	}
 
-	void copy_buffer_to_image(const vk::command_buffer& cmd, const vk::buffer* src, const vk::image* dst, const VkBufferImageCopy& region)
+	void copy_buffer_to_image(VkCommandBuffer cmd, const vk::buffer* src, const vk::image* dst, const VkBufferImageCopy& region)
 	{
 		// Always validate
 		ensure(dst->current_layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL || dst->current_layout == VK_IMAGE_LAYOUT_GENERAL);
@@ -285,7 +256,7 @@ namespace vk
 			const auto s_offset = utils::align<u32>(z_offset + in_depth_size, 256);
 
 			// Zero out the stencil block
-			vkCmdFillBuffer(cmd, src->value, s_offset, utils::align(in_stencil_size, 4), 0);
+			vkCmdFillBuffer(cmd, src->value, s_offset, in_stencil_size, 0);
 
 			vk::insert_buffer_memory_barrier(cmd, src->value, s_offset, in_stencil_size,
 				VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
@@ -332,7 +303,7 @@ namespace vk
 		{
 			if (src->format_class() == dst->format_class())
 			{
-				rsx_log.warning("[Performance warning] Image copy requested incorrectly for matching formats.");
+				rsx_log.error("[Performance warning] Image copy requested incorrectly for matching formats.");
 				copy_image(cmd, src, dst, src_rect, dst_rect, mipmaps, src_transfer_mask, dst_transfer_mask);
 				return;
 			}
@@ -376,23 +347,14 @@ namespace vk
 		const auto min_scratch_size = calculate_working_buffer_size(src_length, src->aspect() | dst->aspect());
 
 		// Initialize scratch memory
-		auto scratch_buf = vk::get_scratch_buffer(cmd, min_scratch_size);
+		auto scratch_buf = vk::get_scratch_buffer(min_scratch_size);
 
 		for (u32 mip_level = 0; mip_level < mipmaps; ++mip_level)
 		{
-			if (mip_level > 0)
-			{
-				// Technically never reached as this method only ever processes 1 mip
-				insert_buffer_memory_barrier(cmd, scratch_buf->value, 0, src_length,
-					VK_PIPELINE_STAGE_TRANSFER_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
-					VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_SHADER_READ_BIT, VK_ACCESS_TRANSFER_WRITE_BIT);
-			}
-
 			vk::copy_image_to_buffer(cmd, src, scratch_buf, src_copy);
 
 			auto src_convert = get_format_convert_flags(src->info.format);
 			auto dst_convert = get_format_convert_flags(dst->info.format);
-			bool require_rw_barrier = true;
 
 			if (src_convert.first || dst_convert.first)
 			{
@@ -403,8 +365,7 @@ namespace vk
 				}
 				else
 				{
-					insert_buffer_memory_barrier(cmd, scratch_buf->value, 0, src_length,
-						VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
+					insert_buffer_memory_barrier(cmd, scratch_buf->value, 0, src_length, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
 						VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT);
 
 					vk::cs_shuffle_base *shuffle_kernel = nullptr;
@@ -431,21 +392,11 @@ namespace vk
 
 					shuffle_kernel->run(cmd, scratch_buf, src_length);
 
-					insert_buffer_memory_barrier(cmd, scratch_buf->value, 0, src_length,
-						VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
+					insert_buffer_memory_barrier(cmd, scratch_buf->value, 0, src_length, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
 						VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
-
-					require_rw_barrier = false;
 				}
 			}
 
-			if (require_rw_barrier)
-			{
-				insert_buffer_memory_barrier(cmd, scratch_buf->value, 0, src_length,
-					VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
-					VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
-			}
-
 			vk::copy_buffer_to_image(cmd, scratch_buf, dst, dst_copy);
 
 			src_copy.imageSubresource.mipLevel++;
@@ -466,7 +417,7 @@ namespace vk
 			src->format() != dst->format())
 		{
 			// Copying between two depth formats must match exactly or crashes will happen
-			rsx_log.warning("[Performance warning] Image copy was requested incorrectly for mismatched depth formats");
+			rsx_log.error("[Performance warning] Image copy was requested incorrectly for mismatched depth formats");
 			copy_image_typeless(cmd, src, dst, src_rect, dst_rect, mipmaps);
 			return;
 		}
@@ -601,7 +552,7 @@ namespace vk
 					const auto dst_w = dst_rect.width();
 					const auto dst_h = dst_rect.height();
 
-					auto scratch_buf = vk::get_scratch_buffer(cmd, std::max(src_w, dst_w) * std::max(src_h, dst_h) * 4);
+					auto scratch_buf = vk::get_scratch_buffer(std::max(src_w, dst_w) * std::max(src_h, dst_h) * 4);
 
 					//1. Copy unscaled to typeless surface
 					VkBufferImageCopy info{};
@@ -665,7 +616,7 @@ namespace vk
 					else
 					{
 						// Ampere GPUs don't like the direct transfer hack above
-						stretch_image_typeless_safe(src, dst, typeless, src_rect, dst_rect, VK_IMAGE_ASPECT_DEPTH_BIT);
+						stretch_image_typeless_safe(src, dst, typeless, src_rect, dst_rect, VK_IMAGE_ASPECT_DEPTH_BIT, VK_IMAGE_ASPECT_DEPTH_BIT);
 					}
 					break;
 				}
@@ -673,21 +624,12 @@ namespace vk
 				{
 					auto typeless = vk::get_typeless_helper(VK_FORMAT_R32_SFLOAT, RSX_FORMAT_CLASS_COLOR, typeless_w, typeless_h);
 					change_image_layout(cmd, typeless, VK_IMAGE_LAYOUT_GENERAL);
-
-					if (use_unsafe_transport)
-					{
-						stretch_image_typeless_unsafe(src, dst, typeless, src_rect, dst_rect, VK_IMAGE_ASPECT_DEPTH_BIT);
-					}
-					else
-					{
-						stretch_image_typeless_safe(src, dst, typeless, src_rect, dst_rect, VK_IMAGE_ASPECT_DEPTH_BIT);
-					}
+					stretch_image_typeless_unsafe(src, dst, typeless, src_rect, dst_rect, VK_IMAGE_ASPECT_DEPTH_BIT);
 					break;
 				}
 				case VK_FORMAT_D24_UNORM_S8_UINT:
 				{
 					const VkImageAspectFlags depth_stencil = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT;
-
 					if (use_unsafe_transport)
 					{
 						auto typeless = vk::get_typeless_helper(VK_FORMAT_B8G8R8A8_UNORM, RSX_FORMAT_CLASS_COLOR, typeless_w, typeless_h);
@@ -770,7 +712,7 @@ namespace vk
 		}
 	}
 
-	static void gpu_deswizzle_sections_impl(const vk::command_buffer& cmd, vk::buffer* scratch_buf, u32 dst_offset, int word_size, int word_count, bool swap_bytes, std::vector<VkBufferImageCopy>& sections)
+	static void gpu_deswizzle_sections_impl(VkCommandBuffer cmd, vk::buffer* scratch_buf, u32 dst_offset, int word_size, int word_count, bool swap_bytes, std::vector<VkBufferImageCopy>& sections)
 	{
 		// NOTE: This has to be done individually for every LOD
 		vk::cs_deswizzle_base* job = nullptr;
@@ -866,27 +808,10 @@ namespace vk
 
 	static const vk::command_buffer& prepare_for_transfer(const vk::command_buffer& primary_cb, vk::image* dst_image, rsx::flags32_t& flags)
 	{
-		AsyncTaskScheduler* async_scheduler = (flags & image_upload_options::upload_contents_async)
-			? std::addressof(g_fxo->get<AsyncTaskScheduler>())
-			: nullptr;
-
-		if (async_scheduler && (dst_image->aspect() & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)))
-		{
-			auto pdev = vk::get_current_renderer();
-			if (pdev->get_graphics_queue_family() != pdev->get_transfer_queue_family()) [[ likely ]]
-			{
-				// According to spec, we cannot call vkCopyBufferToImage on a queue that does not support VK_QUEUE_GRAPHICS_BIT (VUID-vkCmdCopyBufferToImage-commandBuffer-07737)
-				// AMD doesn't care about this, but NVIDIA will crash if you try to cheat.
-				// We can just disable it for this case - it is actually very rare to upload depth-stencil stuff from CPU and RDB already uses inline uploads
-				flags &= ~image_upload_options::upload_contents_async;
-				async_scheduler = nullptr;
-			}
-		}
-
 		const vk::command_buffer* pcmd = nullptr;
-		if (async_scheduler)
+		if (flags & image_upload_options::upload_contents_async)
 		{
-			auto async_cmd = async_scheduler->get_current();
+			auto async_cmd = g_fxo->get<vk::async_scheduler_thread>().get_current();
 			async_cmd->begin();
 			pcmd = async_cmd;
 
@@ -894,20 +819,6 @@ namespace vk
 			{
 				flags |= image_upload_options::initialize_image_layout;
 			}
-
-			// Queue transfer stuff. Must release from primary if owned and acquire in secondary.
-			// Ignore queue transfers when running in the hacky "fast" mode. We're already violating spec there.
-			if (dst_image->current_layout != VK_IMAGE_LAYOUT_UNDEFINED && async_scheduler->is_host_mode())
-			{
-				// Release barrier
-				dst_image->queue_release(primary_cb, pcmd->get_queue_family(), dst_image->current_layout);
-
-				// Acquire barrier. This is not needed if we're going to be changing layouts later anyway (implicit acquire)
-				if (!(flags & image_upload_options::initialize_image_layout))
-				{
-					dst_image->queue_acquire(*pcmd, dst_image->current_layout);
-				}
-			}
 		}
 		else
 		{
@@ -923,13 +834,13 @@ namespace vk
 
 		if (flags & image_upload_options::initialize_image_layout)
 		{
-			dst_image->change_layout(*pcmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
+			dst_image->change_layout(*pcmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, pcmd->get_queue_family());
 		}
 
 		return *pcmd;
 	}
 
-	static const std::pair<u32, u32> calculate_upload_pitch(int format, u32 heap_align, vk::image* dst_image, const rsx::subresource_layout& layout, const rsx::texture_uploader_capabilities& caps)
+	static const std::pair<u32, u32> calculate_upload_pitch(int format, u32 heap_align, vk::image* dst_image, const rsx::subresource_layout& layout)
 	{
 		u32 block_in_pixel = rsx::get_format_block_size_in_texel(format);
 		u8  block_size_in_bytes = rsx::get_format_block_size_in_bytes(format);
@@ -950,7 +861,7 @@ namespace vk
 
 			// We have row_pitch in source coordinates. But some formats have a software decode step which can affect this packing!
 			// For such formats, the packed pitch on src does not match packed pitch on dst
-			if (!rsx::is_compressed_host_format(caps, format))
+			if (!rsx::is_compressed_host_format(format))
 			{
 				const auto host_texel_width = vk::get_format_texel_width(dst_image->format());
 				const auto host_packed_pitch = host_texel_width * layout.width_in_texel;
@@ -977,8 +888,7 @@ namespace vk
 		VkImageAspectFlags flags, vk::data_heap &upload_heap, u32 heap_align, rsx::flags32_t image_setup_flags)
 	{
 		const bool requires_depth_processing = (dst_image->aspect() & VK_IMAGE_ASPECT_STENCIL_BIT) || (format == CELL_GCM_TEXTURE_DEPTH16_FLOAT);
-		auto pdev = vk::get_current_renderer();
-		rsx::texture_uploader_capabilities caps{ .supports_dxt = pdev->get_texture_compression_bc_support(), .alignment = heap_align };
+		rsx::texture_uploader_capabilities caps{ .alignment = heap_align };
 		rsx::texture_memory_info opt{};
 		bool check_caps = true;
 
@@ -994,59 +904,32 @@ namespace vk
 		std::vector<std::pair<VkBuffer, u32>> upload_commands;
 		copy_regions.reserve(subresource_layout.size());
 
-		auto& cmd2 = prepare_for_transfer(cmd, dst_image, image_setup_flags);
-
 		for (const rsx::subresource_layout &layout : subresource_layout)
 		{
-			const auto [row_pitch, upload_pitch_in_texel] = calculate_upload_pitch(format, heap_align, dst_image, layout, caps);
+			const auto [row_pitch, upload_pitch_in_texel] = calculate_upload_pitch(format, heap_align, dst_image, layout);
 			caps.alignment = row_pitch;
 
 			// Calculate estimated memory utilization for this subresource
-			image_linear_size = row_pitch * layout.depth * (rsx::is_compressed_host_format(caps, format) ? layout.height_in_block : layout.height_in_texel);
+			image_linear_size = row_pitch * layout.height_in_block * layout.depth;
+
+			// Map with extra padding bytes in case of realignment
+			offset_in_upload_buffer = upload_heap.alloc<512>(image_linear_size + 8);
+			void* mapped_buffer = upload_heap.map(offset_in_upload_buffer, image_linear_size + 8);
 
 			// Only do GPU-side conversion if occupancy is good
 			if (check_caps)
 			{
-				caps.supports_byteswap = (image_linear_size >= 1024) || (image_setup_flags & source_is_gpu_resident);
+				caps.supports_byteswap = (image_linear_size >= 1024);
 				caps.supports_hw_deswizzle = caps.supports_byteswap;
 				caps.supports_zero_copy = caps.supports_byteswap;
 				caps.supports_vtc_decoding = false;
 				check_caps = false;
 			}
 
-			auto buf_allocator = [&](usz) -> std::tuple<void*, usz>
-			{
-				if (image_setup_flags & source_is_gpu_resident)
-				{
-					// We should never reach here, unless something is very wrong...
-					fmt::throw_exception("Cannot allocate CPU memory for GPU-only data");
-				}
-
-				// Map with extra padding bytes in case of realignment
-				offset_in_upload_buffer = upload_heap.alloc<512>(image_linear_size + 8);
-				void* mapped_buffer = upload_heap.map(offset_in_upload_buffer, image_linear_size + 8);
-				return { mapped_buffer, image_linear_size };
-			};
-
-			auto io_buf = rsx::io_buffer(buf_allocator);
-			opt = upload_texture_subresource(io_buf, layout, format, is_swizzled, caps);
+			std::span<std::byte> mapped{ static_cast<std::byte*>(mapped_buffer), image_linear_size };
+			opt = upload_texture_subresource(mapped, layout, format, is_swizzled, caps);
 			upload_heap.unmap();
 
-			if (image_setup_flags & source_is_gpu_resident)
-			{
-				// Read from GPU buf if the input is already uploaded.
-				auto [iobuf, io_offset] = layout.data.raw();
-				upload_buffer = static_cast<buffer*>(iobuf);
-				offset_in_upload_buffer = io_offset;
-				// Never upload. Data is already resident.
-				opt.require_upload = false;
-			}
-			else
-			{
-				// Read from upload buffer
-				upload_buffer = upload_heap.heap.get();
-			}
-
 			copy_regions.push_back({});
 			auto& copy_info = copy_regions.back();
 			copy_info.bufferOffset = offset_in_upload_buffer;
@@ -1059,6 +942,8 @@ namespace vk
 			copy_info.imageSubresource.mipLevel = layout.level;
 			copy_info.bufferRowLength = upload_pitch_in_texel;
 
+			upload_buffer = upload_heap.heap.get();
+
 			if (opt.require_upload)
 			{
 				ensure(!opt.deferred_cmds.empty());
@@ -1086,12 +971,6 @@ namespace vk
 				offset_in_upload_buffer = dma_mapping.first;
 				copy_info.bufferOffset = offset_in_upload_buffer;
 			}
-			else if (!layout.layer && !layout.level)
-			{
-				// Do not allow mixed transfer modes.
-				// This can happen in special cases, e.g mipN having different processing than mip0 as is the case with the last VTC mip
-				caps.supports_zero_copy = false;
-			}
 
 			if (opt.require_swap || opt.require_deswizzle || requires_depth_processing)
 			{
@@ -1111,10 +990,10 @@ namespace vk
 					{
 						// D-S aspect requires a load section that can fit a separated block => D(4) + S(1)
 						// Due to reverse processing of inputs, only enough space to fit one layer is needed here.
-						scratch_buf_size += (image_linear_size * 5) / 4;
+						scratch_buf_size += dst_image->width() * dst_image->height() * 5;
 					}
 
-					scratch_buf = vk::get_scratch_buffer(cmd2, scratch_buf_size);
+					scratch_buf = vk::get_scratch_buffer(scratch_buf_size);
 					buffer_copies.reserve(subresource_layout.size());
 				}
 
@@ -1136,7 +1015,7 @@ namespace vk
 						copy.size = copy_cmd.length;
 					}
 				}
-				else if (upload_buffer != scratch_buf || offset_in_upload_buffer != scratch_offset)
+				else
 				{
 					buffer_copies.push_back({});
 					auto& copy = buffer_copies.back();
@@ -1168,6 +1047,7 @@ namespace vk
 		}
 
 		ensure(upload_buffer);
+		auto& cmd2 = prepare_for_transfer(cmd, dst_image, image_setup_flags);
 
 		if (opt.require_swap || opt.require_deswizzle || requires_depth_processing)
 		{
@@ -1182,7 +1062,7 @@ namespace vk
 					range_ptr += op.second;
 				}
 			}
-			else if (!buffer_copies.empty())
+			else
 			{
 				vkCmdCopyBuffer(cmd2, upload_buffer->value, scratch_buf->value, static_cast<u32>(buffer_copies.size()), buffer_copies.data());
 			}
@@ -1233,83 +1113,6 @@ namespace vk
 		{
 			vkCmdCopyBufferToImage(cmd2, upload_buffer->value, dst_image->value, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, static_cast<u32>(copy_regions.size()), copy_regions.data());
 		}
-
-		if (cmd2.get_queue_family() != cmd.get_queue_family())
-		{
-			// Release from async chain, the primary chain will acquire later
-			dst_image->queue_release(cmd2, cmd.get_queue_family(), dst_image->current_layout);
-		}
-
-		if (auto rsxthr = static_cast<VKGSRender*>(rsx::get_current_renderer()))
-		{
-			rsxthr->on_guest_texture_read(cmd2);
-		}
-	}
-
-	std::pair<buffer*, u32> detile_memory_block(const vk::command_buffer& cmd, const rsx::GCM_tile_reference& tiled_region,
-		const utils::address_range32& range, u16 width, u16 height, u8 bpp)
-	{
-		// Calculate the true length of the usable memory section
-		const auto available_tile_size = tiled_region.tile->size - (range.start - tiled_region.base_address);
-		const auto max_content_size = tiled_region.tile->pitch * utils::align<u32>(height, 64);
-		const auto section_length = std::min(max_content_size, available_tile_size);
-
-		// Sync the DMA layer
-		const auto dma_mapping = vk::map_dma(range.start, section_length);
-		vk::load_dma(range.start, section_length);
-
-		// Allocate scratch and prepare for the GPU job
-		const auto scratch_buf = vk::get_scratch_buffer(cmd, section_length * 3); // 0 = linear data, 1 = padding (deswz), 2 = tiled data
-		const auto tiled_data_scratch_offset = section_length * 2;
-		const auto linear_data_scratch_offset = 0u;
-
-		// Schedule the job
-		const RSX_detiler_config config =
-		{
-			.tile_base_address = tiled_region.base_address,
-			.tile_base_offset = range.start - tiled_region.base_address,
-			.tile_rw_offset = range.start - tiled_region.base_address,   // TODO
-			.tile_size = tiled_region.tile->size,
-			.tile_pitch = tiled_region.tile->pitch,
-			.bank = tiled_region.tile->bank,
-
-			.dst = scratch_buf,
-			.dst_offset = linear_data_scratch_offset,
-			.src = scratch_buf,
-			.src_offset = section_length * 2,
-
-			.image_width = width,
-			.image_height = height,
-			.image_pitch = static_cast<u32>(width) * bpp,
-			.image_bpp = bpp
-		};
-
-		// Transfer
-		VkBufferCopy copy_rgn
-		{
-			.srcOffset = dma_mapping.first,
-			.dstOffset = tiled_data_scratch_offset,
-			.size = section_length
-		};
-		vkCmdCopyBuffer(cmd, dma_mapping.second->value, scratch_buf->value, 1, &copy_rgn);
-
-		// Barrier
-		vk::insert_buffer_memory_barrier(
-			cmd, scratch_buf->value, linear_data_scratch_offset, section_length,
-			VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
-			VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT);
-
-		// Detile
-		vk::get_compute_task<vk::cs_tile_memcpy<RSX_detiler_op::decode>>()->run(cmd, config);
-
-		// Barrier
-		vk::insert_buffer_memory_barrier(
-			cmd, scratch_buf->value, linear_data_scratch_offset, static_cast<u32>(width) * height * bpp,
-			VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
-			VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_TRANSFER_READ_BIT);
-
-		// Return a descriptor pointing to the decrypted data
-		return { scratch_buf, linear_data_scratch_offset };
 	}
 
 	void blitter::scale_image(vk::command_buffer& cmd, vk::image* src, vk::image* dst, areai src_area, areai dst_area, bool interpolate, const rsx::typeless_xfer& xfer_info)
diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.cpp b/rpcs3/Emu/RSX/VK/VKTextureCache.cpp
index fc1efb3533..c1b91f9ad4 100644
--- a/rpcs3/Emu/RSX/VK/VKTextureCache.cpp
+++ b/rpcs3/Emu/RSX/VK/VKTextureCache.cpp
@@ -1,68 +1,13 @@
 #include "stdafx.h"
-#include "Emu/RSX/VK/VKGSRenderTypes.hpp"
+#include "VKGSRender.h"
 #include "VKTextureCache.h"
 #include "VKCompute.h"
-#include "VKAsyncScheduler.h"
 
 #include "util/asm.hpp"
 
 namespace vk
 {
-	u64 hash_image_properties(VkFormat format, u16 w, u16 h, u16 d, u16 mipmaps, VkImageType type, VkImageCreateFlags create_flags, VkSharingMode sharing_mode)
-	{
-		/**
-		* Key layout:
-		* 00-08: Format  (Max 255)
-		* 08-24: Width   (Max 64K)
-		* 24-40: Height  (Max 64K)
-		* 40-48: Depth   (Max 255)
-		* 48-54: Mipmaps (Max 63)   <- We have some room here, it is not possible to have more than 12 mip levels on PS3 and 16 on PC is pushing it.
-		* 54-56: Type    (Max 3)
-		* 56-57: Sharing (Max 1)    <- Boolean. Exclusive = 0, shared = 1
-		* 57-64: Flags   (Max 127)  <- We have some room here, we only care about a small subset of create flags.
-		*/
-		ensure(static_cast<u32>(format) < 0xFF);
-		return (static_cast<u64>(format) & 0xFF) |
-			(static_cast<u64>(w) << 8) |
-			(static_cast<u64>(h) << 24) |
-			(static_cast<u64>(d) << 40) |
-			(static_cast<u64>(mipmaps) << 48) |
-			(static_cast<u64>(type) << 54) |
-			(static_cast<u64>(sharing_mode) << 56) |
-			(static_cast<u64>(create_flags) << 57);
-	}
-
-	texture_cache::cached_image_reference_t::cached_image_reference_t(texture_cache* parent, std::unique_ptr<vk::viewable_image>& previous)
-	{
-		ensure(previous);
-
-		this->parent = parent;
-		this->data = std::move(previous);
-	}
-
-	texture_cache::cached_image_reference_t::~cached_image_reference_t()
-	{
-		// Erase layout information to force TOP_OF_PIPE transition next time.
-		data->current_layout = VK_IMAGE_LAYOUT_UNDEFINED;
-		data->current_queue_family = VK_QUEUE_FAMILY_IGNORED;
-
-		// Move this object to the cached image pool
-		const auto key = hash_image_properties(data->format(), data->width(), data->height(), data->depth(), data->mipmaps(), data->info.imageType, data->info.flags, data->info.sharingMode);
-		std::lock_guard lock(parent->m_cached_pool_lock);
-
-		if (!parent->m_cache_is_exiting)
-		{
-			parent->m_cached_memory_size += data->memory->size();
-			parent->m_cached_images.emplace_front(key, data);
-		}
-		else
-		{
-			// Destroy if the cache is closed. The GPU is done with this resource anyway.
-			data.reset();
-		}
-	}
-
-	void cached_texture_section::dma_transfer(vk::command_buffer& cmd, vk::image* src, const areai& src_area, const utils::address_range32& valid_range, u32 pitch)
+	void cached_texture_section::dma_transfer(vk::command_buffer& cmd, vk::image* src, const areai& src_area, const utils::address_range& valid_range, u32 pitch)
 	{
 		ensure(src->samples() == 1);
 
@@ -93,56 +38,21 @@ namespace vk
 		rsx_pitch = pitch;
 
 		const bool require_format_conversion = !!(src->aspect() & VK_IMAGE_ASPECT_STENCIL_BIT) || src->format() == VK_FORMAT_D32_SFLOAT;
-		const auto tiled_region = rsx::get_current_renderer()->get_tiled_memory_region(valid_range);
-		const bool require_tiling = !!tiled_region;
-		const bool require_gpu_transform = require_format_conversion || pack_unpack_swap_bytes || require_tiling;
-
-		auto dma_sync_region = valid_range;
-		dma_mapping_handle dma_mapping = { 0, nullptr };
-
-		auto dma_sync = [&dma_sync_region, &dma_mapping](bool load, bool force = false)
-		{
-			if (dma_mapping.second && !force)
-			{
-				return;
-			}
-
-			dma_mapping = vk::map_dma(dma_sync_region.start, dma_sync_region.length());
-			if (load)
-			{
-				vk::load_dma(dma_sync_region.start, dma_sync_region.length());
-			}
-		};
-
-		if (require_gpu_transform)
+		if (require_format_conversion || pack_unpack_swap_bytes)
 		{
+			const auto section_length = valid_range.length();
 			const auto transfer_pitch = real_pitch;
 			const auto task_length = transfer_pitch * src_area.height();
-			auto working_buffer_length = calculate_working_buffer_size(task_length, src->aspect());
+			const auto working_buffer_length = calculate_working_buffer_size(task_length, src->aspect());
 
-#if !DEBUG_DMA_TILING
-			if (require_tiling)
-			{
-				// Safety padding
-				working_buffer_length += tiled_region.tile->size;
-
-				// Calculate actual working section for the memory op
-				dma_sync_region = tiled_region.tile_align(dma_sync_region);
-			}
-#endif
-
-			auto working_buffer = vk::get_scratch_buffer(cmd, working_buffer_length);
-			u32 result_offset = 0;
+			auto working_buffer = vk::get_scratch_buffer(working_buffer_length);
+			auto final_mapping = vk::map_dma(valid_range.start, section_length);
 
 			VkBufferImageCopy region = {};
 			region.imageSubresource = { src->aspect(), 0, 0, 1 };
 			region.imageOffset = { src_area.x1, src_area.y1, 0 };
 			region.imageExtent = { transfer_width, transfer_height, 1 };
-
-			bool require_rw_barrier = true;
-			image_readback_options_t xfer_options{};
-			xfer_options.swap_bytes = require_format_conversion && pack_unpack_swap_bytes;
-			vk::copy_image_to_buffer(cmd, src, working_buffer, region, xfer_options);
+			vk::copy_image_to_buffer(cmd, src, working_buffer, region, (require_format_conversion && pack_unpack_swap_bytes));
 
 			// NOTE: For depth/stencil formats, copying to buffer and byteswap are combined into one step above
 			if (pack_unpack_swap_bytes && !require_format_conversion)
@@ -168,145 +78,39 @@ namespace vk
 				if (shuffle_kernel)
 				{
 					vk::insert_buffer_memory_barrier(cmd, working_buffer->value, 0, task_length,
-						VK_PIPELINE_STAGE_TRANSFER_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
-						VK_ACCESS_TRANSFER_WRITE_BIT | VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT);
+						VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
+						VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT);
 
 					shuffle_kernel->run(cmd, working_buffer, task_length);
 
-					if (!require_tiling)
-					{
-						vk::insert_buffer_memory_barrier(cmd, working_buffer->value, 0, task_length,
-							VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
-							VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
-
-						require_rw_barrier = false;
-					}
+					vk::insert_buffer_memory_barrier(cmd, working_buffer->value, 0, task_length,
+						VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
+						VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
 				}
 			}
 
-			if (require_tiling)
-			{
-#if !DEBUG_DMA_TILING
-				// Compute -> Compute barrier
-				vk::insert_buffer_memory_barrier(cmd, working_buffer->value, 0, task_length,
-					VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
-					VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT);
-
-				// We don't need to calibrate write if two conditions are met:
-				// 1. The start offset of our 2D region is a multiple of 64 lines
-				// 2. We use the whole pitch.
-				// If these conditions are not met, we need to upload the entire tile (or at least the affected tiles wholly)
-
-				// FIXME: There is a 3rd condition - write onto already-persisted range. e.g One transfer copies half the image then the other half is copied later.
-				// We don't need to load again for the second copy in that scenario.
-
-				if (valid_range.start != dma_sync_region.start || real_pitch != tiled_region.tile->pitch)
-				{
-					// Tile indices run to the end of the row (full pitch).
-					// Tiles address outside their 64x64 area too, so we need to actually load the whole thing and "fill in" missing blocks.
-					// Visualizing "hot" pixels when doing a partial copy is very revealing, there's lots of data from the padding areas to be filled in.
-
-					dma_sync(true);
-					ensure(dma_mapping.second);
-
-					// Upload memory to the working buffer
-					const auto dst_offset = task_length; // Append to the end of the input
-					VkBufferCopy mem_load{};
-					mem_load.srcOffset = dma_mapping.first;
-					mem_load.dstOffset = dst_offset;
-					mem_load.size = dma_sync_region.length();
-					vkCmdCopyBuffer(cmd, dma_mapping.second->value, working_buffer->value, 1, &mem_load);
-
-					// Transfer -> Compute barrier
-					vk::insert_buffer_memory_barrier(cmd, working_buffer->value, dst_offset, dma_sync_region.length(),
-						VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
-						VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_SHADER_WRITE_BIT);
-				}
-
-				// Prepare payload
-				const RSX_detiler_config config =
-				{
-					.tile_base_address = tiled_region.base_address,
-					.tile_base_offset = valid_range.start - tiled_region.base_address,
-					.tile_rw_offset = dma_sync_region.start - tiled_region.base_address,
-					.tile_size = tiled_region.tile->size,
-					.tile_pitch = tiled_region.tile->pitch,
-					.bank = tiled_region.tile->bank,
-
-					.dst = working_buffer,
-					.dst_offset = task_length,
-					.src = working_buffer,
-					.src_offset = 0,
-
-					// TODO: Check interaction with anti-aliasing
-					.image_width = static_cast<u16>(transfer_width),
-					.image_height = static_cast<u16>(transfer_height),
-					.image_pitch = real_pitch,
-					.image_bpp = context == rsx::texture_upload_context::dma ? internal_bpp : rsx::get_format_block_size_in_bytes(gcm_format)
-				};
-
-				// Execute
-				const auto job = vk::get_compute_task<vk::cs_tile_memcpy<RSX_detiler_op::encode>>();
-				job->run(cmd, config);
-
-				// Update internal variables
-				result_offset = task_length;
-				real_pitch = tiled_region.tile->pitch; // We're always copying the full image. In case of partials we're "filling in" blocks, not doing partial 2D copies.
-				require_rw_barrier = true;
-
-#if VISUALIZE_GPU_TILING
-				if (g_cfg.video.renderdoc_compatiblity)
-				{
-					vk::insert_buffer_memory_barrier(cmd, working_buffer->value, result_offset, working_buffer_length,
-						VK_PIPELINE_STAGE_TRANSFER_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
-						VK_ACCESS_TRANSFER_WRITE_BIT | VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT);
-
-					// Debug write
-					auto scratch_img = vk::get_typeless_helper(VK_FORMAT_B8G8R8A8_UNORM, RSX_FORMAT_CLASS_COLOR, tiled_region.tile->pitch / 4, 768);
-					scratch_img->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
-
-					VkBufferImageCopy dbg_copy{};
-					dbg_copy.bufferOffset = config.dst_offset;
-					dbg_copy.imageExtent.width = width;
-					dbg_copy.imageExtent.height = height;
-					dbg_copy.imageExtent.depth = 1;
-					dbg_copy.bufferRowLength = tiled_region.tile->pitch / 4;
-					dbg_copy.imageSubresource = { .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, .mipLevel = 0, .baseArrayLayer = 0, .layerCount = 1 };
-					vk::copy_buffer_to_image(cmd, working_buffer, scratch_img, dbg_copy);
-
-					scratch_img->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
-				}
-#endif
-
-#endif
-			}
-
-			if (require_rw_barrier)
-			{
-				vk::insert_buffer_memory_barrier(cmd, working_buffer->value, result_offset, dma_sync_region.length(),
-					VK_PIPELINE_STAGE_TRANSFER_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
-					VK_ACCESS_TRANSFER_WRITE_BIT | VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT);
-			}
-
 			if (rsx_pitch == real_pitch) [[likely]]
 			{
-				dma_sync(false);
-
 				VkBufferCopy copy = {};
-				copy.srcOffset = result_offset;
-				copy.dstOffset = dma_mapping.first;
-				copy.size = dma_sync_region.length();
-				vkCmdCopyBuffer(cmd, working_buffer->value, dma_mapping.second->value, 1, &copy);
+				copy.dstOffset = final_mapping.first;
+				copy.size = section_length;
+				vkCmdCopyBuffer(cmd, working_buffer->value, final_mapping.second->value, 1, &copy);
 			}
 			else
 			{
-				dma_sync(true);
+				if (context != rsx::texture_upload_context::dma)
+				{
+					// Partial load for the bits outside the existing image
+					// NOTE: A true DMA section would have been prepped beforehand
+					// TODO: Parial range load/flush
+					vk::load_dma(valid_range.start, section_length);
+				}
 
 				std::vector<VkBufferCopy> copy;
 				copy.reserve(transfer_height);
 
-				u32 dst_offset = dma_mapping.first;
-				u32 src_offset = result_offset;
+				u32 dst_offset = final_mapping.first;
+				u32 src_offset = 0;
 
 				for (unsigned row = 0; row < transfer_height; ++row)
 				{
@@ -315,45 +119,27 @@ namespace vk
 					dst_offset += rsx_pitch;
 				}
 
-				vkCmdCopyBuffer(cmd, working_buffer->value, dma_mapping.second->value, transfer_height, copy.data());
+				vkCmdCopyBuffer(cmd, working_buffer->value, final_mapping.second->value, transfer_height, copy.data());
 			}
 		}
 		else
 		{
-			dma_sync(false);
-
 			VkBufferImageCopy region = {};
 			region.bufferRowLength = (rsx_pitch / internal_bpp);
 			region.imageSubresource = { src->aspect(), 0, 0, 1 };
 			region.imageOffset = { src_area.x1, src_area.y1, 0 };
 			region.imageExtent = { transfer_width, transfer_height, 1 };
 
-			region.bufferOffset = dma_mapping.first;
-			vkCmdCopyImageToBuffer(cmd, src->value, src->current_layout, dma_mapping.second->value, 1, &region);
+			auto mapping = vk::map_dma(valid_range.start, valid_range.length());
+			region.bufferOffset = mapping.first;
+			vkCmdCopyImageToBuffer(cmd, src->value, src->current_layout, mapping.second->value, 1, &region);
 		}
 
 		src->pop_layout(cmd);
 
-		VkBufferMemoryBarrier2KHR mem_barrier =
-		{
-			.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2_KHR,
-			.srcStageMask = VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR,      // Finish all transfer...
-			.srcAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR,
-			.dstStageMask = VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR,  // ...before proceeding with any command
-			.dstAccessMask = 0,
-			.buffer = dma_mapping.second->value,
-			.offset = dma_mapping.first,
-			.size = valid_range.length()
-		};
-
 		// Create event object for this transfer and queue signal op
-		dma_fence = std::make_unique<vk::event>(*m_device, sync_domain::host);
-		dma_fence->signal(cmd,
-		{
-			.sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO,
-			.bufferMemoryBarrierCount = 1,
-			.pBufferMemoryBarriers = &mem_barrier
-		});
+		dma_fence = std::make_unique<vk::event>(*m_device, sync_domain::any);
+		dma_fence->signal(cmd, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_TRANSFER_WRITE_BIT);
 
 		// Set cb flag for queued dma operations
 		cmd.set_flag(vk::command_buffer::cb_has_dma_transfer);
@@ -374,28 +160,23 @@ namespace vk
 		}
 
 		synchronized = true;
-		sync_timestamp = rsx::get_shared_tag();
+		sync_timestamp = get_system_time();
 	}
 
 	void texture_cache::on_section_destroyed(cached_texture_section& tex)
 	{
-		if (tex.is_managed() && tex.exists())
+		if (tex.is_managed())
 		{
-			auto disposable = vk::disposable_t::make(new cached_image_reference_t(this, tex.get_texture()));
-			vk::get_resource_manager()->dispose(disposable);
+			vk::get_resource_manager()->dispose(tex.get_texture());
 		}
 	}
 
 	void texture_cache::clear()
 	{
-		{
-			std::lock_guard lock(m_cached_pool_lock);
-			m_cache_is_exiting = true;
-		}
 		baseclass::clear();
 
-		m_cached_images.clear();
-		m_cached_memory_size = 0;
+		m_temporary_storage.clear();
+		m_temporary_memory_size = 0;
 	}
 
 	void texture_cache::copy_transfer_regions_impl(vk::command_buffer& cmd, vk::image* dst, const std::vector<copy_region_descriptor>& sections_to_transfer) const
@@ -406,32 +187,7 @@ namespace vk
 		for (const auto& section : sections_to_transfer)
 		{
 			if (!section.src)
-			{
 				continue;
-			}
-
-			// Generates a region to write data to the final destination
-			const auto get_output_region = [&](s32 in_x, s32 in_y, u32 w, u32 h, vk::image* data_src)
-			{
-				VkImageCopy copy_rgn = {
-					.srcSubresource = { data_src->aspect(), 0, 0, 1},
-					.srcOffset = { in_x, in_y, 0 },
-					.dstSubresource = { dst_aspect, section.level, 0, 1 },
-					.dstOffset = { section.dst_x, section.dst_y, 0 },
-					.extent = { w, h, 1 }
-				};
-
-				if (dst->info.imageType == VK_IMAGE_TYPE_3D)
-				{
-					copy_rgn.dstOffset.z = section.dst_z;
-				}
-				else
-				{
-					copy_rgn.dstSubresource.baseArrayLayer = section.dst_z;
-				}
-
-				return copy_rgn;
-			};
 
 			const bool typeless = section.src->aspect() != dst_aspect ||
 				!formats_are_bitcast_compatible(dst, section.src);
@@ -488,55 +244,129 @@ namespace vk
 				src_image->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
 
 				const areai src_rect = coordi{{ src_x, src_y }, { src_w, src_h }};
-				const areai dst_rect = coordi{{ 0, 0 }, { convert_w, src_h }};
+				const areai dst_rect = coordi{{ convert_x, src_y }, { convert_w, src_h }};
 				vk::copy_image_typeless(cmd, section.src, src_image, src_rect, dst_rect, 1);
 				src_image->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
 
-				src_x = 0;
-				src_y = 0;
+				src_x = convert_x;
 				src_w = convert_w;
 			}
 
 			ensure(src_image->current_layout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL || src_image->current_layout == VK_IMAGE_LAYOUT_GENERAL);
-			ensure(transform == rsx::surface_transform::identity);
 
-			if (src_w == section.dst_w && src_h == section.dst_h) [[likely]]
+			// Final aspect mask of the 'final' transfer source
+			const auto new_src_aspect = src_image->aspect();
+
+			if (src_w == section.dst_w && src_h == section.dst_h && transform == rsx::surface_transform::identity) [[likely]]
 			{
-				const auto copy_rgn = get_output_region(src_x, src_y, src_w, src_h, src_image);
+				VkImageCopy copy_rgn;
+				copy_rgn.srcOffset = { src_x, src_y, 0 };
+				copy_rgn.dstOffset = { section.dst_x, section.dst_y, 0 };
+				copy_rgn.dstSubresource = { dst_aspect, 0, 0, 1 };
+				copy_rgn.srcSubresource = { new_src_aspect, 0, 0, 1 };
+				copy_rgn.extent = { src_w, src_h, 1 };
+
+				if (dst->info.imageType == VK_IMAGE_TYPE_3D)
+				{
+					copy_rgn.dstOffset.z = section.dst_z;
+				}
+				else
+				{
+					copy_rgn.dstSubresource.baseArrayLayer = section.dst_z;
+					copy_rgn.dstSubresource.mipLevel = section.level;
+				}
+
 				vkCmdCopyImage(cmd, src_image->value, src_image->current_layout, dst->value, dst->current_layout, 1, &copy_rgn);
 			}
 			else
 			{
-				u16 dst_x = section.dst_x, dst_y = section.dst_y;
-				vk::image* _dst = dst;
+				ensure(section.dst_z == 0);
 
-				if (src_image->info.format != dst->info.format || section.level != 0 || section.dst_z != 0) [[ unlikely ]]
+				u16 dst_x = section.dst_x, dst_y = section.dst_y;
+				vk::image* _dst;
+
+				if (src_image->info.format == dst->info.format && section.level == 0) [[likely]]
 				{
-					// Either a bitcast is required or a scale+copy to mipmap level / layer
-					const u32 requested_width = dst->width();
-					const u32 requested_height = src_y + src_h + section.dst_h; // Accounts for possible typeless ref on the same helper on src
-					_dst = vk::get_typeless_helper(src_image->format(), src_image->format_class(), requested_width, requested_height);
+					_dst = dst;
+				}
+				else
+				{
+					// Either a bitcast is required or a scale+copy to mipmap level
+					_dst = vk::get_typeless_helper(src_image->format(), src_image->format_class(), dst->width(), dst->height() * 2);
 					_dst->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
 				}
 
-				if (_dst != dst)
+				if (transform == rsx::surface_transform::identity)
 				{
-					// We place the output after the source to account for the initial typeless-xfer if applicable
-					// If src_image == _dst then this is just a write-to-self. Either way, use best-fit placement.
-					dst_x = 0;
-					dst_y = src_y + src_h;
+					vk::copy_scaled_image(cmd, src_image, _dst,
+						coordi{ { src_x, src_y }, { src_w, src_h } },
+						coordi{ { section.dst_x, section.dst_y }, { section.dst_w, section.dst_h } },
+						1, src_image->format() == _dst->format(),
+						VK_FILTER_NEAREST);
 				}
+				else if (transform == rsx::surface_transform::argb_to_bgra)
+				{
+					VkBufferImageCopy copy{};
+					copy.imageExtent = { src_w, src_h, 1 };
+					copy.imageOffset = { src_x, src_y, 0 };
+					copy.imageSubresource = { src_image->aspect(), 0, 0, 1 };
 
-				vk::copy_scaled_image(cmd, src_image, _dst,
-					coordi{ { src_x, src_y }, { src_w, src_h } },
-					coordi{ { dst_x, dst_y }, { section.dst_w, section.dst_h } },
-					1, src_image->format() == _dst->format(),
-					VK_FILTER_NEAREST);
+					const auto mem_length = src_w * src_h * dst_bpp;
+					auto scratch_buf = vk::get_scratch_buffer(mem_length);
+					vkCmdCopyImageToBuffer(cmd, src_image->value, src_image->current_layout, scratch_buf->value, 1, &copy);
+
+					vk::insert_buffer_memory_barrier(cmd, scratch_buf->value, 0, mem_length, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
+						VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT);
+
+					auto shuffle_kernel = vk::get_compute_task<vk::cs_shuffle_32>();
+					shuffle_kernel->run(cmd, scratch_buf, mem_length);
+
+					vk::insert_buffer_memory_barrier(cmd, scratch_buf->value, 0, mem_length, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
+						VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
+
+					auto tmp = vk::get_typeless_helper(src_image->format(), src_image->format_class(), section.dst_x + section.dst_w, section.dst_y + section.dst_h);
+					tmp->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
+
+					copy.imageOffset = { 0, 0, 0 };
+					vkCmdCopyBufferToImage(cmd, scratch_buf->value, tmp->value, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &copy);
+
+					dst_x = 0;
+					dst_y = 0;
+
+					if (src_w != section.dst_w || src_h != section.dst_h)
+					{
+						// Optionally scale if needed
+						if (tmp == _dst) [[unlikely]]
+						{
+							dst_y = src_h;
+						}
+
+						vk::copy_scaled_image(cmd, tmp, _dst,
+							areai{ 0, 0, src_w, static_cast<s32>(src_h) },
+							coordi{ { dst_x, dst_y }, { section.dst_w, section.dst_h } },
+							1, tmp->info.format == _dst->info.format,
+							VK_FILTER_NEAREST);
+					}
+					else
+					{
+						_dst = tmp;
+					}
+				}
+				else
+				{
+					fmt::throw_exception("Unreachable");
+				}
 
 				if (_dst != dst) [[unlikely]]
 				{
 					// Casting comes after the scaling!
-					const auto copy_rgn = get_output_region(dst_x, dst_y, section.dst_w, section.dst_h, _dst);
+					VkImageCopy copy_rgn;
+					copy_rgn.srcOffset = { s32(dst_x), s32(dst_y), 0 };
+					copy_rgn.dstOffset = { section.dst_x, section.dst_y, 0 };
+					copy_rgn.dstSubresource = { dst_aspect, section.level, 0, 1 };
+					copy_rgn.srcSubresource = { _dst->aspect(), 0, 0, 1 };
+					copy_rgn.extent = { section.dst_w, section.dst_h, 1 };
+
 					_dst->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
 					vkCmdCopyImage(cmd, _dst->value, _dst->current_layout, dst->value, dst->current_layout, 1, &copy_rgn);
 				}
@@ -619,45 +449,65 @@ namespace vk
 		return result;
 	}
 
-	std::unique_ptr<vk::viewable_image> texture_cache::find_cached_image(VkFormat format, u16 w, u16 h, u16 d, u16 mipmaps, VkImageType type, VkImageCreateFlags create_flags, VkImageUsageFlags usage, VkSharingMode sharing)
+	std::unique_ptr<vk::viewable_image> texture_cache::find_temporary_image(VkFormat format, u16 w, u16 h, u16 d, u8 mipmaps)
 	{
-		reader_lock lock(m_cached_pool_lock);
-
-		if (!m_cached_images.empty())
+		for (auto& e : m_temporary_storage)
 		{
-			const u64 desired_key = hash_image_properties(format, w, h, d, mipmaps, type, create_flags, sharing);
-			lock.upgrade();
-
-			for (auto it = m_cached_images.begin(); it != m_cached_images.end(); ++it)
+			if (e.can_reuse && e.matches(format, w, h, d, mipmaps, 0))
 			{
-				if (it->key == desired_key && (it->data->info.usage & usage) == usage)
-				{
-					auto ret = std::move(it->data);
-					m_cached_images.erase(it);
-					m_cached_memory_size -= ret->memory->size();
-					return ret;
-				}
+				m_temporary_memory_size -= e.block_size;
+				e.block_size = 0;
+				e.can_reuse = false;
+				return std::move(e.combined_image);
 			}
 		}
 
 		return {};
 	}
 
-	std::unique_ptr<vk::viewable_image> texture_cache::create_temporary_subresource_storage(
-		rsx::format_class format_class, VkFormat format,
-		u16 width, u16 height, u16 depth, u16 layers, u8 mips,
-		VkImageType image_type, VkFlags image_flags, VkFlags usage_flags)
+	std::unique_ptr<vk::viewable_image> texture_cache::find_temporary_cubemap(VkFormat format, u16 size)
 	{
-		auto image = find_cached_image(format, width, height, depth, mips, image_type, image_flags, usage_flags, VK_SHARING_MODE_EXCLUSIVE);
+		for (auto& e : m_temporary_storage)
+		{
+			if (e.can_reuse && e.matches(format, size, size, 1, 1, VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT))
+			{
+				m_temporary_memory_size -= e.block_size;
+				e.block_size = 0;
+				e.can_reuse = false;
+				return std::move(e.combined_image);
+			}
+		}
+
+		return {};
+	}
+
+	vk::image_view* texture_cache::create_temporary_subresource_view_impl(vk::command_buffer& cmd, vk::image* source, VkImageType image_type, VkImageViewType view_type,
+		u32 gcm_format, u16 x, u16 y, u16 w, u16 h, u16 d, u8 mips, const rsx::texture_channel_remap_t& remap_vector, bool copy)
+	{
+		std::unique_ptr<vk::viewable_image> image;
+
+		VkImageCreateFlags image_flags = (view_type == VK_IMAGE_VIEW_TYPE_CUBE) ? VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT : 0;
+		VkFormat dst_format = vk::get_compatible_sampler_format(m_formats_support, gcm_format);
+		u16 layers = 1;
+
+		if (!image_flags) [[likely]]
+		{
+			image = find_temporary_image(dst_format, w, h, 1, mips);
+		}
+		else
+		{
+			image = find_temporary_cubemap(dst_format, w);
+			layers = 6;
+		}
 
 		if (!image)
 		{
 			image = std::make_unique<vk::viewable_image>(*vk::get_current_renderer(), m_memory_types.device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
 				image_type,
-				format,
-				width, height, depth, mips, layers, VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
-				VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, image_flags | VK_IMAGE_CREATE_ALLOW_NULL_RPCS3,
-				VMM_ALLOCATION_POOL_TEXTURE_CACHE, format_class);
+				dst_format,
+				w, h, d, mips, layers, VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
+				VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, image_flags | VK_IMAGE_CREATE_ALLOW_NULL,
+				VMM_ALLOCATION_POOL_TEXTURE_CACHE, rsx::classify_format(gcm_format));
 
 			if (!image->value)
 			{
@@ -666,32 +516,6 @@ namespace vk
 			}
 		}
 
-		return image;
-	}
-
-	void texture_cache::dispose_reusable_image(std::unique_ptr<vk::viewable_image>& image)
-	{
-		auto disposable = vk::disposable_t::make(new cached_image_reference_t(this, image));
-		vk::get_resource_manager()->dispose(disposable);
-	}
-
-	vk::image_view* texture_cache::create_temporary_subresource_view_impl(vk::command_buffer& cmd, vk::image* source, VkImageType image_type, VkImageViewType view_type,
-		u32 gcm_format, u16 x, u16 y, u16 w, u16 h, u16 d, u8 mips, const rsx::texture_channel_remap_t& remap_vector, bool copy)
-	{
-		const VkImageCreateFlags image_flags = (view_type == VK_IMAGE_VIEW_TYPE_CUBE) ? VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT : 0;
-		const VkImageUsageFlags usage_flags = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
-		const VkFormat dst_format = vk::get_compatible_sampler_format(m_formats_support, gcm_format);
-		const u16 layers = (view_type == VK_IMAGE_VIEW_TYPE_CUBE) ? 6 : 1;
-
-		// Provision
-		auto image = create_temporary_subresource_storage(rsx::classify_format(gcm_format), dst_format, w, h, d, layers, mips, image_type, image_flags, usage_flags);
-
-		// OOM?
-		if (!image)
-		{
-			return nullptr;
-		}
-
 		// This method is almost exclusively used to work on framebuffer resources
 		// Keep the original swizzle layout unless there is data format conversion
 		VkComponentMapping view_swizzle;
@@ -708,22 +532,18 @@ namespace vk
 			view_swizzle = source->native_component_map;
 		}
 
-		image->set_debug_name("Temp view");
 		image->set_native_component_layout(view_swizzle);
-		auto view = image->get_view(remap_vector);
+		auto view = image->get_view(rsx::get_remap_encoding(remap_vector), remap_vector);
 
 		if (copy)
 		{
 			std::vector<copy_region_descriptor> region =
 			{ {
-				.src = source,
-				.xform = rsx::surface_transform::coordinate_transform,
-				.src_x = x,
-				.src_y = y,
-				.src_w = w,
-				.src_h = h,
-				.dst_w = w,
-				.dst_h = h
+				source,
+				rsx::surface_transform::coordinate_transform,
+				0,
+				x, y, 0, 0, 0,
+				w, h, w, h
 			} };
 
 			vk::change_image_layout(cmd, image.get(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
@@ -731,8 +551,11 @@ namespace vk
 			vk::change_image_layout(cmd, image.get(), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
 		}
 
-		// TODO: Floating reference. We can do better with some restructuring.
-		image.release();
+		const u32 resource_memory = w * h * 4; //Rough approximate
+		m_temporary_storage.emplace_back(image);
+		m_temporary_storage.back().block_size = resource_memory;
+		m_temporary_memory_size += resource_memory;
+
 		return view;
 	}
 
@@ -837,18 +660,15 @@ namespace vk
 		VkImageSubresourceRange dst_range = { dst_aspect, 0, 1, 0, 1 };
 		vk::change_image_layout(cmd, image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_range);
 
-		if (sections_to_copy[0].dst_w != width || sections_to_copy[0].dst_h != height)
+		if (!(dst_aspect & VK_IMAGE_ASPECT_DEPTH_BIT))
 		{
-			if (!(dst_aspect & VK_IMAGE_ASPECT_DEPTH_BIT))
-			{
-				VkClearColorValue clear = {};
-				vkCmdClearColorImage(cmd, image->value, image->current_layout, &clear, 1, &dst_range);
-			}
-			else
-			{
-				VkClearDepthStencilValue clear = { 1.f, 0 };
-				vkCmdClearDepthStencilImage(cmd, image->value, image->current_layout, &clear, 1, &dst_range);
-			}
+			VkClearColorValue clear = {};
+			vkCmdClearColorImage(cmd, image->value, image->current_layout, &clear, 1, &dst_range);
+		}
+		else
+		{
+			VkClearDepthStencilValue clear = { 1.f, 0 };
+			vkCmdClearDepthStencilImage(cmd, image->value, image->current_layout, &clear, 1, &dst_range);
 		}
 
 		copy_transfer_regions_impl(cmd, image, sections_to_copy);
@@ -895,24 +715,26 @@ namespace vk
 
 	void texture_cache::release_temporary_subresource(vk::image_view* view)
 	{
-		auto resource = dynamic_cast<vk::viewable_image*>(view->image());
-		ensure(resource);
-
-		auto image = std::unique_ptr<vk::viewable_image>(resource);
-		auto disposable = vk::disposable_t::make(new cached_image_reference_t(this, image));
-		vk::get_resource_manager()->dispose(disposable);
+		auto handle = dynamic_cast<vk::viewable_image*>(view->image());
+		for (auto& e : m_temporary_storage)
+		{
+			if (e.combined_image.get() == handle)
+			{
+				e.can_reuse = true;
+				return;
+			}
+		}
 	}
 
 	void texture_cache::update_image_contents(vk::command_buffer& cmd, vk::image_view* dst_view, vk::image* src, u16 width, u16 height)
 	{
 		std::vector<copy_region_descriptor> region =
 		{ {
-			.src = src,
-			.xform = rsx::surface_transform::identity,
-			.src_w = width,
-			.src_h = height,
-			.dst_w = width,
-			.dst_h = height
+			src,
+			rsx::surface_transform::identity,
+			0,
+			0, 0, 0, 0, 0,
+			width, height, width, height
 		} };
 
 		auto dst = dst_view->image();
@@ -921,7 +743,7 @@ namespace vk
 		dst->pop_layout(cmd);
 	}
 
-	cached_texture_section* texture_cache::create_new_texture(vk::command_buffer& cmd, const utils::address_range32& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u32 pitch,
+	cached_texture_section* texture_cache::create_new_texture(vk::command_buffer& cmd, const utils::address_range& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch,
 		u32 gcm_format, rsx::texture_upload_context context, rsx::texture_dimension_extended type, bool swizzled, rsx::component_order swizzle_flags, rsx::flags32_t flags)
 	{
 		const auto section_depth = depth;
@@ -967,18 +789,7 @@ namespace vk
 		if (region.exists())
 		{
 			image = dynamic_cast<vk::viewable_image*>(region.get_raw_texture());
-			bool reusable = true;
-
-			if (flags & texture_create_flags::do_not_reuse)
-			{
-				reusable = false;
-			}
-			else if (flags & texture_create_flags::shareable)
-			{
-				reusable = (image && image->sharing_mode() == VK_SHARING_MODE_CONCURRENT);
-			}
-
-			if (!reusable || !image || region.get_image_type() != type || image->depth() != depth) // TODO
+			if (!image || region.get_image_type() != type || image->depth() != depth) // TODO
 			{
 				// Incompatible view/type
 				region.destroy();
@@ -1015,27 +826,13 @@ namespace vk
 		{
 			const bool is_cubemap = type == rsx::texture_dimension_extended::texture_dimension_cubemap;
 			const VkFormat vk_format = get_compatible_sampler_format(m_formats_support, gcm_format);
-			VkImageCreateFlags create_flags = is_cubemap ? VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT : 0;
-			VkSharingMode sharing_mode = (flags & texture_create_flags::shareable) ? VK_SHARING_MODE_CONCURRENT : VK_SHARING_MODE_EXCLUSIVE;
 
-			if (auto found = find_cached_image(vk_format, width, height, depth, mipmaps, image_type, create_flags, usage_flags, sharing_mode))
-			{
-				image = found.release();
-			}
-			else
-			{
-				if (sharing_mode == VK_SHARING_MODE_CONCURRENT)
-				{
-					create_flags |= VK_IMAGE_CREATE_SHAREABLE_RPCS3;
-				}
-
-				image = new vk::viewable_image(*m_device,
-					m_memory_types.device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
-					image_type, vk_format,
-					width, height, depth, mipmaps, layer, VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
-					VK_IMAGE_TILING_OPTIMAL, usage_flags, create_flags,
-					VMM_ALLOCATION_POOL_TEXTURE_CACHE, rsx::classify_format(gcm_format));
-			}
+			image = new vk::viewable_image(*m_device,
+				m_memory_types.device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+				image_type, vk_format,
+				width, height, depth, mipmaps, layer, VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
+				VK_IMAGE_TILING_OPTIMAL, usage_flags, is_cubemap ? VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT : 0,
+				VMM_ALLOCATION_POOL_TEXTURE_CACHE, rsx::classify_format(gcm_format));
 
 			// New section, we must prepare it
 			region.reset(rsx_range);
@@ -1074,23 +871,18 @@ namespace vk
 		return &region;
 	}
 
-	cached_texture_section* texture_cache::create_nul_section(
-		vk::command_buffer& /*cmd*/,
-		const utils::address_range32& rsx_range,
-		const rsx::image_section_attributes_t& attrs,
-		const rsx::GCM_tile_reference& tile,
-		bool memory_load)
+	cached_texture_section* texture_cache::create_nul_section(vk::command_buffer& /*cmd*/, const utils::address_range& rsx_range, bool memory_load)
 	{
 		auto& region = *find_cached_texture(rsx_range, { .gcm_format = RSX_GCM_FORMAT_IGNORED }, true, false, false);
 		ensure(!region.is_locked());
 
 		// Prepare section
 		region.reset(rsx_range);
-		region.create_dma_only(attrs.width, attrs.height, attrs.pitch);
+		region.set_context(rsx::texture_upload_context::dma);
 		region.set_dirty(false);
 		region.set_unpack_swap_bytes(true);
 
-		if (memory_load && !tile) // Memory load on DMA tiles will always happen during the actual copy command
+		if (memory_load)
 		{
 			vk::map_dma(rsx_range.start, rsx_range.length());
 			vk::load_dma(rsx_range.start, rsx_range.length());
@@ -1101,7 +893,7 @@ namespace vk
 		return &region;
 	}
 
-	cached_texture_section* texture_cache::upload_image_from_cpu(vk::command_buffer& cmd, const utils::address_range32& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u32 pitch, u32 gcm_format,
+	cached_texture_section* texture_cache::upload_image_from_cpu(vk::command_buffer& cmd, const utils::address_range& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch, u32 gcm_format,
 		rsx::texture_upload_context context, const std::vector<rsx::subresource_layout>& subresource_layout, rsx::texture_dimension_extended type, bool swizzled)
 	{
 		if (context != rsx::texture_upload_context::shader_read)
@@ -1111,21 +903,8 @@ namespace vk
 				vk::end_renderpass(cmd);
 			}
 		}
-
-		const bool upload_async = rsx::get_current_renderer()->get_backend_config().supports_asynchronous_compute;
-		rsx::flags32_t create_flags = 0;
-
-		if (upload_async && g_fxo->get<AsyncTaskScheduler>().is_host_mode())
-		{
-			create_flags |= texture_create_flags::do_not_reuse;
-			if (m_device->get_graphics_queue() != m_device->get_transfer_queue())
-			{
-				create_flags |= texture_create_flags::shareable;
-			}
-		}
-
 		auto section = create_new_texture(cmd, rsx_range, width, height, depth, mipmaps, pitch, gcm_format, context, type, swizzled,
-			rsx::component_order::default_, create_flags);
+			rsx::component_order::default_, 0);
 
 		auto image = section->get_raw_texture();
 		image->set_debug_name(fmt::format("Raw Texture @0x%x", rsx_range.start));
@@ -1139,44 +918,12 @@ namespace vk
 			input_swizzled = false;
 		}
 
-		rsx::flags32_t upload_command_flags = initialize_image_layout | upload_contents_inline;
-		if (context == rsx::texture_upload_context::shader_read && upload_async)
-		{
-			upload_command_flags |= upload_contents_async;
-		}
-
-		std::vector<rsx::subresource_layout> tmp;
-		auto p_subresource_layout = &subresource_layout;
-		u32 heap_align = upload_heap_align_default;
-
-		if (auto tiled_region = rsx::get_current_renderer()->get_tiled_memory_region(rsx_range);
-			context == rsx::texture_upload_context::blit_engine_src && tiled_region)
-		{
-			if (mipmaps > 1)
-			{
-				// This really shouldn't happen on framebuffer tiled memory
-				rsx_log.error("Tiled decode of mipmapped textures is not supported.");
-			}
-			else
-			{
-				const auto bpp = rsx::get_format_block_size_in_bytes(gcm_format);
-				const auto [scratch_buf, linear_data_scratch_offset] = vk::detile_memory_block(cmd, tiled_region, rsx_range, width, height, bpp);
-
-				auto subres = subresource_layout.front();
-				// FIXME: !!EVIL!!
-				subres.data = { scratch_buf, linear_data_scratch_offset };
-				subres.pitch_in_block = width;
-				upload_command_flags |= source_is_gpu_resident;
-				heap_align = width * bpp;
-
-				tmp.push_back(subres);
-				p_subresource_layout = &tmp;
-			}
-		}
+		rsx::flags32_t upload_command_flags = initialize_image_layout |
+			(rsx::get_current_renderer()->get_backend_config().supports_asynchronous_compute ? upload_contents_async : upload_contents_inline);
 
 		const u16 layer_count = (type == rsx::texture_dimension_extended::texture_dimension_cubemap) ? 6 : 1;
-		vk::upload_image(cmd, image, *p_subresource_layout, gcm_format, input_swizzled, layer_count, image->aspect(),
-			*m_texture_upload_heap, heap_align, upload_command_flags);
+		vk::upload_image(cmd, image, subresource_layout, gcm_format, input_swizzled, layer_count, image->aspect(),
+			*m_texture_upload_heap, upload_heap_align_default, upload_command_flags);
 
 		vk::leave_uninterruptible();
 
@@ -1250,22 +997,16 @@ namespace vk
 		{
 		default:
 			//TODO
-			err_once("Format incompatibility detected, reporting failure to force data copy (VK_FORMAT=0x%X, GCM_FORMAT=0x%X)", static_cast<u32>(vk_format), gcm_format);
+			warn_once("Format incompatibility detected, reporting failure to force data copy (VK_FORMAT=0x%X, GCM_FORMAT=0x%X)", static_cast<u32>(vk_format), gcm_format);
 			return false;
-#ifndef __APPLE__
-		case CELL_GCM_TEXTURE_R5G6B5:
-			return (vk_format == VK_FORMAT_R5G6B5_UNORM_PACK16);
-#else
-		// R5G6B5 is not supported by Metal
-		case CELL_GCM_TEXTURE_R5G6B5:
-			return (vk_format == VK_FORMAT_B8G8R8A8_UNORM);
-#endif
 		case CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT:
 			return (vk_format == VK_FORMAT_R16G16B16A16_SFLOAT);
 		case CELL_GCM_TEXTURE_W32_Z32_Y32_X32_FLOAT:
 			return (vk_format == VK_FORMAT_R32G32B32A32_SFLOAT);
 		case CELL_GCM_TEXTURE_X32_FLOAT:
 			return (vk_format == VK_FORMAT_R32_SFLOAT);
+		case CELL_GCM_TEXTURE_R5G6B5:
+			return (vk_format == VK_FORMAT_R5G6B5_UNORM_PACK16);
 		case CELL_GCM_TEXTURE_A8R8G8B8:
 		case CELL_GCM_TEXTURE_D8R8G8B8:
 			return (vk_format == VK_FORMAT_B8G8R8A8_UNORM || vk_format == VK_FORMAT_D24_UNORM_S8_UINT || vk_format == VK_FORMAT_D32_SFLOAT_S8_UINT);
@@ -1307,36 +1048,12 @@ namespace vk
 		{
 			// Flush any pending async jobs in case of blockers
 			// TODO: Context-level manager should handle this logic
-			auto async_scheduler = g_fxo->try_get<AsyncTaskScheduler>();
-			vk::semaphore* async_sema = nullptr;
-
-			if (async_scheduler && async_scheduler->is_recording())
-			{
-				if (async_scheduler->is_host_mode())
-				{
-					async_sema = async_scheduler->get_sema();
-				}
-				else
-				{
-					vk::queue_submit_t submit_info{};
-					async_scheduler->flush(submit_info, VK_TRUE);
-				}
-			}
+			g_fxo->get<async_scheduler_thread>().flush(VK_TRUE);
 
 			// Primary access command queue, must restart it after
 			vk::fence submit_fence(*m_device);
-			vk::queue_submit_t submit_info{ m_submit_queue, &submit_fence };
+			cmd.submit(m_submit_queue, VK_NULL_HANDLE, VK_NULL_HANDLE, &submit_fence, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_TRUE);
 
-			if (async_sema)
-			{
-				vk::queue_submit_t submit_info2{};
-				submit_info2.queue_signal(*async_sema);
-				async_scheduler->flush(submit_info2, VK_TRUE);
-
-				submit_info.wait_on(*async_sema, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
-			}
-
-			cmd.submit(submit_info, VK_TRUE);
 			vk::wait_for_fence(&submit_fence, GENERAL_WAIT_TIMEOUT);
 
 			CHECK_RESULT(vkResetCommandBuffer(cmd, 0));
@@ -1345,8 +1062,7 @@ namespace vk
 		else
 		{
 			// Auxilliary command queue with auto-restart capability
-			vk::queue_submit_t submit_info{ m_submit_queue, nullptr };
-			cmd.submit(submit_info, VK_TRUE);
+			cmd.submit(m_submit_queue, VK_NULL_HANDLE, VK_NULL_HANDLE, VK_NULL_HANDLE, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_TRUE);
 		}
 
 		ensure(cmd.flags == 0);
@@ -1413,14 +1129,14 @@ namespace vk
 		auto any_released = baseclass::handle_memory_pressure(severity);
 
 		// TODO: This can cause invalidation of in-flight resources
-		if (severity <= rsx::problem_severity::low || !m_cached_memory_size)
+		if (severity <= rsx::problem_severity::low || !m_temporary_memory_size)
 		{
 			// Nothing left to do
 			return any_released;
 		}
 
 		constexpr u64 _1M = 0x100000;
-		if (severity <= rsx::problem_severity::moderate && m_cached_memory_size < (64 * _1M))
+		if (severity <= rsx::problem_severity::moderate && m_temporary_memory_size < (64 * _1M))
 		{
 			// Some memory is consumed by the temporary resources, but no need to panic just yet
 			return any_released;
@@ -1435,50 +1151,53 @@ namespace vk
 
 		// Nuke temporary resources. They will still be visible to the GPU.
 		auto gc = vk::get_resource_manager();
-		any_released |= !m_cached_images.empty();
-		for (auto& img : m_cached_images)
-		{
-			gc->dispose(img.data);
-		}
-		m_cached_images.clear();
-		m_cached_memory_size = 0;
+		u64 actual_released_memory = 0;
 
-		any_released |= !m_temporary_subresource_cache.empty();
-		for (auto& e : m_temporary_subresource_cache)
+		for (auto& entry : m_temporary_storage)
 		{
-			ensure(e.second.second);
-			release_temporary_subresource(e.second.second);
+			if (!entry.combined_image)
+			{
+				continue;
+			}
+
+			actual_released_memory += entry.combined_image->memory->size();
+			gc->dispose(entry.combined_image);
+			m_temporary_memory_size -= entry.block_size;
 		}
+
+		ensure(m_temporary_memory_size == 0);
+		m_temporary_storage.clear();
 		m_temporary_subresource_cache.clear();
 
-		return any_released;
+		rsx_log.warning("Texture cache released %lluM of temporary resources.", (actual_released_memory / _1M));
+		return any_released || (actual_released_memory > 0);
 	}
 
 	void texture_cache::on_frame_end()
 	{
 		trim_sections();
 
-		if (m_storage.m_unreleased_texture_objects >= m_max_zombie_objects)
+		if (m_storage.m_unreleased_texture_objects >= m_max_zombie_objects ||
+			m_temporary_memory_size > 0x4000000) //If already holding over 64M in discardable memory, be frugal with memory resources
 		{
 			purge_unreleased_sections();
 		}
 
-		if (m_cached_images.size() > max_cached_image_pool_size ||
-			m_cached_memory_size > 256 * 0x100000)
+		const u64 last_complete_frame = vk::get_last_completed_frame_id();
+		m_temporary_storage.remove_if([&](const temporary_storage& o)
 		{
-			std::lock_guard lock(m_cached_pool_lock);
-
-			const auto new_size = m_cached_images.size() / 2;
-			for (usz i = new_size; i < m_cached_images.size(); ++i)
+			if (!o.block_size || o.test(last_complete_frame))
 			{
-				m_cached_memory_size -= m_cached_images[i].data->memory->size();
+				m_temporary_memory_size -= o.block_size;
+				return true;
 			}
+			return false;
+		});
 
-			m_cached_images.resize(new_size);
-		}
+		m_temporary_subresource_cache.clear();
+		reset_frame_statistics();
 
 		baseclass::on_frame_end();
-		reset_frame_statistics();
 	}
 
 	vk::viewable_image* texture_cache::upload_image_simple(vk::command_buffer& cmd, VkFormat format, u32 address, u32 width, u32 height, u32 pitch)
@@ -1510,7 +1229,7 @@ namespace vk
 			format,
 			width, height, 1, 1, 1, VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_PREINITIALIZED,
 			VK_IMAGE_TILING_LINEAR, VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, 0,
-			VMM_ALLOCATION_POOL_SWAPCHAIN);
+			VMM_ALLOCATION_POOL_UNDEFINED);
 
 		VkImageSubresource subresource{};
 		subresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
@@ -1540,14 +1259,16 @@ namespace vk
 
 		vk::change_image_layout(cmd, image.get(), VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
 
-		// Fully dispose immediately. These immages aren't really reusable right now.
 		auto result = image.get();
-		vk::get_resource_manager()->dispose(image);
+		const u32 resource_memory = width * height * 4; //Rough approximate
+		m_temporary_storage.emplace_back(image);
+		m_temporary_storage.back().block_size = resource_memory;
+		m_temporary_memory_size += resource_memory;
 
 		return result;
 	}
 
-	bool texture_cache::blit(const rsx::blit_src_info& src, const rsx::blit_dst_info& dst, bool interpolate, vk::surface_cache& m_rtts, vk::command_buffer& cmd)
+	bool texture_cache::blit(rsx::blit_src_info& src, rsx::blit_dst_info& dst, bool interpolate, vk::surface_cache& m_rtts, vk::command_buffer& cmd)
 	{
 		blitter helper;
 		auto reply = upload_scaled_image(src, dst, interpolate, cmd, m_rtts, helper);
@@ -1567,13 +1288,12 @@ namespace vk
 
 	u32 texture_cache::get_unreleased_textures_count() const
 	{
-		return baseclass::get_unreleased_textures_count() + ::size32(m_cached_images);
+		return baseclass::get_unreleased_textures_count() + ::size32(m_temporary_storage);
 	}
 
-	u64 texture_cache::get_temporary_memory_in_use() const
+	u32 texture_cache::get_temporary_memory_in_use() const
 	{
-		// TODO: Technically incorrect, we should have separate metrics for cached evictable resources (this value) and temporary active resources.
-		return m_cached_memory_size;
+		return m_temporary_memory_size;
 	}
 
 	bool texture_cache::is_overallocated() const
@@ -1581,17 +1301,13 @@ namespace vk
 		const auto total_device_memory = m_device->get_memory_mapping().device_local_total_bytes / 0x100000;
 		u64 quota = 0;
 
-		if (total_device_memory >= 2048)
+		if (total_device_memory >= 1024)
 		{
 			quota = std::min<u64>(3072, (total_device_memory * 40) / 100);
 		}
-		else if (total_device_memory >= 1024)
-		{
-			quota = std::max<u64>(204, (total_device_memory * 30) / 100);
-		}
 		else if (total_device_memory >= 768)
 		{
-			quota = 192;
+			quota = 256;
 		}
 		else
 		{
diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h
index 8bbd131fe5..b9fa905272 100644
--- a/rpcs3/Emu/RSX/VK/VKTextureCache.h
+++ b/rpcs3/Emu/RSX/VK/VKTextureCache.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "VKAsyncScheduler.h"
 #include "VKDMA.h"
 #include "VKRenderTargets.h"
 #include "VKResourceManager.h"
@@ -7,7 +8,7 @@
 #include "vkutils/image_helpers.h"
 
 #include "../Common/texture_cache.h"
-#include "../Common/tiled_dma_copy.hpp"
+#include "Emu/Cell/timers.hpp"
 
 #include <memory>
 #include <vector>
@@ -27,7 +28,6 @@ namespace vk
 		using image_view_type         = vk::image_view*;
 		using image_storage_type      = vk::image;
 		using texture_format          = VkFormat;
-		using viewable_image_type     = vk::viewable_image*;
 	};
 
 	class cached_texture_section : public rsx::cached_texture_section<vk::cached_texture_section, vk::texture_cache_traits>
@@ -49,19 +49,6 @@ namespace vk
 		{
 			auto new_texture = static_cast<vk::viewable_image*>(image);
 			ensure(!exists() || !is_managed() || vram_texture == new_texture);
-
-			if (vram_texture != new_texture && !managed_texture && get_protection() == utils::protection::no)
-			{
-				// In-place image swap, still locked. Likely a color buffer that got rebound as depth buffer or vice-versa.
-				vk::as_rtt(vram_texture)->on_swap_out();
-
-				if (!managed)
-				{
-					// Incoming is also an external resource, reference it immediately
-					vk::as_rtt(image)->on_swap_in(is_locked());
-				}
-			}
-
 			vram_texture = new_texture;
 
 			ensure(rsx_pitch);
@@ -142,19 +129,19 @@ namespace vk
 			return !exists() || managed_texture;
 		}
 
-		vk::image_view* get_view(const rsx::texture_channel_remap_t& remap)
+		vk::image_view* get_view(u32 remap_encoding, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap)
 		{
 			ensure(vram_texture != nullptr);
-			return vram_texture->get_view(remap);
+			return vram_texture->get_view(remap_encoding, remap);
 		}
 
 		vk::image_view* get_raw_view()
 		{
 			ensure(vram_texture != nullptr);
-			return vram_texture->get_view(rsx::default_remap_vector);
+			return vram_texture->get_view(0xAAE4, rsx::default_remap_vector);
 		}
 
-		vk::viewable_image* get_raw_texture()
+		vk::image* get_raw_texture()
 		{
 			return managed_texture.get();
 		}
@@ -164,11 +151,6 @@ namespace vk
 			return managed_texture;
 		}
 
-		vk::render_target* get_render_target() const
-		{
-			return vk::as_rtt(vram_texture);
-		}
-
 		VkFormat get_format() const
 		{
 			if (context == rsx::texture_upload_context::dma)
@@ -186,7 +168,7 @@ namespace vk
 			return flushed;
 		}
 
-		void dma_transfer(vk::command_buffer& cmd, vk::image* src, const areai& src_area, const utils::address_range32& valid_range, u32 pitch);
+		void dma_transfer(vk::command_buffer& cmd, vk::image* src, const areai& src_area, const utils::address_range& valid_range, u32 pitch);
 
 		void copy_texture(vk::command_buffer& cmd, bool miss)
 		{
@@ -215,8 +197,8 @@ namespace vk
 			if (context == rsx::texture_upload_context::framebuffer_storage)
 			{
 				auto surface = vk::as_rtt(vram_texture);
-				surface->memory_barrier(cmd, rsx::surface_access::transfer_read);
-				locked_resource = surface->get_surface(rsx::surface_access::transfer_read);
+				surface->read_barrier(cmd);
+				locked_resource = surface->get_surface(rsx::surface_access::shader_read);
 				transfer_width *= surface->samples_x;
 				transfer_height *= surface->samples_y;
 			}
@@ -284,44 +266,13 @@ namespace vk
 
 			// Calculate smallest range to flush - for framebuffers, the raster region is enough
 			const auto range = (context == rsx::texture_upload_context::framebuffer_storage) ? get_section_range() : get_confirmed_range();
-			auto flush_length = range.length();
-
-			const auto tiled_region = rsx::get_current_renderer()->get_tiled_memory_region(range);
-			if (tiled_region)
-			{
-				const auto available_tile_size = tiled_region.tile->size - (range.start - tiled_region.base_address);
-				const auto max_content_size = tiled_region.tile->pitch * utils::align(height, 64);
-				flush_length = std::min(max_content_size, available_tile_size);
-			}
-
-			vk::flush_dma(range.start, flush_length);
-
-#if DEBUG_DMA_TILING
-			// Are we a tiled region?
-			if (const auto tiled_region = rsx::get_current_renderer()->get_tiled_memory_region(range))
-			{
-				auto real_data = vm::get_super_ptr<u8>(range.start);
-				auto out_data = std::vector<u8>(tiled_region.tile->size);
-				rsx::tile_texel_data<u32>(
-					out_data.data(),
-					real_data,
-					tiled_region.base_address,
-					range.start - tiled_region.base_address,
-					tiled_region.tile->size,
-					tiled_region.tile->bank,
-					tiled_region.tile->pitch,
-					width,
-					height
-				);
-				std::memcpy(real_data, out_data.data(), flush_length);
-			}
-#endif
+			vk::flush_dma(range.start, range.length());
 
 			if (is_swizzled())
 			{
 				// This format is completely worthless to CPU processing algorithms where cache lines on die are linear.
 				// If this is happening, usually it means it was not a planned readback (e.g shared pages situation)
-				rsx_log.trace("[Performance warning] CPU readback of swizzled data");
+				rsx_log.warning("[Performance warning] CPU readback of swizzled data");
 
 				// Read-modify-write to avoid corrupting already resident memory outside texture region
 				void* data = get_ptr(range.start);
@@ -342,6 +293,12 @@ namespace vk
 					rsx_log.error("Unexpected swizzled texture format 0x%x", gcm_format);
 				}
 			}
+
+			if (context == rsx::texture_upload_context::framebuffer_storage)
+			{
+				// Update memory tag
+				static_cast<vk::render_target*>(vram_texture)->sync_tag();
+			}
 		}
 
 		void* map_synchronized(u32, u32)
@@ -360,7 +317,7 @@ namespace vk
 			pack_unpack_swap_bytes = swap_bytes;
 		}
 
-		void set_rsx_pitch(u32 pitch)
+		void set_rsx_pitch(u16 pitch)
 		{
 			ensure(!is_locked());
 			rsx_pitch = pitch;
@@ -377,6 +334,11 @@ namespace vk
 			}
 		}
 
+		bool is_synchronized() const
+		{
+			return synchronized;
+		}
+
 		bool has_compatible_format(vk::image* tex) const
 		{
 			return vram_texture->info.format == tex->info.format;
@@ -384,7 +346,60 @@ namespace vk
 
 		bool is_depth_texture() const
 		{
-			return !!(vram_texture->aspect() & VK_IMAGE_ASPECT_DEPTH_BIT);
+			switch (vram_texture->info.format)
+			{
+			case VK_FORMAT_D16_UNORM:
+			case VK_FORMAT_D32_SFLOAT:
+			case VK_FORMAT_D32_SFLOAT_S8_UINT:
+			case VK_FORMAT_D24_UNORM_S8_UINT:
+				return true;
+			default:
+				return false;
+			}
+		}
+	};
+
+	struct temporary_storage
+	{
+		std::unique_ptr<vk::viewable_image> combined_image;
+		bool can_reuse = false;
+
+		// Memory held by this temp storage object
+		u32 block_size = 0;
+
+		// Frame id tag
+		const u64 frame_tag = vk::get_current_frame_id();
+
+		temporary_storage(std::unique_ptr<vk::viewable_image>& _img)
+		{
+			combined_image = std::move(_img);
+		}
+
+		temporary_storage(vk::cached_texture_section& tex)
+		{
+			combined_image = std::move(tex.get_texture());
+			block_size = tex.get_section_size();
+		}
+
+		bool test(u64 ref_frame) const
+		{
+			return ref_frame > 0 && frame_tag <= ref_frame;
+		}
+
+		bool matches(VkFormat format, u16 w, u16 h, u16 d, u16 mipmaps, VkFlags flags) const
+		{
+			if (combined_image &&
+				combined_image->info.flags == flags &&
+				combined_image->format() == format &&
+				combined_image->width() == w &&
+				combined_image->height() == h &&
+				combined_image->depth() == d &&
+				combined_image->mipmaps() == mipmaps)
+			{
+				return true;
+			}
+
+			return false;
 		}
 	};
 
@@ -394,52 +409,26 @@ namespace vk
 		using baseclass = rsx::texture_cache<vk::texture_cache, vk::texture_cache_traits>;
 		friend baseclass;
 
-		struct cached_image_reference_t
-		{
-			std::unique_ptr<vk::viewable_image> data;
-			texture_cache* parent;
-
-			cached_image_reference_t(texture_cache* parent, std::unique_ptr<vk::viewable_image>& previous);
-			~cached_image_reference_t();
-		};
-
-		struct cached_image_t
-		{
-			u64 key;
-			std::unique_ptr<vk::viewable_image> data;
-
-			cached_image_t() = default;
-			cached_image_t(u64 key_, std::unique_ptr<vk::viewable_image>& data_) :
-				key(key_), data(std::move(data_)) {}
-		};
-
 	public:
 		enum texture_create_flags : u32
 		{
 			initialize_image_contents = 1,
-			do_not_reuse = 2,
-			shareable = 4
 		};
 
 		void on_section_destroyed(cached_texture_section& tex) override;
 
 	private:
 
-		// Vulkan internals
+		//Vulkan internals
 		vk::render_device* m_device;
 		vk::memory_type_mapping m_memory_types;
 		vk::gpu_formats_support m_formats_support;
 		VkQueue m_submit_queue;
 		vk::data_heap* m_texture_upload_heap;
 
-		// Stuff that has been dereferenced by the GPU goes into these
-		const u32 max_cached_image_pool_size = 256;
-		std::deque<cached_image_t> m_cached_images;
-		atomic_t<u64> m_cached_memory_size = { 0 };
-		shared_mutex m_cached_pool_lock;
-
-		// Blocks some operations when exiting
-		atomic_t<bool> m_cache_is_exiting = false;
+		//Stuff that has been dereferenced goes into these
+		std::list<temporary_storage> m_temporary_storage;
+		atomic_t<u32> m_temporary_memory_size = { 0 };
 
 		void clear();
 
@@ -449,7 +438,9 @@ namespace vk
 
 		vk::image* get_template_from_collection_impl(const std::vector<copy_region_descriptor>& sections_to_transfer) const;
 
-		std::unique_ptr<vk::viewable_image> find_cached_image(VkFormat format, u16 w, u16 h, u16 d, u16 mipmaps, VkImageType type, VkImageCreateFlags create_flags, VkImageUsageFlags usage, VkSharingMode sharing);
+		std::unique_ptr<vk::viewable_image> find_temporary_image(VkFormat format, u16 w, u16 h, u16 d, u8 mipmaps);
+
+		std::unique_ptr<vk::viewable_image> find_temporary_cubemap(VkFormat format, u16 size);
 
 	protected:
 		vk::image_view* create_temporary_subresource_view_impl(vk::command_buffer& cmd, vk::image* source, VkImageType image_type, VkImageViewType view_type,
@@ -477,13 +468,12 @@ namespace vk
 
 		void update_image_contents(vk::command_buffer& cmd, vk::image_view* dst_view, vk::image* src, u16 width, u16 height) override;
 
-		cached_texture_section* create_new_texture(vk::command_buffer& cmd, const utils::address_range32& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u32 pitch,
+		cached_texture_section* create_new_texture(vk::command_buffer& cmd, const utils::address_range& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch,
 			u32 gcm_format, rsx::texture_upload_context context, rsx::texture_dimension_extended type, bool swizzled, rsx::component_order swizzle_flags, rsx::flags32_t flags) override;
 
-		cached_texture_section* create_nul_section(vk::command_buffer& cmd, const utils::address_range32& rsx_range, const rsx::image_section_attributes_t& attrs,
-			const rsx::GCM_tile_reference& tile, bool memory_load) override;
+		cached_texture_section* create_nul_section(vk::command_buffer& cmd, const utils::address_range& rsx_range, bool memory_load) override;
 
-		cached_texture_section* upload_image_from_cpu(vk::command_buffer& cmd, const utils::address_range32& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u32 pitch, u32 gcm_format,
+		cached_texture_section* upload_image_from_cpu(vk::command_buffer& cmd, const utils::address_range& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch, u32 gcm_format,
 			rsx::texture_upload_context context, const std::vector<rsx::subresource_layout>& subresource_layout, rsx::texture_dimension_extended type, bool swizzled) override;
 
 		void set_component_order(cached_texture_section& section, u32 gcm_format, rsx::component_order expected_flags) override;
@@ -503,26 +493,19 @@ namespace vk
 
 		void destroy() override;
 
-		std::unique_ptr<vk::viewable_image> create_temporary_subresource_storage(
-			rsx::format_class format_class, VkFormat format,
-			u16 width, u16 height, u16 depth, u16 layers, u8 mips,
-			VkImageType image_type, VkFlags image_flags, VkFlags usage_flags);
-
-		void dispose_reusable_image(std::unique_ptr<vk::viewable_image>& tex);
-
 		bool is_depth_texture(u32 rsx_address, u32 rsx_size) override;
 
 		void on_frame_end() override;
 
 		vk::viewable_image* upload_image_simple(vk::command_buffer& cmd, VkFormat format, u32 address, u32 width, u32 height, u32 pitch);
 
-		bool blit(const rsx::blit_src_info& src, const rsx::blit_dst_info& dst, bool interpolate, vk::surface_cache& m_rtts, vk::command_buffer& cmd);
+		bool blit(rsx::blit_src_info& src, rsx::blit_dst_info& dst, bool interpolate, vk::surface_cache& m_rtts, vk::command_buffer& cmd);
 
 		u32 get_unreleased_textures_count() const override;
 
 		bool handle_memory_pressure(rsx::problem_severity severity) override;
 
-		u64 get_temporary_memory_in_use() const;
+		u32 get_temporary_memory_in_use() const;
 
 		bool is_overallocated() const;
 	};
diff --git a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp
index 2c4717de0e..15e0d1c377 100644
--- a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp
+++ b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp
@@ -8,38 +8,42 @@
 
 namespace vk
 {
-	std::pair<VkPrimitiveTopology, bool> get_appropriate_topology(rsx::primitive_type mode)
+	VkPrimitiveTopology get_appropriate_topology(rsx::primitive_type mode, bool &requires_modification)
 	{
+		requires_modification = false;
+
 		switch (mode)
 		{
 		case rsx::primitive_type::lines:
-			return { VK_PRIMITIVE_TOPOLOGY_LINE_LIST, false };
+			return VK_PRIMITIVE_TOPOLOGY_LINE_LIST;
 		case rsx::primitive_type::line_loop:
-			return { VK_PRIMITIVE_TOPOLOGY_LINE_STRIP, true };
+			requires_modification = true;
+			return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP;
 		case rsx::primitive_type::line_strip:
-			return { VK_PRIMITIVE_TOPOLOGY_LINE_STRIP, false };
+			return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP;
 		case rsx::primitive_type::points:
-			return { VK_PRIMITIVE_TOPOLOGY_POINT_LIST, false };
+			return VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
 		case rsx::primitive_type::triangles:
-			return { VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, false };
+			return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
 		case rsx::primitive_type::triangle_strip:
 		case rsx::primitive_type::quad_strip:
-			return { VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP, false };
+			return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
 		case rsx::primitive_type::triangle_fan:
-#ifndef __APPLE__
-			return { VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN, false };
-#endif
+			return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN;
 		case rsx::primitive_type::quads:
 		case rsx::primitive_type::polygon:
-			return { VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, true };
+			requires_modification = true;
+			return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
 		default:
 			fmt::throw_exception("Unsupported primitive topology 0x%x", static_cast<u8>(mode));
 		}
 	}
 
-	bool is_primitive_native(rsx::primitive_type mode)
+	bool is_primitive_native(rsx::primitive_type& mode)
 	{
-		return !get_appropriate_topology(mode).second;
+		bool result;
+		get_appropriate_topology(mode, result);
+		return !result;
 	}
 
 	VkIndexType get_index_type(rsx::index_array_type type)
@@ -95,7 +99,10 @@ namespace
 
 		vertex_input_state operator()(const rsx::draw_array_command& /*command*/)
 		{
-			const auto [prims, primitives_emulated] = vk::get_appropriate_topology(rsx::method_registers.current_draw_clause.primitive);
+			bool primitives_emulated = false;
+			VkPrimitiveTopology prims = vk::get_appropriate_topology(
+				rsx::method_registers.current_draw_clause.primitive, primitives_emulated);
+
 			const u32 vertex_count = rsx::method_registers.current_draw_clause.get_elements_count();
 			const u32 min_index = rsx::method_registers.current_draw_clause.min_index();
 			const u32 max_index = (min_index + vertex_count) - 1;
@@ -117,8 +124,9 @@ namespace
 
 		vertex_input_state operator()(const rsx::draw_indexed_array_command& command)
 		{
+			bool primitives_emulated = false;
 			auto primitive = rsx::method_registers.current_draw_clause.primitive;
-			const auto [prims, primitives_emulated] = vk::get_appropriate_topology(primitive);
+			const VkPrimitiveTopology prims = vk::get_appropriate_topology(primitive, primitives_emulated);
 			const bool emulate_restart = rsx::method_registers.restart_index_enabled() && vk::emulate_primitive_restart(primitive);
 
 			rsx::index_array_type index_type = rsx::method_registers.current_draw_clause.is_immediate_draw ?
@@ -134,15 +142,15 @@ namespace
 
 			if (emulate_restart) upload_size *= 2;
 
-			VkDeviceSize offset_in_index_buffer = m_index_buffer_ring_info.alloc<64>(upload_size);
+			VkDeviceSize offset_in_index_buffer = m_index_buffer_ring_info.alloc<4>(upload_size);
 			void* buf = m_index_buffer_ring_info.map(offset_in_index_buffer, upload_size);
 
 			std::span<std::byte> dst;
-			stx::single_ptr<std::byte[]> tmp;
+			std::vector<std::byte> tmp;
 			if (emulate_restart)
 			{
-				tmp = stx::make_single<std::byte[], false, 64>(upload_size);
-				dst = std::span<std::byte>(tmp.get(), upload_size);
+				tmp.resize(upload_size);
+				dst = tmp;
 			}
 			else
 			{
@@ -172,11 +180,11 @@ namespace
 			{
 				if (index_type == rsx::index_array_type::u16)
 				{
-					index_count = rsx::remove_restart_index(static_cast<u16*>(buf), reinterpret_cast<u16*>(tmp.get()), index_count, u16{umax});
+					index_count = rsx::remove_restart_index(static_cast<u16*>(buf), reinterpret_cast<u16*>(tmp.data()), index_count, u16{umax});
 				}
 				else
 				{
-					index_count = rsx::remove_restart_index(static_cast<u32*>(buf), reinterpret_cast<u32*>(tmp.get()), index_count, u32{umax});
+					index_count = rsx::remove_restart_index(static_cast<u32*>(buf), reinterpret_cast<u32*>(tmp.data()), index_count, u32{umax});
 				}
 			}
 
@@ -191,11 +199,12 @@ namespace
 
 		vertex_input_state operator()(const rsx::draw_inlined_array& /*command*/)
 		{
+			bool primitives_emulated = false;
 			auto &draw_clause = rsx::method_registers.current_draw_clause;
-			const auto [prims, primitives_emulated] = vk::get_appropriate_topology(draw_clause.primitive);
+			VkPrimitiveTopology prims = vk::get_appropriate_topology(draw_clause.primitive, primitives_emulated);
 
 			const auto stream_length = rsx::method_registers.current_draw_clause.inline_vertex_array.size();
-			const u32 vertex_count = u32(stream_length * sizeof(u32)) / m_vertex_layout.interleaved_blocks[0]->attribute_stride;
+			const u32 vertex_count = u32(stream_length * sizeof(u32)) / m_vertex_layout.interleaved_blocks[0].attribute_stride;
 
 			if (!primitives_emulated)
 			{
@@ -217,7 +226,7 @@ namespace
 vk::vertex_upload_info VKGSRender::upload_vertex_data()
 {
 	draw_command_visitor visitor(m_index_buffer_ring_info, m_vertex_layout);
-	auto result = std::visit(visitor, m_draw_processor.get_draw_command(rsx::method_registers));
+	auto result = std::visit(visitor, get_draw_command(rsx::method_registers));
 
 	const u32 vertex_count = (result.max_index - result.min_index) + 1;
 	u32 vertex_base = result.min_index;
@@ -243,15 +252,13 @@ vk::vertex_upload_info VKGSRender::upload_vertex_data()
 		bool to_store = false;
 		u32  storage_address = -1;
 
-		m_frame_stats.vertex_cache_request_count++;
-
 		if (m_vertex_layout.interleaved_blocks.size() == 1 &&
 			rsx::method_registers.current_draw_clause.command != rsx::draw_command::inlined_array)
 		{
-			const auto data_offset = (vertex_base * m_vertex_layout.interleaved_blocks[0]->attribute_stride);
-			storage_address = m_vertex_layout.interleaved_blocks[0]->real_offset_address + data_offset;
+			const auto data_offset = (vertex_base * m_vertex_layout.interleaved_blocks[0].attribute_stride);
+			storage_address = m_vertex_layout.interleaved_blocks[0].real_offset_address + data_offset;
 
-			if (auto cached = m_vertex_cache->find_vertex_range(storage_address, required.first))
+			if (auto cached = m_vertex_cache->find_vertex_range(storage_address, VK_FORMAT_R8_UINT, required.first))
 			{
 				ensure(cached->local_address == storage_address);
 
@@ -266,15 +273,13 @@ vk::vertex_upload_info VKGSRender::upload_vertex_data()
 
 		if (!in_cache)
 		{
-			m_frame_stats.vertex_cache_miss_count++;
-
 			persistent_offset = static_cast<u32>(m_attrib_ring_info.alloc<256>(required.first));
 			persistent_range_base = static_cast<u32>(persistent_offset);
 
 			if (to_store)
 			{
 				//store ref in vertex cache
-				m_vertex_cache->store_range(storage_address, required.first, static_cast<u32>(persistent_offset));
+				m_vertex_cache->store_range(storage_address, VK_FORMAT_R8_UINT, required.first, static_cast<u32>(persistent_offset));
 			}
 		}
 	}
@@ -294,7 +299,7 @@ vk::vertex_upload_info VKGSRender::upload_vertex_data()
 		const usz volatile_offset_in_block = volatile_offset - persistent_offset;
 
 		void *block_mapping = m_attrib_ring_info.map(persistent_offset, block_size);
-		m_draw_processor.write_vertex_data_to_memory(m_vertex_layout, vertex_base, vertex_count, block_mapping, static_cast<char*>(block_mapping) + volatile_offset_in_block);
+		write_vertex_data_to_memory(m_vertex_layout, vertex_base, vertex_count, block_mapping, static_cast<char*>(block_mapping) + volatile_offset_in_block);
 		m_attrib_ring_info.unmap();
 	}
 	else
@@ -302,14 +307,14 @@ vk::vertex_upload_info VKGSRender::upload_vertex_data()
 		if (required.first > 0 && persistent_offset != umax)
 		{
 			void *persistent_mapping = m_attrib_ring_info.map(persistent_offset, required.first);
-			m_draw_processor.write_vertex_data_to_memory(m_vertex_layout, vertex_base, vertex_count, persistent_mapping, nullptr);
+			write_vertex_data_to_memory(m_vertex_layout, vertex_base, vertex_count, persistent_mapping, nullptr);
 			m_attrib_ring_info.unmap();
 		}
 
 		if (required.second > 0)
 		{
 			void *volatile_mapping = m_attrib_ring_info.map(volatile_offset, required.second);
-			m_draw_processor.write_vertex_data_to_memory(m_vertex_layout, vertex_base, vertex_count, nullptr, volatile_mapping);
+			write_vertex_data_to_memory(m_vertex_layout, vertex_base, vertex_count, nullptr, volatile_mapping);
 			m_attrib_ring_info.unmap();
 		}
 	}
@@ -320,13 +325,13 @@ vk::vertex_upload_info VKGSRender::upload_vertex_data()
 		if (m_persistent_attribute_storage &&
 			m_persistent_attribute_storage->info.buffer != m_attrib_ring_info.heap->value)
 		{
-			vk::get_resource_manager()->dispose(m_persistent_attribute_storage);
+			m_current_frame->buffer_views_to_clean.push_back(std::move(m_persistent_attribute_storage));
 		}
 
 		if (m_volatile_attribute_storage &&
 			m_volatile_attribute_storage->info.buffer != m_attrib_ring_info.heap->value)
 		{
-			vk::get_resource_manager()->dispose(m_volatile_attribute_storage);
+			m_current_frame->buffer_views_to_clean.push_back(std::move(m_volatile_attribute_storage));
 		}
 
 		vk::clear_status_interrupt(vk::heap_changed);
@@ -337,7 +342,9 @@ vk::vertex_upload_info VKGSRender::upload_vertex_data()
 		if (!m_persistent_attribute_storage || !m_persistent_attribute_storage->in_range(persistent_range_base, required.first, persistent_range_base))
 		{
 			ensure(m_texbuffer_view_size >= required.first); // "Incompatible driver (MacOS?)"
-			vk::get_resource_manager()->dispose(m_persistent_attribute_storage);
+
+			if (m_persistent_attribute_storage)
+				m_current_frame->buffer_views_to_clean.push_back(std::move(m_persistent_attribute_storage));
 
 			//View 64M blocks at a time (different drivers will only allow a fixed viewable heap size, 64M should be safe)
 			const usz view_size = (persistent_range_base + m_texbuffer_view_size) > m_attrib_ring_info.size() ? m_attrib_ring_info.size() - persistent_range_base : m_texbuffer_view_size;
@@ -351,7 +358,9 @@ vk::vertex_upload_info VKGSRender::upload_vertex_data()
 		if (!m_volatile_attribute_storage || !m_volatile_attribute_storage->in_range(volatile_range_base, required.second, volatile_range_base))
 		{
 			ensure(m_texbuffer_view_size >= required.second); // "Incompatible driver (MacOS?)"
-			vk::get_resource_manager()->dispose(m_volatile_attribute_storage);
+
+			if (m_volatile_attribute_storage)
+				m_current_frame->buffer_views_to_clean.push_back(std::move(m_volatile_attribute_storage));
 
 			const usz view_size = (volatile_range_base + m_texbuffer_view_size) > m_attrib_ring_info.size() ? m_attrib_ring_info.size() - volatile_range_base : m_texbuffer_view_size;
 			m_volatile_attribute_storage = std::make_unique<vk::buffer_view>(*m_device, m_attrib_ring_info.heap->value, VK_FORMAT_R8_UINT, volatile_range_base, view_size);
diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp
index 70d0972984..0d7576a34a 100644
--- a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp
+++ b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp
@@ -6,6 +6,7 @@
 #include "vkutils/device.h"
 #include "../Program/GLSLCommon.h"
 
+
 std::string VKVertexDecompilerThread::getFloatTypeName(usz elementCount)
 {
 	return glsl::getFloatTypeNameImpl(elementCount);
@@ -26,229 +27,114 @@ std::string VKVertexDecompilerThread::compareFunction(COMPARE f, const std::stri
 	return glsl::compareFunctionImpl(f, Op0, Op1, scalar);
 }
 
-void VKVertexDecompilerThread::prepareBindingTable()
-{
-	u32 location = 0;
-	vk_prog->binding_table.vertex_buffers_location = location;
-	location += 3; // Persistent verts, volatile and layout data
-
-	vk_prog->binding_table.context_buffer_location = location++;
-	if (m_device_props.emulate_conditional_rendering)
-	{
-		vk_prog->binding_table.cr_pred_buffer_location = location++;
-	}
-
-	std::memset(vk_prog->binding_table.vtex_location, 0xff, sizeof(vk_prog->binding_table.vtex_location));
-
-	for (const ParamType& PT : m_parr.params[PF_PARAM_UNIFORM])
-	{
-		const bool is_texture_type = PT.type.starts_with("sampler");
-
-		for (const ParamItem& PI : PT.items)
-		{
-			if (is_texture_type)
-			{
-				const int id = vk::get_texture_index(PI.name);
-				vk_prog->binding_table.vtex_location[id] = location++;
-				continue;
-			}
-
-			if (PI.name.starts_with("vc["))
-			{
-				if (!(m_prog.ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS))
-				{
-					vk_prog->binding_table.cbuf_location = location++;
-					continue;
-				}
-
-				vk_prog->binding_table.instanced_lut_buffer_location = location++;
-				vk_prog->binding_table.instanced_cbuf_location = location++;
-				continue;
-			}
-		}
-	}
-}
-
 void VKVertexDecompilerThread::insertHeader(std::stringstream &OS)
 {
-	prepareBindingTable();
+	OS << "#version 450\n\n";
+	OS << "#extension GL_ARB_separate_shader_objects : enable\n\n";
 
-	OS <<
-		"#version 450\n\n"
-		"#extension GL_ARB_separate_shader_objects : enable\n\n";
-
-	OS <<
-		"layout(std140, set=0, binding=" << vk_prog->binding_table.context_buffer_location << ") uniform VertexContextBuffer\n"
-		"{\n"
-		"	mat4 scale_offset_mat;\n"
-		"	ivec4 user_clip_enabled[2];\n"
-		"	vec4 user_clip_factor[2];\n"
-		"	uint transform_branch_bits;\n"
-		"	float point_size;\n"
-		"	float z_near;\n"
-		"	float z_far;\n"
-		"};\n\n";
-
-	vk::glsl::program_input context_input =
-	{
-		.domain = glsl::glsl_vertex_program,
-		.type = vk::glsl::input_type_uniform_buffer,
-		.location = vk_prog->binding_table.context_buffer_location,
-		.name = "VertexContextBuffer"
-	};
-	inputs.push_back(context_input);
+	OS << "layout(std140, set = 0, binding = 0) uniform VertexContextBuffer\n";
+	OS << "{\n";
+	OS << "	mat4 scale_offset_mat;\n";
+	OS << "	ivec4 user_clip_enabled[2];\n";
+	OS << "	vec4 user_clip_factor[2];\n";
+	OS << "	uint transform_branch_bits;\n";
+	OS << "	float point_size;\n";
+	OS << "	float z_near;\n";
+	OS << "	float z_far;\n";
+	OS << "};\n\n";
 
 	if (m_device_props.emulate_conditional_rendering)
 	{
-		OS <<
-			"layout(std430, set=0, binding=" << vk_prog->binding_table.cr_pred_buffer_location << ") readonly buffer EXT_Conditional_Rendering\n"
-			"{\n"
-			"	uint conditional_rendering_predicate;\n"
-			"};\n\n";
-
-		vk::glsl::program_input predicate_input =
-		{
-			.domain = glsl::glsl_vertex_program,
-			.type = vk::glsl::input_type_storage_buffer,
-			.location = vk_prog->binding_table.cr_pred_buffer_location,
-			.name = "EXT_Conditional_Rendering"
-		};
-		inputs.push_back(predicate_input);
+		OS << "layout(std430, set = 0, binding = 8) readonly buffer EXT_Conditional_Rendering\n";
+		OS << "{\n";
+		OS << "	uint conditional_rendering_predicate;\n";
+		OS << "};\n\n";
 	}
 
-	OS <<
-		"layout(push_constant) uniform VertexLayoutBuffer\n"
-		"{\n"
-		"	uint vertex_base_index;\n"
-		"	uint vertex_index_offset;\n"
-		"	uint draw_id;\n"
-		"	uint layout_ptr_offset;\n"
-		"	uint xform_constants_offset;\n";
+	OS << "layout(push_constant) uniform VertexLayoutBuffer\n";
+	OS << "{\n";
+	OS << "	uint vertex_base_index;\n";
+	OS << "	uint vertex_index_offset;\n";
+	OS << "	uint draw_id;\n";
+	OS << "	uint layout_ptr_offset;\n";
 
-	u32 push_constants_size = 5 * sizeof(u32);
 	if (m_device_props.emulate_conditional_rendering)
 	{
-		push_constants_size += sizeof(u32);
 		OS << "	uint conditional_rendering_enabled;\n";
 	}
 
 	OS << "};\n\n";
 
-	vk::glsl::program_input push_constants =
-	{
-		.domain = glsl::glsl_vertex_program,
-		.type = vk::glsl::input_type_push_constant,
-		.bound_data = vk::glsl::push_constant_ref{ .offset = 0, .size = push_constants_size }
-	};
-	inputs.push_back(push_constants);
+	vk::glsl::program_input in;
+	in.location = m_binding_table.vertex_params_bind_slot;
+	in.domain = glsl::glsl_vertex_program;
+	in.name = "VertexContextBuffer";
+	in.type = vk::glsl::input_type_uniform_buffer;
+	inputs.push_back(in);
 }
 
 void VKVertexDecompilerThread::insertInputs(std::stringstream& OS, const std::vector<ParamType>& /*inputs*/)
 {
-	static const char* input_streams[] =
-	{
-		"persistent_input_stream",    // Data stream with persistent vertex data (cacheable)
-		"volatile_input_stream",      // Data stream with per-draw data (registers and immediate draw data)
-		"vertex_layout_stream"        // Data stream defining vertex data layout"
-	};
+	OS << "layout(set=0, binding=5) uniform usamplerBuffer persistent_input_stream;\n";    // Data stream with persistent vertex data (cacheable)
+	OS << "layout(set=0, binding=6) uniform usamplerBuffer volatile_input_stream;\n";      // Data stream with per-draw data (registers and immediate draw data)
+	OS << "layout(set=0, binding=7) uniform usamplerBuffer vertex_layout_stream;\n";       // Data stream defining vertex data layout
 
-	int location = vk_prog->binding_table.vertex_buffers_location;
-	for (const auto& stream : input_streams)
-	{
-		OS << "layout(set=0, binding=" << location << ") uniform usamplerBuffer " << stream << ";\n";
+	vk::glsl::program_input in;
+	in.location = m_binding_table.vertex_buffers_first_bind_slot;
+	in.domain = glsl::glsl_vertex_program;
+	in.name = "persistent_input_stream";
+	in.type = vk::glsl::input_type_texel_buffer;
+	this->inputs.push_back(in);
 
-		vk::glsl::program_input in;
-		in.location = location++;
-		in.domain = glsl::glsl_vertex_program;
-		in.name = stream;
-		in.type = vk::glsl::input_type_texel_buffer;
-		this->inputs.push_back(in);
-	}
+	in.location = m_binding_table.vertex_buffers_first_bind_slot + 1;
+	in.domain = glsl::glsl_vertex_program;
+	in.name = "volatile_input_stream";
+	in.type = vk::glsl::input_type_texel_buffer;
+	this->inputs.push_back(in);
+
+	in.location = m_binding_table.vertex_buffers_first_bind_slot + 2;
+	in.domain = glsl::glsl_vertex_program;
+	in.name = "vertex_layout_stream";
+	in.type = vk::glsl::input_type_texel_buffer;
+	this->inputs.push_back(in);
 }
 
 void VKVertexDecompilerThread::insertConstants(std::stringstream & OS, const std::vector<ParamType> & constants)
 {
+	OS << "layout(std140, set=0, binding = 1) uniform VertexConstantsBuffer\n";
+	OS << "{\n";
+	OS << "	vec4 vc[468];\n";
+	OS << "};\n\n";
+
 	vk::glsl::program_input in;
+	in.location = m_binding_table.vertex_constant_buffers_bind_slot;
+	in.domain = glsl::glsl_vertex_program;
+	in.name = "VertexConstantsBuffer";
+	in.type = vk::glsl::input_type_uniform_buffer;
+
+	inputs.push_back(in);
+
+
+	u32 location = m_binding_table.vertex_textures_first_bind_slot;
 	for (const ParamType &PT : constants)
 	{
 		for (const ParamItem &PI : PT.items)
 		{
-			if (PI.name.starts_with("vc["))
+			if (PI.name == "vc[468]")
+				continue;
+
+			if (PT.type == "sampler2D" ||
+				PT.type == "samplerCube" ||
+				PT.type == "sampler1D" ||
+				PT.type == "sampler3D")
 			{
-				if (!(m_prog.ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS))
-				{
-					OS << "layout(std430, set=0, binding=" << vk_prog->binding_table.cbuf_location << ") readonly buffer VertexConstantsBuffer\n";
-					OS << "{\n";
-					OS << "	vec4 vc[];\n";
-					OS << "};\n\n";
-
-					in.location = vk_prog->binding_table.cbuf_location;
-					in.domain = glsl::glsl_vertex_program;
-					in.name = "VertexConstantsBuffer";
-					in.type = vk::glsl::input_type_storage_buffer;
-
-					inputs.push_back(in);
-					continue;
-				}
-				else
-				{
-					// 1. Bind indirection lookup buffer
-					OS << "layout(std430, set=0, binding=" << vk_prog->binding_table.instanced_lut_buffer_location << ") readonly buffer InstancingData\n";
-					OS << "{\n";
-					OS << "	int constants_addressing_lookup[];\n";
-					OS << "};\n\n";
-
-					in.location = vk_prog->binding_table.instanced_lut_buffer_location;
-					in.domain = glsl::glsl_vertex_program;
-					in.name = "InstancingData";
-					in.type = vk::glsl::input_type_storage_buffer;
-					inputs.push_back(in);
-
-					// 2. Bind actual constants buffer
-					OS << "layout(std430, set=0, binding=" << vk_prog->binding_table.instanced_cbuf_location << ") readonly buffer VertexConstantsBuffer\n";
-					OS << "{\n";
-					OS << "	vec4 instanced_constants_array[];\n";
-					OS << "};\n\n";
-
-					OS << "#define CONSTANTS_ARRAY_LENGTH " << (properties.has_indexed_constants ? 468 : ::size32(m_constant_ids)) << "\n\n";
-
-					in.location = vk_prog->binding_table.instanced_cbuf_location;
-					in.domain = glsl::glsl_vertex_program;
-					in.name = "VertexConstantsBuffer";
-					in.type = vk::glsl::input_type_storage_buffer;
-					inputs.push_back(in);
-					continue;
-				}
-			}
-
-			if (PT.type.starts_with("sampler"))
-			{
-				const int id = vk::get_texture_index(PI.name);
-				in.location = vk_prog->binding_table.vtex_location[id];
+				in.location = location;
 				in.name = PI.name;
 				in.type = vk::glsl::input_type_texture;
 
 				inputs.push_back(in);
 
-				auto samplerType = PT.type;
-
-				if (m_prog.texture_state.multisampled_textures) [[ unlikely ]]
-				{
-					ensure(PI.name.length() > 3);
-					int index = atoi(&PI.name[3]);
-
-					if (m_prog.texture_state.multisampled_textures & (1 << index))
-					{
-						if (samplerType != "sampler1D" && samplerType != "sampler2D")
-						{
-							rsx_log.error("Unexpected multisampled sampler type '%s'", samplerType);
-						}
-
-						samplerType = "sampler2DMS";
-					}
-				}
-
-				OS << "layout(set=0, binding=" << in.location << ") uniform " << samplerType << " " << PI.name << ";\n";
+				OS << "layout(set = 0, binding=" << location++ << ") uniform " << PT.type << " " << PI.name << ";\n";
 			}
 		}
 	}
@@ -302,12 +188,9 @@ void VKVertexDecompilerThread::insertMainStart(std::stringstream & OS)
 	properties2.require_lit_emulation = properties.has_lit_op;
 	properties2.emulate_zclip_transform = true;
 	properties2.emulate_depth_clip_only = vk::g_render_device->get_shader_types_support().allow_float64;
-	properties2.low_precision_tests = vk::is_NVIDIA(vk::get_driver_vendor());
-	properties2.require_explicit_invariance = (vk::is_NVIDIA(vk::get_driver_vendor()) && g_cfg.video.shader_precision != gpu_preset_level::low);
-	properties2.require_instanced_render = !!(m_prog.ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS);
 
 	glsl::insert_glsl_legacy_function(OS, properties2);
-	glsl::insert_vertex_input_fetch(OS, glsl::glsl_rules_vulkan);
+	glsl::insert_vertex_input_fetch(OS, glsl::glsl_rules_spirv);
 
 	// Declare global registers with optional initialization
 	std::string registers;
@@ -429,6 +312,8 @@ void VKVertexDecompilerThread::insertMainEnd(std::stringstream & OS)
 void VKVertexDecompilerThread::Task()
 {
 	m_device_props.emulate_conditional_rendering = vk::emulate_conditional_rendering();
+	m_binding_table = vk::g_render_device->get_pipeline_binding_table();
+
 	m_shader = Decompile();
 	vk_prog->SetInputs(inputs);
 }
@@ -446,16 +331,13 @@ void VKVertexProgram::Decompile(const RSXVertexProgram& prog)
 	VKVertexDecompilerThread decompiler(prog, source, parr, *this);
 	decompiler.Task();
 
-	has_indexed_constants = decompiler.properties.has_indexed_constants;
-	constant_ids = std::vector<u16>(decompiler.m_constant_ids.begin(), decompiler.m_constant_ids.end());
-
 	shader.create(::glsl::program_domain::glsl_vertex_program, source);
 }
 
 void VKVertexProgram::Compile()
 {
 	if (g_cfg.video.log_programs)
-		fs::write_file(fs::get_cache_dir() + "shaderlog/VertexProgram" + std::to_string(id) + ".spirv", fs::rewrite, shader.get_source());
+		fs::file(fs::get_cache_dir() + "shaderlog/VertexProgram" + std::to_string(id) + ".spirv", fs::rewrite).write(shader.get_source());
 	handle = shader.compile();
 }
 
diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.h b/rpcs3/Emu/RSX/VK/VKVertexProgram.h
index 3422333fc6..5170f7abc7 100644
--- a/rpcs3/Emu/RSX/VK/VKVertexProgram.h
+++ b/rpcs3/Emu/RSX/VK/VKVertexProgram.h
@@ -1,5 +1,7 @@
 #pragma once
 #include "../Program/VertexProgramDecompiler.h"
+#include "Utilities/Thread.h"
+#include "VulkanAPI.h"
 #include "VKProgramPipeline.h"
 #include "vkutils/pipeline_binding_table.h"
 
@@ -15,6 +17,7 @@ struct VKVertexDecompilerThread : public VertexProgramDecompiler
 	std::string &m_shader;
 	std::vector<vk::glsl::program_input> inputs;
 	class VKVertexProgram *vk_prog;
+	vk::pipeline_binding_table m_binding_table{};
 
 	struct
 	{
@@ -35,8 +38,6 @@ protected:
 	void insertMainStart(std::stringstream &OS) override;
 	void insertMainEnd(std::stringstream &OS) override;
 
-	void prepareBindingTable();
-
 	const RSXVertexProgram &rsx_vertex_program;
 public:
 	VKVertexDecompilerThread(const RSXVertexProgram &prog, std::string& shader, ParamArray&, class VKVertexProgram &dst)
@@ -51,7 +52,7 @@ public:
 	const std::vector<vk::glsl::program_input>& get_inputs() { return inputs; }
 };
 
-class VKVertexProgram : public rsx::VertexProgramBase
+class VKVertexProgram
 {
 public:
 	VKVertexProgram();
@@ -59,22 +60,10 @@ public:
 
 	ParamArray parr;
 	VkShaderModule handle = nullptr;
+	u32 id;
 	vk::glsl::shader shader;
 	std::vector<vk::glsl::program_input> uniforms;
 
-	// Quick attribute indices
-	struct
-	{
-		u32 context_buffer_location = umax;        // Vertex program context
-		u32 cr_pred_buffer_location = umax;        // Conditional rendering predicate
-		u32 vertex_buffers_location = umax;        // Vertex input streams (3)
-		u32 cbuf_location = umax;                  // Vertex program constants register file
-		u32 instanced_lut_buffer_location = umax;  // Instancing redirection table
-		u32 instanced_cbuf_location = umax;        // Instancing constants register file
-		u32 vtex_location[4];                      // Vertex textures (inf)
-
-	} binding_table;
-
 	void Decompile(const RSXVertexProgram& prog);
 	void Compile();
 	void SetInputs(std::vector<vk::glsl::program_input>& inputs);
diff --git a/rpcs3/Emu/RSX/VK/VulkanAPI.cpp b/rpcs3/Emu/RSX/VK/VulkanAPI.cpp
deleted file mode 100644
index 6e2eb89e3a..0000000000
--- a/rpcs3/Emu/RSX/VK/VulkanAPI.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "stdafx.h"
-#include "VulkanAPI.h"
-
-#include "vkutils/device.h"
-
-#define DECLARE_VK_FUNCTION_BODY
-#include "VKProcTable.h"
-
-namespace vk
-{
-	const render_device* get_current_renderer();
-
-	void init()
-	{
-		auto pdev = get_current_renderer();
-
-		#define VK_FUNC(func) _##func = reinterpret_cast<PFN_##func>(vkGetDeviceProcAddr(*pdev, #func))
-		#include "VKProcTable.h"
-	}
-}
diff --git a/rpcs3/Emu/RSX/VK/VulkanAPI.h b/rpcs3/Emu/RSX/VK/VulkanAPI.h
index c91e9cb5a5..95eb77a835 100644
--- a/rpcs3/Emu/RSX/VK/VulkanAPI.h
+++ b/rpcs3/Emu/RSX/VK/VulkanAPI.h
@@ -1,19 +1,11 @@
 #pragma once
 
-// Configure vulkan.h
 #ifdef _WIN32
 #define VK_USE_PLATFORM_WIN32_KHR
 #elif defined(__APPLE__)
 #define VK_USE_PLATFORM_MACOS_MVK
-#elif defined(ANDROID)
-#define VK_USE_PLATFORM_ANDROID_KHR
-#else
-#if defined(HAVE_X11)
- #define VK_USE_PLATFORM_XLIB_KHR
-#endif
-#if defined(HAVE_WAYLAND)
- #define VK_USE_PLATFORM_WAYLAND_KHR
-#endif
+#elif HAVE_X11
+#define VK_USE_PLATFORM_XLIB_KHR
 #endif
 
 #ifdef _MSC_VER
@@ -22,28 +14,10 @@
 #endif
 
 #include <vulkan/vulkan.h>
+#include <vulkan/vk_sdk_platform.h>
 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
-// Undefine header configuration variables
-#undef VK_USE_PLATFORM_WIN32_KHR
-#undef VK_USE_PLATFORM_MACOS_MVK
-#undef VK_USE_PLATFORM_ANDROID_KHR
-#undef VK_USE_PLATFORM_XLIB_KHR
-#undef VK_USE_PLATFORM_WAYLAND_KHR
-
 #include <util/types.hpp>
-
-#if VK_HEADER_VERSION < 287
-constexpr VkDriverId VK_DRIVER_ID_MESA_HONEYKRISP = static_cast<VkDriverId>(26);
-#endif
-
-#define DECLARE_VK_FUNCTION_HEADER 1
-#include "VKProcTable.h"
-
-namespace vk
-{
-	void init();
-}
diff --git a/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_a_flattened.inc b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_a_flattened.inc
similarity index 97%
rename from rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_a_flattened.inc
rename to rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_a_flattened.inc
index cb8fdbc856..e2a24e5a5b 100644
--- a/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_a_flattened.inc
+++ b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_a_flattened.inc
@@ -4,7 +4,7 @@ R"--RPCS3--(
 #ifndef A_SKIP_EXT
 #ifdef A_HALF
 #extension GL_EXT_shader_16bit_storage:require
-#extension GL_EXT_shader_explicit_arithmetic_types:require
+#extension GL_EXT_shader_explicit_arithmetic_types:require 
 #endif
 #ifdef A_LONG
 #extension GL_ARB_gpu_shader_int64:require
@@ -390,7 +390,7 @@ AW4 AWaveXorW4(AW4 v,AU1 x){return AW4_AU2(subgroupShuffleXor(AU2_AW4(v),x));}
 AU1 AU1_AH1_AF1_x(AF1 a){return f32tof16(a);}
 #define AU1_AH1_AF1(a) AU1_AH1_AF1_x(AF1(a))
 AU1 AU1_AH2_AF2_x(AF2 a){return f32tof16(a.x)|(f32tof16(a.y)<<16);}
-#define AU1_AH2_AF2(a) AU1_AH2_AF2_x(AF2(a))
+#define AU1_AH2_AF2(a) AU1_AH2_AF2_x(AF2(a)) 
 #define AU1_AB4Unorm_AF4(x) D3DCOLORtoUBYTE4(AF4(x))
 AF2 AF2_AH2_AU1_x(AU1 x){return AF2(f16tof32(x&0xFFFF),f16tof32(x>>16));}
 #define AF2_AH2_AU1(x) AF2_AH2_AU1_x(AU1(x))
@@ -906,7 +906,7 @@ AF2 APSinCosF1(AF1 x){AF1 y=AFractF1(x*AF1_(0.5)+AF1_(0.75));y=y*AF1_(2.0)-AF1_(
 #ifdef A_HALF
 AH1 APSinH1(AH1 x){return x*abs(x)-x;}
 AH2 APSinH2(AH2 x){return x*abs(x)-x;} // AND,FMA
-AH1 APCosH1(AH1 x){x=AFractH1(x*AH1_(0.5)+AH1_(0.75));x=x*AH1_(2.0)-AH1_(1.0);return APSinH1(x);}
+AH1 APCosH1(AH1 x){x=AFractH1(x*AH1_(0.5)+AH1_(0.75));x=x*AH1_(2.0)-AH1_(1.0);return APSinH1(x);} 
 AH2 APCosH2(AH2 x){x=AFractH2(x*AH2_(0.5)+AH2_(0.75));x=x*AH2_(2.0)-AH2_(1.0);return APSinH2(x);} // 3x FMA, 2xFRACT, AND
 AH2 APSinCosH1(AH1 x){AH1 y=AFractH1(x*AH1_(0.5)+AH1_(0.75));y=y*AH1_(2.0)-AH1_(1.0);return APSinH2(AH2(x,y));}
 #endif
@@ -1033,9 +1033,9 @@ AF2 ATo709F2(AF2 c){AF3 j=AF3(0.018*4.5,4.5,0.45);AF2 k=AF2(1.099,-0.099);
 return clamp(j.xx ,c*j.yy ,pow(c,j.zz )*k.xx +k.yy );}
 AF3 ATo709F3(AF3 c){AF3 j=AF3(0.018*4.5,4.5,0.45);AF2 k=AF2(1.099,-0.099);
 return clamp(j.xxx,c*j.yyy,pow(c,j.zzz)*k.xxx+k.yyy);}
-AF1 AToGammaF1(AF1 c,AF1 rcpX){return pow(c,AF1_(rcpX));}
-AF2 AToGammaF2(AF2 c,AF1 rcpX){return pow(c,AF2_(rcpX));}
-AF3 AToGammaF3(AF3 c,AF1 rcpX){return pow(c,AF3_(rcpX));}
+AF1 AToGammaF1(AF1 c,AF1 rcpX){return pow(c,AF1_(rcpX));} 
+AF2 AToGammaF2(AF2 c,AF1 rcpX){return pow(c,AF2_(rcpX));} 
+AF3 AToGammaF3(AF3 c,AF1 rcpX){return pow(c,AF3_(rcpX));} 
 AF1 AToPqF1(AF1 x){AF1 p=pow(x,AF1_(0.159302));
 return pow((AF1_(0.835938)+AF1_(18.8516)*p)/(AF1_(1.0)+AF1_(18.6875)*p),AF1_(78.8438));}
 AF2 AToPqF1(AF2 x){AF2 p=pow(x,AF2_(0.159302));
@@ -1062,9 +1062,9 @@ AF2 AFrom709F2(AF2 c){AF3 j=AF3(0.081/4.5,1.0/4.5,1.0/0.45);AF2 k=AF2(1.0/1.099,
 return AZolSelF2(AZolSignedF2(c-j.xx ),c*j.yy ,pow(c*k.xx +k.yy ,j.zz ));}
 AF3 AFrom709F3(AF3 c){AF3 j=AF3(0.081/4.5,1.0/4.5,1.0/0.45);AF2 k=AF2(1.0/1.099,0.099/1.099);
 return AZolSelF3(AZolSignedF3(c-j.xxx),c*j.yyy,pow(c*k.xxx+k.yyy,j.zzz));}
-AF1 AFromGammaF1(AF1 c,AF1 x){return pow(c,AF1_(x));}
-AF2 AFromGammaF2(AF2 c,AF1 x){return pow(c,AF2_(x));}
-AF3 AFromGammaF3(AF3 c,AF1 x){return pow(c,AF3_(x));}
+AF1 AFromGammaF1(AF1 c,AF1 x){return pow(c,AF1_(x));} 
+AF2 AFromGammaF2(AF2 c,AF1 x){return pow(c,AF2_(x));} 
+AF3 AFromGammaF3(AF3 c,AF1 x){return pow(c,AF3_(x));} 
 AF1 AFromPqF1(AF1 x){AF1 p=pow(x,AF1_(0.0126833));
 return pow(ASatF1(p-AF1_(0.835938))/(AF1_(18.8516)-AF1_(18.6875)*p),AF1_(6.27739));}
 AF2 AFromPqF1(AF2 x){AF2 p=pow(x,AF2_(0.0126833));
diff --git a/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_fsr1_flattened.inc b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_fsr1_flattened.inc
similarity index 96%
rename from rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_fsr1_flattened.inc
rename to rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_fsr1_flattened.inc
index 5d8aab1062..5919ab2f4f 100644
--- a/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_fsr1_flattened.inc
+++ b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_fsr1_flattened.inc
@@ -362,7 +362,7 @@ AF1 rcpL=APrxMedRcpF1(AF1_(4.0)*lobe+AF1_(1.0));
 pixR=(lobe*bR+lobe*dR+lobe*hR+lobe*fR+eR)*rcpL;
 pixG=(lobe*bG+lobe*dG+lobe*hG+lobe*fG+eG)*rcpL;
 pixB=(lobe*bB+lobe*dB+lobe*hB+lobe*fB+eB)*rcpL;
-return;}
+return;} 
 #endif
 #if defined(A_GPU)&&defined(A_HALF)&&defined(FSR_RCAS_H)
 AH4 FsrRcasLoadH(ASW2 p);
diff --git a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp
index dc6562289e..6b51a98c7e 100644
--- a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp
+++ b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp
@@ -35,35 +35,24 @@ namespace vk
 		{
 			// Just use AMD-provided source with minimal modification
 			const char* shader_core =
-				#include "Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl"
+				#include "fsr_ubershader.glsl"
 			;
 
 			// Replacements
 			const char* ffx_a_contents =
-				#include "Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_a_flattened.inc"
+				#include "fsr_ffx_a_flattened.inc"
 			;
 
 			const char* ffx_fsr_contents =
-				#include "Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_fsr1_flattened.inc"
+				#include "fsr_ffx_fsr1_flattened.inc"
 			;
 
-			const std::pair<std::string_view, std::string> replacement_table[] =
-			{
-				{ "%FFX_DEFINITIONS%", config_definitions },
-				{ "%FFX_A_IMPORT%", ffx_a_contents },
-				{ "%FFX_FSR_IMPORT%", ffx_fsr_contents },
-				{ "%push_block%", "push_constant" }
-			};
-
 			m_src = shader_core;
-			m_src = fmt::replace_all(m_src, replacement_table);
+			m_src = fmt::replace_all(m_src, { {"%FFX_DEFINITIONS%", config_definitions }, {"%FFX_A_IMPORT%", ffx_a_contents}, {"%FFX_FSR_IMPORT%", ffx_fsr_contents}});
 
 			// Fill with 0 to avoid sending incomplete/unused variables to the GPU
 			memset(m_constants_buf, 0, sizeof(m_constants_buf));
 
-			// No ssbo usage
-			ssbo_count = 0;
-
 			// Enable push constants
 			use_push_constants = true;
 			push_constants_size = push_constants_size_;
@@ -71,33 +60,39 @@ namespace vk
 			create();
 		}
 
-		std::vector<glsl::program_input> fsr_pass::get_inputs()
+		std::vector<std::pair<VkDescriptorType, u8>> fsr_pass::get_descriptor_layout()
+		{
+			return
+			{
+				{ VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1 },
+				{ VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1 }
+			};
+		}
+
+		void fsr_pass::declare_inputs()
 		{
 			std::vector<vk::glsl::program_input> inputs =
 			{
-				glsl::program_input::make(
+				{
 					::glsl::program_domain::glsl_compute_program,
-					"InputTexture",
-					vk::glsl::input_type_texture,
+					vk::glsl::program_input_type::input_type_texture,
+					{}, {},
 					0,
-					0
-				),
-
-				glsl::program_input::make(
+					"InputTexture"
+				},
+				{
 					::glsl::program_domain::glsl_compute_program,
-					"OutputTexture",
-					vk::glsl::input_type_storage_texture,
-					0,
-					1
-				),
+					vk::glsl::program_input_type::input_type_texture,
+					{}, {},
+					1,
+					"OutputTexture"
+				}
 			};
 
-			auto result = compute_task::get_inputs();
-			result.insert(result.end(), inputs.begin(), inputs.end());
-			return result;
+			m_program->load_uniforms(inputs);
 		}
 
-		void fsr_pass::bind_resources(const vk::command_buffer& /*cmd*/)
+		void fsr_pass::bind_resources()
 		{
 			// Bind relevant stuff
 			if (!m_sampler)
@@ -108,22 +103,17 @@ namespace vk
 					VK_FALSE, 0.f, 1.f, 0.f, 0.f, VK_FILTER_LINEAR, VK_FILTER_LINEAR, VK_SAMPLER_MIPMAP_MODE_NEAREST, VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK);
 			}
 
-			m_program->bind_uniform({ m_sampler->value, m_input_image->value, m_input_image->image()->current_layout }, 0, 0);
-			m_program->bind_uniform({ VK_NULL_HANDLE, m_output_image->value, m_output_image->image()->current_layout }, 0, 1);
+			m_program->bind_uniform({ m_sampler->value, m_input_image->value, m_input_image->image()->current_layout }, "InputTexture", VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, m_descriptor_set);
+			m_program->bind_uniform({ VK_NULL_HANDLE, m_output_image->value, m_output_image->image()->current_layout }, "OutputTexture", VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, m_descriptor_set);
 		}
 
 		void fsr_pass::run(const vk::command_buffer& cmd, vk::viewable_image* src, vk::viewable_image* dst, const size2u& input_size, const size2u& output_size)
 		{
-			m_input_image = src->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_IDENTITY));
-			m_output_image = dst->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_IDENTITY));
+			m_input_image = src->get_view(VK_REMAP_IDENTITY, rsx::default_remap_vector);
+			m_output_image = dst->get_view(VK_REMAP_IDENTITY, rsx::default_remap_vector);
 			m_input_size = input_size;
 			m_output_size = output_size;
 
-			if (!m_program)
-			{
-				load_program(cmd);
-			}
-
 			configure(cmd);
 
 			constexpr auto wg_size = 16;
@@ -160,7 +150,7 @@ namespace vk
 				static_cast<f32>(src_image->width()), static_cast<f32>(src_image->height()),     // Size of the raw image to upscale (in case viewport does not cover it all)
 				static_cast<f32>(m_output_size.width), static_cast<f32>(m_output_size.height));  // Size of output viewport (target size)
 
-			vkCmdPushConstants(cmd, m_program->layout(), VK_SHADER_STAGE_COMPUTE_BIT, 0, push_constants_size, m_constants_buf);
+			vkCmdPushConstants(cmd, m_pipeline_layout, VK_SHADER_STAGE_COMPUTE_BIT, 0, push_constants_size, m_constants_buf);
 		}
 
 		rcas_pass::rcas_pass()
@@ -179,7 +169,7 @@ namespace vk
 			auto cas_attenuation = 2.f - (g_cfg.video.vk.rcas_sharpening_intensity / 50.f);
 			FsrRcasCon(&m_constants_buf[0], cas_attenuation);
 
-			vkCmdPushConstants(cmd, m_program->layout(), VK_SHADER_STAGE_COMPUTE_BIT, 0, push_constants_size, m_constants_buf);
+			vkCmdPushConstants(cmd, m_pipeline_layout, VK_SHADER_STAGE_COMPUTE_BIT, 0, push_constants_size, m_constants_buf);
 		}
 
 	} // Namespace FidelityFX
@@ -220,7 +210,7 @@ namespace vk
 				VK_IMAGE_LAYOUT_UNDEFINED,
 				VK_IMAGE_TILING_OPTIMAL,
 				usage,
-				VK_IMAGE_CREATE_ALLOW_NULL_RPCS3,                          // Allow creation to fail if there is no memory
+				VK_IMAGE_CREATE_ALLOW_NULL,                          // Allow creation to fail if there is no memory
 				VMM_ALLOCATION_POOL_SWAPCHAIN,
 				RSX_FORMAT_CLASS_COLOR);
 		};
diff --git a/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ubershader.glsl
similarity index 93%
rename from rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl
rename to rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ubershader.glsl
index a800acb377..bff86f0503 100644
--- a/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl
+++ b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ubershader.glsl
@@ -7,7 +7,7 @@ R"(
 %FFX_DEFINITIONS%
 
 #if defined(SAMPLE_EASU) || defined(SAMPLE_RCAS)
-	layout(%push_block%) uniform const_buffer
+	layout(push_constant) uniform const_buffer
 	{
 		uvec4 Const0;
 		#if SAMPLE_EASU
@@ -29,7 +29,7 @@ layout(set=0,binding=1,rgba8) uniform writeonly image2D OutputTexture;
 		#define FSR_EASU_H 1
 		AH4 FsrEasuRH(AF2 p) { AH4 res = AH4(textureGather(InputTexture, p, 0)); return res; }
 		AH4 FsrEasuGH(AF2 p) { AH4 res = AH4(textureGather(InputTexture, p, 1)); return res; }
-		AH4 FsrEasuBH(AF2 p) { AH4 res = AH4(textureGather(InputTexture, p, 2)); return res; }
+		AH4 FsrEasuBH(AF2 p) { AH4 res = AH4(textureGather(InputTexture, p, 2)); return res; }	
 	#endif
 	#if SAMPLE_RCAS
 		#define FSR_RCAS_H
diff --git a/rpcs3/Emu/RSX/VK/upscalers/fsr_pass.h b/rpcs3/Emu/RSX/VK/upscalers/fsr_pass.h
index 7bff58b049..c5b5b30e73 100644
--- a/rpcs3/Emu/RSX/VK/upscalers/fsr_pass.h
+++ b/rpcs3/Emu/RSX/VK/upscalers/fsr_pass.h
@@ -19,8 +19,9 @@ namespace vk
 			size2u m_output_size;
 			u32 m_constants_buf[20];
 
-			std::vector<glsl::program_input> get_inputs() override;
-			void bind_resources(const vk::command_buffer&) override;
+			std::vector<std::pair<VkDescriptorType, u8>> get_descriptor_layout() override;
+			void declare_inputs() override;
+			void bind_resources() override;
 
 			virtual void configure(const vk::command_buffer& cmd) = 0;
 
diff --git a/rpcs3/Emu/RSX/VK/upscalers/nearest_pass.hpp b/rpcs3/Emu/RSX/VK/upscalers/nearest_pass.hpp
deleted file mode 100644
index 8b878dd9b1..0000000000
--- a/rpcs3/Emu/RSX/VK/upscalers/nearest_pass.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "upscaling.h"
-
-namespace vk
-{
-	struct nearest_upscale_pass : public upscaler
-	{
-		vk::viewable_image* scale_output(
-			const vk::command_buffer& cmd,          // CB
-			vk::viewable_image* src,                // Source input
-			VkImage present_surface,                // Present target. May be VK_NULL_HANDLE for some passes
-			VkImageLayout present_surface_layout,   // Present surface layout, or VK_IMAGE_LAYOUT_UNDEFINED if no present target is provided
-			const VkImageBlit& request,             // Scaling request information
-			rsx::flags32_t mode                     // Mode
-		) override
-		{
-			if (mode & UPSCALE_AND_COMMIT)
-			{
-				ensure(present_surface);
-
-				src->push_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
-				vkCmdBlitImage(cmd, src->value, src->current_layout, present_surface, present_surface_layout, 1, &request, VK_FILTER_NEAREST);
-				src->pop_layout(cmd);
-				return nullptr;
-			}
-
-			// Upscaling source only is unsupported
-			return src;
-		}
-	};
-}
diff --git a/rpcs3/Emu/RSX/VK/upscalers/upscaling.h b/rpcs3/Emu/RSX/VK/upscalers/upscaling.h
index e9ebe31931..3f51558687 100644
--- a/rpcs3/Emu/RSX/VK/upscalers/upscaling.h
+++ b/rpcs3/Emu/RSX/VK/upscalers/upscaling.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "util/types.hpp"
+
 #include "../vkutils/commands.h"
 #include "../vkutils/image.h"
 
diff --git a/rpcs3/Emu/RSX/VK/vkutils/barriers.cpp b/rpcs3/Emu/RSX/VK/vkutils/barriers.cpp
index fb1bb84e34..d5c66b7d89 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/barriers.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/barriers.cpp
@@ -8,14 +8,13 @@
 namespace vk
 {
 	void insert_image_memory_barrier(
-		const vk::command_buffer& cmd, VkImage image,
+		VkCommandBuffer cmd, VkImage image,
 		VkImageLayout current_layout, VkImageLayout new_layout,
 		VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage,
 		VkAccessFlags src_mask, VkAccessFlags dst_mask,
-		const VkImageSubresourceRange& range,
-		bool preserve_renderpass)
+		const VkImageSubresourceRange& range)
 	{
-		if (!preserve_renderpass && vk::is_renderpass_open(cmd))
+		if (vk::is_renderpass_open(cmd))
 		{
 			vk::end_renderpass(cmd);
 		}
@@ -34,15 +33,9 @@ namespace vk
 		vkCmdPipelineBarrier(cmd, src_stage, dst_stage, 0, 0, nullptr, 0, nullptr, 1, &barrier);
 	}
 
-	void insert_buffer_memory_barrier(
-		const vk::command_buffer& cmd,
-		VkBuffer buffer,
-		VkDeviceSize offset, VkDeviceSize length,
-		VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage,
-		VkAccessFlags src_mask, VkAccessFlags dst_mask,
-		bool preserve_renderpass)
+	void insert_buffer_memory_barrier(VkCommandBuffer cmd, VkBuffer buffer, VkDeviceSize offset, VkDeviceSize length, VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage, VkAccessFlags src_mask, VkAccessFlags dst_mask)
 	{
-		if (!preserve_renderpass && vk::is_renderpass_open(cmd))
+		if (vk::is_renderpass_open(cmd))
 		{
 			vk::end_renderpass(cmd);
 		}
@@ -60,13 +53,9 @@ namespace vk
 		vkCmdPipelineBarrier(cmd, src_stage, dst_stage, 0, 0, nullptr, 1, &barrier, 0, nullptr);
 	}
 
-	void insert_global_memory_barrier(
-		const vk::command_buffer& cmd,
-		VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage,
-		VkAccessFlags src_access, VkAccessFlags dst_access,
-		bool preserve_renderpass)
+	void insert_global_memory_barrier(VkCommandBuffer cmd, VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage, VkAccessFlags src_access, VkAccessFlags dst_access)
 	{
-		if (!preserve_renderpass && vk::is_renderpass_open(cmd))
+		if (vk::is_renderpass_open(cmd))
 		{
 			vk::end_renderpass(cmd);
 		}
@@ -78,18 +67,13 @@ namespace vk
 		vkCmdPipelineBarrier(cmd, src_stage, dst_stage, 0, 1, &barrier, 0, nullptr, 0, nullptr);
 	}
 
-	void insert_texture_barrier(
-		const vk::command_buffer& cmd,
-		VkImage image,
-		VkImageLayout current_layout, VkImageLayout new_layout,
-		VkImageSubresourceRange range,
-		bool preserve_renderpass)
+	void insert_texture_barrier(VkCommandBuffer cmd, VkImage image, VkImageLayout current_layout, VkImageLayout new_layout, VkImageSubresourceRange range)
 	{
 		// NOTE: Sampling from an attachment in ATTACHMENT_OPTIMAL layout on some hw ends up with garbage output
 		// Transition to GENERAL if this resource is both input and output
 		// TODO: This implicitly makes the target incompatible with the renderpass declaration; investigate a proper workaround
 		// TODO: This likely throws out hw optimizations on the rest of the renderpass, manage carefully
-		if (!preserve_renderpass && vk::is_renderpass_open(cmd))
+		if (vk::is_renderpass_open(cmd))
 		{
 			vk::end_renderpass(cmd);
 		}
@@ -103,6 +87,12 @@ namespace vk
 		}
 		else
 		{
+			if (!rsx::method_registers.depth_write_enabled() && current_layout == new_layout)
+			{
+				// Nothing to do
+				return;
+			}
+
 			src_access = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
 			src_stage = VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
 		}
@@ -121,9 +111,15 @@ namespace vk
 		vkCmdPipelineBarrier(cmd, src_stage, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, 0, 0, nullptr, 0, nullptr, 1, &barrier);
 	}
 
-	void insert_texture_barrier(const vk::command_buffer& cmd, vk::image* image, VkImageLayout new_layout, bool preserve_renderpass)
+	void insert_texture_barrier(VkCommandBuffer cmd, vk::image* image, VkImageLayout new_layout)
 	{
-		insert_texture_barrier(cmd, image->value, image->current_layout, new_layout, { image->aspect(), 0, 1, 0, 1 }, preserve_renderpass);
+		if (image->samples() > 1)
+		{
+			// This barrier is pointless for multisampled images as they require a resolve operation before access anyway
+			return;
+		}
+
+		insert_texture_barrier(cmd, image->value, image->current_layout, new_layout, { image->aspect(), 0, 1, 0, 1 });
 		image->current_layout = new_layout;
 	}
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/barriers.h b/rpcs3/Emu/RSX/VK/vkutils/barriers.h
index aeda0d2ba0..9ba1a4fd28 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/barriers.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/barriers.h
@@ -5,24 +5,21 @@
 namespace vk
 {
 	class image;
-	class command_buffer;
 
 	//Texture barrier applies to a texture to ensure writes to it are finished before any reads are attempted to avoid RAW hazards
-	void insert_texture_barrier(const vk::command_buffer& cmd, VkImage image, VkImageLayout current_layout, VkImageLayout new_layout, VkImageSubresourceRange range, bool preserve_renderpass = false);
-	void insert_texture_barrier(const vk::command_buffer& cmd, vk::image* image, VkImageLayout new_layout, bool preserve_renderpass = false);
+	void insert_texture_barrier(VkCommandBuffer cmd, VkImage image, VkImageLayout current_layout, VkImageLayout new_layout, VkImageSubresourceRange range);
+	void insert_texture_barrier(VkCommandBuffer cmd, vk::image* image, VkImageLayout new_layout);
 
-	void insert_buffer_memory_barrier(const vk::command_buffer& cmd, VkBuffer buffer, VkDeviceSize offset, VkDeviceSize length,
+	void insert_buffer_memory_barrier(VkCommandBuffer cmd, VkBuffer buffer, VkDeviceSize offset, VkDeviceSize length,
+		VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage, VkAccessFlags src_mask, VkAccessFlags dst_mask);
+
+	void insert_image_memory_barrier(VkCommandBuffer cmd, VkImage image, VkImageLayout current_layout, VkImageLayout new_layout,
 		VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage, VkAccessFlags src_mask, VkAccessFlags dst_mask,
-		bool preserve_renderpass = false);
+		const VkImageSubresourceRange& range);
 
-	void insert_image_memory_barrier(const vk::command_buffer& cmd, VkImage image, VkImageLayout current_layout, VkImageLayout new_layout,
-		VkPipelineStageFlags src_stage, VkPipelineStageFlags dst_stage, VkAccessFlags src_mask, VkAccessFlags dst_mask,
-		const VkImageSubresourceRange& range, bool preserve_renderpass = false);
-
-	void insert_global_memory_barrier(const vk::command_buffer& cmd,
+	void insert_global_memory_barrier(VkCommandBuffer cmd,
 		VkPipelineStageFlags src_stage = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
 		VkPipelineStageFlags dst_stage = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
 		VkAccessFlags src_access = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,
-		VkAccessFlags dst_access = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,
-		bool preserve_renderpass = false);
+		VkAccessFlags dst_access = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT);
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp b/rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp
index 4d7c5237cc..145192d007 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp
@@ -42,11 +42,11 @@ namespace vk
 	buffer::buffer(const vk::render_device& dev, u64 size, const memory_type_info& memory_type, u32 access_flags, VkBufferUsageFlags usage, VkBufferCreateFlags flags, vmm_allocation_pool allocation_pool)
 		: m_device(dev)
 	{
-		info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
-		info.flags = flags;
 		info.size = size;
-		info.usage = usage;
+		info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
 		info.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
+		info.flags = flags;
+		info.usage = usage;
 
 		CHECK_RESULT(vkCreateBuffer(m_device, &info, nullptr, &value));
 
@@ -67,11 +67,11 @@ namespace vk
 	buffer::buffer(const vk::render_device& dev, VkBufferUsageFlags usage, void* host_pointer, u64 size)
 		: m_device(dev)
 	{
-		info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
-		info.flags = 0;
 		info.size = size;
-		info.usage = usage;
+		info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
 		info.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
+		info.flags = 0;
+		info.usage = usage;
 
 		VkExternalMemoryBufferCreateInfoKHR ex_info;
 		ex_info.sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHR;
@@ -82,11 +82,11 @@ namespace vk
 		CHECK_RESULT(vkCreateBuffer(m_device, &info, nullptr, &value));
 
 		auto& memory_map = dev.get_memory_mapping();
-		ensure(_vkGetMemoryHostPointerPropertiesEXT);
+		ensure(memory_map._vkGetMemoryHostPointerPropertiesEXT);
 
 		VkMemoryHostPointerPropertiesEXT memory_properties{};
 		memory_properties.sType = VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT;
-		CHECK_RESULT(_vkGetMemoryHostPointerPropertiesEXT(dev, VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT, host_pointer, &memory_properties));
+		CHECK_RESULT(memory_map._vkGetMemoryHostPointerPropertiesEXT(dev, VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT, host_pointer, &memory_properties));
 
 		VkMemoryRequirements memory_reqs;
 		vkGetBufferMemoryRequirements(m_device, value, &memory_reqs);
diff --git a/rpcs3/Emu/RSX/VK/vkutils/chip_class.cpp b/rpcs3/Emu/RSX/VK/vkutils/chip_class.cpp
index 5bb811d531..ac7f8d886f 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/chip_class.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/chip_class.cpp
@@ -28,9 +28,6 @@ namespace vk
 		table.add(0x7420, 0x743F, chip_class::AMD_navi2x);  // Navi 24 (Beige Goby)
 		table.add(0x163F,         chip_class::AMD_navi2x);  // Navi 2X (Van Gogh)
 		table.add(0x164D, 0x1681, chip_class::AMD_navi2x);  // Navi 2X (Yellow Carp)
-		table.add(0x7440, 0x745F, chip_class::AMD_navi3x);  // Navi 31 (Only 744c, NAVI31XTX is confirmed)
-		table.add(0x7460, 0x747F, chip_class::AMD_navi3x);  // Navi 32 (Unverified)
-		table.add(0x7480, 0x749F, chip_class::AMD_navi3x);  // Navi 33 (Unverified)
 
 		return table;
 	}();
@@ -42,42 +39,22 @@ namespace vk
 
 		// NV cards. See https://envytools.readthedocs.io/en/latest/hw/pciid.html
 		// NOTE: Since NV device IDs are linearly incremented per generation, there is no need to carefully check all the ranges
-		table.add(0x1180, 0x11FA, chip_class::NV_kepler);   // GK104, 106
-		table.add(0x0FC0, 0x0FFF, chip_class::NV_kepler);   // GK107
-		table.add(0x1003, 0x102F, chip_class::NV_kepler);   // GK110, GK210
-		table.add(0x1280, 0x12BA, chip_class::NV_kepler);   // GK208
-		table.add(0x1381, 0x13B0, chip_class::NV_maxwell);  // GM107
-		table.add(0x1340, 0x134D, chip_class::NV_maxwell);  // GM108
-		table.add(0x13C0, 0x13D9, chip_class::NV_maxwell);  // GM204
-		table.add(0x1401, 0x1427, chip_class::NV_maxwell);  // GM206
-		table.add(0x15F7, 0x15F9, chip_class::NV_pascal);   // GP100 (Tesla P100)
+		table.add(0x1180, 0x11FA, chip_class::NV_kepler);  // GK104, 106
+		table.add(0x0FC0, 0x0FFF, chip_class::NV_kepler);  // GK107
+		table.add(0x1003, 0x102F, chip_class::NV_kepler);  // GK110, GK210
+		table.add(0x1280, 0x12BA, chip_class::NV_kepler);  // GK208
+		table.add(0x1381, 0x13B0, chip_class::NV_maxwell); // GM107
+		table.add(0x1340, 0x134D, chip_class::NV_maxwell); // GM108
+		table.add(0x13C0, 0x13D9, chip_class::NV_maxwell); // GM204
+		table.add(0x1401, 0x1427, chip_class::NV_maxwell); // GM206
+		table.add(0x15F7, 0x15F9, chip_class::NV_pascal);  // GP100 (Tesla P100)
 		table.add(0x1B00, 0x1D80, chip_class::NV_pascal);
 		table.add(0x1D81, 0x1DBA, chip_class::NV_volta);
-		table.add(0x1E02, 0x1F54, chip_class::NV_turing);   // TU102, TU104, TU106, TU106M, TU106GL (RTX 20 series)
-		table.add(0x1F82, 0x1FB9, chip_class::NV_turing);   // TU117, TU117M, TU117GL
-		table.add(0x2182, 0x21D1, chip_class::NV_turing);   // TU116, TU116M, TU116GL
-		table.add(0x20B0, 0x20BE, chip_class::NV_ampere);   // GA100
-		table.add(0x2204, 0x25AF, chip_class::NV_ampere);   // GA10x (RTX 30 series)
-		table.add(0x2684, 0x27FF, chip_class::NV_lovelace); // AD102, AD103 (RTX40 series)
-
-		return table;
-	}();
-
-	static const chip_family_table s_INTEL_family_tree = []()
-	{
-		chip_family_table table;
-		table.default_ = chip_class::INTEL_generic; // UHD and other older chips we don't care about
-
-		// INTEL DG2+ cards. See https://github.com/torvalds/linux/blob/d88520ad73b79e71e3ddf08de335b8520ae41c5c/include/drm/i915_pciids.h#L702
-		// Naming on DG2 is pretty consistent, XX9X is mobile arc, XXAX is desktop and XXBX is Pro
-		table.add(0x5690, 0x5692, chip_class::INTEL_alchemist); // G10M
-		table.add(0x56A0, 0x56A2, chip_class::INTEL_alchemist); // G10
-		table.add(0x5693, 0x5695, chip_class::INTEL_alchemist); // G11M
-		table.add(0x56A5, 0x56A6, chip_class::INTEL_alchemist); // G11
-		table.add(0x56B0, 0x56B1, chip_class::INTEL_alchemist); // G11-Pro
-		table.add(0x5696, 0x5697, chip_class::INTEL_alchemist); // G12M
-		table.add(0x56A3, 0x56A4, chip_class::INTEL_alchemist); // G12
-		table.add(0x56B2, 0x56B3, chip_class::INTEL_alchemist); // G12-Pro
+		table.add(0x1E02, 0x1F54, chip_class::NV_turing);  // TU102, TU104, TU106, TU106M, TU106GL (RTX 20 series)
+		table.add(0x1F82, 0x1FB9, chip_class::NV_turing);  // TU117, TU117M, TU117GL
+		table.add(0x2182, 0x21D1, chip_class::NV_turing);  // TU116, TU116M, TU116GL
+		table.add(0x20B0, 0x20BE, chip_class::NV_ampere);  // GA100
+		table.add(0x2204, 0x25AF, chip_class::NV_ampere);  // GA10x (RTX 30 series)
 
 		return table;
 	}();
@@ -101,20 +78,6 @@ namespace vk
 			return s_AMD_family_tree.find(device_id);
 		}
 
-		if (vendor_id == 0x106B)
-		{
-#ifdef __APPLE__
-			return chip_class::APPLE_MVK;
-#else
-			return chip_class::APPLE_HK_generic; // Lazy, but at the moment we don't care about the differences in M1, M2, M3, M4, etc
-#endif
-		}
-
-		if (vendor_id == 0x8086)
-		{
-			return s_INTEL_family_tree.find(device_id);
-		}
-
 		return chip_class::unknown;
 	}
 
diff --git a/rpcs3/Emu/RSX/VK/vkutils/chip_class.h b/rpcs3/Emu/RSX/VK/vkutils/chip_class.h
index 07fbb9a1c9..2def2d58ac 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/chip_class.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/chip_class.h
@@ -9,36 +9,18 @@ namespace vk
 	enum class chip_class
 	{
 		unknown,
-
-		// AMD
 		AMD_gcn_generic,
 		AMD_polaris,
 		AMD_vega,
 		AMD_navi1x,
 		AMD_navi2x,
-		AMD_navi3x,
-		_AMD_ENUM_MAX_, // Do not insert AMD enums beyond this point
-
-		// NVIDIA
 		NV_generic,
 		NV_kepler,
 		NV_maxwell,
 		NV_pascal,
 		NV_volta,
 		NV_turing,
-		NV_ampere,
-		NV_lovelace,
-		_NV_ENUM_MAX_, // Do not insert NV enums beyond this point
-
-		// APPLE
-		APPLE_HK_generic,
-		APPLE_MVK,
-		_APPLE_ENUM_MAX, // Do not insert APPLE enums beyond this point
-
-		// INTEL
-		INTEL_generic,
-		INTEL_alchemist,
-		_INTEL_ENUM_MAX_, // Do not insert INTEL enums beyond this point
+		NV_ampere
 	};
 
 	enum class driver_vendor
@@ -48,15 +30,7 @@ namespace vk
 		NVIDIA,
 		RADV,
 		INTEL,
-		ANV,
-		MVK,
-		DOZEN,
-		LAVAPIPE,
-		NVK,
-		V3DV,
-		HONEYKRISP,
-		PANVK,
-		ARM_MALI
+		ANV
 	};
 
 	driver_vendor get_driver_vendor();
@@ -74,12 +48,4 @@ namespace vk
 
 	chip_class get_chip_family();
 	chip_class get_chip_family(u32 vendor_id, u32 device_id);
-
-	static inline bool is_NVIDIA(chip_class chip) { return chip >= chip_class::NV_generic && chip < chip_class::_NV_ENUM_MAX_; }
-	static inline bool is_AMD(chip_class chip) { return chip >= chip_class::AMD_gcn_generic && chip < chip_class::_AMD_ENUM_MAX_; }
-	static inline bool is_INTEL(chip_class chip) { return chip >= chip_class::INTEL_generic && chip < chip_class::_INTEL_ENUM_MAX_; }
-
-	static inline bool is_NVIDIA(driver_vendor vendor) { return vendor == driver_vendor::NVIDIA || vendor == driver_vendor::NVK; }
-	static inline bool is_AMD(driver_vendor vendor) { return vendor == driver_vendor::AMD || vendor == driver_vendor::RADV; }
-	static inline bool is_INTEL(driver_vendor vendor) { return vendor == driver_vendor::INTEL || vendor == driver_vendor::ANV; }
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/commands.cpp b/rpcs3/Emu/RSX/VK/vkutils/commands.cpp
index c66c63f893..162cf3c9a4 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/commands.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/commands.cpp
@@ -6,7 +6,7 @@
 namespace vk
 {
 	// This queue flushing method to be implemented by the backend as behavior depends on config
-	void queue_submit(const queue_submit_t& submit_info, VkBool32 flush);
+	void queue_submit(VkQueue queue, const VkSubmitInfo* info, fence* pfence, VkBool32 flush = VK_FALSE);
 
 	void command_pool::create(vk::render_device& dev, u32 queue_family_id)
 	{
@@ -45,7 +45,7 @@ namespace vk
 		return pool;
 	}
 
-	void command_buffer::create(command_pool& cmd_pool)
+	void command_buffer::create(command_pool& cmd_pool, bool auto_reset)
 	{
 		VkCommandBufferAllocateInfo infos = {};
 		infos.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
@@ -54,7 +54,11 @@ namespace vk
 		infos.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
 		CHECK_RESULT(vkAllocateCommandBuffers(cmd_pool.get_owner(), &infos, &commands));
 
-		m_submit_fence = new fence(cmd_pool.get_owner());
+		if (auto_reset)
+		{
+			m_submit_fence = new fence(cmd_pool.get_owner());
+		}
+
 		pool = &cmd_pool;
 	}
 
@@ -108,7 +112,7 @@ namespace vk
 		is_open = false;
 	}
 
-	void command_buffer::submit(queue_submit_t& submit_info, VkBool32 flush)
+	void command_buffer::submit(VkQueue queue, VkSemaphore wait_semaphore, VkSemaphore signal_semaphore, fence* pfence, VkPipelineStageFlags pipeline_stage_flags, VkBool32 flush)
 	{
 		if (is_open)
 		{
@@ -119,14 +123,31 @@ namespace vk
 		// Check for hanging queries to avoid driver hang
 		ensure((flags & cb_has_open_query) == 0); // "close and submit of commandbuffer with a hanging query!"
 
-		if (!submit_info.pfence)
+		if (!pfence)
 		{
-			submit_info.pfence = m_submit_fence;
-			is_pending = bool(submit_info.pfence);
+			pfence = m_submit_fence;
+			is_pending = bool(pfence);
 		}
 
-		submit_info.commands = this->commands;
-		queue_submit(submit_info, flush);
+		VkSubmitInfo infos = {};
+		infos.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+		infos.commandBufferCount = 1;
+		infos.pCommandBuffers = &commands;
+		infos.pWaitDstStageMask = &pipeline_stage_flags;
+
+		if (wait_semaphore)
+		{
+			infos.waitSemaphoreCount = 1;
+			infos.pWaitSemaphores = &wait_semaphore;
+		}
+
+		if (signal_semaphore)
+		{
+			infos.signalSemaphoreCount = 1;
+			infos.pSignalSemaphores = &signal_semaphore;
+		}
+
+		queue_submit(queue, &infos, pfence, flush);
 		clear_flags();
 	}
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/commands.h b/rpcs3/Emu/RSX/VK/vkutils/commands.h
index 65ebfe95b2..39db239872 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/commands.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/commands.h
@@ -25,69 +25,33 @@ namespace vk
 		operator VkCommandPool() const;
 	};
 
-	struct queue_submit_t
-	{
-		VkQueue queue = VK_NULL_HANDLE;
-		fence* pfence = nullptr;
-		VkCommandBuffer commands = VK_NULL_HANDLE;
-		std::array<VkSemaphore, 4> wait_semaphores;
-		std::array<VkSemaphore, 4> signal_semaphores;
-		std::array<VkPipelineStageFlags, 4> wait_stages;
-		u32 wait_semaphores_count = 0;
-		u32 signal_semaphores_count = 0;
-
-		queue_submit_t() = default;
-		queue_submit_t(VkQueue queue_, vk::fence* fence_)
-			: queue(queue_), pfence(fence_) {}
-
-		queue_submit_t(const queue_submit_t& other)
-		{
-			std::memcpy(static_cast<void*>(this), &other, sizeof(queue_submit_t));
-		}
-
-		inline queue_submit_t& wait_on(VkSemaphore semaphore, VkPipelineStageFlags stage)
-		{
-			ensure(wait_semaphores_count < 4);
-			wait_semaphores[wait_semaphores_count] = semaphore;
-			wait_stages[wait_semaphores_count++] = stage;
-			return *this;
-		}
-
-		inline queue_submit_t& queue_signal(VkSemaphore semaphore)
-		{
-			ensure(signal_semaphores_count < 4);
-			signal_semaphores[signal_semaphores_count++] = semaphore;
-			return *this;
-		}
-	};
-
 	class command_buffer
 	{
-	protected:
+	private:
 		bool is_open = false;
 		bool is_pending = false;
 		fence* m_submit_fence = nullptr;
 
+	protected:
 		command_pool* pool = nullptr;
 		VkCommandBuffer commands = nullptr;
 
 	public:
 		enum access_type_hint
 		{
-			flush_only, // Only to be submitted/opened/closed via command flush
-			all         // Auxiliary, can be submitted/opened/closed at any time
+			flush_only, //Only to be submitted/opened/closed via command flush
+			all         //Auxiliary, can be submitted/opened/closed at any time
 		}
 		access_hint = flush_only;
 
 		enum command_buffer_data_flag : u32
 		{
-			cb_has_occlusion_task = 0x01,
-			cb_has_blit_transfer  = 0x02,
-			cb_has_dma_transfer   = 0x04,
-			cb_has_open_query     = 0x08,
-			cb_load_occluson_task = 0x10,
-			cb_has_conditional_render = 0x20,
-			cb_reload_dynamic_state   = 0x40
+			cb_has_occlusion_task = 1,
+			cb_has_blit_transfer = 2,
+			cb_has_dma_transfer = 4,
+			cb_has_open_query = 8,
+			cb_load_occluson_task = 16,
+			cb_has_conditional_render = 32
 		};
 		u32 flags = 0;
 
@@ -95,12 +59,12 @@ namespace vk
 		command_buffer() = default;
 		~command_buffer() = default;
 
-		void create(command_pool& cmd_pool);
+		void create(command_pool& cmd_pool, bool auto_reset = false);
 		void destroy();
 
 		void begin();
 		void end();
-		void submit(queue_submit_t& submit_info, VkBool32 flush = VK_FALSE);
+		void submit(VkQueue queue, VkSemaphore wait_semaphore, VkSemaphore signal_semaphore, fence* pfence, VkPipelineStageFlags pipeline_stage_flags, VkBool32 flush = VK_FALSE);
 
 		// Properties
 		command_pool& get_command_pool() const
diff --git a/rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp b/rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp
index 1d7fab0cab..21d96064a0 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp
@@ -53,13 +53,18 @@ namespace vk
 	{
 		// Create new heap. All sizes are aligned up by 64M, upto 1GiB
 		const usz size_limit = 1024 * 0x100000;
-		usz aligned_new_size = utils::align(m_size + size, 64 * 0x100000);
+		const usz aligned_new_size = utils::align(m_size + size, 64 * 0x100000);
 
 		if (aligned_new_size >= size_limit)
 		{
-			// Too large, try to swap out the heap instead of growing.
-			rsx_log.error("[%s] Pool limit was reached. Will attempt to swap out the current heap.", m_name);
-			aligned_new_size = size_limit;
+			// Too large
+			return false;
+		}
+
+		if (shadow)
+		{
+			// Shadowed. Growing this can be messy as it requires double allocation (macOS only)
+			return false;
 		}
 
 		// Wait for DMA activity to end
@@ -81,19 +86,7 @@ namespace vk
 		::data_heap::init(aligned_new_size, m_name, m_min_guard_size);
 
 		// Discard old heap and create a new one. Old heap will be garbage collected when no longer needed
-		auto gc = get_resource_manager();
-		if (shadow)
-		{
-			rsx_log.warning("Buffer usage %u is not heap-compatible using this driver, explicit staging buffer in use", usage);
-
-			gc->dispose(shadow);
-			shadow = std::make_unique<buffer>(*g_render_device, aligned_new_size, memory_index, memory_flags, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, 0, VMM_ALLOCATION_POOL_SYSTEM);
-			usage |= VK_BUFFER_USAGE_TRANSFER_DST_BIT;
-			memory_flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
-			memory_index = memory_map.device_local;
-		}
-
-		gc->dispose(heap);
+		get_resource_manager()->dispose(heap);
 		heap = std::make_unique<buffer>(*g_render_device, aligned_new_size, memory_index, memory_flags, usage, 0, VMM_ALLOCATION_POOL_SYSTEM);
 
 		if (notify_on_grow)
@@ -159,6 +152,20 @@ namespace vk
 		return !dirty_ranges.empty();
 	}
 
+	bool data_heap::is_critical() const
+	{
+		if (!::data_heap::is_critical())
+			return false;
+
+		// By default, allow the size to grow upto 8x larger
+		// This value is arbitrary, theoretically it is possible to allow infinite stretching to improve performance
+		const usz soft_limit = initial_size * 8;
+		if ((m_size + m_min_guard_size) < soft_limit)
+			return false;
+
+		return true;
+	}
+
 	data_heap* get_upload_heap()
 	{
 		if (!g_upload_heap.heap)
diff --git a/rpcs3/Emu/RSX/VK/vkutils/data_heap.h b/rpcs3/Emu/RSX/VK/vkutils/data_heap.h
index 8d8c6e3be3..d8fb876edd 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/data_heap.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/data_heap.h
@@ -6,7 +6,6 @@
 #include "commands.h"
 
 #include <memory>
-#include <type_traits>
 #include <vector>
 
 namespace vk
@@ -39,19 +38,11 @@ namespace vk
 		void* map(usz offset, usz size);
 		void unmap(bool force = false);
 
-		template<int Alignment, typename T = char>
-			requires std::is_trivially_destructible_v<T>
-		std::pair<usz, T*> alloc_and_map(usz count)
-		{
-			const auto size_bytes = count * sizeof(T);
-			const auto addr = alloc<Alignment>(size_bytes);
-			return { addr, reinterpret_cast<T*>(map(addr, size_bytes)) };
-		}
-
 		void sync(const vk::command_buffer& cmd);
 
 		// Properties
 		bool is_dirty() const;
+		bool is_critical() const override;
 	};
 
 	extern data_heap* get_upload_heap();
diff --git a/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp b/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp
deleted file mode 100644
index b5e62f33f6..0000000000
--- a/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp
+++ /dev/null
@@ -1,492 +0,0 @@
-#include "Emu/IdManager.h"
-#include "descriptors.h"
-#include "garbage_collector.h"
-
-namespace vk
-{
-	// Error handler callback
-	extern void on_descriptor_pool_fragmentation(bool fatal);
-
-	namespace descriptors
-	{
-		class dispatch_manager
-		{
-		public:
-			inline void flush_all()
-			{
-				std::lock_guard lock(m_notifications_lock);
-
-				for (auto& set : m_notification_list)
-				{
-					set->flush();
-				}
-
-				m_notification_list.clear();
-			}
-
-			void register_(descriptor_set* set)
-			{
-				std::lock_guard lock(m_notifications_lock);
-
-				m_notification_list.push_back(set);
-				// rsx_log.notice("[descriptor_manager::register] Now monitoring %u descriptor sets", m_notification_list.size());
-			}
-
-			void deregister(descriptor_set* set)
-			{
-				std::lock_guard lock(m_notifications_lock);
-
-				m_notification_list.erase_if(FN(x == set));
-				// rsx_log.notice("[descriptor_manager::deregister] Now monitoring %u descriptor sets", m_notification_list.size());
-			}
-
-			void destroy()
-			{
-				std::lock_guard lock(m_notifications_lock);
-				m_notification_list.clear();
-			}
-
-			dispatch_manager() = default;
-
-		private:
-			rsx::simple_array<descriptor_set*> m_notification_list;
-			std::mutex m_notifications_lock;
-
-			dispatch_manager(const dispatch_manager&) = delete;
-			dispatch_manager& operator = (const dispatch_manager&) = delete;
-		};
-
-		void init()
-		{
-			g_fxo->init<dispatch_manager>();
-		}
-
-		void flush()
-		{
-			g_fxo->get<dispatch_manager>().flush_all();
-		}
-
-		void destroy()
-		{
-			g_fxo->get<dispatch_manager>().destroy();
-		}
-
-		VkDescriptorSetLayout create_layout(const rsx::simple_array<VkDescriptorSetLayoutBinding>& bindings)
-		{
-			VkDescriptorSetLayoutCreateInfo infos = {};
-			infos.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
-			infos.pBindings = bindings.data();
-			infos.bindingCount = ::size32(bindings);
-
-			VkDescriptorSetLayoutBindingFlagsCreateInfo binding_infos = {};
-			rsx::simple_array<VkDescriptorBindingFlags> binding_flags;
-
-			const auto deferred_mask = g_render_device->get_descriptor_update_after_bind_support();
-			binding_flags.resize(::size32(bindings));
-
-			for (u32 i = 0; i < binding_flags.size(); ++i)
-			{
-				if ((1ull << bindings[i].descriptorType) & ~deferred_mask)
-				{
-					binding_flags[i] = 0u;
-				}
-				else
-				{
-					binding_flags[i] = VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT;
-				}
-			}
-
-			binding_infos.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO;
-			binding_infos.pNext = nullptr;
-			binding_infos.bindingCount = ::size32(binding_flags);
-			binding_infos.pBindingFlags = binding_flags.data();
-
-			infos.pNext = &binding_infos;
-			infos.flags |= VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT;
-
-			VkDescriptorSetLayout result;
-			CHECK_RESULT(vkCreateDescriptorSetLayout(*g_render_device, &infos, nullptr, &result));
-			return result;
-		}
-	}
-
-	void descriptor_pool::create(const vk::render_device& dev, const rsx::simple_array<VkDescriptorPoolSize>& pool_sizes, u32 max_sets)
-	{
-		ensure(max_sets > 16);
-
-		m_create_info_pool_sizes = pool_sizes;
-
-		for (auto& size : m_create_info_pool_sizes)
-		{
-			ensure(size.descriptorCount < 128); // Sanity check. Remove before commit.
-			size.descriptorCount *= max_sets;
-		}
-
-		m_create_info.flags = dev.get_descriptor_update_after_bind_support() ? VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT : 0;
-		m_create_info.maxSets = max_sets;
-		m_create_info.poolSizeCount = m_create_info_pool_sizes.size();
-		m_create_info.pPoolSizes = m_create_info_pool_sizes.data();
-		m_create_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
-
-		m_owner = &dev;
-		next_subpool();
-	}
-
-	void descriptor_pool::destroy()
-	{
-		if (m_device_subpools.empty()) return;
-
-		for (auto& pool : m_device_subpools)
-		{
-			vkDestroyDescriptorPool((*m_owner), pool.handle, nullptr);
-			pool.handle = VK_NULL_HANDLE;
-		}
-
-		m_owner = nullptr;
-	}
-
-	void descriptor_pool::reset(u32 subpool_id, VkDescriptorPoolResetFlags flags)
-	{
-		std::lock_guard lock(m_subpool_lock);
-
-		CHECK_RESULT(vkResetDescriptorPool(*m_owner, m_device_subpools[subpool_id].handle, flags));
-		m_device_subpools[subpool_id].busy = VK_FALSE;
-	}
-
-	VkDescriptorSet descriptor_pool::allocate(VkDescriptorSetLayout layout, VkBool32 use_cache)
-	{
-		if (use_cache)
-		{
-			if (m_descriptor_set_cache.empty())
-			{
-				// For optimal cache utilization, each pool should only allocate one layout
-				m_cached_layout = layout;
-			}
-			else if (m_cached_layout != layout)
-			{
-				use_cache = VK_FALSE;
-			}
-			else
-			{
-				return m_descriptor_set_cache.pop_back();
-			}
-		}
-
-		if (!can_allocate(use_cache ? 4 : 1, m_current_subpool_offset))
-		{
-			next_subpool();
-		}
-
-		VkDescriptorSet new_descriptor_set;
-		VkDescriptorSetAllocateInfo alloc_info = {};
-		alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
-		alloc_info.descriptorPool = m_current_pool_handle;
-		alloc_info.descriptorSetCount = 1;
-		alloc_info.pSetLayouts = &layout;
-
-		if (use_cache)
-		{
-			const auto alloc_size = std::min<u32>(m_create_info.maxSets - m_current_subpool_offset, max_cache_size);
-			m_allocation_request_cache.resize(alloc_size);
-			for (auto& layout_ : m_allocation_request_cache)
-			{
-				layout_ = m_cached_layout;
-			}
-
-			ensure(m_descriptor_set_cache.empty());
-			alloc_info.descriptorSetCount = alloc_size;
-			alloc_info.pSetLayouts = m_allocation_request_cache.data();
-
-			m_descriptor_set_cache.resize(alloc_size);
-			CHECK_RESULT(vkAllocateDescriptorSets(*m_owner, &alloc_info, m_descriptor_set_cache.data()));
-
-			m_current_subpool_offset += alloc_size;
-			new_descriptor_set = m_descriptor_set_cache.pop_back();
-		}
-		else
-		{
-			m_current_subpool_offset++;
-			CHECK_RESULT(vkAllocateDescriptorSets(*m_owner, &alloc_info, &new_descriptor_set));
-		}
-
-		return new_descriptor_set;
-	}
-
-	void descriptor_pool::next_subpool()
-	{
-		if (m_current_subpool_index != umax)
-		{
-			// Enqueue release using gc
-			auto release_func = [subpool_index=m_current_subpool_index, this]()
-			{
-				this->reset(subpool_index, 0);
-			};
-
-			auto cleanup_obj = std::make_unique<gc_callback_t>(release_func);
-			vk::get_gc()->dispose(cleanup_obj);
-		}
-
-		m_current_subpool_offset = 0;
-		m_current_subpool_index = umax;
-
-		const int max_retries = 2;
-		int retries = max_retries;
-
-		do
-		{
-			for (u32 index = 0; index < m_device_subpools.size(); ++index)
-			{
-				if (!m_device_subpools[index].busy)
-				{
-					m_current_subpool_index = index;
-					goto done; // Nested break
-				}
-			}
-
-			VkDescriptorPool subpool = VK_NULL_HANDLE;
-			if (VkResult result = vkCreateDescriptorPool(*m_owner, &m_create_info, nullptr, &subpool))
-			{
-				if (retries-- && (result == VK_ERROR_FRAGMENTATION_EXT))
-				{
-					rsx_log.warning("Descriptor pool creation failed with fragmentation error. Will attempt to recover.");
-					vk::on_descriptor_pool_fragmentation(!retries);
-					continue;
-				}
-
-				vk::die_with_error(result);
-				fmt::throw_exception("Unreachable");
-			}
-
-			// New subpool created successfully
-			std::lock_guard lock(m_subpool_lock);
-
-			m_device_subpools.push_back(
-			{
-				.handle = subpool,
-				.busy = VK_FALSE
-			});
-
-			m_current_subpool_index = m_device_subpools.size() - 1;
-
-		} while (m_current_subpool_index == umax);
-
-	done:
-		m_device_subpools[m_current_subpool_index].busy = VK_TRUE;
-		m_current_pool_handle = m_device_subpools[m_current_subpool_index].handle;
-	}
-
-	descriptor_set::descriptor_set(VkDescriptorSet set)
-	{
-		flush();
-		m_handle = set;
-	}
-
-	descriptor_set::~descriptor_set()
-	{
-		if (m_update_after_bind_mask)
-		{
-			g_fxo->get<descriptors::dispatch_manager>().deregister(this);
-		}
-	}
-
-	void descriptor_set::init(VkDescriptorSet new_set)
-	{
-		if (!m_in_use) [[unlikely]]
-		{
-			m_image_info_pool.reserve(m_pool_size);
-			m_buffer_view_pool.reserve(m_pool_size);
-			m_buffer_info_pool.reserve(m_pool_size);
-
-			m_in_use = true;
-			m_update_after_bind_mask = g_render_device->get_descriptor_update_after_bind_support();
-		}
-		else if (m_push_type_mask & ~m_update_after_bind_mask)
-		{
-			flush();
-		}
-
-		m_handle = new_set;
-	}
-
-	void descriptor_set::swap(descriptor_set& other)
-	{
-		const auto other_handle = other.m_handle;
-		other.flush();
-		other.m_handle = m_handle;
-		init(other_handle);
-	}
-
-	descriptor_set& descriptor_set::operator = (VkDescriptorSet set)
-	{
-		init(set);
-		return *this;
-	}
-
-	VkDescriptorSet* descriptor_set::ptr()
-	{
-		if (!m_in_use) [[likely]]
-		{
-			init(m_handle);
-		}
-
-		return &m_handle;
-	}
-
-	void descriptor_set::push(const VkBufferView& buffer_view, VkDescriptorType type, u32 binding)
-	{
-		m_push_type_mask |= (1ull << type);
-		m_buffer_view_pool.push_back(buffer_view);
-		m_pending_writes.emplace_back(
-			VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,    // sType
-			nullptr,                                   // pNext
-			m_handle,                                  // dstSet
-			binding,                                   // dstBinding
-			0,                                         // dstArrayElement
-			1,                                         // descriptorCount
-			type,                                      // descriptorType
-			nullptr,                                   // pImageInfo
-			nullptr,                                   // pBufferInfo
-			&m_buffer_view_pool.back()                 // pTexelBufferView
-		);
-	}
-
-	void descriptor_set::push(const VkDescriptorBufferInfo& buffer_info, VkDescriptorType type, u32 binding)
-	{
-		m_push_type_mask |= (1ull << type);
-		m_buffer_info_pool.push_back(buffer_info);
-		m_pending_writes.emplace_back(
-			VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,    // sType
-			nullptr,                                   // pNext
-			m_handle,                                  // dstSet
-			binding,                                   // dstBinding
-			0,                                         // dstArrayElement
-			1,                                         // descriptorCount
-			type,                                      // descriptorType
-			nullptr,                                   // pImageInfo
-			&m_buffer_info_pool.back(),                // pBufferInfo
-			nullptr                                    // pTexelBufferView
-		);
-	}
-
-	void descriptor_set::push(const VkDescriptorImageInfo& image_info, VkDescriptorType type, u32 binding)
-	{
-		m_push_type_mask |= (1ull << type);
-		m_image_info_pool.push_back(image_info);
-		m_pending_writes.emplace_back(
-			VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,    // sType
-			nullptr,                                   // pNext
-			m_handle,                                  // dstSet
-			binding,                                   // dstBinding
-			0,                                         // dstArrayElement
-			1,                                         // descriptorCount
-			type,                                      // descriptorType
-			&m_image_info_pool.back(),                 // pImageInfo
-			nullptr,                                   // pBufferInfo
-			nullptr                                    // pTexelBufferView
-		);
-	}
-
-	void descriptor_set::push(const VkDescriptorImageInfo* image_info, u32 count, VkDescriptorType type, u32 binding)
-	{
-		VkWriteDescriptorSet writer =
-		{
-			VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,    // sType
-			nullptr,                                   // pNext
-			m_handle,                                  // dstSet
-			binding,                                   // dstBinding
-			0,                                         // dstArrayElement
-			count,                                     // descriptorCount
-			type,                                      // descriptorType
-			image_info,                                // pImageInfo
-			nullptr,                                   // pBufferInfo
-			nullptr                                    // pTexelBufferView
-		};
-		vkUpdateDescriptorSets(*g_render_device, 1, &writer, 0, nullptr);
-	}
-
-	void descriptor_set::push(rsx::simple_array<VkCopyDescriptorSet>& copy_cmd, u32 type_mask)
-	{
-		m_push_type_mask |= type_mask;
-
-		if (m_pending_copies.empty()) [[likely]]
-		{
-			m_pending_copies = std::move(copy_cmd);
-			return;
-		}
-
-		m_pending_copies += copy_cmd;
-	}
-
-	void descriptor_set::push(rsx::simple_array<VkWriteDescriptorSet>& write_cmds, u32 type_mask)
-	{
-		m_push_type_mask |= type_mask;
-
-#if !defined(__clang__) || (__clang_major__ >= 16)
-		if (m_pending_writes.empty()) [[unlikely]]
-		{
-			m_pending_writes = std::move(write_cmds);
-			return;
-		}
-#endif
-		m_pending_writes += write_cmds;
-	}
-
-	void descriptor_set::push(const descriptor_set_dynamic_offset_t& offset)
-	{
-		ensure(offset.location >= 0 && offset.location <= 16);
-		while (m_dynamic_offsets.size() < (static_cast<u32>(offset.location) + 1u))
-		{
-			m_dynamic_offsets.push_back(0);
-		}
-
-		m_dynamic_offsets[offset.location] = offset.value;
-	}
-
-	void descriptor_set::on_bind()
-	{
-		if (!m_push_type_mask)
-		{
-			ensure(m_pending_writes.empty());
-			return;
-		}
-
-		// We have queued writes
-		if ((m_push_type_mask & ~m_update_after_bind_mask) ||
-			(m_pending_writes.size() >= max_cache_size))
-		{
-			flush();
-			return;
-		}
-
-		// Register for async flush
-		ensure(m_update_after_bind_mask);
-		g_fxo->get<descriptors::dispatch_manager>().register_(this);
-	}
-
-	void descriptor_set::bind(const vk::command_buffer& cmd, VkPipelineBindPoint bind_point, VkPipelineLayout layout)
-	{
-		// Notify
-		on_bind();
-
-		vkCmdBindDescriptorSets(cmd, bind_point, layout, 0, 1, &m_handle, ::size32(m_dynamic_offsets), m_dynamic_offsets.data());
-	}
-
-	void descriptor_set::flush()
-	{
-		if (!m_push_type_mask)
-		{
-			return;
-		}
-
-		const auto num_writes = ::size32(m_pending_writes);
-		const auto num_copies = ::size32(m_pending_copies);
-		vkUpdateDescriptorSets(*g_render_device, num_writes, m_pending_writes.data(), num_copies, m_pending_copies.data());
-
-		m_push_type_mask = 0;
-		m_pending_writes.clear();
-		m_pending_copies.clear();
-		m_image_info_pool.clear();
-		m_buffer_info_pool.clear();
-		m_buffer_view_pool.clear();
-	}
-}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/descriptors.h b/rpcs3/Emu/RSX/VK/vkutils/descriptors.h
deleted file mode 100644
index c2cf5deb20..0000000000
--- a/rpcs3/Emu/RSX/VK/vkutils/descriptors.h
+++ /dev/null
@@ -1,169 +0,0 @@
-#pragma once
-
-#include "../VulkanAPI.h"
-#include "Utilities/mutex.h"
-
-#include "commands.h"
-#include "device.h"
-
-#include "Emu/RSX/Common/simple_array.hpp"
-
-namespace vk
-{
-	struct gc_callback_t
-	{
-		std::function<void()> m_callback;
-
-		gc_callback_t(std::function<void()> callback)
-			: m_callback(callback)
-		{}
-
-		~gc_callback_t()
-		{
-			if (m_callback)
-			{
-				m_callback();
-			}
-		}
-	};
-
-	struct descriptor_set_dynamic_offset_t
-	{
-		int location;
-		u32 value;
-	};
-
-	class descriptor_pool
-	{
-	public:
-		descriptor_pool() = default;
-		~descriptor_pool() = default;
-
-		void create(const vk::render_device& dev, const rsx::simple_array<VkDescriptorPoolSize>& pool_sizes, u32 max_sets = 1024);
-		void destroy();
-
-		VkDescriptorSet allocate(VkDescriptorSetLayout layout, VkBool32 use_cache = VK_TRUE);
-
-		operator VkDescriptorPool() { return m_current_pool_handle; }
-		FORCE_INLINE bool valid() const { return !m_device_subpools.empty(); }
-		FORCE_INLINE u32 max_sets() const { return m_create_info.maxSets; }
-
-	private:
-		FORCE_INLINE bool can_allocate(u32 required_count, u32 already_used_count = 0) const { return (required_count + already_used_count) <= m_create_info.maxSets; };
-		void reset(u32 subpool_id, VkDescriptorPoolResetFlags flags);
-		void next_subpool();
-
-		struct logical_subpool_t
-		{
-			VkDescriptorPool handle;
-			VkBool32 busy;
-		};
-
-		const vk::render_device* m_owner = nullptr;
-		VkDescriptorPoolCreateInfo m_create_info = {};
-		rsx::simple_array<VkDescriptorPoolSize> m_create_info_pool_sizes;
-
-		rsx::simple_array<logical_subpool_t> m_device_subpools;
-		VkDescriptorPool m_current_pool_handle = VK_NULL_HANDLE;
-		u32 m_current_subpool_index = umax;
-		u32 m_current_subpool_offset = 0;
-
-		shared_mutex m_subpool_lock;
-
-		static constexpr size_t max_cache_size = 64;
-		VkDescriptorSetLayout m_cached_layout = VK_NULL_HANDLE;
-		rsx::simple_array<VkDescriptorSet> m_descriptor_set_cache;
-		rsx::simple_array<VkDescriptorSetLayout> m_allocation_request_cache;
-	};
-
-	class descriptor_set
-	{
-		static constexpr size_t max_cache_size = 16384;
-		static constexpr size_t max_overflow_size = 64;
-		static constexpr size_t m_pool_size = max_cache_size + max_overflow_size;
-
-		void init(VkDescriptorSet new_set);
-
-	public:
-		descriptor_set(VkDescriptorSet set);
-		descriptor_set() = default;
-		~descriptor_set();
-
-		descriptor_set(const descriptor_set&) = delete;
-
-		void swap(descriptor_set& other);
-		descriptor_set& operator = (VkDescriptorSet set);
-
-		VkDescriptorSet value() const { return m_handle; }
-		operator bool() const { return m_handle != VK_NULL_HANDLE; }
-
-		VkDescriptorSet* ptr();
-		void push(const VkBufferView& buffer_view, VkDescriptorType type, u32 binding);
-		void push(const VkDescriptorBufferInfo& buffer_info, VkDescriptorType type, u32 binding);
-		void push(const VkDescriptorImageInfo& image_info, VkDescriptorType type, u32 binding);
-		void push(const VkDescriptorImageInfo* image_info, u32 count, VkDescriptorType type, u32 binding);
-		void push(rsx::simple_array<VkCopyDescriptorSet>& copy_cmd, u32 type_mask = umax);
-		void push(rsx::simple_array<VkWriteDescriptorSet>& write_cmds, u32 type_mask = umax);
-		void push(const descriptor_set_dynamic_offset_t& offset);
-
-		void on_bind();
-		void bind(const vk::command_buffer& cmd, VkPipelineBindPoint bind_point, VkPipelineLayout layout);
-
-		void flush();
-
-	private:
-		VkDescriptorSet m_handle = VK_NULL_HANDLE;
-		u64 m_update_after_bind_mask = 0;
-		u64 m_push_type_mask = 0;
-		bool m_in_use = false;
-
-		rsx::simple_array<VkBufferView> m_buffer_view_pool;
-		rsx::simple_array<VkDescriptorBufferInfo> m_buffer_info_pool;
-		rsx::simple_array<VkDescriptorImageInfo> m_image_info_pool;
-		rsx::simple_array<u32> m_dynamic_offsets;
-
-#if defined(__clang__) && (__clang_major__ < 16)
-		// Clang (pre 16.x) does not support LWG 2089, std::construct_at for POD types
-		struct WriteDescriptorSetT : public VkWriteDescriptorSet
-		{
-			WriteDescriptorSetT(
-				VkStructureType                  sType,
-				const void*                      pNext,
-				VkDescriptorSet                  dstSet,
-				uint32_t                         dstBinding,
-				uint32_t                         dstArrayElement,
-				uint32_t                         descriptorCount,
-				VkDescriptorType                 descriptorType,
-				const VkDescriptorImageInfo*     pImageInfo,
-				const VkDescriptorBufferInfo*    pBufferInfo,
-				const VkBufferView*              pTexelBufferView)
-			{
-				this->sType = sType,
-				this->pNext = pNext,
-				this->dstSet = dstSet,
-				this->dstBinding = dstBinding,
-				this->dstArrayElement = dstArrayElement,
-				this->descriptorCount = descriptorCount,
-				this->descriptorType = descriptorType,
-				this->pImageInfo = pImageInfo,
-				this->pBufferInfo = pBufferInfo,
-				this->pTexelBufferView = pTexelBufferView;
-			}
-		};
-#else
-		using WriteDescriptorSetT = VkWriteDescriptorSet;
-#endif
-
-		rsx::simple_array<WriteDescriptorSetT> m_pending_writes;
-		rsx::simple_array<VkCopyDescriptorSet> m_pending_copies;
-	};
-
-	namespace descriptors
-	{
-		void init();
-		void flush();
-		void destroy();
-
-		VkDescriptorSetLayout create_layout(const rsx::simple_array<VkDescriptorSetLayoutBinding>& bindings);
-	}
-}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/descriptors.hpp b/rpcs3/Emu/RSX/VK/vkutils/descriptors.hpp
new file mode 100644
index 0000000000..1f685845d0
--- /dev/null
+++ b/rpcs3/Emu/RSX/VK/vkutils/descriptors.hpp
@@ -0,0 +1,74 @@
+#pragma once
+
+#include "../VulkanAPI.h"
+#include "device.h"
+
+#include <vector>
+
+namespace vk
+{
+	class descriptor_pool
+	{
+		const vk::render_device* m_owner = nullptr;
+
+		std::vector<VkDescriptorPool> m_device_pools;
+		VkDescriptorPool m_current_pool_handle = VK_NULL_HANDLE;
+		u32 m_current_pool_index = 0;
+
+	public:
+		descriptor_pool() = default;
+		~descriptor_pool() = default;
+
+		void create(const vk::render_device& dev, VkDescriptorPoolSize* sizes, u32 size_descriptors_count, u32 max_sets, u8 subpool_count)
+		{
+			ensure(subpool_count);
+
+			VkDescriptorPoolCreateInfo infos = {};
+			infos.flags = 0;
+			infos.maxSets = max_sets;
+			infos.poolSizeCount = size_descriptors_count;
+			infos.pPoolSizes = sizes;
+			infos.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
+
+			m_owner = &dev;
+			m_device_pools.resize(subpool_count);
+
+			for (auto& pool : m_device_pools)
+			{
+				CHECK_RESULT(vkCreateDescriptorPool(dev, &infos, nullptr, &pool));
+			}
+
+			m_current_pool_handle = m_device_pools[0];
+		}
+
+		void destroy()
+		{
+			if (m_device_pools.empty()) return;
+
+			for (auto& pool : m_device_pools)
+			{
+				vkDestroyDescriptorPool((*m_owner), pool, nullptr);
+				pool = VK_NULL_HANDLE;
+			}
+
+			m_owner = nullptr;
+		}
+
+		bool valid()
+		{
+			return (!m_device_pools.empty());
+		}
+
+		operator VkDescriptorPool()
+		{
+			return m_current_pool_handle;
+		}
+
+		void reset(VkDescriptorPoolResetFlags flags)
+		{
+			m_current_pool_index = (m_current_pool_index + 1) % u32(m_device_pools.size());
+			m_current_pool_handle = m_device_pools[m_current_pool_index];
+			CHECK_RESULT(vkResetDescriptorPool(*m_owner, m_current_pool_handle, flags));
+		}
+	};
+}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/device.cpp b/rpcs3/Emu/RSX/VK/vkutils/device.cpp
index 907d692e85..8be84fa1c6 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/device.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/device.cpp
@@ -1,8 +1,7 @@
 #include "device.h"
-#include "instance.h"
+#include "instance.hpp"
 #include "util/logs.hpp"
 #include "Emu/system_config.h"
-#include <vulkan/vulkan_core.h>
 
 namespace vk
 {
@@ -20,219 +19,58 @@ namespace vk
 		supported_extensions instance_extensions(supported_extensions::instance);
 		supported_extensions device_extensions(supported_extensions::device, nullptr, dev);
 
-		VkPhysicalDeviceFeatures2KHR features2;
-		features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
-		features2.pNext = nullptr;
-
-		VkPhysicalDeviceFloat16Int8FeaturesKHR shader_support_info{};
-		VkPhysicalDeviceDescriptorIndexingFeatures descriptor_indexing_info{};
-		VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT fbo_loops_info{};
-		VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR shader_barycentric_info{};
-		VkPhysicalDeviceCustomBorderColorFeaturesEXT custom_border_color_info{};
-		VkPhysicalDeviceBorderColorSwizzleFeaturesEXT border_color_swizzle_info{};
-		VkPhysicalDeviceFaultFeaturesEXT device_fault_info{};
-		VkPhysicalDeviceMultiDrawFeaturesEXT multidraw_info{};
-
-		// Core features
-		shader_support_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES;
-		features2.pNext           = &shader_support_info;
-
-		descriptor_indexing_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES;
-		descriptor_indexing_info.pNext = features2.pNext;
-		features2.pNext                = &descriptor_indexing_info;
-		descriptor_indexing_support    = true;
-
-		// Optional features
-		if (device_extensions.is_supported(VK_EXT_ATTACHMENT_FEEDBACK_LOOP_LAYOUT_EXTENSION_NAME))
+		if (!instance_extensions.is_supported(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME))
 		{
-			fbo_loops_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_LAYOUT_FEATURES_EXT;
-			fbo_loops_info.pNext = features2.pNext;
-			features2.pNext      = &fbo_loops_info;
+			vkGetPhysicalDeviceFeatures(dev, &features);
 		}
-
-		if (device_extensions.is_supported(VK_KHR_FRAGMENT_SHADER_BARYCENTRIC_EXTENSION_NAME))
+		else
 		{
-			shader_barycentric_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_KHR;
-			shader_barycentric_info.pNext = features2.pNext;
-			features2.pNext               = &shader_barycentric_info;
-		}
+			VkPhysicalDeviceFeatures2KHR features2;
+			features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
+			features2.pNext = nullptr;
 
-		if (device_extensions.is_supported(VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME))
-		{
-			custom_border_color_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT;
-			custom_border_color_info.pNext = features2.pNext;
-			features2.pNext                = &custom_border_color_info;
-		}
+			VkPhysicalDeviceFloat16Int8FeaturesKHR shader_support_info{};
 
-		if (device_extensions.is_supported(VK_EXT_BORDER_COLOR_SWIZZLE_EXTENSION_NAME))
-		{
-			border_color_swizzle_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT;
-			border_color_swizzle_info.pNext = features2.pNext;
-			features2.pNext                 = &border_color_swizzle_info;
-		}
-
-		if (device_extensions.is_supported(VK_EXT_DEVICE_FAULT_EXTENSION_NAME))
-		{
-			device_fault_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FAULT_FEATURES_EXT;
-			device_fault_info.pNext = features2.pNext;
-			features2.pNext         = &device_fault_info;
-		}
-
-		if (device_extensions.is_supported(VK_EXT_MULTI_DRAW_EXTENSION_NAME))
-		{
-			multidraw_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT;
-			multidraw_info.pNext = features2.pNext;
-			features2.pNext      = &multidraw_info;
-		}
-
-		vkGetPhysicalDeviceFeatures2(dev, &features2);
-
-		shader_types_support.allow_float64 = !!features2.features.shaderFloat64;
-		shader_types_support.allow_float16 = !!shader_support_info.shaderFloat16;
-		shader_types_support.allow_int8    = !!shader_support_info.shaderInt8;
-
-		custom_border_color_support.supported = !!custom_border_color_info.customBorderColors && !!custom_border_color_info.customBorderColorWithoutFormat;
-		custom_border_color_support.swizzle_extension_supported = border_color_swizzle_info.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT;
-		custom_border_color_support.require_border_color_remap = !border_color_swizzle_info.borderColorSwizzleFromImage;
-
-		multidraw_support.supported = !!multidraw_info.multiDraw;
-		multidraw_support.max_batch_size = 65536;
-
-		optional_features_support.barycentric_coords  = !!shader_barycentric_info.fragmentShaderBarycentric;
-		optional_features_support.framebuffer_loops   = !!fbo_loops_info.attachmentFeedbackLoopLayout;
-		optional_features_support.extended_device_fault = !!device_fault_info.deviceFault;
-
-		features = features2.features;
-
-		descriptor_indexing_support.supported = true; // VK_API_VERSION_1_2
-#define SET_DESCRIPTOR_BITFLAG(field, bit) if (descriptor_indexing_info.field) descriptor_indexing_support.update_after_bind_mask |= (1ull << bit)
-		SET_DESCRIPTOR_BITFLAG(descriptorBindingUniformBufferUpdateAfterBind, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
-		SET_DESCRIPTOR_BITFLAG(descriptorBindingSampledImageUpdateAfterBind, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER);
-		SET_DESCRIPTOR_BITFLAG(descriptorBindingSampledImageUpdateAfterBind, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE);
-		SET_DESCRIPTOR_BITFLAG(descriptorBindingStorageImageUpdateAfterBind, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE);
-		SET_DESCRIPTOR_BITFLAG(descriptorBindingStorageBufferUpdateAfterBind, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER);
-		SET_DESCRIPTOR_BITFLAG(descriptorBindingUniformTexelBufferUpdateAfterBind, VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER);
-		SET_DESCRIPTOR_BITFLAG(descriptorBindingStorageTexelBufferUpdateAfterBind, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER);
-#undef SET_DESCRIPTOR_BITFLAG
-
-		optional_features_support.shader_stencil_export    = device_extensions.is_supported(VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME);
-		optional_features_support.conditional_rendering    = device_extensions.is_supported(VK_EXT_CONDITIONAL_RENDERING_EXTENSION_NAME);
-		optional_features_support.external_memory_host     = device_extensions.is_supported(VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME);
-		optional_features_support.synchronization_2        = device_extensions.is_supported(VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME);
-		optional_features_support.unrestricted_depth_range = device_extensions.is_supported(VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME);
-
-		optional_features_support.debug_utils              = instance_extensions.is_supported(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
-		optional_features_support.surface_capabilities_2   = instance_extensions.is_supported(VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME);
-
-		// Post-initialization checks
-		if (!custom_border_color_support.swizzle_extension_supported)
-		{
-			// So far only AMD is known to remap image view and border color together. Mark as not required.
-			custom_border_color_support.require_border_color_remap = get_driver_vendor() != driver_vendor::AMD;
-		}
-
-		// v3dv and PanVK support BC1-BC3 which is all we require, support is reported as false since not all formats are supported
-		optional_features_support.texture_compression_bc = features.textureCompressionBC
-				|| get_driver_vendor() == driver_vendor::V3DV || get_driver_vendor() == driver_vendor::PANVK;
-
-		// Texel buffer UAB is reported to the trigger for some driver crashes on older NV cards
-		if (get_driver_vendor() == driver_vendor::NVIDIA &&
-			get_chip_class() >= chip_class::NV_kepler &&
-			get_chip_class() <= chip_class::NV_pascal)
-		{
-			// UBOs are unsupported on these cards anyway, disable texel buffers as well
-			descriptor_indexing_support.update_after_bind_mask &= ~(1ull << VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER);
-		}
-	}
-
-	void physical_device::get_physical_device_properties_0(bool allow_extensions)
-	{
-		// Core properties only
-		vkGetPhysicalDeviceMemoryProperties(dev, &memory_properties);
-		vkGetPhysicalDeviceProperties(dev, &props);
-
-		if (!allow_extensions)
-		{
-			return;
-		}
-
-		VkPhysicalDeviceProperties2KHR properties2;
-		properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR;
-		properties2.pNext = nullptr;
-
-		driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR;
-		driver_properties.pNext = properties2.pNext;
-		properties2.pNext = &driver_properties;
-		vkGetPhysicalDeviceProperties2(dev, &properties2);
-	}
-
-	void physical_device::get_physical_device_properties_1(bool allow_extensions)
-	{
-		// Extended properties. Call after checking for features
-		if (!allow_extensions)
-		{
-			return;
-		}
-
-		supported_extensions device_extensions(supported_extensions::device, nullptr, dev);
-
-		VkPhysicalDeviceProperties2KHR properties2;
-		properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR;
-		properties2.pNext = nullptr;
-
-		VkPhysicalDeviceDescriptorIndexingPropertiesEXT descriptor_indexing_props{};
-		VkPhysicalDeviceMultiDrawPropertiesEXT multidraw_props{};
-
-		descriptor_indexing_props.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT;
-		descriptor_indexing_props.pNext = properties2.pNext;
-		properties2.pNext = &descriptor_indexing_props;
-
-		if (multidraw_support.supported)
-		{
-			multidraw_props.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT;
-			multidraw_props.pNext = properties2.pNext;
-			properties2.pNext = &multidraw_props;
-		}
-
-		vkGetPhysicalDeviceProperties2(dev, &properties2);
-		props = properties2.properties;
-
-		if (descriptor_indexing_support)
-		{
-			if (descriptor_indexing_props.maxUpdateAfterBindDescriptorsInAllPools < 800'000)
+			if (device_extensions.is_supported(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME))
 			{
-				rsx_log.error("Physical device does not support enough descriptors for deferred updates to work effectively. Deferred updates are disabled.");
-				descriptor_indexing_support.update_after_bind_mask = 0;
+				shader_support_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR;
+				features2.pNext           = &shader_support_info;
 			}
-			else if (descriptor_indexing_props.maxUpdateAfterBindDescriptorsInAllPools < 2'000'000)
+
+			if (device_extensions.is_supported(VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME))
 			{
-				rsx_log.warning("Physical device reports a low amount of allowed deferred descriptor updates. Draw call threshold will be lowered accordingly.");
-				descriptor_max_draw_calls = 8192;
+				driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR;
+				driver_properties.pNext = features2.pNext;
+				features2.pNext         = &driver_properties;
 			}
+
+			auto _vkGetPhysicalDeviceFeatures2KHR = reinterpret_cast<PFN_vkGetPhysicalDeviceFeatures2KHR>(vkGetInstanceProcAddr(parent, "vkGetPhysicalDeviceFeatures2KHR"));
+			ensure(_vkGetPhysicalDeviceFeatures2KHR); // "vkGetInstanceProcAddress failed to find entry point!"
+			_vkGetPhysicalDeviceFeatures2KHR(dev, &features2);
+
+			shader_types_support.allow_float64 = !!features2.features.shaderFloat64;
+			shader_types_support.allow_float16 = !!shader_support_info.shaderFloat16;
+			shader_types_support.allow_int8    = !!shader_support_info.shaderInt8;
+			features                           = features2.features;
 		}
 
-		if (multidraw_support.supported)
-		{
-			multidraw_support.max_batch_size = multidraw_props.maxMultiDrawCount;
-
-			if (!multidraw_props.maxMultiDrawCount)
-			{
-				rsx_log.error("Physical device reports 0 support maxMultiDraw count. Multidraw support will be disabled.");
-				multidraw_support.supported = false;
-			}
-		}
+		stencil_export_support           = device_extensions.is_supported(VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME);
+		conditional_render_support       = device_extensions.is_supported(VK_EXT_CONDITIONAL_RENDERING_EXTENSION_NAME);
+		external_memory_host_support     = device_extensions.is_supported(VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME);
+		unrestricted_depth_range_support = device_extensions.is_supported(VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME);
+		debug_utils_support              = instance_extensions.is_supported(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
+		surface_capabilities_2_support   = instance_extensions.is_supported(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
 	}
 
 	void physical_device::create(VkInstance context, VkPhysicalDevice pdev, bool allow_extensions)
 	{
 		dev    = pdev;
 		parent = context;
-
-		get_physical_device_properties_0(allow_extensions);
+		vkGetPhysicalDeviceProperties(pdev, &props);
+		vkGetPhysicalDeviceMemoryProperties(pdev, &memory_properties);
 		get_physical_device_features(allow_extensions);
-		get_physical_device_properties_1(allow_extensions);
 
-		rsx_log.always()("Found Vulkan-compatible GPU: '%s' running on driver %s", get_name(), get_driver_version());
+		rsx_log.always()("Found vulkan-compatible GPU: '%s' running on driver %s", get_name(), get_driver_version());
 
 		if (get_driver_vendor() == driver_vendor::RADV && get_name().find("LLVM 8.0.0") != umax)
 		{
@@ -244,10 +82,10 @@ namespace vk
 		{
 #ifdef _WIN32
 			// SPIRV bugs were fixed in 452.28 for windows
-			const u32 threshold_version = (452u << 22) | (28 << 14);
+			const u32 threshold_version = (452u >> 22) | (28 >> 14);
 #else
 			// SPIRV bugs were fixed in 450.56 for linux/BSD
-			const u32 threshold_version = (450u << 22) | (56 << 14);
+			const u32 threshold_version = (450u >> 22) | (56 >> 14);
 #endif
 			const auto current_version = props.driverVersion & ~0x3fffu; // Clear patch and revision fields
 			if (current_version < threshold_version)
@@ -256,7 +94,7 @@ namespace vk
 			}
 		}
 
-		if (get_chip_class() == chip_class::AMD_vega && shader_types_support.allow_float16)
+		if (get_chip_class() == chip_class::AMD_vega)
 		{
 			// Disable fp16 if driver uses LLVM emitter. It does fine with AMD proprietary drivers though.
 			shader_types_support.allow_float16 = (driver_properties.driverID == VK_DRIVER_ID_AMD_PROPRIETARY_KHR);
@@ -270,26 +108,9 @@ namespace vk
 
 	driver_vendor physical_device::get_driver_vendor() const
 	{
-#ifdef __APPLE__
-		// moltenVK currently returns DRIVER_ID_MOLTENVK (0).
-		// For now, assume the vendor is moltenVK on Apple devices.
-		return driver_vendor::MVK;
-#endif
-
 		if (!driver_properties.driverID)
 		{
 			const auto gpu_name = get_name();
-
-			if (gpu_name.find("Microsoft Direct3D12") != umax)
-			{
-				return driver_vendor::DOZEN;
-			}
-
-			if (gpu_name.find("RADV") != umax)
-			{
-				return driver_vendor::RADV;
-			}
-
 			if (gpu_name.find("Radeon") != umax)
 			{
 				return driver_vendor::AMD;
@@ -297,14 +118,14 @@ namespace vk
 
 			if (gpu_name.find("NVIDIA") != umax || gpu_name.find("GeForce") != umax || gpu_name.find("Quadro") != umax)
 			{
-				if (gpu_name.find("NVK") != umax)
-				{
-					return driver_vendor::NVK;
-				}
-
 				return driver_vendor::NVIDIA;
 			}
 
+			if (gpu_name.find("RADV") != umax)
+			{
+				return driver_vendor::RADV;
+			}
+
 			if (gpu_name.find("Intel") != umax)
 			{
 #ifdef _WIN32
@@ -314,30 +135,6 @@ namespace vk
 #endif
 			}
 
-			if (gpu_name.find("llvmpipe") != umax)
-			{
-				return driver_vendor::LAVAPIPE;
-			}
-
-			if (gpu_name.find("V3D") != umax)
-			{
-				return driver_vendor::V3DV;
-			}
-
-			if (gpu_name.find("Apple") != umax)
-			{
-				return driver_vendor::HONEYKRISP;
-			}
-
-			if (gpu_name.find("Panfrost") != umax)
-			{ // e.g. "Mali-G610 (Panfrost)"
-				return driver_vendor::PANVK;
-			}
-			else if (gpu_name.find("Mali") != umax)
-			{ // e.g. "Mali-G610", hence "else"
-				return driver_vendor::ARM_MALI;
-			}
-
 			return driver_vendor::unknown;
 		}
 		else
@@ -355,20 +152,6 @@ namespace vk
 				return driver_vendor::INTEL;
 			case VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR:
 				return driver_vendor::ANV;
-			case VK_DRIVER_ID_MESA_DOZEN:
-				return driver_vendor::DOZEN;
-			case VK_DRIVER_ID_MESA_LLVMPIPE:
-				return driver_vendor::LAVAPIPE;
-			case VK_DRIVER_ID_MESA_NVK:
-				return driver_vendor::NVK;
-			case VK_DRIVER_ID_MESA_V3DV:
-				return driver_vendor::V3DV;
-			case VK_DRIVER_ID_MESA_HONEYKRISP:
-				return driver_vendor::HONEYKRISP;
-			case VK_DRIVER_ID_MESA_PANVK:
-				return driver_vendor::PANVK;
-			case VK_DRIVER_ID_ARM_PROPRIETARY:
-				return driver_vendor::ARM_MALI;
 			default:
 				// Mobile?
 				return driver_vendor::unknown;
@@ -453,6 +236,7 @@ namespace vk
 	// Render Device - The actual usable device
 	void render_device::create(vk::physical_device& pdev, u32 graphics_queue_idx, u32 present_queue_idx, u32 transfer_queue_idx)
 	{
+		std::string message_on_error;
 		float queue_priorities[1] = { 0.f };
 		pgpu = &pdev;
 
@@ -504,58 +288,30 @@ namespace vk
 		// Enable hardware features manually
 		// Currently we require:
 		// 1. Anisotropic sampling
-		// 2. Indexable storage buffers
+		// 2. DXT support
+		// 3. Indexable storage buffers
 		VkPhysicalDeviceFeatures enabled_features{};
-		if (pgpu->custom_border_color_support)
+		if (pgpu->shader_types_support.allow_float16)
 		{
-			requested_extensions.push_back(VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME);
+			requested_extensions.push_back(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME);
 		}
 
-		if (pgpu->multidraw_support)
-		{
-			requested_extensions.push_back(VK_EXT_MULTI_DRAW_EXTENSION_NAME);
-		}
-
-		if (pgpu->optional_features_support.conditional_rendering)
+		if (pgpu->conditional_render_support)
 		{
 			requested_extensions.push_back(VK_EXT_CONDITIONAL_RENDERING_EXTENSION_NAME);
 		}
 
-		if (pgpu->optional_features_support.unrestricted_depth_range)
+		if (pgpu->unrestricted_depth_range_support)
 		{
 			requested_extensions.push_back(VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME);
 		}
 
-		if (pgpu->optional_features_support.external_memory_host)
+		if (pgpu->external_memory_host_support)
 		{
+			requested_extensions.push_back(VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME);
 			requested_extensions.push_back(VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME);
 		}
 
-		if (pgpu->optional_features_support.shader_stencil_export)
-		{
-			requested_extensions.push_back(VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME);
-		}
-
-		if (pgpu->optional_features_support.framebuffer_loops)
-		{
-			requested_extensions.push_back(VK_EXT_ATTACHMENT_FEEDBACK_LOOP_LAYOUT_EXTENSION_NAME);
-		}
-
-		if (pgpu->optional_features_support.barycentric_coords)
-		{
-			requested_extensions.push_back(VK_KHR_FRAGMENT_SHADER_BARYCENTRIC_EXTENSION_NAME);
-		}
-
-		if (pgpu->optional_features_support.synchronization_2)
-		{
-			requested_extensions.push_back(VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME); // VK_API_VERSION_1_3
-		}
-
-		if (pgpu->optional_features_support.extended_device_fault)
-		{
-			requested_extensions.push_back(VK_EXT_DEVICE_FAULT_EXTENSION_NAME);
-		}
-
 		enabled_features.robustBufferAccess = VK_TRUE;
 		enabled_features.fullDrawIndexUint32 = VK_TRUE;
 		enabled_features.independentBlend = VK_TRUE;
@@ -576,27 +332,28 @@ namespace vk
 			enabled_features.shaderStorageImageWriteWithoutFormat = VK_TRUE;
 		}
 
-		if (g_cfg.video.precise_zpass_count)
-		{
-			enabled_features.occlusionQueryPrecise = VK_TRUE;
-		}
-
 		// enabled_features.shaderSampledImageArrayDynamicIndexing = TRUE;  // Unused currently but will be needed soon
 		enabled_features.shaderClipDistance = VK_TRUE;
 		// enabled_features.shaderCullDistance = VK_TRUE;  // Alt notation of clip distance
 
 		enabled_features.samplerAnisotropy = VK_TRUE;
-		enabled_features.textureCompressionBC = pgpu->optional_features_support.texture_compression_bc;
+		enabled_features.textureCompressionBC = VK_TRUE;
 		enabled_features.shaderStorageBufferArrayDynamicIndexing = VK_TRUE;
 
-		// Optionally disable unsupported stuff
-		if (!pgpu->features.fullDrawIndexUint32)
+		// If we're on lavapipe / llvmpipe, disable unimplemented features:
+		// - shaderStorageBufferArrayDynamicIndexing
+		// as of mesa 21.1.0-dev (aea36ee05e9, 2020-02-10)
+		// Several games work even if we disable these, testing purpose only
+		if (pgpu->get_name().find("llvmpipe") != umax)
 		{
-			// There's really nothing we can do about PS3 draw indices, just pray your GPU doesn't crash.
-			rsx_log.error("Your GPU driver does not fully support 32-bit vertex indices. This may result in graphical corruption or crashes in some cases.");
-			enabled_features.fullDrawIndexUint32 = VK_FALSE;
+			if (!pgpu->features.shaderStorageBufferArrayDynamicIndexing)
+			{
+				rsx_log.error("Running lavapipe without support for shaderStorageBufferArrayDynamicIndexing");
+				enabled_features.shaderStorageBufferArrayDynamicIndexing = VK_FALSE;
+			}
 		}
 
+		// Optionally disable unsupported stuff
 		if (!pgpu->features.shaderStorageImageMultisample || !pgpu->features.shaderStorageImageWriteWithoutFormat)
 		{
 			// Disable MSAA if any of these two features are unsupported
@@ -612,18 +369,6 @@ namespace vk
 			enabled_features.shaderStorageImageWriteWithoutFormat = VK_FALSE;
 		}
 
-		if (!pgpu->features.shaderClipDistance)
-		{
-			rsx_log.error("Your GPU does not support shader clip distance. Graphics will not render correctly.");
-			enabled_features.shaderClipDistance = VK_FALSE;
-		}
-
-		if (!pgpu->features.shaderStorageBufferArrayDynamicIndexing)
-		{
-			rsx_log.error("Your GPU does not support shader storage buffer array dynamic indexing. Graphics will not render correctly.");
-			enabled_features.shaderStorageBufferArrayDynamicIndexing = VK_FALSE;
-		}
-
 		if (!pgpu->features.samplerAnisotropy)
 		{
 			rsx_log.error("Your GPU does not support anisotropic filtering. Graphics may not render correctly.");
@@ -642,12 +387,6 @@ namespace vk
 			enabled_features.depthBounds = VK_FALSE;
 		}
 
-		if (!pgpu->features.largePoints)
-		{
-			rsx_log.error("Your GPU does not support large points. Graphics may not render correctly.");
-			enabled_features.largePoints = VK_FALSE;
-		}
-
 		if (!pgpu->features.wideLines)
 		{
 			rsx_log.error("Your GPU does not support wide lines. Graphics may not render correctly.");
@@ -667,18 +406,6 @@ namespace vk
 			enabled_features.alphaToOne = VK_FALSE;
 		}
 
-		if (!pgpu->features.occlusionQueryPrecise && enabled_features.occlusionQueryPrecise)
-		{
-			rsx_log.error("Your GPU does not support precise occlusion queries. Graphics may not render correctly.");
-			enabled_features.occlusionQueryPrecise = VK_FALSE;
-		}
-
-		if (!pgpu->features.logicOp)
-		{
-			rsx_log.error("Your GPU does not support framebuffer logical operations. Graphics may not render correctly.");
-			enabled_features.logicOp = VK_FALSE;
-		}
-
 		VkDeviceCreateInfo device = {};
 		device.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
 		device.pNext = nullptr;
@@ -696,7 +423,6 @@ namespace vk
 			// Allow use of f16 type in shaders if possible
 			shader_support_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR;
 			shader_support_info.shaderFloat16 = VK_TRUE;
-			shader_support_info.pNext = const_cast<void*>(device.pNext);
 			device.pNext = &shader_support_info;
 
 			rsx_log.notice("GPU/driver supports float16 data types natively. Using native float16_t variables if possible.");
@@ -706,101 +432,7 @@ namespace vk
 			rsx_log.notice("GPU/driver lacks support for float16 data types. All float16_t arithmetic will be emulated with float32_t.");
 		}
 
-		VkPhysicalDeviceDescriptorIndexingFeatures indexing_features{};
-		if (pgpu->descriptor_indexing_support)
-		{
-#define SET_DESCRIPTOR_BITFLAG(field, bit) if (pgpu->descriptor_indexing_support.update_after_bind_mask & (1ull << bit)) indexing_features.field = VK_TRUE
-			SET_DESCRIPTOR_BITFLAG(descriptorBindingUniformBufferUpdateAfterBind, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
-			SET_DESCRIPTOR_BITFLAG(descriptorBindingSampledImageUpdateAfterBind, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER);
-			SET_DESCRIPTOR_BITFLAG(descriptorBindingSampledImageUpdateAfterBind, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE);
-			SET_DESCRIPTOR_BITFLAG(descriptorBindingStorageImageUpdateAfterBind, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE);
-			SET_DESCRIPTOR_BITFLAG(descriptorBindingStorageBufferUpdateAfterBind, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER);
-			SET_DESCRIPTOR_BITFLAG(descriptorBindingUniformTexelBufferUpdateAfterBind, VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER);
-			SET_DESCRIPTOR_BITFLAG(descriptorBindingStorageTexelBufferUpdateAfterBind, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER);
-#undef SET_DESCRIPTOR_BITFLAG
-
-			indexing_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT;
-			indexing_features.pNext = const_cast<void*>(device.pNext);
-			device.pNext = &indexing_features;
-		}
-
-		VkPhysicalDeviceCustomBorderColorFeaturesEXT custom_border_color_features{};
-		if (pgpu->custom_border_color_support)
-		{
-			custom_border_color_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT;
-			custom_border_color_features.customBorderColors = VK_TRUE;
-			custom_border_color_features.customBorderColorWithoutFormat = VK_TRUE;
-			custom_border_color_features.pNext = const_cast<void*>(device.pNext);
-			device.pNext = &custom_border_color_features;
-		}
-
-		VkPhysicalDeviceMultiDrawFeaturesEXT multidraw_features{};
-		if (pgpu->multidraw_support)
-		{
-			multidraw_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT;
-			multidraw_features.multiDraw = VK_TRUE;
-			multidraw_features.pNext = const_cast<void*>(device.pNext);
-			device.pNext = &multidraw_features;
-		}
-
-		VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT fbo_loop_features{};
-		if (pgpu->optional_features_support.framebuffer_loops)
-		{
-			fbo_loop_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_LAYOUT_FEATURES_EXT;
-			fbo_loop_features.attachmentFeedbackLoopLayout = VK_TRUE;
-			fbo_loop_features.pNext = const_cast<void*>(device.pNext);
-			device.pNext = &fbo_loop_features;
-		}
-
-		VkPhysicalDeviceSynchronization2FeaturesKHR synchronization2_info{};
-		if (pgpu->optional_features_support.synchronization_2)
-		{
-			synchronization2_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES;
-			synchronization2_info.pNext = const_cast<void*>(device.pNext);
-			synchronization2_info.synchronization2 = VK_TRUE;
-			device.pNext = &synchronization2_info;
-		}
-
-		VkPhysicalDeviceFaultFeaturesEXT device_fault_info{};
-		if (pgpu->optional_features_support.extended_device_fault)
-		{
-			device_fault_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FAULT_FEATURES_EXT;
-			device_fault_info.pNext = const_cast<void*>(device.pNext);
-			device_fault_info.deviceFault = VK_TRUE;
-			device_fault_info.deviceFaultVendorBinary = VK_FALSE;
-			device.pNext = &device_fault_info;
-		}
-
-		VkPhysicalDeviceConditionalRenderingFeaturesEXT conditional_rendering_info{};
-		if (pgpu->optional_features_support.conditional_rendering)
-		{
-			conditional_rendering_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT;
-			conditional_rendering_info.pNext = const_cast<void*>(device.pNext);
-			conditional_rendering_info.conditionalRendering = VK_TRUE;
-			device.pNext = &conditional_rendering_info;
-		}
-
-		VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR shader_barycentric_info{};
-		if (pgpu->optional_features_support.barycentric_coords)
-		{
-			shader_barycentric_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_KHR;
-			shader_barycentric_info.pNext = const_cast<void*>(device.pNext);
-			shader_barycentric_info.fragmentShaderBarycentric = VK_TRUE;
-			device.pNext = &shader_barycentric_info;
-		}
-
-		if (auto error = vkCreateDevice(*pgpu, &device, nullptr, &dev))
-		{
-			dump_debug_info(requested_extensions, enabled_features);
-			vk::die_with_error(error);
-		}
-
-		// Dump some diagnostics to the log
-		rsx_log.notice("%u extensions loaded:", ::size32(requested_extensions));
-		for (const auto& ext : requested_extensions)
-		{
-			rsx_log.notice("** Using %s", ext);
-		}
+		CHECK_RESULT_EX(vkCreateDevice(*pgpu, &device, nullptr, &dev), message_on_error);
 
 		// Initialize queues
 		vkGetDeviceQueue(dev, graphics_queue_idx, 0, &m_graphics_queue);
@@ -811,21 +443,33 @@ namespace vk
 			vkGetDeviceQueue(dev, present_queue_idx, 0, &m_present_queue);
 		}
 
+		// Import optional function endpoints
+		if (pgpu->conditional_render_support)
+		{
+			_vkCmdBeginConditionalRenderingEXT = reinterpret_cast<PFN_vkCmdBeginConditionalRenderingEXT>(vkGetDeviceProcAddr(dev, "vkCmdBeginConditionalRenderingEXT"));
+			_vkCmdEndConditionalRenderingEXT = reinterpret_cast<PFN_vkCmdEndConditionalRenderingEXT>(vkGetDeviceProcAddr(dev, "vkCmdEndConditionalRenderingEXT"));
+		}
+
+		if (pgpu->debug_utils_support)
+		{
+			_vkSetDebugUtilsObjectNameEXT = reinterpret_cast<PFN_vkSetDebugUtilsObjectNameEXT>(vkGetDeviceProcAddr(dev, "vkSetDebugUtilsObjectNameEXT"));
+			_vkQueueInsertDebugUtilsLabelEXT = reinterpret_cast<PFN_vkQueueInsertDebugUtilsLabelEXT>(vkGetDeviceProcAddr(dev, "vkQueueInsertDebugUtilsLabelEXT"));
+			_vkCmdInsertDebugUtilsLabelEXT = reinterpret_cast<PFN_vkCmdInsertDebugUtilsLabelEXT>(vkGetDeviceProcAddr(dev, "vkCmdInsertDebugUtilsLabelEXT"));
+		}
+
 		memory_map = vk::get_memory_mapping(pdev);
 		m_formats_support = vk::get_optimal_tiling_supported_formats(pdev);
+		m_pipeline_binding_table = vk::get_pipeline_binding_table(pdev);
+
+		if (pgpu->external_memory_host_support)
+		{
+			memory_map._vkGetMemoryHostPointerPropertiesEXT = reinterpret_cast<PFN_vkGetMemoryHostPointerPropertiesEXT>(vkGetDeviceProcAddr(dev, "vkGetMemoryHostPointerPropertiesEXT"));
+		}
 
 		if (g_cfg.video.disable_vulkan_mem_allocator)
-		{
-			m_allocator = std::make_unique<vk::mem_allocator_vk>(*this, pdev);
-		}
+			m_allocator = std::make_unique<vk::mem_allocator_vk>(dev, pdev);
 		else
-		{
-			m_allocator = std::make_unique<vk::mem_allocator_vma>(*this, pdev, pdev);
-		}
-
-		// Useful for debugging different VRAM configurations
-		const u64 vram_allocation_limit = g_cfg.video.vk.vram_allocation_limit * 0x100000ull;
-		memory_map.device_local_total_bytes = std::min(memory_map.device_local_total_bytes, vram_allocation_limit);
+			m_allocator = std::make_unique<vk::mem_allocator_vma>(dev, pdev);
 	}
 
 	void render_device::destroy()
@@ -850,6 +494,36 @@ namespace vk
 		}
 	}
 
+	VkQueue render_device::get_present_queue() const
+	{
+		return m_present_queue;
+	}
+
+	VkQueue render_device::get_graphics_queue() const
+	{
+		return m_graphics_queue;
+	}
+
+	VkQueue render_device::get_transfer_queue() const
+	{
+		return m_transfer_queue;
+	}
+
+	u32 render_device::get_graphics_queue_family() const
+	{
+		return m_graphics_queue_family;
+	}
+
+	u32 render_device::get_present_queue_family() const
+	{
+		return m_graphics_queue_family;
+	}
+
+	u32 render_device::get_transfer_queue_family() const
+	{
+		return m_transfer_queue_family;
+	}
+
 	const VkFormatProperties render_device::get_format_properties(VkFormat format) const
 	{
 		auto found = pgpu->format_properties.find(format);
@@ -888,93 +562,97 @@ namespace vk
 		return false;
 	}
 
+	const physical_device& render_device::gpu() const
+	{
+		return *pgpu;
+	}
+
+	const memory_type_mapping& render_device::get_memory_mapping() const
+	{
+		return memory_map;
+	}
+
+	const gpu_formats_support& render_device::get_formats_support() const
+	{
+		return m_formats_support;
+	}
+
+	const pipeline_binding_table& render_device::get_pipeline_binding_table() const
+	{
+		return m_pipeline_binding_table;
+	}
+
+	const gpu_shader_types_support& render_device::get_shader_types_support() const
+	{
+		return pgpu->shader_types_support;
+	}
+
+	bool render_device::get_shader_stencil_export_support() const
+	{
+		return pgpu->stencil_export_support;
+	}
+
+	bool render_device::get_depth_bounds_support() const
+	{
+		return pgpu->features.depthBounds != VK_FALSE;
+	}
+
+	bool render_device::get_alpha_to_one_support() const
+	{
+		return pgpu->features.alphaToOne != VK_FALSE;
+	}
+
+	bool render_device::get_anisotropic_filtering_support() const
+	{
+		return pgpu->features.samplerAnisotropy != VK_FALSE;
+	}
+
+	bool render_device::get_wide_lines_support() const
+	{
+		return pgpu->features.wideLines != VK_FALSE;
+	}
+
+	bool render_device::get_conditional_render_support() const
+	{
+		return pgpu->conditional_render_support;
+	}
+
+	bool render_device::get_unrestricted_depth_range_support() const
+	{
+		return pgpu->unrestricted_depth_range_support;
+	}
+
+	bool render_device::get_external_memory_host_support() const
+	{
+		return pgpu->external_memory_host_support;
+	}
+
+	bool render_device::get_surface_capabilities_2_support() const
+	{
+		return pgpu->surface_capabilities_2_support;
+	}
+
+	bool render_device::get_debug_utils_support() const
+	{
+		return g_cfg.video.renderdoc_compatiblity && pgpu->debug_utils_support;
+	}
+
+	mem_allocator_base* render_device::get_allocator() const
+	{
+		return m_allocator.get();
+	}
+
+	render_device::operator VkDevice() const
+	{
+		return dev;
+	}
+
 	void render_device::rebalance_memory_type_usage()
 	{
 		// Rebalance device local memory types
 		memory_map.device_local.rebalance();
 	}
 
-	void render_device::dump_debug_info(
-		const std::vector<const char*>& requested_extensions,
-		const VkPhysicalDeviceFeatures& requested_features) const
-	{
-		rsx_log.notice("Dumping requested extensions...");
-		auto device_extensions = vk::supported_extensions(vk::supported_extensions::enumeration_class::device, nullptr, *pgpu);
-		for (const auto& ext : requested_extensions)
-		{
-			rsx_log.notice("[%s] %s", device_extensions.is_supported(ext) ? "Supported" : "Not supported", ext);
-		}
-
-		rsx_log.notice("Dumping requested features...");
-		const auto& supported_features = pgpu->features;
-
-#define TEST_VK_FEATURE(name) \
-		if (requested_features.name) {\
-			if (supported_features.name) \
-				rsx_log.notice("[Supported] "#name); \
-			else \
-				rsx_log.error("[Not supported] "#name); \
-		}
-
-		TEST_VK_FEATURE(robustBufferAccess);
-		TEST_VK_FEATURE(fullDrawIndexUint32);
-		TEST_VK_FEATURE(imageCubeArray);
-		TEST_VK_FEATURE(independentBlend);
-		TEST_VK_FEATURE(geometryShader);
-		TEST_VK_FEATURE(tessellationShader);
-		TEST_VK_FEATURE(sampleRateShading);
-		TEST_VK_FEATURE(dualSrcBlend);
-		TEST_VK_FEATURE(logicOp);
-		TEST_VK_FEATURE(multiDrawIndirect);
-		TEST_VK_FEATURE(drawIndirectFirstInstance);
-		TEST_VK_FEATURE(depthClamp);
-		TEST_VK_FEATURE(depthBiasClamp);
-		TEST_VK_FEATURE(fillModeNonSolid);
-		TEST_VK_FEATURE(depthBounds);
-		TEST_VK_FEATURE(wideLines);
-		TEST_VK_FEATURE(largePoints);
-		TEST_VK_FEATURE(alphaToOne);
-		TEST_VK_FEATURE(multiViewport);
-		TEST_VK_FEATURE(samplerAnisotropy);
-		TEST_VK_FEATURE(textureCompressionETC2);
-		TEST_VK_FEATURE(textureCompressionASTC_LDR);
-		TEST_VK_FEATURE(textureCompressionBC);
-		TEST_VK_FEATURE(occlusionQueryPrecise);
-		TEST_VK_FEATURE(pipelineStatisticsQuery);
-		TEST_VK_FEATURE(vertexPipelineStoresAndAtomics);
-		TEST_VK_FEATURE(fragmentStoresAndAtomics);
-		TEST_VK_FEATURE(shaderTessellationAndGeometryPointSize);
-		TEST_VK_FEATURE(shaderImageGatherExtended);
-		TEST_VK_FEATURE(shaderStorageImageExtendedFormats);
-		TEST_VK_FEATURE(shaderStorageImageMultisample);
-		TEST_VK_FEATURE(shaderStorageImageReadWithoutFormat);
-		TEST_VK_FEATURE(shaderStorageImageWriteWithoutFormat);
-		TEST_VK_FEATURE(shaderUniformBufferArrayDynamicIndexing);
-		TEST_VK_FEATURE(shaderSampledImageArrayDynamicIndexing);
-		TEST_VK_FEATURE(shaderStorageBufferArrayDynamicIndexing);
-		TEST_VK_FEATURE(shaderStorageImageArrayDynamicIndexing);
-		TEST_VK_FEATURE(shaderClipDistance);
-		TEST_VK_FEATURE(shaderCullDistance);
-		TEST_VK_FEATURE(shaderFloat64);
-		TEST_VK_FEATURE(shaderInt64);
-		TEST_VK_FEATURE(shaderInt16);
-		TEST_VK_FEATURE(shaderResourceResidency);
-		TEST_VK_FEATURE(shaderResourceMinLod);
-		TEST_VK_FEATURE(sparseBinding);
-		TEST_VK_FEATURE(sparseResidencyBuffer);
-		TEST_VK_FEATURE(sparseResidencyImage2D);
-		TEST_VK_FEATURE(sparseResidencyImage3D);
-		TEST_VK_FEATURE(sparseResidency2Samples);
-		TEST_VK_FEATURE(sparseResidency4Samples);
-		TEST_VK_FEATURE(sparseResidency8Samples);
-		TEST_VK_FEATURE(sparseResidency16Samples);
-		TEST_VK_FEATURE(sparseResidencyAliased);
-		TEST_VK_FEATURE(variableMultisampleRate);
-		TEST_VK_FEATURE(inheritedQueries);
-
-#undef TEST_VK_FEATURE
-	}
-
 	// Shared Util
 	memory_type_mapping get_memory_mapping(const vk::physical_device& dev)
 	{
@@ -985,166 +663,86 @@ namespace vk
 		memory_type_mapping result;
 		result.device_local_total_bytes = 0;
 		result.host_visible_total_bytes = 0;
-		result.device_bar_total_bytes = 0;
-
-		// Sort the confusingly laid out heap-type map into something easier to scan.
-		// Not performance-critical, this method is called once at initialization.
-		struct memory_type
-		{
-			u32 type_index;
-			VkFlags flags;
-			VkDeviceSize size;
-		};
-
-		struct heap_type_map_entry
-		{
-			VkMemoryHeap heap;
-			std::vector<memory_type> types;
-		};
-
-		std::vector<heap_type_map_entry> memory_heap_map;
-		for (u32 i = 0; i < memory_properties.memoryHeapCount; ++i)
-		{
-			memory_heap_map.push_back(
-			{
-				.heap = memory_properties.memoryHeaps[i],
-				.types = {}
-			});
-		}
+		bool host_visible_cached = false;
 
 		for (u32 i = 0; i < memory_properties.memoryTypeCount; i++)
 		{
-			auto& type_info = memory_properties.memoryTypes[i];
-			memory_heap_map[type_info.heapIndex].types.push_back({ i, type_info.propertyFlags, 0 });
-		}
+			VkMemoryHeap& heap = memory_properties.memoryHeaps[memory_properties.memoryTypes[i].heapIndex];
 
-		auto find_memory_type_with_property = [&memory_heap_map](VkFlags desired_flags, VkFlags excluded_flags)
-		{
-			std::vector<memory_type> results;
-
-			for (auto& heap : memory_heap_map)
+			bool is_device_local = !!(memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+			if (is_device_local)
 			{
-				for (auto &type : heap.types)
-				{
-					if (((type.flags & desired_flags) == desired_flags) && !(type.flags & excluded_flags))
-					{
-						// Match, only once allowed per heap!
-						results.push_back({ type.type_index, type.flags, heap.heap.size });
-						break;
-					}
-				}
+				// Allow multiple device_local heaps
+				result.device_local.push(i, heap.size);
+				result.device_local_total_bytes += heap.size;
 			}
 
-			return results;
-		};
+			bool is_host_visible = !!(memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
+			bool is_host_coherent = !!(memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
+			bool is_cached = !!(memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_CACHED_BIT);
 
-		auto device_local_types = find_memory_type_with_property(
-			VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
-			(VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD | VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD));
-		auto host_coherent_types = find_memory_type_with_property(
-			(VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT),
-			0);
-		auto bar_memory_types = find_memory_type_with_property(
-			(VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT),
-			0);
-
-		if (host_coherent_types.empty())
-		{
-			rsx_log.warning("[Performance Warning] Could not identify a cached upload heap. Will fall back to uncached transport.");
-			host_coherent_types = find_memory_type_with_property(
-				(VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT),
-				0);
-		}
-
-		ensure(!device_local_types.empty());
-		ensure(!host_coherent_types.empty());
-
-		// BAR heap, currently parked for future use, I have some plans for it (kd-11)
-		for (const auto& type : bar_memory_types)
-		{
-			result.device_bar.push(type.type_index, type.size);
-			result.device_bar_total_bytes += type.size;
-		}
-
-		// Generic VRAM access, requires some minor prioritization based on flags
-		// Most devices have a 'PURE' device local type, pin that as the first priority
-		// Internally, there will be some reshuffling based on memory load later, but this is rare
-		if (device_local_types.size() > 1)
-		{
-			std::sort(device_local_types.begin(), device_local_types.end(), [](const auto& a, const auto& b)
+			if (is_host_coherent && is_host_visible)
 			{
-				if (a.flags == b.flags)
+				if ((is_cached && !host_visible_cached) || (result.host_visible_total_bytes < heap.size))
 				{
-					return a.size > b.size;
+					// Allow only a single host_visible heap. It makes no sense to have multiple of these otherwise
+					result.host_visible_coherent = { i, heap.size };
+					result.host_visible_total_bytes = heap.size;
+					host_visible_cached = is_cached;
 				}
-
-				return (a.flags == VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) || (b.flags != VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT && a.size > b.size);
-			});
+			}
 		}
 
-		for (const auto& type : device_local_types)
-		{
-			result.device_local.push(type.type_index, type.size);
-			result.device_local_total_bytes += type.size;
-		}
-
-		// Sort upload heap entries based on size.
-		if (host_coherent_types.size() > 1)
-		{
-			std::sort(host_coherent_types.begin(), host_coherent_types.end(), FN(x.size > y.size));
-		}
-
-		for (const auto& type : host_coherent_types)
-		{
-			result.host_visible_coherent.push(type.type_index, type.size);
-			result.host_visible_total_bytes += type.size;
-		}
-
-		rsx_log.notice("Detected %llu MB of device local memory", result.device_local_total_bytes / (0x100000));
-		rsx_log.notice("Detected %llu MB of host coherent memory", result.host_visible_total_bytes / (0x100000));
-		rsx_log.notice("Detected %llu MB of BAR memory", result.device_bar_total_bytes / (0x100000));
-
+		if (!result.device_local)
+			fmt::throw_exception("GPU doesn't support device local memory");
+		if (!result.host_visible_coherent)
+			fmt::throw_exception("GPU doesn't support host coherent device local memory");
 		return result;
 	}
 
 	gpu_formats_support get_optimal_tiling_supported_formats(const physical_device& dev)
 	{
-		const auto test_format_features = [&dev](VkFormat format, VkFlags required_features, VkBool32 linear_features) -> bool
-		{
-			VkFormatProperties props;
-			vkGetPhysicalDeviceFormatProperties(dev, format, &props);
-
-			const auto supported_features_mask = (linear_features) ? props.linearTilingFeatures : props.optimalTilingFeatures;
-			return (supported_features_mask & required_features) == required_features;
-		};
-
 		gpu_formats_support result = {};
-		const VkFlags required_zbuffer_features = (VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT);
-		const VkFlags required_colorbuffer_features = (VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT);
 
-		// Check supported depth formats
-		result.d24_unorm_s8 = test_format_features(VK_FORMAT_D24_UNORM_S8_UINT, required_zbuffer_features, VK_FALSE);
-		result.d32_sfloat_s8 = test_format_features(VK_FORMAT_D32_SFLOAT_S8_UINT, required_zbuffer_features, VK_FALSE);
+		VkFormatProperties props;
+		vkGetPhysicalDeviceFormatProperties(dev, VK_FORMAT_D24_UNORM_S8_UINT, &props);
+
+		result.d24_unorm_s8 = !!(props.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT) && !!(props.optimalTilingFeatures & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) &&
+			!!(props.optimalTilingFeatures & VK_FORMAT_FEATURE_BLIT_SRC_BIT) && !!(props.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT);
+
+		vkGetPhysicalDeviceFormatProperties(dev, VK_FORMAT_D32_SFLOAT_S8_UINT, &props);
+		result.d32_sfloat_s8 = !!(props.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT) && !!(props.optimalTilingFeatures & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) &&
+			!!(props.optimalTilingFeatures & VK_FORMAT_FEATURE_BLIT_SRC_BIT);
 
 		// Hide d24_s8 if force high precision z buffer is enabled
 		if (g_cfg.video.force_high_precision_z_buffer && result.d32_sfloat_s8)
-		{
 			result.d24_unorm_s8 = false;
-		}
 
-		// Checks if linear BGRA8 images can be used for present
-		result.bgra8_linear = test_format_features(VK_FORMAT_B8G8R8A8_UNORM, VK_FORMAT_FEATURE_BLIT_SRC_BIT, VK_TRUE);
+		// Checks if BGRA8 images can be used for blitting
+		vkGetPhysicalDeviceFormatProperties(dev, VK_FORMAT_B8G8R8A8_UNORM, &props);
+		result.bgra8_linear = !!(props.linearTilingFeatures & VK_FORMAT_FEATURE_BLIT_SRC_BIT);
 
-		// Check if device supports RGBA8 format for rendering
-		if (!test_format_features(VK_FORMAT_R8G8B8A8_UNORM, required_colorbuffer_features, VK_FALSE))
+		// Check if device supports RGBA8 format
+		vkGetPhysicalDeviceFormatProperties(dev, VK_FORMAT_R8G8B8A8_UNORM, &props);
+		if (!(props.optimalTilingFeatures & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT) || !(props.optimalTilingFeatures & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT) ||
+			!(props.optimalTilingFeatures & VK_FORMAT_FEATURE_BLIT_SRC_BIT))
 		{
 			// Non-fatal. Most games use BGRA layout due to legacy reasons as old GPUs typically supported BGRA and RGBA was emulated.
 			rsx_log.error("Your GPU and/or driver does not support RGBA8 format. This can cause problems in some rare games that use this memory layout.");
 		}
 
-		// Check if linear RGBA8 images can be used for present
-		result.argb8_linear = test_format_features(VK_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_FEATURE_BLIT_SRC_BIT, VK_TRUE);
+		result.argb8_linear = !!(props.linearTilingFeatures & VK_FORMAT_FEATURE_BLIT_SRC_BIT);
+		return result;
+	}
 
+	pipeline_binding_table get_pipeline_binding_table(const vk::physical_device& dev)
+	{
+		pipeline_binding_table result{};
+
+		// Need to check how many samplers are supported by the driver
+		const auto usable_samplers = std::min(dev.get_limits().maxPerStageDescriptorSampledImages, 32u);
+		result.vertex_textures_first_bind_slot = result.textures_first_bind_slot + usable_samplers;
+		result.total_descriptor_bindings = result.vertex_textures_first_bind_slot + 4;
 		return result;
 	}
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/device.h b/rpcs3/Emu/RSX/VK/vkutils/device.h
index 0511802aac..2419ac1c52 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/device.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/device.h
@@ -9,62 +9,32 @@
 #include <vector>
 #include <unordered_map>
 
-#define DESCRIPTOR_MAX_DRAW_CALLS 32768
-
 namespace vk
 {
 	struct gpu_formats_support
 	{
-		bool d24_unorm_s8 : 1;
-		bool d32_sfloat_s8 : 1;
-		bool bgra8_linear : 1;
-		bool argb8_linear : 1;
+		bool d24_unorm_s8;
+		bool d32_sfloat_s8;
+		bool bgra8_linear;
+		bool argb8_linear;
 	};
 
 	struct gpu_shader_types_support
 	{
-		bool allow_float64 : 1;
-		bool allow_float16 : 1;
-		bool allow_int8 : 1;
+		bool allow_float64;
+		bool allow_float16;
+		bool allow_int8;
 	};
 
 	struct memory_type_mapping
 	{
 		memory_type_info host_visible_coherent;
 		memory_type_info device_local;
-		memory_type_info device_bar;
 
 		u64 device_local_total_bytes;
 		u64 host_visible_total_bytes;
-		u64 device_bar_total_bytes;
-	};
 
-	struct descriptor_indexing_features
-	{
-		bool supported = false;
-		u64 update_after_bind_mask = 0;
-
-		descriptor_indexing_features(bool supported = false)
-			: supported(supported) {}
-
-		operator bool() const { return supported; }
-	};
-
-	struct custom_border_color_features
-	{
-		bool supported = false;
-		bool swizzle_extension_supported = false;
-		bool require_border_color_remap = true;  // Assume that without the swizzle extension and explicit remap the device just samples border color as replacement.
-
-		operator bool() const { return supported; }
-	};
-
-	struct multidraw_features
-	{
-		bool supported;
-		u32 max_batch_size;
-
-		operator bool() const { return supported; }
+		PFN_vkGetMemoryHostPointerPropertiesEXT _vkGetMemoryHostPointerPropertiesEXT;
 	};
 
 	class physical_device
@@ -80,33 +50,16 @@ namespace vk
 		gpu_shader_types_support shader_types_support{};
 		VkPhysicalDeviceDriverPropertiesKHR driver_properties{};
 
-		u32 descriptor_max_draw_calls = DESCRIPTOR_MAX_DRAW_CALLS;
-		descriptor_indexing_features descriptor_indexing_support{};
-
-		custom_border_color_features custom_border_color_support{};
-
-		multidraw_features multidraw_support{};
-
-		struct
-		{
-			bool barycentric_coords = false;
-			bool conditional_rendering = false;
-			bool debug_utils = false;
-			bool external_memory_host = false;
-			bool framebuffer_loops = false;
-			bool shader_stencil_export = false;
-			bool surface_capabilities_2 = false;
-			bool synchronization_2 = false;
-			bool unrestricted_depth_range = false;
-			bool extended_device_fault = false;
-			bool texture_compression_bc = false;
-		} optional_features_support;
+		bool stencil_export_support = false;
+		bool conditional_render_support = false;
+		bool external_memory_host_support = false;
+		bool unrestricted_depth_range_support = false;
+		bool surface_capabilities_2_support = false;
+		bool debug_utils_support = false;
 
 		friend class render_device;
 	private:
 		void get_physical_device_features(bool allow_extensions);
-		void get_physical_device_properties_0(bool allow_extensions);
-		void get_physical_device_properties_1(bool allow_extensions);
 
 	public:
 
@@ -137,6 +90,7 @@ namespace vk
 		physical_device* pgpu = nullptr;
 		memory_type_mapping memory_map{};
 		gpu_formats_support m_formats_support{};
+		pipeline_binding_table m_pipeline_binding_table{};
 		std::unique_ptr<mem_allocator_base> m_allocator;
 		VkDevice dev = VK_NULL_HANDLE;
 
@@ -148,9 +102,13 @@ namespace vk
 		u32 m_present_queue_family = 0;
 		u32 m_transfer_queue_family = 0;
 
-		void dump_debug_info(
-			const std::vector<const char*>& requested_extensions,
-			const VkPhysicalDeviceFeatures& requested_features) const;
+	public:
+		// Exported device endpoints
+		PFN_vkCmdBeginConditionalRenderingEXT _vkCmdBeginConditionalRenderingEXT = nullptr;
+		PFN_vkCmdEndConditionalRenderingEXT _vkCmdEndConditionalRenderingEXT = nullptr;
+		PFN_vkSetDebugUtilsObjectNameEXT _vkSetDebugUtilsObjectNameEXT = nullptr;
+		PFN_vkQueueInsertDebugUtilsLabelEXT _vkQueueInsertDebugUtilsLabelEXT = nullptr;
+		PFN_vkCmdInsertDebugUtilsLabelEXT _vkCmdInsertDebugUtilsLabelEXT = nullptr;
 
 	public:
 		render_device() = default;
@@ -164,46 +122,38 @@ namespace vk
 		bool get_compatible_memory_type(u32 typeBits, u32 desired_mask, u32* type_index) const;
 		void rebalance_memory_type_usage();
 
-		const physical_device& gpu() const { return *pgpu; }
-		const memory_type_mapping& get_memory_mapping() const { return memory_map; }
-		const gpu_formats_support& get_formats_support() const { return m_formats_support; }
-		const gpu_shader_types_support& get_shader_types_support() const { return pgpu->shader_types_support; }
-		const custom_border_color_features& get_custom_border_color_support() const { return pgpu->custom_border_color_support; }
-		const multidraw_features get_multidraw_support() const { return pgpu->multidraw_support; }
+		const physical_device& gpu() const;
+		const memory_type_mapping& get_memory_mapping() const;
+		const gpu_formats_support& get_formats_support() const;
+		const pipeline_binding_table& get_pipeline_binding_table() const;
+		const gpu_shader_types_support& get_shader_types_support() const;
 
-		bool get_shader_stencil_export_support() const { return pgpu->optional_features_support.shader_stencil_export; }
-		bool get_depth_bounds_support() const { return pgpu->features.depthBounds != VK_FALSE; }
-		bool get_alpha_to_one_support() const { return pgpu->features.alphaToOne != VK_FALSE; }
-		bool get_anisotropic_filtering_support() const { return pgpu->features.samplerAnisotropy != VK_FALSE; }
-		bool get_wide_lines_support() const { return pgpu->features.wideLines != VK_FALSE; }
-		bool get_conditional_render_support() const { return pgpu->optional_features_support.conditional_rendering; }
-		bool get_unrestricted_depth_range_support() const { return pgpu->optional_features_support.unrestricted_depth_range; }
-		bool get_external_memory_host_support() const { return pgpu->optional_features_support.external_memory_host; }
-		bool get_surface_capabilities_2_support() const { return pgpu->optional_features_support.surface_capabilities_2; }
-		bool get_debug_utils_support() const { return g_cfg.video.renderdoc_compatiblity && pgpu->optional_features_support.debug_utils; }
-		bool get_framebuffer_loops_support() const { return pgpu->optional_features_support.framebuffer_loops; }
-		bool get_barycoords_support() const { return pgpu->optional_features_support.barycentric_coords; }
-		bool get_synchronization2_support() const { return pgpu->optional_features_support.synchronization_2; }
-		bool get_extended_device_fault_support() const { return pgpu->optional_features_support.extended_device_fault; }
-		bool get_texture_compression_bc_support() const { return pgpu->optional_features_support.texture_compression_bc; }
+		bool get_shader_stencil_export_support() const;
+		bool get_depth_bounds_support() const;
+		bool get_alpha_to_one_support() const;
+		bool get_anisotropic_filtering_support() const;
+		bool get_wide_lines_support() const;
+		bool get_conditional_render_support() const;
+		bool get_unrestricted_depth_range_support() const;
+		bool get_external_memory_host_support() const;
+		bool get_surface_capabilities_2_support() const;
+		bool get_debug_utils_support() const;
 
-		u64 get_descriptor_update_after_bind_support() const { return pgpu->descriptor_indexing_support.update_after_bind_mask; }
-		u32 get_descriptor_max_draw_calls() const { return pgpu->descriptor_max_draw_calls; }
+		VkQueue get_present_queue() const;
+		VkQueue get_graphics_queue() const;
+		VkQueue get_transfer_queue() const;
+		u32 get_graphics_queue_family() const;
+		u32 get_present_queue_family() const;
+		u32 get_transfer_queue_family() const;
 
-		VkQueue get_present_queue() const { return m_present_queue; }
-		VkQueue get_graphics_queue() const { return m_graphics_queue; }
-		VkQueue get_transfer_queue() const { return m_transfer_queue; }
-		u32 get_graphics_queue_family() const { return m_graphics_queue_family; }
-		u32 get_present_queue_family() const { return m_graphics_queue_family; }
-		u32 get_transfer_queue_family() const { return m_transfer_queue_family; }
+		mem_allocator_base* get_allocator() const;
 
-		mem_allocator_base* get_allocator() const { return m_allocator.get(); }
-
-		operator VkDevice() const { return dev; }
+		operator VkDevice() const;
 	};
 
 	memory_type_mapping get_memory_mapping(const physical_device& dev);
 	gpu_formats_support get_optimal_tiling_supported_formats(const physical_device& dev);
+	pipeline_binding_table get_pipeline_binding_table(const physical_device& dev);
 
 	extern const render_device* g_render_device;
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/framebuffer_object.hpp b/rpcs3/Emu/RSX/VK/vkutils/framebuffer_object.hpp
index 03ce077bcc..3ee09e9f32 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/framebuffer_object.hpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/framebuffer_object.hpp
@@ -63,19 +63,7 @@ namespace vk
 			return attachments[0]->image()->samples();
 		}
 
-		VkFormat format()
-		{
-			ensure(!attachments.empty());
-			return attachments[0]->image()->format();
-		}
-
-		VkFormat depth_format()
-		{
-			ensure(!attachments.empty());
-			return attachments.back()->image()->format();
-		}
-
-		bool matches(const std::vector<vk::image*>& fbo_images, u32 width, u32 height)
+		bool matches(std::vector<vk::image*> fbo_images, u32 width, u32 height)
 		{
 			if (m_width != width || m_height != height)
 				return false;
diff --git a/rpcs3/Emu/RSX/VK/vkutils/garbage_collector.h b/rpcs3/Emu/RSX/VK/vkutils/garbage_collector.h
deleted file mode 100644
index 48d531f18d..0000000000
--- a/rpcs3/Emu/RSX/VK/vkutils/garbage_collector.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#include <util/types.hpp>
-
-#include <functional>
-
-namespace vk
-{
-	class disposable_t
-	{
-		void* ptr;
-		std::function<void(void*)> deleter;
-
-		disposable_t(void* ptr_, std::function<void(void*)> deleter_) :
-			ptr(ptr_), deleter(deleter_) {}
-	public:
-
-		disposable_t() = delete;
-		disposable_t(const disposable_t&) = delete;
-
-		disposable_t(disposable_t&& other) noexcept :
-			ptr(std::exchange(other.ptr, nullptr)),
-			deleter(other.deleter)
-		{}
-
-		~disposable_t()
-		{
-			if (ptr)
-			{
-				deleter(ptr);
-				ptr = nullptr;
-			}
-		}
-
-		template <typename T>
-		static disposable_t make(T* raw)
-		{
-			return disposable_t(raw, [](void* raw)
-			{
-				delete static_cast<T*>(raw);
-			});
-		}
-	};
-
-	struct garbage_collector
-	{
-		virtual void dispose(vk::disposable_t& object) = 0;
-
-		virtual void add_exit_callback(std::function<void()> callback) = 0;
-
-		template<typename T>
-		void dispose(std::unique_ptr<T>& object)
-		{
-			auto ptr = vk::disposable_t::make(object.release());
-			dispose(ptr);
-		}
-	};
-
-	garbage_collector* get_gc();
-}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/graphics_pipeline_state.hpp b/rpcs3/Emu/RSX/VK/vkutils/graphics_pipeline_state.hpp
index 11f2b834ae..ceae859d2c 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/graphics_pipeline_state.hpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/graphics_pipeline_state.hpp
@@ -23,7 +23,7 @@ namespace vk
 		graphics_pipeline_state()
 		{
 			// NOTE: Vk** structs have padding bytes
-			std::memset(static_cast<void*>(this), 0, sizeof(graphics_pipeline_state));
+			memset(this, 0, sizeof(graphics_pipeline_state));
 
 			ia.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
 			cs.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
@@ -43,7 +43,7 @@ namespace vk
 		graphics_pipeline_state(const graphics_pipeline_state& other)
 		{
 			// NOTE: Vk** structs have padding bytes
-			std::memcpy(static_cast<void*>(this), &other, sizeof(graphics_pipeline_state));
+			memcpy(this, &other, sizeof(graphics_pipeline_state));
 
 			if (other.cs.pAttachments == other.att_state)
 			{
@@ -59,7 +59,7 @@ namespace vk
 			if (this != &other)
 			{
 				// NOTE: Vk** structs have padding bytes
-				std::memcpy(static_cast<void*>(this), &other, sizeof(graphics_pipeline_state));
+				memcpy(this, &other, sizeof(graphics_pipeline_state));
 
 				if (other.cs.pAttachments == other.att_state)
 				{
@@ -76,9 +76,9 @@ namespace vk
 			ia.topology = type;
 		}
 
-		void enable_primitive_restart(VkBool32 enable = VK_TRUE)
+		void enable_primitive_restart(bool enable = true)
 		{
-			ia.primitiveRestartEnable = enable;
+			ia.primitiveRestartEnable = enable? VK_TRUE : VK_FALSE;
 		}
 
 		void set_color_mask(int index, bool r, bool g, bool b, bool a)
@@ -132,8 +132,7 @@ namespace vk
 			ds.depthBoundsTestEnable = enable? VK_TRUE : VK_FALSE;
 		}
 
-		void enable_blend(int mrt_index,
-			VkBlendFactor src_factor_rgb, VkBlendFactor src_factor_a,
+		void enable_blend(int mrt_index, VkBlendFactor src_factor_rgb, VkBlendFactor src_factor_a,
 			VkBlendFactor dst_factor_rgb, VkBlendFactor dst_factor_a,
 			VkBlendOp equation_rgb, VkBlendOp equation_a)
 		{
diff --git a/rpcs3/Emu/RSX/VK/vkutils/image.cpp b/rpcs3/Emu/RSX/VK/vkutils/image.cpp
index 1aa90648ce..b2ed85dd8f 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/image.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/image.cpp
@@ -4,14 +4,13 @@
 #include "image.h"
 #include "image_helpers.h"
 
-#include "../VKResourceManager.h"
 #include <memory>
 
 namespace vk
 {
 	void image::validate(const vk::render_device& dev, const VkImageCreateInfo& info) const
 	{
-		const auto& gpu_limits = dev.gpu().get_limits();
+		const auto gpu_limits = dev.gpu().get_limits();
 		u32 longest_dim, dim_limit;
 
 		switch (info.imageType)
@@ -71,18 +70,6 @@ namespace vk
 		info.initialLayout = initial_layout;
 		info.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
 
-		std::array<u32, 2> concurrency_queue_families = {
-			dev.get_graphics_queue_family(),
-			dev.get_transfer_queue_family()
-		};
-
-		if (image_flags & VK_IMAGE_CREATE_SHAREABLE_RPCS3)
-		{
-			info.sharingMode = VK_SHARING_MODE_CONCURRENT;
-			info.queueFamilyIndexCount = ::size32(concurrency_queue_families);
-			info.pQueueFamilyIndices = concurrency_queue_families.data();
-		}
-
 		create_impl(dev, access_flags, memory_type, allocation_pool);
 		m_storage_aspect = get_aspect_flags(format);
 
@@ -113,8 +100,8 @@ namespace vk
 		ensure(!value && !memory);
 		validate(dev, info);
 
-		const bool nullable = !!(info.flags & VK_IMAGE_CREATE_ALLOW_NULL_RPCS3);
-		info.flags &= ~VK_IMAGE_CREATE_SPECIAL_FLAGS_RPCS3;
+		const bool nullable = !!(info.flags & VK_IMAGE_CREATE_ALLOW_NULL);
+		info.flags &= ~VK_IMAGE_CREATE_ALLOW_NULL;
 
 		CHECK_RESULT(vkCreateImage(m_device, &info, nullptr, &value));
 
@@ -182,11 +169,6 @@ namespace vk
 		return info.imageType;
 	}
 
-	VkSharingMode image::sharing_mode() const
-	{
-		return info.sharingMode;
-	}
-
 	VkImageAspectFlags image::aspect() const
 	{
 		return m_storage_aspect;
@@ -197,25 +179,20 @@ namespace vk
 		return m_format_class;
 	}
 
-	void image::push_layout(const command_buffer& cmd, VkImageLayout layout)
+	void image::push_layout(VkCommandBuffer cmd, VkImageLayout layout)
 	{
-		ensure(current_queue_family == VK_QUEUE_FAMILY_IGNORED || current_queue_family == cmd.get_queue_family());
-
 		m_layout_stack.push(current_layout);
 		change_image_layout(cmd, this, layout);
 	}
 
-	void image::push_barrier(const command_buffer& cmd, VkImageLayout layout)
+	void image::push_barrier(VkCommandBuffer cmd, VkImageLayout layout)
 	{
-		ensure(current_queue_family == VK_QUEUE_FAMILY_IGNORED || current_queue_family == cmd.get_queue_family());
-
 		m_layout_stack.push(current_layout);
 		insert_texture_barrier(cmd, this, layout);
 	}
 
-	void image::pop_layout(const command_buffer& cmd)
+	void image::pop_layout(VkCommandBuffer cmd)
 	{
-		ensure(current_queue_family == VK_QUEUE_FAMILY_IGNORED || current_queue_family == cmd.get_queue_family());
 		ensure(!m_layout_stack.empty());
 
 		auto layout = m_layout_stack.top();
@@ -223,63 +200,37 @@ namespace vk
 		change_image_layout(cmd, this, layout);
 	}
 
-	void image::queue_acquire(const command_buffer& cmd, VkImageLayout new_layout)
-	{
-		ensure(m_layout_stack.empty());
-		ensure(current_queue_family != cmd.get_queue_family());
-
-		if (info.sharingMode == VK_SHARING_MODE_EXCLUSIVE || current_layout != new_layout)
-		{
-			VkImageSubresourceRange range = { aspect(), 0, mipmaps(), 0, layers() };
-			const u32 src_queue_family = info.sharingMode == VK_SHARING_MODE_EXCLUSIVE ? current_queue_family : VK_QUEUE_FAMILY_IGNORED;
-			const u32 dst_queue_family = info.sharingMode == VK_SHARING_MODE_EXCLUSIVE ? cmd.get_queue_family() : VK_QUEUE_FAMILY_IGNORED;
-			change_image_layout(cmd, value, current_layout, new_layout, range, src_queue_family, dst_queue_family, 0u, ~0u);
-		}
-
-		current_layout = new_layout;
-		current_queue_family = cmd.get_queue_family();
-	}
-
-	void image::queue_release(const command_buffer& src_queue_cmd, u32 dst_queue_family, VkImageLayout new_layout)
-	{
-		ensure(current_queue_family == src_queue_cmd.get_queue_family());
-		ensure(m_layout_stack.empty());
-
-		if (info.sharingMode == VK_SHARING_MODE_EXCLUSIVE || current_layout != new_layout)
-		{
-			VkImageSubresourceRange range = { aspect(), 0, mipmaps(), 0, layers() };
-			const u32 src_queue_family = info.sharingMode == VK_SHARING_MODE_EXCLUSIVE ? current_queue_family : VK_QUEUE_FAMILY_IGNORED;
-			const u32 dst_queue_family2 = info.sharingMode == VK_SHARING_MODE_EXCLUSIVE ? dst_queue_family : VK_QUEUE_FAMILY_IGNORED;
-			change_image_layout(src_queue_cmd, value, current_layout, new_layout, range, src_queue_family, dst_queue_family2, ~0u, 0u);
-		}
-
-		current_layout = new_layout;
-		current_queue_family = dst_queue_family;
-	}
-
 	void image::change_layout(const command_buffer& cmd, VkImageLayout new_layout)
 	{
-		// This is implicitly an acquire op
-		if (const auto new_queue_family = cmd.get_queue_family();
-			current_queue_family == VK_QUEUE_FAMILY_IGNORED)
-		{
-			current_queue_family = new_queue_family;
-		}
-		else if (current_queue_family != new_queue_family)
-		{
-			queue_acquire(cmd, new_layout);
-			return;
-		}
-
 		if (current_layout == new_layout)
-		{
 			return;
-		}
 
 		ensure(m_layout_stack.empty());
 		change_image_layout(cmd, this, new_layout);
+	}
 
-		current_queue_family = cmd.get_queue_family();
+	void image::change_layout(const command_buffer& cmd, VkImageLayout new_layout, u32 new_queue_family)
+	{
+		if (current_layout == new_layout && current_queue_family == new_queue_family)
+		{
+			// Nothing to do
+			return;
+		}
+
+		ensure(m_layout_stack.empty());
+		u32 dst_queue = new_queue_family;
+
+		if (current_queue_family == VK_QUEUE_FAMILY_IGNORED)
+		{
+			// Implicit acquisition
+			dst_queue = VK_QUEUE_FAMILY_IGNORED;
+		}
+
+		VkImageSubresourceRange range = { aspect(), 0, mipmaps(), 0, layers() };
+		change_image_layout(cmd, value, current_layout, new_layout, range, current_queue_family, dst_queue);
+
+		current_layout = new_layout;
+		current_queue_family = new_queue_family;
 	}
 
 	void image::set_debug_name(const std::string& name)
@@ -292,7 +243,7 @@ namespace vk
 			name_info.objectHandle = reinterpret_cast<u64>(value);
 			name_info.pObjectName = name.c_str();
 
-			_vkSetDebugUtilsObjectNameEXT(m_device, &name_info);
+			g_render_device->_vkSetDebugUtilsObjectNameEXT(m_device, &name_info);
 		}
 	}
 
@@ -411,9 +362,8 @@ namespace vk
 		return result;
 	}
 
-	image_view* viewable_image::get_view(const rsx::texture_channel_remap_t& remap, VkImageAspectFlags mask)
+	image_view* viewable_image::get_view(u32 remap_encoding, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap, VkImageAspectFlags mask)
 	{
-		u32 remap_encoding = remap.encoded;
 		if (remap_encoding == VK_REMAP_IDENTITY)
 		{
 			if (native_component_map.a == VK_COMPONENT_SWIZZLE_A &&
@@ -421,16 +371,17 @@ namespace vk
 				native_component_map.g == VK_COMPONENT_SWIZZLE_G &&
 				native_component_map.b == VK_COMPONENT_SWIZZLE_B)
 			{
-				remap_encoding = RSX_TEXTURE_REMAP_IDENTITY;
+				remap_encoding = 0xAAE4;
 			}
 		}
 
-		const u64 storage_key = remap_encoding | (static_cast<u64>(mask) << 32);
-		auto found = views.find(storage_key);
-		if (found != views.end())
+		auto found = views.equal_range(remap_encoding);
+		for (auto It = found.first; It != found.second; ++It)
 		{
-			ensure(found->second->info.subresourceRange.aspectMask & mask);
-			return found->second.get();
+			if (It->second->info.subresourceRange.aspectMask & mask)
+			{
+				return It->second.get();
+			}
 		}
 
 		VkComponentMapping real_mapping;
@@ -439,7 +390,7 @@ namespace vk
 		case VK_REMAP_IDENTITY:
 			real_mapping = { VK_COMPONENT_SWIZZLE_IDENTITY, VK_COMPONENT_SWIZZLE_IDENTITY, VK_COMPONENT_SWIZZLE_IDENTITY, VK_COMPONENT_SWIZZLE_IDENTITY };
 			break;
-		case RSX_TEXTURE_REMAP_IDENTITY:
+		case 0xAAE4:
 			real_mapping = native_component_map;
 			break;
 		default:
@@ -456,7 +407,7 @@ namespace vk
 
 		auto view = std::make_unique<vk::image_view>(*g_render_device, this, VK_IMAGE_VIEW_TYPE_MAX_ENUM, real_mapping, range);
 		auto result = view.get();
-		views.emplace(storage_key, std::move(view));
+		views.emplace(remap_encoding, std::move(view));
 		return result;
 	}
 
@@ -468,13 +419,6 @@ namespace vk
 			new_layout.a != native_component_map.a)
 		{
 			native_component_map = new_layout;
-
-			// Safely discard existing views
-			auto gc = vk::get_resource_manager();
-			for (auto& p : views)
-			{
-				gc->dispose(p.second);
-			}
 			views.clear();
 		}
 	}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/image.h b/rpcs3/Emu/RSX/VK/vkutils/image.h
index a37c7676b4..3299b8f4c9 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/image.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/image.h
@@ -12,18 +12,19 @@
 //using enum rsx::format_class;
 using namespace ::rsx::format_class_;
 
+#ifdef __APPLE__
+#define VK_DISABLE_COMPONENT_SWIZZLE 1
+#else
 #define VK_DISABLE_COMPONENT_SWIZZLE 0
+#endif
 
 namespace vk
 {
 	enum : u32// special remap_encoding enums
 	{
-		VK_REMAP_IDENTITY = 0xCAFEBABE,                   // Special view encoding to return an identity image view
-		VK_REMAP_VIEW_MULTISAMPLED = 0xDEADBEEF,          // Special encoding for multisampled images; returns a multisampled image view
-		VK_IMAGE_CREATE_ALLOW_NULL_RPCS3 = 0x80000000,    // Special flag that allows null images to be created if there is no memory
-		VK_IMAGE_CREATE_SHAREABLE_RPCS3  = 0x40000000,    // Special flag to create a shareable image
-
-		VK_IMAGE_CREATE_SPECIAL_FLAGS_RPCS3 = (VK_IMAGE_CREATE_ALLOW_NULL_RPCS3 | VK_IMAGE_CREATE_SHAREABLE_RPCS3)
+		VK_REMAP_IDENTITY = 0xCAFEBABE,             // Special view encoding to return an identity image view
+		VK_REMAP_VIEW_MULTISAMPLED = 0xDEADBEEF,    // Special encoding for multisampled images; returns a multisampled image view
+		VK_IMAGE_CREATE_ALLOW_NULL = 0x80000000,    // Special flag that allows null images to be created if there is no memory
 	};
 
 	class image
@@ -76,19 +77,15 @@ namespace vk
 		u8 samples() const;
 		VkFormat format() const;
 		VkImageType type() const;
-		VkSharingMode sharing_mode() const;
 		VkImageAspectFlags aspect() const;
 		rsx::format_class format_class() const;
 
 		// Pipeline management
-		void push_layout(const command_buffer& cmd, VkImageLayout layout);
-		void push_barrier(const command_buffer& cmd, VkImageLayout layout);
-		void pop_layout(const command_buffer& cmd);
+		void push_layout(VkCommandBuffer cmd, VkImageLayout layout);
+		void push_barrier(VkCommandBuffer cmd, VkImageLayout layout);
+		void pop_layout(VkCommandBuffer cmd);
 		void change_layout(const command_buffer& cmd, VkImageLayout new_layout);
-
-		// Queue transfer
-		void queue_acquire(const command_buffer& cmd, VkImageLayout new_layout);
-		void queue_release(const command_buffer& src_queue_cmd, u32 dst_queue_family, VkImageLayout new_layout);
+		void change_layout(const command_buffer& cmd, VkImageLayout new_layout, u32 new_queue_family);
 
 		// Debug utils
 		void set_debug_name(const std::string& name);
@@ -128,13 +125,13 @@ namespace vk
 	class viewable_image : public image
 	{
 	protected:
-		std::unordered_map<u64, std::unique_ptr<vk::image_view>> views;
+		std::unordered_multimap<u32, std::unique_ptr<vk::image_view>> views;
 		viewable_image* clone();
 
 	public:
 		using image::image;
 
-		virtual image_view* get_view(const rsx::texture_channel_remap_t& remap,
+		virtual image_view* get_view(u32 remap_encoding, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap,
 			VkImageAspectFlags mask = VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT);
 
 		void set_native_component_layout(VkComponentMapping new_layout);
diff --git a/rpcs3/Emu/RSX/VK/vkutils/image_helpers.cpp b/rpcs3/Emu/RSX/VK/vkutils/image_helpers.cpp
index e8d8bc9c0d..cf5131b205 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/image_helpers.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/image_helpers.cpp
@@ -1,8 +1,9 @@
 #include "stdafx.h"
 #include "image_helpers.h"
 #include "image.h"
+#include "util/logs.hpp"
 #include "../VKRenderPass.h"
-#include "../../color_utils.h"
+#include "../../gcm_enums.h"
 
 namespace vk
 {
@@ -29,14 +30,33 @@ namespace vk
 		}
 	}
 
-	VkComponentMapping apply_swizzle_remap(const std::array<VkComponentSwizzle, 4>& base_remap, const rsx::texture_channel_remap_t& remap_vector)
+	VkComponentMapping apply_swizzle_remap(const std::array<VkComponentSwizzle, 4>& base_remap, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap_vector)
 	{
-		const auto final_mapping = remap_vector.remap(base_remap, VK_COMPONENT_SWIZZLE_ZERO, VK_COMPONENT_SWIZZLE_ONE);
-		return { final_mapping[1], final_mapping[2], final_mapping[3], final_mapping[0] };
+		VkComponentSwizzle final_mapping[4] = {};
+
+		for (u8 channel = 0; channel < 4; ++channel)
+		{
+			switch (remap_vector.second[channel])
+			{
+			case CELL_GCM_TEXTURE_REMAP_ONE:
+				final_mapping[channel] = VK_COMPONENT_SWIZZLE_ONE;
+				break;
+			case CELL_GCM_TEXTURE_REMAP_ZERO:
+				final_mapping[channel] = VK_COMPONENT_SWIZZLE_ZERO;
+				break;
+			case CELL_GCM_TEXTURE_REMAP_REMAP:
+				final_mapping[channel] = base_remap[remap_vector.first[channel]];
+				break;
+			default:
+				rsx_log.error("Unknown remap lookup value %d", remap_vector.second[channel]);
+			}
+		}
+
+		return{ final_mapping[1], final_mapping[2], final_mapping[3], final_mapping[0] };
 	}
 
-	void change_image_layout(const vk::command_buffer& cmd, VkImage image, VkImageLayout current_layout, VkImageLayout new_layout, const VkImageSubresourceRange& range,
-		u32 src_queue_family, u32 dst_queue_family, u32 src_access_mask_bits, u32 dst_access_mask_bits)
+	void change_image_layout(VkCommandBuffer cmd, VkImage image, VkImageLayout current_layout, VkImageLayout new_layout, const VkImageSubresourceRange& range,
+		u32 src_queue_family, u32 dst_queue_family)
 	{
 		if (vk::is_renderpass_open(cmd))
 		{
@@ -58,7 +78,7 @@ namespace vk
 		VkPipelineStageFlags src_stage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
 		VkPipelineStageFlags dst_stage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
 
-		switch (+new_layout)
+		switch (new_layout)
 		{
 		case VK_IMAGE_LAYOUT_GENERAL:
 			// Avoid this layout as it is unoptimized
@@ -97,7 +117,6 @@ namespace vk
 			dst_stage = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT;
 			break;
 		case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL:
-		case VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT:
 			barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT;
 			dst_stage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
 			break;
@@ -107,7 +126,7 @@ namespace vk
 			fmt::throw_exception("Attempted to transition to an invalid layout");
 		}
 
-		switch (+current_layout)
+		switch (current_layout)
 		{
 		case VK_IMAGE_LAYOUT_GENERAL:
 			// Avoid this layout as it is unoptimized
@@ -170,7 +189,6 @@ namespace vk
 			src_stage = VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
 			break;
 		case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL:
-		case VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT:
 			barrier.srcAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT;
 			src_stage = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
 			break;
@@ -178,16 +196,10 @@ namespace vk
 			break; //TODO Investigate what happens here
 		}
 
-		barrier.srcAccessMask &= src_access_mask_bits;
-		barrier.dstAccessMask &= dst_access_mask_bits;
-
-		if (!barrier.srcAccessMask) src_stage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
-		if (!barrier.dstAccessMask) dst_stage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
-
 		vkCmdPipelineBarrier(cmd, src_stage, dst_stage, 0, 0, nullptr, 0, nullptr, 1, &barrier);
 	}
 
-	void change_image_layout(const vk::command_buffer& cmd, vk::image* image, VkImageLayout new_layout, const VkImageSubresourceRange& range)
+	void change_image_layout(VkCommandBuffer cmd, vk::image* image, VkImageLayout new_layout, const VkImageSubresourceRange& range)
 	{
 		if (image->current_layout == new_layout) return;
 
@@ -195,7 +207,7 @@ namespace vk
 		image->current_layout = new_layout;
 	}
 
-	void change_image_layout(const vk::command_buffer& cmd, vk::image* image, VkImageLayout new_layout)
+	void change_image_layout(VkCommandBuffer cmd, vk::image* image, VkImageLayout new_layout)
 	{
 		if (image->current_layout == new_layout) return;
 
diff --git a/rpcs3/Emu/RSX/VK/vkutils/image_helpers.h b/rpcs3/Emu/RSX/VK/vkutils/image_helpers.h
index 3e794d59fe..639ed0070a 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/image_helpers.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/image_helpers.h
@@ -1,25 +1,16 @@
 #pragma once
 #include "../VulkanAPI.h"
 
-namespace rsx
-{
-	struct texture_channel_remap_t;
-}
-
 namespace vk
 {
 	class image;
-	class command_buffer;
-
 	extern VkComponentMapping default_component_map;
 
 	VkImageAspectFlags get_aspect_flags(VkFormat format);
-	VkComponentMapping apply_swizzle_remap(const std::array<VkComponentSwizzle, 4>& base_remap, const rsx::texture_channel_remap_t& remap_vector);
+	VkComponentMapping apply_swizzle_remap(const std::array<VkComponentSwizzle, 4>& base_remap, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap_vector);
 
-	void change_image_layout(const vk::command_buffer& cmd, VkImage image, VkImageLayout current_layout, VkImageLayout new_layout, const VkImageSubresourceRange& range,
-		u32 src_queue_family = VK_QUEUE_FAMILY_IGNORED, u32 dst_queue_family = VK_QUEUE_FAMILY_IGNORED,
-		u32 src_access_mask_bits = 0xFFFFFFFF, u32 dst_access_mask_bits = 0xFFFFFFFF);
-
-	void change_image_layout(const vk::command_buffer& cmd, vk::image* image, VkImageLayout new_layout, const VkImageSubresourceRange& range);
-	void change_image_layout(const vk::command_buffer& cmd, vk::image* image, VkImageLayout new_layout);
+	void change_image_layout(VkCommandBuffer cmd, VkImage image, VkImageLayout current_layout, VkImageLayout new_layout, const VkImageSubresourceRange& range,
+		u32 src_queue_family = VK_QUEUE_FAMILY_IGNORED, u32 dst_queue_family = VK_QUEUE_FAMILY_IGNORED);
+	void change_image_layout(VkCommandBuffer cmd, vk::image* image, VkImageLayout new_layout, const VkImageSubresourceRange& range);
+	void change_image_layout(VkCommandBuffer cmd, vk::image* image, VkImageLayout new_layout);
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp b/rpcs3/Emu/RSX/VK/vkutils/instance.cpp
deleted file mode 100644
index fff6691aea..0000000000
--- a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp
+++ /dev/null
@@ -1,363 +0,0 @@
-#include "stdafx.h"
-#include "instance.h"
-
-namespace vk
-{
-	// Supported extensions
-	supported_extensions::supported_extensions(enumeration_class _class, const char* layer_name, VkPhysicalDevice pdev)
-	{
-		u32 count;
-		if (_class == enumeration_class::instance)
-		{
-			if (vkEnumerateInstanceExtensionProperties(layer_name, &count, nullptr) != VK_SUCCESS)
-				return;
-		}
-		else
-		{
-			ensure(pdev);
-			if (vkEnumerateDeviceExtensionProperties(pdev, layer_name, &count, nullptr) != VK_SUCCESS)
-				return;
-		}
-
-		m_vk_exts.resize(count);
-		if (_class == enumeration_class::instance)
-		{
-			vkEnumerateInstanceExtensionProperties(layer_name, &count, m_vk_exts.data());
-		}
-		else
-		{
-			vkEnumerateDeviceExtensionProperties(pdev, layer_name, &count, m_vk_exts.data());
-		}
-	}
-
-	bool supported_extensions::is_supported(std::string_view ext) const
-	{
-		return std::any_of(m_vk_exts.cbegin(), m_vk_exts.cend(), [&](const VkExtensionProperties& p) { return p.extensionName == ext; });
-	}
-
-	// Instance
-	instance::~instance()
-	{
-		if (m_instance)
-		{
-			destroy();
-		}
-	}
-
-	void instance::destroy()
-	{
-		if (!m_instance) return;
-
-		if (m_debugger)
-		{
-			_vkDestroyDebugReportCallback(m_instance, m_debugger, nullptr);
-			m_debugger = nullptr;
-		}
-
-		if (m_surface)
-		{
-			vkDestroySurfaceKHR(m_instance, m_surface, nullptr);
-			m_surface = VK_NULL_HANDLE;
-		}
-
-		vkDestroyInstance(m_instance, nullptr);
-		m_instance = VK_NULL_HANDLE;
-	}
-
-	void instance::enable_debugging()
-	{
-		if (!g_cfg.video.debug_output) return;
-
-		PFN_vkDebugReportCallbackEXT callback = vk::dbgFunc;
-
-		_vkCreateDebugReportCallback = reinterpret_cast<PFN_vkCreateDebugReportCallbackEXT>(vkGetInstanceProcAddr(m_instance, "vkCreateDebugReportCallbackEXT"));
-		_vkDestroyDebugReportCallback = reinterpret_cast<PFN_vkDestroyDebugReportCallbackEXT>(vkGetInstanceProcAddr(m_instance, "vkDestroyDebugReportCallbackEXT"));
-
-		VkDebugReportCallbackCreateInfoEXT dbgCreateInfo = {};
-		dbgCreateInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT;
-		dbgCreateInfo.pfnCallback = callback;
-		dbgCreateInfo.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT;
-
-		CHECK_RESULT(_vkCreateDebugReportCallback(m_instance, &dbgCreateInfo, NULL, &m_debugger));
-	}
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#endif
-	bool instance::create(const char* app_name, bool fast)
-	{
-		// Initialize a vulkan instance
-		VkApplicationInfo app = {};
-
-		app.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
-		app.pApplicationName = app_name;
-		app.applicationVersion = 0;
-		app.pEngineName = app_name;
-		app.engineVersion = 0;
-		app.apiVersion = VK_API_VERSION_1_2;
-
-		// Set up instance information
-
-		std::vector<const char*> extensions;
-		std::vector<const char*> layers;
-		const void* next_info = nullptr;
-
-#ifdef __APPLE__
-		// Declare MVK variables here to ensure the lifetime within the entire scope
-		const VkBool32 setting_true = VK_TRUE;
-		const int32_t setting_fast_math = g_cfg.video.disable_msl_fast_math.get() ? MVK_CONFIG_FAST_MATH_NEVER : MVK_CONFIG_FAST_MATH_ON_DEMAND;
-
-		std::vector<VkLayerSettingEXT> mvk_settings;
-		VkLayerSettingsCreateInfoEXT mvk_layer_settings_create_info{};
-#endif
-
-		if (!fast)
-		{
-			extensions_loaded = true;
-			supported_extensions support(supported_extensions::instance);
-
-			extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
-			if (support.is_supported(VK_EXT_DEBUG_REPORT_EXTENSION_NAME))
-			{
-				extensions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME);
-			}
-
-#ifdef __APPLE__
-			if (support.is_supported(VK_EXT_LAYER_SETTINGS_EXTENSION_NAME))
-			{
-				extensions.push_back(VK_EXT_LAYER_SETTINGS_EXTENSION_NAME);
-				layers.push_back(kMVKMoltenVKDriverLayerName);
-
-				mvk_settings.push_back(VkLayerSettingEXT{ kMVKMoltenVKDriverLayerName, "MVK_CONFIG_RESUME_LOST_DEVICE", VK_LAYER_SETTING_TYPE_BOOL32_EXT, 1, &setting_true });
-				mvk_settings.push_back(VkLayerSettingEXT{ kMVKMoltenVKDriverLayerName, "MVK_CONFIG_FAST_MATH_ENABLED", VK_LAYER_SETTING_TYPE_INT32_EXT, 1, &setting_fast_math });
-
-				mvk_layer_settings_create_info.sType = VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT;
-				mvk_layer_settings_create_info.pNext = next_info;
-				mvk_layer_settings_create_info.settingCount = static_cast<uint32_t>(mvk_settings.size());
-				mvk_layer_settings_create_info.pSettings = mvk_settings.data();
-
-				next_info = &mvk_layer_settings_create_info;
-			}
-#endif
-
-			if (support.is_supported(VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME))
-			{
-				extensions.push_back(VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME);
-			}
-
-			if (g_cfg.video.renderdoc_compatiblity && support.is_supported(VK_EXT_DEBUG_UTILS_EXTENSION_NAME))
-			{
-				extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
-			}
-
-#ifdef _WIN32
-			extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
-#elif defined(__APPLE__)
-			extensions.push_back(VK_MVK_MACOS_SURFACE_EXTENSION_NAME);
-#else
-			bool found_surface_ext = false;
-#ifdef HAVE_X11
-			if (support.is_supported(VK_KHR_XLIB_SURFACE_EXTENSION_NAME))
-			{
-				extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
-				found_surface_ext = true;
-			}
-#endif
-#ifdef HAVE_WAYLAND
-			if (support.is_supported(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME))
-			{
-				extensions.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
-				found_surface_ext = true;
-			}
-#endif //(WAYLAND)
-#ifdef ANDROID
-			if (support.is_supported(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME))
-			{
-				extensions.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME);
-				found_surface_ext = true;
-			}
-#endif
-			if (!found_surface_ext)
-			{
-				rsx_log.error("Could not find a supported Vulkan surface extension");
-				return 0;
-			}
-#endif //(WIN32, __APPLE__)
-			if (g_cfg.video.debug_output)
-				layers.push_back("VK_LAYER_KHRONOS_validation");
-		}
-
-		VkInstanceCreateInfo instance_info = {};
-		instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
-		instance_info.pApplicationInfo = &app;
-		instance_info.enabledLayerCount = static_cast<u32>(layers.size());
-		instance_info.ppEnabledLayerNames = layers.data();
-		instance_info.enabledExtensionCount = fast ? 0 : static_cast<u32>(extensions.size());
-		instance_info.ppEnabledExtensionNames = fast ? nullptr : extensions.data();
-		instance_info.pNext = next_info;
-
-		if (VkResult result = vkCreateInstance(&instance_info, nullptr, &m_instance); result != VK_SUCCESS)
-		{
-			if (result == VK_ERROR_LAYER_NOT_PRESENT)
-			{
-				rsx_log.fatal("Could not initialize layer VK_LAYER_KHRONOS_validation");
-			}
-
-			return false;
-		}
-
-		return true;
-	}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-	void instance::bind()
-	{
-		// Register some global states
-		if (m_debugger)
-		{
-			_vkDestroyDebugReportCallback(m_instance, m_debugger, nullptr);
-			m_debugger = nullptr;
-		}
-
-		enable_debugging();
-	}
-
-	std::vector<physical_device>& instance::enumerate_devices()
-	{
-		u32 num_gpus;
-		// This may fail on unsupported drivers, so just assume no devices
-		if (vkEnumeratePhysicalDevices(m_instance, &num_gpus, nullptr) != VK_SUCCESS)
-			return gpus;
-
-		if (gpus.size() != num_gpus)
-		{
-			std::vector<VkPhysicalDevice> pdevs(num_gpus);
-			gpus.resize(num_gpus);
-
-			CHECK_RESULT(vkEnumeratePhysicalDevices(m_instance, &num_gpus, pdevs.data()));
-
-			for (u32 i = 0; i < num_gpus; ++i)
-				gpus[i].create(m_instance, pdevs[i], extensions_loaded);
-		}
-
-		return gpus;
-	}
-
-	swapchain_base* instance::create_swapchain(display_handle_t window_handle, vk::physical_device& dev)
-	{
-		WSI_config surface_config
-		{
-			.supports_automatic_wm_reports = true
-		};
-		m_surface = make_WSI_surface(m_instance, window_handle, &surface_config);
-
-		u32 device_queues = dev.get_queue_count();
-		std::vector<VkBool32> supports_present(device_queues, VK_FALSE);
-		bool present_possible = true;
-
-		for (u32 index = 0; index < device_queues; index++)
-		{
-			vkGetPhysicalDeviceSurfaceSupportKHR(dev, index, m_surface, &supports_present[index]);
-		}
-
-		u32 graphics_queue_idx = -1;
-		u32 present_queue_idx = -1;
-		u32 transfer_queue_idx = -1;
-
-		auto test_queue_family = [&](u32 index, u32 desired_flags)
-			{
-				if (const auto flags = dev.get_queue_properties(index).queueFlags;
-					(flags & desired_flags) == desired_flags)
-				{
-					return true;
-				}
-
-				return false;
-			};
-
-		for (u32 i = 0; i < device_queues; ++i)
-		{
-			// 1. Test for a present queue possibly one that also supports present
-			if (present_queue_idx == umax && supports_present[i])
-			{
-				present_queue_idx = i;
-				if (test_queue_family(i, VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT))
-				{
-					graphics_queue_idx = i;
-				}
-			}
-			// 2. Check for graphics support
-			else if (graphics_queue_idx == umax && test_queue_family(i, VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT))
-			{
-				graphics_queue_idx = i;
-				if (supports_present[i])
-				{
-					present_queue_idx = i;
-				}
-			}
-			// 3. Check if transfer + compute is available
-			else if (transfer_queue_idx == umax && test_queue_family(i, VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT))
-			{
-				transfer_queue_idx = i;
-			}
-		}
-
-		if (graphics_queue_idx == umax)
-		{
-			rsx_log.fatal("Failed to find a suitable graphics queue");
-			return nullptr;
-		}
-
-		if (graphics_queue_idx != present_queue_idx)
-		{
-			// Separate graphics and present, use headless fallback
-			present_possible = false;
-		}
-
-		if (!present_possible)
-		{
-			//Native(sw) swapchain
-			rsx_log.error("It is not possible for the currently selected GPU to present to the window (Likely caused by NVIDIA driver running the current display)");
-			rsx_log.warning("Falling back to software present support (native windowing API)");
-			auto swapchain = new swapchain_NATIVE(dev, -1, graphics_queue_idx, transfer_queue_idx);
-			swapchain->create(window_handle);
-			return swapchain;
-		}
-
-		// Get the list of VkFormat's that are supported:
-		u32 formatCount;
-		CHECK_RESULT(vkGetPhysicalDeviceSurfaceFormatsKHR(dev, m_surface, &formatCount, nullptr));
-
-		std::vector<VkSurfaceFormatKHR> surfFormats(formatCount);
-		CHECK_RESULT(vkGetPhysicalDeviceSurfaceFormatsKHR(dev, m_surface, &formatCount, surfFormats.data()));
-
-		VkFormat format;
-		VkColorSpaceKHR color_space;
-
-		if (formatCount == 1 && surfFormats[0].format == VK_FORMAT_UNDEFINED)
-		{
-			format = VK_FORMAT_B8G8R8A8_UNORM;
-		}
-		else
-		{
-			if (!formatCount) fmt::throw_exception("Format count is zero!");
-			format = surfFormats[0].format;
-
-			//Prefer BGRA8_UNORM to avoid sRGB compression (RADV)
-			for (auto& surface_format : surfFormats)
-			{
-				if (surface_format.format == VK_FORMAT_B8G8R8A8_UNORM)
-				{
-					format = VK_FORMAT_B8G8R8A8_UNORM;
-					break;
-				}
-			}
-		}
-
-		color_space = surfFormats[0].colorSpace;
-
-		return new swapchain_WSI(dev, present_queue_idx, graphics_queue_idx, transfer_queue_idx, format, m_surface, color_space, !surface_config.supports_automatic_wm_reports);
-	}
-}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.h b/rpcs3/Emu/RSX/VK/vkutils/instance.h
deleted file mode 100644
index b4b87b1a76..0000000000
--- a/rpcs3/Emu/RSX/VK/vkutils/instance.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#pragma once
-
-#include "../VulkanAPI.h"
-#include "swapchain.h"
-
-#include <algorithm>
-#include <vector>
-
-#ifdef __APPLE__
-#include <MoltenVK/mvk_vulkan.h>
-#include <MoltenVK/mvk_private_api.h>
-#endif
-
-namespace vk
-{
-	class supported_extensions
-	{
-	private:
-		std::vector<VkExtensionProperties> m_vk_exts;
-
-	public:
-		enum enumeration_class
-		{
-			instance = 0,
-			device   = 1
-		};
-
-		supported_extensions(enumeration_class _class, const char* layer_name = nullptr, VkPhysicalDevice pdev = VK_NULL_HANDLE);
-
-		bool is_supported(std::string_view ext) const;
-	};
-
-	class instance
-	{
-	private:
-		std::vector<physical_device> gpus;
-		VkInstance m_instance = VK_NULL_HANDLE;
-		VkSurfaceKHR m_surface = VK_NULL_HANDLE;
-
-		PFN_vkDestroyDebugReportCallbackEXT _vkDestroyDebugReportCallback = nullptr;
-		PFN_vkCreateDebugReportCallbackEXT _vkCreateDebugReportCallback = nullptr;
-		VkDebugReportCallbackEXT m_debugger = nullptr;
-
-		bool extensions_loaded = false;
-
-	public:
-
-		instance() = default;
-
-		~instance();
-
-		void destroy();
-
-		void enable_debugging();
-
-		bool create(const char* app_name, bool fast = false);
-
-		void bind();
-
-		std::vector<physical_device>& enumerate_devices();
-
-		swapchain_base* create_swapchain(display_handle_t window_handle, vk::physical_device& dev);
-	};
-}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.hpp b/rpcs3/Emu/RSX/VK/vkutils/instance.hpp
new file mode 100644
index 0000000000..4bf3ecdcef
--- /dev/null
+++ b/rpcs3/Emu/RSX/VK/vkutils/instance.hpp
@@ -0,0 +1,423 @@
+#pragma once
+
+#include "../VulkanAPI.h"
+#include "swapchain.hpp"
+
+#include <algorithm>
+#include <vector>
+
+namespace vk
+{
+	class supported_extensions
+	{
+	private:
+		std::vector<VkExtensionProperties> m_vk_exts;
+
+	public:
+		enum enumeration_class
+		{
+			instance = 0,
+			device   = 1
+		};
+
+		supported_extensions(enumeration_class _class, const char* layer_name = nullptr, VkPhysicalDevice pdev = VK_NULL_HANDLE)
+		{
+			u32 count;
+			if (_class == enumeration_class::instance)
+			{
+				if (vkEnumerateInstanceExtensionProperties(layer_name, &count, nullptr) != VK_SUCCESS)
+					return;
+			}
+			else
+			{
+				ensure(pdev);
+				if (vkEnumerateDeviceExtensionProperties(pdev, layer_name, &count, nullptr) != VK_SUCCESS)
+					return;
+			}
+
+			m_vk_exts.resize(count);
+			if (_class == enumeration_class::instance)
+			{
+				vkEnumerateInstanceExtensionProperties(layer_name, &count, m_vk_exts.data());
+			}
+			else
+			{
+				vkEnumerateDeviceExtensionProperties(pdev, layer_name, &count, m_vk_exts.data());
+			}
+		}
+
+		bool is_supported(const char* ext)
+		{
+			return std::any_of(m_vk_exts.cbegin(), m_vk_exts.cend(), [&](const VkExtensionProperties& p) { return std::strcmp(p.extensionName, ext) == 0; });
+		}
+	};
+
+	class instance
+	{
+	private:
+		std::vector<physical_device> gpus;
+		VkInstance m_instance = VK_NULL_HANDLE;
+		VkSurfaceKHR m_surface = VK_NULL_HANDLE;
+
+		PFN_vkDestroyDebugReportCallbackEXT _vkDestroyDebugReportCallback = nullptr;
+		PFN_vkCreateDebugReportCallbackEXT _vkCreateDebugReportCallback = nullptr;
+		VkDebugReportCallbackEXT m_debugger = nullptr;
+
+		bool extensions_loaded = false;
+
+	public:
+
+		instance() = default;
+
+		~instance()
+		{
+			if (m_instance)
+			{
+				destroy();
+			}
+		}
+
+		void destroy()
+		{
+			if (!m_instance) return;
+
+			if (m_debugger)
+			{
+				_vkDestroyDebugReportCallback(m_instance, m_debugger, nullptr);
+				m_debugger = nullptr;
+			}
+
+			if (m_surface)
+			{
+				vkDestroySurfaceKHR(m_instance, m_surface, nullptr);
+				m_surface = VK_NULL_HANDLE;
+			}
+
+			vkDestroyInstance(m_instance, nullptr);
+			m_instance = VK_NULL_HANDLE;
+		}
+
+		void enable_debugging()
+		{
+			if (!g_cfg.video.debug_output) return;
+
+			PFN_vkDebugReportCallbackEXT callback = vk::dbgFunc;
+
+			_vkCreateDebugReportCallback = reinterpret_cast<PFN_vkCreateDebugReportCallbackEXT>(vkGetInstanceProcAddr(m_instance, "vkCreateDebugReportCallbackEXT"));
+			_vkDestroyDebugReportCallback = reinterpret_cast<PFN_vkDestroyDebugReportCallbackEXT>(vkGetInstanceProcAddr(m_instance, "vkDestroyDebugReportCallbackEXT"));
+
+			VkDebugReportCallbackCreateInfoEXT dbgCreateInfo = {};
+			dbgCreateInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT;
+			dbgCreateInfo.pfnCallback = callback;
+			dbgCreateInfo.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT;
+
+			CHECK_RESULT(_vkCreateDebugReportCallback(m_instance, &dbgCreateInfo, NULL, &m_debugger));
+		}
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif
+		bool create(const char* app_name, bool fast = false)
+		{
+			// Initialize a vulkan instance
+			VkApplicationInfo app = {};
+
+			app.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
+			app.pApplicationName = app_name;
+			app.applicationVersion = 0;
+			app.pEngineName = app_name;
+			app.engineVersion = 0;
+			app.apiVersion = VK_API_VERSION_1_0;
+
+			// Set up instance information
+
+			std::vector<const char*> extensions;
+			std::vector<const char*> layers;
+
+			if (!fast)
+			{
+				extensions_loaded = true;
+				supported_extensions support(supported_extensions::instance);
+
+				extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
+				if (support.is_supported(VK_EXT_DEBUG_REPORT_EXTENSION_NAME))
+				{
+					extensions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME);
+				}
+
+				if (support.is_supported(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME))
+				{
+					extensions.push_back(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
+				}
+
+				if (support.is_supported(VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME))
+				{
+					extensions.push_back(VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME);
+				}
+
+				if (support.is_supported(VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME))
+				{
+					extensions.push_back(VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME);
+				}
+
+				if (g_cfg.video.renderdoc_compatiblity && support.is_supported(VK_EXT_DEBUG_UTILS_EXTENSION_NAME))
+				{
+					extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
+				}
+
+#ifdef _WIN32
+				extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
+#elif defined(__APPLE__)
+				extensions.push_back(VK_MVK_MACOS_SURFACE_EXTENSION_NAME);
+#else
+				bool found_surface_ext = false;
+#ifdef HAVE_X11
+				if (support.is_supported(VK_KHR_XLIB_SURFACE_EXTENSION_NAME))
+				{
+					extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
+					found_surface_ext = true;
+				}
+#endif
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+				if (support.is_supported(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME))
+				{
+					extensions.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
+					found_surface_ext = true;
+				}
+#endif //(WAYLAND)
+				if (!found_surface_ext)
+				{
+					rsx_log.error("Could not find a supported Vulkan surface extension");
+					return 0;
+				}
+#endif //(WIN32, __APPLE__)
+				if (g_cfg.video.debug_output)
+					layers.push_back("VK_LAYER_KHRONOS_validation");
+			}
+
+			VkInstanceCreateInfo instance_info = {};
+			instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
+			instance_info.pApplicationInfo = &app;
+			instance_info.enabledLayerCount = static_cast<u32>(layers.size());
+			instance_info.ppEnabledLayerNames = layers.data();
+			instance_info.enabledExtensionCount = fast ? 0 : static_cast<u32>(extensions.size());
+			instance_info.ppEnabledExtensionNames = fast ? nullptr : extensions.data();
+
+			if (VkResult result = vkCreateInstance(&instance_info, nullptr, &m_instance); result != VK_SUCCESS)
+			{
+				if (result == VK_ERROR_LAYER_NOT_PRESENT)
+				{
+					rsx_log.fatal("Could not initialize layer VK_LAYER_KHRONOS_validation");
+				}
+
+				return false;
+			}
+
+			return true;
+		}
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+		void bind()
+		{
+			// Register some global states
+			if (m_debugger)
+			{
+				_vkDestroyDebugReportCallback(m_instance, m_debugger, nullptr);
+				m_debugger = nullptr;
+			}
+
+			enable_debugging();
+		}
+
+		std::vector<physical_device>& enumerate_devices()
+		{
+			u32 num_gpus;
+			// This may fail on unsupported drivers, so just assume no devices
+			if (vkEnumeratePhysicalDevices(m_instance, &num_gpus, nullptr) != VK_SUCCESS)
+				return gpus;
+
+			if (gpus.size() != num_gpus)
+			{
+				std::vector<VkPhysicalDevice> pdevs(num_gpus);
+				gpus.resize(num_gpus);
+
+				CHECK_RESULT(vkEnumeratePhysicalDevices(m_instance, &num_gpus, pdevs.data()));
+
+				for (u32 i = 0; i < num_gpus; ++i)
+					gpus[i].create(m_instance, pdevs[i], extensions_loaded);
+			}
+
+			return gpus;
+		}
+
+		swapchain_base* create_swapchain(display_handle_t window_handle, vk::physical_device& dev)
+		{
+			bool force_wm_reporting_off = false;
+#ifdef _WIN32
+			using swapchain_NATIVE = swapchain_WIN32;
+			HINSTANCE hInstance = NULL;
+
+			VkWin32SurfaceCreateInfoKHR createInfo = {};
+			createInfo.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR;
+			createInfo.hinstance = hInstance;
+			createInfo.hwnd = window_handle;
+
+			CHECK_RESULT(vkCreateWin32SurfaceKHR(m_instance, &createInfo, NULL, &m_surface));
+
+#elif defined(__APPLE__)
+			using swapchain_NATIVE = swapchain_MacOS;
+			VkMacOSSurfaceCreateInfoMVK createInfo = {};
+			createInfo.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK;
+			createInfo.pView = window_handle;
+
+			CHECK_RESULT(vkCreateMacOSSurfaceMVK(m_instance, &createInfo, NULL, &m_surface));
+#else
+#ifdef HAVE_X11
+			using swapchain_NATIVE = swapchain_X11;
+#else
+			using swapchain_NATIVE = swapchain_Wayland;
+#endif
+
+			std::visit([&](auto&& p)
+			{
+				using T = std::decay_t<decltype(p)>;
+
+#ifdef HAVE_X11
+				if constexpr (std::is_same_v<T, std::pair<Display*, Window>>)
+				{
+					VkXlibSurfaceCreateInfoKHR createInfo = {};
+					createInfo.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
+					createInfo.dpy = p.first;
+					createInfo.window = p.second;
+					CHECK_RESULT(vkCreateXlibSurfaceKHR(this->m_instance, &createInfo, nullptr, &m_surface));
+				}
+				else
+#endif
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+					if constexpr (std::is_same_v<T, std::pair<wl_display*, wl_surface*>>)
+					{
+						VkWaylandSurfaceCreateInfoKHR createInfo = {};
+						createInfo.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR;
+						createInfo.display = p.first;
+						createInfo.surface = p.second;
+						CHECK_RESULT(vkCreateWaylandSurfaceKHR(this->m_instance, &createInfo, nullptr, &m_surface));
+						force_wm_reporting_off = true;
+					}
+					else
+#endif
+					{
+						static_assert(std::conditional_t<true, std::false_type, T>::value, "Unhandled window_handle type in std::variant");
+					}
+			}, window_handle);
+#endif
+
+			u32 device_queues = dev.get_queue_count();
+			std::vector<VkBool32> supports_present(device_queues, VK_FALSE);
+			bool present_possible = true;
+
+			for (u32 index = 0; index < device_queues; index++)
+			{
+				vkGetPhysicalDeviceSurfaceSupportKHR(dev, index, m_surface, &supports_present[index]);
+			}
+
+			u32 graphics_queue_idx = -1;
+			u32 present_queue_idx = -1;
+			u32 transfer_queue_idx = -1;
+
+			auto test_queue_family = [&](u32 index, u32 desired_flags)
+			{
+				if (const auto flags = dev.get_queue_properties(index).queueFlags;
+					(flags & desired_flags) == desired_flags)
+				{
+					return true;
+				}
+
+				return false;
+			};
+
+			for (u32 i = 0; i < device_queues; ++i)
+			{
+				// 1. Test for a present queue possibly one that also supports present
+				if (present_queue_idx == umax && supports_present[i])
+				{
+					present_queue_idx = i;
+					if (test_queue_family(i, VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT))
+					{
+						graphics_queue_idx = i;
+					}
+				}
+				// 2. Check for graphics support
+				else if (graphics_queue_idx == umax && test_queue_family(i, VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT))
+				{
+					graphics_queue_idx = i;
+					if (supports_present[i])
+					{
+						present_queue_idx = i;
+					}
+				}
+				// 3. Check if transfer + compute is available
+				else if (transfer_queue_idx == umax && test_queue_family(i, VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT))
+				{
+					transfer_queue_idx = i;
+				}
+			}
+
+			if (graphics_queue_idx == umax)
+			{
+				rsx_log.fatal("Failed to find a suitable graphics queue");
+				return nullptr;
+			}
+
+			if (graphics_queue_idx != present_queue_idx)
+			{
+				// Separate graphics and present, use headless fallback
+				present_possible = false;
+			}
+
+			if (!present_possible)
+			{
+				//Native(sw) swapchain
+				rsx_log.error("It is not possible for the currently selected GPU to present to the window (Likely caused by NVIDIA driver running the current display)");
+				rsx_log.warning("Falling back to software present support (native windowing API)");
+				auto swapchain = new swapchain_NATIVE(dev, -1, graphics_queue_idx, transfer_queue_idx);
+				swapchain->create(window_handle);
+				return swapchain;
+			}
+
+			// Get the list of VkFormat's that are supported:
+			u32 formatCount;
+			CHECK_RESULT(vkGetPhysicalDeviceSurfaceFormatsKHR(dev, m_surface, &formatCount, nullptr));
+
+			std::vector<VkSurfaceFormatKHR> surfFormats(formatCount);
+			CHECK_RESULT(vkGetPhysicalDeviceSurfaceFormatsKHR(dev, m_surface, &formatCount, surfFormats.data()));
+
+			VkFormat format;
+			VkColorSpaceKHR color_space;
+
+			if (formatCount == 1 && surfFormats[0].format == VK_FORMAT_UNDEFINED)
+			{
+				format = VK_FORMAT_B8G8R8A8_UNORM;
+			}
+			else
+			{
+				if (!formatCount) fmt::throw_exception("Format count is zero!");
+				format = surfFormats[0].format;
+
+				//Prefer BGRA8_UNORM to avoid sRGB compression (RADV)
+				for (auto& surface_format : surfFormats)
+				{
+					if (surface_format.format == VK_FORMAT_B8G8R8A8_UNORM)
+					{
+						format = VK_FORMAT_B8G8R8A8_UNORM;
+						break;
+					}
+				}
+			}
+
+			color_space = surfFormats[0].colorSpace;
+
+			return new swapchain_WSI(dev, present_queue_idx, graphics_queue_idx, transfer_queue_idx, format, m_surface, color_space, force_wm_reporting_off);
+		}
+	};
+}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/mem_allocator.h b/rpcs3/Emu/RSX/VK/vkutils/mem_allocator.h
new file mode 100644
index 0000000000..67e2d14af8
--- /dev/null
+++ b/rpcs3/Emu/RSX/VK/vkutils/mem_allocator.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "../VulkanAPI.h"
+#include "../../rsx_utils.h"
+#include "shared.h"
+
+#include "3rdparty/GPUOpen/include/vk_mem_alloc.h"
+
+namespace vk
+{
+	// Memory Allocator - base class
+
+
+}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/memory.cpp b/rpcs3/Emu/RSX/VK/vkutils/memory.cpp
index ac7010f057..f0b0896dea 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/memory.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/memory.cpp
@@ -135,7 +135,10 @@ namespace vk
 		}
 
 		ensure(free_memory_map.size() == num_types);
-		std::sort(free_memory_map.begin(), free_memory_map.end(), FN(x.second > y.second));
+		std::sort(free_memory_map.begin(), free_memory_map.end(), [](const auto& a, const auto& b)
+		{
+			return a.second > b.second;
+		});
 
 		std::vector<u32> new_type_ids(num_types);
 		std::vector<u64> new_type_sizes(num_types);
@@ -153,12 +156,7 @@ namespace vk
 		rsx_log.warning("Rebalanced memory types successfully");
 	}
 
-	mem_allocator_base::mem_allocator_base(const vk::render_device& dev, VkPhysicalDevice /*pdev*/)
-		: m_device(dev), m_allocation_flags(0)
-	{}
-
-	mem_allocator_vma::mem_allocator_vma(const vk::render_device& dev, VkPhysicalDevice pdev, VkInstance inst)
-		: mem_allocator_base(dev, pdev)
+	mem_allocator_vma::mem_allocator_vma(VkDevice dev, VkPhysicalDevice pdev) : mem_allocator_base(dev, pdev)
 	{
 		// Initialize stats pool
 		std::fill(stats.begin(), stats.end(), VmaBudget{});
@@ -166,25 +164,6 @@ namespace vk
 		VmaAllocatorCreateInfo allocatorInfo = {};
 		allocatorInfo.physicalDevice = pdev;
 		allocatorInfo.device = dev;
-		allocatorInfo.instance = inst;
-		allocatorInfo.vulkanApiVersion = VK_API_VERSION_1_2;
-
-		std::vector<VkDeviceSize> heap_limits;
-		const auto vram_allocation_limit = g_cfg.video.vk.vram_allocation_limit * 0x100000ull;
-		if (vram_allocation_limit < dev.get_memory_mapping().device_local_total_bytes)
-		{
-			VkPhysicalDeviceMemoryProperties memory_properties;
-			vkGetPhysicalDeviceMemoryProperties(pdev, &memory_properties);
-			for (u32 i = 0; i < memory_properties.memoryHeapCount; ++i)
-			{
-				const u64 max_sz = (memory_properties.memoryHeaps[i].flags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)
-					? vram_allocation_limit
-					: VK_WHOLE_SIZE;
-
-				heap_limits.push_back(max_sz);
-			}
-			allocatorInfo.pHeapSizeLimit = heap_limits.data();
-		}
 
 		CHECK_RESULT(vmaCreateAllocator(&allocatorInfo, &m_allocator));
 
@@ -301,7 +280,7 @@ namespace vk
 
 	f32 mem_allocator_vma::get_memory_usage()
 	{
-		vmaGetHeapBudgets(m_allocator, stats.data());
+		vmaGetBudget(m_allocator, stats.data());
 
 		float max_usage = 0.f;
 		for (const auto& info : stats)
diff --git a/rpcs3/Emu/RSX/VK/vkutils/memory.h b/rpcs3/Emu/RSX/VK/vkutils/memory.h
index d2b894cfa2..427763180f 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/memory.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/memory.h
@@ -4,15 +4,7 @@
 #include "../../rsx_utils.h"
 #include "shared.h"
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnullability-completeness"
-#endif
-#define VMA_VULKAN_VERSION 1002000
-#include "3rdparty/GPUOpen/VulkanMemoryAllocator/include/vk_mem_alloc.h"
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+#include "3rdparty/GPUOpen/include/vk_mem_alloc.h"
 
 namespace vk
 {
@@ -26,7 +18,6 @@ namespace vk
 			VMM_ALLOCATION_POOL_TEXTURE_CACHE,
 			VMM_ALLOCATION_POOL_SWAPCHAIN,
 			VMM_ALLOCATION_POOL_SCRATCH,
-			VMM_ALLOCATION_POOL_SAMPLER,
 		};
 	}
 
@@ -63,7 +54,7 @@ namespace vk
 	public:
 		using mem_handle_t = void*;
 
-		mem_allocator_base(const vk::render_device& dev, VkPhysicalDevice pdev);
+		mem_allocator_base(VkDevice dev, VkPhysicalDevice /*pdev*/) : m_device(dev), m_allocation_flags(0) {}
 		virtual ~mem_allocator_base() = default;
 
 		virtual void destroy() = 0;
@@ -91,7 +82,7 @@ namespace vk
 	class mem_allocator_vma : public mem_allocator_base
 	{
 	public:
-		mem_allocator_vma(const vk::render_device& dev, VkPhysicalDevice pdev, VkInstance inst);
+		mem_allocator_vma(VkDevice dev, VkPhysicalDevice pdev);
 		~mem_allocator_vma() override = default;
 
 		void destroy() override;
@@ -120,7 +111,7 @@ namespace vk
 	class mem_allocator_vk : public mem_allocator_base
 	{
 	public:
-		mem_allocator_vk(const vk::render_device& dev, VkPhysicalDevice pdev) : mem_allocator_base(dev, pdev) {}
+		mem_allocator_vk(VkDevice dev, VkPhysicalDevice pdev) : mem_allocator_base(dev, pdev) {}
 		~mem_allocator_vk() override = default;
 
 		void destroy() override {}
@@ -182,7 +173,6 @@ namespace vk
 		void* m_host_pointer;
 	};
 
-	// Tracking for memory usage. Constrained largely by amount of VRAM + shared video memory.
 	void vmm_notify_memory_allocated(void* handle, u32 memory_type, u64 memory_size, vmm_allocation_pool pool);
 	void vmm_notify_memory_freed(void* handle);
 	void vmm_reset();
@@ -192,9 +182,5 @@ namespace vk
 	bool vmm_handle_memory_pressure(rsx::problem_severity severity);
 	rsx::problem_severity vmm_determine_memory_load_severity();
 
-	// Tracking for host memory objects. Allocated count is more important than actual memory amount.
-	void vmm_notify_object_allocated(vmm_allocation_pool pool);
-	void vmm_notify_object_freed(vmm_allocation_pool pool);
-
 	mem_allocator_base* get_current_mem_allocator();
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/pipeline_binding_table.h b/rpcs3/Emu/RSX/VK/vkutils/pipeline_binding_table.h
index fdf0ddd2b0..e2682a503e 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/pipeline_binding_table.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/pipeline_binding_table.h
@@ -14,10 +14,8 @@ namespace vk
 		u8 vertex_buffers_first_bind_slot      = 5;
 		u8 conditional_render_predicate_slot   = 8;
 		u8 rasterizer_env_bind_slot            = 9;
-		u8 instancing_lookup_table_bind_slot   = 10;
-		u8 instancing_constants_buffer_slot    = 11;
-		u8 textures_first_bind_slot            = 12;
-		u8 vertex_textures_first_bind_slot     = 12;                              // Invalid, has to be initialized properly
+		u8 textures_first_bind_slot            = 10;
+		u8 vertex_textures_first_bind_slot     = 10;                              // Invalid, has to be initialized properly
 		u8 total_descriptor_bindings           = vertex_textures_first_bind_slot; // Invalid, has to be initialized properly
 	};
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/query_pool.hpp b/rpcs3/Emu/RSX/VK/vkutils/query_pool.hpp
index 0e480c2d0a..90d4df9057 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/query_pool.hpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/query_pool.hpp
@@ -2,7 +2,6 @@
 
 #include "../VulkanAPI.h"
 #include "../../rsx_utils.h"
-#include "shared.h"
 
 namespace vk
 {
@@ -10,19 +9,17 @@ namespace vk
 	{
 		VkQueryPool m_query_pool;
 		VkDevice m_device;
-		u32 m_size;
 
 	public:
 		query_pool(VkDevice dev, VkQueryType type, u32 size)
 			: m_query_pool(VK_NULL_HANDLE)
 			, m_device(dev)
-			, m_size(size)
 		{
 			VkQueryPoolCreateInfo info{};
 			info.sType      = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO;
 			info.queryType  = type;
 			info.queryCount = size;
-			CHECK_RESULT(vkCreateQueryPool(dev, &info, nullptr, &m_query_pool));
+			vkCreateQueryPool(dev, &info, nullptr, &m_query_pool);
 
 			// Take 'size' references on this object
 			ref_count.release(static_cast<s32>(size));
@@ -37,10 +34,5 @@ namespace vk
 		{
 			return m_query_pool;
 		}
-
-		inline u32 size() const
-		{
-			return m_size;
-		}
 	};
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp b/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp
index 073fc514d0..9a7f6ddb93 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp
@@ -1,77 +1,19 @@
-#include "memory.h"
 #include "sampler.h"
-#include "../../color_utils.h"
 #include "../../rsx_utils.h"
 
 namespace vk
 {
-	extern VkBorderColor get_border_color(u32);
-
-	static VkBorderColor get_closest_border_color_enum(const color4f& color4)
-	{
-		if ((color4.r + color4.g + color4.b) > 1.35f)
-		{
-			//If color elements are brighter than roughly 0.5 average, use white border
-			return VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE;
-		}
-
-		if (color4.a > 0.5f)
-			return VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK;
-
-		return VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK;
-	}
-
-	border_color_t::border_color_t(const color4f& color, VkFormat fmt, VkImageAspectFlags aspect)
-		: storage_key(0), format(fmt), aspect(aspect), color_value(color)
-	{
-		const auto encoded_color = rsx::encode_color_to_storage_key(color);
-		value = vk::get_border_color(encoded_color);
-
-		if (value != VK_BORDER_COLOR_FLOAT_CUSTOM_EXT)
-		{
-			// Nothing to do
-			return;
-		}
-
-		if (!g_render_device->get_custom_border_color_support())
-		{
-			value = get_closest_border_color_enum(color_value);
-			return;
-		}
-
-		if (aspect == VK_IMAGE_ASPECT_STENCIL_BIT)
-		{
-			// We must use INT color format for stencil
-			value = VK_BORDER_COLOR_INT_CUSTOM_EXT;
-			auto int_color = static_cast<s32>(color_value.z * 255.f);
-			color_value = color4f(std::bit_cast<f32>(int_color));
-		}
-
-		ensure(aspect <= VK_IMAGE_ASPECT_METADATA_BIT);
-		storage_key = static_cast<u64>(encoded_color)
-			| (static_cast<u64>(aspect) << 32)
-			| (static_cast<u64>(fmt) << 34);
-	}
-
-	border_color_t::border_color_t(VkBorderColor value)
-		: storage_key(0)
-		, value(value)
-		, format(VK_FORMAT_UNDEFINED)
-		, aspect(VK_IMAGE_ASPECT_COLOR_BIT)
-		, color_value(0.f)
-	{}
-
 	sampler::sampler(const vk::render_device& dev, VkSamplerAddressMode clamp_u, VkSamplerAddressMode clamp_v, VkSamplerAddressMode clamp_w,
 		VkBool32 unnormalized_coordinates, float mipLodBias, float max_anisotropy, float min_lod, float max_lod,
-		VkFilter min_filter, VkFilter mag_filter, VkSamplerMipmapMode mipmap_mode, const vk::border_color_t& border_color,
+		VkFilter min_filter, VkFilter mag_filter, VkSamplerMipmapMode mipmap_mode, VkBorderColor border_color,
 		VkBool32 depth_compare, VkCompareOp depth_compare_mode)
-		: m_device(dev), m_border_color(border_color)
+		: m_device(dev)
 	{
 		info.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
 		info.addressModeU = clamp_u;
 		info.addressModeV = clamp_v;
 		info.addressModeW = clamp_w;
-		info.anisotropyEnable = max_anisotropy >= 2. && dev.get_anisotropic_filtering_support();
+		info.anisotropyEnable = dev.get_anisotropic_filtering_support();
 		info.compareEnable = depth_compare;
 		info.unnormalizedCoordinates = unnormalized_coordinates;
 		info.mipLodBias = mipLodBias;
@@ -82,34 +24,19 @@ namespace vk
 		info.minFilter = min_filter;
 		info.mipmapMode = mipmap_mode;
 		info.compareOp = depth_compare_mode;
-		info.borderColor = border_color.value;
-
-		VkSamplerCustomBorderColorCreateInfoEXT custom_color_info;
-		if (border_color.value >= VK_BORDER_COLOR_FLOAT_CUSTOM_EXT)
-		{
-			custom_color_info =
-			{
-				.sType = VK_STRUCTURE_TYPE_SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT,
-				.format = border_color.format
-			};
-
-			std::memcpy(custom_color_info.customBorderColor.float32, border_color.color_value.rgba, sizeof(float) * 4);
-			info.pNext = &custom_color_info;
-		}
+		info.borderColor = border_color;
 
 		CHECK_RESULT(vkCreateSampler(m_device, &info, nullptr, &value));
-		vmm_notify_object_allocated(VMM_ALLOCATION_POOL_SAMPLER);
 	}
 
 	sampler::~sampler()
 	{
 		vkDestroySampler(m_device, value, nullptr);
-		vmm_notify_object_freed(VMM_ALLOCATION_POOL_SAMPLER);
 	}
 
 	bool sampler::matches(VkSamplerAddressMode clamp_u, VkSamplerAddressMode clamp_v, VkSamplerAddressMode clamp_w,
 		VkBool32 unnormalized_coordinates, float mipLodBias, float max_anisotropy, float min_lod, float max_lod,
-		VkFilter min_filter, VkFilter mag_filter, VkSamplerMipmapMode mipmap_mode, const vk::border_color_t& border_color,
+		VkFilter min_filter, VkFilter mag_filter, VkSamplerMipmapMode mipmap_mode, VkBorderColor border_color,
 		VkBool32 depth_compare, VkCompareOp depth_compare_mode)
 	{
 		if (info.magFilter != mag_filter || info.minFilter != min_filter || info.mipmapMode != mipmap_mode ||
@@ -117,119 +44,9 @@ namespace vk
 		    info.compareEnable != depth_compare || info.unnormalizedCoordinates != unnormalized_coordinates ||
 		    !rsx::fcmp(info.maxLod, max_lod) || !rsx::fcmp(info.mipLodBias, mipLodBias) || !rsx::fcmp(info.minLod, min_lod) ||
 		    !rsx::fcmp(info.maxAnisotropy, max_anisotropy) ||
-		    info.compareOp != depth_compare_mode || m_border_color != border_color)
+		    info.compareOp != depth_compare_mode || info.borderColor != border_color)
 			return false;
 
 		return true;
 	}
-
-	sampler_pool_key_t sampler_pool_t::compute_storage_key(
-		VkSamplerAddressMode clamp_u, VkSamplerAddressMode clamp_v, VkSamplerAddressMode clamp_w,
-		VkBool32 unnormalized_coordinates, float mipLodBias, float max_anisotropy, float min_lod, float max_lod,
-		VkFilter min_filter, VkFilter mag_filter, VkSamplerMipmapMode mipmap_mode, const vk::border_color_t& border_color,
-		VkBool32 depth_compare, VkCompareOp depth_compare_mode)
-	{
-		sampler_pool_key_t key{};
-
-		bool use_border_encoding = false;
-		if (border_color.value > VK_BORDER_COLOR_INT_OPAQUE_WHITE)
-		{
-			// If there is no clamp to border in use, we can ignore the border color entirely
-			if (clamp_u == VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER ||
-				clamp_v == VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER ||
-				clamp_w == VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER)
-			{
-				use_border_encoding = true;
-			}
-		}
-
-		key.base_key = u16(clamp_u) | u64(clamp_v) << 3 | u64(clamp_w) << 6;
-		key.base_key |= u64(unnormalized_coordinates) << 9;            // 1 bit
-		key.base_key |= u64(min_filter) << 10 | u64(mag_filter) << 11; // 1 bit each
-		key.base_key |= u64(mipmap_mode) << 12;   // 1 bit
-
-		if (!use_border_encoding)
-		{
-			// Bits 13-16 are reserved for border color encoding
-			key.base_key |= u64(border_color.value) << 13;
-		}
-		else
-		{
-			key.border_color_key = border_color.storage_key;
-		}
-
-		key.base_key |= u64(depth_compare) << 16; // 1 bit
-		key.base_key |= u64(depth_compare_mode) << 17;  // 3 bits
-		key.base_key |= u64(rsx::encode_fx12(min_lod)) << 20; // 12 bits
-		key.base_key |= u64(rsx::encode_fx12(max_lod)) << 32; // 12 bits
-		key.base_key |= u64(rsx::encode_fx12<true>(mipLodBias)) << 44; // 13 bits (fx12 + sign)
-		key.base_key |= u64(max_anisotropy) << 57;                     // 4 bits
-
-		return key;
-	}
-
-	void sampler_pool_t::clear()
-	{
-		m_generic_sampler_pool.clear();
-		m_custom_color_sampler_pool.clear();
-	}
-
-	cached_sampler_object_t* sampler_pool_t::find(const sampler_pool_key_t& key) const
-	{
-		if (!key.border_color_key) [[ likely ]]
-		{
-			const auto found = m_generic_sampler_pool.find(key.base_key);
-			return found == m_generic_sampler_pool.end() ? nullptr : found->second.get();
-		}
-
-		const auto block = m_custom_color_sampler_pool.equal_range(key.base_key);
-		for (auto it = block.first; it != block.second; ++it)
-		{
-			if (it->second->key.border_color_key == key.border_color_key)
-			{
-				return it->second.get();
-			}
-		}
-
-		return nullptr;
-	}
-
-	cached_sampler_object_t* sampler_pool_t::emplace(const sampler_pool_key_t& key, std::unique_ptr<cached_sampler_object_t>& object)
-	{
-		object->key = key;
-
-		if (!key.border_color_key) [[ likely ]]
-		{
-			const auto [iterator, _unused] = m_generic_sampler_pool.emplace(key.base_key, std::move(object));
-			return iterator->second.get();
-		}
-
-		const auto [iterator, _unused] = m_custom_color_sampler_pool.emplace(key.base_key, std::move(object));
-		return iterator->second.get();
-	}
-
-	std::vector<std::unique_ptr<cached_sampler_object_t>> sampler_pool_t::collect(std::function<bool(const cached_sampler_object_t&)> predicate)
-	{
-		std::vector<std::unique_ptr<cached_sampler_object_t>> result;
-
-		const auto collect_fn = [&](auto& container)
-		{
-			for (auto it = container.begin(); it != container.end();)
-			{
-				if (!predicate(*it->second))
-				{
-					it++;
-					continue;
-				}
-
-				result.emplace_back(std::move(it->second));
-				it = container.erase(it);
-			}
-		};
-
-		collect_fn(m_generic_sampler_pool);
-		collect_fn(m_custom_color_sampler_pool);
-
-		return result;
-	}
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/sampler.h b/rpcs3/Emu/RSX/VK/vkutils/sampler.h
index f1d81d542f..8fa3cc2232 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/sampler.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/sampler.h
@@ -5,36 +5,6 @@
 
 namespace vk
 {
-	struct border_color_t
-	{
-		u64 storage_key;
-		VkBorderColor value;
-		VkFormat format;
-		VkImageCreateFlags aspect;
-		color4f color_value;
-
-		border_color_t(const color4f& color, VkFormat fmt = VK_FORMAT_UNDEFINED, VkImageAspectFlags aspect = VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT);
-
-		border_color_t(VkBorderColor color);
-
-		bool operator == (const border_color_t& that) const
-		{
-			if (this->value != that.value)
-			{
-				return false;
-			}
-
-			switch (this->value)
-			{
-			case VK_BORDER_COLOR_FLOAT_CUSTOM_EXT:
-			case VK_BORDER_COLOR_INT_CUSTOM_EXT:
-				return this->color_value == that.color_value;
-			default:
-				return true;
-			}
-		}
-	};
-
 	struct sampler
 	{
 		VkSampler value;
@@ -42,55 +12,19 @@ namespace vk
 
 		sampler(const vk::render_device& dev, VkSamplerAddressMode clamp_u, VkSamplerAddressMode clamp_v, VkSamplerAddressMode clamp_w,
 			VkBool32 unnormalized_coordinates, float mipLodBias, float max_anisotropy, float min_lod, float max_lod,
-			VkFilter min_filter, VkFilter mag_filter, VkSamplerMipmapMode mipmap_mode, const border_color_t& border_color,
+			VkFilter min_filter, VkFilter mag_filter, VkSamplerMipmapMode mipmap_mode, VkBorderColor border_color,
 			VkBool32 depth_compare = false, VkCompareOp depth_compare_mode = VK_COMPARE_OP_NEVER);
 
 		~sampler();
 
 		bool matches(VkSamplerAddressMode clamp_u, VkSamplerAddressMode clamp_v, VkSamplerAddressMode clamp_w,
 			VkBool32 unnormalized_coordinates, float mipLodBias, float max_anisotropy, float min_lod, float max_lod,
-			VkFilter min_filter, VkFilter mag_filter, VkSamplerMipmapMode mipmap_mode, const border_color_t& border_color,
+			VkFilter min_filter, VkFilter mag_filter, VkSamplerMipmapMode mipmap_mode, VkBorderColor border_color,
 			VkBool32 depth_compare = false, VkCompareOp depth_compare_mode = VK_COMPARE_OP_NEVER);
 
 		sampler(const sampler&) = delete;
 		sampler(sampler&&) = delete;
 	private:
 		VkDevice m_device;
-		border_color_t m_border_color;
-	};
-
-	// Caching helpers
-	struct sampler_pool_key_t
-	{
-		u64 base_key;
-		u64 border_color_key;
-	};
-
-	struct cached_sampler_object_t : public vk::sampler, public rsx::ref_counted
-	{
-		sampler_pool_key_t key;
-		using vk::sampler::sampler;
-	};
-
-	class sampler_pool_t
-	{
-		std::unordered_map<u64, std::unique_ptr<cached_sampler_object_t>> m_generic_sampler_pool;
-		std::unordered_map<u64, std::unique_ptr<cached_sampler_object_t>> m_custom_color_sampler_pool;
-
-	public:
-
-		sampler_pool_key_t compute_storage_key(
-			VkSamplerAddressMode clamp_u, VkSamplerAddressMode clamp_v, VkSamplerAddressMode clamp_w,
-			VkBool32 unnormalized_coordinates, float mipLodBias, float max_anisotropy, float min_lod, float max_lod,
-			VkFilter min_filter, VkFilter mag_filter, VkSamplerMipmapMode mipmap_mode, const vk::border_color_t& border_color,
-			VkBool32 depth_compare, VkCompareOp depth_compare_mode);
-
-		void clear();
-
-		cached_sampler_object_t* find(const sampler_pool_key_t& key) const;
-
-		cached_sampler_object_t* emplace(const sampler_pool_key_t& key, std::unique_ptr<cached_sampler_object_t>& object);
-
-		std::vector<std::unique_ptr<cached_sampler_object_t>> collect(std::function<bool(const cached_sampler_object_t&)> predicate);
 	};
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp b/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp
index 041067bea6..1401aa2d66 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp
@@ -1,8 +1,9 @@
-#include "barriers.h"
 #include "buffer_object.h"
 #include "image.h"
+#include "sampler.h"
 
 #include "../VKResourceManager.h"
+#include "Utilities/address_range.h"
 
 #include <util/asm.hpp>
 
@@ -54,12 +55,12 @@ namespace vk
 		return g_null_sampler;
 	}
 
-	vk::image_view* null_image_view(const vk::command_buffer& cmd, VkImageViewType type)
+	vk::image_view* null_image_view(vk::command_buffer& cmd, VkImageViewType type)
 	{
 		if (auto found = g_null_image_views.find(type);
 			found != g_null_image_views.end())
 		{
-			return found->second->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_IDENTITY));
+			return found->second->get_view(VK_REMAP_IDENTITY, rsx::default_remap_vector);
 		}
 
 		VkImageType image_type;
@@ -96,7 +97,7 @@ namespace vk
 		auto& tex = g_null_image_views[type];
 		tex = std::make_unique<viewable_image>(*g_render_device, g_render_device->get_memory_mapping().device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
 			image_type, VK_FORMAT_B8G8R8A8_UNORM, size, size, 1, 1, num_layers, VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
-			VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, flags | VK_IMAGE_CREATE_ALLOW_NULL_RPCS3, VMM_ALLOCATION_POOL_SCRATCH);
+			VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, flags | VK_IMAGE_CREATE_ALLOW_NULL, VMM_ALLOCATION_POOL_SCRATCH);
 
 		if (!tex->value)
 		{
@@ -109,22 +110,22 @@ namespace vk
 		tex->change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
 
 		VkClearColorValue clear_color = {};
-		VkImageSubresourceRange range = { VK_IMAGE_ASPECT_COLOR_BIT, 0, tex->mipmaps(), 0, tex->layers() };
+		VkImageSubresourceRange range = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 };
 		vkCmdClearColorImage(cmd, tex->value, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &clear_color, 1, &range);
 
 		// Prep for shader access
 		tex->change_layout(cmd, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
 
 		// Return view
-		return tex->get_view(rsx::default_remap_vector.with_encoding(VK_REMAP_IDENTITY));
+		return tex->get_view(VK_REMAP_IDENTITY, rsx::default_remap_vector);
 	}
 
 	vk::image* get_typeless_helper(VkFormat format, rsx::format_class format_class, u32 requested_width, u32 requested_height)
 	{
 		auto create_texture = [&]()
 		{
-			u32 new_width = utils::align(requested_width, 256u);
-			u32 new_height = utils::align(requested_height, 256u);
+			u32 new_width = utils::align(requested_width, 1024u);
+			u32 new_height = utils::align(requested_height, 1024u);
 
 			return new vk::image(*g_render_device, g_render_device->get_memory_mapping().device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
 				VK_IMAGE_TYPE_2D, format, new_width, new_height, 1, 1, 1, VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
@@ -145,16 +146,14 @@ namespace vk
 			}
 
 			ptr.reset(create_texture());
-			ptr->set_debug_name(fmt::format("Scratch: Format=0x%x", static_cast<u32>(format)));
 		}
 
 		return ptr.get();
 	}
 
-	std::pair<vk::buffer*, bool> get_scratch_buffer(u32 queue_family, u64 min_required_size)
+	vk::buffer* get_scratch_buffer(u64 min_required_size)
 	{
-		auto& scratch_buffer = g_scratch_buffers_pool[queue_family].get_buf();
-		bool is_new = false;
+		auto& scratch_buffer = g_scratch_buffers_pool[0 /*TODO: Replace with Queue Family ID*/].get_buf();
 
 		if (scratch_buffer && scratch_buffer->size() < min_required_size)
 		{
@@ -170,29 +169,9 @@ namespace vk
 			scratch_buffer = std::make_unique<vk::buffer>(*g_render_device, alloc_size,
 				g_render_device->get_memory_mapping().device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
 				VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, 0, VMM_ALLOCATION_POOL_SCRATCH);
-
-			is_new = true;
 		}
 
-		return { scratch_buffer.get(), is_new };
-	}
-
-	vk::buffer* get_scratch_buffer(const vk::command_buffer& cmd, u64 min_required_size, bool zero_memory)
-	{
-		const auto [buf, init_mem] = get_scratch_buffer(cmd.get_queue_family(), min_required_size);
-
-		if (init_mem || zero_memory)
-		{
-			// Zero-initialize the allocated VRAM
-			const u64 zero_length = init_mem ? buf->size() : utils::align(min_required_size, 4);
-			vkCmdFillBuffer(cmd, buf->value, 0, zero_length, 0);
-
-			insert_buffer_memory_barrier(cmd, buf->value, 0, zero_length,
-				VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT | VK_PIPELINE_STAGE_TRANSFER_BIT,
-				VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT | VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_TRANSFER_WRITE_BIT);
-		}
-
-		return buf;
+		return scratch_buffer.get();
 	}
 
 	void clear_scratch_resources()
diff --git a/rpcs3/Emu/RSX/VK/vkutils/scratch.h b/rpcs3/Emu/RSX/VK/vkutils/scratch.h
index 312db68c8a..39a00604b4 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/scratch.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/scratch.h
@@ -4,9 +4,9 @@
 namespace vk
 {
 	VkSampler null_sampler();
-	image_view* null_image_view(const command_buffer& cmd, VkImageViewType type);
+	image_view* null_image_view(command_buffer&, VkImageViewType type);
 	image* get_typeless_helper(VkFormat format, rsx::format_class format_class, u32 requested_width, u32 requested_height);
-	buffer* get_scratch_buffer(const command_buffer& cmd, u64 min_required_size, bool zero_memory = false);
+	buffer* get_scratch_buffer(u64 min_required_size);
 
 	void clear_scratch_resources();
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/shared.cpp b/rpcs3/Emu/RSX/VK/vkutils/shared.cpp
index c4a0219e68..e9580bd23f 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/shared.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/shared.cpp
@@ -1,4 +1,3 @@
-#include "device.h"
 #include "shared.h"
 #include "util/logs.hpp"
 
@@ -8,99 +7,13 @@
 
 namespace vk
 {
-	extern void print_debug_markers();
-
-	std::string retrieve_device_fault_info()
+	void die_with_error(VkResult error_code, std::string message,
+		const char* file,
+		const char* func,
+		u32 line,
+		u32 col)
 	{
-		if (!g_render_device || !g_render_device->get_extended_device_fault_support())
-		{
-			return "Extended fault info is not available. Extension 'VK_EXT_device_fault' is probably not supported by your driver.";
-		}
-
-		ensure(_vkGetDeviceFaultInfoEXT);
-
-		VkDeviceFaultCountsEXT fault_counts
-		{
-			.sType = VK_STRUCTURE_TYPE_DEVICE_FAULT_COUNTS_EXT
-		};
-
-		std::vector<VkDeviceFaultAddressInfoEXT> address_info;
-		std::vector<VkDeviceFaultVendorInfoEXT> vendor_info;
-		std::vector<u8> vendor_binary_data;
-		std::string fault_description;
-
-		// Retrieve sizes
-		_vkGetDeviceFaultInfoEXT(*g_render_device, &fault_counts, nullptr);
-
-		// Resize arrays and fill
-		address_info.resize(fault_counts.addressInfoCount);
-		vendor_info.resize(fault_counts.vendorInfoCount);
-		vendor_binary_data.resize(fault_counts.vendorBinarySize);
-
-		VkDeviceFaultInfoEXT fault_info
-		{
-			.sType = VK_STRUCTURE_TYPE_DEVICE_FAULT_INFO_EXT,
-			.pAddressInfos = address_info.data(),
-			.pVendorInfos = vendor_info.data(),
-			.pVendorBinaryData = vendor_binary_data.data()
-		};
-		_vkGetDeviceFaultInfoEXT(*g_render_device, &fault_counts, &fault_info);
-
-		fault_description = fault_info.description;
-		std::string fault_message = fmt::format(
-			"Device Fault Information:\n"
-			"Fault Summary:\n"
-			"  %s\n\n",
-			fault_description);
-
-		if (!address_info.empty())
-		{
-			fmt::append(fault_message, "  Address Fault Information:\n", fault_description);
-
-			for (const auto& fault : address_info)
-			{
-				std::string access_type = "access_unknown";
-				switch (fault.addressType)
-				{
-				case VK_DEVICE_FAULT_ADDRESS_TYPE_NONE_EXT:
-					access_type = "access_none";
-					break;
-				case VK_DEVICE_FAULT_ADDRESS_TYPE_READ_INVALID_EXT:
-					access_type = "access_read"; break;
-				case VK_DEVICE_FAULT_ADDRESS_TYPE_WRITE_INVALID_EXT:
-					access_type = "access_write"; break;
-				case VK_DEVICE_FAULT_ADDRESS_TYPE_EXECUTE_INVALID_EXT:
-					access_type = "access_execute"; break;
-				case VK_DEVICE_FAULT_ADDRESS_TYPE_INSTRUCTION_POINTER_UNKNOWN_EXT:
-					access_type = "instruction_pointer_unknown"; break;
-				case VK_DEVICE_FAULT_ADDRESS_TYPE_INSTRUCTION_POINTER_INVALID_EXT:
-					access_type = "instruction_pointer_invalid"; break;
-				case VK_DEVICE_FAULT_ADDRESS_TYPE_INSTRUCTION_POINTER_FAULT_EXT:
-					access_type = "instruction_pointer_fault"; break;
-				default:
-					break;
-				}
-
-				fmt::append(fault_message, "  - Fault at address 0x%llx caused by %s\n", fault.reportedAddress, access_type);
-			}
-		}
-
-		if (!vendor_info.empty())
-		{
-			fmt::append(fault_message, "  Vendor Fault Information:\n", fault_description);
-
-			for (const auto& fault : vendor_info)
-			{
-				fmt::append(fault_message, "  - [0x%llx, 0x%llx] %s\n", fault.vendorFaultCode, fault.vendorFaultData, fault.description);
-			}
-		}
-
-		return fault_message;
-	}
-
-	void die_with_error(VkResult error_code, std::string message, std::source_location src_loc)
-	{
-		std::string error_message, extra_info;
+		std::string error_message;
 		int severity = 0; // 0 - die, 1 - warn, 2 - nothing
 
 		switch (error_code)
@@ -131,7 +44,6 @@ namespace vk
 			break;
 		case VK_ERROR_DEVICE_LOST:
 			error_message = "Device lost (Driver crashed with unspecified error or stopped responding and recovered) (VK_ERROR_DEVICE_LOST)";
-			extra_info = retrieve_device_fault_info();
 			break;
 		case VK_ERROR_MEMORY_MAP_FAILED:
 			error_message = "Memory map failed (VK_ERROR_MEMORY_MAP_FAILED)";
@@ -182,29 +94,19 @@ namespace vk
 		case VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR:
 			error_message = "Invalid external handle (VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR)";
 			break;
-		case VK_ERROR_FRAGMENTATION_EXT:
-			error_message = "Descriptor pool creation failed (VK_ERROR_FRAGMENTATION)";
-			break;
 		default:
-			error_message = fmt::format("Unknown Code (%Xh, %d)%s", static_cast<s32>(error_code), static_cast<s32>(error_code), src_loc);
+			error_message = fmt::format("Unknown Code (%Xh, %d)%s", static_cast<s32>(error_code), static_cast<s32>(error_code), src_loc{line, col, file, func});
 			break;
 		}
 
-		if (!extra_info.empty())
-		{
-			error_message = fmt::format("%s\n---------------- EXTRA INFORMATION --------------------\n%s", error_message, extra_info);
-		}
-
 		switch (severity)
 		{
 		default:
 		case 0:
-			print_debug_markers();
-
 			if (!message.empty()) message += "\n\n";
-			fmt::throw_exception("%sAssertion Failed! Vulkan API call failed with unrecoverable error: %s%s", message, error_message, src_loc);
+			fmt::throw_exception("%sAssertion Failed! Vulkan API call failed with unrecoverable error: %s%s", message, error_message, src_loc{line, col, file, func});
 		case 1:
-			rsx_log.error("Vulkan API call has failed with an error but will continue: %s%s", error_message, src_loc);
+			rsx_log.error("Vulkan API call has failed with an error but will continue: %s%s", error_message, src_loc{line, col, file, func});
 			break;
 		case 2:
 			break;
@@ -235,9 +137,14 @@ namespace vk
 		return false;
 	}
 
-	VkBool32 BreakCallback(VkFlags /*msgFlags*/, VkDebugReportObjectTypeEXT /*objType*/,
-		u64 /*srcObject*/, usz /*location*/, s32 /*msgCode*/,
-		const char* /*pLayerPrefix*/, const char* /*pMsg*/, void* /*pUserData*/)
+	// Temporarily
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
+	VkBool32 BreakCallback(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType,
+		u64 srcObject, usz location, s32 msgCode,
+		const char* pLayerPrefix, const char* pMsg, void* pUserData)
 	{
 #ifdef _WIN32
 		DebugBreak();
diff --git a/rpcs3/Emu/RSX/VK/vkutils/shared.h b/rpcs3/Emu/RSX/VK/vkutils/shared.h
index f8ffcc103a..1400d10b16 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/shared.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/shared.h
@@ -8,7 +8,11 @@ namespace vk
 #define CHECK_RESULT(expr) { VkResult _res = (expr); if (_res != VK_SUCCESS) vk::die_with_error(_res); }
 #define CHECK_RESULT_EX(expr, msg) { VkResult _res = (expr); if (_res != VK_SUCCESS) vk::die_with_error(_res, msg); }
 
-	void die_with_error(VkResult error_code, std::string message = {}, std::source_location src_loc = std::source_location::current());
+	void die_with_error(VkResult error_code, std::string message = {},
+		const char* file = __builtin_FILE(),
+		const char* func = __builtin_FUNCTION(),
+		u32 line = __builtin_LINE(),
+		u32 col = __builtin_COLUMN());
 
 	VKAPI_ATTR VkBool32 VKAPI_CALL dbgFunc(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType,
 	                                       u64 srcObject, usz location, s32 msgCode,
diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp
deleted file mode 100644
index a296e393e2..0000000000
--- a/rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp
+++ /dev/null
@@ -1,354 +0,0 @@
-#include "stdafx.h"
-#include "swapchain.h"
-
-namespace vk
-{
-	// Swapchain image RPCS3
-	swapchain_image_RPCS3::swapchain_image_RPCS3(render_device& dev, const memory_type_mapping& memory_map, u32 width, u32 height)
-		:image(dev, memory_map.device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_IMAGE_TYPE_2D, VK_FORMAT_B8G8R8A8_UNORM, width, height, 1, 1, 1,
-			VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_TILING_OPTIMAL,
-			VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0, VMM_ALLOCATION_POOL_SWAPCHAIN)
-	{
-		m_width = width;
-		m_height = height;
-		current_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-
-		m_dma_buffer = std::make_unique<buffer>(dev, m_width * m_height * 4, memory_map.host_visible_coherent,
-			VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, VK_BUFFER_USAGE_TRANSFER_DST_BIT, 0, VMM_ALLOCATION_POOL_SWAPCHAIN);
-	}
-
-	void swapchain_image_RPCS3::do_dma_transfer(command_buffer& cmd)
-	{
-		VkBufferImageCopy copyRegion = {};
-		copyRegion.bufferOffset = 0;
-		copyRegion.bufferRowLength = m_width;
-		copyRegion.bufferImageHeight = m_height;
-		copyRegion.imageSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 };
-		copyRegion.imageOffset = {};
-		copyRegion.imageExtent = { m_width, m_height, 1 };
-
-		change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
-		vkCmdCopyImageToBuffer(cmd, value, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, m_dma_buffer->value, 1, &copyRegion);
-		change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
-	}
-
-	u32 swapchain_image_RPCS3::get_required_memory_size() const
-	{
-		return m_width * m_height * 4;
-	}
-
-	void* swapchain_image_RPCS3::get_pixels()
-	{
-		return m_dma_buffer->map(0, VK_WHOLE_SIZE);
-	}
-
-	void swapchain_image_RPCS3::free_pixels()
-	{
-		m_dma_buffer->unmap();
-	}
-
-	// swapchain BASE
-	swapchain_base::swapchain_base(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format)
-	{
-		dev.create(gpu, graphics_queue, present_queue, transfer_queue);
-		m_surface_format = format;
-	}
-
-	// NATIVE swapchain base
-	VkResult native_swapchain_base::acquire_next_swapchain_image(VkSemaphore /*semaphore*/, u64 /*timeout*/, u32* result)
-	{
-		u32 index = 0;
-		for (auto& p : swapchain_images)
-		{
-			if (!p.first)
-			{
-				p.first = true;
-				*result = index;
-				return VK_SUCCESS;
-			}
-
-			++index;
-		}
-
-		return VK_NOT_READY;
-	}
-
-	void native_swapchain_base::init_swapchain_images(render_device& dev, u32 preferred_count)
-	{
-		swapchain_images.resize(preferred_count);
-		for (auto& img : swapchain_images)
-		{
-			img.second = std::make_unique<swapchain_image_RPCS3>(dev, dev.get_memory_mapping(), m_width, m_height);
-			img.first = false;
-		}
-	}
-
-	// WSI implementation
-	void swapchain_WSI::init_swapchain_images(render_device& dev, u32 /*preferred_count*/)
-	{
-		u32 nb_swap_images = 0;
-		_vkGetSwapchainImagesKHR(dev, m_vk_swapchain, &nb_swap_images, nullptr);
-
-		if (!nb_swap_images) fmt::throw_exception("Driver returned 0 images for swapchain");
-
-		std::vector<VkImage> vk_images;
-		vk_images.resize(nb_swap_images);
-		_vkGetSwapchainImagesKHR(dev, m_vk_swapchain, &nb_swap_images, vk_images.data());
-
-		swapchain_images.resize(nb_swap_images);
-		for (u32 i = 0; i < nb_swap_images; ++i)
-		{
-			swapchain_images[i].value = vk_images[i];
-		}
-	}
-
-	swapchain_WSI::swapchain_WSI(vk::physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format, VkSurfaceKHR surface, VkColorSpaceKHR color_space, bool force_wm_reporting_off)
-		: WSI_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format)
-	{
-		_vkCreateSwapchainKHR = reinterpret_cast<PFN_vkCreateSwapchainKHR>(vkGetDeviceProcAddr(dev, "vkCreateSwapchainKHR"));
-		_vkDestroySwapchainKHR = reinterpret_cast<PFN_vkDestroySwapchainKHR>(vkGetDeviceProcAddr(dev, "vkDestroySwapchainKHR"));
-		_vkGetSwapchainImagesKHR = reinterpret_cast<PFN_vkGetSwapchainImagesKHR>(vkGetDeviceProcAddr(dev, "vkGetSwapchainImagesKHR"));
-		_vkAcquireNextImageKHR = reinterpret_cast<PFN_vkAcquireNextImageKHR>(vkGetDeviceProcAddr(dev, "vkAcquireNextImageKHR"));
-		_vkQueuePresentKHR = reinterpret_cast<PFN_vkQueuePresentKHR>(vkGetDeviceProcAddr(dev, "vkQueuePresentKHR"));
-
-		m_surface = surface;
-		m_color_space = color_space;
-
-		if (!force_wm_reporting_off)
-		{
-			switch (gpu.get_driver_vendor())
-			{
-			case driver_vendor::AMD:
-			case driver_vendor::INTEL:
-			case driver_vendor::RADV:
-			case driver_vendor::MVK:
-				break;
-			case driver_vendor::ANV:
-			case driver_vendor::NVIDIA:
-				m_wm_reports_flag = true;
-				break;
-			default:
-				break;
-			}
-		}
-	}
-
-	void swapchain_WSI::destroy(bool)
-	{
-		if (VkDevice pdev = dev)
-		{
-			if (m_vk_swapchain)
-			{
-				_vkDestroySwapchainKHR(pdev, m_vk_swapchain, nullptr);
-			}
-
-			dev.destroy();
-		}
-	}
-
-	std::pair<VkSurfaceCapabilitiesKHR, bool> swapchain_WSI::init_surface_capabilities()
-	{
-#ifdef _WIN32
-		if (g_cfg.video.vk.exclusive_fullscreen_mode != vk_exclusive_fs_mode::unspecified && dev.get_surface_capabilities_2_support())
-		{
-			HMONITOR hmonitor = MonitorFromWindow(window_handle, MONITOR_DEFAULTTOPRIMARY);
-			if (hmonitor)
-			{
-				VkSurfaceCapabilities2KHR pSurfaceCapabilities = {};
-				pSurfaceCapabilities.sType = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR;
-
-				VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo = {};
-				pSurfaceInfo.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR;
-				pSurfaceInfo.surface = m_surface;
-
-				VkSurfaceCapabilitiesFullScreenExclusiveEXT full_screen_exclusive_capabilities = {};
-				VkSurfaceFullScreenExclusiveWin32InfoEXT full_screen_exclusive_win32_info = {};
-				full_screen_exclusive_capabilities.sType = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_FULL_SCREEN_EXCLUSIVE_EXT;
-
-				pSurfaceCapabilities.pNext = &full_screen_exclusive_capabilities;
-
-				full_screen_exclusive_win32_info.sType = VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_WIN32_INFO_EXT;
-				full_screen_exclusive_win32_info.hmonitor = hmonitor;
-
-				pSurfaceInfo.pNext = &full_screen_exclusive_win32_info;
-
-				auto getPhysicalDeviceSurfaceCapabilities2KHR = reinterpret_cast<PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR>(
-					vkGetInstanceProcAddr(dev.gpu(), "vkGetPhysicalDeviceSurfaceCapabilities2KHR")
-					);
-				ensure(getPhysicalDeviceSurfaceCapabilities2KHR);
-				CHECK_RESULT(getPhysicalDeviceSurfaceCapabilities2KHR(dev.gpu(), &pSurfaceInfo, &pSurfaceCapabilities));
-
-				return { pSurfaceCapabilities.surfaceCapabilities, !!full_screen_exclusive_capabilities.fullScreenExclusiveSupported };
-			}
-			else
-			{
-				rsx_log.warning("Swapchain: failed to get monitor for the window");
-			}
-		}
-#endif
-		VkSurfaceCapabilitiesKHR surface_descriptors = {};
-		CHECK_RESULT(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(dev.gpu(), m_surface, &surface_descriptors));
-		return { surface_descriptors, false };
-	}
-
-	bool swapchain_WSI::init()
-	{
-		if (dev.get_present_queue() == VK_NULL_HANDLE)
-		{
-			rsx_log.error("Cannot create WSI swapchain without a present queue");
-			return false;
-		}
-
-		VkSwapchainKHR old_swapchain = m_vk_swapchain;
-		vk::physical_device& gpu = const_cast<vk::physical_device&>(dev.gpu());
-
-		auto [surface_descriptors, should_specify_exclusive_full_screen_mode] = init_surface_capabilities();
-
-		if (surface_descriptors.maxImageExtent.width < m_width ||
-			surface_descriptors.maxImageExtent.height < m_height)
-		{
-			rsx_log.error("Swapchain: Swapchain creation failed because dimensions cannot fit. Max = %d, %d, Requested = %d, %d",
-				surface_descriptors.maxImageExtent.width, surface_descriptors.maxImageExtent.height, m_width, m_height);
-
-			return false;
-		}
-
-		if (surface_descriptors.currentExtent.width != umax)
-		{
-			if (surface_descriptors.currentExtent.width == 0 || surface_descriptors.currentExtent.height == 0)
-			{
-				rsx_log.warning("Swapchain: Current surface extent is a null region. Is the window minimized?");
-				return false;
-			}
-
-			m_width = surface_descriptors.currentExtent.width;
-			m_height = surface_descriptors.currentExtent.height;
-		}
-
-		u32 nb_available_modes = 0;
-		CHECK_RESULT(vkGetPhysicalDeviceSurfacePresentModesKHR(gpu, m_surface, &nb_available_modes, nullptr));
-
-		std::vector<VkPresentModeKHR> present_modes(nb_available_modes);
-		CHECK_RESULT(vkGetPhysicalDeviceSurfacePresentModesKHR(gpu, m_surface, &nb_available_modes, present_modes.data()));
-
-		VkPresentModeKHR swapchain_present_mode = VK_PRESENT_MODE_FIFO_KHR;
-		std::vector<VkPresentModeKHR> preferred_modes;
-
-		if (!g_cfg.video.vk.force_fifo)
-		{
-			// List of preferred modes in decreasing desirability
-			// NOTE: Always picks "triple-buffered vsync" types if possible
-			if (!g_cfg.video.vsync)
-			{
-				preferred_modes = { VK_PRESENT_MODE_IMMEDIATE_KHR, VK_PRESENT_MODE_MAILBOX_KHR, VK_PRESENT_MODE_FIFO_RELAXED_KHR };
-			}
-		}
-
-		bool mode_found = false;
-		for (VkPresentModeKHR preferred_mode : preferred_modes)
-		{
-			//Search for this mode in supported modes
-			for (VkPresentModeKHR mode : present_modes)
-			{
-				if (mode == preferred_mode)
-				{
-					swapchain_present_mode = mode;
-					mode_found = true;
-					break;
-				}
-			}
-
-			if (mode_found)
-				break;
-		}
-
-		rsx_log.notice("Swapchain: present mode %d in use.", static_cast<int>(swapchain_present_mode));
-
-		u32 nb_swap_images = surface_descriptors.minImageCount + 1;
-		if (surface_descriptors.maxImageCount > 0)
-		{
-			//Try to negotiate for a triple buffer setup
-			//In cases where the front-buffer isnt available for present, its better to have a spare surface
-			nb_swap_images = std::max(surface_descriptors.minImageCount + 2u, 3u);
-
-			if (nb_swap_images > surface_descriptors.maxImageCount)
-			{
-				// Application must settle for fewer images than desired:
-				nb_swap_images = surface_descriptors.maxImageCount;
-			}
-		}
-
-		VkSurfaceTransformFlagBitsKHR pre_transform = surface_descriptors.currentTransform;
-		if (surface_descriptors.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR)
-			pre_transform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
-
-		VkSwapchainCreateInfoKHR swap_info = {};
-		swap_info.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
-		swap_info.surface = m_surface;
-		swap_info.minImageCount = nb_swap_images;
-		swap_info.imageFormat = m_surface_format;
-		swap_info.imageColorSpace = m_color_space;
-
-		swap_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
-		swap_info.preTransform = pre_transform;
-		swap_info.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR;
-		swap_info.imageArrayLayers = 1;
-		swap_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
-		swap_info.presentMode = swapchain_present_mode;
-		swap_info.oldSwapchain = old_swapchain;
-		swap_info.clipped = true;
-
-		swap_info.imageExtent.width = std::max(m_width, surface_descriptors.minImageExtent.width);
-		swap_info.imageExtent.height = std::max(m_height, surface_descriptors.minImageExtent.height);
-
-#ifdef _WIN32
-		VkSurfaceFullScreenExclusiveInfoEXT full_screen_exclusive_info = {};
-		if (should_specify_exclusive_full_screen_mode)
-		{
-			vk_exclusive_fs_mode fs_mode = g_cfg.video.vk.exclusive_fullscreen_mode;
-			ensure(fs_mode == vk_exclusive_fs_mode::enable || fs_mode == vk_exclusive_fs_mode::disable);
-
-			full_screen_exclusive_info.sType = VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_INFO_EXT;
-			full_screen_exclusive_info.fullScreenExclusive =
-				fs_mode == vk_exclusive_fs_mode::enable ? VK_FULL_SCREEN_EXCLUSIVE_ALLOWED_EXT : VK_FULL_SCREEN_EXCLUSIVE_DISALLOWED_EXT;
-
-			swap_info.pNext = &full_screen_exclusive_info;
-		}
-
-		rsx_log.notice("Swapchain: requesting full screen exclusive mode %d.", static_cast<int>(full_screen_exclusive_info.fullScreenExclusive));
-#endif
-
-		_vkCreateSwapchainKHR(dev, &swap_info, nullptr, &m_vk_swapchain);
-
-		if (old_swapchain)
-		{
-			if (!swapchain_images.empty())
-			{
-				swapchain_images.clear();
-			}
-
-			_vkDestroySwapchainKHR(dev, old_swapchain, nullptr);
-		}
-
-		init_swapchain_images(dev);
-		return true;
-	}
-
-	VkResult swapchain_WSI::present(VkSemaphore semaphore, u32 image)
-	{
-		VkPresentInfoKHR present = {};
-		present.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
-		present.pNext = nullptr;
-		present.swapchainCount = 1;
-		present.pSwapchains = &m_vk_swapchain;
-		present.pImageIndices = &image;
-
-		if (semaphore != VK_NULL_HANDLE)
-		{
-			present.waitSemaphoreCount = 1;
-			present.pWaitSemaphores = &semaphore;
-		}
-
-		return _vkQueuePresentKHR(dev.get_present_queue(), &present);
-	}
-}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain.h b/rpcs3/Emu/RSX/VK/vkutils/swapchain.h
deleted file mode 100644
index f5128fc487..0000000000
--- a/rpcs3/Emu/RSX/VK/vkutils/swapchain.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#if defined (_WIN32)
-#include "swapchain_win32.hpp"
-#elif defined (ANDROID)
-#include "swapchain_android.hpp"
-#elif defined (__APPLE__)
-#include "swapchain_macos.hpp"
-#else // Both linux and BSD families
-#include "swapchain_unix.hpp"
-#endif
diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain.hpp
new file mode 100644
index 0000000000..c948a09825
--- /dev/null
+++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain.hpp
@@ -0,0 +1,781 @@
+#pragma once
+
+#ifdef HAVE_X11
+#include <X11/Xutil.h>
+#endif
+
+#include "../../display.h"
+#include "../VulkanAPI.h"
+#include "image.h"
+
+#include <memory>
+
+namespace vk
+{
+	struct swapchain_image_WSI
+	{
+		VkImage value = VK_NULL_HANDLE;
+	};
+
+	class swapchain_image_RPCS3 : public image
+	{
+		std::unique_ptr<buffer> m_dma_buffer;
+		u32 m_width = 0;
+		u32 m_height = 0;
+
+	public:
+		swapchain_image_RPCS3(render_device& dev, const memory_type_mapping& memory_map, u32 width, u32 height)
+			:image(dev, memory_map.device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_IMAGE_TYPE_2D, VK_FORMAT_B8G8R8A8_UNORM, width, height, 1, 1, 1,
+				VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_TILING_OPTIMAL,
+				VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0, VMM_ALLOCATION_POOL_SWAPCHAIN)
+		{
+			m_width = width;
+			m_height = height;
+			current_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+
+			m_dma_buffer = std::make_unique<buffer>(dev, m_width * m_height * 4, memory_map.host_visible_coherent,
+				VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, VK_BUFFER_USAGE_TRANSFER_DST_BIT, 0, VMM_ALLOCATION_POOL_SWAPCHAIN);
+		}
+
+		void do_dma_transfer(command_buffer& cmd)
+		{
+			VkBufferImageCopy copyRegion = {};
+			copyRegion.bufferOffset = 0;
+			copyRegion.bufferRowLength = m_width;
+			copyRegion.bufferImageHeight = m_height;
+			copyRegion.imageSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 };
+			copyRegion.imageOffset = {};
+			copyRegion.imageExtent = { m_width, m_height, 1 };
+
+			change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
+			vkCmdCopyImageToBuffer(cmd, value, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, m_dma_buffer->value, 1, &copyRegion);
+			change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
+		}
+
+		u32 get_required_memory_size() const
+		{
+			return m_width * m_height * 4;
+		}
+
+		void* get_pixels()
+		{
+			return m_dma_buffer->map(0, VK_WHOLE_SIZE);
+		}
+
+		void free_pixels()
+		{
+			m_dma_buffer->unmap();
+		}
+	};
+
+	class swapchain_base
+	{
+	protected:
+		render_device dev;
+
+		display_handle_t window_handle{};
+		u32 m_width = 0;
+		u32 m_height = 0;
+		VkFormat m_surface_format = VK_FORMAT_B8G8R8A8_UNORM;
+
+		virtual void init_swapchain_images(render_device& dev, u32 count) = 0;
+
+	public:
+		swapchain_base(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM)
+		{
+			dev.create(gpu, graphics_queue, present_queue, transfer_queue);
+			m_surface_format = format;
+		}
+
+		virtual ~swapchain_base() = default;
+
+		virtual void create(display_handle_t& handle) = 0;
+		virtual void destroy(bool full = true) = 0;
+		virtual bool init() = 0;
+
+		virtual u32 get_swap_image_count() const = 0;
+		virtual VkImage get_image(u32 index) = 0;
+		virtual VkResult acquire_next_swapchain_image(VkSemaphore semaphore, u64 timeout, u32* result) = 0;
+		virtual void end_frame(command_buffer& cmd, u32 index) = 0;
+		virtual VkResult present(VkSemaphore semaphore, u32 index) = 0;
+		virtual VkImageLayout get_optimal_present_layout() = 0;
+
+		virtual bool supports_automatic_wm_reports() const
+		{
+			return false;
+		}
+
+		bool init(u32 w, u32 h)
+		{
+			m_width = w;
+			m_height = h;
+			return init();
+		}
+
+		const vk::render_device& get_device()
+		{
+			return dev;
+		}
+
+		VkFormat get_surface_format()
+		{
+			return m_surface_format;
+		}
+
+		bool is_headless() const
+		{
+			return (dev.get_present_queue() == VK_NULL_HANDLE);
+		}
+	};
+
+	template<typename T>
+	class abstract_swapchain_impl : public swapchain_base
+	{
+	protected:
+		std::vector<T> swapchain_images;
+
+	public:
+		abstract_swapchain_impl(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM)
+			: swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format)
+		{}
+
+		~abstract_swapchain_impl() override = default;
+
+		u32 get_swap_image_count() const override
+		{
+			return ::size32(swapchain_images);
+		}
+
+		using swapchain_base::init;
+	};
+
+	using native_swapchain_base = abstract_swapchain_impl<std::pair<bool, std::unique_ptr<swapchain_image_RPCS3>>>;
+	using WSI_swapchain_base = abstract_swapchain_impl<swapchain_image_WSI>;
+
+	#ifdef _WIN32
+
+	class swapchain_WIN32 : public native_swapchain_base
+	{
+		HDC hDstDC = NULL;
+		HDC hSrcDC = NULL;
+		HBITMAP hDIB = NULL;
+		LPVOID hPtr = NULL;
+
+	public:
+		swapchain_WIN32(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM)
+			: native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format)
+		{}
+
+		~swapchain_WIN32() {}
+
+		bool init() override
+		{
+			if (hDIB || hSrcDC)
+				destroy(false);
+
+			RECT rect;
+			GetClientRect(window_handle, &rect);
+			m_width = rect.right - rect.left;
+			m_height = rect.bottom - rect.top;
+
+			if (m_width == 0 || m_height == 0)
+			{
+				rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height);
+				return false;
+			}
+
+			BITMAPINFO bitmap = {};
+			bitmap.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+			bitmap.bmiHeader.biWidth = m_width;
+			bitmap.bmiHeader.biHeight = m_height * -1;
+			bitmap.bmiHeader.biPlanes = 1;
+			bitmap.bmiHeader.biBitCount = 32;
+			bitmap.bmiHeader.biCompression = BI_RGB;
+
+			hSrcDC = CreateCompatibleDC(hDstDC);
+			hDIB = CreateDIBSection(hSrcDC, &bitmap, DIB_RGB_COLORS, &hPtr, NULL, 0);
+			SelectObject(hSrcDC, hDIB);
+			init_swapchain_images(dev, 3);
+			return true;
+		}
+
+		void create(display_handle_t& handle) override
+		{
+			window_handle = handle;
+			hDstDC = GetDC(handle);
+		}
+
+		void destroy(bool full = true) override
+		{
+			DeleteObject(hDIB);
+			DeleteDC(hSrcDC);
+			hDIB = NULL;
+			hSrcDC = NULL;
+
+			swapchain_images.clear();
+
+			if (full)
+			{
+				ReleaseDC(window_handle, hDstDC);
+				hDstDC = NULL;
+
+				dev.destroy();
+			}
+		}
+
+		VkResult present(VkSemaphore /*semaphore*/, u32 image) override
+		{
+			auto& src = swapchain_images[image];
+			GdiFlush();
+
+			if (hSrcDC)
+			{
+				memcpy(hPtr, src.second->get_pixels(), src.second->get_required_memory_size());
+				BitBlt(hDstDC, 0, 0, m_width, m_height, hSrcDC, 0, 0, SRCCOPY);
+				src.second->free_pixels();
+			}
+
+			src.first = false;
+			return VK_SUCCESS;
+		}
+	#elif defined(__APPLE__)
+
+	class swapchain_MacOS : public native_swapchain_base
+	{
+		void* nsView = nullptr;
+
+	public:
+		swapchain_MacOS(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM)
+			: native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format)
+		{}
+
+		~swapchain_MacOS() {}
+
+		bool init() override
+		{
+			//TODO: get from `nsView`
+			m_width = 0;
+			m_height = 0;
+
+			if (m_width == 0 || m_height == 0)
+			{
+				rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height);
+				return false;
+			}
+
+			init_swapchain_images(dev, 3);
+			return true;
+		}
+
+		void create(display_handle_t& window_handle) override
+		{
+			nsView = window_handle;
+		}
+
+		void destroy(bool full = true) override
+		{
+			swapchain_images.clear();
+
+			if (full)
+				dev.destroy();
+		}
+
+		VkResult present(VkSemaphore /*semaphore*/, u32 /*index*/) override
+		{
+			fmt::throw_exception("Native macOS swapchain is not implemented yet!");
+		}
+	#elif defined(HAVE_X11)
+
+	class swapchain_X11 : public native_swapchain_base
+	{
+		Display* display = nullptr;
+		Window window = 0;
+		XImage* pixmap = nullptr;
+		GC gc = nullptr;
+		int bit_depth = 24;
+
+	public:
+		swapchain_X11(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM)
+			: native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format)
+		{}
+
+		~swapchain_X11() override = default;
+
+		bool init() override
+		{
+			if (pixmap)
+				destroy(false);
+
+			Window root;
+			int x, y;
+			u32 w = 0, h = 0, border, depth;
+
+			if (XGetGeometry(display, window, &root, &x, &y, &w, &h, &border, &depth))
+			{
+				m_width = w;
+				m_height = h;
+				bit_depth = depth;
+			}
+
+			if (m_width == 0 || m_height == 0)
+			{
+				rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height);
+				return false;
+			}
+
+			XVisualInfo visual{};
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wold-style-cast"
+			if (!XMatchVisualInfo(display, DefaultScreen(display), bit_depth, TrueColor, &visual))
+	#pragma GCC diagnostic pop
+			{
+				rsx_log.error("Could not find matching visual info!");
+				return false;
+			}
+
+			pixmap = XCreateImage(display, visual.visual, visual.depth, ZPixmap, 0, nullptr, m_width, m_height, 32, 0);
+			init_swapchain_images(dev, 3);
+			return true;
+		}
+
+		void create(display_handle_t& window_handle) override
+		{
+			std::visit([&](auto&& p)
+			{
+				using T = std::decay_t<decltype(p)>;
+				if constexpr (std::is_same_v<T, std::pair<Display*, Window>>)
+				{
+					display = p.first;
+					window = p.second;
+				}
+			}, window_handle);
+
+			if (display == NULL)
+			{
+				rsx_log.fatal("Could not create virtual display on this window protocol (Wayland?)");
+				return;
+			}
+
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wold-style-cast"
+			gc = DefaultGC(display, DefaultScreen(display));
+	#pragma GCC diagnostic pop
+		}
+
+		void destroy(bool full = true) override
+		{
+			pixmap->data = nullptr;
+			XDestroyImage(pixmap);
+			pixmap = NULL;
+
+			swapchain_images.clear();
+
+			if (full)
+				dev.destroy();
+		}
+
+		VkResult present(VkSemaphore /*semaphore*/, u32 index) override
+		{
+			auto& src = swapchain_images[index];
+			if (pixmap)
+			{
+				pixmap->data = static_cast<char*>(src.second->get_pixels());
+
+				XPutImage(display, window, gc, pixmap, 0, 0, 0, 0, m_width, m_height);
+				XFlush(display);
+
+				src.second->free_pixels();
+			}
+
+			//Release reference
+			src.first = false;
+			return VK_SUCCESS;
+		}
+	#else
+
+	class swapchain_Wayland : public native_swapchain_base
+	{
+
+	public:
+		swapchain_Wayland(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM)
+			: native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format)
+		{}
+
+		~swapchain_Wayland() {}
+
+		bool init() override
+		{
+			fmt::throw_exception("Native Wayland swapchain is not implemented yet!");
+		}
+
+		void create(display_handle_t& window_handle) override
+		{
+			fmt::throw_exception("Native Wayland swapchain is not implemented yet!");
+		}
+
+		void destroy(bool full = true) override
+		{
+			fmt::throw_exception("Native Wayland swapchain is not implemented yet!");
+		}
+
+		VkResult present(VkSemaphore /*semaphore*/, u32 index) override
+		{
+			fmt::throw_exception("Native Wayland swapchain is not implemented yet!");
+		}
+	#endif
+
+		VkResult acquire_next_swapchain_image(VkSemaphore /*semaphore*/, u64 /*timeout*/, u32* result) override
+		{
+			u32 index = 0;
+			for (auto& p : swapchain_images)
+			{
+				if (!p.first)
+				{
+					p.first = true;
+					*result = index;
+					return VK_SUCCESS;
+				}
+
+				++index;
+			}
+
+			return VK_NOT_READY;
+		}
+
+		void end_frame(command_buffer& cmd, u32 index) override
+		{
+			swapchain_images[index].second->do_dma_transfer(cmd);
+		}
+
+		VkImage get_image(u32 index) override
+		{
+			return swapchain_images[index].second->value;
+		}
+
+		VkImageLayout get_optimal_present_layout() override
+		{
+			return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+		}
+
+	protected:
+		void init_swapchain_images(render_device& dev, u32 preferred_count) override
+		{
+			swapchain_images.resize(preferred_count);
+			for (auto& img : swapchain_images)
+			{
+				img.second = std::make_unique<swapchain_image_RPCS3>(dev, dev.get_memory_mapping(), m_width, m_height);
+				img.first = false;
+			}
+		}
+	};
+
+	class swapchain_WSI : public WSI_swapchain_base
+	{
+		VkSurfaceKHR m_surface = VK_NULL_HANDLE;
+		VkColorSpaceKHR m_color_space = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
+		VkSwapchainKHR m_vk_swapchain = nullptr;
+
+		PFN_vkCreateSwapchainKHR _vkCreateSwapchainKHR = nullptr;
+		PFN_vkDestroySwapchainKHR _vkDestroySwapchainKHR = nullptr;
+		PFN_vkGetSwapchainImagesKHR _vkGetSwapchainImagesKHR = nullptr;
+		PFN_vkAcquireNextImageKHR _vkAcquireNextImageKHR = nullptr;
+		PFN_vkQueuePresentKHR _vkQueuePresentKHR = nullptr;
+
+		bool m_wm_reports_flag = false;
+
+	protected:
+		void init_swapchain_images(render_device& dev, u32 /*preferred_count*/ = 0) override
+		{
+			u32 nb_swap_images = 0;
+			_vkGetSwapchainImagesKHR(dev, m_vk_swapchain, &nb_swap_images, nullptr);
+
+			if (!nb_swap_images) fmt::throw_exception("Driver returned 0 images for swapchain");
+
+			std::vector<VkImage> vk_images;
+			vk_images.resize(nb_swap_images);
+			_vkGetSwapchainImagesKHR(dev, m_vk_swapchain, &nb_swap_images, vk_images.data());
+
+			swapchain_images.resize(nb_swap_images);
+			for (u32 i = 0; i < nb_swap_images; ++i)
+			{
+				swapchain_images[i].value = vk_images[i];
+			}
+		}
+
+	public:
+		swapchain_WSI(vk::physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format, VkSurfaceKHR surface, VkColorSpaceKHR color_space, bool force_wm_reporting_off)
+			: WSI_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format)
+		{
+			_vkCreateSwapchainKHR = reinterpret_cast<PFN_vkCreateSwapchainKHR>(vkGetDeviceProcAddr(dev, "vkCreateSwapchainKHR"));
+			_vkDestroySwapchainKHR = reinterpret_cast<PFN_vkDestroySwapchainKHR>(vkGetDeviceProcAddr(dev, "vkDestroySwapchainKHR"));
+			_vkGetSwapchainImagesKHR = reinterpret_cast<PFN_vkGetSwapchainImagesKHR>(vkGetDeviceProcAddr(dev, "vkGetSwapchainImagesKHR"));
+			_vkAcquireNextImageKHR = reinterpret_cast<PFN_vkAcquireNextImageKHR>(vkGetDeviceProcAddr(dev, "vkAcquireNextImageKHR"));
+			_vkQueuePresentKHR = reinterpret_cast<PFN_vkQueuePresentKHR>(vkGetDeviceProcAddr(dev, "vkQueuePresentKHR"));
+
+			m_surface = surface;
+			m_color_space = color_space;
+
+			if (!force_wm_reporting_off)
+			{
+				switch (gpu.get_driver_vendor())
+				{
+				case driver_vendor::AMD:
+				case driver_vendor::INTEL:
+				case driver_vendor::RADV:
+					break;
+				case driver_vendor::ANV:
+				case driver_vendor::NVIDIA:
+					m_wm_reports_flag = true;
+					break;
+				default:
+					break;
+				}
+			}
+		}
+
+		~swapchain_WSI() override = default;
+
+		void create(display_handle_t&) override
+		{}
+
+		void destroy(bool = true) override
+		{
+			if (VkDevice pdev = dev)
+			{
+				if (m_vk_swapchain)
+				{
+					_vkDestroySwapchainKHR(pdev, m_vk_swapchain, nullptr);
+				}
+
+				dev.destroy();
+			}
+		}
+
+		std::pair<VkSurfaceCapabilitiesKHR, bool> init_surface_capabilities()
+		{
+#ifdef _WIN32
+			if (g_cfg.video.vk.force_disable_exclusive_fullscreen_mode && dev.get_surface_capabilities_2_support())
+			{
+				HMONITOR hmonitor = MonitorFromWindow(window_handle, MONITOR_DEFAULTTOPRIMARY);
+				if (hmonitor)
+				{
+					VkSurfaceCapabilities2KHR pSurfaceCapabilities = {};
+					pSurfaceCapabilities.sType                     = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR;
+
+					VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo = {};
+					pSurfaceInfo.sType                           = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR;
+					pSurfaceInfo.surface                         = m_surface;
+
+					VkSurfaceCapabilitiesFullScreenExclusiveEXT full_screen_exclusive_capabilities = {};
+					VkSurfaceFullScreenExclusiveWin32InfoEXT full_screen_exclusive_win32_info      = {};
+					full_screen_exclusive_capabilities.sType                                       = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_FULL_SCREEN_EXCLUSIVE_EXT;
+
+					pSurfaceCapabilities.pNext = &full_screen_exclusive_capabilities;
+
+					full_screen_exclusive_win32_info.sType    = VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_WIN32_INFO_EXT;
+					full_screen_exclusive_win32_info.hmonitor = hmonitor;
+
+					pSurfaceInfo.pNext = &full_screen_exclusive_win32_info;
+
+					auto getPhysicalDeviceSurfaceCapabilities2KHR = reinterpret_cast<PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR>(
+						vkGetInstanceProcAddr(dev.gpu(), "vkGetPhysicalDeviceSurfaceCapabilities2KHR")
+					);
+					ensure(getPhysicalDeviceSurfaceCapabilities2KHR);
+					CHECK_RESULT(getPhysicalDeviceSurfaceCapabilities2KHR(dev.gpu(), &pSurfaceInfo, &pSurfaceCapabilities));
+
+					return { pSurfaceCapabilities.surfaceCapabilities, !!full_screen_exclusive_capabilities.fullScreenExclusiveSupported };
+				}
+				else
+				{
+					rsx_log.warning("Swapchain: failed to get monitor for the window");
+				}
+			}
+#endif
+			VkSurfaceCapabilitiesKHR surface_descriptors = {};
+			CHECK_RESULT(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(dev.gpu(), m_surface, &surface_descriptors));
+			return { surface_descriptors, false };
+		}
+
+		using WSI_swapchain_base::init;
+		bool init() override
+		{
+			if (dev.get_present_queue() == VK_NULL_HANDLE)
+			{
+				rsx_log.error("Cannot create WSI swapchain without a present queue");
+				return false;
+			}
+
+			VkSwapchainKHR old_swapchain = m_vk_swapchain;
+			vk::physical_device& gpu = const_cast<vk::physical_device&>(dev.gpu());
+
+			auto [surface_descriptors, should_disable_exclusive_full_screen] = init_surface_capabilities();
+
+			if (surface_descriptors.maxImageExtent.width < m_width ||
+				surface_descriptors.maxImageExtent.height < m_height)
+			{
+				rsx_log.error("Swapchain: Swapchain creation failed because dimensions cannot fit. Max = %d, %d, Requested = %d, %d",
+					surface_descriptors.maxImageExtent.width, surface_descriptors.maxImageExtent.height, m_width, m_height);
+
+				return false;
+			}
+
+			if (surface_descriptors.currentExtent.width != umax)
+			{
+				if (surface_descriptors.currentExtent.width == 0 || surface_descriptors.currentExtent.height == 0)
+				{
+					rsx_log.warning("Swapchain: Current surface extent is a null region. Is the window minimized?");
+					return false;
+				}
+
+				m_width = surface_descriptors.currentExtent.width;
+				m_height = surface_descriptors.currentExtent.height;
+			}
+
+			u32 nb_available_modes = 0;
+			CHECK_RESULT(vkGetPhysicalDeviceSurfacePresentModesKHR(gpu, m_surface, &nb_available_modes, nullptr));
+
+			std::vector<VkPresentModeKHR> present_modes(nb_available_modes);
+			CHECK_RESULT(vkGetPhysicalDeviceSurfacePresentModesKHR(gpu, m_surface, &nb_available_modes, present_modes.data()));
+
+			VkPresentModeKHR swapchain_present_mode = VK_PRESENT_MODE_FIFO_KHR;
+			std::vector<VkPresentModeKHR> preferred_modes;
+
+			if (!g_cfg.video.vk.force_fifo)
+			{
+				// List of preferred modes in decreasing desirability
+				// NOTE: Always picks "triple-buffered vsync" types if possible
+				if (!g_cfg.video.vsync)
+				{
+					preferred_modes = { VK_PRESENT_MODE_IMMEDIATE_KHR, VK_PRESENT_MODE_MAILBOX_KHR, VK_PRESENT_MODE_FIFO_RELAXED_KHR };
+				}
+			}
+
+			bool mode_found = false;
+			for (VkPresentModeKHR preferred_mode : preferred_modes)
+			{
+				//Search for this mode in supported modes
+				for (VkPresentModeKHR mode : present_modes)
+				{
+					if (mode == preferred_mode)
+					{
+						swapchain_present_mode = mode;
+						mode_found = true;
+						break;
+					}
+				}
+
+				if (mode_found)
+					break;
+			}
+
+			rsx_log.notice("Swapchain: present mode %d in use.", static_cast<int>(swapchain_present_mode));
+
+			u32 nb_swap_images = surface_descriptors.minImageCount + 1;
+			if (surface_descriptors.maxImageCount > 0)
+			{
+				//Try to negotiate for a triple buffer setup
+				//In cases where the front-buffer isnt available for present, its better to have a spare surface
+				nb_swap_images = std::max(surface_descriptors.minImageCount + 2u, 3u);
+
+				if (nb_swap_images > surface_descriptors.maxImageCount)
+				{
+					// Application must settle for fewer images than desired:
+					nb_swap_images = surface_descriptors.maxImageCount;
+				}
+			}
+
+			VkSurfaceTransformFlagBitsKHR pre_transform = surface_descriptors.currentTransform;
+			if (surface_descriptors.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR)
+				pre_transform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
+
+			VkSwapchainCreateInfoKHR swap_info = {};
+			swap_info.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
+			swap_info.surface = m_surface;
+			swap_info.minImageCount = nb_swap_images;
+			swap_info.imageFormat = m_surface_format;
+			swap_info.imageColorSpace = m_color_space;
+
+			swap_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+			swap_info.preTransform = pre_transform;
+			swap_info.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR;
+			swap_info.imageArrayLayers = 1;
+			swap_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
+			swap_info.presentMode = swapchain_present_mode;
+			swap_info.oldSwapchain = old_swapchain;
+			swap_info.clipped = true;
+
+			swap_info.imageExtent.width = std::max(m_width, surface_descriptors.minImageExtent.width);
+			swap_info.imageExtent.height = std::max(m_height, surface_descriptors.minImageExtent.height);
+
+	#ifdef _WIN32
+			VkSurfaceFullScreenExclusiveInfoEXT full_screen_exclusive_info = {};
+			if (should_disable_exclusive_full_screen)
+			{
+				full_screen_exclusive_info.sType               = VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_INFO_EXT;
+				full_screen_exclusive_info.fullScreenExclusive = VK_FULL_SCREEN_EXCLUSIVE_DISALLOWED_EXT;
+
+				swap_info.pNext = &full_screen_exclusive_info;
+			}
+
+			rsx_log.notice("Swapchain: requesting full screen exclusive mode %d.", static_cast<int>(full_screen_exclusive_info.fullScreenExclusive));
+	#endif
+
+			_vkCreateSwapchainKHR(dev, &swap_info, nullptr, &m_vk_swapchain);
+
+			if (old_swapchain)
+			{
+				if (!swapchain_images.empty())
+				{
+					swapchain_images.clear();
+				}
+
+				_vkDestroySwapchainKHR(dev, old_swapchain, nullptr);
+			}
+
+			init_swapchain_images(dev);
+			return true;
+		}
+
+		bool supports_automatic_wm_reports() const override
+		{
+			return m_wm_reports_flag;
+		}
+
+		VkResult acquire_next_swapchain_image(VkSemaphore semaphore, u64 timeout, u32* result) override
+		{
+			return vkAcquireNextImageKHR(dev, m_vk_swapchain, timeout, semaphore, VK_NULL_HANDLE, result);
+		}
+
+		void end_frame(command_buffer& /*cmd*/, u32 /*index*/) override
+		{
+		}
+
+		VkResult present(VkSemaphore semaphore, u32 image) override
+		{
+			VkPresentInfoKHR present = {};
+			present.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
+			present.pNext = nullptr;
+			present.swapchainCount = 1;
+			present.pSwapchains = &m_vk_swapchain;
+			present.pImageIndices = &image;
+
+			if (semaphore != VK_NULL_HANDLE)
+			{
+				present.waitSemaphoreCount = 1;
+				present.pWaitSemaphores = &semaphore;
+			}
+
+			return _vkQueuePresentKHR(dev.get_present_queue(), &present);
+		}
+
+		VkImage get_image(u32 index) override
+		{
+			return swapchain_images[index].value;
+		}
+
+		VkImageLayout get_optimal_present_layout() override
+		{
+			return VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+		}
+	};
+}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp
deleted file mode 100644
index 9c59b8770c..0000000000
--- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "swapchain_core.h"
-
-namespace vk
-{
-#if defined(ANDROID)
-	using swapchain_ANDROID = native_swapchain_base;
-	using swapchain_NATIVE = swapchain_ANDROID;
-
-	[[maybe_unused]] static
-	VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle, WSI_config* /*config*/)
-	{
-		VkSurfaceKHR result = VK_NULL_HANDLE;
-
-		VkWin32SurfaceCreateInfoKHR createInfo = {};
-		createInfo.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR;
-		createInfo.window = std::get<ANativeWindow *>(window_handle);
-
-		CHECK_RESULT(vkCreateAndroidSurfaceKHR(this->m_instance, &createInfo, nullptr, &result));
-		return result;
-	}
-#endif
-}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h b/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h
deleted file mode 100644
index aaf8426b9a..0000000000
--- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h
+++ /dev/null
@@ -1,227 +0,0 @@
-#pragma once
-
-#ifdef HAVE_X11
-#include <X11/Xutil.h>
-#endif
-
-#include "../../display.h"
-#include "../VulkanAPI.h"
-#include "image.h"
-
-#include <memory>
-
-namespace vk
-{
-	struct swapchain_image_WSI
-	{
-		VkImage value = VK_NULL_HANDLE;
-	};
-
-	class swapchain_image_RPCS3 : public image
-	{
-		std::unique_ptr<buffer> m_dma_buffer;
-		u32 m_width = 0;
-		u32 m_height = 0;
-
-	public:
-		swapchain_image_RPCS3(render_device& dev, const memory_type_mapping& memory_map, u32 width, u32 height);
-
-		void do_dma_transfer(command_buffer& cmd);
-
-		u32 get_required_memory_size() const;
-
-		void* get_pixels();
-
-		void free_pixels();
-	};
-
-	class swapchain_base
-	{
-	protected:
-		render_device dev;
-
-		display_handle_t window_handle{};
-		u32 m_width = 0;
-		u32 m_height = 0;
-		VkFormat m_surface_format = VK_FORMAT_B8G8R8A8_UNORM;
-
-		virtual void init_swapchain_images(render_device& dev, u32 count) = 0;
-
-	public:
-		swapchain_base(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM);
-
-		virtual ~swapchain_base() = default;
-
-		virtual void create(display_handle_t& handle) = 0;
-		virtual void destroy(bool full = true) = 0;
-		virtual bool init() = 0;
-
-		virtual u32 get_swap_image_count() const = 0;
-		virtual VkImage get_image(u32 index) = 0;
-		virtual VkResult acquire_next_swapchain_image(VkSemaphore semaphore, u64 timeout, u32* result) = 0;
-		virtual void end_frame(command_buffer& cmd, u32 index) = 0;
-		virtual VkResult present(VkSemaphore semaphore, u32 index) = 0;
-		virtual VkImageLayout get_optimal_present_layout() const = 0;
-
-		virtual bool supports_automatic_wm_reports() const
-		{
-			return false;
-		}
-
-		bool init(u32 w, u32 h)
-		{
-			m_width = w;
-			m_height = h;
-			return init();
-		}
-
-		const vk::render_device& get_device()
-		{
-			return dev;
-		}
-
-		VkFormat get_surface_format() const
-		{
-			return m_surface_format;
-		}
-
-		bool is_headless() const
-		{
-			return (dev.get_present_queue() == VK_NULL_HANDLE);
-		}
-	};
-
-	template<typename T>
-	class abstract_swapchain_impl : public swapchain_base
-	{
-	protected:
-		std::vector<T> swapchain_images;
-
-	public:
-		abstract_swapchain_impl(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM)
-			: swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format)
-		{}
-
-		~abstract_swapchain_impl() override = default;
-
-		u32 get_swap_image_count() const override
-		{
-			return ::size32(swapchain_images);
-		}
-
-		using swapchain_base::init;
-	};
-
-	using WSI_swapchain_base = abstract_swapchain_impl<swapchain_image_WSI>;
-
-	class native_swapchain_base : public abstract_swapchain_impl<std::pair<bool, std::unique_ptr<swapchain_image_RPCS3>>>
-	{
-	public:
-		using abstract_swapchain_impl::abstract_swapchain_impl;
-
-		VkResult acquire_next_swapchain_image(VkSemaphore semaphore, u64 timeout, u32* result) override;
-
-		// Clients must implement these methods to render without WSI support
-		bool init() override
-		{
-			fmt::throw_exception("Native swapchain is not implemented yet!");
-		}
-
-		void create(display_handle_t& /*window_handle*/) override
-		{
-			fmt::throw_exception("Native swapchain is not implemented yet!");
-		}
-
-		void destroy(bool /*full*/ = true) override
-		{
-			fmt::throw_exception("Native swapchain is not implemented yet!");
-		}
-
-		VkResult present(VkSemaphore /*semaphore*/, u32 /*index*/) override
-		{
-			fmt::throw_exception("Native swapchain is not implemented yet!");
-		}
-
-		// Generic accessors
-		void end_frame(command_buffer& cmd, u32 index) override
-		{
-			swapchain_images[index].second->do_dma_transfer(cmd);
-		}
-
-		VkImage get_image(u32 index) override
-		{
-			return swapchain_images[index].second->value;
-		}
-
-		VkImageLayout get_optimal_present_layout() const override
-		{
-			return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-		}
-
-	protected:
-		void init_swapchain_images(render_device& dev, u32 preferred_count) override;
-	};
-
-	class swapchain_WSI : public WSI_swapchain_base
-	{
-		VkSurfaceKHR m_surface = VK_NULL_HANDLE;
-		VkColorSpaceKHR m_color_space = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
-		VkSwapchainKHR m_vk_swapchain = nullptr;
-
-		PFN_vkCreateSwapchainKHR _vkCreateSwapchainKHR = nullptr;
-		PFN_vkDestroySwapchainKHR _vkDestroySwapchainKHR = nullptr;
-		PFN_vkGetSwapchainImagesKHR _vkGetSwapchainImagesKHR = nullptr;
-		PFN_vkAcquireNextImageKHR _vkAcquireNextImageKHR = nullptr;
-		PFN_vkQueuePresentKHR _vkQueuePresentKHR = nullptr;
-
-		bool m_wm_reports_flag = false;
-
-	protected:
-		void init_swapchain_images(render_device& dev, u32 preferred_count = 0) override;
-
-	public:
-		swapchain_WSI(vk::physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format, VkSurfaceKHR surface, VkColorSpaceKHR color_space, bool force_wm_reporting_off);
-
-		~swapchain_WSI() override = default;
-
-		void create(display_handle_t&) override
-		{}
-
-		void destroy(bool = true) override;
-
-		std::pair<VkSurfaceCapabilitiesKHR, bool> init_surface_capabilities();
-
-		using WSI_swapchain_base::init;
-		bool init() override;
-
-		bool supports_automatic_wm_reports() const override
-		{
-			return m_wm_reports_flag;
-		}
-
-		VkResult acquire_next_swapchain_image(VkSemaphore semaphore, u64 timeout, u32* result) override
-		{
-			return vkAcquireNextImageKHR(dev, m_vk_swapchain, timeout, semaphore, VK_NULL_HANDLE, result);
-		}
-
-		void end_frame(command_buffer& /*cmd*/, u32 /*index*/) override
-		{}
-
-		VkResult present(VkSemaphore semaphore, u32 image) override;
-
-		VkImage get_image(u32 index) override
-		{
-			return swapchain_images[index].value;
-		}
-
-		VkImageLayout get_optimal_present_layout() const override
-		{
-			return VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
-		}
-	};
-
-	struct WSI_config
-	{
-		bool supports_automatic_wm_reports = true;
-	};
-}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp
deleted file mode 100644
index 9e4217692d..0000000000
--- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "swapchain_core.h"
-
-namespace vk
-{
-#if defined(__APPLE__)
-	using swapchain_MacOS = native_swapchain_base;
-	using swapchain_NATIVE = swapchain_MacOS;
-
-	[[maybe_unused]] static
-	VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle, WSI_config* /*config*/)
-	{
-		VkSurfaceKHR result = VK_NULL_HANDLE;
-		VkMacOSSurfaceCreateInfoMVK createInfo = {};
-		createInfo.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK;
-		createInfo.pView = window_handle;
-
-		CHECK_RESULT(vkCreateMacOSSurfaceMVK(vk_instance, &createInfo, NULL, &result));
-		return result;
-	}
-#endif
-}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp
deleted file mode 100644
index ec893da8e8..0000000000
--- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#pragma once
-
-#include "swapchain_core.h"
-
-#ifdef HAVE_X11
-#include <X11/Xutil.h>
-#endif
-
-namespace vk
-{
-#if defined(HAVE_X11)
-
-	class swapchain_X11 : public native_swapchain_base
-	{
-		Display* display = nullptr;
-		Window window = 0;
-		XImage* pixmap = nullptr;
-		GC gc = nullptr;
-		int bit_depth = 24;
-
-	public:
-		swapchain_X11(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM)
-			: native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format)
-		{}
-
-		~swapchain_X11() override = default;
-
-		bool init() override
-		{
-			if (pixmap)
-				destroy(false);
-
-			Window root;
-			int x, y;
-			u32 w = 0, h = 0, border, depth;
-
-			if (XGetGeometry(display, window, &root, &x, &y, &w, &h, &border, &depth))
-			{
-				m_width = w;
-				m_height = h;
-				bit_depth = depth;
-			}
-
-			if (m_width == 0 || m_height == 0)
-			{
-				rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height);
-				return false;
-			}
-
-			XVisualInfo visual{};
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-			if (!XMatchVisualInfo(display, DefaultScreen(display), bit_depth, TrueColor, &visual))
-#pragma GCC diagnostic pop
-			{
-				rsx_log.error("Could not find matching visual info!");
-				return false;
-			}
-
-			pixmap = XCreateImage(display, visual.visual, visual.depth, ZPixmap, 0, nullptr, m_width, m_height, 32, 0);
-			init_swapchain_images(dev, 3);
-			return true;
-		}
-
-		void create(display_handle_t& window_handle) override
-		{
-			std::visit([&](auto&& p)
-				{
-					using T = std::decay_t<decltype(p)>;
-					if constexpr (std::is_same_v<T, std::pair<Display*, Window>>)
-					{
-						display = p.first;
-						window = p.second;
-					}
-				}, window_handle);
-
-			if (display == NULL)
-			{
-				rsx_log.fatal("Could not create virtual display on this window protocol (Wayland?)");
-				return;
-			}
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-			gc = DefaultGC(display, DefaultScreen(display));
-#pragma GCC diagnostic pop
-		}
-
-		void destroy(bool full = true) override
-		{
-			pixmap->data = nullptr;
-			XDestroyImage(pixmap);
-			pixmap = NULL;
-
-			swapchain_images.clear();
-
-			if (full)
-				dev.destroy();
-		}
-
-		VkResult present(VkSemaphore /*semaphore*/, u32 index) override
-		{
-			auto& src = swapchain_images[index];
-			if (pixmap)
-			{
-				pixmap->data = static_cast<char*>(src.second->get_pixels());
-
-				XPutImage(display, window, gc, pixmap, 0, 0, 0, 0, m_width, m_height);
-				XFlush(display);
-
-				src.second->free_pixels();
-			}
-
-			//Release reference
-			src.first = false;
-			return VK_SUCCESS;
-		}
-	};
-
-	using swapchain_NATIVE = swapchain_X11;
-
-#endif
-
-#if defined(HAVE_WAYLAND)
-	using swapchain_Wayland = native_swapchain_base;
-
-#ifndef HAVE_X11
-	using swapchain_NATIVE = swapchain_Wayland;
-#endif
-
-#endif
-
-	[[maybe_unused]] static
-	VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle, WSI_config* config)
-	{
-		VkSurfaceKHR result = VK_NULL_HANDLE;
-
-		std::visit([&](auto&& p)
-		{
-			using T = std::decay_t<decltype(p)>;
-
-#ifdef HAVE_X11
-			if constexpr (std::is_same_v<T, std::pair<Display*, Window>>)
-			{
-				VkXlibSurfaceCreateInfoKHR createInfo = {};
-				createInfo.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
-				createInfo.dpy = p.first;
-				createInfo.window = p.second;
-				CHECK_RESULT(vkCreateXlibSurfaceKHR(vk_instance, &createInfo, nullptr, &result));
-			}
-			else
-#endif
-#ifdef HAVE_WAYLAND
-			if constexpr (std::is_same_v<T, std::pair<wl_display*, wl_surface*>>)
-			{
-				VkWaylandSurfaceCreateInfoKHR createInfo = {};
-				createInfo.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR;
-				createInfo.display = p.first;
-				createInfo.surface = p.second;
-				CHECK_RESULT(vkCreateWaylandSurfaceKHR(vk_instance, &createInfo, nullptr, &result));
-				config->supports_automatic_wm_reports = false;
-			}
-			else
-#endif
-			{
-				static_assert(std::conditional_t<true, std::false_type, T>::value, "Unhandled window_handle type in std::variant");
-			}
-		}, window_handle);
-
-		return ensure(result, "Failed to initialize Vulkan display surface");
-	}
-}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp
deleted file mode 100644
index c509d7cffa..0000000000
--- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma once
-
-#include "swapchain_core.h"
-
-namespace vk
-{
-#if defined(_WIN32)
-	class swapchain_WIN32 : public native_swapchain_base
-	{
-		HDC hDstDC = NULL;
-		HDC hSrcDC = NULL;
-		HBITMAP hDIB = NULL;
-		LPVOID hPtr = NULL;
-
-	public:
-		swapchain_WIN32(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM)
-			: native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format)
-		{}
-
-		~swapchain_WIN32() {}
-
-		bool init() override
-		{
-			if (hDIB || hSrcDC)
-				destroy(false);
-
-			RECT rect;
-			GetClientRect(window_handle, &rect);
-			m_width = rect.right - rect.left;
-			m_height = rect.bottom - rect.top;
-
-			if (m_width == 0 || m_height == 0)
-			{
-				rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height);
-				return false;
-			}
-
-			BITMAPINFO bitmap = {};
-			bitmap.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-			bitmap.bmiHeader.biWidth = m_width;
-			bitmap.bmiHeader.biHeight = m_height * -1;
-			bitmap.bmiHeader.biPlanes = 1;
-			bitmap.bmiHeader.biBitCount = 32;
-			bitmap.bmiHeader.biCompression = BI_RGB;
-
-			hSrcDC = CreateCompatibleDC(hDstDC);
-			hDIB = CreateDIBSection(hSrcDC, &bitmap, DIB_RGB_COLORS, &hPtr, NULL, 0);
-			SelectObject(hSrcDC, hDIB);
-			init_swapchain_images(dev, 3);
-			return true;
-		}
-
-		void create(display_handle_t& handle) override
-		{
-			window_handle = handle;
-			hDstDC = GetDC(handle);
-		}
-
-		void destroy(bool full = true) override
-		{
-			DeleteObject(hDIB);
-			DeleteDC(hSrcDC);
-			hDIB = NULL;
-			hSrcDC = NULL;
-
-			swapchain_images.clear();
-
-			if (full)
-			{
-				ReleaseDC(window_handle, hDstDC);
-				hDstDC = NULL;
-
-				dev.destroy();
-			}
-		}
-
-		VkResult present(VkSemaphore /*semaphore*/, u32 image) override
-		{
-			auto& src = swapchain_images[image];
-			GdiFlush();
-
-			if (hSrcDC)
-			{
-				memcpy(hPtr, src.second->get_pixels(), src.second->get_required_memory_size());
-				BitBlt(hDstDC, 0, 0, m_width, m_height, hSrcDC, 0, 0, SRCCOPY);
-				src.second->free_pixels();
-			}
-
-			src.first = false;
-			return VK_SUCCESS;
-		}
-	};
-
-	using swapchain_NATIVE = swapchain_WIN32;
-
-	[[maybe_unused]] static
-	VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle, WSI_config* /*config*/)
-	{
-		HINSTANCE hInstance = NULL;
-		VkSurfaceKHR result = VK_NULL_HANDLE;
-
-		VkWin32SurfaceCreateInfoKHR createInfo = {};
-		createInfo.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR;
-		createInfo.hinstance = hInstance;
-		createInfo.hwnd = window_handle;
-		CHECK_RESULT(vkCreateWin32SurfaceKHR(vk_instance, &createInfo, NULL, &result));
-		return result;
-	}
-#endif
-}
diff --git a/rpcs3/Emu/RSX/VK/vkutils/sync.cpp b/rpcs3/Emu/RSX/VK/vkutils/sync.cpp
index 322e06460f..874217545a 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/sync.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/sync.cpp
@@ -2,7 +2,6 @@
 #include "buffer_object.h"
 #include "commands.h"
 #include "device.h"
-#include "garbage_collector.h"
 #include "sync.h"
 #include "shared.h"
 
@@ -13,140 +12,10 @@
 
 namespace vk
 {
-	namespace globals
-	{
-		static std::unique_ptr<gpu_debug_marker_pool> g_gpu_debug_marker_pool;
-		static std::unique_ptr<gpu_label_pool> g_gpu_label_pool;
+#ifdef _MSC_VER
+	extern "C" void _mm_pause();
+#endif
 
-		gpu_debug_marker_pool& get_shared_marker_pool(const vk::render_device& dev)
-		{
-			if (!g_gpu_debug_marker_pool)
-			{
-				g_gpu_debug_marker_pool = std::make_unique<gpu_debug_marker_pool>(dev, 65536);
-				vk::get_gc()->add_exit_callback([]()
-				{
-					g_gpu_debug_marker_pool.reset();
-				});
-			}
-
-			return *g_gpu_debug_marker_pool;
-		}
-
-		gpu_label_pool& get_shared_label_pool(const vk::render_device& dev)
-		{
-			if (!g_gpu_label_pool)
-			{
-				g_gpu_label_pool = std::make_unique<gpu_label_pool>(dev, 65536);
-				vk::get_gc()->add_exit_callback([]()
-				{
-					g_gpu_label_pool.reset();
-				});
-			}
-
-			return *g_gpu_label_pool;
-		}
-	}
-
-	// Util
-	namespace v1_utils
-	{
-		VkPipelineStageFlags gather_src_stages(const VkDependencyInfoKHR& dependency)
-		{
-			VkPipelineStageFlags stages = VK_PIPELINE_STAGE_NONE;
-			for (u32 i = 0; i < dependency.bufferMemoryBarrierCount; ++i)
-			{
-				stages |= dependency.pBufferMemoryBarriers[i].srcStageMask;
-			}
-			for (u32 i = 0; i < dependency.imageMemoryBarrierCount; ++i)
-			{
-				stages |= dependency.pImageMemoryBarriers[i].srcStageMask;
-			}
-			for (u32 i = 0; i < dependency.memoryBarrierCount; ++i)
-			{
-				stages |= dependency.pMemoryBarriers[i].srcStageMask;
-			}
-			return stages;
-		}
-
-		VkPipelineStageFlags gather_dst_stages(const VkDependencyInfoKHR& dependency)
-		{
-			VkPipelineStageFlags stages = VK_PIPELINE_STAGE_NONE;
-			for (u32 i = 0; i < dependency.bufferMemoryBarrierCount; ++i)
-			{
-				stages |= dependency.pBufferMemoryBarriers[i].dstStageMask;
-			}
-			for (u32 i = 0; i < dependency.imageMemoryBarrierCount; ++i)
-			{
-				stages |= dependency.pImageMemoryBarriers[i].dstStageMask;
-			}
-			for (u32 i = 0; i < dependency.memoryBarrierCount; ++i)
-			{
-				stages |= dependency.pMemoryBarriers[i].dstStageMask;
-			}
-			return stages;
-		}
-
-		auto get_memory_barriers(const VkDependencyInfoKHR& dependency)
-		{
-			std::vector<VkMemoryBarrier> result;
-			for (u32 i = 0; i < dependency.memoryBarrierCount; ++i)
-			{
-				result.push_back
-				({
-					VK_STRUCTURE_TYPE_MEMORY_BARRIER,
-					nullptr,
-					static_cast<VkAccessFlags>(dependency.pMemoryBarriers[i].srcAccessMask),
-					static_cast<VkAccessFlags>(dependency.pMemoryBarriers[i].dstAccessMask)
-				});
-			}
-			return result;
-		}
-
-		auto get_image_memory_barriers(const VkDependencyInfoKHR& dependency)
-		{
-			std::vector<VkImageMemoryBarrier> result;
-			for (u32 i = 0; i < dependency.imageMemoryBarrierCount; ++i)
-			{
-				result.push_back
-				({
-					VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-					nullptr,
-					static_cast<VkAccessFlags>(dependency.pImageMemoryBarriers[i].srcAccessMask),
-					static_cast<VkAccessFlags>(dependency.pImageMemoryBarriers[i].dstAccessMask),
-					dependency.pImageMemoryBarriers[i].oldLayout,
-					dependency.pImageMemoryBarriers[i].newLayout,
-					dependency.pImageMemoryBarriers[i].srcQueueFamilyIndex,
-					dependency.pImageMemoryBarriers[i].dstQueueFamilyIndex,
-					dependency.pImageMemoryBarriers[i].image,
-					dependency.pImageMemoryBarriers[i].subresourceRange
-				});
-			}
-			return result;
-		}
-
-		auto get_buffer_memory_barriers(const VkDependencyInfoKHR& dependency)
-		{
-			std::vector<VkBufferMemoryBarrier> result;
-			for (u32 i = 0; i < dependency.bufferMemoryBarrierCount; ++i)
-			{
-				result.push_back
-				({
-					VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
-					nullptr,
-					static_cast<VkAccessFlags>(dependency.pBufferMemoryBarriers[i].srcAccessMask),
-					static_cast<VkAccessFlags>(dependency.pBufferMemoryBarriers[i].dstAccessMask),
-					dependency.pBufferMemoryBarriers[i].srcQueueFamilyIndex,
-					dependency.pBufferMemoryBarriers[i].dstQueueFamilyIndex,
-					dependency.pBufferMemoryBarriers[i].buffer,
-					dependency.pBufferMemoryBarriers[i].offset,
-					dependency.pBufferMemoryBarriers[i].size
-				});
-			}
-			return result;
-		}
-	}
-
-	// Objects
 	fence::fence(VkDevice dev)
 	{
 		owner                  = dev;
@@ -179,7 +48,11 @@ namespace vk
 	{
 		while (!flushed)
 		{
-			utils::pause();
+#ifdef _MSC_VER
+			_mm_pause();
+#else
+			__builtin_ia32_pause();
+#endif
 		}
 	}
 
@@ -188,375 +61,99 @@ namespace vk
 		return (handle != VK_NULL_HANDLE);
 	}
 
-	semaphore::semaphore(const render_device& dev)
-		: m_device(dev)
-	{
-		VkSemaphoreCreateInfo info{};
-		info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
-		CHECK_RESULT(vkCreateSemaphore(m_device, &info, nullptr, &m_handle));
-	}
-
-	semaphore::~semaphore()
-	{
-		vkDestroySemaphore(m_device, m_handle, nullptr);
-	}
-
-	semaphore::operator VkSemaphore() const
-	{
-		return m_handle;
-	}
-
 	event::event(const render_device& dev, sync_domain domain)
-		: m_device(&dev), m_domain(domain)
 	{
-		m_backend = dev.get_synchronization2_support()
-			? sync_backend::events_v2
-			: sync_backend::events_v1;
-
-		if (domain == sync_domain::host &&
-			vk::get_driver_vendor() == vk::driver_vendor::AMD &&
-			vk::get_chip_family() < vk::chip_class::AMD_navi1x)
+		m_device = dev;
+		if (domain == sync_domain::gpu || dev.gpu().get_driver_vendor() != driver_vendor::AMD)
 		{
-			// Events don't work quite right on AMD drivers
-			m_backend = sync_backend::gpu_label;
-
-			m_label = std::make_unique<vk::gpu_label>(globals::get_shared_label_pool(dev));
-			return;
+			VkEventCreateInfo info
+			{
+				.sType = VK_STRUCTURE_TYPE_EVENT_CREATE_INFO,
+				.pNext = nullptr,
+				.flags = 0
+			};
+			vkCreateEvent(dev, &info, nullptr, &m_vk_event);
 		}
-
-		VkEventCreateInfo info
+		else
 		{
-			.sType = VK_STRUCTURE_TYPE_EVENT_CREATE_INFO,
-			.pNext = nullptr,
-			.flags = 0
-		};
+			// Work around AMD's broken event signals
+			m_buffer = std::make_unique<buffer>
+			(
+				dev,
+				4,
+				dev.get_memory_mapping().host_visible_coherent,
+				VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
+				VK_BUFFER_USAGE_TRANSFER_DST_BIT,
+				0,
+				VMM_ALLOCATION_POOL_SYSTEM
+			);
 
-		if (domain == sync_domain::gpu && m_backend == sync_backend::events_v2)
-		{
-			info.flags = VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR;
+			m_value = reinterpret_cast<u32*>(m_buffer->map(0, 4));
+			*m_value = 0xCAFEBABE;
 		}
-
-		CHECK_RESULT(vkCreateEvent(dev, &info, nullptr, &m_vk_event));
 	}
 
 	event::~event()
 	{
 		if (m_vk_event) [[likely]]
 		{
-			vkDestroyEvent(*m_device, m_vk_event, nullptr);
+			vkDestroyEvent(m_device, m_vk_event, nullptr);
+		}
+		else
+		{
+			m_buffer->unmap();
+			m_buffer.reset();
+			m_value = nullptr;
 		}
 	}
 
-	void event::resolve_dependencies(const command_buffer& cmd, const VkDependencyInfoKHR& dependency)
+	void event::signal(const command_buffer& cmd, VkPipelineStageFlags stages, VkAccessFlags access)
 	{
-		ensure(m_backend != sync_backend::gpu_label);
-
-		if (m_backend == sync_backend::events_v2)
+		if (m_vk_event) [[likely]]
 		{
-			_vkCmdPipelineBarrier2KHR(cmd, &dependency);
-			return;
+			vkCmdSetEvent(cmd, m_vk_event, stages);
 		}
-
-		const auto src_stages = v1_utils::gather_src_stages(dependency);
-		const auto dst_stages = v1_utils::gather_dst_stages(dependency);
-		const auto memory_barriers = v1_utils::get_memory_barriers(dependency);
-		const auto image_memory_barriers = v1_utils::get_image_memory_barriers(dependency);
-		const auto buffer_memory_barriers = v1_utils::get_buffer_memory_barriers(dependency);
-
-		vkCmdPipelineBarrier(cmd, src_stages, dst_stages, dependency.dependencyFlags,
-			::size32(memory_barriers), memory_barriers.data(),
-			::size32(buffer_memory_barriers), buffer_memory_barriers.data(),
-			::size32(image_memory_barriers), image_memory_barriers.data());
-	}
-
-	void event::signal(const command_buffer& cmd, const VkDependencyInfoKHR& dependency)
-	{
-		if (m_backend == sync_backend::gpu_label)
+		else
 		{
-			// Fallback path
-			m_label->signal(cmd, dependency);
-			return;
+			insert_global_memory_barrier(cmd, stages, VK_PIPELINE_STAGE_TRANSFER_BIT, access, VK_ACCESS_TRANSFER_WRITE_BIT);
+			vkCmdFillBuffer(cmd, m_buffer->value, 0, 4, 0xDEADBEEF);
 		}
-
-		if (m_domain != sync_domain::host)
-		{
-			// As long as host is not involved, keep things consistent.
-			// The expectation is that this will be awaited using the gpu_wait function.
-			if (m_backend == sync_backend::events_v2) [[ likely ]]
-			{
-				_vkCmdSetEvent2KHR(cmd, m_vk_event, &dependency);
-			}
-			else
-			{
-				const auto dst_stages = v1_utils::gather_dst_stages(dependency);
-				vkCmdSetEvent(cmd, m_vk_event, dst_stages);
-			}
-
-			return;
-		}
-
-		// Host sync doesn't behave intuitively with events, so we use some workarounds.
-		// 1. Resolve the actual dependencies on a pipeline barrier.
-		resolve_dependencies(cmd, dependency);
-
-		// 2. Signalling won't wait. The caller is responsible for setting up the dependencies correctly.
-		if (m_backend != sync_backend::events_v2)
-		{
-			vkCmdSetEvent(cmd, m_vk_event, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT);
-			return;
-		}
-
-		// We need a memory barrier to keep AMDVLK from hanging
-		VkMemoryBarrier2KHR mem_barrier =
-		{
-			.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR,
-			.srcStageMask = VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR,
-			.srcAccessMask = VK_ACCESS_2_MEMORY_READ_BIT | VK_ACCESS_2_MEMORY_WRITE_BIT
-		};
-
-		// Empty dependency that does nothing
-		VkDependencyInfoKHR empty_dependency
-		{
-			.sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR,
-			.memoryBarrierCount = 1,
-			.pMemoryBarriers = &mem_barrier
-		};
-
-		_vkCmdSetEvent2KHR(cmd, m_vk_event, &empty_dependency);
 	}
 
 	void event::host_signal() const
 	{
-		if (m_backend != sync_backend::gpu_label) [[ likely ]]
-		{
-			vkSetEvent(*m_device, m_vk_event);
-			return;
-		}
-
-		m_label->set();
+		ensure(m_vk_event);
+		vkSetEvent(m_device, m_vk_event);
 	}
 
-	void event::gpu_wait(const command_buffer& cmd, const VkDependencyInfoKHR& dependency) const
+	void event::gpu_wait(const command_buffer& cmd) const
 	{
-		ensure(m_domain != sync_domain::host);
-
-		if (m_backend == sync_backend::events_v2) [[ likely ]]
-		{
-			_vkCmdWaitEvents2KHR(cmd, 1, &m_vk_event, &dependency);
-			return;
-		}
-
-		const auto src_stages = v1_utils::gather_src_stages(dependency);
-		const auto dst_stages = v1_utils::gather_dst_stages(dependency);
-		const auto memory_barriers = v1_utils::get_memory_barriers(dependency);
-		const auto image_memory_barriers = v1_utils::get_image_memory_barriers(dependency);
-		const auto buffer_memory_barriers = v1_utils::get_buffer_memory_barriers(dependency);
-
-		vkCmdWaitEvents(cmd,
-			1, &m_vk_event,
-			src_stages, dst_stages,
-			::size32(memory_barriers), memory_barriers.data(),
-			::size32(buffer_memory_barriers), buffer_memory_barriers.data(),
-			::size32(image_memory_barriers), image_memory_barriers.data());
+		ensure(m_vk_event);
+		vkCmdWaitEvents(cmd, 1, &m_vk_event, 0, 0, 0, nullptr, 0, nullptr, 0, nullptr);
 	}
 
 	void event::reset() const
 	{
-		if (m_backend != sync_backend::gpu_label) [[ likely ]]
+		if (m_vk_event) [[likely]]
 		{
-			vkResetEvent(*m_device, m_vk_event);
-			return;
+			vkResetEvent(m_device, m_vk_event);
+		}
+		else
+		{
+			*m_value = 0xCAFEBABE;
 		}
-
-		m_label->reset();
 	}
 
 	VkResult event::status() const
 	{
-		if (m_backend != sync_backend::gpu_label) [[ likely ]]
+		if (m_vk_event) [[likely]]
 		{
-			return vkGetEventStatus(*m_device, m_vk_event);
-		}
-
-		return m_label->signaled() ? VK_EVENT_SET : VK_EVENT_RESET;
-	}
-
-	gpu_label_pool::gpu_label_pool(const vk::render_device& dev, u32 count)
-		: pdev(&dev), m_count(count)
-	{}
-
-	gpu_label_pool::~gpu_label_pool()
-	{
-		if (m_mapped)
-		{
-			ensure(m_buffer);
-			m_buffer->unmap();
-		}
-	}
-
-	std::tuple<VkBuffer, u64, volatile u32*> gpu_label_pool::allocate()
-	{
-		if (!m_buffer || m_offset >= m_count)
-		{
-			create_impl();
-		}
-
-		const auto out_offset = m_offset;
-		m_offset ++;
-		return { m_buffer->value, out_offset * 4, m_mapped + out_offset };
-	}
-
-	void gpu_label_pool::create_impl()
-	{
-		if (m_buffer)
-		{
-			m_buffer->unmap();
-			vk::get_gc()->dispose(m_buffer);
-		}
-
-		m_buffer = std::make_unique<buffer>
-		(
-			*pdev,
-			m_count * 4,
-			pdev->get_memory_mapping().host_visible_coherent,
-			VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
-			VK_BUFFER_USAGE_TRANSFER_DST_BIT,
-			0,
-			VMM_ALLOCATION_POOL_SYSTEM
-		);
-
-		m_mapped = reinterpret_cast<volatile u32*>(m_buffer->map(0, VK_WHOLE_SIZE));
-		m_offset = 0;
-	}
-
-	gpu_label::gpu_label(gpu_label_pool& pool)
-	{
-		std::tie(m_buffer_handle, m_buffer_offset, m_ptr) = pool.allocate();
-		reset();
-	}
-
-	gpu_label::~gpu_label()
-	{
-		m_ptr = nullptr;
-		m_buffer_offset = 0;
-		m_buffer_handle = VK_NULL_HANDLE;
-	}
-
-	void gpu_label::signal(const vk::command_buffer& cmd, const VkDependencyInfoKHR& dependency)
-	{
-		const auto src_stages = v1_utils::gather_src_stages(dependency);
-		auto dst_stages = v1_utils::gather_dst_stages(dependency);
-		auto memory_barriers = v1_utils::get_memory_barriers(dependency);
-		const auto image_memory_barriers = v1_utils::get_image_memory_barriers(dependency);
-		const auto buffer_memory_barriers = v1_utils::get_buffer_memory_barriers(dependency);
-
-		// Ensure wait before filling the label
-		dst_stages |= VK_PIPELINE_STAGE_TRANSFER_BIT;
-		if (memory_barriers.empty())
-		{
-			const VkMemoryBarrier signal_barrier =
-			{
-				.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER,
-				.srcAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,
-				.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT
-			};
-			memory_barriers.push_back(signal_barrier);
+			return vkGetEventStatus(m_device, m_vk_event);
 		}
 		else
 		{
-			auto& barrier = memory_barriers.front();
-			barrier.dstAccessMask |= VK_ACCESS_TRANSFER_WRITE_BIT;
+			return (*m_value == 0xCAFEBABE) ? VK_EVENT_RESET : VK_EVENT_SET;
 		}
-
-		vkCmdPipelineBarrier(cmd, src_stages, dst_stages, dependency.dependencyFlags,
-			::size32(memory_barriers), memory_barriers.data(),
-			::size32(buffer_memory_barriers), buffer_memory_barriers.data(),
-			::size32(image_memory_barriers), image_memory_barriers.data());
-
-		vkCmdFillBuffer(cmd, m_buffer_handle, m_buffer_offset, 4, label_constants::set_);
-	}
-
-	gpu_debug_marker::gpu_debug_marker(gpu_debug_marker_pool& pool, std::string message)
-		: gpu_label(pool), m_message(std::move(message))
-	{}
-
-	gpu_debug_marker::~gpu_debug_marker()
-	{
-		if (!m_printed)
-		{
-			dump();
-		}
-	}
-
-	void gpu_debug_marker::dump()
-	{
-		if (*m_ptr == gpu_label::label_constants::reset_)
-		{
-			rsx_log.error("DEBUG MARKER NOT REACHED: %s", m_message);
-		}
-
-		m_printed = true;
-	}
-
-	void gpu_debug_marker::dump() const
-	{
-		if (*m_ptr == gpu_label::label_constants::reset_)
-		{
-			rsx_log.error("DEBUG MARKER NOT REACHED: %s", m_message);
-		}
-		else
-		{
-			rsx_log.error("DEBUG MARKER: %s", m_message);
-		}
-	}
-
-	void gpu_debug_marker::insert(
-		const vk::render_device& dev,
-		const vk::command_buffer& cmd,
-		std::string message,
-		VkPipelineStageFlags stages,
-		VkAccessFlags access)
-	{
-		VkMemoryBarrier2KHR barrier =
-		{
-			.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR,
-			.srcStageMask = stages,
-			.srcAccessMask = access,
-			.dstStageMask = VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR,
-			.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT
-		};
-
-		VkDependencyInfoKHR dependency =
-		{
-			.sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR,
-			.memoryBarrierCount = 1,
-			.pMemoryBarriers = &barrier
-		};
-
-		auto result = std::make_unique<gpu_debug_marker>(globals::get_shared_marker_pool(dev), message);
-		result->signal(cmd, dependency);
-		vk::get_gc()->dispose(result);
-	}
-
-	debug_marker_scope::debug_marker_scope(const vk::command_buffer& cmd, const std::string& message)
-		: m_device(&cmd.get_command_pool().get_owner()), m_cb(&cmd), m_message(message), m_tag(rsx::get_shared_tag())
-	{
-		vk::gpu_debug_marker::insert(
-			*m_device,
-			*m_cb,
-			fmt::format("0x%llx: Enter %s", m_tag, m_message)
-		);
-	}
-
-	debug_marker_scope::~debug_marker_scope()
-	{
-		ensure(m_cb && m_cb->is_recording());
-
-		vk::gpu_debug_marker::insert(
-			*m_device,
-			*m_cb,
-			fmt::format("0x%x: Exit %s", m_tag, m_message)
-		);
 	}
 
 	VkResult wait_for_fence(fence* pFence, u64 timeout)
@@ -574,7 +171,6 @@ namespace vk
 				switch (status)
 				{
 				case VK_NOT_READY:
-					utils::pause();
 					continue;
 				default:
 					die_with_error(status);
@@ -589,13 +185,7 @@ namespace vk
 	VkResult wait_for_event(event* pEvent, u64 timeout)
 	{
 		// Convert timeout to TSC cycles. Timeout accuracy isn't super-important, only fast response when event is signaled (within 10us if possible)
-		const u64 freq = utils::get_tsc_freq();
-
-		if (freq)
-		{
-			timeout *= (freq / 1'000'000);
-		}
-
+		timeout *= (utils::get_tsc_freq() / 1'000'000);
 		u64 start = 0;
 
 		while (true)
@@ -613,15 +203,14 @@ namespace vk
 
 			if (timeout)
 			{
-				const auto now = freq ? utils::get_tsc() : get_system_time();
-
 				if (!start)
 				{
-					start = now;
+					start = utils::get_tsc();
 					continue;
 				}
 
-				if ((now > start) &&
+				if (const auto now = utils::get_tsc();
+					(now > start) &&
 					(now - start) > timeout)
 				{
 					rsx_log.error("[vulkan] vk::wait_for_event has timed out!");
@@ -629,7 +218,11 @@ namespace vk
 				}
 			}
 
-			utils::pause();
+#ifdef _MSC_VER
+			_mm_pause();
+#else
+			__builtin_ia32_pause();
+#endif
 		}
 	}
 }
diff --git a/rpcs3/Emu/RSX/VK/vkutils/sync.h b/rpcs3/Emu/RSX/VK/vkutils/sync.h
index 9177e84113..807546aea5 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/sync.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/sync.h
@@ -9,12 +9,10 @@
 namespace vk
 {
 	class command_buffer;
-	class gpu_label;
-	class image;
 
 	enum class sync_domain
 	{
-		host = 0,
+		any = 0,
 		gpu = 1
 	};
 
@@ -26,7 +24,6 @@ namespace vk
 
 		fence(VkDevice dev);
 		~fence();
-		fence(const fence&) = delete;
 
 		void reset();
 		void signal_flushed();
@@ -37,132 +34,23 @@ namespace vk
 
 	class event
 	{
-		enum class sync_backend
-		{
-			events_v1,
-			events_v2,
-			gpu_label
-		};
-
-		const vk::render_device* m_device = nullptr;
-		sync_domain m_domain = sync_domain::host;
-		sync_backend m_backend = sync_backend::events_v1;
-
-		// For events_v1 and events_v2
+		VkDevice m_device = VK_NULL_HANDLE;
 		VkEvent m_vk_event = VK_NULL_HANDLE;
 
-		// For gpu_label
-		std::unique_ptr<gpu_label> m_label{};
-
-		void resolve_dependencies(const command_buffer& cmd, const VkDependencyInfoKHR& dependency);
+		std::unique_ptr<buffer> m_buffer;
+		volatile u32* m_value = nullptr;
 
 	public:
 		event(const render_device& dev, sync_domain domain);
 		~event();
-		event(const event&) = delete;
 
-		void signal(const command_buffer& cmd, const VkDependencyInfoKHR& dependency);
+		void signal(const command_buffer& cmd, VkPipelineStageFlags stages, VkAccessFlags access);
 		void host_signal() const;
-		void gpu_wait(const command_buffer& cmd, const VkDependencyInfoKHR& dependency) const;
+		void gpu_wait(const command_buffer& cmd) const;
 		VkResult status() const;
 		void reset() const;
 	};
 
-	class semaphore
-	{
-		VkSemaphore m_handle = VK_NULL_HANDLE;
-		VkDevice m_device = VK_NULL_HANDLE;
-
-		semaphore() = default;
-
-	public:
-		semaphore(const render_device& dev);
-		~semaphore();
-		semaphore(const semaphore&) = delete;
-
-		operator VkSemaphore() const;
-	};
-
-	// Custom primitives
-	class gpu_label_pool
-	{
-	public:
-		gpu_label_pool(const vk::render_device& dev, u32 count);
-		virtual ~gpu_label_pool();
-
-		std::tuple<VkBuffer, u64, volatile u32*> allocate();
-
-	private:
-		void create_impl();
-
-		const vk::render_device* pdev = nullptr;
-		std::unique_ptr<buffer> m_buffer{};
-		volatile u32* m_mapped = nullptr;
-		u64 m_offset = 0;
-		u32 m_count = 0;
-	};
-
-	class gpu_label
-	{
-	protected:
-		enum label_constants : u32
-		{
-			set_ = 0xCAFEBABE,
-			reset_ = 0xDEADBEEF
-		};
-
-		VkBuffer m_buffer_handle = VK_NULL_HANDLE;
-		u64 m_buffer_offset = 0;
-		volatile u32* m_ptr = nullptr;
-
-	public:
-		gpu_label(gpu_label_pool& pool);
-		virtual ~gpu_label();
-
-		void signal(const vk::command_buffer& cmd, const VkDependencyInfoKHR& dependency);
-		void reset() { *m_ptr = label_constants::reset_; }
-		void set() { *m_ptr = label_constants::set_; }
-		bool signaled() const { return label_constants::set_ == *m_ptr; }
-	};
-
-	class gpu_debug_marker_pool : public gpu_label_pool
-	{
-		using gpu_label_pool::gpu_label_pool;
-	};
-
-	class gpu_debug_marker : public gpu_label
-	{
-		std::string m_message;
-		bool m_printed = false;
-
-	public:
-		gpu_debug_marker(gpu_debug_marker_pool& pool, std::string message);
-		~gpu_debug_marker();
-		gpu_debug_marker(const event&) = delete;
-
-		void dump();
-		void dump() const;
-
-		static void insert(
-			const vk::render_device& dev,
-			const vk::command_buffer& cmd,
-			std::string message,
-			VkPipelineStageFlags stages = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
-			VkAccessFlags access = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT);
-	};
-
-	class debug_marker_scope
-	{
-		const vk::render_device* m_device;
-		const vk::command_buffer* m_cb;
-		std::string m_message;
-		u64 m_tag;
-
-	public:
-		debug_marker_scope(const vk::command_buffer& cmd, const std::string& text);
-		~debug_marker_scope();
-	};
-
 	VkResult wait_for_fence(fence* pFence, u64 timeout = 0ull);
 	VkResult wait_for_event(event* pEvent, u64 timeout = 0ull);
 }
diff --git a/rpcs3/Emu/RSX/color_utils.h b/rpcs3/Emu/RSX/color_utils.h
deleted file mode 100644
index fd3156bd3e..0000000000
--- a/rpcs3/Emu/RSX/color_utils.h
+++ /dev/null
@@ -1,248 +0,0 @@
-#pragma once
-
-#include <util/types.hpp>
-#include <Utilities/geometry.h>
-#include "gcm_enums.h"
-#include "Utilities/StrFmt.h"
-
-namespace rsx
-{
-	struct texture_channel_remap_t
-	{
-		u32 encoded = 0xDEAD;
-		std::array<u8, 4> control_map;
-		std::array<u8, 4> channel_map;
-
-		template <typename T>
-		std::array<T, 4> remap(const std::array<T, 4>& components, T select_zero, T select_one) const
-		{
-			ensure(encoded != 0xDEAD, "Channel remap was not initialized");
-
-			std::array<T, 4> remapped{};
-			for (u8 channel = 0; channel < 4; ++channel)
-			{
-				switch (control_map[channel])
-				{
-				default:
-					[[fallthrough]];
-				case CELL_GCM_TEXTURE_REMAP_REMAP:
-					remapped[channel] = components[channel_map[channel]];
-					break;
-				case CELL_GCM_TEXTURE_REMAP_ZERO:
-					remapped[channel] = select_zero;
-					break;
-				case CELL_GCM_TEXTURE_REMAP_ONE:
-					remapped[channel] = select_one;
-					break;
-				}
-			}
-			return remapped;
-		}
-
-		template <typename T>
-			requires std::is_integral_v<T> || std::is_floating_point_v<T>
-		std::array<T, 4> remap(const std::array<T, 4>& components) const
-		{
-			return remap(components, static_cast<T>(0), static_cast<T>(1));
-		}
-
-		template <typename T>
-		color4_base<T> remap(const color4_base<T>& components)
-		{
-			const std::array<T, 4> values = { components.a, components.r, components.g, components.b };
-			const auto shuffled = remap(values, T{ 0 }, T{ 1 });
-			return color4_base<T>(shuffled[1], shuffled[2], shuffled[3], shuffled[0]);
-		}
-
-		template <typename T>
-			requires std::is_integral_v<T> || std::is_enum_v<T>
-		texture_channel_remap_t with_encoding(T encoding) const
-		{
-			texture_channel_remap_t result = *this;
-			result.encoded = encoding;
-			return result;
-		}
-	};
-
-	static const texture_channel_remap_t default_remap_vector =
-	{
-		.encoded = RSX_TEXTURE_REMAP_IDENTITY,
-		.control_map = { CELL_GCM_TEXTURE_REMAP_REMAP, CELL_GCM_TEXTURE_REMAP_REMAP, CELL_GCM_TEXTURE_REMAP_REMAP, CELL_GCM_TEXTURE_REMAP_REMAP },
-		.channel_map = { CELL_GCM_TEXTURE_REMAP_FROM_A, CELL_GCM_TEXTURE_REMAP_FROM_R, CELL_GCM_TEXTURE_REMAP_FROM_G, CELL_GCM_TEXTURE_REMAP_FROM_B }
-	};
-
-	static inline texture_channel_remap_t decode_remap_encoding(u32 remap_ctl)
-	{
-		// Remapping tables; format is A-R-G-B
-		// Remap input table. Contains channel index to read color from
-		texture_channel_remap_t result =
-		{
-			.encoded = remap_ctl
-		};
-
-		result.channel_map =
-		{
-			static_cast<u8>(remap_ctl & 0x3),
-			static_cast<u8>((remap_ctl >> 2) & 0x3),
-			static_cast<u8>((remap_ctl >> 4) & 0x3),
-			static_cast<u8>((remap_ctl >> 6) & 0x3),
-		};
-
-		// Remap control table. Controls whether the remap value is used, or force either 0 or 1
-		result.control_map =
-		{
-			static_cast<u8>((remap_ctl >> 8) & 0x3),
-			static_cast<u8>((remap_ctl >> 10) & 0x3),
-			static_cast<u8>((remap_ctl >> 12) & 0x3),
-			static_cast<u8>((remap_ctl >> 14) & 0x3),
-		};
-
-		return result;
-	}
-
-	// Convert color write mask for G8B8 to R8G8
-	static inline u32 get_g8b8_r8g8_clearmask(u32 mask)
-	{
-		u32 result = 0;
-		if (mask & RSX_GCM_CLEAR_GREEN_BIT) result |= RSX_GCM_CLEAR_GREEN_BIT;
-		if (mask & RSX_GCM_CLEAR_BLUE_BIT) result |= RSX_GCM_CLEAR_RED_BIT;
-
-		return result;
-	}
-
-	static inline void get_g8b8_r8g8_colormask(bool& red, bool/*green*/, bool& blue, bool& alpha)
-	{
-		red = blue;
-		blue = false;
-		alpha = false;
-	}
-
-	static inline void get_g8b8_clear_color(u8& red, u8 /*green*/, u8 blue, u8 /*alpha*/)
-	{
-		red = blue;
-	}
-
-	static inline u32 get_abgr8_clearmask(u32 mask)
-	{
-		u32 result = 0;
-		if (mask & RSX_GCM_CLEAR_RED_BIT) result |= RSX_GCM_CLEAR_BLUE_BIT;
-		if (mask & RSX_GCM_CLEAR_GREEN_BIT) result |= RSX_GCM_CLEAR_GREEN_BIT;
-		if (mask & RSX_GCM_CLEAR_BLUE_BIT) result |= RSX_GCM_CLEAR_RED_BIT;
-		if (mask & RSX_GCM_CLEAR_ALPHA_BIT) result |= RSX_GCM_CLEAR_ALPHA_BIT;
-		return result;
-	}
-
-	static inline void get_abgr8_colormask(bool& red, bool /*green*/, bool& blue, bool /*alpha*/)
-	{
-		std::swap(red, blue);
-	}
-
-	static inline void get_abgr8_clear_color(u8& red, u8 /*green*/, u8& blue, u8 /*alpha*/)
-	{
-		std::swap(red, blue);
-	}
-
-	template <typename T, typename U>
-		requires std::is_integral_v<T>&& std::is_integral_v<U>
-	u8 renormalize_color8(T input, U base)
-	{
-		// Base will be some POT-1 value
-		const int value = static_cast<u8>(input & base);
-		return static_cast<u8>((value * 255) / base);
-	}
-
-	static inline void get_rgb565_clear_color(u8& red, u8& green, u8& blue, u8 /*alpha*/)
-	{
-		// RSX clear color is just a memcpy, so in this case the input is ARGB8 so only BG have the 16-bit input
-		const u16 raw_value = static_cast<u16>(green) << 8 | blue;
-		blue = renormalize_color8(raw_value, 0x1f);
-		green = renormalize_color8(raw_value >> 5, 0x3f);
-		red = renormalize_color8(raw_value >> 11, 0x1f);
-	}
-
-	static inline void get_a1rgb555_clear_color(u8& red, u8& green, u8& blue, u8& alpha, u8 alpha_override)
-	{
-		// RSX clear color is just a memcpy, so in this case the input is ARGB8 so only BG have the 16-bit input
-		const u16 raw_value = static_cast<u16>(green) << 8 | blue;
-		blue = renormalize_color8(raw_value, 0x1f);
-		green = renormalize_color8(raw_value >> 5, 0x1f);
-		red = renormalize_color8(raw_value >> 10, 0x1f);
-
-		// Alpha can technically be encoded into the clear but the format normally just injects constants.
-		// Will require hardware tests when possible to determine which approach makes more sense.
-		// alpha = static_cast<u8>((raw_value & (1 << 15)) ? 255 : 0);
-		alpha = alpha_override;
-	}
-
-	static inline u32 get_b8_clearmask(u32 mask)
-	{
-		u32 result = 0;
-		if (mask & RSX_GCM_CLEAR_BLUE_BIT) result |= RSX_GCM_CLEAR_RED_BIT;
-		return result;
-	}
-
-	static inline void get_b8_colormask(bool& red, bool& green, bool& blue, bool& alpha)
-	{
-		red = blue;
-		green = false;
-		blue = false;
-		alpha = false;
-	}
-
-	static inline void get_b8_clear_color(u8& red, u8 /*green*/, u8& blue, u8 /*alpha*/)
-	{
-		std::swap(red, blue);
-	}
-
-	static inline color4f decode_border_color(u32 colorref)
-	{
-		color4f result;
-		result.b = (colorref & 0xFF) / 255.f;
-		result.g = ((colorref >> 8) & 0xFF) / 255.f;
-		result.r = ((colorref >> 16) & 0xFF) / 255.f;
-		result.a = ((colorref >> 24) & 0xFF) / 255.f;
-		return result;
-	}
-
-	static inline u32 encode_color_to_storage_key(const color4f& color)
-	{
-		const u32 r = static_cast<u8>(color.r * 255);
-		const u32 g = static_cast<u8>(color.g * 255);
-		const u32 b = static_cast<u8>(color.b * 255);
-		const u32 a = static_cast<u8>(color.a * 255);
-
-		return (a << 24) | (b << 16) | (g << 8) | r;
-	}
-
-	static inline const std::array<bool, 4> get_write_output_mask(rsx::surface_color_format format)
-	{
-		constexpr std::array<bool, 4> rgba = { true, true, true, true };
-		constexpr std::array<bool, 4> rgb = { true, true, true, false };
-		constexpr std::array<bool, 4> rg = { true, true, false, false };
-		constexpr std::array<bool, 4> r = { true, false, false, false };
-
-		switch (format)
-		{
-		case rsx::surface_color_format::a8r8g8b8:
-		case rsx::surface_color_format::a8b8g8r8:
-		case rsx::surface_color_format::w16z16y16x16:
-		case rsx::surface_color_format::w32z32y32x32:
-			return rgba;
-		case rsx::surface_color_format::x1r5g5b5_z1r5g5b5:
-		case rsx::surface_color_format::x1r5g5b5_o1r5g5b5:
-		case rsx::surface_color_format::r5g6b5:
-		case rsx::surface_color_format::x8r8g8b8_z8r8g8b8:
-		case rsx::surface_color_format::x8r8g8b8_o8r8g8b8:
-		case rsx::surface_color_format::x8b8g8r8_z8b8g8r8:
-		case rsx::surface_color_format::x8b8g8r8_o8b8g8r8:
-			return rgb;
-		case rsx::surface_color_format::g8b8:
-			return rg;
-		case rsx::surface_color_format::b8:
-		case rsx::surface_color_format::x32:
-			return r;
-		default:
-			fmt::throw_exception("Unknown surface format 0x%x", static_cast<int>(format));
-		}
-	}
-}
diff --git a/rpcs3/Emu/RSX/display.h b/rpcs3/Emu/RSX/display.h
index 191a111e75..e6d5fa657e 100644
--- a/rpcs3/Emu/RSX/display.h
+++ b/rpcs3/Emu/RSX/display.h
@@ -5,13 +5,13 @@
 #elif defined(__APPLE__)
 // nothing
 #elif defined(HAVE_X11)
-// Cannot include Xlib.h before Qt
+// Cannot include Xlib.h before Qt5
 // and we don't need all of Xlib anyway
 using Display = struct _XDisplay;
 using Window  = unsigned long;
 #endif
 
-#ifdef HAVE_WAYLAND
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
 #include <wayland-client.h>
 #endif
 
@@ -22,14 +22,12 @@ using display_handle_t = void*; // NSView
 #else
 #include <variant>
 using display_handle_t = std::variant<
-#if defined(HAVE_X11) && defined(HAVE_WAYLAND)
+#if defined(HAVE_X11) && defined(VK_USE_PLATFORM_WAYLAND_KHR)
 	std::pair<Display*, Window>, std::pair<wl_display*, wl_surface*>
 #elif defined(HAVE_X11)
 	std::pair<Display*, Window>
-#elif defined(HAVE_WAYLAND)
+#elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
 	std::pair<wl_display*, wl_surface*>
-#elif defined(ANDROID)
-	struct ANativeWindow*
 #endif
 >;
 #endif
diff --git a/rpcs3/Emu/RSX/gcm_enums.cpp b/rpcs3/Emu/RSX/gcm_enums.cpp
index 5c7d88c875..81b6369bbd 100644
--- a/rpcs3/Emu/RSX/gcm_enums.cpp
+++ b/rpcs3/Emu/RSX/gcm_enums.cpp
@@ -3,6 +3,132 @@
 
 using namespace rsx;
 
+vertex_base_type rsx::to_vertex_base_type(u8 in)
+{
+	switch (in)
+	{
+	case 0: return vertex_base_type::ub256;
+	case 1: return vertex_base_type::s1;
+	case 2: return vertex_base_type::f;
+	case 3: return vertex_base_type::sf;
+	case 4: return vertex_base_type::ub;
+	case 5: return vertex_base_type::s32k;
+	case 6: return vertex_base_type::cmp;
+	case 7: return vertex_base_type::ub256;
+	}
+	fmt::throw_exception("Unknown vertex base type %d", in);
+}
+
+primitive_type rsx::to_primitive_type(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_PRIMITIVE_POINTS: return primitive_type::points;
+	case CELL_GCM_PRIMITIVE_LINES: return primitive_type::lines;
+	case CELL_GCM_PRIMITIVE_LINE_LOOP: return primitive_type::line_loop;
+	case CELL_GCM_PRIMITIVE_LINE_STRIP: return primitive_type::line_strip;
+	case CELL_GCM_PRIMITIVE_TRIANGLES: return primitive_type::triangles;
+	case CELL_GCM_PRIMITIVE_TRIANGLE_STRIP: return primitive_type::triangle_strip;
+	case CELL_GCM_PRIMITIVE_TRIANGLE_FAN: return primitive_type::triangle_fan;
+	case CELL_GCM_PRIMITIVE_QUADS: return primitive_type::quads;
+	case CELL_GCM_PRIMITIVE_QUAD_STRIP: return primitive_type::quad_strip;
+	case CELL_GCM_PRIMITIVE_POLYGON: return primitive_type::polygon;
+	default: return primitive_type::invalid;
+	}
+}
+
+enum
+{
+	CELL_GCM_WINDOW_ORIGIN_TOP = 0,
+	CELL_GCM_WINDOW_ORIGIN_BOTTOM = 1,
+	CELL_GCM_WINDOW_PIXEL_CENTER_HALF = 0,
+	CELL_GCM_WINDOW_PIXEL_CENTER_INTEGER = 1,
+};
+
+window_origin rsx::to_window_origin(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_WINDOW_ORIGIN_TOP: return window_origin::top;
+	case CELL_GCM_WINDOW_ORIGIN_BOTTOM: return window_origin::bottom;
+	}
+	fmt::throw_exception("Unknown window origin modifier 0x%x", in);
+}
+
+window_pixel_center rsx::to_window_pixel_center(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_WINDOW_PIXEL_CENTER_HALF: return window_pixel_center::half;
+	case CELL_GCM_WINDOW_PIXEL_CENTER_INTEGER: return window_pixel_center::integer;
+	}
+	fmt::throw_exception("Unknown window pixel center 0x%x", in);
+}
+
+comparison_function rsx::to_comparison_function(u16 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_TEXTURE_ZFUNC_NEVER & CELL_GCM_SCULL_SFUNC_NEVER:
+	case CELL_GCM_NEVER:
+		return comparison_function::never;
+
+	case CELL_GCM_TEXTURE_ZFUNC_LESS & CELL_GCM_SCULL_SFUNC_LESS:
+	case CELL_GCM_LESS:
+		return comparison_function::less;
+
+	case CELL_GCM_TEXTURE_ZFUNC_EQUAL & CELL_GCM_SCULL_SFUNC_EQUAL:
+	case CELL_GCM_EQUAL:
+		return comparison_function::equal;
+
+	case CELL_GCM_TEXTURE_ZFUNC_LEQUAL & CELL_GCM_SCULL_SFUNC_LEQUAL:
+	case CELL_GCM_LEQUAL:
+		return comparison_function::less_or_equal;
+
+	case CELL_GCM_TEXTURE_ZFUNC_GREATER & CELL_GCM_SCULL_SFUNC_GREATER:
+	case CELL_GCM_GREATER:
+		return comparison_function::greater;
+
+	case CELL_GCM_TEXTURE_ZFUNC_NOTEQUAL & CELL_GCM_SCULL_SFUNC_NOTEQUAL:
+	case CELL_GCM_NOTEQUAL:
+		return comparison_function::not_equal;
+
+	case CELL_GCM_TEXTURE_ZFUNC_GEQUAL & CELL_GCM_SCULL_SFUNC_GEQUAL:
+	case CELL_GCM_GEQUAL:
+		return comparison_function::greater_or_equal;
+
+	case CELL_GCM_TEXTURE_ZFUNC_ALWAYS & CELL_GCM_SCULL_SFUNC_ALWAYS:
+	case CELL_GCM_ALWAYS:
+		return comparison_function::always;
+	}
+	fmt::throw_exception("Unknown comparison function 0x%x", in);
+}
+
+fog_mode rsx::to_fog_mode(u32 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_FOG_MODE_LINEAR: return fog_mode::linear;
+	case CELL_GCM_FOG_MODE_EXP: return fog_mode::exponential;
+	case CELL_GCM_FOG_MODE_EXP2: return fog_mode::exponential2;
+	case CELL_GCM_FOG_MODE_EXP_ABS: return fog_mode::exponential_abs;
+	case CELL_GCM_FOG_MODE_EXP2_ABS: return fog_mode::exponential2_abs;
+	case CELL_GCM_FOG_MODE_LINEAR_ABS: return fog_mode::linear_abs;
+	}
+	fmt::throw_exception("Unknown fog mode 0x%x", in);
+}
+
+texture_dimension rsx::to_texture_dimension(u8 in)
+{
+	switch (in)
+	{
+	case 1: return texture_dimension::dimension1d;
+	case 2: return texture_dimension::dimension2d;
+	case 3: return texture_dimension::dimension3d;
+	}
+	fmt::throw_exception("Unknown texture dimension %d", in);
+}
+
 template <>
 void fmt_class_string<CellGcmLocation>::format(std::string& out, u64 arg)
 {
@@ -234,6 +360,7 @@ void fmt_class_string<primitive_type>::format(std::string& out, u64 arg)
 	{
 		switch (value)
 		{
+		case primitive_type::invalid: return "";
 		case primitive_type::points: return "Points";
 		case primitive_type::lines: return "Lines";
 		case primitive_type::line_loop: return "Line_loop";
@@ -263,8 +390,9 @@ void fmt_class_string<blit_engine::transfer_operation>::format(std::string& out,
 		case blit_engine::transfer_operation::srccopy: return "srccopy";
 		case blit_engine::transfer_operation::srccopy_and: return "srccopy_and";
 		case blit_engine::transfer_operation::srccopy_premult: return "srccopy_premult";
-		default: return unknown;
 		}
+
+		return unknown;
 	});
 }
 
@@ -288,8 +416,9 @@ void fmt_class_string<blit_engine::transfer_source_format>::format(std::string&
 		case blit_engine::transfer_source_format::x8r8g8b8: return "x8r8g8b8";
 		case blit_engine::transfer_source_format::y8: return "y8";
 		case blit_engine::transfer_source_format::yb8cr8ya8cb8: return "yb8cr8ya8cb8";
-		default: return unknown;
 		}
+
+		return unknown;
 	});
 }
 
@@ -318,8 +447,9 @@ void fmt_class_string<blit_engine::transfer_destination_format>::format(std::str
 		case blit_engine::transfer_destination_format::a8r8g8b8: return "a8r8g8b8";
 		case blit_engine::transfer_destination_format::r5g6b5: return "r5g6b5";
 		case blit_engine::transfer_destination_format::y32: return "y32";
-		default: return unknown;
 		}
+
+		return unknown;
 	});
 }
 
@@ -406,13 +536,13 @@ void fmt_class_string<blend_equation>::format(std::string& out, u64 arg)
 		switch (value)
 		{
 		case blend_equation::add: return "Add";
-		case blend_equation::subtract: return "Subtract";
-		case blend_equation::reverse_subtract: return "Reverse_subtract";
+		case blend_equation::substract: return "Substract";
+		case blend_equation::reverse_substract: return "Reverse_substract";
 		case blend_equation::min: return "Min";
 		case blend_equation::max: return "Max";
 		case blend_equation::add_signed: return "Add_signed";
 		case blend_equation::reverse_add_signed: return "Reverse_add_signed";
-		case blend_equation::reverse_subtract_signed: return "Reverse_subtract_signed";
+		case blend_equation::reverse_substract_signed: return "Reverse_substract_signed";
 		}
 
 		return unknown;
@@ -610,21 +740,490 @@ void fmt_class_string<texture_max_anisotropy>::format(std::string& out, u64 arg)
 
 namespace rsx
 {
-	enum class boolean_to_string_t : u8;
-}
-
-template <>
-void fmt_class_string<boolean_to_string_t>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](boolean_to_string_t value)
+	std::string print_boolean(bool b)
 	{
-		switch (value)
-		{
-		case boolean_to_string_t{+true}: return "true";
-		case boolean_to_string_t{+false}: return "false";
-		default: break; // TODO: This is technically unreachable but need needs to be reachable when value is not 1 or 0
-		}
+		return b ? "enabled" : "disabled";
+	}
+} // end namespace rsx
 
-		return unknown;
-	});
+enum
+{
+	// Surface Target
+	CELL_GCM_SURFACE_TARGET_NONE = 0,
+	CELL_GCM_SURFACE_TARGET_0 = 1,
+	CELL_GCM_SURFACE_TARGET_1 = 2,
+	CELL_GCM_SURFACE_TARGET_MRT1 = 0x13,
+	CELL_GCM_SURFACE_TARGET_MRT2 = 0x17,
+	CELL_GCM_SURFACE_TARGET_MRT3 = 0x1f,
+
+	// Surface Depth
+	CELL_GCM_SURFACE_Z16 = 1,
+	CELL_GCM_SURFACE_Z24S8 = 2,
+
+	// Surface Antialias
+	CELL_GCM_SURFACE_CENTER_1 = 0,
+	CELL_GCM_SURFACE_DIAGONAL_CENTERED_2 = 3,
+	CELL_GCM_SURFACE_SQUARE_CENTERED_4 = 4,
+	CELL_GCM_SURFACE_SQUARE_ROTATED_4 = 5,
+
+	// Surface format
+	CELL_GCM_SURFACE_X1R5G5B5_Z1R5G5B5 = 1,
+	CELL_GCM_SURFACE_X1R5G5B5_O1R5G5B5 = 2,
+	CELL_GCM_SURFACE_R5G6B5 = 3,
+	CELL_GCM_SURFACE_X8R8G8B8_Z8R8G8B8 = 4,
+	CELL_GCM_SURFACE_X8R8G8B8_O8R8G8B8 = 5,
+	CELL_GCM_SURFACE_A8R8G8B8 = 8,
+	CELL_GCM_SURFACE_B8 = 9,
+	CELL_GCM_SURFACE_G8B8 = 10,
+	CELL_GCM_SURFACE_F_W16Z16Y16X16 = 11,
+	CELL_GCM_SURFACE_F_W32Z32Y32X32 = 12,
+	CELL_GCM_SURFACE_F_X32 = 13,
+	CELL_GCM_SURFACE_X8B8G8R8_Z8B8G8R8 = 14,
+	CELL_GCM_SURFACE_X8B8G8R8_O8B8G8R8 = 15,
+	CELL_GCM_SURFACE_A8B8G8R8 = 16,
+
+	// Wrap
+	CELL_GCM_TEXTURE_WRAP = 1,
+	CELL_GCM_TEXTURE_MIRROR = 2,
+	CELL_GCM_TEXTURE_CLAMP_TO_EDGE = 3,
+	CELL_GCM_TEXTURE_BORDER = 4,
+	CELL_GCM_TEXTURE_CLAMP = 5,
+	CELL_GCM_TEXTURE_MIRROR_ONCE_CLAMP_TO_EDGE = 6,
+	CELL_GCM_TEXTURE_MIRROR_ONCE_BORDER = 7,
+	CELL_GCM_TEXTURE_MIRROR_ONCE_CLAMP = 8,
+
+	// Max Anisotropy
+	CELL_GCM_TEXTURE_MAX_ANISO_1 = 0,
+	CELL_GCM_TEXTURE_MAX_ANISO_2 = 1,
+	CELL_GCM_TEXTURE_MAX_ANISO_4 = 2,
+	CELL_GCM_TEXTURE_MAX_ANISO_6 = 3,
+	CELL_GCM_TEXTURE_MAX_ANISO_8 = 4,
+	CELL_GCM_TEXTURE_MAX_ANISO_10 = 5,
+	CELL_GCM_TEXTURE_MAX_ANISO_12 = 6,
+	CELL_GCM_TEXTURE_MAX_ANISO_16 = 7,
+
+	// Texture Filter
+	CELL_GCM_TEXTURE_NEAREST = 1,
+	CELL_GCM_TEXTURE_LINEAR = 2,
+	CELL_GCM_TEXTURE_NEAREST_NEAREST = 3,
+	CELL_GCM_TEXTURE_LINEAR_NEAREST = 4,
+	CELL_GCM_TEXTURE_NEAREST_LINEAR = 5,
+	CELL_GCM_TEXTURE_LINEAR_LINEAR = 6,
+	CELL_GCM_TEXTURE_CONVOLUTION_MIN = 7,
+	CELL_GCM_TEXTURE_CONVOLUTION_MAG = 4,
+};
+
+texture_wrap_mode rsx::to_texture_wrap_mode(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_TEXTURE_WRAP: return texture_wrap_mode::wrap;
+	case CELL_GCM_TEXTURE_MIRROR: return texture_wrap_mode::mirror;
+	case CELL_GCM_TEXTURE_CLAMP_TO_EDGE: return texture_wrap_mode::clamp_to_edge;
+	case CELL_GCM_TEXTURE_BORDER: return texture_wrap_mode::border;
+	case CELL_GCM_TEXTURE_CLAMP: return texture_wrap_mode::clamp;
+	case CELL_GCM_TEXTURE_MIRROR_ONCE_CLAMP_TO_EDGE: return texture_wrap_mode::mirror_once_clamp_to_edge;
+	case CELL_GCM_TEXTURE_MIRROR_ONCE_BORDER: return texture_wrap_mode::mirror_once_border;
+	case CELL_GCM_TEXTURE_MIRROR_ONCE_CLAMP: return texture_wrap_mode::mirror_once_clamp;
+	}
+	fmt::throw_exception("Unknown wrap mode 0x%x", in);
+}
+
+texture_max_anisotropy rsx::to_texture_max_anisotropy(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_TEXTURE_MAX_ANISO_1: return texture_max_anisotropy::x1;
+	case CELL_GCM_TEXTURE_MAX_ANISO_2: return texture_max_anisotropy::x2;
+	case CELL_GCM_TEXTURE_MAX_ANISO_4: return texture_max_anisotropy::x4;
+	case CELL_GCM_TEXTURE_MAX_ANISO_6: return texture_max_anisotropy::x6;
+	case CELL_GCM_TEXTURE_MAX_ANISO_8: return texture_max_anisotropy::x8;
+	case CELL_GCM_TEXTURE_MAX_ANISO_10: return texture_max_anisotropy::x10;
+	case CELL_GCM_TEXTURE_MAX_ANISO_12: return texture_max_anisotropy::x12;
+	case CELL_GCM_TEXTURE_MAX_ANISO_16: return texture_max_anisotropy::x16;
+	}
+	fmt::throw_exception("Unknown anisotropy max mode 0x%x", in);
+}
+
+texture_minify_filter rsx::to_texture_minify_filter(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_TEXTURE_NEAREST: return texture_minify_filter::nearest;
+	case CELL_GCM_TEXTURE_LINEAR: return texture_minify_filter::linear;
+	case CELL_GCM_TEXTURE_NEAREST_NEAREST: return texture_minify_filter::nearest_nearest;
+	case CELL_GCM_TEXTURE_LINEAR_NEAREST: return texture_minify_filter::linear_nearest;
+	case CELL_GCM_TEXTURE_NEAREST_LINEAR: return texture_minify_filter::nearest_linear;
+	case CELL_GCM_TEXTURE_LINEAR_LINEAR: return texture_minify_filter::linear_linear;
+	case CELL_GCM_TEXTURE_CONVOLUTION_MIN: return texture_minify_filter::linear_linear;
+	}
+	fmt::throw_exception("Unknown minify filter 0x%x", in);
+}
+
+
+texture_magnify_filter rsx::to_texture_magnify_filter(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_TEXTURE_NEAREST: return texture_magnify_filter::nearest;
+	case CELL_GCM_TEXTURE_LINEAR: return texture_magnify_filter::linear;
+	case CELL_GCM_TEXTURE_CONVOLUTION_MAG: return texture_magnify_filter::convolution_mag;
+	}
+	fmt::throw_exception("Unknown magnify filter 0x%x", in);
+}
+
+surface_target rsx::to_surface_target(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_SURFACE_TARGET_NONE: return surface_target::none;
+	case CELL_GCM_SURFACE_TARGET_0: return surface_target::surface_a;
+	case CELL_GCM_SURFACE_TARGET_1: return surface_target::surface_b;
+	case CELL_GCM_SURFACE_TARGET_MRT1: return surface_target::surfaces_a_b;
+	case CELL_GCM_SURFACE_TARGET_MRT2: return surface_target::surfaces_a_b_c;
+	case CELL_GCM_SURFACE_TARGET_MRT3: return surface_target::surfaces_a_b_c_d;
+	}
+	fmt::throw_exception("Unknown surface target 0x%x", in);
+}
+
+surface_depth_format rsx::to_surface_depth_format(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_SURFACE_Z16: return surface_depth_format::z16;
+	case CELL_GCM_SURFACE_Z24S8: return surface_depth_format::z24s8;
+	}
+	fmt::throw_exception("Unknown surface depth format 0x%x", in);
+}
+
+surface_antialiasing rsx::to_surface_antialiasing(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_SURFACE_CENTER_1: return surface_antialiasing::center_1_sample;
+	case CELL_GCM_SURFACE_DIAGONAL_CENTERED_2: return surface_antialiasing::diagonal_centered_2_samples;
+	case CELL_GCM_SURFACE_SQUARE_CENTERED_4: return surface_antialiasing::square_centered_4_samples;
+	case CELL_GCM_SURFACE_SQUARE_ROTATED_4: return surface_antialiasing::square_rotated_4_samples;
+	}
+	fmt::throw_exception("Unknown surface antialiasing format 0x%x", in);
+}
+
+surface_color_format rsx::to_surface_color_format(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_SURFACE_X1R5G5B5_Z1R5G5B5: return surface_color_format::x1r5g5b5_z1r5g5b5;
+	case CELL_GCM_SURFACE_X1R5G5B5_O1R5G5B5: return surface_color_format::x1r5g5b5_o1r5g5b5;
+	case CELL_GCM_SURFACE_R5G6B5: return surface_color_format::r5g6b5;
+	case CELL_GCM_SURFACE_X8R8G8B8_Z8R8G8B8: return surface_color_format::x8r8g8b8_z8r8g8b8;
+	case CELL_GCM_SURFACE_X8R8G8B8_O8R8G8B8: return surface_color_format::x8r8g8b8_o8r8g8b8;
+	case CELL_GCM_SURFACE_A8R8G8B8: return surface_color_format::a8r8g8b8;
+	case CELL_GCM_SURFACE_B8: return surface_color_format::b8;
+	case CELL_GCM_SURFACE_G8B8: return surface_color_format::g8b8;
+	case CELL_GCM_SURFACE_F_W16Z16Y16X16: return surface_color_format::w16z16y16x16;
+	case CELL_GCM_SURFACE_F_W32Z32Y32X32: return surface_color_format::w32z32y32x32;
+	case CELL_GCM_SURFACE_F_X32: return surface_color_format::x32;
+	case CELL_GCM_SURFACE_X8B8G8R8_Z8B8G8R8: return surface_color_format::x8b8g8r8_z8b8g8r8;
+	case CELL_GCM_SURFACE_X8B8G8R8_O8B8G8R8: return surface_color_format::x8b8g8r8_o8b8g8r8;
+	case CELL_GCM_SURFACE_A8B8G8R8: return surface_color_format::a8b8g8r8;
+	}
+	fmt::throw_exception("Unknown surface color format 0x%x", in);
+}
+
+stencil_op rsx::to_stencil_op(u16 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_INVERT: return stencil_op::invert;
+	case CELL_GCM_KEEP: return stencil_op::keep;
+	case CELL_GCM_REPLACE: return stencil_op::replace;
+	case CELL_GCM_INCR: return stencil_op::incr;
+	case CELL_GCM_DECR: return stencil_op::decr;
+	case CELL_GCM_INCR_WRAP: return stencil_op::incr_wrap;
+	case CELL_GCM_DECR_WRAP: return stencil_op::decr_wrap;
+	case CELL_GCM_ZERO: return stencil_op::zero;
+	}
+	fmt::throw_exception("Unknown stencil op 0x%x", in);
+}
+
+blend_equation rsx::to_blend_equation(u16 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_FUNC_ADD: return blend_equation::add;
+	case CELL_GCM_MIN: return blend_equation::min;
+	case CELL_GCM_MAX: return blend_equation::max;
+	case CELL_GCM_FUNC_SUBTRACT: return blend_equation::substract;
+	case CELL_GCM_FUNC_REVERSE_SUBTRACT: return blend_equation::reverse_substract;
+	case CELL_GCM_FUNC_REVERSE_SUBTRACT_SIGNED: return blend_equation::reverse_substract_signed;
+	case CELL_GCM_FUNC_ADD_SIGNED: return blend_equation::add_signed;
+	case CELL_GCM_FUNC_REVERSE_ADD_SIGNED: return blend_equation::reverse_add_signed;
+	}
+	fmt::throw_exception("Unknown blend eq 0x%x", in);
+}
+
+blend_factor rsx::to_blend_factor(u16 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_ZERO: return blend_factor::zero;
+	case CELL_GCM_ONE: return blend_factor::one;
+	case CELL_GCM_SRC_COLOR: return blend_factor::src_color;
+	case CELL_GCM_ONE_MINUS_SRC_COLOR: return blend_factor::one_minus_src_color;
+	case CELL_GCM_SRC_ALPHA: return blend_factor::src_alpha;
+	case CELL_GCM_ONE_MINUS_SRC_ALPHA: return blend_factor::one_minus_src_alpha;
+	case CELL_GCM_DST_ALPHA: return blend_factor::dst_alpha;
+	case CELL_GCM_ONE_MINUS_DST_ALPHA: return blend_factor::one_minus_dst_alpha;
+	case CELL_GCM_DST_COLOR: return blend_factor::dst_color;
+	case CELL_GCM_ONE_MINUS_DST_COLOR: return blend_factor::one_minus_dst_color;
+	case CELL_GCM_SRC_ALPHA_SATURATE: return blend_factor::src_alpha_saturate;
+	case CELL_GCM_CONSTANT_COLOR: return blend_factor::constant_color;
+	case CELL_GCM_ONE_MINUS_CONSTANT_COLOR: return blend_factor::one_minus_constant_color;
+	case CELL_GCM_CONSTANT_ALPHA: return blend_factor::constant_alpha;
+	case CELL_GCM_ONE_MINUS_CONSTANT_ALPHA: return blend_factor::one_minus_constant_alpha;
+	}
+	fmt::throw_exception("Unknown blend factor 0x%x", in);
+}
+
+enum
+{
+	CELL_GCM_CLEAR = 0x1500,
+	CELL_GCM_AND = 0x1501,
+	CELL_GCM_AND_REVERSE = 0x1502,
+	CELL_GCM_COPY = 0x1503,
+	CELL_GCM_AND_INVERTED = 0x1504,
+	CELL_GCM_NOOP = 0x1505,
+	CELL_GCM_XOR = 0x1506,
+	CELL_GCM_OR = 0x1507,
+	CELL_GCM_NOR = 0x1508,
+	CELL_GCM_EQUIV = 0x1509,
+	CELL_GCM_OR_REVERSE = 0x150B,
+	CELL_GCM_COPY_INVERTED = 0x150C,
+	CELL_GCM_OR_INVERTED = 0x150D,
+	CELL_GCM_NAND = 0x150E,
+	CELL_GCM_SET = 0x150F,
+};
+
+logic_op rsx::to_logic_op(u16 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_CLEAR: return logic_op::logic_clear;
+	case CELL_GCM_AND: return logic_op::logic_and;
+	case CELL_GCM_AND_REVERSE: return logic_op::logic_and_reverse;
+	case CELL_GCM_COPY: return logic_op::logic_copy;
+	case CELL_GCM_AND_INVERTED: return logic_op::logic_and_inverted;
+	case CELL_GCM_NOOP: return logic_op::logic_noop;
+	case CELL_GCM_XOR: return logic_op::logic_xor;
+	case CELL_GCM_OR: return logic_op::logic_or;
+	case CELL_GCM_NOR: return logic_op::logic_nor;
+	case CELL_GCM_EQUIV: return logic_op::logic_equiv;
+	case CELL_GCM_INVERT: return logic_op::logic_invert;
+	case CELL_GCM_OR_REVERSE: return logic_op::logic_or_reverse;
+	case CELL_GCM_COPY_INVERTED: return logic_op::logic_copy_inverted;
+	case CELL_GCM_OR_INVERTED: return logic_op::logic_or_inverted;
+	case CELL_GCM_NAND: return logic_op::logic_nand;
+	case CELL_GCM_SET: return logic_op::logic_set;
+	}
+	fmt::throw_exception("Unknown logic op 0x%x", in);
+}
+
+front_face rsx::to_front_face(u16 in)
+{
+	switch (in)
+	{
+	default: // Disgaea 3 pass some garbage value at startup, this is needed to survive.
+	case CELL_GCM_CW: return front_face::cw;
+	case CELL_GCM_CCW: return front_face::ccw;
+	}
+	fmt::throw_exception("Unknown front face 0x%x", in);
+}
+
+enum
+{
+	CELL_GCM_TRANSFER_ORIGIN_CENTER = 1,
+	CELL_GCM_TRANSFER_ORIGIN_CORNER = 2,
+
+	CELL_GCM_TRANSFER_INTERPOLATOR_ZOH = 0,
+	CELL_GCM_TRANSFER_INTERPOLATOR_FOH = 1,
+};
+
+blit_engine::transfer_origin blit_engine::to_transfer_origin(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_TRANSFER_ORIGIN_CENTER: return blit_engine::transfer_origin::center;
+	case CELL_GCM_TRANSFER_ORIGIN_CORNER: return blit_engine::transfer_origin::corner;
+	}
+	fmt::throw_exception("Unknown transfer origin 0x%x", in);
+}
+
+blit_engine::transfer_interpolator blit_engine::to_transfer_interpolator(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_TRANSFER_INTERPOLATOR_ZOH: return blit_engine::transfer_interpolator::zoh;
+	case CELL_GCM_TRANSFER_INTERPOLATOR_FOH: return blit_engine::transfer_interpolator::foh;
+	}
+	fmt::throw_exception("Unknown transfer interpolator 0x%x", in);
+}
+
+enum
+{
+	CELL_GCM_TRANSFER_OPERATION_SRCCOPY_AND = 0,
+	CELL_GCM_TRANSFER_OPERATION_ROP_AND = 1,
+	CELL_GCM_TRANSFER_OPERATION_BLEND_AND = 2,
+	CELL_GCM_TRANSFER_OPERATION_SRCCOPY = 3,
+	CELL_GCM_TRANSFER_OPERATION_SRCCOPY_PREMULT = 4,
+	CELL_GCM_TRANSFER_OPERATION_BLEND_PREMULT = 5,
+};
+
+blit_engine::transfer_operation blit_engine::to_transfer_operation(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_TRANSFER_OPERATION_SRCCOPY_AND: return blit_engine::transfer_operation::srccopy_and;
+	case CELL_GCM_TRANSFER_OPERATION_ROP_AND: return blit_engine::transfer_operation::rop_and;
+	case CELL_GCM_TRANSFER_OPERATION_BLEND_AND: return blit_engine::transfer_operation::blend_and;
+	case CELL_GCM_TRANSFER_OPERATION_SRCCOPY: return blit_engine::transfer_operation::srccopy;
+	case CELL_GCM_TRANSFER_OPERATION_SRCCOPY_PREMULT: return blit_engine::transfer_operation::srccopy_premult;
+	case CELL_GCM_TRANSFER_OPERATION_BLEND_PREMULT: return blit_engine::transfer_operation::blend_premult;
+	default: return blit_engine::transfer_operation::invalid;
+	}
+}
+
+enum
+{
+	CELL_GCM_TRANSFER_SCALE_FORMAT_A1R5G5B5 = 1,
+	CELL_GCM_TRANSFER_SCALE_FORMAT_X1R5G5B5 = 2,
+	CELL_GCM_TRANSFER_SCALE_FORMAT_A8R8G8B8 = 3,
+	CELL_GCM_TRANSFER_SCALE_FORMAT_X8R8G8B8 = 4,
+	CELL_GCM_TRANSFER_SCALE_FORMAT_CR8YB8CB8YA8 = 5,
+	CELL_GCM_TRANSFER_SCALE_FORMAT_YB8CR8YA8CB8 = 6,
+	CELL_GCM_TRANSFER_SCALE_FORMAT_R5G6B5 = 7,
+	CELL_GCM_TRANSFER_SCALE_FORMAT_Y8 = 8,
+	CELL_GCM_TRANSFER_SCALE_FORMAT_AY8 = 9,
+	CELL_GCM_TRANSFER_SCALE_FORMAT_EYB8ECR8EYA8ECB8 = 10,
+	CELL_GCM_TRANSFER_SCALE_FORMAT_ECR8EYB8ECB8EYA8 = 11,
+	CELL_GCM_TRANSFER_SCALE_FORMAT_A8B8G8R8 = 12,
+	CELL_GCM_TRANSFER_SCALE_FORMAT_X8B8G8R8 = 13,
+};
+
+blit_engine::transfer_source_format blit_engine::to_transfer_source_format(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_TRANSFER_SCALE_FORMAT_A1R5G5B5: return blit_engine::transfer_source_format::a1r5g5b5;
+	case CELL_GCM_TRANSFER_SCALE_FORMAT_X1R5G5B5: return blit_engine::transfer_source_format::x1r5g5b5;
+	case CELL_GCM_TRANSFER_SCALE_FORMAT_A8R8G8B8: return blit_engine::transfer_source_format::a8r8g8b8;
+	case CELL_GCM_TRANSFER_SCALE_FORMAT_X8R8G8B8: return blit_engine::transfer_source_format::x8r8g8b8;
+	case CELL_GCM_TRANSFER_SCALE_FORMAT_CR8YB8CB8YA8: return blit_engine::transfer_source_format::cr8yb8cb8ya8;
+	case CELL_GCM_TRANSFER_SCALE_FORMAT_YB8CR8YA8CB8: return blit_engine::transfer_source_format::yb8cr8ya8cb8;
+	case CELL_GCM_TRANSFER_SCALE_FORMAT_R5G6B5: return blit_engine::transfer_source_format::r5g6b5;
+	case CELL_GCM_TRANSFER_SCALE_FORMAT_Y8: return blit_engine::transfer_source_format::y8;
+	case CELL_GCM_TRANSFER_SCALE_FORMAT_AY8: return blit_engine::transfer_source_format::ay8;
+	case CELL_GCM_TRANSFER_SCALE_FORMAT_EYB8ECR8EYA8ECB8: return blit_engine::transfer_source_format::eyb8ecr8eya8ecb8;
+	case CELL_GCM_TRANSFER_SCALE_FORMAT_ECR8EYB8ECB8EYA8: return blit_engine::transfer_source_format::ecr8eyb8ecb8eya8;
+	case CELL_GCM_TRANSFER_SCALE_FORMAT_A8B8G8R8: return blit_engine::transfer_source_format::a8b8g8r8;
+	case CELL_GCM_TRANSFER_SCALE_FORMAT_X8B8G8R8: return blit_engine::transfer_source_format::x8b8g8r8;
+	default: return blit_engine::transfer_source_format::invalid;
+	}
+}
+
+enum
+{
+	// Destination Format conversions
+	CELL_GCM_TRANSFER_SURFACE_FORMAT_R5G6B5 = 4,
+	CELL_GCM_TRANSFER_SURFACE_FORMAT_A8R8G8B8 = 10,
+	CELL_GCM_TRANSFER_SURFACE_FORMAT_Y32 = 11,
+};
+
+blit_engine::transfer_destination_format blit_engine::to_transfer_destination_format(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_TRANSFER_SURFACE_FORMAT_R5G6B5: return blit_engine::transfer_destination_format::r5g6b5;
+	case CELL_GCM_TRANSFER_SURFACE_FORMAT_A8R8G8B8: return blit_engine::transfer_destination_format::a8r8g8b8;
+	case CELL_GCM_TRANSFER_SURFACE_FORMAT_Y32: return blit_engine::transfer_destination_format::y32;
+	default: return blit_engine::transfer_destination_format::invalid;
+	}
+}
+
+enum
+{
+	CELL_GCM_CONTEXT_SURFACE2D = 0x313371C3,
+	CELL_GCM_CONTEXT_SWIZZLE2D = 0x31337A73,
+};
+
+blit_engine::context_surface blit_engine::to_context_surface(u32 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_CONTEXT_SURFACE2D: return blit_engine::context_surface::surface2d;
+	case CELL_GCM_CONTEXT_SWIZZLE2D: return blit_engine::context_surface::swizzle2d;
+	}
+	fmt::throw_exception("Unknown context surface 0x%x", in);
+}
+
+blit_engine::context_dma blit_engine::to_context_dma(u32 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL: return blit_engine::context_dma::to_memory_get_report;
+	case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN: return blit_engine::context_dma::report_location_main;
+	case CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER: return blit_engine::context_dma::memory_host_buffer;
+	}
+	fmt::throw_exception("Unknown context dma 0x%x", in);
+}
+
+enum
+{
+	CELL_GCM_USER_CLIP_PLANE_DISABLE = 0,
+	CELL_GCM_USER_CLIP_PLANE_ENABLE_LT = 1,
+	CELL_GCM_USER_CLIP_PLANE_ENABLE_GE = 2,
+};
+
+user_clip_plane_op rsx::to_user_clip_plane_op(u8 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_USER_CLIP_PLANE_DISABLE: return user_clip_plane_op::disable;
+	case CELL_GCM_USER_CLIP_PLANE_ENABLE_LT: return user_clip_plane_op::less_than;
+	case CELL_GCM_USER_CLIP_PLANE_ENABLE_GE: return user_clip_plane_op::greater_or_equal;
+	}
+	fmt::throw_exception("Unknown user clip plane 0x%x", in);
+}
+
+enum
+{
+	CELL_GCM_FLAT = 0x1D00,
+	CELL_GCM_SMOOTH = 0x1D01,
+};
+
+shading_mode rsx::to_shading_mode(u32 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_FLAT: return shading_mode::flat;
+	case CELL_GCM_SMOOTH: return shading_mode::smooth;
+	}
+	fmt::throw_exception("Unknown shading mode 0x%x", in);
+}
+
+enum
+{
+	CELL_GCM_POLYGON_MODE_POINT = 0x1B00,
+	CELL_GCM_POLYGON_MODE_LINE = 0x1B01,
+	CELL_GCM_POLYGON_MODE_FILL = 0x1B02,
+};
+
+polygon_mode rsx::to_polygon_mode(u32 in)
+{
+	switch (in)
+	{
+	case CELL_GCM_POLYGON_MODE_POINT: return polygon_mode::point;
+	case CELL_GCM_POLYGON_MODE_LINE: return polygon_mode::line;
+	case CELL_GCM_POLYGON_MODE_FILL: return polygon_mode::fill;
+	}
+	fmt::throw_exception("Unknown polygon mode 0x%x", in);
 }
diff --git a/rpcs3/Emu/RSX/gcm_enums.h b/rpcs3/Emu/RSX/gcm_enums.h
index eaa182171e..24b0536e43 100644
--- a/rpcs3/Emu/RSX/gcm_enums.h
+++ b/rpcs3/Emu/RSX/gcm_enums.h
@@ -1,1293 +1,72 @@
 #pragma once
 
 #include "util/types.hpp"
-#include "Common/expected.hpp"
-
-namespace gcm
-{
-	enum
-	{
-		CELL_GCM_TYPE_B   = 1,
-		CELL_GCM_TYPE_C   = 2,
-		CELL_GCM_TYPE_RSX = 3,
-
-		CELL_GCM_MRT_MAXCOUNT = 4,
-
-		CELL_GCM_DISPLAY_MAXID = 8,
-
-		CELL_GCM_CONDITIONAL = 2,
-	};
-
-	enum
-	{
-		CELL_GCM_DISPLAY_HSYNC = 1,
-		CELL_GCM_DISPLAY_VSYNC = 2,
-		CELL_GCM_DISPLAY_HSYNC_WITH_NOISE = 3,
-	};
-
-	enum
-	{
-		CELL_GCM_DEBUG_LEVEL0 = 1,
-		CELL_GCM_DEBUG_LEVEL1 = 2,
-		CELL_GCM_DEBUG_LEVEL2 = 3,
-	};
-
-	enum
-	{
-		CELL_GCM_DISPLAY_FREQUENCY_59_94HZ = 1,
-		CELL_GCM_DISPLAY_FREQUENCY_SCANOUT = 2,
-		CELL_GCM_DISPLAY_FREQUENCY_DISABLE = 3,
-	};
-
-	enum
-	{
-		CELL_GCM_DISPLAY_FLIP_STATUS_DONE = 0,
-		CELL_GCM_DISPLAY_FLIP_STATUS_WAITING = 1,
-	};
-
-	enum
-	{
-		CELL_GCM_ZCULL_ALIGN_OFFSET             = 4096,
-		CELL_GCM_ZCULL_ALIGN_WIDTH              = 64,
-		CELL_GCM_ZCULL_ALIGN_HEIGHT             = 64,
-		CELL_GCM_ZCULL_ALIGN_CULLSTART          = 4096,
-		CELL_GCM_ZCULL_COMPRESSION_TAG_BASE_MAX = 0x7FF,
-		CELL_GCM_ZCULL_RAM_SIZE_MAX             = 0x00300000,
-
-		CELL_GCM_TILE_ALIGN_OFFSET       = 0x00010000,
-		CELL_GCM_TILE_ALIGN_SIZE         = 0x00010000,
-		CELL_GCM_TILE_LOCAL_ALIGN_HEIGHT = 32,
-		CELL_GCM_TILE_MAIN_ALIGN_HEIGHT  = 64,
-		CELL_GCM_TILE_ALIGN_BUFFER_START_BOUNDARY = 8,
-
-		CELL_GCM_FRAGMENT_UCODE_LOCAL_ALIGN_OFFSET = 64,
-		CELL_GCM_FRAGMENT_UCODE_MAIN_ALIGN_OFFSET  = 128,
-
-		CELL_GCM_SURFACE_LINEAR_ALIGN_OFFSET  = 64,
-		CELL_GCM_SURFACE_SWIZZLE_ALIGN_OFFSET = 128,
-
-		CELL_GCM_TEXTURE_SWIZZLE_ALIGN_OFFSET               = 128,
-		CELL_GCM_TEXTURE_CUBEMAP_ALIGN_OFFSET               = 128,
-		CELL_GCM_TEXTURE_SWIZZLED_CUBEMAP_FACE_ALIGN_OFFSET = 128,
-
-		CELL_GCM_VERTEX_TEXTURE_CACHE_LINE_SIZE   = 32,
-		CELL_GCM_L2_TEXTURE_CACHE_LOCAL_LINE_SIZE = 64,
-		CELL_GCM_L2_TEXTURE_CACHE_MAIN_LINE_SIZE  = 128,
-
-		CELL_GCM_IDX_FRAGMENT_UCODE_INSTRUCTION_PREFETCH_COUNT  = 16,
-
-		CELL_GCM_DRAW_INDEX_ARRAY_INDEX_RANGE_MAX = 0x000FFFFF,
-
-		CELL_GCM_CURSOR_ALIGN_OFFSET = 2048
-	};
-
-	enum
-	{
-		CELL_GCM_FREQUENCY_MODULO = 1,
-		CELL_GCM_FREQUENCY_DIVIDE = 0,
-	};
-
-	enum CellRescTableElement
-	{
-		CELL_RESC_ELEMENT_HALF = 0,
-		CELL_RESC_ELEMENT_FLOAT = 1,
-	};
-
-	enum CellGcmDefaultFifoMode
-	{
-		CELL_GCM_DEFAULT_FIFO_MODE_TRADITIONAL = 0,
-		CELL_GCM_DEFAULT_FIFO_MODE_OPTIMIZE    = 1,
-		CELL_GCM_DEFAULT_FIFO_MODE_CONDITIONAL = 2,
-	};
-
-	enum CellGcmSystemMode
-	{
-		CELL_GCM_SYSTEM_MODE_IOMAP_512MB = 1,
-		CELL_GCM_SYSTEM_MODE_MASK = 1
-	};
-
-	enum
-	{
-		// Index Array Type
-		CELL_GCM_DRAW_INDEX_ARRAY_TYPE_32 = 0,
-		CELL_GCM_DRAW_INDEX_ARRAY_TYPE_16 = 1,
-	};
-
-	enum
-	{
-		CELL_GCM_PRIMITIVE_POINTS = 1,
-		CELL_GCM_PRIMITIVE_LINES = 2,
-		CELL_GCM_PRIMITIVE_LINE_LOOP = 3,
-		CELL_GCM_PRIMITIVE_LINE_STRIP = 4,
-		CELL_GCM_PRIMITIVE_TRIANGLES = 5,
-		CELL_GCM_PRIMITIVE_TRIANGLE_STRIP= 6,
-		CELL_GCM_PRIMITIVE_TRIANGLE_FAN = 7,
-		CELL_GCM_PRIMITIVE_QUADS = 8,
-		CELL_GCM_PRIMITIVE_QUAD_STRIP = 9,
-		CELL_GCM_PRIMITIVE_POLYGON = 10,
-	};
-
-	// GCM Texture
-	enum CellGcmTexture : u32
-	{
-		// Color Flag
-		CELL_GCM_TEXTURE_B8 = 0x81,
-		CELL_GCM_TEXTURE_A1R5G5B5 = 0x82,
-		CELL_GCM_TEXTURE_A4R4G4B4 = 0x83,
-		CELL_GCM_TEXTURE_R5G6B5 = 0x84,
-		CELL_GCM_TEXTURE_A8R8G8B8 = 0x85,
-		CELL_GCM_TEXTURE_COMPRESSED_DXT1 = 0x86,
-		CELL_GCM_TEXTURE_COMPRESSED_DXT23 = 0x87,
-		CELL_GCM_TEXTURE_COMPRESSED_DXT45 = 0x88,
-		CELL_GCM_TEXTURE_G8B8 = 0x8B,
-		CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8 = 0x8D, // NOTE: 0xAD in firmware
-		CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8 = 0x8E, // NOTE: 0xAE in firmware
-		CELL_GCM_TEXTURE_R6G5B5 = 0x8F,
-		CELL_GCM_TEXTURE_DEPTH24_D8 = 0x90,
-		CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT = 0x91,
-		CELL_GCM_TEXTURE_DEPTH16 = 0x92,
-		CELL_GCM_TEXTURE_DEPTH16_FLOAT = 0x93,
-		CELL_GCM_TEXTURE_X16 = 0x94,
-		CELL_GCM_TEXTURE_Y16_X16 = 0x95,
-		CELL_GCM_TEXTURE_R5G5B5A1 = 0x97,
-		CELL_GCM_TEXTURE_COMPRESSED_HILO8 = 0x98,
-		CELL_GCM_TEXTURE_COMPRESSED_HILO_S8 = 0x99,
-		CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT = 0x9A,
-		CELL_GCM_TEXTURE_W32_Z32_Y32_X32_FLOAT = 0x9B,
-		CELL_GCM_TEXTURE_X32_FLOAT = 0x9C,
-		CELL_GCM_TEXTURE_D1R5G5B5 = 0x9D,
-		CELL_GCM_TEXTURE_D8R8G8B8 = 0x9E,
-		CELL_GCM_TEXTURE_Y16_X16_FLOAT = 0x9F,
-
-		// Swizzle Flag
-		CELL_GCM_TEXTURE_SZ = 0x00,
-		CELL_GCM_TEXTURE_LN = 0x20,
-
-		// Normalization Flag
-		CELL_GCM_TEXTURE_NR = 0x00,
-		CELL_GCM_TEXTURE_UN = 0x40,
-	};
-
-	// GCM Surface
-	enum
-	{
-		// Surface type
-		CELL_GCM_SURFACE_PITCH = 1,
-		CELL_GCM_SURFACE_SWIZZLE = 2,
-	};
-
-	// GCM blend equation
-	enum
-	{
-		CELL_GCM_FUNC_ADD = 0x8006,
-		CELL_GCM_MIN = 0x8007,
-		CELL_GCM_MAX = 0x8008,
-		CELL_GCM_FUNC_SUBTRACT = 0x800A,
-		CELL_GCM_FUNC_REVERSE_SUBTRACT = 0x800B,
-		CELL_GCM_FUNC_REVERSE_SUBTRACT_SIGNED = 0x0000F005,
-		CELL_GCM_FUNC_ADD_SIGNED = 0x0000F006,
-		CELL_GCM_FUNC_REVERSE_ADD_SIGNED = 0x0000F007,
-	};
-
-	// GCM blend factor
-	enum
-	{
-		CELL_GCM_SRC_COLOR = 0x0300,
-		CELL_GCM_ONE_MINUS_SRC_COLOR = 0x0301,
-		CELL_GCM_SRC_ALPHA = 0x0302,
-		CELL_GCM_ONE_MINUS_SRC_ALPHA = 0x0303,
-		CELL_GCM_DST_ALPHA = 0x0304,
-		CELL_GCM_ONE_MINUS_DST_ALPHA = 0x0305,
-		CELL_GCM_DST_COLOR = 0x0306,
-		CELL_GCM_ONE_MINUS_DST_COLOR = 0x0307,
-		CELL_GCM_SRC_ALPHA_SATURATE = 0x0308,
-		CELL_GCM_CONSTANT_COLOR = 0x8001,
-		CELL_GCM_ONE_MINUS_CONSTANT_COLOR = 0x8002,
-		CELL_GCM_CONSTANT_ALPHA = 0x8003,
-		CELL_GCM_ONE_MINUS_CONSTANT_ALPHA = 0x8004,
-	};
-
-	enum
-	{
-		CELL_GCM_TEXTURE_DIMENSION_1 = 1,
-		CELL_GCM_TEXTURE_DIMENSION_2 = 2,
-		CELL_GCM_TEXTURE_DIMENSION_3 = 3,
-
-		CELL_GCM_TEXTURE_UNSIGNED_REMAP_NORMAL = 0,
-		CELL_GCM_TEXTURE_UNSIGNED_REMAP_BIASED = 1,
-
-		CELL_GCM_TEXTURE_SIGNED_REMAP_NORMAL = 0x0,
-		CELL_GCM_TEXTURE_SIGNED_REMAP_CLAMPED = 0x3,
-
-		CELL_GCM_TEXTURE_REMAP_ORDER_XYXY = 0,
-		CELL_GCM_TEXTURE_REMAP_ORDER_XXXY = 1,
-
-		CELL_GCM_TEXTURE_REMAP_FROM_A = 0,
-		CELL_GCM_TEXTURE_REMAP_FROM_R = 1,
-		CELL_GCM_TEXTURE_REMAP_FROM_G = 2,
-		CELL_GCM_TEXTURE_REMAP_FROM_B = 3,
-
-		CELL_GCM_TEXTURE_REMAP_ZERO = 0,
-		CELL_GCM_TEXTURE_REMAP_ONE = 1,
-		CELL_GCM_TEXTURE_REMAP_REMAP = 2,
-
-		CELL_GCM_TEXTURE_BORDER_TEXTURE = 0,
-		CELL_GCM_TEXTURE_BORDER_COLOR   = 1,
-
-		CELL_GCM_TEXTURE_ZFUNC_NEVER = 0,
-		CELL_GCM_TEXTURE_ZFUNC_LESS = 1,
-		CELL_GCM_TEXTURE_ZFUNC_EQUAL = 2,
-		CELL_GCM_TEXTURE_ZFUNC_LEQUAL = 3,
-		CELL_GCM_TEXTURE_ZFUNC_GREATER = 4,
-		CELL_GCM_TEXTURE_ZFUNC_NOTEQUAL = 5,
-		CELL_GCM_TEXTURE_ZFUNC_GEQUAL = 6,
-		CELL_GCM_TEXTURE_ZFUNC_ALWAYS = 7,
-
-		CELL_GCM_TEXTURE_GAMMA_R = 1 << 0,
-		CELL_GCM_TEXTURE_GAMMA_G = 1 << 1,
-		CELL_GCM_TEXTURE_GAMMA_B = 1 << 2,
-		CELL_GCM_TEXTURE_GAMMA_A = 1 << 3,
-
-		CELL_GCM_TEXTURE_ANISO_SPREAD_0_50_TEXEL = 0x0,
-		CELL_GCM_TEXTURE_ANISO_SPREAD_1_00_TEXEL = 0x1,
-		CELL_GCM_TEXTURE_ANISO_SPREAD_1_125_TEXEL = 0x2,
-		CELL_GCM_TEXTURE_ANISO_SPREAD_1_25_TEXEL = 0x3,
-		CELL_GCM_TEXTURE_ANISO_SPREAD_1_375_TEXEL = 0x4,
-		CELL_GCM_TEXTURE_ANISO_SPREAD_1_50_TEXEL = 0x5,
-		CELL_GCM_TEXTURE_ANISO_SPREAD_1_75_TEXEL = 0x6,
-		CELL_GCM_TEXTURE_ANISO_SPREAD_2_00_TEXEL = 0x7,
-
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX0_U = 1 << 0,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX0_V = 1 << 1,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX0_P = 1 << 2,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX0_Q = 1 << 3,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX1_U = 1 << 4,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX1_V = 1 << 5,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX1_P = 1 << 6,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX1_Q = 1 << 7,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX2_U = 1 << 8,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX2_V = 1 << 9,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX2_P = 1 << 10,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX2_Q = 1 << 11,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX3_U = 1 << 12,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX3_V = 1 << 13,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX3_P = 1 << 14,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX3_Q = 1 << 15,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX4_U = 1 << 16,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX4_V = 1 << 17,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX4_P = 1 << 18,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX4_Q = 1 << 19,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX5_U = 1 << 20,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX5_V = 1 << 21,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX5_P = 1 << 22,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX5_Q = 1 << 23,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX6_U = 1 << 24,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX6_V = 1 << 25,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX6_P = 1 << 26,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX6_Q = 1 << 27,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX7_U = 1 << 28,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX7_V = 1 << 29,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX7_P = 1 << 30,
-		CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX7_Q = 1u << 31,
-
-		CELL_GCM_COLOR_MASK_B = 1 << 0,
-		CELL_GCM_COLOR_MASK_G = 1 << 8,
-		CELL_GCM_COLOR_MASK_R = 1 << 16,
-		CELL_GCM_COLOR_MASK_A = 1 << 24,
-
-		CELL_GCM_COLOR_MASK_MRT1_A = 1 << 4,
-		CELL_GCM_COLOR_MASK_MRT1_R = 1 << 5,
-		CELL_GCM_COLOR_MASK_MRT1_G = 1 << 6,
-		CELL_GCM_COLOR_MASK_MRT1_B = 1 << 7,
-		CELL_GCM_COLOR_MASK_MRT2_A = 1 << 8,
-		CELL_GCM_COLOR_MASK_MRT2_R = 1 << 9,
-		CELL_GCM_COLOR_MASK_MRT2_G = 1 << 10,
-		CELL_GCM_COLOR_MASK_MRT2_B = 1 << 11,
-		CELL_GCM_COLOR_MASK_MRT3_A = 1 << 12,
-		CELL_GCM_COLOR_MASK_MRT3_R = 1 << 13,
-		CELL_GCM_COLOR_MASK_MRT3_G = 1 << 14,
-		CELL_GCM_COLOR_MASK_MRT3_B = 1 << 15,
-
-		CELL_GCM_NEVER = 0x0200,
-		CELL_GCM_LESS = 0x0201,
-		CELL_GCM_EQUAL = 0x0202,
-		CELL_GCM_LEQUAL = 0x0203,
-		CELL_GCM_GREATER = 0x0204,
-		CELL_GCM_NOTEQUAL = 0x0205,
-		CELL_GCM_GEQUAL = 0x0206,
-		CELL_GCM_ALWAYS = 0x0207,
-
-		CELL_GCM_ZERO = 0,
-		CELL_GCM_ONE = 1,
-
-		CELL_GCM_FRONT = 0x0404,
-		CELL_GCM_BACK = 0x0405,
-		CELL_GCM_FRONT_AND_BACK = 0x0408,
-
-		CELL_GCM_CW = 0x0900,
-		CELL_GCM_CCW = 0x0901,
-
-		CELL_GCM_INVERT = 0x150A,
-		CELL_GCM_KEEP = 0x1E00,
-		CELL_GCM_REPLACE = 0x1E01,
-		CELL_GCM_INCR = 0x1E02,
-		CELL_GCM_DECR = 0x1E03,
-		CELL_GCM_INCR_WRAP = 0x8507,
-		CELL_GCM_DECR_WRAP = 0x8508,
-
-		CELL_GCM_TRANSFER_LOCAL_TO_LOCAL = 0,
-		CELL_GCM_TRANSFER_MAIN_TO_LOCAL = 1,
-		CELL_GCM_TRANSFER_LOCAL_TO_MAIN = 2,
-		CELL_GCM_TRANSFER_MAIN_TO_MAIN = 3,
-
-		CELL_GCM_INVALIDATE_TEXTURE = 1,
-		CELL_GCM_INVALIDATE_VERTEX_TEXTURE = 2,
-
-		CELL_GCM_COMPMODE_DISABLED = 0,
-		CELL_GCM_COMPMODE_C32_2X1 = 7,
-		CELL_GCM_COMPMODE_C32_2X2 = 8,
-		CELL_GCM_COMPMODE_Z32_SEPSTENCIL = 9,
-		CELL_GCM_COMPMODE_Z32_SEPSTENCIL_REG = 10,
-		CELL_GCM_COMPMODE_Z32_SEPSTENCIL_REGULAR = 10,
-		CELL_GCM_COMPMODE_Z32_SEPSTENCIL_DIAGONAL = 11,
-		CELL_GCM_COMPMODE_Z32_SEPSTENCIL_ROTATED = 12,
-
-		CELL_GCM_ZCULL_Z16 = 1,
-		CELL_GCM_ZCULL_Z24S8 = 2,
-		CELL_GCM_ZCULL_MSB = 0,
-		CELL_GCM_ZCULL_LONES = 1,
-		CELL_GCM_ZCULL_LESS = 0,
-		CELL_GCM_ZCULL_GREATER = 1,
-
-		CELL_GCM_SCULL_SFUNC_NEVER = 0,
-		CELL_GCM_SCULL_SFUNC_LESS = 1,
-		CELL_GCM_SCULL_SFUNC_EQUAL = 2,
-		CELL_GCM_SCULL_SFUNC_LEQUAL = 3,
-		CELL_GCM_SCULL_SFUNC_GREATER = 4,
-		CELL_GCM_SCULL_SFUNC_NOTEQUAL = 5,
-		CELL_GCM_SCULL_SFUNC_GEQUAL = 6,
-		CELL_GCM_SCULL_SFUNC_ALWAYS = 7,
-
-		CELL_GCM_ATTRIB_OUTPUT_FRONTDIFFUSE = 0,
-		CELL_GCM_ATTRIB_OUTPUT_FRONTSPECULAR = 1,
-		CELL_GCM_ATTRIB_OUTPUT_BACKDIFFUSE = 2,
-		CELL_GCM_ATTRIB_OUTPUT_BACKSPECULAR = 3,
-		CELL_GCM_ATTRIB_OUTPUT_FOG = 4,
-		CELL_GCM_ATTRIB_OUTPUT_POINTSIZE = 5,
-		CELL_GCM_ATTRIB_OUTPUT_UC0 = 6,
-		CELL_GCM_ATTRIB_OUTPUT_UC1 = 7,
-		CELL_GCM_ATTRIB_OUTPUT_UC2 = 8,
-		CELL_GCM_ATTRIB_OUTPUT_UC3 = 9,
-		CELL_GCM_ATTRIB_OUTPUT_UC4 = 10,
-		CELL_GCM_ATTRIB_OUTPUT_UC5 = 11,
-		CELL_GCM_ATTRIB_OUTPUT_TEX8 = 12,
-		CELL_GCM_ATTRIB_OUTPUT_TEX9 = 13,
-		CELL_GCM_ATTRIB_OUTPUT_TEX0 = 14,
-		CELL_GCM_ATTRIB_OUTPUT_TEX1 = 15,
-		CELL_GCM_ATTRIB_OUTPUT_TEX2 = 16,
-		CELL_GCM_ATTRIB_OUTPUT_TEX3 = 17,
-		CELL_GCM_ATTRIB_OUTPUT_TEX4 = 18,
-		CELL_GCM_ATTRIB_OUTPUT_TEX5 = 19,
-		CELL_GCM_ATTRIB_OUTPUT_TEX6 = 20,
-		CELL_GCM_ATTRIB_OUTPUT_TEX7 = 21,
-
-		CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTDIFFUSE = 1 << CELL_GCM_ATTRIB_OUTPUT_FRONTDIFFUSE,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTSPECULAR = 1 << CELL_GCM_ATTRIB_OUTPUT_FRONTSPECULAR,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_BACKDIFFUSE = 1 << CELL_GCM_ATTRIB_OUTPUT_BACKDIFFUSE,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_BACKSPECULAR = 1 << CELL_GCM_ATTRIB_OUTPUT_BACKSPECULAR,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_FOG = 1 << CELL_GCM_ATTRIB_OUTPUT_FOG,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_POINTSIZE = 1 << CELL_GCM_ATTRIB_OUTPUT_POINTSIZE,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_UC0 = 1 << CELL_GCM_ATTRIB_OUTPUT_UC0,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_UC1 = 1 << CELL_GCM_ATTRIB_OUTPUT_UC1,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_UC2 = 1 << CELL_GCM_ATTRIB_OUTPUT_UC2,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_UC3 = 1 << CELL_GCM_ATTRIB_OUTPUT_UC3,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_UC4 = 1 << CELL_GCM_ATTRIB_OUTPUT_UC4,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_UC5 = 1 << CELL_GCM_ATTRIB_OUTPUT_UC5,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_TEX8 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX8,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_TEX9 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX9,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_TEX0 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX0,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_TEX1 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX1,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_TEX2 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX2,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_TEX3 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX3,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_TEX4 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX4,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_TEX5 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX5,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_TEX6 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX6,
-		CELL_GCM_ATTRIB_OUTPUT_MASK_TEX7 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX7,
-
-		CELL_GCM_TRUE = 1,
-		CELL_GCM_FALSE = 0,
-	};
-
-	enum
-	{
-		RSX_TEXTURE_REMAP_IDENTITY = 0xAAE4,
-	};
-
-	enum
-	{
-		CELL_GCM_POINT_SPRITE_RMODE_ZERO   = 0,
-		CELL_GCM_POINT_SPRITE_RMODE_FROM_R = 1,
-		CELL_GCM_POINT_SPRITE_RMODE_FROM_S = 2,
-
-		CELL_GCM_POINT_SPRITE_TEX0 = 1 << 8,
-		CELL_GCM_POINT_SPRITE_TEX1 = 1 << 9,
-		CELL_GCM_POINT_SPRITE_TEX2 = 1 << 10,
-		CELL_GCM_POINT_SPRITE_TEX3 = 1 << 11,
-		CELL_GCM_POINT_SPRITE_TEX4 = 1 << 12,
-		CELL_GCM_POINT_SPRITE_TEX5 = 1 << 13,
-		CELL_GCM_POINT_SPRITE_TEX6 = 1 << 14,
-		CELL_GCM_POINT_SPRITE_TEX7 = 1 << 15,
-		CELL_GCM_POINT_SPRITE_TEX8 = 1 << 16,
-		CELL_GCM_POINT_SPRITE_TEX9 = 1 << 17,
-	};
-
-	enum
-	{
-		CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT = 0xe, ///< shader program exports the depth of the shaded fragment
-		CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS = 0x40, ///< shader program exports 32 bits registers values (instead of 16 bits ones)
-
-		// Other known flags
-		RSX_SHADER_CONTROL_USED_REGS_MASK = 0xf,
-		RSX_SHADER_CONTROL_USED_TEMP_REGS_MASK = 0xff << 24,
-		RSX_SHADER_CONTROL_USES_KIL = 0x80,   // program uses KIL op
-		RSX_SHADER_CONTROL_UNKNOWN0 = 0x400,  // seemingly always set
-		RSX_SHADER_CONTROL_UNKNOWN1 = 0x8000, // seemingly set when srgb packer is used??
-
-		// Custom
-		RSX_SHADER_CONTROL_ATTRIBUTE_INTERPOLATION = 0x10000, // Rasterizing triangles and not lines or points
-		RSX_SHADER_CONTROL_INSTANCED_CONSTANTS     = 0x20000, // Support instance ID offsets when loading constants
-	};
-
-	// GCM Reports
-	enum
-	{
-		CELL_GCM_ZPASS_PIXEL_CNT = 1,
-		CELL_GCM_ZCULL_STATS = 2,
-		CELL_GCM_ZCULL_STATS1 = 3,
-		CELL_GCM_ZCULL_STATS2 = 4,
-		CELL_GCM_ZCULL_STATS3 = 5,
-	};
-
-	// GPU Class Handles
-	enum CellGcmLocation : u32
-	{
-		CELL_GCM_LOCATION_LOCAL = 0,
-		CELL_GCM_LOCATION_MAIN = 1,
-
-		CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER = 0xFEED0000, // Local memory
-		CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER = 0xFEED0001, // Main memory
-		CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL = 0x66626660,
-		CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN = 0xBAD68000,
-		CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0 = 0x6660420F,
-		CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_1 = 0x6660420E,
-		CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_2 = 0x6660420D,
-		CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_3 = 0x6660420C,
-		CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_4 = 0x6660420B,
-		CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_5 = 0x6660420A,
-		CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_6 = 0x66604209,
-		CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_7 = 0x66604208,
-
-		CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY0 = 0x66604207,
-		CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY1 = 0x66604206,
-		CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY2 = 0x66604205,
-		CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY3 = 0x66604204,
-		CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY4 = 0x66604203,
-		CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY5 = 0x66604202,
-		CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY6 = 0x66604201,
-		CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY7 = 0x66604200,
-
-		CELL_GCM_CONTEXT_DMA_SEMAPHORE_RW = 0x66606660,
-		CELL_GCM_CONTEXT_DMA_SEMAPHORE_R = 0x66616661,
-		CELL_GCM_CONTEXT_DMA_DEVICE_RW = 0x56616660,
-		CELL_GCM_CONTEXT_DMA_DEVICE_R = 0x56616661
-	};
-
-	enum CellGcmMethod : u16
-	{
-		// NV40_CHANNEL_DMA (NV406E)
-		NV406E_SET_REFERENCE = 0x00000050 >> 2,
-		NV406E_SET_CONTEXT_DMA_SEMAPHORE = 0x00000060 >> 2,
-		NV406E_SEMAPHORE_OFFSET = 0x00000064 >> 2,
-		NV406E_SEMAPHORE_ACQUIRE = 0x00000068 >> 2,
-		NV406E_SEMAPHORE_RELEASE = 0x0000006c >> 2,
-
-		// NV40_CURIE_PRIMITIVE	(NV4097)
-		NV4097_SET_OBJECT = 0x00000000 >> 2,
-		NV4097_NO_OPERATION = 0x00000100 >> 2,
-		NV4097_NOTIFY = 0x00000104 >> 2,
-		NV4097_WAIT_FOR_IDLE = 0x00000110 >> 2,
-		NV4097_PM_TRIGGER = 0x00000140 >> 2,
-		NV4097_SET_CONTEXT_DMA_NOTIFIES = 0x00000180 >> 2,
-		NV4097_SET_CONTEXT_DMA_A = 0x00000184 >> 2,
-		NV4097_SET_CONTEXT_DMA_B = 0x00000188 >> 2,
-		NV4097_SET_CONTEXT_DMA_COLOR_B = 0x0000018c >> 2,
-		NV4097_SET_CONTEXT_DMA_STATE = 0x00000190 >> 2,
-		NV4097_SET_CONTEXT_DMA_COLOR_A = 0x00000194 >> 2,
-		NV4097_SET_CONTEXT_DMA_ZETA = 0x00000198 >> 2,
-		NV4097_SET_CONTEXT_DMA_VERTEX_A = 0x0000019c >> 2,
-		NV4097_SET_CONTEXT_DMA_VERTEX_B = 0x000001a0 >> 2,
-		NV4097_SET_CONTEXT_DMA_SEMAPHORE = 0x000001a4 >> 2,
-		NV4097_SET_CONTEXT_DMA_REPORT = 0x000001a8 >> 2,
-		NV4097_SET_CONTEXT_DMA_CLIP_ID = 0x000001ac >> 2,
-		NV4097_SET_CONTEXT_DMA_CULL_DATA = 0x000001b0 >> 2,
-		NV4097_SET_CONTEXT_DMA_COLOR_C = 0x000001b4 >> 2,
-		NV4097_SET_CONTEXT_DMA_COLOR_D = 0x000001b8 >> 2,
-		NV4097_SET_SURFACE_CLIP_HORIZONTAL = 0x00000200 >> 2,
-		NV4097_SET_SURFACE_CLIP_VERTICAL = 0x00000204 >> 2,
-		NV4097_SET_SURFACE_FORMAT = 0x00000208 >> 2,
-		NV4097_SET_SURFACE_PITCH_A = 0x0000020c >> 2,
-		NV4097_SET_SURFACE_COLOR_AOFFSET = 0x00000210 >> 2,
-		NV4097_SET_SURFACE_ZETA_OFFSET = 0x00000214 >> 2,
-		NV4097_SET_SURFACE_COLOR_BOFFSET = 0x00000218 >> 2,
-		NV4097_SET_SURFACE_PITCH_B = 0x0000021c >> 2,
-		NV4097_SET_SURFACE_COLOR_TARGET = 0x00000220 >> 2,
-		NV4097_SET_SURFACE_PITCH_Z = 0x0000022c >> 2,
-		NV4097_INVALIDATE_ZCULL = 0x00000234 >> 2,
-		NV4097_SET_CYLINDRICAL_WRAP = 0x00000238 >> 2,
-		NV4097_SET_CYLINDRICAL_WRAP1 = 0x0000023c >> 2,
-		NV4097_SET_SURFACE_PITCH_C = 0x00000280 >> 2,
-		NV4097_SET_SURFACE_PITCH_D = 0x00000284 >> 2,
-		NV4097_SET_SURFACE_COLOR_COFFSET = 0x00000288 >> 2,
-		NV4097_SET_SURFACE_COLOR_DOFFSET = 0x0000028c >> 2,
-		NV4097_SET_WINDOW_OFFSET = 0x000002b8 >> 2,
-		NV4097_SET_WINDOW_CLIP_TYPE = 0x000002bc >> 2,
-		NV4097_SET_WINDOW_CLIP_HORIZONTAL = 0x000002c0 >> 2,
-		NV4097_SET_WINDOW_CLIP_VERTICAL = 0x000002c4 >> 2,
-		NV4097_SET_DITHER_ENABLE = 0x00000300 >> 2,
-		NV4097_SET_ALPHA_TEST_ENABLE = 0x00000304 >> 2,
-		NV4097_SET_ALPHA_FUNC = 0x00000308 >> 2,
-		NV4097_SET_ALPHA_REF = 0x0000030c >> 2,
-		NV4097_SET_BLEND_ENABLE = 0x00000310 >> 2,
-		NV4097_SET_BLEND_FUNC_SFACTOR = 0x00000314 >> 2,
-		NV4097_SET_BLEND_FUNC_DFACTOR = 0x00000318 >> 2,
-		NV4097_SET_BLEND_COLOR = 0x0000031c >> 2,
-		NV4097_SET_BLEND_EQUATION = 0x00000320 >> 2,
-		NV4097_SET_COLOR_MASK = 0x00000324 >> 2,
-		NV4097_SET_STENCIL_TEST_ENABLE = 0x00000328 >> 2,
-		NV4097_SET_STENCIL_MASK = 0x0000032c >> 2,
-		NV4097_SET_STENCIL_FUNC = 0x00000330 >> 2,
-		NV4097_SET_STENCIL_FUNC_REF = 0x00000334 >> 2,
-		NV4097_SET_STENCIL_FUNC_MASK = 0x00000338 >> 2,
-		NV4097_SET_STENCIL_OP_FAIL = 0x0000033c >> 2,
-		NV4097_SET_STENCIL_OP_ZFAIL = 0x00000340 >> 2,
-		NV4097_SET_STENCIL_OP_ZPASS = 0x00000344 >> 2,
-		NV4097_SET_TWO_SIDED_STENCIL_TEST_ENABLE = 0x00000348 >> 2,
-		NV4097_SET_BACK_STENCIL_MASK = 0x0000034c >> 2,
-		NV4097_SET_BACK_STENCIL_FUNC = 0x00000350 >> 2,
-		NV4097_SET_BACK_STENCIL_FUNC_REF = 0x00000354 >> 2,
-		NV4097_SET_BACK_STENCIL_FUNC_MASK = 0x00000358 >> 2,
-		NV4097_SET_BACK_STENCIL_OP_FAIL = 0x0000035c >> 2,
-		NV4097_SET_BACK_STENCIL_OP_ZFAIL = 0x00000360 >> 2,
-		NV4097_SET_BACK_STENCIL_OP_ZPASS = 0x00000364 >> 2,
-		NV4097_SET_SHADE_MODE = 0x00000368 >> 2,
-		NV4097_SET_BLEND_ENABLE_MRT = 0x0000036c >> 2,
-		NV4097_SET_COLOR_MASK_MRT = 0x00000370 >> 2,
-		NV4097_SET_LOGIC_OP_ENABLE = 0x00000374 >> 2,
-		NV4097_SET_LOGIC_OP = 0x00000378 >> 2,
-		NV4097_SET_BLEND_COLOR2 = 0x0000037c >> 2,
-		NV4097_SET_DEPTH_BOUNDS_TEST_ENABLE = 0x00000380 >> 2,
-		NV4097_SET_DEPTH_BOUNDS_MIN = 0x00000384 >> 2,
-		NV4097_SET_DEPTH_BOUNDS_MAX = 0x00000388 >> 2,
-		NV4097_SET_CLIP_MIN = 0x00000394 >> 2,
-		NV4097_SET_CLIP_MAX = 0x00000398 >> 2,
-		NV4097_SET_CONTROL0 = 0x000003b0 >> 2,
-		NV4097_SET_LINE_WIDTH = 0x000003b8 >> 2,
-		NV4097_SET_LINE_SMOOTH_ENABLE = 0x000003bc >> 2,
-		NV4097_SET_ANISO_SPREAD = 0x000003c0 >> 2,
-		NV4097_SET_SCISSOR_HORIZONTAL = 0x000008c0 >> 2,
-		NV4097_SET_SCISSOR_VERTICAL = 0x000008c4 >> 2,
-		NV4097_SET_FOG_MODE = 0x000008cc >> 2,
-		NV4097_SET_FOG_PARAMS = 0x000008d0 >> 2,
-		NV4097_SET_SHADER_PROGRAM = 0x000008e4 >> 2,
-		NV4097_SET_VERTEX_TEXTURE_OFFSET = 0x00000900 >> 2,
-		NV4097_SET_VERTEX_TEXTURE_FORMAT = 0x00000904 >> 2,
-		NV4097_SET_VERTEX_TEXTURE_ADDRESS = 0x00000908 >> 2,
-		NV4097_SET_VERTEX_TEXTURE_CONTROL0 = 0x0000090c >> 2,
-		NV4097_SET_VERTEX_TEXTURE_CONTROL3 = 0x00000910 >> 2,
-		NV4097_SET_VERTEX_TEXTURE_FILTER = 0x00000914 >> 2,
-		NV4097_SET_VERTEX_TEXTURE_IMAGE_RECT = 0x00000918 >> 2,
-		NV4097_SET_VERTEX_TEXTURE_BORDER_COLOR = 0x0000091c >> 2,
-		NV4097_SET_VIEWPORT_HORIZONTAL = 0x00000a00 >> 2,
-		NV4097_SET_VIEWPORT_VERTICAL = 0x00000a04 >> 2,
-		NV4097_SET_POINT_CENTER_MODE = 0x00000a0c >> 2,
-		NV4097_ZCULL_SYNC = 0x00000a1c >> 2,
-		NV4097_SET_VIEWPORT_OFFSET = 0x00000a20 >> 2,
-		NV4097_SET_VIEWPORT_SCALE = 0x00000a30 >> 2,
-		NV4097_SET_POLY_OFFSET_POINT_ENABLE = 0x00000a60 >> 2,
-		NV4097_SET_POLY_OFFSET_LINE_ENABLE = 0x00000a64 >> 2,
-		NV4097_SET_POLY_OFFSET_FILL_ENABLE = 0x00000a68 >> 2,
-		NV4097_SET_DEPTH_FUNC = 0x00000a6c >> 2,
-		NV4097_SET_DEPTH_MASK = 0x00000a70 >> 2,
-		NV4097_SET_DEPTH_TEST_ENABLE = 0x00000a74 >> 2,
-		NV4097_SET_POLYGON_OFFSET_SCALE_FACTOR = 0x00000a78 >> 2,
-		NV4097_SET_POLYGON_OFFSET_BIAS = 0x00000a7c >> 2,
-		NV4097_SET_VERTEX_DATA_SCALED4S_M = 0x00000a80 >> 2,
-		NV4097_SET_TEXTURE_CONTROL2 = 0x00000b00 >> 2,
-		NV4097_SET_TEX_COORD_CONTROL = 0x00000b40 >> 2,
-		NV4097_SET_TRANSFORM_PROGRAM = 0x00000b80 >> 2,
-		NV4097_SET_SPECULAR_ENABLE = 0x00001428 >> 2,
-		NV4097_SET_TWO_SIDE_LIGHT_EN = 0x0000142c >> 2,
-		NV4097_CLEAR_ZCULL_SURFACE = 0x00001438 >> 2,
-		NV4097_SET_PERFORMANCE_PARAMS = 0x00001450 >> 2,
-		NV4097_SET_FLAT_SHADE_OP = 0x00001454 >> 2,
-		NV4097_SET_EDGE_FLAG = 0x0000145c >> 2,
-		NV4097_SET_USER_CLIP_PLANE_CONTROL = 0x00001478 >> 2,
-		NV4097_SET_POLYGON_STIPPLE = 0x0000147c >> 2,
-		NV4097_SET_POLYGON_STIPPLE_PATTERN = 0x00001480 >> 2,
-		NV4097_SET_VERTEX_DATA3F_M = 0x00001500 >> 2,
-		NV4097_SET_VERTEX_DATA_ARRAY_OFFSET = 0x00001680 >> 2,
-		NV4097_INVALIDATE_VERTEX_CACHE_FILE = 0x00001710 >> 2,
-		NV4097_INVALIDATE_VERTEX_FILE = 0x00001714 >> 2,
-		NV4097_PIPE_NOP = 0x00001718 >> 2,
-		NV4097_SET_VERTEX_DATA_BASE_OFFSET = 0x00001738 >> 2,
-		NV4097_SET_VERTEX_DATA_BASE_INDEX = 0x0000173c >> 2,
-		NV4097_SET_VERTEX_DATA_ARRAY_FORMAT = 0x00001740 >> 2,
-		NV4097_CLEAR_REPORT_VALUE = 0x000017c8 >> 2,
-		NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE = 0x000017cc >> 2,
-		NV4097_GET_REPORT = 0x00001800 >> 2,
-		NV4097_SET_ZCULL_STATS_ENABLE = 0x00001804 >> 2,
-		NV4097_SET_BEGIN_END = 0x00001808 >> 2,
-		NV4097_ARRAY_ELEMENT16 = 0x0000180c >> 2,
-		NV4097_ARRAY_ELEMENT32 = 0x00001810 >> 2,
-		NV4097_DRAW_ARRAYS = 0x00001814 >> 2,
-		NV4097_INLINE_ARRAY = 0x00001818 >> 2,
-		NV4097_SET_INDEX_ARRAY_ADDRESS = 0x0000181c >> 2,
-		NV4097_SET_INDEX_ARRAY_DMA = 0x00001820 >> 2,
-		NV4097_DRAW_INDEX_ARRAY = 0x00001824 >> 2,
-		NV4097_SET_FRONT_POLYGON_MODE = 0x00001828 >> 2,
-		NV4097_SET_BACK_POLYGON_MODE = 0x0000182c >> 2,
-		NV4097_SET_CULL_FACE = 0x00001830 >> 2,
-		NV4097_SET_FRONT_FACE = 0x00001834 >> 2,
-		NV4097_SET_POLY_SMOOTH_ENABLE = 0x00001838 >> 2,
-		NV4097_SET_CULL_FACE_ENABLE = 0x0000183c >> 2,
-		NV4097_SET_TEXTURE_CONTROL3 = 0x00001840 >> 2,
-		NV4097_SET_VERTEX_DATA2F_M = 0x00001880 >> 2,
-		NV4097_SET_VERTEX_DATA2S_M = 0x00001900 >> 2,
-		NV4097_SET_VERTEX_DATA4UB_M = 0x00001940 >> 2,
-		NV4097_SET_VERTEX_DATA4S_M = 0x00001980 >> 2,
-		NV4097_SET_TEXTURE_OFFSET = 0x00001a00 >> 2,
-		NV4097_SET_TEXTURE_FORMAT = 0x00001a04 >> 2,
-		NV4097_SET_TEXTURE_ADDRESS = 0x00001a08 >> 2,
-		NV4097_SET_TEXTURE_CONTROL0 = 0x00001a0c >> 2,
-		NV4097_SET_TEXTURE_CONTROL1 = 0x00001a10 >> 2,
-		NV4097_SET_TEXTURE_FILTER = 0x00001a14 >> 2,
-		NV4097_SET_TEXTURE_IMAGE_RECT = 0x00001a18 >> 2,
-		NV4097_SET_TEXTURE_BORDER_COLOR = 0x00001a1c >> 2,
-		NV4097_SET_VERTEX_DATA4F_M = 0x00001c00 >> 2,
-		NV4097_SET_COLOR_KEY_COLOR = 0x00001d00 >> 2,
-		NV4097_SET_SHADER_CONTROL = 0x00001d60 >> 2,
-		NV4097_SET_INDEXED_CONSTANT_READ_LIMITS = 0x00001d64 >> 2,
-		NV4097_SET_SEMAPHORE_OFFSET = 0x00001d6c >> 2,
-		NV4097_BACK_END_WRITE_SEMAPHORE_RELEASE = 0x00001d70 >> 2,
-		NV4097_TEXTURE_READ_SEMAPHORE_RELEASE = 0x00001d74 >> 2,
-		NV4097_SET_ZMIN_MAX_CONTROL = 0x00001d78 >> 2,
-		NV4097_SET_ANTI_ALIASING_CONTROL = 0x00001d7c >> 2,
-		NV4097_SET_SURFACE_COMPRESSION = 0x00001d80 >> 2,
-		NV4097_SET_ZCULL_EN = 0x00001d84 >> 2,
-		NV4097_SET_SHADER_WINDOW = 0x00001d88 >> 2,
-		NV4097_SET_ZSTENCIL_CLEAR_VALUE = 0x00001d8c >> 2,
-		NV4097_SET_COLOR_CLEAR_VALUE = 0x00001d90 >> 2,
-		NV4097_CLEAR_SURFACE = 0x00001d94 >> 2,
-		NV4097_SET_CLEAR_RECT_HORIZONTAL = 0x00001d98 >> 2,
-		NV4097_SET_CLEAR_RECT_VERTICAL = 0x00001d9c >> 2,
-		NV4097_SET_CLIP_ID_TEST_ENABLE = 0x00001da4 >> 2,
-		NV4097_SET_RESTART_INDEX_ENABLE = 0x00001dac >> 2,
-		NV4097_SET_RESTART_INDEX = 0x00001db0 >> 2,
-		NV4097_SET_LINE_STIPPLE = 0x00001db4 >> 2,
-		NV4097_SET_LINE_STIPPLE_PATTERN = 0x00001db8 >> 2,
-		NV4097_SET_VERTEX_DATA1F_M = 0x00001e40 >> 2,
-		NV4097_SET_TRANSFORM_EXECUTION_MODE = 0x00001e94 >> 2,
-		NV4097_SET_RENDER_ENABLE = 0x00001e98 >> 2,
-		NV4097_SET_TRANSFORM_PROGRAM_LOAD = 0x00001e9c >> 2,
-		NV4097_SET_TRANSFORM_PROGRAM_START = 0x00001ea0 >> 2,
-		NV4097_SET_ZCULL_CONTROL0 = 0x00001ea4 >> 2,
-		NV4097_SET_ZCULL_CONTROL1 = 0x00001ea8 >> 2,
-		NV4097_SET_SCULL_CONTROL = 0x00001eac >> 2,
-		NV4097_SET_POINT_SIZE = 0x00001ee0 >> 2,
-		NV4097_SET_POINT_PARAMS_ENABLE = 0x00001ee4 >> 2,
-		NV4097_SET_POINT_SPRITE_CONTROL = 0x00001ee8 >> 2,
-		NV4097_SET_TRANSFORM_TIMEOUT = 0x00001ef8 >> 2,
-		NV4097_SET_TRANSFORM_CONSTANT_LOAD = 0x00001efc >> 2,
-		NV4097_SET_TRANSFORM_CONSTANT = 0x00001f00 >> 2,
-		NV4097_SET_FREQUENCY_DIVIDER_OPERATION = 0x00001fc0 >> 2,
-		NV4097_SET_ATTRIB_COLOR = 0x00001fc4 >> 2,
-		NV4097_SET_ATTRIB_TEX_COORD = 0x00001fc8 >> 2,
-		NV4097_SET_ATTRIB_TEX_COORD_EX = 0x00001fcc >> 2,
-		NV4097_SET_ATTRIB_UCLIP0 = 0x00001fd0 >> 2,
-		NV4097_SET_ATTRIB_UCLIP1 = 0x00001fd4 >> 2,
-		NV4097_INVALIDATE_L2 = 0x00001fd8 >> 2,
-		NV4097_SET_REDUCE_DST_COLOR = 0x00001fe0 >> 2,
-		NV4097_SET_NO_PARANOID_TEXTURE_FETCHES = 0x00001fe8 >> 2,
-		NV4097_SET_SHADER_PACKER = 0x00001fec >> 2,
-		NV4097_SET_VERTEX_ATTRIB_INPUT_MASK = 0x00001ff0 >> 2,
-		NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK = 0x00001ff4 >> 2,
-		NV4097_SET_TRANSFORM_BRANCH_BITS = 0x00001ff8 >> 2,
-
-		// NV03_MEMORY_TO_MEMORY_FORMAT	(NV0039)
-		NV0039_SET_OBJECT = 0x00002000 >> 2,
-		NV0039_SET_CONTEXT_DMA_NOTIFIES = 0x00002180 >> 2,
-		NV0039_SET_CONTEXT_DMA_BUFFER_IN = 0x00002184 >> 2,
-		NV0039_SET_CONTEXT_DMA_BUFFER_OUT = 0x00002188 >> 2,
-		NV0039_OFFSET_IN = 0x0000230C >> 2,
-		NV0039_OFFSET_OUT = 0x00002310 >> 2,
-		NV0039_PITCH_IN = 0x00002314 >> 2,
-		NV0039_PITCH_OUT = 0x00002318 >> 2,
-		NV0039_LINE_LENGTH_IN = 0x0000231C >> 2,
-		NV0039_LINE_COUNT = 0x00002320 >> 2,
-		NV0039_FORMAT = 0x00002324 >> 2,
-		NV0039_BUFFER_NOTIFY = 0x00002328 >> 2,
-
-		// NV30_CONTEXT_SURFACES_2D	(NV3062)
-		NV3062_SET_OBJECT = 0x00006000 >> 2,
-		NV3062_SET_CONTEXT_DMA_NOTIFIES = 0x00006180 >> 2,
-		NV3062_SET_CONTEXT_DMA_IMAGE_SOURCE = 0x00006184 >> 2,
-		NV3062_SET_CONTEXT_DMA_IMAGE_DESTIN = 0x00006188 >> 2,
-		NV3062_SET_COLOR_FORMAT = 0x00006300 >> 2,
-		NV3062_SET_PITCH = 0x00006304 >> 2,
-		NV3062_SET_OFFSET_SOURCE = 0x00006308 >> 2,
-		NV3062_SET_OFFSET_DESTIN = 0x0000630C >> 2,
-
-		// NV30_CONTEXT_SURFACE_SWIZZLED (NV309E)
-		NV309E_SET_OBJECT = 0x00008000 >> 2,
-		NV309E_SET_CONTEXT_DMA_NOTIFIES = 0x00008180 >> 2,
-		NV309E_SET_CONTEXT_DMA_IMAGE = 0x00008184 >> 2,
-		NV309E_SET_FORMAT = 0x00008300 >> 2,
-		NV309E_SET_OFFSET = 0x00008304 >> 2,
-
-		// NV30_IMAGE_FROM_CPU (NV308A)
-		NV308A_SET_OBJECT = 0x0000A000 >> 2,
-		NV308A_SET_CONTEXT_DMA_NOTIFIES = 0x0000A180 >> 2,
-		NV308A_SET_CONTEXT_COLOR_KEY = 0x0000A184 >> 2,
-		NV308A_SET_CONTEXT_CLIP_RECTANGLE = 0x0000A188 >> 2,
-		NV308A_SET_CONTEXT_PATTERN = 0x0000A18C >> 2,
-		NV308A_SET_CONTEXT_ROP = 0x0000A190 >> 2,
-		NV308A_SET_CONTEXT_BETA1 = 0x0000A194 >> 2,
-		NV308A_SET_CONTEXT_BETA4 = 0x0000A198 >> 2,
-		NV308A_SET_CONTEXT_SURFACE = 0x0000A19C >> 2,
-		NV308A_SET_COLOR_CONVERSION = 0x0000A2F8 >> 2,
-		NV308A_SET_OPERATION = 0x0000A2FC >> 2,
-		NV308A_SET_COLOR_FORMAT = 0x0000A300 >> 2,
-		NV308A_POINT = 0x0000A304 >> 2,
-		NV308A_SIZE_OUT = 0x0000A308 >> 2,
-		NV308A_SIZE_IN = 0x0000A30C >> 2,
-		NV308A_COLOR = 0x0000A400 >> 2,
-
-		// NV30_SCALED_IMAGE_FROM_MEMORY (NV3089)
-		NV3089_SET_OBJECT = 0x0000C000 >> 2,
-		NV3089_SET_CONTEXT_DMA_NOTIFIES = 0x0000C180 >> 2,
-		NV3089_SET_CONTEXT_DMA_IMAGE = 0x0000C184 >> 2,
-		NV3089_SET_CONTEXT_PATTERN = 0x0000C188 >> 2,
-		NV3089_SET_CONTEXT_ROP = 0x0000C18C >> 2,
-		NV3089_SET_CONTEXT_BETA1 = 0x0000C190 >> 2,
-		NV3089_SET_CONTEXT_BETA4 = 0x0000C194 >> 2,
-		NV3089_SET_CONTEXT_SURFACE = 0x0000C198 >> 2,
-		NV3089_SET_COLOR_CONVERSION = 0x0000C2FC >> 2,
-		NV3089_SET_COLOR_FORMAT = 0x0000C300 >> 2,
-		NV3089_SET_OPERATION = 0x0000C304 >> 2,
-		NV3089_CLIP_POINT = 0x0000C308 >> 2,
-		NV3089_CLIP_SIZE = 0x0000C30C >> 2,
-		NV3089_IMAGE_OUT_POINT = 0x0000C310 >> 2,
-		NV3089_IMAGE_OUT_SIZE = 0x0000C314 >> 2,
-		NV3089_DS_DX = 0x0000C318 >> 2,
-		NV3089_DT_DY = 0x0000C31C >> 2,
-		NV3089_IMAGE_IN_SIZE = 0x0000C400 >> 2,
-		NV3089_IMAGE_IN_FORMAT = 0x0000C404 >> 2,
-		NV3089_IMAGE_IN_OFFSET = 0x0000C408 >> 2,
-		NV3089_IMAGE_IN = 0x0000C40C >> 2,
-
-		//lv1 hypervisor commands
-		GCM_SET_DRIVER_OBJECT = 0x0000E000 >> 2,
-		GCM_FLIP_HEAD = 0X0000E920 >> 2,          //0xE920:0xE924: Flip head 0 or 1
-		GCM_DRIVER_QUEUE = 0X0000E940 >> 2,       //0XE940:0xE95C: First two indices prepare display buffers, rest unknown
-		GCM_SET_USER_COMMAND = 0x0000EB00 >> 2,   //0xEB00:0xEB04: User interrupt
-
-		GCM_FLIP_COMMAND = 0x0000FEAC >> 2
-	};
-
-
-	enum Method : u32
-	{
-		/*
-		CELL_GCM_METHOD_FLAG_NON_INCREMENT = 0x40000000,
-		CELL_GCM_METHOD_FLAG_JUMP = 0x20000000,
-		CELL_GCM_METHOD_FLAG_CALL = 0x00000002,
-		CELL_GCM_METHOD_FLAG_RETURN = 0x00020000,
-		*/
-		RSX_METHOD_OLD_JUMP_CMD_MASK = 0xe0000003,
-		RSX_METHOD_OLD_JUMP_CMD = 0x20000000,
-		RSX_METHOD_OLD_JUMP_OFFSET_MASK = 0x1ffffffc,
-
-		RSX_METHOD_INCREMENT_CMD_MASK = 0xe0030003,
-		RSX_METHOD_INCREMENT_CMD = 0,
-		RSX_METHOD_NON_INCREMENT_CMD_MASK = 0xe0030003,
-		RSX_METHOD_NON_INCREMENT_CMD = 0x40000000,
-		RSX_METHOD_COUNT_MASK = 0x1ffc0000,
-		RSX_METHOD_COUNT_SHIFT = 18,
-		RSX_METHOD_METHOD_MASK = 0x0000fffc,
-
-		RSX_METHOD_NEW_JUMP_CMD_MASK = 0xe0000003,
-		RSX_METHOD_NEW_JUMP_CMD = 0x00000001,
-		RSX_METHOD_NEW_JUMP_OFFSET_MASK = 0xfffffffc,
-
-		RSX_METHOD_CALL_CMD_MASK = 0x00000003,
-		RSX_METHOD_CALL_CMD = 0x00000002,
-		RSX_METHOD_CALL_OFFSET_MASK = 0x1ffffffc,
-
-		RSX_METHOD_NON_METHOD_CMD_MASK = 0xa0030003,
-		RSX_METHOD_RETURN_CMD = 0x00020000,
-		RSX_METHOD_RETURN_MASK = 0xffff0003,
-
-		RSX_METHOD_NOP_CMD = 0x00000000,
-		RSX_METHOD_NOP_MASK = 0xbfff0003,
-
-		// Stack is empty (invalid value)
-		RSX_CALL_STACK_EMPTY = 0x00000003,
-	};
-
-	// Fog
-	enum
-	{
-		CELL_GCM_FOG_MODE_LINEAR = 0x2601,
-		CELL_GCM_FOG_MODE_EXP = 0x0800,
-		CELL_GCM_FOG_MODE_EXP2 = 0x0801,
-		CELL_GCM_FOG_MODE_EXP_ABS = 0x0802,
-		CELL_GCM_FOG_MODE_EXP2_ABS = 0x0803,
-		CELL_GCM_FOG_MODE_LINEAR_ABS = 0x0804,
-	};
-
-	// ISO
-	enum
-	{
-		CELL_GCM_TEXTURE_ISO_LOW    = 0,
-		CELL_GCM_TEXTURE_ISO_HIGH   = 1,
-		CELL_GCM_TEXTURE_ANISO_LOW  = 0,
-		CELL_GCM_TEXTURE_ANISO_HIGH = 1,
-	};
-
-	// Depth format
-	enum
-	{
-		CELL_GCM_DEPTH_FORMAT_FIXED = 0,
-		CELL_GCM_DEPTH_FORMAT_FLOAT = 1,
-	};
-
-	// Surface clear bitfields (aggregates)
-	enum
-	{
-		RSX_GCM_CLEAR_DEPTH_BIT = 0x01,
-		RSX_GCM_CLEAR_STENCIL_BIT = 0x02,
-		RSX_GCM_CLEAR_RED_BIT = 0x10,
-		RSX_GCM_CLEAR_GREEN_BIT = 0x20,
-		RSX_GCM_CLEAR_BLUE_BIT = 0x40,
-		RSX_GCM_CLEAR_ALPHA_BIT = 0x80,
-
-		RSX_GCM_CLEAR_COLOR_RG_MASK = (RSX_GCM_CLEAR_RED_BIT | RSX_GCM_CLEAR_GREEN_BIT),
-		RSX_GCM_CLEAR_COLOR_RGB_MASK = (RSX_GCM_CLEAR_RED_BIT | RSX_GCM_CLEAR_GREEN_BIT | RSX_GCM_CLEAR_BLUE_BIT),
-		RSX_GCM_CLEAR_COLOR_RGBA_MASK = (RSX_GCM_CLEAR_COLOR_RGB_MASK | RSX_GCM_CLEAR_ALPHA_BIT),
-		RSX_GCM_CLEAR_DEPTH_STENCIL_MASK = (RSX_GCM_CLEAR_DEPTH_BIT | RSX_GCM_CLEAR_STENCIL_BIT),
-		RSX_GCM_CLEAR_ANY_MASK = (RSX_GCM_CLEAR_COLOR_RGBA_MASK | RSX_GCM_CLEAR_DEPTH_STENCIL_MASK)
-	};
-
-	enum
-	{
-		// Surface Target
-		CELL_GCM_SURFACE_TARGET_NONE = 0,
-		CELL_GCM_SURFACE_TARGET_0 = 1,
-		CELL_GCM_SURFACE_TARGET_1 = 2,
-		CELL_GCM_SURFACE_TARGET_MRT1 = 0x13,
-		CELL_GCM_SURFACE_TARGET_MRT2 = 0x17,
-		CELL_GCM_SURFACE_TARGET_MRT3 = 0x1f,
-
-		// Surface Depth
-		CELL_GCM_SURFACE_Z16 = 1,
-		CELL_GCM_SURFACE_Z24S8 = 2,
-
-		// Surface Antialias
-		CELL_GCM_SURFACE_CENTER_1 = 0,
-		CELL_GCM_SURFACE_DIAGONAL_CENTERED_2 = 3,
-		CELL_GCM_SURFACE_SQUARE_CENTERED_4 = 4,
-		CELL_GCM_SURFACE_SQUARE_ROTATED_4 = 5,
-
-		// Surface format
-		CELL_GCM_SURFACE_X1R5G5B5_Z1R5G5B5 = 1,
-		CELL_GCM_SURFACE_X1R5G5B5_O1R5G5B5 = 2,
-		CELL_GCM_SURFACE_R5G6B5 = 3,
-		CELL_GCM_SURFACE_X8R8G8B8_Z8R8G8B8 = 4,
-		CELL_GCM_SURFACE_X8R8G8B8_O8R8G8B8 = 5,
-		CELL_GCM_SURFACE_A8R8G8B8 = 8,
-		CELL_GCM_SURFACE_B8 = 9,
-		CELL_GCM_SURFACE_G8B8 = 10,
-		CELL_GCM_SURFACE_F_W16Z16Y16X16 = 11,
-		CELL_GCM_SURFACE_F_W32Z32Y32X32 = 12,
-		CELL_GCM_SURFACE_F_X32 = 13,
-		CELL_GCM_SURFACE_X8B8G8R8_Z8B8G8R8 = 14,
-		CELL_GCM_SURFACE_X8B8G8R8_O8B8G8R8 = 15,
-		CELL_GCM_SURFACE_A8B8G8R8 = 16,
-
-		// Wrap
-		CELL_GCM_TEXTURE_WRAP = 1,
-		CELL_GCM_TEXTURE_MIRROR = 2,
-		CELL_GCM_TEXTURE_CLAMP_TO_EDGE = 3,
-		CELL_GCM_TEXTURE_BORDER = 4,
-		CELL_GCM_TEXTURE_CLAMP = 5,
-		CELL_GCM_TEXTURE_MIRROR_ONCE_CLAMP_TO_EDGE = 6,
-		CELL_GCM_TEXTURE_MIRROR_ONCE_BORDER = 7,
-		CELL_GCM_TEXTURE_MIRROR_ONCE_CLAMP = 8,
-
-		// Max Anisotropy
-		CELL_GCM_TEXTURE_MAX_ANISO_1 = 0,
-		CELL_GCM_TEXTURE_MAX_ANISO_2 = 1,
-		CELL_GCM_TEXTURE_MAX_ANISO_4 = 2,
-		CELL_GCM_TEXTURE_MAX_ANISO_6 = 3,
-		CELL_GCM_TEXTURE_MAX_ANISO_8 = 4,
-		CELL_GCM_TEXTURE_MAX_ANISO_10 = 5,
-		CELL_GCM_TEXTURE_MAX_ANISO_12 = 6,
-		CELL_GCM_TEXTURE_MAX_ANISO_16 = 7,
-
-		// Texture Filter
-		CELL_GCM_TEXTURE_NEAREST = 1,
-		CELL_GCM_TEXTURE_LINEAR = 2,
-		CELL_GCM_TEXTURE_NEAREST_NEAREST = 3,
-		CELL_GCM_TEXTURE_LINEAR_NEAREST = 4,
-		CELL_GCM_TEXTURE_NEAREST_LINEAR = 5,
-		CELL_GCM_TEXTURE_LINEAR_LINEAR = 6,
-		CELL_GCM_TEXTURE_CONVOLUTION_MIN = 7,
-		CELL_GCM_TEXTURE_CONVOLUTION_MAG = 4,
-		CELL_GCM_TEXTURE_CONVOLUTION_QUINCUNX = 1,
-		CELL_GCM_TEXTURE_CONVOLUTION_GAUSSIAN = 2,
-		CELL_GCM_TEXTURE_CONVOLUTION_QUINCUNX_ALT = 3,
-	};
-
-	enum
-	{
-		CELL_GCM_CLEAR = 0x1500,
-		CELL_GCM_AND = 0x1501,
-		CELL_GCM_AND_REVERSE = 0x1502,
-		CELL_GCM_COPY = 0x1503,
-		CELL_GCM_AND_INVERTED = 0x1504,
-		CELL_GCM_NOOP = 0x1505,
-		CELL_GCM_XOR = 0x1506,
-		CELL_GCM_OR = 0x1507,
-		CELL_GCM_NOR = 0x1508,
-		CELL_GCM_EQUIV = 0x1509,
-		CELL_GCM_OR_REVERSE = 0x150B,
-		CELL_GCM_COPY_INVERTED = 0x150C,
-		CELL_GCM_OR_INVERTED = 0x150D,
-		CELL_GCM_NAND = 0x150E,
-		CELL_GCM_SET = 0x150F,
-	};
-
-	enum
-	{
-		CELL_GCM_TRANSFER_ORIGIN_CENTER = 1,
-		CELL_GCM_TRANSFER_ORIGIN_CORNER = 2,
-
-		CELL_GCM_TRANSFER_INTERPOLATOR_ZOH = 0,
-		CELL_GCM_TRANSFER_INTERPOLATOR_FOH = 1,
-	};
-
-	enum
-	{
-		CELL_GCM_TRANSFER_OPERATION_SRCCOPY_AND = 0,
-		CELL_GCM_TRANSFER_OPERATION_ROP_AND = 1,
-		CELL_GCM_TRANSFER_OPERATION_BLEND_AND = 2,
-		CELL_GCM_TRANSFER_OPERATION_SRCCOPY = 3,
-		CELL_GCM_TRANSFER_OPERATION_SRCCOPY_PREMULT = 4,
-		CELL_GCM_TRANSFER_OPERATION_BLEND_PREMULT = 5,
-	};
-
-	enum
-	{
-		CELL_GCM_TRANSFER_CONVERSION_DITHER            = 0,
-		CELL_GCM_TRANSFER_CONVERSION_TRUNCATE          = 1,
-		CELL_GCM_TRANSFER_CONVERSION_SUBTRACT_TRUNCATE = 2,
-	};
-
-	enum
-	{
-		CELL_GCM_TRANSFER_SCALE_FORMAT_A1R5G5B5 = 1,
-		CELL_GCM_TRANSFER_SCALE_FORMAT_X1R5G5B5 = 2,
-		CELL_GCM_TRANSFER_SCALE_FORMAT_A8R8G8B8 = 3,
-		CELL_GCM_TRANSFER_SCALE_FORMAT_X8R8G8B8 = 4,
-		CELL_GCM_TRANSFER_SCALE_FORMAT_CR8YB8CB8YA8 = 5,
-		CELL_GCM_TRANSFER_SCALE_FORMAT_YB8CR8YA8CB8 = 6,
-		CELL_GCM_TRANSFER_SCALE_FORMAT_R5G6B5 = 7,
-		CELL_GCM_TRANSFER_SCALE_FORMAT_Y8 = 8,
-		CELL_GCM_TRANSFER_SCALE_FORMAT_AY8 = 9,
-		CELL_GCM_TRANSFER_SCALE_FORMAT_EYB8ECR8EYA8ECB8 = 10,
-		CELL_GCM_TRANSFER_SCALE_FORMAT_ECR8EYB8ECB8EYA8 = 11,
-		CELL_GCM_TRANSFER_SCALE_FORMAT_A8B8G8R8 = 12,
-		CELL_GCM_TRANSFER_SCALE_FORMAT_X8B8G8R8 = 13,
-	};
-
-	enum
-	{
-		// Destination Format conversions
-		CELL_GCM_TRANSFER_SURFACE_FORMAT_R5G6B5 = 4,
-		CELL_GCM_TRANSFER_SURFACE_FORMAT_A8R8G8B8 = 10,
-		CELL_GCM_TRANSFER_SURFACE_FORMAT_Y32 = 11,
-	};
-
-	enum
-	{
-		CELL_GCM_TRANSFER_SURFACE = 0,
-		CELL_GCM_TRANSFER_SWIZZLE = 1,
-	};
-
-	enum
-	{
-		CELL_GCM_SHIFT_SET_SHADER_CONTROL_CONTROL_TXP = 15,
-		CELL_GCM_MASK_SET_SHADER_CONTROL_CONTROL_TXP  = 0x00008000,
-
-		CELL_GCM_IOMAP_FLAG_STRICT_ORDERING = 1 << 1,
-	};
-
-	enum
-	{
-		CELL_GCM_CONTEXT_SURFACE2D = 0x313371C3,
-		CELL_GCM_CONTEXT_SWIZZLE2D = 0x31337A73,
-	};
-
-	enum
-	{
-		CELL_GCM_INDEX_RANGE_LABEL_MIN = 64,
-		CELL_GCM_INDEX_RANGE_LABEL_MAX = 255,
-		CELL_GCM_INDEX_RANGE_LABEL_COUNT = (256 - 64),
-
-		CELL_GCM_INDEX_RANGE_NOTIFY_MAIN_MIN = 0,
-		CELL_GCM_INDEX_RANGE_NOTIFY_MAIN_MAX = 255,
-		CELL_GCM_INDEX_RANGE_NOTIFY_MAIN_COUNT = 256,
-
-		CELL_GCM_INDEX_RANGE_REPORT_MAIN_MIN = 0,
-		CELL_GCM_INDEX_RANGE_REPORT_MAIN_MAX = (1024 * 1024 - 1),
-		CELL_GCM_INDEX_RANGE_REPORT_MAIN_COUNT = (1024 * 1024),
-		CELL_GCM_INDEX_RANGE_REPORT_LOCAL_MIN = 0,
-		CELL_GCM_INDEX_RANGE_REPORT_LOCAL_MAX = 2047,
-		CELL_GCM_INDEX_RANGE_REPORT_LOCAL_COUNT = 2048,
-
-		CELL_GCM_INDEX_RANGE_TILE_MIN = 0,
-		CELL_GCM_INDEX_RANGE_TILE_MAX = 14,
-		CELL_GCM_INDEX_RANGE_TILE_COUNT = 15,
-
-		CELL_GCM_INDEX_RANGE_ZCULL_MIN = 0,
-		CELL_GCM_INDEX_RANGE_ZCULL_MAX = 7,
-		CELL_GCM_INDEX_RANGE_ZCULL_COUNT = 8,
-	};
-
-	enum
-	{
-		CELL_GCM_DISPLAY_FIELD_TOP    = 1,
-		CELL_GCM_DISPLAY_FIELD_BOTTOM = 0,
-	};
-
-	enum
-	{
-		CELL_GCM_USER_CLIP_PLANE_DISABLE = 0,
-		CELL_GCM_USER_CLIP_PLANE_ENABLE_LT = 1,
-		CELL_GCM_USER_CLIP_PLANE_ENABLE_GE = 2,
-	};
-
-	enum
-	{
-		CELL_GCM_FLAT = 0x1D00,
-		CELL_GCM_SMOOTH = 0x1D01,
-	};
-
-	enum
-	{
-		CELL_GCM_POLYGON_MODE_POINT = 0x1B00,
-		CELL_GCM_POLYGON_MODE_LINE = 0x1B01,
-		CELL_GCM_POLYGON_MODE_FILL = 0x1B02,
-	};
-
-	enum
-	{
-		CELL_GCM_CLEAR_Z = 1 << 0,
-		CELL_GCM_CLEAR_S = 1 << 1,
-		CELL_GCM_CLEAR_R = 1 << 4,
-		CELL_GCM_CLEAR_G = 1 << 5,
-		CELL_GCM_CLEAR_B = 1 << 6,
-		CELL_GCM_CLEAR_A = 1 << 7,
-		CELL_GCM_CLEAR_M = 0xf3
-	};
-
-	enum
-	{
-		CELL_GCM_VERTEX_S1    = 1,
-		CELL_GCM_VERTEX_F     = 2,
-		CELL_GCM_VERTEX_SF    = 3,
-		CELL_GCM_VERTEX_UB    = 4,
-		CELL_GCM_VERTEX_S32K  = 5,
-		CELL_GCM_VERTEX_CMP   = 6,
-		CELL_GCM_VERTEX_UB256 = 7,
-
-		CELL_GCM_VERTEX_S16_NR       = 1,
-		CELL_GCM_VERTEX_F32          = 2,
-		CELL_GCM_VERTEX_F16          = 3,
-		CELL_GCM_VERTEX_U8_NR        = 4,
-		CELL_GCM_VERTEX_S16_UN       = 5,
-		CELL_GCM_VERTEX_S11_11_10_NR = 6,
-		CELL_GCM_VERTEX_U8_UN        = 7,
-	};
-
-	enum
-	{
-		CELL_GCM_WINDOW_ORIGIN_TOP = 0,
-		CELL_GCM_WINDOW_ORIGIN_BOTTOM = 1,
-		CELL_GCM_WINDOW_PIXEL_CENTER_HALF = 0,
-		CELL_GCM_WINDOW_PIXEL_CENTER_INTEGER = 1,
-	};
-
-	enum
-	{
-		RSX_VERTEX_BASE_TYPE_UNDEFINED = 0,
-		RSX_VERTEX_BASE_TYPE_SNORM16,
-		RSX_VERTEX_BASE_TYPE_FLOAT,
-		RSX_VERTEX_BASE_TYPE_HALF_FLOAT,
-		RSX_VERTEX_BASE_TYPE_UNORM8,
-		RSX_VERTEX_BASE_TYPE_SINT16,
-		RSX_VERTEX_BASE_TYPE_CMP32,
-		RSX_VERTEX_BASE_TYPE_UINT8,
-	};
-}
-
-// Public export
-// TODO: Don't leak namespaces
-using namespace gcm;
 
 namespace rsx
 {
-	template <typename T, u32 min_val, u32 max_val>
-	expected<T> gcm_enum_cast(u32 value)
-	{
-		if (value >= min_val && value <= max_val)
-		{
-			return static_cast<T>(value);
-		}
-
-		return exception_utils::soft_exception_t{ rsx::exception_utils::invalid_enum };
-	}
-
-	template <typename T>
-	expected<T> gcm_enum_cast(u32 value, std::initializer_list<u32> allowed)
-	{
-		for (const auto v : allowed)
-		{
-			if (value == v)
-			{
-				return static_cast<T>(value);
-			}
-		}
-
-		return exception_utils::soft_exception_t{ rsx::exception_utils::invalid_enum };
-	}
-
-	template <typename T>
-	expected<T> gcm_enum_cast(u32 value, std::initializer_list<const std::array<u32, 2>> allowed)
-	{
-		for (const auto& range : allowed)
-		{
-			if (value >= range[0] && value <= range[1])
-			{
-				return static_cast<T>(value);
-			}
-		}
-
-		return exception_utils::soft_exception_t{ rsx::exception_utils::invalid_enum };
-	}
-
 	enum class vertex_base_type : u8
 	{
-		s1 = RSX_VERTEX_BASE_TYPE_SNORM16,    ///< signed normalized 16-bit int
-		f  = RSX_VERTEX_BASE_TYPE_FLOAT,      ///< float
-		sf = RSX_VERTEX_BASE_TYPE_HALF_FLOAT, ///< half float
-		ub = RSX_VERTEX_BASE_TYPE_UNORM8,     ///< unsigned byte interpreted as 0.f and 1.f
-		s32k = RSX_VERTEX_BASE_TYPE_SINT16,   ///< signed 16bits int
-		cmp  = RSX_VERTEX_BASE_TYPE_CMP32,    ///< compressed aka X11G11Z10 and always 1. W.
-		ub256 = RSX_VERTEX_BASE_TYPE_UINT8,   ///< unsigned byte interpreted as between 0 and 255.
+		s1, ///< signed normalized 16-bit int
+		f, ///< float
+		sf, ///< half float
+		ub, ///< unsigned byte interpreted as 0.f and 1.f
+		s32k, ///< signed 16bits int
+		cmp, ///< compressed aka X11G11Z10 and always 1. W.
+		ub256, ///< unsigned byte interpreted as between 0 and 255.
 	};
 
-	static inline auto to_vertex_base_type(u32 in)
-	{
-		return in
-			? gcm_enum_cast<
-				vertex_base_type,
-				RSX_VERTEX_BASE_TYPE_SNORM16,
-				RSX_VERTEX_BASE_TYPE_UINT8>(in)
-			: expected(vertex_base_type::ub256);
-	}
+	vertex_base_type to_vertex_base_type(u8 in);
 
 	enum class index_array_type : u8
 	{
-		u32 = CELL_GCM_DRAW_INDEX_ARRAY_TYPE_32,
-		u16 = CELL_GCM_DRAW_INDEX_ARRAY_TYPE_16
+		u32 = 0, // CELL_GCM_DRAW_INDEX_ARRAY_TYPE_32
+		u16 = 1, // CELL_GCM_DRAW_INDEX_ARRAY_TYPE_16
 	};
 
 	enum class primitive_type : u8
 	{
-		points = CELL_GCM_PRIMITIVE_POINTS,
-		lines  = CELL_GCM_PRIMITIVE_LINES,
-		line_loop = CELL_GCM_PRIMITIVE_LINE_LOOP, // line strip with last end being joined with first end.
-		line_strip = CELL_GCM_PRIMITIVE_LINE_STRIP,
-		triangles  = CELL_GCM_PRIMITIVE_TRIANGLES,
-		triangle_strip = CELL_GCM_PRIMITIVE_TRIANGLE_STRIP,
-		triangle_fan = CELL_GCM_PRIMITIVE_TRIANGLE_FAN, // like strip except that every triangle share the first vertex and one instead of 2 from previous triangle.
-		quads = CELL_GCM_PRIMITIVE_QUADS,
-		quad_strip = CELL_GCM_PRIMITIVE_QUAD_STRIP,
-		polygon = CELL_GCM_PRIMITIVE_POLYGON, // convex polygon
+		invalid,
+		points,
+		lines,
+		line_loop, // line strip with last end being joined with first end.
+		line_strip,
+		triangles,
+		triangle_strip,
+		triangle_fan, // like strip except that every triangle share the first vertex and one instead of 2 from previous triangle.
+		quads,
+		quad_strip,
+		polygon, // convex polygon
 	};
 
-	static inline auto to_primitive_type(u32 in)
-	{
-		return gcm_enum_cast<
-			primitive_type,
-			CELL_GCM_PRIMITIVE_POINTS,
-			CELL_GCM_PRIMITIVE_POLYGON>(in);
-	}
+	primitive_type to_primitive_type(u8 in);
 
 	enum class surface_target : u8
 	{
-		none = CELL_GCM_SURFACE_TARGET_NONE,
-		surface_a = CELL_GCM_SURFACE_TARGET_0,
-		surface_b = CELL_GCM_SURFACE_TARGET_1,
-		surfaces_a_b = CELL_GCM_SURFACE_TARGET_MRT1,
-		surfaces_a_b_c = CELL_GCM_SURFACE_TARGET_MRT2,
-		surfaces_a_b_c_d = CELL_GCM_SURFACE_TARGET_MRT3,
+		none,
+		surface_a,
+		surface_b,
+		surfaces_a_b,
+		surfaces_a_b_c,
+		surfaces_a_b_c_d,
 	};
 
-	static inline auto to_surface_target(u32 in)
-	{
-		return gcm_enum_cast<surface_target>(in, {
-			CELL_GCM_SURFACE_TARGET_0,
-			CELL_GCM_SURFACE_TARGET_MRT1,
-			CELL_GCM_SURFACE_TARGET_NONE,
-			CELL_GCM_SURFACE_TARGET_1,
-			CELL_GCM_SURFACE_TARGET_MRT2,
-			CELL_GCM_SURFACE_TARGET_MRT3
-		});
-	}
+	surface_target to_surface_target(u8 in);
 
 	enum class surface_depth_format : u8
 	{
-		z16 = CELL_GCM_SURFACE_Z16,     // typeless 16 bits depth
-		z24s8 = CELL_GCM_SURFACE_Z24S8, // typeless 24 bits depth + 8 bits stencil
+		z16,   // typeless 16 bits depth
+		z24s8, // typeless 24 bits depth + 8 bits stencil
 	};
 
 	enum class surface_depth_format2 : u8
 	{
-		z16_uint = CELL_GCM_SURFACE_Z16,      // unsigned 16 bits depth
-		z24s8_uint = CELL_GCM_SURFACE_Z24S8,  // unsigned 24 bits depth + 8 bits stencil
+		z16_uint,    // unsigned 16 bits depth
+		z24s8_uint,  // unsigned 24 bits depth + 8 bits stencil
 		z16_float,   // floating point 16 bits depth
 		z24s8_float, // floating point 24 bits depth + 8 bits stencil
 	};
 
-	static inline auto to_surface_depth_format(u32 in)
-	{
-		return gcm_enum_cast<
-			surface_depth_format,
-			CELL_GCM_SURFACE_Z16,
-			CELL_GCM_SURFACE_Z24S8>(in);
-	}
+	surface_depth_format to_surface_depth_format(u8 in);
 
 	constexpr bool operator ==(surface_depth_format2 rhs, surface_depth_format lhs)
 	{
@@ -1304,132 +83,82 @@ namespace rsx
 
 	enum class surface_raster_type : u8
 	{
-		undefined = CELL_GCM_ZERO, // TODO: Drop this (used in surface cache for optional args)
-		linear = CELL_GCM_SURFACE_PITCH,
-		swizzle = CELL_GCM_SURFACE_SWIZZLE,
+		undefined = 0,
+		linear = 1,
+		swizzle = 2,
 	};
 
-	static inline auto to_surface_raster_type(u32 in)
-	{
-		return gcm_enum_cast<
-			surface_raster_type,
-			CELL_GCM_SURFACE_PITCH,
-			CELL_GCM_SURFACE_SWIZZLE>(in);
-	}
-
 	enum class surface_antialiasing : u8
 	{
-		center_1_sample = CELL_GCM_SURFACE_CENTER_1,
-		diagonal_centered_2_samples = CELL_GCM_SURFACE_DIAGONAL_CENTERED_2,
-		square_centered_4_samples = CELL_GCM_SURFACE_SQUARE_CENTERED_4,
-		square_rotated_4_samples = CELL_GCM_SURFACE_SQUARE_ROTATED_4,
+		center_1_sample,
+		diagonal_centered_2_samples,
+		square_centered_4_samples,
+		square_rotated_4_samples,
 	};
 
-	static inline auto to_surface_antialiasing(u32 in)
-	{
-		return gcm_enum_cast<surface_antialiasing>(in,
-		{
-			{ CELL_GCM_SURFACE_CENTER_1, CELL_GCM_SURFACE_CENTER_1 },
-			{ CELL_GCM_SURFACE_DIAGONAL_CENTERED_2, CELL_GCM_SURFACE_SQUARE_ROTATED_4 }
-		});
-	}
+	surface_antialiasing to_surface_antialiasing(u8 in);
 
 	enum class surface_color_format : u8
 	{
-		x1r5g5b5_z1r5g5b5 = CELL_GCM_SURFACE_X1R5G5B5_Z1R5G5B5,
-		x1r5g5b5_o1r5g5b5 = CELL_GCM_SURFACE_X1R5G5B5_O1R5G5B5,
-		r5g6b5 = CELL_GCM_SURFACE_R5G6B5,
-		x8r8g8b8_z8r8g8b8 = CELL_GCM_SURFACE_X8R8G8B8_Z8R8G8B8,
-		x8r8g8b8_o8r8g8b8 = CELL_GCM_SURFACE_X8R8G8B8_O8R8G8B8,
-		a8r8g8b8 = CELL_GCM_SURFACE_A8R8G8B8,
-		b8 = CELL_GCM_SURFACE_B8,
-		g8b8 = CELL_GCM_SURFACE_G8B8,
-		x8b8g8r8_z8b8g8r8 = CELL_GCM_SURFACE_X8B8G8R8_Z8B8G8R8,
-		x8b8g8r8_o8b8g8r8 = CELL_GCM_SURFACE_X8B8G8R8_O8B8G8R8,
-		a8b8g8r8 = CELL_GCM_SURFACE_A8B8G8R8,
-		w16z16y16x16 = CELL_GCM_SURFACE_F_W16Z16Y16X16,
-		w32z32y32x32 = CELL_GCM_SURFACE_F_W32Z32Y32X32,
-		x32 = CELL_GCM_SURFACE_F_X32
+		x1r5g5b5_z1r5g5b5,
+		x1r5g5b5_o1r5g5b5,
+		r5g6b5,
+		x8r8g8b8_z8r8g8b8,
+		x8r8g8b8_o8r8g8b8,
+		a8r8g8b8,
+		b8,
+		g8b8,
+		w16z16y16x16,
+		w32z32y32x32,
+		x32,
+		x8b8g8r8_z8b8g8r8,
+		x8b8g8r8_o8b8g8r8,
+		a8b8g8r8,
 	};
 
-	static inline auto to_surface_color_format(u32 in)
-	{
-		return gcm_enum_cast<
-			surface_color_format,
-			CELL_GCM_SURFACE_X1R5G5B5_Z1R5G5B5,
-			CELL_GCM_SURFACE_A8B8G8R8>(in);
-	}
+	surface_color_format to_surface_color_format(u8 in);
 
 	enum class window_origin : u8
 	{
-		top = CELL_GCM_WINDOW_ORIGIN_TOP,
-		bottom = CELL_GCM_WINDOW_ORIGIN_BOTTOM
+		top,
+		bottom
 	};
 
-	static inline auto to_window_origin(u32 in)
-	{
-		return gcm_enum_cast<
-			window_origin,
-			CELL_GCM_WINDOW_ORIGIN_TOP,
-			CELL_GCM_WINDOW_ORIGIN_BOTTOM>(in);
-	}
+	window_origin to_window_origin(u8 in);
 
 	enum class window_pixel_center : u8
 	{
-		half = CELL_GCM_WINDOW_PIXEL_CENTER_HALF,
-		integer = CELL_GCM_WINDOW_PIXEL_CENTER_INTEGER
+		half,
+		integer
 	};
 
-	static inline auto to_window_pixel_center(u32 in)
-	{
-		return gcm_enum_cast<
-			window_pixel_center,
-			CELL_GCM_WINDOW_PIXEL_CENTER_HALF,
-			CELL_GCM_WINDOW_PIXEL_CENTER_INTEGER>(in);
-	}
+	window_pixel_center to_window_pixel_center(u8 in);
 
-	enum class comparison_function : u16
+	enum class comparison_function : u8
 	{
-		never = CELL_GCM_NEVER,
-		less = CELL_GCM_LESS,
-		equal = CELL_GCM_EQUAL,
-		less_or_equal = CELL_GCM_LEQUAL,
-		greater = CELL_GCM_GREATER,
-		not_equal = CELL_GCM_NOTEQUAL,
-		greater_or_equal = CELL_GCM_GEQUAL,
-		always = CELL_GCM_ALWAYS,
+		never,
+		less,
+		equal,
+		less_or_equal,
+		greater,
+		not_equal,
+		greater_or_equal,
+		always
 	};
 
-	static inline auto to_comparison_function(u32 in)
-	{
-		return gcm_enum_cast<
-			comparison_function,
-			CELL_GCM_NEVER,
-			CELL_GCM_ALWAYS>(in | 0x200);
-	}
+	comparison_function to_comparison_function(u16 in);
 
-	enum class fog_mode : u16
+	enum class fog_mode : u8
 	{
-		linear = CELL_GCM_FOG_MODE_LINEAR,
-		exponential = CELL_GCM_FOG_MODE_EXP,
-		exponential2 = CELL_GCM_FOG_MODE_EXP2,
-		exponential_abs = CELL_GCM_FOG_MODE_EXP_ABS,
-		exponential2_abs = CELL_GCM_FOG_MODE_EXP2_ABS,
-		linear_abs = CELL_GCM_FOG_MODE_LINEAR_ABS
+		linear,
+		exponential,
+		exponential2,
+		exponential_abs,
+		exponential2_abs,
+		linear_abs
 	};
 
-	static inline auto to_fog_mode(u32 in)
-	{
-		if (in == CELL_GCM_FOG_MODE_LINEAR)
-		{
-			return expected(fog_mode::linear);
-		}
-
-		return gcm_enum_cast<
-			fog_mode,
-			CELL_GCM_FOG_MODE_EXP,
-			CELL_GCM_FOG_MODE_LINEAR_ABS>(in);
-	}
+	fog_mode to_fog_mode(u32 in);
 
 	/**
 	* Use an extra cubemap format
@@ -1444,381 +173,1007 @@ namespace rsx
 
 	enum class texture_dimension : u8
 	{
-		dimension1d = 1,
-		dimension2d = 2,
-		dimension3d = 3,
+		dimension1d,
+		dimension2d,
+		dimension3d,
 	};
 
-	static inline auto to_texture_dimension(u32 in)
-	{
-		return gcm_enum_cast<texture_dimension, 1, 3>(in);
-	}
+	texture_dimension to_texture_dimension(u8 in);
 
 	enum class texture_wrap_mode : u8
 	{
-		wrap = CELL_GCM_TEXTURE_WRAP,
-		mirror = CELL_GCM_TEXTURE_MIRROR,
-		clamp_to_edge = CELL_GCM_TEXTURE_CLAMP_TO_EDGE,
-		border = CELL_GCM_TEXTURE_BORDER,
-		clamp = CELL_GCM_TEXTURE_CLAMP,
-		mirror_once_clamp_to_edge = CELL_GCM_TEXTURE_MIRROR_ONCE_CLAMP_TO_EDGE,
-		mirror_once_border = CELL_GCM_TEXTURE_MIRROR_ONCE_BORDER,
-		mirror_once_clamp = CELL_GCM_TEXTURE_MIRROR_ONCE_CLAMP,
+		wrap,
+		mirror,
+		clamp_to_edge,
+		border,
+		clamp,
+		mirror_once_clamp_to_edge,
+		mirror_once_border,
+		mirror_once_clamp,
 	};
 
-	static inline auto to_texture_wrap_mode(u32 in)
-	{
-		return gcm_enum_cast<
-			texture_wrap_mode,
-			CELL_GCM_TEXTURE_WRAP,
-			CELL_GCM_TEXTURE_MIRROR_ONCE_CLAMP>(in);
-	}
+	texture_wrap_mode to_texture_wrap_mode(u8 in);
 
 	enum class texture_max_anisotropy : u8
 	{
-		x1 = CELL_GCM_TEXTURE_MAX_ANISO_1,
-		x2 = CELL_GCM_TEXTURE_MAX_ANISO_2,
-		x4 = CELL_GCM_TEXTURE_MAX_ANISO_4,
-		x6 = CELL_GCM_TEXTURE_MAX_ANISO_6,
-		x8 = CELL_GCM_TEXTURE_MAX_ANISO_8,
-		x10 = CELL_GCM_TEXTURE_MAX_ANISO_10,
-		x12 = CELL_GCM_TEXTURE_MAX_ANISO_12,
-		x16 = CELL_GCM_TEXTURE_MAX_ANISO_16,
+		x1,
+		x2,
+		x4,
+		x6,
+		x8,
+		x10,
+		x12,
+		x16,
 	};
 
-	static inline auto to_texture_max_anisotropy(u32 in)
-	{
-		return gcm_enum_cast<
-			texture_max_anisotropy,
-			CELL_GCM_TEXTURE_MAX_ANISO_1,
-			CELL_GCM_TEXTURE_MAX_ANISO_16>(in);
-	}
+	texture_max_anisotropy to_texture_max_anisotropy(u8 in);
 
 	enum class texture_minify_filter : u8
 	{
-		nearest = CELL_GCM_TEXTURE_NEAREST, ///< no filtering, mipmap base level
-		linear  = CELL_GCM_TEXTURE_LINEAR, ///< linear filtering, mipmap base level
-		nearest_nearest = CELL_GCM_TEXTURE_NEAREST_NEAREST, ///< no filtering, closest mipmap level
-		linear_nearest = CELL_GCM_TEXTURE_LINEAR_NEAREST, ///< linear filtering, closest mipmap level
-		nearest_linear = CELL_GCM_TEXTURE_NEAREST_LINEAR, ///< no filtering, linear mix between closest mipmap levels
-		linear_linear  = CELL_GCM_TEXTURE_LINEAR_LINEAR, ///< linear filtering, linear mix between closest mipmap levels
-		convolution_min = CELL_GCM_TEXTURE_CONVOLUTION_MIN, ///< Unknown mode but looks close to linear_linear
+		nearest, ///< no filtering, mipmap base level
+		linear, ///< linear filtering, mipmap base level
+		nearest_nearest, ///< no filtering, closest mipmap level
+		linear_nearest, ///< linear filtering, closest mipmap level
+		nearest_linear, ///< no filtering, linear mix between closest mipmap levels
+		linear_linear, ///< linear filtering, linear mix between closest mipmap levels
+		convolution_min, ///< Unknown mode but looks close to linear_linear
 	};
 
-	static inline auto to_texture_minify_filter(u32 in)
-	{
-		return gcm_enum_cast<
-			texture_minify_filter,
-			CELL_GCM_TEXTURE_NEAREST,
-			CELL_GCM_TEXTURE_CONVOLUTION_MIN>(in);
-	}
+	texture_minify_filter to_texture_minify_filter(u8 in);
 
 	enum class texture_magnify_filter : u8
 	{
-		nearest = CELL_GCM_TEXTURE_NEAREST, ///< no filtering
-		linear = CELL_GCM_TEXTURE_LINEAR, ///< linear filtering
-		convolution_mag = CELL_GCM_TEXTURE_CONVOLUTION_MAG, ///< Unknown mode but looks close to linear
+		nearest, ///< no filtering
+		linear, ///< linear filtering
+		convolution_mag, ///< Unknown mode but looks close to linear
 	};
 
-	static inline auto to_texture_magnify_filter(u32 in)
-	{
-		return gcm_enum_cast<texture_magnify_filter>(in, { CELL_GCM_TEXTURE_LINEAR, CELL_GCM_TEXTURE_NEAREST, CELL_GCM_TEXTURE_CONVOLUTION_MAG });
-	}
+	texture_magnify_filter to_texture_magnify_filter(u8 in);
 
-	enum class stencil_op : u16
+	enum class stencil_op : u8
 	{
-		keep = CELL_GCM_KEEP,
-		zero = CELL_GCM_ZERO,
-		replace = CELL_GCM_REPLACE,
-		incr = CELL_GCM_INCR,
-		decr = CELL_GCM_DECR,
-		invert = CELL_GCM_INVERT,
-		incr_wrap = CELL_GCM_INCR_WRAP,
-		decr_wrap = CELL_GCM_DECR_WRAP,
+		keep,
+		zero,
+		replace,
+		incr,
+		decr,
+		invert,
+		incr_wrap,
+		decr_wrap,
 	};
 
-	static inline auto to_stencil_op(u32 in)
-	{
-		return gcm_enum_cast<stencil_op>(in,
-		{
-			CELL_GCM_KEEP, CELL_GCM_ZERO, CELL_GCM_REPLACE,
-			CELL_GCM_INCR, CELL_GCM_DECR, CELL_GCM_INVERT,
-			CELL_GCM_INCR_WRAP, CELL_GCM_DECR_WRAP
-		});
-	}
+	stencil_op to_stencil_op(u16 in);
 
-	enum class blend_equation : u16
+	enum class blend_equation : u8
 	{
-		add = CELL_GCM_FUNC_ADD,
-		min = CELL_GCM_MIN,
-		max = CELL_GCM_MAX,
-		subtract = CELL_GCM_FUNC_SUBTRACT,
-		reverse_subtract = CELL_GCM_FUNC_REVERSE_SUBTRACT,
-		reverse_subtract_signed = CELL_GCM_FUNC_REVERSE_SUBTRACT_SIGNED,
-		add_signed = CELL_GCM_FUNC_ADD_SIGNED,
-		reverse_add_signed = CELL_GCM_FUNC_REVERSE_ADD_SIGNED,
+		add,
+		min,
+		max,
+		substract,
+		reverse_substract,
+		reverse_substract_signed,
+		add_signed,
+		reverse_add_signed,
 	};
 
-	static inline auto to_blend_equation(u32 in)
-	{
-		return gcm_enum_cast<blend_equation>(in,
-		{
-			{ CELL_GCM_FUNC_ADD, CELL_GCM_FUNC_REVERSE_SUBTRACT },
-			{ CELL_GCM_FUNC_REVERSE_SUBTRACT_SIGNED, CELL_GCM_FUNC_REVERSE_ADD_SIGNED }
-		});
-	}
+	blend_equation to_blend_equation(u16 in);
 
-	enum class blend_factor : u16
+	enum class blend_factor : u8
 	{
-		zero = CELL_GCM_ZERO,
-		one = CELL_GCM_ONE,
-		src_color = CELL_GCM_SRC_COLOR,
-		one_minus_src_color = CELL_GCM_ONE_MINUS_SRC_COLOR,
-		dst_color = CELL_GCM_DST_COLOR,
-		one_minus_dst_color = CELL_GCM_ONE_MINUS_DST_COLOR,
-		src_alpha = CELL_GCM_SRC_ALPHA,
-		one_minus_src_alpha = CELL_GCM_ONE_MINUS_SRC_ALPHA,
-		dst_alpha = CELL_GCM_DST_ALPHA,
-		one_minus_dst_alpha = CELL_GCM_ONE_MINUS_DST_ALPHA,
-		src_alpha_saturate = CELL_GCM_SRC_ALPHA_SATURATE,
-		constant_color = CELL_GCM_CONSTANT_COLOR,
-		one_minus_constant_color = CELL_GCM_ONE_MINUS_CONSTANT_COLOR,
-		constant_alpha = CELL_GCM_CONSTANT_ALPHA,
-		one_minus_constant_alpha = CELL_GCM_ONE_MINUS_CONSTANT_ALPHA,
+		zero,
+		one,
+		src_color,
+		one_minus_src_color,
+		dst_color,
+		one_minus_dst_color,
+		src_alpha,
+		one_minus_src_alpha,
+		dst_alpha,
+		one_minus_dst_alpha,
+		src_alpha_saturate,
+		constant_color,
+		one_minus_constant_color,
+		constant_alpha,
+		one_minus_constant_alpha,
 	};
 
-	static inline auto to_blend_factor(u32 in)
-	{
-		return gcm_enum_cast<blend_factor>(in,
-		{
-			{ CELL_GCM_SRC_COLOR, CELL_GCM_ONE_MINUS_CONSTANT_ALPHA },
-			{ CELL_GCM_ZERO, CELL_GCM_ONE }
-		});
-	}
+	blend_factor to_blend_factor(u16 in);
 
-	enum class logic_op : u16
+	enum class logic_op : u8
 	{
-		logic_clear = CELL_GCM_CLEAR,
-		logic_and = CELL_GCM_AND,
-		logic_and_reverse = CELL_GCM_AND_REVERSE,
-		logic_copy = CELL_GCM_COPY,
-		logic_and_inverted = CELL_GCM_AND_INVERTED,
-		logic_noop = CELL_GCM_NOOP,
-		logic_xor = CELL_GCM_XOR,
-		logic_or = CELL_GCM_OR,
-		logic_nor = CELL_GCM_NOR,
-		logic_equiv = CELL_GCM_EQUIV,
-		logic_invert = CELL_GCM_INVERT,
-		logic_or_reverse = CELL_GCM_OR_REVERSE,
-		logic_copy_inverted = CELL_GCM_COPY_INVERTED,
-		logic_or_inverted = CELL_GCM_OR_INVERTED,
-		logic_nand = CELL_GCM_NAND,
-		logic_set = CELL_GCM_SET,
+		logic_clear,
+		logic_and,
+		logic_and_reverse,
+		logic_copy,
+		logic_and_inverted,
+		logic_noop,
+		logic_xor,
+		logic_or,
+		logic_nor,
+		logic_equiv,
+		logic_invert,
+		logic_or_reverse,
+		logic_copy_inverted,
+		logic_or_inverted,
+		logic_nand,
+		logic_set,
 	};
 
-	static inline auto to_logic_op(u32 in)
-	{
-		return gcm_enum_cast<
-			logic_op,
-			CELL_GCM_CLEAR,
-			CELL_GCM_SET>(in);
-	}
+	logic_op to_logic_op(u16 in);
 
-	enum class front_face : u16
+	enum class front_face : u8
 	{
-		cw = CELL_GCM_CW, /// clockwise
-		ccw = CELL_GCM_CCW, /// counter clockwise
+		cw, /// clockwise
+		ccw /// counter clockwise
 	};
 
-	static inline auto to_front_face(u32 in)
-	{
-		return gcm_enum_cast<
-			front_face,
-			CELL_GCM_CW,
-			CELL_GCM_CCW>(in);
-	}
+	front_face to_front_face(u16 in);
 
-	enum class cull_face : u16
+	enum class cull_face : u32
 	{
-		front = CELL_GCM_FRONT,
-		back = CELL_GCM_BACK,
-		front_and_back = CELL_GCM_FRONT_AND_BACK
+		front = 0x0404, // CELL_GCM_FRONT
+		back = 0x0405, // CELL_GCM_BACK
+		front_and_back = 0x0408, // CELL_GCM_FRONT_AND_BACK
 	};
 
-	static inline auto to_cull_face(u32 in)
-	{
-		return gcm_enum_cast<cull_face>(in,
-		{
-			CELL_GCM_FRONT,
-			CELL_GCM_BACK,
-			CELL_GCM_FRONT_AND_BACK
-		});
-	}
-
 	enum class user_clip_plane_op : u8
 	{
-		disable = CELL_GCM_USER_CLIP_PLANE_DISABLE,
-		less_than = CELL_GCM_USER_CLIP_PLANE_ENABLE_LT,
-		greater_or_equal = CELL_GCM_USER_CLIP_PLANE_ENABLE_GE,
+		disable,
+		less_than,
+		greater_or_equal,
 	};
 
-	static inline auto to_user_clip_plane_op(u32 in)
-	{
-		return gcm_enum_cast<
-			user_clip_plane_op,
-			CELL_GCM_USER_CLIP_PLANE_DISABLE,
-			CELL_GCM_USER_CLIP_PLANE_ENABLE_GE>(in);
-	}
+	user_clip_plane_op to_user_clip_plane_op(u8 in);
 
-	enum class shading_mode : u16
+	enum class shading_mode : u8
 	{
-		smooth = CELL_GCM_SMOOTH,
-		flat = CELL_GCM_FLAT,
+		smooth,
+		flat,
 	};
 
-	static inline auto to_shading_mode(u32 in)
-	{
-		return gcm_enum_cast<
-			shading_mode,
-			CELL_GCM_FLAT,
-			CELL_GCM_SMOOTH>(in);
-	}
+	shading_mode to_shading_mode(u32 in);
 
-	enum class polygon_mode : u16
+	enum class polygon_mode : u8
 	{
-		point = CELL_GCM_POLYGON_MODE_POINT,
-		line = CELL_GCM_POLYGON_MODE_LINE,
-		fill = CELL_GCM_POLYGON_MODE_FILL,
+		point,
+		line,
+		fill,
 	};
 
-	static inline auto to_polygon_mode(u32 in)
-	{
-		return gcm_enum_cast<
-			polygon_mode,
-			CELL_GCM_POLYGON_MODE_POINT,
-			CELL_GCM_POLYGON_MODE_FILL>(in);
-	}
+	polygon_mode to_polygon_mode(u32 in);
 
 	namespace blit_engine
 	{
 		enum class transfer_origin : u8
 		{
-			center = CELL_GCM_TRANSFER_ORIGIN_CENTER,
-			corner = CELL_GCM_TRANSFER_ORIGIN_CORNER,
+			center,
+			corner,
 		};
 
-		static inline auto to_transfer_origin(u32 in)
-		{
-			return gcm_enum_cast<
-				transfer_origin,
-				CELL_GCM_TRANSFER_ORIGIN_CENTER,
-				CELL_GCM_TRANSFER_ORIGIN_CORNER>(in);
-		}
+		transfer_origin to_transfer_origin(u8 in);
 
 		enum class transfer_interpolator : u8
 		{
-			zoh = CELL_GCM_TRANSFER_INTERPOLATOR_ZOH,
-			foh = CELL_GCM_TRANSFER_INTERPOLATOR_FOH,
+			zoh,
+			foh,
 		};
 
-		static inline auto to_transfer_interpolator(u32 in)
-		{
-			return gcm_enum_cast<
-				transfer_interpolator,
-				CELL_GCM_TRANSFER_INTERPOLATOR_ZOH,
-				CELL_GCM_TRANSFER_INTERPOLATOR_FOH>(in);
-		}
+		transfer_interpolator to_transfer_interpolator(u8 in);
 
 		enum class transfer_operation : u8
 		{
-			srccopy_and = CELL_GCM_TRANSFER_OPERATION_SRCCOPY_AND,
-			rop_and = CELL_GCM_TRANSFER_OPERATION_ROP_AND,
-			blend_and = CELL_GCM_TRANSFER_OPERATION_BLEND_AND,
-			srccopy = CELL_GCM_TRANSFER_OPERATION_SRCCOPY,
-			srccopy_premult = CELL_GCM_TRANSFER_OPERATION_SRCCOPY_PREMULT,
-			blend_premult = CELL_GCM_TRANSFER_OPERATION_BLEND_PREMULT,
+			srccopy_and,
+			rop_and,
+			blend_and,
+			srccopy,
+			srccopy_premult,
+			blend_premult,
+			invalid,
 		};
 
-		static inline auto to_transfer_operation(u32 in)
-		{
-			return gcm_enum_cast<
-				transfer_operation,
-				CELL_GCM_TRANSFER_OPERATION_SRCCOPY_AND,
-				CELL_GCM_TRANSFER_OPERATION_BLEND_PREMULT>(in);
-		}
+		transfer_operation to_transfer_operation(u8 in);
 
 		enum class transfer_source_format : u8
 		{
-			a1r5g5b5 = CELL_GCM_TRANSFER_SCALE_FORMAT_A1R5G5B5,
-			x1r5g5b5 = CELL_GCM_TRANSFER_SCALE_FORMAT_X1R5G5B5,
-			a8r8g8b8 = CELL_GCM_TRANSFER_SCALE_FORMAT_A8R8G8B8,
-			x8r8g8b8 = CELL_GCM_TRANSFER_SCALE_FORMAT_X8R8G8B8,
-			cr8yb8cb8ya8 = CELL_GCM_TRANSFER_SCALE_FORMAT_CR8YB8CB8YA8,
-			yb8cr8ya8cb8 = CELL_GCM_TRANSFER_SCALE_FORMAT_YB8CR8YA8CB8,
-			r5g6b5 = CELL_GCM_TRANSFER_SCALE_FORMAT_R5G6B5,
-			y8 = CELL_GCM_TRANSFER_SCALE_FORMAT_Y8,
-			ay8 = CELL_GCM_TRANSFER_SCALE_FORMAT_AY8,
-			eyb8ecr8eya8ecb8 = CELL_GCM_TRANSFER_SCALE_FORMAT_EYB8ECR8EYA8ECB8,
-			ecr8eyb8ecb8eya8 = CELL_GCM_TRANSFER_SCALE_FORMAT_ECR8EYB8ECB8EYA8,
-			a8b8g8r8 = CELL_GCM_TRANSFER_SCALE_FORMAT_A8B8G8R8,
-			x8b8g8r8 = CELL_GCM_TRANSFER_SCALE_FORMAT_X8B8G8R8,
+			a1r5g5b5,
+			x1r5g5b5,
+			a8r8g8b8,
+			x8r8g8b8,
+			cr8yb8cb8ya8,
+			yb8cr8ya8cb8,
+			r5g6b5,
+			y8,
+			ay8,
+			eyb8ecr8eya8ecb8,
+			ecr8eyb8ecb8eya8,
+			a8b8g8r8,
+			x8b8g8r8,
+			invalid,
 		};
 
-		static inline auto to_transfer_source_format(u32 in)
-		{
-			return gcm_enum_cast<
-				transfer_source_format,
-				CELL_GCM_TRANSFER_SCALE_FORMAT_A1R5G5B5,
-				CELL_GCM_TRANSFER_SCALE_FORMAT_X8B8G8R8>(in);
-		}
+		transfer_source_format to_transfer_source_format(u8 in);
 
 		enum class transfer_destination_format : u8
 		{
-			r5g6b5 = CELL_GCM_TRANSFER_SURFACE_FORMAT_R5G6B5,
-			a8r8g8b8 = CELL_GCM_TRANSFER_SURFACE_FORMAT_A8R8G8B8,
-			y32 = CELL_GCM_TRANSFER_SURFACE_FORMAT_Y32,
+			r5g6b5,
+			a8r8g8b8,
+			y32,
+			invalid
 		};
 
-		static inline auto to_transfer_destination_format(u32 in)
-		{
-			return gcm_enum_cast<transfer_destination_format>(in,
-			{
-				CELL_GCM_TRANSFER_SURFACE_FORMAT_A8R8G8B8,
-				CELL_GCM_TRANSFER_SURFACE_FORMAT_R5G6B5,
-				CELL_GCM_TRANSFER_SURFACE_FORMAT_Y32
-			});
-		}
+		transfer_destination_format to_transfer_destination_format(u8 in);
 
-		enum class context_surface : u32
+		enum class context_surface : u8
 		{
-			surface2d = CELL_GCM_CONTEXT_SURFACE2D,
-			swizzle2d = CELL_GCM_CONTEXT_SWIZZLE2D,
+			surface2d,
+			swizzle2d,
 		};
 
-		static inline auto to_context_surface(u32 in)
-		{
-			return gcm_enum_cast<context_surface>(in,
-			{
-				CELL_GCM_CONTEXT_SURFACE2D,
-				CELL_GCM_CONTEXT_SWIZZLE2D
-			});
-		}
+		context_surface to_context_surface(u32 in);
 
-		enum class context_dma : u32
+		enum class context_dma : u8
 		{
-			to_memory_get_report = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL,
-			report_location_main = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN,
-			memory_host_buffer = CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER,
+			to_memory_get_report,
+			report_location_main,
+			memory_host_buffer,
 		};
 
-		static inline auto to_context_dma(u32 in)
-		{
-			return gcm_enum_cast<context_dma>(in,
-			{
-				CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL,
-				CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN,
-				CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER
-			});
-		}
+		context_dma to_context_dma(u32 in);
 	}
 }
+
+enum
+{
+	CELL_GCM_DISPLAY_HSYNC = 1,
+	CELL_GCM_DISPLAY_VSYNC = 2,
+	CELL_GCM_DISPLAY_HSYNC_WITH_NOISE = 3,
+};
+
+enum
+{
+	CELL_GCM_DEBUG_LEVEL0 = 1,
+	CELL_GCM_DEBUG_LEVEL1 = 2,
+	CELL_GCM_DEBUG_LEVEL2 = 3,
+};
+
+enum
+{
+	CELL_GCM_DISPLAY_FREQUENCY_59_94HZ = 1,
+	CELL_GCM_DISPLAY_FREQUENCY_SCANOUT = 2,
+	CELL_GCM_DISPLAY_FREQUENCY_DISABLE = 3,
+};
+
+enum
+{
+	CELL_GCM_DISPLAY_FLIP_STATUS_DONE = 0,
+	CELL_GCM_DISPLAY_FLIP_STATUS_WAITING = 1,
+};
+
+enum
+{
+	CELL_GCM_FREQUENCY_MODULO = 1,
+	CELL_GCM_FREQUENCY_DIVIDE = 0,
+};
+
+enum CellRescTableElement
+{
+	CELL_RESC_ELEMENT_HALF = 0,
+	CELL_RESC_ELEMENT_FLOAT = 1,
+};
+
+enum
+{
+	CELL_GCM_SYSTEM_MODE_IOMAP_512MB = 1,
+};
+
+enum
+{
+	// Index Array Type
+	CELL_GCM_DRAW_INDEX_ARRAY_TYPE_32 = 0,
+	CELL_GCM_DRAW_INDEX_ARRAY_TYPE_16 = 1,
+};
+
+enum
+{
+	CELL_GCM_PRIMITIVE_POINTS = 1,
+	CELL_GCM_PRIMITIVE_LINES = 2,
+	CELL_GCM_PRIMITIVE_LINE_LOOP = 3,
+	CELL_GCM_PRIMITIVE_LINE_STRIP = 4,
+	CELL_GCM_PRIMITIVE_TRIANGLES = 5,
+	CELL_GCM_PRIMITIVE_TRIANGLE_STRIP= 6,
+	CELL_GCM_PRIMITIVE_TRIANGLE_FAN = 7,
+	CELL_GCM_PRIMITIVE_QUADS = 8,
+	CELL_GCM_PRIMITIVE_QUAD_STRIP = 9,
+	CELL_GCM_PRIMITIVE_POLYGON = 10,
+};
+
+// GCM Texture
+enum CellGcmTexture : u32
+{
+	// Color Flag
+	CELL_GCM_TEXTURE_B8 = 0x81,
+	CELL_GCM_TEXTURE_A1R5G5B5 = 0x82,
+	CELL_GCM_TEXTURE_A4R4G4B4 = 0x83,
+	CELL_GCM_TEXTURE_R5G6B5 = 0x84,
+	CELL_GCM_TEXTURE_A8R8G8B8 = 0x85,
+	CELL_GCM_TEXTURE_COMPRESSED_DXT1 = 0x86,
+	CELL_GCM_TEXTURE_COMPRESSED_DXT23 = 0x87,
+	CELL_GCM_TEXTURE_COMPRESSED_DXT45 = 0x88,
+	CELL_GCM_TEXTURE_G8B8 = 0x8B,
+	CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8 = 0x8D,
+	CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8 = 0x8E,
+	CELL_GCM_TEXTURE_R6G5B5 = 0x8F,
+	CELL_GCM_TEXTURE_DEPTH24_D8 = 0x90,
+	CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT = 0x91,
+	CELL_GCM_TEXTURE_DEPTH16 = 0x92,
+	CELL_GCM_TEXTURE_DEPTH16_FLOAT = 0x93,
+	CELL_GCM_TEXTURE_X16 = 0x94,
+	CELL_GCM_TEXTURE_Y16_X16 = 0x95,
+	CELL_GCM_TEXTURE_R5G5B5A1 = 0x97,
+	CELL_GCM_TEXTURE_COMPRESSED_HILO8 = 0x98,
+	CELL_GCM_TEXTURE_COMPRESSED_HILO_S8 = 0x99,
+	CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT = 0x9A,
+	CELL_GCM_TEXTURE_W32_Z32_Y32_X32_FLOAT = 0x9B,
+	CELL_GCM_TEXTURE_X32_FLOAT = 0x9C,
+	CELL_GCM_TEXTURE_D1R5G5B5 = 0x9D,
+	CELL_GCM_TEXTURE_D8R8G8B8 = 0x9E,
+	CELL_GCM_TEXTURE_Y16_X16_FLOAT = 0x9F,
+
+	// Swizzle Flag
+	CELL_GCM_TEXTURE_SZ = 0x00,
+	CELL_GCM_TEXTURE_LN = 0x20,
+
+	// Normalization Flag
+	CELL_GCM_TEXTURE_NR = 0x00,
+	CELL_GCM_TEXTURE_UN = 0x40,
+};
+
+// GCM Surface
+enum
+{
+	// Surface type
+	CELL_GCM_SURFACE_PITCH = 1,
+	CELL_GCM_SURFACE_SWIZZLE = 2,
+};
+
+// GCM blend equation
+enum
+{
+	CELL_GCM_FUNC_ADD = 0x8006,
+	CELL_GCM_MIN = 0x8007,
+	CELL_GCM_MAX = 0x8008,
+	CELL_GCM_FUNC_SUBTRACT = 0x800A,
+	CELL_GCM_FUNC_REVERSE_SUBTRACT = 0x800B,
+	CELL_GCM_FUNC_REVERSE_SUBTRACT_SIGNED = 0x0000F005,
+	CELL_GCM_FUNC_ADD_SIGNED = 0x0000F006,
+	CELL_GCM_FUNC_REVERSE_ADD_SIGNED = 0x0000F007,
+};
+
+// GCM blend factor
+enum
+{
+	CELL_GCM_SRC_COLOR = 0x0300,
+	CELL_GCM_ONE_MINUS_SRC_COLOR = 0x0301,
+	CELL_GCM_SRC_ALPHA = 0x0302,
+	CELL_GCM_ONE_MINUS_SRC_ALPHA = 0x0303,
+	CELL_GCM_DST_ALPHA = 0x0304,
+	CELL_GCM_ONE_MINUS_DST_ALPHA = 0x0305,
+	CELL_GCM_DST_COLOR = 0x0306,
+	CELL_GCM_ONE_MINUS_DST_COLOR = 0x0307,
+	CELL_GCM_SRC_ALPHA_SATURATE = 0x0308,
+	CELL_GCM_CONSTANT_COLOR = 0x8001,
+	CELL_GCM_ONE_MINUS_CONSTANT_COLOR = 0x8002,
+	CELL_GCM_CONSTANT_ALPHA = 0x8003,
+	CELL_GCM_ONE_MINUS_CONSTANT_ALPHA = 0x8004,
+};
+
+enum
+{
+	CELL_GCM_TEXTURE_UNSIGNED_REMAP_NORMAL = 0,
+	CELL_GCM_TEXTURE_UNSIGNED_REMAP_BIASED = 1,
+
+	CELL_GCM_TEXTURE_SIGNED_REMAP_NORMAL = 0x0,
+	CELL_GCM_TEXTURE_SIGNED_REMAP_CLAMPED = 0x3,
+
+	CELL_GCM_TEXTURE_REMAP_FROM_A = 0,
+	CELL_GCM_TEXTURE_REMAP_FROM_R = 1,
+	CELL_GCM_TEXTURE_REMAP_FROM_G = 2,
+	CELL_GCM_TEXTURE_REMAP_FROM_B = 3,
+
+	CELL_GCM_TEXTURE_REMAP_ZERO = 0,
+	CELL_GCM_TEXTURE_REMAP_ONE = 1,
+	CELL_GCM_TEXTURE_REMAP_REMAP = 2,
+
+	CELL_GCM_TEXTURE_ZFUNC_NEVER = 0,
+	CELL_GCM_TEXTURE_ZFUNC_LESS = 1,
+	CELL_GCM_TEXTURE_ZFUNC_EQUAL = 2,
+	CELL_GCM_TEXTURE_ZFUNC_LEQUAL = 3,
+	CELL_GCM_TEXTURE_ZFUNC_GREATER = 4,
+	CELL_GCM_TEXTURE_ZFUNC_NOTEQUAL = 5,
+	CELL_GCM_TEXTURE_ZFUNC_GEQUAL = 6,
+	CELL_GCM_TEXTURE_ZFUNC_ALWAYS = 7,
+
+	CELL_GCM_TEXTURE_GAMMA_R = 1 << 0,
+	CELL_GCM_TEXTURE_GAMMA_G = 1 << 1,
+	CELL_GCM_TEXTURE_GAMMA_B = 1 << 2,
+	CELL_GCM_TEXTURE_GAMMA_A = 1 << 3,
+
+	CELL_GCM_TEXTURE_ANISO_SPREAD_0_50_TEXEL = 0x0,
+	CELL_GCM_TEXTURE_ANISO_SPREAD_1_00_TEXEL = 0x1,
+	CELL_GCM_TEXTURE_ANISO_SPREAD_1_125_TEXEL = 0x2,
+	CELL_GCM_TEXTURE_ANISO_SPREAD_1_25_TEXEL = 0x3,
+	CELL_GCM_TEXTURE_ANISO_SPREAD_1_375_TEXEL = 0x4,
+	CELL_GCM_TEXTURE_ANISO_SPREAD_1_50_TEXEL = 0x5,
+	CELL_GCM_TEXTURE_ANISO_SPREAD_1_75_TEXEL = 0x6,
+	CELL_GCM_TEXTURE_ANISO_SPREAD_2_00_TEXEL = 0x7,
+
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX0_U = 1 << 0,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX0_V = 1 << 1,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX0_P = 1 << 2,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX0_Q = 1 << 3,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX1_U = 1 << 4,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX1_V = 1 << 5,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX1_P = 1 << 6,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX1_Q = 1 << 7,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX2_U = 1 << 8,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX2_V = 1 << 9,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX2_P = 1 << 10,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX2_Q = 1 << 11,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX3_U = 1 << 12,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX3_V = 1 << 13,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX3_P = 1 << 14,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX3_Q = 1 << 15,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX4_U = 1 << 16,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX4_V = 1 << 17,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX4_P = 1 << 18,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX4_Q = 1 << 19,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX5_U = 1 << 20,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX5_V = 1 << 21,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX5_P = 1 << 22,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX5_Q = 1 << 23,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX6_U = 1 << 24,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX6_V = 1 << 25,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX6_P = 1 << 26,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX6_Q = 1 << 27,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX7_U = 1 << 28,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX7_V = 1 << 29,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX7_P = 1 << 30,
+	CELL_GCM_TEXTURE_CYLINDRICAL_WRAP_ENABLE_TEX7_Q = 1u << 31,
+
+	CELL_GCM_COLOR_MASK_B = 1 << 0,
+	CELL_GCM_COLOR_MASK_G = 1 << 8,
+	CELL_GCM_COLOR_MASK_R = 1 << 16,
+	CELL_GCM_COLOR_MASK_A = 1 << 24,
+
+	CELL_GCM_COLOR_MASK_MRT1_A = 1 << 4,
+	CELL_GCM_COLOR_MASK_MRT1_R = 1 << 5,
+	CELL_GCM_COLOR_MASK_MRT1_G = 1 << 6,
+	CELL_GCM_COLOR_MASK_MRT1_B = 1 << 7,
+	CELL_GCM_COLOR_MASK_MRT2_A = 1 << 8,
+	CELL_GCM_COLOR_MASK_MRT2_R = 1 << 9,
+	CELL_GCM_COLOR_MASK_MRT2_G = 1 << 10,
+	CELL_GCM_COLOR_MASK_MRT2_B = 1 << 11,
+	CELL_GCM_COLOR_MASK_MRT3_A = 1 << 12,
+	CELL_GCM_COLOR_MASK_MRT3_R = 1 << 13,
+	CELL_GCM_COLOR_MASK_MRT3_G = 1 << 14,
+	CELL_GCM_COLOR_MASK_MRT3_B = 1 << 15,
+
+	CELL_GCM_NEVER = 0x0200,
+	CELL_GCM_LESS = 0x0201,
+	CELL_GCM_EQUAL = 0x0202,
+	CELL_GCM_LEQUAL = 0x0203,
+	CELL_GCM_GREATER = 0x0204,
+	CELL_GCM_NOTEQUAL = 0x0205,
+	CELL_GCM_GEQUAL = 0x0206,
+	CELL_GCM_ALWAYS = 0x0207,
+
+	CELL_GCM_ZERO = 0,
+	CELL_GCM_ONE = 1,
+
+	CELL_GCM_FRONT = 0x0404,
+	CELL_GCM_BACK = 0x0405,
+	CELL_GCM_FRONT_AND_BACK = 0x0408,
+
+	CELL_GCM_CW = 0x0900,
+	CELL_GCM_CCW = 0x0901,
+
+	CELL_GCM_INVERT = 0x150A,
+	CELL_GCM_KEEP = 0x1E00,
+	CELL_GCM_REPLACE = 0x1E01,
+	CELL_GCM_INCR = 0x1E02,
+	CELL_GCM_DECR = 0x1E03,
+	CELL_GCM_INCR_WRAP = 0x8507,
+	CELL_GCM_DECR_WRAP = 0x8508,
+
+	CELL_GCM_TRANSFER_LOCAL_TO_LOCAL = 0,
+	CELL_GCM_TRANSFER_MAIN_TO_LOCAL = 1,
+	CELL_GCM_TRANSFER_LOCAL_TO_MAIN = 2,
+	CELL_GCM_TRANSFER_MAIN_TO_MAIN = 3,
+
+	CELL_GCM_INVALIDATE_TEXTURE = 1,
+	CELL_GCM_INVALIDATE_VERTEX_TEXTURE = 2,
+
+	CELL_GCM_COMPMODE_DISABLED = 0,
+	CELL_GCM_COMPMODE_C32_2X1 = 7,
+	CELL_GCM_COMPMODE_C32_2X2 = 8,
+	CELL_GCM_COMPMODE_Z32_SEPSTENCIL = 9,
+	CELL_GCM_COMPMODE_Z32_SEPSTENCIL_REG = 10,
+	CELL_GCM_COMPMODE_Z32_SEPSTENCIL_REGULAR = 10,
+	CELL_GCM_COMPMODE_Z32_SEPSTENCIL_DIAGONAL = 11,
+	CELL_GCM_COMPMODE_Z32_SEPSTENCIL_ROTATED = 12,
+
+	CELL_GCM_ZCULL_Z16 = 1,
+	CELL_GCM_ZCULL_Z24S8 = 2,
+	CELL_GCM_ZCULL_MSB = 0,
+	CELL_GCM_ZCULL_LONES = 1,
+	CELL_GCM_ZCULL_LESS = 0,
+	CELL_GCM_ZCULL_GREATER = 1,
+
+	CELL_GCM_SCULL_SFUNC_NEVER = 0,
+	CELL_GCM_SCULL_SFUNC_LESS = 1,
+	CELL_GCM_SCULL_SFUNC_EQUAL = 2,
+	CELL_GCM_SCULL_SFUNC_LEQUAL = 3,
+	CELL_GCM_SCULL_SFUNC_GREATER = 4,
+	CELL_GCM_SCULL_SFUNC_NOTEQUAL = 5,
+	CELL_GCM_SCULL_SFUNC_GEQUAL = 6,
+	CELL_GCM_SCULL_SFUNC_ALWAYS = 7,
+
+	CELL_GCM_ATTRIB_OUTPUT_FRONTDIFFUSE = 0,
+	CELL_GCM_ATTRIB_OUTPUT_FRONTSPECULAR = 1,
+	CELL_GCM_ATTRIB_OUTPUT_BACKDIFFUSE = 2,
+	CELL_GCM_ATTRIB_OUTPUT_BACKSPECULAR = 3,
+	CELL_GCM_ATTRIB_OUTPUT_FOG = 4,
+	CELL_GCM_ATTRIB_OUTPUT_POINTSIZE = 5,
+	CELL_GCM_ATTRIB_OUTPUT_UC0 = 6,
+	CELL_GCM_ATTRIB_OUTPUT_UC1 = 7,
+	CELL_GCM_ATTRIB_OUTPUT_UC2 = 8,
+	CELL_GCM_ATTRIB_OUTPUT_UC3 = 9,
+	CELL_GCM_ATTRIB_OUTPUT_UC4 = 10,
+	CELL_GCM_ATTRIB_OUTPUT_UC5 = 11,
+	CELL_GCM_ATTRIB_OUTPUT_TEX8 = 12,
+	CELL_GCM_ATTRIB_OUTPUT_TEX9 = 13,
+	CELL_GCM_ATTRIB_OUTPUT_TEX0 = 14,
+	CELL_GCM_ATTRIB_OUTPUT_TEX1 = 15,
+	CELL_GCM_ATTRIB_OUTPUT_TEX2 = 16,
+	CELL_GCM_ATTRIB_OUTPUT_TEX3 = 17,
+	CELL_GCM_ATTRIB_OUTPUT_TEX4 = 18,
+	CELL_GCM_ATTRIB_OUTPUT_TEX5 = 19,
+	CELL_GCM_ATTRIB_OUTPUT_TEX6 = 20,
+	CELL_GCM_ATTRIB_OUTPUT_TEX7 = 21,
+
+	CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTDIFFUSE = 1 << CELL_GCM_ATTRIB_OUTPUT_FRONTDIFFUSE,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTSPECULAR = 1 << CELL_GCM_ATTRIB_OUTPUT_FRONTSPECULAR,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_BACKDIFFUSE = 1 << CELL_GCM_ATTRIB_OUTPUT_BACKDIFFUSE,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_BACKSPECULAR = 1 << CELL_GCM_ATTRIB_OUTPUT_BACKSPECULAR,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_FOG = 1 << CELL_GCM_ATTRIB_OUTPUT_FOG,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_POINTSIZE = 1 << CELL_GCM_ATTRIB_OUTPUT_POINTSIZE,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_UC0 = 1 << CELL_GCM_ATTRIB_OUTPUT_UC0,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_UC1 = 1 << CELL_GCM_ATTRIB_OUTPUT_UC1,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_UC2 = 1 << CELL_GCM_ATTRIB_OUTPUT_UC2,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_UC3 = 1 << CELL_GCM_ATTRIB_OUTPUT_UC3,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_UC4 = 1 << CELL_GCM_ATTRIB_OUTPUT_UC4,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_UC5 = 1 << CELL_GCM_ATTRIB_OUTPUT_UC5,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_TEX8 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX8,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_TEX9 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX9,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_TEX0 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX0,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_TEX1 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX1,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_TEX2 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX2,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_TEX3 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX3,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_TEX4 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX4,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_TEX5 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX5,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_TEX6 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX6,
+	CELL_GCM_ATTRIB_OUTPUT_MASK_TEX7 = 1 << CELL_GCM_ATTRIB_OUTPUT_TEX7,
+
+	CELL_GCM_TRUE = 1,
+	CELL_GCM_FALSE = 0,
+};
+
+enum
+{
+	CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT = 0xe, ///< shader program exports the depth of the shaded fragment
+	CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS = 0x40, ///< shader program exports 32 bits registers values (instead of 16 bits ones)
+
+	//Other known flags
+	RSX_SHADER_CONTROL_USED_REGS_MASK = 0xf,
+	RSX_SHADER_CONTROL_USED_TEMP_REGS_MASK = 0xff << 24,
+	RSX_SHADER_CONTROL_USES_KIL = 0x80,  //program uses KIL op
+	RSX_SHADER_CONTROL_UNKNOWN0 = 0x400, //seemingly always set
+	RSX_SHADER_CONTROL_UNKNOWN1 = 0x8000 //seemingly set when srgb packer is used??
+};
+
+// GCM Reports
+enum
+{
+	CELL_GCM_ZPASS_PIXEL_CNT = 1,
+	CELL_GCM_ZCULL_STATS = 2,
+	CELL_GCM_ZCULL_STATS1 = 3,
+	CELL_GCM_ZCULL_STATS2 = 4,
+	CELL_GCM_ZCULL_STATS3 = 5,
+};
+
+// GPU Class Handles
+enum CellGcmLocation : u32
+{
+	CELL_GCM_LOCATION_LOCAL = 0,
+	CELL_GCM_LOCATION_MAIN = 1,
+
+	CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER = 0xFEED0000, // Local memory
+	CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER = 0xFEED0001, // Main memory
+	CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL = 0x66626660,
+	CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN = 0xBAD68000,
+	CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0 = 0x6660420F,
+	CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_1 = 0x6660420E,
+	CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_2 = 0x6660420D,
+	CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_3 = 0x6660420C,
+	CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_4 = 0x6660420B,
+	CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_5 = 0x6660420A,
+	CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_6 = 0x66604209,
+	CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_7 = 0x66604208,
+
+	CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY0 = 0x66604207,
+	CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY1 = 0x66604206,
+	CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY2 = 0x66604205,
+	CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY3 = 0x66604204,
+	CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY4 = 0x66604203,
+	CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY5 = 0x66604202,
+	CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY6 = 0x66604201,
+	CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY7 = 0x66604200,
+
+	CELL_GCM_CONTEXT_DMA_SEMAPHORE_RW = 0x66606660,
+	CELL_GCM_CONTEXT_DMA_SEMAPHORE_R = 0x66616661,
+	CELL_GCM_CONTEXT_DMA_DEVICE_RW = 0x56616660,
+	CELL_GCM_CONTEXT_DMA_DEVICE_R = 0x56616661
+};
+
+enum CellGcmMethod : u16
+{
+	// NV40_CHANNEL_DMA (NV406E)
+	NV406E_SET_REFERENCE = 0x00000050 >> 2,
+	NV406E_SET_CONTEXT_DMA_SEMAPHORE = 0x00000060 >> 2,
+	NV406E_SEMAPHORE_OFFSET = 0x00000064 >> 2,
+	NV406E_SEMAPHORE_ACQUIRE = 0x00000068 >> 2,
+	NV406E_SEMAPHORE_RELEASE = 0x0000006c >> 2,
+
+	// NV40_CURIE_PRIMITIVE	(NV4097)
+	NV4097_SET_OBJECT = 0x00000000 >> 2,
+	NV4097_NO_OPERATION = 0x00000100 >> 2,
+	NV4097_NOTIFY = 0x00000104 >> 2,
+	NV4097_WAIT_FOR_IDLE = 0x00000110 >> 2,
+	NV4097_PM_TRIGGER = 0x00000140 >> 2,
+	NV4097_SET_CONTEXT_DMA_NOTIFIES = 0x00000180 >> 2,
+	NV4097_SET_CONTEXT_DMA_A = 0x00000184 >> 2,
+	NV4097_SET_CONTEXT_DMA_B = 0x00000188 >> 2,
+	NV4097_SET_CONTEXT_DMA_COLOR_B = 0x0000018c >> 2,
+	NV4097_SET_CONTEXT_DMA_STATE = 0x00000190 >> 2,
+	NV4097_SET_CONTEXT_DMA_COLOR_A = 0x00000194 >> 2,
+	NV4097_SET_CONTEXT_DMA_ZETA = 0x00000198 >> 2,
+	NV4097_SET_CONTEXT_DMA_VERTEX_A = 0x0000019c >> 2,
+	NV4097_SET_CONTEXT_DMA_VERTEX_B = 0x000001a0 >> 2,
+	NV4097_SET_CONTEXT_DMA_SEMAPHORE = 0x000001a4 >> 2,
+	NV4097_SET_CONTEXT_DMA_REPORT = 0x000001a8 >> 2,
+	NV4097_SET_CONTEXT_DMA_CLIP_ID = 0x000001ac >> 2,
+	NV4097_SET_CONTEXT_DMA_CULL_DATA = 0x000001b0 >> 2,
+	NV4097_SET_CONTEXT_DMA_COLOR_C = 0x000001b4 >> 2,
+	NV4097_SET_CONTEXT_DMA_COLOR_D = 0x000001b8 >> 2,
+	NV4097_SET_SURFACE_CLIP_HORIZONTAL = 0x00000200 >> 2,
+	NV4097_SET_SURFACE_CLIP_VERTICAL = 0x00000204 >> 2,
+	NV4097_SET_SURFACE_FORMAT = 0x00000208 >> 2,
+	NV4097_SET_SURFACE_PITCH_A = 0x0000020c >> 2,
+	NV4097_SET_SURFACE_COLOR_AOFFSET = 0x00000210 >> 2,
+	NV4097_SET_SURFACE_ZETA_OFFSET = 0x00000214 >> 2,
+	NV4097_SET_SURFACE_COLOR_BOFFSET = 0x00000218 >> 2,
+	NV4097_SET_SURFACE_PITCH_B = 0x0000021c >> 2,
+	NV4097_SET_SURFACE_COLOR_TARGET = 0x00000220 >> 2,
+	NV4097_SET_SURFACE_PITCH_Z = 0x0000022c >> 2,
+	NV4097_INVALIDATE_ZCULL = 0x00000234 >> 2,
+	NV4097_SET_CYLINDRICAL_WRAP = 0x00000238 >> 2,
+	NV4097_SET_CYLINDRICAL_WRAP1 = 0x0000023c >> 2,
+	NV4097_SET_SURFACE_PITCH_C = 0x00000280 >> 2,
+	NV4097_SET_SURFACE_PITCH_D = 0x00000284 >> 2,
+	NV4097_SET_SURFACE_COLOR_COFFSET = 0x00000288 >> 2,
+	NV4097_SET_SURFACE_COLOR_DOFFSET = 0x0000028c >> 2,
+	NV4097_SET_WINDOW_OFFSET = 0x000002b8 >> 2,
+	NV4097_SET_WINDOW_CLIP_TYPE = 0x000002bc >> 2,
+	NV4097_SET_WINDOW_CLIP_HORIZONTAL = 0x000002c0 >> 2,
+	NV4097_SET_WINDOW_CLIP_VERTICAL = 0x000002c4 >> 2,
+	NV4097_SET_DITHER_ENABLE = 0x00000300 >> 2,
+	NV4097_SET_ALPHA_TEST_ENABLE = 0x00000304 >> 2,
+	NV4097_SET_ALPHA_FUNC = 0x00000308 >> 2,
+	NV4097_SET_ALPHA_REF = 0x0000030c >> 2,
+	NV4097_SET_BLEND_ENABLE = 0x00000310 >> 2,
+	NV4097_SET_BLEND_FUNC_SFACTOR = 0x00000314 >> 2,
+	NV4097_SET_BLEND_FUNC_DFACTOR = 0x00000318 >> 2,
+	NV4097_SET_BLEND_COLOR = 0x0000031c >> 2,
+	NV4097_SET_BLEND_EQUATION = 0x00000320 >> 2,
+	NV4097_SET_COLOR_MASK = 0x00000324 >> 2,
+	NV4097_SET_STENCIL_TEST_ENABLE = 0x00000328 >> 2,
+	NV4097_SET_STENCIL_MASK = 0x0000032c >> 2,
+	NV4097_SET_STENCIL_FUNC = 0x00000330 >> 2,
+	NV4097_SET_STENCIL_FUNC_REF = 0x00000334 >> 2,
+	NV4097_SET_STENCIL_FUNC_MASK = 0x00000338 >> 2,
+	NV4097_SET_STENCIL_OP_FAIL = 0x0000033c >> 2,
+	NV4097_SET_STENCIL_OP_ZFAIL = 0x00000340 >> 2,
+	NV4097_SET_STENCIL_OP_ZPASS = 0x00000344 >> 2,
+	NV4097_SET_TWO_SIDED_STENCIL_TEST_ENABLE = 0x00000348 >> 2,
+	NV4097_SET_BACK_STENCIL_MASK = 0x0000034c >> 2,
+	NV4097_SET_BACK_STENCIL_FUNC = 0x00000350 >> 2,
+	NV4097_SET_BACK_STENCIL_FUNC_REF = 0x00000354 >> 2,
+	NV4097_SET_BACK_STENCIL_FUNC_MASK = 0x00000358 >> 2,
+	NV4097_SET_BACK_STENCIL_OP_FAIL = 0x0000035c >> 2,
+	NV4097_SET_BACK_STENCIL_OP_ZFAIL = 0x00000360 >> 2,
+	NV4097_SET_BACK_STENCIL_OP_ZPASS = 0x00000364 >> 2,
+	NV4097_SET_SHADE_MODE = 0x00000368 >> 2,
+	NV4097_SET_BLEND_ENABLE_MRT = 0x0000036c >> 2,
+	NV4097_SET_COLOR_MASK_MRT = 0x00000370 >> 2,
+	NV4097_SET_LOGIC_OP_ENABLE = 0x00000374 >> 2,
+	NV4097_SET_LOGIC_OP = 0x00000378 >> 2,
+	NV4097_SET_BLEND_COLOR2 = 0x0000037c >> 2,
+	NV4097_SET_DEPTH_BOUNDS_TEST_ENABLE = 0x00000380 >> 2,
+	NV4097_SET_DEPTH_BOUNDS_MIN = 0x00000384 >> 2,
+	NV4097_SET_DEPTH_BOUNDS_MAX = 0x00000388 >> 2,
+	NV4097_SET_CLIP_MIN = 0x00000394 >> 2,
+	NV4097_SET_CLIP_MAX = 0x00000398 >> 2,
+	NV4097_SET_CONTROL0 = 0x000003b0 >> 2,
+	NV4097_SET_LINE_WIDTH = 0x000003b8 >> 2,
+	NV4097_SET_LINE_SMOOTH_ENABLE = 0x000003bc >> 2,
+	NV4097_SET_ANISO_SPREAD = 0x000003c0 >> 2,
+	NV4097_SET_SCISSOR_HORIZONTAL = 0x000008c0 >> 2,
+	NV4097_SET_SCISSOR_VERTICAL = 0x000008c4 >> 2,
+	NV4097_SET_FOG_MODE = 0x000008cc >> 2,
+	NV4097_SET_FOG_PARAMS = 0x000008d0 >> 2,
+	NV4097_SET_SHADER_PROGRAM = 0x000008e4 >> 2,
+	NV4097_SET_VERTEX_TEXTURE_OFFSET = 0x00000900 >> 2,
+	NV4097_SET_VERTEX_TEXTURE_FORMAT = 0x00000904 >> 2,
+	NV4097_SET_VERTEX_TEXTURE_ADDRESS = 0x00000908 >> 2,
+	NV4097_SET_VERTEX_TEXTURE_CONTROL0 = 0x0000090c >> 2,
+	NV4097_SET_VERTEX_TEXTURE_CONTROL3 = 0x00000910 >> 2,
+	NV4097_SET_VERTEX_TEXTURE_FILTER = 0x00000914 >> 2,
+	NV4097_SET_VERTEX_TEXTURE_IMAGE_RECT = 0x00000918 >> 2,
+	NV4097_SET_VERTEX_TEXTURE_BORDER_COLOR = 0x0000091c >> 2,
+	NV4097_SET_VIEWPORT_HORIZONTAL = 0x00000a00 >> 2,
+	NV4097_SET_VIEWPORT_VERTICAL = 0x00000a04 >> 2,
+	NV4097_SET_POINT_CENTER_MODE = 0x00000a0c >> 2,
+	NV4097_ZCULL_SYNC = 0x00000a1c >> 2,
+	NV4097_SET_VIEWPORT_OFFSET = 0x00000a20 >> 2,
+	NV4097_SET_VIEWPORT_SCALE = 0x00000a30 >> 2,
+	NV4097_SET_POLY_OFFSET_POINT_ENABLE = 0x00000a60 >> 2,
+	NV4097_SET_POLY_OFFSET_LINE_ENABLE = 0x00000a64 >> 2,
+	NV4097_SET_POLY_OFFSET_FILL_ENABLE = 0x00000a68 >> 2,
+	NV4097_SET_DEPTH_FUNC = 0x00000a6c >> 2,
+	NV4097_SET_DEPTH_MASK = 0x00000a70 >> 2,
+	NV4097_SET_DEPTH_TEST_ENABLE = 0x00000a74 >> 2,
+	NV4097_SET_POLYGON_OFFSET_SCALE_FACTOR = 0x00000a78 >> 2,
+	NV4097_SET_POLYGON_OFFSET_BIAS = 0x00000a7c >> 2,
+	NV4097_SET_VERTEX_DATA_SCALED4S_M = 0x00000a80 >> 2,
+	NV4097_SET_TEXTURE_CONTROL2 = 0x00000b00 >> 2,
+	NV4097_SET_TEX_COORD_CONTROL = 0x00000b40 >> 2,
+	NV4097_SET_TRANSFORM_PROGRAM = 0x00000b80 >> 2,
+	NV4097_SET_SPECULAR_ENABLE = 0x00001428 >> 2,
+	NV4097_SET_TWO_SIDE_LIGHT_EN = 0x0000142c >> 2,
+	NV4097_CLEAR_ZCULL_SURFACE = 0x00001438 >> 2,
+	NV4097_SET_PERFORMANCE_PARAMS = 0x00001450 >> 2,
+	NV4097_SET_FLAT_SHADE_OP = 0x00001454 >> 2,
+	NV4097_SET_EDGE_FLAG = 0x0000145c >> 2,
+	NV4097_SET_USER_CLIP_PLANE_CONTROL = 0x00001478 >> 2,
+	NV4097_SET_POLYGON_STIPPLE = 0x0000147c >> 2,
+	NV4097_SET_POLYGON_STIPPLE_PATTERN = 0x00001480 >> 2,
+	NV4097_SET_VERTEX_DATA3F_M = 0x00001500 >> 2,
+	NV4097_SET_VERTEX_DATA_ARRAY_OFFSET = 0x00001680 >> 2,
+	NV4097_INVALIDATE_VERTEX_CACHE_FILE = 0x00001710 >> 2,
+	NV4097_INVALIDATE_VERTEX_FILE = 0x00001714 >> 2,
+	NV4097_PIPE_NOP = 0x00001718 >> 2,
+	NV4097_SET_VERTEX_DATA_BASE_OFFSET = 0x00001738 >> 2,
+	NV4097_SET_VERTEX_DATA_BASE_INDEX = 0x0000173c >> 2,
+	NV4097_SET_VERTEX_DATA_ARRAY_FORMAT = 0x00001740 >> 2,
+	NV4097_CLEAR_REPORT_VALUE = 0x000017c8 >> 2,
+	NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE = 0x000017cc >> 2,
+	NV4097_GET_REPORT = 0x00001800 >> 2,
+	NV4097_SET_ZCULL_STATS_ENABLE = 0x00001804 >> 2,
+	NV4097_SET_BEGIN_END = 0x00001808 >> 2,
+	NV4097_ARRAY_ELEMENT16 = 0x0000180c >> 2,
+	NV4097_ARRAY_ELEMENT32 = 0x00001810 >> 2,
+	NV4097_DRAW_ARRAYS = 0x00001814 >> 2,
+	NV4097_INLINE_ARRAY = 0x00001818 >> 2,
+	NV4097_SET_INDEX_ARRAY_ADDRESS = 0x0000181c >> 2,
+	NV4097_SET_INDEX_ARRAY_DMA = 0x00001820 >> 2,
+	NV4097_DRAW_INDEX_ARRAY = 0x00001824 >> 2,
+	NV4097_SET_FRONT_POLYGON_MODE = 0x00001828 >> 2,
+	NV4097_SET_BACK_POLYGON_MODE = 0x0000182c >> 2,
+	NV4097_SET_CULL_FACE = 0x00001830 >> 2,
+	NV4097_SET_FRONT_FACE = 0x00001834 >> 2,
+	NV4097_SET_POLY_SMOOTH_ENABLE = 0x00001838 >> 2,
+	NV4097_SET_CULL_FACE_ENABLE = 0x0000183c >> 2,
+	NV4097_SET_TEXTURE_CONTROL3 = 0x00001840 >> 2,
+	NV4097_SET_VERTEX_DATA2F_M = 0x00001880 >> 2,
+	NV4097_SET_VERTEX_DATA2S_M = 0x00001900 >> 2,
+	NV4097_SET_VERTEX_DATA4UB_M = 0x00001940 >> 2,
+	NV4097_SET_VERTEX_DATA4S_M = 0x00001980 >> 2,
+	NV4097_SET_TEXTURE_OFFSET = 0x00001a00 >> 2,
+	NV4097_SET_TEXTURE_FORMAT = 0x00001a04 >> 2,
+	NV4097_SET_TEXTURE_ADDRESS = 0x00001a08 >> 2,
+	NV4097_SET_TEXTURE_CONTROL0 = 0x00001a0c >> 2,
+	NV4097_SET_TEXTURE_CONTROL1 = 0x00001a10 >> 2,
+	NV4097_SET_TEXTURE_FILTER = 0x00001a14 >> 2,
+	NV4097_SET_TEXTURE_IMAGE_RECT = 0x00001a18 >> 2,
+	NV4097_SET_TEXTURE_BORDER_COLOR = 0x00001a1c >> 2,
+	NV4097_SET_VERTEX_DATA4F_M = 0x00001c00 >> 2,
+	NV4097_SET_COLOR_KEY_COLOR = 0x00001d00 >> 2,
+	NV4097_SET_SHADER_CONTROL = 0x00001d60 >> 2,
+	NV4097_SET_INDEXED_CONSTANT_READ_LIMITS = 0x00001d64 >> 2,
+	NV4097_SET_SEMAPHORE_OFFSET = 0x00001d6c >> 2,
+	NV4097_BACK_END_WRITE_SEMAPHORE_RELEASE = 0x00001d70 >> 2,
+	NV4097_TEXTURE_READ_SEMAPHORE_RELEASE = 0x00001d74 >> 2,
+	NV4097_SET_ZMIN_MAX_CONTROL = 0x00001d78 >> 2,
+	NV4097_SET_ANTI_ALIASING_CONTROL = 0x00001d7c >> 2,
+	NV4097_SET_SURFACE_COMPRESSION = 0x00001d80 >> 2,
+	NV4097_SET_ZCULL_EN = 0x00001d84 >> 2,
+	NV4097_SET_SHADER_WINDOW = 0x00001d88 >> 2,
+	NV4097_SET_ZSTENCIL_CLEAR_VALUE = 0x00001d8c >> 2,
+	NV4097_SET_COLOR_CLEAR_VALUE = 0x00001d90 >> 2,
+	NV4097_CLEAR_SURFACE = 0x00001d94 >> 2,
+	NV4097_SET_CLEAR_RECT_HORIZONTAL = 0x00001d98 >> 2,
+	NV4097_SET_CLEAR_RECT_VERTICAL = 0x00001d9c >> 2,
+	NV4097_SET_CLIP_ID_TEST_ENABLE = 0x00001da4 >> 2,
+	NV4097_SET_RESTART_INDEX_ENABLE = 0x00001dac >> 2,
+	NV4097_SET_RESTART_INDEX = 0x00001db0 >> 2,
+	NV4097_SET_LINE_STIPPLE = 0x00001db4 >> 2,
+	NV4097_SET_LINE_STIPPLE_PATTERN = 0x00001db8 >> 2,
+	NV4097_SET_VERTEX_DATA1F_M = 0x00001e40 >> 2,
+	NV4097_SET_TRANSFORM_EXECUTION_MODE = 0x00001e94 >> 2,
+	NV4097_SET_RENDER_ENABLE = 0x00001e98 >> 2,
+	NV4097_SET_TRANSFORM_PROGRAM_LOAD = 0x00001e9c >> 2,
+	NV4097_SET_TRANSFORM_PROGRAM_START = 0x00001ea0 >> 2,
+	NV4097_SET_ZCULL_CONTROL0 = 0x00001ea4 >> 2,
+	NV4097_SET_ZCULL_CONTROL1 = 0x00001ea8 >> 2,
+	NV4097_SET_SCULL_CONTROL = 0x00001eac >> 2,
+	NV4097_SET_POINT_SIZE = 0x00001ee0 >> 2,
+	NV4097_SET_POINT_PARAMS_ENABLE = 0x00001ee4 >> 2,
+	NV4097_SET_POINT_SPRITE_CONTROL = 0x00001ee8 >> 2,
+	NV4097_SET_TRANSFORM_TIMEOUT = 0x00001ef8 >> 2,
+	NV4097_SET_TRANSFORM_CONSTANT_LOAD = 0x00001efc >> 2,
+	NV4097_SET_TRANSFORM_CONSTANT = 0x00001f00 >> 2,
+	NV4097_SET_FREQUENCY_DIVIDER_OPERATION = 0x00001fc0 >> 2,
+	NV4097_SET_ATTRIB_COLOR = 0x00001fc4 >> 2,
+	NV4097_SET_ATTRIB_TEX_COORD = 0x00001fc8 >> 2,
+	NV4097_SET_ATTRIB_TEX_COORD_EX = 0x00001fcc >> 2,
+	NV4097_SET_ATTRIB_UCLIP0 = 0x00001fd0 >> 2,
+	NV4097_SET_ATTRIB_UCLIP1 = 0x00001fd4 >> 2,
+	NV4097_INVALIDATE_L2 = 0x00001fd8 >> 2,
+	NV4097_SET_REDUCE_DST_COLOR = 0x00001fe0 >> 2,
+	NV4097_SET_NO_PARANOID_TEXTURE_FETCHES = 0x00001fe8 >> 2,
+	NV4097_SET_SHADER_PACKER = 0x00001fec >> 2,
+	NV4097_SET_VERTEX_ATTRIB_INPUT_MASK = 0x00001ff0 >> 2,
+	NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK = 0x00001ff4 >> 2,
+	NV4097_SET_TRANSFORM_BRANCH_BITS = 0x00001ff8 >> 2,
+
+	// NV03_MEMORY_TO_MEMORY_FORMAT	(NV0039)
+	NV0039_SET_OBJECT = 0x00002000 >> 2,
+	NV0039_SET_CONTEXT_DMA_NOTIFIES = 0x00002180 >> 2,
+	NV0039_SET_CONTEXT_DMA_BUFFER_IN = 0x00002184 >> 2,
+	NV0039_SET_CONTEXT_DMA_BUFFER_OUT = 0x00002188 >> 2,
+	NV0039_OFFSET_IN = 0x0000230C >> 2,
+	NV0039_OFFSET_OUT = 0x00002310 >> 2,
+	NV0039_PITCH_IN = 0x00002314 >> 2,
+	NV0039_PITCH_OUT = 0x00002318 >> 2,
+	NV0039_LINE_LENGTH_IN = 0x0000231C >> 2,
+	NV0039_LINE_COUNT = 0x00002320 >> 2,
+	NV0039_FORMAT = 0x00002324 >> 2,
+	NV0039_BUFFER_NOTIFY = 0x00002328 >> 2,
+
+	// NV30_CONTEXT_SURFACES_2D	(NV3062)
+	NV3062_SET_OBJECT = 0x00006000 >> 2,
+	NV3062_SET_CONTEXT_DMA_NOTIFIES = 0x00006180 >> 2,
+	NV3062_SET_CONTEXT_DMA_IMAGE_SOURCE = 0x00006184 >> 2,
+	NV3062_SET_CONTEXT_DMA_IMAGE_DESTIN = 0x00006188 >> 2,
+	NV3062_SET_COLOR_FORMAT = 0x00006300 >> 2,
+	NV3062_SET_PITCH = 0x00006304 >> 2,
+	NV3062_SET_OFFSET_SOURCE = 0x00006308 >> 2,
+	NV3062_SET_OFFSET_DESTIN = 0x0000630C >> 2,
+
+	// NV30_CONTEXT_SURFACE_SWIZZLED (NV309E)
+	NV309E_SET_OBJECT = 0x00008000 >> 2,
+	NV309E_SET_CONTEXT_DMA_NOTIFIES = 0x00008180 >> 2,
+	NV309E_SET_CONTEXT_DMA_IMAGE = 0x00008184 >> 2,
+	NV309E_SET_FORMAT = 0x00008300 >> 2,
+	NV309E_SET_OFFSET = 0x00008304 >> 2,
+
+	// NV30_IMAGE_FROM_CPU (NV308A)
+	NV308A_SET_OBJECT = 0x0000A000 >> 2,
+	NV308A_SET_CONTEXT_DMA_NOTIFIES = 0x0000A180 >> 2,
+	NV308A_SET_CONTEXT_COLOR_KEY = 0x0000A184 >> 2,
+	NV308A_SET_CONTEXT_CLIP_RECTANGLE = 0x0000A188 >> 2,
+	NV308A_SET_CONTEXT_PATTERN = 0x0000A18C >> 2,
+	NV308A_SET_CONTEXT_ROP = 0x0000A190 >> 2,
+	NV308A_SET_CONTEXT_BETA1 = 0x0000A194 >> 2,
+	NV308A_SET_CONTEXT_BETA4 = 0x0000A198 >> 2,
+	NV308A_SET_CONTEXT_SURFACE = 0x0000A19C >> 2,
+	NV308A_SET_COLOR_CONVERSION = 0x0000A2F8 >> 2,
+	NV308A_SET_OPERATION = 0x0000A2FC >> 2,
+	NV308A_SET_COLOR_FORMAT = 0x0000A300 >> 2,
+	NV308A_POINT = 0x0000A304 >> 2,
+	NV308A_SIZE_OUT = 0x0000A308 >> 2,
+	NV308A_SIZE_IN = 0x0000A30C >> 2,
+	NV308A_COLOR = 0x0000A400 >> 2,
+
+	// NV30_SCALED_IMAGE_FROM_MEMORY (NV3089)
+	NV3089_SET_OBJECT = 0x0000C000 >> 2,
+	NV3089_SET_CONTEXT_DMA_NOTIFIES = 0x0000C180 >> 2,
+	NV3089_SET_CONTEXT_DMA_IMAGE = 0x0000C184 >> 2,
+	NV3089_SET_CONTEXT_PATTERN = 0x0000C188 >> 2,
+	NV3089_SET_CONTEXT_ROP = 0x0000C18C >> 2,
+	NV3089_SET_CONTEXT_BETA1 = 0x0000C190 >> 2,
+	NV3089_SET_CONTEXT_BETA4 = 0x0000C194 >> 2,
+	NV3089_SET_CONTEXT_SURFACE = 0x0000C198 >> 2,
+	NV3089_SET_COLOR_CONVERSION = 0x0000C2FC >> 2,
+	NV3089_SET_COLOR_FORMAT = 0x0000C300 >> 2,
+	NV3089_SET_OPERATION = 0x0000C304 >> 2,
+	NV3089_CLIP_POINT = 0x0000C308 >> 2,
+	NV3089_CLIP_SIZE = 0x0000C30C >> 2,
+	NV3089_IMAGE_OUT_POINT = 0x0000C310 >> 2,
+	NV3089_IMAGE_OUT_SIZE = 0x0000C314 >> 2,
+	NV3089_DS_DX = 0x0000C318 >> 2,
+	NV3089_DT_DY = 0x0000C31C >> 2,
+	NV3089_IMAGE_IN_SIZE = 0x0000C400 >> 2,
+	NV3089_IMAGE_IN_FORMAT = 0x0000C404 >> 2,
+	NV3089_IMAGE_IN_OFFSET = 0x0000C408 >> 2,
+	NV3089_IMAGE_IN = 0x0000C40C >> 2,
+
+	//lv1 hypervisor commands
+	GCM_SET_DRIVER_OBJECT = 0x0000E000 >> 2,
+	GCM_FLIP_HEAD = 0X0000E920 >> 2,          //0xE920:0xE924: Flip head 0 or 1
+	GCM_DRIVER_QUEUE = 0X0000E940 >> 2,       //0XE940:0xE95C: First two indices prepare display buffers, rest unknown
+	GCM_SET_USER_COMMAND = 0x0000EB00 >> 2,   //0xEB00:0xEB04: User interrupt
+
+	GCM_FLIP_COMMAND = 0x0000FEAC >> 2
+};
+
+
+enum Method : u32
+{
+	/*
+	CELL_GCM_METHOD_FLAG_NON_INCREMENT = 0x40000000,
+	CELL_GCM_METHOD_FLAG_JUMP = 0x20000000,
+	CELL_GCM_METHOD_FLAG_CALL = 0x00000002,
+	CELL_GCM_METHOD_FLAG_RETURN = 0x00020000,
+	*/
+	RSX_METHOD_OLD_JUMP_CMD_MASK = 0xe0000003,
+	RSX_METHOD_OLD_JUMP_CMD = 0x20000000,
+	RSX_METHOD_OLD_JUMP_OFFSET_MASK = 0x1ffffffc,
+
+	RSX_METHOD_INCREMENT_CMD_MASK = 0xe0030003,
+	RSX_METHOD_INCREMENT_CMD = 0,
+	RSX_METHOD_NON_INCREMENT_CMD_MASK = 0xe0030003,
+	RSX_METHOD_NON_INCREMENT_CMD = 0x40000000,
+	RSX_METHOD_COUNT_MASK = 0x1ffc0000,
+	RSX_METHOD_COUNT_SHIFT = 18,
+	RSX_METHOD_METHOD_MASK = 0x0000fffc,
+
+	RSX_METHOD_NEW_JUMP_CMD_MASK = 0xe0000003,
+	RSX_METHOD_NEW_JUMP_CMD = 0x00000001,
+	RSX_METHOD_NEW_JUMP_OFFSET_MASK = 0xfffffffc,
+
+	RSX_METHOD_CALL_CMD_MASK = 0x00000003,
+	RSX_METHOD_CALL_CMD = 0x00000002,
+	RSX_METHOD_CALL_OFFSET_MASK = 0x1ffffffc,
+
+	RSX_METHOD_NON_METHOD_CMD_MASK = 0xa0030003,
+	RSX_METHOD_RETURN_CMD = 0x00020000,
+	RSX_METHOD_RETURN_MASK = 0xffff0003,
+
+	RSX_METHOD_NOP_CMD = 0x00000000,
+	RSX_METHOD_NOP_MASK = 0xbfff0003,
+
+	// Stack is empty (invalid value)
+	RSX_CALL_STACK_EMPTY = 0x00000003,
+};
+
+//Fog
+enum
+{
+	CELL_GCM_FOG_MODE_LINEAR = 0x2601,
+	CELL_GCM_FOG_MODE_EXP = 0x0800,
+	CELL_GCM_FOG_MODE_EXP2 = 0x0801,
+	CELL_GCM_FOG_MODE_EXP_ABS = 0x0802,
+	CELL_GCM_FOG_MODE_EXP2_ABS = 0x0803,
+	CELL_GCM_FOG_MODE_LINEAR_ABS = 0x0804,
+};
diff --git a/rpcs3/Emu/RSX/gcm_printing.cpp b/rpcs3/Emu/RSX/gcm_printing.cpp
index d7e5e6c811..b0df9a18cb 100644
--- a/rpcs3/Emu/RSX/gcm_printing.cpp
+++ b/rpcs3/Emu/RSX/gcm_printing.cpp
@@ -902,20 +902,18 @@ namespace
 	#undef KEY_STR
 }
 
-std::pair<std::string_view, std::string_view> rsx::get_method_name(u32 id, std::string& string_name)
+std::string rsx::get_method_name(const u32 id)
 {
 	const auto found = methods_name.find(id);
 
 	if (found != methods_name.end())
 	{
-		constexpr std::string_view prefix = "CELL_GCM_";
-
-		return {prefix, found->second};
+		std::string prefix("CELL_GCM_"sv);
+		prefix.append(found->second.data(), found->second.size());
+		return prefix;
 	}
 
-	string_name.clear();
-	fmt::append(string_name, "Unnamed method 0x%04x", id);
-	return {};
+	return fmt::format("Unnamed method 0x%04x", id);
 }
 
 // Various parameter pretty printing function
@@ -986,15 +984,15 @@ namespace
 	namespace
 	{
 		template <u32 Opcode>
-		void register_pretty_function(std::string& out, u32 /*id*/, u32 arg)
+		std::string register_pretty_function(u32 /*id*/, u32 arg)
 		{
-			rsx::registers_decoder<Opcode>::dump(out, arg);
+			return rsx::registers_decoder<Opcode>::dump(arg);
 		}
 
 		template <typename T, T... Index>
-		std::array<void(*)(std::string&, u32, u32), 1 << 14> create_printing_table(std::integer_sequence<T, Index...>)
+		std::array<std::string(*)(u32, u32), 1 << 14> create_printing_table(std::integer_sequence<T, Index...>)
 		{
-			std::array<void(*)(std::string&, u32, u32), 1 << 14> result{};
+			std::array<std::string(*)(u32, u32), 1 << 14> result{};
 
 			((result[opcode_list[Index * 5 + 0]] = &register_pretty_function<opcode_list[Index * 5 + 0]>,
 			result[opcode_list[Index * 5 + 1]] = &register_pretty_function<opcode_list[Index * 5 + 1]>,
@@ -1024,7 +1022,7 @@ namespace
 	 };*/
 }
 
-std::add_pointer_t<void(std::string&, u32, u32)> rsx::get_pretty_printing_function(u32 id)
+std::add_pointer_t<std::string(u32, u32)> rsx::get_pretty_printing_function(u32 id)
 {
 	const auto found = id < printing_functions.size() ? printing_functions[id] : nullptr;
 
@@ -1033,17 +1031,11 @@ std::add_pointer_t<void(std::string&, u32, u32)> rsx::get_pretty_printing_functi
 		return found;
 	}
 
-	return [](std::string& result, u32 id, u32 v)
+	return [](u32 id, u32 v)
 	{
-		std::string string_name;
-		const auto [name_prefix, name] = rsx::get_method_name(id, string_name);
+		const std::string name = rsx::get_method_name(id);
+		const std::string_view view = name, prefix = "CELL_GCM_"sv;
 
-		if (!string_name.empty())
-		{
-			fmt::append(result, "%s: 0x%08x", string_name, v);
-			return;
-		}
-
-		fmt::append(result, "%s: 0x%08x", name, v);
+		return fmt::format("%s: 0x%08x", name.starts_with("CELL_GCM_"sv) ? view.substr(prefix.size()) : view, v);
 	};
 }
diff --git a/rpcs3/Emu/RSX/gcm_printing.h b/rpcs3/Emu/RSX/gcm_printing.h
index 0542349644..eb803f93b6 100644
--- a/rpcs3/Emu/RSX/gcm_printing.h
+++ b/rpcs3/Emu/RSX/gcm_printing.h
@@ -2,10 +2,11 @@
 
 #include "util/types.hpp"
 #include <string>
+#include <functional>
 
 namespace rsx
 {
-	std::pair<std::string_view, std::string_view> get_method_name(u32 id, std::string& result_str);
+	std::string get_method_name(u32 id);
 
-	std::add_pointer_t<void(std::string&, u32, u32)> get_pretty_printing_function(u32 id);
+	std::add_pointer_t<std::string(u32, u32)> get_pretty_printing_function(u32 id);
 }
diff --git a/rpcs3/Emu/RSX/rsx_cache.h b/rpcs3/Emu/RSX/rsx_cache.h
index b219745f6a..d972841e94 100644
--- a/rpcs3/Emu/RSX/rsx_cache.h
+++ b/rpcs3/Emu/RSX/rsx_cache.h
@@ -1,17 +1,16 @@
 #pragma once
-#include "../system_config.h"
 #include "Utilities/File.h"
 #include "Utilities/lockless.h"
 #include "Utilities/Thread.h"
-#include "Common/bitfield.hpp"
-#include "Common/unordered_map.hpp"
+#include "Program/ProgramStateCache.h"
 #include "Emu/System.h"
 #include "Emu/cache_utils.hpp"
-#include "Emu/RSX/Program/RSXVertexProgram.h"
-#include "Emu/RSX/Program/RSXFragmentProgram.h"
+#include "Common/texture_cache_checker.h"
 #include "Overlays/Shaders/shader_loading_dialog.h"
 
+#include "rsx_utils.h"
 #include <chrono>
+#include <unordered_map>
 
 #include "util/sysinfo.hpp"
 #include "util/fnv_hash.hpp"
@@ -21,13 +20,7 @@ namespace rsx
 	template <typename pipeline_storage_type, typename backend_storage>
 	class shaders_cache
 	{
-		using unpacked_type = lf_fifo<std::tuple<pipeline_storage_type, RSXVertexProgram, RSXFragmentProgram>,
-#ifdef ANDROID
-		200
-#else
-		1000 // TODO: Determine best size
-#endif
-		>;
+		using unpacked_type = lf_fifo<std::tuple<pipeline_storage_type, RSXVertexProgram, RSXFragmentProgram>, 1000>; // TODO: Determine best size
 
 		struct pipeline_data
 		{
@@ -35,33 +28,25 @@ namespace rsx
 			u64 fragment_program_hash;
 			u64 pipeline_storage_hash;
 
-			u32 vp_ctrl0;
-			u32 vp_ctrl1;
+			u32 vp_ctrl;
 			u32 vp_texture_dimensions;
-			u32 vp_reserved_0;
 			u64 vp_instruction_mask[9];
 
 			u32 vp_base_address;
 			u32 vp_entry;
 			u16 vp_jump_table[32];
 
-			u16 vp_multisampled_textures;
-			u16 vp_reserved_1;
-			u32 vp_reserved_2;
-
 			u32 fp_ctrl;
 			u32 fp_texture_dimensions;
 			u32 fp_texcoord_control;
+			u16 fp_unnormalized_coords;
 			u16 fp_height;
 			u16 fp_pixel_layout;
 			u16 fp_lighting_flags;
 			u16 fp_shadow_textures;
 			u16 fp_redirected_textures;
-			u16 fp_multisampled_textures;
-			u8  fp_mrt_count;
-			u8  fp_reserved0;
-			u16 fp_reserved1;
-			u32 fp_reserved2;
+			u16 unused_0;             // Retained for binary compatibility
+			u64 unused_1;             // Retained for binary compatibility
 
 			pipeline_storage_type pipeline_properties;
 		};
@@ -117,7 +102,7 @@ namespace rsx
 						continue;
 					}
 
-					m_storage.preload_programs(nullptr, std::get<1>(entry), std::get<2>(entry));
+					m_storage.preload_programs(std::get<1>(entry), std::get<2>(entry));
 
 					unpacked[unpacked.push_begin()] = std::move(entry);
 				}
@@ -306,34 +291,28 @@ namespace rsx
 
 			// Writeback to cache either if file does not exist or it is invalid (unexpected size)
 			// Note: fs::write_file is not atomic, if the process is terminated in the middle an empty file is created
-			if (fs::stat_t s{}; !fs::get_stat(fp_name, s) || s.size != fp.ucode_length)
+			if (fs::stat_t s{}; !fs::stat(fp_name, s) || s.size != fp.ucode_length)
 			{
 				fs::write_file(fp_name, fs::rewrite, fp.get_data(), fp.ucode_length);
 			}
 
-			if (fs::stat_t s{}; !fs::get_stat(vp_name, s) || s.size != vp.data.size() * sizeof(u32))
+			if (fs::stat_t s{}; !fs::stat(vp_name, s) || s.size != vp.data.size() * sizeof(u32))
 			{
 				fs::write_file(vp_name, fs::rewrite, vp.data);
 			}
 
-			const u32 state_params[] =
-			{
-				data.vp_ctrl0,
-				data.vp_ctrl1,
-				data.fp_ctrl,
-				data.vp_texture_dimensions,
-				data.fp_texture_dimensions,
-				data.fp_texcoord_control,
-				data.fp_height,
-				data.fp_pixel_layout,
-				data.fp_lighting_flags,
-				data.fp_shadow_textures,
-				data.fp_redirected_textures,
-				data.vp_multisampled_textures,
-				data.fp_multisampled_textures,
-				data.fp_mrt_count,
-			};
-			const usz state_hash = rpcs3::hash_array(state_params);
+			u64 state_hash = 0;
+			state_hash ^= rpcs3::hash_base<u32>(data.vp_ctrl);
+			state_hash ^= rpcs3::hash_base<u32>(data.fp_ctrl);
+			state_hash ^= rpcs3::hash_base<u32>(data.vp_texture_dimensions);
+			state_hash ^= rpcs3::hash_base<u32>(data.fp_texture_dimensions);
+			state_hash ^= rpcs3::hash_base<u32>(data.fp_texcoord_control);
+			state_hash ^= rpcs3::hash_base<u16>(data.fp_unnormalized_coords);
+			state_hash ^= rpcs3::hash_base<u16>(data.fp_height);
+			state_hash ^= rpcs3::hash_base<u16>(data.fp_pixel_layout);
+			state_hash ^= rpcs3::hash_base<u16>(data.fp_lighting_flags);
+			state_hash ^= rpcs3::hash_base<u16>(data.fp_shadow_textures);
+			state_hash ^= rpcs3::hash_base<u16>(data.fp_redirected_textures);
 
 			const std::string pipeline_file_name = fmt::format("%llX+%llX+%llX+%llX.bin", data.vertex_program_hash, data.fragment_program_hash, data.pipeline_storage_hash, state_hash);
 			const std::string pipeline_path = root_path + "/pipelines/" + pipeline_class_name + "/" + version_prefix + "/" + pipeline_file_name;
@@ -347,6 +326,8 @@ namespace rsx
 			fs::file f(fmt::format("%s/raw/%llX.vp", root_path, program_hash));
 			if (f) f.read(vp.data, f.size() / sizeof(u32));
 
+			vp.skip_vertex_input_check = true;
+
 			return vp;
 		}
 
@@ -379,10 +360,8 @@ namespace rsx
 			fp = load_fp_raw(data.fragment_program_hash);
 			pipeline = data.pipeline_properties;
 
-			vp.ctrl = data.vp_ctrl0;
-			vp.output_mask = data.vp_ctrl1;
+			vp.output_mask = data.vp_ctrl;
 			vp.texture_state.texture_dimensions = data.vp_texture_dimensions;
-			vp.texture_state.multisampled_textures = data.vp_multisampled_textures;
 			vp.base_address = data.vp_base_address;
 			vp.entry = data.vp_entry;
 
@@ -402,12 +381,11 @@ namespace rsx
 
 			fp.ctrl = data.fp_ctrl;
 			fp.texture_state.texture_dimensions = data.fp_texture_dimensions;
+			fp.texture_state.unnormalized_coords = data.fp_unnormalized_coords;
 			fp.texture_state.shadow_textures = data.fp_shadow_textures;
 			fp.texture_state.redirected_textures = data.fp_redirected_textures;
-			fp.texture_state.multisampled_textures = data.fp_multisampled_textures;
 			fp.texcoord_control_mask = data.fp_texcoord_control;
 			fp.two_sided_lighting = !!(data.fp_lighting_flags & 0x1);
-			fp.mrt_buffers_count = data.fp_mrt_count;
 
 			return result;
 		}
@@ -420,10 +398,8 @@ namespace rsx
 			data_block.fragment_program_hash = m_storage.get_hash(fp);
 			data_block.pipeline_storage_hash = m_storage.get_hash(pipeline);
 
-			data_block.vp_ctrl0 = vp.ctrl;
-			data_block.vp_ctrl1 = vp.output_mask;
+			data_block.vp_ctrl = vp.output_mask;
 			data_block.vp_texture_dimensions = vp.texture_state.texture_dimensions;
-			data_block.vp_multisampled_textures = vp.texture_state.multisampled_textures;
 			data_block.vp_base_address = vp.base_address;
 			data_block.vp_entry = vp.entry;
 
@@ -450,11 +426,10 @@ namespace rsx
 			data_block.fp_ctrl = fp.ctrl;
 			data_block.fp_texture_dimensions = fp.texture_state.texture_dimensions;
 			data_block.fp_texcoord_control = fp.texcoord_control_mask;
+			data_block.fp_unnormalized_coords = fp.texture_state.unnormalized_coords;
 			data_block.fp_lighting_flags = u16(fp.two_sided_lighting);
 			data_block.fp_shadow_textures = fp.texture_state.shadow_textures;
 			data_block.fp_redirected_textures = fp.texture_state.redirected_textures;
-			data_block.fp_multisampled_textures = fp.texture_state.multisampled_textures;
-			data_block.fp_mrt_count = fp.mrt_buffers_count;
 
 			return data_block;
 		}
@@ -463,62 +438,61 @@ namespace rsx
 	namespace vertex_cache
 	{
 		// A null vertex cache
-		template <typename storage_type>
+		template <typename storage_type, typename upload_format>
 		class default_vertex_cache
 		{
 		public:
 			virtual ~default_vertex_cache() = default;
-			virtual const storage_type* find_vertex_range(u32 /*local_addr*/, u32 /*data_length*/) { return nullptr; }
-			virtual void store_range(u32 /*local_addr*/, u32 /*data_length*/, u32 /*offset_in_heap*/) {}
+			virtual storage_type* find_vertex_range(uptr /*local_addr*/, upload_format, u32 /*data_length*/) { return nullptr; }
+			virtual void store_range(uptr /*local_addr*/, upload_format, u32 /*data_length*/, u32 /*offset_in_heap*/) {}
 			virtual void purge() {}
 		};
 
-		struct uploaded_range
-		{
-			uptr local_address;
-			u32 offset_in_heap;
-			u32 data_length;
-		};
-
 		// A weak vertex cache with no data checks or memory range locks
 		// Of limited use since contents are only guaranteed to be valid once per frame
-		// Supports upto 1GiB block lengths if typed and full 4GiB otherwise.
-		// Using a 1:1 hash-value with robin-hood is 2x faster than what we had before with std-map-of-arrays.
-		class weak_vertex_cache : public default_vertex_cache<uploaded_range>
+		// TODO: Strict vertex cache with range locks
+		template <typename upload_format>
+		struct uploaded_range
 		{
-			using storage_type = uploaded_range;
+			uptr local_address;
+			upload_format buffer_format;
+			u32 offset_in_heap;
+			u32 data_length;
+		};
+
+		template <typename upload_format>
+		class weak_vertex_cache : public default_vertex_cache<uploaded_range<upload_format>, upload_format>
+		{
+			using storage_type = uploaded_range<upload_format>;
 
 		private:
-			rsx::unordered_map<uptr, storage_type> vertex_ranges;
-
-			FORCE_INLINE u64 hash(u32 local_addr, u32 data_length) const
-			{
-				return u64(local_addr) | (u64(data_length) << 32);
-			}
+			std::unordered_map<uptr, std::vector<storage_type>> vertex_ranges;
 
 		public:
 
-			const storage_type* find_vertex_range(u32 local_addr, u32 data_length) override
+			storage_type* find_vertex_range(uptr local_addr, upload_format fmt, u32 data_length) override
 			{
-				const auto key = hash(local_addr, data_length);
-				const auto found = vertex_ranges.find(key);
-				if (found == vertex_ranges.end())
+				//const auto data_end = local_addr + data_length;
+
+				for (auto &v : vertex_ranges[local_addr])
 				{
-					return nullptr;
+					// NOTE: This has to match exactly. Using sized shortcuts such as >= comparison causes artifacting in some applications (UC1)
+					if (v.buffer_format == fmt && v.data_length == data_length)
+						return &v;
 				}
 
-				return std::addressof(found->second);
+				return nullptr;
 			}
 
-			void store_range(u32 local_addr, u32 data_length, u32 offset_in_heap) override
+			void store_range(uptr local_addr, upload_format fmt, u32 data_length, u32 offset_in_heap) override
 			{
 				storage_type v = {};
+				v.buffer_format = fmt;
 				v.data_length = data_length;
 				v.local_address = local_addr;
 				v.offset_in_heap = offset_in_heap;
 
-				const auto key = hash(local_addr, data_length);
-				vertex_ranges[key] = v;
+				vertex_ranges[local_addr].push_back(v);
 			}
 
 			void purge() override
diff --git a/rpcs3/Emu/RSX/rsx_decode.h b/rpcs3/Emu/RSX/rsx_decode.h
index 10b58d59c4..19820dba79 100644
--- a/rpcs3/Emu/RSX/rsx_decode.h
+++ b/rpcs3/Emu/RSX/rsx_decode.h
@@ -10,12 +10,7 @@
 
 namespace rsx
 {
-	enum class boolean_to_string_t : u8 {};
-
-	constexpr boolean_to_string_t print_boolean(bool b)
-	{
-		return boolean_to_string_t{static_cast<u8>(b)};
-	}
+	std::string print_boolean(bool b);
 
 template <u16 Register>
 struct registers_decoder
@@ -35,12 +30,12 @@ struct registers_decoder<NV406E_SET_REFERENCE>
 	{
 		const u32 value;
 
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV406E Ref: 0x%08x", decoded.value);
+		return fmt::format("NV406E Ref: 0x%08x", decoded.value);
 	}
 };
 
@@ -53,7 +48,7 @@ struct registers_decoder<NV4097_SET_VIEWPORT_HORIZONTAL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 origin_x() const
 		{
@@ -66,9 +61,9 @@ struct registers_decoder<NV4097_SET_VIEWPORT_HORIZONTAL>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Viewport: x: %u width: %u", decoded.origin_x(), decoded.width());
+		return fmt::format("Viewport: x: %u width: %u", decoded.origin_x(), decoded.width());
 	}
 };
 
@@ -81,7 +76,7 @@ struct registers_decoder<NV4097_SET_VIEWPORT_VERTICAL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 origin_y() const
 		{
@@ -94,9 +89,9 @@ struct registers_decoder<NV4097_SET_VIEWPORT_VERTICAL>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Viewport: y: %u height: %u", decoded.origin_y(), decoded.height());
+		return fmt::format("Viewport: y: %u height: %u", decoded.origin_y(), decoded.height());
 	}
 };
 
@@ -109,7 +104,7 @@ struct registers_decoder<NV4097_SET_SCISSOR_HORIZONTAL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 origin_x() const
 		{
@@ -122,9 +117,9 @@ struct registers_decoder<NV4097_SET_SCISSOR_HORIZONTAL>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Scissor: x: %u width: %u", decoded.origin_x(), decoded.width());
+		return "Scissor: x = " + std::to_string(decoded.origin_x()) + " width = " + std::to_string(decoded.width());
 	}
 };
 
@@ -137,7 +132,7 @@ struct registers_decoder<NV4097_SET_SCISSOR_VERTICAL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 origin_y() const
 		{
@@ -150,9 +145,9 @@ struct registers_decoder<NV4097_SET_SCISSOR_VERTICAL>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Scissor: y: %u height: %u",  decoded.origin_y(), decoded.height());
+		return "Scissor: y  = " + std::to_string(decoded.origin_y()) + " height = " + std::to_string(decoded.height());
 	}
 };
 
@@ -165,7 +160,7 @@ struct registers_decoder<NV4097_SET_SURFACE_CLIP_HORIZONTAL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 origin_x() const
 		{
@@ -178,9 +173,9 @@ struct registers_decoder<NV4097_SET_SURFACE_CLIP_HORIZONTAL>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: clip x: %u width: %u", decoded.origin_x(), decoded.width());
+		return "Surface: clip x  = " + std::to_string(decoded.origin_x()) + " width = " + std::to_string(decoded.width());
 	}
 };
 
@@ -193,7 +188,7 @@ struct registers_decoder< NV4097_SET_SURFACE_CLIP_VERTICAL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 origin_y() const
 		{
@@ -206,9 +201,9 @@ struct registers_decoder< NV4097_SET_SURFACE_CLIP_VERTICAL>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: clip y: %u height: %u", decoded.origin_y(), decoded.height());
+		return "Surface: clip y  = " + std::to_string(decoded.origin_y()) + " height = " + std::to_string(decoded.height());
 	}
 };
 
@@ -221,7 +216,7 @@ struct registers_decoder<NV4097_SET_CLEAR_RECT_HORIZONTAL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 origin_x() const
 		{
@@ -234,9 +229,9 @@ struct registers_decoder<NV4097_SET_CLEAR_RECT_HORIZONTAL>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Clear: rect x: %u width: %u", decoded.origin_x(), decoded.width());
+		return "Clear: rect x  = " + std::to_string(decoded.origin_x()) + " width = " + std::to_string(decoded.width());
 	}
 };
 
@@ -249,7 +244,7 @@ struct registers_decoder<NV4097_SET_CLEAR_RECT_VERTICAL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 origin_y() const
 		{
@@ -262,9 +257,9 @@ struct registers_decoder<NV4097_SET_CLEAR_RECT_VERTICAL>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Clear: rect y: %u height: %u", decoded.origin_y(), decoded.height());
+		return "Clear: rect y  = " + std::to_string(decoded.origin_y()) + " height = " + std::to_string(decoded.height());
 	}
 };
 
@@ -277,7 +272,7 @@ struct registers_decoder< NV3089_CLIP_POINT>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 clip_x() const
 		{
@@ -290,9 +285,9 @@ struct registers_decoder< NV3089_CLIP_POINT>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Blit engine: clip x: %u y: %u", decoded.clip_x(), decoded.clip_y());
+		return "Blit engine: clip x  = " + std::to_string(decoded.clip_x()) + " y = " + std::to_string(decoded.clip_y());
 	}
 };
 
@@ -305,7 +300,7 @@ struct registers_decoder<NV3089_CLIP_SIZE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 clip_width() const
 		{
@@ -318,9 +313,9 @@ struct registers_decoder<NV3089_CLIP_SIZE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Blit engine: clip width: %u height: %u", decoded.clip_width(), decoded.clip_height());
+		return "Blit engine: clip width  = " + std::to_string(decoded.clip_width()) + " height = " + std::to_string(decoded.clip_height());
 	}
 };
 
@@ -333,7 +328,7 @@ struct registers_decoder<NV3089_IMAGE_OUT_POINT>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 x() const
 		{
@@ -346,9 +341,9 @@ struct registers_decoder<NV3089_IMAGE_OUT_POINT>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Blit engine: output x: %u y: %u", decoded.x(), decoded.y());
+		return "Blit engine: output x  = " + std::to_string(decoded.x()) + " y = " + std::to_string(decoded.y());
 	}
 };
 
@@ -361,7 +356,7 @@ struct registers_decoder<NV4097_SET_WINDOW_OFFSET>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 window_offset_x() const
 		{
@@ -374,9 +369,9 @@ struct registers_decoder<NV4097_SET_WINDOW_OFFSET>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Window: offset x: %u y: %u", decoded.window_offset_x(), decoded.window_offset_y());
+		return fmt::format("Window: offset x: %u y: %u", decoded.window_offset_x(), decoded.window_offset_y());
 	}
 };
 
@@ -390,7 +385,7 @@ struct registers_decoder<NV3089_IMAGE_OUT_SIZE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 width() const
 		{
@@ -403,9 +398,9 @@ struct registers_decoder<NV3089_IMAGE_OUT_SIZE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Blit engine: output width: %u height: %u", decoded.width(), decoded.height());
+		return "Blit engine: output width  = " + std::to_string(decoded.width()) + " height = " + std::to_string(decoded.height());
 	}
 };
 
@@ -418,7 +413,7 @@ struct registers_decoder<NV3089_IMAGE_IN_SIZE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 width() const
 		{
@@ -431,9 +426,9 @@ struct registers_decoder<NV3089_IMAGE_IN_SIZE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Blit engine: input width: %u height: %u", decoded.width(), decoded.height());
+		return "Blit engine: input width  = " + std::to_string(decoded.width()) + " height = " + std::to_string(decoded.height());
 	}
 };
 
@@ -446,7 +441,7 @@ struct registers_decoder<NV3062_SET_PITCH>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 alignment() const
 		{
@@ -459,9 +454,9 @@ struct registers_decoder<NV3062_SET_PITCH>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Blit engine: output alignment: %u pitch: %u", decoded.alignment(), decoded.pitch());
+		return "Blit engine: output alignment  = " + std::to_string(decoded.alignment()) + " pitch = " + std::to_string(decoded.pitch());
 	}
 };
 
@@ -474,7 +469,7 @@ struct registers_decoder< NV308A_POINT>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 x() const
 		{
@@ -487,9 +482,9 @@ struct registers_decoder< NV308A_POINT>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV308A: x: %u y: %u", decoded.x(), decoded.y());
+		return "NV308A: x  = " + std::to_string(decoded.x()) + " y = " + std::to_string(decoded.y());
 	}
 };
 
@@ -502,7 +497,7 @@ struct registers_decoder<NV4097_SET_VERTEX_ATTRIB_INPUT_MASK>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 mask() const
 		{
@@ -510,10 +505,10 @@ struct registers_decoder<NV4097_SET_VERTEX_ATTRIB_INPUT_MASK>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		out += "Transform program enabled inputs:";
-		constexpr std::string_view input_names[] =
+		std::string result = "Transform program enabled inputs:";
+		const std::string input_names[] =
 		{
 			"in_pos", "in_weight", "in_normal",
 			"in_diff_color", "in_spec_color",
@@ -522,15 +517,10 @@ struct registers_decoder<NV4097_SET_VERTEX_ATTRIB_INPUT_MASK>
 			"in_tc0", "in_tc1", "in_tc2", "in_tc3",
 			"in_tc4", "in_tc5", "in_tc6", "in_tc7"
 		};
-
-		for (u32 i = 0; i < 16; i++)
-		{
+		for (unsigned i = 0; i < 16; i++)
 			if (decoded.mask() & (1 << i))
-			{
-				out += ' ';
-				out += input_names[i];
-			}
-		}
+				result += input_names[i] + " ";
+		return result;
 	}
 };
 
@@ -543,7 +533,7 @@ struct registers_decoder<NV4097_SET_FREQUENCY_DIVIDER_OPERATION>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 frequency_divider_operation_mask() const
 		{
@@ -551,26 +541,13 @@ struct registers_decoder<NV4097_SET_FREQUENCY_DIVIDER_OPERATION>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		out += "Frequency divider:";
-
-		const u32 mask = decoded.frequency_divider_operation_mask();
-
-		if (!mask)
-		{
-			out += " (none)";
-			return;
-		}
-
-		for (u32 i = 0; i < 16; i++)
-		{
-			if (mask & (1 << i))
-			{
-				out += ' ';
-				fmt::append(out, "%u", i);
-			}
-		}
+		std::string result = "Frequency divider: ";
+		for (unsigned i = 0; i < 16; i++)
+			if (decoded.frequency_divider_operation_mask() & (1 << i))
+				result += std::to_string(i) + " ";
+		return result;
 	}
 };
 
@@ -591,9 +568,9 @@ struct registers_decoder<NV4097_SET_DEPTH_TEST_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Depth: test %s", print_boolean(decoded.depth_test_enabled()));
+		return "Depth: test " + print_boolean(decoded.depth_test_enabled());
 	}
 };
 
@@ -614,9 +591,9 @@ struct registers_decoder<NV4097_SET_DEPTH_MASK>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Depth: write: %s", print_boolean(decoded.depth_write_enabled()));
+		return "Depth: write " + print_boolean(decoded.depth_write_enabled());
 	}
 };
 
@@ -629,7 +606,7 @@ struct registers_decoder<NV4097_SET_ZMIN_MAX_CONTROL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool depth_clip_enabled() const
 		{
@@ -647,9 +624,11 @@ struct registers_decoder<NV4097_SET_ZMIN_MAX_CONTROL>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Depth: clip_enabled: %s, clamp: %s, ignore_w: %s", print_boolean(decoded.depth_clip_enabled()), print_boolean(decoded.depth_clamp_enabled()) , print_boolean(decoded.depth_clip_ignore_w()));
+		return "Depth: clip_enabled " + print_boolean(decoded.depth_clip_enabled()) +
+			" clamp " + print_boolean(decoded.depth_clamp_enabled()) +
+			" ignore_w " + print_boolean(decoded.depth_clip_ignore_w());
 	}
 };
 
@@ -670,9 +649,9 @@ struct registers_decoder<NV4097_SET_ALPHA_TEST_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Alpha: test %s", print_boolean(decoded.alpha_test_enabled()));
+		return "Alpha: test " + print_boolean(decoded.alpha_test_enabled());
 	}
 };
 
@@ -693,9 +672,9 @@ struct registers_decoder<NV4097_SET_STENCIL_TEST_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: test %s", print_boolean(decoded.stencil_test_enabled()));
+		return "Stencil: test " + print_boolean(decoded.stencil_test_enabled());
 	}
 };
 
@@ -716,9 +695,9 @@ struct registers_decoder<NV4097_SET_RESTART_INDEX_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Restart Index: %s", print_boolean(decoded.restart_index_enabled()));
+		return "Restart Index: " + print_boolean(decoded.restart_index_enabled());
 	}
 };
 
@@ -739,9 +718,9 @@ struct registers_decoder<NV4097_SET_DEPTH_BOUNDS_TEST_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Depth: bound test %s", print_boolean(decoded.depth_bound_enabled()));
+		return "Depth: bound test " + print_boolean(decoded.depth_bound_enabled());
 	}
 };
 
@@ -762,9 +741,9 @@ struct registers_decoder<NV4097_SET_LOGIC_OP_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Logic: %s", print_boolean(decoded.logic_op_enabled()));
+		return "Logic: " + print_boolean(decoded.logic_op_enabled());
 	}
 };
 
@@ -785,9 +764,9 @@ struct registers_decoder<NV4097_SET_DITHER_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Dither: %s", print_boolean(decoded.dither_enabled()));
+		return "Dither: " + print_boolean(decoded.dither_enabled());
 	}
 };
 
@@ -808,9 +787,9 @@ struct registers_decoder<NV4097_SET_BLEND_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Blend: %s", print_boolean(decoded.blend_enabled()));
+		return "Blend: " + print_boolean(decoded.blend_enabled());
 	}
 };
 
@@ -831,9 +810,9 @@ struct registers_decoder<NV4097_SET_LINE_SMOOTH_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Line smooth: %s", print_boolean(decoded.line_smooth_enabled()));
+		return "Line: smooth " + print_boolean(decoded.line_smooth_enabled());
 	}
 };
 
@@ -854,9 +833,9 @@ struct registers_decoder<NV4097_SET_POLY_OFFSET_POINT_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Polygon: offset point: %s", print_boolean(decoded.poly_offset_point_enabled()));
+		return "Polygon: offset point " + print_boolean(decoded.poly_offset_point_enabled());
 	}
 };
 
@@ -877,9 +856,9 @@ struct registers_decoder<NV4097_SET_POLY_OFFSET_LINE_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Polygon: offset line: %s", print_boolean(decoded.poly_offset_line_enabled()));
+		return "Polygon: offset line " + print_boolean(decoded.poly_offset_line_enabled());
 	}
 };
 
@@ -900,9 +879,9 @@ struct registers_decoder<NV4097_SET_POLY_OFFSET_FILL_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Polygon: offset fill: %s", print_boolean(decoded.poly_offset_fill_enabled()));
+		return "Polygon: offset fill " + print_boolean(decoded.poly_offset_fill_enabled());
 	}
 };
 
@@ -923,9 +902,9 @@ struct registers_decoder<NV4097_SET_CULL_FACE_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Cull face: %s", print_boolean(decoded.cull_face_enabled()));
+		return "Cull face: " + print_boolean(decoded.cull_face_enabled());
 	}
 };
 
@@ -946,9 +925,9 @@ struct registers_decoder<NV4097_SET_POLY_SMOOTH_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Polygon: smooth: %s", print_boolean(decoded.poly_smooth_enabled()));
+		return "Polygon: smooth " + print_boolean(decoded.poly_smooth_enabled());
 	}
 };
 
@@ -969,9 +948,9 @@ struct registers_decoder<NV4097_SET_TWO_SIDED_STENCIL_TEST_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: per side: %s", print_boolean(decoded.two_sided_stencil_test_enabled()));
+		return "Stencil: per side " + print_boolean(decoded.two_sided_stencil_test_enabled());
 	}
 };
 
@@ -992,9 +971,9 @@ struct registers_decoder<NV4097_SET_TWO_SIDE_LIGHT_EN>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Light: per side: %s", print_boolean(decoded.two_sided_lighting_enabled()));
+		return "Light: per side " + print_boolean(decoded.two_sided_lighting_enabled());
 	}
 };
 
@@ -1007,7 +986,7 @@ struct registers_decoder<NV4097_SET_DEPTH_BOUNDS_MIN>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 depth_bound_min() const
 		{
@@ -1015,9 +994,9 @@ struct registers_decoder<NV4097_SET_DEPTH_BOUNDS_MIN>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Depth: bound min: %g", decoded.depth_bound_min());
+		return "Depth: bound min = " + std::to_string(decoded.depth_bound_min());
 	}
 };
 
@@ -1030,7 +1009,7 @@ struct registers_decoder<NV4097_SET_DEPTH_BOUNDS_MAX>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 depth_bound_max() const
 		{
@@ -1038,9 +1017,9 @@ struct registers_decoder<NV4097_SET_DEPTH_BOUNDS_MAX>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Depth: bound max: %g", decoded.depth_bound_max());
+		return "Depth: bound max = " + std::to_string(decoded.depth_bound_max());
 	}
 };
 
@@ -1053,7 +1032,7 @@ struct registers_decoder<NV4097_SET_FOG_PARAMS>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 fog_param_0() const
 		{
@@ -1061,9 +1040,9 @@ struct registers_decoder<NV4097_SET_FOG_PARAMS>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Fog: param 0: %g", decoded.fog_param_0());
+		return "Fog: param 0 = " + std::to_string(decoded.fog_param_0());
 	}
 };
 
@@ -1076,7 +1055,7 @@ struct registers_decoder<NV4097_SET_FOG_PARAMS + 1>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 fog_param_1() const
 		{
@@ -1084,9 +1063,9 @@ struct registers_decoder<NV4097_SET_FOG_PARAMS + 1>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Fog: param 1: %g", decoded.fog_param_1());
+		return "Fog: param 1 = " + std::to_string(decoded.fog_param_1());
 	}
 };
 
@@ -1099,7 +1078,7 @@ struct registers_decoder<NV4097_SET_CLIP_MIN>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 clip_min() const
 		{
@@ -1107,9 +1086,9 @@ struct registers_decoder<NV4097_SET_CLIP_MIN>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Depth: clip min: %g", decoded.clip_min());
+		return "Depth: clip min = " + std::to_string(decoded.clip_min());
 	}
 };
 
@@ -1122,7 +1101,7 @@ struct registers_decoder<NV4097_SET_CLIP_MAX>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 clip_max() const
 		{
@@ -1130,9 +1109,9 @@ struct registers_decoder<NV4097_SET_CLIP_MAX>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Depth: clip max: %g", decoded.clip_max());
+		return "Depth: clip max = " + std::to_string(decoded.clip_max());
 	}
 };
 
@@ -1145,7 +1124,7 @@ struct registers_decoder<NV4097_SET_POLYGON_OFFSET_SCALE_FACTOR>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 polygon_offset_scale_factor() const
 		{
@@ -1153,9 +1132,9 @@ struct registers_decoder<NV4097_SET_POLYGON_OFFSET_SCALE_FACTOR>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Polygon: offset scale: %g", decoded.polygon_offset_scale_factor());
+		return "Polygon: offset scale = " + std::to_string(decoded.polygon_offset_scale_factor());
 	}
 };
 
@@ -1168,7 +1147,7 @@ struct registers_decoder<NV4097_SET_POLYGON_OFFSET_BIAS>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 polygon_offset_scale_bias() const
 		{
@@ -1176,9 +1155,9 @@ struct registers_decoder<NV4097_SET_POLYGON_OFFSET_BIAS>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Polygon: offset bias: %g", decoded.polygon_offset_scale_bias());
+		return "Polygon: offset bias = " + std::to_string(decoded.polygon_offset_scale_bias());
 	}
 };
 
@@ -1191,7 +1170,7 @@ struct registers_decoder<NV4097_SET_VIEWPORT_SCALE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 viewport_scale_x() const
 		{
@@ -1199,9 +1178,9 @@ struct registers_decoder<NV4097_SET_VIEWPORT_SCALE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Viewport: scale x: %g", decoded.viewport_scale_x());
+		return "Viewport: scale x = " + std::to_string(decoded.viewport_scale_x());
 	}
 };
 
@@ -1214,7 +1193,7 @@ struct registers_decoder<NV4097_SET_VIEWPORT_SCALE + 1>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 viewport_scale_y() const
 		{
@@ -1222,9 +1201,9 @@ struct registers_decoder<NV4097_SET_VIEWPORT_SCALE + 1>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Viewport: scale y: %g", decoded.viewport_scale_y());
+		return "Viewport: scale y = " + std::to_string(decoded.viewport_scale_y());
 	}
 };
 
@@ -1237,7 +1216,7 @@ struct registers_decoder<NV4097_SET_VIEWPORT_SCALE + 2>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 viewport_scale_z() const
 		{
@@ -1245,9 +1224,9 @@ struct registers_decoder<NV4097_SET_VIEWPORT_SCALE + 2>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Viewport: scale z: %g", decoded.viewport_scale_z());
+		return "Viewport: scale z = " + std::to_string(decoded.viewport_scale_z());
 	}
 };
 
@@ -1260,7 +1239,7 @@ struct registers_decoder<NV4097_SET_VIEWPORT_SCALE + 3>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 viewport_scale_w() const
 		{
@@ -1268,9 +1247,9 @@ struct registers_decoder<NV4097_SET_VIEWPORT_SCALE + 3>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Viewport: scale w: %g", decoded.viewport_scale_w());
+		return "Viewport: scale w = " + std::to_string(decoded.viewport_scale_w());
 	}
 };
 
@@ -1283,7 +1262,7 @@ struct registers_decoder<NV4097_SET_VIEWPORT_OFFSET>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 viewport_offset_x() const
 		{
@@ -1291,9 +1270,9 @@ struct registers_decoder<NV4097_SET_VIEWPORT_OFFSET>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Viewport: offset x: %g", decoded.viewport_offset_x());
+		return "Viewport: offset x = " + std::to_string(decoded.viewport_offset_x());
 	}
 };
 
@@ -1306,7 +1285,7 @@ struct registers_decoder<NV4097_SET_VIEWPORT_OFFSET + 1>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 viewport_offset_y() const
 		{
@@ -1314,9 +1293,9 @@ struct registers_decoder<NV4097_SET_VIEWPORT_OFFSET + 1>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Viewport: offset y: %g", decoded.viewport_offset_y());
+		return "Viewport: offset y = " + std::to_string(decoded.viewport_offset_y());
 	}
 };
 
@@ -1329,7 +1308,7 @@ struct registers_decoder<NV4097_SET_VIEWPORT_OFFSET + 2>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 viewport_offset_z() const
 		{
@@ -1337,9 +1316,9 @@ struct registers_decoder<NV4097_SET_VIEWPORT_OFFSET + 2>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Viewport: offset z: %g", decoded.viewport_offset_z());
+		return "Viewport: offset z = " + std::to_string(decoded.viewport_offset_z());
 	}
 };
 
@@ -1352,7 +1331,7 @@ struct registers_decoder<NV4097_SET_VIEWPORT_OFFSET + 3>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 viewport_offset_w() const
 		{
@@ -1360,9 +1339,9 @@ struct registers_decoder<NV4097_SET_VIEWPORT_OFFSET + 3>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Viewport: offset w: %g", decoded.viewport_offset_w());
+		return "Viewport: offset w = " + std::to_string(decoded.viewport_offset_w());
 	}
 };
 
@@ -1375,7 +1354,7 @@ struct registers_decoder<NV4097_SET_RESTART_INDEX>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 restart_index() const
 		{
@@ -1383,9 +1362,9 @@ struct registers_decoder<NV4097_SET_RESTART_INDEX>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Restart index: %u", decoded.restart_index());
+		return "Restart index: " + std::to_string(decoded.restart_index());
 	}
 };
 
@@ -1398,7 +1377,7 @@ struct registers_decoder<NV4097_SET_SURFACE_COLOR_AOFFSET>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 surface_a_offset() const
 		{
@@ -1406,9 +1385,9 @@ struct registers_decoder<NV4097_SET_SURFACE_COLOR_AOFFSET>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: A offset 0x%x", decoded.surface_a_offset());
+		return fmt::format("Surface: A offset 0x%x", decoded.surface_a_offset());
 	}
 };
 
@@ -1421,7 +1400,7 @@ struct registers_decoder<NV4097_SET_SURFACE_COLOR_BOFFSET>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 surface_b_offset() const
 		{
@@ -1429,9 +1408,9 @@ struct registers_decoder<NV4097_SET_SURFACE_COLOR_BOFFSET>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: B offset 0x%x", decoded.surface_b_offset());
+		return fmt::format("Surface: B offset 0x%x", decoded.surface_b_offset());
 	}
 };
 
@@ -1444,7 +1423,7 @@ struct registers_decoder<NV4097_SET_SURFACE_COLOR_COFFSET>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 surface_c_offset() const
 		{
@@ -1452,9 +1431,9 @@ struct registers_decoder<NV4097_SET_SURFACE_COLOR_COFFSET>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: C offset 0x%x", decoded.surface_c_offset());
+		return fmt::format("Surface: C offset 0x%x", decoded.surface_c_offset());
 	}
 };
 
@@ -1467,7 +1446,7 @@ struct registers_decoder<NV4097_SET_SURFACE_COLOR_DOFFSET>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 surface_d_offset() const
 		{
@@ -1475,9 +1454,9 @@ struct registers_decoder<NV4097_SET_SURFACE_COLOR_DOFFSET>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: D offset 0x%x", decoded.surface_d_offset());
+		return fmt::format("Surface: D offset 0x%x", decoded.surface_d_offset());
 	}
 };
 
@@ -1490,7 +1469,7 @@ struct registers_decoder<NV4097_SET_SURFACE_PITCH_A>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 surface_a_pitch() const
 		{
@@ -1498,9 +1477,9 @@ struct registers_decoder<NV4097_SET_SURFACE_PITCH_A>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: A pitch: %u", decoded.surface_a_pitch());
+		return "Surface: A pitch " + std::to_string(decoded.surface_a_pitch());
 	}
 };
 
@@ -1513,7 +1492,7 @@ struct registers_decoder<NV4097_SET_SURFACE_PITCH_B>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 surface_b_pitch() const
 		{
@@ -1521,9 +1500,9 @@ struct registers_decoder<NV4097_SET_SURFACE_PITCH_B>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: B pitch: %u", decoded.surface_b_pitch());
+		return "Surface: B pitch " + std::to_string(decoded.surface_b_pitch());
 	}
 };
 
@@ -1536,7 +1515,7 @@ struct registers_decoder<NV4097_SET_SURFACE_PITCH_C>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 surface_c_pitch() const
 		{
@@ -1544,9 +1523,9 @@ struct registers_decoder<NV4097_SET_SURFACE_PITCH_C>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: C pitch: %u", decoded.surface_c_pitch());
+		return "Surface: C pitch " + std::to_string(decoded.surface_c_pitch());
 	}
 };
 
@@ -1559,7 +1538,7 @@ struct registers_decoder<NV4097_SET_SURFACE_PITCH_D>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 surface_d_pitch() const
 		{
@@ -1567,9 +1546,9 @@ struct registers_decoder<NV4097_SET_SURFACE_PITCH_D>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: D pitch: %u", decoded.surface_d_pitch());
+		return "Surface: D pitch " + std::to_string(decoded.surface_d_pitch());
 	}
 };
 
@@ -1582,7 +1561,7 @@ struct registers_decoder<NV4097_SET_SURFACE_ZETA_OFFSET>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 surface_z_offset() const
 		{
@@ -1590,9 +1569,9 @@ struct registers_decoder<NV4097_SET_SURFACE_ZETA_OFFSET>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: Z offset: 0x%x", decoded.surface_z_offset());
+		return "Surface: Z offset " + std::to_string(decoded.surface_z_offset());
 	}
 };
 
@@ -1605,7 +1584,7 @@ struct registers_decoder<NV4097_SET_SURFACE_PITCH_Z>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 surface_z_pitch() const
 		{
@@ -1613,9 +1592,9 @@ struct registers_decoder<NV4097_SET_SURFACE_PITCH_Z>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: Z pitch: %u", decoded.surface_z_pitch());
+		return "Surface: Z pitch " + std::to_string(decoded.surface_z_pitch());
 	}
 };
 
@@ -1628,7 +1607,7 @@ struct registers_decoder<NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 output_mask() const
 		{
@@ -1636,9 +1615,9 @@ struct registers_decoder<NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		static constexpr std::string_view output_names[] =
+		const std::string output_names[] =
 		{
 			"diffuse_color",
 			"specular_color",
@@ -1663,19 +1642,11 @@ struct registers_decoder<NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK>
 			"tc6",
 			"tc7"
 		};
-
-		out += "Transform program outputs:";
-
-		const u32 mask = decoded.output_mask();
-
-		for (u32 i = 0; i < 22; i++)
-		{
-			if (mask & (1 << i))
-			{
-				out += ' ';
-				out += output_names[i];
-			}
-		}
+		std::string result = "Transform program outputs:";
+		for (unsigned i = 0; i < 22; i++)
+			if (decoded.output_mask() & (1 << i))
+				result += output_names[i] + " ";
+		return result;
 	}
 };
 
@@ -1688,7 +1659,7 @@ struct registers_decoder<NV4097_SET_SHADER_CONTROL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 shader_ctrl() const
 		{
@@ -1696,11 +1667,12 @@ struct registers_decoder<NV4097_SET_SHADER_CONTROL>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Shader control: raw_value: 0x%x reg_count: %u%s%s",
-			decoded.shader_ctrl(), ((decoded.shader_ctrl() >> 24) & 0xFF), ((decoded.shader_ctrl() & CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT) ? " depth_replace" : ""),
-			((decoded.shader_ctrl() & CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS) ? " 32b_exports" : ""));
+		return "Shader control: raw_value =" + std::to_string(decoded.shader_ctrl()) +
+			" reg_count = " + std::to_string((decoded.shader_ctrl() >> 24) & 0xFF) +
+			((decoded.shader_ctrl() & CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT) ? " depth_replace " : "") +
+			((decoded.shader_ctrl() & CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS) ? " 32b_exports " : "");
 	}
 };
 
@@ -1713,7 +1685,7 @@ struct registers_decoder<NV4097_SET_SHADER_PACKER>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool srgb_output_enabled() const
 		{
@@ -1721,9 +1693,9 @@ struct registers_decoder<NV4097_SET_SHADER_PACKER>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Shader packer control: srgb_enabled: %s", print_boolean(decoded.srgb_output_enabled()));
+		return "Shader packer control: srgb_enabled = " + std::to_string(decoded.srgb_output_enabled());
 	}
 };
 
@@ -1736,7 +1708,7 @@ struct registers_decoder<NV4097_SET_VERTEX_DATA_BASE_OFFSET>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 vertex_data_base_offset() const
 		{
@@ -1744,9 +1716,9 @@ struct registers_decoder<NV4097_SET_VERTEX_DATA_BASE_OFFSET>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Vertex: base offset 0x%x", decoded.vertex_data_base_offset());
+		return fmt::format("Vertex: base offset 0x%x", decoded.vertex_data_base_offset());
 	}
 };
 
@@ -1759,7 +1731,7 @@ struct registers_decoder<NV4097_SET_INDEX_ARRAY_ADDRESS>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 index_array_offset() const
 		{
@@ -1767,9 +1739,9 @@ struct registers_decoder<NV4097_SET_INDEX_ARRAY_ADDRESS>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Index: array offset 0x%x", decoded.index_array_offset());
+		return fmt::format("Index: array offset 0x%x", decoded.index_array_offset());
 	}
 };
 
@@ -1782,7 +1754,7 @@ struct registers_decoder<NV4097_SET_VERTEX_DATA_BASE_INDEX>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 vertex_data_base_index() const
 		{
@@ -1790,9 +1762,9 @@ struct registers_decoder<NV4097_SET_VERTEX_DATA_BASE_INDEX>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Vertex: base index: %u", decoded.vertex_data_base_index());
+		return "Vertex: base index " + std::to_string(decoded.vertex_data_base_index());
 	}
 };
 
@@ -1805,7 +1777,7 @@ struct registers_decoder<NV4097_SET_SHADER_PROGRAM>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 shader_program_address() const
 		{
@@ -1813,10 +1785,10 @@ struct registers_decoder<NV4097_SET_SHADER_PROGRAM>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
 		const u32 address = decoded.shader_program_address();
-		fmt::append(out, "Shader: %s, offset: 0x%x", CellGcmLocation{(address & 3) - 1}, address & ~3);
+		return fmt::format("Shader: %s, offset: 0x%x", CellGcmLocation{(address & 3) - 1}, address & ~3);
 	}
 };
 
@@ -1829,7 +1801,7 @@ struct registers_decoder<NV4097_SET_TRANSFORM_PROGRAM_START>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 transform_program_start() const
 		{
@@ -1837,9 +1809,9 @@ struct registers_decoder<NV4097_SET_TRANSFORM_PROGRAM_START>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Transform program: start: %u", decoded.transform_program_start());
+		return "Transform program: start = " + std::to_string(decoded.transform_program_start());
 	}
 };
 
@@ -1852,7 +1824,7 @@ struct registers_decoder<NV406E_SET_CONTEXT_DMA_SEMAPHORE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation context_dma() const
 		{
@@ -1860,9 +1832,9 @@ struct registers_decoder<NV406E_SET_CONTEXT_DMA_SEMAPHORE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV406E semaphore: context: %s", decoded.context_dma());
+		return fmt::format("NV406E semaphore: context: %s", decoded.context_dma());
 	}
 };
 
@@ -1876,7 +1848,7 @@ struct registers_decoder<NV406E_SEMAPHORE_OFFSET>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 semaphore_offset() const
 		{
@@ -1884,9 +1856,9 @@ struct registers_decoder<NV406E_SEMAPHORE_OFFSET>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV406E semaphore: offset: 0x%x", decoded.semaphore_offset());
+		return fmt::format("NV406E semaphore: offset: 0x%x", decoded.semaphore_offset());
 	}
 };
 
@@ -1897,15 +1869,16 @@ struct registers_decoder<NV406E_SEMAPHORE_RELEASE>
 	{
 		const u32 value;
 
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV406E semaphore: release: 0x%x", decoded.value);
+		return fmt::format("NV409E semaphore: release: 0x%x", decoded.value);
 	}
 };
 
+
 template <>
 struct registers_decoder<NV406E_SEMAPHORE_ACQUIRE>
 {
@@ -1913,12 +1886,12 @@ struct registers_decoder<NV406E_SEMAPHORE_ACQUIRE>
 	{
 		const u32 value;
 
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV406E semaphore: acquire: 0x%x", decoded.value);
+		return fmt::format("NV409E semaphore: acquire: 0x%x", decoded.value);
 	}
 };
 
@@ -1931,7 +1904,7 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_SEMAPHORE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation context_dma() const
 		{
@@ -1939,9 +1912,9 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_SEMAPHORE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV4097 semaphore: context: %s", decoded.context_dma());
+		return fmt::format("NV4097 semaphore: context: %s", decoded.context_dma());
 	}
 };
 
@@ -1954,7 +1927,7 @@ struct registers_decoder<NV4097_SET_SEMAPHORE_OFFSET>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 semaphore_offset() const
 		{
@@ -1962,9 +1935,9 @@ struct registers_decoder<NV4097_SET_SEMAPHORE_OFFSET>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV4097 semaphore: offset: 0x%x", decoded.semaphore_offset());
+		return fmt::format("NV4097 semaphore: offset: 0x%x", decoded.semaphore_offset());
 	}
 };
 
@@ -1977,7 +1950,7 @@ struct registers_decoder<NV3089_IMAGE_IN_OFFSET>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 input_offset() const
 		{
@@ -1985,9 +1958,9 @@ struct registers_decoder<NV3089_IMAGE_IN_OFFSET>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV3089: input offset: 0x%x", decoded.input_offset());
+		return fmt::format("NV3089: input offset: 0x%x", decoded.input_offset());
 	}
 };
 
@@ -2000,7 +1973,7 @@ struct registers_decoder<NV3062_SET_OFFSET_DESTIN>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 output_offset() const
 		{
@@ -2008,9 +1981,9 @@ struct registers_decoder<NV3062_SET_OFFSET_DESTIN>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV3062: output offset: 0x%x", decoded.output_offset());
+		return fmt::format("NV3062: output offset: 0x%x", decoded.output_offset());
 	}
 };
 
@@ -2023,7 +1996,7 @@ struct registers_decoder<NV309E_SET_OFFSET>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 offset() const
 		{
@@ -2031,9 +2004,9 @@ struct registers_decoder<NV309E_SET_OFFSET>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV309E: offset: 0x%x", decoded.offset());
+		return fmt::format("NV309E: offset: 0x%x", decoded.offset());
 	}
 };
 
@@ -2046,7 +2019,7 @@ struct registers_decoder<NV3089_DS_DX>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		// Convert signed fixed point 32-bit format
 		f32 ds_dx() const
@@ -2063,9 +2036,9 @@ struct registers_decoder<NV3089_DS_DX>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV3089: DS DX: %g", decoded.ds_dx());
+		return "NV3089: dsdx = " + std::to_string(decoded.ds_dx());
 	}
 };
 
@@ -2078,7 +2051,7 @@ struct registers_decoder<NV3089_DT_DY>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		// Convert signed fixed point 32-bit format
 		f32 dt_dy() const
@@ -2095,9 +2068,9 @@ struct registers_decoder<NV3089_DT_DY>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV3089: DT DY: %g", decoded.dt_dy());
+		return "NV3089: dtdy = " + std::to_string(decoded.dt_dy());
 	}
 };
 
@@ -2110,7 +2083,7 @@ struct registers_decoder<NV0039_PITCH_IN>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 input_pitch() const
 		{
@@ -2118,9 +2091,9 @@ struct registers_decoder<NV0039_PITCH_IN>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV0039: input pitch: %u", decoded.input_pitch());
+		return "NV0039: input pitch = " + std::to_string(decoded.input_pitch());
 	}
 };
 
@@ -2133,7 +2106,7 @@ struct registers_decoder<NV0039_PITCH_OUT>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 output_pitch() const
 		{
@@ -2141,9 +2114,9 @@ struct registers_decoder<NV0039_PITCH_OUT>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV0039: output pitch: %u", decoded.output_pitch());
+		return "NV0039: output pitch = " + std::to_string(decoded.output_pitch());
 	}
 };
 
@@ -2156,7 +2129,7 @@ struct registers_decoder<NV0039_LINE_LENGTH_IN>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 input_line_length() const
 		{
@@ -2164,9 +2137,9 @@ struct registers_decoder<NV0039_LINE_LENGTH_IN>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV0039: line length input: %u", decoded.input_line_length());
+		return "NV0039: line length input = " + std::to_string(decoded.input_line_length());
 	}
 };
 
@@ -2179,7 +2152,7 @@ struct registers_decoder<NV0039_LINE_COUNT>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 line_count() const
 		{
@@ -2187,9 +2160,9 @@ struct registers_decoder<NV0039_LINE_COUNT>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV0039: line count: %u", decoded.line_count());
+		return "NV0039: line count = " + std::to_string(decoded.line_count());
 	}
 };
 
@@ -2202,7 +2175,7 @@ struct registers_decoder<NV0039_OFFSET_OUT>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 output_offset() const
 		{
@@ -2210,9 +2183,9 @@ struct registers_decoder<NV0039_OFFSET_OUT>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV0039: output offset: 0x%x", decoded.output_offset());
+		return fmt::format("NV0039: output offset: 0x%x", decoded.output_offset());
 	}
 };
 
@@ -2225,7 +2198,7 @@ struct registers_decoder<NV0039_OFFSET_IN>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 input_offset() const
 		{
@@ -2233,9 +2206,9 @@ struct registers_decoder<NV0039_OFFSET_IN>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV0039: input offset: 00x%x", decoded.input_offset());
+		return fmt::format("NV0039: input offset: 00x%x", decoded.input_offset());
 	}
 };
 
@@ -2248,17 +2221,17 @@ struct registers_decoder<NV4097_SET_DEPTH_FUNC>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto depth_func() const
+		rsx::comparison_function depth_func() const
 		{
 			return to_comparison_function(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Depth: compare_function: %s", decoded.depth_func());
+		return fmt::format("Depth: compare_function: %s", decoded.depth_func());
 	}
 };
 
@@ -2271,17 +2244,17 @@ struct registers_decoder<NV4097_SET_STENCIL_FUNC>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto stencil_func() const
+		rsx::comparison_function stencil_func() const
 		{
 			return to_comparison_function(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: (front) compare_function: %s", decoded.stencil_func());
+		return fmt::format("Stencil: (front) compare_function: %s", decoded.stencil_func());
 	}
 };
 
@@ -2294,17 +2267,17 @@ struct registers_decoder<NV4097_SET_BACK_STENCIL_FUNC>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto back_stencil_func() const
+		rsx::comparison_function back_stencil_func() const
 		{
 			return to_comparison_function(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: back compare_function: %s", decoded.back_stencil_func());
+		return fmt::format("Stencil: back compare_function: %s", decoded.back_stencil_func());
 	}
 };
 
@@ -2317,17 +2290,17 @@ struct registers_decoder<NV4097_SET_ALPHA_FUNC>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto alpha_func() const
+		rsx::comparison_function alpha_func() const
 		{
 			return to_comparison_function(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Alpha: compare_function: %s", decoded.alpha_func());
+		return fmt::format("Alpha: compare_function: %s", decoded.alpha_func());
 	}
 };
 
@@ -2340,17 +2313,17 @@ struct registers_decoder<NV4097_SET_STENCIL_OP_FAIL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto fail() const
+		rsx::stencil_op fail() const
 		{
 			return to_stencil_op(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: (front) fail op: %s", decoded.fail());
+		return fmt::format("Stencil: (front) fail op: %s", decoded.fail());
 	}
 };
 
@@ -2363,17 +2336,17 @@ struct registers_decoder<NV4097_SET_STENCIL_OP_ZFAIL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto zfail() const
+		rsx::stencil_op zfail() const
 		{
 			return to_stencil_op(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: (front) zfail op: %s", decoded.zfail());
+		return fmt::format("Stencil: (front) zfail op: %s", decoded.zfail());
 	}
 };
 
@@ -2386,17 +2359,17 @@ struct registers_decoder<NV4097_SET_STENCIL_OP_ZPASS>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto zpass() const
+		rsx::stencil_op zpass() const
 		{
 			return to_stencil_op(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: (front) zpass op: %s", decoded.zpass());
+		return fmt::format("Stencil: (front) zpass op: %s", decoded.zpass());
 	}
 };
 
@@ -2409,17 +2382,17 @@ struct registers_decoder<NV4097_SET_BACK_STENCIL_OP_FAIL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto back_fail() const
+		rsx::stencil_op back_fail() const
 		{
 			return to_stencil_op(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: (back) fail op: %s", decoded.back_fail());
+		return fmt::format("Stencil: (back) fail op: %s", decoded.back_fail());
 	}
 };
 
@@ -2432,17 +2405,17 @@ struct registers_decoder<NV4097_SET_BACK_STENCIL_OP_ZFAIL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto back_zfail() const
+		rsx::stencil_op back_zfail() const
 		{
 			return to_stencil_op(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: (back) zfail op: %s", decoded.back_zfail());
+		return fmt::format("Stencil: (back) zfail op: %s", decoded.back_zfail());
 	}
 };
 
@@ -2455,17 +2428,17 @@ struct registers_decoder<NV4097_SET_BACK_STENCIL_OP_ZPASS>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto back_zpass() const
+		rsx::stencil_op back_zpass() const
 		{
 			return to_stencil_op(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: (back) zpass op: %s", decoded.back_zpass());
+		return fmt::format("Stencil: (back) zpass op: %s", decoded.back_zpass());
 	}
 };
 
@@ -2478,7 +2451,7 @@ struct registers_decoder<NV4097_SET_STENCIL_FUNC_REF>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u8 stencil_func_ref() const
 		{
@@ -2486,9 +2459,9 @@ struct registers_decoder<NV4097_SET_STENCIL_FUNC_REF>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: (front) func ref: %u", decoded.stencil_func_ref());
+		return "Stencil: (front) func ref = " + std::to_string(decoded.stencil_func_ref());
 	}
 };
 
@@ -2501,7 +2474,7 @@ struct registers_decoder<NV4097_SET_BACK_STENCIL_FUNC_REF>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u8 back_stencil_func_ref() const
 		{
@@ -2509,9 +2482,9 @@ struct registers_decoder<NV4097_SET_BACK_STENCIL_FUNC_REF>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: (back) func ref: %u", decoded.back_stencil_func_ref());
+		return "Stencil: (back) func ref = " + std::to_string(decoded.back_stencil_func_ref());
 	}
 };
 
@@ -2524,7 +2497,7 @@ struct registers_decoder<NV4097_SET_STENCIL_FUNC_MASK>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u8 stencil_func_mask() const
 		{
@@ -2532,9 +2505,9 @@ struct registers_decoder<NV4097_SET_STENCIL_FUNC_MASK>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: (front) func mask: %u", decoded.stencil_func_mask());
+		return "Stencil: (front) func mask = " + std::to_string(decoded.stencil_func_mask());
 	}
 };
 
@@ -2547,7 +2520,7 @@ struct registers_decoder<NV4097_SET_BACK_STENCIL_FUNC_MASK>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u8 back_stencil_func_mask() const
 		{
@@ -2555,9 +2528,9 @@ struct registers_decoder<NV4097_SET_BACK_STENCIL_FUNC_MASK>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: (back) func mask: %u", decoded.back_stencil_func_mask());
+		return "Stencil: (back) func mask = " + std::to_string(decoded.back_stencil_func_mask());
 	}
 };
 
@@ -2570,7 +2543,7 @@ struct registers_decoder<NV4097_SET_ALPHA_REF>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 alpha_ref8() const
 		{
@@ -2588,9 +2561,10 @@ struct registers_decoder<NV4097_SET_ALPHA_REF>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Alpha: ref unorm8: %g, f16: %g", decoded.alpha_ref8(), decoded.alpha_ref16());
+		return "Alpha: ref unorm8 = " + std::to_string(decoded.alpha_ref8()) +
+			" f16 = " + std::to_string(decoded.alpha_ref16());
 	}
 };
 
@@ -2603,7 +2577,7 @@ struct registers_decoder<NV4097_SET_COLOR_CLEAR_VALUE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u8 blue() const { return bf_decoder<0, 8>(value); }
 		u8 green() const { return bf_decoder<8, 8>(value); }
@@ -2611,9 +2585,12 @@ struct registers_decoder<NV4097_SET_COLOR_CLEAR_VALUE>
 		u8 alpha() const { return bf_decoder<24, 8>(value); }
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Clear: R = %u G = %u B = %u A = %u", decoded.red(), decoded.green(), decoded.blue(), decoded.alpha());
+		return "Clear: R = " + std::to_string(decoded.red()) +
+			" G = " + std::to_string(decoded.green()) +
+			" B = " + std::to_string(decoded.blue()) +
+			" A = " + std::to_string(decoded.alpha());
 	}
 };
 
@@ -2626,7 +2603,7 @@ struct registers_decoder<NV4097_SET_STENCIL_MASK>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u8 stencil_mask() const
 		{
@@ -2634,9 +2611,9 @@ struct registers_decoder<NV4097_SET_STENCIL_MASK>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: (front) mask: %u", decoded.stencil_mask());
+		return "Stencil: (front) mask = " + std::to_string(decoded.stencil_mask());
 	}
 };
 
@@ -2649,7 +2626,7 @@ struct registers_decoder<NV4097_SET_BACK_STENCIL_MASK>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u8 back_stencil_mask() const
 		{
@@ -2657,9 +2634,9 @@ struct registers_decoder<NV4097_SET_BACK_STENCIL_MASK>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Stencil: (back) mask: %u", decoded.back_stencil_mask());
+		return "Stencil: (back) mask = " + std::to_string(decoded.back_stencil_mask());
 	}
 };
 
@@ -2672,17 +2649,17 @@ struct registers_decoder<NV4097_SET_LOGIC_OP>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto logic_operation() const
+		logic_op logic_operation() const
 		{
 			return to_logic_op(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Logic: op: %s", decoded.logic_operation());
+		return fmt::format("Logic: op: %s", decoded.logic_operation());
 	}
 };
 
@@ -2695,17 +2672,17 @@ struct registers_decoder<NV4097_SET_FRONT_FACE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto front_face_mode() const
+		front_face front_face_mode() const
 		{
 			return to_front_face(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Front Face: %s", decoded.front_face_mode());
+		return fmt::format("Front Face: %s", decoded.front_face_mode());
 	}
 };
 
@@ -2719,7 +2696,7 @@ struct registers_decoder<NV4097_SET_CULL_FACE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		cull_face cull_face_mode() const
 		{
@@ -2727,9 +2704,9 @@ struct registers_decoder<NV4097_SET_CULL_FACE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Cull Face: %s", decoded.cull_face_mode());
+		return fmt::format("Cull Face: %s", decoded.cull_face_mode());
 	}
 };
 
@@ -2742,17 +2719,17 @@ struct registers_decoder<NV4097_SET_SURFACE_COLOR_TARGET>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto target() const
+		surface_target target() const
 		{
 			return to_surface_target(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: Color target(s): %s", decoded.target());
+		return fmt::format("Surface: Color target(s): %s", decoded.target());
 	}
 };
 
@@ -2765,17 +2742,17 @@ struct registers_decoder<NV4097_SET_FOG_MODE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto fog_equation() const
+		fog_mode fog_equation() const
 		{
 			return to_fog_mode(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Fog: %s", decoded.fog_equation());
+		return fmt::format("Fog: %s", decoded.fog_equation());
 	}
 };
 
@@ -2788,17 +2765,17 @@ struct registers_decoder<NV4097_SET_BEGIN_END>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto primitive() const
+		primitive_type primitive() const
 		{
 			return to_primitive_type(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Primitive: %s", decoded.primitive());
+		return fmt::format("Primitive: %s", decoded.primitive());
 	}
 };
 
@@ -2811,17 +2788,17 @@ struct registers_decoder<NV3089_SET_OPERATION>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto transfer_op() const
+		blit_engine::transfer_operation transfer_op() const
 		{
 			return blit_engine::to_transfer_operation(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV3089: op: %s", decoded.transfer_op());
+		return fmt::format("NV3089: op: %s", decoded.transfer_op());
 	}
 };
 
@@ -2834,17 +2811,17 @@ struct registers_decoder<NV3089_SET_COLOR_FORMAT>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto transfer_source_fmt() const
+		blit_engine::transfer_source_format transfer_source_fmt() const
 		{
 			return blit_engine::to_transfer_source_format(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV3089: source fmt: %s", decoded.transfer_source_fmt());
+		return fmt::format("NV3089: source fmt: %s", decoded.transfer_source_fmt());
 	}
 };
 
@@ -2857,17 +2834,17 @@ struct registers_decoder<NV3089_SET_CONTEXT_SURFACE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto ctx_surface() const
+		blit_engine::context_surface ctx_surface() const
 		{
 			return blit_engine::to_context_surface(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV3089: context surface: %s", decoded.ctx_surface());
+		return fmt::format("NV3089: context surface: %s", decoded.ctx_surface());
 	}
 };
 
@@ -2880,17 +2857,17 @@ struct registers_decoder<NV3062_SET_COLOR_FORMAT>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto transfer_dest_fmt() const
+		blit_engine::transfer_destination_format transfer_dest_fmt() const
 		{
 			return blit_engine::to_transfer_destination_format(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV3062: output fmt: %s", decoded.transfer_dest_fmt());
+		return fmt::format("NV3062: output fmt: %s", decoded.transfer_dest_fmt());
 	}
 };
 
@@ -2912,22 +2889,22 @@ struct registers_decoder<NV4097_SET_BLEND_EQUATION>
 			return bf_decoder<16, 16>(value);
 		}
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto blend_rgb() const
+		blend_equation blend_rgb() const
 		{
 			return to_blend_equation(blend_rgb_raw());
 		}
 
-		auto blend_a() const
+		blend_equation blend_a() const
 		{
 			return to_blend_equation(blend_a_raw());
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Blend: equation rgb: %s a: %s", decoded.blend_rgb(), decoded.blend_a());
+		return fmt::format("Blend: equation rgb: %s a: %s", decoded.blend_rgb(), decoded.blend_a());
 	}
 };
 
@@ -2949,22 +2926,22 @@ struct registers_decoder<NV4097_SET_BLEND_FUNC_SFACTOR>
 			return bf_decoder<16, 16>(value);
 		}
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto src_blend_rgb() const
+		blend_factor src_blend_rgb() const
 		{
 			return to_blend_factor(src_blend_rgb_raw());
 		}
 
-		auto src_blend_a() const
+		blend_factor src_blend_a() const
 		{
 			return to_blend_factor(src_blend_a_raw());
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Blend: sfactor rgb: %s a: %s", decoded.src_blend_rgb(), decoded.src_blend_a());
+		return fmt::format("Blend: sfactor rgb: %s a: %s", decoded.src_blend_rgb(), decoded.src_blend_a());
 	}
 };
 
@@ -2986,22 +2963,22 @@ struct registers_decoder<NV4097_SET_BLEND_FUNC_DFACTOR>
 			return bf_decoder<16, 16>(value);
 		}
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto dst_blend_rgb() const
+		blend_factor dst_blend_rgb() const
 		{
 			return to_blend_factor(dst_blend_rgb_raw());
 		}
 
-		auto dst_blend_a() const
+		blend_factor dst_blend_a() const
 		{
 			return to_blend_factor(dst_blend_a_raw());
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Blend: dfactor rgb: %s a: %s", decoded.dst_blend_rgb(), decoded.dst_blend_a());
+		return fmt::format("Blend: dfactor rgb: %s a: %s", decoded.dst_blend_rgb(), decoded.dst_blend_a());
 	}
 };
 
@@ -3014,7 +2991,7 @@ struct registers_decoder<NV4097_SET_COLOR_MASK>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool color_b() const
 		{
@@ -3040,23 +3017,14 @@ struct registers_decoder<NV4097_SET_COLOR_MASK>
 		{
 			return value != 0;
 		}
-
-		u32 is_invalid() const
-		{
-			return (value & 0xfefefefe) ? value : 0;
-		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		if (u32 invalid_value = decoded.is_invalid())
-		{
-			fmt::append(out, "Surface: color mask: invalid = 0x%08x", invalid_value);
-			return;
-		}
-
-		fmt::append(out, "Surface: color mask A = %s R = %s G = %s B = %s"
-			, print_boolean(decoded.color_a()), print_boolean(decoded.color_r()), print_boolean(decoded.color_g()), print_boolean(decoded.color_b()));
+		return "Surface: color mask A = " + print_boolean(decoded.color_a()) +
+			" R = " + print_boolean(decoded.color_r()) +
+			" G = " + print_boolean(decoded.color_g()) +
+			" B = " + print_boolean(decoded.color_b());
 	}
 };
 
@@ -3069,7 +3037,7 @@ struct registers_decoder<NV4097_SET_COLOR_MASK_MRT>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool color_b(int index) const
 		{
@@ -3097,19 +3065,20 @@ struct registers_decoder<NV4097_SET_COLOR_MASK_MRT>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		out += "Color Mask MRT:\n";
-
+		std::string result;
 		for (int index = 1; index < 4; ++index)
 		{
-			fmt::append(out, "Surface[%d]: A:%d R:%d G:%d B:%d\n",
+			result += fmt::format("Surface[%d]: A:%d R:%d G:%d B:%d\n",
 				index,
 				decoded.color_a(index),
 				decoded.color_r(index),
 				decoded.color_g(index),
 				decoded.color_b(index));
 		}
+
+		return "Color Mask MRT:\n" + result;
 	}
 };
 
@@ -3125,14 +3094,14 @@ struct registers_decoder<NV4097_SET_SHADER_WINDOW>
 		u8 window_shader_pixel_center_raw() const { return bf_decoder<16, 4>(value); }
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto window_shader_origin() const
+		window_origin window_shader_origin() const
 		{
 			return to_window_origin(window_shader_origin_raw());
 		}
 
-		auto window_shader_pixel_center() const
+		window_pixel_center window_shader_pixel_center() const
 		{
 			return to_window_pixel_center(window_shader_pixel_center_raw());
 		}
@@ -3143,9 +3112,9 @@ struct registers_decoder<NV4097_SET_SHADER_WINDOW>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Viewport: height: %u origin: %s pixel center: %s", decoded.window_shader_height()
+		return fmt::format("Viewport: height: %u origin: %s pixel center: %s", decoded.window_shader_height()
 			, decoded.window_shader_origin(), decoded.window_shader_pixel_center());
 	}
 };
@@ -3159,7 +3128,7 @@ struct registers_decoder<NV4097_SET_BLEND_ENABLE_MRT>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool blend_surface_b() const
 		{
@@ -3177,9 +3146,11 @@ struct registers_decoder<NV4097_SET_BLEND_ENABLE_MRT>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Blend: mrt1 = %s, mrt2 = %s, mrt3 = %s", print_boolean(decoded.blend_surface_b()), print_boolean(decoded.blend_surface_c()), print_boolean(decoded.blend_surface_d()));
+		return "Blend: mrt1 = " + print_boolean(decoded.blend_surface_b()) +
+			" mrt2 = " + print_boolean(decoded.blend_surface_c()) +
+			" mrt3 = " + print_boolean(decoded.blend_surface_d());
 	}
 };
 
@@ -3200,42 +3171,42 @@ struct registers_decoder<NV4097_SET_USER_CLIP_PLANE_CONTROL>
 		u8 clip_plane5_raw() const { return bf_decoder<20, 4>(value); }
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto clip_plane0() const
+		user_clip_plane_op clip_plane0() const
 		{
 			return to_user_clip_plane_op(clip_plane0_raw());
 		}
 
-		auto clip_plane1() const
+		user_clip_plane_op clip_plane1() const
 		{
 			return to_user_clip_plane_op(clip_plane1_raw());
 		}
 
-		auto clip_plane2() const
+		user_clip_plane_op clip_plane2() const
 		{
 			return to_user_clip_plane_op(clip_plane2_raw());
 		}
 
-		auto clip_plane3() const
+		user_clip_plane_op clip_plane3() const
 		{
 			return to_user_clip_plane_op(clip_plane3_raw());
 		}
 
-		auto clip_plane4() const
+		user_clip_plane_op clip_plane4() const
 		{
 			return to_user_clip_plane_op(clip_plane4_raw());
 		}
 
-		auto clip_plane5() const
+		user_clip_plane_op clip_plane5() const
 		{
 			return to_user_clip_plane_op(clip_plane5_raw());
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "User clip: UC0: %s UC1: %s UC2: %s UC3: %s UC4: %s"
+		return fmt::format("User clip: UC0: %s UC1: %s UC2: %s UC3: %s UC4: %s"
 			, decoded.clip_plane0()
 			, decoded.clip_plane1()
 			, decoded.clip_plane2()
@@ -3254,7 +3225,7 @@ struct registers_decoder<NV4097_SET_LINE_WIDTH>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 line_width() const
 		{
@@ -3262,9 +3233,9 @@ struct registers_decoder<NV4097_SET_LINE_WIDTH>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Line width: %g", decoded.line_width());
+		return "Line width: " + std::to_string(decoded.line_width());
 	}
 };
 
@@ -3277,7 +3248,7 @@ struct registers_decoder<NV4097_SET_POINT_SIZE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 point_size() const
 		{
@@ -3285,9 +3256,9 @@ struct registers_decoder<NV4097_SET_POINT_SIZE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Point size: %g", decoded.point_size());
+		return "Point size: " + std::to_string(decoded.point_size());
 	}
 };
 
@@ -3300,7 +3271,7 @@ struct registers_decoder<NV4097_SET_POINT_SPRITE_CONTROL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool enabled() const
 		{
@@ -3313,9 +3284,10 @@ struct registers_decoder<NV4097_SET_POINT_SPRITE_CONTROL>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Point sprite: enabled = %s, override mask = 0x%x", print_boolean(decoded.enabled()), decoded.texcoord_mask());
+		return "Point sprite: enabled = " + print_boolean(decoded.enabled()) +
+			"override mask = " + fmt::format("0x%x", decoded.texcoord_mask());
 	}
 };
 
@@ -3333,24 +3305,24 @@ struct registers_decoder<NV4097_SET_SURFACE_FORMAT>
 		u8 antialias_raw() const { return bf_decoder<12, 4>(value); }
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto color_fmt() const
+		surface_color_format color_fmt() const
 		{
 			return to_surface_color_format(color_fmt_raw());
 		}
 
-		auto depth_fmt() const
+		surface_depth_format depth_fmt() const
 		{
 			return to_surface_depth_format(depth_fmt_raw());
 		}
 
-		auto type() const
+		surface_raster_type type() const
 		{
-			return to_surface_raster_type(type_raw());
+			return static_cast<surface_raster_type>(type_raw());
 		}
 
-		auto antialias() const
+		surface_antialiasing antialias() const
 		{
 			return to_surface_antialiasing(antialias_raw());
 		}
@@ -3364,16 +3336,11 @@ struct registers_decoder<NV4097_SET_SURFACE_FORMAT>
 		{
 			return bf_decoder<24, 8>(value);
 		}
-
-		bool is_integer_color_format() const
-		{
-			return color_fmt() < surface_color_format::w16z16y16x16;
-		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: Color format: %s DepthStencil format: %s Anti aliasing: %s w: %u h: %u", decoded.color_fmt()
+		return fmt::format("Surface: Color format: %s DepthStencil format: %s Anti aliasing: %s w: %u h: %u", decoded.color_fmt()
 			, decoded.depth_fmt(), decoded.antialias(), decoded.log2width(), decoded.log2height());
 	}
 };
@@ -3390,7 +3357,7 @@ struct registers_decoder<NV4097_SET_ZSTENCIL_CLEAR_VALUE>
 		u32 clear_z24() const { return bf_decoder<8, 24>(value); }
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u8 clear_stencil() const
 		{
@@ -3406,9 +3373,11 @@ struct registers_decoder<NV4097_SET_ZSTENCIL_CLEAR_VALUE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Clear: Z24 = %u, z16 = %u, Stencil = %u", decoded.clear_z(true), decoded.clear_z(false), decoded.clear_stencil());
+		return "Clear: Z24 = " + std::to_string(decoded.clear_z(true)) +
+			" z16 = " + std::to_string(decoded.clear_z(false)) +
+			" Stencil = " + std::to_string(decoded.clear_stencil());
 	}
 };
 
@@ -3423,7 +3392,7 @@ struct registers_decoder<NV4097_SET_INDEX_ARRAY_DMA>
 		u8 type_raw() const { return bf_decoder<4, 8>(value); }
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation index_dma() const
 		{
@@ -3437,9 +3406,9 @@ struct registers_decoder<NV4097_SET_INDEX_ARRAY_DMA>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Index: type: %s dma: %s", decoded.type(), decoded.index_dma());
+		return fmt::format("Index: type: %s dma: %s", decoded.type(), decoded.index_dma());
 	}
 };
 
@@ -3452,7 +3421,7 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_COLOR_A>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation dma_surface_a() const
 		{
@@ -3460,9 +3429,9 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_COLOR_A>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: A DMA: %s", decoded.dma_surface_a());
+		return fmt::format("Surface: A DMA: %s", decoded.dma_surface_a());
 	}
 };
 
@@ -3475,7 +3444,7 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_COLOR_B>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation dma_surface_b() const
 		{
@@ -3483,9 +3452,9 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_COLOR_B>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: B DMA: %s", decoded.dma_surface_b());
+		return fmt::format("Surface: B DMA: %s", decoded.dma_surface_b());
 	}
 };
 
@@ -3498,7 +3467,7 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_COLOR_C>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation dma_surface_c() const
 		{
@@ -3506,9 +3475,9 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_COLOR_C>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: C DMA: %s", decoded.dma_surface_c());
+		return fmt::format("Surface: C DMA: %s", decoded.dma_surface_c());
 	}
 };
 
@@ -3521,7 +3490,7 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_COLOR_D>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation dma_surface_d() const
 		{
@@ -3529,9 +3498,9 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_COLOR_D>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: D DMA: %s", decoded.dma_surface_d());
+		return fmt::format("Surface: D DMA: %s", decoded.dma_surface_d());
 	}
 };
 
@@ -3544,7 +3513,7 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_ZETA>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation dma_surface_z() const
 		{
@@ -3552,9 +3521,9 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_ZETA>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Surface: Z DMA: %s", decoded.dma_surface_z());
+		return fmt::format("Surface: Z DMA: %s", decoded.dma_surface_z());
 	}
 };
 
@@ -3567,7 +3536,7 @@ struct registers_decoder<NV3089_SET_CONTEXT_DMA_IMAGE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation context_dma() const
 		{
@@ -3575,9 +3544,9 @@ struct registers_decoder<NV3089_SET_CONTEXT_DMA_IMAGE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV3089: input DMA: %s", decoded.context_dma());
+		return fmt::format("NV3089: input DMA: %s", decoded.context_dma());
 	}
 };
 
@@ -3590,7 +3559,7 @@ struct registers_decoder<NV3062_SET_CONTEXT_DMA_IMAGE_DESTIN>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation output_dma() const
 		{
@@ -3598,9 +3567,9 @@ struct registers_decoder<NV3062_SET_CONTEXT_DMA_IMAGE_DESTIN>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV3062: output DMA: %s", decoded.output_dma());
+		return fmt::format("NV3062: output DMA: %s", decoded.output_dma());
 	}
 };
 
@@ -3613,7 +3582,7 @@ struct registers_decoder<NV309E_SET_CONTEXT_DMA_IMAGE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation context_dma() const
 		{
@@ -3621,9 +3590,9 @@ struct registers_decoder<NV309E_SET_CONTEXT_DMA_IMAGE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV309E: output DMA: %s", decoded.context_dma());
+		return fmt::format("NV309E: output DMA: %s", decoded.context_dma());
 	}
 };
 
@@ -3636,7 +3605,7 @@ struct registers_decoder<NV0039_SET_CONTEXT_DMA_BUFFER_OUT>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation output_dma() const
 		{
@@ -3644,9 +3613,9 @@ struct registers_decoder<NV0039_SET_CONTEXT_DMA_BUFFER_OUT>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV0039: output DMA: %s", decoded.output_dma());
+		return fmt::format("NV0039: output DMA: %s", decoded.output_dma());
 	}
 };
 
@@ -3659,7 +3628,7 @@ struct registers_decoder<NV0039_SET_CONTEXT_DMA_BUFFER_IN>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation input_dma() const
 		{
@@ -3667,9 +3636,9 @@ struct registers_decoder<NV0039_SET_CONTEXT_DMA_BUFFER_IN>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV0039: input DMA: %s", decoded.input_dma());
+		return fmt::format("NV0039: input DMA: %s", decoded.input_dma());
 	}
 };
 
@@ -3682,17 +3651,17 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_REPORT>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto context_dma_report() const
+		blit_engine::context_dma context_dma_report() const
 		{
 			return blit_engine::to_context_dma(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "REPORT: context DMA: %s", decoded.context_dma_report());
+		return fmt::format("REPORT: context DMA: %s", decoded.context_dma_report());
 	}
 };
 
@@ -3705,7 +3674,7 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_NOTIFIES>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation context_dma_notify() const
 		{
@@ -3713,9 +3682,9 @@ struct registers_decoder<NV4097_SET_CONTEXT_DMA_NOTIFIES>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NOTIFY: context DMA: %s, index: %u", decoded.context_dma_notify(), (decoded.context_dma_notify() & 7) ^ 7);
+		return fmt::format("NOTIFY: context DMA: %s, index: %d", decoded.context_dma_notify(), (decoded.context_dma_notify() & 7) ^ 7);
 	}
 };
 
@@ -3731,27 +3700,27 @@ struct registers_decoder<NV3089_IMAGE_IN_FORMAT>
 		u8 transfer_interpolator_raw() const { return bf_decoder<24, 8>(value); }
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 format() const
 		{
 			return bf_decoder<0, 16>(value);
 		}
 
-		auto transfer_origin() const
+		blit_engine::transfer_origin transfer_origin() const
 		{
 			return blit_engine::to_transfer_origin(transfer_origin_raw());
 		}
 
-		auto transfer_interpolator() const
+		blit_engine::transfer_interpolator transfer_interpolator() const
 		{
 			return blit_engine::to_transfer_interpolator(transfer_interpolator_raw());
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV3089: input fmt: %u origin: %s interp: %s", decoded.format()
+		return fmt::format("NV3089: input fmt: %u origin: %s interp: %s", decoded.format()
 			, decoded.transfer_origin(), decoded.transfer_interpolator());
 	}
 };
@@ -3766,11 +3735,12 @@ struct registers_decoder<NV309E_SET_FORMAT>
 
 		u32 transfer_destination_fmt() const { return bf_decoder<0, 16, u32>(value); }
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto format() const
+		blit_engine::transfer_destination_format format() const
 		{
-			return blit_engine::to_transfer_destination_format(transfer_destination_fmt());
+			// Why truncate??
+			return blit_engine::to_transfer_destination_format(static_cast<u8>(transfer_destination_fmt()));
 		}
 
 		u8 sw_height_log2() const
@@ -3784,9 +3754,9 @@ struct registers_decoder<NV309E_SET_FORMAT>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV309E: output fmt: %s log2-width: %u log2-height: %u", decoded.format(),
+		return fmt::format("NV309E: output fmt: %s log2-width: %u log2-height: %u", decoded.format(),
 			decoded.sw_width_log2(), decoded.sw_height_log2());
 	}
 };
@@ -3800,7 +3770,7 @@ struct registers_decoder<NV0039_FORMAT>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u8 input_format() const
 		{
@@ -3817,9 +3787,10 @@ struct registers_decoder<NV0039_FORMAT>
 		return std::make_tuple(static_cast<u8>(value & 0xff), static_cast<u8>(value >> 8));
 	}
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV0039: input format = %u, output format = %u", decoded.input_format(), decoded.output_format());
+		return "NV0039: input format = " + std::to_string(decoded.input_format()) +
+			" output format = " + std::to_string(decoded.output_format());
 	}
 };
 
@@ -3832,7 +3803,7 @@ struct registers_decoder<NV4097_SET_BLEND_COLOR2>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 blue() const
 		{
@@ -3845,9 +3816,10 @@ struct registers_decoder<NV4097_SET_BLEND_COLOR2>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Blend color: 16b BA = %u, %u", decoded.blue(), decoded.alpha());
+		return "Blend color: 16b BA = " + std::to_string(decoded.blue()) +
+			", " + std::to_string(decoded.alpha());
 	}
 };
 
@@ -3860,7 +3832,7 @@ struct registers_decoder<NV4097_SET_BLEND_COLOR>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 red16() const
 		{
@@ -3893,10 +3865,11 @@ struct registers_decoder<NV4097_SET_BLEND_COLOR>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Blend color: 8b BGRA = %u, %u, %u, %u 16b RG = %u , %u"
-			, decoded.blue8(), decoded.green8(), decoded.red8(), decoded.alpha8(), decoded.red16(), decoded.green16());
+		return "Blend color: 8b BGRA = " +
+			std::to_string(decoded.blue8()) + ", " + std::to_string(decoded.green8()) + ", " + std::to_string(decoded.red8()) + ", " + std::to_string(decoded.alpha8()) +
+			" 16b RG = " + std::to_string(decoded.red16()) + ", " + std::to_string(decoded.green16());
 	}
 };
 
@@ -3919,7 +3892,7 @@ struct registers_decoder<NV3089_IMAGE_IN>
 		}
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		// x and y given as 16 bit fixed point
 
@@ -3934,9 +3907,10 @@ struct registers_decoder<NV3089_IMAGE_IN>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "NV3089: in x = %u y = %u", decoded.x(), decoded.y());
+		return "NV3089: in x = " + std::to_string(decoded.x()) +
+			" y = " + std::to_string(decoded.y());
 	}
 };
 
@@ -3948,9 +3922,9 @@ struct registers_decoder<NV4097_NO_OPERATION>
 		decoded_type(u32) {}
 	};
 
-	static void dump(std::string& out, u32)
+	static std::string dump(u32)
 	{
-		out += "(nop)";
+		return "(nop)";
 	}
 };
 
@@ -3962,9 +3936,9 @@ struct registers_decoder<NV4097_INVALIDATE_VERTEX_CACHE_FILE>
 		decoded_type(u32) {}
 	};
 
-	static void dump(std::string& out, u32)
+	static std::string dump(u32)
 	{
-		out += "(invalidate vertex cache file)";
+		return "(invalidate vertex cache file)";
 	}
 };
 
@@ -3976,9 +3950,9 @@ struct registers_decoder<NV4097_INVALIDATE_VERTEX_FILE>
 		decoded_type(u32) {}
 	};
 
-	static void dump(std::string& out, u32)
+	static std::string dump(u32)
 	{
-		out += "(invalidate vertex file)";
+		return "(invalidate vertex file)";
 	}
 };
 
@@ -3991,7 +3965,7 @@ struct registers_decoder<NV4097_SET_ANTI_ALIASING_CONTROL>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool msaa_enabled() const
 		{
@@ -4014,9 +3988,12 @@ struct registers_decoder<NV4097_SET_ANTI_ALIASING_CONTROL>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Anti_aliasing: %s alpha_to_coverage: %s alpha_to_one: %s sample_mask: %u", print_boolean(decoded.msaa_enabled()), print_boolean(decoded.msaa_alpha_to_coverage()), print_boolean(decoded.msaa_alpha_to_one()), decoded.msaa_sample_mask());
+		return "Anti_aliasing: " + print_boolean(decoded.msaa_enabled()) +
+			" alpha_to_coverage = " + print_boolean(decoded.msaa_alpha_to_coverage()) +
+			" alpha_to_one = " + print_boolean(decoded.msaa_alpha_to_one()) +
+			" sample_mask = " + std::to_string(decoded.msaa_sample_mask());
 	}
 };
 
@@ -4029,17 +4006,17 @@ struct registers_decoder<NV4097_SET_SHADE_MODE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto shading() const
+		shading_mode shading() const
 		{
 			return to_shading_mode(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Shading mode: %s", decoded.shading());
+		return fmt::format("Shading mode: %s", decoded.shading());
 	}
 };
 
@@ -4052,17 +4029,17 @@ struct registers_decoder<NV4097_SET_FRONT_POLYGON_MODE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto front_polygon_mode() const
+		polygon_mode front_polygon_mode() const
 		{
 			return to_polygon_mode(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Front polygon mode: %s", decoded.front_polygon_mode());
+		return fmt::format("Front polygon mode: %s", decoded.front_polygon_mode());
 	}
 };
 
@@ -4075,17 +4052,17 @@ struct registers_decoder<NV4097_SET_BACK_POLYGON_MODE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
-		auto back_polygon_mode() const
+		polygon_mode back_polygon_mode() const
 		{
 			return to_polygon_mode(value);
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "back polygon mode: %s", decoded.back_polygon_mode());
+		return fmt::format("back polygon mode: %s", decoded.back_polygon_mode());
 	}
 };
 
@@ -4098,7 +4075,7 @@ struct registers_decoder<NV4097_SET_TRANSFORM_CONSTANT_LOAD>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 transform_constant_load() const
 		{
@@ -4106,9 +4083,9 @@ struct registers_decoder<NV4097_SET_TRANSFORM_CONSTANT_LOAD>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Transform constant load: %u", decoded.transform_constant_load());
+		return fmt::format("Transform constant load: %u", decoded.transform_constant_load());
 	}
 };
 
@@ -4121,7 +4098,7 @@ struct registers_decoder<NV4097_SET_POLYGON_STIPPLE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool enabled() const
 		{
@@ -4129,9 +4106,9 @@ struct registers_decoder<NV4097_SET_POLYGON_STIPPLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "polygon_stipple: %s", print_boolean(decoded.enabled()));
+		return fmt::format("polygon_stipple: %s", print_boolean(decoded.enabled()));
 	}
 };
 
@@ -4144,7 +4121,7 @@ struct registers_decoder<NV4097_SET_ZCULL_EN>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool enabled() const
 		{
@@ -4152,9 +4129,9 @@ struct registers_decoder<NV4097_SET_ZCULL_EN>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "ZCULL: %s", print_boolean(decoded.enabled()));
+		return fmt::format("ZCULL: %s", print_boolean(decoded.enabled()));
 	}
 };
 
@@ -4167,7 +4144,7 @@ struct registers_decoder<NV4097_SET_ZCULL_STATS_ENABLE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool enabled() const
 		{
@@ -4175,9 +4152,9 @@ struct registers_decoder<NV4097_SET_ZCULL_STATS_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "ZCULL: stats %s", print_boolean(decoded.enabled()));
+		return fmt::format("ZCULL: stats %s", print_boolean(decoded.enabled()));
 	}
 };
 
@@ -4190,7 +4167,7 @@ struct registers_decoder<NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool enabled() const
 		{
@@ -4198,9 +4175,9 @@ struct registers_decoder<NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "ZCULL: pixel count %s", print_boolean(decoded.enabled()));
+		return fmt::format("ZCULL: pixel count %s", print_boolean(decoded.enabled()));
 	}
 };
 
@@ -4252,7 +4229,7 @@ struct transform_constant_helper
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		f32 constant_value() const
 		{
@@ -4263,7 +4240,7 @@ struct transform_constant_helper
 	static constexpr u32 reg = index / 4;
 	static constexpr u8 subreg = index % 4;
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
 		auto get_subreg_name = [](u8 subreg) -> std::string_view
 		{
@@ -4273,7 +4250,7 @@ struct transform_constant_helper
 				"w"sv;
 		};
 
-		fmt::append(out, "TransformConstant[%u].%s: %g (0x%08x)", reg, get_subreg_name(subreg), decoded.constant_value(), std::bit_cast<u32>(decoded.constant_value()));
+		return fmt::format("TransformConstant[%u].%s: %g (0x%08x)", reg, get_subreg_name(subreg), decoded.constant_value(), std::bit_cast<u32>(decoded.constant_value()));
 	}
 };
 
@@ -4289,12 +4266,12 @@ struct transform_program_helper
 	{
 		const u32 value;
 
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Transform Program (%u): 0x%08x", index, decoded.value);
+		return fmt::format("Transform Program (%u): 0x%08x", index, decoded.value);
 	}
 };
 
@@ -4307,7 +4284,7 @@ struct registers_decoder<NV4097_SET_TRANSFORM_PROGRAM_LOAD>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 transform_program_load() const
 		{
@@ -4315,9 +4292,9 @@ struct registers_decoder<NV4097_SET_TRANSFORM_PROGRAM_LOAD>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Transform Program Load: %u", decoded.transform_program_load());
+		return fmt::format("Transform Program Load: %u", decoded.transform_program_load());
 	}
 };
 
@@ -4335,7 +4312,7 @@ struct registers_decoder<NV4097_DRAW_ARRAYS>
 		}
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 start() const
 		{
@@ -4348,9 +4325,10 @@ struct registers_decoder<NV4097_DRAW_ARRAYS>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Draw vertexes range [%u, %u]", decoded.start(), decoded.start() + decoded.count());
+		return "Draw vertexes range [" + std::to_string(decoded.start()) + ", " +
+			      std::to_string(decoded.start() + decoded.count()) + "]";
 	}
 };
 
@@ -4363,7 +4341,7 @@ struct registers_decoder<NV4097_DRAW_INDEX_ARRAY>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 start() const
 		{
@@ -4376,9 +4354,10 @@ struct registers_decoder<NV4097_DRAW_INDEX_ARRAY>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Draw vertexes range {IdxArray[%u], IdxArray[%u]}", decoded.start(), decoded.start() + decoded.count());
+		return "Draw vertexes range [IdxArray[" + std::to_string(decoded.start()) +
+			      "], IdxArray[" + std::to_string(decoded.start() + decoded.count()) + "}]";
 	}
 };
 
@@ -4391,7 +4370,7 @@ struct registers_decoder<NV4097_SET_CONTROL0>
 		u32 value;
 
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool depth_float() const
 		{
@@ -4399,9 +4378,9 @@ struct registers_decoder<NV4097_SET_CONTROL0>
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Depth float: %s", print_boolean(decoded.depth_float()));
+		return fmt::format("Depth float: %s", print_boolean(decoded.depth_float()));
 	}
 };
 
@@ -4422,7 +4401,7 @@ struct vertex_array_helper
 			return bf_decoder<0, 3>(value);
 		}
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 frequency() const
 		{
@@ -4445,9 +4424,12 @@ struct vertex_array_helper
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		auto print_vertex_attribute_format = [](rsx::vertex_base_type type) -> std::string_view
+		if (decoded.size() == 0)
+			return fmt::format("Vertex Data Array %u (disabled)", index);
+
+		auto print_vertex_attribute_format = [](rsx::vertex_base_type type) -> std::string
 		{
 			switch (type)
 			{
@@ -4462,7 +4444,10 @@ struct vertex_array_helper
 			fmt::throw_exception("Unexpected enum found");
 		};
 
-		fmt::append(out, "Vertex Data Array %u%s: Type: %s, size: %u, stride: %u, frequency: %u", index, decoded.size() ? "" : " (disabled)", print_vertex_attribute_format(decoded.type()), decoded.size(), decoded.stride(), decoded.frequency());
+		return "Vertex array " + std::to_string(index) + ": Type = " + print_vertex_attribute_format(decoded.type()) +
+			" size = " + std::to_string(decoded.size()) +
+			" stride = " + std::to_string(decoded.stride()) +
+			" frequency = " + std::to_string(decoded.frequency());
 	}
 };
 
@@ -4479,7 +4464,7 @@ struct vertex_array_offset_helper
 	private:
 		u32 value;
 	public:
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 offset() const
 		{
@@ -4487,9 +4472,9 @@ struct vertex_array_offset_helper
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Vertex Array %u: Offset: 0x%x", index, decoded.offset());
+		return fmt::format("Vertex array %u: Offset: 0x%x", index, decoded.offset());
 	}
 };
 
@@ -4506,12 +4491,12 @@ struct register_vertex_printer<f32, count>
 {
 	static std::string type()
 	{
-		return fmt::format("float%u", count);
+		return "float" + std::to_string(count);
 	}
 
 	static std::string value(u32 v)
 	{
-		return fmt::format("%g", std::bit_cast<f32>(v));
+		return std::to_string(std::bit_cast<f32>(v));
 	}
 };
 
@@ -4520,26 +4505,26 @@ struct register_vertex_printer<u16, count>
 {
 	static std::string type()
 	{
-		return fmt::format("short%u", count);
+		return "short" + std::to_string(count);
 	}
 
 	static std::string value(u32 v)
 	{
-		return fmt::format("%u %u", (v & 0xffff), (v >> 16));
+		return std::to_string(v & 0xffff) + std::to_string(v >> 16);
 	}
 };
 
 template<>
 struct register_vertex_printer<u8, 4>
 {
-	static std::string_view type()
+	static std::string type()
 	{
 		return "uchar4";
 	}
 
 	static std::string value(u32 v)
 	{
-		return fmt::format("%u %u %u %u", (v & 0xff), ((v >> 8) & 0xff), ((v >> 16) & 0xff), ((v >> 24) & 0xff));
+		return std::to_string(v & 0xff) + std::to_string((v >> 8) & 0xff) + std::to_string((v >> 16) & 0xff) + std::to_string((v >> 24) & 0xff);
 	}
 };
 
@@ -4550,16 +4535,17 @@ struct register_vertex_helper
 	{
 		const u32 value;
 
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 	};
 
 	static constexpr usz increment_per_array_index = (count * sizeof(type)) / sizeof(u32);
 	static constexpr usz attribute_index = index / increment_per_array_index;
 	static constexpr usz vertex_subreg = index % increment_per_array_index;
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "register vertex: %u as %u: %s", attribute_index, register_vertex_printer<type, count>::type(), register_vertex_printer<type, count>::value(decoded.value));
+		return "register vertex " + std::to_string(attribute_index) + " as " + register_vertex_printer<type, count>::type() + ": " +
+			register_vertex_printer<type, count>::value(decoded.value);
 	}
 };
 
@@ -4608,7 +4594,7 @@ struct texture_offset_helper
 	{
 		const u32 value;
 
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u32 offset() const
 		{
@@ -4616,9 +4602,9 @@ struct texture_offset_helper
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Texture %u: Offset: 0x%x", index, decoded.offset());
+		return fmt::format("Texture %u: Offset: 0x%x", index, decoded.offset());
 	}
 };
 
@@ -4629,7 +4615,7 @@ struct texture_format_helper
 	{
 		const u32 value;
 
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		CellGcmLocation location() const
 		{
@@ -4640,7 +4626,7 @@ struct texture_format_helper
 		{
 			return bf_decoder<2, 1, bool>(value);
 		}
-
+	
 		u8 border_type() const
 		{
 			return bf_decoder<3, 1>(value);
@@ -4664,9 +4650,9 @@ struct texture_format_helper
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Texture %u: %s, Cubemap: %s, %s, %s, Mipmap: %u", index,
+		return fmt::format("Texture %u: %s, Cubemap: %s, %s, %s, Mipmap: %u", index,
 				decoded.location(), decoded.cubemap(), decoded.dimension(), decoded.format(), decoded.mipmap());
 	}
 };
@@ -4678,7 +4664,7 @@ struct texture_image_rect_helper
 	{
 		const u32 value;
 
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 height() const
 		{
@@ -4691,9 +4677,9 @@ struct texture_image_rect_helper
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Texture %u: W: %u, H: %u", index, decoded.width(), decoded.height());
+		return fmt::format("Texture %u: W: %u, H: %u", index, decoded.width(), decoded.height());
 	}
 };
 
@@ -4704,7 +4690,7 @@ struct texture_control0_helper
 	{
 		const u32 value;
 
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool enabled() const
 		{
@@ -4732,9 +4718,9 @@ struct texture_control0_helper
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Texture %u: %s, Min/Max LOD: %g/%g, Max Aniso: %s, AKill: %s", index, print_boolean(decoded.enabled())
+		return fmt::format("Texture %u: %s, Min/Max LOD: %g/%g, Max Aniso: %s, AKill: %s", index, print_boolean(decoded.enabled())
 			, decoded.min_lod(), decoded.max_lod(), decoded.max_aniso(), print_boolean(decoded.alpha_kill_enabled()));
 	}
 };
@@ -4746,7 +4732,7 @@ struct texture_control3_helper
 	{
 		const u32 value;
 
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		u16 depth() const
 		{
@@ -4759,9 +4745,9 @@ struct texture_control3_helper
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "Texture %u: Pitch: %u, Depth: %u", index, decoded.pitch(), decoded.depth());
+		return fmt::format("Texture %u: Pitch: %u, Depth: %u", index, decoded.pitch(), decoded.depth());
 	}
 };
 
@@ -4800,7 +4786,7 @@ struct vertex_texture_control0_helper
 	{
 		const u32 value;
 
-		constexpr decoded_type(u32 value) noexcept : value(value) {}
+		decoded_type(u32 value) : value(value) {}
 
 		bool enabled() const
 		{
@@ -4818,9 +4804,9 @@ struct vertex_texture_control0_helper
 		}
 	};
 
-	static void dump(std::string& out, const decoded_type& decoded)
+	static std::string dump(const decoded_type& decoded)
 	{
-		fmt::append(out, "VTexture %u: %s, Min/Max LOD: %g/%g", index, print_boolean(decoded.enabled())
+		return fmt::format("VTexture %u: %s, Min/Max LOD: %g/%g", index, print_boolean(decoded.enabled())
 			, decoded.min_lod(), decoded.max_lod());
 	}
 };
diff --git a/rpcs3/Emu/RSX/rsx_methods.cpp b/rpcs3/Emu/RSX/rsx_methods.cpp
index 903a10c582..5f15152f39 100644
--- a/rpcs3/Emu/RSX/rsx_methods.cpp
+++ b/rpcs3/Emu/RSX/rsx_methods.cpp
@@ -1,89 +1,1696 @@
 #include "stdafx.h"
 #include "rsx_methods.h"
 #include "RSXThread.h"
-#include "Emu/Cell/PPUThread.h"
+#include "rsx_utils.h"
+#include "rsx_decode.h"
+#include "Emu/Cell/PPUCallback.h"
 #include "Emu/Cell/lv2/sys_rsx.h"
+#include "Emu/RSX/Common/BufferUtils.h"
 
-
-#include "Emu/System.h"
-#include "Emu/RSX/NV47/HW/nv47.h"
-#include "Emu/RSX/NV47/HW/nv47_sync.hpp"
-#include "Emu/RSX/NV47/HW/context_accessors.define.h" // TODO: Context objects belong in FW not HW
+#include <thread>
 
 namespace rsx
 {
 	rsx_state method_registers;
 
 	std::array<rsx_method_t, 0x10000 / 4> methods{};
-	std::array<u32, 0x10000 / 4> state_signals{};
 
-	void invalid_method(context* ctx, u32 reg, u32 arg)
+	void invalid_method(thread* rsx, u32 reg, u32 arg)
 	{
 		//Don't throw, gather information and ignore broken/garbage commands
 		//TODO: Investigate why these commands are executed at all. (Heap corruption? Alignment padding?)
-		const u32 cmd = RSX(ctx)->get_fifo_cmd();
+		const u32 cmd = rsx->get_fifo_cmd();
 		rsx_log.error("Invalid RSX method 0x%x (arg=0x%x, start=0x%x, count=0x%x, non-inc=%s)", reg << 2, arg,
 		cmd & 0xfffc, (cmd >> 18) & 0x7ff, !!(cmd & RSX_METHOD_NON_INCREMENT_CMD));
-
-		if (g_cfg.core.rsx_fifo_accuracy != rsx_fifo_mode::as_ps3)
-		{
-			RSX(ctx)->recover_fifo();
-		}
+		rsx->recover_fifo();
 	}
 
-	static void trace_method(context* /*ctx*/, u32 reg, u32 arg)
+	static void trace_method(thread* /*rsx*/, u32 reg, u32 arg)
 	{
 		// For unknown yet valid methods
 		rsx_log.trace("RSX method 0x%x (arg=0x%x)", reg << 2, arg);
 	}
 
-	void flip_command(context* ctx, u32, u32 arg)
+	template<typename Type> struct vertex_data_type_from_element_type;
+	template<> struct vertex_data_type_from_element_type<float> { static const vertex_base_type type = vertex_base_type::f; };
+	template<> struct vertex_data_type_from_element_type<f16> { static const vertex_base_type type = vertex_base_type::sf; };
+	template<> struct vertex_data_type_from_element_type<u8> { static const vertex_base_type type = vertex_base_type::ub; };
+	template<> struct vertex_data_type_from_element_type<u16> { static const vertex_base_type type = vertex_base_type::s32k; };
+	template<> struct vertex_data_type_from_element_type<s16> { static const vertex_base_type type = vertex_base_type::s1; };
+
+	namespace nv406e
 	{
-		ensure(RSX(ctx)->isHLE);
-
-		if (RSX(ctx)->vblank_at_flip != umax)
+		void set_reference(thread* rsx, u32 /*reg*/, u32 arg)
 		{
-			RSX(ctx)->flip_notification_count++;
+			rsx->sync();
+
+			// Write ref+get atomically (get will be written again with the same value at command end)
+			vm::_ref<atomic_be_t<u64>>(rsx->dma_address + ::offset32(&RsxDmaControl::get)).store(u64{rsx->fifo_ctrl->get_pos()} << 32 | arg);
 		}
 
-		if (auto ptr = RSX(ctx)->queue_handler)
+		void semaphore_acquire(thread* rsx, u32 /*reg*/, u32 arg)
 		{
-			RSX(ctx)->intr_thread->cmd_list
-			({
-				{ ppu_cmd::set_args, 1 }, u64{1},
-				{ ppu_cmd::lle_call, ptr },
-				{ ppu_cmd::sleep, 0 }
-			});
+			rsx->sync_point_request.release(true);
+			const u32 addr = get_address(method_registers.semaphore_offset_406e(), method_registers.semaphore_context_dma_406e());
 
-			RSX(ctx)->intr_thread->cmd_notify.store(1);
-			RSX(ctx)->intr_thread->cmd_notify.notify_one();
+			const auto& sema = vm::_ref<RsxSemaphore>(addr).val;
+
+			// TODO: Remove vblank semaphore hack
+			if (addr == rsx->device_addr + 0x30) return;
+
+			if (sema == arg)
+			{
+				// Flip semaphore doesnt need wake-up delay
+				if (addr != rsx->label_addr + 0x10)
+				{
+					rsx->flush_fifo();
+					rsx->fifo_wake_delay(2);
+				}
+
+				return;
+			}
+			else
+			{
+				rsx->flush_fifo();
+			}
+
+			u64 start = get_system_time();
+			while (sema != arg)
+			{
+				if (rsx->is_stopped())
+				{
+					return;
+				}
+
+				if (const auto tdr = static_cast<u64>(g_cfg.video.driver_recovery_timeout))
+				{
+					if (rsx->is_paused())
+					{
+						const u64 start0 = get_system_time();
+
+						while (rsx->is_paused())
+						{
+							rsx->cpu_wait({});
+						}
+
+						// Reset
+						start += get_system_time() - start0;
+					}
+					else
+					{
+						if ((get_system_time() - start) > tdr)
+						{
+							// If longer than driver timeout force exit
+							rsx_log.error("nv406e::semaphore_acquire has timed out. semaphore_address=0x%X", addr);
+							break;
+						}
+					}
+				}
+
+				rsx->cpu_wait({});
+			}
+
+			rsx->fifo_wake_delay();
+			rsx->performance_counters.idle_time += (get_system_time() - start);
 		}
 
-		RSX(ctx)->reset();
-		RSX(ctx)->on_frame_end(arg);
-		RSX(ctx)->request_emu_flip(arg);
-		vm::_ptr<atomic_t<u128>>(RSX(ctx)->label_addr + 0x10)->store(u128{});
+		void semaphore_release(thread* rsx, u32 /*reg*/, u32 arg)
+		{
+			rsx->sync();
+
+			const u32 offset = method_registers.semaphore_offset_406e();
+
+			if (offset % 4)
+			{
+				rsx_log.warning("NV406E semaphore release is using unaligned semaphore, ignoring. (offset=0x%x)", offset);
+				return;
+			}
+
+			const u32 ctxt = method_registers.semaphore_context_dma_406e();
+
+			// By avoiding doing this on flip's semaphore release
+			// We allow last gcm's registers reset to occur in case of a crash
+			if (const bool is_flip_sema = (offset == 0x10 && ctxt == CELL_GCM_CONTEXT_DMA_SEMAPHORE_R);
+				!is_flip_sema)
+			{
+				rsx->sync_point_request.release(true);
+			}
+
+			const u32 addr = get_address(offset, ctxt);
+
+			// TODO: Check if possible to write on reservations
+			if (rsx->label_addr >> 28 != addr >> 28)
+			{
+				rsx_log.fatal("NV406E semaphore unexpected address. Please report to the developers. (offset=0x%x, addr=0x%x)", offset, addr);
+			}
+
+			vm::_ref<RsxSemaphore>(addr).val = arg;
+		}
 	}
 
-	void user_command(context* ctx, u32, u32 arg)
+	namespace nv4097
 	{
-		if (!RSX(ctx)->isHLE)
+		void clear(thread* rsx, u32 /*reg*/, u32 arg)
+		{
+			rsx->clear_surface(arg);
+
+			if (rsx->capture_current_frame)
+			{
+				rsx->capture_frame("clear");
+			}
+		}
+
+		void clear_zcull(thread* rsx, u32 /*reg*/, u32 /*arg*/)
+		{
+			if (rsx->capture_current_frame)
+			{
+				rsx->capture_frame("clear zcull memory");
+			}
+		}
+
+		void set_cull_face(thread* /*rsx*/, u32 reg, u32 arg)
+		{
+			switch (arg)
+			{
+			case CELL_GCM_FRONT_AND_BACK:
+			case CELL_GCM_FRONT:
+			case CELL_GCM_BACK:
+				return;
+			default:
+				// Ignore value if unknown
+				method_registers.registers[reg] = method_registers.register_previous_value;
+			}
+		}
+
+		void set_notify(thread* rsx, u32 /*reg*/, u32 /*arg*/)
+		{
+			const u32 location = method_registers.context_dma_notify();
+			const u32 index = (location & 0x7) ^ 0x7;
+
+			if ((location & ~7) != (CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0 & ~7))
+			{
+				rsx_log.trace("NV4097_NOTIFY: invalid context = 0x%x", method_registers.context_dma_notify());
+				return;
+			}
+
+			const u32 addr = rsx->iomap_table.get_addr(0xf100000 + (index * 0x40));
+
+			ensure(addr != umax);
+
+			vm::_ref<atomic_t<RsxNotify>>(addr).store(
+			{
+				rsx->timestamp(),
+				0
+			});
+		}
+
+		void texture_read_semaphore_release(thread* rsx, u32 /*reg*/, u32 arg)
+		{
+			// Pipeline barrier seems to be equivalent to a SHADER_READ stage barrier
+			g_fxo->get<rsx::dma_manager>().sync();
+			if (g_cfg.video.strict_rendering_mode)
+			{
+				rsx->sync();
+			}
+
+			// lle-gcm likes to inject system reserved semaphores, presumably for system/vsh usage
+			// Avoid calling render to avoid any havoc(flickering) they may cause from invalid flush/write
+			const u32 offset = method_registers.semaphore_offset_4097();
+
+			if (offset % 16)
+			{
+				rsx_log.error("NV4097 semaphore using unaligned offset, recovering. (offset=0x%x)", offset);
+				rsx->recover_fifo();
+				return;
+			}
+
+			vm::_ref<RsxSemaphore>(get_address(offset, method_registers.semaphore_context_dma_4097())).val = arg;
+		}
+
+		void back_end_write_semaphore_release(thread* rsx, u32 /*reg*/, u32 arg)
+		{
+			// Full pipeline barrier
+			g_fxo->get<rsx::dma_manager>().sync();
+			rsx->sync();
+
+			const u32 offset = method_registers.semaphore_offset_4097();
+
+			if (offset % 16)
+			{
+				rsx_log.error("NV4097 semaphore using unaligned offset, recovering. (offset=0x%x)", offset);
+				rsx->recover_fifo();
+				return;
+			}
+
+			const u32 val = (arg & 0xff00ff00) | ((arg & 0xff) << 16) | ((arg >> 16) & 0xff);
+			vm::_ref<RsxSemaphore>(get_address(offset, method_registers.semaphore_context_dma_4097())).val = val;
+		}
+
+		/**
+		 * id = base method register
+		 * index = register index in method
+		 * count = element count per attribute
+		 * register_count = number of registers consumed per attribute. E.g 3-element methods have padding
+		 */
+		template<u32 id, u32 index, int count, int register_count, typename type>
+		void set_vertex_data_impl(thread* rsx, u32 arg)
+		{
+			static constexpr usz increment_per_array_index = (register_count * sizeof(type)) / sizeof(u32);
+
+			static constexpr usz attribute_index = index / increment_per_array_index;
+			static constexpr usz vertex_subreg = index % increment_per_array_index;
+
+			constexpr auto vtype = vertex_data_type_from_element_type<type>::type;
+			static_assert(vtype != rsx::vertex_base_type::cmp);
+			static_assert(vtype != rsx::vertex_base_type::ub256);
+
+			// Convert LE data to BE layout
+			if constexpr (sizeof(type) == 4)
+			{
+				arg = std::bit_cast<u32, be_t<u32>>(arg);
+			}
+			else if constexpr (sizeof(type) == 2)
+			{
+				// 2 16-bit values packed in 1 32-bit word
+				const auto be_data = std::bit_cast<u32, be_t<u32>>(arg);
+
+				// After u32 swap, the components are in the wrong position
+				arg = (be_data << 16) | (be_data >> 16);
+			}
+
+			if (rsx->in_begin_end)
+			{
+				// Update to immediate mode register/array
+				rsx->append_to_push_buffer(attribute_index, count, vertex_subreg, vtype, arg);
+
+				// NOTE: one can update the register to update constant across primitive. Needs verification.
+				// Fall through
+			}
+
+			auto& info = rsx::method_registers.register_vertex_info[attribute_index];
+
+			info.type = vtype;
+			info.size = count;
+			info.frequency = 0;
+			info.stride = 0;
+			rsx::method_registers.register_vertex_info[attribute_index].data[vertex_subreg] = arg;
+		}
+
+		template<u32 index>
+		struct set_vertex_data4ub_m
+		{
+			static void impl(thread* rsx, u32 /*reg*/, u32 arg)
+			{
+				set_vertex_data_impl<NV4097_SET_VERTEX_DATA4UB_M, index, 4, 4, u8>(rsx, arg);
+			}
+		};
+
+		template<u32 index>
+		struct set_vertex_data1f_m
+		{
+			static void impl(thread* rsx, u32 /*reg*/, u32 arg)
+			{
+				set_vertex_data_impl<NV4097_SET_VERTEX_DATA1F_M, index, 1, 1, f32>(rsx, arg);
+			}
+		};
+
+		template<u32 index>
+		struct set_vertex_data2f_m
+		{
+			static void impl(thread* rsx, u32 /*reg*/, u32 arg)
+			{
+				set_vertex_data_impl<NV4097_SET_VERTEX_DATA2F_M, index, 2, 2, f32>(rsx, arg);
+			}
+		};
+
+		template<u32 index>
+		struct set_vertex_data3f_m
+		{
+			static void impl(thread* rsx, u32 /*reg*/, u32 arg)
+			{
+				//Register alignment is only 1, 2, or 4 (Rachet & Clank 2)
+				set_vertex_data_impl<NV4097_SET_VERTEX_DATA3F_M, index, 3, 4, f32>(rsx, arg);
+			}
+		};
+
+		template<u32 index>
+		struct set_vertex_data4f_m
+		{
+			static void impl(thread* rsx, u32 /*reg*/, u32 arg)
+			{
+				set_vertex_data_impl<NV4097_SET_VERTEX_DATA4F_M, index, 4, 4, f32>(rsx, arg);
+			}
+		};
+
+		template<u32 index>
+		struct set_vertex_data2s_m
+		{
+			static void impl(thread* rsx, u32 /*reg*/, u32 arg)
+			{
+				set_vertex_data_impl<NV4097_SET_VERTEX_DATA2S_M, index, 2, 2, u16>(rsx, arg);
+			}
+		};
+
+		template<u32 index>
+		struct set_vertex_data4s_m
+		{
+			static void impl(thread* rsx, u32 /*reg*/, u32 arg)
+			{
+				set_vertex_data_impl<NV4097_SET_VERTEX_DATA4S_M, index, 4, 4, u16>(rsx, arg);
+			}
+		};
+
+		template<u32 index>
+		struct set_vertex_data_scaled4s_m
+		{
+			static void impl(thread* rsx, u32 /*reg*/, u32 arg)
+			{
+				set_vertex_data_impl<NV4097_SET_VERTEX_DATA_SCALED4S_M, index, 4, 4, s16>(rsx, arg);
+			}
+		};
+
+		void set_array_element16(thread* rsx, u32, u32 arg)
+		{
+			if (rsx->in_begin_end)
+			{
+				rsx->append_array_element(arg & 0xFFFF);
+				rsx->append_array_element(arg >> 16);
+			}
+		}
+
+		void set_array_element32(thread* rsx, u32, u32 arg)
+		{
+			if (rsx->in_begin_end)
+				rsx->append_array_element(arg);
+		}
+
+		void draw_arrays(thread* /*rsx*/, u32 /*reg*/, u32 arg)
+		{
+			rsx::method_registers.current_draw_clause.command = rsx::draw_command::array;
+			rsx::registers_decoder<NV4097_DRAW_ARRAYS>::decoded_type v(arg);
+
+			rsx::method_registers.current_draw_clause.append(v.start(), v.count());
+		}
+
+		void draw_index_array(thread* /*rsx*/, u32 /*reg*/, u32 arg)
+		{
+			rsx::method_registers.current_draw_clause.command = rsx::draw_command::indexed;
+			rsx::registers_decoder<NV4097_DRAW_INDEX_ARRAY>::decoded_type v(arg);
+
+			rsx::method_registers.current_draw_clause.append(v.start(), v.count());
+		}
+
+		void draw_inline_array(thread* /*rsx*/, u32 /*reg*/, u32 arg)
+		{
+			arg = std::bit_cast<u32, be_t<u32>>(arg);
+			rsx::method_registers.current_draw_clause.command = rsx::draw_command::inlined_array;
+			rsx::method_registers.current_draw_clause.inline_vertex_array.push_back(arg);
+		}
+
+		template<u32 index>
+		struct set_transform_constant
+		{
+			static void impl(thread* rsx, u32 /*reg*/, u32 /*arg*/)
+			{
+				static constexpr u32 reg = index / 4;
+				static constexpr u8 subreg = index % 4;
+
+				// Get real args count
+				const u32 count = std::min<u32>({rsx->fifo_ctrl->get_remaining_args_count() + 1,
+					static_cast<u32>(((rsx->ctrl->put & ~3ull) - (rsx->fifo_ctrl->get_pos() - 4)) / 4), 32 - index});
+
+				const u32 load = rsx::method_registers.transform_constant_load();
+
+				u32 rcount = count;
+				if (const u32 max = (load + reg) * 4 + count + subreg, limit = 468 * 4; max > limit)
+				{
+					// Ignore addresses outside the usable [0, 467] range
+					rsx_log.warning("Invalid transform register index (load=%u, index=%u, count=%u)", load, index, count);
+
+					if ((max - count) < limit)
+						rcount -= max - limit;
+					else
+						rcount = 0;
+				}
+
+				const auto values = &rsx::method_registers.transform_constants[load + reg][subreg];
+
+				if (rsx->m_graphics_state & rsx::pipeline_state::transform_constants_dirty)
+				{
+					// Minor optimization: don't compare values if we already know we need invalidation
+					stream_data_to_memory_swapped_u32<true>(values, vm::base(rsx->fifo_ctrl->get_current_arg_ptr()), rcount, 4);
+				}
+				else
+				{
+					if (stream_data_to_memory_swapped_and_compare_u32<true>(values, vm::base(rsx->fifo_ctrl->get_current_arg_ptr()), rcount * 4))
+					{
+						// Transform constants invalidation is expensive (~8k bytes per update)
+						rsx->m_graphics_state |= rsx::pipeline_state::transform_constants_dirty;
+					}
+				}
+
+				rsx->fifo_ctrl->skip_methods(count - 1);
+			}
+		};
+
+		template<u32 index>
+		struct set_transform_program
+		{
+			static void impl(thread* rsx, u32 /*reg*/, u32 /*arg*/)
+			{
+				// Get real args count
+				const u32 count = std::min<u32>({rsx->fifo_ctrl->get_remaining_args_count() + 1,
+					static_cast<u32>(((rsx->ctrl->put & ~3ull) - (rsx->fifo_ctrl->get_pos() - 4)) / 4), 32 - index});
+
+				const u32 load_pos = rsx::method_registers.transform_program_load();
+
+				u32 rcount = count;
+
+				if (const u32 max = load_pos * 4 + rcount + (index % 4);
+					max > max_vertex_program_instructions * 4)
+				{
+					rsx_log.warning("Program buffer overflow! Attempted to write %u VP instructions.", max / 4);
+					rcount -= max - (max_vertex_program_instructions * 4);
+				}
+
+				stream_data_to_memory_swapped_u32<true>(&rsx::method_registers.transform_program[load_pos * 4 + index % 4]
+					, vm::base(rsx->fifo_ctrl->get_current_arg_ptr()), rcount, 4);
+
+				rsx->m_graphics_state |= rsx::pipeline_state::vertex_program_ucode_dirty;
+				rsx::method_registers.transform_program_load_set(load_pos + ((rcount + index % 4) / 4));
+				rsx->fifo_ctrl->skip_methods(count - 1);
+			}
+		};
+
+		void set_transform_program_start(thread* rsx, u32 reg, u32)
+		{
+			if (method_registers.registers[reg] != method_registers.register_previous_value)
+			{
+				rsx->m_graphics_state |= rsx::pipeline_state::vertex_program_ucode_dirty;
+			}
+		}
+
+		void set_vertex_attribute_output_mask(thread* rsx, u32 reg, u32)
+		{
+			if (method_registers.registers[reg] != method_registers.register_previous_value)
+			{
+				rsx->m_graphics_state |= rsx::pipeline_state::vertex_program_state_dirty;
+			}
+		}
+
+		void set_begin_end(thread* rsxthr, u32 /*reg*/, u32 arg)
+		{
+			// Ignore upper bits
+			if (const u8 prim = static_cast<u8>(arg))
+			{
+				rsx::method_registers.current_draw_clause.reset(to_primitive_type(prim));
+
+				if (rsx::method_registers.current_draw_clause.primitive == rsx::primitive_type::invalid)
+				{
+					rsxthr->in_begin_end = true;
+
+					rsx_log.warning("Invalid NV4097_SET_BEGIN_END value: 0x%x", arg);
+					return;
+				}
+
+				rsxthr->begin();
+				return;
+			}
+
+			//Check if we have immediate mode vertex data in a driver-local buffer
+			if (rsx::method_registers.current_draw_clause.command == rsx::draw_command::none)
+			{
+				const u32 push_buffer_vertices_count = rsxthr->get_push_buffer_vertex_count();
+				const u32 push_buffer_index_count = rsxthr->get_push_buffer_index_count();
+
+				//Need to set this flag since it overrides some register contents
+				rsx::method_registers.current_draw_clause.is_immediate_draw = true;
+
+				if (push_buffer_index_count)
+				{
+					rsx::method_registers.current_draw_clause.command = rsx::draw_command::indexed;
+					rsx::method_registers.current_draw_clause.append(0, push_buffer_index_count);
+				}
+				else if (push_buffer_vertices_count)
+				{
+					rsx::method_registers.current_draw_clause.command = rsx::draw_command::array;
+					rsx::method_registers.current_draw_clause.append(0, push_buffer_vertices_count);
+				}
+			}
+			else
+				rsx::method_registers.current_draw_clause.is_immediate_draw = false;
+
+			if (!rsx::method_registers.current_draw_clause.empty())
+			{
+				if (rsx::method_registers.current_draw_clause.primitive == rsx::primitive_type::invalid)
+				{
+					// Recover from invalid primitive only if draw clause is not empty
+					rsxthr->recover_fifo();
+
+					rsx_log.error("NV4097_SET_BEGIN_END aborted due to invalid primitive!");
+					return;
+				}
+
+				rsx::method_registers.current_draw_clause.compile();
+				rsxthr->end();
+			}
+			else
+			{
+				rsxthr->in_begin_end = false;
+			}
+		}
+
+		vm::addr_t get_report_data_impl(u32 offset)
+		{
+			u32 location = 0;
+			blit_engine::context_dma report_dma = method_registers.context_dma_report();
+
+			switch (report_dma)
+			{
+			case blit_engine::context_dma::to_memory_get_report: location = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL; break;
+			case blit_engine::context_dma::report_location_main: location = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN; break;
+			case blit_engine::context_dma::memory_host_buffer: location = CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER; break;
+			default:
+				return vm::addr_t(0);
+			}
+
+			return vm::cast(get_address(offset, location));
+		}
+
+		void get_report(thread* rsx, u32 /*reg*/, u32 arg)
+		{
+			u8 type = arg >> 24;
+			u32 offset = arg & 0xffffff;
+
+			auto address_ptr = get_report_data_impl(offset);
+			if (!address_ptr)
+			{
+				rsx_log.error("Bad argument passed to NV4097_GET_REPORT, arg=0x%X", arg);
+				return;
+			}
+
+			switch (type)
+			{
+			case CELL_GCM_ZPASS_PIXEL_CNT:
+			case CELL_GCM_ZCULL_STATS:
+			case CELL_GCM_ZCULL_STATS1:
+			case CELL_GCM_ZCULL_STATS2:
+			case CELL_GCM_ZCULL_STATS3:
+				rsx->get_zcull_stats(type, address_ptr);
+				break;
+			default:
+				rsx_log.error("NV4097_GET_REPORT: Bad type %d", type);
+
+				vm::_ref<atomic_t<CellGcmReportData>>(address_ptr).atomic_op([&](CellGcmReportData& data)
+				{
+					data.timer = rsx->timestamp();
+					data.padding = 0;
+				});
+				break;
+			}
+		}
+
+		void clear_report_value(thread* rsx, u32 /*reg*/, u32 arg)
+		{
+			switch (arg)
+			{
+			case CELL_GCM_ZPASS_PIXEL_CNT:
+			case CELL_GCM_ZCULL_STATS:
+				break;
+			default:
+				rsx_log.error("NV4097_CLEAR_REPORT_VALUE: Bad type: %d", arg);
+				break;
+			}
+
+			rsx->clear_zcull_stats(arg);
+		}
+
+		void set_render_mode(thread* rsx, u32, u32 arg)
+		{
+			const u32 mode = arg >> 24;
+			switch (mode)
+			{
+			case 1:
+				rsx->disable_conditional_rendering();
+				return;
+			case 2:
+				break;
+			default:
+				rsx_log.error("Unknown render mode %d", mode);
+				return;
+			}
+
+			const u32 offset = arg & 0xffffff;
+			auto address_ptr = get_report_data_impl(offset);
+
+			if (!address_ptr)
+			{
+				rsx_log.error("Bad argument passed to NV4097_SET_RENDER_ENABLE, arg=0x%X", arg);
+				return;
+			}
+
+			// Defer conditional render evaluation
+			rsx->enable_conditional_rendering(address_ptr);
+		}
+
+		void set_zcull_render_enable(thread* rsx, u32, u32 arg)
+		{
+			rsx->zcull_rendering_enabled = !!arg;
+			rsx->notify_zcull_info_changed();
+		}
+
+		void set_zcull_stats_enable(thread* rsx, u32, u32 arg)
+		{
+			rsx->zcull_stats_enabled = !!arg;
+			rsx->notify_zcull_info_changed();
+		}
+
+		void set_zcull_pixel_count_enable(thread* rsx, u32, u32 arg)
+		{
+			rsx->zcull_pixel_cnt_enabled = !!arg;
+			rsx->notify_zcull_info_changed();
+		}
+
+		void sync(thread* rsx, u32, u32)
+		{
+			rsx->sync();
+		}
+
+		void set_shader_program_dirty(thread* rsx, u32, u32)
+		{
+			rsx->m_graphics_state |= rsx::pipeline_state::fragment_program_ucode_dirty;
+		}
+
+		void set_surface_dirty_bit(thread* rsx, u32 reg, u32 arg)
+		{
+			if (reg == NV4097_SET_SURFACE_CLIP_VERTICAL ||
+				reg == NV4097_SET_SURFACE_CLIP_HORIZONTAL)
+			{
+				if (arg != method_registers.register_previous_value)
+				{
+					rsx->m_graphics_state |= rsx::pipeline_state::vertex_state_dirty;
+				}
+			}
+
+			rsx->m_rtts_dirty = true;
+			rsx->m_framebuffer_state_contested = false;
+		}
+
+		void set_surface_format(thread* rsx, u32 reg, u32 arg)
+		{
+			// Special consideration - antialiasing control can affect ROP state
+			const auto aa_mask = (0xF << 12);
+			if ((arg & aa_mask) != (method_registers.register_previous_value & aa_mask))
+			{
+				// Antialias control has changed, update ROP parameters
+				rsx->m_graphics_state |= rsx::pipeline_state::fragment_state_dirty;
+			}
+
+			set_surface_dirty_bit(rsx, reg, arg);
+		}
+
+		void set_surface_options_dirty_bit(thread* rsx, u32 reg, u32 arg)
+		{
+			if (arg != method_registers.register_previous_value)
+			{
+				rsx->on_framebuffer_options_changed(reg);
+			}
+		}
+
+		void set_stencil_op(thread* rsx, u32 reg, u32 arg)
+		{
+			if (arg != method_registers.register_previous_value)
+			{
+				switch (arg)
+				{
+				case CELL_GCM_INVERT:
+				case CELL_GCM_KEEP:
+				case CELL_GCM_REPLACE:
+				case CELL_GCM_INCR:
+				case CELL_GCM_DECR:
+				case CELL_GCM_INCR_WRAP:
+				case CELL_GCM_DECR_WRAP:
+				case CELL_GCM_ZERO:
+					set_surface_options_dirty_bit(rsx, reg, arg);
+					break;
+
+				default:
+					// Ignored on RSX
+					method_registers.decode(reg, method_registers.register_previous_value);
+					break;
+				}
+			}
+		}
+
+		template <u32 RsxFlags>
+		void notify_state_changed(thread* rsx, u32, u32 arg)
+		{
+			if (arg != method_registers.register_previous_value)
+			{
+				rsx->m_graphics_state |= RsxFlags;
+			}
+		}
+
+		void set_vertex_base_offset(thread* rsx, u32 reg, u32 arg)
+		{
+			if (rsx->in_begin_end &&
+				!rsx::method_registers.current_draw_clause.empty() &&
+				reg != method_registers.register_previous_value)
+			{
+				// Revert change to queue later
+				method_registers.decode(reg, method_registers.register_previous_value);
+
+				// Insert base mofifier barrier
+				method_registers.current_draw_clause.insert_command_barrier(vertex_base_modifier_barrier, arg);
+			}
+		}
+
+		void set_index_base_offset(thread* rsx, u32 reg, u32 arg)
+		{
+			if (rsx->in_begin_end &&
+				!rsx::method_registers.current_draw_clause.empty() &&
+				reg != method_registers.register_previous_value)
+			{
+				// Revert change to queue later
+				method_registers.decode(reg, method_registers.register_previous_value);
+
+				// Insert base mofifier barrier
+				method_registers.current_draw_clause.insert_command_barrier(index_base_modifier_barrier, arg);
+			}
+		}
+
+		template<u32 index>
+		struct set_vertex_array_offset
+		{
+			static void impl(thread* rsx, u32 reg, u32 arg)
+			{
+				if (rsx->in_begin_end &&
+					!rsx::method_registers.current_draw_clause.empty() &&
+					reg != method_registers.register_previous_value)
+				{
+					// Revert change to queue later
+					method_registers.decode(reg, method_registers.register_previous_value);
+
+					// Insert offset mofifier barrier
+					method_registers.current_draw_clause.insert_command_barrier(vertex_array_offset_modifier_barrier, arg, index);
+				}
+			}
+		};
+
+		void check_index_array_dma(thread* rsx, u32 reg, u32 arg)
+		{
+			// Check if either location or index type are invalid
+			if (arg & ~(CELL_GCM_LOCATION_MAIN | (CELL_GCM_DRAW_INDEX_ARRAY_TYPE_16 << 4)))
+			{
+				// Ignore invalid value, recover
+				method_registers.registers[reg] = method_registers.register_previous_value;
+				rsx->recover_fifo();
+
+				rsx_log.error("Invalid NV4097_SET_INDEX_ARRAY_DMA value: 0x%x", arg);
+			}
+		}
+
+		void set_blend_equation(thread* /*rsx*/, u32 reg, u32 arg)
+		{
+			for (u32 i = 0; i < 32u; i += 16)
+			{
+				switch ((arg >> i) & 0xffff)
+				{
+				case CELL_GCM_FUNC_ADD:
+				case CELL_GCM_MIN:
+				case CELL_GCM_MAX:
+				case CELL_GCM_FUNC_SUBTRACT:
+				case CELL_GCM_FUNC_REVERSE_SUBTRACT:
+				case CELL_GCM_FUNC_REVERSE_SUBTRACT_SIGNED:
+				case CELL_GCM_FUNC_ADD_SIGNED:
+				case CELL_GCM_FUNC_REVERSE_ADD_SIGNED:
+					break;
+
+				default:
+				{
+					// Ignore invalid values as a whole
+					method_registers.decode(reg, method_registers.register_previous_value);
+					return;
+				}
+				}
+			}
+		}
+
+		void set_blend_factor(thread* /*rsx*/, u32 reg, u32 arg)
+		{
+			for (u32 i = 0; i < 32u; i += 16)
+			{
+				switch ((arg >> i) & 0xffff)
+				{
+				case CELL_GCM_ZERO:
+				case CELL_GCM_ONE:
+				case CELL_GCM_SRC_COLOR:
+				case CELL_GCM_ONE_MINUS_SRC_COLOR:
+				case CELL_GCM_SRC_ALPHA:
+				case CELL_GCM_ONE_MINUS_SRC_ALPHA:
+				case CELL_GCM_DST_ALPHA:
+				case CELL_GCM_ONE_MINUS_DST_ALPHA:
+				case CELL_GCM_DST_COLOR:
+				case CELL_GCM_ONE_MINUS_DST_COLOR:
+				case CELL_GCM_SRC_ALPHA_SATURATE:
+				case CELL_GCM_CONSTANT_COLOR:
+				case CELL_GCM_ONE_MINUS_CONSTANT_COLOR:
+				case CELL_GCM_CONSTANT_ALPHA:
+				case CELL_GCM_ONE_MINUS_CONSTANT_ALPHA:
+					break;
+
+				default:
+					// Ignore invalid values as a whole
+					method_registers.decode(reg, method_registers.register_previous_value);
+					return;
+				}
+			}
+		}
+
+		template<u32 index>
+		struct set_texture_dirty_bit
+		{
+			static void impl(thread* rsx, u32 /*reg*/, u32 /*arg*/)
+			{
+				rsx->m_textures_dirty[index] = true;
+
+				if (rsx->current_fp_metadata.referenced_textures_mask & (1 << index))
+				{
+					rsx->m_graphics_state |= rsx::pipeline_state::fragment_program_state_dirty;
+				}
+			}
+		};
+
+		template<u32 index>
+		struct set_vertex_texture_dirty_bit
+		{
+			static void impl(thread* rsx, u32 /*reg*/, u32 /*arg*/)
+			{
+				rsx->m_vertex_textures_dirty[index] = true;
+
+				if (rsx->current_vp_metadata.referenced_textures_mask & (1 << index))
+				{
+					rsx->m_graphics_state |= rsx::pipeline_state::vertex_program_state_dirty;
+				}
+			}
+		};
+	}
+
+	namespace nv308a
+	{
+		template<u32 index>
+		struct color
+		{
+			static void impl(thread* rsx, u32 /*reg*/, u32 /*arg*/)
+			{
+				const u32 out_x_max = method_registers.nv308a_size_out_x();
+
+				if (index >= out_x_max)
+				{
+					// Skip
+					return;
+				}
+
+				// Get position of the current command arg
+				const u32 src_offset = rsx->fifo_ctrl->get_pos() - 4;
+
+				// Get real args count (starting from NV3089_COLOR)
+				const u32 count = std::min<u32>({rsx->fifo_ctrl->get_remaining_args_count() + 1,
+					static_cast<u32>(((rsx->ctrl->put & ~3ull) - src_offset) / 4), 0x700 - index, out_x_max - index});
+
+				const u32 dst_dma = method_registers.blit_engine_output_location_nv3062();
+				const u32 dst_offset = method_registers.blit_engine_output_offset_nv3062();
+				const u32 out_pitch = method_registers.blit_engine_output_pitch_nv3062();
+
+				const u32 x = method_registers.nv308a_x() + index;
+				const u32 y = method_registers.nv308a_y();
+
+				// Skip "handled methods"
+				rsx->fifo_ctrl->skip_methods(count - 1);
+
+				switch (method_registers.blit_engine_nv3062_color_format())
+				{
+				case blit_engine::transfer_destination_format::a8r8g8b8:
+				case blit_engine::transfer_destination_format::y32:
+				{
+					// Bit cast - optimize to mem copy
+
+					const u32 data_length = count * 4;
+
+					const auto dst_address = get_address(dst_offset + (x * 4) + (out_pitch * y), dst_dma, data_length);
+
+					if (!dst_address)
+					{
+						rsx->recover_fifo();
+						return;
+					}
+
+					const auto src_address = get_address(src_offset, CELL_GCM_LOCATION_MAIN);
+
+					const auto dst = vm::_ptr<u8>(dst_address);
+					const auto src = vm::_ptr<const u8>(src_address);
+
+					auto res = rsx::reservation_lock<true>(dst_address, data_length, src_address, data_length);
+
+					if (rsx->fifo_ctrl->last_cmd() & RSX_METHOD_NON_INCREMENT_CMD_MASK) [[unlikely]]
+					{
+						// Move last 32 bits
+						reinterpret_cast<u32*>(dst)[0] = reinterpret_cast<const u32*>(src)[count - 1];
+						rsx->invalidate_fragment_program(dst_dma, dst_offset, 4);
+					}
+					else
+					{
+						if (dst_dma & CELL_GCM_LOCATION_MAIN)
+						{
+							// May overlap
+							std::memmove(dst, src, data_length);
+						}
+						else
+						{
+							// Never overlaps
+							std::memcpy(dst, src, data_length);
+						}
+
+						rsx->invalidate_fragment_program(dst_dma, dst_offset, count * 4);
+					}
+
+					break;
+				}
+				case blit_engine::transfer_destination_format::r5g6b5:
+				{
+					const auto data_length = count * 2;
+
+					const auto dst_address = get_address(dst_offset + (x * 2) + (y * out_pitch), dst_dma, data_length);
+					const auto src_address = get_address(src_offset, CELL_GCM_LOCATION_MAIN);
+					const auto dst = vm::_ptr<u16>(dst_address);
+					const auto src = vm::_ptr<const u32>(src_address);
+
+					if (!dst_address)
+					{
+						rsx->recover_fifo();
+						return;
+					}
+
+					auto res = rsx::reservation_lock<true>(dst_address, data_length, src_address, data_length);
+
+					auto convert = [](u32 input) -> u16
+					{
+						// Input is considered to be ARGB8
+						u32 r = (input >> 16) & 0xFF;
+						u32 g = (input >> 8) & 0xFF;
+						u32 b = input & 0xFF;
+
+						r = (r * 32) / 255;
+						g = (g * 64) / 255;
+						b = (b * 32) / 255;
+						return static_cast<u16>((r << 11) | (g << 5) | b);
+					};
+
+					if (rsx->fifo_ctrl->last_cmd() & RSX_METHOD_NON_INCREMENT_CMD_MASK) [[unlikely]]
+					{
+						// Move last 16 bits
+						dst[0] = convert(src[count - 1]);
+						rsx->invalidate_fragment_program(dst_dma, dst_offset, 2);
+						break;
+					}
+
+					for (u32 i = 0; i < count; i++)
+					{
+						dst[i] = convert(src[i]);
+					}
+
+					rsx->invalidate_fragment_program(dst_dma, dst_offset, count * 2);
+					break;
+				}
+				default:
+				{
+					fmt::throw_exception("Unreachable");
+				}
+				}
+			}
+		};
+	}
+
+	namespace nv3089
+	{
+		void image_in(thread* rsx, u32 /*reg*/, u32 /*arg*/)
+		{
+			const rsx::blit_engine::transfer_operation operation = method_registers.blit_engine_operation();
+
+			const u16 out_x = method_registers.blit_engine_output_x();
+			const u16 out_y = method_registers.blit_engine_output_y();
+			const u16 out_w = method_registers.blit_engine_output_width();
+			const u16 out_h = method_registers.blit_engine_output_height();
+
+			const u16 in_w = method_registers.blit_engine_input_width();
+			const u16 in_h = method_registers.blit_engine_input_height();
+
+			const blit_engine::transfer_origin in_origin = method_registers.blit_engine_input_origin();
+			const blit_engine::transfer_interpolator in_inter = method_registers.blit_engine_input_inter();
+			rsx::blit_engine::transfer_source_format src_color_format = method_registers.blit_engine_src_color_format();
+
+			const f32 scale_x = method_registers.blit_engine_ds_dx();
+			const f32 scale_y = method_registers.blit_engine_dt_dy();
+
+			// Clipping
+			// Validate that clipping rect will fit onto both src and dst regions
+			const u16 clip_w = std::min(method_registers.blit_engine_clip_width(), out_w);
+			const u16 clip_h = std::min(method_registers.blit_engine_clip_height(), out_h);
+
+			// Check both clip dimensions and dst dimensions
+			if (clip_w == 0 || clip_h == 0)
+			{
+				rsx_log.warning("NV3089_IMAGE_IN: Operation NOPed out due to empty regions");
+				return;
+			}
+
+			if (in_w == 0 || in_h == 0)
+			{
+				// Input cant be an empty region
+				fmt::throw_exception("NV3089_IMAGE_IN_SIZE: Invalid blit dimensions passed (in_w=%d, in_h=%d)", in_w, in_h);
+			}
+
+			u16 clip_x = method_registers.blit_engine_clip_x();
+			u16 clip_y = method_registers.blit_engine_clip_y();
+
+			//Fit onto dst
+			if (clip_x && (out_x + clip_x + clip_w) > out_w) clip_x = 0;
+			if (clip_y && (out_y + clip_y + clip_h) > out_h) clip_y = 0;
+
+			u16 in_pitch = method_registers.blit_engine_input_pitch();
+
+			switch (in_origin)
+			{
+			case blit_engine::transfer_origin::corner:
+			case blit_engine::transfer_origin::center:
+				break;
+			default:
+				rsx_log.warning("NV3089_IMAGE_IN_SIZE: unknown origin (%d)", static_cast<u8>(in_origin));
+			}
+
+			if (operation != rsx::blit_engine::transfer_operation::srccopy)
+			{
+				rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown operation (0x%x)", method_registers.registers[NV3089_SET_OPERATION]);
+				rsx->recover_fifo();
+				return;
+			}
+
+			if (src_color_format == rsx::blit_engine::transfer_source_format::invalid)
+			{
+				rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown src color format (0x%x)", method_registers.registers[NV3089_SET_COLOR_FORMAT]);
+				rsx->recover_fifo();
+				return;
+			}
+
+			const u32 src_offset = method_registers.blit_engine_input_offset();
+			const u32 src_dma = method_registers.blit_engine_input_location();
+
+			u32 dst_offset;
+			u32 dst_dma = 0;
+			rsx::blit_engine::transfer_destination_format dst_color_format;
+			u32 out_pitch = 0;
+			[[maybe_unused]] u32 out_alignment = 64;
+			bool is_block_transfer = false;
+
+			switch (method_registers.blit_engine_context_surface())
+			{
+			case blit_engine::context_surface::surface2d:
+			{
+				dst_dma = method_registers.blit_engine_output_location_nv3062();
+				dst_offset = method_registers.blit_engine_output_offset_nv3062();
+				dst_color_format = method_registers.blit_engine_nv3062_color_format();
+				out_pitch = method_registers.blit_engine_output_pitch_nv3062();
+				out_alignment = method_registers.blit_engine_output_alignment_nv3062();
+				is_block_transfer = fcmp(scale_x, 1.f) && fcmp(scale_y, 1.f);
+
+				if (dst_color_format == rsx::blit_engine::transfer_destination_format::invalid)
+				{
+					rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown NV3062 dst color format (0x%x)", method_registers.registers[NV3062_SET_COLOR_FORMAT]);
+					rsx->recover_fifo();
+					return;
+				}
+
+				break;
+			}
+			case blit_engine::context_surface::swizzle2d:
+			{
+				dst_dma = method_registers.blit_engine_nv309E_location();
+				dst_offset = method_registers.blit_engine_nv309E_offset();
+				dst_color_format = method_registers.blit_engine_output_format_nv309E();
+
+				if (dst_color_format == rsx::blit_engine::transfer_destination_format::invalid)
+				{
+					rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown NV309E dst color format (0x%x)", method_registers.registers[NV309E_SET_FORMAT]);
+					rsx->recover_fifo();
+					return;
+				}
+
+				break;
+			}
+			default:
+				rsx_log.error("NV3089_IMAGE_IN_SIZE: unknown m_context_surface (0x%x)", static_cast<u8>(method_registers.blit_engine_context_surface()));
+				return;
+			}
+
+			const u32 in_bpp = (src_color_format == rsx::blit_engine::transfer_source_format::r5g6b5) ? 2 : 4; // bytes per pixel
+			const u32 out_bpp = (dst_color_format == rsx::blit_engine::transfer_destination_format::r5g6b5) ? 2 : 4;
+
+			if (out_pitch == 0)
+			{
+				out_pitch = out_bpp * out_w;
+			}
+
+			if (in_bpp != out_bpp)
+			{
+				is_block_transfer = false;
+			}
+
+			u16 in_x, in_y;
+			if (in_origin == blit_engine::transfer_origin::center)
+			{
+				// Convert to normal u,v addressing. Under this scheme offset of 1 is actually half-way inside pixel 0
+				const float x = std::max(method_registers.blit_engine_in_x(), 0.5f);
+				const float y = std::max(method_registers.blit_engine_in_y(), 0.5f);
+				in_x = static_cast<u16>(std::floor(x - 0.5f));
+				in_y = static_cast<u16>(std::floor(y - 0.5f));
+			}
+			else
+			{
+				in_x = static_cast<u16>(std::floor(method_registers.blit_engine_in_x()));
+				in_y = static_cast<u16>(std::floor(method_registers.blit_engine_in_y()));
+			}
+
+			// Check for subpixel addressing
+			if (scale_x < 1.f)
+			{
+				float dst_x = in_x * scale_x;
+				in_x = static_cast<u16>(std::floor(dst_x) / scale_x);
+			}
+
+			if (scale_y < 1.f)
+			{
+				float dst_y = in_y * scale_y;
+				in_y = static_cast<u16>(std::floor(dst_y) / scale_y);
+			}
+
+			const u32 in_offset = in_x * in_bpp + in_pitch * in_y;
+			const u32 out_offset = out_x * out_bpp + out_pitch * out_y;
+
+			const u32 src_line_length = (in_w * in_bpp);
+
+			u32 src_address = 0;
+			const u32 dst_address = get_address(dst_offset, dst_dma, 1); // TODO: Add size
+
+			if (is_block_transfer && (clip_h == 1 || (in_pitch == out_pitch && src_line_length == in_pitch)))
+			{
+				const u32 nb_lines = std::min(clip_h, in_h);
+				const u32 data_length = nb_lines * src_line_length;
+
+				if (src_address = get_address(src_offset, src_dma, data_length);
+					!src_address || !dst_address)
+				{
+					rsx->recover_fifo();
+					return;
+				}
+
+				rsx->invalidate_fragment_program(dst_dma, dst_offset, data_length);
+
+				if (const auto result = rsx->read_barrier(src_address, data_length, false);
+					result == rsx::result_zcull_intr)
+				{
+					if (rsx->copy_zcull_stats(src_address, data_length, dst_address) == data_length)
+					{
+						// All writes deferred
+						return;
+					}
+				}
+			}
+			else
+			{
+				const u16 read_h = std::min(static_cast<u16>(clip_h / scale_y), in_h);
+				const u32 data_length = in_pitch * (read_h - 1) + src_line_length;
+
+				if (src_address = get_address(src_offset, src_dma, data_length);
+					!src_address || !dst_address)
+				{
+					rsx->recover_fifo();
+					return;
+				}
+
+				rsx->invalidate_fragment_program(dst_dma, dst_offset, data_length);
+				rsx->read_barrier(src_address, data_length, true);
+			}
+
+			if (src_address == dst_address &&
+				in_w == clip_w && in_h == clip_h &&
+				in_pitch == out_pitch &&
+				rsx::fcmp(scale_x, 1.f) && rsx::fcmp(scale_y, 1.f))
+			{
+				// NULL operation
+				rsx_log.warning("NV3089_IMAGE_IN: Operation writes memory onto itself with no modification (move-to-self). Will ignore.");
+				return;
+			}
+
+			u8* pixels_src = vm::_ptr<u8>(src_address + in_offset);
+			u8* pixels_dst = vm::_ptr<u8>(dst_address + out_offset);
+
+			if (dst_color_format != rsx::blit_engine::transfer_destination_format::r5g6b5 &&
+				dst_color_format != rsx::blit_engine::transfer_destination_format::a8r8g8b8)
+			{
+				fmt::throw_exception("NV3089_IMAGE_IN_SIZE: unknown dst_color_format (%d)", static_cast<u8>(dst_color_format));
+			}
+
+			if (src_color_format != rsx::blit_engine::transfer_source_format::r5g6b5 &&
+				src_color_format != rsx::blit_engine::transfer_source_format::a8r8g8b8)
+			{
+				// Alpha has no meaning in both formats
+				if (src_color_format == rsx::blit_engine::transfer_source_format::x8r8g8b8)
+				{
+					src_color_format = rsx::blit_engine::transfer_source_format::a8r8g8b8;
+				}
+				else
+				{
+					// TODO: Support more formats
+					fmt::throw_exception("NV3089_IMAGE_IN_SIZE: unknown src_color_format (%d)", static_cast<u8>(src_color_format));
+				}
+			}
+
+			u32 convert_w = static_cast<u32>(std::abs(scale_x) * in_w);
+			u32 convert_h = static_cast<u32>(std::abs(scale_y) * in_h);
+
+			if (convert_w == 0 || convert_h == 0)
+			{
+				rsx_log.error("NV3089_IMAGE_IN: Invalid dimensions or scaling factor. Request ignored (ds_dx=%f, dt_dy=%f)",
+					method_registers.blit_engine_ds_dx(), method_registers.blit_engine_dt_dy());
+				return;
+			}
+
+			// Lock here. RSX cannot execute any locking operations from this point, including ZCULL read barriers
+			auto res = ::rsx::reservation_lock<true>(dst_address, out_pitch * out_h, src_address, in_pitch * in_h);
+
+			if (!g_cfg.video.force_cpu_blit_processing && (dst_dma == CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER || src_dma == CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER))
+			{
+				blit_src_info src_info = {};
+				blit_dst_info dst_info = {};
+
+				src_info.format = src_color_format;
+				src_info.origin = in_origin;
+				src_info.width = in_w;
+				src_info.height = in_h;
+				src_info.pitch = in_pitch;
+				src_info.offset_x = in_x;
+				src_info.offset_y = in_y;
+				src_info.rsx_address = src_address;
+				src_info.pixels = pixels_src;
+
+				dst_info.format = dst_color_format;
+				dst_info.width = convert_w;
+				dst_info.height = convert_h;
+				dst_info.clip_x = clip_x;
+				dst_info.clip_y = clip_y;
+				dst_info.clip_width = clip_w;
+				dst_info.clip_height = clip_h;
+				dst_info.offset_x = out_x;
+				dst_info.offset_y = out_y;
+				dst_info.pitch = out_pitch;
+				dst_info.scale_x = scale_x;
+				dst_info.scale_y = scale_y;
+				dst_info.rsx_address = dst_address;
+				dst_info.pixels = pixels_dst;
+				dst_info.swizzled = (method_registers.blit_engine_context_surface() == blit_engine::context_surface::swizzle2d);
+
+				if (rsx->scaled_image_from_memory(src_info, dst_info, in_inter == blit_engine::transfer_interpolator::foh))
+					return;
+			}
+
+			std::vector<u8> temp1, temp2, temp3, sw_temp;
+
+			if (scale_y < 0 || scale_x < 0)
+			{
+				const u32 packed_pitch = in_w * in_bpp;
+				temp1.resize(packed_pitch * in_h);
+
+				const s32 stride_y = (scale_y < 0 ? -1 : 1) * s32{in_pitch};
+
+				for (u32 y = 0; y < in_h; ++y)
+				{
+					u8 *dst = temp1.data() + (packed_pitch * y);
+					u8 *src = pixels_src + (static_cast<s32>(y) * stride_y);
+
+					if (scale_x < 0)
+					{
+						if (in_bpp == 2)
+						{
+							rsx::memcpy_r<u16>(dst, src, in_w);
+						}
+						else
+						{
+							rsx::memcpy_r<u32>(dst, src, in_w);
+						}
+					}
+					else
+					{
+						std::memcpy(dst, src, packed_pitch);
+					}
+				}
+
+				pixels_src = temp1.data();
+				in_pitch = packed_pitch;
+			}
+
+			const AVPixelFormat in_format = (src_color_format == rsx::blit_engine::transfer_source_format::r5g6b5) ? AV_PIX_FMT_RGB565BE : AV_PIX_FMT_ARGB;
+			const AVPixelFormat out_format = (dst_color_format == rsx::blit_engine::transfer_destination_format::r5g6b5) ? AV_PIX_FMT_RGB565BE : AV_PIX_FMT_ARGB;
+
+			const bool need_clip =
+				clip_w != in_w ||
+				clip_h != in_h ||
+				clip_x > 0 || clip_y > 0 ||
+				convert_w != out_w || convert_h != out_h;
+
+			const bool need_convert = out_format != in_format || !rsx::fcmp(fabsf(scale_x), 1.f) || !rsx::fcmp(fabsf(scale_y), 1.f);
+			const u32 slice_h = static_cast<u32>(std::ceil(static_cast<f32>(clip_h + clip_y) / scale_y));
+
+			if (method_registers.blit_engine_context_surface() != blit_engine::context_surface::swizzle2d)
+			{
+				if (!need_convert)
+				{
+					const bool is_overlapping = scale_x > 0 && scale_y > 0 && dst_dma == src_dma && [&]() -> bool
+					{
+						const u32 src_max = src_offset + in_pitch * (in_h - 1) + (in_bpp * in_w);
+						const u32 dst_max = dst_offset + out_pitch * (out_h - 1) + (out_bpp * out_w);
+						return (src_offset >= dst_offset && src_offset < dst_max) ||
+						 (dst_offset >= src_offset && dst_offset < src_max);
+					}();
+
+					if (is_overlapping)
+					{
+						if (need_clip)
+						{
+							temp2.resize(out_pitch * clip_h);
+
+							clip_image_may_overlap(pixels_dst, pixels_src, clip_x, clip_y, clip_w, clip_h, out_bpp, in_pitch, out_pitch, temp2.data());
+						}
+						else if (out_pitch != in_pitch || out_pitch != out_bpp * out_w)
+						{
+							const u32 buffer_pitch = out_bpp * out_w;
+							temp2.resize(buffer_pitch * out_h);
+							std::add_pointer_t<u8> buf = temp2.data(), pixels = pixels_src;
+
+							// Read the whole buffer from source
+							for (u32 y = 0; y < out_h; ++y)
+							{
+								std::memcpy(buf, pixels, buffer_pitch);
+								pixels += in_pitch;
+								buf += buffer_pitch;
+							}
+
+							buf = temp2.data(), pixels = pixels_dst;
+
+							// Write to destination
+							for (u32 y = 0; y < out_h; ++y)
+							{
+								std::memcpy(pixels, buf, buffer_pitch);
+								pixels += out_pitch;
+								buf += buffer_pitch;
+							}
+						}
+						else
+						{
+							std::memmove(pixels_dst, pixels_src, out_pitch * out_h);
+						}
+					}
+					else
+					{
+						if (need_clip)
+						{
+							clip_image(pixels_dst, pixels_src, clip_x, clip_y, clip_w, clip_h, out_bpp, in_pitch, out_pitch);
+						}
+						else if (out_pitch != in_pitch || out_pitch != out_bpp * out_w)
+						{
+							u8 *dst = pixels_dst, *src = pixels_src;
+
+							for (u32 y = 0; y < out_h; ++y)
+							{
+								std::memcpy(dst, src, out_w * out_bpp);
+								dst += out_pitch;
+								src += in_pitch;
+							}
+						}
+						else
+						{
+							std::memcpy(pixels_dst, pixels_src, out_pitch * out_h);
+						}
+					}
+				}
+				else
+				{
+					if (need_clip)
+					{
+						temp2.resize(out_pitch * std::max<u32>(convert_h, clip_h));
+
+						convert_scale_image(temp2.data(), out_format, convert_w, convert_h, out_pitch,
+							pixels_src, in_format, in_w, in_h, in_pitch, slice_h, in_inter == blit_engine::transfer_interpolator::foh);
+
+						clip_image(pixels_dst, temp2.data(), clip_x, clip_y, clip_w, clip_h, out_bpp, out_pitch, out_pitch);
+					}
+					else
+					{
+						convert_scale_image(pixels_dst, out_format, out_w, out_h, out_pitch,
+							pixels_src, in_format, in_w, in_h, in_pitch, slice_h, in_inter == blit_engine::transfer_interpolator::foh);
+					}
+				}
+			}
+			else
+			{
+				if (need_convert || need_clip)
+				{
+					if (need_clip)
+					{
+						temp3.resize(out_pitch * clip_h);
+
+						if (need_convert)
+						{
+							temp2.resize(out_pitch * std::max<u32>(convert_h, clip_h));
+
+							convert_scale_image(temp2.data(), out_format, convert_w, convert_h, out_pitch,
+								pixels_src, in_format, in_w, in_h, in_pitch, slice_h, in_inter == blit_engine::transfer_interpolator::foh);
+
+							clip_image(temp3.data(), temp2.data(), clip_x, clip_y, clip_w, clip_h, out_bpp, out_pitch, out_pitch);
+						}
+						else
+						{
+							clip_image(temp3.data(), pixels_src, clip_x, clip_y, clip_w, clip_h, out_bpp, in_pitch, out_pitch);
+						}
+					}
+					else
+					{
+						temp3.resize(out_pitch * out_h);
+
+						convert_scale_image(temp3.data(), out_format, out_w, out_h, out_pitch,
+							pixels_src, in_format, in_w, in_h, in_pitch, slice_h, in_inter == blit_engine::transfer_interpolator::foh);
+					}
+
+					pixels_src = temp3.data();
+					in_pitch = out_pitch;
+				}
+
+				// It looks like rsx may ignore the requested swizzle size and just always
+				// round up to nearest power of 2
+				/*u8 sw_width_log2 = method_registers.nv309e_sw_width_log2();
+				u8 sw_height_log2 = method_registers.nv309e_sw_height_log2();
+
+				// 0 indicates height of 1 pixel
+				sw_height_log2 = sw_height_log2 == 0 ? 1 : sw_height_log2;
+
+				// swizzle based on destination size
+				u16 sw_width = 1 << sw_width_log2;
+				u16 sw_height = 1 << sw_height_log2;
+				*/
+
+				u32 sw_width = next_pow2(out_w);
+				u32 sw_height = next_pow2(out_h);
+
+				u8* linear_pixels = pixels_src;
+				u8* swizzled_pixels = pixels_dst;
+
+				// Check and pad texture out if we are given non power of 2 output
+				if (sw_width != out_w || sw_height != out_h)
+				{
+					sw_temp.resize(out_bpp * sw_width * sw_height);
+
+					switch (out_bpp)
+					{
+					case 1:
+						pad_texture<u8>(linear_pixels, sw_temp.data(), out_w, out_h, sw_width, sw_height);
+						break;
+					case 2:
+						pad_texture<u16>(linear_pixels, sw_temp.data(), out_w, out_h, sw_width, sw_height);
+						break;
+					case 4:
+						pad_texture<u32>(linear_pixels, sw_temp.data(), out_w, out_h, sw_width, sw_height);
+						break;
+					}
+
+					linear_pixels = sw_temp.data();
+				}
+
+				switch (out_bpp)
+				{
+				case 1:
+					convert_linear_swizzle<u8, false>(linear_pixels, swizzled_pixels, sw_width, sw_height, in_pitch);
+					break;
+				case 2:
+					convert_linear_swizzle<u16, false>(linear_pixels, swizzled_pixels, sw_width, sw_height, in_pitch);
+					break;
+				case 4:
+					convert_linear_swizzle<u32, false>(linear_pixels, swizzled_pixels, sw_width, sw_height, in_pitch);
+					break;
+				}
+			}
+		}
+	}
+
+	namespace nv0039
+	{
+		void buffer_notify(thread* rsx, u32, u32 arg)
+		{
+			s32 in_pitch = method_registers.nv0039_input_pitch();
+			s32 out_pitch = method_registers.nv0039_output_pitch();
+			const u32 line_length = method_registers.nv0039_line_length();
+			const u32 line_count = method_registers.nv0039_line_count();
+			const u8 out_format = method_registers.nv0039_output_format();
+			const u8 in_format = method_registers.nv0039_input_format();
+			const u32 notify = arg;
+
+			// The existing GCM commands use only the value 0x1 for inFormat and outFormat
+			if (in_format != 0x01 || out_format != 0x01)
+			{
+				rsx_log.error("NV0039_BUFFER_NOTIFY: Unsupported format: inFormat=%d, outFormat=%d", in_format, out_format);
+			}
+
+			if (!line_count || !line_length)
+			{
+				rsx_log.warning("NV0039_BUFFER_NOTIFY NOPed out: pitch(in=0x%x, out=0x%x), line(len=0x%x, cnt=0x%x), fmt(in=0x%x, out=0x%x), notify=0x%x",
+					in_pitch, out_pitch, line_length, line_count, in_format, out_format, notify);
+				return;
+			}
+
+			rsx_log.trace("NV0039_BUFFER_NOTIFY: pitch(in=0x%x, out=0x%x), line(len=0x%x, cnt=0x%x), fmt(in=0x%x, out=0x%x), notify=0x%x",
+				in_pitch, out_pitch, line_length, line_count, in_format, out_format, notify);
+
+			u32 src_offset = method_registers.nv0039_input_offset();
+			u32 src_dma = method_registers.nv0039_input_location();
+
+			u32 dst_offset = method_registers.nv0039_output_offset();
+			u32 dst_dma = method_registers.nv0039_output_location();
+
+			const bool is_block_transfer = (in_pitch == out_pitch && out_pitch + 0u == line_length);
+			const auto read_address = get_address(src_offset, src_dma);
+			const auto write_address = get_address(dst_offset, dst_dma);
+			const auto read_length = in_pitch * (line_count - 1) + line_length;
+			const auto write_length = out_pitch * (line_count - 1) + line_length;
+
+			rsx->invalidate_fragment_program(dst_dma, dst_offset, write_length);
+
+			if (const auto result = rsx->read_barrier(read_address, read_length, !is_block_transfer);
+				result == rsx::result_zcull_intr)
+			{
+				// This transfer overlaps will zcull data pool
+				if (rsx->copy_zcull_stats(read_address, read_length, write_address) == write_length)
+				{
+					// All writes deferred
+					return;
+				}
+			}
+
+			auto res = ::rsx::reservation_lock<true>(write_address, write_length, read_address, read_length);
+
+			u8 *dst = vm::_ptr<u8>(write_address);
+			const u8 *src = vm::_ptr<u8>(read_address);
+
+			const bool is_overlapping = dst_dma == src_dma && [&]() -> bool
+			{
+				const u32 src_max = src_offset + read_length;
+				const u32 dst_max = dst_offset + (out_pitch * (line_count - 1) + line_length);
+				return (src_offset >= dst_offset && src_offset < dst_max) ||
+				 (dst_offset >= src_offset && dst_offset < src_max);
+			}();
+
+			if (is_overlapping)
+			{
+				if (is_block_transfer)
+				{
+					std::memmove(dst, src, read_length);
+				}
+				else
+				{
+					std::vector<u8> temp(line_length * line_count);
+					u8* buf = temp.data();
+
+					for (u32 y = 0; y < line_count; ++y)
+					{
+						std::memcpy(buf, src, line_length);
+						buf += line_length;
+						src += in_pitch;
+					}
+
+					buf = temp.data();
+
+					for (u32 y = 0; y < line_count; ++y)
+					{
+						std::memcpy(dst, buf, line_length);
+						buf += line_length;
+						dst += out_pitch;
+					}
+				}
+			}
+			else
+			{
+				if (is_block_transfer)
+				{
+					std::memcpy(dst, src, read_length);
+				}
+				else
+				{
+					for (u32 i = 0; i < line_count; ++i)
+					{
+						std::memcpy(dst, src, line_length);
+						dst += out_pitch;
+						src += in_pitch;
+					}
+				}
+			}
+
+			//res->release(0);
+		}
+	}
+
+	void flip_command(thread* rsx, u32, u32 arg)
+	{
+		ensure(rsx->isHLE);
+		rsx->reset();
+		rsx->request_emu_flip(arg);
+	}
+
+	void user_command(thread* rsx, u32, u32 arg)
+	{
+		if (!rsx->isHLE)
 		{
 			sys_rsx_context_attribute(0x55555555, 0xFEF, 0, arg, 0, 0);
 			return;
 		}
 
-		if (auto ptr = RSX(ctx)->user_handler)
+		if (rsx->user_handler)
 		{
-			RSX(ctx)->intr_thread->cmd_list
+			rsx->intr_thread->cmd_list
 			({
 				{ ppu_cmd::set_args, 1 }, u64{arg},
-				{ ppu_cmd::lle_call, ptr },
+				{ ppu_cmd::lle_call, rsx->user_handler },
 				{ ppu_cmd::sleep, 0 }
 			});
 
-			RSX(ctx)->intr_thread->cmd_notify.store(1);
-			RSX(ctx)->intr_thread->cmd_notify.notify_one();
+			rsx->intr_thread->cmd_notify++;
+			rsx->intr_thread->cmd_notify.notify_one();
 		}
 	}
 
@@ -92,7 +1699,7 @@ namespace rsx
 		template<u32 index>
 		struct driver_flip
 		{
-			static void impl(context*, u32 /*reg*/, u32 arg)
+			static void impl(thread* /*rsx*/, u32 /*reg*/, u32 arg)
 			{
 				sys_rsx_context_attribute(0x55555555, 0x102, index, arg, 0, 0);
 			}
@@ -101,13 +1708,8 @@ namespace rsx
 		template<u32 index>
 		struct queue_flip
 		{
-			static void impl(context* ctx, u32 /*reg*/, u32 arg)
+			static void impl(thread* /*rsx*/, u32 /*reg*/, u32 arg)
 			{
-				if (RSX(ctx)->vblank_at_flip != umax)
-				{
-					RSX(ctx)->flip_notification_count++;
-				}
-
 				sys_rsx_context_attribute(0x55555555, 0x103, index, arg, 0, 0);
 			}
 		};
@@ -115,14 +1717,14 @@ namespace rsx
 
 	namespace fifo
 	{
-		void draw_barrier(context* ctx, u32, u32)
+		void draw_barrier(thread* rsx, u32, u32)
 		{
-			if (RSX(ctx)->in_begin_end)
+			if (rsx->in_begin_end)
 			{
-				if (!REGS(ctx)->current_draw_clause.is_disjoint_primitive)
+				if (!method_registers.current_draw_clause.is_disjoint_primitive)
 				{
 					// Enable primitive barrier request
-					REGS(ctx)->current_draw_clause.primitive_barrier_enable = true;
+					method_registers.current_draw_clause.primitive_barrier_enable = true;
 				}
 			}
 		}
@@ -132,11 +1734,8 @@ namespace rsx
 	{
 		// Reset all regsiters
 		registers.fill(0);
-		state_signals.fill(0);
 		transform_program.fill(0);
 		transform_constants = {};
-		current_draw_clause = {};
-		register_vertex_info = {};
 
 		// Special values set at initialization, these are not set by a context reset
 		registers[NV4097_SET_SHADER_PROGRAM] = (0 << 2) | (CELL_GCM_LOCATION_LOCAL + 1);
@@ -154,6 +1753,7 @@ namespace rsx
 		registers[NV406E_SET_CONTEXT_DMA_SEMAPHORE] = CELL_GCM_CONTEXT_DMA_SEMAPHORE_R;
 		registers[NV4097_SET_CONTEXT_DMA_SEMAPHORE] = CELL_GCM_CONTEXT_DMA_SEMAPHORE_RW;
 
+		if (get_current_renderer()->isHLE)
 		{
 			// Commands injected by cellGcmInit
 			registers[NV406E_SEMAPHORE_OFFSET] = 0x30;
@@ -685,111 +2285,7 @@ namespace rsx
 			registers[NV308A_POINT] = 0x0;
 			registers[NV308A_SIZE_OUT] = 0x0;
 			registers[NV308A_SIZE_IN] = 0x0;
-			registers[NV406E_SET_REFERENCE] = umax;
-
-			if (auto rsx = Emu.IsStopped() ? nullptr : get_current_renderer(); rsx && rsx->ctrl)
-			{
-				// FIXME: Multi-context unaware
-				rsx->ctrl->ref = u32{ umax };
-			}
-		}
-
-		{
-			// Signal definitions
-			state_signals[NV4097_SET_SHADER_CONTROL] = rsx::fragment_program_state_dirty;
-			state_signals[NV4097_SET_TEX_COORD_CONTROL + 0] = rsx::fragment_program_state_dirty;
-			state_signals[NV4097_SET_TEX_COORD_CONTROL + 1] = rsx::fragment_program_state_dirty;
-			state_signals[NV4097_SET_TEX_COORD_CONTROL + 2] = rsx::fragment_program_state_dirty;
-			state_signals[NV4097_SET_TEX_COORD_CONTROL + 3] = rsx::fragment_program_state_dirty;
-			state_signals[NV4097_SET_TEX_COORD_CONTROL + 4] = rsx::fragment_program_state_dirty;
-			state_signals[NV4097_SET_TEX_COORD_CONTROL + 5] = rsx::fragment_program_state_dirty;
-			state_signals[NV4097_SET_TEX_COORD_CONTROL + 6] = rsx::fragment_program_state_dirty;
-			state_signals[NV4097_SET_TEX_COORD_CONTROL + 7] = rsx::fragment_program_state_dirty;
-			state_signals[NV4097_SET_TEX_COORD_CONTROL + 8] = rsx::fragment_program_state_dirty;
-			state_signals[NV4097_SET_TEX_COORD_CONTROL + 9] = rsx::fragment_program_state_dirty;
-			state_signals[NV4097_SET_TWO_SIDE_LIGHT_EN] = rsx::fragment_program_state_dirty;
-			state_signals[NV4097_SET_POINT_SPRITE_CONTROL] = rsx::fragment_program_state_dirty;
-			state_signals[NV4097_SET_USER_CLIP_PLANE_CONTROL] = rsx::vertex_state_dirty;
-			state_signals[NV4097_SET_TRANSFORM_BRANCH_BITS] = rsx::vertex_state_dirty;
-			state_signals[NV4097_SET_CLIP_MIN] = rsx::invalidate_zclip_bits;
-			state_signals[NV4097_SET_CLIP_MAX] = rsx::invalidate_zclip_bits;
-			state_signals[NV4097_SET_POINT_SIZE] = rsx::vertex_state_dirty;
-			state_signals[NV4097_SET_ALPHA_FUNC] = rsx::fragment_state_dirty;
-			state_signals[NV4097_SET_ALPHA_REF] = rsx::fragment_state_dirty;
-			state_signals[NV4097_SET_ALPHA_TEST_ENABLE] = rsx::fragment_state_dirty;
-			state_signals[NV4097_SET_ANTI_ALIASING_CONTROL] = rsx::fragment_state_dirty | rsx::pipeline_config_dirty;
-			state_signals[NV4097_SET_SHADER_PACKER] = rsx::fragment_state_dirty;
-			state_signals[NV4097_SET_SHADER_WINDOW] = rsx::fragment_state_dirty;
-			state_signals[NV4097_SET_FOG_MODE] = rsx::fragment_state_dirty;
-			state_signals[NV4097_SET_SCISSOR_HORIZONTAL] = rsx::scissor_config_state_dirty;
-			state_signals[NV4097_SET_SCISSOR_VERTICAL] = rsx::scissor_config_state_dirty;
-			state_signals[NV4097_SET_VIEWPORT_HORIZONTAL] = rsx::scissor_config_state_dirty;
-			state_signals[NV4097_SET_VIEWPORT_VERTICAL] = rsx::scissor_config_state_dirty;
-			state_signals[NV4097_SET_FOG_PARAMS + 0] = rsx::fragment_state_dirty;
-			state_signals[NV4097_SET_FOG_PARAMS + 1] = rsx::fragment_state_dirty;
-			state_signals[NV4097_SET_VIEWPORT_SCALE + 0] = rsx::vertex_state_dirty;
-			state_signals[NV4097_SET_VIEWPORT_SCALE + 1] = rsx::vertex_state_dirty;
-			state_signals[NV4097_SET_VIEWPORT_SCALE + 2] = rsx::vertex_state_dirty;
-			state_signals[NV4097_SET_VIEWPORT_OFFSET + 0] = rsx::vertex_state_dirty;
-			state_signals[NV4097_SET_VIEWPORT_OFFSET + 1] = rsx::vertex_state_dirty;
-			state_signals[NV4097_SET_VIEWPORT_OFFSET + 2] = rsx::vertex_state_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE] = rsx::fragment_state_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 0] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 1] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 2] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 3] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 4] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 5] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 6] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 7] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 8] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 9] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 10] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 11] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 12] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 13] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 14] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 15] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 16] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 17] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 18] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 19] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 20] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 21] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 22] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 23] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 24] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 25] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 26] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 27] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 28] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 29] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 30] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLYGON_STIPPLE_PATTERN + 31] = rsx::polygon_stipple_pattern_dirty;
-			state_signals[NV4097_SET_POLY_OFFSET_FILL_ENABLE] = rsx::polygon_offset_state_dirty;
-			state_signals[NV4097_SET_POLYGON_OFFSET_SCALE_FACTOR] = rsx::polygon_offset_state_dirty;
-			state_signals[NV4097_SET_POLYGON_OFFSET_BIAS] = rsx::polygon_offset_state_dirty;
-			state_signals[NV4097_SET_DEPTH_BOUNDS_TEST_ENABLE] = rsx::depth_bounds_state_dirty;
-			state_signals[NV4097_SET_DEPTH_BOUNDS_MIN] = rsx::depth_bounds_state_dirty;
-			state_signals[NV4097_SET_DEPTH_BOUNDS_MAX] = rsx::depth_bounds_state_dirty;
-			state_signals[NV4097_SET_CULL_FACE_ENABLE] = rsx::pipeline_config_dirty;
-			state_signals[NV4097_SET_ZMIN_MAX_CONTROL] = rsx::pipeline_config_dirty;
-			state_signals[NV4097_SET_LOGIC_OP_ENABLE] = rsx::pipeline_config_dirty;
-			state_signals[NV4097_SET_LOGIC_OP] = rsx::pipeline_config_dirty;
-			state_signals[NV4097_SET_BLEND_ENABLE] = rsx::pipeline_config_dirty;
-			state_signals[NV4097_SET_BLEND_ENABLE_MRT] = rsx::pipeline_config_dirty;
-			state_signals[NV4097_SET_STENCIL_FUNC] = rsx::pipeline_config_dirty;
-			state_signals[NV4097_SET_BACK_STENCIL_FUNC] = rsx::pipeline_config_dirty;
-			state_signals[NV4097_SET_RESTART_INDEX_ENABLE] = rsx::pipeline_config_dirty;
-		}
-
-		// Sanity checks
-		for (size_t id = 0; id < methods.size(); ++id)
-		{
-			if (methods[id] && state_signals[id])
-			{
-				rsx_log.error("FIXME: Method register 0x%x is registered as a method and signal. The signal will be ignored.");
-			}
+			registers[NV406E_SET_REFERENCE] = get_current_renderer()->ctrl->ref = 0xffffffff;
 		}
 	}
 
@@ -1202,7 +2698,7 @@ namespace rsx
 	void rsx_state::decode(u32 reg, u32 value)
 	{
 		// Store new value and save previous
-		latch = std::exchange(registers[reg], value);
+		register_previous_value = std::exchange(registers[reg], value);
 	}
 
 	bool rsx_state::test(u32 reg, u32 value) const
@@ -1210,6 +2706,108 @@ namespace rsx
 		return registers[reg] == value;
 	}
 
+	void draw_clause::insert_command_barrier(command_barrier_type type, u32 arg, u32 index)
+	{
+		ensure(!draw_command_ranges.empty());
+
+		auto _do_barrier_insert = [this](barrier_t&& val)
+		{
+			if (draw_command_barriers.empty() || draw_command_barriers.back() < val)
+			{
+				draw_command_barriers.push_back(val);
+				return;
+			}
+
+			for (auto it = draw_command_barriers.begin(); it != draw_command_barriers.end(); it++)
+			{
+				if (*it < val)
+				{
+					continue;
+				}
+
+				draw_command_barriers.insert(it, val);
+				break;
+			}
+		};
+
+		if (type == primitive_restart_barrier)
+		{
+			// Rasterization flow barrier
+			const auto& last = draw_command_ranges[current_range_index];
+			const auto address = last.first + last.count;
+
+			_do_barrier_insert({ current_range_index, 0, address, index, arg, 0, type });
+		}
+		else
+		{
+			// Execution dependency barrier. Requires breaking the current draw call sequence and start another.
+			if (draw_command_ranges.back().count > 0)
+			{
+				append_draw_command({});
+			}
+			else
+			{
+				// In case of back-to-back modifiers, do not add duplicates
+				current_range_index = draw_command_ranges.size() - 1;
+			}
+
+			_do_barrier_insert({ current_range_index, get_system_time(), ~0u, index, arg, 0, type });
+			last_execution_barrier_index = current_range_index;
+		}
+	}
+
+	void draw_clause::reset(primitive_type type)
+	{
+		current_range_index = ~0u;
+		last_execution_barrier_index = 0;
+
+		command = draw_command::none;
+		primitive = type;
+		primitive_barrier_enable = false;
+
+		draw_command_ranges.clear();
+		draw_command_barriers.clear();
+		inline_vertex_array.clear();
+
+		is_disjoint_primitive = is_primitive_disjointed(primitive);
+	}
+
+	u32 draw_clause::execute_pipeline_dependencies() const
+	{
+		u32 result = 0;
+
+		for (const auto &barrier : draw_command_barriers)
+		{
+			if (barrier.draw_id != current_range_index)
+				continue;
+
+			switch (barrier.type)
+			{
+			case primitive_restart_barrier:
+				break;
+			case index_base_modifier_barrier:
+				// Change index base offset
+				method_registers.decode(NV4097_SET_VERTEX_DATA_BASE_INDEX, barrier.arg);
+				result |= index_base_changed;
+				break;
+			case vertex_base_modifier_barrier:
+				// Change vertex base offset
+				method_registers.decode(NV4097_SET_VERTEX_DATA_BASE_OFFSET, barrier.arg);
+				result |= vertex_base_changed;
+				break;
+			case vertex_array_offset_modifier_barrier:
+				// Change vertex array offset
+				method_registers.decode(NV4097_SET_VERTEX_DATA_ARRAY_OFFSET + barrier.index, barrier.arg);
+				result |= vertex_arrays_changed;
+				break;
+			default:
+				fmt::throw_exception("Unreachable");
+			}
+		}
+
+		return result;
+	}
+
 	namespace method_detail
 	{
 		template <u32 Id, u32 Step, u32 Count, template<u32> class T, u32 Index = 0>
@@ -1233,6 +2831,25 @@ namespace rsx
 
 			bind_range_impl_t<Id, Step, Count, T, Index>::impl();
 		}
+
+		template<u32 Id, rsx_method_t Func>
+		static void bind()
+		{
+			static_assert(Id < 0x10000 / 4);
+
+			methods[Id] = Func;
+		}
+
+		template <u32 Id, u32 Step, u32 Count, rsx_method_t Func>
+		static void bind_array()
+		{
+			static_assert(Step && Count && Id + u64{Step} * (Count - 1) < 0x10000 / 4);
+
+			for (u32 i = Id; i < Id + Count * Step; i += Step)
+			{
+				methods[i] = Func;
+			}
+		}
 	}
 
 	// TODO: implement this as virtual function: rsx::thread::init_methods() or something
@@ -1243,21 +2860,6 @@ namespace rsx
 
 		methods.fill(&invalid_method);
 
-		auto bind = [](u32 id, rsx_method_t func)
-		{
-			::at32(methods, id) = func;
-		};
-
-		auto bind_array = [](u32 id, u32 step, u32 count, rsx_method_t func)
-		{
-			ensure(step && count && id + u64{step} * (count - 1) < 0x10000 / 4);
-
-			for (u32 i = id; i < id + count * step; i += step)
-			{
-				methods[i] = func;
-			}
-		};
-
 		// NV40_CHANNEL_DMA (NV406E)
 		methods[NV406E_SET_REFERENCE]                     = nullptr;
 		methods[NV406E_SET_CONTEXT_DMA_SEMAPHORE]         = nullptr;
@@ -1509,7 +3111,6 @@ namespace rsx
 
 		// NV03_MEMORY_TO_MEMORY_FORMAT	(NV0039)
 		methods[NV0039_SET_OBJECT]                        = nullptr;
-		bind(0x2100 >> 2, trace_method);
 		methods[NV0039_SET_CONTEXT_DMA_NOTIFIES]          = nullptr;
 		methods[NV0039_SET_CONTEXT_DMA_BUFFER_IN]         = nullptr;
 		methods[NV0039_SET_CONTEXT_DMA_BUFFER_OUT]        = nullptr;
@@ -1584,51 +3185,50 @@ namespace rsx
 		methods[GCM_SET_DRIVER_OBJECT]                    = nullptr;
 		methods[FIFO::FIFO_DRAW_BARRIER >> 2]             = nullptr;
 
-		bind_array(GCM_FLIP_HEAD, 1, 2, nullptr);
-		bind_array(GCM_DRIVER_QUEUE, 1, 8, nullptr);
+		bind_array<GCM_FLIP_HEAD, 1, 2, nullptr>();
+		bind_array<GCM_DRIVER_QUEUE, 1, 8, nullptr>();
 
-		bind_array(0x400 >> 2, 1, 0x10, nullptr);
-		bind_array(0x440 >> 2, 1, 0x20, nullptr);
-		bind_array(NV4097_SET_ANISO_SPREAD, 1, 16, nullptr);
-		bind_array(NV4097_SET_VERTEX_TEXTURE_OFFSET, 1, 8 * 4, nullptr);
-		bind_array(NV4097_SET_VERTEX_DATA_SCALED4S_M, 1, 32, nullptr);
-		bind_array(NV4097_SET_TEXTURE_CONTROL2, 1, 16, nullptr);
-		bind_array(NV4097_SET_TEX_COORD_CONTROL, 1, 10, nullptr);
-		bind_array(NV4097_SET_TRANSFORM_PROGRAM, 1, 32, nullptr);
-		bind_array(NV4097_SET_POLYGON_STIPPLE_PATTERN, 1, 32, nullptr);
-		bind_array(NV4097_SET_VERTEX_DATA3F_M, 1, 64, nullptr);
-		bind_array(NV4097_SET_VERTEX_DATA_ARRAY_OFFSET, 1, 16, nullptr);
-		bind_array(NV4097_SET_VERTEX_DATA_ARRAY_FORMAT, 1, 16, nullptr);
-		bind_array(NV4097_SET_TEXTURE_CONTROL3, 1, 16, nullptr);
-		bind_array(NV4097_SET_VERTEX_DATA2F_M, 1, 32, nullptr);
-		bind_array(NV4097_SET_VERTEX_DATA2S_M, 1, 16, nullptr);
-		bind_array(NV4097_SET_VERTEX_DATA4UB_M, 1, 16, nullptr);
-		bind_array(NV4097_SET_VERTEX_DATA4S_M, 1, 32, nullptr);
-		bind_array(NV4097_SET_TEXTURE_OFFSET, 1, 8 * 16, nullptr);
-		bind_array(NV4097_SET_VERTEX_DATA4F_M, 1, 64, nullptr);
-		bind_array(NV4097_SET_VERTEX_DATA1F_M, 1, 16, nullptr);
-		bind_array(NV4097_SET_COLOR_KEY_COLOR, 1, 16, nullptr);
+		bind_array<(0x400 >> 2), 1, 0x10, nullptr>();
+		bind_array<(0x440 >> 2), 1, 0x20, nullptr>();
+		bind_array<NV4097_SET_ANISO_SPREAD, 1, 16, nullptr>();
+		bind_array<NV4097_SET_VERTEX_TEXTURE_OFFSET, 1, 8 * 4, nullptr>();
+		bind_array<NV4097_SET_VERTEX_DATA_SCALED4S_M, 1, 32, nullptr>();
+		bind_array<NV4097_SET_TEXTURE_CONTROL2, 1, 16, nullptr>();
+		bind_array<NV4097_SET_TEX_COORD_CONTROL, 1, 10, nullptr>();
+		bind_array<NV4097_SET_TRANSFORM_PROGRAM, 1, 32, nullptr>();
+		bind_array<NV4097_SET_POLYGON_STIPPLE_PATTERN, 1, 32, nullptr>();
+		bind_array<NV4097_SET_VERTEX_DATA3F_M, 1, 64, nullptr>();
+		bind_array<NV4097_SET_VERTEX_DATA_ARRAY_OFFSET, 1, 16, nullptr>();
+		bind_array<NV4097_SET_VERTEX_DATA_ARRAY_FORMAT, 1, 16, nullptr>();
+		bind_array<NV4097_SET_TEXTURE_CONTROL3, 1, 16, nullptr>();
+		bind_array<NV4097_SET_VERTEX_DATA2F_M, 1, 32, nullptr>();
+		bind_array<NV4097_SET_VERTEX_DATA2S_M, 1, 16, nullptr>();
+		bind_array<NV4097_SET_VERTEX_DATA4UB_M, 1, 16, nullptr>();
+		bind_array<NV4097_SET_VERTEX_DATA4S_M, 1, 32, nullptr>();
+		bind_array<NV4097_SET_TEXTURE_OFFSET, 1, 8 * 16, nullptr>();
+		bind_array<NV4097_SET_VERTEX_DATA4F_M, 1, 64, nullptr>();
+		bind_array<NV4097_SET_VERTEX_DATA1F_M, 1, 16, nullptr>();
+		bind_array<NV4097_SET_COLOR_KEY_COLOR, 1, 16, nullptr>();
 
 		// Unknown (NV4097?)
-		bind(0x171c >> 2, trace_method);
+		bind<(0x171c >> 2), trace_method>();
 
 		// NV406E
-		bind(NV406E_SET_REFERENCE, nv406e::set_reference);
-		bind(NV406E_SEMAPHORE_ACQUIRE, nv406e::semaphore_acquire);
-		bind(NV406E_SEMAPHORE_RELEASE, nv406e::semaphore_release);
+		bind<NV406E_SET_REFERENCE, nv406e::set_reference>();
+		bind<NV406E_SEMAPHORE_ACQUIRE, nv406e::semaphore_acquire>();
+		bind<NV406E_SEMAPHORE_RELEASE, nv406e::semaphore_release>();
 
 		// NV4097
-		bind(NV4097_SET_CULL_FACE, nv4097::set_face_property);
-		bind(NV4097_SET_FRONT_FACE, nv4097::set_face_property);
-		bind(NV4097_TEXTURE_READ_SEMAPHORE_RELEASE, nv4097::texture_read_semaphore_release);
-		bind(NV4097_BACK_END_WRITE_SEMAPHORE_RELEASE, nv4097::back_end_write_semaphore_release);
-		bind(NV4097_SET_BEGIN_END, nv4097::set_begin_end);
-		bind(NV4097_CLEAR_SURFACE, nv4097::clear);
-		bind(NV4097_DRAW_ARRAYS, nv4097::draw_arrays);
-		bind(NV4097_DRAW_INDEX_ARRAY, nv4097::draw_index_array);
-		bind(NV4097_INLINE_ARRAY, nv4097::draw_inline_array);
-		bind(NV4097_ARRAY_ELEMENT16, nv4097::set_array_element16);
-		bind(NV4097_ARRAY_ELEMENT32, nv4097::set_array_element32);
+		bind<NV4097_SET_CULL_FACE, nv4097::set_cull_face>();
+		bind<NV4097_TEXTURE_READ_SEMAPHORE_RELEASE, nv4097::texture_read_semaphore_release>();
+		bind<NV4097_BACK_END_WRITE_SEMAPHORE_RELEASE, nv4097::back_end_write_semaphore_release>();
+		bind<NV4097_SET_BEGIN_END, nv4097::set_begin_end>();
+		bind<NV4097_CLEAR_SURFACE, nv4097::clear>();
+		bind<NV4097_DRAW_ARRAYS, nv4097::draw_arrays>();
+		bind<NV4097_DRAW_INDEX_ARRAY, nv4097::draw_index_array>();
+		bind<NV4097_INLINE_ARRAY, nv4097::draw_inline_array>();
+		bind<NV4097_ARRAY_ELEMENT16, nv4097::set_array_element16>();
+		bind<NV4097_ARRAY_ELEMENT32, nv4097::set_array_element32>();
 		bind_range<NV4097_SET_VERTEX_DATA_SCALED4S_M, 1, 32, nv4097::set_vertex_data_scaled4s_m>();
 		bind_range<NV4097_SET_VERTEX_DATA4UB_M, 1, 16, nv4097::set_vertex_data4ub_m>();
 		bind_range<NV4097_SET_VERTEX_DATA1F_M, 1, 16, nv4097::set_vertex_data1f_m>();
@@ -1637,42 +3237,40 @@ namespace rsx
 		bind_range<NV4097_SET_VERTEX_DATA4F_M, 1, 64, nv4097::set_vertex_data4f_m>();
 		bind_range<NV4097_SET_VERTEX_DATA2S_M, 1, 16, nv4097::set_vertex_data2s_m>();
 		bind_range<NV4097_SET_VERTEX_DATA4S_M, 1, 32, nv4097::set_vertex_data4s_m>();
-		bind(NV4097_SET_TRANSFORM_CONSTANT_LOAD, nv4097::set_transform_constant_load);
-		bind_array(NV4097_SET_TRANSFORM_CONSTANT, 1, 32, nv4097::set_transform_constant::impl);
-		bind_array(NV4097_SET_TRANSFORM_PROGRAM, 1, 32, nv4097::set_transform_program::impl);
-		bind(NV4097_GET_REPORT, nv4097::get_report);
-		bind(NV4097_CLEAR_REPORT_VALUE, nv4097::clear_report_value);
-		bind(NV4097_SET_SURFACE_CLIP_HORIZONTAL, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_SURFACE_CLIP_VERTICAL, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_SURFACE_COLOR_AOFFSET, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_SURFACE_COLOR_BOFFSET, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_SURFACE_COLOR_COFFSET, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_SURFACE_COLOR_DOFFSET, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_SURFACE_COLOR_TARGET, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_SURFACE_ZETA_OFFSET, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_CONTEXT_DMA_COLOR_A, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_CONTEXT_DMA_COLOR_B, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_CONTEXT_DMA_COLOR_C, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_CONTEXT_DMA_COLOR_D, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_CONTEXT_DMA_ZETA, nv4097::set_surface_dirty_bit);
-		bind(NV4097_NOTIFY, nv4097::set_notify);
-		bind(NV4097_SET_SURFACE_FORMAT, nv4097::set_surface_format);
-		bind(NV4097_SET_SURFACE_PITCH_A, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_SURFACE_PITCH_B, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_SURFACE_PITCH_C, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_SURFACE_PITCH_D, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_SURFACE_PITCH_Z, nv4097::set_surface_dirty_bit);
-		bind(NV4097_SET_WINDOW_OFFSET, nv4097::set_surface_dirty_bit);
-		bind_range<NV4097_SET_TEXTURE_OFFSET, 8, 16, nv4097::set_fragment_texture_dirty_bit>();
-		bind_range<NV4097_SET_TEXTURE_FORMAT, 8, 16, nv4097::set_fragment_texture_dirty_bit>();
-		bind_range<NV4097_SET_TEXTURE_ADDRESS, 8, 16, nv4097::set_fragment_texture_dirty_bit>();
-		bind_range<NV4097_SET_TEXTURE_CONTROL0, 8, 16, nv4097::set_fragment_texture_dirty_bit>();
-		bind_range<NV4097_SET_TEXTURE_CONTROL1, 8, 16, nv4097::set_fragment_texture_dirty_bit>();
-		bind_range<NV4097_SET_TEXTURE_FILTER, 8, 16, nv4097::set_fragment_texture_dirty_bit>();
-		bind_range<NV4097_SET_TEXTURE_IMAGE_RECT, 8, 16, nv4097::set_fragment_texture_dirty_bit>();
-		bind_range<NV4097_SET_TEXTURE_BORDER_COLOR, 8, 16, nv4097::set_fragment_texture_dirty_bit>();
-		bind_range<NV4097_SET_TEXTURE_CONTROL2, 1, 16, nv4097::set_fragment_texture_dirty_bit>();
-		bind_range<NV4097_SET_TEXTURE_CONTROL3, 1, 16, nv4097::set_fragment_texture_dirty_bit>();
+		bind_range<NV4097_SET_TRANSFORM_CONSTANT, 1, 32, nv4097::set_transform_constant>();
+		bind_range<NV4097_SET_TRANSFORM_PROGRAM, 1, 32, nv4097::set_transform_program>();
+		bind<NV4097_GET_REPORT, nv4097::get_report>();
+		bind<NV4097_CLEAR_REPORT_VALUE, nv4097::clear_report_value>();
+		bind<NV4097_SET_SURFACE_CLIP_HORIZONTAL, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_SURFACE_CLIP_VERTICAL, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_SURFACE_COLOR_AOFFSET, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_SURFACE_COLOR_BOFFSET, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_SURFACE_COLOR_COFFSET, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_SURFACE_COLOR_DOFFSET, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_SURFACE_ZETA_OFFSET, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_CONTEXT_DMA_COLOR_A, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_CONTEXT_DMA_COLOR_B, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_CONTEXT_DMA_COLOR_C, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_CONTEXT_DMA_COLOR_D, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_CONTEXT_DMA_ZETA, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_NOTIFY, nv4097::set_notify>();
+		bind<NV4097_SET_SURFACE_FORMAT, nv4097::set_surface_format>();
+		bind<NV4097_SET_SURFACE_PITCH_A, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_SURFACE_PITCH_B, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_SURFACE_PITCH_C, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_SURFACE_PITCH_D, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_SURFACE_PITCH_Z, nv4097::set_surface_dirty_bit>();
+		bind<NV4097_SET_WINDOW_OFFSET, nv4097::set_surface_dirty_bit>();
+		bind_range<NV4097_SET_TEXTURE_OFFSET, 8, 16, nv4097::set_texture_dirty_bit>();
+		bind_range<NV4097_SET_TEXTURE_FORMAT, 8, 16, nv4097::set_texture_dirty_bit>();
+		bind_range<NV4097_SET_TEXTURE_ADDRESS, 8, 16, nv4097::set_texture_dirty_bit>();
+		bind_range<NV4097_SET_TEXTURE_CONTROL0, 8, 16, nv4097::set_texture_dirty_bit>();
+		bind_range<NV4097_SET_TEXTURE_CONTROL1, 8, 16, nv4097::set_texture_dirty_bit>();
+		bind_range<NV4097_SET_TEXTURE_CONTROL2, 1, 16, nv4097::set_texture_dirty_bit>();
+		bind_range<NV4097_SET_TEXTURE_CONTROL3, 1, 16, nv4097::set_texture_dirty_bit>();
+		bind_range<NV4097_SET_TEXTURE_FILTER, 8, 16, nv4097::set_texture_dirty_bit>();
+		bind_range<NV4097_SET_TEXTURE_IMAGE_RECT, 8, 16, nv4097::set_texture_dirty_bit>();
+		bind_range<NV4097_SET_TEXTURE_BORDER_COLOR, 8, 16, nv4097::set_texture_dirty_bit>();
 		bind_range<NV4097_SET_VERTEX_TEXTURE_OFFSET, 8, 4, nv4097::set_vertex_texture_dirty_bit>();
 		bind_range<NV4097_SET_VERTEX_TEXTURE_FORMAT, 8, 4, nv4097::set_vertex_texture_dirty_bit>();
 		bind_range<NV4097_SET_VERTEX_TEXTURE_ADDRESS, 8, 4, nv4097::set_vertex_texture_dirty_bit>();
@@ -1681,62 +3279,90 @@ namespace rsx
 		bind_range<NV4097_SET_VERTEX_TEXTURE_FILTER, 8, 4, nv4097::set_vertex_texture_dirty_bit>();
 		bind_range<NV4097_SET_VERTEX_TEXTURE_IMAGE_RECT, 8, 4, nv4097::set_vertex_texture_dirty_bit>();
 		bind_range<NV4097_SET_VERTEX_TEXTURE_BORDER_COLOR, 8, 4, nv4097::set_vertex_texture_dirty_bit>();
-		bind(NV4097_SET_RENDER_ENABLE, nv4097::set_render_mode);
-		bind(NV4097_SET_ZCULL_EN, nv4097::set_zcull_render_enable);
-		bind(NV4097_SET_ZCULL_STATS_ENABLE, nv4097::set_zcull_stats_enable);
-		bind(NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE, nv4097::set_zcull_pixel_count_enable);
-		bind(NV4097_CLEAR_ZCULL_SURFACE, nv4097::clear_zcull);
-		bind(NV4097_SET_DEPTH_TEST_ENABLE, nv4097::set_surface_options_dirty_bit);
-		bind(NV4097_SET_DEPTH_FUNC, nv4097::set_surface_options_dirty_bit);
-		bind(NV4097_SET_DEPTH_MASK, nv4097::set_surface_options_dirty_bit);
-		bind(NV4097_SET_COLOR_MASK, nv4097::set_color_mask);
-		bind(NV4097_SET_COLOR_MASK_MRT, nv4097::set_surface_options_dirty_bit);
-		bind(NV4097_SET_TWO_SIDED_STENCIL_TEST_ENABLE, nv4097::set_surface_options_dirty_bit);
-		bind(NV4097_SET_STENCIL_TEST_ENABLE, nv4097::set_surface_options_dirty_bit);
-		bind(NV4097_SET_STENCIL_MASK, nv4097::set_surface_options_dirty_bit);
-		bind(NV4097_SET_STENCIL_OP_ZPASS, nv4097::set_stencil_op);
-		bind(NV4097_SET_STENCIL_OP_FAIL, nv4097::set_stencil_op);
-		bind(NV4097_SET_STENCIL_OP_ZFAIL, nv4097::set_stencil_op);
-		bind(NV4097_SET_BACK_STENCIL_MASK, nv4097::set_surface_options_dirty_bit);
-		bind(NV4097_SET_BACK_STENCIL_OP_ZPASS, nv4097::set_stencil_op);
-		bind(NV4097_SET_BACK_STENCIL_OP_FAIL, nv4097::set_stencil_op);
-		bind(NV4097_SET_BACK_STENCIL_OP_ZFAIL, nv4097::set_stencil_op);
-		bind(NV4097_WAIT_FOR_IDLE, nv4097::sync);
-		bind(NV4097_INVALIDATE_L2, nv4097::set_shader_program_dirty);
-		bind(NV4097_SET_SHADER_PROGRAM, nv4097::set_shader_program_dirty);
-
-		bind(NV4097_SET_TRANSFORM_PROGRAM_START, nv4097::set_transform_program_start);
-		bind(NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK, nv4097::set_vertex_attribute_output_mask);
-		bind(NV4097_SET_VERTEX_DATA_BASE_OFFSET, nv4097::set_vertex_base_offset);
-		bind(NV4097_SET_VERTEX_DATA_BASE_INDEX, nv4097::set_index_base_offset);
+		bind<NV4097_SET_RENDER_ENABLE, nv4097::set_render_mode>();
+		bind<NV4097_SET_ZCULL_EN, nv4097::set_zcull_render_enable>();
+		bind<NV4097_SET_ZCULL_STATS_ENABLE, nv4097::set_zcull_stats_enable>();
+		bind<NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE, nv4097::set_zcull_pixel_count_enable>();
+		bind<NV4097_CLEAR_ZCULL_SURFACE, nv4097::clear_zcull>();
+		bind<NV4097_SET_DEPTH_TEST_ENABLE, nv4097::set_surface_options_dirty_bit>();
+		bind<NV4097_SET_DEPTH_FUNC, nv4097::set_surface_options_dirty_bit>();
+		bind<NV4097_SET_STENCIL_TEST_ENABLE, nv4097::set_surface_options_dirty_bit>();
+		bind<NV4097_SET_DEPTH_MASK, nv4097::set_surface_options_dirty_bit>();
+		bind<NV4097_SET_COLOR_MASK, nv4097::set_surface_options_dirty_bit>();
+		bind<NV4097_SET_COLOR_MASK_MRT, nv4097::set_surface_options_dirty_bit>();
+		bind<NV4097_SET_TWO_SIDED_STENCIL_TEST_ENABLE, nv4097::set_surface_options_dirty_bit>();
+		bind<NV4097_SET_STENCIL_TEST_ENABLE, nv4097::set_surface_options_dirty_bit>();
+		bind<NV4097_SET_STENCIL_MASK, nv4097::set_surface_options_dirty_bit>();
+		bind<NV4097_SET_STENCIL_OP_ZPASS, nv4097::set_stencil_op>();
+		bind<NV4097_SET_STENCIL_OP_FAIL, nv4097::set_stencil_op>();
+		bind<NV4097_SET_STENCIL_OP_ZFAIL, nv4097::set_stencil_op>();
+		bind<NV4097_SET_BACK_STENCIL_MASK, nv4097::set_surface_options_dirty_bit>();
+		bind<NV4097_SET_BACK_STENCIL_OP_ZPASS, nv4097::set_stencil_op>();
+		bind<NV4097_SET_BACK_STENCIL_OP_FAIL, nv4097::set_stencil_op>();
+		bind<NV4097_SET_BACK_STENCIL_OP_ZFAIL, nv4097::set_stencil_op>();
+		bind<NV4097_WAIT_FOR_IDLE, nv4097::sync>();
+		bind<NV4097_INVALIDATE_L2, nv4097::set_shader_program_dirty>();
+		bind<NV4097_SET_SHADER_PROGRAM, nv4097::set_shader_program_dirty>();
+		bind<NV4097_SET_SHADER_CONTROL, nv4097::notify_state_changed<fragment_program_state_dirty>>();
+		bind_array<NV4097_SET_TEX_COORD_CONTROL, 1, 10, nv4097::notify_state_changed<fragment_program_state_dirty>>();
+		bind<NV4097_SET_TWO_SIDE_LIGHT_EN, nv4097::notify_state_changed<fragment_program_state_dirty>>();
+		bind<NV4097_SET_POINT_SPRITE_CONTROL, nv4097::notify_state_changed<fragment_program_state_dirty>>();
+		bind<NV4097_SET_TRANSFORM_PROGRAM_START, nv4097::set_transform_program_start>();
+		bind<NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK, nv4097::set_vertex_attribute_output_mask>();
+		bind<NV4097_SET_VERTEX_DATA_BASE_OFFSET, nv4097::set_vertex_base_offset>();
+		bind<NV4097_SET_VERTEX_DATA_BASE_INDEX, nv4097::set_index_base_offset>();
 		bind_range<NV4097_SET_VERTEX_DATA_ARRAY_OFFSET, 1, 16, nv4097::set_vertex_array_offset>();
-		bind(NV4097_SET_INDEX_ARRAY_DMA, nv4097::check_index_array_dma);
-		bind(NV4097_SET_BLEND_EQUATION, nv4097::set_blend_equation);
-		bind(NV4097_SET_BLEND_FUNC_SFACTOR, nv4097::set_blend_factor);
-		bind(NV4097_SET_BLEND_FUNC_DFACTOR, nv4097::set_blend_factor);
+		bind<NV4097_SET_USER_CLIP_PLANE_CONTROL, nv4097::notify_state_changed<vertex_state_dirty>>();
+		bind<NV4097_SET_TRANSFORM_BRANCH_BITS, nv4097::notify_state_changed<vertex_state_dirty>>();
+		bind<NV4097_SET_CLIP_MIN, nv4097::notify_state_changed<invalidate_zclip_bits>>();
+		bind<NV4097_SET_CLIP_MAX, nv4097::notify_state_changed<invalidate_zclip_bits>>();
+		bind<NV4097_SET_POINT_SIZE, nv4097::notify_state_changed<vertex_state_dirty>>();
+		bind<NV4097_SET_ALPHA_FUNC, nv4097::notify_state_changed<fragment_state_dirty>>();
+		bind<NV4097_SET_ALPHA_REF, nv4097::notify_state_changed<fragment_state_dirty>>();
+		bind<NV4097_SET_ALPHA_TEST_ENABLE, nv4097::notify_state_changed<fragment_state_dirty>>();
+		bind<NV4097_SET_ANTI_ALIASING_CONTROL, nv4097::notify_state_changed<fragment_state_dirty>>();
+		bind<NV4097_SET_SHADER_PACKER, nv4097::notify_state_changed<fragment_state_dirty>>();
+		bind<NV4097_SET_SHADER_WINDOW, nv4097::notify_state_changed<fragment_state_dirty>>();
+		bind<NV4097_SET_FOG_MODE, nv4097::notify_state_changed<fragment_state_dirty>>();
+		bind<NV4097_SET_SCISSOR_HORIZONTAL, nv4097::notify_state_changed<scissor_config_state_dirty>>();
+		bind<NV4097_SET_SCISSOR_VERTICAL, nv4097::notify_state_changed<scissor_config_state_dirty>>();
+		bind<NV4097_SET_VIEWPORT_HORIZONTAL, nv4097::notify_state_changed<scissor_config_state_dirty>>();
+		bind<NV4097_SET_VIEWPORT_VERTICAL, nv4097::notify_state_changed<scissor_config_state_dirty>>();
+		bind_array<NV4097_SET_FOG_PARAMS, 1, 2, nv4097::notify_state_changed<fragment_state_dirty>>();
+		bind_array<NV4097_SET_VIEWPORT_SCALE, 1, 3, nv4097::notify_state_changed<vertex_state_dirty>>();
+		bind_array<NV4097_SET_VIEWPORT_OFFSET, 1, 3, nv4097::notify_state_changed<vertex_state_dirty>>();
+		bind<NV4097_SET_INDEX_ARRAY_DMA, nv4097::check_index_array_dma>();
+		bind<NV4097_SET_BLEND_EQUATION, nv4097::set_blend_equation>();
+		bind<NV4097_SET_BLEND_FUNC_SFACTOR, nv4097::set_blend_factor>();
+		bind<NV4097_SET_BLEND_FUNC_DFACTOR, nv4097::set_blend_factor>();
+		bind<NV4097_SET_POLYGON_STIPPLE, nv4097::notify_state_changed<fragment_state_dirty>>();
+		bind_array<NV4097_SET_POLYGON_STIPPLE_PATTERN, 1, 32, nv4097::notify_state_changed<polygon_stipple_pattern_dirty>>();
 
 		//NV308A (0xa400..0xbffc!)
-		bind_array(NV308A_COLOR, 1, 256 * 7, nv308a::color::impl);
+		bind_range<NV308A_COLOR + (256 * 0), 1, 256, nv308a::color, 256 * 0>();
+		bind_range<NV308A_COLOR + (256 * 1), 1, 256, nv308a::color, 256 * 1>();
+		bind_range<NV308A_COLOR + (256 * 2), 1, 256, nv308a::color, 256 * 2>();
+		bind_range<NV308A_COLOR + (256 * 3), 1, 256, nv308a::color, 256 * 3>();
+		bind_range<NV308A_COLOR + (256 * 4), 1, 256, nv308a::color, 256 * 4>();
+		bind_range<NV308A_COLOR + (256 * 5), 1, 256, nv308a::color, 256 * 5>();
+		bind_range<NV308A_COLOR + (256 * 6), 1, 256, nv308a::color, 256 * 6>();
 
 		//NV3089
-		bind(NV3089_IMAGE_IN, nv3089::image_in);
+		bind<NV3089_IMAGE_IN, nv3089::image_in>();
 
 		//NV0039
-		bind(NV0039_BUFFER_NOTIFY, nv0039::buffer_notify);
+		bind<NV0039_BUFFER_NOTIFY, nv0039::buffer_notify>();
 
 		// lv1 hypervisor
-		bind_array(GCM_SET_USER_COMMAND, 1, 2, user_command);
+		bind_array<GCM_SET_USER_COMMAND, 1, 2, user_command>();
 		bind_range<GCM_FLIP_HEAD, 1, 2, gcm::driver_flip>();
 		bind_range<GCM_DRIVER_QUEUE, 1, 8, gcm::queue_flip>();
 
 		// custom methods
-		bind(GCM_FLIP_COMMAND, flip_command);
+		bind<GCM_FLIP_COMMAND, flip_command>();
 
 		// FIFO
-		bind(FIFO::FIFO_DRAW_BARRIER >> 2, fifo::draw_barrier);
-
-		// REGS(ctx)->init();
-		method_registers.init();
+		bind<(FIFO::FIFO_DRAW_BARRIER >> 2), fifo::draw_barrier>();
 
 		return true;
 	}();
diff --git a/rpcs3/Emu/RSX/rsx_methods.h b/rpcs3/Emu/RSX/rsx_methods.h
index 60be7ec14e..16a2c02f81 100644
--- a/rpcs3/Emu/RSX/rsx_methods.h
+++ b/rpcs3/Emu/RSX/rsx_methods.h
@@ -6,13 +6,356 @@
 #include "rsx_decode.h"
 #include "RSXTexture.h"
 #include "rsx_vertex_data.h"
+#include "rsx_utils.h"
+#include "Emu/Cell/timers.hpp"
 #include "Program/program_util.h"
 
-#include "NV47/FW/draw_call.hpp"
-
 namespace rsx
 {
-	using rsx_method_t = void(*)(struct context*, u32 reg, u32 arg);
+	enum class draw_command
+	{
+		none,
+		array,
+		inlined_array,
+		indexed,
+	};
+
+	enum command_barrier_type : u32
+	{
+		primitive_restart_barrier,
+		vertex_base_modifier_barrier,
+		index_base_modifier_barrier,
+		vertex_array_offset_modifier_barrier
+	};
+
+	enum command_execution_flags : u32
+	{
+		vertex_base_changed = (1 << 0),
+		index_base_changed = (1 << 1),
+		vertex_arrays_changed = (1 << 2),
+	};
+
+	struct barrier_t
+	{
+		u32 draw_id;
+		u64 timestamp;
+
+		u32 address;
+		u32 index;
+		u32 arg;
+		u32 flags;
+		command_barrier_type type;
+
+		bool operator < (const barrier_t& other) const
+		{
+			if (address != ~0u)
+			{
+				return address < other.address;
+			}
+
+			return timestamp < other.timestamp;
+		}
+	};
+
+	struct draw_range_t
+	{
+		u32 command_data_offset = 0;
+		u32 first = 0;
+		u32 count = 0;
+	};
+
+	class draw_clause
+	{
+		// Stores the first and count argument from draw/draw indexed parameters between begin/end clauses.
+		simple_array<draw_range_t> draw_command_ranges{};
+
+		// Stores rasterization barriers for primitive types sensitive to adjacency
+		simple_array<barrier_t> draw_command_barriers{};
+
+		// Counter used to parse the commands in order
+		u32 current_range_index{};
+
+		// Location of last execution barrier
+		u32 last_execution_barrier_index{};
+
+		// Helper functions
+		// Add a new draw command
+		void append_draw_command(const draw_range_t& range)
+		{
+			current_range_index = draw_command_ranges.size();
+			draw_command_ranges.push_back(range);
+		}
+
+		// Insert a new draw command within the others
+		void insert_draw_command(u32 index, const draw_range_t& range)
+		{
+			auto range_It = draw_command_ranges.begin();
+			std::advance(range_It, index);
+
+			current_range_index = index;
+			draw_command_ranges.insert(range_It, range);
+
+			// Update all barrier draw ids after this one
+			for (auto &barrier : draw_command_barriers)
+			{
+				if (barrier.draw_id >= index)
+				{
+					barrier.draw_id++;
+				}
+			}
+		}
+
+	public:
+		primitive_type primitive{};
+		draw_command command{};
+
+		bool is_immediate_draw{};          // Set if part of the draw is submitted via push registers
+		bool is_disjoint_primitive{};      // Set if primitive type does not rely on adjacency information
+		bool primitive_barrier_enable{};   // Set once to signal that a primitive restart barrier can be inserted
+
+		simple_array<u32> inline_vertex_array{};
+
+		void insert_command_barrier(command_barrier_type type, u32 arg, u32 register_index = 0);
+
+		/**
+		 * Optimize commands for rendering
+		 */
+		void compile()
+		{
+			// End draw call append mode
+			current_range_index = ~0u;
+
+			// TODO
+		}
+
+		/**
+		 * Insert one command range
+		 */
+
+		void append(u32 first, u32 count)
+		{
+			const bool barrier_enable_flag = primitive_barrier_enable;
+			primitive_barrier_enable = false;
+
+			if (!draw_command_ranges.empty())
+			{
+				auto& last = draw_command_ranges[current_range_index];
+
+				if (last.count == 0)
+				{
+					// Special case, usually indicates an execution barrier
+					last.first = first;
+					last.count = count;
+					return;
+				}
+
+				if (last.first + last.count == first)
+				{
+					if (!is_disjoint_primitive && barrier_enable_flag)
+					{
+						// Insert barrier
+						insert_command_barrier(primitive_restart_barrier, 0);
+					}
+
+					last.count += count;
+					return;
+				}
+
+				for (auto index = last_execution_barrier_index; index < draw_command_ranges.size(); ++index)
+				{
+					if (draw_command_ranges[index].first == first &&
+						draw_command_ranges[index].count == count)
+					{
+						// Duplicate entry? WTF!
+						return;
+					}
+
+					if (draw_command_ranges[index].first > first)
+					{
+						insert_draw_command(index, { 0, first, count });
+						return;
+					}
+				}
+			}
+
+			append_draw_command({ 0, first, count });
+		}
+
+		/**
+		 * Returns how many vertex or index will be consumed by the draw clause.
+		 */
+		u32 get_elements_count() const
+		{
+			if (draw_command_ranges.empty())
+			{
+				ensure(command == rsx::draw_command::inlined_array);
+				return 0;
+			}
+
+			return get_range().count;
+		}
+
+		u32 min_index() const
+		{
+			if (draw_command_ranges.empty())
+			{
+				ensure(command == rsx::draw_command::inlined_array);
+				return 0;
+			}
+
+			return get_range().first;
+		}
+
+		bool is_single_draw() const
+		{
+			if (is_disjoint_primitive)
+				return true;
+
+			if (draw_command_ranges.empty())
+			{
+				ensure(!inline_vertex_array.empty());
+				return true;
+			}
+
+			ensure(current_range_index != ~0u);
+			for (const auto &barrier : draw_command_barriers)
+			{
+				if (barrier.draw_id != current_range_index)
+					continue;
+
+				if (barrier.type == primitive_restart_barrier)
+					return false;
+			}
+
+			return true;
+		}
+
+		bool empty() const
+		{
+			return (command == rsx::draw_command::inlined_array) ? inline_vertex_array.empty() : draw_command_ranges.empty();
+		}
+
+		u32 pass_count() const
+		{
+			if (draw_command_ranges.empty())
+			{
+				ensure(!inline_vertex_array.empty());
+				return 1u;
+			}
+
+			u32 count = ::size32(draw_command_ranges);
+			if (draw_command_ranges.back().count == 0)
+			{
+				// Dangling barrier
+				ensure(count > 1);
+				count--;
+			}
+
+			return count;
+		}
+
+		void reset(rsx::primitive_type type);
+
+		void begin()
+		{
+			current_range_index = 0;
+		}
+
+		void end()
+		{
+			current_range_index = draw_command_ranges.size() - 1;
+		}
+
+		bool next()
+		{
+			current_range_index++;
+			if (current_range_index >= draw_command_ranges.size())
+			{
+				current_range_index = 0;
+				return false;
+			}
+
+			if (draw_command_ranges[current_range_index].count == 0)
+			{
+				// Dangling execution barrier
+				ensure(current_range_index > 0 && (current_range_index + 1) == draw_command_ranges.size());
+				current_range_index = 0;
+				return false;
+			}
+
+			return true;
+		}
+
+		/**
+		 * Only call this once after the draw clause has been fully consumed to reconcile any conflicts
+		 */
+		void post_execute_cleanup()
+		{
+			ensure(current_range_index == 0);
+
+			if (draw_command_ranges.size() > 1)
+			{
+				if (draw_command_ranges.back().count == 0)
+				{
+					// Dangling execution barrier
+					current_range_index = draw_command_ranges.size() - 1;
+					execute_pipeline_dependencies();
+					current_range_index = 0;
+				}
+			}
+		}
+
+		/**
+		 * Executes commands reqiured to make the current draw state valid
+		 */
+		u32 execute_pipeline_dependencies() const;
+
+		const draw_range_t& get_range() const
+		{
+			ensure(current_range_index < draw_command_ranges.size());
+			return draw_command_ranges[current_range_index];
+		}
+
+		simple_array<draw_range_t> get_subranges() const
+		{
+			ensure(!is_single_draw());
+
+			const auto range = get_range();
+			const auto limit = range.first + range.count;
+
+			simple_array<draw_range_t> ret;
+			u32 previous_barrier = range.first;
+			u32 vertex_counter = 0;
+
+			for (const auto &barrier : draw_command_barriers)
+			{
+				if (barrier.draw_id != current_range_index)
+					continue;
+
+				if (barrier.type != primitive_restart_barrier)
+					continue;
+
+				if (barrier.address <= range.first)
+					continue;
+
+				if (barrier.address >= limit)
+					break;
+
+				const u32 count = barrier.address - previous_barrier;
+				ret.push_back({ 0, vertex_counter, count });
+				previous_barrier = barrier.address;
+				vertex_counter += count;
+			}
+
+			ensure(!ret.empty());
+			ensure(previous_barrier < limit);
+			ret.push_back({ 0, vertex_counter, limit - previous_barrier });
+
+			return ret;
+		}
+	};
+
+	using rsx_method_t = void(*)(class thread*, u32 reg, u32 arg);
 
 	//TODO
 	union alignas(4) method_registers_t
@@ -79,7 +422,7 @@ namespace rsx
 	{
 	public:
 		std::array<u32, 0x10000 / 4> registers{};
-		u32 latch{};
+		u32 register_previous_value{};
 
 		template<u32 opcode>
 		using decoded_type = typename registers_decoder<opcode>::decoded_type;
@@ -91,12 +434,6 @@ namespace rsx
 			return decoded_type<opcode>(register_value);
 		}
 
-		template<u32 opcode>
-		decoded_type<opcode> decode(u32 register_value) const
-		{
-			return decoded_type<opcode>(register_value);
-		}
-
 		rsx_state& operator=(const rsx_state& in)
 		{
 			registers = in.registers;
@@ -106,7 +443,7 @@ namespace rsx
 			return *this;
 		}
 
-		rsx_state& operator=(rsx_state&& in) noexcept
+		rsx_state& operator=(rsx_state&& in)
 		{
 			registers = std::move(in.registers);
 			transform_program = std::move(in.transform_program);
@@ -165,7 +502,7 @@ namespace rsx
 			this->operator=(other);
 		}
 
-		rsx_state(rsx_state&& other) noexcept
+		rsx_state(rsx_state&& other)
 			: rsx_state()
 		{
 			this->operator=(std::move(other));
@@ -705,11 +1042,6 @@ namespace rsx
 			return decode<NV4097_SET_USER_CLIP_PLANE_CONTROL>().clip_plane5();
 		}
 
-		u32 clip_planes_mask() const
-		{
-			return registers[NV4097_SET_USER_CLIP_PLANE_CONTROL];
-		}
-
 		front_face front_face_mode() const
 		{
 			return decode<NV4097_SET_FRONT_FACE>().front_face_mode();
@@ -904,7 +1236,7 @@ namespace rsx
 
 		surface_depth_format2 surface_depth_fmt() const
 		{
-			const auto base_fmt = *decode<NV4097_SET_SURFACE_FORMAT>().depth_fmt();
+			const auto base_fmt = decode<NV4097_SET_SURFACE_FORMAT>().depth_fmt();
 			if (!depth_buffer_float_enabled()) [[likely]]
 			{
 				return static_cast<surface_depth_format2>(base_fmt);
@@ -1068,7 +1400,7 @@ namespace rsx
 			return decode<NV3089_IMAGE_IN_FORMAT>().transfer_interpolator();
 		}
 
-		expected<blit_engine::transfer_source_format> blit_engine_src_color_format() const
+		blit_engine::transfer_source_format blit_engine_src_color_format() const
 		{
 			return decode<NV3089_SET_COLOR_FORMAT>().transfer_source_fmt();
 		}
@@ -1110,7 +1442,7 @@ namespace rsx
 			return decode<NV3062_SET_OFFSET_DESTIN>().output_offset();
 		}
 
-		expected<blit_engine::transfer_destination_format> blit_engine_nv3062_color_format() const
+		blit_engine::transfer_destination_format blit_engine_nv3062_color_format() const
 		{
 			return decode<NV3062_SET_COLOR_FORMAT>().transfer_dest_fmt();
 		}
@@ -1135,7 +1467,7 @@ namespace rsx
 			return decode<NV309E_SET_OFFSET>().offset();
 		}
 
-		expected<blit_engine::transfer_destination_format> blit_engine_output_format_nv309E() const
+		blit_engine::transfer_destination_format blit_engine_output_format_nv309E() const
 		{
 			return decode<NV309E_SET_FORMAT>().format();
 		}
@@ -1325,5 +1657,4 @@ namespace rsx
 
 	extern rsx_state method_registers;
 	extern std::array<rsx_method_t, 0x10000 / 4> methods;
-	extern std::array<u32, 0x10000 / 4> state_signals;
 }
diff --git a/rpcs3/Emu/RSX/rsx_utils.cpp b/rpcs3/Emu/RSX/rsx_utils.cpp
index 2a781a9c44..27e780be4a 100644
--- a/rpcs3/Emu/RSX/rsx_utils.cpp
+++ b/rpcs3/Emu/RSX/rsx_utils.cpp
@@ -1,7 +1,8 @@
 #include "stdafx.h"
 #include "rsx_utils.h"
 #include "rsx_methods.h"
-#include "Emu/Cell/Modules/cellVideoOut.h"
+#include "Emu/RSX/GCM.h"
+#include "Overlays/overlays.h"
 
 #ifdef _MSC_VER
 #pragma warning(push, 0)
@@ -40,7 +41,7 @@ namespace rsx
 	void clip_image(u8 *dst, const u8 *src, int clip_x, int clip_y, int clip_w, int clip_h, int bpp, int src_pitch, int dst_pitch)
 	{
 		const u8* pixels_src = src + clip_y * src_pitch + clip_x * bpp;
-		u8* pixels_dst = dst;
+		u8 *pixels_dst = dst;
 		const u32 row_length = clip_w * bpp;
 
 		for (int y = 0; y < clip_h; ++y)
@@ -101,128 +102,6 @@ namespace rsx
 		}
 	}
 
-	// Fit a aspect-correct rectangle within a frame of wxh dimensions
-	template <typename T>
-	area_base<T> convert_aspect_ratio_impl(const size2_base<T>& output_dimensions, double aspect)
-	{
-		const double output_aspect = 1. * output_dimensions.width / output_dimensions.height;
-		const double convert_ratio = aspect / output_aspect;
-
-		area_base<T> result;
-		if (convert_ratio > 1.)
-		{
-			const auto height = static_cast<T>(output_dimensions.height / convert_ratio);
-			result.y1 = (output_dimensions.height - height) / 2;
-			result.y2 = result.y1 + height;
-			result.x1 = 0;
-			result.x2 = output_dimensions.width;
-		}
-		else if (convert_ratio < 1.)
-		{
-			const auto width = static_cast<T>(output_dimensions.width * convert_ratio);
-			result.x1 = (output_dimensions.width - width) / 2;
-			result.x2 = result.x1 + width;
-			result.y1 = 0;
-			result.y2 = output_dimensions.height;
-		}
-		else
-		{
-			result = { 0, 0, output_dimensions.width, output_dimensions.height };
-		}
-
-		return result;
-	}
-
-	avconf::avconf() noexcept
-	{
-		switch (g_cfg.video.aspect_ratio)
-		{
-		default:
-		case video_aspect::_16_9:
-			aspect = CELL_VIDEO_OUT_ASPECT_16_9;
-			break;
-		case video_aspect::_4_3:
-			aspect = CELL_VIDEO_OUT_ASPECT_4_3;
-			break;
-		}
-	}
-
-	u32 avconf::get_compatible_gcm_format() const
-	{
-		switch (format)
-		{
-		default:
-			rsx_log.error("Invalid AV format 0x%x", format);
-			[[fallthrough]];
-		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8:
-		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8B8G8R8:
-			return CELL_GCM_TEXTURE_A8R8G8B8;
-		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_R16G16B16X16_FLOAT:
-			return CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT;
-		}
-	}
-
-	u8 avconf::get_bpp() const
-	{
-		switch (format)
-		{
-		default:
-			rsx_log.error("Invalid AV format 0x%x", format);
-			[[fallthrough]];
-		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8:
-		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8B8G8R8:
-			return 4;
-		case CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_R16G16B16X16_FLOAT:
-			return 8;
-		}
-	}
-
-	double avconf::get_aspect_ratio() const
-	{
-		switch (aspect)
-		{
-		case CELL_VIDEO_OUT_ASPECT_16_9: return 16. / 9.;
-		case CELL_VIDEO_OUT_ASPECT_4_3: return 4. / 3.;
-		default: fmt::throw_exception("Invalid aspect ratio %d", aspect);
-		}
-	}
-
-	size2u avconf::aspect_convert_dimensions(const size2u& image_dimensions) const
-	{
-		if (image_dimensions.width == 0 || image_dimensions.height == 0)
-		{
-			rsx_log.trace("Empty region passed to aspect-correct conversion routine [size]. This should never happen.");
-			return {};
-		}
-
-		// Unconstrained aspect ratio conversion
-		return size2u{ static_cast<u32>(image_dimensions.height * get_aspect_ratio()), image_dimensions.height };
-	}
-
-	areau avconf::aspect_convert_region(const size2u& image_dimensions, const size2u& output_dimensions) const
-	{
-		if (const auto test = image_dimensions * output_dimensions;
-			test.width == 0 || test.height == 0)
-		{
-			rsx_log.trace("Empty region passed to aspect-correct conversion routine [region]. This should never happen.");
-			return {};
-		}
-
-		// Fit the input image into the virtual display 'window'
-		const auto source_aspect = 1. * image_dimensions.width / image_dimensions.height;
-		const auto virtual_output = size2u{ resolution_x, resolution_y };
-		const auto area1 = convert_aspect_ratio_impl(virtual_output, source_aspect);
-
-		// Fit the virtual display into the physical display
-		const auto area2 = convert_aspect_ratio_impl(output_dimensions, get_aspect_ratio());
-
-		// Merge the two regions. Since aspect ratio was conserved between both transforms, a simple scale can be used
-		const double stretch_x = 1. * area2.width() / virtual_output.width;
-		const double stretch_y = 1. * area2.height() / virtual_output.height;
-
-		return static_cast<areau>(static_cast<aread>(area1) * size2d { stretch_x, stretch_y }) + size2u{ area2.x1, area2.y1 };
-	}
-
 #ifdef TEXTURE_CACHE_DEBUG
 	tex_cache_checker_t tex_cache_checker = {};
 #endif
diff --git a/rpcs3/Emu/RSX/rsx_utils.h b/rpcs3/Emu/RSX/rsx_utils.h
index 7a0aa3c14f..df0c0e03be 100644
--- a/rpcs3/Emu/RSX/rsx_utils.h
+++ b/rpcs3/Emu/RSX/rsx_utils.h
@@ -5,6 +5,10 @@
 #include "Utilities/geometry.h"
 #include "gcm_enums.h"
 
+#include <memory>
+#include <bitset>
+#include <chrono>
+
 extern "C"
 {
 #include <libavutil/pixfmt.h>
@@ -14,9 +18,9 @@ extern "C"
 
 namespace rsx
 {
-	// Import address_range32 utilities
-	using utils::address_range32;
-	using utils::address_range_vector32;
+	// Import address_range utilities
+	using utils::address_range;
+	using utils::address_range_vector;
 	using utils::page_for;
 	using utils::page_start;
 	using utils::page_end;
@@ -120,27 +124,25 @@ namespace rsx
 		u8  bpp = 0;
 		u8  samples = 0;
 
-		address_range32 range{};
+		address_range range{};
 
 		gcm_framebuffer_info() = default;
 
-		ENABLE_BITWISE_SERIALIZATION;
-
 		void calculate_memory_range(u32 aa_factor_u, u32 aa_factor_v)
 		{
 			// Account for the last line of the block not reaching the end
 			const u32 block_size = pitch * (height - 1) * aa_factor_v;
 			const u32 line_size = width * aa_factor_u * bpp;
-			range = address_range32::start_length(address, block_size + line_size);
+			range = address_range::start_length(address, block_size + line_size);
 		}
 
-		address_range32 get_memory_range(const u32* aa_factors)
+		address_range get_memory_range(const u32* aa_factors)
 		{
 			calculate_memory_range(aa_factors[0], aa_factors[1]);
 			return range;
 		}
 
-		address_range32 get_memory_range() const
+		address_range get_memory_range() const
 		{
 			ensure(range.start == address);
 			return range;
@@ -149,7 +151,7 @@ namespace rsx
 
 	struct avconf
 	{
-		stereo_render_mode_options stereo_mode = stereo_render_mode_options::disabled;        // Stereo 3D display mode
+		bool _3d  = false;         // Stereo 3D off
 		u8 format = 0;             // XRGB
 		u8 aspect = 0;             // AUTO
 		u8 resolution_id = 2;      // 720p
@@ -158,22 +160,36 @@ namespace rsx
 		u32 resolution_x = 1280;   // X RES
 		u32 resolution_y = 720;    // Y RES
 		atomic_t<u32> state = 0;   // 1 after cellVideoOutConfigure was called
-		u8 scan_mode = 1;          // CELL_VIDEO_OUT_SCAN_MODE_PROGRESSIVE
 
-		ENABLE_BITWISE_SERIALIZATION;
-		SAVESTATE_INIT_POS(12);
+		u32 get_compatible_gcm_format() const
+		{
+			switch (format)
+			{
+			default:
+				rsx_log.error("Invalid AV format 0x%x", format);
+				[[fallthrough]];
+			case 0: // CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8:
+			case 1: // CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8B8G8R8:
+				return CELL_GCM_TEXTURE_A8R8G8B8;
+			case 2: // CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_R16G16B16X16_FLOAT:
+				return CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT;
+			}
+		}
 
-		avconf() noexcept;
-		~avconf() = default;
-		avconf(utils::serial& ar);
-		void save(utils::serial& ar);
-
-		u32 get_compatible_gcm_format() const;
-		u8 get_bpp() const;
-		double get_aspect_ratio() const;
-
-		areau aspect_convert_region(const size2u& image_dimensions, const size2u& output_dimensions) const;
-		size2u aspect_convert_dimensions(const size2u& image_dimensions) const;
+		u8 get_bpp() const
+		{
+			switch (format)
+			{
+			default:
+				rsx_log.error("Invalid AV format 0x%x", format);
+				[[fallthrough]];
+			case 0: // CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8:
+			case 1: // CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8B8G8R8:
+				return 4;
+			case 2: // CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_R16G16B16X16_FLOAT:
+				return 8;
+			}
+		}
 	};
 
 	struct blit_src_info
@@ -184,11 +200,9 @@ namespace rsx
 		u16 offset_y;
 		u16 width;
 		u16 height;
-		u32 pitch;
-		u8  bpp;
-		u32 dma;
+		u16 pitch;
 		u32 rsx_address;
-		u8 *pixels;
+		void *pixels;
 	};
 
 	struct blit_dst_info
@@ -198,24 +212,28 @@ namespace rsx
 		u16 offset_y;
 		u16 width;
 		u16 height;
+		u16 pitch;
 		u16 clip_x;
 		u16 clip_y;
 		u16 clip_width;
 		u16 clip_height;
 		f32 scale_x;
 		f32 scale_y;
-		u32 pitch;
-		u8  bpp;
-		u32 dma;
-		u32 rsx_address;
-		u8 *pixels;
+		u32  rsx_address;
+		void *pixels;
 		bool swizzled;
 	};
 
-	template <typename T>
-	void pad_texture(const void* input_pixels, void* output_pixels, u16 input_width, u16 input_height, u16 output_width, u16 /*output_height*/)
+	static const std::pair<std::array<u8, 4>, std::array<u8, 4>> default_remap_vector =
 	{
-		const T *src = static_cast<const T*>(input_pixels);
+		{ CELL_GCM_TEXTURE_REMAP_FROM_A, CELL_GCM_TEXTURE_REMAP_FROM_R, CELL_GCM_TEXTURE_REMAP_FROM_G, CELL_GCM_TEXTURE_REMAP_FROM_B },
+		{ CELL_GCM_TEXTURE_REMAP_REMAP, CELL_GCM_TEXTURE_REMAP_REMAP, CELL_GCM_TEXTURE_REMAP_REMAP, CELL_GCM_TEXTURE_REMAP_REMAP }
+	};
+
+	template <typename T>
+	void pad_texture(void* input_pixels, void* output_pixels, u16 input_width, u16 input_height, u16 output_width, u16 /*output_height*/)
+	{
+		T *src = static_cast<T*>(input_pixels);
 		T *dst = static_cast<T*>(output_pixels);
 
 		for (u16 h = 0; h < input_height; ++h)
@@ -259,9 +277,7 @@ namespace rsx
 
 	static inline u32 get_location(u32 addr)
 	{
-		// We don't really care about the actual memory map, it shouldn't be possible to use the mmio bar region anyway
-		constexpr address_range32 local_mem_range = address_range32::start_length(rsx::constants::local_mem_base, 0x1000'0000);
-		return local_mem_range.overlaps(addr) ?
+		return (addr >= rsx::constants::local_mem_base) ?
 			CELL_GCM_LOCATION_LOCAL :
 			CELL_GCM_LOCATION_MAIN;
 	}
@@ -273,13 +289,6 @@ namespace rsx
 		return ((value + alignment - 1) / alignment) * alignment;
 	}
 
-	// General purpose downward alignment without power-of-2 constraint
-	template <typename T, typename U>
-	static inline T align_down2(T value, U alignment)
-	{
-		return (value / alignment) * alignment;
-	}
-
 	// Copy memory in inverse direction from source
 	// Used to scale negatively x axis while transfering image data
 	template <typename Ts = u8, typename Td = Ts>
@@ -336,8 +345,8 @@ namespace rsx
 	template <typename T, bool input_is_swizzled>
 	void convert_linear_swizzle(const void* input_pixels, void* output_pixels, u16 width, u16 height, u32 pitch)
 	{
-		const u32 log2width = ceil_log2(width);
-		const u32 log2height = ceil_log2(height);
+		u32 log2width = ceil_log2(width);
+		u32 log2height = ceil_log2(height);
 
 		// Max mask possible for square texture
 		u32 x_mask = 0x55555555;
@@ -356,19 +365,15 @@ namespace rsx
 		u32 offs_y = 0;
 		u32 offs_x = 0;
 		u32 offs_x0 = 0; //total y-carry offset for x
-		const u32 y_incr = limit_mask;
+		u32 y_incr = limit_mask;
 
-		// NOTE: The swizzled area is always a POT region and we must scan all of it to fill in the linear.
-		// It is assumed that there is no padding on the linear side for simplicity - backend upload/download will crop as needed.
-		// Remember, in cases of swizzling (and also tiled addressing) it is possible for tiled pixels to fall outside of their linear memory region.
-		const u32 pitch_in_blocks = pitch / sizeof(T);
-		u32 row_offset = 0;
+		u32 adv = pitch / sizeof(T);
 
 		if constexpr (!input_is_swizzled)
 		{
-			for (int y = 0; y < height; ++y, row_offset += pitch_in_blocks)
+			for (int y = 0; y < height; ++y)
 			{
-				auto src = static_cast<const T*>(input_pixels) + row_offset;
+				auto src = static_cast<const T*>(input_pixels) + y * adv;
 				auto dst = static_cast<T*>(output_pixels) + offs_y;
 				offs_x = offs_x0;
 
@@ -388,10 +393,10 @@ namespace rsx
 		}
 		else
 		{
-			for (int y = 0; y < height; ++y, row_offset += pitch_in_blocks)
+			for (int y = 0; y < height; ++y)
 			{
 				auto src = static_cast<const T*>(input_pixels) + offs_y;
-				auto dst = static_cast<T*>(output_pixels) + row_offset;
+				auto dst = static_cast<T*>(output_pixels) + y * adv;
 				offs_x = offs_x0;
 
 				for (int x = 0; x < width; ++x)
@@ -457,7 +462,7 @@ namespace rsx
 	 * TODO: Variable src/dst and optional se conversion
 	 */
 	template <typename T>
-	void shuffle_texel_data_wzyx(void* data, u32 row_pitch_in_bytes, u16 row_length_in_texels, u16 num_rows)
+	void shuffle_texel_data_wzyx(void* data, u16 row_pitch_in_bytes, u16 row_length_in_texels, u16 num_rows)
 	{
 		char* raw_src = static_cast<char*>(data);
 		T tmp[4];
@@ -500,10 +505,10 @@ namespace rsx
 		{
 			if (clip_x >= parent_width)
 			{
-				if (clip_width >= parent_width)
+				if (clip_width < parent_width)
+					width = clip_width;
+				else
 					width = parent_width;
-				//else
-				//	width = clip_width; // Already initialized with clip_width
 
 				x = static_cast<T>(0);
 			}
@@ -520,10 +525,10 @@ namespace rsx
 		{
 			if (clip_y >= parent_height)
 			{
-				if (clip_height >= parent_height)
+				if (clip_height < parent_height)
+					height = clip_height;
+				else
 					height = parent_height;
-				//else
-				//	height = clip_height; // Already initialized with clip_height
 
 				y = static_cast<T>(0);
 			}
@@ -543,8 +548,8 @@ namespace rsx
 	 * Extracts from 'parent' a region that fits in 'child'
 	 */
 	static inline std::tuple<position2u, position2u, size2u> intersect_region(
-		u32 parent_address, u16 parent_w, u16 parent_h,
-		u32 child_address, u16 child_w, u16 child_h,
+		u32 parent_address, u16 parent_w, u16 parent_h, u16 parent_bpp,
+		u32 child_address, u16 child_w, u16 child_h, u32 child_bpp,
 		u32 pitch)
 	{
 		if (child_address < parent_address)
@@ -553,9 +558,9 @@ namespace rsx
 			const auto src_x = 0u;
 			const auto src_y = 0u;
 			const auto dst_y = (offset / pitch);
-			const auto dst_x = (offset % pitch);
-			const auto w = std::min<u32>(parent_w, std::max<u32>(child_w, dst_x) - dst_x); // Clamp negatives to 0!
-			const auto h = std::min<u32>(parent_h, std::max<u32>(child_h, dst_y) - dst_y);
+			const auto dst_x = (offset % pitch) / child_bpp;
+			const auto w = std::min<u32>(parent_w, child_w - dst_x);
+			const auto h = std::min<u32>(parent_h, child_h - dst_y);
 
 			return std::make_tuple<position2u, position2u, size2u>({ src_x, src_y }, { dst_x, dst_y }, { w, h });
 		}
@@ -563,11 +568,11 @@ namespace rsx
 		{
 			const auto offset = child_address - parent_address;
 			const auto src_y = (offset / pitch);
-			const auto src_x = (offset % pitch);
+			const auto src_x = (offset % pitch) / parent_bpp;
 			const auto dst_x = 0u;
 			const auto dst_y = 0u;
-			const auto w = std::min<u32>(child_w, std::max<u32>(parent_w, src_x) - src_x);
-			const auto h = std::min<u32>(child_h, std::max<u32>(parent_h, src_y) - src_y);
+			const auto w = std::min<u32>(child_w, parent_w - src_x);
+			const auto h = std::min<u32>(child_h, parent_h - src_y);
 
 			return std::make_tuple<position2u, position2u, size2u>({ src_x, src_y }, { dst_x, dst_y }, { w, h });
 		}
@@ -586,8 +591,8 @@ namespace rsx
 	template <bool clamp = false>
 	static inline const std::pair<u16, u16> apply_resolution_scale(u16 width, u16 height, u16 ref_width = 0, u16 ref_height = 0)
 	{
-		ref_width = (ref_width) ? ref_width : width;
-		ref_height = (ref_height) ? ref_height : height;
+		ref_width = (ref_width)? ref_width : width;
+		ref_height = (ref_height)? ref_height : height;
 		const u16 ref = std::max(ref_width, ref_height);
 
 		if (ref > g_cfg.video.min_scalable_dimension)
@@ -664,7 +669,7 @@ namespace rsx
 	}
 
 	template <bool __is_surface = true, typename SurfaceType>
-	inline bool pitch_compatible(const SurfaceType* surface, u32 pitch_required, u16 height_required)
+	inline bool pitch_compatible(const SurfaceType* surface, u16 pitch_required, u16 height_required)
 	{
 		if constexpr (__is_surface)
 		{
@@ -740,6 +745,58 @@ namespace rsx
 		return (index + index_base) & 0x000FFFFF;
 	}
 
+	// Convert color write mask for G8B8 to R8G8
+	static inline u32 get_g8b8_r8g8_colormask(u32 mask)
+	{
+		u32 result = 0;
+		if (mask & 0x20) result |= 0x20;
+		if (mask & 0x40) result |= 0x10;
+
+		return result;
+	}
+
+	static inline void get_g8b8_r8g8_colormask(bool &red, bool &/*green*/, bool &blue, bool &alpha)
+	{
+		red = blue;
+		blue = false;
+		alpha = false;
+	}
+
+	static inline void get_g8b8_clear_color(u8& red, u8& /*green*/, u8& blue, u8& /*alpha*/)
+	{
+		red = blue;
+	}
+
+	static inline u32 get_abgr8_colormask(u32 mask)
+	{
+		u32 result = 0;
+		if (mask & 0x10) result |= 0x40;
+		if (mask & 0x20) result |= 0x20;
+		if (mask & 0x40) result |= 0x10;
+		if (mask & 0x80) result |= 0x80;
+		return result;
+	}
+
+	static inline void get_abgr8_colormask(bool& red, bool& /*green*/, bool& blue, bool& /*alpha*/)
+	{
+		std::swap(red, blue);
+	}
+
+	static inline void get_abgr8_clear_color(u8& red, u8& /*green*/, u8& blue, u8& /*alpha*/)
+	{
+		std::swap(red, blue);
+	}
+
+	static inline color4f decode_border_color(u32 colorref)
+	{
+		color4f result;
+		result.b = (colorref & 0xFF) / 255.f;
+		result.g = ((colorref >> 8) & 0xFF) / 255.f;
+		result.r = ((colorref >> 16) & 0xFF) / 255.f;
+		result.a = ((colorref >> 24) & 0xFF) / 255.f;
+		return result;
+	}
+
 	template <uint integer, uint frac, bool sign = true, typename To = f32>
 	static inline To decode_fxp(u32 bits)
 	{
@@ -795,25 +852,379 @@ namespace rsx
 		return base * scale;
 	}
 
-	template<bool _signed = false>
-	u16 encode_fx12(f32 value)
+	template <int N>
+	void unpack_bitset(const std::bitset<N>& block, u64* values)
 	{
-		u16 raw = u16(std::abs(value) * 256.);
-
-		if constexpr (!_signed)
+		for (int bit = 0, n = -1, shift = 0; bit < N; ++bit, ++shift)
 		{
-			return raw;
-		}
-		else
-		{
-			if (value >= 0.f) [[likely]]
+			if ((bit % 64) == 0)
 			{
-				return raw;
+				values[++n] = 0;
+				shift = 0;
 			}
-			else
+
+			if (block[bit])
 			{
-				return u16(0 - raw) & 0x1fff;
+				values[n] |= (1ull << shift);
 			}
 		}
 	}
+
+	template <int N>
+	void pack_bitset(std::bitset<N>& block, u64* values)
+	{
+		for (int n = 0, shift = 0; shift < N; ++n, shift += 64)
+		{
+			std::bitset<N> tmp = values[n];
+			tmp <<= shift;
+			block |= tmp;
+		}
+	}
+
+	template <typename T, typename bitmask_type = u32>
+	class atomic_bitmask_t
+	{
+	private:
+		atomic_t<bitmask_type> m_data{0};
+
+	public:
+		atomic_bitmask_t() = default;
+
+		T load() const
+		{
+			return static_cast<T>(m_data.load());
+		}
+
+		void store(T value)
+		{
+			m_data.store(static_cast<bitmask_type>(value));
+		}
+
+		bool operator & (T mask) const
+		{
+			return ((m_data.load() & static_cast<bitmask_type>(mask)) != 0);
+		}
+
+		T operator | (T mask) const
+		{
+			return static_cast<T>(m_data.load() | static_cast<bitmask_type>(mask));
+		}
+
+		void operator &= (T mask)
+		{
+			m_data.fetch_and(static_cast<bitmask_type>(mask));
+		}
+
+		void operator |= (T mask)
+		{
+			m_data.fetch_or(static_cast<bitmask_type>(mask));
+		}
+
+		bool test_and_set(T mask)
+		{
+			const auto old = m_data.fetch_or(static_cast<bitmask_type>(mask));
+			return (old & static_cast<bitmask_type>(mask)) != 0;
+		}
+
+		auto clear(T mask)
+		{
+			bitmask_type clear_mask = ~(static_cast<bitmask_type>(mask));
+			return m_data.and_fetch(clear_mask);
+		}
+
+		void clear()
+		{
+			m_data.store(0);
+		}
+	};
+
+	template <typename Ty>
+	struct simple_array
+	{
+	public:
+		using iterator = Ty*;
+		using const_iterator = const Ty*;
+		using value_type = Ty;
+
+	private:
+		u32 _capacity = 0;
+		u32 _size = 0;
+		Ty* _data = nullptr;
+
+		inline u64 offset(const_iterator pos)
+		{
+			return (_data) ? u64(pos - _data) : 0ull;
+		}
+
+	public:
+		simple_array() = default;
+
+		simple_array(u32 initial_size, const Ty val = {})
+		{
+			reserve(initial_size);
+			_size = initial_size;
+
+			for (u32 n = 0; n < initial_size; ++n)
+			{
+				_data[n] = val;
+			}
+		}
+
+		simple_array(const std::initializer_list<Ty>& args)
+		{
+			reserve(::size32(args));
+
+			for (const auto& arg : args)
+			{
+				push_back(arg);
+			}
+		}
+
+		simple_array(const simple_array& other)
+		{
+			_capacity = other._capacity;
+			_size = other._size;
+
+			const auto size_bytes = sizeof(Ty) * _capacity;
+			_data = static_cast<Ty*>(malloc(size_bytes));
+			std::memcpy(_data, other._data, size_bytes);
+		}
+
+		simple_array(simple_array&& other) noexcept
+		{
+			swap(other);
+		}
+
+		simple_array& operator=(const simple_array& other)
+		{
+			if (&other != this)
+			{
+				simple_array{other}.swap(*this);
+			}
+
+			return *this;
+		}
+
+		simple_array& operator=(simple_array&& other) noexcept
+		{
+			swap(other);
+			return *this;
+		}
+
+		~simple_array()
+		{
+			if (_data)
+			{
+				free(_data);
+				_data = nullptr;
+				_size = _capacity = 0;
+			}
+		}
+
+		void swap(simple_array<Ty>& other) noexcept
+		{
+			std::swap(_capacity, other._capacity);
+			std::swap(_size, other._size);
+			std::swap(_data, other._data);
+		}
+
+		void reserve(u32 size)
+		{
+			if (_capacity >= size)
+				return;
+
+			ensure(_data = static_cast<Ty*>(std::realloc(_data, sizeof(Ty) * size))); // "realloc() failed!"
+			_capacity = size;
+		}
+
+		void resize(u32 size)
+		{
+			reserve(size);
+			_size = size;
+		}
+
+		void push_back(const Ty& val)
+		{
+			if (_size >= _capacity)
+			{
+				reserve(_capacity + 16);
+			}
+
+			_data[_size++] = val;
+		}
+
+		void push_back(Ty&& val)
+		{
+			if (_size >= _capacity)
+			{
+				reserve(_capacity + 16);
+			}
+
+			_data[_size++] = val;
+		}
+
+		iterator insert(iterator pos, const Ty& val)
+		{
+			ensure(pos >= _data);
+			const auto _loc = offset(pos);
+
+			if (_size >= _capacity)
+			{
+				reserve(_capacity + 16);
+				pos = _data + _loc;
+			}
+
+			if (_loc >= _size)
+			{
+				_data[_size++] = val;
+				return pos;
+			}
+
+			ensure(_loc < _size);
+
+			const auto remaining = (_size - _loc);
+			memmove(pos + 1, pos, remaining * sizeof(Ty));
+
+			*pos = val;
+			_size++;
+
+			return pos;
+		}
+
+		iterator insert(iterator pos, Ty&& val)
+		{
+			ensure(pos >= _data);
+			const auto _loc = offset(pos);
+
+			if (_size >= _capacity)
+			{
+				reserve(_capacity + 16);
+				pos = _data + _loc;
+			}
+
+			if (_loc >= _size)
+			{
+				_data[_size++] = val;
+				return pos;
+			}
+
+			ensure(_loc < _size);
+
+			const u32 remaining = (_size - _loc);
+			memmove(pos + 1, pos, remaining * sizeof(Ty));
+
+			*pos = val;
+			_size++;
+
+			return pos;
+		}
+
+		void clear()
+		{
+			_size = 0;
+		}
+
+		bool empty() const
+		{
+			return _size == 0;
+		}
+
+		u32 size() const
+		{
+			return _size;
+		}
+
+		u32 capacity() const
+		{
+			return _capacity;
+		}
+
+		Ty& operator[] (u32 index)
+		{
+			return _data[index];
+		}
+
+		const Ty& operator[] (u32 index) const
+		{
+			return _data[index];
+		}
+
+		Ty* data()
+		{
+			return _data;
+		}
+
+		const Ty* data() const
+		{
+			return _data;
+		}
+
+		Ty& back()
+		{
+			return _data[_size - 1];
+		}
+
+		const Ty& back() const
+		{
+			return _data[_size - 1];
+		}
+
+		Ty& front()
+		{
+			return _data[0];
+		}
+
+		const Ty& front() const
+		{
+			return _data[0];
+		}
+
+		iterator begin()
+		{
+			return _data;
+		}
+
+		iterator end()
+		{
+			return _data ? _data + _size : nullptr;
+		}
+
+		const_iterator begin() const
+		{
+			return _data;
+		}
+
+		const_iterator end() const
+		{
+			return _data ? _data + _size : nullptr;
+		}
+	};
+
+	struct profiling_timer
+	{
+		bool enabled = false;
+		steady_clock::time_point last;
+
+		profiling_timer() = default;
+
+		void start()
+		{
+			if (enabled) [[unlikely]]
+			{
+				last = steady_clock::now();
+			}
+		}
+
+		s64 duration()
+		{
+			if (!enabled) [[likely]]
+			{
+				return 0ll;
+			}
+
+			auto old = last;
+			last = steady_clock::now();
+			return std::chrono::duration_cast<std::chrono::microseconds>(last - old).count();
+		}
+	};
 }
diff --git a/rpcs3/Emu/RSX/rsx_vertex_data.cpp b/rpcs3/Emu/RSX/rsx_vertex_data.cpp
deleted file mode 100644
index 07c8abec07..0000000000
--- a/rpcs3/Emu/RSX/rsx_vertex_data.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-#include "stdafx.h"
-#include "rsx_vertex_data.h"
-#include "rsx_methods.h"
-
-namespace rsx
-{
-	void push_buffer_vertex_info::clear()
-	{
-		if (size)
-		{
-			data.clear();
-			vertex_count = 0;
-			dword_count = 0;
-			size = 0;
-		}
-	}
-
-	u8 push_buffer_vertex_info::get_vertex_size_in_dwords() const
-	{
-		// NOTE: Types are always provided to fit into 32-bits
-		// i.e no less than 4 8-bit values and no less than 2 16-bit values
-
-		switch (type)
-		{
-		case vertex_base_type::f:
-			return size;
-		case vertex_base_type::ub:
-		case vertex_base_type::ub256:
-			return 1;
-		case vertex_base_type::s1:
-		case vertex_base_type::s32k:
-			return size / 2;
-		default:
-			fmt::throw_exception("Unsupported vertex base type %d", static_cast<u8>(type));
-		}
-	}
-
-	u32 push_buffer_vertex_info::get_vertex_id() const
-	{
-		ensure(attr == 0);    // Only ask ATTR0 for vertex ID
-
-		// Which is the current vertex ID to be written to?
-		// NOTE: Fully writing to ATTR0 closes the current block
-		return size ? (dword_count / get_vertex_size_in_dwords()) : 0;
-	}
-
-	void push_buffer_vertex_info::set_vertex_data(u32 attribute_id, u32 vertex_id, u32 sub_index, vertex_base_type type, u32 size, u32 arg)
-	{
-		if (vertex_count && (type != this->type || size != this->size))
-		{
-			// TODO: Should forcefully break the draw call on this step using an execution barrier.
-			// While RSX can handle this behavior without problem, it can only be the product of nonsensical game design.
-			rsx_log.error("Vertex attribute %u was respecced mid-draw (type = %d vs %d, size = %u vs %u). Indexed execution barrier required. Report this to developers.",
-				attribute_id, static_cast<int>(type), static_cast<int>(this->type), size, this->size);
-		}
-
-		this->type = type;
-		this->size = size;
-		this->attr = attribute_id;
-
-		const auto required_vertex_count = (vertex_id + 1);
-		const auto vertex_size = get_vertex_size_in_dwords();
-
-		if (vertex_count != required_vertex_count)
-		{
-			pad_to(required_vertex_count, true);
-			ensure(vertex_count == required_vertex_count);
-		}
-
-		auto current_vertex = data.data() + ((vertex_count - 1) * vertex_size);
-		current_vertex[sub_index] = arg;
-		++dword_count;
-	}
-
-	void push_buffer_vertex_info::pad_to(u32 required_vertex_count, bool skip_last)
-	{
-		if (vertex_count >= required_vertex_count)
-		{
-			return;
-		}
-
-		const auto vertex_size = get_vertex_size_in_dwords();
-		data.resize(vertex_size * required_vertex_count);
-
-		// For all previous verts, copy over the register contents duplicated over the stream.
-		// Internally it appears RSX actually executes the draw commands as they are encountered.
-		// You can change register data contents mid-way for example and it will pick up for the next N draws.
-		// This is how immediate mode is implemented internally.
-		u32* src = rsx::method_registers.register_vertex_info[attr].data.data();
-		u32* dst = data.data() + (vertex_count * vertex_size);
-		u32* end = data.data() + ((required_vertex_count - (skip_last ? 1 : 0)) * vertex_size);
-
-		while (dst < end)
-		{
-			std::memcpy(dst, src, vertex_size * sizeof(u32));
-			dst += vertex_size;
-		}
-
-		vertex_count = required_vertex_count;
-	}
-}
diff --git a/rpcs3/Emu/RSX/rsx_vertex_data.h b/rpcs3/Emu/RSX/rsx_vertex_data.h
index b7261105cb..7e9e59197c 100644
--- a/rpcs3/Emu/RSX/rsx_vertex_data.h
+++ b/rpcs3/Emu/RSX/rsx_vertex_data.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "gcm_enums.h"
-#include "rsx_decode.h"
-#include "Common/simple_array.hpp"
+
 #include "util/types.hpp"
+#include "rsx_utils.h"
 
 namespace rsx
 {
@@ -56,23 +56,64 @@ public:
 
 struct push_buffer_vertex_info
 {
-	u32 attr = 0;
-	u32 size = 0;
+	u8 size = 0;
 	vertex_base_type type = vertex_base_type::f;
 
 	u32 vertex_count = 0;
-	u32 dword_count = 0;
+	u32 attribute_mask = ~0;
 	rsx::simple_array<u32> data;
 
-	push_buffer_vertex_info() = default;
-	~push_buffer_vertex_info() = default;
+	void clear()
+	{
+		if (size)
+		{
+			data.clear();
+			attribute_mask = ~0;
+			vertex_count = 0;
+			size = 0;
+		}
+	}
 
-	u8 get_vertex_size_in_dwords() const;
-	u32 get_vertex_id() const;
+	u8 get_vertex_size_in_dwords(vertex_base_type type) const
+	{
+		//NOTE: Types are always provided to fit into 32-bits
+		//i.e no less than 4 8-bit values and no less than 2 16-bit values
 
-	void clear();
-	void set_vertex_data(u32 attribute_id, u32 vertex_id, u32 sub_index, vertex_base_type type, u32 size, u32 arg);
-	void pad_to(u32 required_vertex_count, bool skip_last);
+		switch (type)
+		{
+		case vertex_base_type::f:
+			return size;
+		case vertex_base_type::ub:
+		case vertex_base_type::ub256:
+			return 1;
+		case vertex_base_type::s1:
+		case vertex_base_type::s32k:
+			return size / 2;
+		default:
+			fmt::throw_exception("Unsupported vertex base type %d", static_cast<u8>(type));
+		}
+	}
+
+	void append_vertex_data(u32 sub_index, vertex_base_type type, u32 arg)
+	{
+		const u32 element_mask = (1 << sub_index);
+		const u8  vertex_size = get_vertex_size_in_dwords(type);
+
+		this->type = type;
+
+		if (attribute_mask & element_mask)
+		{
+			attribute_mask = 0;
+
+			vertex_count++;
+			data.resize(vertex_count * vertex_size);
+		}
+
+		attribute_mask |= element_mask;
+
+		u32* dst = data.data() + ((vertex_count - 1) * vertex_size) + sub_index;
+		*dst = arg;
+	}
 };
 
 struct register_vertex_data_info
diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 002075b5fa..b386e806b5 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -6,63 +6,44 @@
 #include "Emu/system_progress.hpp"
 #include "Emu/system_utils.hpp"
 #include "Emu/perf_meter.hpp"
-#include "Emu/perf_monitor.hpp"
-#include "Emu/vfs_config.h"
-#include "Emu/IPC_config.h"
-#include "Emu/savestate_utils.hpp"
-#include "Emu/cache_utils.hpp"
 
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/PPUDisAsm.h"
 #include "Emu/Cell/PPUAnalyser.h"
 #include "Emu/Cell/SPUThread.h"
-#include "Emu/Cell/SPURecompiler.h"
 #include "Emu/RSX/RSXThread.h"
 #include "Emu/Cell/lv2/sys_process.h"
 #include "Emu/Cell/lv2/sys_sync.h"
 #include "Emu/Cell/lv2/sys_prx.h"
 #include "Emu/Cell/lv2/sys_overlay.h"
-#include "Emu/Cell/lv2/sys_spu.h"
-#include "Emu/Cell/Modules/cellGame.h"
-#include "Emu/Cell/Modules/cellSysutil.h"
 
 #include "Emu/title.h"
 #include "Emu/IdManager.h"
 #include "Emu/RSX/Capture/rsx_replay.h"
-#include "Emu/RSX/Overlays/overlay_message.h"
 
 #include "Loader/PSF.h"
-#include "Loader/TAR.h"
 #include "Loader/ELF.h"
-#include "Loader/disc.h"
-
-#include "rpcs3_version.h"
 
 #include "Utilities/StrUtil.h"
 
 #include "../Crypto/unself.h"
+#include "util/yaml.hpp"
 #include "util/logs.hpp"
-#include "util/init_mutex.hpp"
-#include "util/sysinfo.hpp"
+#include "util/serialization.hpp"
 
+#include <fstream>
 #include <memory>
 #include <regex>
 
 #include "Utilities/JIT.h"
 
-#include "Emu/IPC_socket.h"
+#include "display_sleep_control.h"
 
-#if defined(HAVE_VULKAN)
+#if defined(_WIN32) || defined(HAVE_VULKAN)
 #include "Emu/RSX/VK/VulkanAPI.h"
 #endif
 
-#include "Emu/RSX/GSRender.h"
-
-#ifdef LLVM_AVAILABLE
-#include "llvm/Config/llvm-config.h"
-#endif
-
 LOG_CHANNEL(sys_log, "SYS");
 
 // Preallocate 32 MiB
@@ -76,48 +57,26 @@ std::string g_cfg_defaults;
 
 atomic_t<u64> g_watchdog_hold_ctr{0};
 
-extern bool ppu_load_exec(const ppu_exec_object&, bool virtual_load, const std::string&, utils::serial* = nullptr);
+extern bool ppu_load_exec(const ppu_exec_object&);
 extern void spu_load_exec(const spu_exec_object&);
-extern void spu_load_rel_exec(const spu_rel_object&);
-extern void ppu_precompile(std::vector<std::string>& dir_queue, std::vector<ppu_module<lv2_obj>*>* loaded_prx);
-extern bool ppu_initialize(const ppu_module<lv2_obj>&, bool check_only = false, u64 file_size = 0);
-extern void ppu_finalize(const ppu_module<lv2_obj>&);
+extern void ppu_precompile(std::vector<std::string>& dir_queue, std::vector<lv2_prx*>* loaded_prx);
+extern bool ppu_initialize(const ppu_module&, bool = false);
+extern void ppu_finalize(const ppu_module&);
 extern void ppu_unload_prx(const lv2_prx&);
-extern shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object&, bool virtual_load, const std::string&, s64 = 0, utils::serial* = nullptr);
-extern std::pair<shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_object&, bool virtual_load, const std::string& path, s64 = 0, utils::serial* = nullptr);
-extern bool ppu_load_rel_exec(const ppu_rel_object&);
-
-extern void send_close_home_menu_cmds();
-
-extern void signal_system_cache_can_stay();
-
-fs::file make_file_view(const fs::file& file, u64 offset, u64 size);
-
-extern std::string get_syscache_state_corruption_indicator_file_path(std::string_view dir_path);
+extern std::shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object&, const std::string&, s64 = 0);
+extern std::pair<std::shared_ptr<lv2_overlay>, CellError> ppu_load_overlay(const ppu_exec_object&, const std::string& path, s64 = 0);
 
 fs::file g_tty;
 atomic_t<s64> g_tty_size{0};
 std::array<std::deque<std::string>, 16> g_tty_input;
 std::mutex g_tty_mutex;
-thread_local std::string_view g_tls_serialize_name;
-
-extern thread_local std::string(*g_tls_log_prefix)();
-
-extern f64 get_cpu_program_usage_percent(u64 hash);
 
 // Report error and call std::abort(), defined in main.cpp
-[[noreturn]] void report_fatal_error(std::string_view text, bool is_html = false, bool include_help_text = true);
-
-void initialize_timebased_time(u64 timebased_init, bool reset = false);
+[[noreturn]] void report_fatal_error(std::string_view);
 
 namespace atomic_wait
 {
-	extern void parse_hashtable(bool(*cb)(u64 id, u32 refs, u64 ptr, u32 max_coll));
-}
-
-namespace rsx
-{
-	void set_native_ui_flip();
+	extern void parse_hashtable(bool(*cb)(u64 id, u32 refs, u64 ptr, u32 stats));
 }
 
 template<>
@@ -132,275 +91,23 @@ void fmt_class_string<game_boot_result>::format(std::string& out, u64 arg)
 		case game_boot_result::nothing_to_boot: return "Nothing to boot";
 		case game_boot_result::wrong_disc_location: return "Wrong disc location";
 		case game_boot_result::invalid_file_or_folder: return "Invalid file or folder";
-		case game_boot_result::invalid_bdvd_folder: return "Invalid dev_bdvd folder";
 		case game_boot_result::install_failed: return "Game install failed";
 		case game_boot_result::decryption_error: return "Failed to decrypt content";
 		case game_boot_result::file_creation_error: return "Could not create important files";
 		case game_boot_result::firmware_missing: return "Firmware is missing";
-		case game_boot_result::firmware_version: return "Firmware is too old";
 		case game_boot_result::unsupported_disc_type: return "This disc type is not supported yet";
-		case game_boot_result::savestate_corrupted: return "Savestate data is corrupted or it's not an RPCS3 savestate";
-		case game_boot_result::savestate_version_unsupported: return "Savestate versioning data differs from your RPCS3 build.\nTry to use an older or newer RPCS3 build.\nEspecially if you know the build that created the savestate.";
-		case game_boot_result::still_running: return "Game is still running";
-		case game_boot_result::already_added: return "Game was already added";
-		case game_boot_result::currently_restricted: return "Booting is restricted at the time being";
 		}
 		return unknown;
 	});
 }
 
-template<>
-void fmt_class_string<cfg_mode>::format(std::string& out, u64 arg)
+void Emulator::Init(bool add_only)
 {
-	format_enum(out, arg, [](cfg_mode value)
-	{
-		switch (value)
-		{
-		case cfg_mode::custom: return "custom config";
-		case cfg_mode::custom_selection: return "custom config selection";
-		case cfg_mode::global: return "global config";
-		case cfg_mode::config_override: return "config override";
-		case cfg_mode::continuous: return "continuous config";
-		case cfg_mode::default_config: return "default config";
-		}
-		return unknown;
-	});
-}
-
-void Emulator::CallFromMainThread(std::function<void()>&& func, atomic_t<u32>* wake_up, bool track_emu_state, u64 stop_ctr, std::source_location src_loc) const
-{
-	std::function<void()> final_func = [this, before = IsStopped(true), track_emu_state, thread_name = thread_ctrl::get_name(), src = src_loc
-		, count = (stop_ctr == umax ? +m_stop_ctr : stop_ctr), func = std::move(func)]
-	{
-		const bool call_it = (!track_emu_state || (count == m_stop_ctr && before == IsStopped(true)));
-
-		sys_log.trace("Callback from thread '%s' at [%s] is %s", thread_name, src, call_it ? "called" : "skipped");
-
-		if (call_it)
-		{
-			func();
-		}
-	};
-
-	m_cb.call_from_main_thread(std::move(final_func), wake_up);
-}
-
-void Emulator::BlockingCallFromMainThread(std::function<void()>&& func, bool track_emu_state, std::source_location src_loc) const
-{
-	atomic_t<u32> wake_up = 0;
-
-	sys_log.trace("Blocking Callback from thread '%s' at [%s] is queued", thread_ctrl::get_name(), src_loc);
-
-	CallFromMainThread(std::move(func), &wake_up, track_emu_state, umax, src_loc);
-
-	bool logged = false;
-
-	while (!wake_up)
-	{
-		if (!logged && !thread_ctrl::get_current())
-		{
-			logged = true;
-			sys_log.error("Calling thread of BlockingCallFromMainThread is not of named_thread<>, calling from %s", src_loc);
-		}
-
-		wake_up.wait(0);
-	}
-}
-
-// This function ensures constant initialization order between different compilers and builds
-void init_fxo_for_exec(utils::serial* ar, bool full = false)
-{
-	g_fxo->init<main_ppu_module<lv2_obj>>();
-
-	void init_ppu_functions(utils::serial* ar, bool full);
-
-	if (full)
-	{
-		init_ppu_functions(ar, true);
-	}
-
-	Emu.ConfigurePPUCache();
-
-	g_fxo->init(false, ar, [](){ Emu.ExecPostponedInitCode(); });
-
-	Emu.GetCallbacks().init_gs_render(ar);
-	Emu.GetCallbacks().init_pad_handler(Emu.GetTitleID());
-	Emu.GetCallbacks().init_kb_handler();
-	Emu.GetCallbacks().init_mouse_handler();
-
-	usz pos = 0;
-
-	if (ar)
-	{
-		pos = ar->pos;
-	}
-
-	// TODO: Remove second call when possible
-	Emu.ExecPostponedInitCode();
-
-	if (ar)
-	{
-		ensure(pos == ar->pos);
-
-		(*ar)(Emu.m_savestate_extension_flags1);
-
-		const usz advance = (Emu.m_savestate_extension_flags1 & Emulator::SaveStateExtentionFlags1::SupportsMenuOpenResume ? 32 : 31);
-
-		// Reserved area
-		if (!load_and_check_reserved(*ar, advance))
-		{
-			sys_log.error("Potential failure to load savestate: padding buyes are not 0. %s", *ar);
-		}
-	}
-}
-
-// Some settings are not allowed in certain PPU decoders
-static void fixup_settings(const psf::registry* _psf)
-{
-	if (g_cfg.core.ppu_decoder != ppu_decoder_type::_static)
-	{
-		if (g_cfg.core.ppu_use_nj_bit)
-		{
-			sys_log.todo("The setting '%s' is currently not supported with PPU decoder type '%s' and will therefore be disabled during emulation.", g_cfg.core.ppu_use_nj_bit.get_name(), g_cfg.core.ppu_decoder.get());
-			g_cfg.core.ppu_use_nj_bit.set(false);
-		}
-
-		if (g_cfg.core.ppu_set_vnan)
-		{
-			sys_log.todo("The setting '%s' is currently not supported with PPU decoder type '%s' and will therefore be disabled during emulation.", g_cfg.core.ppu_set_vnan.get_name(), g_cfg.core.ppu_decoder.get());
-			g_cfg.core.ppu_set_vnan.set(false);
-		}
-
-		if (g_cfg.core.ppu_set_fpcc)
-		{
-			sys_log.todo("The setting '%s' is currently not supported with PPU decoder type '%s' and will therefore be disabled during emulation.", g_cfg.core.ppu_set_fpcc.get_name(), g_cfg.core.ppu_decoder.get());
-			g_cfg.core.ppu_set_fpcc.set(false);
-		}
-	}
-
-	if (const u32 psf_resolution = _psf ? psf::get_integer(*_psf, "RESOLUTION", 0) : 0)
-	{
-		const std::map<video_resolution, u32> resolutions
-		{
-			{ video_resolution::_480p,       psf::resolution_flag::_480 | psf::resolution_flag::_480_16_9 },
-			{ video_resolution::_480i,       psf::resolution_flag::_480 | psf::resolution_flag::_480_16_9 },
-			{ video_resolution::_576p,       psf::resolution_flag::_576 | psf::resolution_flag::_576_16_9 },
-			{ video_resolution::_576i,       psf::resolution_flag::_576 | psf::resolution_flag::_576_16_9 },
-			{ video_resolution::_720p,       psf::resolution_flag::_720  },
-			{ video_resolution::_1080p,      psf::resolution_flag::_1080 },
-			{ video_resolution::_1080i,      psf::resolution_flag::_1080 },
-			{ video_resolution::_1600x1080p, psf::resolution_flag::_1080 },
-			{ video_resolution::_1440x1080p, psf::resolution_flag::_1080 },
-			{ video_resolution::_1280x1080p, psf::resolution_flag::_1080 },
-			{ video_resolution::_960x1080p,  psf::resolution_flag::_1080 },
-		};
-
-		const video_resolution resolution = g_cfg.video.resolution;
-		constexpr video_resolution new_resolution = video_resolution::_720p;
-
-		if (!resolutions.contains(resolution) || !(psf_resolution & resolutions.at(resolution)))
-		{
-			sys_log.error("The game does not support a resolution of %s, so we are forcing the resolution to %s.", resolution, new_resolution);
-			g_cfg.video.resolution.set(new_resolution);
-		}
-	}
-
-	if (g_cfg.net.net_active == np_internet_status::disabled && g_cfg.net.psn_status != np_psn_status::disabled)
-	{
-		sys_log.warning("Net status was set to disconnected so psn status was disabled");
-		g_cfg.net.psn_status.set(np_psn_status::disabled);
-	}
-}
-
-extern void dump_executable(std::span<const u8> data, const ppu_module<lv2_obj>* _module, std::string_view title_id)
-{
-	std::string_view filename = _module->path;
-	filename = filename.substr(filename.find_last_of('/') + 1);
-
-	const std::string lower = fmt::to_lower(filename);
-
-	// Format filename and directory name
-	// Make each directory for each file so tools like IDA can work on it cleanly
-	const std::string dir_path = fs::get_cache_dir() + "ppu_progs/" + std::string{!title_id.empty() ? title_id : "untitled"} + fmt::format("-%s-%s", fmt::base57(_module->sha1), filename)  + '/';
-	const std::string file_path = dir_path + (lower.ends_with(".prx") || lower.ends_with(".sprx") ? "prog.prx" : "exec.elf");
-
-	if (fs::create_dir(dir_path) || fs::g_tls_error == fs::error::exist)
-	{
-		if (fs::file out{file_path, fs::create + fs::write})
-		{
-			if (out.size() == data.size())
-			{
-				// Risky optimization: assume if file size match they are equal and does not need to rewrite it
-				// But it is a debug option and if there are problems the user/developer can remove the previous file
-			}
-			else
-			{
-				out.trunc(0);
-				out.write(data.data(), data.size());
-			}
-		}
-		else
-		{
-			sys_log.error("Failed to save decrypted executable of \"%s\": Failure to create file \"%s\" (%s)", Emu.GetBoot(), filename, fs::g_tls_error);
-		}
-	}
-	else
-	{
-		sys_log.error("Failed to save decrypted executable of \"%s\": Failure to create directory \"%s\" (%s)", Emu.GetBoot(), dir_path, fs::g_tls_error);
-	}
-}
-
-void Emulator::Init()
-{
-	// Log LLVM version
-	if (static bool logged_llvm = false; !logged_llvm)
-	{
-#ifndef LLVM_AVAILABLE
-		sys_log.always()("LLVM version: Compiled without LLVM");
-#elif defined (LLVM_VERSION_STRING)
-		sys_log.always()("LLVM version: %s", LLVM_VERSION_STRING);
-#else
-		sys_log.always()("LLVM version: Unknown");
-#endif
-		logged_llvm = true;
-	}
-
 	jit_runtime::initialize();
 
-	const std::string emu_dir = rpcs3::utils::get_emu_dir();
-	auto make_path_verbose = [&](const std::string& path, bool must_exist_outside_emu_dir)
-	{
-		if (fs::is_dir(path))
-		{
-			return true;
-		}
-
-		if (must_exist_outside_emu_dir)
-		{
-			const std::string parent = fs::get_parent_dir(path);
-			const std::string emu_dir_no_delim = emu_dir.substr(0, emu_dir.find_last_not_of(fs::delim) + 1);
-
-			if (parent != emu_dir_no_delim && GetCallbacks().resolve_path(parent) != GetCallbacks().resolve_path(emu_dir_no_delim))
-			{
-				sys_log.fatal("Cannot use '%s' for Virtual File System because it does not exist.\nPlease specify an existing and writable directory path in Toolbar -> Manage -> Virtual File System.", path);
-				return false;
-			}
-		}
-
-		if (!fs::create_path(path))
-		{
-			sys_log.fatal("Failed to create path: %s (%s)", path, fs::g_tls_error);
-			return false;
-		}
-
-		return true;
-	};
-
 	if (!g_tty)
 	{
-		make_path_verbose(fs::get_log_dir(), true);
-
-		const auto tty_path = fs::get_log_dir() + "TTY.log";
+		const auto tty_path = fs::get_cache_dir() + "TTY.log";
 		g_tty.open(tty_path, fs::rewrite + fs::append);
 
 		if (!g_tty)
@@ -410,11 +117,10 @@ void Emulator::Init()
 	}
 
 	g_fxo->reset();
+	g_fxo->need<named_thread<progress_dialog_server>>();
 
 	// Reset defaults, cache them
-	g_cfg_vfs.from_default();
 	g_cfg.from_default();
-	g_cfg.name.clear();
 
 	// Not all renderers are known at compile time, so set a provided default if possible
 	if (m_default_renderer == video_renderer::vulkan && !m_default_graphics_adapter.empty())
@@ -425,113 +131,36 @@ void Emulator::Init()
 
 	g_cfg_defaults = g_cfg.to_string();
 
-	const std::string cfg_path = fs::get_config_dir(true) + "config.yml";
-
-	// Move file from deprecated location to new location
-#ifdef _WIN32
-	const std::string old_path = fs::get_config_dir(false) + "config.yml";
-
-	if (fs::is_file(old_path))
+	// Reload override configuration set via command line
+	if (!m_config_override_path.empty())
 	{
-		sys_log.notice("Found deprecated config.yml file: '%s'", old_path);
-
-		if (!fs::rename(old_path, cfg_path, false))
+		if (const fs::file cfg_file{m_config_override_path, fs::read + fs::create})
 		{
-			(fs::g_tls_error == fs::error::exist ? sys_log.warning : sys_log.error)("Failed to move '%s' to '%s' (error='%s')", old_path, cfg_path, fs::g_tls_error);
-		}
-	}
-#endif
-
-	// Save new global config if it doesn't exist or is empty
-	if (fs::stat_t info{}; !fs::get_stat(cfg_path, info) || info.size == 0)
-	{
-		Emulator::SaveSettings(g_cfg_defaults, {});
-	}
-
-	// Load VFS config
-	g_cfg_vfs.load();
-	sys_log.notice("Using VFS config:\n%s", g_cfg_vfs.to_string());
-
-	// Mount all devices
-	const std::string elf_dir = fs::get_parent_dir(m_path);
-	const std::string dev_bdvd = g_cfg_vfs.get(g_cfg_vfs.dev_bdvd, emu_dir); // Only used for make_path
-	const std::string dev_hdd0 = g_cfg_vfs.get(g_cfg_vfs.dev_hdd0, emu_dir);
-	const std::string dev_hdd1 = g_cfg_vfs.get(g_cfg_vfs.dev_hdd1, emu_dir);
-	const std::string dev_flash = g_cfg_vfs.get_dev_flash();
-	const std::string dev_flash2 = g_cfg_vfs.get_dev_flash2();
-	const std::string dev_flash3 = g_cfg_vfs.get_dev_flash3();
-
-	vfs::mount("/dev_hdd0", dev_hdd0);
-	vfs::mount("/dev_flash", dev_flash);
-	vfs::mount("/dev_flash2", dev_flash2);
-	vfs::mount("/dev_flash3", dev_flash3);
-	vfs::mount("/app_home", g_cfg_vfs.app_home.to_string().empty() ? elf_dir + '/' : g_cfg_vfs.get(g_cfg_vfs.app_home, emu_dir));
-
-	std::string dev_usb;
-
-	for (const auto& [key, value] : g_cfg_vfs.dev_usb.get_map())
-	{
-		const cfg::device_info usb_info = g_cfg_vfs.get_device(g_cfg_vfs.dev_usb, key, emu_dir);
-
-		if (key.size() != 11 || !key.starts_with("/dev_usb00"sv) || key.back() < '0' || key.back() > '7')
-		{
-			sys_log.error("Trying to mount unsupported usb device: %s", key);
-			continue;
-		}
-
-		if (fs::is_dir(usb_info.path))
-			vfs::mount(key, usb_info.path);
-
-		if (key == "/dev_usb000"sv)
-		{
-			dev_usb = usb_info.path;
-		}
-	}
-
-	ensure(!dev_usb.empty());
-
-	if (!hdd1.empty())
-	{
-		vfs::mount("/dev_hdd1", hdd1);
-		sys_log.notice("Hdd1: %s", vfs::get("/dev_hdd1"));
-	}
-
-	const bool is_exitspawn = m_config_mode == cfg_mode::continuous;
-
-	// Load config file
-	if (m_config_mode == cfg_mode::config_override)
-	{
-		if (const fs::file cfg_file{m_config_path, fs::read + fs::create})
-		{
-			sys_log.notice("Applying config override: %s", m_config_path);
-
 			if (!g_cfg.from_string(cfg_file.to_string()))
 			{
-				sys_log.fatal("Failed to apply config: %s. Proceeding with regular configuration.", m_config_path);
-				m_config_path.clear();
-				m_config_mode = cfg_mode::custom;
+				sys_log.fatal("Failed to apply config override: %s. Proceeding with regular configuration.", m_config_override_path);
+				m_config_override_path.clear();
 			}
 			else
 			{
-				sys_log.success("Applied config override: %s", m_config_path);
-				g_cfg.name = m_config_path;
+				sys_log.success("Applied config override: %s", m_config_override_path);
+				g_cfg.name = m_config_override_path;
 			}
 		}
 		else
 		{
-			sys_log.fatal("Failed to access config: %s (%s). Proceeding with regular configuration.", m_config_path, fs::g_tls_error);
-			m_config_path.clear();
-			m_config_mode = cfg_mode::custom;
+			sys_log.fatal("Failed to access config override: %s (%s). Proceeding with regular configuration.", m_config_override_path, fs::g_tls_error);
+			m_config_override_path.clear();
 		}
 	}
 
 	// Reload global configuration
-	if (m_config_mode != cfg_mode::config_override && m_config_mode != cfg_mode::default_config)
+	if (m_config_override_path.empty())
 	{
+		const auto cfg_path = fs::get_config_dir() + "/config.yml";
+
 		if (const fs::file cfg_file{cfg_path, fs::read + fs::create})
 		{
-			sys_log.notice("Applying global config: %s", cfg_path);
-
 			if (!g_cfg.from_string(cfg_file.to_string()))
 			{
 				sys_log.fatal("Failed to apply global config: %s", cfg_path);
@@ -545,95 +174,68 @@ void Emulator::Init()
 		}
 	}
 
-	// Disable incompatible settings
-	fixup_settings(nullptr);
-
-	// Backup config
-	g_backup_cfg.from_string(g_cfg.to_string());
-
 	// Create directories (can be disabled if necessary)
+	const std::string emu_dir = rpcs3::utils::get_emu_dir();
+	const std::string dev_hdd0 = rpcs3::utils::get_hdd0_dir();
+	const std::string dev_hdd1 = g_cfg.vfs.get(g_cfg.vfs.dev_hdd1, emu_dir);
+	const std::string dev_usb = g_cfg.vfs.get(g_cfg.vfs.dev_usb000, emu_dir);
+	const std::string dev_flsh = g_cfg.vfs.get_dev_flash();
+	const std::string dev_flsh2 = g_cfg.vfs.get_dev_flash2();
+	const std::string dev_flsh3 = g_cfg.vfs.get_dev_flash3();
+
+	auto make_path_verbose = [](const std::string& path)
+	{
+		if (!fs::create_path(path))
+		{
+			sys_log.fatal("Failed to create path: %s (%s)", path, fs::g_tls_error);
+		}
+	};
+
 	const std::string save_path = dev_hdd0 + "home/" + m_usr + "/savedata/";
 	const std::string user_path = dev_hdd0 + "home/" + m_usr + "/localusername";
 
 	if (g_cfg.vfs.init_dirs)
 	{
-		make_path_verbose(dev_bdvd, true);
-		make_path_verbose(dev_flash, true);
-		make_path_verbose(dev_flash2, true);
-		make_path_verbose(dev_flash3, true);
+		make_path_verbose(dev_hdd0);
+		make_path_verbose(dev_hdd1);
+		make_path_verbose(dev_flsh);
+		make_path_verbose(dev_flsh2);
+		make_path_verbose(dev_flsh3);
+		make_path_verbose(dev_usb);
+		make_path_verbose(dev_hdd0 + "game/");
+		make_path_verbose(dev_hdd0 + "game/TEST12345/");
+		make_path_verbose(dev_hdd0 + "game/TEST12345/USRDIR/");
+		make_path_verbose(dev_hdd0 + reinterpret_cast<const char*>(u8"game/＄locks/"));
+		make_path_verbose(dev_hdd0 + "home/");
+		make_path_verbose(dev_hdd0 + "home/" + m_usr + "/");
+		make_path_verbose(dev_hdd0 + "home/" + m_usr + "/exdata/");
+		make_path_verbose(save_path);
+		make_path_verbose(dev_hdd0 + "home/" + m_usr + "/trophy/");
 
-		if (make_path_verbose(dev_usb, true))
+		if (!fs::write_file(user_path, fs::create + fs::excl + fs::write, "User"s))
 		{
-			make_path_verbose(dev_usb + "MUSIC/", false);
-			make_path_verbose(dev_usb + "VIDEO/", false);
-			make_path_verbose(dev_usb + "PICTURE/", false);
-			make_path_verbose(dev_usb + "PS3/EXPORT/PSV/", false); // PS1 and PS2 Saves go here
-			make_path_verbose(dev_usb + "PS3/SAVEDATA", false);
-			make_path_verbose(dev_usb + "PS3/THEME", false);
-			make_path_verbose(dev_usb + "PS3/UPDATE", false);
-		}
-
-		if (make_path_verbose(dev_hdd1, true))
-		{
-			make_path_verbose(dev_hdd1 + "caches/", false);
-		}
-
-		if (make_path_verbose(dev_hdd0, true))
-		{
-			make_path_verbose(dev_hdd0 + "game/", false);
-			make_path_verbose(dev_hdd0 + reinterpret_cast<const char*>(u8"game/＄locks/"), false);
-			make_path_verbose(dev_hdd0 + "game/TEST12345/USRDIR/", false); // Some test elfs rely on this
-			make_path_verbose(dev_hdd0 + "home/", false);
-			make_path_verbose(dev_hdd0 + "home/" + m_usr + "/", false);
-			make_path_verbose(dev_hdd0 + "home/" + m_usr + "/exdata/", false);
-			make_path_verbose(save_path, false);
-			make_path_verbose(dev_hdd0 + "home/" + m_usr + "/trophy/", false);
-
-			if (!fs::write_file(user_path, fs::create + fs::excl + fs::write, "User"s))
+			if (fs::g_tls_error != fs::error::exist)
 			{
-				if (fs::g_tls_error != fs::error::exist)
-				{
-					sys_log.fatal("Failed to create file: %s (%s)", user_path, fs::g_tls_error);
-				}
+				sys_log.fatal("Failed to create file: %s (%s)", user_path, fs::g_tls_error);
 			}
-
-			make_path_verbose(dev_hdd0 + "savedata/", false);
-			make_path_verbose(dev_hdd0 + "savedata/vmc/", false);
-			make_path_verbose(dev_hdd0 + "photo/", false);
-			make_path_verbose(dev_hdd0 + "music/", false);
-			make_path_verbose(dev_hdd0 + "theme/", false);
-			make_path_verbose(dev_hdd0 + "video/", false);
-			make_path_verbose(dev_hdd0 + "drm/", false);
-			make_path_verbose(dev_hdd0 + "vsh/", false);
-			make_path_verbose(dev_hdd0 + "crash_report/", false);
-			make_path_verbose(dev_hdd0 + "tmp/", false);
-			make_path_verbose(dev_hdd0 + "mms/", false); //multimedia server for vsh, created from rebuilding the database
-			make_path_verbose(dev_hdd0 + "data/", false);
-			make_path_verbose(dev_hdd0 + "vm/", false);
 		}
 
-		const std::string games_common_dir = g_cfg_vfs.get(g_cfg_vfs.games_dir, emu_dir);
-
-		if (make_path_verbose(games_common_dir, true))
-		{
-			fs::write_file(games_common_dir + "/Disc Games Can Be Put Here For Automatic Detection.txt", fs::create + fs::excl + fs::write, ""s);
-
-#ifdef _WIN32
-			if (const std::string rpcs3_shortcuts = games_common_dir + "/shortcuts"; make_path_verbose(rpcs3_shortcuts, false))
-			{
-				fs::write_file(rpcs3_shortcuts + "/Copyable Shortcuts For Installed Games Would Be Added Here.txt", fs::create + fs::excl + fs::write, ""s);
-			}
-#endif
-		}
+		make_path_verbose(dev_hdd0 + "disc/");
+		make_path_verbose(dev_hdd0 + "savedata/");
+		make_path_verbose(dev_hdd0 + "savedata/vmc/");
+		make_path_verbose(dev_hdd0 + "photo/");
+		make_path_verbose(dev_hdd1 + "caches/");
 	}
 
-	make_path_verbose(fs::get_cache_dir() + "shaderlog/", false);
-	make_path_verbose(fs::get_cache_dir() + "spu_progs/", false);
-	make_path_verbose(fs::get_cache_dir() + "ppu_progs/", false);
-	make_path_verbose(fs::get_parent_dir(get_savestate_file("NO_ID", "/NO_FILE", -1, -1)), false);
-	make_path_verbose(fs::get_config_dir() + "captures/", false);
-	make_path_verbose(fs::get_config_dir() + "sounds/", false);
-	make_path_verbose(patch_engine::get_patches_path(), false);
+	make_path_verbose(fs::get_cache_dir() + "shaderlog/");
+	make_path_verbose(fs::get_cache_dir() + "spu_progs/");
+	make_path_verbose(fs::get_config_dir() + "captures/");
+
+	if (add_only)
+	{
+		// We don't need to initialize the rest if we only add games
+		return;
+	}
 
 	// Log user
 	if (m_usr.empty())
@@ -670,12 +272,6 @@ void Emulator::Init()
 		}
 	}
 
-	if (is_exitspawn)
-	{
-		// Actions not taken during exitspawn
-		return;
-	}
-
 	// Fixup savedata
 	for (const auto& entry : fs::dir(save_path))
 	{
@@ -710,39 +306,10 @@ void Emulator::Init()
 
 	// Limit cache size
 	if (g_cfg.vfs.limit_cache_size)
-	{
 		rpcs3::cache::limit_cache_size();
-	}
 
-	// Wipe clean VSH's temporary directory of choice
-	if (g_cfg.vfs.empty_hdd0_tmp && !fs::remove_all(dev_hdd0 + "tmp/", false, true))
-	{
-		sys_log.error("Could not clean /dev_hdd0/tmp/ (%s)", fs::g_tls_error);
-	}
-
-	// Remove temporary game data that would have been removed when cellGame has been properly shut
-	for (const auto& entry : fs::dir(dev_hdd0 + "game/"))
-	{
-		if (entry.name.starts_with("_GDATA_") && fs::is_dir(dev_hdd0 + "game/" + entry.name + "/USRDIR/"))
-		{
-			const std::string target = dev_hdd0 + "game/" + entry.name;
-
-			if (!fs::remove_all(target, true, true))
-			{
-				sys_log.error("Could not clean \"%s\" (%s)", target, fs::g_tls_error);
-			}
-		}
-	}
-
-	// Load IPC config
-	g_cfg_ipc.load();
-	sys_log.notice("Using IPC config:\n%s", g_cfg_ipc.to_string());
-
-	// Create and start IPC server only if needed
-	if (g_cfg_ipc.get_server_enabled())
-	{
-		g_fxo->init<IPC_socket::IPC_server_manager>(true);
-	}
+	// Initialize patch engine
+	g_fxo->init<patch_engine>()->append_global_patches();
 }
 
 void Emulator::SetUsr(const std::string& user)
@@ -760,76 +327,79 @@ void Emulator::SetUsr(const std::string& user)
 	m_usr = user;
 }
 
-bool Emulator::BootRsxCapture(const std::string& path)
+std::string Emulator::GetBackgroundPicturePath() const
 {
-	if (m_state != system_state::stopped || m_restrict_emu_state_change)
+	// Try to find a custom icon first
+	std::string path = fs::get_config_dir() + "/Icons/game_icons/" + GetTitleID() + "/PIC1.PNG";
+
+	if (fs::is_file(path))
 	{
-		return false;
+		return path;
 	}
 
-	m_state = system_state::loading;
+	path = m_sfo_dir + "/PIC1.PNG";
 
+	if (!fs::is_file(path))
+	{
+		const std::string disc_dir = vfs::get("/dev_bdvd/PS3_GAME");
+
+		if (disc_dir.empty())
+		{
+			// Fallback to ICON0.PNG
+			path = m_sfo_dir + "/ICON0.PNG";
+		}
+		else
+		{
+			// Fallback to PIC1.PNG in disc dir
+			path = disc_dir + "/PIC1.PNG";
+
+			if (!fs::is_file(path))
+			{
+				// Fallback to ICON0.PNG in update dir
+				path = m_sfo_dir + "/ICON0.PNG";
+
+				if (!fs::is_file(path))
+				{
+					// Fallback to ICON0.PNG in disc dir
+					path = disc_dir + "/ICON0.PNG";
+				}
+			}
+		}
+	}
+
+	return path;
+}
+
+bool Emulator::BootRsxCapture(const std::string& path)
+{
 	fs::file in_file(path);
 
 	if (!in_file)
 	{
-		m_state = system_state::stopped;
 		return false;
 	}
 
 	std::unique_ptr<rsx::frame_capture_data> frame = std::make_unique<rsx::frame_capture_data>();
-	utils::serial load;
-	load.set_reading_state();
- 
- 	const std::string lower = fmt::to_lower(path);
+	utils::serial load_manager;
+	load_manager.set_reading_state(in_file.to_vector<u8>());
 
-	if (lower.ends_with(".gz") || lower.ends_with(".zst"))
-	{
-		if (lower.ends_with(".gz"))
-		{
-			load.m_file_handler = make_compressed_serialization_file_handler(std::move(in_file));
-		}
-		else
-		{
-			load.m_file_handler = make_compressed_zstd_serialization_file_handler(std::move(in_file));
-		}
-
-		// Forcefully read some data to check validity
-		load.pop<uchar>();
-		load.pos -= sizeof(uchar);
-
-		if (load.data.empty())
-		{
-			m_state = system_state::stopped;
-			sys_log.error("Failed to unzip rsx capture file!");
-			return false;
-		}
-	}
-	else
-	{
-		load.m_file_handler = make_uncompressed_serialization_file_handler(std::move(in_file));
-	}
-
-	load(*frame);
+	load_manager(*frame);
+	in_file.close();
 
 	if (frame->magic != rsx::c_fc_magic)
 	{
-		m_state = system_state::stopped;
 		sys_log.error("Invalid rsx capture file!");
 		return false;
 	}
 
 	if (frame->version != rsx::c_fc_version)
 	{
-		m_state = system_state::stopped;
 		sys_log.error("Rsx capture file version not supported! Expected %d, found %d", +rsx::c_fc_version, frame->version);
 		return false;
 	}
 
-	if (frame->LE_format != u32{std::endian::little == std::endian::native})
+	if (frame->LE_format != (std::endian::little == std::endian::native))
 	{
-		m_state = system_state::stopped;
-
 		static constexpr std::string_view machines[2]{"Big-Endian", "Little-Endian"};
 
 		sys_log.error("Rsx capture byte endianness not supported! Expected %s format, found %s format"
@@ -844,34 +414,40 @@ bool Emulator::BootRsxCapture(const std::string& path)
 	vm::init();
 	g_fxo->init(false);
 
-	// Initialize progress dialog
-	g_fxo->init<named_thread<progress_dialog_server>>();
-
-	// Initialize performance monitor
-	g_fxo->init<named_thread<perf_monitor>>();
-
 	// PS3 'executable'
 	m_state = system_state::ready;
 	GetCallbacks().on_ready();
 
-	GetCallbacks().init_gs_render(nullptr);
+	GetCallbacks().init_gs_render();
 	GetCallbacks().init_pad_handler("");
 
 	GetCallbacks().on_run(false);
-	m_state = system_state::starting;
+	m_state = system_state::running;
 
-	ensure(g_fxo->init<named_thread<rsx::rsx_replay_thread>>("RSX Replay", std::move(frame)));
+	auto replay_thr = g_fxo->init<named_thread<rsx::rsx_replay_thread>>("RSX Replay", std::move(frame));
+	replay_thr->state -= cpu_flag::stop;
+	replay_thr->state.notify_one(cpu_flag::stop);
 
 	return true;
 }
 
-game_boot_result Emulator::GetElfPathFromDir(std::string& elf_path, const std::string& path)
+game_boot_result Emulator::BootGame(const std::string& path, const std::string& title_id, bool direct, bool add_only, bool force_global_config)
 {
-	if (!fs::is_dir(path))
+	if (!fs::exists(path))
 	{
 		return game_boot_result::invalid_file_or_folder;
 	}
 
+	m_path_old = m_path;
+
+	if (direct || fs::is_file(path))
+	{
+		m_path = path;
+		return Load(title_id, add_only, force_global_config);
+	}
+
+	game_boot_result result = game_boot_result::nothing_to_boot;
+
 	static const char* boot_list[] =
 	{
 		"/EBOOT.BIN",
@@ -886,87 +462,37 @@ game_boot_result Emulator::GetElfPathFromDir(std::string& elf_path, const std::s
 
 		if (fs::is_file(elf))
 		{
-			elf_path = elf;
-			return game_boot_result::no_errors;
+			m_path = elf;
+			result = Load(title_id, add_only, force_global_config);
+			break;
 		}
 	}
 
-	return game_boot_result::invalid_file_or_folder;
-}
-
-game_boot_result Emulator::BootGame(const std::string& path, const std::string& title_id, bool direct, cfg_mode config_mode, const std::string& config_path)
-{
-	if (m_restrict_emu_state_change)
+	if (add_only)
 	{
-		return game_boot_result::currently_restricted;
-	}
-
-	auto save_args = std::make_tuple(m_path, m_path_original, argv, envp, data, disc, klic, hdd1, m_config_mode, m_config_path);
-
-	auto restore_on_no_boot = [&](game_boot_result result)
-	{
-		if (m_state == system_state::stopped || result != game_boot_result::no_errors)
+		for (auto&& entry : fs::dir{ path })
 		{
-			ensure(IsStopped());
-
-			if (m_state == system_state::stopped)
+			if (entry.name == "." || entry.name == "..")
 			{
-				std::tie(m_path, m_path_original, argv, envp, data, disc, klic, hdd1, m_config_mode, m_config_path) = std::move(save_args);
+				continue;
+			}
 
-				if (result != game_boot_result::no_errors)
+			if (entry.is_directory && std::regex_match(entry.name, std::regex("^PS3_GM[[:digit:]]{2}$")))
+			{
+				const std::string elf = path + "/" + entry.name + "/USRDIR/EBOOT.BIN";
+
+				if (fs::is_file(elf))
 				{
-					GetCallbacks().close_gs_frame();
+					m_path = elf;
+					if (const auto err = Load(title_id, add_only, force_global_config); err != game_boot_result::no_errors)
+					{
+						result = err;
+					}
 				}
 			}
-			else
-			{
-				ensure(m_state == system_state::stopping);
-
-				// Execute after Kill() is done
-				Emu.after_kill_callback = [this, result, save_args = std::move(save_args)]() mutable
-				{
-					std::tie(m_path, m_path_original, argv, envp, data, disc, klic, hdd1, m_config_mode, m_config_path) = std::move(save_args);
-
-					if (result != game_boot_result::no_errors)
-					{
-						GetCallbacks().close_gs_frame();
-					}
-				};
-			}
 		}
-
-		return result;
-	};
-
-	if (m_path_original.empty() || config_mode != cfg_mode::continuous)
-	{
-		m_path_original = m_path;
 	}
-
-	m_path_old = m_path;
-
-	m_config_mode = config_mode;
-	m_config_path = config_path;
-
-	// Handle files and special paths inside Load unmodified
-	if (direct || !fs::is_dir(path))
-	{
-		m_path = path;
-
-		return restore_on_no_boot(Load(title_id));
-	}
-
-	game_boot_result result = game_boot_result::nothing_to_boot;
-
-	std::string elf;
-	if (const game_boot_result res = GetElfPathFromDir(elf, path); res == game_boot_result::no_errors)
-	{
-		ensure(!elf.empty());
-		m_path = elf;
-		result = Load(title_id);
-	}
-
-	return restore_on_no_boot(result);
+	return result;
 }
 
 void Emulator::SetForceBoot(bool force_boot)
@@ -974,83 +500,14 @@ void Emulator::SetForceBoot(bool force_boot)
 	m_force_boot = force_boot;
 }
 
-void Emulator::SetContinuousMode(bool continuous_mode)
+game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool force_global_config, bool is_disc_patch)
 {
-	m_continuous_mode = continuous_mode;
+	m_force_global_config = force_global_config;
+	const std::string resolved_path = GetCallbacks().resolve_path(m_path);
 
-	if (GSRender* render = static_cast<GSRender*>(g_fxo->try_get<rsx::thread>()))
+	if (!IsStopped())
 	{
-		render->set_continuous_mode(continuous_mode);
-	}
-}
-
-game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch, usz recursion_count)
-{
-	if (recursion_count == 0 && m_restrict_emu_state_change)
-	{
-		return game_boot_result::currently_restricted;
-	}
-
-	if (recursion_count == 0 && m_state != system_state::stopped)
-	{
-		return game_boot_result::still_running;
-	}
-
-	struct cleanup_t
-	{
-		Emulator* _this;
-		usz recursion_count;
-
-		~cleanup_t() noexcept
-		{
-			if (recursion_count != 0)
-			{
-				return;
-			}
-
-			_this->m_state.compare_and_swap_test(system_state::loading, system_state::stopped);
-
-			if (_this->IsStopped())
-			{
-				_this->Kill(false);
-			}
-		}
-	} cleanup{this, recursion_count};
-
-	ensure(recursion_count != 0 || m_state.compare_and_swap_test(system_state::stopped, system_state::loading));
-
-	const auto guard = MakeEmulationStateGuard();
-
-	// Enable logging
-	rpcs3::utils::configure_logs(true);
-
-	m_ar.reset();
-
-	{
-		if (m_config_mode == cfg_mode::continuous)
-		{
-			// The program is being booted from another running program
-			// CELL_GAME_GAMETYPE_GAMEDATA is not used as boot type
-
-			if (m_cat == "DG"sv)
-			{
-				m_boot_source_type = CELL_GAME_GAMETYPE_DISC;
-			}
-			else if (m_cat == "HM"sv)
-			{
-				m_boot_source_type = CELL_GAME_GAMETYPE_HOME;
-			}
-			else
-			{
-				m_boot_source_type = CELL_GAME_GAMETYPE_HDD;
-			}
-		}
-		else
-		{
-			m_ar = make_savestate_reader(m_path);
-
-			m_boot_source_type = CELL_GAME_GAMETYPE_SYS;
-		}
+		Stop();
 	}
 
 	if (!title_id.empty())
@@ -1058,360 +515,41 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 		m_title_id = title_id;
 	}
 
-	sys_log.notice("Selected config: mode=%s, path=\"%s\"", m_config_mode, m_config_path);
-	sys_log.notice("Path: %s", m_path);
-
-	std::string inherited_ps3_game_path;
-
 	{
-		Init();
+		Init(add_only);
 
-		m_state_inspection_savestate = g_cfg.savestate.state_inspection_mode.get();
-		m_savestate_extension_flags1 = {};
+		// Load game list (maps ABCD12345 IDs to /dev_bdvd/ locations)
+		YAML::Node games;
 
-		bool resolve_path_as_vfs_path = false;
-
-		const bool from_dev_flash = IsPathInsideDir(m_path, g_cfg_vfs.get_dev_flash());
-
-		std::string savestate_build_version;
-		std::string savestate_creation_date;
-		std::string savestate_app_title;
-
-		if (m_ar)
+		if (fs::file f{fs::get_config_dir() + "/games.yml", fs::read + fs::create})
 		{
-			const auto header = m_ar->try_read<savestate_header>().second;
+			auto [result, error] = yaml_load(f.to_string());
 
-			if (header.magic != "RPCS3SAV"_u64)
+			if (!error.empty())
 			{
-				return game_boot_result::savestate_corrupted;
+				sys_log.error("Failed to load games.yml: %s", error);
 			}
 
-			if (header.LE_format != (std::endian::native == std::endian::little) || header.offset >= m_ar->get_size(header.offset))
-			{
-				return game_boot_result::savestate_corrupted;
-			}
-
-			g_cfg.savestate.state_inspection_mode.set(header.state_inspection_support);
-
-			bool is_incompatible = false;
-
-			if (header.flag_versions_is_following_data)
-			{
-				ensure(header.offset == m_ar->pos);
-
-				if (!is_savestate_version_compatible(m_ar->pop<std::vector<version_entry>>(), true))
-				{
-					is_incompatible = true;
-				}
-			}
-			else
-			{
-				// Read data on another container to keep the existing data
-				utils::serial ar_temp;
-				ar_temp.set_reading_state({}, true);
-				ar_temp.swap_handler(*m_ar);
-				ar_temp.seek_pos(header.offset);
-
-				if (!is_savestate_version_compatible(ar_temp.pop<std::vector<version_entry>>(), true))
-				{
-					is_incompatible = true;
-				}
-
-				// Restore file handler
-				ar_temp.swap_handler(*m_ar);
-			}
-
-			const bool contains_version = m_ar->pop<b8>();
-
-			if (contains_version)
-			{
-				savestate_build_version = m_ar->pop<std::string>();
-				savestate_creation_date = m_ar->pop<std::string>();
-				savestate_app_title = m_ar->pop<std::string>();
-				m_ar->pop<std::string>(); // User note (unused)
-
-				(is_incompatible ? sys_log.error : sys_log.success)("Savestate information: creation time: %s, RPCS3 build: \"%s\"\nGame/Title: \"%s\"", savestate_creation_date, savestate_build_version, savestate_app_title);
-			}
-
-			if (is_incompatible)
-			{
-				return game_boot_result::savestate_version_unsupported;
-			}
-
-			usz reserved_count = 32;
-			reserved_count -= (header.flag_versions_is_following_data ? 0 : 1);
-			reserved_count -= (contains_version ? 0 : 1);
-
-			if (!load_and_check_reserved(*m_ar, reserved_count))
-			{
-				return game_boot_result::savestate_version_unsupported;
-			}
-
-			argv.clear();
-			klic.clear();
-
-			std::string disc_info;
-			m_ar->serialize(argv.emplace_back(), disc_info, klic.emplace_back(), m_game_dir, hdd1);
-
-			if (!klic[0])
-			{
-				klic.clear();
-			}
-
-			if (!disc_info.empty() && disc_info[0] != '/')
-			{
-				// Restore disc path for disc games (must exist in games.yml i.e. your game library)
-				m_title_id = disc_info;
-
-				// Load /dev_bdvd/ from game list if available
-				if (std::string game_path = m_games_config.get_path(m_title_id); !game_path.empty())
-				{
-					if (game_path.ends_with("/./"))
-					{
-						// Marked as PS3_GAME directory
-						inherited_ps3_game_path = std::move(game_path).substr(0, game_path.size() - 3);
-					}
-					else
-					{
-						disc = std::move(game_path);
-					}
-				}
-				else if (!g_cfg.savestate.state_inspection_mode)
-				{
-					sys_log.fatal("Disc directory not found. Savestate cannot be loaded. ('%s')", m_title_id);
-					return game_boot_result::invalid_file_or_folder;
-				}
-			}
-
-			auto load_tar = [&](const std::string& path, const std::string& special_file)
-			{
-				const usz size = m_ar->pop<usz>();
-				const usz max_data_size = m_ar->get_size(utils::add_saturate<usz>(size, m_ar->pos));
-
-				if (size % 512 || max_data_size < size || max_data_size - size < m_ar->pos)
-				{
-					fmt::throw_exception("TAR desrialization failed: Invalid size. TAR size: 0x%x, path='%s', ar: %s", size, path, *m_ar);
-				}
-
-				fs::remove_all(path, size == 0);
-
-				if (!special_file.empty())
-				{
-					fs::write_file<true>(special_file, fs::write_new);
-				}
-
-				if (size)
-				{
-					m_ar->breathe(true);
-					m_ar->m_max_data = m_ar->pos + size;
-					ensure(tar_object(*m_ar).extract(path));
-
-					if (m_ar->m_max_data != m_ar->pos)
-					{
-						fmt::throw_exception("TAR deserialization failed: read bytes: 0x%x, expected: 0x%x, path='%s', ar: %s", m_ar->pos - (m_ar->m_max_data - size), size, path, *m_ar);
-					}
-
-					m_ar->m_max_data = umax;
-					m_ar->breathe();
-				}
-			};
-
-			if (!hdd1.empty())
-			{
-				hdd1 = rpcs3::utils::get_hdd1_dir() + "caches/" + hdd1 + "/";
-				load_tar(hdd1, get_syscache_state_corruption_indicator_file_path(hdd1));
-			}
-
-			for (const std::string hdd0_game = rpcs3::utils::get_hdd0_dir() + "game/";;)
-			{
-				const std::string game_data = m_ar->pop<std::string>();
-
-				if (game_data.empty())
-				{
-					break;
-				}
-
-				if (game_data.find_first_of('\0') != umax || !sysutil_check_name_string(game_data.c_str(), 1, CELL_GAME_DIRNAME_SIZE))
-				{
-					const std::span<const u8> dirname{reinterpret_cast<const u8*>(game_data.data()), game_data.size()};
-					fmt::throw_exception("HDD0 deserialization failed: Invalid directory name: %s, ar=%s", dirname.subspan(0, CELL_GAME_DIRNAME_SIZE + 1), *m_ar);
-				}
-
-				load_tar(hdd0_game + game_data, "");
-			}
-
-			// Reserved area
-			if (!load_and_check_reserved(*m_ar, 32))
-			{
-				return game_boot_result::savestate_version_unsupported;
-			}
-
-			if (disc_info.starts_with("/"sv))
-			{
-				// Restore SFO directory for PSN games
-
-				if (disc_info.starts_with("/dev_hdd0"sv))
-				{
-					disc = rpcs3::utils::get_hdd0_dir();
-					disc += std::string_view(disc_info).substr(9);
-				}
-				else if (disc_info.starts_with("/host_root"sv))
-				{
-					sys_log.error("Host root has been used in savestates!");
-					disc = disc_info.substr(9);
-				}
-				else
-				{
-					sys_log.error("Unknown source for game SFO directory: %s", disc_info);
-				}
-
-				m_cat.clear();
-			}
-
-			m_path_old = m_path;
-			resolve_path_as_vfs_path = true;
-		}
-		else if (m_path.starts_with(vfs_boot_prefix))
-		{
-			m_path = m_path.substr(vfs_boot_prefix.size());
-
-			if (!m_path.empty() && m_path[0] != '/')
-			{
-				// Make valid for VFS
-				m_path.insert(0, "/");
-			}
-
-			if (!argv.empty())
-			{
-				argv[0] = m_path;
-			}
-			else
-			{
-				argv.emplace_back(m_path);
-			}
-
-			resolve_path_as_vfs_path =  true;
-		}
-		else if (m_path.starts_with(game_id_boot_prefix))
-		{
-			// Try to boot a game through game ID only
-			m_title_id = m_path.substr(game_id_boot_prefix.size());
-			m_title_id = m_title_id.substr(0, m_title_id.find_first_of(fs::delim));
-
-			if (m_title_id.size() < 3 && m_title_id.find_first_not_of('.') == umax)
-			{
-				// Do not allow if TITLE_ID result in path redirection
-				sys_log.fatal("Game directory not found using GAMEID token. ('%s')", m_title_id);
-				return game_boot_result::invalid_file_or_folder;
-			}
-
-			std::string tail = m_path.substr(game_id_boot_prefix.size() + m_title_id.size());
-
-			if (tail.find_first_not_of(fs::delim) == umax)
-			{
-				// Treat slashes-only trail as if game ID only was provided
-				tail.clear();
-			}
-
-			bool ok = false;
-			std::string title_path;
-
-			// const overload does not create new node on failure
-			if (std::string game_path = m_games_config.get_path(m_title_id); !game_path.empty())
-			{
-				title_path = std::move(game_path);
-			}
-
-			for (std::string test_path :
-			{
-				rpcs3::utils::get_hdd0_dir() + "game/" + m_title_id + "/USRDIR/EBOOT.BIN"
-				, tail.empty() ? "" : title_path + tail + "/USRDIR/EBOOT.BIN"
-				, title_path + "/PS3_GAME/USRDIR/EBOOT.BIN"
-				, title_path + "/USRDIR/EBOOT.BIN"
-			})
-			{
-				if (!test_path.empty() && fs::is_file(test_path))
-				{
-					m_path = std::move(test_path);
-					ok = true;
-					break;
-				}
-			}
-
-			if (!ok)
-			{
-				sys_log.fatal("Game directory not found using GAMEID token. ('%s')", m_title_id + tail);
-				return game_boot_result::invalid_file_or_folder;
-			}
+			games = result;
 		}
 
-		if (resolve_path_as_vfs_path)
+		if (!games.IsMap())
 		{
-			ensure(!argv.empty());
-
-			if (argv[0].starts_with("/dev_hdd0"sv))
-			{
-				m_path = rpcs3::utils::get_hdd0_dir();
-				m_path += std::string_view(argv[0]).substr(9);
-
-				constexpr auto game0_path = "/dev_hdd0/game/"sv;
-
-				if (argv[0].starts_with(game0_path) && !fs::is_file(vfs::get(argv[0])))
-				{
-					std::string dirname = argv[0].substr(game0_path.size());
-					dirname = dirname.substr(0, dirname.find_first_of('/'));
-
-					// Try to load game directory from list if available
-					if (std::string game_path = m_games_config.get_path(m_title_id); !game_path.empty())
-					{
-						disc = std::move(game_path);
-						m_path = disc + argv[0].substr(game0_path.size() + dirname.size());
-					}
-				}
-			}
-			else if (argv[0].starts_with("/dev_flash"sv))
-			{
-				m_path = g_cfg_vfs.get_dev_flash();
-				m_path += std::string_view(argv[0]).substr(10);
-			}
-			else if (argv[0].starts_with("/dev_bdvd"sv))
-			{
-				m_path = disc;
-				m_path += std::string_view(argv[0]).substr(9);
-			}
-			else if (argv[0].starts_with("/host_root/"sv))
-			{
-				sys_log.error("Host root has been used in path redirection!");
-				m_path = argv[0].substr(11);
-			}
-			else if (argv[0].starts_with("/dev_hdd1"sv))
-			{
-				sys_log.error("HDD1 has been used to store executable in path redirection!");
-				m_path = rpcs3::utils::get_hdd1_dir();
-				m_path += std::string_view(argv[0]).substr(9);
-			}
-			else
-			{
-				sys_log.error("Unknown source for path redirection: %s", argv[0]);
-			}
-
-			if (argv.size() >= 1)
-			{
-				// Resolve later properly as if booted through host path
-				argv[0].clear();
-			}
-
-			sys_log.notice("Restored executable path: \'%s\'", m_path);
+			games.reset();
 		}
 
-		const std::string resolved_path = GetCallbacks().resolve_path(m_path);
+		sys_log.notice("Path: %s", m_path);
 
 		const std::string elf_dir = fs::get_parent_dir(m_path);
 
-		// Mount /app_home again since m_path might have changed due to savestates.
-		vfs::mount("/app_home", g_cfg_vfs.app_home.to_string().empty() ? elf_dir + '/' : g_cfg_vfs.get(g_cfg_vfs.app_home, rpcs3::utils::get_emu_dir()));
-
 		// Load PARAM.SFO (TODO)
+		psf::registry _psf;
+		if (fs::file sfov{elf_dir + "/sce_sys/param.sfo"})
+		{
+			m_sfo_dir = elf_dir;
+			_psf = psf::load_object(sfov);
+		}
+		else
 		{
 			if (fs::is_dir(m_path))
 			{
@@ -1436,11 +574,11 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 			}
 			else
 			{
-				m_sfo_dir = rpcs3::utils::get_sfo_dir_from_game_path(fs::get_parent_dir(elf_dir), m_title_id);
+				m_sfo_dir = rpcs3::utils::get_sfo_dir_from_game_path(elf_dir + "/../", m_title_id);
 			}
-		}
 
-		const psf::registry _psf = psf::load_object(m_sfo_dir + "/PARAM.SFO");
+			_psf = psf::load_object(fs::file(m_sfo_dir + "/PARAM.SFO"));
+		}
 
 		m_title = std::string(psf::get_string(_psf, "TITLE", std::string_view(m_path).substr(m_path.find_last_of(fs::delim) + 1)));
 		m_title_id = std::string(psf::get_string(_psf, "TITLE_ID"));
@@ -1461,159 +599,115 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 		sys_log.notice("Category: %s", GetCat());
 		sys_log.notice("Version: APP_VER=%s VERSION=%s", version_app, version_disc);
 
+		if (!add_only && !force_global_config && m_config_override_path.empty())
 		{
-			if (m_config_mode == cfg_mode::custom_selection || (m_config_mode == cfg_mode::continuous && !m_config_path.empty()))
-			{
-				if (fs::file cfg_file{ m_config_path })
-				{
-					sys_log.notice("Applying %s: %s", m_config_mode, m_config_path);
+			const std::string config_path_new = rpcs3::utils::get_custom_config_path(m_title_id);
+			const std::string config_path_old = rpcs3::utils::get_custom_config_path(m_title_id, true);
 
-					if (g_cfg.from_string(cfg_file.to_string()))
-					{
-						g_cfg.name = m_config_path;
-					}
-					else
-					{
-						sys_log.fatal("Failed to apply %s: %s", m_config_mode, m_config_path);
-					}
+			// Load custom config-1
+			if (fs::file cfg_file{ config_path_old })
+			{
+				sys_log.notice("Applying custom config: %s", config_path_old);
+
+				if (!g_cfg.from_string(cfg_file.to_string()))
+				{
+					sys_log.fatal("Failed to apply custom config: %s", config_path_old);
+				}
+			}
+
+			// Load custom config-2
+			if (fs::file cfg_file{ config_path_new })
+			{
+				sys_log.notice("Applying custom config: %s", config_path_new);
+
+				if (g_cfg.from_string(cfg_file.to_string()))
+				{
+					g_cfg.name = config_path_new;
 				}
 				else
 				{
-					sys_log.fatal("Failed to access %s: %s", m_config_mode, m_config_path);
-				}
-			}
-			else if (m_config_mode == cfg_mode::custom)
-			{
-				// Load custom configs
-				for (std::string config_path :
-				{
-					m_path + ".yml",
-					rpcs3::utils::get_custom_config_path(from_dev_flash ? m_path.substr(m_path.find_last_of(fs::delim) + 1) : m_title_id),
-				})
-				{
-					if (config_path.empty())
-					{
-						continue;
-					}
-
-					if (fs::file cfg_file{config_path})
-					{
-						sys_log.notice("Applying custom config: %s", config_path);
-
-						if (g_cfg.from_string(cfg_file.to_string()))
-						{
-							g_cfg.name = config_path;
-							m_config_path = config_path;
-							break;
-						}
-
-						sys_log.fatal("Failed to apply custom config: %s", config_path);
-					}
+					sys_log.fatal("Failed to apply custom config: %s", config_path_new);
 				}
 			}
 
-			// Disable incompatible settings
-			fixup_settings(&_psf);
-
-			// Force audio provider
-			if (m_path.ends_with("vsh.self"sv))
+			// Load custom config-3
+			if (fs::file cfg_file{ m_path + ".yml" })
 			{
-				g_cfg.audio.provider.set(audio_provider::rsxaudio);
-			}
-			else
-			{
-				g_cfg.audio.provider.set(audio_provider::cell_audio);
-			}
+				sys_log.notice("Applying custom config: %s.yml", m_path);
 
-			// Backup config
-			g_backup_cfg.from_string(g_cfg.to_string());
+				if (!g_cfg.from_string(cfg_file.to_string()))
+				{
+					sys_log.fatal("Failed to apply custom config: %s.yml", m_path);
+				}
+			}
 		}
 
-		// Get localized title
-		m_localized_title = std::string(psf::get_string(_psf, fmt::format("TITLE_%02d", static_cast<s32>(g_cfg.sys.language.get())), m_title));
-		sys_log.notice("Localized Title: %s", GetLocalizedTitle());
+		initalize_timebased_time();
 
 		// Set RTM usage
-		g_use_rtm = utils::has_rtm() && (((utils::has_mpx() && !utils::has_tsx_force_abort()) && g_cfg.core.enable_TSX == tsx_usage::enabled) || g_cfg.core.enable_TSX == tsx_usage::forced);
+		g_use_rtm = utils::has_rtm() && ((utils::has_mpx() && g_cfg.core.enable_TSX == tsx_usage::enabled) || g_cfg.core.enable_TSX == tsx_usage::forced);
 
+		// Log some extra info in case of boot
+		if (!add_only)
 		{
-			// Log some extra info in case of boot
-#if defined(HAVE_VULKAN)
+#if defined(_WIN32) || defined(HAVE_VULKAN)
 			if (g_cfg.video.renderer == video_renderer::vulkan)
 			{
 				sys_log.notice("Vulkan SDK Revision: %d", VK_HEADER_VERSION);
 			}
 #endif
+
 			sys_log.notice("Used configuration:\n%s\n", g_cfg.to_string());
 
-			if (g_use_rtm && (!utils::has_mpx() || utils::has_tsx_force_abort()))
+			if (g_use_rtm && !utils::has_mpx())
 			{
 				sys_log.warning("TSX forced by User");
 			}
-
-			// Initialize patch engine
-			g_fxo->need<patch_engine>();
-
-			// Load patches from different locations
-			g_fxo->get<patch_engine>().append_global_patches();
-			g_fxo->get<patch_engine>().append_title_patches(m_title_id);
 		}
 
 		if (g_use_rtm)
 		{
 			// Update supplementary settings
 			const f64 _1ns = utils::get_tsc_freq() / 1000'000'000.;
-			g_rtm_tx_limit1 = static_cast<u64>(g_cfg.core.tx_limit1_ns * _1ns);
-			g_rtm_tx_limit2 = static_cast<u64>(g_cfg.core.tx_limit2_ns * _1ns);
+			g_rtm_tx_limit1 = g_cfg.core.tx_limit1_ns * _1ns;
+			g_rtm_tx_limit2 = g_cfg.core.tx_limit2_ns * _1ns;
 		}
 
-		// Set bdvd_dir
-		std::string bdvd_dir = g_cfg_vfs.get(g_cfg_vfs.dev_bdvd, rpcs3::utils::get_emu_dir());
+		// Load patches from different locations
+		g_fxo->get<patch_engine>().append_title_patches(m_title_id);
+
+		// Mount all devices
+		const std::string emu_dir = rpcs3::utils::get_emu_dir();
+		std::string bdvd_dir = g_cfg.vfs.dev_bdvd;
+
+		// Mount default relative path to non-existent directory
+		vfs::mount("/dev_hdd0", g_cfg.vfs.get(g_cfg.vfs.dev_hdd0, emu_dir));
+		vfs::mount("/dev_flash", g_cfg.vfs.get_dev_flash());
+		vfs::mount("/dev_flash2", g_cfg.vfs.get_dev_flash2());
+		vfs::mount("/dev_flash3", g_cfg.vfs.get_dev_flash3());
+		vfs::mount("/dev_usb", g_cfg.vfs.get(g_cfg.vfs.dev_usb000, emu_dir));
+		vfs::mount("/dev_usb000", g_cfg.vfs.get(g_cfg.vfs.dev_usb000, emu_dir));
+		vfs::mount("/app_home", g_cfg.vfs.app_home.to_string().empty() ? elf_dir + '/' : g_cfg.vfs.get(g_cfg.vfs.app_home, emu_dir));
+
+		if (!hdd1.empty())
 		{
-			if (!bdvd_dir.empty())
-			{
-				if (bdvd_dir.back() != fs::delim[0] && bdvd_dir.back() != fs::delim[1])
-				{
-					bdvd_dir.push_back('/');
-				}
-
-				if (!fs::is_file(bdvd_dir + "PS3_DISC.SFB"))
-				{
-					if (fs::get_dir_size(bdvd_dir) == 0)
-					{
-						// Ignore empty dir. We will need it later for disc games in dev_hdd0.
-						sys_log.notice("Ignoring empty vfs BDVD directory: '%s'", bdvd_dir);
-					}
-					else
-					{
-						// Unuse if invalid
-						sys_log.error("Failed to use custom BDVD directory: '%s'", bdvd_dir);
-					}
-
-					bdvd_dir.clear();
-				}
-			}
+			vfs::mount("/dev_hdd1", hdd1);
+			sys_log.notice("Hdd1: %s", vfs::get("/dev_hdd1"));
 		}
 
 		// Special boot mode (directory scan)
-		if (fs::is_dir(m_path))
+		if (!add_only && fs::is_dir(m_path))
 		{
 			m_state = system_state::ready;
 			GetCallbacks().on_ready();
-			ensure(g_fxo->init<main_ppu_module<lv2_obj>>());
 			vm::init();
+			g_fxo->init(false);
+			Run(false);
 			m_force_boot = false;
 
 			// Force LLVM recompiler
 			g_cfg.core.ppu_decoder.from_default();
 
-			// Force SPU cache and precompilation
-			g_cfg.core.llvm_precompilation.set(true);
-			g_cfg.core.spu_cache.set(true);
-
-			// Disable incompatible settings
-			fixup_settings(&_psf);
-
 			// Force LLE lib loading mode
 			g_cfg.core.libraries_control.set_set([]()
 			{
@@ -1632,19 +726,18 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 			// Fake arg (workaround)
 			argv.resize(1);
 			argv[0] = "/dev_bdvd/PS3_GAME/USRDIR/EBOOT.BIN";
-			m_dir = "/dev_bdvd/PS3_GAME/";
-
-			std::string path;
-			std::vector<std::string> dir_queue;
-			dir_queue.emplace_back(m_path + '/');
-
-			init_fxo_for_exec(nullptr, true);
+			m_dir = "/dev_bdvd/PS3_GAME";
 
+			g_fxo->init<named_thread>("SPRX Loader"sv, [this]
 			{
+				std::string path;
+				std::vector<std::string> dir_queue;
+				dir_queue.emplace_back(m_path + '/');
+
 				if (m_title_id.empty())
 				{
 					// Check if we are trying to scan vsh/module
-					const std::string vsh_path = g_cfg_vfs.get_dev_flash() + "vsh/module";
+					const std::string vsh_path = g_cfg.vfs.get_dev_flash() + "vsh/module";
 
 					if (IsPathInsideDir(m_path, vsh_path))
 					{
@@ -1662,9 +755,8 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 						if (fs::is_file(hdd0_path + "/USRDIR/EBOOT.BIN"))
 						{
 							m_path = hdd0_path;
+							dir_queue.emplace_back(m_path + '/');
 						}
-
-						dir_queue.emplace_back(hdd0_path + '/');
 					}
 
 					// Memorize path to EBOOT.BIN
@@ -1682,115 +774,125 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 
 					fs::file src{path};
 
-					src = decrypt_self(src);
+					src = decrypt_self(std::move(src));
 
 					const ppu_exec_object obj = src;
 
-					if (obj == elf_error::ok && ppu_load_exec(obj, true, path))
+					if (obj == elf_error::ok)
 					{
-						ensure(g_fxo->try_get<main_ppu_module<lv2_obj>>())->path = path;
+						auto& _main = g_fxo->get<ppu_module>();
+
+						ppu_load_exec(obj);
+
+						_main.path = path;
+
+						ConfigurePPUCache();
+
+						ppu_initialize(_main);
 					}
 					else
 					{
 						sys_log.error("Failed to load binary '%s' (%s)", path, obj.get_error());
 					}
 				}
-			}
-
-			g_fxo->init<named_thread>("SPRX Loader"sv, [this, dir_queue]() mutable
-			{
-				std::vector<ppu_module<lv2_obj>*> mod_list;
-
-				if (auto& _main = *ensure(g_fxo->try_get<main_ppu_module<lv2_obj>>()); !_main.path.empty())
+				else
 				{
-					if (!_main.analyse(0, _main.elf_entry, _main.seg0_code_end, _main.applied_patches, std::vector<u32>{}, [](){ return Emu.IsStopped(); }))
-					{
-						return;
-					}
-
-					Emu.ConfigurePPUCache();
-					ppu_initialize(_main);
-					mod_list.emplace_back(&_main);
+					// Workaround for analyser glitches
+					ensure(vm::falloc(0x10000, 0xf0000, vm::main));
 				}
 
-				if (Emu.IsStopped())
+				if (IsStopped())
 				{
+					m_path = m_path_old; // Reset m_path to fix boot from gui
+					GetCallbacks().on_stop(); // Call on_stop to refresh gui
 					return;
 				}
 
-				ppu_precompile(dir_queue, mod_list.empty() ? nullptr : &mod_list);
-
-				if (Emu.IsStopped())
-				{
-					return;
-				}
-
-				spu_cache::initialize(false);
+				ppu_precompile(dir_queue, nullptr);
 
 				// Exit "process"
-				CallFromMainThread([this]
+				CallAfter([]
 				{
-					Emu.Kill(false);
-					m_path = m_path_old; // Reset m_path to fix boot from gui
+					Emu.SetForceBoot(true);
+					Emu.Stop();
 				});
-			});
 
-			Run(false);
+				m_path = m_path_old; // Reset m_path to fix boot from gui
+				GetCallbacks().on_stop(); // Call on_stop to refresh gui
+			});
 
 			return game_boot_result::no_errors;
 		}
 
-		// Check microphone permissions
-		if (g_cfg.audio.microphone_type != microphone_handler::null)
-		{
-			if (const std::vector<std::string> device_list = fmt::split(g_cfg.audio.microphone_devices.to_string(), {"@@@"}); !device_list.empty())
-			{
-				Emu.GetCallbacks().check_microphone_permissions();
-			}
-		}
-
 		// Detect boot location
+		constexpr usz game_dir_size = 8; // size of PS3_GAME and PS3_GMXX
 		const std::string hdd0_game = vfs::get("/dev_hdd0/game/");
+		const std::string hdd0_disc = vfs::get("/dev_hdd0/disc/");
 		const bool from_hdd0_game   = IsPathInsideDir(m_path, hdd0_game);
+		const bool from_dev_flash   = IsPathInsideDir(m_path, g_cfg.vfs.get_dev_flash());
 
-		if (game_boot_result error = VerifyPathCasing(m_path, hdd0_game, from_hdd0_game); error != game_boot_result::no_errors)
+#ifdef _WIN32
+		// m_path might be passed from command line with differences in uppercase/lowercase on windows.
+		if ((!from_hdd0_game && IsPathInsideDir(fmt::to_lower(m_path), fmt::to_lower(hdd0_game))) ||
+			(!from_dev_flash && IsPathInsideDir(fmt::to_lower(m_path), fmt::to_lower(g_cfg.vfs.get_dev_flash()))))
 		{
-			return error;
-		}
-
-		if (game_boot_result error = VerifyPathCasing(m_path, g_cfg_vfs.get_dev_flash(), from_dev_flash); error != game_boot_result::no_errors)
-		{
-			return error;
+			// Let's just abort to prevent errors down the line.
+			sys_log.error("The boot path seems to contain incorrectly cased characters. Please adjust the path and try again.");
+			return game_boot_result::invalid_file_or_folder;
 		}
+#endif
 
 		// Mount /dev_bdvd/ if necessary
 		if (bdvd_dir.empty() && disc.empty())
 		{
-			std::string sfb_dir;
-			GetBdvdDir(bdvd_dir, sfb_dir, m_game_dir, elf_dir);
-
-			if (!sfb_dir.empty() && from_hdd0_game)
+			// Find /USRDIR position
+#ifdef _WIN32
+			if (const usz usrdir_pos = std::max<usz>(elf_dir.rfind("/USRDIR"sv) + 1, elf_dir.rfind("\\USRDIR"sv) + 1) - 1; usrdir_pos != umax)
+#else
+			if (const usz usrdir_pos = elf_dir.rfind("/USRDIR"); usrdir_pos != umax)
+#endif
 			{
-				// Booting disc game from wrong location
-				sys_log.error("Disc game %s found at invalid location /dev_hdd0/game/", m_title_id);
+				const std::string main_dir = elf_dir.substr(0, usrdir_pos);
 
-				const std::string games_common = rpcs3::utils::get_games_dir();
-				const std::string dst_dir = games_common + sfb_dir.substr(hdd0_game.size());
-
-				// Move and retry from correct location
-				if (fs::create_path(fs::get_parent_dir(dst_dir)) && fs::rename(sfb_dir, dst_dir, false))
+				if (const std::string sfb_dir = fs::get_parent_dir(main_dir);
+					!sfb_dir.empty() && fs::is_file(sfb_dir + "/PS3_DISC.SFB"))
 				{
-					sys_log.success("Disc game %s moved to special location '%s'", m_title_id, dst_dir);
-					m_path = games_common + m_path.substr(hdd0_game.size());
-					return Load(m_title_id);
-				}
+					if (from_hdd0_game)
+					{
+						// Booting disc game from wrong location
+						sys_log.error("Disc game %s found at invalid location /dev_hdd0/game/", m_title_id);
 
-				sys_log.error("Failed to move disc game %s to '%s' (%s)", m_title_id, dst_dir, fs::g_tls_error);
-				return game_boot_result::wrong_disc_location;
+						// Move and retry from correct location
+						if (fs::rename(elf_dir + "/../../", hdd0_disc + elf_dir.substr(hdd0_game.size()) + "/../../", false))
+						{
+							sys_log.success("Disc game %s moved to special location /dev_hdd0/disc/", m_title_id);
+							return m_path = hdd0_disc + m_path.substr(hdd0_game.size()), Load(m_title_id, add_only, force_global_config);
+						}
+
+						sys_log.error("Failed to move disc game %s to /dev_hdd0/disc/ (%s)", m_title_id, fs::g_tls_error);
+						return game_boot_result::wrong_disc_location;
+					}
+
+					bdvd_dir = sfb_dir + "/";
+
+					// Find game dir
+					if (const std::string main_dir_name = main_dir.substr(main_dir.find_last_of(fs::delim) + 1);
+						main_dir_name.size() == game_dir_size)
+					{
+						m_game_dir = main_dir_name;
+					}
+					else
+					{
+						// Show an error and reset game dir for now
+						m_game_dir = "PS3_GAME";
+						sys_log.error("Could not find proper game dir path for %s", elf_dir);
+						return game_boot_result::unsupported_disc_type;
+					}
+				}
 			}
 		}
 
-		if (bdvd_dir.empty() && disc.empty() && !is_disc_patch)
+		if (bdvd_dir.empty() && !is_disc_patch)
 		{
 			// Reset original disc game dir if this is neither disc nor disc patch
 			m_game_dir = "PS3_GAME";
@@ -1800,17 +902,9 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 		if ((is_disc_patch || m_cat == "GD") && bdvd_dir.empty() && disc.empty())
 		{
 			// Load /dev_bdvd/ from game list if available
-			if (std::string game_path = m_games_config.get_path(m_title_id); !game_path.empty())
+			if (auto node = games[m_title_id])
 			{
-				if (game_path.ends_with("/./"))
-				{
-					// Marked as PS3_GAME directory
-					inherited_ps3_game_path = std::move(game_path).substr(0, game_path.size() - 3);
-				}
-				else
-				{
-					bdvd_dir = std::move(game_path);
-				}
+				bdvd_dir = node.Scalar();
 			}
 			else
 			{
@@ -1822,53 +916,46 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 		// Check /dev_bdvd/
 		if (disc.empty() && !bdvd_dir.empty() && fs::is_dir(bdvd_dir))
 		{
+			fs::file sfb_file;
+
 			vfs::mount("/dev_bdvd", bdvd_dir);
 			sys_log.notice("Disc: %s", vfs::get("/dev_bdvd"));
 
 			vfs::mount("/dev_bdvd/PS3_GAME", bdvd_dir + m_game_dir + "/");
 			sys_log.notice("Game: %s", vfs::get("/dev_bdvd/PS3_GAME"));
 
-			if (const std::string sfb_path = vfs::get("/dev_bdvd/PS3_DISC.SFB"); !IsValidSfb(sfb_path))
+			const auto sfb_path = vfs::get("/dev_bdvd/PS3_DISC.SFB");
+
+			if (!sfb_file.open(sfb_path) || sfb_file.size() < 4 || sfb_file.read<u32>() != ".SFB"_u32)
 			{
 				sys_log.error("Invalid disc directory for the disc game %s. (%s)", m_title_id, sfb_path);
 				return game_boot_result::invalid_file_or_folder;
 			}
 
-			const auto game_psf = psf::load_object(vfs::get("/dev_bdvd/PS3_GAME/PARAM.SFO"));
+			const auto game_psf = psf::load_object(fs::file{vfs::get("/dev_bdvd/PS3_GAME/PARAM.SFO")});
 			const auto bdvd_title_id = psf::get_string(game_psf, "TITLE_ID");
 
-			if (m_title_id.empty())
+			if (bdvd_title_id != m_title_id)
 			{
-				// We are most likely booting a binary inside a disc directory
-				sys_log.error("Booting binary without TITLE_ID inside disc dir of '%s'", bdvd_title_id);
+				sys_log.error("Unexpected disc directory for the disc game %s (found %s)", m_title_id, bdvd_title_id);
+				return game_boot_result::invalid_file_or_folder;
 			}
-			else
-			{
-				if (bdvd_title_id != m_title_id)
-				{
-					// Not really an error just an odd situation
-					sys_log.error("Unexpected PARAM.SFO found in disc directory '%s' (found '%s')", m_title_id, bdvd_title_id);
-				}
 
-				// Store /dev_bdvd/ location
-				if (games_config::result res = m_games_config.add_game(m_title_id, bdvd_dir); res == games_config::result::success)
-				{
-					sys_log.notice("Registered BDVD game directory for title '%s': %s", m_title_id, bdvd_dir);
-				}
-				else if (res == games_config::result::failure)
-				{
-					sys_log.error("Failed to save BDVD location of title '%s' (error=%s)", m_title_id, fs::g_tls_error);
-				}
-			}
+			// Store /dev_bdvd/ location
+			games[m_title_id] = bdvd_dir;
+			YAML::Emitter out;
+			out << games;
+
+			fs::pending_file temp(fs::get_config_dir() + "/games.yml");
+			temp.file.write(out.c_str(), out.size());
+			temp.commit();
 		}
 		else if (m_cat == "1P" && from_hdd0_game)
 		{
 			// PS1 Classic located in dev_hdd0/game
 			sys_log.notice("PS1 Game: %s, %s", m_title_id, m_title);
 
-			const std::string tail = m_path.substr(hdd0_game.size());
-			const std::string dirname = fmt::trim_front(tail, fs::delim).substr(0, tail.find_first_of(fs::delim));
-			const std::string game_path = "/dev_hdd0/game/" + dirname;
+			const std::string game_path = "/dev_hdd0/game/" + m_path.substr(hdd0_game.size(), 9);
 
 			argv.resize(9);
 			argv[0] = "/dev_flash/ps1emu/ps1_newemu.self";
@@ -1881,8 +968,8 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 			argv[7] = "2";                        // ??? arg7 2 -- full screen on/off 2/1 ?
 			argv[8] = "1";                        // ??? arg8 2 -- smoothing	on/off	= 1/0 ?
 
-			// TODO, this seems like it would normally be done by sysutil etc
-			// Basically make 2 128KB memory cards 0 filled and let the games handle formatting.
+			//TODO, this seems like it would normally be done by sysutil etc
+			//Basically make 2 128KB memory cards 0 filled and let the games handle formatting.
 
 			fs::file card_1_file(vfs::get("/dev_hdd0/savedata/vmc/" + argv[1]), fs::write + fs::create);
 			card_1_file.trunc(128 * 1024);
@@ -1894,9 +981,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 			// PSP Remaster located in dev_hdd0/game
 			sys_log.notice("PSP Remaster Game: %s, %s", m_title_id, m_title);
 
-			const std::string tail = m_path.substr(hdd0_game.size());
-			const std::string dirname = fmt::trim_front(tail, fs::delim).substr(0, tail.find_first_of(fs::delim));
-			const std::string game_path = "/dev_hdd0/game/" + dirname;
+			const std::string game_path = "/dev_hdd0/game/" + m_path.substr(hdd0_game.size(), 9);
 
 			argv.resize(2);
 			argv[0] = "/dev_flash/pspemu/psp_emulator.self";
@@ -1905,46 +990,12 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 		else if (m_cat != "DG" && m_cat != "GD")
 		{
 			// Don't need /dev_bdvd
-
-			if (!m_title_id.empty() && !from_hdd0_game && m_cat == "HG")
-			{
-				std::string game_dir = m_sfo_dir;
-
-				// Add HG games not in HDD0 to games.yml
-				[[maybe_unused]] const games_config::result res = m_games_config.add_external_hdd_game(m_title_id, game_dir);
-
-				const std::string dir = fmt::trim(game_dir.substr(fs::get_parent_dir_view(game_dir).size() + 1), fs::delim);
-				vfs::mount("/dev_hdd0/game/" + dir, game_dir + '/');
-			}
 		}
-		else if (!inherited_ps3_game_path.empty() || (from_hdd0_game && m_cat == "DG" && disc.empty()))
+		else if (m_cat == "DG" && from_hdd0_game)
 		{
 			// Disc game located in dev_hdd0/game
-			bdvd_dir = g_cfg_vfs.get(g_cfg_vfs.dev_bdvd, rpcs3::utils::get_emu_dir());
-
-			if (fs::get_dir_size(bdvd_dir))
-			{
-				sys_log.error("Failed to load disc game from dev_hdd0. The virtual bdvd_dir path does not exist or the directory is not empty: '%s'", bdvd_dir);
-				return game_boot_result::invalid_bdvd_folder;
-			}
-
-			// TODO: Verify timestamps and error codes with sys_fs
-			vfs::mount("/dev_bdvd", bdvd_dir);
-
-			vfs::mount("/dev_bdvd/PS3_GAME", inherited_ps3_game_path.empty() ? hdd0_game + m_path.substr(hdd0_game.size(), 10) : inherited_ps3_game_path);
-
-			const std::string new_ps3_game = vfs::get("/dev_bdvd/PS3_GAME");
-			sys_log.notice("Game: %s", new_ps3_game);
-
-			// Store /dev_bdvd/PS3_GAME location
-			if (games_config::result res = m_games_config.add_game(m_title_id, new_ps3_game + "/./"); res == games_config::result::success)
-			{
-				sys_log.notice("Registered BDVD/PS3_GAME game directory for title '%s': %s", m_title_id, new_ps3_game);
-			}
-			else if (res == games_config::result::failure)
-			{
-				sys_log.error("Failed to save BDVD/PS3_GAME location of title '%s' (error=%s)", m_title_id, fs::g_tls_error);
-			}
+			vfs::mount("/dev_bdvd/PS3_GAME", hdd0_game + m_path.substr(hdd0_game.size(), 10));
+			sys_log.notice("Game: %s", vfs::get("/dev_bdvd/PS3_GAME"));
 		}
 		else if (disc.empty())
 		{
@@ -1956,26 +1007,27 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 			// Disc game
 			bdvd_dir = disc;
 			vfs::mount("/dev_bdvd", bdvd_dir);
-			vfs::mount("/dev_bdvd/PS3_GAME", bdvd_dir + m_game_dir);
-			sys_log.notice("Disk: %s, Dir: %s", vfs::get("/dev_bdvd"), m_game_dir);
+			sys_log.notice("Disk: %s", vfs::get("/dev_bdvd"));
 		}
 
-		// Initialize progress dialog
-		g_fxo->init<named_thread<progress_dialog_server>>();
-
-		// Initialize performance monitor
-		g_fxo->init<named_thread<perf_monitor>>();
+		if (add_only)
+		{
+			sys_log.notice("Finished to add data to games.yml by boot for: %s", m_path);
+			m_path = m_path_old; // Reset m_path to fix boot from gui
+			return game_boot_result::no_errors;
+		}
 
+		// Set title to actual disc title if necessary
 		const std::string disc_sfo_dir = vfs::get("/dev_bdvd/PS3_GAME/PARAM.SFO");
 
-		const auto disc_psf_obj = psf::load_object(disc_sfo_dir);
+		const auto disc_psf_obj = psf::load_object(fs::file{ disc_sfo_dir });
 
 		// Install PKGDIR, INSDIR, PS3_EXTRA
 		if (!bdvd_dir.empty())
 		{
 			std::string ins_dir = vfs::get("/dev_bdvd/PS3_GAME/INSDIR/");
 			std::string pkg_dir = vfs::get("/dev_bdvd/PS3_GAME/PKGDIR/");
-			std::string extra_dir = vfs::get("/dev_bdvd/PS3_EXTRA/");
+			std::string extra_dir = vfs::get("/dev_bdvd/PS3_GAME/PS3_EXTRA/");
 			fs::file lock_file;
 
 			for (const auto path_ptr : {&ins_dir, &pkg_dir, &extra_dir})
@@ -1998,19 +1050,17 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 				}
 			}
 
-			std::vector<std::string> pkgs;
-
 			if (!lock_file && !ins_dir.empty())
 			{
 				sys_log.notice("Found INSDIR: %s", ins_dir);
 
 				for (auto&& entry : fs::dir{ins_dir})
 				{
-					const std::string pkg_file = ins_dir + entry.name;
-
-					if (!entry.is_directory && entry.name.ends_with(".PKG"))
+					const std::string pkg = ins_dir + entry.name;
+					if (!entry.is_directory && entry.name.ends_with(".PKG") && !rpcs3::utils::install_pkg(pkg))
 					{
-						pkgs.push_back(pkg_file);
+						sys_log.error("Failed to install %s", pkg);
+						return game_boot_result::install_failed;
 					}
 				}
 			}
@@ -2025,9 +1075,10 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 					{
 						const std::string pkg_file = pkg_dir + entry.name + "/INSTALL.PKG";
 
-						if (fs::is_file(pkg_file))
+						if (fs::is_file(pkg_file) && !rpcs3::utils::install_pkg(pkg_file))
 						{
-							pkgs.push_back(pkg_file);
+							sys_log.error("Failed to install %s", pkg_file);
+							return game_boot_result::install_failed;
 						}
 					}
 				}
@@ -2043,31 +1094,15 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 					{
 						const std::string pkg_file = extra_dir + entry.name + "/DATA000.PKG";
 
-						if (fs::is_file(pkg_file))
+						if (fs::is_file(pkg_file) && !rpcs3::utils::install_pkg(pkg_file))
 						{
-							pkgs.push_back(pkg_file);
+							sys_log.error("Failed to install %s", pkg_file);
+							return game_boot_result::install_failed;
 						}
 					}
 				}
 			}
 
-			if (!pkgs.empty())
-			{
-				bool install_success = true;
-				BlockingCallFromMainThread([this, &pkgs, &install_success]()
-				{
-					if (!GetCallbacks().on_install_pkgs(pkgs))
-					{
-						install_success = false;
-					}
-				});
-				if (!install_success)
-				{
-					sys_log.error("Failed to install packages");
-					return game_boot_result::install_failed;
-				}
-			}
-
 			if (!lock_file)
 			{
 				// Create lock file to prevent double installation
@@ -2077,44 +1112,15 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 		}
 
 		// Check game updates
-		if (const std::string hdd0_boot = hdd0_game + m_title_id + "/USRDIR/EBOOT.BIN"; !m_ar
-				&& recursion_count == 0 && disc.empty() && !bdvd_dir.empty() && !m_title_id.empty()
-				&& resolved_path == GetCallbacks().resolve_path(vfs::get("/dev_bdvd/PS3_GAME/USRDIR/EBOOT.BIN"))
-				&& resolved_path != GetCallbacks().resolve_path(hdd0_boot) && fs::is_file(hdd0_boot))
+		const std::string hdd0_boot = hdd0_game + m_title_id + "/USRDIR/EBOOT.BIN";
+
+		if (disc.empty() && !bdvd_dir.empty() && GetCallbacks().resolve_path(m_path) != GetCallbacks().resolve_path(hdd0_boot) && fs::is_file(hdd0_boot))
 		{
-			if (const psf::registry update_sfo = psf::load(hdd0_game + m_title_id + "/PARAM.SFO").sfo;
-				psf::get_string(update_sfo, "TITLE_ID") == m_title_id && psf::get_string(update_sfo, "CATEGORY") == "GD")
-			{
-				// Booting game update
-				sys_log.success("Updates found at /dev_hdd0/game/%s/", m_title_id);
-				m_path = hdd0_boot;
-
-				const game_boot_result boot_result = Load(m_title_id, true, recursion_count + 1);
-				if (boot_result == game_boot_result::no_errors)
-				{
-					return game_boot_result::no_errors;
-				}
-
-				sys_log.error("Failed to boot update at \"%s\", game update may be corrupted! Consider uninstalling or reinstalling it. (reason: %s)", m_path, boot_result);
-				return boot_result;
-			}
+			// Booting game update
+			sys_log.success("Updates found at /dev_hdd0/game/%s/", m_title_id);
+			return m_path = hdd0_boot, Load(m_title_id, false, force_global_config, true);
 		}
 
-		// Check firmware version
-		if (const std::string_view game_fw_version = psf::get_string(_psf, "PS3_SYSTEM_VER", ""); !game_fw_version.empty())
-		{
-			if (const std::string fw_version = utils::get_firmware_version(); fw_version.empty())
-			{
-				sys_log.warning("Firmware not installed. Skipping required firmware check. (title_id='%s', game_fw='%s')", m_title_id, game_fw_version);
-			}
-			else if (rpcs3::utils::version_is_bigger(game_fw_version, fw_version, m_title_id, true))
-			{
-				sys_log.error("The game's required firmware version is higher than the installed firmware's version. (title_id='%s', game_fw='%s', fw='%s')", m_title_id, game_fw_version, fw_version);
-				return game_boot_result::firmware_version;
-			}
-		}
-
-		// Set title to actual disc title if necessary
 		if (!disc_psf_obj.empty())
 		{
 			const auto bdvd_title = psf::get_string(disc_psf_obj, "TITLE");
@@ -2123,19 +1129,15 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 			{
 				sys_log.notice("Title was set from %s to %s", m_title, bdvd_title);
 				m_title = bdvd_title;
-
-				const auto localized_title = psf::get_string(disc_psf_obj, fmt::format("TITLE_%02d", static_cast<s32>(g_cfg.sys.language.get())), m_title);
-				if (m_localized_title != localized_title)
-				{
-					sys_log.notice("Localized Title was set from %s to %s", m_localized_title, localized_title);
-					m_localized_title = localized_title;
-				}
 			}
 		}
 
-		// Replace newlines with spaces
-		std::replace(m_title.begin(), m_title.end(), '\n', ' ');
-		std::replace(m_localized_title.begin(), m_localized_title.end(), '\n', ' ');
+		for (auto& c : m_title)
+		{
+			// Replace newlines with spaces
+			if (c == '\n')
+				c = ' ';
+		}
 
 		// Mount /host_root/ if necessary (special value)
 		if (g_cfg.vfs.host_root)
@@ -2152,49 +1154,44 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 			elf_path = vfs::get(argv[0]);
 		}
 
-		if (m_ar)
-		{
-			g_tls_log_prefix = []()
-			{
-				return fmt::format("Emu State Load Thread: '%s'", g_tls_serialize_name);
-			};
-		}
-
 		fs::file elf_file(elf_path);
 
 		if (!elf_file)
 		{
 			sys_log.error("Failed to open executable: %s", elf_path);
-
-			if (m_ar)
-			{
-				sys_log.warning("State Inspection Savestate Mode!");
-
-				vm::init();
-				vm::load(*m_ar);
-
-				if (!hdd1.empty())
-				{
-					vfs::mount("/dev_hdd1", hdd1);
-					sys_log.notice("Hdd1: %s", hdd1);
-				}
-
-				init_fxo_for_exec(DeserialManager(), true);
-
-				return game_boot_result::no_errors;
-			}
-
 			return game_boot_result::invalid_file_or_folder;
 		}
 
-		bool had_been_decrypted = false;
-
 		// Check SELF header
 		if (elf_file.size() >= 4 && elf_file.read<u32>() == "SCE\0"_u32)
 		{
+			const std::string decrypted_path = "boot.elf";
+
+			fs::stat_t encrypted_stat = elf_file.stat();
+			fs::stat_t decrypted_stat;
+
+			// Check modification time and try to load decrypted ELF
+			if (false && fs::stat(decrypted_path, decrypted_stat) && decrypted_stat.mtime == encrypted_stat.mtime)
+			{
+				elf_file.open(decrypted_path);
+			}
 			// Decrypt SELF
-			had_been_decrypted = true;
-			elf_file = decrypt_self(elf_file, klic.empty() ? nullptr : reinterpret_cast<u8*>(&klic[0]), &g_ps3_process_info.self_info);
+			else if ((elf_file = decrypt_self(std::move(elf_file), klic.empty() ? nullptr : reinterpret_cast<u8*>(&klic[0]), &g_ps3_process_info.self_info)))
+			{
+				if (true)
+				{
+				}
+				else if (fs::file elf_out{decrypted_path, fs::rewrite})
+				{
+					elf_out.write(elf_file.to_vector<u8>());
+					elf_out.close();
+					fs::utime(decrypted_path, encrypted_stat.atime, encrypted_stat.mtime);
+				}
+				else
+				{
+					sys_log.error("Failed to create boot.elf");
+				}
+			}
 		}
 		else
 		{
@@ -2208,25 +1205,11 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 		}
 
 		m_state = system_state::ready;
+		vm::init();
 
 		ppu_exec_object ppu_exec;
 		ppu_prx_object ppu_prx;
-		ppu_rel_object ppu_rel;
 		spu_exec_object spu_exec;
-		spu_rel_object spu_rel;
-
-		vm::init();
-
-		if (m_ar)
-		{
-			vm::load(*m_ar);
-		}
-
-		if (!hdd1.empty())
-		{
-			vfs::mount("/dev_hdd1", hdd1);
-			sys_log.notice("Hdd1: %s", vfs::get("/dev_hdd1"));
-		}
 
 		if (ppu_exec.open(elf_file) == elf_error::ok)
 		{
@@ -2238,21 +1221,6 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 				argv.resize(1);
 			}
 
-			for (const auto& [arg_name, arg] : g_cfg.sys.sup_argv.get_map())
-			{
-				if (m_ar)
-				{
-					break;
-				}
-
-				// arg_name is unused here
-				// It exists solely for the user's convenience
-
-				sys_log.success("Passing CLI argument %d - \'%s\': \"%s\"", argv.size(), arg_name, arg);
-
-				argv.emplace_back(arg);
-			}
-
 			if (argv[0].empty())
 			{
 				auto unescape = [](std::string_view path)
@@ -2270,50 +1238,29 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 
 				if (from_hdd0_game && m_cat == "DG")
 				{
-					const std::string tail = resolved_path.substr(resolved_hdd0.size());
-					const std::string tail_usrdir = tail.substr(tail.find_first_of(fs::delim) + 1);
-					const std::string dirname = tail.substr(0, tail.find_first_of(fs::delim));
-					argv[0] = "/dev_bdvd/PS3_GAME/" + unescape(tail_usrdir);
-					m_dir = "/dev_hdd0/game/" + dirname + "/";
+					argv[0] = "/dev_bdvd/PS3_GAME/" + unescape(resolved_path.substr(resolved_hdd0.size() + 10));
+					m_dir = "/dev_hdd0/game/" + resolved_path.substr(resolved_hdd0.size(), 10);
 					sys_log.notice("Disc path: %s", m_dir);
 				}
 				else if (from_hdd0_game)
 				{
-					const std::string tail = resolved_path.substr(resolved_hdd0.size());
-					const std::string dirname = tail.substr(0, tail.find_first_of(fs::delim));
-					argv[0] = "/dev_hdd0/game/" + unescape(tail);
-					m_dir = "/dev_hdd0/game/" + dirname + "/";
+					argv[0] = "/dev_hdd0/game/" + unescape(resolved_path.substr(resolved_hdd0.size()));
+					m_dir = "/dev_hdd0/game/" + resolved_path.substr(resolved_hdd0.size(), 10);
 					sys_log.notice("Boot path: %s", m_dir);
 				}
 				else if (!bdvd_dir.empty() && fs::is_dir(bdvd_dir))
 				{
 					// Disc games are on /dev_bdvd/
 					const usz pos = resolved_path.rfind(m_game_dir);
-					argv[0] = "/dev_bdvd/PS3_GAME/" + unescape(resolved_path.substr(pos + m_game_dir.size() + 1));
+					argv[0] = "/dev_bdvd/PS3_GAME/" + unescape(resolved_path.substr(pos + game_dir_size + 1));
 					m_dir = "/dev_bdvd/PS3_GAME/";
 				}
 				else if (from_dev_flash)
 				{
 					// Firmware executables
-					argv[0] = "/dev_flash" + resolved_path.substr(GetCallbacks().resolve_path(g_cfg_vfs.get_dev_flash()).size());
+					argv[0] = "/dev_flash" + resolved_path.substr(GetCallbacks().resolve_path(g_cfg.vfs.get_dev_flash()).size());
 					m_dir = fs::get_parent_dir(argv[0]) + '/';
 				}
-				else if (!m_title_id.empty() && m_cat == "HG")
-				{
-					std::string game_dir = m_sfo_dir;
-
-					// Remove the C00 suffix
-					if (game_dir.ends_with("/C00") || game_dir.ends_with("\\C00"))
-					{
-						game_dir = game_dir.substr(0, game_dir.size() - 4);
-					}
-
-					const std::string dir = fmt::trim(game_dir.substr(fs::get_parent_dir_view(game_dir).size() + 1), fs::delim);
-
-					m_dir = "/dev_hdd0/game/" + dir + '/';
-					argv[0] = m_dir + unescape(resolved_path.substr(GetCallbacks().resolve_path(game_dir).size()));
-					sys_log.notice("Boot path: %s", m_dir);
-				}
 				else if (g_cfg.vfs.host_root)
 				{
 					// For homebrew
@@ -2335,39 +1282,30 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 				sys_log.error("Booting HG category outside of HDD0!");
 			}
 
-			const auto _main = ensure(g_fxo->init<main_ppu_module<lv2_obj>>());
+			g_fxo->init<ppu_module>();
+			g_fxo->init<id_manager::id_map<lv2_obj>>();
+			g_fxo->init<id_manager::id_map<named_thread<ppu_thread>>>();
 
-			if (ppu_load_exec(ppu_exec, false, m_path, DeserialManager()))
+			if (ppu_load_exec(ppu_exec))
 			{
-				if (g_cfg.core.ppu_debug && had_been_decrypted)
-				{
-					// Auto-dump decrypted binaries if PPU debug is enabled
+				ConfigurePPUCache();
 
-					const auto exec_bin = elf_file.to_vector<u8>();
-
-					dump_executable({exec_bin.data(), exec_bin.size()}, _main, GetTitleID());
-				}
+				g_fxo->init(false);
+				GetCallbacks().init_gs_render();
+				GetCallbacks().init_pad_handler(m_title_id);
+				GetCallbacks().init_kb_handler();
+				GetCallbacks().init_mouse_handler();
 			}
 			// Overlay (OVL) executable (only load it)
-			else
+			else if (vm::map(0x3000'0000, 0x1000'0000, 0x200); !ppu_load_overlay(ppu_exec, m_path).first)
 			{
-				GetCallbacks().on_ready();
-				g_fxo->init(false);
-
-				if (!vm::map(0x3000'0000, 0x1000'0000, 0x200) || !ppu_load_overlay(ppu_exec, false, m_path).first)
-				{
-					ppu_exec.set_error(elf_error::header_type);
-				}
-				else
-				{
-					// Preserve emulation state for OVL executable
-					Pause(true);
-				}
+				ppu_exec.set_error(elf_error::header_type);
 			}
 
 			if (ppu_exec != elf_error::ok)
 			{
-				Kill(false);
+				SetForceBoot(true);
+				Stop();
 
 				sys_log.error("Invalid or unsupported PPU executable format: %s", elf_path);
 
@@ -2376,35 +1314,17 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 		}
 		else if (ppu_prx.open(elf_file) == elf_error::ok)
 		{
-			// PPU PRX
+			// PPU PRX (experimental)
 			GetCallbacks().on_ready();
 			g_fxo->init(false);
-			ppu_load_prx(ppu_prx, false, m_path);
-			Pause(true);
+			ppu_load_prx(ppu_prx, m_path);
 		}
 		else if (spu_exec.open(elf_file) == elf_error::ok)
 		{
-			// SPU executable
+			// SPU executable (experimental)
 			GetCallbacks().on_ready();
 			g_fxo->init(false);
 			spu_load_exec(spu_exec);
-			Pause(true);
-		}
-		else if (spu_rel.open(elf_file) == elf_error::ok)
-		{
-			// SPU linker file
-			GetCallbacks().on_ready();
-			g_fxo->init(false);
-			spu_load_rel_exec(spu_rel);
-			Pause(true);
-		}
-		else if (ppu_rel.open(elf_file) == elf_error::ok)
-		{
-			// PPU linker file
-			GetCallbacks().on_ready();
-			g_fxo->init(false);
-			ppu_load_rel_exec(ppu_rel);
-			Pause(true);
 		}
 		else
 		{
@@ -2413,16 +1333,15 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 			sys_log.warning("** ppu_exec -> %s", ppu_exec.get_error());
 			sys_log.warning("** ppu_prx  -> %s", ppu_prx.get_error());
 			sys_log.warning("** spu_exec -> %s", spu_exec.get_error());
-			sys_log.warning("** spu_rel -> %s", spu_rel.get_error());
-			sys_log.warning("** ppu_rel -> %s", ppu_rel.get_error());
 
-			Kill(false);
+			SetForceBoot(true);
+			Stop();
 			return game_boot_result::invalid_file_or_folder;
 		}
 
-		if (ppu_exec == elf_error::ok && !fs::is_file(g_cfg_vfs.get_dev_flash() + "sys/external/liblv2.sprx"))
+		if (ppu_exec == elf_error::ok && !fs::is_file(g_cfg.vfs.get_dev_flash() + "sys/external/liblv2.sprx"))
 		{
-			const auto& libs = g_cfg.core.libraries_control.get_set();
+			const auto libs = g_cfg.core.libraries_control.get_set();
 
 			extern const std::map<std::string_view, int> g_prx_list;
 
@@ -2433,9 +1352,10 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 				return libs.count(std::string(lib.first) + ":lle") || (!lib.second && !libs.count(std::string(lib.first) + ":hle"));
 			}))
 			{
-				Kill(false);
+				SetForceBoot(true);
+				Stop();
 
-				CallFromMainThread([this]()
+				CallAfter([this]()
 				{
 					GetCallbacks().on_missing_fw();
 				});
@@ -2444,7 +1364,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 			}
 		}
 
-		const bool autostart = m_ar || (std::exchange(m_force_boot, false) || g_cfg.misc.autostart);
+		const bool autostart = (std::exchange(m_force_boot, false) || g_cfg.misc.autostart);
 
 		if (IsReady())
 		{
@@ -2453,6 +1373,13 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 				Run(true);
 			}
 		}
+		else
+		{
+			ensure(m_state == system_state::paused);
+			Resume(); // Remove paused flag from threads
+			m_state = system_state::ready;
+			GetCallbacks().on_ready();
+		}
 
 		return game_boot_result::no_errors;
 	}
@@ -2460,320 +1387,91 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 
 void Emulator::Run(bool start_playtime)
 {
-	ensure(IsReady() || GetStatus(false) == system_state::frozen);
+	ensure(IsReady());
 
 	GetCallbacks().on_run(start_playtime);
 
 	m_pause_start_time = 0;
 	m_pause_amend_time = 0;
-
-	m_tty_file_init_pos = g_tty ? g_tty.pos() : usz{umax};
-
 	rpcs3::utils::configure_logs();
 
-	m_state = system_state::starting;
-
-	if (g_cfg.misc.prevent_display_sleep)
-	{
-		Emu.GetCallbacks().enable_display_sleep(false);
-	}
-}
-
-void Emulator::RunPPU()
-{
-	ensure(IsStarting());
-
-	bool signalled_thread = false;
+	m_state = system_state::running;
 
 	// Run main thread
-	idm::select<named_thread<ppu_thread>>([&](u32, named_thread<ppu_thread>& cpu)
+	idm::check<named_thread<ppu_thread>>(ppu_thread::id_base, [](named_thread<ppu_thread>& cpu)
 	{
-		if (std::exchange(cpu.stop_flag_removal_protection, false))
-		{
-			return;
-		}
-
 		ensure(cpu.state.test_and_reset(cpu_flag::stop));
-		cpu.state.notify_one();
-		signalled_thread = true;
+		cpu.state.notify_one(cpu_flag::stop);
 	});
 
-	if (!signalled_thread)
-	{
-		FixGuestTime();
-		FinalizeRunRequest();
-	}
-
 	if (auto thr = g_fxo->try_get<named_thread<rsx::rsx_replay_thread>>())
 	{
 		thr->state -= cpu_flag::stop;
-		thr->state.notify_one();
+		thr->state.notify_one(cpu_flag::stop);
+	}
+
+	if (g_cfg.misc.prevent_display_sleep)
+	{
+		disable_display_sleep();
 	}
 }
 
-void Emulator::FixGuestTime()
-{
-	if (m_ar)
-	{
-		initialize_timebased_time(m_ar->pop<u64>());
-
-		g_cfg.savestate.state_inspection_mode.set(m_state_inspection_savestate);
-
-		CallFromMainThread([this]
-		{
-			// Mark a known savestate location and the one we try to boot (in case we boot a moved/copied savestate)
-			if (g_cfg.savestate.suspend_emu)
-			{
-				for (std::string old_path : std::initializer_list<std::string>{m_ar ? m_path_old : "", m_title_id.empty() ? "" : get_savestate_file(m_title_id, m_path_old, 0, 0)})
-				{
-					if (old_path.empty())
-					{
-						continue;
-					}
-
-					std::string new_path = old_path.substr(0, old_path.find_last_not_of(fs::delim) + 1);
-					const usz insert_pos = new_path.find_last_of(fs::delim) + 1;
-					const auto prefix = "used_"sv;
-
-					if (new_path.compare(insert_pos, prefix.size(), prefix) != 0)
-					{
-						new_path.insert(insert_pos, prefix);
-
-						if (fs::rename(old_path, new_path, true))
-						{
-							sys_log.success("Savestate has been moved (hidden) to path='%s'", new_path);
-						}
-					}
-				}
-			}
-
-			g_tls_log_prefix = []()
-			{
-				return std::string();
-			};
-		});
-	}
-	else
-	{
-		initialize_timebased_time(0);
-	}
-}
-
-void Emulator::FinalizeRunRequest()
-{
-	const bool autostart = !m_ar || !!g_cfg.misc.autostart;
-
-	bs_t<cpu_flag> add_flags = cpu_flag::dbg_global_pause;
-
-	if (autostart)
-	{
-		add_flags -= cpu_flag::dbg_global_pause;
-	}
-
-	auto spu_select = [&](u32, spu_thread& spu)
-	{
-		bs_t<cpu_flag> sub_flags = cpu_flag::stop;
-
-		if (spu.group && spu.index == spu.group->waiter_spu_index)
-		{
-			sub_flags -= cpu_flag::stop;
-		}
-		else if (std::exchange(spu.stop_flag_removal_protection, false))
-		{
-			sub_flags -= cpu_flag::stop;
-		}
-
-		spu.add_remove_flags(add_flags, sub_flags);
-	};
-
-	auto ppu_select = [&](u32, ppu_thread& ppu)
-	{
-		ppu.state += add_flags;
-	};
-
-	if (auto rsx = g_fxo->try_get<rsx::thread>())
-	{
-		static_cast<cpu_thread*>(rsx)->add_remove_flags(add_flags, cpu_flag::suspend);
-	}
-
-	if (m_savestate_extension_flags1 & SaveStateExtentionFlags1::ShouldCloseMenu)
-	{
-		g_fxo->get<SysutilMenuOpenStatus>().active = true;
-	}
-
-	idm::select<named_thread<spu_thread>>(spu_select);
-	idm::select<named_thread<ppu_thread>>(ppu_select);
-
-	lv2_obj::make_scheduler_ready();
-
-	m_state.compare_and_swap_test(system_state::starting, system_state::running);
-
-	m_ar.reset();
-
-	if (!autostart)
-	{
-		Pause();
-	}
-
-	if (m_savestate_extension_flags1 & SaveStateExtentionFlags1::ShouldCloseMenu)
-	{
-		std::thread([this, info = GetEmulationIdentifier()]()
-		{
-			thread_base::set_name("Close Home Menu");
-
-			std::this_thread::sleep_for(2s);
-
-			CallFromMainThread([this]()
-			{
-				send_close_home_menu_cmds();
-			}, info);
-		}).detach();
-	}
-}
-
-bool Emulator::Pause(bool freeze_emulation, bool show_resume_message)
+bool Emulator::Pause()
 {
 	const u64 start = get_system_time();
 
-	const system_state pause_state = freeze_emulation ? system_state::frozen : system_state::paused;
-
 	// Try to pause
-	const auto [old_state, done] = m_state.fetch_op([&](system_state& state)
+	if (!m_state.compare_and_swap_test(system_state::running, system_state::paused))
 	{
-		if (state == system_state::running)
-		{
-			state = pause_state;
-			return true;
-		}
-
-		if (!freeze_emulation)
+		if (!m_state.compare_and_swap_test(system_state::ready, system_state::paused))
 		{
 			return false;
 		}
-
-		if (state == system_state::ready || state == system_state::paused)
-		{
-			state = pause_state;
-			return true;
-		}
-
-		return false;
-	});
-
-	if (!done)
-	{
-		return false;
-	}
-
-	if (old_state == system_state::ready || old_state == system_state::paused)
-	{
-		// Perform the side effects of Resume here when transforming paused to frozen state
-		BlockingCallFromMainThread([this]()
-		{
-			for (auto& ref : m_pause_msgs_refs)
-			{
-				// Delete the message queued on pause
-				*ref = 0;
-			}
-
-			m_pause_msgs_refs.clear();
-		});
 	}
 
 	// Signal profilers to print results (if enabled)
 	cpu_thread::flush_profilers();
 
-	auto on_select = [](u32, cpu_thread& cpu)
-	{
-		cpu.state += cpu_flag::dbg_global_pause;
-	};
-
-	if (g_fxo->is_init<id_manager::id_map<named_thread<ppu_thread>>>())
-	{
-		idm::select<named_thread<ppu_thread>>(on_select);
-	}
-
-	if (g_fxo->is_init<id_manager::id_map<named_thread<spu_thread>>>())
-	{
-		idm::select<named_thread<spu_thread>>(on_select);
-	}
-
-	if (auto rsx = g_fxo->try_get<rsx::thread>())
-	{
-		rsx->state += cpu_flag::dbg_global_pause;
-	}
-
 	GetCallbacks().on_pause();
 
-	BlockingCallFromMainThread([this, show_resume_message]()
-	{
-		const auto status = Emu.GetStatus(false);
-
-		if (!show_resume_message || (status != system_state::paused && status != system_state::frozen))
-		{
-			return;
-		}
-
-		auto msg_ref = std::make_shared<atomic_t<u32>>(1);
-
-		// No timeout
-		rsx::overlays::queue_message(status == system_state::paused ? localized_string_id::EMULATION_PAUSED_RESUME_WITH_START : localized_string_id::EMULATION_FROZEN, -1, msg_ref);
-		m_pause_msgs_refs.emplace_back(msg_ref);
-
-		auto refresh_l = [this, msg_ref, status]()
-		{
-			while (*msg_ref && GetStatus(false) == status)
-			{
-				// Refresh Native UI
-				rsx::set_native_ui_flip();
-				thread_ctrl::wait_for(33'000);
-			}
-
-			msg_ref->release(0);
-		};
-
-		struct thread_t
-		{
-			std::unique_ptr<named_thread<decltype(refresh_l)>> m_thread;
-		};
-
-		g_fxo->need<thread_t>();
-		g_fxo->get<thread_t>().m_thread.reset();
-		g_fxo->get<thread_t>().m_thread = std::make_unique<named_thread<decltype(refresh_l)>>("Pause Message Thread"sv, std::move(refresh_l));
-	});
-
-	static atomic_t<u32> pause_mark = 0;
-
-	if (freeze_emulation)
-	{
-		sys_log.warning("Emulation has been frozen! You can either use debugger tools to inspect current emulation state or terminate it.");
-	}
-	else
-	{
-		sys_log.success("Emulation is being paused... (mark=%u)", pause_mark++);
-	}
-
 	// Update pause start time
 	if (m_pause_start_time.exchange(start))
 	{
 		sys_log.error("Emulator::Pause() error: concurrent access");
 	}
 
+	auto on_select = [](u32, cpu_thread& cpu)
+	{
+		cpu.state += cpu_flag::dbg_global_pause;
+	};
+
+	idm::select<named_thread<ppu_thread>>(on_select);
+	idm::select<named_thread<spu_thread>>(on_select);
+
+	if (auto rsx = g_fxo->try_get<rsx::thread>())
+	{
+		rsx->state += cpu_flag::dbg_global_pause;
+	}
+
 	// Always Enable display sleep, not only if it was prevented.
-	Emu.GetCallbacks().enable_display_sleep(true);
+	enable_display_sleep();
 
 	return true;
 }
 
 void Emulator::Resume()
 {
-	if (m_state != system_state::paused)
+	// Get pause start time
+	const u64 time = m_pause_start_time.exchange(0);
+
+	// Try to increment summary pause time
+	if (time)
 	{
-		return;
+		m_pause_amend_time += get_system_time() - time;
 	}
 
 	// Print and reset debug data collected
-	if (g_cfg.core.ppu_decoder == ppu_decoder_type::_static && g_cfg.core.ppu_debug)
+	if (m_state == system_state::paused && g_cfg.core.ppu_debug)
 	{
 		PPUDisAsm dis_asm(cpu_disasm_mode::dump, vm::g_sudo_addr);
 
@@ -2798,37 +1496,26 @@ void Emulator::Resume()
 			}
 		}
 
-		if (!dump.empty())
-		{
-			ppu_log.notice("[RESUME] Dumping instruction stats:%s", dump);
-		}
+		ppu_log.notice("[RESUME] Dumping instruction stats:%s", dump);
 	}
 
+	perf_stat_base::report();
+
 	// Try to resume
 	if (!m_state.compare_and_swap_test(system_state::paused, system_state::running))
 	{
 		return;
 	}
 
-	// Get pause start time
-	const u64 time = m_pause_start_time.exchange(0);
-
-	// Try to increment summary pause time
-	if (time)
-	{
-		m_pause_amend_time += get_system_time() - time;
-	}
-	else
+	if (!time)
 	{
 		sys_log.error("Emulator::Resume() error: concurrent access");
 	}
 
-	perf_stat_base::report();
-
 	auto on_select = [](u32, cpu_thread& cpu)
 	{
 		cpu.state -= cpu_flag::dbg_global_pause;
-		cpu.state.notify_one();
+		cpu.state.notify_one(cpu_flag::dbg_global_pause);
 	};
 
 	idm::select<named_thread<ppu_thread>>(on_select);
@@ -2842,414 +1529,53 @@ void Emulator::Resume()
 
 	GetCallbacks().on_resume();
 
-	sys_log.success("Emulation has been resumed!");
-
-	BlockingCallFromMainThread([this]()
-	{
-		for (auto& ref : m_pause_msgs_refs)
-		{
-			// Delete the message queued on pause
-			*ref = 0;
-		}
-
-		m_pause_msgs_refs.clear();
-	});
-
 	if (g_cfg.misc.prevent_display_sleep)
 	{
-		Emu.GetCallbacks().enable_display_sleep(false);
+		disable_display_sleep();
 	}
 }
 
-u64 get_sysutil_cb_manager_read_count();
-
-void qt_events_aware_op(int repeat_duration_ms, std::function<bool()> wrapped_op);
-
-void Emulator::GracefulShutdown(bool allow_autoexit, bool async_op, bool savestate, bool continuous_mode)
+void Emulator::Stop(bool restart)
 {
-	// Make sure we close the game window
-	if (!continuous_mode)
+	if (m_state.exchange(system_state::stopped) == system_state::stopped)
 	{
-		Emu.SetContinuousMode(false);
-	}
-
-	// Ensure no game has booted in between
-	const auto guard = Emu.MakeEmulationStateGuard();
-
-	stop_counter_t old_emu_id{};
-	system_state old_state{};
-
-	// Perform atomic load of both
-	do
-	{
-		old_emu_id = GetEmulationIdentifier();
-		old_state = m_state.load();
-	}
-	while (old_emu_id != GetEmulationIdentifier() || old_state != m_state.load());
-
-	if (old_state == system_state::stopped || old_state == system_state::stopping)
-	{
-		if (!async_op && old_state == system_state::stopping)
-		{
-			qt_events_aware_op(5, [&]()
-			{
-				return old_emu_id != GetEmulationIdentifier() || m_state != system_state::stopping;
-			});
-		}
-
-		return;
-	}
-
-	if (!savestate && m_emu_state_close_pending)
-	{
-		if (!async_op)
-		{
-			qt_events_aware_op(5, [&]()
-			{
-				return old_emu_id != GetEmulationIdentifier() || m_state != system_state::stopping;
-			});
-		}
-
-		return;
-	}
-
-	if (old_state == system_state::paused)
-	{
-		Resume();
-	}
-
-	const u64 read_counter = get_sysutil_cb_manager_read_count();
-
-	const bool force_termination = old_state == system_state::frozen || savestate;
-
-	if (!force_termination)
-	{
-		sys_log.notice("Requesting game to exit...");
-	}
-
-	if (force_termination || !sysutil_send_system_cmd(0x0101 /* CELL_SYSUTIL_REQUEST_EXITGAME */, 0))
-	{
-		if (!force_termination)
-		{
-			sys_log.warning("The game ignored the exit request. Forcing termination...");
-		}
-
-		// The callback has been rudely ignored, we have no other option but to force termination
-		Kill(allow_autoexit && !savestate, savestate);
-
-		if (!async_op)
-		{
-			qt_events_aware_op(5, [&]()
-			{
-				return (old_emu_id != GetEmulationIdentifier() || m_state == system_state::stopped);
-			});
-		}
-
-		return;
-	}
-
-	sys_log.notice("The game was requested to exit. Waiting for its reaction...");
-
-	auto perform_kill = [read_counter, allow_autoexit, this, info = old_emu_id]()
-	{
-		bool read_sysutil_signal = false;
-		std::vector<stx::shared_ptr<named_thread<ppu_thread>>> ppu_thread_list;
-
-		// If EXITGAME signal is not read, force kill after a second.
-		constexpr int loop_timeout_ms = 50;
-		int kill_timeout_ms = 1000;
-		int elapsed_ms = 0;
-
-		qt_events_aware_op(loop_timeout_ms, [&]()
-		{
-			if (elapsed_ms >= kill_timeout_ms)
-			{
-				return true;
-			}
-
-			// TODO: Prevent pausing by other threads while in this loop
-			CallFromMainThread([this]()
-			{
-				Resume();
-			}, nullptr, true, read_counter);
-
-			// Check if the EXITGAME signal was read. We allow the game to terminate itself if that's the case.
-			if (!read_sysutil_signal && read_counter != get_sysutil_cb_manager_read_count())
-			{
-				sys_log.notice("The game received the exit request. Waiting for it to terminate itself...");
-				kill_timeout_ms += 5000; // Grant a couple more seconds
-				read_sysutil_signal = true;
-
-				// Observe PPU threads state since this stage
-				idm::select<named_thread<ppu_thread>>([&](u32 id, cpu_thread&)
-				{
-					ppu_thread_list.emplace_back(idm::get_unlocked<named_thread<ppu_thread>>(id));
-				});
-			}
-
-			if (static_cast<u64>(info) != m_stop_ctr || Emu.IsStopped())
-			{
-				return true;
-			}
-
-			if (read_sysutil_signal && kill_timeout_ms - elapsed_ms <= 1'500)
-			{
-				int thread_exited_count = 0;
-
-				for (auto& ppu : ppu_thread_list)
-				{
-					if (ppu && (ppu->state & cpu_flag::exit || ppu->joiner == ppu_join_status::zombie))
-					{
-						ppu.reset();
-						thread_exited_count++;
-					}
-				}
-
-				if (thread_exited_count)
-				{
-					// If some threads exited since last check, grant additional 250 miliseconds
-					kill_timeout_ms += 250;
-					sys_log.notice("Threads were terminated.. increasing termination timeout (threads=%d)", thread_exited_count);
-				}
-			}
-
-			// Process events
-			elapsed_ms += loop_timeout_ms;
-			return false;
-		});
-
-		// An inevitable attempt to terminate the *current* emulation course will be issued after the timeout was reached.
-		CallFromMainThread([this, allow_autoexit, elapsed_ms, read_sysutil_signal]()
-		{
-			if (Emu.IsStopped())
-			{
-				return;
-			}
-
-			sys_log.error("The game did not react to the exit request in time. Terminating manually... (read_sysutil_signal=%d, elapsed_ms=%d)", read_sysutil_signal, elapsed_ms);
-			Kill(allow_autoexit);
-		}, info);
-	};
-
-	if (async_op)
-	{
-		std::thread{perform_kill}.detach();
-	}
-	else
-	{
-		perform_kill();
-
-		qt_events_aware_op(5, [&]()
-		{
-			return (old_emu_id != GetEmulationIdentifier() || m_state == system_state::stopped);
-		});
-	}
-}
-
-extern bool check_if_vdec_contexts_exist();
-extern bool try_lock_spu_threads_in_a_state_compatible_with_savestates(bool revert_lock = false, std::vector<std::pair<shared_ptr<named_thread<spu_thread>>, u32>>* out_list = nullptr);
-
-void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_stage)
-{
-	static const auto make_ptr = [](auto ptr)
-	{
-		return std::shared_ptr<std::remove_pointer_t<decltype(ptr)>>(ptr);
-	};
-
-	if (!IsStopped() && savestate)
-	{
-		if (IsStarting())
+		if (restart)
 		{
+			// Reload with prior configs.
+			if (const auto error = Load(m_title_id, false, m_force_global_config); error != game_boot_result::no_errors)
+				sys_log.error("Restart failed: %s", error);
 			return;
 		}
 
-		if (!save_stage || !save_stage->prepared)
-		{
-			if (m_emu_state_close_pending.exchange(true))
-			{
-				return;
-			}
-
-			std::shared_ptr<std::shared_ptr<void>> pause_thread = std::make_shared<std::shared_ptr<void>>();
-
-			*pause_thread = make_ptr(new named_thread("Savestate Prepare Thread"sv, [pause_thread, allow_autoexit, this]() mutable
-			{
-				struct scoped_success_guard
-				{
-					bool save_state_success = false;
-					~scoped_success_guard()
-					{
-						if (!save_state_success)
-						{
-							// Reset continuous mode on savestate error
-							Emu.SetContinuousMode(false);
-
-							// Reset after_kill_callback (which is usually used for Emu.Restart in combination with savestates)
-							Emu.after_kill_callback = nullptr;
-						}
-					}
-				} success_guard {};
-
-				std::vector<std::pair<shared_ptr<named_thread<spu_thread>>, u32>> paused_spus;
-
-				if (!try_lock_spu_threads_in_a_state_compatible_with_savestates(false, &paused_spus))
-				{
-					sys_log.error("Failed to savestate: failed to lock SPU threads execution.");
-
-					if (!g_cfg.savestate.compatible_mode)
-					{
-						rsx::overlays::queue_message(localized_string_id::SAVESTATE_FAILED_DUE_TO_MISSING_SPU_SETTING);
-						sys_log.error("Enabling SPU Savestates-Compatible Mode in Advanced tab may fix this.");
-					}
-					else
-					{
-						rsx::overlays::queue_message(localized_string_id::SAVESTATE_FAILED_DUE_TO_SPU);
-					}
-
-					m_emu_state_close_pending = false;
-
-					CallFromMainThread([pause = std::move(pause_thread)]()
-					{
-						// Join thread
-					}, nullptr, false);
-
-					return;
-				}
-
-				bool savedata_error = false;
-				bool vdec_error = false;
-
-				if (!g_fxo->get<hle_locks_t>().try_finalize([&]()
-				{
-					// List of conditions required for emulation to save properly
-					vdec_error = check_if_vdec_contexts_exist();
-					return !vdec_error;
-				}))
-				{
-					// Unlock SPUs
-					try_lock_spu_threads_in_a_state_compatible_with_savestates(true);
-
-					savedata_error = !vdec_error; // For now it is implied a savedata error
-
-					if (vdec_error)
-					{
-						rsx::overlays::queue_message(localized_string_id::SAVESTATE_FAILED_DUE_TO_VDEC);
-
-						sys_log.error("Failed to savestate: HLE VDEC (video decoder) context(s) exist."
-							"\nLLE libvdec.sprx by selecting it in Advanced tab -> Firmware Libraries."
-							"\nYou need to close the game for it to take effect."
-							"\nIf you cannot close the game due to losing important progress, your best chance is to skip the current cutscenes if any are played and retry.");
-					}
-
-					if (savedata_error)
-					{
-						rsx::overlays::queue_message(localized_string_id::SAVESTATE_FAILED_DUE_TO_SAVEDATA);
-
-						sys_log.error("Failed to savestate: Savedata operation is active."
-							"\nYour best chance is to wait for the current game saving operation to finish and retry."
-							"\nThe game is probably displaying a saving cicrle or other gesture to indicate that it is saving.");
-					}
-
-					m_emu_state_close_pending = false;
-
-					CallFromMainThread([pause = std::move(pause_thread)]()
-					{
-						// Join thread
-					}, nullptr, false);
-
-					return;
-				}
-
-				success_guard.save_state_success = true;
-
-				CallFromMainThread([allow_autoexit, this, paused_spus]()
-				{
-					savestate_stage stage{};
-					stage.prepared = true;
-					stage.paused_spus = paused_spus;
-					Kill(allow_autoexit, true, &stage);
-				});
-
-				CallFromMainThread([pause = std::move(pause_thread)]()
-				{
-					// Join thread
-				}, nullptr, false);
-			}));
-
-			return;
-		}
-	}
-
-	g_tls_log_prefix = []()
-	{
-		return std::string();
-	};
-
-	if (save_stage && save_stage->prepared)
-	{
-		//
-	}
-	else if (m_emu_state_close_pending.exchange(true))
-	{
+		m_force_boot = false;
 		return;
 	}
 
-	if (system_state old_state = m_state.fetch_op([](system_state& state)
-	{
-		if (state == system_state::stopping || state == system_state::stopped)
-		{
-			return false;
-		}
-
-		state = system_state::stopping;
-		return true;
-	}).first; old_state <= system_state::stopping)
-	{
-		if (old_state == system_state::stopping)
-		{
-			// Termination is in progress
-			return;
-		}
-
-		// Ensure clean state
-		m_ar.reset();
-		argv.clear();
-		envp.clear();
-		data.clear();
-		disc.clear();
-		klic.clear();
-		hdd1.clear();
-		init_mem_containers = nullptr;
-		after_kill_callback = nullptr;
-		m_config_path.clear();
-		m_config_mode = cfg_mode::custom;
-		read_used_savestate_versions();
-		m_savestate_extension_flags1 = {};
-		m_emu_state_close_pending = false;
-
-		// Enable logging
-		rpcs3::utils::configure_logs(true);
-		return;
-	}
-
-	// Enable logging
-	rpcs3::utils::configure_logs(true);
-
 	sys_log.notice("Stopping emulator...");
 
-	const bool continuous_savestate_mode = savestate && !g_cfg.savestate.suspend_emu;
-
-	// Show visual feedback to the user in case that stopping takes a while.
-	// This needs to be done before actually stopping, because otherwise the necessary threads will be terminated before we can show an image.
-	if (g_fxo->try_get<named_thread<progress_dialog_server>>() && (continuous_savestate_mode || g_progr_text.operator bool()))
+	named_thread stop_watchdog("Stop Watchdog", [&]()
 	{
-		// Notify progress dialog that we are going to stop emulation
-		g_system_progress_stopping = continuous_savestate_mode ? system_progress_stop_state::stop_state_continuous_savestate : system_progress_stop_state::stop_state_stopping;
-		std::this_thread::sleep_for(30ms); // Enough for one frame to be rendered
-	}
+		for (uint i = 0; thread_ctrl::state() != thread_state::aborting;)
+		{
+			// We don't need accurate timekeeping, using clocks may interfere with debugging
+			if (i >= 1000)
+			{
+				// Total amount of waiting: about 5s
+				report_fatal_error("Stopping emulator took too long."
+					"\nSome thread has probably deadlocked. Aborting.");
+			}
+
+			thread_ctrl::wait_for(5'000);
+
+			if (!g_watchdog_hold_ctr)
+			{
+				// Don't count if there are still uninterruptable threads like PPU LLVM workers
+				i++;
+			}
+		}
+	});
 
 	// Signal threads
-
 	if (auto rsx = g_fxo->try_get<rsx::thread>())
 	{
 		*static_cast<cpu_thread*>(rsx) = thread_state::aborting;
@@ -3257,9 +1583,9 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
 
 	for (const auto& [type, data] : *g_fxo)
 	{
-		if (type.thread_op)
+		if (type.stop)
 		{
-			type.thread_op(data, thread_state::aborting);
+			type.stop(data, thread_state::aborting);
 		}
 	}
 
@@ -3268,610 +1594,89 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
 	// Wait fot newly created cpu_thread to see that emulation has been stopped
 	id_manager::g_mutex.lock_unlock();
 
-	// Type-less smart pointer container for thread (cannot know its type with this approach)
-	// There is no race condition because it is only accessed by the same thread
-	std::shared_ptr<std::shared_ptr<void>> join_thread = std::make_shared<std::shared_ptr<void>>();
+	GetCallbacks().on_stop();
 
-	*join_thread = make_ptr(new named_thread("Emulation Join Thread"sv, [join_thread, savestate, allow_autoexit, save_stage = save_stage ? *save_stage : savestate_stage{}, this]() mutable
+	// Join threads
+	for (const auto& [type, data] : *g_fxo)
 	{
-		fs::pending_file file;
-
-		auto verbose_message = std::make_shared<atomic_ptr<std::string>>();
-		auto init_mtx = std::make_shared<stx::init_mutex>();
-		auto join_ended = std::make_shared<bool>(false);
-		auto to_ar = std::make_shared<atomic_ptr<utils::serial>>();
-
-		auto stop_watchdog = make_ptr(new named_thread("Stop Watchdog"sv,
-			[to_ar, init_mtx, join_ended, verbose_message, this]()
+		if (type.stop)
 		{
-			const auto closed_sucessfully = std::make_shared<atomic_t<bool>>(false);
-
-			bool is_being_held_longer = false;
-
-			for (int i = 0; !*join_ended && thread_ctrl::state() != thread_state::aborting;)
-			{
-				if (g_watchdog_hold_ctr)
-				{
-					is_being_held_longer = true;
-				}
-
-				// We don't need accurate timekeeping, using clocks may interfere with debugging
-				if (i >= (is_being_held_longer ? 5000 : 2000))
-				{
-					// Total amount of waiting: about 10s
-					GetCallbacks().on_emulation_stop_no_response(closed_sucessfully, is_being_held_longer ? 25 : 10);
-
-					while (thread_ctrl::state() != thread_state::aborting)
-					{
-						thread_ctrl::wait_for(5'000);
-					}
-
-					break;
-				}
-
-				thread_ctrl::wait_for(5'000);
-			}
-
-			while (thread_ctrl::state() != thread_state::aborting)
-			{
-				if (auto ar_ptr = to_ar->load())
-				{
-					// Total amount of waiting: about 10s
-					if (g_cfg.savestate.suspend_emu)
-					{
-						GetCallbacks().on_save_state_progress(closed_sucessfully, ar_ptr, verbose_message.get(), init_mtx);
-					}
-
-					while (thread_ctrl::state() != thread_state::aborting)
-					{
-						thread_ctrl::wait_for(5'000);
-					}
-
-					break;
-				}
-
-				thread_ctrl::wait_for(5'000);
-			}
-
-			*closed_sucessfully = true;
-		}));
-
-		// Join threads
-		for (const auto& [type, data] : *g_fxo)
-		{
-			if (type.thread_op)
-			{
-				type.thread_op(data, thread_state::finished);
-			}
+			type.stop(data, thread_state::finished);
 		}
-
-		for (const auto& spu : save_stage.paused_spus)
-		{
-			if (spu.first->pc != spu.second || spu.first->unsavable)
-			{
-				std::string dump; 
-				spu.first->dump_all(dump);
-
-				sys_log.error("SPU thread continued after being paused. (old_pc=0x%x, pc=0x%x, unsavable=%d)", spu.second, spu.first->pc, spu.first->unsavable);
-				spu_log.notice("SPU thread context:\n%s", dump);
-			}
-		}
-
-		// Save it first for maximum timing accuracy
-		const u64 timestamp = get_timebased_time();
-		const u64 start_time = get_system_time();
-
-		sys_log.notice("All threads have been stopped.");
-
-		std::string path;
-
-		static_cast<void>(init_mtx->init());
-
-		// Call explcit semi-destructors (free memory before savestate)
-		for (const auto& [type, data] : *g_fxo)
-		{
-			if (type.thread_op)
-			{
-				type.thread_op(data, thread_state::destroying_context);
-			}
-		}
-
-		auto set_progress_message = [&](std::string_view text)
-		{
-			*verbose_message = stx::make_single<std::string>(text);
-		};
-
-		while (savestate)
-		{
-			set_progress_message("Creating File");
-
-			path = get_savestate_file(m_title_id, m_path, 0, 0);
-
-			// The function is meant for reading files, so if there is no ZST file it would not return compressed file path
-			// So this is the only place where the result is edited if need to be
-			constexpr std::string_view save = ".SAVESTAT";
-			path.resize(path.rfind(save) + save.size());
-			path += ".zst";
-
-			if (!fs::create_path(fs::get_parent_dir(path)))
-			{
-				sys_log.error("Failed to create savestate directory! (path='%s', %s)", fs::get_parent_dir(path), fs::g_tls_error);
-				savestate = false;
-				break;
-			}
-
-			if (!file.open(path))
-			{
-				sys_log.error("Failed to create savestate temporary file! (path='%s', %s)", file.get_temp_path(), fs::g_tls_error);
-				savestate = false;
-				break;
-			}
-
-			auto serial_ptr = stx::make_single<utils::serial>();
-			serial_ptr->m_file_handler = make_compressed_zstd_serialization_file_handler(file.file);
-			*to_ar = std::move(serial_ptr);
-
-			signal_system_cache_can_stay();
-			break;
-		}
-
-		*join_ended = true;
-
-		if (savestate)
-		{
-			// Savestate thread
-			named_thread emu_state_cap_thread("Emu State Capture Thread", [&]()
-			{
-				g_tls_log_prefix = []()
-				{
-					return fmt::format("Emu State Capture Thread: '%s'", g_tls_serialize_name);
-				};
-
-				auto& ar = *to_ar->load();
-
-				read_used_savestate_versions(); // Reset version data
-				USING_SERIALIZATION_VERSION(global_version);
-
-				// Avoid duplicating TAR object memory because it can be very large
-				auto save_tar = [&](const std::string& path)
-				{
-					if (!fs::is_dir(path))
-					{
-						ar(usz{});
-						return;
-					}
-
-					// Cached file list from the first call
-					std::vector<fs::dir_entry> dir_entries;
-
-					// Calculate memory requirements
-					utils::serial ar_null;
-					ar_null.m_file_handler = make_null_serialization_file_handler();
-					tar_object::save_directory(path, ar_null, {}, std::move(dir_entries), false);
-					ar(ar_null.pos);
-					ar.breathe();
-
-					const usz old_pos = ar.seek_end();
-					tar_object::save_directory(path, ar, {}, std::move(dir_entries), true);
-					const usz new_pos = ar.seek_end();
-
-					const usz tar_size = new_pos - old_pos;
-
-					if (tar_size % 512 || tar_size != ar_null.pos)
-					{
-						fmt::throw_exception("Unexpected TAR entry size (size=0x%x, expected=0x%x, entries=0x%x)", tar_size, ar_null.pos, dir_entries.size());
-					}
-
-					sys_log.success("Saved the contents of directory '%s' (size=0x%x)", path, tar_size);
-				};
-
-				auto save_hdd1 = [&]()
-				{
-					const std::string _path = vfs::get("/dev_hdd1");
-					std::string_view path = _path;
-
-					path = path.substr(0, path.find_last_not_of(fs::delim) + 1);
-
-					ar(std::string(path.substr(path.find_last_of(fs::delim) + 1)));
-
-					if (!_path.empty())
-					{
-						save_tar(_path);
-					}
-				};
-
-				auto save_hdd0 = [&]()
-				{
-					if (g_cfg.savestate.save_disc_game_data)
-					{
-						const std::string path = vfs::get("/dev_hdd0/game/");
-
-						for (auto& entry : fs::dir(path))
-						{
-							if (entry.is_directory && entry.name != "." && entry.name != "..")
-							{
-								if (auto res = psf::load(path + entry.name + "/PARAM.SFO"); res && /*!m_title_id.empty() &&*/ psf::get_string(res.sfo, "TITLE_ID") == m_title_id && psf::get_string(res.sfo, "CATEGORY") == "GD")
-								{
-									ar(entry.name);
-									save_tar(path + entry.name);
-								}
-							}
-						}
-					}
-
-					ar(std::string{});
-				};
-
-				set_progress_message("Creating Header");
-
-				ar("RPCS3SAV"_u64);
-				ar(std::endian::native == std::endian::little);
-				ar(g_cfg.savestate.state_inspection_mode.get());
-
-				ar(usz{10 + sizeof(usz) + sizeof(u8)}); // Offset of versioning data (fixed to the following data)
-
-				{
-					// Gather versions because with compressed format going back and patching offset is not efficient
-					utils::serial ar_temp;
-					ar_temp.m_file_handler = make_null_serialization_file_handler();
-					g_fxo->save(ar_temp);
-					ar(u8{1});
-					ar(read_used_savestate_versions());
-				}
-
-				ar(u8{1});
-				ar(rpcs3::get_verbose_version());
-				ar(fmt::format("%s", std::chrono::system_clock::now()));
-				ar(GetTitleAndTitleID());
-				ar(std::string{}); // Possible user note
-
-				ar(std::array<u8, 32>{}); // Reserved for future use
-
-				if (auto dir = vfs::get("/dev_bdvd/PS3_GAME"); fs::is_dir(dir) && !fs::is_file(fs::get_parent_dir(dir) + "/PS3_DISC.SFB"))
-				{
-					// Fake /dev_bdvd/PS3_GAME detected, use HDD0 for m_path restoration
-					ensure(vfs::unmount("/dev_bdvd/PS3_GAME"));
-					ar(vfs::retrieve(m_path));
-					ar(vfs::retrieve(disc));
-					ensure(vfs::mount("/dev_bdvd/PS3_GAME", dir));
-				}
-				else
-				{
-					ar(vfs::retrieve(m_path));
-					ar(!m_title_id.empty() && !vfs::get("/dev_bdvd").empty() ? m_title_id : vfs::retrieve(disc));
-				}
-
-				ar(klic.empty() ? std::array<u8, 16>{} : std::bit_cast<std::array<u8, 16>>(klic[0]));
-				ar(m_game_dir);
-
-				set_progress_message("Saving HDD1");
-				save_hdd1();
-				set_progress_message("Saving HDD0");
-				save_hdd0();
-
-				ar(std::array<u8, 32>{}); // Reserved for future use
-
-				set_progress_message("Saving VMemory");
-				vm::save(ar);
-
-				set_progress_message("Saving FXO");
-				g_fxo->save(ar);
-
-				set_progress_message("Finalizing File");
-
-				bs_t<SaveStateExtentionFlags1> extension_flags{SaveStateExtentionFlags1::SupportsMenuOpenResume};
-
-				if (g_fxo->get<SysutilMenuOpenStatus>().active)
-				{
-					extension_flags += SaveStateExtentionFlags1::ShouldCloseMenu;
-				}
-
-				ar(extension_flags);
-
-				ar(std::array<u8, 32>{}); // Reserved for future use
-				ar(timestamp);
-
-				// Final file write, the file is ready to be committed
-				ar.seek_end();
-				ar.m_file_handler->finalize(ar);
-			});
-
-			// Join it
-			emu_state_cap_thread();
-
-			if (emu_state_cap_thread == thread_state::errored)
-			{
-				sys_log.error("Saving savestate failed due to fatal error!");
-				to_ar->reset();
-				savestate = false;
-			}
-		}
-
-		if (savestate)
-		{
-			fs::stat_t file_stat{};
-
-			set_progress_message("Commiting File");
-
-			{
-				auto& ar = *to_ar->load();
-				auto reset = init_mtx->reset();
-				ar = {};
-				ar.set_reading_state(); // Guard against using it
-				reset.set_init();
-			}
-
-			if (!file.commit() || !fs::get_stat(path, file_stat))
-			{
-				sys_log.error("Failed to write savestate to file! (path='%s', %s)", path, fs::g_tls_error);
-				savestate = false;
-			}
-			else
-			{
-				std::string old_path = path.substr(0, path.find_last_not_of(fs::delim));
-				std::string old_path2 = old_path;
-
-				old_path2.insert(old_path.find_last_of(fs::delim) + 1, "old-"sv);
-				old_path.insert(old_path.find_last_of(fs::delim) + 1, "used_"sv);
-
-				if (fs::remove_file(old_path))
-				{
-					sys_log.success("Old savestate has been removed: path='%s'", old_path);
-				}
-
-				// For backwards compatibility - avoid having loose files
-				if (fs::remove_file(old_path2))
-				{
-					sys_log.success("Old savestate has been removed: path='%s'", old_path2);
-				}
-
-				sys_log.success("Saved savestate! path='%s' (file_size=0x%x, time_to_save=%gs)", path, file_stat.size, (get_system_time() - start_time) / 1000000.);
-
-				if (!g_cfg.savestate.suspend_emu)
-				{
-					// Allow to reboot from GUI
-					m_path = path;
-				}
-			}
-		}
-
-		// Log additional debug information - do not do it on the main thread due to the concern of halting UI events
-
-		if (g_tty && sys_log.notice)
-		{
-			// Write merged TTY output after emulation has been safely stopped
-
-			if (usz attempted_read_size = utils::sub_saturate<usz>(g_tty.pos(), m_tty_file_init_pos))
-			{
-				if (fs::file tty_read_fd{fs::get_log_dir() + "TTY.log"})
-				{
-					// Enforce an arbitrary limit for now to avoid OOM in case the guest code has bombarded TTY
-					// 3MB, this should be enough
-					constexpr usz c_max_tty_spill_size = 0x30'0000;
-
-					std::string tty_buffer(std::min<usz>(attempted_read_size, c_max_tty_spill_size), '\0');
-					tty_buffer.resize(tty_read_fd.read_at(m_tty_file_init_pos, tty_buffer.data(), tty_buffer.size()));
-					tty_read_fd.close();
-
-					if (!tty_buffer.empty())
-					{
-						// Mark start and end very clearly with RPCS3 put in it
-						sys_log.notice("\nAccumulated RPCS3 TTY:\n\n\n%s\n\n\nEnd RPCS3 TTY Section.\n", tty_buffer);
-					}
-				}
-			}
-		}
-
-		if (g_cfg.core.spu_debug && sys_log.notice)
-		{
-			const std::string cache_path = rpcs3::cache::get_ppu_cache();
-
-			if (fs::file spu_log{cache_path + "/spu.log"})
-			{
-				// 96MB limit, this may be a lot but this only has an effect when enabling the debug option
-				constexpr usz c_max_spu_log_spill_size = 0x600'0000;
-				const usz total_size = spu_log.size();
-
-				std::string log_buffer(std::min<usz>(spu_log.size(), c_max_spu_log_spill_size), '\0');
-				log_buffer.resize(spu_log.read(log_buffer.data(), log_buffer.size()));
-				spu_log.close();
-
-				if (!log_buffer.empty())
-				{
-					usz to_remove = 0;
-					usz part_ctr = 1;
-
-					for (std::string_view not_logged = log_buffer; !not_logged.empty(); part_ctr++, not_logged.remove_prefix(to_remove))
-					{
-						std::string_view to_log = not_logged;
-						to_log = to_log.substr(0, 0x8000);
-						to_log = to_log.substr(0, utils::add_saturate<usz>(to_log.rfind("\n========== SPU BLOCK"sv), 1));
-						to_remove = to_log.size();
-
-						std::string new_log(to_log);
-
-						for (usz iter = 0, out_added = 0; iter < to_log.size();)
-						{
-							const usz index = to_log.find(") ==========", iter);
-
-							if (index == umax)
-							{
-								break;
-							}
-
-							const std::string_view until = to_log.substr(0, index);
-							const usz seperator = until.rfind(", ");
-
-							if (seperator == umax)
-							{
-								iter = index + 1;
-								continue;
-							}
-
-							const std::string_view prog_hash = until.substr(seperator + 2);
-
-							if (prog_hash.empty())
-							{
-								iter = index + 1;
-								continue;
-							}
-
-							const fmt::base57_result result = fmt::base57_result::from_string(prog_hash);
-
-							if (result.size < sizeof(be_t<u64>))
-							{
-								iter = index + 1;
-								continue;
-							}
-
-							const u64 hash_val = read_from_ptr<be_t<u64>>(result.data) & -65536;
-							const f64 usage = get_cpu_program_usage_percent(hash_val);
-
-							if (usage == 0)
-							{
-								iter = index + 1;
-								continue;
-							}
-
-							const std::string text_append = fmt::format("usage %%%g, ", usage);
-							new_log.insert(new_log.begin() + seperator + out_added + 2, text_append.begin(), text_append.end());
-
-							out_added += text_append.size();
-							iter = index + 1;
-						}
-
-						// Cannot log it all at once due to technical reasons, split it to 8MB at maximum of whole functions
-						// Assume the block prefix exists because it is created by RPCS3 (or log it in an ugly manner if it does not exist)
-						sys_log.notice("Logging spu.log #%u:\n\n%s\n", part_ctr, new_log);
-					}
-
-					sys_log.notice("End spu.log (%u bytes)", total_size);
-				}
-			}
-		}
-
-		set_progress_message("Resetting Objects");
-
-		// Final termination from main thread (move the last ownership of join thread in order to destroy it)
-		CallFromMainThread([join_thread = std::move(join_thread), verbose_message, stop_watchdog, init_mtx, allow_autoexit, this]()
-		{
-			cpu_thread::cleanup();
-
-			lv2_obj::cleanup();
-
-			g_fxo->reset();
-
-			sys_log.notice("Objects cleared...");
-
-			vm::close();
-
-			*stop_watchdog = thread_state::finished;
-			static_cast<void>(init_mtx->reset());
-
-			jit_runtime::finalize();
-
-			perf_stat_base::report();
-
-			static u64 aw_refs = 0;
-			static u64 aw_colm = 0;
-			static u64 aw_colc = 0;
-			static u64 aw_used = 0;
-
-			aw_refs = 0;
-			aw_colm = 0;
-			aw_colc = 0;
-			aw_used = 0;
-
-			atomic_wait::parse_hashtable([](u64 /*id*/, u32 refs, u64 ptr, u32 maxc) -> bool
-			{
-				aw_refs += refs != 0;
-				aw_used += ptr != 0;
-
-				aw_colm = std::max<u64>(aw_colm, maxc);
-				aw_colc += maxc != 0;
-
-				return false;
-			});
-
-			sys_log.notice("Atomic wait hashtable stats: [in_use=%u, used=%u, max_collision_weight=%u, total_collisions=%u]", aw_refs, aw_used, aw_colm, aw_colc);
-
-			m_stop_ctr++;
-			m_stop_ctr.notify_all();
-
-			// Boot arg cleanup (preserved in the case restarting)
-			argv.clear();
-			envp.clear();
-			data.clear();
-			disc.clear();
-			klic.clear();
-			hdd1.clear();
-			init_mem_containers = nullptr;
-			m_config_path.clear();
-			m_config_mode = cfg_mode::custom;
-			m_ar.reset();
-			read_used_savestate_versions();
-			m_savestate_extension_flags1 = {};
-			m_emu_state_close_pending = false;
-
-			initialize_timebased_time(0, true);
-
-			// Complete the operation
-			m_state = system_state::stopped;
-			GetCallbacks().on_stop();
-
-			// Always Enable display sleep, not only if it was prevented.
-			Emu.GetCallbacks().enable_display_sleep(true);
-
-			if (allow_autoexit)
-			{
-				Quit(g_cfg.misc.autoexit.get());
-			}
-
-			if (after_kill_callback)
-			{
-				// Make after_kill_callback empty before call
-				const auto callback = std::move(after_kill_callback);
-				callback();
-			}
-		});
-	}));
-}
-
-game_boot_result Emulator::Restart(bool graceful)
-{
-	if (m_state == system_state::stopping)
-	{
-		// Emulation stop is in progress
-		return game_boot_result::still_running;
 	}
 
-	Emu.after_kill_callback = [this]
+	cpu_thread::cleanup();
+
+	g_fxo->reset();
+
+	sys_log.notice("All threads have been stopped.");
+
+	lv2_obj::cleanup();
+
+	sys_log.notice("Objects cleared...");
+
+	vm::close();
+
+	jit_runtime::finalize();
+
+	perf_stat_base::report();
+
+	static u64 aw_refs = 0;
+	static u64 aw_colm = 0;
+	static u64 aw_colc = 0;
+	static u64 aw_used = 0;
+
+	aw_refs = 0;
+	aw_colm = 0;
+	aw_colc = 0;
+	aw_used = 0;
+
+	atomic_wait::parse_hashtable([](u64 /*id*/, u32 refs, u64 ptr, u32 maxc) -> bool
+	{
+		aw_refs += refs != 0;
+		aw_used += ptr != 0;
+
+		aw_colm = std::max<u64>(aw_colm, maxc);
+		aw_colc += maxc != 0;
+
+		return false;
+	});
+
+	sys_log.notice("Atomic wait hashtable stats: [in_use=%u, used=%u, max_collision_weight=%u, total_collisions=%u]", aw_refs, aw_used, aw_colm, aw_colc);
+
+	stop_watchdog = thread_state::aborting;
+
+	m_stop_ctr++;
+	m_stop_ctr.notify_all();
+
+	if (restart)
 	{
 		// Reload with prior configs.
-		if (const auto error = Load(m_title_id); error != game_boot_result::no_errors)
-		{
+		if (const auto error = Load(m_title_id, false, m_force_global_config); error != game_boot_result::no_errors)
 			sys_log.error("Restart failed: %s", error);
+		return;
+	}
+
+	// Boot arg cleanup (preserved in the case restarting)
+	argv.clear();
+	envp.clear();
+	data.clear();
+	disc.clear();
+	klic.clear();
+	hdd1.clear();
+
+	// Always Enable display sleep, not only if it was prevented.
+	enable_display_sleep();
+
+	if (!m_force_boot)
+	{
+		if (Quit(g_cfg.misc.autoexit.get()))
+		{
+			return;
 		}
-	};
-
-	if (!IsStopped())
-	{
-		auto save_args = std::make_tuple(argv, envp, data, disc, klic, hdd1, m_config_mode, m_config_path);
-
-		if (graceful)
-			GracefulShutdown(false, false);
-		else
-			Kill(false);
-
-		std::tie(argv, envp, data, disc, klic, hdd1, m_config_mode, m_config_path) = std::move(save_args);
-	}
-	else
-	{
-		// Execute and empty the callback
-		::as_rvalue(std::move(Emu.after_kill_callback))();
 	}
 
-	return game_boot_result::no_errors;
+	m_force_boot = false;
 }
 
 bool Emulator::Quit(bool force_quit)
@@ -3903,7 +1708,7 @@ std::string Emulator::GetFormattedTitle(double fps) const
 {
 	rpcs3::title_format_data title_data;
 	title_data.format = g_cfg.misc.title_format.to_string();
-	title_data.title = GetLocalizedTitle();
+	title_data.title = GetTitle();
 	title_data.title_id = GetTitleID();
 	title_data.renderer = g_cfg.video.renderer.to_string();
 	title_data.vulkan_adapter = g_cfg.video.vk.adapter.to_string();
@@ -3912,11 +1717,67 @@ std::string Emulator::GetFormattedTitle(double fps) const
 	return rpcs3::get_formatted_title(title_data);
 }
 
+s32 error_code::error_report(s32 result, const char* fmt, const fmt_type_info* sup, const u64* args)
+{
+	static thread_local std::unordered_map<std::string, usz> g_tls_error_stats;
+	static thread_local std::string g_tls_error_str;
+
+	if (!sup && !args)
+	{
+		if (!fmt)
+		{
+			// Report and clean error state
+			for (auto&& pair : g_tls_error_stats)
+			{
+				if (pair.second > 3)
+				{
+					sys_log.error("Stat: %s [x%u]", pair.first, pair.second);
+				}
+			}
+
+			g_tls_error_stats.clear();
+			return 0;
+		}
+	}
+
+	logs::channel* channel = &sys_log;
+	const char* func = "Unknown function";
+
+	if (auto ppu = get_current_cpu_thread<ppu_thread>())
+	{
+		if (ppu->current_function)
+		{
+			func = ppu->current_function;
+		}
+	}
+
+	// Format log message (use preallocated buffer)
+	g_tls_error_str.clear();
+	fmt::append(g_tls_error_str, "'%s' failed with 0x%08x", func, result);
+	fmt::raw_append(g_tls_error_str, fmt, sup, args);
+
+	// Update stats and check log threshold
+	const auto stat = ++g_tls_error_stats[g_tls_error_str];
+
+	if (stat <= 3)
+	{
+		channel->error("%s [%u]", g_tls_error_str, stat);
+	}
+
+	return result;
+}
+
 void Emulator::ConfigurePPUCache() const
 {
-	auto& _main = g_fxo->get<main_ppu_module<lv2_obj>>();
+	auto& _main = g_fxo->get<ppu_module>();
 
-	_main.cache = rpcs3::utils::get_cache_dir(_main.path);
+	_main.cache = rpcs3::utils::get_cache_dir();
+
+	if (!m_title_id.empty() && m_cat != "1P")
+	{
+		_main.cache += GetTitleID();
+		_main.cache += '/';
+	}
 
 	fmt::append(_main.cache, "ppu-%s-%s/", fmt::base57(_main.sha1), _main.path.substr(_main.path.find_last_of('/') + 1));
 
@@ -3956,14 +1817,13 @@ std::set<std::string> Emulator::GetGameDirs() const
 			if (entry.is_directory && entry.name.starts_with(GetTitleID()))
 			{
 				const std::string sfo_dir = game_dir + entry.name + '/';
-				const std::string sfo_path = sfo_dir + "PARAM.SFO";
-				const fs::file sfo_file(sfo_path);
+				const fs::file sfo_file(sfo_dir + "PARAM.SFO");
 				if (!sfo_file)
 				{
 					continue;
 				}
 
-				const psf::registry psf = psf::load_object(sfo_file, sfo_path);
+				const psf::registry psf    = psf::load_object(sfo_file);
 				const std::string title_id = std::string(psf::get_string(psf, "TITLE_ID", ""));
 
 				if (title_id == GetTitleID())
@@ -3977,580 +1837,9 @@ std::set<std::string> Emulator::GetGameDirs() const
 	return dirs;
 }
 
-u32 Emulator::AddGamesFromDir(const std::string& path)
-{
-	u32 games_added = 0;
-
-	m_games_config.set_save_on_dirty(false);
-
-	// search dropped path first or else the direct parent to an elf is wrongly skipped
-	if (const game_boot_result error = AddGame(path); error == game_boot_result::no_errors)
-	{
-		games_added++;
-	}
-
-	std::vector<fs::dir_entry> entries;
-
-	for (auto&& dir_entry : fs::dir(path))
-	{
-		// Prefetch entries, it is unsafe to keep fs::dir for a long time or for many operations
-		entries.emplace_back(std::move(dir_entry));
-	}
-
-	auto path_it = entries.begin();
-
-	qt_events_aware_op(0, [&]()
-	{
-		// search direct subdirectories, that way we can drop one folder containing all games
-		for (; path_it != entries.end(); ++path_it)
-		{
-			auto dir_entry = std::move(*path_it);
-
-			if (!dir_entry.is_directory || dir_entry.name == "." || dir_entry.name == "..")
-			{
-				continue;
-			}
-
-			const std::string dir_path = path + '/' + dir_entry.name;
-
-			if (const game_boot_result error = AddGame(dir_path); error == game_boot_result::no_errors)
-			{
-				games_added++;
-			}
-
-			// Process events
-			++path_it;
-			return false;
-		}
-
-		// Exit loop
-		return true;
-	});
-
-	m_games_config.set_save_on_dirty(true);
-
-	if (m_games_config.is_dirty() && !m_games_config.save())
-	{
-		sys_log.error("Failed to save games.yml after adding games");
-	}
-
-	return games_added;
-}
-
-game_boot_result Emulator::AddGame(const std::string& path)
-{
-	// Handle files directly
-	if (!fs::is_dir(path))
-	{
-		return AddGameToYml(path);
-	}
-
-	game_boot_result result = game_boot_result::nothing_to_boot;
-	bool result_set = false;
-
-	std::string elf;
-	if (const game_boot_result res = GetElfPathFromDir(elf, path); res == game_boot_result::no_errors)
-	{
-		ensure(!elf.empty());
-		result = AddGameToYml(elf);
-		result_set = true;
-	}
-
-	for (auto&& entry : fs::dir{ path })
-	{
-		if (entry.name == "." || entry.name == "..")
-		{
-			continue;
-		}
-
-		if (entry.is_directory && std::regex_match(entry.name, std::regex("^PS3_GM[[:digit:]]{2}$")))
-		{
-			const std::string elf = path + "/" + entry.name + "/USRDIR/EBOOT.BIN";
-
-			if (fs::is_file(elf))
-			{
-				if (const auto err = AddGameToYml(elf); err != game_boot_result::no_errors)
-				{
-					if (err != game_boot_result::already_added || !result_set)
-					{
-						result = err;
-						result_set = true;
-					}
-				}
-			}
-		}
-	}
-
-	return result;
-}
-
-game_boot_result Emulator::AddGameToYml(const std::string& path)
-{
-	// Detect boot location
-	const auto is_invalid_path = [this](std::string_view path, std::string_view dir) -> game_boot_result
-	{
-		if (IsPathInsideDir(path, dir))
-		{
-			sys_log.error("Adding games from dev_flash is not allowed.");
-			return game_boot_result::invalid_file_or_folder;
-		}
-
-		return VerifyPathCasing(path, dir, false);
-	};
-
-	if (game_boot_result error = is_invalid_path(path, rpcs3::utils::get_hdd0_dir()); error != game_boot_result::no_errors)
-	{
-		sys_log.error("Adding games from dev_hdd0 is not allowed.");
-		return error;
-	}
-
-	if (game_boot_result error = is_invalid_path(path, g_cfg_vfs.get_dev_flash()); error != game_boot_result::no_errors)
-	{
-		sys_log.error("Adding games from dev_flash is not allowed.");
-		return error;
-	}
-
-	// Load PARAM.SFO
-	const std::string elf_dir = fs::get_parent_dir(path);
-	std::string sfo_dir = rpcs3::utils::get_sfo_dir_from_game_path(fs::get_parent_dir(elf_dir));
-	const psf::registry _psf = psf::load_object(sfo_dir + "/PARAM.SFO");
-
-	const std::string title_id = std::string(psf::get_string(_psf, "TITLE_ID"));
-	const std::string cat = std::string(psf::get_string(_psf, "CATEGORY"));
-
-	if (!_psf.empty() && cat.empty())
-	{
-		sys_log.fatal("Corrupted PARAM.SFO found! Try reinstalling the game.");
-		return game_boot_result::invalid_file_or_folder;
-	}
-
-	if (title_id.empty())
-	{
-		sys_log.notice("Can not add binary without TITLE_ID to games.yml. (path=%s, category=%s)", path, cat);
-		return game_boot_result::invalid_file_or_folder;
-	}
-
-	if (cat == "GD")
-	{
-		sys_log.notice("Can not add game data to games.yml. (path=%s, title_id=%s, category=%s)", path, title_id, cat);
-		return game_boot_result::invalid_file_or_folder;
-	}
-
-	// Set bdvd_dir
-	std::string bdvd_dir;
-	std::string game_dir;
-	std::string sfb_dir;
-	GetBdvdDir(bdvd_dir, sfb_dir, game_dir, elf_dir);
-
-	// Check /dev_bdvd/
-	if (bdvd_dir.empty())
-	{
-		// Add HG games not in HDD0 to games.yml
-		if (cat == "HG")
-		{
-			switch (m_games_config.add_external_hdd_game(title_id, sfo_dir))
-			{
-			case games_config::result::failure: return game_boot_result::generic_error;
-			case games_config::result::success: return game_boot_result::no_errors;
-			case games_config::result::exists: return game_boot_result::already_added;
-			}
-
-			return game_boot_result::generic_error;
-		}
-	}
-	else if (fs::is_dir(bdvd_dir))
-	{
-		if (const std::string sfb_path = bdvd_dir + "/PS3_DISC.SFB"; !IsValidSfb(sfb_path))
-		{
-			sys_log.error("Invalid disc directory for the disc game %s. (%s)", title_id, sfb_path);
-			return game_boot_result::invalid_file_or_folder;
-		}
-
-		// Store /dev_bdvd/ location
-		switch (m_games_config.add_game(title_id, bdvd_dir))
-		{
-		case games_config::result::failure:
-		{
-			sys_log.error("Failed to save BDVD location of title '%s' (error=%s)", title_id, fs::g_tls_error);
-			return game_boot_result::generic_error;
-		}
-		case games_config::result::success:
-		{
-			sys_log.notice("Registered BDVD game directory for title '%s': %s", title_id, bdvd_dir);
-			return game_boot_result::no_errors;
-		}
-		case games_config::result::exists:
-		{
-			return game_boot_result::already_added;
-		}
-		}
-
-		return game_boot_result::generic_error;
-	}
-
-	sys_log.notice("Nothing to add in path %s (title_id=%s, category=%s)", path, title_id, cat);
-	return game_boot_result::invalid_file_or_folder;
-}
-
-u32 Emulator::RemoveGamesFromDir(const std::string& games_dir, const std::vector<std::string>& serials_to_remove_from_yml, bool save_on_disk)
-{
-	// List of serials (title id) to remove in "games.yml" file (if any)
-	std::vector<std::string> serials_to_remove = serials_to_remove_from_yml; // Initialize the list with the specified serials (if any)
-
-	if (!games_dir.empty()) // Skip an empty folder, otherwise we'll remove all games (which is not the intention)
-	{
-		// Scan game list to detect the titles belonging to auto-detection "games_dir" folder
-		for (const auto& [serial, path] : Emu.GetGamesConfig().get_games()) // Loop on game list file
-		{
-			// NOTE: Used starts_with(games_dir) instead of Emu.IsPathInsideDir(path, games_dir) due the latter would check
-			//       also the existence of the paths
-			//
-			if (path.starts_with(games_dir)) // If game path belongs to auto-detection "games_dir" folder, add the serial to the removal list
-			{
-				serials_to_remove.push_back(serial);
-			}
-		}
-	}
-
-	// Remove the specified and detected serials (title id) belonging to "games_dir" from the game list in memory
-	// or also in "games.yml" file according to the value of "save_on_disk"
-	return RemoveGames(serials_to_remove, save_on_disk);
-}
-
-u32 Emulator::RemoveGames(const std::vector<std::string>& title_id_list, bool save_on_disk)
-{
-	if (title_id_list.empty())
-	{
-		return 0;
-	}
-
-	u32 games_removed = 0;
-
-	m_games_config.set_save_on_dirty(false);
-
-	for (const std::string& title_id : title_id_list)
-	{
-		if (RemoveGameFromYml(title_id) == game_boot_result::no_errors)
-		{
-			games_removed++;
-		}
-	}
-
-	m_games_config.set_save_on_dirty(true);
-
-	if (save_on_disk && m_games_config.is_dirty() && !m_games_config.save())
-	{
-		sys_log.error("Failed to save games.yml after removing games");
-	}
-
-	return games_removed;
-}
-
-game_boot_result Emulator::RemoveGameFromYml(const std::string& title_id)
-{
-	// Remove title from games.yml
-	switch (m_games_config.remove_game(title_id))
-	{
-	case games_config::result::failure:
-	{
-		sys_log.error("Failed to remove title '%s' (error=%s)", title_id, fs::g_tls_error);
-		return game_boot_result::generic_error;
-	}
-	case games_config::result::success:
-	case games_config::result::exists: // not applicable for m_games_config.remove_game(). Added just to avoid compilation warnings!
-	{
-		sys_log.notice("Removed title '%s'", title_id);
-		return game_boot_result::no_errors;
-	}
-	}
-
-	return game_boot_result::generic_error;
-}
-
 bool Emulator::IsPathInsideDir(std::string_view path, std::string_view dir) const
 {
-	const std::string dir_path = GetCallbacks().resolve_path(dir);
-	const std::string resolved_path = GetCallbacks().resolve_path(path);
-
-	return !dir_path.empty() && !resolved_path.empty() && (resolved_path + '/').starts_with((dir_path.back() == '/') ? dir_path : (dir_path + '/'));
-}
-
-game_boot_result Emulator::VerifyPathCasing(
-	[[maybe_unused]] std::string_view path,
-	[[maybe_unused]] std::string_view dir,
-	[[maybe_unused]] bool from_dir) const
-{
-#ifdef _WIN32
-	// path might be passed from command line with differences in uppercase/lowercase on windows.
-	if (!from_dir && IsPathInsideDir(fmt::to_lower(path), fmt::to_lower(dir)))
-	{
-		// Let's just abort to prevent errors down the line.
-		sys_log.error("The path seems to contain incorrectly cased characters. Please adjust the path and try again.");
-		return game_boot_result::invalid_file_or_folder;
-	}
-#endif
-	return game_boot_result::no_errors;
-}
-
-const std::string& Emulator::GetFakeCat() const
-{
-	if (m_cat == "DG")
-	{
-		const std::string mount_point = vfs::get("/dev_bdvd");
-
-		if (mount_point.empty() || !IsPathInsideDir(m_path, mount_point))
-		{
-			static const std::string s_hg = "HG";
-			return s_hg;
-		}
-	}
-
-	return m_cat;
-}
-
-const std::string Emulator::GetSfoDir(bool prefer_disc_sfo) const
-{
-	if (prefer_disc_sfo)
-	{
-		const std::string sfo_dir = vfs::get("/dev_bdvd/PS3_GAME");
-
-		if (!sfo_dir.empty())
-		{
-			return sfo_dir;
-		}
-	}
-
-	return m_sfo_dir;
-}
-
-void Emulator::GetBdvdDir(std::string& bdvd_dir, std::string& sfb_dir, std::string& game_dir, const std::string& elf_dir)
-{
-	// Find disc directory by searching a valid PS3_DISC.SFB closest to root directory
-	std::string main_dir;
-	std::string_view main_dir_name;
-
-	std::string parent_dir;
-
-	for (std::string search_dir = elf_dir.substr(0, elf_dir.find_last_not_of(fs::delim) + 1);; search_dir = std::move(parent_dir))
-	{
-		parent_dir = fs::get_parent_dir(search_dir);
-
-		if (parent_dir.size() == search_dir.size())
-		{
-			// Keep looking until root directory is reached
-			break;
-		}
-
-		std::string_view dir_name = std::string_view{search_dir}.substr(search_dir.find_last_of(fs::delim) + 1);
-
-		if (dir_name.size() != ("PS3_GAME"sv).size())
-		{
-			continue;
-		}
-
-		if (dir_name == "PS3_GAME"sv || std::regex_match(dir_name.begin(), dir_name.end(), std::regex("^PS3_GM[[:digit:]]{2}$")))
-		{
-			if (IsValidSfb(parent_dir + "/PS3_DISC.SFB"))
-			{
-				// Remember valid disc directory
-				main_dir_name = {}; // Remove old string reference
-				main_dir = search_dir;
-				sfb_dir = parent_dir;
-				main_dir_name = std::string_view{main_dir}.substr(main_dir.find_last_of(fs::delim) + 1);
-			}
-		}
-	}
-
-	if (!sfb_dir.empty())
-	{
-		bdvd_dir = sfb_dir + "/";
-		game_dir = std::string{main_dir_name};
-	}
-}
-
-void Emulator::EjectDisc()
-{
-	if (!Emu.IsRunning())
-	{
-		sys_log.error("Can not eject disc if the Emulator is not running!");
-		return;
-	}
-
-	if (vfs::get("/dev_bdvd").empty() && vfs::get("/dev_ps2disc").empty())
-	{
-		sys_log.error("Can not eject disc if both dev_bdvd and dev_ps2disc are not mounted!");
-		return;
-	}
-
-	sys_log.notice("Ejecting disc...");
-
-	m_sfo_dir.clear();
-
-	if (g_fxo->is_init<disc_change_manager>())
-	{
-		g_fxo->get<disc_change_manager>().eject_disc();
-	}
-}
-
-game_boot_result Emulator::InsertDisc(const std::string& path)
-{
-	if (!Emu.IsRunning())
-	{
-		sys_log.error("Can not insert disc if the Emulator is not running!");
-		return game_boot_result::generic_error;
-	}
-
-	sys_log.notice("Inserting disc... (path='%s')", path);
-
-	const std::string hdd0_game = vfs::get("/dev_hdd0/game/");
-	const bool from_hdd0_game = IsPathInsideDir(path, hdd0_game);
-
-	if (from_hdd0_game)
-	{
-		sys_log.error("Inserting disc failed: Can not mount discs from '/dev_hdd0/game/'. (path='%s')", path);
-		return game_boot_result::wrong_disc_location;
-	}
-
-	std::string disc_root;
-	std::string ps3_game_dir;
-	const disc::disc_type disc_type = disc::get_disc_type(path, disc_root, ps3_game_dir);
-
-	if (disc_type == disc::disc_type::invalid)
-	{
-		sys_log.error("Inserting disc failed: not a disc (path='%s')", path);
-		return game_boot_result::wrong_disc_location;
-	}
-
-	ensure(!disc_root.empty());
-
-	u32 type = CELL_GAME_DISCTYPE_OTHER;
-	std::string title_id;
-
-	if (disc_type == disc::disc_type::ps3)
-	{
-		type = CELL_GAME_DISCTYPE_PS3;
-
-		// Double check PARAM.SFO
-		const std::string sfo_dir = rpcs3::utils::get_sfo_dir_from_game_path(disc_root);
-		const psf::registry _psf = psf::load_object(sfo_dir + "/PARAM.SFO");
-
-		if (_psf.empty())
-		{
-			sys_log.error("Inserting disc failed: Corrupted PARAM.SFO found! (path='%s/PARAM.SFO')", sfo_dir);
-			return game_boot_result::invalid_file_or_folder;
-		}
-
-		title_id = std::string(psf::get_string(_psf, "TITLE_ID"));
-
-		if (title_id.empty())
-		{
-			sys_log.error("Inserting disc failed: Corrupted PARAM.SFO found! TITLE_ID empty (path='%s/PARAM.SFO')", sfo_dir);
-			return game_boot_result::invalid_file_or_folder;
-		}
-
-		m_sfo_dir = sfo_dir;
-		m_game_dir = ps3_game_dir;
-
-		sys_log.notice("New sfo dir: %s", m_sfo_dir);
-		sys_log.notice("New game dir: %s", m_game_dir);
-
-		ensure(vfs::mount("/dev_bdvd", disc_root));
-		ensure(vfs::mount("/dev_bdvd/PS3_GAME", disc_root + m_game_dir + "/"));
-	}
-	else if (disc_type == disc::disc_type::ps2)
-	{
-		type = CELL_GAME_DISCTYPE_PS2;
-
-		ensure(vfs::mount("/dev_ps2disc", disc_root));
-	}
-	else
-	{
-		// TODO: find out where other discs are mounted
-		sys_log.todo("Mounting non-ps2/ps3 disc in dev_bdvd. Is this correct? (path='%s')", disc_root);
-		ensure(vfs::mount("/dev_bdvd", disc_root));
-	}
-
-	if (g_fxo->is_init<disc_change_manager>())
-	{
-		g_fxo->get<disc_change_manager>().insert_disc(type, std::move(title_id));
-	}
-
-	return game_boot_result::no_errors;
-}
-
-utils::serial* Emulator::DeserialManager() const
-{
-	ensure(!m_ar || !m_ar->is_writing());
-	return m_ar.get();
-}
-
-bool Emulator::IsVsh()
-{
-	return g_ps3_process_info.self_info.valid && (g_ps3_process_info.self_info.prog_id_hdr.program_authority_id >> 36 == 0x1070000); // Not only VSH but also most CoreOS LV2 SELFs need the special treatment
-}
-
-bool Emulator::IsValidSfb(const std::string& path)
-{
-	fs::file sfb_file{path, fs::read + fs::isfile};
-
-	if (sfb_file)
-	{
-		if (sfb_file.size() < 4 || sfb_file.read<u32>() != ".SFB"_u32)
-		{
-			sys_log.error("PS3_DISC.SFB file may be truncated or corrupted. (path='%s')", path);
-			return false;
-		}
-
-		return true;
-	}
-
-	return false;
-}
-
-void Emulator::SaveSettings(const std::string& settings, const std::string& title_id)
-{
-	std::string config_name;
-
-	if (title_id.empty())
-	{
-		config_name = fs::get_config_dir(true) + "config.yml";
-	}
-	else
-	{
-		config_name = rpcs3::utils::get_custom_config_path(title_id);
-	}
-
-	// Save config atomically
-	fs::pending_file temp(config_name);
-	if (!temp.file)
-	{
-		sys_log.error("Could not save config to %s (failed to create temporary file) (error=%s)", config_name, fs::g_tls_error);
-	}
-	else
-	{
-		temp.file.write(settings.c_str(), settings.size());
-		if (!temp.commit())
-		{
-			sys_log.error("Could not save config to %s (failed to commit) (error=%s)", config_name, fs::g_tls_error);
-		}
-	}
-
-	// Check if the running config/title is the same as the edited config/title.
-	if (config_name == g_cfg.name || title_id == Emu.GetTitleID())
-	{
-		// Update current config
-		if (!g_cfg.from_string({settings.c_str(), settings.size()}, !Emu.IsStopped()))
-		{
-			sys_log.fatal("Failed to update configuration");
-		}
-		else if (!Emu.IsStopped()) // Don't spam the log while emulation is stopped. The config will be logged on boot anyway.
-		{
-			sys_log.notice("Updated configuration:\n%s\n", g_cfg.to_string());
-		}
-	}
-
-	// Backup config
-	g_backup_cfg.from_string(g_cfg.to_string());
-}
+	return (GetCallbacks().resolve_path(path) + '/').starts_with(GetCallbacks().resolve_path(dir) + '/');
+};
 
 Emulator Emu;
diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h
index 417bef41b8..2cb4c08888 100644
--- a/rpcs3/Emu/System.h
+++ b/rpcs3/Emu/System.h
@@ -2,41 +2,31 @@
 
 #include "util/types.hpp"
 #include "util/atomic.hpp"
-#include "util/shared_ptr.hpp"
-#include "Utilities/bit_set.h"
-#include "config_mode.h"
-#include "games_config.h"
 #include <functional>
 #include <memory>
 #include <string>
 #include <vector>
 #include <set>
 
-void init_fxo_for_exec(utils::serial*, bool);
+#include "Emu/Cell/timers.hpp"
+
+struct progress_dialog_workaround
+{
+	// WORKAROUND:
+	// We don't want to show the native dialog during gameplay.
+	// This can currently interfere with cell dialogs.
+	atomic_t<bool> skip_the_progress_dialog = false;
+};
 
 enum class localized_string_id;
 enum class video_renderer;
 
-class spu_thread;
-
-template <typename T>
-class named_thread;
-
-namespace cfg
-{
-	class _base;
-}
-
 enum class system_state : u32
 {
-	stopped,
-	loading,
-	stopping,
 	running,
+	stopped,
 	paused,
-	frozen, // paused but cannot resume
 	ready,
-	starting,
 };
 
 enum class game_boot_result : u32
@@ -46,77 +36,37 @@ enum class game_boot_result : u32
 	nothing_to_boot,
 	wrong_disc_location,
 	invalid_file_or_folder,
-	invalid_bdvd_folder,
 	install_failed,
 	decryption_error,
 	file_creation_error,
 	firmware_missing,
-	firmware_version,
-	unsupported_disc_type,
-	savestate_corrupted,
-	savestate_version_unsupported,
-	still_running,
-	already_added,
-	currently_restricted,
+	unsupported_disc_type
 };
 
-constexpr bool is_error(game_boot_result res)
-{
-	return res != game_boot_result::no_errors;
-}
-
 struct EmuCallbacks
 {
-	std::function<void(std::function<void()>, atomic_t<u32>*)> call_from_main_thread;
+	std::function<void(std::function<void()>)> call_after;
 	std::function<void(bool)> on_run; // (start_playtime) continuing or going ingame, so start the clock
 	std::function<void()> on_pause;
 	std::function<void()> on_resume;
 	std::function<void()> on_stop;
 	std::function<void()> on_ready;
-	std::function<void()> on_missing_fw;
-	std::function<void(std::shared_ptr<atomic_t<bool>>, int)> on_emulation_stop_no_response;
-	std::function<void(std::shared_ptr<atomic_t<bool>>, stx::shared_ptr<utils::serial>, stx::atomic_ptr<std::string>*, std::shared_ptr<void>)> on_save_state_progress;
-	std::function<void(bool enabled)> enable_disc_eject;
-	std::function<void(bool enabled)> enable_disc_insert;
+	std::function<bool()> on_missing_fw;
 	std::function<bool(bool, std::function<void()>)> try_to_quit; // (force_quit, on_exit) Try to close RPCS3
 	std::function<void(s32, s32)> handle_taskbar_progress; // (type, value) type: 0 for reset, 1 for increment, 2 for set_limit, 3 for set_value
 	std::function<void()> init_kb_handler;
 	std::function<void()> init_mouse_handler;
 	std::function<void(std::string_view title_id)> init_pad_handler;
-	std::function<void()> update_emu_settings;
-	std::function<void()> save_emu_settings;
-	std::function<void()> close_gs_frame;
 	std::function<std::unique_ptr<class GSFrameBase>()> get_gs_frame;
-	std::function<std::shared_ptr<class camera_handler_base>()> get_camera_handler;
-	std::function<std::shared_ptr<class music_handler_base>()> get_music_handler;
-	std::function<void(utils::serial*)> init_gs_render;
+	std::function<void()> init_gs_render;
 	std::function<std::shared_ptr<class AudioBackend>()> get_audio;
-	std::function<std::shared_ptr<class audio_device_enumerator>(u64)> get_audio_enumerator; // (audio_renderer)
 	std::function<std::shared_ptr<class MsgDialogBase>()> get_msg_dialog;
 	std::function<std::shared_ptr<class OskDialogBase>()> get_osk_dialog;
 	std::function<std::unique_ptr<class SaveDialogBase>()> get_save_dialog;
-	std::function<std::shared_ptr<class SendMessageDialogBase>()> get_sendmessage_dialog;
-	std::function<std::shared_ptr<class RecvMessageDialogBase>()> get_recvmessage_dialog;
 	std::function<std::unique_ptr<class TrophyNotificationBase>()> get_trophy_notification_dialog;
 	std::function<std::string(localized_string_id, const char*)> get_localized_string;
 	std::function<std::u32string(localized_string_id, const char*)> get_localized_u32string;
-	std::function<std::string(const cfg::_base*, u32)> get_localized_setting;
-	std::function<void(const std::string&)> play_sound;
-	std::function<bool(const std::string&, std::string&, s32&, s32&, s32&)> get_image_info; // (filename, sub_type, width, height, CellSearchOrientation)
-	std::function<bool(const std::string&, s32, s32, s32&, s32&, u8*, bool)> get_scaled_image; // (filename, target_width, target_height, width, height, dst, force_fit)
-	std::string(*resolve_path)(std::string_view) = [](std::string_view arg){ return std::string{arg}; }; // Resolve path using Qt
-	std::function<std::vector<std::string>()> get_font_dirs;
-	std::function<bool(const std::vector<std::string>&)> on_install_pkgs;
-	std::function<void(u32)> add_breakpoint;
-	std::function<bool()> display_sleep_control_supported;
-	std::function<void(bool)> enable_display_sleep;
-	std::function<void()> check_microphone_permissions;
-	std::function<std::unique_ptr<class video_source>()> make_video_source;
-};
-
-namespace utils
-{
-	struct serial;
+	std::string(*resolve_path)(std::string_view) = nullptr; // Resolve path using Qt
 };
 
 class Emulator final
@@ -127,73 +77,35 @@ class Emulator final
 
 	atomic_t<u64> m_pause_start_time{0}; // set when paused
 	atomic_t<u64> m_pause_amend_time{0}; // increased when resumed
-	atomic_t<u64> m_stop_ctr{1}; // Increments when emulation is stopped
-	atomic_t<bool> m_emu_state_close_pending = false;
-	atomic_t<u64> m_restrict_emu_state_change{0};
-
-	games_config m_games_config;
+	atomic_t<u64> m_stop_ctr{0}; // Increments when emulation is stopped
 
 	video_renderer m_default_renderer;
 	std::string m_default_graphics_adapter;
 
-	cfg_mode m_config_mode = cfg_mode::custom;
-	std::string m_config_path;
+	std::string m_config_override_path;
 	std::string m_path;
 	std::string m_path_old;
-	std::string m_path_original;
 	std::string m_title_id;
 	std::string m_title;
-	std::string m_localized_title;
 	std::string m_app_version;
-	std::string m_hash;
 	std::string m_cat;
 	std::string m_dir;
 	std::string m_sfo_dir;
 	std::string m_game_dir{"PS3_GAME"};
 	std::string m_usr{"00000001"};
 	u32 m_usrid{1};
-	std::shared_ptr<utils::serial> m_ar;
 
-	// This flag should be adjusted before each Kill() or each BootGame() and similar because:
+	bool m_force_global_config = false;
+
+	// This flag should be adjusted before each Stop() or each BootGame() and similar because:
 	// 1. It forces an application to boot immediately by calling Run() in Load().
-	// 2. It signifies that we don't want to exit on Kill(), for example if we want to transition to another application.
+	// 2. It signifies that we don't want to exit on Stop(), for example if we want to transition to another application.
 	bool m_force_boot = false;
 
-	bool m_continuous_mode = false;
 	bool m_has_gui = true;
 
-	bool m_state_inspection_savestate = false;
-
-	usz m_tty_file_init_pos = umax;
-
-	std::vector<std::shared_ptr<atomic_t<u32>>> m_pause_msgs_refs;
-
-	std::vector<std::function<void()>> m_postponed_init_code;
-
-	void ExecPostponedInitCode()
-	{
-		for (auto&& func : ::as_rvalue(std::move(m_postponed_init_code)))
-		{
-			func();
-		}
-	}
-
-	enum class SaveStateExtentionFlags1 : u8
-	{
-		SupportsMenuOpenResume,
-		ShouldCloseMenu,
-
-		__bitset_enum_max,
-	};
-
-	bs_t<SaveStateExtentionFlags1> m_savestate_extension_flags1{};
-
 public:
-	static constexpr std::string_view game_id_boot_prefix = "%RPCS3_GAMEID%:";
-	static constexpr std::string_view vfs_boot_prefix = "%RPCS3_VFS%:";
-
-	Emulator() noexcept = default;
-	~Emulator() noexcept = default;
+	Emulator() = default;
 
 	void SetCallbacks(EmuCallbacks&& cb)
 	{
@@ -206,34 +118,22 @@ public:
 	}
 
 	// Call from the GUI thread
-	void CallFromMainThread(std::function<void()>&& func, atomic_t<u32>* wake_up = nullptr, bool track_emu_state = true, u64 stop_ctr = umax,
-		std::source_location src_loc = std::source_location::current()) const;
-
-	// Blocking call from the GUI thread
-	void BlockingCallFromMainThread(std::function<void()>&& func, bool track_emu_state = true, std::source_location src_loc = std::source_location::current()) const;
-
-	enum class stop_counter_t : u64{};
-
-	// Returns a different value each time we start a new emulation.
-	stop_counter_t GetEmulationIdentifier(bool subtract_one = false) const
+	void CallAfter(std::function<void()>&& func, bool track_emu_state = true) const
 	{
-		if (subtract_one)
+		if (!track_emu_state)
 		{
-			return stop_counter_t{m_stop_ctr - 1};
+			return m_cb.call_after(std::move(func));
 		}
 
-		return stop_counter_t{+m_stop_ctr};
-	}
+		std::function<void()> final_func = [this, before = IsStopped(), count = +m_stop_ctr, func = std::move(func)]
+		{
+			if (count == m_stop_ctr && before == IsStopped())
+			{
+				func();
+			}
+		};
 
-	void CallFromMainThread(std::function<void()>&& func, stop_counter_t counter,
-		std::source_location src_loc = std::source_location::current()) const
-	{
-		CallFromMainThread(std::move(func), nullptr, true, static_cast<u64>(counter), src_loc);
-	}
-
-	void PostponeInitCode(std::function<void()>&& func)
-	{
-		m_postponed_init_code.emplace_back(std::move(func));
+		return m_cb.call_after(std::move(final_func));
 	}
 
 	/** Set emulator mode to running unconditionnaly.
@@ -244,7 +144,7 @@ public:
 		m_state = system_state::running;
 	}
 
-	void Init();
+	void Init(bool add_only = false);
 
 	std::vector<std::string> argv;
 	std::vector<std::string> envp;
@@ -252,26 +152,12 @@ public:
 	std::vector<u128> klic;
 	std::string disc;
 	std::string hdd1;
-	std::function<void(u32)> init_mem_containers;
-	std::function<void()> after_kill_callback;
-
-	u32 m_boot_source_type = 0; // CELL_GAME_GAMETYPE_SYS
-
-	const u32& GetBootSourceType() const
-	{
-		return m_boot_source_type;
-	}
 
 	const std::string& GetBoot() const
 	{
 		return m_path;
 	}
 
-	const std::string& GetLastBoot() const
-	{
-		return m_path_original;
-	}
-
 	const std::string& GetTitleID() const
 	{
 		return m_title_id;
@@ -282,11 +168,6 @@ public:
 		return m_title;
 	}
 
-	const std::string& GetLocalizedTitle() const
-	{
-		return m_localized_title;
-	}
-
 	const std::string GetTitleAndTitleID() const
 	{
 		return m_title + (m_title_id.empty() ? "" : " [" + m_title_id + "]");
@@ -297,26 +178,20 @@ public:
 		return m_app_version;
 	}
 
-	const std::string& GetExecutableHash() const
-	{
-		return m_hash;
-	}
-
-	void SetExecutableHash(std::string hash) { m_hash = std::move(hash); }
-
 	const std::string& GetCat() const
 	{
 		return m_cat;
 	}
 
-	const std::string& GetFakeCat() const;
-
 	const std::string& GetDir() const
 	{
 		return m_dir;
 	}
 
-	const std::string GetSfoDir(bool prefer_disc_sfo) const;
+	const std::string& GetSfoDir() const
+	{
+		return m_sfo_dir;
+	}
 
 	// String for GUI dialogs.
 	const std::string& GetUsr() const
@@ -324,14 +199,6 @@ public:
 		return m_usr;
 	}
 
-	const games_config& GetGamesConfig() const
-	{
-		return m_games_config;
-	}
-
-	// Get deserialization manager
-	utils::serial* DeserialManager() const;
-
 	// u32 for cell.
 	u32 GetUsrId() const
 	{
@@ -340,139 +207,48 @@ public:
 
 	void SetUsr(const std::string& user);
 
+	std::string GetBackgroundPicturePath() const;
+
 	u64 GetPauseTime() const
 	{
 		return m_pause_amend_time;
 	}
 
-	const std::string& GetUsedConfig() const
-	{
-		return m_config_path;
-	}
-
-	bool IsChildProcess() const
-	{
-		return m_config_mode == cfg_mode::continuous;
-	}
-
-	bool ContinuousModeEnabled(bool reset)
-	{
-		if (reset)
-		{
-			return std::exchange(m_continuous_mode, false);
-		}
-		return m_continuous_mode;
-	}
-
-	class emulation_state_guard_t
-	{
-		class Emulator* _this = nullptr;
-		bool active = true;
-
-	public:
-		explicit emulation_state_guard_t(Emulator* this0) noexcept
-			: _this(this0)
-		{
-			_this->m_restrict_emu_state_change++;
-		}
-
-		~emulation_state_guard_t() noexcept
-		{
-			if (active)
-			{
-				_this->m_restrict_emu_state_change--;
-			}
-		}
-
-		emulation_state_guard_t(emulation_state_guard_t&& rhs) noexcept
-		{
-			_this = rhs._this;
-			active = std::exchange(rhs.active, false);
-		}
-
-		emulation_state_guard_t& operator=(const emulation_state_guard_t&) = delete;
-		emulation_state_guard_t(const emulation_state_guard_t&) = delete;
-	};
-
-	emulation_state_guard_t MakeEmulationStateGuard()
-	{
-		return emulation_state_guard_t{this};
-	}
-
-	game_boot_result BootGame(const std::string& path, const std::string& title_id = "", bool direct = false, cfg_mode config_mode = cfg_mode::custom, const std::string& config_path = "");
+	game_boot_result BootGame(const std::string& path, const std::string& title_id = "", bool direct = false, bool add_only = false, bool force_global_config = false);
 	bool BootRsxCapture(const std::string& path);
 
 	void SetForceBoot(bool force_boot);
-	void SetContinuousMode(bool continuous_mode);
 
-	game_boot_result Load(const std::string& title_id = "", bool is_disc_patch = false, usz recursion_count = 0);
+	game_boot_result Load(const std::string& title_id = "", bool add_only = false, bool force_global_config = false, bool is_disc_patch = false);
 	void Run(bool start_playtime);
-	void RunPPU();
-	void FixGuestTime();
-	void FinalizeRunRequest();
-
-	bool IsBootingRestricted() const
-	{
-		return m_restrict_emu_state_change != 0;
-	}
-
-private:
-	struct savestate_stage
-	{
-		bool prepared = false;
-		std::vector<std::pair<shared_ptr<named_thread<spu_thread>>, u32>> paused_spus;
-	};
-public:
-
-	bool Pause(bool freeze_emulation = false, bool show_resume_message = true);
+	bool Pause();
 	void Resume();
-	void GracefulShutdown(bool allow_autoexit = true, bool async_op = false, bool savestate = false, bool continuous_mode = false);
-	void Kill(bool allow_autoexit = true, bool savestate = false, savestate_stage* stage = nullptr);
-	game_boot_result Restart(bool graceful = true);
+	void Stop(bool restart = false);
+	void Restart() { Stop(true); }
 	bool Quit(bool force_quit);
 	static void CleanUp();
 
 	bool IsRunning() const { return m_state == system_state::running; }
-	bool IsPaused() const { system_state state = m_state; return state >= system_state::paused && state <= system_state::frozen; }
-	bool IsPausedOrReady() const { return m_state >= system_state::paused; }
-	bool IsStopped(bool test_fully = false) const { return test_fully ? m_state == system_state::stopped : m_state <= system_state::stopping; }
+	bool IsPaused()  const { return m_state >= system_state::paused; } // ready is also considered paused by this function
+	bool IsStopped() const { return m_state == system_state::stopped; }
 	bool IsReady()   const { return m_state == system_state::ready; }
-	bool IsStarting() const { return m_state == system_state::starting; }
-	auto GetStatus(bool fixup = true) const { system_state state = m_state; return fixup && state == system_state::frozen ? system_state::paused : fixup && state == system_state::stopping ? system_state::stopped : state; }
+	auto GetStatus() const { return m_state.load(); }
 
 	bool HasGui() const { return m_has_gui; }
 	void SetHasGui(bool has_gui) { m_has_gui = has_gui; }
 
 	void SetDefaultRenderer(video_renderer renderer) { m_default_renderer = renderer; }
 	void SetDefaultGraphicsAdapter(std::string adapter) { m_default_graphics_adapter = std::move(adapter); }
+	void SetConfigOverride(std::string path) { m_config_override_path = std::move(path); }
 
 	std::string GetFormattedTitle(double fps) const;
 
 	void ConfigurePPUCache() const;
 
 	std::set<std::string> GetGameDirs() const;
-	u32 AddGamesFromDir(const std::string& path);
-	game_boot_result AddGame(const std::string& path);
-	game_boot_result AddGameToYml(const std::string& path);
-	u32 RemoveGamesFromDir(const std::string& games_dir, const std::vector<std::string>& serials_to_remove_from_yml = {}, bool save_on_disk = true);
-	u32 RemoveGames(const std::vector<std::string>& title_id_list, bool save_on_disk = true);
-	game_boot_result RemoveGameFromYml(const std::string& title_id);
 
 	// Check if path is inside the specified directory
 	bool IsPathInsideDir(std::string_view path, std::string_view dir) const;
-	game_boot_result VerifyPathCasing(std::string_view path, std::string_view dir, bool from_dir) const;
-
-	void EjectDisc();
-	game_boot_result InsertDisc(const std::string& path);
-
-	static game_boot_result GetElfPathFromDir(std::string& elf_path, const std::string& path);
-	static void GetBdvdDir(std::string& bdvd_dir, std::string& sfb_dir, std::string& game_dir, const std::string& elf_dir);
-	friend void init_fxo_for_exec(utils::serial*, bool);
-
-	static bool IsVsh();
-	static bool IsValidSfb(const std::string& path);
-
-	static void SaveSettings(const std::string& settings, const std::string& title_id);
 };
 
 extern Emulator Emu;
diff --git a/rpcs3/Emu/VFS.cpp b/rpcs3/Emu/VFS.cpp
index 8484c57246..575427e37e 100644
--- a/rpcs3/Emu/VFS.cpp
+++ b/rpcs3/Emu/VFS.cpp
@@ -13,17 +13,14 @@
 #endif
 
 #include <thread>
-#include <map>
-
-LOG_CHANNEL(vfs_log, "VFS");
 
 struct vfs_directory
 {
 	// Real path (empty if root or not exists)
-	std::string path;
+	std::string path{};
 
-	// Virtual subdirectories
-	std::map<std::string, std::unique_ptr<vfs_directory>> dirs;
+	// Virtual subdirectories (vector because only vector allows incomplete types)
+	std::vector<std::pair<std::string, vfs_directory>> dirs{};
 };
 
 struct vfs_manager
@@ -34,16 +31,9 @@ struct vfs_manager
 	vfs_directory root{};
 };
 
-bool vfs::mount(std::string_view vpath, std::string_view path, bool is_dir)
+bool vfs::mount(std::string_view vpath, std::string_view path)
 {
-	if (vpath.empty())
-	{
-		// Empty relative path, should set relative path base; unsupported
-		vfs_log.error("Cannot mount empty path to \"%s\"", path);
-		return false;
-	}
-
-	// Initialize vfs_manager if not yet initialized (e.g. g_fxo->reset() was previously invoked)
+	// Workaround
 	g_fxo->need<vfs_manager>();
 
 	auto& table = g_fxo->get<vfs_manager>();
@@ -52,7 +42,11 @@ bool vfs::mount(std::string_view vpath, std::string_view path, bool is_dir)
 
 	std::lock_guard lock(table.mutex);
 
-	const std::string_view vpath_backup = vpath;
+	if (vpath.empty())
+	{
+		// Empty relative path, should set relative path base; unsupported
+		return false;
+	}
 
 	for (std::vector<vfs_directory*> list{&table.root};;)
 	{
@@ -62,25 +56,13 @@ bool vfs::mount(std::string_view vpath, std::string_view path, bool is_dir)
 		if (pos == 0)
 		{
 			// Mounting relative path is not supported
-			vfs_log.error("Cannot mount relative path \"%s\" to \"%s\"", vpath_backup, path);
 			return false;
 		}
 
 		if (pos == umax)
 		{
-			// Mounting completed; fixup for directories due to resolve_path messing with trailing /
-			list.back()->path = Emu.GetCallbacks().resolve_path(path);
-			if (list.back()->path.empty())
-				list.back()->path = std::string(path); // Fallback when resolving failed
-			if (is_dir && !list.back()->path.ends_with('/'))
-				list.back()->path += '/';
-			if (!is_dir && list.back()->path.ends_with('/'))
-				vfs_log.error("File mounted with trailing /.");
-
-			if (path == "/") // Special
-				list.back()->path = "/";
-
-			vfs_log.notice("Mounted path \"%s\" to \"%s\"", vpath_backup, list.back()->path);
+			// Mounting completed
+			list.back()->path = path;
 			return true;
 		}
 
@@ -108,13 +90,13 @@ bool vfs::mount(std::string_view vpath, std::string_view path, bool is_dir)
 		}
 
 		// Find or add
-		vfs_directory* last = list.back();
+		const auto last = list.back();
 
-		for (auto& [path, dir] : last->dirs)
+		for (auto& dir : last->dirs)
 		{
-			if (path == name)
+			if (dir.first == name)
 			{
-				list.push_back(dir.get());
+				list.push_back(&dir.second);
 				break;
 			}
 		}
@@ -122,87 +104,13 @@ bool vfs::mount(std::string_view vpath, std::string_view path, bool is_dir)
 		if (last == list.back())
 		{
 			// Add new entry
-			std::unique_ptr<vfs_directory> new_entry = std::make_unique<vfs_directory>();
-			list.push_back(new_entry.get());
-			last->dirs.emplace(name, std::move(new_entry));
+			list.push_back(&last->dirs.emplace_back(name, vfs_directory{}).second);
 		}
 	}
 }
 
-bool vfs::unmount(std::string_view vpath)
-{
-	if (vpath.empty())
-	{
-		vfs_log.error("Cannot unmount empty path");
-		return false;
-	}
-
-	const std::vector<std::string> entry_list = fmt::split(vpath, {"/"});
-
-	if (entry_list.empty())
-	{
-		vfs_log.error("Cannot unmount path: '%s'", vpath);
-		return false;
-	}
-
-	vfs_log.notice("About to unmount '%s'", vpath);
-
-	if (!g_fxo->is_init<vfs_manager>())
-	{
-		return false;
-	}
-
-	auto& table = g_fxo->get<vfs_manager>();
-
-	std::lock_guard lock(table.mutex);
-
-	// Search entry recursively and remove it (including all children)
-	std::function<void(vfs_directory&, usz)> unmount_children;
-	unmount_children = [&entry_list, &unmount_children](vfs_directory& dir, usz depth) -> void
-	{
-		if (depth >= entry_list.size())
-		{
-			return;
-		}
-
-		// Get the current name based on the depth
-		const std::string& name = ::at32(entry_list, depth);
-
-		// Go through all children of this node
-		for (auto it = dir.dirs.begin(); it != dir.dirs.end();)
-		{
-			// Find the matching node
-			if (it->first == name)
-			{
-				// Remove the matching node if we reached the maximum depth
-				if (depth + 1 == entry_list.size())
-				{
-					vfs_log.notice("Unmounting '%s' = '%s'", it->first, it->second->path);
-					it = dir.dirs.erase(it);
-					continue;
-				}
-
-				// Otherwise continue searching in the next level of depth
-				unmount_children(*it->second, depth + 1);
-			}
-
-			++it;
-		}
-	};
-	unmount_children(table.root, 0);
-
-	return true;
-}
-
 std::string vfs::get(std::string_view vpath, std::vector<std::string>* out_dir, std::string* out_path)
 {
-	// Just to make the code more robust.
-	// It should never happen because we take care to initialize Emu (and so also vfs_manager) with Emu.Init() before this function is invoked
-	if (!g_fxo->is_init<vfs_manager>())
-	{
-		fmt::throw_exception("vfs_manager not initialized");
-	}
-
 	auto& table = g_fxo->get<vfs_manager>();
 
 	reader_lock lock(table.mutex);
@@ -257,7 +165,7 @@ std::string vfs::get(std::string_view vpath, std::vector<std::string>* out_dir,
 					{
 						for (auto& pair : dir->dirs)
 						{
-							if (!pair.second->path.empty())
+							if (!pair.second.path.empty())
 							{
 								out_dir->emplace_back(pair.first);
 							}
@@ -322,13 +230,13 @@ std::string vfs::get(std::string_view vpath, std::vector<std::string>* out_dir,
 			continue;
 		}
 
-		for (auto& [path, dir] : last->dirs)
+		for (auto& dir : last->dirs)
 		{
-			if (path == name)
+			if (dir.first == name)
 			{
-				list.back() = dir.get();
+				list.back() = &dir.second;
 
-				if (dir->path == "/"sv)
+				if (dir.second.path == "/"sv)
 				{
 					if (vpath.size() <= 1)
 					{
@@ -338,8 +246,7 @@ std::string vfs::get(std::string_view vpath, std::vector<std::string>* out_dir,
 					// Handle /host_root (not escaped, not processed)
 					if (out_path)
 					{
-						out_path->clear();
-						*out_path += '/';
+						*out_path =  "/";
 						*out_path += fmt::merge(name_list, "/");
 						*out_path += vpath;
 					}
@@ -361,8 +268,7 @@ std::string vfs::get(std::string_view vpath, std::vector<std::string>* out_dir,
 	// Merge path fragments
 	if (out_path)
 	{
-		out_path->clear();
-		*out_path += '/';
+		*out_path =  "/";
 		*out_path += fmt::merge(name_list, "/");
 	}
 
@@ -375,129 +281,11 @@ std::string vfs::get(std::string_view vpath, std::vector<std::string>* out_dir,
 	return std::string{result_base} + fmt::merge(escaped, "/");
 }
 
+#if __cpp_char8_t >= 201811
 using char2 = char8_t;
-
-std::string vfs::retrieve(std::string_view path, const vfs_directory* node, std::vector<std::string_view>* mount_path)
-{
-	// Just to make the code more robust.
-	// It should never happen because we take care to initialize Emu (and so also vfs_manager) with Emu.Init() before this function is invoked
-	if (!g_fxo->is_init<vfs_manager>())
-	{
-		fmt::throw_exception("vfs_manager not initialized");
-	}
-
-	auto& table = g_fxo->get<vfs_manager>();
-
-	if (!node)
-	{
-		if (path.starts_with(".") || path.empty())
-		{
-			return {};
-		}
-
-		reader_lock lock(table.mutex);
-
-		std::vector<std::string_view> mount_path_empty;
-
-		const std::string rpath = Emu.GetCallbacks().resolve_path(path);
-
-		if (!rpath.empty())
-		{
-			if (std::string res = vfs::retrieve(rpath, &table.root, &mount_path_empty); !res.empty())
-			{
-				return res;
-			}
-		}
-
-		mount_path_empty.clear();
-
-		return vfs::retrieve(path, &table.root, &mount_path_empty);
-	}
-
-	mount_path->emplace_back();
-
-	// Try to extract host root mount point name (if exists)
-	std::string_view host_root_name;
-
-	std::string result;
-	std::string result_dir;
-
-	for (const auto& [name, dir] : node->dirs)
-	{
-		mount_path->back() = name;
-
-		if (std::string res = vfs::retrieve(path, dir.get(), mount_path); !res.empty())
-		{
-			// Avoid app_home
-			// Prefer dev_bdvd over dev_hdd0
-			if (result.empty() || (name == "app_home") < (result_dir == "app_home") ||
-				(name == "dev_bdvd") > (result_dir == "dev_bdvd"))
-			{
-				result = std::move(res);
-				result_dir = name;
-			}
-		}
-
-		if (dir->path == "/"sv)
-		{
-			host_root_name = name;
-		}
-	}
-
-	if (!result.empty())
-	{
-		return result;
-	}
-
-	mount_path->pop_back();
-
-	if (node->path.size() > 1 && path.starts_with(node->path))
-	{
-		auto unescape_path = [](std::string_view path)
-		{
-			// Unescape from host FS
-			std::vector<std::string> escaped = fmt::split(path, {std::string_view{&fs::delim[0], 1}, std::string_view{&fs::delim[1], 1}});
-			std::vector<std::string> result;
-			for (auto& sv : escaped)
-				result.emplace_back(vfs::unescape(sv));
-
-			return fmt::merge(result, "/");
-		};
-
-		std::string result{"/"};
-
-		for (const auto& name : *mount_path)
-		{
-			result += name;
-			result += '/';
-		}
-
-		result += unescape_path(path.substr(node->path.size()));
-		return result;
-	}
-
-	if (!host_root_name.empty())
-	{
-		// If failed to find mount point for path and /host_root is mounted
-		// Prepend "/host_root" to path and return the constructed string
-		result.clear();
-		result += '/';
-
-		for (const auto& name : *mount_path)
-		{
-			result += name;
-			result += '/';
-		}
-
-		result += host_root_name;
-		result += '/';
-
-		result += path;
-		return result;
-	}
-
-	return result;
-}
+#else
+using char2 = char;
+#endif
 
 std::string vfs::escape(std::string_view name, bool escape_slash)
 {
@@ -939,62 +727,44 @@ std::string vfs::unescape(std::string_view name)
 	return result;
 }
 
-std::string vfs::host::hash_path(const std::string& path, const std::string& dev_root, std::string_view prefix)
+std::string vfs::host::hash_path(const std::string& path, const std::string& dev_root)
 {
-	return fmt::format(u8"%s/＄%s%s%s", dev_root, fmt::base57(std::hash<std::string>()(path)), prefix, fmt::base57(utils::get_unique_tsc()));
+	return fmt::format(u8"%s/＄%s%s", dev_root, fmt::base57(std::hash<std::string>()(path)), fmt::base57(utils::get_unique_tsc()));
 }
 
-bool vfs::host::rename(const std::string& from, const std::string& to, const lv2_fs_mount_point* mp, bool overwrite, bool lock)
+bool vfs::host::rename(const std::string& from, const std::string& to, const lv2_fs_mount_point* mp, bool overwrite)
 {
 	// Lock mount point, close file descriptors, retry
 	const auto from0 = std::string_view(from).substr(0, from.find_last_not_of(fs::delim) + 1);
-
-	std::vector<std::pair<shared_ptr<lv2_file>, std::string>> escaped_real;
-
-	std::unique_lock mp_lock(mp->mutex, std::defer_lock);
-
-	if (lock)
-	{
-		mp_lock.lock();
-	}
-
-	if (fs::rename(from, to, overwrite))
-	{
-		return true;
-	}
-
-	if (fs::g_tls_error != fs::error::acces)
-	{
-		return false;
-	}
-
 	const auto escaped_from = Emu.GetCallbacks().resolve_path(from);
 
+	std::lock_guard lock(mp->mutex);
+
 	auto check_path = [&](std::string_view path)
 	{
 		return path.starts_with(from) && (path.size() == from.size() || path[from.size()] == fs::delim[0] || path[from.size()] == fs::delim[1]);
 	};
 
-	idm::select<lv2_fs_object, lv2_file>([&](u32 id, lv2_file& file)
+	idm::select<lv2_fs_object, lv2_file>([&](u32 /*id*/, lv2_file& file)
 	{
-		if (file.mp != mp)
+		if (check_path(Emu.GetCallbacks().resolve_path(file.real_path)))
 		{
-			return;
-		}
+			ensure(file.mp == mp);
 
-		std::string escaped = Emu.GetCallbacks().resolve_path(file.real_path);
-
-		if (check_path(escaped))
-		{
 			if (!file.file)
 			{
+				file.restore_data.seek_pos = -1;
 				return;
 			}
 
 			file.restore_data.seek_pos = file.file.pos();
 
+			if (!(file.mp->flags & (lv2_mp_flag::read_only + lv2_mp_flag::cache)) && file.flags & CELL_FS_O_ACCMODE)
+			{
+				file.file.sync(); // For cellGameContentPermit atomicity
+			}
+
 			file.file.close(); // Actually close it!
-			escaped_real.emplace_back(ensure(idm::get_unlocked<lv2_fs_object, lv2_file>(id)), std::move(escaped));
 		}
 	});
 
@@ -1017,14 +787,21 @@ bool vfs::host::rename(const std::string& from, const std::string& to, const lv2
 
 	const auto fs_error = fs::g_tls_error;
 
-	for (const auto& [file_ptr, real_path] : escaped_real)
+	idm::select<lv2_fs_object, lv2_file>([&](u32 /*id*/, lv2_file& file)
 	{
-		lv2_file& file = *file_ptr;
+		const auto escaped_real = Emu.GetCallbacks().resolve_path(file.real_path);
+
+		if (check_path(escaped_real))
 		{
+			if (file.restore_data.seek_pos == umax)
+			{
+				return;
+			}
+
 			// Update internal path
 			if (res)
 			{
-				file.real_path = to + (real_path != escaped_from ? '/' + file.real_path.substr(from0.size()) : ""s);
+				file.real_path = to + (escaped_real != escaped_from ? '/' + file.real_path.substr(from0.size()) : ""s);
 			}
 
 			// Reopen with ignored TRUNC, APPEND, CREATE and EXCL flags
@@ -1033,7 +810,7 @@ bool vfs::host::rename(const std::string& from, const std::string& to, const lv2
 			ensure(file.file.operator bool());
 			file.file.seek(file.restore_data.seek_pos);
 		}
-	}
+	});
 
 	fs::g_tls_error = fs_error;
 	return res;
@@ -1049,21 +826,11 @@ bool vfs::host::unlink(const std::string& path, [[maybe_unused]] const std::stri
 	else
 	{
 		// Rename to special dummy name which will be ignored by VFS (but opened file handles can still read or write it)
-		std::string dummy = hash_path(path, dev_root, "file");
+		const std::string dummy = hash_path(path, dev_root);
 
-		while (true)
+		if (!fs::rename(path, dummy, true))
 		{
-			if (fs::rename(path, dummy, false))
-			{
-				break;
-			}
-
-			if (fs::g_tls_error != fs::error::exist)
-			{
-				return false;
-			}
-
-			dummy = hash_path(path, dev_root, "file");
+			return false;
 		}
 
 		if (fs::file f{dummy, fs::read + fs::write})
@@ -1083,36 +850,20 @@ bool vfs::host::unlink(const std::string& path, [[maybe_unused]] const std::stri
 #endif
 }
 
-bool vfs::host::remove_all(const std::string& path, [[maybe_unused]] const std::string& dev_root, [[maybe_unused]] const lv2_fs_mount_point* mp, [[maybe_unused]] bool remove_root, [[maybe_unused]] bool lock, [[maybe_unused]] bool force_atomic)
+bool vfs::host::remove_all(const std::string& path, [[maybe_unused]] const std::string& dev_root, [[maybe_unused]] const lv2_fs_mount_point* mp, bool remove_root)
 {
-#ifndef _WIN32
-	if (!force_atomic)
-	{
-		return fs::remove_all(path, remove_root);
-	}
-#endif
-
+#ifdef _WIN32
 	if (remove_root)
 	{
 		// Rename to special dummy folder which will be ignored by VFS (but opened file handles can still read or write it)
-		std::string dummy = hash_path(path, dev_root, "dir");
+		const std::string dummy = hash_path(path, dev_root);
 
-		while (true)
+		if (!vfs::host::rename(path, dummy, mp, false))
 		{
-			if (vfs::host::rename(path, dummy, mp, false, lock))
-			{
-				break;
-			}
-
-			if (fs::g_tls_error != fs::error::exist)
-			{
-				return false;
-			}
-
-			dummy = hash_path(path, dev_root, "dir");
+			return false;
 		}
 
-		if (!vfs::host::remove_all(dummy, dev_root, mp, false, lock))
+		if (!vfs::host::remove_all(dummy, dev_root, mp, false))
 		{
 			return false;
 		}
@@ -1147,7 +898,7 @@ bool vfs::host::remove_all(const std::string& path, [[maybe_unused]] const std::
 			}
 			else
 			{
-				if (!vfs::host::remove_all(path + '/' + entry.name, dev_root, mp, true, lock))
+				if (!vfs::host::remove_all(path + '/' + entry.name, dev_root, mp))
 				{
 					return false;
 				}
@@ -1156,4 +907,7 @@ bool vfs::host::remove_all(const std::string& path, [[maybe_unused]] const std::
 	}
 
 	return true;
+#else
+	return fs::remove_all(path, remove_root);
+#endif
 }
diff --git a/rpcs3/Emu/VFS.h b/rpcs3/Emu/VFS.h
index 2872d9a5e2..809472ab84 100644
--- a/rpcs3/Emu/VFS.h
+++ b/rpcs3/Emu/VFS.h
@@ -5,22 +5,15 @@
 #include <string_view>
 
 struct lv2_fs_mount_point;
-struct vfs_directory;
 
 namespace vfs
 {
 	// Mount VFS device
-	bool mount(std::string_view vpath, std::string_view path, bool is_dir = true);
-
-	// Unmount VFS device
-	bool unmount(std::string_view vpath);
+	bool mount(std::string_view vpath, std::string_view path);
 
 	// Convert VFS path to fs path, optionally listing directories mounted in it
 	std::string get(std::string_view vpath, std::vector<std::string>* out_dir = nullptr, std::string* out_path = nullptr);
 
-	// Convert fs path to VFS path
-	std::string retrieve(std::string_view path, const vfs_directory* node = nullptr, std::vector<std::string_view>* mount_path = nullptr);
-
 	// Escape VFS name by replacing non-portable characters with surrogates
 	std::string escape(std::string_view name, bool escape_slash = false);
 
@@ -31,15 +24,15 @@ namespace vfs
 	namespace host
 	{
 		// For internal use (don't use)
-		std::string hash_path(const std::string& path, const std::string& dev_root, std::string_view prefix = {});
+		std::string hash_path(const std::string& path, const std::string& dev_root);
 
 		// Call fs::rename with retry on access error
-		bool rename(const std::string& from, const std::string& to, const lv2_fs_mount_point* mp, bool overwrite, bool lock = true);
+		bool rename(const std::string& from, const std::string& to, const lv2_fs_mount_point* mp, bool overwrite);
 
 		// Delete file without deleting its contents, emulated with MoveFileEx on Windows
 		bool unlink(const std::string& path, const std::string& dev_root);
 
 		// Delete folder contents using rename, done atomically if remove_root is true
-		bool remove_all(const std::string& path, const std::string& dev_root, const lv2_fs_mount_point* mp, bool remove_root = true, bool lock = true, bool force_atomic = false);
+		bool remove_all(const std::string& path, const std::string& dev_root, const lv2_fs_mount_point* mp, bool remove_root = true);
 	}
 }
diff --git a/rpcs3/Emu/cache_utils.cpp b/rpcs3/Emu/cache_utils.cpp
index 5c191ee7ee..55671ebdf9 100644
--- a/rpcs3/Emu/cache_utils.cpp
+++ b/rpcs3/Emu/cache_utils.cpp
@@ -3,7 +3,6 @@
 #include "system_utils.hpp"
 #include "system_config.h"
 #include "IdManager.h"
-#include "Emu/Cell/lv2/sys_sync.h"
 #include "Emu/Cell/PPUAnalyser.h"
 #include "Emu/Cell/PPUThread.h"
 
@@ -13,15 +12,15 @@ namespace rpcs3::cache
 {
 	std::string get_ppu_cache()
 	{
-		const auto _main = g_fxo->try_get<main_ppu_module<lv2_obj>>();
-
-		if (!_main || _main->cache.empty())
+		auto& _main = g_fxo->get<ppu_module>();
+	
+		if (!g_fxo->is_init<ppu_module>() || _main.cache.empty())
 		{
 			ppu_log.error("PPU Cache location not initialized.");
 			return {};
 		}
-
-		return _main->cache;
+	
+		return _main.cache;
 	}
 
 	void limit_cache_size()
@@ -76,7 +75,10 @@ namespace rpcs3::cache
 		cache_dir.close();
 
 		// sort oldest first
-		std::sort(file_list.begin(), file_list.end(), FN(x.mtime < y.mtime));
+		std::sort(file_list.begin(), file_list.end(), [](auto left, auto right)
+		{
+			return left.mtime < right.mtime;
+		});
 
 		// keep removing until cache is empty or enough bytes have been cleared
 		// cache is cleared down to 80% of limit to increase interval between clears
@@ -94,7 +96,7 @@ namespace rpcs3::cache
 				break;
 			}
 
-			if (is_dir ? !fs::remove_all(name, true, true) : !fs::remove_file(name))
+			if (is_dir ? !fs::remove_all(name, true) : !fs::remove_file(name))
 			{
 				sys_log.error("Could not remove cache directory '%s' item '%s' (%s)", cache_location, item.name, fs::g_tls_error);
 				break;
diff --git a/rpcs3/Emu/config_mode.h b/rpcs3/Emu/config_mode.h
deleted file mode 100644
index 0ca006e0c8..0000000000
--- a/rpcs3/Emu/config_mode.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-enum class cfg_mode
-{
-	custom,           // Prefer regular custom config. Fall back to global config.
-	custom_selection, // Use user-selected custom config. Fall back to global config.
-	global,           // Use global config.
-	config_override,  // Use config override. This does not use the global VFS settings! Fall back to global config.
-	continuous,       // Use same config as on last boot. Fall back to global config.
-	default_config    // Use the default values of the config entries.
-};
diff --git a/rpcs3/Emu/games_config.cpp b/rpcs3/Emu/games_config.cpp
deleted file mode 100644
index cfa43f6e15..0000000000
--- a/rpcs3/Emu/games_config.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-#include "stdafx.h"
-#include "games_config.h"
-#include "util/logs.hpp"
-#include "util/yaml.hpp"
-#include "Utilities/File.h"
-
-LOG_CHANNEL(cfg_log, "CFG");
-
-games_config::games_config()
-{
-	load();
-}
-
-games_config::~games_config()
-{
-	if (m_dirty)
-	{
-		save();
-	}
-}
-
-const std::map<std::string, std::string> games_config::get_games() const
-{
-	std::lock_guard lock(m_mutex);
-	return m_games;
-}
-
-std::string games_config::get_path(const std::string& title_id) const
-{
-	if (title_id.empty())
-	{
-		return {};
-	}
-
-	std::lock_guard lock(m_mutex);
-
-	if (const auto it = m_games.find(title_id); it != m_games.cend())
-	{
-		return it->second;
-	}
-
-	return {};
-}
-
-games_config::result games_config::add_game(const std::string& key, const std::string& path)
-{
-	std::lock_guard lock(m_mutex);
-
-	// Access or create node if does not exist
-	if (auto it = m_games.find(key); it != m_games.end())
-	{
-		if (it->second == path)
-		{
-			// Nothing to do
-			return result::exists;
-		}
-
-		it->second = path;
-	}
-	else
-	{
-		m_games.emplace(key, path);
-	}
-
-	m_dirty = true;
-
-	if (m_save_on_dirty && !save_nl())
-	{
-		return result::failure;
-	}
-
-	return result::success;
-}
-
-games_config::result games_config::add_external_hdd_game(const std::string& key, std::string& path)
-{
-	// Don't use the C00 subdirectory in our game list
-	if (path.ends_with("/C00") || path.ends_with("\\C00"))
-	{
-		path = path.substr(0, path.size() - 4);
-	}
-
-	const result res = add_game(key, path);
-
-	switch (res)
-	{
-	case result::failure:
-		cfg_log.error("Failed to save HG game location of title '%s' (error=%s)", key, fs::g_tls_error);
-		break;
-	case result::success:
-		cfg_log.notice("Registered HG game directory for title '%s': %s", key, path);
-		break;
-	case result::exists:
-		break;
-	}
-
-	return res;
-}
-
-games_config::result games_config::remove_game(const std::string& key)
-{
-	std::lock_guard lock(m_mutex);
-
-	// Remove node
-	if (m_games.erase(key) == 0) // If node not found
-	{
-		// Nothing to do
-		return result::success;
-	}
-
-	m_dirty = true;
-
-	if (m_save_on_dirty && !save_nl())
-	{
-		return result::failure;
-	}
-
-	return result::success;
-}
-
-bool games_config::save_nl()
-{
-	YAML::Emitter out;
-	out << m_games;
-
-	fs::pending_file temp(fs::get_config_dir(true) + "games.yml");
-
-	if (temp.file && temp.file.write(out.c_str(), out.size()) >= out.size() && temp.commit())
-	{
-		m_dirty = false;
-		return true;
-	}
-
-	cfg_log.error("Failed to save games.yml: %s", fs::g_tls_error);
-	return false;
-}
-
-bool games_config::save()
-{
-	std::lock_guard lock(m_mutex);
-	return save_nl();
-}
-
-void games_config::load()
-{
-	std::lock_guard lock(m_mutex);
-
-	m_games.clear();
-
-	const std::string path = fs::get_config_dir(true) + "games.yml";
-
-	// Move file from deprecated location to new location
-#ifdef _WIN32
-	const std::string old_path = fs::get_config_dir(false) + "games.yml";
-
-	if (fs::is_file(old_path))
-	{
-		cfg_log.notice("Found deprecated games.yml file: '%s'", old_path);
-
-		if (!fs::rename(old_path, path, false))
-		{
-			(fs::g_tls_error == fs::error::exist ? cfg_log.warning : cfg_log.error)("Failed to move '%s' to '%s' (error='%s')", old_path, path, fs::g_tls_error);
-		}
-	}
-#endif
-
-	if (fs::file f{path, fs::read + fs::create})
-	{
-		auto [result, error] = yaml_load(f.to_string());
-
-		if (!error.empty())
-		{
-			cfg_log.error("Failed to load games.yml: %s", error);
-		}
-
-		if (!result.IsMap())
-		{
-			if (!result.IsNull())
-			{
-				cfg_log.error("Failed to load games.yml: type %d not a map", result.Type());
-			}
-			return;
-		}
-
-		for (const auto& entry : result)
-		{
-			if (!entry.first.Scalar().empty() && entry.second.IsScalar() && !entry.second.Scalar().empty())
-			{
-				m_games.emplace(entry.first.Scalar(), entry.second.Scalar());
-			}
-		}
-	}
-}
diff --git a/rpcs3/Emu/games_config.h b/rpcs3/Emu/games_config.h
deleted file mode 100644
index c0e8bfb870..0000000000
--- a/rpcs3/Emu/games_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include "Utilities/mutex.h"
-#include <map>
-
-class games_config
-{
-public:
-	games_config();
-	virtual ~games_config();
-
-	void set_save_on_dirty(bool enabled) { m_save_on_dirty = enabled; }
-
-	const std::map<std::string, std::string> get_games() const;
-	bool is_dirty() const { return m_dirty; }
-
-	std::string get_path(const std::string& title_id) const;
-
-	enum class result
-	{
-		failure,
-		success,
-		exists
-	};
-	result add_game(const std::string& key, const std::string& path);
-	result add_external_hdd_game(const std::string& key, std::string& path);
-	result remove_game(const std::string& key);
-	bool save();
-
-private:
-	bool save_nl();
-	void load();
-
-	std::map<std::string, std::string> m_games;
-	mutable shared_mutex m_mutex;
-
-	bool m_dirty = false;
-	bool m_save_on_dirty = true;
-};
diff --git a/rpcs3/Emu/localized_string_id.h b/rpcs3/Emu/localized_string_id.h
index 408403fd1f..ac324a1b39 100644
--- a/rpcs3/Emu/localized_string_id.h
+++ b/rpcs3/Emu/localized_string_id.h
@@ -9,7 +9,6 @@ enum class localized_string_id
 	RSX_OVERLAYS_TROPHY_GOLD,
 	RSX_OVERLAYS_TROPHY_PLATINUM,
 	RSX_OVERLAYS_COMPILING_SHADERS,
-	RSX_OVERLAYS_COMPILING_PPU_MODULES,
 	RSX_OVERLAYS_MSG_DIALOG_YES,
 	RSX_OVERLAYS_MSG_DIALOG_NO,
 	RSX_OVERLAYS_MSG_DIALOG_CANCEL,
@@ -25,18 +24,8 @@ enum class localized_string_id
 	RSX_OVERLAYS_OSK_DIALOG_SHIFT,
 	RSX_OVERLAYS_OSK_DIALOG_ENTER_TEXT,
 	RSX_OVERLAYS_OSK_DIALOG_ENTER_PASSWORD,
-	RSX_OVERLAYS_MEDIA_DIALOG_TITLE,
-	RSX_OVERLAYS_MEDIA_DIALOG_TITLE_PHOTO_IMPORT,
-	RSX_OVERLAYS_MEDIA_DIALOG_EMPTY,
 	RSX_OVERLAYS_LIST_SELECT,
 	RSX_OVERLAYS_LIST_CANCEL,
-	RSX_OVERLAYS_LIST_DENY,
-	RSX_OVERLAYS_PRESSURE_INTENSITY_TOGGLED_OFF,
-	RSX_OVERLAYS_PRESSURE_INTENSITY_TOGGLED_ON,
-	RSX_OVERLAYS_ANALOG_LIMITER_TOGGLED_OFF,
-	RSX_OVERLAYS_ANALOG_LIMITER_TOGGLED_ON,
-	RSX_OVERLAYS_MOUSE_AND_KEYBOARD_EMULATED,
-	RSX_OVERLAYS_MOUSE_AND_KEYBOARD_PAD,
 
 	CELL_GAME_ERROR_BROKEN_GAMEDATA,
 	CELL_GAME_ERROR_BROKEN_HDDGAME,
@@ -122,7 +111,6 @@ enum class localized_string_id
 	CELL_MSG_DIALOG_ERROR_8001003E,
 
 	CELL_OSK_DIALOG_TITLE,
-	CELL_OSK_DIALOG_BUSY,
 
 	CELL_SAVEDATA_CB_BROKEN,
 	CELL_SAVEDATA_CB_FAILURE,
@@ -138,182 +126,4 @@ enum class localized_string_id
 	CELL_SAVEDATA_SAVE,
 	CELL_SAVEDATA_LOAD,
 	CELL_SAVEDATA_OVERWRITE,
-	CELL_SAVEDATA_AUTOSAVE,
-	CELL_SAVEDATA_AUTOLOAD,
-
-	CELL_CROSS_CONTROLLER_MSG,
-	CELL_CROSS_CONTROLLER_FW_MSG,
-
-	CELL_NP_RECVMESSAGE_DIALOG_TITLE,
-	CELL_NP_RECVMESSAGE_DIALOG_TITLE_INVITE,
-	CELL_NP_RECVMESSAGE_DIALOG_TITLE_ADD_FRIEND,
-	CELL_NP_RECVMESSAGE_DIALOG_FROM,
-	CELL_NP_RECVMESSAGE_DIALOG_SUBJECT,
-
-	CELL_NP_SENDMESSAGE_DIALOG_TITLE,
-	CELL_NP_SENDMESSAGE_DIALOG_TITLE_INVITE,
-	CELL_NP_SENDMESSAGE_DIALOG_TITLE_ADD_FRIEND,
-	CELL_NP_SENDMESSAGE_DIALOG_CONFIRMATION,
-	CELL_NP_SENDMESSAGE_DIALOG_CONFIRMATION_INVITE,
-	CELL_NP_SENDMESSAGE_DIALOG_CONFIRMATION_ADD_FRIEND,
-
-	RECORDING_ABORTED,
-
-	RPCN_NO_ERROR,
-	RPCN_ERROR_INVALID_INPUT,
-	RPCN_ERROR_WOLFSSL,
-	RPCN_ERROR_RESOLVE,
-	RPCN_ERROR_BINDING,
-	RPCN_ERROR_CONNECT,
-	RPCN_ERROR_LOGIN_ERROR,
-	RPCN_ERROR_ALREADY_LOGGED,
-	RPCN_ERROR_INVALID_LOGIN,
-	RPCN_ERROR_INVALID_PASSWORD,
-	RPCN_ERROR_INVALID_TOKEN,
-	RPCN_ERROR_INVALID_PROTOCOL_VERSION,
-	RPCN_ERROR_UNKNOWN,
-	RPCN_SUCCESS_LOGGED_ON,
-	RPCN_FRIEND_REQUEST_RECEIVED,
-	RPCN_FRIEND_ADDED,
-	RPCN_FRIEND_LOST,
-	RPCN_FRIEND_LOGGED_IN,
-	RPCN_FRIEND_LOGGED_OUT,
-
-	HOME_MENU_TITLE,
-	HOME_MENU_EXIT_GAME,
-	HOME_MENU_RESTART,
-	HOME_MENU_RESUME,
-	HOME_MENU_FRIENDS,
-	HOME_MENU_FRIENDS_REQUESTS,
-	HOME_MENU_FRIENDS_BLOCKED,
-	HOME_MENU_FRIENDS_STATUS_ONLINE,
-	HOME_MENU_FRIENDS_STATUS_OFFLINE,
-	HOME_MENU_FRIENDS_STATUS_BLOCKED,
-	HOME_MENU_FRIENDS_REQUEST_SENT,
-	HOME_MENU_FRIENDS_REQUEST_RECEIVED,
-	HOME_MENU_FRIENDS_BLOCK_USER_MSG,
-	HOME_MENU_FRIENDS_UNBLOCK_USER_MSG,
-	HOME_MENU_FRIENDS_REMOVE_USER_MSG,
-	HOME_MENU_FRIENDS_ACCEPT_REQUEST_MSG,
-	HOME_MENU_FRIENDS_CANCEL_REQUEST_MSG,
-	HOME_MENU_FRIENDS_REJECT_REQUEST_MSG,
-	HOME_MENU_FRIENDS_REJECT_REQUEST,
-	HOME_MENU_FRIENDS_NEXT_LIST,
-	HOME_MENU_SETTINGS,
-	HOME_MENU_SETTINGS_SAVE,
-	HOME_MENU_SETTINGS_SAVE_BUTTON,
-	HOME_MENU_SETTINGS_DISCARD,
-	HOME_MENU_SETTINGS_DISCARD_BUTTON,
-	HOME_MENU_SETTINGS_AUDIO,
-	HOME_MENU_SETTINGS_AUDIO_MASTER_VOLUME,
-	HOME_MENU_SETTINGS_AUDIO_BACKEND,
-	HOME_MENU_SETTINGS_AUDIO_BUFFERING,
-	HOME_MENU_SETTINGS_AUDIO_BUFFER_DURATION,
-	HOME_MENU_SETTINGS_AUDIO_TIME_STRETCHING,
-	HOME_MENU_SETTINGS_AUDIO_TIME_STRETCHING_THRESHOLD,
-	HOME_MENU_SETTINGS_VIDEO,
-	HOME_MENU_SETTINGS_VIDEO_FRAME_LIMIT,
-	HOME_MENU_SETTINGS_VIDEO_ANISOTROPIC_OVERRIDE,
-	HOME_MENU_SETTINGS_VIDEO_OUTPUT_SCALING,
-	HOME_MENU_SETTINGS_VIDEO_RCAS_SHARPENING,
-	HOME_MENU_SETTINGS_VIDEO_STRETCH_TO_DISPLAY,
-	HOME_MENU_SETTINGS_INPUT,
-	HOME_MENU_SETTINGS_INPUT_BACKGROUND_INPUT,
-	HOME_MENU_SETTINGS_INPUT_KEEP_PADS_CONNECTED,
-	HOME_MENU_SETTINGS_INPUT_SHOW_PS_MOVE_CURSOR,
-	HOME_MENU_SETTINGS_INPUT_CAMERA_FLIP,
-	HOME_MENU_SETTINGS_INPUT_PAD_MODE,
-	HOME_MENU_SETTINGS_INPUT_PAD_SLEEP,
-	HOME_MENU_SETTINGS_INPUT_FAKE_MOVE_ROTATION_CONE_H,
-	HOME_MENU_SETTINGS_INPUT_FAKE_MOVE_ROTATION_CONE_V,
-	HOME_MENU_SETTINGS_ADVANCED,
-	HOME_MENU_SETTINGS_ADVANCED_PREFERRED_SPU_THREADS,
-	HOME_MENU_SETTINGS_ADVANCED_MAX_CPU_PREEMPTIONS,
-	HOME_MENU_SETTINGS_ADVANCED_ACCURATE_RSX_RESERVATION_ACCESS,
-	HOME_MENU_SETTINGS_ADVANCED_SLEEP_TIMERS_ACCURACY,
-	HOME_MENU_SETTINGS_ADVANCED_MAX_SPURS_THREADS,
-	HOME_MENU_SETTINGS_ADVANCED_DRIVER_WAKE_UP_DELAY,
-	HOME_MENU_SETTINGS_ADVANCED_VBLANK_FREQUENCY,
-	HOME_MENU_SETTINGS_ADVANCED_VBLANK_NTSC,
-	HOME_MENU_SETTINGS_OVERLAYS,
-	HOME_MENU_SETTINGS_OVERLAYS_SHOW_TROPHY_POPUPS,
-	HOME_MENU_SETTINGS_OVERLAYS_SHOW_RPCN_POPUPS,
-	HOME_MENU_SETTINGS_OVERLAYS_SHOW_SHADER_COMPILATION_HINT,
-	HOME_MENU_SETTINGS_OVERLAYS_SHOW_PPU_COMPILATION_HINT,
-	HOME_MENU_SETTINGS_OVERLAYS_SHOW_AUTO_SAVE_LOAD_HINT,
-	HOME_MENU_SETTINGS_OVERLAYS_SHOW_PRESSURE_INTENSITY_TOGGLE_HINT,
-	HOME_MENU_SETTINGS_OVERLAYS_SHOW_ANALOG_LIMITER_TOGGLE_HINT,
-	HOME_MENU_SETTINGS_OVERLAYS_SHOW_MOUSE_AND_KB_TOGGLE_HINT,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE_FRAMERATE_GRAPH,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE_FRAMETIME_GRAPH,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_DETAIL_LEVEL,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMERATE_DETAIL_LEVEL,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMETIME_DETAIL_LEVEL,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMERATE_DATAPOINT_COUNT,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMETIME_DATAPOINT_COUNT,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_UPDATE_INTERVAL,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_POSITION,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_CENTER_X,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_CENTER_Y,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_MARGIN_X,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_MARGIN_Y,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FONT_SIZE,
-	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_OPACITY,
-	HOME_MENU_SETTINGS_DEBUG,
-	HOME_MENU_SETTINGS_DEBUG_OVERLAY,
-	HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY,
-	HOME_MENU_SETTINGS_DEBUG_DISABLE_VIDEO_OUTPUT,
-	HOME_MENU_SETTINGS_DEBUG_TEXTURE_LOD_BIAS,
-	HOME_MENU_SCREENSHOT,
-	HOME_MENU_SAVESTATE,
-	HOME_MENU_SAVESTATE_SAVE,
-	HOME_MENU_SAVESTATE_AND_EXIT,
-	HOME_MENU_RELOAD_SAVESTATE,
-	HOME_MENU_RECORDING,
-	HOME_MENU_TROPHIES,
-	HOME_MENU_TROPHY_LIST_TITLE,
-	HOME_MENU_TROPHY_LOCKED_TITLE,
-	HOME_MENU_TROPHY_HIDDEN_TITLE,
-	HOME_MENU_TROPHY_HIDDEN_DESCRIPTION,
-	HOME_MENU_TROPHY_SHOW_HIDDEN_TROPHIES,
-	HOME_MENU_TROPHY_HIDE_HIDDEN_TROPHIES,
-	HOME_MENU_TROPHY_PLATINUM_RELEVANT,
-	HOME_MENU_TROPHY_GRADE_BRONZE,
-	HOME_MENU_TROPHY_GRADE_SILVER,
-	HOME_MENU_TROPHY_GRADE_GOLD,
-	HOME_MENU_TROPHY_GRADE_PLATINUM,
-
-	AUDIO_MUTED,
-	AUDIO_UNMUTED,
-	AUDIO_CHANGED,
-
-	PROGRESS_DIALOG_PROGRESS,
-	PROGRESS_DIALOG_PROGRESS_ANALYZING,
-	PROGRESS_DIALOG_REMAINING,
-	PROGRESS_DIALOG_DONE,
-	PROGRESS_DIALOG_FILE,
-	PROGRESS_DIALOG_MODULE,
-	PROGRESS_DIALOG_OF,
-	PROGRESS_DIALOG_PLEASE_WAIT,
-	PROGRESS_DIALOG_STOPPING_PLEASE_WAIT,
-	PROGRESS_DIALOG_SAVESTATE_PLEASE_WAIT,
-	PROGRESS_DIALOG_SCANNING_PPU_EXECUTABLE,
-	PROGRESS_DIALOG_ANALYZING_PPU_EXECUTABLE,
-	PROGRESS_DIALOG_SCANNING_PPU_MODULES,
-	PROGRESS_DIALOG_LOADING_PPU_MODULES,
-	PROGRESS_DIALOG_COMPILING_PPU_MODULES,
-	PROGRESS_DIALOG_LINKING_PPU_MODULES,
-	PROGRESS_DIALOG_APPLYING_PPU_CODE,
-	PROGRESS_DIALOG_BUILDING_SPU_CACHE,
-
-	EMULATION_PAUSED_RESUME_WITH_START,
-	EMULATION_RESUMING,
-	EMULATION_FROZEN,
-
-	SAVESTATE_FAILED_DUE_TO_VDEC,
-	SAVESTATE_FAILED_DUE_TO_SAVEDATA,
-	SAVESTATE_FAILED_DUE_TO_SPU,
-	SAVESTATE_FAILED_DUE_TO_MISSING_SPU_SETTING,
 };
diff --git a/rpcs3/Emu/perf_meter.cpp b/rpcs3/Emu/perf_meter.cpp
index adaed4cf47..d570394066 100644
--- a/rpcs3/Emu/perf_meter.cpp
+++ b/rpcs3/Emu/perf_meter.cpp
@@ -2,10 +2,7 @@
 #include "perf_meter.hpp"
 
 #include "util/sysinfo.hpp"
-#include "util/fence.hpp"
-#include "util/tsc.hpp"
 #include "Utilities/Thread.h"
-#include "Utilities/mutex.h"
 
 #include <map>
 #include <mutex>
@@ -27,13 +24,13 @@ void perf_stat_base::print(const char* name) const noexcept
 {
 	if (u64 num_total = m_log[0].load())
 	{
-		perf_log.notice(u8"Perf stats for %s: total events: %u (total time %.4fs, avg %.4fus)", name, num_total, m_log[65].load() / 1000'000'000., m_log[65].load() / 1000. / num_total);
+		perf_log.notice(u8"Perf stats for %s: total events: %u (total time %.4fs, avg %.4fµs)", name, num_total, m_log[65].load() / 1000'000'000., m_log[65].load() / 1000. / num_total);
 
 		for (u32 i = 0; i < 13; i++)
 		{
 			if (u64 count = m_log[i + 1].load())
 			{
-				perf_log.notice(u8"Perf stats for %s: events < %.3fus: %u", name, std::pow(2., i) / 1000., count);
+				perf_log.notice(u8"Perf stats for %s: events < %.3fµs: %u", name, std::pow(2., i) / 1000., count);
 			}
 		}
 
@@ -71,10 +68,18 @@ void perf_stat_base::print(const char* name) const noexcept
 	}
 }
 
+#ifdef _MSC_VER
+extern "C" void _mm_lfence();
+#endif
+
 SAFE_BUFFERS(void) perf_stat_base::push(u64 data[66], u64 start_time, const char* name) noexcept
 {
 	// Event end
-	const u64 end_time = (utils::lfence(), utils::get_tsc());
+#ifdef _MSC_VER
+	const u64 end_time = (_mm_lfence(), get_tsc());
+#else
+	const u64 end_time = (__builtin_ia32_lfence(), get_tsc());
+#endif
 
 	// Compute difference in seconds
 	const f64 diff = (end_time - start_time) * 1. / utils::get_tsc_freq();
@@ -85,7 +90,7 @@ SAFE_BUFFERS(void) perf_stat_base::push(u64 data[66], u64 start_time, const char
 	// Print in microseconds
 	if (static_cast<u64>(diff * 1000'000.) >= g_cfg.core.perf_report_threshold)
 	{
-		perf_log.notice(u8"%s: %.3fus", name, diff * 1000'000.);
+		perf_log.notice(u8"%s: %.3fµs", name, diff * 1000'000.);
 	}
 
 	data[0] += ns != 0;
diff --git a/rpcs3/Emu/perf_meter.hpp b/rpcs3/Emu/perf_meter.hpp
index ac53185b08..a936e13994 100644
--- a/rpcs3/Emu/perf_meter.hpp
+++ b/rpcs3/Emu/perf_meter.hpp
@@ -2,13 +2,26 @@
 
 #include "util/types.hpp"
 #include "util/logs.hpp"
-#include "util/tsc.hpp"
 #include "system_config.h"
 #include <array>
 #include <cmath>
 
 LOG_CHANNEL(perf_log, "PERF");
 
+#ifdef _MSC_VER
+extern "C" u64 __rdtsc();
+
+inline u64 get_tsc()
+{
+	return __rdtsc();
+}
+#else
+inline u64 get_tsc()
+{
+	return __builtin_ia32_rdtsc();
+}
+#endif
+
 // TODO: constexpr with the help of bitcast
 template <auto Name>
 inline const auto perf_name = []
@@ -74,11 +87,9 @@ class perf_stat final : public perf_stat_base
 	} g_tls_perf_stat;
 
 public:
-	static FORCE_INLINE SAFE_BUFFERS(void) push([[maybe_unused]] u64 start_time) noexcept
+	static FORCE_INLINE SAFE_BUFFERS(void) push(u64 start_time) noexcept
 	{
-#if !defined(_WIN32) || defined(_MSC_VER) // Windows clang LTO doesn't seem to like this template
 		perf_stat_base::push(g_tls_perf_stat.m_log, start_time, perf_name<ShortName>.data());
-#endif
 	}
 };
 
@@ -95,16 +106,6 @@ public:
 		restart();
 	}
 
-	FORCE_INLINE SAFE_BUFFERS() perf_meter(int) noexcept
-	{
-		std::fill(std::begin(m_timestamps), std::end(m_timestamps), 0);
-	}
-
-	FORCE_INLINE SAFE_BUFFERS(operator bool) () const noexcept
-	{
-		return m_timestamps[0] != 0;
-	}
-
 	// Copy first timestamp
 	template <auto SN, auto... S>
 	FORCE_INLINE SAFE_BUFFERS() perf_meter(const perf_meter<SN, S...>& r) noexcept
@@ -144,7 +145,7 @@ public:
 		if constexpr (std::array<bool, sizeof...(SubEvents)>{(SubEvents == Event)...}[Index])
 		{
 			// Push actual timestamp into an array
-			m_timestamps[Index + 1] = utils::get_tsc();
+			m_timestamps[Index + 1] = get_tsc();
 		}
 		else if constexpr (Index < sizeof...(SubEvents))
 		{
@@ -168,7 +169,7 @@ public:
 	// Re-initialize first timestamp
 	FORCE_INLINE SAFE_BUFFERS(void) restart() noexcept
 	{
-		m_timestamps[0] = utils::get_tsc();
+		m_timestamps[0] = get_tsc();
 		std::memset(m_timestamps + 1, 0, sizeof(m_timestamps) - sizeof(u64));
 	}
 
diff --git a/rpcs3/Emu/perf_monitor.cpp b/rpcs3/Emu/perf_monitor.cpp
deleted file mode 100644
index 15cdcf498f..0000000000
--- a/rpcs3/Emu/perf_monitor.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-#include "stdafx.h"
-#include "perf_monitor.hpp"
-
-#include "Emu/System.h"
-#include "Emu/Cell/timers.hpp"
-#include "util/cpu_stats.hpp"
-#include "Utilities/Thread.h"
-
-LOG_CHANNEL(perf_log, "PERF");
-
-void perf_monitor::operator()()
-{
-	constexpr u64 update_interval_us = 1000000; // Update every second
-	constexpr u64 log_interval_us = 10000000;   // Log every 10 seconds
-	u64 elapsed_us = 0;
-
-	utils::cpu_stats stats;
-	stats.init_cpu_query();
-
-	u32 logged_pause = 0;
-	u64 last_pause_time = umax;
-
-	std::vector<double> per_core_usage;
-	std::string msg;
-
-	for (u64 sleep_until = get_system_time(); thread_ctrl::state() != thread_state::aborting;)
-	{
-		thread_ctrl::wait_until(&sleep_until, update_interval_us);
-		elapsed_us += update_interval_us;
-
-		if (thread_ctrl::state() == thread_state::aborting)
-		{
-			break;
-		}
-
-		double total_usage = 0.0;
-
-		stats.get_per_core_usage(per_core_usage, total_usage);
-
-		if (elapsed_us >= log_interval_us)
-		{
-			elapsed_us = 0;
-
-			const bool is_paused = Emu.IsPaused();
-			const u64 pause_time = Emu.GetPauseTime();
-
-			if (!is_paused || last_pause_time != pause_time)
-			{
-				// Resumed or not paused since last check
-				logged_pause = 0;
-				last_pause_time = pause_time;
-			}
-
-			if (is_paused)
-			{
-				if (logged_pause >= 2)
-				{
-					// Let's not spam the log when emulation is paused
-					// But still emit the message two times so even paused state can be debugged and inspected
-					continue;
-				}
-
-				logged_pause++;
-			}
-
-			msg.clear();
-			fmt::append(msg, "CPU Usage: Total: %.1f%%", total_usage);
-
-			if (!per_core_usage.empty())
-			{
-				fmt::append(msg, ", Cores:");
-			}
-
-			for (usz i = 0; i < per_core_usage.size(); i++)
-			{
-				fmt::append(msg, "%s %.1f%%", i > 0 ? "," : "", per_core_usage[i]);
-			}
-
-			perf_log.notice("%s", msg);
-		}
-	}
-}
-
-perf_monitor::~perf_monitor()
-{
-}
diff --git a/rpcs3/Emu/perf_monitor.hpp b/rpcs3/Emu/perf_monitor.hpp
deleted file mode 100644
index a37b14fd9a..0000000000
--- a/rpcs3/Emu/perf_monitor.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include <string_view>
-using namespace std::literals;
-
-struct perf_monitor
-{
-	void operator()();
-	~perf_monitor();
-
-	static constexpr auto thread_name = "Performance Sensor"sv;
-};
diff --git a/rpcs3/Emu/savestate_utils.cpp b/rpcs3/Emu/savestate_utils.cpp
deleted file mode 100644
index 31b24eba5f..0000000000
--- a/rpcs3/Emu/savestate_utils.cpp
+++ /dev/null
@@ -1,545 +0,0 @@
-#include "stdafx.h"
-#include "util/types.hpp"
-#include "util/logs.hpp"
-#include "util/v128.hpp"
-#include "util/simd.hpp"
-#include "Utilities/File.h"
-#include "Utilities/StrFmt.h"
-#include "system_config.h"
-#include "savestate_utils.hpp"
-
-#include "System.h"
-
-#include <set>
-#include <span>
-
-LOG_CHANNEL(sys_log, "SYS");
-
-struct serial_ver_t
-{
-	std::string ver_name;
-	bool used = false;
-	u16 current_version = 0;
-	std::set<u16> compatible_versions;
-};
-
-static std::array<serial_ver_t, 27> s_serial_versions;
-
-#define SERIALIZATION_VER(name, identifier, ...) \
-\
-	const bool s_##name##_serialization_fill = []() { auto& e = ::s_serial_versions[identifier]; if (e.compatible_versions.empty()) { e.compatible_versions = {__VA_ARGS__}; e.ver_name = #name; } return true; }();\
-\
-	extern void using_##name##_serialization()\
-	{\
-		ensure(Emu.IsStopped());\
-		::s_serial_versions[identifier].used = true;\
-	}\
-\
-	extern s32 get_##name##_serialization_version()\
-	{\
-		return ::s_serial_versions[identifier].current_version;\
-	}
-
-SERIALIZATION_VER(global_version, 0,                            19) // For stuff not listed here
-SERIALIZATION_VER(ppu, 1,                                       1, 2/*PPU sleep order*/, 3/*PPU FNID and module*/)
-SERIALIZATION_VER(spu, 2,                                       1)
-SERIALIZATION_VER(lv2_sync, 3,                                  1)
-SERIALIZATION_VER(lv2_vm, 4,                                    1)
-SERIALIZATION_VER(lv2_net, 5,                                   1, 2/*TCP Feign conection loss*/)
-SERIALIZATION_VER(lv2_fs, 6,                                    1, 2/*NPDRM key saving*/)
-SERIALIZATION_VER(lv2_prx_overlay, 7,                           1)
-SERIALIZATION_VER(lv2_memory, 8,                                1)
-SERIALIZATION_VER(lv2_config, 9,                                1)
-
-namespace rsx
-{
-	SERIALIZATION_VER(rsx, 10,                                  1, 2/*Pending flip*/, 3/*avconf scan_mode*/)
-}
-
-namespace np
-{
-	SERIALIZATION_VER(sceNp, 11,                                1)
-}
-
-#ifdef _MSC_VER
-// Compiler bug, lambda function body does seem to inherit used namespace atleast for function declaration
-SERIALIZATION_VER(rsx, 10)
-SERIALIZATION_VER(sceNp, 11)
-#endif
-
-SERIALIZATION_VER(cellVdec, 12,                                 1)
-SERIALIZATION_VER(cellAudio, 13,                                1)
-SERIALIZATION_VER(cellCamera, 14,                               1, 2/*gem_camera_shared*/)
-SERIALIZATION_VER(cellGem, 15,                                  1, 2/*calibration_status_flags*/, 3/*video_conversion*/)
-SERIALIZATION_VER(sceNpTrophy, 16,                              1)
-SERIALIZATION_VER(cellMusic, 17,                                1)
-SERIALIZATION_VER(cellVoice, 18,                                1)
-SERIALIZATION_VER(cellGcm, 19,                                  1)
-SERIALIZATION_VER(sysPrxForUser, 20,                            1)
-SERIALIZATION_VER(cellSaveData, 21,                             1)
-SERIALIZATION_VER(cellAudioOut, 22,                             1)
-SERIALIZATION_VER(sys_io, 23,                                   2)
-
-// Misc versions for HLE/LLE not included so main version would not invalidated
-SERIALIZATION_VER(LLE, 24,                                      1)
-SERIALIZATION_VER(HLE, 25,                                      1)
-
-SERIALIZATION_VER(cellSysutil, 26,                              1, 2/*AVC2 Muting,Volume*/)
-
-template <>
-void fmt_class_string<std::remove_cvref_t<decltype(s_serial_versions)>>::format(std::string& out, u64 arg)
-{
-	bool is_first = true;
-
-	const auto& serials = get_object(arg);
-
-	out += "{ ";
-
-	for (auto& entry : serials)
-	{
-		if (entry.current_version)
-		{
-			if (!is_first)
-			{
-				out += ", ";
-			}
-
-			is_first = false;
-			fmt::append(out, "%s=%d", entry.ver_name, entry.current_version);
-		}
-	}
-
-	out += " }";
-}
-
-std::vector<version_entry> get_savestate_versioning_data(fs::file&& file, std::string_view filepath)
-{
-	if (!file)
-	{
-		return {};
-	}
-
-	file.seek(0);
-
-	utils::serial ar;
-	ar.set_reading_state({}, true);
-
-	if (filepath.ends_with(".zst"))
-	{
-		ar.m_file_handler = make_compressed_zstd_serialization_file_handler(std::move(file));
-	}
-	else if (filepath.ends_with(".gz"))
-	{
-		ar.m_file_handler = make_compressed_serialization_file_handler(std::move(file));
-	}
-	else
-	{
-		ar.m_file_handler = make_uncompressed_serialization_file_handler(std::move(file));
-	}
-
-	if (u64 r = 0; ar.try_read(r) != 0 || r != "RPCS3SAV"_u64)
-	{
-		return {};
-	}
-
-	ar.pos = 10;
-
-	u64 offs = ar.try_read<u64>().second;
-
-	const usz fsize = ar.get_size(offs);
-
-	if (!offs || fsize <= offs)
-	{
-		return {};
-	}
-
-	ar.seek_pos(offs);
-	ar.breathe(true);
-
-	std::vector<version_entry> ver_data = ar.pop<std::vector<version_entry>>();
-	return ver_data;
-}
-
-std::shared_ptr<utils::serial> make_savestate_reader(const std::string& path)
-{
-	std::shared_ptr<utils::serial> ar;
-
-	fs::file save{path, fs::isfile + fs::read};
-
-	if (!save)
-	{
-		return ar;
-	}
-
-	if (path.ends_with(".SAVESTAT") && save.size() >= 8 && save.read<u64>() == "RPCS3SAV"_u64)
-	{
-		ar = std::make_shared<utils::serial>();
-		ar->set_reading_state();
-
-		ar->m_file_handler = make_uncompressed_serialization_file_handler(std::move(save));
-	}
-	else if (path.ends_with(".zst"))
-	{
-		ar = std::make_shared<utils::serial>();
-		ar->set_reading_state();
-
-		ar->m_file_handler = make_compressed_zstd_serialization_file_handler(std::move(save));
-
-		if (ar->try_read<u64>().second != "RPCS3SAV"_u64)
-		{
-			ar.reset();
-		}
-		else
-		{
-			ar->pos = 0;
-		}
-	}
-	else if (path.ends_with(".gz"))
-	{
-		ar = std::make_shared<utils::serial>();
-		ar->set_reading_state();
-
-		ar->m_file_handler = make_compressed_serialization_file_handler(std::move(save));
-
-		if (ar->try_read<u64>().second != "RPCS3SAV"_u64)
-		{
-			ar.reset();
-		}
-		else
-		{
-			ar->pos = 0;
-		}
-	}
-
-	return ar;
-}
-
-bool is_savestate_version_compatible(const std::vector<version_entry>& data, bool is_boot_check)
-{
-	if (data.empty())
-	{
-		return false;
-	}
-
-	bool ok = true;
-
-	if (is_boot_check)
-	{
-		for (auto& entry : s_serial_versions)
-		{
-			// Version 0 means that the entire constructor using the version should be skipped
-			entry.current_version = 0;
-		}
-	}
-
-	auto& channel = (is_boot_check ? sys_log.error : sys_log.trace);
-
-	for (const auto& entry : data)
-	{
-		if (entry.type >= s_serial_versions.size())
-		{
-			channel("Savestate version identifier is unknown! (category=%u, version=%u)", entry.type, entry.version);
-			ok = false; // Log all mismatches
-		}
-		else if (!s_serial_versions[entry.type].compatible_versions.count(entry.version))
-		{
-			channel("Savestate version is not supported. (category=%u, version=%u)", entry.type, entry.version);
-			ok = false;
-		}
-		else if (is_boot_check)
-		{
-			s_serial_versions[entry.type].current_version = entry.version;
-		}
-	}
-
-	if (is_boot_check)
-	{
-		if (ok)
-		{
-			sys_log.success("Savestate versions: %s", s_serial_versions);
-		}
-		else
-		{
-			for (auto& entry : s_serial_versions)
-			{
-				entry.current_version = 0;
-			}
-		}
-	}
-
-	return ok;
-}
-
-std::string get_savestate_file(std::string_view title_id, std::string_view boot_path, s64 abs_id, s64 rel_id)
-{
-	const std::string title = std::string{title_id.empty() ? boot_path.substr(boot_path.find_last_of(fs::delim) + 1) : title_id};
-
-	if (abs_id == -1 && rel_id == -1)
-	{
-		// Return directory
-		return fs::get_config_dir() + "savestates/" + title + "/";
-	}
-
-	ensure(rel_id < 0 || abs_id >= 0, "Unimplemented!");
-
-	const std::string save_id = fmt::format("%d", abs_id);
-
-	// Make sure that savestate file with higher IDs are placed at the bottom of "by name" file ordering in directory view by adding a single character prefix which tells the ID length
-	// While not needing to keep a 59 chars long suffix at all times for this purpose
-	const char prefix = ::at32("0123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"sv, save_id.size());
-
-	std::string path = fs::get_config_dir() + "/savestates/" + title + "/" + title + '_' + prefix + '_' + save_id + ".SAVESTAT";
-
-	if (std::string path_compressed = path + ".zst"; fs::is_file(path_compressed))
-	{
-		return path_compressed;
-	}
-
-	if (std::string path_compressed = path + ".gz"; fs::is_file(path_compressed))
-	{
-		return path_compressed;
-	}
-
-	return path;
-}
-
-bool is_savestate_compatible(fs::file&& file, std::string_view filepath)
-{
-	return is_savestate_version_compatible(get_savestate_versioning_data(std::move(file), filepath), false);
-}
-
-bool is_savestate_compatible(const std::string& filepath)
-{
-	if (fs::file file{filepath, fs::isfile + fs::read})
-	{
-		return is_savestate_compatible(std::move(file), filepath);
-	}
-	return false;
-}
-
-std::vector<version_entry> read_used_savestate_versions()
-{
-	std::vector<version_entry> used_serial;
-	used_serial.reserve(s_serial_versions.size());
-
-	for (serial_ver_t& ver : s_serial_versions)
-	{
-		if (std::exchange(ver.used, false))
-		{
-			used_serial.push_back(version_entry{static_cast<u16>(&ver - s_serial_versions.data()), *ver.compatible_versions.rbegin()});
-		}
-
-		ver.current_version = 0;
-	}
-
-	return used_serial;
-}
-
-bool boot_last_savestate(bool testing)
-{
-	if (!g_cfg.savestate.suspend_emu && !Emu.GetTitleID().empty() && (Emu.IsRunning() || Emu.GetStatus() == system_state::paused))
-	{
-		const std::string save_dir = get_savestate_file(Emu.GetTitleID(), Emu.GetBoot(), -1, -1);
-
-		std::string savestate_path;
-		s64 mtime = smin;
-
-		for (auto&& entry : fs::dir(save_dir))
-		{
-			if (entry.is_directory)
-			{
-				continue;
-			}
-
-			// Find the latest savestate file compatible with the game (TODO: Check app version and anything more)
-			if (entry.name.find(Emu.GetTitleID()) != umax && mtime <= entry.mtime)
-			{
-				if (std::string path = save_dir + entry.name + ".zst"; is_savestate_compatible(fs::file(path), path))
-				{
-					savestate_path = std::move(path);
-					mtime = entry.mtime;
-				}
-				else if (std::string path = save_dir + entry.name + ".gz"; is_savestate_compatible(fs::file(path), path))
-				{
-					savestate_path = std::move(path);
-					mtime = entry.mtime;
-				}
-				else if (std::string path = save_dir + entry.name; is_savestate_compatible(fs::file(path), path))
-				{
-					savestate_path = std::move(path);
-					mtime = entry.mtime;
-				}
-			}
-		}
-
-		const bool result = fs::is_file(savestate_path);
-
-		if (testing)
-		{
-			sys_log.trace("boot_last_savestate(true) returned %s.", result);
-			return result;
-		}
-
-		if (result)
-		{
-			sys_log.success("Booting the most recent savestate \'%s\' using the Reload shortcut.", savestate_path);
-
-			// Make sure we keep the game window opened
-			Emu.SetContinuousMode(true);
-			Emu.GracefulShutdown(false, false, false, true);
-
-			if (game_boot_result error = Emu.BootGame(savestate_path, "", true); error != game_boot_result::no_errors)
-			{
-				sys_log.error("Failed to boot savestate \'%s\' using the Reload shortcut. (error: %s)", savestate_path, error);
-			}
-			else
-			{
-				return true;
-			}
-		}
-
-		sys_log.error("No compatible savestate file found in \'%s\''", save_dir);
-	}
-
-	return false;
-}
-
-bool load_and_check_reserved(utils::serial& ar, usz size)
-{
-	u8 bytes[4096];
-	ensure(size < std::size(bytes));
-	std::memset(&bytes[size & (0 - sizeof(v128))], 0, sizeof(v128));
-
-	const usz old_pos = ar.pos;
-	ar(std::span<u8>(bytes, size));
-
-	// Check if all are 0
-	for (usz i = 0; i < size; i += sizeof(v128))
-	{
-		if (v128::loadu(&bytes[i]) != v128{})
-		{
-			return false;
-		}
-	}
-
-	return old_pos + size == ar.pos;
-}
-
-namespace stx
-{
-	extern u16 serial_breathe_and_tag(utils::serial& ar, std::string_view name, bool tag_bit)
-	{
-		thread_local std::string_view s_tls_object_name = "none";
-		thread_local u64 s_tls_call_count = 1, s_tls_current_pos = 0;
-
-		if (s_tls_current_pos >= ar.pos)
-		{
-			// Reset, probably a new utils::serial object
-			s_tls_call_count = 1;
-			s_tls_object_name = "none"sv;
-		}
-
-		s_tls_current_pos = ar.pos;
-
-		constexpr u16 data_mask = 0x7fff;
-
-		if (ar.m_file_handler && ar.m_file_handler->is_null())
-		{
-			return (tag_bit ? data_mask + 1 : 0);
-		}
-
-		u16 tag = static_cast<u16>((static_cast<u16>(ar.pos / 2) & data_mask) | (tag_bit ? data_mask + 1 : 0));
-		u16 saved = tag;
-		ar(saved);
-
-		sys_log.trace("serial_breathe_and_tag(%u): %s, object: '%s', next-object: '%s', expected/tag: 0x%x == 0x%x", s_tls_call_count, ar, s_tls_object_name, name, tag, saved);
-
-		if ((saved ^ tag) & data_mask)
-		{
-			ensure(!ar.is_writing());
-			fmt::throw_exception("serial_breathe_and_tag(%u): %s\nobject: '%s', next-object: '%s', expected/tag: 0x%x != 0x%x,", s_tls_call_count, ar, s_tls_object_name, name, tag, saved);
-		}
-
-		s_tls_object_name = name;
-		s_tls_call_count++;
-		ar.breathe();
-		return saved;
-	}
-}
-
-// MSVC bug workaround, see above similar case
-extern u16 serial_breathe_and_tag(utils::serial& ar, std::string_view name, bool tag_bit)
-{
-	return ::stx::serial_breathe_and_tag(ar, name, tag_bit);
-}
-
-[[noreturn]] void hle_locks_t::lock()
-{
-	// Unreachable
-	fmt::throw_exception("Unreachable");
-}
-
-bool hle_locks_t::try_lock()
-{
-	while (true)
-	{
-		auto [old, success] = lock_val.fetch_op([](s64& value)
-		{
-			if (value >= 0)
-			{
-				value++;
-				return true;
-			}
-
-			return false;
-		});
-
-		if (success)
-		{
-			return true;
-		}
-
-		if (old == finalized)
-		{
-			break;
-		}
-
-		lock_val.wait(old);
-	}
-
-	return false;
-}
-
-void hle_locks_t::unlock()
-{
-	lock_val--;
-}
-
-bool hle_locks_t::try_finalize(std::function<bool()> test)
-{
-	if (!test())
-	{
-		return false;
-	}
-
-	if (!lock_val.compare_and_swap_test(0, waiting_for_evaluation))
-	{
-		return false;
-	}
-
-	if (!test())
-	{
-		// Failed
-		ensure(lock_val.compare_and_swap_test(waiting_for_evaluation, 0));
-		return false;
-	}
-
-	ensure(lock_val.compare_and_swap_test(waiting_for_evaluation, finalized));
-
-	// Sanity check when debugging (the result is not expected to change after finalization)
-	//ensure(test());
-
-	lock_val.notify_all();
-	return true;
-}
-
diff --git a/rpcs3/Emu/savestate_utils.hpp b/rpcs3/Emu/savestate_utils.hpp
deleted file mode 100644
index 18028ae9ec..0000000000
--- a/rpcs3/Emu/savestate_utils.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#pragma once
-
-#include "util/serialization_ext.hpp"
-
-struct version_entry
-{
-	u16 type;
-	u16 version;
-
-	ENABLE_BITWISE_SERIALIZATION;
-};
-
-struct savestate_header
-{
-	ENABLE_BITWISE_SERIALIZATION;
-
-	nse_t<u64, 1> magic;
-	bool LE_format;
-	bool state_inspection_support;
-	nse_t<u64, 1> offset;
-	b8 flag_versions_is_following_data;
-};
-
-struct hle_locks_t
-{
-	atomic_t<s64> lock_val{0};
-
-	enum states : s64
-	{
-		waiting_for_evaluation = -1,
-		finalized = -2,
-	};
-
-	[[noreturn]] void lock();
-	bool try_lock();
-	void unlock();
-	bool try_finalize(std::function<bool()> test);
-};
-
-std::shared_ptr<utils::serial> make_savestate_reader(const std::string& path);
-bool load_and_check_reserved(utils::serial& ar, usz size);
-bool is_savestate_version_compatible(const std::vector<version_entry>& data, bool is_boot_check);
-std::vector<version_entry> get_savestate_versioning_data(fs::file&& file, std::string_view filepath);
-bool is_savestate_compatible(fs::file&& file, std::string_view filepath);
-bool is_savestate_compatible(const std::string& filepath);
-std::vector<version_entry> read_used_savestate_versions();
-std::string get_savestate_file(std::string_view title_id, std::string_view boot_path, s64 abs_id, s64 rel_id);
diff --git a/rpcs3/Emu/scoped_progress_dialog.cpp b/rpcs3/Emu/scoped_progress_dialog.cpp
deleted file mode 100644
index ababe3d190..0000000000
--- a/rpcs3/Emu/scoped_progress_dialog.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-#include "stdafx.h"
-#include "system_progress.hpp"
-
-shared_ptr<std::string> progress_dialog_string_t::get_string_ptr() const noexcept
-{
-	shared_ptr<std::string> text;
-	data_t old_val = data.load();
-
-	while (true)
-	{
-		text.reset();
-
-		if (old_val.text_count == 0)
-		{
-			return text;
-		}
-
-		if (old_val.text_index != umax)
-		{
-			if (text = g_progr_text_queue[old_val.text_index].load(); !text)
-			{
-				// Search for available text (until the time another thread sets index)
-				const u64 queue_size = g_progr_text_queue.size();
-
-				for (u64 i = queue_size - 1;; i--)
-				{
-					if (i == umax)
-					{
-						return text;
-					}
-
-					if ((text = g_progr_text_queue[i].load()))
-					{
-						return text;
-					}
-				}
-			}
-		}
-
-		auto new_val = data.load();
-
-		if (old_val.update_id == new_val.update_id)
-		{
-			break;
-		}
-
-		old_val = new_val;
-	}
-
-	return text;
-}
-
-scoped_progress_dialog::scoped_progress_dialog(std::string text) noexcept
-{
-	shared_ptr<std::string> installed_ptr = make_single_value(std::move(text));
-	const shared_ptr<std::string> c_null_ptr;
-
-	for (usz init_size = g_progr_text_queue.size(), new_text_index = std::max<usz>(init_size, 1) - 1;;)
-	{
-		if (new_text_index >= init_size)
-		{
-			// Search element in new memeory
-			new_text_index++;
-		}
-		else if (new_text_index == 0)
-		{
-			// Search element in new memeory
-			new_text_index = init_size;
-		}
-		else
-		{
-			new_text_index--;
-		}
-
-		auto& info = g_progr_text_queue[new_text_index];
-
-		if (!info && info.compare_and_swap_test(c_null_ptr, installed_ptr))
-		{
-			m_text_index = ::narrow<u32>(new_text_index);
-			break;
-		}
-	}
-
-	g_progr_text.data.atomic_op([&](std::common_type_t<progress_dialog_string_t::data_t>& progr)
-	{
-		progr.update_id++;
-		progr.text_index = m_text_index;
-		progr.text_count++;
-	});
-}
-
-scoped_progress_dialog& scoped_progress_dialog::operator=(std::string text) noexcept
-{
-	// Set text atomically
-	g_progr_text_queue[m_text_index].store(make_single_value(std::move(text)));
-	return *this;
-}
-
-scoped_progress_dialog::~scoped_progress_dialog() noexcept
-{
-	// Deallocate memory
-	g_progr_text_queue[m_text_index].reset();
-
-	auto progr = g_progr_text.data.load();
-
-	while (true)
-	{
-		u64 restored_text_index = umax;
-
-		if (progr.text_index == m_text_index && !g_progr_text_queue[m_text_index])
-		{
-			// Search for available text
-			// Out of scope of atomic loop to keep atomic_op as clean as possible (for potential future enhacements)
-			const u64 queue_size = g_progr_text_queue.size();
-
-			for (u64 i = queue_size - 1;; i--)
-			{
-				if (i == umax)
-				{
-					restored_text_index = umax;
-					break;
-				}
-
-				if (g_progr_text_queue[i].operator bool())
-				{
-					restored_text_index = i;
-					break;
-				}
-			}
-		}
-
-		auto [old, ok] = g_progr_text.data.fetch_op([&](std::common_type_t<progress_dialog_string_t::data_t>& progr0)
-		{
-			if (progr.update_id != progr0.update_id)
-			{
-				// Repeat the loop
-				return false;
-			}
-
-			progr0.text_count--;
-
-			if (progr0.text_index == m_text_index)
-			{
-				if (restored_text_index == umax)
-				{
-					progr0.text_index = umax;
-					progr0.update_id++;
-					return true;
-				}
-
-				progr0.text_index = ::narrow<u32>(restored_text_index);
-				progr0.update_id++;
-			}
-
-			return true;
-		});
-
-		progr = old;
-
-		if (!ok)
-		{
-			continue;
-		}
-
-		break;
-	}
-}
diff --git a/rpcs3/Emu/system_config.cpp b/rpcs3/Emu/system_config.cpp
index b1b1295b81..d608f0ac60 100644
--- a/rpcs3/Emu/system_config.cpp
+++ b/rpcs3/Emu/system_config.cpp
@@ -1,18 +1,54 @@
 #include "stdafx.h"
 #include "system_config.h"
+#include "Utilities/StrUtil.h"
+#include "Utilities/StrFmt.h"
 
 #include "util/sysinfo.hpp"
 
 cfg_root g_cfg{};
-cfg_root g_backup_cfg{};
 
-bool cfg_root::node_core::enable_tsx_by_default()
+bool cfg_root::node_core::has_rtm()
 {
-	return utils::has_rtm() && utils::has_mpx() && !utils::has_tsx_force_abort();
+	return utils::has_rtm();
 }
 
-std::string cfg_root::node_sys::get_random_system_name()
+std::string cfg_root::node_vfs::get(const cfg::string& _cfg, std::string_view emu_dir) const
 {
-	std::srand(static_cast<u32>(std::time(nullptr)));
-	return "RPCS3-" + std::to_string(100 + std::rand() % 899);
+	std::string _emu_dir; // Storage only
+
+	if (emu_dir.empty())
+	{
+		// Optimization if provided arg
+		_emu_dir = emulator_dir;
+
+		if (_emu_dir.empty())
+		{
+			_emu_dir = fs::get_config_dir() + '/';
+		}
+		// Check if path does not end with a delimiter
+		else if (_emu_dir.back() != fs::delim[0] && _emu_dir.back() != fs::delim[1])
+		{
+			_emu_dir += '/';
+		}
+
+		emu_dir = _emu_dir;
+	}
+
+	std::string path = _cfg.to_string();
+
+	if (path.empty())
+	{
+		// Fallback
+		path = _cfg.def;
+	}
+
+	path = fmt::replace_all(path, "$(EmulatorDir)", emu_dir);
+
+	// Check if path does not end with a delimiter
+	if (path.back() != fs::delim[0] && path.back() != fs::delim[1])
+	{
+		path += '/';
+	}
+
+	return path;
 }
diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h
index 92031a51db..0123110d80 100644
--- a/rpcs3/Emu/system_config.h
+++ b/rpcs3/Emu/system_config.h
@@ -14,7 +14,7 @@ struct cfg_root : cfg::node
 	{
 	private:
 		/** We don't wanna include the sysinfo header here */
-		static bool enable_tsx_by_default();
+		static bool has_rtm();
 
 	public:
 		node_core(cfg::node* _this) : cfg::node(_this, "Core") {}
@@ -27,56 +27,35 @@ struct cfg_root : cfg::node
 		cfg::string llvm_cpu{ this, "Use LLVM CPU" };
 		cfg::_int<0, 1024> llvm_threads{ this, "Max LLVM Compile Threads", 0 };
 		cfg::_bool ppu_llvm_greedy_mode{ this, "PPU LLVM Greedy Mode", false, false };
-		cfg::_bool llvm_precompilation{ this, "LLVM Precompilation", true };
+		cfg::_bool ppu_llvm_precompilation{ this, "PPU LLVM Precompilation", true };
 		cfg::_enum<thread_scheduler_mode> thread_scheduler{this, "Thread Scheduler Mode", thread_scheduler_mode::os};
 		cfg::_bool set_daz_and_ftz{ this, "Set DAZ and FTZ", false };
 		cfg::_enum<spu_decoder_type> spu_decoder{ this, "SPU Decoder", spu_decoder_type::llvm };
-		cfg::uint<0, 100> spu_reservation_busy_waiting_percentage{ this, "SPU Reservation Busy Waiting Percentage 1", 100, true };
-		cfg::_bool spu_reservation_busy_waiting_enabled{ this, "SPU Reservation Busy Waiting Enabled", false, true };
-		cfg::uint<0, 100> spu_getllar_busy_waiting_percentage{ this, "SPU GETLLAR Busy Waiting Percentage", 100, true };
-		cfg::_bool spu_getllar_spin_optimization_disabled{ this, "Disable SPU GETLLAR Spin Optimization", false, true };
+		cfg::_bool lower_spu_priority{ this, "Lower SPU thread priority" };
+		cfg::_bool spu_getllar_polling_detection{ this, "SPU GETLLAR polling detection", false, true };
 		cfg::_bool spu_debug{ this, "SPU Debug" };
 		cfg::_bool mfc_debug{ this, "MFC Debug" };
 		cfg::_int<0, 6> preferred_spu_threads{ this, "Preferred SPU Threads", 0, true }; // Number of hardware threads dedicated to heavy simultaneous spu tasks
 		cfg::_int<0, 16> spu_delay_penalty{ this, "SPU delay penalty", 3 }; // Number of milliseconds to block a thread if a virtual 'core' isn't free
-		cfg::_bool spu_loop_detection{ this, "SPU loop detection", false }; // Try to detect wait loops and trigger thread yield
-		cfg::_int<1, 6> max_spurs_threads{ this, "Max SPURS Threads", 6, true }; // HACK. If less then 6, max number of running SPURS threads in each thread group.
+		cfg::_bool spu_loop_detection{ this, "SPU loop detection", true, true }; // Try to detect wait loops and trigger thread yield
+		cfg::_int<0, 6> max_spurs_threads{ this, "Max SPURS Threads", 6 }; // HACK. If less then 6, max number of running SPURS threads in each thread group.
 		cfg::_enum<spu_block_size_type> spu_block_size{ this, "SPU Block Size", spu_block_size_type::safe };
+		cfg::_bool spu_accurate_getllar{ this, "Accurate GETLLAR", false, true };
 		cfg::_bool spu_accurate_dma{ this, "Accurate SPU DMA", false };
-		cfg::_bool spu_accurate_reservations{ this, "Accurate SPU Reservations", true };
 		cfg::_bool accurate_cache_line_stores{ this, "Accurate Cache Line Stores", false };
 		cfg::_bool rsx_accurate_res_access{this, "Accurate RSX reservation access", false, true};
-
-		struct fifo_setting : public cfg::_enum<rsx_fifo_mode>
-		{
-			using _enum = cfg::_enum<rsx_fifo_mode>;
-			using _enum::_enum;
-
-			explicit operator bool() const
-			{
-				return get() != rsx_fifo_mode::fast;
-			}
-		};
-
-		fifo_setting rsx_fifo_accuracy{this, "RSX FIFO Accuracy", rsx_fifo_mode::fast };
 		cfg::_bool spu_verification{ this, "SPU Verification", true }; // Should be enabled
 		cfg::_bool spu_cache{ this, "SPU Cache", true };
 		cfg::_bool spu_prof{ this, "SPU Profiler", false };
-		cfg::uint<0, 16> mfc_transfers_shuffling{ this, "MFC Commands Shuffling Limit", 0 };
-		cfg::uint<0, 10000> mfc_transfers_timeout{ this, "MFC Commands Timeout", 0, true };
-		cfg::_bool mfc_shuffling_in_steps{ this, "MFC Commands Shuffling In Steps", false, true };
-		cfg::_enum<tsx_usage> enable_TSX{ this, "Enable TSX", enable_tsx_by_default() ? tsx_usage::enabled : tsx_usage::disabled }; // Enable TSX. Forcing this on Haswell/Broadwell CPUs should be used carefully
-		cfg::_enum<xfloat_accuracy> spu_xfloat_accuracy{ this, "XFloat Accuracy", xfloat_accuracy::approximate, false };
+		cfg::_enum<tsx_usage> enable_TSX{ this, "Enable TSX", has_rtm() ? tsx_usage::enabled : tsx_usage::disabled }; // Enable TSX. Forcing this on Haswell/Broadwell CPUs should be used carefully
+		cfg::_bool spu_accurate_xfloat{ this, "Accurate xfloat", false };
+		cfg::_bool spu_approx_xfloat{ this, "Approximate xfloat", true };
+		cfg::_bool llvm_accurate_dfma{ this, "LLVM Accurate DFMA", true }; // Enable accurate double-precision FMA for CPUs which do not support it natively
+		cfg::_bool llvm_ppu_jm_handling{ this, "PPU LLVM Java Mode Handling", false }; // Respect current Java Mode for alti-vec ops by PPU LLVM
 		cfg::_int<-1, 14> ppu_128_reservations_loop_max_length{ this, "Accurate PPU 128-byte Reservation Op Max Length", 0, true }; // -1: Always accurate, 0: Never accurate, 1-14: max accurate loop length
+		cfg::_bool llvm_ppu_accurate_vector_nan{ this, "PPU LLVM Accurate Vector NaN values", false };
 		cfg::_int<-64, 64> stub_ppu_traps{ this, "Stub PPU Traps", 0, true }; // Hack, skip PPU traps for rare cases where the trap is continueable (specify relative instructions to skip)
-		cfg::_bool precise_spu_verification{ this, "Precise SPU Verification", false }; // Disables use of xorsum based spu verification if enabled.
-		cfg::_bool ppu_llvm_nj_fixup{ this, "PPU LLVM Java Mode Handling", true }; // Partially respect current Java Mode for alti-vec ops by PPU LLVM
-		cfg::_bool use_accurate_dfma{ this, "Use Accurate DFMA", true }; // Enable accurate double-precision FMA for CPUs which do not support it natively
-		cfg::_bool ppu_set_sat_bit{ this, "PPU Set Saturation Bit", false }; // Accuracy. If unset, completely disable saturation flag handling.
-		cfg::_bool ppu_use_nj_bit{ this, "PPU Accurate Non-Java Mode", false }; // Accuracy. If set, accurately emulate NJ flag. Implies NJ fixup.
-		cfg::_bool ppu_fix_vnan{ this, "PPU Fixup Vector NaN Values", false }; // Accuracy. Partial.
-		cfg::_bool ppu_set_vnan{ this, "PPU Accurate Vector NaN Values", false }; // Accuracy. Implies ppu_fix_vnan.
-		cfg::_bool ppu_set_fpcc{ this, "PPU Set FPCC Bits", false }; // Accuracy.
+		cfg::_bool full_width_avx512{ this, "Full Width AVX-512", false};
 
 		cfg::_bool debug_console_mode{ this, "Debug Console Mode", false }; // Debug console emulation, not recommended
 		cfg::_bool hook_functions{ this, "Hook static functions" };
@@ -88,32 +67,53 @@ struct cfg_root : cfg::node
 		cfg::uint64 tx_limit2_ns{this, "TSX Transaction Second Limit", 2000}; // In nanoseconds
 
 		cfg::_int<10, 3000> clocks_scale{ this, "Clocks scale", 100 }; // Changing this from 100 (percentage) may affect game speed in unexpected ways
-		cfg::uint<0, 3000> spu_wakeup_delay{ this, "SPU Wake-Up Delay", 0, true };
-		cfg::uint<0, (1 << 6) - 1> spu_wakeup_delay_mask{ this, "SPU Wake-Up Delay Thread Mask", (1 << 6) - 1, true };
-		cfg::uint<0, 400> max_cpu_preempt_count_per_frame{ this, "Max CPU Preempt Count", 0, true };
-		cfg::_bool allow_rsx_cpu_preempt{ this, "Allow RSX CPU Preemptions", true, true };
-#if defined (__linux__) || defined (__APPLE__)
-		cfg::_enum<sleep_timers_accuracy_level> sleep_timers_accuracy{ this, "Sleep Timers Accuracy", sleep_timers_accuracy_level::_as_host, true };
+		cfg::_enum<sleep_timers_accuracy_level> sleep_timers_accuracy{ this, "Sleep Timers Accuracy",
+#ifdef __linux__
+			sleep_timers_accuracy_level::_as_host, true };
 #else
-		cfg::_enum<sleep_timers_accuracy_level> sleep_timers_accuracy{ this, "Sleep Timers Accuracy", sleep_timers_accuracy_level::_usleep, true };
+			sleep_timers_accuracy_level::_usleep, true };
 #endif
-		cfg::_int<-1000, 1500> usleep_addend{ this, "Usleep Time Addend", 0, true };
 
 		cfg::uint64 perf_report_threshold{this, "Performance Report Threshold", 500, true}; // In µs, 0.5ms = default, 0 = everything
 		cfg::_bool perf_report{this, "Enable Performance Report", false, true}; // Show certain perf-related logs
-		cfg::_bool external_debugger{this, "Assume External Debugger"};
 	} core{ this };
 
 	struct node_vfs : cfg::node
 	{
 		node_vfs(cfg::node* _this) : cfg::node(_this, "VFS") {}
 
+		std::string get(const cfg::string&, std::string_view emu_dir = {}) const;
+
+		cfg::string emulator_dir{ this, "$(EmulatorDir)" }; // Default (empty): taken from fs::get_config_dir()
+		cfg::string dev_hdd0{ this, "/dev_hdd0/", "$(EmulatorDir)dev_hdd0/" };
+		cfg::string dev_hdd1{ this, "/dev_hdd1/", "$(EmulatorDir)dev_hdd1/" };
+		cfg::string dev_flash{ this, "/dev_flash/", "$(EmulatorDir)dev_flash/" };
+		cfg::string dev_flash2{ this, "/dev_flash2/", "$(EmulatorDir)dev_flash2/" };
+		cfg::string dev_flash3{ this, "/dev_flash3/", "$(EmulatorDir)dev_flash3/" };
+		cfg::string dev_usb000{ this, "/dev_usb000/", "$(EmulatorDir)dev_usb000/" };
+		cfg::string dev_bdvd{ this, "/dev_bdvd/" }; // Not mounted
+		cfg::string app_home{ this, "/app_home/" }; // Not mounted
+
+		std::string get_dev_flash() const
+		{
+			return get(dev_flash);
+		}
+
+		std::string get_dev_flash2() const
+		{
+			return get(dev_flash2);
+		}
+
+		std::string get_dev_flash3() const
+		{
+			return get(dev_flash3);
+		}
+
 		cfg::_bool host_root{ this, "Enable /host_root/" };
 		cfg::_bool init_dirs{ this, "Initialize Directories", true };
 
 		cfg::_bool limit_cache_size{ this, "Limit disk cache size", false };
 		cfg::_int<0, 10240> cache_max_size{ this, "Disk cache maximum size (MB)", 5120 };
-		cfg::_bool empty_hdd0_tmp{ this, "Empty /dev_hdd0/tmp/", true };
 
 	} vfs{ this };
 
@@ -121,36 +121,28 @@ struct cfg_root : cfg::node
 	{
 		node_video(cfg::node* _this) : cfg::node(_this, "Video") {}
 
-#if defined(HAVE_VULKAN)
-		cfg::_enum<video_renderer> renderer{ this, "Renderer", video_renderer::vulkan };
-#else
 		cfg::_enum<video_renderer> renderer{ this, "Renderer", video_renderer::opengl };
-#endif
 
-		cfg::_enum<video_resolution> resolution{ this, "Resolution", video_resolution::_720p };
+		cfg::_enum<video_resolution> resolution{ this, "Resolution", video_resolution::_720 };
 		cfg::_enum<video_aspect> aspect_ratio{ this, "Aspect ratio", video_aspect::_16_9 };
 		cfg::_enum<frame_limit_type> frame_limit{ this, "Frame limit", frame_limit_type::_auto, true };
-		cfg::_float<0, 1000> second_frame_limit{ this, "Second Frame Limit", 0, true }; // 0 disables its effect
 		cfg::_enum<msaa_level> antialiasing_level{ this, "MSAA", msaa_level::_auto };
 		cfg::_enum<shader_mode> shadermode{ this, "Shader Mode", shader_mode::async_recompiler };
-		cfg::_enum<gpu_preset_level> shader_precision{ this, "Shader Precision", gpu_preset_level::high };
 
 		cfg::_bool write_color_buffers{ this, "Write Color Buffers" };
 		cfg::_bool write_depth_buffer{ this, "Write Depth Buffer" };
 		cfg::_bool read_color_buffers{ this, "Read Color Buffers" };
 		cfg::_bool read_depth_buffer{ this, "Read Depth Buffer" };
-		cfg::_bool handle_tiled_memory{ this, "Handle RSX Memory Tiling", false, true };
 		cfg::_bool log_programs{ this, "Log shader programs" };
 		cfg::_bool vsync{ this, "VSync" };
 		cfg::_bool debug_output{ this, "Debug output" };
-		cfg::_bool debug_overlay{ this, "Debug overlay", false, true };
+		cfg::_bool overlay{ this, "Debug overlay", false, true };
 		cfg::_bool renderdoc_compatiblity{ this, "Renderdoc Compatibility Mode" };
 		cfg::_bool use_gpu_texture_scaling{ this, "Use GPU texture scaling", false };
 		cfg::_bool stretch_to_display_area{ this, "Stretch To Display Area", false, true };
 		cfg::_bool force_high_precision_z_buffer{ this, "Force High Precision Z buffer" };
 		cfg::_bool strict_rendering_mode{ this, "Strict Rendering Mode" };
 		cfg::_bool disable_zcull_queries{ this, "Disable ZCull Occlusion Queries", false, true };
-		cfg::_bool disable_video_output{ this, "Disable Video Output", false, true };
 		cfg::_bool disable_vertex_cache{ this, "Disable Vertex Cache", false };
 		cfg::_bool disable_FIFO_reordering{ this, "Disable FIFO Reordering", false };
 		cfg::_bool frame_skip_enabled{ this, "Enable Frame Skip", false, true };
@@ -159,28 +151,22 @@ struct cfg_root : cfg::node
 		cfg::_bool disable_vulkan_mem_allocator{ this, "Disable Vulkan Memory Allocator", false };
 		cfg::_bool full_rgb_range_output{ this, "Use full RGB output range", true, true }; // Video out dynamic range
 		cfg::_bool strict_texture_flushing{ this, "Strict Texture Flushing", false };
+		cfg::_bool disable_native_float16{ this, "Disable native float16 support", false };
 		cfg::_bool multithreaded_rsx{ this, "Multithreaded RSX", false };
 		cfg::_bool relaxed_zcull_sync{ this, "Relaxed ZCULL Sync", false };
-		cfg::_bool force_hw_MSAA_resolve{ this, "Force Hardware MSAA Resolve", false, true };
-		cfg::_enum<stereo_render_mode_options> stereo_render_mode{ this, "3D Display Mode", stereo_render_mode_options::disabled };
+		cfg::_bool enable_3d{ this, "Enable 3D", false };
 		cfg::_bool debug_program_analyser{ this, "Debug Program Analyser", false };
-		cfg::_bool precise_zpass_count{ this, "Accurate ZCULL stats", true };
 		cfg::_int<1, 8> consecutive_frames_to_draw{ this, "Consecutive Frames To Draw", 1, true};
 		cfg::_int<1, 8> consecutive_frames_to_skip{ this, "Consecutive Frames To Skip", 1, true};
-		cfg::_int<25, 800> resolution_scale_percent{ this, "Resolution Scale", 100 };
+		cfg::_int<50, 800> resolution_scale_percent{ this, "Resolution Scale", 100 };
 		cfg::uint<0, 16> anisotropic_level_override{ this, "Anisotropic Filter Override", 0, true };
-		cfg::_float<-32, 32> texture_lod_bias{ this, "Texture LOD Bias Addend", 0, true };
+		cfg::_int<-16, 16> texture_lod_bias{ this, "Texture LOD Bias Addend", 0, true };
 		cfg::_int<1, 1024> min_scalable_dimension{ this, "Minimum Scalable Dimension", 16 };
 		cfg::_int<0, 16> shader_compiler_threads_count{ this, "Shader Compiler Threads", 0 };
 		cfg::_int<0, 30000000> driver_recovery_timeout{ this, "Driver Recovery Timeout", 1000000, true };
-		cfg::uint<0, 16667> driver_wakeup_delay{ this, "Driver Wake-Up Delay", 0, true };
-		cfg::_int<1, 6000> vblank_rate{ this, "Vblank Rate", 60, true }; // Changing this from 60 may affect game speed in unexpected ways
-		cfg::_bool vblank_ntsc{ this, "Vblank NTSC Fixup", false, true };
+		cfg::_int<0, 16667> driver_wakeup_delay{ this, "Driver Wake-Up Delay", 1, true };
+		cfg::_int<1, 1800> vblank_rate{ this, "Vblank Rate", 60, true }; // Changing this from 60 may affect game speed in unexpected ways
 		cfg::_bool decr_memory_layout{ this, "DECR memory layout", false}; // Force enable increased allowed main memory range as DECR console
-		cfg::_bool host_label_synchronization{ this, "Allow Host GPU Labels", false };
-		cfg::_bool disable_msl_fast_math{ this, "Disable MSL Fast Math", false };
-		cfg::_bool disable_async_host_memory_manager{ this, "Disable Asynchronous Memory Manager", false, true };
-		cfg::_enum<output_scaling_mode> output_scaling{ this, "Output Scaling Mode", output_scaling_mode::bilinear, true };
 
 		struct node_vk : cfg::node
 		{
@@ -189,11 +175,11 @@ struct cfg_root : cfg::node
 			cfg::string adapter{ this, "Adapter" };
 			cfg::_bool force_fifo{ this, "Force FIFO present mode" };
 			cfg::_bool force_primitive_restart{ this, "Force primitive restart flag" };
-			cfg::_enum<vk_exclusive_fs_mode> exclusive_fullscreen_mode{ this, "Exclusive Fullscreen Mode", vk_exclusive_fs_mode::unspecified};
+			cfg::_bool force_disable_exclusive_fullscreen_mode{ this, "Force Disable Exclusive Fullscreen Mode" };
 			cfg::_bool asynchronous_texture_streaming{ this, "Asynchronous Texture Streaming 2", false };
+			cfg::_bool fsr_upscaling{ this, "Enable FidelityFX Super Resolution Upscaling", false, true };
 			cfg::uint<0, 100> rcas_sharpening_intensity{ this, "FidelityFX CAS Sharpening Intensity", 50, true };
-			cfg::_enum<vk_gpu_scheduler_mode> asynchronous_scheduler{ this, "Asynchronous Queue Scheduler", vk_gpu_scheduler_mode::safe };
-			cfg::uint<256, 65536> vram_allocation_limit{ this, "VRAM allocation limit (MB)", 65536, false };
+			cfg::_enum<vk_gpu_scheduler_mode> asynchronous_scheduler{ this, "Asynchronous Queue Scheduler", vk_gpu_scheduler_mode::device };
 
 		} vk{ this };
 
@@ -225,6 +211,15 @@ struct cfg_root : cfg::node
 
 		} perf_overlay{ this };
 
+		struct node_shader_compilation_hint : cfg::node
+		{
+			node_shader_compilation_hint(cfg::node* _this) : cfg::node(_this, "Shader Compilation Hint") {}
+
+			cfg::_int<0, 1280> pos_x{ this, "Position X (px)", 20, true }; // horizontal position starting from the upper border in px
+			cfg::_int<0, 720> pos_y{ this, "Position Y (px)", 690, true }; // vertical position starting from the left border in px
+
+		} shader_compilation_hint{ this };
+
 		struct node_shader_preloading_dialog : cfg::node
 		{
 			node_shader_preloading_dialog(cfg::node* _this) : cfg::node(_this, "Shader Loading Dialog") {}
@@ -241,24 +236,27 @@ struct cfg_root : cfg::node
 	{
 		node_audio(cfg::node* _this) : cfg::node(_this, "Audio") {}
 
-		cfg::_enum<audio_renderer> renderer{ this, "Renderer", audio_renderer::cubeb, true };
-		cfg::_enum<audio_provider> provider{ this, "Audio Provider", audio_provider::cell_audio, false };
-		cfg::_enum<audio_avport> rsxaudio_port{ this, "RSXAudio Avport", audio_avport::hdmi_0, true };
-		cfg::_bool dump_to_file{ this, "Dump to file", false, true };
-		cfg::_bool convert_to_s16{ this, "Convert to 16 bit", false, true };
-		cfg::_enum<audio_format> format{ this, "Audio Format", audio_format::stereo, false };
-		cfg::uint<0, 0xFF> formats{ this, "Audio Formats", static_cast<u32>(audio_format_flag::lpcm_2_48khz), false };
-		cfg::_enum<audio_channel_layout> channel_layout{ this, "Audio Channel Layout", audio_channel_layout::automatic, false };
-		cfg::string audio_device{ this, "Audio Device", "@@@default@@@", true };
+		cfg::_enum<audio_renderer> renderer{ this, "Renderer",
+#ifdef _WIN32
+			audio_renderer::xaudio, true };
+#elif HAVE_FAUDIO
+			audio_renderer::faudio, true };
+#else
+			audio_renderer::openal, true };
+#endif
+
+		cfg::_bool dump_to_file{ this, "Dump to file" };
+		cfg::_bool convert_to_u16{ this, "Convert to 16 bit", false, true };
+		cfg::_enum<audio_downmix> audio_channel_downmix{ this, "Audio Channels", audio_downmix::downmix_to_stereo, true };
+		cfg::_int<1, 128> start_threshold{ this, "Start Threshold", 1, true }; // TODO: used only by ALSA, should probably be removed once ALSA is upgraded
 		cfg::_int<0, 200> volume{ this, "Master Volume", 100, true };
 		cfg::_bool enable_buffering{ this, "Enable Buffering", true, true };
 		cfg::_int <4, 250> desired_buffer_duration{ this, "Desired Audio Buffer Duration", 100, true };
+		cfg::_int<1, 1000> sampling_period_multiplier{ this, "Sampling Period Multiplier", 100, true };
 		cfg::_bool enable_time_stretching{ this, "Enable Time Stretching", false, true };
-		cfg::_bool disable_sampling_skip{ this, "Disable Sampling Skip", false, true };
 		cfg::_int<0, 100> time_stretching_threshold{ this, "Time Stretching Threshold", 75, true };
 		cfg::_enum<microphone_handler> microphone_type{ this, "Microphone Type", microphone_handler::null };
 		cfg::string microphone_devices{ this, "Microphone Devices", "@@@@@@@@@@@@" };
-		cfg::_enum<music_handler> music{ this, "Music Handler", music_handler::qt };
 	} audio{ this };
 
 	struct node_io : cfg::node
@@ -269,32 +267,12 @@ struct cfg_root : cfg::node
 		cfg::_enum<mouse_handler> mouse{ this, "Mouse", mouse_handler::basic };
 		cfg::_enum<camera_handler> camera{ this, "Camera", camera_handler::null };
 		cfg::_enum<fake_camera_type> camera_type{ this, "Camera type", fake_camera_type::unknown };
-		cfg::_enum<camera_flip> camera_flip_option{ this, "Camera flip", camera_flip::none, true };
-		cfg::string camera_id{ this, "Camera ID", "Default", true };
-		cfg::_enum<move_handler> move{ this, "Move", move_handler::null, true };
+		cfg::_enum<move_handler> move{ this, "Move", move_handler::null };
 		cfg::_enum<buzz_handler> buzz{ this, "Buzz emulated controller", buzz_handler::null };
-		cfg::_enum<turntable_handler> turntable{this, "Turntable emulated controller", turntable_handler::null};
-		cfg::_enum<ghltar_handler> ghltar{this, "GHLtar emulated controller", ghltar_handler::null};
-		cfg::_enum<pad_handler_mode> pad_mode{this, "Pad handler mode", pad_handler_mode::single_threaded, true};
-		cfg::_bool keep_pads_connected{this, "Keep pads connected", false, true};
-		cfg::uint<0, 100'000> pad_sleep{this, "Pad handler sleep (microseconds)", 1'000, true};
-		cfg::_bool background_input_enabled{this, "Background input enabled", true, true};
-		cfg::_bool show_move_cursor{this, "Show move cursor", false, true};
-		cfg::_bool paint_move_spheres{this, "Paint move spheres", false, true};
-		cfg::_bool allow_move_hue_set_by_game{this, "Allow move hue set by game", false, true};
-		cfg::_bool lock_overlay_input_to_player_one{this, "Lock overlay input to player one", false, true};
-		cfg::string midi_devices{this, "Emulated Midi devices", "ßßß@@@ßßß@@@ßßß@@@"};
-		cfg::_bool load_sdl_mappings{ this, "Load SDL GameController Mappings", true };
-		cfg::_bool debug_overlay{ this, "IO Debug overlay", false, true };
-		cfg::uint<1, 180> fake_move_rotation_cone_h{ this, "Fake Move Rotation Cone", 10, true };
-		cfg::uint<1, 180> fake_move_rotation_cone_v{ this, "Fake Move Rotation Cone (Vertical)", 10, true };
-
 	} io{ this };
 
 	struct node_sys : cfg::node
 	{
-		static std::string get_random_system_name();
-
 		node_sys(cfg::node* _this) : cfg::node(_this, "System") {}
 
 		cfg::_enum<CellSysutilLicenseArea> license_area{ this, "License Area", CellSysutilLicenseArea{1} }; // CELL_SYSUTIL_LICENSE_AREA_A
@@ -302,12 +280,7 @@ struct cfg_root : cfg::node
 		cfg::_enum<CellKbMappingType> keyboard_type{ this, "Keyboard Type", CellKbMappingType{0} }; // CELL_KB_MAPPING_101 = US
 		cfg::_enum<enter_button_assign> enter_button_assignment{ this, "Enter button assignment", enter_button_assign::cross };
 		cfg::_int<-60*60*24*365*100LL, 60*60*24*365*100LL> console_time_offset{ this, "Console time offset (s)", 0 }; // console time offset, limited to +/-100years
-		cfg::string system_name{this, "System Name", get_random_system_name()};
-		cfg::uint<0, umax> console_psid_high{this, "PSID high"};
-		cfg::uint<0, umax> console_psid_low{this, "PSID low"};
-		cfg::string hdd_model{this, "HDD Model Name", ""};
-		cfg::string hdd_serial{this, "HDD Serial Number", ""};
-		cfg::node_map_entry sup_argv{ this, "Process ARGV" };
+
 	} sys{ this };
 
 	struct node_net : cfg::node
@@ -316,48 +289,26 @@ struct cfg_root : cfg::node
 
 		cfg::_enum<np_internet_status> net_active{this, "Internet enabled", np_internet_status::disabled};
 		cfg::string ip_address{this, "IP address", "0.0.0.0"};
-		cfg::string bind_address{this, "Bind address", "0.0.0.0"};
 		cfg::string dns{this, "DNS address", "8.8.8.8"};
 		cfg::string swap_list{this, "IP swap list", ""};
-		cfg::_bool upnp_enabled{this, "UPNP Enabled", false};
 
 		cfg::_enum<np_psn_status> psn_status{this, "PSN status", np_psn_status::disabled};
-		cfg::string country{this, "PSN Country", "us"};
 	} net{this};
 
-	struct node_savestate : cfg::node
-	{
-		node_savestate(cfg::node* _this) : cfg::node(_this, "Savestate") {}
-
-		cfg::_bool start_paused{ this, "Start Paused", false }; // Pause on first frame
-		cfg::_bool suspend_emu{ this, "Suspend Emulation Savestate Mode", false }; // Close emulation when saving, delete save after loading
-		cfg::_bool compatible_mode{ this, "Compatible Savestate Mode", false }; // SPU emulation optimized for savestate compatibility (off by default for performance reasons)
-		cfg::_bool state_inspection_mode{ this, "Inspection Mode Savestates" }; // Save memory stored in executable files, thus allowing to view state without any files (for debugging)
-		cfg::_bool save_disc_game_data{ this, "Save Disc Game Data", false };
-	} savestate{this};
-
 	struct node_misc : cfg::node
 	{
 		node_misc(cfg::node* _this) : cfg::node(_this, "Miscellaneous") {}
 
 		cfg::_bool autostart{ this, "Automatically start games after boot", true, true };
 		cfg::_bool autoexit{ this, "Exit RPCS3 when process finishes", false, true };
-		cfg::_bool autopause{ this, "Pause emulation on RPCS3 focus loss", false, true };
 		cfg::_bool start_fullscreen{ this, "Start games in fullscreen mode", false, true };
 		cfg::_bool prevent_display_sleep{ this, "Prevent display sleep while running games", true, true };
 		cfg::_bool show_trophy_popups{ this, "Show trophy popups", true, true };
-		cfg::_bool show_rpcn_popups{ this, "Show RPCN popups", true, true };
 		cfg::_bool show_shader_compilation_hint{ this, "Show shader compilation hint", true, true };
-		cfg::_bool show_ppu_compilation_hint{ this, "Show PPU compilation hint", true, true };
-		cfg::_bool show_autosave_autoload_hint{ this, "Show autosave/autoload hint", false, true };
-		cfg::_bool show_pressure_intensity_toggle_hint{ this, "Show pressure intensity toggle hint", true, true };
-		cfg::_bool show_analog_limiter_toggle_hint{ this, "Show analog limiter toggle hint", true, true };
-		cfg::_bool show_mouse_and_keyboard_toggle_hint{ this, "Show mouse and keyboard toggle hint", true, true };
 		cfg::_bool use_native_interface{ this, "Use native user interface", true };
 		cfg::string gdb_server{ this, "GDB Server", "127.0.0.1:2345" };
 		cfg::_bool silence_all_logs{ this, "Silence All Logs", false, true };
 		cfg::string title_format{ this, "Window Title Format", "FPS: %F | %R | %V | %T [%t]", true };
-		cfg::_bool pause_during_home_menu{this, "Pause Emulation During Home Menu", false, false };
 
 	} misc{ this };
 
@@ -367,4 +318,3 @@ struct cfg_root : cfg::node
 };
 
 extern cfg_root g_cfg;
-extern cfg_root g_backup_cfg;
diff --git a/rpcs3/Emu/system_config_types.cpp b/rpcs3/Emu/system_config_types.cpp
index c01692b8a5..104a8940b6 100644
--- a/rpcs3/Emu/system_config_types.cpp
+++ b/rpcs3/Emu/system_config_types.cpp
@@ -10,7 +10,6 @@ void fmt_class_string<mouse_handler>::format(std::string& out, u64 arg)
 		{
 		case mouse_handler::null: return "Null";
 		case mouse_handler::basic: return "Basic";
-		case mouse_handler::raw: return "Raw";
 		}
 
 		return unknown;
@@ -40,17 +39,14 @@ void fmt_class_string<video_resolution>::format(std::string& out, u64 arg)
 	{
 		switch (value)
 		{
-		case video_resolution::_1080p: return "1920x1080";
-		case video_resolution::_1080i: return "1920x1080i";
-		case video_resolution::_720p: return "1280x720";
-		case video_resolution::_480p: return "720x480";
-		case video_resolution::_480i: return "720x480i";
-		case video_resolution::_576p: return "720x576";
-		case video_resolution::_576i: return "720x576i";
-		case video_resolution::_1600x1080p: return "1600x1080";
-		case video_resolution::_1440x1080p: return "1440x1080";
-		case video_resolution::_1280x1080p: return "1280x1080";
-		case video_resolution::_960x1080p: return "960x1080";
+		case video_resolution::_1080: return "1920x1080";
+		case video_resolution::_720: return "1280x720";
+		case video_resolution::_480: return "720x480";
+		case video_resolution::_576: return "720x576";
+		case video_resolution::_1600x1080: return "1600x1080";
+		case video_resolution::_1440x1080: return "1440x1080";
+		case video_resolution::_1280x1080: return "1280x1080";
+		case video_resolution::_960x1080: return "960x1080";
 		}
 
 		return unknown;
@@ -113,7 +109,13 @@ void fmt_class_string<audio_renderer>::format(std::string& out, u64 arg)
 #ifdef _WIN32
 		case audio_renderer::xaudio: return "XAudio2";
 #endif
-		case audio_renderer::cubeb: return "Cubeb";
+#ifdef HAVE_ALSA
+		case audio_renderer::alsa: return "ALSA";
+#endif
+#ifdef HAVE_PULSE
+		case audio_renderer::pulse: return "PulseAudio";
+#endif
+		case audio_renderer::openal: return "OpenAL";
 #ifdef HAVE_FAUDIO
 		case audio_renderer::faudio: return "FAudio";
 #endif
@@ -123,27 +125,6 @@ void fmt_class_string<audio_renderer>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
-void fmt_class_string<audio_channel_layout>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](audio_channel_layout value)
-	{
-		switch (value)
-		{
-		case audio_channel_layout::automatic: return "Automatic";
-		case audio_channel_layout::mono: return "Mono";
-		case audio_channel_layout::stereo: return "Stereo";
-		case audio_channel_layout::stereo_lfe: return "Stereo LFE";
-		case audio_channel_layout::quadraphonic: return "Quadraphonic";
-		case audio_channel_layout::quadraphonic_lfe: return "Quadraphonic LFE";
-		case audio_channel_layout::surround_5_1: return "Surround 5.1";
-		case audio_channel_layout::surround_7_1: return "Surround 7.1";
-		}
-
-		return unknown;
-	});
-}
-
 template <>
 void fmt_class_string<detail_level>::format(std::string& out, u64 arg)
 {
@@ -212,23 +193,6 @@ void fmt_class_string<tsx_usage>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
-void fmt_class_string<rsx_fifo_mode>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](rsx_fifo_mode value)
-	{
-		switch (value)
-		{
-		case rsx_fifo_mode::fast: return "Fast";
-		case rsx_fifo_mode::atomic: return "Atomic";
-		case rsx_fifo_mode::atomic_ordered: return "Ordered & Atomic";
-		case rsx_fifo_mode::as_ps3: return "PS3";
-		}
-
-		return unknown;
-	});
-}
-
 template <>
 void fmt_class_string<sleep_timers_accuracy_level>::format(std::string& out, u64 arg)
 {
@@ -283,8 +247,8 @@ void fmt_class_string<np_psn_status>::format(std::string& out, u64 arg)
 		switch (value)
 		{
 		case np_psn_status::disabled: return "Disconnected";
-		case np_psn_status::psn_fake: return "Simulated";
-		case np_psn_status::psn_rpcn: return "RPCN";
+		case np_psn_status::fake: return "Simulated";
+		case np_psn_status::rpcn: return "RPCN";
 		}
 
 		return unknown;
@@ -298,8 +262,8 @@ void fmt_class_string<spu_decoder_type>::format(std::string& out, u64 arg)
 	{
 		switch (type)
 		{
-		case spu_decoder_type::_static: return "Interpreter (static)";
-		case spu_decoder_type::dynamic: return "Interpreter (dynamic)";
+		case spu_decoder_type::precise: return "Interpreter (precise)";
+		case spu_decoder_type::fast: return "Interpreter (fast)";
 		case spu_decoder_type::asmjit: return "Recompiler (ASMJIT)";
 		case spu_decoder_type::llvm: return "Recompiler (LLVM)";
 		}
@@ -332,14 +296,11 @@ void fmt_class_string<frame_limit_type>::format(std::string& out, u64 arg)
 		switch (value)
 		{
 		case frame_limit_type::none: return "Off";
-		case frame_limit_type::_30: return "30";
+		case frame_limit_type::_59_94: return "59.94";
 		case frame_limit_type::_50: return "50";
 		case frame_limit_type::_60: return "60";
-		case frame_limit_type::_120: return "120";
-		case frame_limit_type::display_rate: return "Display";
+		case frame_limit_type::_30: return "30";
 		case frame_limit_type::_auto: return "Auto";
-		case frame_limit_type::_ps3: return "PS3 Native";
-		case frame_limit_type::infinite: return "Infinite";
 		}
 
 		return unknown;
@@ -373,22 +334,6 @@ void fmt_class_string<camera_handler>::format(std::string& out, u64 arg)
 		{
 		case camera_handler::null: return "Null";
 		case camera_handler::fake: return "Fake";
-		case camera_handler::qt: return "Qt";
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<music_handler>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-	{
-		switch (value)
-		{
-		case music_handler::null: return "Null";
-		case music_handler::qt: return "Qt";
 		}
 
 		return unknown;
@@ -412,23 +357,6 @@ void fmt_class_string<fake_camera_type>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
-void fmt_class_string<camera_flip>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-	{
-		switch (value)
-		{
-		case camera_flip::none: return "None";
-		case camera_flip::horizontal: return "Horizontal";
-		case camera_flip::vertical: return "Vertical";
-		case camera_flip::both: return "Both";
-		}
-
-		return unknown;
-	});
-}
-
 template <>
 void fmt_class_string<move_handler>::format(std::string& out, u64 arg)
 {
@@ -437,28 +365,8 @@ void fmt_class_string<move_handler>::format(std::string& out, u64 arg)
 		switch (value)
 		{
 		case move_handler::null: return "Null";
-		case move_handler::real: return "Real";
 		case move_handler::fake: return "Fake";
 		case move_handler::mouse: return "Mouse";
-		case move_handler::raw_mouse: return "Raw Mouse";
-#ifdef HAVE_LIBEVDEV
-		case move_handler::gun: return "Gun";
-#endif
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<pad_handler_mode>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-	{
-		switch (value)
-		{
-		case pad_handler_mode::single_threaded: return "Single-threaded";
-		case pad_handler_mode::multi_threaded: return "Multi-threaded";
 		}
 
 		return unknown;
@@ -481,38 +389,6 @@ void fmt_class_string<buzz_handler>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
-void fmt_class_string<turntable_handler>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-	{
-		switch (value)
-		{
-		case turntable_handler::null: return "Null";
-		case turntable_handler::one_controller: return "1 controller";
-		case turntable_handler::two_controllers: return "2 controllers";
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<ghltar_handler>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](auto value)
-	{
-		switch (value)
-		{
-		case ghltar_handler::null: return "Null";
-		case ghltar_handler::one_controller: return "1 controller";
-		case ghltar_handler::two_controllers: return "2 controllers";
-		}
-
-		return unknown;
-	});
-}
-
 template <>
 void fmt_class_string<ppu_decoder_type>::format(std::string& out, u64 arg)
 {
@@ -520,7 +396,8 @@ void fmt_class_string<ppu_decoder_type>::format(std::string& out, u64 arg)
 	{
 		switch (type)
 		{
-		case ppu_decoder_type::_static: return "Interpreter (static)";
+		case ppu_decoder_type::precise: return "Interpreter (precise)";
+		case ppu_decoder_type::fast: return "Interpreter (fast)";
 		case ppu_decoder_type::llvm: return "Recompiler (LLVM)";
 		}
 
@@ -546,51 +423,16 @@ void fmt_class_string<shader_mode>::format(std::string& out, u64 arg)
 }
 
 template <>
-void fmt_class_string<audio_provider>::format(std::string& out, u64 arg)
+void fmt_class_string<audio_downmix>::format(std::string& out, u64 arg)
 {
-	format_enum(out, arg, [](audio_provider value)
+	format_enum(out, arg, [](audio_downmix value)
 	{
 		switch (value)
 		{
-		case audio_provider::none: return "None";
-		case audio_provider::cell_audio: return "CellAudio";
-		case audio_provider::rsxaudio: return "RSXAudio";
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<audio_avport>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](audio_avport value)
-	{
-		switch (value)
-		{
-		case audio_avport::hdmi_0: return "HDMI 0";
-		case audio_avport::hdmi_1: return "HDMI 1";
-		case audio_avport::avmulti: return "AV multiout";
-		case audio_avport::spdif_0: return "SPDIF 0";
-		case audio_avport::spdif_1: return "SPDIF 1";
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<audio_format>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](audio_format value)
-	{
-		switch (value)
-		{
-		case audio_format::stereo: return "Stereo";
-		case audio_format::surround_5_1: return "Surround 5.1";
-		case audio_format::surround_7_1: return "Surround 7.1";
-		case audio_format::automatic: return "Automatic";
-		case audio_format::manual: return "Manual";
+		case audio_downmix::no_downmix: return "No downmix";
+		case audio_downmix::downmix_to_stereo: return "Downmix to Stereo";
+		case audio_downmix::downmix_to_5_1: return "Downmix to 5.1";
+		case audio_downmix::use_application_settings: return "Use application settings";
 		}
 
 		return unknown;
@@ -604,8 +446,8 @@ void fmt_class_string<vk_gpu_scheduler_mode>::format(std::string& out, u64 arg)
 	{
 		switch (value)
 		{
-		case vk_gpu_scheduler_mode::safe: return "Safe";
-		case vk_gpu_scheduler_mode::fast: return "Fast";
+		case vk_gpu_scheduler_mode::host: return "Host";
+		case vk_gpu_scheduler_mode::device: return "Device";
 		}
 
 		return unknown;
@@ -627,92 +469,3 @@ void fmt_class_string<thread_scheduler_mode>::format(std::string& out, u64 arg)
 		return unknown;
 	});
 }
-
-template <>
-void fmt_class_string<gpu_preset_level>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](gpu_preset_level value)
-	{
-		switch (value)
-		{
-		case gpu_preset_level::_auto: return "Auto";
-		case gpu_preset_level::ultra: return "Ultra";
-		case gpu_preset_level::high: return "High";
-		case gpu_preset_level::low: return "Low";
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<vk_exclusive_fs_mode>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](vk_exclusive_fs_mode value)
-		{
-			switch (value)
-			{
-			case vk_exclusive_fs_mode::unspecified: return "Automatic";
-			case vk_exclusive_fs_mode::disable: return "Disable";
-			case vk_exclusive_fs_mode::enable: return "Enable";
-			}
-
-			return unknown;
-		});
-}
-
-template <>
-void fmt_class_string<stereo_render_mode_options>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](stereo_render_mode_options value)
-		{
-			switch (value)
-			{
-			case stereo_render_mode_options::disabled: return "Disabled";
-			case stereo_render_mode_options::side_by_side: return "Side-by-Side";
-			case stereo_render_mode_options::over_under: return "Over-Under";
-			case stereo_render_mode_options::interlaced: return "Interlaced";
-			case stereo_render_mode_options::anaglyph_red_green: return "Anaglyph Red-Green";
-			case stereo_render_mode_options::anaglyph_red_blue: return "Anaglyph Red-Blue";
-			case stereo_render_mode_options::anaglyph_red_cyan: return "Anaglyph Red-Cyan";
-			case stereo_render_mode_options::anaglyph_magenta_cyan: return "Anaglyph Magenta-Cyan";
-			case stereo_render_mode_options::anaglyph_trioscopic: return "Anaglyph Trioscopic";
-			case stereo_render_mode_options::anaglyph_amber_blue: return "Anaglyph Amber-Blue";
-			}
-
-			return unknown;
-		});
-}
-
-template <>
-void fmt_class_string<output_scaling_mode>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](output_scaling_mode value)
-	{
-		switch (value)
-		{
-		case output_scaling_mode::nearest: return "Nearest";
-		case output_scaling_mode::bilinear: return "Bilinear";
-		case output_scaling_mode::fsr: return "FidelityFX Super Resolution";
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<xfloat_accuracy>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](xfloat_accuracy value)
-	{
-		switch (value)
-		{
-		case xfloat_accuracy::accurate: return "Accurate";
-		case xfloat_accuracy::approximate: return "Approximate";
-		case xfloat_accuracy::relaxed: return "Relaxed";
-		case xfloat_accuracy::inaccurate: return "Inaccurate";
-		}
-
-		return unknown;
-	});
-}
diff --git a/rpcs3/Emu/system_config_types.h b/rpcs3/Emu/system_config_types.h
index 9459ba698d..6a8c87f772 100644
--- a/rpcs3/Emu/system_config_types.h
+++ b/rpcs3/Emu/system_config_types.h
@@ -2,14 +2,15 @@
 
 enum class ppu_decoder_type : unsigned
 {
-	_static,
+	precise = 0, // Don't change (0)
+	fast, // Don't change (1)
 	llvm,
 };
 
 enum class spu_decoder_type : unsigned
 {
-	_static,
-	dynamic,
+	precise = 0, // Don't change (0)
+	fast, // Don't change (1)
 	asmjit,
 	llvm,
 };
@@ -38,7 +39,6 @@ enum class mouse_handler
 {
 	null,
 	basic,
-	raw
 };
 
 enum class video_renderer
@@ -54,77 +54,30 @@ enum class audio_renderer
 #ifdef _WIN32
 	xaudio,
 #endif
-	cubeb,
+#ifdef HAVE_ALSA
+	alsa,
+#endif
+	openal,
+#ifdef HAVE_PULSE
+	pulse,
+#endif
 #ifdef HAVE_FAUDIO
 	faudio,
 #endif
 };
 
-enum class audio_provider
+enum class audio_downmix
 {
-	none,
-	cell_audio,
-	rsxaudio
-};
-
-enum class audio_avport
-{
-	hdmi_0,
-	hdmi_1,
-	avmulti,
-	spdif_0,
-	spdif_1
-};
-
-enum class audio_format
-{
-	stereo,
-	surround_5_1,
-	surround_7_1,
-	automatic,
-	manual,
-};
-
-enum class audio_format_flag : unsigned
-{
-	lpcm_2_48khz   = 0x00000000, // Linear PCM 2 Ch. 48 kHz (always available)
-	lpcm_5_1_48khz = 0x00000001, // Linear PCM 5.1 Ch. 48 kHz
-	lpcm_7_1_48khz = 0x00000002, // Linear PCM 7.1 Ch. 48 kHz
-	ac3            = 0x00000004, // Dolby Digital 5.1 Ch.
-	dts            = 0x00000008, // DTS 5.1 Ch.
-};
-
-enum class audio_channel_layout
-{
-	automatic,
-	mono,
-	stereo,
-	stereo_lfe,
-	quadraphonic,
-	quadraphonic_lfe,
-	surround_5_1,
-	surround_7_1,
-};
-
-enum class music_handler
-{
-	null,
-	qt
+	no_downmix, // Surround 7.1
+	downmix_to_stereo,
+	downmix_to_5_1,
+	use_application_settings
 };
 
 enum class camera_handler
 {
 	null,
 	fake,
-	qt
-};
-
-enum class camera_flip
-{
-	none,
-	horizontal,
-	vertical,
-	both
 };
 
 enum class fake_camera_type
@@ -138,13 +91,8 @@ enum class fake_camera_type
 enum class move_handler
 {
 	null,
-	real,
 	fake,
 	mouse,
-	raw_mouse,
-#ifdef HAVE_LIBEVDEV
-	gun
-#endif
 };
 
 enum class buzz_handler
@@ -154,20 +102,6 @@ enum class buzz_handler
 	two_controllers,
 };
 
-enum class turntable_handler
-{
-	null,
-	one_controller,
-	two_controllers,
-};
-
-enum class ghltar_handler
-{
-	null,
-	one_controller,
-	two_controllers,
-};
-
 enum class microphone_handler
 {
 	null,
@@ -177,25 +111,16 @@ enum class microphone_handler
 	rocksmith,
 };
 
-enum class pad_handler_mode
-{
-	single_threaded, // All pad handlers run on the same thread sequentially.
-	multi_threaded   // Each pad handler has its own thread.
-};
-
 enum class video_resolution
 {
-	_1080p,
-	_1080i,
-	_720p,
-	_480p,
-	_480i,
-	_576p,
-	_576i,
-	_1600x1080p,
-	_1440x1080p,
-	_1280x1080p,
-	_960x1080p,
+	_1080,
+	_720,
+	_480,
+	_576,
+	_1600x1080,
+	_1440x1080,
+	_1280x1080,
+	_960x1080,
 };
 
 enum class video_aspect
@@ -207,14 +132,11 @@ enum class video_aspect
 enum class frame_limit_type
 {
 	none,
-	_30,
+	_59_94,
 	_50,
 	_60,
-	_120,
-	display_rate,
+	_30,
 	_auto,
-	_ps3,
-	infinite,
 };
 
 enum class msaa_level
@@ -240,14 +162,6 @@ enum class screen_quadrant
 	bottom_right
 };
 
-enum class rsx_fifo_mode : unsigned
-{
-	fast,
-	atomic,
-	atomic_ordered,
-	as_ps3,
-};
-
 enum class tsx_usage
 {
 	disabled,
@@ -267,11 +181,11 @@ enum class np_internet_status
 	enabled,
 };
 
-enum class np_psn_status
+enum np_psn_status
 {
 	disabled,
-	psn_fake,
-	psn_rpcn,
+	fake,
+	rpcn,
 };
 
 enum class shader_mode
@@ -282,17 +196,10 @@ enum class shader_mode
 	interpreter_only
 };
 
-enum class vk_exclusive_fs_mode
-{
-	unspecified,
-	disable,
-	enable
-};
-
 enum class vk_gpu_scheduler_mode
 {
-	safe,
-	fast
+	host,
+	device
 };
 
 enum class thread_scheduler_mode
@@ -309,48 +216,3 @@ enum class perf_graph_detail_level
 	show_one_percent_avg,
 	show_all
 };
-
-enum class zcull_precision_level
-{
-	precise,
-	approximate,
-	relaxed,
-	undefined
-};
-
-enum class gpu_preset_level
-{
-	ultra,
-	high,
-	low,
-	_auto
-};
-
-enum class output_scaling_mode
-{
-	nearest,
-	bilinear,
-	fsr
-};
-
-enum class stereo_render_mode_options
-{
-	disabled,
-	side_by_side,
-	over_under,
-	interlaced,
-	anaglyph_red_green,
-	anaglyph_red_blue,
-	anaglyph_red_cyan,
-	anaglyph_magenta_cyan,
-	anaglyph_trioscopic,
-	anaglyph_amber_blue,
-};
-
-enum class xfloat_accuracy
-{
-	accurate,
-	approximate,
-	relaxed, // Approximate accuracy for only the "FCGT", "FNMS", "FREST" AND "FRSQEST" instructions
-	inaccurate
-};
diff --git a/rpcs3/Emu/system_progress.cpp b/rpcs3/Emu/system_progress.cpp
index 52e49516fb..092ca399d2 100644
--- a/rpcs3/Emu/system_progress.cpp
+++ b/rpcs3/Emu/system_progress.cpp
@@ -2,32 +2,19 @@
 #include "system_progress.hpp"
 #include "Emu/Cell/Modules/cellMsgDialog.h"
 #include "Emu/RSX/RSXThread.h"
-#include "Emu/RSX/Overlays/overlay_manager.h"
 #include "Emu/RSX/Overlays/overlay_message_dialog.h"
-#include "Emu/RSX/Overlays/overlay_message.h"
-#include "Emu/RSX/Overlays/overlay_compile_notification.h"
 #include "Emu/System.h"
 
-#include "util/asm.hpp"
-
-LOG_CHANNEL(sys_log, "SYS");
-
 // Progress display server synchronization variables
-lf_array<atomic_ptr<std::string>> g_progr_text_queue;
-progress_dialog_string_t g_progr_text{};
+atomic_t<const char*> g_progr{nullptr};
 atomic_t<u32> g_progr_ftotal{0};
 atomic_t<u32> g_progr_fdone{0};
-atomic_t<u64> g_progr_ftotal_bits{0};
-atomic_t<u64> g_progr_fknown_bits{0};
 atomic_t<u32> g_progr_ptotal{0};
 atomic_t<u32> g_progr_pdone{0};
 
 // For Batch PPU Compilation
 atomic_t<bool> g_system_progress_canceled{false};
 
-// For showing feedback while stopping emulation
-atomic_t<system_progress_stop_state> g_system_progress_stopping{system_progress_stop_state::stop_state_disabled};
-
 namespace rsx::overlays
 {
 	class progress_dialog : public message_dialog
@@ -39,105 +26,23 @@ namespace rsx::overlays
 
 void progress_dialog_server::operator()()
 {
-	std::shared_ptr<rsx::overlays::progress_dialog> native_dlg;
-	g_system_progress_stopping = system_progress_stop_state::stop_state_disabled;
-	g_system_progress_canceled = false;
-
-	const auto get_state = []()
-	{
-		auto whole_state = std::make_tuple(g_progr_text.operator std::string(), +g_progr_ftotal, +g_progr_fdone, +g_progr_ftotal_bits, +g_progr_fknown_bits, +g_progr_ptotal, +g_progr_pdone);
-
-		while (true)
-		{
-			auto new_state = std::make_tuple(g_progr_text.operator std::string(), +g_progr_ftotal, +g_progr_fdone, +g_progr_ftotal_bits, +g_progr_fknown_bits, +g_progr_ptotal, +g_progr_pdone);
-
-			if (new_state == whole_state)
-			{
-				// Only leave while it has a complete (atomic) state
-				return whole_state;
-			}
-
-			whole_state = std::move(new_state);
-		}
-
-		return whole_state;
-	};
-
-	const auto create_native_dialog = [&native_dlg](const std::string& text, bool* show_overlay_message)
-	{
-		if (const auto renderer = rsx::get_current_renderer())
-		{
-			// Some backends like OpenGL actually initialize a lot of driver objects in the "on_init" method.
-			// Wait for init to complete within reasonable time. Abort just in case we have hardware/driver issues.
-			renderer->is_initialized.wait(0, atomic_wait_timeout(5 * 1000000000ull));
-
-			auto manager = g_fxo->try_get<rsx::overlays::display_manager>();
-
-			if (show_overlay_message)
-			{
-				*show_overlay_message = g_fxo->get<progress_dialog_workaround>().show_overlay_message_only;
-				if (*show_overlay_message)
-				{
-					return;
-				}
-			}
-
-			if (manager)
-			{
-				MsgDialogType type{};
-				type.se_mute_on         = true;
-				type.se_normal          = true;
-				type.bg_invisible       = true;
-				type.disable_cancel     = true;
-				type.progress_bar_count = 1;
-
-				native_dlg = manager->create<rsx::overlays::progress_dialog>(true);
-				native_dlg->show(false, text, type, msg_dialog_source::sys_progress, nullptr);
-				native_dlg->progress_bar_set_message(0, get_localized_string(localized_string_id::PROGRESS_DIALOG_PLEASE_WAIT));
-			}
-		}
-	};
-
-	while (!g_system_progress_stopping && thread_ctrl::state() != thread_state::aborting)
+	while (thread_ctrl::state() != thread_state::aborting)
 	{
 		// Wait for the start condition
-		std::string text0 = g_progr_text;
+		auto text0 = +g_progr;
 
-		while (text0.empty())
+		while (!text0)
 		{
-			if (g_system_progress_stopping || thread_ctrl::state() == thread_state::aborting)
+			if (thread_ctrl::state() == thread_state::aborting)
 			{
 				break;
 			}
 
-			if (g_progr_ftotal || g_progr_fdone || g_progr_ptotal || g_progr_pdone)
-			{
-				const auto [text_new, ftotal, fdone, ftotal_bits, fknown_bits, ptotal, pdone] = get_state();
-
-				if (!text_new.empty())
-				{
-					text0 = text_new;
-					break;
-				}
-
-				if ((ftotal || ptotal) && ftotal == fdone && ptotal == pdone)
-				{
-					// Cleanup (missed message but do not cry over spilt milk)
-					g_progr_fdone -= fdone;
-					g_progr_pdone -= pdone;
-					g_progr_ftotal_bits -= ftotal_bits;
-					g_progr_fknown_bits -= fknown_bits;
-					g_progr_ftotal -= ftotal;
-					g_progr_ptotal -= ptotal;
-					g_progr_ptotal.notify_all();
-				}
-			}
-
-			thread_ctrl::wait_for(5000);
-			text0 = g_progr_text;
+			std::this_thread::sleep_for(5ms);
+			text0 = +g_progr;
 		}
 
-		if (g_system_progress_stopping || thread_ctrl::state() == thread_state::aborting)
+		if (thread_ctrl::state() == thread_state::aborting)
 		{
 			break;
 		}
@@ -145,271 +50,140 @@ void progress_dialog_server::operator()()
 		g_system_progress_canceled = false;
 
 		// Initialize message dialog
-		bool show_overlay_message = false; // Only show an overlay message after initial loading is done.
+		bool skip_this_one = false; // Workaround: do not open a progress dialog if there is already a cell message dialog open.
 		std::shared_ptr<MsgDialogBase> dlg;
+		std::shared_ptr<rsx::overlays::progress_dialog> native_dlg;
 
-		create_native_dialog(text0, &show_overlay_message);
-
-		if (!show_overlay_message && !native_dlg && (dlg = Emu.GetCallbacks().get_msg_dialog()))
+		if (const auto renderer = rsx::get_current_renderer();
+		    renderer && renderer->is_inited)
 		{
+			auto manager  = g_fxo->try_get<rsx::overlays::display_manager>();
+			skip_this_one = g_fxo->get<progress_dialog_workaround>().skip_the_progress_dialog || (manager && manager->get<rsx::overlays::message_dialog>());
+
+			if (manager && !skip_this_one)
+			{
+				MsgDialogType type{};
+				type.se_normal          = true;
+				type.bg_invisible       = true;
+				type.disable_cancel     = true;
+				type.progress_bar_count = 1;
+
+				native_dlg = manager->create<rsx::overlays::progress_dialog>(true);
+				native_dlg->show(false, text0, type, nullptr);
+				native_dlg->progress_bar_set_message(0, "Please wait");
+			}
+		}
+
+		if (!skip_this_one && !native_dlg)
+		{
+			dlg                          = Emu.GetCallbacks().get_msg_dialog();
 			dlg->type.se_normal          = true;
 			dlg->type.bg_invisible       = true;
 			dlg->type.progress_bar_count = 1;
 			dlg->on_close = [](s32 /*status*/)
 			{
-				Emu.CallFromMainThread([]()
+				Emu.CallAfter([]()
 				{
 					// Abort everything
-					sys_log.notice("Aborted progress dialog");
-					Emu.GracefulShutdown(false, true);
+					Emu.Stop();
 				});
 
 				g_system_progress_canceled = true;
 			};
 
-			Emu.CallFromMainThread([dlg, text0]()
+			Emu.CallAfter([dlg, text0]()
 			{
 				dlg->Create(text0, text0);
 			});
 		}
 
 		u32 ftotal = 0;
-		u32 fdone = 0;
-		u64 fknown_bits = 0;
-		u64 ftotal_bits = 0;
+		u32 fdone  = 0;
 		u32 ptotal = 0;
-		u32 pdone = 0;
-		std::string text1;
-
-		const u64 start_time = get_system_time();
-		u64 wait_no_update_count = 0;
-
-		std::shared_ptr<atomic_t<u32>> ppu_cue_refs;
-
-		std::vector<std::pair<u64, u64>> time_left_queue(1024);
-		usz time_left_queue_idx = 0;
+		u32 pdone  = 0;
+		auto text1 = text0;
 
 		// Update progress
-		for (u64 sleep_until = get_system_time(), sleep_for = 500;
-			!g_system_progress_stopping && thread_ctrl::state() != thread_state::aborting;
-			thread_ctrl::wait_until(&sleep_until, std::exchange(sleep_for, 500)))
+		while (thread_ctrl::state() != thread_state::aborting)
 		{
-			const auto [text_new, ftotal_new, fdone_new, ftotal_bits_new, fknown_bits_new, ptotal_new, pdone_new] = get_state();
+			const auto text_new = g_progr.load();
 
-			// Force-update every 20 seconds to update remaining time
-			if (wait_no_update_count == 100u * 20 || ftotal != ftotal_new || fdone != fdone_new || fknown_bits != fknown_bits_new
-				|| ftotal_bits != ftotal_bits_new || ptotal != ptotal_new || pdone != pdone_new || text_new != text1)
+			const u32 ftotal_new = g_progr_ftotal;
+			const u32 fdone_new  = g_progr_fdone;
+			const u32 ptotal_new = g_progr_ptotal;
+			const u32 pdone_new  = g_progr_pdone;
+
+			if (ftotal != ftotal_new || fdone != fdone_new || ptotal != ptotal_new || pdone != pdone_new || text_new != text1)
 			{
-				wait_no_update_count = 0;
 				ftotal = ftotal_new;
 				fdone  = fdone_new;
-				ftotal_bits = ftotal_bits_new;
-				fknown_bits = fknown_bits_new;
 				ptotal = ptotal_new;
 				pdone  = pdone_new;
+				text1  = text_new;
 
-				const bool text_changed = !text_new.empty() && text_new != text1;
-
-				if (!text_new.empty())
+				if (!text_new)
 				{
-					text1 = text_new;
+					// Close dialog
+					break;
 				}
 
-				if (text1.empty())
+				if (skip_this_one)
 				{
-					// Cannot do anything
-					continue;
-				}
-
-				if (show_overlay_message)
-				{
-					// Show a message instead (if compilation period is estimated to be lengthy)
-					if (pdone < ptotal && g_cfg.misc.show_ppu_compilation_hint)
-					{
-						const u64 passed_usec = (get_system_time() - start_time);
-						const u64 remaining_usec = pdone ? utils::rational_mul<u64>(passed_usec, static_cast<u64>(ptotal) - pdone, pdone) : (passed_usec * ptotal);
-
-						// Only show compile notification if we estimate at least 100ms
-						if (remaining_usec >= 100'000ULL)
-						{
-							if (!ppu_cue_refs || !*ppu_cue_refs)
-							{
-								ppu_cue_refs = rsx::overlays::show_ppu_compile_notification();
-							}
-
-							// Make sure to update any pending messages. PPU compilation may freeze the image.
-							rsx::overlays::refresh_message_queue();
-						}
-					}
-
-					if (pdone >= ptotal)
-					{
-						if (ppu_cue_refs)
-						{
-							*ppu_cue_refs = 0;
-							ppu_cue_refs.reset();
-
-							rsx::overlays::refresh_message_queue();
-						}
-					}
-
-					sleep_for = 10000;
+					// Do nothing
+					std::this_thread::sleep_for(10ms);
 					continue;
 				}
 
 				// Compute new progress in percents
 				// Assume not all programs were found if files were not compiled (as it may contain more)
-				const bool use_bits = fknown_bits && ftotal_bits;
-				const u64 known_files = use_bits ? fknown_bits : ftotal;
-				const u64 total = utils::rational_mul<u64>(std::max<u64>(ptotal, 1), std::max<u64>(use_bits ? ftotal_bits : ftotal, 1), std::max<u64>(known_files, 1));
-				const u64 done  = pdone;
-				const u32 value = static_cast<u32>(done >= total ? 100 : done * 100 / total);
+				const u64 total    = std::max<u64>(ptotal, 1) * std::max<u64>(ftotal, 1);
+				const u64 done     = pdone * std::max<u64>(fdone, 1);
+				const double value = std::fmin(done * 100. / total, 100.);
 
-				std::string progr;
+				std::string progr = "Progress:";
 
-				if (ftotal || ptotal)
-				{
-					progr = get_localized_string(localized_string_id::PROGRESS_DIALOG_PROGRESS);
-
-					if (ftotal)
-						fmt::append(progr, " %s %u %s %u%s", get_localized_string(localized_string_id::PROGRESS_DIALOG_FILE), fdone, get_localized_string(localized_string_id::PROGRESS_DIALOG_OF), ftotal, ptotal ? "," : "");
-					if (ptotal)
-						fmt::append(progr, " %s %u %s %u", get_localized_string(localized_string_id::PROGRESS_DIALOG_MODULE), pdone, get_localized_string(localized_string_id::PROGRESS_DIALOG_OF), ptotal);
-
-					const u32 of_1000 = static_cast<u32>(done >= total ? 1000 : done * 1000 / total);
-
-					if (of_1000 >= 2)
-					{
-						const u64 passed = (get_system_time() - start_time);
-						const u64 total = utils::rational_mul<u64>(passed, 1000, of_1000);
-						const u64 remaining = total - passed;
-
-						// Stabilize the result by using the maximum one from the recent history
-						// This is a very simple approach yet appears to solve most inconsistencies
-						u64 max_remaining = remaining;
-
-						for (usz i = 0; i < time_left_queue.size(); i++)
-						{
-							const auto& sample = time_left_queue[(time_left_queue.size() + time_left_queue_idx - i) % time_left_queue.size()];
-
-							const u64 sample_age = passed - sample.first;
-
-							if (passed - sample.first >= 4'000'000)
-							{
-								// Ignore old samples
-								break;
-							}
-
-							max_remaining = std::max<u64>(max_remaining, sample.second >= sample_age ? sample.second - sample_age : 0);
-						}
-
-						if (auto new_val = std::make_pair(passed, remaining); time_left_queue[time_left_queue_idx] != new_val)
-						{
-							time_left_queue_idx = (time_left_queue_idx + 1) % time_left_queue.size();
-							time_left_queue[time_left_queue_idx] = new_val;
-						}
-
-						const u64 max_seconds_remaining = max_remaining / 1'000'000;
-						const u64 seconds = max_seconds_remaining % 60;
-						const u64 minutes = (max_seconds_remaining / 60) % 60;
-						const u64 hours = (max_seconds_remaining / 3600);
-
-						if (passed < 4'000'000)
-						{
-							// Cannot rely on such small duration of time for estimation
-						}
-						else if (done >= total)
-						{
-							fmt::append(progr, " (%s)", get_localized_string(localized_string_id::PROGRESS_DIALOG_DONE));
-						}
-						else if (hours)
-						{
-							fmt::append(progr, " (%uh %2um %s)", hours, minutes, get_localized_string(localized_string_id::PROGRESS_DIALOG_REMAINING));
-						}
-						else if (minutes >= 2)
-						{
-							fmt::append(progr, " (%um %s)", minutes, get_localized_string(localized_string_id::PROGRESS_DIALOG_REMAINING));
-						}
-						else if (minutes == 0)
-						{
-							fmt::append(progr, " (%us %s)", std::max<u64>(seconds, 1), get_localized_string(localized_string_id::PROGRESS_DIALOG_REMAINING));
-						}
-						else
-						{
-							fmt::append(progr, " (%um %2us %s)", minutes, seconds, get_localized_string(localized_string_id::PROGRESS_DIALOG_REMAINING));
-						}
-					}
-				}
-				else
-				{
-					progr = get_localized_string(localized_string_id::PROGRESS_DIALOG_PROGRESS_ANALYZING);
-				}
+				if (ftotal)
+					fmt::append(progr, " file %u of %u%s", fdone, ftotal, ptotal ? "," : "");
+				if (ptotal)
+					fmt::append(progr, " module %u of %u", pdone, ptotal);
 
 				// Changes detected, send update
 				if (native_dlg)
 				{
-					if (text_changed)
-					{
-						native_dlg->set_text(text1);
-					}
-
-					native_dlg->progress_bar_set_message(0, std::move(progr));
-					native_dlg->progress_bar_set_value(0, static_cast<f32>(value));
+					native_dlg->set_text(text_new);
+					native_dlg->progress_bar_set_message(0, progr);
+					native_dlg->progress_bar_set_value(0, std::floor(value));
 				}
 				else if (dlg)
 				{
-					Emu.CallFromMainThread([=]()
+					Emu.CallAfter([=]()
 					{
-						if (text_changed)
-						{
-							dlg->SetMsg(text1);
-						}
-
+						dlg->SetMsg(text_new);
 						dlg->ProgressBarSetMsg(0, progr);
-						dlg->ProgressBarSetValue(0, value);
+						dlg->ProgressBarSetValue(0, std::floor(value));
 					});
 				}
 			}
 
-			if (show_overlay_message)
-			{
-				// Make sure to update any pending messages. PPU compilation may freeze the image.
-				rsx::overlays::refresh_message_queue();
-			}
-
-			// Leave only if total count is equal to done count
-			if (ftotal == fdone && ptotal == pdone && text_new.empty())
-			{
-				// Complete state, empty message: close dialog
-				break;
-			}
-
-			sleep_for = 10'000;
-			wait_no_update_count++;
+			std::this_thread::sleep_for(10ms);
 		}
 
-		if (ppu_cue_refs)
-		{
-			*ppu_cue_refs = 0;
-		}
-
-		if (g_system_progress_stopping || thread_ctrl::state() == thread_state::aborting)
+		if (thread_ctrl::state() == thread_state::aborting)
 		{
 			break;
 		}
 
-		if (show_overlay_message)
+		if (skip_this_one)
 		{
 			// Do nothing
 		}
 		else if (native_dlg)
 		{
 			native_dlg->close(false, false);
-			native_dlg.reset();
 		}
 		else if (dlg)
 		{
-			Emu.CallFromMainThread([=]()
+			Emu.CallAfter([=]()
 			{
 				dlg->Close(true);
 			});
@@ -418,47 +192,17 @@ void progress_dialog_server::operator()()
 		// Cleanup
 		g_progr_fdone -= fdone;
 		g_progr_pdone -= pdone;
-		g_progr_ftotal_bits -= ftotal_bits;
-		g_progr_fknown_bits -= fknown_bits;
 		g_progr_ftotal -= ftotal;
 		g_progr_ptotal -= ptotal;
 		g_progr_ptotal.notify_all();
 	}
-
-	if (g_system_progress_stopping)
-	{
-		const std::string text = get_localized_string(
-			g_system_progress_stopping == system_progress_stop_state::stop_state_continuous_savestate
-				? localized_string_id::PROGRESS_DIALOG_SAVESTATE_PLEASE_WAIT
-				: localized_string_id::PROGRESS_DIALOG_STOPPING_PLEASE_WAIT
-		);
-		if (native_dlg)
-		{
-			native_dlg->set_text(text);
-		}
-		else
-		{
-			create_native_dialog(text, nullptr);
-		}
-		if (native_dlg)
-		{
-			native_dlg->refresh();
-		}
-	}
-
-	if (g_progr_ptotal.exchange(0))
-	{
-		g_progr_ptotal.notify_all();
-	}
 }
 
 progress_dialog_server::~progress_dialog_server()
 {
 	g_progr_ftotal.release(0);
 	g_progr_fdone.release(0);
-	g_progr_ftotal_bits.release(0);
-	g_progr_fknown_bits.release(0);
 	g_progr_ptotal.release(0);
 	g_progr_pdone.release(0);
-	g_progr_text.data.release(std::common_type_t<progress_dialog_string_t::data_t>{});
+	g_progr.release(nullptr);
 }
diff --git a/rpcs3/Emu/system_progress.hpp b/rpcs3/Emu/system_progress.hpp
index 67e4e68df1..b9b1422e4a 100644
--- a/rpcs3/Emu/system_progress.hpp
+++ b/rpcs3/Emu/system_progress.hpp
@@ -2,73 +2,34 @@
 
 #include "util/types.hpp"
 #include "util/atomic.hpp"
-#include "Utilities/lockless.h"
-#include "util/shared_ptr.hpp"
 
-extern lf_array<atomic_ptr<std::string>> g_progr_text_queue;
-
-struct alignas(16) progress_dialog_string_t
-{
-	struct alignas(16) data_t
-	{
-		usz update_id = 0;
-		u32 text_index = umax;
-		u32 text_count = 0;
-	};
-
-	atomic_t<data_t> data{};
-
-	shared_ptr<std::string> get_string_ptr() const noexcept;
-
-	operator std::string() const noexcept
-	{
-		if (shared_ptr<std::string> ptr = get_string_ptr())
-		{
-			return *ptr;
-		}
-
-		return {};
-	}
-
-	explicit operator bool() const noexcept
-	{
-		return data.load().text_count != 0;
-	}
-};
-
-enum system_progress_stop_state : u32
-{
-	stop_state_disabled = 0,
-	stop_state_stopping,
-	stop_state_continuous_savestate
-};
-
-extern progress_dialog_string_t g_progr_text;
+extern atomic_t<const char*> g_progr;
 extern atomic_t<u32> g_progr_ftotal;
 extern atomic_t<u32> g_progr_fdone;
-extern atomic_t<u64> g_progr_ftotal_bits;
-extern atomic_t<u64> g_progr_fknown_bits;
 extern atomic_t<u32> g_progr_ptotal;
 extern atomic_t<u32> g_progr_pdone;
 extern atomic_t<bool> g_system_progress_canceled;
-extern atomic_t<system_progress_stop_state> g_system_progress_stopping;
 
 // Initialize progress dialog (can be recursive)
 class scoped_progress_dialog final
 {
-private:
-	u32 m_text_index = 0;
+	// Saved previous value
+	const char* const m_prev;
 
 public:
-	scoped_progress_dialog(std::string text) noexcept;
+	scoped_progress_dialog(const char* text)
+		: m_prev(g_progr.exchange(text ? text : ""))
+	{
+	}
 
 	scoped_progress_dialog(const scoped_progress_dialog&) = delete;
 
 	scoped_progress_dialog& operator=(const scoped_progress_dialog&) = delete;
 
-	scoped_progress_dialog& operator=(std::string text) noexcept;
-
-	~scoped_progress_dialog() noexcept;
+	~scoped_progress_dialog()
+	{
+		g_progr.release(m_prev);
+	}
 };
 
 struct progress_dialog_server
@@ -76,11 +37,5 @@ struct progress_dialog_server
 	void operator()();
 	~progress_dialog_server();
 
-	static constexpr auto thread_name = "Progress Dialog Server"sv;
-};
-
-struct progress_dialog_workaround
-{
-	// We don't want to show the native dialog during gameplay.
-	atomic_t<bool> show_overlay_message_only = false;
+	static auto constexpr thread_name = "Progress Dialog Server"sv;
 };
diff --git a/rpcs3/Emu/system_utils.cpp b/rpcs3/Emu/system_utils.cpp
index ba98a44795..b82998459d 100644
--- a/rpcs3/Emu/system_utils.cpp
+++ b/rpcs3/Emu/system_utils.cpp
@@ -1,20 +1,20 @@
 #include "stdafx.h"
 #include "system_utils.hpp"
 #include "system_config.h"
-#include "vfs_config.h"
 #include "Emu/Io/pad_config.h"
-#include "Emu/System.h"
-#include "Emu/VFS.h"
 #include "util/sysinfo.hpp"
 #include "Utilities/File.h"
+#include "Utilities/StrUtil.h"
 #include "Utilities/Thread.h"
 #include "Crypto/unpkg.h"
-#include "Crypto/unself.h"
-#include "Crypto/unedat.h"
 
 #include <charconv>
 #include <thread>
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 LOG_CHANNEL(sys_log, "SYS");
 
 namespace rpcs3::utils
@@ -27,17 +27,17 @@ namespace rpcs3::utils
 		return thread_count;
 	}
 
-	void configure_logs(bool force_enable)
+	void configure_logs()
 	{
 		static bool was_silenced = false;
 
-		const bool silenced = g_cfg.misc.silence_all_logs.get() && !force_enable;
+		const bool silenced = g_cfg.misc.silence_all_logs.get();
 
 		if (silenced)
 		{
 			if (!was_silenced)
 			{
-				sys_log.always()("Disabling logging! Do not create issues on GitHub or on the forums while logging is disabled.");
+				sys_log.success("Disabling logging! Do not create issues on GitHub or on the forums while logging is disabled.");
 			}
 
 			logs::silence();
@@ -59,12 +59,12 @@ namespace rpcs3::utils
 	u32 check_user(const std::string& user)
 	{
 		u32 id = 0;
-
+	
 		if (user.size() == 8)
 		{
 			std::from_chars(&user.front(), &user.back() + 1, id);
 		}
-
+	
 		return id;
 	}
 
@@ -72,28 +72,27 @@ namespace rpcs3::utils
 	{
 		sys_log.success("Installing package: %s", path);
 
+		atomic_t<double> progress(0.);
 		int int_progress = 0;
 
-		std::deque<package_reader> reader;
-		reader.emplace_back(path);
-
 		// Run PKG unpacking asynchronously
 		named_thread worker("PKG Installer", [&]
 		{
-			std::deque<std::string> bootables;
-			const package_install_result result = package_reader::extract_data(reader, bootables);
-			return result.error == package_install_result::error_type::no_error;
+			package_reader reader(path);
+			return reader.extract_data(progress);
 		});
 
 		// Wait for the completion
 		while (std::this_thread::sleep_for(5ms), worker <= thread_state::aborting)
 		{
 			// TODO: update unified progress dialog
-			const int pval = reader[0].get_progress(100);
+			double pval = progress;
+			pval < 0 ? pval += 1. : pval;
+			pval *= 100.;
 
-			if (pval > int_progress)
+			if (static_cast<int>(pval) > int_progress)
 			{
-				int_progress = pval;
+				int_progress = static_cast<int>(pval);
 				sys_log.success("... %u%%", int_progress);
 			}
 		}
@@ -101,25 +100,32 @@ namespace rpcs3::utils
 		return worker();
 	}
 
+#ifdef _WIN32
+	std::string get_exe_dir()
+	{
+		wchar_t buffer[32767];
+		GetModuleFileNameW(nullptr, buffer, sizeof(buffer) / 2);
+
+		const std::string path_to_exe = wchar_to_utf8(buffer);
+		const usz last = path_to_exe.find_last_of('\\');
+		return last == std::string::npos ? std::string("") : path_to_exe.substr(0, last + 1);
+	}
+#endif
+
 	std::string get_emu_dir()
 	{
-		const std::string& emu_dir_ = g_cfg_vfs.emulator_dir;
+		const std::string& emu_dir_ = g_cfg.vfs.emulator_dir;
 		return emu_dir_.empty() ? fs::get_config_dir() : emu_dir_;
 	}
 
-	std::string get_games_dir()
-	{
-		return g_cfg_vfs.get(g_cfg_vfs.games_dir, get_emu_dir());
-	}
-
 	std::string get_hdd0_dir()
 	{
-		return g_cfg_vfs.get(g_cfg_vfs.dev_hdd0, get_emu_dir());
+		return g_cfg.vfs.get(g_cfg.vfs.dev_hdd0, get_emu_dir());
 	}
 
 	std::string get_hdd1_dir()
 	{
-		return g_cfg_vfs.get(g_cfg_vfs.dev_hdd1, get_emu_dir());
+		return g_cfg.vfs.get(g_cfg.vfs.dev_hdd1, get_emu_dir());
 	}
 
 	std::string get_cache_dir()
@@ -127,31 +133,9 @@ namespace rpcs3::utils
 		return fs::get_cache_dir() + "cache/";
 	}
 
-	std::string get_cache_dir(std::string_view module_path)
+	std::string get_rap_file_path(const std::string& rap)
 	{
-		std::string cache_dir = get_cache_dir();
-
-		const std::string dev_flash = g_cfg_vfs.get_dev_flash();
-		const bool in_dev_flash = Emu.IsPathInsideDir(module_path, dev_flash);
-
-		if (in_dev_flash && !Emu.IsPathInsideDir(module_path, dev_flash + "sys/external/"))
-		{
-			// Add prefix for vsh
-			cache_dir += "vsh/";
-		}
-		else if (!in_dev_flash && !Emu.GetTitleID().empty() && Emu.GetCat() != "1P")
-		{
-			// Add prefix for anything except dev_flash files, standalone elfs or PS1 classics
-			cache_dir += Emu.GetTitleID();
-			cache_dir += '/';
-		}
-
-		return cache_dir;
-	}
-
-	std::string get_rap_file_path(const std::string_view& rap)
-	{
-		const std::string home_dir = get_hdd0_dir() + "home";
+		const std::string home_dir = get_hdd0_dir() + "/home";
 
 		std::string rap_path;
 
@@ -171,92 +155,6 @@ namespace rpcs3::utils
 		return rap_path;
 	}
 
-	std::string get_c00_unlock_edat_path(const std::string_view& content_id)
-	{
-		const std::string home_dir = get_hdd0_dir() + "home";
-
-		std::string edat_path;
-
-		for (auto&& entry : fs::dir(home_dir))
-		{
-			if (entry.is_directory && check_user(entry.name))
-			{
-				edat_path = fmt::format("%s/%s/exdata/%s.edat", home_dir, entry.name, content_id);
-				if (fs::is_file(edat_path))
-				{
-					return edat_path;
-				}
-			}
-		}
-
-		// Return a sample path tested for logging purposes
-		return edat_path;
-	}
-
-	bool verify_c00_unlock_edat(const std::string_view& content_id, bool fast)
-	{
-		const std::string edat_path = rpcs3::utils::get_c00_unlock_edat_path(content_id);
-
-		// Check if user has unlock EDAT installed
-		fs::file enc_file(edat_path);
-
-		if (!enc_file)
-		{
-			sys_log.notice("verify_c00_unlock_edat(): '%s' not found", edat_path);
-			return false;
-		}
-
-		// Use simple check for GUI
-		if (fast)
-			return true;
-
-		u128 k_licensee = get_default_self_klic();
-		NPD_HEADER npd;
-
-		if (!VerifyEDATHeaderWithKLicense(enc_file, edat_path, reinterpret_cast<u8*>(&k_licensee), &npd))
-		{
-			sys_log.error("verify_c00_unlock_edat(): Failed to verify npd file '%s'", edat_path);
-			return false;
-		}
-
-		std::string edat_content_id = npd.content_id;
-
-		if (edat_content_id != content_id)
-		{
-			sys_log.error("verify_c00_unlock_edat(): Content ID mismatch in npd header of '%s'", edat_path);
-			return false;
-		}
-
-		// Decrypt EDAT and verify its contents
-		fs::file dec_file = DecryptEDAT(enc_file, edat_path, 8, reinterpret_cast<u8*>(&k_licensee));
-		if (!dec_file)
-		{
-			sys_log.error("verify_c00_unlock_edat(): Failed to decrypt '%s'", edat_path);
-			return false;
-		}
-
-		u32 magic{};
-		dec_file.read<u32>(magic);
-		if (magic != "GOMA"_u32)
-		{
-			sys_log.error("verify_c00_unlock_edat(): Bad header magic in unlock EDAT '%s'", edat_path);
-			return false;
-		}
-
-		// Read null-terminated string
-		dec_file.seek(0x10);
-		dec_file.read(edat_content_id, 0x30);
-		edat_content_id.resize(std::min<usz>(0x30, edat_content_id.find_first_of('\0')));
-		if (edat_content_id != content_id)
-		{
-			sys_log.error("verify_c00_unlock_edat(): Content ID mismatch in unlock EDAT '%s'", edat_path);
-			return false;
-		}
-
-		// Game has been purchased and EDAT is verified
-		return true;
-	}
-
 	std::string get_sfo_dir_from_game_path(const std::string& game_path, const std::string& title_id)
 	{
 		if (fs::is_file(game_path + "/PS3_DISC.SFB"))
@@ -275,7 +173,7 @@ namespace rpcs3::utils
 
 					if (entry.is_directory && fs::is_file(sfo_path))
 					{
-						const auto psf = psf::load_object(sfo_path);
+						const auto psf = psf::load_object(fs::file(sfo_path));
 						const auto serial = psf::get_string(psf, "TITLE_ID");
 						if (serial == title_id)
 						{
@@ -288,20 +186,18 @@ namespace rpcs3::utils
 			return game_path + "/PS3_GAME";
 		}
 
-		const auto psf = psf::load_object(game_path + "/PARAM.SFO");
+		const auto psf = psf::load_object(fs::file(game_path + "/PARAM.SFO"));
 
 		const auto category = psf::get_string(psf, "CATEGORY");
-		const auto content_id = psf::get_string(psf, "CONTENT_ID");
+		const auto content_id = std::string(psf::get_string(psf, "CONTENT_ID"));
 
 		if (category == "HG" && !content_id.empty())
 		{
-			// This is a trial game. Check if the user has EDAT file to unlock it.
-			const auto c00_title_id = psf::get_string(psf, "TITLE_ID");
-
-			if (fs::is_file(game_path + "/C00/PARAM.SFO") && verify_c00_unlock_edat(content_id, true))
+			// This is a trial game. Check if the user has a RAP file to unlock it.
+			if (fs::is_file(game_path + "/C00/PARAM.SFO") && fs::is_file(get_rap_file_path(content_id)))
 			{
 				// Load full game data.
-				sys_log.notice("Found EDAT file %s.edat for trial game %s", content_id, c00_title_id);
+				sys_log.notice("Found RAP file %s.rap for trial game %s", content_id, title_id);
 				return game_path + "/C00";
 			}
 		}
@@ -311,22 +207,32 @@ namespace rpcs3::utils
 
 	std::string get_custom_config_dir()
 	{
-		return fs::get_config_dir(true) + "custom_configs/";
+#ifdef _WIN32
+		return fs::get_config_dir() + "config/custom_configs/";
+#else
+		return fs::get_config_dir() + "custom_configs/";
+#endif
 	}
 
-	std::string get_custom_config_path(const std::string& identifier)
+	std::string get_custom_config_path(const std::string& title_id, bool get_deprecated_path)
 	{
-		if (identifier.empty())
-		{
-			return {};
-		}
+		std::string path;
 
-		return get_custom_config_dir() + "config_" + identifier + ".yml";
+		if (get_deprecated_path)
+			path = fs::get_config_dir() + "data/" + title_id + "/config.yml";
+		else
+			path = get_custom_config_dir() + "config_" + title_id + ".yml";
+
+		return path;
 	}
 
 	std::string get_input_config_root()
 	{
-		return fs::get_config_dir(true) + "input_configs/";
+#ifdef _WIN32
+		return fs::get_config_dir() + "config/input_configs/";
+#else
+		return fs::get_config_dir() + "input_configs/";
+#endif
 	}
 
 	std::string get_input_config_dir(const std::string& title_id)
@@ -337,100 +243,6 @@ namespace rpcs3::utils
 	std::string get_custom_input_config_path(const std::string& title_id)
 	{
 		if (title_id.empty()) return "";
-		return get_input_config_dir(title_id) + g_cfg_input_configs.default_config + ".yml";
-	}
-
-	std::string get_game_content_path(game_content_type type)
-	{
-		const std::string locale_suffix = fmt::format("_%02d", static_cast<s32>(g_cfg.sys.language.get()));
-		const std::string disc_dir = vfs::get("/dev_bdvd/PS3_GAME");
-		std::string hdd0_dir = Emu.GetSfoDir(false);
-
-		if (hdd0_dir == disc_dir)
-		{
-			hdd0_dir.clear(); // No hdd0 dir
-		}
-
-		const bool check_disc = !disc_dir.empty();
-		const bool check_hdd0 = !hdd0_dir.empty() && !check_disc;
-
-		const auto find_content = [&](const std::string& name, const std::string& extension) -> std::string
-		{
-			// Check localized content first
-			for (bool localized : { true, false })
-			{
-				const std::string filename = fmt::format("/%s%s.%s", name, localized ? locale_suffix : std::string(), extension);
-
-				// Check content on hdd0 first
-				if (check_hdd0)
-				{
-					if (std::string path = hdd0_dir + filename; fs::is_file(path))
-					{
-						return path;
-					}
-				}
-
-				// Check content on disc
-				if (check_disc)
-				{
-					if (std::string path = disc_dir + filename; fs::is_file(path))
-					{
-						return path;
-					}
-				}
-			}
-
-			return {};
-		};
-
-		switch (type)
-		{
-		case game_content_type::content_icon:
-		{
-			return find_content("ICON0", "PNG");
-		}
-		case game_content_type::content_video:
-		{
-			return find_content("ICON1", "PAM");
-		}
-		case game_content_type::content_sound:
-		{
-			return find_content("SND0", "AT3");
-		}
-		case game_content_type::overlay_picture:
-		{
-			const bool high_res = g_cfg.video.aspect_ratio == video_aspect::_16_9;
-			return find_content(high_res ? "PIC0" : "PIC2", "PNG");
-		}
-		case game_content_type::background_picture:
-		case game_content_type::background_picture_2:
-		{
-			// Try to find a custom background first
-			if (std::string path = fs::get_config_dir() + "/Icons/game_icons/" + Emu.GetTitleID() + "/PIC1.PNG"; fs::is_file(path))
-			{
-				return path;
-			}
-
-			// Look for proper background
-			return find_content(type == game_content_type::background_picture ? "PIC1" : "PIC3", "PNG");
-		}
-		}
-
-		return {};
-	}
-
-	bool version_is_bigger(std::string_view v0, std::string_view v1, std::string_view serial, bool is_fw)
-	{
-		std::add_pointer_t<char> ev0, ev1;
-		const double ver0 = std::strtod(v0.data(), &ev0);
-		const double ver1 = std::strtod(v1.data(), &ev1);
-
-		if (v0.data() + v0.size() == ev0 && v1.data() + v1.size() == ev1)
-		{
-			return ver0 > ver1;
-		}
-
-		sys_log.error("Failed to compare the %s numbers for title ID %s: '%s'-'%s'", is_fw ? "firmware version" : "version", serial, v0, v1);
-		return false;
+		return get_input_config_dir(title_id) + g_cfg_profile.default_profile + ".yml";
 	}
 }
diff --git a/rpcs3/Emu/system_utils.hpp b/rpcs3/Emu/system_utils.hpp
index 30ccb0add0..2342cab946 100644
--- a/rpcs3/Emu/system_utils.hpp
+++ b/rpcs3/Emu/system_utils.hpp
@@ -3,45 +3,32 @@
 #include "util/types.hpp"
 #include <string>
 
-enum class game_content_type
-{
-	content_icon,         // ICON0.PNG
-	content_video,        // ICON1.PAM
-	content_sound,        // SND0.AT3
-	overlay_picture,      // PIC0.PNG (16:9) or PIC2.PNG (4:3)
-	background_picture,   // PIC1.PNG
-	background_picture_2, // PIC3.PNG (should only exist for install or extra content discs...)
-};
-
 namespace rpcs3::utils
 {
 	u32 get_max_threads();
 
-	void configure_logs(bool force_enable = false);
+	void configure_logs();
 
 	u32 check_user(const std::string& user);
 
 	bool install_pkg(const std::string& path);
 
+#ifdef _WIN32
+	std::string get_exe_dir();
+#endif
+
 	std::string get_emu_dir();
-	std::string get_games_dir();
 	std::string get_hdd0_dir();
 	std::string get_hdd1_dir();
 	std::string get_cache_dir();
-	std::string get_cache_dir(std::string_view module_path);
 
-	std::string get_rap_file_path(const std::string_view& rap);
-	bool verify_c00_unlock_edat(const std::string_view& content_id, bool fast = false);
+	std::string get_rap_file_path(const std::string& rap);
 	std::string get_sfo_dir_from_game_path(const std::string& game_path, const std::string& title_id = "");
 
 	std::string get_custom_config_dir();
-	std::string get_custom_config_path(const std::string& identifier);
+	std::string get_custom_config_path(const std::string& title_id, bool get_deprecated_path = false);
 
 	std::string get_input_config_root();
 	std::string get_input_config_dir(const std::string& title_id = "");
 	std::string get_custom_input_config_path(const std::string& title_id);
-
-	std::string get_game_content_path(game_content_type type);
-
-	bool version_is_bigger(std::string_view v0, std::string_view v1, std::string_view serial, bool is_fw);
 }
diff --git a/rpcs3/Emu/title.h b/rpcs3/Emu/title.h
index 7084231f32..79f63d2922 100644
--- a/rpcs3/Emu/title.h
+++ b/rpcs3/Emu/title.h
@@ -13,6 +13,6 @@ namespace rpcs3
 		std::string vulkan_adapter;
 		double fps = .0;
 	};
-
+	
 	std::string get_formatted_title(const title_format_data& title_data);
 }
diff --git a/rpcs3/Emu/vfs_config.cpp b/rpcs3/Emu/vfs_config.cpp
deleted file mode 100644
index bd292f9a25..0000000000
--- a/rpcs3/Emu/vfs_config.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-#include "stdafx.h"
-#include "vfs_config.h"
-#include "Utilities/StrUtil.h"
-
-LOG_CHANNEL(vfs_log, "VFS");
-
-cfg_vfs g_cfg_vfs{};
-
-std::string cfg_vfs::get(const cfg::string& _cfg, std::string_view emu_dir) const
-{
-	return get(_cfg.to_string(), _cfg.def, emu_dir);
-}
-
-std::string cfg_vfs::get(const std::string& _cfg, const std::string& def, std::string_view emu_dir) const
-{
-	std::string path = _cfg;
-
-	// Fallback
-	if (path.empty())
-	{
-		if (def.empty())
-		{
-			vfs_log.notice("VFS config called with empty path and empty default");
-			return {};
-		}
-
-		path = def;
-	}
-
-	std::string _emu_dir; // Storage only
-
-	if (emu_dir.empty())
-	{
-		// Optimization if provided arg
-		_emu_dir = emulator_dir;
-
-		if (_emu_dir.empty())
-		{
-			_emu_dir = fs::get_config_dir() + '/';
-		}
-		// Check if path does not end with a delimiter
-		else if (_emu_dir.back() != fs::delim[0] && _emu_dir.back() != fs::delim[1])
-		{
-			_emu_dir += '/';
-		}
-
-		emu_dir = _emu_dir;
-	}
-
-	path = fmt::replace_all(path, "$(EmulatorDir)", emu_dir);
-
-	// Check if path does not end with a delimiter
-	if (path.empty())
-	{
-		vfs_log.error("VFS config path empty (_cfg='%s', def='%s', emu_dir='%s')", _cfg, def, emu_dir);
-	}
-	else if (path.back() != fs::delim[0] && path.back() != fs::delim[1])
-	{
-		path += '/';
-	}
-
-	return path;
-}
-
-cfg::device_info cfg_vfs::get_device(const cfg::device_entry& _cfg, std::string_view key, std::string_view emu_dir) const
-{
-	return get_device_info(_cfg, key, emu_dir);
-}
-
-cfg::device_info cfg_vfs::get_device_info(const cfg::device_entry& _cfg, std::string_view key, std::string_view emu_dir) const
-{
-	const auto& device_map = _cfg.get_map();
-
-	if (auto it = device_map.find(key); it != device_map.cend())
-	{
-		// Make sure the path is properly resolved
-		cfg::device_info info = it->second;
-		const auto& def_map = _cfg.get_default();
-		std::string def_path;
-
-		if (auto def_it = def_map.find(key); def_it != def_map.cend())
-		{
-			def_path = def_it->second.path;
-		}
-
-		if (info.path.empty() && def_path.empty())
-		{
-			return info;
-		}
-
-		info.path = get(info.path, def_path, emu_dir);
-		return info;
-	}
-
-	return {};
-}
-
-void cfg_vfs::load()
-{
-	const std::string path = cfg_vfs::get_path();
-
-	if (fs::file cfg_file{path, fs::read})
-	{
-		vfs_log.notice("Loading VFS config. Path: %s", path);
-		from_string(cfg_file.to_string());
-	}
-	else
-	{
-		vfs_log.notice("VFS config missing. Using default settings. Path: %s", path);
-		from_default();
-	}
-}
-
-void cfg_vfs::save() const
-{
-#ifdef _WIN32
-	const std::string path_to_cfg = fs::get_config_dir(true);
-	if (!fs::create_path(path_to_cfg))
-	{
-		vfs_log.error("Could not create path: %s", path_to_cfg);
-	}
-#endif
-
-	fs::pending_file temp(cfg_vfs::get_path());
-
-	if (!temp.file)
-	{
-		vfs_log.error("Could not save config: \"%s\" (error=%s)", cfg_vfs::get_path(), fs::g_tls_error);
-		return;
-	}
-
-	temp.file.write(to_string());
-
-	if (!temp.commit())
-	{
-		vfs_log.error("Could not save config: \"%s\" (error=%s)", cfg_vfs::get_path(), fs::g_tls_error);
-	}
-}
-
-std::string cfg_vfs::get_path()
-{
-	return fs::get_config_dir(true) + "vfs.yml";
-}
diff --git a/rpcs3/Emu/vfs_config.h b/rpcs3/Emu/vfs_config.h
deleted file mode 100644
index eaba041344..0000000000
--- a/rpcs3/Emu/vfs_config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-
-#include "Utilities/Config.h"
-
-struct cfg_vfs : cfg::node
-{
-	std::string get(const cfg::string& _cfg, std::string_view emu_dir = {}) const;
-	void load();
-	void save() const;
-	static std::string get_path();
-
-	cfg::string emulator_dir{ this, "$(EmulatorDir)" }; // Default (empty): taken from fs::get_config_dir()
-	cfg::string dev_hdd0{ this, "/dev_hdd0/", "$(EmulatorDir)dev_hdd0/" };
-	cfg::string dev_hdd1{ this, "/dev_hdd1/", "$(EmulatorDir)dev_hdd1/" };
-	cfg::string dev_flash{ this, "/dev_flash/", "$(EmulatorDir)dev_flash/" };
-	cfg::string dev_flash2{ this, "/dev_flash2/", "$(EmulatorDir)dev_flash2/" };
-	cfg::string dev_flash3{ this, "/dev_flash3/", "$(EmulatorDir)dev_flash3/" };
-	cfg::string dev_bdvd{ this, "/dev_bdvd/", "$(EmulatorDir)dev_bdvd/" }; // Only mounted in some special cases
-	cfg::string games_dir{ this, "/games/", "$(EmulatorDir)games/" }; // Not mounted
-	cfg::string app_home{ this, "/app_home/" }; // Not mounted
-
-	cfg::device_entry dev_usb{ this, "/dev_usb***/",
-		{
-			{ "/dev_usb000", cfg::device_info{.path = "$(EmulatorDir)dev_usb000/"} }
-		}};
-
-	std::string get_dev_flash() const
-	{
-		return get(dev_flash);
-	}
-
-	std::string get_dev_flash2() const
-	{
-		return get(dev_flash2);
-	}
-
-	std::string get_dev_flash3() const
-	{
-		return get(dev_flash3);
-	}
-
-	cfg::device_info get_device(const cfg::device_entry& _cfg, std::string_view key, std::string_view emu_dir = {}) const;
-
-private:
-	std::string get(const std::string& _cfg, const std::string& def, std::string_view emu_dir) const;
-	cfg::device_info get_device_info(const cfg::device_entry& _cfg, std::string_view key, std::string_view emu_dir = {}) const;
-};
-
-extern cfg_vfs g_cfg_vfs;
diff --git a/rpcs3/GLGSRender.vcxproj b/rpcs3/GLGSRender.vcxproj
index dbaffc5d00..1d604d4642 100644
--- a/rpcs3/GLGSRender.vcxproj
+++ b/rpcs3/GLGSRender.vcxproj
@@ -1,123 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <RootNamespace>GLGSRender</RootNamespace>
-    <ProjectGuid>{3384223A-6D97-4799-9862-359F85312892}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="emucore.vcxproj">
-      <Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Emu\RSX\GL\GLCompute.h" />
-    <ClInclude Include="Emu\RSX\GL\GLDMA.h" />
-    <ClInclude Include="Emu\RSX\GL\GLOverlays.h" />
-    <ClInclude Include="Emu\RSX\GL\GLPipelineCompiler.h" />
-    <ClInclude Include="Emu\RSX\GL\GLCommonDecompiler.h" />
-    <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" />
-    <ClInclude Include="Emu\RSX\GL\GLGSRender.h" />
-    <ClInclude Include="Emu\RSX\GL\GLProcTable.h" />
-    <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" />
-    <ClInclude Include="Emu\RSX\GL\GLResolveHelper.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\blitter.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\buffer_object.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\capabilities.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\common.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\fbo.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\pixel_settings.hpp" />
-    <ClInclude Include="Emu\RSX\GL\glutils\program.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\ring_buffer.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\sampler.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\state_tracker.hpp" />
-    <ClInclude Include="Emu\RSX\GL\glutils\image.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\sync.hpp" />
-    <ClInclude Include="Emu\RSX\GL\glutils\vao.hpp" />
-    <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" />
-    <ClInclude Include="Emu\RSX\GL\GLHelpers.h" />
-    <ClInclude Include="Emu\RSX\GL\GLRenderTargets.h" />
-    <ClInclude Include="Emu\RSX\GL\GLShaderInterpreter.h" />
-    <ClInclude Include="Emu\RSX\GL\GLTextureCache.h" />
-    <ClInclude Include="Emu\RSX\GL\OpenGL.h" />
-    <ClInclude Include="Emu\RSX\GL\GLTexture.h" />
-    <ClInclude Include="Emu\RSX\GL\upscalers\bilinear_pass.hpp" />
-    <ClInclude Include="Emu\RSX\GL\upscalers\fsr_pass.h" />
-    <ClInclude Include="Emu\RSX\GL\upscalers\nearest_pass.hpp" />
-    <ClInclude Include="Emu\RSX\GL\upscalers\static_pass.hpp" />
-    <ClInclude Include="Emu\RSX\GL\upscalers\upscaling.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLCompute.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLDMA.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLDraw.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLOverlays.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLPipelineCompiler.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLResolveHelper.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\blitter.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\buffer_object.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\capabilities.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\common.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\fbo.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\program.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\ring_buffer.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\image.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\sampler.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLHelpers.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLPresent.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLRenderTargets.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLShaderInterpreter.cpp" />
-    <ClCompile Include="Emu\RSX\GL\OpenGL.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLTexture.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLVertexBuffers.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLTextureCache.cpp" />
-    <ClCompile Include="Emu\RSX\GL\upscalers\fsr1\fsr_pass.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <RootNamespace>GLGSRender</RootNamespace>
+    <ProjectGuid>{3384223A-6D97-4799-9862-359F85312892}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="emucore.vcxproj">
+      <Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Emu\RSX\GL\GLCompute.h" />
+    <ClInclude Include="Emu\RSX\GL\GLExecutionState.h" />
+    <ClInclude Include="Emu\RSX\GL\GLOverlays.h" />
+    <ClInclude Include="Emu\RSX\GL\GLPipelineCompiler.h" />
+    <ClInclude Include="Emu\RSX\GL\GLTextOut.h" />
+    <ClInclude Include="Emu\RSX\GL\GLCommonDecompiler.h" />
+    <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" />
+    <ClInclude Include="Emu\RSX\GL\GLGSRender.h" />
+    <ClInclude Include="Emu\RSX\GL\GLProcTable.h" />
+    <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" />
+    <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" />
+    <ClInclude Include="Emu\RSX\GL\GLHelpers.h" />
+    <ClInclude Include="Emu\RSX\GL\GLRenderTargets.h" />
+    <ClInclude Include="Emu\RSX\GL\GLShaderInterpreter.h" />
+    <ClInclude Include="Emu\RSX\GL\GLTextureCache.h" />
+    <ClInclude Include="Emu\RSX\GL\OpenGL.h" />
+    <ClInclude Include="Emu\RSX\GL\GLTexture.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLCompute.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLDraw.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLOverlays.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLPipelineCompiler.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLHelpers.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLPresent.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLRenderTargets.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLShaderInterpreter.cpp" />
+    <ClCompile Include="Emu\RSX\GL\OpenGL.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLTexture.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLVertexBuffers.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLTextureCache.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/rpcs3/GLGSRender.vcxproj.filters b/rpcs3/GLGSRender.vcxproj.filters
index 4866b14643..00b2469faa 100644
--- a/rpcs3/GLGSRender.vcxproj.filters
+++ b/rpcs3/GLGSRender.vcxproj.filters
@@ -1,137 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Emu\RSX\GL\GLDraw.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLTexture.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLHelpers.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" />
-    <ClCompile Include="Emu\RSX\GL\OpenGL.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLPresent.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLRenderTargets.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLShaderInterpreter.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLVertexBuffers.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLPipelineCompiler.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLTextureCache.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLOverlays.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLCompute.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\buffer_object.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\ring_buffer.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\image.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\common.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\blitter.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\fbo.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\program.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\sampler.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\capabilities.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\upscalers\fsr1\fsr_pass.cpp">
-      <Filter>upscalers\fsr1</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\GLDMA.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLResolveHelper.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Emu\RSX\GL\GLTexture.h" />
-    <ClInclude Include="Emu\RSX\GL\GLHelpers.h" />
-    <ClInclude Include="Emu\RSX\GL\GLCommonDecompiler.h" />
-    <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" />
-    <ClInclude Include="Emu\RSX\GL\GLGSRender.h" />
-    <ClInclude Include="Emu\RSX\GL\GLProcTable.h" />
-    <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" />
-    <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" />
-    <ClInclude Include="Emu\RSX\GL\OpenGL.h" />
-    <ClInclude Include="Emu\RSX\GL\GLTextureCache.h" />
-    <ClInclude Include="Emu\RSX\GL\GLRenderTargets.h" />
-    <ClInclude Include="Emu\RSX\GL\GLShaderInterpreter.h" />
-    <ClInclude Include="Emu\RSX\GL\GLOverlays.h" />
-    <ClInclude Include="Emu\RSX\GL\GLCompute.h" />
-    <ClInclude Include="Emu\RSX\GL\GLPipelineCompiler.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\buffer_object.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\ring_buffer.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\common.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\capabilities.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\image.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\state_tracker.hpp">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\pixel_settings.hpp">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\blitter.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\fbo.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\vao.hpp">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\program.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\sync.hpp">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\sampler.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\upscalers\upscaling.h">
-      <Filter>upscalers</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\upscalers\bilinear_pass.hpp">
-      <Filter>upscalers</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\upscalers\static_pass.hpp">
-      <Filter>upscalers</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\upscalers\nearest_pass.hpp">
-      <Filter>upscalers</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\upscalers\fsr_pass.h">
-      <Filter>upscalers</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\GLDMA.h" />
-    <ClInclude Include="Emu\RSX\GL\GLResolveHelper.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="glutils">
-      <UniqueIdentifier>{ed9ef6b7-efbb-4a8e-88a4-583b6655c141}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="upscalers">
-      <UniqueIdentifier>{4ce10cbf-4595-433a-a21a-035bf40bb4e5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="upscalers\fsr1">
-      <UniqueIdentifier>{d5626eff-1471-4810-9e57-0f8987f86d67}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="Emu\RSX\GL\GLDraw.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLTexture.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLHelpers.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" />
+    <ClCompile Include="Emu\RSX\GL\OpenGL.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLPresent.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLRenderTargets.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLShaderInterpreter.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLVertexBuffers.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLPipelineCompiler.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLTextureCache.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLOverlays.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLCompute.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Emu\RSX\GL\GLTexture.h" />
+    <ClInclude Include="Emu\RSX\GL\GLHelpers.h" />
+    <ClInclude Include="Emu\RSX\GL\GLCommonDecompiler.h" />
+    <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" />
+    <ClInclude Include="Emu\RSX\GL\GLGSRender.h" />
+    <ClInclude Include="Emu\RSX\GL\GLProcTable.h" />
+    <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" />
+    <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" />
+    <ClInclude Include="Emu\RSX\GL\OpenGL.h" />
+    <ClInclude Include="Emu\RSX\GL\GLTextureCache.h" />
+    <ClInclude Include="Emu\RSX\GL\GLRenderTargets.h" />
+    <ClInclude Include="Emu\RSX\GL\GLShaderInterpreter.h" />
+    <ClInclude Include="Emu\RSX\GL\GLTextOut.h" />
+    <ClInclude Include="Emu\RSX\GL\GLOverlays.h" />
+    <ClInclude Include="Emu\RSX\GL\GLExecutionState.h" />
+    <ClInclude Include="Emu\RSX\GL\GLCompute.h" />
+    <ClInclude Include="Emu\RSX\GL\GLPipelineCompiler.h" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/rpcs3/Icons/DualShock_3.svg b/rpcs3/Icons/DualShock_3.svg
deleted file mode 100644
index 4e66fe9933..0000000000
--- a/rpcs3/Icons/DualShock_3.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<svg id="DualShock_3_SVG" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="250" viewBox="0,  0, 400, 250"><!-- DualShock 3 SVG by HerrHulaHoop -->
-<path id="MainOutline" d="M 116.5 41.6 C 116.9 40.5, 116 35.6, 115 29.9 C 112.7 14.7, 112.5 14.3, 108.9 12 C 108 11.4, 106.4 10.2, 105.4 9.3 C 100.4 4.6, 89 2.3, 77.4 3.5 C 70.7 4.2, 65.6 6.1, 62.2 9.2 C 61 10.2, 59.5 11.4, 58.7 11.9 C 56.8 13, 55 15.1, 54.6 16.8 C 54.2 18.1, 51.6 34, 50 42.4 M 25.4 74.2 C 22 81.1, 18.5 102.3, 10.4 159.5 C 8.1 175.6, 5.6 192.4, 4.8 196.7 C 3 207.4, 2.9 208.8, 3.4 212.7 C 7.2 241.6, 46.2 259.1, 69.4 242.3 C 77.3 236.6, 80.3 231.6, 103.5 186.3 L 110 174.1 M 292 173.5 C 292.5 174.5, 295 179.2, 297.9 184.9 C 308.1 205.1, 320.6 228.7, 323.2 232.6 C 335.6 250.8, 359.9 254.2, 380.5 240.4 C 394.5 231.1, 400.8 217.3, 398.1 202.1 C 396.5 193.4, 394.9 182.8, 390.4 151.1 C 383.3 101.3, 380 81.4, 376.8 75 M 351.9 42.3 C 351.8 40.5, 351 35.6, 350 29.9 C 347.7 14.7, 347.5 14.3, 343.9 11.5 C 343 10, 341.4 9.2, 342.6 9.8 C 335.4 4.6, 324 2.3, 312.4 3.5 C 305.7 4.2, 300.6 6.1, 297.1 9.2 C 296 10.2, 294.5 11.4, 293.7 11.9 C 291.8 13,  290.1 15.1, 289.6 16.8 C 289.2 18.1, 286.6 34, 285 42.4" stroke="black" fill="none" />
-<path id="LeftShoulder" d="M 107 10.6 C 94.4 6.7, 74.8 6.5, 60.5 10.6" stroke="black" fill="none" />
-<path id="RightShoulder" d="M 343.7 11.2 C 329.4 6.7, 309.8 6.5, 295.5 10.6" stroke="black" fill="none" />
-<path id="UpperLine1" d="M 116.5 41.6 H 186 A 80 80, 0, 0 0, 216.5 41.6 H 286" stroke="black" fill="none" />
-<line id="UpperLine2" x1="129" y1="52" x2="273" y2="52" stroke="black" fill="none" />
-<line id="LowerLine1" x1="181.5" y1="164" x2="220" y2="164" stroke="black" fill="none" />
-<line id="LowerLine2" x1="179" y1="170.5" x2="222.5" y2="170.5" stroke="black" fill="none" />
-<rect id="SelectButton" x="155" y="95" width="20" height="10" stroke="black" fill="none" />
-<text id="SelectText" x="150" y="90.5" font-family="sans-serif" font-size="8" font-weight="bold" fill="black">SELECT</text>
-<path id="StartButton" d="M 226 95 V 105 L 244 100 Z" stroke="black" fill="none" />
-<text id="StartText" x="222" y="90.5" font-family="sans-serif" font-size="8" font-weight="bold" fill="black">START</text>
-<circle id="PSButton" cx="201" cy="129" r="13" stroke="black" fill="none" />
-<circle id="RightJoystickOuter" cx="258" cy="154" r="39" stroke="black" fill="none" />
-<circle id="RightJoystickMiddle" cx="258" cy="154" r="30" stroke="black" fill="none" />
-<circle id="RightJoystickInner" cx="258" cy="154" r="27" stroke="black" fill="none" />
-<circle id="LeftJoystickOuter" cx="143.4" cy="154" r="39" stroke="black" fill="none" />
-<circle id="LeftJoystickMiddle" cx="143.4" cy="154" r="30" stroke="black" fill="none" />
-<circle id="LeftJoystickInner" cx="143.4" cy="154" r="27" stroke="black" fill="none" />
-<path id="RightFacebuttonCircle" d="M 297.3 152.5 A 61.8 61.8, 0, 1 0, 260 115" stroke="black" fill="none" />
-<path id="RightButtonBorder" d="M 301 76 H 278 A 6 6, 0, 0 0, 272 82 V 105 A 6 6, 0, 0 0, 278 111 H 301 V 134 A 6 6, 0, 0 0, 307 140 H 330 A 6 6, 0, 0 0, 336 134 V 111 H 359 A 6 6, 0, 0 0, 365 105 V 82 A 6 6, 0, 0 0, 359 76 H 336 V 53 A 6 6, 0, 0 0, 330 47 H 307 A 6 6, 0, 0 0, 301 53 V 76.5" stroke="black" fill="none" />
-<circle id="ButtonBorder1" cx="289.5" cy="93.5" r="13" stroke="black" fill="none" />
-<rect id="ButtonSquare" x="282" y="86.5" width="15" height="15" stroke="black" fill="none" />
-<circle id="ButtonBorder2" cx="347.5" cy="93.5" r="13" stroke="black" fill="none" />
-<circle id="ButtonCircle" cx="347.5" cy="93.5" r="9" stroke="black" fill="none" />
-<circle id="ButtonBorder3" cx="318.5" cy="64.5" r="13" stroke="black" fill="none" />
-<path id="ButtonTriangle" d="M 310 70 H 327 L 318.5 56 Z" stroke="black" fill="none" />
-<circle id="ButtonBorder4" cx="318.5" cy="122.5" r="13" stroke="black" fill="none" />
-<path id="ButtonCross" d="M 311.5 115.5 L 325.5 129.5 M 311.5 129.5 L 325.5 115.5" stroke="black" fill="none" />
-<path id="LeftDpadCircle" d="M 104.2 152.5 A 61.8 61.8, 0, 1 1, 142 115" stroke="black" fill="none" />
-<path id="LeftDpadBorder" d="M 66 76 H 43 A 6 6, 0, 0 0, 37 82 V 105 A 6 6, 0, 0 0, 43 111 H 66 V 134 A 6 6, 0, 0 0, 72 140 H 95 A 6 6, 0, 0 0, 101 134 V 111 H 124 A 6 6, 0, 0 0, 130 105 V 82 A 6 6, 0, 0 0, 124 76 H 101 V 53 A 6 6, 0, 0 0, 95 47 H 72 A 6 6, 0, 0 0, 66 53 V 76.5" stroke="black" fill="none" />
-<path id="DpadButtonLeft" d="M 52 85 H 69 L 75 93.5 L 69 102 H 52 Z M 48 88 V 99 L 43 93.5 Z" stroke="black" fill="none" />
-<path id="DpadButtonRight" d="M 115 85 H 98 L 92 93.5 L 98 102 H 115 Z M 119 88 V 99 L 124 93.5 Z" stroke="black" fill="none" />
-<path id="DpadButtonTop" d="M 75 62 V 79 L 83.5 85 L 92 79 V 62 Z M 78 58 H 89 L 83.5 53 Z" stroke="black" fill="none" />
-<path id="DpadButtonBottom" d="M 75 125 V 108 L 83.5 102 L 92 108 V 125 Z M 78 129 H 89 L 83.5 134 Z" stroke="black" fill="none" />
-</svg>
diff --git a/rpcs3/Icons/controller.png b/rpcs3/Icons/controller.png
new file mode 100644
index 0000000000..0143102a0b
Binary files /dev/null and b/rpcs3/Icons/controller.png differ
diff --git a/rpcs3/Icons/insignia.png b/rpcs3/Icons/insignia.png
new file mode 100644
index 0000000000..83d68d0a7d
Binary files /dev/null and b/rpcs3/Icons/insignia.png differ
diff --git a/rpcs3/Input/basic_keyboard_handler.cpp b/rpcs3/Input/basic_keyboard_handler.cpp
index 3fa7acf876..e7e2eb9ee4 100644
--- a/rpcs3/Input/basic_keyboard_handler.cpp
+++ b/rpcs3/Input/basic_keyboard_handler.cpp
@@ -11,34 +11,27 @@
 
 LOG_CHANNEL(input_log, "Input");
 
-void basic_keyboard_handler::Init(keyboard_consumer& consumer, const u32 max_connect)
+void basic_keyboard_handler::Init(const u32 max_connect)
 {
-	KbInfo& info = consumer.GetInfo();
-	std::vector<Keyboard>& keyboards = consumer.GetKeyboards();
-
-	info = {};
-	keyboards.clear();
-
 	for (u32 i = 0; i < max_connect; i++)
 	{
-		Keyboard kb{};
+		Keyboard kb;
+
 		kb.m_config.arrange = g_cfg.sys.keyboard_type;
 
-		if (consumer.id() == keyboard_consumer::identifier::overlays)
-		{
-			// Enable key repeat
-			kb.m_key_repeat = true;
-		}
-
-		LoadSettings(kb);
-
-		keyboards.emplace_back(kb);
+		m_keyboards.emplace_back();
 	}
 
-	info.max_connect = max_connect;
-	info.now_connect = std::min(::size32(keyboards), max_connect);
-	info.info        = input::g_keyboards_intercepted ? CELL_KB_INFO_INTERCEPTED : 0; // Ownership of keyboard data: 0=Application, 1=System
-	info.status[0]   = CELL_KB_STATUS_CONNECTED; // (TODO: Support for more keyboards)
+	LoadSettings();
+	memset(&m_info, 0, sizeof(KbInfo));
+	m_info.max_connect = max_connect;
+	m_info.now_connect = std::min(::size32(m_keyboards), max_connect);
+	m_info.info        = input::g_intercepted ? CELL_KB_INFO_INTERCEPTED : 0; // Ownership of keyboard data: 0=Application, 1=System
+	m_info.status[0]   = CELL_KB_STATUS_CONNECTED; // (TODO: Support for more keyboards)
+}
+
+basic_keyboard_handler::basic_keyboard_handler() : QObject()
+{
 }
 
 /* Sets the target window for the event handler, and also installs an event filter on the target. */
@@ -60,22 +53,11 @@ void basic_keyboard_handler::SetTargetWindow(QWindow* target)
 
 bool basic_keyboard_handler::eventFilter(QObject* watched, QEvent* event)
 {
-	if (!event) [[unlikely]]
+	if (!event || input::g_intercepted)
 	{
 		return false;
 	}
 
-	if (input::g_active_mouse_and_keyboard != input::active_mouse_and_keyboard::emulated)
-	{
-		if (!m_keys_released)
-		{
-			ReleaseAllKeys();
-		}
-		return false;
-	}
-
-	m_keys_released = false;
-
 	// !m_target is for future proofing when gsrender isn't automatically initialized on load.
 	// !m_target->isVisible() is a hack since currently a guiless application will STILL inititialize a gsrender (providing a valid target)
 	if (!m_target || !m_target->isVisible() || watched == m_target)
@@ -108,12 +90,12 @@ bool basic_keyboard_handler::eventFilter(QObject* watched, QEvent* event)
 
 void basic_keyboard_handler::keyPressEvent(QKeyEvent* keyEvent)
 {
-	if (!keyEvent) [[unlikely]]
+	if (!keyEvent)
 	{
 		return;
 	}
 
-	if (m_consumers.empty())
+	if (m_keyboards.empty() || (keyEvent->isAutoRepeat() && !m_keyboards[0].m_key_repeat))
 	{
 		keyEvent->ignore();
 		return;
@@ -121,20 +103,20 @@ void basic_keyboard_handler::keyPressEvent(QKeyEvent* keyEvent)
 
 	const int key = getUnmodifiedKey(keyEvent);
 
-	if (key < 0 || !HandleKey(static_cast<u32>(key), keyEvent->nativeScanCode(), true, keyEvent->isAutoRepeat(), keyEvent->text().toStdU32String()))
+	if (key >= 0)
 	{
-		keyEvent->ignore();
+		Key(static_cast<u32>(key), true);
 	}
 }
 
 void basic_keyboard_handler::keyReleaseEvent(QKeyEvent* keyEvent)
 {
-	if (!keyEvent) [[unlikely]]
+	if (!keyEvent)
 	{
 		return;
 	}
 
-	if (m_consumers.empty())
+	if (m_keyboards.empty() || (keyEvent->isAutoRepeat() && !m_keyboards[0].m_key_repeat))
 	{
 		keyEvent->ignore();
 		return;
@@ -142,9 +124,9 @@ void basic_keyboard_handler::keyReleaseEvent(QKeyEvent* keyEvent)
 
 	const int key = getUnmodifiedKey(keyEvent);
 
-	if (key < 0 || !HandleKey(static_cast<u32>(key), keyEvent->nativeScanCode(), false, keyEvent->isAutoRepeat(), keyEvent->text().toStdU32String()))
+	if (key >= 0)
 	{
-		keyEvent->ignore();
+		Key(static_cast<u32>(key), false);
 	}
 }
 
@@ -152,7 +134,7 @@ void basic_keyboard_handler::keyReleaseEvent(QKeyEvent* keyEvent)
 // key() only shows the modifiers and the modified key (e.g. no easy way of knowing that - was pressed in 'SHIFT+-' in order to get _)
 s32 basic_keyboard_handler::getUnmodifiedKey(QKeyEvent* keyEvent)
 {
-	if (!keyEvent) [[unlikely]]
+	if (!keyEvent)
 	{
 		return -1;
 	}
@@ -185,31 +167,33 @@ s32 basic_keyboard_handler::getUnmodifiedKey(QKeyEvent* keyEvent)
 	return static_cast<s32>(raw_key);
 }
 
-void basic_keyboard_handler::LoadSettings(Keyboard& keyboard)
+void basic_keyboard_handler::LoadSettings()
 {
-	std::vector<KbButton> buttons;
+	if (m_keyboards.empty())
+	{
+		return;
+	}
+
+	std::vector<KbButton>& buttons = m_keyboards[0].m_buttons;
 
 	// Meta Keys
-	buttons.emplace_back(Qt::Key_Control, CELL_KB_MKEY_L_CTRL);
+	//buttons.emplace_back(Qt::Key_Control, CELL_KB_MKEY_L_CTRL);
 	buttons.emplace_back(Qt::Key_Shift, CELL_KB_MKEY_L_SHIFT);
 	buttons.emplace_back(Qt::Key_Alt, CELL_KB_MKEY_L_ALT);
-	buttons.emplace_back(Qt::Key_Meta, CELL_KB_MKEY_L_WIN);
-	//buttons.emplace_back(, CELL_KB_MKEY_R_CTRL);  // There is no way to know if it's left or right in Qt at the moment
-	//buttons.emplace_back(, CELL_KB_MKEY_R_SHIFT); // There is no way to know if it's left or right in Qt at the moment
-	//buttons.emplace_back(, CELL_KB_MKEY_R_ALT);   // There is no way to know if it's left or right in Qt at the moment
-	//buttons.emplace_back(, CELL_KB_MKEY_R_WIN);   // There is no way to know if it's left or right in Qt at the moment
-
-	buttons.emplace_back(Qt::Key_Super_L, CELL_KB_MKEY_L_WIN); // The super keys are supposed to be the windows keys, but they trigger the meta key instead. Let's assign the windows keys to both.
-	buttons.emplace_back(Qt::Key_Super_R, CELL_KB_MKEY_R_WIN); // The super keys are supposed to be the windows keys, but they trigger the meta key instead. Let's assign the windows keys to both.
+	buttons.emplace_back(Qt::Key_Super_L, CELL_KB_MKEY_L_WIN);
+	//buttons.emplace_back(, CELL_KB_MKEY_R_CTRL);
+	//buttons.emplace_back(, CELL_KB_MKEY_R_SHIFT);
+	//buttons.emplace_back(, CELL_KB_MKEY_R_ALT);
+	buttons.emplace_back(Qt::Key_Super_R, CELL_KB_MKEY_R_WIN);
 
 	// CELL_KB_RAWDAT
-	//buttons.emplace_back(, CELL_KEYC_NO_EVENT); // Redundant, listed for completeness
+	//buttons.emplace_back(, CELL_KEYC_NO_EVENT);
 	//buttons.emplace_back(, CELL_KEYC_E_ROLLOVER);
 	//buttons.emplace_back(, CELL_KEYC_E_POSTFAIL);
 	//buttons.emplace_back(, CELL_KEYC_E_UNDEF);
 	buttons.emplace_back(Qt::Key_Escape, CELL_KEYC_ESCAPE);
 	buttons.emplace_back(Qt::Key_Kanji, CELL_KEYC_106_KANJI);
-	buttons.emplace_back(Qt::Key_CapsLock, CELL_KEYC_CAPS_LOCK);
+	//buttons.emplace_back(Qt::Key_CapsLock, CELL_KEYC_CAPS_LOCK);
 	buttons.emplace_back(Qt::Key_F1, CELL_KEYC_F1);
 	buttons.emplace_back(Qt::Key_F2, CELL_KEYC_F2);
 	buttons.emplace_back(Qt::Key_F3, CELL_KEYC_F3);
@@ -235,8 +219,8 @@ void basic_keyboard_handler::LoadSettings(Keyboard& keyboard)
 	buttons.emplace_back(Qt::Key_Left, CELL_KEYC_LEFT_ARROW);
 	buttons.emplace_back(Qt::Key_Down, CELL_KEYC_DOWN_ARROW);
 	buttons.emplace_back(Qt::Key_Up, CELL_KEYC_UP_ARROW);
-	//buttons.emplace_back(, CELL_KEYC_NUM_LOCK);
-	//buttons.emplace_back(, CELL_KEYC_APPLICATION); // This is probably the PS key on the PS3 keyboard
+	//buttons.emplace_back(WXK_NUMLOCK, CELL_KEYC_NUM_LOCK);
+	//buttons.emplace_back(, CELL_KEYC_APPLICATION);
 	buttons.emplace_back(Qt::Key_Kana_Shift, CELL_KEYC_KANA); // maybe Key_Kana_Lock
 	buttons.emplace_back(Qt::Key_Henkan, CELL_KEYC_HENKAN);
 	buttons.emplace_back(Qt::Key_Muhenkan, CELL_KEYC_MUHENKAN);
@@ -306,42 +290,25 @@ void basic_keyboard_handler::LoadSettings(Keyboard& keyboard)
 	buttons.emplace_back(Qt::Key_Minus, CELL_KEYC_MINUS);
 	buttons.emplace_back(Qt::Key_Equal, CELL_KEYC_EQUAL_101);
 	buttons.emplace_back(Qt::Key_AsciiCircum, CELL_KEYC_ACCENT_CIRCONFLEX_106);
+	buttons.emplace_back(Qt::Key_BracketLeft, CELL_KEYC_LEFT_BRACKET_101);
 	buttons.emplace_back(Qt::Key_At, CELL_KEYC_ATMARK_106);
+	buttons.emplace_back(Qt::Key_BracketRight, CELL_KEYC_RIGHT_BRACKET_101);
+	buttons.emplace_back(Qt::Key_BracketLeft, CELL_KEYC_LEFT_BRACKET_106);
+	buttons.emplace_back(Qt::Key_Backslash, CELL_KEYC_BACKSLASH_101);
+	buttons.emplace_back(Qt::Key_BracketRight, CELL_KEYC_RIGHT_BRACKET_106);
 	buttons.emplace_back(Qt::Key_Semicolon, CELL_KEYC_SEMICOLON);
 	buttons.emplace_back(Qt::Key_Apostrophe, CELL_KEYC_QUOTATION_101);
 	buttons.emplace_back(Qt::Key_Colon, CELL_KEYC_COLON_106);
 	buttons.emplace_back(Qt::Key_Comma, CELL_KEYC_COMMA);
 	buttons.emplace_back(Qt::Key_Period, CELL_KEYC_PERIOD);
 	buttons.emplace_back(Qt::Key_Slash, CELL_KEYC_SLASH);
+	buttons.emplace_back(Qt::Key_Backslash, CELL_KEYC_BACKSLASH_106);
 	buttons.emplace_back(Qt::Key_yen, CELL_KEYC_YEN_106);
 
-	// Some buttons share the same key code on different layouts
-	if (keyboard.m_config.arrange == CELL_KB_MAPPING_106)
-	{
-		buttons.emplace_back(Qt::Key_Backslash, CELL_KEYC_BACKSLASH_106);
-		buttons.emplace_back(Qt::Key_BracketLeft, CELL_KEYC_LEFT_BRACKET_106);
-		buttons.emplace_back(Qt::Key_BracketRight, CELL_KEYC_RIGHT_BRACKET_106);
-	}
-	else
-	{
-		buttons.emplace_back(Qt::Key_Backslash, CELL_KEYC_BACKSLASH_101);
-		buttons.emplace_back(Qt::Key_BracketLeft, CELL_KEYC_LEFT_BRACKET_101);
-		buttons.emplace_back(Qt::Key_BracketRight, CELL_KEYC_RIGHT_BRACKET_101);
-	}
-
 	// Made up helper buttons
 	buttons.emplace_back(Qt::Key_Less, CELL_KEYC_LESS);
 	buttons.emplace_back(Qt::Key_NumberSign, CELL_KEYC_HASHTAG);
 	buttons.emplace_back(Qt::Key_ssharp, CELL_KEYC_SSHARP);
 	buttons.emplace_back(Qt::Key_QuoteLeft, CELL_KEYC_BACK_QUOTE);
 	buttons.emplace_back(Qt::Key_acute, CELL_KEYC_BACK_QUOTE);
-
-	// Fill our map
-	for (const KbButton& button : buttons)
-	{
-		if (!keyboard.m_keys.try_emplace(button.m_keyCode, button).second)
-		{
-			input_log.error("basic_keyboard_handler failed to set key code %d", button.m_keyCode);
-		}
-	}
 }
diff --git a/rpcs3/Input/basic_keyboard_handler.h b/rpcs3/Input/basic_keyboard_handler.h
index 284890025f..52d0608bce 100644
--- a/rpcs3/Input/basic_keyboard_handler.h
+++ b/rpcs3/Input/basic_keyboard_handler.h
@@ -8,19 +8,17 @@
 
 class basic_keyboard_handler final : public KeyboardHandlerBase, public QObject
 {
-	using KeyboardHandlerBase::KeyboardHandlerBase;
-
 public:
-	void Init(keyboard_consumer& consumer, const u32 max_connect) override;
+	void Init(const u32 max_connect) override;
+
+	explicit basic_keyboard_handler();
 
 	void SetTargetWindow(QWindow* target);
 	bool eventFilter(QObject* watched, QEvent* event) override;
 	void keyPressEvent(QKeyEvent* event);
 	void keyReleaseEvent(QKeyEvent* event);
 	static s32 getUnmodifiedKey(QKeyEvent* event);
-
+	void LoadSettings();
 private:
-	void LoadSettings(Keyboard& keyboard);
-
 	QWindow* m_target = nullptr;
 };
diff --git a/rpcs3/Input/basic_mouse_handler.cpp b/rpcs3/Input/basic_mouse_handler.cpp
index 4ce238441b..17900bf8b5 100644
--- a/rpcs3/Input/basic_mouse_handler.cpp
+++ b/rpcs3/Input/basic_mouse_handler.cpp
@@ -5,35 +5,18 @@
 #include "util/logs.hpp"
 
 #include "basic_mouse_handler.h"
-#include "keyboard_pad_handler.h"
 #include "rpcs3qt/gs_frame.h"
 #include "Emu/Io/interception.h"
-#include "Emu/Io/mouse_config.h"
 
-mouse_config g_cfg_mouse;
+LOG_CHANNEL(input_log, "Input");
 
 void basic_mouse_handler::Init(const u32 max_connect)
 {
-	if (m_info.max_connect > 0)
-	{
-		// Already initialized
-		return;
-	}
-
-	if (!g_cfg_mouse.load())
-	{
-		input_log.notice("basic_mouse_handler: Could not load basic mouse config. Using defaults.");
-	}
-
-	reload_config();
-
-	m_mice.clear();
 	m_mice.emplace_back(Mouse());
-
-	m_info = {};
+	memset(&m_info, 0, sizeof(MouseInfo));
 	m_info.max_connect = max_connect;
 	m_info.now_connect = std::min(::size32(m_mice), max_connect);
-	m_info.info = input::g_mice_intercepted ? CELL_MOUSE_INFO_INTERCEPTED : 0; // Ownership of mouse data: 0=Application, 1=System
+	m_info.info = input::g_intercepted ? CELL_MOUSE_INFO_INTERCEPTED : 0; // Ownership of mouse data: 0=Application, 1=System
 	for (u32 i = 1; i < max_connect; i++)
 	{
 		m_info.status[i] = CELL_MOUSE_STATUS_DISCONNECTED;
@@ -43,28 +26,15 @@ void basic_mouse_handler::Init(const u32 max_connect)
 	m_info.status[0] = CELL_MOUSE_STATUS_CONNECTED; // (TODO: Support for more mice)
 	m_info.vendor_id[0] = 0x1234;
 	m_info.product_id[0] = 0x1234;
-
-	type = mouse_handler::basic;
 }
 
-void basic_mouse_handler::reload_config()
-{
-	input_log.notice("Basic mouse config=\n%s", g_cfg_mouse.to_string());
-
-	m_buttons[CELL_MOUSE_BUTTON_1] = get_mouse_button(g_cfg_mouse.mouse_button_1);
-	m_buttons[CELL_MOUSE_BUTTON_2] = get_mouse_button(g_cfg_mouse.mouse_button_2);
-	m_buttons[CELL_MOUSE_BUTTON_3] = get_mouse_button(g_cfg_mouse.mouse_button_3);
-	m_buttons[CELL_MOUSE_BUTTON_4] = get_mouse_button(g_cfg_mouse.mouse_button_4);
-	m_buttons[CELL_MOUSE_BUTTON_5] = get_mouse_button(g_cfg_mouse.mouse_button_5);
-	m_buttons[CELL_MOUSE_BUTTON_6] = get_mouse_button(g_cfg_mouse.mouse_button_6);
-	m_buttons[CELL_MOUSE_BUTTON_7] = get_mouse_button(g_cfg_mouse.mouse_button_7);
-	m_buttons[CELL_MOUSE_BUTTON_8] = get_mouse_button(g_cfg_mouse.mouse_button_8);
-}
+basic_mouse_handler::basic_mouse_handler() : QObject()
+{}
 
 /* Sets the target window for the event handler, and also installs an event filter on the target. */
 void basic_mouse_handler::SetTargetWindow(QWindow* target)
 {
-	if (target)
+	if (target != nullptr)
 	{
 		m_target = target;
 		target->installEventFilter(this);
@@ -80,18 +50,7 @@ void basic_mouse_handler::SetTargetWindow(QWindow* target)
 
 bool basic_mouse_handler::eventFilter(QObject* target, QEvent* ev)
 {
-	if (m_info.max_connect == 0)
-	{
-		// Not initialized
-		return false;
-	}
-
-	if (!ev) [[unlikely]]
-	{
-		return false;
-	}
-
-	if (input::g_active_mouse_and_keyboard != input::active_mouse_and_keyboard::emulated)
+	if (!ev || input::g_intercepted)
 	{
 		return false;
 	}
@@ -100,18 +59,13 @@ bool basic_mouse_handler::eventFilter(QObject* target, QEvent* ev)
 	// !m_target->isVisible() is a hack since currently a guiless application will STILL inititialize a gsrender (providing a valid target)
 	if (!m_target || !m_target->isVisible() || target == m_target)
 	{
-		if (g_cfg_mouse.reload_requested.exchange(false))
-		{
-			reload_config();
-		}
-
 		switch (ev->type())
 		{
 		case QEvent::MouseButtonPress:
-			MouseButton(static_cast<QMouseEvent*>(ev), true);
+			MouseButtonDown(static_cast<QMouseEvent*>(ev));
 			break;
 		case QEvent::MouseButtonRelease:
-			MouseButton(static_cast<QMouseEvent*>(ev), false);
+			MouseButtonUp(static_cast<QMouseEvent*>(ev));
 			break;
 		case QEvent::MouseMove:
 			MouseMove(static_cast<QMouseEvent*>(ev));
@@ -119,24 +73,6 @@ bool basic_mouse_handler::eventFilter(QObject* target, QEvent* ev)
 		case QEvent::Wheel:
 			MouseScroll(static_cast<QWheelEvent*>(ev));
 			break;
-		case QEvent::KeyPress:
-			Key(static_cast<QKeyEvent*>(ev), true);
-			break;
-		case QEvent::KeyRelease:
-			Key(static_cast<QKeyEvent*>(ev), false);
-			break;
-		case QEvent::Leave:
-		{
-			// Issue mouse move on leave. Otherwise we may not get any mouse event at the screen borders.
-			const QPoint window_pos = m_target->mapToGlobal(m_target->position()) / m_target->devicePixelRatio();
-			const QPoint cursor_pos = QCursor::pos() - window_pos;
-
-			if (cursor_pos.x() <= 0 || cursor_pos.x() >= m_target->width() || cursor_pos.y() <= 0 || cursor_pos.y() >= m_target->height())
-			{
-				MouseMove(cursor_pos);
-			}
-			break;
-		}
 		default:
 			return false;
 		}
@@ -144,47 +80,35 @@ bool basic_mouse_handler::eventFilter(QObject* target, QEvent* ev)
 	return false;
 }
 
-void basic_mouse_handler::Key(QKeyEvent* event, bool pressed)
+void basic_mouse_handler::MouseButtonDown(QMouseEvent* event)
 {
-	if (!event) [[unlikely]]
-	{
-		return;
-	}
-
-	const int key = event->key();
-	if (const auto it = std::find_if(m_buttons.cbegin(), m_buttons.cend(), [key](const auto& entry){ return entry.second.code == key && entry.second.is_key; });
-		it != m_buttons.cend())
-	{
-		MouseHandlerBase::Button(0, it->first, pressed);
-	}
+	if (event->button() == Qt::LeftButton)        MouseHandlerBase::Button(CELL_MOUSE_BUTTON_1, true);
+	else if (event->button() == Qt::RightButton)  MouseHandlerBase::Button(CELL_MOUSE_BUTTON_2, true);
+	else if (event->button() == Qt::MiddleButton) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_3, true);
+	// TODO: verify these
+	else if (event->button() == Qt::ExtraButton1) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_4, true);
+	else if (event->button() == Qt::ExtraButton2) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_5, true);
+	else if (event->button() == Qt::ExtraButton3) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_6, true);
+	else if (event->button() == Qt::ExtraButton4) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_7, true);
+	else if (event->button() == Qt::ExtraButton5) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_8, true);
 }
 
-void basic_mouse_handler::MouseButton(QMouseEvent* event, bool pressed)
+void basic_mouse_handler::MouseButtonUp(QMouseEvent* event)
 {
-	if (!event) [[unlikely]]
-	{
-		return;
-	}
-
-	const int button = event->button();
-	if (const auto it = std::find_if(m_buttons.cbegin(), m_buttons.cend(), [button](const auto& entry){ return entry.second.code == button && !entry.second.is_key; });
-		it != m_buttons.cend())
-	{
-		MouseHandlerBase::Button(0, it->first, pressed);
-	}
+	if (event->button() == Qt::LeftButton)        MouseHandlerBase::Button(CELL_MOUSE_BUTTON_1, false);
+	else if (event->button() == Qt::RightButton)  MouseHandlerBase::Button(CELL_MOUSE_BUTTON_2, false);
+	else if (event->button() == Qt::MiddleButton) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_3, false);
+	// TODO: verify these
+	else if (event->button() == Qt::ExtraButton1) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_4, false);
+	else if (event->button() == Qt::ExtraButton2) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_5, false);
+	else if (event->button() == Qt::ExtraButton3) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_6, false);
+	else if (event->button() == Qt::ExtraButton4) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_7, false);
+	else if (event->button() == Qt::ExtraButton5) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_8, false);
 }
 
 void basic_mouse_handler::MouseScroll(QWheelEvent* event)
 {
-	if (!event) [[unlikely]]
-	{
-		return;
-	}
-
-	const QPoint delta = event->angleDelta();
-	const s8 x = std::clamp(delta.x() / 120, -128, 127);
-	const s8 y = std::clamp(delta.y() / 120, -128, 127);
-	MouseHandlerBase::Scroll(0, x, y);
+	MouseHandlerBase::Scroll(event->angleDelta().y());
 }
 
 bool basic_mouse_handler::get_mouse_lock_state() const
@@ -194,80 +118,40 @@ bool basic_mouse_handler::get_mouse_lock_state() const
 	return false;
 }
 
-basic_mouse_handler::mouse_button basic_mouse_handler::get_mouse_button(const cfg::string& button)
-{
-	const std::string name = button.to_string();
-	const auto it = std::find_if(mouse_list.cbegin(), mouse_list.cend(), [&name](const auto& entry){ return entry.second == name; });
-
-	if (it != mouse_list.cend())
-	{
-		return mouse_button{
-			.code = static_cast<int>(it->first),
-			.is_key = false
-		};
-	}
-
-	if (const u32 key = keyboard_pad_handler::GetKeyCode(QString::fromStdString(name)))
-	{
-		return mouse_button{
-			.code = static_cast<int>(key),
-			.is_key = true
-		};
-	}
-
-	return mouse_button{
-		.code = Qt::MouseButton::NoButton,
-		.is_key = false
-	};
-}
-
 void basic_mouse_handler::MouseMove(QMouseEvent* event)
 {
-	if (!event) [[unlikely]]
-	{
-		return;
-	}
-
 	if (is_time_for_update())
 	{
-		MouseMove(event->pos());
-	}
-}
-
-void basic_mouse_handler::MouseMove(const QPoint& e_pos)
-{
-	if (!m_target) return;
-
-	// get the screen dimensions
-	const QSize screen = m_target->size();
-
-	if (m_target->isActive() && get_mouse_lock_state())
-	{
-		// get the center of the screen in global coordinates
-		QPoint p_center = m_target->geometry().topLeft() + QPoint(screen.width() / 2, screen.height() / 2);
-
-		// reset the mouse to the center for consistent results since edge movement won't be registered
-		QCursor::setPos(m_target->screen(), p_center);
-
-		// convert the center into screen coordinates
-		p_center = m_target->mapFromGlobal(p_center);
-
-		// current mouse position, starting at the center
-		static QPoint p_real(p_center);
-
-		// get the delta of the mouse position to the screen center
-		const QPoint p_delta = e_pos - p_center;
-
-		// update the current position without leaving the screen borders
-		p_real.setX(std::clamp(p_real.x() + p_delta.x(), 0, screen.width()));
-		p_real.setY(std::clamp(p_real.y() + p_delta.y(), 0, screen.height()));
-
-		// pass the 'real' position and the current delta to the screen center
-		MouseHandlerBase::Move(0, p_real.x(), p_real.y(), screen.width(), screen.height(), true, p_delta.x(), p_delta.y());
-	}
-	else
-	{
-		// pass the absolute position
-		MouseHandlerBase::Move(0, e_pos.x(), e_pos.y(), screen.width(), screen.height());
+		// get the screen dimensions
+		const QSize screen = m_target->size();
+
+		if (m_target && m_target->isActive() && get_mouse_lock_state())
+		{
+			// get the center of the screen in global coordinates
+			QPoint p_center = m_target->geometry().topLeft() + QPoint(screen.width() / 2, screen.height() / 2);
+
+			// reset the mouse to the center for consistent results since edge movement won't be registered
+			QCursor::setPos(m_target->screen(), p_center);
+
+			// convert the center into screen coordinates
+			p_center = m_target->mapFromGlobal(p_center);
+
+			// current mouse position, starting at the center
+			static QPoint p_real(p_center);
+
+			// get the delta of the mouse position to the screen center
+			const QPoint p_delta = event->pos() - p_center;
+
+			// update the current position without leaving the screen borders
+			p_real.setX(std::clamp(p_real.x() + p_delta.x(), 0, screen.width()));
+			p_real.setY(std::clamp(p_real.y() + p_delta.y(), 0, screen.height()));
+
+			// pass the 'real' position and the current delta to the screen center
+			MouseHandlerBase::Move(p_real.x(), p_real.y(), screen.width(), screen.height(), true, p_delta.x(), p_delta.y());
+		}
+		else
+		{
+			MouseHandlerBase::Move(event->x(), event->y(), screen.width(), screen.height());
+		}
 	}
 }
diff --git a/rpcs3/Input/basic_mouse_handler.h b/rpcs3/Input/basic_mouse_handler.h
index e10dafc2f6..9dbd169a04 100644
--- a/rpcs3/Input/basic_mouse_handler.h
+++ b/rpcs3/Input/basic_mouse_handler.h
@@ -7,37 +7,21 @@
 #include <QMouseEvent>
 #include <QWheelEvent>
 
-namespace cfg
-{
-	class string;
-}
-
 class basic_mouse_handler final : public MouseHandlerBase, public QObject
 {
-	using MouseHandlerBase::MouseHandlerBase;
-
 public:
 	void Init(const u32 max_connect) override;
 
+	basic_mouse_handler();
+
 	void SetTargetWindow(QWindow* target);
-	void Key(QKeyEvent* event, bool pressed);
-	void MouseButton(QMouseEvent* event, bool pressed);
+	void MouseButtonDown(QMouseEvent* event);
+	void MouseButtonUp(QMouseEvent* event);
 	void MouseScroll(QWheelEvent* event);
 	void MouseMove(QMouseEvent* event);
-	void MouseMove(const QPoint& e_pos);
 
 	bool eventFilter(QObject* obj, QEvent* ev) override;
 private:
-	void reload_config();
-	bool get_mouse_lock_state() const;
-
-	struct mouse_button
-	{
-		int code = Qt::MouseButton::NoButton;
-		bool is_key = false;
-	};
-	static mouse_button get_mouse_button(const cfg::string& button);
-
 	QWindow* m_target = nullptr;
-	std::map<u8, mouse_button> m_buttons;
+	bool get_mouse_lock_state() const;
 };
diff --git a/rpcs3/Input/ds3_pad_handler.cpp b/rpcs3/Input/ds3_pad_handler.cpp
index 2bc41ccead..710ff45ff7 100644
--- a/rpcs3/Input/ds3_pad_handler.cpp
+++ b/rpcs3/Input/ds3_pad_handler.cpp
@@ -2,16 +2,50 @@
 #include "ds3_pad_handler.h"
 #include "Emu/Io/pad_config.h"
 
+#include "util/asm.hpp"
+
 LOG_CHANNEL(ds3_log, "DS3");
 
-using namespace reports;
+struct ds3_rumble
+{
+	u8 padding              = 0x00;
+	u8 small_motor_duration = 0xFF; // 0xff means forever
+	u8 small_motor_on       = 0x00; // 0 or 1 (off/on)
+	u8 large_motor_duration = 0xFF; // 0xff means forever
+	u8 large_motor_force    = 0x00; // 0 to 255
+};
 
-constexpr std::array<u8, 6> battery_capacity = {0, 1, 25, 50, 75, 100};
+struct ds3_led
+{
+	u8 duration             = 0xFF; // total duration, 0xff means forever
+	u8 interval_duration    = 0xFF; // interval duration in deciseconds
+	u8 enabled              = 0x10;
+	u8 interval_portion_off = 0x00; // in percent (100% = 0xFF)
+	u8 interval_portion_on  = 0xFF; // in percent (100% = 0xFF)
+};
 
-constexpr id_pair SONY_DS3_ID_0 = {0x054C, 0x0268};
+struct ds3_output_report
+{
+#ifdef _WIN32
+	u8 report_id = 0x00;
+	u8 idk_what_this_is[3] = {0x02, 0x00, 0x00};
+#else
+	u8 report_id = 0x01;
+#endif
+	ds3_rumble rumble;
+	u8 padding[4]  = {0x00, 0x00, 0x00, 0x00};
+	u8 led_enabled = 0x00; // LED 1 = 0x02, LED 2 = 0x04, etc.
+	ds3_led led[4];
+	ds3_led led_5;         // reserved for another LED
+};
+
+constexpr u8 battery_capacity[] = {0, 1, 25, 50, 75, 100};
+
+constexpr u16 DS3_VID = 0x054C;
+constexpr u16 DS3_PID = 0x0268;
 
 ds3_pad_handler::ds3_pad_handler()
-    : hid_pad_handler(pad_handler::ds3, {SONY_DS3_ID_0})
+    : hid_pad_handler(pad_handler::ds3, DS3_VID, {DS3_PID})
 {
 	button_list =
 	{
@@ -48,15 +82,11 @@ ds3_pad_handler::ds3_pad_handler()
 	// set capabilities
 	b_has_config = true;
 	b_has_rumble = true;
-	b_has_motion = true;
 	b_has_deadzones = true;
 	b_has_battery = true;
-	b_has_battery_led = true;
 	b_has_led = true;
 	b_has_rgb = false;
-	b_has_player_led = true;
 	b_has_pressure_intensity_button = false; // The DS3 obviously already has this feature natively.
-	b_has_orientation = true;
 
 	m_name_string = "DS3 Pad #";
 	m_max_devices = CELL_PAD_MAX_PORT_NUM;
@@ -74,11 +104,7 @@ ds3_pad_handler::~ds3_pad_handler()
 			// Disable blinking and vibration
 			controller.second->large_motor = 0;
 			controller.second->small_motor = 0;
-
-			if (send_output_report(controller.second.get()) == -1)
-			{
-				ds3_log.error("~ds3_pad_handler: send_output_report failed! error=%s", hid_error(controller.second->hidDevice));
-			}
+			send_output_report(controller.second.get());
 		}
 	}
 }
@@ -93,26 +119,36 @@ u32 ds3_pad_handler::get_battery_level(const std::string& padId)
 	return std::clamp<u32>(device->battery_level, 0, 100);
 }
 
-void ds3_pad_handler::SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32/* r*/, s32/* g*/, s32 /* b*/, bool player_led, bool /*battery_led*/, u32 /*battery_led_brightness*/)
+void ds3_pad_handler::SetPadData(const std::string& padId, u8 player_id, u32 largeMotor, u32 smallMotor, s32/* r*/, s32/* g*/, s32 /* b*/, bool /*battery_led*/, u32 /*battery_led_brightness*/)
 {
 	std::shared_ptr<ds3_device> device = get_hid_device(padId);
 	if (device == nullptr || device->hidDevice == nullptr)
 		return;
 
 	// Set the device's motor speeds to our requested values 0-255
-	device->large_motor = large_motor;
-	device->small_motor = small_motor;
+	device->large_motor = largeMotor;
+	device->small_motor = smallMotor;
 	device->player_id = player_id;
-	device->config = get_config(padId);
+
+	int index = 0;
+	for (uint i = 0; i < MAX_GAMEPADS; i++)
+	{
+		if (g_cfg_input.player[i]->handler == m_type)
+		{
+			if (g_cfg_input.player[i]->device.to_string() == padId)
+			{
+				m_pad_configs[index].from_string(g_cfg_input.player[i]->config.to_string());
+				device->config = &m_pad_configs[index];
+				break;
+			}
+			index++;
+		}
+	}
 
 	ensure(device->config);
-	device->config->player_led_enabled.set(player_led);
 
 	// Start/Stop the engines :)
-	if (send_output_report(device.get()) == -1)
-	{
-		ds3_log.error("SetPadData: send_output_report failed! error=%s", hid_error(device->hidDevice));
-	}
+	send_output_report(device.get());
 }
 
 int ds3_pad_handler::send_output_report(ds3_device* ds3dev)
@@ -120,7 +156,7 @@ int ds3_pad_handler::send_output_report(ds3_device* ds3dev)
 	if (!ds3dev || !ds3dev->hidDevice || !ds3dev->config)
 		return -2;
 
-	ds3_output_report output_report{};
+	ds3_output_report output_report;
 	output_report.rumble.small_motor_on    = ds3dev->small_motor;
 	output_report.rumble.large_motor_force = ds3dev->large_motor;
 
@@ -135,7 +171,7 @@ int ds3_pad_handler::send_output_report(ds3_device* ds3dev)
 		else
 			output_report.led_enabled = 0b00000010;
 	}
-	else if (ds3dev->config->player_led_enabled)
+	else
 	{
 		switch (ds3dev->player_id)
 		{
@@ -150,10 +186,6 @@ int ds3_pad_handler::send_output_report(ds3_device* ds3dev)
 			fmt::throw_exception("DS3 is using forbidden player id %d", ds3dev->player_id);
 		}
 	}
-	else
-	{
-		output_report.led_enabled = 0;
-	}
 
 	if (ds3dev->config->led_low_battery_blink && ds3dev->battery_level < 25)
 	{
@@ -162,7 +194,7 @@ int ds3_pad_handler::send_output_report(ds3_device* ds3dev)
 		output_report.led[3].interval_portion_off = ds3dev->led_delay_off;
 	}
 
-	return hid_write(ds3dev->hidDevice, &output_report.report_id, sizeof(ds3_output_report));
+	return hid_write(ds3dev->hidDevice, &output_report.report_id, sizeof(output_report));
 }
 
 void ds3_pad_handler::init_config(cfg_pad* cfg)
@@ -170,39 +202,35 @@ void ds3_pad_handler::init_config(cfg_pad* cfg)
 	if (!cfg) return;
 
 	// Set default button mapping
-	cfg->ls_left.def = ::at32(button_list, DS3KeyCodes::LSXNeg);
-	cfg->ls_down.def = ::at32(button_list, DS3KeyCodes::LSYNeg);
-	cfg->ls_right.def = ::at32(button_list, DS3KeyCodes::LSXPos);
-	cfg->ls_up.def = ::at32(button_list, DS3KeyCodes::LSYPos);
-	cfg->rs_left.def = ::at32(button_list, DS3KeyCodes::RSXNeg);
-	cfg->rs_down.def = ::at32(button_list, DS3KeyCodes::RSYNeg);
-	cfg->rs_right.def = ::at32(button_list, DS3KeyCodes::RSXPos);
-	cfg->rs_up.def = ::at32(button_list, DS3KeyCodes::RSYPos);
-	cfg->start.def = ::at32(button_list, DS3KeyCodes::Start);
-	cfg->select.def = ::at32(button_list, DS3KeyCodes::Select);
-	cfg->ps.def = ::at32(button_list, DS3KeyCodes::PSButton);
-	cfg->square.def = ::at32(button_list, DS3KeyCodes::Square);
-	cfg->cross.def = ::at32(button_list, DS3KeyCodes::Cross);
-	cfg->circle.def = ::at32(button_list, DS3KeyCodes::Circle);
-	cfg->triangle.def = ::at32(button_list, DS3KeyCodes::Triangle);
-	cfg->left.def = ::at32(button_list, DS3KeyCodes::Left);
-	cfg->down.def = ::at32(button_list, DS3KeyCodes::Down);
-	cfg->right.def = ::at32(button_list, DS3KeyCodes::Right);
-	cfg->up.def = ::at32(button_list, DS3KeyCodes::Up);
-	cfg->r1.def = ::at32(button_list, DS3KeyCodes::R1);
-	cfg->r2.def = ::at32(button_list, DS3KeyCodes::R2);
-	cfg->r3.def = ::at32(button_list, DS3KeyCodes::R3);
-	cfg->l1.def = ::at32(button_list, DS3KeyCodes::L1);
-	cfg->l2.def = ::at32(button_list, DS3KeyCodes::L2);
-	cfg->l3.def = ::at32(button_list, DS3KeyCodes::L3);
+	cfg->ls_left.def = button_list.at(DS3KeyCodes::LSXNeg);
+	cfg->ls_down.def = button_list.at(DS3KeyCodes::LSYNeg);
+	cfg->ls_right.def = button_list.at(DS3KeyCodes::LSXPos);
+	cfg->ls_up.def = button_list.at(DS3KeyCodes::LSYPos);
+	cfg->rs_left.def = button_list.at(DS3KeyCodes::RSXNeg);
+	cfg->rs_down.def = button_list.at(DS3KeyCodes::RSYNeg);
+	cfg->rs_right.def = button_list.at(DS3KeyCodes::RSXPos);
+	cfg->rs_up.def = button_list.at(DS3KeyCodes::RSYPos);
+	cfg->start.def = button_list.at(DS3KeyCodes::Start);
+	cfg->select.def = button_list.at(DS3KeyCodes::Select);
+	cfg->ps.def = button_list.at(DS3KeyCodes::PSButton);
+	cfg->square.def = button_list.at(DS3KeyCodes::Square);
+	cfg->cross.def = button_list.at(DS3KeyCodes::Cross);
+	cfg->circle.def = button_list.at(DS3KeyCodes::Circle);
+	cfg->triangle.def = button_list.at(DS3KeyCodes::Triangle);
+	cfg->left.def = button_list.at(DS3KeyCodes::Left);
+	cfg->down.def = button_list.at(DS3KeyCodes::Down);
+	cfg->right.def = button_list.at(DS3KeyCodes::Right);
+	cfg->up.def = button_list.at(DS3KeyCodes::Up);
+	cfg->r1.def = button_list.at(DS3KeyCodes::R1);
+	cfg->r2.def = button_list.at(DS3KeyCodes::R2);
+	cfg->r3.def = button_list.at(DS3KeyCodes::R3);
+	cfg->l1.def = button_list.at(DS3KeyCodes::L1);
+	cfg->l2.def = button_list.at(DS3KeyCodes::L2);
+	cfg->l3.def = button_list.at(DS3KeyCodes::L3);
 
-	cfg->pressure_intensity_button.def = ::at32(button_list, DS3KeyCodes::None);
-	cfg->analog_limiter_button.def = ::at32(button_list, DS3KeyCodes::None);
-	cfg->orientation_reset_button.def = ::at32(button_list, DS3KeyCodes::None);
+	cfg->pressure_intensity_button.def = button_list.at(DS3KeyCodes::None);
 
 	// Set default misc variables
-	cfg->lstick_anti_deadzone.def = 0;
-	cfg->rstick_anti_deadzone.def = 0;
 	cfg->lstickdeadzone.def    = 40; // between 0 and 255
 	cfg->rstickdeadzone.def    = 40; // between 0 and 255
 	cfg->ltriggerthreshold.def = 0;  // between 0 and 255
@@ -218,7 +246,7 @@ void ds3_pad_handler::init_config(cfg_pad* cfg)
 	cfg->from_default();
 }
 
-void ds3_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial)
+void ds3_pad_handler::check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view wide_serial)
 {
 	if (!hidDevice)
 	{
@@ -245,53 +273,43 @@ void ds3_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerated_dev
 
 	std::string serial;
 
+	// Uses libusb for windows as hidapi will never work with UsbHid driver for the ds3 and it won't work with WinUsb either(windows hid api needs the UsbHid in the driver stack as far as I can tell)
+	// For other os use hidapi and hope for the best!
 #ifdef _WIN32
-	std::array<u8, 0xFF> buf{};
+	u8 buf[0xFF];
 	buf[0] = 0xF2;
 
-	int res = hid_get_feature_report(hidDevice, buf.data(), buf.size());
-	if (res <= 0 || buf[0] != 0xF2)
+	bool got_report = hid_get_feature_report(hidDevice, buf, 0xFF) >= 0;
+	if (!got_report)
 	{
-		ds3_log.warning("check_add_device: hid_get_feature_report 0xF2 failed! Trying again with 0x0. (result=%d, buf[0]=0x%x, error=%s)", res, buf[0], hid_error(hidDevice));
-		buf    = {};
-		buf[0] = 0x0;
-		res    = hid_get_feature_report(hidDevice, buf.data(), buf.size());
-		if (res <= 0 || buf[0] != 0x0)
-		{
-			ds3_log.error("check_add_device: hid_get_feature_report 0x0 failed! result=%d, buf[0]=0x%x, error=%s", res, buf[0], hid_error(hidDevice));
-			HidDevice::close(hidDevice);
-			return;
-		}
+		buf[0]     = 0;
+		got_report = hid_get_feature_report(hidDevice, buf, 0xFF) >= 0;
 	}
-
-	device->report_id = buf[0];
-#elif defined (__APPLE__)
-	int res = hid_init_sixaxis_usb(hidDevice);
-	if (res < 0)
+	if (!got_report)
 	{
-		ds3_log.error("check_add_device: hid_init_sixaxis_usb failed! (result=%d, error=%s)", res, hid_error(hidDevice));
-		HidDevice::close(hidDevice);
+		ds3_log.error("check_add_device: hid_get_feature_report failed! Reason: %s", hid_error(hidDevice));
+		hid_close(hidDevice);
 		return;
 	}
+	device->report_id = buf[0];
 #endif
 
-	for (wchar_t ch : wide_serial)
-		serial += static_cast<uchar>(ch);
+	{
+		for (wchar_t ch : wide_serial)
+			serial += static_cast<uchar>(ch);
+	}
 
 	if (hid_set_nonblocking(hidDevice, 1) == -1)
 	{
 		ds3_log.error("check_add_device: hid_set_nonblocking failed! Reason: %s", hid_error(hidDevice));
-		HidDevice::close(hidDevice);
+		hid_close(hidDevice);
 		return;
 	}
 
 	device->path      = path;
 	device->hidDevice = hidDevice;
 
-	if (send_output_report(device) == -1)
-	{
-		ds3_log.error("check_add_device: send_output_report failed! Reason: %s", hid_error(hidDevice));
-	}
+	send_output_report(device);
 
 #ifdef _WIN32
 	ds3_log.notice("Added device: report_id=%d, serial='%s', path='%s'", device->report_id, serial, device->path);
@@ -305,36 +323,24 @@ ds3_pad_handler::DataStatus ds3_pad_handler::get_data(ds3_device* ds3dev)
 	if (!ds3dev)
 		return DataStatus::ReadError;
 
-	std::array<u8, 64> buf{};
-
 #ifdef _WIN32
-	buf[0] = ds3dev->report_id;
-	const int result = hid_get_feature_report(ds3dev->hidDevice, buf.data(), buf.size());
-	if (result < 0)
-	{
-		ds3_log.error("get_data: hid_get_feature_report 0x%02x failed! result=%d, buf[0]=0x%x, error=%s", ds3dev->report_id, result, buf[0], hid_error(ds3dev->hidDevice));
-		return DataStatus::ReadError;
-	}
+	ds3dev->padData[0] = ds3dev->report_id;
+	const int result = hid_get_feature_report(ds3dev->hidDevice, ds3dev->padData.data(), 64);
 #else
-	const int result = hid_read(ds3dev->hidDevice, buf.data(), buf.size());
-	if (result < 0)
-	{
-		ds3_log.error("get_data: hid_read failed! result=%d, error=%s", result, hid_error(ds3dev->hidDevice));
-		return DataStatus::ReadError;
-	}
+	const int result = hid_read(ds3dev->hidDevice, ds3dev->padData.data(), 64);
 #endif
 
 	if (result > 0)
 	{
 #ifdef _WIN32
-		if (buf[0] == ds3dev->report_id)
+		if (ds3dev->padData[0] == ds3dev->report_id)
 #else
-		if (buf[0] == 0x01 && buf[1] != 0xFF)
+		if (ds3dev->padData[0] == 0x01 && ds3dev->padData[1] != 0xFF)
 #endif
 		{
-			std::memcpy(&ds3dev->report, &buf[DS3_HID_OFFSET], sizeof(ds3_input_report));
+			const u8 battery_status = ds3dev->padData[30 + DS3_HID_OFFSET];
 
-			if (ds3dev->report.battery_status >= 0xEE)
+			if (battery_status >= 0xEE)
 			{
 				// Charging (0xEE) or full (0xEF). Let's set the level to 100%.
 				ds3dev->battery_level = 100;
@@ -342,17 +348,25 @@ ds3_pad_handler::DataStatus ds3_pad_handler::get_data(ds3_device* ds3dev)
 			}
 			else
 			{
-				ds3dev->battery_level = ::at32(battery_capacity, std::min<usz>(ds3dev->report.battery_status, battery_capacity.size() - 1));
+				ds3dev->battery_level = battery_capacity[std::min<u8>(battery_status, 5)];
 				ds3dev->cable_state   = 0;
 			}
 
 			return DataStatus::NewData;
 		}
-
-		ds3_log.warning("get_data: Unknown packet received: 0x%02x", buf[0]);
+		else
+		{
+			ds3_log.warning("Unknown packet received:0x%02x", ds3dev->padData[0]);
+			return DataStatus::NoNewData;
+		}
+	}
+	else
+	{
+		if (result == 0)
+			return DataStatus::NoNewData;
 	}
 
-	return DataStatus::NoNewData;
+	return DataStatus::ReadError;
 }
 
 std::unordered_map<u64, u16> ds3_pad_handler::get_button_values(const std::shared_ptr<PadDevice>& device)
@@ -362,44 +376,49 @@ std::unordered_map<u64, u16> ds3_pad_handler::get_button_values(const std::share
 	if (!dev)
 		return key_buf;
 
-	const ds3_input_report& report = dev->report;
+	auto& dbuf = dev->padData;
+
+	const u8 lsx = dbuf[6 + DS3_HID_OFFSET];
+	const u8 lsy = dbuf[7 + DS3_HID_OFFSET];
+	const u8 rsx = dbuf[8 + DS3_HID_OFFSET];
+	const u8 rsy = dbuf[9 + DS3_HID_OFFSET];
 
 	// Left Stick X Axis
-	key_buf[DS3KeyCodes::LSXNeg] = Clamp0To255((127.5f - report.lsx) * 2.0f);
-	key_buf[DS3KeyCodes::LSXPos] = Clamp0To255((report.lsx - 127.5f) * 2.0f);
+	key_buf[DS3KeyCodes::LSXNeg] = Clamp0To255((127.5f - lsx) * 2.0f);
+	key_buf[DS3KeyCodes::LSXPos] = Clamp0To255((lsx - 127.5f) * 2.0f);
 
 	// Left Stick Y Axis (Up is the negative for some reason)
-	key_buf[DS3KeyCodes::LSYNeg] = Clamp0To255((report.lsy - 127.5f) * 2.0f);
-	key_buf[DS3KeyCodes::LSYPos] = Clamp0To255((127.5f - report.lsy) * 2.0f);
+	key_buf[DS3KeyCodes::LSYNeg] = Clamp0To255((lsy - 127.5f) * 2.0f);
+	key_buf[DS3KeyCodes::LSYPos] = Clamp0To255((127.5f - lsy) * 2.0f);
 
 	// Right Stick X Axis
-	key_buf[DS3KeyCodes::RSXNeg] = Clamp0To255((127.5f - report.rsx) * 2.0f);
-	key_buf[DS3KeyCodes::RSXPos] = Clamp0To255((report.rsx - 127.5f) * 2.0f);
+	key_buf[DS3KeyCodes::RSXNeg] = Clamp0To255((127.5f - rsx) * 2.0f);
+	key_buf[DS3KeyCodes::RSXPos] = Clamp0To255((rsx - 127.5f) * 2.0f);
 
 	// Right Stick Y Axis (Up is the negative for some reason)
-	key_buf[DS3KeyCodes::RSYNeg] = Clamp0To255((report.rsy - 127.5f) * 2.0f);
-	key_buf[DS3KeyCodes::RSYPos] = Clamp0To255((127.5f - report.rsy) * 2.0f);
+	key_buf[DS3KeyCodes::RSYNeg] = Clamp0To255((rsy - 127.5f) * 2.0f);
+	key_buf[DS3KeyCodes::RSYPos] = Clamp0To255((127.5f - rsy) * 2.0f);
 
 	// Buttons or triggers with pressure sensitivity
-	key_buf[DS3KeyCodes::Up]       = (report.buttons[0] & 0x10) ? report.button_values[0] : 0;
-	key_buf[DS3KeyCodes::Right]    = (report.buttons[0] & 0x20) ? report.button_values[1] : 0;
-	key_buf[DS3KeyCodes::Down]     = (report.buttons[0] & 0x40) ? report.button_values[2] : 0;
-	key_buf[DS3KeyCodes::Left]     = (report.buttons[0] & 0x80) ? report.button_values[3] : 0;
-	key_buf[DS3KeyCodes::L2]       = (report.buttons[1] & 0x01) ? report.button_values[4] : 0;
-	key_buf[DS3KeyCodes::R2]       = (report.buttons[1] & 0x02) ? report.button_values[5] : 0;
-	key_buf[DS3KeyCodes::L1]       = (report.buttons[1] & 0x04) ? report.button_values[6] : 0;
-	key_buf[DS3KeyCodes::R1]       = (report.buttons[1] & 0x08) ? report.button_values[7] : 0;
-	key_buf[DS3KeyCodes::Triangle] = (report.buttons[1] & 0x10) ? report.button_values[8] : 0;
-	key_buf[DS3KeyCodes::Circle]   = (report.buttons[1] & 0x20) ? report.button_values[9] : 0;
-	key_buf[DS3KeyCodes::Cross]    = (report.buttons[1] & 0x40) ? report.button_values[10] : 0;
-	key_buf[DS3KeyCodes::Square]   = (report.buttons[1] & 0x80) ? report.button_values[11] : 0;
+	key_buf[DS3KeyCodes::Up]       = (dbuf[2 + DS3_HID_OFFSET] & 0x10) ? dbuf[14 + DS3_HID_OFFSET] : 0;
+	key_buf[DS3KeyCodes::Right]    = (dbuf[2 + DS3_HID_OFFSET] & 0x20) ? dbuf[15 + DS3_HID_OFFSET] : 0;
+	key_buf[DS3KeyCodes::Down]     = (dbuf[2 + DS3_HID_OFFSET] & 0x40) ? dbuf[16 + DS3_HID_OFFSET] : 0;
+	key_buf[DS3KeyCodes::Left]     = (dbuf[2 + DS3_HID_OFFSET] & 0x80) ? dbuf[17 + DS3_HID_OFFSET] : 0;
+	key_buf[DS3KeyCodes::L2]       = (dbuf[3 + DS3_HID_OFFSET] & 0x01) ? dbuf[18 + DS3_HID_OFFSET] : 0;
+	key_buf[DS3KeyCodes::R2]       = (dbuf[3 + DS3_HID_OFFSET] & 0x02) ? dbuf[19 + DS3_HID_OFFSET] : 0;
+	key_buf[DS3KeyCodes::L1]       = (dbuf[3 + DS3_HID_OFFSET] & 0x04) ? dbuf[20 + DS3_HID_OFFSET] : 0;
+	key_buf[DS3KeyCodes::R1]       = (dbuf[3 + DS3_HID_OFFSET] & 0x08) ? dbuf[21 + DS3_HID_OFFSET] : 0;
+	key_buf[DS3KeyCodes::Triangle] = (dbuf[3 + DS3_HID_OFFSET] & 0x10) ? dbuf[22 + DS3_HID_OFFSET] : 0;
+	key_buf[DS3KeyCodes::Circle]   = (dbuf[3 + DS3_HID_OFFSET] & 0x20) ? dbuf[23 + DS3_HID_OFFSET] : 0;
+	key_buf[DS3KeyCodes::Cross]    = (dbuf[3 + DS3_HID_OFFSET] & 0x40) ? dbuf[24 + DS3_HID_OFFSET] : 0;
+	key_buf[DS3KeyCodes::Square]   = (dbuf[3 + DS3_HID_OFFSET] & 0x80) ? dbuf[25 + DS3_HID_OFFSET] : 0;
 
 	// Buttons without pressure sensitivity
-	key_buf[DS3KeyCodes::Select]   = (report.buttons[0] & 0x01) ? 255 : 0;
-	key_buf[DS3KeyCodes::L3]       = (report.buttons[0] & 0x02) ? 255 : 0;
-	key_buf[DS3KeyCodes::R3]       = (report.buttons[0] & 0x04) ? 255 : 0;
-	key_buf[DS3KeyCodes::Start]    = (report.buttons[0] & 0x08) ? 255 : 0;
-	key_buf[DS3KeyCodes::PSButton] = (report.buttons[2] & 0x01) ? 255 : 0;
+	key_buf[DS3KeyCodes::Select]   = (dbuf[2 + DS3_HID_OFFSET] & 0x01) ? 255 : 0;
+	key_buf[DS3KeyCodes::L3]       = (dbuf[2 + DS3_HID_OFFSET] & 0x02) ? 255 : 0;
+	key_buf[DS3KeyCodes::R3]       = (dbuf[2 + DS3_HID_OFFSET] & 0x04) ? 255 : 0;
+	key_buf[DS3KeyCodes::Start]    = (dbuf[2 + DS3_HID_OFFSET] & 0x08) ? 255 : 0;
+	key_buf[DS3KeyCodes::PSButton] = (dbuf[4 + DS3_HID_OFFSET] & 0x01) ? 255 : 0;
 
 	return key_buf;
 }
@@ -407,41 +426,36 @@ std::unordered_map<u64, u16> ds3_pad_handler::get_button_values(const std::share
 pad_preview_values ds3_pad_handler::get_preview_values(const std::unordered_map<u64, u16>& data)
 {
 	return {
-		::at32(data, L2),
-		::at32(data, R2),
-		::at32(data, LSXPos) - ::at32(data, LSXNeg),
-		::at32(data, LSYPos) - ::at32(data, LSYNeg),
-		::at32(data, RSXPos) - ::at32(data, RSXNeg),
-		::at32(data, RSYPos) - ::at32(data, RSYNeg)
+		data.at(L2),
+		data.at(R2),
+		data.at(LSXPos) - data.at(LSXNeg),
+		data.at(LSYPos) - data.at(LSYNeg),
+		data.at(RSXPos) - data.at(RSXNeg),
+		data.at(RSYPos) - data.at(RSYNeg)
 	};
 }
 
-void ds3_pad_handler::get_extended_info(const pad_ensemble& binding)
+void ds3_pad_handler::get_extended_info(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad)
 {
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
-	ds3_device* dev = static_cast<ds3_device*>(device.get());
-	if (!dev || !pad)
+	ds3_device* ds3dev = static_cast<ds3_device*>(device.get());
+	if (!ds3dev || !pad)
 		return;
 
-	const ds3_input_report& report = dev->report;
-
-	pad->m_battery_level = dev->battery_level;
-	pad->m_cable_state   = dev->cable_state;
+	pad->m_battery_level = ds3dev->battery_level;
+	pad->m_cable_state   = ds3dev->cable_state;
 
 	// For unknown reasons the sixaxis values seem to be in little endian on linux
 
 #ifdef _WIN32
 	// Official Sony Windows DS3 driver seems to do the same modification of this value as the ps3
-	pad->m_sensors[0].m_value = report.accel_x;
+	pad->m_sensors[0].m_value = *utils::bless<le_t<u16, 1>>(&ds3dev->padData[41 + DS3_HID_OFFSET]);
 #else
 	// When getting raw values from the device this adjustement is needed
-	pad->m_sensors[0].m_value = 512 - (static_cast<u16>(report.accel_x) - 512);
+	pad->m_sensors[0].m_value = 512 - (*utils::bless<le_t<u16, 1>>(&ds3dev->padData[41]) - 512);
 #endif
-	pad->m_sensors[1].m_value = report.accel_y;
-	pad->m_sensors[2].m_value = report.accel_z;
-	pad->m_sensors[3].m_value = report.gyro;
+	pad->m_sensors[1].m_value = *utils::bless<le_t<u16, 1>>(&ds3dev->padData[45 + DS3_HID_OFFSET]);
+	pad->m_sensors[2].m_value = *utils::bless<le_t<u16, 1>>(&ds3dev->padData[43 + DS3_HID_OFFSET]);
+	pad->m_sensors[3].m_value = *utils::bless<le_t<u16, 1>>(&ds3dev->padData[47 + DS3_HID_OFFSET]);
 
 	// Those are formulas used to adjust sensor values in sys_hid code but I couldn't find all the vars.
 	//auto polish_value = [](s32 value, s32 dword_0x0, s32 dword_0x4, s32 dword_0x8, s32 dword_0xC, s32 dword_0x18, s32 dword_0x1C) -> u16
@@ -462,22 +476,19 @@ void ds3_pad_handler::get_extended_info(const pad_ensemble& binding)
 	//pad->m_sensors[1].m_value = polish_value(pad->m_sensors[1].m_value, 226, 226, 512, 512, 0, 1023);
 	//pad->m_sensors[2].m_value = polish_value(pad->m_sensors[2].m_value, 113, 113, 512, 512, 0, 1023);
 	//pad->m_sensors[3].m_value = polish_value(pad->m_sensors[3].m_value, 1, 1, 512, 512, 0, 1023);
-
-	// Set raw orientation
-	set_raw_orientation(*pad);
 }
 
-bool ds3_pad_handler::get_is_left_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool ds3_pad_handler::get_is_left_trigger(u64 keyCode)
 {
 	return keyCode == DS3KeyCodes::L2;
 }
 
-bool ds3_pad_handler::get_is_right_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool ds3_pad_handler::get_is_right_trigger(u64 keyCode)
 {
 	return keyCode == DS3KeyCodes::R2;
 }
 
-bool ds3_pad_handler::get_is_left_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool ds3_pad_handler::get_is_left_stick(u64 keyCode)
 {
 	switch (keyCode)
 	{
@@ -491,7 +502,7 @@ bool ds3_pad_handler::get_is_left_stick(const std::shared_ptr<PadDevice>& /*devi
 	}
 }
 
-bool ds3_pad_handler::get_is_right_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool ds3_pad_handler::get_is_right_stick(u64 keyCode)
 {
 	switch (keyCode)
 	{
@@ -508,17 +519,19 @@ bool ds3_pad_handler::get_is_right_stick(const std::shared_ptr<PadDevice>& /*dev
 PadHandlerBase::connection ds3_pad_handler::update_connection(const std::shared_ptr<PadDevice>& device)
 {
 	ds3_device* dev = static_cast<ds3_device*>(device.get());
-	if (!dev || dev->path == hid_enumerated_device_default)
+	if (!dev || dev->path.empty())
 		return connection::disconnected;
 
 	if (dev->hidDevice == nullptr)
 	{
-		if (hid_device* hid_dev = dev->open())
+		hid_device* devhandle = hid_open_path(dev->path.c_str());
+		if (devhandle)
 		{
-			if (hid_set_nonblocking(hid_dev, 1) == -1)
+			if (hid_set_nonblocking(devhandle, 1) == -1)
 			{
-				ds3_log.error("Reconnecting Device %s: hid_set_nonblocking failed with error %s", dev->path, hid_error(hid_dev));
+				ds3_log.error("Reconnecting Device %s: hid_set_nonblocking failed with error %s", dev->path, hid_error(devhandle));
 			}
+			dev->hidDevice = devhandle;
 		}
 		else
 		{
@@ -529,7 +542,8 @@ PadHandlerBase::connection ds3_pad_handler::update_connection(const std::shared_
 	if (get_data(dev) == DataStatus::ReadError)
 	{
 		// this also can mean disconnected, either way deal with it on next loop and reconnect
-		dev->close();
+		hid_close(dev->hidDevice);
+		dev->hidDevice = nullptr;
 
 		return connection::no_data;
 	}
@@ -537,19 +551,19 @@ PadHandlerBase::connection ds3_pad_handler::update_connection(const std::shared_
 	return connection::connected;
 }
 
-void ds3_pad_handler::apply_pad_data(const pad_ensemble& binding)
+void ds3_pad_handler::apply_pad_data(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad)
 {
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
 	ds3_device* dev = static_cast<ds3_device*>(device.get());
 	if (!dev || !dev->hidDevice || !dev->config || !pad)
 		return;
 
 	cfg_pad* config = dev->config;
 
-	const u8 speed_large = config->get_large_motor_speed(pad->m_vibrateMotors);
-	const u8 speed_small = config->get_small_motor_speed(pad->m_vibrateMotors);
+	const int idx_l = config->switch_vibration_motors ? 1 : 0;
+	const int idx_s = config->switch_vibration_motors ? 0 : 1;
+
+	const int speed_large = config->enable_vibration_motor_large ? pad->m_vibrateMotors[idx_l].m_value : vibration_min;
+	const int speed_small = config->enable_vibration_motor_small ? pad->m_vibrateMotors[idx_s].m_value : vibration_min;
 
 	const bool wireless    = dev->cable_state == 0;
 	const bool low_battery = dev->battery_level < 25;
@@ -584,31 +598,16 @@ void ds3_pad_handler::apply_pad_data(const pad_ensemble& binding)
 		}
 	}
 
-	// Use LEDs to indicate battery level
-	if (dev->enable_player_leds != config->player_led_enabled.get())
-	{
-		dev->new_output_data = true;
-		dev->enable_player_leds = config->player_led_enabled.get();
-	}
-
 	dev->new_output_data |= dev->large_motor != speed_large || dev->small_motor != speed_small;
 
 	dev->large_motor = speed_large;
 	dev->small_motor = speed_small;
 
-	const auto now = steady_clock::now();
-	const auto elapsed = now - dev->last_output;
-
-	if (dev->new_output_data || elapsed > min_output_interval)
+	if (dev->new_output_data)
 	{
-		if (const int res = send_output_report(dev); res >= 0)
+		if (send_output_report(dev) >= 0)
 		{
 			dev->new_output_data = false;
-			dev->last_output = now;
-		}
-		else if (res == -1)
-		{
-			ds3_log.error("apply_pad_data: send_output_report failed! error=%s", hid_error(dev->hidDevice));
 		}
 	}
 }
diff --git a/rpcs3/Input/ds3_pad_handler.h b/rpcs3/Input/ds3_pad_handler.h
index 47dfbf4587..2fc351db50 100644
--- a/rpcs3/Input/ds3_pad_handler.h
+++ b/rpcs3/Input/ds3_pad_handler.h
@@ -4,70 +4,12 @@
 
 #include <unordered_map>
 
-namespace reports
-{
-	struct ds3_rumble
-	{
-		u8 padding              = 0x00;
-		u8 small_motor_duration = 0xFF; // 0xff means forever
-		u8 small_motor_on       = 0x00; // 0 or 1 (off/on)
-		u8 large_motor_duration = 0xFF; // 0xff means forever
-		u8 large_motor_force    = 0x00; // 0 to 255
-	};
-
-	struct ds3_led
-	{
-		u8 duration             = 0xFF; // total duration, 0xff means forever
-		u8 interval_duration    = 0xFF; // interval duration in deciseconds
-		u8 enabled              = 0x10;
-		u8 interval_portion_off = 0x00; // in percent (100% = 0xFF)
-		u8 interval_portion_on  = 0xFF; // in percent (100% = 0xFF)
-	};
-
-	struct ds3_output_report
-	{
-	#ifdef _WIN32
-		u8 report_id = 0x00;
-		u8 idk_what_this_is[3] = {0x02, 0x00, 0x00};
-	#else
-		u8 report_id = 0x01;
-	#endif
-		ds3_rumble rumble;
-		u8 padding[4]  = {0x00, 0x00, 0x00, 0x00};
-		u8 led_enabled = 0x00; // LED 1 = 0x02, LED 2 = 0x04, etc.
-		ds3_led led[4];
-		ds3_led led_5;         // reserved for another LED
-	};
-
-	struct ds3_input_report
-	{
-		u8 unknown_0[2];
-		u8 buttons[3];
-		u8 unknown_1;
-		u8 lsx;
-		u8 lsy;
-		u8 rsx;
-		u8 rsy;
-		u8 unknown_2[4];
-		u8 button_values[12];
-		u8 unknown_3[4];
-		u8 battery_status;
-		u8 unknown_4[10];
-		le_t<u16, 1> accel_x;
-		le_t<u16, 1> accel_z;
-		le_t<u16, 1> accel_y;
-		le_t<u16, 1> gyro;
-	};
-	static_assert(sizeof(ds3_input_report) == 49);
-}
-
 class ds3_device : public HidDevice
 {
 public:
 #ifdef _WIN32
 	u8 report_id = 0;
 #endif
-	reports::ds3_input_report report{};
 };
 
 class ds3_pad_handler final : public hid_pad_handler<ds3_device>
@@ -138,22 +80,22 @@ public:
 	ds3_pad_handler();
 	~ds3_pad_handler();
 
-	void SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool player_led, bool battery_led, u32 battery_led_brightness) override;
+	void SetPadData(const std::string& padId, u8 player_id, u32 largeMotor, u32 smallMotor, s32 r, s32 g, s32 b, bool battery_led, u32 battery_led_brightness) override;
 	u32 get_battery_level(const std::string& padId) override;
 	void init_config(cfg_pad* cfg) override;
 
 private:
 	ds3_pad_handler::DataStatus get_data(ds3_device* ds3dev) override;
 	int send_output_report(ds3_device* ds3dev) override;
-	void check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view serial) override;
+	void check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view serial) override;
 
-	bool get_is_left_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_left_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
+	bool get_is_left_trigger(u64 keyCode) override;
+	bool get_is_right_trigger(u64 keyCode) override;
+	bool get_is_left_stick(u64 keyCode) override;
+	bool get_is_right_stick(u64 keyCode) override;
 	PadHandlerBase::connection update_connection(const std::shared_ptr<PadDevice>& device) override;
-	void get_extended_info(const pad_ensemble& binding) override;
-	void apply_pad_data(const pad_ensemble& binding) override;
+	void get_extended_info(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad) override;
+	void apply_pad_data(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad) override;
 	std::unordered_map<u64, u16> get_button_values(const std::shared_ptr<PadDevice>& device) override;
 	pad_preview_values get_preview_values(const std::unordered_map<u64, u16>& data) override;
 };
diff --git a/rpcs3/Input/ds4_pad_handler.cpp b/rpcs3/Input/ds4_pad_handler.cpp
index ad7e88a4b1..6098976e34 100644
--- a/rpcs3/Input/ds4_pad_handler.cpp
+++ b/rpcs3/Input/ds4_pad_handler.cpp
@@ -2,20 +2,27 @@
 #include "ds4_pad_handler.h"
 #include "Emu/Io/pad_config.h"
 
-#include <limits>
-
 LOG_CHANNEL(ds4_log, "DS4");
 
-using namespace reports;
-
-constexpr id_pair SONY_DS4_ID_0 = {0x054C, 0x0BA0}; // Dongle
-constexpr id_pair SONY_DS4_ID_1 = {0x054C, 0x05C4}; // CUH-ZCT1x
-constexpr id_pair SONY_DS4_ID_2 = {0x054C, 0x09CC}; // CUH-ZCT2x
-
-constexpr id_pair ZEROPLUS_ID_0 = {0x0C12, 0x0E20};
+constexpr u16 DS4_VID = 0x054C;
+constexpr u16 DS4_PID_0 = 0xBA0;
+constexpr u16 DS4_PID_1 = 0x5C4;
+constexpr u16 DS4_PID_2 = 0x09CC;
 
 namespace
 {
+	constexpr u32 DS4_ACC_RES_PER_G = 8192;
+	constexpr u32 DS4_GYRO_RES_PER_DEG_S = 16; // technically this could be 1024, but keeping it at 16 keeps us within 16 bits of precision
+	constexpr u32 DS4_FEATURE_REPORT_0x02_SIZE = 37;
+	constexpr u32 DS4_FEATURE_REPORT_0x05_SIZE = 41;
+	constexpr u32 DS4_FEATURE_REPORT_0x12_SIZE = 16;
+	constexpr u32 DS4_FEATURE_REPORT_0x81_SIZE = 7;
+	constexpr u32 DS4_INPUT_REPORT_0x11_SIZE = 78;
+	constexpr u32 DS4_OUTPUT_REPORT_0x05_SIZE = 32;
+	constexpr u32 DS4_OUTPUT_REPORT_0x11_SIZE = 78;
+	constexpr u32 DS4_INPUT_REPORT_GYRO_X_OFFSET = 13;
+	constexpr u32 DS4_INPUT_REPORT_BATTERY_OFFSET = 30;
+
 	// This tries to convert axis to give us the max even in the corners,
 	// this actually might work 'too' well, we end up actually getting diagonals of actual max/min, we need the corners still a bit rounded to match ds3
 	// im leaving it here for now, and future reference as it probably can be used later
@@ -64,7 +71,7 @@ namespace
 }
 
 ds4_pad_handler::ds4_pad_handler()
-    : hid_pad_handler<DS4Device>(pad_handler::ds4, {SONY_DS4_ID_0, SONY_DS4_ID_1, SONY_DS4_ID_2, ZEROPLUS_ID_0})
+    : hid_pad_handler<DS4Device>(pad_handler::ds4, DS4_VID, {DS4_PID_0, DS4_PID_1, DS4_PID_2})
 {
 	// Unique names for the config files and our pad settings dialog
 	button_list =
@@ -85,10 +92,6 @@ ds4_pad_handler::ds4_pad_handler()
 		{ DS4KeyCodes::Share,    "Share" },
 		{ DS4KeyCodes::PSButton, "PS Button" },
 		{ DS4KeyCodes::TouchPad, "Touch Pad" },
-		{ DS4KeyCodes::Touch_L,  "Touch Left" },
-		{ DS4KeyCodes::Touch_R,  "Touch Right" },
-		{ DS4KeyCodes::Touch_U,  "Touch Up" },
-		{ DS4KeyCodes::Touch_D,  "Touch Down" },
 		{ DS4KeyCodes::L1,       "L1" },
 		{ DS4KeyCodes::L2,       "L2" },
 		{ DS4KeyCodes::L3,       "L3" },
@@ -108,17 +111,16 @@ ds4_pad_handler::ds4_pad_handler()
 	thumb_max = 255;
 	trigger_min = 0;
 	trigger_max = 255;
+	vibration_min = 0;
+	vibration_max = 255;
 
 	// set capabilities
 	b_has_config = true;
 	b_has_rumble = true;
-	b_has_motion = true;
 	b_has_deadzones = true;
 	b_has_led = true;
 	b_has_rgb = true;
 	b_has_battery = true;
-	b_has_battery_led = true;
-	b_has_orientation = true;
 
 	m_name_string = "DS4 Pad #";
 	m_max_devices = CELL_PAD_MAX_PORT_NUM;
@@ -127,64 +129,40 @@ ds4_pad_handler::ds4_pad_handler()
 	m_thumb_threshold = thumb_max / 2;
 }
 
-ds4_pad_handler::~ds4_pad_handler()
-{
-	for (auto& controller : m_controllers)
-	{
-		if (controller.second && controller.second->hidDevice)
-		{
-			// Disable blinking and vibration
-			controller.second->small_motor = 0;
-			controller.second->large_motor = 0;
-			controller.second->led_delay_on = 0;
-			controller.second->led_delay_off = 0;
-
-			if (send_output_report(controller.second.get()) == -1)
-			{
-				ds4_log.error("~ds4_pad_handler: send_output_report failed! error=%s", hid_error(controller.second->hidDevice));
-			}
-		}
-	}
-}
-
 void ds4_pad_handler::init_config(cfg_pad* cfg)
 {
 	if (!cfg) return;
 
 	// Set default button mapping
-	cfg->ls_left.def  = ::at32(button_list, DS4KeyCodes::LSXNeg);
-	cfg->ls_down.def  = ::at32(button_list, DS4KeyCodes::LSYNeg);
-	cfg->ls_right.def = ::at32(button_list, DS4KeyCodes::LSXPos);
-	cfg->ls_up.def    = ::at32(button_list, DS4KeyCodes::LSYPos);
-	cfg->rs_left.def  = ::at32(button_list, DS4KeyCodes::RSXNeg);
-	cfg->rs_down.def  = ::at32(button_list, DS4KeyCodes::RSYNeg);
-	cfg->rs_right.def = ::at32(button_list, DS4KeyCodes::RSXPos);
-	cfg->rs_up.def    = ::at32(button_list, DS4KeyCodes::RSYPos);
-	cfg->start.def    = ::at32(button_list, DS4KeyCodes::Options);
-	cfg->select.def   = ::at32(button_list, DS4KeyCodes::Share);
-	cfg->ps.def       = ::at32(button_list, DS4KeyCodes::PSButton);
-	cfg->square.def   = ::at32(button_list, DS4KeyCodes::Square);
-	cfg->cross.def    = ::at32(button_list, DS4KeyCodes::Cross);
-	cfg->circle.def   = ::at32(button_list, DS4KeyCodes::Circle);
-	cfg->triangle.def = ::at32(button_list, DS4KeyCodes::Triangle);
-	cfg->left.def     = ::at32(button_list, DS4KeyCodes::Left);
-	cfg->down.def     = ::at32(button_list, DS4KeyCodes::Down);
-	cfg->right.def    = ::at32(button_list, DS4KeyCodes::Right);
-	cfg->up.def       = ::at32(button_list, DS4KeyCodes::Up);
-	cfg->r1.def       = ::at32(button_list, DS4KeyCodes::R1);
-	cfg->r2.def       = ::at32(button_list, DS4KeyCodes::R2);
-	cfg->r3.def       = ::at32(button_list, DS4KeyCodes::R3);
-	cfg->l1.def       = ::at32(button_list, DS4KeyCodes::L1);
-	cfg->l2.def       = ::at32(button_list, DS4KeyCodes::L2);
-	cfg->l3.def       = ::at32(button_list, DS4KeyCodes::L3);
+	cfg->ls_left.def  = button_list.at(DS4KeyCodes::LSXNeg);
+	cfg->ls_down.def  = button_list.at(DS4KeyCodes::LSYNeg);
+	cfg->ls_right.def = button_list.at(DS4KeyCodes::LSXPos);
+	cfg->ls_up.def    = button_list.at(DS4KeyCodes::LSYPos);
+	cfg->rs_left.def  = button_list.at(DS4KeyCodes::RSXNeg);
+	cfg->rs_down.def  = button_list.at(DS4KeyCodes::RSYNeg);
+	cfg->rs_right.def = button_list.at(DS4KeyCodes::RSXPos);
+	cfg->rs_up.def    = button_list.at(DS4KeyCodes::RSYPos);
+	cfg->start.def    = button_list.at(DS4KeyCodes::Options);
+	cfg->select.def   = button_list.at(DS4KeyCodes::Share);
+	cfg->ps.def       = button_list.at(DS4KeyCodes::PSButton);
+	cfg->square.def   = button_list.at(DS4KeyCodes::Square);
+	cfg->cross.def    = button_list.at(DS4KeyCodes::Cross);
+	cfg->circle.def   = button_list.at(DS4KeyCodes::Circle);
+	cfg->triangle.def = button_list.at(DS4KeyCodes::Triangle);
+	cfg->left.def     = button_list.at(DS4KeyCodes::Left);
+	cfg->down.def     = button_list.at(DS4KeyCodes::Down);
+	cfg->right.def    = button_list.at(DS4KeyCodes::Right);
+	cfg->up.def       = button_list.at(DS4KeyCodes::Up);
+	cfg->r1.def       = button_list.at(DS4KeyCodes::R1);
+	cfg->r2.def       = button_list.at(DS4KeyCodes::R2);
+	cfg->r3.def       = button_list.at(DS4KeyCodes::R3);
+	cfg->l1.def       = button_list.at(DS4KeyCodes::L1);
+	cfg->l2.def       = button_list.at(DS4KeyCodes::L2);
+	cfg->l3.def       = button_list.at(DS4KeyCodes::L3);
 
-	cfg->pressure_intensity_button.def = ::at32(button_list, DS4KeyCodes::None);
-	cfg->analog_limiter_button.def = ::at32(button_list, DS4KeyCodes::None);
-	cfg->orientation_reset_button.def = ::at32(button_list, DS4KeyCodes::None);
+	cfg->pressure_intensity_button.def = button_list.at(DS4KeyCodes::None);
 
 	// Set default misc variables
-	cfg->lstick_anti_deadzone.def = static_cast<u32>(0.13 * thumb_max); // 13%
-	cfg->rstick_anti_deadzone.def = static_cast<u32>(0.13 * thumb_max); // 13%
 	cfg->lstickdeadzone.def    = 40; // between 0 and 255
 	cfg->rstickdeadzone.def    = 40; // between 0 and 255
 	cfg->ltriggerthreshold.def = 0;  // between 0 and 255
@@ -216,17 +194,31 @@ u32 ds4_pad_handler::get_battery_level(const std::string& padId)
 	return std::min<u32>(device->battery_level * 10, 100);
 }
 
-void ds4_pad_handler::SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool /*player_led*/, bool battery_led, u32 battery_led_brightness)
+void ds4_pad_handler::SetPadData(const std::string& padId, u8 player_id, u32 largeMotor, u32 smallMotor, s32 r, s32 g, s32 b, bool battery_led, u32 battery_led_brightness)
 {
 	std::shared_ptr<DS4Device> device = get_hid_device(padId);
-	if (!device || !device->hidDevice)
+	if (!device || !device->hidDevice || !device->config)
 		return;
 
 	// Set the device's motor speeds to our requested values 0-255
-	device->large_motor = large_motor;
-	device->small_motor = small_motor;
+	device->large_motor = largeMotor;
+	device->small_motor = smallMotor;
 	device->player_id = player_id;
-	device->config = get_config(padId);
+
+	int index = 0;
+	for (uint i = 0; i < MAX_GAMEPADS; i++)
+	{
+		if (g_cfg_input.player[i]->handler == m_type)
+		{
+			if (g_cfg_input.player[i]->device.to_string() == padId)
+			{
+				m_pad_configs[index].from_string(g_cfg_input.player[i]->config.to_string());
+				device->config = &m_pad_configs[index];
+				break;
+			}
+			index++;
+		}
+	}
 
 	ensure(device->config);
 
@@ -246,39 +238,36 @@ void ds4_pad_handler::SetPadData(const std::string& padId, u8 player_id, u8 larg
 	}
 
 	// Start/Stop the engines :)
-	if (send_output_report(device.get()) == -1)
-	{
-		ds4_log.error("SetPadData: send_output_report failed! error=%s", hid_error(device->hidDevice));
-	}
+	send_output_report(device.get());
 }
 
 std::unordered_map<u64, u16> ds4_pad_handler::get_button_values(const std::shared_ptr<PadDevice>& device)
 {
 	std::unordered_map<u64, u16> keyBuffer;
-	DS4Device* dev = static_cast<DS4Device*>(device.get());
-	if (!dev)
+	DS4Device* ds4_dev = static_cast<DS4Device*>(device.get());
+	if (!ds4_dev)
 		return keyBuffer;
 
-	const ds4_input_report_common& input = dev->bt_controller ? dev->report_bt.common : dev->report_usb.common;
+	auto buf = ds4_dev->padData;
 
 	// Left Stick X Axis
-	keyBuffer[DS4KeyCodes::LSXNeg] = Clamp0To255((127.5f - input.x) * 2.0f);
-	keyBuffer[DS4KeyCodes::LSXPos] = Clamp0To255((input.x - 127.5f) * 2.0f);
+	keyBuffer[DS4KeyCodes::LSXNeg] = Clamp0To255((127.5f - buf[1]) * 2.0f);
+	keyBuffer[DS4KeyCodes::LSXPos] = Clamp0To255((buf[1] - 127.5f) * 2.0f);
 
 	// Left Stick Y Axis (Up is the negative for some reason)
-	keyBuffer[DS4KeyCodes::LSYNeg] = Clamp0To255((input.y - 127.5f) * 2.0f);
-	keyBuffer[DS4KeyCodes::LSYPos] = Clamp0To255((127.5f - input.y) * 2.0f);
+	keyBuffer[DS4KeyCodes::LSYNeg] = Clamp0To255((buf[2] - 127.5f) * 2.0f);
+	keyBuffer[DS4KeyCodes::LSYPos] = Clamp0To255((127.5f - buf[2]) * 2.0f);
 
 	// Right Stick X Axis
-	keyBuffer[DS4KeyCodes::RSXNeg] = Clamp0To255((127.5f - input.rx) * 2.0f);
-	keyBuffer[DS4KeyCodes::RSXPos] = Clamp0To255((input.rx - 127.5f) * 2.0f);
+	keyBuffer[DS4KeyCodes::RSXNeg] = Clamp0To255((127.5f - buf[3]) * 2.0f);
+	keyBuffer[DS4KeyCodes::RSXPos] = Clamp0To255((buf[3] - 127.5f) * 2.0f);
 
 	// Right Stick Y Axis (Up is the negative for some reason)
-	keyBuffer[DS4KeyCodes::RSYNeg] = Clamp0To255((input.ry - 127.5f) * 2.0f);
-	keyBuffer[DS4KeyCodes::RSYPos] = Clamp0To255((127.5f - input.ry) * 2.0f);
+	keyBuffer[DS4KeyCodes::RSYNeg] = Clamp0To255((buf[4] - 127.5f) * 2.0f);
+	keyBuffer[DS4KeyCodes::RSYPos] = Clamp0To255((127.5f - buf[4]) * 2.0f);
 
 	// bleh, dpad in buffer is stored in a different state
-	const u8 dpadState = input.buttons[0] & 0xf;
+	const u8 dpadState = buf[5] & 0xf;
 	switch (dpadState)
 	{
 	case 0x08: // none pressed
@@ -340,69 +329,28 @@ std::unordered_map<u64, u16> ds4_pad_handler::get_button_values(const std::share
 	}
 
 	// square, cross, circle, triangle
-	keyBuffer[DS4KeyCodes::Square] =   ((input.buttons[0] & (1 << 4)) != 0) ? 255 : 0;
-	keyBuffer[DS4KeyCodes::Cross] =    ((input.buttons[0] & (1 << 5)) != 0) ? 255 : 0;
-	keyBuffer[DS4KeyCodes::Circle] =   ((input.buttons[0] & (1 << 6)) != 0) ? 255 : 0;
-	keyBuffer[DS4KeyCodes::Triangle] = ((input.buttons[0] & (1 << 7)) != 0) ? 255 : 0;
+	keyBuffer[DS4KeyCodes::Square] =   ((buf[5] & (1 << 4)) != 0) ? 255 : 0;
+	keyBuffer[DS4KeyCodes::Cross] =    ((buf[5] & (1 << 5)) != 0) ? 255 : 0;
+	keyBuffer[DS4KeyCodes::Circle] =   ((buf[5] & (1 << 6)) != 0) ? 255 : 0;
+	keyBuffer[DS4KeyCodes::Triangle] = ((buf[5] & (1 << 7)) != 0) ? 255 : 0;
 
 	// L1, R1, L2, L3, select, start, L3, L3
-	keyBuffer[DS4KeyCodes::L1]      = ((input.buttons[1] & (1 << 0)) != 0) ? 255 : 0;
-	keyBuffer[DS4KeyCodes::R1]      = ((input.buttons[1] & (1 << 1)) != 0) ? 255 : 0;
-	//keyBuffer[DS4KeyCodes::L2But]   = ((input.buttons[1] & (1 << 2)) != 0) ? 255 : 0;
-	//keyBuffer[DS4KeyCodes::R2But]   = ((input.buttons[1] & (1 << 3)) != 0) ? 255 : 0;
-	keyBuffer[DS4KeyCodes::Share]   = ((input.buttons[1] & (1 << 4)) != 0) ? 255 : 0;
-	keyBuffer[DS4KeyCodes::Options] = ((input.buttons[1] & (1 << 5)) != 0) ? 255 : 0;
-	keyBuffer[DS4KeyCodes::L3]      = ((input.buttons[1] & (1 << 6)) != 0) ? 255 : 0;
-	keyBuffer[DS4KeyCodes::R3]      = ((input.buttons[1] & (1 << 7)) != 0) ? 255 : 0;
+	keyBuffer[DS4KeyCodes::L1]      = ((buf[6] & (1 << 0)) != 0) ? 255 : 0;
+	keyBuffer[DS4KeyCodes::R1]      = ((buf[6] & (1 << 1)) != 0) ? 255 : 0;
+	//keyBuffer[DS4KeyCodes::L2But]   = ((buf[6] & (1 << 2)) != 0) ? 255 : 0;
+	//keyBuffer[DS4KeyCodes::R2But]   = ((buf[6] & (1 << 3)) != 0) ? 255 : 0;
+	keyBuffer[DS4KeyCodes::Share]   = ((buf[6] & (1 << 4)) != 0) ? 255 : 0;
+	keyBuffer[DS4KeyCodes::Options] = ((buf[6] & (1 << 5)) != 0) ? 255 : 0;
+	keyBuffer[DS4KeyCodes::L3]      = ((buf[6] & (1 << 6)) != 0) ? 255 : 0;
+	keyBuffer[DS4KeyCodes::R3]      = ((buf[6] & (1 << 7)) != 0) ? 255 : 0;
 
 	// PS Button, Touch Button
-	keyBuffer[DS4KeyCodes::PSButton] = ((input.buttons[2] & (1 << 0)) != 0) ? 255 : 0;
-	keyBuffer[DS4KeyCodes::TouchPad] = ((input.buttons[2] & (1 << 1)) != 0) ? 255 : 0;
+	keyBuffer[DS4KeyCodes::PSButton] = ((buf[7] & (1 << 0)) != 0) ? 255 : 0;
+	keyBuffer[DS4KeyCodes::TouchPad] = ((buf[7] & (1 << 1)) != 0) ? 255 : 0;
 
 	// L2, R2
-	keyBuffer[DS4KeyCodes::L2] = input.z;
-	keyBuffer[DS4KeyCodes::R2] = input.rz;
-
-	// Touch Pad
-	const auto apply_touch = [&keyBuffer](const ds4_touch_report& touch)
-	{
-		for (const ds4_touch_point& point : touch.points)
-		{
-			if (!(point.contact & DS4_TOUCH_POINT_INACTIVE))
-			{
-				const s32 x = (point.x_hi << 8) | point.x_lo;
-				const s32 y = (point.y_hi << 4) | point.y_lo;
-
-				const f32 x_scaled = ScaledInput(static_cast<float>(x), 0.0f, static_cast<float>(DS4_TOUCHPAD_WIDTH), 0.0f, 255.0f);
-				const f32 y_scaled = ScaledInput(static_cast<float>(y), 0.0f, static_cast<float>(DS4_TOUCHPAD_HEIGHT), 0.0f, 255.0f);
-
-				keyBuffer[DS4KeyCodes::Touch_L] = Clamp0To255((127.5f - x_scaled) * 2.0f);
-				keyBuffer[DS4KeyCodes::Touch_R] = Clamp0To255((x_scaled - 127.5f) * 2.0f);
-
-				keyBuffer[DS4KeyCodes::Touch_U] = Clamp0To255((127.5f - y_scaled) * 2.0f);
-				keyBuffer[DS4KeyCodes::Touch_D] = Clamp0To255((y_scaled - 127.5f) * 2.0f);
-			}
-		}
-	};
-
-	if (dev->bt_controller)
-	{
-		const ds4_input_report_bt& report = dev->report_bt;
-
-		for (u32 i = 0; i < std::min<u32>(report.num_touch_reports, ::size32(report.touch_reports)); i++)
-		{
-			apply_touch(report.touch_reports[i]);
-		}
-	}
-	else
-	{
-		const ds4_input_report_usb& report = dev->report_usb;
-
-		for (u32 i = 0; i < std::min<u32>(report.num_touch_reports, ::size32(report.touch_reports)); i++)
-		{
-			apply_touch(report.touch_reports[i]);
-		}
-	}
+	keyBuffer[DS4KeyCodes::L2] = buf[8];
+	keyBuffer[DS4KeyCodes::R2] = buf[9];
 
 	return keyBuffer;
 }
@@ -410,12 +358,12 @@ std::unordered_map<u64, u16> ds4_pad_handler::get_button_values(const std::share
 pad_preview_values ds4_pad_handler::get_preview_values(const std::unordered_map<u64, u16>& data)
 {
 	return {
-		::at32(data, L2),
-		::at32(data, R2),
-		::at32(data, LSXPos) - ::at32(data, LSXNeg),
-		::at32(data, LSYPos) - ::at32(data, LSYNeg),
-		::at32(data, RSXPos) - ::at32(data, RSXNeg),
-		::at32(data, RSYPos) - ::at32(data, RSYNeg)
+		data.at(L2),
+		data.at(R2),
+		data.at(LSXPos) - data.at(LSXNeg),
+		data.at(LSYPos) - data.at(LSYNeg),
+		data.at(RSXPos) - data.at(RSXNeg),
+		data.at(RSYPos) - data.at(RSYNeg)
 	};
 }
 
@@ -427,25 +375,23 @@ bool ds4_pad_handler::GetCalibrationData(DS4Device* ds4Dev) const
 		return false;
 	}
 
-	std::array<u8, 64> buf{};
-
+	std::array<u8, 64> buf;
 	if (ds4Dev->bt_controller)
 	{
 		for (int tries = 0; tries < 3; ++tries)
 		{
-			buf = {};
-			buf[0] = 0x05; // Calibration feature report id
+			buf[0] = 0x05;
 
-			if (int res = hid_get_feature_report(ds4Dev->hidDevice, buf.data(), DS4_FEATURE_REPORT_BLUETOOTH_CALIBRATION_SIZE); res != DS4_FEATURE_REPORT_BLUETOOTH_CALIBRATION_SIZE || buf[0] != 0x05)
+			if (hid_get_feature_report(ds4Dev->hidDevice, buf.data(), DS4_FEATURE_REPORT_0x05_SIZE) <= 0)
 			{
-				ds4_log.error("GetCalibrationData: hid_get_feature_report 0x05 for bluetooth controller failed! result=%d, error=%s", res, hid_error(ds4Dev->hidDevice));
+				ds4_log.error("GetCalibrationData: hid_get_feature_report 0x05 failed! Reason: %s", hid_error(ds4Dev->hidDevice));
 				return false;
 			}
 
 			const u8 btHdr = 0xA3;
 			const u32 crcHdr = CRCPP::CRC::Calculate(&btHdr, 1, crcTable);
-			const u32 crcCalc = CRCPP::CRC::Calculate(buf.data(), DS4_FEATURE_REPORT_BLUETOOTH_CALIBRATION_SIZE - 4, crcTable, crcHdr);
-			const u32 crcReported = read_u32(&buf[DS4_FEATURE_REPORT_BLUETOOTH_CALIBRATION_SIZE - 4]);
+			const u32 crcCalc = CRCPP::CRC::Calculate(buf.data(), (DS4_FEATURE_REPORT_0x05_SIZE - 4), crcTable, crcHdr);
+			const u32 crcReported = read_u32(&buf[DS4_FEATURE_REPORT_0x05_SIZE - 4]);
 
 			if (crcCalc == crcReported)
 				break;
@@ -462,9 +408,9 @@ bool ds4_pad_handler::GetCalibrationData(DS4Device* ds4Dev) const
 	else
 	{
 		buf[0] = 0x02;
-		if (int res = hid_get_feature_report(ds4Dev->hidDevice, buf.data(), DS4_FEATURE_REPORT_USB_CALIBRATION_SIZE); res != DS4_FEATURE_REPORT_USB_CALIBRATION_SIZE || buf[0] != 0x02)
+		if (hid_get_feature_report(ds4Dev->hidDevice, buf.data(), DS4_FEATURE_REPORT_0x02_SIZE) <= 0)
 		{
-			ds4_log.error("GetCalibrationData: hid_get_feature_report 0x02 for wired controller failed! result=%d, error=%s", res, hid_error(ds4Dev->hidDevice));
+			ds4_log.error("GetCalibrationData: hid_get_feature_report 0x02 failed! Reason: %s", hid_error(ds4Dev->hidDevice));
 			return false;
 		}
 	}
@@ -503,6 +449,7 @@ bool ds4_pad_handler::GetCalibrationData(DS4Device* ds4Dev) const
 		pitchNeg >= 0 || yawNeg >= 0 || rollNeg >= 0)
 	{
 		ds4_log.error("GetCalibrationData: calibration data check failed! pitchPlus=%d, pitchNeg=%d, rollPlus=%d, rollNeg=%d, yawPlus=%d, yawNeg=%d", pitchPlus, pitchNeg, rollPlus, rollNeg, yawPlus, yawNeg);
+		return false;
 	}
 
 	const s32 gyroSpeedScale = read_s16(&buf[19]) + read_s16(&buf[21]);
@@ -540,23 +487,19 @@ bool ds4_pad_handler::GetCalibrationData(DS4Device* ds4Dev) const
 
 	// Make sure data 'looks' valid, dongle will report invalid calibration data with no controller connected
 
-	for (usz i = 0; i < ds4Dev->calib_data.size(); i++)
+	for (const auto& data : ds4Dev->calib_data)
 	{
-		CalibData& data = ds4Dev->calib_data[i];
-
 		if (data.sens_denom == 0)
 		{
-			ds4_log.error("GetCalibrationData: Invalid accelerometer calibration data for axis %d, disabling calibration.", i);
-			data.bias = 0;
-			data.sens_numer = 4 * DS4_ACC_RES_PER_G;
-			data.sens_denom = std::numeric_limits<s16>::max();
+			ds4_log.error("GetCalibrationData: Failure: sens_denom == 0");
+			return false;
 		}
 	}
 
 	return true;
 }
 
-void ds4_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial)
+void ds4_pad_handler::check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view wide_serial)
 {
 	if (!hidDevice)
 	{
@@ -582,61 +525,76 @@ void ds4_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerated_dev
 	}
 
 	std::string serial;
-	for (wchar_t ch : wide_serial)
-		serial += static_cast<uchar>(ch);
 
-	const hid_device_info* devinfo = hid_get_device_info(hidDevice);
-	if (!devinfo)
+	// There isnt a nice 'portable' way with hidapi to detect bt vs wired as the pid/vid's are the same
+	// Let's try getting 0x81 feature report, which should will return mac address on wired, and should error on bluetooth
+	std::array<u8, 64> buf{};
+	buf[0] = 0x81;
+	if (const auto bytes_read = hid_get_feature_report(hidDevice, buf.data(), DS4_FEATURE_REPORT_0x81_SIZE); bytes_read > 0)
 	{
-		ds4_log.error("check_add_device: hid_get_device_info failed! error=%s", hid_error(hidDevice));
-		HidDevice::close(hidDevice);
-		return;
+		if (bytes_read != DS4_FEATURE_REPORT_0x81_SIZE)
+		{
+			// Controller may not be genuine. These controllers do not have feature 0x81 implemented and calibration data is in bluetooth format even in USB mode!
+			ds4_log.warning("check_add_device: DS4 controller may not be genuine. Workaround enabled.");
+
+			// Read feature report 0x12 instead which is what the console uses.
+			buf[0] = 0x12;
+			buf[1] = 0;
+			if (hid_get_feature_report(hidDevice, buf.data(), DS4_FEATURE_REPORT_0x12_SIZE) == -1)
+			{
+				ds4_log.error("check_add_device: hid_get_feature_report 0x12 failed! Reason: %s", hid_error(hidDevice));
+			}
+		}
+
+		serial = fmt::format("%x%x%x%x%x%x", buf[6], buf[5], buf[4], buf[3], buf[2], buf[1]);
+	}
+	else
+	{
+		device->bt_controller = true;
+		for (wchar_t ch : wide_serial)
+			serial += static_cast<uchar>(ch);
 	}
 
-	device->bt_controller = (devinfo->bus_type == HID_API_BUS_BLUETOOTH);
 	device->hidDevice = hidDevice;
 
 	if (!GetCalibrationData(device))
 	{
 		ds4_log.error("check_add_device: GetCalibrationData failed!");
-		device->close();
+		hid_close(hidDevice);
+		device->hidDevice = nullptr;
 		return;
 	}
 
-	u32 hw_version{};
-	u32 fw_version{};
-
-	std::array<u8, 64> buf{};
-	buf[0] = 0xA3;
-
-	int res = hid_get_feature_report(hidDevice, buf.data(), DS4_FEATURE_REPORT_FIRMWARE_INFO_SIZE);
-	if (res != DS4_FEATURE_REPORT_FIRMWARE_INFO_SIZE || buf[0] != 0xA3)
-	{
-		ds4_log.error("check_add_device: hid_get_feature_report 0xA3 failed! Could not retrieve firmware version! result=%d, buf[0]=0x%x, error=%s", res, buf[0], hid_error(hidDevice));
-	}
-	else
-	{
-		hw_version = read_u32(&buf[35]);
-		fw_version = read_u32(&buf[41]);
-		ds4_log.notice("check_add_device: Got firmware version: hw_version: 0x%x, fw_version: 0x%x", hw_version, fw_version);
-	}
-
 	if (hid_set_nonblocking(hidDevice, 1) == -1)
 	{
 		ds4_log.error("check_add_device: hid_set_nonblocking failed! Reason: %s", hid_error(hidDevice));
-		device->close();
+		hid_close(hidDevice);
+		device->hidDevice = nullptr;
 		return;
 	}
 
 	device->has_calib_data = true;
 	device->path           = path;
 
-	if (send_output_report(device) == -1)
-	{
-		ds4_log.error("check_add_device: send_output_report failed! Reason: %s", hid_error(hidDevice));
-	}
+	send_output_report(device);
 
-	ds4_log.notice("Added device: bluetooth=%d, serial='%s', hw_version: 0x%x, fw_version: 0x%x, path='%s'", device->bt_controller, serial, hw_version, fw_version, device->path);
+	ds4_log.notice("Added device: bluetooth=%d, serial='%s', path='%s'", device->bt_controller, serial, device->path);
+}
+
+ds4_pad_handler::~ds4_pad_handler()
+{
+	for (auto& controller : m_controllers)
+	{
+		if (controller.second && controller.second->hidDevice)
+		{
+			// Disable blinking and vibration
+			controller.second->small_motor = 0;
+			controller.second->large_motor = 0;
+			controller.second->led_delay_on = 0;
+			controller.second->led_delay_off = 0;
+			send_output_report(controller.second.get());
+		}
+	}
 }
 
 int ds4_pad_handler::send_output_report(DS4Device* device)
@@ -646,46 +604,52 @@ int ds4_pad_handler::send_output_report(DS4Device* device)
 
 	const auto config = device->config;
 	if (config == nullptr)
-		return -2; // hid_write returns -1 on error
+		return -2; // hid_write and hid_write_control return -1 on error
 
+	std::array<u8, 78> outputBuf{0};
 	// write rumble state
-	ds4_output_report_common common{};
-	common.valid_flag0 = 0x07;
-	common.motor_right = device->small_motor;
-	common.motor_left = device->large_motor;
-
-	// write LED color
-	common.lightbar_red = config->colorR;
-	common.lightbar_green = config->colorG;
-	common.lightbar_blue = config->colorB;
-
-	// alternating blink states with values 0-255: only setting both to zero disables blinking
-	// 255 is roughly 2 seconds, so setting both values to 255 results in a 4 second interval
-	// using something like (0,10) will heavily blink, while using (0, 255) will be slow. you catch the drift
-	common.lightbar_blink_on = device->led_delay_on;
-	common.lightbar_blink_off = device->led_delay_off;
-
 	if (device->bt_controller)
 	{
-		ds4_output_report_bt output{};
-		output.report_id = 0x11;
-		output.hw_control = 0xC4;
-		output.common = std::move(common);
+		outputBuf[0] = 0x11;
+		outputBuf[1] = 0xC4;
+		outputBuf[3] = 0x07;
+		outputBuf[6] = device->small_motor;
+		outputBuf[7] = device->large_motor;
+		outputBuf[8]  = config->colorR; // red
+		outputBuf[9]  = config->colorG; // green
+		outputBuf[10] = config->colorB; // blue
+
+		// alternating blink states with values 0-255: only setting both to zero disables blinking
+		// 255 is roughly 2 seconds, so setting both values to 255 results in a 4 second interval
+		// using something like (0,10) will heavily blink, while using (0, 255) will be slow. you catch the drift
+		outputBuf[11] = device->led_delay_on;
+		outputBuf[12] = device->led_delay_off;
 
 		const u8 btHdr = 0xA2;
 		const u32 crcHdr = CRCPP::CRC::Calculate(&btHdr, 1, crcTable);
-		const u32 crcCalc = CRCPP::CRC::Calculate(&output.report_id, offsetof(ds4_output_report_bt, crc32), crcTable, crcHdr);
+		const u32 crcCalc = CRCPP::CRC::Calculate(outputBuf.data(), (DS4_OUTPUT_REPORT_0x11_SIZE - 4), crcTable, crcHdr);
 
-		write_to_ptr(output.crc32, crcCalc);
+		outputBuf[74] = (crcCalc >> 0) & 0xFF;
+		outputBuf[75] = (crcCalc >> 8) & 0xFF;
+		outputBuf[76] = (crcCalc >> 16) & 0xFF;
+		outputBuf[77] = (crcCalc >> 24) & 0xFF;
 
-		return hid_write(device->hidDevice, &output.report_id, sizeof(ds4_output_report_bt));
+		return hid_write_control(device->hidDevice, outputBuf.data(), DS4_OUTPUT_REPORT_0x11_SIZE);
 	}
+	else
+	{
+		outputBuf[0] = 0x05;
+		outputBuf[1] = 0x07;
+		outputBuf[4] = device->small_motor;
+		outputBuf[5] = device->large_motor;
+		outputBuf[6] = config->colorR; // red
+		outputBuf[7] = config->colorG; // green
+		outputBuf[8] = config->colorB; // blue
+		outputBuf[9] = device->led_delay_on;
+		outputBuf[10] = device->led_delay_off;
 
-	ds4_output_report_usb output{};
-	output.report_id = 0x05;
-	output.common = std::move(common);
-
-	return hid_write(device->hidDevice, &output.report_id, sizeof(ds4_output_report_usb));
+		return hid_write(device->hidDevice, outputBuf.data(), DS4_OUTPUT_REPORT_0x05_SIZE);
+	}
 }
 
 ds4_pad_handler::DataStatus ds4_pad_handler::get_data(DS4Device* device)
@@ -693,9 +657,9 @@ ds4_pad_handler::DataStatus ds4_pad_handler::get_data(DS4Device* device)
 	if (!device || !device->hidDevice)
 		return DataStatus::ReadError;
 
-	std::array<u8, std::max(sizeof(ds4_input_report_bt), sizeof(ds4_input_report_usb))> buf{};
+	std::array<u8, 78> buf{};
 
-	const int res = hid_read(device->hidDevice, buf.data(), device->bt_controller ? sizeof(ds4_input_report_bt) : sizeof(ds4_input_report_usb));
+	const int res = hid_read(device->hidDevice, buf.data(), device->bt_controller ? 78 : 64);
 	if (res == -1)
 	{
 		// looks like controller disconnected or read error
@@ -712,81 +676,72 @@ ds4_pad_handler::DataStatus ds4_pad_handler::get_data(DS4Device* device)
 		// tells controller to send 0x11 reports
 		std::array<u8, 64> buf_error{};
 		buf_error[0] = 0x2;
-		if (int res = hid_get_feature_report(device->hidDevice, buf_error.data(), buf_error.size()); res != static_cast<int>(buf_error.size()) || buf_error[0] != 0x2)
+		if (hid_get_feature_report(device->hidDevice, buf_error.data(), buf_error.size()) == -1)
 		{
-			ds4_log.error("GetRawData: hid_get_feature_report 0x2 failed! result=%d, buf[0]=0x%x, error=%s", res, buf[0], hid_error(device->hidDevice));
+			ds4_log.error("GetRawData: hid_get_feature_report 0x2 failed! Reason: %s", hid_error(device->hidDevice));
 		}
 		return DataStatus::NoNewData;
 	}
 
-	int offset = 0;
-
+	int offset;
 	// check report and set offset
-	if (device->bt_controller && buf[0] == 0x11 && res == sizeof(ds4_input_report_bt))
+	if (device->bt_controller && buf[0] == 0x11 && res == 78)
 	{
-		offset = offsetof(ds4_input_report_bt, common);
+		offset = 2;
 
 		const u8 btHdr = 0xA1;
 		const u32 crcHdr = CRCPP::CRC::Calculate(&btHdr, 1, crcTable);
-		const u32 crcCalc = CRCPP::CRC::Calculate(buf.data(), offsetof(ds4_input_report_bt, crc32), crcTable, crcHdr);
-		const u32 crcReported = read_u32(&buf[offsetof(ds4_input_report_bt, crc32)]);
+		const u32 crcCalc = CRCPP::CRC::Calculate(buf.data(), (DS4_INPUT_REPORT_0x11_SIZE - 4), crcTable, crcHdr);
+		const u32 crcReported = read_u32(&buf[DS4_INPUT_REPORT_0x11_SIZE - 4]);
 		if (crcCalc != crcReported)
 		{
 			ds4_log.warning("Data packet CRC check failed, ignoring! Received 0x%x, Expected 0x%x", crcReported, crcCalc);
 			return DataStatus::NoNewData;
 		}
 	}
-	else if (!device->bt_controller && buf[0] == 0x01 && res == sizeof(ds4_input_report_usb))
+	else if (!device->bt_controller && buf[0] == 0x01 && res == 64)
 	{
 		// Ds4 Dongle uses this bit to actually report whether a controller is connected
-		const bool connected = !(buf[31] & 0x04);
+		const bool connected = (buf[31] & 0x04) ? false : true;
 		if (connected && !device->has_calib_data)
 			device->has_calib_data = GetCalibrationData(device);
 
-		offset = offsetof(ds4_input_report_usb, common);
+		offset = 0;
 	}
 	else
 		return DataStatus::NoNewData;
 
-	const int battery_offset = offset + offsetof(ds4_input_report_common, status);
+	const int battery_offset = offset + DS4_INPUT_REPORT_BATTERY_OFFSET;
 	device->cable_state = (buf[battery_offset] >> 4) & 0x01;
 	device->battery_level = buf[battery_offset] & 0x0F; // 0 - 9 while unplugged, 0 - 10 while plugged in, 11 charge complete
 
 	if (device->has_calib_data)
 	{
-		int calib_offset = offset + offsetof(ds4_input_report_common, gyro);
+		int calibOffset = offset + DS4_INPUT_REPORT_GYRO_X_OFFSET;
 		for (int i = 0; i < CalibIndex::COUNT; ++i)
 		{
-			const s16 raw_value = read_s16(&buf[calib_offset]);
-			const s16 cal_value = apply_calibration(raw_value, device->calib_data[i]);
-			buf[calib_offset++] = (static_cast<u16>(cal_value) >> 0) & 0xFF;
-			buf[calib_offset++] = (static_cast<u16>(cal_value) >> 8) & 0xFF;
+			const s16 rawValue = read_s16(&buf[calibOffset]);
+			const s16 calValue = apply_calibration(rawValue, device->calib_data[i]);
+			buf[calibOffset++] = (static_cast<u16>(calValue) >> 0) & 0xFF;
+			buf[calibOffset++] = (static_cast<u16>(calValue) >> 8) & 0xFF;
 		}
 	}
-
-	if (device->bt_controller)
-	{
-		std::memcpy(&device->report_bt, buf.data(), sizeof(ds4_input_report_bt));
-	}
-	else
-	{
-		std::memcpy(&device->report_usb, buf.data(), sizeof(ds4_input_report_usb));
-	}
+	memcpy(device->padData.data(), &buf[offset], 64);
 
 	return DataStatus::NewData;
 }
 
-bool ds4_pad_handler::get_is_left_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool ds4_pad_handler::get_is_left_trigger(u64 keyCode)
 {
 	return keyCode == DS4KeyCodes::L2;
 }
 
-bool ds4_pad_handler::get_is_right_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool ds4_pad_handler::get_is_right_trigger(u64 keyCode)
 {
 	return keyCode == DS4KeyCodes::R2;
 }
 
-bool ds4_pad_handler::get_is_left_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool ds4_pad_handler::get_is_left_stick(u64 keyCode)
 {
 	switch (keyCode)
 	{
@@ -800,7 +755,7 @@ bool ds4_pad_handler::get_is_left_stick(const std::shared_ptr<PadDevice>& /*devi
 	}
 }
 
-bool ds4_pad_handler::get_is_right_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool ds4_pad_handler::get_is_right_stick(u64 keyCode)
 {
 	switch (keyCode)
 	{
@@ -814,40 +769,25 @@ bool ds4_pad_handler::get_is_right_stick(const std::shared_ptr<PadDevice>& /*dev
 	}
 }
 
-bool ds4_pad_handler::get_is_touch_pad_motion(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
-{
-	switch (keyCode)
-	{
-	case DS4KeyCodes::Touch_L:
-	case DS4KeyCodes::Touch_R:
-	case DS4KeyCodes::Touch_U:
-	case DS4KeyCodes::Touch_D:
-		return true;
-	default:
-		return false;
-	}
-}
-
 PadHandlerBase::connection ds4_pad_handler::update_connection(const std::shared_ptr<PadDevice>& device)
 {
-	DS4Device* dev = static_cast<DS4Device*>(device.get());
-	if (!dev || dev->path == hid_enumerated_device_default)
+	DS4Device* ds4_dev = static_cast<DS4Device*>(device.get());
+	if (!ds4_dev || ds4_dev->path.empty())
 		return connection::disconnected;
 
-	if (dev->hidDevice == nullptr)
+	if (ds4_dev->hidDevice == nullptr)
 	{
 		// try to reconnect
-		if (hid_device* hid_dev = dev->open())
+		hid_device* dev = hid_open_path(ds4_dev->path.c_str());
+		if (dev)
 		{
-			if (hid_set_nonblocking(hid_dev, 1) == -1)
+			if (hid_set_nonblocking(dev, 1) == -1)
 			{
-				ds4_log.error("Reconnecting Device %s: hid_set_nonblocking failed with error %s", dev->path, hid_error(hid_dev));
-			}
-
-			if (!dev->has_calib_data)
-			{
-				dev->has_calib_data = GetCalibrationData(dev);
+				ds4_log.error("Reconnecting Device %s: hid_set_nonblocking failed with error %s", ds4_dev->path, hid_error(dev));
 			}
+			ds4_dev->hidDevice = dev;
+			if (!ds4_dev->has_calib_data)
+				ds4_dev->has_calib_data = GetCalibrationData(ds4_dev);
 		}
 		else
 		{
@@ -856,10 +796,11 @@ PadHandlerBase::connection ds4_pad_handler::update_connection(const std::shared_
 		}
 	}
 
-	if (get_data(dev) == DataStatus::ReadError)
+	if (get_data(ds4_dev) == DataStatus::ReadError)
 	{
 		// this also can mean disconnected, either way deal with it on next loop and reconnect
-		dev->close();
+		hid_close(ds4_dev->hidDevice);
+		ds4_dev->hidDevice = nullptr;
 
 		return connection::no_data;
 	}
@@ -867,63 +808,62 @@ PadHandlerBase::connection ds4_pad_handler::update_connection(const std::shared_
 	return connection::connected;
 }
 
-void ds4_pad_handler::get_extended_info(const pad_ensemble& binding)
+void ds4_pad_handler::get_extended_info(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad)
 {
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
-	DS4Device* dev = static_cast<DS4Device*>(device.get());
-	if (!dev || !pad)
+	DS4Device* ds4_device = static_cast<DS4Device*>(device.get());
+	if (!ds4_device || !pad)
 		return;
 
-	const ds4_input_report_common& input = dev->bt_controller ? dev->report_bt.common : dev->report_usb.common;
+	auto buf = ds4_device->padData;
 
-	pad->m_battery_level = dev->battery_level;
-	pad->m_cable_state   = dev->cable_state;
+	pad->m_battery_level = ds4_device->battery_level;
+	pad->m_cable_state   = ds4_device->cable_state;
 
 	// these values come already calibrated, all we need to do is convert to ds3 range
 
-	// acceleration (linear velocity in m/s²)
-	const f32 accel_x = static_cast<s16>(input.accel[0]) / static_cast<f32>(DS4_ACC_RES_PER_G) * -1;
-	const f32 accel_y = static_cast<s16>(input.accel[1]) / static_cast<f32>(DS4_ACC_RES_PER_G) * -1;
-	const f32 accel_z = static_cast<s16>(input.accel[2]) / static_cast<f32>(DS4_ACC_RES_PER_G) * -1;
-
-	// gyro (angular velocity in degree/s)
-	const f32 gyro_x = static_cast<s16>(input.gyro[0]) / static_cast<f32>(DS4_GYRO_RES_PER_DEG_S) * -1;
-	const f32 gyro_y = static_cast<s16>(input.gyro[1]) / static_cast<f32>(DS4_GYRO_RES_PER_DEG_S) * -1;
-	const f32 gyro_z = static_cast<s16>(input.gyro[2]) / static_cast<f32>(DS4_GYRO_RES_PER_DEG_S) * -1;
+	// accel
+	f32 accelX = static_cast<s16>((buf[20] << 8) | buf[19]) / static_cast<f32>(DS4_ACC_RES_PER_G) * -1;
+	f32 accelY = static_cast<s16>((buf[22] << 8) | buf[21]) / static_cast<f32>(DS4_ACC_RES_PER_G) * -1;
+	f32 accelZ = static_cast<s16>((buf[24] << 8) | buf[23]) / static_cast<f32>(DS4_ACC_RES_PER_G) * -1;
 
 	// now just use formula from ds3
-	pad->m_sensors[0].m_value = Clamp0To1023(accel_x * MOTION_ONE_G + 512);
-	pad->m_sensors[1].m_value = Clamp0To1023(accel_y * MOTION_ONE_G + 512);
-	pad->m_sensors[2].m_value = Clamp0To1023(accel_z * MOTION_ONE_G + 512);
+	accelX = accelX * 113 + 512;
+	accelY = accelY * 113 + 512;
+	accelZ = accelZ * 113 + 512;
 
-	// gyro_y is yaw, which is all that we need.
-	// Convert to ds3. The ds3 resolution is 123/90°/sec.
-	pad->m_sensors[3].m_value = Clamp0To1023(gyro_y * (123.f / 90.f) + 512);
+	pad->m_sensors[0].m_value = Clamp0To1023(accelX);
+	pad->m_sensors[1].m_value = Clamp0To1023(accelY);
+	pad->m_sensors[2].m_value = Clamp0To1023(accelZ);
 
-	// Set raw orientation
-	set_raw_orientation(pad->move_data, accel_x, accel_y, accel_z, gyro_x, gyro_y, gyro_z);
+	// gyroX is yaw, which is all that we need
+	f32 gyroX = static_cast<s16>((buf[16] << 8) | buf[15]) / static_cast<f32>(DS4_GYRO_RES_PER_DEG_S) * -1;
+	//const int gyroY = ((u16)(buf[14] << 8) | buf[13]) / 256;
+	//const int gyroZ = ((u16)(buf[18] << 8) | buf[17]) / 256;
+
+	// convert to ds3
+	gyroX = gyroX * (123.f / 90.f) + 512;
+
+	pad->m_sensors[3].m_value = Clamp0To1023(gyroX);
 }
 
-void ds4_pad_handler::apply_pad_data(const pad_ensemble& binding)
+void ds4_pad_handler::apply_pad_data(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad)
 {
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
-	DS4Device* dev = static_cast<DS4Device*>(device.get());
-	if (!dev || !dev->hidDevice || !dev->config || !pad)
+	DS4Device* ds4_dev = static_cast<DS4Device*>(device.get());
+	if (!ds4_dev || !ds4_dev->hidDevice || !ds4_dev->config || !pad)
 		return;
 
-	cfg_pad* config = dev->config;
+	cfg_pad* config = ds4_dev->config;
 
 	// Attempt to send rumble no matter what
-	const u8 speed_large = config->get_large_motor_speed(pad->m_vibrateMotors);
-	const u8 speed_small = config->get_small_motor_speed(pad->m_vibrateMotors);
+	const int idx_l = config->switch_vibration_motors ? 1 : 0;
+	const int idx_s = config->switch_vibration_motors ? 0 : 1;
 
-	const bool wireless    = dev->cable_state == 0;
-	const bool low_battery = dev->battery_level < 2;
-	const bool is_blinking = dev->led_delay_on > 0 || dev->led_delay_off > 0;
+	const int speed_large = config->enable_vibration_motor_large ? pad->m_vibrateMotors[idx_l].m_value : vibration_min;
+	const int speed_small = config->enable_vibration_motor_small ? pad->m_vibrateMotors[idx_s].m_value : vibration_min;
+
+	const bool wireless    = ds4_dev->cable_state == 0;
+	const bool low_battery = ds4_dev->battery_level < 2;
+	const bool is_blinking = ds4_dev->led_delay_on > 0 || ds4_dev->led_delay_off > 0;
 
 	// Blink LED when battery is low
 	if (config->led_low_battery_blink)
@@ -931,16 +871,16 @@ void ds4_pad_handler::apply_pad_data(const pad_ensemble& binding)
 		// we are now wired or have okay battery level -> stop blinking
 		if (is_blinking && !(wireless && low_battery))
 		{
-			dev->led_delay_on = 0;
-			dev->led_delay_off = 0;
-			dev->new_output_data = true;
+			ds4_dev->led_delay_on = 0;
+			ds4_dev->led_delay_off = 0;
+			ds4_dev->new_output_data = true;
 		}
 		// we are now wireless and low on battery -> blink
 		else if (!is_blinking && wireless && low_battery)
 		{
-			dev->led_delay_on = 100;
-			dev->led_delay_off = 100;
-			dev->new_output_data = true;
+			ds4_dev->led_delay_on = 100;
+			ds4_dev->led_delay_off = 100;
+			ds4_dev->new_output_data = true;
 		}
 	}
 
@@ -948,35 +888,27 @@ void ds4_pad_handler::apply_pad_data(const pad_ensemble& binding)
 	if (config->led_battery_indicator)
 	{
 		// This makes sure that the LED color doesn't update every 1ms. DS4 only reports battery level in 10% increments
-		if (dev->last_battery_level != dev->battery_level)
+		if (ds4_dev->last_battery_level != ds4_dev->battery_level)
 		{
-			const u32 combined_color = get_battery_color(dev->battery_level, config->led_battery_indicator_brightness);
+			const u32 combined_color = get_battery_color(ds4_dev->battery_level, config->led_battery_indicator_brightness);
 			config->colorR.set(combined_color >> 8);
 			config->colorG.set(combined_color & 0xff);
 			config->colorB.set(0);
-			dev->new_output_data = true;
-			dev->last_battery_level = dev->battery_level;
+			ds4_dev->new_output_data = true;
+			ds4_dev->last_battery_level = ds4_dev->battery_level;
 		}
 	}
 
-	dev->new_output_data |= dev->large_motor != speed_large || dev->small_motor != speed_small;
+	ds4_dev->new_output_data |= ds4_dev->large_motor != speed_large || ds4_dev->small_motor != speed_small;
 
-	dev->large_motor = speed_large;
-	dev->small_motor = speed_small;
+	ds4_dev->large_motor = speed_large;
+	ds4_dev->small_motor = speed_small;
 
-	const auto now = steady_clock::now();
-	const auto elapsed = now - dev->last_output;
-
-	if (dev->new_output_data || elapsed > min_output_interval)
+	if (ds4_dev->new_output_data)
 	{
-		if (const int res = send_output_report(dev); res >= 0)
+		if (send_output_report(ds4_dev) >= 0)
 		{
-			dev->new_output_data = false;
-			dev->last_output = now;
-		}
-		else if (res == -1)
-		{
-			ds4_log.error("apply_pad_data: send_output_report failed! error=%s", hid_error(dev->hidDevice));
+			ds4_dev->new_output_data = false;
 		}
 	}
 }
diff --git a/rpcs3/Input/ds4_pad_handler.h b/rpcs3/Input/ds4_pad_handler.h
index 4fdb829d73..816eda727a 100644
--- a/rpcs3/Input/ds4_pad_handler.h
+++ b/rpcs3/Input/ds4_pad_handler.h
@@ -4,124 +4,12 @@
 
 #include <unordered_map>
 
-namespace reports
-{
-	constexpr u32 DS4_ACC_RES_PER_G = 8192;
-	constexpr u32 DS4_GYRO_RES_PER_DEG_S = 86; // technically this could be 1024, but keeping it at 86 keeps us within 16 bits of precision
-	constexpr u32 DS4_FEATURE_REPORT_USB_CALIBRATION_SIZE = 37;
-	constexpr u32 DS4_FEATURE_REPORT_BLUETOOTH_CALIBRATION_SIZE = 41;
-	//constexpr u32 DS4_FEATURE_REPORT_PAIRING_INFO_SIZE = 16;
-	//constexpr u32 DS4_FEATURE_REPORT_0x81_SIZE = 7;
-	constexpr u32 DS4_FEATURE_REPORT_FIRMWARE_INFO_SIZE = 49;
-	constexpr u32 DS4_INPUT_REPORT_USB_SIZE = 64;
-	constexpr u32 DS4_INPUT_REPORT_BLUETOOTH_SIZE = 78;
-	constexpr u32 DS4_OUTPUT_REPORT_USB_SIZE = 32;
-	constexpr u32 DS4_OUTPUT_REPORT_BLUETOOTH_SIZE = 78;
-	constexpr u32 DS4_TOUCHPAD_WIDTH = 1920;
-	constexpr u32 DS4_TOUCHPAD_HEIGHT = 942;
-	constexpr u32 DS4_TOUCH_POINT_INACTIVE = 0x80;
-
-	struct ds4_touch_point
-	{
-		u8 contact;
-		u8 x_lo;
-		u8 x_hi : 4;
-		u8 y_lo : 4;
-		u8 y_hi;
-	};
-	static_assert(sizeof(ds4_touch_point) == 4);
-
-	struct ds4_touch_report
-	{
-		u8 timestamp;
-		std::array<ds4_touch_point, 2> points;
-	};
-	static_assert(sizeof(ds4_touch_report) == 9);
-
-	struct ds4_input_report_common
-	{
-		u8 x;
-		u8 y;
-		u8 rx;
-		u8 ry;
-		u8 buttons[3];
-		u8 z;
-		u8 rz;
-		le_t<u16, 1> sensor_timestamp;
-		u8 sensor_temperature;
-		le_t<u16, 1> gyro[3];
-		le_t<u16, 1> accel[3];
-		u8 reserved2[5];
-		u8 status[2];
-		u8 reserved3;
-	};
-	static_assert(sizeof(ds4_input_report_common) == 32);
-
-	struct ds4_input_report_usb
-	{
-		u8 report_id;
-		ds4_input_report_common common;
-		u8 num_touch_reports;
-		std::array<ds4_touch_report, 3> touch_reports;
-		u8 reserved[3];
-	};
-	static_assert(sizeof(ds4_input_report_usb) == DS4_INPUT_REPORT_USB_SIZE);
-
-	struct ds4_input_report_bt
-	{
-		u8 report_id;
-		u8 reserved[2];
-		ds4_input_report_common common;
-		u8 num_touch_reports;
-		std::array<ds4_touch_report, 4> touch_reports;
-		u8 reserved2[2];
-		u8 crc32[4];
-	};
-	static_assert(sizeof(ds4_input_report_bt) == DS4_INPUT_REPORT_BLUETOOTH_SIZE);
-
-	struct ds4_output_report_common
-	{
-		u8 valid_flag0;
-		u8 valid_flag1;
-		u8 reserved;
-		u8 motor_right;
-		u8 motor_left;
-		u8 lightbar_red;
-		u8 lightbar_green;
-		u8 lightbar_blue;
-		u8 lightbar_blink_on;
-		u8 lightbar_blink_off;
-	};
-	static_assert(sizeof(ds4_output_report_common) == 10);
-
-	struct ds4_output_report_usb
-	{
-		u8 report_id;
-		ds4_output_report_common common;
-		u8 reserved[21];
-	};
-	static_assert(sizeof(ds4_output_report_usb) == DS4_OUTPUT_REPORT_USB_SIZE);
-
-	struct ds4_output_report_bt
-	{
-		u8 report_id;
-		u8 hw_control;
-		u8 audio_control;
-		ds4_output_report_common common;
-		u8 reserved[61];
-		u8 crc32[4];
-	};
-	static_assert(sizeof(ds4_output_report_bt) == DS4_OUTPUT_REPORT_BLUETOOTH_SIZE);
-}
-
 class DS4Device : public HidDevice
 {
 public:
 	bool bt_controller{false};
 	bool has_calib_data{false};
 	std::array<CalibData, CalibIndex::COUNT> calib_data{};
-	reports::ds4_input_report_usb report_usb{};
-	reports::ds4_input_report_bt report_bt{};
 };
 
 class ds4_pad_handler final : public hid_pad_handler<DS4Device>
@@ -151,11 +39,6 @@ class ds4_pad_handler final : public hid_pad_handler<DS4Device>
 		PSButton,
 		TouchPad,
 
-		Touch_L,
-		Touch_R,
-		Touch_U,
-		Touch_D,
-
 		L2,
 		R2,
 
@@ -173,7 +56,7 @@ public:
 	ds4_pad_handler();
 	~ds4_pad_handler();
 
-	void SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool player_led, bool battery_led, u32 battery_led_brightness) override;
+	void SetPadData(const std::string& padId, u8 player_id, u32 largeMotor, u32 smallMotor, s32 r, s32 g, s32 b, bool battery_led, u32 battery_led_brightness) override;
 	u32 get_battery_level(const std::string& padId) override;
 	void init_config(cfg_pad* cfg) override;
 
@@ -184,16 +67,15 @@ private:
 	// Copies data into padData if status is NewData, otherwise buffer is untouched
 	DataStatus get_data(DS4Device* ds4Device) override;
 	int send_output_report(DS4Device* device) override;
-	void check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view serial) override;
+	void check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view serial) override;
 
-	bool get_is_left_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_left_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_touch_pad_motion(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
+	bool get_is_left_trigger(u64 keyCode) override;
+	bool get_is_right_trigger(u64 keyCode) override;
+	bool get_is_left_stick(u64 keyCode) override;
+	bool get_is_right_stick(u64 keyCode) override;
 	PadHandlerBase::connection update_connection(const std::shared_ptr<PadDevice>& device) override;
-	void get_extended_info(const pad_ensemble& binding) override;
-	void apply_pad_data(const pad_ensemble& binding) override;
+	void get_extended_info(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad) override;
+	void apply_pad_data(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad) override;
 	std::unordered_map<u64, u16> get_button_values(const std::shared_ptr<PadDevice>& device) override;
 	pad_preview_values get_preview_values(const std::unordered_map<u64, u16>& data) override;
 };
diff --git a/rpcs3/Input/dualsense_pad_handler.cpp b/rpcs3/Input/dualsense_pad_handler.cpp
index 63c4b6d8b6..c9383a363d 100644
--- a/rpcs3/Input/dualsense_pad_handler.cpp
+++ b/rpcs3/Input/dualsense_pad_handler.cpp
@@ -2,16 +2,12 @@
 #include "dualsense_pad_handler.h"
 #include "Emu/Io/pad_config.h"
 
-#include <limits>
-
 LOG_CHANNEL(dualsense_log, "DualSense");
 
-using namespace reports;
-
 template <>
 void fmt_class_string<DualSenseDevice::DualSenseDataMode>::format(std::string& out, u64 arg)
 {
-	format_enum(out, arg, [](DualSenseDevice::DualSenseDataMode mode)
+	format_enum(out, arg, [](auto mode)
 	{
 		switch (mode)
 		{
@@ -25,12 +21,76 @@ void fmt_class_string<DualSenseDevice::DualSenseDataMode>::format(std::string& o
 
 namespace
 {
-	constexpr id_pair SONY_DUALSENSE_ID_0 = {0x054C, 0x0CE6}; // DualSense
-	constexpr id_pair SONY_DUALSENSE_ID_1 = {0x054C, 0x0DF2}; // DualSense Edge
+	constexpr u32 DUALSENSE_ACC_RES_PER_G = 8192;
+	constexpr u32 DUALSENSE_GYRO_RES_PER_DEG_S = 1024;
+	constexpr u32 DUALSENSE_CALIBRATION_REPORT_SIZE = 41;
+	constexpr u32 DUALSENSE_BLUETOOTH_REPORT_SIZE = 78;
+	constexpr u32 DUALSENSE_USB_REPORT_SIZE = 63;
+	constexpr u32 DUALSENSE_COMMON_REPORT_SIZE = 47;
+	constexpr u32 DUALSENSE_INPUT_REPORT_GYRO_X_OFFSET = 15;
+
+	constexpr u16 DUALSENSE_VID = 0x054C;
+	constexpr u16 DUALSENSE_PID = 0x0CE6;
+
+	enum
+	{
+		VALID_FLAG_0_COMPATIBLE_VIBRATION            = 0x01,
+		VALID_FLAG_0_HAPTICS_SELECT                  = 0x02,
+		VALID_FLAG_1_MIC_MUTE_LED_CONTROL_ENABLE     = 0x01,
+		VALID_FLAG_1_POWER_SAVE_CONTROL_ENABLE       = 0x02,
+		VALID_FLAG_1_LIGHTBAR_CONTROL_ENABLE         = 0x04,
+		VALID_FLAG_1_RELEASE_LEDS                    = 0x08,
+		VALID_FLAG_1_PLAYER_INDICATOR_CONTROL_ENABLE = 0x10,
+		VALID_FLAG_2_LIGHTBAR_SETUP_CONTROL_ENABLE   = 0x02,
+		POWER_SAVE_CONTROL_MIC_MUTE                  = 0x10,
+		LIGHTBAR_SETUP_LIGHT_ON                      = 0x01,
+		LIGHTBAR_SETUP_LIGHT_OUT                     = 0x02,
+	};
+	
+	struct output_report_common
+	{
+		u8 valid_flag_0;
+		u8 valid_flag_1;
+		u8 motor_right;
+		u8 motor_left;
+		u8 reserved[4];
+		u8 mute_button_led;
+		u8 power_save_control;
+		u8 reserved_2[28];
+		u8 valid_flag_2;
+		u8 reserved_3[2];
+		u8 lightbar_setup;
+		u8 led_brightness;
+		u8 player_leds;
+		u8 lightbar_r;
+		u8 lightbar_g;
+		u8 lightbar_b;
+	};
+
+	struct output_report_bt
+	{
+		u8 report_id; // 0x31
+		u8 seq_tag;
+		u8 tag;
+		output_report_common common;
+		u8 reserved[24];
+		u8 crc32[4];
+	};
+
+	struct output_report_usb
+	{
+		u8 report_id; // 0x02
+		output_report_common common;
+		u8 reserved[15];
+	};
+
+	static_assert(sizeof(struct output_report_common) == DUALSENSE_COMMON_REPORT_SIZE);
+	static_assert(sizeof(struct output_report_bt) == DUALSENSE_BLUETOOTH_REPORT_SIZE);
+	static_assert(sizeof(struct output_report_usb) == DUALSENSE_USB_REPORT_SIZE);
 }
 
 dualsense_pad_handler::dualsense_pad_handler()
-    : hid_pad_handler<DualSenseDevice>(pad_handler::dualsense, {SONY_DUALSENSE_ID_0, SONY_DUALSENSE_ID_1})
+    : hid_pad_handler<DualSenseDevice>(pad_handler::dualsense, DUALSENSE_VID, {DUALSENSE_PID})
 {
 	// Unique names for the config files and our pad settings dialog
 	button_list =
@@ -52,10 +112,6 @@ dualsense_pad_handler::dualsense_pad_handler()
 		{ DualSenseKeyCodes::PSButton, "PS Button" },
 		{ DualSenseKeyCodes::Mic,      "Mic" },
 		{ DualSenseKeyCodes::TouchPad, "Touch Pad" },
-		{ DualSenseKeyCodes::Touch_L,  "Touch Left" },
-		{ DualSenseKeyCodes::Touch_R,  "Touch Right" },
-		{ DualSenseKeyCodes::Touch_U,  "Touch Up" },
-		{ DualSenseKeyCodes::Touch_D,  "Touch Down" },
 		{ DualSenseKeyCodes::L1,       "L1" },
 		{ DualSenseKeyCodes::L2,       "L2" },
 		{ DualSenseKeyCodes::L3,       "L3" },
@@ -66,11 +122,7 @@ dualsense_pad_handler::dualsense_pad_handler()
 		{ DualSenseKeyCodes::RSXNeg,   "RS X-" },
 		{ DualSenseKeyCodes::RSXPos,   "RS X+" },
 		{ DualSenseKeyCodes::RSYPos,   "RS Y+" },
-		{ DualSenseKeyCodes::RSYNeg,   "RS Y-" },
-		{ DualSenseKeyCodes::EdgeFnL,  "FN L" },
-		{ DualSenseKeyCodes::EdgeFnR,  "FN R" },
-		{ DualSenseKeyCodes::EdgeLB,   "LB" },
-		{ DualSenseKeyCodes::EdgeRB,   "RB" },
+		{ DualSenseKeyCodes::RSYNeg,   "RS Y-" }
 	};
 
 	init_configs();
@@ -79,18 +131,16 @@ dualsense_pad_handler::dualsense_pad_handler()
 	thumb_max = 255;
 	trigger_min = 0;
 	trigger_max = 255;
+	vibration_min = 0;
+	vibration_max = 255;
 
 	// Set capabilities
 	b_has_config = true;
 	b_has_rumble = true;
-	b_has_motion = true;
 	b_has_deadzones = true;
 	b_has_led = true;
 	b_has_rgb = true;
-	b_has_player_led = true;
 	b_has_battery = true;
-	b_has_battery_led = true;
-	b_has_orientation = true;
 
 	m_name_string = "DualSense Pad #";
 	m_max_devices = CELL_PAD_MAX_PORT_NUM;
@@ -99,7 +149,7 @@ dualsense_pad_handler::dualsense_pad_handler()
 	m_thumb_threshold   = thumb_max / 2;
 }
 
-void dualsense_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial)
+void dualsense_pad_handler::check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view wide_serial)
 {
 	if (!hidDevice)
 	{
@@ -124,23 +174,15 @@ void dualsense_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerat
 		return;
 	}
 
-	std::array<u8, std::max(DUALSENSE_FIRMWARE_REPORT_SIZE, DUALSENSE_PAIRING_REPORT_SIZE)> buf{};
+	std::string serial;
+
+	std::array<u8, 65> buf{};
 	buf[0] = 0x09;
 
 	// This will give us the bluetooth mac address of the device, regardless if we are on wired or bluetooth.
 	// So we can't use this to determine if it is a bluetooth device or not.
 	// Will also enable enhanced feature reports for bluetooth.
-	int res = hid_get_feature_report(hidDevice, buf.data(), buf.size());
-	if (res < 0 || buf[0] != 0x09)
-	{
-		dualsense_log.error("check_add_device: hid_get_feature_report 0x09 failed! result=%d, buf[0]=0x%x, error=%s", res, buf[0], hid_error(hidDevice));
-		HidDevice::close(hidDevice);
-		return;
-	}
-
-	std::string serial;
-
-	if (res == 21)
+	if (hid_get_feature_report(hidDevice, buf.data(), 64) == 21)
 	{
 		serial = fmt::format("%x%x%x%x%x%x", buf[6], buf[5], buf[4], buf[3], buf[2], buf[1]);
 		device->data_mode = DualSenseDevice::DualSenseDataMode::Enhanced;
@@ -149,8 +191,6 @@ void dualsense_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerat
 	{
 		// We're probably on Bluetooth in this case, but for whatever reason the feature report failed.
 		// This will give us a less capable fallback.
-		dualsense_log.warning("check_add_device: hid_get_feature_report returned wrong size! Falling back to simple mode. (result=%d)", res);
-
 		device->data_mode = DualSenseDevice::DualSenseDataMode::Simple;
 		for (wchar_t ch : wide_serial)
 			serial += static_cast<uchar>(ch);
@@ -161,63 +201,43 @@ void dualsense_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerat
 	if (!get_calibration_data(device))
 	{
 		dualsense_log.error("check_add_device: get_calibration_data failed!");
-		device->close();
+		hid_close(hidDevice);
+		device->hidDevice = nullptr;
 		return;
 	}
 
 	u32 hw_version{};
-	u16 fw_version{};
-	u32 fw_version2{};
+	u32 fw_version{};
 
-	buf = {};
 	buf[0] = 0x20;
-
-	res = hid_get_feature_report(hidDevice, buf.data(), DUALSENSE_FIRMWARE_REPORT_SIZE);
-	if (res != DUALSENSE_FIRMWARE_REPORT_SIZE || buf[0] != 0x20) // Old versions return 65, newer versions return 64
+	if (hid_get_feature_report(hidDevice, buf.data(), 64) == 65)
 	{
-		dualsense_log.error("check_add_device: hid_get_feature_report 0x20 failed! Could not retrieve firmware version! result=%d, buf[0]=0x%x, error=%s", res, buf[0], hid_error(hidDevice));
+		hw_version = read_u32(&buf[24]);
+		fw_version = read_u32(&buf[28]);
 	}
 	else
 	{
-		hw_version = read_u32(&buf[24]);
-		fw_version2 = read_u32(&buf[28]);
-		fw_version = static_cast<u16>(buf[44]) | (static_cast<u16>(buf[45]) << 8);
+		dualsense_log.error("Could not retrieve firmware version");
 	}
 
 	if (hid_set_nonblocking(hidDevice, 1) == -1)
 	{
 		dualsense_log.error("check_add_device: hid_set_nonblocking failed! Reason: %s", hid_error(hidDevice));
-		device->close();
+		hid_close(hidDevice);
+		device->hidDevice = nullptr;
 		return;
 	}
 
 	device->has_calib_data = true;
 	device->path           = path;
 
-	// Get feature set
-	if (const hid_device_info* info = hid_get_device_info(device->hidDevice))
-	{
-		if (info->product_id == SONY_DUALSENSE_ID_1.m_pid)
-		{
-			device->feature_set = DualSenseDevice::DualSenseFeatureSet::Edge;
-			dualsense_log.notice("check_add_device: device is DualSense Edge: vid=0x%x, pid=0x%x, path='%s'", info->vendor_id, info->product_id, path);
-		}
-	}
-	else
-	{
-		dualsense_log.warning("check_add_device: hid_get_device_info failed for determining feature set! Reason: %s", hid_error(hidDevice));
-	}
-
 	// Activate
-	if (send_output_report(device) == -1)
-	{
-		dualsense_log.error("check_add_device: send_output_report failed! Reason: %s", hid_error(hidDevice));
-	}
+	send_output_report(device);
 
 	// Get bluetooth information
 	get_data(device);
 
-	dualsense_log.notice("Added device: bluetooth=%d, data_mode=%s, serial='%s', hw_version: 0x%x, fw_version: 0x%x (0x%x), path='%s'", device->bt_controller, device->data_mode, serial, hw_version, fw_version, fw_version2, device->path);
+	dualsense_log.notice("Added device: bluetooth=%d, data_mode=%s, serial='%s', hw_version: 0x%x, fw_version: 0x%x, path='%s'", device->bt_controller, device->data_mode, serial, hw_version, fw_version, device->path);
 }
 
 void dualsense_pad_handler::init_config(cfg_pad* cfg)
@@ -225,39 +245,35 @@ void dualsense_pad_handler::init_config(cfg_pad* cfg)
 	if (!cfg) return;
 
 	// Set default button mapping
-	cfg->ls_left.def  = ::at32(button_list, DualSenseKeyCodes::LSXNeg);
-	cfg->ls_down.def  = ::at32(button_list, DualSenseKeyCodes::LSYNeg);
-	cfg->ls_right.def = ::at32(button_list, DualSenseKeyCodes::LSXPos);
-	cfg->ls_up.def    = ::at32(button_list, DualSenseKeyCodes::LSYPos);
-	cfg->rs_left.def  = ::at32(button_list, DualSenseKeyCodes::RSXNeg);
-	cfg->rs_down.def  = ::at32(button_list, DualSenseKeyCodes::RSYNeg);
-	cfg->rs_right.def = ::at32(button_list, DualSenseKeyCodes::RSXPos);
-	cfg->rs_up.def    = ::at32(button_list, DualSenseKeyCodes::RSYPos);
-	cfg->start.def    = ::at32(button_list, DualSenseKeyCodes::Options);
-	cfg->select.def   = ::at32(button_list, DualSenseKeyCodes::Share);
-	cfg->ps.def       = ::at32(button_list, DualSenseKeyCodes::PSButton);
-	cfg->square.def   = ::at32(button_list, DualSenseKeyCodes::Square);
-	cfg->cross.def    = ::at32(button_list, DualSenseKeyCodes::Cross);
-	cfg->circle.def   = ::at32(button_list, DualSenseKeyCodes::Circle);
-	cfg->triangle.def = ::at32(button_list, DualSenseKeyCodes::Triangle);
-	cfg->left.def     = ::at32(button_list, DualSenseKeyCodes::Left);
-	cfg->down.def     = ::at32(button_list, DualSenseKeyCodes::Down);
-	cfg->right.def    = ::at32(button_list, DualSenseKeyCodes::Right);
-	cfg->up.def       = ::at32(button_list, DualSenseKeyCodes::Up);
-	cfg->r1.def       = ::at32(button_list, DualSenseKeyCodes::R1);
-	cfg->r2.def       = ::at32(button_list, DualSenseKeyCodes::R2);
-	cfg->r3.def       = ::at32(button_list, DualSenseKeyCodes::R3);
-	cfg->l1.def       = ::at32(button_list, DualSenseKeyCodes::L1);
-	cfg->l2.def       = ::at32(button_list, DualSenseKeyCodes::L2);
-	cfg->l3.def       = ::at32(button_list, DualSenseKeyCodes::L3);
+	cfg->ls_left.def  = button_list.at(DualSenseKeyCodes::LSXNeg);
+	cfg->ls_down.def  = button_list.at(DualSenseKeyCodes::LSYNeg);
+	cfg->ls_right.def = button_list.at(DualSenseKeyCodes::LSXPos);
+	cfg->ls_up.def    = button_list.at(DualSenseKeyCodes::LSYPos);
+	cfg->rs_left.def  = button_list.at(DualSenseKeyCodes::RSXNeg);
+	cfg->rs_down.def  = button_list.at(DualSenseKeyCodes::RSYNeg);
+	cfg->rs_right.def = button_list.at(DualSenseKeyCodes::RSXPos);
+	cfg->rs_up.def    = button_list.at(DualSenseKeyCodes::RSYPos);
+	cfg->start.def    = button_list.at(DualSenseKeyCodes::Options);
+	cfg->select.def   = button_list.at(DualSenseKeyCodes::Share);
+	cfg->ps.def       = button_list.at(DualSenseKeyCodes::PSButton);
+	cfg->square.def   = button_list.at(DualSenseKeyCodes::Square);
+	cfg->cross.def    = button_list.at(DualSenseKeyCodes::Cross);
+	cfg->circle.def   = button_list.at(DualSenseKeyCodes::Circle);
+	cfg->triangle.def = button_list.at(DualSenseKeyCodes::Triangle);
+	cfg->left.def     = button_list.at(DualSenseKeyCodes::Left);
+	cfg->down.def     = button_list.at(DualSenseKeyCodes::Down);
+	cfg->right.def    = button_list.at(DualSenseKeyCodes::Right);
+	cfg->up.def       = button_list.at(DualSenseKeyCodes::Up);
+	cfg->r1.def       = button_list.at(DualSenseKeyCodes::R1);
+	cfg->r2.def       = button_list.at(DualSenseKeyCodes::R2);
+	cfg->r3.def       = button_list.at(DualSenseKeyCodes::R3);
+	cfg->l1.def       = button_list.at(DualSenseKeyCodes::L1);
+	cfg->l2.def       = button_list.at(DualSenseKeyCodes::L2);
+	cfg->l3.def       = button_list.at(DualSenseKeyCodes::L3);
 
-	cfg->pressure_intensity_button.def = ::at32(button_list, DualSenseKeyCodes::None);
-	cfg->analog_limiter_button.def = ::at32(button_list, DualSenseKeyCodes::None);
-	cfg->orientation_reset_button.def = ::at32(button_list, DualSenseKeyCodes::None);
+	cfg->pressure_intensity_button.def = button_list.at(DualSenseKeyCodes::None);
 
 	// Set default misc variables
-	cfg->lstick_anti_deadzone.def = static_cast<u32>(0.13 * thumb_max); // 13%
-	cfg->rstick_anti_deadzone.def = static_cast<u32>(0.13 * thumb_max); // 13%
 	cfg->lstickdeadzone.def    = 40; // between 0 and 255
 	cfg->rstickdeadzone.def    = 40; // between 0 and 255
 	cfg->ltriggerthreshold.def = 0;  // between 0 and 255
@@ -286,7 +302,7 @@ dualsense_pad_handler::DataStatus dualsense_pad_handler::get_data(DualSenseDevic
 
 	std::array<u8, 128> buf{};
 
-	const int res = hid_read(device->hidDevice, buf.data(), buf.size());
+	const int res = hid_read(device->hidDevice, buf.data(), 128);
 
 	if (res == -1)
 	{
@@ -298,36 +314,34 @@ dualsense_pad_handler::DataStatus dualsense_pad_handler::get_data(DualSenseDevic
 		return DataStatus::NoNewData;
 
 	u8 offset = 0;
-
 	switch (buf[0])
 	{
 	case 0x01:
 	{
-		if (res == sizeof(dualsense_input_report_bt))
+		if (res == DUALSENSE_BLUETOOTH_REPORT_SIZE)
 		{
 			device->data_mode     = DualSenseDevice::DualSenseDataMode::Simple;
 			device->bt_controller = true;
+			offset = 1;
 		}
 		else
 		{
 			device->data_mode     = DualSenseDevice::DualSenseDataMode::Enhanced;
 			device->bt_controller = false;
+			offset = 1;
 		}
-
-		offset = offsetof(dualsense_input_report_usb, common);
 		break;
 	}
 	case 0x31:
 	{
 		device->data_mode     = DualSenseDevice::DualSenseDataMode::Enhanced;
 		device->bt_controller = true;
-
-		offset = offsetof(dualsense_input_report_bt, common);
+		offset = 2;
 
 		const u8 btHdr = 0xA1;
 		const u32 crcHdr = CRCPP::CRC::Calculate(&btHdr, 1, crcTable);
-		const u32 crcCalc = CRCPP::CRC::Calculate(buf.data(), offsetof(dualsense_input_report_bt, crc32), crcTable, crcHdr);
-		const u32 crcReported = read_u32(&buf[offsetof(dualsense_input_report_bt, crc32)]);
+		const u32 crcCalc = CRCPP::CRC::Calculate(buf.data(), (DUALSENSE_BLUETOOTH_REPORT_SIZE - 4), crcTable, crcHdr);
+		const u32 crcReported = read_u32(&buf[DUALSENSE_BLUETOOTH_REPORT_SIZE - 4]);
 		if (crcCalc != crcReported)
 		{
 			dualsense_log.warning("Data packet CRC check failed, ignoring! Received 0x%x, Expected 0x%x", crcReported, crcCalc);
@@ -341,7 +355,7 @@ dualsense_pad_handler::DataStatus dualsense_pad_handler::get_data(DualSenseDevic
 
 	if (device->has_calib_data)
 	{
-		int calib_offset = offset + offsetof(dualsense_input_report_common, gyro);
+		int calib_offset = offset + DUALSENSE_INPUT_REPORT_GYRO_X_OFFSET;
 		for (int i = 0; i < CalibIndex::COUNT; ++i)
 		{
 			const s16 raw_value = read_s16(&buf[calib_offset]);
@@ -351,12 +365,10 @@ dualsense_pad_handler::DataStatus dualsense_pad_handler::get_data(DualSenseDevic
 		}
 	}
 
-	std::memcpy(&device->report, &buf[offset], sizeof(dualsense_input_report_common));
-
 	// For now let's only get battery info in enhanced mode
 	if (device->data_mode == DualSenseDevice::DualSenseDataMode::Enhanced)
 	{
-		const u8 battery_state = device->report.status;
+		const u8 battery_state = buf[offset + 52];
 		const u8 battery_value = battery_state & 0x0F; // 10% per unit, starting with 0-9%. So 100% equals unit 10
 		const u8 charge_info = (battery_state & 0xF0) >> 4;
 
@@ -382,29 +394,28 @@ dualsense_pad_handler::DataStatus dualsense_pad_handler::get_data(DualSenseDevic
 		}
 	}
 
+	memcpy(device->padData.data(), &buf[offset], 64);
 	return DataStatus::NewData;
 }
 
-bool dualsense_pad_handler::get_calibration_data(DualSenseDevice* dev) const
+bool dualsense_pad_handler::get_calibration_data(DualSenseDevice* dualsense_device) const
 {
-	if (!dev || !dev->hidDevice)
+	if (!dualsense_device || !dualsense_device->hidDevice)
 	{
 		dualsense_log.error("get_calibration_data called with null device");
 		return false;
 	}
 
-	std::array<u8, 64> buf{};
-
-	if (dev->bt_controller)
+	std::array<u8, 64> buf;
+	if (dualsense_device->bt_controller)
 	{
 		for (int tries = 0; tries < 3; ++tries)
 		{
-			buf = {};
 			buf[0] = 0x05;
 
-			if (int res = hid_get_feature_report(dev->hidDevice, buf.data(), DUALSENSE_CALIBRATION_REPORT_SIZE); res != DUALSENSE_CALIBRATION_REPORT_SIZE || buf[0] != 0x05)
+			if (hid_get_feature_report(dualsense_device->hidDevice, buf.data(), DUALSENSE_CALIBRATION_REPORT_SIZE) <= 0)
 			{
-				dualsense_log.error("get_calibration_data: hid_get_feature_report 0x05 for bluetooth controller failed! result=%d, buf[0]=0x%x, error=%s", res, buf[0], hid_error(dev->hidDevice));
+				dualsense_log.error("get_calibration_data: hid_get_feature_report 0x05 failed! Reason: %s", hid_error(dualsense_device->hidDevice));
 				return false;
 			}
 
@@ -429,23 +440,42 @@ bool dualsense_pad_handler::get_calibration_data(DualSenseDevice* dev) const
 	{
 		buf[0] = 0x05;
 
-		if (int res = hid_get_feature_report(dev->hidDevice, buf.data(), DUALSENSE_CALIBRATION_REPORT_SIZE); res != DUALSENSE_CALIBRATION_REPORT_SIZE || buf[0] != 0x05)
+		if (hid_get_feature_report(dualsense_device->hidDevice, buf.data(), DUALSENSE_CALIBRATION_REPORT_SIZE) <= 0)
 		{
-			dualsense_log.error("get_calibration_data: hid_get_feature_report 0x05 for wired controller failed! result=%d, buf[0]=0x%x, error=%s", res, buf[0], hid_error(dev->hidDevice));
+			dualsense_log.error("get_calibration_data: hid_get_feature_report 0x05 failed! Reason: %s", hid_error(dualsense_device->hidDevice));
 			return false;
 		}
 	}
 
-	dev->calib_data[CalibIndex::PITCH].bias = read_s16(&buf[1]);
-	dev->calib_data[CalibIndex::YAW].bias   = read_s16(&buf[3]);
-	dev->calib_data[CalibIndex::ROLL].bias  = read_s16(&buf[5]);
+	dualsense_device->calib_data[CalibIndex::PITCH].bias = read_s16(&buf[1]);
+	dualsense_device->calib_data[CalibIndex::YAW].bias   = read_s16(&buf[3]);
+	dualsense_device->calib_data[CalibIndex::ROLL].bias  = read_s16(&buf[5]);
 
-	const s16 pitch_plus  = read_s16(&buf[7]);
-	const s16 pitch_minus = read_s16(&buf[9]);
-	const s16 yaw_plus    = read_s16(&buf[11]);
-	const s16 yaw_minus   = read_s16(&buf[13]);
-	const s16 roll_plus   = read_s16(&buf[15]);
-	const s16 roll_minus  = read_s16(&buf[17]);
+	s16 pitch_plus, pitch_minus, roll_plus, roll_minus, yaw_plus, yaw_minus;
+
+	// TODO: This was copied from DS4. Find out if it applies here.
+	// Check for calibration data format
+	// It's going to be either alternating +/- or +++---
+	if (read_s16(&buf[9]) < 0 && read_s16(&buf[7]) > 0)
+	{
+		// Wired mode for OEM controllers
+		pitch_plus  = read_s16(&buf[7]);
+		pitch_minus = read_s16(&buf[9]);
+		yaw_plus    = read_s16(&buf[11]);
+		yaw_minus   = read_s16(&buf[13]);
+		roll_plus   = read_s16(&buf[15]);
+		roll_minus  = read_s16(&buf[17]);
+	}
+	else
+	{
+		// Bluetooth mode and wired mode for some 3rd party controllers
+		pitch_plus  = read_s16(&buf[7]);
+		yaw_plus    = read_s16(&buf[9]);
+		roll_plus   = read_s16(&buf[11]);
+		pitch_minus = read_s16(&buf[13]);
+		yaw_minus   = read_s16(&buf[15]);
+		roll_minus  = read_s16(&buf[17]);
+	}
 
 	// Confirm correctness. Need confirmation with dongle with no active controller
 	if (pitch_plus <= 0 || yaw_plus <= 0 || roll_plus <= 0 ||
@@ -453,18 +483,19 @@ bool dualsense_pad_handler::get_calibration_data(DualSenseDevice* dev) const
 	{
 		dualsense_log.error("get_calibration_data: calibration data check failed! pitch_plus=%d, pitch_minus=%d, roll_plus=%d, roll_minus=%d, yaw_plus=%d, yaw_minus=%d",
 		    pitch_plus, pitch_minus, roll_plus, roll_minus, yaw_plus, yaw_minus);
+		return false;
 	}
 
 	const s32 gyro_speed_scale = read_s16(&buf[19]) + read_s16(&buf[21]);
 
-	dev->calib_data[CalibIndex::PITCH].sens_numer = gyro_speed_scale * DUALSENSE_GYRO_RES_PER_DEG_S;
-	dev->calib_data[CalibIndex::PITCH].sens_denom = pitch_plus - pitch_minus;
+	dualsense_device->calib_data[CalibIndex::PITCH].sens_numer = gyro_speed_scale * DUALSENSE_GYRO_RES_PER_DEG_S;
+	dualsense_device->calib_data[CalibIndex::PITCH].sens_denom = pitch_plus - pitch_minus;
 
-	dev->calib_data[CalibIndex::YAW].sens_numer = gyro_speed_scale * DUALSENSE_GYRO_RES_PER_DEG_S;
-	dev->calib_data[CalibIndex::YAW].sens_denom = yaw_plus - yaw_minus;
+	dualsense_device->calib_data[CalibIndex::YAW].sens_numer = gyro_speed_scale * DUALSENSE_GYRO_RES_PER_DEG_S;
+	dualsense_device->calib_data[CalibIndex::YAW].sens_denom = yaw_plus - yaw_minus;
 
-	dev->calib_data[CalibIndex::ROLL].sens_numer = gyro_speed_scale * DUALSENSE_GYRO_RES_PER_DEG_S;
-	dev->calib_data[CalibIndex::ROLL].sens_denom = roll_plus - roll_minus;
+	dualsense_device->calib_data[CalibIndex::ROLL].sens_numer = gyro_speed_scale * DUALSENSE_GYRO_RES_PER_DEG_S;
+	dualsense_device->calib_data[CalibIndex::ROLL].sens_denom = roll_plus - roll_minus;
 
 	const s16 accel_x_plus  = read_s16(&buf[23]);
 	const s16 accel_x_minus = read_s16(&buf[25]);
@@ -477,47 +508,43 @@ bool dualsense_pad_handler::get_calibration_data(DualSenseDevice* dev) const
 	const s32 accel_y_range = accel_y_plus - accel_y_minus;
 	const s32 accel_z_range = accel_z_plus - accel_z_minus;
 
-	dev->calib_data[CalibIndex::X].bias       = accel_x_plus - accel_x_range / 2;
-	dev->calib_data[CalibIndex::X].sens_numer = 2 * DUALSENSE_ACC_RES_PER_G;
-	dev->calib_data[CalibIndex::X].sens_denom = accel_x_range;
+	dualsense_device->calib_data[CalibIndex::X].bias       = accel_x_plus - accel_x_range / 2;
+	dualsense_device->calib_data[CalibIndex::X].sens_numer = 2 * DUALSENSE_ACC_RES_PER_G;
+	dualsense_device->calib_data[CalibIndex::X].sens_denom = accel_x_range;
 
-	dev->calib_data[CalibIndex::Y].bias       = accel_y_plus - accel_y_range / 2;
-	dev->calib_data[CalibIndex::Y].sens_numer = 2 * DUALSENSE_ACC_RES_PER_G;
-	dev->calib_data[CalibIndex::Y].sens_denom = accel_y_range;
+	dualsense_device->calib_data[CalibIndex::Y].bias       = accel_y_plus - accel_y_range / 2;
+	dualsense_device->calib_data[CalibIndex::Y].sens_numer = 2 * DUALSENSE_ACC_RES_PER_G;
+	dualsense_device->calib_data[CalibIndex::Y].sens_denom = accel_y_range;
 
-	dev->calib_data[CalibIndex::Z].bias       = accel_z_plus - accel_z_range / 2;
-	dev->calib_data[CalibIndex::Z].sens_numer = 2 * DUALSENSE_ACC_RES_PER_G;
-	dev->calib_data[CalibIndex::Z].sens_denom = accel_z_range;
+	dualsense_device->calib_data[CalibIndex::Z].bias       = accel_z_plus - accel_z_range / 2;
+	dualsense_device->calib_data[CalibIndex::Z].sens_numer = 2 * DUALSENSE_ACC_RES_PER_G;
+	dualsense_device->calib_data[CalibIndex::Z].sens_denom = accel_z_range;
 
 	// Make sure data 'looks' valid, dongle will report invalid calibration data with no controller connected
 
-	for (usz i = 0; i < dev->calib_data.size(); i++)
+	for (const auto& data : dualsense_device->calib_data)
 	{
-		CalibData& data = dev->calib_data[i];
-
 		if (data.sens_denom == 0)
 		{
-			dualsense_log.error("GetCalibrationData: Invalid accelerometer calibration data for axis %d, disabling calibration.", i);
-			data.bias = 0;
-			data.sens_numer = 4 * DUALSENSE_ACC_RES_PER_G;
-			data.sens_denom = std::numeric_limits<s16>::max();
+			dualsense_log.error("get_calibration_data: Failure: sens_denom == 0");
+			return false;
 		}
 	}
 
 	return true;
 }
 
-bool dualsense_pad_handler::get_is_left_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool dualsense_pad_handler::get_is_left_trigger(u64 keyCode)
 {
 	return keyCode == DualSenseKeyCodes::L2;
 }
 
-bool dualsense_pad_handler::get_is_right_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool dualsense_pad_handler::get_is_right_trigger(u64 keyCode)
 {
 	return keyCode == DualSenseKeyCodes::R2;
 }
 
-bool dualsense_pad_handler::get_is_left_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool dualsense_pad_handler::get_is_left_stick(u64 keyCode)
 {
 	switch (keyCode)
 	{
@@ -531,7 +558,7 @@ bool dualsense_pad_handler::get_is_left_stick(const std::shared_ptr<PadDevice>&
 	}
 }
 
-bool dualsense_pad_handler::get_is_right_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool dualsense_pad_handler::get_is_right_stick(u64 keyCode)
 {
 	switch (keyCode)
 	{
@@ -545,40 +572,25 @@ bool dualsense_pad_handler::get_is_right_stick(const std::shared_ptr<PadDevice>&
 	}
 }
 
-bool dualsense_pad_handler::get_is_touch_pad_motion(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
-{
-	switch (keyCode)
-	{
-	case DualSenseKeyCodes::Touch_L:
-	case DualSenseKeyCodes::Touch_R:
-	case DualSenseKeyCodes::Touch_U:
-	case DualSenseKeyCodes::Touch_D:
-		return true;
-	default:
-		return false;
-	}
-}
-
 PadHandlerBase::connection dualsense_pad_handler::update_connection(const std::shared_ptr<PadDevice>& device)
 {
-	DualSenseDevice* dev = static_cast<DualSenseDevice*>(device.get());
-	if (!dev || dev->path == hid_enumerated_device_default)
+	DualSenseDevice* dualsense_dev = static_cast<DualSenseDevice*>(device.get());
+	if (!dualsense_dev || dualsense_dev->path.empty())
 		return connection::disconnected;
 
-	if (dev->hidDevice == nullptr)
+	if (dualsense_dev->hidDevice == nullptr)
 	{
 		// try to reconnect
-		if (hid_device* hid_dev = dev->open())
+		hid_device* dev = hid_open_path(dualsense_dev->path.c_str());
+		if (dev)
 		{
-			if (hid_set_nonblocking(hid_dev, 1) == -1)
+			if (hid_set_nonblocking(dev, 1) == -1)
 			{
-				dualsense_log.error("Reconnecting Device %s: hid_set_nonblocking failed with error %s", dev->path, hid_error(hid_dev));
-			}
-
-			if (!dev->has_calib_data)
-			{
-				dev->has_calib_data = get_calibration_data(dev);
+				dualsense_log.error("Reconnecting Device %s: hid_set_nonblocking failed with error %s", dualsense_dev->path, hid_error(dev));
 			}
+			dualsense_dev->hidDevice = dev;
+			if (!dualsense_dev->has_calib_data)
+				dualsense_dev->has_calib_data = get_calibration_data(dualsense_dev);
 		}
 		else
 		{
@@ -587,10 +599,11 @@ PadHandlerBase::connection dualsense_pad_handler::update_connection(const std::s
 		}
 	}
 
-	if (get_data(dev) == DataStatus::ReadError)
+	if (get_data(dualsense_dev) == DataStatus::ReadError)
 	{
 		// this also can mean disconnected, either way deal with it on next loop and reconnect
-		dev->close();
+		hid_close(dualsense_dev->hidDevice);
+		dualsense_dev->hidDevice = nullptr;
 
 		return connection::no_data;
 	}
@@ -598,76 +611,179 @@ PadHandlerBase::connection dualsense_pad_handler::update_connection(const std::s
 	return connection::connected;
 }
 
-void dualsense_pad_handler::get_extended_info(const pad_ensemble& binding)
+void dualsense_pad_handler::get_extended_info(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad)
 {
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
-	DualSenseDevice* dev = static_cast<DualSenseDevice*>(device.get());
-	if (!dev || !pad)
+	DualSenseDevice* dualsense_device = static_cast<DualSenseDevice*>(device.get());
+	if (!dualsense_device || !pad)
 		return;
 
-	pad->m_battery_level = dev->battery_level;
-	pad->m_cable_state   = dev->cable_state;
+	pad->m_battery_level = dualsense_device->battery_level;
+	pad->m_cable_state   = dualsense_device->cable_state;
 
-	const dualsense_input_report_common& input = dev->report;
+	auto& buf = dualsense_device->padData;
 
 	// these values come already calibrated, all we need to do is convert to ds3 range
 
-	// gyro (angular velocity in degree/s)
-	const f32 gyro_x = static_cast<s16>(input.gyro[0]) / static_cast<f32>(DUALSENSE_GYRO_RES_PER_DEG_S) * -1.f;
-	const f32 gyro_y = static_cast<s16>(input.gyro[1]) / static_cast<f32>(DUALSENSE_GYRO_RES_PER_DEG_S) * -1.f;
-	const f32 gyro_z = static_cast<s16>(input.gyro[2]) / static_cast<f32>(DUALSENSE_GYRO_RES_PER_DEG_S) * -1.f;
+	// gyroX is yaw, which is all that we need
+	f32 gyroX = static_cast<s16>((buf[16] << 8) | buf[15]) / static_cast<f32>(DUALSENSE_GYRO_RES_PER_DEG_S) * -1;
+	//const int gyroY = ((u16)(buf[18] << 8) | buf[17]) / 256;
+	//const int gyroZ = ((u16)(buf[20] << 8) | buf[19]) / 256;
 
-	// acceleration (linear velocity in m/s²)
-	const f32 accel_x = static_cast<s16>(input.accel[0]) / static_cast<f32>(DUALSENSE_ACC_RES_PER_G) * -1;
-	const f32 accel_y = static_cast<s16>(input.accel[1]) / static_cast<f32>(DUALSENSE_ACC_RES_PER_G) * -1;
-	const f32 accel_z = static_cast<s16>(input.accel[2]) / static_cast<f32>(DUALSENSE_ACC_RES_PER_G) * -1;
+	// accel
+	f32 accelX = static_cast<s16>((buf[22] << 8) | buf[21]) / static_cast<f32>(DUALSENSE_ACC_RES_PER_G) * -1;
+	f32 accelY = static_cast<s16>((buf[24] << 8) | buf[23]) / static_cast<f32>(DUALSENSE_ACC_RES_PER_G) * -1;
+	f32 accelZ = static_cast<s16>((buf[26] << 8) | buf[25]) / static_cast<f32>(DUALSENSE_ACC_RES_PER_G) * -1;
 
 	// now just use formula from ds3
-	pad->m_sensors[0].m_value = Clamp0To1023(accel_x * MOTION_ONE_G + 512);
-	pad->m_sensors[1].m_value = Clamp0To1023(accel_y * MOTION_ONE_G + 512);
-	pad->m_sensors[2].m_value = Clamp0To1023(accel_z * MOTION_ONE_G + 512);
+	accelX = accelX * 113 + 512;
+	accelY = accelY * 113 + 512;
+	accelZ = accelZ * 113 + 512;
 
-	// gyro_y is yaw, which is all that we need
-	// Convert to ds3. The ds3 resolution is 123/90°/sec.
-	pad->m_sensors[3].m_value = Clamp0To1023(gyro_y * (123.f / 90.f) + 512);
+	// convert to ds3
+	gyroX  = gyroX * (123.f / 90.f) + 512;
 
-	// Set raw orientation
-	set_raw_orientation(pad->move_data, accel_x, accel_y, accel_z, gyro_x, gyro_y, gyro_z);
+	pad->m_sensors[0].m_value = Clamp0To1023(accelX);
+	pad->m_sensors[1].m_value = Clamp0To1023(accelY);
+	pad->m_sensors[2].m_value = Clamp0To1023(accelZ);
+	pad->m_sensors[3].m_value = Clamp0To1023(gyroX);
 }
 
 std::unordered_map<u64, u16> dualsense_pad_handler::get_button_values(const std::shared_ptr<PadDevice>& device)
 {
 	std::unordered_map<u64, u16> keyBuffer;
-	DualSenseDevice* dev = static_cast<DualSenseDevice*>(device.get());
-	if (!dev)
+	DualSenseDevice* dualsense_dev = static_cast<DualSenseDevice*>(device.get());
+	if (!dualsense_dev)
 		return keyBuffer;
 
-	const dualsense_input_report_common& input = dev->report;
+	auto buf = dualsense_dev->padData;
 
-	const bool is_simple_mode = dev->data_mode == DualSenseDevice::DualSenseDataMode::Simple;
+	if (dualsense_dev->data_mode == DualSenseDevice::DualSenseDataMode::Simple)
+	{
+		// Left Stick X Axis
+		keyBuffer[DualSenseKeyCodes::LSXNeg] = Clamp0To255((127.5f - buf[0]) * 2.0f);
+		keyBuffer[DualSenseKeyCodes::LSXPos] = Clamp0To255((buf[0] - 127.5f) * 2.0f);
+
+		// Left Stick Y Axis (Up is the negative for some reason)
+		keyBuffer[DualSenseKeyCodes::LSYNeg] = Clamp0To255((buf[1] - 127.5f) * 2.0f);
+		keyBuffer[DualSenseKeyCodes::LSYPos] = Clamp0To255((127.5f - buf[1]) * 2.0f);
+
+		// Right Stick X Axis
+		keyBuffer[DualSenseKeyCodes::RSXNeg] = Clamp0To255((127.5f - buf[2]) * 2.0f);
+		keyBuffer[DualSenseKeyCodes::RSXPos] = Clamp0To255((buf[2] - 127.5f) * 2.0f);
+
+		// Right Stick Y Axis (Up is the negative for some reason)
+		keyBuffer[DualSenseKeyCodes::RSYNeg] = Clamp0To255((buf[3] - 127.5f) * 2.0f);
+		keyBuffer[DualSenseKeyCodes::RSYPos] = Clamp0To255((127.5f - buf[3]) * 2.0f);
+
+		// bleh, dpad in buffer is stored in a different state
+		u8 data = buf[4] & 0xf;
+		switch (data)
+		{
+		case 0x08: // none pressed
+			keyBuffer[DualSenseKeyCodes::Up]    = 0;
+			keyBuffer[DualSenseKeyCodes::Down]  = 0;
+			keyBuffer[DualSenseKeyCodes::Left]  = 0;
+			keyBuffer[DualSenseKeyCodes::Right] = 0;
+			break;
+		case 0x07: // NW...left and up
+			keyBuffer[DualSenseKeyCodes::Up]    = 255;
+			keyBuffer[DualSenseKeyCodes::Down]  = 0;
+			keyBuffer[DualSenseKeyCodes::Left]  = 255;
+			keyBuffer[DualSenseKeyCodes::Right] = 0;
+			break;
+		case 0x06: // W..left
+			keyBuffer[DualSenseKeyCodes::Up]    = 0;
+			keyBuffer[DualSenseKeyCodes::Down]  = 0;
+			keyBuffer[DualSenseKeyCodes::Left]  = 255;
+			keyBuffer[DualSenseKeyCodes::Right] = 0;
+			break;
+		case 0x05: // SW..left down
+			keyBuffer[DualSenseKeyCodes::Up]    = 0;
+			keyBuffer[DualSenseKeyCodes::Down]  = 255;
+			keyBuffer[DualSenseKeyCodes::Left]  = 255;
+			keyBuffer[DualSenseKeyCodes::Right] = 0;
+			break;
+		case 0x04: // S..down
+			keyBuffer[DualSenseKeyCodes::Up]    = 0;
+			keyBuffer[DualSenseKeyCodes::Down]  = 255;
+			keyBuffer[DualSenseKeyCodes::Left]  = 0;
+			keyBuffer[DualSenseKeyCodes::Right] = 0;
+			break;
+		case 0x03: // SE..down and right
+			keyBuffer[DualSenseKeyCodes::Up]    = 0;
+			keyBuffer[DualSenseKeyCodes::Down]  = 255;
+			keyBuffer[DualSenseKeyCodes::Left]  = 0;
+			keyBuffer[DualSenseKeyCodes::Right] = 255;
+			break;
+		case 0x02: // E... right
+			keyBuffer[DualSenseKeyCodes::Up]    = 0;
+			keyBuffer[DualSenseKeyCodes::Down]  = 0;
+			keyBuffer[DualSenseKeyCodes::Left]  = 0;
+			keyBuffer[DualSenseKeyCodes::Right] = 255;
+			break;
+		case 0x01: // NE.. up right
+			keyBuffer[DualSenseKeyCodes::Up]    = 255;
+			keyBuffer[DualSenseKeyCodes::Down]  = 0;
+			keyBuffer[DualSenseKeyCodes::Left]  = 0;
+			keyBuffer[DualSenseKeyCodes::Right] = 255;
+			break;
+		case 0x00: // n.. up
+			keyBuffer[DualSenseKeyCodes::Up]    = 255;
+			keyBuffer[DualSenseKeyCodes::Down]  = 0;
+			keyBuffer[DualSenseKeyCodes::Left]  = 0;
+			keyBuffer[DualSenseKeyCodes::Right] = 0;
+			break;
+		default:
+			fmt::throw_exception("dualsense dpad state encountered unexpected input");
+		}
+
+		data = buf[4] >> 4;
+		keyBuffer[DualSenseKeyCodes::Square]   = ((data & 0x01) != 0) ? 255 : 0;
+		keyBuffer[DualSenseKeyCodes::Cross]    = ((data & 0x02) != 0) ? 255 : 0;
+		keyBuffer[DualSenseKeyCodes::Circle]   = ((data & 0x04) != 0) ? 255 : 0;
+		keyBuffer[DualSenseKeyCodes::Triangle] = ((data & 0x08) != 0) ? 255 : 0;
+
+		data = buf[5];
+		keyBuffer[DualSenseKeyCodes::L1]      = ((data & 0x01) != 0) ? 255 : 0;
+		keyBuffer[DualSenseKeyCodes::R1]      = ((data & 0x02) != 0) ? 255 : 0;
+		//keyBuffer[DualSenseKeyCodes::L2]      = ((data & 0x04) != 0) ? 255 : 0; // active when L2 is pressed
+		//keyBuffer[DualSenseKeyCodes::R2]      = ((data & 0x08) != 0) ? 255 : 0; // active when R2 is pressed
+		keyBuffer[DualSenseKeyCodes::Share]   = ((data & 0x10) != 0) ? 255 : 0;
+		keyBuffer[DualSenseKeyCodes::Options] = ((data & 0x20) != 0) ? 255 : 0;
+		keyBuffer[DualSenseKeyCodes::L3]      = ((data & 0x40) != 0) ? 255 : 0;
+		keyBuffer[DualSenseKeyCodes::R3]      = ((data & 0x80) != 0) ? 255 : 0;
+
+		data = buf[6];
+		keyBuffer[DualSenseKeyCodes::PSButton] = ((data & 0x01) != 0) ? 255 : 0;
+		keyBuffer[DualSenseKeyCodes::TouchPad] = ((data & 0x02) != 0) ? 255 : 0;
+		keyBuffer[DualSenseKeyCodes::Mic]      = ((data & 0x04) != 0) ? 255 : 0;
+
+		keyBuffer[DualSenseKeyCodes::L2] = buf[7];
+		keyBuffer[DualSenseKeyCodes::R2] = buf[8];
+
+		return keyBuffer;
+	}
 
 	// Left Stick X Axis
-	keyBuffer[DualSenseKeyCodes::LSXNeg] = Clamp0To255((127.5f - input.x) * 2.0f);
-	keyBuffer[DualSenseKeyCodes::LSXPos] = Clamp0To255((input.x - 127.5f) * 2.0f);
+	keyBuffer[DualSenseKeyCodes::LSXNeg] = Clamp0To255((127.5f - buf[0]) * 2.0f);
+	keyBuffer[DualSenseKeyCodes::LSXPos] = Clamp0To255((buf[0] - 127.5f) * 2.0f);
 
 	// Left Stick Y Axis (Up is the negative for some reason)
-	keyBuffer[DualSenseKeyCodes::LSYNeg] = Clamp0To255((input.y - 127.5f) * 2.0f);
-	keyBuffer[DualSenseKeyCodes::LSYPos] = Clamp0To255((127.5f - input.y) * 2.0f);
+	keyBuffer[DualSenseKeyCodes::LSYNeg] = Clamp0To255((buf[1] - 127.5f) * 2.0f);
+	keyBuffer[DualSenseKeyCodes::LSYPos] = Clamp0To255((127.5f - buf[1]) * 2.0f);
 
 	// Right Stick X Axis
-	keyBuffer[DualSenseKeyCodes::RSXNeg] = Clamp0To255((127.5f - input.rx) * 2.0f);
-	keyBuffer[DualSenseKeyCodes::RSXPos] = Clamp0To255((input.rx - 127.5f) * 2.0f);
+	keyBuffer[DualSenseKeyCodes::RSXNeg] = Clamp0To255((127.5f - buf[2]) * 2.0f);
+	keyBuffer[DualSenseKeyCodes::RSXPos] = Clamp0To255((buf[2] - 127.5f) * 2.0f);
 
 	// Right Stick Y Axis (Up is the negative for some reason)
-	keyBuffer[DualSenseKeyCodes::RSYNeg] = Clamp0To255((input.ry - 127.5f) * 2.0f);
-	keyBuffer[DualSenseKeyCodes::RSYPos] = Clamp0To255((127.5f - input.ry) * 2.0f);
+	keyBuffer[DualSenseKeyCodes::RSYNeg] = Clamp0To255((buf[3] - 127.5f) * 2.0f);
+	keyBuffer[DualSenseKeyCodes::RSYPos] = Clamp0To255((127.5f - buf[3]) * 2.0f);
 
-	keyBuffer[DualSenseKeyCodes::L2] = is_simple_mode ? input.buttons[0] : input.z;
-	keyBuffer[DualSenseKeyCodes::R2] = is_simple_mode ? input.buttons[1] : input.rz;
+	keyBuffer[DualSenseKeyCodes::L2] = buf[4];
+	keyBuffer[DualSenseKeyCodes::R2] = buf[5];
 
-	u8 data = (is_simple_mode ? input.z : input.buttons[0]) & 0xf;
+	u8 data = buf[7] & 0xf;
 	switch (data)
 	{
 	case 0x08: // none pressed
@@ -728,13 +844,13 @@ std::unordered_map<u64, u16> dualsense_pad_handler::get_button_values(const std:
 		fmt::throw_exception("dualsense dpad state encountered unexpected input");
 	}
 
-	data = (is_simple_mode ? input.z : input.buttons[0]) >> 4;
+	data = buf[7] >> 4;
 	keyBuffer[DualSenseKeyCodes::Square]   = ((data & 0x01) != 0) ? 255 : 0;
 	keyBuffer[DualSenseKeyCodes::Cross]    = ((data & 0x02) != 0) ? 255 : 0;
 	keyBuffer[DualSenseKeyCodes::Circle]   = ((data & 0x04) != 0) ? 255 : 0;
 	keyBuffer[DualSenseKeyCodes::Triangle] = ((data & 0x08) != 0) ? 255 : 0;
 
-	data = (is_simple_mode ? input.rz : input.buttons[1]);
+	data = buf[8];
 	keyBuffer[DualSenseKeyCodes::L1]      = ((data & 0x01) != 0) ? 255 : 0;
 	keyBuffer[DualSenseKeyCodes::R1]      = ((data & 0x02) != 0) ? 255 : 0;
 	//keyBuffer[DualSenseKeyCodes::L2]      = ((data & 0x04) != 0) ? 255 : 0; // active when L2 is pressed
@@ -744,50 +860,23 @@ std::unordered_map<u64, u16> dualsense_pad_handler::get_button_values(const std:
 	keyBuffer[DualSenseKeyCodes::L3]      = ((data & 0x40) != 0) ? 255 : 0;
 	keyBuffer[DualSenseKeyCodes::R3]      = ((data & 0x80) != 0) ? 255 : 0;
 
-	data = (is_simple_mode ? input.seq_number : input.buttons[2]);
+	data = buf[9];
 	keyBuffer[DualSenseKeyCodes::PSButton] = ((data & 0x01) != 0) ? 255 : 0;
 	keyBuffer[DualSenseKeyCodes::TouchPad] = ((data & 0x02) != 0) ? 255 : 0;
 	keyBuffer[DualSenseKeyCodes::Mic]      = ((data & 0x04) != 0) ? 255 : 0;
 
-	// Touch Pad
-	for (const dualsense_touch_point& point : input.points)
-	{
-		if (!(point.contact & DUALSENSE_TOUCH_POINT_INACTIVE))
-		{
-			const s32 x = (point.x_hi << 8) | point.x_lo;
-			const s32 y = (point.y_hi << 4) | point.y_lo;
-
-			const f32 x_scaled = ScaledInput(static_cast<float>(x), 0.0f, static_cast<float>(DUALSENSE_TOUCHPAD_WIDTH), 0.0f, 255.0f);
-			const f32 y_scaled = ScaledInput(static_cast<float>(y), 0.0f, static_cast<float>(DUALSENSE_TOUCHPAD_HEIGHT), 0.0f, 255.0f);
-
-			keyBuffer[DualSenseKeyCodes::Touch_L] = Clamp0To255((127.5f - x_scaled) * 2.0f);
-			keyBuffer[DualSenseKeyCodes::Touch_R] = Clamp0To255((x_scaled - 127.5f) * 2.0f);
-
-			keyBuffer[DualSenseKeyCodes::Touch_U] = Clamp0To255((127.5f - y_scaled) * 2.0f);
-			keyBuffer[DualSenseKeyCodes::Touch_D] = Clamp0To255((y_scaled - 127.5f) * 2.0f);
-		}
-	}
-
-	if (dev->feature_set == DualSenseDevice::DualSenseFeatureSet::Edge)
-	{
-		keyBuffer[DualSenseKeyCodes::EdgeFnL] = ((data & 0x10) != 0) ? 255 : 0;
-		keyBuffer[DualSenseKeyCodes::EdgeFnR] = ((data & 0x20) != 0) ? 255 : 0;
-		keyBuffer[DualSenseKeyCodes::EdgeLB] = ((data & 0x40) != 0) ? 255 : 0;
-		keyBuffer[DualSenseKeyCodes::EdgeRB] = ((data & 0x80) != 0) ? 255 : 0;
-	}
-
 	return keyBuffer;
 }
 
 pad_preview_values dualsense_pad_handler::get_preview_values(const std::unordered_map<u64, u16>& data)
 {
 	return {
-		::at32(data, L2),
-		::at32(data, R2),
-		::at32(data, LSXPos) - ::at32(data, LSXNeg),
-		::at32(data, LSYPos) - ::at32(data, LSYNeg),
-		::at32(data, RSXPos) - ::at32(data, RSXNeg),
-		::at32(data, RSYPos) - ::at32(data, RSYNeg)
+		data.at(L2),
+		data.at(R2),
+		data.at(LSXPos) - data.at(LSXNeg),
+		data.at(LSYPos) - data.at(LSYNeg),
+		data.at(RSXPos) - data.at(RSXNeg),
+		data.at(RSYPos) - data.at(RSYNeg)
 	};
 }
 
@@ -800,14 +889,7 @@ dualsense_pad_handler::~dualsense_pad_handler()
 			// Disable vibration
 			controller.second->small_motor = 0;
 			controller.second->large_motor = 0;
-
-			// Turns off the lights (disabled due to user complaints)
-			//controller.second->release_leds = true;
-
-			if (send_output_report(controller.second.get()) == -1)
-			{
-				dualsense_log.error("~dualsense_pad_handler: send_output_report failed! Reason: %s", hid_error(controller.second->hidDevice));
-			}
+			send_output_report(controller.second.get());
 		}
 	}
 }
@@ -817,11 +899,11 @@ int dualsense_pad_handler::send_output_report(DualSenseDevice* device)
 	if (!device || !device->hidDevice)
 		return -2;
 
-	const cfg_pad* config = device->config;
+	const auto config = device->config;
 	if (config == nullptr)
-		return -2; // hid_write returns -1 on error
+		return -2; // hid_write and hid_write_control return -1 on error
 
-	dualsense_output_report_common common{};
+	output_report_common common{};
 
 	// Only initialize lightbar in the first output report. The controller didn't seem to update the player LEDs correctly otherwise. (Might be placebo)
 	if (device->init_lightbar)
@@ -831,20 +913,12 @@ int dualsense_pad_handler::send_output_report(DualSenseDevice* device)
 		device->lightbar_on_old = true;
 
 		common.valid_flag_2 |= VALID_FLAG_2_LIGHTBAR_SETUP_CONTROL_ENABLE;
-		common.lightbar_setup = LIGHTBAR_SETUP_LIGHT_OFF; // Fade light out.
-	}
-	else if (device->release_leds)
-	{
-		common.valid_flag_1 |= VALID_FLAG_1_RELEASE_LEDS;
-		device->release_leds = false;
+		common.lightbar_setup = LIGHTBAR_SETUP_LIGHT_OUT; // Fade light out.
 	}
 	else
 	{
 		common.valid_flag_0 |= VALID_FLAG_0_COMPATIBLE_VIBRATION;
 		common.valid_flag_0 |= VALID_FLAG_0_HAPTICS_SELECT;
-		common.valid_flag_1 |= VALID_FLAG_1_POWER_SAVE_CONTROL_ENABLE;
-		common.valid_flag_2 |= VALID_FLAG_2_IMPROVED_RUMBLE_EMULATION;
-
 		common.motor_left  = device->large_motor;
 		common.motor_right = device->small_motor;
 
@@ -878,24 +952,17 @@ int dualsense_pad_handler::send_output_report(DualSenseDevice* device)
 			// Use OR with 0x1, 0x2, 0x4, 0x8 and 0x10 to enable the LEDs (from leftmost to rightmost).
 			common.valid_flag_1 |= VALID_FLAG_1_PLAYER_INDICATOR_CONTROL_ENABLE;
 
-			if (config->player_led_enabled)
+			switch (device->player_id)
 			{
-				switch (device->player_id)
-				{
-				case 0: common.player_leds = 0b00100; break;
-				case 1: common.player_leds = 0b01010; break;
-				case 2: common.player_leds = 0b10101; break;
-				case 3: common.player_leds = 0b11011; break;
-				case 4: common.player_leds = 0b11111; break;
-				case 5: common.player_leds = 0b10111; break;
-				case 6: common.player_leds = 0b11101; break;
-				default:
-					fmt::throw_exception("Dualsense is using forbidden player id %d", device->player_id);
-				}
-			}
-			else
-			{
-				common.player_leds = 0;
+			case 0: common.player_leds = 0b00100; break;
+			case 1: common.player_leds = 0b01010; break;
+			case 2: common.player_leds = 0b10101; break;
+			case 3: common.player_leds = 0b11011; break;
+			case 4: common.player_leds = 0b11111; break;
+			case 5: common.player_leds = 0b10111; break;
+			case 6: common.player_leds = 0b11101; break;
+			default:
+				fmt::throw_exception("Dualsense is using forbidden player id %d", device->player_id);
 			}
 		}
 	}
@@ -905,142 +972,145 @@ int dualsense_pad_handler::send_output_report(DualSenseDevice* device)
 		const u8 seq_tag = (device->bt_sequence << 4) | 0x0;
 		if (++device->bt_sequence >= 16) device->bt_sequence = 0;
 
-		dualsense_output_report_bt report{};
+		output_report_bt report{};
 		report.report_id = 0x31; // report id for bluetooth
 		report.seq_tag   = seq_tag;
 		report.tag       = 0x10; // magic number
-		report.common    = std::move(common);
+		report.common    = common;
 
 		const u8 btHdr    = 0xA2;
 		const u32 crcHdr  = CRCPP::CRC::Calculate(&btHdr, 1, crcTable);
-		const u32 crcCalc = CRCPP::CRC::Calculate(&report.report_id, (sizeof(dualsense_output_report_bt) - 4), crcTable, crcHdr);
+		const u32 crcCalc = CRCPP::CRC::Calculate(&report.report_id, (DUALSENSE_BLUETOOTH_REPORT_SIZE - 4), crcTable, crcHdr);
 
-		write_to_ptr(report.crc32, crcCalc);
+		report.crc32[0] = (crcCalc >> 0) & 0xFF;
+		report.crc32[1] = (crcCalc >> 8) & 0xFF;
+		report.crc32[2] = (crcCalc >> 16) & 0xFF;
+		report.crc32[3] = (crcCalc >> 24) & 0xFF;
 
-		return hid_write(device->hidDevice, &report.report_id, sizeof(dualsense_output_report_bt));
+		return hid_write(device->hidDevice, &report.report_id, DUALSENSE_BLUETOOTH_REPORT_SIZE);
 	}
+	else
+	{
+		output_report_usb report{};
+		report.report_id = 0x02; // report id for usb
+		report.common    = common;
 
-	dualsense_output_report_usb report{};
-	report.report_id = 0x02; // report id for usb
-	report.common    = std::move(common);
-
-	return hid_write(device->hidDevice, &report.report_id, DUALSENSE_USB_REPORT_SIZE);
+		return hid_write(device->hidDevice, &report.report_id, DUALSENSE_USB_REPORT_SIZE);
+	}
 }
 
-void dualsense_pad_handler::apply_pad_data(const pad_ensemble& binding)
+void dualsense_pad_handler::apply_pad_data(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad)
 {
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
-	DualSenseDevice* dev = static_cast<DualSenseDevice*>(device.get());
-	if (!dev || !dev->hidDevice || !dev->config || !pad)
+	DualSenseDevice* dualsense_dev = static_cast<DualSenseDevice*>(device.get());
+	if (!dualsense_dev || !dualsense_dev->hidDevice || !dualsense_dev->config || !pad)
 		return;
 
-	cfg_pad* config = dev->config;
+	cfg_pad* config = dualsense_dev->config;
 
 	// Attempt to send rumble no matter what
-	const u8 speed_large = config->get_large_motor_speed(pad->m_vibrateMotors);
-	const u8 speed_small = config->get_small_motor_speed(pad->m_vibrateMotors);
+	const int idx_l = config->switch_vibration_motors ? 1 : 0;
+	const int idx_s  = config->switch_vibration_motors ? 0 : 1;
 
-	const bool wireless    = dev->cable_state == 0;
-	const bool low_battery = dev->battery_level <= 1;
-	const bool is_blinking = dev->led_delay_on > 0 || dev->led_delay_off > 0;
+	const int speed_large = config->enable_vibration_motor_large ? pad->m_vibrateMotors[idx_l].m_value : vibration_min;
+	const int speed_small = config->enable_vibration_motor_small ? pad->m_vibrateMotors[idx_s].m_value : vibration_min;
 
+	const bool wireless    = dualsense_dev->cable_state == 0;
+	const bool low_battery = dualsense_dev->battery_level <= 1;
+	const bool is_blinking = dualsense_dev->led_delay_on > 0 || dualsense_dev->led_delay_off > 0;
+	
 	// Blink LED when battery is low
 	if (config->led_low_battery_blink)
 	{
 		// we are now wired or have okay battery level -> stop blinking
 		if (is_blinking && !(wireless && low_battery))
 		{
-			dev->lightbar_on = true;
-			dev->led_delay_on = 0;
-			dev->led_delay_off = 0;
-			dev->update_lightbar = true;
+			dualsense_dev->lightbar_on = true;
+			dualsense_dev->led_delay_on = 0;
+			dualsense_dev->led_delay_off = 0;
+			dualsense_dev->update_lightbar = true;
 		}
 		// we are now wireless and low on battery -> blink
 		else if (!is_blinking && wireless && low_battery)
 		{
-			dev->led_delay_on = 100;
-			dev->led_delay_off = 100;
-			dev->update_lightbar = true;
+			dualsense_dev->led_delay_on = 100;
+			dualsense_dev->led_delay_off = 100;
+			dualsense_dev->update_lightbar = true;
 		}
 
 		// Turn lightbar on and off in an interval. I wanted to do an automatic pulse, but I haven't found out how to do that yet.
-		if (dev->led_delay_on > 0)
+		if (dualsense_dev->led_delay_on > 0)
 		{
-			if (const steady_clock::time_point now = steady_clock::now(); (now - dev->last_lightbar_time) > 500ms)
+			if (const steady_clock::time_point now = steady_clock::now(); (now - dualsense_dev->last_lightbar_time) > 500ms)
 			{
-				dev->lightbar_on = !dev->lightbar_on;
-				dev->last_lightbar_time = now;
-				dev->update_lightbar = true;
+				dualsense_dev->lightbar_on = !dualsense_dev->lightbar_on;
+				dualsense_dev->last_lightbar_time = now;
+				dualsense_dev->update_lightbar = true;
 			}
 		}
 	}
-	else if (!dev->lightbar_on)
+	else if (!dualsense_dev->lightbar_on)
 	{
-		dev->lightbar_on = true;
-		dev->update_lightbar = true;
+		dualsense_dev->lightbar_on = true;
+		dualsense_dev->update_lightbar = true;
 	}
 
 	// Use LEDs to indicate battery level
 	if (config->led_battery_indicator)
 	{
 		// This makes sure that the LED color doesn't update every 1ms. DS4 only reports battery level in 10% increments
-		if (dev->last_battery_level != dev->battery_level)
+		if (dualsense_dev->last_battery_level != dualsense_dev->battery_level)
 		{
-			const u32 combined_color = get_battery_color(dev->battery_level, config->led_battery_indicator_brightness);
+			const u32 combined_color = get_battery_color(dualsense_dev->battery_level, config->led_battery_indicator_brightness);
 			config->colorR.set(combined_color >> 8);
 			config->colorG.set(combined_color & 0xff);
 			config->colorB.set(0);
-			dev->update_lightbar = true;
-			dev->last_battery_level = dev->battery_level;
+			dualsense_dev->update_lightbar = true;
+			dualsense_dev->last_battery_level = dualsense_dev->battery_level;
 		}
 	}
 
-	if (dev->enable_player_leds != config->player_led_enabled.get())
+	dualsense_dev->new_output_data |= dualsense_dev->update_lightbar || dualsense_dev->large_motor != speed_large || dualsense_dev->small_motor != speed_small;
+
+	dualsense_dev->large_motor = speed_large;
+	dualsense_dev->small_motor = speed_small;
+
+	if (dualsense_dev->new_output_data)
 	{
-		dev->enable_player_leds = config->player_led_enabled.get();
-		dev->update_player_leds = true;
-	}
-
-	dev->new_output_data |= dev->release_leds || dev->update_player_leds || dev->update_lightbar || dev->large_motor != speed_large || dev->small_motor != speed_small;
-
-	dev->large_motor = speed_large;
-	dev->small_motor = speed_small;
-
-	const auto now = steady_clock::now();
-	const auto elapsed = now - dev->last_output;
-
-	if (dev->new_output_data || elapsed > min_output_interval)
-	{
-		if (const int res = send_output_report(dev); res >= 0)
+		if (send_output_report(dualsense_dev) >= 0)
 		{
-			dev->new_output_data = false;
-			dev->last_output = now;
-		}
-		else if (res == -1)
-		{
-			dualsense_log.error("apply_pad_data: send_output_report failed! error=%s", hid_error(dev->hidDevice));
+			dualsense_dev->new_output_data = false;
 		}
 	}
 }
 
-void dualsense_pad_handler::SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool player_led, bool battery_led, u32 battery_led_brightness)
+void dualsense_pad_handler::SetPadData(const std::string& padId, u8 player_id, u32 largeMotor, u32 smallMotor, s32 r, s32 g, s32 b, bool battery_led, u32 battery_led_brightness)
 {
 	std::shared_ptr<DualSenseDevice> device = get_hid_device(padId);
 	if (device == nullptr || device->hidDevice == nullptr)
 		return;
 
 	// Set the device's motor speeds to our requested values 0-255
-	device->large_motor = large_motor;
-	device->small_motor = small_motor;
+	device->large_motor = largeMotor;
+	device->small_motor = smallMotor;
 	device->player_id = player_id;
-	device->config = get_config(padId);
+
+	int index = 0;
+	for (uint i = 0; i < MAX_GAMEPADS; i++)
+	{
+		if (g_cfg_input.player[i]->handler == m_type)
+		{
+			if (g_cfg_input.player[i]->device.to_string() == padId)
+			{
+				m_pad_configs[index].from_string(g_cfg_input.player[i]->config.to_string());
+				device->config = &m_pad_configs[index];
+				break;
+			}
+			index++;
+		}
+	}
 
 	ensure(device->config);
 	device->update_lightbar = true;
-	device->update_player_leds = true;
-	device->config->player_led_enabled.set(player_led);
 
 	// Set new LED color (see ds4_pad_handler)
 	if (battery_led)
@@ -1060,17 +1130,11 @@ void dualsense_pad_handler::SetPadData(const std::string& padId, u8 player_id, u
 	if (device->init_lightbar)
 	{
 		// Initialize first
-		if (send_output_report(device.get()) == -1)
-		{
-			dualsense_log.error("SetPadData: send_output_report failed! Reason: %s", hid_error(device->hidDevice));
-		}
+		send_output_report(device.get());
 	}
 
 	// Start/Stop the engines :)
-	if (send_output_report(device.get()) == -1)
-	{
-		dualsense_log.error("SetPadData: send_output_report failed! Reason: %s", hid_error(device->hidDevice));
-	}
+	send_output_report(device.get());
 }
 
 u32 dualsense_pad_handler::get_battery_level(const std::string& padId)
diff --git a/rpcs3/Input/dualsense_pad_handler.h b/rpcs3/Input/dualsense_pad_handler.h
index 77b85f320b..39f3c29519 100644
--- a/rpcs3/Input/dualsense_pad_handler.h
+++ b/rpcs3/Input/dualsense_pad_handler.h
@@ -4,156 +4,6 @@
 
 #include <unordered_map>
 
-namespace reports
-{
-	constexpr u32 DUALSENSE_ACC_RES_PER_G = 8192;
-	constexpr u32 DUALSENSE_GYRO_RES_PER_DEG_S = 86; // technically this could be 1024, but keeping it at 86 keeps us within 16 bits of precision
-	constexpr u32 DUALSENSE_CALIBRATION_REPORT_SIZE = 41;
-	constexpr u32 DUALSENSE_FIRMWARE_REPORT_SIZE = 64;
-	constexpr u32 DUALSENSE_PAIRING_REPORT_SIZE = 20;
-	constexpr u32 DUALSENSE_BLUETOOTH_REPORT_SIZE = 78;
-	constexpr u32 DUALSENSE_USB_REPORT_SIZE = 63; // 64 in hid, because of the report ID being added
-	constexpr u32 DUALSENSE_COMMON_REPORT_SIZE = 47;
-	constexpr u32 DUALSENSE_USB_INPUT_REPORT_SIZE = 64;
-	constexpr u32 DUALSENSE_BLUETOOTH_INPUT_REPORT_SIZE = 78;
-	constexpr u32 DUALSENSE_INPUT_REPORT_GYRO_X_OFFSET = 15;
-	constexpr u32 DUALSENSE_TOUCHPAD_WIDTH  = 1920;
-	constexpr u32 DUALSENSE_TOUCHPAD_HEIGHT = 1080;
-	constexpr u32 DUALSENSE_TOUCH_POINT_INACTIVE = 0x80;
-
-	enum
-	{
-		VALID_FLAG_0_COMPATIBLE_VIBRATION            = 0x01,
-		VALID_FLAG_0_HAPTICS_SELECT                  = 0x02,
-		VALID_FLAG_0_SET_LEFT_TRIGGER_MOTOR          = 0x04,
-		VALID_FLAG_0_SET_RIGHT_TRIGGER_MOTOR         = 0x08,
-		VALID_FLAG_0_SET_AUDIO_VOLUME                = 0x10,
-		VALID_FLAG_0_TOGGLE_AUDIO                    = 0x20,
-		VALID_FLAG_0_SET_MICROPHONE_VOLUME           = 0x40,
-		VALID_FLAG_0_TOGGLE_MICROPHONE               = 0x80,
-
-		VALID_FLAG_1_TOGGLE_MIC_BUTTON_LED           = 0x01,
-		VALID_FLAG_1_POWER_SAVE_CONTROL_ENABLE       = 0x02,
-		VALID_FLAG_1_LIGHTBAR_CONTROL_ENABLE         = 0x04,
-		VALID_FLAG_1_RELEASE_LEDS                    = 0x08,
-		VALID_FLAG_1_PLAYER_INDICATOR_CONTROL_ENABLE = 0x10,
-		VALID_FLAG_1_EFFECT_POWER                    = 0x40,
-
-		VALID_FLAG_2_SET_PLAYER_LED_BRIGHTNESS       = 0x01,
-		VALID_FLAG_2_LIGHTBAR_SETUP_CONTROL_ENABLE   = 0x02,
-		VALID_FLAG_2_IMPROVED_RUMBLE_EMULATION       = 0x04,
-
-		AUDIO_BIT_FORCE_INTERNAL_MIC                 = 0x01,
-		AUDIO_BIT_FORCE_EXTERNAL_MIC                 = 0x02,
-		AUDIO_BIT_PAD_EXTERNAL_MIC                   = 0x04,
-		AUDIO_BIT_PAD_INTERNAL_MIC                   = 0x08,
-		AUDIO_BIT_DISABLE_EXTERNAL_SPEAKERS          = 0x10,
-		AUDIO_BIT_ENABLE_INTERNAL_SPEAKERS           = 0x20,
-
-		POWER_SAVE_CONTROL_MIC_MUTE                  = 0x10,
-		POWER_SAVE_CONTROL_AUDIO_MUTE                = 0x40,
-		LIGHTBAR_SETUP_LIGHT_ON                      = 0x01,
-		LIGHTBAR_SETUP_LIGHT_OFF                     = 0x02,
-		MIC_BUTTON_LED_ON                            = 0x01,
-		MIC_BUTTON_LED_PULSE                         = 0x02,
-	};
-
-	struct dualsense_touch_point
-	{
-		u8 contact;
-		u8 x_lo;
-		u8 x_hi : 4;
-		u8 y_lo : 4;
-		u8 y_hi;
-	};
-	static_assert(sizeof(dualsense_touch_point) == 4);
-
-	struct dualsense_input_report_common
-	{
-		u8 x;
-		u8 y;
-		u8 rx;
-		u8 ry;
-		u8 z;
-		u8 rz;
-		u8 seq_number;
-		u8 buttons[4];
-		u8 reserved[4];
-		le_t<u16, 1> gyro[3];
-		le_t<u16, 1> accel[3];
-		le_t<u32, 1> sensor_timestamp;
-		u8 reserved2;
-		std::array<dualsense_touch_point, 2> points;
-		u8 reserved3[12];
-		u8 status;
-		u8 reserved4[10];
-	};
-
-	struct dualsense_input_report_usb
-	{
-		u8 report_id;
-		dualsense_input_report_common common;
-	};
-	static_assert(sizeof(dualsense_input_report_usb) == DUALSENSE_USB_INPUT_REPORT_SIZE);
-
-	struct dualsense_input_report_bt
-	{
-		u8 report_id;
-		u8 something;
-		dualsense_input_report_common common;
-		u8 reserved[9];
-		u8 crc32[4];
-	};
-	static_assert(sizeof(dualsense_input_report_bt) == DUALSENSE_BLUETOOTH_INPUT_REPORT_SIZE);
-
-	struct dualsense_output_report_common
-	{
-		u8 valid_flag_0;
-		u8 valid_flag_1;
-		u8 motor_right;
-		u8 motor_left;
-		u8 headphone_volume;
-		u8 speaker_volume;
-		u8 microphone_volume;
-		u8 audio_enable_bits;
-		u8 mute_button_led;
-		u8 power_save_control;
-		u8 right_trigger_effect[11];
-		u8 left_trigger_effect[11];
-		u8 reserved[6];
-		u8 valid_flag_2;
-		u8 effect_strength_1 : 4; // 0-7 (one for motors, the other for trigger motors, not sure which is which)
-		u8 effect_strength_2 : 4; // 0-7 (one for motors, the other for trigger motors, not sure which is which)
-		u8 reserved2;
-		u8 lightbar_setup;
-		u8 led_brightness;
-		u8 player_leds;
-		u8 lightbar_r;
-		u8 lightbar_g;
-		u8 lightbar_b;
-	};
-	static_assert(sizeof(dualsense_output_report_common) == DUALSENSE_COMMON_REPORT_SIZE);
-
-	struct dualsense_output_report_bt
-	{
-		u8 report_id; // 0x31
-		u8 seq_tag;
-		u8 tag;
-		dualsense_output_report_common common;
-		u8 reserved[24];
-		u8 crc32[4];
-	};
-	static_assert(sizeof(dualsense_output_report_bt) == DUALSENSE_BLUETOOTH_REPORT_SIZE);
-
-	struct dualsense_output_report_usb
-	{
-		u8 report_id; // 0x02
-		dualsense_output_report_common common;
-		u8 reserved[15];
-	};
-	static_assert(sizeof(dualsense_output_report_usb) == DUALSENSE_USB_REPORT_SIZE);
-}
-
 class DualSenseDevice : public HidDevice
 {
 public:
@@ -163,22 +13,14 @@ public:
 		Enhanced
 	};
 
-	enum class DualSenseFeatureSet
-	{
-		Normal,
-		Edge
-	};
-
 	bool bt_controller{false};
 	u8 bt_sequence{0};
 	bool has_calib_data{false};
 	std::array<CalibData, CalibIndex::COUNT> calib_data{};
-	reports::dualsense_input_report_common report{}; // No need to have separate reports for usb and bluetooth
 	DualSenseDataMode data_mode{DualSenseDataMode::Simple};
-	DualSenseFeatureSet feature_set{DualSenseFeatureSet::Normal};
 	bool init_lightbar{true};
 	bool update_lightbar{true};
-	bool release_leds{false};
+	bool update_player_leds{true};
 
 	// Controls for lightbar pulse. This seems somewhat hacky for now, as I haven't found out a nicer way.
 	bool lightbar_on{false};
@@ -210,11 +52,6 @@ class dualsense_pad_handler final : public hid_pad_handler<DualSenseDevice>
 		Mic,
 		TouchPad,
 
-		Touch_L,
-		Touch_R,
-		Touch_U,
-		Touch_D,
-
 		L2,
 		R2,
 
@@ -225,37 +62,31 @@ class dualsense_pad_handler final : public hid_pad_handler<DualSenseDevice>
 		RSXNeg,
 		RSXPos,
 		RSYNeg,
-		RSYPos,
-
-		EdgeFnL,
-		EdgeFnR,
-		EdgeLB,
-		EdgeRB,
+		RSYPos
 	};
 
 public:
 	dualsense_pad_handler();
 	~dualsense_pad_handler();
 
-	void SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool player_led, bool battery_led, u32 battery_led_brightness) override;
+	void SetPadData(const std::string& padId, u8 player_id, u32 largeMotor, u32 smallMotor, s32 r, s32 g, s32 b, bool battery_led, u32 battery_led_brightness) override;
 	u32 get_battery_level(const std::string& padId) override;
 	void init_config(cfg_pad* cfg) override;
 
 private:
-	bool get_calibration_data(DualSenseDevice* dev) const;
+	bool get_calibration_data(DualSenseDevice* dualsense_device) const;
 
 	DataStatus get_data(DualSenseDevice* device) override;
-	void check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial) override;
+	void check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view wide_serial) override;
 	int send_output_report(DualSenseDevice* device) override;
 
-	bool get_is_left_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_left_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_touch_pad_motion(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
+	bool get_is_left_trigger(u64 keyCode) override;
+	bool get_is_right_trigger(u64 keyCode) override;
+	bool get_is_left_stick(u64 keyCode) override;
+	bool get_is_right_stick(u64 keyCode) override;
 	PadHandlerBase::connection update_connection(const std::shared_ptr<PadDevice>& device) override;
 	std::unordered_map<u64, u16> get_button_values(const std::shared_ptr<PadDevice>& device) override;
 	pad_preview_values get_preview_values(const std::unordered_map<u64, u16>& data) override;
-	void get_extended_info(const pad_ensemble& binding) override;
-	void apply_pad_data(const pad_ensemble& binding) override;
+	void get_extended_info(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad) override;
+	void apply_pad_data(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad) override;
 };
diff --git a/rpcs3/Input/evdev_joystick_handler.cpp b/rpcs3/Input/evdev_joystick_handler.cpp
index 3b8677afd8..03000d1e96 100644
--- a/rpcs3/Input/evdev_joystick_handler.cpp
+++ b/rpcs3/Input/evdev_joystick_handler.cpp
@@ -8,6 +8,7 @@
 #include "evdev_joystick_handler.h"
 #include "util/logs.hpp"
 
+#include <functional>
 #include <algorithm>
 #include <unistd.h>
 #include <fcntl.h>
@@ -18,33 +19,6 @@
 
 LOG_CHANNEL(evdev_log, "evdev");
 
-bool positive_axis::load()
-{
-	if (fs::file cfg_file{ cfg_name, fs::read })
-	{
-		return from_string(cfg_file.to_string());
-	}
-
-	from_default();
-	return false;
-}
-
-void positive_axis::save() const
-{
-	fs::pending_file file(cfg_name);
-
-	if (file.file)
-	{
-		file.file.write(to_string());
-		file.commit();
-	}
-}
-
-bool positive_axis::exist() const
-{
-	return fs::is_file(cfg_name);
-}
-
 evdev_joystick_handler::evdev_joystick_handler()
     : PadHandlerBase(pad_handler::evdev)
 {
@@ -54,13 +28,13 @@ evdev_joystick_handler::evdev_joystick_handler()
 	thumb_max     = 255;
 	trigger_min   = 0;
 	trigger_max   = 255;
+	vibration_min = 0;
+	vibration_max = 65535;
 
 	// set capabilities
 	b_has_config    = true;
 	b_has_rumble    = true;
-	b_has_motion    = true;
 	b_has_deadzones = true;
-	b_has_orientation = true;
 
 	m_trigger_threshold = trigger_max / 2;
 	m_thumb_threshold   = thumb_max / 2;
@@ -70,7 +44,7 @@ evdev_joystick_handler::evdev_joystick_handler()
 
 evdev_joystick_handler::~evdev_joystick_handler()
 {
-	close_devices();
+	Close();
 }
 
 void evdev_joystick_handler::init_config(cfg_pad* cfg)
@@ -78,85 +52,66 @@ void evdev_joystick_handler::init_config(cfg_pad* cfg)
 	if (!cfg) return;
 
 	// Set default button mapping
-	cfg->ls_left.def  = ::at32(rev_axis_list, ABS_X);
-	cfg->ls_down.def  = ::at32(axis_list, ABS_Y);
-	cfg->ls_right.def = ::at32(axis_list, ABS_X);
-	cfg->ls_up.def    = ::at32(rev_axis_list, ABS_Y);
-	cfg->rs_left.def  = ::at32(rev_axis_list, ABS_RX);
-	cfg->rs_down.def  = ::at32(axis_list, ABS_RY);
-	cfg->rs_right.def = ::at32(axis_list, ABS_RX);
-	cfg->rs_up.def    = ::at32(rev_axis_list, ABS_RY);
-	cfg->start.def    = ::at32(button_list, BTN_START);
-	cfg->select.def   = ::at32(button_list, BTN_SELECT);
-	cfg->ps.def       = ::at32(button_list, BTN_MODE);
-	cfg->square.def   = ::at32(button_list, BTN_X);
-	cfg->cross.def    = ::at32(button_list, BTN_A);
-	cfg->circle.def   = ::at32(button_list, BTN_B);
-	cfg->triangle.def = ::at32(button_list, BTN_Y);
-	cfg->left.def     = ::at32(rev_axis_list, ABS_HAT0X);
-	cfg->down.def     = ::at32(axis_list, ABS_HAT0Y);
-	cfg->right.def    = ::at32(axis_list, ABS_HAT0X);
-	cfg->up.def       = ::at32(rev_axis_list, ABS_HAT0Y);
-	cfg->r1.def       = ::at32(button_list, BTN_TR);
-	cfg->r2.def       = ::at32(axis_list, ABS_RZ);
-	cfg->r3.def       = ::at32(button_list, BTN_THUMBR);
-	cfg->l1.def       = ::at32(button_list, BTN_TL);
-	cfg->l2.def       = ::at32(axis_list, ABS_Z);
-	cfg->l3.def       = ::at32(button_list, BTN_THUMBL);
+	cfg->ls_left.def  = rev_axis_list.at(ABS_X);
+	cfg->ls_down.def  = axis_list.at(ABS_Y);
+	cfg->ls_right.def = axis_list.at(ABS_X);
+	cfg->ls_up.def    = rev_axis_list.at(ABS_Y);
+	cfg->rs_left.def  = rev_axis_list.at(ABS_RX);
+	cfg->rs_down.def  = axis_list.at(ABS_RY);
+	cfg->rs_right.def = axis_list.at(ABS_RX);
+	cfg->rs_up.def    = rev_axis_list.at(ABS_RY);
+	cfg->start.def    = button_list.at(BTN_START);
+	cfg->select.def   = button_list.at(BTN_SELECT);
+	cfg->ps.def       = button_list.at(BTN_MODE);
+	cfg->square.def   = button_list.at(BTN_X);
+	cfg->cross.def    = button_list.at(BTN_A);
+	cfg->circle.def   = button_list.at(BTN_B);
+	cfg->triangle.def = button_list.at(BTN_Y);
+	cfg->left.def     = rev_axis_list.at(ABS_HAT0X);
+	cfg->down.def     = axis_list.at(ABS_HAT0Y);
+	cfg->right.def    = axis_list.at(ABS_HAT0X);
+	cfg->up.def       = rev_axis_list.at(ABS_HAT0Y);
+	cfg->r1.def       = button_list.at(BTN_TR);
+	cfg->r2.def       = axis_list.at(ABS_RZ);
+	cfg->r3.def       = button_list.at(BTN_THUMBR);
+	cfg->l1.def       = button_list.at(BTN_TL);
+	cfg->l2.def       = axis_list.at(ABS_Z);
+	cfg->l3.def       = button_list.at(BTN_THUMBL);
 
-	cfg->motion_sensor_x.axis.def = ::at32(motion_axis_list, ABS_X);
-	cfg->motion_sensor_y.axis.def = ::at32(motion_axis_list, ABS_Y);
-	cfg->motion_sensor_z.axis.def = ::at32(motion_axis_list, ABS_Z);
-	cfg->motion_sensor_g.axis.def = ::at32(motion_axis_list, ABS_RY); // DS3 uses the yaw axis for gyros
-
-	cfg->pressure_intensity_button.def = ::at32(button_list, NO_BUTTON);
-	cfg->analog_limiter_button.def = ::at32(button_list, NO_BUTTON);
-	cfg->orientation_reset_button.def = ::at32(button_list, NO_BUTTON);
+	cfg->pressure_intensity_button.def = button_list.at(NO_BUTTON);
 
 	// Set default misc variables
-	cfg->lstick_anti_deadzone.def = static_cast<u32>(0.13 * thumb_max); // 13%
-	cfg->rstick_anti_deadzone.def = static_cast<u32>(0.13 * thumb_max); // 13%
 	cfg->lstickdeadzone.def    = 30; // between 0 and 255
 	cfg->rstickdeadzone.def    = 30; // between 0 and 255
 	cfg->ltriggerthreshold.def = 0;  // between 0 and 255
 	cfg->rtriggerthreshold.def = 0;  // between 0 and 255
-	cfg->lpadsquircling.def    = 8000;
-	cfg->rpadsquircling.def    = 8000;
+	cfg->lpadsquircling.def    = 5000;
+	cfg->rpadsquircling.def    = 5000;
 
 	// apply defaults
 	cfg->from_default();
 }
 
-std::unordered_map<u32, std::string> evdev_joystick_handler::get_motion_axis_list() const
-{
-	return motion_axis_list;
-}
-
 bool evdev_joystick_handler::Init()
 {
 	if (m_is_init)
 		return true;
 
-	if (!m_pos_axis_config.load())
-	{
-		evdev_log.notice("positive_axis config missing. Using defaults");
-	}
-
-	evdev_log.notice("positive_axis config=\n%s", m_pos_axis_config.to_string());
+	m_pos_axis_config.load();
 
 	if (!m_pos_axis_config.exist())
 		m_pos_axis_config.save();
 
 	for (const auto& node : m_pos_axis_config.get_nodes())
 	{
-		if (node && *static_cast<cfg::_bool*>(node))
+		if (*static_cast<cfg::_bool*>(node))
 		{
-			const std::string& name = node->get_name();
-			const int code = libevdev_event_code_from_name(EV_ABS, name.c_str());
+			const auto name = node->get_name();
+			const int code  = libevdev_event_code_from_name(EV_ABS, name.c_str());
 			if (code < 0)
 				evdev_log.error("Failed to read axis name from %s. [code = %d] [name = %s]", m_pos_axis_config.cfg_name, code, name);
 			else
-				m_positive_axis.insert(code);
+				m_positive_axis.emplace_back(code);
 		}
 	}
 
@@ -166,19 +121,14 @@ bool evdev_joystick_handler::Init()
 
 std::string evdev_joystick_handler::get_device_name(const libevdev* dev)
 {
-	std::string name;
+	std::string name  = libevdev_get_name(dev);
+	const auto unique = libevdev_get_uniq(dev);
 
-	if (const char* raw_name = libevdev_get_name(dev))
-		name = raw_name;
+	if (name == "" && unique != nullptr)
+		name = unique;
 
-	if (name.empty())
-	{
-		if (const char* unique = libevdev_get_uniq(dev))
-			name = unique;
-
-		if (name.empty())
-			name = "Unknown Device";
-	}
+	if (name == "")
+		name = "Unknown Device";
 
 	return name;
 }
@@ -189,8 +139,8 @@ bool evdev_joystick_handler::update_device(const std::shared_ptr<PadDevice>& dev
 	if (!evdev_device)
 		return false;
 
-	const std::string& path = evdev_device->path;
-	libevdev*& dev = evdev_device->device;
+	const auto& path = evdev_device->path;
+	libevdev*& dev   = evdev_device->device;
 
 	const bool was_connected = dev != nullptr;
 
@@ -230,34 +180,31 @@ bool evdev_joystick_handler::update_device(const std::shared_ptr<PadDevice>& dev
 	return true;
 }
 
-void evdev_joystick_handler::close_devices()
+void evdev_joystick_handler::update_devs()
 {
-	const auto free_device = [](EvdevDevice* evdev_device)
+	for (auto& binding : bindings)
 	{
-		if (evdev_device && evdev_device->device)
+		update_device(binding.first);
+	}
+}
+
+void evdev_joystick_handler::Close()
+{
+	for (auto& binding : bindings)
+	{
+		EvdevDevice* evdev_device = static_cast<EvdevDevice*>(binding.first.get());
+		if (evdev_device)
 		{
-			const int fd = libevdev_get_fd(evdev_device->device);
-			if (evdev_device->effect_id != -1)
-				ioctl(fd, EVIOCRMFF, evdev_device->effect_id);
-			libevdev_free(evdev_device->device);
-			close(fd);
+			auto& dev = evdev_device->device;
+			if (dev != nullptr)
+			{
+				const int fd = libevdev_get_fd(dev);
+				if (evdev_device->effect_id != -1)
+					ioctl(fd, EVIOCRMFF, evdev_device->effect_id);
+				libevdev_free(dev);
+				close(fd);
+			}
 		}
-	};
-
-	for (pad_ensemble& binding : m_bindings)
-	{
-		free_device(static_cast<EvdevDevice*>(binding.device.get()));
-		free_device(static_cast<EvdevDevice*>(binding.buddy_device.get()));
-	}
-
-	for (auto& [name, device] : m_settings_added)
-	{
-		free_device(static_cast<EvdevDevice*>(device.get()));
-	}
-
-	for (auto& [name, device] : m_motion_settings_added)
-	{
-		free_device(static_cast<EvdevDevice*>(device.get()));
 	}
 }
 
@@ -267,13 +214,15 @@ std::unordered_map<u64, std::pair<u16, bool>> evdev_joystick_handler::GetButtonV
 	if (!device)
 		return button_values;
 
-	libevdev* dev = device->device;
+	auto& dev = device->device;
 
 	if (!Init())
 		return button_values;
 
-	for (const auto& [code, name] : button_list)
+	for (const auto& entry : button_list)
 	{
+		const auto code = entry.first;
+
 		if (code == NO_BUTTON)
 			continue;
 
@@ -285,26 +234,26 @@ std::unordered_map<u64, std::pair<u16, bool>> evdev_joystick_handler::GetButtonV
 		button_values.emplace(code, std::make_pair<u16, bool>(static_cast<u16>(val > 0 ? 255 : 0), false));
 	}
 
-	for (const auto& [code, name] : axis_list)
+	for (const auto& entry : axis_list)
 	{
-		int val = 0;
+		const auto code = entry.first;
+		int val         = 0;
 
 		if (libevdev_fetch_event_value(dev, EV_ABS, code, &val) == 0)
 			continue;
 
 		const int min = libevdev_get_abs_minimum(dev, code);
 		const int max = libevdev_get_abs_maximum(dev, code);
-		const int flat = libevdev_get_abs_flat(dev, code);
 
 		// Triggers do not need handling of negative values
-		if (min >= 0 && !m_positive_axis.contains(code))
+		if (min >= 0 && std::find(m_positive_axis.begin(), m_positive_axis.end(), code) == m_positive_axis.end())
 		{
-			const float fvalue = ScaledInput(val, min, max, flat);
+			const float fvalue = ScaledInput(val, min, max);
 			button_values.emplace(code, std::make_pair<u16, bool>(static_cast<u16>(fvalue), false));
 			continue;
 		}
 
-		const float fvalue = ScaledAxisInput(val, min, max, flat);
+		const float fvalue = ScaledInput2(val, min, max);
 		if (fvalue < 0)
 			button_values.emplace(code, std::make_pair<u16, bool>(static_cast<u16>(std::abs(fvalue)), true));
 		else
@@ -317,95 +266,57 @@ std::unordered_map<u64, std::pair<u16, bool>> evdev_joystick_handler::GetButtonV
 std::shared_ptr<evdev_joystick_handler::EvdevDevice> evdev_joystick_handler::get_evdev_device(const std::string& device)
 {
 	// Add device if not yet present
-	std::shared_ptr<EvdevDevice> evdev_device = add_device(device, true);
-	if (!evdev_device)
+	const int pad_index = add_device(device, nullptr, true);
+	if (pad_index < 0)
 		return nullptr;
 
+	auto dev = bindings[pad_index];
+
 	// Check if our device is connected
-	if (!update_device(evdev_device))
+	if (!update_device(dev.first))
 		return nullptr;
 
-	return evdev_device;
+	return std::static_pointer_cast<EvdevDevice>(dev.first);
 }
 
-PadHandlerBase::connection evdev_joystick_handler::get_next_button_press(const std::string& padId, const pad_callback& callback, const pad_fail_callback& fail_callback, gui_call_type call_type, const std::vector<std::string>& buttons)
+void evdev_joystick_handler::get_next_button_press(const std::string& padId, const pad_callback& callback, const pad_fail_callback& fail_callback, bool get_blacklist, const std::vector<std::string>& buttons)
 {
-	if (call_type == gui_call_type::blacklist)
+	if (get_blacklist)
 		m_blacklist.clear();
 
-	if (call_type == gui_call_type::reset_input || call_type == gui_call_type::blacklist)
-		m_min_button_values.clear();
-
 	// Get our evdev device
-	std::shared_ptr<EvdevDevice> device = get_evdev_device(padId);
-	if (!device || !device->device)
+	auto device = get_evdev_device(padId);
+	if (!device || device->device == nullptr)
 	{
 		if (fail_callback)
 			fail_callback(padId);
-		return connection::disconnected;
+		return;
 	}
-
 	libevdev* dev = device->device;
 
-	// Try to fetch all new events from the joystick.
+	// Try to query the latest event from the joystick.
 	input_event evt;
-	bool has_new_event = false;
-	int ret = LIBEVDEV_READ_STATUS_SUCCESS;
-	while (ret >= 0)
+	int ret = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL, &evt);
+
+	// Grab any pending sync event.
+	if (ret == LIBEVDEV_READ_STATUS_SYNC)
+		ret = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL | LIBEVDEV_READ_FLAG_SYNC, &evt);
+
+	auto data = GetButtonValues(device);
+
+	auto find_value = [=, this](const std::string& name)
 	{
-		if (ret == LIBEVDEV_READ_STATUS_SYNC)
-		{
-			// Grab any pending sync event.
-			ret = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_SYNC, &evt);
-		}
-		else
-		{
-			ret = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL, &evt);
-		}
-
-		has_new_event |= ret == LIBEVDEV_READ_STATUS_SUCCESS;
-	}
-
-	if (call_type == gui_call_type::get_connection)
-	{
-		return has_new_event ? connection::connected : connection::no_data;
-	}
-
-	const auto data = GetButtonValues(device);
-
-	const auto find_value = [&, this](const std::string& str)
-	{
-		const std::vector<std::string> names = cfg_pad::get_buttons(str);
-
-		u16 value{};
-
-		const auto set_value = [&value, &data](u32 code, bool dir)
-		{
-			if (const auto it = data.find(static_cast<u64>(code)); it != data.cend() && dir == it->second.second)
-			{
-				value = std::max(value, it->second.first);
-			}
-		};
-
-		for (const u32 code : FindKeyCodes<u32, u32>(rev_axis_list, names))
-		{
-			set_value(code, true);
-		}
-
-		for (const u32 code : FindKeyCodes<u32, u32>(axis_list, names))
-		{
-			set_value(code, false);
-		}
-
-		for (const u32 code : FindKeyCodes<u32, u32>(button_list, names))
-		{
-			set_value(code, false);
-		}
-
-		return value;
+		int key = FindKeyCodeByString(rev_axis_list, name, false);
+		const bool dir = key >= 0;
+		if (key < 0)
+			key = FindKeyCodeByString(axis_list, name, false);
+		if (key < 0)
+			key = FindKeyCodeByString(button_list, name);
+		auto it = data.find(static_cast<u64>(key));
+		return it != data.end() && dir == it->second.second ? it->second.first : 0;
 	};
 
-	pad_preview_values preview_values{};
+	pad_preview_values preview_values = { 0, 0, 0, 0, 0, 0 };
 
 	if (buttons.size() == 10)
 	{
@@ -417,201 +328,108 @@ PadHandlerBase::connection evdev_joystick_handler::get_next_button_press(const s
 		preview_values[5] = find_value(buttons[9]) - find_value(buttons[8]); // Right Stick Y
 	}
 
-	// return if nothing new has happened. ignore this to get the current state for blacklist or reset_input
-	if (call_type != gui_call_type::blacklist && call_type != gui_call_type::reset_input && !has_new_event)
+	// return if nothing new has happened. ignore this to get the current state for blacklist
+	if (!get_blacklist && ret < 0)
 	{
 		if (callback)
 			callback(0, "", padId, 0, preview_values);
-		return connection::no_data;
+		return;
 	}
 
-	struct
-	{
-		u16 value = 0;
-		std::string name;
-	} pressed_button{};
-
-	const auto set_button_press = [&](const u32 code, const std::string& name, std::string_view type, u16 threshold, int ev_type, bool is_rev_axis)
-	{
-		if (call_type != gui_call_type::blacklist && m_blacklist.contains(name))
-			return;
-
-		// Ignore codes that aren't part of the latest events. Otherwise we will get value 0 which will reset our min_value.
-		const auto it = data.find(static_cast<u64>(code));
-		if (it == data.cend())
-		{
-			if (call_type == gui_call_type::reset_input)
-			{
-				// Set to max. We won't have all the events for all the buttons or axis at this point.
-				m_min_button_values[name] = 65535;
-
-				if (ev_type == EV_ABS)
-				{
-					// Also set the other direction to max if it wasn't already found.
-					const auto it_other_axis = is_rev_axis ? axis_list.find(code) : rev_axis_list.find(code);
-					ensure(it_other_axis != (is_rev_axis ? axis_list.cend() : rev_axis_list.cend()));
-					if (const std::string& other_name = it_other_axis->second; !m_min_button_values.contains(other_name))
-					{
-						m_min_button_values[other_name] = 65535;
-					}
-				}
-			}
-			return;
-		}
-
-		const auto& [value, is_rev_ax] = it->second;
-
-		// If we want the value for an axis, its direction has to match the direction of the data.
-		if (ev_type == EV_ABS && is_rev_axis != is_rev_ax)
-			return;
-
-		u16& min_value = m_min_button_values[name];
-
-		if (call_type == gui_call_type::reset_input || value < min_value)
-		{
-			min_value = value;
-			return;
-		}
-
-		if (value <= threshold)
-			return;
-
-		if (call_type == gui_call_type::blacklist)
-		{
-			m_blacklist.insert(name);
-
-			if (ev_type == EV_ABS)
-			{
-				const int min = libevdev_get_abs_minimum(dev, code);
-				const int max = libevdev_get_abs_maximum(dev, code);
-				evdev_log.error("Evdev Calibration: Added %s [ %d = %s = %s ] to blacklist. [ Value = %d ] [ Min = %d ] [ Max = %d ]", type, code, libevdev_event_code_get_name(ev_type, code), name, value, min, max);
-			}
-			else
-			{
-				evdev_log.error("Evdev Calibration: Added %s [ %d = %s = %s ] to blacklist. Value = %d", type, code, libevdev_event_code_get_name(ev_type, code), name, value);
-			}
-
-			return;
-		}
-
-		const u16 diff = value > min_value ? value - min_value : 0;
-
-		if (diff > button_press_threshold && value > pressed_button.value)
-		{
-			pressed_button = { .value = value, .name = name };
-		}
-	};
-
-	const bool is_xbox_360_controller = padId.find("Xbox 360") != umax;
-	const bool is_sony_controller = !is_xbox_360_controller && padId.find("Sony") != umax;
-	const bool is_sony_guitar = is_sony_controller && padId.find("Guitar") != umax;
+	std::pair<u16, std::string> pressed_button = { 0, "" };
 
 	for (const auto& [code, name] : button_list)
 	{
 		// Handle annoying useless buttons
 		if (code == NO_BUTTON)
 			continue;
-		if (is_xbox_360_controller && code >= BTN_TRIGGER_HAPPY)
+		if (padId.find("Xbox 360") != umax && code >= BTN_TRIGGER_HAPPY)
 			continue;
-		if (is_sony_controller && !is_sony_guitar && (code == BTN_TL2 || code == BTN_TR2))
+		if (padId.find("Sony") != umax && (code == BTN_TL2 || code == BTN_TR2))
 			continue;
 
-		set_button_press(code, name, "button"sv, 0, EV_KEY, false);
+		if (!get_blacklist && std::find(m_blacklist.begin(), m_blacklist.end(), name) != m_blacklist.end())
+			continue;
+
+		const u16 value = data[code].first;
+		if (value > 0)
+		{
+			if (get_blacklist)
+			{
+				m_blacklist.emplace_back(name);
+				evdev_log.error("Evdev Calibration: Added button [ %d = %s = %s ] to blacklist. Value = %d", code, libevdev_event_code_get_name(EV_KEY, code), name, value);
+			}
+			else if (value > pressed_button.first)
+				pressed_button = { value, name };
+		}
 	}
 
 	for (const auto& [code, name] : axis_list)
 	{
-		set_button_press(code, name, "axis"sv, m_thumb_threshold, EV_ABS, false);
+		if (data[code].second)
+			continue;
+
+		if (!get_blacklist && std::find(m_blacklist.begin(), m_blacklist.end(), name) != m_blacklist.end())
+			continue;
+
+		const u16 value = data[code].first;
+		if (value > 0 && value >= m_thumb_threshold)
+		{
+			if (get_blacklist)
+			{
+				const int min = libevdev_get_abs_minimum(dev, code);
+				const int max = libevdev_get_abs_maximum(dev, code);
+				m_blacklist.emplace_back(name);
+				evdev_log.error("Evdev Calibration: Added axis [ %d = %s = %s ] to blacklist. [ Value = %d ] [ Min = %d ] [ Max = %d ]", code, libevdev_event_code_get_name(EV_ABS, code), name, value, min, max);
+			}
+			else if (value > pressed_button.first)
+				pressed_button = { value, name };
+		}
 	}
 
 	for (const auto& [code, name] : rev_axis_list)
 	{
-		set_button_press(code, name, "rev axis"sv, m_thumb_threshold, EV_ABS, true);
+		if (!data[code].second)
+			continue;
+
+		if (!get_blacklist && std::find(m_blacklist.begin(), m_blacklist.end(), name) != m_blacklist.end())
+			continue;
+
+		const u16 value = data[code].first;
+		if (value > 0 && value >= m_thumb_threshold)
+		{
+			if (get_blacklist)
+			{
+				const int min = libevdev_get_abs_minimum(dev, code);
+				const int max = libevdev_get_abs_maximum(dev, code);
+				m_blacklist.emplace_back(name);
+				evdev_log.error("Evdev Calibration: Added rev axis [ %d = %s = %s ] to blacklist. [ Value = %d ] [ Min = %d ] [ Max = %d ]", code, libevdev_event_code_get_name(EV_ABS, code), name, value, min, max);
+			}
+			else if (value > pressed_button.first)
+				pressed_button = { value, name };
+		}
 	}
 
-	if (call_type == gui_call_type::reset_input)
-	{
-		return connection::no_data;
-	}
-
-	if (call_type == gui_call_type::blacklist)
+	if (get_blacklist)
 	{
 		if (m_blacklist.empty())
 			evdev_log.success("Evdev Calibration: Blacklist is clear. No input spam detected");
-		return connection::connected;
+		return;
 	}
 
 	if (callback)
 	{
-		if (pressed_button.value > 0)
-			callback(pressed_button.value, pressed_button.name, padId, 0, std::move(preview_values));
+		if (pressed_button.first > 0)
+			return callback(pressed_button.first, pressed_button.second, padId, 0, preview_values);
 		else
-			callback(0, "", padId, 0, std::move(preview_values));
+			return callback(0, "", padId, 0, preview_values);
 	}
-
-	return connection::connected;
-}
-
-void evdev_joystick_handler::get_motion_sensors(const std::string& padId, const motion_callback& callback, const motion_fail_callback& fail_callback, motion_preview_values preview_values, const std::array<AnalogSensor, 4>& sensors)
-{
-	// Add device if not yet present
-	std::shared_ptr<EvdevDevice> device = add_motion_device(padId, true);
-	if (!device || !update_device(device) || !device->device)
-	{
-		if (fail_callback)
-			fail_callback(padId, std::move(preview_values));
-		return;
-	}
-
-	libevdev* dev = device->device;
-
-	// Try to fetch all new events from the joystick.
-	bool is_dirty = false;
-	int ret = LIBEVDEV_READ_STATUS_SUCCESS;
-	while (ret >= 0)
-	{
-		input_event evt;
-
-		if (ret == LIBEVDEV_READ_STATUS_SYNC)
-		{
-			// Grab any pending sync event.
-			ret = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL | LIBEVDEV_READ_FLAG_SYNC, &evt);
-		}
-		else
-		{
-			ret = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL, &evt);
-		}
-
-		if (ret == LIBEVDEV_READ_STATUS_SUCCESS && evt.type == EV_ABS)
-		{
-			for (usz i = 0; i < sensors.size(); i++)
-			{
-				const AnalogSensor& sensor = sensors[i];
-
-				if (sensor.m_keyCode != evt.code)
-					continue;
-
-				preview_values[i] = get_sensor_value(dev, sensor, evt);;
-				is_dirty = true;
-			}
-		}
-	}
-
-	if (ret < 0)
-	{
-		// -EAGAIN signifies no available events, not an actual *error*.
-		if (ret != -EAGAIN)
-			evdev_log.error("Failed to read latest event from motion device: %s [errno %d]", strerror(-ret), -ret);
-	}
-
-	if (callback && is_dirty)
-		callback(padId, std::move(preview_values));
 }
 
 // https://github.com/dolphin-emu/dolphin/blob/master/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
 // https://github.com/reicast/reicast-emulator/blob/master/core/linux-dist/evdev.cpp
 // http://www.infradead.org/~mchehab/kernel_docs_pdf/linux-input.pdf
-void evdev_joystick_handler::SetRumble(EvdevDevice* device, u8 large, u8 small)
+void evdev_joystick_handler::SetRumble(EvdevDevice* device, u16 large, u16 small)
 {
 	if (!device || !device->has_rumble || device->effect_id == -2)
 		return;
@@ -620,18 +438,15 @@ void evdev_joystick_handler::SetRumble(EvdevDevice* device, u8 large, u8 small)
 	if (fd < 0)
 		return;
 
-	device->new_output_data = large != device->large_motor || small != device->small_motor;
-
-	const auto now = steady_clock::now();
-	const auto elapsed = now - device->last_output;
+	if (large == device->force_large && small == device->force_small)
+		return;
 
 	// XBox One Controller can't handle faster vibration updates than ~10ms. Elite is even worse.
 	// So I'll use 20ms to be on the safe side. No lag was noticable.
-	if ((!device->new_output_data || elapsed <= 20ms) && elapsed <= min_output_interval)
+	if (clock() - device->last_vibration < 20)
 		return;
 
-	device->new_output_data = false;
-	device->last_output = now;
+	device->last_vibration = clock();
 
 	// delete the previous effect (which also stops it)
 	if (device->effect_id != -1)
@@ -642,8 +457,8 @@ void evdev_joystick_handler::SetRumble(EvdevDevice* device, u8 large, u8 small)
 
 	if (large == 0 && small == 0)
 	{
-		device->large_motor = large;
-		device->small_motor = small;
+		device->force_large = large;
+		device->force_small = small;
 		return;
 	}
 
@@ -654,8 +469,8 @@ void evdev_joystick_handler::SetRumble(EvdevDevice* device, u8 large, u8 small)
 		effect.type                      = FF_RUMBLE;
 		effect.id                        = device->effect_id;
 		effect.direction                 = 0;
-		effect.u.rumble.strong_magnitude = large * 257;
-		effect.u.rumble.weak_magnitude   = small * 257;
+		effect.u.rumble.strong_magnitude = large;
+		effect.u.rumble.weak_magnitude   = small;
 		effect.replay.length             = 0;
 		effect.replay.delay              = 0;
 		effect.trigger.button            = 0;
@@ -687,42 +502,94 @@ void evdev_joystick_handler::SetRumble(EvdevDevice* device, u8 large, u8 small)
 		device->effect_id = -2;
 	}
 
-	device->large_motor = large;
-	device->small_motor = small;
+	device->force_large = large;
+	device->force_small = small;
 }
 
-void evdev_joystick_handler::SetPadData(const std::string& padId, u8 /*player_id*/, u8 large_motor, u8 small_motor, s32 /* r*/, s32 /* g*/, s32 /* b*/, bool /*player_led*/, bool /*battery_led*/, u32 /*battery_led_brightness*/)
+void evdev_joystick_handler::SetPadData(const std::string& padId, u8 /*player_id*/, u32 largeMotor, u32 smallMotor, s32 /* r*/, s32 /* g*/, s32 /* b*/, bool /*battery_led*/, u32 /*battery_led_brightness*/)
 {
 	// Get our evdev device
-	std::shared_ptr<EvdevDevice> dev = get_evdev_device(padId);
+	auto dev = get_evdev_device(padId);
 	if (!dev)
 	{
-		evdev_log.error("evdev TestVibration: Device [%s] not found! [large_motor = %d] [small_motor = %d]", padId, large_motor, small_motor);
+		evdev_log.error("evdev TestVibration: Device [%s] not found! [largeMotor = %d] [smallMotor = %d]", padId, largeMotor, smallMotor);
 		return;
 	}
 
 	if (!dev->has_rumble)
 	{
-		evdev_log.error("evdev TestVibration: Device [%s] does not support rumble features! [large_motor = %d] [small_motor = %d]", padId, large_motor, small_motor);
+		evdev_log.error("evdev TestVibration: Device [%s] does not support rumble features! [largeMotor = %d] [smallMotor = %d]", padId, largeMotor, smallMotor);
 		return;
 	}
 
-	SetRumble(static_cast<EvdevDevice*>(dev.get()), large_motor, small_motor);
+	SetRumble(static_cast<EvdevDevice*>(dev.get()), largeMotor, smallMotor);
 }
 
-std::vector<pad_list_entry> evdev_joystick_handler::list_devices()
+u32 evdev_joystick_handler::GetButtonInfo(const input_event& evt, const std::shared_ptr<EvdevDevice>& device, int& value)
+{
+	const u32 code         = evt.code;
+	const int val          = evt.value;
+	m_is_button_or_trigger = false;
+
+	switch (evt.type)
+	{
+	case EV_KEY:
+	{
+		m_is_button_or_trigger = true;
+
+		// get the button value and return its code
+		if (button_list.find(code) == button_list.end())
+		{
+			evdev_log.error("Evdev button %s (%d) is unknown. Please add it to the button list.", libevdev_event_code_get_name(EV_KEY, code), code);
+			return -1;
+		}
+
+		value = val > 0 ? 255 : 0;
+		return code;
+	}
+	case EV_ABS:
+	{
+		if (!device || !device->device)
+		{
+			return -1;
+		}
+		auto& dev     = device->device;
+		const int min = libevdev_get_abs_minimum(dev, code);
+		const int max = libevdev_get_abs_maximum(dev, code);
+
+		// Triggers do not need handling of negative values
+		if (min >= 0 && std::find(m_positive_axis.begin(), m_positive_axis.end(), code) == m_positive_axis.end())
+		{
+			m_is_negative          = false;
+			m_is_button_or_trigger = true;
+			value                  = static_cast<u16>(ScaledInput(val, min, max));
+			return code;
+		}
+
+		const float fvalue = ScaledInput2(val, min, max);
+		m_is_negative      = fvalue < 0;
+		value              = static_cast<u16>(std::abs(fvalue));
+		return code;
+	}
+	default: return -1;
+	}
+}
+
+std::vector<std::string> evdev_joystick_handler::ListDevices()
 {
 	Init();
 
 	std::unordered_map<std::string, u32> unique_names;
-	std::vector<pad_list_entry> evdev_joystick_list;
+	std::vector<std::string> evdev_joystick_list;
+	fs::dir devdir{"/dev/input/"};
+	fs::dir_entry et;
 
-	for (auto&& et : fs::dir{"/dev/input/"})
+	while (devdir.read(et))
 	{
 		// Check if the entry starts with event (a 5-letter word)
-		if (et.name.size() > 5 && et.name.starts_with("event"))
+		if (et.name.size() > 5 && et.name.compare(0, 5, "event") == 0)
 		{
-			const int fd         = open(("/dev/input/" + et.name).c_str(), O_RDONLY | O_NONBLOCK);
+			const int fd         = open(("/dev/input/" + et.name).c_str(), O_RDWR | O_NONBLOCK);
 			struct libevdev* dev = NULL;
 			const int rc         = libevdev_new_from_fd(fd, &dev);
 			if (rc < 0)
@@ -734,32 +601,19 @@ std::vector<pad_list_entry> evdev_joystick_handler::list_devices()
 				close(fd);
 				continue;
 			}
-
-			if (libevdev_has_event_type(dev, EV_ABS))
+			if (libevdev_has_event_type(dev, EV_KEY) &&
+				libevdev_has_event_type(dev, EV_ABS))
 			{
-				bool is_motion_device = false;
-				bool is_pad_device = libevdev_has_event_type(dev, EV_KEY);
+				// It's a joystick.
+				std::string name = get_device_name(dev);
 
-				if (!is_pad_device)
-				{
-					// Check if it's a motion device.
-					is_motion_device = libevdev_has_property(dev, INPUT_PROP_ACCELEROMETER);
-				}
+				if (unique_names.find(name) == unique_names.end())
+					unique_names.emplace(name, 1);
+				else
+					name = fmt::format("%d. %s", ++unique_names[name], name);
 
-				if (is_pad_device || is_motion_device)
-				{
-					// It's a joystick or motion device.
-					std::string name = get_device_name(dev);
-
-					if (unique_names.find(name) == unique_names.end())
-						unique_names.emplace(name, 1);
-					else
-						name = fmt::format("%d. %s", ++unique_names[name], name);
-
-					evdev_joystick_list.emplace_back(name, is_motion_device);
-				}
+				evdev_joystick_list.push_back(name);
 			}
-
 			libevdev_free(dev);
 			close(fd);
 		}
@@ -767,18 +621,19 @@ std::vector<pad_list_entry> evdev_joystick_handler::list_devices()
 	return evdev_joystick_list;
 }
 
-std::shared_ptr<evdev_joystick_handler::EvdevDevice> evdev_joystick_handler::add_device(const std::string& device, bool in_settings)
+int evdev_joystick_handler::add_device(const std::string& device, const std::shared_ptr<Pad>& pad, bool in_settings)
 {
 	if (in_settings && m_settings_added.count(device))
-		return ::at32(m_settings_added, device);
+		return m_settings_added.at(device);
 
 	// Now we need to find the device with the same name, and make sure not to grab any duplicates.
 	std::unordered_map<std::string, u32> unique_names;
-
-	for (auto&& et : fs::dir{"/dev/input/"})
+	fs::dir devdir{ "/dev/input/" };
+	fs::dir_entry et;
+	while (devdir.read(et))
 	{
 		// Check if the entry starts with event (a 5-letter word)
-		if (et.name.size() > 5 && et.name.starts_with("event"))
+		if (et.name.size() > 5 && et.name.compare(0, 5, "event") == 0)
 		{
 			const std::string path = "/dev/input/" + et.name;
 			const int fd           = open(path.c_str(), O_RDWR | O_NONBLOCK);
@@ -801,25 +656,35 @@ std::shared_ptr<evdev_joystick_handler::EvdevDevice> evdev_joystick_handler::add
 			else
 				name = fmt::format("%d. %s", ++unique_names[name], name);
 
-			if (name == device &&
-				libevdev_has_event_type(dev, EV_KEY) &&
-				libevdev_has_event_type(dev, EV_ABS))
+			if (libevdev_has_event_type(dev, EV_KEY) &&
+				libevdev_has_event_type(dev, EV_ABS) &&
+				name == device)
 			{
-				// It's a joystick.
+				// It's a joystick. Now let's make sure we don't already have this one.
+				if (std::any_of(bindings.begin(), bindings.end(), [&path](std::pair<std::shared_ptr<PadDevice>, std::shared_ptr<Pad>> binding)
+				{
+					EvdevDevice* device = static_cast<EvdevDevice*>(binding.first.get());
+					return device && path == device->path;
+				}))
+				{
+					libevdev_free(dev);
+					close(fd);
+					continue;
+				}
 
 				if (in_settings)
 				{
-					m_dev = std::make_shared<EvdevDevice>();
-					m_settings_added[device] = m_dev;
+					m_dev                  = std::make_shared<EvdevDevice>();
+					m_settings_added[device] = bindings.size();
 
 					// Let's log axis information while we are in the settings in order to identify problems more easily.
 					for (const auto& [code, axis_name] : axis_list)
 					{
-						if (const input_absinfo* info = libevdev_get_abs_info(dev, code))
+						if (const input_absinfo *info = libevdev_get_abs_info(dev, code))
 						{
-							const char* code_name = libevdev_event_code_get_name(EV_ABS, code);
-							evdev_log.notice("Axis info for %s: %s (%s) => minimum=%d, maximum=%d, fuzz=%d, flat=%d, resolution=%d",
-								name, code_name, axis_name, info->minimum, info->maximum, info->fuzz, info->flat, info->resolution);
+							const auto code_name = libevdev_event_code_get_name(EV_ABS, code);
+							evdev_log.notice("Axis info for %s: %s (%s) => minimum=%d, maximum=%d, fuzz=%d, resolution=%d",
+								name, code_name, axis_name, info->minimum, info->maximum, info->fuzz, info->resolution);
 						}
 					}
 				}
@@ -828,93 +693,14 @@ std::shared_ptr<evdev_joystick_handler::EvdevDevice> evdev_joystick_handler::add
 				m_dev->device     = dev;
 				m_dev->path       = path;
 				m_dev->has_rumble = libevdev_has_event_type(dev, EV_FF);
-				m_dev->has_motion = libevdev_has_property(dev, INPUT_PROP_ACCELEROMETER);
-
-				evdev_log.notice("Capability info for %s: rumble=%d, motion=%d", name, m_dev->has_rumble, m_dev->has_motion);
-
-				return m_dev;
+				bindings.emplace_back(m_dev, pad);
+				return bindings.size() - 1;
 			}
 			libevdev_free(dev);
 			close(fd);
 		}
 	}
-	return nullptr;
-}
-
-std::shared_ptr<evdev_joystick_handler::EvdevDevice> evdev_joystick_handler::add_motion_device(const std::string& device, bool in_settings)
-{
-	if (device.empty())
-		return nullptr;
-
-	if (in_settings && m_motion_settings_added.count(device))
-		return ::at32(m_motion_settings_added, device);
-
-	// Now we need to find the device with the same name, and make sure not to grab any duplicates.
-	std::unordered_map<std::string, u32> unique_names;
-
-	for (auto&& et : fs::dir{"/dev/input/"})
-	{
-		// Check if the entry starts with event (a 5-letter word)
-		if (et.name.size() > 5 && et.name.starts_with("event"))
-		{
-			const std::string path = "/dev/input/" + et.name;
-			const int fd           = open(path.c_str(), O_RDWR | O_NONBLOCK);
-			struct libevdev* dev   = NULL;
-			const int rc           = libevdev_new_from_fd(fd, &dev);
-			if (rc < 0)
-			{
-				// If it's just a bad file descriptor, don't bother logging, but otherwise, log it.
-				if (rc != -9)
-					evdev_log.warning("Failed to connect to device at %s, the error was: %s", path, strerror(-rc));
-				libevdev_free(dev);
-				close(fd);
-				continue;
-			}
-
-			std::string name = get_device_name(dev);
-
-			if (unique_names.find(name) == unique_names.end())
-				unique_names.emplace(name, 1);
-			else
-				name = fmt::format("%d. %s", ++unique_names[name], name);
-
-			if (name == device &&
-				libevdev_has_property(dev, INPUT_PROP_ACCELEROMETER) &&
-				libevdev_has_event_type(dev, EV_ABS))
-			{
-				// Let's log axis information while we are in the settings in order to identify problems more easily.
-				// Directional axes on this device (absolute and/or relative x, y, z) represent accelerometer data.
-				// Some devices also report gyroscope data, which devices can report through the rotational axes (absolute and/or relative rx, ry, rz).
-				// All other axes retain their meaning.
-				// A device must not mix regular directional axes and accelerometer axes on the same event node.
-				for (const auto& [code, axis_name] : axis_list)
-				{
-					if (const input_absinfo* info = libevdev_get_abs_info(dev, code))
-					{
-						const bool is_accel = code == ABS_X || code == ABS_Y || code == ABS_Z;
-						const char* code_name = libevdev_event_code_get_name(EV_ABS, code);
-						evdev_log.notice("Axis info for %s: %s (%s, %s) => minimum=%d, maximum=%d, fuzz=%d, flat=%d, resolution=%d",
-							name, code_name, axis_name, is_accel ? "accelerometer" : "gyro", info->minimum, info->maximum, info->fuzz, info->flat, info->resolution);
-					}
-				}
-
-				std::shared_ptr<EvdevDevice> motion_device = std::make_shared<EvdevDevice>();
-				motion_device->device     = dev;
-				motion_device->path       = path;
-				motion_device->has_motion = true;
-
-				if (in_settings)
-				{
-					m_motion_settings_added[device] = motion_device;
-				}
-
-				return motion_device;
-			}
-			libevdev_free(dev);
-			close(fd);
-		}
-	}
-	return nullptr;
+	return -1;
 }
 
 PadHandlerBase::connection evdev_joystick_handler::update_connection(const std::shared_ptr<PadDevice>& device)
@@ -929,129 +715,25 @@ PadHandlerBase::connection evdev_joystick_handler::update_connection(const std::
 	return connection::connected;
 }
 
-void evdev_joystick_handler::get_mapping(const pad_ensemble& binding)
+void evdev_joystick_handler::get_mapping(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad)
 {
-	m_dev = std::static_pointer_cast<EvdevDevice>(binding.device);
-	const auto& pad = binding.pad;
-
+	m_dev = std::static_pointer_cast<EvdevDevice>(device);
 	if (!m_dev || !pad)
 		return;
 
-	libevdev* dev = m_dev->device;
-	if (!dev)
+	auto& dev = m_dev->device;
+	if (dev == nullptr)
 		return;
 
-	// Try to fetch all new events from the joystick.
-	bool got_changes = false;
+	// Try to query the latest event from the joystick.
 	input_event evt;
-	int ret = LIBEVDEV_READ_STATUS_SUCCESS;
-	while (ret >= 0)
+	int ret = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL, &evt);
+
+	// Grab any pending sync event.
+	if (ret == LIBEVDEV_READ_STATUS_SYNC)
 	{
-		if (ret == LIBEVDEV_READ_STATUS_SYNC)
-		{
-			// Grab any pending sync event.
-			ret = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL | LIBEVDEV_READ_FLAG_SYNC, &evt);
-		}
-		else
-		{
-			ret = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL, &evt);
-		}
-
-		if (ret == LIBEVDEV_READ_STATUS_SUCCESS)
-		{
-			switch (evt.type)
-			{
-			case EV_KEY:
-			{
-				auto& wrapper = m_dev->events_by_code[evt.code];
-
-				if (!wrapper)
-				{
-					wrapper.reset(new key_event_wrapper());
-				}
-
-				key_event_wrapper* key_wrapper = static_cast<key_event_wrapper*>(wrapper.get());
-
-				if (!key_wrapper->is_initialized)
-				{
-					if (!button_list.contains(evt.code))
-					{
-						evdev_log.error("Evdev button %s (%d) is unknown. Please add it to the button list.", libevdev_event_code_get_name(EV_KEY, evt.code), evt.code);
-					}
-
-					key_wrapper->is_initialized = true;
-				}
-
-				const u16 new_value = evt.value > 0 ? 255 : 0;
-
-				if (key_wrapper->value != new_value)
-				{
-					key_wrapper->value = new_value;
-					got_changes = true;
-				}
-				break;
-			}
-			case EV_ABS:
-			{
-				auto& wrapper = m_dev->events_by_code[evt.code];
-
-				if (!wrapper)
-				{
-					wrapper.reset(new axis_event_wrapper());
-				}
-
-				axis_event_wrapper* axis_wrapper = static_cast<axis_event_wrapper*>(wrapper.get());
-
-				if (!axis_wrapper->is_initialized)
-				{
-					axis_wrapper->min = libevdev_get_abs_minimum(dev, evt.code);
-					axis_wrapper->max = libevdev_get_abs_maximum(dev, evt.code);
-					axis_wrapper->flat = libevdev_get_abs_flat(dev, evt.code);
-					axis_wrapper->is_initialized = true;
-
-					// Triggers do not need handling of negative values
-					if (axis_wrapper->min >= 0 && !m_positive_axis.contains(evt.code))
-					{
-						axis_wrapper->is_trigger = true;
-					}
-				}
-
-				// Triggers do not need handling of negative values
-				if (axis_wrapper->is_trigger)
-				{
-					const u16 new_value = static_cast<u16>(ScaledInput(evt.value, axis_wrapper->min, axis_wrapper->max, axis_wrapper->flat));
-					u16& key_value = axis_wrapper->values[false];
-
-					if (key_value != new_value)
-					{
-						key_value = new_value;
-						got_changes = true;
-					}
-				}
-				else
-				{
-					const float fvalue = ScaledAxisInput(evt.value, axis_wrapper->min, axis_wrapper->max, axis_wrapper->flat);
-					const bool is_negative = fvalue < 0;
-
-					const u16 new_value_0 = static_cast<u16>(std::abs(fvalue));
-					const u16 new_value_1 = 0; // We need to reset the other direction of this axis
-
-					u16& key_value_0 = axis_wrapper->values[is_negative];
-					u16& key_value_1 = axis_wrapper->values[!is_negative];
-
-					if (key_value_0 != new_value_0 || key_value_1 != new_value_1)
-					{
-						key_value_0 = new_value_0;
-						key_value_1 = new_value_1;
-						got_changes = true;
-					}
-				}
-				break;
-			}
-			default:
-				break;
-			}
-		}
+		evdev_log.notice("Captured sync event");
+		ret = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL | LIBEVDEV_READ_FLAG_SYNC, &evt);
 	}
 
 	if (ret < 0)
@@ -1059,260 +741,172 @@ void evdev_joystick_handler::get_mapping(const pad_ensemble& binding)
 		// -EAGAIN signifies no available events, not an actual *error*.
 		if (ret != -EAGAIN)
 			evdev_log.error("Failed to read latest event from joystick: %s [errno %d]", strerror(-ret), -ret);
+		return;
 	}
 
-	// Apply all events
-	if (got_changes)
-	{
-		apply_input_events(pad);
-	}
-}
+	m_dev->cur_type = evt.type;
 
-void evdev_joystick_handler::get_extended_info(const pad_ensemble& binding)
-{
-	// We use this to get motion controls from our buddy device
-	const auto& device = std::static_pointer_cast<EvdevDevice>(binding.buddy_device);
-	const auto& pad = binding.pad;
-
-	if (!pad || !device || !update_device(device))
+	int value;
+	const u32 button_code = GetButtonInfo(evt, m_dev, value);
+	if (button_code == NO_BUTTON || value < 0)
 		return;
 
-	libevdev* dev = device->device;
-	if (!dev)
-		return;
-
-	// Try to fetch all new events from the joystick.
-	input_event evt;
-	int ret = LIBEVDEV_READ_STATUS_SUCCESS;
-	while (ret >= 0)
-	{
-		if (ret == LIBEVDEV_READ_STATUS_SYNC)
-		{
-			// Grab any pending sync event.
-			ret = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL | LIBEVDEV_READ_FLAG_SYNC, &evt);
-		}
-		else
-		{
-			ret = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL, &evt);
-		}
-
-		if (ret == LIBEVDEV_READ_STATUS_SUCCESS && evt.type == EV_ABS)
-		{
-			for (AnalogSensor& sensor : pad->m_sensors)
-			{
-				if (sensor.m_keyCode != evt.code)
-					continue;
-
-				sensor.m_value = get_sensor_value(dev, sensor, evt);
-			}
-		}
-	}
-
-	set_raw_orientation(*pad);
-
-	if (ret < 0)
-	{
-		// -EAGAIN signifies no available events, not an actual *error*.
-		if (ret != -EAGAIN)
-			evdev_log.error("Failed to read latest event from buddy device: %s [errno %d]", strerror(-ret), -ret);
-	}
-}
-
-u16 evdev_joystick_handler::get_sensor_value(const libevdev* dev, const AnalogSensor& sensor, const input_event& evt) const
-{
-	if (dev)
-	{
-		const int min = libevdev_get_abs_minimum(dev, evt.code);
-		const int max = libevdev_get_abs_maximum(dev, evt.code);
-		const int flat = libevdev_get_abs_flat(dev, evt.code);
-
-		s16 value = ScaledInput(evt.value, min, max, flat, 1023.0f);
-
-		if (sensor.m_mirrored)
-		{
-			value = 1023 - value;
-		}
-
-		return Clamp0To1023(value + sensor.m_shift);
-	}
-
-	return 0;
-}
-
-void evdev_joystick_handler::apply_input_events(const std::shared_ptr<Pad>& pad)
-{
-	if (!pad)
-		return;
-
-	const cfg_pad* cfg = m_dev->config;
-	if (!cfg)
-		return;
+	auto axis_orientations = m_dev->axis_orientations;
 
 	// Find out if special buttons are pressed (introduced by RPCS3).
 	// These buttons will have a delay of one cycle, but whatever.
-	const bool analog_limiter_enabled = pad->get_analog_limiter_button_active(cfg->analog_limiter_toggle_mode.get(), pad->m_player_id);
-	const bool adjust_pressure = pad->get_pressure_intensity_button_active(cfg->pressure_intensity_toggle_mode.get(), pad->m_player_id);
-	const u32 pressure_intensity_deadzone = cfg->pressure_intensity_deadzone.get();
-
-	const auto update_values = [&](bool& pressed, u16& final_value, bool is_stick_value, u32 code, u16 val)
-	{
-		bool press{};
-		TranslateButtonPress(m_dev, code, press, val, analog_limiter_enabled, is_stick_value);
-
-		if (press)
-		{
-			if (!is_stick_value)
-			{
-				// Modify pressure if necessary if the button was pressed
-				if (adjust_pressure)
-				{
-					val = pad->m_pressure_intensity;
-				}
-				else if (pressure_intensity_deadzone > 0)
-				{
-					// Ignore triggers, since they have their own deadzones
-					if (!get_is_left_trigger(m_dev, code) && !get_is_right_trigger(m_dev, code))
-					{
-						val = NormalizeDirectedInput(val, pressure_intensity_deadzone, 255);
-					}
-				}
-			}
-
-			final_value = std::max(final_value, val);
-			pressed = final_value > 0;
-		}
-	};
-
-	const auto process_mapped_button = [&](u32 index, bool& pressed, u16& final_value, bool is_stick_value)
-	{
-		const EvdevButton& evdev_button = ::at32(m_dev->all_buttons, index);
-		auto& wrapper = m_dev->events_by_code[evdev_button.code];
-		if (!wrapper || !wrapper->is_initialized)
-		{
-			return;
-		}
-
-		// We need to set the current direction and type for TranslateButtonPress
-		m_dev->cur_type = wrapper->type;
-		m_dev->cur_dir = evdev_button.dir;
-
-		switch (wrapper->type)
-		{
-		case EV_KEY:
-		{
-			key_event_wrapper* key_wrapper = static_cast<key_event_wrapper*>(wrapper.get());
-			update_values(pressed, final_value, is_stick_value, evdev_button.code, key_wrapper->value);
-			break;
-		}
-		case EV_ABS: // Be careful to handle mapped axis specially
-		{
-			if (evdev_button.dir < 0)
-			{
-				evdev_log.error("Invalid axis direction = %d, Button Nr.%d", evdev_button.dir, index);
-				break;
-			}
-
-			axis_event_wrapper* axis_wrapper = static_cast<axis_event_wrapper*>(wrapper.get());
-
-			if (is_stick_value && axis_wrapper->is_trigger)
-			{
-				update_values(pressed, final_value, is_stick_value, evdev_button.code, axis_wrapper->values[false]);
-				break;
-			}
-
-			for (const auto& [is_negative, value] : axis_wrapper->values)
-			{
-				// Only set value if the stick / hat is actually pointing to the correct direction.
-				if (is_negative == (evdev_button.dir == 1))
-				{
-					update_values(pressed, final_value, is_stick_value, evdev_button.code, value);
-				}
-			}
-			break;
-		}
-		default:
-			fmt::throw_exception("Unknown evdev input_event_wrapper type: %d", wrapper->type);
-		}
-	};
+	const bool adjust_pressure = pad->m_pressure_intensity_button_index >= 0 && pad->m_buttons[pad->m_pressure_intensity_button_index].m_pressed;
 
 	// Translate any corresponding keycodes to our normal DS3 buttons and triggers
-	for (Button& button : pad->m_buttons)
+	for (int i = 0; i < static_cast<int>(pad->m_buttons.size()); i++)
 	{
-		bool pressed{};
-		u16 final_value{};
+		auto& button = pad->m_buttons[i];
 
-		for (u32 index : button.m_key_codes)
+		if (button.m_keyCode != button_code)
+			continue;
+
+		// Be careful to handle mapped axis specially
+		if (evt.type == EV_ABS)
 		{
-			process_mapped_button(index, pressed, final_value, false);
+			// get axis direction and skip on error or set to 0 if the stick/hat is actually pointing to the other direction.
+			// maybe mimic on error, needs investigation. FindAxisDirection should ideally never return -1 anyway
+			const int direction = FindAxisDirection(axis_orientations, i);
+			m_dev->cur_dir      = direction;
+
+			if (direction < 0)
+			{
+				evdev_log.error("FindAxisDirection = %d, Button Nr.%d, value = %d", direction, i, value);
+				continue;
+			}
+			else if (direction != (m_is_negative ? 1 : 0))
+			{
+				button.m_value   = 0;
+				button.m_pressed = 0;
+				continue;
+			}
 		}
 
-		button.m_value = final_value;
-		button.m_pressed = pressed;
+		// Using a temporary buffer because the values can change during translation
+		Button tmp = button;
+		tmp.m_value = static_cast<u16>(value);
+
+		TranslateButtonPress(m_dev, button_code, tmp.m_pressed, tmp.m_value);
+
+		// Modify pressure if necessary if the button was pressed
+		if (adjust_pressure && tmp.m_pressed)
+		{
+			tmp.m_value = pad->m_pressure_intensity;
+		}
+
+		button = tmp;
 	}
 
-	// used to get the absolute value of an axis
-	s32 stick_val[4]{};
-
 	// Translate any corresponding keycodes to our two sticks. (ignoring thresholds for now)
-	for (usz i = 0; i < pad->m_sticks.size(); i++)
+	for (int idx = 0; idx < static_cast<int>(pad->m_sticks.size()); idx++)
 	{
-		bool pressed{}; // unused
-		u16 val_min{};
-		u16 val_max{};
+		bool pressed_min = false;
+		bool pressed_max = false;
 
-		// m_key_codes_min are the mapped keys for left or down
-		for (u32 index : pad->m_sticks[i].m_key_codes_min)
+		// m_keyCodeMin is the mapped key for left or down
+		if (pad->m_sticks[idx].m_keyCodeMin == button_code)
 		{
-			process_mapped_button(index, pressed, val_min, true);
+			bool is_direction_min = false;
+
+			if (!m_is_button_or_trigger && evt.type == EV_ABS)
+			{
+				const int index         = pad->m_buttons.size() + (idx * 2) + 1;
+				const int min_direction = FindAxisDirection(axis_orientations, index);
+				m_dev->cur_dir          = min_direction;
+
+				if (min_direction < 0)
+					evdev_log.error("keyCodeMin FindAxisDirection = %d, Axis Nr.%d, Button Nr.%d, value = %d", min_direction, idx, index, value);
+				else
+					is_direction_min = m_is_negative == (min_direction == 1);
+			}
+
+			if (m_is_button_or_trigger || is_direction_min)
+			{
+				m_dev->val_min[idx] = value;
+				TranslateButtonPress(m_dev, button_code, pressed_min, m_dev->val_min[idx], true);
+			}
+			else // set to 0 to avoid remnant counter axis values
+				m_dev->val_min[idx] = 0;
 		}
 
-		// m_key_codes_max are the mapped keys for right or up
-		for (u32 index : pad->m_sticks[i].m_key_codes_max)
+		// m_keyCodeMax is the mapped key for right or up
+		if (pad->m_sticks[idx].m_keyCodeMax == button_code)
 		{
-			process_mapped_button(index, pressed, val_max, true);
+			bool is_direction_max = false;
+
+			if (!m_is_button_or_trigger && evt.type == EV_ABS)
+			{
+				const int index         = pad->m_buttons.size() + (idx * 2);
+				const int max_direction = FindAxisDirection(axis_orientations, index);
+				m_dev->cur_dir          = max_direction;
+
+				if (max_direction < 0)
+					evdev_log.error("keyCodeMax FindAxisDirection = %d, Axis Nr.%d, Button Nr.%d, value = %d", max_direction, idx, index, value);
+				else
+					is_direction_max = m_is_negative == (max_direction == 1);
+			}
+
+			if (m_is_button_or_trigger || is_direction_max)
+			{
+				m_dev->val_max[idx] = value;
+				TranslateButtonPress(m_dev, button_code, pressed_max, m_dev->val_max[idx], true);
+			}
+			else // set to 0 to avoid remnant counter axis values
+				m_dev->val_max[idx] = 0;
 		}
 
 		// cancel out opposing values and get the resulting difference. if there was no change, use the old value.
-		stick_val[i] = val_max - val_min;
+		m_dev->stick_val[idx] = m_dev->val_max[idx] - m_dev->val_min[idx];
 	}
 
+	const auto cfg = m_dev->config;
+
 	u16 lx, ly, rx, ry;
 
 	// Normalize and apply pad squircling
-	convert_stick_values(lx, ly, stick_val[0], stick_val[1], cfg->lstickdeadzone, cfg->lstick_anti_deadzone, cfg->lpadsquircling);
-	convert_stick_values(rx, ry, stick_val[2], stick_val[3], cfg->rstickdeadzone, cfg->rstick_anti_deadzone, cfg->rpadsquircling);
+	convert_stick_values(lx, ly, m_dev->stick_val[0], m_dev->stick_val[1], cfg->lstickdeadzone, cfg->lpadsquircling);
+	convert_stick_values(rx, ry, m_dev->stick_val[2], m_dev->stick_val[3], cfg->rstickdeadzone, cfg->rpadsquircling);
 
 	pad->m_sticks[0].m_value = lx;
 	pad->m_sticks[1].m_value = 255 - ly;
 	pad->m_sticks[2].m_value = rx;
 	pad->m_sticks[3].m_value = 255 - ry;
+
+	return;
 }
 
-void evdev_joystick_handler::apply_pad_data(const pad_ensemble& binding)
+void evdev_joystick_handler::apply_pad_data(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad)
 {
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
 	EvdevDevice* evdev_device = static_cast<EvdevDevice*>(device.get());
 	if (!evdev_device)
 		return;
 
-	cfg_pad* cfg = device->config;
-	if (!cfg)
-		return;
+	auto cfg = device->config;
 
 	// Handle vibration
-	const u8 force_large = cfg->get_large_motor_speed(pad->m_vibrateMotors);
-	const u8 force_small = cfg->get_small_motor_speed(pad->m_vibrateMotors);
+	const int idx_l       = cfg->switch_vibration_motors ? 1 : 0;
+	const int idx_s       = cfg->switch_vibration_motors ? 0 : 1;
+	const u16 force_large = cfg->enable_vibration_motor_large ? pad->m_vibrateMotors[idx_l].m_value * 257 : vibration_min;
+	const u16 force_small = cfg->enable_vibration_motor_small ? pad->m_vibrateMotors[idx_s].m_value * 257 : vibration_min;
 	SetRumble(evdev_device, force_large, force_small);
 }
 
-bool evdev_joystick_handler::bindPadToDevice(std::shared_ptr<Pad> pad)
+// Search axis_orientations map for the direction by index, returns -1 if not found, 0 for positive and 1 for negative
+int evdev_joystick_handler::FindAxisDirection(const std::unordered_map<int, bool>& map, int index)
 {
-	if (!pad || pad->m_player_id >= g_cfg_input.player.size())
-		return false;
+	if (const auto it = map.find(index); it != map.end())
+	{
+		return it->second;
+	}
+	return -1;
+}
 
-	const cfg_player* player_config = g_cfg_input.player[pad->m_player_id];
+bool evdev_joystick_handler::bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device, u8 player_id)
+{
 	if (!pad)
 		return false;
 
@@ -1320,70 +914,50 @@ bool evdev_joystick_handler::bindPadToDevice(std::shared_ptr<Pad> pad)
 
 	m_dev = std::make_shared<EvdevDevice>();
 
-	m_pad_configs[pad->m_player_id].from_string(player_config->config.to_string());
-	m_dev->config = &m_pad_configs[pad->m_player_id];
-	m_dev->player_id = pad->m_player_id;
+	m_pad_configs[player_id].from_string(g_cfg_input.player[player_id]->config.to_string());
+	m_dev->config = &m_pad_configs[player_id];
+	m_dev->player_id = player_id;
 	cfg_pad* cfg = m_dev->config;
-	if (!cfg)
+	if (cfg == nullptr)
 		return false;
 
-	// We need to register EvdevButtons due to their axis directions.
-	const auto register_evdevbutton = [this](u32 code, bool is_axis, bool is_reverse) -> u32
-	{
-		const u32 index = ::narrow<u32>(m_dev->all_buttons.size());
+	std::unordered_map<int, bool> axis_orientations;
+	int i = 0; // increment to know the axis location
 
-		if (is_axis)
+	auto evdevbutton = [&](const cfg::string& name)
+	{
+		EvdevButton button{ 0, -1, EV_ABS };
+
+		int key  = FindKeyCode(axis_list, name, false);
+		if (key >= 0)
+			axis_orientations.emplace(i, false);
+
+		if (key < 0)
 		{
-			m_dev->all_buttons.push_back(EvdevButton{ code, is_reverse ? 1 : 0, EV_ABS });
+			key = FindKeyCode(rev_axis_list, name, false);
+			if (key >= 0)
+				axis_orientations.emplace(i, true);
+		}
+
+		if (key < 0)
+		{
+			key         = FindKeyCode(button_list, name);
+			button.type = EV_KEY;
 		}
 		else
 		{
-			m_dev->all_buttons.push_back(EvdevButton{ code, -1, EV_KEY });
+			button.dir = axis_orientations[i];
 		}
 
-		return index;
-	};
+		button.code = static_cast<u32>(key);
 
-	const auto find_buttons = [&](const cfg::string& name) -> std::set<u32>
-	{
-		const std::vector<std::string> names = cfg_pad::get_buttons(name);
-
-		// In evdev we store indices to an EvdevButton vector in our pad objects instead of the usual key codes.
-		std::set<u32> indices;
-
-		for (const u32 code : FindKeyCodes<u32, u32>(axis_list, names))
-		{
-			indices.insert(register_evdevbutton(code, true, false));
-		}
-
-		for (const u32 code : FindKeyCodes<u32, u32>(rev_axis_list, names))
-		{
-			indices.insert(register_evdevbutton(code, true, true));
-		}
-
-		for (const u32 code : FindKeyCodes<u32, u32>(button_list, names))
-		{
-			indices.insert(register_evdevbutton(code, false, false));
-		}
-
-		return indices;
-	};
-
-	const auto find_motion_button = [&](const cfg_sensor& sensor) -> evdev_sensor
-	{
-		evdev_sensor e_sensor{};
-		e_sensor.type = EV_ABS;
-		e_sensor.mirrored = sensor.mirrored.get();
-		e_sensor.shift = sensor.shift.get();
-
-		const std::set<u32> keys = FindKeyCodes<u32, u32>(motion_axis_list, sensor.axis);
-		if (!keys.empty()) e_sensor.code = *keys.begin(); // We should only have one key for each of our sensors
-		return e_sensor;
+		i++;
+		return button;
 	};
 
 	u32 pclass_profile = 0x0;
 
-	for (const input::product_info& product : input::get_products_by_class(cfg->device_class_type))
+	for (const auto product : input::get_products_by_class(cfg->device_class_type))
 	{
 		if (product.vendor_id == cfg->vendor_id && product.product_id == cfg->product_id)
 		{
@@ -1403,154 +977,92 @@ bool evdev_joystick_handler::bindPadToDevice(std::shared_ptr<Pad> pad)
 		cfg->pressure_intensity
 	);
 
-	if (b_has_pressure_intensity_button)
-	{
-		pad->m_buttons.emplace_back(special_button_offset, find_buttons(cfg->pressure_intensity_button), special_button_value::pressure_intensity);
-		pad->m_pressure_intensity_button_index = static_cast<s32>(pad->m_buttons.size()) - 1;
-	}
+	pad->m_buttons.emplace_back(special_button_offset, evdevbutton(cfg->pressure_intensity_button).code, special_button_value::pressure_intensity);
+	pad->m_pressure_intensity_button_index = static_cast<s32>(pad->m_buttons.size()) - 1;
 
-	if (b_has_analog_limiter_button)
-	{
-		pad->m_buttons.emplace_back(special_button_offset, find_buttons(cfg->analog_limiter_button), special_button_value::analog_limiter);
-		pad->m_analog_limiter_button_index = static_cast<s32>(pad->m_buttons.size()) - 1;
-	}
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, evdevbutton(cfg->triangle).code, CELL_PAD_CTRL_TRIANGLE);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, evdevbutton(cfg->circle).code,   CELL_PAD_CTRL_CIRCLE);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, evdevbutton(cfg->cross).code,    CELL_PAD_CTRL_CROSS);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, evdevbutton(cfg->square).code,   CELL_PAD_CTRL_SQUARE);
 
-	if (b_has_orientation)
-	{
-		pad->m_buttons.emplace_back(special_button_offset, find_buttons(cfg->orientation_reset_button), special_button_value::orientation_reset);
-		pad->m_orientation_reset_button_index = static_cast<s32>(pad->m_buttons.size()) - 1;
-	}
+	m_dev->trigger_left = evdevbutton(cfg->l2);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, m_dev->trigger_left.code,              CELL_PAD_CTRL_L2);
 
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2,find_buttons(cfg->triangle), CELL_PAD_CTRL_TRIANGLE);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2,find_buttons(cfg->circle),   CELL_PAD_CTRL_CIRCLE);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2,find_buttons(cfg->cross),    CELL_PAD_CTRL_CROSS);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2,find_buttons(cfg->square),   CELL_PAD_CTRL_SQUARE);
+	m_dev->trigger_right = evdevbutton(cfg->r2);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, m_dev->trigger_right.code,             CELL_PAD_CTRL_R2);
 
-	m_dev->trigger_left = find_buttons(cfg->l2);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, m_dev->trigger_left,         CELL_PAD_CTRL_L2);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, evdevbutton(cfg->l1).code,       CELL_PAD_CTRL_L1);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, evdevbutton(cfg->r1).code,       CELL_PAD_CTRL_R1);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, evdevbutton(cfg->start).code,    CELL_PAD_CTRL_START);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, evdevbutton(cfg->select).code,   CELL_PAD_CTRL_SELECT);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, evdevbutton(cfg->l3).code,       CELL_PAD_CTRL_L3);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, evdevbutton(cfg->r3).code,       CELL_PAD_CTRL_R3);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, evdevbutton(cfg->ps).code,       0x100/*CELL_PAD_CTRL_PS*/);// TODO: PS button support
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, evdevbutton(cfg->up).code,       CELL_PAD_CTRL_UP);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, evdevbutton(cfg->down).code,     CELL_PAD_CTRL_DOWN);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, evdevbutton(cfg->left).code,     CELL_PAD_CTRL_LEFT);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, evdevbutton(cfg->right).code,    CELL_PAD_CTRL_RIGHT);
+	//pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, 0,                                     0x0); // Reserved (and currently not in use by rpcs3 at all)
 
-	m_dev->trigger_right = find_buttons(cfg->r2);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, m_dev->trigger_right,        CELL_PAD_CTRL_R2);
+	m_dev->axis_left[0]  = evdevbutton(cfg->ls_right);
+	m_dev->axis_left[1]  = evdevbutton(cfg->ls_left);
+	m_dev->axis_left[2]  = evdevbutton(cfg->ls_up);
+	m_dev->axis_left[3]  = evdevbutton(cfg->ls_down);
+	m_dev->axis_right[0] = evdevbutton(cfg->rs_right);
+	m_dev->axis_right[1] = evdevbutton(cfg->rs_left);
+	m_dev->axis_right[2] = evdevbutton(cfg->rs_up);
+	m_dev->axis_right[3] = evdevbutton(cfg->rs_down);
 
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_buttons(cfg->l1),       CELL_PAD_CTRL_L1);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_buttons(cfg->r1),       CELL_PAD_CTRL_R1);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_buttons(cfg->start),    CELL_PAD_CTRL_START);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_buttons(cfg->select),   CELL_PAD_CTRL_SELECT);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_buttons(cfg->l3),       CELL_PAD_CTRL_L3);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_buttons(cfg->r3),       CELL_PAD_CTRL_R3);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_buttons(cfg->ps),       CELL_PAD_CTRL_PS);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_buttons(cfg->up),       CELL_PAD_CTRL_UP);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_buttons(cfg->down),     CELL_PAD_CTRL_DOWN);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_buttons(cfg->left),     CELL_PAD_CTRL_LEFT);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_buttons(cfg->right),    CELL_PAD_CTRL_RIGHT);
+	pad->m_sticks.emplace_back(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X,  m_dev->axis_left[1].code,  m_dev->axis_left[0].code);
+	pad->m_sticks.emplace_back(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y,  m_dev->axis_left[3].code,  m_dev->axis_left[2].code);
+	pad->m_sticks.emplace_back(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X, m_dev->axis_right[1].code, m_dev->axis_right[0].code);
+	pad->m_sticks.emplace_back(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y, m_dev->axis_right[3].code, m_dev->axis_right[2].code);
 
-	if (pad->m_class_type == CELL_PAD_PCLASS_TYPE_SKATEBOARD)
-	{
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, find_buttons(cfg->ir_nose), CELL_PAD_CTRL_PRESS_TRIANGLE);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, find_buttons(cfg->ir_tail), CELL_PAD_CTRL_PRESS_CIRCLE);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, find_buttons(cfg->ir_left), CELL_PAD_CTRL_PRESS_CROSS);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, find_buttons(cfg->ir_right), CELL_PAD_CTRL_PRESS_SQUARE);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, find_buttons(cfg->tilt_left), CELL_PAD_CTRL_PRESS_L1);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, find_buttons(cfg->tilt_right), CELL_PAD_CTRL_PRESS_R1);
-	}
+	pad->m_sensors.emplace_back(CELL_PAD_BTN_OFFSET_SENSOR_X, 512);
+	pad->m_sensors.emplace_back(CELL_PAD_BTN_OFFSET_SENSOR_Y, 399);
+	pad->m_sensors.emplace_back(CELL_PAD_BTN_OFFSET_SENSOR_Z, 512);
+	pad->m_sensors.emplace_back(CELL_PAD_BTN_OFFSET_SENSOR_G, 512);
 
-	m_dev->axis_left[0]  = find_buttons(cfg->ls_right);
-	m_dev->axis_left[1]  = find_buttons(cfg->ls_left);
-	m_dev->axis_left[2]  = find_buttons(cfg->ls_up);
-	m_dev->axis_left[3]  = find_buttons(cfg->ls_down);
-	m_dev->axis_right[0] = find_buttons(cfg->rs_right);
-	m_dev->axis_right[1] = find_buttons(cfg->rs_left);
-	m_dev->axis_right[2] = find_buttons(cfg->rs_up);
-	m_dev->axis_right[3] = find_buttons(cfg->rs_down);
+	pad->m_vibrateMotors.emplace_back(true, 0);
+	pad->m_vibrateMotors.emplace_back(false, 0);
 
-	pad->m_sticks[0] = AnalogStick(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X,  m_dev->axis_left[1],  m_dev->axis_left[0]);
-	pad->m_sticks[1] = AnalogStick(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y,  m_dev->axis_left[3],  m_dev->axis_left[2]);
-	pad->m_sticks[2] = AnalogStick(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X, m_dev->axis_right[1], m_dev->axis_right[0]);
-	pad->m_sticks[3] = AnalogStick(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y, m_dev->axis_right[3], m_dev->axis_right[2]);
+	m_dev->axis_orientations = axis_orientations;
 
-	m_dev->axis_motion[0] = find_motion_button(cfg->motion_sensor_x);
-	m_dev->axis_motion[1] = find_motion_button(cfg->motion_sensor_y);
-	m_dev->axis_motion[2] = find_motion_button(cfg->motion_sensor_z);
-	m_dev->axis_motion[3] = find_motion_button(cfg->motion_sensor_g);
-
-	pad->m_sensors[0] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_X, m_dev->axis_motion[0].code, m_dev->axis_motion[0].mirrored, m_dev->axis_motion[0].shift, DEFAULT_MOTION_X);
-	pad->m_sensors[1] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_Y, m_dev->axis_motion[1].code, m_dev->axis_motion[1].mirrored, m_dev->axis_motion[1].shift, DEFAULT_MOTION_Y);
-	pad->m_sensors[2] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_Z, m_dev->axis_motion[2].code, m_dev->axis_motion[2].mirrored, m_dev->axis_motion[2].shift, DEFAULT_MOTION_Z);
-	pad->m_sensors[3] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_G, m_dev->axis_motion[3].code, m_dev->axis_motion[3].mirrored, m_dev->axis_motion[3].shift, DEFAULT_MOTION_G);
-
-	pad->m_vibrateMotors[0] = VibrateMotor(true, 0);
-	pad->m_vibrateMotors[1] = VibrateMotor(false, 0);
-
-	if (std::shared_ptr<EvdevDevice> evdev_device = add_device(player_config->device, false))
-	{
-		if (std::shared_ptr<EvdevDevice> motion_device = add_motion_device(player_config->buddy_device, false))
-		{
-			m_bindings.emplace_back(pad, evdev_device, motion_device);
-		}
-		else
-		{
-			m_bindings.emplace_back(pad, evdev_device, nullptr);
-
-			if (const std::string buddy_device_name = player_config->buddy_device.to_string(); buddy_device_name != "Null")
-			{
-				evdev_log.warning("evdev add_motion_device in bindPadToDevice failed for device %s", buddy_device_name);
-			}
-		}
-	}
-	else
-	{
-		evdev_log.warning("evdev add_device in bindPadToDevice failed for device %s", player_config->device.to_string());
-	}
-
-	for (pad_ensemble& binding : m_bindings)
-	{
-		update_device(binding.device);
-		update_device(binding.buddy_device);
-	}
+	if (add_device(device, pad, false) < 0)
+		evdev_log.warning("evdev add_device in bindPadToDevice failed for device %s", device);
 
+	update_devs();
 	return true;
 }
 
-bool evdev_joystick_handler::check_button_set(const std::set<u32>& indices, const u32 code)
+bool evdev_joystick_handler::check_button(const EvdevButton& b, const u32 code)
 {
-	if (!m_dev)
-		return false;
-
-	for (u32 index : indices)
-	{
-		const EvdevButton& button = ::at32(m_dev->all_buttons, index);
-		if (button.code == code && button.type == m_dev->cur_type && button.dir == m_dev->cur_dir)
-		{
-			return true;
-		}
-	}
-
-	return false;
+	return m_dev && b.code == code && b.type == m_dev->cur_type && b.dir == m_dev->cur_dir;
 }
 
-bool evdev_joystick_handler::check_button_sets(const std::array<std::set<u32>, 4>& sets, const u32 code)
+bool evdev_joystick_handler::check_buttons(const std::vector<EvdevButton>& b, const u32 code)
 {
-	return std::any_of(sets.begin(), sets.end(), [this, code](const std::set<u32>& indices) { return check_button_set(indices, code); });
+	return std::any_of(b.begin(), b.end(), [this, code](const EvdevButton& b) { return check_button(b, code); });
 };
 
-bool evdev_joystick_handler::get_is_left_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool evdev_joystick_handler::get_is_left_trigger(u64 keyCode)
 {
-	return check_button_set(m_dev->trigger_left, static_cast<u32>(keyCode));
+	return keyCode == check_button(m_dev->trigger_left, static_cast<u32>(keyCode));
 }
 
-bool evdev_joystick_handler::get_is_right_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool evdev_joystick_handler::get_is_right_trigger(u64 keyCode)
 {
-	return check_button_set(m_dev->trigger_right, static_cast<u32>(keyCode));
+	return keyCode == check_button(m_dev->trigger_right, static_cast<u32>(keyCode));
 }
 
-bool evdev_joystick_handler::get_is_left_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool evdev_joystick_handler::get_is_left_stick(u64 keyCode)
 {
-	return check_button_sets(m_dev->axis_left, static_cast<u32>(keyCode));
+	return keyCode == check_buttons(m_dev->axis_left, static_cast<u32>(keyCode));
 }
 
-bool evdev_joystick_handler::get_is_right_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool evdev_joystick_handler::get_is_right_stick(u64 keyCode)
 {
-	return check_button_sets(m_dev->axis_right, static_cast<u32>(keyCode));
+	return keyCode == check_buttons(m_dev->axis_right, static_cast<u32>(keyCode));
 }
 
 #endif
diff --git a/rpcs3/Input/evdev_joystick_handler.h b/rpcs3/Input/evdev_joystick_handler.h
index 6919a32205..9312adc5e6 100644
--- a/rpcs3/Input/evdev_joystick_handler.h
+++ b/rpcs3/Input/evdev_joystick_handler.h
@@ -7,8 +7,8 @@
 #include <libevdev/libevdev.h>
 #include <memory>
 #include <unordered_map>
-#include <array>
 #include <vector>
+#include <thread>
 #include <ctime>
 
 struct positive_axis : cfg::node
@@ -57,9 +57,25 @@ struct positive_axis : cfg::node
 	cfg::_bool abs_mt_tool_x{ this, "ABS_MT_TOOL_X", false };
 	cfg::_bool abs_mt_tool_y{ this, "ABS_MT_TOOL_Y", false };
 
-	bool load();
-	void save() const;
-	bool exist() const;
+	bool load()
+	{
+		if (fs::file cfg_file{ cfg_name, fs::read })
+		{
+			return from_string(cfg_file.to_string());
+		}
+
+		return false;
+	}
+
+	void save()
+	{
+		fs::file(cfg_name, fs::rewrite).write(to_string());
+	}
+
+	bool exist()
+	{
+		return fs::is_file(cfg_name);
+	}
 };
 
 class evdev_joystick_handler final : public PadHandlerBase
@@ -80,8 +96,6 @@ class evdev_joystick_handler final : public PadHandlerBase
 		{ KEY_DOWN            , "Down Key"    },
 		{ KEY_NEXT            , "Next Key"    },
 		{ KEY_PREVIOUS        , "Previous Key"},
-		// 8bitdo Pro 2 controller uses this for the button below "b"
-		{ KEY_MENU            , "Menu"        },
 		//{ BTN_MISC            , "Misc"        }, same as BTN_0
 		{ BTN_0               , "0"           },
 		{ BTN_1               , "1"           },
@@ -116,7 +130,7 @@ class evdev_joystick_handler final : public PadHandlerBase
 		{ 0x11d               , "0x11d"       },
 		{ 0x11e               , "0x11e"       },
 		{ 0x11f               , "0x11f"       },
-		//{ BTN_JOYSTICK        , "Joystick"    }, same as BTN_TRIGGER
+		{ BTN_JOYSTICK        , "Joystick"    },
 		{ BTN_TRIGGER         , "Trigger"     },
 		{ BTN_THUMB           , "Thumb"       },
 		{ BTN_THUMB2          , "Thumb 2"     },
@@ -313,68 +327,32 @@ class evdev_joystick_handler final : public PadHandlerBase
 		{ ABS_MT_TOOL_Y      , "MT Tool Y-"   },
 	};
 
-	// Unique motion axis names for the config files and our pad settings dialog
-	const std::unordered_map<u32, std::string> motion_axis_list =
-	{
-		{ ABS_X  , "X"  },
-		{ ABS_Y  , "Y"  },
-		{ ABS_Z  , "Z"  },
-		{ ABS_RX , "RX" },
-		{ ABS_RY , "RY" },
-		{ ABS_RZ , "RZ" },
-	};
-
 	struct EvdevButton
 	{
-		u32 code = 0; // key code of our button or axis
-		int dir = 0;  // dir is -1 in case of a button, 0 in case of a regular axis and 1 in case of a reverse axis
-		int type = 0; // EV_KEY or EV_ABS
-	};
-
-	struct evdev_sensor : public EvdevButton
-	{
-		bool mirrored = false;
-		s32 shift = 0;
-	};
-
-	struct input_event_wrapper
-	{
-		int type{}; // EV_KEY or EV_ABS
-		bool is_initialized{};
-	};
-
-	struct key_event_wrapper : public input_event_wrapper
-	{
-		key_event_wrapper() { type = EV_KEY; }
-		u16 value{};
-	};
-
-	struct axis_event_wrapper : public input_event_wrapper
-	{
-		axis_event_wrapper() { type = EV_ABS; }
-		std::map<bool, u16> values{}; // direction (negative = true)
-		bool is_trigger{};
-		int min{};
-		int max{};
-		int flat{};
+		u32 code;
+		int dir;
+		int type;
 	};
 
 	struct EvdevDevice : public PadDevice
 	{
 		libevdev* device{ nullptr };
 		std::string path;
-		std::vector<EvdevButton> all_buttons;
-		std::set<u32> trigger_left{};
-		std::set<u32> trigger_right{};
-		std::array<std::set<u32>, 4> axis_left{};
-		std::array<std::set<u32>, 4> axis_right{};
-		std::array<evdev_sensor, 4> axis_motion{};
-		std::map<u32, std::shared_ptr<input_event_wrapper>> events_by_code;
+		std::unordered_map<int, bool> axis_orientations; // value is true if key was found in rev_axis_list
+		s32 stick_val[4] = { 0, 0, 0, 0 };
+		u16 val_min[4] = { 0, 0, 0, 0 };
+		u16 val_max[4] = { 0, 0, 0, 0 };
+		EvdevButton trigger_left  = { 0, 0, 0 };
+		EvdevButton trigger_right = { 0, 0, 0 };
+		std::vector<EvdevButton> axis_left  = { { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } };
+		std::vector<EvdevButton> axis_right = { { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } };
 		int cur_dir = 0;
 		int cur_type = 0;
 		int effect_id = -1;
 		bool has_rumble = false;
-		bool has_motion = false;
+		u16 force_large = 0;
+		u16 force_small = 0;
+		clock_t last_vibration = 0;
 	};
 
 public:
@@ -383,47 +361,45 @@ public:
 
 	void init_config(cfg_pad* cfg) override;
 	bool Init() override;
-	std::vector<pad_list_entry> list_devices() override;
-	bool bindPadToDevice(std::shared_ptr<Pad> pad) override;
-	connection get_next_button_press(const std::string& padId, const pad_callback& callback, const pad_fail_callback& fail_callback, gui_call_type call_type, const std::vector<std::string>& buttons) override;
-	void get_motion_sensors(const std::string& padId, const motion_callback& callback, const motion_fail_callback& fail_callback, motion_preview_values preview_values, const std::array<AnalogSensor, 4>& sensors) override;
-	std::unordered_map<u32, std::string> get_motion_axis_list() const override;
-	void SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool player_led, bool battery_led, u32 battery_led_brightness) override;
+	std::vector<std::string> ListDevices() override;
+	bool bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device, u8 player_id) override;
+	void Close();
+	void get_next_button_press(const std::string& padId, const pad_callback& callback, const pad_fail_callback& fail_callback, bool get_blacklist = false, const std::vector<std::string>& buttons = {}) override;
+	void SetPadData(const std::string& padId, u8 player_id, u32 largeMotor, u32 smallMotor, s32 r, s32 g, s32 b, bool battery_led, u32 battery_led_brightness) override;
 
 private:
-	void close_devices();
 	std::shared_ptr<EvdevDevice> get_evdev_device(const std::string& device);
 	std::string get_device_name(const libevdev* dev);
 	bool update_device(const std::shared_ptr<PadDevice>& device);
-	std::shared_ptr<evdev_joystick_handler::EvdevDevice> add_device(const std::string& device, bool in_settings = false);
-	std::shared_ptr<evdev_joystick_handler::EvdevDevice> add_motion_device(const std::string& device, bool in_settings);
+	void update_devs();
+	int add_device(const std::string& device, const std::shared_ptr<Pad>& pad, bool in_settings = false);
+	u32 GetButtonInfo(const input_event& evt, const std::shared_ptr<EvdevDevice>& device, int& button_code);
 	std::unordered_map<u64, std::pair<u16, bool>> GetButtonValues(const std::shared_ptr<EvdevDevice>& device);
-	void SetRumble(EvdevDevice* device, u8 large, u8 small);
+	void SetRumble(EvdevDevice* device, u16 large, u16 small);
+
+	// Search axis_orientations map for the direction by index, returns -1 if not found, 0 for positive and 1 for negative
+	int FindAxisDirection(const std::unordered_map<int, bool>& map, int index);
 
 	positive_axis m_pos_axis_config;
-	std::set<u32> m_positive_axis;
-	std::set<std::string> m_blacklist;
-	std::unordered_map<std::string, u16> m_min_button_values;
-	std::unordered_map<std::string, std::shared_ptr<evdev_joystick_handler::EvdevDevice>> m_settings_added;
-	std::unordered_map<std::string, std::shared_ptr<evdev_joystick_handler::EvdevDevice>> m_motion_settings_added;
+	std::vector<u32> m_positive_axis;
+	std::vector<std::string> m_blacklist;
+	std::unordered_map<std::string, int> m_settings_added;
 	std::shared_ptr<EvdevDevice> m_dev;
+	bool m_is_button_or_trigger;
+	bool m_is_negative;
+	bool m_is_init = false;
 
-	bool check_button_set(const std::set<u32>& indices, const u32 code);
-	bool check_button_sets(const std::array<std::set<u32>, 4>& sets, const u32 code);
-
-	void apply_input_events(const std::shared_ptr<Pad>& pad);
-
-	u16 get_sensor_value(const libevdev* dev, const AnalogSensor& sensor, const input_event& evt) const;
+	bool check_button(const EvdevButton& b, const u32 code);
+	bool check_buttons(const std::vector<EvdevButton>& b, const u32 code);
 
 protected:
 	PadHandlerBase::connection update_connection(const std::shared_ptr<PadDevice>& device) override;
-	void get_mapping(const pad_ensemble& binding) override;
-	void get_extended_info(const pad_ensemble& binding) override;
-	void apply_pad_data(const pad_ensemble& binding) override;
-	bool get_is_left_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_left_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
+	void get_mapping(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad) override;
+	void apply_pad_data(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad) override;
+	bool get_is_left_trigger(u64 keyCode) override;
+	bool get_is_right_trigger(u64 keyCode) override;
+	bool get_is_left_stick(u64 keyCode) override;
+	bool get_is_right_stick(u64 keyCode) override;
 };
 
 #endif
diff --git a/rpcs3/Input/gui_pad_thread.cpp b/rpcs3/Input/gui_pad_thread.cpp
deleted file mode 100644
index 3aa81efb29..0000000000
--- a/rpcs3/Input/gui_pad_thread.cpp
+++ /dev/null
@@ -1,791 +0,0 @@
-#include "stdafx.h"
-#include "gui_pad_thread.h"
-#include "ds3_pad_handler.h"
-#include "ds4_pad_handler.h"
-#include "dualsense_pad_handler.h"
-#include "skateboard_pad_handler.h"
-#ifdef _WIN32
-#include "xinput_pad_handler.h"
-#include "mm_joystick_handler.h"
-#elif HAVE_LIBEVDEV
-#include "evdev_joystick_handler.h"
-#endif
-#ifdef HAVE_SDL3
-#include "sdl_pad_handler.h"
-#endif
-#include "Emu/Io/PadHandler.h"
-#include "Emu/system_config.h"
-#include "rpcs3qt/gui_settings.h"
-
-#ifdef __linux__
-#include <linux/uinput.h>
-#include <fcntl.h>
-#include <unistd.h>
-#define CHECK_IOCTRL_RET(res) if (res == -1) { gui_log.error("gui_pad_thread: ioctl failed (errno=%d=%s)", res, strerror(errno)); }
-#elif defined(__APPLE__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
-#pragma GCC diagnostic ignored "-Wnullability-completeness"
-#pragma GCC diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion"
-#include <ApplicationServices/ApplicationServices.h>
-#include <Carbon/Carbon.h>
-#pragma GCC diagnostic pop
-#endif
-
-#include <QApplication>
-
-LOG_CHANNEL(gui_log, "GUI");
-
-atomic_t<bool> gui_pad_thread::m_reset = false;
-
-gui_pad_thread::gui_pad_thread()
-{
-	m_thread = std::make_unique<named_thread<std::function<void()>>>("Gui Pad Thread", [this](){ run(); });
-}
-
-gui_pad_thread::~gui_pad_thread()
-{
-	// Join thread
-	m_thread.reset();
-
-#ifdef __linux__
-	if (m_uinput_fd != 1)
-	{
-		gui_log.notice("gui_pad_thread: closing /dev/uinput");
-		CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_DEV_DESTROY));
-		int res = close(m_uinput_fd);
-		if (res == -1)
-		{
-			gui_log.error("gui_pad_thread: Failed to close /dev/uinput (errno=%d=%s)", res, strerror(errno));
-		}
-		m_uinput_fd = -1;
-	}
-#endif
-}
-
-void gui_pad_thread::update_settings(const std::shared_ptr<gui_settings>& settings)
-{
-	ensure(!!settings);
-
-	m_allow_global_input = settings->GetValue(gui::nav_global).toBool();
-}
-
-bool gui_pad_thread::init()
-{
-	m_handler.reset();
-	m_pad.reset();
-
-	// Initialize last button states as pressed to avoid unwanted button presses when starting the thread.
-	m_last_button_state.fill(true);
-	m_timestamp = steady_clock::now();
-	m_initial_timestamp = steady_clock::now();
-	m_last_auto_repeat_button = pad_button::pad_button_max_enum;
-
-	g_cfg_input_configs.load();
-
-	std::string active_config = g_cfg_input_configs.active_configs.get_value("");
-
-	if (active_config.empty())
-	{
-		active_config = g_cfg_input_configs.active_configs.get_value(g_cfg_input_configs.global_key);
-	}
-
-	gui_log.notice("gui_pad_thread: Using input configuration: '%s'", active_config);
-
-	// Load in order to get the pad handlers
-	if (!g_cfg_input.load("", active_config))
-	{
-		gui_log.notice("gui_pad_thread: Loaded empty pad config");
-	}
-
-	// Adjust to the different pad handlers
-	for (usz i = 0; i < g_cfg_input.player.size(); i++)
-	{
-		std::shared_ptr<PadHandlerBase> handler;
-		gui_pad_thread::InitPadConfig(g_cfg_input.player[i]->config, g_cfg_input.player[i]->handler, handler);
-	}
-
-	// Reload with proper defaults
-	if (!g_cfg_input.load("", active_config))
-	{
-		gui_log.notice("gui_pad_thread: Reloaded empty pad config");
-	}
-
-	gui_log.trace("gui_pad_thread: Using pad config:\n%s", g_cfg_input);
-
-	for (u32 i = 0; i < CELL_PAD_MAX_PORT_NUM; i++) // max 7 pads
-	{
-		cfg_player* cfg = g_cfg_input.player[i];
-
-		const pad_handler handler_type = cfg->handler.get();
-		std::shared_ptr<PadHandlerBase> cur_pad_handler = GetHandler(handler_type);
-
-		if (!cur_pad_handler)
-		{
-			continue;
-		}
-
-		cur_pad_handler->Init();
-
-		m_handler = cur_pad_handler;
-		m_pad = std::make_shared<Pad>(handler_type, i, CELL_PAD_STATUS_DISCONNECTED, CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_ACTUATOR, CELL_PAD_DEV_TYPE_STANDARD);
-
-		if (!cur_pad_handler->bindPadToDevice(m_pad))
-		{
-			gui_log.error("gui_pad_thread: Failed to bind device '%s' to handler %s.", cfg->device.to_string(), handler_type);
-		}
-
-		gui_log.notice("gui_pad_thread: Pad %d: device='%s', handler=%s, VID=0x%x, PID=0x%x, class_type=0x%x, class_profile=0x%x",
-			i, cfg->device.to_string(), m_pad->m_pad_handler, m_pad->m_vendor_id, m_pad->m_product_id, m_pad->m_class_type, m_pad->m_class_profile);
-
-		if (handler_type != pad_handler::null)
-		{
-			input_log.notice("gui_pad_thread %d: config=\n%s", i, cfg->to_string());
-		}
-
-		// We only use one pad
-		break;
-	}
-
-	if (!m_handler || !m_pad)
-	{
-		gui_log.notice("gui_pad_thread: No devices configured.");
-		return false;
-	}
-
-#ifdef __linux__
-	gui_log.notice("gui_pad_thread: opening /dev/uinput");
-
-	m_uinput_fd = open("/dev/uinput", O_WRONLY | O_NONBLOCK);
-	if (m_uinput_fd == -1)
-	{
-		gui_log.error("gui_pad_thread: Failed to open /dev/uinput (errno=%d=%s)", m_uinput_fd, strerror(errno));
-		return false;
-	}
-
-	struct uinput_setup usetup{};
-	usetup.id.bustype = BUS_USB;
-	usetup.id.vendor = 0x1234;
-	usetup.id.product = 0x1234;
-	std::strcpy(usetup.name, "RPCS3 GUI Input Device");
-
-	// The ioctls below will enable the device that is about to be created to pass events.
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_EVBIT, EV_KEY));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_KEYBIT, KEY_ESC));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_KEYBIT, KEY_ENTER));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_KEYBIT, KEY_BACKSPACE));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_KEYBIT, KEY_TAB));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_KEYBIT, KEY_LEFT));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_KEYBIT, KEY_RIGHT));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_KEYBIT, KEY_UP));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_KEYBIT, KEY_DOWN));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_KEYBIT, BTN_LEFT));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_KEYBIT, BTN_RIGHT));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_KEYBIT, BTN_MIDDLE));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_EVBIT, EV_REL));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_RELBIT, REL_X));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_RELBIT, REL_Y));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_RELBIT, REL_WHEEL));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_SET_RELBIT, REL_HWHEEL));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_DEV_SETUP, &usetup));
-	CHECK_IOCTRL_RET(ioctl(m_uinput_fd, UI_DEV_CREATE));
-#endif
-
-	return true;
-}
-
-std::shared_ptr<PadHandlerBase> gui_pad_thread::GetHandler(pad_handler type)
-{
-	switch (type)
-	{
-	case pad_handler::null:
-	case pad_handler::keyboard:
-	case pad_handler::move:
-		// Makes no sense to use this if we are in the GUI anyway
-		return nullptr;
-	case pad_handler::ds3:
-		return std::make_shared<ds3_pad_handler>();
-	case pad_handler::ds4:
-		return std::make_shared<ds4_pad_handler>();
-	case pad_handler::dualsense:
-		return std::make_shared<dualsense_pad_handler>();
-	case pad_handler::skateboard:
-		return std::make_shared<skateboard_pad_handler>();
-#ifdef _WIN32
-	case pad_handler::xinput:
-		return std::make_shared<xinput_pad_handler>();
-	case pad_handler::mm:
-		return std::make_shared<mm_joystick_handler>();
-#endif
-#ifdef HAVE_SDL3
-	case pad_handler::sdl:
-		return std::make_shared<sdl_pad_handler>();
-#endif
-#ifdef HAVE_LIBEVDEV
-	case pad_handler::evdev:
-		return std::make_shared<evdev_joystick_handler>();
-#endif
-	}
-
-	return nullptr;
-}
-
-void gui_pad_thread::InitPadConfig(cfg_pad& cfg, pad_handler type, std::shared_ptr<PadHandlerBase>& handler)
-{
-	if (!handler)
-	{
-		handler = GetHandler(type);
-
-		if (handler)
-		{
-			handler->init_config(&cfg);
-		}
-	}
-}
-
-void gui_pad_thread::run()
-{
-	gui_log.notice("gui_pad_thread: Pad thread started");
-
-	m_reset = true;
-
-	while (thread_ctrl::state() != thread_state::aborting)
-	{
-		if (m_reset && m_reset.exchange(false))
-		{
-			if (!init())
-			{
-				gui_log.warning("gui_pad_thread: Pad thread stopped (init failed during reset)");
-				return;
-			}
-		}
-
-		// Only process input if there is an active window
-		if (m_handler && m_pad && (m_allow_global_input || QApplication::activeWindow()))
-		{
-			m_handler->process();
-
-			if (thread_ctrl::state() == thread_state::aborting)
-			{
-				break;
-			}
-
-			process_input();
-		}
-
-		thread_ctrl::wait_for(10000);
-	}
-
-	gui_log.notice("gui_pad_thread: Pad thread stopped");
-}
-
-void gui_pad_thread::process_input()
-{
-	if (!m_pad || !m_pad->is_connected())
-	{
-		return;
-	}
-
-	constexpr u64 ms_threshold = 500;
-
-	const auto on_button_pressed = [this](pad_button button_id, bool pressed, u16 value)
-	{
-		if (button_id == m_mouse_boost_button)
-		{
-			m_boost_mouse = pressed;
-			return;
-		}
-
-		u16 key = 0;
-		mouse_button btn = mouse_button::none;
-		mouse_wheel wheel = mouse_wheel::none;
-		float wheel_delta = 0.0f;
-		const float wheel_multiplier = pressed ? (m_boost_mouse ? 10.0f : 1.0f) : 0.0f;
-		const float move_multiplier = pressed ? (m_boost_mouse ? 40.0f : 20.0f) : 0.0f;
-
-		switch (button_id)
-		{
-#ifdef _WIN32
-		case pad_button::dpad_up: key = VK_UP; break;
-		case pad_button::dpad_down: key = VK_DOWN; break;
-		case pad_button::dpad_left: key = VK_LEFT; break;
-		case pad_button::dpad_right: key = VK_RIGHT; break;
-		case pad_button::circle: key = VK_ESCAPE; break;
-		case pad_button::cross: key = VK_RETURN; break;
-		case pad_button::square: key = VK_BACK; break;
-		case pad_button::triangle: key = VK_TAB; break;
-#elif defined(__linux__)
-		case pad_button::dpad_up: key = KEY_UP; break;
-		case pad_button::dpad_down: key = KEY_DOWN; break;
-		case pad_button::dpad_left: key = KEY_LEFT; break;
-		case pad_button::dpad_right: key = KEY_RIGHT; break;
-		case pad_button::circle: key = KEY_ESC; break;
-		case pad_button::cross: key = KEY_ENTER; break;
-		case pad_button::square: key = KEY_BACKSPACE; break;
-		case pad_button::triangle: key = KEY_TAB; break;
-#elif defined (__APPLE__)
-		case pad_button::dpad_up: key = kVK_UpArrow; break;
-		case pad_button::dpad_down: key = kVK_DownArrow; break;
-		case pad_button::dpad_left: key = kVK_LeftArrow; break;
-		case pad_button::dpad_right: key = kVK_RightArrow; break;
-		case pad_button::circle: key = kVK_Escape; break;
-		case pad_button::cross: key = kVK_Return; break;
-		case pad_button::square: key = kVK_Delete; break;
-		case pad_button::triangle: key = kVK_Tab; break;
-#endif
-		case pad_button::L1: btn = mouse_button::left; break;
-		case pad_button::R1: btn = mouse_button::right; break;
-		case pad_button::rs_up: wheel = mouse_wheel::vertical; wheel_delta = 10.0f * wheel_multiplier; break;
-		case pad_button::rs_down: wheel = mouse_wheel::vertical; wheel_delta = -10.0f * wheel_multiplier; break;
-		case pad_button::rs_left: wheel = mouse_wheel::horizontal; wheel_delta = -10.0f * wheel_multiplier; break;
-		case pad_button::rs_right: wheel = mouse_wheel::horizontal; wheel_delta = 10.0f * wheel_multiplier; break;
-		case pad_button::ls_up: m_mouse_delta_y -= (abs(value - 128) / 255.f) * move_multiplier; break;
-		case pad_button::ls_down: m_mouse_delta_y += (abs(value - 128) / 255.f) * move_multiplier; break;
-		case pad_button::ls_left: m_mouse_delta_x -= (abs(value - 128) / 255.f) * move_multiplier; break;
-		case pad_button::ls_right: m_mouse_delta_x += (abs(value - 128) / 255.f) * move_multiplier; break;
-		default: return;
-		}
-
-		if (key)
-		{
-			send_key_event(key, pressed);
-		}
-		else if (btn != mouse_button::none)
-		{
-			send_mouse_button_event(btn, pressed);
-		}
-		else if (wheel != mouse_wheel::none && pressed)
-		{
-			send_mouse_wheel_event(wheel, wheel_delta);
-		}
-	};
-
-	const auto handle_button_press = [&](pad_button button_id, bool pressed, u16 value)
-	{
-		if (button_id >= pad_button::pad_button_max_enum)
-		{
-			return;
-		}
-
-		bool& last_state = m_last_button_state[static_cast<u32>(button_id)];
-
-		if (pressed)
-		{
-			const bool is_auto_repeat_button = m_auto_repeat_buttons.contains(button_id);
-			const bool is_mouse_move_button = m_mouse_move_buttons.contains(button_id);
-
-			if (!last_state)
-			{
-				if (button_id != m_mouse_boost_button && !is_mouse_move_button)
-				{
-					// The button was not pressed before, so this is a new button press. Reset auto-repeat.
-					m_timestamp = steady_clock::now();
-					m_initial_timestamp = m_timestamp;
-					m_last_auto_repeat_button = is_auto_repeat_button ? button_id : pad_button::pad_button_max_enum;
-				}
-
-				on_button_pressed(static_cast<pad_button>(button_id), true, value);
-			}
-			else if (is_auto_repeat_button)
-			{
-				if (m_last_auto_repeat_button == button_id
-				    && m_input_timer.GetMsSince(m_initial_timestamp) > ms_threshold
-				    && m_input_timer.GetMsSince(m_timestamp) > m_auto_repeat_buttons.at(button_id))
-				{
-					// The auto-repeat button was pressed for at least the given threshold in ms and will trigger at an interval.
-					m_timestamp = steady_clock::now();
-					on_button_pressed(static_cast<pad_button>(button_id), true, value);
-				}
-				else if (m_last_auto_repeat_button == pad_button::pad_button_max_enum)
-				{
-					// An auto-repeat button was already pressed before and will now start triggering again after the next threshold.
-					m_last_auto_repeat_button = button_id;
-				}
-			}
-			else if (is_mouse_move_button)
-			{
-				on_button_pressed(static_cast<pad_button>(button_id), pressed, value);
-			}
-		}
-		else if (last_state)
-		{
-			if (m_last_auto_repeat_button == button_id)
-			{
-				// We stopped pressing an auto-repeat button, so re-enable auto-repeat for other buttons.
-				m_last_auto_repeat_button = pad_button::pad_button_max_enum;
-			}
-
-			on_button_pressed(static_cast<pad_button>(button_id), false, value);
-		}
-
-		last_state = pressed;
-	};
-
-	for (const auto& button : m_pad->m_buttons)
-	{
-		pad_button button_id = pad_button::pad_button_max_enum;
-		if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
-		{
-			switch (button.m_outKeyCode)
-			{
-			case CELL_PAD_CTRL_LEFT:
-				button_id = pad_button::dpad_left;
-				break;
-			case CELL_PAD_CTRL_RIGHT:
-				button_id = pad_button::dpad_right;
-				break;
-			case CELL_PAD_CTRL_DOWN:
-				button_id = pad_button::dpad_down;
-				break;
-			case CELL_PAD_CTRL_UP:
-				button_id = pad_button::dpad_up;
-				break;
-			case CELL_PAD_CTRL_L3:
-				button_id = pad_button::L3;
-				break;
-			case CELL_PAD_CTRL_R3:
-				button_id = pad_button::R3;
-				break;
-			case CELL_PAD_CTRL_SELECT:
-				button_id = pad_button::select;
-				break;
-			case CELL_PAD_CTRL_START:
-				button_id = pad_button::start;
-				break;
-			default:
-				break;
-			}
-		}
-		else if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2)
-		{
-			switch (button.m_outKeyCode)
-			{
-			case CELL_PAD_CTRL_TRIANGLE:
-				button_id = pad_button::triangle;
-				break;
-			case CELL_PAD_CTRL_CIRCLE:
-				button_id = g_cfg.sys.enter_button_assignment == enter_button_assign::circle ? pad_button::cross : pad_button::circle;
-				break;
-			case CELL_PAD_CTRL_SQUARE:
-				button_id = pad_button::square;
-				break;
-			case CELL_PAD_CTRL_CROSS:
-				button_id = g_cfg.sys.enter_button_assignment == enter_button_assign::circle ? pad_button::circle : pad_button::cross;
-				break;
-			case CELL_PAD_CTRL_L1:
-				button_id = pad_button::L1;
-				break;
-			case CELL_PAD_CTRL_R1:
-				button_id = pad_button::R1;
-				break;
-			case CELL_PAD_CTRL_L2:
-				button_id = pad_button::L2;
-				break;
-			case CELL_PAD_CTRL_R2:
-				button_id = pad_button::R2;
-				break;
-			case CELL_PAD_CTRL_PS:
-				button_id = pad_button::ps;
-				break;
-			default:
-				break;
-			}
-		}
-
-		handle_button_press(button_id, button.m_pressed, button.m_value);
-	}
-
-	for (const AnalogStick& stick : m_pad->m_sticks)
-	{
-		pad_button button_id = pad_button::pad_button_max_enum;
-		pad_button release_id = pad_button::pad_button_max_enum;
-
-		switch (stick.m_offset)
-		{
-		case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X:
-			button_id = (stick.m_value <= 128) ? pad_button::ls_left : pad_button::ls_right;
-			release_id = (stick.m_value > 128) ? pad_button::ls_left : pad_button::ls_right;
-			break;
-		case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y:
-			button_id = (stick.m_value <= 128) ? pad_button::ls_up : pad_button::ls_down;
-			release_id = (stick.m_value > 128) ? pad_button::ls_up : pad_button::ls_down;
-			break;
-		case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X:
-			button_id = (stick.m_value <= 128) ? pad_button::rs_left : pad_button::rs_right;
-			release_id = (stick.m_value > 128) ? pad_button::rs_left : pad_button::rs_right;
-			break;
-		case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y:
-			button_id = (stick.m_value <= 128) ? pad_button::rs_up : pad_button::rs_down;
-			release_id = (stick.m_value > 128) ? pad_button::rs_up : pad_button::rs_down;
-			break;
-		default:
-			break;
-		}
-
-		bool pressed;
-
-		if (m_mouse_move_buttons.contains(button_id))
-		{
-			// Mouse move sticks are always pressed if they surpass a tiny deadzone.
-			constexpr int deadzone = 5;
-			pressed = std::abs(stick.m_value - 128) > deadzone;
-		}
-		else
-		{
-			// Let's say other sticks are only pressed if they are almost completely tilted. Otherwise navigation feels really wacky.
-			pressed = stick.m_value < 30 || stick.m_value > 225;
-		}
-
-		// Release other direction on the same axis first
-		handle_button_press(release_id, false, stick.m_value);
-
-		// Handle currently pressed stick direction
-		handle_button_press(button_id, pressed, stick.m_value);
-	}
-
-	// Send mouse move event at the end to prevent redundant calls
-
-	// Round to lower integer
-	const int delta_x = m_mouse_delta_x;
-	const int delta_y = m_mouse_delta_y;
-
-	if (delta_x || delta_y)
-	{
-		// Remove integer part
-		m_mouse_delta_x -= delta_x;
-		m_mouse_delta_y -= delta_y;
-
-		// Send event
-		send_mouse_move_event(delta_x, delta_y);
-	}
-}
-
-#ifdef __linux__
-void gui_pad_thread::emit_event(int type, int code, int val)
-{
-	struct input_event ie{};
-	ie.type = type;
-	ie.code = code;
-	ie.value = val;
-
-	int res = write(m_uinput_fd, &ie, sizeof(ie));
-	if (res == -1)
-	{
-		gui_log.error("gui_pad_thread::emit_event: write failed (errno=%d=%s)", res, strerror(errno));
-	}
-}
-#endif
-
-void gui_pad_thread::send_key_event(u32 key, bool pressed)
-{
-	gui_log.trace("gui_pad_thread::send_key_event: key=%d, pressed=%d", key, pressed);
-
-#ifdef _WIN32
-	INPUT input{};
-	input.type = INPUT_KEYBOARD;
-	input.ki.wVk = key;
-
-	if (!pressed)
-	{
-		input.ki.dwFlags = KEYEVENTF_KEYUP;
-	}
-
-	if (SendInput(1, &input, sizeof(INPUT)) != 1)
-	{
-		gui_log.error("gui_pad_thread: SendInput() failed: %s", fmt::win_error{GetLastError(), nullptr});
-	}
-#elif defined(__linux__)
-	emit_event(EV_KEY, key, pressed ? 1 : 0);
-	emit_event(EV_SYN, SYN_REPORT, 0);
-#elif defined(__APPLE__)
-	CGEventRef ev = CGEventCreateKeyboardEvent(NULL, static_cast<CGKeyCode>(key), pressed);
-	if (!ev)
-	{
-		gui_log.error("gui_pad_thread: CGEventCreateKeyboardEvent() failed");
-		return;
-	}
-
-	CGEventPost(kCGHIDEventTap, ev);
-	CFRelease(ev);
-#endif
-}
-
-void gui_pad_thread::send_mouse_button_event(mouse_button btn, bool pressed)
-{
-	gui_log.trace("gui_pad_thread::send_mouse_button_event: btn=%d, pressed=%d", static_cast<int>(btn), pressed);
-
-#ifdef _WIN32
-	INPUT input{};
-	input.type = INPUT_MOUSE;
-
-	switch (btn)
-	{
-	case mouse_button::none: return;
-	case mouse_button::left: input.mi.dwFlags = pressed ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_LEFTUP; break;
-	case mouse_button::right: input.mi.dwFlags = pressed ? MOUSEEVENTF_RIGHTDOWN : MOUSEEVENTF_RIGHTUP; break;
-	case mouse_button::middle: input.mi.dwFlags = pressed ? MOUSEEVENTF_MIDDLEDOWN : MOUSEEVENTF_MIDDLEUP; break;
-	}
-
-	if (SendInput(1, &input, sizeof(INPUT)) != 1)
-	{
-		gui_log.error("gui_pad_thread: SendInput() failed: %s", fmt::win_error{GetLastError(), nullptr});
-	}
-#elif defined(__linux__)
-	int key = 0;
-
-	switch (btn)
-	{
-	case mouse_button::none: return;
-	case mouse_button::left: key = BTN_LEFT; break;
-	case mouse_button::right: key = BTN_RIGHT; break;
-	case mouse_button::middle: key = BTN_MIDDLE; break;
-	}
-
-	emit_event(EV_KEY, key, pressed ? 1 : 0);
-	emit_event(EV_SYN, SYN_REPORT, 0);
-#elif defined(__APPLE__)
-	CGEventType type{};
-	CGMouseButton mouse_btn{};
-
-	switch (btn)
-	{
-	case mouse_button::none: return;
-	case mouse_button::left:
-		type = pressed ? kCGEventLeftMouseDown : kCGEventLeftMouseUp;
-		mouse_btn = kCGMouseButtonLeft;
-		break;
-	case mouse_button::right:
-		type = pressed ? kCGEventRightMouseDown : kCGEventRightMouseUp;
-		mouse_btn = kCGMouseButtonRight;
-		break;
-	case mouse_button::middle:
-		type = pressed ? kCGEventOtherMouseDown : kCGEventOtherMouseUp;
-		mouse_btn = kCGMouseButtonCenter;
-		break;
-	}
-
-	CGEventRef ev = CGEventCreateMouseEvent(NULL, type, CGPointMake(m_mouse_abs_x, m_mouse_abs_y), mouse_btn);
-	if (!ev)
-	{
-		gui_log.error("gui_pad_thread: CGEventCreateMouseEvent() failed");
-		return;
-	}
-
-	CGEventPost(kCGHIDEventTap, ev);
-	CFRelease(ev);
-#endif
-}
-
-void gui_pad_thread::send_mouse_wheel_event(mouse_wheel wheel, int delta)
-{
-	gui_log.trace("gui_pad_thread::send_mouse_wheel_event: wheel=%d, delta=%d", static_cast<int>(wheel), delta);
-
-	if (!delta)
-	{
-		return;
-	}
-
-#ifdef _WIN32
-	INPUT input{};
-	input.type = INPUT_MOUSE;
-	input.mi.mouseData = delta;
-
-	switch (wheel)
-	{
-	case mouse_wheel::none: return;
-	case mouse_wheel::vertical: input.mi.dwFlags = MOUSEEVENTF_WHEEL; break;
-	case mouse_wheel::horizontal: input.mi.dwFlags = MOUSEEVENTF_HWHEEL; break;
-	}
-
-	if (SendInput(1, &input, sizeof(INPUT)) != 1)
-	{
-		gui_log.error("gui_pad_thread: SendInput() failed: %s", fmt::win_error{GetLastError(), nullptr});
-	}
-#elif defined(__linux__)
-	int axis = 0;
-
-	switch (wheel)
-	{
-	case mouse_wheel::none: return;
-	case mouse_wheel::vertical: axis = REL_WHEEL; break;
-	case mouse_wheel::horizontal: axis = REL_HWHEEL; break;
-	}
-
-	emit_event(EV_REL, axis, delta);
-	emit_event(EV_SYN, SYN_REPORT, 0);
-#elif defined(__APPLE__)
-	int v_delta = 0;
-	int h_delta = 0;
-
-	switch (wheel)
-	{
-	case mouse_wheel::none: return;
-	case mouse_wheel::vertical: v_delta = delta; break;
-	case mouse_wheel::horizontal: h_delta = delta; break;
-	}
-
-	constexpr u32 wheel_count = 2;
-	CGEventRef ev = CGEventCreateScrollWheelEvent(NULL, kCGScrollEventUnitPixel, wheel_count, v_delta, h_delta);
-	if (!ev)
-	{
-		gui_log.error("gui_pad_thread: CGEventCreateScrollWheelEvent() failed");
-		return;
-	}
-
-	CGEventPost(kCGHIDEventTap, ev);
-	CFRelease(ev);
-#endif
-}
-
-void gui_pad_thread::send_mouse_move_event(int delta_x, int delta_y)
-{
-	gui_log.trace("gui_pad_thread::send_mouse_move_event: delta_x=%d, delta_y=%d", delta_x, delta_y);
-
-	if (!delta_x && !delta_y)
-	{
-		return;
-	}
-
-#ifdef _WIN32
-	INPUT input{};
-	input.type = INPUT_MOUSE;
-	input.mi.dwFlags = MOUSEEVENTF_MOVE;
-	input.mi.dx = delta_x;
-	input.mi.dy = delta_y;
-
-	if (SendInput(1, &input, sizeof(INPUT)) != 1)
-	{
-		gui_log.error("gui_pad_thread: SendInput() failed: %s", fmt::win_error{GetLastError(), nullptr});
-	}
-#elif defined(__linux__)
-	if (delta_x) emit_event(EV_REL, REL_X, delta_x);
-	if (delta_y) emit_event(EV_REL, REL_Y, delta_y);
-	emit_event(EV_SYN, SYN_REPORT, 0);
-#elif defined(__APPLE__)
-	CGDirectDisplayID display = CGMainDisplayID();
-	const usz width = CGDisplayPixelsWide(display);
-	const usz height = CGDisplayPixelsHigh(display);
-	const float mouse_abs_x = std::clamp(m_mouse_abs_x + delta_x, 0.0f, width - 1.0f);
-	const float mouse_abs_y = std::clamp(m_mouse_abs_y + delta_y, 0.0f, height - 1.0f);
-
-	if (m_mouse_abs_x == mouse_abs_x && m_mouse_abs_y == mouse_abs_y)
-	{
-		return;
-	}
-
-	m_mouse_abs_x = mouse_abs_x;
-	m_mouse_abs_y = mouse_abs_y;
-
-	CGEventRef ev = CGEventCreateMouseEvent(NULL, kCGEventMouseMoved, CGPointMake(m_mouse_abs_x, m_mouse_abs_y), {});
-	if (!ev)
-	{
-		gui_log.error("gui_pad_thread: CGEventCreateMouseEvent() failed");
-		return;
-	}
-
-	CGEventPost(kCGHIDEventTap, ev);
-	CFRelease(ev);
-#endif
-}
diff --git a/rpcs3/Input/gui_pad_thread.h b/rpcs3/Input/gui_pad_thread.h
deleted file mode 100644
index dc04fb456f..0000000000
--- a/rpcs3/Input/gui_pad_thread.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-#include "util/atomic.hpp"
-#include "Emu/Io/pad_types.h"
-#include "Emu/Io/pad_config.h"
-#include "Emu/Io/pad_config_types.h"
-#include "Utilities/Timer.h"
-#include "Utilities/Thread.h"
-
-class PadHandlerBase;
-class gui_settings;
-
-class gui_pad_thread
-{
-public:
-	gui_pad_thread();
-	virtual ~gui_pad_thread();
-
-	void update_settings(const std::shared_ptr<gui_settings>& settings);
-
-	static std::shared_ptr<PadHandlerBase> GetHandler(pad_handler type);
-	static void InitPadConfig(cfg_pad& cfg, pad_handler type, std::shared_ptr<PadHandlerBase>& handler);
-
-	static void reset()
-	{
-		m_reset = true;
-	}
-
-protected:
-	bool init();
-	void run();
-
-	void process_input();
-
-	enum class mouse_button
-	{
-		none,
-		left,
-		right,
-		middle
-	};
-
-	enum class mouse_wheel
-	{
-		none,
-		vertical,
-		horizontal
-	};
-
-	void send_key_event(u32 key, bool pressed);
-	void send_mouse_button_event(mouse_button btn, bool pressed);
-	void send_mouse_wheel_event(mouse_wheel wheel, int delta);
-	void send_mouse_move_event(int delta_x, int delta_y);
-
-#ifdef __linux__
-	int m_uinput_fd = -1;
-	void emit_event(int type, int code, int val);
-#endif
-
-	std::shared_ptr<PadHandlerBase> m_handler;
-	std::shared_ptr<Pad> m_pad;
-
-	std::unique_ptr<named_thread<std::function<void()>>> m_thread;
-	atomic_t<bool> m_allow_global_input = false;
-	static atomic_t<bool> m_reset;
-
-	std::array<bool, static_cast<u32>(pad_button::pad_button_max_enum)> m_last_button_state{};
-
-	steady_clock::time_point m_timestamp;
-	steady_clock::time_point m_initial_timestamp;
-	Timer m_input_timer;
-
-	static constexpr u64 auto_repeat_ms_interval_default = 200;
-	pad_button m_last_auto_repeat_button = pad_button::pad_button_max_enum;
-	std::map<pad_button, u64> m_auto_repeat_buttons = {
-		{ pad_button::dpad_up, auto_repeat_ms_interval_default },
-		{ pad_button::dpad_down, auto_repeat_ms_interval_default },
-		{ pad_button::dpad_left, auto_repeat_ms_interval_default },
-		{ pad_button::dpad_right, auto_repeat_ms_interval_default },
-		{ pad_button::rs_up, 1 },   // used for wheel scrolling by default
-		{ pad_button::rs_down, 1 }, // used for wheel scrolling by default
-		{ pad_button::rs_left, 1 }, // used for wheel scrolling by default
-		{ pad_button::rs_right, 1 } // used for wheel scrolling by default
-	};
-
-	// Mouse movement should just work without delays
-	std::map<pad_button, u64> m_mouse_move_buttons = {
-		{ pad_button::ls_up, 1 },
-		{ pad_button::ls_down, 1 },
-		{ pad_button::ls_left, 1 },
-		{ pad_button::ls_right, 1 }
-	};
-	pad_button m_mouse_boost_button = pad_button::L2;
-	bool m_boost_mouse = false;
-	float m_mouse_delta_x = 0.0f;
-	float m_mouse_delta_y = 0.0f;
-#ifdef __APPLE__
-	float m_mouse_abs_x = 0.0f;
-	float m_mouse_abs_y = 0.0f;
-#endif
-};
diff --git a/rpcs3/Input/hid_pad_handler.cpp b/rpcs3/Input/hid_pad_handler.cpp
index 9c9ca6ba48..7b7c4aa911 100644
--- a/rpcs3/Input/hid_pad_handler.cpp
+++ b/rpcs3/Input/hid_pad_handler.cpp
@@ -2,183 +2,43 @@
 #include "ds3_pad_handler.h"
 #include "ds4_pad_handler.h"
 #include "dualsense_pad_handler.h"
-#include "skateboard_pad_handler.h"
-#include "ps_move_handler.h"
 #include "util/logs.hpp"
-#include "Utilities/Timer.h"
-#include "Emu/System.h"
-#include "pad_thread.h"
-
-#if defined(__APPLE__)
-#include "3rdparty/hidapi/hidapi/mac/hidapi_darwin.h"
-#endif
 
 #include <algorithm>
 #include <memory>
 
 LOG_CHANNEL(hid_log, "HID");
 
-#ifdef ANDROID
-std::vector<android_usb_device> g_android_usb_devices;
-std::mutex g_android_usb_devices_mutex;
-#elif defined(__APPLE__)
-std::mutex g_hid_mutex;
-#endif
-
-struct hid_instance
-{
-public:
-	hid_instance() = default;
-	~hid_instance()
-	{
-		std::lock_guard lock(m_hid_mutex);
-
-		// Only exit HIDAPI once on exit. HIDAPI uses a global state internally...
-		if (m_initialized)
-		{
-			hid_log.notice("Exiting HIDAPI...");
-
-			if (hid_exit() != 0)
-			{
-				hid_log.error("hid_exit failed!");
-			}
-		}
-	}
-
-	static hid_instance& get_instance()
-	{
-		static hid_instance instance {};
-		return instance;
-	}
-
-	bool initialize()
-	{
-		std::lock_guard lock(m_hid_mutex);
-
-		// Only init HIDAPI once. HIDAPI uses a global state internally...
-		if (m_initialized)
-		{
-			return true;
-		}
-
-		hid_log.notice("Initializing HIDAPI ...");
-
-#if defined(__APPLE__)
-		int error_code = 0;
-		Emu.BlockingCallFromMainThread([&error_code]()
-		{
-			error_code = hid_init();
-			hid_darwin_set_open_exclusive(0);
-		}, false);
-#else
-		const int error_code = hid_init();
-#endif
-		if (error_code != 0)
-		{
-			hid_log.fatal("hid_init error %d: %s", error_code, hid_error(nullptr));
-			return false;
-		}
-
-		m_initialized = true;
-		return true;
-	}
-
-private:
-	bool m_initialized = false;
-	std::mutex m_hid_mutex;
-};
-
-hid_device* HidDevice::open()
-{
-#ifdef ANDROID
-	hidDevice = hid_libusb_wrap_sys_device(path, -1);
-#elif defined(__APPLE__)
-	std::unique_lock static_lock(g_hid_mutex, std::defer_lock);
-	if (!static_lock.try_lock())
-	{
-		// The enumeration thread is busy. If we lock and open the device, we might get input stutter on other devices.
-		return nullptr;
-	}
-	Emu.BlockingCallFromMainThread([this]()
-	{
-		hidDevice = hid_open_path(path.c_str());
-	}, false);
-#else
-	hidDevice = hid_open_path(path.data());
-#endif
-
-	return hidDevice;
-}
-
-void HidDevice::close(hid_device* dev)
-{
-	if (!dev) return;
-
-#if defined(__APPLE__)
-	Emu.BlockingCallFromMainThread([dev]()
-	{
-		if (dev)
-		{
-			hid_close(dev);
-		}
-	}, false);
-#else
-	hid_close(dev);
-#endif
-}
-
-void HidDevice::close()
-{
-#if defined(__APPLE__)
-	if (hidDevice)
-	{
-		Emu.BlockingCallFromMainThread([this]()
-		{
-			if (hidDevice)
-			{
-				hid_close(hidDevice);
-				hidDevice = nullptr;
-			}
-		}, false);
-	}
-#else
-	if (hidDevice)
-	{
-		hid_close(hidDevice);
-		hidDevice = nullptr;
-	}
-#endif
-
-#ifdef _WIN32
-	if (bt_device)
-	{
-		hid_close(bt_device);
-		bt_device = nullptr;
-	}
-#endif
-}
+static std::mutex s_hid_mutex; // hid_pad_handler is created by pad_thread and pad_settings_dialog
+static u8 s_hid_instances{0};
 
 template <class Device>
-hid_pad_handler<Device>::hid_pad_handler(pad_handler type, std::vector<id_pair> ids)
-    : PadHandlerBase(type), m_ids(std::move(ids))
+hid_pad_handler<Device>::hid_pad_handler(pad_handler type, u16 vid, std::vector<u16> pids)
+    : PadHandlerBase(type), m_vid(vid), m_pids(std::move(pids))
 {
+	std::scoped_lock lock(s_hid_mutex);
+	ensure(s_hid_instances++ < 255);
 };
 
 template <class Device>
 hid_pad_handler<Device>::~hid_pad_handler()
 {
-	// Join thread
-	m_enumeration_thread.reset();
-
-#if defined(__APPLE__)
-	std::lock_guard static_lock(g_hid_mutex);
-#endif
-
 	for (auto& controller : m_controllers)
 	{
-		if (controller.second)
+		if (controller.second && controller.second->hidDevice)
 		{
-			controller.second->close();
+			hid_close(controller.second->hidDevice);
+		}
+	}
+
+	std::scoped_lock lock(s_hid_mutex);
+	ensure(s_hid_instances-- > 0);
+	if (s_hid_instances == 0)
+	{
+		// Call hid_exit after all hid_pad_handlers are finished
+		if (hid_exit() != 0)
+		{
+			hid_log.error("hid_exit failed!");
 		}
 	}
 }
@@ -189,8 +49,9 @@ bool hid_pad_handler<Device>::Init()
 	if (m_is_init)
 		return true;
 
-	if (!hid_instance::get_instance().initialize())
-		return false;
+	const int res = hid_init();
+	if (res != 0)
+		fmt::throw_exception("%s hidapi-init error.threadproc", m_type);
 
 	for (usz i = 1; i <= MAX_GAMEPADS; i++) // Controllers 1-n in GUI
 	{
@@ -198,45 +59,36 @@ bool hid_pad_handler<Device>::Init()
 	}
 
 	enumerate_devices();
-	update_devices();
 
 	m_is_init = true;
-
-	m_enumeration_thread = std::make_unique<named_thread<std::function<void()>>>(fmt::format("%s Enumerator", m_type), [this]()
-	{
-		while (thread_ctrl::state() != thread_state::aborting)
-		{
-			if (pad::g_enabled && Emu.IsRunning())
-			{
-				enumerate_devices();
-			}
-
-			thread_ctrl::wait_for(2'000'000);
-		}
-	});
-
 	return true;
 }
 
 template <class Device>
-void hid_pad_handler<Device>::process()
+void hid_pad_handler<Device>::ThreadProc()
 {
-	update_devices();
+	const auto now     = std::chrono::system_clock::now();
+	const auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(now - m_last_enumeration).count();
+	if (elapsed > 2000)
+	{
+		m_last_enumeration = now;
+		enumerate_devices();
+	}
 
-	PadHandlerBase::process();
+	PadHandlerBase::ThreadProc();
 }
 
 template <class Device>
-std::vector<pad_list_entry> hid_pad_handler<Device>::list_devices()
+std::vector<std::string> hid_pad_handler<Device>::ListDevices()
 {
-	std::vector<pad_list_entry> pads_list;
+	std::vector<std::string> pads_list;
 
 	if (!Init())
 		return pads_list;
 
 	for (const auto& controller : m_controllers) // Controllers 1-n in GUI
 	{
-		pads_list.emplace_back(controller.first, false);
+		pads_list.emplace_back(controller.first);
 	}
 
 	return pads_list;
@@ -245,116 +97,36 @@ std::vector<pad_list_entry> hid_pad_handler<Device>::list_devices()
 template <class Device>
 void hid_pad_handler<Device>::enumerate_devices()
 {
-	Timer timer;
-	std::set<hid_enumerated_device_type> device_paths;
-	std::map<hid_enumerated_device_type, std::wstring> serials;
+	std::set<std::string> device_paths;
+	std::map<std::string, std::wstring_view> serials;
 
-#ifdef ANDROID
+	for (const auto& pid : m_pids)
 	{
-		std::lock_guard lock(g_android_usb_devices_mutex);
-		for (const android_usb_device& device : g_android_usb_devices)
+		hid_device_info* dev_info = hid_enumerate(m_vid, pid);
+		hid_device_info* head     = dev_info;
+		while (dev_info)
 		{
-			const auto filter = [&](id_pair id)
-			{
-				return id.m_vid == device.vendorId && id.m_pid == device.productId;
-			};
-
-			if (std::find_if(m_ids.begin(), m_ids.end(), filter) != m_ids.end())
-			{
-				device_paths.insert(device.fd);
-			}
-		}
-	}
-#else
-	for (const auto& [vid, pid] : m_ids)
-	{
-#if defined(__APPLE__)
-		// Let's make sure hid_enumerate is only done one thread at a time
-		std::lock_guard static_lock(g_hid_mutex);
-		Emu.BlockingCallFromMainThread([&]()
-		{
-#endif
-		hid_device_info* head = hid_enumerate(vid, pid);
-		for (hid_device_info* dev_info = head; dev_info != nullptr; dev_info = dev_info->next)
-		{
-			if (!dev_info->path)
-			{
-				hid_log.error("Skipping enumeration of device with empty path.");
-				continue;
-			}
-
-			std::string path = dev_info->path;
-			device_paths.insert(path);
-
-#ifdef _WIN32
-			// Only add serials for col01 ps move device
-			if (m_type == pad_handler::move && path.find("&Col01#") != umax)
-#endif
-			{
-				serials[std::move(path)] = dev_info->serial_number ? std::wstring(dev_info->serial_number) : std::wstring();
-			}
+			ensure(dev_info->path != nullptr);
+			device_paths.insert(dev_info->path);
+			serials[dev_info->path] = dev_info->serial_number ? std::wstring_view(dev_info->serial_number) : std::wstring_view{};
+			dev_info                = dev_info->next;
 		}
 		hid_free_enumeration(head);
-#if defined(__APPLE__)
-		}, false);
-#endif
 	}
-#endif
-	hid_log.notice("%s enumeration found %d devices (%f ms)", m_type, device_paths.size(), timer.GetElapsedTimeInMilliSec());
 
-#ifdef _WIN32
-	if (m_type == pad_handler::move)
+	if (m_last_enumerated_devices == device_paths)
 	{
-		// Windows enumerates 3 ps move devices: Col01, Col02, and Col03.
-		// We use Col01 for data and Col02 for bluetooth.
-
-		// Filter paths. We only want the Col01 paths.
-		std::set<std::string> col01_paths;
-
-		for (const std::string& path : device_paths)
-		{
-			hid_log.trace("Found ps move device: %s", path);
-
-			if (path.find("&Col01#") != umax)
-			{
-				col01_paths.insert(path);
-			}
-		}
-
-		device_paths = std::move(col01_paths);
-	}
-#endif
-
-	std::lock_guard lock(m_enumeration_mutex);
-	m_new_enumerated_devices = std::move(device_paths);
-	m_new_enumerated_serials = std::move(serials);
-}
-
-template <class Device>
-void hid_pad_handler<Device>::update_devices()
-{
-	{
-		std::lock_guard lock(m_enumeration_mutex);
-
-		if (m_enumerated_devices == m_new_enumerated_devices)
-		{
-			return;
-		}
-
-		m_enumerated_devices = m_new_enumerated_devices;
-		m_enumerated_serials = std::move(m_new_enumerated_serials);
+		return;
 	}
 
-#if defined(__APPLE__)
-	std::lock_guard static_lock(g_hid_mutex);
-#endif
+	m_last_enumerated_devices = device_paths;
 
 	// Scrap devices that are not in the new list
 	for (auto& controller : m_controllers)
 	{
-		if (controller.second && controller.second->path != hid_enumerated_device_default && !m_enumerated_devices.contains(controller.second->path))
+		if (controller.second && !controller.second->path.empty() && !device_paths.contains(controller.second->path))
 		{
-			controller.second->close();
+			hid_close(controller.second->hidDevice);
 			cfg_pad* config = controller.second->config;
 			controller.second.reset(new Device());
 			controller.second->config = config;
@@ -364,7 +136,7 @@ void hid_pad_handler<Device>::update_devices()
 	bool warn_about_drivers = false;
 
 	// Find and add new devices
-	for (const auto& path : m_enumerated_devices)
+	for (const auto& path : device_paths)
 	{
 		// Check if we have at least one virtual controller left
 		if (std::none_of(m_controllers.cbegin(), m_controllers.cend(), [](const auto& c) { return !c.second || !c.second->hidDevice; }))
@@ -374,41 +146,14 @@ void hid_pad_handler<Device>::update_devices()
 		if (std::any_of(m_controllers.cbegin(), m_controllers.cend(), [&path](const auto& c) { return c.second && c.second->path == path; }))
 			continue;
 
-#ifdef _WIN32
-		if (m_type == pad_handler::move)
-		{
-			check_add_device(nullptr, path, m_enumerated_serials[path]);
-			continue;
-		}
-#endif
-
-#ifdef ANDROID
-		if (hid_device* dev = hid_libusb_wrap_sys_device(path, -1))
-#elif defined(__APPLE__)
-		hid_device* dev = nullptr;
-		Emu.BlockingCallFromMainThread([&]()
-		{
-			dev = hid_open_path(path.c_str());
-		}, false);
+		hid_device* dev = hid_open_path(path.c_str());
 		if (dev)
-#else
-		if (hid_device* dev = hid_open_path(path.c_str()))
-#endif
 		{
-			if (const hid_device_info* info = hid_get_device_info(dev))
-			{
-				hid_log.notice("%s adding device: vid=0x%x, pid=0x%x, path='%s'", m_type, info->vendor_id, info->product_id, path);
-			}
-			else
-			{
-				hid_log.warning("%s adding device: vid=N/A, pid=N/A, path='%s', error='%s'", m_type, path, hid_error(dev));
-			}
-
-			check_add_device(dev, path, m_enumerated_serials[path]);
+			check_add_device(dev, path, serials[path]);
 		}
 		else
 		{
-			hid_log.error("%s hid_open_path failed! error='%s', path='%s'", m_type, hid_error(dev), path);
+			hid_log.error("%s hid_open_path failed! Reason: %s", m_type, hid_error(dev));
 			warn_about_drivers = true;
 		}
 	}
@@ -417,7 +162,7 @@ void hid_pad_handler<Device>::update_devices()
 	{
 		hid_log.error("One or more %s pads were detected but couldn't be interacted with directly", m_type);
 #if defined(_WIN32) || defined(__linux__)
-		hid_log.error("Check https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration for instructions on how to solve this issue");
+		hid_log.error("Check https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration for intructions on how to solve this issue");
 #endif
 	}
 	else
@@ -441,9 +186,12 @@ std::shared_ptr<Device> hid_pad_handler<Device>::get_hid_device(const std::strin
 		return nullptr;
 
 	// Controllers 1-n in GUI
-	if (auto it = m_controllers.find(padId); it != m_controllers.end())
+	for (auto& cur_control : m_controllers)
 	{
-		return it->second;
+		if (padId == cur_control.first)
+		{
+			return cur_control.second;
+		}
 	}
 
 	return nullptr;
@@ -456,9 +204,9 @@ std::shared_ptr<PadDevice> hid_pad_handler<Device>::get_device(const std::string
 }
 
 template <class Device>
-u32 hid_pad_handler<Device>::get_battery_color(u8 battery_level, u32 brightness)
+u32 hid_pad_handler<Device>::get_battery_color(u8 battery_level, int brightness)
 {
-	static constexpr std::array<u32, 12> battery_level_clr = {0xff00, 0xff33, 0xff66, 0xff99, 0xffcc, 0xffff, 0xccff, 0x99ff, 0x66ff, 0x33ff, 0x00ff, 0x00ff};
+	static const std::array<u32, 12> battery_level_clr = {0xff00, 0xff33, 0xff66, 0xff99, 0xffcc, 0xffff, 0xccff, 0x99ff, 0x66ff, 0x33ff, 0x00ff, 0x00ff};
 
 	const u32 combined_color = battery_level_clr[battery_level < battery_level_clr.size() ? battery_level : 0];
 
@@ -470,5 +218,3 @@ u32 hid_pad_handler<Device>::get_battery_color(u8 battery_level, u32 brightness)
 template class hid_pad_handler<ds3_device>;
 template class hid_pad_handler<DS4Device>;
 template class hid_pad_handler<DualSenseDevice>;
-template class hid_pad_handler<skateboard_device>;
-template class hid_pad_handler<ps_move_device>;
diff --git a/rpcs3/Input/hid_pad_handler.h b/rpcs3/Input/hid_pad_handler.h
index fe6f6e5925..c27a638d7a 100644
--- a/rpcs3/Input/hid_pad_handler.h
+++ b/rpcs3/Input/hid_pad_handler.h
@@ -2,41 +2,16 @@
 
 #include "Emu/Io/PadHandler.h"
 #include "Utilities/CRC.h"
-#include "Utilities/Thread.h"
 
-#include <hidapi.h>
+#include "hidapi.h"
 
-#ifdef ANDROID
-#include "hidapi_libusb.h"
-#endif
-
-#include <mutex>
-
-#ifdef ANDROID
-using hid_enumerated_device_type = int;
-using hid_enumerated_device_view = int;
-
-struct android_usb_device
-{
-	int fd;
-	u16 vendorId;
-	u16 productId;
-};
-
-inline constexpr auto hid_enumerated_device_default = -1;
-extern std::vector<android_usb_device> g_android_usb_devices;
-extern std::mutex g_android_usb_devices_mutex;
-#else
-using hid_enumerated_device_type = std::string;
-using hid_enumerated_device_view = std::string_view;
-inline const auto hid_enumerated_device_default = std::string();
-#endif
+#include <algorithm>
 
 struct CalibData
 {
-	s16 bias = 0;
-	s32 sens_numer = 0;
-	s32 sens_denom = 0;
+	s16 bias;
+	s32 sens_numer;
+	s32 sens_denom;
 };
 
 enum CalibIndex
@@ -56,15 +31,12 @@ enum CalibIndex
 class HidDevice : public PadDevice
 {
 public:
-	hid_device* open();
-	static void close(hid_device* dev);
-	void close();
-
 	hid_device* hidDevice{nullptr};
-#ifdef _WIN32
-	hid_device* bt_device{nullptr}; // Used in ps move handler
-#endif
-	hid_enumerated_device_type path = hid_enumerated_device_default;
+	std::string path{""};
+	std::array<u8, 64> padData{};
+	bool new_output_data{true};
+	u8 large_motor{0};
+	u8 small_motor{0};
 	u8 led_delay_on{0};
 	u8 led_delay_off{0};
 	u8 battery_level{0};
@@ -72,22 +44,16 @@ public:
 	u8 cable_state{0};
 };
 
-struct id_pair
-{
-	u16 m_vid = 0;
-	u16 m_pid = 0;
-};
-
 template <class Device>
 class hid_pad_handler : public PadHandlerBase
 {
 public:
-	hid_pad_handler(pad_handler type, std::vector<id_pair> ids);
+	hid_pad_handler(pad_handler type, u16 vid, std::vector<u16> pids);
 	~hid_pad_handler();
 
 	bool Init() override;
-	void process() override;
-	std::vector<pad_list_entry> list_devices() override;
+	void ThreadProc() override;
+	std::vector<std::string> ListDevices() override;
 
 protected:
 	enum class DataStatus
@@ -99,32 +65,29 @@ protected:
 
 	CRCPP::CRC::Table<u32, 32> crcTable{CRCPP::CRC::CRC_32()};
 
-	std::vector<id_pair> m_ids;
+	u16 m_vid;
+	std::vector<u16> m_pids;
 
 	// pseudo 'controller id' to keep track of unique controllers
 	std::map<std::string, std::shared_ptr<Device>> m_controllers;
 
-	std::set<hid_enumerated_device_type> m_enumerated_devices;
-	std::set<hid_enumerated_device_type> m_new_enumerated_devices;
-	std::map<hid_enumerated_device_type, std::wstring> m_enumerated_serials;
-	std::map<hid_enumerated_device_type, std::wstring> m_new_enumerated_serials;
-	std::mutex m_enumeration_mutex;
-	std::unique_ptr<named_thread<std::function<void()>>> m_enumeration_thread;
+	bool m_is_init = false;
+	std::chrono::system_clock::time_point m_last_enumeration;
+	std::set<std::string> m_last_enumerated_devices;
 
 	void enumerate_devices();
-	void update_devices();
 	std::shared_ptr<Device> get_hid_device(const std::string& padId);
 
-	virtual void check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view serial) = 0;
+	virtual void check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view serial) = 0;
 	virtual int send_output_report(Device* device) = 0;
 	virtual DataStatus get_data(Device* device) = 0;
 
-	static s16 apply_calibration(s32 raw_value, const CalibData& calib_data)
+	static s16 apply_calibration(s32 rawValue, const CalibData& calibData)
 	{
-		const s32 biased = raw_value - calib_data.bias;
-		const s32 quot   = calib_data.sens_numer / calib_data.sens_denom;
-		const s32 rem    = calib_data.sens_numer % calib_data.sens_denom;
-		const s32 output = (quot * biased) + ((rem * biased) / calib_data.sens_denom);
+		const s32 biased = rawValue - calibData.bias;
+		const s32 quot   = calibData.sens_numer / calibData.sens_denom;
+		const s32 rem    = calibData.sens_numer % calibData.sens_denom;
+		const s32 output = (quot * biased) + ((rem * biased) / calibData.sens_denom);
 
 		return static_cast<s16>(std::clamp<s32>(output, s16{smin}, s16{smax}));
 	}
@@ -139,7 +102,7 @@ protected:
 		return *static_cast<const u32*>(buf);
 	}
 
-	static u32 get_battery_color(u8 battery_level, u32 brightness);
+	static u32 get_battery_color(u8 battery_level, int brightness);
 
 private:
 	std::shared_ptr<PadDevice> get_device(const std::string& device) override;
diff --git a/rpcs3/Input/keyboard_pad_handler.cpp b/rpcs3/Input/keyboard_pad_handler.cpp
index 11901800c2..8eb60c46e4 100644
--- a/rpcs3/Input/keyboard_pad_handler.cpp
+++ b/rpcs3/Input/keyboard_pad_handler.cpp
@@ -1,13 +1,16 @@
 #include "keyboard_pad_handler.h"
 #include "pad_thread.h"
 #include "Emu/Io/pad_config.h"
-#include "Emu/Io/KeyboardHandler.h"
-#include "Emu/Io/interception.h"
 #include "Input/product_info.h"
 #include "rpcs3qt/gs_frame.h"
 
 #include <QApplication>
 
+LOG_CHANNEL(input_log, "Input");
+
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
+constexpr auto qstr = QString::fromStdString;
+
 bool keyboard_pad_handler::Init()
 {
 	const steady_clock::time_point now = steady_clock::now();
@@ -37,10 +40,10 @@ void keyboard_pad_handler::init_config(cfg_pad* cfg)
 	cfg->ls_down.def  = GetKeyName(Qt::Key_S);
 	cfg->ls_right.def = GetKeyName(Qt::Key_D);
 	cfg->ls_up.def    = GetKeyName(Qt::Key_W);
-	cfg->rs_left.def  = GetKeyName(Qt::Key_Delete);
-	cfg->rs_down.def  = GetKeyName(Qt::Key_End);
-	cfg->rs_right.def = GetKeyName(Qt::Key_PageDown);
-	cfg->rs_up.def    = GetKeyName(Qt::Key_Home);
+	cfg->rs_left.def  = GetKeyName(Qt::Key_Home);
+	cfg->rs_down.def  = GetKeyName(Qt::Key_PageDown);
+	cfg->rs_right.def = GetKeyName(Qt::Key_End);
+	cfg->rs_up.def    = GetKeyName(Qt::Key_PageUp);
 	cfg->start.def    = GetKeyName(Qt::Key_Return);
 	cfg->select.def   = GetKeyName(Qt::Key_Space);
 	cfg->ps.def       = GetKeyName(Qt::Key_Backspace);
@@ -60,16 +63,6 @@ void keyboard_pad_handler::init_config(cfg_pad* cfg)
 	cfg->l3.def       = GetKeyName(Qt::Key_F);
 
 	cfg->pressure_intensity_button.def = GetKeyName(Qt::NoButton);
-	cfg->analog_limiter_button.def = GetKeyName(Qt::NoButton);
-
-	cfg->lstick_anti_deadzone.def = 0;
-	cfg->rstick_anti_deadzone.def = 0;
-	cfg->lstickdeadzone.def       = 0;
-	cfg->rstickdeadzone.def       = 0;
-	cfg->ltriggerthreshold.def    = 0;
-	cfg->rtriggerthreshold.def    = 0;
-	cfg->lpadsquircling.def       = 8000;
-	cfg->rpadsquircling.def       = 8000;
 
 	// apply defaults
 	cfg->from_default();
@@ -86,216 +79,56 @@ void keyboard_pad_handler::Key(const u32 code, bool pressed, u16 value)
 
 	for (auto& pad : m_pads_internal)
 	{
-		const auto register_new_button_value = [&](std::map<u32, u16>& pressed_keys) -> u16
+		for (Button& button : pad.m_buttons)
 		{
-			u16 actual_value = 0;
-
-			// Make sure we keep this button pressed until all related keys are released.
-			if (pressed)
-			{
-				pressed_keys[code] = value;
-			}
-			else
-			{
-				pressed_keys.erase(code);
-			}
-
-			// Get the max value of all pressed keys for this button
-			for (const auto& [key, val] : pressed_keys)
-			{
-				actual_value = std::max(actual_value, val);
-			}
-
-			return actual_value;
-		};
-
-		// Find out if special buttons are pressed (introduced by RPCS3).
-		// Activate the buttons here if possible since keys don't auto-repeat. This ensures that they are already pressed in the following loop.
-		if (pad.m_pressure_intensity_button_index >= 0)
-		{
-			Button& pressure_intensity_button = pad.m_buttons[pad.m_pressure_intensity_button_index];
-
-			if (pressure_intensity_button.m_key_codes.contains(code))
-			{
-				const u16 actual_value = register_new_button_value(pressure_intensity_button.m_pressed_keys);
-
-				pressure_intensity_button.m_pressed = actual_value > 0;
-				pressure_intensity_button.m_value = actual_value;
-			}
-		}
-
-		const bool adjust_pressure = pad.get_pressure_intensity_button_active(m_pressure_intensity_toggle_mode, pad.m_player_id);
-		const bool adjust_pressure_changed = pad.m_adjust_pressure_last != adjust_pressure;
-
-		if (adjust_pressure_changed)
-		{
-			pad.m_adjust_pressure_last = adjust_pressure;
-		}
-
-		if (pad.m_analog_limiter_button_index >= 0)
-		{
-			Button& analog_limiter_button = pad.m_buttons[pad.m_analog_limiter_button_index];
-
-			if (analog_limiter_button.m_key_codes.contains(code))
-			{
-				const u16 actual_value = register_new_button_value(analog_limiter_button.m_pressed_keys);
-
-				analog_limiter_button.m_pressed = actual_value > 0;
-				analog_limiter_button.m_value = actual_value;
-			}
-		}
-
-		const bool analog_limiter_enabled = pad.get_analog_limiter_button_active(m_analog_limiter_toggle_mode, pad.m_player_id);
-		const bool analog_limiter_changed = pad.m_analog_limiter_enabled_last != analog_limiter_enabled;
-		const u32 l_stick_multiplier = analog_limiter_enabled ? m_l_stick_multiplier : 100;
-		const u32 r_stick_multiplier = analog_limiter_enabled ? m_r_stick_multiplier : 100;
-
-		if (analog_limiter_changed)
-		{
-			pad.m_analog_limiter_enabled_last = analog_limiter_enabled;
-		}
-
-		// Handle buttons
-		for (usz i = 0; i < pad.m_buttons.size(); i++)
-		{
-			// Ignore special buttons
-			if (static_cast<s32>(i) == pad.m_pressure_intensity_button_index ||
-				static_cast<s32>(i) == pad.m_analog_limiter_button_index)
+			if (button.m_keyCode != code)
 				continue;
 
-			Button& button = pad.m_buttons[i];
+			button.m_actual_value = pressed ? value : 0;
 
 			bool update_button = true;
 
-			if (!button.m_key_codes.contains(code))
+			// to get the fastest response time possible we don't wanna use any lerp with factor 1
+			if (button.m_analog)
 			{
-				// Handle pressure changes anyway
-				update_button = adjust_pressure_changed;
+				update_button = m_analog_lerp_factor >= 1.0f;
 			}
-			else
+			else if (button.m_trigger)
 			{
-				button.m_actual_value = register_new_button_value(button.m_pressed_keys);
-
-				// to get the fastest response time possible we don't wanna use any lerp with factor 1
-				if (button.m_analog)
-				{
-					update_button = m_analog_lerp_factor >= 1.0f;
-				}
-				else if (button.m_trigger)
-				{
-					update_button = m_trigger_lerp_factor >= 1.0f;
-				}
+				update_button = m_trigger_lerp_factor >= 1.0f;
 			}
 
-			if (!update_button)
-				continue;
-
-			if (button.m_actual_value > 0)
+			if (update_button)
 			{
-				// Modify pressure if necessary if the button was pressed
-				if (adjust_pressure)
-				{
-					button.m_value = pad.m_pressure_intensity;
-				}
-				else if (m_pressure_intensity_deadzone > 0)
-				{
-					button.m_value = NormalizeDirectedInput(button.m_actual_value, m_pressure_intensity_deadzone, 255);
-				}
-				else
-				{
-					button.m_value = button.m_actual_value;
-				}
-
-				button.m_pressed = button.m_value > 0;
-			}
-			else
-			{
-				button.m_value = 0;
-				button.m_pressed = false;
+				button.m_value = pressed ? value : 0;
+				button.m_pressed = pressed;
 			}
 		}
 
-		// Handle sticks
 		for (usz i = 0; i < pad.m_sticks.size(); i++)
 		{
-			AnalogStick& stick = pad.m_sticks[i];
+			const bool is_max = pad.m_sticks[i].m_keyCodeMax == code;
+			const bool is_min = pad.m_sticks[i].m_keyCodeMin == code;
 
-			const bool is_left_stick = i < 2;
+			const u16 normalized_value = std::max<u16>(1, static_cast<u16>(std::floor(value / 2.0)));
 
-			const bool is_max = stick.m_key_codes_max.contains(code);
-			const bool is_min = stick.m_key_codes_min.contains(code);
+			if (is_max)
+				m_stick_max[i] = pressed ? 128 + normalized_value : 128;
 
-			if (!is_max && !is_min)
+			if (is_min)
+				m_stick_min[i] = pressed ? normalized_value : 0;
+
+			if (is_max || is_min)
 			{
-				if (!analog_limiter_changed)
-					continue;
+				m_stick_val[i] = m_stick_max[i] - m_stick_min[i];
 
-				// Update already pressed sticks
-				const bool is_min_pressed = !stick.m_pressed_keys_min.empty();
-				const bool is_max_pressed = !stick.m_pressed_keys_max.empty();
+				const f32 stick_lerp_factor = (i < 2) ? m_l_stick_lerp_factor : m_r_stick_lerp_factor;
 
-				const u32 stick_multiplier = is_left_stick ? l_stick_multiplier : r_stick_multiplier;
-
-				const u16 actual_min_value = is_min_pressed ? MultipliedInput(255, stick_multiplier) : 255;
-				const u16 normalized_min_value = std::ceil(actual_min_value / 2.0);
-
-				const u16 actual_max_value = is_max_pressed ? MultipliedInput(255, stick_multiplier) : 255;
-				const u16 normalized_max_value = std::ceil(actual_max_value / 2.0);
-
-				m_stick_min[i] = is_min_pressed ? std::min<u8>(normalized_min_value, 128) : 0;
-				m_stick_max[i] = is_max_pressed ? std::min<int>(128 + normalized_max_value, 255) : 128;
-			}
-			else
-			{
-				const u16 actual_value = pressed ? MultipliedInput(value, is_left_stick ? l_stick_multiplier : r_stick_multiplier) : value;
-				u16 normalized_value = std::ceil(actual_value / 2.0);
-
-				const auto register_new_stick_value = [&](std::map<u32, u16>& pressed_keys, bool is_max)
+				// to get the fastest response time possible we don't wanna use any lerp with factor 1
+				if (stick_lerp_factor >= 1.0f)
 				{
-					// Make sure we keep this stick pressed until all related keys are released.
-					if (pressed)
-					{
-						pressed_keys[code] = normalized_value;
-					}
-					else
-					{
-						pressed_keys.erase(code);
-					}
-
-					// Get the min/max value of all pressed keys for this stick
-					for (const auto& [key, val] : pressed_keys)
-					{
-						normalized_value = is_max ? std::max(normalized_value, val) : std::min(normalized_value, val);
-					}
-				};
-
-				if (is_max)
-				{
-					register_new_stick_value(stick.m_pressed_keys_max, true);
-
-					const bool is_max_pressed = !stick.m_pressed_keys_max.empty();
-
-					m_stick_max[i] = is_max_pressed ? std::min<int>(128 + normalized_value, 255) : 128;
+					pad.m_sticks[i].m_value = m_stick_val[i];
 				}
-
-				if (is_min)
-				{
-					register_new_stick_value(stick.m_pressed_keys_min, false);
-
-					const bool is_min_pressed = !stick.m_pressed_keys_min.empty();
-
-					m_stick_min[i] = is_min_pressed ? std::min<u8>(normalized_value, 128) : 0;
-				}
-			}
-
-			m_stick_val[i] = m_stick_max[i] - m_stick_min[i];
-
-			const f32 stick_lerp_factor = is_left_stick ? m_l_stick_lerp_factor : m_r_stick_lerp_factor;
-
-			// to get the fastest response time possible we don't wanna use any lerp with factor 1
-			if (stick_lerp_factor >= 1.0f)
-			{
-				stick.m_value = m_stick_val[i];
 			}
 		}
 	}
@@ -320,28 +153,10 @@ void keyboard_pad_handler::release_all_keys()
 			pad.m_sticks[i].m_value = 128;
 		}
 	}
-
-	m_keys_released = true;
 }
 
 bool keyboard_pad_handler::eventFilter(QObject* target, QEvent* ev)
 {
-	if (!ev) [[unlikely]]
-	{
-		return false;
-	}
-
-	if (input::g_active_mouse_and_keyboard != input::active_mouse_and_keyboard::pad)
-	{
-		if (!m_keys_released)
-		{
-			release_all_keys();
-		}
-		return false;
-	}
-
-	m_keys_released = false;
-
 	// !m_target is for future proofing when gsrender isn't automatically initialized on load.
 	// !m_target->isVisible() is a hack since currently a guiless application will STILL inititialize a gsrender (providing a valid target)
 	if (!m_target || !m_target->isVisible()|| target == m_target)
@@ -395,30 +210,28 @@ void keyboard_pad_handler::SetTargetWindow(QWindow* target)
 
 void keyboard_pad_handler::processKeyEvent(QKeyEvent* event, bool pressed)
 {
-	if (!event) [[unlikely]]
-	{
-		return;
-	}
-
 	if (event->isAutoRepeat())
 	{
 		event->ignore();
 		return;
 	}
 
-	const auto handle_key = [this, pressed, event]()
+	auto handle_key = [this, pressed, event]()
 	{
 		QStringList list = GetKeyNames(event);
 		if (list.isEmpty())
 			return;
 
-		const bool is_num_key = list.removeAll("Num") > 0;
-		const QString name = QString::fromStdString(GetKeyName(event, true));
+		const bool is_num_key = list.contains("Num");
+		if (is_num_key)
+			list.removeAll("Num");
+
+		const QString name = qstr(GetKeyName(event));
 
 		// TODO: Edge case: switching numlock keeps numpad keys pressed due to now different modifier
 
 		// Handle every possible key combination, for example: ctrl+A -> {ctrl, A, ctrl+A}
-		for (const QString& keyname : list)
+		for (const auto& keyname : list)
 		{
 			// skip the 'original keys' when handling numpad keys
 			if (is_num_key && !keyname.contains("Num"))
@@ -430,17 +243,37 @@ void keyboard_pad_handler::processKeyEvent(QKeyEvent* event, bool pressed)
 		}
 	};
 
-	handle_key();
+	// We need to ignore keys when using rpcs3 keyboard shortcuts
+	// NOTE: needs to be updated with gs_frame::keyPressEvent
+	switch (event->key())
+	{
+	case Qt::Key_Escape:
+	case Qt::Key_F12:
+		break;
+	case Qt::Key_L:
+		if (event->modifiers() != Qt::AltModifier && event->modifiers() != Qt::ControlModifier)
+			handle_key();
+		break;
+	case Qt::Key_Return:
+		if (event->modifiers() != Qt::AltModifier)
+			handle_key();
+		break;
+	case Qt::Key_P:
+	case Qt::Key_S:
+	case Qt::Key_R:
+	case Qt::Key_E:
+		if (event->modifiers() != Qt::ControlModifier)
+			handle_key();
+		break;
+	default:
+		handle_key();
+		break;
+	}
 	event->ignore();
 }
 
 void keyboard_pad_handler::keyPressEvent(QKeyEvent* event)
 {
-	if (!event) [[unlikely]]
-	{
-		return;
-	}
-
 	if (event->modifiers() & Qt::AltModifier)
 	{
 		switch (event->key())
@@ -499,36 +332,26 @@ void keyboard_pad_handler::keyReleaseEvent(QKeyEvent* event)
 
 void keyboard_pad_handler::mousePressEvent(QMouseEvent* event)
 {
-	if (!event) [[unlikely]]
-	{
-		return;
-	}
-
 	Key(event->button(), true);
 	event->ignore();
 }
 
 void keyboard_pad_handler::mouseReleaseEvent(QMouseEvent* event)
 {
-	if (!event) [[unlikely]]
-	{
-		return;
-	}
-
 	Key(event->button(), false, 0);
 	event->ignore();
 }
 
 bool keyboard_pad_handler::get_mouse_lock_state() const
 {
-	if (gs_frame* game_frame = dynamic_cast<gs_frame*>(m_target))
+	if (auto game_frame = dynamic_cast<gs_frame*>(m_target))
 		return game_frame->get_mouse_lock_state();
 	return false;
 }
 
 void keyboard_pad_handler::mouseMoveEvent(QMouseEvent* event)
 {
-	if (!m_mouse_move_used || !event)
+	if (!m_mouse_move_used)
 	{
 		event->ignore();
 		return;
@@ -554,59 +377,23 @@ void keyboard_pad_handler::mouseMoveEvent(QMouseEvent* event)
 		// get the delta of the mouse position to the screen center
 		const QPoint p_delta = event->pos() - p_center;
 
-		if (m_mouse_movement_mode == mouse_movement_mode::relative)
-		{
-			movement_x = p_delta.x();
-			movement_y = p_delta.y();
-		}
-		else
-		{
-			// current mouse position, starting at the center
-			static QPoint p_real(p_center);
-
-			// update the current position without leaving the screen borders
-			p_real.setX(std::clamp(p_real.x() + p_delta.x(), 0, screen.width()));
-			p_real.setY(std::clamp(p_real.y() + p_delta.y(), 0, screen.height()));
-
-			// get the delta of the real mouse position to the screen center
-			const QPoint p_real_delta = p_real - p_center;
-
-			movement_x = p_real_delta.x();
-			movement_y = p_real_delta.y();
-		}
-	}
-	else if (m_mouse_movement_mode == mouse_movement_mode::relative)
-	{
-		static int last_pos_x = 0;
-		static int last_pos_y = 0;
-		const QPoint e_pos = event->pos();
-
-		movement_x = e_pos.x() - last_pos_x;
-		movement_y = e_pos.y() - last_pos_y;
-
-		last_pos_x = e_pos.x();
-		last_pos_y = e_pos.y();
-	}
-	else if (m_target && m_target->isActive())
-	{
-		// get the screen dimensions
-		const QSize screen = m_target->size();
-
-		// get the center of the screen in global coordinates
-		QPoint p_center = m_target->geometry().topLeft() + QPoint(screen.width() / 2, screen.height() / 2);
-
-		// convert the center into screen coordinates
-		p_center = m_target->mapFromGlobal(p_center);
-
-		// get the delta of the mouse position to the screen center
-		const QPoint p_delta = event->pos() - p_center;
-
 		movement_x = p_delta.x();
 		movement_y = p_delta.y();
 	}
+	else
+	{
+		static int last_pos_x = 0;
+		static int last_pos_y = 0;
 
-	movement_x *= m_multi_x;
-	movement_y *= m_multi_y;
+		movement_x = event->x() - last_pos_x;
+		movement_y = event->y() - last_pos_y;
+
+		last_pos_x = event->x();
+		last_pos_y = event->y();
+	}
+
+	movement_x = m_multi_x * movement_x;
+	movement_y = m_multi_y * movement_y;
 
 	int deadzone_x = 0;
 	int deadzone_y = 0;
@@ -666,7 +453,7 @@ void keyboard_pad_handler::mouseMoveEvent(QMouseEvent* event)
 
 void keyboard_pad_handler::mouseWheelEvent(QWheelEvent* event)
 {
-	if (!m_mouse_wheel_used || !event)
+	if (!m_mouse_wheel_used)
 	{
 		return;
 	}
@@ -711,19 +498,19 @@ void keyboard_pad_handler::mouseWheelEvent(QWheelEvent* event)
 	}
 }
 
-std::vector<pad_list_entry> keyboard_pad_handler::list_devices()
+std::vector<std::string> keyboard_pad_handler::ListDevices()
 {
-	std::vector<pad_list_entry> list_devices;
-	list_devices.emplace_back(std::string(pad::keyboard_device_name), false);
+	std::vector<std::string> list_devices;
+	list_devices.emplace_back(pad::keyboard_device_name);
 	return list_devices;
 }
 
-std::string keyboard_pad_handler::GetMouseName(const QMouseEvent* event)
+std::string keyboard_pad_handler::GetMouseName(const QMouseEvent* event) const
 {
 	return GetMouseName(event->button());
 }
 
-std::string keyboard_pad_handler::GetMouseName(u32 button)
+std::string keyboard_pad_handler::GetMouseName(u32 button) const
 {
 	if (const auto it = mouse_list.find(button); it != mouse_list.cend())
 		return it->second;
@@ -763,7 +550,7 @@ QStringList keyboard_pad_handler::GetKeyNames(const QKeyEvent* keyEvent)
 	// Handle special cases
 	if (const std::string name = native_scan_code_to_string(keyEvent->nativeScanCode()); !name.empty())
 	{
-		list.append(QString::fromStdString(name));
+		list.append(qstr(name));
 	}
 
 	switch (keyEvent->key())
@@ -792,7 +579,7 @@ QStringList keyboard_pad_handler::GetKeyNames(const QKeyEvent* keyEvent)
 	return list;
 }
 
-std::string keyboard_pad_handler::GetKeyName(const QKeyEvent* keyEvent, bool with_modifiers)
+std::string keyboard_pad_handler::GetKeyName(const QKeyEvent* keyEvent)
 {
 	// Handle special cases first
 	if (std::string name = native_scan_code_to_string(keyEvent->nativeScanCode()); !name.empty())
@@ -802,168 +589,114 @@ std::string keyboard_pad_handler::GetKeyName(const QKeyEvent* keyEvent, bool wit
 
 	switch (keyEvent->key())
 	{
-	case Qt::Key_Alt: return "Alt";
-	case Qt::Key_AltGr: return "AltGr";
-	case Qt::Key_Shift: return "Shift";
-	case Qt::Key_Control: return "Ctrl";
-	case Qt::Key_Meta: return "Meta";
-	case Qt::Key_NumLock: return QKeySequence(keyEvent->key()).toString(QKeySequence::NativeText).toStdString();
-#ifdef __APPLE__
-	// On macOS, the arrow keys are considered to be part of the keypad;
-	// since most Mac keyboards lack a keypad to begin with,
-	// we change them to regular arrows to avoid confusion
-	case Qt::Key_Left: return "←";
-	case Qt::Key_Up: return "↑";
-	case Qt::Key_Right: return "→";
-	case Qt::Key_Down: return "↓";
-#endif
+	case Qt::Key_Alt:
+		return "Alt";
+	case Qt::Key_AltGr:
+		return "AltGr";
+	case Qt::Key_Shift:
+		return "Shift";
+	case Qt::Key_Control:
+		return "Ctrl";
+	case Qt::Key_Meta:
+		return "Meta";
+	case Qt::Key_NumLock:
+		return sstr(QKeySequence(keyEvent->key()).toString(QKeySequence::NativeText));
 	default:
 		break;
 	}
-
-	if (with_modifiers)
-	{
-		return QKeySequence(keyEvent->key() | keyEvent->modifiers()).toString(QKeySequence::NativeText).toStdString();
-	}
-
-	return QKeySequence(keyEvent->key()).toString(QKeySequence::NativeText).toStdString();
+	return sstr(QKeySequence(keyEvent->key() | keyEvent->modifiers()).toString(QKeySequence::NativeText));
 }
 
 std::string keyboard_pad_handler::GetKeyName(const u32& keyCode)
 {
-	return QKeySequence(keyCode).toString(QKeySequence::NativeText).toStdString();
+	return sstr(QKeySequence(keyCode).toString(QKeySequence::NativeText));
 }
 
-std::set<u32> keyboard_pad_handler::GetKeyCodes(const cfg::string& cfg_string)
+u32 keyboard_pad_handler::GetKeyCode(const std::string& keyName)
 {
-	std::set<u32> key_codes;
-	for (const std::string& key_name : cfg_pad::get_buttons(cfg_string))
-	{
-		if (u32 code = GetKeyCode(QString::fromStdString(key_name)); code != Qt::NoButton)
-		{
-			key_codes.insert(code);
-		}
-	}
-	return key_codes;
+	return GetKeyCode(qstr(keyName));
 }
 
 u32 keyboard_pad_handler::GetKeyCode(const QString& keyName)
 {
-	if (keyName.isEmpty()) return Qt::NoButton;
-	if (const int native_scan_code = native_scan_code_from_string(keyName.toStdString()); native_scan_code >= 0)
+	if (keyName.isEmpty())
+		return Qt::NoButton;
+	if (const int native_scan_code = native_scan_code_from_string(sstr(keyName)); native_scan_code >= 0)
 		return Qt::Key_unknown + native_scan_code; // Special cases that can't be expressed with Qt::Key
-	if (keyName == "Alt") return Qt::Key_Alt;
-	if (keyName == "AltGr") return Qt::Key_AltGr;
-	if (keyName == "Shift") return Qt::Key_Shift;
-	if (keyName == "Ctrl") return Qt::Key_Control;
-	if (keyName == "Meta") return Qt::Key_Meta;
-#ifdef __APPLE__
-	// QKeySequence doesn't work properly for the arrow keys on macOS
-	if (keyName == "Num←") return Qt::Key_Left;
-	if (keyName == "Num↑") return Qt::Key_Up;
-	if (keyName == "Num→") return Qt::Key_Right;
-	if (keyName == "Num↓") return Qt::Key_Down;
-#endif
+	if (keyName == "Alt")
+		return Qt::Key_Alt;
+	if (keyName == "AltGr")
+		return Qt::Key_AltGr;
+	if (keyName == "Shift")
+		return Qt::Key_Shift;
+	if (keyName == "Ctrl")
+		return Qt::Key_Control;
+	if (keyName == "Meta")
+		return Qt::Key_Meta;
 
 	const QKeySequence seq(keyName);
-	u32 key_code = Qt::NoButton;
+	u32 key_code = 0;
 
-	if (seq.count() == 1 && seq[0].key() != Qt::Key_unknown)
-		key_code = seq[0].key();
+	if (seq.count() == 1)
+		key_code = seq[0];
 	else
-		input_log.notice("GetKeyCode(%s): seq.count() = %d", keyName, seq.count());
+		input_log.notice("GetKeyCode(%s): seq.count() = %d", sstr(keyName), seq.count());
 
 	return key_code;
 }
 
 int keyboard_pad_handler::native_scan_code_from_string([[maybe_unused]] const std::string& key)
 {
-	// NOTE: Qt throws a Ctrl key at us when using Alt Gr first, so right Alt does not work at the moment
-	if (key == "Shift Left") return native_key::shift_l;
-	if (key == "Shift Right") return native_key::shift_r;
-	if (key == "Ctrl Left") return native_key::ctrl_l;
-	if (key == "Ctrl Right") return native_key::ctrl_r;
-	if (key == "Alt Left") return native_key::alt_l;
-	if (key == "Alt Right") return native_key::alt_r;
-	if (key == "Meta Left") return native_key::meta_l;
-	if (key == "Meta Right") return native_key::meta_r;
+	// NOTE: Qt throws a Ctrl key at us when using Alt Gr, so there is no point in distinguishing left and right Alt at the moment
 #ifdef _WIN32
-	if (key == "Num+0" || key == "Num+Ins") return 82;
-	if (key == "Num+1" || key == "Num+End") return 79;
-	if (key == "Num+2" || key == "Num+Down") return 80;
-	if (key == "Num+3" || key == "Num+PgDown") return 81;
-	if (key == "Num+4" || key == "Num+Left") return 75;
-	if (key == "Num+5" || key == "Num+Clear") return 76;
-	if (key == "Num+6" || key == "Num+Right") return 77;
-	if (key == "Num+7" || key == "Num+Home") return 71;
-	if (key == "Num+8" || key == "Num+Up") return 72;
-	if (key == "Num+9" || key == "Num+PgUp") return 73;
-	if (key == "Num+," || key == "Num+Del") return 83;
-	if (key == "Num+/") return 309;
-	if (key == "Num+*") return 55;
-	if (key == "Num+-") return 74;
-	if (key == "Num++") return 78;
-	if (key == "Num+Enter") return 284;
+	if (key == "Shift Left")
+		return 42;
+	if (key == "Shift Right")
+		return 54;
+	if (key == "Ctrl Left")
+		return 29;
+	if (key == "Ctrl Right")
+		return 285;
 #else
-	// TODO
+		// TODO
 #endif
 	return -1;
 }
 
 std::string keyboard_pad_handler::native_scan_code_to_string(int native_scan_code)
 {
-	// NOTE: the other Qt function "nativeVirtualKey" does not distinguish between VK_SHIFT and VK_RSHIFT key in Qt at the moment
-	// NOTE: Qt throws a Ctrl key at us when using Alt Gr first, so right Alt does not work at the moment
-	// NOTE: for MacOs: nativeScanCode may not work
 	switch (native_scan_code)
 	{
-	case native_key::shift_l: return "Shift Left";
-	case native_key::shift_r: return "Shift Right";
-	case native_key::ctrl_l: return "Ctrl Left";
-	case native_key::ctrl_r: return "Ctrl Right";
-	case native_key::alt_l: return "Alt Left";
-	case native_key::alt_r: return "Alt Right";
-	case native_key::meta_l: return "Meta Left";
-	case native_key::meta_r: return "Meta Right";
 #ifdef _WIN32
-	case 82: return "Num+0"; // Also "Num+Ins" depending on numlock
-	case 79: return "Num+1"; // Also "Num+End" depending on numlock
-	case 80: return "Num+2"; // Also "Num+Down" depending on numlock
-	case 81: return "Num+3"; // Also "Num+PgDown" depending on numlock
-	case 75: return "Num+4"; // Also "Num+Left" depending on numlock
-	case 76: return "Num+5"; // Also "Num+Clear" depending on numlock
-	case 77: return "Num+6"; // Also "Num+Right" depending on numlock
-	case 71: return "Num+7"; // Also "Num+Home" depending on numlock
-	case 72: return "Num+8"; // Also "Num+Up" depending on numlock
-	case 73: return "Num+9"; // Also "Num+PgUp" depending on numlock
-	case 83: return "Num+,"; // Also "Num+Del" depending on numlock
-	case 309: return "Num+/";
-	case 55: return "Num+*";
-	case 74: return "Num+-";
-	case 78: return "Num++";
-	case 284: return "Num+Enter";
+	// NOTE: the other Qt function "nativeVirtualKey" does not distinguish between VK_SHIFT and VK_RSHIFT key in Qt at the moment
+	// NOTE: Qt throws a Ctrl key at us when using Alt Gr, so there is no point in distinguishing left and right Alt at the moment
+	case 42:
+		return "Shift Left";
+	case 54:
+		return "Shift Right";
+	case 29:
+		return "Ctrl Left";
+	case 285:
+		return "Ctrl Right";
 #else
 	// TODO
+	// NOTE for MacOs: nativeScanCode may not work
 #endif
-	default: return "";
+	default:
+		return "";
 	}
 }
 
-bool keyboard_pad_handler::bindPadToDevice(std::shared_ptr<Pad> pad)
+bool keyboard_pad_handler::bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device, u8 player_id)
 {
-	if (!pad || pad->m_player_id >= g_cfg_input.player.size())
+	if (device != pad::keyboard_device_name)
 		return false;
 
-	const cfg_player* player_config = g_cfg_input.player[pad->m_player_id];
-	if (!player_config || player_config->device.to_string() != pad::keyboard_device_name)
-		return false;
-
-	m_pad_configs[pad->m_player_id].from_string(player_config->config.to_string());
-	const cfg_pad* cfg = &m_pad_configs[pad->m_player_id];
+	m_pad_configs[player_id].from_string(g_cfg_input.player[player_id]->config.to_string());
+	cfg_pad* cfg = &m_pad_configs[player_id];
 	if (cfg == nullptr)
 		return false;
 
-	m_mouse_movement_mode = cfg->mouse_move_mode;
 	m_mouse_move_used = false;
 	m_mouse_wheel_used = false;
 	m_deadzone_x = cfg->mouse_deadzone_x;
@@ -974,34 +707,24 @@ bool keyboard_pad_handler::bindPadToDevice(std::shared_ptr<Pad> pad)
 	m_r_stick_lerp_factor = cfg->r_stick_lerp_factor / 100.0f;
 	m_analog_lerp_factor  = cfg->analog_lerp_factor / 100.0f;
 	m_trigger_lerp_factor = cfg->trigger_lerp_factor / 100.0f;
-	m_l_stick_multiplier = cfg->lstickmultiplier;
-	m_r_stick_multiplier = cfg->rstickmultiplier;
-	m_analog_limiter_toggle_mode = cfg->analog_limiter_toggle_mode.get();
-	m_pressure_intensity_toggle_mode = cfg->pressure_intensity_toggle_mode.get();
-	m_pressure_intensity_deadzone = cfg->pressure_intensity_deadzone.get();
 
-	const auto find_keys = [this](const cfg::string& name)
+	const auto find_key = [this](const cfg::string& name)
 	{
-		std::set<u32> keys = FindKeyCodes<u32, u32>(mouse_list, name, false);
-		for (const u32& key : GetKeyCodes(name)) keys.insert(key);
-
-		if (!keys.empty())
-		{
-			if (!m_mouse_move_used && (keys.contains(mouse::move_left) || keys.contains(mouse::move_right) || keys.contains(mouse::move_up) || keys.contains(mouse::move_down)))
-			{
-				m_mouse_move_used = true;
-			}
-			else if (!m_mouse_wheel_used && (keys.contains(mouse::wheel_left) || keys.contains(mouse::wheel_right) || keys.contains(mouse::wheel_up) || keys.contains(mouse::wheel_down)))
-			{
-				m_mouse_wheel_used = true;
-			}
-		}
-		return keys;
+		int key = FindKeyCode(mouse_list, name, false);
+		if (key < 0)
+			key = GetKeyCode(name);
+		if (key < 0)
+			key = 0;
+		else if (!m_mouse_move_used && (key == mouse::move_left || key == mouse::move_right || key == mouse::move_up || key == mouse::move_down))
+			m_mouse_move_used = true;
+		else if (!m_mouse_wheel_used && (key == mouse::wheel_left || key == mouse::wheel_right || key == mouse::wheel_up || key == mouse::wheel_down))
+			m_mouse_wheel_used = true;
+		return key;
 	};
 
 	u32 pclass_profile = 0x0;
 
-	for (const input::product_info& product : input::get_products_by_class(cfg->device_class_type))
+	for (const auto& product : input::get_products_by_class(cfg->device_class_type))
 	{
 		if (product.vendor_id == cfg->vendor_id && product.product_id == cfg->product_id)
 		{
@@ -1022,69 +745,51 @@ bool keyboard_pad_handler::bindPadToDevice(std::shared_ptr<Pad> pad)
 		cfg->pressure_intensity
 	);
 
-	if (b_has_pressure_intensity_button)
-	{
-		pad->m_buttons.emplace_back(special_button_offset, find_keys(cfg->pressure_intensity_button), special_button_value::pressure_intensity);
-		pad->m_pressure_intensity_button_index = static_cast<s32>(pad->m_buttons.size()) - 1;
-	}
+	pad->m_buttons.emplace_back(special_button_offset, find_key(cfg->pressure_intensity_button), special_button_value::pressure_intensity);
+	pad->m_pressure_intensity_button_index = static_cast<s32>(pad->m_buttons.size()) - 1;
 
-	if (b_has_analog_limiter_button)
-	{
-		pad->m_buttons.emplace_back(special_button_offset, find_keys(cfg->analog_limiter_button), special_button_value::analog_limiter);
-		pad->m_analog_limiter_button_index = static_cast<s32>(pad->m_buttons.size()) - 1;
-	}
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_key(cfg->left),     CELL_PAD_CTRL_LEFT);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_key(cfg->down),     CELL_PAD_CTRL_DOWN);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_key(cfg->right),    CELL_PAD_CTRL_RIGHT);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_key(cfg->up),       CELL_PAD_CTRL_UP);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_key(cfg->start),    CELL_PAD_CTRL_START);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_key(cfg->r3),       CELL_PAD_CTRL_R3);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_key(cfg->l3),       CELL_PAD_CTRL_L3);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_key(cfg->select),   CELL_PAD_CTRL_SELECT);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_key(cfg->ps),       0x100/*CELL_PAD_CTRL_PS*/);// TODO: PS button support
+	//pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, 0,                             0x0); // Reserved (and currently not in use by rpcs3 at all)
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_key(cfg->square),   CELL_PAD_CTRL_SQUARE);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_key(cfg->cross),    CELL_PAD_CTRL_CROSS);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_key(cfg->circle),   CELL_PAD_CTRL_CIRCLE);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_key(cfg->triangle), CELL_PAD_CTRL_TRIANGLE);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_key(cfg->r1),       CELL_PAD_CTRL_R1);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_key(cfg->l1),       CELL_PAD_CTRL_L1);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_key(cfg->r2),       CELL_PAD_CTRL_R2);
+	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_key(cfg->l2),       CELL_PAD_CTRL_L2);
 
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_keys(cfg->left),     CELL_PAD_CTRL_LEFT);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_keys(cfg->down),     CELL_PAD_CTRL_DOWN);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_keys(cfg->right),    CELL_PAD_CTRL_RIGHT);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_keys(cfg->up),       CELL_PAD_CTRL_UP);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_keys(cfg->start),    CELL_PAD_CTRL_START);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_keys(cfg->r3),       CELL_PAD_CTRL_R3);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_keys(cfg->l3),       CELL_PAD_CTRL_L3);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_keys(cfg->select),   CELL_PAD_CTRL_SELECT);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL1, find_keys(cfg->ps),       CELL_PAD_CTRL_PS);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_keys(cfg->square),   CELL_PAD_CTRL_SQUARE);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_keys(cfg->cross),    CELL_PAD_CTRL_CROSS);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_keys(cfg->circle),   CELL_PAD_CTRL_CIRCLE);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_keys(cfg->triangle), CELL_PAD_CTRL_TRIANGLE);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_keys(cfg->r1),       CELL_PAD_CTRL_R1);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_keys(cfg->l1),       CELL_PAD_CTRL_L1);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_keys(cfg->r2),       CELL_PAD_CTRL_R2);
-	pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_DIGITAL2, find_keys(cfg->l2),       CELL_PAD_CTRL_L2);
+	pad->m_sticks.emplace_back(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X,  find_key(cfg->ls_left), find_key(cfg->ls_right));
+	pad->m_sticks.emplace_back(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y,  find_key(cfg->ls_up),   find_key(cfg->ls_down));
+	pad->m_sticks.emplace_back(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X, find_key(cfg->rs_left), find_key(cfg->rs_right));
+	pad->m_sticks.emplace_back(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y, find_key(cfg->rs_up),   find_key(cfg->rs_down));
 
-	if (pad->m_class_type == CELL_PAD_PCLASS_TYPE_SKATEBOARD)
-	{
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, find_keys(cfg->ir_nose), CELL_PAD_CTRL_PRESS_TRIANGLE);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, find_keys(cfg->ir_tail), CELL_PAD_CTRL_PRESS_CIRCLE);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, find_keys(cfg->ir_left), CELL_PAD_CTRL_PRESS_CROSS);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, find_keys(cfg->ir_right), CELL_PAD_CTRL_PRESS_SQUARE);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, find_keys(cfg->tilt_left), CELL_PAD_CTRL_PRESS_L1);
-		pad->m_buttons.emplace_back(CELL_PAD_BTN_OFFSET_PRESS_PIGGYBACK, find_keys(cfg->tilt_right), CELL_PAD_CTRL_PRESS_R1);
-	}
+	pad->m_sensors.emplace_back(CELL_PAD_BTN_OFFSET_SENSOR_X, 512);
+	pad->m_sensors.emplace_back(CELL_PAD_BTN_OFFSET_SENSOR_Y, 399);
+	pad->m_sensors.emplace_back(CELL_PAD_BTN_OFFSET_SENSOR_Z, 512);
+	pad->m_sensors.emplace_back(CELL_PAD_BTN_OFFSET_SENSOR_G, 512);
 
-	pad->m_sticks[0] = AnalogStick(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X,  find_keys(cfg->ls_left), find_keys(cfg->ls_right));
-	pad->m_sticks[1] = AnalogStick(CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y,  find_keys(cfg->ls_up),   find_keys(cfg->ls_down));
-	pad->m_sticks[2] = AnalogStick(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X, find_keys(cfg->rs_left), find_keys(cfg->rs_right));
-	pad->m_sticks[3] = AnalogStick(CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y, find_keys(cfg->rs_up),   find_keys(cfg->rs_down));
+	pad->m_vibrateMotors.emplace_back(true, 0);
+	pad->m_vibrateMotors.emplace_back(false, 0);
 
-	pad->m_sensors[0] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_X, 0, 0, 0, DEFAULT_MOTION_X);
-	pad->m_sensors[1] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_Y, 0, 0, 0, DEFAULT_MOTION_Y);
-	pad->m_sensors[2] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_Z, 0, 0, 0, DEFAULT_MOTION_Z);
-	pad->m_sensors[3] = AnalogSensor(CELL_PAD_BTN_OFFSET_SENSOR_G, 0, 0, 0, DEFAULT_MOTION_G);
-
-	pad->m_vibrateMotors[0] = VibrateMotor(true, 0);
-	pad->m_vibrateMotors[1] = VibrateMotor(false, 0);
-
-	m_bindings.emplace_back(pad, nullptr, nullptr);
+	m_bindings.push_back(pad);
 	m_pads_internal.push_back(*pad);
 
 	return true;
 }
 
-void keyboard_pad_handler::process()
+void keyboard_pad_handler::ThreadProc()
 {
-	constexpr double stick_interval = 10.0;
-	constexpr double button_interval = 10.0;
+	static const double stick_interval = 10.0;
+	static const double button_interval = 10.0;
 
 	const auto now = steady_clock::now();
 
@@ -1104,9 +809,9 @@ void keyboard_pad_handler::process()
 		m_button_time = now;
 	}
 
-	if (m_mouse_move_used && m_mouse_movement_mode == mouse_movement_mode::relative)
+	if (m_mouse_move_used)
 	{
-		constexpr double mouse_interval = 30.0;
+		static const double mouse_interval = 30.0;
 
 		const double elapsed_left  = std::chrono::duration_cast<std::chrono::microseconds>(now - m_last_mouse_move_left).count() / 1000.0;
 		const double elapsed_right = std::chrono::duration_cast<std::chrono::microseconds>(now - m_last_mouse_move_right).count() / 1000.0;
@@ -1151,9 +856,8 @@ void keyboard_pad_handler::process()
 
 		if (last_connection_status[i] == false)
 		{
-			ensure(m_bindings[i].pad);
-			m_bindings[i].pad->m_port_status |= CELL_PAD_STATUS_CONNECTED;
-			m_bindings[i].pad->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES;
+			m_bindings[i]->m_port_status |= CELL_PAD_STATUS_CONNECTED;
+			m_bindings[i]->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES;
 			last_connection_status[i] = true;
 			connected_devices++;
 		}
@@ -1161,7 +865,7 @@ void keyboard_pad_handler::process()
 		{
 			if (update_sticks)
 			{
-				for (usz j = 0; j < pad.m_sticks.size(); j++)
+				for (int j = 0; j < static_cast<int>(pad.m_sticks.size()); j++)
 				{
 					const f32 stick_lerp_factor = (j < 2) ? m_l_stick_lerp_factor : m_r_stick_lerp_factor;
 
@@ -1179,7 +883,7 @@ void keyboard_pad_handler::process()
 
 			if (update_buttons)
 			{
-				for (Button& button : pad.m_buttons)
+				for (auto& button : pad.m_buttons)
 				{
 					if (button.m_analog)
 					{
@@ -1243,36 +947,8 @@ void keyboard_pad_handler::process()
 
 	for (uint i = 0; i < m_bindings.size(); i++)
 	{
-		auto& pad = m_bindings[i].pad;
-		ensure(pad);
-
-		const cfg_pad* cfg = &m_pad_configs[pad->m_player_id];
-		ensure(cfg);
-
-		const Pad& pad_internal = m_pads_internal[i];
-
-		// Normalize and apply pad squircling
-		// Copy sticks first. We don't want to modify the raw internal values
-		std::array<AnalogStick, 4> squircled_sticks = pad_internal.m_sticks;
-
-		// Apply squircling
-		if (cfg->lpadsquircling != 0)
-		{
-			u16& lx = squircled_sticks[0].m_value;
-			u16& ly = squircled_sticks[1].m_value;
-
-			ConvertToSquirclePoint(lx, ly, cfg->lpadsquircling);
-		}
-
-		if (cfg->rpadsquircling != 0)
-		{
-			u16& rx = squircled_sticks[2].m_value;
-			u16& ry = squircled_sticks[3].m_value;
-
-			ConvertToSquirclePoint(rx, ry, cfg->rpadsquircling);
-		}
-
-		pad->m_buttons = pad_internal.m_buttons;
-		pad->m_sticks = squircled_sticks; // Don't use std::move here. We assign values lockless, so std::move can lead to segfaults.
+		auto& pad = m_bindings[i];
+		pad->m_buttons = m_pads_internal[i].m_buttons;
+		pad->m_sticks = m_pads_internal[i].m_sticks;
 	}
 }
diff --git a/rpcs3/Input/keyboard_pad_handler.h b/rpcs3/Input/keyboard_pad_handler.h
index 855f9709ec..247615071f 100644
--- a/rpcs3/Input/keyboard_pad_handler.h
+++ b/rpcs3/Input/keyboard_pad_handler.h
@@ -21,51 +21,51 @@ enum mouse
 	wheel_right = 0x05555557
 };
 
-// Unique button names for the config files and our pad settings dialog
-const std::unordered_map<u32, std::string> mouse_list =
-{
-	{ Qt::NoButton       , ""             },
-	{ Qt::LeftButton     , "Mouse Left"   },
-	{ Qt::RightButton    , "Mouse Right"  },
-	{ Qt::MiddleButton   , "Mouse Middle" },
-	{ Qt::BackButton     , "Mouse Back"   },
-	{ Qt::ForwardButton  , "Mouse Fwd"    },
-	{ Qt::TaskButton     , "Mouse Task"   },
-	{ Qt::ExtraButton4   , "Mouse 4"      },
-	{ Qt::ExtraButton5   , "Mouse 5"      },
-	{ Qt::ExtraButton6   , "Mouse 6"      },
-	{ Qt::ExtraButton7   , "Mouse 7"      },
-	{ Qt::ExtraButton8   , "Mouse 8"      },
-	{ Qt::ExtraButton9   , "Mouse 9"      },
-	{ Qt::ExtraButton10  , "Mouse 10"     },
-	{ Qt::ExtraButton11  , "Mouse 11"     },
-	{ Qt::ExtraButton12  , "Mouse 12"     },
-	{ Qt::ExtraButton13  , "Mouse 13"     },
-	{ Qt::ExtraButton14  , "Mouse 14"     },
-	{ Qt::ExtraButton15  , "Mouse 15"     },
-	{ Qt::ExtraButton16  , "Mouse 16"     },
-	{ Qt::ExtraButton17  , "Mouse 17"     },
-	{ Qt::ExtraButton18  , "Mouse 18"     },
-	{ Qt::ExtraButton19  , "Mouse 19"     },
-	{ Qt::ExtraButton20  , "Mouse 20"     },
-	{ Qt::ExtraButton21  , "Mouse 21"     },
-	{ Qt::ExtraButton22  , "Mouse 22"     },
-	{ Qt::ExtraButton23  , "Mouse 23"     },
-	{ Qt::ExtraButton24  , "Mouse 24"     },
-
-	{ mouse::move_left   , "Mouse MLeft"  },
-	{ mouse::move_right  , "Mouse MRight" },
-	{ mouse::move_up     , "Mouse MUp"    },
-	{ mouse::move_down   , "Mouse MDown"  },
-
-	{ mouse::wheel_up    , "Wheel Up"     },
-	{ mouse::wheel_down  , "Wheel Down"   },
-	{ mouse::wheel_left  , "Wheel Left"   },
-	{ mouse::wheel_right , "Wheel Right"  },
-};
-
 class keyboard_pad_handler final : public QObject, public PadHandlerBase
 {
+	// Unique button names for the config files and our pad settings dialog
+	const std::unordered_map<u32, std::string> mouse_list =
+	{
+		{ Qt::NoButton       , ""             },
+		{ Qt::LeftButton     , "Mouse Left"   },
+		{ Qt::RightButton    , "Mouse Right"  },
+		{ Qt::MiddleButton   , "Mouse Middle" },
+		{ Qt::BackButton     , "Mouse Back"   },
+		{ Qt::ForwardButton  , "Mouse Fwd"    },
+		{ Qt::TaskButton     , "Mouse Task"   },
+		{ Qt::ExtraButton4   , "Mouse 4"      },
+		{ Qt::ExtraButton5   , "Mouse 5"      },
+		{ Qt::ExtraButton6   , "Mouse 6"      },
+		{ Qt::ExtraButton7   , "Mouse 7"      },
+		{ Qt::ExtraButton8   , "Mouse 8"      },
+		{ Qt::ExtraButton9   , "Mouse 9"      },
+		{ Qt::ExtraButton10  , "Mouse 10"     },
+		{ Qt::ExtraButton11  , "Mouse 11"     },
+		{ Qt::ExtraButton12  , "Mouse 12"     },
+		{ Qt::ExtraButton13  , "Mouse 13"     },
+		{ Qt::ExtraButton14  , "Mouse 14"     },
+		{ Qt::ExtraButton15  , "Mouse 15"     },
+		{ Qt::ExtraButton16  , "Mouse 16"     },
+		{ Qt::ExtraButton17  , "Mouse 17"     },
+		{ Qt::ExtraButton18  , "Mouse 18"     },
+		{ Qt::ExtraButton19  , "Mouse 19"     },
+		{ Qt::ExtraButton20  , "Mouse 20"     },
+		{ Qt::ExtraButton21  , "Mouse 21"     },
+		{ Qt::ExtraButton22  , "Mouse 22"     },
+		{ Qt::ExtraButton23  , "Mouse 23"     },
+		{ Qt::ExtraButton24  , "Mouse 24"     },
+
+		{ mouse::move_left   , "Mouse MLeft"  },
+		{ mouse::move_right  , "Mouse MRight" },
+		{ mouse::move_up     , "Mouse MUp"    },
+		{ mouse::move_down   , "Mouse MDown"  },
+
+		{ mouse::wheel_up    , "Wheel Up"     },
+		{ mouse::wheel_down  , "Wheel Down"   },
+		{ mouse::wheel_left  , "Wheel Left"   },
+		{ mouse::wheel_right , "Wheel Right"  },
+	};
+
 public:
 	bool Init() override;
 
@@ -83,17 +83,17 @@ public:
 	bool eventFilter(QObject* target, QEvent* ev) override;
 
 	void init_config(cfg_pad* cfg) override;
-	std::vector<pad_list_entry> list_devices() override;
-	connection get_next_button_press(const std::string& /*padId*/, const pad_callback& /*callback*/, const pad_fail_callback& /*fail_callback*/, gui_call_type /*call_type*/, const std::vector<std::string>& /*buttons*/) override { return connection::connected; }
-	bool bindPadToDevice(std::shared_ptr<Pad> pad) override;
-	void process() override;
+	std::vector<std::string> ListDevices() override;
+	void get_next_button_press(const std::string& /*padId*/, const pad_callback& /*callback*/, const pad_fail_callback& /*fail_callback*/, bool /*get_blacklist*/ = false, const std::vector<std::string>& /*buttons*/ = {}) override {}
+	bool bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device, u8 player_id) override;
+	void ThreadProc() override;
 
-	static std::string GetMouseName(const QMouseEvent* event);
-	static std::string GetMouseName(u32 button);
+	std::string GetMouseName(const QMouseEvent* event) const;
+	std::string GetMouseName(u32 button) const;
 	static QStringList GetKeyNames(const QKeyEvent* keyEvent);
-	static std::string GetKeyName(const QKeyEvent* keyEvent, bool with_modifiers);
+	static std::string GetKeyName(const QKeyEvent* keyEvent);
 	static std::string GetKeyName(const u32& keyCode);
-	static std::set<u32> GetKeyCodes(const cfg::string& cfg_string);
+	static u32 GetKeyCode(const std::string& keyName);
 	static u32 GetKeyCode(const QString& keyName);
 
 	static int native_scan_code_from_string(const std::string& key);
@@ -104,34 +104,26 @@ protected:
 
 private:
 	QWindow* m_target = nullptr;
-	mouse_movement_mode m_mouse_movement_mode = mouse_movement_mode::relative;
-	bool m_keys_released = false;
 	bool m_mouse_move_used = false;
 	bool m_mouse_wheel_used = false;
 	bool get_mouse_lock_state() const;
 	void release_all_keys();
 
+	std::vector<std::shared_ptr<Pad>> m_bindings;
 	std::vector<Pad> m_pads_internal; // Accumulates input until the next poll. Only used for user input!
 
 	// Button Movements
 	steady_clock::time_point m_button_time;
 	f32 m_analog_lerp_factor  = 1.0f;
 	f32 m_trigger_lerp_factor = 1.0f;
-	bool m_analog_limiter_toggle_mode = false;
-	bool m_pressure_intensity_toggle_mode = false;
-	u32 m_pressure_intensity_deadzone = 0;
 
 	// Stick Movements
 	steady_clock::time_point m_stick_time;
 	f32 m_l_stick_lerp_factor = 1.0f;
 	f32 m_r_stick_lerp_factor = 1.0f;
-	u32 m_l_stick_multiplier = 100;
-	u32 m_r_stick_multiplier = 100;
-
-	static constexpr usz max_sticks = 4;
-	std::array<u8, max_sticks> m_stick_min{ 0, 0, 0, 0 };
-	std::array<u8, max_sticks> m_stick_max{ 128, 128, 128, 128 };
-	std::array<u8, max_sticks> m_stick_val{ 128, 128, 128, 128 };
+	u8 m_stick_min[4] = { 0, 0, 0, 0 };
+	u8 m_stick_max[4] = { 128, 128, 128, 128 };
+	u8 m_stick_val[4] = { 128, 128, 128, 128 };
 
 	// Mouse Movements
 	steady_clock::time_point m_last_mouse_move_left;
diff --git a/rpcs3/Input/mm_joystick_handler.cpp b/rpcs3/Input/mm_joystick_handler.cpp
index 7c483732fc..8438aa9e4f 100644
--- a/rpcs3/Input/mm_joystick_handler.cpp
+++ b/rpcs3/Input/mm_joystick_handler.cpp
@@ -2,6 +2,8 @@
 #include "mm_joystick_handler.h"
 #include "Emu/Io/pad_config.h"
 
+LOG_CHANNEL(input_log, "Input");
+
 mm_joystick_handler::mm_joystick_handler() : PadHandlerBase(pad_handler::mm)
 {
 	init_configs();
@@ -10,9 +12,12 @@ mm_joystick_handler::mm_joystick_handler() : PadHandlerBase(pad_handler::mm)
 	thumb_max = 255;
 	trigger_min = 0;
 	trigger_max = 255;
+	vibration_min = 0;
+	vibration_max = 65535;
 
 	// set capabilities
 	b_has_config = true;
+	b_has_rumble = true;
 	b_has_deadzones = true;
 
 	m_name_string = "Joystick #";
@@ -26,38 +31,35 @@ void mm_joystick_handler::init_config(cfg_pad* cfg)
 	if (!cfg) return;
 
 	// Set default button mapping
-	cfg->ls_left.def  = ::at32(axis_list, mmjoy_axis::joy_x_neg);
-	cfg->ls_down.def  = ::at32(axis_list, mmjoy_axis::joy_y_neg);
-	cfg->ls_right.def = ::at32(axis_list, mmjoy_axis::joy_x_pos);
-	cfg->ls_up.def    = ::at32(axis_list, mmjoy_axis::joy_y_pos);
-	cfg->rs_left.def  = ::at32(axis_list, mmjoy_axis::joy_z_neg);
-	cfg->rs_down.def  = ::at32(axis_list, mmjoy_axis::joy_r_neg);
-	cfg->rs_right.def = ::at32(axis_list, mmjoy_axis::joy_z_pos);
-	cfg->rs_up.def    = ::at32(axis_list, mmjoy_axis::joy_r_pos);
-	cfg->start.def    = ::at32(button_list, JOY_BUTTON9);
-	cfg->select.def   = ::at32(button_list, JOY_BUTTON10);
-	cfg->ps.def       = ::at32(button_list, JOY_BUTTON17);
-	cfg->square.def   = ::at32(button_list, JOY_BUTTON4);
-	cfg->cross.def    = ::at32(button_list, JOY_BUTTON3);
-	cfg->circle.def   = ::at32(button_list, JOY_BUTTON2);
-	cfg->triangle.def = ::at32(button_list, JOY_BUTTON1);
-	cfg->left.def     = ::at32(pov_list, JOY_POVLEFT);
-	cfg->down.def     = ::at32(pov_list, JOY_POVBACKWARD);
-	cfg->right.def    = ::at32(pov_list, JOY_POVRIGHT);
-	cfg->up.def       = ::at32(pov_list, JOY_POVFORWARD);
-	cfg->r1.def       = ::at32(button_list, JOY_BUTTON8);
-	cfg->r2.def       = ::at32(button_list, JOY_BUTTON6);
-	cfg->r3.def       = ::at32(button_list, JOY_BUTTON12);
-	cfg->l1.def       = ::at32(button_list, JOY_BUTTON7);
-	cfg->l2.def       = ::at32(button_list, JOY_BUTTON5);
-	cfg->l3.def       = ::at32(button_list, JOY_BUTTON11);
+	cfg->ls_left.def  = axis_list.at(mmjoy_axis::joy_x_neg);
+	cfg->ls_down.def  = axis_list.at(mmjoy_axis::joy_y_neg);
+	cfg->ls_right.def = axis_list.at(mmjoy_axis::joy_x_pos);
+	cfg->ls_up.def    = axis_list.at(mmjoy_axis::joy_y_pos);
+	cfg->rs_left.def  = axis_list.at(mmjoy_axis::joy_z_neg);
+	cfg->rs_down.def  = axis_list.at(mmjoy_axis::joy_r_neg);
+	cfg->rs_right.def = axis_list.at(mmjoy_axis::joy_z_pos);
+	cfg->rs_up.def    = axis_list.at(mmjoy_axis::joy_r_pos);
+	cfg->start.def    = button_list.at(JOY_BUTTON9);
+	cfg->select.def   = button_list.at(JOY_BUTTON10);
+	cfg->ps.def       = button_list.at(JOY_BUTTON17);
+	cfg->square.def   = button_list.at(JOY_BUTTON4);
+	cfg->cross.def    = button_list.at(JOY_BUTTON3);
+	cfg->circle.def   = button_list.at(JOY_BUTTON2);
+	cfg->triangle.def = button_list.at(JOY_BUTTON1);
+	cfg->left.def     = pov_list.at(JOY_POVLEFT);
+	cfg->down.def     = pov_list.at(JOY_POVBACKWARD);
+	cfg->right.def    = pov_list.at(JOY_POVRIGHT);
+	cfg->up.def       = pov_list.at(JOY_POVFORWARD);
+	cfg->r1.def       = button_list.at(JOY_BUTTON8);
+	cfg->r2.def       = button_list.at(JOY_BUTTON6);
+	cfg->r3.def       = button_list.at(JOY_BUTTON12);
+	cfg->l1.def       = button_list.at(JOY_BUTTON7);
+	cfg->l2.def       = button_list.at(JOY_BUTTON5);
+	cfg->l3.def       = button_list.at(JOY_BUTTON11);
 
-	cfg->pressure_intensity_button.def = ::at32(button_list, NO_BUTTON);
-	cfg->analog_limiter_button.def = ::at32(button_list, NO_BUTTON);
+	cfg->pressure_intensity_button.def = button_list.at(NO_BUTTON);
 
 	// Set default misc variables
-	cfg->lstick_anti_deadzone.def = static_cast<u32>(0.13 * thumb_max); // 13%
-	cfg->rstick_anti_deadzone.def = static_cast<u32>(0.13 * thumb_max); // 13%
 	cfg->lstickdeadzone.def    = 0; // between 0 and 255
 	cfg->rstickdeadzone.def    = 0; // between 0 and 255
 	cfg->ltriggerthreshold.def = 0; // between 0 and 255
@@ -71,178 +73,119 @@ void mm_joystick_handler::init_config(cfg_pad* cfg)
 
 bool mm_joystick_handler::Init()
 {
-	if (m_is_init)
+	if (is_init)
 		return true;
 
 	m_devices.clear();
 
-	m_max_devices = joyGetNumDevs();
-	if (!m_max_devices)
+	const u32 supported_joysticks = joyGetNumDevs();
+	if (supported_joysticks <= 0)
 	{
 		input_log.error("mmjoy: Driver doesn't support Joysticks");
 		return false;
 	}
 
-	input_log.notice("mmjoy: Driver supports %u joysticks", m_max_devices);
+	input_log.notice("mmjoy: Driver supports %u joysticks", supported_joysticks);
 
-	enumerate_devices();
-
-	m_is_init = true;
-	return true;
-}
-
-void mm_joystick_handler::enumerate_devices()
-{
-	// Mark all known devices as unplugged
-	for (auto& [name, device] : m_devices)
-	{
-		if (!device) continue;
-		device->device_status = JOYERR_UNPLUGGED;
-	}
-
-	for (int i = 0; i < static_cast<int>(m_max_devices); i++)
+	for (u32 i = 0; i < supported_joysticks; i++)
 	{
 		MMJOYDevice dev;
 
 		if (GetMMJOYDevice(i, &dev) == false)
 			continue;
 
-		auto it = m_devices.find(dev.device_name);
-		if (it == m_devices.end())
-		{
-			// Create a new device
-			m_devices.emplace(dev.device_name, std::make_shared<MMJOYDevice>(dev));
-			continue;
-		}
-
-		const auto& device = it->second;
-
-		if (!device)
-			continue;
-
-		// Update the device (don't update the base class members)
-		device->device_id = dev.device_id;
-		device->device_name = dev.device_name;
-		device->device_info = dev.device_info;
-		device->device_caps = dev.device_caps;
-		device->device_status = dev.device_status;
+		m_devices.emplace(i, dev);
 	}
+
+	is_init = true;
+	return true;
 }
 
-std::vector<pad_list_entry> mm_joystick_handler::list_devices()
+std::vector<std::string> mm_joystick_handler::ListDevices()
 {
-	std::vector<pad_list_entry> devices;
+	std::vector<std::string> devices;
 
 	if (!Init())
 		return devices;
 
-	enumerate_devices();
-
-	for (const auto& [name, dev] : m_devices)
+	for (const auto& dev : m_devices)
 	{
-		if (!dev) continue;
-		devices.emplace_back(name, false);
+		devices.emplace_back(dev.second.device_name);
 	}
 
 	return devices;
 }
 
-template <typename T>
-std::set<T> mm_joystick_handler::find_keys(const cfg::string& cfg_string) const
+u64 mm_joystick_handler::find_key(const std::string& name) const
 {
-	return find_keys<T>(cfg_pad::get_buttons(cfg_string));
+	long key = FindKeyCodeByString(axis_list, name, false);
+	if (key < 0)
+		key = FindKeyCodeByString(pov_list, name, false);
+	if (key < 0)
+		key = FindKeyCodeByString(button_list, name);
+	return static_cast<u64>(key);
 }
 
-template <typename T>
-std::set<T> mm_joystick_handler::find_keys(const std::vector<std::string>& names) const
+std::array<u32, PadHandlerBase::button::button_count> mm_joystick_handler::get_mapped_key_codes(const std::shared_ptr<PadDevice>& device, const cfg_pad* cfg)
 {
-	std::set<T> keys;
+	std::array<u32, button::button_count> mapping{};
 
-	for (const T& k : FindKeyCodes<u64, T>(axis_list, names)) keys.insert(k);
-	for (const T& k : FindKeyCodes<u64, T>(pov_list, names)) keys.insert(k);
-	for (const T& k : FindKeyCodes<u64, T>(button_list, names)) keys.insert(k);
-
-	return keys;
-}
-
-std::array<std::set<u32>, PadHandlerBase::button::button_count> mm_joystick_handler::get_mapped_key_codes(const std::shared_ptr<PadDevice>& device, const cfg_pad* cfg)
-{
-	std::array<std::set<u32>, button::button_count> mapping{};
-
-	MMJOYDevice* dev = static_cast<MMJOYDevice*>(device.get());
-	if (!dev || !cfg)
+	MMJOYDevice* joy_device = static_cast<MMJOYDevice*>(device.get());
+	if (!joy_device || !cfg)
 		return mapping;
 
-	dev->trigger_code_left  = find_keys<u64>(cfg->l2);
-	dev->trigger_code_right = find_keys<u64>(cfg->r2);
-	dev->axis_code_left[0]  = find_keys<u64>(cfg->ls_left);
-	dev->axis_code_left[1]  = find_keys<u64>(cfg->ls_right);
-	dev->axis_code_left[2]  = find_keys<u64>(cfg->ls_down);
-	dev->axis_code_left[3]  = find_keys<u64>(cfg->ls_up);
-	dev->axis_code_right[0] = find_keys<u64>(cfg->rs_left);
-	dev->axis_code_right[1] = find_keys<u64>(cfg->rs_right);
-	dev->axis_code_right[2] = find_keys<u64>(cfg->rs_down);
-	dev->axis_code_right[3] = find_keys<u64>(cfg->rs_up);
+	joy_device->trigger_left  = find_key(cfg->l2);
+	joy_device->trigger_right = find_key(cfg->r2);
+	joy_device->axis_left[0]  = find_key(cfg->ls_left);
+	joy_device->axis_left[1]  = find_key(cfg->ls_right);
+	joy_device->axis_left[2]  = find_key(cfg->ls_down);
+	joy_device->axis_left[3]  = find_key(cfg->ls_up);
+	joy_device->axis_right[0] = find_key(cfg->rs_left);
+	joy_device->axis_right[1] = find_key(cfg->rs_right);
+	joy_device->axis_right[2] = find_key(cfg->rs_down);
+	joy_device->axis_right[3] = find_key(cfg->rs_up);
 
-	mapping[button::up]       = find_keys<u32>(cfg->up);
-	mapping[button::down]     = find_keys<u32>(cfg->down);
-	mapping[button::left]     = find_keys<u32>(cfg->left);
-	mapping[button::right]    = find_keys<u32>(cfg->right);
-	mapping[button::cross]    = find_keys<u32>(cfg->cross);
-	mapping[button::square]   = find_keys<u32>(cfg->square);
-	mapping[button::circle]   = find_keys<u32>(cfg->circle);
-	mapping[button::triangle] = find_keys<u32>(cfg->triangle);
-	mapping[button::l1]       = find_keys<u32>(cfg->l1);
-	mapping[button::l2]       = narrow_set(dev->trigger_code_left);
-	mapping[button::l3]       = find_keys<u32>(cfg->l3);
-	mapping[button::r1]       = find_keys<u32>(cfg->r1);
-	mapping[button::r2]       = narrow_set(dev->trigger_code_right);
-	mapping[button::r3]       = find_keys<u32>(cfg->r3);
-	mapping[button::start]    = find_keys<u32>(cfg->start);
-	mapping[button::select]   = find_keys<u32>(cfg->select);
-	mapping[button::ps]       = find_keys<u32>(cfg->ps);
-	mapping[button::ls_left]  = narrow_set(dev->axis_code_left[0]);
-	mapping[button::ls_right] = narrow_set(dev->axis_code_left[1]);
-	mapping[button::ls_down]  = narrow_set(dev->axis_code_left[2]);
-	mapping[button::ls_up]    = narrow_set(dev->axis_code_left[3]);
-	mapping[button::rs_left]  = narrow_set(dev->axis_code_right[0]);
-	mapping[button::rs_right] = narrow_set(dev->axis_code_right[1]);
-	mapping[button::rs_down]  = narrow_set(dev->axis_code_right[2]);
-	mapping[button::rs_up]    = narrow_set(dev->axis_code_right[3]);
+	mapping[button::up]       = static_cast<u32>(find_key(cfg->up));
+	mapping[button::down]     = static_cast<u32>(find_key(cfg->down));
+	mapping[button::left]     = static_cast<u32>(find_key(cfg->left));
+	mapping[button::right]    = static_cast<u32>(find_key(cfg->right));
+	mapping[button::cross]    = static_cast<u32>(find_key(cfg->cross));
+	mapping[button::square]   = static_cast<u32>(find_key(cfg->square));
+	mapping[button::circle]   = static_cast<u32>(find_key(cfg->circle));
+	mapping[button::triangle] = static_cast<u32>(find_key(cfg->triangle));
+	mapping[button::l1]       = static_cast<u32>(find_key(cfg->l1));
+	mapping[button::l2]       = static_cast<u32>(joy_device->trigger_left);
+	mapping[button::l3]       = static_cast<u32>(find_key(cfg->l3));
+	mapping[button::r1]       = static_cast<u32>(find_key(cfg->r1));
+	mapping[button::r2]       = static_cast<u32>(joy_device->trigger_right);
+	mapping[button::r3]       = static_cast<u32>(find_key(cfg->r3));
+	mapping[button::start]    = static_cast<u32>(find_key(cfg->start));
+	mapping[button::select]   = static_cast<u32>(find_key(cfg->select));
+	mapping[button::ps]       = static_cast<u32>(find_key(cfg->ps));
+	mapping[button::ls_left]  = static_cast<u32>(joy_device->axis_left[0]);
+	mapping[button::ls_right] = static_cast<u32>(joy_device->axis_left[1]);
+	mapping[button::ls_down]  = static_cast<u32>(joy_device->axis_left[2]);
+	mapping[button::ls_up]    = static_cast<u32>(joy_device->axis_left[3]);
+	mapping[button::rs_left]  = static_cast<u32>(joy_device->axis_right[0]);
+	mapping[button::rs_right] = static_cast<u32>(joy_device->axis_right[1]);
+	mapping[button::rs_down]  = static_cast<u32>(joy_device->axis_right[2]);
+	mapping[button::rs_up]    = static_cast<u32>(joy_device->axis_right[3]);
 
-	mapping[button::skateboard_ir_nose]    = find_keys<u32>(cfg->ir_nose);
-	mapping[button::skateboard_ir_tail]    = find_keys<u32>(cfg->ir_tail);
-	mapping[button::skateboard_ir_left]    = find_keys<u32>(cfg->ir_left);
-	mapping[button::skateboard_ir_right]   = find_keys<u32>(cfg->ir_right);
-	mapping[button::skateboard_tilt_left]  = find_keys<u32>(cfg->tilt_left);
-	mapping[button::skateboard_tilt_right] = find_keys<u32>(cfg->tilt_right);
-
-	if (b_has_pressure_intensity_button)
-	{
-		mapping[button::pressure_intensity_button] = find_keys<u32>(cfg->pressure_intensity_button);
-	}
-
-	if (b_has_analog_limiter_button)
-	{
-		mapping[button::analog_limiter_button] = find_keys<u32>(cfg->analog_limiter_button);
-	}
+	mapping[button::pressure_intensity_button] = static_cast<u32>(find_key(cfg->pressure_intensity_button));
 
 	return mapping;
 }
 
-PadHandlerBase::connection mm_joystick_handler::get_next_button_press(const std::string& padId, const pad_callback& callback, const pad_fail_callback& fail_callback, gui_call_type call_type, const std::vector<std::string>& buttons)
+void mm_joystick_handler::get_next_button_press(const std::string& padId, const pad_callback& callback, const pad_fail_callback& fail_callback, bool get_blacklist, const std::vector<std::string>& buttons)
 {
-	if (call_type == gui_call_type::blacklist)
-		m_blacklist.clear();
-
-	if (call_type == gui_call_type::reset_input || call_type == gui_call_type::blacklist)
-		m_min_button_values.clear();
+	if (get_blacklist)
+		blacklist.clear();
 
 	if (!Init())
 	{
 		if (fail_callback)
 			fail_callback(padId);
-		return connection::disconnected;
+		return;
 	}
 
 	static std::string cur_pad;
@@ -251,25 +194,23 @@ PadHandlerBase::connection mm_joystick_handler::get_next_button_press(const std:
 	if (cur_pad != padId)
 	{
 		cur_pad = padId;
-		const auto dev = get_device_by_name(padId);
-		id = dev ? static_cast<int>(dev->device_id) : -1;
+		id = GetIDByName(padId);
 		if (id < 0)
 		{
 			input_log.error("MMJOY get_next_button_press for device [%s] failed with id = %d", padId, id);
 			if (fail_callback)
 				fail_callback(padId);
-			return connection::disconnected;
+			return;
 		}
 	}
 
-	JOYINFOEX js_info{};
-	JOYCAPS js_caps{};
+	JOYINFOEX js_info;
+	JOYCAPS js_caps;
 	js_info.dwSize = sizeof(js_info);
 	js_info.dwFlags = JOY_RETURNALL;
-	MMRESULT status = joyGetDevCaps(id, &js_caps, sizeof(js_caps));
+	joyGetDevCaps(id, &js_caps, sizeof(js_caps));
 
-	if (status == JOYERR_NOERROR)
-		status = joyGetPosEx(id, &js_info);
+	const MMRESULT status = joyGetPosEx(id, &js_info);
 
 	switch (status)
 	{
@@ -277,126 +218,112 @@ PadHandlerBase::connection mm_joystick_handler::get_next_button_press(const std:
 	{
 		if (fail_callback)
 			fail_callback(padId);
-		return connection::disconnected;
+		return;
 	}
 	case JOYERR_NOERROR:
 	{
-		if (call_type == gui_call_type::get_connection)
-		{
-			return connection::connected;
-		}
-
 		auto data = GetButtonValues(js_info, js_caps);
 
 		// Check for each button in our list if its corresponding (maybe remapped) button or axis was pressed.
 		// Return the new value if the button was pressed (aka. its value was bigger than 0 or the defined threshold)
-		// Get all the legally pressed buttons and use the one with highest value (prioritize first)
-		struct
+		// Use a pair to get all the legally pressed buttons and use the one with highest value (prioritize first)
+		std::pair<u16, std::string> pressed_button = { 0, "" };
+
+		for (const auto& button : axis_list)
 		{
-			u16 value = 0;
-			std::string name;
-		} pressed_button{};
+			u64 keycode = button.first;
+			u16 value = data[keycode];
 
-		const auto set_button_press = [&](const u64& keycode, const std::string& name, std::string_view type, u16 threshold)
-		{
-			if (call_type != gui_call_type::blacklist && m_blacklist.contains(keycode))
-				return;
+			if (!get_blacklist && std::find(blacklist.begin(), blacklist.end(), keycode) != blacklist.end())
+				continue;
 
-			const u16 value = data[keycode];
-			u16& min_value = m_min_button_values[keycode];
-
-			if (call_type == gui_call_type::reset_input || value < min_value)
+			if (value > m_thumb_threshold)
 			{
-				min_value = value;
-				return;
+				if (get_blacklist)
+				{
+					blacklist.emplace_back(keycode);
+					input_log.error("MMJOY Calibration: Added axis [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value);
+				}
+				else if (value > pressed_button.first)
+					pressed_button = { value, button.second };
 			}
-
-			if (value <= threshold)
-				return;
-
-			if (call_type == gui_call_type::blacklist)
-			{
-				m_blacklist.insert(keycode);
-				input_log.error("MMJOY Calibration: Added %s [ %d = %s ] to blacklist. Value = %d", type, keycode, name, value);
-				return;
-			}
-
-			const u16 diff = value > min_value ? value - min_value : 0;
-
-			if (diff > button_press_threshold && value > pressed_button.value)
-			{
-				pressed_button = { .value = value, .name = name };
-			}
-		};
-
-		for (const auto& [keycode, name] : axis_list)
-		{
-			set_button_press(keycode, name, "axis"sv, m_thumb_threshold);
 		}
 
-		for (const auto& [keycode, name] : pov_list)
+		for (const auto& button : pov_list)
 		{
-			set_button_press(keycode, name, "pov"sv, 0);
+			u64 keycode = button.first;
+			u16 value = data[keycode];
+
+			if (!get_blacklist && std::find(blacklist.begin(), blacklist.end(), keycode) != blacklist.end())
+				continue;
+
+			if (value > 0)
+			{
+				if (get_blacklist)
+				{
+					blacklist.emplace_back(keycode);
+					input_log.error("MMJOY Calibration: Added pov [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value);
+				}
+				else if (value > pressed_button.first)
+					pressed_button = { value, button.second };
+			}
 		}
 
-		for (const auto& [keycode, name] : button_list)
+		for (const auto& button : button_list)
 		{
+			const u64 keycode = button.first;
+
 			if (keycode == NO_BUTTON)
 				continue;
 
-			set_button_press(keycode, name, "button"sv, 0);
+			if (!get_blacklist && std::find(blacklist.begin(), blacklist.end(), keycode) != blacklist.end())
+				continue;
+
+			const u16 value = data[keycode];
+
+			if (value > 0)
+			{
+				if (get_blacklist)
+				{
+					blacklist.emplace_back(keycode);
+					input_log.error("MMJOY Calibration: Added button [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value);
+				}
+				else if (value > pressed_button.first)
+					pressed_button = { value, button.second };
+			}
 		}
 
-		if (call_type == gui_call_type::reset_input)
+		if (get_blacklist)
 		{
-			return connection::no_data;
-		}
-
-		if (call_type == gui_call_type::blacklist)
-		{
-			if (m_blacklist.empty())
+			if (blacklist.empty())
 				input_log.success("MMJOY Calibration: Blacklist is clear. No input spam detected");
-			return connection::connected;
+			return;
+		}
+
+		pad_preview_values preview_values = { 0, 0, 0, 0, 0, 0 };
+		if (buttons.size() == 10)
+		{
+			preview_values[0] = data[find_key(buttons[0])];
+			preview_values[1] = data[find_key(buttons[1])];
+			preview_values[2] = data[find_key(buttons[3])] - data[find_key(buttons[2])];
+			preview_values[3] = data[find_key(buttons[5])] - data[find_key(buttons[4])];
+			preview_values[4] = data[find_key(buttons[7])] - data[find_key(buttons[6])];
+			preview_values[5] = data[find_key(buttons[9])] - data[find_key(buttons[8])];
 		}
 
 		if (callback)
 		{
-			pad_preview_values preview_values{};
-			if (buttons.size() == 10)
-			{
-				const auto get_key_value = [this, &data](const std::string& str) -> u16
-				{
-					u16 value{};
-					for (u32 key_code : find_keys<u32>(cfg_pad::get_buttons(str)))
-					{
-						if (const auto it = data.find(key_code); it != data.cend())
-						{
-							value = std::max(value, it->second);
-						}
-					}
-					return value;
-				};
-				preview_values[0] = get_key_value(buttons[0]);
-				preview_values[1] = get_key_value(buttons[1]);
-				preview_values[2] = get_key_value(buttons[3]) - get_key_value(buttons[2]);
-				preview_values[3] = get_key_value(buttons[5]) - get_key_value(buttons[4]);
-				preview_values[4] = get_key_value(buttons[7]) - get_key_value(buttons[6]);
-				preview_values[5] = get_key_value(buttons[9]) - get_key_value(buttons[8]);
-			}
-
-			if (pressed_button.value > 0)
-				callback(pressed_button.value, pressed_button.name, padId, 0, std::move(preview_values));
+			if (pressed_button.first > 0)
+				return callback(pressed_button.first, pressed_button.second, padId, 0, preview_values);
 			else
-				callback(0, "", padId, 0, std::move(preview_values));
+				return callback(0, "", padId, 0, preview_values);
 		}
 
-		return connection::connected;
+		break;
 	}
 	default:
-		return connection::disconnected;
+		break;
 	}
-
-	return connection::no_data;
 }
 
 std::unordered_map<u64, u16> mm_joystick_handler::GetButtonValues(const JOYINFOEX& js_info, const JOYCAPS& js_caps)
@@ -408,7 +335,7 @@ std::unordered_map<u64, u16> mm_joystick_handler::GetButtonValues(const JOYINFOE
 		if (entry.first == NO_BUTTON)
 			continue;
 
-		button_values.emplace(entry.first, (js_info.dwButtons & entry.first) ? 255 : 0);
+		button_values.emplace(entry.first, js_info.dwButtons & entry.first ? 255 : 0);
 	}
 
 	if (js_caps.wCaps & JOYCAPS_HASPOV)
@@ -463,8 +390,7 @@ std::unordered_map<u64, u16> mm_joystick_handler::GetButtonValues(const JOYINFOE
 
 	auto add_axis_value = [&](DWORD axis, UINT min, UINT max, u64 pos, u64 neg)
 	{
-		constexpr f32 deadzone = 0.0f;
-		const float val = ScaledAxisInput(static_cast<f32>(axis), static_cast<f32>(min), static_cast<f32>(max), deadzone);
+		const float val = ScaledInput2(axis, min, max);
 		if (val < 0)
 		{
 			button_values.emplace(pos, 0);
@@ -503,40 +429,14 @@ std::unordered_map<u64, u16> mm_joystick_handler::get_button_values(const std::s
 	return GetButtonValues(dev->device_info, dev->device_caps);
 }
 
-std::shared_ptr<mm_joystick_handler::MMJOYDevice> mm_joystick_handler::get_device_by_name(const std::string& name)
+int mm_joystick_handler::GetIDByName(const std::string& name)
 {
-	// Try to find a device with valid name and index
-	if (auto it = m_devices.find(name); it != m_devices.end())
+	for (const auto& dev : m_devices)
 	{
-		if (it->second && it->second->device_id != umax)
-			return it->second;
+		if (dev.second.device_name == name)
+			return dev.first;
 	}
-
-	// Make sure we have a device pointer (marked as invalid and unplugged)
-	std::shared_ptr<MMJOYDevice> dev = create_device_by_name(name);
-	m_devices.emplace(name, dev);
-
-	return dev;
-}
-
-std::shared_ptr<mm_joystick_handler::MMJOYDevice> mm_joystick_handler::create_device_by_name(const std::string& name)
-{
-	std::shared_ptr<MMJOYDevice> dev = std::make_shared<MMJOYDevice>();
-	dev->device_name = name;
-
-	// Assign the proper index if possible
-	if (name.size() > m_name_string.size() && m_max_devices > 0)
-	{
-		u64 index = 0;
-		std::string_view suffix(name.begin() + m_name_string.size(), name.end());
-
-		if (try_to_uint64(&index, suffix, 1, m_max_devices))
-		{
-			dev->device_id = ::narrow<u32>(index - 1);
-		}
-	}
-
-	return dev;
+	return -1;
 }
 
 bool mm_joystick_handler::GetMMJOYDevice(int index, MMJOYDevice* dev) const
@@ -544,21 +444,18 @@ bool mm_joystick_handler::GetMMJOYDevice(int index, MMJOYDevice* dev) const
 	if (!dev)
 		return false;
 
-	JOYINFOEX js_info{};
-	JOYCAPS js_caps{};
+	JOYINFOEX js_info;
+	JOYCAPS js_caps;
 	js_info.dwSize = sizeof(js_info);
 	js_info.dwFlags = JOY_RETURNALL;
-
-	dev->device_status = joyGetDevCaps(index, &js_caps, sizeof(js_caps));
-	if (dev->device_status != JOYERR_NOERROR)
-		return false;
+	joyGetDevCaps(index, &js_caps, sizeof(js_caps));
 
 	dev->device_status = joyGetPosEx(index, &js_info);
 	if (dev->device_status != JOYERR_NOERROR)
 		return false;
 
-	char drv[MAXPNAMELEN]{};
-	wcstombs(drv, js_caps.szPname, MAXPNAMELEN - 1);
+	char drv[32];
+	wcstombs(drv, js_caps.szPname, 31);
 
 	input_log.notice("Joystick nr.%d found. Driver: %s", index, drv);
 
@@ -575,64 +472,47 @@ std::shared_ptr<PadDevice> mm_joystick_handler::get_device(const std::string& de
 	if (!Init())
 		return nullptr;
 
-	return get_device_by_name(device);
+	const int id = GetIDByName(device);
+	if (id < 0)
+		return nullptr;
+
+	std::shared_ptr<MMJOYDevice> joy_device = std::make_shared<MMJOYDevice>(m_devices.at(id));
+	return joy_device;
 }
 
-bool mm_joystick_handler::get_is_left_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode)
+bool mm_joystick_handler::get_is_left_trigger(u64 keyCode)
 {
-	const MMJOYDevice* dev = static_cast<MMJOYDevice*>(device.get());
-	return dev && dev->trigger_code_left.contains(keyCode);
+	return m_dev && m_dev->trigger_left == keyCode;
 }
 
-bool mm_joystick_handler::get_is_right_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode)
+bool mm_joystick_handler::get_is_right_trigger(u64 keyCode)
 {
-	const MMJOYDevice* dev = static_cast<MMJOYDevice*>(device.get());
-	return dev && dev->trigger_code_right.contains(keyCode);
+	return m_dev && m_dev->trigger_right == keyCode;
 }
 
-bool mm_joystick_handler::get_is_left_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode)
+bool mm_joystick_handler::get_is_left_stick(u64 keyCode)
 {
-	const MMJOYDevice* dev = static_cast<MMJOYDevice*>(device.get());
-	return dev && std::any_of(dev->axis_code_left.cbegin(), dev->axis_code_left.cend(), [&keyCode](const std::set<u64>& s){ return s.contains(keyCode); });
+	return m_dev && std::find(m_dev->axis_left.begin(), m_dev->axis_left.end(), keyCode) != m_dev->axis_left.end();
 }
 
-bool mm_joystick_handler::get_is_right_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode)
+bool mm_joystick_handler::get_is_right_stick(u64 keyCode)
 {
-	const MMJOYDevice* dev = static_cast<MMJOYDevice*>(device.get());
-	return dev && std::any_of(dev->axis_code_right.cbegin(), dev->axis_code_right.cend(), [&keyCode](const std::set<u64>& s){ return s.contains(keyCode); });
+	return m_dev && std::find(m_dev->axis_right.begin(), m_dev->axis_right.end(), keyCode) != m_dev->axis_right.end();
 }
 
 PadHandlerBase::connection mm_joystick_handler::update_connection(const std::shared_ptr<PadDevice>& device)
 {
 	MMJOYDevice* dev = static_cast<MMJOYDevice*>(device.get());
-	if (!dev || dev->device_id == umax)
+	if (!dev)
 		return connection::disconnected;
 
-	// Quickly check if the device is connected and fetch the button values
 	const auto old_status = dev->device_status;
 	dev->device_status    = joyGetPosEx(dev->device_id, &dev->device_info);
 
-	// The device is connected and was connected
-	if (dev->device_status == JOYERR_NOERROR && old_status == JOYERR_NOERROR)
-		return connection::connected;
-
-	// The device is not connected or was not connected
-	if (dev->device_status != JOYERR_NOERROR)
+	if (dev->device_status == JOYERR_NOERROR && (old_status == JOYERR_NOERROR || GetMMJOYDevice(dev->device_id, dev)))
 	{
-		// Only try to reconnect once every now and then.
-		const steady_clock::time_point now = steady_clock::now();
-		const s64 elapsed_ms = std::chrono::duration_cast<std::chrono::milliseconds>(now - dev->last_update).count();
-
-		if (elapsed_ms < 1000)
-			return connection::disconnected;
-
-		dev->last_update = now;
-	}
-
-	// Try to connect properly again
-	if (GetMMJOYDevice(dev->device_id, dev))
 		return connection::connected;
-
+	}
 	return connection::disconnected;
 }
 
diff --git a/rpcs3/Input/mm_joystick_handler.h b/rpcs3/Input/mm_joystick_handler.h
index 1459e9be82..ebd2bdc7ff 100644
--- a/rpcs3/Input/mm_joystick_handler.h
+++ b/rpcs3/Input/mm_joystick_handler.h
@@ -100,12 +100,15 @@ class mm_joystick_handler final : public PadHandlerBase
 
 	struct MMJOYDevice : public PadDevice
 	{
-		u32 device_id{ umax };
-		std::string device_name;
+		u32 device_id{ 0 };
+		std::string device_name{ "" };
 		JOYINFOEX device_info{};
 		JOYCAPS device_caps{};
 		MMRESULT device_status = JOYERR_UNPLUGGED;
-		steady_clock::time_point last_update{};
+		u64 trigger_left = 0;
+		u64 trigger_right = 0;
+		std::vector<u64> axis_left  = { 0,0,0,0 };
+		std::vector<u64> axis_right = { 0,0,0,0 };
 	};
 
 public:
@@ -113,35 +116,29 @@ public:
 
 	bool Init() override;
 
-	std::vector<pad_list_entry> list_devices() override;
-	connection get_next_button_press(const std::string& padId, const pad_callback& callback, const pad_fail_callback& fail_callback, gui_call_type call_type, const std::vector<std::string>& buttons) override;
+	std::vector<std::string> ListDevices() override;
+	void get_next_button_press(const std::string& padId, const pad_callback& callback, const pad_fail_callback& fail_callback, bool get_blacklist = false, const std::vector<std::string>& buttons = {}) override;
 	void init_config(cfg_pad* cfg) override;
 
 private:
 	std::unordered_map<u64, u16> GetButtonValues(const JOYINFOEX& js_info, const JOYCAPS& js_caps);
-	std::shared_ptr<MMJOYDevice> get_device_by_name(const std::string& name);
-	std::shared_ptr<MMJOYDevice> create_device_by_name(const std::string& name);
+	int GetIDByName(const std::string& name);
 	bool GetMMJOYDevice(int index, MMJOYDevice* dev) const;
-	void enumerate_devices();
 
-	bool m_is_init = false;
+	bool is_init = false;
 
-	std::set<u64> m_blacklist;
-	std::unordered_map<u64, u16> m_min_button_values;
-	std::map<std::string, std::shared_ptr<MMJOYDevice>> m_devices;
+	std::vector<u64> blacklist;
+	std::shared_ptr<MMJOYDevice> m_dev;
+	std::unordered_map<int, MMJOYDevice> m_devices;
 
-	template <typename T>
-	std::set<T> find_keys(const std::vector<std::string>& names) const;
+	u64 find_key(const std::string& name) const;
 
-	template <typename T>
-	std::set<T> find_keys(const cfg::string& cfg_string) const;
-
-	std::array<std::set<u32>, PadHandlerBase::button::button_count> get_mapped_key_codes(const std::shared_ptr<PadDevice>& device, const cfg_pad* cfg) override;
+	std::array<u32, PadHandlerBase::button::button_count> get_mapped_key_codes(const std::shared_ptr<PadDevice>& device, const cfg_pad* cfg) override;
 	std::shared_ptr<PadDevice> get_device(const std::string& device) override;
-	bool get_is_left_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_left_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
+	bool get_is_left_trigger(u64 keyCode) override;
+	bool get_is_right_trigger(u64 keyCode) override;
+	bool get_is_left_stick(u64 keyCode) override;
+	bool get_is_right_stick(u64 keyCode) override;
 	PadHandlerBase::connection update_connection(const std::shared_ptr<PadDevice>& device) override;
 	std::unordered_map<u64, u16> get_button_values(const std::shared_ptr<PadDevice>& device) override;
 };
diff --git a/rpcs3/Input/pad_thread.cpp b/rpcs3/Input/pad_thread.cpp
index 51a7c21632..799979373d 100644
--- a/rpcs3/Input/pad_thread.cpp
+++ b/rpcs3/Input/pad_thread.cpp
@@ -4,54 +4,27 @@
 #include "ds3_pad_handler.h"
 #include "ds4_pad_handler.h"
 #include "dualsense_pad_handler.h"
-#include "skateboard_pad_handler.h"
-#include "ps_move_handler.h"
 #ifdef _WIN32
 #include "xinput_pad_handler.h"
 #include "mm_joystick_handler.h"
 #elif HAVE_LIBEVDEV
 #include "evdev_joystick_handler.h"
 #endif
-#ifdef HAVE_SDL3
-#include "sdl_pad_handler.h"
-#endif
-#ifndef ANDROID
 #include "keyboard_pad_handler.h"
-#endif
 #include "Emu/Io/Null/NullPadHandler.h"
-#include "Emu/Io/interception.h"
 #include "Emu/Io/PadHandler.h"
 #include "Emu/Io/pad_config.h"
-#include "Emu/System.h"
-#include "Emu/system_config.h"
-#include "Emu/RSX/Overlays/HomeMenu/overlay_home_menu.h"
-#include "Emu/RSX/Overlays/overlay_message.h"
-#include "Emu/Cell/lv2/sys_usbd.h"
-#include "Emu/Cell/Modules/cellGem.h"
-#include "Emu/Cell/timers.hpp"
-#include "Utilities/Thread.h"
-#include "util/atomic.hpp"
 
-LOG_CHANNEL(sys_log, "SYS");
-
-extern void pad_state_notify_state_change(usz index, u32 state);
-extern bool is_input_allowed();
-extern std::string g_input_config_override;
+LOG_CHANNEL(input_log, "Input");
 
 namespace pad
 {
-	atomic_t<pad_thread*> g_pad_thread = nullptr;
+	atomic_t<pad_thread*> g_current = nullptr;
 	shared_mutex g_pad_mutex;
 	std::string g_title_id;
-	atomic_t<bool> g_started{false};
 	atomic_t<bool> g_reset{false};
 	atomic_t<bool> g_enabled{true};
-	atomic_t<bool> g_home_menu_requested{false};
-}
-
-namespace rsx
-{
-	void set_native_ui_flip();
+	atomic_t<bool> g_active{false};
 }
 
 struct pad_setting
@@ -59,22 +32,25 @@ struct pad_setting
 	u32 port_status = 0;
 	u32 device_capability = 0;
 	u32 device_type = 0;
-	u32 class_type = 0;
-	u16 vendor_id = 0;
-	u16 product_id = 0;
-	bool is_ldd_pad = false;
+	s32 ldd_handle = -1;
 };
 
-pad_thread::pad_thread(void* curthread, void* curwindow, std::string_view title_id) : m_curthread(curthread), m_curwindow(curwindow)
+pad_thread::pad_thread(void *_curthread, void *_curwindow, std::string_view title_id) : curthread(_curthread), curwindow(_curwindow)
 {
 	pad::g_title_id = title_id;
-	pad::g_pad_thread = this;
-	pad::g_started = false;
+	Init();
+
+	thread = std::make_shared<std::thread>(&pad_thread::ThreadFunc, this);
+	pad::g_current = this;
 }
 
 pad_thread::~pad_thread()
 {
-	pad::g_pad_thread = nullptr;
+	pad::g_current = nullptr;
+	pad::g_active = false;
+	thread->join();
+
+	handlers.clear();
 }
 
 void pad_thread::Init()
@@ -92,10 +68,7 @@ void pad_thread::Init()
 				m_pads[i]->m_port_status,
 				m_pads[i]->m_device_capability,
 				m_pads[i]->m_device_type,
-				m_pads[i]->m_class_type,
-				m_pads[i]->m_vendor_id,
-				m_pads[i]->m_product_id,
-				m_pads[i]->ldd
+				m_pads[i]->ldd ? static_cast<s32>(i) : -1
 			};
 		}
 		else
@@ -105,10 +78,7 @@ void pad_thread::Init()
 				CELL_PAD_STATUS_DISCONNECTED,
 				CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_ACTUATOR,
 				CELL_PAD_DEV_TYPE_STANDARD,
-				CELL_PAD_PCLASS_TYPE_STANDARD,
-				0,
-				0,
-				false
+				-1
 			};
 		}
 	}
@@ -117,21 +87,12 @@ void pad_thread::Init()
 
 	m_info.now_connect = 0;
 
-	m_handlers.clear();
+	handlers.clear();
 
-	g_cfg_input_configs.load();
-
-	std::string active_config = g_cfg_input_configs.active_configs.get_value(pad::g_title_id);
-
-	if (active_config.empty())
-	{
-		active_config = g_cfg_input_configs.active_configs.get_value(g_cfg_input_configs.global_key);
-	}
-
-	input_log.notice("Using input configuration: '%s' (override='%s')", active_config, g_input_config_override);
+	g_cfg_profile.load();
 
 	// Load in order to get the pad handlers
-	if (!g_cfg_input.load(pad::g_title_id, active_config))
+	if (!g_cfg_input.load(pad::g_title_id, g_cfg_profile.active_profiles.get_value(pad::g_title_id)))
 	{
 		input_log.notice("Loaded empty pad config");
 	}
@@ -144,135 +105,93 @@ void pad_thread::Init()
 	}
 
 	// Reload with proper defaults
-	if (!g_cfg_input.load(pad::g_title_id, active_config))
+	if (!g_cfg_input.load(pad::g_title_id, g_cfg_profile.active_profiles.get_value(pad::g_title_id)))
 	{
 		input_log.notice("Reloaded empty pad config");
 	}
 
-	input_log.trace("Using pad config:\n%s", g_cfg_input);
-
-#ifndef ANDROID
 	std::shared_ptr<keyboard_pad_handler> keyptr;
-#endif
 
 	// Always have a Null Pad Handler
 	std::shared_ptr<NullPadHandler> nullpad = std::make_shared<NullPadHandler>();
-	m_handlers.emplace(pad_handler::null, nullpad);
+	handlers.emplace(pad_handler::null, nullpad);
 
 	for (u32 i = 0; i < CELL_PAD_MAX_PORT_NUM; i++) // max 7 pads
 	{
-		cfg_player* cfg = g_cfg_input.player[i];
 		std::shared_ptr<PadHandlerBase> cur_pad_handler;
 
-		const pad_handler handler_type = pad_settings[i].is_ldd_pad ? pad_handler::null : cfg->handler.get();
+		const bool is_ldd_pad = pad_settings[i].ldd_handle == static_cast<s32>(i);
+		const auto handler_type = is_ldd_pad ? pad_handler::null : g_cfg_input.player[i]->handler.get();
 
-		if (m_handlers.contains(handler_type))
+		if (handlers.contains(handler_type))
 		{
-			cur_pad_handler = m_handlers[handler_type];
+			cur_pad_handler = handlers[handler_type];
 		}
 		else
 		{
-			if (handler_type == pad_handler::keyboard)
+			switch (handler_type)
 			{
-#ifndef ANDROID
+			case pad_handler::keyboard:
 				keyptr = std::make_shared<keyboard_pad_handler>();
-				keyptr->moveToThread(static_cast<QThread*>(m_curthread));
-				keyptr->SetTargetWindow(static_cast<QWindow*>(m_curwindow));
+				keyptr->moveToThread(static_cast<QThread*>(curthread));
+				keyptr->SetTargetWindow(static_cast<QWindow*>(curwindow));
 				cur_pad_handler = keyptr;
-#else
-				cur_pad_handler = nullpad;
+				break;
+			case pad_handler::ds3:
+				cur_pad_handler = std::make_shared<ds3_pad_handler>();
+				break;
+			case pad_handler::ds4:
+				cur_pad_handler = std::make_shared<ds4_pad_handler>();
+				break;
+			case pad_handler::dualsense:
+				cur_pad_handler = std::make_shared<dualsense_pad_handler>();
+				break;
+#ifdef _WIN32
+			case pad_handler::xinput:
+				cur_pad_handler = std::make_shared<xinput_pad_handler>();
+				break;
+			case pad_handler::mm:
+				cur_pad_handler = std::make_shared<mm_joystick_handler>();
+				break;
 #endif
+#ifdef HAVE_LIBEVDEV
+			case pad_handler::evdev:
+				cur_pad_handler = std::make_shared<evdev_joystick_handler>();
+				break;
+#endif
+			case pad_handler::null:
+				break;
 			}
-			else
-			{
-				cur_pad_handler = GetHandler(handler_type);
-			}
-			m_handlers.emplace(handler_type, cur_pad_handler);
+			handlers.emplace(handler_type, cur_pad_handler);
 		}
 		cur_pad_handler->Init();
 
-		std::shared_ptr<Pad> pad = std::make_shared<Pad>(handler_type, i, CELL_PAD_STATUS_DISCONNECTED, pad_settings[i].device_capability, pad_settings[i].device_type);
-		m_pads[i] = pad;
+		m_pads[i] = std::make_shared<Pad>(CELL_PAD_STATUS_DISCONNECTED, pad_settings[i].device_capability, pad_settings[i].device_type);
 
-		if (pad_settings[i].is_ldd_pad)
+		if (is_ldd_pad)
 		{
-			InitLddPad(i, &pad_settings[i].port_status);
+			InitLddPad(pad_settings[i].ldd_handle);
 		}
-		else
+		else if (!cur_pad_handler->bindPadToDevice(m_pads[i], g_cfg_input.player[i]->device.to_string(), i))
 		{
-			if (!cur_pad_handler->bindPadToDevice(pad))
-			{
-				// Failed to bind the device to cur_pad_handler so binds to NullPadHandler
-				input_log.error("Failed to bind device '%s' to handler %s. Falling back to NullPadHandler.", cfg->device.to_string(), handler_type);
-				nullpad->bindPadToDevice(pad);
-			}
-
-			input_log.notice("Pad %d: device='%s', handler=%s, VID=0x%x, PID=0x%x, class_type=0x%x, class_profile=0x%x",
-				i, cfg->device.to_string(), pad->m_pad_handler, pad->m_vendor_id, pad->m_product_id, pad->m_class_type, pad->m_class_profile);
-
-			if (pad->m_pad_handler != pad_handler::null)
-			{
-				input_log.notice("Pad %d: config=\n%s", i, cfg->to_string());
-			}
-
-			// If the user changes the emulated controller, then simulate unplugging and plugging in a new controller
-			if (m_pads_connected[i] && (pad_settings[i].class_type != pad->m_class_type || pad_settings[i].vendor_id != pad->m_vendor_id || pad_settings[i].product_id != pad->m_product_id))
-			{
-				pad->m_disconnection_timer = get_system_time() + 30'000ull;
-			}
+			// Failed to bind the device to cur_pad_handler so binds to NullPadHandler
+			input_log.error("Failed to bind device %s to handler %s", g_cfg_input.player[i]->device.to_string(), handler_type);
+			nullpad->bindPadToDevice(m_pads[i], g_cfg_input.player[i]->device.to_string(), i);
 		}
 
-		pad->is_fake_pad = ((g_cfg.io.move == move_handler::real || g_cfg.io.move == move_handler::fake) && i >= (static_cast<u32>(CELL_PAD_MAX_PORT_NUM) - static_cast<u32>(CELL_GEM_MAX_NUM)))
-			|| (pad->m_class_type >= CELL_PAD_FAKE_TYPE_FIRST && pad->m_class_type < CELL_PAD_FAKE_TYPE_LAST);
-		connect_usb_controller(i, input::get_product_by_vid_pid(pad->m_vendor_id, pad->m_product_id));
+		input_log.notice("Pad %d: %s", i, g_cfg_input.player[i]->device.to_string());
 	}
-
-	// Set copilots
-	for (usz i = 0; i < m_pads.size(); i++)
-	{
-		auto& pad = m_pads[i];
-		if (!pad)
-			continue;
-
-		pad->copilots.clear();
-
-		if (pad->is_copilot())
-			continue;
-
-		for (usz j = 0; j < m_pads.size(); j++)
-		{
-			auto& other = m_pads[j];
-			if (i == j || !other || other->copilot_player() != i)
-				continue;
-
-			pad->copilots.push_back(other);
-		}
-	}
-
-	// Initialize active mouse and keyboard. Activate pad handler if one exists.
-	input::set_mouse_and_keyboard(m_handlers.contains(pad_handler::keyboard) ? input::active_mouse_and_keyboard::pad : input::active_mouse_and_keyboard::emulated);
 }
 
-void pad_thread::SetRumble(u32 pad, u8 large_motor, bool small_motor)
+void pad_thread::SetRumble(const u32 pad, u8 largeMotor, bool smallMotor)
 {
-	if (pad >= m_pads.size() || !m_pads[pad])
+	if (pad > m_pads.size())
 		return;
 
-	const u64 now_us = get_system_time();
-
-	m_pads[pad]->m_last_rumble_time_us = now_us;
-	m_pads[pad]->m_vibrateMotors[0].m_value = large_motor;
-	m_pads[pad]->m_vibrateMotors[1].m_value = small_motor ? 255 : 0;
-
-	// Rumble copilots as well
-	for (const auto& copilot : m_pads[pad]->copilots)
+	if (m_pads[pad]->m_vibrateMotors.size() >= 2)
 	{
-		if (copilot && copilot->is_connected())
-		{
-			copilot->m_last_rumble_time_us = now_us;
-			copilot->m_vibrateMotors[0].m_value = large_motor;
-			copilot->m_vibrateMotors[1].m_value = small_motor ? 255 : 0;
-		}
+		m_pads[pad]->m_vibrateMotors[0].m_value = largeMotor;
+		m_pads[pad]->m_vibrateMotors[1].m_value = smallMotor ? 255 : 0;
 	}
 }
 
@@ -289,528 +208,95 @@ void pad_thread::SetIntercepted(bool intercepted)
 	}
 }
 
-void pad_thread::apply_copilots()
+void pad_thread::ThreadFunc()
 {
-	const auto normalize = [](s32 value)
+	pad::g_active = true;
+	while (pad::g_active)
 	{
-		return (value - 128) / 127.0f;
-	};
-
-	std::lock_guard lock(pad::g_pad_mutex);
-
-	for (auto& pad : m_pads)
-	{
-		if (!pad || !pad->is_connected())
+		if (!pad::g_enabled)
 		{
+			std::this_thread::sleep_for(1ms);
 			continue;
 		}
 
-		pad->m_buttons_external.resize(pad->m_buttons.size());
-
-		for (usz i = 0; i < pad->m_buttons.size(); i++)
+		if (pad::g_reset && pad::g_reset.exchange(false))
 		{
-			const Button& src = pad->m_buttons[i];
-			Button& dst = pad->m_buttons_external[i];
-
-			dst.m_offset = src.m_offset;
-			dst.m_outKeyCode = src.m_outKeyCode;
-			dst.m_value = src.m_value;
-			dst.m_pressed = src.m_pressed;
-		}
-
-		for (usz i = 0; i < pad->m_sticks.size(); i++)
-		{
-			const AnalogStick& src = pad->m_sticks[i];
-			AnalogStick& dst = pad->m_sticks_external[i];
-
-			dst.m_offset = src.m_offset;
-			dst.m_value = src.m_value;
-		}
-
-		if (pad->copilots.empty() || pad->is_copilot())
-		{
-			continue;
-		}
-
-		// Merge buttons
-		for (const auto& copilot : pad->copilots)
-		{
-			if (!copilot || !copilot->is_connected())
-			{
-				continue;
-			}
-
-			for (Button& button : pad->m_buttons_external)
-			{
-				for (const Button& other : copilot->m_buttons)
-				{
-					if (button.m_offset == other.m_offset && button.m_outKeyCode == other.m_outKeyCode)
-					{
-						if (other.m_pressed)
-						{
-							button.m_pressed = true;
-
-							if (button.m_value < other.m_value)
-							{
-								button.m_value = other.m_value;
-							}
-						}
-
-						break;
-					}
-				}
-			}
-		}
-
-		// Merge sticks
-		for (AnalogStick& stick : pad->m_sticks_external)
-		{
-			f32 accumulated_value = normalize(stick.m_value);
-
-			for (const auto& copilot : pad->copilots)
-			{
-				if (!copilot || !copilot->is_connected())
-				{
-					continue;
-				}
-
-				for (const AnalogStick& other : copilot->m_sticks)
-				{
-					if (stick.m_offset == other.m_offset)
-					{
-						accumulated_value += normalize(other.m_value);
-						break;
-					}
-				}
-			}
-
-			stick.m_value = static_cast<u16>(std::round(std::clamp(accumulated_value * 127.0f + 128.0f, 0.0f, 255.0f)));
-		}
-	}
-}
-
-void pad_thread::update_pad_states()
-{
-	for (usz i = 0; i < m_pads.size(); i++)
-	{
-		const auto& pad = m_pads[i];
-
-		// Simulate unplugging and plugging in a new controller
-		if (pad && pad->m_disconnection_timer > 0)
-		{
-			const bool is_connected = pad->is_connected();
-			const u64 now = get_system_time();
-
-			if (is_connected && now < pad->m_disconnection_timer)
-			{
-				pad->m_port_status &= ~CELL_PAD_STATUS_CONNECTED;
-				pad->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES;
-			}
-			else if (!is_connected && now >= pad->m_disconnection_timer)
-			{
-				pad->m_port_status |= CELL_PAD_STATUS_CONNECTED + CELL_PAD_STATUS_ASSIGN_CHANGES;
-				pad->m_disconnection_timer = 0;
-			}
-		}
-
-		const bool connected = pad && !pad->is_fake_pad && pad->is_connected();
-
-		if (m_pads_connected[i] == connected)
-			continue;
-
-		pad_state_notify_state_change(i, connected ? CELL_PAD_STATUS_CONNECTED : CELL_PAD_STATUS_DISCONNECTED);
-
-		m_pads_connected[i] = connected;
-	}
-}
-
-void pad_thread::operator()()
-{
-	Init();
-
-	const bool is_vsh = Emu.IsVsh();
-
-	pad::g_reset = false;
-	pad::g_started = true;
-
-	bool mode_changed = true;
-
-	atomic_t<pad_handler_mode> pad_mode{g_cfg.io.pad_mode.get()};
-	std::vector<std::unique_ptr<named_thread<std::function<void()>>>> threads;
-
-	const auto stop_threads = [&threads]()
-	{
-		input_log.notice("Stopping pad threads...");
-
-		for (auto& thread : threads)
-		{
-			// Join thread (ordered explicitly)
-			thread.reset();
-		}
-
-		threads.clear();
-
-		input_log.notice("Pad threads stopped");
-	};
-
-	const auto start_threads = [this, &threads, &pad_mode]()
-	{
-		if (pad_mode == pad_handler_mode::single_threaded)
-		{
-			return;
-		}
-
-		input_log.notice("Starting pad threads...");
-
-#if defined(__APPLE__)
-		// Let's keep hid handlers on the same thread
-		std::vector<std::shared_ptr<PadHandlerBase>> hid_handlers;
-		std::vector<std::shared_ptr<PadHandlerBase>> handlers;
-
-		for (const auto& [type, handler] : m_handlers)
-		{
-			switch (type)
-			{
-			case pad_handler::null:
-				break;
-			case pad_handler::ds3:
-			case pad_handler::ds4:
-			case pad_handler::dualsense:
-			case pad_handler::skateboard:
-			case pad_handler::move:
-				hid_handlers.push_back(handler);
-				break;
-			default:
-				handlers.push_back(handler);
-				break;
-			}
-		}
-
-		if (!hid_handlers.empty())
-		{
-			threads.push_back(std::make_unique<named_thread<std::function<void()>>>("HID Thread", [handlers = std::move(hid_handlers)]()
-			{
-				while (thread_ctrl::state() != thread_state::aborting)
-				{
-					if (!pad::g_enabled || !is_input_allowed())
-					{
-						thread_ctrl::wait_for(30'000);
-						continue;
-					}
-
-					for (auto& handler : handlers)
-					{
-						handler->process();
-					}
-
-					u64 pad_sleep = g_cfg.io.pad_sleep;
-
-					if (Emu.IsPaused())
-					{
-						pad_sleep = std::max<u64>(pad_sleep, 30'000);
-					}
-
-					thread_ctrl::wait_for(pad_sleep);
-				}
-			}));
-		}
-
-		for (const auto& handler : handlers)
-		{
-#else
-		for (const auto& [type, handler] : m_handlers)
-		{
-			if (type == pad_handler::null) continue;
-#endif
-			threads.push_back(std::make_unique<named_thread<std::function<void()>>>(fmt::format("%s Thread", handler->m_type), [handler]()
-			{
-				while (thread_ctrl::state() != thread_state::aborting)
-				{
-					if (!pad::g_enabled || !is_input_allowed())
-					{
-						thread_ctrl::wait_for(30'000);
-						continue;
-					}
-
-					handler->process();
-
-					u64 pad_sleep = g_cfg.io.pad_sleep;
-
-					if (Emu.IsPaused())
-					{
-						pad_sleep = std::max<u64>(pad_sleep, 30'000);
-					}
-
-					thread_ctrl::wait_for(pad_sleep);
-				}
-			}));
-		}
-
-		input_log.notice("Pad threads started");
-	};
-
-	while (thread_ctrl::state() != thread_state::aborting)
-	{
-		if (!pad::g_enabled || !is_input_allowed())
-		{
-			m_resume_emulation_flag = false;
-			m_mask_start_press_to_resume = 0;
-			thread_ctrl::wait_for(30'000);
-			continue;
-		}
-
-		// Update variables
-		const bool needs_reset = pad::g_reset && pad::g_reset.exchange(false);
-		const pad_handler_mode new_pad_mode = g_cfg.io.pad_mode.get();
-		mode_changed |= new_pad_mode != pad_mode.exchange(new_pad_mode);
-
-		// Reset pad handlers if necessary
-		if (needs_reset || mode_changed)
-		{
-			mode_changed = false;
-
-			stop_threads();
-
-			if (needs_reset)
-			{
-				Init();
-			}
-			else
-			{
-				input_log.success("The pad mode was changed to %s", pad_mode.load());
-			}
-
-			start_threads();
+			Init();
 		}
 
 		u32 connected_devices = 0;
 
-		if (pad_mode == pad_handler_mode::single_threaded)
+		for (auto& cur_pad_handler : handlers)
 		{
-			for (auto& handler : m_handlers)
-			{
-				handler.second->process();
-				connected_devices += handler.second->connected_devices;
-			}
-		}
-		else
-		{
-			for (auto& handler : m_handlers)
-			{
-				connected_devices += handler.second->connected_devices;
-			}
-		}
-
-		apply_copilots();
-
-		if (Emu.IsRunning())
-		{
-			update_pad_states();
+			cur_pad_handler.second->ThreadProc();
+			connected_devices += cur_pad_handler.second->connected_devices;
 		}
 
 		m_info.now_connect = connected_devices + num_ldd_pad;
 
-		// The ignore_input section is only reached when a dialog was closed and the pads are still intercepted.
+		// The input_ignored section is only reached when a dialog was closed and the pads are still intercepted.
 		// As long as any of the listed buttons is pressed, cellPadGetData will ignore all input (needed for Hotline Miami).
 		// ignore_input was added because if we keep the pads intercepted, then some games will enter the menu due to unexpected system interception (tested with Ninja Gaiden Sigma).
-		if (m_info.ignore_input && !(m_info.system_info & CELL_PAD_INFO_INTERCEPTED))
+		const bool input_ignored = m_info.ignore_input && !(m_info.system_info & CELL_PAD_INFO_INTERCEPTED);
+		bool any_button_pressed = false;
+
+		for (usz i = 0; i < m_pads.size(); i++)
 		{
-			bool any_button_pressed = false;
+			const auto& pad = m_pads[i];
 
-			for (usz i = 0; i < m_pads.size() && !any_button_pressed; i++)
+			if (pad->m_port_status & CELL_PAD_STATUS_CONNECTED)
 			{
-				const auto& pad = m_pads[i];
-
-				if (!pad->is_connected())
-					continue;
-
-				for (const auto& button : pad->m_buttons)
+				for (auto& button : pad->m_buttons)
 				{
-					if (button.m_pressed && (
-						button.m_outKeyCode == CELL_PAD_CTRL_CROSS ||
-						button.m_outKeyCode == CELL_PAD_CTRL_CIRCLE ||
-						button.m_outKeyCode == CELL_PAD_CTRL_TRIANGLE ||
-						button.m_outKeyCode == CELL_PAD_CTRL_SQUARE ||
-						button.m_outKeyCode == CELL_PAD_CTRL_START ||
-						button.m_outKeyCode == CELL_PAD_CTRL_SELECT))
+					if (button.m_pressed)
 					{
-						any_button_pressed = true;
-						break;
-					}
-				}
-			}
-
-			if (!any_button_pressed)
-			{
-				m_info.ignore_input = false;
-			}
-		}
-
-		// Handle home menu if requested
-		if (!is_vsh && !m_home_menu_open && Emu.IsRunning())
-		{
-			bool ps_button_pressed = false;
-
-			for (usz i = 0; i < m_pads.size() && !ps_button_pressed; i++)
-			{
-				if (i > 0 && g_cfg.io.lock_overlay_input_to_player_one)
-					break;
-
-				const auto& pad = m_pads[i];
-
-				if (!pad->is_connected())
-					continue;
-
-				// Check if an LDD pad pressed the PS button (bit 0 of the first button)
-				// NOTE: Rock Band 3 doesn't seem to care about the len. It's always 0.
-				if (pad->ldd /*&& pad->ldd_data.len >= 1 */&& !!(pad->ldd_data.button[0] & CELL_PAD_CTRL_LDD_PS))
-				{
-					ps_button_pressed = true;
-					break;
-				}
-
-				for (const auto& button : pad->m_buttons)
-				{
-					if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1 && button.m_outKeyCode == CELL_PAD_CTRL_PS && button.m_pressed)
-					{
-						ps_button_pressed = true;
-						break;
-					}
-				}
-			}
-
-			// Make sure we call this function only once per button press
-			if ((ps_button_pressed && !m_ps_button_pressed) || pad::g_home_menu_requested.exchange(false))
-			{
-				open_home_menu();
-			}
-
-			m_ps_button_pressed = ps_button_pressed;
-		}
-
-		// Handle paused emulation (if triggered by home menu).
-		if (m_home_menu_open && g_cfg.misc.pause_during_home_menu)
-		{
-			// Reset resume control if the home menu is open
-			m_resume_emulation_flag = false;
-			m_mask_start_press_to_resume = 0;
-			m_track_start_press_begin_timestamp = 0;
-
-			// Update UI
-			rsx::set_native_ui_flip();
-			thread_ctrl::wait_for(33'000);
-			continue;
-		}
-
-		if (m_resume_emulation_flag)
-		{
-			m_resume_emulation_flag = false;
-
-			Emu.BlockingCallFromMainThread([]()
-			{
-				Emu.Resume();
-			});
-		}
-
-		u64 pad_sleep = g_cfg.io.pad_sleep;
-
-		if (Emu.GetStatus(false) == system_state::paused)
-		{
-			pad_sleep = std::max<u64>(pad_sleep, 30'000);
-
-			u64 timestamp = get_system_time();
-			u32 pressed_mask = 0;
-
-			for (usz i = 0; i < m_pads.size(); i++)
-			{
-				const auto& pad = m_pads[i];
-
-				if (!pad->is_connected())
-					continue;
-
-				for (const auto& button : pad->m_buttons)
-				{
-					if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1 && button.m_outKeyCode == CELL_PAD_CTRL_START && button.m_pressed)
-					{
-						pressed_mask |= 1u << i;
-						break;
-					}
-				}
-			}
-
-			m_mask_start_press_to_resume &= pressed_mask;
-
-			if (!pressed_mask || timestamp - m_track_start_press_begin_timestamp >= 700'000)
-			{
-				m_track_start_press_begin_timestamp = timestamp;
-
-				if (std::exchange(m_mask_start_press_to_resume, u32{umax}))
-				{
-					m_mask_start_press_to_resume = 0;
-					m_track_start_press_begin_timestamp = 0;
-
-					sys_log.success("Resuming emulation using the START button in a few seconds...");
-
-					auto msg_ref = std::make_shared<atomic_t<u32>>(1);
-					rsx::overlays::queue_message(localized_string_id::EMULATION_RESUMING, 2'000'000, msg_ref);
-
-					m_resume_emulation_flag = true;
-
-					for (u32 i = 0; i < 40; i++)
-					{
-						if (Emu.GetStatus(false) != system_state::paused)
+						if (button.m_outKeyCode == CELL_PAD_CTRL_CROSS ||
+							button.m_outKeyCode == CELL_PAD_CTRL_CIRCLE ||
+							button.m_outKeyCode == CELL_PAD_CTRL_TRIANGLE ||
+							button.m_outKeyCode == CELL_PAD_CTRL_SQUARE ||
+							button.m_outKeyCode == CELL_PAD_CTRL_START ||
+							button.m_outKeyCode == CELL_PAD_CTRL_SELECT)
 						{
-							// Abort if emulation has been resumed by other means
-							m_resume_emulation_flag = false;
-							msg_ref->release(0);
-							break;
+							any_button_pressed = true;
 						}
-
-						thread_ctrl::wait_for(50'000);
-						rsx::set_native_ui_flip();
 					}
 				}
 			}
 		}
-		else
+
+		if (input_ignored && !any_button_pressed)
 		{
-			// Reset resume control if caught a state of unpaused emulation
-			m_mask_start_press_to_resume = 0;
-			m_track_start_press_begin_timestamp = 0;
+			m_info.ignore_input = false;
 		}
 
-		thread_ctrl::wait_for(pad_sleep);
+		std::this_thread::sleep_for(1ms);
 	}
-
-	stop_threads();
 }
 
-void pad_thread::InitLddPad(u32 handle, const u32* port_status)
+void pad_thread::InitLddPad(u32 handle)
 {
 	if (handle >= m_pads.size())
 	{
 		return;
 	}
 
-	static const input::product_info product = input::get_product_info(input::product_type::playstation_3_controller);
+	input_log.notice("Pad %d: LDD", handle);
 
-	auto& pad = m_pads[handle];
-	pad->ldd = true;
-	pad->Init
+	static const auto product = input::get_product_info(input::product_type::playstation_3_controller);
+
+	m_pads[handle]->ldd = true;
+	m_pads[handle]->Init
 	(
-		port_status ? *port_status : CELL_PAD_STATUS_CONNECTED | CELL_PAD_STATUS_ASSIGN_CHANGES | CELL_PAD_STATUS_CUSTOM_CONTROLLER,
+		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,
+		0, // CELL_PAD_PCLASS_TYPE_STANDARD
 		product.pclass_profile,
 		product.vendor_id,
 		product.product_id,
 		50
 	);
 
-	input_log.notice("Pad %d: LDD, VID=0x%x, PID=0x%x, class_type=0x%x, class_profile=0x%x",
-		handle, pad->m_vendor_id, pad->m_product_id, pad->m_class_type, pad->m_class_profile);
-
 	num_ldd_pad++;
 }
 
@@ -821,7 +307,7 @@ s32 pad_thread::AddLddPad()
 	{
 		if (g_cfg_input.player[i]->handler == pad_handler::null && !m_pads[i]->ldd)
 		{
-			InitLddPad(i, nullptr);
+			InitLddPad(i);
 			return i;
 		}
 	}
@@ -831,11 +317,9 @@ s32 pad_thread::AddLddPad()
 
 void pad_thread::UnregisterLddPad(u32 handle)
 {
-	auto& pad = ::at32(m_pads, handle);
+	ensure(handle < m_pads.size());
 
-	pad->ldd = false;
-	pad->m_port_status &= ~CELL_PAD_STATUS_CONNECTED;
-	pad->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES;
+	m_pads[handle]->ldd = false;
 
 	num_ldd_pad--;
 }
@@ -845,36 +329,24 @@ std::shared_ptr<PadHandlerBase> pad_thread::GetHandler(pad_handler type)
 	switch (type)
 	{
 	case pad_handler::null:
-		return std::make_shared<NullPadHandler>();
+		return std::make_unique<NullPadHandler>();
 	case pad_handler::keyboard:
-#ifdef ANDROID
-		return std::make_shared<NullPadHandler>();
-#else
-		return std::make_shared<keyboard_pad_handler>();
-#endif
+		return std::make_unique<keyboard_pad_handler>();
 	case pad_handler::ds3:
-		return std::make_shared<ds3_pad_handler>();
+		return std::make_unique<ds3_pad_handler>();
 	case pad_handler::ds4:
-		return std::make_shared<ds4_pad_handler>();
+		return std::make_unique<ds4_pad_handler>();
 	case pad_handler::dualsense:
-		return std::make_shared<dualsense_pad_handler>();
-	case pad_handler::skateboard:
-		return std::make_shared<skateboard_pad_handler>();
-	case pad_handler::move:
-		return std::make_shared<ps_move_handler>();
+		return std::make_unique<dualsense_pad_handler>();
 #ifdef _WIN32
 	case pad_handler::xinput:
-		return std::make_shared<xinput_pad_handler>();
+		return std::make_unique<xinput_pad_handler>();
 	case pad_handler::mm:
-		return std::make_shared<mm_joystick_handler>();
-#endif
-#ifdef HAVE_SDL3
-	case pad_handler::sdl:
-		return std::make_shared<sdl_pad_handler>();
+		return std::make_unique<mm_joystick_handler>();
 #endif
 #ifdef HAVE_LIBEVDEV
 	case pad_handler::evdev:
-		return std::make_shared<evdev_joystick_handler>();
+		return std::make_unique<evdev_joystick_handler>();
 #endif
 	}
 
@@ -888,47 +360,35 @@ void pad_thread::InitPadConfig(cfg_pad& cfg, pad_handler type, std::shared_ptr<P
 		handler = GetHandler(type);
 	}
 
-	ensure(!!handler);
-	handler->init_config(&cfg);
-}
-
-extern bool send_open_home_menu_cmds();
-extern void send_close_home_menu_cmds();
-extern bool close_osk_from_ps_button();
-
-void pad_thread::open_home_menu()
-{
-	// Check if the OSK is open and can be closed
-	if (!close_osk_from_ps_button())
+	switch (handler->m_type)
 	{
-		rsx::overlays::queue_message(get_localized_string(localized_string_id::CELL_OSK_DIALOG_BUSY));
-		return;
-	}
-
-	if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
-	{
-		if (m_home_menu_open.exchange(true))
-		{
-			return;
-		}
-
-		if (!send_open_home_menu_cmds())
-		{
-			m_home_menu_open = false;
-			return;
-		}
-
-		input_log.notice("opening home menu...");
-
-		const error_code result = manager->create<rsx::overlays::home_menu_dialog>()->show([this](s32 status)
-		{
-			input_log.notice("closing home menu with status %d", status);
-
-			m_home_menu_open = false;
-
-			send_close_home_menu_cmds();
-		});
-
-		(result ? input_log.error : input_log.notice)("opened home menu with result %d", s32{result});
+	case pad_handler::null:
+		static_cast<NullPadHandler*>(handler.get())->init_config(&cfg);
+		break;
+	case pad_handler::keyboard:
+		static_cast<keyboard_pad_handler*>(handler.get())->init_config(&cfg);
+		break;
+	case pad_handler::ds3:
+		static_cast<ds3_pad_handler*>(handler.get())->init_config(&cfg);
+		break;
+	case pad_handler::ds4:
+		static_cast<ds4_pad_handler*>(handler.get())->init_config(&cfg);
+		break;
+	case pad_handler::dualsense:
+		static_cast<dualsense_pad_handler*>(handler.get())->init_config(&cfg);
+		break;
+#ifdef _WIN32
+	case pad_handler::xinput:
+		static_cast<xinput_pad_handler*>(handler.get())->init_config(&cfg);
+		break;
+	case pad_handler::mm:
+		static_cast<mm_joystick_handler*>(handler.get())->init_config(&cfg);
+		break;
+#endif
+#ifdef HAVE_LIBEVDEV
+	case pad_handler::evdev:
+		static_cast<evdev_joystick_handler*>(handler.get())->init_config(&cfg);
+		break;
+#endif
 	}
 }
diff --git a/rpcs3/Input/pad_thread.h b/rpcs3/Input/pad_thread.h
index addcf8b73f..e5d9a0d899 100644
--- a/rpcs3/Input/pad_thread.h
+++ b/rpcs3/Input/pad_thread.h
@@ -8,6 +8,7 @@
 #include "Utilities/mutex.h"
 
 #include <map>
+#include <thread>
 #include <mutex>
 #include <string_view>
 #include <string>
@@ -17,76 +18,59 @@ class PadHandlerBase;
 class pad_thread
 {
 public:
-	pad_thread(void* curthread, void* curwindow, std::string_view title_id); // void * instead of QThread * and QWindow * because of include in emucore
+	pad_thread(void* _curthread, void* _curwindow, std::string_view title_id); // void * instead of QThread * and QWindow * because of include in emucore
 	pad_thread(const pad_thread&) = delete;
 	pad_thread& operator=(const pad_thread&) = delete;
 	~pad_thread();
 
-	void operator()();
-
 	PadInfo& GetInfo() { return m_info; }
-	std::array<std::shared_ptr<Pad>, CELL_PAD_MAX_PORT_NUM>& GetPads() { return m_pads; }
-	void SetRumble(u32 pad, u8 large_motor, bool small_motor);
+	auto& GetPads() { return m_pads; }
+	void SetRumble(const u32 pad, u8 largeMotor, bool smallMotor);
+	void Init();
 	void SetIntercepted(bool intercepted);
 
 	s32 AddLddPad();
 	void UnregisterLddPad(u32 handle);
 
-	void open_home_menu();
-
-	std::map<pad_handler, std::shared_ptr<PadHandlerBase>>& get_handlers() { return m_handlers; }
-
 	static std::shared_ptr<PadHandlerBase> GetHandler(pad_handler type);
 	static void InitPadConfig(cfg_pad& cfg, pad_handler type, std::shared_ptr<PadHandlerBase>& handler);
 
-	static auto constexpr thread_name = "Pad Thread"sv;
-
 protected:
-	void Init();
-	void InitLddPad(u32 handle, const u32* port_status);
+	void InitLddPad(u32 handle);
+	void ThreadFunc();
 
 	// List of all handlers
-	std::map<pad_handler, std::shared_ptr<PadHandlerBase>> m_handlers;
+	std::map<pad_handler, std::shared_ptr<PadHandlerBase>> handlers;
 
 	// Used for pad_handler::keyboard
-	void* m_curthread = nullptr;
-	void* m_curwindow = nullptr;
+	void *curthread;
+	void *curwindow;
 
 	PadInfo m_info{ 0, 0, false };
-	std::array<std::shared_ptr<Pad>, CELL_PAD_MAX_PORT_NUM> m_pads{};
-	std::array<bool, CELL_PAD_MAX_PORT_NUM> m_pads_connected{};
+	std::array<std::shared_ptr<Pad>, CELL_PAD_MAX_PORT_NUM> m_pads;
+
+	std::shared_ptr<std::thread> thread;
 
 	u32 num_ldd_pad = 0;
-
-private:
-	void apply_copilots();
-	void update_pad_states();
-
-	u32 m_mask_start_press_to_resume = 0;
-	u64 m_track_start_press_begin_timestamp = 0;
-	bool m_resume_emulation_flag = false;
-	bool m_ps_button_pressed = false;
-	atomic_t<bool> m_home_menu_open = false;
 };
 
 namespace pad
 {
-	extern atomic_t<pad_thread*> g_pad_thread;
+	extern atomic_t<pad_thread*> g_current;
 	extern shared_mutex g_pad_mutex;
 	extern std::string g_title_id;
 	extern atomic_t<bool> g_enabled;
 	extern atomic_t<bool> g_reset;
-	extern atomic_t<bool> g_started;
-	extern atomic_t<bool> g_home_menu_requested;
+	extern atomic_t<bool> g_active;
 
-	static inline class pad_thread* get_pad_thread(bool relaxed = false)
+	static inline class pad_thread* get_current_handler(bool relaxed = false)
 	{
 		if (relaxed)
 		{
-			return g_pad_thread.observe();
+			return g_current.observe();
 		}
 
-		return ensure(g_pad_thread.load());
+		return ensure(g_current.load());
 	}
 
 	static inline void set_enabled(bool enabled)
@@ -97,13 +81,13 @@ namespace pad
 	static inline void reset(std::string_view title_id)
 	{
 		g_title_id = title_id;
-		g_reset = true;
+		g_reset = g_active.load();
 	}
 
 	static inline void SetIntercepted(bool intercepted)
 	{
 		std::lock_guard lock(g_pad_mutex);
-		const auto handler = get_pad_thread();
+		const auto handler = get_current_handler();
 		handler->SetIntercepted(intercepted);
 	}
 }
diff --git a/rpcs3/Input/product_info.cpp b/rpcs3/Input/product_info.cpp
deleted file mode 100644
index 120354014d..0000000000
--- a/rpcs3/Input/product_info.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-#include "Input/product_info.h"
-
-#include <map>
-
-#include "Emu/Io/pad_types.h"
-
-namespace input
-{
-	static const std::map<product_type, product_info> input_products = {
-	{
-		product_type::playstation_3_controller,
-		{
-			.type = product_type::playstation_3_controller,
-			.class_id = CELL_PAD_PCLASS_TYPE_STANDARD,
-			.vendor_id = vendor_id::sony_corp,
-			.product_id = product_id::playstation_3_controller,
-			.pclass_profile = 0x0,
-			.capabilites = CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_HP_ANALOG_STICK | CELL_PAD_CAPABILITY_ACTUATOR | CELL_PAD_CAPABILITY_SENSOR_MODE
-		}
-	},
-	{
-		product_type::red_octane_gh_guitar,
-		{
-			.type = product_type::red_octane_gh_guitar,
-			.class_id = CELL_PAD_PCLASS_TYPE_GUITAR,
-			.vendor_id = vendor_id::sony_cea,
-			.product_id = product_id::red_octane_gh_guitar,
-			.pclass_profile =
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_1 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_2 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_3 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_4 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_5 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_STRUM_UP |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_STRUM_DOWN |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_WHAMMYBAR,
-			.capabilites = CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_HP_ANALOG_STICK | CELL_PAD_CAPABILITY_ACTUATOR | CELL_PAD_CAPABILITY_SENSOR_MODE
-		}
-	},
-	{
-		product_type::harmonix_rockband_guitar,
-		{
-			.type = product_type::harmonix_rockband_guitar,
-			.class_id = CELL_PAD_PCLASS_TYPE_GUITAR,
-			.vendor_id = vendor_id::sony_cea,
-			.product_id = product_id::harmonix_rockband_guitar,
-			.pclass_profile =
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_1 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_2 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_3 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_4 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_5 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_STRUM_UP |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_STRUM_DOWN |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_WHAMMYBAR |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_H1 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_H2 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_H3 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_H4 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_FRET_H5 |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_5WAY_EFFECT |
-				CELL_PAD_PCLASS_PROFILE_GUITAR_TILT_SENS,
-			.capabilites = CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_HP_ANALOG_STICK | CELL_PAD_CAPABILITY_ACTUATOR | CELL_PAD_CAPABILITY_SENSOR_MODE
-		}
-	},
-	{
-		product_type::red_octane_gh_drum_kit,
-		{
-			.type = product_type::red_octane_gh_drum_kit,
-			.class_id = CELL_PAD_PCLASS_TYPE_DRUM,
-			.vendor_id = vendor_id::sony_cea,
-			.product_id = product_id::red_octane_gh_drum_kit,
-			.pclass_profile =
-				CELL_PAD_PCLASS_PROFILE_DRUM_SNARE |
-				CELL_PAD_PCLASS_PROFILE_DRUM_TOM |
-				CELL_PAD_PCLASS_PROFILE_DRUM_TOM_FLOOR |
-				CELL_PAD_PCLASS_PROFILE_DRUM_KICK |
-				CELL_PAD_PCLASS_PROFILE_DRUM_CYM_HiHAT |
-				CELL_PAD_PCLASS_PROFILE_DRUM_CYM_RIDE,
-			.capabilites = CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_HP_ANALOG_STICK | CELL_PAD_CAPABILITY_ACTUATOR | CELL_PAD_CAPABILITY_SENSOR_MODE
-		}
-	},
-	{
-		product_type::harmonix_rockband_drum_kit,
-		{
-			.type = product_type::harmonix_rockband_drum_kit,
-			.class_id = CELL_PAD_PCLASS_TYPE_DRUM,
-			.vendor_id = vendor_id::sony_cea,
-			.product_id = product_id::harmonix_rockband_drum_kit,
-			.pclass_profile = 
-				CELL_PAD_PCLASS_PROFILE_DRUM_SNARE |
-				CELL_PAD_PCLASS_PROFILE_DRUM_TOM |
-				CELL_PAD_PCLASS_PROFILE_DRUM_TOM2 |
-				CELL_PAD_PCLASS_PROFILE_DRUM_TOM_FLOOR |
-				CELL_PAD_PCLASS_PROFILE_DRUM_KICK |
-				CELL_PAD_PCLASS_PROFILE_DRUM_CYM_HiHAT |
-				CELL_PAD_PCLASS_PROFILE_DRUM_CYM_CRASH |
-				CELL_PAD_PCLASS_PROFILE_DRUM_CYM_RIDE,
-			.capabilites = CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_HP_ANALOG_STICK | CELL_PAD_CAPABILITY_ACTUATOR | CELL_PAD_CAPABILITY_SENSOR_MODE
-		}
-	},
-	{
-		product_type::harmonix_rockband_drum_kit_2,
-		{
-			.type = product_type::harmonix_rockband_drum_kit_2,
-			.class_id = CELL_PAD_PCLASS_TYPE_DRUM,
-			.vendor_id = vendor_id::sony_cea,
-			.product_id = product_id::harmonix_rockband_drum_kit_2,
-			.pclass_profile =
-				CELL_PAD_PCLASS_PROFILE_DRUM_SNARE |
-				CELL_PAD_PCLASS_PROFILE_DRUM_TOM |
-				CELL_PAD_PCLASS_PROFILE_DRUM_TOM2 |
-				CELL_PAD_PCLASS_PROFILE_DRUM_TOM_FLOOR |
-				CELL_PAD_PCLASS_PROFILE_DRUM_KICK |
-				CELL_PAD_PCLASS_PROFILE_DRUM_CYM_HiHAT |
-				CELL_PAD_PCLASS_PROFILE_DRUM_CYM_RIDE,
-			.capabilites = CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_HP_ANALOG_STICK | CELL_PAD_CAPABILITY_ACTUATOR | CELL_PAD_CAPABILITY_SENSOR_MODE
-		}
-	},
-	{
-		product_type::rock_revolution_drum_kit,
-		{
-			.type = product_type::rock_revolution_drum_kit,
-			.class_id = CELL_PAD_PCLASS_TYPE_DRUM,
-			.vendor_id = vendor_id::sony_cea,
-			.product_id = product_id::rock_revolution_drum_kit,
-			.pclass_profile =
-				CELL_PAD_PCLASS_PROFILE_DRUM_SNARE |
-				CELL_PAD_PCLASS_PROFILE_DRUM_TOM |
-				CELL_PAD_PCLASS_PROFILE_DRUM_TOM_FLOOR |
-				CELL_PAD_PCLASS_PROFILE_DRUM_KICK |
-				CELL_PAD_PCLASS_PROFILE_DRUM_CYM_HiHAT |
-				CELL_PAD_PCLASS_PROFILE_DRUM_CYM_CRASH |
-				CELL_PAD_PCLASS_PROFILE_DRUM_CYM_RIDE,
-			.capabilites = CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_HP_ANALOG_STICK | CELL_PAD_CAPABILITY_ACTUATOR | CELL_PAD_CAPABILITY_SENSOR_MODE
-		}
-	},
-	{
-		product_type::dj_hero_turntable,
-		{
-			.type = product_type::dj_hero_turntable,
-			.class_id = CELL_PAD_PCLASS_TYPE_DJ,
-			.vendor_id = vendor_id::sony_cea,
-			.product_id = product_id::dj_hero_turntable,
-			.pclass_profile =
-				CELL_PAD_PCLASS_PROFILE_DJ_MIXER_ATTACK |
-				CELL_PAD_PCLASS_PROFILE_DJ_MIXER_CROSSFADER |
-				CELL_PAD_PCLASS_PROFILE_DJ_MIXER_DSP_DIAL |
-				CELL_PAD_PCLASS_PROFILE_DJ_DECK1_STREAM1 |
-				CELL_PAD_PCLASS_PROFILE_DJ_DECK1_STREAM2 |
-				CELL_PAD_PCLASS_PROFILE_DJ_DECK1_STREAM3 |
-				CELL_PAD_PCLASS_PROFILE_DJ_DECK1_PLATTER |
-				CELL_PAD_PCLASS_PROFILE_DJ_DECK2_STREAM1 |
-				CELL_PAD_PCLASS_PROFILE_DJ_DECK2_STREAM2 |
-				CELL_PAD_PCLASS_PROFILE_DJ_DECK2_STREAM3 |
-				CELL_PAD_PCLASS_PROFILE_DJ_DECK2_PLATTER,
-			.capabilites = CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_HP_ANALOG_STICK | CELL_PAD_CAPABILITY_ACTUATOR | CELL_PAD_CAPABILITY_SENSOR_MODE
-		}
-	},
-	{
-		product_type::dance_dance_revolution_mat,
-		{
-			.type = product_type::dance_dance_revolution_mat,
-			.class_id = CELL_PAD_PCLASS_TYPE_DANCEMAT,
-			.vendor_id = vendor_id::konami_de,
-			.product_id = product_id::dance_dance_revolution_mat,
-			.pclass_profile =
-				CELL_PAD_PCLASS_PROFILE_DANCEMAT_CIRCLE |
-				CELL_PAD_PCLASS_PROFILE_DANCEMAT_CROSS |
-				CELL_PAD_PCLASS_PROFILE_DANCEMAT_TRIANGLE |
-				CELL_PAD_PCLASS_PROFILE_DANCEMAT_SQUARE |
-				CELL_PAD_PCLASS_PROFILE_DANCEMAT_RIGHT |
-				CELL_PAD_PCLASS_PROFILE_DANCEMAT_LEFT |
-				CELL_PAD_PCLASS_PROFILE_DANCEMAT_UP |
-				CELL_PAD_PCLASS_PROFILE_DANCEMAT_DOWN,
-			.capabilites = CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_HP_ANALOG_STICK | CELL_PAD_CAPABILITY_ACTUATOR | CELL_PAD_CAPABILITY_SENSOR_MODE
-		}
-	},
-	{
-		product_type::ps_move_navigation,
-		{
-			.type = product_type::ps_move_navigation,
-			.class_id = CELL_PAD_PCLASS_TYPE_NAVIGATION,
-			.vendor_id = vendor_id::sony_corp,
-			.product_id = product_id::ps_move_navigation,
-			.pclass_profile = 0x0,
-			.capabilites = CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_HP_ANALOG_STICK | CELL_PAD_CAPABILITY_ACTUATOR | CELL_PAD_CAPABILITY_SENSOR_MODE
-		}
-	},
-	{
-		product_type::ride_skateboard,
-		{
-			.type = product_type::ride_skateboard,
-			.class_id = CELL_PAD_PCLASS_TYPE_SKATEBOARD,
-			.vendor_id = vendor_id::sony_cea,
-			.product_id = product_id::ride_skateboard,
-			.pclass_profile = 0x0,
-			.capabilites = CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_SENSOR_MODE
-		}
-	},
-	{
-		product_type::guncon_3,
-		{
-			.type = product_type::guncon_3,
-			.class_id = CELL_PAD_FAKE_TYPE_GUNCON3,
-			.vendor_id = vendor_id::namco,
-			.product_id = product_id::guncon_3,
-			.pclass_profile = 0x0,
-			.capabilites = 0x0
-		}
-	},
-	{
-		product_type::top_shot_elite,
-		{
-			.type = product_type::top_shot_elite,
-			.class_id = CELL_PAD_FAKE_TYPE_TOP_SHOT_ELITE,
-			.vendor_id = vendor_id::sony_cea,
-			.product_id = product_id::top_shot_elite,
-			.pclass_profile = 0x0,
-			.capabilites = 0x0
-		}
-	},
-	{
-		product_type::top_shot_fearmaster,
-		{
-			.type = product_type::top_shot_fearmaster,
-			.class_id = CELL_PAD_FAKE_TYPE_TOP_SHOT_FEARMASTER,
-			.vendor_id = vendor_id::sony_cea,
-			.product_id = product_id::top_shot_fearmaster,
-			.pclass_profile = 0x0,
-			.capabilites = 0x0
-		}
-	},
-	{
-		product_type::udraw_gametablet,
-		{
-			.type = product_type::udraw_gametablet,
-			.class_id = CELL_PAD_FAKE_TYPE_GAMETABLET,
-			.vendor_id = vendor_id::bda,
-			.product_id = product_id::udraw_gametablet,
-			.pclass_profile = 0x0,
-			.capabilites = 0x0
-		}
-	}
-	};
-
-	product_info get_product_info(product_type type)
-	{
-		return input_products.at(type);
-	}
-
-	product_type get_product_by_vid_pid(u16 vendor_id, u16 product_id)
-	{
-		for (const auto& [type, product] : input_products)
-		{
-			if (product.vendor_id == vendor_id && product.product_id == product_id)
-				return type;
-		}
-		return product_type::playstation_3_controller;
-	}
-
-	std::vector<product_info> get_products_by_class(int class_id)
-	{
-		if (class_id >= CELL_PAD_FAKE_TYPE_COPILOT_1 && class_id <= CELL_PAD_FAKE_TYPE_COPILOT_7)
-		{
-			class_id = CELL_PAD_PCLASS_TYPE_STANDARD;
-		}
-
-		std::vector<product_info> ret;
-		for (const auto& [type, product] : input_products)
-		{
-			if (product.class_id == class_id)
-				ret.push_back(product);
-		}
-		return ret;
-	}
-}
diff --git a/rpcs3/Input/product_info.h b/rpcs3/Input/product_info.h
index 82f397d2b6..dfa30d189a 100644
--- a/rpcs3/Input/product_info.h
+++ b/rpcs3/Input/product_info.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vector>
-#include "util/types.hpp"
 
 namespace input
 {
@@ -15,54 +14,132 @@ namespace input
 		harmonix_rockband_guitar,
 		harmonix_rockband_drum_kit,
 		harmonix_rockband_drum_kit_2,
-		rock_revolution_drum_kit,
-		ps_move_navigation,
-		ride_skateboard,
-		guncon_3,
-		top_shot_elite,
-		top_shot_fearmaster,
-		udraw_gametablet,
+		rock_revolution_drum_kit
 	};
 
 	enum vendor_id
 	{
 		sony_corp = 0x054C, // Sony Corp.
-		namco     = 0x0B9A, // Namco
 		sony_cea  = 0x12BA, // Sony Computer Entertainment America
 		konami_de = 0x1CCF, // Konami Digital Entertainment
-		bda       = 0x20D6, // Bensussen Deutsch & Associates
 	};
 
 	enum product_id
 	{
 		red_octane_gh_guitar         = 0x0100, // RedOctane Guitar (Guitar Hero 4 Guitar Controller)
 		red_octane_gh_drum_kit       = 0x0120, // RedOctane Drum Kit (Guitar Hero 4 Drum Controller)
+		dance_dance_revolution_mat   = 0x0140, // Dance Dance Revolution Dance Mat Controller
 		dj_hero_turntable            = 0x0140, // DJ Hero Turntable Controller
 		harmonix_rockband_guitar     = 0x0200, // Harmonix Guitar (Rock Band II Guitar Controller)
 		harmonix_rockband_drum_kit   = 0x0210, // Harmonix Drum Kit (Rock Band II Drum Controller)
 		harmonix_rockband_drum_kit_2 = 0x0218, // Harmonix Pro-Drum Kit (Rock Band III Pro-Drum Controller)
 		playstation_3_controller     = 0x0268, // PlayStation 3 Controller
 		rock_revolution_drum_kit     = 0x0300, // Rock Revolution Drum Controller
-		ps_move_navigation           = 0x042F, // PlayStation Move navigation controller
-		dance_dance_revolution_mat   = 0x1010, // Dance Dance Revolution Dance Mat Controller
-		ride_skateboard              = 0x0400, // Tony Hawk RIDE Skateboard Controller
-		top_shot_elite               = 0x04A0, // Top Shot Elite Controller
-		top_shot_fearmaster          = 0x04A1, // Top Shot Fearmaster Controller
-		guncon_3                     = 0x0800, // GunCon 3 Controller
-		udraw_gametablet             = 0xCB17, // uDraw GameTablet Controller
 	};
 
 	struct product_info
 	{
 		product_type type;
-		u16 class_id;
-		u16 vendor_id;
-		u16 product_id;
-		u32 pclass_profile; // See CELL_PAD_PCLASS_PROFILE flags
-		u32 capabilites; // See CELL_PAD_CAPABILITY flags
+		unsigned short vendor_id;
+		unsigned short product_id;
+		unsigned int pclass_profile; // See CELL_PAD_PCLASS_PROFILE flags
 	};
 
-	product_info get_product_info(product_type type);
-	product_type get_product_by_vid_pid(u16 vid, u16 pid);
-	std::vector<product_info> get_products_by_class(int class_id);
-}
+	inline product_info get_product_info(product_type type)
+	{
+		switch (type)
+		{
+		case product_type::dance_dance_revolution_mat:
+		{
+			return product_info{ type, vendor_id::konami_de, product_id::dance_dance_revolution_mat, 0x000000FF };
+		}
+		case product_type::dj_hero_turntable:
+		{
+			return product_info{ type, vendor_id::sony_cea, product_id::dj_hero_turntable, 0x000007FF };
+		}
+		case product_type::harmonix_rockband_drum_kit:
+		{
+			return product_info{ type, vendor_id::sony_cea, product_id::harmonix_rockband_drum_kit, 0x000000FF };
+		}
+		case product_type::harmonix_rockband_drum_kit_2:
+		{
+			return product_info{ type, vendor_id::sony_cea, product_id::harmonix_rockband_drum_kit_2, 0x000000BF };
+		}
+		case product_type::harmonix_rockband_guitar:
+		{
+			return product_info{ type, vendor_id::sony_cea, product_id::harmonix_rockband_guitar, 0x00007FFF };
+		}
+		case product_type::red_octane_gh_drum_kit:
+		{
+			return product_info{ type, vendor_id::sony_cea, product_id::red_octane_gh_drum_kit, 0x000000BB };
+		}
+		case product_type::red_octane_gh_guitar:
+		{
+			return product_info{ type, vendor_id::sony_cea, product_id::red_octane_gh_guitar, 0x000000FF };
+		}
+		case product_type::rock_revolution_drum_kit:
+		{
+			return product_info{ type, vendor_id::sony_cea, product_id::rock_revolution_drum_kit, 0x000000FB };
+		}
+		case product_type::playstation_3_controller:
+		default: // GCC doesn't like it when there is no return value if if all enum values are covered
+		{
+			return product_info{ type, vendor_id::sony_corp, product_id::playstation_3_controller, 0x0 };
+		}
+		}
+	}
+
+	inline std::vector<product_info> get_products_by_class(int class_id)
+	{
+		switch (class_id)
+		{
+		default:
+		case 0: // CELL_PAD_PCLASS_TYPE_STANDARD
+		{
+			return
+			{
+				get_product_info(product_type::playstation_3_controller)
+			};
+		}
+		case 1: // CELL_PAD_PCLASS_TYPE_GUITAR
+		{
+			return
+			{
+				get_product_info(product_type::red_octane_gh_guitar),
+				get_product_info(product_type::harmonix_rockband_guitar)
+			};
+		}
+		case 2: // CELL_PAD_PCLASS_TYPE_DRUM
+		{
+			return
+			{
+				get_product_info(product_type::red_octane_gh_drum_kit),
+				get_product_info(product_type::harmonix_rockband_drum_kit),
+				get_product_info(product_type::harmonix_rockband_drum_kit_2),
+				get_product_info(product_type::rock_revolution_drum_kit)
+			};
+		}
+		case 3: // CELL_PAD_PCLASS_TYPE_DJ
+		{
+			return
+			{
+				get_product_info(product_type::dj_hero_turntable)
+			};
+		}
+		case 4: // CELL_PAD_PCLASS_TYPE_DANCEMAT
+		{
+			return
+			{
+				get_product_info(product_type::dance_dance_revolution_mat)
+			};
+		}
+		case 5: // CELL_PAD_PCLASS_TYPE_NAVIGATION
+		{
+			return
+			{
+				get_product_info(product_type::playstation_3_controller)
+			};
+		}
+		}
+	}
+};
diff --git a/rpcs3/Input/ps_move_calibration.cpp b/rpcs3/Input/ps_move_calibration.cpp
deleted file mode 100644
index bac042de66..0000000000
--- a/rpcs3/Input/ps_move_calibration.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-#include "stdafx.h"
-#include "ps_move_calibration.h"
-
-LOG_CHANNEL(move_log, "Move");
-
-// This is basically the same as in ps move api
-
-static inline s32 psmove_calibration_decode_16bit_unsigned(const u8* data, u32 offset)
-{
-	const u8 low = data[offset] & 0xFF;
-	const u8 high = (data[offset + 1]) & 0xFF;
-	return (low | (high << 8)) - zero_shift;
-}
-
-static inline s16 psmove_calibration_decode_16bit_signed(const u8* data, u32 offset)
-{
-	const u16 low = data[offset] & 0xFF;
-	const u16 high = (data[offset + 1]) & 0xFF;
-	return static_cast<s16>(low | (high << 8));
-}
-
-static inline u32 psmove_calibration_decode_12bits(const u8* data, u32 offset)
-{
-	const u8 low = data[offset] & 0xFF;
-	const u8 high = (data[offset + 1]) & 0xFF;
-	return low | (high << 8);
-}
-
-static inline f32 psmove_calibration_decode_float(const u8* data, u32 offset)
-{
-	union
-	{
-		uint32_t u32;
-		float f;
-	} v {
-		.u32 = static_cast<u32>( (data[offset]     & 0xFF) |
-		                        ((data[offset + 1] & 0xFF) << 8) |
-		                        ((data[offset + 2] & 0xFF) << 16) |
-		                        ((data[offset + 3] & 0xFF) << 24))
-	};
-
-	return v.f;
-}
-
-static void psmove_dump_calibration(const reports::ps_move_calibration_blob& calibration, const ps_move_device& device)
-{
-	int t, x, y, z;
-	float fx, fy, fz;
-
-	const u8* data = calibration.data.data();
-
-	std::string msg;
-
-	switch (device.model)
-	{
-	case ps_move_model::ZCM1:
-		t = psmove_calibration_decode_12bits(data, 0x02);
-		fmt::append(msg, "Temperature: 0x%04X\n", t);
-		for (int orientation = 0; orientation < 6; orientation++)
-		{
-			x = psmove_calibration_decode_16bit_unsigned(data, 0x04 + 6 * orientation);
-			y = psmove_calibration_decode_16bit_unsigned(data, 0x04 + 6 * orientation + 2);
-			z = psmove_calibration_decode_16bit_unsigned(data, 0x04 + 6 * orientation + 4);
-			fmt::append(msg, "Orientation #%d:      (%5d | %5d | %5d)\n", orientation, x, y, z);
-		}
-
-		t = psmove_calibration_decode_12bits(data, 0x42);
-		fmt::append(msg, "Temperature: 0x%04X\n", t);
-		for (int orientation = 0; orientation < 3; orientation++)
-		{
-			x = psmove_calibration_decode_16bit_unsigned(data, 0x46 + 8 * orientation);
-			y = psmove_calibration_decode_16bit_unsigned(data, 0x46 + 8 * orientation + 2);
-			z = psmove_calibration_decode_16bit_unsigned(data, 0x46 + 8 * orientation + 4);
-			fmt::append(msg, "Gyro %c, 80 rpm:      (%5d | %5d | %5d)\n", "XYZ"[orientation], x, y, z);
-		}
-
-		t = psmove_calibration_decode_12bits(data, 0x28);
-		x = psmove_calibration_decode_16bit_unsigned(data, 0x2a);
-		y = psmove_calibration_decode_16bit_unsigned(data, 0x2a + 2);
-		z = psmove_calibration_decode_16bit_unsigned(data, 0x2a + 4);
-		fmt::append(msg, "Temperature: 0x%04X\n", t);
-		fmt::append(msg, "Gyro, 0 rpm (@0x2a): (%5d | %5d | %5d)\n", x, y, z);
-
-		t = psmove_calibration_decode_12bits(data, 0x30);
-		x = psmove_calibration_decode_16bit_unsigned(data, 0x32);
-		y = psmove_calibration_decode_16bit_unsigned(data, 0x32 + 2);
-		z = psmove_calibration_decode_16bit_unsigned(data, 0x32 + 4);
-		fmt::append(msg, "Temperature: 0x%04X\n", t);
-		fmt::append(msg, "Gyro, 0 rpm (@0x32): (%5d | %5d | %5d)\n", x, y, z);
-
-		t = psmove_calibration_decode_12bits(data, 0x5c);
-		fx = psmove_calibration_decode_float(data, 0x5e);
-		fy = psmove_calibration_decode_float(data, 0x5e + 4);
-		fz = psmove_calibration_decode_float(data, 0x5e + 8);
-		fmt::append(msg, "Temperature: 0x%04X\n", t);
-		fmt::append(msg, "Vector @0x5e: (%f | %f | %f)\n", fx, fy, fz);
-
-		fx = psmove_calibration_decode_float(data, 0x6a);
-		fy = psmove_calibration_decode_float(data, 0x6a + 4);
-		fz = psmove_calibration_decode_float(data, 0x6a + 8);
-		fmt::append(msg, "Vector @0x6a: (%f | %f | %f)\n", fx, fy, fz);
-
-		fmt::append(msg, "byte @0x3f:  0x%02x\n", static_cast<u8>(data[0x3f]));
-		fmt::append(msg, "float @0x76: %f\n", psmove_calibration_decode_float(data, 0x76));
-		fmt::append(msg, "float @0x7a: %f\n", psmove_calibration_decode_float(data, 0x7a));
-		break;
-	case ps_move_model::ZCM2:
-		for (int orientation = 0; orientation < 6; orientation++)
-		{
-			x = psmove_calibration_decode_16bit_signed(data, 0x04 + 6 * orientation);
-			y = psmove_calibration_decode_16bit_signed(data, 0x04 + 6 * orientation + 2);
-			z = psmove_calibration_decode_16bit_signed(data, 0x04 + 6 * orientation + 4);
-			fmt::append(msg, "Orientation #%d:      (%5d | %5d | %5d)\n", orientation, x, y, z);
-		}
-
-		x = psmove_calibration_decode_16bit_signed(data, 0x26);
-		y = psmove_calibration_decode_16bit_signed(data, 0x26 + 2);
-		z = psmove_calibration_decode_16bit_signed(data, 0x26 + 4);
-		fmt::append(msg, "Gyro Bias?, 0 rpm (@0x26): (%5d | %5d | %5d)\n", x, y, z);
-
-		for (int orientation = 0; orientation < 6; orientation++)
-		{
-			x = psmove_calibration_decode_16bit_signed(data, 0x30 + 6 * orientation);
-			y = psmove_calibration_decode_16bit_signed(data, 0x30 + 6 * orientation + 2);
-			z = psmove_calibration_decode_16bit_signed(data, 0x30 + 6 * orientation + 4);
-			fmt::append(msg, "Gyro %c, 90 rpm:      (%5d | %5d | %5d)\n", "XYZXYZ"[orientation], x, y, z);
-		}
-		break;
-	}
-
-	move_log.notice("Calibration:\n%s", msg);
-}
-
-void psmove_calibration_get_usb_accel_values(const reports::ps_move_calibration_blob& calibration, ps_move_device& device)
-{
-	const u8* data = calibration.data.data();
-
-	int x1 = 0, x2 = 0, y1 = 0, y2 = 0, z1 = 0, z2 = 0;
-
-	switch (device.model)
-	{
-	case ps_move_model::ZCM1:
-		// Minimum (negative) value of each axis
-		x1 = psmove_calibration_decode_16bit_unsigned(data, 0x04 + 6 * 1);
-		y1 = psmove_calibration_decode_16bit_unsigned(data, 0x04 + 6 * 5 + 2);
-		z1 = psmove_calibration_decode_16bit_unsigned(data, 0x04 + 6 * 2 + 4);
-
-		// Maximum (positive) value of each axis
-		x2 = psmove_calibration_decode_16bit_unsigned(data, 0x04 + 6 * 3);
-		y2 = psmove_calibration_decode_16bit_unsigned(data, 0x04 + 6 * 4 + 2);
-		z2 = psmove_calibration_decode_16bit_unsigned(data, 0x04 + 6 * 0 + 4);
-		break;
-	case ps_move_model::ZCM2:
-		// Minimum (negative) value of each axis
-		x1 = psmove_calibration_decode_16bit_signed(data, 0x02 + 6 * 1);
-		y1 = psmove_calibration_decode_16bit_signed(data, 0x02 + 6 * 3 + 2);
-		z1 = psmove_calibration_decode_16bit_signed(data, 0x02 + 6 * 5 + 4);
-
-		// Maximum (positive) value of each axis
-		x2 = psmove_calibration_decode_16bit_signed(data, 0x02 + 6 * 0);
-		y2 = psmove_calibration_decode_16bit_signed(data, 0x02 + 6 * 2 + 2);
-		z2 = psmove_calibration_decode_16bit_signed(data, 0x02 + 6 * 4 + 4);
-		break;
-	}
-
-	device.calibration.accel_x_factor = 2.0f / static_cast<float>(x2 - x1);
-	device.calibration.accel_y_factor = 2.0f / static_cast<float>(y2 - y1);
-	device.calibration.accel_z_factor = 2.0f / static_cast<float>(z2 - z1);
-
-	device.calibration.accel_x_offset = -(device.calibration.accel_x_factor * static_cast<float>(x1)) - 1.0f;
-	device.calibration.accel_y_offset = -(device.calibration.accel_y_factor * static_cast<float>(x1)) - 1.0f;
-	device.calibration.accel_z_offset = -(device.calibration.accel_z_factor * static_cast<float>(x1)) - 1.0f;
-}
-
-void psmove_calibration_get_usb_gyro_values(const reports::ps_move_calibration_blob& calibration, ps_move_device& device)
-{
-	const u8* data = calibration.data.data();
-
-	constexpr f32 PI = 3.14159265f;
-	constexpr f32 rpm_to_rad_per_sec = (2.0f * PI) / 60.0f;
-
-	switch (device.model)
-	{
-	case ps_move_model::ZCM1:
-	{
-		const int bx = psmove_calibration_decode_16bit_unsigned(data, 0x2a);
-		const int by = psmove_calibration_decode_16bit_unsigned(data, 0x2a + 2);
-		const int bz = psmove_calibration_decode_16bit_unsigned(data, 0x2a + 4);
-
-		const int x = psmove_calibration_decode_16bit_unsigned(data, 0x46 + 8 * 0) - bx;
-		const int y = psmove_calibration_decode_16bit_unsigned(data, 0x46 + 8 * 1 + 2) - by;
-		const int z = psmove_calibration_decode_16bit_unsigned(data, 0x46 + 8 * 2 + 4) - bz;
-
-		constexpr f32 calibration_rpm = 80.0f;
-		constexpr f32 factor = calibration_rpm * rpm_to_rad_per_sec;
-
-		// Per frame drift taken into account using adjusted gain values
-		device.calibration.gyro_x_gain = factor / static_cast<float>(x);
-		device.calibration.gyro_y_gain = factor / static_cast<float>(y);
-		device.calibration.gyro_z_gain = factor / static_cast<float>(z);
-		device.calibration.gyro_x_offset = 0;
-		device.calibration.gyro_y_offset = 0;
-		device.calibration.gyro_z_offset = 0;
-		break;
-	}
-	case ps_move_model::ZCM2:
-	{
-		// Minimum (negative) value of each axis
-		const int x1 = psmove_calibration_decode_16bit_signed(data, 0x30 + 6 * 3);
-		const int y1 = psmove_calibration_decode_16bit_signed(data, 0x30 + 6 * 4 + 2);
-		const int z1 = psmove_calibration_decode_16bit_signed(data, 0x30 + 6 * 5 + 4);
-
-		// Maximum (positive) values of each axis
-		const int x2 = psmove_calibration_decode_16bit_signed(data, 0x30 + 6 * 0);
-		const int y2 = psmove_calibration_decode_16bit_signed(data, 0x30 + 6 * 1 + 2);
-		const int z2 = psmove_calibration_decode_16bit_signed(data, 0x30 + 6 * 2 + 4);
-
-		const int dx = psmove_calibration_decode_16bit_signed(data, 0x26);
-		const int dy = psmove_calibration_decode_16bit_signed(data, 0x26 + 2);
-		const int dz = psmove_calibration_decode_16bit_signed(data, 0x26 + 4);
-
-		constexpr f32 calibration_rpm = 90.0f;
-		constexpr f32 calibration_hi = calibration_rpm * rpm_to_rad_per_sec;
-		constexpr f32 calibration_low = -calibration_rpm * rpm_to_rad_per_sec;
-		constexpr f32 factor = calibration_hi - calibration_low;
-
-		// Compute the gain value (the slope of the gyro reading/angular speed line)
-		device.calibration.gyro_x_gain = factor / static_cast<f32>(x2 - x1);
-		device.calibration.gyro_y_gain = factor / static_cast<f32>(y2 - y1);
-		device.calibration.gyro_z_gain = factor / static_cast<f32>(z2 - z1);
-		device.calibration.gyro_x_offset = static_cast<f32>(dx);
-		device.calibration.gyro_y_offset = static_cast<f32>(dy);
-		device.calibration.gyro_z_offset = static_cast<f32>(dz);
-		break;
-	}
-	}
-}
-
-void psmove_parse_calibration(const reports::ps_move_calibration_blob& calibration, ps_move_device& device)
-{
-	psmove_dump_calibration(calibration, device);
-	psmove_calibration_get_usb_accel_values(calibration, device);
-	psmove_calibration_get_usb_gyro_values(calibration, device);
-}
diff --git a/rpcs3/Input/ps_move_calibration.h b/rpcs3/Input/ps_move_calibration.h
deleted file mode 100644
index a1e362fa9f..0000000000
--- a/rpcs3/Input/ps_move_calibration.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "ps_move_handler.h"
-
-void psmove_parse_calibration(const reports::ps_move_calibration_blob& calibration, ps_move_device& device);
diff --git a/rpcs3/Input/ps_move_config.cpp b/rpcs3/Input/ps_move_config.cpp
deleted file mode 100644
index bb9daa528a..0000000000
--- a/rpcs3/Input/ps_move_config.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "stdafx.h"
-#include "ps_move_config.h"
-
-LOG_CHANNEL(ps_move);
-
-cfg_ps_moves g_cfg_move;
-
-cfg_ps_moves::cfg_ps_moves()
-	: cfg::node()
-	, path(fs::get_config_dir(true) + "ps_move.yml")
-{
-}
-
-bool cfg_ps_moves::load()
-{
-	ps_move.notice("Loading PS Move config from '%s'", path);
-
-	if (fs::file cfg_file{ path, fs::read })
-	{
-		return from_string(cfg_file.to_string());
-	}
-
-	ps_move.notice("PS Move config missing. Using default settings. Path: %s", path);
-	from_default();
-	return false;
-}
-
-void cfg_ps_moves::save() const
-{
-	ps_move.notice("Saving PS Move config to '%s'", path);
-
-	if (!cfg::node::save(path))
-	{
-		ps_move.error("Failed to save PS Move config to '%s' (error=%s)", path, fs::g_tls_error);
-	}
-}
diff --git a/rpcs3/Input/ps_move_config.h b/rpcs3/Input/ps_move_config.h
deleted file mode 100644
index 3fbae71dab..0000000000
--- a/rpcs3/Input/ps_move_config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include "Utilities/Config.h"
-
-#include <array>
-
-struct cfg_ps_move final : cfg::node
-{
-	cfg_ps_move() : cfg::node() {}
-	cfg_ps_move(cfg::node* owner, std::string name) : cfg::node(owner, std::move(name)) {}
-
-	cfg::uint<0, 255> r{ this, "Color R", 0, true };
-	cfg::uint<0, 255> g{ this, "Color G", 0, true };
-	cfg::uint<0, 255> b{ this, "Color B", 0, true };
-	cfg::uint<0, 359> hue{ this, "Hue", 0, true };
-	cfg::uint<0, 180> hue_threshold{ this, "Hue Threshold", 10, true };
-	cfg::uint<0, 255> saturation_threshold{ this, "Saturation Threshold", 10, true };
-};
-
-struct cfg_ps_moves final : cfg::node
-{
-	cfg_ps_moves();
-
-	cfg_ps_move move1{ this, "PS Move 1" };
-	cfg_ps_move move2{ this, "PS Move 2" };
-	cfg_ps_move move3{ this, "PS Move 3" };
-	cfg_ps_move move4{ this, "PS Move 4" };
-
-	cfg::_float<0, 50> min_radius{ this, "Minimum Radius", 1.0f, true }; // Percentage of image width
-	cfg::_float<0, 50> max_radius{ this, "Maximum Radius", 10.0f, true }; // Percentage of image width
-
-	std::array<cfg_ps_move*, 4> move{ &move1, &move2, &move3, &move4 };
-
-	const std::string path;
-
-	bool load();
-	void save() const;
-};
-
-extern cfg_ps_moves g_cfg_move;
diff --git a/rpcs3/Input/ps_move_handler.cpp b/rpcs3/Input/ps_move_handler.cpp
deleted file mode 100644
index d5c87f7a21..0000000000
--- a/rpcs3/Input/ps_move_handler.cpp
+++ /dev/null
@@ -1,875 +0,0 @@
-#include "stdafx.h"
-#include "ps_move_handler.h"
-#include "ps_move_calibration.h"
-#include "Emu/Io/pad_config.h"
-#include "Emu/Cell/Modules/cellGem.h"
-
-LOG_CHANNEL(move_log, "Move");
-
-using namespace reports;
-
-namespace
-{
-	constexpr id_pair MOVE_ID_ZCM1 = {0x054C, 0x03D5};
-	constexpr id_pair MOVE_ID_ZCM2 = {0x054C, 0x0c5e};
-
-	enum button_flags : u16
-	{
-		select   = 0x01,
-		start    = 0x08,
-		triangle = 0x10,
-		circle   = 0x20,
-		cross    = 0x40,
-		square   = 0x80,
-		ps       = 0x0001,
-		move     = 0x4008,
-		t        = 0x8010,
-		ext_dev  = 0x1000,
-
-		// Sharpshooter
-		ss_firing_mode_1 = 0x01,
-		ss_firing_mode_2 = 0x02,
-		ss_firing_mode_3 = 0x04,
-		ss_trigger       = 0x40,
-		ss_reload        = 0x80,
-
-		// Racing Wheel
-		rw_d_pad_up    = 0x10,
-		rw_d_pad_right = 0x20,
-		rw_d_pad_down  = 0x40,
-		rw_d_pad_left  = 0x80,
-		rw_l1          = 0x04,
-		rw_r1          = 0x08,
-		rw_paddle_l    = 0x01,
-		rw_paddle_r    = 0x02,
-	};
-
-	enum battery_status : u8
-	{
-		charge_empty = 0x00,
-		charge_1     = 0x01,
-		charge_2     = 0x02,
-		charge_3     = 0x03,
-		charge_4     = 0x04,
-		charge_full  = 0x05,
-		usb_charging = 0xEE,
-		usb_charged  = 0xEF,
-	};
-}
-
-const ps_move_input_report_common& ps_move_device::input_report_common() const
-{
-	switch (model)
-	{
-	default:
-	case ps_move_model::ZCM1:
-	{
-		return input_report_ZCM1.common;
-	}
-	case ps_move_model::ZCM2:
-	{
-		return input_report_ZCM2.common;
-	}
-	}
-}
-
-ps_move_handler::ps_move_handler()
-    : hid_pad_handler<ps_move_device>(pad_handler::move, { MOVE_ID_ZCM1, MOVE_ID_ZCM2 })
-{
-	// Unique names for the config files and our pad settings dialog
-	button_list =
-	{
-		{ ps_move_key_codes::none,          "" },
-		{ ps_move_key_codes::cross,         "Cross" },
-		{ ps_move_key_codes::square,        "Square" },
-		{ ps_move_key_codes::circle,        "Circle" },
-		{ ps_move_key_codes::triangle,      "Triangle" },
-		{ ps_move_key_codes::start,         "Start" },
-		{ ps_move_key_codes::select,        "Select" },
-		{ ps_move_key_codes::ps,            "PS" },
-		{ ps_move_key_codes::move,          "Move" },
-		{ ps_move_key_codes::t,             "T" },
-		{ ps_move_key_codes::firing_mode_1, "Firing Mode 1" },
-		{ ps_move_key_codes::firing_mode_2, "Firing Mode 2" },
-		{ ps_move_key_codes::firing_mode_3, "Firing Mode 3" },
-		{ ps_move_key_codes::reload,        "Reload" },
-		{ ps_move_key_codes::dpad_up,       "D-Pad Up" },
-		{ ps_move_key_codes::dpad_down,     "D-Pad Down" },
-		{ ps_move_key_codes::dpad_left,     "D-Pad Left" },
-		{ ps_move_key_codes::dpad_right,    "D-Pad Right" },
-		{ ps_move_key_codes::L1,            "L1" },
-		{ ps_move_key_codes::R1,            "R1" },
-		{ ps_move_key_codes::L2,            "L2" },
-		{ ps_move_key_codes::R2,            "R2" },
-		{ ps_move_key_codes::throttle,      "Throttle" },
-		{ ps_move_key_codes::paddle_left,   "Paddle Left" },
-		{ ps_move_key_codes::paddle_right,  "Paddle Right" },
-	};
-
-	init_configs();
-
-	// Define border values
-	thumb_max = 255;
-	trigger_min = 0;
-	trigger_max = 255;
-
-	// Set capabilities
-	b_has_config = true;
-	b_has_rumble = true;
-	b_has_motion = true;
-	b_has_deadzones = true;
-	b_has_led = true;
-	b_has_rgb = true;
-	b_has_player_led = false;
-	b_has_battery = true;
-	b_has_battery_led = false;
-	b_has_pressure_intensity_button = false;
-	b_has_orientation = true;
-
-	m_name_string = "PS Move #";
-	m_max_devices = 4; // CELL_GEM_MAX_NUM
-
-	m_trigger_threshold = trigger_max / 2;
-	m_thumb_threshold   = thumb_max / 2;
-}
-
-ps_move_handler::~ps_move_handler()
-{
-}
-
-void ps_move_handler::init_config(cfg_pad* cfg)
-{
-	if (!cfg) return;
-
-	// Set default button mapping
-	cfg->ls_left.def  = ::at32(button_list, ps_move_key_codes::none);
-	cfg->ls_down.def  = ::at32(button_list, ps_move_key_codes::none);
-	cfg->ls_right.def = ::at32(button_list, ps_move_key_codes::none);
-	cfg->ls_up.def    = ::at32(button_list, ps_move_key_codes::none);
-	cfg->rs_left.def  = ::at32(button_list, ps_move_key_codes::none);
-	cfg->rs_down.def  = ::at32(button_list, ps_move_key_codes::none);
-	cfg->rs_right.def = ::at32(button_list, ps_move_key_codes::none);
-	cfg->rs_up.def    = ::at32(button_list, ps_move_key_codes::none);
-	cfg->start.def    = ::at32(button_list, ps_move_key_codes::start);
-	cfg->select.def   = ::at32(button_list, ps_move_key_codes::select);
-	cfg->ps.def       = ::at32(button_list, ps_move_key_codes::ps);
-	cfg->square.def   = ::at32(button_list, ps_move_key_codes::square);
-	cfg->cross.def    = ::at32(button_list, ps_move_key_codes::cross);
-	cfg->circle.def   = ::at32(button_list, ps_move_key_codes::circle);
-	cfg->triangle.def = ::at32(button_list, ps_move_key_codes::triangle);
-	cfg->left.def     = ::at32(button_list, ps_move_key_codes::none);
-	cfg->down.def     = ::at32(button_list, ps_move_key_codes::none);
-	cfg->right.def    = ::at32(button_list, ps_move_key_codes::none);
-	cfg->up.def       = ::at32(button_list, ps_move_key_codes::none);
-	cfg->r1.def       = ::at32(button_list, ps_move_key_codes::move);
-	cfg->r2.def       = ::at32(button_list, ps_move_key_codes::t);
-	cfg->r3.def       = ::at32(button_list, ps_move_key_codes::none);
-	cfg->l1.def       = ::at32(button_list, ps_move_key_codes::none);
-	cfg->l2.def       = ::at32(button_list, ps_move_key_codes::none);
-	cfg->l3.def       = ::at32(button_list, ps_move_key_codes::none);
-
-	cfg->orientation_reset_button.def = ::at32(button_list, ps_move_key_codes::none);
-
-	// Set default misc variables
-	cfg->lstickdeadzone.def    = 40; // between 0 and 255
-	cfg->rstickdeadzone.def    = 40; // between 0 and 255
-	cfg->ltriggerthreshold.def = 0;  // between 0 and 255
-	cfg->rtriggerthreshold.def = 0;  // between 0 and 255
-
-	// apply defaults
-	cfg->from_default();
-}
-
-#ifdef _WIN32
-hid_device* ps_move_handler::connect_move_device(ps_move_device* device, std::string_view path)
-{
-	if (!device)
-	{
-		return nullptr;
-	}
-
-	// Windows enumerates 3 ps move devices: Col01, Col02, and Col03.
-	// We use Col01 for data and Col02 for bluetooth.
-	// Our enumerated paths are filtered and only contain Col01.
-	// We open Col02 first, and then Col01. Col02 is unused for now.
-
-	static const std::string col01 = "&Col01#";
-	static const std::string number = "&0000#";
-
-	std::string col02_path { path };
-	col02_path.replace(path.find(col01), col01.size(), "&Col02#");
-	col02_path.replace(path.find(number), number.size(), "&0001#");
-
-	// Open Col02
-	device->bt_device = hid_open_path(col02_path.c_str());
-	if (!device->bt_device)
-	{
-		move_log.error("%s hid_open_path failed! error='%s', path='%s'", m_type, hid_error(device->bt_device), col02_path);
-		return nullptr;
-	}
-
-	if (const hid_device_info* info = hid_get_device_info(device->bt_device))
-	{
-		move_log.notice("%s adding bt device: vid=0x%x, pid=0x%x, path='%s'", m_type, info->vendor_id, info->product_id, col02_path);
-	}
-	else
-	{
-		move_log.warning("%s adding bt device: vid=N/A, pid=N/A, path='%s', error='%s'", m_type, col02_path, hid_error(device->bt_device));
-	}
-
-	if (hid_set_nonblocking(device->bt_device, 1) == -1)
-	{
-		move_log.error("connect_move_device: hid_set_nonblocking failed! Reason: %s", hid_error(device->bt_device));
-		device->close();
-		return nullptr;
-	}
-
-	// Open Col01
-	device->hidDevice = hid_open_path(path.data());
-	if (!device->hidDevice)
-	{
-		move_log.error("%s hid_open_path failed! error='%s', path='%s'", m_type, hid_error(device->bt_device), path);
-		device->close();
-		return nullptr;
-	}
-
-	if (hid_set_nonblocking(device->hidDevice, 1) == -1)
-	{
-		move_log.error("connect_move_device: hid_set_nonblocking failed! Reason: %s", hid_error(device->hidDevice));
-		device->close();
-		return nullptr;
-	}
-
-	if (const hid_device_info* info = hid_get_device_info(device->hidDevice))
-	{
-		move_log.notice("%s adding device: vid=0x%x, pid=0x%x, path='%s'", m_type, info->vendor_id, info->product_id, col02_path);
-
-		switch (info->product_id)
-		{
-		default:
-		case MOVE_ID_ZCM1.m_pid:
-			device->model = ps_move_model::ZCM1;
-			break;
-		case MOVE_ID_ZCM2.m_pid:
-			device->model = ps_move_model::ZCM2;
-			break;
-		}
-	}
-	else
-	{
-		move_log.warning("%s adding device: vid=N/A, pid=N/A, path='%s', error='%s'", m_type, col02_path, hid_error(device->hidDevice));
-		device->model = ps_move_model::ZCM1;
-	}
-
-	return device->hidDevice;
-}
-#endif
-
-void ps_move_handler::check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial)
-{
-#ifndef _WIN32
-	if (!hidDevice)
-	{
-		return;
-	}
-#endif
-
-	ps_move_device* device = nullptr;
-
-	for (auto& controller : m_controllers)
-	{
-		ensure(controller.second);
-
-		if (!controller.second->hidDevice)
-		{
-			device = controller.second.get();
-			break;
-		}
-	}
-
-	if (!device)
-	{
-		return;
-	}
-
-#ifdef _WIN32
-	hidDevice = connect_move_device(device, path);
-	if (!hidDevice)
-	{
-		device->close();
-		return;
-	}
-#else
-	if (hid_set_nonblocking(hidDevice, 1) == -1)
-	{
-		move_log.error("check_add_device: hid_set_nonblocking failed! Reason: %s", hid_error(hidDevice));
-		HidDevice::close(hidDevice);
-		return;
-	}
-#endif
-
-	device->hidDevice = hidDevice;
-	device->path = path;
-
-	// Get calibration
-	device->calibration.is_valid = true;
-
-	ps_move_calibration_blob calibration {};
-
-	for (int i = 0; i < 2; i++)
-	{
-		std::array<u8, PSMOVE_CALIBRATION_SIZE> cal {};
-		cal[0] = 0x10;
-		const int res = hid_get_feature_report(device->hidDevice, cal.data(), cal.size());
-		if (res < 0)
-		{
-			move_log.error("connect_move_device: hid_get_feature_report 0x10 (calibration) failed! result=%d, error=%s", res, hid_error(device->hidDevice));
-			device->calibration.is_valid = false;
-			break;
-		}
-
-		int src_offset = 0;
-		int dest_offset = 0;
-
-		if ((cal[1] == 0x01 && device->model == ps_move_model::ZCM1) ||
-			(cal[1] == 0x81 && device->model == ps_move_model::ZCM2))
-		{
-			// This is the second block
-			dest_offset = PSMOVE_CALIBRATION_SIZE;
-			src_offset = 2;
-		}
-		else if (cal[1] == 0x82 && device->model == ps_move_model::ZCM1)
-		{
-			// This is the third block
-			dest_offset = 2 * PSMOVE_CALIBRATION_SIZE - 2;
-			src_offset = 2;
-		}
-		else if (cal[1] != 0x00) // Check if this is the first block (offsets stay 0)
-		{
-			move_log.error("connect_move_device: Failed to read calibration: cal=0x%x'", cal[1]);
-			device->calibration.is_valid = false;
-			break;
-		}
-
-		std::memcpy(&calibration.data[dest_offset], &cal[src_offset], cal.size() - src_offset);
-	}
-
-	if (device->calibration.is_valid)
-	{
-		psmove_parse_calibration(calibration, *device);
-	}
-
-	// Activate
-	if (send_output_report(device) == -1)
-	{
-		move_log.error("check_add_device: send_output_report failed! Reason: %s", hid_error(hidDevice));
-	}
-
-	std::string serial;
-	for (wchar_t ch : wide_serial)
-		serial += static_cast<uchar>(ch);
-
-	move_log.success("Added device: serial='%s', path='%s'", serial, device->path);
-}
-
-ps_move_handler::DataStatus ps_move_handler::get_data(ps_move_device* device)
-{
-	if (!device)
-		return DataStatus::ReadError;
-
-	constexpr u8 reportId = 0x01;
-	void* report = nullptr;
-	usz report_size = 0;
-
-	switch (device->model)
-	{
-	case ps_move_model::ZCM1:
-		report = &device->input_report_ZCM1;
-		device->input_report_ZCM1.common.report_id = reportId;
-		report_size = sizeof(ps_move_input_report_ZCM1);
-		break;
-	case ps_move_model::ZCM2:
-		report = &device->input_report_ZCM2;
-		device->input_report_ZCM2.common.report_id = reportId;
-		report_size = sizeof(ps_move_input_report_ZCM2);
-		break;
-	}
-
-	std::vector<u8> buf(report_size);
-
-	int res = hid_read(device->hidDevice, buf.data(), report_size);
-	if (res < 0)
-	{
-		// looks like controller disconnected or read error
-		move_log.error("get_data: hid_read 0x%02x failed! result=%d, buf[0]=0x%x, error=%s", reportId, res, buf[0], hid_error(device->hidDevice));
-		return DataStatus::ReadError;
-	}
-
-	if (res != static_cast<int>(report_size))
-		return DataStatus::NoNewData;
-
-	if (std::memcmp(report, buf.data(), report_size) == 0)
-		return DataStatus::NoNewData;
-
-	// Get the new data
-	std::memcpy(report, buf.data(), report_size);
-
-	//move_log.error("%s", fmt::buf_to_hexstring(buf.data(), buf.size(), 64));
-
-	return DataStatus::NewData;
-}
-
-PadHandlerBase::connection ps_move_handler::update_connection(const std::shared_ptr<PadDevice>& device)
-{
-	ps_move_device* move_device = static_cast<ps_move_device*>(device.get());
-	if (!move_device || move_device->path == hid_enumerated_device_default)
-		return connection::disconnected;
-
-	if (move_device->hidDevice == nullptr)
-	{
-		// try to reconnect
-#ifdef _WIN32
-		if (hid_device* dev = connect_move_device(move_device, move_device->path))
-		{
-			move_device->hidDevice = dev;
-		}
-#else
-		if (hid_device* dev = move_device->open())
-		{
-			if (hid_set_nonblocking(dev, 1) == -1)
-			{
-				move_log.error("Reconnecting Device %s: hid_set_nonblocking failed with error %s", move_device->path, hid_error(dev));
-			}
-		}
-#endif
-		else
-		{
-			// nope, not there
-			move_log.error("Device %s: disconnected", move_device->path);
-			return connection::disconnected;
-		}
-	}
-
-	if (get_data(move_device) == DataStatus::ReadError)
-	{
-		// this also can mean disconnected, either way deal with it on next loop and reconnect
-		move_device->close();
-
-		return connection::no_data;
-	}
-
-	return connection::connected;
-}
-
-void ps_move_handler::handle_external_device(const pad_ensemble& binding)
-{
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
-	ps_move_device* dev = static_cast<ps_move_device*>(device.get());
-	if (!dev || !pad)
-		return;
-
-	auto& move_data = pad->move_data;
-
-	if (dev->model != ps_move_model::ZCM1)
-	{
-		move_data.external_device_read_requested = false;
-		move_data.external_device_write_requested = false;
-		return;
-	}
-
-	const ps_move_input_report_common& input = dev->input_report_common();
-	const u16 extra_buttons = input.sequence_number << 8 | input.buttons_3;
-
-	move_data.external_device_connected = !!(extra_buttons & button_flags::ext_dev);
-
-	if (!move_data.external_device_connected)
-	{
-		dev->external_device_id = move_data.external_device_id = 0;
-		std::memset(move_data.external_device_data.data(), 0, move_data.external_device_data.size());
-		move_data.external_device_read_requested = false;
-		move_data.external_device_write_requested = false;
-		return;
-	}
-
-	std::memcpy(move_data.external_device_data.data(), dev->input_report_ZCM1.ext_device_data.data(), dev->input_report_ZCM1.ext_device_data.size());
-
-	if (move_data.external_device_read_requested || move_data.external_device_id == 0)
-	{
-		bool success = false;
-
-		std::array<u8, 49> ext_buf{};
-		ext_buf[0x00] = 0xE0; // Report ID
-		ext_buf[0x01] = 0x01; // Read flag
-		ext_buf[0x02] = 0xA0; // Target extension device's I²C slave address
-		ext_buf[0x03] = 0x00; // Offset
-		ext_buf[0x04] = 0xFF; // Length
-
-		if (int res = hid_send_feature_report(dev->hidDevice, ext_buf.data(), ext_buf.size()); res != static_cast<int>(ext_buf.size()))
-		{
-			move_log.error("get_extended_info: hid_send_feature_report 0xE0 (external_device) failed! result=%d, ext_buf[0]=0x%x, error=%s", res, ext_buf[0], hid_error(dev->hidDevice));
-		}
-		else if (res = hid_get_feature_report(dev->hidDevice, ext_buf.data(), ext_buf.size()); res < 0)
-		{
-			move_log.error("get_extended_info: hid_get_feature_report 0xE0 (external_device) failed! result=%d, ext_buf[0]=0x%x, error=%s", res, ext_buf[0], hid_error(dev->hidDevice));
-		}
-		else if (ext_buf[0x01] != 0) // The result will hold an error flag at pos 0x01
-		{
-			move_log.error("get_extended_info: hid_get_feature_report 0xE0 (external_device) returned error: ext_buf[0x01]=0x%x, error=%s", ext_buf[0x01], hid_error(dev->hidDevice));
-		}
-		else
-		{
-			move_log.trace("get_extended_info: hid_get_feature_report 0xE0 got result: %s", fmt::buf_to_hexstring(ext_buf.data(), ext_buf.size(), 64));
-			success = true;
-		}
-
-		// Get device ID
-		const u32 old_id = dev->external_device_id;
-
-		// The result will be stored starting at pos 0x09
-		dev->external_device_id = move_data.external_device_id = (ext_buf[0x09] << 8) | ext_buf[0x0A];
-
-		if (dev->external_device_id != 0 && dev->external_device_id != old_id)
-		{
-			move_log.notice("get_extended_info: external device with ID 0x%x found", dev->external_device_id);
-		}
-
-		if (move_data.external_device_read_requested)
-		{
-			auto& dst = move_data.external_device_read;
-
-			if (success)
-			{
-				// Copy everything except device ID starting at pos 0x0B
-				ensure(ext_buf.size() == dst.size() + 0x0B);
-				std::memcpy(dst.data(), &ext_buf[0x0B], dst.size());
-			}
-			else
-			{
-				std::memset(dst.data(), 0, dst.size());
-			}
-		}
-	}
-
-	if (move_data.external_device_write_requested)
-	{
-		const auto& src = move_data.external_device_write;
-
-		std::array<u8, 49> ext_buf{};
-		ext_buf[0x00] = 0xE0; // Report ID
-		ext_buf[0x01] = 0x00; // Read flag
-		ext_buf[0x02] = 0xA0; // Target extension device's I²C slave address
-		ext_buf[0x03] = src[0];         // Control Byte
-		ext_buf[0x04] = static_cast<u8>(src.size() - 1); // Length
-
-		std::memcpy(&ext_buf[0x09], &src[1], src.size() - 1);
-
-		move_log.trace("ps_move_handler: trying to send data to external device: %s", fmt::buf_to_hexstring(ext_buf.data(), ext_buf.size(), 64));
-
-		if (const int res = hid_send_feature_report(dev->hidDevice, ext_buf.data(), ext_buf.size()); res < 0)
-		{
-			move_log.error("get_extended_info: hid_send_feature_report 0xE0 (external_device) failed! result=%d, ext_buf[0]=0x%x, error=%s", res, ext_buf[0], hid_error(dev->hidDevice));
-		}
-	}
-
-	move_data.external_device_read_requested = false;
-	move_data.external_device_write_requested = false;
-}
-
-bool ps_move_handler::get_is_left_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
-{
-	// We also report the T button as left trigger
-	return keyCode == ps_move_key_codes::L2 || keyCode == ps_move_key_codes::t;
-}
-
-bool ps_move_handler::get_is_right_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
-{
-	// We also report the Throttle button as right trigger
-	return keyCode == ps_move_key_codes::R2 || keyCode == ps_move_key_codes::throttle;
-}
-
-std::unordered_map<u64, u16> ps_move_handler::get_button_values(const std::shared_ptr<PadDevice>& device)
-{
-	std::unordered_map<u64, u16> key_buf;
-	ps_move_device* dev = static_cast<ps_move_device*>(device.get());
-	if (!dev)
-		return key_buf;
-
-	const ps_move_input_report_common& input = dev->input_report_common();
-
-	key_buf[ps_move_key_codes::cross]    = (input.buttons_2 & button_flags::cross)    ? 255 : 0;
-	key_buf[ps_move_key_codes::square]   = (input.buttons_2 & button_flags::square)   ? 255 : 0;
-	key_buf[ps_move_key_codes::circle]   = (input.buttons_2 & button_flags::circle)   ? 255 : 0;
-	key_buf[ps_move_key_codes::triangle] = (input.buttons_2 & button_flags::triangle) ? 255 : 0;
-	key_buf[ps_move_key_codes::start]    = (input.buttons_1 & button_flags::start)    ? 255 : 0;
-	key_buf[ps_move_key_codes::select]   = (input.buttons_1 & button_flags::select)   ? 255 : 0;
-
-	const u16 extra_buttons = input.sequence_number << 8 | input.buttons_3;
-	key_buf[ps_move_key_codes::ps]   = (extra_buttons & button_flags::ps)   ? 255 : 0;
-	key_buf[ps_move_key_codes::move] = (extra_buttons & button_flags::move) ? 255 : 0;
-	key_buf[ps_move_key_codes::t]    = (extra_buttons & button_flags::t)    ? input.trigger_2 : 0;
-
-	dev->battery_level = input.battery_level;
-
-	// Handle external data
-	if (dev->model == ps_move_model::ZCM1)
-	{
-		const bool external_device_connected = !!(extra_buttons & button_flags::ext_dev);
-
-		if (external_device_connected)
-		{
-			const std::array<u8, 5>& ext_data = dev->input_report_ZCM1.ext_device_data;
-
-			switch (dev->external_device_id)
-			{
-			case SHARP_SHOOTER_DEVICE_ID:
-				key_buf[ps_move_key_codes::firing_mode_1] = (ext_data[0] & button_flags::ss_firing_mode_1) ? 255 : 0;
-				key_buf[ps_move_key_codes::firing_mode_2] = (ext_data[0] & button_flags::ss_firing_mode_2) ? 255 : 0;
-				key_buf[ps_move_key_codes::firing_mode_3] = (ext_data[0] & button_flags::ss_firing_mode_3) ? 255 : 0;
-				key_buf[ps_move_key_codes::reload]        = (ext_data[0] & button_flags::ss_reload)        ? 255 : 0;
-				//key_buf[ps_move_key_codes::t]             = (ext_data[0] & button_flags::ss_trigger)       ? 255 : 0; // This is already reported as normal trigger
-				break;
-			case RACING_WHEEL_DEVICE_ID:
-				key_buf[ps_move_key_codes::dpad_up]      = (input.buttons_1 & button_flags::rw_d_pad_up)    ? 255 : 0;
-				key_buf[ps_move_key_codes::dpad_right]   = (input.buttons_1 & button_flags::rw_d_pad_right) ? 255 : 0;
-				key_buf[ps_move_key_codes::dpad_down]    = (input.buttons_1 & button_flags::rw_d_pad_down)  ? 255 : 0;
-				key_buf[ps_move_key_codes::dpad_left]    = (input.buttons_1 & button_flags::rw_d_pad_left)  ? 255 : 0;
-				key_buf[ps_move_key_codes::L1]           = (input.buttons_2 & button_flags::rw_l1)          ? 255 : 0;
-				key_buf[ps_move_key_codes::R1]           = (input.buttons_2 & button_flags::rw_r1)          ? 255 : 0;
-				key_buf[ps_move_key_codes::throttle]     = ext_data[0];
-				key_buf[ps_move_key_codes::L2]           = ext_data[1];
-				key_buf[ps_move_key_codes::R2]           = ext_data[2];
-				key_buf[ps_move_key_codes::paddle_left]  = (ext_data[3] & button_flags::rw_paddle_l) ? 255 : 0;
-				key_buf[ps_move_key_codes::paddle_right] = (ext_data[3] & button_flags::rw_paddle_r) ? 255 : 0;
-				break;
-			default:
-				break;
-			}
-		}
-	}
-
-	return key_buf;
-}
-
-void ps_move_handler::get_extended_info(const pad_ensemble& binding)
-{
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
-	ps_move_device* dev = static_cast<ps_move_device*>(device.get());
-	if (!dev || !pad)
-		return;
-
-	const ps_move_input_report_common& input = dev->input_report_common();
-
-	// The default position is flat on the ground, pointing forward.
-	// The accelerometers constantly measure G forces.
-	// The gyros measure changes in orientation and will reset when the device isn't moved anymore.
-	f32 accel_x = input.accel_x_1; // Increases if the device is rolled to the left
-	f32 accel_y = input.accel_y_1; // Increases if the device is pitched upwards
-	f32 accel_z = input.accel_z_1; // Increases if the device is moved upwards
-	f32 gyro_x = input.gyro_x_1;   // Increases if the device is pitched upwards
-	f32 gyro_y = input.gyro_y_1;   // Increases if the device is rolled to the right
-	f32 gyro_z = input.gyro_z_1;   // Increases if the device is yawed to the left
-
-	if (dev->model == ps_move_model::ZCM1)
-	{
-		accel_x -= static_cast<f32>(zero_shift);
-		accel_y -= static_cast<f32>(zero_shift);
-		accel_z -= static_cast<f32>(zero_shift);
-		gyro_x -= static_cast<f32>(zero_shift);
-		gyro_y -= static_cast<f32>(zero_shift);
-		gyro_z -= static_cast<f32>(zero_shift);
-	}
-
-	if (!device->config || !device->config->orientation_enabled)
-	{
-		pad->move_data.reset_sensors();
-	}
-	else
-	{
-		// Apply calibration
-		if (dev->calibration.is_valid)
-		{
-			accel_x = accel_x * dev->calibration.accel_x_factor + dev->calibration.accel_x_offset;
-			accel_y = accel_y * dev->calibration.accel_y_factor + dev->calibration.accel_y_offset;
-			accel_z = accel_z * dev->calibration.accel_z_factor + dev->calibration.accel_z_offset;
-			gyro_x = (gyro_x - dev->calibration.gyro_x_offset) * dev->calibration.gyro_x_gain;
-			gyro_y = (gyro_y - dev->calibration.gyro_y_offset) * dev->calibration.gyro_y_gain;
-			gyro_z = (gyro_z - dev->calibration.gyro_z_offset) * dev->calibration.gyro_z_gain;
-		}
-		else
-		{
-			constexpr f32 MOVE_ONE_G = 4096.0f; // This is just a rough estimate and probably depends on the device
-
-			accel_x /= MOVE_ONE_G;
-			accel_y /= MOVE_ONE_G;
-			accel_z /= MOVE_ONE_G;
-			gyro_x /= MOVE_ONE_G;
-			gyro_y /= MOVE_ONE_G;
-			gyro_z /= MOVE_ONE_G;
-		}
-
-		pad->move_data.accelerometer_x = accel_x;
-		pad->move_data.accelerometer_y = accel_y;
-		pad->move_data.accelerometer_z = accel_z;
-		pad->move_data.gyro_x = gyro_x;
-		pad->move_data.gyro_y = gyro_y;
-		pad->move_data.gyro_z = gyro_z;
-
-		if (dev->model == ps_move_model::ZCM1)
-		{
-			const ps_move_input_report_ZCM1& input_zcm1 = dev->input_report_ZCM1;
-
-			#define TWELVE_BIT_SIGNED(x) (((x) & 0x800) ? (-(((~(x)) & 0xFFF) + 1)) : (x))
-			pad->move_data.magnetometer_x = static_cast<f32>(TWELVE_BIT_SIGNED(((input.magnetometer_x & 0x0F) << 8) | input_zcm1.magnetometer_x2));
-			pad->move_data.magnetometer_y = static_cast<f32>(TWELVE_BIT_SIGNED((input_zcm1.magnetometer_y << 4) | (input_zcm1.magnetometer_yz & 0xF0) >> 4));
-			pad->move_data.magnetometer_z = static_cast<f32>(TWELVE_BIT_SIGNED(((input_zcm1.magnetometer_yz & 0x0F) << 8) | input_zcm1.magnetometer_z));
-		}
-	}
-
-	pad->move_data.temperature = ((input.temperature << 4) | ((input.magnetometer_x & 0xF0) >> 4));
-
-	pad->m_sensors[0].m_value = Clamp0To1023(512.0f + (MOTION_ONE_G * accel_x * -1.0f));
-	pad->m_sensors[1].m_value = Clamp0To1023(512.0f + (MOTION_ONE_G * accel_y * -1.0f));
-	pad->m_sensors[2].m_value = Clamp0To1023(512.0f + (MOTION_ONE_G * accel_z));
-	pad->m_sensors[3].m_value = Clamp0To1023(512.0f + (MOTION_ONE_G * gyro_z * -1.0f));
-
-	handle_external_device(binding);
-}
-
-pad_preview_values ps_move_handler::get_preview_values(const std::unordered_map<u64, u16>& data)
-{
-	return {
-		std::max(::at32(data, ps_move_key_codes::L2), ::at32(data, ps_move_key_codes::t)),
-		std::max(::at32(data, ps_move_key_codes::R2), ::at32(data, ps_move_key_codes::throttle)),
-		0,
-		0,
-		0,
-		0
-	};
-}
-
-int ps_move_handler::send_output_report(ps_move_device* device)
-{
-	if (!device || !device->hidDevice)
-		return -2;
-
-	const cfg_pad* config = device->config;
-	if (config == nullptr)
-		return -2; // hid_write returns -1 on error
-
-	device->output_report.type = 0x06;
-	device->output_report.rumble = device->large_motor;
-
-	// Override color if necessary (for example while we actually use the PS Move with cellGem)
-	if (device->color_override_active)
-	{
-		device->output_report.r = device->color_override.r;
-		device->output_report.g = device->color_override.g;
-		device->output_report.b = device->color_override.b;
-	}
-	else
-	{
-		device->output_report.r = config->colorR;
-		device->output_report.g = config->colorG;
-		device->output_report.b = config->colorB;
-	}
-
-	const auto now = steady_clock::now();
-	const auto elapsed = now - device->last_output_report_time;
-
-	// Update LED at an interval or it will be disabled automatically
-	device->new_output_data |= elapsed >= 4000ms;
-
-	if (!device->new_output_data)
-	{
-		// Use LED update rate of 120ms
-		if (elapsed < 120ms)
-		{
-			return -3;
-		}
-
-		device->new_output_data = std::memcmp(&device->output_report, &device->last_output_report, sizeof(ps_move_output_report));
-
-		if (!device->new_output_data)
-		{
-			return -3;
-		}
-	}
-
-	device->last_output_report_time = now;
-	device->last_output_report = device->output_report;
-
-	return hid_write(device->hidDevice, reinterpret_cast<u8*>(&device->output_report), sizeof(ps_move_output_report));
-}
-
-void ps_move_handler::apply_pad_data(const pad_ensemble& binding)
-{
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
-	ps_move_device* dev = static_cast<ps_move_device*>(device.get());
-	if (!dev || !dev->hidDevice || !dev->config || !pad)
-		return;
-
-	cfg_pad* config = dev->config;
-
-	const u8 speed_large = config->get_large_motor_speed(pad->m_vibrateMotors);
-
-	dev->new_output_data |= dev->large_motor != speed_large;
-	dev->large_motor = speed_large;
-
-	if (send_output_report(dev) >= 0)
-	{
-		dev->new_output_data = false;
-	}
-}
-
-void ps_move_handler::SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool /*player_led*/, bool /*battery_led*/, u32 /*battery_led_brightness*/)
-{
-	std::shared_ptr<ps_move_device> device = get_hid_device(padId);
-	if (device == nullptr || device->hidDevice == nullptr)
-		return;
-
-	device->large_motor = large_motor;
-	device->small_motor = small_motor;
-	device->player_id = player_id;
-	device->config = get_config(padId);
-
-	ensure(device->config);
-
-	if (r >= 0 && g >= 0 && b >= 0 && r <= 255 && g <= 255 && b <= 255)
-	{
-		device->config->colorR.set(r);
-		device->config->colorG.set(g);
-		device->config->colorB.set(b);
-	}
-
-	if (send_output_report(device.get()) >= 0)
-	{
-		device->new_output_data = false;
-	}
-}
-
-u32 ps_move_handler::get_battery_level(const std::string& padId)
-{
-	const std::shared_ptr<ps_move_device> device = get_hid_device(padId);
-	if (!device || !device->hidDevice)
-	{
-		return 0;
-	}
-
-	switch (device->battery_level)
-	{
-	case battery_status::usb_charging:
-	case battery_status::usb_charged:
-		return 100;
-	default:
-		break;
-	}
-
-	// 0 to 5
-	return std::clamp<u32>(device->battery_level * 20, 0, 100);
-}
diff --git a/rpcs3/Input/ps_move_handler.h b/rpcs3/Input/ps_move_handler.h
deleted file mode 100644
index 6584364556..0000000000
--- a/rpcs3/Input/ps_move_handler.h
+++ /dev/null
@@ -1,204 +0,0 @@
-#pragma once
-
-#include "hid_pad_handler.h"
-
-#include <unordered_map>
-
-namespace reports
-{
-	// NOTE: The 1st half-frame contains slightly older data than the 2nd half-frame
-#pragma pack(push, 1)
-	struct ps_move_input_report_common
-	{
-		//                                      ID    Size   Description
-		u8 report_id{};                      // 0x00    1    HID Report ID (always 0x01)
-		u8 buttons_1{};                      // 0x01    1    Buttons 1 (Start, Select)
-		u8 buttons_2{};                      // 0x02    1    Buttons 2 (X, Square, Circle, Triangle)
-		u8 buttons_3{};                      // 0x03    1+   Buttons 3 (PS, Move, T) and EXT
-		u8 sequence_number{};                // 0x04    1-   Sequence number
-		u8 trigger_1{};                      // 0x05    1    T button values (1st half-frame)
-		u8 trigger_2{};                      // 0x06    1    T button values (2nd half-frame)
-		u32 magic{};                         // 0x07    4    always 0x7F7F7F7F
-		u8 timestamp_upper{};                // 0x0B    1    Timestamp (upper byte)
-		u8 battery_level{};                  // 0x0C    1    Battery level. 0x05 = max, 0xEE = USB charging
-		s16 accel_x_1{};                     // 0x0D    2    X-axis accelerometer (1st half-frame)
-		s16 accel_y_1{};                     // 0x0F    2    Z-axis accelerometer (1st half-frame)
-		s16 accel_z_1{};                     // 0x11    2    Y-axis accelerometer (1st half-frame)
-		s16 accel_x_2{};                     // 0x13    2    X-axis accelerometer (2nd half-frame)
-		s16 accel_y_2{};                     // 0x15    2    Z-axis accelerometer (2nd half-frame)
-		s16 accel_z_2{};                     // 0x17    2    Y-axis accelerometer (2nd half-frame)
-		s16 gyro_x_1{};                      // 0x19    2    X-axis gyroscope (1st half-frame)
-		s16 gyro_y_1{};                      // 0x1B    2    Z-axis gyroscope (1st half-frame)
-		s16 gyro_z_1{};                      // 0x1D    2    Y-axis gyroscope (1st half-frame)
-		s16 gyro_x_2{};                      // 0x1F    2    X-axis gyroscope (2nd half-frame)
-		s16 gyro_y_2{};                      // 0x21    2    Z-axis gyroscope (2nd half-frame)
-		s16 gyro_z_2{};                      // 0x23    2    Y-axis gyroscope (2nd half-frame)
-		u8 temperature{};                    // 0x25    1+   Temperature
-		u8 magnetometer_x{};                 // 0x26    1+   Temperature + X-axis magnetometer
-	};
-#pragma pack(pop)
-
-#pragma pack(push, 1)
-	struct ps_move_input_report_ZCM1
-	{
-		ps_move_input_report_common common{};
-
-		//                                      ID    Size   Description
-		u8 magnetometer_x2{};                // 0x27    1-   X-axis magnetometer
-		u8 magnetometer_y{};                 // 0x28    1+   Y-axis magnetometer
-		u8 magnetometer_yz{};                // 0x29    1    YZ-axis magnetometer
-		u8 magnetometer_z{};                 // 0x2A    1-   Z-axis magnetometer
-		u8 timestamp_lower{};                // 0x2B    1    Timestamp (lower byte)
-		std::array<u8, 5> ext_device_data{}; // 0x2C    5    External device data
-	};
-#pragma pack(pop)
-
-#pragma pack(push, 1)
-	struct ps_move_input_report_ZCM2
-	{
-		ps_move_input_report_common common{};
-
-		//                                      ID    Size   Description
-		u16 timestamp2;                      // 0x27    2    same as common timestamp
-		u16 unk;                             // 0x29    2    Unknown
-		u8 timestamp_lower;                  // 0x2B    1    Timestamp (lower byte)
-	};
-#pragma pack(pop)
-
-	struct ps_move_output_report
-	{
-		u8 type{};
-		u8 zero{};
-		u8 r{};
-		u8 g{};
-		u8 b{};
-		u8 zero2{};
-		u8 rumble{};
-		u8 padding[2];
-	};
-
-	struct ps_move_feature_report
-	{
-		std::array<u8, 4> data{}; // TODO
-	};
-
-	// Buffer size for calibration data
-	constexpr u32 PSMOVE_CALIBRATION_SIZE = 49;
-
-	// Three blocks, minus header (2 bytes) for blocks 2,3
-	constexpr u32 PSMOVE_ZCM1_CALIBRATION_BLOB_SIZE = PSMOVE_CALIBRATION_SIZE * 3 - 2 * 2;
-
-	// Three blocks, minus header (2 bytes) for block 2
-	constexpr u32 PSMOVE_ZCM2_CALIBRATION_BLOB_SIZE = PSMOVE_CALIBRATION_SIZE * 2 - 2 * 1;
-
-	struct ps_move_calibration_blob
-	{
-		std::array<u8, std::max(PSMOVE_ZCM1_CALIBRATION_BLOB_SIZE, PSMOVE_ZCM2_CALIBRATION_BLOB_SIZE)> data{};
-	};
-}
-
-enum
-{
-	zero_shift = 0x8000,
-};
-
-enum class ps_move_model
-{
-	ZCM1, // PS3
-	ZCM2, // PS4
-};
-
-struct ps_move_calibration
-{
-	bool is_valid = false;
-	f32 accel_x_factor = 1.0f;
-	f32 accel_y_factor = 1.0f;
-	f32 accel_z_factor = 1.0f;
-	f32 accel_x_offset = 0.0f;
-	f32 accel_y_offset = 0.0f;
-	f32 accel_z_offset = 0.0f;
-	f32 gyro_x_gain = 1.0f;
-	f32 gyro_y_gain = 1.0f;
-	f32 gyro_z_gain = 1.0f;
-	f32 gyro_x_offset = 0.0f;
-	f32 gyro_y_offset = 0.0f;
-	f32 gyro_z_offset = 0.0f;
-};
-
-class ps_move_device : public HidDevice
-{
-public:
-	ps_move_model model = ps_move_model::ZCM1;
-	reports::ps_move_input_report_ZCM1 input_report_ZCM1{};
-	reports::ps_move_input_report_ZCM2 input_report_ZCM2{};
-	reports::ps_move_output_report output_report{};
-	reports::ps_move_output_report last_output_report{};
-	steady_clock::time_point last_output_report_time;
-	u32 external_device_id = 0;
-	ps_move_calibration calibration{};
-
-	const reports::ps_move_input_report_common& input_report_common() const;
-};
-
-class ps_move_handler final : public hid_pad_handler<ps_move_device>
-{
-	enum ps_move_key_codes
-	{
-		none = 0,
-		cross,
-		square,
-		circle,
-		triangle,
-		start,
-		select,
-		ps,
-		move,
-		t,
-
-		// Available through external sharpshooter
-		firing_mode_1,
-		firing_mode_2,
-		firing_mode_3,
-		reload,
-
-		// Available through external racing wheel
-		dpad_up,
-		dpad_down,
-		dpad_left,
-		dpad_right,
-		L1,
-		R1,
-		L2,
-		R2,
-		throttle,
-		paddle_left,
-		paddle_right,
-	};
-
-public:
-	ps_move_handler();
-	~ps_move_handler();
-
-	void SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool player_led, bool battery_led, u32 battery_led_brightness) override;
-	u32 get_battery_level(const std::string& padId) override;
-	void init_config(cfg_pad* cfg) override;
-
-private:
-#ifdef _WIN32
-	hid_device* connect_move_device(ps_move_device* device, std::string_view path);
-#endif
-
-	DataStatus get_data(ps_move_device* device) override;
-	void check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial) override;
-	int send_output_report(ps_move_device* device) override;
-
-	bool get_is_left_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	PadHandlerBase::connection update_connection(const std::shared_ptr<PadDevice>& device) override;
-	std::unordered_map<u64, u16> get_button_values(const std::shared_ptr<PadDevice>& device) override;
-	pad_preview_values get_preview_values(const std::unordered_map<u64, u16>& data) override;
-	void get_extended_info(const pad_ensemble& binding) override;
-	void apply_pad_data(const pad_ensemble& binding) override;
-
-	void handle_external_device(const pad_ensemble& binding);
-};
diff --git a/rpcs3/Input/ps_move_tracker.cpp b/rpcs3/Input/ps_move_tracker.cpp
deleted file mode 100644
index d3deead687..0000000000
--- a/rpcs3/Input/ps_move_tracker.cpp
+++ /dev/null
@@ -1,654 +0,0 @@
-#include "stdafx.h"
-#include "Emu/Cell/Modules/cellCamera.h"
-#include "Emu/Cell/Modules/cellGem.h"
-#include "ps_move_tracker.h"
-
-#include <cmath>
-
-#ifdef HAVE_OPENCV
-#include <opencv2/photo.hpp>
-#endif
-
-LOG_CHANNEL(ps_move);
-
-namespace gem
-{
-	extern bool convert_image_format(CellCameraFormat input_format, CellGemVideoConvertFormatEnum output_format,
-	                                 const std::vector<u8>& video_data_in, u32 width, u32 height,
-	                                 u8* video_data_out, u32 video_data_out_size, std::string_view caller);
-}
-
-template <bool DiagnosticsEnabled>
-ps_move_tracker<DiagnosticsEnabled>::ps_move_tracker()
-{
-	init_workers();
-}
-
-template <bool DiagnosticsEnabled>
-ps_move_tracker<DiagnosticsEnabled>::~ps_move_tracker()
-{
-	for (u32 index = 0; index < CELL_GEM_MAX_NUM; index++)
-	{
-		if (auto& worker = m_workers[index])
-		{
-			auto& thread = *worker;
-			thread = thread_state::aborting;
-			m_wake_up_workers[index].release(1);
-			m_wake_up_workers[index].notify_one();
-			thread();
-		}
-	}
-}
-
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::set_valid(ps_move_info& info, u32 index, bool valid)
-{
-	u32& fail_count = ::at32(m_fail_count, index);
-
-	if (info.valid && !valid)
-	{
-		// Ignore a couple of untracked frames. This reduces noise.
-		if (++fail_count >= 3)
-		{
-			info.valid = valid;
-		}
-
-		return;
-	}
-
-	info.valid = valid;
-	fail_count = 0; // Reset fail count
-};
-
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::set_image_data(const void* buf, u64 size, u32 width, u32 height, s32 format)
-{
-	if (!buf || !size || !width || !height || !format)
-	{
-		ps_move.error("ps_move_tracker got unexpected input: buf=*0x%x, size=%d, width=%d, height=%d, format=%d", buf, size, width, height, format);
-		return;
-	}
-
-	m_width = width;
-	m_height = height;
-	m_format = format;
-	m_image_data.resize(size);
-
-	std::memcpy(m_image_data.data(), buf, size);
-}
-
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::set_active(u32 index, bool active)
-{
-	ps_move_config& config = ::at32(m_config, index);
-	config.active = active;
-}
-
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::ps_move_config::calculate_values()
-{
-	// The hue is a "circle", so we use modulo 360.
-	max_hue = (hue + hue_threshold) % 360;
-	min_hue = hue - hue_threshold;
-
-	if (min_hue < 0)
-	{
-		min_hue += 360;
-	}
-	else
-	{
-		min_hue %= 360;
-	}
-
-	saturation_threshold = saturation_threshold_u8 / 255.0f;
-}
-
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::set_hue(u32 index, u16 hue)
-{
-	ps_move_config& config = ::at32(m_config, index);
-	config.hue = hue;
-	config.calculate_values();
-}
-
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::set_hue_threshold(u32 index, u16 threshold)
-{
-	ps_move_config& config = ::at32(m_config, index);
-	config.hue_threshold = threshold;
-	config.calculate_values();
-}
-
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::set_saturation_threshold(u32 index, u16 threshold)
-{
-	ps_move_config& config = ::at32(m_config, index);
-	config.saturation_threshold_u8 = threshold;
-	config.calculate_values();
-}
-
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::init_workers()
-{
-	for (u32 index = 0; index < CELL_GEM_MAX_NUM; index++)
-	{
-		if (m_workers[index])
-		{
-			continue;
-		}
-
-		m_workers[index] = std::make_unique<named_thread<std::function<void()>>>(fmt::format("PS Move Worker %d", index), [this, index]()
-		{
-			while (thread_ctrl::state() != thread_state::aborting)
-			{
-				// Notify that all work is done
-				m_workers_finished[index].release(1);
-				m_workers_finished[index].notify_one();
-
-				// Wait for work
-				m_wake_up_workers[index].wait(0);
-				m_wake_up_workers[index].release(0);
-
-				if (thread_ctrl::state() == thread_state::aborting)
-				{
-					break;
-				}
-
-				// Find contours
-				ps_move_info& info = m_info[index];
-				ps_move_info new_info = info;
-				process_contours(new_info, index);
-
-				if (new_info.valid)
-				{
-					info = std::move(new_info);
-				}
-				else
-				{
-					info.valid = false;
-				}
-			}
-
-			// Notify one last time that all work is done
-			m_workers_finished[index].release(1);
-			m_workers_finished[index].notify_one();
-		});
-	}
-}
-
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::process_image()
-{
-	// Convert image to RGBA
-	convert_image(CELL_GEM_RGBA_640x480);
-
-	// Calculate hues
-	process_hues();
-
-	// Get active devices
-	std::vector<u32> active_devices;
-	for (u32 index = 0; index < CELL_GEM_MAX_NUM; index++)
-	{
-		ps_move_config& config = m_config[index];
-
-		if (config.active)
-		{
-			active_devices.push_back(index);
-		}
-		else
-		{
-			ps_move_info& info = m_info[index];
-			info.valid = false;
-			m_fail_count[index] = 0;
-		}
-	}
-
-	// Find contours on worker threads
-	for (u32 index : active_devices)
-	{
-		// Clear old state
-		m_workers_finished[index].release(0);
-
-		// Wake up worker
-		m_wake_up_workers[index].release(1);
-		m_wake_up_workers[index].notify_one();
-	}
-
-	// Wait for worker threads (a couple of seconds so we don't deadlock)
-	for (u32 index : active_devices)
-	{
-		// Wait for worker
-		m_workers_finished[index].wait(0, atomic_wait_timeout{5000000000});
-		m_workers_finished[index].release(0);
-	}
-}
-
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::convert_image(s32 output_format)
-{
-	const u32 width = m_width;
-	const u32 height = m_height;
-	const u32 size = height * width;
-
-	m_image_rgba.resize(size * 4);
-	m_image_hsv.resize(size * 3);
-
-	for (u32 index = 0; index < CELL_GEM_MAX_NUM; index++)
-	{
-		m_image_binary[index].resize(size);
-	}
-
-	if (gem::convert_image_format(CellCameraFormat{m_format}, CellGemVideoConvertFormatEnum{output_format}, m_image_data, width, height, m_image_rgba.data(), ::size32(m_image_rgba), "gemTracker"))
-	{
-		ps_move.trace("Converted video frame of format %s to %s", CellCameraFormat{m_format}, CellGemVideoConvertFormatEnum{output_format});
-	}
-
-	if constexpr (DiagnosticsEnabled)
-	{
-		m_image_gray.resize(size);
-		m_image_rgba_contours.resize(size * 4);
-
-		std::memcpy(m_image_rgba_contours.data(), m_image_rgba.data(), m_image_rgba.size());
-	}
-}
-
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::process_hues()
-{
-	const u32 width = m_width;
-	const u32 height = m_height;
-
-	if constexpr (DiagnosticsEnabled)
-	{
-		std::fill(m_hues.begin(), m_hues.end(), 0);
-	}
-
-	u8* gray = nullptr;
-
-	for (u32 y = 0; y < height; y++)
-	{
-		const u8* rgba = &m_image_rgba[y * width * 4];
-		u8* hsv = &m_image_hsv[y * width * 3];
-
-		if constexpr (DiagnosticsEnabled)
-		{
-			gray = &m_image_gray[y * width];
-		}
-
-		for (u32 x = 0; x < width; x++, rgba += 4, hsv += 3)
-		{
-			const f32 r = rgba[0] / 255.0f;
-			const f32 g = rgba[1] / 255.0f;
-			const f32 b = rgba[2] / 255.0f;
-			const auto [hue, saturation, value] = rgb_to_hsv(r, g, b);
-
-			hsv[0] = static_cast<u8>(hue / 2);
-			hsv[1] = static_cast<u8>(saturation * 255.0f);
-			hsv[2] = static_cast<u8>(value * 255.0f);
-
-			if constexpr (DiagnosticsEnabled)
-			{
-				*gray++ = static_cast<u8>(std::clamp((0.299f * r + 0.587f * g + 0.114f * b) * 255.0f, 0.0f, 255.0f));
-				++m_hues[hue];
-			}
-		}
-	}
-}
-
-#ifdef HAVE_OPENCV
-static bool is_circular_contour(const std::vector<cv::Point>& contour, f32& area)
-{
-	std::vector<cv::Point> approx;
-	cv::approxPolyDP(contour, approx, 0.01 * cv::arcLength(contour, true), true);
-	if (approx.size() < 8ULL) return false;
-
-	area = static_cast<f32>(cv::contourArea(contour));
-	if (area < 30.0f) return false;
-
-	cv::Point2f center;
-	f32 radius;
-	cv::minEnclosingCircle(contour, center, radius);
-	if (radius < 5.0f) return false;
-
-	return true;
-}
-
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::draw_sphere_size_range(f32 result_radius)
-{
-	if constexpr (!DiagnosticsEnabled) return;
-	if (!m_draw_overlays) return;
-
-	// Map memory
-	cv::Mat rgba(cv::Size(m_width, m_height), CV_8UC4, m_image_rgba_contours.data(), 0);
-
-	// Draw result, min and max radius
-	const f32 min_radius = m_min_radius * m_width;
-	const f32 max_radius = m_max_radius * m_width;
-	const f32 min_radius_clamped = std::max(0.0f, std::min(min_radius, max_radius));
-	const cv::Point2f center = cv::Point2f(m_width - 1 - max_radius, max_radius);
-	if (result_radius > 0.0f)
-	{
-		cv::circle(rgba, center, static_cast<int>(result_radius), cv::Scalar(255, 0, 0, 255), cv::FILLED);
-	}
-	if (min_radius_clamped > 0.0f && min_radius_clamped <= max_radius)
-	{
-		cv::circle(rgba, center, static_cast<int>(min_radius_clamped), cv::Scalar(0, 0, 0, 255), cv::FILLED);
-	}
-	if (max_radius > min_radius_clamped)
-	{
-		cv::circle(rgba, center, static_cast<int>(max_radius), cv::Scalar(0, 0, 0, 255), 1);
-	}
-}
-
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::process_contours(ps_move_info& info, u32 index)
-{
-	const ps_move_config& config = ::at32(m_config, index);
-	const std::vector<u8>& image_hsv = m_image_hsv;
-	std::vector<u8>& image_binary = ::at32(m_image_binary, index);
-
-	const u32 width = m_width;
-	const u32 height = m_height;
-	const bool wrapped_hue = config.min_hue > config.max_hue; // e.g. min=355, max=5 (red)
-
-	info.x_max = width;
-	info.y_max = height;
-
-	// Map memory
-	cv::Mat binary(cv::Size(width, height), CV_8UC1, image_binary.data(), 0);
-
-	// Filter image
-	for (u32 y = 0; y < height; y++)
-	{
-		const u8* src = &image_hsv[y * width * 3];
-		u8* dst = &image_binary[y * width];
-
-		for (u32 x = 0; x < width; x++, src += 3)
-		{
-			const u16 hue = src[0] * 2;
-			const u8 saturation = src[1];
-			const u8 value = src[2];
-
-			// Simply drop dark and colorless pixels as well as pixels that don't match our hue
-			if ((wrapped_hue ? (hue < config.min_hue && hue > config.max_hue) : (hue < config.min_hue || hue > config.max_hue)) ||
-				saturation < config.saturation_threshold_u8 || saturation > 200 ||
-				value < 150 || value > 255)
-			{
-				dst[x] = 0;
-			}
-			else
-			{
-				dst[x] = 255;
-			}
-		}
-	}
-
-	// Remove all small outer contours
-	if (m_filter_small_contours)
-	{
-		std::vector<std::vector<cv::Point>> contours;
-		cv::findContours(binary, contours, cv::RETR_LIST, cv::CHAIN_APPROX_SIMPLE);
-		for (auto it = contours.begin(); it != contours.end();)
-		{
-			f32 area;
-			if (is_circular_contour(*it, area))
-			{
-				it = contours.erase(it);
-				continue;
-			}
-			it++;
-		}
-		if (!contours.empty())
-		{
-			cv::drawContours(binary, contours, -1, 0, cv::FILLED);
-		}
-	}
-
-	// Find best contour
-	std::vector<std::vector<cv::Point>> all_contours;
-	cv::findContours(binary, all_contours, cv::RETR_EXTERNAL, cv::CHAIN_APPROX_SIMPLE);
-
-	if (all_contours.empty())
-	{
-		set_valid(info, index, false);
-
-		if constexpr (DiagnosticsEnabled)
-		{
-			draw_sphere_size_range(0.0f);
-		}
-		return;
-	}
-
-	std::vector<std::vector<cv::Point>> contours;
-	contours.reserve(all_contours.size());
-
-	std::vector<cv::Point2f> centers;
-	centers.reserve(all_contours.size());
-
-	std::vector<f32> radii;
-	radii.reserve(all_contours.size());
-
-	const f32 min_radius = m_min_radius * width;
-	const f32 max_radius = m_max_radius * width;
-
-	usz best_index = umax;
-	f32 best_area = 0.0f;
-	for (usz i = 0; i < all_contours.size(); i++)
-	{
-		const std::vector<cv::Point>& contour = all_contours[i];
-		f32 area;
-		if (!is_circular_contour(contour, area))
-			continue;
-
-		// Get center and radius
-		cv::Point2f center;
-		f32 radius;
-		cv::minEnclosingCircle(contour, center, radius);
-
-		// Filter radius
-		if (radius < min_radius || radius > max_radius)
-			continue;
-
-		contours.push_back(std::move(all_contours[i]));
-		centers.push_back(std::move(center));
-		radii.push_back(std::move(radius));
-
-		if (area > best_area)
-		{
-			best_area = area;
-			best_index = contours.size() - 1;
-		}
-	}
-
-	if (best_index == umax)
-	{
-		set_valid(info, index, false);
-
-		if constexpr (DiagnosticsEnabled)
-		{
-			draw_sphere_size_range(0.0f);
-		}
-		return;
-	}
-
-	// Calculate distance from sphere to camera
-	const f32 sphere_radius_pixels = radii[best_index];
-	constexpr f32 focal_length_mm = 3.5f; // Based on common webcam specs
-	constexpr f32 sensor_width_mm = 3.6f; // Based on common webcam specs
-	const f32 image_width_pixels = static_cast<f32>(width);
-	const f32 focal_length_pixels = (focal_length_mm * image_width_pixels) / sensor_width_mm;
-	const f32 distance_mm = (focal_length_pixels * CELL_GEM_SPHERE_RADIUS_MM) / sphere_radius_pixels;
-
-	// Set results
-	set_valid(info, index, true);
-
-	const u32 x_pos = std::clamp(static_cast<u32>(centers[best_index].x), 0u, width);
-	const u32 y_pos = std::clamp(static_cast<u32>(centers[best_index].y), 0u, height);
-
-	// Only set new values if the new shape and position are relatively similar to the old ones.
-	const auto distance_travelled = [](int x1, int y1, int x2, int y2)
-	{
-		return std::sqrt(std::pow(x2 - x1, 2) + pow(y2 - y1, 2));
-	};
-	const bool shape_matches = std::abs(info.radius - sphere_radius_pixels) < (info.radius * 2) &&
-	                           distance_travelled(info.x_pos, info.y_pos, x_pos, y_pos) < (info.radius * 8);
-
-	if (shape_matches || ++m_shape_fail_count[index] >= 3)
-	{
-		info.distance_mm = distance_mm;
-		info.radius = sphere_radius_pixels;
-		info.x_pos = x_pos;
-		info.y_pos = y_pos;
-
-		m_shape_fail_count[index] = 0; // Reset fail count
-	}
-
-	if constexpr (!DiagnosticsEnabled)
-		return;
-
-	if (!m_draw_contours && !m_draw_overlays) [[likely]]
-		return;
-
-	draw_sphere_size_range(info.radius);
-
-	// Map memory
-	cv::Mat rgba(cv::Size(width, height), CV_8UC4, m_image_rgba_contours.data(), 0);
-
-	if (!m_show_all_contours) [[likely]]
-	{
-		std::vector<cv::Point> contour = std::move(contours[best_index]);
-		contours = { std::move(contour) };
-		centers = { centers[best_index] };
-		radii = { radii[best_index] };
-	}
-
-	static const cv::Scalar contour_color(255, 0, 0, 255);
-	static const cv::Scalar circle_color(0, 255, 0, 255);
-	static const cv::Scalar center_color(0, 0, 255, 255);
-
-	// Draw contours
-	if (m_draw_contours)
-	{
-		cv::drawContours(rgba, contours, -1, contour_color, cv::FILLED);
-	}
-
-	// Draw overlays
-	if (m_draw_overlays)
-	{
-		for (usz i = 0; i < centers.size(); i++)
-		{
-			const cv::Point2f& center = centers[i];
-			const f32 radius = radii[i];
-
-			cv::circle(rgba, center, static_cast<int>(radius), circle_color, 1);
-			cv::line(rgba, center + cv::Point2f(-2.0f, 0.0f), center + cv::Point2f(2.0f, 0.0f), center_color, 1);
-			cv::line(rgba, center + cv::Point2f(0.0f, -2.0f), center + cv::Point2f(0.0f, 2.0f), center_color, 1);
-		}
-	}
-}
-#else
-template <bool DiagnosticsEnabled>
-void ps_move_tracker<DiagnosticsEnabled>::process_contours(ps_move_info& info, u32 index)
-{
-	ensure(index < m_config.size());
-
-	const u32 width = m_width;
-	const u32 height = m_height;
-
-	info.valid = false;
-	info.x_max = width;
-	info.y_max = height;
-
-	ps_move.error("The tracker is not implemented for this operating system.");
-}
-#endif
-
-template <bool DiagnosticsEnabled>
-std::tuple<u8, u8, u8> ps_move_tracker<DiagnosticsEnabled>::hsv_to_rgb(u16 hue, f32 saturation, f32 value)
-{
-	const f32 h = hue / 60.0f;
-	const f32 chroma = value * saturation;
-	const f32 x = chroma * (1.0f - std::abs(std::fmod(h, 2.0f) - 1.0f));
-	const f32 m = value - chroma;
-
-	f32 r = 0.0f;
-	f32 g = 0.0f;
-	f32 b = 0.0f;
-
-	switch (static_cast<int>(std::ceil(h)))
-	{
-	case 0:
-	case 1:
-		r = chroma + m;
-		g = x + m;
-		b = 0 + m;
-		break;
-	case 2:
-		r = x + m;
-		g = chroma + m;
-		b = 0 + m;
-		break;
-	case 3:
-		r = 0 + m;
-		g = chroma + m;
-		b = x + m;
-		break;
-	case 4:
-		r = 0 + m;
-		g = x + m;
-		b = chroma + m;
-		break;
-	case 5:
-		r = x + m;
-		g = 0 + m;
-		b = chroma + m;
-		break;
-	case 6:
-		r = chroma + m;
-		g = 0 + m;
-		b = x + m;
-		break;
-	default:
-		break;
-	}
-
-	const u8 red   = static_cast<u8>(std::clamp(std::round(r * 255.0f), 0.0f, 255.0f));
-	const u8 green = static_cast<u8>(std::clamp(std::round(g * 255.0f), 0.0f, 255.0f));
-	const u8 blue  = static_cast<u8>(std::clamp(std::round(b * 255.0f), 0.0f, 255.0f));
-
-	return { red, green, blue };
-}
-
-template <bool DiagnosticsEnabled>
-std::tuple<s16, f32, f32> ps_move_tracker<DiagnosticsEnabled>::rgb_to_hsv(f32 r, f32 g, f32 b)
-{
-	const f32 cmax = std::max({r, g, b}); // V (of HSV)
-	const f32 cmin = std::min({r, g, b});
-	const f32 delta = cmax - cmin;
-	const f32 saturation = cmax ? (delta / cmax) : 0.0f; // S (of HSV)
-
-	s16 hue; // H (of HSV)
-
-	if (!delta)
-	{
-		hue = 0;
-	}
-	else if (cmax == r)
-	{
-		hue = (static_cast<s16>(60.0f * (g - b) / delta) + 360) % 360;
-	}
-	else if (cmax == g)
-	{
-		hue = (static_cast<s16>(60.0f * (b - r) / delta) + 120 + 360) % 360;
-	}
-	else
-	{
-		hue = (static_cast<s16>(60.0f * (r - g) / delta) + 240 + 360) % 360;
-	}
-
-	return { hue, saturation, cmax };
-}
-
-template class ps_move_tracker<false>;
-template class ps_move_tracker<true>;
diff --git a/rpcs3/Input/ps_move_tracker.h b/rpcs3/Input/ps_move_tracker.h
deleted file mode 100644
index a1fa0e8936..0000000000
--- a/rpcs3/Input/ps_move_tracker.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma once
-
-#include "Emu/Cell/Modules/cellGem.h"
-
-#ifdef HAVE_OPENCV
-	constexpr bool g_ps_move_tracking_supported = true;
-#else
-	constexpr bool g_ps_move_tracking_supported = false;
-#endif
-
-struct ps_move_info
-{
-	bool valid = false;     // The tracking result
-	f32 radius = 0.0f;      // Radius of the sphere in pixels
-	f32 distance_mm = 0.0f; // Distance from sphere to camera in mm
-	u32 x_pos = 0;          // X position in pixels
-	u32 y_pos = 0;          // Y position in pixels
-	u32 x_max = 0;          // Maximum X position in pixels
-	u32 y_max = 0;          // Maximum Y position in pixels
-};
-
-template <bool DiagnosticsEnabled = false>
-class ps_move_tracker
-{
-public:
-	ps_move_tracker();
-	virtual ~ps_move_tracker();
-
-	void set_image_data(const void* buf, u64 size, u32 width, u32 height, s32 format);
-
-	void init_workers();
-	void process_image();
-	void convert_image(s32 output_format);
-	void process_hues();
-	void process_contours(ps_move_info& info, u32 index);
-	
-	void set_active(u32 index, bool active);
-	void set_hue(u32 index, u16 hue);
-	void set_hue_threshold(u32 index, u16 threshold);
-	void set_saturation_threshold(u32 index, u16 threshold);
-
-	void set_min_radius(f32 radius) { m_min_radius = radius; }
-	void set_max_radius(f32 radius) { m_max_radius = radius; }
-	void set_filter_small_contours(bool enabled = false) { m_filter_small_contours = enabled; }
-	void set_show_all_contours(bool enabled = false) { m_show_all_contours = enabled; }
-	void set_draw_contours(bool enabled = false) { m_draw_contours = enabled; }
-	void set_draw_overlays(bool enabled = false) { m_draw_overlays = enabled; }
-
-	const std::array<ps_move_info, CELL_GEM_MAX_NUM>& info() { return m_info; }
-	const std::array<u32, 360>& hues() { return m_hues; }
-	const std::vector<u8>& rgba() { return m_image_rgba; }
-	const std::vector<u8>& rgba_contours() { return m_image_rgba_contours; }
-	const std::vector<u8>& hsv() { return m_image_hsv; }
-	const std::vector<u8>& gray() { return m_image_gray; }
-	const std::vector<u8>& binary(u32 index) { return ::at32(m_image_binary, index); }
-
-	static std::tuple<u8, u8, u8> hsv_to_rgb(u16 hue, f32 saturation, f32 value);
-	static std::tuple<s16, f32, f32> rgb_to_hsv(f32 r, f32 g, f32 b);
-
-private:
-	struct ps_move_config
-	{
-		bool active = false;
-
-		u16 hue = 0;
-		u16 hue_threshold = 0;
-		u16 saturation_threshold_u8 = 0;
-
-		s16 min_hue = 0;
-		s16 max_hue = 0;
-		f32 saturation_threshold = 0.0f;
-
-		void calculate_values();
-	};
-
-	void set_valid(ps_move_info& info, u32 index, bool valid);
-
-	void draw_sphere_size_range(f32 result_radius);
-
-	u32 m_width = 0;
-	u32 m_height = 0;
-	s32 m_format = 0;
-	f32 m_min_radius = 0.0f;
-	f32 m_max_radius = 1.0f;
-
-	bool m_filter_small_contours = true;
-	bool m_show_all_contours = false;
-	bool m_draw_contours = false;
-	bool m_draw_overlays = false;
-
-	std::vector<u8> m_image_data;
-	std::vector<u8> m_image_rgba;
-	std::vector<u8> m_image_rgba_contours;
-	std::vector<u8> m_image_hsv;
-	std::vector<u8> m_image_gray;
-
-	std::array<std::vector<u8>, CELL_GEM_MAX_NUM> m_image_hue_filtered{};
-	std::array<std::vector<u8>, CELL_GEM_MAX_NUM> m_image_binary{};
-	std::array<u32, CELL_GEM_MAX_NUM> m_fail_count{};
-	std::array<u32, CELL_GEM_MAX_NUM> m_shape_fail_count{};
-
-	std::array<u32, 360> m_hues{};
-	std::array<ps_move_info, CELL_GEM_MAX_NUM> m_info{};
-	std::array<ps_move_config, CELL_GEM_MAX_NUM> m_config{};
-
-	std::array<std::unique_ptr<named_thread<std::function<void()>>>, CELL_GEM_MAX_NUM> m_workers{};
-	std::array<atomic_t<u32>, CELL_GEM_MAX_NUM> m_wake_up_workers{};
-	std::array<atomic_t<u32>, CELL_GEM_MAX_NUM> m_workers_finished{};
-};
diff --git a/rpcs3/Input/raw_mouse_config.cpp b/rpcs3/Input/raw_mouse_config.cpp
deleted file mode 100644
index c5284c6ef5..0000000000
--- a/rpcs3/Input/raw_mouse_config.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-#include "stdafx.h"
-#include "raw_mouse_config.h"
-#include "Emu/Io/MouseHandler.h"
-
-LOG_CHANNEL(cfg_log, "CFG");
-
-cfg::string& raw_mouse_config::get_button_by_index(int index)
-{
-	switch (index)
-	{
-	case 0: return mouse_button_1;
-	case 1: return mouse_button_2;
-	case 2: return mouse_button_3;
-	case 3: return mouse_button_4;
-	case 4: return mouse_button_5;
-	case 5: return mouse_button_6;
-	case 6: return mouse_button_7;
-	case 7: return mouse_button_8;
-	default: fmt::throw_exception("Invalid index %d", index);
-	}
-}
-
-cfg::string& raw_mouse_config::get_button(int code)
-{
-	switch (code)
-	{
-	case CELL_MOUSE_BUTTON_1: return mouse_button_1;
-	case CELL_MOUSE_BUTTON_2: return mouse_button_2;
-	case CELL_MOUSE_BUTTON_3: return mouse_button_3;
-	case CELL_MOUSE_BUTTON_4: return mouse_button_4;
-	case CELL_MOUSE_BUTTON_5: return mouse_button_5;
-	case CELL_MOUSE_BUTTON_6: return mouse_button_6;
-	case CELL_MOUSE_BUTTON_7: return mouse_button_7;
-	case CELL_MOUSE_BUTTON_8: return mouse_button_8;
-	default: fmt::throw_exception("Invalid code %d", code);
-	}
-}
-
-std::string raw_mouse_config::get_button_name(std::string_view value)
-{
-	if (raw_mouse_button_map.contains(value))
-	{
-		return std::string(value);
-	}
-
-	if (value.starts_with(key_prefix))
-	{
-		s64 scan_code{};
-		if (try_to_int64(&scan_code, value.substr(key_prefix.size()), s32{smin}, s32{smax}))
-		{
-			return get_key_name(static_cast<s32>(scan_code));
-		}
-	}
-
-	return "";
-}
-
-std::string raw_mouse_config::get_button_name(s32 button_code)
-{
-	for (const auto& [name, code] : raw_mouse_button_map)
-	{
-		if (code == button_code)
-		{
-			return std::string(name);
-		}
-	}
-	return "";
-}
-
-std::string raw_mouse_config::get_key_name(s32 scan_code)
-{
-#ifdef _WIN32
-	TCHAR name_buf[MAX_PATH] {};
-	if (!GetKeyNameTextW(scan_code, name_buf, MAX_PATH))
-	{
-		cfg_log.error("raw_mouse_config: GetKeyNameText failed: %s", fmt::win_error{GetLastError(), nullptr});
-		return {};
-	}
-	return wchar_to_utf8(name_buf);
-#else
-	static_cast<void>(scan_code);
-	return "";
-#endif
-}
-
-raw_mice_config::raw_mice_config()
-{
-	for (u32 i = 0; i < ::size32(players); i++)
-	{
-		players.at(i) = std::make_shared<raw_mouse_config>(this, fmt::format("Player %d", i + 1));
-	}
-}
-
-bool raw_mice_config::load()
-{
-	m_mutex.lock();
-
-	bool result = false;
-	const std::string cfg_name = fmt::format("%s%s.yml", fs::get_config_dir(true), cfg_id);
-	cfg_log.notice("Loading %s config: %s", cfg_id, cfg_name);
-
-	from_default();
-
-	if (fs::file cfg_file{ cfg_name, fs::read })
-	{
-		if (const std::string content = cfg_file.to_string(); !content.empty())
-		{
-			result = from_string(content);
-		}
-
-		m_mutex.unlock();
-	}
-	else
-	{
-		m_mutex.unlock();
-		save();
-	}
-
-	return result;
-}
-
-void raw_mice_config::save()
-{
-	std::lock_guard lock(m_mutex);
-
-	const std::string cfg_name = fmt::format("%s%s.yml", fs::get_config_dir(true), cfg_id);
-	cfg_log.notice("Saving %s config to '%s'", cfg_id, cfg_name);
-
-	if (!fs::create_path(fs::get_parent_dir(cfg_name)))
-	{
-		cfg_log.fatal("Failed to create path: %s (%s)", cfg_name, fs::g_tls_error);
-	}
-
-	if (!cfg::node::save(cfg_name))
-	{
-		cfg_log.error("Failed to save %s config to '%s' (error=%s)", cfg_id, cfg_name, fs::g_tls_error);
-	}
-
-	reload_requested = true;
-}
diff --git a/rpcs3/Input/raw_mouse_config.h b/rpcs3/Input/raw_mouse_config.h
deleted file mode 100644
index 2791725637..0000000000
--- a/rpcs3/Input/raw_mouse_config.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#pragma once
-
-#include "Utilities/Config.h"
-#include "Utilities/mutex.h"
-
-#include <array>
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-static const std::map<std::string_view, int> raw_mouse_button_map
-{
-	{ "", 0 },
-#ifdef _WIN32
-	{ "Button 1", RI_MOUSE_BUTTON_1_UP },
-	{ "Button 2", RI_MOUSE_BUTTON_2_UP },
-	{ "Button 3", RI_MOUSE_BUTTON_3_UP },
-	{ "Button 4", RI_MOUSE_BUTTON_4_UP },
-	{ "Button 5", RI_MOUSE_BUTTON_5_UP },
-#endif
-};
-
-struct raw_mouse_config : cfg::node
-{
-public:
-	using cfg::node::node;
-
-	cfg::string device{this, "Device", ""};
-
-	cfg::_float<10, 1000> mouse_acceleration{ this, "Mouse Acceleration", 100.0f, true };
-
-	cfg::string mouse_button_1{ this, "Button 1", "Button 1", true };
-	cfg::string mouse_button_2{ this, "Button 2", "Button 2", true };
-	cfg::string mouse_button_3{ this, "Button 3", "Button 3", true };
-	cfg::string mouse_button_4{ this, "Button 4", "Button 4", true };
-	cfg::string mouse_button_5{ this, "Button 5", "Button 5", true };
-	cfg::string mouse_button_6{ this, "Button 6", "", true };
-	cfg::string mouse_button_7{ this, "Button 7", "", true };
-	cfg::string mouse_button_8{ this, "Button 8", "", true };
-
-	cfg::string& get_button_by_index(int index);
-	cfg::string& get_button(int code);
-
-	static constexpr std::string_view key_prefix = "Key ";
-
-	static std::string get_button_name(std::string_view value);
-	static std::string get_button_name(s32 button_code);
-	static std::string get_key_name(s32 scan_code);
-};
-
-struct raw_mice_config : cfg::node
-{
-	raw_mice_config();
-
-	shared_mutex m_mutex;
-	static constexpr std::string_view cfg_id = "raw_mouse";
-	std::array<std::shared_ptr<raw_mouse_config>, 4> players;
-	atomic_t<bool> reload_requested = false;
-
-	bool load();
-	void save();
-};
-
-extern raw_mice_config g_cfg_raw_mouse;
diff --git a/rpcs3/Input/raw_mouse_handler.cpp b/rpcs3/Input/raw_mouse_handler.cpp
deleted file mode 100644
index 874eccdde6..0000000000
--- a/rpcs3/Input/raw_mouse_handler.cpp
+++ /dev/null
@@ -1,693 +0,0 @@
-#include "stdafx.h"
-#include "raw_mouse_handler.h"
-
-#include "Emu/RSX/GSRender.h"
-#include "Emu/RSX/RSXThread.h"
-#include "Emu/Io/interception.h"
-#include "Input/raw_mouse_config.h"
-#include "Utilities/Timer.h"
-
-#ifdef _WIN32
-#include <hidusage.h>
-#endif
-
-#define RAW_MOUSE_DEBUG_CURSOR_ENABLED 0
-#if RAW_MOUSE_DEBUG_CURSOR_ENABLED
-#include "Emu/RSX/Overlays/overlay_cursor.h"
-static inline void draw_overlay_cursor(u32 index, s32 x_pos, s32 y_pos, s32 x_max, s32 y_max)
-{
-	const s16 x = static_cast<s16>(x_pos / (x_max / static_cast<f32>(rsx::overlays::overlay::virtual_width)));
-	const s16 y = static_cast<s16>(y_pos / (y_max / static_cast<f32>(rsx::overlays::overlay::virtual_height)));
-
-	const color4f color = { 1.0f, 0.0f, 0.0f, 1.0f };
-
-	rsx::overlays::set_cursor(rsx::overlays::cursor_offset::last + index, x, y, color, 2'000'000, false);
-}
-#else
-[[maybe_unused]] static inline void draw_overlay_cursor(u32, s32, s32, s32, s32) {}
-#endif
-
-const std::unordered_map<int, raw_mouse::mouse_button> raw_mouse::btn_pairs =
-{
-	{ 0, {}},
-#ifdef _WIN32
-	{ RI_MOUSE_BUTTON_1_UP, mouse_button{ RI_MOUSE_BUTTON_1_DOWN, RI_MOUSE_BUTTON_1_UP, 0, false }},
-	{ RI_MOUSE_BUTTON_2_UP, mouse_button{ RI_MOUSE_BUTTON_2_DOWN, RI_MOUSE_BUTTON_2_UP, 0, false }},
-	{ RI_MOUSE_BUTTON_3_UP, mouse_button{ RI_MOUSE_BUTTON_3_DOWN, RI_MOUSE_BUTTON_3_UP, 0, false }},
-	{ RI_MOUSE_BUTTON_4_UP, mouse_button{ RI_MOUSE_BUTTON_4_DOWN, RI_MOUSE_BUTTON_4_UP, 0, false }},
-	{ RI_MOUSE_BUTTON_5_UP, mouse_button{ RI_MOUSE_BUTTON_5_DOWN, RI_MOUSE_BUTTON_5_UP, 0, false }},
-#endif
-};
-
-LOG_CHANNEL(input_log, "Input");
-
-raw_mice_config g_cfg_raw_mouse;
-shared_mutex g_registered_handlers_mutex;
-u32 g_registered_handlers = 0;
-
-raw_mouse::raw_mouse(u32 index, const std::string& device_name, void* handle, raw_mouse_handler* handler)
-	: m_index(index), m_device_name(device_name), m_handle(handle), m_handler(handler)
-{
-	reload_config();
-}
-
-raw_mouse::~raw_mouse()
-{
-}
-
-void raw_mouse::reload_config()
-{
-	m_buttons.clear();
-
-	if (m_index < ::size32(g_cfg_raw_mouse.players))
-	{
-		if (const auto& player = ::at32(g_cfg_raw_mouse.players, m_index))
-		{
-			input_log.notice("Raw mouse config for player %d=\n%s", m_index, player->to_string());
-
-			m_mouse_acceleration = static_cast<float>(player->mouse_acceleration.get()) / 100.0f;
-
-			m_buttons[CELL_MOUSE_BUTTON_1] = get_mouse_button(player->mouse_button_1);
-			m_buttons[CELL_MOUSE_BUTTON_2] = get_mouse_button(player->mouse_button_2);
-			m_buttons[CELL_MOUSE_BUTTON_3] = get_mouse_button(player->mouse_button_3);
-			m_buttons[CELL_MOUSE_BUTTON_4] = get_mouse_button(player->mouse_button_4);
-			m_buttons[CELL_MOUSE_BUTTON_5] = get_mouse_button(player->mouse_button_5);
-			m_buttons[CELL_MOUSE_BUTTON_6] = get_mouse_button(player->mouse_button_6);
-			m_buttons[CELL_MOUSE_BUTTON_7] = get_mouse_button(player->mouse_button_7);
-			m_buttons[CELL_MOUSE_BUTTON_8] = get_mouse_button(player->mouse_button_8);
-		}
-	}
-}
-
-void raw_mouse::set_index(u32 index)
-{
-	m_index = index;
-	m_reload_requested = true;
-}
-
-raw_mouse::mouse_button raw_mouse::get_mouse_button(const cfg::string& button)
-{
-	const std::string value = button.to_string();
-
-	if (const auto it = raw_mouse_button_map.find(value); it != raw_mouse_button_map.cend())
-	{
-		return ::at32(btn_pairs, it->second);
-	}
-
-	if (value.starts_with(raw_mouse_config::key_prefix))
-	{
-		s64 scan_code{};
-		if (try_to_int64(&scan_code, value.substr(raw_mouse_config::key_prefix.size()), s32{smin}, s32{smax}))
-		{
-			return mouse_button{ 0, 0, static_cast<s32>(scan_code), true };
-		}
-	}
-
-	return {};
-}
-
-void raw_mouse::update_window_handle()
-{
-#ifdef _WIN32
-	if (GSRender* render = static_cast<GSRender*>(g_fxo->try_get<rsx::thread>()))
-	{
-		if (GSFrameBase* frame = render->get_frame())
-		{
-			if (display_handle_t window_handle = frame->handle(); window_handle && window_handle == GetActiveWindow())
-			{
-				m_window_handle = window_handle;
-				m_window_width = frame->client_width();
-				m_window_height = frame->client_height();
-				return;
-			}
-		}
-	}
-#endif
-
-	m_window_handle = {};
-	m_window_width = 0;
-	m_window_height = 0;
-}
-
-void raw_mouse::center_cursor()
-{
-	m_pos_x = m_window_width / 2;
-	m_pos_y = m_window_height / 2;
-}
-
-#ifdef _WIN32
-void raw_mouse::update_values(const RAWMOUSE& state)
-{
-	ensure(m_handler != nullptr);
-
-	// Update window handle and size
-	update_window_handle();
-
-	if (std::exchange(m_reload_requested, false))
-	{
-		reload_config();
-	}
-
-	if (m_handler->is_for_gui())
-	{
-		for (const auto& [up, btn] : btn_pairs)
-		{
-			// Only update the value if either down or up flags are present
-			if ((state.usButtonFlags & btn.down))
-			{
-				m_handler->mouse_press_callback(m_device_name, up, true);
-			}
-			else if ((state.usButtonFlags & btn.up))
-			{
-				m_handler->mouse_press_callback(m_device_name, up, false);
-			}
-		}
-		return;
-	}
-
-	// Get mouse buttons
-	for (const auto& [button, btn] : m_buttons)
-	{
-		if (btn.is_key) continue;
-
-		// Only update the value if either down or up flags are present
-		if ((state.usButtonFlags & btn.down))
-		{
-			m_handler->Button(m_index, button, true);
-		}
-		else if ((state.usButtonFlags & btn.up))
-		{
-			m_handler->Button(m_index, button, false);
-		}
-	}
-
-	// Get mouse wheel
-	if ((state.usButtonFlags & RI_MOUSE_WHEEL))
-	{
-		m_handler->Scroll(m_index, 0, std::clamp(static_cast<s16>(state.usButtonData) / WHEEL_DELTA, -128, 127));
-	}
-	else if ((state.usButtonFlags & RI_MOUSE_HWHEEL))
-	{
-		m_handler->Scroll(m_index, std::clamp(static_cast<s16>(state.usButtonData) / WHEEL_DELTA, -128, 127), 0);
-	}
-
-	// Get mouse movement
-	if ((state.usFlags & MOUSE_MOVE_ABSOLUTE))
-	{
-		// Get absolute mouse movement
-
-		if (m_window_handle && m_window_width && m_window_height)
-		{
-			// Convert virtual coordinates to screen coordinates
-			const bool is_virtual_desktop = (state.usFlags & MOUSE_VIRTUAL_DESKTOP) == MOUSE_VIRTUAL_DESKTOP;
-			const int width = GetSystemMetrics(is_virtual_desktop ? SM_CXVIRTUALSCREEN : SM_CXSCREEN);
-			const int height = GetSystemMetrics(is_virtual_desktop ? SM_CYVIRTUALSCREEN : SM_CYSCREEN);
-
-			if (width && height)
-			{
-				POINT pt {
-					.x = long(state.lLastX / 65535.0f * width),
-					.y = long(state.lLastY / 65535.0f * height)
-				};
-
-				if (ScreenToClient(m_window_handle, &pt))
-				{
-					// Move mouse with absolute position
-					m_handler->Move(m_index, pt.x, pt.y, m_window_width, m_window_height);
-					draw_overlay_cursor(m_index, pt.x, pt.y, m_window_width, m_window_height);
-				}
-			}
-		}
-	}
-	else if (state.lLastX || state.lLastY)
-	{
-		// Get relative mouse movement (units most likely in raw dpi)
-
-		if (m_window_handle && m_window_width && m_window_height)
-		{
-			// Apply mouse acceleration
-			const int delta_x = static_cast<int>(state.lLastX * m_mouse_acceleration);
-			const int delta_y = static_cast<int>(state.lLastY * m_mouse_acceleration);
-
-			// Adjust mouse position if the window size changed
-			if (m_window_width_old != m_window_width || m_window_height_old != m_window_height)
-			{
-				m_pos_x = static_cast<int>(std::round((m_pos_x / static_cast<f32>(m_window_width_old)) * m_window_width));
-				m_pos_y = static_cast<int>(std::round((m_pos_y / static_cast<f32>(m_window_height_old)) * m_window_height));
-
-				m_window_width_old = m_window_width;
-				m_window_height_old = m_window_height;
-			}
-
-			// Calculate new position
-			m_pos_x = std::max(0, std::min(m_pos_x + delta_x, m_window_width - 1));
-			m_pos_y = std::max(0, std::min(m_pos_y + delta_y, m_window_height - 1));
-
-			// Move mouse relative to old position
-			m_handler->Move(m_index, m_pos_x, m_pos_y, m_window_width, m_window_height, true, delta_x, delta_y);
-			draw_overlay_cursor(m_index, m_pos_x, m_pos_y, m_window_width, m_window_height);
-		}
-	}
-}
-
-void raw_mouse::update_values(s32 scan_code, bool pressed)
-{
-	ensure(m_handler != nullptr);
-
-	if (std::exchange(m_reload_requested, false))
-	{
-		reload_config();
-	}
-
-	if (m_handler->is_for_gui())
-	{
-		m_handler->key_press_callback(m_device_name, scan_code, pressed);
-		return;
-	}
-
-	// Get mouse buttons
-	for (const auto& [button, btn] : m_buttons)
-	{
-		if (!btn.is_key || btn.scan_code != scan_code) return;
-
-		m_handler->Button(m_index, button, pressed);
-	}
-}
-#endif
-
-raw_mouse_handler::~raw_mouse_handler()
-{
-	// Join thread
-	m_thread.reset();
-
-#ifdef _WIN32
-	unregister_raw_input_devices();
-#endif
-}
-
-void raw_mouse_handler::Init(const u32 max_connect)
-{
-	if (m_info.max_connect > 0)
-	{
-		// Already initialized
-		return;
-	}
-
-	if (!g_cfg_raw_mouse.load())
-	{
-		input_log.notice("raw_mouse_handler: Could not load raw mouse config. Using defaults.");
-	}
-
-	m_mice.clear();
-	m_mice.resize(max_connect);
-
-	// Get max device index
-	std::set<u32> connected_mice{};
-	const u32 now_connect = get_now_connect(connected_mice);
-
-	// Init mouse info
-	m_info = {};
-	m_info.max_connect = max_connect;
-	m_info.now_connect = std::min(now_connect, max_connect);
-	m_info.info = input::g_mice_intercepted ? CELL_MOUSE_INFO_INTERCEPTED : 0; // Ownership of mouse data: 0=Application, 1=System
-
-	for (u32 i = 0; i < m_info.max_connect; i++)
-	{
-		m_info.status[i] = connected_mice.contains(i) ? CELL_MOUSE_STATUS_CONNECTED : CELL_MOUSE_STATUS_DISCONNECTED;
-		m_info.mode[i] = CELL_MOUSE_INFO_TABLET_MOUSE_MODE;
-		m_info.tablet_is_supported[i] = CELL_MOUSE_INFO_TABLET_NOT_SUPPORTED;
-		m_info.vendor_id[0] = 0x1234;
-		m_info.product_id[0] = 0x1234;
-	}
-
-	type = mouse_handler::raw;
-
-	if (m_is_for_gui)
-	{
-		// No need for a thread. We call update_devices manually.
-		return;
-	}
-
-	m_thread = std::make_unique<named_thread<std::function<void()>>>("Raw Mouse Thread", [this]()
-	{
-		input_log.notice("raw_mouse_handler: thread started");
-
-		while (thread_ctrl::state() != thread_state::aborting)
-		{
-			update_devices();
-
-			thread_ctrl::wait_for(1'000'000);
-		}
-
-		input_log.notice("raw_mouse_handler: thread stopped");
-	});
-}
-
-void raw_mouse_handler::update_devices()
-{
-	u32 max_connect;
-	{
-		std::lock_guard lock(mutex);
-		max_connect = m_info.max_connect;
-	}
-
-	{
-		std::map<void*, raw_mouse> enumerated = enumerate_devices(max_connect);
-
-		std::lock_guard lock(m_raw_mutex);
-
-		if (m_is_for_gui)
-		{
-			// Use the new devices
-			m_raw_mice = std::move(enumerated);
-		}
-		else
-		{
-			// Integrate the new devices
-			std::map<void*, raw_mouse> updated_mice;
-
-			for (u32 i = 0; i < std::min(max_connect, ::size32(g_cfg_raw_mouse.players)); i++)
-			{
-				const auto& player = ::at32(g_cfg_raw_mouse.players, i);
-				const std::string device_name = player->device.to_string();
-
-				// Check if the configured device for this player is connected
-				if (const auto it = std::find_if(enumerated.begin(), enumerated.end(), [&device_name](const auto& entry){ return entry.second.device_name() == device_name; });
-					it != enumerated.cend())
-				{
-					// Check if the device was already known
-					const auto it_exists = m_raw_mice.find(it->first);
-					const bool exists = it_exists != m_raw_mice.cend();
-
-					// Copy by value to allow for the same device for multiple players
-					raw_mouse& mouse = updated_mice[it->first];
-					mouse = exists ? it_exists->second : it->second;
-					mouse.set_index(i);
-
-					if (!exists)
-					{
-						// Initialize and center mouse
-						mouse.update_window_handle();
-						mouse.center_cursor();
-
-						input_log.notice("raw_mouse_handler: added new device for player %d: '%s'", i, device_name);
-					}
-				}
-			}
-
-			// Log disconnected devices
-			for (const auto& [handle, mouse] : m_raw_mice)
-			{
-				if (!updated_mice.contains(handle))
-				{
-					input_log.notice("raw_mouse_handler: removed device for player %d: '%s'", mouse.index(), mouse.device_name());
-				}
-			}
-
-			m_raw_mice = std::move(updated_mice);
-		}
-	}
-
-	// Update mouse info
-	std::set<u32> connected_mice{};
-	const u32 now_connect = get_now_connect(connected_mice);
-	{
-		std::lock_guard lock(mutex);
-
-		m_info.now_connect = std::min(now_connect, m_info.max_connect);
-
-		for (u32 i = 0; i < m_info.max_connect; i++)
-		{
-			m_info.status[i] = connected_mice.contains(i) ? CELL_MOUSE_STATUS_CONNECTED : CELL_MOUSE_STATUS_DISCONNECTED;
-		}
-	}
-
-#ifdef _WIN32
-	register_raw_input_devices();
-#endif
-}
-
-#ifdef _WIN32
-void raw_mouse_handler::register_raw_input_devices()
-{
-	std::lock_guard lock(m_raw_mutex);
-
-	if (m_registered_raw_input_devices || !m_info.max_connect || m_raw_mice.empty())
-	{
-		return;
-	}
-
-	// Get the window handle of the first mouse
-	raw_mouse& mouse = m_raw_mice.begin()->second;
-
-	std::vector<RAWINPUTDEVICE> raw_input_devices;
-	raw_input_devices.push_back(RAWINPUTDEVICE {
-		.usUsagePage = HID_USAGE_PAGE_GENERIC,
-		.usUsage = HID_USAGE_GENERIC_MOUSE,
-		.dwFlags = 0,
-		.hwndTarget = mouse.window_handle()
-	});
-	raw_input_devices.push_back(RAWINPUTDEVICE {
-		.usUsagePage = HID_USAGE_PAGE_GENERIC,
-		.usUsage = HID_USAGE_GENERIC_KEYBOARD,
-		.dwFlags = 0,
-		.hwndTarget = mouse.window_handle()
-	});
-
-	{
-		std::lock_guard lock(g_registered_handlers_mutex);
-
-		if (!RegisterRawInputDevices(raw_input_devices.data(), ::size32(raw_input_devices), sizeof(RAWINPUTDEVICE)))
-		{
-			input_log.error("raw_mouse_handler: RegisterRawInputDevices failed: %s", fmt::win_error{GetLastError(), nullptr});
-			return;
-		}
-
-		g_registered_handlers++;
-	}
-
-	m_registered_raw_input_devices = true;
-}
-
-void raw_mouse_handler::unregister_raw_input_devices() const
-{
-	if (!m_registered_raw_input_devices)
-	{
-		return;
-	}
-
-	std::lock_guard lock(g_registered_handlers_mutex);
-
-	if (!g_registered_handlers || (--g_registered_handlers > 0))
-	{
-		input_log.notice("raw_mouse_handler: Skip unregistering devices. %d other handlers are still registered.", g_registered_handlers);
-		return;
-	}
-
-	input_log.notice("raw_mouse_handler: Unregistering devices");
-
-	std::vector<RAWINPUTDEVICE> raw_input_devices;
-	raw_input_devices.push_back(RAWINPUTDEVICE {
-		.usUsagePage = HID_USAGE_PAGE_GENERIC,
-		.usUsage = HID_USAGE_GENERIC_MOUSE,
-		.dwFlags = RIDEV_REMOVE,
-		.hwndTarget = nullptr
-	});
-	raw_input_devices.push_back(RAWINPUTDEVICE {
-		.usUsagePage = HID_USAGE_PAGE_GENERIC,
-		.usUsage = HID_USAGE_GENERIC_KEYBOARD,
-		.dwFlags = 0,
-		.hwndTarget = nullptr
-	});
-
-	if (!RegisterRawInputDevices(raw_input_devices.data(), ::size32(raw_input_devices), sizeof(RAWINPUTDEVICE)))
-	{
-		input_log.error("raw_mouse_handler: RegisterRawInputDevices (unregister) failed: %s", fmt::win_error{GetLastError(), nullptr});
-	}
-}
-#endif
-
-u32 raw_mouse_handler::get_now_connect(std::set<u32>& connected_mice)
-{
-	u32 now_connect = 0;
-	connected_mice.clear();
-	{
-		std::lock_guard lock(m_raw_mutex);
-
-		for (const auto& [handle, mouse] : m_raw_mice)
-		{
-			now_connect = std::max(now_connect, mouse.index() + 1);
-			connected_mice.insert(mouse.index());
-		}
-	}
-	return now_connect;
-}
-
-std::map<void*, raw_mouse> raw_mouse_handler::enumerate_devices(u32 max_connect)
-{
-	input_log.trace("raw_mouse_handler: enumerating devices (max_connect=%d)", max_connect);
-
-	std::map<void*, raw_mouse> raw_mice;
-
-	if (max_connect == 0)
-	{
-		return raw_mice;
-	}
-
-	Timer timer{};
-
-#ifdef _WIN32
-	u32 num_devices{};
-	u32 res = GetRawInputDeviceList(nullptr, &num_devices, sizeof(RAWINPUTDEVICELIST));
-	if (res == umax)
-	{
-		input_log.error("raw_mouse_handler: GetRawInputDeviceList (count) failed: %s", fmt::win_error{GetLastError(), nullptr});
-		return raw_mice;
-	}
-
-	if (num_devices == 0)
-	{
-		return raw_mice;
-	}
-
-	std::vector<RAWINPUTDEVICELIST> device_list(num_devices);
-
-	res = GetRawInputDeviceList(device_list.data(), &num_devices, sizeof(RAWINPUTDEVICELIST));
-	if (res == umax)
-	{
-		input_log.error("raw_mouse_handler: GetRawInputDeviceList (fetch) failed: %s", fmt::win_error{GetLastError(), nullptr});
-		return raw_mice;
-	}
-
-	for (RAWINPUTDEVICELIST& device : device_list)
-	{
-		if (device.dwType != RIM_TYPEMOUSE)
-		{
-			continue;
-		}
-
-		u32 size = 0;
-		res = GetRawInputDeviceInfoW(device.hDevice, RIDI_DEVICENAME, nullptr, &size);
-		if (res == umax)
-		{
-			input_log.error("raw_mouse_handler: GetRawInputDeviceInfoA (RIDI_DEVICENAME count) failed: %s", fmt::win_error{GetLastError(), nullptr});
-			continue;
-		}
-
-		if (size == 0)
-		{
-			continue;
-		}
-
-		std::vector<wchar_t> buf(size);
-		res = GetRawInputDeviceInfoW(device.hDevice, RIDI_DEVICENAME, buf.data(), &size);
-		if (res == umax)
-		{
-			input_log.error("raw_mouse_handler: GetRawInputDeviceInfoA (RIDI_DEVICENAME fetch) failed: %s", fmt::win_error{GetLastError(), nullptr});
-			continue;
-		}
-
-		const std::string device_name = wchar_to_utf8(buf.data());
-		input_log.trace("raw_mouse_handler: found device: '%s'", device_name);
-
-		raw_mice[device.hDevice] = raw_mouse(::size32(raw_mice), device_name, device.hDevice, this);
-	}
-#endif
-
-	input_log.trace("raw_mouse_handler: found %d devices in %f ms", raw_mice.size(), timer.GetElapsedTimeInMilliSec());
-	return raw_mice;
-}
-
-#ifdef _WIN32
-void raw_mouse_handler::handle_native_event(const MSG& msg)
-{
-	if (m_info.max_connect == 0)
-	{
-		// Not initialized
-		return;
-	}
-
-	if (msg.message != WM_INPUT && msg.message != WM_KEYDOWN && msg.message != WM_KEYUP)
-	{
-		return;
-	}
-
-	if (GET_RAWINPUT_CODE_WPARAM(msg.wParam) != RIM_INPUT)
-	{
-		return;
-	}
-
-	RAWINPUT raw_input{};
-	UINT size = sizeof(RAWINPUT);
-
-	const u32 res = GetRawInputData(reinterpret_cast<HRAWINPUT>(msg.lParam), RID_INPUT, &raw_input, &size, sizeof(RAWINPUTHEADER));
-	if (res == umax)
-	{
-		return;
-	}
-
-	if ((raw_input.header.dwType == RIM_TYPEMOUSE || raw_input.header.dwType == RIM_TYPEKEYBOARD) &&
-		g_cfg_raw_mouse.reload_requested.exchange(false))
-	{
-		std::lock_guard lock(m_raw_mutex);
-
-		for (auto& [handle, mouse] : m_raw_mice)
-		{
-			mouse.request_reload();
-		}
-	}
-
-	switch (raw_input.header.dwType)
-	{
-	case RIM_TYPEMOUSE:
-	{
-		std::lock_guard lock(m_raw_mutex);
-
-		if (auto it = m_raw_mice.find(raw_input.header.hDevice); it != m_raw_mice.end())
-		{
-			it->second.update_values(raw_input.data.mouse);
-		}
-		break;
-	}
-	case RIM_TYPEKEYBOARD:
-	{
-		const RAWKEYBOARD& keyboard = raw_input.data.keyboard;
-
-		// Ignore key overrun state and keys not mapped to any virtual key code
-		if (keyboard.MakeCode == KEYBOARD_OVERRUN_MAKE_CODE || keyboard.VKey >= UCHAR_MAX)
-		{
-			break;
-		}
-
-		WORD scan_code;
-
-		if (keyboard.MakeCode)
-		{
-			// Compose the full scan code value with its extended byte
-			scan_code = MAKEWORD(keyboard.MakeCode & 0x7f, ((keyboard.Flags & RI_KEY_E0) ? 0xe0 : ((keyboard.Flags & RI_KEY_E1) ? 0xe1 : 0x00)));
-		}
-		else
-		{
-			// Scan code value may be empty for some buttons (for example multimedia buttons)
-			// Try to get the scan code from the virtual key code
-			scan_code = LOWORD(MapVirtualKey(keyboard.VKey, MAPVK_VK_TO_VSC_EX));
-		}
-
-		const LONG scan_code_extended = static_cast<LONG>(MAKELPARAM(0, (HIBYTE(scan_code) ? KF_EXTENDED : 0x00) | LOBYTE(scan_code)));
-		const bool pressed = !(keyboard.Flags & RI_KEY_BREAK);
-
-		std::lock_guard lock(m_raw_mutex);
-
-		for (auto& [handle, mouse] : m_raw_mice)
-		{
-			mouse.update_values(scan_code_extended, pressed);
-		}
-		break;
-	}
-	default:
-	{
-		break;
-	}
-	}
-}
-#endif
diff --git a/rpcs3/Input/raw_mouse_handler.h b/rpcs3/Input/raw_mouse_handler.h
deleted file mode 100644
index 9ab7945f20..0000000000
--- a/rpcs3/Input/raw_mouse_handler.h
+++ /dev/null
@@ -1,127 +0,0 @@
-#pragma once
-
-#include "Emu/Io/MouseHandler.h"
-#include "Emu/RSX/display.h"
-#include "Utilities/Config.h"
-#include "Utilities/mutex.h"
-#include "Utilities/Thread.h"
-
-class raw_mouse_handler;
-
-class raw_mouse
-{
-public:
-	raw_mouse() {}
-	raw_mouse(u32 index, const std::string& device_name, void* handle, raw_mouse_handler* handler);
-	virtual ~raw_mouse();
-
-	void update_window_handle();
-	display_handle_t window_handle() const { return m_window_handle; }
-
-	void center_cursor();
-
-#ifdef _WIN32
-	void update_values(const RAWMOUSE& state);
-	void update_values(s32 scan_code, bool pressed);
-#endif
-
-	const std::string& device_name() const { return m_device_name; }
-	u32 index() const { return m_index; }
-	void set_index(u32 index);
-	void request_reload() { m_reload_requested = true; }
-
-private:
-	struct mouse_button
-	{
-		int down = 0;
-		int up = 0;
-		s32 scan_code = 0;
-		bool is_key = false;
-	};
-
-	static const std::unordered_map<int, raw_mouse::mouse_button> btn_pairs;
-
-	void reload_config();
-	static mouse_button get_mouse_button(const cfg::string& button);
-
-	u32 m_index = 0;
-	std::string m_device_name;
-	void* m_handle{};
-	display_handle_t m_window_handle{};
-	int m_window_width{};
-	int m_window_height{};
-	int m_window_width_old{};
-	int m_window_height_old{};
-	int m_pos_x{};
-	int m_pos_y{};
-	float m_mouse_acceleration = 1.0f;
-	raw_mouse_handler* m_handler{};
-	std::map<u8, mouse_button> m_buttons;
-	bool m_reload_requested = false;
-};
-
-class raw_mouse_handler final : public MouseHandlerBase
-{
-public:
-	using MouseHandlerBase::MouseHandlerBase;
-
-	virtual ~raw_mouse_handler();
-
-	void Init(const u32 max_connect) override;
-
-	void set_is_for_gui(bool value) { m_is_for_gui = value; }
-	bool is_for_gui() const { return m_is_for_gui; }
-
-	const std::map<void*, raw_mouse>& get_mice() const { return m_raw_mice; };
-
-	void set_mouse_press_callback(std::function<void(const std::string&, s32, bool)> cb)
-	{
-		m_mouse_press_callback = std::move(cb);
-	}
-
-	void mouse_press_callback(const std::string& device_name, s32 button_code, bool pressed)
-	{
-		if (m_mouse_press_callback)
-		{
-			m_mouse_press_callback(device_name, button_code, pressed);
-		}
-	}
-
-	void set_key_press_callback(std::function<void(const std::string&, s32, bool)> cb)
-	{
-		m_key_press_callback = std::move(cb);
-	}
-
-	void key_press_callback(const std::string& device_name, s32 scan_code, bool pressed)
-	{
-		if (m_key_press_callback)
-		{
-			m_key_press_callback(device_name, scan_code, pressed);
-		}
-	}
-
-	void update_devices();
-
-#ifdef _WIN32
-	void handle_native_event(const MSG& msg);
-#endif
-
-	shared_mutex m_raw_mutex;
-
-private:
-	u32 get_now_connect(std::set<u32>& connected_mice);
-	std::map<void*, raw_mouse> enumerate_devices(u32 max_connect);
-
-#ifdef _WIN32
-	void register_raw_input_devices();
-	void unregister_raw_input_devices() const;
-	bool m_registered_raw_input_devices = false;
-#endif
-
-	bool m_is_for_gui = false;
-	std::map<void*, raw_mouse> m_raw_mice;
-	std::function<void(const std::string&, s32, bool)> m_mouse_press_callback;
-	std::function<void(const std::string&, s32, bool)> m_key_press_callback;
-
-	std::unique_ptr<named_thread<std::function<void()>>> m_thread;
-};
diff --git a/rpcs3/Input/sdl_instance.cpp b/rpcs3/Input/sdl_instance.cpp
deleted file mode 100644
index 879333b513..0000000000
--- a/rpcs3/Input/sdl_instance.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-#ifdef HAVE_SDL3
-
-#include "stdafx.h"
-#include "sdl_instance.h"
-#include "Emu/System.h"
-
-#ifndef _MSC_VER
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include "SDL3/SDL.h"
-#ifndef _MSC_VER
-#pragma GCC diagnostic pop
-#endif
-
-LOG_CHANNEL(sdl_log, "SDL");
-
-sdl_instance::~sdl_instance()
-{
-	// Only quit SDL once on exit. SDL uses a global state internally...
-	if (m_initialized)
-	{
-		sdl_log.notice("Quitting SDL ...");
-		SDL_Quit();
-	}
-}
-
-sdl_instance& sdl_instance::get_instance()
-{
-	static sdl_instance instance{};
-	return instance;
-}
-
-void sdl_instance::pump_events()
-{
-	std::lock_guard lock(m_instance_mutex);
-
-	if (m_initialized)
-	{
-		SDL_PumpEvents();
-	}
-}
-
-void sdl_instance::set_hint(const char* name, const char* value)
-{
-	if (!SDL_SetHint(name, value))
-	{
-		sdl_log.error("Could not set hint '%s' to '%s': %s", name, value, SDL_GetError());
-	}
-}
-
-bool sdl_instance::initialize()
-{
-	std::lock_guard lock(m_instance_mutex);
-
-	if (m_initialized)
-	{
-		return true;
-	}
-
-	bool instance_success = false;
-
-	Emu.BlockingCallFromMainThread([this, &instance_success]()
-	{
-		instance_success = initialize_impl();
-	}, false);
-
-	return instance_success;
-}
-
-bool sdl_instance::initialize_impl()
-{
-	// Only init SDL once. SDL uses a global state internally...
-	if (m_initialized)
-	{
-		return true;
-	}
-
-	sdl_log.notice("Initializing SDL ...");
-
-	// Set non-dynamic hints before SDL_Init
-	set_hint(SDL_HINT_JOYSTICK_THREAD, "1");
-
-	// DS3 pressure sensitive buttons
-#ifdef _WIN32
-	set_hint(SDL_HINT_JOYSTICK_HIDAPI_PS3_SIXAXIS_DRIVER, "1");
-#else
-	set_hint(SDL_HINT_JOYSTICK_HIDAPI_PS3, "1");
-#endif
-
-	if (!SDL_Init(SDL_INIT_GAMEPAD | SDL_INIT_HAPTIC))
-	{
-		sdl_log.error("Could not initialize! SDL Error: %s", SDL_GetError());
-		return false;
-	}
-
-	SDL_SetLogPriorities(SDL_LOG_PRIORITY_VERBOSE);
-	SDL_SetLogOutputFunction([](void*, int category, SDL_LogPriority priority, const char* message)
-		{
-			std::string category_name;
-			switch (category)
-			{
-			case SDL_LOG_CATEGORY_APPLICATION:
-				category_name = "app";
-				break;
-			case SDL_LOG_CATEGORY_ERROR:
-				category_name = "error";
-				break;
-			case SDL_LOG_CATEGORY_ASSERT:
-				category_name = "assert";
-				break;
-			case SDL_LOG_CATEGORY_SYSTEM:
-				category_name = "system";
-				break;
-			case SDL_LOG_CATEGORY_AUDIO:
-				category_name = "audio";
-				break;
-			case SDL_LOG_CATEGORY_VIDEO:
-				category_name = "video";
-				break;
-			case SDL_LOG_CATEGORY_RENDER:
-				category_name = "render";
-				break;
-			case SDL_LOG_CATEGORY_INPUT:
-				category_name = "input";
-				break;
-			case SDL_LOG_CATEGORY_TEST:
-				category_name = "test";
-				break;
-			case SDL_LOG_CATEGORY_GPU:
-				category_name = "gpu";
-				break;
-			default:
-				category_name = fmt::format("unknown(%d)", category);
-				break;
-			}
-
-			switch (priority)
-			{
-			case SDL_LOG_PRIORITY_VERBOSE:
-			case SDL_LOG_PRIORITY_DEBUG:
-				sdl_log.trace("%s: %s", category_name, message);
-				break;
-			case SDL_LOG_PRIORITY_INFO:
-				sdl_log.notice("%s: %s", category_name, message);
-				break;
-			case SDL_LOG_PRIORITY_WARN:
-				sdl_log.warning("%s: %s", category_name, message);
-				break;
-			case SDL_LOG_PRIORITY_ERROR:
-				sdl_log.error("%s: %s", category_name, message);
-				break;
-			case SDL_LOG_PRIORITY_CRITICAL:
-				sdl_log.error("%s: %s", category_name, message);
-				break;
-			default:
-				break;
-			}
-		},
-		nullptr);
-
-	m_initialized = true;
-	return true;
-}
-
-#endif
diff --git a/rpcs3/Input/sdl_instance.h b/rpcs3/Input/sdl_instance.h
deleted file mode 100644
index 23fc1b6d59..0000000000
--- a/rpcs3/Input/sdl_instance.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#ifdef HAVE_SDL3
-
-#include <mutex>
-
-struct sdl_instance
-{
-public:
-	sdl_instance() = default;
-	virtual ~sdl_instance();
-
-	static sdl_instance& get_instance();
-
-	bool initialize();
-	void pump_events();
-
-private:
-	void set_hint(const char* name, const char* value);
-	bool initialize_impl();
-
-	bool m_initialized = false;
-	std::mutex m_instance_mutex;
-};
-
-#endif
diff --git a/rpcs3/Input/sdl_pad_handler.cpp b/rpcs3/Input/sdl_pad_handler.cpp
deleted file mode 100644
index ef73c81a20..0000000000
--- a/rpcs3/Input/sdl_pad_handler.cpp
+++ /dev/null
@@ -1,1135 +0,0 @@
-#ifdef HAVE_SDL3
-
-#include "stdafx.h"
-#include "sdl_pad_handler.h"
-#include "sdl_instance.h"
-#include "Emu/system_utils.hpp"
-#include "Emu/system_config.h"
-#include "Emu/System.h"
-
-#include <mutex>
-
-LOG_CHANNEL(sdl_log, "SDL");
-
-template <>
-void fmt_class_string<SDL_GUID>::format(std::string& out, u64 arg)
-{
-	const SDL_GUID& guid = get_object(arg);
-	char str[sizeof(SDL_GUID) * 2 + 1] {};
-	SDL_GUIDToString(guid, str, sizeof(str));
-	fmt::append(out, "%s", str);
-}
-
-sdl_pad_handler::sdl_pad_handler() : PadHandlerBase(pad_handler::sdl)
-{
-	button_list =
-	{
-		{ SDLKeyCodes::None,     ""         },
-		{ SDLKeyCodes::South,    "South"    },
-		{ SDLKeyCodes::East,     "East"     },
-		{ SDLKeyCodes::West,     "West"     },
-		{ SDLKeyCodes::North,    "North"    },
-		{ SDLKeyCodes::Left,     "Left"     },
-		{ SDLKeyCodes::Right,    "Right"    },
-		{ SDLKeyCodes::Up,       "Up"       },
-		{ SDLKeyCodes::Down,     "Down"     },
-		{ SDLKeyCodes::LB,       "LB"       },
-		{ SDLKeyCodes::RB,       "RB"       },
-		{ SDLKeyCodes::Back,     "Back"     },
-		{ SDLKeyCodes::Start,    "Start"    },
-		{ SDLKeyCodes::LS,       "LS"       },
-		{ SDLKeyCodes::RS,       "RS"       },
-		{ SDLKeyCodes::Guide,    "Guide"    },
-		{ SDLKeyCodes::Misc1,    "Misc 1"   },
-		{ SDLKeyCodes::Misc2,    "Misc 2"   },
-		{ SDLKeyCodes::Misc3,    "Misc 3"   },
-		{ SDLKeyCodes::Misc4,    "Misc 4"   },
-		{ SDLKeyCodes::Misc5,    "Misc 5"   },
-		{ SDLKeyCodes::Misc6,    "Misc 6"   },
-		{ SDLKeyCodes::RPaddle1, "R Paddle 1" },
-		{ SDLKeyCodes::LPaddle1, "L Paddle 1" },
-		{ SDLKeyCodes::RPaddle2, "R Paddle 2" },
-		{ SDLKeyCodes::LPaddle2, "L Paddle 2" },
-		{ SDLKeyCodes::Touchpad, "Touchpad" },
-		{ SDLKeyCodes::Touch_L,  "Touch Left" },
-		{ SDLKeyCodes::Touch_R,  "Touch Right" },
-		{ SDLKeyCodes::Touch_U,  "Touch Up" },
-		{ SDLKeyCodes::Touch_D,  "Touch Down" },
-		{ SDLKeyCodes::LT,       "LT"       },
-		{ SDLKeyCodes::RT,       "RT"       },
-		{ SDLKeyCodes::LSXNeg,   "LS X-"    },
-		{ SDLKeyCodes::LSXPos,   "LS X+"    },
-		{ SDLKeyCodes::LSYPos,   "LS Y+"    },
-		{ SDLKeyCodes::LSYNeg,   "LS Y-"    },
-		{ SDLKeyCodes::RSXNeg,   "RS X-"    },
-		{ SDLKeyCodes::RSXPos,   "RS X+"    },
-		{ SDLKeyCodes::RSYPos,   "RS Y+"    },
-		{ SDLKeyCodes::RSYNeg,   "RS Y-"    },
-		{ SDLKeyCodes::PressureCross,    "South" }, // Same name as non-pressure button
-		{ SDLKeyCodes::PressureCircle,   "East" },  // Same name as non-pressure button
-		{ SDLKeyCodes::PressureSquare,   "West" },  // Same name as non-pressure button
-		{ SDLKeyCodes::PressureTriangle, "North" }, // Same name as non-pressure button
-		{ SDLKeyCodes::PressureL1,       "LB" },    // Same name as non-pressure button
-		{ SDLKeyCodes::PressureR1,       "RB" },    // Same name as non-pressure button
-		{ SDLKeyCodes::PressureUp,       "Up" },    // Same name as non-pressure button
-		{ SDLKeyCodes::PressureDown,     "Down" },  // Same name as non-pressure button
-		{ SDLKeyCodes::PressureLeft,     "Left" },  // Same name as non-pressure button
-		{ SDLKeyCodes::PressureRight,    "Right" }, // Same name as non-pressure button
-	};
-
-	init_configs();
-
-	// Define border values
-	thumb_max = SDL_JOYSTICK_AXIS_MAX;
-	trigger_min = 0;
-	trigger_max = SDL_JOYSTICK_AXIS_MAX;
-
-	// set capabilities
-	b_has_config = true;
-	b_has_deadzones = true;
-	b_has_rumble = true;
-	b_has_motion = true;
-	b_has_led = true;
-	b_has_player_led = true;
-	b_has_rgb = true;
-	b_has_battery = true;
-	b_has_battery_led = true;
-	b_has_orientation = true;
-
-	m_trigger_threshold = trigger_max / 2;
-	m_thumb_threshold = thumb_max / 2;
-}
-
-sdl_pad_handler::~sdl_pad_handler()
-{
-	if (!m_is_init)
-		return;
-
-	for (auto& controller : m_controllers)
-	{
-		if (controller.second && controller.second->sdl.gamepad)
-		{
-			set_rumble(controller.second.get(), 0, 0);
-			SDL_CloseGamepad(controller.second->sdl.gamepad);
-			controller.second->sdl.gamepad = nullptr;
-		}
-	}
-}
-
-void sdl_pad_handler::init_config(cfg_pad* cfg)
-{
-	if (!cfg) return;
-
-	// Set default button mapping
-	cfg->ls_left.def  = ::at32(button_list, SDLKeyCodes::LSXNeg);
-	cfg->ls_down.def  = ::at32(button_list, SDLKeyCodes::LSYNeg);
-	cfg->ls_right.def = ::at32(button_list, SDLKeyCodes::LSXPos);
-	cfg->ls_up.def    = ::at32(button_list, SDLKeyCodes::LSYPos);
-	cfg->rs_left.def  = ::at32(button_list, SDLKeyCodes::RSXNeg);
-	cfg->rs_down.def  = ::at32(button_list, SDLKeyCodes::RSYNeg);
-	cfg->rs_right.def = ::at32(button_list, SDLKeyCodes::RSXPos);
-	cfg->rs_up.def    = ::at32(button_list, SDLKeyCodes::RSYPos);
-	cfg->start.def    = ::at32(button_list, SDLKeyCodes::Start);
-	cfg->select.def   = ::at32(button_list, SDLKeyCodes::Back);
-	cfg->ps.def       = ::at32(button_list, SDLKeyCodes::Guide);
-	cfg->square.def   = ::at32(button_list, SDLKeyCodes::West);
-	cfg->cross.def    = ::at32(button_list, SDLKeyCodes::South);
-	cfg->circle.def   = ::at32(button_list, SDLKeyCodes::East);
-	cfg->triangle.def = ::at32(button_list, SDLKeyCodes::North);
-	cfg->left.def     = ::at32(button_list, SDLKeyCodes::Left);
-	cfg->down.def     = ::at32(button_list, SDLKeyCodes::Down);
-	cfg->right.def    = ::at32(button_list, SDLKeyCodes::Right);
-	cfg->up.def       = ::at32(button_list, SDLKeyCodes::Up);
-	cfg->r1.def       = ::at32(button_list, SDLKeyCodes::RB);
-	cfg->r2.def       = ::at32(button_list, SDLKeyCodes::RT);
-	cfg->r3.def       = ::at32(button_list, SDLKeyCodes::RS);
-	cfg->l1.def       = ::at32(button_list, SDLKeyCodes::LB);
-	cfg->l2.def       = ::at32(button_list, SDLKeyCodes::LT);
-	cfg->l3.def       = ::at32(button_list, SDLKeyCodes::LS);
-
-	cfg->pressure_intensity_button.def = ::at32(button_list, SDLKeyCodes::None);
-	cfg->analog_limiter_button.def = ::at32(button_list, SDLKeyCodes::None);
-	cfg->orientation_reset_button.def = ::at32(button_list, SDLKeyCodes::None);
-
-	// Set default misc variables
-	cfg->lstick_anti_deadzone.def = static_cast<u32>(0.13 * thumb_max); // 13%
-	cfg->rstick_anti_deadzone.def = static_cast<u32>(0.13 * thumb_max); // 13%
-	cfg->lstickdeadzone.def    = 8000; // between 0 and SDL_JOYSTICK_AXIS_MAX
-	cfg->rstickdeadzone.def    = 8000; // between 0 and SDL_JOYSTICK_AXIS_MAX
-	cfg->ltriggerthreshold.def = 0; // between 0 and SDL_JOYSTICK_AXIS_MAX
-	cfg->rtriggerthreshold.def = 0; // between 0 and SDL_JOYSTICK_AXIS_MAX
-	cfg->lpadsquircling.def    = 8000;
-	cfg->rpadsquircling.def    = 8000;
-
-	// Set default color value
-	cfg->colorR.def = 0;
-	cfg->colorG.def = 0;
-	cfg->colorB.def = 20;
-
-	// Set default LED options
-	cfg->led_battery_indicator.def            = false;
-	cfg->led_battery_indicator_brightness.def = 10;
-	cfg->led_low_battery_blink.def            = true;
-
-	// apply defaults
-	cfg->from_default();
-}
-
-bool sdl_pad_handler::Init()
-{
-	if (m_is_init)
-		return true;
-
-	if (!sdl_instance::get_instance().initialize())
-		return false;
-
-	if (g_cfg.io.load_sdl_mappings)
-	{
-		const std::string db_path = rpcs3::utils::get_input_config_root() + "gamecontrollerdb.txt";
-		sdl_log.notice("Adding mappings from file '%s'", db_path);
-
-		if (fs::is_file(db_path))
-		{
-			if (SDL_AddGamepadMappingsFromFile(db_path.c_str()) < 0)
-			{
-				sdl_log.error("Could not add mappings from file '%s'! SDL Error: %s", db_path, SDL_GetError());
-			}
-		}
-		else
-		{
-			sdl_log.warning("Could not add mappings from file '%s'! File does not exist!", db_path);
-		}
-	}
-
-	if (const char* revision = SDL_GetRevision(); revision && strlen(revision) > 0)
-	{
-		sdl_log.notice("Using version: %d.%d.%d (revision='%s')", SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_MICRO_VERSION, revision);
-	}
-	else
-	{
-		sdl_log.notice("Using version: %d.%d.%d", SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_MICRO_VERSION);
-	}
-
-	m_is_init = true;
-	enumerate_devices();
-
-	return true;
-}
-
-void sdl_pad_handler::process()
-{
-	if (!m_is_init)
-		return;
-
-	sdl_instance::get_instance().pump_events();
-
-	PadHandlerBase::process();
-}
-
-SDLDevice::sdl_info sdl_pad_handler::get_sdl_info(SDL_JoystickID id)
-{
-	SDLDevice::sdl_info info{};
-	info.gamepad = SDL_OpenGamepad(id);
-
-	if (!info.gamepad)
-	{
-		sdl_log.error("Could not open device %d! SDL Error: %s", id, SDL_GetError());
-		return {};
-	}
-
-	if (const char* name = SDL_GetGamepadName(info.gamepad))
-	{
-		info.name = name;
-	}
-
-	if (const char* path = SDL_GetGamepadPath(info.gamepad))
-	{
-		info.path = path;
-	}
-
-	if (const char* serial = SDL_GetGamepadSerial(info.gamepad))
-	{
-		info.serial = serial;
-	}
-
-	const SDL_PropertiesID property_id = SDL_GetGamepadProperties(info.gamepad);
-	if (!property_id)
-	{
-		sdl_log.error("Could not get properties of device %d! SDL Error: %s", id, SDL_GetError());
-	}
-
-	info.type = SDL_GetGamepadType(info.gamepad);
-	info.real_type = SDL_GetRealGamepadType(info.gamepad);
-	info.guid = SDL_GetGamepadGUIDForID(id);
-	info.vid = SDL_GetGamepadVendor(info.gamepad);
-	info.pid = SDL_GetGamepadProduct(info.gamepad);
-	info.product_version = SDL_GetGamepadProductVersion(info.gamepad);
-	info.firmware_version = SDL_GetGamepadFirmwareVersion(info.gamepad);
-	info.has_led = SDL_HasProperty(property_id, SDL_PROP_GAMEPAD_CAP_RGB_LED_BOOLEAN);
-	info.has_mono_led = SDL_HasProperty(property_id, SDL_PROP_GAMEPAD_CAP_MONO_LED_BOOLEAN);
-	info.has_player_led = SDL_HasProperty(property_id, SDL_PROP_GAMEPAD_CAP_PLAYER_LED_BOOLEAN);
-	info.has_rumble = SDL_HasProperty(property_id, SDL_PROP_GAMEPAD_CAP_RUMBLE_BOOLEAN);
-	info.has_rumble_triggers = SDL_HasProperty(property_id, SDL_PROP_GAMEPAD_CAP_TRIGGER_RUMBLE_BOOLEAN);
-	info.has_accel = SDL_GamepadHasSensor(info.gamepad, SDL_SENSOR_ACCEL);
-	info.has_gyro = SDL_GamepadHasSensor(info.gamepad, SDL_SENSOR_GYRO);
-
-	if (const int num_touchpads = SDL_GetNumGamepadTouchpads(info.gamepad); num_touchpads > 0)
-	{
-		info.touchpads.resize(num_touchpads);
-
-		for (int i = 0; i < num_touchpads; i++)
-		{
-			SDLDevice::touchpad& touchpad = ::at32(info.touchpads, i);
-			touchpad.index = i;
-
-			if (const int num_fingers = SDL_GetNumGamepadTouchpadFingers(info.gamepad, touchpad.index); num_fingers > 0)
-			{
-				touchpad.fingers.resize(num_fingers);
-
-				for (int f = 0; f < num_fingers; f++)
-				{
-					::at32(touchpad.fingers, f).index = f;
-				}
-			}
-		}
-	}
-
-	sdl_log.notice("Found game pad %d: type=%d, real_type=%d, name='%s', guid='%s', path='%s', serial='%s', vid=0x%x, pid=0x%x, product_version=0x%x, firmware_version=0x%x, has_led=%d, has_player_led=%d, has_mono_led=%d, has_rumble=%d, has_rumble_triggers=%d, has_accel=%d, has_gyro=%d",
-		id, static_cast<int>(info.type), static_cast<int>(info.real_type), info.name, info.guid, info.path, info.serial, info.vid, info.pid, info.product_version, info.firmware_version, info.has_led, info.has_player_led, info.has_mono_led, info.has_rumble, info.has_rumble_triggers, info.has_accel, info.has_gyro);
-
-	if (info.has_accel)
-	{
-		if (!SDL_SetGamepadSensorEnabled(info.gamepad, SDL_SENSOR_ACCEL, true) ||
-			!SDL_GamepadSensorEnabled(info.gamepad, SDL_SENSOR_ACCEL))
-		{
-			sdl_log.error("Could not activate acceleration sensor of device %d! SDL Error: %s", id, SDL_GetError());
-			info.has_accel = false;
-		}
-		else
-		{
-			info.data_rate_accel = SDL_GetGamepadSensorDataRate(info.gamepad, SDL_SENSOR_ACCEL);
-			sdl_log.notice("Acceleration sensor data rate of device %d = %.2f/s", id, info.data_rate_accel);
-		}
-	}
-
-	if (info.has_gyro)
-	{
-		if (!SDL_SetGamepadSensorEnabled(info.gamepad, SDL_SENSOR_GYRO, true) ||
-			!SDL_GamepadSensorEnabled(info.gamepad, SDL_SENSOR_GYRO))
-		{
-			sdl_log.error("Could not activate gyro sensor of device %d! SDL Error: %s", id, SDL_GetError());
-			info.has_gyro = false;
-		}
-		else
-		{
-			info.data_rate_gyro = SDL_GetGamepadSensorDataRate(info.gamepad, SDL_SENSOR_GYRO);
-			sdl_log.notice("Gyro sensor data rate of device %d = %.2f/s", id, info.data_rate_accel);
-		}
-	}
-
-	for (int i = 0; i < SDL_GAMEPAD_BUTTON_COUNT; i++)
-	{
-		const SDL_GamepadButton button_id = static_cast<SDL_GamepadButton>(i);
-		if (SDL_GamepadHasButton(info.gamepad, button_id))
-		{
-			info.button_ids.insert(button_id);
-		}
-	}
-
-	for (int i = 0; i < SDL_GAMEPAD_AXIS_COUNT; i++)
-	{
-		const SDL_GamepadAxis axis_id = static_cast<SDL_GamepadAxis>(i);
-		if (SDL_GamepadHasAxis(info.gamepad, axis_id))
-		{
-			info.axis_ids.insert(axis_id);
-		}
-	}
-
-	// The DS3 may have extra pressure sensitive buttons as axis
-	if (info.real_type == SDL_GamepadType::SDL_GAMEPAD_TYPE_PS3)
-	{
-		if (SDL_Joystick* joystick = SDL_GetGamepadJoystick(info.gamepad))
-		{
-			const int num_axes = SDL_GetNumJoystickAxes(joystick);
-			const int num_buttons = SDL_GetNumJoystickButtons(joystick);
-
-			info.is_ds3_with_pressure_buttons = num_axes == 16 && num_buttons == 11;
-
-			sdl_log.notice("DS3 device %d has %d axis and %d buttons (has_pressure_buttons=%d)", id, num_axes, num_buttons, info.is_ds3_with_pressure_buttons);
-
-			if (info.is_ds3_with_pressure_buttons)
-			{
-				// Add pressure buttons
-				for (int i = SDL_GAMEPAD_AXIS_COUNT; i < num_axes; i++)
-				{
-					const SDL_GamepadAxis axis_id = static_cast<SDL_GamepadAxis>(i);
-					//if (SDL_GamepadHasAxis(info.gamepad, axis_id)) // Always returns false for axis >= SDL_GAMEPAD_AXIS_COUNT
-					{
-						info.axis_ids.insert(axis_id);
-					}
-				}
-			}
-		}
-	}
-
-	return info;
-}
-
-std::vector<pad_list_entry> sdl_pad_handler::list_devices()
-{
-	std::vector<pad_list_entry> pads_list;
-
-	if (!Init())
-		return pads_list;
-
-	for (const auto& controller : m_controllers)
-	{
-		pads_list.emplace_back(controller.first, false);
-	}
-
-	return pads_list;
-}
-
-void sdl_pad_handler::enumerate_devices()
-{
-	if (!m_is_init)
-		return;
-
-	int count = 0;
-	SDL_JoystickID* gamepads = SDL_GetGamepads(&count);
-	for (int i = 0; i < count && gamepads; i++)
-	{
-		if (SDLDevice::sdl_info info = get_sdl_info(gamepads[i]); info.gamepad)
-		{
-			std::shared_ptr<SDLDevice> dev = std::make_shared<SDLDevice>();
-			dev->sdl = std::move(info);
-
-			// Count existing real devices with the same name
-			u32 device_count = 1; // This device also counts
-			for (const auto& controller : m_controllers)
-			{
-				if (controller.second && !controller.second->sdl.is_virtual_device && controller.second->sdl.name == dev->sdl.name)
-				{
-					device_count++;
-				}
-			}
-
-			// Add real device
-			const std::string device_name = fmt::format("%s %d", dev->sdl.name, device_count);
-			m_controllers[device_name] = std::move(dev);
-		}
-	}
-	SDL_free(gamepads);
-}
-
-std::shared_ptr<SDLDevice> sdl_pad_handler::get_device_by_gamepad(SDL_Gamepad* gamepad) const
-{
-	if (!gamepad)
-		return nullptr;
-
-	const char* name = SDL_GetGamepadName(gamepad);
-	const char* path = SDL_GetGamepadPath(gamepad);
-	const char* serial = SDL_GetGamepadSerial(gamepad);
-
-	// Try to find a real device
-	for (const auto& controller : m_controllers)
-	{
-		if (!controller.second || controller.second->sdl.is_virtual_device)
-			continue;
-
-		const auto is_same = [](const char* c, std::string_view s) -> bool
-		{
-			return c ? c == s : s.empty();
-		};
-
-		if (is_same(name, controller.second->sdl.name) &&
-			is_same(path, controller.second->sdl.path) &&
-			is_same(serial, controller.second->sdl.serial))
-		{
-			return controller.second;
-		}
-	}
-
-	// Try to find a virtual device if we can't find a real device
-	for (const auto& controller : m_controllers)
-	{
-		if (!controller.second || !controller.second->sdl.is_virtual_device)
-			continue;
-
-		if (name && controller.second->sdl.name.starts_with(name))
-		{
-			return controller.second;
-		}
-	}
-
-	return nullptr;
-}
-
-std::shared_ptr<PadDevice> sdl_pad_handler::get_device(const std::string& device)
-{
-	if (!Init() || device.empty())
-		return nullptr;
-
-	if (auto it = m_controllers.find(device); it != m_controllers.end())
-	{
-		return it->second;
-	}
-
-	// Add a virtual controller until it is actually attached
-	std::shared_ptr<SDLDevice> dev = std::make_unique<SDLDevice>();
-	dev->sdl.name = device;
-	dev->sdl.is_virtual_device = true;
-	m_controllers.emplace(device, dev);
-	sdl_log.warning("Adding empty device: %s", device);
-
-	return dev;
-}
-
-PadHandlerBase::connection sdl_pad_handler::update_connection(const std::shared_ptr<PadDevice>& device)
-{
-	if (SDLDevice* dev = static_cast<SDLDevice*>(device.get()))
-	{
-		if (dev->sdl.gamepad)
-		{
-			if (SDL_GamepadConnected(dev->sdl.gamepad))
-			{
-				if (SDL_HasEvents(SDL_EventType::SDL_EVENT_GAMEPAD_AXIS_MOTION, SDL_EventType::SDL_EVENT_GAMEPAD_BUTTON_UP) ||
-					SDL_HasEvents(SDL_EventType::SDL_EVENT_GAMEPAD_TOUCHPAD_DOWN, SDL_EventType::SDL_EVENT_GAMEPAD_SENSOR_UPDATE) ||
-					SDL_HasEvent(SDL_EventType::SDL_EVENT_JOYSTICK_BATTERY_UPDATED))
-				{
-					return connection::connected;
-				}
-
-				return connection::no_data;
-			}
-
-			SDL_CloseGamepad(dev->sdl.gamepad);
-			dev->sdl.gamepad = nullptr;
-		}
-
-		// Try to reconnect
-
-		int count = 0;
-		SDL_JoystickID* gamepads = SDL_GetGamepads(&count);
-		for (int i = 0; i < count; i++)
-		{
-			// Get game pad
-			SDL_Gamepad* gamepad = SDL_OpenGamepad(gamepads[i]);
-			if (!gamepad)
-			{
-				continue;
-			}
-
-			// Find out if we already know this controller
-			std::shared_ptr<SDLDevice> sdl_device = get_device_by_gamepad(gamepad);
-			if (!sdl_device)
-			{
-				// Close the game pad if we don't know it.
-				SDL_CloseGamepad(gamepad);
-				continue;
-			}
-
-			// Re-attach the controller if the device matches the current one
-			if (sdl_device.get() == dev)
-			{
-				if (SDLDevice::sdl_info info = get_sdl_info(gamepads[i]); info.gamepad)
-				{
-					dev->sdl = std::move(info);
-				}
-				break;
-			}
-		}
-		SDL_free(gamepads);
-	}
-
-	return connection::disconnected;
-}
-
-void sdl_pad_handler::SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool player_led, bool battery_led, u32 battery_led_brightness)
-{
-	std::shared_ptr<PadDevice> device = get_device(padId);
-	SDLDevice* dev = static_cast<SDLDevice*>(device.get());
-	if (!dev)
-		return;
-
-	dev->player_id = player_id;
-	dev->config = get_config(padId);
-
-	ensure(dev->config);
-
-	set_rumble(dev, large_motor, small_motor);
-
-	dev->update_player_leds = true;
-	dev->config->player_led_enabled.set(player_led);
-
-	if (battery_led)
-	{
-		const u32 combined_color = get_battery_color(dev->sdl.power_level, battery_led_brightness);
-		dev->config->colorR.set(combined_color >> 8);
-		dev->config->colorG.set(combined_color & 0xff);
-		dev->config->colorB.set(0);
-	}
-	else if (r >= 0 && g >= 0 && b >= 0 && r <= 255 && g <= 255 && b <= 255)
-	{
-		dev->config->colorR.set(r);
-		dev->config->colorG.set(g);
-		dev->config->colorB.set(b);
-	}
-
-	if ((dev->sdl.has_led || dev->sdl.has_mono_led) && !SDL_SetGamepadLED(dev->sdl.gamepad, r, g, b))
-	{
-		sdl_log.error("Could not set LED of device %d! SDL Error: %s", player_id, SDL_GetError());
-	}
-
-	if (dev->sdl.has_player_led && !SDL_SetGamepadPlayerIndex(dev->sdl.gamepad, player_led ? player_id : -1))
-	{
-		sdl_log.error("Could not set player LED of device %d! SDL Error: %s", player_id, SDL_GetError());
-	}
-}
-
-u32 sdl_pad_handler::get_battery_color(int power_level, u32 brightness) const
-{
-	u32 combined_color{};
-
-	if (power_level < 20)      combined_color = 0xFF00;
-	else if (power_level < 40) combined_color = 0xFF33;
-	else if (power_level < 60) combined_color = 0xFFCC;
-	else if (power_level < 80) combined_color = 0x66FF;
-	else                       combined_color = 0x00FF;
-
-	const u32 red = (combined_color >> 8) * brightness / 100;
-	const u32 green = (combined_color & 0xff) * brightness / 100;
-	return ((red << 8) | green);
-}
-
-u32 sdl_pad_handler::get_battery_level(const std::string& padId)
-{
-	std::shared_ptr<PadDevice> device = get_device(padId);
-	SDLDevice* dev = static_cast<SDLDevice*>(device.get());
-	if (!dev)
-		return 0;
-
-	if (dev->sdl.gamepad)
-	{
-		const SDL_PowerState power_state = SDL_GetGamepadPowerInfo(dev->sdl.gamepad, &dev->sdl.power_level);
-		switch (power_state)
-		{
-		case SDL_PowerState::SDL_POWERSTATE_ERROR:
-		case SDL_PowerState::SDL_POWERSTATE_UNKNOWN:
-			return 0;
-		default:
-			return std::clamp(dev->sdl.power_level, 0, 100);
-		}
-	}
-
-	 return 0;
-}
-
-void sdl_pad_handler::get_extended_info(const pad_ensemble& binding)
-{
-	const auto& pad = binding.pad;
-	SDLDevice* dev = static_cast<SDLDevice*>(binding.device.get());
-	if (!dev || !dev->sdl.gamepad || !pad)
-		return;
-
-	if (dev->sdl.gamepad)
-	{
-		const SDL_PowerState power_state = SDL_GetGamepadPowerInfo(dev->sdl.gamepad, &dev->sdl.power_level);
-		switch (power_state)
-		{
-		case SDL_PowerState::SDL_POWERSTATE_ON_BATTERY:
-			pad->m_battery_level = std::clamp(dev->sdl.power_level, 0, 100);
-			pad->m_cable_state = 0;
-			break;
-		case SDL_PowerState::SDL_POWERSTATE_NO_BATTERY:
-		case SDL_PowerState::SDL_POWERSTATE_CHARGING:
-		case SDL_PowerState::SDL_POWERSTATE_CHARGED:
-			pad->m_battery_level = std::clamp(dev->sdl.power_level, 0, 100);
-			pad->m_cable_state = 1;
-			break;
-		default:
-			pad->m_battery_level = 0;
-			pad->m_cable_state = 0;
-			break;
-		}
-	}
-	else
-	{
-		pad->m_cable_state = 1;
-		pad->m_battery_level = 100;
-	}
-
-	if (dev->sdl.has_accel)
-	{
-		if (!SDL_GetGamepadSensorData(dev->sdl.gamepad, SDL_SENSOR_ACCEL, dev->values_accel.data(), 3))
-		{
-			sdl_log.error("Could not get acceleration sensor data of device %d! SDL Error: %s", dev->player_id, SDL_GetError());
-		}
-		else
-		{
-			const f32 accel_x = dev->values_accel[0]; // Angular speed around the x axis (pitch)
-			const f32 accel_y = dev->values_accel[1]; // Angular speed around the y axis (yaw)
-			const f32 accel_z = dev->values_accel[2]; // Angular speed around the z axis (roll)
-
-			// Convert to ds3. The ds3 resolution is 113/G.
-			pad->m_sensors[0].m_value = Clamp0To1023((accel_x / SDL_STANDARD_GRAVITY) * -1 * MOTION_ONE_G + 512);
-			pad->m_sensors[1].m_value = Clamp0To1023((accel_y / SDL_STANDARD_GRAVITY) * -1 * MOTION_ONE_G + 512);
-			pad->m_sensors[2].m_value = Clamp0To1023((accel_z / SDL_STANDARD_GRAVITY) * -1 * MOTION_ONE_G + 512);
-		}
-	}
-
-	if (dev->sdl.has_gyro)
-	{
-		if (!SDL_GetGamepadSensorData(dev->sdl.gamepad, SDL_SENSOR_GYRO, dev->values_gyro.data(), 3))
-		{
-			sdl_log.error("Could not get gyro sensor data of device %d! SDL Error: %s", dev->player_id, SDL_GetError());
-		}
-		else
-		{
-			//const f32 gyro_x = dev->values_gyro[0]; // Angular speed around the x axis (pitch)
-			const f32 gyro_y = dev->values_gyro[1]; // Angular speed around the y axis (yaw)
-			//const f32 gyro_z = dev->values_gyro[2]; // Angular speed around the z axis (roll)
-
-			// Convert to ds3. The ds3 resolution is 123/90°/sec. The SDL gyro is measured in rad/sec.
-			const f32 degree = rad_to_degree(gyro_y);
-			pad->m_sensors[3].m_value = Clamp0To1023(degree * (123.f / 90.f) + 512);
-		}
-	}
-
-	if (dev->sdl.has_accel || dev->sdl.has_gyro)
-	{
-		set_raw_orientation(*pad);
-	}
-}
-
-void sdl_pad_handler::get_motion_sensors(const std::string& pad_id, const motion_callback& callback, const motion_fail_callback& fail_callback, motion_preview_values preview_values, const std::array<AnalogSensor, 4>& sensors)
-{
-	if (!m_is_init)
-		return;
-
-	sdl_instance::get_instance().pump_events();
-
-	PadHandlerBase::get_motion_sensors(pad_id, callback, fail_callback, preview_values, sensors);
-}
-
-PadHandlerBase::connection sdl_pad_handler::get_next_button_press(const std::string& padId, const pad_callback& callback, const pad_fail_callback& fail_callback, gui_call_type call_type, const std::vector<std::string>& buttons)
-{
-	if (!m_is_init)
-		return connection::disconnected;
-
-	sdl_instance::get_instance().pump_events();
-
-	return PadHandlerBase::get_next_button_press(padId, callback, fail_callback, call_type, buttons);
-}
-
-void sdl_pad_handler::apply_pad_data(const pad_ensemble& binding)
-{
-	const auto& pad = binding.pad;
-	SDLDevice* dev = static_cast<SDLDevice*>(binding.device.get());
-	if (!dev || !pad)
-		return;
-
-	cfg_pad* cfg = dev->config;
-
-	// The left motor is the low-frequency rumble motor. The right motor is the high-frequency rumble motor.
-	// The two motors are not the same, and they create different vibration effects. Values range between 0 to 65535.
-	if (dev->sdl.has_rumble || dev->sdl.has_rumble_triggers)
-	{
-		const u8 speed_large = cfg->get_large_motor_speed(pad->m_vibrateMotors);
-		const u8 speed_small = cfg->get_small_motor_speed(pad->m_vibrateMotors);
-
-		dev->new_output_data |= dev->large_motor != speed_large || dev->small_motor != speed_small;
-
-		dev->large_motor = speed_large;
-		dev->small_motor = speed_small;
-
-		const auto now = steady_clock::now();
-		const auto elapsed = now - dev->last_output;
-
-		// XBox One Controller can't handle faster vibration updates than ~10ms. Elite is even worse. So I'll use 20ms to be on the safe side. No lag was noticable.
-		if ((dev->new_output_data && elapsed > 20ms) || elapsed > min_output_interval)
-		{
-			set_rumble(dev, speed_large, speed_small);
-
-			dev->new_output_data = false;
-			dev->last_output = now;
-		}
-	}
-
-	if (dev->sdl.has_led || dev->sdl.has_mono_led)
-	{
-		// Use LEDs to indicate battery level
-		if (cfg->led_battery_indicator)
-		{
-			// This makes sure that the LED color doesn't update every 1ms. DS4 only reports battery level in 10% increments
-			if (dev->sdl.last_power_level != dev->sdl.power_level)
-			{
-				const u32 combined_color = get_battery_color(dev->sdl.power_level, cfg->led_battery_indicator_brightness);
-				cfg->colorR.set(combined_color >> 8);
-				cfg->colorG.set(combined_color & 0xff);
-				cfg->colorB.set(0);
-
-				dev->sdl.last_power_level = dev->sdl.power_level;
-				dev->led_needs_update = true;
-			}
-		}
-
-		// Blink LED when battery is low
-		if (cfg->led_low_battery_blink)
-		{
-			const bool low_battery = pad->m_battery_level <= 20;
-
-			if (dev->led_is_blinking && !low_battery)
-			{
-				dev->led_is_blinking = false;
-				dev->led_needs_update = true;
-			}
-			else if (!dev->led_is_blinking && low_battery)
-			{
-				dev->led_is_blinking = true;
-				dev->led_needs_update = true;
-			}
-
-			if (dev->led_is_blinking)
-			{
-				if (const steady_clock::time_point now = steady_clock::now(); (now - dev->led_timestamp) > 500ms)
-				{
-					dev->led_is_on = !dev->led_is_on;
-					dev->led_timestamp = now;
-					dev->led_needs_update = true;
-				}
-			}
-		}
-		else if (!dev->led_is_on)
-		{
-			dev->led_is_on = true;
-			dev->led_needs_update = true;
-		}
-
-		if (dev->led_needs_update)
-		{
-			const u8 r = dev->led_is_on ? cfg->colorR : 0;
-			const u8 g = dev->led_is_on ? cfg->colorG : 0;
-			const u8 b = dev->led_is_on ? cfg->colorB : 0;
-
-			if (!SDL_SetGamepadLED(dev->sdl.gamepad, r, g, b))
-			{
-				sdl_log.error("Could not set LED of device %d! SDL Error: %s", dev->player_id, SDL_GetError());
-			}
-
-			dev->led_needs_update = false;
-		}
-	}
-
-	if (dev->sdl.has_player_led && (dev->update_player_leds || dev->enable_player_leds != cfg->player_led_enabled.get()))
-	{
-		dev->enable_player_leds = cfg->player_led_enabled.get();
-		dev->update_player_leds = false;
-
-		if (!SDL_SetGamepadPlayerIndex(dev->sdl.gamepad, dev->enable_player_leds ? dev->player_id : -1))
-		{
-			sdl_log.error("Could not set player LED of device %d! SDL Error: %s", dev->player_id, SDL_GetError());
-		}
-	}
-}
-
-void sdl_pad_handler::set_rumble(SDLDevice* dev, u8 speed_large, u8 speed_small)
-{
-	if (!dev || !dev->sdl.gamepad) return;
-
-	constexpr u32 rumble_duration_ms = static_cast<u32>((min_output_interval + 100ms).count()); // Some number higher than the min_output_interval.
-
-	if (dev->sdl.has_rumble)
-	{
-		if (!SDL_RumbleGamepad(dev->sdl.gamepad, speed_large * 257, speed_small * 257, rumble_duration_ms))
-		{
-			sdl_log.error("Unable to play game pad rumble of player %d! SDL Error: %s", dev->player_id, SDL_GetError());
-		}
-	}
-
-	// NOTE: Disabled for now. The triggers do not seem to be implemented correctly in SDL in the current version.
-	//       The rumble is way too intensive and has a high frequency. It is very displeasing at the moment.
-	//       In the future we could use additional trigger rumble to enhance the existing rumble.
-	if (false && dev->sdl.has_rumble_triggers)
-	{
-		// Only the large motor shall control both triggers. It wouldn't make sense to differentiate here.
-		if (!SDL_RumbleGamepadTriggers(dev->sdl.gamepad, speed_large * 257, speed_large * 257, rumble_duration_ms))
-		{
-			sdl_log.error("Unable to play game pad trigger rumble of player %d! SDL Error: %s", dev->player_id, SDL_GetError());
-		}
-	}
-}
-
-bool sdl_pad_handler::get_is_left_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
-{
-	return keyCode == SDLKeyCodes::LT;
-}
-
-bool sdl_pad_handler::get_is_right_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
-{
-	return keyCode == SDLKeyCodes::RT;
-}
-
-bool sdl_pad_handler::get_is_left_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
-{
-	switch (keyCode)
-	{
-	case SDLKeyCodes::LSXNeg:
-	case SDLKeyCodes::LSXPos:
-	case SDLKeyCodes::LSYPos:
-	case SDLKeyCodes::LSYNeg:
-		return true;
-	default:
-		return false;
-	}
-}
-
-bool sdl_pad_handler::get_is_right_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
-{
-	switch (keyCode)
-	{
-	case SDLKeyCodes::RSXNeg:
-	case SDLKeyCodes::RSXPos:
-	case SDLKeyCodes::RSYPos:
-	case SDLKeyCodes::RSYNeg:
-		return true;
-	default:
-		return false;
-	}
-}
-
-bool sdl_pad_handler::get_is_touch_pad_motion(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
-{
-	switch (keyCode)
-	{
-	case SDLKeyCodes::Touch_L:
-	case SDLKeyCodes::Touch_R:
-	case SDLKeyCodes::Touch_U:
-	case SDLKeyCodes::Touch_D:
-		return true;
-	default:
-		return false;
-	}
-}
-
-std::unordered_map<u64, u16> sdl_pad_handler::get_button_values(const std::shared_ptr<PadDevice>& device)
-{
-	std::unordered_map<u64, u16> values;
-	SDLDevice* dev = static_cast<SDLDevice*>(device.get());
-	if (!dev || !dev->sdl.gamepad)
-		return values;
-
-	std::set<SDLKeyCodes> pressed_pressure_buttons;
-
-	for (SDL_GamepadButton button_id : dev->sdl.button_ids)
-	{
-		const bool value = SDL_GetGamepadButton(dev->sdl.gamepad, button_id);
-		const SDLKeyCodes key_code = get_button_code(button_id);
-
-		// NOTE: SDL does not simply support DS3 button intensity in the current version
-		//       So we have to skip the normal buttons if a DS3 with pressure buttons was detected
-		if (dev->sdl.is_ds3_with_pressure_buttons)
-		{
-			switch (key_code)
-			{
-			case SDLKeyCodes::North:
-			case SDLKeyCodes::South:
-			case SDLKeyCodes::West:
-			case SDLKeyCodes::East:
-			case SDLKeyCodes::Left:
-			case SDLKeyCodes::Right:
-			case SDLKeyCodes::Up:
-			case SDLKeyCodes::Down:
-			case SDLKeyCodes::LB:
-			case SDLKeyCodes::RB:
-			{
-				static const std::map<SDLKeyCodes, SDLKeyCodes> button_to_pressure =
-				{
-					{ SDLKeyCodes::South, SDLKeyCodes::PressureCross },
-					{ SDLKeyCodes::East, SDLKeyCodes::PressureCircle },
-					{ SDLKeyCodes::West, SDLKeyCodes::PressureSquare },
-					{ SDLKeyCodes::North, SDLKeyCodes::PressureTriangle },
-					{ SDLKeyCodes::LB, SDLKeyCodes::PressureL1 },
-					{ SDLKeyCodes::RB, SDLKeyCodes::PressureR1 },
-					{ SDLKeyCodes::Up, SDLKeyCodes::PressureUp },
-					{ SDLKeyCodes::Down, SDLKeyCodes::PressureDown },
-					{ SDLKeyCodes::Left, SDLKeyCodes::PressureLeft },
-					{ SDLKeyCodes::Right, SDLKeyCodes::PressureRight }
-				};
-
-				if (value)
-				{
-					pressed_pressure_buttons.insert(::at32(button_to_pressure, key_code));
-				}
-				continue;
-			}
-			default:
-				break;
-			}
-		}
-
-		values[key_code] = value ? 255 : 0;
-	}
-
-	for (SDL_GamepadAxis axis_id : dev->sdl.axis_ids)
-	{
-		s16 value = SDL_GetGamepadAxis(dev->sdl.gamepad, axis_id);
-
-		switch (axis_id)
-		{
-		case SDL_GamepadAxis::SDL_GAMEPAD_AXIS_LEFT_TRIGGER:
-			values[SDLKeyCodes::LT] = std::max<u16>(0, value);
-			break;
-		case SDL_GamepadAxis::SDL_GAMEPAD_AXIS_RIGHT_TRIGGER:
-			values[SDLKeyCodes::RT] = std::max<u16>(0, value);
-			break;
-		case SDL_GamepadAxis::SDL_GAMEPAD_AXIS_LEFTX:
-			values[SDLKeyCodes::LSXNeg] = value < 0 ? std::abs(value) - 1 : 0;
-			values[SDLKeyCodes::LSXPos] = value > 0 ? value : 0;
-			break;
-		case SDL_GamepadAxis::SDL_GAMEPAD_AXIS_LEFTY:
-			values[SDLKeyCodes::LSYNeg] = value > 0 ? value : 0;
-			values[SDLKeyCodes::LSYPos] = value < 0 ? std::abs(value) - 1 : 0;
-			break;
-		case SDL_GamepadAxis::SDL_GAMEPAD_AXIS_RIGHTX:
-			values[SDLKeyCodes::RSXNeg] = value < 0 ? std::abs(value) - 1 : 0;
-			values[SDLKeyCodes::RSXPos] = value > 0 ? value : 0;
-			break;
-		case SDL_GamepadAxis::SDL_GAMEPAD_AXIS_RIGHTY:
-			values[SDLKeyCodes::RSYNeg] = value > 0 ? value : 0;
-			values[SDLKeyCodes::RSYPos] = value < 0 ? std::abs(value) - 1 : 0;
-			break;
-		default:
-		{
-			if (dev->sdl.is_ds3_with_pressure_buttons)
-			{
-				// Get pressure button value from axis
-				if (const int key_code = SDLKeyCodes::PressureBegin + 1 + axis_id - SDL_GAMEPAD_AXIS_COUNT;
-					key_code > SDLKeyCodes::PressureBegin && key_code < SDLKeyCodes::PressureEnd)
-				{
-					// We need to get the joystick value directly for axis >= SDL_GAMEPAD_AXIS_COUNT
-					if (SDL_Joystick* joystick = SDL_GetGamepadJoystick(dev->sdl.gamepad))
-					{
-						value = SDL_GetJoystickAxis(joystick, axis_id);
-					}
-
-					value = static_cast<s16>(ScaledInput(value, SDL_JOYSTICK_AXIS_MIN, SDL_JOYSTICK_AXIS_MAX, 0.0f, 255.0f));
-
-					if (value <= 0 && pressed_pressure_buttons.contains(static_cast<SDLKeyCodes>(key_code)))
-					{
-						value = 1;
-					}
-
-					values[key_code] = Clamp0To255(value);
-				}
-			}
-			break;
-		}
-		}
-	}
-
-	for (const SDLDevice::touchpad& touchpad : dev->sdl.touchpads)
-	{
-		for (const SDLDevice::touch_point& finger : touchpad.fingers)
-		{
-			bool down = false; // true means the finger is touching the pad
-			f32 x = 0.0f; // 0 = left, 1 = right
-			f32 y = 0.0f; // 0 = top, 1 = bottom
-			f32 pressure = 0.0f; // In the current SDL version the pressure is always 1 if the state is 1
-
-			if (!SDL_GetGamepadTouchpadFinger(dev->sdl.gamepad, touchpad.index, finger.index, &down, &x, &y, &pressure))
-			{
-				sdl_log.error("Could not get touchpad %d finger %d data of device %d! SDL Error: %s", touchpad.index, finger.index, dev->player_id, SDL_GetError());
-			}
-			else
-			{
-				sdl_log.trace("touchpad=%d, finger=%d, state=%d, x=%f, y=%f, pressure=%f", touchpad.index, finger.index, down, x, y, pressure);
-
-				if (!down)
-				{
-					continue;
-				}
-
-				const f32 x_scaled = ScaledInput(x, 0.0f, 1.0f, 0.0f, 255.0f);
-				const f32 y_scaled = ScaledInput(y, 0.0f, 1.0f, 0.0f, 255.0f);
-
-				values[SDLKeyCodes::Touch_L] = Clamp0To255((127.5f - x_scaled) * 2.0f);
-				values[SDLKeyCodes::Touch_R] = Clamp0To255((x_scaled - 127.5f) * 2.0f);
-
-				values[SDLKeyCodes::Touch_U] = Clamp0To255((127.5f - y_scaled) * 2.0f);
-				values[SDLKeyCodes::Touch_D] = Clamp0To255((y_scaled - 127.5f) * 2.0f);
-			}
-		}
-	}
-
-	return values;
-}
-
-pad_preview_values sdl_pad_handler::get_preview_values(const std::unordered_map<u64, u16>& data)
-{
-	return {
-		::at32(data, LT),
-		::at32(data, RT),
-		::at32(data, LSXPos) - ::at32(data, LSXNeg),
-		::at32(data, LSYPos) - ::at32(data, LSYNeg),
-		::at32(data, RSXPos) - ::at32(data, RSXNeg),
-		::at32(data, RSYPos) - ::at32(data, RSYNeg)
-	};
-}
-
-std::string sdl_pad_handler::button_to_string(SDL_GamepadButton button)
-{
-	if (const char* name = SDL_GetGamepadStringForButton(button))
-	{
-		return name;
-	}
-
-	return {};
-}
-
-std::string sdl_pad_handler::axis_to_string(SDL_GamepadAxis axis)
-{
-	if (const char* name = SDL_GetGamepadStringForAxis(axis))
-	{
-		return name;
-	}
-
-	return {};
-}
-
-sdl_pad_handler::SDLKeyCodes sdl_pad_handler::get_button_code(SDL_GamepadButton button)
-{
-	switch (button)
-	{
-	default:
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_INVALID: return SDLKeyCodes::None;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_SOUTH: return SDLKeyCodes::South;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_EAST: return SDLKeyCodes::East;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_WEST: return SDLKeyCodes::West;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_NORTH: return SDLKeyCodes::North;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_DPAD_LEFT: return SDLKeyCodes::Left;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_DPAD_RIGHT: return SDLKeyCodes::Right;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_DPAD_UP: return SDLKeyCodes::Up;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_DPAD_DOWN: return SDLKeyCodes::Down;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_LEFT_SHOULDER: return SDLKeyCodes::LB;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER: return SDLKeyCodes::RB;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_BACK: return SDLKeyCodes::Back;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_START: return SDLKeyCodes::Start;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_LEFT_STICK: return SDLKeyCodes::LS;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_RIGHT_STICK: return SDLKeyCodes::RS;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_GUIDE: return SDLKeyCodes::Guide;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_MISC1: return SDLKeyCodes::Misc1;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_MISC2: return SDLKeyCodes::Misc2;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_MISC3: return SDLKeyCodes::Misc3;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_MISC4: return SDLKeyCodes::Misc4;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_MISC5: return SDLKeyCodes::Misc5;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_MISC6: return SDLKeyCodes::Misc6;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_RIGHT_PADDLE1: return SDLKeyCodes::RPaddle1;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_LEFT_PADDLE1: return SDLKeyCodes::LPaddle1;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_RIGHT_PADDLE2: return SDLKeyCodes::RPaddle2;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_LEFT_PADDLE2: return SDLKeyCodes::LPaddle2;
-	case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_TOUCHPAD: return SDLKeyCodes::Touchpad;
-	}
-}
-
-#endif
diff --git a/rpcs3/Input/sdl_pad_handler.h b/rpcs3/Input/sdl_pad_handler.h
deleted file mode 100644
index 0fb5633a81..0000000000
--- a/rpcs3/Input/sdl_pad_handler.h
+++ /dev/null
@@ -1,190 +0,0 @@
-#pragma once
-
-#ifdef HAVE_SDL3
-
-#include "Emu/Io/PadHandler.h"
-
-#ifndef _MSC_VER
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include "SDL3/SDL.h"
-#ifndef _MSC_VER
-#pragma GCC diagnostic pop
-#endif
-
-
-class SDLDevice : public PadDevice
-{
-public:
-
-	struct touch_point
-	{
-		int index = 0;
-		int x = 0;
-		int y = 0;
-	};
-
-	struct touchpad
-	{
-		int index = 0;
-		std::vector<touch_point> fingers;
-	};
-
-	struct sdl_info
-	{
-		SDL_Gamepad* gamepad = nullptr;
-		SDL_GamepadType type = SDL_GamepadType::SDL_GAMEPAD_TYPE_UNKNOWN;
-		SDL_GamepadType real_type = SDL_GamepadType::SDL_GAMEPAD_TYPE_UNKNOWN;
-		SDL_GUID guid {};
-		int power_level = 0;
-		int last_power_level = 0;
-
-		std::string name;
-		std::string path;
-		std::string serial;
-		u16 vid = 0;
-		u16 pid = 0;
-		u16 product_version = 0;
-		u16 firmware_version = 0;
-
-		bool is_virtual_device = false;
-		bool is_ds3_with_pressure_buttons = false;
-
-		bool has_led = false;
-		bool has_mono_led = false;
-		bool has_player_led = false;
-		bool has_rumble = false;
-		bool has_rumble_triggers = false;
-		bool has_accel = false;
-		bool has_gyro = false;
-
-		f32 data_rate_accel = 0.0f;
-		f32 data_rate_gyro = 0.0f;
-
-		std::set<SDL_GamepadButton> button_ids;
-		std::set<SDL_GamepadAxis> axis_ids;
-
-		std::vector<touchpad> touchpads;
-	};
-
-	sdl_info sdl{};
-
-	std::array<f32, 3> values_accel{};
-	std::array<f32, 3> values_gyro{};
-
-	bool led_needs_update = true;
-	bool led_is_on = true;
-	bool led_is_blinking = false;
-	steady_clock::time_point led_timestamp{};
-};
-
-class sdl_pad_handler : public PadHandlerBase
-{
-	enum SDLKeyCodes
-	{
-		None = 0,
-
-		South,
-		East,
-		West,
-		North,
-		Left,
-		Right,
-		Up,
-		Down,
-		LB,
-		RB,
-		LS,
-		RS,
-		Start,
-		Back,
-		Guide,
-		Misc1,
-		Misc2,
-		Misc3,
-		Misc4,
-		Misc5,
-		Misc6,
-		RPaddle1,
-		LPaddle1,
-		RPaddle2,
-		LPaddle2,
-		Touchpad,
-
-		Touch_L,
-		Touch_R,
-		Touch_U,
-		Touch_D,
-
-		LT,
-		RT,
-
-		LSXNeg,
-		LSXPos,
-		LSYNeg,
-		LSYPos,
-		RSXNeg,
-		RSXPos,
-		RSYNeg,
-		RSYPos,
-
-		// DS3 Pressure sensitive buttons (reported as axis)
-		PressureBegin,
-		PressureCross,    // Cross        axis 6
-		PressureCircle,   // Circle       axis 7
-		PressureSquare,   // Square       axis 8
-		PressureTriangle, // Triangle     axis 9
-		PressureL1,       // L1           axis 10
-		PressureR1,       // R1           axis 11
-		PressureUp,       // D-Pad Up     axis 12
-		PressureDown,     // D-Pad Down   axis 13
-		PressureLeft,     // D-Pad Left   axis 14
-		PressureRight,    // D-Pad Right  axis 15
-		PressureEnd,
-	};
-
-public:
-	sdl_pad_handler();
-	~sdl_pad_handler();
-
-	SDLDevice::sdl_info get_sdl_info(SDL_JoystickID id);
-
-	bool Init() override;
-	void process() override;
-	void init_config(cfg_pad* cfg) override;
-	std::vector<pad_list_entry> list_devices() override;
-	void SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool player_led, bool battery_led, u32 battery_led_brightness) override;
-	u32 get_battery_level(const std::string& padId) override;
-	void get_motion_sensors(const std::string& pad_id, const motion_callback& callback, const motion_fail_callback& fail_callback, motion_preview_values preview_values, const std::array<AnalogSensor, 4>& sensors) override;
-	connection get_next_button_press(const std::string& padId, const pad_callback& callback, const pad_fail_callback& fail_callback, gui_call_type call_type, const std::vector<std::string>& buttons) override;
-
-private:
-	// pseudo 'controller id' to keep track of unique controllers
-	std::map<std::string, std::shared_ptr<SDLDevice>> m_controllers;
-
-	void enumerate_devices();
-	std::shared_ptr<SDLDevice> get_device_by_gamepad(SDL_Gamepad* gamepad) const;
-
-	std::shared_ptr<PadDevice> get_device(const std::string& device) override;
-	PadHandlerBase::connection update_connection(const std::shared_ptr<PadDevice>& device) override;
-	void get_extended_info(const pad_ensemble& binding) override;
-	void apply_pad_data(const pad_ensemble& binding) override;
-	bool get_is_left_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_left_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_touch_pad_motion(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	std::unordered_map<u64, u16> get_button_values(const std::shared_ptr<PadDevice>& device) override;
-	pad_preview_values get_preview_values(const std::unordered_map<u64, u16>& data) override;
-
-	u32 get_battery_color(int power_level, u32 brightness) const;
-	void set_rumble(SDLDevice* dev, u8 speed_large, u8 speed_small);
-
-	static std::string button_to_string(SDL_GamepadButton button);
-	static std::string axis_to_string(SDL_GamepadAxis axis);
-
-	static SDLKeyCodes get_button_code(SDL_GamepadButton button);
-};
-
-#endif
diff --git a/rpcs3/Input/skateboard_pad_handler.cpp b/rpcs3/Input/skateboard_pad_handler.cpp
deleted file mode 100644
index fdcc5be727..0000000000
--- a/rpcs3/Input/skateboard_pad_handler.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-#include "stdafx.h"
-#include "skateboard_pad_handler.h"
-#include "Emu/Io/pad_config.h"
-
-LOG_CHANNEL(skateboard_log, "Skateboard");
-
-using namespace reports;
-
-namespace
-{
-	constexpr id_pair SKATEBOARD_ID_0 = {0x12BA, 0x0400}; // Tony Hawk RIDE Skateboard
-	constexpr id_pair SKATEBOARD_ID_1 = {0x1430, 0x0100}; // Tony Hawk SHRED Skateboard
-
-	enum button_flags : u16
-	{
-		square   = 0x0001,
-		cross    = 0x0002,
-		circle   = 0x0004,
-		triangle = 0x0008,
-		select   = 0x0100,
-		start    = 0x0200,
-		ps       = 0x1000,
-	};
-
-	enum dpad_states : u8
-	{
-		up         = 0x00,
-		up_right   = 0x01,
-		left       = 0x02,
-		down_right = 0x03,
-		down       = 0x04,
-		down_left  = 0x05,
-		right      = 0x06,
-		up_left    = 0x07,
-		none       = 0x0F,
-	};
-
-	// Default data if dongle is connected but the skateboard is turned off:
-	static constexpr std::array<u8, sizeof(skateboard_input_report)> not_connected_state = { 0x00, 0x00, 0x0F, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02 };
-	static constexpr std::array<u8, sizeof(skateboard_input_report)> disconnected_state  = { 0x00, 0x00, 0x0F, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-}
-
-skateboard_pad_handler::skateboard_pad_handler()
-    : hid_pad_handler<skateboard_device>(pad_handler::skateboard, {SKATEBOARD_ID_0, SKATEBOARD_ID_1})
-{
-	// Unique names for the config files and our pad settings dialog
-	button_list =
-	{
-		{ skateboard_key_codes::none,       "" },
-		{ skateboard_key_codes::left,       "Left" },
-		{ skateboard_key_codes::right,      "Right" },
-		{ skateboard_key_codes::up,         "Up" },
-		{ skateboard_key_codes::down,       "Down" },
-		{ skateboard_key_codes::cross,      "Cross" },
-		{ skateboard_key_codes::square,     "Square" },
-		{ skateboard_key_codes::circle,     "Circle" },
-		{ skateboard_key_codes::triangle,   "Triangle" },
-		{ skateboard_key_codes::start,      "Start" },
-		{ skateboard_key_codes::select,     "Select" },
-		{ skateboard_key_codes::ps,         "PS" },
-		{ skateboard_key_codes::ir_left,    "IR Left" },
-		{ skateboard_key_codes::ir_right,   "IR Right" },
-		{ skateboard_key_codes::ir_nose,    "IR Nose" },
-		{ skateboard_key_codes::ir_tail,    "IR Tail" },
-		{ skateboard_key_codes::tilt_left,  "Tilt Left" },
-		{ skateboard_key_codes::tilt_right, "Tilt Right" }
-	};
-
-	init_configs();
-
-	// Define border values
-	thumb_max = 255;
-	trigger_min = 0;
-	trigger_max = 255;
-
-	// Set capabilities
-	b_has_config = true;
-	b_has_rumble = false;
-	b_has_motion = true;
-	b_has_deadzones = false;
-	b_has_led = false;
-	b_has_rgb = false;
-	b_has_player_led = false;
-	b_has_battery = false;
-	b_has_battery_led = false;
-	b_has_pressure_intensity_button = false;
-	b_has_orientation = true;
-
-	m_name_string = "Skateboard #";
-	m_max_devices = CELL_PAD_MAX_PORT_NUM;
-
-	m_trigger_threshold = trigger_max / 2;
-	m_thumb_threshold   = thumb_max / 2;
-}
-
-skateboard_pad_handler::~skateboard_pad_handler()
-{
-}
-
-void skateboard_pad_handler::init_config(cfg_pad* cfg)
-{
-	if (!cfg) return;
-
-	// Set default button mapping
-	cfg->ls_left.def  = ::at32(button_list, skateboard_key_codes::none);
-	cfg->ls_down.def  = ::at32(button_list, skateboard_key_codes::none);
-	cfg->ls_right.def = ::at32(button_list, skateboard_key_codes::none);
-	cfg->ls_up.def    = ::at32(button_list, skateboard_key_codes::none);
-	cfg->rs_left.def  = ::at32(button_list, skateboard_key_codes::none);
-	cfg->rs_down.def  = ::at32(button_list, skateboard_key_codes::none);
-	cfg->rs_right.def = ::at32(button_list, skateboard_key_codes::none);
-	cfg->rs_up.def    = ::at32(button_list, skateboard_key_codes::none);
-	cfg->start.def    = ::at32(button_list, skateboard_key_codes::start);
-	cfg->select.def   = ::at32(button_list, skateboard_key_codes::select);
-	cfg->ps.def       = ::at32(button_list, skateboard_key_codes::ps);
-	cfg->square.def   = ::at32(button_list, skateboard_key_codes::square);
-	cfg->cross.def    = ::at32(button_list, skateboard_key_codes::cross);
-	cfg->circle.def   = ::at32(button_list, skateboard_key_codes::circle);
-	cfg->triangle.def = ::at32(button_list, skateboard_key_codes::triangle);
-	cfg->left.def     = ::at32(button_list, skateboard_key_codes::left);
-	cfg->down.def     = ::at32(button_list, skateboard_key_codes::down);
-	cfg->right.def    = ::at32(button_list, skateboard_key_codes::right);
-	cfg->up.def       = ::at32(button_list, skateboard_key_codes::up);
-	cfg->r1.def       = ::at32(button_list, skateboard_key_codes::none);
-	cfg->r2.def       = ::at32(button_list, skateboard_key_codes::none);
-	cfg->r3.def       = ::at32(button_list, skateboard_key_codes::none);
-	cfg->l1.def       = ::at32(button_list, skateboard_key_codes::none);
-	cfg->l2.def       = ::at32(button_list, skateboard_key_codes::none);
-	cfg->l3.def       = ::at32(button_list, skateboard_key_codes::none);
-
-	cfg->ir_nose.def    = ::at32(button_list, skateboard_key_codes::ir_nose);
-	cfg->ir_tail.def    = ::at32(button_list, skateboard_key_codes::ir_tail);
-	cfg->ir_left.def    = ::at32(button_list, skateboard_key_codes::ir_left);
-	cfg->ir_right.def   = ::at32(button_list, skateboard_key_codes::ir_right);
-	cfg->tilt_left.def  = ::at32(button_list, skateboard_key_codes::tilt_left);
-	cfg->tilt_right.def = ::at32(button_list, skateboard_key_codes::tilt_right);
-
-	cfg->orientation_reset_button.def = ::at32(button_list, skateboard_key_codes::none);
-
-	// Set default misc variables
-	cfg->lstick_anti_deadzone.def = 0;
-	cfg->rstick_anti_deadzone.def = 0;
-	cfg->lstickdeadzone.def    = 40; // between 0 and 255
-	cfg->rstickdeadzone.def    = 40; // between 0 and 255
-	cfg->ltriggerthreshold.def = 0;  // between 0 and 255
-	cfg->rtriggerthreshold.def = 0;  // between 0 and 255
-
-	// apply defaults
-	cfg->from_default();
-}
-
-void skateboard_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial)
-{
-	if (!hidDevice)
-	{
-		return;
-	}
-
-	skateboard_device* device = nullptr;
-
-	for (auto& controller : m_controllers)
-	{
-		ensure(controller.second);
-
-		if (!controller.second->hidDevice)
-		{
-			device = controller.second.get();
-			break;
-		}
-	}
-
-	if (!device)
-	{
-		return;
-	}
-
-	if (hid_set_nonblocking(hidDevice, 1) == -1)
-	{
-		skateboard_log.error("check_add_device: hid_set_nonblocking failed! Reason: %s", hid_error(hidDevice));
-		HidDevice::close(hidDevice);
-		return;
-	}
-
-	device->hidDevice = hidDevice;
-	device->path = path;
-
-	// Activate
-	if (send_output_report(device) == -1)
-	{
-		skateboard_log.error("check_add_device: send_output_report failed! Reason: %s", hid_error(hidDevice));
-	}
-
-	std::string serial;
-	for (wchar_t ch : wide_serial)
-		serial += static_cast<uchar>(ch);
-
-	skateboard_log.notice("Added device: serial='%s', path='%s'", serial, device->path);
-}
-
-skateboard_pad_handler::DataStatus skateboard_pad_handler::get_data(skateboard_device* device)
-{
-	if (!device)
-		return DataStatus::ReadError;
-
-	std::array<u8, sizeof(skateboard_input_report)> buf{};
-
-	int res = hid_read(device->hidDevice, buf.data(), buf.size());
-
-	if (res == -1)
-	{
-		// looks like controller disconnected or read error
-		skateboard_log.error("get_data ReadError: %s", hid_error(device->hidDevice));
-		return DataStatus::ReadError;
-	}
-
-	if (res != static_cast<int>(sizeof(skateboard_input_report)))
-		return DataStatus::NoNewData;
-
-	if (std::memcmp(&device->report, buf.data(), sizeof(skateboard_input_report)) == 0)
-		return DataStatus::NoNewData;
-
-	// Get the new data
-	std::memcpy(&device->report, buf.data(), sizeof(skateboard_input_report));
-
-	// Check the skateboard's power state based on the input report
-	device->skateboard_is_on =
-		(std::memcmp(not_connected_state.data(), buf.data(), not_connected_state.size()) != 0 && // This usually means that the device hasn't been connected to the dongle yet.
-		 std::memcmp(disconnected_state.data(), buf.data(), disconnected_state.size()) != 0);    // This usually means that the device was disconnected from the dongle.
-
-	return DataStatus::NewData;
-}
-
-PadHandlerBase::connection skateboard_pad_handler::update_connection(const std::shared_ptr<PadDevice>& device)
-{
-	skateboard_device* dev = static_cast<skateboard_device*>(device.get());
-	if (!dev || dev->path == hid_enumerated_device_default)
-		return connection::disconnected;
-
-	if (dev->hidDevice == nullptr)
-	{
-		// try to reconnect
-		if (hid_device* hid_dev = dev->open())
-		{
-			if (hid_set_nonblocking(hid_dev, 1) == -1)
-			{
-				skateboard_log.error("Reconnecting Device %s: hid_set_nonblocking failed with error %s", dev->path, hid_error(hid_dev));
-			}
-		}
-		else
-		{
-			// nope, not there
-			return connection::disconnected;
-		}
-	}
-
-	if (get_data(dev) == DataStatus::ReadError)
-	{
-		// this also can mean disconnected, either way deal with it on next loop and reconnect
-		dev->close();
-
-		return connection::no_data;
-	}
-
-	if (!dev->skateboard_is_on)
-	{
-		// This means that the dongle is still connected, but the skateboard is turned off.
-		// There is no need to reconnect the hid device again, we just have to check the input report for proper data.
-		// The game should get the proper disconnected state anyway.
-		return connection::disconnected;
-	}
-
-	return connection::connected;
-}
-
-std::unordered_map<u64, u16> skateboard_pad_handler::get_button_values(const std::shared_ptr<PadDevice>& device)
-{
-	std::unordered_map<u64, u16> key_buf;
-	skateboard_device* dev = static_cast<skateboard_device*>(device.get());
-	if (!dev)
-		return key_buf;
-
-	const skateboard_input_report& input = dev->report;
-
-	// D-Pad
-	key_buf[skateboard_key_codes::left]  = (input.d_pad == dpad_states::left || input.d_pad == dpad_states::up_left || input.d_pad == dpad_states::down_left) ? 255 : 0;
-	key_buf[skateboard_key_codes::right] = (input.d_pad == dpad_states::right || input.d_pad == dpad_states::up_right || input.d_pad == dpad_states::down_right) ? 255 : 0;
-	key_buf[skateboard_key_codes::up]    = (input.d_pad == dpad_states::up || input.d_pad == dpad_states::up_left || input.d_pad == dpad_states::up_right) ? 255 : 0;
-	key_buf[skateboard_key_codes::down]  = (input.d_pad == dpad_states::down || input.d_pad == dpad_states::down_left || input.d_pad == dpad_states::down_right) ? 255 : 0;
-
-	// Face buttons
-	key_buf[skateboard_key_codes::cross]    = (input.buttons & button_flags::cross)    ? 255 : 0;
-	key_buf[skateboard_key_codes::square]   = (input.buttons & button_flags::square)   ? 255 : 0;
-	key_buf[skateboard_key_codes::circle]   = (input.buttons & button_flags::circle)   ? 255 : 0;
-	key_buf[skateboard_key_codes::triangle] = (input.buttons & button_flags::triangle) ? 255 : 0;
-	key_buf[skateboard_key_codes::start]    = (input.buttons & button_flags::start)    ? 255 : 0;
-	key_buf[skateboard_key_codes::select]   = (input.buttons & button_flags::select)   ? 255 : 0;
-	key_buf[skateboard_key_codes::ps]       = (input.buttons & button_flags::ps)       ? 255 : 0;
-
-	// Infrared
-	key_buf[skateboard_key_codes::ir_nose]    = input.pressure_triangle;
-	key_buf[skateboard_key_codes::ir_tail]    = input.pressure_circle;
-	key_buf[skateboard_key_codes::ir_left]    = input.pressure_cross;
-	key_buf[skateboard_key_codes::ir_right]   = input.pressure_square;
-	key_buf[skateboard_key_codes::tilt_left]  = input.pressure_l1;
-	key_buf[skateboard_key_codes::tilt_right] = input.pressure_r1;
-
-	// NOTE: Axes X, Y, Z and RZ are always 128, which is the default anyway, so setting the values is omitted.
-
-	return key_buf;
-}
-
-void skateboard_pad_handler::get_extended_info(const pad_ensemble& binding)
-{
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
-	skateboard_device* dev = static_cast<skateboard_device*>(device.get());
-	if (!dev || !pad)
-		return;
-
-	const skateboard_input_report& input = dev->report;
-
-	pad->m_sensors[0].m_value = Clamp0To1023(input.large_axes[0]);
-	pad->m_sensors[1].m_value = Clamp0To1023(input.large_axes[1]);
-	pad->m_sensors[2].m_value = Clamp0To1023(input.large_axes[2]);
-	pad->m_sensors[3].m_value = Clamp0To1023(input.large_axes[3]);
-
-	set_raw_orientation(*pad);
-}
-
-pad_preview_values skateboard_pad_handler::get_preview_values(const std::unordered_map<u64, u16>& /*data*/)
-{
-	// There is no proper user interface for skateboard values yet
-	return {};
-}
-
-int skateboard_pad_handler::send_output_report(skateboard_device* device)
-{
-	if (!device || !device->hidDevice)
-		return -2;
-
-	const cfg_pad* config = device->config;
-	if (config == nullptr)
-		return -2; // hid_write returns -1 on error
-
-	// The output report contents are still unknown
-	skateboard_output_report report{};
-	return hid_write(device->hidDevice, report.data.data(), report.data.size());
-}
-
-void skateboard_pad_handler::apply_pad_data(const pad_ensemble& binding)
-{
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
-	skateboard_device* dev = static_cast<skateboard_device*>(device.get());
-	if (!dev || !dev->hidDevice || !dev->config || !pad)
-		return;
-
-	dev->new_output_data = false;
-
-	// Disabled until needed
-	//const auto now = steady_clock::now();
-	//const auto elapsed = now - dev->last_output;
-
-	//if (dev->new_output_data || elapsed > min_output_interval)
-	//{
-	//	if (const int res = send_output_report(dev); res >= 0)
-	//	{
-	//		dev->new_output_data = false;
-	//		dev->last_output = now;
-	//	}
-	//	else if (res == -1)
-	//	{
-	//		skateboard_log.error("apply_pad_data: send_output_report failed! error=%s", hid_error(dev->hidDevice));
-	//	}
-	//}
-}
-
-void skateboard_pad_handler::SetPadData(const std::string& padId, u8 player_id, u8 /*large_motor*/, u8 /*small_motor*/, s32 /*r*/, s32 /*g*/, s32 /*b*/, bool /*player_led*/, bool /*battery_led*/, u32 /*battery_led_brightness*/)
-{
-	std::shared_ptr<skateboard_device> device = get_hid_device(padId);
-	if (device == nullptr || device->hidDevice == nullptr)
-		return;
-
-	device->player_id = player_id;
-	device->config = get_config(padId);
-
-	ensure(device->config);
-
-	// Disabled until needed
-	//if (send_output_report(device.get()) == -1)
-	//{
-	//	skateboard_log.error("SetPadData: send_output_report failed! Reason: %s", hid_error(device->hidDevice));
-	//}
-}
diff --git a/rpcs3/Input/skateboard_pad_handler.h b/rpcs3/Input/skateboard_pad_handler.h
deleted file mode 100644
index e7f15c494e..0000000000
--- a/rpcs3/Input/skateboard_pad_handler.h
+++ /dev/null
@@ -1,190 +0,0 @@
-#pragma once
-
-#include "hid_pad_handler.h"
-
-#include <array>
-#include <unordered_map>
-
-namespace reports
-{
-	// Descriptor
-	// 0x09, 0x05,        // Usage (0x05)
-	// 0xA1, 0x01,        // Collection (Application)
-	// 0x05, 0x09,        //   Usage Page (Button)
-	// 0x19, 0x01,        //   Usage Minimum (0x01)
-	// 0x29, 0x0D,        //   Usage Maximum (0x0D)
-	// 0x15, 0x00,        //   Logical Minimum (0)
-	// 0x25, 0x01,        //   Logical Maximum (1)
-	// 0x75, 0x01,        //   Report Size (1)
-	// 0x95, 0x0D,        //   Report Count (13)
-	// 0x81, 0x02,        //   Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
-	// 0x75, 0x03,        //   Report Size (3)
-	// 0x95, 0x01,        //   Report Count (1)
-	// 0x81, 0x03,        //   Input (Const,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
-	// 0x05, 0x01,        //   Usage Page (Generic Desktop Ctrls)
-	// 0x09, 0x39,        //   Usage (Hat switch)
-	// 0x15, 0x00,        //   Logical Minimum (0)
-	// 0x25, 0x07,        //   Logical Maximum (7)
-	// 0x35, 0x00,        //   Physical Minimum (0)
-	// 0x46, 0x3B, 0x01,  //   Physical Maximum (315)
-	// 0x65, 0x14,        //   Unit (System: English Rotation, Length: Centimeter)
-	// 0x75, 0x04,        //   Report Size (4)
-	// 0x95, 0x01,        //   Report Count (1)
-	// 0x81, 0x42,        //   Input (Data,Var,Abs,No Wrap,Linear,Preferred State,Null State)
-	// 0x75, 0x04,        //   Report Size (4)
-	// 0x95, 0x01,        //   Report Count (1)
-	// 0x81, 0x03,        //   Input (Const,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
-	// 0x09, 0x30,        //   Usage (X)
-	// 0x09, 0x31,        //   Usage (Y)
-	// 0x09, 0x32,        //   Usage (Z)
-	// 0x09, 0x35,        //   Usage (Rz)
-	// 0x15, 0x00,        //   Logical Minimum (0)
-	// 0x26, 0xFF, 0x00,  //   Logical Maximum (255)
-	// 0x35, 0x00,        //   Physical Minimum (0)
-	// 0x46, 0xFF, 0x00,  //   Physical Maximum (255)
-	// 0x65, 0x00,        //   Unit (None)
-	// 0x75, 0x08,        //   Report Size (8)
-	// 0x95, 0x04,        //   Report Count (4)
-	// 0x81, 0x02,        //   Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
-	// 0x06, 0x00, 0xFF,  //   Usage Page (Vendor Defined 0xFF00)
-	// 0x09, 0x20,        //   Usage (0x20)
-	// 0x09, 0x21,        //   Usage (0x21)
-	// 0x09, 0x22,        //   Usage (0x22)
-	// 0x09, 0x23,        //   Usage (0x23)
-	// 0x09, 0x24,        //   Usage (0x24)
-	// 0x09, 0x25,        //   Usage (0x25)
-	// 0x09, 0x26,        //   Usage (0x26)
-	// 0x09, 0x27,        //   Usage (0x27)
-	// 0x09, 0x28,        //   Usage (0x28)
-	// 0x09, 0x29,        //   Usage (0x29)
-	// 0x09, 0x2A,        //   Usage (0x2A)
-	// 0x09, 0x2B,        //   Usage (0x2B)
-	// 0x15, 0x00,        //   Logical Minimum (0)
-	// 0x26, 0xFF, 0x00,  //   Logical Maximum (255)
-	// 0x75, 0x08,        //   Report Size (8)
-	// 0x95, 0x0C,        //   Report Count (12)
-	// 0x81, 0x02,        //   Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
-	// 0x09, 0x2C,        //   Usage (0x2C)
-	// 0x09, 0x2D,        //   Usage (0x2D)
-	// 0x09, 0x2E,        //   Usage (0x2E)
-	// 0x09, 0x2F,        //   Usage (0x2F)
-	// 0x15, 0x00,        //   Logical Minimum (0)
-	// 0x26, 0xFF, 0x03,  //   Logical Maximum (1023)
-	// 0x35, 0x00,        //   Physical Minimum (0)
-	// 0x46, 0xFF, 0x03,  //   Physical Maximum (1023)
-	// 0x75, 0x10,        //   Report Size (16)
-	// 0x95, 0x04,        //   Report Count (4)
-	// 0x81, 0x02,        //   Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
-	// 0x0A, 0x21, 0x26,  //   Usage (0x2621)
-	// 0x15, 0x00,        //   Logical Minimum (0)
-	// 0x26, 0xFF, 0x00,  //   Logical Maximum (255)
-	// 0x35, 0x00,        //   Physical Minimum (0)
-	// 0x46, 0xFF, 0x00,  //   Physical Maximum (255)
-	// 0x75, 0x08,        //   Report Size (8)
-	// 0x95, 0x08,        //   Report Count (8)
-	// 0x91, 0x02,        //   Output (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position,Non-volatile)
-	// 0x0A, 0x21, 0x26,  //   Usage (0x2621)
-	// 0x15, 0x00,        //   Logical Minimum (0)
-	// 0x26, 0xFF, 0x00,  //   Logical Maximum (255)
-	// 0x75, 0x08,        //   Report Size (8)
-	// 0x95, 0x08,        //   Report Count (8)
-	// 0xB1, 0x02,        //   Feature (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position,Non-volatile)
-	// 0xC0,              // End Collection
-
-#pragma pack(push, 1)
-	struct skateboard_input_report
-	{
-		// 13 buttons, value range 0 to 1, 13 bits + 3 bits padding (2 bytes total)
-		u16 buttons{};
-
-		// d-pad, value range 0 to 7 (8 directions), 4 bits + 4 bits padding (1 byte total)
-		u8 d_pad{};
-
-		// 4 axis (X, Y, Z, RZ), value range 0 to 255, 1 byte each (4 bytes total)
-		u8 axis_x{};
-		u8 axis_y{};
-		u8 axis_z{};
-		u8 axis_rz{};
-
-		// 12 axis (0x20 - 0x2B), value range 0 to 255, 1 byte each (12 bytes total)
-		// These 12 values match the pressure sensitivity values of the buttons (CELL_PAD_BTN_OFFSET_PRESS)
-		u8 pressure_right{};    // value for CELL_PAD_BTN_OFFSET_PRESS_RIGHT    -> always 0 ?
-		u8 pressure_left{};     // value for CELL_PAD_BTN_OFFSET_PRESS_LEFT     -> always 0 ?
-		u8 pressure_up{};       // value for CELL_PAD_BTN_OFFSET_PRESS_UP       -> always 0 ?
-		u8 pressure_down{};     // value for CELL_PAD_BTN_OFFSET_PRESS_DOWN     -> always 0 ?
-		u8 pressure_triangle{}; // value for CELL_PAD_BTN_OFFSET_PRESS_TRIANGLE -> infrared nose
-		u8 pressure_circle{};   // value for CELL_PAD_BTN_OFFSET_PRESS_CIRCLE   -> infrared tail
-		u8 pressure_cross{};    // value for CELL_PAD_BTN_OFFSET_PRESS_CROSS    -> infrared left
-		u8 pressure_square{};   // value for CELL_PAD_BTN_OFFSET_PRESS_SQUARE   -> infrared right
-		u8 pressure_l1{};       // value for CELL_PAD_BTN_OFFSET_PRESS_L1       -> tilt left (probably)
-		u8 pressure_r1{};       // value for CELL_PAD_BTN_OFFSET_PRESS_R1       -> tilt right (probably)
-		u8 pressure_l2{};       // value for CELL_PAD_BTN_OFFSET_PRESS_L2       -> always 0 ?
-		u8 pressure_r2{};       // value for CELL_PAD_BTN_OFFSET_PRESS_R2       -> always 0 ?
-
-		// 4 axis (0x2C - 0x2F), value range 0 to 1023, 2 bytes each (8 bytes total)
-		std::array<u16, 4> large_axes{};
-	};
-#pragma pack(pop)
-
-	struct skateboard_output_report
-	{
-		// 8 axis (0x2621), value range 0 to 255, 1 byte each (8 bytes total)
-		std::array<u8, 8> data{};
-	};
-
-	struct skateboard_feature_report
-	{
-		// 8 axis (0x2621), value range 0 to 255, 1 byte each (8 bytes total)
-		std::array<u8, 8> data{};
-	};
-}
-
-class skateboard_device : public HidDevice
-{
-public:
-	bool skateboard_is_on = false;
-	reports::skateboard_input_report report{};
-};
-
-class skateboard_pad_handler final : public hid_pad_handler<skateboard_device>
-{
-	enum skateboard_key_codes
-	{
-		none = 0,
-		left,
-		right,
-		up,
-		down,
-		cross,
-		square,
-		circle,
-		triangle,
-		start,
-		select,
-		ps,
-		ir_nose,
-		ir_tail,
-		ir_left,
-		ir_right,
-		tilt_left,
-		tilt_right,
-	};
-
-public:
-	skateboard_pad_handler();
-	~skateboard_pad_handler();
-
-	void SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool player_led, bool battery_led, u32 battery_led_brightness) override;
-	void init_config(cfg_pad* cfg) override;
-
-private:
-	DataStatus get_data(skateboard_device* device) override;
-	void check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial) override;
-	int send_output_report(skateboard_device* device) override;
-
-	PadHandlerBase::connection update_connection(const std::shared_ptr<PadDevice>& device) override;
-	std::unordered_map<u64, u16> get_button_values(const std::shared_ptr<PadDevice>& device) override;
-	pad_preview_values get_preview_values(const std::unordered_map<u64, u16>& data) override;
-	void get_extended_info(const pad_ensemble& binding) override;
-	void apply_pad_data(const pad_ensemble& binding) override;
-};
diff --git a/rpcs3/Input/xinput_pad_handler.cpp b/rpcs3/Input/xinput_pad_handler.cpp
index f23cb7fd79..ae8e31bfed 100644
--- a/rpcs3/Input/xinput_pad_handler.cpp
+++ b/rpcs3/Input/xinput_pad_handler.cpp
@@ -3,7 +3,6 @@
 #include "stdafx.h"
 #include "xinput_pad_handler.h"
 #include "Emu/Io/pad_config.h"
-#include "util/dyn_lib.hpp"
 
 namespace XINPUT_INFO
 {
@@ -38,10 +37,6 @@ xinput_pad_handler::xinput_pad_handler() : PadHandlerBase(pad_handler::xinput)
 		{ XInputKeyCodes::Guide,  "Guide" },
 		{ XInputKeyCodes::LT,     "LT" },
 		{ XInputKeyCodes::RT,     "RT" },
-		{ XInputKeyCodes::LT_Pos, "LT+" },
-		{ XInputKeyCodes::LT_Neg, "LT-" },
-		{ XInputKeyCodes::RT_Pos, "RT+" },
-		{ XInputKeyCodes::RT_Neg, "RT-" },
 		{ XInputKeyCodes::LSXNeg, "LS X-" },
 		{ XInputKeyCodes::LSXPos, "LS X+" },
 		{ XInputKeyCodes::LSYPos, "LS Y+" },
@@ -58,14 +53,14 @@ xinput_pad_handler::xinput_pad_handler() : PadHandlerBase(pad_handler::xinput)
 	thumb_max = 32767;
 	trigger_min = 0;
 	trigger_max = 255;
+	vibration_min = 0;
+	vibration_max = 65535;
 
 	// set capabilities
 	b_has_config = true;
 	b_has_rumble = true;
 	b_has_deadzones = true;
 	b_has_battery = true;
-	b_has_battery_led = false;
-	b_has_orientation = false;
 
 	m_name_string = "XInput Pad #";
 	m_max_devices = XUSER_MAX_COUNT;
@@ -78,6 +73,8 @@ xinput_pad_handler::~xinput_pad_handler()
 {
 	if (library)
 	{
+		FreeLibrary(library);
+		library = nullptr;
 		xinputGetExtended = nullptr;
 		xinputGetCustomData = nullptr;
 		xinputGetState = nullptr;
@@ -91,39 +88,35 @@ void xinput_pad_handler::init_config(cfg_pad* cfg)
 	if (!cfg) return;
 
 	// Set default button mapping
-	cfg->ls_left.def  = ::at32(button_list, XInputKeyCodes::LSXNeg);
-	cfg->ls_down.def  = ::at32(button_list, XInputKeyCodes::LSYNeg);
-	cfg->ls_right.def = ::at32(button_list, XInputKeyCodes::LSXPos);
-	cfg->ls_up.def    = ::at32(button_list, XInputKeyCodes::LSYPos);
-	cfg->rs_left.def  = ::at32(button_list, XInputKeyCodes::RSXNeg);
-	cfg->rs_down.def  = ::at32(button_list, XInputKeyCodes::RSYNeg);
-	cfg->rs_right.def = ::at32(button_list, XInputKeyCodes::RSXPos);
-	cfg->rs_up.def    = ::at32(button_list, XInputKeyCodes::RSYPos);
-	cfg->start.def    = ::at32(button_list, XInputKeyCodes::Start);
-	cfg->select.def   = ::at32(button_list, XInputKeyCodes::Back);
-	cfg->ps.def       = ::at32(button_list, XInputKeyCodes::Guide);
-	cfg->square.def   = ::at32(button_list, XInputKeyCodes::X);
-	cfg->cross.def    = ::at32(button_list, XInputKeyCodes::A);
-	cfg->circle.def   = ::at32(button_list, XInputKeyCodes::B);
-	cfg->triangle.def = ::at32(button_list, XInputKeyCodes::Y);
-	cfg->left.def     = ::at32(button_list, XInputKeyCodes::Left);
-	cfg->down.def     = ::at32(button_list, XInputKeyCodes::Down);
-	cfg->right.def    = ::at32(button_list, XInputKeyCodes::Right);
-	cfg->up.def       = ::at32(button_list, XInputKeyCodes::Up);
-	cfg->r1.def       = ::at32(button_list, XInputKeyCodes::RB);
-	cfg->r2.def       = ::at32(button_list, XInputKeyCodes::RT);
-	cfg->r3.def       = ::at32(button_list, XInputKeyCodes::RS);
-	cfg->l1.def       = ::at32(button_list, XInputKeyCodes::LB);
-	cfg->l2.def       = ::at32(button_list, XInputKeyCodes::LT);
-	cfg->l3.def       = ::at32(button_list, XInputKeyCodes::LS);
+	cfg->ls_left.def  = button_list.at(XInputKeyCodes::LSXNeg);
+	cfg->ls_down.def  = button_list.at(XInputKeyCodes::LSYNeg);
+	cfg->ls_right.def = button_list.at(XInputKeyCodes::LSXPos);
+	cfg->ls_up.def    = button_list.at(XInputKeyCodes::LSYPos);
+	cfg->rs_left.def  = button_list.at(XInputKeyCodes::RSXNeg);
+	cfg->rs_down.def  = button_list.at(XInputKeyCodes::RSYNeg);
+	cfg->rs_right.def = button_list.at(XInputKeyCodes::RSXPos);
+	cfg->rs_up.def    = button_list.at(XInputKeyCodes::RSYPos);
+	cfg->start.def    = button_list.at(XInputKeyCodes::Start);
+	cfg->select.def   = button_list.at(XInputKeyCodes::Back);
+	cfg->ps.def       = button_list.at(XInputKeyCodes::Guide);
+	cfg->square.def   = button_list.at(XInputKeyCodes::X);
+	cfg->cross.def    = button_list.at(XInputKeyCodes::A);
+	cfg->circle.def   = button_list.at(XInputKeyCodes::B);
+	cfg->triangle.def = button_list.at(XInputKeyCodes::Y);
+	cfg->left.def     = button_list.at(XInputKeyCodes::Left);
+	cfg->down.def     = button_list.at(XInputKeyCodes::Down);
+	cfg->right.def    = button_list.at(XInputKeyCodes::Right);
+	cfg->up.def       = button_list.at(XInputKeyCodes::Up);
+	cfg->r1.def       = button_list.at(XInputKeyCodes::RB);
+	cfg->r2.def       = button_list.at(XInputKeyCodes::RT);
+	cfg->r3.def       = button_list.at(XInputKeyCodes::RS);
+	cfg->l1.def       = button_list.at(XInputKeyCodes::LB);
+	cfg->l2.def       = button_list.at(XInputKeyCodes::LT);
+	cfg->l3.def       = button_list.at(XInputKeyCodes::LS);
 
-	cfg->pressure_intensity_button.def = ::at32(button_list, XInputKeyCodes::None);
-	cfg->analog_limiter_button.def = ::at32(button_list, XInputKeyCodes::None);
-	cfg->orientation_reset_button.def = ::at32(button_list, XInputKeyCodes::None);
+	cfg->pressure_intensity_button.def = button_list.at(XInputKeyCodes::None);
 
 	// Set default misc variables
-	cfg->lstick_anti_deadzone.def = static_cast<u32>(0.13 * thumb_max); // 13%
-	cfg->rstick_anti_deadzone.def = static_cast<u32>(0.13 * thumb_max); // 13%
 	cfg->lstickdeadzone.def    = XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE;  // between 0 and 32767
 	cfg->rstickdeadzone.def    = XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE; // between 0 and 32767
 	cfg->ltriggerthreshold.def = XINPUT_GAMEPAD_TRIGGER_THRESHOLD;    // between 0 and 255
@@ -135,7 +128,7 @@ void xinput_pad_handler::init_config(cfg_pad* cfg)
 	cfg->from_default();
 }
 
-void xinput_pad_handler::SetPadData(const std::string& padId, u8 /*player_id*/, u8 large_motor, u8 small_motor, s32/* r*/, s32/* g*/, s32/* b*/, bool /*player_led*/, bool /*battery_led*/, u32 /*battery_led_brightness*/)
+void xinput_pad_handler::SetPadData(const std::string& padId, u8 /*player_id*/, u32 largeMotor, u32 smallMotor, s32/* r*/, s32/* g*/, s32/* b*/, bool /*battery_led*/, u32 /*battery_led_brightness*/)
 {
 	const int device_number = GetDeviceNumber(padId);
 	if (device_number < 0)
@@ -143,13 +136,12 @@ void xinput_pad_handler::SetPadData(const std::string& padId, u8 /*player_id*/,
 
 	// The left motor is the low-frequency rumble motor. The right motor is the high-frequency rumble motor.
 	// The two motors are not the same, and they create different vibration effects.
-	XINPUT_VIBRATION vibrate
-	{
-		.wLeftMotorSpeed = static_cast<u16>(large_motor * 257), // between 0 to 65535
-		.wRightMotorSpeed = static_cast<u16>(small_motor * 257) // between 0 to 65535
-	};
+	XINPUT_VIBRATION vibrate;
 
-	xinputSetState(static_cast<u32>(device_number), &vibrate);
+	vibrate.wLeftMotorSpeed = largeMotor;  // between 0 to 65535
+	vibrate.wRightMotorSpeed = smallMotor; // between 0 to 65535
+
+	(*xinputSetState)(static_cast<u32>(device_number), &vibrate);
 }
 
 u32 xinput_pad_handler::get_battery_level(const std::string& padId)
@@ -160,7 +152,7 @@ u32 xinput_pad_handler::get_battery_level(const std::string& padId)
 
 	// Receive Battery Info. If device is not on cable, get battery level, else assume full.
 	XINPUT_BATTERY_INFORMATION battery_info;
-	xinputGetBatteryInformation(device_number, BATTERY_DEVTYPE_GAMEPAD, &battery_info);
+	(*xinputGetBatteryInformation)(device_number, BATTERY_DEVTYPE_GAMEPAD, &battery_info);
 
 	switch (battery_info.BatteryType)
 	{
@@ -213,34 +205,19 @@ std::unordered_map<u64, u16> xinput_pad_handler::get_button_values(const std::sh
 	// Try SCP first, if it fails for that pad then try normal XInput
 	if (dev->is_scp_device)
 	{
-		return get_button_values_scp(dev->state_scp, m_trigger_recognition_mode);
+		return get_button_values_scp(dev->state_scp);
 	}
 
-	return get_button_values_base(dev->state_base, m_trigger_recognition_mode);
+	return get_button_values_base(dev->state_base);
 }
 
-xinput_pad_handler::PadButtonValues xinput_pad_handler::get_button_values_base(const XINPUT_STATE& state, trigger_recognition_mode trigger_mode)
+xinput_pad_handler::PadButtonValues xinput_pad_handler::get_button_values_base(const XINPUT_STATE& state)
 {
 	PadButtonValues values;
 
 	// Triggers
-	if (trigger_mode == trigger_recognition_mode::any || trigger_mode == trigger_recognition_mode::one_directional)
-	{
-		values[XInputKeyCodes::LT] = state.Gamepad.bLeftTrigger;
-		values[XInputKeyCodes::RT] = state.Gamepad.bRightTrigger;
-	}
-
-	if (trigger_mode == trigger_recognition_mode::any || trigger_mode == trigger_recognition_mode::two_directional)
-	{
-		const float lTrigger = state.Gamepad.bLeftTrigger / 255.0f;
-		const float rTrigger = state.Gamepad.bRightTrigger / 255.0f;
-
-		values[XInputKeyCodes::LT_Pos] = static_cast<u16>(lTrigger > 0.5f ? std::clamp((lTrigger - 0.5f) * 2.0f * 255.0f, 0.0f, 255.0f) : 0.0f);
-		values[XInputKeyCodes::LT_Neg] = static_cast<u16>(lTrigger < 0.5f ? std::clamp((0.5f - lTrigger) * 2.0f * 255.0f, 0.0f, 255.0f) : 0.0f);
-
-		values[XInputKeyCodes::RT_Pos] = static_cast<u16>(rTrigger > 0.5f ? std::clamp((rTrigger - 0.5f) * 2.0f * 255.0f, 0.0f, 255.0f) : 0.0f);
-		values[XInputKeyCodes::RT_Neg] = static_cast<u16>(rTrigger < 0.5f ? std::clamp((0.5f - rTrigger) * 2.0f * 255.0f, 0.0f, 255.0f) : 0.0f);
-	}
+	values[XInputKeyCodes::LT] = state.Gamepad.bLeftTrigger;
+	values[XInputKeyCodes::RT] = state.Gamepad.bRightTrigger;
 
 	// Sticks
 	const int lx = state.Gamepad.sThumbLX;
@@ -293,25 +270,13 @@ xinput_pad_handler::PadButtonValues xinput_pad_handler::get_button_values_base(c
 	return values;
 }
 
-xinput_pad_handler::PadButtonValues xinput_pad_handler::get_button_values_scp(const SCP_EXTN& state, trigger_recognition_mode trigger_mode)
+xinput_pad_handler::PadButtonValues xinput_pad_handler::get_button_values_scp(const SCP_EXTN& state)
 {
 	PadButtonValues values;
 
 	// Triggers
-	if (trigger_mode == trigger_recognition_mode::any || trigger_mode == trigger_recognition_mode::one_directional)
-	{
-		values[xinput_pad_handler::XInputKeyCodes::LT] = static_cast<u16>(state.SCP_L2 * 255.0f);
-		values[xinput_pad_handler::XInputKeyCodes::RT] = static_cast<u16>(state.SCP_R2 * 255.0f);
-	}
-
-	if (trigger_mode == trigger_recognition_mode::any || trigger_mode == trigger_recognition_mode::two_directional)
-	{
-		values[XInputKeyCodes::LT_Pos] = static_cast<u16>(state.SCP_L2 > 0.5f ? std::clamp((state.SCP_L2 - 0.5f) * 2.0f * 255.0f, 0.0f, 255.0f) : 0.0f);
-		values[XInputKeyCodes::LT_Neg] = static_cast<u16>(state.SCP_L2 < 0.5f ? std::clamp((0.5f - state.SCP_L2) * 2.0f * 255.0f, 0.0f, 255.0f) : 0.0f);
-
-		values[XInputKeyCodes::RT_Pos] = static_cast<u16>(state.SCP_R2 > 0.5f ? std::clamp((state.SCP_R2 - 0.5f) * 2.0f * 255.0f, 0.0f, 255.0f) : 0.0f);
-		values[XInputKeyCodes::RT_Neg] = static_cast<u16>(state.SCP_R2 < 0.5f ? std::clamp((0.5f - state.SCP_R2) * 2.0f * 255.0f, 0.0f, 255.0f) : 0.0f);
-	}
+	values[xinput_pad_handler::XInputKeyCodes::LT] = static_cast<u16>(state.SCP_L2 * 255.0f);
+	values[xinput_pad_handler::XInputKeyCodes::RT] = static_cast<u16>(state.SCP_R2 * 255.0f);
 
 	// Sticks
 	const float lx = state.SCP_LX;
@@ -364,40 +329,42 @@ xinput_pad_handler::PadButtonValues xinput_pad_handler::get_button_values_scp(co
 pad_preview_values xinput_pad_handler::get_preview_values(const std::unordered_map<u64, u16>& data)
 {
 	return {
-		::at32(data, LT),
-		::at32(data, RT),
-		::at32(data, LSXPos) - ::at32(data, LSXNeg),
-		::at32(data, LSYPos) - ::at32(data, LSYNeg),
-		::at32(data, RSXPos) - ::at32(data, RSXNeg),
-		::at32(data, RSYPos) - ::at32(data, RSYNeg)
+		data.at(LT),
+		data.at(RT),
+		data.at(LSXPos) - data.at(LSXNeg),
+		data.at(LSYPos) - data.at(LSYNeg),
+		data.at(RSXPos) - data.at(RSXNeg),
+		data.at(RSYPos) - data.at(RSYNeg)
 	};
 }
 
 bool xinput_pad_handler::Init()
 {
-	if (m_is_init)
+	if (is_init)
 		return true;
 
 	for (auto it : XINPUT_INFO::LIBRARY_FILENAMES)
 	{
-		library.load(it);
+		library = LoadLibrary(it);
 		if (library)
 		{
-			xinputGetExtended = library.get<PFN_XINPUTGETEXTENDED>("XInputGetExtended");       // Optional
-			xinputGetCustomData = library.get<PFN_XINPUTGETCUSTOMDATA>("XInputGetCustomData"); // Optional
-			xinputGetState = library.get<PFN_XINPUTGETSTATE>(reinterpret_cast<LPCSTR>(100));
+			xinputGetExtended = reinterpret_cast<PFN_XINPUTGETEXTENDED>(GetProcAddress(library, "XInputGetExtended")); // Optional
+			xinputGetCustomData = reinterpret_cast<PFN_XINPUTGETCUSTOMDATA>(GetProcAddress(library, "XInputGetCustomData")); // Optional
+			xinputGetState = reinterpret_cast<PFN_XINPUTGETSTATE>(GetProcAddress(library, reinterpret_cast<LPCSTR>(100)));
 			if (!xinputGetState)
-				xinputGetState = library.get<PFN_XINPUTGETSTATE>("XInputGetState");
+				xinputGetState = reinterpret_cast<PFN_XINPUTGETSTATE>(GetProcAddress(library, "XInputGetState"));
 
-			xinputSetState = library.get<PFN_XINPUTSETSTATE>("XInputSetState");
-			xinputGetBatteryInformation = library.get<PFN_XINPUTGETBATTERYINFORMATION>("XInputGetBatteryInformation");
+			xinputSetState = reinterpret_cast<PFN_XINPUTSETSTATE>(GetProcAddress(library, "XInputSetState"));
+			xinputGetBatteryInformation = reinterpret_cast<PFN_XINPUTGETBATTERYINFORMATION>(GetProcAddress(library, "XInputGetBatteryInformation"));
 
 			if (xinputGetState && xinputSetState && xinputGetBatteryInformation)
 			{
-				m_is_init = true;
+				is_init = true;
 				break;
 			}
 
+			FreeLibrary(library);
+			library = nullptr;
 			xinputGetExtended = nullptr;
 			xinputGetCustomData = nullptr;
 			xinputGetState = nullptr;
@@ -406,17 +373,15 @@ bool xinput_pad_handler::Init()
 		}
 	}
 
-	b_has_orientation = !!xinputGetCustomData;
-
-	if (!m_is_init)
+	if (!is_init)
 		return false;
 
 	return true;
 }
 
-std::vector<pad_list_entry> xinput_pad_handler::list_devices()
+std::vector<std::string> xinput_pad_handler::ListDevices()
 {
-	std::vector<pad_list_entry> xinput_pads_list;
+	std::vector<std::string> xinput_pads_list;
 
 	if (!Init())
 		return xinput_pads_list;
@@ -439,7 +404,7 @@ std::vector<pad_list_entry> xinput_pad_handler::list_devices()
 		}
 
 		if (result == ERROR_SUCCESS)
-			xinput_pads_list.emplace_back(m_name_string + std::to_string(i + 1), false); // Controllers 1-n in GUI
+			xinput_pads_list.push_back(m_name_string + std::to_string(i + 1)); // Controllers 1-n in GUI
 	}
 	return xinput_pads_list;
 }
@@ -451,23 +416,23 @@ std::shared_ptr<PadDevice> xinput_pad_handler::get_device(const std::string& dev
 	if (device_number < 0)
 		return nullptr;
 
-	std::shared_ptr<XInputDevice> dev = std::make_shared<XInputDevice>();
-	dev->deviceNumber = static_cast<u32>(device_number);
+	std::shared_ptr<XInputDevice> x_device = std::make_shared<XInputDevice>();
+	x_device->deviceNumber = static_cast<u32>(device_number);
 
-	return dev;
+	return x_device;
 }
 
-bool xinput_pad_handler::get_is_left_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool xinput_pad_handler::get_is_left_trigger(u64 keyCode)
 {
 	return keyCode == XInputKeyCodes::LT;
 }
 
-bool xinput_pad_handler::get_is_right_trigger(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool xinput_pad_handler::get_is_right_trigger(u64 keyCode)
 {
 	return keyCode == XInputKeyCodes::RT;
 }
 
-bool xinput_pad_handler::get_is_left_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool xinput_pad_handler::get_is_left_stick(u64 keyCode)
 {
 	switch (keyCode)
 	{
@@ -481,7 +446,7 @@ bool xinput_pad_handler::get_is_left_stick(const std::shared_ptr<PadDevice>& /*d
 	}
 }
 
-bool xinput_pad_handler::get_is_right_stick(const std::shared_ptr<PadDevice>& /*device*/, u64 keyCode)
+bool xinput_pad_handler::get_is_right_stick(u64 keyCode)
 {
 	switch (keyCode)
 	{
@@ -520,11 +485,8 @@ PadHandlerBase::connection xinput_pad_handler::update_connection(const std::shar
 	return connection::disconnected;
 }
 
-void xinput_pad_handler::get_extended_info(const pad_ensemble& binding)
+void xinput_pad_handler::get_extended_info(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad)
 {
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
 	XInputDevice* dev = static_cast<XInputDevice*>(device.get());
 	if (!dev || !pad)
 		return;
@@ -533,7 +495,7 @@ void xinput_pad_handler::get_extended_info(const pad_ensemble& binding)
 
 	// Receive Battery Info. If device is not on cable, get battery level, else assume full
 	XINPUT_BATTERY_INFORMATION battery_info;
-	xinputGetBatteryInformation(padnum, BATTERY_DEVTYPE_GAMEPAD, &battery_info);
+	(*xinputGetBatteryInformation)(padnum, BATTERY_DEVTYPE_GAMEPAD, &battery_info);
 	pad->m_cable_state = battery_info.BatteryType == BATTERY_TYPE_WIRED ? 1 : 0;
 	pad->m_battery_level = pad->m_cable_state ? BATTERY_LEVEL_FULL : battery_info.BatteryLevel;
 
@@ -546,17 +508,12 @@ void xinput_pad_handler::get_extended_info(const pad_ensemble& binding)
 			pad->m_sensors[1].m_value = sensors.SCP_ACCEL_Y;
 			pad->m_sensors[2].m_value = sensors.SCP_ACCEL_Z;
 			pad->m_sensors[3].m_value = sensors.SCP_GYRO;
-
-			set_raw_orientation(*pad);
 		}
 	}
 }
 
-void xinput_pad_handler::apply_pad_data(const pad_ensemble& binding)
+void xinput_pad_handler::apply_pad_data(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad)
 {
-	const auto& device = binding.device;
-	const auto& pad = binding.pad;
-
 	XInputDevice* dev = static_cast<XInputDevice*>(device.get());
 	if (!dev || !pad)
 		return;
@@ -566,30 +523,28 @@ void xinput_pad_handler::apply_pad_data(const pad_ensemble& binding)
 
 	// The left motor is the low-frequency rumble motor. The right motor is the high-frequency rumble motor.
 	// The two motors are not the same, and they create different vibration effects. Values range between 0 to 65535.
-	const u8 speed_large = cfg->get_large_motor_speed(pad->m_vibrateMotors);
-	const u8 speed_small = cfg->get_small_motor_speed(pad->m_vibrateMotors);
+	const usz idx_l = cfg->switch_vibration_motors ? 1 : 0;
+	const usz idx_s = cfg->switch_vibration_motors ? 0 : 1;
 
-	dev->new_output_data |= dev->large_motor != speed_large || dev->small_motor != speed_small;
+	const u16 speed_large = cfg->enable_vibration_motor_large ? pad->m_vibrateMotors[idx_l].m_value : static_cast<u16>(vibration_min);
+	const u16 speed_small = cfg->enable_vibration_motor_small ? pad->m_vibrateMotors[idx_s].m_value : static_cast<u16>(vibration_min);
 
-	dev->large_motor = speed_large;
-	dev->small_motor = speed_small;
+	dev->newVibrateData |= dev->largeVibrate != speed_large || dev->smallVibrate != speed_small;
 
-	const auto now = steady_clock::now();
-	const auto elapsed = now - dev->last_output;
+	dev->largeVibrate = speed_large;
+	dev->smallVibrate = speed_small;
 
 	// XBox One Controller can't handle faster vibration updates than ~10ms. Elite is even worse. So I'll use 20ms to be on the safe side. No lag was noticable.
-	if ((dev->new_output_data && elapsed > 20ms) || elapsed > min_output_interval)
+	if (dev->newVibrateData && steady_clock::now() - dev->last_vibration > 20ms)
 	{
-		XINPUT_VIBRATION vibrate
-		{
-			.wLeftMotorSpeed = static_cast<u16>(speed_large * 257), // between 0 to 65535
-			.wRightMotorSpeed = static_cast<u16>(speed_small * 257) // between 0 to 65535
-		};
+		XINPUT_VIBRATION vibrate;
+		vibrate.wLeftMotorSpeed = speed_large * 257;
+		vibrate.wRightMotorSpeed = speed_small * 257;
 
-		if (xinputSetState(padnum, &vibrate) == ERROR_SUCCESS)
+		if ((*xinputSetState)(padnum, &vibrate) == ERROR_SUCCESS)
 		{
-			dev->new_output_data = false;
-			dev->last_output = now;
+			dev->newVibrateData = false;
+			dev->last_vibration = steady_clock::now();
 		}
 	}
 }
diff --git a/rpcs3/Input/xinput_pad_handler.h b/rpcs3/Input/xinput_pad_handler.h
index 899e649b13..2ceddfdc35 100644
--- a/rpcs3/Input/xinput_pad_handler.h
+++ b/rpcs3/Input/xinput_pad_handler.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "Emu/Io/PadHandler.h"
-#include "util/dyn_lib.hpp"
 
 #include <unordered_map>
 
@@ -10,6 +9,7 @@
 #endif
 #include <Windows.h>
 #include <Xinput.h>
+#include <chrono>
 
 // ScpToolkit defined structure for pressure sensitive button query
 struct SCP_EXTN
@@ -78,11 +78,6 @@ class xinput_pad_handler final : public PadHandlerBase
 		LT,
 		RT,
 
-		LT_Pos,
-		LT_Neg,
-		RT_Pos,
-		RT_Neg,
-
 		LSXNeg,
 		LSXPos,
 		LSYNeg,
@@ -98,6 +93,10 @@ class xinput_pad_handler final : public PadHandlerBase
 	struct XInputDevice : public PadDevice
 	{
 		u32 deviceNumber{ 0 };
+		bool newVibrateData{ true };
+		u16 largeVibrate{ 0 };
+		u16 smallVibrate{ 0 };
+		steady_clock::time_point last_vibration;
 		bool is_scp_device{ false };
 		DWORD state{ ERROR_NOT_CONNECTED }; // holds internal controller state change
 		SCP_EXTN state_scp{};
@@ -110,37 +109,39 @@ public:
 
 	bool Init() override;
 
-	std::vector<pad_list_entry> list_devices() override;
-	void SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool player_led, bool battery_led, u32 battery_led_brightness) override;
+	std::vector<std::string> ListDevices() override;
+	void SetPadData(const std::string& padId, u8 player_id, u32 largeMotor, u32 smallMotor, s32 r, s32 g, s32 b, bool battery_led, u32 battery_led_brightness) override;
 	u32 get_battery_level(const std::string& padId) override;
 	void init_config(cfg_pad* cfg) override;
 
 private:
-	using PFN_XINPUTGETEXTENDED = DWORD(WINAPI*)(DWORD, SCP_EXTN*);
-	using PFN_XINPUTGETCUSTOMDATA = DWORD(WINAPI*)(DWORD, DWORD, void*);
-	using PFN_XINPUTGETSTATE = DWORD(WINAPI*)(DWORD, XINPUT_STATE*);
-	using PFN_XINPUTSETSTATE = DWORD(WINAPI*)(DWORD, XINPUT_VIBRATION*);
-	using PFN_XINPUTGETBATTERYINFORMATION = DWORD(WINAPI*)(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*);
+	typedef DWORD (WINAPI * PFN_XINPUTGETEXTENDED)(DWORD, SCP_EXTN *);
+	typedef DWORD (WINAPI * PFN_XINPUTGETCUSTOMDATA)(DWORD, DWORD, void *);
+	typedef DWORD (WINAPI * PFN_XINPUTGETSTATE)(DWORD, XINPUT_STATE *);
+	typedef DWORD (WINAPI * PFN_XINPUTSETSTATE)(DWORD, XINPUT_VIBRATION *);
+	typedef DWORD (WINAPI * PFN_XINPUTGETBATTERYINFORMATION)(DWORD, BYTE, XINPUT_BATTERY_INFORMATION *);
 
+private:
 	int GetDeviceNumber(const std::string& padId);
-	static PadButtonValues get_button_values_base(const XINPUT_STATE& state, trigger_recognition_mode trigger_mode);
-	static PadButtonValues get_button_values_scp(const SCP_EXTN& state, trigger_recognition_mode trigger_mode);
+	static PadButtonValues get_button_values_base(const XINPUT_STATE& state);
+	static PadButtonValues get_button_values_scp(const SCP_EXTN& state);
 
+	bool is_init{ false };
+	HMODULE library{ nullptr };
 	PFN_XINPUTGETEXTENDED xinputGetExtended{ nullptr };
 	PFN_XINPUTGETCUSTOMDATA xinputGetCustomData{ nullptr };
 	PFN_XINPUTGETSTATE xinputGetState{ nullptr };
 	PFN_XINPUTSETSTATE xinputSetState{ nullptr };
 	PFN_XINPUTGETBATTERYINFORMATION xinputGetBatteryInformation{ nullptr };
-	utils::dynamic_library library;
 
 	std::shared_ptr<PadDevice> get_device(const std::string& device) override;
-	bool get_is_left_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_trigger(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_left_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
-	bool get_is_right_stick(const std::shared_ptr<PadDevice>& device, u64 keyCode) override;
+	bool get_is_left_trigger(u64 keyCode) override;
+	bool get_is_right_trigger(u64 keyCode) override;
+	bool get_is_left_stick(u64 keyCode) override;
+	bool get_is_right_stick(u64 keyCode) override;
 	PadHandlerBase::connection update_connection(const std::shared_ptr<PadDevice>& device) override;
-	void get_extended_info(const pad_ensemble& binding) override;
-	void apply_pad_data(const pad_ensemble& binding) override;
+	void get_extended_info(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad) override;
+	void apply_pad_data(const std::shared_ptr<PadDevice>& device, const std::shared_ptr<Pad>& pad) override;
 	std::unordered_map<u64, u16> get_button_values(const std::shared_ptr<PadDevice>& device) override;
 	pad_preview_values get_preview_values(const std::unordered_map<u64, u16>& data) override;
 };
diff --git a/rpcs3/Loader/ELF.h b/rpcs3/Loader/ELF.h
index b9e6ad8803..19dcc7c3d8 100644
--- a/rpcs3/Loader/ELF.h
+++ b/rpcs3/Loader/ELF.h
@@ -4,8 +4,6 @@
 #include "../../Utilities/File.h"
 #include "../../Utilities/bit_set.h"
 
-#include <span>
-
 enum class elf_os : u8
 {
 	none = 0,
@@ -35,54 +33,6 @@ enum class elf_machine : u16
 	mips = 0x08,
 };
 
-enum class sec_type : u32
-{
-	sht_null = 0,
-	sht_progbits = 1,
-	sht_symtab = 2,
-	sht_strtab = 3,
-	sht_rela = 4,
-	sht_hash = 5,
-	sht_dynamic = 6,
-	sht_note = 7,
-	sht_nobits = 8,
-	sht_rel = 9,
-};
-
-enum class sh_flag : u32
-{
-	shf_write,
-	shf_alloc,
-	shf_execinstr,
-
-	__bitset_enum_max
-};
-
-constexpr bool is_memorizable_section(sec_type type, bs_t<sh_flag> flags)
-{
-	switch (type)
-	{
-	case sec_type::sht_null:
-	case sec_type::sht_nobits:
-	{
-		return false;
-	}
-	case sec_type::sht_progbits:
-	{
-		return flags.all_of(sh_flag::shf_alloc);
-	}
-	default:
-	{
-		if (type > sec_type::sht_rel)
-		{
-			return false;
-		}
-
-		return true;
-	}
-	}
-}
-
 template<typename T>
 using elf_be = be_t<T>;
 
@@ -173,8 +123,8 @@ template<template<typename T> class en_t, typename sz_t>
 struct elf_shdr
 {
 	en_t<u32> sh_name;
-	en_t<sec_type> sh_type;
-	en_t<sz_t> _sh_flags;
+	en_t<u32> sh_type;
+	en_t<sz_t> sh_flags;
 	en_t<sz_t> sh_addr;
 	en_t<sz_t> sh_offset;
 	en_t<sz_t> sh_size;
@@ -182,32 +132,6 @@ struct elf_shdr
 	en_t<u32> sh_info;
 	en_t<sz_t> sh_addralign;
 	en_t<sz_t> sh_entsize;
-
-	bs_t<sh_flag> sh_flags() const
-	{
-		return std::bit_cast<bs_t<sh_flag>>(static_cast<u32>(+_sh_flags));
-	}
-};
-
-template<template<typename T> class en_t, typename sz_t>
-struct elf_shdata final : elf_shdr<en_t, sz_t>
-{
-	std::vector<uchar> bin{};
-	std::span<const uchar> bin_view{};
-
-	using base = elf_shdr<en_t, sz_t>;
-
-	elf_shdata() = default;
-
-	std::span<const uchar> get_bin() const
-	{
-		if (!bin_view.empty())
-		{
-			return bin_view;
-		}
-
-		return {bin.data(), bin.size()};
-	}
 };
 
 // ELF loading options
@@ -253,14 +177,11 @@ public:
 	using phdr_t = elf_phdr<en_t, sz_t>;
 	using shdr_t = elf_shdr<en_t, sz_t>;
 	using prog_t = elf_prog<en_t, sz_t>;
-	using shdata_t = elf_shdata<en_t, sz_t>;
 
 	ehdr_t header{};
 
 	std::vector<prog_t> progs{};
-	std::vector<shdata_t> shdrs{};
-
-	usz highest_offset = 0;
+	std::vector<shdr_t> shdrs{};
 
 public:
 	elf_object() = default;
@@ -272,14 +193,13 @@ public:
 
 	elf_error open(const fs::file& stream, u64 offset = 0, bs_t<elf_opt> opts = {})
 	{
-		highest_offset = 0;
-
 		// Check stream
 		if (!stream)
 			return set_error(elf_error::stream);
 
 		// Read ELF header
-		if (sizeof(header) != stream.read_at(offset, &header, sizeof(header)))
+		stream.seek(offset);
+		if (!stream.read(header))
 			return set_error(elf_error::stream_header);
 
 		// Check magic
@@ -287,11 +207,11 @@ public:
 			return set_error(elf_error::header_magic);
 
 		// Check class
-		if (header.e_class != (std::is_same_v<sz_t, u32> ? 1 : 2))
+		if (header.e_class != (std::is_same<sz_t, u32>::value ? 1 : 2))
 			return set_error(elf_error::header_class);
 
 		// Check endianness
-		if (header.e_data != (std::is_same_v<en_t<u32>, le_t<u32>> ? 1 : 2))
+		if (header.e_data != (std::is_same<en_t<u32>, le_t<u32>>::value ? 1 : 2))
 			return set_error(elf_error::header_endianness);
 
 		// Check machine
@@ -316,29 +236,20 @@ public:
 		if (header.e_shnum && header.e_shentsize != u16{sizeof(shdr_t)})
 			return set_error(elf_error::header_version);
 
-		highest_offset = sizeof(header);
-
 		// Load program headers
 		std::vector<phdr_t> _phdrs;
-		std::vector<shdr_t> _shdrs;
-
-		u64 seek_pos = 0;
 
 		if (!(opts & elf_opt::no_programs))
 		{
-			seek_pos = offset + header.e_phoff;
-			highest_offset = std::max<usz>(highest_offset, seek_pos);
-
-			if (!stream.read(_phdrs, header.e_phnum, true, seek_pos))
+			stream.seek(offset + header.e_phoff);
+			if (!stream.read<true>(_phdrs, header.e_phnum))
 				return set_error(elf_error::stream_phdrs);
 		}
 
 		if (!(opts & elf_opt::no_sections))
 		{
-			seek_pos = offset + header.e_shoff;
-			highest_offset = std::max<usz>(highest_offset, seek_pos);
-
-			if (!stream.read(_shdrs, header.e_shnum, true, seek_pos))
+			stream.seek(offset + header.e_shoff);
+			if (!stream.read<true>(shdrs, header.e_shnum))
 				return set_error(elf_error::stream_shdrs);
 		}
 
@@ -346,50 +257,14 @@ public:
 		progs.reserve(_phdrs.size());
 		for (const auto& hdr : _phdrs)
 		{
-			static_cast<phdr_t&>(progs.emplace_back()) = hdr;
+			progs.emplace_back();
+
+			static_cast<phdr_t&>(progs.back()) = hdr;
 
 			if (!(opts & elf_opt::no_data))
 			{
-				seek_pos = offset + hdr.p_offset;
-				highest_offset = std::max<usz>(highest_offset, seek_pos);
-
-				if (!stream.read(progs.back().bin, hdr.p_filesz, true, seek_pos))
-					return set_error(elf_error::stream_data);
-			}
-		}
-
-		shdrs.clear();
-		shdrs.reserve(_shdrs.size());
-		for (const auto& shdr : _shdrs)
-		{
-			static_cast<shdr_t&>(shdrs.emplace_back()) = shdr;
-
-			if (!(opts & elf_opt::no_data) && is_memorizable_section(shdr.sh_type, shdr.sh_flags()))
-			{
-				usz p_index = umax;
-
-				for (const auto& hdr : _phdrs)
-				{
-					// Try to find it in phdr data instead of allocating new section
-					p_index++;
-
-					if (hdr.p_offset <= shdr.sh_offset && shdr.sh_offset + shdr.sh_size - 1 <= hdr.p_offset + hdr.p_filesz - 1)
-					{
-						const auto& prog = ::at32(progs, p_index);
-						shdrs.back().bin_view = {prog.bin.data() + shdr.sh_offset - hdr.p_offset, shdr.sh_size};
-					}
-				}
-
-				if (!shdrs.back().bin_view.empty())
-				{
-					// Optimized
-					continue;
-				}
-
-				seek_pos = offset + shdr.sh_offset;
-				highest_offset = std::max<usz>(highest_offset, seek_pos);
-
-				if (!stream.read(shdrs.back().bin, shdr.sh_size, true, seek_pos))
+				stream.seek(offset + hdr.p_offset);
+				if (!stream.read<true>(progs.back().bin, hdr.p_filesz))
 					return set_error(elf_error::stream_data);
 			}
 		}
@@ -402,20 +277,13 @@ public:
 
 	std::vector<u8> save(std::vector<u8>&& init = std::vector<u8>{}) const
 	{
-		if (get_error() != elf_error::ok)
-		{
-			return std::move(init);
-		}
-
 		fs::file stream = fs::make_stream<std::vector<u8>>(std::move(init));
 
-		const bool fixup_shdrs = shdrs.empty() || shdrs[0].sh_type != sec_type::sht_null;
-
 		// Write header
 		ehdr_t header{};
 		header.e_magic = "\177ELF"_u32;
-		header.e_class = std::is_same_v<sz_t, u32> ? 1 : 2;
-		header.e_data = std::is_same_v<en_t<u32>, le_t<u32>> ? 1 : 2;
+		header.e_class = std::is_same<sz_t, u32>::value ? 1 : 2;
+		header.e_data = std::is_same<en_t<u32>, le_t<u32>>::value ? 1 : 2;
 		header.e_curver = 1;
 		header.e_os_abi = OS != elf_os::none ? OS : this->header.e_os_abi;
 		header.e_abi_ver = this->header.e_abi_ver;
@@ -430,7 +298,7 @@ public:
 		header.e_phentsize = u32{sizeof(phdr_t)};
 		header.e_phnum = ::size32(progs);
 		header.e_shentsize = u32{sizeof(shdr_t)};
-		header.e_shnum = ::size32(shdrs) + u32{fixup_shdrs};
+		header.e_shnum = ::size32(shdrs);
 		header.e_shstrndx = this->header.e_shstrndx;
 		stream.write(header);
 
@@ -442,54 +310,10 @@ public:
 			stream.write(phdr);
 		}
 
-		if (fixup_shdrs)
+		for (shdr_t shdr : shdrs)
 		{
-			// Insert a must-have empty section at the start
-			stream.write(shdr_t{});
-		}
-
-		for (const auto& shdr : shdrs)
-		{
-			shdr_t out = static_cast<shdr_t>(shdr);
-
-			if (is_memorizable_section(shdr.sh_type, shdr.sh_flags()))
-			{
-				usz p_index = umax;
-				usz data_base = header.e_shoff + u32{sizeof(shdr_t)} * ::size32(shdrs);
-				bool result = false;
-
-				for (const auto& hdr : progs)
-				{
-					if (shdr.bin_view.empty())
-					{
-						break;
-					}
-
-					// Try to find it in phdr data instead of writing new section
-					p_index++;
-
-					// Rely on previous sh_offset value!
-					if (hdr.p_offset <= shdr.sh_offset && shdr.sh_offset + shdr.sh_size - 1 <= hdr.p_offset + hdr.p_filesz - 1)
-					{
-						out.sh_offset = ::narrow<sz_t>(data_base + static_cast<usz>(shdr.sh_offset - hdr.p_offset));
-						result = true;
-						break;
-					}
-
-					data_base += ::at32(progs, p_index).p_filesz;
-				}
-
-				if (result)
-				{
-					// Optimized
-				}
-				else
-				{
-					out.sh_offset = std::exchange(off, off + shdr.sh_size);
-				}
-			}
-
-			stream.write(static_cast<shdr_t>(out));
+			// TODO?
+			stream.write(shdr);
 		}
 
 		// Write data
@@ -498,16 +322,6 @@ public:
 			stream.write(prog.bin);
 		}
 
-		for (const auto& shdr : shdrs)
-		{
-			if (!is_memorizable_section(shdr.sh_type, shdr.sh_flags()) || !shdr.bin_view.empty())
-			{
-				continue;
-			}
-
-			stream.write(shdr.bin);
-		}
-
 		return std::move(static_cast<fs::container_stream<std::vector<u8>>*>(stream.release().get())->obj);
 	}
 
@@ -524,11 +338,15 @@ public:
 	elf_object& set_error(elf_error error)
 	{
 		// Setting an error causes the state to clear if there was no error before
-		if (m_error == elf_error::ok && error != elf_error::ok)
-			clear();
+		// Trying to set elf_error::ok is ignored
+		if (error != elf_error::ok)
+		{
+			if (m_error == elf_error::ok)
+				clear();
+
+			m_error = error;
+		}
 
-		m_error = error;
-		highest_offset = 0;
 		return *this;
 	}
 
@@ -546,7 +364,5 @@ public:
 
 using ppu_exec_object = elf_object<elf_be, u64, elf_machine::ppc64, elf_os::none, elf_type::exec>;
 using ppu_prx_object  = elf_object<elf_be, u64, elf_machine::ppc64, elf_os::lv2, elf_type::prx>;
-using ppu_rel_object  = elf_object<elf_be, u64, elf_machine::ppc64, elf_os::lv2, elf_type::rel>;
 using spu_exec_object = elf_object<elf_be, u32, elf_machine::spu, elf_os::none, elf_type::exec>;
-using spu_rel_object  = elf_object<elf_be, u32, elf_machine::spu, elf_os::none, elf_type::rel>;
 using arm_exec_object = elf_object<elf_le, u32, elf_machine::arm, elf_os::none, elf_type::none>;
diff --git a/rpcs3/Loader/PSF.cpp b/rpcs3/Loader/PSF.cpp
index ee88424608..fe9ea504d5 100644
--- a/rpcs3/Loader/PSF.cpp
+++ b/rpcs3/Loader/PSF.cpp
@@ -2,11 +2,10 @@
 #include "PSF.h"
 
 #include "util/asm.hpp"
-#include <span>
 
 LOG_CHANNEL(psf_log, "PSF");
 
-template <>
+template<>
 void fmt_class_string<psf::format>::format(std::string& out, u64 arg)
 {
 	format_enum(out, arg, [](auto fmt)
@@ -22,7 +21,7 @@ void fmt_class_string<psf::format>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
+template<>
 void fmt_class_string<psf::error>::format(std::string& out, u64 arg)
 {
 	format_enum(out, arg, [](auto fmt)
@@ -39,47 +38,6 @@ void fmt_class_string<psf::error>::format(std::string& out, u64 arg)
 	});
 }
 
-template <>
-void fmt_class_string<psf::registry>::format(std::string& out, u64 arg)
-{
-	const psf::registry& psf = get_object(arg);
-
-	for (const auto& entry : psf)
-	{
-		if (entry.second.type() == psf::format::array)
-		{
-			// Format them last
-			continue;
-		}
-
-		fmt::append(out, "%s: ", entry.first);
-
-		const psf::entry& data = entry.second;
-
-		if (data.type() == psf::format::integer)
-		{
-			fmt::append(out, "0x%x", data.as_integer());
-		}
-		else
-		{
-			fmt::append(out, "\"%s\"", data.as_string());
-		}
-
-		out += '\n';
-	}
-
-	for (const auto& entry : psf)
-	{
-		if (entry.second.type() != psf::format::array)
-		{
-			// Formatted before
-			continue;
-		}
-
-		fmt::append(out, "%s: %s\n", entry.first, std::span<const u8>(reinterpret_cast<const u8*>(entry.second.as_string().data()), entry.second.size()));
-	}
-}
-
 namespace psf
 {
 	struct header_t
@@ -101,27 +59,26 @@ namespace psf
 	};
 
 
-	entry::entry(format type, u32 max_size, std::string_view value, bool allow_truncate) noexcept
+	entry::entry(format type, u32 max_size, std::string_view value)
 		: m_type(type)
 		, m_max_size(max_size)
 		, m_value_string(value)
 	{
 		ensure(type == format::string || type == format::array);
-		ensure(max_size > (type == format::string ? 1u : 0u));
-
-		if (allow_truncate && value.size() > max(false))
-		{
-			m_value_string.resize(max(false));
-		}
+		ensure(max_size);
 	}
 
-	entry::entry(u32 value) noexcept
+	entry::entry(u32 value)
 		: m_type(format::integer)
 		, m_max_size(sizeof(u32))
 		, m_value_integer(value)
 	{
 	}
 
+	entry::~entry()
+	{
+	}
+
 	const std::string& entry::as_string() const
 	{
 		ensure(m_type == format::string || m_type == format::array);
@@ -154,7 +111,7 @@ namespace psf
 		{
 		case format::string:
 		case format::array:
-			return std::min(m_max_size, ::narrow<u32>(m_value_string.size() + (m_type == format::string ? 1 : 0)));
+			return std::min(m_max_size, ::narrow<u32>(m_value_string.size() + (m_type == format::string)));
 
 		case format::integer:
 			return sizeof(u32);
@@ -163,73 +120,54 @@ namespace psf
 		fmt::throw_exception("Invalid format (0x%x)", m_type);
 	}
 
-	bool entry::is_valid() const
+	load_result_t load(const fs::file& stream)
 	{
-		switch (m_type)
-		{
-		case format::string:
-		case format::array:
-			return m_value_string.size() <= this->max(false);
+#define PSF_CHECK(cond, err) if (!static_cast<bool>(cond)) { if (error::err != error::stream) psf_log.error("Error loading PSF: %s%s", error::err, \
+			src_loc{__builtin_LINE(), __builtin_COLUMN(), __builtin_FILE(), __builtin_FUNCTION()}); \
+			result.clear(); \
+			errc = error::err; \
+			return pair; }
 
-		case format::integer:
-			return true;
-		default: break;
-		}
+		load_result_t pair{};
+		auto& [result, errc] = pair;
 
-		fmt::throw_exception("Invalid format (0x%x)", m_type);
-	}
-
-	load_result_t load(const fs::file& stream, std::string_view filename)
-	{
-		load_result_t result{};
-
-#define PSF_CHECK(cond, err) \
-		if (!static_cast<bool>(cond)) \
-		{ \
-			if (err != error::stream) \
-				psf_log.error("Error loading PSF '%s': %s%s", filename, err, std::source_location::current()); \
-			result.sfo.clear(); \
-			result.errc = err; \
-			return result; \
-		}
-
-		PSF_CHECK(stream, error::stream);
+		PSF_CHECK(stream, stream);
 
 		stream.seek(0);
 
 		// Get header
 		header_t header;
-		PSF_CHECK(stream.read(header), error::not_psf);
+		PSF_CHECK(stream.read(header), not_psf);
 
 		// Check magic and version
-		PSF_CHECK(header.magic == "\0PSF"_u32, error::not_psf);
-		PSF_CHECK(header.version == 0x101u, error::not_psf);
-		PSF_CHECK(header.off_key_table >= sizeof(header_t), error::corrupt);
-		PSF_CHECK(header.off_key_table <= header.off_data_table, error::corrupt);
-		PSF_CHECK(header.off_data_table <= stream.size(), error::corrupt);
+		PSF_CHECK(header.magic == "\0PSF"_u32, not_psf);
+		PSF_CHECK(header.version == 0x101u, not_psf);
+		PSF_CHECK(header.off_key_table >= sizeof(header_t), corrupt);
+		PSF_CHECK(header.off_key_table <= header.off_data_table, corrupt);
+		PSF_CHECK(header.off_data_table <= stream.size(), corrupt);
 
 		// Get indices
 		std::vector<def_table_t> indices;
-		PSF_CHECK(stream.read(indices, header.entries_num), error::corrupt);
+		PSF_CHECK(stream.read<true>(indices, header.entries_num), corrupt);
 
 		// Get keys
 		std::string keys;
-		PSF_CHECK(stream.seek(header.off_key_table) == header.off_key_table, error::corrupt);
-		PSF_CHECK(stream.read(keys, header.off_data_table - header.off_key_table), error::corrupt);
+		PSF_CHECK(stream.seek(header.off_key_table) == header.off_key_table, corrupt);
+		PSF_CHECK(stream.read<true>(keys, header.off_data_table - header.off_key_table), corrupt);
 
 		// Load entries
 		for (u32 i = 0; i < header.entries_num; ++i)
 		{
-			PSF_CHECK(indices[i].key_off < header.off_data_table - header.off_key_table, error::corrupt);
+			PSF_CHECK(indices[i].key_off < header.off_data_table - header.off_key_table, corrupt);
 
 			// Get key name (null-terminated string)
 			std::string key(keys.data() + indices[i].key_off);
 
 			// Check entry
-			PSF_CHECK(!result.sfo.contains(key), error::corrupt);
-			PSF_CHECK(indices[i].param_len <= indices[i].param_max, error::corrupt);
-			PSF_CHECK(indices[i].data_off < stream.size() - header.off_data_table, error::corrupt);
-			PSF_CHECK(indices[i].param_max < stream.size() - indices[i].data_off, error::corrupt);
+			PSF_CHECK(result.count(key) == 0, corrupt);
+			PSF_CHECK(indices[i].param_len <= indices[i].param_max, corrupt);
+			PSF_CHECK(indices[i].data_off < stream.size() - header.off_data_table, corrupt);
+			PSF_CHECK(indices[i].param_max < stream.size() - indices[i].data_off, corrupt);
 
 			// Seek data pointer
 			stream.seek(header.off_data_table + indices[i].data_off);
@@ -238,9 +176,9 @@ namespace psf
 			{
 				// Integer data
 				le_t<u32> value;
-				PSF_CHECK(stream.read(value), error::corrupt);
+				PSF_CHECK(stream.read(value), corrupt);
 
-				result.sfo.emplace(std::piecewise_construct,
+				result.emplace(std::piecewise_construct,
 					std::forward_as_tuple(std::move(key)),
 					std::forward_as_tuple(value));
 			}
@@ -248,7 +186,7 @@ namespace psf
 			{
 				// String/array data
 				std::string value;
-				PSF_CHECK(stream.read(value, indices[i].param_len), error::corrupt);
+				PSF_CHECK(stream.read<true>(value, indices[i].param_len), corrupt);
 
 				if (indices[i].param_fmt == format::string)
 				{
@@ -256,7 +194,7 @@ namespace psf
 					value.resize(std::strlen(value.c_str()));
 				}
 
-				result.sfo.emplace(std::piecewise_construct,
+				result.emplace(std::piecewise_construct,
 					std::forward_as_tuple(std::move(key)),
 					std::forward_as_tuple(indices[i].param_fmt, indices[i].param_max, std::move(value)));
 			}
@@ -267,22 +205,13 @@ namespace psf
 			}
 		}
 
-		const auto cat = get_string(result.sfo, "CATEGORY", "");
-		constexpr std::string_view valid_cats[]{"GD", "DG", "HG", "AM", "AP", "AS", "AT", "AV", "BV", "WT", "HM", "CB", "SF", "2P", "2G", "1P", "PP", "MN", "PE", "2D", "SD", "MS"};
-
-		if (std::find(std::begin(valid_cats), std::end(valid_cats), cat) == std::end(valid_cats))
-		{
-			psf_log.error("Unknown category ('%s')", cat);
-			PSF_CHECK(false, error::corrupt);
-		}
-
 #undef PSF_CHECK
-		return result;
+		return pair;
 	}
 
 	load_result_t load(const std::string& filename)
 	{
-		return load(fs::file(filename), filename);
+		return load(fs::file(filename));
 	}
 
 	std::vector<u8> save_object(const psf::registry& psf, std::vector<u8>&& init)
@@ -296,11 +225,11 @@ namespace psf
 
 		for (const auto& entry : psf)
 		{
-			def_table_t index{};
+			def_table_t index;
 			index.key_off = ::narrow<u32>(key_offset);
 			index.param_fmt = entry.second.type();
 			index.param_len = entry.second.size();
-			index.param_max = entry.second.max(true);
+			index.param_max = entry.second.max();
 			index.data_off = ::narrow<u32>(data_offset);
 
 			// Update offsets:
@@ -314,7 +243,7 @@ namespace psf
 		key_offset = utils::align(key_offset, 4);
 
 		// Generate header
-		header_t header{};
+		header_t header;
 		header.magic = "\0PSF"_u32;
 		header.version = 0x101;
 		header.off_key_table = ::narrow<u32>(sizeof(header_t) + sizeof(def_table_t) * psf.size());
@@ -339,7 +268,7 @@ namespace psf
 		for (const auto& entry : psf)
 		{
 			const auto fmt = entry.second.type();
-			const u32 max = entry.second.max(true);
+			const u32 max = entry.second.max();
 
 			if (fmt == format::integer && max == sizeof(u32))
 			{
@@ -348,17 +277,17 @@ namespace psf
 			}
 			else if (fmt == format::string || fmt == format::array)
 			{
-				std::string_view value = entry.second.as_string();
+				const std::string& value = entry.second.as_string();
+				const usz size = std::min<usz>(max, value.size());
 
-				if (!entry.second.is_valid())
+				if (value.size() + (fmt == format::string) > max)
 				{
 					// TODO: check real limitations of PSF format
-					psf_log.error("Entry value shrinkage (key='%s', value='%s', size=0x%zx, max=0x%x)", entry.first, value, value.size(), max);
-					value = value.substr(0, entry.second.max(false));
+					psf_log.error("Entry value shrinkage (key='%s', value='%s', size=0x%zx, max=0x%x)", entry.first, value, size, max);
 				}
 
-				stream.write(value.data(), value.size());
-				stream.trunc(stream.seek(max - value.size(), fs::seek_cur)); // Skip up to max_size
+				stream.write(value);
+				stream.trunc(stream.seek(max - size, fs::seek_cur)); // Skip up to max_size
 			}
 			else
 			{
@@ -369,7 +298,7 @@ namespace psf
 		return std::move(static_cast<fs::container_stream<std::vector<u8>>*>(stream.release().get())->obj);
 	}
 
-	std::string_view get_string(const registry& psf, std::string_view key, std::string_view def)
+	std::string_view get_string(const registry& psf, const std::string& key, std::string_view def)
 	{
 		const auto found = psf.find(key);
 
@@ -381,7 +310,7 @@ namespace psf
 		return found->second.as_string();
 	}
 
-	u32 get_integer(const registry& psf, std::string_view key, u32 def)
+	u32 get_integer(const registry& psf, const std::string& key, u32 def)
 	{
 		const auto found = psf.find(key);
 
@@ -392,44 +321,4 @@ namespace psf
 
 		return found->second.as_integer();
 	}
-
-	bool check_registry(const registry& psf, std::function<bool(bool ok, const std::string& key, const entry& value)> validate, std::source_location src_loc)
-	{
-		bool psf_ok = true;
-
-		for (const auto& [key, value] : psf)
-		{
-			bool entry_ok = value.is_valid();
-
-			if (validate)
-			{
-				// Validate against a custom condition as well (forward error)
-				if (!validate(entry_ok, key, value))
-				{
-					entry_ok = false;
-				}
-			}
-
-			if (!entry_ok)
-			{
-				if (value.type() == format::string)
-				{
-					psf_log.error("Entry '%s' is invalid: string='%s'.%s", key, value.as_string(), src_loc);
-				}
-				else
-				{
-					// TODO: Better logging of other types
-					psf_log.error("Entry %s is invalid.%s", key, value.as_string(), src_loc);
-				}
-			}
-
-			if (!entry_ok)
-			{
-				// Do not break, run over all entries in order to report all errors
-				psf_ok = false;
-			}
-		}
-
-		return psf_ok;
-	}
 }
diff --git a/rpcs3/Loader/PSF.h b/rpcs3/Loader/PSF.h
index 9cc8b16c19..581bd75d87 100644
--- a/rpcs3/Loader/PSF.h
+++ b/rpcs3/Loader/PSF.h
@@ -12,25 +12,6 @@ namespace fs
 
 namespace psf
 {
-	enum sound_format_flag : s32
-	{
-		lpcm_2   = 1 << 0, // Linear PCM 2 Ch.
-		lpcm_5_1 = 1 << 2, // Linear PCM 5.1 Ch.
-		lpcm_7_1 = 1 << 4, // Linear PCM 7.1 Ch.
-		ac3      = 1 << 8, // Dolby Digital 5.1 Ch.
-		dts      = 1 << 9, // DTS 5.1 Ch.
-	};
-
-	enum resolution_flag : s32
-	{
-		_480      = 1 << 0,
-		_576      = 1 << 1,
-		_720      = 1 << 2,
-		_1080     = 1 << 3,
-		_480_16_9 = 1 << 4,
-		_576_16_9 = 1 << 5,
-	};
-
 	enum class format : u16
 	{
 		array   = 0x0004, // claimed to be a non-NTS string (char array)
@@ -55,12 +36,12 @@ namespace psf
 
 	public:
 		// Construct string entry, assign the value
-		entry(format type, u32 max_size, std::string_view value, bool allow_truncate = false) noexcept;
+		entry(format type, u32 max_size, std::string_view value);
 
 		// Construct integer entry, assign the value
-		entry(u32 value) noexcept;
+		entry(u32 value);
 
-		~entry() = default;
+		~entry();
 
 		const std::string& as_string() const;
 		u32 as_integer() const;
@@ -69,13 +50,12 @@ namespace psf
 		entry& operator =(u32 value);
 
 		format type() const { return m_type; }
-		u32 max(bool with_nts) const { return m_max_size - (!with_nts && m_type == format::string ? 1 : 0); }
+		u32 max() const { return m_max_size; }
 		u32 size() const;
-		bool is_valid() const;
 	};
 
 	// Define PSF registry as a sorted map of entries:
-	using registry = std::map<std::string, entry, std::less<>>;
+	using registry = std::map<std::string, entry>;
 
 	struct load_result_t
 	{
@@ -89,24 +69,21 @@ namespace psf
 	};
 
 	// Load PSF registry from SFO binary format
-	load_result_t load(const fs::file&, std::string_view filename);
+	load_result_t load(const fs::file&);
 	load_result_t load(const std::string& filename);
-	inline registry load_object(const fs::file& f, std::string_view filename) { return load(f, filename).sfo; }
-	inline registry load_object(const std::string& filename) { return load(filename).sfo; }
+	inline registry load_object(const fs::file& f) { return load(f).sfo; }
 
 	// Convert PSF registry to SFO binary format
 	std::vector<u8> save_object(const registry&, std::vector<u8>&& init = std::vector<u8>{});
 
 	// Get string value or default value
-	std::string_view get_string(const registry& psf, std::string_view key, std::string_view def = ""sv);
+	std::string_view get_string(const registry& psf, const std::string& key, std::string_view def = ""sv);
 
 	// Get integer value or default value
-	u32 get_integer(const registry& psf, std::string_view key, u32 def = 0);
-
-	bool check_registry(const registry& psf, std::function<bool(bool ok, const std::string& key, const entry& value)> validate = {}, std::source_location src_loc = std::source_location::current());
+	u32 get_integer(const registry& psf, const std::string& key, u32 def = 0);
 
 	// Assign new entry
-	inline void assign(registry& psf, std::string_view key, entry&& _entry)
+	inline void assign(registry& psf, const std::string& key, entry&& _entry)
 	{
 		const auto found = psf.find(key);
 
@@ -121,18 +98,9 @@ namespace psf
 	}
 
 	// Make string entry
-	inline entry string(u32 max_size, std::string_view value, bool allow_truncate = false)
+	inline entry string(u32 max_size, std::string_view value)
 	{
-		return {format::string, max_size, value, allow_truncate};
-	}
-
-	// Make string entry (from char[N])
-	template <usz CharN>
-	inline entry string(u32 max_size, char (&value_array)[CharN], bool allow_truncate = false)
-	{
-		std::string_view value{value_array, CharN};
-		value = value.substr(0, std::min<usz>(value.find_first_of('\0'), value.size()));
-		return string(max_size, value, allow_truncate);
+		return {format::string, max_size, value};
 	}
 
 	// Make array entry
@@ -140,10 +108,4 @@ namespace psf
 	{
 		return {format::array, max_size, value};
 	}
-
-	// Checks if of HDD catgeory (assumes a valid category is being passed)
-	constexpr bool is_cat_hdd(std::string_view cat)
-	{
-		return cat.size() == 2u && cat[1] != 'D' && cat != "DG"sv && cat != "MS"sv;
-	}
 }
diff --git a/rpcs3/Loader/PUP.cpp b/rpcs3/Loader/PUP.cpp
index 398014cb88..65af45ef01 100644
--- a/rpcs3/Loader/PUP.cpp
+++ b/rpcs3/Loader/PUP.cpp
@@ -32,7 +32,7 @@ pup_object::pup_object(fs::file&& file) : m_file(std::move(file))
 		return;
 	}
 
-	// Check if file size is the expected size, use subtraction to avoid overflows
+	// Check if file size is the expected size, use substraction to avoid overflows
 	if (file_size < m_header.header_length || file_size - m_header.header_length < m_header.data_length)
 	{
 		m_formatted_error = fmt::format("Firmware size mismatch, expected: 0x%x + 0x%x, actual: 0x%x", m_header.header_length, m_header.data_length, file_size);
@@ -46,7 +46,7 @@ pup_object::pup_object(fs::file&& file) : m_file(std::move(file))
 		return;
 	}
 
-	if (!m_file.read(m_file_tbl, m_header.file_count) || !m_file.read(m_hash_tbl, m_header.file_count))
+	if (!m_file.read<true>(m_file_tbl, m_header.file_count) || !m_file.read<true>(m_hash_tbl, m_header.file_count))
 	{
 		m_error = pup_error::header_file_count;
 		return;
@@ -89,7 +89,7 @@ pup_error pup_object::validate_hashes()
 
 	for (const PUPFileEntry& file : m_file_tbl)
 	{
-		// Sanity check for offset and length, use subtraction to avoid overflows
+		// Sanity check for offset and length, use substraction to avoid overflows
 		if (size < file.data_offset || size - file.data_offset < file.data_length)
 		{
 			m_formatted_error = fmt::format("File database entry is invalid. (offset=0x%x, length=0x%x, PUP.size=0x%x)", file.data_offset, file.data_length, size);
diff --git a/rpcs3/Loader/PUP.h b/rpcs3/Loader/PUP.h
index 0732738d5a..ec2775e0e8 100644
--- a/rpcs3/Loader/PUP.h
+++ b/rpcs3/Loader/PUP.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "util/types.hpp"
-#include "util/endian.hpp"
 #include "../../Utilities/File.h"
 
 #include <vector>
@@ -59,7 +58,6 @@ class pup_object
 
 public:
 	pup_object(fs::file&& file);
-	fs::file &file() { return m_file; }
 
 	explicit operator pup_error() const { return m_error; }
 	const std::string& get_formatted_error() const { return m_formatted_error; }
diff --git a/rpcs3/Loader/TAR.cpp b/rpcs3/Loader/TAR.cpp
index bfd937b3d3..5705c69013 100644
--- a/rpcs3/Loader/TAR.cpp
+++ b/rpcs3/Loader/TAR.cpp
@@ -9,29 +9,12 @@
 
 #include "util/asm.hpp"
 
-#include "util/serialization_ext.hpp"
-
 #include <charconv>
-#include <span>
 
 LOG_CHANNEL(tar_log, "TAR");
 
-fs::file make_file_view(const fs::file& file, u64 offset, u64 size);
-
-// File constructor
 tar_object::tar_object(const fs::file& file)
-	: m_file(std::addressof(file))
-	, m_ar(nullptr)
-	, m_ar_tar_start(umax)
-{
-	ensure(*m_file);
-}
-
-// Stream (pipe-like) constructor
-tar_object::tar_object(utils::serial& ar)
-	: m_file(nullptr)
-	, m_ar(std::addressof(ar))
-	, m_ar_tar_start(ar.pos)
+	: m_file(file)
 {
 }
 
@@ -39,14 +22,12 @@ TARHeader tar_object::read_header(u64 offset) const
 {
 	TARHeader header{};
 
-	if (m_ar)
+	if (m_file.seek(offset) != offset)
 	{
-		ensure(m_ar->pos == m_ar_tar_start + offset);
-		m_ar->serialize(header);
 		return header;
 	}
 
-	if (m_file->read_at(offset, &header, sizeof(header)) != sizeof(header))
+	if (!m_file.read(header))
 	{
 		std::memset(&header, 0, sizeof(header));
 	}
@@ -56,13 +37,13 @@ TARHeader tar_object::read_header(u64 offset) const
 
 u64 octal_text_to_u64(std::string_view sv)
 {
-	u64 i = umax;
+	u64 i = -1;
 	const auto ptr = std::from_chars(sv.data(), sv.data() + sv.size(), i, 8).ptr;
 
 	// Range must be terminated with either NUL or space
 	if (ptr == sv.data() + sv.size() || (*ptr && *ptr != ' '))
 	{
-		i = umax;
+		i = -1;
 	}
 
 	return i;
@@ -71,190 +52,132 @@ u64 octal_text_to_u64(std::string_view sv)
 std::vector<std::string> tar_object::get_filenames()
 {
 	std::vector<std::string> vec;
-
 	get_file("");
-
 	for (auto it = m_map.cbegin(); it != m_map.cend(); ++it)
 	{
 		vec.push_back(it->first);
 	}
-
 	return vec;
 }
 
-std::unique_ptr<utils::serial> tar_object::get_file(const std::string& path, std::string* new_file_path)
+fs::file tar_object::get_file(const std::string& path)
 {
-	std::unique_ptr<utils::serial> m_out;
-
-	auto emplace_single_entry = [&](usz& offset, const usz max_size) -> std::pair<usz, std::string>
-	{
-		if (offset >= max_size)
-		{
-			return {};
-		}
-
-		TARHeader header = read_header(offset);
-		offset += 512;
-
-		u64 size = umax;
-
-		std::string filename;
-
-		if (std::memcmp(header.magic, "ustar", 5) == 0)
-		{
-			const std::string_view size_sv{header.size, std::size(header.size)};
-
-			size = octal_text_to_u64(size_sv);
-
-			// Check for overflows and if surpasses file size
-			if ((header.name[0] || header.prefix[0]) && ~size >= 512 && max_size >= size && max_size - size >= offset)
-			{
-				// Cache size in native u64 format
-				static_assert(sizeof(size) < sizeof(header.size));
-				std::memcpy(header.size, &size, 8);
-
-				std::string_view prefix_name{header.prefix, std::size(header.prefix)};
-				std::string_view name{header.name, std::size(header.name)};
-
-				prefix_name = prefix_name.substr(0, prefix_name.find_first_of('\0'));
-				name = name.substr(0, name.find_first_of('\0'));
-
-				filename += prefix_name;
-				filename += name;
-
-				// Save header and offset
-				m_map.insert_or_assign(filename, std::make_pair(offset, std::move(header)));
-
-				if (new_file_path)
-				{
-					*new_file_path = filename;
-				}
-
-				return { size, std::move(filename) };
-			}
-
-			tar_log.error("tar_object::get_file() failed to convert header.size=%s, filesize=0x%x", size_sv, max_size);
-		}
-		else
-		{
-			tar_log.notice("tar_object::get_file() failed to parse header: offset=0x%x, filesize=0x%x, header_first16=0x%016x", offset, max_size, read_from_ptr<be_t<u128>>(reinterpret_cast<const u8*>(&header)));
-		}
-
-		return { size, {} };
-	};
+	if (!m_file) return fs::file();
 
 	if (auto it = m_map.find(path); it != m_map.end())
 	{
 		u64 size = 0;
 		std::memcpy(&size, it->second.second.size, sizeof(size));
-
-		if (m_file)
-		{
-			m_out = std::make_unique<utils::serial>();
-			m_out->set_reading_state();
-			m_out->m_file_handler = make_uncompressed_serialization_file_handler(make_file_view(*m_file, it->second.first, size));
-		}
-		else
-		{
-			m_out = std::make_unique<utils::serial>();
-			*m_out = std::move(*m_ar);
-			m_out->m_max_data = m_ar_tar_start + it->second.first + size;
-		}
-
-		return m_out;
+		std::vector<u8> buf(size);
+		m_file.seek(it->second.first);
+		m_file.read(buf, size);
+		return fs::make_stream(std::move(buf));
 	}
-	else if (m_ar && path.empty())
+	else //continue scanning from last file entered
 	{
-		const u64 size = emplace_single_entry(largest_offset, m_ar->get_size(umax) - m_ar_tar_start).first;
-
-		// Advance offset to next block
-		largest_offset += utils::align(size, 512);
-	}
-	// Continue scanning from last file entered
-	else if (m_file)
-	{
-		const u64 max_size = m_file->size();
+		const u64 max_size = m_file.size();
 
 		while (largest_offset < max_size)
 		{
-			const auto [size, filename] = emplace_single_entry(largest_offset, max_size);
+			TARHeader header = read_header(largest_offset);
+
+			u64 size = -1;
+
+			std::string filename;
+
+			if (std::memcmp(header.magic, "ustar", 5) == 0)
+			{
+				const std::string_view size_sv{header.size, std::size(header.size)};
+
+				size = octal_text_to_u64(size_sv);
+
+				// Check for overflows and if surpasses file size
+				if ((header.name[0] || header.prefix[0]) && size + 512 > size && max_size >= size + 512 && max_size - size - 512 >= largest_offset)
+				{
+					// Cache size in native u64 format
+					static_assert(sizeof(size) < sizeof(header.size));
+					std::memcpy(header.size, &size, 8);
+
+					std::string_view prefix_name{header.prefix, std::size(header.prefix)};
+					std::string_view name{header.name, std::size(header.name)};
+
+					prefix_name = prefix_name.substr(0, prefix_name.find_first_of('\0'));
+					name = name.substr(0, name.find_first_of('\0'));
+
+					filename += prefix_name;
+					filename += name;
+
+					// Save header and offset
+					m_map.insert_or_assign(filename, std::make_pair(largest_offset + 512, header));
+				}
+				else
+				{
+					// Invalid
+					size = -1;
+					tar_log.error("tar_object::get_file() failed to convert header.size=%s, filesize=0x%x", size_sv, max_size);
+				}
+			}
+			else
+			{
+				tar_log.trace("tar_object::get_file() failed to parse header: offset=0x%x, filesize=0x%x", largest_offset, max_size);
+			}
 
 			if (size == umax)
 			{
+				largest_offset += 512;
 				continue;
 			}
 
 			// Advance offset to next block
-			largest_offset += utils::align(size, 512);
+			largest_offset += utils::align(size, 512) + 512;
 
 			if (!path.empty() && path == filename)
 			{
-				// Path is equal, return handle to the file data
-				return get_file(path);
+				// Path is equal, read file and advance offset to start of next block
+				std::vector<u8> buf(size);
+
+				if (m_file.read(buf, size))
+				{
+					return fs::make_stream(std::move(buf));
+				}
+
+				tar_log.error("tar_object::get_file() failed to read file entry %s (size=0x%x)", filename, size);
+				largest_offset -= utils::align(size, 512);
 			}
 		}
-	}
 
-	return m_out;
+		return fs::file();
+	}
 }
 
-bool tar_object::extract(const std::string& prefix_path, bool is_vfs)
+bool tar_object::extract(std::string vfs_mp)
 {
-	std::vector<u8> filedata_buffer(0x80'0000);
-	std::span<u8> filedata_span{filedata_buffer.data(), filedata_buffer.size()};
+	if (!m_file) return false;
 
-	auto iter = m_map.begin();
+	get_file(""); // Make sure we have scanned all files
 
-	auto get_next = [&](bool is_first)
+	for (auto& iter : m_map)
 	{
-		if (m_ar)
-		{
-			ensure(!is_first || m_map.empty()); // Must be empty on first call
-			std::string name_iter;
-			get_file("", &name_iter); // Get next entry
-			return m_map.find(name_iter);
-		}
-		else if (is_first)
-		{
-			get_file(""); // Scan entries
-			return m_map.begin();
-		}
-		else
-		{
-			return std::next(iter);
-		}
-	};
-
-	for (iter = get_next(true); iter != m_map.end(); iter = get_next(false))
-	{
-		const TARHeader& header = iter->second.second;
-		const std::string& name = iter->first;
-
-		// Backwards compatibility measure
-		const bool should_ignore = name.find(reinterpret_cast<const char*>(u8"＄")) != umax;
+		const TARHeader& header = iter.second.second;
+		const std::string& name = iter.first;
 
 		std::string result = name;
 
-		if (!prefix_path.empty())
+		if (!vfs_mp.empty())
 		{
-			result = prefix_path + '/' + result;
+			result = fmt::format("/%s/%s", vfs_mp, result);
 		}
 		else
 		{
-			// Must be VFS here
-			is_vfs = true;
 			result.insert(result.begin(), '/');
 		}
 
-		if (is_vfs)
-		{
-			result = vfs::get(result);
+		result = vfs::get(result);
 
-			if (result.empty())
-			{
-				tar_log.error("Path of entry is not mounted: '%s' (prefix_path='%s')", name, prefix_path);
-				return false;
-			}
+		if (result.empty())
+		{
+			tar_log.error("Path of entry is not mounted: '%s' (vfs_mp='%s')", name, vfs_mp);
+			return false;
 		}
 
 		u64 mtime = octal_text_to_u64({header.mtime, std::size(header.mtime)});
@@ -274,75 +197,22 @@ bool tar_object::extract(const std::string& prefix_path, bool is_vfs)
 		case '\0':
 		case '0':
 		{
-			// Create the directories which should have been mount points if prefix_path is not empty
-			if (!prefix_path.empty() && !fs::create_path(fs::get_parent_dir(result)))
+			// Create the directories which should have been mount points if vfs_mp is not empty
+			if (!vfs_mp.empty() && !fs::create_path(fs::get_parent_dir(result)))
 			{
 				tar_log.error("TAR Loader: failed to create directory for file %s (%s)", name, fs::g_tls_error);
 				return false;
 			}
 
-			// For restoring m_ar->m_max_data
-			usz restore_limit = umax;
+			auto data = get_file(name).release();
 
-			if (!m_file)
+			fs::file file(result, fs::rewrite);
+
+			if (file)
 			{
-				// Restore m_ar (remove limit)
-				restore_limit = m_ar->m_max_data;
-			}
-
-			std::unique_ptr<utils::serial> file_data = get_file(name);
-
-			fs::file file;
-
-			if (should_ignore)
-			{
-				file = fs::make_stream<std::vector<u8>>();
-			}
-			else
-			{
-				file.open(result, fs::rewrite);
-			}
-
-			if (file && file_data)
-			{
-				while (true)
-				{
-					const usz unread_size = file_data->try_read(filedata_span);
-
-					if (unread_size == 0)
-					{
-						file.write(filedata_span.data(), should_ignore ? 0 : filedata_span.size());
-						continue;
-					}
-
-					// Tail data
-
-					if (usz read_size = filedata_span.size() - unread_size)
-					{
-						ensure(file_data->try_read(filedata_span.first(read_size)) == 0);
-						file.write(filedata_span.data(), should_ignore ? 0 : read_size);
-					}
-
-					break;
-				}
-
+				file.write(static_cast<fs::container_stream<std::vector<u8>>*>(data.get())->obj);
 				file.close();
 
-
-				file_data->seek_pos(m_ar_tar_start + largest_offset, true);
-
-				if (!m_file)
-				{
-					// Restore m_ar
-					*m_ar = std::move(*file_data);
-					m_ar->m_max_data = restore_limit;
-				}
-
-				if (should_ignore)
-				{
-					break;
-				}
-
 				if (mtime != umax && !fs::utime(result, atime, mtime))
 				{
 					tar_log.error("TAR Loader: fs::utime failed on %s (%s)", result, fs::g_tls_error);
@@ -353,13 +223,6 @@ bool tar_object::extract(const std::string& prefix_path, bool is_vfs)
 				break;
 			}
 
-			if (!m_file)
-			{
-				// Restore m_ar
-				*m_ar = std::move(*file_data);
-				m_ar->m_max_data = restore_limit;
-			}
-
 			const auto old_error = fs::g_tls_error;
 			tar_log.error("TAR Loader: failed to write file %s (%s) (fs::exists=%s)", name, old_error, fs::exists(result));
 			return false;
@@ -367,11 +230,6 @@ bool tar_object::extract(const std::string& prefix_path, bool is_vfs)
 
 		case '5':
 		{
-			if (should_ignore)
-			{
-				break;
-			}
-
 			if (!fs::create_path(result))
 			{
 				tar_log.error("TAR Loader: failed to create directory %s (%s)", name, fs::g_tls_error);
@@ -395,14 +253,32 @@ bool tar_object::extract(const std::string& prefix_path, bool is_vfs)
 	return true;
 }
 
-void tar_object::save_directory(const std::string& target_path, utils::serial& ar, const process_func& func, std::vector<fs::dir_entry>&& entries, bool has_evaluated_results, usz src_dir_pos)
+std::vector<u8> tar_object::save_directory(const std::string& src_dir, std::vector<u8>&& init, const process_func& func, std::string full_path)
 {
-	const bool is_null = ar.m_file_handler && ar.m_file_handler->is_null();
-	const bool reuse_entries = !is_null || has_evaluated_results;
+	const std::string& target_path = full_path.empty() ? src_dir : full_path;
 
-	if (reuse_entries)
+	fs::stat_t stat{};
+	if (!fs::stat(target_path, stat))
 	{
-		ensure(!entries.empty());
+		return std::move(init);
+	}
+
+	if (stat.is_directory)
+	{
+		bool has_items = false;
+
+		for (auto& entry : fs::dir(target_path))
+		{
+			if (entry.name.find_first_not_of('.') == umax) continue;
+
+			init = save_directory(src_dir, std::move(init), func, target_path + '/' + entry.name);
+			has_items = true;
+		}
+
+		if (has_items)
+		{
+			return std::move(init);
+		}
 	}
 
 	auto write_octal = [](char* ptr, u64 i)
@@ -413,7 +289,7 @@ void tar_object::save_directory(const std::string& target_path, utils::serial& a
 			return;
 		}
 
-		ptr += utils::aligned_div(static_cast<u32>(std::bit_width(i)), 3) - 1;
+		ptr += utils::aligned_div(std::bit_width(i), 3) - 1;
 
 		for (; i; ptr--, i /= 8)
 		{
@@ -421,225 +297,57 @@ void tar_object::save_directory(const std::string& target_path, utils::serial& a
 		}
 	};
 
-	auto save_file = [&](const fs::stat_t& file_stat, const std::string& file_name)
+	std::string saved_path{target_path.data() + src_dir.size(), target_path.size() - src_dir.size()};
+
+	const u64 old_size = init.size();
+	init.resize(old_size + sizeof(TARHeader));
+
+	if (!stat.is_directory)
 	{
-		if (!file_stat.size)
-		{
-			return;
-		}
+		fs::file fd(target_path);
 
-		if (is_null && !func)
+		if (func)
 		{
-			ar.pos += utils::align(file_stat.size, 512);
-			return;
-		}
-
-		if (fs::file fd{file_name})
-		{
-			const u64 old_pos = ar.pos;
-			const usz old_size = ar.data.size();
-
-			if (func)
+			// Use custom function for file saving if provided
+			// Allows for example to compress PNG files as JPEG in the TAR itself
+			if (!func(fd, saved_path, std::move(init)))
 			{
-				std::string saved_path{&::at32(file_name, src_dir_pos), file_name.size() - src_dir_pos};
-
-				// Use custom function for file saving if provided
-				// Allows for example to compress PNG files as JPEG in the TAR itself
-				if (!func(fd, saved_path, ar))
-				{
-					// Revert (this entry should not be included if func returns false)
-
-					if (is_null)
-					{
-						ar.pos = old_pos;
-						return;
-					}
-
-					ar.data.resize(old_size);
-					ar.seek_end();
-					return;
-				}
-
-				if (is_null)
-				{
-					// Align
-					ar.pos += utils::align(ar.pos - old_pos, 512);
-					return;
-				}
+				// Revert (this entry should not be included if func returns false)
+				init.resize(old_size);
+				return std::move(init);
 			}
-			else
-			{
-				constexpr usz transfer_block_size = 0x100'0000;
-
-				for (usz read_index = 0; read_index < file_stat.size; read_index += transfer_block_size)
-				{
-					const usz read_size = std::min<usz>(transfer_block_size, file_stat.size - read_index);
-
-					// Read file data
-					const usz buffer_tail = ar.data.size();
-					ar.data.resize(buffer_tail + read_size);
-					ensure(fd.read_at(read_index, ar.data.data() + buffer_tail, read_size) == read_size);
-
-					// Set position to the end of data, so breathe() would work correctly
-					ar.seek_end();
-
-					// Allow flushing to file if needed
-					ar.breathe();
-				}
-			}
-
-			// Align
-			const usz diff = ar.pos - old_pos;
-			ar.data.resize(ar.data.size() + utils::align(diff, 512) - diff);
-			ar.seek_end();
-
-			fd.close();
-			ensure(fs::utime(file_name, file_stat.atime, file_stat.mtime));
 		}
 		else
 		{
-			ensure(false);
-		}
-	};
-
-	auto save_header = [&](const fs::stat_t& stat, const std::string& name)
-	{
-		static_assert(sizeof(TARHeader) == 512);
-
-		std::string_view saved_path{name.size() == src_dir_pos ? name.c_str() : &::at32(name, src_dir_pos), name.size() - src_dir_pos};
-
-		if (is_null)
-		{
-			ar.pos += sizeof(TARHeader);
-			return;
+			const u64 old_size2 = init.size();
+			init.resize(init.size() + stat.size);
+			ensure(fd.read(init.data() + old_size2, stat.size) == stat.size);
 		}
 
-		if (usz pos = saved_path.find_first_not_of(fs::delim); pos != umax)
-		{
-			saved_path = saved_path.substr(pos, saved_path.size());
-		}
-		else
-		{
-			// Target the destination directory, I do not know if this is compliant with TAR format
-			saved_path = "/"sv;
-		}
+		// Align
+		init.resize(utils::align(init.size(), 512));
 
-		TARHeader header{};
-		std::memcpy(header.magic, "ustar ", 6);
-
-		// Prefer saving to name field as much as we can
-		// If it doesn't fit, save 100 characters at name and 155 characters preceding to it at max
-		const u64 prefix_size = std::clamp<usz>(saved_path.size(), 100, 255) - 100;
-		std::memcpy(header.prefix, saved_path.data(), prefix_size);
-		const u64 name_size = std::min<usz>(saved_path.size(), 255) - prefix_size;
-		std::memcpy(header.name, saved_path.data() + prefix_size, name_size);
-
-		write_octal(header.size, stat.is_directory ? 0 : stat.size);
-		write_octal(header.mtime, stat.mtime);
-		write_octal(header.padding, stat.atime);
-		header.filetype = stat.is_directory ? '5' : '0';
-
-		ar(header);
-		ar.breathe();
-	};
-
-	fs::stat_t stat{};
-
-	if (src_dir_pos == umax)
-	{
-		// First call, get source directory string size so it can be cut from entry paths
-		src_dir_pos = target_path.size();
+		fd.close();
+		fs::utime(target_path, stat.atime, stat.mtime);
 	}
 
-	if (has_evaluated_results)
-	{
-		// Save from cached data by previous call
-		for (auto&& entry : entries)
-		{
-			ensure(entry.name.starts_with(target_path));
-			save_header(entry, entry.name);
+	TARHeader header{};
+	std::memcpy(header.magic, "ustar ", 6);
 
-			if (!entry.is_directory)
-			{
-				save_file(entry, entry.name);
-			}
-		}
-	}
-	else
-	{
-		if (entries.empty())
-		{
-			if (!fs::get_stat(target_path, stat))
-			{
-				return;
-			}
+	// Prefer saving to name field as much as we can
+	// If it doesn't fit, save 100 characters at name and 155 characters preceding to it at max
+	const u64 prefix_size = std::clamp<usz>(saved_path.size(), 100, 255) - 100;
+	std::memcpy(header.prefix, saved_path.data(), prefix_size);
+	const u64 name_size = std::min<usz>(saved_path.size(), 255) - prefix_size;
+	std::memcpy(header.name, saved_path.data() + prefix_size, name_size);
 
-			save_header(stat, target_path);
+	write_octal(header.size, stat.is_directory ? 0 : stat.size);
+	write_octal(header.mtime, stat.mtime);
+	write_octal(header.padding, stat.atime);
+	header.filetype = stat.is_directory ? '5' : '0';
 
-			// Optimization: avoid saving to list if this is not an evaluation call
-			if (is_null)
-			{
-				static_cast<fs::stat_t&>(entries.emplace_back()) = stat;
-				entries.back().name = target_path;
-			}
-		}
-		else
-		{
-			stat = entries.back();
-			save_header(stat, entries.back().name);
-		}
-
-		if (stat.is_directory)
-		{
-			bool exists = false;
-
-			for (auto&& entry : fs::dir(target_path))
-			{
-				exists = true;
-
-				if (entry.name.find_first_not_of('.') == umax || entry.name.starts_with(reinterpret_cast<const char*>(u8"＄")))
-				{
-					continue;
-				}
-
-				entry.name = target_path.ends_with('/') ? target_path + entry.name : target_path + '/' + entry.name;
-
-				if (!entry.is_directory)
-				{
-					save_header(entry, entry.name);
-					save_file(entry, entry.name);
-
-					// TAR is an old format which does not depend on previous data so memory ventilation is trivial here
-					ar.breathe();
-
-					entries.emplace_back(std::move(entry));
-				}
-				else
-				{
-					if (!is_null)
-					{
-						// Optimization: avoid saving to list if this is not an evaluation call
-						entries.clear();
-					}
-
-					entries.emplace_back(std::move(entry));
-					save_directory(::as_rvalue(entries.back().name), ar, func, std::move(entries), false, src_dir_pos);
-				}
-			}
-
-			ensure(exists);
-		}
-		else
-		{
-			fs::dir_entry entry{};
-			entry.name = target_path;
-			static_cast<fs::stat_t&>(entry) = stat;
-
-			save_file(entry, entry.name);
-		}
-
-		ar.breathe();
-	}
+	std::memcpy(init.data() + old_size, &header, sizeof(header));
+	return std::move(init);
 }
 
 bool extract_tar(const std::string& file_path, const std::string& dir_path, fs::file file)
@@ -691,7 +399,7 @@ bool extract_tar(const std::string& file_path, const std::string& dir_path, fs::
 
 	tar_object tar(vec.empty() ? file : vec[2]);
 
-	const bool ok = tar.extract("/tar_extract", true);
+	const bool ok = tar.extract("/tar_extract");
 
 	if (ok)
 	{
diff --git a/rpcs3/Loader/TAR.h b/rpcs3/Loader/TAR.h
index 92f900b805..3e06e1f630 100644
--- a/rpcs3/Loader/TAR.h
+++ b/rpcs3/Loader/TAR.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "util/types.hpp"
-
 #include <map>
 
 struct TARHeader
@@ -17,26 +15,16 @@ struct TARHeader
 	char dontcare2[82];
 	char prefix[155];
 	char padding[12]; // atime for RPCS3
-
-	ENABLE_BITWISE_SERIALIZATION;
 };
 
 namespace fs
 {
 	class file;
-	struct dir_entry;
-}
-
-namespace utils
-{
-	struct serial;
 }
 
 class tar_object
 {
-	const fs::file* m_file;
-	utils::serial* m_ar;
-	const usz m_ar_tar_start;
+	const fs::file& m_file;
 
 	usz largest_offset = 0; // We store the largest offset so we can continue to scan from there.
 	std::map<std::string, std::pair<u64, TARHeader>> m_map{}; // Maps path to offset of file data and its header
@@ -45,19 +33,18 @@ class tar_object
 
 public:
 	tar_object(const fs::file& file);
-	tar_object(utils::serial& ar);
 
 	std::vector<std::string> get_filenames();
 
-	std::unique_ptr<utils::serial> get_file(const std::string& path, std::string* new_file_path = nullptr);
+	fs::file get_file(const std::string& path);
 
-	using process_func = std::function<bool(const fs::file&, std::string&, utils::serial&)>;
+	using process_func = std::function<bool(const fs::file&, std::string&, std::vector<u8>&&)>;
 
-	// Extract all files in archive to destination (as VFS if is_vfs is true)
+	// Extract all files in archive to destination as VFS
 	// Allow to optionally specify explicit mount point (which may be directory meant for extraction)
-	bool extract(const std::string& prefix_path = {}, bool is_vfs = false);
+	bool extract(std::string vfs_mp = {});
 
-	static void save_directory(const std::string& src_dir, utils::serial& ar, const process_func& func = {}, std::vector<fs::dir_entry>&& = std::vector<fs::dir_entry>{}, bool has_evaluated_results = false, usz src_dir_pos = umax);
+	static std::vector<u8> save_directory(const std::string& src_dir, std::vector<u8>&& init = std::vector<u8>{}, const process_func& func = {}, std::string append_path = {});
 };
 
 bool extract_tar(const std::string& file_path, const std::string& dir_path, fs::file file = {});
diff --git a/rpcs3/Loader/TROPUSR.cpp b/rpcs3/Loader/TROPUSR.cpp
index 55d6415955..7043093ffc 100644
--- a/rpcs3/Loader/TROPUSR.cpp
+++ b/rpcs3/Loader/TROPUSR.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include "Utilities/rXml.h"
 #include "Emu/VFS.h"
 #include "TROPUSR.h"
 
@@ -9,31 +10,9 @@ enum : u32
 	TROPUSR_MAGIC = 0x818F54AD
 };
 
-std::shared_ptr<rXmlNode> trophy_xml_document::GetRoot()
+TROPUSRLoader::load_result TROPUSRLoader::Load(const std::string& filepath, const std::string& configpath)
 {
-	auto trophy_base = rXmlDocument::GetRoot();
-	if (!trophy_base)
-	{
-		return nullptr;
-	}
-
-	if (auto trophy_conf = trophy_base->GetChildren();
-		trophy_conf && trophy_conf->GetName() == "trophyconf")
-	{
-		trophy_base = trophy_conf;
-	}
-	else
-	{
-		trp_log.error("trophy_xml_document: Root name does not match trophyconf in trophy. Name: %s", trophy_conf ? trophy_conf->GetName() : trophy_base->GetName());
-		// TODO: return nullptr or is this possible?
-	}
-
-	return trophy_base;
-}
-
-TROPUSRLoader::load_result TROPUSRLoader::Load(std::string_view filepath, std::string_view configpath)
-{
-	const std::string path = vfs::get(filepath);
+	const std::string& path = vfs::get(filepath);
 
 	load_result res{};
 
@@ -101,7 +80,7 @@ bool TROPUSRLoader::LoadTableHeaders()
 	m_file.seek(0x30);
 	m_tableHeaders.clear();
 
-	if (!m_file.read(m_tableHeaders, m_header.tables_count))
+	if (!m_file.read<true>(m_tableHeaders, m_header.tables_count))
 	{
 		return false;
 	}
@@ -124,7 +103,7 @@ bool TROPUSRLoader::LoadTables()
 		{
 			m_table4.clear();
 
-			if (!m_file.read(m_table4, tableHeader.entries_count))
+			if (!m_file.read<true>(m_table4, tableHeader.entries_count))
 				return false;
 		}
 
@@ -132,7 +111,7 @@ bool TROPUSRLoader::LoadTables()
 		{
 			m_table6.clear();
 
-			if (!m_file.read(m_table6, tableHeader.entries_count))
+			if (!m_file.read<true>(m_table6, tableHeader.entries_count))
 				return false;
 		}
 
@@ -143,7 +122,7 @@ bool TROPUSRLoader::LoadTables()
 }
 
 // TODO: TROPUSRLoader::Save deletes the TROPUSR and creates it again. This is probably very slow.
-bool TROPUSRLoader::Save(std::string_view filepath)
+bool TROPUSRLoader::Save(const std::string& filepath)
 {
 	fs::pending_file temp(vfs::get(filepath));
 
@@ -160,7 +139,7 @@ bool TROPUSRLoader::Save(std::string_view filepath)
 	return temp.commit();
 }
 
-bool TROPUSRLoader::Generate(std::string_view filepath, std::string_view configpath)
+bool TROPUSRLoader::Generate(const std::string& filepath, const std::string& configpath)
 {
 	fs::file config(vfs::get(configpath));
 
@@ -169,22 +148,16 @@ bool TROPUSRLoader::Generate(std::string_view filepath, std::string_view configp
 		return false;
 	}
 
-	trophy_xml_document doc{};
-	pugi::xml_parse_result res = doc.Read(config.to_string());
-	if (!res)
-	{
-		trp_log.error("TROPUSRLoader::Generate: Failed to read file: %s", filepath);
-		return false;
-	}
+	rXmlDocument doc;
+	doc.Read(config.to_string());
 
 	m_table4.clear();
 	m_table6.clear();
 
 	auto trophy_base = doc.GetRoot();
-	if (!trophy_base)
+	if (trophy_base->GetChildren()->GetName() == "trophyconf")
 	{
-		trp_log.error("TROPUSRLoader::Generate: Failed to read file (root is null): %s", filepath);
-		return false;
+		trophy_base = trophy_base->GetChildren();
 	}
 
 	for (std::shared_ptr<rXmlNode> n = trophy_base->GetChildren(); n; n = n->GetNext())
@@ -231,12 +204,12 @@ bool TROPUSRLoader::Generate(std::string_view filepath, std::string_view configp
 	return Save(filepath);
 }
 
-u32 TROPUSRLoader::GetTrophiesCount() const
+u32 TROPUSRLoader::GetTrophiesCount()
 {
 	return ::size32(m_table6);
 }
 
-u32 TROPUSRLoader::GetUnlockedTrophiesCount() const
+u32 TROPUSRLoader::GetUnlockedTrophiesCount()
 {
 	u32 count = 0;
 	for (const auto& trophy : m_table6)
@@ -274,19 +247,13 @@ u32 TROPUSRLoader::GetUnlockedPlatinumID(u32 trophy_id, const std::string& confi
 		return invalid_trophy_id;
 	}
 
-	trophy_xml_document doc{};
-	pugi::xml_parse_result res = doc.Read(config.to_string());
-	if (!res)
-	{
-		trp_log.error("TROPUSRLoader::GetUnlockedPlatinumID: Failed to read file: %s", config_path);
-		return invalid_trophy_id;
-	}
+	rXmlDocument doc;
+	doc.Read(config.to_string());
 
 	auto trophy_base = doc.GetRoot();
-	if (!trophy_base)
+	if (trophy_base->GetChildren()->GetName() == "trophyconf")
 	{
-		trp_log.error("TROPUSRLoader::GetUnlockedPlatinumID: Failed to read file (root is null): %s", config_path);
-		return false;
+		trophy_base = trophy_base->GetChildren();
 	}
 
 	const usz trophy_count = m_table4.size();
@@ -329,7 +296,7 @@ u32 TROPUSRLoader::GetUnlockedPlatinumID(u32 trophy_id, const std::string& confi
 	return pid;
 }
 
-u32 TROPUSRLoader::GetTrophyGrade(u32 id) const
+u32 TROPUSRLoader::GetTrophyGrade(u32 id)
 {
 	if (id >= m_table4.size())
 	{
@@ -340,7 +307,7 @@ u32 TROPUSRLoader::GetTrophyGrade(u32 id) const
 	return m_table4[id].trophy_grade; // Let's assume the trophies are stored ordered
 }
 
-u32 TROPUSRLoader::GetTrophyUnlockState(u32 id) const
+u32 TROPUSRLoader::GetTrophyUnlockState(u32 id)
 {
 	if (id >= m_table6.size())
 	{
@@ -351,7 +318,7 @@ u32 TROPUSRLoader::GetTrophyUnlockState(u32 id) const
 	return m_table6[id].trophy_state; // Let's assume the trophies are stored ordered
 }
 
-u64 TROPUSRLoader::GetTrophyTimestamp(u32 id) const
+u64 TROPUSRLoader::GetTrophyTimestamp(u32 id)
 {
 	if (id >= m_table6.size())
 	{
@@ -377,18 +344,3 @@ bool TROPUSRLoader::UnlockTrophy(u32 id, u64 timestamp1, u64 timestamp2)
 
 	return true;
 }
-
-bool TROPUSRLoader::LockTrophy(u32 id)
-{
-	if (id >= m_table6.size())
-	{
-		trp_log.warning("TROPUSRLoader::LockTrophy: Invalid id=%d", id);
-		return false;
-	}
-
-	m_table6[id].trophy_state = 0;
-	m_table6[id].timestamp1 = 0;
-	m_table6[id].timestamp2 = 0;
-
-	return true;
-}
diff --git a/rpcs3/Loader/TROPUSR.h b/rpcs3/Loader/TROPUSR.h
index 50f8079c0e..bc6f6af88e 100644
--- a/rpcs3/Loader/TROPUSR.h
+++ b/rpcs3/Loader/TROPUSR.h
@@ -1,7 +1,4 @@
 #pragma once
-#include "stdafx.h"
-#include "Utilities/rXml.h"
-#include "Utilities/File.h"
 
 struct TROPUSRHeader
 {
@@ -57,12 +54,6 @@ struct TROPUSREntry6
 	// Note: One of the fields should hold a flag showing whether the trophy is hidden or not
 };
 
-struct trophy_xml_document : public rXmlDocument
-{
-	trophy_xml_document() : rXmlDocument() {}
-	std::shared_ptr<rXmlNode> GetRoot() override;
-};
-
 class TROPUSRLoader
 {
 	enum trophy_grade : u32
@@ -81,10 +72,10 @@ class TROPUSRLoader
 	std::vector<TROPUSREntry4> m_table4;
 	std::vector<TROPUSREntry6> m_table6;
 
-	[[nodiscard]] bool Generate(std::string_view filepath, std::string_view configpath);
-	[[nodiscard]] bool LoadHeader();
-	[[nodiscard]] bool LoadTableHeaders();
-	[[nodiscard]] bool LoadTables();
+	virtual bool Generate(const std::string& filepath, const std::string& configpath);
+	virtual bool LoadHeader();
+	virtual bool LoadTableHeaders();
+	virtual bool LoadTables();
 
 public:
 	virtual ~TROPUSRLoader() = default;
@@ -95,18 +86,17 @@ public:
 		bool success;
 	};
 
-	[[nodiscard]] load_result Load(std::string_view filepath, std::string_view configpath);
-	[[nodiscard]] bool Save(std::string_view filepath);
+	virtual load_result Load(const std::string& filepath, const std::string& configpath);
+	virtual bool Save(const std::string& filepath);
 
-	[[nodiscard]] u32 GetTrophiesCount() const;
-	[[nodiscard]] u32 GetUnlockedTrophiesCount() const;
+	virtual u32 GetTrophiesCount();
+	virtual u32 GetUnlockedTrophiesCount();
 
-	[[nodiscard]] u32 GetUnlockedPlatinumID(u32 trophy_id, const std::string& config_path);
+	virtual u32 GetUnlockedPlatinumID(u32 trophy_id, const std::string& config_path);
 
-	[[nodiscard]] u32 GetTrophyGrade(u32 id) const;
-	[[nodiscard]] u32 GetTrophyUnlockState(u32 id) const;
-	[[nodiscard]] u64 GetTrophyTimestamp(u32 id) const;
+	virtual u32 GetTrophyGrade(u32 id);
+	virtual u32 GetTrophyUnlockState(u32 id);
+	virtual u64 GetTrophyTimestamp(u32 id);
 
-	[[nodiscard]] bool UnlockTrophy(u32 id, u64 timestamp1, u64 timestamp2);
-	[[nodiscard]] bool LockTrophy(u32 id);
+	virtual bool UnlockTrophy(u32 id, u64 timestamp1, u64 timestamp2);
 };
diff --git a/rpcs3/Loader/TRP.cpp b/rpcs3/Loader/TRP.cpp
index d0e9df4382..29f80241d4 100644
--- a/rpcs3/Loader/TRP.cpp
+++ b/rpcs3/Loader/TRP.cpp
@@ -11,7 +11,7 @@ TRPLoader::TRPLoader(const fs::file& f)
 {
 }
 
-bool TRPLoader::Install(std::string_view dest, bool /*show*/)
+bool TRPLoader::Install(const std::string& dest, bool /*show*/)
 {
 	if (!trp_f)
 	{
@@ -21,21 +21,17 @@ bool TRPLoader::Install(std::string_view dest, bool /*show*/)
 
 	fs::g_tls_error = {};
 
-	const std::string local_path = vfs::get(dest);
+	const std::string& local_path = vfs::get(dest);
 
-	const std::string temp = fmt::format(u8"%s.＄temp＄%u", local_path, utils::get_unique_tsc());
+	const auto temp = fmt::format(u8"%s.＄temp＄%u", local_path, utils::get_unique_tsc());
 
 	if (!fs::create_dir(temp))
 	{
-		trp_log.error("Failed to create temp dir: '%s' (error=%s)", temp, fs::g_tls_error);
 		return false;
 	}
 
 	// Save TROPUSR.DAT
-	if (!fs::copy_file(local_path + "/TROPUSR.DAT", temp + "/TROPUSR.DAT", false))
-	{
-		trp_log.error("Failed to copy TROPUSR.DAT from '%s' to '%s' (error=%s)", local_path, temp, fs::g_tls_error);
-	}
+	fs::copy_file(local_path + "/TROPUSR.DAT", temp + "/TROPUSR.DAT", false);
 
 	std::vector<char> buffer(65536);
 
@@ -44,38 +40,28 @@ bool TRPLoader::Install(std::string_view dest, bool /*show*/)
 	{
 		trp_f.seek(entry.offset);
 
-		if (!trp_f.read(buffer, entry.size))
+		if (!trp_f.read<true>(buffer, entry.size))
 		{
 			trp_log.error("Failed to read TRPEntry at: offset=0x%x, size=0x%x", entry.offset, entry.size);
 			continue; // ???
 		}
 
 		// Create the file in the temporary directory
-		const std::string filename = temp + '/' + vfs::escape(entry.name);
-		success = fs::write_file<true>(filename, fs::create + fs::excl, buffer);
+		success = fs::write_file<true>(temp + '/' + vfs::escape(entry.name), fs::create + fs::excl, buffer);
 		if (!success)
 		{
-			trp_log.error("Failed to write file '%s' (error=%s)", filename, fs::g_tls_error);
 			break;
 		}
 	}
 
 	if (success)
 	{
-		success = fs::remove_all(local_path, true, true);
+		success = fs::remove_all(local_path) || !fs::is_dir(local_path);
 
 		if (success)
 		{
 			// Atomically create trophy data (overwrite existing data)
 			success = fs::rename(temp, local_path, false);
-			if (!success)
-			{
-				trp_log.error("Failed to move directory '%s' to '%s' (error=%s)", temp, local_path, fs::g_tls_error);
-			}
-		}
-		else
-		{
-			trp_log.error("Failed to remove directory '%s' (error=%s)", local_path, fs::g_tls_error);
 		}
 	}
 
@@ -120,7 +106,7 @@ bool TRPLoader::LoadHeader(bool show)
 		std::vector<u8> file_contents;
 
 		trp_f.seek(0);
-		if (!trp_f.read(file_contents, m_header.trp_file_size))
+		if (!trp_f.read<true>(file_contents, m_header.trp_file_size))
 		{
 			trp_log.notice("Failed verifying checksum");
 		}
@@ -141,7 +127,7 @@ bool TRPLoader::LoadHeader(bool show)
 
 	m_entries.clear();
 
-	if (!trp_f.read(m_entries, m_header.trp_files_count))
+	if (!trp_f.read<true>(m_entries, m_header.trp_files_count))
 	{
 		return false;
 	}
@@ -165,16 +151,11 @@ u64 TRPLoader::GetRequiredSpace() const
 	return file_size - sizeof(m_header) - file_element_size;
 }
 
-bool TRPLoader::ContainsEntry(std::string_view filename)
+bool TRPLoader::ContainsEntry(const char *filename)
 {
-	if (filename.size() >= sizeof(TRPEntry::name))
-	{
-		return false;
-	}
-
 	for (const TRPEntry& entry : m_entries)
 	{
-		if (entry.name == filename)
+		if (!strcmp(entry.name, filename))
 		{
 			return true;
 		}
@@ -182,17 +163,12 @@ bool TRPLoader::ContainsEntry(std::string_view filename)
 	return false;
 }
 
-void TRPLoader::RemoveEntry(std::string_view filename)
+void TRPLoader::RemoveEntry(const char *filename)
 {
-	if (filename.size() >= sizeof(TRPEntry::name))
-	{
-		return;
-	}
-
 	std::vector<TRPEntry>::iterator i = m_entries.begin();
 	while (i != m_entries.end())
 	{
-		if (i->name == filename)
+		if (!strcmp(i->name, filename))
 		{
 			i = m_entries.erase(i);
 		}
@@ -203,18 +179,13 @@ void TRPLoader::RemoveEntry(std::string_view filename)
 	}
 }
 
-void TRPLoader::RenameEntry(std::string_view oldname, std::string_view newname)
+void TRPLoader::RenameEntry(const char *oldname, const char *newname)
 {
-	if (oldname.size() >= sizeof(TRPEntry::name) || newname.size() >= sizeof(TRPEntry::name))
-	{
-		return;
-	}
-
 	for (TRPEntry& entry : m_entries)
 	{
-		if (entry.name == oldname)
+		if (!strcmp(entry.name, oldname))
 		{
-			strcpy_trunc(entry.name, newname);
+			strcpy_trunc(entry.name, std::string_view(newname));
 		}
 	}
 }
diff --git a/rpcs3/Loader/TRP.h b/rpcs3/Loader/TRP.h
index cc096b7a78..de677836c3 100644
--- a/rpcs3/Loader/TRP.h
+++ b/rpcs3/Loader/TRP.h
@@ -30,11 +30,11 @@ class TRPLoader final
 public:
 	TRPLoader(const fs::file& f);
 
-	bool Install(std::string_view dest, bool show = false);
+	bool Install(const std::string& dest, bool show = false);
 	bool LoadHeader(bool show = false);
 	u64 GetRequiredSpace() const;
 
-	bool ContainsEntry(std::string_view filename);
-	void RemoveEntry(std::string_view filename);
-	void RenameEntry(std::string_view oldname, std::string_view newname);
+	bool ContainsEntry(const char *filename);
+	void RemoveEntry(const char *filename);
+	void RenameEntry(const char *oldname, const char *newname);
 };
diff --git a/rpcs3/Loader/disc.cpp b/rpcs3/Loader/disc.cpp
deleted file mode 100644
index b2ea4dc855..0000000000
--- a/rpcs3/Loader/disc.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-#include "stdafx.h"
-#include "disc.h"
-#include "PSF.h"
-#include "util/logs.hpp"
-#include "Utilities/StrUtil.h"
-#include "Emu/System.h"
-#include "Emu/system_utils.hpp"
-
-LOG_CHANNEL(disc_log, "DISC");
-
-namespace disc
-{
-	disc_type get_disc_type(const std::string& path, std::string& disc_root, std::string& ps3_game_dir)
-	{
-		disc_type type = disc_type::unknown;
-
-		disc_root.clear();
-		ps3_game_dir.clear();
-
-		if (path.empty())
-		{
-			disc_log.error("Can not determine disc type. Path is empty.");
-			return disc_type::invalid;
-		}
-
-		if (!fs::is_dir(path))
-		{
-			disc_log.error("Can not determine disc type. Path not a directory: '%s'", path);
-			return disc_type::invalid;
-		}
-
-		// Check for PS3 game first.
-		std::string elf_path;
-		if (const game_boot_result result = Emulator::GetElfPathFromDir(elf_path, path);
-			result == game_boot_result::no_errors)
-		{
-			// Every error past this point is considered a corrupt disc.
-
-			std::string sfb_dir;
-			const std::string elf_dir = fs::get_parent_dir(elf_path);
-
-			Emulator::GetBdvdDir(disc_root, sfb_dir, ps3_game_dir, elf_dir);
-
-			if (!fs::is_dir(disc_root) || !fs::is_dir(sfb_dir) || ps3_game_dir.empty())
-			{
-				disc_log.error("Not a PS3 disc: invalid folder (bdvd_dir='%s', sfb_dir='%s', game_dir='%s')", disc_root, sfb_dir, ps3_game_dir);
-				return disc_type::invalid;
-			}
-
-			// Load PARAM.SFO
-			const std::string sfo_dir = rpcs3::utils::get_sfo_dir_from_game_path(elf_dir + "/../", "");
-			const psf::registry _psf = psf::load_object(sfo_dir + "/PARAM.SFO");
-
-			if (_psf.empty())
-			{
-				disc_log.error("Not a PS3 disc: Corrupted PARAM.SFO found! (path='%s/PARAM.SFO')", sfo_dir);
-				return disc_type::invalid;
-			}
-
-			const std::string cat = std::string(psf::get_string(_psf, "CATEGORY"));
-
-			if (cat != "DG")
-			{
-				disc_log.error("Not a PS3 disc: Wrong category '%s'.", cat);
-				return disc_type::invalid;
-			}
-
-			return disc_type::ps3;
-		}
-
-		disc_log.notice("Not a PS3 disc: Elf not found. Looking for SYSTEM.CNF... (path='%s')", path);
-
-		std::vector<std::string> lines;
-
-		// Try to find SYSTEM.CNF
-		for (std::string search_dir = path;;)
-		{
-			if (fs::file file(search_dir + "/SYSTEM.CNF"); file)
-			{
-				disc_root = search_dir + "/";
-				lines = fmt::split(file.to_string(), {"\n"});
-				break;
-			}
-
-			std::string parent_dir = fs::get_parent_dir(search_dir);
-
-			if (parent_dir.size() == search_dir.size())
-			{
-				// Keep looking until root directory is reached
-				disc_log.error("SYSTEM.CNF not found in path: '%s'", path);
-				return disc_type::invalid;
-			}
-
-			search_dir = std::move(parent_dir);
-		}
-
-		for (usz i = 0; i < lines.size(); i++)
-		{
-			const std::string& line = lines[i];
-			const usz pos = line.find('=');
-
-			if (pos == umax)
-			{
-				continue;
-			}
-
-			const std::string key = fmt::trim(line.substr(0, pos));
-			std::string value;
-
-			if (pos != (line.size() - 1))
-			{
-				value = fmt::trim(line.substr(pos + 1));
-			}
-
-			if (value.empty() && i != (lines.size() - 1) && line.size() != 1)
-			{
-				// Some games have a character on the last line of the file, don't print the error in those cases.
-				disc_log.warning("Unusual or malformed entry in SYSTEM.CNF ignored: %s", line);
-				continue;
-			}
-
-			if (key == "BOOT2")
-			{
-				disc_log.notice("SYSTEM.CNF - Detected PS2 Disc = %s", value);
-				type = disc_type::ps2;
-			}
-			else if (key == "BOOT")
-			{
-				disc_log.notice("SYSTEM.CNF - Detected PSX/PSone Disc = %s", value);
-				type = disc_type::ps1;
-			}
-			else if (key == "VMODE")
-			{
-				disc_log.notice("SYSTEM.CNF - Disc region type = %s", value);
-			}
-			else if (key == "VER")
-			{
-				disc_log.notice("SYSTEM.CNF - Software version = %s", value);
-			}
-		}
-
-		if (type == disc_type::unknown)
-		{
-			disc_log.error("SYSTEM.CNF - Disc is not a PSX/PSone or PS2 game!");
-		}
-
-		return type;
-	}
-}
diff --git a/rpcs3/Loader/disc.h b/rpcs3/Loader/disc.h
deleted file mode 100644
index 25123afbec..0000000000
--- a/rpcs3/Loader/disc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-namespace disc
-{
-	enum class disc_type
-	{
-		invalid,
-		unknown,
-		ps1,
-		ps2,
-		ps3
-	};
-
-	disc_type get_disc_type(const std::string& path, std::string& disc_root, std::string& ps3_game_dir);
-}
diff --git a/rpcs3/Loader/mself.cpp b/rpcs3/Loader/mself.cpp
index 0437cb4d13..1b56c8c9aa 100644
--- a/rpcs3/Loader/mself.cpp
+++ b/rpcs3/Loader/mself.cpp
@@ -42,7 +42,7 @@ bool extract_mself(const std::string& file, const std::string& extract_to)
 	if (!mself.read(recs))
 	{
 		mself_log.error("Error extracting MSELF records");
-		return false;
+		return false;	
 	}
 
 	std::vector<u8> buffer;
@@ -63,12 +63,6 @@ bool extract_mself(const std::string& file, const std::string& extract_to)
 		mself.seek(pos);
 		mself.read(buffer.data(), rec.size);
 
-		if (!fs::create_path(fs::get_parent_dir(extract_to + name)))
-		{
-			mself_log.error("Error creating directory %s (%s)", fs::get_parent_dir(extract_to + name), fs::g_tls_error);
-			return false;
-		}
-
 		if (!fs::write_file(extract_to + name, fs::rewrite, buffer))
 		{
 			mself_log.error("Error creating %s (%s)", extract_to + name, fs::g_tls_error);
diff --git a/rpcs3/Cubeb.vcxproj b/rpcs3/OpenAL.vcxproj
similarity index 71%
rename from rpcs3/Cubeb.vcxproj
rename to rpcs3/OpenAL.vcxproj
index 05a6f461b3..3ba5b315d7 100644
--- a/rpcs3/Cubeb.vcxproj
+++ b/rpcs3/OpenAL.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -11,8 +11,9 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{9610627D-20FE-4B07-8CE3-9FF68A5F1EC2}</ProjectGuid>
-    <RootNamespace>Cubeb</RootNamespace>
+    <ProjectGuid>{30A05C4D-F5FD-421C-A864-17A64BDEAA75}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>OpenAL</RootNamespace>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -36,30 +37,36 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'" Label="PropertySheets">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_llvm.props" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'" Label="PropertySheets">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_llvm.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\3rdparty\cubeb\cubeb\include\;..\3rdparty\cubeb\extra\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\3rdparty\OpenAL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="Emu\Audio\AL\OpenALBackend.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Emu\Audio\AL\OpenALBackend.h" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="emucore.vcxproj">
       <Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Emu\Audio\Cubeb\CubebBackend.h" />
-    <ClInclude Include="Emu\Audio\Cubeb\cubeb_enumerator.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Emu\Audio\Cubeb\CubebBackend.cpp" />
-    <ClCompile Include="Emu\Audio\Cubeb\cubeb_enumerator.cpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/rpcs3/OpenAL.vcxproj.filters b/rpcs3/OpenAL.vcxproj.filters
new file mode 100644
index 0000000000..7da7606efa
--- /dev/null
+++ b/rpcs3/OpenAL.vcxproj.filters
@@ -0,0 +1,19 @@
+<?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>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Emu\Audio\AL\OpenALBackend.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Emu\Audio\AL\OpenALBackend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/rpcs3/VKGSRender.vcxproj b/rpcs3/VKGSRender.vcxproj
index 3470c82ed1..4bc240f86c 100644
--- a/rpcs3/VKGSRender.vcxproj
+++ b/rpcs3/VKGSRender.vcxproj
@@ -13,23 +13,19 @@
   <ItemGroup>
     <ClInclude Include="Emu\RSX\VK\upscalers\bilinear_pass.hpp" />
     <ClInclude Include="Emu\RSX\VK\upscalers\fsr_pass.h" />
-    <ClInclude Include="Emu\RSX\VK\upscalers\nearest_pass.hpp" />
     <ClInclude Include="Emu\RSX\VK\upscalers\upscaling.h" />
     <ClInclude Include="Emu\RSX\VK\VKAsyncScheduler.h" />
     <ClInclude Include="Emu\RSX\VK\VKCommandStream.h" />
     <ClInclude Include="Emu\RSX\VK\VKCommonDecompiler.h" />
     <ClInclude Include="Emu\RSX\VK\VKCompute.h" />
-    <ClInclude Include="Emu\RSX\VK\VKDataHeapManager.h" />
     <ClInclude Include="Emu\RSX\VK\VKDMA.h" />
     <ClInclude Include="Emu\RSX\VK\VKFormats.h" />
     <ClInclude Include="Emu\RSX\VK\VKFragmentProgram.h" />
     <ClInclude Include="Emu\RSX\VK\VKFramebuffer.h" />
     <ClInclude Include="Emu\RSX\VK\VKGSRender.h" />
-    <ClInclude Include="Emu\RSX\VK\VKGSRenderTypes.hpp" />
     <ClInclude Include="Emu\RSX\VK\VKHelpers.h" />
     <ClInclude Include="Emu\RSX\VK\VKOverlays.h" />
     <ClInclude Include="Emu\RSX\VK\VKPipelineCompiler.h" />
-    <ClInclude Include="Emu\RSX\VK\VKProcTable.h" />
     <ClInclude Include="Emu\RSX\VK\VKProgramBuffer.h" />
     <ClInclude Include="Emu\RSX\VK\VKProgramPipeline.h" />
     <ClInclude Include="Emu\RSX\VK\VKQueryPool.h" />
@@ -38,25 +34,19 @@
     <ClInclude Include="Emu\RSX\VK\VKResolveHelper.h" />
     <ClInclude Include="Emu\RSX\VK\VKResourceManager.h" />
     <ClInclude Include="Emu\RSX\VK\VKShaderInterpreter.h" />
-    <ClInclude Include="Emu\RSX\VK\VKCommonPipelineLayout.h" />
+    <ClInclude Include="Emu\RSX\VK\VKTextOut.h" />
     <ClInclude Include="Emu\RSX\VK\VKTextureCache.h" />
     <ClInclude Include="Emu\RSX\VK\vkutils\buffer_object.h" />
     <ClInclude Include="Emu\RSX\VK\vkutils\chip_class.h" />
     <ClInclude Include="Emu\RSX\VK\vkutils\commands.h" />
     <ClInclude Include="Emu\RSX\VK\vkutils\data_heap.h" />
-    <ClInclude Include="Emu\RSX\VK\vkutils\descriptors.h" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\descriptors.hpp" />
     <ClInclude Include="Emu\RSX\VK\vkutils\barriers.h" />
     <ClInclude Include="Emu\RSX\VK\vkutils\framebuffer_object.hpp" />
-    <ClInclude Include="Emu\RSX\VK\vkutils\garbage_collector.h" />
     <ClInclude Include="Emu\RSX\VK\vkutils\image.h" />
     <ClInclude Include="Emu\RSX\VK\vkutils\image_helpers.h" />
     <ClInclude Include="Emu\RSX\VK\vkutils\scratch.h" />
-    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain.h" />
-    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain_android.hpp" />
-    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain_core.h" />
-    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain_unix.hpp" />
-    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain_macos.hpp" />
-    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain_win32.hpp" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain.hpp" />
     <ClInclude Include="Emu\RSX\VK\vkutils\sync.h" />
     <ClInclude Include="Emu\RSX\VK\vkutils\graphics_pipeline_state.hpp" />
     <ClInclude Include="Emu\RSX\VK\vkutils\memory.h" />
@@ -65,7 +55,7 @@
     <ClInclude Include="Emu\RSX\VK\vkutils\query_pool.hpp" />
     <ClInclude Include="Emu\RSX\VK\vkutils\sampler.h" />
     <ClInclude Include="Emu\RSX\VK\vkutils\shared.h" />
-    <ClInclude Include="Emu\RSX\VK\vkutils\instance.h" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\instance.hpp" />
     <ClInclude Include="Emu\RSX\VK\VKVertexProgram.h" />
     <ClInclude Include="Emu\RSX\VK\VulkanAPI.h" />
   </ItemGroup>
@@ -75,7 +65,6 @@
     <ClCompile Include="Emu\RSX\VK\VKCommandStream.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKCommonDecompiler.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKCompute.cpp" />
-    <ClCompile Include="Emu\RSX\VK\VKDataHeapManager.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKDMA.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKDraw.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKFormats.cpp" />
@@ -93,7 +82,6 @@
     <ClCompile Include="Emu\RSX\VK\VKResolveHelper.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKResourceManager.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKShaderInterpreter.cpp" />
-    <ClCompile Include="Emu\RSX\VK\VKCommonPipelineLayout.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKTexture.cpp" />
     <ClCompile Include="Emu\RSX\VK\vkutils\barriers.cpp" />
     <ClCompile Include="Emu\RSX\VK\vkutils\buffer_object.cpp" />
@@ -102,12 +90,9 @@
     <ClCompile Include="Emu\RSX\VK\vkutils\data_heap.cpp" />
     <ClCompile Include="Emu\RSX\VK\vkutils\image.cpp" />
     <ClCompile Include="Emu\RSX\VK\vkutils\image_helpers.cpp" />
-    <ClCompile Include="Emu\RSX\VK\vkutils\instance.cpp" />
     <ClCompile Include="Emu\RSX\VK\vkutils\scratch.cpp" />
-    <ClCompile Include="Emu\RSX\VK\vkutils\swapchain.cpp" />
     <ClCompile Include="Emu\RSX\VK\vkutils\sync.cpp" />
     <ClCompile Include="Emu\RSX\VK\vkutils\memory.cpp" />
-    <ClCompile Include="Emu\RSX\VK\vkutils\descriptors.cpp" />
     <ClCompile Include="Emu\RSX\VK\vkutils\device.cpp" />
     <ClCompile Include="Emu\RSX\VK\vkutils\sampler.cpp" />
     <ClCompile Include="Emu\RSX\VK\vkutils\shared.cpp" />
@@ -115,15 +100,20 @@
     <ClCompile Include="Emu\RSX\VK\VKVertexProgram.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKTextureCache.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKMemAlloc.cpp" />
-    <ClCompile Include="Emu\RSX\VK\VulkanAPI.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="emucore.vcxproj">
       <Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Emu\RSX\VK\upscalers\fsr1\fsr_ffx_a_flattened.inc" />
+    <None Include="Emu\RSX\VK\upscalers\fsr1\fsr_ffx_fsr1_flattened.inc" />
+    <None Include="Emu\RSX\VK\upscalers\fsr1\fsr_ubershader.glsl" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
     <RootNamespace>VKGSRender</RootNamespace>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
@@ -155,7 +145,7 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(VULKAN_SDK)\Include;$(SolutionDir)\3rdparty\glslang\glslang\Public;..\3rdparty\glslang\glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(VULKAN_SDK)\Include;$(SolutionDir)\3rdparty\glslang\glslang\Public;..\3rdparty\glslang\glslang;..\3rdparty\SPIRV\SPIRV-Tools\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
     </ClCompile>
diff --git a/rpcs3/VKGSRender.vcxproj.filters b/rpcs3/VKGSRender.vcxproj.filters
index 0d4db62e53..f85a5c9d52 100644
--- a/rpcs3/VKGSRender.vcxproj.filters
+++ b/rpcs3/VKGSRender.vcxproj.filters
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="Emu\RSX\VK\VKAsyncScheduler.cpp" />
-    <ClCompile Include="Emu\RSX\VK\VKCommandStream.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKCommonDecompiler.cpp" />
-    <ClCompile Include="Emu\RSX\VK\VKCompute.cpp" />
-    <ClCompile Include="Emu\RSX\VK\VKDataHeapManager.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKDMA.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKDraw.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKFormats.cpp" />
@@ -13,22 +9,20 @@
     <ClCompile Include="Emu\RSX\VK\VKFramebuffer.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKGSRender.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKHelpers.cpp" />
-    <ClCompile Include="Emu\RSX\VK\VKMemAlloc.cpp" />
-    <ClCompile Include="Emu\RSX\VK\VKOverlays.cpp" />
-    <ClCompile Include="Emu\RSX\VK\VKPipelineCompiler.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKPresent.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKProgramPipeline.cpp" />
-    <ClCompile Include="Emu\RSX\VK\VKQueryPool.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKRenderPass.cpp" />
-    <ClCompile Include="Emu\RSX\VK\VKRenderTargets.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKResolveHelper.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKResourceManager.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKShaderInterpreter.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKTexture.cpp" />
-    <ClCompile Include="Emu\RSX\VK\VKTextureCache.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKVertexBuffers.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKVertexProgram.cpp" />
-    <ClCompile Include="Emu\RSX\VK\VulkanAPI.cpp" />
+    <ClCompile Include="Emu\RSX\VK\VKTextureCache.cpp" />
+    <ClCompile Include="Emu\RSX\VK\VKMemAlloc.cpp" />
+    <ClCompile Include="Emu\RSX\VK\VKCommandStream.cpp" />
+    <ClCompile Include="Emu\RSX\VK\VKQueryPool.cpp" />
+    <ClCompile Include="Emu\RSX\VK\VKPipelineCompiler.cpp" />
     <ClCompile Include="Emu\RSX\VK\vkutils\chip_class.cpp">
       <Filter>vkutils</Filter>
     </ClCompile>
@@ -50,9 +44,6 @@
     <ClCompile Include="Emu\RSX\VK\vkutils\memory.cpp">
       <Filter>vkutils</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\VK\vkutils\descriptors.cpp">
-      <Filter>vkutils</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\RSX\VK\vkutils\device.cpp">
       <Filter>vkutils</Filter>
     </ClCompile>
@@ -71,21 +62,17 @@
     <ClCompile Include="Emu\RSX\VK\vkutils\image_helpers.cpp">
       <Filter>vkutils</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\RSX\VK\VKOverlays.cpp" />
+    <ClCompile Include="Emu\RSX\VK\VKCompute.cpp" />
+    <ClCompile Include="Emu\RSX\VK\VKAsyncScheduler.cpp" />
+    <ClCompile Include="Emu\RSX\VK\VKRenderTargets.cpp" />
     <ClCompile Include="Emu\RSX\VK\upscalers\fsr1\fsr_pass.cpp">
       <Filter>upscalers\fsr1</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\VK\VKCommonPipelineLayout.cpp" />
-    <ClCompile Include="Emu\RSX\VK\vkutils\instance.cpp">
-      <Filter>vkutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\VK\vkutils\swapchain.cpp">
-      <Filter>vkutils</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Emu\RSX\VK\VKCommonDecompiler.h" />
     <ClInclude Include="Emu\RSX\VK\VKCompute.h" />
-    <ClInclude Include="Emu\RSX\VK\VKDataHeapManager.h" />
     <ClInclude Include="Emu\RSX\VK\VKDMA.h" />
     <ClInclude Include="Emu\RSX\VK\VKFormats.h" />
     <ClInclude Include="Emu\RSX\VK\VKFragmentProgram.h" />
@@ -99,6 +86,7 @@
     <ClInclude Include="Emu\RSX\VK\VKResolveHelper.h" />
     <ClInclude Include="Emu\RSX\VK\VKResourceManager.h" />
     <ClInclude Include="Emu\RSX\VK\VKShaderInterpreter.h" />
+    <ClInclude Include="Emu\RSX\VK\VKTextOut.h" />
     <ClInclude Include="Emu\RSX\VK\VKTextureCache.h" />
     <ClInclude Include="Emu\RSX\VK\VKVertexProgram.h" />
     <ClInclude Include="Emu\RSX\VK\VulkanAPI.h" />
@@ -133,7 +121,7 @@
     <ClInclude Include="Emu\RSX\VK\vkutils\device.h">
       <Filter>vkutils</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\vkutils\instance.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\instance.hpp">
       <Filter>vkutils</Filter>
     </ClInclude>
     <ClInclude Include="Emu\RSX\VK\vkutils\memory.h">
@@ -148,10 +136,10 @@
     <ClInclude Include="Emu\RSX\VK\vkutils\image.h">
       <Filter>vkutils</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain.hpp">
       <Filter>vkutils</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\vkutils\descriptors.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\descriptors.hpp">
       <Filter>vkutils</Filter>
     </ClInclude>
     <ClInclude Include="Emu\RSX\VK\vkutils\data_heap.h">
@@ -176,30 +164,6 @@
     <ClInclude Include="Emu\RSX\VK\upscalers\upscaling.h">
       <Filter>upscalers</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\VKGSRenderTypes.hpp" />
-    <ClInclude Include="Emu\RSX\VK\upscalers\nearest_pass.hpp">
-      <Filter>upscalers</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\vkutils\garbage_collector.h">
-      <Filter>vkutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\VKCommonPipelineLayout.h" />
-    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain_win32.hpp">
-      <Filter>vkutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain_unix.hpp">
-      <Filter>vkutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain_macos.hpp">
-      <Filter>vkutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain_android.hpp">
-      <Filter>vkutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\vkutils\swapchain_core.h">
-      <Filter>vkutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\VKProcTable.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="vkutils">
@@ -212,4 +176,15 @@
       <UniqueIdentifier>{8387b0fc-178f-4c9c-9cf2-03df99ce4df2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Emu\RSX\VK\upscalers\fsr1\fsr_ffx_a_flattened.inc">
+      <Filter>upscalers\fsr1</Filter>
+    </None>
+    <None Include="Emu\RSX\VK\upscalers\fsr1\fsr_ffx_fsr1_flattened.inc">
+      <Filter>upscalers\fsr1</Filter>
+    </None>
+    <None Include="Emu\RSX\VK\upscalers\fsr1\fsr_ubershader.glsl">
+      <Filter>upscalers\fsr1</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/rpcs3/XAudio.vcxproj b/rpcs3/XAudio.vcxproj
index 6d3bd7a636..654031f66f 100644
--- a/rpcs3/XAudio.vcxproj
+++ b/rpcs3/XAudio.vcxproj
@@ -42,7 +42,7 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\3rdparty\XAudio2Redist\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -53,13 +53,11 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Emu\Audio\XAudio2\XAudio2Backend.h" />
-    <ClInclude Include="Emu\Audio\XAudio2\xaudio2_enumerator.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Emu\Audio\XAudio2\XAudio2Backend.cpp" />
-    <ClCompile Include="Emu\Audio\XAudio2\xaudio2_enumerator.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/rpcs3/XAudio.vcxproj.filters b/rpcs3/XAudio.vcxproj.filters
index 78e33e85ce..bb23de38fe 100644
--- a/rpcs3/XAudio.vcxproj.filters
+++ b/rpcs3/XAudio.vcxproj.filters
@@ -10,16 +10,10 @@
     <ClCompile Include="Emu\Audio\XAudio2\XAudio2Backend.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Audio\XAudio2\xaudio2_enumerator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Emu\Audio\XAudio2\XAudio2Backend.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Audio\XAudio2\xaudio2_enumerator.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/rpcs3/display_sleep_control.cpp b/rpcs3/display_sleep_control.cpp
index 27fefa8b3e..3a6f17faf3 100644
--- a/rpcs3/display_sleep_control.cpp
+++ b/rpcs3/display_sleep_control.cpp
@@ -1,13 +1,11 @@
 #include "display_sleep_control.h"
 
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #elif defined(__APPLE__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
 #include <IOKit/pwr_mgt/IOPMLib.h>
-#pragma GCC diagnostic pop
 
 static IOPMAssertionID s_pm_assertion = kIOPMNullAssertionID;
 
@@ -25,21 +23,14 @@ bool display_sleep_control_supported()
 #if defined(_WIN32) || defined(__APPLE__)
 	return true;
 #elif defined(HAVE_QTDBUS)
-	for (const char* service : { "org.freedesktop.ScreenSaver", "org.mate.ScreenSaver" })
-	{
-		QDBusInterface interface(service, "/ScreenSaver", service, QDBusConnection::sessionBus());
-		if (interface.isValid())
-		{
-			return true;
-		}
-	}
-	return false;
+	QDBusInterface interface("org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver", QDBusConnection::sessionBus());
+	return interface.isValid();
 #else
 	return false;
 #endif
 }
 
-void enable_display_sleep(bool enabled)
+void enable_display_sleep()
 {
 	if (!display_sleep_control_supported())
 	{
@@ -47,50 +38,40 @@ void enable_display_sleep(bool enabled)
 	}
 
 #ifdef _WIN32
-	SetThreadExecutionState(enabled ? ES_CONTINUOUS : (ES_CONTINUOUS | ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED));
+	SetThreadExecutionState(ES_CONTINUOUS);
 #elif defined(__APPLE__)
-	if (enabled && s_pm_assertion != kIOPMNullAssertionID)
+	if (s_pm_assertion != kIOPMNullAssertionID)
 	{
 		IOPMAssertionRelease(s_pm_assertion);
 		s_pm_assertion = kIOPMNullAssertionID;
 	}
-	else if (!enabled)
-	{
-#pragma GCC diagnostic push
-// Necessary as some of those values are macro using old casts
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-		IOPMAssertionCreateWithName(kIOPMAssertionTypePreventUserIdleDisplaySleep, kIOPMAssertionLevelOn, CFSTR("Game running"), &s_pm_assertion);
-#pragma GCC diagnostic pop
-	}
 #elif defined(HAVE_QTDBUS)
-	if (enabled && s_dbus_cookie != 0)
+	if (s_dbus_cookie != 0)
 	{
-		for (const char* service : { "org.freedesktop.ScreenSaver", "org.mate.ScreenSaver" })
-		{
-			QDBusInterface interface(service, "/ScreenSaver", service, QDBusConnection::sessionBus());
-			if (interface.isValid())
-			{
-				interface.call("UnInhibit", s_dbus_cookie);
-				break;
-			}
-		}
+		QDBusInterface interface("org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver", QDBusConnection::sessionBus());
+		interface.call("UnInhibit", s_dbus_cookie);
 		s_dbus_cookie = 0;
 	}
-	else if (!enabled)
-	{
-		for (const char* service : { "org.freedesktop.ScreenSaver", "org.mate.ScreenSaver" })
-		{
-			QDBusInterface interface(service, "/ScreenSaver", service, QDBusConnection::sessionBus());
-			if (interface.isValid())
-			{
-				QDBusReply<u32> reply = interface.call("Inhibit", "rpcs3", "Game running");
-				if (reply.isValid())
-				{
-					s_dbus_cookie = reply.value();
-				}
-				break;
-			}
-		}
-	}
+#endif
+}
+
+void disable_display_sleep()
+{
+	if (!display_sleep_control_supported())
+	{
+		return;
+	}
+
+#ifdef _WIN32
+	SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED);
+#elif defined(__APPLE__)
+	IOPMAssertionCreateWithName(kIOPMAssertionTypePreventUserIdleDisplaySleep, kIOPMAssertionLevelOn, CFSTR("Game running"), &s_pm_assertion);
+#elif defined(HAVE_QTDBUS)
+	QDBusInterface interface("org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver", QDBusConnection::sessionBus());
+	QDBusReply<u32> reply = interface.call("Inhibit", "rpcs3", "Game running");
+	if (reply.isValid())
+	{
+		s_dbus_cookie = reply.value();
+	}
 #endif
 }
diff --git a/rpcs3/display_sleep_control.h b/rpcs3/display_sleep_control.h
index 66d246a46b..e2c7ce2168 100644
--- a/rpcs3/display_sleep_control.h
+++ b/rpcs3/display_sleep_control.h
@@ -1,4 +1,5 @@
 #pragma once
 
 bool display_sleep_control_supported();
-void enable_display_sleep(bool enabled);
+void enable_display_sleep();
+void disable_display_sleep();
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 3e623663d4..54c12d901b 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -40,131 +40,49 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\3rdparty\miniupnp\miniupnp\miniupnpc\include;..\3rdparty\wolfssl\wolfssl;..\3rdparty\flatbuffers\include;..\3rdparty\libusb\libusb\libusb;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\SoundTouch\soundtouch\include;..\3rdparty\rtmidi\rtmidi;..\3rdparty\zlib\zlib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\include;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\include;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm\include;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\include;$(VULKAN_SDK)\Include;..\3rdparty\zstd\zstd\lib;$(SolutionDir)3rdparty\fusion\fusion\Fusion;$(SolutionDir)3rdparty\wolfssl\extra\win32;$(SolutionDir)3rdparty\libsdl-org\SDL\include;$(SolutionDir)3rdparty\glslang\glslang</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\3rdparty\wolfssl\;..\3rdparty\flatbuffers\include;..\3rdparty\libusb\libusb\libusb;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\zlib\zlib;..\llvm\include;..\llvm_build\include;$(VULKAN_SDK)\Include</AdditionalIncludeDirectories>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AL_LIBTYPE_STATIC;MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL3;ZLIB_CONST;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AL_LIBTYPE_STATIC;MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL3;ZLIB_CONST;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalModuleDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalModuleDependencies)</AdditionalModuleDependencies>
-      <AdditionalModuleDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalModuleDependencies)</AdditionalModuleDependencies>
     </ClCompile>
     <PreBuildEvent>
       <Command>cmd.exe /c "$(SolutionDir)\Utilities\git-version-gen.cmd"</Command>
       <Message>Updating git-version.h</Message>
     </PreBuildEvent>
-    <Lib>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ntdll.lib</AdditionalDependencies>
-    </Lib>
-    <Lib>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ntdll.lib</AdditionalDependencies>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\Utilities\cheat_info.cpp" />
-    <ClCompile Include="..\Utilities\date_time.cpp" />
-    <ClCompile Include="..\Utilities\stack_trace.cpp" />
-    <ClCompile Include="Crypto\decrypt_binaries.cpp" />
-    <ClCompile Include="Crypto\unzip.cpp" />
-    <ClCompile Include="Emu\Audio\audio_resampler.cpp" />
-    <ClCompile Include="Emu\Audio\audio_utils.cpp" />
+    <ClCompile Include="Emu\Audio\ALSA\ALSABackend.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Emu\Audio\audio_device_listener.cpp" />
     <ClCompile Include="Emu\Audio\FAudio\FAudioBackend.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="Emu\Audio\FAudio\faudio_enumerator.cpp">
+    <ClCompile Include="Emu\Audio\Pulse\PulseBackend.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="Emu\cache_utils.cpp" />
-    <ClCompile Include="Emu\Cell\ErrorCodes.cpp" />
-    <ClCompile Include="Emu\Cell\lv2\sys_game.cpp" />
-    <ClCompile Include="Emu\Cell\Modules\cellMusicSelectionContext.cpp" />
     <ClCompile Include="Emu\Cell\Modules\libfs_utility_init.cpp" />
     <ClCompile Include="Emu\Cell\Modules\sys_crashdump.cpp" />
-    <ClCompile Include="Emu\Cell\Modules\HLE_PATCHES.cpp" />
-    <ClCompile Include="Emu\games_config.cpp" />
-    <ClCompile Include="Emu\Io\Buzz.cpp" />
-    <ClCompile Include="Emu\Io\camera_config.cpp" />
-    <ClCompile Include="Emu\Io\evdev_gun_handler.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\GameTablet.cpp" />
-    <ClCompile Include="Emu\Io\GHLtar.cpp" />
-    <ClCompile Include="Emu\Io\GunCon3.cpp" />
-    <ClCompile Include="Emu\Io\midi_config_types.cpp" />
-    <ClCompile Include="Emu\Io\MouseHandler.cpp" />
-    <ClCompile Include="Emu\Io\pad_types.cpp" />
-    <ClCompile Include="Emu\Io\rb3drums_config.cpp" />
-    <ClCompile Include="Emu\Io\RB3MidiDrums.cpp" />
-    <ClCompile Include="Emu\Io\RB3MidiGuitar.cpp" />
-    <ClCompile Include="Emu\Io\RB3MidiKeyboard.cpp" />
-    <ClCompile Include="Emu\Io\recording_config.cpp" />
-    <ClCompile Include="Emu\Io\TopShotElite.cpp" />
-    <ClCompile Include="Emu\Io\TopShotFearmaster.cpp" />
     <ClCompile Include="Emu\Io\Turntable.cpp" />
-    <ClCompile Include="Emu\Io\LogitechG27.cpp" />
-    <ClCompile Include="Emu\Io\LogitechG27Config.cpp" />
-    <ClCompile Include="Emu\Io\usio.cpp" />
+    <ClCompile Include="Emu\Io\GHLtar.cpp" />
+    <ClCompile Include="Emu\Io\Buzz.cpp" />
     <ClCompile Include="Emu\Audio\AudioBackend.cpp" />
     <ClCompile Include="Emu\Io\interception.cpp" />
     <ClCompile Include="Emu\Io\KeyboardHandler.cpp" />
-    <ClCompile Include="Emu\Io\mouse_config.cpp" />
     <ClCompile Include="Emu\Io\pad_config.cpp" />
     <ClCompile Include="Emu\Io\pad_config_types.cpp" />
-    <ClCompile Include="Emu\IPC_config.cpp" />
-    <ClCompile Include="Emu\IPC_socket.cpp" />
     <ClCompile Include="Emu\localized_string.cpp" />
     <ClCompile Include="Emu\NP\rpcn_config.cpp" />
-    <ClCompile Include="Emu\NP\rpcn_countries.cpp" />
-    <ClCompile Include="Emu\NP\upnp_config.cpp" />
-    <ClCompile Include="Emu\NP\upnp_handler.cpp" />
-    <ClCompile Include="Emu\perf_monitor.cpp" />
     <ClCompile Include="Emu\RSX\Common\texture_cache.cpp" />
-    <ClCompile Include="Emu\RSX\Common\texture_cache_types.cpp" />
-    <ClCompile Include="Emu\RSX\Core\RSXContext.cpp" />
-    <ClCompile Include="Emu\RSX\Core\RSXDisplay.cpp" />
-    <ClCompile Include="Emu\RSX\Core\RSXDrawCommands.cpp" />
-    <ClCompile Include="Emu\RSX\GSFrameBase.cpp" />
-    <ClCompile Include="Emu\RSX\Host\MM.cpp" />
-    <ClCompile Include="Emu\RSX\Host\RSXDMAWriter.cpp" />
-    <ClCompile Include="Emu\RSX\NV47\FW\draw_call.cpp" />
-    <ClCompile Include="Emu\RSX\NV47\FW\reg_context.cpp" />
-    <ClCompile Include="Emu\RSX\NV47\HW\common.cpp" />
-    <ClCompile Include="Emu\RSX\NV47\HW\nv0039.cpp" />
-    <ClCompile Include="Emu\RSX\NV47\HW\nv3089.cpp" />
-    <ClCompile Include="Emu\RSX\NV47\HW\nv308a.cpp" />
-    <ClCompile Include="Emu\RSX\NV47\HW\nv406e.cpp" />
-    <ClCompile Include="Emu\RSX\NV47\HW\nv4097.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\FriendsList\overlay_friends_list_dialog.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_components.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_message_box.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_main_menu.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_page.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_settings.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_savestate.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\Network\overlay_recvmessage_dialog.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\Network\overlay_sendmessage_dialog.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\overlay_animated_icon.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\overlay_controls.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\overlay_cursor.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\overlay_debug_overlay.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\overlay_manager.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\overlay_media_list_dialog.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\overlay_osk_panel.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\overlay_compile_notification.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\overlay_user_list_dialog.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\overlay_utils.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\overlay_video.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\Shaders\shader_loading_dialog.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\Shaders\shader_loading_dialog_native.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\Trophies\overlay_trophy_list_dialog.cpp" />
-    <ClCompile Include="Emu\RSX\Program\FragmentProgramRegister.cpp" />
     <ClCompile Include="Emu\RSX\Program\ProgramStateCache.cpp" />
     <ClCompile Include="Emu\RSX\Program\program_util.cpp" />
-    <ClCompile Include="Emu\RSX\Program\SPIRVCommon.cpp" />
     <ClCompile Include="Emu\RSX\RSXDisAsm.cpp" />
-    <ClCompile Include="Emu\RSX\RSXZCULL.cpp" />
-    <ClCompile Include="Emu\RSX\rsx_vertex_data.cpp" />
-    <ClCompile Include="Emu\savestate_utils.cpp" />
-    <ClCompile Include="Emu\scoped_progress_dialog.cpp" />
     <ClCompile Include="Emu\system_config_types.cpp" />
     <ClCompile Include="Emu\perf_meter.cpp" />
     <ClCompile Include="Emu\system_progress.cpp" />
@@ -172,29 +90,14 @@
     <ClCompile Include="Emu\title.cpp" />
     <ClCompile Include="Emu\system_config.cpp" />
     <ClCompile Include="Emu\NP\fb_helpers.cpp" />
-    <ClCompile Include="Emu\NP\np_cache.cpp" />
-    <ClCompile Include="Emu\NP\np_gui_cache.cpp" />
     <ClCompile Include="Emu\NP\np_contexts.cpp" />
-    <ClCompile Include="Emu\NP\np_dnshook.cpp" />
-    <ClCompile Include="Emu\NP\np_requests_gui.cpp" />
     <ClCompile Include="Emu\NP\np_handler.cpp" />
-    <ClCompile Include="Emu\NP\np_helpers.cpp" />
-    <ClCompile Include="Emu\NP\np_notifications.cpp" />
-    <ClCompile Include="Emu\NP\np_requests.cpp" />
     <ClCompile Include="Emu\NP\signaling_handler.cpp" />
     <ClCompile Include="Emu\NP\np_structs_extra.cpp" />
     <ClCompile Include="Emu\NP\rpcn_client.cpp" />
-    <ClCompile Include="Emu\NP\ip_address.cpp" />
-    <ClCompile Include="Emu\vfs_config.cpp" />
-    <ClCompile Include="Loader\disc.cpp" />
-    <ClCompile Include="util\emu_utils.cpp" />
-    <ClCompile Include="util\serialization_ext.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="util\atomic.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="util\video_provider.cpp" />
     <ClCompile Include="util\media_utils.cpp" />
     <ClCompile Include="util\yaml.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -209,10 +112,7 @@
     <ClCompile Include="util\dyn_lib.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\Utilities\JITASM.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\JITLLVM.cpp">
+    <ClCompile Include="..\Utilities\JIT.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="util\logs.cpp">
@@ -232,9 +132,6 @@
     <ClCompile Include="..\Utilities\sema.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\Utilities\simple_ringbuf.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="..\Utilities\StrFmt.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
@@ -253,14 +150,6 @@
     </ClCompile>
     <ClCompile Include="Emu\Cell\lv2\sys_gpio.cpp" />
     <ClCompile Include="Emu\Cell\lv2\sys_net.cpp" />
-    <ClCompile Include="Emu\Cell\lv2\sys_net\lv2_socket.cpp" />
-    <ClCompile Include="Emu\Cell\lv2\sys_net\lv2_socket_native.cpp" />
-    <ClCompile Include="Emu\Cell\lv2\sys_net\lv2_socket_raw.cpp" />
-    <ClCompile Include="Emu\Cell\lv2\sys_net\lv2_socket_p2p.cpp" />
-    <ClCompile Include="Emu\Cell\lv2\sys_net\lv2_socket_p2ps.cpp" />
-    <ClCompile Include="Emu\Cell\lv2\sys_net\network_context.cpp" />
-    <ClCompile Include="Emu\Cell\lv2\sys_net\nt_p2p_port.cpp" />
-    <ClCompile Include="Emu\Cell\lv2\sys_net\sys_net_helpers.cpp" />
     <ClCompile Include="Emu\Cell\Modules\StaticHLE.cpp" />
     <ClCompile Include="Emu\Cell\lv2\sys_overlay.cpp" />
     <ClCompile Include="Emu\Cell\PPUAnalyser.cpp" />
@@ -313,7 +202,6 @@
     <ClCompile Include="Emu\Cell\Modules\cellAdec.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellAtrac.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellAtracMulti.cpp" />
-    <ClCompile Include="Emu\Cell\Modules\cellAtracXdec.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellAudio.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellAudioOut.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellAuthDialog.cpp" />
@@ -325,7 +213,6 @@
     <ClCompile Include="Emu\Cell\Modules\cellCrossController.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellDaisy.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellDmux.cpp" />
-    <ClCompile Include="Emu\Cell\Modules\cellDmuxPamf.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellDtcpIpUtility.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellFiber.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellFont.cpp" />
@@ -422,9 +309,8 @@
     <ClCompile Include="Emu\Cell\Modules\sceNpTrophy.cpp" />
     <ClCompile Include="Emu\Cell\Modules\sceNpTus.cpp" />
     <ClCompile Include="Emu\Cell\Modules\sceNpUtil.cpp" />
-    <ClCompile Include="Emu\Cell\Modules\sceNpPlus.cpp" />
     <ClCompile Include="Emu\Cell\Modules\sysPrxForUser.cpp" />
-    <ClCompile Include="Emu\Cell\Modules\sys_game_.cpp" />
+    <ClCompile Include="Emu\Cell\Modules\sys_game.cpp" />
     <ClCompile Include="Emu\Cell\Modules\sys_heap.cpp" />
     <ClCompile Include="Emu\Cell\Modules\sys_io_.cpp" />
     <ClCompile Include="Emu\Cell\Modules\sys_libc.cpp" />
@@ -447,14 +333,10 @@
     <ClCompile Include="Emu\Cell\SPUDisAsm.cpp" />
     <ClCompile Include="Emu\Cell\SPUInterpreter.cpp" />
     <ClCompile Include="Emu\IdManager.cpp" />
-    <ClCompile Include="Emu\Io\Dimensions.cpp" />
-    <ClCompile Include="Emu\Io\Infinity.cpp" />
     <ClCompile Include="Emu\Io\Skylander.cpp" />
     <ClCompile Include="Emu\Io\usb_device.cpp" />
-    <ClCompile Include="Emu\Io\usb_vfs.cpp" />
     <ClCompile Include="Emu\RSX\Capture\rsx_capture.cpp" />
     <ClCompile Include="Emu\RSX\Capture\rsx_replay.cpp" />
-    <ClCompile Include="Emu\RSX\Program\CgBinaryProgram.cpp" />
     <ClCompile Include="Emu\RSX\Program\CgBinaryFragmentProgram.cpp" />
     <ClCompile Include="Emu\RSX\Program\CgBinaryVertexProgram.cpp" />
     <ClCompile Include="Emu\RSX\Common\BufferUtils.cpp" />
@@ -475,12 +357,12 @@
     <ClCompile Include="Emu\RSX\Overlays\overlay_edit_text.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\overlay_fonts.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\overlay_list_view.cpp" />
-    <ClCompile Include="Emu\RSX\Overlays\overlay_message.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\overlay_message_dialog.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\overlay_osk.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\overlay_perf_metrics.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\overlay_progress_bar.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\overlay_save_dialog.cpp" />
+    <ClCompile Include="Emu\RSX\Overlays\overlay_shader_compile_notification.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\overlay_trophy_notification.cpp" />
     <ClCompile Include="Emu\RSX\RSXFIFO.cpp" />
     <ClCompile Include="Emu\RSX\RSXOffload.cpp" />
@@ -517,8 +399,7 @@
     <ClCompile Include="Emu\Cell\MFC.cpp" />
     <ClCompile Include="Emu\Cell\PPUThread.cpp" />
     <ClCompile Include="Emu\Cell\RawSPUThread.cpp" />
-    <ClCompile Include="Emu\Cell\SPUCommonRecompiler.cpp" />
-    <ClCompile Include="Emu\Cell\SPULLVMRecompiler.cpp" />
+    <ClCompile Include="Emu\Cell\SPURecompiler.cpp" />
     <ClCompile Include="Emu\Cell\SPUThread.cpp" />
     <ClCompile Include="Emu\CPU\CPUThread.cpp" />
     <ClCompile Include="Emu\VFS.cpp" />
@@ -536,210 +417,84 @@
     <ClCompile Include="Loader\TROPUSR.cpp" />
     <ClCompile Include="Loader\TRP.cpp" />
     <ClCompile Include="rpcs3_version.cpp" />
-    <ClCompile Include="Emu\stb_image.cpp" />
+    <ClCompile Include="stb_image.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\3rdparty\stblib\stb\stb_image.h" />
+    <ClInclude Include="..\3rdparty\stblib\include\stb_image.h" />
     <ClInclude Include="..\Utilities\address_range.h" />
     <ClInclude Include="..\Utilities\cheat_info.h" />
-    <ClInclude Include="..\Utilities\simple_ringbuf.h" />
-    <ClInclude Include="..\Utilities\stack_trace.h" />
-    <ClInclude Include="..\Utilities\transactional_storage.h" />
-    <ClInclude Include="Crypto\decrypt_binaries.h" />
-    <ClInclude Include="Crypto\unzip.h" />
-    <ClInclude Include="Emu\Audio\audio_resampler.h" />
-    <ClInclude Include="Emu\Audio\audio_device_enumerator.h" />
-    <ClInclude Include="Emu\Audio\audio_utils.h" />
+    <ClInclude Include="Emu\Audio\ALSA\ALSABackend.h">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Emu\Audio\audio_device_listener.h" />
     <ClInclude Include="Emu\Audio\FAudio\FAudioBackend.h">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="Emu\Audio\FAudio\faudio_enumerator.h">
+    <ClInclude Include="Emu\Audio\Pulse\PulseBackend.h">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="Emu\cache_utils.hpp" />
     <ClInclude Include="Emu\Cell\lv2\sys_crypto_engine.h" />
-    <ClInclude Include="Emu\Cell\lv2\sys_game.h" />
     <ClInclude Include="Emu\Cell\Modules\cellCrossController.h" />
-    <ClInclude Include="Emu\Cell\Modules\cellMusicDecode.h" />
-    <ClInclude Include="Emu\Cell\Modules\cellRec.h" />
     <ClInclude Include="Emu\Cell\Modules\cellRemotePlay.h" />
     <ClInclude Include="Emu\Cell\Modules\cellSsl.h" />
     <ClInclude Include="Emu\Cell\Modules\cellStorage.h" />
-    <ClInclude Include="Emu\Cell\Modules\cellSysutilAvc.h" />
     <ClInclude Include="Emu\Cell\Modules\libfs_utility_init.h" />
     <ClInclude Include="Emu\Cell\Modules\sys_crashdump.h" />
-    <ClInclude Include="Emu\config_mode.h" />
-    <ClInclude Include="Emu\CPU\Hypervisor.h" />
-    <ClInclude Include="Emu\CPU\sse2neon.h" />
-    <ClInclude Include="Emu\games_config.h" />
-    <ClInclude Include="Emu\Io\Buzz.h" />
-    <ClInclude Include="Emu\Io\buzz_config.h" />
-    <ClInclude Include="Emu\Io\camera_config.h" />
-    <ClInclude Include="Emu\Io\camera_handler_base.h" />
-    <ClInclude Include="Emu\Io\emulated_pad_config.h" />
-    <ClInclude Include="Emu\Io\evdev_gun_handler.h">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\GameTablet.h" />
-    <ClInclude Include="Emu\Io\gem_config.h" />
+    <ClInclude Include="Emu\Io\Turntable.h" />
     <ClInclude Include="Emu\Io\GHLtar.h" />
-    <ClInclude Include="Emu\Io\ghltar_config.h" />
-    <ClInclude Include="Emu\Io\guncon3_config.h" />
-    <ClInclude Include="Emu\Io\GunCon3.h" />
+    <ClInclude Include="Emu\Io\Buzz.h" />
     <ClInclude Include="Emu\Io\interception.h" />
+    <ClInclude Include="Emu\Io\pad_types.h" />
     <ClInclude Include="Emu\Io\Keyboard.h" />
-    <ClInclude Include="Emu\Io\midi_config_types.h" />
-    <ClInclude Include="Emu\Io\music_handler_base.h" />
-    <ClInclude Include="Emu\Io\Null\null_camera_handler.h" />
-    <ClInclude Include="Emu\Io\Null\null_music_handler.h" />
     <ClInclude Include="Emu\Io\pad_config.h" />
     <ClInclude Include="Emu\Io\pad_config_types.h" />
-    <ClInclude Include="Emu\Io\pad_types.h" />
-    <ClInclude Include="Emu\Io\rb3drums_config.h" />
-    <ClInclude Include="Emu\Io\RB3MidiDrums.h" />
-    <ClInclude Include="Emu\Io\RB3MidiGuitar.h" />
-    <ClInclude Include="Emu\Io\RB3MidiKeyboard.h" />
-    <ClInclude Include="Emu\Io\recording_config.h" />
-    <ClInclude Include="Emu\Io\TopShotElite.h" />
-    <ClInclude Include="Emu\Io\topshotelite_config.h" />
-    <ClInclude Include="Emu\Io\TopShotFearmaster.h" />
-    <ClInclude Include="Emu\Io\topshotfearmaster_config.h" />
-    <ClInclude Include="Emu\Io\Turntable.h" />
-    <ClInclude Include="Emu\Io\turntable_config.h" />
-    <ClInclude Include="Emu\Io\usio.h" />
-    <ClInclude Include="Emu\Io\usio_config.h" />
-    <ClInclude Include="Emu\Io\LogitechG27.h" />
-    <ClInclude Include="Emu\Io\LogitechG27Config.h" />
-    <ClInclude Include="Emu\IPC_config.h" />
-    <ClInclude Include="Emu\IPC_socket.h" />
     <ClInclude Include="Emu\localized_string.h" />
     <ClInclude Include="Emu\localized_string_id.h" />
-    <ClInclude Include="Emu\NP\fb_helpers.h" />
     <ClInclude Include="Emu\NP\generated\np2_structs_generated.h" />
-    <ClInclude Include="Emu\NP\np_contexts.h" />
-    <ClInclude Include="Emu\NP\np_gui_cache.h" />
     <ClInclude Include="Emu\NP\np_handler.h" />
-    <ClInclude Include="Emu\NP\rpcn_countries.h" />
     <ClInclude Include="Emu\NP\signaling_handler.h" />
-    <ClInclude Include="Emu\NP\upnp_config.h" />
-    <ClInclude Include="Emu\NP\upnp_handler.h" />
-    <ClInclude Include="Emu\NP\vport0.h" />
-    <ClInclude Include="Emu\NP\np_allocator.h" />
-    <ClInclude Include="Emu\NP\np_cache.h" />
-    <ClInclude Include="Emu\NP\np_dnshook.h" />
-    <ClInclude Include="Emu\NP\np_event_data.h" />
-    <ClInclude Include="Emu\NP\np_helpers.h" />
     <ClInclude Include="Emu\NP\np_structs_extra.h" />
     <ClInclude Include="Emu\NP\rpcn_client.h" />
     <ClInclude Include="Emu\NP\rpcn_config.h" />
-    <ClInclude Include="Emu\NP\ip_address.h" />
-    <ClInclude Include="Emu\perf_monitor.hpp" />
-    <ClInclude Include="Emu\RSX\color_utils.h" />
-    <ClInclude Include="Emu\RSX\Common\bitfield.hpp" />
-    <ClInclude Include="Emu\RSX\Common\buffer_stream.hpp" />
-    <ClInclude Include="Emu\RSX\Common\tiled_dma_copy.hpp" />
-    <ClInclude Include="Emu\RSX\Common\expected.hpp" />
-    <ClInclude Include="Emu\RSX\Common\io_buffer.h" />
-    <ClInclude Include="Emu\RSX\Common\profiling_timer.hpp" />
-    <ClInclude Include="Emu\RSX\Common\ranged_map.hpp" />
-    <ClInclude Include="Emu\RSX\Common\simple_array.hpp" />
-    <ClInclude Include="Emu\RSX\Common\surface_cache_dma.hpp" />
-    <ClInclude Include="Emu\RSX\Common\time.hpp" />
-    <ClInclude Include="Emu\RSX\Common\unordered_map.hpp" />
-    <ClInclude Include="Emu\RSX\Core\RSXContext.h" />
-    <ClInclude Include="Emu\RSX\Core\RSXDrawCommands.h" />
-    <ClInclude Include="Emu\RSX\Core\RSXDriverState.h" />
-    <ClInclude Include="Emu\RSX\Core\RSXEngLock.hpp" />
-    <ClInclude Include="Emu\RSX\Core\RSXFrameBuffer.h" />
-    <ClInclude Include="Emu\RSX\Core\RSXIOMap.hpp" />
-    <ClInclude Include="Emu\RSX\Core\RSXDisplay.h" />
-    <ClInclude Include="Emu\RSX\Core\RSXReservationLock.hpp" />
-    <ClInclude Include="Emu\RSX\Core\RSXVertexTypes.h" />
-    <ClInclude Include="Emu\RSX\Host\MM.h" />
-    <ClInclude Include="Emu\RSX\Host\RSXDMAWriter.h" />
-    <ClInclude Include="Emu\RSX\NV47\FW\draw_call.hpp" />
-    <ClInclude Include="Emu\RSX\NV47\FW\draw_call.inc.h" />
-    <ClInclude Include="Emu\RSX\NV47\FW\GRAPH_backend.h" />
-    <ClInclude Include="Emu\RSX\NV47\FW\reg_context.h" />
-    <ClInclude Include="Emu\RSX\NV47\HW\context.h" />
-    <ClInclude Include="Emu\RSX\NV47\HW\context_accessors.define.h" />
-    <ClInclude Include="Emu\RSX\NV47\HW\context_accessors.undef.h" />
-    <ClInclude Include="Emu\RSX\NV47\HW\nv0039.h" />
-    <ClInclude Include="Emu\RSX\NV47\HW\nv3089.h" />
-    <ClInclude Include="Emu\RSX\NV47\HW\nv308a.h" />
-    <ClInclude Include="Emu\RSX\NV47\HW\nv406e.h" />
-    <ClInclude Include="Emu\RSX\NV47\HW\nv4097.h" />
-    <ClInclude Include="Emu\RSX\NV47\HW\nv47.h" />
-    <ClInclude Include="Emu\RSX\NV47\HW\common.h" />
-    <ClInclude Include="Emu\RSX\NV47\HW\nv47_sync.hpp" />
-    <ClInclude Include="Emu\RSX\Overlays\FriendsList\overlay_friends_list_dialog.h" />
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu.h" />
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_components.h" />
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_message_box.h" />
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_main_menu.h" />
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_page.h" />
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_settings.h" />
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_savestate.h" />
-    <ClInclude Include="Emu\RSX\Overlays\Network\overlay_recvmessage_dialog.h" />
-    <ClInclude Include="Emu\RSX\Overlays\Network\overlay_sendmessage_dialog.h" />
-    <ClInclude Include="Emu\RSX\Overlays\overlay_animated_icon.h" />
-    <ClInclude Include="Emu\RSX\Overlays\overlay_cursor.h" />
-    <ClInclude Include="Emu\RSX\Overlays\overlay_debug_overlay.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_edit_text.hpp" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_list_view.hpp" />
-    <ClInclude Include="Emu\RSX\Overlays\overlay_loading_icon.hpp" />
-    <ClInclude Include="Emu\RSX\Overlays\overlay_manager.h" />
-    <ClInclude Include="Emu\RSX\Overlays\overlay_media_list_dialog.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_progress_bar.hpp" />
-    <ClInclude Include="Emu\RSX\Overlays\overlay_video.h" />
-    <ClInclude Include="Emu\RSX\Overlays\Trophies\overlay_trophy_list_dialog.h" />
-    <ClInclude Include="Emu\RSX\Program\FragmentProgramRegister.h" />
     <ClInclude Include="Emu\RSX\Program\GLSLTypes.h" />
     <ClInclude Include="Emu\RSX\Program\ProgramStateCache.h" />
     <ClInclude Include="Emu\RSX\Program\program_util.h" />
-    <ClInclude Include="Emu\RSX\Program\RSXOverlay.h" />
     <ClInclude Include="Emu\RSX\Program\ShaderInterpreter.h" />
     <ClInclude Include="Emu\RSX\Common\texture_cache_helpers.h" />
     <ClInclude Include="Emu\RSX\Common\texture_cache_types.h" />
     <ClInclude Include="Emu\RSX\display.h" />
     <ClInclude Include="Emu\RSX\GSFrameBase.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_fonts.h" />
-    <ClInclude Include="Emu\RSX\Overlays\overlay_message.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_message_dialog.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_osk.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_osk_panel.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_perf_metrics.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_save_dialog.h" />
-    <ClInclude Include="Emu\RSX\Overlays\overlay_compile_notification.h" />
+    <ClInclude Include="Emu\RSX\Overlays\overlay_shader_compile_notification.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_trophy_notification.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_user_list_dialog.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_utils.h" />
     <ClInclude Include="Emu\RSX\Overlays\Shaders\shader_loading_dialog.h" />
     <ClInclude Include="Emu\RSX\Overlays\Shaders\shader_loading_dialog_native.h" />
-    <ClInclude Include="Emu\RSX\Program\SPIRVCommon.h" />
     <ClInclude Include="Emu\RSX\RSXDisAsm.h" />
-    <ClInclude Include="Emu\RSX\RSXZCULL.h" />
-    <ClInclude Include="Emu\savestate_utils.hpp" />
     <ClInclude Include="Emu\system_progress.hpp" />
     <ClInclude Include="Emu\system_utils.hpp" />
     <ClInclude Include="Emu\title.h" />
     <ClInclude Include="Emu\system_config.h" />
     <ClInclude Include="Emu\system_config_types.h" />
-    <ClInclude Include="Emu\vfs_config.h" />
-    <ClInclude Include="Loader\disc.h" />
     <ClInclude Include="Loader\mself.hpp" />
     <ClInclude Include="util\atomic.hpp" />
-    <ClInclude Include="util\bless.hpp" />
-    <ClInclude Include="util\video_sink.h" />
-    <ClInclude Include="util\video_provider.h" />
     <ClInclude Include="util\media_utils.h" />
     <ClInclude Include="util\serialization.hpp" />
-    <ClInclude Include="util\serialization_ext.hpp" />
     <ClInclude Include="util\v128.hpp" />
-    <ClInclude Include="util\simd.hpp" />
+    <ClInclude Include="util\v128sse.hpp" />
     <ClInclude Include="util\to_endian.hpp" />
     <ClInclude Include="..\Utilities\bin_patch.h" />
     <ClInclude Include="..\Utilities\BitField.h" />
@@ -773,7 +528,6 @@
     <ClInclude Include="..\Utilities\Timer.h" />
     <ClInclude Include="util\types.hpp" />
     <ClInclude Include="..\Utilities\version.h" />
-    <ClInclude Include="util\video_source.h" />
     <ClInclude Include="util\vm.hpp" />
     <ClInclude Include="util\asm.hpp" />
     <ClInclude Include="Crypto\aes.h" />
@@ -805,16 +559,12 @@
     <ClInclude Include="Emu\Cell\PPUAnalyser.h" />
     <ClInclude Include="Emu\Cell\PPUTranslator.h" />
     <ClInclude Include="Emu\CPU\CPUTranslator.h" />
-    <ClInclude Include="Emu\Io\Dimensions.h" />
-    <ClInclude Include="Emu\Io\Infinity.h" />
     <ClInclude Include="Emu\Io\Skylander.h" />
     <ClInclude Include="Emu\Io\usb_device.h" />
-    <ClInclude Include="Emu\Io\usb_vfs.h" />
     <ClInclude Include="Emu\IPC.h" />
     <ClInclude Include="Emu\Audio\AudioDumper.h" />
     <ClInclude Include="Emu\Audio\AudioBackend.h" />
     <ClInclude Include="Emu\Audio\Null\NullAudioBackend.h" />
-    <ClInclude Include="Emu\Audio\Null\null_enumerator.h" />
     <ClInclude Include="Emu\Cell\Common.h" />
     <ClInclude Include="Emu\Cell\ErrorCodes.h" />
     <ClInclude Include="Emu\Cell\lv2\sys_cond.h" />
@@ -858,14 +608,12 @@
     <ClInclude Include="Emu\Cell\Modules\cellAdec.h" />
     <ClInclude Include="Emu\Cell\Modules\cellAtrac.h" />
     <ClInclude Include="Emu\Cell\Modules\cellAtracMulti.h" />
-    <ClInclude Include="Emu\Cell\Modules\cellAtracXdec.h" />
     <ClInclude Include="Emu\Cell\Modules\cellAudio.h" />
     <ClInclude Include="Emu\Cell\Modules\cellAudioIn.h" />
     <ClInclude Include="Emu\Cell\Modules\cellAudioOut.h" />
     <ClInclude Include="Emu\Cell\Modules\cellBgdl.h" />
     <ClInclude Include="Emu\Cell\Modules\cellCamera.h" />
     <ClInclude Include="Emu\Cell\Modules\cellDmux.h" />
-    <ClInclude Include="Emu\Cell\Modules\cellDmuxPamf.h" />
     <ClInclude Include="Emu\Cell\Modules\cellFiber.h" />
     <ClInclude Include="Emu\Cell\Modules\cellFont.h" />
     <ClInclude Include="Emu\Cell\Modules\cellFontFT.h" />
@@ -921,7 +669,6 @@
     <ClInclude Include="Emu\Cell\Modules\sceNpTrophy.h" />
     <ClInclude Include="Emu\Cell\Modules\sceNpTus.h" />
     <ClInclude Include="Emu\Cell\Modules\sceNpUtil.h" />
-    <ClInclude Include="Emu\Cell\Modules\sceNpPlus.h" />
     <ClInclude Include="Emu\Cell\Modules\sysPrxForUser.h" />
     <ClInclude Include="Emu\Cell\Modules\sys_lv2dbg.h" />
     <ClInclude Include="Emu\Cell\Modules\sys_net_.h" />
@@ -948,6 +695,7 @@
     <ClInclude Include="Emu\RSX\Capture\rsx_trace.h" />
     <ClInclude Include="Emu\RSX\Program\GLSLCommon.h" />
     <ClInclude Include="Emu\RSX\Common\surface_utils.h" />
+    <ClInclude Include="Emu\RSX\Common\TextGlyphs.h" />
     <ClInclude Include="Emu\RSX\Common\texture_cache.h" />
     <ClInclude Include="Emu\RSX\Common\texture_cache_checker.h" />
     <ClInclude Include="Emu\RSX\Common\texture_cache_predictor.h" />
@@ -974,6 +722,7 @@
     <ClInclude Include="Emu\RSX\Program\CgBinaryProgram.h" />
     <ClInclude Include="Emu\RSX\Common\BufferUtils.h" />
     <ClInclude Include="Emu\RSX\Program\FragmentProgramDecompiler.h" />
+    <ClInclude Include="Emu\RSX\Program\program_state_cache2.hpp" />
     <ClInclude Include="Emu\RSX\Common\ring_buffer_helper.h" />
     <ClInclude Include="Emu\RSX\Program\ShaderParam.h" />
     <ClInclude Include="Emu\RSX\Common\surface_store.h" />
@@ -989,7 +738,6 @@
     <ClInclude Include="Emu\Memory\vm.h" />
     <ClInclude Include="Emu\Memory\vm_ptr.h" />
     <ClInclude Include="Emu\Memory\vm_ref.h" />
-    <ClInclude Include="Emu\Memory\vm_reservation.h" />
     <ClInclude Include="Emu\Memory\vm_var.h" />
     <ClInclude Include="Emu\RSX\rsx_methods.h" />
     <ClInclude Include="Emu\RSX\rsx_utils.h" />
@@ -1018,58 +766,10 @@
     <ProjectReference Include="..\3rdparty\yaml-cpp\yaml-cpp.vcxproj">
       <Project>{fdc361c5-7734-493b-8cfb-037308b35122}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\3rdparty\zlib\zlib.vcxproj">
-      <Project>{60f89955-91c6-3a36-8000-13c592fec2df}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\3rdparty\zstd\zstd.vcxproj">
-      <Project>{4e52a41a-f33b-4c7a-8c36-a1a6b4f4277c}</Project>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Emu\RSX\Program\GLSLInterpreter\FragmentInterpreter.glsl" />
-    <None Include="Emu\RSX\Program\GLSLInterpreter\VertexInterpreter.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\CopyBufferToColorImage.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\CopyBufferToGenericImage.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\CopyD24x8ToBuffer.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\CopyRGBA8ToBuffer.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\GenericVSPassthrough.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\GPUDeswizzle.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\OverlayRenderFS.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\OverlayRenderVS.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXMemoryTiling.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXDefines2.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXFragmentPrologue.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXFragmentTextureDepthConversion.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXFragmentTextureMSAAOps.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXFragmentTextureMSAAOpsInternal.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXFragmentTextureOps.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXProgramCommon.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXProgrammableBlendPrologue.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXROPEpilogue.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXROPPrologue.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXVertexFetch.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXVertexPrologue.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\ShuffleBytes.glsl" />
-    <None Include="Emu\RSX\Program\GLSLSnippets\VideoOutCalibrationPass.glsl" />
-    <None Include="Emu\RSX\Program\MSAA\ColorResolvePass.glsl" />
-    <None Include="Emu\RSX\Program\MSAA\ColorUnresolvePass.glsl" />
-    <None Include="Emu\RSX\Program\MSAA\DepthResolvePass.glsl" />
-    <None Include="Emu\RSX\Program\MSAA\DepthStencilResolvePass.glsl" />
-    <None Include="Emu\RSX\Program\MSAA\DepthStencilUnresolvePass.glsl" />
-    <None Include="Emu\RSX\Program\MSAA\DepthUnresolvePass.glsl" />
-    <None Include="Emu\RSX\Program\MSAA\StencilResolvePass.glsl" />
-    <None Include="Emu\RSX\Program\MSAA\StencilUnresolvePass.glsl" />
-    <None Include="Emu\RSX\Program\Upscalers\FSR1\fsr_ffx_a_flattened.inc" />
-    <None Include="Emu\RSX\Program\Upscalers\FSR1\fsr_ffx_fsr1_flattened.inc" />
-    <None Include="Emu\RSX\Program\Upscalers\FSR1\fsr_ubershader.glsl" />
-    <None Include="Emu\CPU\Backends\AArch64\AArch64ASM.h" />
-    <None Include="Emu\CPU\Backends\AArch64\AArch64Common.h" />
-    <None Include="Emu\CPU\Backends\AArch64\AArch64JIT.h" />
-    <None Include="Emu\CPU\Backends\AArch64\AArch64Signal.h" />
-    <None Include="Emu\CPU\Backends\AArch64\AArch64ASM.cpp" />
-    <None Include="Emu\CPU\Backends\AArch64\AArch64Common.cpp" />
-    <None Include="Emu\CPU\Backends\AArch64\AArch64JIT.cpp" />
-    <None Include="Emu\CPU\Backends\AArch64\AArch64Signal.cpp" />
+    <None Include="Emu\RSX\Common\Interpreter\FragmentInterpreter.glsl" />
+    <None Include="Emu\RSX\Common\Interpreter\VertexInterpreter.glsl" />
   </ItemGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 94f0382bcc..057975c297 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -64,75 +64,21 @@
     <Filter Include="Emu\NP">
       <UniqueIdentifier>{652ce43e-72db-42cd-831a-0e194f67e731}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Emu\GPU\RSX\Common\Interpreter">
+      <UniqueIdentifier>{bc97b324-1eea-445a-8fa9-6fc49e3df47c}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Emu\Audio\FAudio">
       <UniqueIdentifier>{7555ff6f-67a9-4d02-b744-0bf896751edb}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Emu\Audio\ALSA">
+      <UniqueIdentifier>{c76057f1-bb19-4981-8ab0-5ba20ac27552}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\Audio\Pulse">
+      <UniqueIdentifier>{84c0e40e-efb6-4cfd-b2f5-13c720b09105}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Emu\GPU\RSX\Program">
       <UniqueIdentifier>{d055ca32-157a-4d8c-895e-29509858fcb0}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Emu\GPU\RSX\Program\Snippets">
-      <UniqueIdentifier>{21667779-4136-4de4-8695-9ea13e5c9bce}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Program\Interpreter">
-      <UniqueIdentifier>{bc97b324-1eea-445a-8fa9-6fc49e3df47c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Core">
-      <UniqueIdentifier>{99b3a1c9-93ea-4498-86b0-1000793013fa}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Overlays\HomeMenu">
-      <UniqueIdentifier>{787ed009-9e17-4ef0-abae-885a708d33e7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Overlays\HomeMenu\Pages">
-      <UniqueIdentifier>{017e5a5d-b190-4032-baed-57f8020861a5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Program\Snippets\RSXProg">
-      <UniqueIdentifier>{f990b0be-adbd-4a1c-b8c7-d6f963d5b629}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Overlays\Network">
-      <UniqueIdentifier>{d7a60dc0-ac4e-4983-97d3-ce1328af49a7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Program\Upscalers">
-      <UniqueIdentifier>{646a5689-94cc-43f3-82fb-213e21c7a31f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Program\Upscalers\FSR1">
-      <UniqueIdentifier>{cab197c1-581c-49db-9d8b-670335b44cb2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\NV47">
-      <UniqueIdentifier>{213387bd-09c5-4247-8fb0-b3cae06ba34b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\NV47\HW">
-      <UniqueIdentifier>{24fc03a5-0469-4b6e-89df-44459e51855f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\NV47\FW">
-      <UniqueIdentifier>{fdb8ff8f-5a03-45a2-8c0a-16a89b7a574b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\CPU\Backends">
-      <UniqueIdentifier>{636c461d-99c0-4f98-89dc-1d4ec7157bfc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\CPU\Backends\AArch64">
-      <UniqueIdentifier>{73650043-acf8-4890-9f84-5bfa7a8c946b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Overlays\FriendsList">
-      <UniqueIdentifier>{a9d2ff9f-b5cd-4fd4-afca-424e876aa656}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Decoders">
-      <UniqueIdentifier>{40f6640a-ed40-4096-b79b-995ae5be3052}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Game Window">
-      <UniqueIdentifier>{8a3a8944-dd32-4fd2-972e-451547a13f98}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Host Mini-Driver">
-      <UniqueIdentifier>{3bc6035f-0c00-4bc3-98cd-7ed26f6a4ecb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Utils">
-      <UniqueIdentifier>{0e218fca-53a6-4066-a412-4e0659d6ff0b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Overlays\Trophies">
-      <UniqueIdentifier>{caf84300-5c45-4340-bd9a-8ac859409351}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GPU\RSX\Program\MSAA">
-      <UniqueIdentifier>{ce6d6b90-8313-4273-b46c-d92bd450c002}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Crypto\aes.cpp">
@@ -195,12 +141,18 @@
     <ClCompile Include="Loader\TRP.cpp">
       <Filter>Loader</Filter>
     </ClCompile>
-    <ClCompile Include="..\Utilities\simple_ringbuf.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
     <ClCompile Include="..\Utilities\StrFmt.cpp">
       <Filter>Utilities</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\RSX\GSRender.cpp">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\RSXTexture.cpp">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\RSXThread.cpp">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClCompile>
     <ClCompile Include="..\Utilities\rXml.cpp">
       <Filter>Utilities</Filter>
     </ClCompile>
@@ -222,10 +174,7 @@
     <ClCompile Include="util\vm_native.cpp">
       <Filter>Utilities</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Cell\SPUCommonRecompiler.cpp">
-      <Filter>Emu\Cell</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\SPULLVMRecompiler.cpp">
+    <ClCompile Include="Emu\Cell\SPURecompiler.cpp">
       <Filter>Emu\Cell</Filter>
     </ClCompile>
     <ClCompile Include="Emu\Cell\SPUAnalyser.cpp">
@@ -243,6 +192,12 @@
     <ClCompile Include="Emu\RSX\Null\NullGSRender.cpp">
       <Filter>Emu\GPU\RSX\Null</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\RSX\rsx_utils.cpp">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\rsx_methods.cpp">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClCompile>
     <ClCompile Include="Emu\RSX\Common\surface_store.cpp">
       <Filter>Emu\GPU\RSX\Common</Filter>
     </ClCompile>
@@ -363,9 +318,6 @@
     <ClCompile Include="Emu\Cell\Modules\cellAtracMulti.cpp">
       <Filter>Emu\Cell\Modules</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Cell\Modules\cellAtracXdec.cpp">
-      <Filter>Emu\Cell\Modules</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\Cell\Modules\cellAudio.cpp">
       <Filter>Emu\Cell\Modules</Filter>
     </ClCompile>
@@ -399,9 +351,6 @@
     <ClCompile Include="Emu\Cell\Modules\cellDmux.cpp">
       <Filter>Emu\Cell\Modules</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Cell\Modules\cellDmuxPamf.cpp">
-      <Filter>Emu\Cell\Modules</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\Cell\Modules\cellDtcpIpUtility.cpp">
       <Filter>Emu\Cell\Modules</Filter>
     </ClCompile>
@@ -690,10 +639,7 @@
     <ClCompile Include="Emu\Cell\Modules\sceNpUtil.cpp">
       <Filter>Emu\Cell\Modules</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Cell\Modules\sceNpPlus.cpp">
-      <Filter>Emu\Cell\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\Modules\sys_game_.cpp">
+    <ClCompile Include="Emu\Cell\Modules\sys_game.cpp">
       <Filter>Emu\Cell\Modules</Filter>
     </ClCompile>
     <ClCompile Include="Emu\Cell\Modules\sys_heap.cpp">
@@ -765,18 +711,21 @@
     <ClCompile Include="util\dyn_lib.cpp">
       <Filter>Utilities</Filter>
     </ClCompile>
-    <ClCompile Include="..\Utilities\JITASM.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\JITLLVM.cpp">
+    <ClCompile Include="..\Utilities\JIT.cpp">
       <Filter>Utilities</Filter>
     </ClCompile>
     <ClCompile Include="Emu\Cell\PPUAnalyser.cpp">
       <Filter>Emu\Cell</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\RSX\gcm_enums.cpp">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClCompile>
     <ClCompile Include="Loader\ELF.cpp">
       <Filter>Loader</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\RSX\gcm_printing.cpp">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClCompile>
     <ClCompile Include="..\Utilities\mutex.cpp">
       <Filter>Utilities</Filter>
     </ClCompile>
@@ -816,30 +765,6 @@
     <ClCompile Include="Emu\Cell\lv2\sys_net.cpp">
       <Filter>Emu\Cell\lv2</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Cell\lv2\sys_net\lv2_socket.cpp">
-      <Filter>Emu\Cell\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\lv2\sys_net\lv2_socket_native.cpp">
-      <Filter>Emu\Cell\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\lv2\sys_net\lv2_socket_raw.cpp">
-      <Filter>Emu\Cell\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\lv2\sys_net\lv2_socket_p2p.cpp">
-      <Filter>Emu\Cell\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\lv2\sys_net\lv2_socket_p2ps.cpp">
-      <Filter>Emu\Cell\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\lv2\sys_net\network_context.cpp">
-      <Filter>Emu\Cell\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\lv2\sys_net\nt_p2p_port.cpp">
-      <Filter>Emu\Cell\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\lv2\sys_net\sys_net_helpers.cpp">
-      <Filter>Emu\Cell\lv2</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\Io\PadHandler.cpp">
       <Filter>Emu\Io</Filter>
     </ClCompile>
@@ -861,6 +786,9 @@
     <ClCompile Include="Emu\RSX\Overlays\overlay_perf_metrics.cpp">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\RSX\RSXFIFO.cpp">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClCompile>
     <ClCompile Include="Emu\Cell\Modules\StaticHLE.cpp">
       <Filter>Emu\Cell\Modules</Filter>
     </ClCompile>
@@ -870,12 +798,6 @@
     <ClCompile Include="Emu\Cell\lv2\sys_config.cpp">
       <Filter>Emu\Cell\lv2</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Io\Dimensions.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\Infinity.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\Io\Skylander.cpp">
       <Filter>Emu\Io</Filter>
     </ClCompile>
@@ -885,10 +807,10 @@
     <ClCompile Include="Emu\RSX\Overlays\overlay_save_dialog.cpp">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\overlay_message.cpp">
+    <ClCompile Include="Emu\RSX\Overlays\overlay_message_dialog.cpp">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\overlay_message_dialog.cpp">
+    <ClCompile Include="Emu\RSX\Overlays\overlay_shader_compile_notification.cpp">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClCompile>
     <ClCompile Include="Emu\RSX\Overlays\overlay_trophy_notification.cpp">
@@ -903,6 +825,9 @@
     <ClCompile Include="Emu\RSX\Overlays\overlay_progress_bar.cpp">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\RSX\RSXOffload.cpp">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClCompile>
     <ClCompile Include="Emu\Io\KeyboardHandler.cpp">
       <Filter>Emu\Io</Filter>
     </ClCompile>
@@ -912,9 +837,6 @@
     <ClCompile Include="Emu\Io\usb_device.cpp">
       <Filter>Emu\Io</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Io\usb_vfs.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
     <ClCompile Include="util\atomic.cpp">
       <Filter>Utilities</Filter>
     </ClCompile>
@@ -933,27 +855,12 @@
     <ClCompile Include="Emu\RSX\Overlays\Shaders\shader_loading_dialog.cpp">
       <Filter>Emu\GPU\RSX\Overlays\Shaders</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Io\GameTablet.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\Io\GHLtar.cpp">
       <Filter>Emu\Io</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Io\GunCon3.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\Io\Buzz.cpp">
       <Filter>Emu\Io</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Io\LogitechG27.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\LogitechG27Config.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\usio.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\Cell\lv2\sys_crypto_engine.cpp">
       <Filter>Emu\Cell\lv2</Filter>
     </ClCompile>
@@ -984,33 +891,12 @@
     <ClCompile Include="Emu\NP\fb_helpers.cpp">
       <Filter>Emu\NP</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\NP\np_cache.cpp">
-      <Filter>Emu\NP</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\NP\np_gui_cache.cpp">
-      <Filter>Emu\NP</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\NP\np_contexts.cpp">
       <Filter>Emu\NP</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\NP\np_dnshook.cpp">
-      <Filter>Emu\NP</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\NP\np_requests_gui.cpp">
-      <Filter>Emu\NP</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\NP\np_handler.cpp">
       <Filter>Emu\NP</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\NP\np_helpers.cpp">
-      <Filter>Emu\NP</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\NP\np_notifications.cpp">
-      <Filter>Emu\NP</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\NP\np_requests.cpp">
-      <Filter>Emu\NP</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\NP\signaling_handler.cpp">
       <Filter>Emu\NP</Filter>
     </ClCompile>
@@ -1023,8 +909,11 @@
     <ClCompile Include="Emu\Audio\FAudio\FAudioBackend.cpp">
       <Filter>Emu\Audio\FAudio</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Audio\FAudio\faudio_enumerator.cpp">
-      <Filter>Emu\Audio\FAudio</Filter>
+    <ClCompile Include="Emu\Audio\ALSA\ALSABackend.cpp">
+      <Filter>Emu\Audio\ALSA</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Audio\Pulse\PulseBackend.cpp">
+      <Filter>Emu\Audio\Pulse</Filter>
     </ClCompile>
     <ClCompile Include="..\Utilities\cheat_info.cpp">
       <Filter>Utilities</Filter>
@@ -1035,9 +924,6 @@
     <ClCompile Include="Emu\NP\rpcn_client.cpp">
       <Filter>Emu\NP</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\NP\ip_address.cpp">
-      <Filter>Emu\NP</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\NP\rpcn_config.cpp">
       <Filter>Emu\NP</Filter>
     </ClCompile>
@@ -1050,18 +936,15 @@
     <ClCompile Include="Emu\Io\interception.cpp">
       <Filter>Emu\Io</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\RSX\RSXDisAsm.cpp">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClCompile>
     <ClCompile Include="Emu\RSX\Common\texture_cache.cpp">
       <Filter>Emu\GPU\RSX\Common</Filter>
     </ClCompile>
     <ClCompile Include="Emu\Cell\Modules\sys_crashdump.cpp">
       <Filter>Emu\Cell\Modules</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Io\TopShotElite.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\TopShotFearmaster.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\Io\Turntable.cpp">
       <Filter>Emu\Io</Filter>
     </ClCompile>
@@ -1089,7 +972,7 @@
     <ClCompile Include="stdafx.cpp">
       <Filter>Emu</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\stb_image.cpp" />
+    <ClCompile Include="stb_image.cpp" />
     <ClCompile Include="Emu\RSX\Program\FragmentProgramDecompiler.cpp">
       <Filter>Emu\GPU\RSX\Program</Filter>
     </ClCompile>
@@ -1099,9 +982,6 @@
     <ClCompile Include="Emu\RSX\Program\VertexProgramDecompiler.cpp">
       <Filter>Emu\GPU\RSX\Program</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\Program\CgBinaryProgram.cpp">
-      <Filter>Emu\GPU\RSX\Program</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\RSX\Program\CgBinaryFragmentProgram.cpp">
       <Filter>Emu\GPU\RSX\Program</Filter>
     </ClCompile>
@@ -1123,252 +1003,9 @@
     <ClCompile Include="Emu\Cell\Modules\libfs_utility_init.cpp">
       <Filter>Emu\Cell\Modules</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\vfs_config.cpp">
-      <Filter>Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\camera_config.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Audio\audio_resampler.cpp">
+    <ClCompile Include="Emu\Audio\audio_device_listener.cpp">
       <Filter>Emu\Audio</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\overlay_media_list_dialog.cpp">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\perf_monitor.cpp">
-      <Filter>Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Crypto\decrypt_binaries.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\IPC_socket.cpp">
-      <Filter>Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\IPC_config.cpp">
-      <Filter>Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\disc.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\overlay_cursor.cpp">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClCompile>
-    <ClCompile Include="util\serialization_ext.cpp">
-      <Filter>Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\savestate_utils.cpp">
-      <Filter>Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\scoped_progress_dialog.cpp">
-      <Filter>Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\Modules\cellMusicSelectionContext.cpp">
-      <Filter>Emu\Cell\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\stack_trace.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\lv2\sys_game.cpp">
-      <Filter>Emu\Cell\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="util\video_provider.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\recording_config.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\Modules\HLE_PATCHES.cpp">
-      <Filter>Emu\Cell\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_components.cpp">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_page.cpp">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu.cpp">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_main_menu.cpp">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu\Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_settings.cpp">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu\Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_savestate.cpp">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu\Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\overlay_animated_icon.cpp">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\overlay_compile_notification.cpp">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_message_box.cpp">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\NP\upnp_handler.cpp">
-      <Filter>Emu\NP</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\NP\upnp_config.cpp">
-      <Filter>Emu\NP</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\overlay_manager.cpp">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\games_config.cpp">
-      <Filter>Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\RB3MidiGuitar.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\RB3MidiKeyboard.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\midi_config_types.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\pad_types.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Core\RSXContext.cpp">
-      <Filter>Emu\GPU\RSX\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Core\RSXDisplay.cpp">
-      <Filter>Emu\GPU\RSX\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="Crypto\unzip.cpp">
-      <Filter>Crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\overlay_debug_overlay.cpp">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\Network\overlay_recvmessage_dialog.cpp">
-      <Filter>Emu\GPU\RSX\Overlays\Network</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\Network\overlay_sendmessage_dialog.cpp">
-      <Filter>Emu\GPU\RSX\Overlays\Network</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\RB3MidiDrums.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\rb3drums_config.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Program\SPIRVCommon.cpp">
-      <Filter>Emu\GPU\RSX\Program</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\NV47\HW\common.cpp">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\NV47\HW\nv0039.cpp">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\NV47\HW\nv308a.cpp">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\NV47\HW\nv406e.cpp">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\NV47\HW\nv3089.cpp">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\NV47\HW\nv4097.cpp">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\NV47\FW\reg_context.cpp">
-      <Filter>Emu\GPU\RSX\NV47\FW</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\NV47\FW\draw_call.cpp">
-      <Filter>Emu\GPU\RSX\NV47\FW</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\mouse_config.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\MouseHandler.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\NP\rpcn_countries.cpp">
-      <Filter>Emu\NP</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\FriendsList\overlay_friends_list_dialog.cpp">
-      <Filter>Emu\GPU\RSX\Overlays\FriendsList</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\RSXTexture.cpp">
-      <Filter>Emu\GPU\RSX\Decoders</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GSRender.cpp">
-      <Filter>Emu\GPU\RSX\Game Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\RSXOffload.cpp">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\RSXThread.cpp">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\gcm_printing.cpp">
-      <Filter>Emu\GPU\RSX\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\rsx_utils.cpp">
-      <Filter>Emu\GPU\RSX\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\rsx_vertex_data.cpp">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\rsx_methods.cpp">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\RSXZCULL.cpp">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\RSXFIFO.cpp">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\RSXDisAsm.cpp">
-      <Filter>Emu\GPU\RSX\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\gcm_enums.cpp">
-      <Filter>Emu\GPU\RSX\NV47\FW</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Host\RSXDMAWriter.cpp">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Host\MM.cpp">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Core\RSXDrawCommands.cpp">
-      <Filter>Emu\GPU\RSX\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\Trophies\overlay_trophy_list_dialog.cpp">
-      <Filter>Emu\GPU\RSX\Overlays\Trophies</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Audio\audio_utils.cpp">
-      <Filter>Emu\Audio</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\ErrorCodes.cpp">
-      <Filter>Emu\Cell</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Program\FragmentProgramRegister.cpp">
-      <Filter>Emu\GPU\RSX\Program</Filter>
-    </ClCompile>
-    <ClCompile Include="util\emu_utils.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\date_time.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GSFrameBase.cpp">
-      <Filter>Emu\GPU\RSX\Game Window</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Common\texture_cache_types.cpp">
-      <Filter>Emu\GPU\RSX\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\overlay_video.cpp">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\evdev_gun_handler.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">
@@ -1467,7 +1104,7 @@
     <ClInclude Include="util\v128.hpp">
       <Filter>Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="util\simd.hpp">
+    <ClInclude Include="util\v128sse.hpp">
       <Filter>Utilities</Filter>
     </ClInclude>
     <ClInclude Include="util\to_endian.hpp">
@@ -1482,15 +1119,27 @@
     <ClInclude Include="Emu\RSX\Null\NullGSRender.h">
       <Filter>Emu\GPU\RSX\Null</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\GSRender.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
     <ClInclude Include="Emu\RSX\Program\RSXFragmentProgram.h">
       <Filter>Emu\GPU\RSX\Program</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\RSXTexture.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\RSXThread.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
     <ClInclude Include="Emu\RSX\Program\CgBinaryProgram.h">
       <Filter>Emu\GPU\RSX\Program</Filter>
     </ClInclude>
     <ClInclude Include="Emu\RSX\Program\RSXVertexProgram.h">
       <Filter>Emu\GPU\RSX\Program</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\GCM.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
     <ClInclude Include="Emu\IdManager.h">
       <Filter>Emu</Filter>
     </ClInclude>
@@ -1518,9 +1167,6 @@
     <ClInclude Include="Emu\Memory\vm_ref.h">
       <Filter>Emu\Memory</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Memory\vm_reservation.h">
-      <Filter>Emu\Memory</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\Memory\vm_var.h">
       <Filter>Emu\Memory</Filter>
     </ClInclude>
@@ -1563,6 +1209,12 @@
     <ClInclude Include="..\Utilities\BitField.h">
       <Filter>Utilities</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\rsx_utils.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\rsx_methods.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
     <ClInclude Include="Emu\RSX\Common\surface_store.h">
       <Filter>Emu\GPU\RSX\Common</Filter>
     </ClInclude>
@@ -1686,9 +1338,6 @@
     <ClInclude Include="Emu\Cell\Modules\cellAtracMulti.h">
       <Filter>Emu\Cell\Modules</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Cell\Modules\cellAtracXdec.h">
-      <Filter>Emu\Cell\Modules</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\Cell\Modules\cellAudio.h">
       <Filter>Emu\Cell\Modules</Filter>
     </ClInclude>
@@ -1707,9 +1356,6 @@
     <ClInclude Include="Emu\Cell\Modules\cellDmux.h">
       <Filter>Emu\Cell\Modules</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Cell\Modules\cellDmuxPamf.h">
-      <Filter>Emu\Cell\Modules</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\Cell\Modules\cellFiber.h">
       <Filter>Emu\Cell\Modules</Filter>
     </ClInclude>
@@ -1878,9 +1524,6 @@
     <ClInclude Include="Emu\Cell\Modules\sceNpUtil.h">
       <Filter>Emu\Cell\Modules</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Cell\Modules\sceNpPlus.h">
-      <Filter>Emu\Cell\Modules</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\Cell\Modules\sys_crashdump.h">
       <Filter>Emu\Cell\Modules</Filter>
     </ClInclude>
@@ -1932,15 +1575,33 @@
     <ClInclude Include="..\Utilities\sync.h">
       <Filter>Utilities</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\rsx_cache.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
     <ClInclude Include="..\Utilities\JIT.h">
       <Filter>Utilities</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\rsx_vertex_data.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\rsx_decode.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\gcm_enums.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
     <ClInclude Include="..\Utilities\cfmt.h">
       <Filter>Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\Utilities\bit_set.h">
       <Filter>Utilities</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\gcm_printing.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\Common\TextGlyphs.h">
+      <Filter>Emu\GPU\RSX\Common</Filter>
+    </ClInclude>
     <ClInclude Include="..\Utilities\mutex.h">
       <Filter>Utilities</Filter>
     </ClInclude>
@@ -2046,6 +1707,9 @@
     <ClInclude Include="Emu\RSX\Common\texture_cache_utils.h">
       <Filter>Emu\GPU\RSX\Common</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\RSXFIFO.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
     <ClInclude Include="Emu\RSX\Common\texture_cache_predictor.h">
       <Filter>Emu\GPU\RSX\Common</Filter>
     </ClInclude>
@@ -2058,24 +1722,18 @@
     <ClInclude Include="Emu\Audio\Null\NullAudioBackend.h">
       <Filter>Emu\Audio\Null</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Audio\Null\null_enumerator.h">
-      <Filter>Emu\Audio\Null</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\Cell\lv2\sys_config.h">
       <Filter>Emu\Cell\lv2</Filter>
     </ClInclude>
     <ClInclude Include="Emu\RSX\Common\surface_utils.h">
       <Filter>Emu\GPU\RSX\Common</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\RSXOffload.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
     <ClInclude Include="Emu\Io\Keyboard.h">
       <Filter>Emu\Io</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Io\Dimensions.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\Infinity.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\Io\Skylander.h">
       <Filter>Emu\Io</Filter>
     </ClInclude>
@@ -2085,9 +1743,6 @@
     <ClInclude Include="Emu\Io\usb_device.h">
       <Filter>Emu\Io</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Io\usb_vfs.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
     <ClInclude Include="Crypto\aesni.h">
       <Filter>Crypto</Filter>
     </ClInclude>
@@ -2145,48 +1800,27 @@
     <ClInclude Include="Emu\RSX\Overlays\overlay_save_dialog.h">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\overlay_message.h">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\RSX\Overlays\overlay_message_dialog.h">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClInclude>
     <ClInclude Include="Emu\RSX\Overlays\overlay_trophy_notification.h">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\overlay_compile_notification.h">
+    <ClInclude Include="Emu\RSX\Overlays\overlay_shader_compile_notification.h">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Io\GameTablet.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\Io\GHLtar.h">
       <Filter>Emu\Io</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Io\GunCon3.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\Io\Buzz.h">
       <Filter>Emu\Io</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Io\LogitechG27.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\LogitechG27Config.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\usio.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\NP\np_handler.h">
       <Filter>Emu\NP</Filter>
     </ClInclude>
     <ClInclude Include="Emu\NP\signaling_handler.h">
       <Filter>Emu\NP</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\NP\vport0.h">
-      <Filter>Emu\NP</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\RSX\Overlays\overlay_osk_panel.h">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClInclude>
@@ -2226,8 +1860,11 @@
     <ClInclude Include="Emu\Audio\FAudio\FAudioBackend.h">
       <Filter>Emu\Audio\FAudio</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Audio\FAudio\faudio_enumerator.h">
-      <Filter>Emu\Audio\FAudio</Filter>
+    <ClInclude Include="Emu\Audio\ALSA\ALSABackend.h">
+      <Filter>Emu\Audio\ALSA</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Audio\Pulse\PulseBackend.h">
+      <Filter>Emu\Audio\Pulse</Filter>
     </ClInclude>
     <ClInclude Include="..\Utilities\cheat_info.h">
       <Filter>Utilities</Filter>
@@ -2256,15 +1893,18 @@
     <ClInclude Include="Emu\Io\interception.h">
       <Filter>Emu\Io</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\GSFrameBase.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\display.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\RSXDisAsm.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
     <ClInclude Include="Emu\RSX\Common\texture_cache_types.h">
       <Filter>Emu\GPU\RSX\Common</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Io\TopShotElite.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\TopShotFearmaster.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\Io\Turntable.h">
       <Filter>Emu\Io</Filter>
     </ClInclude>
@@ -2295,13 +1935,16 @@
     <ClInclude Include="Emu\Cell\timers.hpp">
       <Filter>Emu</Filter>
     </ClInclude>
-    <ClInclude Include="..\3rdparty\stblib\stb\stb_image.h" />
+    <ClInclude Include="..\3rdparty\stblib\include\stb_image.h" />
     <ClInclude Include="Emu\RSX\Program\FragmentProgramDecompiler.h">
       <Filter>Emu\GPU\RSX\Program</Filter>
     </ClInclude>
     <ClInclude Include="Emu\RSX\Program\GLSLCommon.h">
       <Filter>Emu\GPU\RSX\Program</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\Program\program_state_cache2.hpp">
+      <Filter>Emu\GPU\RSX\Program</Filter>
+    </ClInclude>
     <ClInclude Include="Emu\RSX\Program\program_util.h">
       <Filter>Emu\GPU\RSX\Program</Filter>
     </ClInclude>
@@ -2338,547 +1981,16 @@
     <ClInclude Include="Emu\Cell\Modules\libfs_utility_init.h">
       <Filter>Emu\Cell\Modules</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\vfs_config.h">
-      <Filter>Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Common\simple_array.hpp">
-      <Filter>Emu\GPU\RSX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Common\profiling_timer.hpp">
-      <Filter>Emu\GPU\RSX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Common\bitfield.hpp">
-      <Filter>Emu\GPU\RSX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\camera_handler_base.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\Null\null_camera_handler.h">
-      <Filter>Emu\Io\Null</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\camera_config.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Audio\audio_resampler.h">
+    <ClInclude Include="Emu\Audio\audio_device_listener.h">
       <Filter>Emu\Audio</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\Audio\audio_device_enumerator.h">
-      <Filter>Emu\Audio</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\NP\np_allocator.h">
-      <Filter>Emu\NP</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\NP\np_cache.h">
-      <Filter>Emu\NP</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\NP\np_dnshook.h">
-      <Filter>Emu\NP</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\NP\np_event_data.h">
-      <Filter>Emu\NP</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\NP\np_helpers.h">
-      <Filter>Emu\NP</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\music_handler_base.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\Null\null_music_handler.h">
-      <Filter>Emu\Io\Null</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\simple_ringbuf.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\transactional_storage.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\overlay_media_list_dialog.h">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Common\time.hpp">
-      <Filter>Emu\GPU\RSX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\perf_monitor.hpp">
-      <Filter>Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Common\ranged_map.hpp">
-      <Filter>Emu\GPU\RSX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Common\surface_cache_dma.hpp">
-      <Filter>Emu\GPU\RSX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\CPU\sse2neon.h">
-      <Filter>Emu\CPU</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Common\buffer_stream.hpp">
-      <Filter>Emu\GPU\RSX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\Modules\cellRec.h">
-      <Filter>Emu\Cell\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Crypto\decrypt_binaries.h">
-      <Filter>Crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\IPC_socket.h">
-      <Filter>Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\IPC_config.h">
-      <Filter>Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\disc.h">
-      <Filter>Loader</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\overlay_cursor.h">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\Modules\cellMusicDecode.h">
-      <Filter>Emu\Cell\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\stack_trace.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\lv2\sys_game.h">
-      <Filter>Emu\Cell\lv2</Filter>
-    </ClInclude>
-    <ClInclude Include="util\video_provider.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="util\video_sink.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\recording_config.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Core\RSXIOMap.hpp">
-      <Filter>Emu\GPU\RSX\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Core\RSXDisplay.h">
-      <Filter>Emu\GPU\RSX\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Core\RSXVertexTypes.h">
-      <Filter>Emu\GPU\RSX\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Core\RSXFrameBuffer.h">
-      <Filter>Emu\GPU\RSX\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Core\RSXReservationLock.hpp">
-      <Filter>Emu\GPU\RSX\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Core\RSXEngLock.hpp">
-      <Filter>Emu\GPU\RSX\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Common\expected.hpp">
-      <Filter>Emu\GPU\RSX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_components.h">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_page.h">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu.h">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_main_menu.h">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu\Pages</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_settings.h">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu\Pages</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_savestate.h">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu\Pages</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\overlay_loading_icon.hpp">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\overlay_animated_icon.h">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Program\RSXOverlay.h">
-      <Filter>Emu\GPU\RSX\Program</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_message_box.h">
-      <Filter>Emu\GPU\RSX\Overlays\HomeMenu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\overlay_manager.h">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\NP\upnp_handler.h">
-      <Filter>Emu\NP</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\NP\upnp_config.h">
-      <Filter>Emu\NP</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Common\io_buffer.h">
-      <Filter>Emu\GPU\RSX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Common\tiled_dma_copy.hpp">
-      <Filter>Emu\GPU\RSX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\games_config.h">
-      <Filter>Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\config_mode.h">
-      <Filter>Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\RB3MidiGuitar.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\RB3MidiKeyboard.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\midi_config_types.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\buzz_config.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\turntable_config.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\ghltar_config.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\guncon3_config.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\topshotelite_config.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\topshotfearmaster_config.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\usio_config.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\gem_config.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\emulated_pad_config.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Common\unordered_map.hpp">
-      <Filter>Emu\GPU\RSX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="util\bless.hpp">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Core\RSXContext.h">
-      <Filter>Emu\GPU\RSX\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="Crypto\unzip.h">
-      <Filter>Crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="util\serialization_ext.hpp">
-      <Filter>Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\overlay_debug_overlay.h">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\Network\overlay_recvmessage_dialog.h">
-      <Filter>Emu\GPU\RSX\Overlays\Network</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\Network\overlay_sendmessage_dialog.h">
-      <Filter>Emu\GPU\RSX\Overlays\Network</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\RB3MidiDrums.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\rb3drums_config.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Program\SPIRVCommon.h">
-      <Filter>Emu\GPU\RSX\Program</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\HW\common.h">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\HW\context.h">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\HW\context_accessors.define.h">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\HW\context_accessors.undef.h">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\HW\nv0039.h">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\HW\nv47.h">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\HW\nv47_sync.hpp">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\HW\nv308a.h">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\HW\nv406e.h">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\HW\nv3089.h">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\HW\nv4097.h">
-      <Filter>Emu\GPU\RSX\NV47\HW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\FW\draw_call.inc.h">
-      <Filter>Emu\GPU\RSX\NV47\FW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\FW\reg_context.h">
-      <Filter>Emu\GPU\RSX\NV47\FW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\FW\draw_call.hpp">
-      <Filter>Emu\GPU\RSX\NV47\FW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\savestate_utils.hpp">
-      <Filter>Emu</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\NV47\FW\GRAPH_backend.h">
-      <Filter>Emu\GPU\RSX\NV47\FW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\CPU\Hypervisor.h">
-      <Filter>Emu\CPU</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\NP\rpcn_countries.h">
-      <Filter>Emu\NP</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\Modules\cellSysutilAvc.h">
-      <Filter>Emu\Cell\Modules</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\FriendsList\overlay_friends_list_dialog.h">
-      <Filter>Emu\GPU\RSX\Overlays\FriendsList</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\RSXTexture.h">
-      <Filter>Emu\GPU\RSX\Decoders</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\rsx_decode.h">
-      <Filter>Emu\GPU\RSX\Decoders</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GSFrameBase.h">
-      <Filter>Emu\GPU\RSX\Game Window</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GSRender.h">
-      <Filter>Emu\GPU\RSX\Game Window</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\RSXOffload.h">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\RSXThread.h">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\gcm_printing.h">
-      <Filter>Emu\GPU\RSX\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\rsx_utils.h">
-      <Filter>Emu\GPU\RSX\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\rsx_vertex_data.h">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\rsx_methods.h">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\rsx_cache.h">
-      <Filter>Emu\GPU\RSX\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\RSXZCULL.h">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\RSXFIFO.h">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\RSXDisAsm.h">
-      <Filter>Emu\GPU\RSX\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\gcm_enums.h">
-      <Filter>Emu\GPU\RSX\NV47\FW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GCM.h">
-      <Filter>Emu\GPU\RSX\NV47\FW</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\display.h">
-      <Filter>Emu\GPU\RSX\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\color_utils.h">
-      <Filter>Emu\GPU\RSX\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Host\RSXDMAWriter.h">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Host\MM.h">
-      <Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\NP\fb_helpers.h">
-      <Filter>Emu\NP</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\NP\np_contexts.h">
-      <Filter>Emu\NP</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\NP\np_gui_cache.h">
-      <Filter>Emu\NP</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\NP\ip_address.h">
-      <Filter>Emu\NP</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Core\RSXDrawCommands.h">
-      <Filter>Emu\GPU\RSX\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Core\RSXDriverState.h">
-      <Filter>Emu\GPU\RSX\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\Trophies\overlay_trophy_list_dialog.h">
-      <Filter>Emu\GPU\RSX\Overlays\Trophies</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Audio\audio_utils.h">
-      <Filter>Emu\Audio</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Program\FragmentProgramRegister.h">
-      <Filter>Emu\GPU\RSX\Program</Filter>
-    </ClInclude>
-    <ClInclude Include="util\video_source.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\overlay_video.h">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\evdev_gun_handler.h">
-      <Filter>Emu\Io</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Emu\RSX\Program\GLSLSnippets\GPUDeswizzle.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets</Filter>
+    <None Include="Emu\RSX\Common\Interpreter\FragmentInterpreter.glsl">
+      <Filter>Emu\GPU\RSX\Common\Interpreter</Filter>
     </None>
-    <None Include="Emu\RSX\Program\GLSLInterpreter\FragmentInterpreter.glsl">
-      <Filter>Emu\GPU\RSX\Program\Interpreter</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLInterpreter\VertexInterpreter.glsl">
-      <Filter>Emu\GPU\RSX\Program\Interpreter</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\ShuffleBytes.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\GenericVSPassthrough.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\CopyD24x8ToBuffer.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\CopyRGBA8ToBuffer.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\CopyBufferToColorImage.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\CopyBufferToGenericImage.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\OverlayRenderVS.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\OverlayRenderFS.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXFragmentPrologue.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets\RSXProg</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXFragmentTextureDepthConversion.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets\RSXProg</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXFragmentTextureOps.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets\RSXProg</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXProgramCommon.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets\RSXProg</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXVertexPrologue.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets\RSXProg</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXFragmentTextureMSAAOps.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets\RSXProg</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXFragmentTextureMSAAOpsInternal.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets\RSXProg</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXDefines2.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets\RSXProg</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXVertexFetch.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets\RSXProg</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXMemoryTiling.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXProgrammableBlendPrologue.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets\RSXProg</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXROPEpilogue.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets\RSXProg</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXROPPrologue.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets\RSXProg</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\GLSLSnippets\VideoOutCalibrationPass.glsl">
-      <Filter>Emu\GPU\RSX\Program\Snippets</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\Upscalers\FSR1\fsr_ffx_a_flattened.inc">
-      <Filter>Emu\GPU\RSX\Program\Upscalers\FSR1</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\Upscalers\FSR1\fsr_ffx_fsr1_flattened.inc">
-      <Filter>Emu\GPU\RSX\Program\Upscalers\FSR1</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\Upscalers\FSR1\fsr_ubershader.glsl">
-      <Filter>Emu\GPU\RSX\Program\Upscalers\FSR1</Filter>
-    </None>
-    <None Include="Emu\CPU\Backends\AArch64\AArch64ASM.h">
-      <Filter>Emu\CPU\Backends\AArch64</Filter>
-    </None>
-    <None Include="Emu\CPU\Backends\AArch64\AArch64Common.h">
-      <Filter>Emu\CPU\Backends\AArch64</Filter>
-    </None>
-    <None Include="Emu\CPU\Backends\AArch64\AArch64JIT.h">
-      <Filter>Emu\CPU\Backends\AArch64</Filter>
-    </None>
-    <None Include="Emu\CPU\Backends\AArch64\AArch64Signal.h">
-      <Filter>Emu\CPU\Backends\AArch64</Filter>
-    </None>
-    <None Include="Emu\CPU\Backends\AArch64\AArch64ASM.cpp">
-      <Filter>Emu\CPU\Backends\AArch64</Filter>
-    </None>
-    <None Include="Emu\CPU\Backends\AArch64\AArch64Common.cpp">
-      <Filter>Emu\CPU\Backends\AArch64</Filter>
-    </None>
-    <None Include="Emu\CPU\Backends\AArch64\AArch64JIT.cpp">
-      <Filter>Emu\CPU\Backends\AArch64</Filter>
-    </None>
-    <None Include="Emu\CPU\Backends\AArch64\AArch64Signal.cpp">
-      <Filter>Emu\CPU\Backends\AArch64</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\MSAA\ColorResolvePass.glsl">
-      <Filter>Emu\GPU\RSX\Program\MSAA</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\MSAA\ColorUnresolvePass.glsl">
-      <Filter>Emu\GPU\RSX\Program\MSAA</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\MSAA\DepthResolvePass.glsl">
-      <Filter>Emu\GPU\RSX\Program\MSAA</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\MSAA\DepthStencilResolvePass.glsl">
-      <Filter>Emu\GPU\RSX\Program\MSAA</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\MSAA\DepthStencilUnresolvePass.glsl">
-      <Filter>Emu\GPU\RSX\Program\MSAA</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\MSAA\DepthUnresolvePass.glsl">
-      <Filter>Emu\GPU\RSX\Program\MSAA</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\MSAA\StencilResolvePass.glsl">
-      <Filter>Emu\GPU\RSX\Program\MSAA</Filter>
-    </None>
-    <None Include="Emu\RSX\Program\MSAA\StencilUnresolvePass.glsl">
-      <Filter>Emu\GPU\RSX\Program\MSAA</Filter>
+    <None Include="Emu\RSX\Common\Interpreter\VertexInterpreter.glsl">
+      <Filter>Emu\GPU\RSX\Common\Interpreter</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/rpcs3/git-version.cmake b/rpcs3/git-version.cmake
index 51c41da9d7..fb90f84127 100644
--- a/rpcs3/git-version.cmake
+++ b/rpcs3/git-version.cmake
@@ -38,9 +38,10 @@ function(gen_git_version rpcs3_src_dir)
 	set(GIT_VERSION_FILE "${rpcs3_src_dir}/git-version.h")
 	set(GIT_VERSION_UPDATE "1")
 
-	# These environment variables are defined by CI
+	# These environment variables are defined by Azure pipelines
 	# BUILD_REPOSITORY_NAME will look like "RPCS3/rpcs3"
 	# BUILD_SOURCEBRANCHNAME will look like "master"
+	# See https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables
 	if (DEFINED ENV{BUILD_REPOSITORY_NAME} AND NOT "$ENV{BUILD_REPOSITORY_NAME}" STREQUAL "")
 		set(RPCS3_GIT_FULL_BRANCH "$ENV{BUILD_REPOSITORY_NAME}/$ENV{BUILD_SOURCEBRANCHNAME}")
 	endif()
diff --git a/rpcs3/headless_application.cpp b/rpcs3/headless_application.cpp
index 43de0e108f..591f6ee270 100644
--- a/rpcs3/headless_application.cpp
+++ b/rpcs3/headless_application.cpp
@@ -1,20 +1,14 @@
 #include "headless_application.h"
 
-#include "Emu/System.h"
 #include "Emu/RSX/Null/NullGSRender.h"
 #include "Emu/Cell/Modules/cellMsgDialog.h"
 #include "Emu/Cell/Modules/cellOskDialog.h"
 #include "Emu/Cell/Modules/cellSaveData.h"
 #include "Emu/Cell/Modules/sceNpTrophy.h"
-#include "Emu/Io/Null/null_camera_handler.h"
-#include "Emu/Io/Null/null_music_handler.h"
-#include "util/video_source.h"
 
 #include <clocale>
 
-LOG_CHANNEL(sys_log, "SYS");
-
-[[noreturn]] void report_fatal_error(std::string_view text, bool is_html = false, bool include_help_text = true);
+#include <QFileInfo>
 
 // For now, a trivial constructor/destructor. May add command line usage later.
 headless_application::headless_application(int& argc, char** argv) : QCoreApplication(argc, argv)
@@ -41,7 +35,7 @@ bool headless_application::Init()
 void headless_application::InitializeConnects() const
 {
 	qRegisterMetaType<std::function<void()>>("std::function<void()>");
-	connect(this, &headless_application::RequestCallFromMainThread, this, &headless_application::CallFromMainThread);
+	connect(this, &headless_application::RequestCallAfter, this, &headless_application::HandleCallAfter);
 }
 
 /** RPCS3 emulator has functions it desires to call from the GUI at times. Initialize them in here. */
@@ -58,29 +52,30 @@ void headless_application::InitializeCallbacks()
 				on_exit();
 			}
 
-			sys_log.notice("Quitting headless application");
 			quit();
 			return true;
 		}
 
 		return false;
 	};
-	callbacks.call_from_main_thread = [this](std::function<void()> func, atomic_t<u32>* wake_up)
+	callbacks.call_after = [this](std::function<void()> func)
 	{
-		RequestCallFromMainThread(std::move(func), wake_up);
+		RequestCallAfter(std::move(func));
 	};
 
-	callbacks.init_gs_render = [](utils::serial* ar)
+	callbacks.init_gs_render = []()
 	{
 		switch (const video_renderer type = g_cfg.video.renderer)
 		{
 		case video_renderer::null:
 		{
-			g_fxo->init<rsx::thread, named_thread<NullGSRender>>(ar);
+			g_fxo->init<rsx::thread, named_thread<NullGSRender>>();
 			break;
 		}
 		case video_renderer::opengl:
+#if defined(_WIN32) || defined(HAVE_VULKAN)
 		case video_renderer::vulkan:
+#endif
 		{
 			fmt::throw_exception("Headless mode can only be used with the %s video renderer. Current renderer: %s", video_renderer::null, type);
 			[[fallthrough]];
@@ -92,40 +87,6 @@ void headless_application::InitializeCallbacks()
 		}
 	};
 
-	callbacks.get_camera_handler = []() -> std::shared_ptr<camera_handler_base>
-	{
-		switch (g_cfg.io.camera.get())
-		{
-		case camera_handler::null:
-		case camera_handler::fake:
-		{
-			return std::make_shared<null_camera_handler>();
-		}
-		case camera_handler::qt:
-		{
-			fmt::throw_exception("Headless mode can not be used with this camera handler. Current handler: %s", g_cfg.io.camera.get());
-		}
-		}
-		return nullptr;
-	};
-
-	callbacks.get_music_handler = []() -> std::shared_ptr<music_handler_base>
-	{
-		switch (g_cfg.audio.music.get())
-		{
-		case music_handler::null:
-		{
-			return std::make_shared<null_music_handler>();
-		}
-		case music_handler::qt:
-		{
-			fmt::throw_exception("Headless mode can not be used with this music handler. Current handler: %s", g_cfg.audio.music.get());
-		}
-		}
-		return nullptr;
-	};
-
-	callbacks.close_gs_frame = [](){};
 	callbacks.get_gs_frame = []() -> std::unique_ptr<GSFrameBase>
 	{
 		if (g_cfg.video.renderer != video_renderer::null)
@@ -145,39 +106,14 @@ void headless_application::InitializeCallbacks()
 	callbacks.on_resume = []() {};
 	callbacks.on_stop   = []() {};
 	callbacks.on_ready  = []() {};
-	callbacks.on_emulation_stop_no_response = [](std::shared_ptr<atomic_t<bool>> closed_successfully, int /*seconds_waiting_already*/)
-	{
-		if (!closed_successfully || !*closed_successfully)
-		{
-			report_fatal_error(tr("Stopping emulator took too long."
-						"\nSome thread has probably deadlocked. Aborting.").toStdString());
-		}
-	};
-
-	callbacks.on_save_state_progress = [](std::shared_ptr<atomic_t<bool>>, stx::shared_ptr<utils::serial>, stx::atomic_ptr<std::string>*, std::shared_ptr<void>)
-	{
-	};
-
-	callbacks.enable_disc_eject  = [](bool) {};
-	callbacks.enable_disc_insert = [](bool) {};
-
-	callbacks.on_missing_fw = []() {};
-
-	callbacks.handle_taskbar_progress = [](s32, s32) {};
 
 	callbacks.get_localized_string    = [](localized_string_id, const char*) -> std::string { return {}; };
 	callbacks.get_localized_u32string = [](localized_string_id, const char*) -> std::u32string { return {}; };
-	callbacks.get_localized_setting   = [](const cfg::_base*, u32) -> std::string { return {}; };
 
-	callbacks.play_sound = [](const std::string&){};
-	callbacks.add_breakpoint = [](u32 /*addr*/){};
-
-	callbacks.display_sleep_control_supported = [](){ return false; };
-	callbacks.enable_display_sleep = [](bool /*enabled*/){};
-
-	callbacks.check_microphone_permissions = [](){};
-
-	callbacks.make_video_source = [](){ return nullptr; };
+	callbacks.resolve_path = [](std::string_view sv)
+	{
+		return QFileInfo(QString::fromUtf8(sv.data(), static_cast<int>(sv.size()))).canonicalFilePath().toStdString();
+	};
 
 	Emu.SetCallbacks(std::move(callbacks));
 }
@@ -185,13 +121,7 @@ void headless_application::InitializeCallbacks()
 /**
  * Using connects avoids timers being unable to be used in a non-qt thread. So, even if this looks stupid to just call func, it's succinct.
  */
-void headless_application::CallFromMainThread(const std::function<void()>& func, atomic_t<u32>* wake_up)
+void headless_application::HandleCallAfter(const std::function<void()>& func)
 {
 	func();
-
-	if (wake_up)
-	{
-		*wake_up = true;
-		wake_up->notify_one();
-	}
 }
diff --git a/rpcs3/headless_application.h b/rpcs3/headless_application.h
index 5208861236..9caa06a4e9 100644
--- a/rpcs3/headless_application.h
+++ b/rpcs3/headless_application.h
@@ -3,7 +3,6 @@
 #include <QCoreApplication>
 
 #include "main_application.h"
-#include "util/atomic.hpp"
 
 #include <functional>
 
@@ -30,8 +29,8 @@ private:
 	}
 
 Q_SIGNALS:
-	void RequestCallFromMainThread(std::function<void()> func, atomic_t<u32>* wake_up);
+	void RequestCallAfter(std::function<void()> func);
 
 private Q_SLOTS:
-	static void CallFromMainThread(const std::function<void()>& func, atomic_t<u32>* wake_up);
+	static void HandleCallAfter(const std::function<void()>& func);
 };
diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp
index 1ea2321804..2ce56ec631 100644
--- a/rpcs3/main.cpp
+++ b/rpcs3/main.cpp
@@ -1,11 +1,985 @@
-#include "stdafx.h"
-#include "rpcs3.h"
+// Qt5.10+ frontend implementation for rpcs3. Known to work on Windows, Linux, Mac
+// by Sacha Refshauge, Megamouse and flash-fire
+
+#include <iostream>
+
+#include <QApplication>
+#include <QCommandLineParser>
+#include <QFileInfo>
+#include <QTimer>
+#include <QObject>
+#include <QStyleFactory>
+#include <QByteArray>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QJsonDocument>
+#include <QMessageBox>
+#include <QMetaEnum>
+
+#include "rpcs3qt/gui_application.h"
+#include "rpcs3qt/fatal_error_dialog.h"
+#include "rpcs3qt/curl_handle.h"
+#include "rpcs3qt/main_window.h"
+
+#include "headless_application.h"
+#include "Utilities/sema.h"
+#ifdef _WIN32
+#include <windows.h>
+#include "util/dyn_lib.hpp"
+DYNAMIC_IMPORT("ntdll.dll", NtQueryTimerResolution, NTSTATUS(PULONG MinimumResolution, PULONG MaximumResolution, PULONG CurrentResolution));
+DYNAMIC_IMPORT("ntdll.dll", NtSetTimerResolution, NTSTATUS(ULONG DesiredResolution, BOOLEAN SetResolution, PULONG CurrentResolution));
+#else
+#include <unistd.h>
+#include <spawn.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+#endif
+
+#ifdef __linux__
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+
+#ifdef __APPLE__
+#include <dispatch/dispatch.h>
+#endif
+
+#include "Utilities/Config.h"
+#include "Utilities/Thread.h"
+#include "Utilities/File.h"
+#include "Utilities/StrUtil.h"
+#include "rpcs3_version.h"
+#include "Emu/System.h"
+#include "Emu/system_utils.hpp"
+#include <thread>
+#include <charconv>
+
+#include "util/sysinfo.hpp"
+
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
+
+static semaphore<> s_qt_init;
+
+static atomic_t<bool> s_headless = false;
+static atomic_t<bool> s_no_gui = false;
+static atomic_t<char*> s_argv0;
+
+extern thread_local std::string(*g_tls_log_prefix)();
+
+#ifndef _WIN32
+extern char **environ;
+#endif
 
 LOG_CHANNEL(sys_log, "SYS");
+LOG_CHANNEL(q_debug, "QDEBUG");
+
+[[noreturn]] extern void report_fatal_error(std::string_view _text)
+{
+	std::string buf;
+
+	// Check if thread id is in string
+	if (_text.find("\nThread id = "sv) == umax)
+	{
+		// Copy only when needed
+		buf = std::string(_text);
+
+		// Always print thread id
+		fmt::append(buf, "\nThread id = %s.", std::this_thread::get_id());
+	}
+
+	const std::string_view text = buf.empty() ? _text : buf;
+
+	if (s_headless)
+	{
+#ifdef _WIN32
+		if (AttachConsole(ATTACH_PARENT_PROCESS) || AllocConsole())
+			[[maybe_unused]] const auto con_out = freopen("conout$", "w", stderr);
+#endif
+		std::cerr << fmt::format("RPCS3: %s\n", text);
+		std::abort();
+	}
+
+	const bool local = s_qt_init.try_lock();
+
+	// Possibly created and assigned here
+	static QScopedPointer<QCoreApplication> app;
+
+	if (local)
+	{
+		static int argc = 1;
+		static char* argv[] = {+s_argv0};
+		app.reset(new QApplication{argc, argv});
+	}
+	else
+	{
+		std::cerr << fmt::format("RPCS3: %s\n", text);
+	}
+
+	auto show_report = [](std::string_view text)
+	{
+		fatal_error_dialog dlg(text);
+		dlg.exec();
+	};
+
+#ifdef __APPLE__
+	// Cocoa access is not allowed outside of the main thread
+	if (!pthread_main_np())
+	{
+		dispatch_sync(dispatch_get_main_queue(), ^ { show_report(text); });
+	}
+	else
+#endif
+	{
+		// If Qt is already initialized, spawn a new RPCS3 process with an --error argument
+		if (local)
+		{
+			// Since we only show an error, we can hope for a graceful exit
+			show_report(text);
+			std::exit(0);
+		}
+
+#ifdef _WIN32
+		wchar_t buffer[32767];
+		GetModuleFileNameW(nullptr, buffer, sizeof(buffer) / 2);
+		const std::wstring arg(text.cbegin(), text.cend()); // ignore unicode for now
+		_wspawnl(_P_WAIT, buffer, buffer, L"--error", arg.c_str(), nullptr);
+#else
+		pid_t pid;
+		std::vector<char> data(text.data(), text.data() + text.size() + 1);
+		std::string run_arg = +s_argv0;
+		std::string err_arg = "--error";
+
+		if (run_arg.find_first_of('/') == umax)
+		{
+			// AppImage has "rpcs3" in argv[0], can't just execute it
+#ifdef __linux__
+			char buffer[PATH_MAX]{};
+			if (::readlink("/proc/self/exe", buffer, sizeof(buffer) - 1) > 0)
+			{
+				printf("Found exec link: %s\n", buffer);
+				run_arg = buffer;
+			}
+#endif
+		}
+
+		char* argv[] = {run_arg.data(), err_arg.data(), data.data(), nullptr};
+		int ret = posix_spawn(&pid, run_arg.c_str(), nullptr, nullptr, argv, environ);
+
+		if (ret == 0)
+		{
+			int status;
+			waitpid(pid, &status, 0);
+		}
+		else
+		{
+			std::fprintf(stderr, "posix_spawn() failed: %d\n", ret);
+		}
+#endif
+	}
+
+	std::abort();
+}
+
+struct fatal_error_listener final : logs::listener
+{
+	~fatal_error_listener() override = default;
+
+	void log(u64 /*stamp*/, const logs::message& msg, const std::string& prefix, const std::string& text) override
+	{
+		if (msg == logs::level::fatal)
+		{
+			std::string _msg = "RPCS3: ";
+
+			if (!prefix.empty())
+			{
+				_msg += prefix;
+				_msg += ": ";
+			}
+
+			if (msg->name && '\0' != *msg->name)
+			{
+				_msg += msg->name;
+				_msg += ": ";
+			}
+
+			_msg += text;
+			_msg += '\n';
+
+#ifdef _WIN32
+			// If launched from CMD
+			if (AttachConsole(ATTACH_PARENT_PROCESS))
+				[[maybe_unused]] const auto con_out = freopen("CONOUT$", "w", stderr);
+#endif
+			// Output to error stream as is
+			std::cerr << _msg;
+
+#ifdef _WIN32
+			if (IsDebuggerPresent())
+			{
+				// Output string to attached debugger
+				OutputDebugStringA(_msg.c_str());
+			}
+#endif
+			// Pause emulation if fatal error encountered
+			Emu.Pause();
+		}
+	}
+};
+
+constexpr auto arg_headless   = "headless";
+constexpr auto arg_no_gui     = "no-gui";
+constexpr auto arg_high_dpi   = "hidpi";
+constexpr auto arg_rounding   = "dpi-rounding";
+constexpr auto arg_styles     = "styles";
+constexpr auto arg_style      = "style";
+constexpr auto arg_stylesheet = "stylesheet";
+constexpr auto arg_config     = "config";
+constexpr auto arg_q_debug    = "qDebug";
+constexpr auto arg_error      = "error";
+constexpr auto arg_updating   = "updating";
+constexpr auto arg_user_id    = "user-id";
+constexpr auto arg_installfw  = "installfw";
+constexpr auto arg_installpkg = "installpkg";
+constexpr auto arg_commit_db  = "get-commit-db";
+
+int find_arg(std::string arg, int& argc, char* argv[])
+{
+	arg = "--" + arg;
+	for (int i = 0; i < argc; ++i) // It's not guaranteed that argv 0 is the executable.
+		if (!strcmp(arg.c_str(), argv[i]))
+			return i;
+	return -1;
+}
+
+QCoreApplication* createApplication(int& argc, char* argv[])
+{
+	if (find_arg(arg_headless, argc, argv) != -1)
+		return new headless_application(argc, argv);
+
+#ifdef __linux__
+	// set the DISPLAY variable in order to open web browsers
+	if (qEnvironmentVariable("DISPLAY", "").isEmpty())
+	{
+		qputenv("DISPLAY", ":0");
+	}
+
+	// Set QT_AUTO_SCREEN_SCALE_FACTOR to 0. This value is deprecated but still seems to make problems on some distros
+	if (!qEnvironmentVariable("QT_AUTO_SCREEN_SCALE_FACTOR", "").isEmpty())
+	{
+		qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "0");
+	}
+#endif
+
+	bool use_high_dpi = true;
+
+	const int i_hdpi = find_arg(arg_high_dpi, argc, argv);
+	if (i_hdpi != -1)
+	{
+		const std::string cmp_str = "0";
+		const auto i_hdpi_2 = (argc > (i_hdpi + 1)) ? (i_hdpi + 1) : 0;
+		const auto high_dpi_setting = (i_hdpi_2 && !strcmp(cmp_str.c_str(), argv[i_hdpi_2])) ? "0" : "1";
+
+		// Set QT_ENABLE_HIGHDPI_SCALING from environment. Defaults to cli argument, which defaults to 1.
+		use_high_dpi = "1" == qEnvironmentVariable("QT_ENABLE_HIGHDPI_SCALING", high_dpi_setting);
+	}
+
+	// AA_EnableHighDpiScaling has to be set before creating a QApplication
+	QApplication::setAttribute(use_high_dpi ? Qt::AA_EnableHighDpiScaling : Qt::AA_DisableHighDpiScaling);
+
+	if (use_high_dpi)
+	{
+		// Set QT_SCALE_FACTOR_ROUNDING_POLICY from environment. Defaults to cli argument, which defaults to PassThrough.
+		Qt::HighDpiScaleFactorRoundingPolicy rounding_val = Qt::HighDpiScaleFactorRoundingPolicy::PassThrough;
+		const QMetaEnum meta_enum = QMetaEnum::fromType<Qt::HighDpiScaleFactorRoundingPolicy>();
+		QString rounding_str_cli = meta_enum.valueToKey(static_cast<int>(rounding_val));
+
+		const auto check_dpi_rounding_arg = [&rounding_str_cli, &rounding_val, &meta_enum](const char* val) -> bool
+		{
+			// Try to find out if the argument is a valid string representation of Qt::HighDpiScaleFactorRoundingPolicy
+			bool ok{false};
+			if (const int enum_index = meta_enum.keyToValue(val, &ok); ok)
+			{
+				rounding_str_cli = meta_enum.valueToKey(enum_index);
+				rounding_val = static_cast<Qt::HighDpiScaleFactorRoundingPolicy>(enum_index);
+			}
+			return ok;
+		};
+
+		if (const int i_rounding = find_arg(arg_rounding, argc, argv); i_rounding != -1)
+		{
+			if (const int i_rounding_2 = i_rounding + 1; argc > i_rounding_2)
+			{
+				if (const auto arg_val = argv[i_rounding_2]; !check_dpi_rounding_arg(arg_val))
+				{
+					const std::string msg = fmt::format("The command line value %s for %s is not allowed. Please use a valid value for Qt::HighDpiScaleFactorRoundingPolicy.", arg_val, arg_rounding);
+					sys_log.error("%s", msg); // Don't exit with fatal error. The resulting dialog might be unreadable with dpi problems.
+					std::cerr << msg << std::endl;
+				}
+			}
+		}
+
+		// Get the environment variable. Fallback to cli argument.
+		rounding_str_cli = qEnvironmentVariable("QT_SCALE_FACTOR_ROUNDING_POLICY", rounding_str_cli);
+
+		if (!check_dpi_rounding_arg(rounding_str_cli.toStdString().c_str()))
+		{
+			const std::string msg = fmt::format("The value %s for the environment variable QT_SCALE_FACTOR_ROUNDING_POLICY is not allowed. Please use a valid value for Qt::HighDpiScaleFactorRoundingPolicy.", rounding_str_cli.toStdString());
+			sys_log.error("%s", msg); // Don't exit with fatal error. The resulting dialog might be unreadable with dpi problems.
+			std::cerr << msg << std::endl;
+		}
+
+		QApplication::setHighDpiScaleFactorRoundingPolicy(rounding_val);
+	}
+
+	return new gui_application(argc, argv);
+}
+
+void log_q_debug(QtMsgType type, const QMessageLogContext& context, const QString& msg)
+{
+	Q_UNUSED(context)
+
+	switch (type)
+	{
+	case QtDebugMsg: q_debug.trace("%s", msg.toStdString()); break;
+	case QtInfoMsg: q_debug.notice("%s", msg.toStdString()); break;
+	case QtWarningMsg: q_debug.warning("%s", msg.toStdString()); break;
+	case QtCriticalMsg: q_debug.error("%s", msg.toStdString()); break;
+	case QtFatalMsg: q_debug.fatal("%s", msg.toStdString()); break;
+	}
+}
+
+
 
 int main(int argc, char** argv)
 {
-	const int exit_code = run_rpcs3(argc, argv);
-	sys_log.notice("RPCS3 terminated with exit code %d", exit_code);
-	return exit_code;
+#ifdef _WIN32
+	ULONG64 intro_cycles{};
+	QueryThreadCycleTime(GetCurrentThread(), &intro_cycles);
+#elif defined(RUSAGE_THREAD)
+	struct ::rusage intro_stats{};
+	::getrusage(RUSAGE_THREAD, &intro_stats);
+	const u64 intro_time = (intro_stats.ru_utime.tv_sec + intro_stats.ru_stime.tv_sec) * 1000000000ull + (intro_stats.ru_utime.tv_usec + intro_stats.ru_stime.tv_usec) * 1000ull;
+#endif
+
+	s_argv0 = argv[0]; // Save for report_fatal_error
+
+	// Only run RPCS3 to display an error
+	if (int err_pos = find_arg(arg_error, argc, argv); err_pos != -1)
+	{
+		// Reconstruction of the error from multiple args
+		std::string error;
+		for (int i = err_pos + 1; i < argc; i++)
+		{
+			if (i > err_pos + 1)
+				error += ' ';
+			error += argv[i];
+		}
+
+		report_fatal_error(error);
+	}
+
+	const std::string lock_name = fs::get_cache_dir() + "RPCS3.buf";
+
+	static fs::file instance_lock;
+
+	// True if an argument --updating found
+	const bool is_updating = find_arg(arg_updating, argc, argv) != -1;
+
+	// Keep trying to lock the file for ~2s normally, and for ~10s in the case of --updating
+	for (u32 num = 0; num < (is_updating ? 500u : 100u) && !instance_lock.open(lock_name, fs::rewrite + fs::lock); num++)
+	{
+		std::this_thread::sleep_for(20ms);
+	}
+
+	if (!instance_lock)
+	{
+		if (fs::g_tls_error == fs::error::acces)
+		{
+			if (fs::exists(lock_name))
+			{
+				report_fatal_error("Another instance of RPCS3 is running. Close it or kill its process, if necessary.");
+			}
+
+			report_fatal_error("Cannot create RPCS3.log (access denied)."
+#ifdef _WIN32
+				"\nNote that RPCS3 cannot be installed in Program Files or similar directories with limited permissions."
+#else
+				"\nPlease, check RPCS3 permissions in '~/.config/rpcs3'."
+#endif
+			);
+		}
+
+		report_fatal_error(fmt::format("Cannot create RPCS3.log (error %s)", fs::g_tls_error));
+	}
+
+#ifdef _WIN32
+	if (!SetProcessWorkingSetSize(GetCurrentProcess(), 0x80000000, 0xC0000000)) // 2-3 GiB
+	{
+		report_fatal_error("Not enough memory for RPCS3 process.");
+	}
+#endif
+
+	ensure(thread_ctrl::is_main(), "Not main thread");
+
+	// Initialize TSC freq (in case it isn't)
+	static_cast<void>(utils::get_tsc_freq());
+
+	// Initialize thread pool finalizer (on first use)
+	static_cast<void>(named_thread("", [](int) {}));
+
+	static std::unique_ptr<logs::listener> log_file;
+	{
+		// Check free space
+		fs::device_stat stats{};
+		if (!fs::statfs(fs::get_cache_dir(), stats) || stats.avail_free < 128 * 1024 * 1024)
+		{
+			report_fatal_error(fmt::format("Not enough free space (%f KB)", stats.avail_free / 1000000.));
+		}
+
+		// Limit log size to ~25% of free space
+		log_file = logs::make_file_listener(fs::get_cache_dir() + "RPCS3.log", stats.avail_free / 4);
+	}
+
+	static std::unique_ptr<logs::listener> fatal_listener = std::make_unique<fatal_error_listener>();
+	logs::listener::add(fatal_listener.get());
+
+	{
+		// Write RPCS3 version
+		logs::stored_message ver{sys_log.always()};
+		ver.text  = fmt::format("RPCS3 v%s | %s", rpcs3::get_version().to_string(), rpcs3::get_branch());
+
+		// Write System information
+		logs::stored_message sys{sys_log.always()};
+		sys.text  = utils::get_system_info();
+
+		// Write OS version
+		logs::stored_message os{sys_log.always()};
+		os.text  = utils::get_OS_version();
+
+		// Write Qt version
+		logs::stored_message qt{(strcmp(QT_VERSION_STR, qVersion()) != 0) ? sys_log.error : sys_log.notice};
+		qt.text  = fmt::format("Qt version: Compiled against Qt %s | Run-time uses Qt %s", QT_VERSION_STR, qVersion());
+
+		logs::set_init({std::move(ver), std::move(sys), std::move(os), std::move(qt)});
+	}
+
+#ifdef _WIN32
+	sys_log.notice("Initialization times before main(): %fGc", intro_cycles / 1000000000.);
+#elif defined(RUSAGE_THREAD)
+	sys_log.notice("Initialization times before main(): %fs", intro_time / 1000000000.);
+#endif
+
+	std::string argument_str;
+	for (int i = 0; i < argc; i++)
+	{
+		argument_str += "'" + std::string(argv[i]) + "'";
+		if (i != argc - 1) argument_str += " ";
+	}
+	sys_log.notice("argc: %d, argv: %s", argc, argument_str);
+
+#ifdef __linux__
+	struct ::rlimit rlim;
+	rlim.rlim_cur = 4096;
+	rlim.rlim_max = 4096;
+#ifdef RLIMIT_NOFILE
+	if (::setrlimit(RLIMIT_NOFILE, &rlim) != 0)
+		std::cerr << "Failed to set max open file limit (4096).\n";
+#endif
+
+	rlim.rlim_cur = 0x80000000;
+	rlim.rlim_max = 0x80000000;
+#ifdef RLIMIT_MEMLOCK
+	if (::setrlimit(RLIMIT_MEMLOCK, &rlim) != 0)
+		std::cerr << "Failed to set RLIMIT_MEMLOCK size to 2 GiB. Try to update your system configuration.\n";
+#endif
+	// Work around crash on startup on KDE: https://bugs.kde.org/show_bug.cgi?id=401637
+	setenv( "KDE_DEBUG", "1", 0 );
+#endif
+
+	std::lock_guard qt_init(s_qt_init);
+
+	// The constructor of QApplication eats the --style and --stylesheet arguments.
+	// By checking for stylesheet().isEmpty() we could implicitly know if a stylesheet was passed,
+	// but I haven't found an implicit way to check for style yet, so we naively check them both here for now.
+	const bool use_cli_style = find_arg(arg_style, argc, argv) != -1 || find_arg(arg_stylesheet, argc, argv) != -1;
+
+	QScopedPointer<QCoreApplication> app(createApplication(argc, argv));
+	app->setApplicationVersion(QString::fromStdString(rpcs3::get_version().to_string()));
+	app->setApplicationName("RPCS3");
+
+	// Command line args
+	static QCommandLineParser parser;
+	parser.setApplicationDescription("Welcome to RPCS3 command line.");
+	parser.addPositionalArgument("(S)ELF", "Path for directly executing a (S)ELF");
+	parser.addPositionalArgument("[Args...]", "Optional args for the executable");
+
+	const QCommandLineOption help_option    = parser.addHelpOption();
+	const QCommandLineOption version_option = parser.addVersionOption();
+	parser.addOption(QCommandLineOption(arg_headless, "Run RPCS3 in headless mode."));
+	parser.addOption(QCommandLineOption(arg_no_gui, "Run RPCS3 without its GUI."));
+	parser.addOption(QCommandLineOption(arg_high_dpi, "Enables Qt High Dpi Scaling.", "enabled", "1"));
+	parser.addOption(QCommandLineOption(arg_rounding, "Sets the Qt::HighDpiScaleFactorRoundingPolicy for values like 150% zoom.", "rounding", "4"));
+	parser.addOption(QCommandLineOption(arg_styles, "Lists the available styles."));
+	parser.addOption(QCommandLineOption(arg_style, "Loads a custom style.", "style", ""));
+	parser.addOption(QCommandLineOption(arg_stylesheet, "Loads a custom stylesheet.", "path", ""));
+	const QCommandLineOption config_option(arg_config, "Forces the emulator to use this configuration file.", "path", "");
+	parser.addOption(config_option);
+	const QCommandLineOption installfw_option(arg_installfw, "Forces the emulator to install this firmware file.", "path", "");
+	parser.addOption(installfw_option);
+	const QCommandLineOption installpkg_option(arg_installpkg, "Forces the emulator to install this pkg file.", "path", "");
+	parser.addOption(installpkg_option);
+	const QCommandLineOption user_id_option(arg_user_id, "Start RPCS3 as this user.", "user id", "");
+	parser.addOption(user_id_option);
+	parser.addOption(QCommandLineOption(arg_q_debug, "Log qDebug to RPCS3.log."));
+	parser.addOption(QCommandLineOption(arg_error, "For internal usage."));
+	parser.addOption(QCommandLineOption(arg_updating, "For internal usage."));
+	parser.addOption(QCommandLineOption(arg_commit_db, "Update commits.lst cache. Optional arguments: <path> <sha>"));
+	parser.process(app->arguments());
+
+	// Don't start up the full rpcs3 gui if we just want the version or help.
+	if (parser.isSet(version_option) || parser.isSet(help_option))
+		return 0;
+
+	if (parser.isSet(arg_commit_db))
+	{
+#ifdef _WIN32
+		if (AttachConsole(ATTACH_PARENT_PROCESS) || AllocConsole())
+		{
+			[[maybe_unused]] const auto con_out = freopen("CONOUT$", "w", stdout);
+			[[maybe_unused]] const auto con_err = freopen("CONOUT$", "w", stderr);
+		}
+
+		std::string path;
+#else
+		std::string path = "bin/git/commits.lst";
+#endif
+		std::string from_sha;
+
+		if (const int i_arg_commit_db = find_arg(arg_commit_db, argc, argv); i_arg_commit_db != -1)
+		{
+			if (int i = i_arg_commit_db + 1; argc > i)
+			{
+				path = argv[i++];
+
+				if (argc > i)
+				{
+					from_sha = argv[i];
+				}
+			}
+#ifdef _WIN32
+			else
+			{
+				fprintf(stderr, "Missing path argument.\n");
+				return 1;
+			}
+#endif
+		}
+		else
+		{
+			fprintf(stderr, "Can not find argument --%s\n", arg_commit_db);
+			return 1;
+		}
+
+		fs::file file(path, fs::read + fs::write + fs::append + fs::create);
+
+		if (!file)
+		{
+			fprintf(stderr, "Failed to open file: '%s' (errno=%d)\n", path.c_str(), errno);
+			return 1;
+		}
+
+		fprintf(stdout, "\nAppending commits to '%s' ...\n", path.c_str());
+
+		// Get existing list
+		std::string data = file.to_string();
+		std::vector<std::string> list = fmt::split(data, {"\n"});
+
+		const bool was_empty = data.empty();
+
+		// SHA to start
+		std::string last;
+
+		if (!list.empty())
+		{
+			// Decode last entry to check last written commit
+			QByteArray buf(list.back().c_str(), list.back().size());
+			QJsonDocument doc = QJsonDocument::fromJson(buf);
+
+			if (doc.isObject() && doc["sha"].isString())
+			{
+				last = doc["sha"].toString().toStdString();
+			}
+		}
+
+		list.clear();
+
+		// JSON buffer
+		QByteArray buf;
+
+		// CURL handle to work with GitHub API
+		curl_handle curl;
+
+		struct curl_slist* hhdr{};
+		hhdr = curl_slist_append(hhdr, "Accept: application/vnd.github.v3+json");
+		hhdr = curl_slist_append(hhdr, "User-Agent: curl/7.37.0");
+
+		CURLcode err = curl_easy_setopt(curl, CURLOPT_HTTPHEADER, hhdr);
+		if (err != CURLE_OK) fprintf(stderr, "curl_easy_setopt(CURLOPT_HTTPHEADER) error: %s", curl_easy_strerror(err));
+
+		err = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, +[](const char* ptr, usz, usz size, void* json) -> usz
+		{
+			static_cast<QByteArray*>(json)->append(ptr, size);
+			return size;
+		});
+		if (err != CURLE_OK) fprintf(stderr, "curl_easy_setopt(CURLOPT_WRITEFUNCTION) error: %s", curl_easy_strerror(err));
+
+		err = curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buf);
+		if (err != CURLE_OK) fprintf(stderr, "curl_easy_setopt(CURLOPT_WRITEDATA) error: %s", curl_easy_strerror(err));
+
+		u32 page = 1;
+		constexpr u32 per_page = 100;
+
+		while (page <= 55)
+		{
+			fprintf(stdout, "Fetching page %d ...\n", page);
+
+			std::string url = "https://api.github.com/repos/RPCS3/rpcs3/commits?per_page=";
+			fmt::append(url, "%u&page=%u", per_page, page++);
+			if (!from_sha.empty())
+				fmt::append(url, "&sha=%s", from_sha);
+
+			err = curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+			if (err != CURLE_OK)
+			{
+				fprintf(stderr, "curl_easy_setopt(CURLOPT_URL, %s) error: %s", url.c_str(), curl_easy_strerror(err));
+				break;
+			}
+
+			err = curl_easy_perform(curl);
+			if (err != CURLE_OK)
+			{
+				fprintf(stderr, "Curl error:\n%s", curl_easy_strerror(err));
+				break;
+			}
+
+			QJsonDocument info = QJsonDocument::fromJson(buf);
+
+			if (!info.isArray()) [[unlikely]]
+			{
+				fprintf(stderr, "Bad response:\n%s", buf.data());
+				break;
+			}
+
+			u32 count = 0;
+
+			for (auto&& ref : info.array())
+			{
+				if (!ref.isObject())
+				{
+					page = -1;
+					break;
+				}
+
+				count++;
+
+				QJsonObject result, author, committer;
+				QJsonObject commit = ref.toObject();
+
+				auto commit_ = commit["commit"].toObject();
+				auto author_ = commit_["author"].toObject();
+				auto committer_ = commit_["committer"].toObject();
+				auto _author = commit["author"].toObject();
+				auto _committer = commit["committer"].toObject();
+
+				result["sha"] = commit["sha"];
+				result["msg"] = commit_["message"];
+
+				author["name"] = author_["name"];
+				author["date"] = author_["date"];
+				author["email"] = author_["email"];
+				author["login"] = _author["login"];
+				author["avatar"] = _author["avatar_url"];
+
+				committer["name"] = committer_["name"];
+				committer["date"] = committer_["date"];
+				committer["email"] = committer_["email"];
+				committer["login"] = _committer["login"];
+				committer["avatar"] = _committer["avatar_url"];
+
+				result["author"] = author;
+				result["committer"] = committer;
+
+				QJsonDocument out(result);
+				buf = out.toJson(QJsonDocument::JsonFormat::Compact);
+				buf += "\n";
+
+				if (was_empty || !from_sha.empty())
+				{
+					data = buf.toStdString() + std::move(data);
+				}
+				else if (commit["sha"].toString().toStdString() == last)
+				{
+					page = -1;
+					break;
+				}
+				else
+				{
+					// Append to the list
+					list.emplace_back(buf.data(), buf.size());
+				}
+			}
+
+			buf.clear();
+
+			if (count < per_page)
+			{
+				break;
+			}
+		}
+
+		if (was_empty || !from_sha.empty())
+		{
+			file.trunc(0);
+			file.write(data);
+		}
+		else
+		{
+			// Append list in reverse order
+			for (usz i = list.size() - 1; ~i; --i)
+			{
+				file.write(list[i]);
+			}
+		}
+
+		curl_slist_free_all(hhdr);
+
+		fprintf(stdout, "Finished fetching commits: %s\n", path.c_str());
+		return 0;
+	}
+
+	if (parser.isSet(arg_q_debug))
+	{
+		qInstallMessageHandler(log_q_debug);
+	}
+
+	if (parser.isSet(arg_styles))
+	{
+#ifdef _WIN32
+		if (AttachConsole(ATTACH_PARENT_PROCESS) || AllocConsole())
+			[[maybe_unused]] const auto con_out = freopen("CONOUT$", "w", stdout);
+#endif
+		for (const auto& style : QStyleFactory::keys())
+			std::cout << "\n" << style.toStdString();
+
+		return 0;
+	}
+
+	std::string active_user;
+
+	if (parser.isSet(arg_user_id))
+	{
+		active_user = parser.value(arg_user_id).toStdString();
+
+		if (rpcs3::utils::check_user(active_user) == 0)
+		{
+			report_fatal_error(fmt::format("Failed to set user ID '%s'.\nThe user ID must consist of 8 digits and cannot be 00000000.", active_user));
+		}
+	}
+
+	s_no_gui = parser.isSet(arg_no_gui);
+
+	if (auto gui_app = qobject_cast<gui_application*>(app.data()))
+	{
+		gui_app->setAttribute(Qt::AA_UseHighDpiPixmaps);
+		gui_app->setAttribute(Qt::AA_DisableWindowContextHelpButton);
+		gui_app->setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);
+
+		gui_app->SetShowGui(!s_no_gui);
+		gui_app->SetUseCliStyle(use_cli_style);
+		gui_app->SetWithCliBoot(parser.isSet(arg_installfw) || parser.isSet(arg_installpkg) || !parser.positionalArguments().isEmpty());
+		gui_app->SetActiveUser(active_user);
+
+		if (!gui_app->Init())
+		{
+			Emu.Quit(true);
+			return 0;
+		}
+	}
+	else if (auto headless_app = qobject_cast<headless_application*>(app.data()))
+	{
+		s_headless = true;
+
+		headless_app->SetActiveUser(active_user);
+
+		if (!headless_app->Init())
+		{
+			Emu.Quit(true);
+			return 0;
+		}
+	}
+	else
+	{
+		// Should be unreachable
+		report_fatal_error("RPCS3 initialization failed!");
+	}
+
+#ifdef _WIN32
+	// Create dummy permanent low resolution timer to workaround messing with system timer resolution
+	QTimer* dummy_timer = new QTimer(app.data());
+	dummy_timer->start(13);
+
+	// Set 0.5 msec timer resolution for best performance
+	// - As QT5 timers (QTimer) sets the timer resolution to 1 msec, override it here.
+	ULONG min_res, max_res, orig_res, new_res;
+	if (NtQueryTimerResolution(&min_res, &max_res, &orig_res) == 0)
+	{
+		NtSetTimerResolution(max_res, TRUE, &new_res);
+	}
+#endif
+
+	if (parser.isSet(arg_config))
+	{
+		const std::string config_override_path = parser.value(config_option).toStdString();
+
+		if (!fs::is_file(config_override_path))
+		{
+			report_fatal_error(fmt::format("No config file found: %s", config_override_path));
+		}
+
+		Emu.SetConfigOverride(config_override_path);
+	}
+
+	// Force install firmware or pkg first if specified through command-line
+	if (parser.isSet(arg_installfw) || parser.isSet(arg_installpkg))
+	{
+		if (auto gui_app = qobject_cast<gui_application*>(app.data()))
+		{
+			if (s_no_gui)
+			{
+				report_fatal_error("Cannot perform installation in no-gui mode!");
+			}
+
+			if (gui_app->m_main_window)
+			{
+				if (parser.isSet(arg_installfw) && parser.isSet(arg_installpkg))
+				{
+					QMessageBox::warning(gui_app->m_main_window, QObject::tr("Invalid command-line arguments!"), QObject::tr("Cannot perform multiple installations at the same time!"));
+				}
+				else if (parser.isSet(arg_installfw))
+				{
+					gui_app->m_main_window->InstallPup(parser.value(installfw_option));
+				}
+				else
+				{
+					gui_app->m_main_window->InstallPackages({parser.value(installpkg_option)});
+				}
+			}
+			else
+			{
+				report_fatal_error("Cannot perform installation. No main window found!");
+			}
+		}
+		else
+		{
+			report_fatal_error("Cannot perform installation in headless mode!");
+		}
+	}
+
+	for (const auto& opt : parser.optionNames())
+	{
+		sys_log.notice("Option passed via command line: %s %s", opt.toStdString(), parser.value(opt).toStdString());
+	}
+
+	if (const QStringList args = parser.positionalArguments(); !args.isEmpty() && !is_updating && !parser.isSet(arg_installfw) && !parser.isSet(arg_installpkg))
+	{
+		sys_log.notice("Booting application from command line: %s", args.at(0).toStdString());
+
+		// Propagate command line arguments
+		std::vector<std::string> rpcs3_argv;
+
+		if (args.length() > 1)
+		{
+			rpcs3_argv.emplace_back();
+
+			for (int i = 1; i < args.length(); i++)
+			{
+				const std::string arg = args[i].toStdString();
+				rpcs3_argv.emplace_back(arg);
+				sys_log.notice("Optional command line argument %d: %s", i, arg);
+			}
+		}
+
+		// Postpone startup to main event loop
+		Emu.CallAfter([path = sstr(QFileInfo(args.at(0)).absoluteFilePath()), rpcs3_argv = std::move(rpcs3_argv)]() mutable
+		{
+			Emu.argv = std::move(rpcs3_argv);
+			Emu.SetForceBoot(true);
+
+			if (const game_boot_result error = Emu.BootGame(path, ""); error != game_boot_result::no_errors)
+			{
+				sys_log.error("Booting '%s' with cli argument failed: reason: %s", path, error);
+
+				if (s_headless || s_no_gui)
+				{
+					report_fatal_error(fmt::format("Booting '%s' failed!\n\nReason: %s", path, error));
+				}
+			}
+		});
+	}
+
+	// run event loop (maybe only needed for the gui application)
+	return app->exec();
 }
+
+// Temporarily, this is code from std for prebuilt LLVM. I don't understand why this is necessary.
+// From the same MSVC 19.27.29112.0, LLVM libs depend on these, but RPCS3 gets linker errors.
+#ifdef _WIN32
+extern "C"
+{
+	int __stdcall __std_init_once_begin_initialize(void** ppinit, ulong f, int* fp, void** lpc) noexcept
+	{
+		return InitOnceBeginInitialize(reinterpret_cast<LPINIT_ONCE>(ppinit), f, fp, lpc);
+	}
+
+	int __stdcall __std_init_once_complete(void** ppinit, ulong f, void* lpc) noexcept
+	{
+		return InitOnceComplete(reinterpret_cast<LPINIT_ONCE>(ppinit), f, lpc);
+	}
+
+	usz __stdcall __std_get_string_size_without_trailing_whitespace(const char* str, usz size) noexcept
+	{
+		while (size)
+		{
+			switch (str[size - 1])
+			{
+			case 0:
+			case ' ':
+			case '\n':
+			case '\r':
+			case '\t':
+			{
+				size--;
+				continue;
+			}
+			default: break;
+			}
+
+			break;
+		}
+
+		return size;
+	}
+
+	usz __stdcall __std_system_error_allocate_message(const unsigned long msg_id, char** ptr_str) noexcept
+	{
+		return __std_get_string_size_without_trailing_whitespace(*ptr_str, FormatMessageA(
+			FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+			nullptr, msg_id, 0, reinterpret_cast<char*>(ptr_str), 0, nullptr));
+	}
+
+	void __stdcall __std_system_error_deallocate_message(char* s) noexcept
+	{
+		LocalFree(s);
+	}
+}
+#endif
diff --git a/rpcs3/main_application.cpp b/rpcs3/main_application.cpp
index 65a8117b7f..f491709a7f 100644
--- a/rpcs3/main_application.cpp
+++ b/rpcs3/main_application.cpp
@@ -1,17 +1,12 @@
-#include "stdafx.h"
 #include "main_application.h"
-#include "display_sleep_control.h"
 
 #include "util/types.hpp"
 #include "util/logs.hpp"
 #include "util/sysinfo.hpp"
 
-#include "Utilities/Thread.h"
-#include "Utilities/File.h"
 #include "Input/pad_thread.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"
-#include "Emu/system_utils.hpp"
 #include "Emu/IdManager.h"
 #include "Emu/Io/Null/NullKeyboardHandler.h"
 #include "Emu/Io/Null/NullMouseHandler.h"
@@ -19,43 +14,25 @@
 #include "Emu/Io/MouseHandler.h"
 #include "Input/basic_keyboard_handler.h"
 #include "Input/basic_mouse_handler.h"
-#include "Input/raw_mouse_handler.h"
 
 #include "Emu/Audio/AudioBackend.h"
 #include "Emu/Audio/Null/NullAudioBackend.h"
-#include "Emu/Audio/Null/null_enumerator.h"
-#include "Emu/Audio/Cubeb/CubebBackend.h"
-#include "Emu/Audio/Cubeb/cubeb_enumerator.h"
+#include "Emu/Audio/AL/OpenALBackend.h"
 #ifdef _WIN32
 #include "Emu/Audio/XAudio2/XAudio2Backend.h"
-#include "Emu/Audio/XAudio2/xaudio2_enumerator.h"
+#endif
+#ifdef HAVE_ALSA
+#include "Emu/Audio/ALSA/ALSABackend.h"
+#endif
+#ifdef HAVE_PULSE
+#include "Emu/Audio/Pulse/PulseBackend.h"
 #endif
 #ifdef HAVE_FAUDIO
 #include "Emu/Audio/FAudio/FAudioBackend.h"
-#include "Emu/Audio/FAudio/faudio_enumerator.h"
 #endif
 
-#include <QFileInfo> // This shouldn't be outside rpcs3qt...
-#include <QImageReader> // This shouldn't be outside rpcs3qt...
-#include <QStandardPaths> // This shouldn't be outside rpcs3qt...
-#include <thread>
-
 LOG_CHANNEL(sys_log, "SYS");
 
-namespace audio
-{
-	extern void configure_audio(bool force_reset = false);
-	extern void configure_rsxaudio();
-}
-
-namespace rsx::overlays
-{
-	extern void reset_performance_overlay();
-	extern void reset_debug_overlay();
-}
-
-extern void qt_events_aware_op(int repeat_duration_ms, std::function<bool()> wrapped_op);
-
 /** Emu.Init() wrapper for user management */
 void main_application::InitializeEmulator(const std::string& user, bool show_gui)
 {
@@ -69,48 +46,10 @@ void main_application::InitializeEmulator(const std::string& user, bool show_gui
 	sys_log.always()("%s", firmware_string);
 }
 
-void main_application::OnEmuSettingsChange()
-{
-	if (Emu.IsRunning())
-	{
-		enable_display_sleep(!g_cfg.misc.prevent_display_sleep);
-	}
-
-	if (!Emu.IsStopped())
-	{
-		// Change logging (only allowed during gameplay)
-		rpcs3::utils::configure_logs();
-
-		// Force audio provider
-		g_cfg.audio.provider.set(Emu.IsVsh() ? audio_provider::rsxaudio : audio_provider::cell_audio);
-	}
-
-	audio::configure_audio();
-	audio::configure_rsxaudio();
-	rsx::overlays::reset_performance_overlay();
-	rsx::overlays::reset_debug_overlay();
-}
-
 /** RPCS3 emulator has functions it desires to call from the GUI at times. Initialize them in here. */
 EmuCallbacks main_application::CreateCallbacks()
 {
-	EmuCallbacks callbacks{};
-
-	callbacks.update_emu_settings = [this]()
-	{
-		Emu.CallFromMainThread([&]()
-		{
-			OnEmuSettingsChange();
-		});
-	};
-
-	callbacks.save_emu_settings = [this]()
-	{
-		Emu.BlockingCallFromMainThread([&]()
-		{
-			Emulator::SaveSettings(g_cfg.to_string(), Emu.GetTitleID());
-		});
-	};
+	EmuCallbacks callbacks;
 
 	callbacks.init_kb_handler = [this]()
 	{
@@ -118,15 +57,14 @@ EmuCallbacks main_application::CreateCallbacks()
 		{
 		case keyboard_handler::null:
 		{
-			ensure(g_fxo->init<KeyboardHandlerBase, NullKeyboardHandler>(Emu.DeserialManager()));
+			g_fxo->init<KeyboardHandlerBase, NullKeyboardHandler>();
 			break;
 		}
 		case keyboard_handler::basic:
 		{
-			basic_keyboard_handler* ret = g_fxo->init<KeyboardHandlerBase, basic_keyboard_handler>(Emu.DeserialManager());
-			ensure(ret);
+			basic_keyboard_handler* ret = g_fxo->init<KeyboardHandlerBase, basic_keyboard_handler>();
 			ret->moveToThread(get_thread());
-			ret->SetTargetWindow(reinterpret_cast<QWindow*>(m_game_window));
+			ret->SetTargetWindow(m_game_window);
 			break;
 		}
 		}
@@ -134,41 +72,26 @@ EmuCallbacks main_application::CreateCallbacks()
 
 	callbacks.init_mouse_handler = [this]()
 	{
-		mouse_handler handler = g_cfg.io.mouse;
-
-		if (handler == mouse_handler::null)
-		{
-			switch (g_cfg.io.move)
-			{
-			case move_handler::mouse:
-				handler = mouse_handler::basic;
-				break;
-			case move_handler::raw_mouse:
-				handler = mouse_handler::raw;
-				break;
-			default:
-				break;
-			}
-		}
-
-		switch (handler)
+		switch (g_cfg.io.mouse.get())
 		{
 		case mouse_handler::null:
 		{
-			ensure(g_fxo->init<MouseHandlerBase, NullMouseHandler>(Emu.DeserialManager()));
+			if (g_cfg.io.move == move_handler::mouse)
+			{
+				basic_mouse_handler* ret = g_fxo->init<MouseHandlerBase, basic_mouse_handler>();
+				ret->moveToThread(get_thread());
+				ret->SetTargetWindow(m_game_window);
+			}
+			else
+				g_fxo->init<MouseHandlerBase, NullMouseHandler>();
+
 			break;
 		}
 		case mouse_handler::basic:
 		{
-			basic_mouse_handler* ret = g_fxo->init<MouseHandlerBase, basic_mouse_handler>(Emu.DeserialManager());
-			ensure(ret);
+			basic_mouse_handler* ret = g_fxo->init<MouseHandlerBase, basic_mouse_handler>();
 			ret->moveToThread(get_thread());
-			ret->SetTargetWindow(reinterpret_cast<QWindow*>(m_game_window));
-			break;
-		}
-		case mouse_handler::raw:
-		{
-			ensure(g_fxo->init<MouseHandlerBase, raw_mouse_handler>(Emu.DeserialManager()));
+			ret->SetTargetWindow(m_game_window);
 			break;
 		}
 		}
@@ -176,9 +99,7 @@ EmuCallbacks main_application::CreateCallbacks()
 
 	callbacks.init_pad_handler = [this](std::string_view title_id)
 	{
-		ensure(g_fxo->init<named_thread<pad_thread>>(get_thread(), m_game_window, title_id));
-
-		qt_events_aware_op(0, [](){ return !!pad::g_started; });
+		g_fxo->init<pad_thread>(get_thread(), m_game_window, title_id);
 	};
 
 	callbacks.get_audio = []() -> std::shared_ptr<AudioBackend>
@@ -190,7 +111,14 @@ EmuCallbacks main_application::CreateCallbacks()
 #ifdef _WIN32
 		case audio_renderer::xaudio: result = std::make_shared<XAudio2Backend>(); break;
 #endif
-		case audio_renderer::cubeb: result = std::make_shared<CubebBackend>(); break;
+#ifdef HAVE_ALSA
+		case audio_renderer::alsa: result = std::make_shared<ALSABackend>(); break;
+#endif
+#ifdef HAVE_PULSE
+		case audio_renderer::pulse: result = std::make_shared<PulseBackend>(); break;
+#endif
+
+		case audio_renderer::openal: result = std::make_shared<OpenALBackend>(); break;
 #ifdef HAVE_FAUDIO
 		case audio_renderer::faudio: result = std::make_shared<FAudioBackend>(); break;
 #endif
@@ -199,180 +127,11 @@ EmuCallbacks main_application::CreateCallbacks()
 		if (!result->Initialized())
 		{
 			// Fall back to a null backend if something went wrong
-			sys_log.error("Audio renderer %s could not be initialized, using a Null renderer instead. Make sure that no other application is running that might block audio access (e.g. Netflix).", result->GetName());
+			sys_log.error("Audio renderer %s could not be initialized, using a Null renderer instead", result->GetName());
 			result = std::make_shared<NullAudioBackend>();
 		}
 		return result;
 	};
 
-	callbacks.get_audio_enumerator = [](u64 renderer) -> std::shared_ptr<audio_device_enumerator>
-	{
-		switch (static_cast<audio_renderer>(renderer))
-		{
-		case audio_renderer::null: return std::make_shared<null_enumerator>();
-#ifdef _WIN32
-		case audio_renderer::xaudio: return std::make_shared<xaudio2_enumerator>();
-#endif
-		case audio_renderer::cubeb: return std::make_shared<cubeb_enumerator>();
-#ifdef HAVE_FAUDIO
-		case audio_renderer::faudio: return std::make_shared<faudio_enumerator>();
-#endif
-		default: fmt::throw_exception("Invalid renderer index %u", renderer);
-		}
-	};
-
-	callbacks.get_image_info = [](const std::string& filename, std::string& sub_type, s32& width, s32& height, s32& orientation) -> bool
-	{
-		sub_type.clear();
-		width = 0;
-		height = 0;
-		orientation = 0; // CELL_SEARCH_ORIENTATION_UNKNOWN
-
-		bool success = false;
-		Emu.BlockingCallFromMainThread([&]()
-		{
-			const QImageReader reader(QString::fromStdString(filename));
-			if (reader.canRead())
-			{
-				const QSize size = reader.size();
-				width = size.width();
-				height = size.height();
-				sub_type = reader.subType().toStdString();
-
-				switch (reader.transformation())
-				{
-				case QImageIOHandler::Transformation::TransformationNone:
-					orientation = 1; // CELL_SEARCH_ORIENTATION_TOP_LEFT = 0°
-					break;
-				case QImageIOHandler::Transformation::TransformationRotate90:
-					orientation = 2; // CELL_SEARCH_ORIENTATION_TOP_RIGHT = 90°
-					break;
-				case QImageIOHandler::Transformation::TransformationRotate180:
-					orientation = 3; // CELL_SEARCH_ORIENTATION_BOTTOM_RIGHT = 180°
-					break;
-				case QImageIOHandler::Transformation::TransformationRotate270:
-					orientation = 4; // CELL_SEARCH_ORIENTATION_BOTTOM_LEFT = 270°
-					break;
-				default:
-					// Ignore other transformations for now
-					break;
-				}
-
-				success = true;
-				sys_log.notice("get_image_info found image: filename='%s', sub_type='%s', width=%d, height=%d, orientation=%d", filename, sub_type, width, height, orientation);
-			}
-			else
-			{
-				sys_log.error("get_image_info failed to read '%s'. Error='%s'", filename, reader.errorString());
-			}
-		});
-		return success;
-	};
-
-	callbacks.get_scaled_image = [](const std::string& path, s32 target_width, s32 target_height, s32& width, s32& height, u8* dst, bool force_fit) -> bool
-	{
-		width = 0;
-		height = 0;
-
-		if (target_width <= 0 || target_height <= 0 || !dst || !fs::is_file(path))
-		{
-			return false;
-		}
-
-		bool success = false;
-		Emu.BlockingCallFromMainThread([&]()
-		{
-			// We use QImageReader instead of QImage. This way we can load and scale image in one step.
-			QImageReader reader(QString::fromStdString(path));
-
-			if (reader.canRead())
-			{
-				QSize size = reader.size();
-				width = size.width();
-				height = size.height();
-
-				if (width <= 0 || height <= 0)
-				{
-					return;
-				}
-
-				if (force_fit || width > target_width || height > target_height)
-				{
-					const f32 target_ratio = target_width / static_cast<f32>(target_height);
-					const f32 image_ratio = width / static_cast<f32>(height);
-					const f32 convert_ratio = image_ratio / target_ratio;
-
-					if (convert_ratio > 1.0f)
-					{
-						size = QSize(target_width, target_height / convert_ratio);
-					}
-					else if (convert_ratio < 1.0f)
-					{
-						size = QSize(target_width * convert_ratio, target_height);
-					}
-					else
-					{
-						size = QSize(target_width, target_height);
-					}
-
-					reader.setScaledSize(size);
-					width = size.width();
-					height = size.height();
-				}
-
-				QImage image = reader.read();
-
-				if (image.format() != QImage::Format::Format_RGBA8888)
-				{
-					image = image.convertToFormat(QImage::Format::Format_RGBA8888);
-				}
-
-				std::memcpy(dst, image.constBits(), std::min(target_width * target_height * 4LL, image.height() * image.bytesPerLine()));
-				success = true;
-				sys_log.notice("get_scaled_image scaled image: path='%s', width=%d, height=%d", path, width, height);
-			}
-			else
-			{
-				sys_log.error("get_scaled_image failed to read '%s'. Error='%s'", path, reader.errorString());
-			}
-		});
-		return success;
-	};
-
-	callbacks.resolve_path = [](std::string_view sv)
-	{
-		// May result in an empty string if path does not exist
-		return QFileInfo(QString::fromUtf8(sv.data(), static_cast<int>(sv.size()))).canonicalFilePath().toStdString();
-	};
-
-	callbacks.get_font_dirs = []()
-	{
-		const QStringList locations = QStandardPaths::standardLocations(QStandardPaths::FontsLocation);
-		std::vector<std::string> font_dirs;
-		for (const QString& location : locations)
-		{
-			std::string font_dir = location.toStdString();
-			if (!font_dir.ends_with('/'))
-			{
-				font_dir += '/';
-			}
-			font_dirs.push_back(font_dir);
-		}
-		return font_dirs;
-	};
-
-	callbacks.on_install_pkgs = [](const std::vector<std::string>& pkgs)
-	{
-		for (const std::string& pkg : pkgs)
-		{
-			if (!rpcs3::utils::install_pkg(pkg))
-			{
-				sys_log.error("Failed to install %s", pkg);
-				return false;
-			}
-		}
-		return true;
-	};
-
 	return callbacks;
 }
diff --git a/rpcs3/main_application.h b/rpcs3/main_application.h
index dd0806970d..71f8e90430 100644
--- a/rpcs3/main_application.h
+++ b/rpcs3/main_application.h
@@ -1,10 +1,9 @@
 #pragma once
 
 #include <string>
-#include <QThread>
+#include <QWindow>
 
 struct EmuCallbacks;
-class gs_frame;
 
 class main_application
 {
@@ -21,10 +20,8 @@ public:
 protected:
 	virtual QThread* get_thread() = 0;
 
-	void OnEmuSettingsChange();
-
 	EmuCallbacks CreateCallbacks();
 
 	std::string m_active_user;
-	gs_frame* m_game_window = nullptr;
+	QWindow* m_game_window = nullptr; // (Currently) only needed so that pad handlers have a valid target for event filtering.
 };
diff --git a/rpcs3/module_verifier.cpp b/rpcs3/module_verifier.cpp
deleted file mode 100644
index d2d3e7011d..0000000000
--- a/rpcs3/module_verifier.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include "stdafx.h"
-#include "module_verifier.hpp"
-
-#ifdef _WIN32
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <Windows.h>
-#include <Shlwapi.h>
-
-#include <util/types.hpp>
-#include <util/logs.hpp>
-#include <Utilities/StrUtil.h>
-#include <Utilities/StrFmt.h>
-
-LOG_CHANNEL(sys_log, "SYS");
-
-[[noreturn]] void report_fatal_error(std::string_view text, bool is_html, bool include_help_text);
-
-void WIN32_module_verifier::run_module_verification()
-{
-	struct module_info_t
-	{
-		std::wstring_view name;
-		std::string_view package_name;
-		std::string_view dl_link;
-	};
-
-	const std::vector<module_info_t> special_module_infos = {
-		{ L"vulkan-1.dll", "Vulkan Runtime", "https://sdk.lunarg.com/sdk/download/latest/windows/vulkan-runtime.exe" },
-		{ L"msvcp140.dll", "Microsoft Visual C++ 2015-2022 Redistributable", "https://aka.ms/vs/17/release/VC_redist.x64.exe" },
-		{ L"vcruntime140.dll", "Microsoft Visual C++ 2015-2022 Redistributable", "https://aka.ms/vs/17/release/VC_redist.x64.exe" },
-		{ L"msvcp140_1.dll", "Microsoft Visual C++ 2015-2022 Redistributable", "https://aka.ms/vs/17/release/VC_redist.x64.exe" },
-		{ L"vcruntime140_1.dll", "Microsoft Visual C++ 2015-2022 Redistributable", "https://aka.ms/vs/17/release/VC_redist.x64.exe" }
-	};
-
-	WCHAR windir[MAX_PATH];
-	if (!GetWindowsDirectory(windir, MAX_PATH))
-	{
-		report_fatal_error(fmt::format("WIN32_module_verifier: Failed to query WindowsDirectory"), false, true);
-	}
-
-	for (const auto& module : special_module_infos)
-	{
-		const HMODULE hModule = GetModuleHandle(module.name.data());
-		if (hModule == NULL)
-		{
-			continue;
-		}
-
-		WCHAR wpath[MAX_PATH];
-		const auto len = GetModuleFileName(hModule, wpath, MAX_PATH);
-		if (!len)
-		{
-			continue;
-		}
-
-		if (::StrStrI(wpath, windir) != wpath)
-		{
-			const std::string path = wchar_to_utf8(wpath);
-			const std::string win_path = wchar_to_utf8(windir);
-			const std::string module_name = wchar_to_utf8(module.name);
-			const std::string error_message = fmt::format(
-				"<p>"
-				"The module <strong>%s</strong> was incorrectly installed at<br>"
-				"'%s'<br>"
-				"<br>"
-				"This module is part of the <strong>%s</strong> package.<br>"
-				"Install this package, then delete <strong>%s</strong> from rpcs3's installation directory.<br>"
-				"<br>"
-				"You can install this package from this URL:<br>"
-				"<a href='%s'>%s</a>"
-				"</p>",
-				module_name,
-				path,
-				module.package_name,
-				module_name,
-				module.dl_link,
-				module.dl_link
-			);
-
-			sys_log.error("Found incorrectly installed module: '%s' (path='%s', windows='%s')", module_name, path, win_path);
-
-			report_fatal_error(error_message, true, false);
-		}
-	}
-}
-
-void WIN32_module_verifier::run()
-{
-	WIN32_module_verifier verifier{};
-	verifier.run_module_verification();
-}
-
-#endif // _WIN32
diff --git a/rpcs3/module_verifier.hpp b/rpcs3/module_verifier.hpp
deleted file mode 100644
index 930288fb44..0000000000
--- a/rpcs3/module_verifier.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#ifdef _WIN32
-
-#include <util/types.hpp>
-
-// Validates that system modules are properly installed
-// Only relevant for WIN32
-class WIN32_module_verifier
-{
-	void run_module_verification();
-
-	WIN32_module_verifier() = default;
-
-public:
-	static void run();
-};
-
-#endif // _WIN32
diff --git a/rpcs3/qt/etc/qt.conf b/rpcs3/qt/etc/qt.conf
index af6127460f..8a60d8561e 100644
--- a/rpcs3/qt/etc/qt.conf
+++ b/rpcs3/qt/etc/qt.conf
@@ -1,4 +1,4 @@
 [Paths]
-Prefix = qt6/
+Prefix = qt/
 Plugins = plugins
 Translations = translations
diff --git a/rpcs3/resource.h b/rpcs3/resource.h
index 1b0fd304b4..18aedf4013 100644
--- a/rpcs3/resource.h
+++ b/rpcs3/resource.h
@@ -2,7 +2,7 @@
 #define IDI_ICON1                       101
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        102
diff --git a/rpcs3/resources.qrc b/rpcs3/resources.qrc
index ebace85372..576a7b9e55 100644
--- a/rpcs3/resources.qrc
+++ b/rpcs3/resources.qrc
@@ -5,6 +5,8 @@
         <file>Icons/restart.png</file>
         <file>Icons/stop.png</file>
         <file>rpcs3.ico</file>
+        <file>Icons/controller.png</file>
+        <file>Icons/insignia.png</file>
         <file>Icons/configure.png</file>
         <file>Icons/controllers.png</file>
         <file>Icons/fullscreen.png</file>
@@ -15,7 +17,5 @@
         <file>Icons/open.png</file>
         <file>Icons/custom_config.png</file>
         <file>Icons/combo_config_bordered.png</file>
-        <file>rpcs3.svg</file>
-        <file>Icons/DualShock_3.svg</file>
     </qresource>
 </RCC>
diff --git a/rpcs3/rpcs3.cpp b/rpcs3/rpcs3.cpp
deleted file mode 100644
index f7efb7728b..0000000000
--- a/rpcs3/rpcs3.cpp
+++ /dev/null
@@ -1,1321 +0,0 @@
-// Qt6 frontend implementation for rpcs3. Known to work on Windows, Linux, Mac
-// by Sacha Refshauge, Megamouse and flash-fire
-
-#include <iostream>
-#include <chrono>
-#include <clocale>
-#include <span>
-
-#include <QApplication>
-#include <QCommandLineParser>
-#include <QFileInfo>
-#include <QTimer>
-#include <QObject>
-#include <QStyleFactory>
-#include <QMessageBox>
-#include <QMetaEnum>
-#include <QStandardPaths>
-
-#include "rpcs3qt/gui_application.h"
-#include "rpcs3qt/fatal_error_dialog.h"
-#include "rpcs3qt/curl_handle.h"
-#include "rpcs3qt/main_window.h"
-#include "rpcs3qt/uuid.h"
-
-#include "headless_application.h"
-#include "Utilities/sema.h"
-#include "Utilities/date_time.h"
-#include "util/console.h"
-#include "Crypto/decrypt_binaries.h"
-#ifdef _WIN32
-#include "module_verifier.hpp"
-#include "util/dyn_lib.hpp"
-#include <shellapi.h>
-
-// TODO(cjj19970505@live.cn)
-// When compiling with WIN32_LEAN_AND_MEAN definition
-// NTSTATUS is defined in CMake build but not in VS build
-// May be caused by some different header pre-inclusion between CMake and VS configurations.
-#if !defined(NTSTATUS)
-// Copied from ntdef.h
-typedef _Return_type_success_(return >= 0) LONG NTSTATUS;
-#endif
-DYNAMIC_IMPORT("ntdll.dll", NtQueryTimerResolution, NTSTATUS(PULONG MinimumResolution, PULONG MaximumResolution, PULONG CurrentResolution));
-DYNAMIC_IMPORT("ntdll.dll", NtSetTimerResolution, NTSTATUS(ULONG DesiredResolution, BOOLEAN SetResolution, PULONG CurrentResolution));
-#else
-#include <unistd.h>
-#include <spawn.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include <signal.h>
-#endif
-
-#ifdef __linux__
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/prctl.h>
-#endif
-
-#if defined(__APPLE__)
-#include <dispatch/dispatch.h>
-#endif
-
-#include "Utilities/Config.h"
-#include "Utilities/Thread.h"
-#include "Utilities/File.h"
-#include "Utilities/StrUtil.h"
-#include "util/media_utils.h"
-#include "rpcs3_version.h"
-#include "Emu/System.h"
-#include "Emu/system_utils.hpp"
-#include <thread>
-#include <charconv>
-
-#include "util/sysinfo.hpp"
-
-// Let's initialize the locale first
-static const bool s_init_locale = []()
-{
-	std::setlocale(LC_ALL, "C");
-	return true;
-}();
-
-static semaphore<> s_qt_init;
-
-static atomic_t<bool> s_headless = false;
-static atomic_t<bool> s_no_gui = false;
-static atomic_t<char*> s_argv0 = nullptr;
-static bool s_is_error_launch = false;
-
-std::string g_input_config_override;
-
-extern thread_local std::string(*g_tls_log_prefix)();
-extern thread_local std::string_view g_tls_serialize_name;
-
-#ifndef _WIN32
-extern char **environ;
-#endif
-
-LOG_CHANNEL(sys_log, "SYS");
-LOG_CHANNEL(q_debug, "QDEBUG");
-
-#ifdef _WIN32
-std::set<std::string> get_one_drive_paths()
-{
-	std::set<std::string> paths;
-
-	// NOTE: Disabled. The environment variables can lead to false positives.
-	//for (const char* key : { "OneDrive", "OneDriveConsumer", "OneDriveCommercial" })
-	//{
-	//	if (const char* env_path = std::getenv(key))
-	//	{
-	//		sys_log.notice("get_one_drive_paths: Found OneDrive env path: '%s' (key='%s')", env_path, key);
-	//		paths.insert(env_path);
-	//	}
-	//}
-
-	for (const wchar_t* key : { L"Software\\Microsoft\\OneDrive\\Accounts\\Personal" })
-	{
-		HKEY hkey = NULL;
-		LSTATUS status = RegOpenKeyW(HKEY_CURRENT_USER, key, &hkey);
-		if (status != ERROR_SUCCESS)
-		{
-			sys_log.trace("get_one_drive_paths: RegOpenKeyW failed: %s (key='%s')", fmt::win_error{static_cast<unsigned long>(status), nullptr}, wchar_to_utf8(key));
-			continue;
-		}
-
-		std::wstring path_buffer;
-		DWORD type = 0U;
-
-		do
-		{
-			path_buffer.resize(path_buffer.size() + MAX_PATH);
-			DWORD buffer_size = static_cast<DWORD>(path_buffer.size() - 1);
-			status = RegQueryValueExW(hkey, L"UserFolder", NULL, &type, reinterpret_cast<LPBYTE>(path_buffer.data()), &buffer_size);
-		}
-		while (status == ERROR_MORE_DATA);
-
-		const LSTATUS close_status = RegCloseKey(hkey);
-		if (close_status != ERROR_SUCCESS)
-		{
-			sys_log.error("get_one_drive_paths: RegCloseKey failed: %s", fmt::win_error{static_cast<unsigned long>(close_status), nullptr});
-		}
-
-		if (status != ERROR_SUCCESS)
-		{
-			sys_log.trace("get_one_drive_paths: RegQueryValueExW failed: %s", fmt::win_error{static_cast<unsigned long>(status), nullptr});
-			continue;
-		}
-
-		if ((type == REG_SZ) || (type == REG_EXPAND_SZ) || (type == REG_MULTI_SZ))
-		{
-			const std::string path = wchar_to_utf8(path_buffer.data());
-			sys_log.notice("get_one_drive_paths: Found OneDrive registry path: '%s' (key='%s')", path, wchar_to_utf8(key));
-			paths.insert(path);
-		}
-	}
-
-	return paths;
-}
-#endif
-
-[[noreturn]] extern void report_fatal_error(std::string_view _text, bool is_html = false, bool include_help_text = true)
-{
-#ifdef __linux__
-	extern void jit_announce(uptr, usz, std::string_view);
-#endif
-	std::string buf;
-
-	if (!s_is_error_launch)
-	{
-		buf = std::string(_text);
-
-		// Check if thread id is in string
-		if (_text.find("\nThread id = "sv) == umax && !thread_ctrl::is_main())
-		{
-			// Append thread id if it isn't already, except on main thread
-			fmt::append(buf, "\n\nThread id = %u.", thread_ctrl::get_tid());
-		}
-
-		if (!g_tls_serialize_name.empty())
-		{
-			fmt::append(buf, "\nSerialized Object: %s", g_tls_serialize_name);
-		}
-
-		const system_state state = Emu.GetStatus(false);
-
-		if (state == system_state::stopped)
-		{
-			fmt::append(buf, "\nEmulation is stopped");
-		}
-		else
-		{
-			const std::string& name = Emu.GetTitleAndTitleID();
-			fmt::append(buf, "\nTitle: \"%s\" (emulation is %s)", name.empty() ? "N/A" : name.data(), state == system_state::stopping ? "stopping" : "running");
-		}
-
-		fmt::append(buf, "\nBuild: \"%s\"", rpcs3::get_verbose_version());
-		fmt::append(buf, "\nDate: \"%s\"", std::chrono::system_clock::now());
-	}
-
-	std::string_view text = s_is_error_launch ? _text : buf;
-
-	if (s_headless)
-	{
-		utils::attach_console(utils::console_stream::std_err, true);
-
-		utils::output_stderr(fmt::format("RPCS3: %s\n", text));
-#ifdef __linux__
-		jit_announce(0, 0, "");
-#endif
-		std::abort();
-	}
-
-	const bool local = s_qt_init.try_lock();
-
-	// Possibly created and assigned here
-	static QScopedPointer<QCoreApplication> app;
-
-	if (local)
-	{
-		static int argc = 1;
-		static char* argv[] = {+s_argv0};
-		app.reset(new QApplication{argc, argv});
-	}
-	else
-	{
-		utils::output_stderr(fmt::format("RPCS3: %s\n", text));
-	}
-
-	static auto show_report = [is_html, include_help_text](std::string_view text)
-	{
-		fatal_error_dialog dlg(text, is_html, include_help_text);
-		dlg.exec();
-	};
-
-#if defined(__APPLE__)
-	if (!pthread_main_np())
-	{
-		dispatch_sync_f(dispatch_get_main_queue(), &text, [](void* text){ show_report(*static_cast<std::string_view*>(text)); });
-	}
-	else
-#endif
-	{
-		// If Qt is already initialized, spawn a new RPCS3 process with an --error argument
-		if (local)
-		{
-			show_report(text);
-#ifdef _WIN32
-			ExitProcess(0);
-#else
-			kill(getpid(), SIGKILL);
-#endif
-		}
-
-#ifdef _WIN32
-		constexpr DWORD size = 32767;
-		std::vector<wchar_t> buffer(size);
-		GetModuleFileNameW(nullptr, buffer.data(), size);
-		const std::wstring arg(text.cbegin(), text.cend()); // ignore unicode for now
-		_wspawnl(_P_WAIT, buffer.data(), buffer.data(), L"--error", arg.c_str(), nullptr);
-#else
-		pid_t pid;
-		std::vector<char> data(text.data(), text.data() + text.size() + 1);
-		std::string run_arg = +s_argv0;
-		std::string err_arg = "--error";
-
-		if (run_arg.find_first_of('/') == umax)
-		{
-			// AppImage has "rpcs3" in argv[0], can't just execute it
-#ifdef __linux__
-			char buffer[PATH_MAX]{};
-			if (::readlink("/proc/self/exe", buffer, sizeof(buffer) - 1) > 0)
-			{
-				printf("Found exec link: %s\n", buffer);
-				run_arg = buffer;
-			}
-#endif
-		}
-
-		char* argv[] = {run_arg.data(), err_arg.data(), data.data(), nullptr};
-		int ret = posix_spawn(&pid, run_arg.c_str(), nullptr, nullptr, argv, environ);
-
-		if (ret == 0)
-		{
-			int status;
-			waitpid(pid, &status, 0);
-		}
-		else
-		{
-			std::fprintf(stderr, "posix_spawn() failed: %d\n", ret);
-		}
-#endif
-	}
-
-#ifdef __linux__
-	jit_announce(0, 0, "");
-#endif
-	std::abort();
-}
-
-struct fatal_error_listener final : logs::listener
-{
-public:
-	~fatal_error_listener() override = default;
-
-	void log(u64 /*stamp*/, const logs::message& msg, std::string_view prefix, std::string_view text) override
-	{
-		if (msg == logs::level::fatal || (msg == logs::level::always && m_log_always))
-		{
-			std::string _msg = "RPCS3: ";
-
-			if (!prefix.empty())
-			{
-				_msg += prefix;
-				_msg += ": ";
-			}
-
-			if (msg->name && '\0' != *msg->name)
-			{
-				_msg += msg->name;
-				_msg += ": ";
-			}
-
-			_msg += text;
-			_msg += '\n';
-
-			// If launched from CMD
-			utils::attach_console(msg == logs::level::fatal ? utils::console_stream::std_err : utils::console_stream::std_out, false);
-
-			// Output to error stream as is
-			if (msg == logs::level::fatal)
-			{
-				utils::output_stderr(_msg);
-			}
-			else
-			{
-				std::cout << _msg;
-			}
-
-#ifdef _WIN32
-			if (IsDebuggerPresent())
-			{
-				// Output string to attached debugger
-				OutputDebugStringA(_msg.c_str());
-			}
-#endif
-			if (msg == logs::level::fatal)
-			{
-				// Pause emulation if fatal error encountered
-				Emu.Pause(true);
-			}
-		}
-	}
-
-	void log_always(bool enabled)
-	{
-		m_log_always = enabled;
-	}
-
-private:
-	bool m_log_always = false;
-};
-
-// Arguments that force a headless application (need to be checked in create_application)
-constexpr auto arg_headless     = "headless";
-constexpr auto arg_decrypt      = "decrypt";
-
-// Arguments that can be used with a gui application
-constexpr auto arg_no_gui       = "no-gui";
-constexpr auto arg_fullscreen   = "fullscreen"; // only useful with no-gui
-constexpr auto arg_gs_screen    = "game-screen";
-constexpr auto arg_high_dpi     = "hidpi";
-constexpr auto arg_rounding     = "dpi-rounding";
-constexpr auto arg_styles       = "styles";
-constexpr auto arg_style        = "style";
-constexpr auto arg_stylesheet   = "stylesheet";
-constexpr auto arg_config       = "config";
-constexpr auto arg_input_config = "input-config"; // only useful with no-gui
-constexpr auto arg_q_debug      = "qDebug";
-constexpr auto arg_error        = "error";
-constexpr auto arg_updating     = "updating";
-constexpr auto arg_user_id      = "user-id";
-constexpr auto arg_installfw    = "installfw";
-constexpr auto arg_installpkg   = "installpkg";
-constexpr auto arg_savestate    = "savestate";
-constexpr auto arg_rsx_capture  = "rsx-capture";
-constexpr auto arg_timer        = "high-res-timer";
-constexpr auto arg_verbose_curl = "verbose-curl";
-constexpr auto arg_any_location = "allow-any-location";
-constexpr auto arg_codecs       = "codecs";
-
-#ifdef _WIN32
-constexpr auto arg_stdout       = "stdout";
-constexpr auto arg_stderr       = "stderr";
-#endif
-
-constexpr auto arg_emulation_barrier = "";
-
-int find_arg(const char* to_search, std::span<char* const> argv)
-{
-	// It's not guaranteed that argv 0 is the executable.
-	for (usz i = 0; i != argv.size(); i++)
-	{
-		const auto argp = argv[i];
-
-		if (argp[0] == '-' && argp[1] == '-' && !std::strcmp(to_search, argp + 2))
-		{
-			return ::narrow<int>(i);
-		}
-	}
-
-	return -1;
-}
-
-QCoreApplication* create_application(std::span<char* const> qt_argv)
-{
-	static int s_argc = static_cast<int>(qt_argv.size());
-	static char** const s_argv = const_cast<char**>(qt_argv.data());
-
-	if (find_arg(arg_headless, qt_argv) != -1 ||
-		find_arg(arg_decrypt, qt_argv) != -1)
-	{
-		return new headless_application(s_argc, s_argv);
-	}
-
-#ifdef __linux__
-	// set the DISPLAY variable in order to open web browsers
-	if (qEnvironmentVariable("DISPLAY", "").isEmpty())
-	{
-		qputenv("DISPLAY", ":0");
-	}
-
-	// Set QT_AUTO_SCREEN_SCALE_FACTOR to 0. This value is deprecated but still seems to make problems on some distros
-	if (!qEnvironmentVariable("QT_AUTO_SCREEN_SCALE_FACTOR", "").isEmpty())
-	{
-		qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "0");
-	}
-#endif
-
-	bool use_high_dpi = true;
-
-	const int i_hdpi = find_arg(arg_high_dpi, qt_argv);
-	if (i_hdpi != -1)
-	{
-		const std::string cmp_str = "0";
-		const auto i_hdpi_2 = (s_argc > (i_hdpi + 1)) ? (i_hdpi + 1) : 0;
-		const auto high_dpi_setting = (i_hdpi_2 && !std::strcmp(cmp_str.c_str(), qt_argv[i_hdpi_2])) ? "0" : "1";
-
-		// Set QT_ENABLE_HIGHDPI_SCALING from environment. Defaults to cli argument, which defaults to 1.
-		use_high_dpi = "1" == qEnvironmentVariable("QT_ENABLE_HIGHDPI_SCALING", high_dpi_setting);
-	}
-
-	if (use_high_dpi)
-	{
-		// Set QT_SCALE_FACTOR_ROUNDING_POLICY from environment. Defaults to cli argument, which defaults to PassThrough.
-		Qt::HighDpiScaleFactorRoundingPolicy rounding_val = Qt::HighDpiScaleFactorRoundingPolicy::PassThrough;
-		const QMetaEnum meta_enum = QMetaEnum::fromType<Qt::HighDpiScaleFactorRoundingPolicy>();
-		QString rounding_str_cli = meta_enum.valueToKey(static_cast<int>(rounding_val));
-
-		const auto check_dpi_rounding_arg = [&rounding_str_cli, &rounding_val, &meta_enum](const char* val) -> bool
-		{
-			// Try to find out if the argument is a valid string representation of Qt::HighDpiScaleFactorRoundingPolicy
-			bool ok{false};
-			if (const int enum_index = meta_enum.keyToValue(val, &ok); ok)
-			{
-				rounding_str_cli = meta_enum.valueToKey(enum_index);
-				rounding_val = static_cast<Qt::HighDpiScaleFactorRoundingPolicy>(enum_index);
-			}
-			return ok;
-		};
-
-		if (const int i_rounding = find_arg(arg_rounding, qt_argv); i_rounding != -1)
-		{
-			if (const int i_rounding_2 = i_rounding + 1; s_argc > i_rounding_2)
-			{
-				if (const auto arg_val = qt_argv[i_rounding_2]; !check_dpi_rounding_arg(arg_val))
-				{
-					const std::string msg = fmt::format("The command line value %s for %s is not allowed. Please use a valid value for Qt::HighDpiScaleFactorRoundingPolicy.", arg_val, arg_rounding);
-					sys_log.error("%s", msg); // Don't exit with fatal error. The resulting dialog might be unreadable with dpi problems.
-					utils::output_stderr(msg, true);
-				}
-			}
-		}
-
-		// Get the environment variable. Fallback to cli argument.
-		rounding_str_cli = qEnvironmentVariable("QT_SCALE_FACTOR_ROUNDING_POLICY", rounding_str_cli);
-
-		if (!check_dpi_rounding_arg(rounding_str_cli.toStdString().c_str()))
-		{
-			const std::string msg = fmt::format("The value %s for the environment variable QT_SCALE_FACTOR_ROUNDING_POLICY is not allowed. Please use a valid value for Qt::HighDpiScaleFactorRoundingPolicy.", rounding_str_cli.toStdString());
-			sys_log.error("%s", msg); // Don't exit with fatal error. The resulting dialog might be unreadable with dpi problems.
-			std::cerr << msg << std::endl;
-		}
-
-		QApplication::setHighDpiScaleFactorRoundingPolicy(rounding_val);
-	}
-
-	return new gui_application(s_argc, s_argv);
-}
-
-template <>
-void fmt_class_string<QString>::format(std::string& out, u64 arg)
-{
- 	out += get_object(arg).toStdString();
-}
-
-void log_q_debug(QtMsgType type, const QMessageLogContext& context, const QString& msg)
-{
-	Q_UNUSED(context)
-
-	switch (type)
-	{
-	case QtDebugMsg: q_debug.trace("%s", msg); break;
-	case QtInfoMsg: q_debug.notice("%s", msg); break;
-	case QtWarningMsg: q_debug.warning("%s", msg); break;
-	case QtCriticalMsg: q_debug.error("%s", msg); break;
-	case QtFatalMsg: q_debug.fatal("%s", msg); break;
-	}
-}
-
-void run_platform_sanity_checks()
-{
-#ifdef _WIN32
-	// Check if we loaded modules correctly
-	WIN32_module_verifier::run();
-#endif
-}
-
-int run_rpcs3(int argc, char** argv)
-{
-#ifdef _WIN32
-	ULONG64 intro_cycles{};
-	QueryThreadCycleTime(GetCurrentThread(), &intro_cycles);
-#elif defined(RUSAGE_THREAD)
-	struct ::rusage intro_stats{};
-	::getrusage(RUSAGE_THREAD, &intro_stats);
-	const u64 intro_time = (intro_stats.ru_utime.tv_sec + intro_stats.ru_stime.tv_sec) * 1000000000ull + (intro_stats.ru_utime.tv_usec + intro_stats.ru_stime.tv_usec) * 1000ull;
-#endif
-
-#ifdef __linux__
-	// Set timerslack value for Linux. The default value is 50,000ns. Change this to just 1 since we value precise timers.
-	prctl(PR_SET_TIMERSLACK, 1, 0, 0, 0);
-#endif
-
-	s_argv0 = argv[0]; // Save for report_fatal_error
-
-	std::span<char* const> argv_span{ argv, argc + 0u };
-	std::span<char* const> emu_argv;
-	std::span<char* const> qt_argv;
-
-	if (int emu_pos = find_arg(arg_emulation_barrier, argv_span); emu_pos != -1)
-	{
-		emu_argv = argv_span.subspan(emu_pos + 1);
-		qt_argv = argv_span.subspan(0, emu_pos);
-	}
-	else
-	{
-		qt_argv = argv_span;
-	}
-
-	// Only run RPCS3 to display an error
-	if (int err_pos = find_arg(arg_error, qt_argv); err_pos != -1)
-	{
-		// Reconstruction of the error from multiple args
-		std::string error;
-		for (int i = err_pos + 1; i < argc; i++)
-		{
-			if (i > err_pos + 1)
-				error += ' ';
-			error += argv[i];
-		}
-
-		s_is_error_launch = true;
-		report_fatal_error(error);
-	}
-
-	const std::string lock_name = fs::get_cache_dir() + "RPCS3.buf";
-	const std::string log_name = fs::get_log_dir() + "RPCS3.log";
-
-	static fs::file instance_lock;
-
-	// True if an argument --updating found
-	const bool is_updating = find_arg(arg_updating, qt_argv) != -1;
-
-	// Keep trying to lock the file for ~2s normally, and for ~10s in the case of --updating
-	for (u32 num = 0; num < (is_updating ? 500u : 100u) && !instance_lock.open(lock_name, fs::rewrite + fs::lock); num++)
-	{
-		std::this_thread::sleep_for(20ms);
-	}
-
-	if (!instance_lock)
-	{
-		if (fs::g_tls_error == fs::error::acces)
-		{
-			if (fs::exists(lock_name))
-			{
-				report_fatal_error(fmt::format("Another instance of RPCS3 is running.\nClose it or kill its process, if necessary.\n'%s' still exists.", lock_name));
-			}
-
-			report_fatal_error(fmt::format("Cannot create '%s' or '%s' (access denied).\n"
-#ifdef _WIN32
-				"Note that RPCS3 cannot be installed in Program Files or similar directories with limited permissions."
-#else
-				"Please, check RPCS3 permissions."
-#endif
-				, log_name, lock_name));
-		}
-
-		report_fatal_error(fmt::format("Cannot create'%s' or '%s' (error=%s)", log_name, lock_name, fs::g_tls_error));
-	}
-
-#ifdef _WIN32
-	if (!SetProcessWorkingSetSize(GetCurrentProcess(), 0x80000000, 0xC0000000)) // 2-3 GiB
-	{
-		report_fatal_error("Not enough memory for RPCS3 process.");
-	}
-
-	WSADATA wsa_data{};
-	if (const int res = WSAStartup(MAKEWORD(2, 2), &wsa_data); res != 0)
-	{
-		report_fatal_error(fmt::format("WSAStartup failed (error=%s)", fmt::win_error{static_cast<unsigned long>(res), nullptr}));
-	}
-#endif
-
-#if defined(__APPLE__) && defined(__x86_64__)
-	if (const utils::OS_version os = utils::get_OS_version();
-		os.version_major == 14 && os.version_minor < 3 && (utils::get_cpu_brand().rfind("VirtualApple", 0) == 0))
-	{
-		report_fatal_error(fmt::format("RPCS3 requires macOS 14.3.0 or later.\nYou're currently using macOS %i.%i.%i.\nPlease update macOS from System Settings.\n\n", os.version_major, os.version_minor, os.version_patch));
-	}
-#endif
-
-	ensure(thread_ctrl::is_main(), "Not main thread");
-
-	// Initialize thread pool finalizer (on first use)
-	static_cast<void>(named_thread("", [](int) {}));
-
-	static std::unique_ptr<logs::listener> log_file;
-	{
-		// Check free space
-		fs::device_stat stats{};
-		if (!fs::statfs(fs::get_cache_dir(), stats) || stats.avail_free < 128 * 1024 * 1024)
-		{
-			std::fprintf(stderr, "Not enough free space for logs (%f KB)", stats.avail_free / 1000000.);
-		}
-
-		// Limit log size to ~25% of free space
-		log_file = logs::make_file_listener(log_name, stats.avail_free / 4);
-	}
-
-	static std::unique_ptr<fatal_error_listener> fatal_listener = std::make_unique<fatal_error_listener>();
-	logs::listener::add(fatal_listener.get());
-
-	{
-		// Write RPCS3 version
-		logs::stored_message ver{sys_log.always()};
-		ver.text = fmt::format("RPCS3 v%s", rpcs3::get_verbose_version());
-
-		// Write System information
-		logs::stored_message sys{sys_log.always()};
-		sys.text = utils::get_system_info();
-
-		// Write OS version
-		logs::stored_message os{sys_log.always()};
-		os.text = utils::get_OS_version_string();
-
-		// Write Qt version
-		logs::stored_message qt{(strcmp(QT_VERSION_STR, qVersion()) != 0) ? sys_log.error : sys_log.notice};
-		qt.text = fmt::format("Qt version: Compiled against Qt %s | Run-time uses Qt %s", QT_VERSION_STR, qVersion());
-
-		// Write current time
-		logs::stored_message time{sys_log.always()};
-		time.text = fmt::format("Current Time: %s", std::chrono::system_clock::now());
-
-		logs::set_init({std::move(ver), std::move(sys), std::move(os), std::move(qt), std::move(time)});
-	}
-
-#ifdef _WIN32
-	sys_log.notice("Initialization times before main(): %fGc", intro_cycles / 1000000000.);
-#elif defined(RUSAGE_THREAD)
-	sys_log.notice("Initialization times before main(): %fs", intro_time / 1000000000.);
-#endif
-
-	std::string argument_str;
-	for (int i = 0; i < argc; i++)
-	{
-		if (i > 0) argument_str += " ";
-		argument_str += '\'' + std::string(argv[i]) + '\'';
-	}
-
-	sys_log.notice("argc: %d, argv: %s", argc, argument_str);
-
-#ifdef _WIN32
-	int n_args = 0;
-	if (LPWSTR* arg_list = CommandLineToArgvW(GetCommandLineW(), &n_args))
-	{
-		std::string utf8_args;
-		for (int i = 0; i < n_args; i++)
-		{
-			if (i > 0) utf8_args += " ";
-			utf8_args += '\'' + wchar_to_utf8(arg_list[i]) + '\'';
-		}
-		LocalFree(arg_list);
-		sys_log.notice("argv_utf8: %s", utf8_args);
-	}
-#endif
-
-	// Before we proceed, run some sanity checks
-	run_platform_sanity_checks();
-
-#ifdef __linux__
-	struct ::rlimit rlim;
-	rlim.rlim_cur = 4096;
-	rlim.rlim_max = 4096;
-#ifdef RLIMIT_NOFILE
-	if (::setrlimit(RLIMIT_NOFILE, &rlim) != 0)
-	{
-		std::cerr << "Failed to set max open file limit (4096).\n";
-	}
-#endif
-
-	rlim.rlim_cur = 0x80000000;
-	rlim.rlim_max = 0x80000000;
-#ifdef RLIMIT_MEMLOCK
-	if (::setrlimit(RLIMIT_MEMLOCK, &rlim) != 0)
-	{
-		std::cerr << "Failed to set RLIMIT_MEMLOCK size to 2 GiB. Try to update your system configuration.\n";
-	}
-#endif
-	// Work around crash on startup on KDE: https://bugs.kde.org/show_bug.cgi?id=401637
-	setenv( "KDE_DEBUG", "1", 0 );
-#endif
-
-#ifdef __APPLE__
-	struct ::rlimit rlim;
-	::getrlimit(RLIMIT_NOFILE, &rlim);
-	rlim.rlim_cur = OPEN_MAX;
-	if (::setrlimit(RLIMIT_NOFILE, &rlim) != 0)
-	{
-		std::cerr << "Failed to set max open file limit (" << OPEN_MAX << ").\n";
-	}
-#endif
-
-#ifndef _WIN32
-	// Write file limits
-	sys_log.notice("Maximum open file descriptors: %i", utils::get_maxfiles());
-#endif
-
-	if (utils::get_low_power_mode())
-	{
-		sys_log.error("Low Power Mode is enabled, performance may be reduced.");
-	}
-
-	std::lock_guard qt_init(s_qt_init);
-
-	// The constructor of QApplication eats the --style and --stylesheet arguments.
-	// By checking for stylesheet().isEmpty() we could implicitly know if a stylesheet was passed,
-	// but I haven't found an implicit way to check for style yet, so we naively check them both here for now.
-	const bool use_cli_style = find_arg(arg_style, qt_argv) != -1 || find_arg(arg_stylesheet, qt_argv) != -1;
-
-	QScopedPointer<QCoreApplication> app(create_application(qt_argv));
-	app->setApplicationVersion(QString::fromStdString(rpcs3::get_version().to_string()));
-	app->setApplicationName("RPCS3");
-	app->setOrganizationName("RPCS3");
-
-	// Command line args
-	static QCommandLineParser parser;
-	parser.setApplicationDescription("Welcome to RPCS3 command line.");
-	parser.addPositionalArgument("(S)ELF", "Path for directly executing a (S)ELF");
-	parser.addPositionalArgument("[Args...]", "Optional args for the executable");
-
-	const QCommandLineOption help_option    = parser.addHelpOption();
-	const QCommandLineOption version_option = parser.addVersionOption();
-	parser.addOption(QCommandLineOption(arg_headless, "Run RPCS3 in headless mode."));
-	parser.addOption(QCommandLineOption(arg_no_gui, "Run RPCS3 without its GUI."));
-	parser.addOption(QCommandLineOption(arg_fullscreen, "Run games in fullscreen mode. Only used when no-gui is set."));
-	const QCommandLineOption screen_option(arg_gs_screen, "Forces the emulator to use the specified screen for the game window.", "index", "");
-	parser.addOption(screen_option);
-	parser.addOption(QCommandLineOption(arg_high_dpi, "Enables Qt High Dpi Scaling.", "enabled", "1"));
-	parser.addOption(QCommandLineOption(arg_rounding, "Sets the Qt::HighDpiScaleFactorRoundingPolicy for values like 150% zoom.", "rounding", "4"));
-	parser.addOption(QCommandLineOption(arg_styles, "Lists the available styles."));
-	parser.addOption(QCommandLineOption(arg_style, "Loads a custom style.", "style", ""));
-	parser.addOption(QCommandLineOption(arg_stylesheet, "Loads a custom stylesheet.", "path", ""));
-	const QCommandLineOption config_option(arg_config, "Forces the emulator to use this configuration file for CLI-booted game.", "path", "");
-	parser.addOption(config_option);
-	const QCommandLineOption input_config_option(arg_input_config, "Forces the emulator to use this input config file for CLI-booted game.", "name", "");
-	parser.addOption(input_config_option);
-	const QCommandLineOption installfw_option(arg_installfw, "Forces the emulator to install this firmware file.", "path", "");
-	parser.addOption(installfw_option);
-	const QCommandLineOption installpkg_option(arg_installpkg, "Forces the emulator to install this pkg file.", "path", "");
-	parser.addOption(installpkg_option);
-	const QCommandLineOption decrypt_option(arg_decrypt, "Decrypt PS3 binaries.", "path(s)", "");
-	parser.addOption(decrypt_option);
-	const QCommandLineOption user_id_option(arg_user_id, "Start RPCS3 as this user.", "user id", "");
-	parser.addOption(user_id_option);
-	const QCommandLineOption savestate_option(arg_savestate, "Path for directly loading a savestate.", "path", "");
-	parser.addOption(savestate_option);
-	const QCommandLineOption rsx_capture_option(arg_rsx_capture, "Path for directly loading an rsx capture.", "path", "");
-	parser.addOption(rsx_capture_option);
-	parser.addOption(QCommandLineOption(arg_q_debug, "Log qDebug to RPCS3.log."));
-	parser.addOption(QCommandLineOption(arg_error, "For internal usage."));
-	parser.addOption(QCommandLineOption(arg_updating, "For internal usage."));
-	parser.addOption(QCommandLineOption(arg_timer, "Enable high resolution timer for better performance (windows)", "enabled", "1"));
-	parser.addOption(QCommandLineOption(arg_verbose_curl, "Enable verbose curl logging."));
-	parser.addOption(QCommandLineOption(arg_any_location, "Allow RPCS3 to be run from any location. Dangerous"));
-	const QCommandLineOption codec_option(arg_codecs, "List ffmpeg codecs");
-	parser.addOption(codec_option);
-
-#ifdef _WIN32
-	parser.addOption(QCommandLineOption(arg_stdout, "Attach the console window and listen to standard output stream. (STDOUT)"));
-	parser.addOption(QCommandLineOption(arg_stderr, "Attach the console window and listen to error output stream. (STDERR)"));
-#endif
-
-	parser.addOption(QCommandLineOption("N/A", "Arguments after \"--\" are considered emulation arguments."));
-
-	parser.process(app->arguments());
-
-	// Don't start up the full rpcs3 gui if we just want the version or help.
-	if (parser.isSet(version_option) || parser.isSet(help_option))
-		return 0;
-
-	if (parser.isSet(codec_option))
-	{
-		utils::attach_console(utils::console_stream::std_out | utils::console_stream::std_err, true);
-
-		for (const utils::ffmpeg_codec& codec : utils::list_ffmpeg_decoders())
-		{
-			fprintf(stdout, "Found ffmpeg decoder: %s (%d, %s)\n", codec.name.c_str(), codec.codec_id, codec.long_name.c_str());
-			sys_log.success("Found ffmpeg decoder: %s (%d, %s)", codec.name, codec.codec_id, codec.long_name);
-		}
-		for (const utils::ffmpeg_codec& codec : utils::list_ffmpeg_encoders())
-		{
-			fprintf(stdout, "Found ffmpeg encoder: %s (%d, %s)\n", codec.name.c_str(), codec.codec_id, codec.long_name.c_str());
-			sys_log.success("Found ffmpeg encoder: %s (%d, %s)", codec.name, codec.codec_id, codec.long_name);
-		}
-		return 0;
-	}
-
-#ifdef _WIN32
-	if (parser.isSet(arg_stdout) || parser.isSet(arg_stderr))
-	{
-		int stream = 0;
-		if (parser.isSet(arg_stdout))
-		{
-			stream |= utils::console_stream::std_out;
-		}
-		if (parser.isSet(arg_stderr))
-		{
-			stream |= utils::console_stream::std_err;
-		}
-		utils::attach_console(stream, true);
-	}
-#endif
-
-	// Set curl to verbose if needed
-	rpcs3::curl::g_curl_verbose = parser.isSet(arg_verbose_curl);
-
-	if (rpcs3::curl::g_curl_verbose)
-	{
-		utils::attach_console(utils::console_stream::std_out | utils::console_stream::std_err, true);
-		fprintf(stdout, "Enabled Curl verbose logging.\n");
-		sys_log.always()("Enabled Curl verbose logging. Please look at your console output.");
-	}
-
-	if (parser.isSet(arg_q_debug))
-	{
-		qInstallMessageHandler(log_q_debug);
-	}
-
-	if (parser.isSet(arg_styles))
-	{
-		utils::attach_console(utils::console_stream::std_out, true);
-
-		for (const auto& style : QStyleFactory::keys())
-			std::cout << "\n" << style.toStdString();
-
-		return 0;
-	}
-
-	// Enable console output of "always" log messages.
-	// Do this after parsing any Qt cli args that might open a window.
-	fatal_listener->log_always(true);
-
-	// Log unique ID
-	gui::utils::log_uuid();
-
-	std::string active_user;
-
-	if (parser.isSet(arg_user_id))
-	{
-		active_user = parser.value(arg_user_id).toStdString();
-
-		if (rpcs3::utils::check_user(active_user) == 0)
-		{
-			report_fatal_error(fmt::format("Failed to set user ID '%s'.\nThe user ID must consist of 8 digits and cannot be 00000000.", active_user));
-		}
-	}
-
-	s_no_gui = parser.isSet(arg_no_gui);
-
-	if (gui_application* gui_app = qobject_cast<gui_application*>(app.data()))
-	{
-		gui_app->setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);
-
-		gui_app->SetShowGui(!s_no_gui);
-		gui_app->SetUseCliStyle(use_cli_style);
-		gui_app->SetWithCliBoot(parser.isSet(arg_installfw) || parser.isSet(arg_installpkg) || !parser.positionalArguments().isEmpty());
-		gui_app->SetActiveUser(active_user);
-
-		if (parser.isSet(arg_fullscreen))
-		{
-			if (!s_no_gui)
-			{
-				report_fatal_error(fmt::format("The option '%s' can only be used in combination with '%s'.", arg_fullscreen, arg_no_gui));
-			}
-
-			gui_app->SetStartGamesFullscreen(true);
-		}
-
-		if (parser.isSet(arg_gs_screen))
-		{
-			const int game_screen_index = parser.value(arg_gs_screen).toInt();
-
-			if (game_screen_index < 0)
-			{
-				report_fatal_error(fmt::format("The option '%s' can only be used with numbers >= 0 (you used %d)", arg_gs_screen, game_screen_index));
-			}
-
-			gui_app->SetGameScreenIndex(game_screen_index);
-		}
-
-		if (!gui_app->Init())
-		{
-			Emu.Quit(true);
-			return 0;
-		}
-	}
-	else if (headless_application* headless_app = qobject_cast<headless_application*>(app.data()))
-	{
-		s_headless = true;
-
-		headless_app->SetActiveUser(active_user);
-
-		if (!headless_app->Init())
-		{
-			Emu.Quit(true);
-			return 0;
-		}
-	}
-	else
-	{
-		// Should be unreachable
-		report_fatal_error("RPCS3 initialization failed!");
-	}
-
-	// Check if the current location is actually useable
-	if (!parser.isSet(arg_any_location))
-	{
-		const std::string emu_dir = rpcs3::utils::get_emu_dir();
-
-		// Check temporary directories
-		for (const QString& path : QStandardPaths::standardLocations(QStandardPaths::StandardLocation::TempLocation))
-		{
-			if (Emu.IsPathInsideDir(emu_dir, path.toStdString()))
-			{
-				report_fatal_error(QObject::tr(
-					"RPCS3 should never be run from a temporary location!\n"
-					"Please install RPCS3 in a persistent location.\n"
-					"Current location:\n%0").arg(QString::fromStdString(emu_dir)).toStdString());
-				return 1;
-			}
-		}
-
-		// Check nonsensical archive locations
-		for (const std::string_view& expr : { "/Rar$"sv })
-		{
-			if (emu_dir.find(expr) != umax)
-			{
-				report_fatal_error(QObject::tr(
-					"RPCS3 should never be run from an archive!\n"
-					"Please install RPCS3 in a persistent location.\n"
-					"Current location:\n%0").arg(QString::fromStdString(emu_dir)).toStdString());
-				return 1;
-			}
-		}
-
-#ifdef _WIN32
-		// Check OneDrive locations
-		for (const std::string& one_drive_path : get_one_drive_paths())
-		{
-			if (Emu.IsPathInsideDir(emu_dir, one_drive_path))
-			{
-				report_fatal_error(QObject::tr(
-					"RPCS3 should never be run from a OneDrive path!\n"
-					"Please move RPCS3 to a location not synced by OneDrive.\n"
-					"Current location:\n%0").arg(QString::fromStdString(emu_dir)).toStdString());
-				return 1;
-			}
-		}
-#endif
-	}
-
-// Set timerslack value for Linux. The default value is 50,000ns. Change this to just 1 since we value precise timers.
-#ifdef __linux__
-	prctl(PR_SET_TIMERSLACK, 1, 0, 0, 0);
-#endif
-
-#ifdef _WIN32
-	// Create dummy permanent low resolution timer to workaround messing with system timer resolution
-	QTimer* dummy_timer = new QTimer(app.data());
-	dummy_timer->start(13);
-
-	ULONG min_res, max_res, orig_res;
-	bool got_timer_resolution = NtQueryTimerResolution(&min_res, &max_res, &orig_res) == 0;
-
-	// Set 0.5 msec timer resolution for best performance
-	// - As QT timers (QTimer) sets the timer resolution to 1 msec, override it here.
-	if (parser.value(arg_timer).toStdString() == "1")
-	{
-		ULONG new_res;
-		if (got_timer_resolution && NtSetTimerResolution(max_res, TRUE, &new_res) == 0)
-		{
-			NtSetTimerResolution(max_res, TRUE, &new_res);
-			sys_log.notice("New timer resolution: %d us (old=%d us, min=%d us, max=%d us)", new_res / 10, orig_res / 10, min_res / 10, max_res / 10);
-			got_timer_resolution = false; // Invalidate for log message later
-		}
-		else
-		{
-			sys_log.error("Failed to set timer resolution!");
-		}
-	}
-	else
-	{
-		sys_log.warning("High resolution timer disabled!");
-	}
-
-	if (got_timer_resolution)
-	{
-		sys_log.notice("Timer resolution: %d us (min=%d us, max=%d us)", orig_res / 10, min_res / 10, max_res / 10);
-	}
-#endif
-
-	if (parser.isSet(arg_decrypt))
-	{
-		utils::attach_console(utils::console_stream::std_out | utils::console_stream::std_in, true);
-
-		std::vector<std::string> vec_modules;
-		for (const QString& mod : parser.values(decrypt_option))
-		{
-			const QFileInfo fi(mod);
-			if (!fi.exists())
-			{
-				std::cout << "File not found: " << mod.toStdString() << std::endl;
-				return 1;
-			}
-			if (!fi.isFile())
-			{
-				std::cout << "Not a file: " << mod.toStdString() << std::endl;
-				return 1;
-			}
-
-			vec_modules.push_back(fi.absoluteFilePath().toStdString());
-		}
-
-		Emu.Init();
-
-		std::shared_ptr<decrypt_binaries_t> decrypter = std::make_shared<decrypt_binaries_t>(std::move(vec_modules));
-
-		usz mod_index = decrypter->decrypt();
-		usz repeat_count = mod_index == 0 ? 1 : 0;
-
-		while (!decrypter->done())
-		{
-			const std::string& path = (*decrypter)[mod_index];
-			const std::string filename = path.substr(path.find_last_of(fs::delim) + 1);
-
-			const std::string hint = fmt::format("Hint: KLIC (KLicense key) is a 16-byte long string. (32 hexadecimal characters)"
-				"\nAnd is logged with some sceNpDrm* functions when the game/application which owns \"%0\" is running.", filename);
-
-			if (repeat_count >= 2)
-			{
-				std::cout << "Failed to decrypt " << path << " with specfied KLIC, retrying.\n" << hint << std::endl;
-			}
-
-			std::cout << "Enter KLIC of " << filename << "\nHexadecimal only, 32 characters:" << std::endl;
-
-			std::string input;
-			std::cin >> input;
-
-			if (input.empty())
-			{
-				break;
-			}
-
-			const usz new_index = decrypter->decrypt(input);
-			repeat_count = new_index == mod_index ? repeat_count + 1 : 0;
-			mod_index = new_index;
-		}
-
-		Emu.Quit(true);
-		return 0;
-	}
-
-	// Force install firmware or pkg first if specified through command-line
-	if (parser.isSet(arg_installfw) || parser.isSet(arg_installpkg))
-	{
-		if (auto gui_app = qobject_cast<gui_application*>(app.data()))
-		{
-			if (s_no_gui)
-			{
-				report_fatal_error("Cannot perform installation in no-gui mode!");
-			}
-
-			if (gui_app->m_main_window)
-			{
-				if (parser.isSet(arg_installfw) && parser.isSet(arg_installpkg))
-				{
-					QMessageBox::warning(gui_app->m_main_window, QObject::tr("Invalid command-line arguments!"), QObject::tr("Cannot perform multiple installations at the same time!"));
-				}
-				else if (parser.isSet(arg_installfw))
-				{
-					gui_app->m_main_window->InstallPup(parser.value(installfw_option));
-				}
-				else
-				{
-					gui_app->m_main_window->InstallPackages({parser.value(installpkg_option)});
-				}
-			}
-			else
-			{
-				report_fatal_error("Cannot perform installation. No main window found!");
-			}
-		}
-		else
-		{
-			report_fatal_error("Cannot perform installation in headless mode!");
-		}
-	}
-
-	for (const auto& opt : parser.optionNames())
-	{
-		sys_log.notice("Option passed via command line: %s %s", opt, parser.value(opt));
-	}
-
-	if (parser.isSet(arg_savestate))
-	{
-		const std::string savestate_path = parser.value(savestate_option).toStdString();
-		sys_log.notice("Booting savestate from command line: %s", savestate_path);
-
-		if (!fs::is_file(savestate_path))
-		{
-			report_fatal_error(fmt::format("No savestate file found: %s", savestate_path));
-		}
-
-		Emu.CallFromMainThread([path = savestate_path]()
-		{
-			Emu.SetForceBoot(true);
-
-			if (const game_boot_result error = Emu.BootGame(path); error != game_boot_result::no_errors)
-			{
-				sys_log.error("Booting savestate '%s' failed: reason: %s", path, error);
-
-				if (s_headless || s_no_gui)
-				{
-					report_fatal_error(fmt::format("Booting savestate '%s' failed!\n\nReason: %s", path, error));
-				}
-			}
-		});
-	}
-	else if (parser.isSet(arg_rsx_capture))
-	{
-		const std::string rsx_capture_path = parser.value(rsx_capture_option).toStdString();
-		sys_log.notice("Booting rsx capture from command line: %s", rsx_capture_path);
-
-		if (!fs::is_file(rsx_capture_path))
-		{
-			report_fatal_error(fmt::format("No rsx capture file found: %s", rsx_capture_path));
-		}
-
-		Emu.CallFromMainThread([path = rsx_capture_path]()
-		{
-			if (!Emu.BootRsxCapture(path))
-			{
-				sys_log.error("Booting rsx capture '%s' failed", path);
-
-				if (s_headless || s_no_gui)
-				{
-					report_fatal_error(fmt::format("Booting rsx capture '%s' failed!", path));
-				}
-			}
-		});
-	}
-	else if (const QStringList args = parser.positionalArguments(); (!args.isEmpty() || !emu_argv.empty()) && !is_updating && !parser.isSet(arg_installfw) && !parser.isSet(arg_installpkg))
-	{
-		std::string spath = (args.isEmpty() ? emu_argv[0] : ::at32(args, 0).toStdString());
-
-		if (spath.starts_with(Emulator::vfs_boot_prefix))
-		{
-			sys_log.notice("Booting application from command line using VFS path: %s", spath.substr(Emulator::vfs_boot_prefix.size()));
-		}
-		else if (spath.starts_with(Emulator::game_id_boot_prefix))
-		{
-			sys_log.notice("Booting application from command line using GAMEID: %s", spath.substr(Emulator::game_id_boot_prefix.size()));
-		}
-		else
-		{
-			sys_log.notice("Booting application from command line: %s", spath);
-		}
-
-		// Propagate command line arguments
-		std::vector<std::string> rpcs3_argv;
-
-		if (args.length() > 1)
-		{
-			// Reserve empty string for executable path
-			rpcs3_argv.emplace_back();
-
-			rpcs3_argv.emplace_back();
-
-			for (int i = 1; i != args.length(); i++)
-			{
-				const std::string arg = args[i].toStdString();
-				rpcs3_argv.emplace_back(arg);
-
-				sys_log.error("Optional command line argument %d: %s"
-					"\nPlease pass emulation arguments after an empty \"--\" paramater."
-					"\nIn the future, the emulator would not support optional arguments without it.", i, arg);
-			}
-		}
-
-		// Additional arguments passed after "--"
-		if (emu_argv.size() > (args.isEmpty() ? 1 : 0))
-		{
-			// Reserve empty string for executable path
-			if (rpcs3_argv.empty())
-			{
-				rpcs3_argv.emplace_back();
-			}
-
-			rpcs3_argv.emplace_back();
-
-			for (usz i = args.isEmpty() ? 1 : 0; i != emu_argv.size(); i++)
-			{
-				const std::string arg = args[i].toStdString();
-				rpcs3_argv.emplace_back(arg);
-
-				sys_log.success("Optional command line argument %d: %s", i, arg);
-			}
-		}
-
-		std::string config_path;
-
-		if (parser.isSet(arg_config))
-		{
-			config_path = parser.value(config_option).toStdString();
-
-			if (!fs::is_file(config_path))
-			{
-				report_fatal_error(fmt::format("No config file found: %s", config_path));
-			}
-		}
-
-		if (parser.isSet(arg_input_config))
-		{
-			if (!s_no_gui)
-			{
-				report_fatal_error(fmt::format("The option '%s' can only be used in combination with '%s'.", arg_input_config, arg_no_gui));
-			}
-
-			g_input_config_override = parser.value(input_config_option).toStdString();
-
-			if (g_input_config_override.empty())
-			{
-				report_fatal_error(fmt::format("Input config file name is empty"));
-			}
-		}
-
-		if (!spath.starts_with("%RPCS3_"))
-		{
-			spath = QFileInfo(::at32(args, 0)).absoluteFilePath().toStdString();
-		}
-
-		// Postpone startup to main event loop
-		Emu.CallFromMainThread([path = std::move(spath), rpcs3_argv = std::move(rpcs3_argv), config_path = std::move(config_path)]() mutable
-		{
-			Emu.argv = std::move(rpcs3_argv);
-			Emu.SetForceBoot(true);
-
-			const cfg_mode config_mode = config_path.empty() ? cfg_mode::custom : cfg_mode::config_override;
-
-			if (const game_boot_result error = Emu.BootGame(path, "", false, config_mode, config_path); error != game_boot_result::no_errors)
-			{
-				sys_log.error("Booting '%s' with cli argument failed: reason: %s", path, error);
-
-				if (s_headless || s_no_gui)
-				{
-					report_fatal_error(fmt::format("Booting '%s' failed!\n\nReason: %s", path, error));
-				}
-			}
-		});
-	}
-	else if (s_headless || s_no_gui)
-	{
-		// If launched from CMD
-		utils::attach_console(utils::console_stream::std_out | utils::console_stream::std_err, false);
-
-		sys_log.error("Cannot run %s mode without boot target. Terminating...", s_headless ? "headless" : "no-gui");
-		fprintf(stderr, "Cannot run %s mode without boot target. Terminating...\n", s_headless ? "headless" : "no-gui");
-
-		if (s_no_gui)
-		{
-			QMessageBox::warning(nullptr, QObject::tr("Missing command-line arguments!"), QObject::tr("Cannot run no-gui mode without boot target.\nTerminating..."));
-		}
-
-		Emu.Quit(true);
-		return 0;
-	}
-
-	// run event loop (maybe only needed for the gui application)
-	return app->exec();
-}
diff --git a/rpcs3/rpcs3.h b/rpcs3/rpcs3.h
deleted file mode 100644
index 2441b3c83b..0000000000
--- a/rpcs3/rpcs3.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-int run_rpcs3(int argc, char** argv);
diff --git a/rpcs3/rpcs3.icns b/rpcs3/rpcs3.icns
index 491a468cb0..ca6e390b9e 100644
Binary files a/rpcs3/rpcs3.icns and b/rpcs3/rpcs3.icns differ
diff --git a/rpcs3/rpcs3.metainfo.xml b/rpcs3/rpcs3.metainfo.xml
index 327c90c0f2..27031198e9 100644
--- a/rpcs3/rpcs3.metainfo.xml
+++ b/rpcs3/rpcs3.metainfo.xml
@@ -1,52 +1,37 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!-- Copyright 2018 RPCS3 -->
-<component type="desktop">
-    <!--Created with jdAppStreamEdit 8.0-->
-    <id>net.rpcs3.RPCS3</id>
-    <name>RPCS3</name>
-    <summary>Open-source Sony PlayStation 3 Emulator</summary>
-    <summary xml:lang="de">Quelloffener Sony PlayStation 3 Emulator</summary>
-    <developer_name>RPCS3 Developers</developer_name>
-    <launchable type="desktop-id">rpcs3.desktop</launchable>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2018 RPCS3-->
+<component type="desktop-application">
+    <id>RPCS3</id>
     <metadata_license>FSFAP</metadata_license>
     <project_license>GPL-2.0-only</project_license>
+    <name>RPCS3</name>
+    <summary>Open-source Sony PlayStation 3 Emulator</summary>
+
     <description>
-        <p>RPCS3 is an experimental open-source Sony PlayStation 3 emulator and debugger written in C++ for Windows and Linux. RPCS3 started development in May of 2011 by its founders DH and Hykem.
-The emulator is currently capable of running over 2500 commercial titles powered by Vulkan and OpenGL.</p>
-        <p xml:lang="de">RPCS3 ist ein experimenteller, quelloffener Emulator und Debugger für die Sony PlayStation 3, der in C++ für Windows und Linux entwickelt wurde. Die Entwicklung von RPCS3 begann im Mai 2011 durch seine Gründer DH und Hykem. Der Emulator ist derzeit in der Lage, über 2500 kommerzielle Titel mit Vulkan und OpenGL auszuführen.</p>
-        <p>The goal of this project is to experiment, research, and educate on the topic of PlayStation 3 emulation that can be performed on compatible devices and operating systems.
-All information was obtained legally by purchasing PlayStation 3 hardware and software. Additional information was obtained from various sources on the internet that include but is not limited to system hardware and software documentation.
-Most of this information can be found on the PlayStation 3 Developer Wiki.</p>
-        <p xml:lang="de">Das Ziel dieses Projekts besteht darin, auf dem Gebiet der PlayStation 3 Emulation auf kompatiblen Geräten und Betriebssystemen zu experimentieren, zu forschen und Wissen zu vermitteln. Alle Informationen wurden legal durch den Kauf von PlayStation 3 Hardware und Software erlangt. Zusätzliche Informationen wurden aus verschiedenen Quellen im Internet bezogen, einschließlich, aber nicht beschränkt auf System-Hardware- und Software-Dokumentation. Die meisten dieser Informationen sind im PlayStation 3 Developer Wiki zu finden.</p>
+        <p>
+            RPCS3 is an experimental open-source Sony PlayStation 3 emulator and debugger written in C++ for Windows and Linux. RPCS3 started development in May of 2011 by its founders DH and Hykem.
+            The emulator is currently capable of running over 1800 commercial titles powered by Vulkan and OpenGL.
+        </p>
+        <p>
+            The goal of this project is to experiment, research, and educate on the topic of PlayStation 3 emulation that can be performed on compatible devices and operating systems.
+            All information was obtained legally by purchasing PlayStation 3 hardware and software. Additional information was obtained from various sources on the internet that include but is not limited to system hardware and software documentation.
+            Most of this information can be found on the PlayStation 3 Developer Wiki.
+        </p>
     </description>
-    <screenshots>
-        <screenshot type="default">
-            <caption>RPCS3 running a game using the Vulkan backend</caption>
-            <image type="source">https://rpcs3.net/blog/wp-content/uploads/2017/05/progress/vklinux.jpg</image>
-        </screenshot>
-    </screenshots>
+
+    <launchable type="desktop-id">rpcs3.desktop</launchable>
+
     <url type="homepage">https://rpcs3.net</url>
     <url type="bugtracker">https://github.com/RPCS3/rpcs3/issues</url>
-    <url type="faq">https://rpcs3.net/faq</url>
     <url type="help">https://rpcs3.net/quickstart</url>
-    <url type="donation">https://www.patreon.com/Nekotekina</url>
-    <url type="vcs-browser">https://github.com/RPCS3/rpcs3</url>
-    <url type="contribute">https://github.com/RPCS3/rpcs3#contributing</url>
-    <categories>
-        <category>Game</category>
-        <category>Emulator</category>
-    </categories>
-    <recommends>
-        <control>gamepad</control>
-        <!-- 768 logical pixels is given as the value for small screens in the AppStream spec -->
-        <display_length compare="ge">768</display_length>
-    </recommends>
-    <content_rating type="oars-1.1"/>
+
+    <screenshots>
+        <screenshot type="default">
+            <image>https://rpcs3.net/blog/wp-content/uploads/2017/05/progress/vklinux.jpg</image>
+        </screenshot>
+    </screenshots>
+
     <provides>
         <binary>rpcs3</binary>
     </provides>
-    <keywords>
-        <keyword>ps3</keyword>
-        <keyword>playstation</keyword>
-    </keywords>
 </component>
diff --git a/rpcs3/rpcs3.plist.in b/rpcs3/rpcs3.plist.in
index 53902adea3..1073bceb0c 100644
--- a/rpcs3/rpcs3.plist.in
+++ b/rpcs3/rpcs3.plist.in
@@ -22,21 +22,9 @@
 	<string>${RPCS3_GIT_TAG}</string>
 	<key>CFBundleVersion</key>
 	<string>${RPCS3_GIT_TAG}</string>
- 	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
 	<key>NSHumanReadableCopyright</key>
 	<string>Licensed under GPLv2</string>
 	<key>NSHighResolutionCapable</key>
 	<true/>
-	<key>LSApplicationCategoryType</key>
-	<string>public.app-category.games</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>14.0</string>
-	<key>NSCameraUsageDescription</key>
-	<string>The camera will be used for PlayStation Eye emulation</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>The microphone will be used for Chat/SingStar emulation</string>
 </dict>
 </plist>
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index 0e4dab8f27..02d1452e7e 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|x64">
@@ -13,6 +13,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}</ProjectGuid>
     <RootNamespace>rpcs3</RootNamespace>
+    <Keyword>Qt4VSv1.0</Keyword>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -51,54 +52,55 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">rpcs3</TargetName>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">rpcs3d</TargetName>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)3rdparty\7zip\7zip\C;$(SolutionDir)3rdparty\hidapi\hidapi\hidapi;.\;$(SolutionDir);$(SolutionDir)3rdparty\asmjit\asmjit\src;$(SolutionDir)3rdparty\yaml-cpp\yaml-cpp\include;$(SolutionDir)3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)3rdparty\libpng\libpng;$(SolutionDir)3rdparty\GL;$(SolutionDir)3rdparty\stblib\stb;$(SolutionDir)3rdparty\openal\openal-soft\include\AL;$(SolutionDir)3rdparty\pugixml\src;$(SolutionDir)3rdparty\Optional;$(SolutionDir)3rdparty\discord-rpc\discord-rpc\include;$(SolutionDir)3rdparty\zlib\zlib;$(SolutionDir)3rdparty\libsdl-org\SDL\include;$(SolutionDir)3rdparty\fusion\fusion\Fusion</IncludePath>
-    <LibraryPath>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
+    <IncludePath>..\3rdparty\7z\src;..\3rdparty\hidapi\hidapi\hidapi;.\;..\;..\3rdparty\asmjit\asmjit\src;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\XAudio2Redist\include;..\3rdparty\libpng\libpng;..\3rdparty\GL;..\3rdparty\stblib\include;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib\zlib</IncludePath>
+    <LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LibraryPath>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
-    <IncludePath>$(SolutionDir)3rdparty\7zip\7zip\C;$(SolutionDir)3rdparty\hidapi\hidapi\hidapi;.\;$(SolutionDir);$(SolutionDir)3rdparty\asmjit\asmjit\src;$(SolutionDir)3rdparty\yaml-cpp\yaml-cpp\include;$(SolutionDir)3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)3rdparty\libpng\libpng;$(SolutionDir)3rdparty\GL;$(SolutionDir)3rdparty\stblib\stb;$(SolutionDir)3rdparty\openal\openal-soft\include\AL;$(SolutionDir)3rdparty\pugixml\src;$(SolutionDir)3rdparty\Optional;$(SolutionDir)3rdparty\discord-rpc\discord-rpc\include;$(SolutionDir)3rdparty\zlib\zlib;$(SolutionDir)3rdparty\libsdl-org\SDL\include;$(SolutionDir)3rdparty\fusion\fusion\Fusion</IncludePath>
+    <LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
+    <IncludePath>..\3rdparty\7z\src;..\3rdparty\hidapi\hidapi\hidapi;.\;..\;..\3rdparty\asmjit\asmjit\src;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\XAudio2Redist\include;..\3rdparty\libpng\libpng;..\3rdparty\GL;..\3rdparty\stblib\include;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib\zlib</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\opencv\opencv\opencv411\build\include;$(SolutionDir)3rdparty\SoundTouch\soundtouch\include;$(SolutionDir)3rdparty\cubeb\extra;$(SolutionDir)3rdparty\cubeb\cubeb\include\;$(SolutionDir)3rdparty\flatbuffers\include;$(SolutionDir)3rdparty\wolfssl\wolfssl;$(SolutionDir)3rdparty\wolfssl\extra\win32;$(SolutionDir)3rdparty\curl\curl\include;$(SolutionDir)3rdparty\rtmidi\rtmidi;$(SolutionDir)3rdparty\libusb\libusb\libusb;$(VULKAN_SDK)\Include;$(SolutionDir)3rdparty\libsdl-org\SDL\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtConcurrent;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtSvgWidgets;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtMultimedia;$(QTDIR)\mkspecs\win32-msvc;.\release;.\QTGeneratedFiles\$(ConfigurationName);.\QTGeneratedFiles;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Zc:__cplusplus -Zc:strictStrings -Zc:throwingNew- -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>..\3rdparty\flatbuffers\include;..\3rdparty\wolfssl;..\3rdparty\curl\curl\include;..\3rdparty\libusb\libusb\libusb;$(VULKAN_SDK)\Include;..\3rdparty\XAudio2Redist\include;$(QTDIR)\include;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtCore;.\release;$(QTDIR)\mkspecs\win32-msvc2015;.\QTGeneratedFiles\$(ConfigurationName);.\QTGeneratedFiles;$(QTDIR)\include\QtWinExtras;$(QTDIR)\include\QtConcurrent;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>-Zc:strictStrings -Zc:throwingNew- -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)</AdditionalOptions>
       <AssemblerListingLocation>release\</AssemblerListingLocation>
       <BrowseInformation>false</BrowseInformation>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4577;4467;4281;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4577;4467;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;WIN32;WIN64;WIN32_LEAN_AND_MEAN;HAVE_VULKAN;HAVE_OPENCV;CV_IGNORE_DEBUG_BUILD_GUARD;MINIUPNP_STATICLIB;ZLIB_CONST;AL_LIBTYPE_STATIC;WOLFSSL_USER_SETTINGS;HAVE_SDL3;WITH_DISCORD_RPC;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;NDEBUG;QT_CONCURRENT_LIB;QT_MULTIMEDIA_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_SVG_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;UNICODE;WIN32;WIN64;WITH_DISCORD_RPC;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;NDEBUG;QT_WINEXTRAS_LIB;QT_CONCURRENT_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <WarningLevel>Level3</WarningLevel>
-      <ExternalWarningLevel>TurnOffAllWarnings</ExternalWarningLevel>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>opencv_world4110.lib;DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;imm32.lib;ksuser.lib;version.lib;OpenAL32.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslang.lib;OSDependent.lib;SPIRV.lib;MachineIndependent.lib;GenericCodeGen.lib;Advapi32.lib;user32.lib;zlib.lib;zstd.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Core.lib;Qt6Gui.lib;Qt6Widgets.lib;Qt6Concurrent.lib;Qt6Multimedia.lib;Qt6MultimediaWidgets.lib;Qt6Svg.lib;Qt6SvgWidgets.lib;7zip.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;SDL.lib;fusion.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\opencv\opencv\opencv411\build\x64\lib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\glslang;$(SolutionDir)build\lib_ext\$(CONFIGURATION)-$(PLATFORM);$(QTDIR)\lib;$(VULKAN_SDK)\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Ole32.lib;gdi32.lib;..\hidapi.lib;..\libusb-1.0.lib;winmm.lib;OpenAL.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;MachineIndependent.lib;GenericCodeGen.lib;Advapi32.lib;user32.lib;zlib.lib;..\libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;$(QTDIR)\lib\qtmain.lib;shell32.lib;$(QTDIR)\lib\Qt5Widgets.lib;$(QTDIR)\lib\Qt5Gui.lib;$(QTDIR)\lib\Qt5Core.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5WinExtras.lib;Qt5Concurrent.lib;7zlib.lib;SPIRV-Tools.lib;SPIRV-Tools-opt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\3rdparty\OpenAL\libs\Win64;..\3rdparty\glslang\build\hlsl\Release;..\3rdparty\glslang\build\SPIRV\Release;..\3rdparty\glslang\build\OGLCompilersDLL\Release;..\3rdparty\glslang\build\glslang\OSDependent\Windows\Release;..\3rdparty\glslang\build\glslang\Release;..\3rdparty\SPIRV\build\source\Release;..\3rdparty\SPIRV\build\source\opt\Release;..\lib\$(CONFIGURATION)-$(PLATFORM);..\3rdparty\XAudio2Redist\libs;..\3rdparty\discord-rpc\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories);$(VULKAN_SDK)\Lib</AdditionalLibraryDirectories>
       <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <GenerateDebugInformation>Debug</GenerateDebugInformation>
       <IgnoreImportLibrary>true</IgnoreImportLibrary>
       <LinkIncremental>false</LinkIncremental>
       <OutputFile>$(OutDir)\rpcs3.exe</OutputFile>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <SubSystem>Windows</SubSystem>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
+      <BaseAddress>0x10000</BaseAddress>
+      <DelayLoadDLLs>xaudio2_9redist.dll</DelayLoadDLLs>
     </Link>
     <Midl>
       <DefaultCharType>Unsigned</DefaultCharType>
@@ -110,35 +112,25 @@
     </ResourceCompile>
     <PostBuildEvent>
       <Command>
-        $(QTDIR)\bin\windeployqt6 --no-compiler-runtime --no-opengl-sw --no-patchqt --no-translations --no-quick --no-system-d3d-compiler --no-system-dxc-compiler --no-quick-import --plugindir "$(TargetDir)qt6\plugins" --release "$(TargetPath)"
-        xcopy /y /d "$(SolutionDir)3rdparty\opencv\opencv\opencv411\build\x64\bin\opencv_world4110.dll" "$(OutDir)"
+        $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir "$(TargetDir)qt\plugins" --release "$(TargetPath)"
       </Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>
       </Message>
     </PostBuildEvent>
-    <PreLinkEvent Condition="'$(GTestInstalled)' == 'true'">
-      <Command>@echo off
-&gt; "$(IntermediateOutputPath)obj_files.rsp" (
-  for /F "delims=" %%i in ('dir "$(IntermediateOutputPath)*.obj" /B ^| findstr /V /I "main.obj"') do (
-    echo "$(IntermediateOutputPath)%%i"
-  )
-)
-"$(VCToolsInstallDir)bin\Hostx64\x64\lib.exe" /out:"$(SolutionDir)build\lib\$(Configuration)-$(Platform)\rpcs3.lib" @$(IntermediateOutputPath)obj_files.rsp</Command>
-    </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\opencv\opencv\opencv411\build\include;$(SolutionDir)3rdparty\SoundTouch\soundtouch\include;$(SolutionDir)3rdparty\cubeb\extra;$(SolutionDir)3rdparty\cubeb\cubeb\include\;$(SolutionDir)3rdparty\flatbuffers\include;$(SolutionDir)3rdparty\wolfssl\wolfssl;$(SolutionDir)3rdparty\wolfssl\extra\win32;$(SolutionDir)3rdparty\curl\curl\include;$(SolutionDir)3rdparty\rtmidi\rtmidi;$(SolutionDir)3rdparty\libusb\libusb\libusb;$(VULKAN_SDK)\Include;$(SolutionDir)3rdparty\libsdl-org\SDL\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtConcurrent;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtSvgWidgets;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtMultimedia;$(QTDIR)\mkspecs\win32-msvc;.\debug;.\QTGeneratedFiles\$(ConfigurationName);.\QTGeneratedFiles;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Zc:__cplusplus -Zc:strictStrings -Zc:throwingNew- -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>..\3rdparty\flatbuffers\include;..\3rdparty\wolfssl;..\3rdparty\curl\curl\include;..\3rdparty\libusb\libusb\libusb;$(VULKAN_SDK)\Include;..\3rdparty\XAudio2Redist\include;$(QTDIR)\include;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtCore;.\debug;$(QTDIR)\mkspecs\win32-msvc2015;.\QTGeneratedFiles\$(ConfigurationName);.\QTGeneratedFiles;$(QTDIR)\include\QtWinExtras;$(QTDIR)\include\QtConcurrent;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>-Zc:strictStrings -Zc:throwingNew- -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)</AdditionalOptions>
       <AssemblerListingLocation>debug\</AssemblerListingLocation>
       <BrowseInformation>false</BrowseInformation>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4577;4467;4281;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4577;4467;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;WIN32;WIN64;WIN32_LEAN_AND_MEAN;HAVE_VULKAN;HAVE_OPENCV;CV_IGNORE_DEBUG_BUILD_GUARD;MINIUPNP_STATICLIB;ZLIB_CONST;AL_LIBTYPE_STATIC;WOLFSSL_USER_SETTINGS;HAVE_SDL3;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_MULTIMEDIA_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_SVG_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;UNICODE;WIN32;WIN64;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_WINEXTRAS_LIB;QT_CONCURRENT_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -147,17 +139,20 @@
       <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>opencv_world4110.lib;DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;imm32.lib;ksuser.lib;version.lib;OpenAL32.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslangd.lib;OSDependentd.lib;SPIRVd.lib;MachineIndependentd.lib;GenericCodeGend.lib;Advapi32.lib;user32.lib;zlib.lib;zstd.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Cored.lib;Qt6Guid.lib;Qt6Widgetsd.lib;Qt6Concurrentd.lib;Qt6Multimediad.lib;Qt6MultimediaWidgetsd.lib;Qt6Svgd.lib;Qt6SvgWidgetsd.lib;7zip.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;SDL.lib;fusion.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\opencv\opencv\opencv411\build\x64\lib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\glslang;$(SolutionDir)build\lib\$(CONFIGURATION)-$(PLATFORM);$(QTDIR)\lib;$(VULKAN_SDK)\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Ole32.lib;gdi32.lib;..\hidapi.lib;..\libusb-1.0.lib;winmm.lib;OpenAL.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslangd.lib;OSDependentd.lib;OGLCompilerd.lib;SPIRVd.lib;MachineIndependentd.lib;GenericCodeGend.lib;Advapi32.lib;user32.lib;zlib.lib;..\libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;$(QTDIR)\lib\qtmaind.lib;shell32.lib;$(QTDIR)\lib\Qt5Widgetsd.lib;$(QTDIR)\lib\Qt5Guid.lib;$(QTDIR)\lib\Qt5Cored.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5WinExtrasd.lib;Qt5Concurrentd.lib;7zlib.lib;SPIRV-Tools.lib;SPIRV-Tools-opt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\3rdparty\OpenAL\libs\Win64;..\3rdparty\glslang\build\hlsl\Debug;..\3rdparty\glslang\build\SPIRV\Debug;..\3rdparty\glslang\build\OGLCompilersDLL\Debug;..\3rdparty\glslang\build\glslang\OSDependent\Windows\Debug;..\3rdparty\glslang\build\glslang\Debug;..\3rdparty\SPIRV\build\source\opt\Debug;..\3rdparty\XAudio2Redist\libs;..\3rdparty\discord-rpc\lib;..\lib\$(CONFIGURATION)-$(PLATFORM);$(QTDIR)\lib;%(AdditionalLibraryDirectories);$(VULKAN_SDK)\Lib</AdditionalLibraryDirectories>
       <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'"  /VERBOSE %(AdditionalOptions)</AdditionalOptions>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <GenerateDebugInformation>Debug</GenerateDebugInformation>
       <IgnoreImportLibrary>true</IgnoreImportLibrary>
       <OutputFile>$(OutDir)\rpcs3d.exe</OutputFile>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <SubSystem>Windows</SubSystem>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+      <BaseAddress>0x10000</BaseAddress>
+      <DelayLoadDLLs>xaudio2_9redist.dll</DelayLoadDLLs>
     </Link>
     <Midl>
       <DefaultCharType>Unsigned</DefaultCharType>
@@ -169,38 +164,18 @@
     </ResourceCompile>
     <PostBuildEvent>
       <Command>
-        $(QTDIR)\bin\windeployqt6 --no-compiler-runtime --no-opengl-sw --no-patchqt --no-translations --no-quick --no-system-d3d-compiler --no-system-dxc-compiler --no-quick-import --plugindir "$(TargetDir)qt6\plugins" --debug "$(TargetPath)"
-        xcopy /y /d "$(SolutionDir)3rdparty\opencv\opencv\opencv411\build\x64\bin\opencv_world4110.dll" "$(OutDir)"
+        $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir "$(TargetDir)qt\plugins" --debug "$(TargetPath)"
       </Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>
       </Message>
     </PostBuildEvent>
-    <PreLinkEvent Condition="'$(GTestInstalled)' == 'true'">
-      <Command>@echo off
-&gt; "$(IntermediateOutputPath)obj_files.rsp" (
-  for /F "delims=" %%i in ('dir "$(IntermediateOutputPath)*.obj" /B ^| findstr /V /I "main.obj"') do (
-    echo "$(IntermediateOutputPath)%%i"
-  )
-)
-"$(VCToolsInstallDir)bin\Hostx64\x64\lib.exe" /out:"$(SolutionDir)build\lib\$(Configuration)-$(Platform)\rpcs3d.lib" @$(IntermediateOutputPath)obj_files.rsp</Command>
-    </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="display_sleep_control.cpp" />
     <ClCompile Include="Input\dualsense_pad_handler.cpp" />
-    <ClCompile Include="Input\gui_pad_thread.cpp" />
     <ClCompile Include="Input\hid_pad_handler.cpp" />
-    <ClCompile Include="Input\ps_move_calibration.cpp" />
-    <ClCompile Include="Input\ps_move_config.cpp" />
-    <ClCompile Include="Input\ps_move_tracker.cpp" />
-    <ClCompile Include="Input\raw_mouse_config.cpp" />
-    <ClCompile Include="Input\raw_mouse_handler.cpp" />
-    <ClCompile Include="Input\ps_move_handler.cpp" />
-    <ClCompile Include="Input\sdl_pad_handler.cpp" />
-    <ClCompile Include="Input\sdl_instance.cpp" />
-    <ClCompile Include="Input\skateboard_pad_handler.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="main_application.cpp" />
     <ClCompile Include="Input\basic_keyboard_handler.cpp" />
@@ -211,65 +186,36 @@
     <ClCompile Include="Input\keyboard_pad_handler.cpp" />
     <ClCompile Include="Input\mm_joystick_handler.cpp" />
     <ClCompile Include="Input\pad_thread.cpp" />
-    <ClCompile Include="Input\product_info.cpp" />
-    <ClCompile Include="module_verifier.cpp" />
     <ClCompile Include="QTGeneratedFiles\Debug\moc_about_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_auto_pause_settings_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_basic_mouse_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_breakpoint_list.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_call_stack_list.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_camera_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_ps_move_tracker_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_cg_disasm_window.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_cheat_manager.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_config_checker.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_custom_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_debugger_add_bp_window.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_debugger_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_debugger_list.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_dimensions_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_downloader.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_elf_memory_dumping_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_emulated_pad_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_emulated_logitech_g27_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_emu_settings.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -279,30 +225,15 @@
     <ClCompile Include="QTGeneratedFiles\Debug\moc_find_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_flow_widget.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_flow_widget_item.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_game_compatibility.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_game_list.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_game_list_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_game_list_grid.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_game_list_grid_item.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_game_list_table.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_gs_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -315,18 +246,12 @@
     <ClCompile Include="QTGeneratedFiles\Debug\moc_headless_application.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_infinity_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_input_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_instruction_editor_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_ipc_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_kernel_explorer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -345,7 +270,7 @@
     <ClCompile Include="QTGeneratedFiles\Debug\moc_main_window.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_music_player_dialog.cpp">
+    <ClCompile Include="QTGeneratedFiles\Debug\moc_memory_string_searcher.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_memory_viewer_panel.cpp">
@@ -354,9 +279,6 @@
     <ClCompile Include="QTGeneratedFiles\Debug\moc_microphone_creator.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_midi_creator.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_msg_dialog_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -366,15 +288,9 @@
     <ClCompile Include="QTGeneratedFiles\Debug\moc_pad_led_settings_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_pad_motion_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_pad_settings_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_patch_creator_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_patch_manager_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -384,18 +300,6 @@
     <ClCompile Include="QTGeneratedFiles\Debug\moc_pkg_install_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_qt_camera_handler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_qt_music_handler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_raw_mouse_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_recvmessage_dialog_frame.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_register_editor_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -417,54 +321,30 @@
     <ClCompile Include="QTGeneratedFiles\Debug\moc_save_manager_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_screenshot_item.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_screenshot_manager_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_screenshot_preview.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_sendmessage_dialog_frame.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_settings.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_settings_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_shortcut_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_shortcut_handler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_shortcut_settings.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_skylander_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_vfs_tool_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_syntax_highlighter.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_system_cmd_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_tooltips.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_trophy_manager_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_savestate_manager_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_trophy_notification_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -477,18 +357,9 @@
     <ClCompile Include="QTGeneratedFiles\Debug\moc_vfs_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_vfs_dialog_path_widget.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_vfs_dialog_tab.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_vfs_dialog_usb_input.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_vfs_dialog_usb_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_welcome_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -516,48 +387,24 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_call_stack_list.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_camera_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_ps_move_tracker_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_cg_disasm_window.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_cheat_manager.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_config_checker.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_custom_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_debugger_add_bp_window.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_debugger_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_debugger_list.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_dimensions_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_downloader.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_elf_memory_dumping_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_emulated_pad_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_emulated_logitech_g27_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_emu_settings.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -567,30 +414,15 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_find_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_flow_widget.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_flow_widget_item.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_game_compatibility.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_game_list.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_game_list_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_game_list_grid.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_game_list_grid_item.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_game_list_table.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_gs_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -603,18 +435,12 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_headless_application.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_infinity_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_input_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_instruction_editor_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_ipc_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_kernel_explorer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -633,7 +459,7 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_main_window.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_music_player_dialog.cpp">
+    <ClCompile Include="QTGeneratedFiles\Release\moc_memory_string_searcher.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_memory_viewer_panel.cpp">
@@ -642,9 +468,6 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_microphone_creator.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_midi_creator.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_msg_dialog_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -654,15 +477,9 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_pad_led_settings_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_pad_motion_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_pad_settings_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_patch_creator_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_patch_manager_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -672,15 +489,6 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_pkg_install_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_qt_camera_handler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_qt_music_handler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_recvmessage_dialog_frame.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_register_editor_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -702,54 +510,30 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_save_manager_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_screenshot_item.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_screenshot_manager_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_screenshot_preview.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_sendmessage_dialog_frame.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_settings.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_settings_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_shortcut_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_shortcut_handler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_shortcut_settings.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_skylander_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_vfs_tool_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_syntax_highlighter.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_system_cmd_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_tooltips.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_trophy_manager_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_savestate_manager_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_trophy_notification_frame.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -762,116 +546,54 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_vfs_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_vfs_dialog_path_widget.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_vfs_dialog_tab.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_vfs_dialog_usb_input.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_vfs_dialog_usb_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_welcome_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_basic_mouse_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_raw_mouse_settings_dialog.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="rpcs3.cpp" />
     <ClCompile Include="rpcs3qt\about_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\basic_mouse_settings_dialog.cpp" />
     <ClCompile Include="rpcs3qt\breakpoint_handler.cpp" />
     <ClCompile Include="rpcs3qt\breakpoint_list.cpp" />
     <ClCompile Include="rpcs3qt\call_stack_list.cpp" />
-    <ClCompile Include="rpcs3qt\camera_settings_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\gui_game_info.cpp" />
-    <ClCompile Include="rpcs3qt\permissions.cpp" />
-    <ClCompile Include="rpcs3qt\ps_move_tracker_dialog.cpp" />
     <ClCompile Include="rpcs3qt\cheat_manager.cpp" />
     <ClCompile Include="rpcs3qt\config_adapter.cpp" />
-    <ClCompile Include="rpcs3qt\config_checker.cpp" />
     <ClCompile Include="rpcs3qt\curl_handle.cpp" />
     <ClCompile Include="rpcs3qt\custom_dialog.cpp" />
     <ClCompile Include="rpcs3qt\custom_table_widget_item.cpp" />
     <ClCompile Include="rpcs3qt\debugger_list.cpp" />
-    <ClCompile Include="rpcs3qt\dimensions_dialog.cpp" />
     <ClCompile Include="rpcs3qt\downloader.cpp" />
-    <ClCompile Include="rpcs3qt\elf_memory_dumping_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\emulated_pad_settings_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\emulated_logitech_g27_settings_dialog.cpp" />
     <ClCompile Include="rpcs3qt\fatal_error_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\flow_layout.cpp" />
-    <ClCompile Include="rpcs3qt\flow_widget.cpp" />
-    <ClCompile Include="rpcs3qt\flow_widget_item.cpp" />
     <ClCompile Include="rpcs3qt\game_list.cpp" />
-    <ClCompile Include="rpcs3qt\game_list_base.cpp" />
-    <ClCompile Include="rpcs3qt\game_list_delegate.cpp" />
-    <ClCompile Include="rpcs3qt\game_list_grid_item.cpp" />
-    <ClCompile Include="rpcs3qt\game_list_table.cpp" />
     <ClCompile Include="rpcs3qt\gui_application.cpp" />
-    <ClCompile Include="rpcs3qt\infinity_dialog.cpp" />
     <ClCompile Include="rpcs3qt\input_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\ipc_settings_dialog.cpp" />
     <ClCompile Include="rpcs3qt\localized.cpp" />
-    <ClCompile Include="rpcs3qt\localized_emu.cpp" />
     <ClCompile Include="rpcs3qt\log_viewer.cpp" />
     <ClCompile Include="rpcs3qt\microphone_creator.cpp" />
-    <ClCompile Include="rpcs3qt\midi_creator.cpp" />
-    <ClCompile Include="rpcs3qt\movie_item.cpp" />
-    <ClCompile Include="rpcs3qt\movie_item_base.cpp" />
     <ClCompile Include="rpcs3qt\osk_dialog_frame.cpp" />
     <ClCompile Include="rpcs3qt\pad_led_settings_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\pad_motion_settings_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\patch_creator_dialog.cpp" />
     <ClCompile Include="rpcs3qt\patch_manager_dialog.cpp" />
     <ClCompile Include="rpcs3qt\pkg_install_dialog.cpp" />
     <ClCompile Include="rpcs3qt\persistent_settings.cpp" />
-    <ClCompile Include="rpcs3qt\progress_indicator.cpp" />
-    <ClCompile Include="rpcs3qt\qt_camera_handler.cpp" />
-    <ClCompile Include="rpcs3qt\qt_music_handler.cpp" />
-    <ClCompile Include="rpcs3qt\qt_video_source.cpp" />
-    <ClCompile Include="rpcs3qt\raw_mouse_settings_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\recvmessage_dialog_frame.cpp" />
     <ClCompile Include="rpcs3qt\render_creator.cpp" />
     <ClCompile Include="rpcs3qt\rpcn_settings_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\screenshot_item.cpp" />
     <ClCompile Include="rpcs3qt\screenshot_manager_dialog.cpp" />
     <ClCompile Include="rpcs3qt\screenshot_preview.cpp" />
-    <ClCompile Include="rpcs3qt\sendmessage_dialog_frame.cpp" />
     <ClCompile Include="rpcs3qt\settings.cpp" />
-    <ClCompile Include="rpcs3qt\shortcut_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\shortcut_handler.cpp" />
-    <ClCompile Include="rpcs3qt\shortcut_settings.cpp" />
-    <ClCompile Include="rpcs3qt\shortcut_utils.cpp" />
     <ClCompile Include="rpcs3qt\skylander_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\system_cmd_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\table_item_delegate.cpp" />
     <ClCompile Include="rpcs3qt\tooltips.cpp" />
     <ClCompile Include="rpcs3qt\update_manager.cpp" />
-    <ClCompile Include="rpcs3qt\qt_camera_video_sink.cpp" />
-    <ClCompile Include="rpcs3qt\uuid.cpp" />
-    <ClCompile Include="rpcs3qt\vfs_dialog_path_widget.cpp" />
-    <ClCompile Include="rpcs3qt\vfs_dialog_usb_input.cpp" />
-    <ClCompile Include="rpcs3qt\vfs_dialog_usb_tab.cpp" />
-    <ClCompile Include="rpcs3qt\vfs_tool_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\video_label.cpp" />
     <ClCompile Include="rpcs3qt\_discord_utils.cpp" />
     <ClCompile Include="rpcs3qt\find_dialog.cpp" />
     <ClCompile Include="rpcs3qt\game_compatibility.cpp" />
     <ClCompile Include="rpcs3qt\game_list_grid.cpp" />
+    <ClCompile Include="rpcs3qt\game_list_grid_delegate.cpp" />
     <ClCompile Include="rpcs3qt\progress_dialog.cpp" />
     <ClCompile Include="rpcs3qt\qt_utils.cpp" />
     <ClCompile Include="rpcs3qt\syntax_highlighter.cpp" />
     <ClCompile Include="rpcs3qt\save_data_info_dialog.cpp" />
     <ClCompile Include="rpcs3qt\save_manager_dialog.cpp" />
     <ClCompile Include="rpcs3qt\trophy_manager_dialog.cpp" />
-    <ClCompile Include="rpcs3qt\savestate_manager_dialog.cpp" />
     <ClCompile Include="rpcs3qt\trophy_notification_frame.cpp" />
     <ClCompile Include="rpcs3qt\trophy_notification_helper.cpp" />
     <ClCompile Include="rpcs3qt\user_account.cpp" />
@@ -882,7 +604,6 @@
     <ClCompile Include="headless_application.cpp" />
     <ClCompile Include="rpcs3qt\auto_pause_settings_dialog.cpp" />
     <ClCompile Include="rpcs3qt\cg_disasm_window.cpp" />
-    <ClCompile Include="rpcs3qt\debugger_add_bp_window.cpp" />
     <ClCompile Include="rpcs3qt\debugger_frame.cpp" />
     <ClCompile Include="rpcs3qt\emu_settings.cpp" />
     <ClCompile Include="rpcs3qt\game_list_frame.cpp" />
@@ -893,7 +614,6 @@
     <ClCompile Include="rpcs3qt\kernel_explorer.cpp" />
     <ClCompile Include="rpcs3qt\log_frame.cpp" />
     <ClCompile Include="rpcs3qt\main_window.cpp" />
-    <ClCompile Include="rpcs3qt\music_player_dialog.cpp" />
     <ClCompile Include="rpcs3qt\memory_string_searcher.cpp" />
     <ClCompile Include="rpcs3qt\memory_viewer_panel.cpp" />
     <ClCompile Include="rpcs3qt\msg_dialog_frame.cpp" />
@@ -904,19 +624,18 @@
     <ClCompile Include="rpcs3qt\save_data_list_dialog.cpp" />
     <ClCompile Include="rpcs3qt\settings_dialog.cpp" />
     <ClCompile Include="Input\xinput_pad_handler.cpp" />
-    <ClCompile Include="util\console.cpp" />
     <ClCompile Include="\rpcs3qt\*.cpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="headless_application.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <ClInclude Include="Input\basic_keyboard_handler.h" />
     <ClInclude Include="Input\basic_mouse_handler.h" />
@@ -925,370 +644,311 @@
     <ClInclude Include="Input\ds4_pad_handler.h" />
     <ClInclude Include="Input\dualsense_pad_handler.h" />
     <ClInclude Include="Input\evdev_joystick_handler.h" />
-    <ClInclude Include="Input\gui_pad_thread.h" />
     <ClInclude Include="Input\hid_pad_handler.h" />
     <ClInclude Include="Input\keyboard_pad_handler.h" />
     <CustomBuild Include="rpcs3qt\gs_frame.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing gs_frame.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing gs_frame.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\log_frame.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing log_frame.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing log_frame.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\main_window.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing main_window.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing main_window.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\music_player_dialog.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing music_player_dialog.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing music_player_dialog.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\pad_settings_dialog.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing pad_settings_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing pad_settings_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\pad_led_settings_dialog.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\settings_dialog.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing settings_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing settings_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\auto_pause_settings_dialog.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing auto_pause_settings_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing auto_pause_settings_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\debugger_add_bp_window.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing debugger_add_bp_window.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing debugger_add_bp_window.h...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\debugger_frame.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing debugger_frame.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing debugger_frame.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\game_list_frame.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing game_list_frame.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing game_list_frame.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
-    <ClInclude Include="Input\ps_move_calibration.h" />
-    <ClInclude Include="Input\ps_move_config.h" />
-    <ClInclude Include="Input\ps_move_tracker.h" />
-    <ClInclude Include="Input\raw_mouse_config.h" />
-    <ClInclude Include="Input\raw_mouse_handler.h" />
-    <ClInclude Include="Input\ps_move_handler.h" />
-    <ClInclude Include="Input\sdl_pad_handler.h" />
-    <ClInclude Include="Input\sdl_instance.h" />
-    <ClInclude Include="Input\skateboard_pad_handler.h" />
     <ClInclude Include="main_application.h" />
     <ClInclude Include="Input/mm_joystick_handler.h" />
     <CustomBuild Include="rpcs3qt\cg_disasm_window.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing cg_disasm_window.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing cg_disasm_window.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+    </CustomBuild>
+    <CustomBuild Include="rpcs3qt\memory_string_searcher.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing memory_string_searcher.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing memory_string_searcher.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\gui_settings.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing gui_settings.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing gui_settings.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\kernel_explorer.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing kernel_explorer.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing kernel_explorer.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\emu_settings.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing emu_settings.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing emu_settings.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\game_list_grid.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing game_list_grid.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing game_list_grid.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <ClInclude Include="Input\pad_thread.h" />
     <ClInclude Include="Input\product_info.h" />
-    <ClInclude Include="module_verifier.hpp" />
     <ClInclude Include="QTGeneratedFiles\ui_about_dialog.h" />
-    <ClInclude Include="QTGeneratedFiles\ui_camera_settings_dialog.h" />
-    <ClInclude Include="QTGeneratedFiles\ui_ps_move_tracker_dialog.h" />
     <ClInclude Include="QTGeneratedFiles\ui_main_window.h" />
-    <ClInclude Include="QTGeneratedFiles\ui_music_player_dialog.h" />
     <ClInclude Include="QTGeneratedFiles\ui_pad_led_settings_dialog.h" />
-    <ClInclude Include="QTGeneratedFiles\ui_pad_motion_settings_dialog.h" />
     <ClInclude Include="QTGeneratedFiles\ui_pad_settings_dialog.h" />
-    <ClInclude Include="QTGeneratedFiles\ui_patch_creator_dialog.h" />
     <ClInclude Include="QTGeneratedFiles\ui_patch_manager_dialog.h" />
     <ClInclude Include="QTGeneratedFiles\ui_settings_dialog.h" />
-    <ClInclude Include="QTGeneratedFiles\ui_shortcut_dialog.h" />
-    <ClInclude Include="QTGeneratedFiles\ui_vfs_tool_dialog.h" />
     <ClInclude Include="QTGeneratedFiles\ui_welcome_dialog.h" />
     <CustomBuild Include="rpcs3qt\about_dialog.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing about_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing about_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
-    <ClInclude Include="rpcs3.h" />
     <ClInclude Include="rpcs3qt\breakpoint_handler.h" />
     <CustomBuild Include="rpcs3qt\breakpoint_list.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\call_stack_list.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\custom_dialog.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\cheat_manager.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\camera_settings_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\ps_move_tracker_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <ClInclude Include="rpcs3qt\category.h" />
     <ClInclude Include="rpcs3qt\config_adapter.h" />
-    <CustomBuild Include="rpcs3qt\config_checker.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DHAVE_SDL3 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
     <ClInclude Include="rpcs3qt\curl_handle.h" />
     <ClInclude Include="rpcs3qt\custom_dock_widget.h" />
     <CustomBuild Include="rpcs3qt\debugger_list.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\input_dialog.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\osk_dialog_frame.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\gui_application.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\pkg_install_dialog.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\settings.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\persistent_settings.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\localized.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\screenshot_manager_dialog.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
@@ -1296,379 +956,115 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\fatal_error_dialog.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\microphone_creator.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\midi_creator.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\downloader.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\elf_memory_dumping_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\emulated_pad_settings_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\rtmidi\rtmidi" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\rtmidi\rtmidi" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\emulated_logitech_g27_settings_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\rtmidi\rtmidi" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\rtmidi\rtmidi" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <ClInclude Include="rpcs3qt\emu_settings_type.h" />
     <CustomBuild Include="rpcs3qt\render_creator.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
-    <ClInclude Include="rpcs3qt\flow_layout.h" />
-    <CustomBuild Include="rpcs3qt\flow_widget.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\game_list_base.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\flow_widget_item.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <ClInclude Include="rpcs3qt\game_list_delegate.h" />
-    <CustomBuild Include="rpcs3qt\game_list_table.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\game_list_grid_item.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <ClInclude Include="rpcs3qt\gui_game_info.h" />
     <ClInclude Include="rpcs3qt\gui_save.h" />
     <CustomBuild Include="rpcs3qt\patch_manager_dialog.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\rpcn_settings_dialog.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\localized_emu.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\log_viewer.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\ipc_settings_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <ClInclude Include="rpcs3qt\hex_validator.h" />
     <ClInclude Include="rpcs3qt\movie_item.h" />
-    <ClInclude Include="rpcs3qt\movie_item_base.h" />
     <ClInclude Include="rpcs3qt\numbered_widget_item.h" />
-    <CustomBuild Include="rpcs3qt\patch_creator_dialog.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\recvmessage_dialog_frame.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\qt_camera_handler.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\pad_motion_settings_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <ClInclude Include="rpcs3qt\pad_device_info.h" />
-    <ClInclude Include="rpcs3qt\permissions.h" />
-    <ClInclude Include="rpcs3qt\progress_indicator.h" />
-    <CustomBuild Include="rpcs3qt\qt_music_handler.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\basic_mouse_settings_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\raw_mouse_settings_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <ClInclude Include="rpcs3qt\qt_video_source.h" />
     <ClInclude Include="rpcs3qt\richtext_item_delegate.h" />
-    <CustomBuild Include="rpcs3qt\sendmessage_dialog_frame.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\shortcut_handler.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\shortcut_settings.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\shortcut_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\vfs_tool_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\screenshot_item.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <ClInclude Include="rpcs3qt\shortcut_utils.h" />
     <ClInclude Include="rpcs3qt\stylesheets.h" />
     <CustomBuild Include="rpcs3qt\skylander_dialog.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\infinity_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\dimensions_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\update_manager.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
@@ -1676,148 +1072,97 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
-    <ClInclude Include="rpcs3qt\qt_camera_video_sink.h" />
-    <CustomBuild Include="rpcs3qt\vfs_dialog_usb_tab.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\vfs_dialog_usb_input.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\vfs_dialog_path_widget.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\system_cmd_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DHAVE_SDL3 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-    </CustomBuild>
-    <ClInclude Include="rpcs3qt\uuid.h" />
-    <ClInclude Include="rpcs3qt\video_label.h" />
     <ClInclude Include="rpcs3qt\_discord_utils.h" />
     <CustomBuild Include="rpcs3qt\find_dialog.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <ClInclude Include="rpcs3qt\custom_table_widget_item.h" />
     <CustomBuild Include="rpcs3qt\game_compatibility.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing game_compatibility.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing game_compatibility.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\game_list.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
+    <ClInclude Include="rpcs3qt\game_list.h" />
+    <ClInclude Include="rpcs3qt\game_list_grid_delegate.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="rpcs3qt\gl_gs_frame.h" />
     <CustomBuild Include="rpcs3qt\syntax_highlighter.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing syntax_highlighter.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing syntax_highlighter.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\instruction_editor_dialog.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\memory_viewer_panel.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\msg_dialog_frame.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing msg_dialog_frame.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing msg_dialog_frame.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\rsx_debugger.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing rsx_debugger.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing rsx_debugger.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\save_data_list_dialog.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing save_data_list_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing save_data_list_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <ClInclude Include="rpcs3qt\progress_dialog.h" />
     <ClInclude Include="rpcs3qt\qt_utils.h" />
@@ -1826,39 +1171,39 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing register_editor_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing register_editor_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\save_data_info_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing save_data_info_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing save_data_info_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\save_manager_dialog.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing save_manager_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing save_manager_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\user_manager_dialog.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
@@ -1866,10 +1211,10 @@
     <CustomBuild Include="rpcs3qt\welcome_dialog.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing welcome_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing welcome_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
@@ -1877,58 +1222,65 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing vfs_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing vfs_dialog.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\vfs_dialog_tab.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing vfs_dialog_tab.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing vfs_dialog_tab.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\trophy_manager_dialog.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\savestate_manager_dialog.h">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\trophy_notification_frame.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
     <ClInclude Include="rpcs3qt\trophy_notification_helper.h" />
     <ClInclude Include="rpcs3qt\user_account.h" />
     <ClInclude Include="Input\xinput_pad_handler.h" />
-    <ClInclude Include="util\console.h" />
     <ClInclude Include="\rpcs3qt\*.h" />
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="debug\moc_predefs.h.cbt">
+      <FileType>Document</FileType>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:strictStrings -Zc:throwingNew- -Zi -MDd -GR -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E -Za $(QTDIR)\mkspecs\features\data\dummy.cpp 2&gt;NUL &gt;debug\moc_predefs.h</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate moc_predefs.h</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">debug\moc_predefs.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="release\moc_predefs.h.cbt">
+      <FileType>Document</FileType>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl -Bx"$(QTDIR)\bin\qmake.exe" -nologo -Zc:wchar_t -FS -Zc:strictStrings -Zc:throwingNew- -O2 -MD -GR -W3 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 -wd4577 -wd4467 -E -Za $(QTDIR)\mkspecs\features\data\dummy.cpp 2&gt;NUL &gt;release\moc_predefs.h</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate moc_predefs.h</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">release\moc_predefs.h;%(Outputs)</Outputs>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </CustomBuild>
+  </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="resources.qrc">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(FullPath);%(AdditionalInputs)</AdditionalInputs>
@@ -1971,18 +1323,6 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
     </CustomBuild>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="rpcs3qt\music_player_dialog.ui">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-    </CustomBuild>
-  </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="rpcs3qt\pad_settings_dialog.ui">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
@@ -2056,118 +1396,8 @@
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="rpcs3qt\patch_creator_dialog.ui">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\camera_settings_dialog.ui">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\ps_move_tracker_dialog.ui">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\pad_motion_settings_dialog.ui">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\shortcut_dialog.ui">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\vfs_tool_dialog.ui">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\.ci\build-freebsd.sh" />
-    <None Include="..\.ci\build-linux-aarch64.sh" />
-    <None Include="..\.ci\build-linux.sh" />
-    <None Include="..\.ci\build-mac-arm64.sh" />
-    <None Include="..\.ci\build-mac.sh" />
-    <None Include="..\.ci\build-windows-clang.sh" />
-    <None Include="..\.ci\deploy-linux-legacy.sh" />
-    <None Include="..\.ci\deploy-linux.sh" />
-    <None Include="..\.ci\deploy-llvm.sh" />
-    <None Include="..\.ci\deploy-mac-arm64.sh" />
-    <None Include="..\.ci\deploy-mac.sh" />
-    <None Include="..\.ci\deploy-windows.sh" />
-    <None Include="..\.ci\docker.env" />
-    <None Include="..\.ci\generate-qt-ts.sh" />
-    <None Include="..\.ci\get_keys-windows.sh" />
-    <None Include="..\.ci\github-upload.sh" />
-    <None Include="..\.ci\install-freebsd.sh" />
-    <None Include="..\.ci\optimize-mac.sh" />
-    <None Include="..\.ci\setup-llvm.sh" />
-    <None Include="..\.ci\setup-windows.sh" />
-    <None Include="..\.ci\setup-windows-ci-vars.sh" />
-    <None Include="..\.github\workflows\llvm.yml" />
-    <None Include="..\.github\workflows\qt-ts.yml" />
-    <None Include="..\.github\workflows\rpcs3.yml" />
-    <None Include="..\bin\GuiConfigs\Classic (Bright).qss" />
-    <None Include="..\bin\GuiConfigs\Darker Style by TheMitoSan.qss" />
-    <None Include="..\bin\GuiConfigs\Envy.qss" />
-    <None Include="..\bin\GuiConfigs\Kuroi (Dark) by Ani.qss" />
-    <None Include="..\bin\GuiConfigs\ModernBlue Theme by TheMitoSan.qss" />
-    <None Include="..\bin\GuiConfigs\Nekotekina by GooseWing.qss" />
-    <None Include="..\bin\GuiConfigs\Skyline (Nightfall).qss" />
-    <None Include="..\bin\GuiConfigs\Skyline.qss" />
-    <None Include="..\bin\GuiConfigs\YoRHa by Ani.qss" />
-    <None Include="..\buildfiles\cmake\ConfigureCompiler.cmake" />
-    <None Include="..\buildfiles\cmake\FindFFMPEG.cmake" />
-    <None Include="..\buildfiles\cmake\FindWayland.cmake" />
-    <None Include="..\buildfiles\cmake\TCDarwinARM64.cmake" />
-    <None Include="..\buildfiles\msvc\common_default.props" />
-    <None Include="..\buildfiles\msvc\common_default_clang_cl.props" />
-    <None Include="..\buildfiles\msvc\common_default_macros.props" />
-    <None Include="..\buildfiles\msvc\rpcs3_debug.props" />
-    <None Include="..\buildfiles\msvc\rpcs3_default.props" />
-    <None Include="..\buildfiles\msvc\rpcs3_release.props" />
-    <None Include="..\darwin\util\sysinfo_darwin.mm" />
-    <None Include="..\Utilities\git-version-gen.cmd" />
-    <None Include="update_helper.sh" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-    <Text Include="rpcs3qt\CMakeLists.txt" />
+    <None Include="QTGeneratedFiles\Debug\pkg_install_dialog.moc" />
+    <None Include="QTGeneratedFiles\Release\pkg_install_dialog.moc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
@@ -2176,4 +1406,4 @@
       <UserProperties MocDir=".\QTGeneratedFiles\$(ConfigurationName)" Qt5Version_x0020_x64="$(DefaultQtVersion)" RccDir=".\QTGeneratedFiles" UicDir=".\QTGeneratedFiles" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters
index 0f8c7dce71..abb8a0118e 100644
--- a/rpcs3/rpcs3.vcxproj.filters
+++ b/rpcs3/rpcs3.vcxproj.filters
@@ -101,12 +101,6 @@
     <Filter Include="Io\DS3">
       <UniqueIdentifier>{66e6027b-d3dd-4894-814c-cc4444a4c7df}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Gui\dimensions">
-      <UniqueIdentifier>{d138e7e2-861a-4078-badf-80ecb10b0d04}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Gui\infinity">
-      <UniqueIdentifier>{f5fcca0d-918b-46ba-bb91-2f2f9d9ddbba}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Gui\skylanders">
       <UniqueIdentifier>{c25f8f80-cc74-4760-8488-a291b3026b1d}</UniqueIdentifier>
     </Filter>
@@ -136,72 +130,6 @@
     <Filter Include="Gui\custom items">
       <UniqueIdentifier>{949cff6d-9cc5-4a8a-a453-a5144da8ecf4}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Gui\rpcn">
-      <UniqueIdentifier>{dfd401ec-dd22-4f8a-9dea-565a03efab6a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Io\camera">
-      <UniqueIdentifier>{f1996891-48b7-441a-b3fe-52794cbebe80}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Io\music">
-      <UniqueIdentifier>{44c3b8d8-cc4d-4d5f-8681-21241ab220d0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Gui\ipc">
-      <UniqueIdentifier>{91389c5b-9ebd-43fe-a288-1bbad775e528}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Io\SDL">
-      <UniqueIdentifier>{00fa44cd-ccae-48d9-8541-5f3b2b26a845}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Gui\shortcuts">
-      <UniqueIdentifier>{1b83df2f-bb74-4bc9-87f1-ab2f3889bcc9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Gui\progress">
-      <UniqueIdentifier>{d60be100-0d7e-4076-a24a-d413d0e91532}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Gui\flow_layout">
-      <UniqueIdentifier>{9191ae51-8b80-4606-b5bc-966a9588f538}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="StyleSheets">
-      <UniqueIdentifier>{b927140a-5214-4628-a648-8380ae793179}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Scripts">
-      <UniqueIdentifier>{f4ff05a1-e8c9-44f8-ba05-2c731919a878}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="CI">
-      <UniqueIdentifier>{b3bba7ee-4f23-41b6-8ddf-e40f848015de}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Io\Skateboard">
-      <UniqueIdentifier>{bd1fd182-dc0d-45cb-bb9e-f68b2282d7eb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Io\raw">
-      <UniqueIdentifier>{f44f5837-8651-456a-8584-5a2005ac613e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="buildfiles">
-      <UniqueIdentifier>{febb24ed-5432-48de-9d18-2711449e2f1e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="buildfiles\cmake">
-      <UniqueIdentifier>{43565cd0-48fc-4441-9ce6-74d6718bc823}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="buildfiles\msvc">
-      <UniqueIdentifier>{5cace00d-92fc-4b03-82a2-72706cd04e84}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Gui\ps_move_tracker_dialog">
-      <UniqueIdentifier>{4a270c26-740b-46e8-880c-bb22e708b897}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Io\Move">
-      <UniqueIdentifier>{f8a98f7b-dc23-47c0-8a5f-d0b76eaf0df5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Darwin">
-      <UniqueIdentifier>{f6b701aa-7f4a-4816-b05f-80d24cb70e13}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Gui\savestates">
-      <UniqueIdentifier>{9b51636c-b371-425b-86d3-be003774a1b7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Io\video">
-      <UniqueIdentifier>{2bb5cec5-5acb-40c0-a388-68db05dff305}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Gui\widgets">
-      <UniqueIdentifier>{149c596b-83e7-43f8-b5db-6108694434ef}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -219,12 +147,6 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_cg_disasm_window.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_debugger_add_bp_window.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_debugger_add_bp_window.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_debugger_frame.cpp">
       <Filter>Generated Files\Debug</Filter>
     </ClCompile>
@@ -273,10 +195,10 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_main_window.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_music_player_dialog.cpp">
+    <ClCompile Include="QTGeneratedFiles\Debug\moc_memory_string_searcher.cpp">
       <Filter>Generated Files\Debug</Filter>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_music_player_dialog.cpp">
+    <ClCompile Include="QTGeneratedFiles\Release\moc_memory_string_searcher.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_pad_settings_dialog.cpp">
@@ -327,18 +249,6 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_welcome_dialog.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_basic_mouse_settings_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_basic_mouse_settings_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_raw_mouse_settings_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_raw_mouse_settings_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_game_list_grid.cpp">
       <Filter>Generated Files\Debug</Filter>
     </ClCompile>
@@ -399,9 +309,6 @@
     <ClCompile Include="Input\pad_thread.cpp">
       <Filter>Io</Filter>
     </ClCompile>
-    <ClCompile Include="Input\product_info.cpp">
-      <Filter>Io</Filter>
-    </ClCompile>
     <ClCompile Include="rpcs3qt\about_dialog.cpp">
       <Filter>Gui\misc dialogs</Filter>
     </ClCompile>
@@ -414,9 +321,6 @@
     <ClCompile Include="rpcs3qt\cg_disasm_window.cpp">
       <Filter>Gui\dev tools</Filter>
     </ClCompile>
-    <ClCompile Include="rpcs3qt\debugger_add_bp_window.cpp">
-      <Filter>Gui\debugger</Filter>
-    </ClCompile>
     <ClCompile Include="rpcs3qt\debugger_frame.cpp">
       <Filter>Gui\debugger</Filter>
     </ClCompile>
@@ -441,9 +345,6 @@
     <ClCompile Include="rpcs3qt\main_window.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
-    <ClCompile Include="rpcs3qt\music_player_dialog.cpp">
-      <Filter>Gui\misc dialogs</Filter>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_syntax_highlighter.cpp">
       <Filter>Generated Files\Debug</Filter>
     </ClCompile>
@@ -462,6 +363,9 @@
     <ClCompile Include="rpcs3qt\game_list_grid.cpp">
       <Filter>Gui\game list</Filter>
     </ClCompile>
+    <ClCompile Include="rpcs3qt\game_list_grid_delegate.cpp">
+      <Filter>Gui\game list</Filter>
+    </ClCompile>
     <ClCompile Include="rpcs3qt\memory_string_searcher.cpp">
       <Filter>Gui\dev tools</Filter>
     </ClCompile>
@@ -498,9 +402,6 @@
     <ClCompile Include="rpcs3qt\trophy_manager_dialog.cpp">
       <Filter>Gui\trophy</Filter>
     </ClCompile>
-    <ClCompile Include="rpcs3qt\savestate_manager_dialog.cpp">
-      <Filter>Gui\savestates</Filter>
-    </ClCompile>
     <ClCompile Include="rpcs3qt\progress_dialog.cpp">
       <Filter>Gui\misc dialogs</Filter>
     </ClCompile>
@@ -579,12 +480,6 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_trophy_manager_dialog.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_savestate_manager_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_savestate_manager_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
     <ClCompile Include="rpcs3qt\input_dialog.cpp">
       <Filter>Gui\misc dialogs</Filter>
     </ClCompile>
@@ -633,12 +528,6 @@
     <ClCompile Include="headless_application.cpp">
       <Filter>rpcs3</Filter>
     </ClCompile>
-    <ClCompile Include="rpcs3qt\dimensions_dialog.cpp">
-      <Filter>Gui\dimensions</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\infinity_dialog.cpp">
-      <Filter>Gui\infinity</Filter>
-    </ClCompile>
     <ClCompile Include="rpcs3qt\skylander_dialog.cpp">
       <Filter>Gui\skylanders</Filter>
     </ClCompile>
@@ -741,18 +630,6 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_screenshot_preview.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_dimensions_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_dimensions_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_infinity_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_infinity_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_skylander_dialog.cpp">
       <Filter>Generated Files\Debug</Filter>
     </ClCompile>
@@ -801,12 +678,6 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_microphone_creator.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_midi_creator.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_midi_creator.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
     <ClCompile Include="rpcs3qt\render_creator.cpp">
       <Filter>Gui\settings</Filter>
     </ClCompile>
@@ -840,6 +711,9 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_downloader.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
+    <ClCompile Include="rpcs3qt\rpcn_settings_dialog.cpp">
+      <Filter>Gui\settings</Filter>
+    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_rpcn_settings_dialog.cpp">
       <Filter>Generated Files\Debug</Filter>
     </ClCompile>
@@ -873,342 +747,6 @@
     <ClCompile Include="rpcs3qt\game_list.cpp">
       <Filter>Gui\game list</Filter>
     </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_patch_creator_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\patch_creator_dialog.cpp">
-      <Filter>Gui\patch manager</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_patch_creator_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\rpcn_settings_dialog.cpp">
-      <Filter>Gui\rpcn</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\sendmessage_dialog_frame.cpp">
-      <Filter>Gui\message dialog</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_sendmessage_dialog_frame.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_sendmessage_dialog_frame.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\recvmessage_dialog_frame.cpp">
-      <Filter>Gui\message dialog</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_recvmessage_dialog_frame.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_recvmessage_dialog_frame.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\qt_camera_handler.cpp">
-      <Filter>Io\camera</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\qt_camera_video_sink.cpp">
-      <Filter>Io\camera</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_qt_camera_handler.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_qt_camera_handler.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\camera_settings_dialog.cpp">
-      <Filter>Gui\settings</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_camera_settings_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_camera_settings_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\ps_move_tracker_dialog.cpp">
-      <Filter>Gui\ps_move_tracker_dialog</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_ps_move_tracker_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_ps_move_tracker_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\shortcut_utils.cpp">
-      <Filter>Gui\utils</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\qt_music_handler.cpp">
-      <Filter>Io\music</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_qt_music_handler.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_qt_music_handler.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\vfs_dialog_usb_tab.cpp">
-      <Filter>Gui\vfs</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_vfs_dialog_usb_tab.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_vfs_dialog_usb_tab.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\vfs_dialog_usb_input.cpp">
-      <Filter>Gui\vfs</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_vfs_dialog_usb_input.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_vfs_dialog_usb_input.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\vfs_dialog_path_widget.cpp">
-      <Filter>Gui\vfs</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_vfs_dialog_path_widget.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_vfs_dialog_path_widget.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\ipc_settings_dialog.cpp">
-      <Filter>Gui\ipc</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_ipc_settings_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_ipc_settings_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\uuid.cpp">
-      <Filter>Gui\utils</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\pad_motion_settings_dialog.cpp">
-      <Filter>Gui\settings</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_pad_motion_settings_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_pad_motion_settings_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="Input\sdl_pad_handler.cpp">
-      <Filter>Io\SDL</Filter>
-    </ClCompile>
-    <ClCompile Include="Input\sdl_instance.cpp">
-      <Filter>Io\SDL</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\config_checker.cpp">
-      <Filter>Gui\log</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_config_checker.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_config_checker.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\shortcut_handler.cpp">
-      <Filter>Gui\shortcuts</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_shortcut_handler.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_shortcut_handler.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\shortcut_settings.cpp">
-      <Filter>Gui\shortcuts</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_shortcut_settings.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_shortcut_settings.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\shortcut_dialog.cpp">
-      <Filter>Gui\shortcuts</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_shortcut_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_shortcut_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_vfs_tool_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_vfs_tool_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\progress_indicator.cpp">
-      <Filter>Gui\progress</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\system_cmd_dialog.cpp">
-      <Filter>Gui\dev tools</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_system_cmd_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_system_cmd_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\table_item_delegate.cpp">
-      <Filter>Gui\custom items</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\movie_item.cpp">
-      <Filter>Gui\custom items</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_game_list.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_game_list.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\game_list_delegate.cpp">
-      <Filter>Gui\game list</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\flow_layout.cpp">
-      <Filter>Gui\flow_layout</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\flow_widget.cpp">
-      <Filter>Gui\flow_layout</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\game_list_table.cpp">
-      <Filter>Gui\game list</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_game_list_table.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_game_list_table.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\game_list_base.cpp">
-      <Filter>Gui\game list</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\movie_item_base.cpp">
-      <Filter>Gui\custom items</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\game_list_grid_item.cpp">
-      <Filter>Gui\game list</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_game_list_grid_item.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_game_list_grid_item.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\flow_widget_item.cpp">
-      <Filter>Gui\flow_layout</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_screenshot_item.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_screenshot_item.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\screenshot_item.cpp">
-      <Filter>Gui\screenshot manager</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_flow_widget_item.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_flow_widget_item.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_flow_widget.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_flow_widget.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\elf_memory_dumping_dialog.cpp">
-      <Filter>Gui\dev tools</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_elf_memory_dumping_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_elf_memory_dumping_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\midi_creator.cpp">
-      <Filter>Gui\settings</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\emulated_pad_settings_dialog.cpp">
-      <Filter>Gui\settings</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_emulated_pad_settings_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_emulated_pad_settings_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\emulated_logitech_g27_settings_dialog.cpp">
-      <Filter>Gui\settings</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Debug\moc_emulated_logitech_g27_settings_dialog.cpp">
-      <Filter>Generated Files\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="QTGeneratedFiles\Release\moc_emulated_logitech_g27_settings_dialog.cpp">
-      <Filter>Generated Files\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\localized_emu.cpp">
-      <Filter>Gui\settings</Filter>
-    </ClCompile>
-    <ClCompile Include="Input\skateboard_pad_handler.cpp">
-      <Filter>Io\Skateboard</Filter>
-    </ClCompile>
-    <ClCompile Include="Input\raw_mouse_handler.cpp">
-      <Filter>Io\raw</Filter>
-    </ClCompile>
-    <ClCompile Include="Input\gui_pad_thread.cpp">
-      <Filter>Io</Filter>
-    </ClCompile>
-    <ClCompile Include="util\console.cpp">
-      <Filter>rpcs3</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\basic_mouse_settings_dialog.cpp">
-      <Filter>Gui\settings</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\raw_mouse_settings_dialog.cpp">
-      <Filter>Gui\settings</Filter>
-    </ClCompile>
-    <ClCompile Include="Input\raw_mouse_config.cpp">
-      <Filter>Io\raw</Filter>
-    </ClCompile>
-    <ClCompile Include="module_verifier.cpp">
-      <Filter>rpcs3</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\vfs_tool_dialog.cpp">
-      <Filter>Gui\vfs</Filter>
-    </ClCompile>
-    <ClCompile Include="Input\ps_move_handler.cpp">
-      <Filter>Io\Move</Filter>
-    </ClCompile>
-    <ClCompile Include="Input\ps_move_tracker.cpp">
-      <Filter>Io\Move</Filter>
-    </ClCompile>
-    <ClCompile Include="Input\ps_move_config.cpp">
-      <Filter>Io\Move</Filter>
-    </ClCompile>
-    <ClCompile Include="Input\ps_move_calibration.cpp">
-      <Filter>Io\Move</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\permissions.cpp">
-      <Filter>Gui\utils</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\gui_game_info.cpp">
-      <Filter>Gui\game list</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\qt_video_source.cpp">
-      <Filter>Io\video</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3qt\video_label.cpp">
-      <Filter>Gui\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="rpcs3.cpp">
-      <Filter>rpcs3</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Input\ds4_pad_handler.h">
@@ -1223,9 +761,6 @@
     <ClInclude Include="QTGeneratedFiles\ui_main_window.h">
       <Filter>Generated Files</Filter>
     </ClInclude>
-    <ClInclude Include="QTGeneratedFiles\ui_music_player_dialog.h">
-      <Filter>Generated Files</Filter>
-    </ClInclude>
     <ClInclude Include="QTGeneratedFiles\ui_pad_settings_dialog.h">
       <Filter>Generated Files</Filter>
     </ClInclude>
@@ -1250,12 +785,21 @@
     <ClInclude Include="rpcs3qt\gl_gs_frame.h">
       <Filter>Gui\game window</Filter>
     </ClInclude>
+    <ClInclude Include="rpcs3qt\game_list.h">
+      <Filter>Gui\game list</Filter>
+    </ClInclude>
+    <ClInclude Include="rpcs3qt\game_list_grid_delegate.h">
+      <Filter>Gui\game list</Filter>
+    </ClInclude>
     <ClInclude Include="Input\evdev_joystick_handler.h">
       <Filter>Io\evdev</Filter>
     </ClInclude>
     <ClInclude Include="rpcs3qt\qt_utils.h">
       <Filter>Gui\utils</Filter>
     </ClInclude>
+    <ClInclude Include="rpcs3qt\custom_dock_widget.h">
+      <Filter>Gui</Filter>
+    </ClInclude>
     <ClInclude Include="rpcs3qt\user_account.h">
       <Filter>Gui\user accounts</Filter>
     </ClInclude>
@@ -1334,107 +878,14 @@
     <ClInclude Include="rpcs3qt\movie_item.h">
       <Filter>Gui\custom items</Filter>
     </ClInclude>
-    <ClInclude Include="QTGeneratedFiles\ui_patch_creator_dialog.h">
-      <Filter>Generated Files</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\qt_camera_video_sink.h">
-      <Filter>Io\camera</Filter>
-    </ClInclude>
-    <ClInclude Include="QTGeneratedFiles\ui_camera_settings_dialog.h">
-      <Filter>Generated Files</Filter>
-    </ClInclude>
-    <ClInclude Include="QTGeneratedFiles\ui_ps_move_tracker_dialog.h">
-      <Filter>Generated Files</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\shortcut_utils.h">
-      <Filter>Gui\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\uuid.h">
-      <Filter>Gui\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="QTGeneratedFiles\ui_pad_motion_settings_dialog.h">
-      <Filter>Generated Files</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\pad_device_info.h">
-      <Filter>Gui\settings</Filter>
-    </ClInclude>
-    <ClInclude Include="module_verifier.hpp">
-      <Filter>rpcs3</Filter>
-    </ClInclude>
-    <ClInclude Include="Input\sdl_pad_handler.h">
-      <Filter>Io\SDL</Filter>
-    </ClInclude>
-    <ClInclude Include="Input\sdl_instance.h">
-      <Filter>Io\SDL</Filter>
-    </ClInclude>
-    <ClInclude Include="QTGeneratedFiles\ui_shortcut_dialog.h">
-      <Filter>Generated Files</Filter>
-    </ClInclude>
-    <ClInclude Include="QTGeneratedFiles\ui_vfs_tool_dialog.h">
-      <Filter>Generated Files</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\progress_indicator.h">
-      <Filter>Gui\progress</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\game_list_delegate.h">
-      <Filter>Gui\game list</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\flow_layout.h">
-      <Filter>Gui\flow_layout</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\movie_item_base.h">
-      <Filter>Gui\custom items</Filter>
-    </ClInclude>
-    <ClInclude Include="Input\skateboard_pad_handler.h">
-      <Filter>Io\Skateboard</Filter>
-    </ClInclude>
-    <ClInclude Include="Input\raw_mouse_handler.h">
-      <Filter>Io\raw</Filter>
-    </ClInclude>
-    <ClInclude Include="Input\gui_pad_thread.h">
-      <Filter>Io</Filter>
-    </ClInclude>
-    <ClInclude Include="util\console.h">
-      <Filter>rpcs3</Filter>
-    </ClInclude>
-    <ClInclude Include="Input\raw_mouse_config.h">
-      <Filter>Io\raw</Filter>
-    </ClInclude>
-    <ClInclude Include="Input\ps_move_handler.h">
-      <Filter>Io\Move</Filter>
-    </ClInclude>
-    <ClInclude Include="Input\ps_move_tracker.h">
-      <Filter>Io\Move</Filter>
-    </ClInclude>
-    <ClInclude Include="Input\ps_move_config.h">
-      <Filter>Io\Move</Filter>
-    </ClInclude>
-    <ClInclude Include="Input\ps_move_calibration.h">
-      <Filter>Io\Move</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\permissions.h">
-      <Filter>Gui\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\gui_game_info.h">
-      <Filter>Gui\game list</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\qt_video_source.h">
-      <Filter>Io\video</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\custom_dock_widget.h">
-      <Filter>Gui\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\video_label.h">
-      <Filter>Gui\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3qt\hex_validator.h">
-      <Filter>Gui\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3.h">
-      <Filter>rpcs3</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
+    <CustomBuild Include="debug\moc_predefs.h.cbt">
+      <Filter>Generated Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="release\moc_predefs.h.cbt">
+      <Filter>Generated Files</Filter>
+    </CustomBuild>
     <ClInclude Include="resource.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
@@ -1447,9 +898,6 @@
     <CustomBuild Include="rpcs3qt\main_window.ui">
       <Filter>Form Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\music_player_dialog.ui">
-      <Filter>Form Files</Filter>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\pad_settings_dialog.ui">
       <Filter>Form Files</Filter>
     </CustomBuild>
@@ -1507,9 +955,6 @@
     <CustomBuild Include="rpcs3qt\main_window.h">
       <Filter>Gui</Filter>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\music_player_dialog.h">
-      <Filter>Gui\misc dialogs</Filter>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\kernel_explorer.h">
       <Filter>Gui\dev tools</Filter>
     </CustomBuild>
@@ -1519,6 +964,9 @@
     <CustomBuild Include="rpcs3qt\game_list_grid.h">
       <Filter>Gui\game list</Filter>
     </CustomBuild>
+    <CustomBuild Include="rpcs3qt\memory_string_searcher.h">
+      <Filter>Gui\dev tools</Filter>
+    </CustomBuild>
     <CustomBuild Include="rpcs3qt\settings_dialog.h">
       <Filter>Gui\settings</Filter>
     </CustomBuild>
@@ -1561,9 +1009,6 @@
     <CustomBuild Include="rpcs3qt\trophy_manager_dialog.h">
       <Filter>Gui\trophy</Filter>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\savestate_manager_dialog.h">
-      <Filter>Gui\savestates</Filter>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\input_dialog.h">
       <Filter>Gui\misc dialogs</Filter>
     </CustomBuild>
@@ -1606,12 +1051,6 @@
     <CustomBuild Include="rpcs3qt\screenshot_preview.h">
       <Filter>Gui\screenshot manager</Filter>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\dimensions_dialog.h">
-      <Filter>Gui\dimensions</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\infinity_dialog.h">
-      <Filter>Gui\infinity</Filter>
-    </CustomBuild>
     <CustomBuild Include="rpcs3qt\skylander_dialog.h">
       <Filter>Gui\skylanders</Filter>
     </CustomBuild>
@@ -1645,129 +1084,15 @@
     <CustomBuild Include="rpcs3qt\downloader.h">
       <Filter>Gui\network</Filter>
     </CustomBuild>
+    <CustomBuild Include="rpcs3qt\rpcn_settings_dialog.h">
+      <Filter>Gui\settings</Filter>
+    </CustomBuild>
     <CustomBuild Include="rpcs3qt\localized_emu.h">
       <Filter>Gui\settings</Filter>
     </CustomBuild>
     <CustomBuild Include="rpcs3qt\log_viewer.h">
       <Filter>Gui\log</Filter>
     </CustomBuild>
-    <CustomBuild Include="rpcs3qt\patch_creator_dialog.ui">
-      <Filter>Form Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\patch_creator_dialog.h">
-      <Filter>Gui\patch manager</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\rpcn_settings_dialog.h">
-      <Filter>Gui\rpcn</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\sendmessage_dialog_frame.h">
-      <Filter>Gui\message dialog</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\recvmessage_dialog_frame.h">
-      <Filter>Gui\message dialog</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\qt_camera_handler.h">
-      <Filter>Io\camera</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\camera_settings_dialog.ui">
-      <Filter>Form Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\camera_settings_dialog.h">
-      <Filter>Gui\settings</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\ps_move_tracker_dialog.ui">
-      <Filter>Form Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\ps_move_tracker_dialog.h">
-      <Filter>Gui\ps_move_tracker_dialog</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\qt_music_handler.h">
-      <Filter>Io\music</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\vfs_dialog_usb_tab.h">
-      <Filter>Gui\vfs</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\vfs_dialog_usb_input.h">
-      <Filter>Gui\vfs</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\vfs_dialog_path_widget.h">
-      <Filter>Gui\vfs</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\ipc_settings_dialog.h">
-      <Filter>Gui\ipc</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\pad_motion_settings_dialog.h">
-      <Filter>Gui\settings</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\pad_motion_settings_dialog.ui">
-      <Filter>Form Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\config_checker.h">
-      <Filter>Gui\log</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\shortcut_handler.h">
-      <Filter>Gui\shortcuts</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\shortcut_settings.h">
-      <Filter>Gui\shortcuts</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\shortcut_dialog.h">
-      <Filter>Gui\shortcuts</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\shortcut_dialog.ui">
-      <Filter>Form Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\vfs_tool_dialog.ui">
-      <Filter>Form Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\system_cmd_dialog.h">
-      <Filter>Gui\dev tools</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\game_list.h">
-      <Filter>Gui\game list</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\flow_widget.h">
-      <Filter>Gui\flow_layout</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\game_list_table.h">
-      <Filter>Gui\game list</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\game_list_base.h">
-      <Filter>Gui\game list</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\game_list_grid_item.h">
-      <Filter>Gui\game list</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\screenshot_item.h">
-      <Filter>Gui\screenshot manager</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\flow_widget_item.h">
-      <Filter>Gui\flow_layout</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\elf_memory_dumping_dialog.h">
-      <Filter>Gui\dev tools</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\emulated_pad_settings_dialog.h">
-      <Filter>Gui\settings</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\emulated_logitech_g27_settings_dialog.h">
-      <Filter>Gui\settings</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\midi_creator.h">
-      <Filter>Gui\settings</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\basic_mouse_settings_dialog.h">
-      <Filter>Gui\settings</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\raw_mouse_settings_dialog.h">
-      <Filter>Gui\settings</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\vfs_tool_dialog.h">
-      <Filter>Gui\vfs</Filter>
-    </CustomBuild>
-    <CustomBuild Include="rpcs3qt\debugger_add_bp_window.h">
-      <Filter>Gui\debugger</Filter>
-    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Image Include="rpcs3.ico" />
@@ -1776,151 +1101,11 @@
     <ResourceCompile Include="rpcs3.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\bin\GuiConfigs\Classic (Bright).qss">
-      <Filter>StyleSheets</Filter>
+    <None Include="QTGeneratedFiles\Debug\pkg_install_dialog.moc">
+      <Filter>Generated Files\Debug</Filter>
     </None>
-    <None Include="..\bin\GuiConfigs\Darker Style by TheMitoSan.qss">
-      <Filter>StyleSheets</Filter>
+    <None Include="QTGeneratedFiles\Release\pkg_install_dialog.moc">
+      <Filter>Generated Files\Release</Filter>
     </None>
-    <None Include="..\bin\GuiConfigs\YoRHa by Ani.qss">
-      <Filter>StyleSheets</Filter>
-    </None>
-    <None Include="..\bin\GuiConfigs\Skyline.qss">
-      <Filter>StyleSheets</Filter>
-    </None>
-    <None Include="..\bin\GuiConfigs\ModernBlue Theme by TheMitoSan.qss">
-      <Filter>StyleSheets</Filter>
-    </None>
-    <None Include="..\bin\GuiConfigs\Nekotekina by GooseWing.qss">
-      <Filter>StyleSheets</Filter>
-    </None>
-    <None Include="..\bin\GuiConfigs\Skyline (Nightfall).qss">
-      <Filter>StyleSheets</Filter>
-    </None>
-    <None Include="..\bin\GuiConfigs\Kuroi (Dark) by Ani.qss">
-      <Filter>StyleSheets</Filter>
-    </None>
-    <None Include="..\bin\GuiConfigs\Envy.qss">
-      <Filter>StyleSheets</Filter>
-    </None>
-    <None Include="..\Utilities\git-version-gen.cmd">
-      <Filter>Scripts</Filter>
-    </None>
-    <None Include="..\.ci\build-freebsd.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\build-linux.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\build-mac.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\build-windows-clang.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\deploy-linux.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\deploy-mac.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\deploy-windows.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\get_keys-windows.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\github-upload.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\setup-windows.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\setup-windows-ci-vars.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\install-freebsd.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="update_helper.sh">
-      <Filter>Scripts</Filter>
-    </None>
-    <None Include="..\buildfiles\msvc\common_default.props">
-      <Filter>buildfiles\msvc</Filter>
-    </None>
-    <None Include="..\buildfiles\msvc\common_default_clang_cl.props">
-      <Filter>buildfiles\msvc</Filter>
-    </None>
-    <None Include="..\buildfiles\msvc\common_default_macros.props">
-      <Filter>buildfiles\msvc</Filter>
-    </None>
-    <None Include="..\buildfiles\msvc\rpcs3_debug.props">
-      <Filter>buildfiles\msvc</Filter>
-    </None>
-    <None Include="..\buildfiles\msvc\rpcs3_default.props">
-      <Filter>buildfiles\msvc</Filter>
-    </None>
-    <None Include="..\buildfiles\msvc\rpcs3_release.props">
-      <Filter>buildfiles\msvc</Filter>
-    </None>
-    <None Include="..\buildfiles\cmake\ConfigureCompiler.cmake">
-      <Filter>buildfiles\cmake</Filter>
-    </None>
-    <None Include="..\buildfiles\cmake\FindFFMPEG.cmake">
-      <Filter>buildfiles\cmake</Filter>
-    </None>
-    <None Include="..\buildfiles\cmake\FindWayland.cmake">
-      <Filter>buildfiles\cmake</Filter>
-    </None>
-    <None Include="..\buildfiles\cmake\TCDarwinARM64.cmake">
-      <Filter>buildfiles\cmake</Filter>
-    </None>
-    <None Include="..\.ci\build-linux-aarch64.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\build-mac-arm64.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\deploy-linux-legacy.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\deploy-mac-arm64.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\docker.env">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\optimize-mac.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\darwin\util\sysinfo_darwin.mm">
-      <Filter>Darwin</Filter>
-    </None>
-    <None Include="..\.github\workflows\rpcs3.yml">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\deploy-llvm.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\generate-qt-ts.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.ci\setup-llvm.sh">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.github\workflows\llvm.yml">
-      <Filter>CI</Filter>
-    </None>
-    <None Include="..\.github\workflows\qt-ts.yml">
-      <Filter>CI</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="rpcs3qt\CMakeLists.txt">
-      <Filter>buildfiles\cmake</Filter>
-    </Text>
-    <Text Include="CMakeLists.txt">
-      <Filter>buildfiles\cmake</Filter>
-    </Text>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/rpcs3/rpcs3_version.cpp b/rpcs3/rpcs3_version.cpp
index f78cec9234..f1f6bee538 100644
--- a/rpcs3/rpcs3_version.cpp
+++ b/rpcs3/rpcs3_version.cpp
@@ -28,46 +28,28 @@ namespace rpcs3
 	// Currently accessible by Windows and Linux build scripts, see implementations when doing MACOSX
 	const utils::version& get_version()
 	{
-		static constexpr utils::version version{ 0, 0, 37, utils::version_type::alpha, 1, RPCS3_GIT_VERSION };
+		static constexpr utils::version version{ 0, 0, 18, utils::version_type::alpha, 1, RPCS3_GIT_VERSION };
 		return version;
 	}
 
 	std::string get_version_and_branch()
 	{
+		// Get version by substringing VersionNumber-buildnumber-commithash to get just the part before the dash
+		std::string version = rpcs3::get_version().to_string();
+		const auto last_minus = version.find_last_of('-');
+
 		// Add branch and commit hash to version on frame unless it's master.
 		if (rpcs3::get_branch() != "master"sv && rpcs3::get_branch() != "HEAD"sv)
 		{
-			return get_verbose_version();
+			version = version.substr(0, ~last_minus ? last_minus + 9 : last_minus);
+			version += '-';
+			version += rpcs3::get_branch();
 		}
-
-		// Get version by substringing VersionNumber-buildnumber-commithash to get just the part before the dash
-		std::string version = rpcs3::get_version().to_string();
-
-		const auto last_minus = version.find_last_of('-');
-		version = version.substr(0, last_minus);
-
-		return version;
-	}
-
-	std::string get_verbose_version()
-	{
-		std::string version = fmt::format("%s | %s", rpcs3::get_version().to_string(), get_branch());
-		if (is_local_build())
+		else
 		{
-			fmt::append(version, " | local_build");
+			version = version.substr(0, last_minus);
 		}
+
 		return version;
 	}
-
-	bool is_release_build()
-	{
-		static constexpr bool is_release_build = std::string_view(RPCS3_GIT_FULL_BRANCH) == "RPCS3/rpcs3/master"sv;
-		return is_release_build;
-	}
-
-	bool is_local_build()
-	{
-		static constexpr bool is_local_build = std::string_view(RPCS3_GIT_FULL_BRANCH) == "local_build"sv;
-		return is_local_build;
-	}
 }
diff --git a/rpcs3/rpcs3_version.h b/rpcs3/rpcs3_version.h
index 4cb0c20597..bd22fc0943 100644
--- a/rpcs3/rpcs3_version.h
+++ b/rpcs3/rpcs3_version.h
@@ -7,9 +7,6 @@ namespace rpcs3
 	std::string_view get_branch();
 	std::string_view get_full_branch();
 	std::pair<std::string, std::string> get_commit_and_hash();
-	const ::utils::version& get_version();
+	const utils::version& get_version();
 	std::string get_version_and_branch();
-	std::string get_verbose_version();
-	bool is_release_build();
-	bool is_local_build();
 }
diff --git a/rpcs3/rpcs3qt/CMakeLists.txt b/rpcs3/rpcs3qt/CMakeLists.txt
index c49daf0346..632fe13c28 100644
--- a/rpcs3/rpcs3qt/CMakeLists.txt
+++ b/rpcs3/rpcs3qt/CMakeLists.txt
@@ -1,84 +1,55 @@
-add_library(rpcs3_ui STATIC
+# prevent WolfSSL from warning about not having harden options
+add_compile_definitions(WC_NO_HARDEN)
+
+set(SRC_FILES
     about_dialog.cpp
     auto_pause_settings_dialog.cpp
-    basic_mouse_settings_dialog.cpp
     breakpoint_handler.cpp
     breakpoint_list.cpp
     call_stack_list.cpp
-    camera_settings_dialog.cpp
     cg_disasm_window.cpp
     cheat_manager.cpp
     config_adapter.cpp
-    config_checker.cpp
     curl_handle.cpp
     custom_dialog.cpp
     custom_table_widget_item.cpp
-    debugger_add_bp_window.cpp
     debugger_frame.cpp
     debugger_list.cpp
     downloader.cpp
-    dimensions_dialog.cpp
     _discord_utils.cpp
     emu_settings.cpp
-    elf_memory_dumping_dialog.cpp
-    emulated_pad_settings_dialog.cpp
-    emulated_logitech_g27_settings_dialog.cpp
     fatal_error_dialog.cpp
     find_dialog.cpp
-    flow_layout.cpp
-    flow_widget.cpp
-    flow_widget_item.cpp
     game_compatibility.cpp
     game_list.cpp
-    game_list_base.cpp
-    game_list_delegate.cpp
     game_list_frame.cpp
     game_list_grid.cpp
-    game_list_grid_item.cpp
-    game_list_table.cpp
+    game_list_grid_delegate.cpp
     gui_application.cpp
     gl_gs_frame.cpp
     gs_frame.cpp
-    gui_game_info.cpp
     gui_settings.cpp
-    infinity_dialog.cpp
     input_dialog.cpp
     instruction_editor_dialog.cpp
-    ipc_settings_dialog.cpp
     kernel_explorer.cpp
     localized.cpp
-    localized_emu.cpp
+    localized_emu.h
     log_frame.cpp
     log_viewer.cpp
     main_window.cpp
     memory_string_searcher.cpp
     memory_viewer_panel.cpp
     microphone_creator.cpp
-    midi_creator.cpp
-    movie_item.cpp
-    movie_item_base.cpp
     msg_dialog_frame.cpp
-    music_player_dialog.cpp
     osk_dialog_frame.cpp
     pad_led_settings_dialog.cpp
-    pad_motion_settings_dialog.cpp
     pad_settings_dialog.cpp
-    patch_creator_dialog.cpp
     patch_manager_dialog.cpp
-    permissions.cpp
     persistent_settings.cpp
     pkg_install_dialog.cpp
     progress_dialog.cpp
-    progress_indicator.cpp
-    ps_move_tracker_dialog.cpp
-    qt_camera_handler.cpp
-    qt_camera_video_sink.cpp
-    qt_music_handler.cpp
     qt_utils.cpp
-    qt_video_source.cpp
-    raw_mouse_settings_dialog.cpp
     register_editor_dialog.cpp
-    recvmessage_dialog_frame.cpp
     render_creator.cpp
     rpcn_settings_dialog.cpp
     rsx_debugger.cpp
@@ -86,21 +57,12 @@ add_library(rpcs3_ui STATIC
     save_data_info_dialog.cpp
     save_data_list_dialog.cpp
     save_manager_dialog.cpp
-    savestate_manager_dialog.cpp
-    screenshot_item.cpp
     screenshot_manager_dialog.cpp
     screenshot_preview.cpp
-    sendmessage_dialog_frame.cpp
     settings.cpp
     settings_dialog.cpp
-    shortcut_utils.cpp
-    shortcut_dialog.cpp
-    shortcut_handler.cpp
-    shortcut_settings.cpp
     skylander_dialog.cpp
     syntax_highlighter.cpp
-    system_cmd_dialog.cpp
-    table_item_delegate.cpp
     tooltips.cpp
     trophy_manager_dialog.cpp
     trophy_notification_frame.cpp
@@ -108,101 +70,45 @@ add_library(rpcs3_ui STATIC
     update_manager.cpp
     user_account.cpp
     user_manager_dialog.cpp
-    uuid.cpp
     vfs_dialog.cpp
-    vfs_dialog_path_widget.cpp
     vfs_dialog_tab.cpp
-    vfs_dialog_usb_input.cpp
-    vfs_dialog_usb_tab.cpp
-    vfs_tool_dialog.cpp
-    video_label.cpp
     welcome_dialog.cpp
-
-    about_dialog.ui
-    camera_settings_dialog.ui
-    main_window.ui
-    music_player_dialog.ui
-    pad_led_settings_dialog.ui
-    pad_motion_settings_dialog.ui
-    pad_settings_dialog.ui
-    patch_creator_dialog.ui
-    patch_manager_dialog.ui
-    ps_move_tracker_dialog.ui
-    settings_dialog.ui
-    shortcut_dialog.ui
-    welcome_dialog.ui
-
-    ../display_sleep_control.cpp
-    ../headless_application.cpp
-    ../main_application.cpp
-    ../module_verifier.cpp
-    ../rpcs3.cpp
-    ../rpcs3_version.cpp
-    ../stdafx.cpp
-
-    ../Input/basic_keyboard_handler.cpp
-    ../Input/basic_mouse_handler.cpp
-    ../Input/ds3_pad_handler.cpp
-    ../Input/ds4_pad_handler.cpp
-    ../Input/dualsense_pad_handler.cpp
-    ../Input/evdev_joystick_handler.cpp
-    ../Input/gui_pad_thread.cpp
-    ../Input/hid_pad_handler.cpp
-    ../Input/keyboard_pad_handler.cpp
-    ../Input/mm_joystick_handler.cpp
-    ../Input/pad_thread.cpp
-    ../Input/product_info.cpp
-    ../Input/ps_move_calibration.cpp
-    ../Input/ps_move_config.cpp
-    ../Input/ps_move_handler.cpp
-    ../Input/ps_move_tracker.cpp
-    ../Input/raw_mouse_config.cpp
-    ../Input/raw_mouse_handler.cpp
-    ../Input/sdl_pad_handler.cpp
-    ../Input/sdl_instance.cpp
-    ../Input/skateboard_pad_handler.cpp
-    ../Input/xinput_pad_handler.cpp
-
-    "../resources.qrc"
 )
 
-if(HAS_MEMORY_BREAKPOINTS)
-    target_compile_definitions(rpcs3_ui PRIVATE RPCS3_HAS_MEMORY_BREAKPOINTS)
-endif()
+set(UI_FILES
+    about_dialog.ui
+    main_window.ui
+    pad_led_settings_dialog.ui
+    pad_settings_dialog.ui
+    settings_dialog.ui
+    welcome_dialog.ui
+)
+
+set(RES_FILES "../resources.qrc")
 
 if(WIN32)
-    target_sources(rpcs3_ui PUBLIC "../windows.qrc")
-    target_compile_definitions(rpcs3_ui PRIVATE UNICODE _UNICODE)
+    list(APPEND RES_FILES "../windows.qrc")
 endif()
 
+add_library(rpcs3_ui ${SRC_FILES} ${UI_FILES} ${RES_FILES})
+
 set_target_properties(rpcs3_ui
     PROPERTIES
         AUTOMOC ON
         AUTOUIC ON
         AUTORCC ON)
 
-# AUTOMOC brings Windows.h to the sources, which have some definitions conflicting with winsock2.h
-# define WIN32_LEAN_AND_MEAN resolve the problem
-# https://docs.microsoft.com/en-us/windows/win32/winsock/creating-a-basic-winsock-application
-# https://docs.microsoft.com/en-us/windows/win32/winprog/using-the-windows-headers#faster-builds-with-smaller-header-files
-target_compile_definitions(rpcs3_ui PRIVATE WIN32_LEAN_AND_MEAN)
-
 target_link_libraries(rpcs3_ui
     PUBLIC
+        3rdparty::qt5 3rdparty::yaml-cpp
+
+    PRIVATE
         rpcs3_emu
-        3rdparty::qt6
-        3rdparty::yaml-cpp
-        3rdparty::zlib
+        3rdparty::zlib 3rdparty::pugixml
         3rdparty::discordRPC
         3rdparty::hidapi
         3rdparty::libusb
-        3rdparty::wolfssl
-        3rdparty::libcurl
-        3rdparty::opencv
-        3rdparty::fusion
-
-    PRIVATE
-        3rdparty::pugixml
         3rdparty::libpng
-        3rdparty::7zip
-        3rdparty::rtmidi)
+        3rdparty::7z
+        3rdparty::wolfssl
+        3rdparty::libcurl)
diff --git a/rpcs3/rpcs3qt/about_dialog.cpp b/rpcs3/rpcs3qt/about_dialog.cpp
index 95e1388ce9..002baf7c60 100644
--- a/rpcs3/rpcs3qt/about_dialog.cpp
+++ b/rpcs3/rpcs3qt/about_dialog.cpp
@@ -2,37 +2,31 @@
 #include "ui_about_dialog.h"
 
 #include "rpcs3_version.h"
-#include "qt_utils.h"
 
 #include <QDesktopServices>
 #include <QUrl>
-#include <QSvgWidget>
+
+constexpr auto qstr = QString::fromStdString;
 
 about_dialog::about_dialog(QWidget* parent) : QDialog(parent), ui(new Ui::about_dialog)
 {
 	ui->setupUi(this);
-	setAttribute(Qt::WA_DeleteOnClose);
 
 	ui->close->setDefault(true);
-	ui->icon->load(QStringLiteral(":/rpcs3.svg"));
-	ui->version->setText(tr("RPCS3 Version: %1").arg(QString::fromStdString(rpcs3::get_verbose_version())));
-	ui->description->setText(gui::utils::make_paragraph(tr(
-		"RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.\n"
-		"It is written in C++ for Windows, Linux, FreeBSD and MacOS, funded with %0.\n"
-		"Our developers and contributors are always working hard to ensure this project is the best that it can be.\n"
-		"There are still plenty of implementations to make and optimizations to do.")
-		.arg(gui::utils::make_link(tr("Patreon"), "https://rpcs3.net/patreon"))));
+
+	ui->version->setText(tr("RPCS3 Version: %1").arg(qstr(rpcs3::get_version().to_string())));
 
 	// Events
 	connect(ui->gitHub, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://www.github.com/RPCS3")); });
-	connect(ui->website, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://rpcs3.net")); });
+	connect(ui->website, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://www.rpcs3.net")); });
 	connect(ui->forum, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://forums.rpcs3.net")); });
-	connect(ui->patreon, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://rpcs3.net/patreon")); });
-	connect(ui->discord, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://discord.gg/rpcs3")); });
-	connect(ui->wiki, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://wiki.rpcs3.net/index.php?title=Main_Page")); });
+	connect(ui->patreon, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://www.patreon.com/Nekotekina")); });
 	connect(ui->close, &QPushButton::clicked, this, &QWidget::close);
+
+	layout()->setSizeConstraint(QLayout::SetFixedSize);
 }
 
 about_dialog::~about_dialog()
 {
+	delete ui;
 }
diff --git a/rpcs3/rpcs3qt/about_dialog.h b/rpcs3/rpcs3qt/about_dialog.h
index 91872ec6cc..7e842936aa 100644
--- a/rpcs3/rpcs3qt/about_dialog.h
+++ b/rpcs3/rpcs3qt/about_dialog.h
@@ -16,5 +16,5 @@ public:
 	~about_dialog();
 
 private:
-	std::unique_ptr<Ui::about_dialog> ui;
+	Ui::about_dialog *ui;
 };
diff --git a/rpcs3/rpcs3qt/about_dialog.ui b/rpcs3/rpcs3qt/about_dialog.ui
index 67bb5762f4..7d67eece31 100644
--- a/rpcs3/rpcs3qt/about_dialog.ui
+++ b/rpcs3/rpcs3qt/about_dialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>805</width>
-    <height>555</height>
+    <width>880</width>
+    <height>630</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,7 @@
    <iconset resource="../resources.qrc">
     <normaloff>:/rpcs3.ico</normaloff>:/rpcs3.ico</iconset>
   </property>
-  <layout class="QVBoxLayout" name="about_dialog_layout" stretch="0,1,0">
+  <layout class="QVBoxLayout" name="about_dialog_layout">
    <property name="spacing">
     <number>6</number>
    </property>
@@ -41,15 +41,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <layout class="QHBoxLayout" name="header_section_layout" stretch="0,1">
+     <layout class="QHBoxLayout" name="header_section_layout">
       <item>
        <widget class="QWidget" name="icon_widget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
         <layout class="QVBoxLayout" name="icon_widget_layout">
          <property name="leftMargin">
           <number>0</number>
@@ -63,23 +57,43 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
-         <item>
-          <widget class="QSvgWidget" name="icon" native="true">
+         <item alignment="Qt::AlignHCenter|Qt::AlignTop">
+          <widget class="QLabel" name="icon">
            <property name="maximumSize">
             <size>
              <width>50</width>
              <height>50</height>
             </size>
            </property>
+           <property name="font">
+            <font>
+             <pointsize>8</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="pixmap">
+            <pixmap resource="../resources.qrc">:/Icons/insignia.png</pixmap>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignHCenter|Qt::AlignTop</set>
+           </property>
+           <property name="margin">
+            <number>0</number>
+           </property>
           </widget>
          </item>
          <item>
           <spacer name="icon_spacer">
            <property name="orientation">
-            <enum>Qt::Orientation::Vertical</enum>
+            <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeType">
-            <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+            <enum>QSizePolicy::MinimumExpanding</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -100,6 +114,7 @@
            <font>
             <family>Arial</family>
             <pointsize>14</pointsize>
+            <weight>50</weight>
             <bold>false</bold>
            </font>
           </property>
@@ -107,10 +122,10 @@
            <string>RPCS3 PlayStation 3 Emulator</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
           </property>
           <property name="textInteractionFlags">
-           <set>Qt::TextInteractionFlag::TextSelectableByMouse</set>
+           <set>Qt::TextSelectableByMouse</set>
           </property>
          </widget>
         </item>
@@ -122,11 +137,14 @@
             <kerning>true</kerning>
            </font>
           </property>
+          <property name="text">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.&lt;br/&gt;It is written in C++ for Windows and Linux funded with &lt;a href=&quot;https://www.patreon.com/Nekotekina&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Patreon&lt;/span&gt;&lt;/a&gt;.&lt;br/&gt;Our developers and contributors are always working hard to ensure this project can be the best that it can be.&lt;br/&gt;There are still plenty of implementations to be made and optimizations to be done.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
           <property name="textFormat">
-           <enum>Qt::TextFormat::RichText</enum>
+           <enum>Qt::RichText</enum>
           </property>
           <property name="alignment">
-           <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
           </property>
           <property name="wordWrap">
            <bool>false</bool>
@@ -135,7 +153,7 @@
            <bool>true</bool>
           </property>
           <property name="textInteractionFlags">
-           <set>Qt::TextInteractionFlag::TextBrowserInteraction</set>
+           <set>Qt::TextBrowserInteraction</set>
           </property>
          </widget>
         </item>
@@ -151,16 +169,16 @@
            <string/>
           </property>
           <property name="textFormat">
-           <enum>Qt::TextFormat::RichText</enum>
+           <enum>Qt::RichText</enum>
           </property>
           <property name="alignment">
-           <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
           </property>
           <property name="wordWrap">
            <bool>true</bool>
           </property>
           <property name="textInteractionFlags">
-           <set>Qt::TextInteractionFlag::TextBrowserInteraction</set>
+           <set>Qt::TextBrowserInteraction</set>
           </property>
          </widget>
         </item>
@@ -172,7 +190,7 @@
    <item>
     <widget class="QScrollArea" name="name_section">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -180,17 +198,17 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>200</height>
+       <height>400</height>
       </size>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Shape::NoFrame</enum>
+      <enum>QFrame::NoFrame</enum>
      </property>
      <property name="verticalScrollBarPolicy">
-      <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOn</enum>
+      <enum>Qt::ScrollBarAlwaysOn</enum>
      </property>
      <property name="sizeAdjustPolicy">
-      <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents</enum>
+      <enum>QAbstractScrollArea::AdjustToContents</enum>
      </property>
      <property name="widgetResizable">
       <bool>true</bool>
@@ -200,105 +218,50 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>793</width>
-        <height>2638</height>
+        <width>863</width>
+        <height>1376</height>
        </rect>
       </property>
       <layout class="QHBoxLayout" name="names_layout" stretch="1,1,1,1">
        <property name="sizeConstraint">
-        <enum>QLayout::SizeConstraint::SetMinimumSize</enum>
+        <enum>QLayout::SetMinimumSize</enum>
        </property>
        <property name="leftMargin">
         <number>24</number>
        </property>
        <item>
-        <layout class="QVBoxLayout" name="developerLayout" stretch="0,1">
-         <property name="spacing">
-          <number>10</number>
+        <widget class="QLabel" name="developers">
+         <property name="text">
+          <string>&lt;p&gt;&lt;b&gt;Developers:&lt;/b&gt;&lt;br&gt;&lt;br&gt;¬DH&lt;br&gt;¬AlexAltea&lt;br&gt;¬Hykem&lt;br&gt;¬Oil&lt;br&gt;Nekotekina&lt;br&gt;¬Bigpet&lt;br&gt;¬gopalsr83&lt;br&gt;¬tambry&lt;br&gt;¬vlj&lt;br&gt;kd-11&lt;br&gt;¬jarveson&lt;br&gt;¬raven02&lt;br&gt;AniLeo&lt;br&gt;cornytrace&lt;br&gt;ssshadow&lt;br&gt;¬Numan&lt;br&gt;hcorion&lt;br&gt;Megamouse&lt;br&gt;¬flash-fire&lt;br&gt;DAGINATSUKO&lt;br&gt;GalCiv&lt;br&gt;eladash&lt;/p&gt;</string>
          </property>
-         <item>
-          <widget class="QLabel" name="developersTitle">
-           <property name="font">
-            <font>
-             <bold>true</bold>
-            </font>
-           </property>
-           <property name="text">
-            <string>Developers:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="developers">
-           <property name="text">
-            <string notr="true">&lt;p&gt;¬DH&lt;br&gt;¬AlexAltea&lt;br&gt;¬Hykem&lt;br&gt;¬Oil&lt;br&gt;Nekotekina&lt;br&gt;¬Bigpet&lt;br&gt;¬gopalsr83&lt;br&gt;¬tambry&lt;br&gt;¬vlj&lt;br&gt;kd-11&lt;br&gt;¬jarveson&lt;br&gt;¬raven02&lt;br&gt;AniLeo&lt;br&gt;¬cornytrace&lt;br&gt;¬ssshadow&lt;br&gt;¬Numan&lt;br&gt;hcorion&lt;br&gt;Megamouse&lt;br&gt;¬flash-fire&lt;br&gt;DAGINATSUKO&lt;br&gt;GalCiv&lt;br&gt;eladash&lt;/p&gt;</string>
-           </property>
-           <property name="scaledContents">
-            <bool>false</bool>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-           </property>
-           <property name="textInteractionFlags">
-            <set>Qt::TextInteractionFlag::TextSelectableByMouse</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
+         <property name="scaledContents">
+          <bool>false</bool>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::TextSelectableByMouse</set>
+         </property>
+        </widget>
        </item>
        <item>
-        <layout class="QVBoxLayout" name="contributorsLayout" stretch="0,1">
-         <property name="spacing">
-          <number>10</number>
+        <widget class="QLabel" name="contributors">
+         <property name="text">
+          <string>&lt;p&gt;&lt;b&gt;Contributors:&lt;/b&gt;&lt;br&gt;&lt;br&gt;BlackDaemon&lt;br&gt;elisha464&lt;br&gt;Aishou&lt;br&gt;krofna&lt;br&gt;xsacha&lt;br&gt;danilaml&lt;br&gt;unknownbrackets&lt;br&gt;Zangetsu38&lt;br&gt;lioncash&lt;br&gt;achurch&lt;br&gt;darkf&lt;br&gt;Syphurith&lt;br&gt;Blaypeg&lt;br&gt;Survanium90&lt;br&gt;georgemoralis&lt;br&gt;ikki84&lt;br&gt;scribam&lt;br&gt;TGE&lt;br&gt;velocity&lt;br&gt;Farseer&lt;br&gt;Dangles&lt;br&gt;ruipin&lt;br&gt;jbeich&lt;br&gt;CookiePLMonster&lt;br&gt;Whatcookie&lt;br&gt;rajkosto&lt;br&gt;Admiral Thrawn&lt;/p&gt;</string>
          </property>
-         <item>
-          <widget class="QLabel" name="contributorsTitle">
-           <property name="font">
-            <font>
-             <bold>true</bold>
-            </font>
-           </property>
-           <property name="text">
-            <string>Contributors:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="contributors">
-           <property name="text">
-            <string notr="true">&lt;p&gt;BlackDaemon&lt;br&gt;elisha464&lt;br&gt;Aishou&lt;br&gt;krofna&lt;br&gt;xsacha&lt;br&gt;danilaml&lt;br&gt;unknownbrackets&lt;br&gt;Zangetsu38&lt;br&gt;lioncash&lt;br&gt;achurch&lt;br&gt;darkf&lt;br&gt;Syphurith&lt;br&gt;Blaypeg&lt;br&gt;Survanium90&lt;br&gt;georgemoralis&lt;br&gt;ikki84&lt;br&gt;scribam&lt;br&gt;TGE&lt;br&gt;velocity&lt;br&gt;Farseer&lt;br&gt;Dangles&lt;br&gt;ruipin&lt;br&gt;jbeich&lt;br&gt;CookiePLMonster&lt;br&gt;Whatcookie&lt;br&gt;rajkosto&lt;br&gt;Admiral Thrawn&lt;br&gt;FlexBy&lt;br&gt;Dunastique&lt;br&gt;Jonathan44062&lt;br&gt;yurinator557&lt;br&gt;Satan&lt;br&gt;HoldTheMourning&lt;br&gt;illusion0001&lt;/p&gt;</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-           </property>
-           <property name="textInteractionFlags">
-            <set>Qt::TextInteractionFlag::TextSelectableByMouse</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::TextSelectableByMouse</set>
+         </property>
+        </widget>
        </item>
        <item>
-        <layout class="QVBoxLayout" name="supportersLayout" stretch="0,1">
-         <property name="spacing">
-          <number>10</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="supportersTitle">
-           <property name="font">
-            <font>
-             <bold>true</bold>
-            </font>
-           </property>
-           <property name="text">
-            <string>Supporters:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="supporters">
-           <property name="text">
-            <string notr="true">&lt;p&gt;Howard Garrison&lt;br&gt;EXPotemkin&lt;br&gt;Marko V.&lt;br&gt;danhp&lt;br&gt;Jake (5315825)&lt;br&gt;Ian Reid&lt;br&gt;Tad Sherlock&lt;br&gt;Tyler Friesen&lt;br&gt;Folzar&lt;br&gt;Payton Williams&lt;br&gt;RedPill Australia&lt;br&gt;yanghong&lt;br&gt;Mohammed El-Serougi&lt;br&gt;Дима ~Ximer13~ Кулин&lt;br&gt;James Reed&lt;br&gt;BaroqueSonata&lt;br&gt;Bonzay0&lt;br&gt;Henrijs Kons&lt;br&gt;eoiz&lt;br&gt;Lena Stöffler&lt;br&gt;Michael Holder&lt;br&gt;Max Bosse&lt;br&gt;Tyler Whisinnand&lt;br&gt;Gato Harvey&lt;br&gt;cain4355&lt;br&gt;Thomas Peltier&lt;br&gt;Loli Co.&lt;br&gt;MapleLoonie&lt;br&gt;Travis McEwen&lt;br&gt;Scott Singratsomboune&lt;br&gt;T.E&lt;br&gt;Lukas Rieger&lt;br&gt;Dane Madsen&lt;br&gt;JMS&lt;br&gt;Jonatan R&lt;br&gt;Luke Johnson&lt;br&gt;Thomas Zaorski&lt;br&gt;MyOwnFan&lt;br&gt;Alexandros Mandravillis&lt;br&gt;Socker Bopper&lt;br&gt;Faris Leonhart&lt;br&gt;Fabien Net&lt;br&gt;Raves&lt;br&gt;Barrowsx&lt;br&gt;kilsuton&lt;br&gt;Max Mason&lt;br&gt;Ethan Condon&lt;br&gt;jfidone&lt;br&gt;iaDRM&lt;br&gt;Kazer2.0&lt;br&gt;Bryce Quintin&lt;br&gt;Yuri Kunde Schlesner&lt;br&gt;Abdulla Altayer&lt;br&gt;Nicolas Jallamion&lt;br&gt;Vorvek&lt;br&gt;Ian Faddis&lt;br&gt;Leon&lt;br&gt;Mohammad Taleb&lt;br&gt;Jokez&lt;br&gt;crashX&lt;br&gt;Raveskirza&lt;br&gt;Grant Deacon&lt;br&gt;michael&lt;br&gt;David Zech&lt;br&gt;Ben Manoochehri&lt;br&gt;Adnan Kovacevic&lt;br&gt;Mighty J&lt;br&gt;Sam Shan Jiang&lt;br&gt;TheAnig&lt;br&gt;Rodney Coleman&lt;br&gt;FiniteAce&lt;br&gt;Kian Soon Alex Chiam&lt;br&gt;yukkuri&lt;br&gt;Justin Chadwick&lt;br&gt;toxic Itzi&lt;br&gt;Templerror&lt;br&gt;Myles Wesley Carlson&lt;br&gt;Max Bosse&lt;br&gt;Ethan Clark&lt;br&gt;LupineDream&lt;br&gt;CheatCodesOfLife&lt;br&gt;Jan Zykmund&lt;br&gt;Francesco Cinquemani&lt;br&gt;Andylg&lt;br&gt;Julia H de Camargos&lt;br&gt;Suvodip Mitra&lt;br&gt;Goh&lt;br&gt;Dmitry&lt;br&gt;Steel Brain&lt;br&gt;VarieZ&lt;br&gt;William Swango&lt;br&gt;Matthew Messersmith&lt;br&gt;Duane Locsin&lt;br&gt;Shuddertrix&lt;br&gt;Loweys Litsman&lt;br&gt;Shuddertrix&lt;br&gt;Mason Ferrie&lt;br&gt;Richard Kaplan&lt;br&gt;Hugues Valois&lt;br&gt;richard(lath..ch@)&lt;br&gt;Johnathan (Virtuous John)&lt;br&gt;eoiz&lt;br&gt;Dany Huguenin&lt;br&gt;doobieashtray&lt;br&gt;dean(mag..94@)&lt;br&gt;Pommier Jean-Philippe&lt;br&gt;Douglas Alan Albino&lt;br&gt;Ryan Mull&lt;br&gt;Thor-Erling Engen&lt;br&gt;Nick Carpenter&lt;br&gt;curryking3&lt;br&gt;Jared Tracton&lt;br&gt;alex(koo..oh@)&lt;br&gt;Jason O'Brien&lt;br&gt;Skeletal Charizard&lt;br&gt;Ace00&lt;br&gt;Brandon Corujo&lt;br&gt;HyperBitHero&lt;br&gt;佳文 李&lt;br&gt;sorryboi
+        <widget class="QLabel" name="supporters">
+         <property name="text">
+          <string>&lt;p&gt;&lt;b&gt;Supporters:&lt;/b&gt;&lt;br&gt;&lt;br&gt;Howard Garrison&lt;br&gt;EXPotemkin&lt;br&gt;Marko V.&lt;br&gt;danhp&lt;br&gt;Jake (5315825)&lt;br&gt;Ian Reid&lt;br&gt;Tad Sherlock&lt;br&gt;Tyler Friesen&lt;br&gt;Folzar&lt;br&gt;Payton Williams&lt;br&gt;RedPill Australia&lt;br&gt;yanghong&lt;br&gt;Mohammed El-Serougi&lt;br&gt;Дима ~Ximer13~ Кулин&lt;br&gt;James Reed&lt;br&gt;BaroqueSonata&lt;br&gt;Bonzay0&lt;br&gt;Henrijs Kons&lt;br&gt;eoiz&lt;br&gt;Lena Stöffler&lt;br&gt;Michael Holder&lt;br&gt;Max Bosse&lt;br&gt;Tyler Whisinnand&lt;br&gt;Gato Harvey&lt;br&gt;cain4355&lt;br&gt;Thomas Peltier&lt;br&gt;Loli Co.&lt;br&gt;MapleLoonie&lt;br&gt;Travis McEwen&lt;br&gt;Scott Singratsomboune&lt;br&gt;T.E&lt;br&gt;Lukas Rieger&lt;br&gt;Dane Madsen&lt;br&gt;JMS&lt;br&gt;Jonatan R&lt;br&gt;Luke Johnson&lt;br&gt;Thomas Zaorski&lt;br&gt;MyOwnFan&lt;br&gt;Alexandros Mandravillis&lt;br&gt;Socker Bopper&lt;br&gt;Faris Leonhart&lt;br&gt;Fabien Net&lt;br&gt;Raves&lt;br&gt;Barrowsx&lt;br&gt;kilsuton&lt;br&gt;Max Mason&lt;br&gt;Ethan Condon&lt;br&gt;jfidone&lt;br&gt;iaDRM&lt;br&gt;Kazer2.0&lt;br&gt;Bryce Quintin&lt;br&gt;Yuri Kunde Schlesner&lt;br&gt;Abdulla Altayer&lt;br&gt;Nicolas Jallamion&lt;br&gt;Vorvek&lt;br&gt;Ian Faddis&lt;br&gt;Leon&lt;br&gt;Mohammad Taleb&lt;br&gt;Jokez&lt;br&gt;crashX&lt;br&gt;Raveskirza&lt;br&gt;Grant Deacon&lt;br&gt;michael&lt;br&gt;David Zech&lt;br&gt;Ben Manoochehri&lt;br&gt;Adnan Kovacevic&lt;br&gt;Mighty J&lt;br&gt;Sam Shan Jiang&lt;br&gt;TheAnig&lt;br&gt;Rodney Coleman&lt;br&gt;FiniteAce&lt;br&gt;Kian Soon Alex Chiam&lt;br&gt;yukkuri&lt;br&gt;Justin Chadwick&lt;br&gt;toxic Itzi&lt;br&gt;Templerror&lt;br&gt;Myles Wesley Carlson&lt;br&gt;Max Bosse&lt;br&gt;Ethan Clark&lt;br&gt;LupineDream&lt;br&gt;CheatCodesOfLife&lt;br&gt;Jan Zykmund&lt;br&gt;Francesco Cinquemani&lt;br&gt;Andylg&lt;br&gt;Julia H de Camargos&lt;br&gt;Suvodip Mitra&lt;br&gt;Goh&lt;br&gt;Dmitry&lt;br&gt;Steel Brain&lt;br&gt;VarieZ&lt;br&gt;William Swango&lt;br&gt;Matthew Messersmith&lt;br&gt;Duane Locsin&lt;br&gt;Shuddertrix&lt;br&gt;Loweys Litsman&lt;br&gt;Shuddertrix&lt;br&gt;Mason Ferrie&lt;br&gt;Richard Kaplan&lt;br&gt;Hugues Valois&lt;br&gt;richard(lath..ch@)&lt;br&gt;Johnathan (Virtuous John)&lt;br&gt;eoiz&lt;br&gt;Dany Huguenin&lt;br&gt;doobieashtray&lt;br&gt;dean(mag..94@)&lt;br&gt;Pommier Jean-Philippe&lt;br&gt;Douglas Alan Albino&lt;br&gt;Ryan Mull&lt;br&gt;Thor-Erling Engen&lt;br&gt;Nick Carpenter&lt;br&gt;curryking3&lt;br&gt;Jared Tracton&lt;br&gt;alex(koo..oh@)&lt;br&gt;Jason O'Brien&lt;br&gt;Skeletal Charizard&lt;br&gt;Ace00&lt;br&gt;Brandon Corujo&lt;br&gt;HyperBitHero&lt;br&gt;佳文 李&lt;br&gt;sorryboi
           &lt;br&gt;Johnson Bui
           &lt;br&gt;itachi1986
           &lt;br&gt;Mortano
@@ -324,42 +287,23 @@
           &lt;br&gt;Morito
           &lt;br&gt;Chaining Ten
           &lt;br&gt;Xeropel
-          &lt;br&gt;Marko Gatzouris
-          &lt;br&gt;Steven (...weller@gmail.com)
-          &lt;br&gt;Real Gamer
-          &lt;br&gt;Spencer Robinson
-          &lt;br&gt;naps
-          &lt;br&gt;Matthew Stevens
-          &lt;br&gt;Orion Clark
-          &lt;br&gt;William K. Leung
-          &lt;br&gt;Trent M
-          &lt;br&gt;Viktor Ni
-          &lt;br&gt;Marc Tönsing
-          &lt;br&gt;Amogus
-          &lt;br&gt;Scott Davis
-          &lt;br&gt;秉軒 侯
-          &lt;br&gt;Wiktor Tkaczyński
-          &lt;br&gt;Vekkar
-          &lt;br&gt;Jackson Abney
           &lt;/p&gt;</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-           </property>
-           <property name="textInteractionFlags">
-            <set>Qt::TextInteractionFlag::TextSelectableByMouse</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::TextSelectableByMouse</set>
+         </property>
+        </widget>
        </item>
        <item>
         <spacer name="names_spacer">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeType">
-          <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+          <enum>QSizePolicy::MinimumExpanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -408,20 +352,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="discord">
-       <property name="text">
-        <string>Discord</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="wiki">
-       <property name="text">
-        <string>Wiki</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QPushButton" name="patreon">
        <property name="text">
@@ -432,7 +362,7 @@
      <item>
       <spacer name="button_spacer">
        <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -453,14 +383,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QSvgWidget</class>
-   <extends>QWidget</extends>
-   <header>qsvgwidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources>
   <include location="../resources.qrc"/>
  </resources>
diff --git a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp
index 26cbfc96b7..cbf56d7d29 100644
--- a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp
@@ -13,6 +13,8 @@
 
 LOG_CHANNEL(autopause_log, "AutoPause");
 
+constexpr auto qstr = QString::fromStdString;
+
 auto_pause_settings_dialog::auto_pause_settings_dialog(QWidget *parent) : QDialog(parent)
 {
 	QLabel *description = new QLabel(tr("To use auto pause: enter the ID(s) of a function or a system call.\nRestart of the game is required to apply. You can enable/disable this in the settings."), this);
@@ -60,7 +62,8 @@ auto_pause_settings_dialog::auto_pause_settings_dialog(QWidget *parent) : QDialo
 	});
 	connect(cancelButton, &QAbstractButton::clicked, this, &QWidget::close);
 
-	Emu.GracefulShutdown(false);
+	Emu.SetForceBoot(true);
+	Emu.Stop();
 
 	LoadEntries();
 	UpdateList();
@@ -125,7 +128,7 @@ void auto_pause_settings_dialog::UpdateList()
 		typeItem->setFlags(typeItem->flags() & ~Qt::ItemIsEditable);
 		if (m_entries[i] != 0xFFFFFFFF)
 		{
-			callItem->setData(Qt::DisplayRole, QString::fromStdString(fmt::format("%08x", m_entries[i])));
+			callItem->setData(Qt::DisplayRole, qstr(fmt::format("%08x", m_entries[i])));
 		}
 		else
 		{
@@ -192,7 +195,7 @@ void auto_pause_settings_dialog::OnRemove()
 	std::sort(selection.begin(), selection.end());
 	for (int i = selection.count() - 1; i >= 0; i--)
 	{
-		m_entries.erase(m_entries.begin() + ::at32(selection, i).row());
+		m_entries.erase(m_entries.begin() + selection.at(i).row());
 	}
 	UpdateList();
 }
@@ -228,7 +231,7 @@ AutoPauseConfigDialog::AutoPauseConfigDialog(QWidget* parent, auto_pause_setting
 	m_current_converted->setWordWrap(true);
 
 	m_id = new QLineEdit(this);
-	m_id->setText(QString::fromStdString(fmt::format("%08x", m_entry)));
+	m_id->setText(qstr(fmt::format("%08x", m_entry)));
 	m_id->setPlaceholderText("ffffffff");
 	m_id->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
 	m_id->setMaxLength(8);
diff --git a/rpcs3/rpcs3qt/basic_mouse_settings_dialog.cpp b/rpcs3/rpcs3qt/basic_mouse_settings_dialog.cpp
deleted file mode 100644
index e98d2798a4..0000000000
--- a/rpcs3/rpcs3qt/basic_mouse_settings_dialog.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-#include "stdafx.h"
-#include "basic_mouse_settings_dialog.h"
-#include "localized_emu.h"
-#include "Input/basic_mouse_handler.h"
-#include "Input/keyboard_pad_handler.h"
-#include "Emu/Io/mouse_config.h"
-#include "util/asm.hpp"
-
-#include <QGroupBox>
-#include <QMessageBox>
-#include <QVBoxLayout>
-
-LOG_CHANNEL(cfg_log, "CFG");
-
-enum button_role
-{
-	button_name = Qt::UserRole,
-	button_code
-};
-
-basic_mouse_settings_dialog::basic_mouse_settings_dialog(QWidget* parent)
-	: QDialog(parent)
-{
-	setObjectName("basic_mouse_settings_dialog");
-	setWindowTitle(tr("Configure Basic Mouse Handler"));
-	setAttribute(Qt::WA_DeleteOnClose);
-	setAttribute(Qt::WA_StyledBackground);
-	setModal(true);
-
-	QVBoxLayout* v_layout = new QVBoxLayout(this);
-
-	m_button_box = new QDialogButtonBox(this);
-	m_button_box->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::Save | QDialogButtonBox::RestoreDefaults);
-
-	connect(m_button_box, &QDialogButtonBox::clicked, this, [this](QAbstractButton* button)
-	{
-		if (button == m_button_box->button(QDialogButtonBox::Apply))
-		{
-			g_cfg_mouse.save();
-		}
-		else if (button == m_button_box->button(QDialogButtonBox::Save))
-		{
-			g_cfg_mouse.save();
-			accept();
-		}
-		else if (button == m_button_box->button(QDialogButtonBox::RestoreDefaults))
-		{
-			if (QMessageBox::question(this, tr("Confirm Reset"), tr("Reset all settings?")) != QMessageBox::Yes)
-				return;
-			reset_config();
-		}
-		else if (button == m_button_box->button(QDialogButtonBox::Cancel))
-		{
-			// Restore config
-			if (!g_cfg_mouse.load())
-			{
-				cfg_log.notice("Could not restore mouse config. Using defaults.");
-			}
-			reject();
-		}
-	});
-
-	if (!g_cfg_mouse.load())
-	{
-		cfg_log.notice("Could not load basic mouse config. Using defaults.");
-	}
-
-	m_buttons = new QButtonGroup(this);
-
-	connect(m_buttons, &QButtonGroup::idClicked, this, &basic_mouse_settings_dialog::on_button_click);
-
-	connect(&m_remap_timer, &QTimer::timeout, this, [this]()
-	{
-		auto button = m_buttons->button(m_button_id);
-
-		if (--m_seconds <= 0)
-		{
-			if (button)
-			{
-				if (const int button_id = m_buttons->id(button))
-				{
-					const std::string name = g_cfg_mouse.get_button(button_id).to_string();
-					button->setText(name.empty() ? QStringLiteral("-") : QString::fromStdString(name));
-				}
-			}
-			reactivate_buttons();
-			return;
-		}
-		if (button)
-		{
-			button->setText(tr("[ Waiting %1 ]").arg(m_seconds));
-		}
-	});
-
-	const auto insert_button = [this](int id, QPushButton* button)
-	{
-		m_buttons->addButton(button, id);
-		button->installEventFilter(this);
-	};
-
-	constexpr u32 button_count = 8;
-	constexpr u32 max_items_per_column = 4;
-	int rows = button_count;
-
-	for (u32 cols = 1; utils::aligned_div(button_count, cols) > max_items_per_column;)
-	{
-		rows = utils::aligned_div(button_count, ++cols);
-	}
-
-	QWidget* widget = new QWidget(this);
-	QGridLayout* grid_layout = new QGridLayout(this);
-
-	for (int i = 0, row = 0, col = 0; i < static_cast<int>(button_count); i++, row++)
-	{
-		const int cell_code = get_mouse_button_code(i);
-		const QString translated_cell_button = localized_emu::translated_mouse_button(cell_code);
-
-		QHBoxLayout* h_layout = new QHBoxLayout(this);
-		QGroupBox* gb = new QGroupBox(translated_cell_button, this);
-		QPushButton* pb = new QPushButton(this);
-
-		insert_button(cell_code, pb);
-
-		const std::string saved_btn = g_cfg_mouse.get_button(cell_code);
-
-		pb->setText(saved_btn.empty() ? QStringLiteral("-") : QString::fromStdString(saved_btn));
-
-		if (row >= rows)
-		{
-			row = 0;
-			col++;
-		}
-
-		m_push_buttons[cell_code] = pb;
-		h_layout->addWidget(pb);
-		gb->setLayout(h_layout);
-		grid_layout->addWidget(gb, row, col);
-	}
-
-	widget->setLayout(grid_layout);
-
-	v_layout->addWidget(widget);
-	v_layout->addWidget(m_button_box);
-	setLayout(v_layout);
-
-	m_palette = m_push_buttons[CELL_MOUSE_BUTTON_1]->palette(); // save normal palette
-}
-
-void basic_mouse_settings_dialog::reset_config()
-{
-	g_cfg_mouse.from_default();
-
-	for (auto& [cell_code, pb] : m_push_buttons)
-	{
-		if (!pb)
-			continue;
-
-		const QString text = QString::fromStdString(g_cfg_mouse.get_button(cell_code).def);
-		pb->setText(text.isEmpty() ? QStringLiteral("-") : text);
-	}
-}
-
-void basic_mouse_settings_dialog::on_button_click(int id)
-{
-	if (id < 0)
-	{
-		return;
-	}
-
-	for (auto but : m_buttons->buttons())
-	{
-		but->setEnabled(false);
-		but->setFocusPolicy(Qt::ClickFocus);
-	}
-
-	m_button_box->setEnabled(false);
-	for (auto but : m_button_box->buttons())
-	{
-		but->setFocusPolicy(Qt::ClickFocus);
-	}
-
-	m_button_id = id;
-	if (auto button = m_buttons->button(m_button_id))
-	{
-		button->setText(tr("[ Waiting %1 ]").arg(MAX_SECONDS));
-		button->setPalette(QPalette(Qt::blue));
-		button->grabMouse();
-	}
-
-	m_remap_timer.start(1000);
-}
-
-void basic_mouse_settings_dialog::keyPressEvent(QKeyEvent* event)
-{
-	if (m_button_id < 0)
-	{
-		// We are not remapping a button, so pass the event to the base class.
-		QDialog::keyPressEvent(event);
-		return;
-	}
-
-	const std::string name = keyboard_pad_handler::GetKeyName(event, false);
-	g_cfg_mouse.get_button(m_button_id).from_string(name);
-
-	if (auto button = m_buttons->button(m_button_id))
-	{
-		button->setText(QString::fromStdString(name));
-	}
-
-	reactivate_buttons();
-}
-
-void basic_mouse_settings_dialog::mouseReleaseEvent(QMouseEvent* event)
-{
-	if (m_button_id < 0)
-	{
-		// We are not remapping a button, so pass the event to the base class.
-		QDialog::mouseReleaseEvent(event);
-		return;
-	}
-
-	const std::string name = keyboard_pad_handler::GetMouseName(event);
-	g_cfg_mouse.get_button(m_button_id).from_string(name);
-
-	if (auto button = m_buttons->button(m_button_id))
-	{
-		button->setText(QString::fromStdString(name));
-	}
-
-	reactivate_buttons();
-}
-
-bool basic_mouse_settings_dialog::eventFilter(QObject* object, QEvent* event)
-{
-	switch (event->type())
-	{
-	case QEvent::MouseButtonRelease:
-	{
-		// On right click clear binding if we are not remapping pad button
-		if (m_button_id < 0)
-		{
-			QMouseEvent* mouse_event = static_cast<QMouseEvent*>(event);
-			if (const auto button = qobject_cast<QPushButton*>(object); button && button->isEnabled() && mouse_event->button() == Qt::RightButton)
-			{
-				if (const int button_id = m_buttons->id(button))
-				{
-					button->setText(QStringLiteral("-"));
-					g_cfg_mouse.get_button(button_id).from_string("");
-					return true;
-				}
-			}
-		}
-
-		// Disabled buttons should not absorb mouseclicks
-		event->ignore();
-		break;
-	}
-	default:
-	{
-		break;
-	}
-	}
-
-	return QDialog::eventFilter(object, event);
-}
-
-void basic_mouse_settings_dialog::reactivate_buttons()
-{
-	m_remap_timer.stop();
-	m_seconds = MAX_SECONDS;
-
-	if (m_button_id < 0)
-	{
-		return;
-	}
-
-	if (auto button = m_buttons->button(m_button_id))
-	{
-		button->setPalette(m_palette);
-		button->releaseMouse();
-	}
-
-	m_button_id = -1;
-
-	// Enable all buttons
-	m_button_box->setEnabled(true);
-
-	for (auto but : m_button_box->buttons())
-	{
-		but->setFocusPolicy(Qt::StrongFocus);
-	}
-
-	for (auto but : m_buttons->buttons())
-	{
-		but->setEnabled(true);
-		but->setFocusPolicy(Qt::StrongFocus);
-	}
-}
diff --git a/rpcs3/rpcs3qt/basic_mouse_settings_dialog.h b/rpcs3/rpcs3qt/basic_mouse_settings_dialog.h
deleted file mode 100644
index 3de5029978..0000000000
--- a/rpcs3/rpcs3qt/basic_mouse_settings_dialog.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <QButtonGroup>
-#include <QPushButton>
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QMouseEvent>
-#include <QTimer>
-
-#include <unordered_map>
-
-class basic_mouse_settings_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	basic_mouse_settings_dialog(QWidget* parent = nullptr);
-
-private:
-	void reset_config();
-
-	void on_button_click(int id);
-	void reactivate_buttons();
-
-	// Buttons
-	QDialogButtonBox* m_button_box = nullptr;
-	QButtonGroup* m_buttons = nullptr;
-	std::unordered_map<int, QPushButton*> m_push_buttons;
-	int m_button_id = -1;
-
-	// Backup for standard button palette
-	QPalette m_palette;
-
-	// Remap Timer
-	static constexpr int MAX_SECONDS = 5;
-	int m_seconds = MAX_SECONDS;
-	QTimer m_remap_timer;
-
-protected:
-	void keyPressEvent(QKeyEvent* event) override;
-	void mouseReleaseEvent(QMouseEvent* event) override;
-	bool eventFilter(QObject* object, QEvent* event) override;
-};
diff --git a/rpcs3/rpcs3qt/breakpoint_handler.cpp b/rpcs3/rpcs3qt/breakpoint_handler.cpp
index 57ae05c28d..b65525a72e 100644
--- a/rpcs3/rpcs3qt/breakpoint_handler.cpp
+++ b/rpcs3/rpcs3qt/breakpoint_handler.cpp
@@ -2,69 +2,29 @@
 
 extern bool ppu_breakpoint(u32 loc, bool is_adding);
 
-bool breakpoint_handler::IsBreakOnBPM() const
+bool breakpoint_handler::HasBreakpoint(u32 loc) const
 {
-	return m_break_on_bpm;
+	return m_breakpoints.contains(loc);
 }
 
-void breakpoint_handler::SetBreakOnBPM(bool break_on_bpm)
+bool breakpoint_handler::AddBreakpoint(u32 loc)
 {
-	m_break_on_bpm = break_on_bpm;
-}
-
-bool breakpoint_handler::HasBreakpoint(u32 loc, bs_t<breakpoint_types> type)
-{
-	if (m_empty.load(std::memory_order_acquire))
-		return false;
-
-	std::lock_guard lock(mutex_breakpoints);
-
-	return m_breakpoints.contains(loc) && ((m_breakpoints.at(loc) & type) == type);
-}
-
-bool breakpoint_handler::AddBreakpoint(u32 loc, bs_t<breakpoint_types> type)
-{
-	std::lock_guard lock(mutex_breakpoints);
-
-	if ((type & breakpoint_types::bp_exec) && !ppu_breakpoint(loc, true))
+	if (!ppu_breakpoint(loc, true))
 	{
 		return false;
 	}
 
-	bool result = m_breakpoints.insert({loc, type}).second;
-	
-	if (result)
-	{
-		m_empty.store(false, std::memory_order_release);
-	}
-
-	return result;
+	ensure(m_breakpoints.insert(loc).second);
+	return true;
 }
 
 bool breakpoint_handler::RemoveBreakpoint(u32 loc)
 {
-	std::lock_guard lock(mutex_breakpoints);
-
-	bs_t<breakpoint_types> bp_type{};
-	if (m_breakpoints.contains(loc))
-	{
-		bp_type = m_breakpoints.at(loc);
-	}
-
 	if (m_breakpoints.erase(loc) == 0)
 	{
 		return false;
 	}
 
-	if (bp_type & breakpoint_types::bp_exec)
-	{
-		ensure(ppu_breakpoint(loc, false));
-	}
-
-	if (m_breakpoints.empty())
-	{
-		m_empty.store(true, std::memory_order_release);
-	}
-
+	ensure(ppu_breakpoint(loc, false));
 	return true;
 }
diff --git a/rpcs3/rpcs3qt/breakpoint_handler.h b/rpcs3/rpcs3qt/breakpoint_handler.h
index 05fdc221e2..4794fd1d83 100644
--- a/rpcs3/rpcs3qt/breakpoint_handler.h
+++ b/rpcs3/rpcs3qt/breakpoint_handler.h
@@ -1,17 +1,13 @@
 #pragma once
 
 #include "util/types.hpp"
-#include "Utilities/bit_set.h"
-#include <map>
-#include "Utilities/mutex.h"
-#include <atomic>
+#include <set>
 
 enum class breakpoint_types
 {
 	bp_read = 0x1,
 	bp_write = 0x2,
 	bp_exec = 0x4,
-	__bitset_enum_max
 };
 
 /*
@@ -24,19 +20,16 @@ public:
 	breakpoint_handler() = default;
 	~breakpoint_handler() = default;
 
-	bool IsBreakOnBPM() const;
-	void SetBreakOnBPM(bool break_on_bpm);
-
 	/**
 	* Returns true iff breakpoint exists at loc.
 	* TODO: Add arg for flags, gameid, and maybe even thread if it should be thread local breakpoint.... breakpoint struct is probably what'll happen
 	*/
-	bool HasBreakpoint(u32 loc, bs_t<breakpoint_types> type);
+	bool HasBreakpoint(u32 loc) const;
 
 	/**
 	* Returns true if added successfully. TODO: flags
 	*/
-	bool AddBreakpoint(u32 loc, bs_t<breakpoint_types> type);
+	bool AddBreakpoint(u32 loc);
 
 	/**
 	* Returns true if removed breakpoint at loc successfully.
@@ -46,10 +39,5 @@ public:
 private:
 	// TODO : generalize to hold multiple games and handle flags.Probably do : std::map<std::string (gameid), std::set<breakpoint>>.
 	// Although, externally, they'll only be accessed by loc (I think) so a map of maps may also do?
-	shared_mutex mutex_breakpoints;
-	std::atomic<bool> m_empty{true};
-	std::map<u32, bs_t<breakpoint_types>> m_breakpoints; //! Holds all breakpoints.
-	bool m_break_on_bpm = false;
+	std::set<u32> m_breakpoints; //! Holds all breakpoints.
 };
-
-extern breakpoint_handler g_breakpoint_handler;
diff --git a/rpcs3/rpcs3qt/breakpoint_list.cpp b/rpcs3/rpcs3qt/breakpoint_list.cpp
index 63e7756c9a..161d6ea0d0 100644
--- a/rpcs3/rpcs3qt/breakpoint_list.cpp
+++ b/rpcs3/rpcs3qt/breakpoint_list.cpp
@@ -3,16 +3,15 @@
 
 #include "Emu/CPU/CPUDisAsm.h"
 #include "Emu/Cell/PPUThread.h"
-#include "Emu/Cell/SPUThread.h"
-#include "rpcs3qt/debugger_add_bp_window.h"
 
 #include <QMenu>
 #include <QMessageBox>
-#include <QMouseEvent>
 
-extern bool is_using_interpreter(thread_class t_class);
+constexpr auto qstr = QString::fromStdString;
 
-breakpoint_list::breakpoint_list(QWidget* parent, breakpoint_handler* handler) : QListWidget(parent), m_ppu_breakpoint_handler(handler)
+extern bool is_using_interpreter(u32 id_type);
+
+breakpoint_list::breakpoint_list(QWidget* parent, breakpoint_handler* handler) : QListWidget(parent), m_breakpoint_handler(handler)
 {
 	setEditTriggers(QAbstractItemView::NoEditTriggers);
 	setContextMenuPolicy(Qt::CustomContextMenu);
@@ -26,17 +25,15 @@ breakpoint_list::breakpoint_list(QWidget* parent, breakpoint_handler* handler) :
 	m_delete_action->setShortcutContext(Qt::WidgetShortcut);
 	connect(m_delete_action, &QAction::triggered, this, &breakpoint_list::OnBreakpointListDelete);
 	addAction(m_delete_action);
-
-	// Hide until used in order to allow as much space for registers panel as possible
-	hide();
 }
 
 /**
 * It's unfortunate I need a method like this to sync these.  Should ponder a cleaner way to do this.
 */
-void breakpoint_list::UpdateCPUData(std::shared_ptr<CPUDisAsm> disasm)
+void breakpoint_list::UpdateCPUData(cpu_thread* cpu, CPUDisAsm* disasm)
 {
-	m_disasm = std::move(disasm);
+	m_cpu = cpu;
+	m_disasm = disasm;
 }
 
 void breakpoint_list::ClearBreakpoints()
@@ -45,16 +42,14 @@ void breakpoint_list::ClearBreakpoints()
 	{
 		auto* currentItem = takeItem(0);
 		const u32 loc = currentItem->data(Qt::UserRole).value<u32>();
-		m_ppu_breakpoint_handler->RemoveBreakpoint(loc);
+		m_breakpoint_handler->RemoveBreakpoint(loc);
 		delete currentItem;
 	}
-
-	hide();
 }
 
 void breakpoint_list::RemoveBreakpoint(u32 addr)
 {
-	m_ppu_breakpoint_handler->RemoveBreakpoint(addr);
+	m_breakpoint_handler->RemoveBreakpoint(addr);
 
 	for (int i = 0; i < count(); i++)
 	{
@@ -67,115 +62,46 @@ void breakpoint_list::RemoveBreakpoint(u32 addr)
 		}
 	}
 
-	if (!count())
-	{
-		hide();
-	}
+	Q_EMIT RequestShowAddress(addr);
 }
 
-bool breakpoint_list::AddBreakpoint(u32 pc, bs_t<breakpoint_types> type)
+bool breakpoint_list::AddBreakpoint(u32 pc)
 {
-	if (!m_ppu_breakpoint_handler->AddBreakpoint(pc, type))
+	if (!m_breakpoint_handler->AddBreakpoint(pc))
 	{
 		return false;
 	}
 
-	QString breakpoint_item_text;
+	m_disasm->disasm(pc);
 
-	if (type == breakpoint_types::bp_exec)
-	{
-		m_disasm->disasm(m_disasm->dump_pc = pc);
-		breakpoint_item_text = QString::fromStdString(m_disasm->last_opcode);
-		breakpoint_item_text.remove(10, 13);
-	}
-	else if (type == breakpoint_types::bp_read)
-	{
-		breakpoint_item_text = QString("BPMR:  0x%1").arg(pc, 8, 16, QChar('0'));
-	}
-	else if (type == breakpoint_types::bp_write)
-	{
-		breakpoint_item_text = QString("BPMW:  0x%1").arg(pc, 8, 16, QChar('0'));
-	}
-	else if (type == (breakpoint_types::bp_read + breakpoint_types::bp_write))
-	{
-		breakpoint_item_text = QString("BPMRW: 0x%1").arg(pc, 8, 16, QChar('0'));
-	}
+	QString text = qstr(m_disasm->last_opcode);
+	text.remove(10, 13);
 
-	QListWidgetItem* breakpoint_item = new QListWidgetItem(breakpoint_item_text);
+	QListWidgetItem* breakpoint_item = new QListWidgetItem(text);
 	breakpoint_item->setForeground(m_text_color_bp);
 	breakpoint_item->setBackground(m_color_bp);
 	breakpoint_item->setData(Qt::UserRole, pc);
 	addItem(breakpoint_item);
 
-	show();
+	Q_EMIT RequestShowAddress(pc);
 
 	return true;
 }
 
 /**
- * If breakpoint exists, we remove it, else add new one.  Yeah, it'd be nicer from a code logic to have it be set/reset.  But, that logic has to happen somewhere anyhow.
- */
-void breakpoint_list::HandleBreakpointRequest(u32 loc, bool only_add)
+* If breakpoint exists, we remove it, else add new one.  Yeah, it'd be nicer from a code logic to have it be set/reset.  But, that logic has to happen somewhere anyhow.
+*/
+void breakpoint_list::HandleBreakpointRequest(u32 loc)
 {
-	const auto cpu = m_disasm ? m_disasm->get_cpu() : nullptr;
-
-	if (!cpu || cpu->state & cpu_flag::exit)
+	if (!m_cpu || m_cpu->state & cpu_flag::exit)
 	{
 		return;
 	}
 
-	if (!is_using_interpreter(cpu->get_class()))
+	if (m_cpu->id_type() != 1)
 	{
-		QMessageBox::warning(this, tr("Interpreters-Only Feature!"), tr("Cannot set breakpoints on non-interpreter decoders."));
-		return;
-	}
-
-	switch (cpu->get_class())
-	{
-	case thread_class::spu:
-	{
-		if (loc >= SPU_LS_SIZE || loc % 4)
-		{
-			QMessageBox::warning(this, tr("Invalid Memory For Breakpoints!"), tr("Cannot set breakpoints on non-SPU executable memory!"));
-			return;
-		}
-
-		const auto spu = static_cast<spu_thread*>(cpu);
-		auto& list = spu->local_breakpoints;
-		const u32 pos_at = loc / 4;
-		const u32 pos_bit = 1u << (pos_at % 8);
-
-		if (list[pos_at / 8].fetch_xor(pos_bit) & pos_bit)
-		{
-			if (std::none_of(list.begin(), list.end(), [](auto& val){ return val.load(); }))
-			{
-				spu->has_active_local_bps = false;
-			}
-		}
-		else
-		{
-			if (!spu->has_active_local_bps.exchange(true))
-			{
-				spu->state.atomic_op([](bs_t<cpu_flag>& flags)
-				{
-					if (flags & cpu_flag::pending)
-					{
-						flags += cpu_flag::pending_recheck;
-					}
-					else
-					{
-						flags += cpu_flag::pending;
-					}
-				});
-			}
-		}
-
-		return;
-	}
-	case thread_class::ppu:
-		break;
-	default:
-		QMessageBox::warning(this, tr("Unimplemented Breakpoints For Thread Type!"), tr("Cannot set breakpoints on a thread not an PPU/SPU currently, sorry."));
+		// TODO: SPU breakpoints
+		QMessageBox::warning(this, tr("Unimplemented Breakpoints For Thread Type!"), tr("Cannot set breakpoints on non-PPU thread currently, sorry."));
 		return;
 	}
 
@@ -185,16 +111,19 @@ void breakpoint_list::HandleBreakpointRequest(u32 loc, bool only_add)
 		return;
 	}
 
-	if (m_ppu_breakpoint_handler->HasBreakpoint(loc, breakpoint_types::bp_exec))
+	if (!is_using_interpreter(m_cpu->id_type()))
 	{
-		if (!only_add)
-		{
-			RemoveBreakpoint(loc);
-		}
+		QMessageBox::warning(this, tr("Interpreters-Only Feature!"), tr("Cannot set breakpoints on non-interpreter decoders."));
+		return;
+	}
+
+	if (m_breakpoint_handler->HasBreakpoint(loc))
+	{
+		RemoveBreakpoint(loc);
 	}
 	else
 	{
-		if (!AddBreakpoint(loc, breakpoint_types::bp_exec))
+		if (!AddBreakpoint(loc))
 		{
 			QMessageBox::warning(this, tr("Unknown error while setting breakpoint!"), tr("Failed to set breakpoints."));
 			return;
@@ -204,15 +133,17 @@ void breakpoint_list::HandleBreakpointRequest(u32 loc, bool only_add)
 
 void breakpoint_list::OnBreakpointListDoubleClicked()
 {
-	if (QListWidgetItem* item = currentItem())
-	{
-		const u32 address = item->data(Qt::UserRole).value<u32>();
-		Q_EMIT RequestShowAddress(address);
-	}
+	const u32 address = currentItem()->data(Qt::UserRole).value<u32>();
+	Q_EMIT RequestShowAddress(address);
 }
 
-void breakpoint_list::OnBreakpointListRightClicked(const QPoint& pos)
+void breakpoint_list::OnBreakpointListRightClicked(const QPoint &pos)
 {
+	if (!itemAt(pos))
+	{
+		return;
+	}
+
 	m_context_menu = new QMenu();
 
 	if (selectedItems().count() == 1)
@@ -227,28 +158,7 @@ void breakpoint_list::OnBreakpointListRightClicked(const QPoint& pos)
 		m_context_menu->addSeparator();
 	}
 
-	if (selectedItems().count() >= 1)
-	{
-		m_context_menu->addAction(m_delete_action);
-	}
-
-	QAction* m_addbp = new QAction(tr("Add Breakpoint"), this);
-	connect(m_addbp, &QAction::triggered, this, [this]
-		{
-			debugger_add_bp_window dlg(this, this);
-			dlg.exec();
-		});
-	m_context_menu->addAction(m_addbp);
-
-#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS
-	QAction* m_tglbpmbreak = new QAction(m_ppu_breakpoint_handler->IsBreakOnBPM() ? tr("Disable BPM") : tr("Enable BPM"), this);
-	connect(m_tglbpmbreak, &QAction::triggered, [this]
-		{
-			m_ppu_breakpoint_handler->SetBreakOnBPM(!m_ppu_breakpoint_handler->IsBreakOnBPM());
-		});
-	m_context_menu->addAction(m_tglbpmbreak);
-#endif
-
+	m_context_menu->addAction(m_delete_action);
 	m_context_menu->exec(viewport()->mapToGlobal(pos));
 	m_context_menu->deleteLater();
 	m_context_menu = nullptr;
@@ -258,7 +168,7 @@ void breakpoint_list::OnBreakpointListDelete()
 {
 	for (int i = selectedItems().count() - 1; i >= 0; i--)
 	{
-		RemoveBreakpoint(::at32(selectedItems(), i)->data(Qt::UserRole).value<u32>());
+		RemoveBreakpoint(selectedItems().at(i)->data(Qt::UserRole).value<u32>());
 	}
 
 	if (m_context_menu)
@@ -266,18 +176,3 @@ void breakpoint_list::OnBreakpointListDelete()
 		m_context_menu->close();
 	}
 }
-
-void breakpoint_list::mouseDoubleClickEvent(QMouseEvent* ev)
-{
-	if (!ev) return;
-
-	// Qt's itemDoubleClicked signal doesn't distinguish between mouse buttons and there is no simple way to get the pressed button.
-	// So we have to ignore this event when another button is pressed.
-	if (ev->button() != Qt::LeftButton)
-	{
-		ev->ignore();
-		return;
-	}
-
-	QListWidget::mouseDoubleClickEvent(ev);
-}
diff --git a/rpcs3/rpcs3qt/breakpoint_list.h b/rpcs3/rpcs3qt/breakpoint_list.h
index 15d87857eb..c792e8a1ff 100644
--- a/rpcs3/rpcs3qt/breakpoint_list.h
+++ b/rpcs3/rpcs3qt/breakpoint_list.h
@@ -4,10 +4,9 @@
 
 #include <QListWidget>
 
-#include "breakpoint_handler.h"
-
 class CPUDisAsm;
 class cpu_thread;
+class breakpoint_handler;
 
 class breakpoint_list : public QListWidget
 {
@@ -15,30 +14,25 @@ class breakpoint_list : public QListWidget
 
 public:
 	breakpoint_list(QWidget* parent, breakpoint_handler* handler);
-	void UpdateCPUData(std::shared_ptr<CPUDisAsm> disasm);
+	void UpdateCPUData(cpu_thread* cpu, CPUDisAsm* disasm);
 	void ClearBreakpoints();
+	bool AddBreakpoint(u32 pc);
 	void RemoveBreakpoint(u32 addr);
-	bool AddBreakpoint(u32 pc, bs_t<breakpoint_types> type);
 
 	QColor m_text_color_bp;
 	QColor m_color_bp;
-
-protected:
-	void mouseDoubleClickEvent(QMouseEvent* ev) override;
-
 Q_SIGNALS:
 	void RequestShowAddress(u32 addr, bool select_addr = true, bool force = false);
 public Q_SLOTS:
-	void HandleBreakpointRequest(u32 loc, bool add_only);
-
+	void HandleBreakpointRequest(u32 loc);
 private Q_SLOTS:
 	void OnBreakpointListDoubleClicked();
 	void OnBreakpointListRightClicked(const QPoint &pos);
 	void OnBreakpointListDelete();
-
 private:
-	breakpoint_handler* m_ppu_breakpoint_handler = nullptr;
+	breakpoint_handler* m_breakpoint_handler;
 	QMenu* m_context_menu = nullptr;
 	QAction* m_delete_action;
-	std::shared_ptr<CPUDisAsm> m_disasm = nullptr;
+	cpu_thread* m_cpu = nullptr;
+	CPUDisAsm* m_disasm = nullptr;
 };
diff --git a/rpcs3/rpcs3qt/call_stack_list.cpp b/rpcs3/rpcs3qt/call_stack_list.cpp
index 6c761ed164..90638e1b85 100644
--- a/rpcs3/rpcs3qt/call_stack_list.cpp
+++ b/rpcs3/rpcs3qt/call_stack_list.cpp
@@ -2,8 +2,7 @@
 
 #include "Utilities/StrFmt.h"
 
-#include <QKeyEvent>
-#include <QMouseEvent>
+constexpr auto qstr = QString::fromStdString;
 
 call_stack_list::call_stack_list(QWidget* parent) : QListWidget(parent)
 {
@@ -12,21 +11,7 @@ call_stack_list::call_stack_list(QWidget* parent) : QListWidget(parent)
 	setSelectionMode(QAbstractItemView::ExtendedSelection);
 
 	// connects
-	connect(this, &QListWidget::itemDoubleClicked, this, &call_stack_list::ShowItemAddress);
-
-	// Hide until used in order to allow as much space for registers panel as possible
-	hide();
-}
-
-void call_stack_list::keyPressEvent(QKeyEvent* event)
-{
-	QListWidget::keyPressEvent(event);
-	event->ignore(); // Propagate the event to debugger_frame
-
-	if (!event->modifiers() && event->key() == Qt::Key_Return)
-	{
-		ShowItemAddress();
-	}
+	connect(this, &QListWidget::itemDoubleClicked, this, &call_stack_list::OnCallStackListDoubleClicked);
 }
 
 void call_stack_list::HandleUpdate(const std::vector<std::pair<u32, u32>>& call_stack)
@@ -35,35 +20,15 @@ void call_stack_list::HandleUpdate(const std::vector<std::pair<u32, u32>>& call_
 
 	for (const auto& addr : call_stack)
 	{
-		const QString text = QString::fromStdString(fmt::format("0x%08llx (sp=0x%08llx)", addr.first, addr.second));
+		const QString text = qstr(fmt::format("0x%08llx (sp=0x%08llx)", addr.first, addr.second));
 		QListWidgetItem* call_stack_item = new QListWidgetItem(text);
 		call_stack_item->setData(Qt::UserRole, { addr.first });
 		addItem(call_stack_item);
 	}
-
-	setVisible(!call_stack.empty());
 }
 
-void call_stack_list::ShowItemAddress()
+void call_stack_list::OnCallStackListDoubleClicked()
 {
-	if (QListWidgetItem* call_stack_item = currentItem())
-	{
-		const u32 address = call_stack_item->data(Qt::UserRole).value<u32>();
-		Q_EMIT RequestShowAddress(address);
-	}
-}
-
-void call_stack_list::mouseDoubleClickEvent(QMouseEvent* ev)
-{
-	if (!ev) return;
-
-	// Qt's itemDoubleClicked signal doesn't distinguish between mouse buttons and there is no simple way to get the pressed button.
-	// So we have to ignore this event when another button is pressed.
-	if (ev->button() != Qt::LeftButton)
-	{
-		ev->ignore();
-		return;
-	}
-
-	QListWidget::mouseDoubleClickEvent(ev);
+	const u32 address = currentItem()->data(Qt::UserRole).value<u32>();
+	Q_EMIT RequestShowAddress(address);
 }
diff --git a/rpcs3/rpcs3qt/call_stack_list.h b/rpcs3/rpcs3qt/call_stack_list.h
index 48a71dbbbb..bdae7a434c 100644
--- a/rpcs3/rpcs3qt/call_stack_list.h
+++ b/rpcs3/rpcs3qt/call_stack_list.h
@@ -15,17 +15,10 @@ class call_stack_list : public QListWidget
 public:
 	explicit call_stack_list(QWidget* parent);
 
-protected:
-	void mouseDoubleClickEvent(QMouseEvent* ev) override;
-
 Q_SIGNALS:
 	void RequestShowAddress(u32 addr, bool select_addr = true, bool force = false);
 public Q_SLOTS:
 	void HandleUpdate(const std::vector<std::pair<u32, u32>>& call_stack);
-
 private Q_SLOTS:
-	void ShowItemAddress();
-
-private:
-	void keyPressEvent(QKeyEvent* event) override;
+	void OnCallStackListDoubleClicked();
 };
diff --git a/rpcs3/rpcs3qt/camera_settings_dialog.cpp b/rpcs3/rpcs3qt/camera_settings_dialog.cpp
deleted file mode 100644
index 0cc5843595..0000000000
--- a/rpcs3/rpcs3qt/camera_settings_dialog.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-#include "stdafx.h"
-#include "camera_settings_dialog.h"
-#include "ui_camera_settings_dialog.h"
-#include "permissions.h"
-#include "Emu/Io/camera_config.h"
-
-#include <QCameraDevice>
-#include <QMediaDevices>
-#include <QMessageBox>
-#include <QPushButton>
-
-LOG_CHANNEL(camera_log, "Camera");
-
-template <>
-void fmt_class_string<QVideoFrameFormat::PixelFormat>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](QVideoFrameFormat::PixelFormat value)
-	{
-		switch (value)
-		{
-		case QVideoFrameFormat::Format_ARGB8888: return "ARGB8888";
-		case QVideoFrameFormat::Format_ARGB8888_Premultiplied: return "ARGB8888_Premultiplied";
-		case QVideoFrameFormat::Format_XRGB8888: return "XRGB8888";
-		case QVideoFrameFormat::Format_BGRA8888: return "BGRA8888";
-		case QVideoFrameFormat::Format_BGRA8888_Premultiplied: return "BGRA8888_Premultiplied";
-		case QVideoFrameFormat::Format_BGRX8888: return "BGRX8888";
-		case QVideoFrameFormat::Format_ABGR8888: return "ABGR8888";
-		case QVideoFrameFormat::Format_XBGR8888: return "XBGR8888";
-		case QVideoFrameFormat::Format_RGBA8888: return "RGBA8888";
-		case QVideoFrameFormat::Format_RGBX8888: return "RGBX8888";
-		case QVideoFrameFormat::Format_AYUV: return "AYUV";
-		case QVideoFrameFormat::Format_AYUV_Premultiplied: return "AYUV_Premultiplied";
-		case QVideoFrameFormat::Format_YUV420P: return "YUV420P";
-		case QVideoFrameFormat::Format_YUV422P: return "YUV422P";
-		case QVideoFrameFormat::Format_YV12: return "YV12";
-		case QVideoFrameFormat::Format_UYVY: return "UYVY";
-		case QVideoFrameFormat::Format_YUYV: return "YUYV";
-		case QVideoFrameFormat::Format_NV12: return "NV12";
-		case QVideoFrameFormat::Format_NV21: return "NV21";
-		case QVideoFrameFormat::Format_IMC1: return "IMC1";
-		case QVideoFrameFormat::Format_IMC2: return "IMC2";
-		case QVideoFrameFormat::Format_IMC3: return "IMC3";
-		case QVideoFrameFormat::Format_IMC4: return "IMC4";
-		case QVideoFrameFormat::Format_Y8: return "Y8";
-		case QVideoFrameFormat::Format_Y16: return "Y16";
-		case QVideoFrameFormat::Format_P010: return "P010";
-		case QVideoFrameFormat::Format_P016: return "P016";
-		case QVideoFrameFormat::Format_SamplerExternalOES: return "SamplerExternalOES";
-		case QVideoFrameFormat::Format_Jpeg: return "Jpeg";
-		case QVideoFrameFormat::Format_SamplerRect: return "SamplerRect";
-		default: return unknown;
-		}
-	});
-}
-
-Q_DECLARE_METATYPE(QCameraDevice);
-
-camera_settings_dialog::camera_settings_dialog(QWidget* parent)
-	: QDialog(parent)
-	, ui(new Ui::camera_settings_dialog)
-{
-	ui->setupUi(this);
-
-	load_config();
-
-	for (const QCameraDevice& camera_info : QMediaDevices::videoInputs())
-	{
-		if (camera_info.isNull()) continue;
-		ui->combo_camera->addItem(camera_info.description(), QVariant::fromValue(camera_info));
-		camera_log.notice("Found camera: '%s'", camera_info.description());
-	}
-
-	connect(ui->combo_camera, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &camera_settings_dialog::handle_camera_change);
-	connect(ui->combo_settings, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &camera_settings_dialog::handle_settings_change);
-	connect(ui->buttonBox, &QDialogButtonBox::clicked, [this](QAbstractButton* button)
-	{
-		if (button == ui->buttonBox->button(QDialogButtonBox::Save))
-		{
-			save_config();
-			accept();
-		}
-		else if (button == ui->buttonBox->button(QDialogButtonBox::Apply))
-		{
-			save_config();
-		}
-	});
-
-	if (ui->combo_camera->count() == 0)
-	{
-		ui->combo_camera->setEnabled(false);
-		ui->combo_settings->setEnabled(false);
-		ui->buttonBox->button(QDialogButtonBox::Save)->setEnabled(false);
-		ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
-	}
-	else
-	{
-		// TODO: show camera ID somewhere
-		ui->combo_camera->setCurrentIndex(0);
-	}
-}
-
-camera_settings_dialog::~camera_settings_dialog()
-{
-}
-
-void camera_settings_dialog::handle_camera_change(int index)
-{
-	if (index < 0 || !ui->combo_camera->itemData(index).canConvert<QCameraDevice>())
-	{
-		ui->combo_settings->clear();
-		return;
-	}
-
-	const QCameraDevice camera_info = ui->combo_camera->itemData(index).value<QCameraDevice>();
-
-	if (camera_info.isNull())
-	{
-		ui->combo_settings->clear();
-		return;
-	}
-
-	m_camera.reset(new QCamera(camera_info));
-	m_media_capture_session.reset(new QMediaCaptureSession(nullptr));
-	m_media_capture_session->setCamera(m_camera.get());
-	m_media_capture_session->setVideoSink(ui->videoWidget->videoSink());
-
-	if (!m_camera->isAvailable())
-	{
-		ui->combo_settings->clear();
-		QMessageBox::warning(this, tr("Camera not available"), tr("The selected camera is not available.\nIt might be blocked by another application."));
-		return;
-	}
-
-	ui->combo_settings->blockSignals(true);
-	ui->combo_settings->clear();
-
-	QList<QCameraFormat> settings = camera_info.videoFormats();
-	std::sort(settings.begin(), settings.end(), [](const QCameraFormat& l, const QCameraFormat& r) -> bool
-	{
-		if (l.resolution().width() > r.resolution().width()) return true;
-		if (l.resolution().width() < r.resolution().width()) return false;
-		if (l.resolution().height() > r.resolution().height()) return true;
-		if (l.resolution().height() < r.resolution().height()) return false;
-		if (l.minFrameRate() > r.minFrameRate()) return true;
-		if (l.minFrameRate() < r.minFrameRate()) return false;
-		if (l.maxFrameRate() > r.maxFrameRate()) return true;
-		if (l.maxFrameRate() < r.maxFrameRate()) return false;
-		if (l.pixelFormat() > r.pixelFormat()) return true;
-		if (l.pixelFormat() < r.pixelFormat()) return false;
-		return false;
-	});
-
-	for (const QCameraFormat& setting : settings)
-	{
-		if (setting.isNull()) continue;
-		const QString description = tr("%0x%1, %2-%3 FPS, Format=%4")
-			.arg(setting.resolution().width())
-			.arg(setting.resolution().height())
-			.arg(setting.minFrameRate())
-			.arg(setting.maxFrameRate())
-			.arg(QString::fromStdString(fmt::format("%s", setting.pixelFormat())));
-		ui->combo_settings->addItem(description, QVariant::fromValue(setting));
-	}
-	ui->combo_settings->blockSignals(false);
-
-	if (ui->combo_settings->count() == 0)
-	{
-		ui->combo_settings->setEnabled(false);
-	}
-	else
-	{
-		// Load selected settings from config file
-		int index = 0;
-		bool success = false;
-		const std::string key = camera_info.id().toStdString();
-		cfg_camera::camera_setting cfg_setting = g_cfg_camera.get_camera_setting(key, success);
-
-		if (success)
-		{
-			camera_log.notice("Found config entry for camera \"%s\"", key);
-
-			// Select matching drowdown entry
-			const double epsilon = 0.001;
-
-			for (int i = 0; i < ui->combo_settings->count(); i++)
-			{
-				const QCameraFormat tmp = ui->combo_settings->itemData(i).value<QCameraFormat>();
-
-				if (tmp.resolution().width() == cfg_setting.width &&
-					tmp.resolution().height() == cfg_setting.height &&
-					tmp.minFrameRate() >= (cfg_setting.min_fps - epsilon) &&
-					tmp.minFrameRate() <= (cfg_setting.min_fps + epsilon) &&
-					tmp.maxFrameRate() >= (cfg_setting.max_fps - epsilon) &&
-					tmp.maxFrameRate() <= (cfg_setting.max_fps + epsilon) &&
-					tmp.pixelFormat() == static_cast<QVideoFrameFormat::PixelFormat>(cfg_setting.format))
-				{
-					index = i;
-					break;
-				}
-			}
-		}
-
-		ui->combo_settings->setCurrentIndex(std::max<int>(0, index));
-		ui->combo_settings->setEnabled(true);
-
-		// Update config to match user interface outcome
-		const QCameraFormat setting = ui->combo_settings->currentData().value<QCameraFormat>();
-		cfg_setting.width = setting.resolution().width();
-		cfg_setting.height = setting.resolution().height();
-		cfg_setting.min_fps = setting.minFrameRate();
-		cfg_setting.max_fps = setting.maxFrameRate();
-		cfg_setting.format = static_cast<int>(setting.pixelFormat());
-		g_cfg_camera.set_camera_setting(key, cfg_setting);
-	}
-}
-
-void camera_settings_dialog::handle_settings_change(int index)
-{
-	if (!m_camera)
-	{
-		return;
-	}
-
-	if (!m_camera->isAvailable())
-	{
-		QMessageBox::warning(this, tr("Camera not available"), tr("The selected camera is not available.\nIt might be blocked by another application."));
-		return;
-	}
-
-	if (!gui::utils::check_camera_permission(this,
-		[this, index](){ handle_settings_change(index); },
-		[this](){ QMessageBox::warning(this, tr("Camera permissions denied!"), tr("RPCS3 has no permissions to access cameras on this device.")); }))
-	{
-		return;
-	}
-
-	if (index >= 0 && ui->combo_settings->itemData(index).canConvert<QCameraFormat>() && ui->combo_camera->currentData().canConvert<QCameraDevice>())
-	{
-		const QCameraFormat setting = ui->combo_settings->itemData(index).value<QCameraFormat>();
-		if (!setting.isNull())
-		{
-			m_camera->setCameraFormat(setting);
-		}
-
-		cfg_camera::camera_setting cfg_setting;
-		cfg_setting.width = setting.resolution().width();
-		cfg_setting.height = setting.resolution().height();
-		cfg_setting.min_fps = setting.minFrameRate();
-		cfg_setting.max_fps = setting.maxFrameRate();
-		cfg_setting.format = static_cast<int>(setting.pixelFormat());
-		g_cfg_camera.set_camera_setting(ui->combo_camera->currentData().value<QCameraDevice>().id().toStdString(), cfg_setting);
-	}
-
-	m_camera->start();
-}
-
-void camera_settings_dialog::load_config()
-{
-	if (!g_cfg_camera.load())
-	{
-		camera_log.notice("Could not load camera config. Using defaults.");
-	}
-}
-
-void camera_settings_dialog::save_config()
-{
-	g_cfg_camera.save();
-}
diff --git a/rpcs3/rpcs3qt/camera_settings_dialog.h b/rpcs3/rpcs3qt/camera_settings_dialog.h
deleted file mode 100644
index da18f64cca..0000000000
--- a/rpcs3/rpcs3qt/camera_settings_dialog.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <QCamera>
-#include <QDialog>
-#include <QMediaCaptureSession>
-
-namespace Ui
-{
-	class camera_settings_dialog;
-}
-
-class camera_settings_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	camera_settings_dialog(QWidget* parent = nullptr);
-	virtual ~camera_settings_dialog();
-
-private Q_SLOTS:
-	void handle_camera_change(int index);
-	void handle_settings_change(int index);
-
-private:
-	void load_config();
-	void save_config();
-
-	std::unique_ptr<Ui::camera_settings_dialog> ui;
-	std::unique_ptr<QCamera> m_camera;
-	std::unique_ptr<QMediaCaptureSession> m_media_capture_session;
-};
diff --git a/rpcs3/rpcs3qt/camera_settings_dialog.ui b/rpcs3/rpcs3qt/camera_settings_dialog.ui
deleted file mode 100644
index 8afe262f22..0000000000
--- a/rpcs3/rpcs3qt/camera_settings_dialog.ui
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>camera_settings_dialog</class>
- <widget class="QDialog" name="camera_settings_dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>356</width>
-    <height>380</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Camera Settings</string>
-  </property>
-  <layout class="QVBoxLayout" name="mainLayout" stretch="0,1,0">
-   <item>
-    <layout class="QHBoxLayout" name="settingsLayout" stretch="1,2">
-     <item>
-      <widget class="QGroupBox" name="gbCamera">
-       <property name="title">
-        <string>Camera</string>
-       </property>
-       <layout class="QVBoxLayout" name="camera_layout">
-        <item>
-         <widget class="QComboBox" name="combo_camera">
-          <property name="placeholderText">
-           <string>No cameras found</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QGroupBox" name="gbSettings">
-       <property name="title">
-        <string>Settings</string>
-       </property>
-       <layout class="QVBoxLayout" name="settings_layout">
-        <item>
-         <widget class="QComboBox" name="combo_settings">
-          <property name="placeholderText">
-           <string>No settings found</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="gbPreview">
-     <property name="title">
-      <string>Preview</string>
-     </property>
-     <layout class="QVBoxLayout" name="preview_layout">
-      <item>
-       <widget class="QVideoWidget" name="videoWidget" native="true">
-        <property name="minimumSize">
-         <size>
-          <width>64</width>
-          <height>48</height>
-         </size>
-        </property>
-        <property name="autoFillBackground">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>QVideoWidget</class>
-   <extends>QWidget</extends>
-   <header>qvideowidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>camera_settings_dialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>camera_settings_dialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/rpcs3/rpcs3qt/category.h b/rpcs3/rpcs3qt/category.h
index d87ebc1092..7f94fb765b 100644
--- a/rpcs3/rpcs3qt/category.h
+++ b/rpcs3/rpcs3qt/category.h
@@ -13,7 +13,6 @@ enum Category
 	Home,
 	Media,
 	Data,
-	OS,
 	Unknown_Cat,
 	Others,
 };
@@ -22,7 +21,6 @@ namespace cat
 {
 	const QString cat_app_music = "AM";
 	const QString cat_app_photo = "AP";
-	const QString cat_app_store = "AS";
 	const QString cat_app_tv    = "AT";
 	const QString cat_app_video = "AV";
 	const QString cat_bc_video  = "BV";
@@ -43,14 +41,11 @@ namespace cat
 	const QString cat_ps3_save  = "SD";
 	const QString cat_psp_save  = "MS";
 
-	const QString cat_ps3_os    = "/OS";
-
 	const QString cat_unknown = "Unknown";
 
 	const QStringList ps2_games = { cat_ps2_game, cat_ps2_inst };
 	const QStringList psp_games = { cat_psp_game, cat_psp_mini, cat_psp_rema };
-	const QStringList media = { cat_app_photo, cat_app_video, cat_bc_video, cat_app_music, cat_app_store, cat_app_tv, cat_web_tv };
+	const QStringList media = { cat_app_photo, cat_app_video, cat_bc_video, cat_app_music, cat_app_tv, cat_web_tv };
 	const QStringList data = { cat_ps3_data, cat_ps2_data, cat_ps3_save, cat_psp_save };
-	const QStringList os = { cat_ps3_os };
 	const QStringList others = { cat_network, cat_store_fe };
 }
diff --git a/rpcs3/rpcs3qt/cg_disasm_window.cpp b/rpcs3/rpcs3qt/cg_disasm_window.cpp
index 480383b973..9cc62f881a 100644
--- a/rpcs3/rpcs3qt/cg_disasm_window.cpp
+++ b/rpcs3/rpcs3qt/cg_disasm_window.cpp
@@ -13,6 +13,9 @@
 
 LOG_CHANNEL(gui_log, "GUI");
 
+constexpr auto qstr = QString::fromStdString;
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
+
 cg_disasm_window::cg_disasm_window(std::shared_ptr<gui_settings> gui_settings)
 	: m_gui_settings(std::move(gui_settings))
 {
@@ -108,15 +111,15 @@ void cg_disasm_window::ShowDisasm() const
 {
 	if (QFileInfo(m_path_last).isFile())
 	{
-		CgBinaryDisasm disasm(m_path_last.toStdString());
+		CgBinaryDisasm disasm(sstr(m_path_last));
 		disasm.BuildShaderBody();
-		m_disasm_text->setText(QString::fromStdString(disasm.GetArbShader()));
-		m_glsl_text->setText(QString::fromStdString(disasm.GetGlslShader()));
+		m_disasm_text->setText(qstr(disasm.GetArbShader()));
+		m_glsl_text->setText(qstr(disasm.GetGlslShader()));
 		m_gui_settings->SetValue(gui::fd_cg_disasm, m_path_last);
 	}
 	else if (!m_path_last.isEmpty())
 	{
-		gui_log.error("CgDisasm: Failed to open %s", m_path_last);
+		gui_log.error("CgDisasm: Failed to open %s", sstr(m_path_last));
 	}
 }
 
diff --git a/rpcs3/rpcs3qt/cg_disasm_window.h b/rpcs3/rpcs3qt/cg_disasm_window.h
index dc0a963c84..f1df84e507 100644
--- a/rpcs3/rpcs3qt/cg_disasm_window.h
+++ b/rpcs3/rpcs3qt/cg_disasm_window.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "util/types.hpp"
+
 #include <QTextEdit>
 #include <QDropEvent>
 
diff --git a/rpcs3/rpcs3qt/cheat_manager.cpp b/rpcs3/rpcs3qt/cheat_manager.cpp
index 8f4d82d9c9..3520bd591a 100644
--- a/rpcs3/rpcs3qt/cheat_manager.cpp
+++ b/rpcs3/rpcs3qt/cheat_manager.cpp
@@ -7,7 +7,6 @@
 #include <QGuiApplication>
 
 #include "cheat_manager.h"
-#include "memory_viewer_panel.h"
 
 #include "Emu/System.h"
 #include "Emu/Memory/vm.h"
@@ -15,12 +14,10 @@
 
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUAnalyser.h"
-#include "Emu/Cell/PPUInterpreter.h"
-#include "Emu/Cell/lv2/sys_sync.h"
+#include "Emu/Cell/PPUFunction.h"
 
 #include "util/yaml.hpp"
 #include "util/asm.hpp"
-#include "util/logs.hpp"
 #include "util/to_endian.hpp"
 #include "Utilities/File.h"
 #include "Utilities/StrUtil.h"
@@ -30,6 +27,28 @@ LOG_CHANNEL(log_cheat, "Cheat");
 
 cheat_manager_dialog* cheat_manager_dialog::inst = nullptr;
 
+template <>
+void fmt_class_string<cheat_type>::format(std::string& out, u64 arg)
+{
+	format_enum(out, arg, [](cheat_type value)
+	{
+		switch (value)
+		{
+		case cheat_type::unsigned_8_cheat: return "Unsigned 8 bits";
+		case cheat_type::unsigned_16_cheat: return "Unsigned 16 bits";
+		case cheat_type::unsigned_32_cheat: return "Unsigned 32 bits";
+		case cheat_type::unsigned_64_cheat: return "Unsigned 64 bits";
+		case cheat_type::signed_8_cheat: return "Signed 8 bits";
+		case cheat_type::signed_16_cheat: return "Signed 16 bits";
+		case cheat_type::signed_32_cheat: return "Signed 32 bits";
+		case cheat_type::signed_64_cheat: return "Signed 64 bits";
+		case cheat_type::max: break;
+		}
+
+		return unknown;
+	});
+}
+
 YAML::Emitter& operator<<(YAML::Emitter& out, const cheat_info& rhs)
 {
 	std::string type_formatted;
@@ -147,7 +166,7 @@ std::string cheat_engine::export_cheats_to_str() const
 
 	for (const auto& game : cheats)
 	{
-		for (const auto& offset : ::at32(cheats, game.first))
+		for (const auto& offset : cheats.at(game.first))
 		{
 			cheats_str += offset.second.to_str();
 			cheats_str += "^^^";
@@ -159,7 +178,7 @@ std::string cheat_engine::export_cheats_to_str() const
 
 bool cheat_engine::exist(const std::string& game, const u32 offset) const
 {
-	return cheats.contains(game) && ::at32(cheats, game).contains(offset);
+	return cheats.contains(game) && cheats.at(game).contains(offset);
 }
 
 void cheat_engine::add(const std::string& game, const std::string& description, const cheat_type type, const u32 offset, const std::string& red_script)
@@ -389,7 +408,7 @@ bool cheat_engine::set_value(const u32 offset, const T value)
 
 		if (exec_code_at_end || exec_code_at_start)
 		{
-			extern void ppu_register_function_at(u32, u32, ppu_intrp_func_t);
+			extern void ppu_register_function_at(u32, u32, ppu_function_t);
 
 			u32 addr = offset, size = sizeof(T);
 
@@ -422,7 +441,7 @@ bool cheat_engine::is_addr_safe(const u32 offset)
 	if (Emu.IsStopped())
 		return false;
 
-	const auto ppum = g_fxo->try_get<main_ppu_module<lv2_obj>>();
+	const auto ppum = g_fxo->try_get<ppu_module>();
 
 	if (!ppum)
 	{
@@ -592,9 +611,8 @@ cheat_manager_dialog::cheat_manager_dialog(QWidget* parent)
 			return;
 		}
 
-		bool success = false;
-		u64 result_value {};
-		f64 result_value_f {};
+		bool success;
+		u64 result_value;
 
 		switch (cheat->type)
 		{
@@ -606,7 +624,6 @@ cheat_manager_dialog::cheat_manager_dialog(QWidget* parent)
 		case cheat_type::signed_16_cheat: result_value = cheat_engine::get_value<s16>(final_offset, success); break;
 		case cheat_type::signed_32_cheat: result_value = cheat_engine::get_value<s32>(final_offset, success); break;
 		case cheat_type::signed_64_cheat: result_value = cheat_engine::get_value<s64>(final_offset, success); break;
-		case cheat_type::float_32_cheat: result_value_f = cheat_engine::get_value<f32>(final_offset, success); break;
 		default: log_cheat.fatal("Unsupported cheat type"); return;
 		}
 
@@ -614,8 +631,6 @@ cheat_manager_dialog::cheat_manager_dialog(QWidget* parent)
 		{
 			if (cheat->type >= cheat_type::signed_8_cheat && cheat->type <= cheat_type::signed_64_cheat)
 				edt_value_final->setText(tr("%1").arg(static_cast<s64>(result_value)));
-			else if (cheat->type == cheat_type::float_32_cheat)
-				edt_value_final->setText(tr("%1").arg(result_value_f));
 			else
 				edt_value_final->setText(tr("%1").arg(result_value));
 		}
@@ -779,7 +794,6 @@ cheat_manager_dialog::cheat_manager_dialog(QWidget* parent)
 		case cheat_type::signed_16_cheat: results = convert_and_set<s16>(final_offset); break;
 		case cheat_type::signed_32_cheat: results = convert_and_set<s32>(final_offset); break;
 		case cheat_type::signed_64_cheat: results = convert_and_set<s64>(final_offset); break;
-		case cheat_type::float_32_cheat: results = convert_and_set<f32>(final_offset); break;
 		default: log_cheat.fatal("Unsupported cheat type"); return;
 		}
 
@@ -830,7 +844,6 @@ cheat_manager_dialog::cheat_manager_dialog(QWidget* parent)
 		QMenu* menu = new QMenu();
 
 		QAction* add_to_cheat_list = new QAction(tr("Add to cheat list"), menu);
-		QAction* show_in_mem_viewer = new QAction(tr("Show in Memory Viewer"), menu);
 
 		const u32 offset       = offsets_found[current_row];
 		const cheat_type type  = static_cast<cheat_type>(cbx_cheat_search_type->currentIndex());
@@ -839,7 +852,7 @@ cheat_manager_dialog::cheat_manager_dialog(QWidget* parent)
 		{
 			if (g_cheat.exist(name, offset))
 			{
-				if (QMessageBox::question(this, tr("Cheat already exists"), tr("Do you want to overwrite the existing cheat?"), QMessageBox::Ok | QMessageBox::Cancel) != QMessageBox::Ok)
+				if (QMessageBox::question(this, tr("Cheat already exist"), tr("Do you want to overwrite the existing cheat?"), QMessageBox::Ok | QMessageBox::Cancel) != QMessageBox::Ok)
 					return;
 			}
 
@@ -851,13 +864,7 @@ cheat_manager_dialog::cheat_manager_dialog(QWidget* parent)
 			update_cheat_list();
 		});
 
-		connect(show_in_mem_viewer, &QAction::triggered, this, [offset]()
-		{
-			memory_viewer_panel::ShowAtPC(offset);
-		});
-
 		menu->addAction(add_to_cheat_list);
-		menu->addAction(show_in_mem_viewer);
 		menu->exec(globalPos);
 	});
 
@@ -880,56 +887,55 @@ cheat_manager_dialog* cheat_manager_dialog::get_dlg(QWidget* parent)
 template <typename T>
 T cheat_manager_dialog::convert_from_QString(const QString& str, bool& success)
 {
-	if constexpr (std::is_same_v<T, u8>)
+	T result;
+
+	if constexpr (std::is_same<T, u8>::value)
 	{
 		const u16 result_16 = str.toUShort(&success);
 
 		if (result_16 > 0xFF)
 			success = false;
 
-		return static_cast<T>(result_16);
+		result = static_cast<T>(result_16);
 	}
 
-	if constexpr (std::is_same_v<T, u16>)
-		return str.toUShort(&success);
+	if constexpr (std::is_same<T, u16>::value)
+		result = str.toUShort(&success);
 
-	if constexpr (std::is_same_v<T, u32>)
-		return str.toUInt(&success);
+	if constexpr (std::is_same<T, u32>::value)
+		result = str.toUInt(&success);
 
-	if constexpr (std::is_same_v<T, u64>)
-		return str.toULongLong(&success);
+	if constexpr (std::is_same<T, u64>::value)
+		result = str.toULongLong(&success);
 
-	if constexpr (std::is_same_v<T, s8>)
+	if constexpr (std::is_same<T, s8>::value)
 	{
 		const s16 result_16 = str.toShort(&success);
 		if (result_16 < -128 || result_16 > 127)
 			success = false;
 
-		return static_cast<T>(result_16);
+		result = static_cast<T>(result_16);
 	}
 
-	if constexpr (std::is_same_v<T, s16>)
-		return str.toShort(&success);
+	if constexpr (std::is_same<T, s16>::value)
+		result = str.toShort(&success);
 
-	if constexpr (std::is_same_v<T, s32>)
-		return str.toInt(&success);
+	if constexpr (std::is_same<T, s32>::value)
+		result = str.toInt(&success);
 
-	if constexpr (std::is_same_v<T, s64>)
-		return str.toLongLong(&success);
+	if constexpr (std::is_same<T, s64>::value)
+		result = str.toLongLong(&success);
 
-	if constexpr (std::is_same_v<T, f32>)
-		return str.toFloat(&success);
-
-	return {};
+	return result;
 }
 
 template <typename T>
 bool cheat_manager_dialog::convert_and_search()
 {
-	bool res_conv = false;
+	bool res_conv;
 	const QString to_search = edt_cheat_search_value->text();
 
-	const T value = convert_from_QString<T>(to_search, res_conv);
+	T value = convert_from_QString<T>(to_search, res_conv);
 
 	if (!res_conv)
 		return false;
@@ -941,10 +947,10 @@ bool cheat_manager_dialog::convert_and_search()
 template <typename T>
 std::pair<bool, bool> cheat_manager_dialog::convert_and_set(u32 offset)
 {
-	bool res_conv = false;
+	bool res_conv;
 	const QString to_set = edt_value_final->text();
 
-	const T value = convert_from_QString<T>(to_set, res_conv);
+	T value = convert_from_QString<T>(to_set, res_conv);
 
 	if (!res_conv)
 		return {false, false};
@@ -967,7 +973,6 @@ void cheat_manager_dialog::do_the_search()
 	case cheat_type::signed_16_cheat: res_conv = convert_and_search<s16>(); break;
 	case cheat_type::signed_32_cheat: res_conv = convert_and_search<s32>(); break;
 	case cheat_type::signed_64_cheat: res_conv = convert_and_search<s64>(); break;
-	case cheat_type::float_32_cheat: res_conv = convert_and_search<f32>(); break;
 	default: log_cheat.fatal("Unsupported cheat type"); break;
 	}
 
@@ -998,7 +1003,7 @@ void cheat_manager_dialog::do_the_search()
 	{
 		for (u32 row = 0; row < size; row++)
 		{
-			lst_search->insertItem(row, QString("0x%0").arg(offsets_found[row], 1, 16).toUpper());
+			lst_search->insertItem(row, tr("0x%0").arg(offsets_found[row], 1, 16).toUpper());
 		}
 	}
 
@@ -1032,7 +1037,7 @@ void cheat_manager_dialog::update_cheat_list()
 				item_type->setFlags(item_type->flags() & ~Qt::ItemIsEditable);
 				tbl_cheats->setItem(row, cheat_table_columns::type, item_type);
 
-				QTableWidgetItem* item_offset = new QTableWidgetItem(QString("0x%0").arg(offset.second.offset, 1, 16).toUpper());
+				QTableWidgetItem* item_offset = new QTableWidgetItem(tr("0x%1").arg(offset.second.offset, 1, 16).toUpper());
 				item_offset->setData(Qt::UserRole, QVariant(offset.second.offset));
 				item_offset->setFlags(item_offset->flags() & ~Qt::ItemIsEditable);
 				tbl_cheats->setItem(row, cheat_table_columns::offset, item_offset);
@@ -1059,7 +1064,6 @@ QString cheat_manager_dialog::get_localized_cheat_type(cheat_type type)
 	case cheat_type::signed_16_cheat: return tr("Signed 16 bits");
 	case cheat_type::signed_32_cheat: return tr("Signed 32 bits");
 	case cheat_type::signed_64_cheat: return tr("Signed 64 bits");
-	case cheat_type::float_32_cheat: return tr("Float 32 bits");
 	case cheat_type::max: break;
 	}
 	std::string type_formatted;
diff --git a/rpcs3/rpcs3qt/config_adapter.cpp b/rpcs3/rpcs3qt/config_adapter.cpp
index ddc0cc839c..1ff8b6a82e 100644
--- a/rpcs3/rpcs3qt/config_adapter.cpp
+++ b/rpcs3/rpcs3qt/config_adapter.cpp
@@ -6,11 +6,11 @@ LOG_CHANNEL(cfg_log, "CFG");
 // Helper methods to interact with YAML and the config settings.
 namespace cfg_adapter
 {
-	static cfg::_base& get_cfg(const cfg::_base& root, const std::string& name)
+	static cfg::_base& get_cfg(cfg::_base& root, const std::string& name)
 	{
 		if (root.get_type() == cfg::type::node)
 		{
-			for (const auto& node : static_cast<const cfg::node&>(root).get_nodes())
+			for (const auto& node : static_cast<cfg::node&>(root).get_nodes())
 			{
 				if (node->get_name() == name)
 				{
@@ -36,7 +36,7 @@ namespace cfg_adapter
 
 		if (!node || !node.IsMap())
 		{
-			cfg_log.fatal("Node error. A cfg_location does not match its cfg::node (location: %s)", get_yaml_node_location(node));
+			cfg_log.fatal("Node error. A cfg_location does not match its cfg::node");
 			return YAML::Node();
 		}
 
@@ -48,24 +48,30 @@ namespace cfg_adapter
 		return get_node(node, location.cbegin(), location.cend());
 	}
 
-	std::vector<std::string> get_options(const cfg_location& location)
+	QStringList get_options(const cfg_location& location)
 	{
-		return cfg_adapter::get_cfg(g_cfg, location.cbegin(), location.cend()).to_list();
+		QStringList values;
+		for (const auto& v : cfg_adapter::get_cfg(g_cfg, location.cbegin(), location.cend()).to_list())
+		{
+			values.append(QString::fromStdString(v));
+		}
+		return values;
 	}
-
+	
 	static bool get_is_dynamic(const cfg_location& location)
 	{
 		return cfg_adapter::get_cfg(g_cfg, location.cbegin(), location.cend()).get_is_dynamic();
 	}
-
+	
 	bool get_is_dynamic(emu_settings_type type)
 	{
-		return get_is_dynamic(::at32(settings_location, type));
+		const cfg_location loc = settings_location[type];
+		return get_is_dynamic(loc);
 	}
 
 	std::string get_setting_name(emu_settings_type type)
 	{
-		const cfg_location& loc = ::at32(settings_location, type);
-		return ::at32(loc, loc.size() - 1);
+		const cfg_location loc = settings_location[type];
+		return loc[loc.size() - 1];
 	}
 }
diff --git a/rpcs3/rpcs3qt/config_adapter.h b/rpcs3/rpcs3qt/config_adapter.h
index 66bf71aa38..f808b58f97 100644
--- a/rpcs3/rpcs3qt/config_adapter.h
+++ b/rpcs3/rpcs3qt/config_adapter.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <QStringList>
+
 #include "emu_settings_type.h"
 #include "util/yaml.hpp"
 
@@ -12,7 +14,7 @@ namespace cfg_adapter
 	YAML::Node get_node(const YAML::Node& node, const cfg_location& location);
 
 	/** Returns possible options for values for some particular setting.*/
-	std::vector<std::string> get_options(const cfg_location& location);
+	QStringList get_options(const cfg_location& location);
 
 	/** Returns dynamic property for some particular setting.*/
 	bool get_is_dynamic(emu_settings_type type);
diff --git a/rpcs3/rpcs3qt/config_checker.cpp b/rpcs3/rpcs3qt/config_checker.cpp
deleted file mode 100644
index accab63662..0000000000
--- a/rpcs3/rpcs3qt/config_checker.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-#include "stdafx.h"
-#include "config_checker.h"
-#include "Emu/system_config.h"
-
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QMessageBox>
-#include <QTextEdit>
-#include <QVBoxLayout>
-#include <QLabel>
-
-LOG_CHANNEL(gui_log, "GUI");
-
-config_checker::config_checker(QWidget* parent, const QString& content, bool is_log) : QDialog(parent)
-{
-	setObjectName("config_checker");
-	setAttribute(Qt::WA_DeleteOnClose);
-
-	QVBoxLayout* layout = new QVBoxLayout();
-	QLabel* label = new QLabel(this);
-	layout->addWidget(label);
-
-	QString result;
-
-	if (check_config(content, result, is_log))
-	{
-		setWindowTitle(tr("Interesting!"));
-
-		if (result.isEmpty())
-		{
-			label->setText(tr("Found config.\nIt seems to match the default config."));
-		}
-		else
-		{
-			label->setText(tr("Found config.\nSome settings seem to deviate from the default config:"));
-
-			QTextEdit* text_box = new QTextEdit();
-			text_box->setReadOnly(true);
-			text_box->setHtml(result);
-			layout->addWidget(text_box);
-
-			resize(400, 600);
-		}
-	}
-	else
-	{
-		setWindowTitle(tr("Ooops!"));
-		label->setText(result);
-	}
-
-	QDialogButtonBox* box = new QDialogButtonBox(QDialogButtonBox::Close);
-	connect(box, &QDialogButtonBox::rejected, this, &QDialog::reject);
-	layout->addWidget(box);
-
-	setLayout(layout);
-}
-
-bool config_checker::check_config(QString content, QString& result, bool is_log)
-{
-	cfg_root config{};
-
-	if (is_log)
-	{
-		const QString start_token = "SYS: Used configuration:\n";
-		const QString end_token = "\n·";
-
-		qsizetype start = content.indexOf(start_token);
-		qsizetype end = -1;
-
-		if (start >= 0)
-		{
-			start += start_token.size();
-			end = content.indexOf(end_token, start);
-		}
-
-		if (end < 0)
-		{
-			result = tr("Cannot find any config!");
-			return false;
-		}
-
-		content = content.mid(start, end - start);
-	}
-
-	if (!config.from_string(content.toStdString()))
-	{
-		gui_log.error("log_viewer: Failed to parse config:\n%s", content);
-		result = tr("Cannot find any config!");
-		return false;
-	}
-
-	std::function<void(const cfg::_base*, std::string&, int)> print_diff_recursive;
-	print_diff_recursive = [&print_diff_recursive](const cfg::_base* base, std::string& diff, int indentation) -> void
-	{
-		if (!base)
-		{
-			return;
-		}
-
-		const auto indent = [](std::string& str, int indentation)
-		{
-			for (int i = 0; i < indentation * 2; i++)
-			{
-				str += "&nbsp;";
-			}
-		};
-
-		switch (base->get_type())
-		{
-		case cfg::type::node:
-		{
-			if (const auto& node = static_cast<const cfg::node*>(base))
-			{
-				std::string diff_tmp;
-
-				for (const auto& n : node->get_nodes())
-				{
-					print_diff_recursive(n, diff_tmp, indentation + 1);
-				}
-
-				if (!diff_tmp.empty())
-				{
-					indent(diff, indentation);
-
-					if (!base->get_name().empty())
-					{
-						fmt::append(diff, "<b>%s:</b><br>", base->get_name());
-					}
-
-					fmt::append(diff, "%s", diff_tmp);
-				}
-			}
-			break;
-		}
-		case cfg::type::_bool:
-		case cfg::type::_enum:
-		case cfg::type::_int:
-		case cfg::type::uint:
-		case cfg::type::string:
-		{
-			const std::string val = base->to_string();
-			const std::string def = base->def_to_string();
-
-			if (val != def)
-			{
-				indent(diff, indentation);
-
-				if (def.empty())
-				{
-					fmt::append(diff, "%s: <span style=\"color:red;\">%s</span><br>", base->get_name(), val);
-				}
-				else
-				{
-					fmt::append(diff, "%s: <span style=\"color:red;\">%s</span> <span style=\"color:gray;\">default:</span> <span style=\"color:green;\">%s</span><br>", base->get_name(), val, def);
-				}
-			}
-			break;
-		}
-		case cfg::type::set:
-		{
-			if (const auto& node = static_cast<const cfg::set_entry*>(base))
-			{
-				const std::vector<std::string> set_entries = node->to_list();
-
-				if (!set_entries.empty())
-				{
-					indent(diff, indentation);
-					fmt::append(diff, "<b>%s:</b><br>", base->get_name());
-
-					for (const std::string& entry : set_entries)
-					{
-						indent(diff, indentation + 1);
-						fmt::append(diff, "- <span style=\"color:red;\">%s</span><br>", entry);
-					}
-				}
-			}
-			break;
-		}
-		case cfg::type::log:
-		{
-			if (const auto& node = static_cast<const cfg::log_entry*>(base))
-			{
-				const auto& log_entries = node->get_map();
-
-				if (!log_entries.empty())
-				{
-					indent(diff, indentation);
-					fmt::append(diff, "<b>%s:</b><br>", base->get_name());
-
-					for (const auto& entry : log_entries)
-					{
-						indent(diff, indentation + 1);
-						fmt::append(diff, "<span style=\"color:red;\">%s: %s</span><br>", entry.first, entry.second);
-					}
-				}
-			}
-			break;
-		}
-		case cfg::type::map:
-		case cfg::type::node_map:
-		case cfg::type::device:
-		{
-			// Ignored
-			break;
-		}
-		}
-	};
-
-	std::string diff;
-	print_diff_recursive(&config, diff, 0);
-	result = QString::fromStdString(diff);
-
-	return true;
-}
diff --git a/rpcs3/rpcs3qt/config_checker.h b/rpcs3/rpcs3qt/config_checker.h
deleted file mode 100644
index 900fb30351..0000000000
--- a/rpcs3/rpcs3qt/config_checker.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <QDialog>
-
-class config_checker : public QDialog
-{
-	Q_OBJECT
-
-public:
-	config_checker(QWidget* parent, const QString& path, bool is_log);
-
-	bool check_config(QString content, QString& result, bool is_log);
-};
diff --git a/rpcs3/rpcs3qt/curl_handle.cpp b/rpcs3/rpcs3qt/curl_handle.cpp
index cb91311d26..55a876e6c0 100644
--- a/rpcs3/rpcs3qt/curl_handle.cpp
+++ b/rpcs3/rpcs3qt/curl_handle.cpp
@@ -1,5 +1,5 @@
-#include "stdafx.h"
 #include "curl_handle.h"
+#include "Emu/system_utils.hpp"
 #include "util/logs.hpp"
 
 #ifdef _WIN32
@@ -8,27 +8,17 @@
 
 LOG_CHANNEL(network_log, "NET");
 
-namespace rpcs3::curl
+curl_handle::curl_handle(QObject* parent) : QObject(parent)
 {
-
-curl_handle::curl_handle()
-{
-	reset_error_buffer();
-
 	m_curl = curl_easy_init();
 
-	CURLcode err = curl_easy_setopt(m_curl, CURLOPT_ERRORBUFFER, m_error_buffer.data());
-	if (err != CURLE_OK) network_log.error("curl_easy_setopt(CURLOPT_ERRORBUFFER): %s", curl_easy_strerror(err));
-
-	m_uses_error_buffer = err == CURLE_OK;
-
-	err = curl_easy_setopt(m_curl, CURLOPT_VERBOSE, g_curl_verbose);
-	if (err != CURLE_OK) network_log.error("curl_easy_setopt(CURLOPT_VERBOSE, %d): %s", g_curl_verbose, curl_easy_strerror(err));
-
 #ifdef _WIN32
-	// Tell curl to use the native CA store for certificate verification
-	err = curl_easy_setopt(m_curl, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NATIVE_CA);
-	if (err != CURLE_OK) network_log.error("curl_easy_setopt(CURLOPT_SSL_OPTIONS): %s", curl_easy_strerror(err));
+	// This shouldn't be needed on linux
+	const std::string path_to_cert = rpcs3::utils::get_exe_dir() + "cacert.pem";
+	const std::string ansi_path = utf8_path_to_ansi_path(path_to_cert);
+
+	const CURLcode err = curl_easy_setopt(m_curl, CURLOPT_CAINFO, ansi_path.data());
+	if (err != CURLE_OK) network_log.error("curl_easy_setopt(CURLOPT_CAINFO, %s) error: %s", ansi_path, curl_easy_strerror(err));
 #endif
 }
 
@@ -41,43 +31,3 @@ CURL* curl_handle::get_curl() const
 {
 	return m_curl;
 }
-
-void curl_handle::reset_error_buffer()
-{
-	ensure(m_error_buffer.size() == CURL_ERROR_SIZE);
-	m_error_buffer[0] = 0;
-}
-
-std::string curl_handle::get_verbose_error(CURLcode code) const
-{
-	if (m_uses_error_buffer)
-	{
-		ensure(m_error_buffer.size() == CURL_ERROR_SIZE);
-		if (m_error_buffer[0])
-		{
-			return fmt::format("Curl error (%d): %s\nDetails: %s", static_cast<int>(code), curl_easy_strerror(code), m_error_buffer.data());
-		}
-	}
-
-	return fmt::format("Curl error (%d): %s", static_cast<int>(code), curl_easy_strerror(code));
-}
-
-}
-
-#ifdef _WIN32
-// Functions exported from our user_settings.h in WolfSSL, implemented in RPCS3
-extern "C"
-{
-
-FILE* wolfSSL_fopen_utf8(const char* name, const char* mode)
-{
-	return _wfopen(utf8_to_wchar(name).c_str(), utf8_to_wchar(mode).c_str());
-}
-
-int wolfSSL_stat_utf8(const char* path, struct _stat* buffer)
-{
-	return _wstat(utf8_to_wchar(path).c_str(), buffer);
-}
-
-}
-#endif
diff --git a/rpcs3/rpcs3qt/curl_handle.h b/rpcs3/rpcs3qt/curl_handle.h
index e0d4db22d3..65abee5978 100644
--- a/rpcs3/rpcs3qt/curl_handle.h
+++ b/rpcs3/rpcs3qt/curl_handle.h
@@ -1,20 +1,19 @@
 #pragma once
 
-#include <array>
+#include <QObject>
 
 #ifndef CURL_STATICLIB
 #define CURL_STATICLIB
 #endif
 #include <curl/curl.h>
 
-namespace rpcs3::curl
+class curl_handle : public QObject
 {
-inline bool g_curl_verbose = false;
+private:
+	CURL* m_curl = nullptr;
 
-class curl_handle
-{
 public:
-	explicit curl_handle();
+	explicit curl_handle(QObject* parent = nullptr);
 	~curl_handle();
 
 	CURL* get_curl() const;
@@ -23,14 +22,4 @@ public:
 	{
 		return get_curl();
 	}
-
-	void reset_error_buffer();
-	std::string get_verbose_error(CURLcode code) const;
-
-private:
-	CURL* m_curl = nullptr;
-	bool m_uses_error_buffer = false;
-	std::array<char, CURL_ERROR_SIZE> m_error_buffer;
 };
-
-}
diff --git a/rpcs3/rpcs3qt/custom_dock_widget.h b/rpcs3/rpcs3qt/custom_dock_widget.h
index d24725d007..2c54f30ce1 100644
--- a/rpcs3/rpcs3qt/custom_dock_widget.h
+++ b/rpcs3/rpcs3qt/custom_dock_widget.h
@@ -55,7 +55,7 @@ protected:
 		if (isFloating())
 		{
 			QStyleOption opt;
-			opt.initFrom(this);
+			opt.init(this);
 			QPainter p(this);
 			style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
 			return;
diff --git a/rpcs3/rpcs3qt/custom_table_widget_item.cpp b/rpcs3/rpcs3qt/custom_table_widget_item.cpp
index aa6d660ee3..83235e395a 100644
--- a/rpcs3/rpcs3qt/custom_table_widget_item.cpp
+++ b/rpcs3/rpcs3qt/custom_table_widget_item.cpp
@@ -28,37 +28,37 @@ bool custom_table_widget_item::operator<(const QTableWidgetItem& other) const
 		return QTableWidgetItem::operator<(other);
 	}
 
-	const QVariant data_l = data(m_sort_role);
-	const QVariant data_r = other.data(m_sort_role);
-	const int type_l = data_l.metaType().id();
-	const int type_r = data_r.metaType().id();
+	const QVariant data_l       = data(m_sort_role);
+	const QVariant data_r       = other.data(m_sort_role);
+	const QVariant::Type type_l = data_l.type();
+	const QVariant::Type type_r = data_r.type();
 
 	ensure(type_l == type_r);
 
 	switch (type_l)
 	{
-	case QMetaType::Type::Bool:
-	case QMetaType::Type::Int:
+	case QVariant::Type::Bool:
+	case QVariant::Type::Int:
 		return data_l.toInt() < data_r.toInt();
-	case QMetaType::Type::UInt:
+	case QVariant::Type::UInt:
 		return data_l.toUInt() < data_r.toUInt();
-	case QMetaType::Type::LongLong:
+	case QVariant::Type::LongLong:
 		return data_l.toLongLong() < data_r.toLongLong();
-	case QMetaType::Type::ULongLong:
+	case QVariant::Type::ULongLong:
 		return data_l.toULongLong() < data_r.toULongLong();
-	case QMetaType::Type::Double:
+	case QVariant::Type::Double:
 		return data_l.toDouble() < data_r.toDouble();
-	case QMetaType::Type::QDate:
+	case QVariant::Type::Date:
 		return data_l.toDate() < data_r.toDate();
-	case QMetaType::Type::QTime:
+	case QVariant::Type::Time:
 		return data_l.toTime() < data_r.toTime();
-	case QMetaType::Type::QDateTime:
+	case QVariant::Type::DateTime:
 		return data_l.toDateTime() < data_r.toDateTime();
-	case QMetaType::Type::Char:
-	case QMetaType::Type::QString:
+	case QVariant::Type::Char:
+	case QVariant::Type::String:
 		return data_l.toString() < data_r.toString();
 	default:
-		fmt::throw_exception("Unimplemented type %s", QMetaType(type_l).name());
+		fmt::throw_exception("Unimplemented type %s", QVariant::typeToName(type_l));
 	}
 }
 
diff --git a/rpcs3/rpcs3qt/debugger_add_bp_window.cpp b/rpcs3/rpcs3qt/debugger_add_bp_window.cpp
deleted file mode 100644
index 64255ecc50..0000000000
--- a/rpcs3/rpcs3qt/debugger_add_bp_window.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-#include "debugger_add_bp_window.h"
-#include "Utilities/StrFmt.h"
-#include "Utilities/StrUtil.h"
-#include "breakpoint_handler.h"
-#include "util/types.hpp"
-
-#include <QVBoxLayout>
-#include <QLineEdit>
-#include <QLabel>
-#include <QComboBox>
-#include <QPushButton>
-#include <QDialogButtonBox>
-#include <QMessageBox>
-
-debugger_add_bp_window::debugger_add_bp_window(breakpoint_list* bp_list, QWidget* parent)
-	: QDialog(parent)
-{
-	ensure(bp_list);
-	
-	setWindowTitle(tr("Add a breakpoint"));
-	setModal(true);
-
-	QVBoxLayout* vbox_panel = new QVBoxLayout();
-
-	QHBoxLayout* hbox_top = new QHBoxLayout();
-	QLabel* l_address = new QLabel(tr("Address"));
-	QLineEdit* t_address = new QLineEdit();
-	t_address->setPlaceholderText(tr("Address here"));
-	t_address->setFocus();
-
-	hbox_top->addWidget(l_address);
-	hbox_top->addWidget(t_address);
-	vbox_panel->addLayout(hbox_top);
-
-	QHBoxLayout* hbox_bot = new QHBoxLayout();
-	QComboBox* co_bptype = new QComboBox(this);
-	QStringList qstr_breakpoint_types;
-
-	qstr_breakpoint_types
-#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS
-		<< tr("Memory Read")
-		<< tr("Memory Write")
-		<< tr("Memory Read&Write")
-#endif
-		<< tr("Execution");
-
-	co_bptype->addItems(qstr_breakpoint_types);
-
-	hbox_bot->addWidget(co_bptype);
-	vbox_panel->addLayout(hbox_bot);
-
-	QHBoxLayout* hbox_buttons = new QHBoxLayout();
-	QDialogButtonBox* button_box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-	button_box->button(QDialogButtonBox::Ok)->setText(tr("Add"));
-
-	hbox_buttons->addWidget(button_box);
-	vbox_panel->addLayout(hbox_buttons);
-
-	setLayout(vbox_panel);
-
-	connect(button_box, &QDialogButtonBox::accepted, this, [=, this]
-		{
-			const std::string str_address = t_address->text().toStdString();
-
-			if (str_address.empty())
-			{
-				QMessageBox::warning(this, tr("Add BP error"), tr("Address is empty!"));
-				return;
-			}
-
-			// We always want hex
-			const std::string parsed_string = (!str_address.starts_with("0x") && !str_address.starts_with("0X")) ? fmt::format("0x%s", str_address) : str_address;
-			u64 parsed_address = 0;
-
-			// We don't accept 0
-			if (!try_to_uint64(&parsed_address, parsed_string, 1, 0xFF'FF'FF'FF))
-			{
-				QMessageBox::warning(this, tr("Add BP error"), tr("Address is invalid!"));
-				return;
-			}
-
-			const u32 address = static_cast<u32>(parsed_address);
-			bs_t<breakpoint_types> bp_t{};
-
-#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS
-			switch (co_bptype->currentIndex())
-			{
-			case 0:
-				bp_t = breakpoint_types::bp_read;
-				break;
-			case 1:
-				bp_t = breakpoint_types::bp_write;
-				break;
-			case 2:
-				bp_t = breakpoint_types::bp_read + breakpoint_types::bp_write;
-				break;
-			case 3:
-				bp_t = breakpoint_types::bp_exec;
-				break;
-			default:
-				break;
-			}
-#else
-			bp_t = breakpoint_types::bp_exec;
-#endif
-
-			if (bp_t)
-				bp_list->AddBreakpoint(address, bp_t);
-
-			QDialog::accept();
-		});
-
-	connect(button_box, &QDialogButtonBox::rejected, this, &QDialog::reject);
-
-	move(QCursor::pos());
-}
diff --git a/rpcs3/rpcs3qt/debugger_add_bp_window.h b/rpcs3/rpcs3qt/debugger_add_bp_window.h
deleted file mode 100644
index c57c6873d8..0000000000
--- a/rpcs3/rpcs3qt/debugger_add_bp_window.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "breakpoint_list.h"
-
-#include <QDialog>
-
-class debugger_add_bp_window : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit debugger_add_bp_window(breakpoint_list* bp_list, QWidget* parent = nullptr);
-};
diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp
index b85aa2859e..a17bd2d3d7 100644
--- a/rpcs3/rpcs3qt/debugger_frame.cpp
+++ b/rpcs3/rpcs3qt/debugger_frame.cpp
@@ -2,7 +2,6 @@
 #include "register_editor_dialog.h"
 #include "instruction_editor_dialog.h"
 #include "memory_viewer_panel.h"
-#include "elf_memory_dumping_dialog.h"
 #include "gui_settings.h"
 #include "debugger_list.h"
 #include "breakpoint_list.h"
@@ -10,13 +9,11 @@
 #include "call_stack_list.h"
 #include "input_dialog.h"
 #include "qt_utils.h"
-#include "hex_validator.h"
 
 #include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/RSX/RSXThread.h"
 #include "Emu/RSX/RSXDisAsm.h"
-#include "Emu/Cell/PPUAnalyser.h"
 #include "Emu/Cell/PPUDisAsm.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/SPUDisAsm.h"
@@ -26,41 +23,41 @@
 
 #include <QKeyEvent>
 #include <QScrollBar>
+#include <QApplication>
 #include <QFontDatabase>
 #include <QCompleter>
 #include <QVBoxLayout>
 #include <QTimer>
 #include <QCheckBox>
-#include <QMessageBox>
-#include <QMenu>
-#include <QTextDocumentFragment>
-#include <algorithm>
-#include <functional>
+#include <charconv>
 
-#include "rpcs3qt/debugger_add_bp_window.h"
 #include "util/asm.hpp"
 
+constexpr auto qstr = QString::fromStdString;
+
 constexpr auto s_pause_flags = cpu_flag::dbg_pause + cpu_flag::dbg_global_pause;
 
 extern atomic_t<bool> g_debugger_pause_all_threads_on_bp;
 
-extern const ppu_decoder<ppu_itype> g_ppu_itype;
-#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS
-breakpoint_handler g_breakpoint_handler = breakpoint_handler();
-#endif
-
-extern bool is_using_interpreter(thread_class t_class);
-
-extern std::shared_ptr<CPUDisAsm> make_disasm(const cpu_thread* cpu, shared_ptr<cpu_thread> handle);
+extern bool is_using_interpreter(u32 id_type)
+{
+	switch (id_type)
+	{
+	case 1: return g_cfg.core.ppu_decoder != ppu_decoder_type::llvm;
+	case 2: return g_cfg.core.spu_decoder == spu_decoder_type::fast || g_cfg.core.spu_decoder == spu_decoder_type::precise;
+	default: return true; 
+	}
+}
 
 debugger_frame::debugger_frame(std::shared_ptr<gui_settings> gui_settings, QWidget *parent)
-	: custom_dock_widget(tr("Debugger [Press F1 for Help]"), parent)
+	: custom_dock_widget(tr("Debugger"), parent)
 	, m_gui_settings(std::move(gui_settings))
 {
 	setContentsMargins(0, 0, 0, 0);
 
 	m_update = new QTimer(this);
 	connect(m_update, &QTimer::timeout, this, &debugger_frame::UpdateUI);
+	EnableUpdateTimer(true);
 
 	m_mono = QFontDatabase::systemFont(QFontDatabase::FixedFont);
 	m_mono.setPointSize(9);
@@ -71,15 +68,10 @@ debugger_frame::debugger_frame(std::shared_ptr<gui_settings> gui_settings, QWidg
 	QHBoxLayout* hbox_b_main = new QHBoxLayout();
 	hbox_b_main->setContentsMargins(0, 0, 0, 0);
 
-#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS
-	m_ppu_breakpoint_handler = &g_breakpoint_handler;
-#else
-	m_ppu_breakpoint_handler = new breakpoint_handler();
-#endif
+	m_breakpoint_handler = new breakpoint_handler();
+	m_breakpoint_list = new breakpoint_list(this, m_breakpoint_handler);
 
-	m_breakpoint_list = new breakpoint_list(this, m_ppu_breakpoint_handler);
-
-	m_debugger_list = new debugger_list(this, m_gui_settings, m_ppu_breakpoint_handler);
+	m_debugger_list = new debugger_list(this, m_gui_settings, m_breakpoint_handler);
 	m_debugger_list->installEventFilter(this);
 
 	m_call_stack_list = new call_stack_list(this);
@@ -94,13 +86,11 @@ debugger_frame::debugger_frame(std::shared_ptr<gui_settings> gui_settings, QWidg
 	m_choice_units->completer()->setCompletionMode(QCompleter::PopupCompletion);
 	m_choice_units->completer()->setMaxVisibleItems(30);
 	m_choice_units->completer()->setFilterMode(Qt::MatchContains);
-	m_choice_units->installEventFilter(this);
 
 	m_go_to_addr = new QPushButton(tr("Go To Address"), this);
 	m_go_to_pc = new QPushButton(tr("Go To PC"), this);
 	m_btn_step = new QPushButton(tr("Step"), this);
 	m_btn_step_over = new QPushButton(tr("Step Over"), this);
-	m_btn_add_bp = new QPushButton(tr("Add BP"), this);
 	m_btn_run = new QPushButton(RunString, this);
 
 	EnableButtons(false);
@@ -111,22 +101,20 @@ debugger_frame::debugger_frame(std::shared_ptr<gui_settings> gui_settings, QWidg
 	hbox_b_main->addWidget(m_go_to_pc);
 	hbox_b_main->addWidget(m_btn_step);
 	hbox_b_main->addWidget(m_btn_step_over);
-	hbox_b_main->addWidget(m_btn_add_bp);
 	hbox_b_main->addWidget(m_btn_run);
 	hbox_b_main->addWidget(m_choice_units);
 	hbox_b_main->addStretch();
 
 	// Misc state
-	m_misc_state = new QPlainTextEdit(this);
-	m_misc_state->setLineWrapMode(QPlainTextEdit::NoWrap);
+	m_misc_state = new QTextEdit(this);
+	m_misc_state->setLineWrapMode(QTextEdit::NoWrap);
 	m_misc_state->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
 
 	// Registers
-	m_regs = new QPlainTextEdit(this);
-	m_regs->setLineWrapMode(QPlainTextEdit::NoWrap);
+	m_regs = new QTextEdit(this);
+	m_regs->setLineWrapMode(QTextEdit::NoWrap);
 	m_regs->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
-	m_regs->setContextMenuPolicy(Qt::CustomContextMenu);
-	
+
 	m_debugger_list->setFont(m_mono);
 	m_misc_state->setFont(m_mono);
 	m_regs->setFont(m_mono);
@@ -159,28 +147,52 @@ debugger_frame::debugger_frame(std::shared_ptr<gui_settings> gui_settings, QWidg
 	body->setLayout(vbox_p_main);
 	setWidget(body);
 
-	connect(m_regs, &QPlainTextEdit::customContextMenuRequested, this, &debugger_frame::OnRegsContextMenu);
-
 	connect(m_go_to_addr, &QAbstractButton::clicked, this, &debugger_frame::ShowGotoAddressDialog);
-	connect(m_go_to_pc, &QAbstractButton::clicked, this, [this]() { ShowPC(true); });
+	connect(m_go_to_pc, &QAbstractButton::clicked, this, &debugger_frame::ShowPC);
 
 	connect(m_btn_step, &QAbstractButton::clicked, this, &debugger_frame::DoStep);
 	connect(m_btn_step_over, &QAbstractButton::clicked, [this]() { DoStep(true); });
 
-	connect(m_btn_add_bp, &QAbstractButton::clicked, this, [this]
+	connect(m_btn_run, &QAbstractButton::clicked, [this]()
+	{
+		if (const auto cpu = get_cpu())
 		{
-			debugger_add_bp_window dlg(m_breakpoint_list, this);
-			dlg.exec();
-		});
+			// If paused, unpause.
+			// If not paused, add dbg_pause.
+			const auto old = cpu->state.fetch_op([](bs_t<cpu_flag>& state)
+			{
+				if (state & s_pause_flags)
+				{
+					state -= s_pause_flags;
+				}
+				else
+				{
+					state += cpu_flag::dbg_pause;
+				}
+			});
 
-	connect(m_btn_run, &QAbstractButton::clicked, this, &debugger_frame::RunBtnPress);
+			// Notify only if no pause flags are set after this change
+			if (old & s_pause_flags)
+			{
+				if (g_debugger_pause_all_threads_on_bp && Emu.IsPaused() && (old & s_pause_flags) == s_pause_flags)
+				{
+					// Resume all threads were paused by this breakpoint
+					Emu.Resume();
+				}
+
+				cpu->state.notify_one(s_pause_flags);
+			}
+		}
+		UpdateUI();
+	});
 
 	connect(m_choice_units->lineEdit(), &QLineEdit::editingFinished, [&]
 	{
 		m_choice_units->clearFocus();
 	});
 
-	connect(m_choice_units, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [&](){ m_is_spu_disasm_mode = false; OnSelectUnit(); });
+	connect(m_choice_units, QOverload<int>::of(&QComboBox::activated), this, &debugger_frame::UpdateUI);
+	connect(m_choice_units, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &debugger_frame::OnSelectUnit);
 	connect(this, &QDockWidget::visibilityChanged, this, &debugger_frame::EnableUpdateTimer);
 
 	connect(m_debugger_list, &debugger_list::BreakpointRequested, m_breakpoint_list, &breakpoint_list::HandleBreakpointRequest);
@@ -189,10 +201,8 @@ debugger_frame::debugger_frame(std::shared_ptr<gui_settings> gui_settings, QWidg
 	connect(this, &debugger_frame::CallStackUpdateRequested, m_call_stack_list, &call_stack_list::HandleUpdate);
 	connect(m_call_stack_list, &call_stack_list::RequestShowAddress, m_debugger_list, &debugger_list::ShowAddress);
 
-	m_debugger_list->RefreshView();
-
-	m_choice_units->clear();
-	m_choice_units->addItem(NoThreadString);
+	m_debugger_list->ShowAddress(m_debugger_list->m_pc, false);
+	UpdateUnitList();
 }
 
 void debugger_frame::SaveSettings() const
@@ -204,12 +214,10 @@ void debugger_frame::ChangeColors() const
 {
 	if (m_debugger_list)
 	{
-		const QColor color = gui::utils::get_foreground_color();
-
-		m_debugger_list->m_color_bp = m_breakpoint_list->m_color_bp = gui::utils::get_label_color("debugger_frame_breakpoint", Qt::yellow, Qt::darkYellow, QPalette::Window);
-		m_debugger_list->m_color_pc = gui::utils::get_label_color("debugger_frame_pc", Qt::green, Qt::darkGreen, QPalette::Window);
-		m_debugger_list->m_text_color_bp = m_breakpoint_list->m_text_color_bp = gui::utils::get_label_color("debugger_frame_breakpoint", color, color);
-		m_debugger_list->m_text_color_pc = gui::utils::get_label_color("debugger_frame_pc", color, color);
+		m_debugger_list->m_color_bp = m_breakpoint_list->m_color_bp = gui::utils::get_label_color("debugger_frame_breakpoint", QPalette::Window);
+		m_debugger_list->m_color_pc = gui::utils::get_label_color("debugger_frame_pc", QPalette::Window);
+		m_debugger_list->m_text_color_bp = m_breakpoint_list->m_text_color_bp = gui::utils::get_label_color("debugger_frame_breakpoint");
+		m_debugger_list->m_text_color_pc = gui::utils::get_label_color("debugger_frame_pc");
 	}
 }
 
@@ -219,31 +227,17 @@ bool debugger_frame::eventFilter(QObject* object, QEvent* event)
 	if (object == m_debugger_list && event->type() == QEvent::KeyPress)
 	{
 		keyPressEvent(static_cast<QKeyEvent*>(event));
-		event->accept(); // Restore accepted state
-		return false;
 	}
-
-	if (object == m_choice_units && event->type() == QEvent::FocusOut)
-	{
-		if (int index = m_choice_units->currentIndex(); index >= 0)
-		{
-			// Restore item text automatically on focus-out after search
-			m_choice_units->setCurrentText(m_choice_units->itemText(index));
-		}
-	}
-
 	return false;
 }
 
-void debugger_frame::closeEvent(QCloseEvent* event)
+void debugger_frame::closeEvent(QCloseEvent *event)
 {
-	SaveSettings();
-
 	QDockWidget::closeEvent(event);
 	Q_EMIT DebugFrameClosed();
 }
 
-void debugger_frame::showEvent(QShowEvent* event)
+void debugger_frame::showEvent(QShowEvent * event)
 {
 	// resize splitter widgets
 	if (!m_splitter->restoreState(m_gui_settings->GetValue(gui::d_splitterState).toByteArray()))
@@ -256,7 +250,7 @@ void debugger_frame::showEvent(QShowEvent* event)
 	QDockWidget::showEvent(event);
 }
 
-void debugger_frame::hideEvent(QHideEvent* event)
+void debugger_frame::hideEvent(QHideEvent * event)
 {
 	// save splitter state or it will resume its initial state on next show
 	m_gui_settings->SetValue(gui::d_splitterState, m_splitter->saveState());
@@ -285,14 +279,13 @@ void debugger_frame::open_breakpoints_settings()
 	hbox_layout->addWidget(button_ok);
 	dlg->setLayout(hbox_layout);
 	dlg->setAttribute(Qt::WA_DeleteOnClose);
-	dlg->open();
+	dlg->exec();
 }
 
 void debugger_frame::keyPressEvent(QKeyEvent* event)
 {
 	if (!isActiveWindow())
 	{
-		event->ignore();
 		return;
 	}
 
@@ -304,10 +297,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 	case Qt::Key_F1:
 	{
 		if (event->isAutoRepeat())
-		{
-			event->ignore();
 			return;
-		}
 
 		QDialog* dlg = new QDialog(this);
 		dlg->setAttribute(Qt::WA_DeleteOnClose);
@@ -316,12 +306,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 		QLabel* l = new QLabel(tr(
 			"Keys Ctrl+G: Go to typed address."
 			"\nKeys Ctrl+B: Open breakpoints settings."
-			"\nKeys Ctrl+C: Copy instruction contents."
-			"\nKeys Ctrl+F: Find thread."
-			"\nKeys Alt+S: Capture SPU images of selected SPU or generalized form when used from PPU."
-			"\nKeys Alt+S: Launch a memory viewer pointed to the current RSX semaphores location when used from RSX."
-			"\nKeys Alt+R: Load last saved SPU state capture."
-			"\nKeys Alt+F5: Show the SPU disassmebler dialog."
+			"\nKeys Alt+S: Capture SPU images of selected SPU."
 			"\nKey D: SPU MFC commands logger, MFC debug setting must be enabled."
 			"\nKey D: Also PPU calling history logger, interpreter and non-zero call history size must be used."
 			"\nKey E: Instruction Editor: click on the instruction you want to modify, then press E."
@@ -346,66 +331,26 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 		dlg->setLayout(layout);
 		dlg->setFixedSize(dlg->sizeHint());
 		dlg->move(QCursor::pos());
-		dlg->open();
+		dlg->exec();
 		return;
 	}
 	default: break;
 	}
 
-	if (event->modifiers() == Qt::ControlModifier)
-	{
-		switch (const auto key = event->key())
-		{
-		case Qt::Key_PageUp:
-		case Qt::Key_PageDown:
-		{
-			if (event->isAutoRepeat())
-			{
-				event->ignore();
-				break;
-			}
-
-			const int count = m_choice_units->count();
-			const int cur_index = m_choice_units->currentIndex();
-
-			if (count && cur_index >= 0)
-			{
-				// Wrap around
-				// Adding count so the result would not be negative, that would alter the remainder operation
-				m_choice_units->setCurrentIndex((cur_index + count + (key == Qt::Key_PageUp ? -1 : 1)) % count);
-			}
-
-			return;
-		}
-		case Qt::Key_F:
-		{
-			m_choice_units->clearEditText();
-			m_choice_units->setFocus();
-			return;
-		}
-		default: break;
-		}
-	}
-
 	if (!cpu)
 	{
-		event->ignore();
 		return;
 	}
 
-	const u32 address_limits = (cpu->get_class() == thread_class::spu ? 0x3fffc : ~3);
-	const u32 pc = (m_debugger_list->m_pc & address_limits);
-	const u32 selected = (m_debugger_list->m_showing_selected_instruction ? m_debugger_list->m_selected_instruction : cpu->get_pc()) & address_limits;
+	const u32 address_limits = (cpu->id_type() == 2 ? 0x3fffc : ~3);
+	const u32 pc = (row >= 0 ? m_debugger_list->m_pc + row * 4 : cpu->get_pc()) & address_limits;
 
-	const auto modifiers = event->modifiers();
+	const auto modifiers = QApplication::keyboardModifiers();
 
-	if (modifiers == Qt::ControlModifier)
+	if (modifiers & Qt::ControlModifier)
 	{
 		if (event->isAutoRepeat())
-		{
-			event->ignore();
 			return;
-		}
 
 		switch (event->key())
 		{
@@ -429,9 +374,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 		case Qt::Key_D:
 		{
 			if (event->isAutoRepeat())
-			{
-				break;
-			}
+				return;
 
 			auto get_max_allowed = [&](QString title, QString description, u32 limit) -> u32
 			{
@@ -442,7 +385,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 				dlg.set_input_font(mono, false);
 				dlg.set_clear_button_enabled(false);
 				dlg.set_button_enabled(QDialogButtonBox::StandardButton::Ok, false);
-				dlg.set_validator(new QRegularExpressionValidator(QRegularExpression("^[1-9][0-9]*$"), &dlg));
+				dlg.set_validator(new QRegExpValidator(QRegExp("^[1-9][0-9]*$")));
 
 				u32 max = 0;
 
@@ -469,8 +412,6 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 
 			auto copy_overlapping_list = [&] <typename T> (u64& index, u64 max, const std::vector<T>& in, std::vector<T>& out, bool& emptied)
 			{
-				max = std::min<u64>(max, in.size());
-
 				const u64 current_pos = index % in.size();
 				const u64 last_elements = std::min<u64>(current_pos, max);
 				const u64 overlapped_old_elements = std::min<u64>(index, max) - last_elements;
@@ -489,7 +430,8 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 				}
 			};
 
-			if (cpu->get_class() == thread_class::spu && g_cfg.core.mfc_debug)
+
+			if (cpu->id_type() == 2 && g_cfg.core.mfc_debug)
 			{
 				const u32 max = get_max_allowed(tr("Max MFC cmds logged"), tr("Decimal only, max allowed is %0."), spu_thread::max_mfc_dump_idx);
 
@@ -512,7 +454,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 					auto& dump = *it;
 
 					const u32 pc = std::exchange(dump.cmd.eah, 0);
-					fmt::append(ret, "\n(%d) PC 0x%05x: [%s] (%s)", i, pc, dump.cmd, spu_block_hash{dump.block_hash});
+					fmt::append(ret, "\n(%d) PC 0x%05x: [%s]", i, pc, dump.cmd);
 
 					if (dump.cmd.cmd == MFC_PUTLLC_CMD)
 					{
@@ -545,22 +487,19 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 
 				spu_log.success("SPU MFC dump of '%s': %s", cpu->get_name(), ret);
 			}
-			else if (cpu->get_class() == thread_class::ppu && g_cfg.core.ppu_call_history)
+			else if (cpu->id_type() == 1 && g_cfg.core.ppu_call_history)
 			{
 				const u32 max = get_max_allowed(tr("Max PPU calls logged"), tr("Decimal only, max allowed is %0."), ppu_thread::call_history_max_size);
 
 				// Preallocate in order to save execution time when inside suspend_all.
 				std::vector<u32> copy(max);
-				std::vector<typename ppu_thread::syscall_history_t::entry_t> sys_copy(ppu_thread::syscall_history_max_size);
 
-				std::array<bool, 2> emptied{};
+				bool emptied = false;
 
 				cpu_thread::suspend_all(nullptr, {}, [&]
 				{
 					auto& list = static_cast<ppu_thread*>(cpu)->call_history;
-					auto& sys_list = static_cast<ppu_thread*>(cpu)->syscall_history;
-					copy_overlapping_list(list.index, max, list.data, copy, emptied[0]);
-					copy_overlapping_list(sys_list.index, max, sys_list.data, sys_copy, emptied[1]);
+					copy_overlapping_list(list.index, max, list.data, copy, emptied);
 				});
 
 				std::string ret;
@@ -573,28 +512,17 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 					dis_asm.disasm(*it);
 					fmt::append(ret, "\n(%u) 0x%08x: %s", i, *it, dis_asm.last_opcode);
 				}
-
-				i = 0;
-				for (auto it = sys_copy.rbegin(); it != sys_copy.rend(); it++, i++)
-				{
-					fmt::append(ret, "\n(%u) 0x%08x: %s, 0x%x, r3=0x%x, r4=0x%x, r5=0x%x, r6=0x%x", i, it->cia, it->func_name, it->error, it->args[0], it->args[1], it->args[2], it->args[3]);
-				}
-
+	
 				if (ret.empty())
 				{
 					ret = "No PPU calls have been logged";
 				}
 
-				if (emptied[0])
+				if (emptied)
 				{
 					ret += "\nPrevious call history has been emptied!";
 				}
 
-				if (emptied[1])
-				{
-					ret += "\nPrevious HLE call history has been emptied!";
-				}
-
 				ppu_log.success("PPU calling history dump of '%s': %s", cpu->get_name(), ret);
 			}
 
@@ -603,65 +531,37 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 		case Qt::Key_E:
 		{
 			if (event->isAutoRepeat())
-			{
-				break;
-			}
+				return;
 
-			if (cpu->get_class() == thread_class::ppu || cpu->get_class() == thread_class::spu)
+			if (cpu->id_type() == 1 || cpu->id_type() == 2)
 			{
 				if (!m_inst_editor)
 				{
-					m_inst_editor = new instruction_editor_dialog(this, selected, m_disasm.get(), make_check_cpu(cpu));
+					m_inst_editor = new instruction_editor_dialog(this, pc, m_disasm.get(), make_check_cpu(cpu));
 					connect(m_inst_editor, &QDialog::finished, this, [this]() { m_inst_editor = nullptr; });
 					m_inst_editor->show();
 				}
 			}
-
 			return;
 		}
 		case Qt::Key_F:
 		{
 			if (event->isAutoRepeat())
-			{
-				break;
-			}
-
-			if (cpu->get_class() == thread_class::ppu)
-			{
-				static_cast<ppu_thread*>(cpu)->debugger_mode.atomic_op([](ppu_debugger_mode& mode)
-				{
-					mode = static_cast<ppu_debugger_mode>((static_cast<u32>(mode) + 1) % static_cast<u32>(ppu_debugger_mode::max_mode));
-				});
-
 				return;
-			}
-			if (cpu->get_class() == thread_class::spu)
-			{
-				static_cast<spu_thread*>(cpu)->debugger_mode.atomic_op([](spu_debugger_mode& mode)
-				{
-					mode = static_cast<spu_debugger_mode>((static_cast<u32>(mode) + 1) % static_cast<u32>(spu_debugger_mode::max_mode));
-				});
 
+			if (cpu->id_type() != 2)
 				return;
-			}
 
-			break;
+			static_cast<spu_thread*>(cpu)->debugger_float_mode ^= 1; // Switch mode
+			return;
 		}
 		case Qt::Key_R:
 		{
 			if (event->isAutoRepeat())
-			{
-				break;
-			}
+				return;
 
-			if (cpu->get_class() == thread_class::ppu || cpu->get_class() == thread_class::spu)
+			if (cpu->id_type() == 1 || cpu->id_type() == 2)
 			{
-				if (cpu->get_class() == thread_class::spu && modifiers & Qt::AltModifier)
-				{
-					static_cast<spu_thread*>(cpu)->try_load_debug_capture();
-					return;
-				}
-
 				if (!m_reg_editor)
 				{
 					m_reg_editor = new register_editor_dialog(this, m_disasm.get(), make_check_cpu(cpu));
@@ -669,51 +569,23 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 					m_reg_editor->show();
 				}
 			}
-
 			return;
 		}
 		case Qt::Key_S:
 		{
 			if (event->isAutoRepeat())
-			{
-				break;
-			}
+				return;
 
 			if (modifiers & Qt::AltModifier)
 			{
-				if (cpu->get_class() == thread_class::rsx)
-				{
-					if (u32 addr = static_cast<rsx::thread*>(cpu)->label_addr)
-					{
-						// Memory viewer pointing to RSX semaphores
-						idm::make<memory_viewer_handle>(this, m_disasm, addr, make_check_cpu(nullptr));
-					}
-
-					return;
-				}
-
-				if (cpu->get_class() == thread_class::ppu)
-				{
-					new elf_memory_dumping_dialog(pc, m_gui_settings, this);
-					return;
-				}
-
-				if (cpu->get_class() != thread_class::spu)
+				if (cpu->id_type() != 2)
 				{
 					return;
 				}
 
-				if (!cpu->state.all_of(cpu_flag::wait + cpu_flag::dbg_pause))
-				{
-					QMessageBox::warning(this, QObject::tr("Pause the SPU Thread!"), QObject::tr("Cannot perform SPU capture due to the thread needing manual pausing!"));
-					return;
-				}
-
-				static_cast<spu_thread*>(cpu)->capture_state();
-				return;
+				static_cast<spu_thread*>(cpu)->capture_local_storage();
 			}
-
-			break;
+			return;
 		}
 		case Qt::Key_N:
 		{
@@ -722,47 +594,37 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 			// Indirect branches (unknown targets, such as function return) do not proceed to any instruction
 			std::array<u32, 2> res{umax, umax};
 
-			const u32 selected = (m_debugger_list->m_showing_selected_instruction ? m_debugger_list->m_selected_instruction : cpu->get_pc()) & address_limits;
-
-			switch (cpu->get_class())
+			switch (cpu->id_type())
 			{
-			case thread_class::spu:
+			case 2:
 			{
-				res = op_branch_targets(selected, spu_opcode_t{static_cast<spu_thread*>(cpu)->_ref<u32>(selected)});
+				res = op_branch_targets(pc, spu_opcode_t{static_cast<spu_thread*>(cpu)->_ref<u32>(pc)});
 				break;
 			}
-			case thread_class::ppu:
+			case 1:
 			{
 				be_t<ppu_opcode_t> op{};
 
-				if (vm::check_addr(selected, vm::page_executable) && vm::try_access(selected, &op, 4, false))
-					res = op_branch_targets(selected, op);
+				if (vm::check_addr(pc, vm::page_executable) && vm::try_access(pc, &op, 4, false))
+					res = op_branch_targets(pc, op);
 
 				break;
 			}
 			default: break;
 			}
 
-			if (auto it = std::find_if(res.rbegin(), res.rend(), FN(x != umax)); it != res.rend())
-				m_debugger_list->ShowAddress(*it - std::max(row, 0) * 4, true);
+			if (const usz pos = std::basic_string_view<u32>(res.data(), 2).find_last_not_of(umax); pos != umax)
+				m_debugger_list->ShowAddress(res[pos] - std::max(row, 0) * 4, true, true);
 
 			return;
 		}
 		case Qt::Key_M:
 		{
 			if (event->isAutoRepeat())
-			{
-				break;
-			}
-
-			if (m_disasm && cpu->get_class() == thread_class::spu)
-			{
-				// Save shared pointer to shared memory handle, ensure the destructor will not be called until the SPUDisAsm is destroyed
-				static_cast<SPUDisAsm*>(m_disasm.get())->set_shm(static_cast<const spu_thread*>(cpu)->shm);
-			}
+				return;
 
 			// Memory viewer
-			idm::make<memory_viewer_handle>(this, m_disasm, pc, make_check_cpu(cpu));
+			idm::make<memory_viewer_handle>(this, pc, make_check_cpu(cpu));
 			return;
 		}
 		case Qt::Key_F10:
@@ -775,126 +637,66 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
 			DoStep(false);
 			return;
 		}
-		case Qt::Key_F5:
-		{
-			if (modifiers & Qt::AltModifier)
-			{
-				OnSelectSPUDisassembler();
-				return;
-			}
-
-			break;
-		}
 		default: break;
 		}
 	}
-
-	event->ignore();
 }
 
 cpu_thread* debugger_frame::get_cpu()
 {
-	if (m_emu_state == system_state::stopped)
-	{
-		m_rsx = nullptr;
-		m_cpu.reset();
-		return nullptr;
-	}
-
 	// Wait flag is raised by the thread itself, acknowledging exit
 	if (m_cpu)
 	{
-		if (m_cpu->state.all_of(cpu_flag::wait + cpu_flag::exit))
+		if (+m_cpu->state + cpu_flag::wait + cpu_flag::exit != +m_cpu->state)
 		{
-			m_cpu.reset();
-			return nullptr;
+			return m_cpu.get();
 		}
-
-		return m_cpu.get();
 	}
 
 	// m_rsx is raw pointer, when emulation is stopped it won't be cleared
 	// Therefore need to do invalidation checks manually
 
-	if (m_rsx)
+	if (m_emu_state == system_state::stopped)
 	{
-		if (g_fxo->try_get<rsx::thread>() != m_rsx || !m_rsx->ctrl || m_rsx->state.all_of(cpu_flag::wait + cpu_flag::exit))
-		{
-			m_rsx = nullptr;
-			return nullptr;
-		}
+		m_rsx = nullptr;
+		return m_rsx;
+	}
+
+	if (!g_fxo->is_init<rsx::thread>())
+	{
+		m_rsx = nullptr;
+		return m_rsx;
+	}
+
+	if (m_rsx && !m_rsx->ctrl)
+	{
+		m_rsx = nullptr;
+		return m_rsx;
 	}
 
 	return m_rsx;
 }
 
-std::function<cpu_thread*()> debugger_frame::make_check_cpu(cpu_thread* cpu, bool unlocked)
+std::function<cpu_thread*()> debugger_frame::make_check_cpu(cpu_thread* cpu)
 {
-	constexpr cpu_thread* null_cpu = nullptr;
+	const u32 id = cpu ? cpu->id : umax;
+	const u32 type = id >> 24;
 
-	if (Emu.IsStopped())
+	std::shared_ptr<cpu_thread> shared = type == 1 ? static_cast<std::shared_ptr<cpu_thread>>(idm::get<named_thread<ppu_thread>>(id)) :
+		type == 2 ? idm::get<named_thread<spu_thread>>(id) : nullptr;
+
+	if (shared.get() != cpu)
 	{
-		return []() { return null_cpu; };
+		shared.reset();
 	}
 
-	const auto type = cpu ? cpu->get_class() : thread_class::general;
-
-	shared_ptr<cpu_thread> shared;
-
-	if (g_fxo->is_init<id_manager::id_map<named_thread<ppu_thread>>>() && g_fxo->is_init<id_manager::id_map<named_thread<spu_thread>>>())
+	return [&rsx = m_rsx, cpu, type, shared = std::move(shared)]() -> cpu_thread*
 	{
-		if (unlocked)
-		{
-			if (type == thread_class::ppu)
-			{
-				shared = idm::get_unlocked<named_thread<ppu_thread>>(cpu->id);
-			}
-			else if (type == thread_class::spu)
-			{
-				shared = idm::get_unlocked<named_thread<spu_thread>>(cpu->id);
-			}
-		}
-		else
-		{
-			if (type == thread_class::ppu)
-			{
-				shared = idm::get_unlocked<named_thread<ppu_thread>>(cpu->id);
-			}
-			else if (type == thread_class::spu)
-			{
-				shared = idm::get_unlocked<named_thread<spu_thread>>(cpu->id);
-			}
-		}
-	}
-
-	if (type == thread_class::rsx)
-	{
-		if (g_fxo->try_get<rsx::thread>() != cpu)
-		{
-			return []() { return null_cpu; };
-		}
-	}
-	else if (!shared || shared.get() != cpu)
-	{
-		return []() { return null_cpu; };
-	}
-
-	return [cpu, type, shared = std::move(shared), emulation_id = Emu.GetEmulationIdentifier()]() mutable -> cpu_thread*
-	{
-		if (emulation_id != Emu.GetEmulationIdentifier() || Emu.IsStopped())
-		{
-			// Invalidate all data after Emu.Kill()
-			shared.reset();
-			cpu = nullptr;
-			return nullptr;
-		}
-
-		if (type == thread_class::ppu || type == thread_class::spu)
+		if (type == 1 || type == 2)
 		{
 			// SPU and PPU
-			if (!shared || shared->state.all_of(cpu_flag::exit + cpu_flag::wait))
+			if (!shared || (shared->state & cpu_flag::exit && shared->state & cpu_flag::wait))
 			{
-				shared.reset();
 				return nullptr;
 			}
 
@@ -902,59 +704,35 @@ std::function<cpu_thread*()> debugger_frame::make_check_cpu(cpu_thread* cpu, boo
 		}
 
 		// RSX
-		const auto rsx = g_fxo->try_get<rsx::thread>();
-
-		if (cpu)
+		if (rsx == cpu)
 		{
-			if (rsx != cpu || !rsx->ctrl || rsx->state.all_of(cpu_flag::wait + cpu_flag::exit))
-			{
-				cpu = nullptr;
-				return nullptr;
-			}
+			return cpu;
 		}
 
-		return cpu;
+		return nullptr;
 	};
 }
 
 void debugger_frame::UpdateUI()
 {
+	UpdateUnitList();
+
 	const auto cpu = get_cpu();
 
-	// Refresh at a high rate during initialization (looks weird otherwise)
-	if (m_ui_update_ctr % (cpu || m_ui_update_ctr < 200 || m_debugger_list->m_dirty_flag ? 5 : 50) == 0)
-	{
-		// If no change to instruction position happened, update instruction list at 20hz
-		ShowPC();
-	}
-
-	if (m_ui_update_ctr % 20 == 0 && !m_thread_list_pending_update)
-	{
-		// Update threads list at 5hz (low priority)
-		UpdateUnitList();
-	}
-
 	if (!cpu)
 	{
 		if (m_last_pc != umax || !m_last_query_state.empty())
 		{
-			if (m_ui_update_ctr % 20 && !m_thread_list_pending_update)
-			{
-				// Update threads list (thread exited)
-				UpdateUnitList();
-			}
-
-			ShowPC();
 			m_last_query_state.clear();
 			m_last_pc = -1;
 			DoUpdate();
 		}
 	}
-	else if (m_ui_update_ctr % 5 == 0 || m_ui_update_ctr < m_ui_fast_update_permission_deadline)
+	else
 	{
 		const auto cia = cpu->get_pc();
-		const auto size_context = cpu->get_class() == thread_class::ppu ? sizeof(ppu_thread) :
-			cpu->get_class() == thread_class::spu ? sizeof(spu_thread) : sizeof(cpu_thread);
+		const auto size_context = cpu->id_type() == 1 ? sizeof(ppu_thread) :
+			cpu->id_type() == 2 ? sizeof(spu_thread) : sizeof(cpu_thread);
 
 		if (m_last_pc != cia || m_last_query_state.size() != size_context || std::memcmp(m_last_query_state.data(), static_cast<void *>(cpu), size_context))
 		{
@@ -976,126 +754,83 @@ void debugger_frame::UpdateUI()
 				m_btn_run->setText(PauseString);
 			}
 
-			if (m_ui_update_ctr % 5)
-			{
-				// Call if it hasn't been called before
-				ShowPC();
-			}
-
-			if (is_using_interpreter(cpu->get_class()))
+			if (is_using_interpreter(cpu->id_type()))
 			{
 				m_btn_step->setEnabled(paused);
 				m_btn_step_over->setEnabled(paused);
 			}
 		}
 	}
-
-	m_ui_update_ctr++;
 }
 
+using data_type = std::pair<cpu_thread*, u32>;
+
+Q_DECLARE_METATYPE(data_type);
+
 void debugger_frame::UpdateUnitList()
 {
-	const u64 emulation_id = static_cast<std::underlying_type_t<Emulator::stop_counter_t>>(Emu.GetEmulationIdentifier());
 	const u64 threads_created = cpu_thread::g_threads_created;
 	const u64 threads_deleted = cpu_thread::g_threads_deleted;
 	const system_state emu_state = Emu.GetStatus();
 
-	std::unique_lock<shared_mutex> lock{id_manager::g_mutex, std::defer_lock};
-
-	if (emulation_id == m_emulation_id && threads_created == m_threads_created && threads_deleted == m_threads_deleted && emu_state == m_emu_state)
+	if (threads_created != m_threads_created || threads_deleted != m_threads_deleted || emu_state != m_emu_state)
+	{
+		m_threads_created = threads_created;
+		m_threads_deleted = threads_deleted;
+		m_emu_state = emu_state;
+	}
+	else
 	{
 		// Nothing to do
-		m_thread_list_pending_update = false;
 		return;
 	}
 
-	const cpu_thread* old_cpu_ptr = get_cpu();
+	//const int old_size = m_choice_units->count();
+	QVariant old_cpu = m_choice_units->currentData();
 
-	if (!lock.try_lock())
-	{
-		m_thread_list_pending_update = true;
-		QTimer::singleShot(5, [this]() { UpdateUnitList(); });
-		return;
-	}
-
-	std::vector<std::pair<QString, std::function<cpu_thread*()>>> cpu_list;
-	cpu_list.reserve(threads_created >= threads_deleted ? 0 : threads_created - threads_deleted);
-
-	usz reselected_index = umax;
+	bool reselected = false;
 
 	const auto on_select = [&](u32 id, cpu_thread& cpu)
 	{
-		std::function<cpu_thread*()> func_cpu = make_check_cpu(std::addressof(cpu), true);
+		if (emu_state == system_state::stopped) return;
+
+		const QVariant var_cpu = QVariant::fromValue<std::pair<cpu_thread*, u32>>(std::make_pair(&cpu, id));
 
 		// Space at the end is to pad a gap on the right
-		cpu_list.emplace_back(QString::fromStdString((id >> 24 == 0x55 ? "RSX[0x55555555]" : cpu.get_name()) + ' '), std::move(func_cpu));
+		m_choice_units->addItem(qstr((id >> 24 == 0x55 ? "RSX[0x55555555]" : cpu.get_name()) + ' '), var_cpu);
 
-		if (old_cpu_ptr == std::addressof(cpu))
+		if (!reselected && old_cpu == var_cpu)
 		{
-			reselected_index = cpu_list.size() - 1;
+			m_choice_units->setCurrentIndex(m_choice_units->count() - 1);
+			reselected = true;
 		}
 	};
 
-	if (emu_state != system_state::stopped)
 	{
-		if (g_fxo->is_init<id_manager::id_map<named_thread<ppu_thread>>>())
-		{
-			idm::select<named_thread<ppu_thread>>(on_select, idm::unlocked);
-		}
+		const QSignalBlocker blocker(m_choice_units);
 
-		if (g_fxo->is_init<id_manager::id_map<named_thread<spu_thread>>>())
-		{
-			idm::select<named_thread<spu_thread>>(on_select, idm::unlocked);
-		}
+		m_choice_units->clear();
+		m_choice_units->addItem(NoThreadString);
 
-		if (const auto render = g_fxo->try_get<rsx::thread>(); render && render->ctrl)
+		idm::select<named_thread<ppu_thread>>(on_select);
+		idm::select<named_thread<spu_thread>>(on_select);
+
+		if (const auto render = g_fxo->try_get<rsx::thread>(); emu_state != system_state::stopped && render && render->ctrl)
 		{
 			on_select(render->id, *render);
 		}
 	}
 
-	lock.unlock();
-
-	m_emulation_id = emulation_id;
-	m_threads_created = threads_created;
-	m_threads_deleted = threads_deleted;
-	m_emu_state = emu_state;
-	m_thread_list_pending_update = false;
-
-	{
-		const QSignalBlocker blocker(m_choice_units);
-
-		m_threads_info.clear();
-		m_choice_units->clear();
-
-		m_threads_info.emplace_back(make_check_cpu(nullptr));
-		m_choice_units->addItem(NoThreadString);
-
-		for (auto&& [thread_name, func_cpu] : cpu_list)
-		{
-			m_threads_info.emplace_back(std::move(func_cpu));
-			m_choice_units->addItem(std::move(thread_name));
-		}
-
-		if (reselected_index != umax)
-		{
-			// Include no-thread at index 0 
-			m_choice_units->setCurrentIndex(::narrow<s32>(reselected_index + 1));
-		}
-	}
-
 	// Close dialogs which are tied to the specific thread selected
-	if (reselected_index == umax)
+	if (!reselected)
 	{
 		if (m_reg_editor) m_reg_editor->close();
 		if (m_inst_editor) m_inst_editor->close();
-		if (m_goto_dialog) m_goto_dialog->close();
 	}
 
 	if (emu_state == system_state::stopped)
 	{
 		ClearBreakpoints();
-		ClearCallStack();
 	}
 
 	OnSelectUnit();
@@ -1105,20 +840,10 @@ void debugger_frame::UpdateUnitList()
 
 void debugger_frame::OnSelectUnit()
 {
-	if (m_is_spu_disasm_mode)
-	{
-		return;
-	}
-
-	cpu_thread* selected = nullptr;
+	auto [selected, cpu_id] = m_choice_units->currentData().value<std::pair<cpu_thread*, u32>>();
 
 	if (m_emu_state != system_state::stopped)
 	{
-		if (int index = m_choice_units->currentIndex(); index >= 0 && index + 0u < m_threads_info.size())
-		{
-			selected = ::at32(m_threads_info, index)();
-		}
-
 		if (selected && m_cpu.get() == selected)
 		{
 			// They match, nothing to do.
@@ -1135,36 +860,47 @@ void debugger_frame::OnSelectUnit()
 			return;
 		}
 	}
+	else
+	{
+		selected = nullptr;
+	}
 
 	m_disasm.reset();
 	m_cpu.reset();
 	m_rsx = nullptr;
-	m_spu_disasm_memory.reset();
 
 	if (selected)
 	{
-		const u32 cpu_id = selected->id;
-
 		switch (cpu_id >> 24)
 		{
 		case 1:
 		{
-			m_cpu = idm::get_unlocked<named_thread<ppu_thread>>(cpu_id);
+			m_cpu = idm::get<named_thread<ppu_thread>>(cpu_id);
 
 			if (selected == m_cpu.get())
 			{
-				m_disasm = make_disasm(selected, m_cpu);
+				m_disasm = std::make_shared<PPUDisAsm>(cpu_disasm_mode::interpreter, vm::g_sudo_addr);
+			}
+			else
+			{
+				m_cpu.reset();
+				selected = nullptr;
 			}
 
 			break;
 		}
 		case 2:
 		{
-			m_cpu = idm::get_unlocked<named_thread<spu_thread>>(cpu_id);
+			m_cpu = idm::get<named_thread<spu_thread>>(cpu_id);
 
 			if (selected == m_cpu.get())
 			{
-				m_disasm = make_disasm(selected, m_cpu);
+				m_disasm = std::make_shared<SPUDisAsm>(cpu_disasm_mode::interpreter, static_cast<const spu_thread*>(m_cpu.get())->ls);
+			}
+			else
+			{
+				m_cpu.reset();
+				selected = nullptr;
 			}
 
 			break;
@@ -1175,7 +911,7 @@ void debugger_frame::OnSelectUnit()
 
 			if (get_cpu())
 			{
-				m_disasm = make_disasm(m_rsx, null_ptr);
+				m_disasm = std::make_shared<RSXDisAsm>(cpu_disasm_mode::interpreter, vm::g_sudo_addr, m_rsx);
 			}
 
 			break;
@@ -1184,175 +920,24 @@ void debugger_frame::OnSelectUnit()
 		}
 	}
 
-	if (!m_disasm)
-	{
-		m_cpu.reset();
-		m_rsx = nullptr;
-	}
-
 	EnableButtons(true);
 
-	m_debugger_list->UpdateCPUData(m_disasm);
-	m_breakpoint_list->UpdateCPUData(m_disasm);
-
-	ShowPC(true);
+	m_debugger_list->UpdateCPUData(get_cpu(), m_disasm.get());
+	m_breakpoint_list->UpdateCPUData(get_cpu(), m_disasm.get());
 	DoUpdate();
 	UpdateUI();
 }
 
-void debugger_frame::OnSelectSPUDisassembler()
-{
-	if (m_spu_disasm_dialog)
-	{
-		m_spu_disasm_dialog->move(QCursor::pos());
-		m_spu_disasm_dialog->show();
-		m_spu_disasm_dialog->setFocus();
-		return;
-	}
-
-	m_spu_disasm_dialog = new QDialog(this);
-	m_spu_disasm_dialog->setWindowTitle(tr("SPU Disassembler Properties"));
-
-	// Panels
-	QVBoxLayout* vbox_panel(new QVBoxLayout());
-	QHBoxLayout* hbox_expression_input_panel = new QHBoxLayout();
-	QHBoxLayout* hbox_button_panel(new QHBoxLayout());
-
-	// Address expression input
-	QLineEdit* source_eal(new QLineEdit(m_spu_disasm_dialog));
-	QLineEdit* start_pc(new QLineEdit(m_spu_disasm_dialog));
-	source_eal->setFont(m_mono);
-	source_eal->setMaxLength(12);
-	source_eal->setValidator(new QRegularExpressionValidator(QRegularExpression("^(0[xX])?0*[a-fA-F0-9]{0,8}$"), this));
-	start_pc->setFont(m_mono);
-	start_pc->setMaxLength(7);
-	start_pc->setValidator(new QRegularExpressionValidator(QRegularExpression("^(0[xX])?0*[a-fA-F0-9]{0,5}$"), this));
-
-	// Ok/Cancel
-	QPushButton* button_ok = new QPushButton(tr("OK"));
-	QPushButton* button_cancel = new QPushButton(tr("Cancel"));
-
-	hbox_expression_input_panel->addWidget(new QLabel(tr("Source Address: ")));
-	hbox_expression_input_panel->addWidget(source_eal);
-	hbox_expression_input_panel->addSpacing(10);
-	hbox_expression_input_panel->addWidget(new QLabel(tr("Load PC: ")));
-	hbox_expression_input_panel->addWidget(start_pc);
-
-	hbox_button_panel->addWidget(button_ok);
-	hbox_button_panel->addWidget(button_cancel);
-
-	vbox_panel->addLayout(hbox_expression_input_panel);
-	vbox_panel->addSpacing(8);
-	vbox_panel->addLayout(hbox_button_panel);
-
-	m_spu_disasm_dialog->setLayout(vbox_panel);
-
-	const QFont font = source_eal->font();
-
-	source_eal->setPlaceholderText(QString::fromStdString(fmt::format("0x%08x", 0)));
-	start_pc->setPlaceholderText(QString::fromStdString(fmt::format("0x%05x", 0)));
-
-	source_eal->setFixedWidth(gui::utils::get_label_width(source_eal->placeholderText(), &font) + 5);
-	start_pc->setFixedWidth(gui::utils::get_label_width(start_pc->placeholderText(), &font) + 5);
-
-	if (m_spu_disasm_origin_eal)
-	{
-		source_eal->setText(QString::fromStdString(fmt::format("0x%08x", m_spu_disasm_origin_eal)));
-		start_pc->setText(QString::fromStdString(fmt::format("0x%05x", m_spu_disasm_pc)));
-	}
-
-	connect(button_ok, &QAbstractButton::clicked, m_spu_disasm_dialog, &QDialog::accept);
-	connect(button_cancel, &QAbstractButton::clicked, m_spu_disasm_dialog, &QDialog::reject);
-
-	m_spu_disasm_dialog->move(QCursor::pos());
-	m_spu_disasm_dialog->setAttribute(Qt::WA_DeleteOnClose);
-
-	connect(m_spu_disasm_dialog, &QDialog::finished, this, [this, source_eal, start_pc](int result)
-	{
-		m_spu_disasm_dialog = nullptr;
-
-		if (result != QDialog::Accepted)
-		{
-			return;
-		}
-		const u64 spu_base = EvaluateExpression(start_pc->text());
-
-		if (spu_base > SPU_LS_SIZE - 4 || spu_base % 4)
-		{
-			return;
-		}
-
-		const u64 spu_addr = EvaluateExpression(source_eal->text());
-
-		if (spu_addr == umax || !spu_addr)
-		{
-			return;
-		}
-
-		// Try to load as much memory as possible until SPU local memory ends
-		// Because I don't think there is a need for a size argument
-		// The user probably does not know the exact size of the SPU code either
-		u32 spu_size = SPU_LS_SIZE - spu_base;
-
-		for (u32 passed = spu_base; passed < SPU_LS_SIZE; passed += 4096)
-		{
-			if (!vm::check_addr(spu_addr + passed))
-			{
-				if (passed == spu_base)
-				{
-					return;
-				}
-
-				spu_size = passed - spu_base - (spu_addr + passed) % 4096;
-				break;
-			}
-
-			if (4096 > ~(spu_addr + passed))
-			{
-				// For overflow
-				spu_size = std::min<u32>(SPU_LS_SIZE, 0 - spu_addr);
-				break;
-			}
-		}
-
-		m_disasm.reset();
-		m_cpu.reset();
-		m_rsx = nullptr;
-
-		m_spu_disasm_memory = std::make_shared<utils::shm>(SPU_LS_SIZE);
-		m_spu_disasm_memory->map_self();
-		m_is_spu_disasm_mode = true;
-
-		std::memset(m_spu_disasm_memory->get(), 0, spu_base);
-		std::memcpy(m_spu_disasm_memory->get() + spu_base, vm::get_super_ptr(spu_addr), spu_size);
-		std::memset(m_spu_disasm_memory->get() + spu_base + spu_size, 0, SPU_LS_SIZE - (spu_base + spu_size));
-
-		m_spu_disasm_pc = spu_base;
-		m_spu_disasm_origin_eal = spu_addr;
-
-		m_disasm = std::make_shared<SPUDisAsm>(cpu_disasm_mode::interpreter, m_spu_disasm_memory->get());
-
-		EnableButtons(true);
-
-		m_debugger_list->UpdateCPUData(m_disasm);
-		m_breakpoint_list->UpdateCPUData(m_disasm);
-		ShowPC(true);
-		DoUpdate();
-		UpdateUI();
-	});
-
-	m_spu_disasm_dialog->show();
-}
-
 void debugger_frame::DoUpdate()
 {
 	// Check if we need to disable a step over bp
 	if (const auto cpu0 = get_cpu(); cpu0 && m_last_step_over_breakpoint != umax && cpu0->get_pc() == m_last_step_over_breakpoint)
 	{
-		m_ppu_breakpoint_handler->RemoveBreakpoint(m_last_step_over_breakpoint);
+		m_breakpoint_handler->RemoveBreakpoint(m_last_step_over_breakpoint);
 		m_last_step_over_breakpoint = -1;
 	}
 
+	ShowPC();
 	WritePanels();
 }
 
@@ -1364,41 +949,27 @@ void debugger_frame::WritePanels()
 	{
 		m_misc_state->clear();
 		m_regs->clear();
-		ClearCallStack();
 		return;
 	}
 
 	int loc = m_misc_state->verticalScrollBar()->value();
-	int hloc = m_misc_state->horizontalScrollBar()->value();
 	m_misc_state->clear();
-	m_misc_state->setPlainText(QString::fromStdString(cpu->dump_misc()));
+	m_misc_state->setText(qstr(cpu->dump_misc()));
 	m_misc_state->verticalScrollBar()->setValue(loc);
-	m_misc_state->horizontalScrollBar()->setValue(hloc);
 
 	loc = m_regs->verticalScrollBar()->value();
-	hloc = m_regs->horizontalScrollBar()->value();
 	m_regs->clear();
-	m_last_reg_state.clear();
-	cpu->dump_regs(m_last_reg_state, m_dump_reg_func_data);
-	m_regs->setPlainText(QString::fromStdString(m_last_reg_state));
+	m_regs->setText(qstr(cpu->dump_regs()));
 	m_regs->verticalScrollBar()->setValue(loc);
-	m_regs->horizontalScrollBar()->setValue(hloc);
 
 	Q_EMIT CallStackUpdateRequested(cpu->dump_callstack_list());
 }
 
 void debugger_frame::ShowGotoAddressDialog()
 {
-	if (m_goto_dialog)
-	{
-		m_goto_dialog->move(QCursor::pos());
-		m_goto_dialog->show();
-		m_goto_dialog->setFocus();
-		return;
-	}
-
-	m_goto_dialog = new QDialog(this);
-	m_goto_dialog->setWindowTitle(tr("Go To Address"));
+	QDialog* dlg = new QDialog(this);
+	dlg->setWindowTitle(tr("Go To Address"));
+	dlg->setModal(true);
 
 	// Panels
 	QVBoxLayout* vbox_panel(new QVBoxLayout());
@@ -1406,16 +977,17 @@ void debugger_frame::ShowGotoAddressDialog()
 	QHBoxLayout* hbox_button_panel(new QHBoxLayout());
 
 	// Address expression input
-	QLineEdit* expression_input(new QLineEdit(m_goto_dialog));
+	QLineEdit* expression_input(new QLineEdit(dlg));
 	expression_input->setFont(m_mono);
+	expression_input->setMaxLength(18);
 
-	if (const auto thread = get_cpu(); !thread || thread->get_class() != thread_class::spu)
+	if (const auto thread = get_cpu(); !thread || thread->id_type() != 2)
 	{
-		expression_input->setValidator(new HexValidator(expression_input));
+		expression_input->setValidator(new QRegExpValidator(QRegExp("^(0[xX])?0*[a-fA-F0-9]{0,8}$")));
 	}
 	else
 	{
-		expression_input->setValidator(new HexValidator(expression_input));
+		expression_input->setValidator(new QRegExpValidator(QRegExp("^(0[xX])?0*[a-fA-F0-9]{0,5}$")));
 	}
 
 	// Ok/Cancel
@@ -1431,104 +1003,41 @@ void debugger_frame::ShowGotoAddressDialog()
 	vbox_panel->addSpacing(8);
 	vbox_panel->addLayout(hbox_button_panel);
 
-	m_goto_dialog->setLayout(vbox_panel);
+	dlg->setLayout(vbox_panel);
 
-	const auto cpu_check = make_check_cpu(get_cpu());
-	const auto cpu = cpu_check();
+	const auto cpu = get_cpu();
 	const QFont font = expression_input->font();
 
 	// -1 from get_pc() turns into 0
 	const u32 pc = cpu ? utils::align<u32>(cpu->get_pc(), 4) : 0;
 	expression_input->setPlaceholderText(QString("0x%1").arg(pc, 16, 16, QChar('0')));
-	expression_input->setFixedWidth(gui::utils::get_label_width(expression_input->placeholderText(), &font) + 5);
+	expression_input->setFixedWidth(gui::utils::get_label_width(expression_input->placeholderText(), &font));
 
-	connect(button_ok, &QAbstractButton::clicked, m_goto_dialog, &QDialog::accept);
-	connect(button_cancel, &QAbstractButton::clicked, m_goto_dialog, &QDialog::reject);
+	connect(button_ok, &QAbstractButton::clicked, dlg, &QDialog::accept);
+	connect(button_cancel, &QAbstractButton::clicked, dlg, &QDialog::reject);
 
-	m_goto_dialog->move(QCursor::pos());
-	m_goto_dialog->setAttribute(Qt::WA_DeleteOnClose);
+	dlg->move(QCursor::pos());
 
-	connect(m_goto_dialog, &QDialog::finished, this, [this, cpu, cpu_check, expression_input](int result)
+	if (dlg->exec() == QDialog::Accepted)
 	{
-		// Check if the thread has not been destroyed and is still the focused since
-		// This also works if no thread is selected and has been selected before
-		if (result == QDialog::Accepted && cpu == get_cpu() && cpu == cpu_check())
-		{
-			PerformGoToRequest(normalize_hex_qstring(expression_input->text()));
-		}
-
-		m_goto_dialog = nullptr;
-	});
-
-	m_goto_dialog->show();
-}
-
-void debugger_frame::PerformGoToRequest(const QString& text_argument)
-{
-	const bool asterisk_prefixed = text_argument.startsWith(QChar('*'));
-	const u64 address = EvaluateExpression(asterisk_prefixed ? text_argument.sliced(1, text_argument.size() - 1) : text_argument);
-
-	if (address != umax)
-	{
-		// Try to read from OPD entry if prefixed by asterisk
-		if (asterisk_prefixed)
-		{
-			if (auto cpu = get_cpu())
-			{
-				if (cpu->try_get<ppu_thread>())
-				{
-					const vm::ptr<u32> func_ptr = vm::cast(static_cast<u32>(address));
-
-					be_t<u32> code_addr{};
-
-					if (func_ptr.try_read(code_addr))
-					{
-						m_debugger_list->ShowAddress(code_addr, true);
-					}
-				}
-			}
-
-			return;
-		}
-
-		m_debugger_list->ShowAddress(static_cast<u32>(address), true);
+		const u32 address = EvaluateExpression(expression_input->text());
+		m_debugger_list->ShowAddress(address, true);
 	}
-}
 
-void debugger_frame::PerformGoToThreadRequest(const QString& text_argument)
-{
-	const u64 thread_id = EvaluateExpression(text_argument);
-
-	if (thread_id != umax)
-	{
-		for (usz i = 0; i < m_threads_info.size(); i++)
-		{
-			if (cpu_thread* ptr = m_threads_info[i](); ptr && ptr->id == thread_id)
-			{
-				// Success
-				m_choice_units->setCurrentIndex(::narrow<s32>(i));
-				return;
-			}
-		}
-	}
-}
-
-void debugger_frame::PerformAddBreakpointRequest(u32 addr)
-{
-	m_debugger_list->BreakpointRequested(addr, true);
+	dlg->deleteLater();
 }
 
 u64 debugger_frame::EvaluateExpression(const QString& expression)
 {
 	bool ok = false;
 
-	// Parse expression (or at least used to, was nuked to remove the need for QtJsEngine)
-	const QString fixed_expression = QRegularExpression(QRegularExpression::anchoredPattern("a .*|^[A-Fa-f0-9]+$")).match(expression).hasMatch() ? "0x" + expression : expression;
+	// Parse expression(or at least used to, was nuked to remove the need for QtJsEngine)
+	const QString fixed_expression = QRegExp("^[A-Fa-f0-9]+$").exactMatch(expression) ? "0x" + expression : expression;
 	const u64 res = static_cast<u64>(fixed_expression.toULong(&ok, 16));
 
 	if (ok) return res;
-	if (const auto thread = get_cpu(); thread && expression.isEmpty()) return thread->get_pc();
-	return umax;
+	if (const auto thread = get_cpu()) return thread->get_pc();
+	return 0;
 }
 
 void debugger_frame::ClearBreakpoints() const
@@ -1541,80 +1050,36 @@ void debugger_frame::ClearCallStack()
 	Q_EMIT CallStackUpdateRequested({});
 }
 
-void debugger_frame::ShowPC(bool user_requested)
+void debugger_frame::ShowPC()
 {
 	const auto cpu0 = get_cpu();
 
-	const u32 pc = (cpu0 ? cpu0->get_pc() : (m_is_spu_disasm_mode ? m_spu_disasm_pc : 0));
+	const u32 pc = (cpu0 ? cpu0->get_pc() : 0);
 
-	if (user_requested)
-	{
-		m_debugger_list->EnableThreadFollowing();
-	}
-
-	m_debugger_list->ShowAddress(pc, false);
+	m_debugger_list->ShowAddress(pc, true);
 }
 
 void debugger_frame::DoStep(bool step_over)
 {
 	if (const auto cpu = get_cpu())
 	{
-		bool should_step_over = step_over && cpu->get_class() == thread_class::ppu;
-
-		// If stepping over, lay at the same spot and wait for the thread to finish the call
-		// If not, fixate on the current pointed instruction
-		m_debugger_list->EnableThreadFollowing(!should_step_over);
-
-		if (should_step_over)
-		{
-			m_debugger_list->ShowAddress(cpu->get_pc() + 4, false);
-		}
-
-		if (step_over && cpu->get_class() == thread_class::rsx)
-		{
-			const bool was_paused = cpu->is_paused();
-			static_cast<rsx::thread*>(cpu)->pause_on_draw = true;
-
-			if (was_paused)
-			{
-				RunBtnPress();
-				m_debugger_list->EnableThreadFollowing(true);
-			}
-
-			return;
-		}
+		bool should_step_over = step_over && cpu->id_type() == 1;
 
 		if (const auto _state = +cpu->state; _state & s_pause_flags && _state & cpu_flag::wait && !(_state & cpu_flag::dbg_step))
 		{
-			if (should_step_over && cpu->get_class() == thread_class::ppu)
-			{
-				const u32 current_instruction_pc = cpu->get_pc();
-
-				vm::ptr<u32> inst_ptr = vm::cast(current_instruction_pc);
-				be_t<u32> result{};
-
-				if (inst_ptr.try_read(result))
-				{
-					ppu_opcode_t ppu_op{result};
-					const ppu_itype::type itype = g_ppu_itype.decode(ppu_op.opcode);
-
-					should_step_over = (itype & ppu_itype::branch && ppu_op.lk);
-				}
-			}
-
 			if (should_step_over)
 			{
 				const u32 current_instruction_pc = cpu->get_pc();
 
 				// Set breakpoint on next instruction
 				const u32 next_instruction_pc = current_instruction_pc + 4;
-				m_ppu_breakpoint_handler->AddBreakpoint(next_instruction_pc, breakpoint_types::bp_exec);
+				m_breakpoint_handler->AddBreakpoint(next_instruction_pc);
 
-				// Undefine previous step over breakpoint if it hasn't been already
+				// Undefine previous step over breakpoint if it hasnt been already
 				// This can happen when the user steps over a branch that doesn't return to itself
 				if (m_last_step_over_breakpoint != umax)
 				{
-					m_ppu_breakpoint_handler->RemoveBreakpoint(next_instruction_pc);
+					m_breakpoint_handler->RemoveBreakpoint(next_instruction_pc);
 				}
 
 				m_last_step_over_breakpoint = next_instruction_pc;
@@ -1634,60 +1099,16 @@ void debugger_frame::DoStep(bool step_over)
 				}
 			});
 
-			cpu->state.notify_one();
+			cpu->state.notify_one(s_pause_flags);
 		}
 	}
 
-	// Tighten up, put the debugger on a wary watch over any thread info changes if there aren't any
-	// This allows responsive debugger interaction
-	m_ui_fast_update_permission_deadline = m_ui_update_ctr + 5;
+	UpdateUI();
 }
 
 void debugger_frame::EnableUpdateTimer(bool enable) const
 {
-	if (m_update->isActive() == enable)
-	{
-		return;
-	}
-
-	enable ? m_update->start(10) : m_update->stop();
-}
-
-void debugger_frame::RunBtnPress()
-{
-	if (const auto cpu = get_cpu())
-	{
-		// If paused, unpause.
-		// If not paused, add dbg_pause.
-		const auto old = cpu->state.fetch_op([](bs_t<cpu_flag>& state)
-		{
-			if (state & s_pause_flags)
-			{
-				state -= s_pause_flags;
-			}
-			else
-			{
-				state += cpu_flag::dbg_pause;
-			}
-		});
-
-		// Notify only if no pause flags are set after this change
-		if (old & s_pause_flags)
-		{
-			if (g_debugger_pause_all_threads_on_bp && Emu.IsPaused() && (old & s_pause_flags) == s_pause_flags)
-			{
-				// Resume all threads were paused by this breakpoint
-				Emu.Resume();
-			}
-
-			cpu->state.notify_one();
-			m_debugger_list->EnableThreadFollowing();
-		}
-	}
-
-	// Tighten up, put the debugger on a wary watch over any thread info changes if there aren't any
-	// This allows responsive debugger interaction
-	m_ui_fast_update_permission_deadline = m_ui_update_ctr + 5;
+	enable ? m_update->start(50) : m_update->stop();
 }
 
 void debugger_frame::EnableButtons(bool enable)
@@ -1696,45 +1117,11 @@ void debugger_frame::EnableButtons(bool enable)
 
 	if (!cpu) enable = false;
 
-	const bool step = enable && is_using_interpreter(cpu->get_class());
-
+	const bool step = enable && is_using_interpreter(cpu->id_type());
+ 
 	m_go_to_addr->setEnabled(enable);
 	m_go_to_pc->setEnabled(enable);
-	m_btn_add_bp->setEnabled(enable);
 	m_btn_step->setEnabled(step);
 	m_btn_step_over->setEnabled(step);
 	m_btn_run->setEnabled(enable);
 }
-
-void debugger_frame::OnRegsContextMenu(const QPoint& pos)
-{
-	QMenu* menu = m_regs->createStandardContextMenu();
-	QAction* memory_viewer_action = new QAction(tr("Show in Memory Viewer"), menu);
-
-	connect(memory_viewer_action, &QAction::triggered, this, &debugger_frame::RegsShowMemoryViewerAction);
-
-	menu->addSeparator();
-	menu->addAction(memory_viewer_action);
-	menu->exec(m_regs->mapToGlobal(pos));
-}
-
-void debugger_frame::RegsShowMemoryViewerAction()
-{
-	const QTextCursor cursor = m_regs->textCursor();
-	if (!cursor.hasSelection())
-	{
-		QMessageBox::warning(this, tr("No Selection"), tr("Please select a hex value first."));
-		return;
-	}
-
-	const QTextDocumentFragment frag(cursor);
-	const QString selected = frag.toPlainText().trimmed();
-	u64 pc = 0;
-	if (!parse_hex_qstring(selected, &pc))
-	{
-		QMessageBox::critical(this, tr("Invalid Hex"), tr("“%0” is not a valid 32-bit hex value.").arg(selected));
-		return;
-	}
-
-	memory_viewer_panel::ShowAtPC(static_cast<u32>(pc), make_check_cpu(get_cpu()));
-}
diff --git a/rpcs3/rpcs3qt/debugger_frame.h b/rpcs3/rpcs3qt/debugger_frame.h
index 6837347c3f..fb2a8403ed 100644
--- a/rpcs3/rpcs3qt/debugger_frame.h
+++ b/rpcs3/rpcs3qt/debugger_frame.h
@@ -1,19 +1,16 @@
 #pragma once
 
 #include "util/types.hpp"
-#include "util/shared_ptr.hpp"
 
 #include "custom_dock_widget.h"
 
 #include <QSplitter>
-#include <QPlainTextEdit>
+#include <QTextEdit>
 #include <QPushButton>
 #include <QComboBox>
 
 #include <memory>
 #include <vector>
-#include <any>
-#include <functional>
 
 class CPUDisAsm;
 class cpu_thread;
@@ -28,11 +25,6 @@ namespace rsx
 	class thread;
 }
 
-namespace utils
-{
-	class shm;
-}
-
 enum class system_state : u32;
 
 class instruction_editor_dialog;
@@ -46,56 +38,41 @@ class debugger_frame : public custom_dock_widget
 	const QString RunString = tr("Run");
 	const QString PauseString = tr("Pause");
 
-	debugger_list* m_debugger_list = nullptr;
-	QSplitter* m_right_splitter = nullptr;
+	debugger_list* m_debugger_list;
+	QSplitter* m_right_splitter;
 	QFont m_mono;
-	QPlainTextEdit* m_misc_state = nullptr;
-	QPlainTextEdit* m_regs = nullptr;
-	QPushButton* m_go_to_addr = nullptr;
-	QPushButton* m_go_to_pc = nullptr;
-	QPushButton* m_btn_step = nullptr;
-	QPushButton* m_btn_step_over = nullptr;
-	QPushButton* m_btn_add_bp = nullptr;
-	QPushButton* m_btn_run = nullptr;
-
-	QComboBox* m_choice_units = nullptr;
-	QTimer* m_update = nullptr;
-	QSplitter* m_splitter = nullptr;
+	QTextEdit* m_misc_state;
+	QTextEdit* m_regs;
+	QPushButton* m_go_to_addr;
+	QPushButton* m_go_to_pc;
+	QPushButton* m_btn_step;
+	QPushButton* m_btn_step_over;
+	QPushButton* m_btn_run;
+	QComboBox* m_choice_units;
+	QTimer* m_update;
+	QSplitter* m_splitter;
 
 	u64 m_threads_created = -1;
 	u64 m_threads_deleted = -1;
 	system_state m_emu_state{};
-	u64 m_emulation_id{};
 	u32 m_last_pc = -1;
 	std::vector<char> m_last_query_state;
-	std::string m_last_reg_state;
-	std::any m_dump_reg_func_data;
-	std::vector<std::function<cpu_thread*()>> m_threads_info;
 	u32 m_last_step_over_breakpoint = -1;
-	u64 m_ui_update_ctr = 0;
-	u64 m_ui_fast_update_permission_deadline = 0;
-	bool m_thread_list_pending_update = false;
 
 	std::shared_ptr<CPUDisAsm> m_disasm; // Only shared to allow base/derived functionality
-	shared_ptr<cpu_thread> m_cpu;
+	std::shared_ptr<cpu_thread> m_cpu;
 	rsx::thread* m_rsx = nullptr;
-	std::shared_ptr<utils::shm> m_spu_disasm_memory;
-	u32 m_spu_disasm_origin_eal = 0;
-	u32 m_spu_disasm_pc = 0;
-	bool m_is_spu_disasm_mode = false;
 
-	breakpoint_list* m_breakpoint_list = nullptr;
-	breakpoint_handler* m_ppu_breakpoint_handler = nullptr;
-	call_stack_list* m_call_stack_list = nullptr;
+	breakpoint_list* m_breakpoint_list;
+	breakpoint_handler* m_breakpoint_handler;
+	call_stack_list* m_call_stack_list;
 	instruction_editor_dialog* m_inst_editor = nullptr;
 	register_editor_dialog* m_reg_editor = nullptr;
-	QDialog* m_goto_dialog = nullptr;
-	QDialog* m_spu_disasm_dialog = nullptr;
 
 	std::shared_ptr<gui_settings> m_gui_settings;
 
 	cpu_thread* get_cpu();
-	std::function<cpu_thread*()> make_check_cpu(cpu_thread* cpu, bool unlocked = false);
+	std::function<cpu_thread*()> make_check_cpu(cpu_thread* cpu);
 	void open_breakpoints_settings();
 
 public:
@@ -111,9 +88,6 @@ public:
 	void WritePanels();
 	void EnableButtons(bool enable);
 	void ShowGotoAddressDialog();
-	void PerformGoToRequest(const QString& text_argument);
-	void PerformGoToThreadRequest(const QString& text_argument);
-	void PerformAddBreakpointRequest(u32 addr);
 	u64 EvaluateExpression(const QString& expression);
 	void ClearBreakpoints() const; // Fallthrough method into breakpoint_list.
 	void ClearCallStack();
@@ -136,12 +110,8 @@ public Q_SLOTS:
 
 private Q_SLOTS:
 	void OnSelectUnit();
-	void OnSelectSPUDisassembler();
-	void OnRegsContextMenu(const QPoint& pos);
-	void ShowPC(bool user_requested = false);
+	void ShowPC();
 	void EnableUpdateTimer(bool enable) const;
-	void RunBtnPress();
-	void RegsShowMemoryViewerAction();
 };
 
 Q_DECLARE_METATYPE(u32)
diff --git a/rpcs3/rpcs3qt/debugger_list.cpp b/rpcs3/rpcs3qt/debugger_list.cpp
index 757eb9cd98..30677170ee 100644
--- a/rpcs3/rpcs3qt/debugger_list.cpp
+++ b/rpcs3/rpcs3qt/debugger_list.cpp
@@ -4,14 +4,12 @@
 #include "breakpoint_handler.h"
 
 #include "Emu/Cell/SPUThread.h"
+#include "Emu/Cell/PPUThread.h"
 #include "Emu/CPU/CPUDisAsm.h"
 #include "Emu/CPU/CPUThread.h"
 #include "Emu/RSX/RSXDisAsm.h"
-#include "Emu/RSX/RSXThread.h"
 #include "Emu/System.h"
 
-#include "util/asm.hpp"
-
 #include <QMouseEvent>
 #include <QWheelEvent>
 #include <QVBoxLayout>
@@ -19,225 +17,92 @@
 
 #include <memory>
 
+constexpr auto qstr = QString::fromStdString;
+
 debugger_list::debugger_list(QWidget* parent, std::shared_ptr<gui_settings> gui_settings, breakpoint_handler* handler)
 	: QListWidget(parent)
 	, m_gui_settings(std::move(gui_settings))
-	, m_ppu_breakpoint_handler(handler)
+	, m_breakpoint_handler(handler)
 {
 	setWindowTitle(tr("ASM"));
-
 	for (uint i = 0; i < m_item_count; ++i)
 	{
 		insertItem(i, new QListWidgetItem(""));
 	}
-
 	setSizeAdjustPolicy(QListWidget::AdjustToContents);
-	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-
-	connect(this, &QListWidget::currentRowChanged, this, [this](int row)
-	{
-		if (row < 0)
-		{
-			m_selected_instruction = -1;
-			m_showing_selected_instruction = false;
-			return;
-		}
-
-		u32 pc = m_start_addr;
-
-		const auto cpu = m_disasm && !Emu.IsStopped() ? m_disasm->get_cpu() : nullptr;
-
-		for (; cpu && cpu->get_class() == thread_class::rsx && row; row--)
-		{
-			// If scrolling forwards (downwards), we can skip entire commands
-			pc += std::max<u32>(m_disasm->disasm(pc), 4);
-		}
-
-		m_selected_instruction = pc + row * 4;
-	});
 }
 
-void debugger_list::UpdateCPUData(std::shared_ptr<CPUDisAsm> disasm)
+void debugger_list::UpdateCPUData(cpu_thread* cpu, CPUDisAsm* disasm)
 {
-	if ((!m_disasm) != (!disasm) || (m_disasm && disasm->get_cpu() != m_disasm->get_cpu()))
-	{
-		m_selected_instruction = -1;
-		m_showing_selected_instruction = false;
-	}
-
-	m_disasm = std::move(disasm);
+	m_cpu = cpu;
+	m_disasm = disasm;
 }
 
-u32 debugger_list::GetStartAddress(u32 address)
+u32 debugger_list::GetCenteredAddress(u32 address) const
 {
-	const auto cpu = m_disasm && !Emu.IsStopped() ? m_disasm->get_cpu() : nullptr;
+	return address - ((m_item_count / 2) * 4);
+}
 
-	const u32 steps = m_item_count / 3;
-	const u32 inst_count_jump_on_step = std::min<u32>(steps, 4);
-
-	const bool is_spu = IsSpu();
-	const u32 address_mask = (is_spu ? 0x3fffc : ~3);
-
-	u32 result = address & address_mask;
-
-	if (cpu && cpu->get_class() == thread_class::rsx)
+void debugger_list::ShowAddress(u32 addr, bool select_addr, bool force)
+{
+	auto IsBreakpoint = [this](u32 pc)
 	{
-		if (auto [count, res] = static_cast<rsx::thread*>(cpu)->try_get_pc_of_x_cmds_backwards(steps, address); count == steps)
+		return m_cpu && m_cpu->id_type() == 1 && m_breakpoint_handler->HasBreakpoint(pc);
+	};
+
+	bool center_pc = m_gui_settings->GetValue(gui::d_centerPC).toBool();
+
+	// How many spaces addr can move down without us needing to move the entire view
+	const u32 addr_margin = (m_item_count / (center_pc ? 2 : 1) - 4); // 4 is just a buffer of 4 spaces at the bottom
+
+	if (m_cpu && m_cpu->id_type() == 0x55)
+	{
+		// RSX instructions' size is not consistent, this is the only valid mode for it
+		force = true;
+		center_pc = false;
+	}
+
+	if (force || addr - m_pc > addr_margin * 4) // 4 is the number of bytes in each instruction
+	{
+		if (center_pc)
 		{
-			result = res;
-		}
-	}
-	else
-	{
-		result = (address - (steps * 4)) & address_mask;
-	}
-
-	u32 upper_bound = (m_start_addr + (steps * 4)) & address_mask;
-
-	if (cpu && cpu->get_class() == thread_class::rsx)
-	{
-		if (auto [count, res] = static_cast<rsx::thread*>(cpu)->try_get_pc_of_x_cmds_backwards(0 - steps, m_start_addr); count == steps)
-		{
-			upper_bound = res;
-		}
-	}
-
-	bool goto_addr = false;
-
-	if (upper_bound > m_start_addr)
-	{
-		goto_addr = address < m_start_addr || address >= upper_bound;
-	}
-	else
-	{
-		// Overflowing bounds case
-		goto_addr = address < m_start_addr && address >= upper_bound;
-	}
-
-	if (goto_addr)
-	{
-		m_pc = address;
-
-		if (address > upper_bound && address - upper_bound < inst_count_jump_on_step * 4)
-		{
-			m_start_addr = result + inst_count_jump_on_step * 4;
+			m_pc = GetCenteredAddress(addr);
 		}
 		else
 		{
-			m_start_addr = result;
+			m_pc = addr;
 		}
 	}
 
-	return m_start_addr;
-}
-
-bool debugger_list::IsSpu() const
-{
-	const auto cpu = m_disasm && !Emu.IsStopped() ? m_disasm->get_cpu() : nullptr;
-
-	return (cpu && cpu->get_class() == thread_class::spu) || (m_disasm && !cpu);
-}
-
-void debugger_list::ShowAddress(u32 addr, bool select_addr, bool direct)
-{
-	const auto cpu = m_disasm && !Emu.IsStopped() ? m_disasm->get_cpu() : nullptr;
-
-	const decltype(spu_thread::local_breakpoints)* spu_bps_list{};
-
-	if (cpu && cpu->get_class() == thread_class::spu)
-	{
-		spu_bps_list = &static_cast<spu_thread*>(cpu)->local_breakpoints;
-	}
-
-	auto IsBreakpoint = [&](u32 pc)
-	{
-		switch (cpu ? cpu->get_class() : thread_class::general)
-		{
-		case thread_class::ppu:
-		{
-			return m_ppu_breakpoint_handler->HasBreakpoint(pc, breakpoint_types::bp_exec);
-		}
-		case thread_class::spu:
-		{
-			const u32 pos_at = pc / 4;
-			const u32 pos_bit = 1u << (pos_at % 8);
-
-			return !!((*spu_bps_list)[pos_at / 8] & pos_bit);
-		}
-		default: return false;
-		}
-	};
-
-	if (select_addr || direct)
-	{
-		// The user wants to survey a specific memory location, do not interfere from this point forth
-		m_follow_thread = false;
-	}
-
-	m_dirty_flag = false;
-
-	u32 pc = m_start_addr;
-
-	if (!direct && (m_follow_thread || select_addr))
-	{
-		pc = GetStartAddress(addr);
-	}
-
 	const auto& default_foreground = palette().color(foregroundRole());
 	const auto& default_background = palette().color(backgroundRole());
 
-	m_showing_selected_instruction = false;
-
-	if (select_addr)
-	{
-		m_selected_instruction = addr;
-	}
-
-	for (uint i = 0; i < m_item_count; ++i)
-	{
-		if (auto list_item = item(i); list_item->isSelected())
-		{
-			list_item->setSelected(false);
-		}
-	}
-
-	if (!m_disasm || (cpu && cpu->state.all_of(cpu_flag::exit + cpu_flag::wait)))
+	if (!m_cpu || !m_disasm || +m_cpu->state + cpu_flag::exit + cpu_flag::wait == +m_cpu->state)
 	{
 		for (uint i = 0; i < m_item_count; ++i)
 		{
 			QListWidgetItem* list_item = item(i);
-			list_item->setText(QString::fromStdString(fmt::format("   [%08x]  ?? ?? ?? ??:", 0)));
+			list_item->setText(qstr(fmt::format("   [%08x]  ?? ?? ?? ??:", 0)));
 			list_item->setForeground(default_foreground);
 			list_item->setBackground(default_background);
 		}
 	}
 	else
 	{
-		const bool is_spu = IsSpu();
+		const bool is_spu = m_cpu->id_type() == 2;
 		const u32 address_limits = (is_spu ? 0x3fffc : ~3);
-		const u32 current_pc = (cpu ? cpu->get_pc() : 0);
-		m_start_addr &= address_limits;
-		pc = m_start_addr;
+		m_pc &= address_limits;
+		u32 pc = m_pc;
 
 		for (uint i = 0, count = 4; i < m_item_count; ++i, pc = (pc + count) & address_limits)
 		{
 			QListWidgetItem* list_item = item(i);
 
-			if (pc == current_pc)
+			if (m_cpu->is_paused() && pc == m_cpu->get_pc())
 			{
 				list_item->setForeground(m_text_color_pc);
 				list_item->setBackground(m_color_pc);
 			}
-			else if (pc == m_selected_instruction)
-			{
-				// setSelected may invoke a resize event which causes stack overflow, terminate recursion
-				if (!list_item->isSelected())
-				{
-					list_item->setSelected(true);
-				}
-
-				m_showing_selected_instruction = true;
-			}
 			else if (IsBreakpoint(pc))
 			{
 				list_item->setForeground(m_text_color_bp);
@@ -249,17 +114,22 @@ void debugger_list::ShowAddress(u32 addr, bool select_addr, bool direct)
 				list_item->setBackground(default_background);
 			}
 
-			if (cpu && cpu->get_class() == thread_class::ppu && !vm::check_addr(pc, 0))
+			if (select_addr && pc == addr)
 			{
-				list_item->setText((IsBreakpoint(pc) ? ">> " : "   ") + QString::fromStdString(fmt::format("[%08x]  ?? ?? ?? ??:", pc)));
+				list_item->setSelected(true);
+			}
+
+			if (m_cpu->id_type() == 1 && !vm::check_addr(pc, 0))
+			{
+				list_item->setText((IsBreakpoint(pc) ? ">> " : "   ") + qstr(fmt::format("[%08x]  ?? ?? ?? ??:", pc)));
 				count = 4;
 				continue;
 			}
 
-			if (cpu && cpu->get_class() == thread_class::ppu && !vm::check_addr(pc, vm::page_executable))
+			if (m_cpu->id_type() == 1 && !vm::check_addr(pc, vm::page_executable))
 			{
 				const u32 data = *vm::get_super_ptr<atomic_be_t<u32>>(pc);
-				list_item->setText((IsBreakpoint(pc) ? ">> " : "   ") + QString::fromStdString(fmt::format("[%08x]  %02x %02x %02x %02x:", pc,
+				list_item->setText((IsBreakpoint(pc) ? ">> " : "   ") + qstr(fmt::format("[%08x]  %02x %02x %02x %02x:", pc,
 				static_cast<u8>(data >> 24),
 				static_cast<u8>(data >> 16),
 				static_cast<u8>(data >> 8),
@@ -272,79 +142,35 @@ void debugger_list::ShowAddress(u32 addr, bool select_addr, bool direct)
 
 			if (!count)
 			{
-				list_item->setText((IsBreakpoint(pc) ? ">> " : "   ") + QString::fromStdString(fmt::format("[%08x] ???     ?? ??", pc)));
+				list_item->setText((IsBreakpoint(pc) ? ">> " : "   ") + qstr(fmt::format("[%08x] ???     ?? ??", pc)));
 				count = 4;
 				continue;
 			}
 
-			list_item->setText((IsBreakpoint(pc) ? ">> " : "   ") + QString::fromStdString(m_disasm->last_opcode));
+			list_item->setText((IsBreakpoint(pc) ? ">> " : "   ") + qstr(m_disasm->last_opcode));
 		}
 	}
 
 	setLineWidth(-1);
 }
 
-void debugger_list::RefreshView()
-{
-	const bool old = std::exchange(m_follow_thread, false);
-	ShowAddress(0, false);
-	m_follow_thread = old;
-}
-
-void debugger_list::EnableThreadFollowing(bool enable)
-{
-	m_follow_thread = enable;
-}
-
 void debugger_list::scroll(s32 steps)
 {
-	const auto cpu = m_disasm && !Emu.IsStopped() ? m_disasm->get_cpu() : nullptr;
-
-	for (; cpu && cpu->get_class() == thread_class::rsx && steps > 0; steps--)
+	while (m_cpu && m_cpu->id_type() == 0x55 && steps > 0)
 	{
 		// If scrolling forwards (downwards), we can skip entire commands
-		m_start_addr += std::max<u32>(m_disasm->disasm(m_start_addr), 4);
+		// Backwards is impossible though
+		m_pc += std::max<u32>(m_disasm->disasm(m_pc), 4);
+		steps--;
 	}
 
-	if (cpu && cpu->get_class() == thread_class::rsx && steps < 0)
-	{
-		// If scrolling backwards (upwards), try to obtain the start of commands tail
-		if (auto [count, res] = static_cast<rsx::thread*>(cpu)->try_get_pc_of_x_cmds_backwards(-steps, m_start_addr); count == 0u - steps)
-		{
-			steps = 0;
-			m_start_addr = res;
-		}
-	}
-
-	EnableThreadFollowing(false);
-	m_start_addr += steps * 4;
-	ShowAddress(0, false, true);
+	ShowAddress(m_pc + (steps * 4), false, true);
 }
 
 void debugger_list::keyPressEvent(QKeyEvent* event)
 {
-	const auto cpu = m_disasm && !Emu.IsStopped() ? m_disasm->get_cpu() : nullptr;
-
-	// Always accept event (so it would not bubble upwards, debugger_frame already sees it)
-	struct accept_event_t
-	{
-		QKeyEvent* event;
-
-		~accept_event_t() noexcept
-		{
-			event->accept();
-		}
-	} accept_event{event};
-
 	if (!isActiveWindow())
 	{
-		QListWidget::keyPressEvent(event);
-		return;
-	}
-
-	if (event->modifiers())
-	{
-		QListWidget::keyPressEvent(event);
 		return;
 	}
 
@@ -352,28 +178,23 @@ void debugger_list::keyPressEvent(QKeyEvent* event)
 	{
 	case Qt::Key_PageUp:   scroll(0 - m_item_count); return;
 	case Qt::Key_PageDown: scroll(m_item_count); return;
-	case Qt::Key_Up:       scroll(-1); return;
-	case Qt::Key_Down:     scroll(1); return;
+	case Qt::Key_Up:       scroll(1); return;
+	case Qt::Key_Down:     scroll(-1); return;
 	case Qt::Key_I:
 	{
 		if (event->isAutoRepeat())
 		{
-			QListWidget::keyPressEvent(event);
 			return;
 		}
-
-		if (cpu && cpu->get_class() == thread_class::rsx)
+		if (m_cpu && m_cpu->id_type() == 0x55)
 		{
-			create_rsx_command_detail(m_showing_selected_instruction ? m_selected_instruction : m_pc);
+			create_rsx_command_detail(m_pc, currentRow());
 			return;
 		}
-
-		break;
+		return;
 	}
 	default: break;
 	}
-
-	QListWidget::keyPressEvent(event);
 }
 
 
@@ -389,10 +210,20 @@ void debugger_list::hideEvent(QHideEvent* event)
 	QListWidget::hideEvent(event);
 }
 
-void debugger_list::create_rsx_command_detail(u32 pc)
+void debugger_list::create_rsx_command_detail(u32 pc, int row)
 {
-	RSXDisAsm rsx_dis = static_cast<RSXDisAsm&>(*m_disasm);
-	rsx_dis.change_mode(cpu_disasm_mode::list);
+	if (row < 0)
+	{
+		return;
+	}
+
+	for (; row > 0; row--)
+	{
+		// Skip methods
+		pc += std::max<u32>(m_disasm->disasm(pc), 4);
+	}
+
+	RSXDisAsm rsx_dis = CPUDisAsm::copy_and_change_mode(*static_cast<RSXDisAsm*>(m_disasm), cpu_disasm_mode::list);
 
 	// Either invalid or not a method
 	if (rsx_dis.disasm(pc) <= 4) return;
@@ -430,21 +261,10 @@ void debugger_list::mouseDoubleClickEvent(QMouseEvent* event)
 {
 	if (event->button() == Qt::LeftButton)
 	{
-		int i = currentRow();
+		const int i = currentRow();
 		if (i < 0) return;
 
-		u32 pc = m_start_addr;
-
-		const auto cpu = m_disasm && !Emu.IsStopped() ? m_disasm->get_cpu() : nullptr;
-
-		for (; cpu && cpu->get_class() == thread_class::rsx && i; i--)
-		{
-			// If scrolling forwards (downwards), we can skip entire commands
-			pc += std::max<u32>(m_disasm->disasm(pc), 4);
-		}
-
-		pc += i * 4;
-		m_selected_instruction = pc;
+		const u32 pc = m_pc + i * 4;
 
 		// Let debugger_frame know about breakpoint.
 		// Other option is to add to breakpoint manager directly and have a signal there instead.
@@ -464,31 +284,27 @@ void debugger_list::wheelEvent(QWheelEvent* event)
 
 void debugger_list::resizeEvent(QResizeEvent* event)
 {
-	QListWidget::resizeEvent(event);
+	Q_UNUSED(event)
 
 	if (count() < 1 || visualItemRect(item(0)).height() < 1)
 	{
 		return;
 	}
 
-	const u32 old_size = m_item_count;
+	m_item_count = (rect().height() - frameWidth() * 2) / visualItemRect(item(0)).height();
 
-	// It is fine if the QWidgetList is a tad bit larger than the frame
-	m_item_count = utils::aligned_div<u32>(rect().height() - frameWidth() * 2, visualItemRect(item(0)).height());
+	clear();
 
-	if (old_size <= m_item_count)
+	for (u32 i = 0; i < m_item_count; ++i)
 	{
-		for (u32 i = old_size; i < m_item_count; ++i)
-		{
-			insertItem(i, new QListWidgetItem(""));
-			m_dirty_flag = true;
-		}
+		insertItem(i, new QListWidgetItem(""));
 	}
-	else
+
+	if (horizontalScrollBar())
 	{
-		for (u32 i = old_size - 1; i >= m_item_count; --i)
-		{
-			delete takeItem(i);
-		}
+		m_item_count--;
+		delete item(m_item_count);
 	}
+
+	ShowAddress(m_pc, false);
 }
diff --git a/rpcs3/rpcs3qt/debugger_list.h b/rpcs3/rpcs3qt/debugger_list.h
index e0429db884..8fe7c24a12 100644
--- a/rpcs3/rpcs3qt/debugger_list.h
+++ b/rpcs3/rpcs3qt/debugger_list.h
@@ -18,26 +18,19 @@ class debugger_list : public QListWidget
 
 public:
 	u32 m_pc = 0;
-	u32 m_start_addr = 0;
 	u32 m_item_count = 30;
-	u32 m_selected_instruction = -1;
-	bool m_follow_thread = true; // If true, follow the selected thread to wherever it goes in code
-	bool m_showing_selected_instruction = false;
-	bool m_dirty_flag = false;
 	QColor m_color_bp;
 	QColor m_color_pc;
 	QColor m_text_color_bp;
 	QColor m_text_color_pc;
 
 Q_SIGNALS:
-	void BreakpointRequested(u32 loc, bool only_add = false);
+	void BreakpointRequested(u32 loc);
 public:
 	debugger_list(QWidget* parent, std::shared_ptr<gui_settings> settings, breakpoint_handler* handler);
-	void UpdateCPUData(std::shared_ptr<CPUDisAsm> disasm);
-	void EnableThreadFollowing(bool enable = true);
+	void UpdateCPUData(cpu_thread* cpu, CPUDisAsm* disasm);
 public Q_SLOTS:
-	void ShowAddress(u32 addr, bool select_addr = true, bool direct = false);
-	void RefreshView();
+	void ShowAddress(u32 addr, bool select_addr = true, bool force = false);
 protected:
 	void keyPressEvent(QKeyEvent* event) override;
 	void mouseDoubleClickEvent(QMouseEvent* event) override;
@@ -46,19 +39,18 @@ protected:
 	void showEvent(QShowEvent* event) override;
 	void hideEvent(QHideEvent* event) override;
 	void scroll(s32 steps);
-	void create_rsx_command_detail(u32 pc);
+	void create_rsx_command_detail(u32 pc, int row);
 private:
 	/**
 	* It really upsetted me I had to copy this code to make debugger_list/frame not circularly dependent.
 	*/
-	u32 GetStartAddress(u32 address);
-	bool IsSpu() const;
+	u32 GetCenteredAddress(u32 address) const;
 
 	std::shared_ptr<gui_settings> m_gui_settings;
 
-	breakpoint_handler* m_ppu_breakpoint_handler = nullptr;
+	breakpoint_handler* m_breakpoint_handler;
 	cpu_thread* m_cpu = nullptr;
-	std::shared_ptr<CPUDisAsm> m_disasm;
+	CPUDisAsm* m_disasm = nullptr;
 	QDialog* m_cmd_detail = nullptr;
 	QLabel* m_detail_label = nullptr;
 };
diff --git a/rpcs3/rpcs3qt/dimensions_dialog.cpp b/rpcs3/rpcs3qt/dimensions_dialog.cpp
deleted file mode 100644
index a6eb07018e..0000000000
--- a/rpcs3/rpcs3qt/dimensions_dialog.cpp
+++ /dev/null
@@ -1,779 +0,0 @@
-#include "stdafx.h"
-#include "Utilities/File.h"
-#include "dimensions_dialog.h"
-#include "Emu/Io/Dimensions.h"
-
-#include <QLabel>
-#include <QGroupBox>
-#include <QFileDialog>
-#include <QVBoxLayout>
-#include <QMessageBox>
-#include <QComboBox>
-#include <QPushButton>
-#include <QStringList>
-#include <QCompleter>
-#include <QGridLayout>
-
-dimensions_dialog* dimensions_dialog::inst = nullptr;
-std::array<std::optional<u32>, 7> figure_slots = {};
-static QString s_last_figure_path;
-
-LOG_CHANNEL(dimensions_log, "dimensions");
-
-const std::map<const u32, const std::string> list_minifigs = {
-	{0, "Blank Tag"},
-	{1, "Batman"},
-	{2, "Gandalf"},
-	{3, "Wyldstyle"},
-	{4, "Aquaman"},
-	{5, "Bad Cop"},
-	{6, "Bane"},
-	{7, "Bart Simpson"},
-	{8, "Benny"},
-	{9, "Chell"},
-	{10, "Cole"},
-	{11, "Cragger"},
-	{12, "Cyborg"},
-	{13, "Cyberman"},
-	{14, "Doc Brown"},
-	{15, "The Doctor"},
-	{16, "Emmet"},
-	{17, "Eris"},
-	{18, "Gimli"},
-	{19, "Gollum"},
-	{20, "Harley Quinn"},
-	{21, "Homer Simpson"},
-	{22, "Jay"},
-	{23, "Joker"},
-	{24, "Kai"},
-	{25, "ACU Trooper"},
-	{26, "Gamer Kid"},
-	{27, "Krusty the Clown"},
-	{28, "Laval"},
-	{29, "Legolas"},
-	{30, "Lloyd"},
-	{31, "Marty McFly"},
-	{32, "Nya"},
-	{33, "Owen Grady"},
-	{34, "Peter Venkman"},
-	{35, "Slimer"},
-	{36, "Scooby-Doo"},
-	{37, "Sensei Wu"},
-	{38, "Shaggy"},
-	{39, "Stay Puft"},
-	{40, "Superman"},
-	{41, "Unikitty"},
-	{42, "Wicked Witch of the West"},
-	{43, "Wonder Woman"},
-	{44, "Zane"},
-	{45, "Green Arrow"},
-	{46, "Supergirl"},
-	{47, "Abby Yates"},
-	{48, "Finn the Human"},
-	{49, "Ethan Hunt"},
-	{50, "Lumpy Space Princess"},
-	{51, "Jake the Dog"},
-	{52, "Harry Potter"},
-	{53, "Lord Voldemort"},
-	{54, "Michael Knight"},
-	{55, "B.A. Baracus"},
-	{56, "Newt Scamander"},
-	{57, "Sonic the Hedgehog"},
-	{58, "Future Update (unreleased)"},
-	{59, "Gizmo"},
-	{60, "Stripe"},
-	{61, "E.T."},
-	{62, "Tina Goldstein"},
-	{63, "Marceline the Vampire Queen"},
-	{64, "Batgirl"},
-	{65, "Robin"},
-	{66, "Sloth"},
-	{67, "Hermione Granger"},
-	{68, "Chase McCain"},
-	{69, "Excalibur Batman"},
-	{70, "Raven"},
-	{71, "Beast Boy"},
-	{72, "Betelgeuse"},
-	{73, "Lord Vortech (unreleased)"},
-	{74, "Blossom"},
-	{75, "Bubbles"},
-	{76, "Buttercup"},
-	{77, "Starfire"},
-	{78, "World 15 (unreleased)"},
-	{79, "World 16 (unreleased)"},
-	{80, "World 17 (unreleased)"},
-	{81, "World 18 (unreleased)"},
-	{82, "World 19 (unreleased)"},
-	{83, "World 20 (unreleased)"},
-	{768, "Unknown 768"},
-	{769, "Supergirl Red Lantern"},
-	{770, "Unknown 770"}};
-
-const std::map<const u32, const std::string> list_tokens = {
-	{1000, "Police Car"},
-	{1001, "Aerial Squad Car"},
-	{1002, "Missile Striker"},
-	{1003, "Gravity Sprinter"},
-	{1004, "Street Shredder"},
-	{1005, "Sky Clobberer"},
-	{1006, "Batmobile"},
-	{1007, "Batblaster"},
-	{1008, "Sonic Batray"},
-	{1009, "Benny's Spaceship"},
-	{1010, "Lasercraft"},
-	{1011, "The Annihilator"},
-	{1012, "DeLorean Time Machine"},
-	{1013, "Electric Time Machine"},
-	{1014, "Ultra Time Machine"},
-	{1015, "Hoverboard"},
-	{1016, "Cyclone Board"},
-	{1017, "Ultimate Hoverjet"},
-	{1018, "Eagle Interceptor"},
-	{1019, "Eagle Sky Blazer"},
-	{1020, "Eagle Swoop Diver"},
-	{1021, "Swamp Skimmer"},
-	{1022, "Cragger's Fireship"},
-	{1023, "Croc Command Sub"},
-	{1024, "Cyber-Guard"},
-	{1025, "Cyber-Wrecker"},
-	{1026, "Laser Robot Walker"},
-	{1027, "K-9"},
-	{1028, "K-9 Ruff Rover"},
-	{1029, "K-9 Laser Cutter"},
-	{1030, "TARDIS"},
-	{1031, "Laser-Pulse TARDIS"},
-	{1032, "Energy-Burst TARDIS"},
-	{1033, "Emmet's Excavator"},
-	{1034, "Destroy Dozer"},
-	{1035, "Destruct-o-Mech"},
-	{1036, "Winged Monkey"},
-	{1037, "Battle Monkey"},
-	{1038, "Commander Monkey"},
-	{1039, "Axe Chariot"},
-	{1040, "Axe Hurler"},
-	{1041, "Soaring Chariot"},
-	{1042, "Shelob the Great"},
-	{1043, "8-Legged Stalker"},
-	{1044, "Poison Slinger"},
-	{1045, "Homer's Car"},
-	{1047, "The SubmaHomer"},
-	{1046, "The Homercraft"},
-	{1048, "Taunt-o-Vision"},
-	{1050, "The MechaHomer"},
-	{1049, "Blast Cam"},
-	{1051, "Velociraptor"},
-	{1053, "Venom Raptor"},
-	{1052, "Spike Attack Raptor"},
-	{1054, "Gyrosphere"},
-	{1055, "Sonic Beam Gyrosphere"},
-	{1056, " Gyrosphere"},
-	{1057, "Clown Bike"},
-	{1058, "Cannon Bike"},
-	{1059, "Anti-Gravity Rocket Bike"},
-	{1060, "Mighty Lion Rider"},
-	{1061, "Lion Blazer"},
-	{1062, "Fire Lion"},
-	{1063, "Arrow Launcher"},
-	{1064, "Seeking Shooter"},
-	{1065, "Triple Ballista"},
-	{1066, "Mystery Machine"},
-	{1067, "Mystery Tow & Go"},
-	{1068, "Mystery Monster"},
-	{1069, "Boulder Bomber"},
-	{1070, "Boulder Blaster"},
-	{1071, "Cyclone Jet"},
-	{1072, "Storm Fighter"},
-	{1073, "Lightning Jet"},
-	{1074, "Electro-Shooter"},
-	{1075, "Blade Bike"},
-	{1076, "Flight Fire Bike"},
-	{1077, "Blades of Fire"},
-	{1078, "Samurai Mech"},
-	{1079, "Samurai Shooter"},
-	{1080, "Soaring Samurai Mech"},
-	{1081, "Companion Cube"},
-	{1082, "Laser Deflector"},
-	{1083, "Gold Heart Emitter"},
-	{1084, "Sentry Turret"},
-	{1085, "Turret Striker"},
-	{1086, "Flight Turret Carrier"},
-	{1087, "Scooby Snack"},
-	{1088, "Scooby Fire Snack"},
-	{1089, "Scooby Ghost Snack"},
-	{1090, "Cloud Cuckoo Car"},
-	{1091, "X-Stream Soaker"},
-	{1092, "Rainbow Cannon"},
-	{1093, "Invisible Jet"},
-	{1094, "Laser Shooter"},
-	{1095, "Torpedo Bomber"},
-	{1096, "NinjaCopter"},
-	{1097, "Glaciator"},
-	{1098, "Freeze Fighter"},
-	{1099, "Travelling Time Train"},
-	{1100, "Flight Time Train"},
-	{1101, "Missile Blast Time Train"},
-	{1102, "Aqua Watercraft"},
-	{1103, "Seven Seas Speeder"},
-	{1104, "Trident of Fire"},
-	{1105, "Drill Driver"},
-	{1106, "Bane Dig 'n' Drill"},
-	{1107, "Bane Drill 'n' Blast"},
-	{1108, "Quinn Mobile"},
-	{1109, "Quinn Ultra Racer"},
-	{1110, "Missile Launcher"},
-	{1111, "The Joker's Chopper"},
-	{1112, "Mischievous Missile Blaster"},
-	{1113, "Lock 'n' Laser Jet"},
-	{1114, "Hover Pod"},
-	{1115, "Krypton Striker"},
-	{1116, "Super Stealth Pod"},
-	{1117, "Dalek"},
-	{1118, "Fire 'n' Ride Dalek"},
-	{1119, "Silver Shooter Dalek"},
-	{1120, "Ecto-1"},
-	{1121, "Ecto-1 Blaster"},
-	{1122, "Ecto-1 Water Diver"},
-	{1123, "Ghost Trap"},
-	{1124, "Ghost Stun 'n' Trap"},
-	{1125, "Proton Zapper"},
-	{1126, "Unknown"},
-	{1127, "Unknown"},
-	{1128, "Unknown"},
-	{1129, "Unknown"},
-	{1130, "Unknown"},
-	{1131, "Unknown"},
-	{1132, "Lloyd's Golden Dragon"},
-	{1133, "Sword Projector Dragon"},
-	{1134, "Unknown"},
-	{1135, "Unknown"},
-	{1136, "Unknown"},
-	{1137, "Unknown"},
-	{1138, "Unknown"},
-	{1139, "Unknown"},
-	{1140, "Unknown"},
-	{1141, "Unknown"},
-	{1142, "Unknown"},
-	{1143, "Unknown"},
-	{1144, "Mega Flight Dragon"},
-	{1145, "Unknown"},
-	{1146, "Unknown"},
-	{1147, "Unknown"},
-	{1148, "Unknown"},
-	{1149, "Unknown"},
-	{1150, "Unknown"},
-	{1151, "Unknown"},
-	{1152, "Unknown"},
-	{1153, "Unknown"},
-	{1154, "Unknown"},
-	{1155, "Flying White Dragon"},
-	{1156, "Golden Fire Dragon"},
-	{1157, "Ultra Destruction Dragon"},
-	{1158, "Arcade Machine"},
-	{1159, "8-Bit Shooter"},
-	{1160, "The Pixelator"},
-	{1161, "G-6155 Spy Hunter"},
-	{1162, "Interdiver"},
-	{1163, "Aerial Spyhunter"},
-	{1164, "Slime Shooter"},
-	{1165, "Slime Exploder"},
-	{1166, "Slime Streamer"},
-	{1167, "Terror Dog"},
-	{1168, "Terror Dog Destroyer"},
-	{1169, "Soaring Terror Dog"},
-	{1170, "Ancient Psychic Tandem War Elephant"},
-	{1171, "Cosmic Squid"},
-	{1172, "Psychic Submarine"},
-	{1173, "BMO"},
-	{1174, "DOGMO"},
-	{1175, "SNAKEMO"},
-	{1176, "Jakemobile"},
-	{1177, "Snail Dude Jake"},
-	{1178, "Hover Jake"},
-	{1179, "Lumpy Car"},
-	{1181, "Lumpy Land Whale"},
-	{1180, "Lumpy Truck"},
-	{1182, "Lunatic Amp"},
-	{1183, "Shadow Scorpion"},
-	{1184, "Heavy Metal Monster"},
-	{1185, "B.A.'s Van"},
-	{1186, "Fool Smasher"},
-	{1187, "Pain Plane"},
-	{1188, "Phone Home"},
-	{1189, "Mobile Uplink"},
-	{1190, "Super-Charged Satellite"},
-	{1191, "Niffler"},
-	{1192, "Sinister Scorpion"},
-	{1193, "Vicious Vulture"},
-	{1194, "Swooping Evil"},
-	{1195, "Brutal Bloom"},
-	{1196, "Crawling Creeper"},
-	{1197, "Ecto-1 (2016)"},
-	{1198, "Ectozer"},
-	{1199, "PerfEcto"},
-	{1200, "Flash 'n' Finish"},
-	{1201, "Rampage Record Player"},
-	{1202, "Stripe's Throne"},
-	{1203, "R.C. Racer"},
-	{1204, "Gadget-O-Matic"},
-	{1205, "Scarlet Scorpion"},
-	{1206, "Hogwarts Express"},
-	{1208, "Steam Warrior"},
-	{1207, "Soaring Steam Plane"},
-	{1209, "Enchanted Car"},
-	{1210, "Shark Sub"},
-	{1211, "Monstrous Mouth"},
-	{1212, "IMF Scrambler"},
-	{1213, "Shock Cycle"},
-	{1214, "IMF Covert Jet"},
-	{1215, "IMF Sports Car"},
-	{1216, "IMF Tank"},
-	{1217, "IMF Splorer"},
-	{1218, "Sonic Speedster"},
-	{1219, "Blue Typhoon"},
-	{1220, "Moto Bug"},
-	{1221, "The Tornado"},
-	{1222, "Crabmeat"},
-	{1223, "Eggcatcher"},
-	{1224, "K.I.T.T."},
-	{1225, "Goliath Armored Semi"},
-	{1226, "K.I.T.T. Jet"},
-	{1227, "Police Helicopter"},
-	{1228, "Police Hovercraft"},
-	{1229, "Police Plane"},
-	{1230, "Bionic Steed"},
-	{1231, "Bat-Raptor"},
-	{1232, "Ultrabat"},
-	{1233, "Batwing"},
-	{1234, "The Black Thunder"},
-	{1235, "Bat-Tank"},
-	{1236, "Skeleton Organ"},
-	{1237, "Skeleton Jukebox"},
-	{1238, "Skele-Turkey"},
-	{1239, "One-Eyed Willy's Pirate Ship"},
-	{1240, "Fanged Fortune"},
-	{1241, "Inferno Cannon"},
-	{1242, "Buckbeak"},
-	{1243, "Giant Owl"},
-	{1244, "Fierce Falcon"},
-	{1245, "Saturn's Sandworm"},
-	{1247, "Haunted Vacuum"},
-	{1246, "Spooky Spider"},
-	{1248, "PPG Smartphone"},
-	{1249, "PPG Hotline"},
-	{1250, "Powerpuff Mag-Net"},
-	{1253, "Mega Blast Bot"},
-	{1251, "Ka-Pow Cannon"},
-	{1252, "Slammin' Guitar"},
-	{1254, "Octi"},
-	{1255, "Super Skunk"},
-	{1256, "Sonic Squid"},
-	{1257, "T-Car"},
-	{1258, "T-Forklift"},
-	{1259, "T-Plane"},
-	{1260, "Spellbook of Azarath"},
-	{1261, "Raven Wings"},
-	{1262, "Giant Hand"},
-	{1263, "Titan Robot"},
-	{1264, "T-Rocket"},
-	{1265, "Robot Retriever"}};
-
-minifig_creator_dialog::minifig_creator_dialog(QWidget* parent)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("Figure Creator"));
-	setObjectName("figure_creator");
-	setMinimumSize(QSize(500, 150));
-
-	QVBoxLayout* vbox_panel = new QVBoxLayout();
-
-	QComboBox* combo_figlist = new QComboBox();
-	QStringList filterlist;
-
-	for (const auto& [figure, figure_name] : list_minifigs)
-	{
-		QString name = QString::fromStdString(figure_name);
-		combo_figlist->addItem(name, QVariant(figure));
-		filterlist << std::move(name);
-	}
-
-	combo_figlist->addItem(tr("--Unknown--"), QVariant(0xFFFF));
-	combo_figlist->setEditable(true);
-	combo_figlist->setInsertPolicy(QComboBox::NoInsert);
-	combo_figlist->model()->sort(0, Qt::AscendingOrder);
-
-	QCompleter* co_compl = new QCompleter(filterlist, this);
-	co_compl->setCaseSensitivity(Qt::CaseInsensitive);
-	co_compl->setCompletionMode(QCompleter::PopupCompletion);
-	co_compl->setFilterMode(Qt::MatchContains);
-	combo_figlist->setCompleter(co_compl);
-
-	vbox_panel->addWidget(combo_figlist);
-
-	QFrame* line = new QFrame();
-	line->setFrameShape(QFrame::HLine);
-	line->setFrameShadow(QFrame::Sunken);
-	vbox_panel->addWidget(line);
-
-	QHBoxLayout* hbox_number = new QHBoxLayout();
-	QLabel* label_number = new QLabel(tr("Figure Number:"));
-	QLineEdit* edit_number = new QLineEdit(QString::fromStdString(std::to_string(0)));
-	QRegularExpressionValidator* rxv = new QRegularExpressionValidator(QRegularExpression("\\d*"), this);
-	edit_number->setValidator(rxv);
-	hbox_number->addWidget(label_number);
-	hbox_number->addWidget(edit_number);
-	vbox_panel->addLayout(hbox_number);
-
-	QHBoxLayout* hbox_buttons = new QHBoxLayout();
-	QPushButton* btn_create = new QPushButton(tr("Create"), this);
-	QPushButton* btn_cancel = new QPushButton(tr("Cancel"), this);
-	hbox_buttons->addStretch();
-	hbox_buttons->addWidget(btn_create);
-	hbox_buttons->addWidget(btn_cancel);
-	vbox_panel->addLayout(hbox_buttons);
-
-	setLayout(vbox_panel);
-
-	connect(combo_figlist, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index)
-		{
-			const u16 fig_info = combo_figlist->itemData(index).toUInt();
-			if (fig_info != 0xFFFF)
-			{
-				edit_number->setText(QString::number(fig_info));
-			}
-		});
-
-	connect(btn_create, &QAbstractButton::clicked, this, [=, this]()
-		{
-			bool ok_num = false;
-			const u16 fig_num = edit_number->text().toUInt(&ok_num) & 0xFFFF;
-			if (!ok_num)
-			{
-				QMessageBox::warning(this, tr("Error converting value"), tr("Figure number entered is invalid!"), QMessageBox::Ok);
-				return;
-			}
-			const auto found_figure = list_minifigs.find(fig_num);
-			if (found_figure != list_minifigs.cend())
-			{
-				s_last_figure_path += QString::fromStdString(found_figure->second + ".bin");
-			}
-			else
-			{
-				s_last_figure_path += QString("Unknown(%1).bin").arg(fig_num);
-			}
-
-			m_file_path = QFileDialog::getSaveFileName(this, tr("Create Figure File"), s_last_figure_path, tr("Dimensions Figure (*.bin);;"));
-			if (m_file_path.isEmpty())
-			{
-				return;
-			}
-
-			fs::file dim_file(m_file_path.toStdString(), fs::read + fs::write + fs::create);
-			if (!dim_file)
-			{
-				QMessageBox::warning(this, tr("Failed to create minifig file!"), tr("Failed to create minifig file:\n%1").arg(m_file_path), QMessageBox::Ok);
-				return;
-			}
-
-			std::array<u8, 0x2D * 0x04> file_data{};
-			g_dimensionstoypad.create_blank_character(file_data, fig_num);
-
-			dim_file.write(file_data.data(), file_data.size());
-			dim_file.close();
-
-			s_last_figure_path = QFileInfo(m_file_path).absolutePath() + "/";
-			accept();
-		});
-
-	connect(btn_cancel, &QAbstractButton::clicked, this, &QDialog::reject);
-
-	connect(co_compl, QOverload<const QString&>::of(&QCompleter::activated), [=](const QString& text)
-		{
-			combo_figlist->setCurrentIndex(combo_figlist->findText(text));
-		});
-}
-
-QString minifig_creator_dialog::get_file_path() const
-{
-	return m_file_path;
-}
-
-minifig_move_dialog::minifig_move_dialog(QWidget* parent, u8 old_index)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("Figure Mover"));
-	setObjectName("figure_mover");
-	setMinimumSize(QSize(500, 150));
-
-	auto* grid_panel = new QGridLayout();
-
-	add_minifig_position(grid_panel, 0, 0, 0, old_index);
-	grid_panel->addWidget(new QLabel(tr("")), 0, 1);
-	add_minifig_position(grid_panel, 1, 0, 2, old_index);
-	grid_panel->addWidget(new QLabel(tr(""), this), 0, 3);
-	add_minifig_position(grid_panel, 2, 0, 4, old_index);
-
-	add_minifig_position(grid_panel, 3, 1, 0, old_index);
-	add_minifig_position(grid_panel, 4, 1, 1, old_index);
-	grid_panel->addWidget(new QLabel(tr("")), 1, 2);
-	add_minifig_position(grid_panel, 5, 1, 3, old_index);
-	add_minifig_position(grid_panel, 6, 1, 4, old_index);
-
-	setLayout(grid_panel);
-}
-
-void minifig_move_dialog::add_minifig_position(QGridLayout* grid_panel, u8 index, u8 row, u8 column, u8 old_index)
-{
-	ensure(index < figure_slots.size());
-
-	auto* vbox_panel = new QVBoxLayout();
-
-	if (figure_slots[index])
-	{
-		const auto found_figure = list_minifigs.find(figure_slots[index].value());
-		if (found_figure != list_minifigs.cend())
-		{
-			vbox_panel->addWidget(new QLabel(tr(found_figure->second.c_str())));
-		}
-	}
-	else
-	{
-		vbox_panel->addWidget(new QLabel(tr("None")));
-	}
-	auto* btn_move = new QPushButton(tr("Move Here"), this);
-	if (old_index == index)
-	{
-		btn_move->setText(tr("Pick up and Place"));
-	}
-	vbox_panel->addWidget(btn_move);
-	connect(btn_move, &QAbstractButton::clicked, this, [this, index]
-		{
-			m_index = index;
-			m_pad = index == 1                             ? 1 :
-		            index == 0 || index == 3 || index == 4 ? 2 :
-		                                                     3;
-			accept();
-		});
-
-	grid_panel->addLayout(vbox_panel, row, column);
-}
-
-u8 minifig_move_dialog::get_new_pad() const
-{
-	return m_pad;
-}
-
-u8 minifig_move_dialog::get_new_index() const
-{
-	return m_index;
-}
-
-dimensions_dialog::dimensions_dialog(QWidget* parent)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("Dimensions Manager"));
-	setObjectName("dimensions_manager");
-	setAttribute(Qt::WA_DeleteOnClose);
-	setMinimumSize(QSize(800, 200));
-
-	QVBoxLayout* vbox_panel = new QVBoxLayout();
-	QVBoxLayout* vbox_group = new QVBoxLayout();
-	QHBoxLayout* hbox_group_1 = new QHBoxLayout();
-	QHBoxLayout* hbox_group_2 = new QHBoxLayout();
-
-	QGroupBox* group_figures = new QGroupBox(tr("Active Dimensions Figures:"));
-
-	add_minifig_slot(hbox_group_1, 2, 0);
-	hbox_group_1->addSpacerItem(new QSpacerItem(50, 0, QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
-	add_minifig_slot(hbox_group_1, 1, 1);
-	hbox_group_1->addSpacerItem(new QSpacerItem(50, 0, QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
-	add_minifig_slot(hbox_group_1, 3, 2);
-
-	add_minifig_slot(hbox_group_2, 2, 3);
-	add_minifig_slot(hbox_group_2, 2, 4);
-	hbox_group_2->addSpacerItem(new QSpacerItem(50, 0, QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
-	add_minifig_slot(hbox_group_2, 3, 5);
-	add_minifig_slot(hbox_group_2, 3, 6);
-
-	vbox_group->addLayout(hbox_group_1);
-	vbox_group->addSpacerItem(new QSpacerItem(0, 20, QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
-	vbox_group->addLayout(hbox_group_2);
-	group_figures->setLayout(vbox_group);
-	vbox_panel->addWidget(group_figures);
-	setLayout(vbox_panel);
-}
-
-dimensions_dialog::~dimensions_dialog()
-{
-	inst = nullptr;
-}
-
-dimensions_dialog* dimensions_dialog::get_dlg(QWidget* parent)
-{
-	if (inst == nullptr)
-		inst = new dimensions_dialog(parent);
-
-	return inst;
-}
-
-void dimensions_dialog::add_minifig_slot(QHBoxLayout* layout, u8 pad, u8 index)
-{
-	ensure(index < figure_slots.size());
-
-	QVBoxLayout* vbox_layout = new QVBoxLayout();
-
-	QHBoxLayout* hbox_name_move = new QHBoxLayout();
-	QHBoxLayout* hbox_actions = new QHBoxLayout();
-
-	QPushButton* clear_btn = new QPushButton(tr("Clear"));
-	QPushButton* create_btn = new QPushButton(tr("Create"));
-	QPushButton* load_btn = new QPushButton(tr("Load"));
-	QPushButton* move_btn = new QPushButton(tr("Move"));
-
-	m_edit_figures[index] = new QLineEdit();
-	m_edit_figures[index]->setEnabled(false);
-	if (figure_slots[index])
-	{
-		const auto found_figure = list_minifigs.find(figure_slots[index].value());
-		if (found_figure != list_minifigs.cend())
-		{
-			m_edit_figures[index]->setText(QString::fromStdString(found_figure->second));
-		}
-		else
-		{
-			m_edit_figures[index]->setText(tr("Unknown Figure"));
-		}
-	}
-	else
-	{
-		m_edit_figures[index]->setText(tr("None"));
-	}
-
-	connect(clear_btn, &QAbstractButton::clicked, this, [this, pad, index]
-		{
-			clear_figure(pad, index);
-		});
-	connect(create_btn, &QAbstractButton::clicked, this, [this, pad, index]
-		{
-			create_figure(pad, index);
-		});
-	connect(load_btn, &QAbstractButton::clicked, this, [this, pad, index]
-		{
-			load_figure(pad, index);
-		});
-	connect(move_btn, &QAbstractButton::clicked, this, [this, pad, index]
-		{
-			if (figure_slots[index])
-			{
-				move_figure(pad, index);
-			}
-		});
-
-	hbox_name_move->addWidget(m_edit_figures[index]);
-	hbox_name_move->addWidget(move_btn);
-	hbox_actions->addWidget(clear_btn);
-	hbox_actions->addWidget(create_btn);
-	hbox_actions->addWidget(load_btn);
-
-	vbox_layout->addLayout(hbox_name_move);
-	vbox_layout->addLayout(hbox_actions);
-
-	layout->addLayout(vbox_layout);
-}
-
-void dimensions_dialog::clear_figure(u8 pad, u8 index)
-{
-	ensure(index < figure_slots.size());
-
-	if (figure_slots[index])
-	{
-		g_dimensionstoypad.remove_figure(pad, index, true, true);
-		figure_slots[index] = std::nullopt;
-		m_edit_figures[index]->setText(tr("None"));
-	}
-}
-
-void dimensions_dialog::create_figure(u8 pad, u8 index)
-{
-	ensure(index < figure_slots.size());
-	minifig_creator_dialog create_dlg(this);
-	if (create_dlg.exec() == Accepted)
-	{
-		load_figure_path(pad, index, create_dlg.get_file_path());
-	}
-}
-
-void dimensions_dialog::load_figure(u8 pad, u8 index)
-{
-	ensure(index < figure_slots.size());
-	const QString file_path = QFileDialog::getOpenFileName(this, tr("Select Dimensions File"), s_last_figure_path, tr("Dimensions Figure (*.bin);;"));
-	if (file_path.isEmpty())
-	{
-		return;
-	}
-
-	s_last_figure_path = QFileInfo(file_path).absolutePath() + "/";
-
-	load_figure_path(pad, index, file_path);
-}
-
-void dimensions_dialog::move_figure(u8 pad, u8 index)
-{
-	ensure(index < figure_slots.size());
-	minifig_move_dialog move_dlg(this, index);
-	g_dimensionstoypad.temp_remove(index);
-	if (move_dlg.exec() == Accepted)
-	{
-		g_dimensionstoypad.move_figure(move_dlg.get_new_pad(), move_dlg.get_new_index(), pad, index);
-		if (index != move_dlg.get_new_index())
-		{
-			figure_slots[move_dlg.get_new_index()] = figure_slots[index];
-			m_edit_figures[move_dlg.get_new_index()]->setText(m_edit_figures[index]->text());
-			figure_slots[index] = std::nullopt;
-			m_edit_figures[index]->setText(tr("None"));
-		}
-	}
-	else
-	{
-		g_dimensionstoypad.cancel_remove(index);
-	}
-}
-
-void dimensions_dialog::load_figure_path(u8 pad, u8 index, const QString& path)
-{
-	fs::file dim_file(path.toStdString(), fs::read + fs::write + fs::lock);
-	if (!dim_file)
-	{
-		QMessageBox::warning(this, tr("Failed to open the figure file!"), tr("Failed to open the figure file(%1)!\nFile may already be in use on the base.").arg(path), QMessageBox::Ok);
-		return;
-	}
-
-	std::array<u8, 0x2D * 0x04> data;
-	if (dim_file.read(data.data(), data.size()) != data.size())
-	{
-		QMessageBox::warning(this, tr("Failed to read the figure file!"), tr("Failed to read the figure file(%1)!\nFile was too small.").arg(path), QMessageBox::Ok);
-		return;
-	}
-
-	clear_figure(pad, index);
-
-	const u32 fig_num = g_dimensionstoypad.load_figure(data, std::move(dim_file), pad, index, true);
-
-	figure_slots[index] = fig_num;
-	const auto name = list_minifigs.find(fig_num);
-	if (name != list_minifigs.cend())
-	{
-		m_edit_figures[index]->setText(QString::fromStdString(name->second));
-	}
-	else
-	{
-		const auto blank_name = list_tokens.find(fig_num);
-		if (blank_name != list_tokens.cend())
-		{
-			m_edit_figures[index]->setText(QString::fromStdString(blank_name->second));
-		}
-		else
-		{
-			m_edit_figures[index]->setText("Blank Tag");
-		}
-	}
-}
diff --git a/rpcs3/rpcs3qt/dimensions_dialog.h b/rpcs3/rpcs3qt/dimensions_dialog.h
deleted file mode 100644
index ceaeaef316..0000000000
--- a/rpcs3/rpcs3qt/dimensions_dialog.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-
-#include <QDialog>
-#include <QLineEdit>
-#include <QGridLayout>
-
-class minifig_creator_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit minifig_creator_dialog(QWidget* parent);
-	QString get_file_path() const;
-
-protected:
-	QString m_file_path;
-};
-
-class minifig_move_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit minifig_move_dialog(QWidget* parent, u8 old_index);
-	u8 get_new_pad() const;
-	u8 get_new_index() const;
-
-protected:
-	u8 m_pad = 0;
-	u8 m_index = 0;
-
-private:
-	void add_minifig_position(QGridLayout* grid_panel, u8 index, u8 row, u8 column, u8 old_index);
-};
-
-class dimensions_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit dimensions_dialog(QWidget* parent);
-	~dimensions_dialog();
-	static dimensions_dialog* get_dlg(QWidget* parent);
-
-	dimensions_dialog(dimensions_dialog const&) = delete;
-	void operator=(dimensions_dialog const&) = delete;
-
-protected:
-	void clear_figure(u8 pad, u8 index);
-	void create_figure(u8 pad, u8 index);
-	void load_figure(u8 pad, u8 index);
-	void move_figure(u8 pad, u8 index);
-	void load_figure_path(u8 pad, u8 index, const QString& path);
-
-protected:
-	std::array<QLineEdit*, 7> m_edit_figures{};
-
-private:
-	void add_minifig_slot(QHBoxLayout* layout, u8 pad, u8 index);
-	static dimensions_dialog* inst;
-};
diff --git a/rpcs3/rpcs3qt/downloader.cpp b/rpcs3/rpcs3qt/downloader.cpp
index dd861da73e..b29f0669d8 100644
--- a/rpcs3/rpcs3qt/downloader.cpp
+++ b/rpcs3/rpcs3qt/downloader.cpp
@@ -5,6 +5,7 @@
 #include "curl_handle.h"
 #include "progress_dialog.h"
 
+#include "Crypto/sha256.h"
 #include "util/logs.hpp"
 
 LOG_CHANNEL(network_log, "NET");
@@ -18,7 +19,7 @@ usz curl_write_cb_compat(char* ptr, usz /*size*/, usz nmemb, void* userdata)
 downloader::downloader(QWidget* parent)
 	: QObject(parent)
 	, m_parent(parent)
-	, m_curl(new rpcs3::curl::curl_handle())
+	, m_curl(new curl_handle(this))
 {
 }
 
@@ -63,15 +64,12 @@ void downloader::start(const std::string& url, bool follow_location, bool show_p
 
 	m_thread = QThread::create([this]
 	{
-		// Reset error buffer before we call curl_easy_perform
-		m_curl->reset_error_buffer();
-
-		const CURLcode result = curl_easy_perform(m_curl->get_curl());
+		const auto result = curl_easy_perform(m_curl->get_curl());
 		m_curl_success = result == CURLE_OK;
 
 		if (!m_curl_success && !m_curl_abort)
 		{
-			const std::string error = fmt::format("curl_easy_perform(): %s", m_curl->get_verbose_error(result));
+			const std::string error = "Curl error: " + std::string{ curl_easy_strerror(result) };
 			network_log.error("%s", error);
 			Q_EMIT signal_download_error(QString::fromStdString(error));
 		}
@@ -81,18 +79,17 @@ void downloader::start(const std::string& url, bool follow_location, bool show_p
 	{
 		if (m_curl_abort)
 		{
-			network_log.notice("Download aborted");
 			return;
 		}
 
-		if (!m_keep_progress_dialog_open || !m_curl_success)
+		if (m_progress_dialog && (!m_keep_progress_dialog_open || !m_curl_success))
 		{
-			close_progress_dialog();
+			m_progress_dialog->close();
+			m_progress_dialog = nullptr;
 		}
 
 		if (m_curl_success)
 		{
-			network_log.notice("Download finished");
 			Q_EMIT signal_download_finished(m_curl_buf);
 		}
 	});
@@ -109,7 +106,7 @@ void downloader::start(const std::string& url, bool follow_location, bool show_p
 		{
 			m_progress_dialog->setWindowTitle(progress_dialog_title);
 			m_progress_dialog->setAutoClose(!m_keep_progress_dialog_open);
-			m_progress_dialog->SetRange(0, maximum);
+			m_progress_dialog->setMaximum(maximum);
 		}
 		else
 		{
@@ -122,13 +119,9 @@ void downloader::start(const std::string& url, bool follow_location, bool show_p
 			connect(m_progress_dialog, &QProgressDialog::canceled, this, [this]()
 			{
 				m_curl_abort = true;
-				m_progress_dialog = nullptr; // The progress dialog deletes itself on close
-				Q_EMIT signal_download_canceled();
-			});
-			connect(m_progress_dialog, &QProgressDialog::finished, this, [this]()
-			{
-				m_progress_dialog = nullptr; // The progress dialog deletes itself on close
+				close_progress_dialog();
 			});
+			connect(m_progress_dialog, &QProgressDialog::finished, m_progress_dialog, &QProgressDialog::deleteLater);
 		}
 	}
 
@@ -149,7 +142,7 @@ void downloader::close_progress_dialog()
 {
 	if (m_progress_dialog)
 	{
-		m_progress_dialog->accept();
+		m_progress_dialog->close();
 		m_progress_dialog = nullptr;
 	}
 }
@@ -159,6 +152,27 @@ progress_dialog* downloader::get_progress_dialog() const
 	return m_progress_dialog;
 }
 
+std::string downloader::get_hash(const char* data, usz size, bool lower_case)
+{
+	u8 res_hash[32];
+	mbedtls_sha256_context ctx;
+	mbedtls_sha256_init(&ctx);
+	mbedtls_sha256_starts_ret(&ctx, 0);
+	mbedtls_sha256_update_ret(&ctx, reinterpret_cast<const unsigned char*>(data), size);
+	mbedtls_sha256_finish_ret(&ctx, res_hash);
+
+	std::string res_hash_string("0000000000000000000000000000000000000000000000000000000000000000");
+
+	for (usz index = 0; index < 32; index++)
+	{
+		const auto pal                   = lower_case ? "0123456789abcdef" : "0123456789ABCDEF";
+		res_hash_string[index * 2]       = pal[res_hash[index] >> 4];
+		res_hash_string[(index * 2) + 1] = pal[res_hash[index] & 15];
+	}
+
+	return res_hash_string;
+}
+
 usz downloader::update_buffer(char* data, usz size)
 {
 	if (m_curl_abort)
@@ -175,7 +189,7 @@ usz downloader::update_buffer(char* data, usz size)
 
 	if (m_actual_download_size < 0)
 	{
-		if (curl_easy_getinfo(m_curl->get_curl(), CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &m_actual_download_size) == CURLE_OK && m_actual_download_size > 0)
+		if (curl_easy_getinfo(m_curl->get_curl(), CURLINFO_CONTENT_LENGTH_DOWNLOAD, &m_actual_download_size) == CURLE_OK && m_actual_download_size > 0)
 		{
 			max = static_cast<int>(m_actual_download_size);
 		}
@@ -195,8 +209,8 @@ void downloader::handle_buffer_update(int size, int max) const
 
 	if (m_progress_dialog)
 	{
-		m_progress_dialog->SetRange(0, max > 0 ? max : m_progress_dialog->maximum());
-		m_progress_dialog->SetValue(size);
+		m_progress_dialog->setMaximum(max > 0 ? max : m_progress_dialog->maximum());
+		m_progress_dialog->setValue(size);
 		QApplication::processEvents();
 	}
 }
diff --git a/rpcs3/rpcs3qt/downloader.h b/rpcs3/rpcs3qt/downloader.h
index 5a2a44fabe..cde365f653 100644
--- a/rpcs3/rpcs3qt/downloader.h
+++ b/rpcs3/rpcs3qt/downloader.h
@@ -3,14 +3,7 @@
 #include <QObject>
 #include "util/atomic.hpp"
 
-namespace rpcs3
-{
-	namespace curl
-	{
-		class curl_handle;
-	}
-}
-
+class curl_handle;
 class progress_dialog;
 
 class downloader : public QObject
@@ -29,19 +22,20 @@ public:
 
 	progress_dialog* get_progress_dialog() const;
 
+	static std::string get_hash(const char* data, usz size, bool lower_case);
+
 private Q_SLOTS:
 	void handle_buffer_update(int size, int max) const;
 
 Q_SIGNALS:
 	void signal_download_error(const QString& error);
 	void signal_download_finished(const QByteArray& data);
-	void signal_download_canceled();
 	void signal_buffer_update(int size, int max);
 
 private:
 	QWidget* m_parent = nullptr;
 
-	std::unique_ptr<rpcs3::curl::curl_handle> m_curl;
+	curl_handle* m_curl = nullptr;
 	QByteArray m_curl_buf;
 	atomic_t<bool> m_curl_abort = false;
 	atomic_t<bool> m_curl_success = false;
diff --git a/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp b/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp
deleted file mode 100644
index c191b878de..0000000000
--- a/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-#include "elf_memory_dumping_dialog.h"
-#include "Emu/Cell/SPUThread.h"
-
-#include "qt_utils.h"
-
-#include <QFileDialog>
-#include <QCoreApplication>
-#include <QFontDatabase>
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QMessageBox>
-#include <QLineEdit>
-#include <QLabel>
-
-LOG_CHANNEL(gui_log, "GUI");
-
-Q_DECLARE_METATYPE(spu_memory_segment_dump_data);
-
-elf_memory_dumping_dialog::elf_memory_dumping_dialog(u32 ppu_debugger_addr, std::shared_ptr<gui_settings> _gui_settings, QWidget* parent)
-	: QDialog(parent), m_gui_settings(std::move(_gui_settings))
-{
-	setWindowTitle(tr("SPU ELF Dumper"));
-	setAttribute(Qt::WA_DeleteOnClose);
-
-	m_seg_list = new QListWidget();
-
-	// Font
-	const int pSize = 10;
-	QFont mono = QFontDatabase::systemFont(QFontDatabase::FixedFont);
-	mono.setPointSize(pSize);
-
-	m_seg_list->setMinimumWidth(gui::utils::get_label_width(tr("PPU Address: 0x00000000, LS Address: 0x00000, Segment Size: 0x00000, Flags: 0x0")));
-
-	// Address expression input
-	auto make_hex_edit = [this, mono](u32 max_digits)
-	{
-		QLineEdit* le = new QLineEdit();
-		le->setFont(mono);
-		le->setMaxLength(max_digits + 2);
-		le->setPlaceholderText("0x" + QStringLiteral("0").repeated(max_digits));
-		le->setValidator(new QRegularExpressionValidator(QRegularExpression(QStringLiteral("^(0[xX])?0*[a-fA-F0-9]{0,%1}$").arg(max_digits)), this));
-		return le;
-	};
-
-	m_segment_size_input = make_hex_edit(5);
-	m_ppu_address_input = make_hex_edit(8);
-	m_ls_address_input = make_hex_edit(5);
-	m_segment_flags_input = make_hex_edit(1);
-	m_segment_flags_input->setText("0x7"); // READ WRITE EXEC
-	m_ppu_address_input->setText(QStringLiteral("0x%1").arg(ppu_debugger_addr & -0x10000, 1, 16)); // SPU code segments are usually 128 bytes aligned, let's make it even 64k so the user would have to type himself the lower part to avoid human errors.
-
-	QPushButton* add_segment_button = new QPushButton(QStringLiteral("+"));
-	add_segment_button->setToolTip(tr("Add new segment"));
-	add_segment_button->setFixedWidth(add_segment_button->sizeHint().height()); // Make button square
-	connect(add_segment_button, &QAbstractButton::clicked, this, &elf_memory_dumping_dialog::add_new_segment);
-
-	QPushButton* remove_segment_button = new QPushButton(QStringLiteral("-"));
-	remove_segment_button->setToolTip(tr("Remove segment"));
-	remove_segment_button->setFixedWidth(remove_segment_button->sizeHint().height()); // Make button square
-	remove_segment_button->setEnabled(false);
-	connect(remove_segment_button, &QAbstractButton::clicked, this, &elf_memory_dumping_dialog::remove_segment);
-
-	QPushButton* save_to_file = new QPushButton(tr("Save To ELF"));
-	save_to_file->setToolTip(tr("Save To An ELF file"));
-	connect(save_to_file, &QAbstractButton::clicked, this, &elf_memory_dumping_dialog::save_to_file);
-
-	QHBoxLayout* hbox_input = new QHBoxLayout;
-	hbox_input->addWidget(new QLabel(tr("Segment Size:")));
-	hbox_input->addWidget(m_segment_size_input);
-	hbox_input->addSpacing(5);
-
-	hbox_input->addWidget(new QLabel(tr("PPU Address:")));
-	hbox_input->addWidget(m_ppu_address_input);
-	hbox_input->addSpacing(5);
-	hbox_input->addWidget(new QLabel(tr("LS Address:")));
-	hbox_input->addWidget(m_ls_address_input);
-	hbox_input->addSpacing(5);
-	hbox_input->addWidget(new QLabel(tr("Flags:")));
-	hbox_input->addWidget(m_segment_flags_input);
-
-	QHBoxLayout* hbox_save_and_edit = new QHBoxLayout;
-	hbox_save_and_edit->addStretch(2);
-	hbox_save_and_edit->addWidget(add_segment_button);
-	hbox_save_and_edit->addSpacing(4);
-	hbox_save_and_edit->addWidget(remove_segment_button);
-	hbox_save_and_edit->addSpacing(4);
-	hbox_save_and_edit->addWidget(save_to_file);
-
-	QVBoxLayout* vbox = new QVBoxLayout();
-	vbox->addLayout(hbox_input);
-	vbox->addSpacing(5);
-	vbox->addWidget(m_seg_list);
-	vbox->addSpacing(5);
-	vbox->addLayout(hbox_save_and_edit);
-
-	setLayout(vbox);
-
-	connect(m_seg_list, &QListWidget::currentRowChanged, this, [this, remove_segment_button](int row)
-	{
-		remove_segment_button->setEnabled(row >= 0 && m_seg_list->item(row));
-	});
-
-	show();
-}
-
-void elf_memory_dumping_dialog::add_new_segment()
-{
-	QStringList errors;
-	auto interpret = [&](QString text, QString error_field) -> u32
-	{
-		bool ok = false;
-
-		// Parse expression (or at least used to, was nuked to remove the need for QtJsEngine)
-		const QString fixed_expression = QRegularExpression(QRegularExpression::anchoredPattern("a .*|^[A-Fa-f0-9]+$")).match(text).hasMatch() ? "0x" + text : text;
-		const u32 res = static_cast<u32>(fixed_expression.toULong(&ok, 16));
-
-		if (!ok)
-		{
-			errors << error_field;
-			return umax;
-		}
-
-		return res;
-	};
-
-	spu_memory_segment_dump_data data{};
-	data.segment_size = interpret(m_segment_size_input->text(), tr("Segment Size"));
-	data.src_addr = vm::get_super_ptr(interpret(m_ppu_address_input->text(), tr("PPU Address")));
-	data.ls_addr = interpret(m_ls_address_input->text(), tr("LS Address"));
-	data.flags = interpret(m_segment_flags_input->text(), tr("Segment Flags"));
-
-	if (!errors.isEmpty())
-	{
-		QMessageBox::warning(this, tr("Failed To Add Segment"), tr("Segment parameters are incorrect:\n%1").arg(errors.join('\n')));
-		return;
-	}
-
-	if (data.segment_size % 4)
-	{
-		QMessageBox::warning(this, tr("Failed To Add Segment"), tr("SPU segment size must be 4 bytes aligned."));
-		return;
-	}
-
-	if (data.segment_size + data.ls_addr > SPU_LS_SIZE || data.segment_size == 0 || data.segment_size % 4)
-	{
-		QMessageBox::warning(this, tr("Failed To Add Segment"), tr("SPU segment range is invalid."));
-		return;
-	}
-
-	if (!vm::check_addr(vm::try_get_addr(data.src_addr).first, vm::page_readable, data.segment_size))
-	{
-		QMessageBox::warning(this, tr("Failed To Add Segment"), tr("PPU address range is not accessible."));
-		return;
-	}
-
-	for (int i = 0; i < m_seg_list->count(); ++i)
-	{
-		ensure(m_seg_list->item(i)->data(Qt::UserRole).canConvert<spu_memory_segment_dump_data>());
-		const auto seg_stored = m_seg_list->item(i)->data(Qt::UserRole).value<spu_memory_segment_dump_data>();
-
-		const auto stored_max = seg_stored.src_addr + seg_stored.segment_size;
-		const auto data_max = data.src_addr + data.segment_size;
-
-		if (seg_stored.src_addr < data_max && data.src_addr < stored_max)
-		{
-			QMessageBox::warning(this, tr("Failed To Add Segment"), tr("SPU segment overlaps with previous SPU segment(s)\n"));
-			return;
-		}
-	}
-
-	auto item = new QListWidgetItem(tr("PPU Address: 0x%0, LS Address: 0x%1, Segment Size: 0x%2, Flags: 0x%3").arg(+vm::try_get_addr(data.src_addr).first, 5, 16).arg(data.ls_addr, 2, 16).arg(data.segment_size, 2, 16).arg(data.flags, 2, 16), m_seg_list);
-	item->setData(Qt::UserRole, QVariant::fromValue(data));
-	m_seg_list->setCurrentItem(item);
-}
-
-void elf_memory_dumping_dialog::remove_segment()
-{
-	const int row = m_seg_list->currentRow();
-	if (row >= 0)
-	{
-		QListWidgetItem* item = m_seg_list->takeItem(row);
-		delete item;
-	}
-}
-
-void elf_memory_dumping_dialog::save_to_file()
-{
-	std::vector<spu_memory_segment_dump_data> segs;
-	segs.reserve(m_seg_list->count());
-
-	for (int i = 0; i < m_seg_list->count(); ++i)
-	{
-		ensure(m_seg_list->item(i)->data(Qt::UserRole).canConvert<spu_memory_segment_dump_data>());
-		const auto seg_stored = m_seg_list->item(i)->data(Qt::UserRole).value<spu_memory_segment_dump_data>();
-		segs.emplace_back(seg_stored);
-	}
-
-	if (segs.empty())
-	{
-		return;
-	}
-
-	const QString path_last_elf = m_gui_settings->GetValue(gui::fd_save_elf).toString();
-
-	const QString qpath = QFileDialog::getSaveFileName(this, tr("Capture"), path_last_elf, "SPU ELF (*.elf)" );
-	const std::string path = qpath.toStdString();
-
-	if (!path.empty())
-	{
-		const auto result = spu_thread::capture_memory_as_elf({segs.data(), segs.size()}).save();
-
-		if (!result.empty() && fs::write_file(path, fs::rewrite, result))
-		{
-			gui_log.success("Saved ELF at %s", path);
-			m_gui_settings->SetValue(gui::fd_save_elf, qpath);
-		}
-		else
-		{
-			QMessageBox::warning(this, tr("Save Failure"), tr("Failed to save SPU ELF."));
-		}
-	}
-}
diff --git a/rpcs3/rpcs3qt/elf_memory_dumping_dialog.h b/rpcs3/rpcs3qt/elf_memory_dumping_dialog.h
deleted file mode 100644
index 3c6d7fe59f..0000000000
--- a/rpcs3/rpcs3qt/elf_memory_dumping_dialog.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-#include "gui_settings.h"
-
-#include <QListWidget>
-#include <QLineEdit>
-#include <QDialog>
-
-#include <memory>
-
-class elf_memory_dumping_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit elf_memory_dumping_dialog(u32 ppu_debugger_pc, std::shared_ptr<gui_settings> _gui_settings, QWidget* parent = nullptr);
-
-protected:
-	void add_new_segment();
-	void remove_segment();
-	void save_to_file();
-
-	std::shared_ptr<gui_settings> m_gui_settings;
-
-	// UI variables needed in higher scope
-	QListWidget* m_seg_list = nullptr;
-
-	QLineEdit* m_ls_address_input = nullptr;
-	QLineEdit* m_segment_size_input = nullptr;
-	QLineEdit* m_ppu_address_input = nullptr;
-	QLineEdit* m_segment_flags_input = nullptr;
-};
diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp
index 0dc672bc41..254364cc5c 100644
--- a/rpcs3/rpcs3qt/emu_settings.cpp
+++ b/rpcs3/rpcs3qt/emu_settings.cpp
@@ -10,7 +10,6 @@
 #include "Emu/system_config.h"
 #include "Emu/system_utils.hpp"
 #include "Emu/Cell/Modules/cellSysutil.h"
-#include "Emu/Io/Keyboard.h"
 
 #include "util/yaml.hpp"
 #include "Utilities/File.h"
@@ -20,6 +19,9 @@ LOG_CHANNEL(cfg_log, "CFG");
 
 extern std::string g_cfg_defaults; //! Default settings grabbed from Utilities/Config.h
 
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
+inline std::string sstr(const QVariant& _in) { return sstr(_in.toString()); }
+
 // Emit sorted YAML
 namespace
 {
@@ -70,6 +72,11 @@ bool emu_settings::Init()
 {
 	m_render_creator = new render_creator(this);
 
+	if (!m_render_creator)
+	{
+		fmt::throw_exception("emu_settings::emu_settings() render_creator is null");
+	}
+
 	if (m_render_creator->abort_requested)
 	{
 		return false;
@@ -78,8 +85,8 @@ bool emu_settings::Init()
 	// Make Vulkan default setting if it is supported
 	if (m_render_creator->Vulkan.supported && !m_render_creator->Vulkan.adapters.empty())
 	{
-		const std::string adapter = ::at32(m_render_creator->Vulkan.adapters, 0).toStdString();
-		cfg_log.notice("Setting the default renderer to Vulkan. Default GPU: '%s'", adapter);
+		const std::string adapter = sstr(m_render_creator->Vulkan.adapters.at(0));
+		cfg_log.notice("Setting the default renderer to Vulkan. Default GPU: '%s')", adapter);
 		Emu.SetDefaultRenderer(video_renderer::vulkan);
 		Emu.SetDefaultGraphicsAdapter(adapter);
 	}
@@ -87,12 +94,12 @@ bool emu_settings::Init()
 	return true;
 }
 
-void emu_settings::LoadSettings(const std::string& title_id, bool create_config_from_global)
+void emu_settings::LoadSettings(const std::string& title_id)
 {
 	m_title_id = title_id;
 
 	// Create config path if necessary
-	fs::create_path(title_id.empty() ? fs::get_config_dir(true) : rpcs3::utils::get_custom_config_dir());
+	fs::create_path(title_id.empty() ? fs::get_config_dir() : rpcs3::utils::get_custom_config_dir());
 
 	// Load default config
 	auto [default_config, default_error] = yaml_load(g_cfg_defaults);
@@ -109,25 +116,21 @@ void emu_settings::LoadSettings(const std::string& title_id, bool create_config_
 			.arg(QString::fromStdString(default_error)), QMessageBox::Ok);
 	}
 
-	if (create_config_from_global)
-	{
-		// Add global config
-		const std::string global_config_path = fs::get_config_dir(true) + "config.yml";
-		fs::g_tls_error = fs::error::ok;
-		fs::file config(global_config_path, fs::read + fs::create);
-		auto [global_config, global_error] = yaml_load(config ? config.to_string() : "");
+	// Add global config
+	const std::string global_config_path = fs::get_config_dir() + "config.yml";
+	fs::file config(global_config_path, fs::read + fs::write + fs::create);
+	auto [global_config, global_error] = yaml_load(config.to_string());
+	config.close();
 
-		if (config && global_error.empty())
-		{
-			m_current_settings += global_config;
-		}
-		else
-		{
-			config.close();
-			cfg_log.fatal("Failed to load global config %s:\n%s (%s)", global_config_path, global_error, fs::g_tls_error);
-			QMessageBox::critical(nullptr, tr("Config Error"), tr("Failed to load global config:\nFile: %0\nError: %1")
-				.arg(QString::fromStdString(global_config_path)).arg(QString::fromStdString(global_error)), QMessageBox::Ok);
-		}
+	if (global_error.empty())
+	{
+		m_current_settings += global_config;
+	}
+	else
+	{
+		cfg_log.fatal("Failed to load global config %s:\n%s", global_config_path, global_error);
+		QMessageBox::critical(nullptr, tr("Config Error"), tr("Failed to load global config:\nFile: %0\nError: %1")
+			.arg(QString::fromStdString(global_config_path)).arg(QString::fromStdString(global_error)), QMessageBox::Ok);
 	}
 
 	// Add game config
@@ -137,16 +140,22 @@ void emu_settings::LoadSettings(const std::string& title_id, bool create_config_
 		// Otherwise we'll always trigger the "obsolete settings dialog" when editing custom configs.
 		ValidateSettings(true);
 
+		const std::string config_path_new = rpcs3::utils::get_custom_config_path(m_title_id);
+		const std::string config_path_old = rpcs3::utils::get_custom_config_path(m_title_id, true);
 		std::string custom_config_path;
 
-		if (std::string config_path = rpcs3::utils::get_custom_config_path(m_title_id); fs::is_file(config_path))
+		if (fs::is_file(config_path_new))
 		{
-			custom_config_path = std::move(config_path);
+			custom_config_path = config_path_new;
+		}
+		else if (fs::is_file(config_path_old))
+		{
+			custom_config_path = config_path_old;
 		}
 
 		if (!custom_config_path.empty())
 		{
-			if (fs::file config{custom_config_path})
+			if ((config = fs::file(custom_config_path, fs::read + fs::write)))
 			{
 				auto [custom_config, custom_error] = yaml_load(config.to_string());
 				config.close();
@@ -162,12 +171,6 @@ void emu_settings::LoadSettings(const std::string& title_id, bool create_config_
 						.arg(QString::fromStdString(custom_config_path)).arg(QString::fromStdString(custom_error)), QMessageBox::Ok);
 				}
 			}
-			else if (fs::g_tls_error != fs::error::noent)
-			{
-				cfg_log.fatal("Failed to load custom config %s (file error: %s)", custom_config_path, fs::g_tls_error);
-					QMessageBox::critical(nullptr, tr("Config Error"), tr("Failed to load custom config:\nFile: %0\nError: %1")
-						.arg(QString::fromStdString(custom_config_path)).arg(QString::fromStdString(fmt::format("%s", fs::g_tls_error))), QMessageBox::Ok);
-			}
 		}
 	}
 }
@@ -188,7 +191,7 @@ bool emu_settings::ValidateSettings(bool cleanup)
 
 		for (const auto& yml_entry : yml_node)
 		{
-			const std::string& key = yml_entry.first.Scalar();
+			const std::string key = yml_entry.first.Scalar();
 			cfg::_base* cfg_node = nullptr;
 
 			keys.resize(next_level);
@@ -208,24 +211,18 @@ bool emu_settings::ValidateSettings(bool cleanup)
 
 			if (cfg_node)
 			{
-				// Ignore every node in Log subsection
-				if (level == 0 && cfg_node->get_name() == "Log")
-				{
-					continue;
-				}
-
 				YAML::Node next_node = yml_node[key];
 				search_level(next_level, next_node, keys, cfg_node);
 			}
 			else
 			{
-				const auto get_full_key = [&keys](const std::string& separator) -> std::string
+				const auto get_full_key = [&keys](const std::string& seperator) -> std::string
 				{
 					std::string full_key;
 					for (usz i = 0; i < keys.size(); i++)
 					{
 						full_key += keys[i];
-						if (i < keys.size() - 1) full_key += separator;
+						if (i < keys.size() - 1) full_key += seperator;
 					}
 					return full_key;
 				};
@@ -252,33 +249,58 @@ bool emu_settings::ValidateSettings(bool cleanup)
 		}
 	};
 
-	std::unique_ptr<cfg_root> root = std::make_unique<cfg_root>();
+	cfg_root root;
 	std::vector<std::string> keys;
 
 	do
 	{
 		is_clean = true;
-		search_level(0, m_current_settings, keys, root.get());
+		search_level(0, m_current_settings, keys, &root);
 	}
 	while (cleanup && !is_clean);
 
 	return is_clean;
 }
 
-void emu_settings::RestoreDefaults()
-{
-	m_current_settings = YAML::Clone(m_default_settings);
-	Q_EMIT RestoreDefaultsSignal();
-}
-
-void emu_settings::SaveSettings() const
+void emu_settings::SaveSettings()
 {
 	YAML::Emitter out;
+	std::string config_name;
+
+	if (m_title_id.empty())
+	{
+		config_name = fs::get_config_dir() + "/config.yml";
+	}
+	else
+	{
+		// VFS paths are being controlled mainly by the main config (needs manual modification for customization of custom configs)
+		m_current_settings.remove("VFS");
+		config_name = rpcs3::utils::get_custom_config_path(m_title_id);
+	}
+
 	emit_data(out, m_current_settings);
-	Emulator::SaveSettings(out.c_str(), m_title_id);
+
+	// Save config atomically
+	fs::pending_file temp(config_name);
+	temp.file.write(out.c_str(), out.size());
+	temp.commit();
+
+	// Check if the running config/title is the same as the edited config/title.
+	if (config_name == g_cfg.name || m_title_id == Emu.GetTitleID())
+	{
+		// Update current config
+		if (!g_cfg.from_string({out.c_str(), out.size()}, !Emu.IsStopped()))
+		{
+			cfg_log.fatal("Failed to update configuration");
+		}
+		else if (!Emu.IsStopped()) // Don't spam the log while emulation is stopped. The config will be logged on boot anyway.
+		{
+			cfg_log.notice("Updated configuration:\n%s\n", g_cfg.to_string());
+		}
+	}
 }
 
-void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type, bool is_ranged, bool use_max, int max, bool sorted, bool strict)
+void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type, bool is_ranged, bool use_max, int max, bool sorted)
 {
 	if (!combobox)
 	{
@@ -293,8 +315,7 @@ void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type,
 			cfg_log.warning("EnhanceCombobox '%s': ignoring sorting request on ranged combo box", cfg_adapter::get_setting_name(type));
 		}
 
-		const QStringList range = GetQStringSettingOptions(type);
-		ensure(!range.empty());
+		const QStringList range = GetSettingOptions(type);
 
 		const int max_item = use_max ? max : range.last().toInt();
 
@@ -305,11 +326,11 @@ void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type,
 	}
 	else
 	{
-		const QStringList settings = GetQStringSettingOptions(type);
+		const QStringList settings = GetSettingOptions(type);
 
 		for (int i = 0; i < settings.count(); i++)
 		{
-			const QString localized_setting = GetLocalizedSetting(settings[i], type, combobox->count(), strict);
+			const QString localized_setting = GetLocalizedSetting(settings[i], type, combobox->count());
 			combobox->addItem(localized_setting, QVariant({settings[i], i}));
 		}
 
@@ -320,20 +341,12 @@ void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type,
 	}
 
 	// Since the QComboBox has localised strings, we can't just findText / findData, so we need to manually iterate through it to find our index
-	const auto find_index = [](QComboBox* combobox, const QString& value)
+	const auto find_index = [&](const QString& value)
 	{
-		if (!combobox)
-		{
-			return -1;
-		}
-
 		for (int i = 0; i < combobox->count(); i++)
 		{
 			const QVariantList var_list = combobox->itemData(i).toList();
-			if (var_list.size() != 2 || !var_list[0].canConvert<QString>())
-			{
-				fmt::throw_exception("Invalid data found in combobox entry %d (text='%s', listsize=%d, itemcount=%d)", i, combobox->itemText(i), var_list.size(), combobox->count());
-			}
+			ensure(var_list.size() == 2 && var_list[0].canConvert<QString>());
 
 			if (value == var_list[0].toString())
 			{
@@ -343,9 +356,8 @@ void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type,
 		return -1;
 	};
 
-	const std::string def      = GetSettingDefault(type);
 	const std::string selected = GetSetting(type);
-	const QString selected_q = QString::fromStdString(selected);
+	const QString selected_q = qstr(selected);
 	int index;
 
 	if (is_ranged)
@@ -354,20 +366,21 @@ void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type,
 	}
 	else
 	{
-		index = find_index(combobox, selected_q);
+		index = find_index(selected_q);
 	}
 
 	if (index == -1)
 	{
+		const std::string def = GetSettingDefault(type);
 		cfg_log.error("EnhanceComboBox '%s' tried to set an invalid value: %s. Setting to default: %s", cfg_adapter::get_setting_name(type), selected, def);
 
 		if (is_ranged)
 		{
-			index = combobox->findData(QString::fromStdString(def));
+			index = combobox->findData(selected_q);
 		}
 		else
 		{
-			index = find_index(combobox, QString::fromStdString(def));
+			index = find_index(qstr(def));
 		}
 
 		m_broken_types.insert(type);
@@ -377,32 +390,15 @@ void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type,
 
 	connect(combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), combobox, [this, is_ranged, combobox, type](int index)
 	{
-		if (index < 0) return;
-
 		if (is_ranged)
 		{
-			SetSetting(type, combobox->itemData(index).toString().toStdString());
+			SetSetting(type, sstr(combobox->itemData(index)));
 		}
 		else
 		{
 			const QVariantList var_list = combobox->itemData(index).toList();
-			if (var_list.size() != 2 || !var_list[0].canConvert<QString>())
-			{
-				fmt::throw_exception("Invalid data found in combobox entry %d (text='%s', listsize=%d, itemcount=%d)", index, combobox->itemText(index), var_list.size(), combobox->count());
-			}
-			SetSetting(type, var_list[0].toString().toStdString());
-		}
-	});
-
-	connect(this, &emu_settings::RestoreDefaultsSignal, combobox, [def, combobox, is_ranged, find_index]()
-	{
-		if (is_ranged)
-		{
-			combobox->setCurrentIndex(combobox->findData(QString::fromStdString(def)));
-		}
-		else
-		{
-			combobox->setCurrentIndex(find_index(combobox, QString::fromStdString(def)));
+			ensure(var_list.size() == 2 && var_list[0].canConvert<QString>());
+			SetSetting(type, sstr(var_list[0]));
 		}
 	});
 }
@@ -438,16 +434,11 @@ void emu_settings::EnhanceCheckBox(QCheckBox* checkbox, emu_settings_type type)
 		m_broken_types.insert(type);
 	}
 
-	connect(checkbox, &QCheckBox::checkStateChanged, this, [type, this](Qt::CheckState val)
+	connect(checkbox, &QCheckBox::stateChanged, [type, this](int val)
 	{
-		const std::string str = val != Qt::Unchecked ? "true" : "false";
+		const std::string str = val != 0 ? "true" : "false";
 		SetSetting(type, str);
 	});
-
-	connect(this, &emu_settings::RestoreDefaultsSignal, checkbox, [def, checkbox]()
-	{
-		checkbox->setChecked(def == "true");
-	});
 }
 
 void emu_settings::EnhanceDateTimeEdit(QDateTimeEdit* date_time_edit, emu_settings_type type, const QString& format, bool use_calendar, bool as_offset_from_now, int offset_update_time)
@@ -466,11 +457,9 @@ void emu_settings::EnhanceDateTimeEdit(QDateTimeEdit* date_time_edit, emu_settin
 		// If using offset from now, then we disable the keyboard tracking to reduce the numebr of events that occur (since for each event we will lose focus)
 		date_time_edit->setKeyboardTracking(false);
 
-		const QStringList range = GetQStringSettingOptions(type);
-		ensure(!range.empty());
-
 		bool ok_def = false, ok_min = false, ok_max = false;
-		const s64 def = QString::fromStdString(GetSettingDefault(type)).toLongLong(&ok_def);
+		const QStringList range = GetSettingOptions(type);
+		const s64 def = qstr(GetSettingDefault(type)).toLongLong(&ok_def);
 		const s64 min = range.first().toLongLong(&ok_min);
 		const s64 max = range.last().toLongLong(&ok_max);
 		if (!ok_def || !ok_min || !ok_max)
@@ -480,7 +469,7 @@ void emu_settings::EnhanceDateTimeEdit(QDateTimeEdit* date_time_edit, emu_settin
 		}
 
 		bool ok_sel = false;
-		s64 val = QString::fromStdString(GetSetting(type)).toLongLong(&ok_sel);
+		s64 val = qstr(GetSetting(type)).toLongLong(&ok_sel);
 		if (!ok_sel || val < min || val > max)
 		{
 			cfg_log.error("EnhanceDateTimeEdit '%s' tried to set an invalid value: %d. Setting to default: %d. Allowed range: [%d, %d]", cfg_adapter::get_setting_name(type), val, def, min, max);
@@ -503,12 +492,12 @@ void emu_settings::EnhanceDateTimeEdit(QDateTimeEdit* date_time_edit, emu_settin
 		if (offset_update_time > 0)
 		{
 			QTimer* console_time_update = new QTimer(date_time_edit);
-			connect(console_time_update, &QTimer::timeout, date_time_edit, [this, date_time_edit, min, max]()
+			connect(console_time_update, &QTimer::timeout, [this, date_time_edit, min, max]()
 			{
 				if (!date_time_edit->hasFocus() && (!date_time_edit->calendarPopup() || !date_time_edit->calendarWidget()->hasFocus()))
 				{
-					const QDateTime now = QDateTime::currentDateTime();
-					const s64 offset = QString::fromStdString(GetSetting(emu_settings_type::ConsoleTimeOffset)).toLongLong();
+					const auto now   = QDateTime::currentDateTime();
+					const s64 offset = qstr(GetSetting(emu_settings_type::ConsoleTimeOffset)).toLongLong();
 					date_time_edit->setDateTime(now.addSecs(offset));
 					date_time_edit->setDateTimeRange(now.addSecs(min), now.addSecs(max));
 				}
@@ -516,36 +505,30 @@ void emu_settings::EnhanceDateTimeEdit(QDateTimeEdit* date_time_edit, emu_settin
 
 			console_time_update->start(offset_update_time);
 		}
-
-		connect(this, &emu_settings::RestoreDefaultsSignal, date_time_edit, [def, date_time_edit]()
-		{
-			date_time_edit->setDateTime(QDateTime::currentDateTime().addSecs(def));
-		});
 	}
 	else
 	{
-		const QStringList range = GetQStringSettingOptions(type);
-		ensure(!range.empty());
-
-		QString str             = QString::fromStdString(GetSettingDefault(type));
-		const QDateTime def     = QDateTime::fromString(str, Qt::ISODate);
-		const QDateTime min     = QDateTime::fromString(range.first(), Qt::ISODate);
-		const QDateTime max     = QDateTime::fromString(range.last(), Qt::ISODate);
+		auto str                = qstr(GetSettingDefault(type));
+		const QStringList range = GetSettingOptions(type);
+		const auto def          = QDateTime::fromString(str, Qt::ISODate);
+		const auto min          = QDateTime::fromString(range.first(), Qt::ISODate);
+		const auto max          = QDateTime::fromString(range.last(), Qt::ISODate);
 		if (!def.isValid() || !min.isValid() || !max.isValid())
 		{
 			cfg_log.fatal("EnhanceDateTimeEdit '%s' was used with an invalid emu_settings_type", cfg_adapter::get_setting_name(type));
 			return;
 		}
 
-		str = QString::fromStdString(GetSetting(type));
-		QDateTime val = QDateTime::fromString(str, Qt::ISODate);
+		str = qstr(GetSetting(type));
+		auto val = QDateTime::fromString(str, Qt::ISODate);
 		if (!val.isValid() || val < min || val > max)
 		{
 			cfg_log.error("EnhanceDateTimeEdit '%s' tried to set an invalid value: %s. Setting to default: %s Allowed range: [%s, %s]",
-				cfg_adapter::get_setting_name(type), val.toString(Qt::ISODate), def.toString(Qt::ISODate), min.toString(Qt::ISODate), max.toString(Qt::ISODate));
+				cfg_adapter::get_setting_name(type), val.toString(Qt::ISODate).toStdString(), def.toString(Qt::ISODate).toStdString(),
+				min.toString(Qt::ISODate).toStdString(), max.toString(Qt::ISODate).toStdString());
 			val = def;
 			m_broken_types.insert(type);
-			SetSetting(type, def.toString(Qt::ISODate).toStdString());
+			SetSetting(type, sstr(def.toString(Qt::ISODate)));
 		}
 
 		// we set the allowed limits
@@ -553,14 +536,9 @@ void emu_settings::EnhanceDateTimeEdit(QDateTimeEdit* date_time_edit, emu_settin
 
 		// set the date_time value to the control
 		date_time_edit->setDateTime(val);
-
-		connect(this, &emu_settings::RestoreDefaultsSignal, date_time_edit, [def, date_time_edit]()
-		{
-			date_time_edit->setDateTime(def);
-		});
 	}
 
-	connect(date_time_edit, &QDateTimeEdit::dateTimeChanged, this, [date_time_edit, type, as_offset_from_now, this](const QDateTime& datetime)
+	connect(date_time_edit, &QDateTimeEdit::dateTimeChanged, [date_time_edit, type, as_offset_from_now, this](const QDateTime& datetime)
 	{
 		if (as_offset_from_now)
 		{
@@ -570,15 +548,12 @@ void emu_settings::EnhanceDateTimeEdit(QDateTimeEdit* date_time_edit, emu_settin
 
 			// HACK: We are only looking at whether the control has focus to prevent the time from updating dynamically, so we
 			// clear the focus, so that this dynamic updating isn't suppressed.
-			if (date_time_edit)
-			{
-				date_time_edit->clearFocus();
-			}
+			date_time_edit->clearFocus();
 		}
 		else
 		{
 			// date time will be written straight into settings
-			SetSetting(type, datetime.toString(Qt::ISODate).toStdString());
+			SetSetting(type, sstr(datetime.toString(Qt::ISODate)));
 		}
 	});
 }
@@ -591,12 +566,10 @@ void emu_settings::EnhanceSlider(QSlider* slider, emu_settings_type type)
 		return;
 	}
 
-	const QStringList range = GetQStringSettingOptions(type);
-	ensure(!range.empty());
-
+	const QStringList range = GetSettingOptions(type);
 	bool ok_def, ok_sel, ok_min, ok_max;
 
-	const int def = QString::fromStdString(GetSettingDefault(type)).toInt(&ok_def);
+	const int def = qstr(GetSettingDefault(type)).toInt(&ok_def);
 	const int min = range.first().toInt(&ok_min);
 	const int max = range.last().toInt(&ok_max);
 
@@ -606,7 +579,7 @@ void emu_settings::EnhanceSlider(QSlider* slider, emu_settings_type type)
 		return;
 	}
 
-	const QString selected = QString::fromStdString(GetSetting(type));
+	const QString selected = qstr(GetSetting(type));
 	int val = selected.toInt(&ok_sel);
 
 	if (!ok_sel || val < min || val > max)
@@ -619,14 +592,9 @@ void emu_settings::EnhanceSlider(QSlider* slider, emu_settings_type type)
 	slider->setRange(min, max);
 	slider->setValue(val);
 
-	connect(slider, &QSlider::valueChanged, this, [type, this](int value)
+	connect(slider, &QSlider::valueChanged, [type, this](int value)
 	{
-		SetSetting(type, QString::number(value).toStdString());
-	});
-
-	connect(this, &emu_settings::RestoreDefaultsSignal, slider, [def, slider]()
-	{
-		slider->setValue(def);
+		SetSetting(type, sstr(value));
 	});
 }
 
@@ -638,12 +606,10 @@ void emu_settings::EnhanceSpinBox(QSpinBox* spinbox, emu_settings_type type, con
 		return;
 	}
 
-	const QStringList range = GetQStringSettingOptions(type);
-	ensure(!range.empty());
-
+	const QStringList range = GetSettingOptions(type);
 	bool ok_def, ok_sel, ok_min, ok_max;
 
-	const int def = QString::fromStdString(GetSettingDefault(type)).toInt(&ok_def);
+	const int def = qstr(GetSettingDefault(type)).toInt(&ok_def);
 	const int min = range.first().toInt(&ok_min);
 	const int max = range.last().toInt(&ok_max);
 
@@ -654,7 +620,7 @@ void emu_settings::EnhanceSpinBox(QSpinBox* spinbox, emu_settings_type type, con
 	}
 
 	const std::string selected = GetSetting(type);
-	int val = QString::fromStdString(selected).toInt(&ok_sel);
+	int val = qstr(selected).toInt(&ok_sel);
 
 	if (!ok_sel || val < min || val > max)
 	{
@@ -668,15 +634,9 @@ void emu_settings::EnhanceSpinBox(QSpinBox* spinbox, emu_settings_type type, con
 	spinbox->setRange(min, max);
 	spinbox->setValue(val);
 
-	connect(spinbox, &QSpinBox::textChanged, this, [type, spinbox, this](const QString& /* text*/)
+	connect(spinbox, &QSpinBox::textChanged, [=, this](const QString&/* text*/)
 	{
-		if (!spinbox) return;
-		SetSetting(type, spinbox->cleanText().toStdString());
-	});
-
-	connect(this, &emu_settings::RestoreDefaultsSignal, spinbox, [def, spinbox]()
-	{
-		spinbox->setValue(def);
+		SetSetting(type, sstr(spinbox->cleanText()));
 	});
 }
 
@@ -688,30 +648,22 @@ void emu_settings::EnhanceDoubleSpinBox(QDoubleSpinBox* spinbox, emu_settings_ty
 		return;
 	}
 
-	const std::vector<std::string> range = GetSettingOptions(type);
-	ensure(!range.empty());
+	const QStringList range = GetSettingOptions(type);
+	bool ok_def, ok_sel, ok_min, ok_max;
 
-	const std::string def_s = GetSettingDefault(type);
-	const std::string val_s = GetSetting(type);
-	const std::string& min_s = range.front();
-	const std::string& max_s = range.back();
-
-	// cfg::_float range is in s32
-	constexpr s32 min_value = ::std::numeric_limits<s32>::min();
-	constexpr s32 max_value = ::std::numeric_limits<s32>::max();
-
-	f64 val, def, min, max;
-	const bool ok_sel = try_to_float(&val, val_s, min_value, max_value);
-	const bool ok_def = try_to_float(&def, def_s, min_value, max_value);
-	const bool ok_min = try_to_float(&min, min_s, min_value, max_value);
-	const bool ok_max = try_to_float(&max, max_s, min_value, max_value);
+	const double def = qstr(GetSettingDefault(type)).toDouble(&ok_def);
+	const double min = range.first().toDouble(&ok_min);
+	const double max = range.last().toDouble(&ok_max);
 
 	if (!ok_def || !ok_min || !ok_max)
 	{
-		cfg_log.fatal("EnhanceDoubleSpinBox '%s' was used with an invalid type. (val='%s', def='%s', min_s='%s', max_s='%s')", cfg_adapter::get_setting_name(type), val_s, def_s, min_s, max_s);
+		cfg_log.fatal("EnhanceDoubleSpinBox '%s' was used with an invalid type", cfg_adapter::get_setting_name(type));
 		return;
 	}
 
+	const std::string selected = GetSetting(type);
+	double val = qstr(selected).toDouble(&ok_sel);
+
 	if (!ok_sel || val < min || val > max)
 	{
 		cfg_log.error("EnhanceDoubleSpinBox '%s' tried to set an invalid value: %f. Setting to default: %f. Allowed range: [%f, %f]", cfg_adapter::get_setting_name(type), val, def, min, max);
@@ -724,15 +676,9 @@ void emu_settings::EnhanceDoubleSpinBox(QDoubleSpinBox* spinbox, emu_settings_ty
 	spinbox->setRange(min, max);
 	spinbox->setValue(val);
 
-	connect(spinbox, &QDoubleSpinBox::textChanged, this, [type, spinbox, this](const QString& /* text*/)
+	connect(spinbox, &QDoubleSpinBox::textChanged, [=, this](const QString&/* text*/)
 	{
-		if (!spinbox) return;
-		SetSetting(type, spinbox->cleanText().toStdString());
-	});
-
-	connect(this, &emu_settings::RestoreDefaultsSignal, spinbox, [def, spinbox]()
-	{
-		spinbox->setValue(def);
+		SetSetting(type, sstr(spinbox->cleanText()));
 	});
 }
 
@@ -745,21 +691,11 @@ void emu_settings::EnhanceLineEdit(QLineEdit* edit, emu_settings_type type)
 	}
 
 	const std::string set_text = GetSetting(type);
-	edit->setText(QString::fromStdString(set_text));
+	edit->setText(qstr(set_text));
 
-	connect(edit, &QLineEdit::textChanged, this, [type, this](const QString &text)
+	connect(edit, &QLineEdit::textChanged, [type, this](const QString &text)
 	{
-		const QString trimmed = text.trimmed();
-		if (trimmed.size() != text.size())
-		{
-			cfg_log.warning("EnhanceLineEdit '%s' input was trimmed", cfg_adapter::get_setting_name(type));
-		}
-		SetSetting(type, trimmed.toStdString());
-	});
-
-	connect(this, &emu_settings::RestoreDefaultsSignal, edit, [this, edit, type]()
-	{
-		edit->setText(QString::fromStdString(GetSettingDefault(type)));
+		SetSetting(type, sstr(text));
 	});
 }
 
@@ -771,9 +707,9 @@ void emu_settings::EnhanceRadioButton(QButtonGroup* button_group, emu_settings_t
 		return;
 	}
 
-	const QString selected    = QString::fromStdString(GetSetting(type));
-	const QString def         = QString::fromStdString(GetSettingDefault(type));
-	const QStringList options = GetQStringSettingOptions(type);
+	const QString selected    = qstr(GetSetting(type));
+	const QString def         = qstr(GetSettingDefault(type));
+	const QStringList options = GetSettingOptions(type);
 
 	if (button_group->buttons().count() < options.size())
 	{
@@ -786,29 +722,23 @@ void emu_settings::EnhanceRadioButton(QButtonGroup* button_group, emu_settings_t
 
 	for (int i = 0; i < options.count(); i++)
 	{
-		const QString& option = options[i];
-		const QString localized_setting = GetLocalizedSetting(option, type, i, true);
+		const QString localized_setting = GetLocalizedSetting(options[i], type, i);
 
-		QAbstractButton* button = button_group->button(i);
-		button->setText(localized_setting);
+		button_group->button(i)->setText(localized_setting);
 
-		if (!found && option == selected)
+		if (!found && options[i] == selected)
 		{
 			found = true;
-			button->setChecked(true);
+			button_group->button(i)->setChecked(true);
 		}
-
-		if (def_pos == -1 && option == def)
+		else if (def_pos == -1 && options[i] == def)
 		{
 			def_pos = i;
 		}
 
-		connect(button, &QAbstractButton::toggled, this, [this, type, val = option.toStdString()](bool checked)
+		connect(button_group->button(i), &QAbstractButton::clicked, [=, this]()
 		{
-			if (checked)
-			{
-				SetSetting(type, val);
-			}
+			SetSetting(type, sstr(options[i]));
 		});
 	}
 
@@ -816,20 +746,12 @@ void emu_settings::EnhanceRadioButton(QButtonGroup* button_group, emu_settings_t
 	{
 		ensure(def_pos >= 0);
 
-		cfg_log.error("EnhanceRadioButton '%s' tried to set an invalid value: %s. Setting to default: %s.", cfg_adapter::get_setting_name(type), selected, def);
+		cfg_log.error("EnhanceRadioButton '%s' tried to set an invalid value: %s. Setting to default: %s.", cfg_adapter::get_setting_name(type), sstr(selected), sstr(def));
 		m_broken_types.insert(type);
 
 		// Select the default option on invalid setting string
 		button_group->button(def_pos)->setChecked(true);
 	}
-
-	connect(this, &emu_settings::RestoreDefaultsSignal, button_group, [button_group, def_pos]()
-	{
-		if (button_group && button_group->button(def_pos))
-		{
-			button_group->button(def_pos)->setChecked(true);
-		}
-	});
 }
 
 std::vector<std::string> emu_settings::GetLibrariesControl()
@@ -842,24 +764,14 @@ void emu_settings::SaveSelectedLibraries(const std::vector<std::string>& libs)
 	m_current_settings["Core"]["Libraries Control"] = libs;
 }
 
-std::vector<std::string> emu_settings::GetSettingOptions(emu_settings_type type)
+QStringList emu_settings::GetSettingOptions(emu_settings_type type)
 {
-	return cfg_adapter::get_options(::at32(settings_location, type));
-}
-
-QStringList emu_settings::GetQStringSettingOptions(emu_settings_type type)
-{
-	QStringList values;
-	for (const std::string& value : cfg_adapter::get_options(::at32(settings_location, type)))
-	{
-		values.append(QString::fromStdString(value));
-	}
-	return values;
+	return cfg_adapter::get_options(const_cast<cfg_location&&>(settings_location[type]));
 }
 
 std::string emu_settings::GetSettingDefault(emu_settings_type type) const
 {
-	if (const auto node = cfg_adapter::get_node(m_default_settings, ::at32(settings_location, type)); node && node.IsScalar())
+	if (const auto node = cfg_adapter::get_node(m_default_settings, settings_location[type]); node && node.IsScalar())
 	{
 		return node.Scalar();
 	}
@@ -870,7 +782,7 @@ std::string emu_settings::GetSettingDefault(emu_settings_type type) const
 
 std::string emu_settings::GetSetting(emu_settings_type type) const
 {
-	if (const auto node = cfg_adapter::get_node(m_current_settings, ::at32(settings_location, type)); node && node.IsScalar())
+	if (const auto node = cfg_adapter::get_node(m_current_settings, settings_location[type]); node && node.IsScalar())
 	{
 		return node.Scalar();
 	}
@@ -881,65 +793,7 @@ std::string emu_settings::GetSetting(emu_settings_type type) const
 
 void emu_settings::SetSetting(emu_settings_type type, const std::string& val) const
 {
-	cfg_adapter::get_node(m_current_settings, ::at32(settings_location, type)) = val;
-}
-
-emu_settings_type emu_settings::FindSettingsType(const cfg::_base* node) const
-{
-	// Add key and value to static map on first use
-	static std::map<u32, emu_settings_type> id_to_type;
-	static std::mutex mtx;
-	std::lock_guard lock(mtx);
-
-	if (!node) [[unlikely]]
-	{
-		// Provoke error. Don't use ensure or we will get a nullptr deref warning in VS
-		return ::at32(id_to_type, umax);
-	}
-
-	std::vector<std::string> node_location;
-	if (!id_to_type.contains(node->get_id()))
-	{
-		for (const cfg::_base* n = node; n; n = n->get_parent())
-		{
-			if (!n->get_name().empty())
-			{
-				node_location.push_back(n->get_name());
-			}
-		}
-
-		std::reverse(node_location.begin(), node_location.end());
-
-		for (const auto& [type, loc]: settings_location)
-		{
-			if (node_location.size() != loc.size())
-			{
-				continue;
-			}
-
-			bool is_match = true;
-			for (usz i = 0; i < node_location.size(); i++)
-			{
-				if (node_location[i] != loc[i])
-				{
-					is_match = false;
-					break;
-				}
-			}
-
-			if (is_match && !id_to_type.try_emplace(node->get_id(), type).second)
-			{
-				cfg_log.error("'%s' already exists", loc.back());
-			}
-		}
-	}
-
-	if (!id_to_type.contains(node->get_id()))
-	{
-		fmt::throw_exception("Node '%s' not represented in emu_settings_type", node->get_name());
-	}
-
-	return ::at32(id_to_type, node->get_id());
+	cfg_adapter::get_node(m_current_settings, settings_location[type]) = val;
 }
 
 void emu_settings::OpenCorrectionDialog(QWidget* parent)
@@ -968,7 +822,7 @@ void emu_settings::OpenCorrectionDialog(QWidget* parent)
 	}
 }
 
-QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_type type, int index, bool strict) const
+QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_type type, int index) const
 {
 	switch (type)
 	{
@@ -1013,34 +867,15 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_
 		case shader_mode::interpreter_only: return tr("Shader Interpreter only", "Shader Mode");
 		}
 		break;
-	case emu_settings_type::Resolution:
-		switch (static_cast<video_resolution>(index))
-		{
-		case video_resolution::_1080p: return tr("1080p", "Resolution");
-		case video_resolution::_1080i: return tr("1080i", "Resolution");
-		case video_resolution::_720p: return tr("720p", "Resolution");
-		case video_resolution::_480p: return tr("480p", "Resolution");
-		case video_resolution::_480i: return tr("480i", "Resolution");
-		case video_resolution::_576p: return tr("576p", "Resolution");
-		case video_resolution::_576i: return tr("576i", "Resolution");
-		case video_resolution::_1600x1080p: return tr("1600x1080p", "Resolution");
-		case video_resolution::_1440x1080p: return tr("1440x1080p", "Resolution");
-		case video_resolution::_1280x1080p: return tr("1280x1080p", "Resolution");
-		case video_resolution::_960x1080p: return tr("960x1080p", "Resolution");
-		}
-		break;
 	case emu_settings_type::FrameLimit:
 		switch (static_cast<frame_limit_type>(index))
 		{
 		case frame_limit_type::none: return tr("Off", "Frame limit");
-		case frame_limit_type::_30: return tr("30", "Frame limit");
+		case frame_limit_type::_59_94: return tr("59.94", "Frame limit");
 		case frame_limit_type::_50: return tr("50", "Frame limit");
 		case frame_limit_type::_60: return tr("60", "Frame limit");
-		case frame_limit_type::_120: return tr("120", "Frame limit");
-		case frame_limit_type::display_rate: return tr("Display", "Frame limit");
+		case frame_limit_type::_30: return tr("30", "Frame limit");
 		case frame_limit_type::_auto: return tr("Auto", "Frame limit");
-		case frame_limit_type::_ps3: return tr("PS3 Native", "Frame limit");
-		case frame_limit_type::infinite: return tr("Infinite", "Frame limit");
 		}
 		break;
 	case emu_settings_type::MSAA:
@@ -1050,23 +885,6 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_
 		case msaa_level::_auto: return tr("Auto", "MSAA");
 		}
 		break;
-	case emu_settings_type::ShaderPrecisionQuality:
-		switch (static_cast<gpu_preset_level>(index))
-		{
-		case gpu_preset_level::_auto: return tr("Auto", "Shader Precision");
-		case gpu_preset_level::ultra: return tr("Ultra", "Shader Precision");
-		case gpu_preset_level::high: return tr("High", "Shader Precision");
-		case gpu_preset_level::low: return tr("Low", "Shader Precision");
-		}
-		break;
-	case emu_settings_type::OutputScalingMode:
-		switch (static_cast<output_scaling_mode>(index))
-		{
-		case output_scaling_mode::nearest: return tr("Nearest", "Output Scaling Mode");
-		case output_scaling_mode::bilinear: return tr("Bilinear", "Output Scaling Mode");
-		case output_scaling_mode::fsr: return tr("FidelityFX Super Resolution 1", "Output Scaling Mode");
-		}
-		break;
 	case emu_settings_type::AudioRenderer:
 		switch (static_cast<audio_renderer>(index))
 		{
@@ -1074,7 +892,13 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_
 #ifdef _WIN32
 		case audio_renderer::xaudio: return tr("XAudio2", "Audio renderer");
 #endif
-		case audio_renderer::cubeb: return tr("Cubeb", "Audio renderer");
+#ifdef HAVE_ALSA
+		case audio_renderer::alsa: return tr("ALSA", "Audio renderer");
+#endif
+#ifdef HAVE_PULSE
+		case audio_renderer::pulse: return tr("PulseAudio", "Audio renderer");
+#endif
+		case audio_renderer::openal: return tr("OpenAL", "Audio renderer");
 #ifdef HAVE_FAUDIO
 		case audio_renderer::faudio: return tr("FAudio", "Audio renderer");
 #endif
@@ -1102,7 +926,6 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_
 		{
 		case mouse_handler::null: return tr("Null", "Mouse handler");
 		case mouse_handler::basic: return tr("Basic", "Mouse handler");
-		case mouse_handler::raw: return tr("Raw", "Mouse handler");
 		}
 		break;
 	case emu_settings_type::CameraType:
@@ -1114,48 +937,19 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_
 		case fake_camera_type::uvc1_1: return tr("UVC 1.1", "Camera type");
 		}
 		break;
-	case emu_settings_type::CameraFlip:
-		switch (static_cast<camera_flip>(index))
-		{
-		case camera_flip::none: return tr("No", "Camera flip");
-		case camera_flip::horizontal: return tr("Flip horizontally", "Camera flip");
-		case camera_flip::vertical: return tr("Flip vertically", "Camera flip");
-		case camera_flip::both: return tr("Flip both axes", "Camera flip");
-		}
-		break;
 	case emu_settings_type::Camera:
 		switch (static_cast<camera_handler>(index))
 		{
 		case camera_handler::null: return tr("Null", "Camera handler");
 		case camera_handler::fake: return tr("Fake", "Camera handler");
-		case camera_handler::qt: return tr("Qt", "Camera handler");
-		}
-		break;
-	case emu_settings_type::MusicHandler:
-		switch (static_cast<music_handler>(index))
-		{
-		case music_handler::null: return tr("Null", "Music handler");
-		case music_handler::qt: return tr("Qt", "Music handler");
-		}
-		break;
-	case emu_settings_type::PadHandlerMode:
-		switch (static_cast<pad_handler_mode>(index))
-		{
-		case pad_handler_mode::single_threaded: return tr("Single-threaded", "Pad handler mode");
-		case pad_handler_mode::multi_threaded: return tr("Multi-threaded", "Pad handler mode");
 		}
 		break;
 	case emu_settings_type::Move:
 		switch (static_cast<move_handler>(index))
 		{
 		case move_handler::null: return tr("Null", "Move handler");
-		case move_handler::real: return tr("Real", "Move handler");
 		case move_handler::fake: return tr("Fake", "Move handler");
 		case move_handler::mouse: return tr("Mouse", "Move handler");
-		case move_handler::raw_mouse: return tr("Raw Mouse", "Move handler");
-#ifdef HAVE_LIBEVDEV
-		case move_handler::gun: return tr("Gun", "Gun handler");
-#endif
 		}
 		break;
 	case emu_settings_type::Buzz:
@@ -1166,22 +960,6 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_
 		case buzz_handler::two_controllers: return tr("2 controllers (5-7 players)", "Buzz handler");
 		}
 		break;
-	case emu_settings_type::Turntable:
-		switch (static_cast<turntable_handler>(index))
-		{
-		case turntable_handler::null: return tr("Null", "Turntable handler");
-		case turntable_handler::one_controller: return tr("1 controller", "Turntable handler");
-		case turntable_handler::two_controllers: return tr("2 controllers", "Turntable handler");
-		}
-		break;
-	case emu_settings_type::GHLtar:
-		switch (static_cast<ghltar_handler>(index))
-		{
-		case ghltar_handler::null: return tr("Null", "GHLtar handler");
-		case ghltar_handler::one_controller: return tr("1 controller", "GHLtar handler");
-		case ghltar_handler::two_controllers: return tr("2 controllers", "GHLtar handler");
-		}
-		break;
 	case emu_settings_type::InternetStatus:
 		switch (static_cast<np_internet_status>(index))
 		{
@@ -1193,8 +971,8 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_
 		switch (static_cast<np_psn_status>(index))
 		{
 		case np_psn_status::disabled: return tr("Disconnected", "PSN Status");
-		case np_psn_status::psn_fake: return tr("Simulated", "PSN Status");
-		case np_psn_status::psn_rpcn: return tr("RPCN", "PSN Status");
+		case np_psn_status::fake: return tr("Simulated", "PSN Status");
+		case np_psn_status::rpcn: return tr("RPCN", "PSN Status");
 		}
 		break;
 	case emu_settings_type::SleepTimersAccuracy:
@@ -1205,15 +983,6 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_
 		case sleep_timers_accuracy_level::_all_timers: return tr("All Timers", "Sleep timers accuracy");
 		}
 		break;
-	case emu_settings_type::FIFOAccuracy:
-		switch (static_cast<rsx_fifo_mode>(index))
-		{
-		case rsx_fifo_mode::fast: return tr("Fast", "RSX FIFO Accuracy");
-		case rsx_fifo_mode::atomic: return tr("Atomic", "RSX FIFO Accuracy");
-		case rsx_fifo_mode::atomic_ordered: return tr("Ordered & Atomic", "RSX FIFO Accuracy");
-		case rsx_fifo_mode::as_ps3: return tr("PS3", "RSX FIFO Accuracy");
-		}
-		break;
 	case emu_settings_type::PerfOverlayDetailLevel:
 		switch (static_cast<detail_level>(index))
 		{
@@ -1224,16 +993,6 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_
 		case detail_level::high: return tr("High", "Detail Level");
 		}
 		break;
-	case emu_settings_type::PerfOverlayFramerateDetailLevel:
-	case emu_settings_type::PerfOverlayFrametimeDetailLevel:
-		switch (static_cast<perf_graph_detail_level>(index))
-		{
-		case perf_graph_detail_level::minimal: return tr("Minimal", "Perf Graph Detail Level");
-		case perf_graph_detail_level::show_min_max: return tr("Show Min And Max", "Perf Graph Detail Level");
-		case perf_graph_detail_level::show_one_percent_avg: return tr("Show 1% Low And Average", "Perf Graph Detail Level");
-		case perf_graph_detail_level::show_all: return tr("Show All", "Perf Graph Detail Level");
-		}
-		break;
 	case emu_settings_type::PerfOverlayPosition:
 		switch (static_cast<screen_quadrant>(index))
 		{
@@ -1246,15 +1005,16 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_
 	case emu_settings_type::PPUDecoder:
 		switch (static_cast<ppu_decoder_type>(index))
 		{
-		case ppu_decoder_type::_static: return tr("Interpreter (static)", "PPU decoder");
+		case ppu_decoder_type::precise: return tr("Interpreter (precise)", "PPU decoder");
+		case ppu_decoder_type::fast: return tr("Interpreter (fast)", "PPU decoder");
 		case ppu_decoder_type::llvm: return tr("Recompiler (LLVM)", "PPU decoder");
 		}
 		break;
 	case emu_settings_type::SPUDecoder:
 		switch (static_cast<spu_decoder_type>(index))
 		{
-		case spu_decoder_type::_static: return tr("Interpreter (static)", "SPU decoder");
-		case spu_decoder_type::dynamic: return tr("Interpreter (dynamic)", "SPU decoder");
+		case spu_decoder_type::precise: return tr("Interpreter (precise)", "SPU decoder");
+		case spu_decoder_type::fast: return tr("Interpreter (fast)", "SPU decoder");
 		case spu_decoder_type::asmjit: return tr("Recompiler (ASMJIT)", "SPU decoder");
 		case spu_decoder_type::llvm: return tr("Recompiler (LLVM)", "SPU decoder");
 		}
@@ -1266,55 +1026,13 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_
 		case enter_button_assign::cross: return tr("Enter with cross", "Enter button assignment");
 		}
 		break;
-	case emu_settings_type::AudioFormat:
-		switch (static_cast<audio_format>(index))
+	case emu_settings_type::AudioChannels:
+		switch (static_cast<audio_downmix>(index))
 		{
-		case audio_format::stereo: return tr("Stereo", "Audio format");
-		case audio_format::surround_5_1: return tr("Surround 5.1", "Audio format");
-		case audio_format::surround_7_1: return tr("Surround 7.1", "Audio format");
-		case audio_format::manual: return tr("Manual", "Audio format");
-		case audio_format::automatic: return tr("Automatic", "Audio format");
-		}
-		break;
-	case emu_settings_type::AudioFormats:
-		switch (static_cast<audio_format_flag>(index))
-		{
-		case audio_format_flag::lpcm_2_48khz: return tr("Linear PCM 2 Ch. 48 kHz", "Audio format flag");
-		case audio_format_flag::lpcm_5_1_48khz: return tr("Linear PCM 5.1 Ch. 48 kHz", "Audio format flag");
-		case audio_format_flag::lpcm_7_1_48khz: return tr("Linear PCM 7.1 Ch. 48 kHz", "Audio format flag");
-		case audio_format_flag::ac3: return tr("Dolby Digital 5.1 Ch.", "Audio format flag");
-		case audio_format_flag::dts: return tr("DTS 5.1 Ch.", "Audio format flag");
-		}
-		break;
-	case emu_settings_type::AudioProvider:
-		switch (static_cast<audio_provider>(index))
-		{
-		case audio_provider::none: return tr("None", "Audio Provider");
-		case audio_provider::cell_audio: return tr("CellAudio", "Audio Provider");
-		case audio_provider::rsxaudio: return tr("RSXAudio", "Audio Provider");
-		}
-		break;
-	case emu_settings_type::AudioAvport:
-		switch (static_cast<audio_avport>(index))
-		{
-		case audio_avport::hdmi_0: return tr("HDMI 0", "Audio Avport");
-		case audio_avport::hdmi_1: return tr("HDMI 1", "Audio Avport");
-		case audio_avport::avmulti: return tr("AV multiout", "Audio Avport");
-		case audio_avport::spdif_0: return tr("SPDIF 0", "Audio Avport");
-		case audio_avport::spdif_1: return tr("SPDIF 1", "Audio Avport");
-		}
-		break;
-	case emu_settings_type::AudioChannelLayout:
-		switch (static_cast<audio_channel_layout>(index))
-		{
-		case audio_channel_layout::automatic:        return tr("Auto", "Audio Channel Layout");
-		case audio_channel_layout::mono:             return tr("Mono", "Audio Channel Layout");
-		case audio_channel_layout::stereo:           return tr("Stereo", "Audio Channel Layout");
-		case audio_channel_layout::stereo_lfe:       return tr("Stereo LFE", "Audio Channel Layout");
-		case audio_channel_layout::quadraphonic:     return tr("Quadraphonic", "Audio Channel Layout");
-		case audio_channel_layout::quadraphonic_lfe: return tr("Quadraphonic LFE", "Audio Channel Layout");
-		case audio_channel_layout::surround_5_1:     return tr("Surround 5.1", "Audio Channel Layout");
-		case audio_channel_layout::surround_7_1:     return tr("Surround 7.1", "Audio Channel Layout");
+		case audio_downmix::no_downmix: return tr("Surround 7.1", "Audio downmix");
+		case audio_downmix::downmix_to_stereo: return tr("Downmix to Stereo", "Audio downmix");
+		case audio_downmix::downmix_to_5_1: return tr("Downmix to 5.1", "Audio downmix");
+		case audio_downmix::use_application_settings: return tr("Use application settings", "Audio downmix");
 		}
 		break;
 	case emu_settings_type::LicenseArea:
@@ -1329,140 +1047,9 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_
 		case CellSysutilLicenseArea::CELL_SYSUTIL_LICENSE_AREA_OTHER: return tr("Other", "License Area");
 		}
 		break;
-	case emu_settings_type::VulkanAsyncSchedulerDriver:
-		switch (static_cast<vk_gpu_scheduler_mode>(index))
-		{
-		case vk_gpu_scheduler_mode::safe: return tr("Safe", "Asynchronous Queue Scheduler");
-		case vk_gpu_scheduler_mode::fast: return tr("Fast", "Asynchronous Queue Scheduler");
-		}
-		break;
-	case emu_settings_type::Language:
-		switch (static_cast<CellSysutilLang>(index))
-		{
-		case CELL_SYSUTIL_LANG_JAPANESE: return tr("Japanese", "System Language");
-		case CELL_SYSUTIL_LANG_ENGLISH_US: return tr("English (US)", "System Language");
-		case CELL_SYSUTIL_LANG_FRENCH: return tr("French", "System Language");
-		case CELL_SYSUTIL_LANG_SPANISH: return tr("Spanish", "System Language");
-		case CELL_SYSUTIL_LANG_GERMAN: return tr("German", "System Language");
-		case CELL_SYSUTIL_LANG_ITALIAN: return tr("Italian", "System Language");
-		case CELL_SYSUTIL_LANG_DUTCH: return tr("Dutch", "System Language");
-		case CELL_SYSUTIL_LANG_PORTUGUESE_PT: return tr("Portuguese (Portugal)", "System Language");
-		case CELL_SYSUTIL_LANG_RUSSIAN: return tr("Russian", "System Language");
-		case CELL_SYSUTIL_LANG_KOREAN: return tr("Korean", "System Language");
-		case CELL_SYSUTIL_LANG_CHINESE_T: return tr("Chinese (Traditional)", "System Language");
-		case CELL_SYSUTIL_LANG_CHINESE_S: return tr("Chinese (Simplified)", "System Language");
-		case CELL_SYSUTIL_LANG_FINNISH: return tr("Finnish", "System Language");
-		case CELL_SYSUTIL_LANG_SWEDISH: return tr("Swedish", "System Language");
-		case CELL_SYSUTIL_LANG_DANISH: return tr("Danish", "System Language");
-		case CELL_SYSUTIL_LANG_NORWEGIAN: return tr("Norwegian", "System Language");
-		case CELL_SYSUTIL_LANG_POLISH: return tr("Polish", "System Language");
-		case CELL_SYSUTIL_LANG_ENGLISH_GB: return tr("English (UK)", "System Language");
-		case CELL_SYSUTIL_LANG_PORTUGUESE_BR: return tr("Portuguese (Brazil)", "System Language");
-		case CELL_SYSUTIL_LANG_TURKISH: return tr("Turkish", "System Language");
-		default:
-			break;
-		}
-		break;
-	case emu_settings_type::KeyboardType:
-		switch (static_cast<CellKbMappingType>(index))
-		{
-		case CELL_KB_MAPPING_101: return tr("English keyboard (US standard)", "Keyboard Type");
-		case CELL_KB_MAPPING_106: return tr("Japanese keyboard", "Keyboard Type");
-		case CELL_KB_MAPPING_106_KANA: return tr("Japanese keyboard (Kana state)", "Keyboard Type");
-		case CELL_KB_MAPPING_GERMAN_GERMANY: return tr("German keyboard", "Keyboard Type");
-		case CELL_KB_MAPPING_SPANISH_SPAIN: return tr("Spanish keyboard", "Keyboard Type");
-		case CELL_KB_MAPPING_FRENCH_FRANCE: return tr("French keyboard", "Keyboard Type");
-		case CELL_KB_MAPPING_ITALIAN_ITALY: return tr("Italian keyboard", "Keyboard Type");
-		case CELL_KB_MAPPING_DUTCH_NETHERLANDS: return tr("Dutch keyboard", "Keyboard Type");
-		case CELL_KB_MAPPING_PORTUGUESE_PORTUGAL: return tr("Portuguese keyboard (Portugal)", "Keyboard Type");
-		case CELL_KB_MAPPING_RUSSIAN_RUSSIA: return tr("Russian keyboard", "Keyboard Type");
-		case CELL_KB_MAPPING_ENGLISH_UK: return tr("English keyboard (UK standard)", "Keyboard Type");
-		case CELL_KB_MAPPING_KOREAN_KOREA: return tr("Korean keyboard", "Keyboard Type");
-		case CELL_KB_MAPPING_NORWEGIAN_NORWAY: return tr("Norwegian keyboard", "Keyboard Type");
-		case CELL_KB_MAPPING_FINNISH_FINLAND: return tr("Finnish keyboard", "Keyboard Type");
-		case CELL_KB_MAPPING_DANISH_DENMARK: return tr("Danish keyboard", "Keyboard Type");
-		case CELL_KB_MAPPING_SWEDISH_SWEDEN: return tr("Swedish keyboard", "Keyboard Type");
-		case CELL_KB_MAPPING_CHINESE_TRADITIONAL: return tr("Chinese keyboard (Traditional)", "Keyboard Type");
-		case CELL_KB_MAPPING_CHINESE_SIMPLIFIED: return tr("Chinese keyboard (Simplified)", "Keyboard Type");
-		case CELL_KB_MAPPING_SWISS_FRENCH_SWITZERLAND: return tr("French keyboard (Switzerland)", "Keyboard Type");
-		case CELL_KB_MAPPING_SWISS_GERMAN_SWITZERLAND: return tr("German keyboard (Switzerland)", "Keyboard Type");
-		case CELL_KB_MAPPING_CANADIAN_FRENCH_CANADA: return tr("French keyboard (Canada)", "Keyboard Type");
-		case CELL_KB_MAPPING_BELGIAN_BELGIUM: return tr("French keyboard (Belgium)", "Keyboard Type");
-		case CELL_KB_MAPPING_POLISH_POLAND: return tr("Polish keyboard", "Keyboard Type");
-		case CELL_KB_MAPPING_PORTUGUESE_BRAZIL: return tr("Portuguese keyboard (Brazil)", "Keyboard Type");
-		case CELL_KB_MAPPING_TURKISH_TURKEY: return tr("Turkish keyboard", "Keyboard Type");
-		}
-		break;
-	case emu_settings_type::ExclusiveFullscreenMode:
-		switch (static_cast<vk_exclusive_fs_mode>(index))
-		{
-		case vk_exclusive_fs_mode::unspecified: return tr("Automatic (Default)", "Exclusive Fullscreen Mode");
-		case vk_exclusive_fs_mode::disable: return tr("Prefer borderless fullscreen", "Exclusive Fullscreen Mode");
-		case vk_exclusive_fs_mode::enable: return tr("Prefer exclusive fullscreen", "Exclusive Fullscreen Mode");
-		}
-		break;
-	case emu_settings_type::StereoRenderMode:
-		switch (static_cast<stereo_render_mode_options>(index))
-		{
-		case stereo_render_mode_options::disabled: return tr("Disabled", "3D Display Mode");
-		case stereo_render_mode_options::side_by_side: return tr("Side-by-side", "3D Display Mode");
-		case stereo_render_mode_options::over_under: return tr("Over-under", "3D Display Mode");
-		case stereo_render_mode_options::interlaced: return tr("Interlaced", "3D Display Mode");
-		case stereo_render_mode_options::anaglyph_red_green: return tr("Anaglyph Red-Green", "3D Display Mode");
-		case stereo_render_mode_options::anaglyph_red_blue: return tr("Anaglyph Red-Blue", "3D Display Mode");
-		case stereo_render_mode_options::anaglyph_red_cyan: return tr("Anaglyph Red-Cyan", "3D Display Mode");
-		case stereo_render_mode_options::anaglyph_magenta_cyan: return tr("Anaglyph Magenta-Cyan", "3D Display Mode");
-		case stereo_render_mode_options::anaglyph_trioscopic: return tr("Anaglyph Green-Magenta (Trioscopic)", "3D Display Mode");
-		case stereo_render_mode_options::anaglyph_amber_blue: return tr("Anaglyph Amber-Blue (ColorCode 3D)", "3D Display Mode");
-		}
-		break;
-	case emu_settings_type::MidiDevices:
-		switch (static_cast<midi_device_type>(index))
-		{
-		case midi_device_type::guitar: return tr("Guitar (17 frets)", "Midi Device Type");
-		case midi_device_type::guitar_22fret: return tr("Guitar (22 frets)", "Midi Device Type");
-		case midi_device_type::keyboard: return tr("Keyboard", "Midi Device Type");
-		case midi_device_type::drums: return tr("Drums", "Midi Device Type");
-		}
-		break;
-	case emu_settings_type::XFloatAccuracy:
-		switch (static_cast<xfloat_accuracy>(index))
-		{
-		case xfloat_accuracy::accurate: return tr("Accurate XFloat");
-		case xfloat_accuracy::approximate: return tr("Approximate XFloat");
-		case xfloat_accuracy::relaxed: return tr("Relaxed XFloat");
-		case xfloat_accuracy::inaccurate: return tr("Inaccurate XFloat");
-		}
-		break;
 	default:
 		break;
 	}
 
-	if (strict)
-	{
-		std::string type_string;
-		if (const auto it = settings_location.find(type); it != settings_location.cend())
-		{
-			for (const char* loc : it->second)
-			{
-				if (!type_string.empty()) type_string += ": ";
-				type_string += loc;
-			}
-		}
-		fmt::throw_exception("Missing translation for emu setting (original=%s, type='%s'=%d, index=%d)", original, type_string.empty() ? "?" : type_string, static_cast<int>(type), index);
-	}
-
 	return original;
 }
-
-std::string emu_settings::GetLocalizedSetting(const std::string& original, emu_settings_type type, int index, bool strict) const
-{
-	return GetLocalizedSetting(QString::fromStdString(original), type, index, strict).toStdString();
-}
-
-std::string emu_settings::GetLocalizedSetting(const cfg::_base* node, u32 index) const
-{
-	const emu_settings_type type = FindSettingsType(node);
-	const std::vector<std::string> settings = GetSettingOptions(type);
-	return GetLocalizedSetting(::at32(settings, index), type, index, true);
-}
diff --git a/rpcs3/rpcs3qt/emu_settings.h b/rpcs3/rpcs3qt/emu_settings.h
index 5da946dabe..c884dd1024 100644
--- a/rpcs3/rpcs3qt/emu_settings.h
+++ b/rpcs3/rpcs3qt/emu_settings.h
@@ -4,7 +4,6 @@
 #include "util/yaml.hpp"
 
 #include "microphone_creator.h"
-#include "midi_creator.h"
 #include "render_creator.h"
 #include "emu_settings_type.h"
 
@@ -18,10 +17,7 @@
 #include <string>
 #include <vector>
 
-namespace cfg
-{
-	class _base;
-}
+constexpr auto qstr = QString::fromStdString;
 
 class emu_settings : public QObject
 {
@@ -40,7 +36,7 @@ public:
 	bool Init();
 
 	/** Connects a combo box with the target settings type*/
-	void EnhanceComboBox(QComboBox* combobox, emu_settings_type type, bool is_ranged = false, bool use_max = false, int max = 0, bool sorted = false, bool strict = true);
+	void EnhanceComboBox(QComboBox* combobox, emu_settings_type type, bool is_ranged = false, bool use_max = false, int max = 0, bool sorted = false);
 
 	/** Connects a check box with the target settings type*/
 	void EnhanceCheckBox(QCheckBox* checkbox, emu_settings_type type);
@@ -67,10 +63,7 @@ public:
 	void SaveSelectedLibraries(const std::vector<std::string>& libs);
 
 	/** Returns the valid options for a given setting.*/
-	static std::vector<std::string> GetSettingOptions(emu_settings_type type);
-
-	/** Returns the valid options for a given setting.*/
-	static QStringList GetQStringSettingOptions(emu_settings_type type);
+	static QStringList GetSettingOptions(emu_settings_type type);
 
 	/** Returns the default value of the setting type.*/
 	std::string GetSettingDefault(emu_settings_type type) const;
@@ -81,46 +74,27 @@ public:
 	/** Sets the setting type to a given value.*/
 	void SetSetting(emu_settings_type type, const std::string& val) const;
 
-	/** Try to find the settings type for a given string.*/
-	emu_settings_type FindSettingsType(const cfg::_base* node) const;
-
 	/** Gets all the renderer info for gpu settings.*/
 	render_creator* m_render_creator = nullptr;
 
 	/** Gets a list of all the microphones available.*/
 	microphone_creator m_microphone_creator;
 
-	/** Gets a list of all the midi devices available.*/
-	midi_creator m_midi_creator;
-
 	/** Loads the settings from path.*/
-	void LoadSettings(const std::string& title_id = "", bool create_config_from_global = true);
+	void LoadSettings(const std::string& title_id = "");
 
 	/** Fixes all registered invalid settings after asking the user for permission.*/
 	void OpenCorrectionDialog(QWidget* parent = Q_NULLPTR);
 
 	/** Get a localized and therefore freely adjustable version of the string used in config.yml.*/
-	QString GetLocalizedSetting(const QString& original, emu_settings_type type, int index, bool strict) const;
-
-	/** Get a localized and therefore freely adjustable version of the string used in config.yml.*/
-	std::string GetLocalizedSetting(const std::string& original, emu_settings_type type, int index, bool strict) const;
-
-	/** Get a localized and therefore freely adjustable version of the string used in config.yml.*/
-	std::string GetLocalizedSetting(const cfg::_base* node, u32 index) const;
+	QString GetLocalizedSetting(const QString& original, emu_settings_type type, int index) const;
 
 	/** Validates the settings and logs unused entries or cleans up the yaml*/
 	bool ValidateSettings(bool cleanup);
 
-	/** Resets the current settings to the global default. This includes all connected widgets. */
-	void RestoreDefaults();
-
-Q_SIGNALS:
-	void RestoreDefaultsSignal();
-
 public Q_SLOTS:
 	/** Writes the unsaved settings to file.  Used in settings dialog on accept.*/
-	void SaveSettings() const;
-
+	void SaveSettings();
 private:
 	YAML::Node m_default_settings; // The default settings as a YAML node.
 	YAML::Node m_current_settings; // The current settings as a YAML node.
diff --git a/rpcs3/rpcs3qt/emu_settings_type.h b/rpcs3/rpcs3qt/emu_settings_type.h
index 0fda096705..02e8b04a4d 100644
--- a/rpcs3/rpcs3qt/emu_settings_type.h
+++ b/rpcs3/rpcs3qt/emu_settings_type.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <map>
-#include <vector>
+#include <QMap>
 
 // Node location
 using cfg_location = std::vector<const char*>;
@@ -13,46 +12,35 @@ enum class emu_settings_type
 	SPUDecoder,
 	HookStaticFuncs,
 	ThreadSchedulerMode,
+	LowerSPUThreadPrio,
 	SPULoopDetection,
 	PreferredSPUThreads,
 	PPUDebug,
 	SPUDebug,
 	MFCDebug,
 	MaxLLVMThreads,
-	LLVMPrecompilation,
+	PPULLVMPrecompilation,
 	EnableTSX,
+	AccurateGETLLAR,
 	AccurateSpuDMA,
 	AccurateClineStores,
+	AccurateLLVMdfma,
+	AccurateVectorNaN,
 	AccurateRSXAccess,
-	FIFOAccuracy,
-	XFloatAccuracy,
+	AccurateXFloat,
 	AccuratePPU128Loop,
-	MFCCommandsShuffling,
 	NumPPUThreads,
 	SetDAZandFTZ,
 	SPUBlockSize,
 	SPUCache,
 	DebugConsoleMode,
 	SilenceAllLogs,
-	SuspendEmulationSavestateMode,
-	CompatibleEmulationSavestateMode,
-	StartSavestatePaused,
 	MaxSPURSThreads,
 	SleepTimersAccuracy,
 	ClocksScale,
 	PerformanceReport,
 	FullWidthAVX512,
-	PPUNJFixup,
-	AccurateDFMA,
-	AccuratePPUSAT,
-	AccuratePPUNJ,
-	FixupPPUVNAN,
-	AccuratePPUVNAN,
-	AccuratePPUFPCC,
-	MaxPreemptCount,
-	SPUProfiler,
-	DisableSpinOptimization,
-	EnabledSPUEventsBusyLoop,
+	PPULLVMJavaModeHandling,
 
 	// Graphics
 	Renderer,
@@ -65,7 +53,6 @@ enum class emu_settings_type
 	WriteColorBuffers,
 	ReadColorBuffers,
 	ReadDepthBuffer,
-	HandleRSXTiledMemory,
 	VSync,
 	DebugOutput,
 	DebugOverlay,
@@ -77,17 +64,15 @@ enum class emu_settings_type
 	StrictRenderingMode,
 	DisableVertexCache,
 	DisableOcclusionQueries,
-	DisableVideoOutput,
 	DisableFIFOReordering,
 	StrictTextureFlushing,
-	ShaderPrecisionQuality,
-	StereoRenderMode,
+	DisableNativefloat16,
+	Enable3D,
 	AnisotropicFilterOverride,
-	TextureLodBias,
 	ResolutionScale,
 	MinimumScalableDimension,
+	FsrUpscalingEnable,
 	FsrSharpeningStrength,
-	ExclusiveFullscreenMode,
 	ForceCPUBlitEmulation,
 	DisableOnDiskShaderCache,
 	DisableVulkanMemAllocator,
@@ -95,17 +80,10 @@ enum class emu_settings_type
 	ShaderCompilerNumThreads,
 	MultithreadedRSX,
 	VBlankRate,
-	VBlankNTSCFixup,
 	RelaxedZCULL,
-	PreciseZCULL,
 	DriverWakeUpDelay,
 	VulkanAsyncTextureUploads,
 	VulkanAsyncSchedulerDriver,
-	AllowHostGPULabels,
-	DisableMSLFastMath,
-	OutputScalingMode,
-	ForceHwMSAAResolve,
-	DisableAsyncHostMM,
 
 	// Performance Overlay
 	PerfOverlayEnabled,
@@ -114,8 +92,6 @@ enum class emu_settings_type
 	PerfOverlayFramerateDatapoints,
 	PerfOverlayFrametimeDatapoints,
 	PerfOverlayDetailLevel,
-	PerfOverlayFramerateDetailLevel,
-	PerfOverlayFrametimeDetailLevel,
 	PerfOverlayPosition,
 	PerfOverlayUpdateInterval,
 	PerfOverlayFontSize,
@@ -134,12 +110,7 @@ enum class emu_settings_type
 	AudioRenderer,
 	DumpToFile,
 	ConvertTo16Bit,
-	AudioFormat,
-	AudioFormats,
-	AudioProvider,
-	AudioAvport,
-	AudioDevice,
-	AudioChannelLayout,
+	AudioChannels,
 	MasterVolume,
 	EnableBuffering,
 	AudioBufferDuration,
@@ -147,54 +118,30 @@ enum class emu_settings_type
 	TimeStretchingThreshold,
 	MicrophoneType,
 	MicrophoneDevices,
-	MusicHandler,
 
 	// Input / Output
-	BackgroundInput,
-	ShowMoveCursor,
-	LockOvlIptToP1,
-	PadHandlerMode,
-	PadConnection,
 	KeyboardHandler,
 	MouseHandler,
 	Camera,
 	CameraType,
-	CameraFlip,
-	CameraID,
 	Move,
 	Buzz,
-	Turntable,
-	GHLtar,
-	MidiDevices,
-	SDLMappings,
-	IoDebugOverlay,
 
 	// Misc
 	ExitRPCS3OnFinish,
 	StartOnBoot,
-	PauseOnFocusLoss,
 	StartGameFullscreen,
 	PreventDisplaySleep,
 	ShowTrophyPopups,
-	ShowRpcnPopups,
 	UseNativeInterface,
 	ShowShaderCompilationHint,
-	ShowPPUCompilationHint,
-	ShowAutosaveAutoloadHint,
-	ShowPressureIntensityToggleHint,
-	ShowAnalogLimiterToggleHint,
-	ShowMouseAndKeyboardToggleHint,
 	WindowTitleFormat,
-	PauseDuringHomeMenu,
 
 	// Network
 	InternetStatus,
 	DNSAddress,
 	IpSwapList,
 	PSNStatus,
-	BindAddress,
-	EnableUpnp,
-	PSNCountry,
 
 	// System
 	LicenseArea,
@@ -202,34 +149,44 @@ enum class emu_settings_type
 	KeyboardType,
 	EnterButtonAssignment,
 	EnableHostRoot,
-	EmptyHdd0Tmp,
 	LimitCacheSize,
 	MaximumCacheSize,
 	ConsoleTimeOffset,
+
+	// Virtual File System
+	emulatorLocation,
+	dev_hdd0Location,
+	dev_hdd1Location,
+	dev_flashLocation,
+	dev_flash2Location,
+	dev_flash3Location,
+	dev_usb000Location,
 };
 
 /** A helper map that keeps track of where a given setting type is located*/
-inline static const std::map<emu_settings_type, cfg_location> settings_location =
+inline static const QMap<emu_settings_type, cfg_location> settings_location =
 {
 	// Core Tab
 	{ emu_settings_type::PPUDecoder,               { "Core", "PPU Decoder"}},
 	{ emu_settings_type::SPUDecoder,               { "Core", "SPU Decoder"}},
 	{ emu_settings_type::HookStaticFuncs,          { "Core", "Hook static functions"}},
 	{ emu_settings_type::ThreadSchedulerMode,      { "Core", "Thread Scheduler Mode"}},
+	{ emu_settings_type::LowerSPUThreadPrio,       { "Core", "Lower SPU thread priority"}},
 	{ emu_settings_type::SPULoopDetection,         { "Core", "SPU loop detection"}},
 	{ emu_settings_type::PreferredSPUThreads,      { "Core", "Preferred SPU Threads"}},
 	{ emu_settings_type::PPUDebug,                 { "Core", "PPU Debug"}},
 	{ emu_settings_type::SPUDebug,                 { "Core", "SPU Debug"}},
 	{ emu_settings_type::MFCDebug,                 { "Core", "MFC Debug"}},
 	{ emu_settings_type::MaxLLVMThreads,           { "Core", "Max LLVM Compile Threads"}},
-	{ emu_settings_type::LLVMPrecompilation,       { "Core", "LLVM Precompilation"}},
+	{ emu_settings_type::PPULLVMPrecompilation,    { "Core", "PPU LLVM Precompilation"}},
 	{ emu_settings_type::EnableTSX,                { "Core", "Enable TSX"}},
+	{ emu_settings_type::AccurateGETLLAR,          { "Core", "Accurate GETLLAR"}},
 	{ emu_settings_type::AccurateSpuDMA,           { "Core", "Accurate SPU DMA"}},
 	{ emu_settings_type::AccurateClineStores,      { "Core", "Accurate Cache Line Stores"}},
+	{ emu_settings_type::AccurateLLVMdfma,         { "Core", "LLVM Accurate DFMA"}},
+	{ emu_settings_type::AccurateVectorNaN,        { "Core", "PPU LLVM Accurate Vector NaN values"}},
 	{ emu_settings_type::AccurateRSXAccess,        { "Core", "Accurate RSX reservation access"}},
-	{ emu_settings_type::FIFOAccuracy,             { "Core", "RSX FIFO Accuracy"}},
-	{ emu_settings_type::XFloatAccuracy,           { "Core", "XFloat Accuracy"}},
-	{ emu_settings_type::MFCCommandsShuffling,     { "Core", "MFC Commands Shuffling Limit"}},
+	{ emu_settings_type::AccurateXFloat,           { "Core", "Accurate xfloat"}},
 	{ emu_settings_type::SetDAZandFTZ,             { "Core", "Set DAZ and FTZ"}},
 	{ emu_settings_type::SPUBlockSize,             { "Core", "SPU Block Size"}},
 	{ emu_settings_type::SPUCache,                 { "Core", "SPU Cache"}},
@@ -241,17 +198,7 @@ inline static const std::map<emu_settings_type, cfg_location> settings_location
 	{ emu_settings_type::PerformanceReport,        { "Core", "Enable Performance Report"}},
 	{ emu_settings_type::FullWidthAVX512,          { "Core", "Full Width AVX-512"}},
 	{ emu_settings_type::NumPPUThreads,            { "Core", "PPU Threads"}},
-	{ emu_settings_type::PPUNJFixup,               { "Core", "PPU LLVM Java Mode Handling"}},
-	{ emu_settings_type::AccurateDFMA,             { "Core", "Use Accurate DFMA"}},
-	{ emu_settings_type::AccuratePPUSAT,           { "Core", "PPU Set Saturation Bit"}},
-	{ emu_settings_type::AccuratePPUNJ,            { "Core", "PPU Accurate Non-Java Mode"}},
-	{ emu_settings_type::FixupPPUVNAN,             { "Core", "PPU Fixup Vector NaN Values"}},
-	{ emu_settings_type::AccuratePPUVNAN,          { "Core", "PPU Accurate Vector NaN Values"}},
-	{ emu_settings_type::AccuratePPUFPCC,          { "Core", "PPU Set FPCC Bits"}},
-	{ emu_settings_type::MaxPreemptCount,          { "Core", "Max CPU Preempt Count"}},
-	{ emu_settings_type::SPUProfiler,              { "Core", "SPU Profiler"}},
-	{ emu_settings_type::DisableSpinOptimization,  { "Core", "Disable SPU GETLLAR Spin Optimization"}},
-	{ emu_settings_type::EnabledSPUEventsBusyLoop, { "Core", "SPU Reservation Busy Waiting Enabled"}},
+	{ emu_settings_type::PPULLVMJavaModeHandling,  { "Core", "PPU LLVM Java Mode Handling"}},
 
 	// Graphics Tab
 	{ emu_settings_type::Renderer,                   { "Video", "Renderer"}},
@@ -264,7 +211,6 @@ inline static const std::map<emu_settings_type, cfg_location> settings_location
 	{ emu_settings_type::WriteColorBuffers,          { "Video", "Write Color Buffers"}},
 	{ emu_settings_type::ReadColorBuffers,           { "Video", "Read Color Buffers"}},
 	{ emu_settings_type::ReadDepthBuffer,            { "Video", "Read Depth Buffer"}},
-	{ emu_settings_type::HandleRSXTiledMemory,       { "Video", "Handle RSX Memory Tiling"}},
 	{ emu_settings_type::VSync,                      { "Video", "VSync"}},
 	{ emu_settings_type::DebugOutput,                { "Video", "Debug output"}},
 	{ emu_settings_type::DebugOverlay,               { "Video", "Debug overlay"}},
@@ -275,38 +221,29 @@ inline static const std::map<emu_settings_type, cfg_location> settings_location
 	{ emu_settings_type::StrictRenderingMode,        { "Video", "Strict Rendering Mode"}},
 	{ emu_settings_type::DisableVertexCache,         { "Video", "Disable Vertex Cache"}},
 	{ emu_settings_type::DisableOcclusionQueries,    { "Video", "Disable ZCull Occlusion Queries"}},
-	{ emu_settings_type::DisableVideoOutput,         { "Video", "Disable Video Output"}},
 	{ emu_settings_type::DisableFIFOReordering,      { "Video", "Disable FIFO Reordering"}},
-	{ emu_settings_type::StereoRenderMode,           { "Video", "3D Display Mode"}},
+	{ emu_settings_type::DisableNativefloat16,       { "Video", "Disable native float16 support"}},
+	{ emu_settings_type::Enable3D,                   { "Video", "Enable 3D"}},
 	{ emu_settings_type::StrictTextureFlushing,      { "Video", "Strict Texture Flushing"}},
 	{ emu_settings_type::ForceCPUBlitEmulation,      { "Video", "Force CPU Blit"}},
 	{ emu_settings_type::DisableOnDiskShaderCache,   { "Video", "Disable On-Disk Shader Cache"}},
 	{ emu_settings_type::DisableVulkanMemAllocator,  { "Video", "Disable Vulkan Memory Allocator"}},
 	{ emu_settings_type::ShaderMode,                 { "Video", "Shader Mode"}},
 	{ emu_settings_type::ShaderCompilerNumThreads,   { "Video", "Shader Compiler Threads"}},
-	{ emu_settings_type::ShaderPrecisionQuality,     { "Video", "Shader Precision"}},
 	{ emu_settings_type::MultithreadedRSX,           { "Video", "Multithreaded RSX"}},
 	{ emu_settings_type::RelaxedZCULL,               { "Video", "Relaxed ZCULL Sync"}},
-	{ emu_settings_type::PreciseZCULL,               { "Video", "Accurate ZCULL stats"}},
 	{ emu_settings_type::AnisotropicFilterOverride,  { "Video", "Anisotropic Filter Override"}},
-	{ emu_settings_type::TextureLodBias,             { "Video", "Texture LOD Bias Addend"}},
 	{ emu_settings_type::ResolutionScale,            { "Video", "Resolution Scale"}},
 	{ emu_settings_type::MinimumScalableDimension,   { "Video", "Minimum Scalable Dimension"}},
 	{ emu_settings_type::VulkanAdapter,              { "Video", "Vulkan", "Adapter"}},
 	{ emu_settings_type::VBlankRate,                 { "Video", "Vblank Rate"}},
-	{ emu_settings_type::VBlankNTSCFixup,            { "Video", "Vblank NTSC Fixup"}},
 	{ emu_settings_type::DriverWakeUpDelay,          { "Video", "Driver Wake-Up Delay"}},
-	{ emu_settings_type::AllowHostGPULabels,         { "Video", "Allow Host GPU Labels"}},
-	{ emu_settings_type::DisableMSLFastMath,         { "Video", "Disable MSL Fast Math"}},
-	{ emu_settings_type::OutputScalingMode,          { "Video", "Output Scaling Mode"}},
-	{ emu_settings_type::ForceHwMSAAResolve,         { "Video", "Force Hardware MSAA Resolve"}},
-	{ emu_settings_type::DisableAsyncHostMM,         { "Video", "Disable Asynchronous Memory Manager"}},
 
 	// Vulkan
-	{ emu_settings_type::VulkanAsyncTextureUploads,           { "Video", "Vulkan", "Asynchronous Texture Streaming 2"}},
-	{ emu_settings_type::VulkanAsyncSchedulerDriver,          { "Video", "Vulkan", "Asynchronous Queue Scheduler"}},
-	{ emu_settings_type::FsrSharpeningStrength,               { "Video", "Vulkan", "FidelityFX CAS Sharpening Intensity"}},
-	{ emu_settings_type::ExclusiveFullscreenMode,             { "Video", "Vulkan", "Exclusive Fullscreen Mode"}},
+	{ emu_settings_type::VulkanAsyncTextureUploads,        { "Video", "Vulkan", "Asynchronous Texture Streaming 2"}},
+	{ emu_settings_type::VulkanAsyncSchedulerDriver,       { "Video", "Vulkan", "Asynchronous Queue Scheduler"}},
+	{ emu_settings_type::FsrUpscalingEnable,               { "Video", "Vulkan", "Enable FidelityFX Super Resolution Upscaling"}},
+	{ emu_settings_type::FsrSharpeningStrength,            { "Video", "Vulkan", "FidelityFX CAS Sharpening Intensity"}},
 
 	// Performance Overlay
 	{ emu_settings_type::PerfOverlayEnabled,               { "Video", "Performance Overlay", "Enabled" } },
@@ -315,8 +252,6 @@ inline static const std::map<emu_settings_type, cfg_location> settings_location
 	{ emu_settings_type::PerfOverlayFramerateDatapoints,   { "Video", "Performance Overlay", "Framerate datapoints" } },
 	{ emu_settings_type::PerfOverlayFrametimeDatapoints,   { "Video", "Performance Overlay", "Frametime datapoints" } },
 	{ emu_settings_type::PerfOverlayDetailLevel,           { "Video", "Performance Overlay", "Detail level" } },
-	{ emu_settings_type::PerfOverlayFramerateDetailLevel,  { "Video", "Performance Overlay", "Framerate graph detail level" } },
-	{ emu_settings_type::PerfOverlayFrametimeDetailLevel,  { "Video", "Performance Overlay", "Frametime graph detail level" } },
 	{ emu_settings_type::PerfOverlayPosition,              { "Video", "Performance Overlay", "Position" } },
 	{ emu_settings_type::PerfOverlayUpdateInterval,        { "Video", "Performance Overlay", "Metrics update interval (ms)" } },
 	{ emu_settings_type::PerfOverlayFontSize,              { "Video", "Performance Overlay", "Font size (px)" } },
@@ -335,12 +270,7 @@ inline static const std::map<emu_settings_type, cfg_location> settings_location
 	{ emu_settings_type::AudioRenderer,           { "Audio", "Renderer"}},
 	{ emu_settings_type::DumpToFile,              { "Audio", "Dump to file"}},
 	{ emu_settings_type::ConvertTo16Bit,          { "Audio", "Convert to 16 bit"}},
-	{ emu_settings_type::AudioFormat,             { "Audio", "Audio Format"}},
-	{ emu_settings_type::AudioFormats,            { "Audio", "Audio Formats"}},
-	{ emu_settings_type::AudioProvider,           { "Audio", "Audio Provider"}},
-	{ emu_settings_type::AudioAvport,             { "Audio", "RSXAudio Avport"}},
-	{ emu_settings_type::AudioDevice,             { "Audio", "Audio Device"}},
-	{ emu_settings_type::AudioChannelLayout,      { "Audio", "Audio Channel Layout"}},
+	{ emu_settings_type::AudioChannels,           { "Audio", "Audio Channels"}},
 	{ emu_settings_type::MasterVolume,            { "Audio", "Master Volume"}},
 	{ emu_settings_type::EnableBuffering,         { "Audio", "Enable Buffering"}},
 	{ emu_settings_type::AudioBufferDuration,     { "Audio", "Desired Audio Buffer Duration"}},
@@ -348,55 +278,31 @@ inline static const std::map<emu_settings_type, cfg_location> settings_location
 	{ emu_settings_type::TimeStretchingThreshold, { "Audio", "Time Stretching Threshold"}},
 	{ emu_settings_type::MicrophoneType,          { "Audio", "Microphone Type" }},
 	{ emu_settings_type::MicrophoneDevices,       { "Audio", "Microphone Devices" }},
-	{ emu_settings_type::MusicHandler,            { "Audio", "Music Handler"}},
 
 	// Input / Output
-	{ emu_settings_type::BackgroundInput, { "Input/Output", "Background input enabled"}},
-	{ emu_settings_type::ShowMoveCursor,  { "Input/Output", "Show move cursor"}},
-	{ emu_settings_type::LockOvlIptToP1,  { "Input/Output", "Lock overlay input to player one"}},
-	{ emu_settings_type::PadHandlerMode,  { "Input/Output", "Pad handler mode"}},
-	{ emu_settings_type::PadConnection,   { "Input/Output", "Keep pads connected" }},
 	{ emu_settings_type::KeyboardHandler, { "Input/Output", "Keyboard"}},
 	{ emu_settings_type::MouseHandler,    { "Input/Output", "Mouse"}},
 	{ emu_settings_type::Camera,          { "Input/Output", "Camera"}},
 	{ emu_settings_type::CameraType,      { "Input/Output", "Camera type"}},
-	{ emu_settings_type::CameraFlip,      { "Input/Output", "Camera flip"}},
-	{ emu_settings_type::CameraID,        { "Input/Output", "Camera ID"}},
 	{ emu_settings_type::Move,            { "Input/Output", "Move" }},
 	{ emu_settings_type::Buzz,            { "Input/Output", "Buzz emulated controller" }},
-	{ emu_settings_type::Turntable,       { "Input/Output", "Turntable emulated controller" }},
-	{ emu_settings_type::GHLtar,          { "Input/Output", "GHLtar emulated controller" }},
-	{ emu_settings_type::MidiDevices,     { "Input/Output", "Emulated Midi devices" }},
-	{ emu_settings_type::SDLMappings,     { "Input/Output", "Load SDL GameController Mappings" }},
-	{ emu_settings_type::IoDebugOverlay,  { "Input/Output", "IO Debug overlay" }},
 
 	// Misc
-	{ emu_settings_type::ExitRPCS3OnFinish,               { "Miscellaneous", "Exit RPCS3 when process finishes" }},
-	{ emu_settings_type::StartOnBoot,                     { "Miscellaneous", "Automatically start games after boot" }},
-	{ emu_settings_type::PauseOnFocusLoss,                { "Miscellaneous", "Pause emulation on RPCS3 focus loss" }},
-	{ emu_settings_type::StartGameFullscreen,             { "Miscellaneous", "Start games in fullscreen mode"}},
-	{ emu_settings_type::PreventDisplaySleep,             { "Miscellaneous", "Prevent display sleep while running games"}},
-	{ emu_settings_type::ShowTrophyPopups,                { "Miscellaneous", "Show trophy popups"}},
-	{ emu_settings_type::ShowRpcnPopups,                  { "Miscellaneous", "Show RPCN popups"}},
-	{ emu_settings_type::UseNativeInterface,              { "Miscellaneous", "Use native user interface"}},
-	{ emu_settings_type::ShowShaderCompilationHint,       { "Miscellaneous", "Show shader compilation hint"}},
-	{ emu_settings_type::ShowPPUCompilationHint,          { "Miscellaneous", "Show PPU compilation hint"}},
-	{ emu_settings_type::ShowAutosaveAutoloadHint,        { "Miscellaneous", "Show autosave/autoload hint"}},
-	{ emu_settings_type::ShowPressureIntensityToggleHint, { "Miscellaneous", "Show pressure intensity toggle hint"}},
-	{ emu_settings_type::ShowAnalogLimiterToggleHint,     { "Miscellaneous", "Show analog limiter toggle hint"}},
-	{ emu_settings_type::ShowMouseAndKeyboardToggleHint,  { "Miscellaneous", "Show mouse and keyboard toggle hint"}},
-	{ emu_settings_type::SilenceAllLogs,                  { "Miscellaneous", "Silence All Logs" }},
-	{ emu_settings_type::WindowTitleFormat,               { "Miscellaneous", "Window Title Format" }},
-	{ emu_settings_type::PauseDuringHomeMenu,             { "Miscellaneous", "Pause Emulation During Home Menu" }},
+	{ emu_settings_type::ExitRPCS3OnFinish,         { "Miscellaneous", "Exit RPCS3 when process finishes" }},
+	{ emu_settings_type::StartOnBoot,               { "Miscellaneous", "Automatically start games after boot" }},
+	{ emu_settings_type::StartGameFullscreen,       { "Miscellaneous", "Start games in fullscreen mode"}},
+	{ emu_settings_type::PreventDisplaySleep,       { "Miscellaneous", "Prevent display sleep while running games"}},
+	{ emu_settings_type::ShowTrophyPopups,          { "Miscellaneous", "Show trophy popups"}},
+	{ emu_settings_type::UseNativeInterface,        { "Miscellaneous", "Use native user interface"}},
+	{ emu_settings_type::ShowShaderCompilationHint, { "Miscellaneous", "Show shader compilation hint"}},
+	{ emu_settings_type::SilenceAllLogs,            { "Miscellaneous", "Silence All Logs" }},
+	{ emu_settings_type::WindowTitleFormat,         { "Miscellaneous", "Window Title Format" }},
 
 	// Networking
 	{ emu_settings_type::InternetStatus, { "Net", "Internet enabled"}},
 	{ emu_settings_type::DNSAddress,     { "Net", "DNS address"}},
 	{ emu_settings_type::IpSwapList,     { "Net", "IP swap list"}},
 	{ emu_settings_type::PSNStatus,      { "Net", "PSN status"}},
-	{ emu_settings_type::BindAddress,    { "Net", "Bind address"}},
-	{ emu_settings_type::EnableUpnp,     { "Net", "UPNP Enabled"}},
-	{ emu_settings_type::PSNCountry,     { "Net", "PSN Country"}},
 
 	// System
 	{ emu_settings_type::LicenseArea,           { "System", "License Area"}},
@@ -404,13 +310,16 @@ inline static const std::map<emu_settings_type, cfg_location> settings_location
 	{ emu_settings_type::KeyboardType,          { "System", "Keyboard Type"} },
 	{ emu_settings_type::EnterButtonAssignment, { "System", "Enter button assignment"}},
 	{ emu_settings_type::EnableHostRoot,        { "VFS", "Enable /host_root/"}},
-	{ emu_settings_type::EmptyHdd0Tmp,          { "VFS", "Empty /dev_hdd0/tmp/"}},
 	{ emu_settings_type::LimitCacheSize,        { "VFS", "Limit disk cache size"}},
 	{ emu_settings_type::MaximumCacheSize,      { "VFS", "Disk cache maximum size (MB)"}},
 	{ emu_settings_type::ConsoleTimeOffset,     { "System", "Console time offset (s)"}},
 
-	// Savestates
-	{ emu_settings_type::SuspendEmulationSavestateMode,       { "Savestate", "Suspend Emulation Savestate Mode" }},
-	{ emu_settings_type::CompatibleEmulationSavestateMode,    { "Savestate", "Compatible Savestate Mode" }},
-	{ emu_settings_type::StartSavestatePaused,                { "Savestate", "Start Paused" }},
+	// Virtual File System
+	{ emu_settings_type::emulatorLocation,   { "VFS", "$(EmulatorDir)"}},
+	{ emu_settings_type::dev_hdd0Location,   { "VFS", "/dev_hdd0/" }},
+	{ emu_settings_type::dev_hdd1Location,   { "VFS", "/dev_hdd1/" }},
+	{ emu_settings_type::dev_flashLocation,  { "VFS", "/dev_flash/"}},
+	{ emu_settings_type::dev_flash2Location, { "VFS", "/dev_flash2/"}},
+	{ emu_settings_type::dev_flash3Location, { "VFS", "/dev_flash3/"}},
+	{ emu_settings_type::dev_usb000Location, { "VFS", "/dev_usb000/"}},
 };
diff --git a/rpcs3/rpcs3qt/emulated_logitech_g27_settings_dialog.cpp b/rpcs3/rpcs3qt/emulated_logitech_g27_settings_dialog.cpp
deleted file mode 100644
index a65f62648b..0000000000
--- a/rpcs3/rpcs3qt/emulated_logitech_g27_settings_dialog.cpp
+++ /dev/null
@@ -1,872 +0,0 @@
-#include "stdafx.h"
-
-#ifdef HAVE_SDL3
-
-#include "emulated_logitech_g27_settings_dialog.h"
-#include "Emu/Io/LogitechG27.h"
-#include "Input/sdl_instance.h"
-#include "qt_utils.h"
-
-#include <QDialogButtonBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QVBoxLayout>
-#include <QScrollBar>
-#include <QTimer>
-#include <QSlider>
-#include <QComboBox>
-
-LOG_CHANNEL(logitech_g27_cfg_log, "LOGIG27");
-
-static const QString DEFAULT_STATUS = " ";
-
-enum class mapping_device
-{
-	NONE = -1,
-
-	// Axis
-	STEERING = 0,
-	THROTTLE,
-	BRAKE,
-	CLUTCH,
-
-	// Buttons
-	FIRST_BUTTON,
-	SHIFT_UP = FIRST_BUTTON,
-	SHIFT_DOWN,
-
-	UP,
-	DOWN,
-	LEFT,
-	RIGHT,
-
-	TRIANGLE,
-	CROSS,
-	SQUARE,
-	CIRCLE,
-
-	L2,
-	L3,
-	R2,
-	R3,
-
-	PLUS,
-	MINUS,
-
-	DIAL_CLOCKWISE,
-	DIAL_ANTICLOCKWISE,
-
-	SELECT,
-	PAUSE,
-
-	SHIFTER_1,
-	SHIFTER_2,
-	SHIFTER_3,
-	SHIFTER_4,
-	SHIFTER_5,
-	SHIFTER_6,
-	SHIFTER_R,
-	SHIFTER_PRESS,
-
-	// Enum count
-	COUNT
-};
-
-QString device_name(mapping_device dev)
-{
-	switch (dev)
-	{
-	case mapping_device::NONE: return "";
-	case mapping_device::STEERING: return QObject::tr("Steering");
-	case mapping_device::THROTTLE: return QObject::tr("Throttle");
-	case mapping_device::BRAKE: return QObject::tr("Brake");
-	case mapping_device::CLUTCH: return QObject::tr("Clutch");
-	case mapping_device::SHIFT_UP: return QObject::tr("Shift up");
-	case mapping_device::SHIFT_DOWN: return QObject::tr("Shift down");
-	case mapping_device::UP: return QObject::tr("Up");
-	case mapping_device::DOWN: return QObject::tr("Down");
-	case mapping_device::LEFT: return QObject::tr("Left");
-	case mapping_device::RIGHT: return QObject::tr("Right");
-	case mapping_device::TRIANGLE: return QObject::tr("Triangle");
-	case mapping_device::CROSS: return QObject::tr("Cross");
-	case mapping_device::SQUARE: return QObject::tr("Square");
-	case mapping_device::CIRCLE: return QObject::tr("Circle");
-	case mapping_device::L2: return QObject::tr("L2");
-	case mapping_device::L3: return QObject::tr("L3");
-	case mapping_device::R2: return QObject::tr("R2");
-	case mapping_device::R3: return QObject::tr("R3");
-	case mapping_device::PLUS: return QObject::tr("L4");
-	case mapping_device::MINUS: return QObject::tr("L5");
-	case mapping_device::DIAL_CLOCKWISE: return QObject::tr("R4");
-	case mapping_device::DIAL_ANTICLOCKWISE: return QObject::tr("R5");
-	case mapping_device::SELECT: return QObject::tr("Select");
-	case mapping_device::PAUSE: return QObject::tr("Pause");
-	case mapping_device::SHIFTER_1: return QObject::tr("Gear 1");
-	case mapping_device::SHIFTER_2: return QObject::tr("Gear 2");
-	case mapping_device::SHIFTER_3: return QObject::tr("Gear 3");
-	case mapping_device::SHIFTER_4: return QObject::tr("Gear 4");
-	case mapping_device::SHIFTER_5: return QObject::tr("Gear 5");
-	case mapping_device::SHIFTER_6: return QObject::tr("Gear 6");
-	case mapping_device::SHIFTER_R: return QObject::tr("Gear R");
-	case mapping_device::SHIFTER_PRESS: return QObject::tr("Shifter press");
-	case mapping_device::COUNT: return "";
-	}
-	return "";
-}
-
-emulated_logitech_g27_mapping& device_cfg(mapping_device dev)
-{
-	auto& cfg = g_cfg_logitech_g27;
-
-	switch (dev)
-	{
-	case mapping_device::STEERING: return cfg.steering;
-	case mapping_device::THROTTLE: return cfg.throttle;
-	case mapping_device::BRAKE: return cfg.brake;
-	case mapping_device::CLUTCH: return cfg.clutch;
-	case mapping_device::SHIFT_UP: return cfg.shift_up;
-	case mapping_device::SHIFT_DOWN: return cfg.shift_down;
-	case mapping_device::UP: return cfg.up;
-	case mapping_device::DOWN: return cfg.down;
-	case mapping_device::LEFT: return cfg.left;
-	case mapping_device::RIGHT: return cfg.right;
-	case mapping_device::TRIANGLE: return cfg.triangle;
-	case mapping_device::CROSS: return cfg.cross;
-	case mapping_device::SQUARE: return cfg.square;
-	case mapping_device::CIRCLE: return cfg.circle;
-	case mapping_device::L2: return cfg.l2;
-	case mapping_device::L3: return cfg.l3;
-	case mapping_device::R2: return cfg.r2;
-	case mapping_device::R3: return cfg.r3;
-	case mapping_device::PLUS: return cfg.plus;
-	case mapping_device::MINUS: return cfg.minus;
-	case mapping_device::DIAL_CLOCKWISE: return cfg.dial_clockwise;
-	case mapping_device::DIAL_ANTICLOCKWISE: return cfg.dial_anticlockwise;
-	case mapping_device::SELECT: return cfg.select;
-	case mapping_device::PAUSE: return cfg.pause;
-	case mapping_device::SHIFTER_1: return cfg.shifter_1;
-	case mapping_device::SHIFTER_2: return cfg.shifter_2;
-	case mapping_device::SHIFTER_3: return cfg.shifter_3;
-	case mapping_device::SHIFTER_4: return cfg.shifter_4;
-	case mapping_device::SHIFTER_5: return cfg.shifter_5;
-	case mapping_device::SHIFTER_6: return cfg.shifter_6;
-	case mapping_device::SHIFTER_R: return cfg.shifter_r;
-	case mapping_device::SHIFTER_PRESS: return cfg.shifter_press;
-	default: fmt::throw_exception("Unexpected mapping_device %d", static_cast<int>(dev));
-	}
-}
-
-class DeviceChoice : public QWidget
-{
-public:
-	DeviceChoice(QWidget* parent, const QString& name)
-		: QWidget(parent)
-	{
-		auto layout = new QHBoxLayout(this);
-		setLayout(layout);
-
-		QLabel* label = new QLabel(this);
-		label->setText(name);
-		label->setMinimumWidth(400);
-		layout->addWidget(label);
-
-		m_dropdown = new QComboBox(this);
-		layout->addWidget(m_dropdown);
-
-		m_disable_button = new QPushButton(tr("DISABLE"), this);
-		layout->addWidget(m_disable_button);
-
-		connect(m_dropdown, &QComboBox::currentIndexChanged, this, [this](int index)
-		{
-			if (index < 0) return;
-
-			const QVariant var = m_dropdown->currentData();
-			if (!var.canConvert<int>()) return;
-
-			m_device_choice = static_cast<mapping_device>(var.toInt());
-			update_display();
-		});
-
-		connect(m_disable_button, &QPushButton::clicked, this, [this]()
-		{
-			m_device_choice = mapping_device::NONE;
-			update_display();
-		});
-
-		m_dropdown->setPlaceholderText(tr("-- Disabled --"));
-
-		for (int i = 0; i < static_cast<int>(mapping_device::COUNT); i++)
-		{
-			const mapping_device dev = static_cast<mapping_device>(i);
-			m_dropdown->addItem(device_name(dev), i);
-		}
-
-		update_display();
-	}
-
-	mapping_device get_device_choice() const
-	{
-		return m_device_choice;
-	}
-
-	void set_device_choice(mapping_device choice)
-	{
-		m_device_choice = choice;
-		update_display();
-	}
-
-	void set_enable(bool enable)
-	{
-		m_dropdown->setEnabled(enable);
-		m_disable_button->setEnabled(enable);
-	}
-
-private:
-	void update_display()
-	{
-		m_dropdown->setCurrentIndex(static_cast<int>(m_device_choice));
-	}
-
-	mapping_device m_device_choice = mapping_device::NONE;
-	QComboBox* m_dropdown = nullptr;
-	QPushButton* m_disable_button = nullptr;
-};
-
-class Mapping : public QGroupBox
-{
-public:
-	Mapping(QWidget* parent, emulated_logitech_g27_settings_dialog* dialog, bool is_axis, const QString& name, bool flip_axis_display)
-		: QGroupBox(parent), m_setting_dialog(dialog), m_is_axis(is_axis), m_name(name), m_flip_axis_display(flip_axis_display)
-	{
-		QVBoxLayout* layout = new QVBoxLayout(this);
-		setLayout(layout);
-
-		QWidget* horizontal_container = new QWidget(this);
-		QHBoxLayout* horizontal_layout = new QHBoxLayout(horizontal_container);
-		horizontal_container->setLayout(horizontal_layout);
-
-		layout->addWidget(horizontal_container);
-
-		QLabel* label = new QLabel(horizontal_container);
-		label->setText(name);
-
-		m_display_box = new QLabel(horizontal_container);
-		m_display_box->setTextFormat(Qt::RichText);
-		m_display_box->setWordWrap(true);
-		m_display_box->setFrameStyle(QFrame::Box);
-		m_display_box->setMinimumWidth(225);
-
-		m_map_button = new QPushButton(tr("MAP"), horizontal_container);
-		m_unmap_button = new QPushButton(tr("UNMAP"), horizontal_container);
-		m_reverse_checkbox = new QCheckBox(tr("Reverse"), horizontal_container);
-
-		if (!m_is_axis)
-		{
-			m_button_status = new QCheckBox(tr("Pressed"), horizontal_container);
-			m_button_status->setDisabled(true);
-		}
-		else
-		{
-			m_axis_status = new QSlider(Qt::Horizontal, this);
-			m_axis_status->setDisabled(true);
-			m_axis_status->setMinimum(-0x8000);
-			m_axis_status->setMaximum(0x7FFF);
-			m_axis_status->setValue(-0x8000);
-		}
-
-		update_display();
-
-		horizontal_layout->addWidget(label, 1);
-		horizontal_layout->addWidget(m_display_box, 2);
-		if (m_button_status)
-			horizontal_layout->addWidget(m_button_status, 1);
-		else
-			horizontal_layout->addStretch(1); // For a more consistent layout
-		horizontal_layout->addWidget(m_map_button, 1);
-		horizontal_layout->addWidget(m_unmap_button, 1);
-		horizontal_layout->addWidget(m_reverse_checkbox, 1);
-
-		if (m_axis_status)
-			layout->addWidget(m_axis_status);
-
-		connect(m_map_button, &QPushButton::clicked, this, [this]()
-		{
-			m_mapping_in_progress = true;
-			m_timeout_msec = 5500;
-			m_setting_dialog->set_enable(false);
-			m_last_joystick_states = m_setting_dialog->get_joystick_states();
-		});
-
-		connect(m_unmap_button, &QPushButton::clicked, this, [this]()
-		{
-			m_mapping.device_type_id = 0;
-			update_display();
-		});
-
-		connect(m_reverse_checkbox, &QCheckBox::clicked, this, [this]()
-		{
-			m_mapping.reverse = m_reverse_checkbox->isChecked();
-		});
-
-		m_tick_timer = new QTimer(this);
-		connect(m_tick_timer, &QTimer::timeout, this, [this]()
-		{
-			if (m_mapping_in_progress)
-			{
-				const int timeout_sec = m_timeout_msec / 1000;
-				const std::map<u64, joystick_state>& new_joystick_states = m_setting_dialog->get_joystick_states();
-
-				m_setting_dialog->set_state_text(tr("Input %0 for %1, timeout in %2 %3").arg(m_is_axis ? tr("axis") : tr("button/hat")).arg(m_name).arg(timeout_sec).arg(timeout_sec >= 2 ? tr("seconds") : tr("second")));
-
-				for (auto& [device_type_id, new_joystick_state] : new_joystick_states)
-				{
-					const auto last_joystick_state = m_last_joystick_states.find(device_type_id);
-					if (last_joystick_state == m_last_joystick_states.cend())
-					{
-						continue;
-					}
-
-					if (m_is_axis)
-					{
-						constexpr s16 axis_change_threshold = 0x7FFF / 5;
-						if (last_joystick_state->second.axes.size() != new_joystick_state.axes.size())
-						{
-							logitech_g27_cfg_log.error("During input state change diff, number of axes on %04x:%04x changed", (device_type_id >> 16) & 0xFFFF, device_type_id & 0xFFFF);
-							continue;
-						}
-						for (usz i = 0; i < new_joystick_state.axes.size(); i++)
-						{
-							const s32 diff = std::abs(last_joystick_state->second.axes[i] - new_joystick_state.axes[i]);
-							if (diff > axis_change_threshold)
-							{
-								m_mapping_in_progress = false;
-								m_setting_dialog->set_state_text(DEFAULT_STATUS);
-								m_setting_dialog->set_enable(true);
-								m_mapping.device_type_id = device_type_id;
-								m_mapping.type = sdl_mapping_type::axis;
-								m_mapping.id = i;
-								m_mapping.hat = hat_component::none;
-								break;
-							}
-						}
-					}
-					else
-					{
-						if (last_joystick_state->second.buttons.size() != new_joystick_state.buttons.size())
-						{
-							logitech_g27_cfg_log.error("during input state change diff, number of buttons on %04x:%04x changed", (device_type_id >> 16) & 0xFFFF, device_type_id & 0xFFFF);
-							continue;
-						}
-						if (last_joystick_state->second.hats.size() != new_joystick_state.hats.size())
-						{
-							logitech_g27_cfg_log.error("during input state change diff, number of hats on %04x:%04x changed", (device_type_id >> 16) & 0xFFFF, device_type_id & 0xFFFF);
-							continue;
-						}
-						for (usz i = 0; i < new_joystick_state.buttons.size(); i++)
-						{
-							if (last_joystick_state->second.buttons[i] != new_joystick_state.buttons[i])
-							{
-								m_mapping_in_progress = false;
-								m_setting_dialog->set_state_text(DEFAULT_STATUS);
-								m_setting_dialog->set_enable(true);
-								m_mapping.device_type_id = device_type_id;
-								m_mapping.type = sdl_mapping_type::button;
-								m_mapping.id = i;
-								m_mapping.hat = hat_component::none;
-								break;
-							}
-						}
-						for (usz i = 0; i < new_joystick_state.hats.size(); i++)
-						{
-							if (last_joystick_state->second.hats[i] != new_joystick_state.hats[i] && new_joystick_state.hats[i] != hat_component::none)
-							{
-								m_mapping_in_progress = false;
-								m_setting_dialog->set_state_text(DEFAULT_STATUS);
-								m_setting_dialog->set_enable(true);
-								m_mapping.device_type_id = device_type_id;
-								m_mapping.type = sdl_mapping_type::hat;
-								m_mapping.id = i;
-								m_mapping.hat = new_joystick_state.hats[i];
-								break;
-							}
-						}
-					}
-				}
-
-				m_timeout_msec -= 25;
-				if (m_timeout_msec <= 0)
-				{
-					m_mapping_in_progress = false;
-					m_setting_dialog->set_state_text(DEFAULT_STATUS);
-					m_setting_dialog->set_enable(true);
-				}
-			}
-
-			update_display();
-		});
-		m_tick_timer->start(25);
-	}
-
-	void set_enable(bool enable)
-	{
-		m_map_button->setEnabled(enable);
-		m_unmap_button->setEnabled(enable);
-		m_reverse_checkbox->setEnabled(enable);
-	}
-
-	void set_mapping(const sdl_mapping& mapping)
-	{
-		m_mapping = mapping;
-		update_display();
-	}
-
-	const sdl_mapping& get_mapping() const
-	{
-		return m_mapping;
-	}
-
-private:
-	emulated_logitech_g27_settings_dialog* m_setting_dialog = nullptr;
-	DeviceChoice* m_ffb_device = nullptr;
-	DeviceChoice* m_led_device = nullptr;
-	sdl_mapping m_mapping{};
-	bool m_is_axis = false;
-	QString m_name;
-	bool m_flip_axis_display = false;
-
-	QLabel* m_display_box = nullptr;
-	QPushButton* m_map_button = nullptr;
-	QPushButton* m_unmap_button = nullptr;
-	QCheckBox* m_reverse_checkbox = nullptr;
-
-	bool m_mapping_in_progress = false;
-	int m_timeout_msec = 5500;
-	QTimer* m_tick_timer = nullptr;
-	std::map<u64, joystick_state> m_last_joystick_states;
-
-	QCheckBox* m_button_status = nullptr;
-	QSlider* m_axis_status = nullptr;
-
-	void update_display()
-	{
-		const std::string text = fmt::format("%04x:%04x (0x%08x), %s %u %s", (m_mapping.device_type_id >> 16) & 0xFFFF, m_mapping.device_type_id & 0xFFFF, m_mapping.device_type_id >> 32, m_mapping.type, m_mapping.id, m_mapping.hat);
-		m_display_box->setText(QString::fromStdString(text));
-
-		m_reverse_checkbox->setChecked(m_mapping.reverse);
-
-		if (m_button_status)
-			m_button_status->setChecked(m_mapping.reverse);
-
-		if (m_axis_status)
-		{
-			s32 axis_value = -0x8000;
-			if (m_mapping.reverse)
-				axis_value *= -1;
-			if (m_flip_axis_display)
-				axis_value *= -1;
-			m_axis_status->setValue(std::clamp(axis_value, -0x8000, 0x7FFF));
-		}
-
-		const std::map<u64, joystick_state>& joystick_states = m_setting_dialog->get_joystick_states();
-		auto joystick_state = joystick_states.find(m_mapping.device_type_id);
-
-		if (joystick_state != joystick_states.end())
-		{
-			switch (m_mapping.type)
-			{
-			case sdl_mapping_type::button:
-			{
-				if (joystick_state->second.buttons.size() <= m_mapping.id)
-					break;
-				bool value = joystick_state->second.buttons[m_mapping.id];
-				if (m_mapping.reverse)
-					value = !value;
-				m_button_status->setChecked(value);
-				break;
-			}
-			case sdl_mapping_type::hat:
-			{
-				if (joystick_state->second.hats.size() <= m_mapping.id)
-					break;
-				bool value = joystick_state->second.hats[m_mapping.id] == m_mapping.hat;
-				if (m_mapping.reverse)
-					value = !value;
-				m_button_status->setChecked(value);
-				break;
-			}
-			case sdl_mapping_type::axis:
-			{
-				if (joystick_state->second.axes.size() <= m_mapping.id)
-					break;
-				s32 value = joystick_state->second.axes[m_mapping.id];
-				if (m_mapping.reverse)
-					value *= -1;
-				if (m_flip_axis_display)
-					value *= -1;
-				m_axis_status->setValue(std::clamp(value, -0x8000, 0x7FFF));
-				break;
-			}
-			}
-		}
-	}
-};
-
-void emulated_logitech_g27_settings_dialog::save_ui_state_to_config()
-{
-	const auto save_mapping = [this](mapping_device device_choice)
-	{
-		emulated_logitech_g27_mapping& mapping = device_cfg(device_choice);
-		const sdl_mapping& m = ::at32(m_mappings, device_choice)->get_mapping();
-		mapping.device_type_id.set(m.device_type_id);
-		mapping.type.set(m.type);
-		mapping.id.set(m.id);
-		mapping.hat.set(m.hat);
-		mapping.reverse.set(m.reverse);
-
-		if (m_ffb_device->get_device_choice() == device_choice)
-		{
-			g_cfg_logitech_g27.ffb_device_type_id.set(m.device_type_id);
-		}
-		if (m_led_device->get_device_choice() == device_choice)
-		{
-			g_cfg_logitech_g27.led_device_type_id.set(m.device_type_id);
-		}
-	};
-
-	for (int i = 0; i < static_cast<int>(mapping_device::COUNT); i++)
-	{
-		save_mapping(static_cast<mapping_device>(i));
-	}
-
-	g_cfg_logitech_g27.enabled.set(m_enabled->isChecked());
-	g_cfg_logitech_g27.reverse_effects.set(m_reverse_effects->isChecked());
-
-	if (m_ffb_device->get_device_choice() == mapping_device::NONE)
-	{
-		g_cfg_logitech_g27.ffb_device_type_id.set(0);
-	}
-
-	if (m_led_device->get_device_choice() == mapping_device::NONE)
-	{
-		g_cfg_logitech_g27.led_device_type_id.set(0);
-	}
-}
-
-void emulated_logitech_g27_settings_dialog::load_ui_state_from_config()
-{
-	const auto load_mapping = [this](mapping_device device_choice)
-	{
-		const emulated_logitech_g27_mapping& mapping = device_cfg(device_choice);
-		const sdl_mapping m =
-		{
-			.device_type_id = mapping.device_type_id.get(),
-			.type = mapping.type.get(),
-			.id = mapping.id.get(),
-			.hat = mapping.hat.get(),
-			.reverse = mapping.reverse.get(),
-			.positive_axis = false
-		};
-
-		::at32(m_mappings, device_choice)->set_mapping(m);
-
-		const u64 ffb_device_type_id = g_cfg_logitech_g27.ffb_device_type_id.get();
-		const u64 led_device_type_id = g_cfg_logitech_g27.led_device_type_id.get();
-
-		if (ffb_device_type_id == m.device_type_id && m_ffb_device->get_device_choice() == mapping_device::NONE)
-		{
-			m_ffb_device->set_device_choice(device_choice);
-		}
-		if (led_device_type_id == m.device_type_id && m_led_device->get_device_choice() == mapping_device::NONE)
-		{
-			m_led_device->set_device_choice(device_choice);
-		}
-	};
-
-	for (int i = 0; i < static_cast<int>(mapping_device::COUNT); i++)
-	{
-		load_mapping(static_cast<mapping_device>(i));
-	}
-
-	m_enabled->setChecked(g_cfg_logitech_g27.enabled.get());
-	m_reverse_effects->setChecked(g_cfg_logitech_g27.reverse_effects.get());
-}
-
-emulated_logitech_g27_settings_dialog::emulated_logitech_g27_settings_dialog(QWidget* parent)
-	: QDialog(parent)
-{
-	setObjectName("emulated_logitech_g27_settings_dialog");
-	setWindowTitle(tr("Configure Emulated Logitech G27 Wheel"));
-	setAttribute(Qt::WA_DeleteOnClose);
-	setAttribute(Qt::WA_StyledBackground);
-	setModal(true);
-
-	QVBoxLayout* v_layout = new QVBoxLayout(this);
-
-	QDialogButtonBox* buttons = new QDialogButtonBox(this);
-	buttons->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::Save | QDialogButtonBox::RestoreDefaults);
-
-	g_cfg_logitech_g27.load();
-
-	connect(buttons, &QDialogButtonBox::clicked, this, [this, buttons](QAbstractButton* button)
-	{
-		if (button == buttons->button(QDialogButtonBox::Apply))
-		{
-			save_ui_state_to_config();
-			g_cfg_logitech_g27.save();
-			load_ui_state_from_config();
-		}
-		else if (button == buttons->button(QDialogButtonBox::Save))
-		{
-			save_ui_state_to_config();
-			g_cfg_logitech_g27.save();
-			accept();
-		}
-		else if (button == buttons->button(QDialogButtonBox::RestoreDefaults))
-		{
-			if (QMessageBox::question(this, tr("Confirm Reset"), tr("Reset all?")) != QMessageBox::Yes)
-				return;
-			g_cfg_logitech_g27.reset();
-			load_ui_state_from_config();
-		}
-		else if (button == buttons->button(QDialogButtonBox::Cancel))
-		{
-			reject();
-		}
-	});
-
-	QLabel* warning = new QLabel(tr("Warning: Force feedback output were meant for Logitech G27, on stronger wheels please adjust force strength accordingly in your wheel software."), this);
-	warning->setStyleSheet(QString("color: %0;").arg(gui::utils::get_label_color("emulated_logitech_g27_warning_label", Qt::red, Qt::red).name()));
-	warning->setWordWrap(true);
-	v_layout->addWidget(warning);
-
-	QLabel* mapping_note = new QLabel(tr("Note: Please DO NOT map your wheel onto gamepads, only map it here. If your wheel was mapped onto gamepads, go to gamepad settings and unmap it. If you used vJoy to map your wheel onto a gamepad before for RPCS3, undo that."), this);
-	mapping_note->setWordWrap(true);
-	v_layout->addWidget(mapping_note);
-
-	m_enabled = new QCheckBox(tr("Enabled (requires game restart)"), this);
-	v_layout->addWidget(m_enabled);
-
-	m_reverse_effects = new QCheckBox(tr("Reverse force feedback effects"), this);
-	v_layout->addWidget(m_reverse_effects);
-
-	m_state_text = new QLabel(DEFAULT_STATUS, this);
-	v_layout->addWidget(m_state_text);
-
-	m_ffb_device = new DeviceChoice(this, tr("Use the device with the following mapping for force feedback:"));
-	m_led_device = new DeviceChoice(this, tr("Use the device with the following mapping for LED:"));
-
-	m_mapping_scroll_area = new QScrollArea(this);
-	QWidget* mapping_widget = new QWidget(m_mapping_scroll_area);
-	QVBoxLayout* mapping_layout = new QVBoxLayout(mapping_widget);
-	mapping_widget->setLayout(mapping_layout);
-	m_mapping_scroll_area->setWidget(mapping_widget);
-	m_mapping_scroll_area->setWidgetResizable(true);
-	m_mapping_scroll_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-	m_mapping_scroll_area->setMinimumHeight(400);
-	m_mapping_scroll_area->setMinimumWidth(700);
-
-	v_layout->addWidget(m_mapping_scroll_area);
-
-	QLabel* axis_label = new QLabel(tr("Axes:"), mapping_widget);
-	mapping_layout->addWidget(axis_label);
-
-	const auto add_axis = [this, mapping_widget, mapping_layout](mapping_device dev, bool flip_axis_display)
-	{
-		m_mappings[dev] = new Mapping(mapping_widget, this, true, device_name(dev), flip_axis_display);
-		mapping_layout->addWidget(m_mappings[dev]);
-	};
-
-	const auto add_button = [this, mapping_widget, mapping_layout](mapping_device dev)
-	{
-		m_mappings[dev] = new Mapping(mapping_widget, this, false, device_name(dev), false);
-		mapping_layout->addWidget(m_mappings[dev]);
-	};
-
-	add_axis(mapping_device::STEERING, false);
-	add_axis(mapping_device::THROTTLE, true);
-	add_axis(mapping_device::BRAKE, true);
-	add_axis(mapping_device::CLUTCH, true);
-
-	QLabel* button_label = new QLabel(tr("Buttons:"), mapping_widget);
-	mapping_layout->addWidget(button_label);
-
-	for (int i = static_cast<int>(mapping_device::FIRST_BUTTON); i < static_cast<int>(mapping_device::COUNT); i++)
-	{
-		add_button(static_cast<mapping_device>(i));
-	}
-
-	v_layout->addSpacing(20);
-
-	v_layout->addWidget(m_ffb_device);
-	v_layout->addWidget(m_led_device);
-
-	v_layout->addWidget(buttons);
-	setLayout(v_layout);
-
-	m_sdl_initialized = sdl_instance::get_instance().initialize();
-
-	load_ui_state_from_config();
-
-	if (m_sdl_initialized)
-		get_joystick_states();
-}
-
-emulated_logitech_g27_settings_dialog::~emulated_logitech_g27_settings_dialog()
-{
-	for (SDL_Joystick* joystick_handle : m_joystick_handles)
-	{
-		if (joystick_handle)
-			SDL_CloseJoystick(joystick_handle);
-	}
-}
-
-static inline hat_component get_sdl_hat_component(u8 sdl_hat)
-{
-	if (sdl_hat & SDL_HAT_UP)
-	{
-		return hat_component::up;
-	}
-
-	if (sdl_hat & SDL_HAT_DOWN)
-	{
-		return hat_component::down;
-	}
-
-	if (sdl_hat & SDL_HAT_LEFT)
-	{
-		return hat_component::left;
-	}
-
-	if (sdl_hat & SDL_HAT_RIGHT)
-	{
-		return hat_component::right;
-	}
-
-	return hat_component::none;
-}
-
-const std::map<u64, joystick_state>& emulated_logitech_g27_settings_dialog::get_joystick_states()
-{
-	if (!m_sdl_initialized)
-	{
-		return m_last_joystick_states;
-	}
-
-	const u64 now = SDL_GetTicks();
-
-	if (now - m_last_joystick_states_update < 25)
-	{
-		return m_last_joystick_states;
-	}
-
-	m_last_joystick_states_update = now;
-
-	std::map<u64, joystick_state> new_joystick_states;
-	std::vector<SDL_Joystick*> new_joystick_handles;
-
-	sdl_instance::get_instance().pump_events();
-
-	int joystick_count = 0;
-	if (SDL_JoystickID* joystick_ids = SDL_GetJoysticks(&joystick_count))
-	{
-		for (int i = 0; i < joystick_count; i++)
-		{
-			SDL_Joystick* cur_joystick = SDL_OpenJoystick(joystick_ids[i]);
-			if (!cur_joystick)
-			{
-				continue;
-			}
-			new_joystick_handles.push_back(cur_joystick);
-
-			const int num_axes = SDL_GetNumJoystickAxes(cur_joystick);
-			const int num_buttons = SDL_GetNumJoystickButtons(cur_joystick);
-			const int num_hats = SDL_GetNumJoystickHats(cur_joystick);
-			const emulated_g27_device_type_id device_type_id_struct =
-			{
-				.product_id = static_cast<u64>(SDL_GetJoystickProduct(cur_joystick)),
-				.vendor_id = static_cast<u64>(SDL_GetJoystickVendor(cur_joystick)),
-				.num_axes = static_cast<u64>(num_axes),
-				.num_hats = static_cast<u64>(num_hats),
-				.num_buttons = static_cast<u64>(num_buttons)
-			};
-			const u64 device_type_id = device_type_id_struct.as_u64();
-
-			auto cur_state = new_joystick_states.find(device_type_id);
-			if (cur_state == new_joystick_states.end())
-			{
-				joystick_state s {};
-				for (int j = 0; j < num_axes; j++)
-				{
-					s.axes.push_back(SDL_GetJoystickAxis(cur_joystick, j));
-				}
-				for (int j = 0; j < num_buttons; j++)
-				{
-					s.buttons.push_back(SDL_GetJoystickButton(cur_joystick, j));
-				}
-				for (int j = 0; j < num_hats; j++)
-				{
-					const u8 sdl_hat = SDL_GetJoystickHat(cur_joystick, j);
-					s.hats.push_back(get_sdl_hat_component(sdl_hat));
-				}
-				new_joystick_states[device_type_id] = std::move(s);
-			}
-			else
-			{
-				for (s32 j = 0; j < static_cast<s32>(cur_state->second.axes.size()); j++)
-				{
-					cur_state->second.axes[j] = (cur_state->second.axes[j] + SDL_GetJoystickAxis(cur_joystick, j)) / 2;
-				}
-				for (s32 j = 0; j < static_cast<s32>(cur_state->second.buttons.size()); j++)
-				{
-					cur_state->second.buttons[j] = cur_state->second.buttons[j] || SDL_GetJoystickButton(cur_joystick, j);
-				}
-				for (s32 j = 0; j < static_cast<s32>(cur_state->second.hats.size()); j++)
-				{
-					if (cur_state->second.hats[j] != hat_component::none)
-						continue;
-					const u8 sdl_hat = SDL_GetJoystickHat(cur_joystick, j);
-					cur_state->second.hats[j] = get_sdl_hat_component(sdl_hat);
-				}
-			}
-		}
-	}
-
-	for (SDL_Joystick* joystick_handle : m_joystick_handles)
-	{
-		if (joystick_handle)
-			SDL_CloseJoystick(joystick_handle);
-	}
-
-	m_joystick_handles = new_joystick_handles;
-	m_last_joystick_states = new_joystick_states;
-
-	return m_last_joystick_states;
-}
-
-void emulated_logitech_g27_settings_dialog::set_state_text(const QString& text)
-{
-	m_state_text->setText(text);
-}
-
-void emulated_logitech_g27_settings_dialog::set_enable(bool enable)
-{
-	const int slider_position = m_mapping_scroll_area->verticalScrollBar()->sliderPosition();
-
-	for (auto& [dev, mapping] : m_mappings)
-	{
-		mapping->set_enable(enable);
-	}
-
-	m_enabled->setEnabled(enable);
-	m_reverse_effects->setEnabled(enable);
-
-	m_ffb_device->set_enable(enable);
-	m_led_device->set_enable(enable);
-
-	m_mapping_scroll_area->verticalScrollBar()->setEnabled(enable);
-	m_mapping_scroll_area->verticalScrollBar()->setSliderPosition(slider_position);
-}
-
-#endif
diff --git a/rpcs3/rpcs3qt/emulated_logitech_g27_settings_dialog.h b/rpcs3/rpcs3qt/emulated_logitech_g27_settings_dialog.h
deleted file mode 100644
index f06f1308c1..0000000000
--- a/rpcs3/rpcs3qt/emulated_logitech_g27_settings_dialog.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#pragma once
-
-#ifdef HAVE_SDL3
-
-#include <QDialog>
-#include <QLabel>
-#include <QCheckBox>
-#include <QScrollArea>
-
-#ifndef _MSC_VER
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include "SDL3/SDL.h"
-#ifndef _MSC_VER
-#pragma GCC diagnostic pop
-#endif
-
-#include <map>
-#include <vector>
-#include <Emu/Io/LogitechG27Config.h>
-
-struct joystick_state
-{
-	std::vector<s16> axes;
-	std::vector<bool> buttons;
-	std::vector<hat_component> hats;
-};
-
-class Mapping;
-class DeviceChoice;
-
-enum class mapping_device;
-
-class emulated_logitech_g27_settings_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	emulated_logitech_g27_settings_dialog(QWidget* parent = nullptr);
-	virtual ~emulated_logitech_g27_settings_dialog();
-	void set_state_text(const QString& text);
-	const std::map<u64, joystick_state>& get_joystick_states();
-	void set_enable(bool enable);
-
-private:
-	void load_ui_state_from_config();
-	void save_ui_state_to_config();
-
-	std::map<u64, joystick_state> m_last_joystick_states;
-	std::vector<SDL_Joystick*> m_joystick_handles;
-	uint64_t m_last_joystick_states_update = 0;
-	bool m_sdl_initialized = false;
-
-	// ui elements
-	QLabel* m_state_text = nullptr;
-
-	QCheckBox* m_enabled = nullptr;
-	QCheckBox* m_reverse_effects = nullptr;
-
-	std::map<mapping_device, Mapping*> m_mappings;
-
-	DeviceChoice* m_ffb_device = nullptr;
-	DeviceChoice* m_led_device = nullptr;
-
-	QScrollArea* m_mapping_scroll_area = nullptr;
-};
-
-#endif
diff --git a/rpcs3/rpcs3qt/emulated_pad_settings_dialog.cpp b/rpcs3/rpcs3qt/emulated_pad_settings_dialog.cpp
deleted file mode 100644
index aee4c44c77..0000000000
--- a/rpcs3/rpcs3qt/emulated_pad_settings_dialog.cpp
+++ /dev/null
@@ -1,608 +0,0 @@
-#include "stdafx.h"
-#include "emulated_pad_settings_dialog.h"
-#include "localized_emu.h"
-#include "Input/raw_mouse_config.h"
-#include "Emu/Io/mouse_config.h"
-#include "Emu/Io/buzz_config.h"
-#include "Emu/Io/gem_config.h"
-#include "Emu/Io/ghltar_config.h"
-#include "Emu/Io/guncon3_config.h"
-#include "Emu/Io/topshotelite_config.h"
-#include "Emu/Io/topshotfearmaster_config.h"
-#include "Emu/Io/turntable_config.h"
-#include "Emu/Io/usio_config.h"
-#include "util/asm.hpp"
-
-#include <QDialogButtonBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QVBoxLayout>
-
-enum button_role
-{
-	button = Qt::UserRole,
-	emulated_button
-};
-
-emulated_pad_settings_dialog::emulated_pad_settings_dialog(pad_type type, QWidget* parent)
-	: QDialog(parent), m_type(type)
-{
-	setObjectName("emulated_pad_settings_dialog");
-	setAttribute(Qt::WA_DeleteOnClose);
-	setAttribute(Qt::WA_StyledBackground);
-	setModal(true);
-
-	QVBoxLayout* v_layout = new QVBoxLayout(this);
-
-	QTabWidget* tabs = new QTabWidget();
-	tabs->setUsesScrollButtons(false);
-
-	QDialogButtonBox* buttons = new QDialogButtonBox(this);
-	buttons->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::Save | QDialogButtonBox::RestoreDefaults);
-
-	connect(buttons, &QDialogButtonBox::clicked, this, [this, buttons](QAbstractButton* button)
-	{
-		if (button == buttons->button(QDialogButtonBox::Apply))
-		{
-			save_config();
-		}
-		else if (button == buttons->button(QDialogButtonBox::Save))
-		{
-			save_config();
-			accept();
-		}
-		else if (button == buttons->button(QDialogButtonBox::RestoreDefaults))
-		{
-			if (QMessageBox::question(this, tr("Confirm Reset"), tr("Reset all buttons of all players?")) != QMessageBox::Yes)
-				return;
-			reset_config();
-		}
-		else if (button == buttons->button(QDialogButtonBox::Cancel))
-		{
-			// Restore config
-			load_config();
-			reject();
-		}
-	});
-
-	load_config();
-
-	switch (m_type)
-	{
-	case emulated_pad_settings_dialog::pad_type::buzz:
-		setWindowTitle(tr("Configure Emulated Buzz"));
-		add_tabs<buzz_btn>(tabs);
-		break;
-	case emulated_pad_settings_dialog::pad_type::turntable:
-		setWindowTitle(tr("Configure Emulated Turntable"));
-		add_tabs<turntable_btn>(tabs);
-		break;
-	case emulated_pad_settings_dialog::pad_type::ghltar:
-		setWindowTitle(tr("Configure Emulated GHLtar"));
-		add_tabs<ghltar_btn>(tabs);
-		break;
-	case emulated_pad_settings_dialog::pad_type::usio:
-		setWindowTitle(tr("Configure Emulated USIO"));
-		add_tabs<usio_btn>(tabs);
-		break;
-	case emulated_pad_settings_dialog::pad_type::gem:
-		setWindowTitle(tr("Configure Emulated PS Move (Real)"));
-		add_tabs<gem_btn>(tabs);
-		break;
-	case emulated_pad_settings_dialog::pad_type::ds3gem:
-		setWindowTitle(tr("Configure Emulated PS Move (Fake)"));
-		add_tabs<gem_btn>(tabs);
-		break;
-	case emulated_pad_settings_dialog::pad_type::mousegem:
-		setWindowTitle(tr("Configure Emulated PS Move (Mouse)"));
-		add_tabs<gem_btn>(tabs);
-		break;
-	case emulated_pad_settings_dialog::pad_type::guncon3:
-		setWindowTitle(tr("Configure Emulated GunCon 3"));
-		add_tabs<guncon3_btn>(tabs);
-		break;
-	case emulated_pad_settings_dialog::pad_type::topshotelite:
-		setWindowTitle(tr("Configure Emulated Top Shot Elite"));
-		add_tabs<topshotelite_btn>(tabs);
-		break;
-	case emulated_pad_settings_dialog::pad_type::topshotfearmaster:
-		setWindowTitle(tr("Configure Emulated Top Shot Fearmaster"));
-		add_tabs<topshotfearmaster_btn>(tabs);
-		break;
-	}
-
-	v_layout->addWidget(tabs);
-	v_layout->addWidget(buttons);
-	setLayout(v_layout);
-}
-
-template <typename T>
-void emulated_pad_settings_dialog::add_tabs(QTabWidget* tabs)
-{
-	ensure(!!tabs);
-
-	std::set<int> ignored_values;
-
-	const auto remove_value = [&ignored_values](int value)
-	{
-		ignored_values.insert(static_cast<int>(value));
-	};
-
-	usz players = 0;
-	switch (m_type)
-	{
-	case pad_type::buzz:
-		players = g_cfg_buzz.players.size();
-		break;
-	case pad_type::turntable:
-		players = g_cfg_turntable.players.size();
-		break;
-	case pad_type::ghltar:
-		players = g_cfg_ghltar.players.size();
-		break;
-	case pad_type::usio:
-		players = g_cfg_usio.players.size();
-		break;
-	case pad_type::gem:
-		players = g_cfg_gem_real.players.size();
-
-		// Ignore combo, x and y axis
-		remove_value(static_cast<int>(gem_btn::x_axis));
-		remove_value(static_cast<int>(gem_btn::y_axis));
-		for (int i = static_cast<int>(gem_btn::combo_begin); i <= static_cast<int>(gem_btn::combo_end); i++)
-		{
-			remove_value(i);
-		}
-		break;
-	case pad_type::ds3gem:
-		players = g_cfg_gem_fake.players.size();
-
-		// Ignore combo
-		for (int i = static_cast<int>(gem_btn::combo_begin); i <= static_cast<int>(gem_btn::combo_end); i++)
-		{
-			remove_value(i);
-		}
-		break;
-	case pad_type::mousegem:
-		players = g_cfg_gem_mouse.players.size();
-
-		// Ignore x and y axis
-		remove_value(static_cast<int>(gem_btn::x_axis));
-		remove_value(static_cast<int>(gem_btn::y_axis));
-		break;
-	case pad_type::guncon3:
-		players = g_cfg_guncon3.players.size();
-		break;
-	case pad_type::topshotelite:
-		players = g_cfg_topshotelite.players.size();
-		break;
-	case pad_type::topshotfearmaster:
-		players = g_cfg_topshotfearmaster.players.size();
-		break;
-	}
-
-	constexpr u32 max_items_per_column = 6;
-	const int count = static_cast<int>(T::count) - static_cast<int>(ignored_values.size());
-	int rows = count;
-
-	for (u32 cols = 1; utils::aligned_div(static_cast<u32>(count), cols) > max_items_per_column;)
-	{
-		rows = utils::aligned_div(static_cast<u32>(count), ++cols);
-	}
-
-	m_combos.resize(players);
-
-	const bool show_mouse_legend = m_type == pad_type::mousegem;
-
-	if (show_mouse_legend)
-	{
-		if (!g_cfg_mouse.load())
-		{
-			cfg_log.notice("Could not restore mouse config. Using defaults.");
-		}
-
-		if (!g_cfg_raw_mouse.load())
-		{
-			cfg_log.notice("Could not restore raw mouse config. Using defaults.");
-		}
-	}
-
-	for (usz player = 0; player < players; player++)
-	{
-		// Create grid with all buttons
-		QGridLayout* grid_layout = new QGridLayout(this);
-
-		for (int i = 0, row = 0, col = 0; i < static_cast<int>(T::count); i++)
-		{
-			if (ignored_values.contains(i)) continue;
-
-			const T id = static_cast<T>(i);
-			const QString name = QString::fromStdString(fmt::format("%s", id));
-
-			QHBoxLayout* h_layout = new QHBoxLayout(this);
-			QGroupBox* gb = new QGroupBox(name, this);
-			QComboBox* combo = new QComboBox;
-
-			if constexpr (std::is_same_v<T, gem_btn>)
-			{
-				const gem_btn btn = static_cast<gem_btn>(i);
-				if (btn >= gem_btn::combo_begin && btn <= gem_btn::combo_end)
-				{
-					gb->setToolTip(tr("Press the \"Combo\" button in combination with any of the other combo buttons to trigger their related PS Move button.\n"
-					                  "This can be useful if your device does not have enough regular buttons."));
-				}
-			}
-
-			// Add empty value
-			combo->addItem("");
-			const int index = combo->findText("");
-			combo->setItemData(index, static_cast<int>(pad_button::pad_button_max_enum), button_role::button);
-			combo->setItemData(index, i, button_role::emulated_button);
-
-			if (m_type != pad_type::mousegem)
-			{
-				for (int p = 0; p < static_cast<int>(pad_button::pad_button_max_enum); p++)
-				{
-					const QString translated = localized_emu::translated_pad_button(static_cast<pad_button>(p));
-					combo->addItem(translated);
-					const int index = combo->findText(translated);
-					combo->setItemData(index, p, button_role::button);
-					combo->setItemData(index, i, button_role::emulated_button);
-				}
-			}
-
-			if (std::is_same_v<T, guncon3_btn> || std::is_same_v<T, topshotelite_btn> || std::is_same_v<T, topshotfearmaster_btn> || m_type == pad_type::mousegem)
-			{
-				for (int p = static_cast<int>(pad_button::mouse_button_1); p <= static_cast<int>(pad_button::mouse_button_8); p++)
-				{
-					const QString translated = localized_emu::translated_pad_button(static_cast<pad_button>(p));
-					combo->addItem(translated);
-					const int index = combo->findText(translated);
-					combo->setItemData(index, p, button_role::button);
-					combo->setItemData(index, i, button_role::emulated_button);
-				}
-			}
-
-			pad_button saved_btn_id = pad_button::pad_button_max_enum;
-			switch (m_type)
-			{
-			case pad_type::buzz:
-				saved_btn_id = ::at32(g_cfg_buzz.players, player)->get_pad_button(static_cast<buzz_btn>(id));
-				break;
-			case pad_type::turntable:
-				saved_btn_id = ::at32(g_cfg_turntable.players, player)->get_pad_button(static_cast<turntable_btn>(id));
-				break;
-			case pad_type::ghltar:
-				saved_btn_id = ::at32(g_cfg_ghltar.players, player)->get_pad_button(static_cast<ghltar_btn>(id));
-				break;
-			case pad_type::usio:
-				saved_btn_id = ::at32(g_cfg_usio.players, player)->get_pad_button(static_cast<usio_btn>(id));
-				break;
-			case pad_type::gem:
-				saved_btn_id = ::at32(g_cfg_gem_real.players, player)->get_pad_button(static_cast<gem_btn>(id));
-				break;
-			case pad_type::ds3gem:
-				saved_btn_id = ::at32(g_cfg_gem_fake.players, player)->get_pad_button(static_cast<gem_btn>(id));
-				break;
-			case pad_type::mousegem:
-				saved_btn_id = ::at32(g_cfg_gem_mouse.players, player)->get_pad_button(static_cast<gem_btn>(id));
-				break;
-			case pad_type::guncon3:
-				saved_btn_id = ::at32(g_cfg_guncon3.players, player)->get_pad_button(static_cast<guncon3_btn>(id));
-				break;
-			case pad_type::topshotelite:
-				saved_btn_id = ::at32(g_cfg_topshotelite.players, player)->get_pad_button(static_cast<topshotelite_btn>(id));
-				break;
-			case pad_type::topshotfearmaster:
-				saved_btn_id = ::at32(g_cfg_topshotfearmaster.players, player)->get_pad_button(static_cast<topshotfearmaster_btn>(id));
-				break;
-			}
-
-			combo->setCurrentIndex(combo->findData(static_cast<int>(saved_btn_id)));
-
-			connect(combo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this, player, id, combo](int index)
-			{
-				if (index < 0 || !combo)
-					return;
-
-				const QVariant data = combo->itemData(index, button_role::button);
-				if (!data.isValid() || !data.canConvert<int>())
-					return;
-
-				const pad_button btn_id = static_cast<pad_button>(data.toInt());
-
-				switch (m_type)
-				{
-				case pad_type::buzz:
-					::at32(g_cfg_buzz.players, player)->set_button(static_cast<buzz_btn>(id), btn_id);
-					break;
-				case pad_type::turntable:
-					::at32(g_cfg_turntable.players, player)->set_button(static_cast<turntable_btn>(id), btn_id);
-					break;
-				case pad_type::ghltar:
-					::at32(g_cfg_ghltar.players, player)->set_button(static_cast<ghltar_btn>(id), btn_id);
-					break;
-				case pad_type::usio:
-					::at32(g_cfg_usio.players, player)->set_button(static_cast<usio_btn>(id), btn_id);
-					break;
-				case pad_type::gem:
-					::at32(g_cfg_gem_real.players, player)->set_button(static_cast<gem_btn>(id), btn_id);
-					break;
-				case pad_type::ds3gem:
-					::at32(g_cfg_gem_fake.players, player)->set_button(static_cast<gem_btn>(id), btn_id);
-					break;
-				case pad_type::mousegem:
-					::at32(g_cfg_gem_mouse.players, player)->set_button(static_cast<gem_btn>(id), btn_id);
-					break;
-				case pad_type::guncon3:
-					::at32(g_cfg_guncon3.players, player)->set_button(static_cast<guncon3_btn>(id), btn_id);
-					break;
-				case pad_type::topshotelite:
-					::at32(g_cfg_topshotelite.players, player)->set_button(static_cast<topshotelite_btn>(id), btn_id);
-					break;
-				case pad_type::topshotfearmaster:
-					::at32(g_cfg_topshotfearmaster.players, player)->set_button(static_cast<topshotfearmaster_btn>(id), btn_id);
-					break;
-				}
-			});
-
-			if (row >= rows)
-			{
-				row = 0;
-				col++;
-			}
-
-			::at32(m_combos, player).push_back(combo);
-			h_layout->addWidget(combo);
-			gb->setLayout(h_layout);
-			grid_layout->addWidget(gb, row, col);
-
-			row++;
-		}
-
-		QVBoxLayout* v_layout = new QVBoxLayout(this);
-
-		// Create a legend of the current mouse settings
-		if (show_mouse_legend)
-		{
-			QHBoxLayout* legend_layout = new QHBoxLayout(this);
-			if (player == 0)
-			{
-				std::string basic_mouse_settings;
-				fmt::append(basic_mouse_settings, "1: %s\n", g_cfg_mouse.mouse_button_1.to_string());
-				fmt::append(basic_mouse_settings, "2: %s\n", g_cfg_mouse.mouse_button_2.to_string());
-				fmt::append(basic_mouse_settings, "3: %s\n", g_cfg_mouse.mouse_button_3.to_string());
-				fmt::append(basic_mouse_settings, "4: %s\n", g_cfg_mouse.mouse_button_4.to_string());
-				fmt::append(basic_mouse_settings, "5: %s\n", g_cfg_mouse.mouse_button_5.to_string());
-				fmt::append(basic_mouse_settings, "6: %s\n", g_cfg_mouse.mouse_button_6.to_string());
-				fmt::append(basic_mouse_settings, "7: %s\n", g_cfg_mouse.mouse_button_7.to_string());
-				fmt::append(basic_mouse_settings, "8: %s",   g_cfg_mouse.mouse_button_8.to_string());
-
-				QGroupBox* gb_legend_basic = new QGroupBox(tr("Current Basic Mouse Config"), this);
-				QVBoxLayout* gb_legend_basic_layout = new QVBoxLayout(this);
-				gb_legend_basic_layout->addWidget(new QLabel(QString::fromStdString(basic_mouse_settings), this));
-				gb_legend_basic->setLayout(gb_legend_basic_layout);
-				legend_layout->addWidget(gb_legend_basic);
-			}
-			{
-				std::string raw_mouse_settings;
-				const auto& raw_cfg = *ensure(::at32(g_cfg_raw_mouse.players, player));
-				fmt::append(raw_mouse_settings, "1: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_1.to_string()));
-				fmt::append(raw_mouse_settings, "2: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_2.to_string()));
-				fmt::append(raw_mouse_settings, "3: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_3.to_string()));
-				fmt::append(raw_mouse_settings, "4: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_4.to_string()));
-				fmt::append(raw_mouse_settings, "5: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_5.to_string()));
-				fmt::append(raw_mouse_settings, "6: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_6.to_string()));
-				fmt::append(raw_mouse_settings, "7: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_7.to_string()));
-				fmt::append(raw_mouse_settings, "8: %s",   raw_mouse_config::get_button_name(raw_cfg.mouse_button_8.to_string()));
-
-				QGroupBox* gb_legend_raw = new QGroupBox(tr("Current Raw Mouse Config"), this);
-				QVBoxLayout* gb_legend_raw_layout = new QVBoxLayout(this);
-				gb_legend_raw_layout->addWidget(new QLabel(QString::fromStdString(raw_mouse_settings), this));
-				gb_legend_raw->setLayout(gb_legend_raw_layout);
-				legend_layout->addWidget(gb_legend_raw);
-			}
-			v_layout->addLayout(legend_layout);
-		}
-
-		v_layout->addLayout(grid_layout);
-
-		QWidget* widget = new QWidget(this);
-		widget->setLayout(v_layout);
-
-		tabs->addTab(widget, tr("Player %0").arg(player + 1));
-	}
-}
-
-void emulated_pad_settings_dialog::load_config()
-{
-	switch (m_type)
-	{
-	case emulated_pad_settings_dialog::pad_type::buzz:
-		if (!g_cfg_buzz.load())
-		{
-			cfg_log.notice("Could not load buzz config. Using defaults.");
-		}
-		break;
-	case emulated_pad_settings_dialog::pad_type::turntable:
-		if (!g_cfg_turntable.load())
-		{
-			cfg_log.notice("Could not load turntable config. Using defaults.");
-		}
-		break;
-	case emulated_pad_settings_dialog::pad_type::ghltar:
-		if (!g_cfg_ghltar.load())
-		{
-			cfg_log.notice("Could not load ghltar config. Using defaults.");
-		}
-		break;
-	case emulated_pad_settings_dialog::pad_type::usio:
-		if (!g_cfg_usio.load())
-		{
-			cfg_log.notice("Could not load usio config. Using defaults.");
-		}
-		break;
-	case emulated_pad_settings_dialog::pad_type::gem:
-		if (!g_cfg_gem_real.load())
-		{
-			cfg_log.notice("Could not load gem config. Using defaults.");
-		}
-		break;
-	case emulated_pad_settings_dialog::pad_type::ds3gem:
-		if (!g_cfg_gem_fake.load())
-		{
-			cfg_log.notice("Could not load fake gem config. Using defaults.");
-		}
-		break;
-	case emulated_pad_settings_dialog::pad_type::mousegem:
-		if (!g_cfg_gem_mouse.load())
-		{
-			cfg_log.notice("Could not load mouse gem config. Using defaults.");
-		}
-		break;
-	case emulated_pad_settings_dialog::pad_type::guncon3:
-		if (!g_cfg_guncon3.load())
-		{
-			cfg_log.notice("Could not load guncon3 config. Using defaults.");
-		}
-		break;
-	case emulated_pad_settings_dialog::pad_type::topshotelite:
-		if (!g_cfg_topshotelite.load())
-		{
-			cfg_log.notice("Could not load topshotelite config. Using defaults.");
-		}
-		break;
-	case emulated_pad_settings_dialog::pad_type::topshotfearmaster:
-		if (!g_cfg_topshotfearmaster.load())
-		{
-			cfg_log.notice("Could not load topshotfearmaster config. Using defaults.");
-		}
-		break;
-	}
-}
-
-void emulated_pad_settings_dialog::save_config()
-{
-	switch (m_type)
-	{
-	case emulated_pad_settings_dialog::pad_type::buzz:
-		g_cfg_buzz.save();
-		break;
-	case emulated_pad_settings_dialog::pad_type::turntable:
-		g_cfg_turntable.save();
-		break;
-	case emulated_pad_settings_dialog::pad_type::ghltar:
-		g_cfg_ghltar.save();
-		break;
-	case emulated_pad_settings_dialog::pad_type::usio:
-		g_cfg_usio.save();
-		break;
-	case emulated_pad_settings_dialog::pad_type::gem:
-		g_cfg_gem_real.save();
-		break;
-	case emulated_pad_settings_dialog::pad_type::ds3gem:
-		g_cfg_gem_fake.save();
-		break;
-	case emulated_pad_settings_dialog::pad_type::mousegem:
-		g_cfg_gem_mouse.save();
-		break;
-	case emulated_pad_settings_dialog::pad_type::guncon3:
-		g_cfg_guncon3.save();
-		break;
-	case emulated_pad_settings_dialog::pad_type::topshotelite:
-		g_cfg_topshotelite.save();
-		break;
-	case emulated_pad_settings_dialog::pad_type::topshotfearmaster:
-		g_cfg_topshotfearmaster.save();
-		break;
-	}
-}
-
-void emulated_pad_settings_dialog::reset_config()
-{
-	switch (m_type)
-	{
-	case emulated_pad_settings_dialog::pad_type::buzz:
-		g_cfg_buzz.from_default();
-		break;
-	case emulated_pad_settings_dialog::pad_type::turntable:
-		g_cfg_turntable.from_default();
-		break;
-	case emulated_pad_settings_dialog::pad_type::ghltar:
-		g_cfg_ghltar.from_default();
-		break;
-	case emulated_pad_settings_dialog::pad_type::usio:
-		g_cfg_usio.from_default();
-		break;
-	case emulated_pad_settings_dialog::pad_type::gem:
-		g_cfg_gem_real.from_default();
-		break;
-	case emulated_pad_settings_dialog::pad_type::ds3gem:
-		g_cfg_gem_fake.from_default();
-		break;
-	case emulated_pad_settings_dialog::pad_type::mousegem:
-		g_cfg_gem_mouse.from_default();
-		break;
-	case emulated_pad_settings_dialog::pad_type::guncon3:
-		g_cfg_guncon3.from_default();
-		break;
-	case emulated_pad_settings_dialog::pad_type::topshotelite:
-		g_cfg_topshotelite.from_default();
-		break;
-	case emulated_pad_settings_dialog::pad_type::topshotfearmaster:
-		g_cfg_topshotfearmaster.from_default();
-		break;
-	}
-
-	for (usz player = 0; player < m_combos.size(); player++)
-	{
-		for (QComboBox* combo : m_combos.at(player))
-		{
-			if (!combo)
-				continue;
-
-			const QVariant data = combo->itemData(0, button_role::emulated_button);
-			if (!data.isValid() || !data.canConvert<int>())
-				continue;
-
-			pad_button def_btn_id = pad_button::pad_button_max_enum;
-			switch (m_type)
-			{
-			case pad_type::buzz:
-				def_btn_id = ::at32(g_cfg_buzz.players, player)->default_pad_button(static_cast<buzz_btn>(data.toInt()));
-				break;
-			case pad_type::turntable:
-				def_btn_id = ::at32(g_cfg_turntable.players, player)->default_pad_button(static_cast<turntable_btn>(data.toInt()));
-				break;
-			case pad_type::ghltar:
-				def_btn_id = ::at32(g_cfg_ghltar.players, player)->default_pad_button(static_cast<ghltar_btn>(data.toInt()));
-				break;
-			case pad_type::usio:
-				def_btn_id = ::at32(g_cfg_usio.players, player)->default_pad_button(static_cast<usio_btn>(data.toInt()));
-				break;
-			case pad_type::gem:
-				def_btn_id = ::at32(g_cfg_gem_real.players, player)->default_pad_button(static_cast<gem_btn>(data.toInt()));
-				break;
-			case pad_type::ds3gem:
-				def_btn_id = ::at32(g_cfg_gem_fake.players, player)->default_pad_button(static_cast<gem_btn>(data.toInt()));
-				break;
-			case pad_type::mousegem:
-				def_btn_id = ::at32(g_cfg_gem_mouse.players, player)->default_pad_button(static_cast<gem_btn>(data.toInt()));
-				break;
-			case pad_type::guncon3:
-				def_btn_id = ::at32(g_cfg_guncon3.players, player)->default_pad_button(static_cast<guncon3_btn>(data.toInt()));
-				break;
-			case pad_type::topshotelite:
-				def_btn_id = ::at32(g_cfg_topshotelite.players, player)->default_pad_button(static_cast<topshotelite_btn>(data.toInt()));
-				break;
-			case pad_type::topshotfearmaster:
-				def_btn_id = ::at32(g_cfg_topshotfearmaster.players, player)->default_pad_button(static_cast<topshotfearmaster_btn>(data.toInt()));
-				break;
-			}
-
-			combo->setCurrentIndex(combo->findData(static_cast<int>(def_btn_id)));
-		}
-	}
-}
diff --git a/rpcs3/rpcs3qt/emulated_pad_settings_dialog.h b/rpcs3/rpcs3qt/emulated_pad_settings_dialog.h
deleted file mode 100644
index 490dee3ae7..0000000000
--- a/rpcs3/rpcs3qt/emulated_pad_settings_dialog.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-#include <QComboBox>
-#include <QDialog>
-#include <QTabWidget>
-
-#include <vector>
-
-class emulated_pad_settings_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	enum class pad_type
-	{
-		buzz,
-		turntable,
-		ghltar,
-		usio,
-		gem,
-		ds3gem,
-		mousegem,
-		guncon3,
-		topshotelite,
-		topshotfearmaster,
-	};
-
-	emulated_pad_settings_dialog(pad_type type, QWidget* parent = nullptr);
-
-private:
-	template <typename T>
-	void add_tabs(QTabWidget* tabs);
-
-	void load_config();
-	void save_config();
-	void reset_config();
-
-	pad_type m_type;
-
-	std::vector<std::vector<QComboBox*>> m_combos;
-};
diff --git a/rpcs3/rpcs3qt/fatal_error_dialog.cpp b/rpcs3/rpcs3qt/fatal_error_dialog.cpp
index 0e9c2651ce..1a7c55e6f6 100644
--- a/rpcs3/rpcs3qt/fatal_error_dialog.cpp
+++ b/rpcs3/rpcs3qt/fatal_error_dialog.cpp
@@ -4,51 +4,22 @@
 #include <QTextDocument>
 #include <QIcon>
 
-const QString document_with_help_text = R"(
-<style>
-	p {white-space: nowrap;}
-</style>
-<p>
-	%1<br>
-	%2<br>
-	<a href='https://github.com/RPCS3/rpcs3/wiki/How-to-ask-for-Support'>https://github.com/RPCS3/rpcs3/wiki/How-to-ask-for-Support</a><br>
-	%3<br>
-</p>
-)";
-
-const QString document_without_help_text = R"(
-<style>
-	p {white-space: nowrap;}
-</style>
-<p>
-	%1<br>
-</p>
-)";
-
-fatal_error_dialog::fatal_error_dialog(std::string_view text, bool is_html, bool include_help_text) : QMessageBox()
+fatal_error_dialog::fatal_error_dialog(std::string_view text) : QMessageBox()
 {
-	const QString qstr = QString::fromUtf8(text.data(), text.size());
-	const QString msg = is_html ? qstr : Qt::convertFromPlainText(qstr);
-
-	QString document_body;
-	if (include_help_text) [[likely]]
-	{
-		document_body = document_with_help_text
-			.arg(msg)
-			.arg(tr("HOW TO REPORT ERRORS:"))
-			.arg(tr("Please, don't send incorrect reports. Thanks for understanding."));
-	}
-	else
-	{
-		document_body = document_without_help_text.arg(msg);
-	}
-
-#ifndef __APPLE__
 	setWindowIcon(QIcon(":/rpcs3.ico"));
-#endif
 	setWindowTitle(tr("RPCS3: Fatal Error"));
 	setIcon(QMessageBox::Icon::Critical);
 	setTextFormat(Qt::TextFormat::RichText);
-	setText(document_body);
+	setText(QString(R"(
+			<p style="white-space: nowrap;">
+				%1<br>
+				%2<br>
+				<a href='https://github.com/RPCS3/rpcs3/wiki/How-to-ask-for-Support'>https://github.com/RPCS3/rpcs3/wiki/How-to-ask-for-Support</a><br>
+				%3<br>
+			</p>
+			)")
+		.arg(Qt::convertFromPlainText(QString::fromUtf8(text.data(), text.size())))
+		.arg(tr("HOW TO REPORT ERRORS:"))
+		.arg(tr("Please, don't send incorrect reports. Thanks for understanding.")));
 	layout()->setSizeConstraint(QLayout::SetFixedSize);
 }
diff --git a/rpcs3/rpcs3qt/fatal_error_dialog.h b/rpcs3/rpcs3qt/fatal_error_dialog.h
index 913daf2844..69f7d09cc9 100644
--- a/rpcs3/rpcs3qt/fatal_error_dialog.h
+++ b/rpcs3/rpcs3qt/fatal_error_dialog.h
@@ -9,5 +9,5 @@ class fatal_error_dialog : public QMessageBox
 	Q_OBJECT
 
 public:
-	explicit fatal_error_dialog(std::string_view text, bool is_html, bool include_help_text);
+	explicit fatal_error_dialog(std::string_view text);
 };
diff --git a/rpcs3/rpcs3qt/find_dialog.cpp b/rpcs3/rpcs3qt/find_dialog.cpp
index 9c5e805050..69b7a2f1f4 100644
--- a/rpcs3/rpcs3qt/find_dialog.cpp
+++ b/rpcs3/rpcs3qt/find_dialog.cpp
@@ -2,7 +2,7 @@
 
 #include <QVBoxLayout>
 
-find_dialog::find_dialog(QPlainTextEdit* edit, QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f), m_text_edit(edit)
+find_dialog::find_dialog(QTextEdit* edit, QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f), m_text_edit(edit)
 {
 	setWindowTitle(tr("Find string"));
 
diff --git a/rpcs3/rpcs3qt/find_dialog.h b/rpcs3/rpcs3qt/find_dialog.h
index 27baf03c75..d99363b654 100644
--- a/rpcs3/rpcs3qt/find_dialog.h
+++ b/rpcs3/rpcs3qt/find_dialog.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <QDialog>
-#include <QPlainTextEdit>
+#include <QTextEdit>
 #include <QLineEdit>
 #include <QPushButton>
 #include <QLabel>
@@ -11,14 +11,14 @@ class find_dialog : public QDialog
 	Q_OBJECT
 
 public:
-	find_dialog(QPlainTextEdit* edit, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+	find_dialog(QTextEdit* edit, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
 
 private:
 	int m_count_lines = 0;
 	int m_count_total = 0;
 	QLabel* m_label_count_lines;
 	QLabel* m_label_count_total;
-	QPlainTextEdit* m_text_edit;
+	QTextEdit* m_text_edit;
 	QLineEdit* m_find_bar;
 	QPushButton* m_find_first;
 	QPushButton* m_find_last;
diff --git a/rpcs3/rpcs3qt/flow_layout.cpp b/rpcs3/rpcs3qt/flow_layout.cpp
deleted file mode 100644
index 92fe956b28..0000000000
--- a/rpcs3/rpcs3qt/flow_layout.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "flow_layout.h"
-
-flow_layout::flow_layout(QWidget* parent, int margin, bool dynamic_spacing, int hSpacing, int vSpacing)
-	: QLayout(parent)
-	, m_dynamic_spacing(dynamic_spacing)
-	, m_h_space_initial(hSpacing)
-	, m_v_space_initial(vSpacing)
-	, m_h_space(hSpacing)
-	, m_v_space(vSpacing)
-{
-	setContentsMargins(margin, margin, margin, margin);
-}
-
-flow_layout::flow_layout(int margin, bool dynamic_spacing, int hSpacing, int vSpacing)
-	: m_dynamic_spacing(dynamic_spacing)
-	, m_h_space_initial(hSpacing)
-	, m_v_space_initial(vSpacing)
-	, m_h_space(hSpacing)
-	, m_v_space(vSpacing)
-{
-	setContentsMargins(margin, margin, margin, margin);
-}
-
-flow_layout::~flow_layout()
-{
-	clear();
-}
-
-void flow_layout::clear()
-{
-	// We can't use a ranged loop here, since deleting the widget will call takeAt on the layout. So let's also use takeAt.
-	while (QLayoutItem* item = takeAt(0))
-	{
-		if (item)
-		{
-			delete item->widget();
-			delete item;
-		}
-	}
-	m_item_list.clear();
-	m_positions.clear();
-}
-
-void flow_layout::addItem(QLayoutItem* item)
-{
-	m_positions.append(position{ .row = -1, .col = -1 });
-	m_item_list.append(item);
-}
-
-int flow_layout::horizontalSpacing() const
-{
-	if (m_h_space >= 0)
-	{
-		return m_h_space;
-	}
-
-	return smartSpacing(QStyle::PM_LayoutHorizontalSpacing);
-}
-
-int flow_layout::verticalSpacing() const
-{
-	if (m_v_space >= 0)
-	{
-		return m_v_space;
-	}
-
-	return smartSpacing(QStyle::PM_LayoutVerticalSpacing);
-}
-
-int flow_layout::count() const
-{
-	return m_item_list.size();
-}
-
-QLayoutItem* flow_layout::itemAt(int index) const
-{
-	return m_item_list.value(index);
-}
-
-QLayoutItem* flow_layout::takeAt(int index)
-{
-	if (index >= 0 && index < m_item_list.size())
-	{
-		m_positions.takeAt(index);
-		return m_item_list.takeAt(index);
-	}
-
-	return nullptr;
-}
-
-Qt::Orientations flow_layout::expandingDirections() const
-{
-	return {};
-}
-
-bool flow_layout::hasHeightForWidth() const
-{
-	return true;
-}
-
-int flow_layout::heightForWidth(int width) const
-{
-	return doLayout(QRect(0, 0, width, 0), true);
-}
-
-void flow_layout::setGeometry(const QRect& rect)
-{
-	QLayout::setGeometry(rect);
-	doLayout(rect, false);
-}
-
-QSize flow_layout::sizeHint() const
-{
-	return minimumSize();
-}
-
-QSize flow_layout::minimumSize() const
-{
-	QSize size;
-	for (const QLayoutItem* item : m_item_list)
-	{
-		if (item)
-		{
-			size = size.expandedTo(item->minimumSize());
-		}
-	}
-
-	const QMargins margins = contentsMargins();
-	size += QSize(margins.left() + margins.right(), margins.top() + margins.bottom());
-	return size;
-}
-
-int flow_layout::doLayout(const QRect& rect, bool testOnly) const
-{
-	int left, top, right, bottom;
-	getContentsMargins(&left, &top, &right, &bottom);
-	const QRect effectiveRect = rect.adjusted(+left, +top, -right, -bottom);
-	int x = effectiveRect.x();
-	int y = effectiveRect.y();
-	int lineHeight = 0;
-	int row_count = 0;
-	int col_count = 0;
-
-	if (m_dynamic_spacing)
-	{
-		const int available_width = effectiveRect.width();
-		const int min_spacing = smartSpacing(QStyle::PM_LayoutHorizontalSpacing);
-		bool fits_into_width = true;
-		int width = 0;
-		int index = 0;
-
-		for (; index < m_item_list.size(); index++)
-		{
-			if (QLayoutItem* item = m_item_list.at(index))
-			{
-				const int new_width = width + item->sizeHint().width() + (width > 0 ? min_spacing : 0);
-
-				if (new_width > effectiveRect.width())
-				{
-					fits_into_width = false;
-					break;
-				}
-
-				width = new_width;
-			}
-		}
-
-		// Try to evenly distribute the items across the width
-		m_h_space = (index == 0) ? -1 : ((available_width - width) / index);
-
-		if (fits_into_width)
-		{
-			// Make sure there aren't huge gaps between the items
-			m_h_space = smartSpacing(QStyle::PM_LayoutHorizontalSpacing);
-		}
-	}
-	else
-	{
-		m_h_space = m_h_space_initial;
-	}
-
-	for (int i = 0, row = 0, col = 0; i < m_item_list.size(); i++)
-	{
-		QLayoutItem* item = m_item_list.at(i);
-		if (!item)
-			continue;
-
-		const QWidget* wid = item->widget();
-		if (!wid)
-			continue;
-
-		int spaceX = horizontalSpacing();
-		if (spaceX == -1)
-			spaceX = wid->style()->layoutSpacing(QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Horizontal);
-
-		int spaceY = verticalSpacing();
-		if (spaceY == -1)
-			spaceY = wid->style()->layoutSpacing(QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Vertical);
-
-		int nextX = x + item->sizeHint().width() + spaceX;
-		if (nextX - spaceX > effectiveRect.right() && lineHeight > 0)
-		{
-			x = effectiveRect.x();
-			y = y + lineHeight + spaceY;
-			nextX = x + item->sizeHint().width() + spaceX;
-			lineHeight = 0;
-			col = 0;
-			row++;
-		}
-
-		position& pos = m_positions[i];
-		pos.row = row;
-		pos.col = col++;
-
-		row_count = std::max(row_count, pos.row + 1);
-		col_count = std::max(col_count, pos.col + 1);
-
-		if (!testOnly)
-			item->setGeometry(QRect(QPoint(x, y), item->sizeHint()));
-
-		x = nextX;
-		lineHeight = qMax(lineHeight, item->sizeHint().height());
-	}
-
-	m_rows = row_count;
-	m_cols = col_count;
-
-	return y + lineHeight - rect.y() + bottom;
-}
-
-int flow_layout::smartSpacing(QStyle::PixelMetric pm) const
-{
-	const QObject* parent = this->parent();
-	if (!parent)
-	{
-		return -1;
-	}
-
-	if (parent->isWidgetType())
-	{
-		const QWidget* pw = static_cast<const QWidget*>(parent);
-		return pw->style()->pixelMetric(pm, nullptr, pw);
-	}
-
-	return static_cast<const QLayout*>(parent)->spacing();
-}
diff --git a/rpcs3/rpcs3qt/flow_layout.h b/rpcs3/rpcs3qt/flow_layout.h
deleted file mode 100644
index c04fa8ab6d..0000000000
--- a/rpcs3/rpcs3qt/flow_layout.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#pragma once
-
-#include <QLayout>
-#include <QRect>
-#include <QStyle>
-
-class flow_layout : public QLayout
-{
-public:
-	struct position
-	{
-		int row{};
-		int col{};
-	};
-
-	explicit flow_layout(QWidget* parent, int margin = -1, bool dynamic_spacing = false, int hSpacing = -1, int vSpacing = -1);
-	explicit flow_layout(int margin = -1, bool dynamic_spacing = false, int hSpacing = -1, int vSpacing = -1);
-	~flow_layout();
-
-	void clear();
-	const QList<QLayoutItem*>& item_list() const { return m_item_list; }
-	const QList<position>& positions() const { return m_positions; }
-	int rows() const { return m_rows; }
-	int cols() const { return m_cols; }
-
-	void addItem(QLayoutItem* item) override;
-	Qt::Orientations expandingDirections() const override;
-	bool hasHeightForWidth() const override;
-	int heightForWidth(int) const override;
-	int count() const override;
-	QLayoutItem* itemAt(int index) const override;
-	QSize minimumSize() const override;
-	void setGeometry(const QRect& rect) override;
-	QSize sizeHint() const override;
-	QLayoutItem* takeAt(int index) override;
-
-private:
-	int horizontalSpacing() const;
-	int verticalSpacing() const;
-	int doLayout(const QRect& rect, bool testOnly) const;
-	int smartSpacing(QStyle::PixelMetric pm) const;
-
-	QList<QLayoutItem*> m_item_list;
-	bool m_dynamic_spacing{};
-	int m_h_space_initial{-1};
-	int m_v_space_initial{-1};
-	mutable int m_h_space{-1};
-	mutable int m_v_space{-1};
-
-	mutable QList<position> m_positions;
-	mutable int m_rows{};
-	mutable int m_cols{};
-};
diff --git a/rpcs3/rpcs3qt/flow_widget.cpp b/rpcs3/rpcs3qt/flow_widget.cpp
deleted file mode 100644
index 13754f6c66..0000000000
--- a/rpcs3/rpcs3qt/flow_widget.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-#include "stdafx.h"
-#include "flow_widget.h"
-
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <QStyleOption>
-#include <QPainter>
-
-flow_widget::flow_widget(QWidget* parent)
-	: QWidget(parent)
-{
-	m_flow_layout = new flow_layout();
-
-	QWidget* widget = new QWidget(this);
-	widget->setLayout(m_flow_layout);
-	widget->setObjectName("flow_widget_content");
-	widget->setFocusProxy(this);
-
-	m_scroll_area = new QScrollArea(this);
-	m_scroll_area->setWidget(widget);
-	m_scroll_area->setWidgetResizable(true);
-
-	QVBoxLayout* layout = new QVBoxLayout(this);
-	layout->addWidget(m_scroll_area);
-	layout->setContentsMargins(0, 0, 0, 0);
-	setLayout(layout);
-}
-
-flow_widget::~flow_widget()
-{
-}
-
-void flow_widget::add_widget(flow_widget_item* widget)
-{
-	if (widget)
-	{
-		m_widgets.push_back(widget);
-		m_flow_layout->addWidget(widget);
-
-		connect(widget, &flow_widget_item::navigate, this, &flow_widget::on_navigate);
-		connect(widget, &flow_widget_item::focused, this, &flow_widget::on_item_focus);
-	}
-}
-
-void flow_widget::clear()
-{
-	m_widgets.clear();
-	m_flow_layout->clear();
-}
-
-flow_widget_item* flow_widget::selected_item() const
-{
-	if (m_selected_index >= 0 && static_cast<usz>(m_selected_index) < m_widgets.size())
-	{
-		return ::at32(m_widgets, m_selected_index);
-	}
-
-	return nullptr;
-}
-
-void flow_widget::paintEvent(QPaintEvent* /*event*/)
-{
-	// Needed for stylesheets to apply to QWidgets
-	QStyleOption option;
-	option.initFrom(this);
-	QPainter painter(this);
-	style()->drawPrimitive(QStyle::PE_Widget, &option, &painter, this);
-}
-
-s64 flow_widget::find_item(const flow_layout::position& pos)
-{
-	if (pos.row < 0 || pos.col < 0)
-	{
-		return -1;
-	}
-
-	const auto& positions = m_flow_layout->positions();
-
-	for (s64 i = 0; i < positions.size(); i++)
-	{
-		if (const auto& other = ::at32(positions, i); other.row == pos.row && other.col == pos.col)
-		{
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-flow_layout::position flow_widget::find_item(flow_widget_item* item)
-{
-	if (item)
-	{
-		const auto& item_list = m_flow_layout->item_list();
-		const auto& positions = m_flow_layout->positions();
-		ensure(item_list.size() == positions.size());
-
-		for (s64 i = 0; i < item_list.size(); i++)
-		{
-			if (const auto& layout_item = ::at32(item_list, i); layout_item && layout_item->widget() == item)
-			{
-				return ::at32(positions, i);
-			}
-		}
-	}
-
-	return flow_layout::position{ .row = -1, .col = - 1};
-}
-
-flow_layout::position flow_widget::find_next_item(flow_layout::position current_pos, flow_navigation value)
-{
-	if (current_pos.row >= 0 && current_pos.col >= 0 && m_flow_layout->rows() > 0 && m_flow_layout->cols() > 0)
-	{
-		switch (value)
-		{
-		case flow_navigation::up:
-			// Go up one row.
-			if (current_pos.row > 0)
-			{
-				current_pos.row--;
-			}
-			break;
-		case flow_navigation::down:
-			// Go down one row. Beware of last row which might have less columns.
-			for (const auto& pos : m_flow_layout->positions())
-			{;
-				if (pos.col != current_pos.col) continue;
-				if (pos.row == current_pos.row + 1)
-				{
-					current_pos.row = pos.row;
-					break;
-				}
-			}
-			break;
-		case flow_navigation::left:
-			// Go left one column.
-			if (current_pos.col > 0)
-			{
-				current_pos.col--;
-			}
-			break;
-		case flow_navigation::right:
-			// Go right one column. Beware of last row which might have less columns.
-			for (const auto& pos : m_flow_layout->positions())
-			{
-				if (pos.row > current_pos.row) break;
-				if (pos.row < current_pos.row) continue;
-				if (pos.col == current_pos.col + 1)
-				{
-					current_pos.col = pos.col;
-					break;
-				}
-			}
-			break;
-		case flow_navigation::home:
-			// Go to leftmost column.
-			current_pos.col = 0;
-			break;
-		case flow_navigation::end:
-			// Go to last column. Beware of last row which might have less columns.
-			for (const auto& pos : m_flow_layout->positions())
-			{
-				if (pos.row > current_pos.row) break;
-				if (pos.row < current_pos.row) continue;
-				current_pos.col = std::max(current_pos.col, pos.col);
-			}
-			break;
-		case flow_navigation::page_up:
-			// Go to top row.
-			current_pos.row = 0;
-			break;
-		case flow_navigation::page_down:
-			// Go to bottom row. Beware of last row which might have less columns.
-			for (const auto& pos : m_flow_layout->positions())
-			{
-				if (pos.col != current_pos.col) continue;
-				current_pos.row = std::max(current_pos.row, pos.row);
-			}
-			break;
-		}
-	}
-
-	return current_pos;
-}
-
-void flow_widget::select_item(flow_widget_item* item)
-{
-	const flow_layout::position selected_pos = find_item(item);
-	const s64 selected_index = find_item(selected_pos);
-
-	if (selected_index < 0 || static_cast<usz>(selected_index) >= items().size())
-	{
-		m_selected_index = -1;
-		return;
-	}
-
-	m_selected_index = selected_index;
-	Q_EMIT ItemSelectionChanged(m_selected_index);
-
-	for (usz i = 0; i < items().size(); i++)
-	{
-		if (flow_widget_item* item = items().at(i))
-		{
-			// We need to polish the widgets in order to re-apply any stylesheet changes for the selected property.
-			item->selected = m_selected_index >= 0 && i == static_cast<usz>(m_selected_index);
-			item->polish_style();
-		}
-	}
-
-	// Make sure we see the focused widget
-	m_scroll_area->ensureWidgetVisible(::at32(items(), m_selected_index));
-}
-
-void flow_widget::on_item_focus()
-{
-	select_item(static_cast<flow_widget_item*>(QObject::sender()));
-}
-
-void flow_widget::on_navigate(flow_navigation value)
-{
-	const flow_layout::position selected_pos = find_next_item(find_item(static_cast<flow_widget_item*>(QObject::sender())), value);
-	const s64 selected_index = find_item(selected_pos);
-	if (selected_index < 0 || static_cast<usz>(selected_index) >= items().size())
-	{
-		return;
-	}
-
-	if (flow_widget_item* item = items().at(selected_index))
-	{
-		item->setFocus();
-	}
-
-	m_selected_index = selected_index;
-}
-
-void flow_widget::mouseDoubleClickEvent(QMouseEvent* ev)
-{
-	if (!ev) return;
-
-	// Qt's itemDoubleClicked signal doesn't distinguish between mouse buttons and there is no simple way to get the pressed button.
-	// So we have to ignore this event when another button is pressed.
-	if (ev->button() != Qt::LeftButton)
-	{
-		ev->ignore();
-		return;
-	}
-
-	QWidget::mouseDoubleClickEvent(ev);
-}
diff --git a/rpcs3/rpcs3qt/flow_widget.h b/rpcs3/rpcs3qt/flow_widget.h
deleted file mode 100644
index 433d05ad0e..0000000000
--- a/rpcs3/rpcs3qt/flow_widget.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-#include "flow_widget_item.h"
-#include "flow_layout.h"
-
-#include <QWidget>
-#include <QScrollArea>
-#include <QPaintEvent>
-
-class flow_widget : public QWidget
-{
-	Q_OBJECT
-
-public:
-	flow_widget(QWidget* parent);
-	virtual ~flow_widget();
-
-	void add_widget(flow_widget_item* widget);
-	void clear();
-
-	std::vector<flow_widget_item*>& items() { return m_widgets; }
-	flow_widget_item* selected_item() const;
-	QScrollArea* scroll_area() const { return m_scroll_area; }
-
-	void paintEvent(QPaintEvent* event) override;
-
-Q_SIGNALS:
-	void ItemSelectionChanged(int index);
-
-private Q_SLOTS:
-	void on_item_focus();
-	void on_navigate(flow_navigation value);
-
-protected:
-	void select_item(flow_widget_item* item);
-	void mouseDoubleClickEvent(QMouseEvent* event) override;
-
-private:
-	s64 find_item(const flow_layout::position& pos);
-	flow_layout::position find_item(flow_widget_item* item);
-	flow_layout::position find_next_item(flow_layout::position current_pos, flow_navigation value);
-
-	flow_layout* m_flow_layout{};
-	QScrollArea* m_scroll_area{};
-	std::vector<flow_widget_item*> m_widgets;
-	s64 m_selected_index = -1;
-};
diff --git a/rpcs3/rpcs3qt/flow_widget_item.cpp b/rpcs3/rpcs3qt/flow_widget_item.cpp
deleted file mode 100644
index 8b766d3029..0000000000
--- a/rpcs3/rpcs3qt/flow_widget_item.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-#include "flow_widget_item.h"
-
-#include <QStyle>
-#include <QStyleOption>
-#include <QPainter>
-
-flow_widget_item::flow_widget_item(QWidget* parent) : QWidget(parent)
-{
-	setAttribute(Qt::WA_Hover); // We need to enable the hover attribute to ensure that hover events are handled.
-}
-
-flow_widget_item::~flow_widget_item()
-{
-}
-
-void flow_widget_item::polish_style()
-{
-	style()->unpolish(this);
-	style()->polish(this);
-}
-
-void flow_widget_item::paintEvent(QPaintEvent* /*event*/)
-{
-	// Needed for stylesheets to apply to QWidgets
-	QStyleOption option;
-	option.initFrom(this);
-	QPainter painter(this);
-	style()->drawPrimitive(QStyle::PE_Widget, &option, &painter, this);
-
-	if (!got_visible && cb_on_first_visibility)
-	{
-		if (QWidget* widget = static_cast<QWidget*>(parent()))
-		{
-			if (widget->visibleRegion().intersects(geometry()))
-			{
-				got_visible = true;
-				cb_on_first_visibility();
-			}
-		}
-	}
-}
-
-void flow_widget_item::focusInEvent(QFocusEvent* event)
-{
-	QWidget::focusInEvent(event);
-
-	// We need to polish the widgets in order to re-apply any stylesheet changes for the focus property.
-	polish_style();
-
-	Q_EMIT focused();
-}
-
-void flow_widget_item::focusOutEvent(QFocusEvent* event)
-{
-	QWidget::focusOutEvent(event);
-
-	// We need to polish the widgets in order to re-apply any stylesheet changes for the focus property.
-	polish_style();
-}
-
-void flow_widget_item::keyPressEvent(QKeyEvent* event)
-{
-	if (!event)
-	{
-		return;
-	}
-
-	switch (event->key())
-	{
-	case Qt::Key_Left:
-		Q_EMIT navigate(flow_navigation::left);
-		return;
-	case Qt::Key_Right:
-		Q_EMIT navigate(flow_navigation::right);
-		return;
-	case Qt::Key_Up:
-		Q_EMIT navigate(flow_navigation::up);
-		return;
-	case Qt::Key_Down:
-		Q_EMIT navigate(flow_navigation::down);
-		return;
-	case Qt::Key_Home:
-		Q_EMIT navigate(flow_navigation::home);
-		return;
-	case Qt::Key_End:
-		Q_EMIT navigate(flow_navigation::end);
-		return;
-	case Qt::Key_PageUp:
-		Q_EMIT navigate(flow_navigation::page_up);
-		return;
-	case Qt::Key_PageDown:
-		Q_EMIT navigate(flow_navigation::page_down);
-		return;
-	default:
-		break;
-	}
-
-	QWidget::keyPressEvent(event);
-}
-
-bool flow_widget_item::event(QEvent* event)
-{
-	bool hover_changed = false;
-
-	switch (event->type())
-	{
-	case QEvent::HoverEnter:
-		hover_changed = setProperty("hover", "true");
-		break;
-	case QEvent::HoverLeave:
-		hover_changed = setProperty("hover", "false");
-		break;
-	default:
-		break;
-	}
-
-	if (hover_changed)
-	{
-		// We need to polish the widgets in order to re-apply any stylesheet changes for the custom hover property.
-		// :hover does not work if we add descendants in the qss, so we need to use a custom property.
-		polish_style();
-	}
-
-	return QWidget::event(event);
-}
diff --git a/rpcs3/rpcs3qt/flow_widget_item.h b/rpcs3/rpcs3qt/flow_widget_item.h
deleted file mode 100644
index 78e2d32426..0000000000
--- a/rpcs3/rpcs3qt/flow_widget_item.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-
-#include <QWidget>
-#include <QKeyEvent>
-
-#include <functional>
-
-enum class flow_navigation
-{
-	up,
-	down,
-	left,
-	right,
-	home,
-	end,
-	page_up,
-	page_down
-};
-
-class flow_widget_item : public QWidget
-{
-	Q_OBJECT
-
-	Q_PROPERTY(bool hover MEMBER m_hover) // Stylesheet workaround for descendants with parent pseudo state
-	Q_PROPERTY(bool selected MEMBER selected) // Stylesheet workaround for descendants with parent pseudo state
-
-public:
-	flow_widget_item(QWidget* parent);
-	virtual ~flow_widget_item();
-
-	virtual void polish_style();
-
-	void paintEvent(QPaintEvent* event) override;
-	void focusInEvent(QFocusEvent* event) override;
-	void focusOutEvent(QFocusEvent* event) override;
-	void keyPressEvent(QKeyEvent* event) override;
-	bool event(QEvent* event) override;
-
-	bool got_visible{};
-	bool selected{};
-	std::function<void()> cb_on_first_visibility{};
-
-protected:
-	bool m_hover{};
-
-Q_SIGNALS:
-	void navigate(flow_navigation value);
-	void focused();
-};
diff --git a/rpcs3/rpcs3qt/game_compatibility.cpp b/rpcs3/rpcs3qt/game_compatibility.cpp
index 2d901b6642..b58d9ca850 100644
--- a/rpcs3/rpcs3qt/game_compatibility.cpp
+++ b/rpcs3/rpcs3qt/game_compatibility.cpp
@@ -13,6 +13,9 @@
 
 LOG_CHANNEL(compat_log, "Compat");
 
+constexpr auto qstr = QString::fromStdString;
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
+
 game_compatibility::game_compatibility(std::shared_ptr<gui_settings> gui_settings, QWidget* parent)
 	: QObject(parent)
 	, m_gui_settings(std::move(gui_settings))
@@ -23,7 +26,6 @@ game_compatibility::game_compatibility(std::shared_ptr<gui_settings> gui_setting
 
 	connect(m_downloader, &downloader::signal_download_error, this, &game_compatibility::handle_download_error);
 	connect(m_downloader, &downloader::signal_download_finished, this, &game_compatibility::handle_download_finished);
-	connect(m_downloader, &downloader::signal_download_canceled, this, &game_compatibility::handle_download_canceled);
 }
 
 void game_compatibility::handle_download_error(const QString& error)
@@ -38,33 +40,28 @@ void game_compatibility::handle_download_finished(const QByteArray& content)
 	// Create new map from database and write database to file if database was valid
 	if (ReadJSON(QJsonDocument::fromJson(content).object(), true))
 	{
+		// We have a new database in map, therefore refresh gamelist to new state
+		Q_EMIT DownloadFinished();
+
 		// Write database to file
 		QFile file(m_filepath);
 
 		if (file.exists())
 		{
-			compat_log.notice("Database file found: %s", m_filepath);
+			compat_log.notice("Database file found: %s", sstr(m_filepath));
 		}
 
 		if (!file.open(QIODevice::WriteOnly))
 		{
-			compat_log.error("Database Error - Could not write database to file: %s", m_filepath);
+			compat_log.error("Database Error - Could not write database to file: %s", sstr(m_filepath));
 			return;
 		}
 
 		file.write(content);
 		file.close();
 
-		compat_log.success("Wrote database to file: %s", m_filepath);
+		compat_log.success("Wrote database to file: %s", sstr(m_filepath));
 	}
-
-	// We have a new database in map, therefore refresh gamelist to new state
-	Q_EMIT DownloadFinished();
-}
-
-void game_compatibility::handle_download_canceled()
-{
-	Q_EMIT DownloadCanceled();
 }
 
 bool game_compatibility::ReadJSON(const QJsonObject& json_data, bool after_download)
@@ -89,7 +86,7 @@ bool game_compatibility::ReadJSON(const QJsonObject& json_data, bool after_downl
 				break;
 			}
 			compat_log.error("%s: return code %d", error_message, return_code);
-			Q_EMIT DownloadError(QString::fromStdString(error_message) + " " + QString::number(return_code));
+			Q_EMIT DownloadError(qstr(error_message) + " " + QString::number(return_code));
 		}
 		else
 		{
@@ -113,14 +110,14 @@ bool game_compatibility::ReadJSON(const QJsonObject& json_data, bool after_downl
 	{
 		if (!json_results[key].isObject())
 		{
-			compat_log.error("Database Error - Unusable object %s", key);
+			compat_log.error("Database Error - Unusable object %s", sstr(key));
 			continue;
 		}
 
 		QJsonObject json_result = json_results[key].toObject();
 
 		// Retrieve compatibility information from json
-		compat::status status = ::at32(Status_Data, json_result.value("status").toString("NoResult"));
+		compat::status status = Status_Data.at(json_result.value("status").toString("NoResult"));
 
 		// Add date if possible
 		status.date = json_result.value("date").toString();
@@ -184,7 +181,7 @@ bool game_compatibility::ReadJSON(const QJsonObject& json_data, bool after_downl
 		}
 
 		// Add status to map
-		m_compat_database.emplace(key.toStdString(), std::move(status));
+		m_compat_database.emplace(std::pair<std::string, compat::status>(sstr(key), status));
 	}
 
 	return true;
@@ -199,20 +196,20 @@ void game_compatibility::RequestCompatibility(bool online)
 
 		if (!file.exists())
 		{
-			compat_log.notice("Database file not found: %s", m_filepath);
+			compat_log.notice("Database file not found: %s", sstr(m_filepath));
 			return;
 		}
 
 		if (!file.open(QIODevice::ReadOnly))
 		{
-			compat_log.error("Database Error - Could not read database from file: %s", m_filepath);
+			compat_log.error("Database Error - Could not read database from file: %s", sstr(m_filepath));
 			return;
 		}
 
 		const QByteArray content = file.readAll();
 		file.close();
 
-		compat_log.notice("Finished reading database from file: %s", m_filepath);
+		compat_log.notice("Finished reading database from file: %s", sstr(m_filepath));
 
 		// Create new map from database
 		ReadJSON(QJsonDocument::fromJson(content).object(), online);
@@ -233,20 +230,19 @@ compat::status game_compatibility::GetCompatibility(const std::string& title_id)
 {
 	if (m_compat_database.empty())
 	{
-		return ::at32(Status_Data, "NoData");
+		return Status_Data.at("NoData");
 	}
-
-	if (const auto it = m_compat_database.find(title_id); it != m_compat_database.cend())
+	else if (m_compat_database.count(title_id) > 0)
 	{
-		return it->second;
+		return m_compat_database[title_id];
 	}
 
-	return ::at32(Status_Data, "NoResult");
+	return Status_Data.at("NoResult");
 }
 
 compat::status game_compatibility::GetStatusData(const QString& status) const
 {
-	return ::at32(Status_Data, status);
+	return Status_Data.at(status);
 }
 
 compat::package_info game_compatibility::GetPkgInfo(const QString& pkg_path, game_compatibility* compat)
@@ -260,17 +256,17 @@ compat::package_info game_compatibility::GetPkgInfo(const QString& pkg_path, gam
 		return info;
 	}
 
-	const psf::registry& psf = reader.get_psf();
+	const psf::registry psf = reader.get_psf();
 
 	// TODO: localization of title and changelog
 	const std::string title_key     = "TITLE";
 	const std::string changelog_key = "paramhip";
 
 	info.path     = pkg_path;
-	info.title    = QString::fromStdString(std::string(psf::get_string(psf, title_key))); // Let's read this from the psf first
-	info.title_id = QString::fromStdString(std::string(psf::get_string(psf, "TITLE_ID")));
-	info.category = QString::fromStdString(std::string(psf::get_string(psf, "CATEGORY")));
-	info.version  = QString::fromStdString(std::string(psf::get_string(psf, "APP_VER")));
+	info.title    = qstr(std::string(psf::get_string(psf, title_key))); // Let's read this from the psf first
+	info.title_id = qstr(std::string(psf::get_string(psf, "TITLE_ID")));
+	info.category = qstr(std::string(psf::get_string(psf, "CATEGORY")));
+	info.version  = qstr(std::string(psf::get_string(psf, "APP_VER")));
 
 	if (!info.category.isEmpty())
 	{
@@ -304,27 +300,27 @@ compat::package_info game_compatibility::GetPkgInfo(const QString& pkg_path, gam
 	if (info.version.isEmpty())
 	{
 		// Fallback to VERSION
-		info.version = QString::fromStdString(std::string(psf::get_string(psf, "VERSION")));
+		info.version = qstr(std::string(psf::get_string(psf, "VERSION")));
 	}
 
 	if (compat)
 	{
-		compat::status stat = compat->GetCompatibility(info.title_id.toStdString());
+		compat::status stat = compat->GetCompatibility(sstr(info.title_id));
 		if (!stat.patch_sets.empty())
 		{
 			// We currently only handle the first patch set
 			for (const auto& package : stat.patch_sets.front().packages)
 			{
-				if (info.version.toStdString() == package.version)
+				if (sstr(info.version) == package.version)
 				{
 					if (const std::string localized_title = package.get_title(title_key); !localized_title.empty())
 					{
-						info.title = QString::fromStdString(localized_title);
+						info.title= qstr(localized_title);
 					}
 
 					if (const std::string localized_changelog = package.get_changelog(changelog_key); !localized_changelog.empty())
 					{
-						info.changelog = QString::fromStdString(localized_changelog);
+						info.changelog = qstr(localized_changelog);
 					}
 
 					// This should be an update since it was found in a patch set
diff --git a/rpcs3/rpcs3qt/game_compatibility.h b/rpcs3/rpcs3qt/game_compatibility.h
index f24ebfbe1f..2572dcd4a3 100644
--- a/rpcs3/rpcs3qt/game_compatibility.h
+++ b/rpcs3/rpcs3qt/game_compatibility.h
@@ -2,6 +2,7 @@
 
 #include <memory>
 
+#include <QPainter>
 #include <QJsonObject>
 
 class downloader;
@@ -156,11 +157,25 @@ public:
 Q_SIGNALS:
 	void DownloadStarted();
 	void DownloadFinished();
-	void DownloadCanceled();
 	void DownloadError(const QString& error);
 
 private Q_SLOTS:
 	void handle_download_error(const QString& error);
 	void handle_download_finished(const QByteArray& content);
-	void handle_download_canceled();
+};
+
+class compat_pixmap : public QPixmap
+{
+public:
+	compat_pixmap(const QColor& color, qreal pixel_ratio) : QPixmap(pixel_ratio * 16, pixel_ratio * 16)
+	{
+		fill(Qt::transparent);
+
+		QPainter painter(this);
+		setDevicePixelRatio(pixel_ratio);
+		painter.setRenderHint(QPainter::Antialiasing);
+		painter.setPen(Qt::NoPen);
+		painter.setBrush(color);
+		painter.drawEllipse(0, 0, width(), height());
+	}
 };
diff --git a/rpcs3/rpcs3qt/game_list.cpp b/rpcs3/rpcs3qt/game_list.cpp
index 4c9c5e9b5a..6d3e17c37e 100644
--- a/rpcs3/rpcs3qt/game_list.cpp
+++ b/rpcs3/rpcs3qt/game_list.cpp
@@ -1,91 +1,6 @@
-#include "stdafx.h"
 #include "game_list.h"
 #include "movie_item.h"
 
-#include <QApplication>
-#include <QHeaderView>
-#include <QMenu>
-
-game_list::game_list() : QTableWidget(), game_list_base()
-{
-	m_icon_ready_callback = [this](const movie_item_base* item)
-	{
-		Q_EMIT IconReady(item);
-	};
-}
-
-void game_list::sync_header_actions(QList<QAction*>& actions, std::function<bool(int)> get_visibility)
-{
-	ensure(get_visibility);
-
-	bool is_dirty = false;
-
-	for (int col = 0; col < actions.count(); ++col)
-	{
-		const bool is_hidden = !get_visibility(col);
-		actions[col]->setChecked(!is_hidden);
-
-		if (isColumnHidden(col) != is_hidden)
-		{
-			setColumnHidden(col, is_hidden);
-			is_dirty = true;
-		}
-	}
-
-	if (is_dirty)
-	{
-		fix_narrow_columns();
-	}
-}
-
-void game_list::create_header_actions(QList<QAction*>& actions, std::function<bool(int)> get_visibility, std::function<void(int, bool)> set_visibility)
-{
-	ensure(get_visibility);
-	ensure(set_visibility);
-
-	horizontalHeader()->setContextMenuPolicy(Qt::CustomContextMenu);
-
-	connect(horizontalHeader(), &QHeaderView::customContextMenuRequested, this, [this, &actions](const QPoint& pos)
-	{
-		QMenu* configure = new QMenu(this);
-		configure->addActions(actions);
-		configure->exec(horizontalHeader()->viewport()->mapToGlobal(pos));
-	});
-
-	for (int col = 0; col < actions.count(); ++col)
-	{
-		actions[col]->setCheckable(true);
-
-		connect(actions[col], &QAction::triggered, this, [this, &actions, get_visibility, set_visibility, col](bool checked)
-		{
-			if (!checked) // be sure to have at least one column left so you can call the context menu at all time
-			{
-				int c = 0;
-				for (int i = 0; i < actions.count(); ++i)
-				{
-					if (get_visibility(i) && ++c > 1)
-						break;
-				}
-				if (c < 2)
-				{
-					actions[col]->setChecked(true); // re-enable the checkbox if we don't change the actual state
-					return;
-				}
-			}
-
-			setColumnHidden(col, !checked); // Negate because it's a set col hidden and we have menu say show.
-			set_visibility(col, checked);
-
-			if (checked) // handle hidden columns that have zero width after showing them (stuck between others)
-			{
-				fix_narrow_columns();
-			}
-		});
-	}
-
-	sync_header_actions(actions, get_visibility);
-}
-
 void game_list::clear_list()
 {
 	m_last_hover_item = nullptr;
@@ -93,28 +8,9 @@ void game_list::clear_list()
 	clearContents();
 }
 
-void game_list::fix_narrow_columns()
+void game_list::mousePressEvent(QMouseEvent *event)
 {
-	QApplication::processEvents();
-
-	// handle columns (other than the icon column) that have zero width after showing them (stuck between others)
-	for (int col = 1; col < columnCount(); ++col)
-	{
-		if (isColumnHidden(col))
-		{
-			continue;
-		}
-
-		if (columnWidth(col) <= horizontalHeader()->minimumSectionSize())
-		{
-			setColumnWidth(col, horizontalHeader()->minimumSectionSize());
-		}
-	}
-}
-
-void game_list::mousePressEvent(QMouseEvent* event)
-{
-	if (QTableWidgetItem* item = itemAt(event->pos()); !item || !item->data(Qt::UserRole).isValid())
+	if (!indexAt(event->pos()).isValid() || !itemAt(event->pos())->data(Qt::UserRole).isValid())
 	{
 		clearSelection();
 		setCurrentItem(nullptr); // Needed for currentItemChanged
@@ -122,7 +18,7 @@ void game_list::mousePressEvent(QMouseEvent* event)
 	QTableWidget::mousePressEvent(event);
 }
 
-void game_list::mouseMoveEvent(QMouseEvent* event)
+void game_list::mouseMoveEvent(QMouseEvent *event)
 {
 	movie_item* new_item = static_cast<movie_item*>(itemAt(event->pos()));
 
@@ -139,55 +35,13 @@ void game_list::mouseMoveEvent(QMouseEvent* event)
 	}
 
 	m_last_hover_item = new_item;
-
-	QTableWidget::mouseMoveEvent(event);
 }
 
-void game_list::mouseDoubleClickEvent(QMouseEvent* ev)
-{
-	if (!ev) return;
-
-	// Qt's itemDoubleClicked signal doesn't distinguish between mouse buttons and there is no simple way to get the pressed button.
-	// So we have to ignore this event when another button is pressed.
-	if (ev->button() != Qt::LeftButton)
-	{
-		ev->ignore();
-		return;
-	}
-
-	QTableWidget::mouseDoubleClickEvent(ev);
-}
-
-void game_list::keyPressEvent(QKeyEvent* event)
-{
-	const auto modifiers = event->modifiers();
-
-	if (modifiers == Qt::ControlModifier && event->key() == Qt::Key_F && !event->isAutoRepeat())
-	{
-		Q_EMIT FocusToSearchBar();
-		return;
-	}
-
-	QTableWidget::keyPressEvent(event);
-}
-
-void game_list::leaveEvent(QEvent* event)
+void game_list::leaveEvent(QEvent */*event*/)
 {
 	if (m_last_hover_item)
 	{
 		m_last_hover_item->set_active(false);
 		m_last_hover_item = nullptr;
 	}
-
-	QTableWidget::leaveEvent(event);
-}
-
-void game_list::FocusAndSelectFirstEntryIfNoneIs()
-{
-	if (QTableWidgetItem* item = itemAt(0, 0); item && selectedIndexes().isEmpty())
-	{
-		setCurrentItem(item);
-	}
-
-	setFocus();
 }
diff --git a/rpcs3/rpcs3qt/game_list.h b/rpcs3/rpcs3qt/game_list.h
index c49f5b5aa1..f708c3c870 100644
--- a/rpcs3/rpcs3qt/game_list.h
+++ b/rpcs3/rpcs3qt/game_list.h
@@ -1,49 +1,44 @@
 #pragma once
 
-#include <QAction>
-#include <QList>
 #include <QTableWidget>
 #include <QMouseEvent>
-#include <QKeyEvent>
+#include <QPixmap>
 
-#include "game_list_base.h"
-
-#include <functional>
+#include "game_compatibility.h"
+#include "Emu/GameInfo.h"
 
 class movie_item;
 
+/* Having the icons associated with the game info simplifies logic internally */
+struct gui_game_info
+{
+	GameInfo info;
+	QString localized_category;
+	compat::status compat;
+	QPixmap icon;
+	QPixmap pxmap;
+	bool hasCustomConfig;
+	bool hasCustomPadConfig;
+	bool has_hover_gif;
+	movie_item* item;
+};
+
+typedef std::shared_ptr<gui_game_info> game_info;
+Q_DECLARE_METATYPE(game_info)
+
 /*
 	class used in order to get deselection and hover change
 	if you know a simpler way, tell @Megamouse
 */
-class game_list : public QTableWidget, public game_list_base
+class game_list : public QTableWidget
 {
-	Q_OBJECT
-
 public:
-	game_list();
-
-	void sync_header_actions(QList<QAction*>& actions, std::function<bool(int)> get_visibility);
-	void create_header_actions(QList<QAction*>& actions, std::function<bool(int)> get_visibility, std::function<void(int, bool)> set_visibility);
-
-	void clear_list() override; // Use this instead of clearContents
-
-	/** Fix columns with width smaller than the minimal section size */
-	void fix_narrow_columns();
-
-public Q_SLOTS:
-	void FocusAndSelectFirstEntryIfNoneIs();
-
-Q_SIGNALS:
-	void FocusToSearchBar();
-	void IconReady(const movie_item_base* item);
+	void clear_list(); // Use this instead of clearContents
 
 protected:
 	movie_item* m_last_hover_item = nullptr;
 
-	void mousePressEvent(QMouseEvent* event) override;
-	void mouseMoveEvent(QMouseEvent* event) override;
-	void mouseDoubleClickEvent(QMouseEvent* event) override;
-	void keyPressEvent(QKeyEvent* event) override;
-	void leaveEvent(QEvent* event) override;
+	void mousePressEvent(QMouseEvent *event) override;
+	void mouseMoveEvent(QMouseEvent *event) override;
+	void leaveEvent(QEvent *event) override;
 };
diff --git a/rpcs3/rpcs3qt/game_list_base.cpp b/rpcs3/rpcs3qt/game_list_base.cpp
deleted file mode 100644
index 21640906ee..0000000000
--- a/rpcs3/rpcs3qt/game_list_base.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-#include "stdafx.h"
-#include "game_list_base.h"
-
-#include <QDir>
-#include <QPainter>
-
-#include <cmath>
-#include <unordered_set>
-
-LOG_CHANNEL(game_list_log, "GameList");
-
-game_list_base::game_list_base()
-{
-}
-
-void game_list_base::repaint_icons(std::vector<game_info>& game_data, const QColor& icon_color, const QSize& icon_size, qreal device_pixel_ratio)
-{
-	m_icon_size = icon_size;
-	m_icon_color = icon_color;
-
-	QPixmap placeholder(icon_size * device_pixel_ratio);
-	placeholder.setDevicePixelRatio(device_pixel_ratio);
-	placeholder.fill(Qt::transparent);
-
-	for (game_info& game : game_data)
-	{
-		game->pxmap = placeholder;
-
-		if (movie_item_base* item = game->item)
-		{
-			item->set_icon_load_func([this, game, device_pixel_ratio, cancel = item->icon_loading_aborted()](int)
-			{
-				IconLoadFunction(game, device_pixel_ratio, cancel);
-			});
-
-			item->image_change_callback();
-		}
-	}
-}
-
-void game_list_base::IconLoadFunction(game_info game, qreal device_pixel_ratio, std::shared_ptr<atomic_t<bool>> cancel)
-{
-	if (cancel && cancel->load())
-	{
-		return;
-	}
-
-	static std::unordered_set<std::string> warn_once_list;
-	static shared_mutex s_mtx;
-
-	if (game->icon.isNull() && (game->info.icon_path.empty() || !game->icon.load(QString::fromStdString(game->info.icon_path))))
-	{
-		if (game_list_log.warning)
-		{
-			bool logged = false;
-			{
-				std::lock_guard lock(s_mtx);
-				logged = !warn_once_list.emplace(game->info.icon_path).second;
-			}
-
-			if (!logged)
-			{
-				game_list_log.warning("Could not load image from path %s", QDir(QString::fromStdString(game->info.icon_path)).absolutePath());
-			}
-		}
-	}
-
-	if (!game->item || (cancel && cancel->load()))
-	{
-		return;
-	}
-
-	const QColor color = GetGridCompatibilityColor(game->compat.color);
-	{
-		std::lock_guard lock(game->item->pixmap_mutex);
-		game->pxmap = PaintedPixmap(game->icon, device_pixel_ratio, game->has_custom_config, game->has_custom_pad_config, color);
-	}
-
-	if (!cancel || !cancel->load())
-	{
-		if (m_icon_ready_callback)
-			m_icon_ready_callback(game->item);
-	}
-}
-
-QPixmap game_list_base::PaintedPixmap(const QPixmap& icon, qreal device_pixel_ratio, bool paint_config_icon, bool paint_pad_config_icon, const QColor& compatibility_color) const
-{
-	QSize canvas_size(320, 176);
-	QSize icon_size(icon.size());
-	QPoint target_pos;
-
-	if (!icon.isNull())
-	{
-		// Let's upscale the original icon to at least fit into the outer rect of the size of PS3's ICON0.PNG
-		if (icon_size.width() < 320 || icon_size.height() < 176)
-		{
-			icon_size.scale(320, 176, Qt::KeepAspectRatio);
-		}
-
-		canvas_size = icon_size;
-
-		// Calculate the centered size and position of the icon on our canvas.
-		if (icon_size.width() != 320 || icon_size.height() != 176)
-		{
-			ensure(icon_size.height() > 0);
-			constexpr double target_ratio = 320.0 / 176.0; // aspect ratio 20:11
-
-			if ((icon_size.width() / static_cast<double>(icon_size.height())) > target_ratio)
-			{
-				canvas_size.setHeight(std::ceil(icon_size.width() / target_ratio));
-			}
-			else
-			{
-				canvas_size.setWidth(std::ceil(icon_size.height() * target_ratio));
-			}
-
-			target_pos.setX(std::max<int>(0, (canvas_size.width() - icon_size.width()) / 2.0));
-			target_pos.setY(std::max<int>(0, (canvas_size.height() - icon_size.height()) / 2.0));
-		}
-	}
-
-	// Create a canvas large enough to fit our entire scaled icon
-	QPixmap canvas(canvas_size * device_pixel_ratio);
-	canvas.setDevicePixelRatio(device_pixel_ratio);
-	canvas.fill(m_icon_color);
-
-	// Create a painter for our canvas
-	QPainter painter(&canvas);
-	painter.setRenderHint(QPainter::SmoothPixmapTransform);
-
-	// Draw the icon onto our canvas
-	if (!icon.isNull())
-	{
-		painter.drawPixmap(target_pos.x(), target_pos.y(), icon_size.width(), icon_size.height(), icon);
-	}
-
-	// Draw config icons if necessary
-	if (!m_is_list_layout && (paint_config_icon || paint_pad_config_icon))
-	{
-		const int width = canvas_size.width() * 0.2;
-		const QPoint origin = QPoint(canvas_size.width() - width, 0);
-		QString icon_path;
-
-		if (paint_config_icon && paint_pad_config_icon)
-		{
-			icon_path = ":/Icons/combo_config_bordered.png";
-		}
-		else if (paint_config_icon)
-		{
-			icon_path = ":/Icons/custom_config.png";
-		}
-		else if (paint_pad_config_icon)
-		{
-			icon_path = ":/Icons/controllers.png";
-		}
-
-		QPixmap custom_config_icon(icon_path);
-		custom_config_icon.setDevicePixelRatio(device_pixel_ratio);
-		painter.drawPixmap(origin, custom_config_icon.scaled(QSize(width, width) * device_pixel_ratio, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation));
-	}
-
-	// Draw game compatibility icons if necessary
-	if (compatibility_color.isValid())
-	{
-		const int size = canvas_size.height() * 0.2;
-		const int spacing = canvas_size.height() * 0.05;
-		QColor copyColor = QColor(compatibility_color);
-		copyColor.setAlpha(215); // ~85% opacity
-		painter.setRenderHint(QPainter::Antialiasing);
-		painter.setBrush(QBrush(copyColor));
-		painter.setPen(QPen(Qt::black, std::max(canvas_size.width() / 320, canvas_size.height() / 176)));
-		painter.drawEllipse(spacing, spacing, size, size);
-	}
-
-	// Finish the painting
-	painter.end();
-
-	// Scale and return our final image
-	return canvas.scaled(m_icon_size * device_pixel_ratio, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation);
-}
-
-QColor game_list_base::GetGridCompatibilityColor(const QString& string) const
-{
-	if (m_draw_compat_status_to_grid && !m_is_list_layout)
-	{
-		return QColor(string);
-	}
-	return QColor();
-}
-
-QIcon game_list_base::GetCustomConfigIcon(const game_info& game)
-{
-	if (!game)
-		return {};
-
-	static const QIcon icon_combo_config_bordered(":/Icons/combo_config_bordered.png");
-	static const QIcon icon_custom_config(":/Icons/custom_config.png");
-	static const QIcon icon_controllers(":/Icons/controllers.png");
-
-	if (game->has_custom_config && game->has_custom_pad_config)
-	{
-		return icon_combo_config_bordered;
-	}
-
-	if (game->has_custom_config)
-	{
-		return icon_custom_config;
-	}
-
-	if (game->has_custom_pad_config)
-	{
-		return icon_controllers;
-	}
-
-	return {};
-}
diff --git a/rpcs3/rpcs3qt/game_list_base.h b/rpcs3/rpcs3qt/game_list_base.h
deleted file mode 100644
index ce6df55825..0000000000
--- a/rpcs3/rpcs3qt/game_list_base.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include "gui_game_info.h"
-
-#include <QIcon>
-#include <QWidget>
-
-class game_list_base
-{
-public:
-	game_list_base();
-
-	virtual void clear_list(){};
-	virtual void populate(
-		[[maybe_unused]] const std::vector<game_info>& game_data,
-		[[maybe_unused]] const std::map<QString, QString>& notes_map,
-		[[maybe_unused]] const std::map<QString, QString>& title_map,
-		[[maybe_unused]] const std::string& selected_item_id,
-		[[maybe_unused]] bool play_hover_movies){};
-
-	void set_icon_size(QSize size) { m_icon_size = std::move(size); }
-	void set_icon_color(QColor color) { m_icon_color = std::move(color); }
-	void set_draw_compat_status_to_grid(bool enabled) { m_draw_compat_status_to_grid = enabled; }
-
-	virtual void repaint_icons(std::vector<game_info>& game_data, const QColor& icon_color, const QSize& icon_size, qreal device_pixel_ratio);
-
-	/** Sets the custom config icon. */
-	static QIcon GetCustomConfigIcon(const game_info& game);
-
-protected:
-	void IconLoadFunction(game_info game, qreal device_pixel_ratio, std::shared_ptr<atomic_t<bool>> cancel);
-	QPixmap PaintedPixmap(const QPixmap& icon, qreal device_pixel_ratio, bool paint_config_icon = false, bool paint_pad_config_icon = false, const QColor& compatibility_color = {}) const;
-	QColor GetGridCompatibilityColor(const QString& string) const;
-
-	std::function<void(const movie_item_base*)> m_icon_ready_callback{};
-	bool m_draw_compat_status_to_grid{};
-	bool m_is_list_layout{};
-	QSize m_icon_size{};
-	QColor m_icon_color{};
-};
diff --git a/rpcs3/rpcs3qt/game_list_delegate.cpp b/rpcs3/rpcs3qt/game_list_delegate.cpp
deleted file mode 100644
index 6b91cce707..0000000000
--- a/rpcs3/rpcs3qt/game_list_delegate.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "game_list_delegate.h"
-#include "movie_item.h"
-#include "gui_settings.h"
-
-#include <QHeaderView>
-
-game_list_delegate::game_list_delegate(QObject* parent)
-	: table_item_delegate(parent, true)
-{}
-
-void game_list_delegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
-{
-	table_item_delegate::paint(painter, option, index);
-
-	// Find out if the icon or size items are visible
-	if (index.column() == static_cast<int>(gui::game_list_columns::dir_size) || (m_has_icons && index.column() == static_cast<int>(gui::game_list_columns::icon)))
-	{
-		if (const QTableWidget* table = static_cast<const QTableWidget*>(parent()))
-		{
-			// We need to remove the headers from our calculation. The visualItemRect starts at 0,0 while the visibleRegion doesn't.
-			QRegion visible_region = table->visibleRegion();
-			visible_region.translate(-table->verticalHeader()->width(), -table->horizontalHeader()->height());
-
-			if (const QTableWidgetItem* current_item = table->item(index.row(), index.column());
-				current_item && visible_region.boundingRect().intersects(table->visualItemRect(current_item)))
-			{
-				if (movie_item* item = static_cast<movie_item*>(table->item(index.row(), static_cast<int>(gui::game_list_columns::icon))))
-				{
-					if (index.column() == static_cast<int>(gui::game_list_columns::dir_size))
-					{
-						if (!item->size_on_disk_loading())
-						{
-							item->call_size_calc_func();
-						}
-					}
-					else if (m_has_icons && index.column() == static_cast<int>(gui::game_list_columns::icon))
-					{
-						if (!item->icon_loading())
-						{
-							item->call_icon_load_func(index.row());
-						}
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/rpcs3/rpcs3qt/game_list_delegate.h b/rpcs3/rpcs3qt/game_list_delegate.h
deleted file mode 100644
index 60d818625e..0000000000
--- a/rpcs3/rpcs3qt/game_list_delegate.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "table_item_delegate.h"
-
-class game_list_delegate : public table_item_delegate
-{
-public:
-	explicit game_list_delegate(QObject* parent);
-
-	void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-};
diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp
index 3da34c832a..39a0bcab9e 100644
--- a/rpcs3/rpcs3qt/game_list_frame.cpp
+++ b/rpcs3/rpcs3qt/game_list_frame.cpp
@@ -2,25 +2,26 @@
 #include "qt_utils.h"
 #include "settings_dialog.h"
 #include "pad_settings_dialog.h"
+#include "table_item_delegate.h"
+#include "custom_table_widget_item.h"
 #include "input_dialog.h"
 #include "localized.h"
 #include "progress_dialog.h"
 #include "persistent_settings.h"
 #include "emu_settings.h"
 #include "gui_settings.h"
-#include "gui_application.h"
-#include "game_list_table.h"
+#include "game_list.h"
 #include "game_list_grid.h"
-#include "game_list_grid_item.h"
 #include "patch_manager_dialog.h"
 
+#include "Emu/Memory/vm.h"
 #include "Emu/System.h"
-#include "Emu/vfs_config.h"
+#include "Emu/system_config.h"
 #include "Emu/system_utils.hpp"
 #include "Loader/PSF.h"
 #include "util/types.hpp"
 #include "Utilities/File.h"
-#include "util/sysinfo.hpp"
+#include "util/yaml.hpp"
 #include "Input/pad_thread.h"
 
 #include <algorithm>
@@ -28,7 +29,6 @@
 #include <set>
 #include <regex>
 #include <unordered_map>
-#include <unordered_set>
 
 #include <QtConcurrent>
 #include <QDesktopServices>
@@ -46,7 +46,7 @@ LOG_CHANNEL(sys_log, "SYS");
 
 extern atomic_t<bool> g_system_progress_canceled;
 
-std::string get_savestate_file(std::string_view title_id, std::string_view boot_pat, s64 abs_id, s64 rel_id);
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
 
 game_list_frame::game_list_frame(std::shared_ptr<gui_settings> gui_settings, std::shared_ptr<emu_settings> emu_settings, std::shared_ptr<persistent_settings> persistent_settings, QWidget* parent)
 	: custom_dock_widget(tr("Game List"), parent)
@@ -66,133 +66,114 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> gui_settings, std
 	m_old_layout_is_list = m_is_list_layout;
 
 	// Save factors for first setup
-	m_gui_settings->SetValue(gui::gl_iconColor, m_icon_color, false);
-	m_gui_settings->SetValue(gui::gl_marginFactor, m_margin_factor, false);
-	m_gui_settings->SetValue(gui::gl_textFactor, m_text_factor, true);
+	m_gui_settings->SetValue(gui::gl_iconColor, m_icon_color);
+	m_gui_settings->SetValue(gui::gl_marginFactor, m_margin_factor);
+	m_gui_settings->SetValue(gui::gl_textFactor, m_text_factor);
 
 	m_game_dock = new QMainWindow(this);
 	m_game_dock->setWindowFlags(Qt::Widget);
 	setWidget(m_game_dock);
 
-	m_game_grid = new game_list_grid();
-	m_game_grid->installEventFilter(this);
-	m_game_grid->scroll_area()->verticalScrollBar()->installEventFilter(this);
+	m_game_grid = new game_list_grid(QSize(), m_icon_color, m_margin_factor, m_text_factor, false);
 
-	m_game_list = new game_list_table(this, m_persistent_settings);
-	m_game_list->installEventFilter(this);
+	m_game_list = new game_list();
+	m_game_list->setShowGrid(false);
+	m_game_list->setItemDelegate(new table_item_delegate(this, true));
+	m_game_list->setEditTriggers(QAbstractItemView::NoEditTriggers);
+	m_game_list->setSelectionBehavior(QAbstractItemView::SelectRows);
+	m_game_list->setSelectionMode(QAbstractItemView::SingleSelection);
+	m_game_list->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+	m_game_list->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
 	m_game_list->verticalScrollBar()->installEventFilter(this);
+	m_game_list->verticalScrollBar()->setSingleStep(20);
+	m_game_list->horizontalScrollBar()->setSingleStep(20);
+	m_game_list->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
+	m_game_list->verticalHeader()->setVisible(false);
+	m_game_list->horizontalHeader()->setContextMenuPolicy(Qt::CustomContextMenu);
+	m_game_list->horizontalHeader()->setHighlightSections(false);
+	m_game_list->horizontalHeader()->setSortIndicatorShown(true);
+	m_game_list->horizontalHeader()->setStretchLastSection(true);
+	m_game_list->horizontalHeader()->setDefaultSectionSize(150);
+	m_game_list->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
+	m_game_list->setContextMenuPolicy(Qt::CustomContextMenu);
+	m_game_list->setAlternatingRowColors(true);
+	m_game_list->installEventFilter(this);
+	m_game_list->setColumnCount(gui::column_count);
+	m_game_list->setMouseTracking(true);
 
 	m_game_compat = new game_compatibility(m_gui_settings, this);
 
 	m_central_widget = new QStackedWidget(this);
 	m_central_widget->addWidget(m_game_list);
 	m_central_widget->addWidget(m_game_grid);
-
-	if (m_is_list_layout)
-	{
-		m_central_widget->setCurrentWidget(m_game_list);
-	}
-	else
-	{
-		m_central_widget->setCurrentWidget(m_game_grid);
-	}
+	m_central_widget->setCurrentWidget(m_is_list_layout ? m_game_list : m_game_grid);
 
 	m_game_dock->setCentralWidget(m_central_widget);
 
 	// Actions regarding showing/hiding columns
 	auto add_column = [this](gui::game_list_columns col, const QString& header_text, const QString& action_text)
 	{
-		m_game_list->setHorizontalHeaderItem(static_cast<int>(col), new QTableWidgetItem(header_text));
+		m_game_list->setHorizontalHeaderItem(col, new QTableWidgetItem(header_text));
 		m_columnActs.append(new QAction(action_text, this));
 	};
 
-	add_column(gui::game_list_columns::icon,       tr("Icon"),                  tr("Show Icons"));
-	add_column(gui::game_list_columns::name,       tr("Name"),                  tr("Show Names"));
-	add_column(gui::game_list_columns::serial,     tr("Serial"),                tr("Show Serials"));
-	add_column(gui::game_list_columns::firmware,   tr("Firmware"),              tr("Show Firmwares"));
-	add_column(gui::game_list_columns::version,    tr("Version"),               tr("Show Versions"));
-	add_column(gui::game_list_columns::category,   tr("Category"),              tr("Show Categories"));
-	add_column(gui::game_list_columns::path,       tr("Path"),                  tr("Show Paths"));
-	add_column(gui::game_list_columns::move,       tr("PlayStation Move"),      tr("Show PlayStation Move"));
-	add_column(gui::game_list_columns::resolution, tr("Supported Resolutions"), tr("Show Supported Resolutions"));
-	add_column(gui::game_list_columns::sound,      tr("Sound Formats"),         tr("Show Sound Formats"));
-	add_column(gui::game_list_columns::parental,   tr("Parental Level"),        tr("Show Parental Levels"));
-	add_column(gui::game_list_columns::last_play,  tr("Last Played"),           tr("Show Last Played"));
-	add_column(gui::game_list_columns::playtime,   tr("Time Played"),           tr("Show Time Played"));
-	add_column(gui::game_list_columns::compat,     tr("Compatibility"),         tr("Show Compatibility"));
-	add_column(gui::game_list_columns::dir_size,   tr("Space On Disk"),         tr("Show Space On Disk"));
-
-	m_progress_dialog = new progress_dialog(tr("Loading games"), tr("Loading games, please wait..."), tr("Cancel"), 0, 0, false, this, Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
-	m_progress_dialog->setMinimumDuration(200); // Only show the progress dialog after some time has passed
+	add_column(gui::column_icon,       tr("Icon"),                  tr("Show Icons"));
+	add_column(gui::column_name,       tr("Name"),                  tr("Show Names"));
+	add_column(gui::column_serial,     tr("Serial"),                tr("Show Serials"));
+	add_column(gui::column_firmware,   tr("Firmware"),              tr("Show Firmwares"));
+	add_column(gui::column_version,    tr("Version"),               tr("Show Versions"));
+	add_column(gui::column_category,   tr("Category"),              tr("Show Categories"));
+	add_column(gui::column_path,       tr("Path"),                  tr("Show Paths"));
+	add_column(gui::column_move,       tr("PlayStation Move"),      tr("Show PlayStation Move"));
+	add_column(gui::column_resolution, tr("Supported Resolutions"), tr("Show Supported Resolutions"));
+	add_column(gui::column_sound,      tr("Sound Formats"),         tr("Show Sound Formats"));
+	add_column(gui::column_parental,   tr("Parental Level"),        tr("Show Parental Levels"));
+	add_column(gui::column_last_play,  tr("Last Played"),           tr("Show Last Played"));
+	add_column(gui::column_playtime,   tr("Time Played"),           tr("Show Time Played"));
+	add_column(gui::column_compat,     tr("Compatibility"),         tr("Show Compatibility"));
 
 	// Events
-	connect(m_progress_dialog, &QProgressDialog::canceled, this, [this]()
-	{
-		gui::utils::stop_future_watcher(m_parsing_watcher, true);
-		gui::utils::stop_future_watcher(m_refresh_watcher, true);
-
-		m_path_entries.clear();
-		m_path_list.clear();
-		m_serials.clear();
-		m_game_data.clear();
-		m_notes.clear();
-		m_games.pop_all();
-	});
-	connect(&m_parsing_watcher, &QFutureWatcher<void>::finished, this, &game_list_frame::OnParsingFinished);
-	connect(&m_parsing_watcher, &QFutureWatcher<void>::canceled, this, [this]()
-	{
-		WaitAndAbortSizeCalcThreads();
-		WaitAndAbortRepaintThreads();
-
-		m_path_entries.clear();
-		m_path_list.clear();
-		m_game_data.clear();
-		m_serials.clear();
-		m_games.pop_all();
-	});
 	connect(&m_refresh_watcher, &QFutureWatcher<void>::finished, this, &game_list_frame::OnRefreshFinished);
 	connect(&m_refresh_watcher, &QFutureWatcher<void>::canceled, this, [this]()
 	{
-		WaitAndAbortSizeCalcThreads();
-		WaitAndAbortRepaintThreads();
+		if (m_repaint_watcher.isRunning())
+		{
+			m_repaint_watcher.cancel();
+			m_repaint_watcher.waitForFinished();
+		}
 
-		m_path_entries.clear();
 		m_path_list.clear();
 		m_game_data.clear();
 		m_serials.clear();
 		m_games.pop_all();
-
-		if (m_progress_dialog)
-		{
-			m_progress_dialog->accept();
-		}
 	});
-	connect(&m_refresh_watcher, &QFutureWatcher<void>::progressRangeChanged, this, [this](int minimum, int maximum)
+	connect(&m_repaint_watcher, &QFutureWatcher<movie_item*>::finished, this, &game_list_frame::OnRepaintFinished);
+	connect(&m_repaint_watcher, &QFutureWatcher<movie_item*>::resultReadyAt, this, [this](int index)
 	{
-		if (m_progress_dialog)
+		if (!m_is_list_layout) return;
+		if (movie_item* item = m_repaint_watcher.resultAt(index))
 		{
-			m_progress_dialog->SetRange(minimum, maximum);
-		}
-	});
-	connect(&m_refresh_watcher, &QFutureWatcher<void>::progressValueChanged, this, [this](int value)
-	{
-		if (m_progress_dialog)
-		{
-			m_progress_dialog->SetValue(value);
+			item->call_icon_func();
 		}
 	});
 
 	connect(m_game_list, &QTableWidget::customContextMenuRequested, this, &game_list_frame::ShowContextMenu);
 	connect(m_game_list, &QTableWidget::itemSelectionChanged, this, &game_list_frame::ItemSelectionChangedSlot);
-	connect(m_game_list, &QTableWidget::itemDoubleClicked, this, QOverload<QTableWidgetItem*>::of(&game_list_frame::doubleClickedSlot));
+	connect(m_game_list, &QTableWidget::itemDoubleClicked, this, &game_list_frame::doubleClickedSlot);
 
 	connect(m_game_list->horizontalHeader(), &QHeaderView::sectionClicked, this, &game_list_frame::OnColClicked);
+	connect(m_game_list->horizontalHeader(), &QHeaderView::customContextMenuRequested, [this](const QPoint& pos)
+	{
+		QMenu* configure = new QMenu(this);
+		configure->addActions(m_columnActs);
+		configure->exec(m_game_list->horizontalHeader()->viewport()->mapToGlobal(pos));
+	});
 
-	connect(m_game_grid, &QWidget::customContextMenuRequested, this, &game_list_frame::ShowContextMenu);
-	connect(m_game_grid, &game_list_grid::ItemSelectionChanged, this, &game_list_frame::NotifyGameSelection);
-	connect(m_game_grid, &game_list_grid::ItemDoubleClicked, this, QOverload<const game_info&>::of(&game_list_frame::doubleClickedSlot));
+	connect(m_game_grid, &QTableWidget::customContextMenuRequested, this, &game_list_frame::ShowContextMenu);
+	connect(m_game_grid, &QTableWidget::itemSelectionChanged, this, &game_list_frame::ItemSelectionChangedSlot);
+	connect(m_game_grid, &QTableWidget::itemDoubleClicked, this, &game_list_frame::doubleClickedSlot);
 
-	connect(m_game_compat, &game_compatibility::DownloadStarted, this, [this]()
+	connect(m_game_compat, &game_compatibility::DownloadStarted, [this]()
 	{
 		for (const auto& game : m_game_data)
 		{
@@ -200,47 +181,136 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> gui_settings, std
 		}
 		Refresh();
 	});
-	connect(m_game_compat, &game_compatibility::DownloadFinished, this, &game_list_frame::OnCompatFinished);
-	connect(m_game_compat, &game_compatibility::DownloadCanceled, this, &game_list_frame::OnCompatFinished);
-	connect(m_game_compat, &game_compatibility::DownloadError, this, [this](const QString& error)
+	connect(m_game_compat, &game_compatibility::DownloadFinished, [this]()
 	{
-		OnCompatFinished();
+		for (const auto& game : m_game_data)
+		{
+			game->compat = m_game_compat->GetCompatibility(game->info.serial);
+		}
+		Refresh();
+	});
+	connect(m_game_compat, &game_compatibility::DownloadError, [this](const QString& error)
+	{
+		for (const auto& game : m_game_data)
+		{
+			game->compat = m_game_compat->GetCompatibility(game->info.serial);
+		}
+		Refresh();
 		QMessageBox::warning(this, tr("Warning!"), tr("Failed to retrieve the online compatibility database!\nFalling back to local database.\n\n%0").arg(error));
 	});
 
-	connect(m_game_list, &game_list::FocusToSearchBar, this, &game_list_frame::FocusToSearchBar);
-	connect(m_game_grid, &game_list_grid::FocusToSearchBar, this, &game_list_frame::FocusToSearchBar);
+	for (int col = 0; col < m_columnActs.count(); ++col)
+	{
+		m_columnActs[col]->setCheckable(true);
 
-	m_game_list->create_header_actions(m_columnActs,
-		[this](int col) { return m_gui_settings->GetGamelistColVisibility(static_cast<gui::game_list_columns>(col)); },
-		[this](int col, bool visible) { m_gui_settings->SetGamelistColVisibility(static_cast<gui::game_list_columns>(col), visible); });
+		connect(m_columnActs[col], &QAction::triggered, [this, col](bool checked)
+		{
+			if (!checked) // be sure to have at least one column left so you can call the context menu at all time
+			{
+				int c = 0;
+				for (int i = 0; i < m_columnActs.count(); ++i)
+				{
+					if (m_gui_settings->GetGamelistColVisibility(i) && ++c > 1)
+						break;
+				}
+				if (c < 2)
+				{
+					m_columnActs[col]->setChecked(true); // re-enable the checkbox if we don't change the actual state
+					return;
+				}
+			}
+			m_game_list->setColumnHidden(col, !checked); // Negate because it's a set col hidden and we have menu say show.
+			m_gui_settings->SetGamelistColVisibility(col, checked);
+
+			if (checked) // handle hidden columns that have zero width after showing them (stuck between others)
+			{
+				FixNarrowColumns();
+			}
+		});
+	}
 }
 
 void game_list_frame::LoadSettings()
 {
 	m_col_sort_order = m_gui_settings->GetValue(gui::gl_sortAsc).toBool() ? Qt::AscendingOrder : Qt::DescendingOrder;
 	m_sort_column = m_gui_settings->GetValue(gui::gl_sortCol).toInt();
-	m_category_filters = m_gui_settings->GetGameListCategoryFilters(true);
-	m_grid_category_filters = m_gui_settings->GetGameListCategoryFilters(false);
+	m_category_filters = m_gui_settings->GetGameListCategoryFilters();
 	m_draw_compat_status_to_grid = m_gui_settings->GetValue(gui::gl_draw_compat).toBool();
-	m_prefer_game_data_icons = m_gui_settings->GetValue(gui::gl_pref_gd_icon).toBool();
 	m_show_custom_icons = m_gui_settings->GetValue(gui::gl_custom_icon).toBool();
 	m_play_hover_movies = m_gui_settings->GetValue(gui::gl_hover_gifs).toBool();
 
-	m_game_list->sync_header_actions(m_columnActs, [this](int col) { return m_gui_settings->GetGamelistColVisibility(static_cast<gui::game_list_columns>(col)); });
+	Refresh(true);
+
+	const QByteArray state = m_gui_settings->GetValue(gui::gl_state).toByteArray();
+	if (!m_game_list->horizontalHeader()->restoreState(state) && m_game_list->rowCount())
+	{
+		// If no settings exist, resize to contents.
+		ResizeColumnsToContents();
+	}
+
+	for (int col = 0; col < m_columnActs.count(); ++col)
+	{
+		const bool vis = m_gui_settings->GetGamelistColVisibility(col);
+		m_columnActs[col]->setChecked(vis);
+		m_game_list->setColumnHidden(col, !vis);
+	}
+
+	SortGameList();
+	FixNarrowColumns();
+
+	m_game_list->horizontalHeader()->restoreState(m_game_list->horizontalHeader()->saveState());
 }
 
 game_list_frame::~game_list_frame()
 {
-	WaitAndAbortSizeCalcThreads();
-	WaitAndAbortRepaintThreads();
-	gui::utils::stop_future_watcher(m_parsing_watcher, true);
-	gui::utils::stop_future_watcher(m_refresh_watcher, true);
+	SaveSettings();
+}
+
+void game_list_frame::FixNarrowColumns() const
+{
+	qApp->processEvents();
+
+	// handle columns (other than the icon column) that have zero width after showing them (stuck between others)
+	for (int col = 1; col < m_columnActs.count(); ++col)
+	{
+		if (m_game_list->isColumnHidden(col))
+		{
+			continue;
+		}
+
+		if (m_game_list->columnWidth(col) <= m_game_list->horizontalHeader()->minimumSectionSize())
+		{
+			m_game_list->setColumnWidth(col, m_game_list->horizontalHeader()->minimumSectionSize());
+		}
+	}
+}
+
+void game_list_frame::ResizeColumnsToContents(int spacing) const
+{
+	if (!m_game_list)
+	{
+		return;
+	}
+
+	m_game_list->verticalHeader()->resizeSections(QHeaderView::ResizeMode::ResizeToContents);
+	m_game_list->horizontalHeader()->resizeSections(QHeaderView::ResizeMode::ResizeToContents);
+
+	// Make non-icon columns slighty bigger for better visuals
+	for (int i = 1; i < m_game_list->columnCount(); i++)
+	{
+		if (m_game_list->isColumnHidden(i))
+		{
+			continue;
+		}
+
+		const int size = m_game_list->horizontalHeader()->sectionSize(i) + spacing;
+		m_game_list->horizontalHeader()->resizeSection(i, size);
+	}
 }
 
 void game_list_frame::OnColClicked(int col)
 {
-	if (col == static_cast<int>(gui::game_list_columns::icon)) return; // Don't "sort" icons.
+	if (col == 0) return; // Don't "sort" icons.
 
 	if (col == m_sort_column)
 	{
@@ -252,122 +322,106 @@ void game_list_frame::OnColClicked(int col)
 	}
 	m_sort_column = col;
 
-	m_gui_settings->SetValue(gui::gl_sortAsc, m_col_sort_order == Qt::AscendingOrder, false);
-	m_gui_settings->SetValue(gui::gl_sortCol, col, true);
+	m_gui_settings->SetValue(gui::gl_sortAsc, m_col_sort_order == Qt::AscendingOrder);
+	m_gui_settings->SetValue(gui::gl_sortCol, col);
 
-	m_game_list->sort(m_game_data.size(), m_sort_column, m_col_sort_order);
+	SortGameList();
 }
 
 // Get visibility of entries
-bool game_list_frame::IsEntryVisible(const game_info& game, bool search_fallback) const
+bool game_list_frame::IsEntryVisible(const game_info& game)
 {
-	const auto matches_category = [&]()
+	auto matches_category = [&]()
 	{
 		if (m_is_list_layout)
 		{
-			return m_category_filters.contains(QString::fromStdString(game->info.category));
+			return m_category_filters.contains(qstr(game->info.category));
 		}
 
-		return m_grid_category_filters.contains(QString::fromStdString(game->info.category));
+		const auto cat_boot = Localized().category.cat_boot;
+		return cat_boot.find(qstr(game->info.category)) != cat_boot.end();
 	};
 
-	const QString serial = QString::fromStdString(game->info.serial);
+	const QString serial = qstr(game->info.serial);
 	const bool is_visible = m_show_hidden || !m_hidden_list.contains(serial);
-	return is_visible && matches_category() && SearchMatchesApp(QString::fromStdString(game->info.name), serial, search_fallback);
+	return is_visible && matches_category() && SearchMatchesApp(qstr(game->info.name), serial);
 }
 
-bool game_list_frame::RemoveContentPath(const std::string& path, const std::string& desc)
+void game_list_frame::SortGameList() const
 {
-	if (!fs::exists(path))
+	// Back-up old header sizes to handle unwanted column resize in case of zero search results
+	QList<int> column_widths;
+	const int old_row_count = m_game_list->rowCount();
+	const int old_game_count = m_game_data.count();
+
+	for (int i = 0; i < m_game_list->columnCount(); i++)
 	{
-		return true;
+		column_widths.append(m_game_list->columnWidth(i));
 	}
 
-	if (fs::is_dir(path))
-	{
-		if (fs::remove_all(path))
-		{
-			game_list_log.notice("Removed '%s' directory: '%s'", desc, path);
-		}
-		else
-		{
-			game_list_log.error("Could not remove '%s' directory: '%s' (%s)", desc, path, fs::g_tls_error);
+	// Sorting resizes hidden columns, so unhide them as a workaround
+	QList<int> columns_to_hide;
 
-			return false;
-		}
-	}
-	else // If file
+	for (int i = 0; i < m_game_list->columnCount(); i++)
 	{
-		if (fs::remove_file(path))
+		if (m_game_list->isColumnHidden(i))
 		{
-			game_list_log.notice("Removed '%s' file: '%s'", desc, path);
-		}
-		else
-		{
-			game_list_log.error("Could not remove '%s' file: '%s' (%s)", desc, path, fs::g_tls_error);
-
-			return false;
+			m_game_list->setColumnHidden(i, false);
+			columns_to_hide << i;
 		}
 	}
 
-	return true;
+	// Sort the list by column and sort order
+	m_game_list->sortByColumn(m_sort_column, m_col_sort_order);
+
+	// Hide columns again
+	for (auto i : columns_to_hide)
+	{
+		m_game_list->setColumnHidden(i, true);
+	}
+
+	// Don't resize the columns if no game is shown to preserve the header settings
+	if (!m_game_list->rowCount())
+	{
+		for (int i = 0; i < m_game_list->columnCount(); i++)
+		{
+			m_game_list->setColumnWidth(i, column_widths[i]);
+		}
+
+		m_game_list->horizontalHeader()->setSectionResizeMode(gui::column_icon, QHeaderView::Fixed);
+		return;
+	}
+
+	// Fixate vertical header and row height
+	m_game_list->verticalHeader()->setMinimumSectionSize(m_icon_size.height());
+	m_game_list->verticalHeader()->setMaximumSectionSize(m_icon_size.height());
+	m_game_list->resizeRowsToContents();
+
+	// Resize columns if the game list was empty before
+	if (!old_row_count && !old_game_count)
+	{
+		ResizeColumnsToContents();
+	}
+	else
+	{
+		m_game_list->resizeColumnToContents(gui::column_icon);
+	}
+
+	// Fixate icon column
+	m_game_list->horizontalHeader()->setSectionResizeMode(gui::column_icon, QHeaderView::Fixed);
+
+	// Shorten the last section to remove horizontal scrollbar if possible
+	m_game_list->resizeColumnToContents(gui::column_count - 1);
 }
 
-u32 game_list_frame::RemoveContentPathList(const std::vector<std::string>& path_list, const std::string& desc)
+QString game_list_frame::GetLastPlayedBySerial(const QString& serial) const
 {
-	u32 paths_removed = 0;
-
-	for (const std::string& path : path_list)
-	{
-		if (RemoveContentPath(path, desc))
-		{
-			paths_removed++;
-		}
-	}
-
-	return paths_removed;
-}
-
-bool game_list_frame::RemoveContentBySerial(const std::string& base_dir, const std::string& serial, const std::string& desc)
-{
-	bool success = true;
-
-	for (const auto& entry : fs::dir(base_dir))
-	{
-		// Search for any path starting with serial (e.g. BCES01118_BCES01118)
-		if (!entry.name.starts_with(serial))
-		{
-			continue;
-		}
-
-		if (!RemoveContentPath(base_dir + entry.name, desc))
-		{
-			success = false; // Mark as failed if there is at least one failure
-		}
-	}
-
-	return success;
-}
-
-std::vector<std::string> game_list_frame::GetDirListBySerial(const std::string& base_dir, const std::string& serial)
-{
-	std::vector<std::string> dir_list;
-
-	for (const auto& entry : fs::dir(base_dir))
-	{
-		// Check for sub folder starting with serial (e.g. BCES01118_BCES01118)
-		if (entry.is_directory && entry.name.starts_with(serial))
-		{
-			dir_list.push_back(base_dir + entry.name);
-		}
-	}
-
-	return dir_list;
+	return m_persistent_settings->GetLastPlayed(serial);
 }
 
 std::string game_list_frame::GetCacheDirBySerial(const std::string& serial)
 {
-	return rpcs3::utils::get_cache_dir() + (serial == "vsh.self" ? "vsh" : serial);
+	return rpcs3::utils::get_cache_dir() + serial;
 }
 
 std::string game_list_frame::GetDataDirBySerial(const std::string& serial)
@@ -375,118 +429,260 @@ std::string game_list_frame::GetDataDirBySerial(const std::string& serial)
 	return fs::get_config_dir() + "data/" + serial;
 }
 
-void game_list_frame::push_path(const std::string& path, std::vector<std::string>& legit_paths)
+void game_list_frame::Refresh(const bool from_drive, const bool scroll_after)
 {
+	if (m_repaint_watcher.isRunning())
 	{
-		std::lock_guard lock(m_path_mutex);
-		if (!m_path_list.insert(path).second)
+		m_repaint_watcher.cancel();
+		m_repaint_watcher.waitForFinished();
+	}
+
+	if (m_refresh_watcher.isRunning())
+	{
+		if (from_drive)
 		{
-			return;
+			m_refresh_watcher.cancel();
 		}
-	}
-	legit_paths.push_back(path);
-}
-
-void game_list_frame::Refresh(const bool from_drive, const std::vector<std::string>& serials_to_remove_from_yml, const bool scroll_after)
-{
-	if (from_drive)
-	{
-		WaitAndAbortSizeCalcThreads();
-	}
-	WaitAndAbortRepaintThreads();
-	gui::utils::stop_future_watcher(m_parsing_watcher, from_drive);
-	gui::utils::stop_future_watcher(m_refresh_watcher, from_drive);
-
-	if (m_progress_dialog && m_progress_dialog->isVisible())
-	{
-		m_progress_dialog->SetValue(m_progress_dialog->maximum());
-		m_progress_dialog->accept();
+		m_refresh_watcher.waitForFinished();
 	}
 
 	if (from_drive)
 	{
-		m_path_entries.clear();
+		const Localized localized;
+
 		m_path_list.clear();
 		m_serials.clear();
 		m_game_data.clear();
 		m_notes.clear();
 		m_games.pop_all();
 
-		if (m_progress_dialog)
+		const std::string _hdd =  rpcs3::utils::get_hdd0_dir();
+
+		const auto add_disc_dir = [&](const std::string& path)
 		{
-			m_progress_dialog->SetValue(0);
-		}
-
-		const std::string games_dir = rpcs3::utils::get_games_dir();
-
-		// Remove the specified and detected serials (title id) belonging to "games_dir" folder only from the game list in memory
-		// (not yet in "games.yml" file)
-		Emu.RemoveGamesFromDir(games_dir, serials_to_remove_from_yml, false);
-
-		// Scan auto-detection "games" folder adding the detected titles to the game list plus flushing also all the other changes in "games.yml" file
-		if (const u32 games_added = Emu.AddGamesFromDir(games_dir); games_added != 0)
-		{
-			game_list_log.notice("Refresh added %d new entries found in %s", games_added, games_dir);
-		}
-
-		const std::string _hdd = Emu.GetCallbacks().resolve_path(rpcs3::utils::get_hdd0_dir()) + '/';
-
-		m_parsing_watcher.setFuture(QtConcurrent::map(m_parsing_threads, [this, _hdd](int index)
-		{
-			if (index > 0)
+			for (const auto& entry : fs::dir(path))
 			{
-				game_list_log.error("Unexpected thread index: %d", index);
-				return;
-			}
-
-			const auto add_dir = [this](const std::string& path, bool is_disc)
-			{
-				for (const auto& entry : fs::dir(path))
-				{
-					if (m_parsing_watcher.isCanceled())
-					{
-						break;
-					}
-
-					if (!entry.is_directory || entry.name == "." || entry.name == "..")
-					{
-						continue;
-					}
-
-					std::lock_guard lock(m_path_mutex);
-					m_path_entries.emplace_back(path_entry{path + entry.name, is_disc, false});
-				}
-			};
-
-			const std::string hdd0_game = _hdd + "game/";
-
-			add_dir(hdd0_game, false);
-			add_dir(_hdd + "disc/", true); // Deprecated
-
-			for (const auto& [serial, path] : Emu.GetGamesConfig().get_games())
-			{
-				if (m_parsing_watcher.isCanceled())
-				{
-					break;
-				}
-
-				std::string game_dir = path;
-				game_dir.resize(game_dir.find_last_not_of('/') + 1);
-
-				if (game_dir.empty() || path.starts_with(hdd0_game))
+				if (!entry.is_directory || entry.name == "." || entry.name == "..")
 				{
 					continue;
 				}
 
-				// Don't use the C00 subdirectory in our game list
-				if (game_dir.ends_with("/C00") || game_dir.ends_with("\\C00"))
+				if (entry.name == "PS3_GAME" || std::regex_match(entry.name, std::regex("^PS3_GM[[:digit:]]{2}$")))
 				{
-					game_dir = game_dir.substr(0, game_dir.size() - 4);
+					m_path_list.emplace_back(path + "/" + entry.name);
+				}
+			}
+		};
+
+		const auto add_dir = [&](const std::string& path, bool is_disc)
+		{
+			for (const auto& entry : fs::dir(path))
+			{
+				if (!entry.is_directory || entry.name == "." || entry.name == "..")
+				{
+					continue;
 				}
 
-				std::lock_guard lock(m_path_mutex);
-				m_path_entries.emplace_back(path_entry{game_dir, false, true});
+				const std::string entry_path = path + entry.name;
+
+				if (fs::is_file(entry_path + "/PS3_DISC.SFB"))
+				{
+					if (!is_disc)
+					{
+						game_list_log.error("Invalid game path found in %s", entry_path);
+					}
+					else
+					{
+						add_disc_dir(entry_path);
+					}
+				}
+				else
+				{
+					if (is_disc)
+					{
+						game_list_log.error("Invalid disc path found in %s", entry_path);
+					}
+					else
+					{
+						m_path_list.emplace_back(entry_path);
+					}
+				}
 			}
+		};
+
+		add_dir(_hdd + "game/", false);
+		add_dir(_hdd + "disc/", true);
+
+		auto get_games = []() -> YAML::Node
+		{
+			if (const fs::file games = fs::file(fs::get_config_dir() + "/games.yml", fs::read + fs::create))
+			{
+				auto [result, error] = yaml_load(games.to_string());
+
+				if (!error.empty())
+				{
+					game_list_log.error("Failed to load games.yml: %s", error);
+					return {};
+				}
+
+				return result;
+			}
+
+			game_list_log.error("Failed to load games.yml, check permissions.");
+			return {};
+		};
+
+		for (auto&& pair : get_games())
+		{
+			std::string game_dir = pair.second.Scalar();
+
+			game_dir.resize(game_dir.find_last_not_of('/') + 1);
+
+			if (fs::is_file(game_dir + "/PS3_DISC.SFB"))
+			{
+				// Check if a path loaded from games.yml is already registered in add_dir(_hdd + "disc/");
+				if (game_dir.starts_with(_hdd))
+				{
+					std::string_view frag = std::string_view(game_dir).substr(_hdd.size());
+
+					if (frag.starts_with("disc/"))
+					{
+						// Our path starts from _hdd + 'disc/'
+						frag.remove_prefix(5);
+
+						// Check if the remaining part is the only path component
+						if (frag.find_first_of('/') + 1 == 0)
+						{
+							game_list_log.trace("Removed duplicate for %s: %s", pair.first.Scalar(), pair.second.Scalar());
+							continue;
+						}
+					}
+				}
+
+				add_disc_dir(game_dir);
+			}
+			else
+			{
+				game_list_log.trace("Invalid disc path registered for %s: %s", pair.first.Scalar(), pair.second.Scalar());
+			}
+		}
+
+		// Remove duplicates
+		sort(m_path_list.begin(), m_path_list.end());
+		m_path_list.erase(unique(m_path_list.begin(), m_path_list.end()), m_path_list.end());
+
+		const std::string game_icon_path = m_play_hover_movies ? fs::get_config_dir() + "/Icons/game_icons/" : "";
+
+		m_refresh_watcher.setFuture(QtConcurrent::map(m_path_list, [this, cat_unknown_localized = sstr(localized.category.unknown), cat_unknown = sstr(cat::cat_unknown), game_icon_path](const std::string& dir)
+		{
+			const Localized thread_localized;
+
+			const std::string sfo_dir = rpcs3::utils::get_sfo_dir_from_game_path(dir);
+			const psf::registry psf = psf::load_object(fs::file(sfo_dir + "/PARAM.SFO"));
+			const std::string_view title_id = psf::get_string(psf, "TITLE_ID", "");
+
+			if (title_id.empty())
+			{
+				// Do not care about invalid entries
+				return;
+			}
+
+			GameInfo game;
+			game.path         = dir;
+			game.serial       = std::string(title_id);
+			game.name         = std::string(psf::get_string(psf, "TITLE", cat_unknown_localized));
+			game.app_ver      = std::string(psf::get_string(psf, "APP_VER", cat_unknown_localized));
+			game.version      = std::string(psf::get_string(psf, "VERSION", cat_unknown_localized));
+			game.category     = std::string(psf::get_string(psf, "CATEGORY", cat_unknown));
+			game.fw           = std::string(psf::get_string(psf, "PS3_SYSTEM_VER", cat_unknown_localized));
+			game.parental_lvl = psf::get_integer(psf, "PARENTAL_LEVEL", 0);
+			game.resolution   = psf::get_integer(psf, "RESOLUTION", 0);
+			game.sound_format = psf::get_integer(psf, "SOUND_FORMAT", 0);
+			game.bootable     = psf::get_integer(psf, "BOOTABLE", 0);
+			game.attr         = psf::get_integer(psf, "ATTRIBUTE", 0);
+
+			if (m_show_custom_icons)
+			{
+				game.icon_path = fs::get_config_dir() + "/Icons/game_icons/" + game.serial + "/ICON0.PNG";
+			}
+
+			if (!m_show_custom_icons || !fs::is_file(game.icon_path))
+			{
+				game.icon_path = sfo_dir + "/ICON0.PNG";
+			}
+
+			m_mutex_cat.lock();
+
+			const QString serial = qstr(game.serial);
+
+			// Read persistent_settings values
+			const QString note  = m_persistent_settings->GetValue(gui::persistent::notes, serial, "").toString();
+			const QString title = m_persistent_settings->GetValue(gui::persistent::titles, serial, "").toString().simplified();
+			QString last_played = m_persistent_settings->GetValue(gui::persistent::last_played, serial, "").toString();
+			quint64 playtime    = m_persistent_settings->GetValue(gui::persistent::playtime, serial, 0).toULongLong();
+
+			// Read deprecated gui_setting values first for backwards compatibility (older than January 12th 2020).
+			// Restrict this to empty persistent settings to keep continuity.
+			if (last_played.isEmpty())
+			{
+				last_played = m_gui_settings->GetValue(gui::persistent::last_played, serial, "").toString();
+				m_gui_settings->RemoveValue(gui::persistent::last_played, serial);
+			}
+			if (playtime <= 0)
+			{
+				playtime = m_gui_settings->GetValue(gui::persistent::playtime, serial, 0).toULongLong();
+				m_gui_settings->RemoveValue(gui::persistent::playtime, serial);
+			}
+
+			// Set persistent_settings values if values exist
+			if (!last_played.isEmpty())
+			{
+				m_persistent_settings->SetLastPlayed(serial, last_played);
+			}
+			if (playtime > 0)
+			{
+				m_persistent_settings->SetPlaytime(serial, playtime);
+			}
+
+			m_serials.insert(serial);
+
+			if (!note.isEmpty())
+			{
+				m_notes.insert(serial, note);
+			}
+
+			if (!title.isEmpty())
+			{
+				m_titles.insert(serial, title);
+			}
+
+			auto qt_cat = qstr(game.category);
+
+			if (const auto boot_cat = thread_localized.category.cat_boot.find(qt_cat); boot_cat != thread_localized.category.cat_boot.end())
+			{
+				qt_cat = boot_cat->second;
+			}
+			else if (const auto data_cat = thread_localized.category.cat_data.find(qt_cat); data_cat != thread_localized.category.cat_data.end())
+			{
+				qt_cat = data_cat->second;
+			}
+			else if (game.category == cat_unknown)
+			{
+				qt_cat = thread_localized.category.unknown;
+			}
+			else
+			{
+				qt_cat = thread_localized.category.other;
+			}
+
+			m_mutex_cat.unlock();
+
+			const auto compat = m_game_compat->GetCompatibility(game.serial);
+			const bool hasCustomConfig = fs::is_file(rpcs3::utils::get_custom_config_path(game.serial)) || fs::is_file(rpcs3::utils::get_custom_config_path(game.serial, true));
+			const bool hasCustomPadConfig = fs::is_file(rpcs3::utils::get_custom_input_config_path(game.serial));
+			const bool has_hover_gif = fs::is_file(game_icon_path + game.serial + "/hover.gif");
+
+			m_games.push(std::make_shared<gui_game_info>(gui_game_info{game, qt_cat, compat, {}, {}, hasCustomConfig, hasCustomPadConfig, has_hover_gif, nullptr}));
 		}));
 
 		return;
@@ -494,43 +690,11 @@ void game_list_frame::Refresh(const bool from_drive, const std::vector<std::stri
 
 	// Fill Game List / Game Grid
 
-	const std::string selected_item = CurrentSelectionPath();
-
-	// Release old data
-	for (const auto& game : m_game_data)
-	{
-		game->item = nullptr;
-	}
-
-	// Get list of matching apps
-	std::vector<game_info> matching_apps;
-
-	for (const auto& app : m_game_data)
-	{
-		if (IsEntryVisible(app))
-		{
-			matching_apps.push_back(app);
-		}
-	}
-
-	// Fallback is not needed when at least one entry is visible
-	if (matching_apps.empty())
-	{
-		for (const auto& app : m_game_data)
-		{
-			if (IsEntryVisible(app, true))
-			{
-				matching_apps.push_back(app);
-			}
-		}
-	}
-
 	if (m_is_list_layout)
 	{
-		m_game_grid->clear_list();
 		const int scroll_position = m_game_list->verticalScrollBar()->value();
-		m_game_list->populate(matching_apps, m_notes, m_titles, selected_item, m_play_hover_movies);
-		m_game_list->sort(m_game_data.size(), m_sort_column, m_col_sort_order);
+		PopulateGameList();
+		SortGameList();
 		RepaintIcons();
 
 		if (scroll_after)
@@ -544,289 +708,17 @@ void game_list_frame::Refresh(const bool from_drive, const std::vector<std::stri
 	}
 	else
 	{
-		m_game_list->clear_list();
-		m_game_grid->populate(matching_apps, m_notes, m_titles, selected_item, m_play_hover_movies);
 		RepaintIcons();
 	}
 }
 
-void game_list_frame::OnParsingFinished()
-{
-	const Localized localized;
-	const std::string dev_flash = g_cfg_vfs.get_dev_flash();
-	const std::string _hdd = rpcs3::utils::get_hdd0_dir();
-
-	m_path_entries.emplace_back(path_entry{dev_flash + "vsh/module/vsh.self", false, false});
-
-	// Remove duplicates
-	sort(m_path_entries.begin(), m_path_entries.end(), [](const path_entry& l, const path_entry& r){return l.path < r.path;});
-	m_path_entries.erase(unique(m_path_entries.begin(), m_path_entries.end(), [](const path_entry& l, const path_entry& r){return l.path == r.path;}), m_path_entries.end());
-
-	const s32 language_index = gui_application::get_language_id();
-	const std::string game_icon_path = fs::get_config_dir() + "/Icons/game_icons/";
-	const std::string localized_title = fmt::format("TITLE_%02d", language_index);
-	const std::string localized_icon = fmt::format("ICON0_%02d.PNG", language_index);
-	const std::string localized_movie = fmt::format("ICON1_%02d.PAM", language_index);
-
-	const auto add_game = [this, localized_title, localized_icon, localized_movie, dev_flash, cat_unknown_localized = localized.category.unknown.toStdString(), cat_unknown = cat::cat_unknown.toStdString(), game_icon_path, _hdd, play_hover_movies = m_play_hover_movies, show_custom_icons = m_show_custom_icons](const std::string& dir_or_elf)
-	{
-		gui_game_info game{};
-		game.info.path = dir_or_elf;
-
-		const Localized thread_localized;
-
-		const std::string sfo_dir = rpcs3::utils::get_sfo_dir_from_game_path(dir_or_elf);
-		const psf::registry psf = psf::load_object(sfo_dir + "/PARAM.SFO");
-		const std::string_view title_id = psf::get_string(psf, "TITLE_ID", "");
-
-		if (title_id.empty())
-		{
-			if (!fs::is_file(dir_or_elf))
-			{
-				// Do not care about invalid entries
-				return;
-			}
-
-			game.info.serial = dir_or_elf.substr(dir_or_elf.find_last_of(fs::delim) + 1);
-			game.info.category = cat::cat_ps3_os.toStdString(); // Key for operating system executables
-			game.info.version = utils::get_firmware_version();
-			game.info.app_ver = game.info.version;
-			game.info.fw = game.info.version;
-			game.info.bootable = 1;
-			game.info.icon_path = dev_flash + "vsh/resource/explore/icon/icon_home.png";
-
-			if (dir_or_elf.starts_with(dev_flash))
-			{
-				std::string path_vfs = dir_or_elf.substr(dev_flash.size());
-
-				if (const usz pos = path_vfs.find_first_not_of(fs::delim); pos != umax && pos != 0)
-				{
-					path_vfs = path_vfs.substr(pos);
-				}
-
-				if (const auto it = thread_localized.title.titles.find(path_vfs); it != thread_localized.title.titles.cend())
-				{
-					game.info.name = it->second.toStdString();
-				}
-			}
-
-			if (game.info.name.empty())
-			{
-				game.info.name = game.info.serial;
-			}
-		}
-		else
-		{
-			std::string_view name = psf::get_string(psf, localized_title);
-			if (name.empty()) name = psf::get_string(psf, "TITLE", cat_unknown_localized);
-
-			game.info.serial       = std::string(title_id);
-			game.info.name         = std::string(name);
-			game.info.app_ver      = std::string(psf::get_string(psf, "APP_VER", cat_unknown_localized));
-			game.info.version      = std::string(psf::get_string(psf, "VERSION", cat_unknown_localized));
-			game.info.category     = std::string(psf::get_string(psf, "CATEGORY", cat_unknown));
-			game.info.fw           = std::string(psf::get_string(psf, "PS3_SYSTEM_VER", cat_unknown_localized));
-			game.info.parental_lvl = psf::get_integer(psf, "PARENTAL_LEVEL", 0);
-			game.info.resolution   = psf::get_integer(psf, "RESOLUTION", 0);
-			game.info.sound_format = psf::get_integer(psf, "SOUND_FORMAT", 0);
-			game.info.bootable     = psf::get_integer(psf, "BOOTABLE", 0);
-			game.info.attr         = psf::get_integer(psf, "ATTRIBUTE", 0);
-		}
-
-		if (show_custom_icons)
-		{
-			if (std::string icon_path = game_icon_path + game.info.serial + "/ICON0.PNG"; fs::is_file(icon_path))
-			{
-				game.info.icon_path = std::move(icon_path);
-				game.has_custom_icon = true;
-			}
-		}
-
-		if (game.info.icon_path.empty())
-		{
-			if (std::string icon_path = sfo_dir + "/" + localized_icon; fs::is_file(icon_path))
-			{
-				game.info.icon_path = std::move(icon_path);
-			}
-			else
-			{
-				game.info.icon_path = sfo_dir + "/ICON0.PNG";
-			}
-		}
-
-		if (std::string movie_path = game_icon_path + game.info.serial + "/hover.gif"; fs::is_file(movie_path))
-		{
-			game.info.movie_path = std::move(movie_path);
-			game.has_hover_gif = true;
-		}
-		else if (std::string movie_path = sfo_dir + "/" + localized_movie; fs::is_file(movie_path))
-		{
-			game.info.movie_path = std::move(movie_path);
-			game.has_hover_pam = true;
-		}
-		else if (std::string movie_path = sfo_dir + "/ICON1.PAM"; fs::is_file(movie_path))
-		{
-			game.info.movie_path = std::move(movie_path);
-			game.has_hover_pam = true;
-		}
-
-		const QString serial = QString::fromStdString(game.info.serial);
-
-		m_games_mutex.lock();
-
-		// Read persistent_settings values
-		const QString last_played = m_persistent_settings->GetValue(gui::persistent::last_played, serial, "").toString();
-		const quint64 playtime    = m_persistent_settings->GetValue(gui::persistent::playtime, serial, 0).toULongLong();
-
-		// Set persistent_settings values if values exist
-		if (!last_played.isEmpty())
-		{
-			m_persistent_settings->SetLastPlayed(serial, last_played, false); // No need to sync here. It would slow down the refresh anyway.
-		}
-		if (playtime > 0)
-		{
-			m_persistent_settings->SetPlaytime(serial, playtime, false); // No need to sync here. It would slow down the refresh anyway.
-		}
-
-		m_serials.insert(serial);
-
-		if (QString note = m_persistent_settings->GetValue(gui::persistent::notes, serial, "").toString(); !note.isEmpty())
-		{
-			m_notes.insert_or_assign(serial, std::move(note));
-		}
-
-		if (QString title = m_persistent_settings->GetValue(gui::persistent::titles, serial, "").toString().simplified(); !title.isEmpty())
-		{
-			m_titles.insert_or_assign(serial, std::move(title));
-		}
-
-		m_games_mutex.unlock();
-
-		QString qt_cat = QString::fromStdString(game.info.category);
-
-		if (const auto boot_cat = thread_localized.category.cat_boot.find(qt_cat); boot_cat != thread_localized.category.cat_boot.cend())
-		{
-			qt_cat = boot_cat->second;
-		}
-		else if (const auto data_cat = thread_localized.category.cat_data.find(qt_cat); data_cat != thread_localized.category.cat_data.cend())
-		{
-			qt_cat = data_cat->second;
-		}
-		else if (game.info.category == cat_unknown)
-		{
-			qt_cat = thread_localized.category.unknown;
-		}
-		else
-		{
-			qt_cat = thread_localized.category.other;
-		}
-
-		game.localized_category = std::move(qt_cat);
-		game.compat = m_game_compat->GetCompatibility(game.info.serial);
-		game.has_custom_config = fs::is_file(rpcs3::utils::get_custom_config_path(game.info.serial));
-		game.has_custom_pad_config = fs::is_file(rpcs3::utils::get_custom_input_config_path(game.info.serial));
-
-		m_games.push(std::make_shared<gui_game_info>(std::move(game)));
-	};
-
-	const auto add_disc_dir = [this](const std::string& path, std::vector<std::string>& legit_paths)
-	{
-		for (const auto& entry : fs::dir(path))
-		{
-			if (m_refresh_watcher.isCanceled())
-			{
-				break;
-			}
-
-			if (!entry.is_directory || entry.name == "." || entry.name == "..")
-			{
-				continue;
-			}
-
-			if (entry.name == "PS3_GAME" || std::regex_match(entry.name, std::regex("^PS3_GM[[:digit:]]{2}$")))
-			{
-				push_path(path + "/" + entry.name, legit_paths);
-			}
-		}
-	};
-
-	m_refresh_watcher.setFuture(QtConcurrent::map(m_path_entries, [this, _hdd, add_disc_dir, add_game](const path_entry& entry)
-	{
-		std::vector<std::string> legit_paths;
-
-		if (entry.is_from_yml)
-		{
-			if (fs::is_file(entry.path + "/PARAM.SFO"))
-			{
-				push_path(entry.path, legit_paths);
-			}
-			else if (fs::is_file(entry.path + "/PS3_DISC.SFB"))
-			{
-				// Check if a path loaded from games.yml is already registered in add_dir(_hdd + "disc/");
-				if (entry.path.starts_with(_hdd))
-				{
-					std::string_view frag = std::string_view(entry.path).substr(_hdd.size());
-
-					if (frag.starts_with("disc/"))
-					{
-						// Our path starts from _hdd + 'disc/'
-						frag.remove_prefix(5);
-
-						// Check if the remaining part is the only path component
-						if (frag.find_first_of('/') + 1 == 0)
-						{
-							game_list_log.trace("Removed duplicate: %s", entry.path);
-
-							if (static std::unordered_set<std::string> warn_once_list; warn_once_list.emplace(entry.path).second)
-							{
-								game_list_log.todo("Game at '%s' is using deprecated directory '/dev_hdd0/disc/'.\nConsider moving into '%s'.", entry.path, rpcs3::utils::get_games_dir());
-							}
-
-							return;
-						}
-					}
-				}
-
-				add_disc_dir(entry.path, legit_paths);
-			}
-			else
-			{
-				game_list_log.trace("Invalid game path registered: %s", entry.path);
-				return;
-			}
-		}
-		else if (fs::is_file(entry.path + "/PS3_DISC.SFB"))
-		{
-			if (!entry.is_disc)
-			{
-				game_list_log.error("Invalid game path found in %s", entry.path);
-				return;
-			}
-
-			add_disc_dir(entry.path, legit_paths);
-		}
-		else
-		{
-			if (entry.is_disc)
-			{
-				game_list_log.error("Invalid disc path found in %s", entry.path);
-				return;
-			}
-
-			push_path(entry.path, legit_paths);
-		}
-
-		for (const std::string& path : legit_paths)
-		{
-			add_game(path);
-		}
-	}));
-}
-
 void game_list_frame::OnRefreshFinished()
 {
-	WaitAndAbortSizeCalcThreads();
-	WaitAndAbortRepaintThreads();
+	if (m_repaint_watcher.isRunning())
+	{
+		m_repaint_watcher.cancel();
+		m_repaint_watcher.waitForFinished();
+	}
 
 	for (auto&& g : m_games.pop_all())
 	{
@@ -834,65 +726,48 @@ void game_list_frame::OnRefreshFinished()
 	}
 
 	const Localized localized;
-	const std::string cat_unknown_localized = localized.category.unknown.toStdString();
-	const s32 language_index = gui_application::get_language_id();
-	const std::string localized_icon = fmt::format("ICON0_%02d.PNG", language_index);
-	const std::string localized_movie = fmt::format("ICON1_%02d.PAM", language_index);
+	const std::string cat_unknown_localized = sstr(localized.category.unknown);
 
 	// Try to update the app version for disc games if there is a patch
-	// Also try to find updated game icons and movies
-	for (const game_info& entry : m_game_data)
+	for (const auto& entry : m_game_data)
 	{
-		if (entry->info.category != "DG") continue;
-
-		for (const auto& other : m_game_data)
+		if (entry->info.category == "DG")
 		{
-			if (other->info.category == "DG") continue;
-			if (entry->info.serial != other->info.serial) continue;
-
-			// The patch is game data and must have the same serial and an app version
-			if (other->info.app_ver != cat_unknown_localized)
+			for (const auto& other : m_game_data)
 			{
-				// Update the app version if it's higher than the disc's version (old games may not have an app version)
-				if (entry->info.app_ver == cat_unknown_localized || rpcs3::utils::version_is_bigger(other->info.app_ver, entry->info.app_ver, entry->info.serial, false))
+				// The patch is game data and must have the same serial and an app version
+				static constexpr auto version_is_bigger = [](const std::string& v0, const std::string& v1, const std::string& serial, bool is_fw)
 				{
-					entry->info.app_ver = other->info.app_ver;
-				}
-				// Update the firmware version if possible and if it's higher than the disc's version
-				if (other->info.fw != cat_unknown_localized && rpcs3::utils::version_is_bigger(other->info.fw, entry->info.fw, entry->info.serial, true))
-				{
-					entry->info.fw = other->info.fw;
-				}
-				// Update the parental level if possible and if it's higher than the disc's level
-				if (other->info.parental_lvl != 0 && other->info.parental_lvl > entry->info.parental_lvl)
-				{
-					entry->info.parental_lvl = other->info.parental_lvl;
-				}
-			}
+					std::add_pointer_t<char> ev0, ev1;
+					const double ver0 = std::strtod(v0.c_str(), &ev0);
+					const double ver1 = std::strtod(v1.c_str(), &ev1);
 
-			// Let's fetch the game data icon if preferred or if the path was empty for some reason
-			if ((m_prefer_game_data_icons && !entry->has_custom_icon) || entry->info.icon_path.empty())
-			{
-				if (std::string icon_path = other->info.path + "/" + localized_icon; fs::is_file(icon_path))
-				{
-					entry->info.icon_path = std::move(icon_path);
-				}
-				else if (std::string icon_path = other->info.path + "/ICON0.PNG"; fs::is_file(icon_path))
-				{
-					entry->info.icon_path = std::move(icon_path);
-				}
-			}
+					if (v0.c_str() + v0.size() == ev0 && v1.c_str() + v1.size() == ev1)
+					{
+						return ver0 > ver1;
+					}
 
-			// Let's fetch the game data movie if preferred or if the path was empty
-			if (m_prefer_game_data_icons || entry->info.movie_path.empty())
-			{
-				if (std::string movie_path = other->info.path + "/" + localized_movie; fs::is_file(movie_path))
+					game_list_log.error("Failed to update the displayed %s numbers for title ID %s\n'%s'-'%s'", is_fw ? "firmware version" : "version", serial, v0, v1);
+					return false;
+				};
+
+				if (entry->info.serial == other->info.serial && other->info.category != "DG" && other->info.app_ver != cat_unknown_localized)
 				{
-					entry->info.movie_path = std::move(movie_path);
-				}
-				else if (std::string movie_path = other->info.path + "/ICON1.PAM"; fs::is_file(movie_path))
-				{
-					entry->info.movie_path = std::move(movie_path);
+					// Update the app version if it's higher than the disc's version (old games may not have an app version)
+					if (entry->info.app_ver == cat_unknown_localized || version_is_bigger(other->info.app_ver, entry->info.app_ver, entry->info.serial, true))
+					{
+						entry->info.app_ver = other->info.app_ver;
+					}
+					// Update the firmware version if possible and if it's higher than the disc's version
+					if (other->info.fw != cat_unknown_localized && version_is_bigger(other->info.fw, entry->info.fw, entry->info.serial, false))
+					{
+						entry->info.fw = other->info.fw;
+					}
+					// Update the parental level if possible and if it's higher than the disc's level
+					if (other->info.parental_lvl != 0 && other->info.parental_lvl > entry->info.parental_lvl)
+					{
+						entry->info.parental_lvl = other->info.parental_lvl;
+					}
 				}
 			}
 		}
@@ -901,10 +776,8 @@ void game_list_frame::OnRefreshFinished()
 	// Sort by name at the very least.
 	std::sort(m_game_data.begin(), m_game_data.end(), [&](const game_info& game1, const game_info& game2)
 	{
-		const QString serial1 = QString::fromStdString(game1->info.serial);
-		const QString serial2 = QString::fromStdString(game2->info.serial);
-		const QString& title1 = m_titles.contains(serial1) ? m_titles.at(serial1) : QString::fromStdString(game1->info.name);
-		const QString& title2 = m_titles.contains(serial2) ? m_titles.at(serial2) : QString::fromStdString(game2->info.name);
+		const QString title1 = m_titles.value(qstr(game1->info.serial), qstr(game1->info.name));
+		const QString title2 = m_titles.value(qstr(game2->info.serial), qstr(game2->info.name));
 		return title1.toLower() < title2.toLower();
 	});
 
@@ -913,44 +786,56 @@ void game_list_frame::OnRefreshFinished()
 	m_gui_settings->SetValue(gui::gl_hidden_list, QStringList(m_hidden_list.values()));
 	m_serials.clear();
 	m_path_list.clear();
-	m_path_entries.clear();
 
 	Refresh();
-
-	if (!std::exchange(m_initial_refresh_done, true))
-	{
-		m_game_list->restore_layout(m_gui_settings->GetValue(gui::gl_state).toByteArray());
-		m_game_list->sync_header_actions(m_columnActs, [this](int col) { return m_gui_settings->GetGamelistColVisibility(static_cast<gui::game_list_columns>(col)); });
-	}
-
-	// Emit signal and remove slots
-	Q_EMIT Refreshed();
-	m_refresh_funcs_manage_type.reset();
-	m_refresh_funcs_manage_type.emplace();
 }
 
-void game_list_frame::OnCompatFinished()
+void game_list_frame::OnRepaintFinished()
 {
-	for (const auto& game : m_game_data)
+	if (m_is_list_layout)
 	{
-		game->compat = m_game_compat->GetCompatibility(game->info.serial);
+		// Fixate vertical header and row height
+		m_game_list->verticalHeader()->setMinimumSectionSize(m_icon_size.height());
+		m_game_list->verticalHeader()->setMaximumSectionSize(m_icon_size.height());
+
+		// Resize the icon column
+		m_game_list->resizeColumnToContents(gui::column_icon);
+
+		// Shorten the last section to remove horizontal scrollbar if possible
+		m_game_list->resizeColumnToContents(gui::column_count - 1);
+	}
+	else
+	{
+		// The game grid needs to be recreated from scratch
+		int games_per_row = 0;
+
+		if (m_icon_size.width() > 0 && m_icon_size.height() > 0)
+		{
+			games_per_row = width() / (m_icon_size.width() + m_icon_size.width() * m_game_grid->getMarginFactor() * 2);
+		}
+
+		const int scroll_position = m_game_grid->verticalScrollBar()->value();
+		PopulateGameGrid(games_per_row, m_icon_size, m_icon_color);
+		connect(m_game_grid, &QTableWidget::customContextMenuRequested, this, &game_list_frame::ShowContextMenu);
+		connect(m_game_grid, &QTableWidget::itemSelectionChanged, this, &game_list_frame::ItemSelectionChangedSlot);
+		connect(m_game_grid, &QTableWidget::itemDoubleClicked, this, &game_list_frame::doubleClickedSlot);
+		m_central_widget->addWidget(m_game_grid);
+		m_central_widget->setCurrentWidget(m_game_grid);
+		m_game_grid->verticalScrollBar()->setValue(scroll_position);
 	}
-	Refresh();
 }
 
 void game_list_frame::ToggleCategoryFilter(const QStringList& categories, bool show)
 {
-	QStringList& filters = m_is_list_layout ? m_category_filters : m_grid_category_filters;
-
 	if (show)
 	{
-		filters.append(categories);
+		m_category_filters.append(categories);
 	}
 	else
 	{
-		for (const QString& cat : categories)
+		for (const auto& cat : categories)
 		{
-			filters.removeAll(cat);
+			m_category_filters.removeAll(cat);
 		}
 	}
 
@@ -961,25 +846,22 @@ void game_list_frame::SaveSettings()
 {
 	for (int col = 0; col < m_columnActs.count(); ++col)
 	{
-		m_gui_settings->SetGamelistColVisibility(static_cast<gui::game_list_columns>(col), m_columnActs[col]->isChecked());
+		m_gui_settings->SetGamelistColVisibility(col, m_columnActs[col]->isChecked());
 	}
-	m_gui_settings->SetValue(gui::gl_sortCol, m_sort_column, false);
-	m_gui_settings->SetValue(gui::gl_sortAsc, m_col_sort_order == Qt::AscendingOrder, false);
-	m_gui_settings->SetValue(gui::gl_state, m_game_list->horizontalHeader()->saveState(), true);
+	m_gui_settings->SetValue(gui::gl_sortCol, m_sort_column);
+	m_gui_settings->SetValue(gui::gl_sortAsc, m_col_sort_order == Qt::AscendingOrder);
+	m_gui_settings->SetValue(gui::gl_state, m_game_list->horizontalHeader()->saveState());
 }
 
-void game_list_frame::doubleClickedSlot(QTableWidgetItem* item)
+void game_list_frame::doubleClickedSlot(QTableWidgetItem *item)
 {
 	if (!item)
 	{
 		return;
 	}
 
-	doubleClickedSlot(GetGameInfoByMode(item));
-}
+	const game_info game = GetGameInfoByMode(item);
 
-void game_list_frame::doubleClickedSlot(const game_info& game)
-{
 	if (!game)
 	{
 		return;
@@ -995,172 +877,55 @@ void game_list_frame::ItemSelectionChangedSlot()
 
 	if (m_is_list_layout)
 	{
-		if (const auto item = m_game_list->item(m_game_list->currentRow(), static_cast<int>(gui::game_list_columns::icon)); item && item->isSelected())
+		if (const auto item = m_game_list->item(m_game_list->currentRow(), gui::column_icon); item && item->isSelected())
 		{
 			game = GetGameInfoByMode(item);
 		}
 	}
+	else if (const auto item = m_game_grid->currentItem(); item && item->isSelected())
+	{
+		game = GetGameInfoByMode(item);
+	}
 
 	Q_EMIT NotifyGameSelection(game);
 }
 
-void game_list_frame::CreateShortcuts(const std::vector<game_info>& games, const std::set<gui::utils::shortcut_location>& locations)
-{
-	if (games.empty())
-	{
-		game_list_log.notice("Skip creating shortcuts. No games selected.");
-		return;
-	}
-
-	if (locations.empty())
-	{
-		game_list_log.error("Failed to create shortcuts. No locations selected.");
-		return;
-	}
-
-	bool success = true;
-
-	for (const game_info& gameinfo : games)
-	{
-		std::string gameid_token_value;
-
-		const std::string dev_flash = g_cfg_vfs.get_dev_flash();
-
-		if (gameinfo->info.category == "DG" && !fs::is_file(rpcs3::utils::get_hdd0_dir() + "/game/" + gameinfo->info.serial + "/USRDIR/EBOOT.BIN"))
-		{
-			const usz ps3_game_dir_pos = fs::get_parent_dir(gameinfo->info.path).size();
-			std::string relative_boot_dir = gameinfo->info.path.substr(ps3_game_dir_pos);
-
-			if (usz char_pos = relative_boot_dir.find_first_not_of(fs::delim); char_pos != umax)
-			{
-				relative_boot_dir = relative_boot_dir.substr(char_pos);
-			}
-			else
-			{
-				relative_boot_dir.clear();
-			}
-
-			if (!relative_boot_dir.empty())
-			{
-				if (relative_boot_dir != "PS3_GAME")
-				{
-					gameid_token_value = gameinfo->info.serial + "/" + relative_boot_dir;
-				}
-				else
-				{
-					gameid_token_value = gameinfo->info.serial;
-				}
-			}
-		}
-		else
-		{
-			gameid_token_value = gameinfo->info.serial;
-		}
-
-#ifdef __linux__
-		const std::string target_cli_args = gameinfo->info.path.starts_with(dev_flash) ? fmt::format("--no-gui \"%%%%RPCS3_VFS%%%%:dev_flash/%s\"", gameinfo->info.path.substr(dev_flash.size()))
-		                                                                               : fmt::format("--no-gui \"%%%%RPCS3_GAMEID%%%%:%s\"", gameid_token_value);
-#else
-		const std::string target_cli_args = gameinfo->info.path.starts_with(dev_flash) ? fmt::format("--no-gui \"%%RPCS3_VFS%%:dev_flash/%s\"", gameinfo->info.path.substr(dev_flash.size()))
-		                                                                               : fmt::format("--no-gui \"%%RPCS3_GAMEID%%:%s\"", gameid_token_value);
-#endif
-		const std::string target_icon_dir = fmt::format("%sIcons/game_icons/%s/", fs::get_config_dir(), gameinfo->info.serial);
-
-		if (!fs::create_path(target_icon_dir))
-		{
-			game_list_log.error("Failed to create shortcut path %s (%s)", QString::fromStdString(gameinfo->info.name).simplified(), target_icon_dir, fs::g_tls_error);
-			success = false;
-			continue;
-		}
-
-		for (const gui::utils::shortcut_location& location : locations)
-		{
-			std::string destination;
-
-			switch (location)
-			{
-			case gui::utils::shortcut_location::desktop:
-				destination = "desktop";
-				break;
-			case gui::utils::shortcut_location::applications:
-				destination = "application menu";
-				break;
-#ifdef _WIN32
-			case gui::utils::shortcut_location::rpcs3_shortcuts:
-				destination = "/games/shortcuts/";
-				break;
-#endif
-			}
-
-			if (!gameid_token_value.empty() && gui::utils::create_shortcut(gameinfo->info.name, gameinfo->info.serial, target_cli_args, gameinfo->info.name, gameinfo->info.icon_path, target_icon_dir, location))
-			{
-				game_list_log.success("Created %s shortcut for %s", destination, QString::fromStdString(gameinfo->info.name).simplified());
-			}
-			else
-			{
-				game_list_log.error("Failed to create %s shortcut for %s", destination, QString::fromStdString(gameinfo->info.name).simplified());
-				success = false;
-			}
-		}
-	}
-
-#ifdef _WIN32
-	if (locations.size() == 1 && locations.contains(gui::utils::shortcut_location::rpcs3_shortcuts))
-	{
-		return;
-	}
-#endif
-
-	if (success)
-	{
-		QMessageBox::information(this, tr("Success!"), tr("Successfully created shortcut(s)."));
-	}
-	else
-	{
-		QMessageBox::warning(this, tr("Warning!"), tr("Failed to create one or more shortcuts!"));
-	}
-}
-
 void game_list_frame::ShowContextMenu(const QPoint &pos)
 {
 	QPoint global_pos;
-	game_info gameinfo;
+	QTableWidgetItem* item;
 
 	if (m_is_list_layout)
 	{
-		QTableWidgetItem* item = m_game_list->item(m_game_list->indexAt(pos).row(), static_cast<int>(gui::game_list_columns::icon));
+		item = m_game_list->item(m_game_list->indexAt(pos).row(), gui::column_icon);
 		global_pos = m_game_list->viewport()->mapToGlobal(pos);
-		gameinfo = GetGameInfoFromItem(item);
 	}
-	else if (game_list_grid_item* item = static_cast<game_list_grid_item*>(m_game_grid->selected_item()))
+	else
 	{
-		gameinfo = item->game();
-		global_pos = m_game_grid->mapToGlobal(pos);
+		const QModelIndex mi = m_game_grid->indexAt(pos);
+		item = m_game_grid->item(mi.row(), mi.column());
+		global_pos = m_game_grid->viewport()->mapToGlobal(pos);
 	}
 
+	game_info gameinfo = GetGameInfoFromItem(item);
 	if (!gameinfo)
 	{
 		return;
 	}
 
 	GameInfo current_game = gameinfo->info;
-	const QString serial = QString::fromStdString(current_game.serial);
-	const QString name = QString::fromStdString(current_game.name).simplified();
+	const QString serial = qstr(current_game.serial);
+	const QString name = qstr(current_game.name).simplified();
 
 	const std::string cache_base_dir = GetCacheDirBySerial(current_game.serial);
-	const std::string config_data_base_dir = GetDataDirBySerial(current_game.serial);
+	const std::string data_base_dir  = GetDataDirBySerial(current_game.serial);
 
 	// Make Actions
 	QMenu menu;
 
-	static const auto is_game_running = [](const std::string& serial)
-	{
-		return !Emu.IsStopped(true) && (serial == Emu.GetTitleID() || (serial == "vsh.self" && Emu.IsVsh()));
-	};
+	const bool is_current_running_game = (Emu.IsRunning() || Emu.IsPaused()) && current_game.serial == Emu.GetTitleID();
 
-	const bool is_current_running_game = is_game_running(current_game.serial);
-
-	QAction* boot = new QAction(gameinfo->has_custom_config
+	QAction* boot = new QAction(gameinfo->hasCustomConfig
 		? (is_current_running_game
 			? tr("&Reboot with global configuration")
 			: tr("&Boot with global configuration"))
@@ -1171,7 +936,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 	QFont font = boot->font();
 	font.setBold(true);
 
-	if (gameinfo->has_custom_config)
+	if (gameinfo->hasCustomConfig)
 	{
 		QAction* boot_custom = menu.addAction(is_current_running_game
 			? tr("&Reboot with custom configuration")
@@ -1189,70 +954,25 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 	}
 
 	menu.addAction(boot);
-
-	{
-		QAction* boot_default = menu.addAction(is_current_running_game
-			? tr("&Reboot with default configuration")
-			: tr("&Boot with default configuration"));
-
-		connect(boot_default, &QAction::triggered, [this, gameinfo]
-		{
-			sys_log.notice("Booting from gamelist per context menu...");
-			Q_EMIT RequestBoot(gameinfo, cfg_mode::default_config);
-		});
-
-		QAction* boot_manual = menu.addAction(is_current_running_game
-			? tr("&Reboot with manually selected configuration")
-			: tr("&Boot with manually selected configuration"));
-
-		connect(boot_manual, &QAction::triggered, [this, gameinfo]
-		{
-			if (const std::string file_path = QFileDialog::getOpenFileName(this, "Select Config File", "", tr("Config Files (*.yml);;All files (*.*)")).toStdString(); !file_path.empty())
-			{
-				sys_log.notice("Booting from gamelist per context menu...");
-				Q_EMIT RequestBoot(gameinfo, cfg_mode::custom_selection, file_path);
-			}
-			else
-			{
-				sys_log.notice("Manual config selection aborted.");
-			}
-		});
-	}
-
-	extern bool is_savestate_compatible(const std::string& filepath);
-
-	if (const std::string sstate = get_savestate_file(current_game.serial, current_game.path, 0, 0); is_savestate_compatible(sstate))
-	{
-		QAction* boot_state = menu.addAction(is_current_running_game
-			? tr("&Reboot with savestate")
-			: tr("&Boot with savestate"));
-		connect(boot_state, &QAction::triggered, [this, gameinfo, sstate]
-		{
-			sys_log.notice("Booting savestate from gamelist per context menu...");
-			Q_EMIT RequestBoot(gameinfo, cfg_mode::custom, "", sstate);
-		});
-	}
-
 	menu.addSeparator();
 
-	QAction* configure = menu.addAction(gameinfo->has_custom_config
+	QAction* configure = menu.addAction(gameinfo->hasCustomConfig
 		? tr("&Change Custom Configuration")
-		: tr("&Create Custom Configuration From Global Settings"));
-	QAction* create_game_default_config = gameinfo->has_custom_config ? nullptr
-		: menu.addAction(tr("&Create Custom Configuration From Default Settings"));
-	QAction* pad_configure = menu.addAction(gameinfo->has_custom_pad_config
+		: tr("&Create Custom Configuration"));
+	QAction* pad_configure = menu.addAction(gameinfo->hasCustomPadConfig
 		? tr("&Change Custom Gamepad Configuration")
 		: tr("&Create Custom Gamepad Configuration"));
 	QAction* configure_patches = menu.addAction(tr("&Manage Game Patches"));
-
+	QAction* create_ppu_cache = menu.addAction(tr("&Create PPU Cache"));
+	menu.addSeparator();
+	QAction* rename_title = menu.addAction(tr("&Rename In Game List"));
+	QAction* hide_serial = menu.addAction(tr("&Hide From Game List"));
+	hide_serial->setCheckable(true);
+	hide_serial->setChecked(m_hidden_list.contains(serial));
 	menu.addSeparator();
-
-	QAction* create_cpu_cache = menu.addAction(tr("&Create LLVM Cache"));
-
-	// Remove menu
 	QMenu* remove_menu = menu.addMenu(tr("&Remove"));
-
-	if (gameinfo->has_custom_config)
+	QAction* remove_game = remove_menu->addAction(tr("&Remove %1").arg(gameinfo->localized_category));
+	if (gameinfo->hasCustomConfig)
 	{
 		QAction* remove_custom_config = remove_menu->addAction(tr("&Remove Custom Configuration"));
 		connect(remove_custom_config, &QAction::triggered, [this, current_game, gameinfo]()
@@ -1263,7 +983,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 			}
 		});
 	}
-	if (gameinfo->has_custom_pad_config)
+	if (gameinfo->hasCustomPadConfig)
 	{
 		QAction* remove_custom_pad_config = remove_menu->addAction(tr("&Remove Custom Gamepad Configuration"));
 		connect(remove_custom_pad_config, &QAction::triggered, [this, current_game, gameinfo]()
@@ -1274,128 +994,67 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 			}
 		});
 	}
-
-	const bool has_cache_dir = fs::is_dir(cache_base_dir);
-
-	if (has_cache_dir)
+	if (fs::is_dir(cache_base_dir))
 	{
 		remove_menu->addSeparator();
-
 		QAction* remove_shaders_cache = remove_menu->addAction(tr("&Remove Shaders Cache"));
-		remove_shaders_cache->setEnabled(!is_current_running_game);
 		connect(remove_shaders_cache, &QAction::triggered, [this, cache_base_dir]()
 		{
 			RemoveShadersCache(cache_base_dir, true);
 		});
 		QAction* remove_ppu_cache = remove_menu->addAction(tr("&Remove PPU Cache"));
-		remove_ppu_cache->setEnabled(!is_current_running_game);
 		connect(remove_ppu_cache, &QAction::triggered, [this, cache_base_dir]()
 		{
 			RemovePPUCache(cache_base_dir, true);
 		});
 		QAction* remove_spu_cache = remove_menu->addAction(tr("&Remove SPU Cache"));
-		remove_spu_cache->setEnabled(!is_current_running_game);
 		connect(remove_spu_cache, &QAction::triggered, [this, cache_base_dir]()
 		{
 			RemoveSPUCache(cache_base_dir, true);
 		});
-	}
-
-	const std::string hdd1_cache_base_dir = rpcs3::utils::get_hdd1_dir() + "caches/";
-	const bool has_hdd1_cache_dir = !GetDirListBySerial(hdd1_cache_base_dir, current_game.serial).empty();
-	
-	if (has_hdd1_cache_dir)
-	{
-		QAction* remove_hdd1_cache = remove_menu->addAction(tr("&Remove HDD1 Cache"));
-		remove_hdd1_cache->setEnabled(!is_current_running_game);
-		connect(remove_hdd1_cache, &QAction::triggered, [this, hdd1_cache_base_dir, serial = current_game.serial]()
-		{
-			RemoveHDD1Cache(hdd1_cache_base_dir, serial, true);
-		});
-	}
-
-	if (has_cache_dir || has_hdd1_cache_dir)
-	{
 		QAction* remove_all_caches = remove_menu->addAction(tr("&Remove All Caches"));
-		remove_all_caches->setEnabled(!is_current_running_game);
-		connect(remove_all_caches, &QAction::triggered, [this, current_game, cache_base_dir, hdd1_cache_base_dir]()
+		connect(remove_all_caches, &QAction::triggered, [this, cache_base_dir]()
 		{
-			if (is_game_running(current_game.serial))
-				return;
-
 			if (QMessageBox::question(this, tr("Confirm Removal"), tr("Remove all caches?")) != QMessageBox::Yes)
 				return;
 
-			RemoveContentPath(cache_base_dir, "cache");
-			RemoveHDD1Cache(hdd1_cache_base_dir, current_game.serial);
+			RemoveShadersCache(cache_base_dir);
+			RemovePPUCache(cache_base_dir);
+			RemoveSPUCache(cache_base_dir);
 		});
 	}
-
-	const std::string savestate_dir = fs::get_config_dir() + "savestates/" + current_game.serial;
-
-	if (fs::is_dir(savestate_dir))
-	{
-		remove_menu->addSeparator();
-
-		QAction* remove_savestate = remove_menu->addAction(tr("&Remove Savestates"));
-		remove_savestate->setEnabled(!is_current_running_game);
-		connect(remove_savestate, &QAction::triggered, [this, current_game, savestate_dir]()
-		{
-			if (is_game_running(current_game.serial))
-				return;
-
-			if (QMessageBox::question(this, tr("Confirm Removal"), tr("Remove savestates?")) != QMessageBox::Yes)
-				return;
-
-			RemoveContentPath(savestate_dir, "savestate");
-		});
-	}
-
-	// Disable the Remove menu if empty
-	remove_menu->setEnabled(!remove_menu->isEmpty());
-
 	menu.addSeparator();
-
-	// Manage Game menu
-	QMenu* manage_game_menu = menu.addMenu(tr("&Manage Game"));
-
-	// Create game shortcuts
-	QAction* create_desktop_shortcut = manage_game_menu->addAction(tr("&Create Desktop Shortcut"));
-	connect(create_desktop_shortcut, &QAction::triggered, this, [this, gameinfo]()
+	QAction* open_game_folder = menu.addAction(tr("&Open Install Folder"));
+	if (gameinfo->hasCustomConfig)
 	{
-		CreateShortcuts({gameinfo}, {gui::utils::shortcut_location::desktop});
-	});
-#ifdef _WIN32
-	QAction* create_start_menu_shortcut = manage_game_menu->addAction(tr("&Create Start Menu Shortcut"));
-#elif defined(__APPLE__)
-	QAction* create_start_menu_shortcut = manage_game_menu->addAction(tr("&Create Launchpad Shortcut"));
-#else
-	QAction* create_start_menu_shortcut = manage_game_menu->addAction(tr("&Create Application Menu Shortcut"));
-#endif
-	connect(create_start_menu_shortcut, &QAction::triggered, this, [this, gameinfo]()
+		QAction* open_config_dir = menu.addAction(tr("&Open Custom Config Folder"));
+		connect(open_config_dir, &QAction::triggered, [current_game]()
+		{
+			const std::string new_config_path = rpcs3::utils::get_custom_config_path(current_game.serial);
+
+			if (fs::is_file(new_config_path))
+				gui::utils::open_dir(new_config_path);
+
+			const std::string old_config_path = rpcs3::utils::get_custom_config_path(current_game.serial, true);
+
+			if (fs::is_file(old_config_path))
+				gui::utils::open_dir(old_config_path);
+		});
+	}
+	if (fs::is_dir(data_base_dir))
 	{
-		CreateShortcuts({gameinfo}, {gui::utils::shortcut_location::applications});
-	});
+		QAction* open_data_dir = menu.addAction(tr("&Open Data Folder"));
+		connect(open_data_dir, &QAction::triggered, [data_base_dir]()
+		{
+			gui::utils::open_dir(data_base_dir);
+		});
+	}
+	menu.addSeparator();
+	QAction* check_compat = menu.addAction(tr("&Check Game Compatibility"));
+	QAction* download_compat = menu.addAction(tr("&Download Compatibility Database"));
+	menu.addSeparator();
+	QAction* edit_notes = menu.addAction(tr("&Edit Tooltip Notes"));
 
-	manage_game_menu->addSeparator();
-
-	// Hide/rename game in game list
-	QAction* hide_serial = manage_game_menu->addAction(tr("&Hide From Game List"));
-	hide_serial->setCheckable(true);
-	hide_serial->setChecked(m_hidden_list.contains(serial));
-	QAction* rename_title = manage_game_menu->addAction(tr("&Rename In Game List"));
-
-	// Edit tooltip notes/reset time played
-	QAction* edit_notes = manage_game_menu->addAction(tr("&Edit Tooltip Notes"));
-	QAction* reset_time_played = manage_game_menu->addAction(tr("&Reset Time Played"));
-
-	manage_game_menu->addSeparator();
-
-	// Remove game
-	QAction* remove_game = manage_game_menu->addAction(tr("&Remove %1").arg(gameinfo->localized_category));
-	remove_game->setEnabled(!is_current_running_game);
-
-	// Custom Images menu
 	QMenu* icon_menu = menu.addMenu(tr("&Custom Images"));
 	const std::array<QAction*, 3> custom_icon_actions =
 	{
@@ -1433,7 +1092,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 			hover_gif,
 			shader_load
 		};
-
+		
 		const auto handle_icon = [this, serial](const QString& game_icon_path, const QString& suffix, icon_action action, icon_type type)
 		{
 			QString icon_path;
@@ -1478,12 +1137,12 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 				{
 					if (QFile file(game_icon_path); file.exists() && !file.remove())
 					{
-						game_list_log.error("Could not remove old file: '%s'", game_icon_path, file.errorString());
+						game_list_log.error("Could not remove old file: '%s'", sstr(game_icon_path), sstr(file.errorString()));
 						QMessageBox::warning(this, tr("Warning!"), tr("Failed to remove the old file!"));
 						return;
 					}
 
-					game_list_log.success("Removed file: '%s'", game_icon_path);
+					game_list_log.success("Removed file: '%s'", sstr(game_icon_path));
 					if (action == icon_action::remove)
 					{
 						refresh = true;
@@ -1494,12 +1153,12 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 				{
 					if (!QFile::copy(icon_path, game_icon_path))
 					{
-						game_list_log.error("Could not import file '%s' to '%s'.", icon_path, game_icon_path);
+						game_list_log.error("Could not import file '%s' to '%s'.", sstr(icon_path), sstr(game_icon_path));
 						QMessageBox::warning(this, tr("Warning!"), tr("Failed to import the new file!"));
 					}
 					else
 					{
-						game_list_log.success("Imported file '%s' to '%s'", icon_path, game_icon_path);
+						game_list_log.success("Imported file '%s' to '%s'", sstr(icon_path), sstr(game_icon_path));
 						refresh = true;
 					}
 				}
@@ -1520,7 +1179,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 
 		for (const auto& [type, icon_name, suffix, actions] : icon_map)
 		{
-			const QString icon_path = QString::fromStdString(custom_icon_dir_path) + icon_name;
+			const QString icon_path = qstr(custom_icon_dir_path) + icon_name;
 
 			if (QFile::exists(icon_path))
 			{
@@ -1542,159 +1201,37 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 		icon_menu->setEnabled(false);
 	}
 
-	menu.addSeparator();
-
-	// Open Folder menu
-	QMenu* open_folder_menu = menu.addMenu(tr("&Open Folder"));
-
-	const bool is_disc_game = QString::fromStdString(current_game.category) == cat::cat_disc_game;
-	const std::string captures_dir = fs::get_config_dir() + "/captures/";
-	const std::string recordings_dir = fs::get_config_dir() + "/recordings/" + current_game.serial;
-	const std::string screenshots_dir = fs::get_config_dir() + "/screenshots/" + current_game.serial;
-	std::vector<std::string> data_dir_list;
-
-	if (is_disc_game)
-	{
-		QAction* open_disc_game_folder = open_folder_menu->addAction(tr("&Open Disc Game Folder"));
-		connect(open_disc_game_folder, &QAction::triggered, [current_game]()
-		{
-			gui::utils::open_dir(current_game.path);
-		});
-
-		data_dir_list = GetDirListBySerial(rpcs3::utils::get_hdd0_dir() + "game/", current_game.serial); // It could be absent for a disc game
-	}
-	else
-	{
-		data_dir_list.push_back(current_game.path);
-	}
-
-	if (!data_dir_list.empty()) // "true" if data path is present (it could be absent for a disc game)
-	{
-		QAction* open_data_folder = open_folder_menu->addAction(tr("&Open %0 Folder").arg(is_disc_game ? tr("Game Data") : gameinfo->localized_category));
-		connect(open_data_folder, &QAction::triggered, [data_dir_list]()
-		{
-			for (const std::string& data_dir : data_dir_list)
-			{
-				gui::utils::open_dir(data_dir);
-			}
-		});
-	}
-
-	if (gameinfo->has_custom_config)
-	{
-		QAction* open_config_dir = open_folder_menu->addAction(tr("&Open Custom Config Folder"));
-		connect(open_config_dir, &QAction::triggered, [current_game]()
-		{
-			const std::string config_path = rpcs3::utils::get_custom_config_path(current_game.serial);
-
-			if (fs::is_file(config_path))
-				gui::utils::open_dir(config_path);
-		});
-	}
-
-	// This is a debug feature, let's hide it by reusing debug tab protection
-	if (m_gui_settings->GetValue(gui::m_showDebugTab).toBool() && has_cache_dir)
-	{
-		QAction* open_cache_folder = open_folder_menu->addAction(tr("&Open Cache Folder"));
-		connect(open_cache_folder, &QAction::triggered, [cache_base_dir]()
-		{
-			gui::utils::open_dir(cache_base_dir);
-		});
-	}
-
-	if (fs::is_dir(config_data_base_dir))
-	{
-		QAction* open_config_data_dir = open_folder_menu->addAction(tr("&Open Config Data Folder"));
-		connect(open_config_data_dir, &QAction::triggered, [config_data_base_dir]()
-		{
-			gui::utils::open_dir(config_data_base_dir);
-		});
-	}
-
-	if (fs::is_dir(savestate_dir))
-	{
-		QAction* open_savestate_dir = open_folder_menu->addAction(tr("&Open Savestate Folder"));
-		connect(open_savestate_dir, &QAction::triggered, [savestate_dir]()
-		{
-			gui::utils::open_dir(savestate_dir);
-		});
-	}
-
-	QAction* open_captures_dir = open_folder_menu->addAction(tr("&Open Captures Folder"));
-	connect(open_captures_dir, &QAction::triggered, [captures_dir]()
-	{
-		gui::utils::open_dir(captures_dir);
-	});
-
-	if (fs::is_dir(recordings_dir))
-	{
-		QAction* open_recordings_dir = open_folder_menu->addAction(tr("&Open Recordings Folder"));
-		connect(open_recordings_dir, &QAction::triggered, [recordings_dir]()
-		{
-			gui::utils::open_dir(recordings_dir);
-		});
-	}
-
-	if (fs::is_dir(screenshots_dir))
-	{
-		QAction* open_screenshots_dir = open_folder_menu->addAction(tr("&Open Screenshots Folder"));
-		connect(open_screenshots_dir, &QAction::triggered, [screenshots_dir]()
-		{
-			gui::utils::open_dir(screenshots_dir);
-		});
-	}
-
-	// Copy Info menu
 	QMenu* info_menu = menu.addMenu(tr("&Copy Info"));
 	QAction* copy_info = info_menu->addAction(tr("&Copy Name + Serial"));
 	QAction* copy_name = info_menu->addAction(tr("&Copy Name"));
 	QAction* copy_serial = info_menu->addAction(tr("&Copy Serial"));
 
-	menu.addSeparator();
-
-	QAction* check_compat = menu.addAction(tr("&Check Game Compatibility"));
-	QAction* download_compat = menu.addAction(tr("&Download Compatibility Database"));
-
 	connect(boot, &QAction::triggered, this, [this, gameinfo]()
 	{
 		sys_log.notice("Booting from gamelist per context menu...");
-		Q_EMIT RequestBoot(gameinfo, cfg_mode::global);
+		Q_EMIT RequestBoot(gameinfo, gameinfo->hasCustomConfig);
 	});
-
-	auto configure_l = [this, current_game, gameinfo](bool create_cfg_from_global_cfg)
+	connect(configure, &QAction::triggered, this, [this, current_game, gameinfo]()
 	{
-		settings_dialog dlg(m_gui_settings, m_emu_settings, 0, this, &current_game, create_cfg_from_global_cfg);
-
+		settings_dialog dlg(m_gui_settings, m_emu_settings, 0, this, &current_game);
 		connect(&dlg, &settings_dialog::EmuSettingsApplied, [this, gameinfo]()
 		{
-			if (!gameinfo->has_custom_config)
+			if (!gameinfo->hasCustomConfig)
 			{
-				gameinfo->has_custom_config = true;
+				gameinfo->hasCustomConfig = true;
 				ShowCustomConfigIcon(gameinfo);
 			}
 			Q_EMIT NotifyEmuSettingsChange();
 		});
-
 		dlg.exec();
-	};
-
-	if (create_game_default_config)
-	{
-		connect(configure, &QAction::triggered, this, [configure_l]() { configure_l(true); });
-		connect(create_game_default_config, &QAction::triggered, this, [configure_l = std::move(configure_l)]() { configure_l(false); });
-	}
-	else
-	{
-		connect(configure, &QAction::triggered, this, [configure_l = std::move(configure_l)]() { configure_l(true); });
-	}
-
+	});
 	connect(pad_configure, &QAction::triggered, this, [this, current_game, gameinfo]()
 	{
 		pad_settings_dialog dlg(m_gui_settings, this, &current_game);
 
-		if (dlg.exec() == QDialog::Accepted && !gameinfo->has_custom_pad_config)
+		if (dlg.exec() == QDialog::Accepted && !gameinfo->hasCustomPadConfig)
 		{
-			gameinfo->has_custom_pad_config = true;
+			gameinfo->hasCustomPadConfig = true;
 			ShowCustomConfigIcon(gameinfo);
 		}
 	});
@@ -1708,201 +1245,67 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 		m_gui_settings->SetValue(gui::gl_hidden_list, QStringList(m_hidden_list.values()));
 		Refresh();
 	});
-	connect(create_cpu_cache, &QAction::triggered, this, [gameinfo, this]
+	connect(create_ppu_cache, &QAction::triggered, this, [gameinfo, this]
 	{
 		if (m_gui_settings->GetBootConfirmation(this))
 		{
-			CreateCPUCaches(gameinfo);
+			CreatePPUCache(gameinfo);
 		}
 	});
-	connect(remove_game, &QAction::triggered, this, [this, current_game, gameinfo, cache_base_dir, hdd1_cache_base_dir, name]
+	connect(remove_game, &QAction::triggered, this, [this, current_game, gameinfo, cache_base_dir, name]
 	{
-		if (is_game_running(current_game.serial))
+		if (current_game.path.empty())
 		{
-			QMessageBox::critical(this, tr("Cannot Remove Game"), tr("The PS3 application is still running, it cannot be removed!"));
+			game_list_log.fatal("Cannot remove game. Path is empty");
 			return;
 		}
 
-		const bool is_disc_game = QString::fromStdString(current_game.category) == cat::cat_disc_game;
-		const bool is_in_games_dir = is_disc_game && Emu.IsPathInsideDir(current_game.path, rpcs3::utils::get_games_dir());
-		std::vector<std::string> data_dir_list;
-
-		if (is_disc_game)
+		QMessageBox* mb = new QMessageBox(QMessageBox::Question, tr("Confirm %1 Removal").arg(gameinfo->localized_category), tr("Permanently remove %0 from drive?\nPath: %1").arg(name).arg(qstr(current_game.path)), QMessageBox::Yes | QMessageBox::No, this);
+		mb->setCheckBox(new QCheckBox(tr("Remove caches and custom configs")));
+		mb->deleteLater();
+		if (mb->exec() == QMessageBox::Yes)
 		{
-			data_dir_list = GetDirListBySerial(rpcs3::utils::get_hdd0_dir() + "game/", current_game.serial);
-		}
-		else
-		{
-			data_dir_list.push_back(current_game.path);
-		}
-
-		const bool has_data_dir = !data_dir_list.empty(); // "true" if data path is present (it could be absent for a disc game)
-		QString text = tr("%0 - %1\n").arg(QString::fromStdString(current_game.serial)).arg(name);
-
-		if (is_disc_game)
-		{
-			text += tr("\nDisc Game Info:\nPath: %0\n").arg(QString::fromStdString(current_game.path));
-
-			if (current_game.size_on_disk != umax) // If size was properly detected
+			const bool remove_caches = mb->checkBox()->isChecked();
+			if (fs::remove_all(current_game.path))
 			{
-				text += tr("Size: %0\n").arg(gui::utils::format_byte_size(current_game.size_on_disk));
-			}
-		}
-
-		if (has_data_dir)
-		{
-			u64 total_data_size = 0;
-
-			text += tr("\n%0 Info:\n").arg(is_disc_game ? tr("Game Data") : gameinfo->localized_category);
-
-			for (const std::string& data_dir : data_dir_list)
-			{
-				text += tr("Path: %0\n").arg(QString::fromStdString(data_dir));
-
-				if (const u64 data_size = fs::get_dir_size(data_dir, 1); data_size != umax) // If size was properly detected
+				if (remove_caches)
 				{
-					total_data_size += data_size;
-					text += tr("Size: %0\n").arg(gui::utils::format_byte_size(data_size));
+					RemoveShadersCache(cache_base_dir);
+					RemovePPUCache(cache_base_dir);
+					RemoveSPUCache(cache_base_dir);
+					RemoveCustomConfiguration(current_game.serial);
+					RemoveCustomPadConfiguration(current_game.serial);
 				}
-			}
-
-			if (data_dir_list.size() > 1)
-			{
-				text += tr("Total size: %0\n").arg(gui::utils::format_byte_size(total_data_size));
-			}
-		}
-
-		if (fs::device_stat stat{}; fs::statfs(rpcs3::utils::get_hdd0_dir(), stat)) // Retrieve disk space info on data path's drive
-		{
-			text += tr("\nCurrent free disk space: %0\n").arg(gui::utils::format_byte_size(stat.avail_free));
-		}
-		
-		if (has_data_dir)
-		{
-			text += tr("\nPermanently remove %0 and selected (optional) contents from drive?\n").arg(is_disc_game ? tr("Game Data") : gameinfo->localized_category);
-		}
-		else
-		{
-			text += tr("\nPermanently remove selected (optional) contents from drive?\n");
-		}
-
-		QMessageBox mb(QMessageBox::Question, tr("Confirm %0 Removal").arg(gameinfo->localized_category), text, QMessageBox::Yes | QMessageBox::No, this);
-		QCheckBox* disc = new QCheckBox(tr("Remove title from game list (Disc Game path is not removed!)"));
-		QCheckBox* caches = new QCheckBox(tr("Remove caches and custom configs"));
-		QCheckBox* icons = new QCheckBox(tr("Remove icons and shortcuts"));
-		QCheckBox* savestate = new QCheckBox(tr("Remove savestates"));
-		QCheckBox* captures = new QCheckBox(tr("Remove captures"));
-		QCheckBox* recordings = new QCheckBox(tr("Remove recordings"));
-		QCheckBox* screenshots = new QCheckBox(tr("Remove screenshots"));
-
-		if (is_disc_game)
-		{
-			if (is_in_games_dir)
-			{
-				disc->setToolTip(tr("Title located under auto-detection \"games\" folder cannot be removed"));
-				disc->setDisabled(true);
+				m_game_data.erase(std::remove(m_game_data.begin(), m_game_data.end(), gameinfo), m_game_data.end());
+				game_list_log.success("Removed %s %s in %s", sstr(gameinfo->localized_category), current_game.name, current_game.path);
+				Refresh(true);
 			}
 			else
 			{
-				disc->setChecked(true);
-			}
-		}
-		else
-		{
-			disc->setVisible(false);
-		}
-
-		caches->setChecked(true);
-		icons->setChecked(true);
-		mb.setCheckBox(disc);
-
-		QGridLayout* grid = qobject_cast<QGridLayout*>(mb.layout());
-		int row, column, rowSpan, columnSpan;
-
-		grid->getItemPosition(grid->indexOf(disc), &row, &column, &rowSpan, &columnSpan);
-		grid->addWidget(caches, row + 3, column, rowSpan, columnSpan);
-		grid->addWidget(icons, row + 4, column, rowSpan, columnSpan);
-		grid->addWidget(savestate, row + 5, column, rowSpan, columnSpan);
-		grid->addWidget(captures, row + 6, column, rowSpan, columnSpan);
-		grid->addWidget(recordings, row + 7, column, rowSpan, columnSpan);
-		grid->addWidget(screenshots, row + 8, column, rowSpan, columnSpan);
-
-		if (mb.exec() == QMessageBox::Yes)
-		{
-			const bool remove_caches = caches->isChecked();
-
-			// Remove data path in "dev_hdd0/game" folder (if any)
-			if (has_data_dir && RemoveContentPathList(data_dir_list, gameinfo->localized_category.toStdString()) != data_dir_list.size())
-			{
+				game_list_log.error("Failed to remove %s %s in %s (%s)", sstr(gameinfo->localized_category), current_game.name, current_game.path, fs::g_tls_error);
 				QMessageBox::critical(this, tr("Failure!"), remove_caches
-					? tr("Failed to remove %0 from drive!\nPath: %1\nCaches and custom configs have been left intact.").arg(name).arg(QString::fromStdString(data_dir_list[0]))
-					: tr("Failed to remove %0 from drive!\nPath: %1").arg(name).arg(QString::fromStdString(data_dir_list[0])));
-
-				return;
+					? tr("Failed to remove %0 from drive!\nPath: %1\nCaches and custom configs have been left intact.").arg(name).arg(qstr(current_game.path))
+					: tr("Failed to remove %0 from drive!\nPath: %1").arg(name).arg(qstr(current_game.path)));
 			}
-
-			// Remove lock file in "dev_hdd0/game/＄locks" folder (if any)
-			RemoveContentBySerial(rpcs3::utils::get_hdd0_dir() + "game/＄locks/", current_game.serial, "lock");
-
-			// Remove caches in "cache" and "dev_hdd1/caches" folders (if any) and custom configs in "config/custom_config" folder (if any)
-			if (remove_caches)
-			{
-				RemoveContentPath(cache_base_dir, "cache");
-				RemoveHDD1Cache(hdd1_cache_base_dir, current_game.serial);
-
-				RemoveCustomConfiguration(current_game.serial);
-				RemoveCustomPadConfiguration(current_game.serial);
-			}
-
-			// Remove icons in "Icons/game_icons" folder, shortcuts in "games/shortcuts" folder and from desktop/start menu
-			if (icons->isChecked())
-			{
-				RemoveContentBySerial(fs::get_config_dir() + "Icons/game_icons/", current_game.serial, "icons");
-				RemoveContentBySerial(fs::get_config_dir() + "games/shortcuts/", name.toStdString() + ".lnk", "link");
-				// TODO: Remove shortcuts from desktop/start menu
-			}
-
-			if (savestate->isChecked())
-			{
-				RemoveContentBySerial(fs::get_config_dir() + "savestates/", current_game.serial, "savestate");
-			}
-
-			if (captures->isChecked())
-			{
-				RemoveContentBySerial(fs::get_config_dir() + "captures/", current_game.serial, "captures");
-			}
-
-			if (recordings->isChecked())
-			{
-				RemoveContentBySerial(fs::get_config_dir() + "recordings/", current_game.serial, "recordings");
-			}
-
-			if (screenshots->isChecked())
-			{
-				RemoveContentBySerial(fs::get_config_dir() + "screenshots/", current_game.serial, "screenshots");
-			}
-
-			m_game_data.erase(std::remove(m_game_data.begin(), m_game_data.end(), gameinfo), m_game_data.end());
-			game_list_log.success("Removed %s - %s", gameinfo->localized_category, current_game.name);
-
-			std::vector<std::string> serials_to_remove_from_yml{};
-
-			// Prepare list of serials (title id) to remove in "games.yml" file (if any)
-			if (is_disc_game && disc->isChecked())
-			{
-				serials_to_remove_from_yml.push_back(current_game.serial);
-			}
-
-			// Finally, refresh the game list.
-			// Hidden list in "GuiConfigs/CurrentSettings.ini" file is also properly updated (title removed) if needed
-			Refresh(true, serials_to_remove_from_yml);
 		}
 	});
 	connect(configure_patches, &QAction::triggered, this, [this, gameinfo]()
 	{
-		patch_manager_dialog patch_manager(m_gui_settings, m_game_data, gameinfo->info.serial, gameinfo->GetGameVersion(), this);
+		std::unordered_map<std::string, std::set<std::string>> games;
+		for (const auto& game : m_game_data)
+		{
+			if (game)
+			{
+				games[game->info.serial].insert(game_list_frame::GetGameVersion(game));
+			}
+		}
+		patch_manager_dialog patch_manager(m_gui_settings, games, gameinfo->info.serial, GetGameVersion(gameinfo), this);
 		patch_manager.exec();
 	});
+	connect(open_game_folder, &QAction::triggered, this, [current_game]()
+	{
+		gui::utils::open_dir(current_game.path);
+	});
 	connect(check_compat, &QAction::triggered, this, [serial]
 	{
 		const QString link = "https://rpcs3.net/compatibility?g=" + serial;
@@ -1926,12 +1329,12 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 
 			if (new_title.isEmpty() || new_title == name)
 			{
-				m_titles.erase(serial);
+				m_titles.remove(serial);
 				m_persistent_settings->RemoveValue(gui::persistent::titles, serial);
 			}
 			else
 			{
-				m_titles.insert_or_assign(serial, new_title);
+				m_titles.insert(serial, new_title);
 				m_persistent_settings->SetValue(gui::persistent::titles, serial, new_title);
 			}
 			Refresh(true); // full refresh in order to reliably sort the list
@@ -1947,26 +1350,17 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 		{
 			if (new_notes.simplified().isEmpty())
 			{
-				m_notes.erase(serial);
+				m_notes.remove(serial);
 				m_persistent_settings->RemoveValue(gui::persistent::notes, serial);
 			}
 			else
 			{
-				m_notes.insert_or_assign(serial, new_notes);
+				m_notes.insert(serial, new_notes);
 				m_persistent_settings->SetValue(gui::persistent::notes, serial, new_notes);
 			}
 			Refresh();
 		}
 	});
-	connect(reset_time_played, &QAction::triggered, this, [this, name, serial]
-	{
-		if (QMessageBox::question(this, tr("Confirm Reset"), tr("Reset time played?\n\n%0 [%1]").arg(name).arg(serial)) == QMessageBox::Yes)
-		{
-			m_persistent_settings->SetPlaytime(serial, 0, false);
-			m_persistent_settings->SetLastPlayed(serial, 0, true);
-			Refresh();
-		}
-	});
 	connect(copy_info, &QAction::triggered, this, [name, serial]
 	{
 		QApplication::clipboard()->setText(name % QStringLiteral(" [") % serial % QStringLiteral("]"));
@@ -1981,13 +1375,13 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 	});
 
 	// Disable options depending on software category
-	const QString category = QString::fromStdString(current_game.category);
+	const QString category = qstr(current_game.category);
 
-	if (category == cat::cat_ps3_os)
+	if (category == cat::cat_disc_game)
 	{
 		remove_game->setEnabled(false);
 	}
-	else if (category != cat::cat_disc_game && category != cat::cat_hdd_game)
+	else if (category != cat::cat_hdd_game)
 	{
 		check_compat->setEnabled(false);
 	}
@@ -1995,31 +1389,32 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
 	menu.exec(global_pos);
 }
 
-bool game_list_frame::CreateCPUCaches(const std::string& path, const std::string& serial)
+bool game_list_frame::CreatePPUCache(const std::string& path, const std::string& serial)
 {
-	Emu.GracefulShutdown(false);
+	Emu.SetForceBoot(true);
+	Emu.Stop();
 	Emu.SetForceBoot(true);
 
-	if (const auto error = Emu.BootGame(fs::is_file(path) ? fs::get_parent_dir(path) : path, serial, true); error != game_boot_result::no_errors)
+	if (const auto error = Emu.BootGame(path, serial, true); error != game_boot_result::no_errors)
 	{
-		game_list_log.error("Could not create LLVM caches for %s, error: %s", path, error);
+		game_list_log.error("Could not create PPU Cache for %s, error: %s", path, error);
 		return false;
 	}
-
-	game_list_log.warning("Creating LLVM Caches for %s", path);
+	game_list_log.warning("Creating PPU Cache for %s", path);
 	return true;
 }
 
-bool game_list_frame::CreateCPUCaches(const game_info& game)
+bool game_list_frame::CreatePPUCache(const game_info& game)
 {
-	return game && CreateCPUCaches(game->info.path, game->info.serial);
+	return game && CreatePPUCache(game->info.path, game->info.serial);
 }
 
 bool game_list_frame::RemoveCustomConfiguration(const std::string& title_id, const game_info& game, bool is_interactive)
 {
-	const std::string path = rpcs3::utils::get_custom_config_path(title_id);
+	const std::string config_path_new = rpcs3::utils::get_custom_config_path(title_id);
+	const std::string config_path_old = rpcs3::utils::get_custom_config_path(title_id, true);
 
-	if (!fs::is_file(path))
+	if (!fs::is_file(config_path_new) && !fs::is_file(config_path_old))
 		return true;
 
 	if (is_interactive && QMessageBox::question(this, tr("Confirm Removal"), tr("Remove custom game configuration?")) != QMessageBox::Yes)
@@ -2027,13 +1422,17 @@ bool game_list_frame::RemoveCustomConfiguration(const std::string& title_id, con
 
 	bool result = true;
 
-	if (fs::is_file(path))
+	for (const std::string& path : { config_path_new, config_path_old })
 	{
+		if (!fs::is_file(path))
+		{
+			continue;
+		}
 		if (fs::remove_file(path))
 		{
 			if (game)
 			{
-				game->has_custom_config = false;
+				game->hasCustomConfig = false;
 			}
 			game_list_log.success("Removed configuration file: %s", path);
 		}
@@ -2062,23 +1461,18 @@ bool game_list_frame::RemoveCustomPadConfiguration(const std::string& title_id,
 	if (!fs::is_dir(config_dir))
 		return true;
 
-	if (is_interactive && QMessageBox::question(this, tr("Confirm Removal"), (!Emu.IsStopped(true) && Emu.GetTitleID() == title_id)
+	if (is_interactive && QMessageBox::question(this, tr("Confirm Removal"), (!Emu.IsStopped() && Emu.GetTitleID() == title_id)
 		? tr("Remove custom pad configuration?\nYour configuration will revert to the global pad settings.")
 		: tr("Remove custom pad configuration?")) != QMessageBox::Yes)
 		return true;
 
-	g_cfg_input_configs.load();
-	g_cfg_input_configs.active_configs.erase(title_id);
-	g_cfg_input_configs.save();
-	game_list_log.notice("Removed active input configuration entry for key '%s'", title_id);
-
-	if (QDir(QString::fromStdString(config_dir)).removeRecursively())
+	if (QDir(qstr(config_dir)).removeRecursively())
 	{
 		if (game)
 		{
-			game->has_custom_pad_config = false;
+			game->hasCustomPadConfig = false;
 		}
-		if (!Emu.IsStopped(true) && Emu.GetTitleID() == title_id)
+		if (!Emu.IsStopped() && Emu.GetTitleID() == title_id)
 		{
 			pad::set_enabled(false);
 			pad::reset(title_id);
@@ -2108,9 +1502,8 @@ bool game_list_frame::RemoveShadersCache(const std::string& base_dir, bool is_in
 	u32 caches_total   = 0;
 
 	const QStringList filter{ QStringLiteral("shaders_cache") };
-	const QString q_base_dir = QString::fromStdString(base_dir);
 
-	QDirIterator dir_iter(q_base_dir, filter, QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+	QDirIterator dir_iter(qstr(base_dir), filter, QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
 
 	while (dir_iter.hasNext())
 	{
@@ -2119,11 +1512,11 @@ bool game_list_frame::RemoveShadersCache(const std::string& base_dir, bool is_in
 		if (QDir(filepath).removeRecursively())
 		{
 			++caches_removed;
-			game_list_log.notice("Removed shaders cache dir: %s", filepath);
+			game_list_log.notice("Removed shaders cache dir: %s", sstr(filepath));
 		}
 		else
 		{
-			game_list_log.warning("Could not completely remove shaders cache dir: %s", filepath);
+			game_list_log.warning("Could not completely remove shaders cache dir: %s", sstr(filepath));
 		}
 
 		++caches_total;
@@ -2136,14 +1529,6 @@ bool game_list_frame::RemoveShadersCache(const std::string& base_dir, bool is_in
 	else
 		game_list_log.fatal("Only %d/%d shaders cache dirs could be removed in %s", caches_removed, caches_total, base_dir);
 
-	if (QDir(q_base_dir).isEmpty())
-	{
-		if (fs::remove_dir(base_dir))
-			game_list_log.notice("Removed empty shader cache directory: %s", base_dir);
-		else
-			game_list_log.error("Could not remove empty shader cache directory: '%s' (%s)", base_dir, fs::g_tls_error);
-	}
-
 	return success;
 }
 
@@ -2159,9 +1544,8 @@ bool game_list_frame::RemovePPUCache(const std::string& base_dir, bool is_intera
 	u32 files_total = 0;
 
 	const QStringList filter{ QStringLiteral("v*.obj"), QStringLiteral("v*.obj.gz") };
-	const QString q_base_dir = QString::fromStdString(base_dir);
 
-	QDirIterator dir_iter(q_base_dir, filter, QDir::Files | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+	QDirIterator dir_iter(qstr(base_dir), filter, QDir::Files | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
 
 	while (dir_iter.hasNext())
 	{
@@ -2170,11 +1554,11 @@ bool game_list_frame::RemovePPUCache(const std::string& base_dir, bool is_intera
 		if (QFile::remove(filepath))
 		{
 			++files_removed;
-			game_list_log.notice("Removed PPU cache file: %s", filepath);
+			game_list_log.notice("Removed PPU cache file: %s", sstr(filepath));
 		}
 		else
 		{
-			game_list_log.warning("Could not remove PPU cache file: %s", filepath);
+			game_list_log.warning("Could not remove PPU cache file: %s", sstr(filepath));
 		}
 
 		++files_total;
@@ -2187,14 +1571,6 @@ bool game_list_frame::RemovePPUCache(const std::string& base_dir, bool is_intera
 	else
 		game_list_log.fatal("Only %d/%d PPU cache files could be removed in %s", files_removed, files_total, base_dir);
 
-	if (QDir(q_base_dir).isEmpty())
-	{
-		if (fs::remove_dir(base_dir))
-			game_list_log.notice("Removed empty PPU cache directory: %s", base_dir);
-		else
-			game_list_log.error("Could not remove empty PPU cache directory: '%s' (%s)", base_dir, fs::g_tls_error);
-	}
-
 	return success;
 }
 
@@ -2210,9 +1586,8 @@ bool game_list_frame::RemoveSPUCache(const std::string& base_dir, bool is_intera
 	u32 files_total = 0;
 
 	const QStringList filter{ QStringLiteral("spu*.dat"), QStringLiteral("spu*.dat.gz"), QStringLiteral("spu*.obj"), QStringLiteral("spu*.obj.gz") };
-	const QString q_base_dir = QString::fromStdString(base_dir);
 
-	QDirIterator dir_iter(q_base_dir, filter, QDir::Files | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+	QDirIterator dir_iter(qstr(base_dir), filter, QDir::Files | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
 
 	while (dir_iter.hasNext())
 	{
@@ -2221,11 +1596,11 @@ bool game_list_frame::RemoveSPUCache(const std::string& base_dir, bool is_intera
 		if (QFile::remove(filepath))
 		{
 			++files_removed;
-			game_list_log.notice("Removed SPU cache file: %s", filepath);
+			game_list_log.notice("Removed SPU cache file: %s", sstr(filepath));
 		}
 		else
 		{
-			game_list_log.warning("Could not remove SPU cache file: %s", filepath);
+			game_list_log.warning("Could not remove SPU cache file: %s", sstr(filepath));
 		}
 
 		++files_total;
@@ -2238,185 +1613,18 @@ bool game_list_frame::RemoveSPUCache(const std::string& base_dir, bool is_intera
 	else
 		game_list_log.fatal("Only %d/%d SPU cache files could be removed in %s", files_removed, files_total, base_dir);
 
-	if (QDir(q_base_dir).isEmpty())
-	{
-		if (fs::remove_dir(base_dir))
-			game_list_log.notice("Removed empty SPU cache directory: %s", base_dir);
-		else
-			game_list_log.error("Could not remove empty SPU cache directory: '%s' (%s)", base_dir, fs::g_tls_error);
-	}
-
 	return success;
 }
 
-void game_list_frame::RemoveHDD1Cache(const std::string& base_dir, const std::string& title_id, bool is_interactive)
+void game_list_frame::BatchCreatePPUCaches()
 {
-	if (!fs::is_dir(base_dir))
-		return;
-
-	if (is_interactive && QMessageBox::question(this, tr("Confirm Removal"), tr("Remove HDD1 cache?")) != QMessageBox::Yes)
-		return;
-
-	u32 dirs_removed = 0;
-	u32 dirs_total = 0;
-
-	const QString q_base_dir = QString::fromStdString(base_dir);
-
-	const QStringList filter{ QString::fromStdString(title_id + "_*") };
-
-	QDirIterator dir_iter(q_base_dir, filter, QDir::Dirs | QDir::NoDotAndDotDot);
-
-	while (dir_iter.hasNext())
-	{
-		const QString filepath = dir_iter.next();
-
-		if (fs::remove_all(filepath.toStdString()))
-		{
-			++dirs_removed;
-			game_list_log.notice("Removed HDD1 cache directory: %s", filepath);
-		}
-		else
-		{
-			game_list_log.warning("Could not remove HDD1 cache directory: %s", filepath);
-		}
-
-		++dirs_total;
-	}
-
-	const bool success = dirs_removed == dirs_total;
-
-	if (success)
-		game_list_log.success("Removed HDD1 cache in %s (%s)", base_dir, title_id);
-	else
-		game_list_log.fatal("Only %d/%d HDD1 cache directories could be removed in %s (%s)", dirs_removed, dirs_total, base_dir, title_id);
-}
-
-void game_list_frame::BatchActionBySerials(progress_dialog* pdlg, const std::set<std::string>& serials, QString progressLabel, std::function<bool(const std::string&)> action, std::function<void(u32, u32)> cancel_log, bool refresh_on_finish, bool can_be_concurrent, std::function<bool()> should_wait_cb)
-{
-	// Concurrent tasks should not wait (at least not in current implementation)
-	ensure(!should_wait_cb || !can_be_concurrent);
-
-	g_system_progress_canceled = false;
-
-	const std::shared_ptr<std::function<bool(int)>> iterate_over_serial = std::make_shared<std::function<bool(int)>>();
-
-	const std::shared_ptr<atomic_t<int>> index = std::make_shared<atomic_t<int>>(0);
-
-	const int serials_size = ::narrow<int>(serials.size());
-
-	*iterate_over_serial = [=, this, index_ptr = index](int index)
-	{
-		if (index == serials_size)
-		{
-			return false;
-		}
-
-		const std::string& serial = *std::next(serials.begin(), index);
-
-		if (pdlg->wasCanceled() || g_system_progress_canceled.exchange(false))
-		{
-			if (cancel_log)
-			{
-				cancel_log(index, serials_size);
-			}
-			return false;
-		}
-
-		if (action(serial))
-		{
-			const int done = index_ptr->load();
-			pdlg->setLabelText(progressLabel.arg(done + 1).arg(serials_size));
-			pdlg->SetValue(done + 1);
-		}
-
-		(*index_ptr)++;
-		return true;
-	};
-
-	if (can_be_concurrent)
-	{
-		// Unused currently
-
-		QList<int> indices;
-
-		for (int i = 0; i < serials_size; i++)
-		{
-			indices.append(i);
-		}
-
-		QFutureWatcher<void>* future_watcher = new QFutureWatcher<void>(this);
-
-		future_watcher->setFuture(QtConcurrent::map(std::move(indices), *iterate_over_serial));
-
-		connect(future_watcher, &QFutureWatcher<void>::finished, this, [=, this]()
-		{
-			pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size));
-			pdlg->setCancelButtonText(tr("OK"));
-			QApplication::beep();
-
-			if (refresh_on_finish && index)
-			{
-				Refresh(true);
-			}
-
-			future_watcher->deleteLater();
-		});
-
-		return;
-	}
-
-	const std::shared_ptr<std::function<void()>> periodic_func = std::make_shared<std::function<void()>>();
-
-	*periodic_func = [=, this]()
-	{
-		if (should_wait_cb && should_wait_cb())
-		{
-			// Conditions are not met for execution
-			// Check again later
-			QTimer::singleShot(5, this, *periodic_func);
-			return;
-		}
-
-		if ((*iterate_over_serial)(*index))
-		{
-			QTimer::singleShot(1, this, *periodic_func);
-			return;
-		}
-
-		pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size));
-		pdlg->setCancelButtonText(tr("OK"));
-		connect(pdlg, &progress_dialog::canceled, this, [pdlg](){ pdlg->deleteLater(); });
-		QApplication::beep();
-
-		if (refresh_on_finish && index)
-		{
-			Refresh(true);
-		}
-	};
-
-	// Invoked on the next event loop processing iteration
-	QTimer::singleShot(1, this, *periodic_func);
-}
-
-void game_list_frame::BatchCreateCPUCaches(const std::vector<game_info>& game_data)
-{
-	std::set<std::string> serials;
-
-	if (game_data.empty())
-	{
-		serials.emplace("vsh.self");
-	}
-
-	for (const auto& game : (game_data.empty() ? m_game_data : game_data))
-	{
-		serials.emplace(game->info.serial);
-	}
-
-	const usz total = serials.size();
+	const std::string vsh_path = g_cfg.vfs.get_dev_flash() + "vsh/module/";
+	const bool vsh_exists = fs::is_file(vsh_path + "vsh.self");
+	const u32 total = m_game_data.size() + (vsh_exists ? 1 : 0);
 
 	if (total == 0)
 	{
-		QMessageBox::information(this, tr("LLVM Cache Batch Creation"), tr("No titles found"), QMessageBox::Ok);
+		QMessageBox::information(this, tr("PPU Cache Batch Creation"), tr("No titles found"), QMessageBox::Ok);
 		return;
 	}
 
@@ -2425,61 +1633,85 @@ void game_list_frame::BatchCreateCPUCaches(const std::vector<game_info>& game_da
 		return;
 	}
 
-	const QString main_label = tr("Creating all LLVM caches");
+	const QString main_label = tr("Creating all PPU caches");
 
-	progress_dialog* pdlg = new progress_dialog(tr("LLVM Cache Batch Creation"), main_label, tr("Cancel"), 0, ::narrow<s32>(total), false, this);
+	progress_dialog* pdlg = new progress_dialog(tr("PPU Cache Batch Creation"), main_label, tr("Cancel"), 0, total, true, this);
 	pdlg->setAutoClose(false);
 	pdlg->setAutoReset(false);
-	pdlg->open();
+	pdlg->show();
+	QApplication::processEvents();
 
-	connect(pdlg, &progress_dialog::canceled, this, []()
+	u32 created = 0;
+
+	const auto wait_until_compiled = [pdlg]() -> bool
 	{
+		while (!Emu.IsStopped())
+		{
+			if (pdlg->wasCanceled())
+			{
+				return false;
+			}
+			QApplication::processEvents();
+		}
+		return true;
+	};
+
+	if (vsh_exists)
+	{
+		pdlg->setLabelText(tr("%0\nProgress: %1/%2. Compiling caches for VSH...", "Second line after main label").arg(main_label).arg(created).arg(total));
+		QApplication::processEvents();
+
+		if (CreatePPUCache(vsh_path) && wait_until_compiled())
+		{
+			pdlg->SetValue(++created);
+		}
+	}
+
+	for (const auto& game : m_game_data)
+	{
+		if (pdlg->wasCanceled() || g_system_progress_canceled)
+		{
+			break;
+		}
+
+		pdlg->setLabelText(tr("%0\nProgress: %1/%2. Compiling caches for %3...", "Second line after main label").arg(main_label).arg(created).arg(total).arg(qstr(game->info.serial)));
+		QApplication::processEvents();
+
+		if (CreatePPUCache(game) && wait_until_compiled())
+		{
+			pdlg->SetValue(++created);
+		}
+	}
+
+	if (pdlg->wasCanceled() || g_system_progress_canceled)
+	{
+		game_list_log.notice("PPU Cache Batch Creation was canceled");
+
 		if (!Emu.IsStopped())
 		{
-			Emu.GracefulShutdown(false, true);
+			QApplication::processEvents();
+			Emu.Stop();
 		}
-	});
 
-	BatchActionBySerials(pdlg, serials, tr("%0\nProgress: %1/%2 caches compiled").arg(main_label),
-	[&, game_data](const std::string& serial)
-	{
-		if (Emu.IsStopped(true))
+		if (!pdlg->wasCanceled())
 		{
-			const auto it = std::find_if(m_game_data.begin(), m_game_data.end(), FN(x->info.serial == serial));
-
-			if (it != m_game_data.end())
-			{
-				return CreateCPUCaches((*it)->info.path, serial);
-			}
+			pdlg->close();
 		}
+		return;
+	}
 
-		return false;
-	},
-	[this](u32, u32)
-	{
-		game_list_log.notice("LLVM Cache Batch Creation was canceled");
-	}, false, false,
-	[]()
-	{
-		return !Emu.IsStopped(true);
-	});
+	pdlg->setLabelText(tr("Created PPU Caches for %n title(s)", "", created));
+	pdlg->setCancelButtonText(tr("OK"));
+	QApplication::beep();
 }
 
 void game_list_frame::BatchRemovePPUCaches()
 {
-	if (Emu.GetStatus(false) != system_state::stopped)
-	{
-		return;
-	}
-
 	std::set<std::string> serials;
-	serials.emplace("vsh.self");
-
 	for (const auto& game : m_game_data)
 	{
 		serials.emplace(game->info.serial);
 	}
-
 	const u32 total = ::size32(serials);
 
 	if (total == 0)
@@ -2488,37 +1720,39 @@ void game_list_frame::BatchRemovePPUCaches()
 		return;
 	}
 
-	progress_dialog* pdlg = new progress_dialog(tr("PPU Cache Batch Removal"), tr("Removing all PPU caches"), tr("Cancel"), 0, total, false, this);
+	progress_dialog* pdlg = new progress_dialog(tr("PPU Cache Batch Removal"), tr("Removing all PPU caches"), tr("Cancel"), 0, total, true, this);
 	pdlg->setAutoClose(false);
 	pdlg->setAutoReset(false);
-	pdlg->open();
+	pdlg->show();
 
-	BatchActionBySerials(pdlg, serials, tr("%0/%1 caches cleared"),
-	[this](const std::string& serial)
+	u32 removed = 0;
+	for (const auto& serial : serials)
 	{
-		return Emu.IsStopped(true) && RemovePPUCache(GetCacheDirBySerial(serial));
-	},
-	[this](u32, u32)
-	{
-		game_list_log.notice("PPU Cache Batch Removal was canceled");
-	}, false);
+		if (pdlg->wasCanceled())
+		{
+			game_list_log.notice("PPU Cache Batch Removal was canceled");
+			break;
+		}
+		QApplication::processEvents();
+
+		if (RemovePPUCache(GetCacheDirBySerial(serial)))
+		{
+			pdlg->SetValue(++removed);
+		}
+	}
+
+	pdlg->setLabelText(tr("%0/%1 caches cleared").arg(removed).arg(total));
+	pdlg->setCancelButtonText(tr("OK"));
+	QApplication::beep();
 }
 
 void game_list_frame::BatchRemoveSPUCaches()
 {
-	if (Emu.GetStatus(false) != system_state::stopped)
-	{
-		return;
-	}
-
 	std::set<std::string> serials;
-	serials.emplace("vsh.self");
-
 	for (const auto& game : m_game_data)
 	{
 		serials.emplace(game->info.serial);
 	}
-
 	const u32 total = ::size32(serials);
 
 	if (total == 0)
@@ -2527,20 +1761,30 @@ void game_list_frame::BatchRemoveSPUCaches()
 		return;
 	}
 
-	progress_dialog* pdlg = new progress_dialog(tr("SPU Cache Batch Removal"), tr("Removing all SPU caches"), tr("Cancel"), 0, total, false, this);
+	progress_dialog* pdlg = new progress_dialog(tr("SPU Cache Batch Removal"), tr("Removing all SPU caches"), tr("Cancel"), 0, total, true, this);
 	pdlg->setAutoClose(false);
 	pdlg->setAutoReset(false);
-	pdlg->open();
+	pdlg->show();
 
-	BatchActionBySerials(pdlg, serials, tr("%0/%1 caches cleared"),
-	[this](const std::string& serial)
+	u32 removed = 0;
+	for (const auto& serial : serials)
 	{
-		return Emu.IsStopped(true) && RemoveSPUCache(GetCacheDirBySerial(serial));
-	},
-	[this](u32 removed, u32 total)
-	{
-		game_list_log.notice("SPU Cache Batch Removal was canceled. %d/%d folders cleared", removed, total);
-	}, false);
+		if (pdlg->wasCanceled())
+		{
+			game_list_log.notice("SPU Cache Batch Removal was canceled. %d/%d folders cleared", removed, total);
+			break;
+		}
+		QApplication::processEvents();
+
+		if (RemoveSPUCache(GetCacheDirBySerial(serial)))
+		{
+			pdlg->SetValue(++removed);
+		}
+	}
+
+	pdlg->setLabelText(tr("%0/%1 caches cleared").arg(removed).arg(total));
+	pdlg->setCancelButtonText(tr("OK"));
+	QApplication::beep();
 }
 
 void game_list_frame::BatchRemoveCustomConfigurations()
@@ -2548,12 +1792,11 @@ void game_list_frame::BatchRemoveCustomConfigurations()
 	std::set<std::string> serials;
 	for (const auto& game : m_game_data)
 	{
-		if (game->has_custom_config && !serials.count(game->info.serial))
+		if (game->hasCustomConfig && !serials.count(game->info.serial))
 		{
 			serials.emplace(game->info.serial);
 		}
 	}
-
 	const u32 total = ::size32(serials);
 
 	if (total == 0)
@@ -2562,20 +1805,31 @@ void game_list_frame::BatchRemoveCustomConfigurations()
 		return;
 	}
 
-	progress_dialog* pdlg = new progress_dialog(tr("Custom Configuration Batch Removal"), tr("Removing all custom configurations"), tr("Cancel"), 0, total, false, this);
+	progress_dialog* pdlg = new progress_dialog(tr("Custom Configuration Batch Removal"), tr("Removing all custom configurations"), tr("Cancel"), 0, total, true, this);
 	pdlg->setAutoClose(false);
 	pdlg->setAutoReset(false);
-	pdlg->open();
+	pdlg->show();
 
-	BatchActionBySerials(pdlg, serials, tr("%0/%1 custom configurations cleared"),
-	[this](const std::string& serial)
+	u32 removed = 0;
+	for (const auto& serial : serials)
 	{
-		return Emu.IsStopped(true) && RemoveCustomConfiguration(serial);
-	},
-	[this](u32 removed, u32 total)
-	{
-		game_list_log.notice("Custom Configuration Batch Removal was canceled. %d/%d custom configurations cleared", removed, total);
-	}, true);
+		if (pdlg->wasCanceled())
+		{
+			game_list_log.notice("Custom Configuration Batch Removal was canceled. %d/%d custom configurations cleared", removed, total);
+			break;
+		}
+		QApplication::processEvents();
+
+		if (RemoveCustomConfiguration(serial))
+		{
+			pdlg->SetValue(++removed);
+		}
+	}
+
+	pdlg->setLabelText(tr("%0/%1 custom configurations cleared").arg(removed).arg(total));
+	pdlg->setCancelButtonText(tr("OK"));
+	QApplication::beep();
+	Refresh(true);
 }
 
 void game_list_frame::BatchRemoveCustomPadConfigurations()
@@ -2583,7 +1837,7 @@ void game_list_frame::BatchRemoveCustomPadConfigurations()
 	std::set<std::string> serials;
 	for (const auto& game : m_game_data)
 	{
-		if (game->has_custom_pad_config && !serials.count(game->info.serial))
+		if (game->hasCustomPadConfig && !serials.count(game->info.serial))
 		{
 			serials.emplace(game->info.serial);
 		}
@@ -2596,37 +1850,40 @@ void game_list_frame::BatchRemoveCustomPadConfigurations()
 		return;
 	}
 
-	progress_dialog* pdlg = new progress_dialog(tr("Custom Pad Configuration Batch Removal"), tr("Removing all custom pad configurations"), tr("Cancel"), 0, total, false, this);
+	progress_dialog* pdlg = new progress_dialog(tr("Custom Pad Configuration Batch Removal"), tr("Removing all custom pad configurations"), tr("Cancel"), 0, total, true, this);
 	pdlg->setAutoClose(false);
 	pdlg->setAutoReset(false);
-	pdlg->open();
+	pdlg->show();
 
-	BatchActionBySerials(pdlg, serials, tr("%0/%1 custom pad configurations cleared"),
-	[this](const std::string& serial)
+	u32 removed = 0;
+	for (const auto& serial : serials)
 	{
-		return Emu.IsStopped(true) && RemoveCustomPadConfiguration(serial);
-	},
-	[this](u32 removed, u32 total)
-	{
-		game_list_log.notice("Custom Pad Configuration Batch Removal was canceled. %d/%d custom pad configurations cleared", removed, total);
-	}, true);
+		if (pdlg->wasCanceled())
+		{
+			game_list_log.notice("Custom Pad Configuration Batch Removal was canceled. %d/%d custom pad configurations cleared", removed, total);
+			break;
+		}
+		QApplication::processEvents();
+
+		if (RemoveCustomPadConfiguration(serial))
+		{
+			pdlg->SetValue(++removed);
+		}
+	}
+
+	pdlg->setLabelText(tr("%0/%1 custom pad configurations cleared").arg(removed).arg(total));
+	pdlg->setCancelButtonText(tr("OK"));
+	QApplication::beep();
+	Refresh(true);
 }
 
 void game_list_frame::BatchRemoveShaderCaches()
 {
-	if (Emu.GetStatus(false) != system_state::stopped)
-	{
-		return;
-	}
-
 	std::set<std::string> serials;
-	serials.emplace("vsh.self");
-
 	for (const auto& game : m_game_data)
 	{
 		serials.emplace(game->info.serial);
 	}
-
 	const u32 total = ::size32(serials);
 
 	if (total == 0)
@@ -2635,20 +1892,154 @@ void game_list_frame::BatchRemoveShaderCaches()
 		return;
 	}
 
-	progress_dialog* pdlg = new progress_dialog(tr("Shader Cache Batch Removal"), tr("Removing all shader caches"), tr("Cancel"), 0, total, false, this);
+	progress_dialog* pdlg = new progress_dialog(tr("Shader Cache Batch Removal"), tr("Removing all shader caches"), tr("Cancel"), 0, total, true, this);
 	pdlg->setAutoClose(false);
 	pdlg->setAutoReset(false);
-	pdlg->open();
+	pdlg->show();
 
-	BatchActionBySerials(pdlg, serials, tr("%0/%1 shader caches cleared"),
-	[this](const std::string& serial)
+	u32 removed = 0;
+	for (const auto& serial : serials)
 	{
-		return Emu.IsStopped(true) && RemoveShadersCache(GetCacheDirBySerial(serial));
-	},
-	[this](u32 removed, u32 total)
+		if (pdlg->wasCanceled())
+		{
+			game_list_log.notice("Shader Cache Batch Removal was canceled");
+			break;
+		}
+		QApplication::processEvents();
+
+		if (RemoveShadersCache(GetCacheDirBySerial(serial)))
+		{
+			pdlg->SetValue(++removed);
+		}
+	}
+
+	pdlg->setLabelText(tr("%0/%1 shader caches cleared").arg(removed).arg(total));
+	pdlg->setCancelButtonText(tr("OK"));
+	QApplication::beep();
+}
+
+QPixmap game_list_frame::PaintedPixmap(const QPixmap& icon, bool paint_config_icon, bool paint_pad_config_icon, const QColor& compatibility_color) const
+{
+	const qreal device_pixel_ratio = devicePixelRatioF();
+	QSize canvas_size(320, 176);
+	QSize icon_size(icon.size());
+	QPoint target_pos;
+
+	if (!icon.isNull())
 	{
-		game_list_log.notice("Shader Cache Batch Removal was canceled. %d/%d cleared", removed, total);
-	}, false);
+		// Let's upscale the original icon to at least fit into the outer rect of the size of PS3's ICON0.PNG
+		if (icon_size.width() < 320 || icon_size.height() < 176)
+		{
+			icon_size.scale(320, 176, Qt::KeepAspectRatio);
+		}
+
+		canvas_size = icon_size;
+
+		// Calculate the centered size and position of the icon on our canvas.
+		if (icon_size.width() != 320 || icon_size.height() != 176)
+		{
+			ensure(icon_size.height() > 0);
+			constexpr double target_ratio = 320.0 / 176.0; // aspect ratio 20:11
+
+			if ((icon_size.width() / static_cast<double>(icon_size.height())) > target_ratio)
+			{
+				canvas_size.setHeight(std::ceil(icon_size.width() / target_ratio));
+			}
+			else
+			{
+				canvas_size.setWidth(std::ceil(icon_size.height() * target_ratio));
+			}
+
+			target_pos.setX(std::max<int>(0, (canvas_size.width() - icon_size.width()) / 2.0));
+			target_pos.setY(std::max<int>(0, (canvas_size.height() - icon_size.height()) / 2.0));
+		}
+	}
+
+	// Create a canvas large enough to fit our entire scaled icon
+	QPixmap canvas(canvas_size * device_pixel_ratio);
+	canvas.setDevicePixelRatio(device_pixel_ratio);
+	canvas.fill(m_icon_color);
+
+	// Create a painter for our canvas
+	QPainter painter(&canvas);
+	painter.setRenderHint(QPainter::SmoothPixmapTransform);
+
+	// Draw the icon onto our canvas
+	if (!icon.isNull())
+	{
+		painter.drawPixmap(target_pos.x(), target_pos.y(), icon_size.width(), icon_size.height(), icon);
+	}
+
+	// Draw config icons if necessary
+	if (!m_is_list_layout && (paint_config_icon || paint_pad_config_icon))
+	{
+		const int width = canvas_size.width() * 0.2;
+		const QPoint origin = QPoint(canvas_size.width() - width, 0);
+		QString icon_path;
+
+		if (paint_config_icon && paint_pad_config_icon)
+		{
+			icon_path = ":/Icons/combo_config_bordered.png";
+		}
+		else if (paint_config_icon)
+		{
+			icon_path = ":/Icons/custom_config.png";
+		}
+		else if (paint_pad_config_icon)
+		{
+			icon_path = ":/Icons/controllers.png";
+		}
+
+		QPixmap custom_config_icon(icon_path);
+		custom_config_icon.setDevicePixelRatio(device_pixel_ratio);
+		painter.drawPixmap(origin, custom_config_icon.scaled(QSize(width, width) * device_pixel_ratio, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation));
+	}
+
+	// Draw game compatibility icons if necessary
+	if (compatibility_color.isValid())
+	{
+		const int size = canvas_size.height() * 0.2;
+		const int spacing = canvas_size.height() * 0.05;
+		QColor copyColor = QColor(compatibility_color);
+		copyColor.setAlpha(215); // ~85% opacity
+		painter.setRenderHint(QPainter::Antialiasing);
+		painter.setBrush(QBrush(copyColor));
+		painter.setPen(QPen(Qt::black, std::max(canvas_size.width() / 320, canvas_size.height() / 176)));
+		painter.drawEllipse(spacing, spacing, size, size);
+	}
+
+	// Finish the painting
+	painter.end();
+
+	// Scale and return our final image
+	return canvas.scaled(m_icon_size * device_pixel_ratio, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation);
+}
+
+void game_list_frame::SetCustomConfigIcon(QTableWidgetItem* title_item, const game_info& game)
+{
+	if (!title_item || !game)
+		return;
+
+	static QIcon icon_combo_config_bordered(":/Icons/combo_config_bordered.png");
+	static QIcon icon_custom_config(":/Icons/custom_config.png");
+	static QIcon icon_controllers(":/Icons/controllers.png");
+
+	if (game->hasCustomConfig && game->hasCustomPadConfig)
+	{
+		title_item->setIcon(icon_combo_config_bordered);
+	}
+	else if (game->hasCustomConfig)
+	{
+		title_item->setIcon(icon_custom_config);
+	}
+	else if (game->hasCustomPadConfig)
+	{
+		title_item->setIcon(icon_controllers);
+	}
+	else if (!title_item->icon().isNull())
+	{
+		title_item->setIcon({});
+	}
 }
 
 void game_list_frame::ShowCustomConfigIcon(const game_info& game)
@@ -2659,19 +2050,27 @@ void game_list_frame::ShowCustomConfigIcon(const game_info& game)
 	}
 
 	const std::string serial         = game->info.serial;
-	const bool has_custom_config     = game->has_custom_config;
-	const bool has_custom_pad_config = game->has_custom_pad_config;
+	const bool has_custom_config     = game->hasCustomConfig;
+	const bool has_custom_pad_config = game->hasCustomPadConfig;
 
 	for (const auto& other_game : m_game_data)
 	{
 		if (other_game->info.serial == serial)
 		{
-			other_game->has_custom_config     = has_custom_config;
-			other_game->has_custom_pad_config = has_custom_pad_config;
+			other_game->hasCustomConfig    = has_custom_config;
+			other_game->hasCustomPadConfig = has_custom_pad_config;
 		}
 	}
 
-	m_game_list->set_custom_config_icon(game);
+	const QString q_serial = qstr(game->info.serial);
+
+	for (int row = 0; row < m_game_list->rowCount(); ++row)
+	{
+		if (const auto item = m_game_list->item(row, gui::column_serial); item && item->text() == q_serial)
+		{
+			SetCustomConfigIcon(m_game_list->item(row, gui::column_name), game);
+		}
+	}
 
 	RepaintIcons();
 }
@@ -2686,9 +2085,11 @@ void game_list_frame::ResizeIcons(const int& slider_pos)
 
 void game_list_frame::RepaintIcons(const bool& from_settings)
 {
-	gui::utils::stop_future_watcher(m_parsing_watcher, false);
-	gui::utils::stop_future_watcher(m_refresh_watcher, false);
-	WaitAndAbortRepaintThreads();
+	if (m_repaint_watcher.isRunning())
+	{
+		m_repaint_watcher.cancel();
+		m_repaint_watcher.waitForFinished();
+	}
 
 	if (from_settings)
 	{
@@ -2698,19 +2099,46 @@ void game_list_frame::RepaintIcons(const bool& from_settings)
 		}
 		else
 		{
-			m_icon_color = gui::utils::get_label_color("gamelist_icon_background_color", Qt::transparent, Qt::transparent);
+			m_icon_color = gui::utils::get_label_color("gamelist_icon_background_color");
 		}
 	}
 
 	if (m_is_list_layout)
 	{
-		m_game_list->repaint_icons(m_game_data, m_icon_color, m_icon_size, devicePixelRatioF());
+		QPixmap placeholder(m_icon_size);
+		placeholder.fill(Qt::transparent);
+
+		for (auto& game : m_game_data)
+		{
+			game->pxmap = placeholder;
+			if (movie_item* item = game->item)
+			{
+				item->call_icon_func();
+			}
+		}
+
+		// Fixate vertical header and row height
+		m_game_list->verticalHeader()->setMinimumSectionSize(m_icon_size.height());
+		m_game_list->verticalHeader()->setMaximumSectionSize(m_icon_size.height());
+
+		// Resize the icon column
+		m_game_list->resizeColumnToContents(gui::column_icon);
+
+		// Shorten the last section to remove horizontal scrollbar if possible
+		m_game_list->resizeColumnToContents(gui::column_count - 1);
 	}
-	else
+
+	const std::function func = [this](const game_info& game) -> movie_item*
 	{
-		m_game_grid->set_draw_compat_status_to_grid(m_draw_compat_status_to_grid);
-		m_game_grid->repaint_icons(m_game_data, m_icon_color, m_icon_size, devicePixelRatioF());
-	}
+		if (game->icon.isNull() && (game->info.icon_path.empty() || !game->icon.load(qstr(game->info.icon_path))))
+		{
+			game_list_log.warning("Could not load image from path %s", sstr(QDir(qstr(game->info.icon_path)).absolutePath()));
+		}
+		const QColor color = getGridCompatibilityColor(game->compat.color);
+		game->pxmap = PaintedPixmap(game->icon, game->hasCustomConfig, game->hasCustomPadConfig, color);
+		return game->item;
+	};
+	m_repaint_watcher.setFuture(QtConcurrent::mapped(m_game_data, func));
 }
 
 void game_list_frame::SetShowHidden(bool show)
@@ -2725,16 +2153,9 @@ void game_list_frame::SetListMode(const bool& is_list)
 
 	m_gui_settings->SetValue(gui::gl_listMode, is_list);
 
-	Refresh();
+	Refresh(true);
 
-	if (m_is_list_layout)
-	{
-		m_central_widget->setCurrentWidget(m_game_list);
-	}
-	else
-	{
-		m_central_widget->setCurrentWidget(m_game_grid);
-	}
+	m_central_widget->setCurrentWidget(m_is_list_layout ? m_game_list : m_game_grid);
 }
 
 void game_list_frame::SetSearchText(const QString& text)
@@ -2743,38 +2164,27 @@ void game_list_frame::SetSearchText(const QString& text)
 	Refresh();
 }
 
-void game_list_frame::FocusAndSelectFirstEntryIfNoneIs()
-{
-	if (m_is_list_layout)
-	{
-		if (m_game_list)
-		{
-			m_game_list->FocusAndSelectFirstEntryIfNoneIs();
-		}
-	}
-	else
-	{
-		if (m_game_grid)
-		{
-			m_game_grid->FocusAndSelectFirstEntryIfNoneIs();
-		}
-	}
-}
-
 void game_list_frame::closeEvent(QCloseEvent *event)
 {
-	SaveSettings();
-
 	QDockWidget::closeEvent(event);
 	Q_EMIT GameListFrameClosed();
 }
 
+void game_list_frame::resizeEvent(QResizeEvent *event)
+{
+	if (!m_is_list_layout)
+	{
+		Refresh(false, m_game_grid->selectedItems().count());
+	}
+	QDockWidget::resizeEvent(event);
+}
+
 bool game_list_frame::eventFilter(QObject *object, QEvent *event)
 {
 	// Zoom gamelist/gamegrid
-	if (event->type() == QEvent::Wheel && (object == m_game_list->verticalScrollBar() || object == m_game_grid->scroll_area()->verticalScrollBar()))
+	if (event->type() == QEvent::Wheel && (object == m_game_list->verticalScrollBar() || object == m_game_grid->verticalScrollBar()))
 	{
-		QWheelEvent* wheel_event = static_cast<QWheelEvent*>(event);
+		QWheelEvent *wheel_event = static_cast<QWheelEvent *>(event);
 
 		if (wheel_event->modifiers() & Qt::ControlModifier)
 		{
@@ -2786,7 +2196,7 @@ bool game_list_frame::eventFilter(QObject *object, QEvent *event)
 	}
 	else if (event->type() == QEvent::KeyPress && (object == m_game_list || object == m_game_grid))
 	{
-		QKeyEvent* key_event = static_cast<QKeyEvent*>(event);
+		QKeyEvent *key_event = static_cast<QKeyEvent *>(event);
 
 		if (key_event->modifiers() & Qt::ControlModifier)
 		{
@@ -2801,25 +2211,21 @@ bool game_list_frame::eventFilter(QObject *object, QEvent *event)
 				return true;
 			}
 		}
-		else if (!key_event->isAutoRepeat())
+		else
 		{
 			if (key_event->key() == Qt::Key_Enter || key_event->key() == Qt::Key_Return)
 			{
-				game_info gameinfo{};
+				QTableWidgetItem* item;
 
 				if (object == m_game_list)
-				{
-					QTableWidgetItem* item = m_game_list->item(m_game_list->currentRow(), static_cast<int>(gui::game_list_columns::icon));
+					item = m_game_list->item(m_game_list->currentRow(), gui::column_icon);
+				else
+					item = m_game_grid->currentItem();
 
-					if (!item || !item->isSelected())
-						return false;
+				if (!item || !item->isSelected())
+					return false;
 
-					gameinfo = GetGameInfoFromItem(item);
-				}
-				else if (game_list_grid_item* item = static_cast<game_list_grid_item*>(m_game_grid->selected_item()))
-				{
-					gameinfo = item->game();
-				}
+				const game_info gameinfo = GetGameInfoFromItem(item);
 
 				if (!gameinfo)
 					return false;
@@ -2836,78 +2242,258 @@ bool game_list_frame::eventFilter(QObject *object, QEvent *event)
 }
 
 /**
-* Returns false if the game should be hidden because it doesn't match search term in toolbar.
+ Cleans and readds entries to table widget in UI.
 */
-bool game_list_frame::SearchMatchesApp(const QString& name, const QString& serial, bool fallback) const
+void game_list_frame::PopulateGameList()
 {
-	if (!m_search_text.isEmpty())
-	{
-		QString search_text = m_search_text.toLower();
-		QString title_name;
+	int selected_row = -1;
 
-		if (const auto it = m_titles.find(serial); it != m_titles.cend())
+	const std::string selected_item = CurrentSelectionPath();
+
+	m_game_list->clear_list();
+	m_game_list->setRowCount(m_game_data.size());
+
+	// Default locale. Uses current Qt application language.
+	const QLocale locale{};
+	const Localized localized;
+
+	const QString game_icon_path = m_play_hover_movies ? qstr(fs::get_config_dir() + "/Icons/game_icons/") : "";
+
+	int row = 0;
+	int index = -1;
+	for (const auto& game : m_game_data)
+	{
+		index++;
+
+		if (!IsEntryVisible(game))
 		{
-			title_name = it->second.toLower();
+			game->item = nullptr;
+			continue;
+		}
+
+		const QString serial = qstr(game->info.serial);
+		const QString title = m_titles.value(serial, qstr(game->info.name));
+		const QString notes = m_notes.value(serial);
+
+		// Icon
+		custom_table_widget_item* icon_item = new custom_table_widget_item;
+		game->item = icon_item;
+
+		icon_item->set_icon_func([this, icon_item, game](int)
+		{
+			ensure(icon_item);
+
+			if (QMovie* movie = icon_item->movie(); movie && icon_item->get_active())
+			{
+				icon_item->setData(Qt::DecorationRole, movie->currentPixmap().scaled(m_icon_size, Qt::KeepAspectRatio));
+			}
+			else
+			{
+				icon_item->setData(Qt::DecorationRole, game->pxmap);
+				if (movie)
+				{
+					movie->stop();
+				}
+			}
+		});
+
+		if (m_play_hover_movies && game->has_hover_gif)
+		{
+			icon_item->init_movie(game_icon_path % serial % "/hover.gif");
+		}
+
+		icon_item->setData(Qt::UserRole, index, true);
+		icon_item->setData(gui::custom_roles::game_role, QVariant::fromValue(game));
+
+		// Title
+		custom_table_widget_item* title_item = new custom_table_widget_item(title);
+		SetCustomConfigIcon(title_item, game);
+
+		// Serial
+		custom_table_widget_item* serial_item = new custom_table_widget_item(game->info.serial);
+
+		if (!notes.isEmpty())
+		{
+			const QString tool_tip = tr("%0 [%1]\n\nNotes:\n%2").arg(title).arg(serial).arg(notes);
+			title_item->setToolTip(tool_tip);
+			serial_item->setToolTip(tool_tip);
+		}
+
+		// Move Support (http://www.psdevwiki.com/ps3/PARAM.SFO#ATTRIBUTE)
+		const bool supports_move = game->info.attr & 0x800000;
+
+		// Compatibility
+		custom_table_widget_item* compat_item = new custom_table_widget_item;
+		compat_item->setText(game->compat.text % (game->compat.date.isEmpty() ? QStringLiteral("") : " (" % game->compat.date % ")"));
+		compat_item->setData(Qt::UserRole, game->compat.index, true);
+		compat_item->setToolTip(game->compat.tooltip);
+		if (!game->compat.color.isEmpty())
+		{
+			compat_item->setData(Qt::DecorationRole, compat_pixmap(game->compat.color, devicePixelRatioF() * 2));
+		}
+
+		// Version
+		QString app_version = qstr(GetGameVersion(game));
+
+		if (game->info.bootable && !game->compat.latest_version.isEmpty())
+		{
+			// If the app is bootable and the compat database contains info about the latest patch version:
+			// add a hint for available software updates if the app version is unknown or lower than the latest version.
+			if (app_version == localized.category.unknown || game->compat.latest_version.toDouble() > app_version.toDouble())
+			{
+				app_version = tr("%0 (Update available: %1)").arg(app_version, game->compat.latest_version);
+			}
+		}
+
+		// Playtimes
+		const quint64 elapsed_ms = m_persistent_settings->GetPlaytime(serial);
+
+		// Last played (support outdated values)
+		QDate last_played;
+		const QString last_played_str = GetLastPlayedBySerial(serial);
+
+		if (!last_played_str.isEmpty())
+		{
+			last_played = QDate::fromString(last_played_str, gui::persistent::last_played_date_format);
+
+			if (!last_played.isValid())
+			{
+				last_played = QDate::fromString(last_played_str, gui::persistent::last_played_date_format_old);
+			}
+		}
+
+		m_game_list->setItem(row, gui::column_icon,       icon_item);
+		m_game_list->setItem(row, gui::column_name,       title_item);
+		m_game_list->setItem(row, gui::column_serial,     serial_item);
+		m_game_list->setItem(row, gui::column_firmware,   new custom_table_widget_item(game->info.fw));
+		m_game_list->setItem(row, gui::column_version,    new custom_table_widget_item(app_version));
+		m_game_list->setItem(row, gui::column_category,   new custom_table_widget_item(game->localized_category));
+		m_game_list->setItem(row, gui::column_path,       new custom_table_widget_item(game->info.path));
+		m_game_list->setItem(row, gui::column_move,       new custom_table_widget_item(sstr(supports_move ? tr("Supported") : tr("Not Supported")), Qt::UserRole, !supports_move));
+		m_game_list->setItem(row, gui::column_resolution, new custom_table_widget_item(GetStringFromU32(game->info.resolution, localized.resolution.mode, true)));
+		m_game_list->setItem(row, gui::column_sound,      new custom_table_widget_item(GetStringFromU32(game->info.sound_format, localized.sound.format, true)));
+		m_game_list->setItem(row, gui::column_parental,   new custom_table_widget_item(GetStringFromU32(game->info.parental_lvl, localized.parental.level), Qt::UserRole, game->info.parental_lvl));
+		m_game_list->setItem(row, gui::column_last_play,  new custom_table_widget_item(locale.toString(last_played, gui::persistent::last_played_date_format_new), Qt::UserRole, last_played));
+		m_game_list->setItem(row, gui::column_playtime,   new custom_table_widget_item(elapsed_ms == 0 ? tr("Never played") : localized.GetVerboseTimeByMs(elapsed_ms), Qt::UserRole, elapsed_ms));
+		m_game_list->setItem(row, gui::column_compat,     compat_item);
+
+		if (selected_item == game->info.path + game->info.icon_path)
+		{
+			selected_row = row;
+		}
+
+		row++;
+	}
+
+	m_game_list->setRowCount(row);
+	m_game_list->selectRow(selected_row);
+}
+
+void game_list_frame::PopulateGameGrid(int maxCols, const QSize& image_size, const QColor& image_color)
+{
+	int r = 0;
+	int c = 0;
+
+	const std::string selected_item = CurrentSelectionPath();
+
+	m_game_grid->deleteLater();
+
+	const bool show_text = m_icon_size_index > gui::gl_max_slider_pos * 2 / 5;
+
+	if (m_icon_size_index < gui::gl_max_slider_pos * 2 / 3)
+	{
+		m_game_grid = new game_list_grid(image_size, image_color, m_margin_factor, m_text_factor * 2, show_text);
+	}
+	else
+	{
+		m_game_grid = new game_list_grid(image_size, image_color, m_margin_factor, m_text_factor, show_text);
+	}
+
+	// Get list of matching apps
+	QList<game_info> matching_apps;
+
+	for (const auto& app : m_game_data)
+	{
+		if (IsEntryVisible(app))
+		{
+			matching_apps.push_back(app);
+		}
+	}
+
+	const int entries = matching_apps.count();
+
+	// Edge cases!
+	if (entries == 0)
+	{ // For whatever reason, 0%x is division by zero. Absolute nonsense by definition of modulus. But, I'll acquiesce.
+		return;
+	}
+
+	maxCols = std::clamp(maxCols, 1, entries);
+
+	const int needs_extra_row = (entries % maxCols) != 0;
+	const int max_rows = needs_extra_row + entries / maxCols;
+	m_game_grid->setRowCount(max_rows);
+	m_game_grid->setColumnCount(maxCols);
+
+	const QString game_icon_path = m_play_hover_movies ? qstr(fs::get_config_dir() + "/Icons/game_icons/") : "";
+
+	for (const auto& app : matching_apps)
+	{
+		const QString serial = qstr(app->info.serial);
+		const QString title = m_titles.value(serial, qstr(app->info.name));
+		const QString notes = m_notes.value(serial);
+
+		movie_item* item = m_game_grid->addItem(app, title, (m_play_hover_movies && app->has_hover_gif) ? (game_icon_path % serial % "/hover.gif") : QStringLiteral(""), r, c);
+		ensure(item);
+		app->item = item;
+		item->setData(gui::game_role, QVariant::fromValue(app));
+
+		if (!notes.isEmpty())
+		{
+			item->setToolTip(tr("%0 [%1]\n\nNotes:\n%2").arg(title).arg(serial).arg(notes));
 		}
 		else
 		{
-			title_name = name.toLower();
+			item->setToolTip(tr("%0 [%1]").arg(title).arg(serial));
 		}
 
-		// Ignore trademarks when no search results have been yielded by unmodified search
-		static const QRegularExpression s_ignored_on_fallback(reinterpret_cast<const char*>(u8"[:\\-®©™]+"));
-
-		if (fallback)
+		if (selected_item == app->info.path + app->info.icon_path)
 		{
-			search_text = search_text.simplified();
-			title_name = title_name.simplified();
-
-			QString title_name_replaced_trademarks_with_spaces = title_name;
-			QString title_name_simplified = title_name;
-
-			search_text.remove(s_ignored_on_fallback);
-			title_name.remove(s_ignored_on_fallback);
-			title_name_replaced_trademarks_with_spaces.replace(s_ignored_on_fallback, " ");
-
-			// Before simplify to allow spaces in the beginning and end where ignored characters may have been
-			if (title_name_replaced_trademarks_with_spaces.contains(search_text))
-			{
-				return true;
-			}
-
-			title_name_replaced_trademarks_with_spaces = title_name_replaced_trademarks_with_spaces.simplified();
-
-			if (title_name_replaced_trademarks_with_spaces.contains(search_text))
-			{
-				return true;
-			}
-
-			// Initials-only search
-			if (search_text.size() >= 2 && search_text.count(QRegularExpression(QStringLiteral("[a-z0-9]"))) >= 2 && !search_text.contains(QRegularExpression(QStringLiteral("[^a-z0-9 ]"))))
-			{
-				QString initials = QStringLiteral("\\b");
-
-				for (auto it = search_text.begin(); it != search_text.end(); it++)
-				{
-					if (it->isSpace())
-					{
-						continue;
-					}
-
-					initials += *it;
-					initials += QStringLiteral("\\w*\\b ");
-				}
-
-				initials += QChar('?');
-
-				if (title_name_replaced_trademarks_with_spaces.contains(QRegularExpression(initials)))
-				{
-					return true;
-				}
-			}
+			m_game_grid->setCurrentItem(item);
 		}
 
-		return title_name.contains(search_text) || serial.toLower().contains(search_text);
+		if (++c >= maxCols)
+		{
+			c = 0;
+			r++;
+		}
+	}
+
+	if (c != 0)
+	{ // if left over games exist -- if empty entries exist
+		for (int col = c; col < maxCols; ++col)
+		{
+			movie_item* empty_item = new movie_item();
+			empty_item->setFlags(Qt::NoItemFlags);
+			m_game_grid->setItem(r, col, empty_item);
+		}
+	}
+
+	m_game_grid->resizeColumnsToContents();
+	m_game_grid->resizeRowsToContents();
+	m_game_grid->installEventFilter(this);
+	m_game_grid->verticalScrollBar()->installEventFilter(this);
+}
+
+/**
+* Returns false if the game should be hidden because it doesn't match search term in toolbar.
+*/
+bool game_list_frame::SearchMatchesApp(const QString& name, const QString& serial) const
+{
+	if (!m_search_text.isEmpty())
+	{
+		const QString search_text = m_search_text.toLower();
+		return m_titles.value(serial, name).toLower().contains(search_text) || serial.toLower().contains(search_text);
 	}
 	return true;
 }
@@ -2916,32 +2502,32 @@ std::string game_list_frame::CurrentSelectionPath()
 {
 	std::string selection;
 
-	game_info game{};
+	QTableWidgetItem* item = nullptr;
 
 	if (m_old_layout_is_list)
 	{
 		if (!m_game_list->selectedItems().isEmpty())
 		{
-			if (QTableWidgetItem* item = m_game_list->item(m_game_list->currentRow(), 0))
-			{
-				if (const QVariant var = item->data(gui::game_role); var.canConvert<game_info>())
-				{
-					game = var.value<game_info>();
-				}
-			}
+			item = m_game_list->item(m_game_list->currentRow(), 0);
 		}
 	}
-	else if (m_game_grid)
+	else
 	{
-		if (game_list_grid_item* item = static_cast<game_list_grid_item*>(m_game_grid->selected_item()))
+		if (!m_game_grid->selectedItems().isEmpty())
 		{
-			game = item->game();
+			item = m_game_grid->currentItem();
 		}
 	}
 
-	if (game)
+	if (item)
 	{
-		selection = game->info.path + game->info.icon_path;
+		if (const QVariant var = item->data(gui::game_role); var.canConvert<game_info>())
+		{
+			if (const game_info game = var.value<game_info>())
+			{
+				selection = game->info.path + game->info.icon_path;
+			}
+		}
 	}
 
 	m_old_layout_is_list = m_is_list_layout;
@@ -2949,6 +2535,36 @@ std::string game_list_frame::CurrentSelectionPath()
 	return selection;
 }
 
+std::string game_list_frame::GetStringFromU32(const u32& key, const std::map<u32, QString>& map, bool combined)
+{
+	QStringList string;
+
+	if (combined)
+	{
+		for (const auto& item : map)
+		{
+			if (key & item.first)
+			{
+				string << item.second;
+			}
+		}
+	}
+	else
+	{
+		if (map.find(key) != map.end())
+		{
+			string << map.at(key);
+		}
+	}
+
+	if (string.isEmpty())
+	{
+		string << tr("Unknown");
+	}
+
+	return sstr(string.join(", "));
+}
+
 game_info game_list_frame::GetGameInfoByMode(const QTableWidgetItem* item) const
 {
 	if (!item)
@@ -2958,7 +2574,7 @@ game_info game_list_frame::GetGameInfoByMode(const QTableWidgetItem* item) const
 
 	if (m_is_list_layout)
 	{
-		return GetGameInfoFromItem(m_game_list->item(item->row(), static_cast<int>(gui::game_list_columns::icon)));
+		return GetGameInfoFromItem(m_game_list->item(item->row(), gui::column_icon));
 	}
 
 	return GetGameInfoFromItem(item);
@@ -2980,6 +2596,15 @@ game_info game_list_frame::GetGameInfoFromItem(const QTableWidgetItem* item)
 	return var.value<game_info>();
 }
 
+QColor game_list_frame::getGridCompatibilityColor(const QString& string) const
+{
+	if (m_draw_compat_status_to_grid && !m_is_list_layout)
+	{
+		return QColor(string);
+	}
+	return QColor();
+}
+
 void game_list_frame::SetShowCompatibilityInGrid(bool show)
 {
 	m_draw_compat_status_to_grid = show;
@@ -2987,16 +2612,6 @@ void game_list_frame::SetShowCompatibilityInGrid(bool show)
 	m_gui_settings->SetValue(gui::gl_draw_compat, show);
 }
 
-void game_list_frame::SetPreferGameDataIcons(bool enabled)
-{
-	if (m_prefer_game_data_icons != enabled)
-	{
-		m_prefer_game_data_icons = enabled;
-		m_gui_settings->SetValue(gui::gl_pref_gd_icon, enabled);
-		Refresh(true);
-	}
-}
-
 void game_list_frame::SetShowCustomIcons(bool show)
 {
 	if (m_show_custom_icons != show)
@@ -3017,29 +2632,18 @@ void game_list_frame::SetPlayHoverGifs(bool play)
 	}
 }
 
-const std::vector<game_info>& game_list_frame::GetGameInfo() const
+QList<game_info> game_list_frame::GetGameInfo() const
 {
 	return m_game_data;
 }
 
-void game_list_frame::WaitAndAbortRepaintThreads()
+std::string game_list_frame::GetGameVersion(const game_info& game)
 {
-	for (const game_info& game : m_game_data)
+	if (game->info.app_ver == sstr(Localized().category.unknown))
 	{
-		if (game && game->item)
-		{
-			game->item->wait_for_icon_loading(true);
-		}
+		// Fall back to Disc/Pkg Revision
+		return game->info.version;
 	}
-}
 
-void game_list_frame::WaitAndAbortSizeCalcThreads()
-{
-	for (const game_info& game : m_game_data)
-	{
-		if (game && game->item)
-		{
-			game->item->wait_for_size_on_disk_loading(true);
-		}
-	}
+	return game->info.app_ver;
 }
diff --git a/rpcs3/rpcs3qt/game_list_frame.h b/rpcs3/rpcs3qt/game_list_frame.h
index 5e4156f09d..2b81f69036 100644
--- a/rpcs3/rpcs3qt/game_list_frame.h
+++ b/rpcs3/rpcs3qt/game_list_frame.h
@@ -2,11 +2,8 @@
 
 #include "game_list.h"
 #include "custom_dock_widget.h"
-#include "shortcut_utils.h"
+#include "gui_save.h"
 #include "Utilities/lockless.h"
-#include "Utilities/mutex.h"
-#include "util/auto_typemap.hpp"
-#include "Emu/config_mode.h"
 
 #include <QMainWindow>
 #include <QToolBar>
@@ -14,18 +11,13 @@
 #include <QSet>
 #include <QTableWidgetItem>
 #include <QFutureWatcher>
-#include <QTimer>
 
 #include <memory>
-#include <optional>
-#include <set>
 
-class game_list_table;
 class game_list_grid;
 class gui_settings;
 class emu_settings;
 class persistent_settings;
-class progress_dialog;
 
 class game_list_frame : public custom_dock_widget
 {
@@ -35,8 +27,14 @@ public:
 	explicit game_list_frame(std::shared_ptr<gui_settings> gui_settings, std::shared_ptr<emu_settings> emu_settings, std::shared_ptr<persistent_settings> persistent_settings, QWidget* parent = nullptr);
 	~game_list_frame();
 
+	/** Fix columns with width smaller than the minimal section size */
+	void FixNarrowColumns() const;
+
+	/** Resizes the columns to their contents and adds a small spacing */
+	void ResizeColumnsToContents(int spacing = 20) const;
+
 	/** Refresh the gamelist with/without loading game data from files. Public so that main frame can refresh after vfs or install */
-	void Refresh(const bool from_drive = false, const std::vector<std::string>& serials_to_remove_from_yml = {}, const bool scroll_after = true);
+	void Refresh(const bool from_drive = false, const bool scroll_after = true);
 
 	/** Adds/removes categories that should be shown on gamelist. Public so that main frame menu actions can apply them */
 	void ToggleCategoryFilter(const QStringList& categories, bool show);
@@ -57,14 +55,13 @@ public:
 
 	game_compatibility* GetGameCompatibility() const { return m_game_compat; }
 
-	const std::vector<game_info>& GetGameInfo() const;
+	QList<game_info> GetGameInfo() const;
 
-	void CreateShortcuts(const std::vector<game_info>& games, const std::set<gui::utils::shortcut_location>& locations);
-
-	bool IsEntryVisible(const game_info& game, bool search_fallback = false) const;
+	// Returns the visible version string in the game list
+	static std::string GetGameVersion(const game_info& game);
 
 public Q_SLOTS:
-	void BatchCreateCPUCaches(const std::vector<game_info>& game_data = {});
+	void BatchCreatePPUCaches();
 	void BatchRemovePPUCaches();
 	void BatchRemoveSPUCaches();
 	void BatchRemoveCustomConfigurations();
@@ -73,85 +70,57 @@ public Q_SLOTS:
 	void SetListMode(const bool& is_list);
 	void SetSearchText(const QString& text);
 	void SetShowCompatibilityInGrid(bool show);
-	void SetPreferGameDataIcons(bool enabled);
 	void SetShowCustomIcons(bool show);
 	void SetPlayHoverGifs(bool play);
-	void FocusAndSelectFirstEntryIfNoneIs();
 
 private Q_SLOTS:
-	void OnParsingFinished();
 	void OnRefreshFinished();
-	void OnCompatFinished();
+	void OnRepaintFinished();
 	void OnColClicked(int col);
 	void ShowContextMenu(const QPoint &pos);
-	void doubleClickedSlot(QTableWidgetItem* item);
-	void doubleClickedSlot(const game_info& game);
+	void doubleClickedSlot(QTableWidgetItem *item);
 	void ItemSelectionChangedSlot();
 Q_SIGNALS:
 	void GameListFrameClosed();
 	void NotifyGameSelection(const game_info& game);
-	void RequestBoot(const game_info& game, cfg_mode config_mode = cfg_mode::custom, const std::string& config_path = "", const std::string& savestate = "");
+	void RequestBoot(const game_info& game, bool force_global_config = false);
 	void RequestIconSizeChange(const int& val);
 	void NotifyEmuSettingsChange();
-	void FocusToSearchBar();
-	void Refreshed();
-
-public:
-	template <typename KeyType>
-	struct GameIdsTable
-	{
-		// List of game paths an operation has been done on for the use of the slot function
-		std::set<std::string> m_done_paths;
-	};
-
-	// Enqueue slot for refreshed signal
-	// Allowing for an individual container for each distinct use case (currently disabled and contains only one such entry)
-	template <typename KeySlot = void, typename Func>
-	void AddRefreshedSlot(Func&& func)
-	{
-		// NOTE: Remove assert when the need for individual containers arises
-		static_assert(std::is_void_v<KeySlot>);
-
-		connect(this, &game_list_frame::Refreshed, this, [this, func = std::move(func)]() mutable
-		{
-			func(m_refresh_funcs_manage_type->get<GameIdsTable<KeySlot>>().m_done_paths);
-		}, Qt::SingleShotConnection);
-	}
-
 protected:
 	/** Override inherited method from Qt to allow signalling when close happened.*/
 	void closeEvent(QCloseEvent* event) override;
+	void resizeEvent(QResizeEvent *event) override;
 	bool eventFilter(QObject *object, QEvent *event) override;
 private:
-	void push_path(const std::string& path, std::vector<std::string>& legit_paths);
+	QPixmap PaintedPixmap(const QPixmap& icon, bool paint_config_icon = false, bool paint_pad_config_icon = false, const QColor& color = QColor()) const;
+	QColor getGridCompatibilityColor(const QString& string) const;
 
+	/** Sets the custom config icon. Only call this for list title items. */
+	void SetCustomConfigIcon(QTableWidgetItem* title_item, const game_info& game);
 	void ShowCustomConfigIcon(const game_info& game);
-	bool SearchMatchesApp(const QString& name, const QString& serial, bool fallback = false) const;
+	void PopulateGameList();
+	void PopulateGameGrid(int maxCols, const QSize& image_size, const QColor& image_color);
+	bool IsEntryVisible(const game_info& game);
+	void SortGameList() const;
+	bool SearchMatchesApp(const QString& name, const QString& serial) const;
 
 	bool RemoveCustomConfiguration(const std::string& title_id, const game_info& game = nullptr, bool is_interactive = false);
 	bool RemoveCustomPadConfiguration(const std::string& title_id, const game_info& game = nullptr, bool is_interactive = false);
 	bool RemoveShadersCache(const std::string& base_dir, bool is_interactive = false);
 	bool RemovePPUCache(const std::string& base_dir, bool is_interactive = false);
 	bool RemoveSPUCache(const std::string& base_dir, bool is_interactive = false);
-	void RemoveHDD1Cache(const std::string& base_dir, const std::string& title_id, bool is_interactive = false);
-	static bool CreateCPUCaches(const std::string& path, const std::string& serial = {});
-	static bool CreateCPUCaches(const game_info& game);
+	static bool CreatePPUCache(const std::string& path, const std::string& serial = {});
+	static bool CreatePPUCache(const game_info& game);
 
-	static bool RemoveContentPath(const std::string& path, const std::string& desc);
-	static u32 RemoveContentPathList(const std::vector<std::string>& path_list, const std::string& desc);
-	static bool RemoveContentBySerial(const std::string& base_dir, const std::string& serial, const std::string& desc);
-	static std::vector<std::string> GetDirListBySerial(const std::string& base_dir, const std::string& serial);
-	void BatchActionBySerials(progress_dialog* pdlg, const std::set<std::string>& serials, QString progressLabel, std::function<bool(const std::string&)> action, std::function<void(u32, u32)> cancel_log, bool refresh_on_finish, bool can_be_concurrent = false, std::function<bool()> should_wait_cb = {});
+	QString GetLastPlayedBySerial(const QString& serial) const;
 	static std::string GetCacheDirBySerial(const std::string& serial);
 	static std::string GetDataDirBySerial(const std::string& serial);
 	std::string CurrentSelectionPath();
+	static std::string GetStringFromU32(const u32& key, const std::map<u32, QString>& map, bool combined = false);
 
 	game_info GetGameInfoByMode(const QTableWidgetItem* item) const;
 	static game_info GetGameInfoFromItem(const QTableWidgetItem* item);
 
-	void WaitAndAbortRepaintThreads();
-	void WaitAndAbortSizeCalcThreads();
-
 	// Which widget we are displaying depends on if we are in grid or list mode.
 	QMainWindow* m_game_dock = nullptr;
 	QStackedWidget* m_central_widget = nullptr;
@@ -160,19 +129,16 @@ private:
 	game_list_grid* m_game_grid = nullptr;
 
 	// Game List
-	game_list_table* m_game_list = nullptr;
+	game_list* m_game_list = nullptr;
 	game_compatibility* m_game_compat = nullptr;
-	progress_dialog* m_progress_dialog = nullptr;
 	QList<QAction*> m_columnActs;
-	Qt::SortOrder m_col_sort_order{};
-	int m_sort_column{};
-	bool m_initial_refresh_done = false;
-	std::map<QString, QString> m_notes;
-	std::map<QString, QString> m_titles;
+	Qt::SortOrder m_col_sort_order;
+	int m_sort_column;
+	QMap<QString, QString> m_notes;
+	QMap<QString, QString> m_titles;
 
 	// Categories
 	QStringList m_category_filters;
-	QStringList m_grid_category_filters;
 
 	// List Mode
 	bool m_is_list_layout = true;
@@ -182,22 +148,13 @@ private:
 	std::shared_ptr<gui_settings> m_gui_settings;
 	std::shared_ptr<emu_settings> m_emu_settings;
 	std::shared_ptr<persistent_settings> m_persistent_settings;
-	std::vector<game_info> m_game_data;
-	struct path_entry
-	{
-		std::string path;
-		bool is_disc{};
-		bool is_from_yml{};
-	};
-	std::vector<path_entry> m_path_entries;
-	shared_mutex m_path_mutex;
-	std::set<std::string> m_path_list;
+	QList<game_info> m_game_data;
+	std::vector<std::string> m_path_list;
 	QSet<QString> m_serials;
-	QMutex m_games_mutex;
+	QMutex m_mutex_cat;
 	lf_queue<game_info> m_games;
-	const std::array<int, 1> m_parsing_threads{0};
-	QFutureWatcher<void> m_parsing_watcher;
 	QFutureWatcher<void> m_refresh_watcher;
+	QFutureWatcher<movie_item*> m_repaint_watcher;
 	QSet<QString> m_hidden_list;
 	bool m_show_hidden{false};
 
@@ -213,8 +170,6 @@ private:
 	qreal m_margin_factor;
 	qreal m_text_factor;
 	bool m_draw_compat_status_to_grid = false;
-	bool m_prefer_game_data_icons = false;
 	bool m_show_custom_icons = true;
 	bool m_play_hover_movies = true;
-	std::optional<auto_typemap<game_list_frame>> m_refresh_funcs_manage_type{std::in_place};
 };
diff --git a/rpcs3/rpcs3qt/game_list_grid.cpp b/rpcs3/rpcs3qt/game_list_grid.cpp
index 4a762f288c..ee4e8aba28 100644
--- a/rpcs3/rpcs3qt/game_list_grid.cpp
+++ b/rpcs3/rpcs3qt/game_list_grid.cpp
@@ -1,215 +1,146 @@
-#include "stdafx.h"
 #include "game_list_grid.h"
-#include "game_list_grid_item.h"
-#include "gui_settings.h"
+#include "game_list_grid_delegate.h"
+#include "movie_item.h"
 #include "qt_utils.h"
-#include "Utilities/File.h"
 
-#include <QApplication>
-#include <QStringBuilder>
+#include <QHeaderView>
+#include <QScrollBar>
 
-game_list_grid::game_list_grid()
-	: flow_widget(nullptr), game_list_base()
+game_list_grid::game_list_grid(const QSize& icon_size, QColor icon_color, const qreal& margin_factor, const qreal& text_factor, const bool& showText)
+	: game_list()
+	, m_icon_size(icon_size)
+	, m_icon_color(std::move(icon_color))
+	, m_margin_factor(margin_factor)
+	, m_text_factor(text_factor)
+	, m_text_enabled(showText)
 {
-	setObjectName("game_list_grid");
+	setObjectName("game_grid");
+
+	QSize item_size;
+	if (m_text_enabled)
+	{
+		item_size = m_icon_size + QSize(m_icon_size.width() * m_margin_factor * 2, m_icon_size.height() * m_margin_factor * (m_text_factor + 1));
+	}
+	else
+	{
+		item_size = m_icon_size + m_icon_size * m_margin_factor * 2;
+	}
+
+	grid_item_delegate = new game_list_grid_delegate(item_size, m_margin_factor, m_text_factor, this);
+	setItemDelegate(grid_item_delegate);
+	setEditTriggers(QAbstractItemView::NoEditTriggers);
+	setSelectionBehavior(QAbstractItemView::SelectItems);
+	setSelectionMode(QAbstractItemView::SingleSelection);
+	setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+	setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
+	verticalScrollBar()->setSingleStep(20);
+	horizontalScrollBar()->setSingleStep(20);
 	setContextMenuPolicy(Qt::CustomContextMenu);
-
-	m_icon_ready_callback = [this](const movie_item_base* item)
-	{
-		Q_EMIT IconReady(item);
-	};
-
-	connect(this, &game_list_grid::IconReady, this, [this](const movie_item_base* item)
-	{
-		if (item) item->image_change_callback();
-	}, Qt::QueuedConnection); // The default 'AutoConnection' doesn't seem to work in this specific case...
-
-	connect(this, &flow_widget::ItemSelectionChanged, this, [this](int index)
-	{
-		if (game_list_grid_item* item = static_cast<game_list_grid_item*>(::at32(items(), index)))
-		{
-			Q_EMIT ItemSelectionChanged(item->game());
-		}
-	});
+	verticalHeader()->setVisible(false);
+	horizontalHeader()->setVisible(false);
+	setShowGrid(false);
+	setMouseTracking(true);
 }
 
-void game_list_grid::clear_list()
+void game_list_grid::enableText(const bool& enabled)
 {
-	clear();
+	m_text_enabled = enabled;
 }
 
-void game_list_grid::populate(
-	const std::vector<game_info>& game_data,
-	const std::map<QString, QString>& notes_map,
-	const std::map<QString, QString>& title_map,
-	const std::string& selected_item_id,
-	bool play_hover_movies)
+void game_list_grid::setIconSize(const QSize& size) const
 {
-	clear_list();
-
-	game_list_grid_item* selected_item = nullptr;
-
-	blockSignals(true);
-
-	const auto get_title = [&title_map](const QString& serial, const std::string& name) -> QString
+	if (m_text_enabled)
 	{
-		if (const auto it = title_map.find(serial); it != title_map.cend())
-		{
-			return it->second.simplified();
-		}
-
-		return QString::fromStdString(name).simplified();
-	};
-
-	for (const auto& game : game_data)
+		grid_item_delegate->setItemSize(size + QSize(size.width() * m_margin_factor * 2, size.height() * m_margin_factor * (m_text_factor + 1)));
+	}
+	else
 	{
-		const QString serial = QString::fromStdString(game->info.serial);
-		const QString title = get_title(serial, game->info.name);
+		grid_item_delegate->setItemSize(size + size * m_margin_factor * 2);
+	}
+}
 
-		game_list_grid_item* item = new game_list_grid_item(this, game, title);
-		item->installEventFilter(this);
-		item->setFocusPolicy(Qt::StrongFocus);
+movie_item* game_list_grid::addItem(const game_info& app, const QString& name, const QString& movie_path, const int& row, const int& col)
+{
+	// create item with expanded image, title and position
+	movie_item* item = new movie_item;
 
-		game->item = item;
+	item->set_icon_func([this, app, item](int)
+	{
+		ensure(item);
 
-		if (const auto it = notes_map.find(serial); it != notes_map.cend() && !it->second.isEmpty())
+		const qreal device_pixel_ratio = devicePixelRatioF();
+
+		// define size of expanded image, which is raw image size + margins
+		QSizeF exp_size_f;
+		if (m_text_enabled)
 		{
-			item->setToolTip(tr("%0 [%1]\n\nNotes:\n%2").arg(title).arg(serial).arg(it->second));
+			exp_size_f = m_icon_size + QSizeF(m_icon_size.width() * m_margin_factor * 2, m_icon_size.height() * m_margin_factor * (m_text_factor + 1));
 		}
 		else
 		{
-			item->setToolTip(tr("%0 [%1]").arg(title).arg(serial));
+			exp_size_f = m_icon_size + m_icon_size * m_margin_factor * 2;
 		}
 
-		item->set_image_change_callback([this, item, game](const QVideoFrame& frame)
+		QMovie* movie = item->movie();
+		const bool draw_movie_frame = movie && movie->isValid() && item->get_active();
+		const QSize exp_size = (exp_size_f * device_pixel_ratio).toSize();
+
+		// create empty canvas for expanded image
+		QImage exp_img(exp_size, QImage::Format_ARGB32);
+		exp_img.setDevicePixelRatio(device_pixel_ratio);
+		exp_img.fill(Qt::transparent);
+
+		// define offset for raw image placement
+		QPoint offset(m_icon_size.width() * m_margin_factor, m_icon_size.height() * m_margin_factor);
+
+		// place raw image inside expanded image
+		QPainter painter(&exp_img);
+		painter.setRenderHint(QPainter::SmoothPixmapTransform);
+
+		if (draw_movie_frame)
 		{
-			if (!item || !game)
-			{
-				return;
-			}
-
-			if (const QPixmap pixmap = item->get_movie_image(frame); item->get_active() && !pixmap.isNull())
-			{
-				item->set_icon(gui::utils::get_centered_pixmap(pixmap, m_icon_size, 0, 0, 1.0, Qt::FastTransformation));
-				return;
-			}
-
-			std::lock_guard lock(item->pixmap_mutex);
-
-			if (!game->pxmap.isNull())
-			{
-				item->set_icon(game->pxmap);
-
-				if (!game->has_hover_gif && !game->has_hover_pam)
-				{
-					game->pxmap = {};
-				}
-			}
-		});
-
-		if (play_hover_movies && (game->has_hover_gif || game->has_hover_pam))
+			const QPixmap scaled_movie_frame = movie->currentPixmap().scaled(m_icon_size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+			offset += QPoint(m_icon_size.width() / 2 - scaled_movie_frame.width() / 2,
+			                 m_icon_size.height() / 2 - scaled_movie_frame.height() / 2);
+			painter.drawPixmap(offset, scaled_movie_frame);
+		}
+		else
 		{
-			item->set_video_path(game->info.movie_path);
+			// create background for image
+			QImage bg_img(app->pxmap.size(), QImage::Format_ARGB32);
+			bg_img.setDevicePixelRatio(device_pixel_ratio);
+			bg_img.fill(m_icon_color);
+
+			painter.drawImage(offset, bg_img);
+			painter.drawPixmap(offset, app->pxmap);
+
+			if (movie)
+			{
+				movie->stop();
+			}
 		}
 
-		if (selected_item_id == game->info.path + game->info.icon_path)
-		{
-			selected_item = item;
-		}
+		painter.end();
 
-		add_widget(item);
+		// create item with expanded image, title and position
+		item->setData(Qt::ItemDataRole::DecorationRole, QPixmap::fromImage(exp_img));
+	});
+
+	if (!movie_path.isEmpty())
+	{
+		item->init_movie(movie_path);
 	}
 
-	blockSignals(false);
+	if (m_text_enabled)
+	{
+		item->setData(Qt::ItemDataRole::DisplayRole, name);
+	}
 
-	// Update layout before setting focus on the selected item
-	show();
-
-	QApplication::processEvents();
-
-	select_item(selected_item);
+	setItem(row, col, item);
+	return item;
 }
 
-void game_list_grid::repaint_icons(std::vector<game_info>& game_data, const QColor& icon_color, const QSize& icon_size, qreal device_pixel_ratio)
+qreal game_list_grid::getMarginFactor() const
 {
-	m_icon_size = icon_size;
-	m_icon_color = icon_color;
-
-	QPixmap placeholder(icon_size * device_pixel_ratio);
-	placeholder.setDevicePixelRatio(device_pixel_ratio);
-	placeholder.fill(Qt::transparent);
-
-	const bool show_title = m_icon_size.width() > (gui::gl_icon_size_medium.width() + gui::gl_icon_size_small.width()) / 2;
-
-	for (game_info& game : game_data)
-	{
-		if (game_list_grid_item* item = static_cast<game_list_grid_item*>(game->item))
-		{
-			if (item->icon_loading())
-			{
-				// We already have an icon. Simply set the icon size to let the label scale itself in a quick and dirty fashion.
-				item->set_icon_size(m_icon_size);
-			}
-			else
-			{
-				// We don't have an icon. Set a placeholder to initialize the layout.
-				game->pxmap = placeholder;
-				item->image_change_callback();
-			}
-
-			item->set_icon_load_func([this, game, device_pixel_ratio, cancel = item->icon_loading_aborted()](int)
-			{
-				IconLoadFunction(game, device_pixel_ratio, cancel);
-			});
-
-			item->adjust_size();
-			item->show_title(show_title);
-			item->got_visible = false;
-		}
-	}
-}
-
-void game_list_grid::FocusAndSelectFirstEntryIfNoneIs()
-{
-	if (!items().empty())
-	{
-		items().front()->setFocus();
-	}
-}
-
-bool game_list_grid::eventFilter(QObject* watched, QEvent* event)
-{
-	if (!event)
-	{
-		return false;
-	}
-
-	if (event->type() == QEvent::MouseButtonDblClick && static_cast<QMouseEvent*>(event)->button() == Qt::LeftButton)
-	{
-		if (game_list_grid_item* item = static_cast<game_list_grid_item*>(watched))
-		{
-			Q_EMIT ItemDoubleClicked(item->game());
-			return true;
-		}
-	}
-
-	return false;
-}
-
-void game_list_grid::keyPressEvent(QKeyEvent* event)
-{
-	if (!event)
-	{
-		return;
-	}
-
-	const auto modifiers = event->modifiers();
-
-	if (modifiers == Qt::ControlModifier && event->key() == Qt::Key_F && !event->isAutoRepeat())
-	{
-		Q_EMIT FocusToSearchBar();
-		return;
-	}
-
-	flow_widget::keyPressEvent(event);
+	return m_margin_factor;
 }
diff --git a/rpcs3/rpcs3qt/game_list_grid.h b/rpcs3/rpcs3qt/game_list_grid.h
index aaa1e267d3..dc5b336662 100644
--- a/rpcs3/rpcs3qt/game_list_grid.h
+++ b/rpcs3/rpcs3qt/game_list_grid.h
@@ -1,37 +1,28 @@
 #pragma once
 
-#include "game_list_base.h"
-#include "flow_widget.h"
+#include "game_list.h"
 
-#include <QKeyEvent>
+class game_list_grid_delegate;
 
-class game_list_grid : public flow_widget, public game_list_base
+class game_list_grid : public game_list
 {
 	Q_OBJECT
 
+	QSize m_icon_size;
+	QColor m_icon_color;
+	qreal m_margin_factor;
+	qreal m_text_factor;
+	bool m_text_enabled = true;
+
 public:
-	explicit game_list_grid();
+	explicit game_list_grid(const QSize& icon_size, QColor icon_color, const qreal& margin_factor, const qreal& text_factor, const bool& showText);
 
-	void clear_list() override;
+	void enableText(const bool& enabled);
+	void setIconSize(const QSize& size) const;
+	movie_item* addItem(const game_info& app, const QString& name, const QString& movie_path, const int& row, const int& col);
 
-	void populate(
-		const std::vector<game_info>& game_data,
-		const std::map<QString, QString>& notes_map,
-		const std::map<QString, QString>& title_map,
-		const std::string& selected_item_id,
-		bool play_hover_movies) override;
+	[[nodiscard]] qreal getMarginFactor() const;
 
-	void repaint_icons(std::vector<game_info>& game_data, const QColor& icon_color, const QSize& icon_size, qreal device_pixel_ratio) override;
-
-	bool eventFilter(QObject* watched, QEvent* event) override;
-	void keyPressEvent(QKeyEvent* event) override;
-
-public Q_SLOTS:
-	void FocusAndSelectFirstEntryIfNoneIs();
-
-Q_SIGNALS:
-	void FocusToSearchBar();
-	void ItemDoubleClicked(const game_info& game);
-	void ItemSelectionChanged(const game_info& game);
-	void IconReady(const movie_item_base* item);
+private:
+	game_list_grid_delegate* grid_item_delegate; 
 };
diff --git a/rpcs3/rpcs3qt/game_list_grid_delegate.cpp b/rpcs3/rpcs3qt/game_list_grid_delegate.cpp
new file mode 100644
index 0000000000..1ef4ef096e
--- /dev/null
+++ b/rpcs3/rpcs3qt/game_list_grid_delegate.cpp
@@ -0,0 +1,67 @@
+#include "game_list_grid_delegate.h"
+
+game_list_grid_delegate::game_list_grid_delegate(const QSize& size, const qreal& margin_factor, const qreal& text_factor, QObject *parent)
+	 : QStyledItemDelegate(parent), m_size(size), m_margin_factor(margin_factor), m_text_factor(text_factor)
+{
+}
+
+void game_list_grid_delegate::initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const
+{
+	Q_UNUSED(index)
+
+	// Remove the focus frame around selected items
+	option->state &= ~QStyle::State_HasFocus;
+
+	// Call initStyleOption without a model index, since we want to paint the relevant data ourselves
+	QStyledItemDelegate::initStyleOption(option, QModelIndex());
+}
+
+void game_list_grid_delegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+	const QRect r = option.rect;
+
+	painter->setRenderHints(QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform);
+	painter->eraseRect(r);
+
+	// Get title and image
+	const QPixmap image = qvariant_cast<QPixmap>(index.data(Qt::DecorationRole));
+	const QString title = index.data(Qt::DisplayRole).toString();
+
+	// Paint from our stylesheet
+	QStyledItemDelegate::paint(painter, option, index);
+
+	// image
+	if (image.isNull() == false)
+	{
+		painter->drawPixmap(option.rect, image);
+	}
+
+	const int h = r.height() / (1 + m_margin_factor + m_margin_factor * m_text_factor);
+	const int height = r.height() - h - h * m_margin_factor;
+	const int top = r.bottom() - height;
+
+	// title
+	if (option.state & QStyle::State_Selected)
+	{
+		painter->setPen(QPen(option.palette.color(QPalette::HighlightedText), 1, Qt::SolidLine));
+	}
+	else
+	{
+		painter->setPen(QPen(option.palette.color(QPalette::WindowText), 1, Qt::SolidLine));
+	}
+
+	painter->setFont(option.font);
+	painter->drawText(QRect(r.left(), top, r.width(), height), +Qt::TextWordWrap | +Qt::AlignCenter, title);
+}
+
+QSize game_list_grid_delegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+	Q_UNUSED(option)
+	Q_UNUSED(index)
+	return m_size;
+}
+
+void game_list_grid_delegate::setItemSize(const QSize& size)
+{
+	m_size = size;
+}
diff --git a/rpcs3/rpcs3qt/game_list_grid_delegate.h b/rpcs3/rpcs3qt/game_list_grid_delegate.h
new file mode 100644
index 0000000000..7ec6ecde76
--- /dev/null
+++ b/rpcs3/rpcs3qt/game_list_grid_delegate.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <QPainter>
+#include <QStyledItemDelegate>
+
+class game_list_grid_delegate : public QStyledItemDelegate
+{
+public:
+	game_list_grid_delegate(const QSize& imageSize, const qreal& margin_factor, const qreal& margin_ratio, QObject *parent = nullptr);
+
+	void initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const override;
+	void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+	QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const override;
+	void setItemSize(const QSize& size);
+private:
+	QSize m_size;
+	qreal m_margin_factor;
+	qreal m_text_factor;
+};
diff --git a/rpcs3/rpcs3qt/game_list_grid_item.cpp b/rpcs3/rpcs3qt/game_list_grid_item.cpp
deleted file mode 100644
index 928a5fa264..0000000000
--- a/rpcs3/rpcs3qt/game_list_grid_item.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#include "game_list_grid_item.h"
-
-#include <QVBoxLayout>
-#include <QStyle>
-
-game_list_grid_item::game_list_grid_item(QWidget* parent, game_info game, const QString& title)
-	: flow_widget_item(parent), movie_item_base(), m_game(std::move(game))
-{
-	setObjectName("game_list_grid_item");
-	setAttribute(Qt::WA_Hover); // We need to enable the hover attribute to ensure that hover events are handled.
-
-	cb_on_first_visibility = [this]()
-	{
-		if (!icon_loading())
-		{
-			call_icon_load_func(0);
-		}
-	};
-
-	m_icon_label = new QLabel(this);
-	m_icon_label->setObjectName("game_list_grid_item_icon_label");
-	m_icon_label->setAttribute(Qt::WA_TranslucentBackground);
-	m_icon_label->setScaledContents(true);
-
-	m_title_label = new QLabel(title, this);
-	m_title_label->setObjectName("game_list_grid_item_title_label");
-	m_title_label->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
-	m_title_label->setWordWrap(true);
-	m_title_label->setVisible(false);
-
-	QVBoxLayout* layout = new QVBoxLayout(this);
-	layout->addWidget(m_icon_label, 1);
-	layout->addWidget(m_title_label, 0);
-
-	setLayout(layout);
-}
-
-void game_list_grid_item::set_icon_size(const QSize& size)
-{
-	m_icon_size = size;
-}
-
-void game_list_grid_item::set_icon(const QPixmap& pixmap)
-{
-	m_icon_size = pixmap.size() / devicePixelRatioF();
-	m_icon_label->setPixmap(pixmap);
-}
-
-void game_list_grid_item::adjust_size()
-{
-	m_icon_label->setMinimumSize(m_icon_size);
-	m_icon_label->setMaximumSize(m_icon_size);
-	m_title_label->setMaximumWidth(m_icon_size.width());
-}
-
-void game_list_grid_item::show_title(bool visible)
-{
-	if (m_title_label)
-	{
-		m_title_label->setVisible(visible);
-	}
-}
-
-void game_list_grid_item::polish_style()
-{
-	flow_widget_item::polish_style();
-
-	m_title_label->style()->unpolish(m_title_label);
-	m_title_label->style()->polish(m_title_label);
-}
-
-bool game_list_grid_item::event(QEvent* event)
-{
-	switch (event->type())
-	{
-	case QEvent::HoverEnter:
-		set_active(true);
-		break;
-	case QEvent::HoverLeave:
-		set_active(false);
-		break;
-	default:
-		break;
-	}
-
-	return flow_widget_item::event(event);
-}
diff --git a/rpcs3/rpcs3qt/game_list_grid_item.h b/rpcs3/rpcs3qt/game_list_grid_item.h
deleted file mode 100644
index 7738548238..0000000000
--- a/rpcs3/rpcs3qt/game_list_grid_item.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include "flow_widget_item.h"
-#include "movie_item_base.h"
-#include "game_list_base.h"
-
-#include <QLabel>
-
-class game_list_grid_item : public flow_widget_item, public movie_item_base
-{
-	Q_OBJECT
-
-public:
-	game_list_grid_item(QWidget* parent, game_info game, const QString& title);
-
-	void set_icon_size(const QSize& size);
-	void set_icon(const QPixmap& pixmap);
-	void adjust_size();
-
-	const game_info& game() const
-	{
-		return m_game;
-	}
-
-	void show_title(bool visible);
-
-	void polish_style() override;
-
-	bool event(QEvent* event) override;
-
-private:
-	QSize m_icon_size{};
-	QLabel* m_icon_label{};
-	QLabel* m_title_label{};
-	game_info m_game{};
-};
diff --git a/rpcs3/rpcs3qt/game_list_table.cpp b/rpcs3/rpcs3qt/game_list_table.cpp
deleted file mode 100644
index 31950ab177..0000000000
--- a/rpcs3/rpcs3qt/game_list_table.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-#include "stdafx.h"
-#include "game_list_table.h"
-#include "game_list_delegate.h"
-#include "game_list_frame.h"
-#include "gui_settings.h"
-#include "localized.h"
-#include "custom_table_widget_item.h"
-#include "persistent_settings.h"
-#include "qt_utils.h"
-
-#include "Emu/vfs_config.h"
-#include "Utilities/StrUtil.h"
-
-#include <QHeaderView>
-#include <QScrollBar>
-#include <QStringBuilder>
-
-game_list_table::game_list_table(game_list_frame* frame, std::shared_ptr<persistent_settings> persistent_settings)
-	: game_list(), m_game_list_frame(frame), m_persistent_settings(std::move(persistent_settings))
-{
-	m_is_list_layout = true;
-
-	setShowGrid(false);
-	setItemDelegate(new game_list_delegate(this));
-	setEditTriggers(QAbstractItemView::NoEditTriggers);
-	setSelectionBehavior(QAbstractItemView::SelectRows);
-	setSelectionMode(QAbstractItemView::SingleSelection);
-	setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
-	setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
-	verticalScrollBar()->setSingleStep(20);
-	horizontalScrollBar()->setSingleStep(20);
-	verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
-	verticalHeader()->setVisible(false);
-	horizontalHeader()->setHighlightSections(false);
-	horizontalHeader()->setSortIndicatorShown(true);
-	horizontalHeader()->setStretchLastSection(true);
-	horizontalHeader()->setDefaultSectionSize(150);
-	horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
-	setContextMenuPolicy(Qt::CustomContextMenu);
-	setAlternatingRowColors(true);
-	setColumnCount(static_cast<int>(gui::game_list_columns::count));
-	setMouseTracking(true);
-
-	connect(this, &game_list_table::size_on_disk_ready, this, [this](const game_info& game)
-	{
-		if (!game || !game->item) return;
-		if (QTableWidgetItem* size_item = item(static_cast<movie_item*>(game->item)->row(), static_cast<int>(gui::game_list_columns::dir_size)))
-		{
-			const u64& game_size = game->info.size_on_disk;
-			size_item->setText(game_size != umax ? gui::utils::format_byte_size(game_size) : tr("Unknown"));
-			size_item->setData(Qt::UserRole, QVariant::fromValue<qulonglong>(game_size));
-		}
-	});
-
-	connect(this, &game_list::IconReady, this, [this](const movie_item_base* item)
-	{
-		if (item) item->image_change_callback();
-	});
-}
-
-void game_list_table::restore_layout(const QByteArray& state)
-{
-	// Resize to fit and get the ideal icon column width
-	resize_columns_to_contents();
-	const int icon_column_width = columnWidth(static_cast<int>(gui::game_list_columns::icon));
-
-	// Restore header layout from last session
-	if (!horizontalHeader()->restoreState(state) && rowCount())
-	{
-		// Nothing to do
-	}
-
-	// Make sure no columns are squished
-	fix_narrow_columns();
-
-	// Make sure that the icon column is large enough for the actual items.
-	// This is important if the list appeared as empty when closing the software before.
-	horizontalHeader()->resizeSection(static_cast<int>(gui::game_list_columns::icon), icon_column_width);
-
-	// Save new header state
-	horizontalHeader()->restoreState(horizontalHeader()->saveState());
-}
-
-void game_list_table::resize_columns_to_contents(int spacing)
-{
-	horizontalHeader()->resizeSections(QHeaderView::ResizeMode::ResizeToContents);
-
-	// Make non-icon columns slightly bigger for better visuals
-	for (int i = 1; i < columnCount(); i++)
-	{
-		if (isColumnHidden(i))
-		{
-			continue;
-		}
-
-		const int size = horizontalHeader()->sectionSize(i) + spacing;
-		horizontalHeader()->resizeSection(i, size);
-	}
-}
-
-void game_list_table::adjust_icon_column()
-{
-	// Fixate vertical header and row height
-	verticalHeader()->setDefaultSectionSize(m_icon_size.height());
-	verticalHeader()->setMinimumSectionSize(m_icon_size.height());
-	verticalHeader()->setMaximumSectionSize(m_icon_size.height());
-
-	// Resize the icon column
-	resizeColumnToContents(static_cast<int>(gui::game_list_columns::icon));
-
-	// Shorten the last section to remove horizontal scrollbar if possible
-	resizeColumnToContents(static_cast<int>(gui::game_list_columns::count) - 1);
-}
-
-void game_list_table::sort(usz game_count, int sort_column, Qt::SortOrder col_sort_order)
-{
-	// Back-up old header sizes to handle unwanted column resize in case of zero search results
-	const int old_row_count = rowCount();
-	const usz old_game_count = game_count;
-
-	std::vector<int> column_widths(columnCount());
-	for (int i = 0; i < columnCount(); i++)
-	{
-		column_widths[i] = columnWidth(i);
-	}
-
-	// Sorting resizes hidden columns, so unhide them as a workaround
-	std::vector<int> columns_to_hide;
-
-	for (int i = 0; i < columnCount(); i++)
-	{
-		if (isColumnHidden(i))
-		{
-			setColumnHidden(i, false);
-			columns_to_hide.push_back(i);
-		}
-	}
-
-	// Sort the list by column and sort order
-	sortByColumn(sort_column, col_sort_order);
-
-	// Hide columns again
-	for (int col : columns_to_hide)
-	{
-		setColumnHidden(col, true);
-	}
-
-	// Don't resize the columns if no game is shown to preserve the header settings
-	if (!rowCount())
-	{
-		for (int i = 0; i < columnCount(); i++)
-		{
-			setColumnWidth(i, column_widths[i]);
-		}
-
-		horizontalHeader()->setSectionResizeMode(static_cast<int>(gui::game_list_columns::icon), QHeaderView::Fixed);
-		return;
-	}
-
-	// Fixate vertical header and row height
-	verticalHeader()->setDefaultSectionSize(m_icon_size.height());
-	verticalHeader()->setMinimumSectionSize(m_icon_size.height());
-	verticalHeader()->setMaximumSectionSize(m_icon_size.height());
-
-	// Resize columns if the game list was empty before
-	if (!old_row_count && !old_game_count)
-	{
-		resize_columns_to_contents();
-	}
-	else
-	{
-		resizeColumnToContents(static_cast<int>(gui::game_list_columns::icon));
-	}
-
-	// Fixate icon column
-	horizontalHeader()->setSectionResizeMode(static_cast<int>(gui::game_list_columns::icon), QHeaderView::Fixed);
-
-	// Shorten the last section to remove horizontal scrollbar if possible
-	resizeColumnToContents(static_cast<int>(gui::game_list_columns::count) - 1);
-}
-
-void game_list_table::set_custom_config_icon(const game_info& game)
-{
-	if (!game)
-	{
-		return;
-	}
-
-	const QString serial = QString::fromStdString(game->info.serial);
-
-	for (int row = 0; row < rowCount(); ++row)
-	{
-		if (QTableWidgetItem* title_item = item(row, static_cast<int>(gui::game_list_columns::name)))
-		{
-			if (const QTableWidgetItem* serial_item = item(row, static_cast<int>(gui::game_list_columns::serial)); serial_item && serial_item->text() == serial)
-			{
-				title_item->setIcon(game_list_base::GetCustomConfigIcon(game));
-			}
-		}
-	}
-}
-
-void game_list_table::populate(
-	const std::vector<game_info>& game_data,
-	const std::map<QString, QString>& notes_map,
-	const std::map<QString, QString>& title_map,
-	const std::string& selected_item_id,
-	bool play_hover_movies)
-{
-	clear_list();
-
-	setRowCount(::narrow<int>(game_data.size()));
-
-	// Default locale. Uses current Qt application language.
-	const QLocale locale{};
-	const Localized localized;
-
-	const std::string dev_flash = g_cfg_vfs.get_dev_flash();
-
-	int row = 0;
-	int index = -1;
-	int selected_row = -1;
-
-	const auto get_title = [&title_map](const QString& serial, const std::string& name) -> QString
-	{
-		if (const auto it = title_map.find(serial); it != title_map.cend())
-		{
-			return it->second;
-		}
-
-		return QString::fromStdString(name);
-	};
-
-	for (const auto& game : game_data)
-	{
-		index++;
-
-		const QString serial = QString::fromStdString(game->info.serial);
-		const QString title = get_title(serial, game->info.name);
-
-		// Icon
-		custom_table_widget_item* icon_item = new custom_table_widget_item;
-		game->item = icon_item;
-
-		icon_item->set_image_change_callback([this, icon_item, game](const QVideoFrame& frame)
-		{
-			if (!icon_item || !game)
-			{
-				return;
-			}
-
-			if (const QPixmap pixmap = icon_item->get_movie_image(frame); icon_item->get_active() && !pixmap.isNull())
-			{
-				icon_item->setData(Qt::DecorationRole, pixmap.scaled(m_icon_size, Qt::KeepAspectRatio));
-				return;
-			}
-
-			std::lock_guard lock(icon_item->pixmap_mutex);
-
-			if (!game->pxmap.isNull())
-			{
-				icon_item->setData(Qt::DecorationRole, game->pxmap);
-
-				if (!game->has_hover_gif && !game->has_hover_pam)
-				{
-					game->pxmap = {};
-				}
-			}
-		});
-
-		icon_item->set_size_calc_func([this, game, cancel = icon_item->size_on_disk_loading_aborted(), dev_flash]()
-		{
-			if (game && game->info.size_on_disk == umax && (!cancel || !cancel->load()))
-			{
-				if (game->info.path.starts_with(dev_flash))
-				{
-					// Do not report size of apps inside /dev_flash (it does not make sense to do so)
-					game->info.size_on_disk = 0;
-				}
-				else
-				{
-					game->info.size_on_disk = fs::get_dir_size(game->info.path, 1, cancel.get());
-				}
-
-				if (!cancel || !cancel->load())
-				{
-					Q_EMIT size_on_disk_ready(game);
-					return;
-				}
-			}
-		});
-
-		if (play_hover_movies && (game->has_hover_gif || game->has_hover_pam))
-		{
-			icon_item->set_video_path(game->info.movie_path);
-		}
-
-		icon_item->setData(Qt::UserRole, index, true);
-		icon_item->setData(gui::custom_roles::game_role, QVariant::fromValue(game));
-
-		// Title
-		custom_table_widget_item* title_item = new custom_table_widget_item(title);
-		title_item->setIcon(game_list_base::GetCustomConfigIcon(game));
-
-		// Serial
-		custom_table_widget_item* serial_item = new custom_table_widget_item(game->info.serial);
-
-		if (const auto it = notes_map.find(serial); it != notes_map.cend() && !it->second.isEmpty())
-		{
-			const QString tool_tip = tr("%0 [%1]\n\nNotes:\n%2").arg(title).arg(serial).arg(it->second);
-			title_item->setToolTip(tool_tip);
-			serial_item->setToolTip(tool_tip);
-		}
-
-		// Move Support (http://www.psdevwiki.com/ps3/PARAM.SFO#ATTRIBUTE)
-		const bool supports_move = game->info.attr & 0x800000;
-
-		// Compatibility
-		custom_table_widget_item* compat_item = new custom_table_widget_item;
-		compat_item->setText(game->compat.text % (game->compat.date.isEmpty() ? QStringLiteral("") : " (" % game->compat.date % ")"));
-		compat_item->setData(Qt::UserRole, game->compat.index, true);
-		compat_item->setToolTip(game->compat.tooltip);
-		if (!game->compat.color.isEmpty())
-		{
-			compat_item->setData(Qt::DecorationRole, gui::utils::circle_pixmap(game->compat.color, devicePixelRatioF() * 2));
-		}
-
-		// Version
-		QString app_version = QString::fromStdString(game->GetGameVersion());
-
-		if (game->info.bootable && !game->compat.latest_version.isEmpty())
-		{
-			f64 top_ver = 0.0, app_ver = 0.0;
-			const bool unknown = app_version == localized.category.unknown;
-			const bool ok_app = !unknown && try_to_float(&app_ver, app_version.toStdString(), ::std::numeric_limits<s32>::min(), ::std::numeric_limits<s32>::max());
-			const bool ok_top = !unknown && try_to_float(&top_ver, game->compat.latest_version.toStdString(), ::std::numeric_limits<s32>::min(), ::std::numeric_limits<s32>::max());
-
-			// If the app is bootable and the compat database contains info about the latest patch version:
-			// add a hint for available software updates if the app version is unknown or lower than the latest version.
-			if (unknown || (ok_top && ok_app && top_ver > app_ver))
-			{
-				app_version = tr("%0 (Update available: %1)").arg(app_version, game->compat.latest_version);
-			}
-		}
-
-		// Playtimes
-		const quint64 elapsed_ms = m_persistent_settings->GetPlaytime(serial);
-
-		// Last played (support outdated values)
-		QDateTime last_played;
-		const QString last_played_str = m_persistent_settings->GetLastPlayed(serial);
-
-		if (!last_played_str.isEmpty())
-		{
-			last_played = QDateTime::fromString(last_played_str, gui::persistent::last_played_date_format);
-
-			if (!last_played.isValid())
-			{
-				last_played = QDateTime::fromString(last_played_str, gui::persistent::last_played_date_format_old);
-			}
-		}
-
-		const u64 game_size = game->info.size_on_disk;
-
-		setItem(row, static_cast<int>(gui::game_list_columns::icon),       icon_item);
-		setItem(row, static_cast<int>(gui::game_list_columns::name),       title_item);
-		setItem(row, static_cast<int>(gui::game_list_columns::serial),     serial_item);
-		setItem(row, static_cast<int>(gui::game_list_columns::firmware),   new custom_table_widget_item(game->info.fw));
-		setItem(row, static_cast<int>(gui::game_list_columns::version),    new custom_table_widget_item(app_version));
-		setItem(row, static_cast<int>(gui::game_list_columns::category),   new custom_table_widget_item(game->localized_category));
-		setItem(row, static_cast<int>(gui::game_list_columns::path),       new custom_table_widget_item(game->info.path));
-		setItem(row, static_cast<int>(gui::game_list_columns::move),       new custom_table_widget_item((supports_move ? tr("Supported") : tr("Not Supported")).toStdString(), Qt::UserRole, !supports_move));
-		setItem(row, static_cast<int>(gui::game_list_columns::resolution), new custom_table_widget_item(Localized::GetStringFromU32(game->info.resolution, localized.resolution.mode, true)));
-		setItem(row, static_cast<int>(gui::game_list_columns::sound),      new custom_table_widget_item(Localized::GetStringFromU32(game->info.sound_format, localized.sound.format, true)));
-		setItem(row, static_cast<int>(gui::game_list_columns::parental),   new custom_table_widget_item(Localized::GetStringFromU32(game->info.parental_lvl, localized.parental.level), Qt::UserRole, game->info.parental_lvl));
-		setItem(row, static_cast<int>(gui::game_list_columns::last_play),  new custom_table_widget_item(locale.toString(last_played, last_played >= QDateTime::currentDateTime().addDays(-7) ? gui::persistent::last_played_date_with_time_of_day_format : gui::persistent::last_played_date_format_new), Qt::UserRole, last_played));
-		setItem(row, static_cast<int>(gui::game_list_columns::playtime),   new custom_table_widget_item(elapsed_ms == 0 ? tr("Never played") : localized.GetVerboseTimeByMs(elapsed_ms), Qt::UserRole, elapsed_ms));
-		setItem(row, static_cast<int>(gui::game_list_columns::compat),     compat_item);
-		setItem(row, static_cast<int>(gui::game_list_columns::dir_size),   new custom_table_widget_item(game_size != umax ? gui::utils::format_byte_size(game_size) : tr("Unknown"), Qt::UserRole, QVariant::fromValue<qulonglong>(game_size)));
-
-		if (selected_item_id == game->info.path + game->info.icon_path)
-		{
-			selected_row = row;
-		}
-
-		row++;
-	}
-
-	selectRow(selected_row);
-}
-
-void game_list_table::repaint_icons(std::vector<game_info>& game_data, const QColor& icon_color, const QSize& icon_size, qreal device_pixel_ratio)
-{
-	game_list_base::repaint_icons(game_data, icon_color, icon_size, device_pixel_ratio);
-	adjust_icon_column();
-}
diff --git a/rpcs3/rpcs3qt/game_list_table.h b/rpcs3/rpcs3qt/game_list_table.h
deleted file mode 100644
index e3d6930342..0000000000
--- a/rpcs3/rpcs3qt/game_list_table.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include "game_list.h"
-
-class persistent_settings;
-class game_list_frame;
-
-class game_list_table : public game_list
-{
-	Q_OBJECT
-
-public:
-	game_list_table(game_list_frame* frame, std::shared_ptr<persistent_settings> persistent_settings);
-
-	/** Restores the initial layout of the table */
-	void restore_layout(const QByteArray& state);
-
-	/** Resizes the columns to their contents and adds a small spacing */
-	void resize_columns_to_contents(int spacing = 20);
-
-	void adjust_icon_column();
-
-	void sort(usz game_count, int sort_column, Qt::SortOrder col_sort_order);
-
-	void set_custom_config_icon(const game_info& game);
-
-	void populate(
-		const std::vector<game_info>& game_data,
-		const std::map<QString, QString>& notes_map,
-		const std::map<QString, QString>& title_map,
-		const std::string& selected_item_id,
-		bool play_hover_movies) override;
-
-	void repaint_icons(std::vector<game_info>& game_data, const QColor& icon_color, const QSize& icon_size, qreal device_pixel_ratio) override;
-
-Q_SIGNALS:
-	void size_on_disk_ready(const game_info& game);
-
-private:
-	game_list_frame* m_game_list_frame{};
-	std::shared_ptr<persistent_settings> m_persistent_settings;
-};
diff --git a/rpcs3/rpcs3qt/gl_gs_frame.cpp b/rpcs3/rpcs3qt/gl_gs_frame.cpp
index 94b6aa964f..e1f48ba6c4 100644
--- a/rpcs3/rpcs3qt/gl_gs_frame.cpp
+++ b/rpcs3/rpcs3qt/gl_gs_frame.cpp
@@ -1,36 +1,25 @@
 #include "gl_gs_frame.h"
 
-#include "Emu/System.h"
 #include "Emu/system_config.h"
 
 #include <QOpenGLContext>
 #include <QOffscreenSurface>
 
-gl_gs_frame::gl_gs_frame(QScreen* screen, const QRect& geometry, const QIcon& appIcon, std::shared_ptr<gui_settings> gui_settings, bool force_fullscreen)
-	: gs_frame(screen, geometry, appIcon, std::move(gui_settings), force_fullscreen)
+gl_gs_frame::gl_gs_frame(QScreen* screen, const QRect& geometry, const QIcon& appIcon, std::shared_ptr<gui_settings> gui_settings)
+	: gs_frame(screen, geometry, appIcon, std::move(gui_settings))
 {
 	setSurfaceType(QSurface::OpenGLSurface);
 
-	m_format.setRenderableType(QSurfaceFormat::OpenGL);
 	m_format.setMajorVersion(4);
 	m_format.setMinorVersion(3);
 	m_format.setProfile(QSurfaceFormat::CoreProfile);
-	m_format.setAlphaBufferSize(0);
 	m_format.setDepthBufferSize(0);
 	m_format.setSwapBehavior(QSurfaceFormat::SwapBehavior::DoubleBuffer);
-	m_format.setSwapInterval(0);
 	if (g_cfg.video.debug_output)
 	{
 		m_format.setOption(QSurfaceFormat::FormatOption::DebugContext);
 	}
 	setFormat(m_format);
-	create();
-	show();
-}
-
-void gl_gs_frame::reset()
-{
-	m_primary_context = nullptr;
 }
 
 draw_context_t gl_gs_frame::make_context()
@@ -40,15 +29,9 @@ draw_context_t gl_gs_frame::make_context()
 
 	if (m_primary_context)
 	{
-		QOffscreenSurface* surface = nullptr;
-
-		// Workaround for the Qt warning: "Attempting to create QWindow-based QOffscreenSurface outside the gui thread. Expect failures."
-		Emu.BlockingCallFromMainThread([&]()
-		{
-			surface = new QOffscreenSurface();
-			surface->setFormat(m_format);
-			surface->create();
-		});
+		auto surface = new QOffscreenSurface();
+		surface->setFormat(m_format);
+		surface->create();
 
 		// Share resources with the first created context
 		context->handle->setShareContext(m_primary_context->handle);
@@ -64,11 +47,7 @@ draw_context_t gl_gs_frame::make_context()
 	}
 
 	context->handle->setFormat(m_format);
-
-	if (!context->handle->create())
-	{
-		fmt::throw_exception("Failed to create OpenGL context");
-	}
+	context->handle->create();
 
 	return context;
 }
@@ -90,10 +69,7 @@ void gl_gs_frame::set_current(draw_context_t ctx)
 		}
 		else if (!context->handle->isValid())
 		{
-			if (!context->handle->create())
-			{
-				fmt::throw_exception("Failed to create OpenGL context");
-			}
+			context->handle->create();
 		}
 
 		if (!context->handle->makeCurrent(context->surface))
@@ -141,8 +117,5 @@ void gl_gs_frame::flip(draw_context_t context, bool skip_frame)
 
 	const auto gl_ctx = static_cast<GLContext*>(context);
 
-	if (auto window = dynamic_cast<QWindow*>(gl_ctx->surface); window && window->isExposed())
-	{
-		gl_ctx->handle->swapBuffers(gl_ctx->surface);
-	}
+	gl_ctx->handle->swapBuffers(gl_ctx->surface);
 }
diff --git a/rpcs3/rpcs3qt/gl_gs_frame.h b/rpcs3/rpcs3qt/gl_gs_frame.h
index d1129f8e3a..50f09f634d 100644
--- a/rpcs3/rpcs3qt/gl_gs_frame.h
+++ b/rpcs3/rpcs3qt/gl_gs_frame.h
@@ -18,9 +18,8 @@ private:
 	GLContext *m_primary_context = nullptr;
 
 public:
-	explicit gl_gs_frame(QScreen* screen, const QRect& geometry, const QIcon& appIcon, std::shared_ptr<gui_settings> gui_settings, bool force_fullscreen);
+	explicit gl_gs_frame(QScreen* screen, const QRect& geometry, const QIcon& appIcon, std::shared_ptr<gui_settings> gui_settings);
 
-	void reset() override;
 	draw_context_t make_context() override;
 	void set_current(draw_context_t ctx) override;
 	void delete_context(draw_context_t ctx) override;
diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp
index 8cd2a2bc9b..fe116c5831 100644
--- a/rpcs3/rpcs3qt/gs_frame.cpp
+++ b/rpcs3/rpcs3qt/gs_frame.cpp
@@ -5,21 +5,13 @@
 #include "Utilities/Timer.h"
 #include "Utilities/date_time.h"
 #include "Utilities/File.h"
-#include "util/video_provider.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"
-#include "Emu/system_progress.hpp"
 #include "Emu/IdManager.h"
-#include "Emu/Audio/audio_utils.h"
 #include "Emu/Cell/Modules/cellScreenshot.h"
-#include "Emu/Cell/Modules/cellAudio.h"
-#include "Emu/Cell/lv2/sys_rsxaudio.h"
 #include "Emu/RSX/rsx_utils.h"
-#include "Emu/RSX/Overlays/overlay_message.h"
-#include "Emu/Io/interception.h"
-#include "Emu/Io/recording_config.h"
 
-#include <QApplication>
+#include <QCoreApplication>
 #include <QDateTime>
 #include <QKeyEvent>
 #include <QMessageBox>
@@ -36,7 +28,7 @@
 #elif defined(__APPLE__)
 //nothing
 #else
-#ifdef HAVE_WAYLAND
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
 #include <QGuiApplication>
 #include <qpa/qplatformnativeinterface.h>
 #endif
@@ -45,39 +37,34 @@
 #endif
 #endif
 
+#ifdef _WIN32
+#include <QWinTHumbnailToolbutton>
+#elif HAVE_QTDBUS
+#include <QtDBus/QDBusMessage>
+#include <QtDBus/QDBusConnection>
+#endif
+
 LOG_CHANNEL(screenshot_log, "SCREENSHOT");
 LOG_CHANNEL(mark_log, "MARK");
-LOG_CHANNEL(gui_log, "GUI");
 
-extern atomic_t<bool> g_user_asked_for_recording;
-extern atomic_t<bool> g_user_asked_for_screenshot;
 extern atomic_t<bool> g_user_asked_for_frame_capture;
-extern atomic_t<bool> g_disable_frame_limit;
-extern atomic_t<bool> g_game_window_focused;
-extern atomic_t<recording_mode> g_recording_mode;
 
-namespace pad
-{
-	extern atomic_t<bool> g_home_menu_requested;
-}
+constexpr auto qstr = QString::fromStdString;
 
-gs_frame::gs_frame(QScreen* screen, const QRect& geometry, const QIcon& appIcon, std::shared_ptr<gui_settings> gui_settings, bool force_fullscreen)
+gs_frame::gs_frame(QScreen* screen, const QRect& geometry, const QIcon& appIcon, std::shared_ptr<gui_settings> gui_settings)
 	: QWindow()
 	, m_initial_geometry(geometry)
 	, m_gui_settings(std::move(gui_settings))
-	, m_start_games_fullscreen(force_fullscreen)
-	, m_renderer(g_cfg.video.renderer)
 {
+	m_disable_mouse = m_gui_settings->GetValue(gui::gs_disableMouse).toBool();
+	m_disable_kb_hotkeys = m_gui_settings->GetValue(gui::gs_disableKbHotkeys).toBool();
+	m_show_mouse_in_fullscreen = m_gui_settings->GetValue(gui::gs_showMouseFs).toBool();
+	m_lock_mouse_in_fullscreen  = m_gui_settings->GetValue(gui::gs_lockMouseFs).toBool();
+	m_hide_mouse_after_idletime = m_gui_settings->GetValue(gui::gs_hideMouseIdle).toBool();
+	m_hide_mouse_idletime = m_gui_settings->GetValue(gui::gs_hideMouseIdleTime).toUInt();
+
 	m_window_title = Emu.GetFormattedTitle(0);
 
-	if (!g_cfg_recording.load())
-	{
-		gui_log.notice("Could not load recording config. Using defaults.");
-	}
-
-	g_fxo->need<utils::video_provider>();
-	m_video_encoder = std::make_shared<utils::video_encoder>();
-
 	if (!appIcon.isNull())
 	{
 		setIcon(appIcon);
@@ -109,90 +96,53 @@ gs_frame::gs_frame(QScreen* screen, const QRect& geometry, const QIcon& appIcon,
 	setMinimumHeight(90);
 	setScreen(screen);
 	setGeometry(geometry);
-	setTitle(QString::fromStdString(m_window_title));
-
-	if (g_cfg.video.renderer != video_renderer::opengl)
-	{
-		// Do not display the window before OpenGL is configured!
-		// This works fine in windows and X11 but wayland-egl will crash later.
-		setVisibility(startup_visibility);
-		create();
-	}
-
-	load_gui_settings();
+	setTitle(qstr(m_window_title));
+	setVisibility(startup_visibility);
+	create();
 
 	// Change cursor when in fullscreen.
 	connect(this, &QWindow::visibilityChanged, this, [this](QWindow::Visibility visibility)
 	{
-		handle_cursor(visibility, true, false, true);
+		handle_cursor(visibility, true, true);
 	});
 
 	// Change cursor when this window gets or loses focus.
 	connect(this, &QWindow::activeChanged, this, [this]()
 	{
-		g_game_window_focused = isActive();
-		handle_cursor(visibility(), false, true, true);
+		handle_cursor(visibility(), false, true);
 	});
 
 	// Configure the mouse hide on idle timer
-	connect(&m_mousehide_timer, &QTimer::timeout, this, &gs_frame::mouse_hide_timeout);
+	connect(&m_mousehide_timer, &QTimer::timeout, this, &gs_frame::MouseHideTimeout);
 	m_mousehide_timer.setSingleShot(true);
 
-	m_progress_indicator = std::make_unique<progress_indicator>(0, 100);
+#ifdef _WIN32
+	m_tb_button = new QWinTaskbarButton();
+	m_tb_progress = m_tb_button->progress();
+	m_tb_progress->setRange(0, m_gauge_max);
+	m_tb_progress->setVisible(false);
+
+#elif HAVE_QTDBUS
+	UpdateProgress(0);
+	m_progress_value = 0;
+#endif
 }
 
 gs_frame::~gs_frame()
 {
-	g_user_asked_for_screenshot = false;
-	pad::g_home_menu_requested = false;
-
-	// Save active screen to gui settings
-	const QScreen* current_screen = screen();
-	const QList<QScreen*> screens = QGuiApplication::screens();
-	int screen_index = 0;
-
-	for (int i = 0; i < screens.count(); i++)
+#ifdef _WIN32
+	// QWinTaskbarProgress::hide() will crash if the application is already about to close, even if the object is not null.
+	if (m_tb_progress && !QCoreApplication::closingDown())
 	{
-		if (current_screen == ::at32(screens, i))
-		{
-			screen_index = i;
-			break;
-		}
+		m_tb_progress->hide();
 	}
-
-	m_gui_settings->SetValue(gui::gs_screen, screen_index);
-}
-
-void gs_frame::load_gui_settings()
-{
-	m_disable_mouse = m_gui_settings->GetValue(gui::gs_disableMouse).toBool();
-	m_disable_kb_hotkeys = m_gui_settings->GetValue(gui::gs_disableKbHotkeys).toBool();
-	m_show_mouse_in_fullscreen = m_gui_settings->GetValue(gui::gs_showMouseFs).toBool();
-	m_lock_mouse_in_fullscreen  = m_gui_settings->GetValue(gui::gs_lockMouseFs).toBool();
-	m_hide_mouse_after_idletime = m_gui_settings->GetValue(gui::gs_hideMouseIdle).toBool();
-	m_hide_mouse_idletime = m_gui_settings->GetValue(gui::gs_hideMouseIdleTime).toUInt();
-
-	if (m_disable_kb_hotkeys)
+	if (m_tb_button)
 	{
-		if (m_shortcut_handler)
-		{
-			m_shortcut_handler->deleteLater();
-			m_shortcut_handler = nullptr;
-		}
-	}
-	else if (!m_shortcut_handler)
-	{
-		m_shortcut_handler = new shortcut_handler(gui::shortcuts::shortcut_handler_id::game_window, this, m_gui_settings);
-		connect(m_shortcut_handler, &shortcut_handler::shortcut_activated, this, &gs_frame::handle_shortcut);
-	}
-}
-
-void gs_frame::update_shortcuts()
-{
-	if (m_shortcut_handler)
-	{
-		m_shortcut_handler->update();
+		m_tb_button->deleteLater();
 	}
+#elif HAVE_QTDBUS
+	UpdateProgress(0, false);
+#endif
 }
 
 void gs_frame::paintEvent(QPaintEvent *event)
@@ -243,147 +193,89 @@ void gs_frame::showEvent(QShowEvent *event)
 	QWindow::showEvent(event);
 }
 
-void gs_frame::handle_shortcut(gui::shortcuts::shortcut shortcut_key, const QKeySequence& key_sequence)
+void gs_frame::keyPressEvent(QKeyEvent *keyEvent)
 {
-	gui_log.notice("Game window registered shortcut: %s (%s)", shortcut_key, key_sequence.toString());
-
-	if (m_disable_kb_hotkeys)
+	if (keyEvent->isAutoRepeat())
 	{
+		keyEvent->ignore();
 		return;
 	}
 
-	switch (shortcut_key)
+	// NOTE: needs to be updated with keyboard_pad_handler::processKeyEvent
+
+	switch (keyEvent->key())
 	{
-	case gui::shortcuts::shortcut::gw_toggle_fullscreen:
-	{
-		toggle_fullscreen();
+	case Qt::Key_L:
+		if (keyEvent->modifiers() == Qt::AltModifier)
+		{
+			static int count = 0;
+			mark_log.success("Made forced mark %d in log", ++count);
+			return;
+		}
+		else if (keyEvent->modifiers() == Qt::ControlModifier)
+		{
+			toggle_mouselock();
+			return;
+		}
 		break;
-	}
-	case gui::shortcuts::shortcut::gw_exit_fullscreen:
-	{
+	case Qt::Key_Return:
+		if (keyEvent->modifiers() == Qt::AltModifier)
+		{
+			toggle_fullscreen();
+			return;
+		}
+		break;
+	case Qt::Key_Escape:
 		if (visibility() == FullScreen)
 		{
 			toggle_fullscreen();
-		}
-		break;
-	}
-	case gui::shortcuts::shortcut::gw_log_mark:
-	{
-		static int count = 0;
-		mark_log.success("Made forced mark %d in log", ++count);
-		break;
-	}
-	case gui::shortcuts::shortcut::gw_mouse_lock:
-	{
-		toggle_mouselock();
-		break;
-	}
-	case gui::shortcuts::shortcut::gw_screenshot:
-	{
-		g_user_asked_for_screenshot = true;
-		break;
-	}
-	case gui::shortcuts::shortcut::gw_toggle_recording:
-	{
-		toggle_recording();
-		break;
-	}
-	case gui::shortcuts::shortcut::gw_pause_play:
-	{
-		switch (Emu.GetStatus())
-		{
-		case system_state::ready:
-		{
-			Emu.Run(true);
 			return;
 		}
-		case system_state::paused:
-		{
-			Emu.Resume();
-			return;
-		}
-		default:
+		break;
+	case Qt::Key_P:
+		if (keyEvent->modifiers() == Qt::ControlModifier && !m_disable_kb_hotkeys && Emu.IsRunning())
 		{
 			Emu.Pause();
 			return;
 		}
+		break;
+	case Qt::Key_R:
+		if (keyEvent->modifiers() == Qt::ControlModifier && !m_disable_kb_hotkeys)
+		{
+			switch (Emu.GetStatus())
+			{
+			case system_state::ready:
+			{
+				Emu.Run(true);
+				return;
+			}
+			case system_state::paused:
+			{
+				Emu.Resume();
+				return;
+			}
+			default: break;
+			}
 		}
 		break;
-	}
-	case gui::shortcuts::shortcut::gw_restart:
-	{
-		if (Emu.IsStopped())
+	case Qt::Key_C:
+		if (keyEvent->modifiers() == Qt::AltModifier && !m_disable_kb_hotkeys)
 		{
-			Emu.Restart();
+			g_user_asked_for_frame_capture = true;
 			return;
 		}
-
-		extern bool boot_last_savestate(bool testing);
-		boot_last_savestate(false);
 		break;
-	}
-	case gui::shortcuts::shortcut::gw_savestate:
-	{
-		if (!g_cfg.savestate.suspend_emu)
-		{
-			Emu.after_kill_callback = []()
-			{
-				Emu.Restart();
-			};
-
-			// Make sure we keep the game window opened
-			Emu.SetContinuousMode(true);
-		}
-
-		Emu.Kill(false, true);
-		return;
-	}
-	case gui::shortcuts::shortcut::gw_rsx_capture:
-	{
-		g_user_asked_for_frame_capture = true;
+	case Qt::Key_F12:
+		screenshot_toggle = true;
 		break;
-	}
-	case gui::shortcuts::shortcut::gw_frame_limit:
-	{
-		g_disable_frame_limit = !g_disable_frame_limit;
-		gui_log.warning("%s boost mode", g_disable_frame_limit.load() ? "Enabled" : "Disabled");
-		break;
-	}
-	case gui::shortcuts::shortcut::gw_toggle_mouse_and_keyboard:
-	{
-		input::toggle_mouse_and_keyboard();
-		break;
-	}
-	case gui::shortcuts::shortcut::gw_home_menu:
-	{
-		pad::g_home_menu_requested = true;
-		break;
-	}
-	case gui::shortcuts::shortcut::gw_mute_unmute:
-	{
-		audio::toggle_mute();
-		break;
-	}
-	case gui::shortcuts::shortcut::gw_volume_up:
-	{
-		audio::change_volume(5);
-		break;
-	}
-	case gui::shortcuts::shortcut::gw_volume_down:
-	{
-		audio::change_volume(-5);
-		break;
-	}
 	default:
-	{
 		break;
 	}
-	}
 }
 
 void gs_frame::toggle_fullscreen()
 {
-	Emu.CallFromMainThread([this]()
+	Emu.CallAfter([this]()
 	{
 		if (visibility() == FullScreen)
 		{
@@ -404,138 +296,13 @@ void gs_frame::toggle_fullscreen()
 	});
 }
 
-void gs_frame::toggle_recording()
-{
-	utils::video_provider& video_provider = g_fxo->get<utils::video_provider>();
-
-	if (g_recording_mode == recording_mode::cell)
-	{
-		gui_log.warning("A video recorder is already in use by cell. Regular recording can not proceed.");
-		m_video_encoder->stop();
-		return;
-	}
-
-	if (g_recording_mode.exchange(recording_mode::stopped) == recording_mode::rpcs3)
-	{
-		m_video_encoder->stop();
-
-		if (!video_provider.set_video_sink(nullptr, recording_mode::rpcs3))
-		{
-			gui_log.warning("The video provider could not release the video sink. A sink with higher priority must have been set.");
-		}
-
-		// Play a sound
-		if (const std::string sound_path = fs::get_config_dir() + "sounds/snd_recording.wav"; fs::is_file(sound_path))
-		{
-			Emu.GetCallbacks().play_sound(sound_path);
-		}
-		else
-		{
-			QApplication::beep();
-		}
-
-		ensure(m_video_encoder->path().starts_with(fs::get_config_dir()));
-		const std::string shortpath = m_video_encoder->path().substr(fs::get_config_dir().size() - 1); // -1 for /
-		rsx::overlays::queue_message(tr("Recording saved: %0").arg(QString::fromStdString(shortpath)).toStdString());
-	}
-	else
-	{
-		m_video_encoder->stop();
-
-		const std::string& id = Emu.GetTitleID();
-		std::string video_path = fs::get_config_dir() + "recordings/";
-		if (!id.empty())
-		{
-			video_path += id + "/";
-		}
-
-		if (!fs::create_path(video_path) && fs::g_tls_error != fs::error::exist)
-		{
-			screenshot_log.error("Failed to create recordings path \"%s\" : %s", video_path, fs::g_tls_error);
-			return;
-		}
-
-		if (!id.empty())
-		{
-			video_path += id + "_";
-		}
-
-		video_path += "recording_" + date_time::current_time_narrow<'_'>() + ".mp4";
-
-		utils::video_encoder::frame_format output_format{};
-		output_format.av_pixel_format = static_cast<AVPixelFormat>(g_cfg_recording.video.pixel_format.get());
-		output_format.width = g_cfg_recording.video.width;
-		output_format.height = g_cfg_recording.video.height;
-		output_format.pitch = g_cfg_recording.video.width * 4;
-
-		m_video_encoder->use_internal_audio = true;
-		m_video_encoder->use_internal_video = true;
-		m_video_encoder->set_path(video_path);
-		m_video_encoder->set_framerate(g_cfg_recording.video.framerate);
-		m_video_encoder->set_video_bitrate(g_cfg_recording.video.video_bps);
-		m_video_encoder->set_video_codec(g_cfg_recording.video.video_codec);
-		m_video_encoder->set_max_b_frames(g_cfg_recording.video.max_b_frames);
-		m_video_encoder->set_gop_size(g_cfg_recording.video.gop_size);
-		m_video_encoder->set_output_format(output_format);
-
-		switch (g_cfg.audio.provider)
-		{
-		case audio_provider::none:
-		{
-			// Disable audio recording
-			m_video_encoder->use_internal_audio = false;
-			break;
-		}
-		case audio_provider::cell_audio:
-		{
-			const cell_audio_config& cfg = g_fxo->get<cell_audio>().cfg;
-			m_video_encoder->set_sample_rate(cfg.audio_sampling_rate);
-			m_video_encoder->set_audio_channels(cfg.audio_channels);
-			break;
-		}
-		case audio_provider::rsxaudio:
-		{
-			const auto& rsx_audio = g_fxo->get<rsx_audio_backend>();
-			m_video_encoder->set_sample_rate(rsx_audio.get_sample_rate());
-			m_video_encoder->set_audio_channels(rsx_audio.get_channel_count());
-			break;
-		}
-		}
-
-		m_video_encoder->set_audio_bitrate(g_cfg_recording.audio.audio_bps);
-		m_video_encoder->set_audio_codec(g_cfg_recording.audio.audio_codec);
-		m_video_encoder->encode();
-
-		if (m_video_encoder->has_error)
-		{
-			rsx::overlays::queue_message(tr("Recording not possible").toStdString());
-			m_video_encoder->stop();
-			return;
-		}
-
-		if (!video_provider.set_video_sink(m_video_encoder, recording_mode::rpcs3))
-		{
-			gui_log.warning("The video provider could not set the video sink. A sink with higher priority must have been set.");
-			rsx::overlays::queue_message(tr("Recording not possible").toStdString());
-			m_video_encoder->stop();
-			return;
-		}
-
-		video_provider.set_pause_time_us(0);
-
-		g_recording_mode = recording_mode::rpcs3;
-
-		rsx::overlays::queue_message(tr("Recording started").toStdString());
-	}
-}
-
 void gs_frame::toggle_mouselock()
 {
 	// first we toggle the value
 	m_mouse_hide_and_lock = !m_mouse_hide_and_lock;
 
 	// and update the cursor
-	handle_cursor(visibility(), false, false, true);
+	handle_cursor(visibility(), false, true);
 }
 
 void gs_frame::update_cursor()
@@ -572,66 +339,26 @@ void gs_frame::update_cursor()
 
 bool gs_frame::get_mouse_lock_state()
 {
-	handle_cursor(visibility(), false, false, true);
+	handle_cursor(visibility(), false, true);
 
 	return isActive() && m_mouse_hide_and_lock;
 }
 
-void gs_frame::hide_on_close()
-{
-	// Make sure not to save the hidden state, which is useless to us.
-	const Visibility current_visibility = visibility();
-	m_gui_settings->SetValue(gui::gs_visibility, current_visibility == Visibility::Hidden ? Visibility::AutomaticVisibility : current_visibility, false);
-	m_gui_settings->SetValue(gui::gs_geometry, geometry(), true);
-
-	if (!g_progr_text)
-	{
-		// Hide the dialog before stopping if no progress bar is being shown.
-		// Otherwise users might think that the game softlocked if stopping takes too long.
-		QWindow::hide();
-	}
-}
-
 void gs_frame::close()
 {
-	if (m_is_closing.exchange(true))
+	Emu.CallAfter([this]()
 	{
-		gui_log.notice("Closing game window (ignored, already closing)");
-		return;
-	}
-
-	gui_log.notice("Closing game window");
-
-	if (m_ignore_stop_events)
-	{
-		return;
-	}
-
-	Emu.CallFromMainThread([this]()
-	{
-		// Hide window if necessary
-		hide_on_close();
+		QWindow::hide(); // Workaround
 
 		if (!Emu.IsStopped())
 		{
-			// Notify progress dialog cancellation
-			g_system_progress_canceled = true;
+			Emu.Stop();
+		}
 
-			// Blocking shutdown request. Obsolete, but I'm keeping it here as last resort.
-			Emu.after_kill_callback = [this](){ deleteLater(); };
-			Emu.GracefulShutdown(true);
-		}
-		else
-		{
-			deleteLater();
-		}
+		deleteLater();
 	});
 }
 
-void gs_frame::reset()
-{
-}
-
 bool gs_frame::shown()
 {
 	return QWindow::isVisible();
@@ -639,28 +366,28 @@ bool gs_frame::shown()
 
 void gs_frame::hide()
 {
-	Emu.CallFromMainThread([this]() { QWindow::hide(); });
+	Emu.CallAfter([this]() { QWindow::hide(); });
 }
 
 void gs_frame::show()
 {
-	Emu.CallFromMainThread([this]()
+	Emu.CallAfter([this]()
 	{
 		QWindow::show();
-
-		if (g_cfg.misc.start_fullscreen || m_start_games_fullscreen)
+		if (g_cfg.misc.start_fullscreen)
 		{
 			setVisibility(FullScreen);
 		}
-		else if (const QVariant var = m_gui_settings->GetValue(gui::gs_visibility); var.canConvert<Visibility>())
-		{
-			// Restore saved visibility from last time. Make sure not to hide the window, or the user can't access it anymore.
-			if (const Visibility visibility = var.value<Visibility>(); visibility != Visibility::Hidden)
-			{
-				setVisibility(visibility);
-			}
-		}
 	});
+
+#ifdef _WIN32
+	// if we do this before show, the QWinTaskbarProgress won't show
+	if (m_tb_button)
+	{
+		m_tb_button->setWindow(this);
+		m_tb_progress->show();
+	}
+#endif
 }
 
 display_handle_t gs_frame::handle() const
@@ -670,7 +397,7 @@ display_handle_t gs_frame::handle() const
 #elif defined(__APPLE__)
 	return reinterpret_cast<void*>(this->winId()); //NSView
 #else
-#ifdef HAVE_WAYLAND
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
 	QPlatformNativeInterface *native = QGuiApplication::platformNativeInterface();
 	struct wl_display *wl_dpy = static_cast<struct wl_display *>(
 		native->nativeResourceForWindow("display", NULL));
@@ -681,14 +408,16 @@ display_handle_t gs_frame::handle() const
 		return std::make_pair(wl_dpy, wl_surf);
 	}
 	else
+	{
 #endif
 #ifdef HAVE_X11
-	{
 		return std::make_pair(XOpenDisplay(0), static_cast<ulong>(this->winId()));
-	}
 #else
 		fmt::throw_exception("Vulkan X11 support disabled at compile-time.");
 #endif
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+	}
+#endif
 #endif
 }
 
@@ -731,21 +460,9 @@ int gs_frame::client_height()
 	return height() * devicePixelRatio();
 }
 
-f64 gs_frame::client_display_rate()
+double gs_frame::client_device_pixel_ratio() const
 {
-	f64 rate = 20.; // Minimum is 20
-
-	Emu.BlockingCallFromMainThread([this, &rate]()
-	{
-		const QList<QScreen*> screens = QGuiApplication::screens();
-
-		for (int i = 0; i < screens.count(); i++)
-		{
-			rate = std::fmax(rate, ::at32(screens, i)->refreshRate());
-		}
-	});
-
-	return rate;
+	return devicePixelRatio();
 }
 
 void gs_frame::flip(draw_context_t, bool /*skip_frame*/)
@@ -770,66 +487,33 @@ void gs_frame::flip(draw_context_t, bool /*skip_frame*/)
 		{
 			m_window_title = new_title;
 
-			Emu.CallFromMainThread([this, title = std::move(new_title)]()
+			Emu.CallAfter([this, title = std::move(new_title)]()
 			{
-				setTitle(QString::fromStdString(title));
+				setTitle(qstr(title));
 			});
 		}
 
 		m_frames = 0;
 		fps_t.Start();
 	}
-
-	if (g_user_asked_for_recording.exchange(false))
-	{
-		Emu.CallFromMainThread([this]()
-		{
-			toggle_recording();
-		});
-	}
 }
 
-bool gs_frame::can_consume_frame() const
-{
-	utils::video_provider& video_provider = g_fxo->get<utils::video_provider>();
-	return video_provider.can_consume_frame();
-}
-
-void gs_frame::present_frame(std::vector<u8>& data, u32 pitch, u32 width, u32 height, bool is_bgra) const
-{
-	utils::video_provider& video_provider = g_fxo->get<utils::video_provider>();
-	video_provider.present_frame(data, pitch, width, height, is_bgra);
-}
-
-void gs_frame::take_screenshot(std::vector<u8>&& data, u32 sshot_width, u32 sshot_height, bool is_bgra)
+void gs_frame::take_screenshot(std::vector<u8> data, const u32 sshot_width, const u32 sshot_height, bool is_bgra)
 {
 	std::thread(
 		[sshot_width, sshot_height, is_bgra](std::vector<u8> sshot_data)
 		{
-			thread_base::set_name("Screenshot");
-
 			screenshot_log.notice("Taking screenshot (%dx%d)", sshot_width, sshot_height);
 
-			const std::string& id = Emu.GetTitleID();
 			std::string screen_path = fs::get_config_dir() + "screenshots/";
-			if (!id.empty())
-			{
-				screen_path += id + "/";
-			}
 
-			if (!fs::create_path(screen_path) && fs::g_tls_error != fs::error::exist)
+			if (!fs::create_dir(screen_path) && fs::g_tls_error != fs::error::exist)
 			{
 				screenshot_log.error("Failed to create screenshot path \"%s\" : %s", screen_path, fs::g_tls_error);
 				return;
 			}
 
-			std::string filename = screen_path;
-			if (!id.empty())
-			{
-				filename += id + "_";
-			}
-
-			filename += "screenshot_" + date_time::current_time_narrow<'_'>() + ".png";
+			const std::string filename = screen_path + "screenshot-" + date_time::current_time_narrow<'_'>() + ".png";
 
 			fs::file sshot_file(filename, fs::open_mode::create + fs::open_mode::write + fs::open_mode::excl);
 			if (!sshot_file)
@@ -913,30 +597,16 @@ void gs_frame::take_screenshot(std::vector<u8>&& data, u32 sshot_width, u32 ssho
 			text[num_text].key         = const_cast<char*>("Comment");
 			text[num_text].text        = const_cast<char*>(game_comment.c_str());
 
-			// Create image from data
-			QImage img(sshot_data_alpha.data(), sshot_width, sshot_height, sshot_width * 4, QImage::Format_RGBA8888);
-
-			// Scale image if necessary
-			const auto& avconf = g_fxo->get<rsx::avconf>();
-			auto new_size = avconf.aspect_convert_dimensions(size2u{ u32(img.width()), u32(img.height()) });
-
-			if (new_size.width != static_cast<u32>(img.width()) || new_size.height != static_cast<u32>(img.height()))
-			{
-				img = img.scaled(QSize(new_size.width, new_size.height), Qt::AspectRatioMode::IgnoreAspectRatio, Qt::TransformationMode::SmoothTransformation);
-				img.convertTo(QImage::Format_RGBA8888); // The current Qt version changes the image format during smooth scaling, so we have to change it back.
-			}
-
-			// Create row pointers for libpng
-			std::vector<u8*> rows(img.height());
-			for (int y = 0; y < img.height(); y++)
-				rows[y] = img.scanLine(y);
+			std::vector<u8*> rows(sshot_height);
+			for (usz y = 0; y < sshot_height; y++)
+				rows[y] = sshot_data_alpha.data() + y * sshot_width * 4;
 
 			std::vector<u8> encoded_png;
 
 			const auto write_png = [&]()
 			{
 				const scoped_png_ptrs ptrs;
-				png_set_IHDR(ptrs.write_ptr, ptrs.info_ptr, img.width(), img.height(), 8, PNG_COLOR_TYPE_RGBA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+				png_set_IHDR(ptrs.write_ptr, ptrs.info_ptr, sshot_width, sshot_height, 8, PNG_COLOR_TYPE_RGBA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
 				png_set_text(ptrs.write_ptr, ptrs.info_ptr, text, 6);
 				png_set_rows(ptrs.write_ptr, ptrs.info_ptr, &rows[0]);
 				png_set_write_fn(ptrs.write_ptr, &encoded_png, [](png_structp png_ptr, png_bytep data, png_size_t length)
@@ -961,7 +631,7 @@ void gs_frame::take_screenshot(std::vector<u8>&& data, u32 sshot_width, u32 ssho
 
 					QImage overlay_img;
 
-					if (!overlay_img.load(QString::fromStdString(cell_sshot_overlay_path)))
+					if (!overlay_img.load(qstr(cell_sshot_overlay_path)))
 					{
 						screenshot_log.error("Failed to read cell screenshot overlay '%s' : %s", cell_sshot_overlay_path, fs::g_tls_error);
 						return;
@@ -969,11 +639,10 @@ void gs_frame::take_screenshot(std::vector<u8>&& data, u32 sshot_width, u32 ssho
 
 					// Games choose the overlay file and the offset based on the current video resolution.
 					// We need to scale the overlay if our resolution scaling causes the image to have a different size.
+					auto& avconf = g_fxo->get<rsx::avconf>();
 
-					// Scale the resolution first (as seen before with the image)
-					new_size = avconf.aspect_convert_dimensions(size2u{ avconf.resolution_x, avconf.resolution_y });
-
-					if (new_size.width != static_cast<u32>(img.width()) || new_size.height != static_cast<u32>(img.height()))
+					// TODO: handle wacky PS3 resolutions (without resolution scaling)
+					if (avconf.resolution_x != sshot_width || avconf.resolution_y != sshot_height)
 					{
 						const int scale = rsx::get_resolution_scale_percent();
 						const int x = (scale * manager.overlay_offset_x) / 100;
@@ -989,17 +658,16 @@ void gs_frame::take_screenshot(std::vector<u8>&& data, u32 sshot_width, u32 ssho
 						overlay_img = overlay_img.scaled(QSize(width, height), Qt::AspectRatioMode::IgnoreAspectRatio, Qt::TransformationMode::SmoothTransformation);
 					}
 
-					if (manager.overlay_offset_x < static_cast<s64>(img.width()) &&
-					    manager.overlay_offset_y < static_cast<s64>(img.height()) &&
+					if (manager.overlay_offset_x < static_cast<s64>(sshot_width) &&
+					    manager.overlay_offset_y < static_cast<s64>(sshot_height) &&
 					    manager.overlay_offset_x + overlay_img.width() > 0 &&
 					    manager.overlay_offset_y + overlay_img.height() > 0)
 					{
-						QImage screenshot_img(rows[0], img.width(), img.height(), QImage::Format_RGBA8888);
+						QImage screenshot_img(rows[0], sshot_width, sshot_height, QImage::Format_RGBA8888);
 						QPainter painter(&screenshot_img);
 						painter.drawImage(manager.overlay_offset_x, manager.overlay_offset_y, overlay_img);
-						painter.end();
 
-						std::memcpy(rows[0], screenshot_img.constBits(), screenshot_img.sizeInBytes());
+						std::memcpy(rows[0], screenshot_img.constBits(), static_cast<usz>(sshot_height) * screenshot_img.bytesPerLine());
 
 						screenshot_log.success("Applied screenshot overlay '%s'", cell_sshot_overlay_path);
 					}
@@ -1030,23 +698,6 @@ void gs_frame::take_screenshot(std::vector<u8>&& data, u32 sshot_width, u32 ssho
 				screenshot_log.success("Successfully saved cell screenshot to %s", cell_sshot_filename);
 			}
 
-			// Play a sound
-			Emu.CallFromMainThread([]()
-			{
-				if (const std::string sound_path = fs::get_config_dir() + "sounds/snd_screenshot.wav"; fs::is_file(sound_path))
-				{
-					Emu.GetCallbacks().play_sound(sound_path);
-				}
-				else
-				{
-					QApplication::beep();
-				}
-			});
-
-			ensure(filename.starts_with(fs::get_config_dir()));
-			const std::string shortpath = filename.substr(fs::get_config_dir().size() - 1); // -1 for /
-			rsx::overlays::queue_message(tr("Screenshot saved: %0").arg(QString::fromStdString(shortpath)).toStdString());
-
 			return;
 		},
 		std::move(data))
@@ -1055,22 +706,7 @@ void gs_frame::take_screenshot(std::vector<u8>&& data, u32 sshot_width, u32 ssho
 
 void gs_frame::mouseDoubleClickEvent(QMouseEvent* ev)
 {
-	if (m_disable_mouse)
-	{
-		return;
-	}
-
-	switch (g_cfg.io.move)
-	{
-	case move_handler::mouse:
-	case move_handler::raw_mouse:
-#ifdef HAVE_LIBEVDEV
-	case move_handler::gun:
-#endif
-		return;
-	default:
-		break;
-	}
+	if (m_disable_mouse || g_cfg.io.move == move_handler::mouse) return;
 
 	if (ev->button() == Qt::LeftButton)
 	{
@@ -1078,19 +714,13 @@ void gs_frame::mouseDoubleClickEvent(QMouseEvent* ev)
 	}
 }
 
-void gs_frame::handle_cursor(QWindow::Visibility visibility, bool visibility_changed, bool active_changed, bool start_idle_timer)
+void gs_frame::handle_cursor(QWindow::Visibility visibility, bool from_event, bool start_idle_timer)
 {
-	// Let's reload the gui settings when the visibility or the active window changes.
-	if (visibility_changed || active_changed)
+	// Update the mouse lock state if the visibility changed.
+	if (from_event)
 	{
-		load_gui_settings();
-
-		// Update the mouse lock state if the visibility changed.
-		if (visibility_changed)
-		{
-			// In fullscreen we default to hiding and locking. In windowed mode we do not want the lock by default.
-			m_mouse_hide_and_lock = (visibility == QWindow::Visibility::FullScreen) && m_lock_mouse_in_fullscreen;
-		}
+		// In fullscreen we default to hiding and locking. In windowed mode we do not want the lock by default.
+		m_mouse_hide_and_lock = (visibility == QWindow::Visibility::FullScreen) && m_lock_mouse_in_fullscreen;
 	}
 
 	// Update the mouse hide timer
@@ -1107,12 +737,12 @@ void gs_frame::handle_cursor(QWindow::Visibility visibility, bool visibility_cha
 	update_cursor();
 }
 
-void gs_frame::mouse_hide_timeout()
+void gs_frame::MouseHideTimeout()
 {
-	// Our idle timeout occurred, so we update the cursor
+	// Our idle timeout occured, so we update the cursor
 	if (m_hide_mouse_after_idletime && m_show_mouse)
 	{
-		handle_cursor(visibility(), false, false, false);
+		handle_cursor(visibility(), false, false);
 	}
 }
 
@@ -1128,54 +758,45 @@ bool gs_frame::event(QEvent* ev)
 			}
 
 			int result = QMessageBox::Yes;
-			m_gui_settings->ShowConfirmationBox(tr("Exit Game?"),
-				tr("Do you really want to exit the game?<br><br>Any unsaved progress will be lost!<br>"),
-				gui::ib_confirm_exit, &result, nullptr);
+			atomic_t<bool> called = false;
+
+			Emu.CallAfter([this, &result, &called]()
+			{
+				m_gui_settings->ShowConfirmationBox(tr("Exit Game?"),
+					tr("Do you really want to exit the game?<br><br>Any unsaved progress will be lost!<br>"),
+					gui::ib_confirm_exit, &result, nullptr);
+
+				called = true;
+				called.notify_one();
+			});
+
+			called.wait(false);
 
 			if (result != QMessageBox::Yes)
 			{
 				return true;
 			}
 		}
-
-		gui_log.notice("Game window close event issued");
-
-		if (m_ignore_stop_events)
-		{
-			return QWindow::event(ev);
-		}
-
-		if (Emu.IsStopped())
-		{
-			// This should be unreachable, but never say never. Properly close the window anyway.
-			close();
-		}
-		else
-		{
-			// Notify progress dialog cancellation
-			g_system_progress_canceled = true;
-
-			// Issue async shutdown
-			Emu.GracefulShutdown(true, true);
-
-			// Hide window if necessary
-			hide_on_close();
-
-			// Do not propagate the close event. It will be closed by the rsx_thread.
-			return true;
-		}
+		close();
 	}
 	else if (ev->type() == QEvent::MouseMove && (!m_show_mouse || m_mousehide_timer.isActive()))
 	{
 		// This will make the cursor visible again if it was hidden by the mouse idle timeout
-		handle_cursor(visibility(), false, false, true);
+		handle_cursor(visibility(), false, true);
 	}
 	return QWindow::event(ev);
 }
 
 void gs_frame::progress_reset(bool reset_limit)
 {
-	m_progress_indicator->reset();
+#ifdef _WIN32
+	if (m_tb_progress)
+	{
+		m_tb_progress->reset();
+	}
+#elif HAVE_QTDBUS
+	UpdateProgress(0);
+#endif
 
 	if (reset_limit)
 	{
@@ -1185,23 +806,63 @@ void gs_frame::progress_reset(bool reset_limit)
 
 void gs_frame::progress_set_value(int value)
 {
-	m_progress_indicator->set_value(value);
+#ifdef _WIN32
+	if (m_tb_progress)
+	{
+		m_tb_progress->setValue(std::clamp(value, m_tb_progress->minimum(), m_tb_progress->maximum()));
+	}
+#elif HAVE_QTDBUS
+	m_progress_value = std::clamp(value, 0, m_gauge_max);
+	UpdateProgress(m_progress_value);
+#endif
 }
 
 void gs_frame::progress_increment(int delta)
 {
-	if (delta != 0)
+	if (delta == 0)
 	{
-		m_progress_indicator->set_value(m_progress_indicator->value() + delta);
+		return;
 	}
+
+#ifdef _WIN32
+	if (m_tb_progress)
+	{
+		progress_set_value(m_tb_progress->value() + delta);
+	}
+#elif HAVE_QTDBUS
+	progress_set_value(m_progress_value + delta);
+#endif
 }
 
 void gs_frame::progress_set_limit(int limit)
 {
-	m_progress_indicator->set_range(0, limit);
+#ifdef _WIN32
+	if (m_tb_progress)
+	{
+		m_tb_progress->setMaximum(limit);
+	}
+#elif HAVE_QTDBUS
+	m_gauge_max = limit;
+#endif
 }
 
-bool gs_frame::has_alpha()
+#ifdef HAVE_QTDBUS
+void gs_frame::UpdateProgress(int progress, bool disable)
 {
-	return format().hasAlpha();
+	QDBusMessage message = QDBusMessage::createSignal
+	(
+		QStringLiteral("/"),
+		QStringLiteral("com.canonical.Unity.LauncherEntry"),
+		QStringLiteral("Update")
+	);
+	QVariantMap properties;
+	if (disable)
+		properties.insert(QStringLiteral("progress-visible"), false);
+	else
+		properties.insert(QStringLiteral("progress-visible"), true);
+	//Progress takes a value from 0.0 to 0.1
+	properties.insert(QStringLiteral("progress"), 1. * progress / m_gauge_max);
+	message << QStringLiteral("application://rpcs3.desktop") << properties;
+	QDBusConnection::sessionBus().send(message);
 }
+#endif
diff --git a/rpcs3/rpcs3qt/gs_frame.h b/rpcs3/rpcs3qt/gs_frame.h
index 38bbaa0a3e..700ce7b4b5 100644
--- a/rpcs3/rpcs3qt/gs_frame.h
+++ b/rpcs3/rpcs3qt/gs_frame.h
@@ -1,21 +1,22 @@
 #pragma once
 
-#include "shortcut_handler.h"
-#include "progress_indicator.h"
 #include "util/types.hpp"
 #include "util/atomic.hpp"
-#include "util/media_utils.h"
 #include "Emu/RSX/GSFrameBase.h"
 
 #include <QWindow>
 #include <QPaintEvent>
 #include <QTimer>
 
+#ifdef _WIN32
+#include <QWinTaskbarProgress>
+#include <QWinTaskbarButton>
+#endif
+
 #include <memory>
 #include <vector>
 
 class gui_settings;
-enum class video_renderer;
 
 class gs_frame : public QWindow, public GSFrameBase
 {
@@ -23,9 +24,14 @@ class gs_frame : public QWindow, public GSFrameBase
 
 private:
 	// taskbar progress
-	std::unique_ptr<progress_indicator> m_progress_indicator;
-
-	shortcut_handler* m_shortcut_handler = nullptr;
+	int m_gauge_max = 100;
+#ifdef _WIN32
+	QWinTaskbarButton* m_tb_button = nullptr;
+	QWinTaskbarProgress* m_tb_progress = nullptr;
+#elif HAVE_QTDBUS
+	int m_progress_value = 0;
+	void UpdateProgress(int progress, bool disable = false);
+#endif
 
 	QRect m_initial_geometry;
 
@@ -35,7 +41,6 @@ private:
 	u64 m_frames = 0;
 	std::string m_window_title;
 	QWindow::Visibility m_last_visibility = Visibility::Windowed;
-	atomic_t<bool> m_is_closing = false;
 	atomic_t<bool> m_show_mouse = true;
 	bool m_disable_mouse = false;
 	bool m_disable_kb_hotkeys = false;
@@ -45,26 +50,16 @@ private:
 	bool m_hide_mouse_after_idletime = false;
 	u32 m_hide_mouse_idletime = 2000; // ms
 	bool m_flip_showed_frame = false;
-	bool m_start_games_fullscreen = false;
-	bool m_ignore_stop_events = false;
-
-	std::shared_ptr<utils::video_encoder> m_video_encoder{};
 
 public:
-	explicit gs_frame(QScreen* screen, const QRect& geometry, const QIcon& appIcon, std::shared_ptr<gui_settings> gui_settings, bool force_fullscreen);
+	explicit gs_frame(QScreen* screen, const QRect& geometry, const QIcon& appIcon, std::shared_ptr<gui_settings> gui_settings);
 	~gs_frame();
 
-	video_renderer renderer() const { return m_renderer; };
-
-	void ignore_stop_events() { m_ignore_stop_events = true; }
-
 	draw_context_t make_context() override;
 	void set_current(draw_context_t context) override;
 	void delete_context(draw_context_t context) override;
 	void toggle_fullscreen() override;
 
-	void update_shortcuts();
-
 	// taskbar progress
 	void progress_reset(bool reset_limit = false);
 	void progress_set_value(int value);
@@ -77,18 +72,15 @@ public:
 	*/
 	bool get_mouse_lock_state();
 
-	bool can_consume_frame() const override;
-	void present_frame(std::vector<u8>& data, u32 pitch, u32 width, u32 height, bool is_bgra) const override;
-	void take_screenshot(std::vector<u8>&& data, u32 sshot_width, u32 sshot_height, bool is_bgra) override;
+	void take_screenshot(std::vector<u8> data, const u32 sshot_width, const u32 sshot_height, bool is_bgra) override;
 
 protected:
-	video_renderer m_renderer;
-
-	void paintEvent(QPaintEvent *event) override;
+	virtual void paintEvent(QPaintEvent *event);
 	void showEvent(QShowEvent *event) override;
 
+	void keyPressEvent(QKeyEvent *keyEvent) override;
+
 	void close() override;
-	void reset() override;
 
 	bool shown() override;
 	void hide() override;
@@ -100,20 +92,15 @@ protected:
 	void flip(draw_context_t context, bool skip_frame = false) override;
 	int client_width() override;
 	int client_height() override;
-	f64 client_display_rate() override;
-	bool has_alpha() override;
+	double client_device_pixel_ratio() const override;
 
 	bool event(QEvent* ev) override;
 
 private:
-	void load_gui_settings();
-	void hide_on_close();
-	void toggle_recording();
 	void toggle_mouselock();
 	void update_cursor();
-	void handle_cursor(QWindow::Visibility visibility, bool visibility_changed, bool active_changed, bool start_idle_timer);
+	void handle_cursor(QWindow::Visibility visibility, bool from_event, bool start_idle_timer);
 
 private Q_SLOTS:
-	void mouse_hide_timeout();
-	void handle_shortcut(gui::shortcuts::shortcut shortcut_key, const QKeySequence& key_sequence);
+	void MouseHideTimeout();
 };
diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp
index 82f29fcdbd..5bade1e98b 100644
--- a/rpcs3/rpcs3qt/gui_application.cpp
+++ b/rpcs3/rpcs3qt/gui_application.cpp
@@ -1,8 +1,6 @@
-#include "stdafx.h"
 #include "gui_application.h"
 
 #include "qt_utils.h"
-#include "permissions.h"
 #include "welcome_dialog.h"
 #include "main_window.h"
 #include "emu_settings.h"
@@ -10,71 +8,41 @@
 #include "persistent_settings.h"
 #include "gs_frame.h"
 #include "gl_gs_frame.h"
-#include "localized_emu.h"
-#include "qt_camera_handler.h"
-#include "qt_music_handler.h"
-#include "rpcs3_version.h"
 #include "display_sleep_control.h"
+#include "localized_emu.h"
 
 #ifdef WITH_DISCORD_RPC
 #include "_discord_utils.h"
 #endif
 
-#include "Emu/Audio/audio_utils.h"
-#include "Emu/Cell/Modules/cellSysutil.h"
-#include "Emu/Io/Null/null_camera_handler.h"
-#include "Emu/Io/Null/null_music_handler.h"
-#include "Emu/vfs_config.h"
-#include "util/init_mutex.hpp"
-#include "util/console.h"
-#include "qt_video_source.h"
+#include "Emu/Cell/Modules/cellAudio.h"
+#include "Emu/RSX/Overlays/overlay_perf_metrics.h"
+#include "Emu/system_utils.hpp"
 #include "trophy_notification_helper.h"
 #include "save_data_dialog.h"
 #include "msg_dialog_frame.h"
 #include "osk_dialog_frame.h"
-#include "recvmessage_dialog_frame.h"
-#include "sendmessage_dialog_frame.h"
 #include "stylesheets.h"
-#include "progress_dialog.h"
 
 #include <QScreen>
 #include <QFontDatabase>
-#include <QLayout>
 #include <QLibraryInfo>
 #include <QDirIterator>
 #include <QFileInfo>
-#include <QMessageBox>
-#include <QTextDocument>
-#include <QStyleFactory>
-#include <QStyleHints>
 
 #include <clocale>
 
 #include "Emu/RSX/Null/NullGSRender.h"
 #include "Emu/RSX/GL/GLGSRender.h"
 
-#if defined(HAVE_VULKAN)
+#if defined(_WIN32) || defined(HAVE_VULKAN)
 #include "Emu/RSX/VK/VKGSRender.h"
 #endif
 
-#ifdef _WIN32
-#include <Usbiodef.h>
-#include <Dbt.h>
-
-#include "Emu/Cell/lv2/sys_usbd.h"
-#endif
-
 LOG_CHANNEL(gui_log, "GUI");
 
-std::unique_ptr<raw_mouse_handler> g_raw_mouse_handler;
-
-s32 gui_application::m_language_id = static_cast<s32>(CELL_SYSUTIL_LANG_ENGLISH_US);
-
-[[noreturn]] void report_fatal_error(std::string_view text, bool is_html = false, bool include_help_text = true);
-
 gui_application::gui_application(int& argc, char** argv) : QApplication(argc, argv)
 {
-	std::setlocale(LC_NUMERIC, "C"); // On linux Qt changes to system locale while initializing QCoreApplication
 }
 
 gui_application::~gui_application()
@@ -82,64 +50,21 @@ gui_application::~gui_application()
 #ifdef WITH_DISCORD_RPC
 	discord::shutdown();
 #endif
-#ifdef _WIN32
-	unregister_device_notification();
-#endif
 }
 
 bool gui_application::Init()
 {
-#ifndef __APPLE__
 	setWindowIcon(QIcon(":/rpcs3.ico"));
-#endif
 
-	if (!rpcs3::is_release_build() && !rpcs3::is_local_build())
-	{
-		const std::string_view branch_name = rpcs3::get_full_branch();
-		gui_log.warning("Experimental Build Warning! Build origin: %s", branch_name);
-
-		QMessageBox msg;
-		msg.setWindowModality(Qt::WindowModal);
-		msg.setWindowTitle(tr("Experimental Build Warning"));
-		msg.setIcon(QMessageBox::Critical);
-		msg.setTextFormat(Qt::RichText);
-		msg.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-		msg.setDefaultButton(QMessageBox::No);
-		msg.setText(gui::utils::make_paragraph(tr(
-			"Please understand that this build is not an official RPCS3 release.\n"
-			"This build contains changes that may break games, or even <b>damage</b> your data.\n"
-			"We recommend to download and use the official build from the %0.\n"
-			"\n"
-			"Build origin: %1\n"
-			"Do you wish to use this build anyway?")
-			.arg(gui::utils::make_link(tr("RPCS3 website"), "https://rpcs3.net/download"))
-			.arg(Qt::convertFromPlainText(branch_name.data()))));
-		msg.layout()->setSizeConstraint(QLayout::SetFixedSize);
-
-		if (msg.exec() == QMessageBox::No)
-		{
-			return false;
-		}
-	}
-
-	m_emu_settings = std::make_shared<emu_settings>();
-	m_gui_settings = std::make_shared<gui_settings>();
-	m_persistent_settings = std::make_shared<persistent_settings>();
+	m_emu_settings.reset(new emu_settings());
+	m_gui_settings.reset(new gui_settings());
+	m_persistent_settings.reset(new persistent_settings());
 
 	if (!m_emu_settings->Init())
 	{
 		return false;
 	}
 
-	if (m_gui_settings->GetValue(gui::m_attachCommandLine).toBool())
-	{
-		utils::attach_console(utils::console_stream::std_err, true);
-	}
-	else
-	{
-		m_gui_settings->SetValue(gui::m_attachCommandLine, false);
-	}
-
 	// The user might be set by cli arg. If not, set another user.
 	if (m_active_user.empty())
 	{
@@ -159,7 +84,7 @@ bool gui_application::Init()
 		const auto language = m_gui_settings->GetValue(gui::loc_language).toString();
 		const auto index    = codes.indexOf(language);
 
-		LoadLanguage(index < 0 ? QLocale(QLocale::English).bcp47Name() : ::at32(codes, index));
+		LoadLanguage(index < 0 ? QLocale(QLocale::English).bcp47Name() : codes.at(index));
 	}
 
 	// Create callbacks from the emulator, which reference the handlers.
@@ -170,24 +95,8 @@ bool gui_application::Init()
 
 	if (m_gui_settings->GetValue(gui::ib_show_welcome).toBool())
 	{
-		welcome_dialog* welcome = new welcome_dialog(m_gui_settings, false);
-
-		if (welcome->exec() == QDialog::Rejected)
-		{
-			// If the agreement on RPCS3's usage conditions was not accepted by the user, ask the main window to gracefully terminate
-			return false;
-		}
-	}
-
-	// Check maxfiles
-	if (utils::get_maxfiles() < 4096)
-	{
-		QMessageBox::warning(nullptr,
-							 tr("Warning"),
-							 tr("The current limit of maximum file descriptors is too low.\n"
-								"Some games will crash.\n"
-								"\n"
-								"Please increase the limit before running RPCS3."));
+		welcome_dialog* welcome = new welcome_dialog();
+		welcome->exec();
 	}
 
 	if (m_main_window && !m_main_window->Init(m_with_cli_boot))
@@ -203,16 +112,6 @@ bool gui_application::Init()
 	}
 #endif
 
-	// Install native event filter
-#ifdef _WIN32 // Currently only needed for raw mouse input on windows
-	installNativeEventFilter(&m_native_event_filter);
-
-	if (m_main_window)
-	{
-		register_device_notification(m_main_window->winId());
-	}
-#endif
-
 	return true;
 }
 
@@ -221,7 +120,7 @@ void gui_application::SwitchTranslator(QTranslator& translator, const QString& f
 	// remove the old translator
 	removeTranslator(&translator);
 
-	const QString lang_path = QLibraryInfo::path(QLibraryInfo::TranslationsPath) + QStringLiteral("/");
+	const QString lang_path = QLibraryInfo::location(QLibraryInfo::TranslationsPath) + QStringLiteral("/");
 	const QString file_path = lang_path + filename;
 
 	if (QFileInfo(file_path).isFile())
@@ -232,13 +131,13 @@ void gui_application::SwitchTranslator(QTranslator& translator, const QString& f
 			installTranslator(&translator);
 		}
 	}
-	else if (QString default_code = QLocale(QLocale::English).bcp47Name(); language_code != default_code)
+	else if (const QString default_code = QLocale(QLocale::English).bcp47Name(); language_code != default_code)
 	{
 		// show error, but ignore default case "en", since it is handled in source code
-		gui_log.error("No translation file found in: %s", file_path);
+		gui_log.error("No translation file found in: %s", file_path.toStdString());
 
 		// reset current language to default "en"
-		set_language_code(std::move(default_code));
+		m_language_code = default_code;
 	}
 }
 
@@ -249,7 +148,7 @@ void gui_application::LoadLanguage(const QString& language_code)
 		return;
 	}
 
-	set_language_code(language_code);
+	m_language_code = language_code;
 
 	const QLocale locale      = QLocale(language_code);
 	const QString locale_name = QLocale::languageToString(locale.language());
@@ -277,103 +176,33 @@ void gui_application::LoadLanguage(const QString& language_code)
 
 	m_gui_settings->SetValue(gui::loc_language, m_language_code);
 
-	gui_log.notice("Current language changed to %s (%s)", locale_name, language_code);
+	gui_log.notice("Current language changed to %s (%s)", locale_name.toStdString(), language_code.toStdString());
 }
 
 QStringList gui_application::GetAvailableLanguageCodes()
 {
 	QStringList language_codes;
 
-	const QString language_path = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
+	const QString language_path = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
 
 	if (QFileInfo(language_path).isDir())
 	{
 		const QDir dir(language_path);
-		const QStringList filenames = dir.entryList(QStringList("rpcs3_*.qm"));
+		const QStringList filenames = dir.entryList(QStringList("*.qm"));
 
-		for (const QString& filename : filenames)
+		for (const auto& filename : filenames)
 		{
 			QString language_code = filename;                        // "rpcs3_en.qm"
 			language_code.truncate(language_code.lastIndexOf('.'));  // "rpcs3_en"
 			language_code.remove(0, language_code.indexOf('_') + 1); // "en"
 
-			if (language_codes.contains(language_code))
-			{
-				gui_log.error("Found duplicate language '%s' (%s)", language_code, filename);
-			}
-			else
-			{
-				language_codes << language_code;
-			}
+			language_codes << language_code;
 		}
 	}
 
 	return language_codes;
 }
 
-void gui_application::set_language_code(QString language_code)
-{
-	m_language_code = language_code;
-
-	// Transform language code to lowercase and use '-'
-	language_code = language_code.toLower().replace("_", "-");
-
-	// Try to find the CELL language ID for this language code
-	static const std::map<QString, CellSysutilLang> language_ids = {
-		{"ja", CELL_SYSUTIL_LANG_JAPANESE },
-		{"en", CELL_SYSUTIL_LANG_ENGLISH_US },
-		{"en-us", CELL_SYSUTIL_LANG_ENGLISH_US },
-		{"en-gb", CELL_SYSUTIL_LANG_ENGLISH_GB },
-		{"fr", CELL_SYSUTIL_LANG_FRENCH },
-		{"es", CELL_SYSUTIL_LANG_SPANISH },
-		{"de", CELL_SYSUTIL_LANG_GERMAN },
-		{"it", CELL_SYSUTIL_LANG_ITALIAN },
-		{"nl", CELL_SYSUTIL_LANG_DUTCH },
-		{"pt", CELL_SYSUTIL_LANG_PORTUGUESE_PT },
-		{"pt-pt", CELL_SYSUTIL_LANG_PORTUGUESE_PT },
-		{"pt-br", CELL_SYSUTIL_LANG_PORTUGUESE_BR },
-		{"ru", CELL_SYSUTIL_LANG_RUSSIAN },
-		{"ko", CELL_SYSUTIL_LANG_KOREAN },
-		{"zh", CELL_SYSUTIL_LANG_CHINESE_T },
-		{"zh-hant", CELL_SYSUTIL_LANG_CHINESE_T },
-		{"zh-hans", CELL_SYSUTIL_LANG_CHINESE_S },
-		{"fi", CELL_SYSUTIL_LANG_FINNISH },
-		{"sv", CELL_SYSUTIL_LANG_SWEDISH },
-		{"da", CELL_SYSUTIL_LANG_DANISH },
-		{"no", CELL_SYSUTIL_LANG_NORWEGIAN },
-		{"nn", CELL_SYSUTIL_LANG_NORWEGIAN },
-		{"nb", CELL_SYSUTIL_LANG_NORWEGIAN },
-		{"pl", CELL_SYSUTIL_LANG_POLISH },
-		{"tr", CELL_SYSUTIL_LANG_TURKISH },
-	};
-
-	// Check direct match first
-	const auto it = language_ids.find(language_code);
-	if (it != language_ids.cend())
-	{
-		m_language_id = static_cast<s32>(it->second);
-		return;
-	}
-
-	// Try to find closest match
-	for (const auto& [code, id] : language_ids)
-	{
-		if (language_code.startsWith(code))
-		{
-			m_language_id = static_cast<s32>(id);
-			return;
-		}
-	}
-
-	// Fallback to English (US)
-	m_language_id = static_cast<s32>(CELL_SYSUTIL_LANG_ENGLISH_US);
-}
-
-s32 gui_application::get_language_id()
-{
-	return m_language_id;
-}
-
 void gui_application::InitializeConnects()
 {
 	connect(&m_timer, &QTimer::timeout, this, &gui_application::UpdatePlaytime);
@@ -381,24 +210,18 @@ void gui_application::InitializeConnects()
 	connect(this, &gui_application::OnEmulatorStop, this, &gui_application::StopPlaytime);
 	connect(this, &gui_application::OnEmulatorPause, this, &gui_application::StopPlaytime);
 	connect(this, &gui_application::OnEmulatorResume, this, &gui_application::StartPlaytime);
-	connect(this, &QGuiApplication::applicationStateChanged, this, &gui_application::OnAppStateChanged);
 
 	if (m_main_window)
 	{
 		connect(m_main_window, &main_window::RequestLanguageChange, this, &gui_application::LoadLanguage);
 		connect(m_main_window, &main_window::RequestGlobalStylesheetChange, this, &gui_application::OnChangeStyleSheetRequest);
-		connect(m_main_window, &main_window::NotifyEmuSettingsChange, this, [this](){ OnEmuSettingsChange(); });
-		connect(m_main_window, &main_window::NotifyShortcutHandlers, this, &gui_application::OnShortcutChange);
+		connect(m_main_window, &main_window::NotifyEmuSettingsChange, this, &gui_application::OnEmuSettingsChange);
 
 		connect(this, &gui_application::OnEmulatorRun, m_main_window, &main_window::OnEmuRun);
 		connect(this, &gui_application::OnEmulatorStop, m_main_window, &main_window::OnEmuStop);
 		connect(this, &gui_application::OnEmulatorPause, m_main_window, &main_window::OnEmuPause);
 		connect(this, &gui_application::OnEmulatorResume, m_main_window, &main_window::OnEmuResume);
 		connect(this, &gui_application::OnEmulatorReady, m_main_window, &main_window::OnEmuReady);
-		connect(this, &gui_application::OnEnableDiscEject, m_main_window, &main_window::OnEnableDiscEject);
-		connect(this, &gui_application::OnEnableDiscInsert, m_main_window, &main_window::OnEnableDiscInsert);
-
-		connect(QGuiApplication::styleHints(), &QStyleHints::colorSchemeChanged, this, [this](){ OnChangeStyleSheetRequest(); });
 	}
 
 #ifdef WITH_DISCORD_RPC
@@ -421,114 +244,25 @@ void gui_application::InitializeConnects()
 #endif
 
 	qRegisterMetaType<std::function<void()>>("std::function<void()>");
-	connect(this, &gui_application::RequestCallFromMainThread, this, &gui_application::CallFromMainThread);
+	connect(this, &gui_application::RequestCallAfter, this, &gui_application::HandleCallAfter);
 }
 
 std::unique_ptr<gs_frame> gui_application::get_gs_frame()
 {
-	// Load AppIcon
-	const QIcon app_icon = m_main_window ? m_main_window->GetAppIcon() : gui::utils::get_app_icon_from_path(Emu.GetBoot(), Emu.GetTitleID());
-
-	if (m_game_window)
-	{
-		// Check if the continuous mode is enabled. We reset the mode after each use in order to ensure that it is only used when explicitly needed.
-		const bool continuous_mode_enabled = Emu.ContinuousModeEnabled(true);
-
-		// Make sure we run the same config
-		const bool is_same_renderer = m_game_window->renderer() == g_cfg.video.renderer;
-
-		if (is_same_renderer && (Emu.IsChildProcess() || continuous_mode_enabled))
-		{
-			gui_log.notice("gui_application: Re-using old game window (IsChildProcess=%d, ContinuousModeEnabled=%d)", Emu.IsChildProcess(), continuous_mode_enabled);
-
-			if (!app_icon.isNull())
-			{
-				m_game_window->setIcon(app_icon);
-			}
-			return std::unique_ptr<gs_frame>(m_game_window);
-		}
-
-		// Clean-up old game window. This should only happen if the renderer changed or there was an unexpected error during boot.
-		Emu.GetCallbacks().close_gs_frame();
-	}
-
-	gui_log.notice("gui_application: Creating new game window");
-
 	extern const std::unordered_map<video_resolution, std::pair<int, int>, value_hash<video_resolution>> g_video_out_resolution_map;
 
-	auto [w, h] = ::at32(g_video_out_resolution_map, g_cfg.video.resolution);
+	auto [w, h] = g_video_out_resolution_map.at(g_cfg.video.resolution);
 
-	const bool resize_game_window = m_gui_settings->GetValue(gui::gs_resize).toBool();
-
-	if (resize_game_window)
+	if (m_gui_settings->GetValue(gui::gs_resize).toBool())
 	{
-		if (m_gui_settings->GetValue(gui::gs_resize_manual).toBool())
-		{
-			w = m_gui_settings->GetValue(gui::gs_width).toInt();
-			h = m_gui_settings->GetValue(gui::gs_height).toInt();
-		}
-		else
-		{
-			const qreal device_pixel_ratio = devicePixelRatio();
-			w /= device_pixel_ratio;
-			h /= device_pixel_ratio;
-		}
+		w = m_gui_settings->GetValue(gui::gs_width).toInt();
+		h = m_gui_settings->GetValue(gui::gs_height).toInt();
 	}
 
-	QScreen* screen = nullptr;
-	QRect base_geometry{};
-
-	// Use screen index set by CLI argument
-	int screen_index = m_game_screen_index;
-	const int last_screen_index = m_gui_settings->GetValue(gui::gs_screen).toInt();
-
-	// Use last used screen if no CLI index was set
-	if (screen_index < 0)
-	{
-		screen_index = last_screen_index;
-	}
-
-	// Try to find the specified screen
-	if (screen_index >= 0)
-	{
-		const QList<QScreen*> available_screens = screens();
-
-		if (screen_index < available_screens.count())
-		{
-			screen = ::at32(available_screens, screen_index);
-
-			if (screen)
-			{
-				base_geometry = screen->geometry();
-			}
-		}
-
-		if (!screen)
-		{
-			gui_log.error("The selected game screen with index %d is not available (available screens: %d)", screen_index, available_screens.count());
-		}
-	}
-
-	// Fallback to the screen of the main window. Use the primary screen as last resort.
-	if (!screen)
-	{
-		screen = m_main_window ? m_main_window->screen() : primaryScreen();
-		base_geometry = m_main_window ? m_main_window->frameGeometry() : primaryScreen()->geometry();
-	}
-
-	// Use saved geometry if possible. Ignore this if the last used screen is different than the requested screen.
-	QRect frame_geometry = screen_index != last_screen_index ? QRect{} : m_gui_settings->GetValue(gui::gs_geometry).value<QRect>();
-
-	if (frame_geometry.isNull() || frame_geometry.isEmpty())
-	{
-		// Center above main window or inside screen if the saved geometry is invalid
-		frame_geometry = gui::utils::create_centered_window_geometry(screen, base_geometry, w, h);
-	}
-	else if (resize_game_window)
-	{
-		// Apply size override to our saved geometry if needed
-		frame_geometry.setSize(QSize(w, h));
-	}
+	const auto screen = m_main_window ? m_main_window->screen() : primaryScreen();
+	const auto base_geometry  = m_main_window ? m_main_window->frameGeometry() : primaryScreen()->geometry();
+	const auto frame_geometry = gui::utils::create_centered_window_geometry(screen, base_geometry, w, h);
+	const auto app_icon = m_main_window ? m_main_window->GetAppIcon() : gui::utils::get_app_icon_from_path(Emu.GetBoot(), Emu.GetTitleID());
 
 	gs_frame* frame = nullptr;
 
@@ -536,39 +270,18 @@ std::unique_ptr<gs_frame> gui_application::get_gs_frame()
 	{
 	case video_renderer::opengl:
 	{
-		frame = new gl_gs_frame(screen, frame_geometry, app_icon, m_gui_settings, m_start_games_fullscreen);
+		frame = new gl_gs_frame(screen, frame_geometry, app_icon, m_gui_settings);
 		break;
 	}
 	case video_renderer::null:
 	case video_renderer::vulkan:
 	{
-		frame = new gs_frame(screen, frame_geometry, app_icon, m_gui_settings, m_start_games_fullscreen);
+		frame = new gs_frame(screen, frame_geometry, app_icon, m_gui_settings);
 		break;
 	}
 	}
 
 	m_game_window = frame;
-	ensure(m_game_window);
-
-#ifdef _WIN32
-	if (!m_show_gui)
-	{
-		register_device_notification(m_game_window->winId());
-	}
-#endif
-
-	connect(m_game_window, &gs_frame::destroyed, this, [this]()
-	{
-		gui_log.notice("gui_application: Deleting old game window");
-		m_game_window = nullptr;
-
-#ifdef _WIN32
-		if (!m_show_gui)
-		{
-			unregister_device_notification();
-		}
-#endif
-	});
 
 	return std::unique_ptr<gs_frame>(frame);
 }
@@ -593,94 +306,45 @@ void gui_application::InitializeCallbacks()
 				// Close main window in order to save its window state
 				m_main_window->close();
 			}
-
-			gui_log.notice("Quitting gui application");
 			quit();
 			return true;
 		}
 
 		return false;
 	};
-	callbacks.call_from_main_thread = [this](std::function<void()> func, atomic_t<u32>* wake_up)
+	callbacks.call_after = [this](std::function<void()> func)
 	{
-		RequestCallFromMainThread(std::move(func), wake_up);
+		RequestCallAfter(std::move(func));
 	};
 
-	callbacks.init_gs_render = [](utils::serial* ar)
+	callbacks.init_gs_render = []()
 	{
 		switch (g_cfg.video.renderer.get())
 		{
 		case video_renderer::null:
 		{
-			g_fxo->init<rsx::thread, named_thread<NullGSRender>>(ar);
+			g_fxo->init<rsx::thread, named_thread<NullGSRender>>();
 			break;
 		}
 		case video_renderer::opengl:
 		{
-#if not defined(__APPLE__)
-			g_fxo->init<rsx::thread, named_thread<GLGSRender>>(ar);
-#endif
+			g_fxo->init<rsx::thread, named_thread<GLGSRender>>();
 			break;
 		}
+#if defined(_WIN32) || defined(HAVE_VULKAN)
 		case video_renderer::vulkan:
 		{
-#if defined(HAVE_VULKAN)
-			g_fxo->init<rsx::thread, named_thread<VKGSRender>>(ar);
-#endif
+			g_fxo->init<rsx::thread, named_thread<VKGSRender>>();
 			break;
 		}
+#endif
 		}
 	};
 
-	callbacks.get_camera_handler = []() -> std::shared_ptr<camera_handler_base>
-	{
-		switch (g_cfg.io.camera.get())
-		{
-		case camera_handler::null:
-		case camera_handler::fake:
-		{
-			return std::make_shared<null_camera_handler>();
-		}
-		case camera_handler::qt:
-		{
-			return std::make_shared<qt_camera_handler>();
-		}
-		}
-		return nullptr;
-	};
-
-	callbacks.get_music_handler = []() -> std::shared_ptr<music_handler_base>
-	{
-		switch (g_cfg.audio.music.get())
-		{
-		case music_handler::null:
-		{
-			return std::make_shared<null_music_handler>();
-		}
-		case music_handler::qt:
-		{
-			return std::make_shared<qt_music_handler>();
-		}
-		}
-		return nullptr;
-	};
-
-	callbacks.close_gs_frame  = [this]()
-	{
-		if (m_game_window)
-		{
-			gui_log.warning("gui_application: Closing old game window");
-			m_game_window->ignore_stop_events();
-			delete m_game_window;
-			m_game_window = nullptr;
-		}
-	};
 	callbacks.get_gs_frame    = [this]() -> std::unique_ptr<GSFrameBase> { return get_gs_frame(); };
 	callbacks.get_msg_dialog  = [this]() -> std::shared_ptr<MsgDialogBase> { return m_show_gui ? std::make_shared<msg_dialog_frame>() : nullptr; };
 	callbacks.get_osk_dialog  = [this]() -> std::shared_ptr<OskDialogBase> { return m_show_gui ? std::make_shared<osk_dialog_frame>() : nullptr; };
 	callbacks.get_save_dialog = []() -> std::unique_ptr<SaveDialogBase> { return std::make_unique<save_data_dialog>(); };
-	callbacks.get_sendmessage_dialog = [this]() -> std::shared_ptr<SendMessageDialogBase> { return std::make_shared<sendmessage_dialog_frame>(); };
-	callbacks.get_recvmessage_dialog = [this]() -> std::shared_ptr<RecvMessageDialogBase> { return std::make_shared<recvmessage_dialog_frame>(); };
 	callbacks.get_trophy_notification_dialog = [this]() -> std::unique_ptr<TrophyNotificationBase> { return std::make_unique<trophy_notification_helper>(m_game_window); };
 
 	callbacks.on_run    = [this](bool start_playtime) { OnEmulatorRun(start_playtime); };
@@ -689,27 +353,10 @@ void gui_application::InitializeCallbacks()
 	callbacks.on_stop   = [this]() { OnEmulatorStop(); };
 	callbacks.on_ready  = [this]() { OnEmulatorReady(); };
 
-	callbacks.enable_disc_eject  = [this](bool enabled)
-	{
-		Emu.CallFromMainThread([this, enabled]()
-		{
-			OnEnableDiscEject(enabled);
-		});
-	};
-	callbacks.enable_disc_insert = [this](bool enabled)
-	{
-		Emu.CallFromMainThread([this, enabled]()
-		{
-			OnEnableDiscInsert(enabled);
-		});
-	};
-
 	callbacks.on_missing_fw = [this]()
 	{
-		if (m_main_window)
-		{
-			m_main_window->OnMissingFw();
-		}
+		if (!m_main_window) return false;
+		return m_main_window->OnMissingFw();
 	};
 
 	callbacks.handle_taskbar_progress = [this](s32 type, s32 value)
@@ -718,10 +365,10 @@ void gui_application::InitializeCallbacks()
 		{
 			switch (type)
 			{
-			case 0: m_game_window->progress_reset(value); break;
-			case 1: m_game_window->progress_increment(value); break;
-			case 2: m_game_window->progress_set_limit(value); break;
-			case 3: m_game_window->progress_set_value(value); break;
+			case 0: static_cast<gs_frame*>(m_game_window)->progress_reset(value); break;
+			case 1: static_cast<gs_frame*>(m_game_window)->progress_increment(value); break;
+			case 2: static_cast<gs_frame*>(m_game_window)->progress_set_limit(value); break;
+			case 3: static_cast<gs_frame*>(m_game_window)->progress_set_value(value); break;
 			default: gui_log.fatal("Unknown type in handle_taskbar_progress(type=%d, value=%d)", type, value); break;
 			}
 		}
@@ -737,229 +384,11 @@ void gui_application::InitializeCallbacks()
 		return localized_emu::get_u32string(id, args);
 	};
 
-	callbacks.get_localized_setting = [this](const cfg::_base* node, u32 enum_index) -> std::string
+	callbacks.resolve_path = [](std::string_view sv)
 	{
-		ensure(!!m_emu_settings);
-		return m_emu_settings->GetLocalizedSetting(node, enum_index);
+		return QFileInfo(QString::fromUtf8(sv.data(), static_cast<int>(sv.size()))).canonicalFilePath().toStdString();
 	};
 
-	callbacks.play_sound = [this](const std::string& path)
-	{
-		Emu.CallFromMainThread([this, path]()
-		{
-			if (fs::is_file(path))
-			{
-				// Allow to play 3 sound effects at the same time
-				while (m_sound_effects.size() >= 3)
-				{
-					m_sound_effects.pop_front();
-				}
-
-				// Create a new sound effect. Re-using the same object seems to be broken for some users starting with Qt 6.6.3.
-				std::unique_ptr<QSoundEffect> sound_effect = std::make_unique<QSoundEffect>();
-				sound_effect->setSource(QUrl::fromLocalFile(QString::fromStdString(path)));
-				sound_effect->setVolume(audio::get_volume());
-				sound_effect->play();
-
-				m_sound_effects.push_back(std::move(sound_effect));
-			}
-		});
-	};
-
-	if (m_show_gui) // If this is false, we already have a fallback in the main_application.
-	{
-		callbacks.on_install_pkgs = [this](const std::vector<std::string>& pkgs)
-		{
-			ensure(m_main_window);
-			ensure(!pkgs.empty());
-			QStringList pkg_list;
-			for (const std::string& pkg : pkgs)
-			{
-				pkg_list << QString::fromStdString(pkg);
-			}
-			return m_main_window->InstallPackages(pkg_list, true);
-		};
-	}
-
-	callbacks.on_emulation_stop_no_response = [this](std::shared_ptr<atomic_t<bool>> closed_successfully, int seconds_waiting_already)
-	{
-		const std::string terminate_message = tr("Stopping emulator took too long."
-			"\nSome thread has probably deadlocked. Aborting.").toStdString();
-
-		if (!closed_successfully)
-		{
-			report_fatal_error(terminate_message);
-		}
-
-		Emu.CallFromMainThread([this, closed_successfully, seconds_waiting_already, terminate_message]
-		{
-			const auto seconds = std::make_shared<int>(seconds_waiting_already);
-
-			QMessageBox* mb = new QMessageBox();
-			mb->setWindowTitle(tr("PS3 Game/Application Is Unresponsive"));
-			mb->setIcon(QMessageBox::Critical);
-			mb->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-			mb->setDefaultButton(QMessageBox::No);
-			mb->button(QMessageBox::Yes)->setText(tr("Terminate RPCS3"));
-			mb->button(QMessageBox::No)->setText(tr("Keep Waiting"));
-
-			QString text_base = tr("Waiting for %0 second(s) already to stop emulation without success."
-			                       "\nKeep waiting or terminate RPCS3 unsafely at your own risk?");
-
-			mb->setText(text_base.arg(10));
-			mb->layout()->setSizeConstraint(QLayout::SetFixedSize);
-			mb->setAttribute(Qt::WA_DeleteOnClose);
-
-			QTimer* update_timer = new QTimer(mb);
-
-			connect(update_timer, &QTimer::timeout, [mb, seconds, text_base, closed_successfully]()
-			{
-				*seconds += 1;
-				mb->setText(text_base.arg(*seconds));
-
-				if (*closed_successfully)
-				{
-					mb->reject();
-				}
-			});
-
-			connect(mb, &QDialog::accepted, mb, [closed_successfully, terminate_message]
-			{
-				if (!*closed_successfully)
-				{
-					report_fatal_error(terminate_message);
-				}
-			});
-
-			mb->open();
-			update_timer->start(1000);
-		});
-	};
-
-	callbacks.on_save_state_progress = [this](std::shared_ptr<atomic_t<bool>> closed_successfully, stx::shared_ptr<utils::serial> ar_ptr, stx::atomic_ptr<std::string>* code_location, std::shared_ptr<void> init_mtx)
-	{
-		Emu.CallFromMainThread([this, closed_successfully, ar_ptr, code_location, init_mtx]
-		{
-			const auto half_seconds = std::make_shared<int>(1);
-
-			progress_dialog* pdlg = new progress_dialog(tr("Creating Save-State / Do Not Close RPCS3"), tr("Please wait..."), tr("Hide Progress"), 0, 100, true, m_main_window);
-			pdlg->setAutoReset(false);
-			pdlg->setAutoClose(true);
-			pdlg->show();
-
-			QString text_base = tr("%0 written, %1 second(s) passed%2");
-
-			pdlg->setLabelText(text_base.arg("0B").arg(1).arg(""));
-			pdlg->setAttribute(Qt::WA_DeleteOnClose);
-
-			QTimer* update_timer = new QTimer(pdlg);
-
-			connect(update_timer, &QTimer::timeout, [pdlg, ar_ptr, half_seconds, text_base, closed_successfully
-				, code_location, init_mtx, old_written = usz{0}, repeat_count = u32{0}]() mutable
-			{
-				std::string verbose_message;
-				usz bytes_written = 0;
-
-				while (true)
-				{
-					auto mtx = static_cast<stx::init_mutex*>(init_mtx.get());
-					auto init = mtx->access();
-
-					if (!init)
-					{
-						// Try to wait for the abort process to complete
-						auto fake_reset = mtx->reset();
-						if (!fake_reset)
-						{
-							// End of emulation termination
-							pdlg->reject();
-							return;
-						}
-
-						fake_reset.set_init();
-
-						// Now ar_ptr contains a null file descriptor
-						continue;
-					}
-
-					if (auto str_ptr = code_location->load())
-					{
-						verbose_message = "\n" + *str_ptr;
-					}
-
-					bytes_written = ar_ptr->is_writing() ? std::max<usz>(ar_ptr->get_size(), old_written) : old_written;
-					break;
-				}
-
-				*half_seconds += 1;
-
-				if (old_written == bytes_written)
-				{
-					if (repeat_count == 60)
-					{
-						if (verbose_message.empty())
-						{
-							verbose_message += "\n";
-						}
-						else
-						{
-							verbose_message += ". ";
-						}
-
-						verbose_message += tr("If Stuck, Report To Developers").toStdString();
-					}
-					else
-					{
-						repeat_count++;
-					}
-				}
-				else
-				{
-					repeat_count = 0;
-				}
-
-				old_written = bytes_written;
-
-				pdlg->setLabelText(text_base.arg(gui::utils::format_byte_size(bytes_written)).arg(*half_seconds / 2).arg(QString::fromStdString(verbose_message)));
-
-				// 300MB -> 50%, 600MB -> 75%, 1200MB -> 87.5% etc
-				const int percent = std::clamp(static_cast<int>(100. - 100. / std::pow(2., std::fmax(0.01, bytes_written * 1. / (300 * 1024 * 1024)))), 2, 100);
-
-				// Add a third of the remaining progress when the keyword is found
-				pdlg->setValue(verbose_message.find("Finalizing") != umax ? 100 - ((100 - percent) * 2 / 3) : percent);
-
-				if (*closed_successfully)
-				{
-					pdlg->reject();
-				}
-			});
-
-			pdlg->open();
-			update_timer->start(500);
-		});
-	};
-
-	callbacks.add_breakpoint = [this](u32 addr)
-	{
-		Emu.BlockingCallFromMainThread([this, addr]()
-		{
-			m_main_window->OnAddBreakpoint(addr);
-		});
-	};
-
-	callbacks.display_sleep_control_supported = [](){ return display_sleep_control_supported(); };
-	callbacks.enable_display_sleep = [](bool enabled){ enable_display_sleep(enabled); };
-
-	callbacks.check_microphone_permissions = []()
-	{
-		Emu.BlockingCallFromMainThread([]()
-		{
-			gui::utils::check_microphone_permission();
-		});
-	};
-
-	callbacks.make_video_source = [](){ return std::make_unique<qt_video_source_wrapper>(); };
-
 	Emu.SetCallbacks(std::move(callbacks));
 }
 
@@ -970,13 +399,13 @@ void gui_application::StartPlaytime(bool start_playtime = true)
 		return;
 	}
 
-	const QString serial = QString::fromStdString(Emu.GetTitleID());
+	const QString serial = qstr(Emu.GetTitleID());
 	if (serial.isEmpty())
 	{
 		return;
 	}
 
-	m_persistent_settings->SetLastPlayed(serial, QDateTime::currentDateTime().toString(gui::persistent::last_played_date_format), true);
+	m_persistent_settings->SetLastPlayed(serial, QDate::currentDate().toString(gui::persistent::last_played_date_format));
 	m_timer_playtime.start();
 	m_timer.start(10000); // Update every 10 seconds in case the emulation crashes
 }
@@ -989,7 +418,7 @@ void gui_application::UpdatePlaytime()
 		return;
 	}
 
-	const QString serial = QString::fromStdString(Emu.GetTitleID());
+	const QString serial = qstr(Emu.GetTitleID());
 	if (serial.isEmpty())
 	{
 		m_timer_playtime.invalidate();
@@ -997,8 +426,8 @@ void gui_application::UpdatePlaytime()
 		return;
 	}
 
-	m_persistent_settings->AddPlaytime(serial, m_timer_playtime.restart(), false);
-	m_persistent_settings->SetLastPlayed(serial, QDateTime::currentDateTime().toString(gui::persistent::last_played_date_format), true);
+	m_persistent_settings->AddPlaytime(serial, m_timer_playtime.restart());
+	m_persistent_settings->SetLastPlayed(serial, QDate::currentDate().toString(gui::persistent::last_played_date_format));
 }
 
 void gui_application::StopPlaytime()
@@ -1008,15 +437,15 @@ void gui_application::StopPlaytime()
 	if (!m_timer_playtime.isValid())
 		return;
 
-	const QString serial = QString::fromStdString(Emu.GetTitleID());
+	const QString serial = qstr(Emu.GetTitleID());
 	if (serial.isEmpty())
 	{
 		m_timer_playtime.invalidate();
 		return;
 	}
 
-	m_persistent_settings->AddPlaytime(serial, m_timer_playtime.restart(), false);
-	m_persistent_settings->SetLastPlayed(serial, QDateTime::currentDateTime().toString(gui::persistent::last_played_date_format), true);
+	m_persistent_settings->AddPlaytime(serial, m_timer_playtime.restart());
+	m_persistent_settings->SetLastPlayed(serial, QDate::currentDate().toString(gui::persistent::last_played_date_format));
 	m_timer_playtime.invalidate();
 }
 
@@ -1043,104 +472,31 @@ void gui_application::OnChangeStyleSheetRequest()
 
 	const QString stylesheet_name = m_gui_settings->GetValue(gui::m_currentStylesheet).toString();
 
-	// Determine default style
-	if (m_default_style.isEmpty())
-	{
-#ifdef _WIN32
-		// On windows, the custom stylesheets don't seem to work properly unless we use the windowsvista style as default
-		if (QStyleFactory::keys().contains("windowsvista"))
-		{
-			m_default_style = "windowsvista";
-			gui_log.notice("Using '%s' as default style", m_default_style);
-		}
-#endif
-
-		// Use the initial style as default style
-		if (const QStyle* style = m_default_style.isEmpty() ? QApplication::style() : nullptr)
-		{
-			m_default_style = style->name();
-			gui_log.notice("Determined '%s' as default style", m_default_style);
-		}
-
-		// Fallback to the first style, which is supposed to be the default style according to the Qt docs.
-		if (m_default_style.isEmpty())
-		{
-			if (const QStringList styles = QStyleFactory::keys(); !styles.empty())
-			{
-				m_default_style = styles.front();
-				gui_log.notice("Determined '%s' as default style (first style available)", m_default_style);
-			}
-		}
-	}
-
-	// Reset style to default before doing anything else, or we will get unexpected effects in custom stylesheets.
-	if (QStyle* style = QStyleFactory::create(m_default_style))
-	{
-		setStyle(style);
-	}
-
-	const auto match_native_style = [&stylesheet_name]() -> QString
-	{
-		// Search for "native (<style>)"
-		static const QRegularExpression expr(gui::NativeStylesheet + " \\((?<style>.*)\\)");
-		const QRegularExpressionMatch match = expr.match(stylesheet_name);
-
-		if (match.hasMatch())
-		{
-			return match.captured("style");
-		}
-
-		return {};
-	};
-
-	gui_log.notice("Changing stylesheet to '%s'", stylesheet_name);
-	gui::custom_stylesheet_active = false;
-
 	if (stylesheet_name.isEmpty() || stylesheet_name == gui::DefaultStylesheet)
 	{
-		gui_log.notice("Using default stylesheet");
 		setStyleSheet(gui::stylesheets::default_style_sheet);
-		gui::custom_stylesheet_active = true;
 	}
 	else if (stylesheet_name == gui::NoStylesheet)
 	{
-		gui_log.notice("Using empty style");
 		setStyleSheet("/* none */");
 	}
-	else if (const QString native_style = match_native_style(); !native_style.isEmpty())
-	{
-		if (QStyle* style = QStyleFactory::create(native_style))
-		{
-			gui_log.notice("Using native style '%s'", native_style);
-			setStyleSheet("/* none */");
-			setStyle(style);
-		}
-		else
-		{
-			gui_log.error("Failed to set stylesheet: Native style '%s' not available", native_style);
-		}
-	}
 	else
 	{
 		QString stylesheet_path;
 		QString stylesheet_dir;
-		std::vector<QDir> locs;
-		locs.push_back(m_gui_settings->GetSettingsDir());
+		QList<QDir> locs;
+		locs << m_gui_settings->GetSettingsDir();
 
 #if !defined(_WIN32)
 #ifdef __APPLE__
-		locs.push_back(QCoreApplication::applicationDirPath() + "/../Resources/GuiConfigs/");
+		locs << QCoreApplication::applicationDirPath() + "/../Resources/GuiConfigs/";
 #else
-#ifdef DATADIR
-		const QString data_dir = (DATADIR);
-		locs.push_back(data_dir + "/GuiConfigs/");
+		locs << QCoreApplication::applicationDirPath() + "/../share/rpcs3/GuiConfigs/";
 #endif
-		locs.push_back(QCoreApplication::applicationDirPath() + "/../share/rpcs3/GuiConfigs/");
-#endif
-		locs.push_back(QCoreApplication::applicationDirPath() + "/GuiConfigs/");
+		locs << QCoreApplication::applicationDirPath() + "/GuiConfigs/";
 #endif
 
-		for (QDir& loc : locs)
+		for (auto&& loc : locs)
 		{
 			QFileInfo file_info(loc.absoluteFilePath(stylesheet_name + QStringLiteral(".qss")));
 			if (file_info.exists())
@@ -1154,10 +510,10 @@ void gui_application::OnChangeStyleSheetRequest()
 
 		if (QFile file(stylesheet_path); !stylesheet_path.isEmpty() && file.open(QIODevice::ReadOnly | QIODevice::Text))
 		{
-			const QString config_dir = QString::fromStdString(fs::get_config_dir());
+			const QString config_dir = qstr(fs::get_config_dir());
 
 			// Add PS3 fonts
-			QDirIterator ps3_font_it(QString::fromStdString(g_cfg_vfs.get_dev_flash() + "data/font/"), QStringList() << "*.ttf", QDir::Files, QDirIterator::Subdirectories);
+			QDirIterator ps3_font_it(qstr(g_cfg.vfs.get_dev_flash() + "data/font/"), QStringList() << "*.ttf", QDir::Files, QDirIterator::Subdirectories);
 			while (ps3_font_it.hasNext())
 				QFontDatabase::addApplicationFont(ps3_font_it.next());
 
@@ -1175,11 +531,9 @@ void gui_application::OnChangeStyleSheetRequest()
 		}
 		else
 		{
-			gui_log.error("Could not find stylesheet '%s'. Using default.", stylesheet_name);
+			gui_log.error("Could not find stylesheet '%s'. Using default.", stylesheet_name.toStdString());
 			setStyleSheet(gui::stylesheets::default_style_sheet);
 		}
-
-		gui::custom_stylesheet_active = true;
 	}
 
 	gui::stylesheet = styleSheet();
@@ -1190,171 +544,29 @@ void gui_application::OnChangeStyleSheetRequest()
 	}
 }
 
-void gui_application::OnShortcutChange()
+void gui_application::OnEmuSettingsChange()
 {
-	if (m_game_window)
+	if (Emu.IsRunning())
 	{
-		m_game_window->update_shortcuts();
+		if (g_cfg.misc.prevent_display_sleep)
+		{
+			enable_display_sleep();
+		}
+		else
+		{
+			disable_display_sleep();
+		}
 	}
+
+	rpcs3::utils::configure_logs();
+	audio::configure_audio();
+	rsx::overlays::reset_performance_overlay();
 }
 
 /**
  * Using connects avoids timers being unable to be used in a non-qt thread. So, even if this looks stupid to just call func, it's succinct.
  */
-void gui_application::CallFromMainThread(const std::function<void()>& func, atomic_t<u32>* wake_up)
+void gui_application::HandleCallAfter(const std::function<void()>& func)
 {
 	func();
-
-	if (wake_up)
-	{
-		*wake_up = true;
-		wake_up->notify_one();
-	}
 }
-
-void gui_application::OnAppStateChanged(Qt::ApplicationState state)
-{
-	// Invalidate previous delayed pause call (even when the setting is off because it is dynamic)
-	m_pause_delayed_tag++;
-
-	if (!g_cfg.misc.autopause)
-	{
-		return;
-	}
-
-	const auto emu_state = Emu.GetStatus();
-	const bool is_active = state & Qt::ApplicationActive;
-
-	if (emu_state != system_state::paused && emu_state != system_state::running)
-	{
-		return;
-	}
-
-	const bool is_paused = emu_state == system_state::paused;
-
-	if (is_active != is_paused)
-	{
-		// Nothing to do (either paused and this is focus-out event or running and this is a focus-in event)
-		// Invalidate data
-		m_is_pause_on_focus_loss_active = false;
-		m_emu_focus_out_emulation_id = Emulator::stop_counter_t{};
-		return;
-	}
-
-	if (is_paused)
-	{
-		// Check if Emu.Resume() or Emu.Kill() has not been called since
-		if (m_is_pause_on_focus_loss_active && m_pause_amend_time_on_focus_loss == Emu.GetPauseTime() && m_emu_focus_out_emulation_id == Emu.GetEmulationIdentifier())
-		{
-			m_is_pause_on_focus_loss_active = false;
-			Emu.Resume();
-		}
-
-		return;
-	}
-
-	// Gather validation data
-	m_emu_focus_out_emulation_id = Emu.GetEmulationIdentifier();
-
-	auto pause_callback = [this, delayed_tag = m_pause_delayed_tag]()
-	{
-		// Check if Emu.Kill() has not been called since
-		if (applicationState() != Qt::ApplicationActive && Emu.IsRunning() &&
-		    m_emu_focus_out_emulation_id == Emu.GetEmulationIdentifier() &&
-		    delayed_tag == m_pause_delayed_tag &&
-			!m_is_pause_on_focus_loss_active)
-		{
-			if (Emu.Pause())
-			{
-				// Gather validation data
-				m_pause_amend_time_on_focus_loss = Emu.GetPauseTime();
-				m_emu_focus_out_emulation_id = Emu.GetEmulationIdentifier();
-				m_is_pause_on_focus_loss_active = true;
-			}
-		}
-	};
-
-	if (state == Qt::ApplicationSuspended)
-	{
-		// Must be invoked now (otherwise it may not happen later)
-		pause_callback();
-		return;
-	}
-
-	// Delay pause so it won't immediately pause the emulated application
-	QTimer::singleShot(1000, this, pause_callback);
-}
-
-bool gui_application::native_event_filter::nativeEventFilter([[maybe_unused]] const QByteArray& eventType, [[maybe_unused]] void* message, [[maybe_unused]] qintptr* result)
-{
-#ifdef _WIN32
-	if (!Emu.IsRunning() && !Emu.IsStarting() && !g_raw_mouse_handler)
-	{
-		return false;
-	}
-
-	if (eventType == "windows_generic_MSG")
-	{
-		if (MSG* msg = static_cast<MSG*>(message); msg && (msg->message == WM_INPUT || msg->message == WM_KEYDOWN || msg->message == WM_KEYUP || msg->message == WM_DEVICECHANGE))
-		{
-			if (msg->message == WM_DEVICECHANGE && (msg->wParam == DBT_DEVICEARRIVAL || msg->wParam == DBT_DEVICEREMOVECOMPLETE))
-			{
-				if (Emu.IsRunning() || Emu.IsStarting())
-				{
-					handle_hotplug_event(msg->wParam == DBT_DEVICEARRIVAL);
-				}
-				return false;
-			}
-
-			if (auto* handler = g_fxo->try_get<MouseHandlerBase>(); handler && handler->type == mouse_handler::raw)
-			{
-				static_cast<raw_mouse_handler*>(handler)->handle_native_event(*msg);
-			}
-
-			if (g_raw_mouse_handler)
-			{
-				g_raw_mouse_handler->handle_native_event(*msg);
-			}
-		}
-	}
-#endif
-
-	return false;
-}
-
-#ifdef _WIN32
-void gui_application::register_device_notification(WId window_id)
-{
-	if (m_device_notification_handle) return;
-
-	gui_log.notice("Registering device notifications...");
-
-	// Enable usb device hotplug events
-	// Currently only needed for hotplug on windows, as libusb handles other platforms
-	DEV_BROADCAST_DEVICEINTERFACE notification_filter {};
-	notification_filter.dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE);
-	notification_filter.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
-	notification_filter.dbcc_classguid = GUID_DEVINTERFACE_USB_DEVICE;
-
-	m_device_notification_handle = RegisterDeviceNotification(reinterpret_cast<HWND>(window_id), &notification_filter, DEVICE_NOTIFY_WINDOW_HANDLE);
-	if (!m_device_notification_handle )
-	{
-		gui_log.error("RegisterDeviceNotification() failed: %s", fmt::win_error{GetLastError(), nullptr});
-	}
-}
-
-void gui_application::unregister_device_notification()
-{
-	if (m_device_notification_handle)
-	{
-		gui_log.notice("Unregistering device notifications...");
-
-		if (!UnregisterDeviceNotification(m_device_notification_handle))
-		{
-			gui_log.error("UnregisterDeviceNotification() failed: %s", fmt::win_error{GetLastError(), nullptr});
-		}
-
-		m_device_notification_handle = {};
-	}
-}
-#endif
diff --git a/rpcs3/rpcs3qt/gui_application.h b/rpcs3/rpcs3qt/gui_application.h
index bec8424da4..979e4cbd90 100644
--- a/rpcs3/rpcs3qt/gui_application.h
+++ b/rpcs3/rpcs3qt/gui_application.h
@@ -1,27 +1,16 @@
 #pragma once
 
 #include "util/types.hpp"
-#include "util/atomic.hpp"
 
 #include <QApplication>
-#include <QAbstractNativeEventFilter>
 #include <QElapsedTimer>
 #include <QTimer>
 #include <QTranslator>
-#include <QSoundEffect>
 
 #include "main_application.h"
 
-#include "Emu/System.h"
-#include "Input/raw_mouse_handler.h"
-
 #include <memory>
 #include <functional>
-#include <deque>
-
-#ifdef _WIN32
-#include "Windows.h"
-#endif
 
 class gs_frame;
 class main_window;
@@ -29,8 +18,6 @@ class gui_settings;
 class emu_settings;
 class persistent_settings;
 
-extern std::unique_ptr<raw_mouse_handler> g_raw_mouse_handler; // Only used for GUI
-
 /** RPCS3 GUI Application Class
  * The main point of this class is to do application initialization, to hold the main and game windows and to initialize callbacks.
  */
@@ -56,21 +43,9 @@ public:
 		m_with_cli_boot = with_cli_boot;
 	}
 
-	void SetStartGamesFullscreen(bool start_games_fullscreen = false)
-	{
-		m_start_games_fullscreen = start_games_fullscreen;
-	}
-
-	void SetGameScreenIndex(int screen_index = -1)
-	{
-		m_game_screen_index = screen_index;
-	}
-
 	/** Call this method before calling app.exec */
 	bool Init() override;
 
-	static s32 get_language_id();
-
 	std::unique_ptr<gs_frame> get_gs_frame();
 
 	main_window* m_main_window = nullptr;
@@ -92,51 +67,24 @@ private:
 	void UpdatePlaytime();
 	void StopPlaytime();
 
-	void set_language_code(QString language_code);
-
-	class native_event_filter : public QAbstractNativeEventFilter
-	{
-	public:
-		bool nativeEventFilter(const QByteArray& eventType, void* message, qintptr* result) override;
-
-	} m_native_event_filter;
-
 	QTranslator m_translator;
+	QTranslator m_translator_qt;
 	QString m_language_code;
-	static s32 m_language_id;
 
 	QTimer m_timer;
 	QElapsedTimer m_timer_playtime;
 
-	std::deque<std::unique_ptr<QSoundEffect>> m_sound_effects{};
-
 	std::shared_ptr<emu_settings> m_emu_settings;
 	std::shared_ptr<gui_settings> m_gui_settings;
 	std::shared_ptr<persistent_settings> m_persistent_settings;
 
-	QString m_default_style;
-
 	bool m_show_gui = true;
 	bool m_use_cli_style = false;
 	bool m_with_cli_boot = false;
-	bool m_start_games_fullscreen = false;
-	int m_game_screen_index = -1;
-
-	u64 m_pause_amend_time_on_focus_loss = umax;
-	u64 m_pause_delayed_tag = 0;
-	typename Emulator::stop_counter_t m_emu_focus_out_emulation_id{};
-	bool m_is_pause_on_focus_loss_active = false;
-
-#ifdef _WIN32
-	void register_device_notification(WId window_id);
-	void unregister_device_notification();
-	HDEVNOTIFY m_device_notification_handle {};
-#endif
 
 private Q_SLOTS:
 	void OnChangeStyleSheetRequest();
-	void OnShortcutChange();
-	void OnAppStateChanged(Qt::ApplicationState state);
+	static void OnEmuSettingsChange();
 
 Q_SIGNALS:
 	void OnEmulatorRun(bool start_playtime);
@@ -144,11 +92,9 @@ Q_SIGNALS:
 	void OnEmulatorResume(bool start_playtime);
 	void OnEmulatorStop();
 	void OnEmulatorReady();
-	void OnEnableDiscEject(bool enabled);
-	void OnEnableDiscInsert(bool enabled);
 
-	void RequestCallFromMainThread(std::function<void()> func, atomic_t<u32>* wake_up);
+	void RequestCallAfter(const std::function<void()>& func);
 
 private Q_SLOTS:
-	static void CallFromMainThread(const std::function<void()>& func, atomic_t<u32>* wake_up);
+	static void HandleCallAfter(const std::function<void()>& func);
 };
diff --git a/rpcs3/rpcs3qt/gui_game_info.cpp b/rpcs3/rpcs3qt/gui_game_info.cpp
deleted file mode 100644
index 61187a6f11..0000000000
--- a/rpcs3/rpcs3qt/gui_game_info.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "stdafx.h"
-#include "gui_game_info.h"
-#include "localized.h"
-
-std::string gui_game_info::GetGameVersion() const
-{
-	if (info.app_ver == Localized().category.unknown.toStdString())
-	{
-		// Fall back to Disc/Pkg Revision
-		return info.version;
-	}
-
-	return info.app_ver;
-}
diff --git a/rpcs3/rpcs3qt/gui_game_info.h b/rpcs3/rpcs3qt/gui_game_info.h
deleted file mode 100644
index 984f8eb7bf..0000000000
--- a/rpcs3/rpcs3qt/gui_game_info.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "movie_item_base.h"
-#include "game_compatibility.h"
-
-#include "Emu/GameInfo.h"
-
-#include <QPixmap>
-
-/* Having the icons associated with the game info simplifies logic internally */
-struct gui_game_info
-{
-	GameInfo info{};
-	QString localized_category;
-	compat::status compat;
-	QPixmap icon;
-	QPixmap pxmap;
-	bool has_custom_config = false;
-	bool has_custom_pad_config = false;
-	bool has_custom_icon = false;
-	bool has_hover_gif = false;
-	bool has_hover_pam = false;
-	movie_item_base* item = nullptr;
-
-	// Returns the visible version string in the game list
-	std::string GetGameVersion() const;
-};
-
-typedef std::shared_ptr<gui_game_info> game_info;
-Q_DECLARE_METATYPE(game_info)
diff --git a/rpcs3/rpcs3qt/gui_save.h b/rpcs3/rpcs3qt/gui_save.h
index cbeec7b5a6..66970172f6 100644
--- a/rpcs3/rpcs3qt/gui_save.h
+++ b/rpcs3/rpcs3qt/gui_save.h
@@ -11,11 +11,16 @@ struct gui_save
 
 	gui_save()
 	{
+		key = "";
+		name = "";
+		def = QVariant();
 	}
 
 	gui_save(const QString& k, const QString& n, const QVariant& d)
-		: key(k), name(n), def(d)
 	{
+		key = k;
+		name = n;
+		def = d;
 	}
 
 	bool operator==(const gui_save& rhs) const noexcept
diff --git a/rpcs3/rpcs3qt/gui_settings.cpp b/rpcs3/rpcs3qt/gui_settings.cpp
index 8f42a14dd7..f08ed55e28 100644
--- a/rpcs3/rpcs3qt/gui_settings.cpp
+++ b/rpcs3/rpcs3qt/gui_settings.cpp
@@ -1,7 +1,7 @@
 #include "gui_settings.h"
 
 #include "qt_utils.h"
-#include "category.h"
+#include "localized.h"
 
 #include "Emu/System.h"
 
@@ -11,131 +11,96 @@
 
 LOG_CHANNEL(cfg_log, "CFG");
 
-extern void qt_events_aware_op(int repeat_duration_ms, std::function<bool()> wrapped_op);
-
-namespace gui
-{
-	QString stylesheet;
-	bool custom_stylesheet_active = false;
-
-	QString get_savestate_list_column_name(savestate_list_columns col)
-	{
-		switch (col)
-		{
-		case gui::savestate_list_columns::name: return "savestate_column_name";
-		case gui::savestate_list_columns::compatible: return "savestate_column_compatible";
-		case gui::savestate_list_columns::date: return "savestate_column_date";
-		case gui::savestate_list_columns::path: return "savestate_column_path";
-		case gui::savestate_list_columns::count: return "";
-		}
-
-		fmt::throw_exception("get_savestate_list_column_name: Invalid column");
-	}
-
-	QString get_savestate_game_list_column_name(savestate_game_list_columns col)
-	{
-		switch (col)
-		{
-		case gui::savestate_game_list_columns::icon: return "savestate_game_column_icon";
-		case gui::savestate_game_list_columns::name: return "savestate_game_column_name";
-		case gui::savestate_game_list_columns::savestates: return "savestate_game_column_savestates";
-		case gui::savestate_game_list_columns::count: return "";
-		}
-
-		fmt::throw_exception("get_savestate_game_list_column_name: Invalid column");
-	}
-
-	QString get_game_list_column_name(game_list_columns col)
-	{
-		switch (col)
-		{
-		case game_list_columns::icon: return "column_icon";
-		case game_list_columns::name: return "column_name";
-		case game_list_columns::serial: return "column_serial";
-		case game_list_columns::firmware: return "column_firmware";
-		case game_list_columns::version: return "column_version";
-		case game_list_columns::category: return "column_category";
-		case game_list_columns::path: return "column_path";
-		case game_list_columns::move: return "column_move";
-		case game_list_columns::resolution: return "column_resolution";
-		case game_list_columns::sound: return "column_sound";
-		case game_list_columns::parental: return "column_parental";
-		case game_list_columns::last_play: return "column_last_play";
-		case game_list_columns::playtime: return "column_playtime";
-		case game_list_columns::compat: return "column_compat";
-		case game_list_columns::dir_size: return "column_dir_size";
-		case game_list_columns::count: return "";
-		}
-	
-		fmt::throw_exception("get_game_list_column_name: Invalid column");
-	}
-
-	QString get_trophy_list_column_name(trophy_list_columns col)
-	{
-		switch (col)
-		{
-		case trophy_list_columns::icon: return "trophy_column_icon";
-		case trophy_list_columns::name: return "trophy_column_name";
-		case trophy_list_columns::description: return "trophy_column_description";
-		case trophy_list_columns::type: return "trophy_column_type";
-		case trophy_list_columns::is_unlocked: return "trophy_column_is_unlocked";
-		case trophy_list_columns::id: return "trophy_column_id";
-		case trophy_list_columns::platinum_link: return "trophy_column_platinum_link";
-		case trophy_list_columns::time_unlocked: return "trophy_column_time_unlocked";
-		case trophy_list_columns::count: return "";
-		}
-	
-		fmt::throw_exception("get_trophy_list_column_name: Invalid column");
-	}
-
-	QString get_trophy_game_list_column_name(trophy_game_list_columns col)
-	{
-		switch (col)
-		{
-		case trophy_game_list_columns::icon: return "trophy_game_column_icon";
-		case trophy_game_list_columns::name: return "trophy_game_column_name";
-		case trophy_game_list_columns::progress: return "trophy_game_column_progress";
-		case trophy_game_list_columns::trophies: return "trophy_game_column_trophies";
-		case trophy_game_list_columns::count: return "";
-		}
-	
-		fmt::throw_exception("get_trophy_game_list_column_name: Invalid column");
-	}
-}
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
 
 gui_settings::gui_settings(QObject* parent) : settings(parent)
 {
-	m_settings = std::make_unique<QSettings>(ComputeSettingsDir() + gui::Settings + ".ini", QSettings::Format::IniFormat, parent);
+	m_settings.reset(new QSettings(ComputeSettingsDir() + gui::Settings + ".ini", QSettings::Format::IniFormat, parent));
 }
 
-QStringList gui_settings::GetGameListCategoryFilters(bool is_list_mode) const
+QStringList gui_settings::GetGameListCategoryFilters() const
 {
-	QStringList filters;
+	QStringList filterList;
 
-	if (GetCategoryVisibility(Category::HDD_Game, is_list_mode)) filters.append(cat::cat_hdd_game);
-	if (GetCategoryVisibility(Category::Disc_Game, is_list_mode)) filters.append(cat::cat_disc_game);
-	if (GetCategoryVisibility(Category::PS1_Game, is_list_mode)) filters.append(cat::cat_ps1_game);
-	if (GetCategoryVisibility(Category::PS2_Game, is_list_mode)) filters.append(cat::ps2_games);
-	if (GetCategoryVisibility(Category::PSP_Game, is_list_mode)) filters.append(cat::psp_games);
-	if (GetCategoryVisibility(Category::Home, is_list_mode)) filters.append(cat::cat_home);
-	if (GetCategoryVisibility(Category::Media, is_list_mode)) filters.append(cat::media);
-	if (GetCategoryVisibility(Category::Data, is_list_mode)) filters.append(cat::data);
-	if (GetCategoryVisibility(Category::OS, is_list_mode)) filters.append(cat::os);
-	if (GetCategoryVisibility(Category::Unknown_Cat, is_list_mode)) filters.append(cat::cat_unknown);
-	if (GetCategoryVisibility(Category::Others, is_list_mode)) filters.append(cat::others);
+	if (GetCategoryVisibility(Category::HDD_Game)) filterList.append(cat::cat_hdd_game);
+	if (GetCategoryVisibility(Category::Disc_Game)) filterList.append(cat::cat_disc_game);
+	if (GetCategoryVisibility(Category::PS1_Game)) filterList.append(cat::cat_ps1_game);
+	if (GetCategoryVisibility(Category::PS2_Game)) filterList.append(cat::ps2_games);
+	if (GetCategoryVisibility(Category::PSP_Game)) filterList.append(cat::psp_games);
+	if (GetCategoryVisibility(Category::Home)) filterList.append(cat::cat_home);
+	if (GetCategoryVisibility(Category::Media)) filterList.append(cat::media);
+	if (GetCategoryVisibility(Category::Data)) filterList.append(cat::data);
+	if (GetCategoryVisibility(Category::Unknown_Cat)) filterList.append(cat::cat_unknown);
+	if (GetCategoryVisibility(Category::Others)) filterList.append(cat::others);
 
-	return filters;
+	return filterList;
 }
 
-bool gui_settings::GetCategoryVisibility(int cat, bool is_list_mode) const
+bool gui_settings::GetCategoryVisibility(int cat) const
 {
-	const gui_save value = GetGuiSaveForCategory(cat, is_list_mode);
+	gui_save value;
+
+	switch (cat)
+	{
+	case Category::HDD_Game:
+		value = gui::cat_hdd_game; break;
+	case Category::Disc_Game:
+		value = gui::cat_disc_game; break;
+	case Category::PS1_Game:
+		value = gui::cat_ps1_game; break;
+	case Category::PS2_Game:
+		value = gui::cat_ps2_game; break;
+	case Category::PSP_Game:
+		value = gui::cat_psp_game; break;
+	case Category::Home:
+		value = gui::cat_home; break;
+	case Category::Media:
+		value = gui::cat_audio_video; break;
+	case Category::Data:
+		value = gui::cat_game_data; break;
+	case Category::Unknown_Cat:
+		value = gui::cat_unknown; break;
+	case Category::Others:
+		value = gui::cat_other; break;
+	default:
+		cfg_log.warning("GetCategoryVisibility: wrong cat <%d>", cat);
+		break;
+	}
+
 	return GetValue(value).toBool();
 }
 
-void gui_settings::SetCategoryVisibility(int cat, bool val, bool is_list_mode) const
+void gui_settings::SetCategoryVisibility(int cat, const bool& val) const
 {
-	const gui_save value = GetGuiSaveForCategory(cat, is_list_mode);
+	gui_save value;
+
+	switch (cat)
+	{
+	case Category::HDD_Game:
+		value = gui::cat_hdd_game; break;
+	case Category::Disc_Game:
+		value = gui::cat_disc_game; break;
+	case Category::Home:
+		value = gui::cat_home; break;
+	case Category::PS1_Game:
+		value = gui::cat_ps1_game; break;
+	case Category::PS2_Game:
+		value = gui::cat_ps2_game; break;
+	case Category::PSP_Game:
+		value = gui::cat_psp_game; break;
+	case Category::Media:
+		value = gui::cat_audio_video; break;
+	case Category::Data:
+		value = gui::cat_game_data; break;
+	case Category::Unknown_Cat:
+		value = gui::cat_unknown; break;
+	case Category::Others:
+		value = gui::cat_other; break;
+	default:
+		cfg_log.warning("SetCategoryVisibility: wrong cat <%d>", cat);
+		break;
+	}
+
 	SetValue(value, val);
 }
 
@@ -146,37 +111,38 @@ void gui_settings::ShowBox(QMessageBox::Icon icon, const QString& title, const Q
 
 	if (has_gui_setting && !GetValue(entry).toBool())
 	{
-		cfg_log.notice("%s Dialog for Entry %s was ignored", dialog_type, entry.name);
+		cfg_log.notice("%s Dialog for Entry %s was ignored", dialog_type, sstr(entry.name));
 		return;
 	}
 
 	const QFlags<QMessageBox::StandardButton> buttons = icon != QMessageBox::Information ? QMessageBox::Yes | QMessageBox::No : QMessageBox::Ok;
 
-	QMessageBox mb(icon, title, text, buttons, parent, Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint | (always_on_top ? Qt::WindowStaysOnTopHint : Qt::Widget));
-	mb.setTextFormat(Qt::RichText);
+	QMessageBox* mb = new QMessageBox(icon, title, text, buttons, parent, Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint | (always_on_top ? Qt::WindowStaysOnTopHint : Qt::Widget));
+	mb->deleteLater();
+	mb->setTextFormat(Qt::RichText);
 
 	if (has_gui_setting && icon != QMessageBox::Critical)
 	{
-		mb.setCheckBox(new QCheckBox(tr("Don't show again")));
+		mb->setCheckBox(new QCheckBox(tr("Don't show again")));
 	}
 
-	connect(&mb, &QMessageBox::finished, [&](int res)
+	connect(mb, &QMessageBox::finished, [&](int res)
 	{
 		if (result)
 		{
 			*result = res;
 		}
 
-		const auto checkBox = mb.checkBox();
+		const auto checkBox = mb->checkBox();
 
 		if (checkBox && checkBox->isChecked())
 		{
 			SetValue(entry, false);
-			cfg_log.notice("%s Dialog for Entry %s is now disabled", dialog_type, entry.name);
+			cfg_log.notice("%s Dialog for Entry %s is now disabled", dialog_type, sstr(entry.name));
 		}
 	});
 
-	mb.exec();
+	mb->exec();
 }
 
 void gui_settings::ShowConfirmationBox(const QString& title, const QString& text, const gui_save& entry, int* result = nullptr, QWidget* parent = nullptr)
@@ -191,23 +157,6 @@ void gui_settings::ShowInfoBox(const QString& title, const QString& text, const
 
 bool gui_settings::GetBootConfirmation(QWidget* parent, const gui_save& gui_save_entry)
 {
-	// Ensure no game has booted inbetween
-	const auto guard = Emu.MakeEmulationStateGuard();
-
-	const auto info = Emu.GetEmulationIdentifier();
-	const auto old_status = Emu.GetStatus(false);
-
-	qt_events_aware_op(16, [&]()
-	{
-		if (Emu.GetStatus(false) != system_state::stopping)
-		{
-			ensure(info == Emu.GetEmulationIdentifier(old_status == system_state::stopping));
-			return true;
-		}
-
-		return false;
-	});
-
 	if (!Emu.IsStopped())
 	{
 		QString title = tr("Close Running Game?");
@@ -231,36 +180,14 @@ bool gui_settings::GetBootConfirmation(QWidget* parent, const gui_save& gui_save
 		{
 			return false;
 		}
-
-		cfg_log.notice("User accepted to stop the current emulation.");
 	}
 
 	return true;
 }
 
-void gui_settings::SetSavestateGamelistColVisibility(gui::savestate_game_list_columns col, bool val) const
+void gui_settings::SetGamelistColVisibility(int col, bool val) const
 {
-	SetValue(GetGuiSaveForSavestateGameColumn(col), val);
-}
-
-void gui_settings::SetSavestateListColVisibility(gui::savestate_list_columns col, bool val) const
-{
-	SetValue(GetGuiSaveForSavestateColumn(col), val);
-}
-
-void gui_settings::SetTrophyGamelistColVisibility(gui::trophy_game_list_columns col, bool val) const
-{
-	SetValue(GetGuiSaveForTrophyGameColumn(col), val);
-}
-
-void gui_settings::SetTrophylistColVisibility(gui::trophy_list_columns col, bool val) const
-{
-	SetValue(GetGuiSaveForTrophyColumn(col), val);
-}
-
-void gui_settings::SetGamelistColVisibility(gui::game_list_columns col, bool val) const
-{
-	SetValue(GetGuiSaveForGameColumn(col), val);
+	SetValue(GetGuiSaveForColumn(col), val);
 }
 
 void gui_settings::SetCustomColor(int col, const QColor& val) const
@@ -273,29 +200,9 @@ logs::level gui_settings::GetLogLevel() const
 	return logs::level(GetValue(gui::l_level).toUInt());
 }
 
-bool gui_settings::GetSavestateGamelistColVisibility(gui::savestate_game_list_columns col) const
+bool gui_settings::GetGamelistColVisibility(int col) const
 {
-	return GetValue(GetGuiSaveForSavestateGameColumn(col)).toBool();
-}
-
-bool gui_settings::GetSavestateListColVisibility(gui::savestate_list_columns col) const
-{
-	return GetValue(GetGuiSaveForSavestateColumn(col)).toBool();
-}
-
-bool gui_settings::GetTrophyGamelistColVisibility(gui::trophy_game_list_columns col) const
-{
-	return GetValue(GetGuiSaveForTrophyGameColumn(col)).toBool();
-}
-
-bool gui_settings::GetTrophylistColVisibility(gui::trophy_list_columns col) const
-{
-	return GetValue(GetGuiSaveForTrophyColumn(col)).toBool();
-}
-
-bool gui_settings::GetGamelistColVisibility(gui::game_list_columns col) const
-{
-	return GetValue(GetGuiSaveForGameColumn(col)).toBool();
+	return GetValue(GetGuiSaveForColumn(col)).toBool();
 }
 
 QColor gui_settings::GetCustomColor(int col) const
@@ -313,10 +220,6 @@ QStringList gui_settings::GetStylesheetEntries() const
 	QDir platformStylesheetDir = QCoreApplication::applicationDirPath() + "/../Resources/GuiConfigs/";
 #else
 	QDir platformStylesheetDir = QCoreApplication::applicationDirPath() + "/../share/rpcs3/GuiConfigs/";
-#ifdef DATADIR
-	const QString data_dir = (DATADIR);
-	res.append(gui::utils::get_dir_entries(data_dir + "/GuiConfigs/", name_filter));
-#endif
 #endif
 	res.append(gui::utils::get_dir_entries(QCoreApplication::applicationDirPath() + "/GuiConfigs/", name_filter));
 	res.append(gui::utils::get_dir_entries(platformStylesheetDir, name_filter));
@@ -331,50 +234,9 @@ QSize gui_settings::SizeFromSlider(int pos)
 	return gui::gl_icon_size_min + (gui::gl_icon_size_max - gui::gl_icon_size_min) * (1.f * pos / gui::gl_max_slider_pos);
 }
 
-gui_save gui_settings::GetGuiSaveForSavestateGameColumn(gui::savestate_game_list_columns col)
-{
-	return gui_save{ gui::savestate, "visibility_" + gui::get_savestate_game_list_column_name(col), true };
-}
-
-gui_save gui_settings::GetGuiSaveForSavestateColumn(gui::savestate_list_columns col)
-{
-	return gui_save{ gui::savestate, "visibility_" + gui::get_savestate_list_column_name(col), true };
-}
-
-gui_save gui_settings::GetGuiSaveForTrophyGameColumn(gui::trophy_game_list_columns col)
-{
-	return gui_save{ gui::trophy, "visibility_" + gui::get_trophy_game_list_column_name(col), true };
-}
-
-gui_save gui_settings::GetGuiSaveForTrophyColumn(gui::trophy_list_columns col)
-{
-	return gui_save{ gui::trophy, "visibility_" + gui::get_trophy_list_column_name(col), true };
-}
-
-gui_save gui_settings::GetGuiSaveForGameColumn(gui::game_list_columns col)
+gui_save gui_settings::GetGuiSaveForColumn(int col)
 {
 	// hide sound format, parental level, firmware version and path by default
-	const bool show = col != gui::game_list_columns::sound && col != gui::game_list_columns::parental && col != gui::game_list_columns::firmware && col != gui::game_list_columns::path;
-	return gui_save{ gui::game_list, "visibility_" + gui::get_game_list_column_name(col), show };
-}
-
-gui_save gui_settings::GetGuiSaveForCategory(int cat, bool is_list_mode)
-{
-	switch (cat)
-	{
-	case Category::HDD_Game: return is_list_mode ? gui::cat_hdd_game : gui::grid_cat_hdd_game;
-	case Category::Disc_Game: return is_list_mode ? gui::cat_disc_game : gui::grid_cat_disc_game;
-	case Category::Home: return is_list_mode ? gui::cat_home : gui::grid_cat_home;
-	case Category::PS1_Game: return is_list_mode ? gui::cat_ps1_game : gui::grid_cat_ps1_game;
-	case Category::PS2_Game: return is_list_mode ? gui::cat_ps2_game : gui::grid_cat_ps2_game;
-	case Category::PSP_Game: return is_list_mode ? gui::cat_psp_game : gui::grid_cat_psp_game;
-	case Category::Media: return is_list_mode ? gui::cat_audio_video : gui::grid_cat_audio_video;
-	case Category::Data: return is_list_mode ? gui::cat_game_data : gui::grid_cat_game_data;
-	case Category::OS: return is_list_mode ? gui::cat_os : gui::grid_cat_os;
-	case Category::Unknown_Cat: return is_list_mode ? gui::cat_unknown : gui::grid_cat_unknown;
-	case Category::Others: return is_list_mode ? gui::cat_other : gui::grid_cat_other;
-	default:
-		cfg_log.warning("GetGuiSaveForCategory: wrong cat <%d>", cat);
-		return {};
-	}
+	const bool show = col != gui::column_sound && col != gui::column_parental && col != gui::column_firmware && col != gui::column_path;
+	return gui_save{ gui::game_list, "visibility_" + gui::get_game_list_column_name(static_cast<gui::game_list_columns>(col)), show };
 }
diff --git a/rpcs3/rpcs3qt/gui_settings.h b/rpcs3/rpcs3qt/gui_settings.h
index fbf66dceed..27b3c573e7 100644
--- a/rpcs3/rpcs3qt/gui_settings.h
+++ b/rpcs3/rpcs3qt/gui_settings.h
@@ -7,87 +7,74 @@
 #include <QSize>
 #include <QColor>
 #include <QMessageBox>
-#include <QWindow>
 
 namespace gui
 {
-	extern QString stylesheet;
-	extern bool custom_stylesheet_active;
+	static QString stylesheet;
 
 	enum custom_roles
 	{
 		game_role = Qt::UserRole + 1337,
 	};
 
-	enum class game_list_columns
+	enum game_list_columns
 	{
-		icon,
-		name,
-		serial,
-		firmware,
-		version,
-		category,
-		path,
-		move,
-		resolution,
-		sound,
-		parental,
-		last_play,
-		playtime,
-		compat,
-		dir_size,
+		column_icon,
+		column_name,
+		column_serial,
+		column_firmware,
+		column_version,
+		column_category,
+		column_path,
+		column_move,
+		column_resolution,
+		column_sound,
+		column_parental,
+		column_last_play,
+		column_playtime,
+		column_compat,
 
-		count
+		column_count
 	};
 
-	enum class trophy_list_columns
+	inline QString get_game_list_column_name(game_list_columns col)
 	{
-		icon = 0,
-		name = 1,
-		description = 2,
-		type = 3,
-		is_unlocked = 4,
-		id = 5,
-		platinum_link = 6,
-		time_unlocked = 7,
+		switch (col)
+		{
+		case column_icon:
+			return "column_icon";
+		case column_name:
+			return "column_name";
+		case column_serial:
+			return "column_serial";
+		case column_firmware:
+			return "column_firmware";
+		case column_version:
+			return "column_version";
+		case column_category:
+			return "column_category";
+		case column_path:
+			return "column_path";
+		case column_move:
+			return "column_move";
+		case column_resolution:
+			return "column_resolution";
+		case column_sound:
+			return "column_sound";
+		case column_parental:
+			return "column_parental";
+		case column_last_play:
+			return "column_last_play";
+		case column_playtime:
+			return "column_playtime";
+		case column_compat:
+			return "column_compat";
+		case column_count:
+			return "";
+		}
 
-		count
-	};
-
-	enum class trophy_game_list_columns
-	{
-		icon = 0,
-		name = 1,
-		progress = 2,
-		trophies = 3,
-
-		count
-	};
-
-	enum class savestate_game_list_columns
-	{
-		icon = 0,
-		name = 1,
-		savestates = 2,
-
-		count
-	};
-
-	enum class savestate_list_columns
-	{
-		name = 0,
-		compatible = 1,
-		date = 2,
-		path = 3,
-
-		count
-	};
-
-	QString get_savestate_game_list_column_name(savestate_game_list_columns col);
-	QString get_savestate_list_column_name(savestate_list_columns col);
-	QString get_trophy_game_list_column_name(trophy_game_list_columns col);
-	QString get_trophy_list_column_name(trophy_list_columns col);
-	QString get_game_list_column_name(game_list_columns col);
+		fmt::throw_exception("get_game_list_column_name: Invalid column");
+	}
 
 	const QSize gl_icon_size_min    = QSize(40, 22);
 	const QSize gl_icon_size_small  = QSize(80, 44);
@@ -108,11 +95,9 @@ namespace gui
 		return q_string_pair(path, title.simplified()); // simplified() forces single line text
 	}
 
-	const QString Settings          = "CurrentSettings";
+	const QString Settings = "CurrentSettings";
 	const QString DefaultStylesheet = "default";
-	const QString NoStylesheet      = "none";
-	const QString NativeStylesheet  = "native";
-	const QString DarkStylesheet    = "Darker Style by TheMitoSan";
+	const QString NoStylesheet = "none";
 
 	const QString main_window  = "main_window";
 	const QString game_list    = "GameList";
@@ -126,12 +111,7 @@ namespace gui
 	const QString patches      = "Patches";
 	const QString localization = "Localization";
 	const QString pad_settings = "PadSettings";
-	const QString config       = "Config";
-	const QString log_viewer   = "LogViewer";
-	const QString sc           = "Shortcuts";
-	const QString navigation   = "PadNavigation";
-	const QString savestate    = "Savestate";
-
+	
 	const QString update_on   = "true";
 	const QString update_off  = "false";
 	const QString update_auto = "auto";
@@ -142,10 +122,6 @@ namespace gui
 	const gui_save rg_freeze  = gui_save(main_window, "recentGamesFrozen", false);
 	const gui_save rg_entries = gui_save(main_window, "recentGamesNames",  QVariant::fromValue(q_pair_list()));
 
-	const gui_save rs_freeze  = gui_save(main_window, "recentSavestatesFrozen", false);
-	const gui_save rs_entries = gui_save(main_window, "recentSavestatesNames",  QVariant::fromValue(q_pair_list()));
-
-	const gui_save ib_skip_version = gui_save(main_window, "infoBoxSkipVersion",       "");
 	const gui_save ib_pkg_success  = gui_save(main_window, "infoBoxEnabledInstallPKG", true);
 	const gui_save ib_pup_success  = gui_save(main_window, "infoBoxEnabledInstallPUP", true);
 	const gui_save ib_show_welcome = gui_save(main_window, "infoBoxEnabledWelcome",    true);
@@ -153,7 +129,6 @@ namespace gui
 	const gui_save ib_confirm_boot = gui_save(main_window, "confirmationBoxBootGame",  true);
 	const gui_save ib_obsolete_cfg = gui_save(main_window, "confirmationObsoleteCfg",  true);
 	const gui_save ib_same_buttons = gui_save(main_window, "confirmationSameButtons",  true);
-	const gui_save ib_restart_hint = gui_save(main_window, "confirmationRestart",      true);
 
 	const gui_save fd_install_pkg  = gui_save(main_window, "lastExplorePathPKG",  "");
 	const gui_save fd_install_pup  = gui_save(main_window, "lastExplorePathPUP",  "");
@@ -164,10 +139,6 @@ namespace gui
 	const gui_save fd_log_viewer   = gui_save(main_window, "lastExplorePathLOG",  "");
 	const gui_save fd_ext_mself    = gui_save(main_window, "lastExplorePathExMSELF",  "");
 	const gui_save fd_ext_tar      = gui_save(main_window, "lastExplorePathExTAR",  "");
-	const gui_save fd_insert_disc  = gui_save(main_window, "lastExplorePathDISC", "");
-	const gui_save fd_cfg_check    = gui_save(main_window, "lastExplorePathCfgChk", "");
-	const gui_save fd_save_elf     = gui_save(main_window, "lastExplorePathSaveElf", "");
-	const gui_save fd_save_log     = gui_save(main_window, "lastExplorePathSaveLog", "");
 
 	const gui_save mw_debugger         = gui_save(main_window, "debuggerVisible",  false);
 	const gui_save mw_logger           = gui_save(main_window, "loggerVisible",    true);
@@ -186,22 +157,9 @@ namespace gui
 	const gui_save cat_home        = gui_save(game_list, "categoryVisibleHome",       true);
 	const gui_save cat_audio_video = gui_save(game_list, "categoryVisibleAudioVideo", true);
 	const gui_save cat_game_data   = gui_save(game_list, "categoryVisibleGameData",   false);
-	const gui_save cat_os          = gui_save(game_list, "categoryVisibleOS",         false);
 	const gui_save cat_unknown     = gui_save(game_list, "categoryVisibleUnknown",    true);
 	const gui_save cat_other       = gui_save(game_list, "categoryVisibleOther",      true);
 
-	const gui_save grid_cat_hdd_game    = gui_save(game_list, "gridCategoryVisibleHDDGame",    true);
-	const gui_save grid_cat_disc_game   = gui_save(game_list, "gridCategoryVisibleDiscGame",   true);
-	const gui_save grid_cat_ps1_game    = gui_save(game_list, "gridCategoryVisiblePS1Game",    true);
-	const gui_save grid_cat_ps2_game    = gui_save(game_list, "gridCategoryVisiblePS2Game",    true);
-	const gui_save grid_cat_psp_game    = gui_save(game_list, "gridCategoryVisiblePSPGame",    true);
-	const gui_save grid_cat_home        = gui_save(game_list, "gridCategoryVisibleHome",       true);
-	const gui_save grid_cat_audio_video = gui_save(game_list, "gridCategoryVisibleAudioVideo", true);
-	const gui_save grid_cat_game_data   = gui_save(game_list, "gridCategoryVisibleGameData",   false);
-	const gui_save grid_cat_os          = gui_save(game_list, "gridCategoryVisibleOS",         false);
-	const gui_save grid_cat_unknown     = gui_save(game_list, "gridCategoryVisibleUnknown",    true);
-	const gui_save grid_cat_other       = gui_save(game_list, "gridCategoryVisibleOther",      true);
-
 	const gui_save gl_sortAsc      = gui_save(game_list, "sortAsc",      true);
 	const gui_save gl_sortCol      = gui_save(game_list, "sortCol",      1);
 	const gui_save gl_state        = gui_save(game_list, "state",        QByteArray());
@@ -214,7 +172,6 @@ namespace gui
 	const gui_save gl_show_hidden  = gui_save(game_list, "show_hidden",  false);
 	const gui_save gl_hidden_list  = gui_save(game_list, "hidden_list",  QStringList());
 	const gui_save gl_draw_compat  = gui_save(game_list, "draw_compat",  false);
-	const gui_save gl_pref_gd_icon = gui_save(game_list, "pref_gd_icon", false);
 	const gui_save gl_custom_icon  = gui_save(game_list, "custom_icon",  true);
 	const gui_save gl_hover_gifs   = gui_save(game_list, "hover_gifs",   true);
 
@@ -224,32 +181,24 @@ namespace gui
 	const gui_save fs_dev_flash_list    = gui_save(fs, "dev_flash_list",    QStringList());
 	const gui_save fs_dev_flash2_list   = gui_save(fs, "dev_flash2_list",   QStringList());
 	const gui_save fs_dev_flash3_list   = gui_save(fs, "dev_flash3_list",   QStringList());
-	const gui_save fs_dev_bdvd_list     = gui_save(fs, "dev_bdvd_list",     QStringList());
-	const gui_save fs_games_list        = gui_save(fs, "games_list",        QStringList());
-	const gui_save fs_dev_usb_list      = gui_save(fs, "dev_usb00X_list",   QStringList()); // Used as a template for all usb paths
+	const gui_save fs_dev_usb000_list   = gui_save(fs, "dev_usb000_list",   QStringList());
 
 	const gui_save l_tty       = gui_save(logger, "TTY",       true);
 	const gui_save l_level     = gui_save(logger, "level",     static_cast<uchar>(logs::level::success));
 	const gui_save l_prefix    = gui_save(logger, "prefix_on", false);
-	const gui_save l_stack_err = gui_save(logger, "ERR_stack", true);
 	const gui_save l_stack     = gui_save(logger, "stack",     true);
 	const gui_save l_stack_tty = gui_save(logger, "TTY_stack", false);
-	const gui_save l_ansi_code = gui_save(logger, "ANSI_code", true);
 	const gui_save l_limit     = gui_save(logger, "limit",     1000);
 	const gui_save l_limit_tty = gui_save(logger, "TTY_limit", 1000);
 
 	const gui_save d_splitterState = gui_save(debugger, "splitterState", QByteArray());
+	const gui_save d_centerPC      = gui_save(debugger, "centerPC",      false);
 
 	const gui_save rsx_geometry = gui_save(rsx, "geometry", QByteArray());
 	const gui_save rsx_states   = gui_save(rsx, "states",   QVariantMap());
 
-#ifdef __APPLE__
-	const gui_save m_currentStylesheet = gui_save(meta, "currentStylesheet", "native (macOS)");
-#else
 	const gui_save m_currentStylesheet = gui_save(meta, "currentStylesheet", DefaultStylesheet);
-#endif
 	const gui_save m_showDebugTab      = gui_save(meta, "showDebugTab",      false);
-	const gui_save m_attachCommandLine = gui_save(meta, "attachCommandLine", false);
 	const gui_save m_enableUIColors    = gui_save(meta, "enableUIColors",    false);
 	const gui_save m_richPresence      = gui_save(meta, "useRichPresence",   true);
 	const gui_save m_discordState      = gui_save(meta, "discordState",      "");
@@ -260,21 +209,10 @@ namespace gui
 	const gui_save gs_showMouseFs       = gui_save(gs_frame, "showMouseInFullscreen", false);
 	const gui_save gs_lockMouseFs       = gui_save(gs_frame, "lockMouseInFullscreen", true);
 	const gui_save gs_resize            = gui_save(gs_frame, "resize",                false);
-	const gui_save gs_resize_manual     = gui_save(gs_frame, "resizeManual",          true);
-	const gui_save gs_screen            = gui_save(gs_frame, "screen",                0);
 	const gui_save gs_width             = gui_save(gs_frame, "width",                 1280);
 	const gui_save gs_height            = gui_save(gs_frame, "height",                720);
 	const gui_save gs_hideMouseIdle     = gui_save(gs_frame, "hideMouseOnIdle",       false);
 	const gui_save gs_hideMouseIdleTime = gui_save(gs_frame, "hideMouseOnIdleTime",   2000);
-	const gui_save gs_geometry          = gui_save(gs_frame, "geometry",              QRect());
-	const gui_save gs_visibility        = gui_save(gs_frame, "visibility",            QWindow::Visibility::AutomaticVisibility);
-
-	const gui_save ss_icon_color      = gui_save(trophy, "icon_color",    gl_icon_color);
-	const gui_save ss_game_icon_size  = gui_save(trophy, "game_icon_size",  25);
-	const gui_save ss_geometry        = gui_save(trophy, "geometry",        QByteArray());
-	const gui_save ss_splitterState   = gui_save(trophy, "splitterState",   QByteArray());
-	const gui_save ss_games_state     = gui_save(trophy, "games_state",     QByteArray());
-	const gui_save ss_savestate_state = gui_save(trophy, "savestate_state", QByteArray());
 
 	const gui_save tr_icon_color    = gui_save(trophy, "icon_color",    gl_icon_color);
 	const gui_save tr_icon_height   = gui_save(trophy, "icon_height",   75);
@@ -301,21 +239,9 @@ namespace gui
 
 	const gui_save um_geometry    = gui_save(users, "geometry",    QByteArray());
 
-	const gui_save cfg_geometry = gui_save(config, "geometry", QByteArray());
-
 	const gui_save loc_language = gui_save(localization, "language", "en");
 
 	const gui_save pads_show_emulated = gui_save(pad_settings, "show_emulated_values", false);
-	const gui_save pads_geometry      = gui_save(pad_settings, "geometry",             QByteArray());
-
-	const gui_save lv_show_timestamps = gui_save(log_viewer, "show_timestamps", true);
-	const gui_save lv_show_threads    = gui_save(log_viewer, "show_threads",    true);
-	const gui_save lv_log_levels      = gui_save(log_viewer, "log_levels",      0b11111111u);
-
-	const gui_save sc_shortcuts = gui_save(sc, "shortcuts", QVariantMap());
-
-	const gui_save nav_enabled = gui_save(navigation, "pad_input_enabled",      false);
-	const gui_save nav_global  = gui_save(navigation, "allow_global_pad_input", false);
 }
 
 /** Class for GUI settings..
@@ -327,42 +253,29 @@ class gui_settings : public settings
 public:
 	explicit gui_settings(QObject* parent = nullptr);
 
-	bool GetCategoryVisibility(int cat, bool is_list_mode) const;
+	bool GetCategoryVisibility(int cat) const;
 
 	void ShowConfirmationBox(const QString& title, const QString& text, const gui_save& entry, int* result, QWidget* parent);
 	void ShowInfoBox(const QString& title, const QString& text, const gui_save& entry, QWidget* parent);
 	bool GetBootConfirmation(QWidget* parent, const gui_save& gui_save_entry = gui_save());
 
 	logs::level GetLogLevel() const;
-	bool GetSavestateGamelistColVisibility(gui::savestate_game_list_columns col) const;
-	bool GetSavestateListColVisibility(gui::savestate_list_columns col) const;
-	bool GetTrophyGamelistColVisibility(gui::trophy_game_list_columns col) const;
-	bool GetTrophylistColVisibility(gui::trophy_list_columns col) const;
-	bool GetGamelistColVisibility(gui::game_list_columns col) const;
+	bool GetGamelistColVisibility(int col) const;
 	QColor GetCustomColor(int col) const;
 	QStringList GetStylesheetEntries() const;
-	QStringList GetGameListCategoryFilters(bool is_list_mode) const;
-
-	static QSize SizeFromSlider(int pos);
+	QStringList GetGameListCategoryFilters() const;
 
+public Q_SLOTS:
 	/** Sets the visibility of the chosen category. */
-	void SetCategoryVisibility(int cat, bool val, bool is_list_mode) const;
+	void SetCategoryVisibility(int cat, const bool& val) const;
 
-	void SetSavestateGamelistColVisibility(gui::savestate_game_list_columns col, bool val) const;
-	void SetSavestateListColVisibility(gui::savestate_list_columns col, bool val) const;
-	void SetTrophyGamelistColVisibility(gui::trophy_game_list_columns col, bool val) const;
-	void SetTrophylistColVisibility(gui::trophy_list_columns col, bool val) const;
-	void SetGamelistColVisibility(gui::game_list_columns col, bool val) const;
+	void SetGamelistColVisibility(int col, bool val) const;
 
 	void SetCustomColor(int col, const QColor& val) const;
 
-private:
-	static gui_save GetGuiSaveForSavestateGameColumn(gui::savestate_game_list_columns col);
-	static gui_save GetGuiSaveForSavestateColumn(gui::savestate_list_columns col);
-	static gui_save GetGuiSaveForTrophyGameColumn(gui::trophy_game_list_columns col);
-	static gui_save GetGuiSaveForTrophyColumn(gui::trophy_list_columns col);
-	static gui_save GetGuiSaveForGameColumn(gui::game_list_columns col);
-	static gui_save GetGuiSaveForCategory(int cat, bool is_list_mode);
+	static QSize SizeFromSlider(int pos);
+	static gui_save GetGuiSaveForColumn(int col);
 
+private:
 	void ShowBox(QMessageBox::Icon icon, const QString& title, const QString& text, const gui_save& entry, int* result, QWidget* parent, bool always_on_top);
 };
diff --git a/rpcs3/rpcs3qt/hex_validator.h b/rpcs3/rpcs3qt/hex_validator.h
deleted file mode 100644
index e11624483d..0000000000
--- a/rpcs3/rpcs3qt/hex_validator.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#pragma once
-
-#include <QValidator>
-#include <QRegularExpression>
-
-class HexValidator : public QValidator
-{
-public:
-	explicit HexValidator(QObject* parent = nullptr, int max_bits = 32)
-		: QValidator(parent)
-		, m_max_bits(max_bits)
-	{}
-
-	State validate(QString& input, int& pos) const override
-	{
-		Q_UNUSED(pos);
-
-		QString stripped = input.toLower().remove(' ');
-
-		if (stripped.startsWith("0x"))
-			stripped = stripped.mid(2);
-
-		if (stripped.endsWith("h"))
-			stripped.chop(1);
-
-		if (stripped.isEmpty())
-			return QValidator::Intermediate;
-
-		if (stripped.length() > 16)
-			return QValidator::Invalid;
-
-		static const QRegularExpression hex_re("^[0-9a-f]+$");
-		if (!hex_re.match(stripped).hasMatch())
-			return QValidator::Invalid;
-
-		QString sig = stripped;
-		sig.remove(QRegularExpression("^0+"));
-		const int sig_nibbles = sig.isEmpty() ? 1 : sig.length();
-		if (sig_nibbles > (m_max_bits + 3) / 4)
-			return QValidator::Invalid;
-
-		bool ok = false;
-		const qulonglong value = stripped.toULongLong(&ok, 16);
-		if (!ok)
-			return QValidator::Invalid;
-
-		if (m_max_bits < 64)
-		{
-			const qulonglong max_val = (qulonglong(1) << m_max_bits) - 1;
-			if (value > max_val)
-				return QValidator::Invalid;
-		}
-
-		return QValidator::Acceptable;
-	}
-
-private:
-	const int m_max_bits;
-};
-
-inline QString normalize_hex_qstring(const QString& input)
-{
-	QString s = input;
-	s.remove(' ');
-	s = s.toLower();
-	if (s.startsWith("0x"))
-		s = s.mid(2);
-	if (s.endsWith('h'))
-		s.chop(1);
-	return s;
-}
-
-inline bool parse_hex_qstring(const QString& input, u64* result, int max_bits = 32)
-{
-	QString s = input;
-	int pos = 0;
-	const HexValidator validator(nullptr, max_bits);
-	const QValidator::State st = validator.validate(s, pos);
-
-	if (st != QValidator::Acceptable)
-		return false;
-
-	const QString norm = normalize_hex_qstring(input);
-	bool ok = false;
-	const quint64 value = norm.toULongLong(&ok, 16);
-
-	if (ok && result)
-		*result = static_cast<u64>(value);
-
-	return ok;
-}
diff --git a/rpcs3/rpcs3qt/infinity_dialog.cpp b/rpcs3/rpcs3qt/infinity_dialog.cpp
deleted file mode 100644
index b172ddad22..0000000000
--- a/rpcs3/rpcs3qt/infinity_dialog.cpp
+++ /dev/null
@@ -1,834 +0,0 @@
-#include "stdafx.h"
-#include "Utilities/File.h"
-#include "Crypto/aes.h"
-#include "Crypto/sha1.h"
-#include "infinity_dialog.h"
-#include "Emu/Io/Infinity.h"
-
-#include <QLabel>
-#include <QGroupBox>
-#include <QFileDialog>
-#include <QVBoxLayout>
-#include <QMessageBox>
-#include <QComboBox>
-#include <QPushButton>
-#include <QStringList>
-#include <QCompleter>
-
-infinity_dialog* infinity_dialog::inst = nullptr;
-std::array<std::optional<u32>, 9> infinity_dialog::figure_slots = {};
-static QString s_last_figure_path;
-
-LOG_CHANNEL(infinity_log, "infinity");
-
-static constexpr std::array<u8, 16> BLANK_BLOCK = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static constexpr std::array<u8, 32> SHA1_CONSTANT = {
-	0xAF, 0x62, 0xD2, 0xEC, 0x04, 0x91, 0x96, 0x8C, 0xC5, 0x2A, 0x1A, 0x71, 0x65, 0xF8, 0x65, 0xFE,
-	0x28, 0x63, 0x29, 0x20, 0x44, 0x69, 0x73, 0x6e, 0x65, 0x79, 0x20, 0x32, 0x30, 0x31, 0x33};
-
-const std::map<const u32, const std::pair<const u8, const std::string>> list_figures = {
-	{0x0F4241, {1, "Mr. Incredible"}},
-	{0x0F4242, {1, "Sulley"}},
-	{0x0F4243, {1, "Jack Sparrow"}},
-	{0x0F4244, {1, "Lone Ranger"}},
-	{0x0F4245, {1, "Tonto"}},
-	{0x0F4246, {1, "Lightning McQueen"}},
-	{0x0F4247, {1, "Holley Shiftwell"}},
-	{0x0F4248, {1, "Buzz Lightyear"}},
-	{0x0F4249, {1, "Jessie"}},
-	{0x0F424A, {1, "Mike"}},
-	{0x0F424B, {1, "Mrs. Incredible"}},
-	{0x0F424C, {1, "Hector Barbossa"}},
-	{0x0F424D, {1, "Davy Jones"}},
-	{0x0F424E, {1, "Randy"}},
-	{0x0F424F, {1, "Syndrome"}},
-	{0x0F4250, {1, "Woody"}},
-	{0x0F4251, {1, "Mater"}},
-	{0x0F4252, {1, "Dash"}},
-	{0x0F4253, {1, "Violet"}},
-	{0x0F4254, {1, "Francesco Bernoulli"}},
-	{0x0F4255, {1, "Sorcerer's Apprentice Mickey"}},
-	{0x0F4256, {1, "Jack Skellington"}},
-	{0x0F4257, {1, "Rapunzel"}},
-	{0x0F4258, {1, "Anna"}},
-	{0x0F4259, {1, "Elsa"}},
-	{0x0F425A, {1, "Phineas"}},
-	{0x0F425B, {1, "Agent P"}},
-	{0x0F425C, {1, "Wreck-It Ralph"}},
-	{0x0F425D, {1, "Vanellope"}},
-	{0x0F425E, {1, "Mr. Incredible (Crystal)"}},
-	{0x0F425F, {1, "Jack Sparrow (Crystal)"}},
-	{0x0F4260, {1, "Sulley (Crystal)"}},
-	{0x0F4261, {1, "Lightning McQueen (Crystal)"}},
-	{0x0F4262, {1, "Lone Ranger (Crystal)"}},
-	{0x0F4263, {1, "Buzz Lightyear (Crystal)"}},
-	{0x0F4264, {1, "Agent P (Crystal)"}},
-	{0x0F4265, {1, "Sorcerer's Apprentice Mickey (Crystal)"}},
-	{0x0F4266, {1, "Buzz Lightyear (Glowing)"}},
-	{0x0F42A4, {2, "Captain America"}},
-	{0x0F42A5, {2, "Hulk"}},
-	{0x0F42A6, {2, "Iron Man"}},
-	{0x0F42A7, {2, "Thor"}},
-	{0x0F42A8, {2, "Groot"}},
-	{0x0F42A9, {2, "Rocket Raccoon"}},
-	{0x0F42AA, {2, "Star-Lord"}},
-	{0x0F42AB, {2, "Spider-Man"}},
-	{0x0F42AC, {2, "Nick Fury"}},
-	{0x0F42AD, {2, "Black Widow"}},
-	{0x0F42AE, {2, "Hawkeye"}},
-	{0x0F42AF, {2, "Drax"}},
-	{0x0F42B0, {2, "Gamora"}},
-	{0x0F42B1, {2, "Iron Fist"}},
-	{0x0F42B2, {2, "Nova"}},
-	{0x0F42B3, {2, "Venom"}},
-	{0x0F42B4, {2, "Donald Duck"}},
-	{0x0F42B5, {2, "Aladdin"}},
-	{0x0F42B6, {2, "Stitch"}},
-	{0x0F42B7, {2, "Merida"}},
-	{0x0F42B8, {2, "Tinker Bell"}},
-	{0x0F42B9, {2, "Maleficent"}},
-	{0x0F42BA, {2, "Hiro"}},
-	{0x0F42BB, {2, "Baymax"}},
-	{0x0F42BC, {2, "Loki"}},
-	{0x0F42BD, {2, "Ronan"}},
-	{0x0F42BE, {2, "Green Goblin"}},
-	{0x0F42BF, {2, "Falcon"}},
-	{0x0F42C0, {2, "Yondu"}},
-	{0x0F42C1, {2, "Jasmine"}},
-	{0x0F42C6, {2, "Black Suit Spider-Man"}},
-	{0x0F42D6, {3, "Sam Flynn"}},
-	{0x0F42D7, {3, "Quorra"}},
-	{0x0F4308, {3, "Anakin Skywalker"}},
-	{0x0F4309, {3, "Obi-Wan Kenobi"}},
-	{0x0F430A, {3, "Yoda"}},
-	{0x0F430B, {3, "Ahsoka Tano"}},
-	{0x0F430C, {3, "Darth Maul"}},
-	{0x0F430E, {3, "Luke Skywalker"}},
-	{0x0F430F, {3, "Han Solo"}},
-	{0x0F4310, {3, "Princess Leia"}},
-	{0x0F4311, {3, "Chewbacca"}},
-	{0x0F4312, {3, "Darth Vader"}},
-	{0x0F4313, {3, "Boba Fett"}},
-	{0x0F4314, {3, "Ezra Bridger"}},
-	{0x0F4315, {3, "Kanan Jarrus"}},
-	{0x0F4316, {3, "Sabine Wren"}},
-	{0x0F4317, {3, "Zeb Orrelios"}},
-	{0x0F4318, {3, "Joy"}},
-	{0x0F4319, {3, "Anger"}},
-	{0x0F431A, {3, "Fear"}},
-	{0x0F431B, {3, "Sadness"}},
-	{0x0F431C, {3, "Disgust"}},
-	{0x0F431D, {3, "Mickey Mouse"}},
-	{0x0F431E, {3, "Minnie Mouse"}},
-	{0x0F431F, {3, "Mulan"}},
-	{0x0F4320, {3, "Olaf"}},
-	{0x0F4321, {3, "Vision"}},
-	{0x0F4322, {3, "Ultron"}},
-	{0x0F4323, {3, "Ant-Man"}},
-	{0x0F4325, {3, "Captain America - The First Avenger"}},
-	{0x0F4326, {3, "Finn"}},
-	{0x0F4327, {3, "Kylo Ren"}},
-	{0x0F4328, {3, "Poe Dameron"}},
-	{0x0F4329, {3, "Rey"}},
-	{0x0F432B, {3, "Spot"}},
-	{0x0F432C, {3, "Nick Wilde"}},
-	{0x0F432D, {3, "Judy Hopps"}},
-	{0x0F432E, {3, "Hulkbuster"}},
-	{0x0F432F, {3, "Anakin Skywalker (Light FX)"}},
-	{0x0F4330, {3, "Obi-Wan Kenobi (Light FX)"}},
-	{0x0F4331, {3, "Yoda (Light FX)"}},
-	{0x0F4332, {3, "Luke Skywalker (Light FX)"}},
-	{0x0F4333, {3, "Darth Vader (Light FX)"}},
-	{0x0F4334, {3, "Kanan Jarrus (Light FX)"}},
-	{0x0F4335, {3, "Kylo Ren (Light FX)"}},
-	{0x0F4336, {3, "Black Panther"}},
-	{0x0F436C, {3, "Nemo"}},
-	{0x0F436D, {3, "Dory"}},
-	{0x0F436E, {3, "Baloo"}},
-	{0x0F436F, {3, "Alice"}},
-	{0x0F4370, {3, "Mad Hatter"}},
-	{0x0F4371, {3, "Time"}},
-	{0x0F4372, {3, "Peter Pan"}},
-	{0x1E8481, {1, "Starter Play Set"}},
-	{0x1E8482, {1, "Lone Ranger Play Set"}},
-	{0x1E8483, {1, "Cars Play Set"}},
-	{0x1E8484, {1, "Toy Story in Space Play Set"}},
-	{0x1E84E4, {2, "Marvel's The Avengers Play Set"}},
-	{0x1E84E5, {2, "Marvel's Spider-Man Play Set"}},
-	{0x1E84E6, {2, "Marvel's Guardians of the Galaxy Play Set"}},
-	{0x1E84E7, {2, "Assault on Asgard"}},
-	{0x1E84E8, {2, "Escape from the Kyln"}},
-	{0x1E84E9, {2, "Stitch's Tropical Rescue"}},
-	{0x1E84EA, {2, "Brave Forest Siege"}},
-	{0x1E8548, {3, "Inside Out Play Set"}},
-	{0x1E8549, {3, "Star Wars: Twilight of the Republic Play Set"}},
-	{0x1E854A, {3, "Star Wars: Rise Against the Empire Play Set"}},
-	{0x1E854B, {3, "Star Wars: The Force Awakens Play Set"}},
-	{0x1E854C, {3, "Marvel Battlegrounds Play Set"}},
-	{0x1E854D, {3, "Toy Box Speedway"}},
-	{0x1E854E, {3, "Toy Box Takeover"}},
-	{0x1E85AC, {3, "Finding Dory Play Set"}},
-	{0x2DC6C3, {1, "Bolt's Super Strength"}},
-	{0x2DC6C4, {1, "Ralph's Power of Destruction"}},
-	{0x2DC6C5, {1, "Chernabog's Power"}},
-	{0x2DC6C6, {1, "C.H.R.O.M.E. Damage Increaser"}},
-	{0x2DC6C7, {1, "Dr. Doofenshmirtz's Damage-Inator!"}},
-	{0x2DC6C8, {1, "Electro-Charge"}},
-	{0x2DC6C9, {1, "Fix-It Felix's Repair Power"}},
-	{0x2DC6CA, {1, "Rapunzel's Healing"}},
-	{0x2DC6CB, {1, "C.H.R.O.M.E. Armor Shield"}},
-	{0x2DC6CC, {1, "Star Command Shield"}},
-	{0x2DC6CD, {1, "Violet's Force Field"}},
-	{0x2DC6CE, {1, "Pieces of Eight"}},
-	{0x2DC6CF, {1, "Scrooge McDuck's Lucky Dime"}},
-	{0x2DC6D0, {1, "User Control"}},
-	{0x2DC6D1, {1, "Sorcerer Mickey's Hat"}},
-	{0x2DC6FE, {1, "Emperor Zurg's Wrath"}},
-	{0x2DC6FF, {1, "Merlin's Summon"}},
-	{0x2DC765, {2, "Enchanted Rose"}},
-	{0x2DC766, {2, "Mulan's Training Uniform"}},
-	{0x2DC767, {2, "Flubber"}},
-	{0x2DC768, {2, "S.H.I.E.L.D. Helicarrier Strike"}},
-	{0x2DC769, {2, "Zeus' Thunderbolts"}},
-	{0x2DC76A, {2, "King Louie's Monkeys"}},
-	{0x2DC76B, {2, "Infinity Gauntlet"}},
-	{0x2DC76D, {2, "Sorcerer Supreme"}},
-	{0x2DC76E, {2, "Maleficent's Spell Cast"}},
-	{0x2DC76F, {2, "Chernabog's Spirit Cyclone"}},
-	{0x2DC770, {2, "Marvel Team-Up: Capt. Marvel"}},
-	{0x2DC771, {2, "Marvel Team-Up: Iron Patriot"}},
-	{0x2DC772, {2, "Marvel Team-Up: Ant-Man"}},
-	{0x2DC773, {2, "Marvel Team-Up: White Tiger"}},
-	{0x2DC774, {2, "Marvel Team-Up: Yondu"}},
-	{0x2DC775, {2, "Marvel Team-Up: Winter Soldier"}},
-	{0x2DC776, {2, "Stark Arc Reactor"}},
-	{0x2DC777, {2, "Gamma Rays"}},
-	{0x2DC778, {2, "Alien Symbiote"}},
-	{0x2DC779, {2, "All for One"}},
-	{0x2DC77A, {2, "Sandy Claws Surprise"}},
-	{0x2DC77B, {2, "Glory Days"}},
-	{0x2DC77C, {2, "Cursed Pirate Gold"}},
-	{0x2DC77D, {2, "Sentinel of Liberty"}},
-	{0x2DC77E, {2, "The Immortal Iron Fist"}},
-	{0x2DC77F, {2, "Space Armor"}},
-	{0x2DC780, {2, "Rags to Riches"}},
-	{0x2DC781, {2, "Ultimate Falcon"}},
-	{0x2DC788, {3, "Tomorrowland Time Bomb"}},
-	{0x2DC78E, {3, "Galactic Team-Up: Mace Windu"}},
-	{0x2DC791, {3, "Luke's Rebel Alliance Flight Suit Costume"}},
-	{0x2DC798, {3, "Finn's Stormtrooper Costume"}},
-	{0x2DC799, {3, "Poe's Resistance Jacket"}},
-	{0x2DC79A, {3, "Resistance Tactical Strike"}},
-	{0x2DC79E, {3, "Officer Nick Wilde"}},
-	{0x2DC79F, {3, "Meter Maid Judy"}},
-	{0x2DC7A2, {3, "Darkhawk's Blast"}},
-	{0x2DC7A3, {3, "Cosmic Cube Blast"}},
-	{0x2DC7A4, {3, "Princess Leia's Boushh Disguise"}},
-	{0x2DC7A6, {3, "Nova Corps Strike"}},
-	{0x2DC7A7, {3, "King Mickey"}},
-	{0x3D0912, {1, "Mickey's Car"}},
-	{0x3D0913, {1, "Cinderella's Coach"}},
-	{0x3D0914, {1, "Electric Mayhem Bus"}},
-	{0x3D0915, {1, "Cruella De Vil's Car"}},
-	{0x3D0916, {1, "Pizza Planet Delivery Truck"}},
-	{0x3D0917, {1, "Mike's New Car"}},
-	{0x3D0919, {1, "Parking Lot Tram"}},
-	{0x3D091A, {1, "Captain Hook's Ship"}},
-	{0x3D091B, {1, "Dumbo"}},
-	{0x3D091C, {1, "Calico Helicopter"}},
-	{0x3D091D, {1, "Maximus"}},
-	{0x3D091E, {1, "Angus"}},
-	{0x3D091F, {1, "Abu the Elephant"}},
-	{0x3D0920, {1, "Headless Horseman's Horse"}},
-	{0x3D0921, {1, "Phillipe"}},
-	{0x3D0922, {1, "Khan"}},
-	{0x3D0923, {1, "Tantor"}},
-	{0x3D0924, {1, "Dragon Firework Cannon"}},
-	{0x3D0925, {1, "Stitch's Blaster"}},
-	{0x3D0926, {1, "Toy Story Mania Blaster"}},
-	{0x3D0927, {1, "Flamingo Croquet Mallet"}},
-	{0x3D0928, {1, "Carl Fredricksen's Cane"}},
-	{0x3D0929, {1, "Hangin' Ten Stitch With Surfboard"}},
-	{0x3D092A, {1, "Condorman Glider"}},
-	{0x3D092B, {1, "WALL-E's Fire Extinguisher"}},
-	{0x3D092C, {1, "On the Grid"}},
-	{0x3D092D, {1, "WALL-E's Collection"}},
-	{0x3D092E, {1, "King Candy's Dessert Toppings"}},
-	{0x3D0930, {1, "Victor's Experiments"}},
-	{0x3D0931, {1, "Jack's Scary Decorations"}},
-	{0x3D0933, {1, "Frozen Flourish"}},
-	{0x3D0934, {1, "Rapunzel's Kingdom"}},
-	{0x3D0935, {1, "TRON Interface"}},
-	{0x3D0936, {1, "Buy N Large Atmosphere"}},
-	{0x3D0937, {1, "Sugar Rush Sky"}},
-	{0x3D0939, {1, "New Holland Skyline"}},
-	{0x3D093A, {1, "Halloween Town Sky"}},
-	{0x3D093C, {1, "Chill in the Air"}},
-	{0x3D093D, {1, "Rapunzel's Birthday Sky"}},
-	{0x3D0940, {1, "Astro Blasters Space Cruiser"}},
-	{0x3D0941, {1, "Marlin's Reef"}},
-	{0x3D0942, {1, "Nemo's Seascape"}},
-	{0x3D0943, {1, "Alice's Wonderland"}},
-	{0x3D0944, {1, "Tulgey Wood"}},
-	{0x3D0945, {1, "Tri-State Area Terrain"}},
-	{0x3D0946, {1, "Danville Sky"}},
-	{0x3D0965, {2, "Stark Tech"}},
-	{0x3D0966, {2, "Spider-Streets"}},
-	{0x3D0967, {2, "World War Hulk"}},
-	{0x3D0968, {2, "Gravity Falls Forest"}},
-	{0x3D0969, {2, "Neverland"}},
-	{0x3D096A, {2, "Simba's Pridelands"}},
-	{0x3D096C, {2, "Calhoun's Command"}},
-	{0x3D096D, {2, "Star-Lord's Galaxy"}},
-	{0x3D096E, {2, "Dinosaur World"}},
-	{0x3D096F, {2, "Groot's Roots"}},
-	{0x3D0970, {2, "Mulan's Countryside"}},
-	{0x3D0971, {2, "The Sands of Agrabah"}},
-	{0x3D0974, {2, "A Small World"}},
-	{0x3D0975, {2, "View from the Suit"}},
-	{0x3D0976, {2, "Spider-Sky"}},
-	{0x3D0977, {2, "World War Hulk Sky"}},
-	{0x3D0978, {2, "Gravity Falls Sky"}},
-	{0x3D0979, {2, "Second Star to the Right"}},
-	{0x3D097A, {2, "The King's Domain"}},
-	{0x3D097C, {2, "CyBug Swarm"}},
-	{0x3D097D, {2, "The Rip"}},
-	{0x3D097E, {2, "Forgotten Skies"}},
-	{0x3D097F, {2, "Groot's View"}},
-	{0x3D0980, {2, "The Middle Kingdom"}},
-	{0x3D0984, {2, "Skies of the World"}},
-	{0x3D0985, {2, "S.H.I.E.L.D. Containment Truck"}},
-	{0x3D0986, {2, "Main Street Electrical Parade Float"}},
-	{0x3D0987, {2, "Mr. Toad's Motorcar"}},
-	{0x3D0988, {2, "Le Maximum"}},
-	{0x3D0989, {2, "Alice in Wonderland's Caterpillar"}},
-	{0x3D098A, {2, "Eglantine's Motorcycle"}},
-	{0x3D098B, {2, "Medusa's Swamp Mobile"}},
-	{0x3D098C, {2, "Hydra Motorcycle"}},
-	{0x3D098D, {2, "Darkwing Duck's Ratcatcher"}},
-	{0x3D098F, {2, "The USS Swinetrek"}},
-	{0x3D0991, {2, "Spider-Copter"}},
-	{0x3D0992, {2, "Aerial Area Rug"}},
-	{0x3D0993, {2, "Jack-O-Lantern's Glider"}},
-	{0x3D0994, {2, "Spider-Buggy"}},
-	{0x3D0995, {2, "Jack Skellington's Reindeer"}},
-	{0x3D0996, {2, "Fantasyland Carousel Horse"}},
-	{0x3D0997, {2, "Odin's Horse"}},
-	{0x3D0998, {2, "Gus the Mule"}},
-	{0x3D099A, {2, "Darkwing Duck's Grappling Gun"}},
-	{0x3D099C, {2, "Ghost Rider's Chain Whip"}},
-	{0x3D099D, {2, "Lew Zealand's Boomerang Fish"}},
-	{0x3D099E, {2, "Sergeant Calhoun's Blaster"}},
-	{0x3D09A0, {2, "Falcon's Wings"}},
-	{0x3D09A1, {2, "Mabel's Kittens for Fists"}},
-	{0x3D09A2, {2, "Jim Hawkins' Solar Board"}},
-	{0x3D09A3, {2, "Black Panther's Vibranium Knives"}},
-	{0x3D09A4, {2, "Cloak of Levitation"}},
-	{0x3D09A5, {2, "Aladdin's Magic Carpet"}},
-	{0x3D09A6, {2, "Honey Lemon's Ice Capsules"}},
-	{0x3D09A7, {2, "Jasmine's Palace View"}},
-	{0x3D09C1, {2, "Lola"}},
-	{0x3D09C2, {2, "Spider-Cycle"}},
-	{0x3D09C3, {2, "The Avenjet"}},
-	{0x3D09C4, {2, "Spider-Glider"}},
-	{0x3D09C5, {2, "Light Cycle"}},
-	{0x3D09C6, {2, "Light Jet"}},
-	{0x3D09C9, {3, "Retro Ray Gun"}},
-	{0x3D09CA, {3, "Tomorrowland Futurescape"}},
-	{0x3D09CB, {3, "Tomorrowland Stratosphere"}},
-	{0x3D09CC, {3, "Skies Over Felucia"}},
-	{0x3D09CD, {3, "Forests of Felucia"}},
-	{0x3D09CF, {3, "General Grievous' Wheel Bike"}},
-	{0x3D09D2, {3, "Slave I Flyer"}},
-	{0x3D09D3, {3, "Y-Wing Fighter"}},
-	{0x3D09D4, {3, "Arlo"}},
-	{0x3D09D5, {3, "Nash"}},
-	{0x3D09D6, {3, "Butch"}},
-	{0x3D09D7, {3, "Ramsey"}},
-	{0x3D09DC, {3, "Stars Over Sahara Square"}},
-	{0x3D09DD, {3, "Sahara Square Sands"}},
-	{0x3D09E0, {3, "Ghost Rider's Motorcycle"}},
-	{0x3D09E5, {3, "Quad Jumper"}}};
-
-u32 infinity_crc32(u16 init_value, const u8* buffer, u32 size)
-{
-	const std::array<u32, 256> CRC32_TABLE = {
-		0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535,
-		0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd,
-		0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d,
-		0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
-		0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
-		0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
-		0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac,
-		0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
-		0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab,
-		0xb6662d3d, 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
-		0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb,
-		0x086d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-		0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea,
-		0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, 0x4db26158, 0x3ab551ce,
-		0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
-		0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
-		0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409,
-		0xce61e49f, 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-		0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739,
-		0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
-		0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, 0x8708a3d2, 0x1e01f268,
-		0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0,
-		0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8,
-		0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-		0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
-		0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703,
-		0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7,
-		0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
-		0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae,
-		0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-		0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, 0x88085ae6,
-		0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
-		0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d,
-		0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5,
-		0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
-		0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-		0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d};
-	u32 crc = init_value;
-
-	for (u32 i = 0; i < size; i++)
-	{
-		u8 index = u8(crc & 0xFF) ^ buffer[i];
-		crc = ((crc >> 8) ^ CRC32_TABLE[index]);
-	}
-
-	return crc;
-}
-
-figure_creator_dialog::figure_creator_dialog(QWidget* parent, u8 slot)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("Figure Creator"));
-	setObjectName("figure_creator");
-	setMinimumSize(QSize(500, 150));
-
-	QVBoxLayout* vbox_panel = new QVBoxLayout();
-
-	QComboBox* combo_figlist = new QComboBox();
-	QStringList filterlist;
-	u32 first_entry = 0;
-
-	for (const auto& [figure, entry] : list_figures)
-	{
-		// Only display entry if it is a piece appropriate for the slot
-		if ((slot == 0 &&
-				((figure > 0x1E8480 && figure < 0x2DC6BF) || (figure > 0x3D0900 && figure < 0x4C4B3F))) ||
-			((slot == 1 || slot == 2) && (figure > 0x3D0900 && figure < 0x4C4B3F)) ||
-			((slot == 3 || slot == 6) && figure < 0x1E847F) ||
-			((slot == 4 || slot == 5 || slot == 7 || slot == 8) &&
-				(figure > 0x2DC6C0 && figure < 0x3D08FF)))
-		{
-			const auto& [num, figure_name] = entry;
-			const u32 qnum = (figure << 8) | num;
-			QString name = QString::fromStdString(figure_name);
-			combo_figlist->addItem(name, QVariant(qnum));
-			filterlist << std::move(name);
-			if (first_entry == 0)
-			{
-				first_entry = figure;
-			}
-		}
-	}
-
-	combo_figlist->addItem(tr("--Unknown--"), QVariant(0xFFFFFFFF));
-	combo_figlist->setEditable(true);
-	combo_figlist->setInsertPolicy(QComboBox::NoInsert);
-	combo_figlist->model()->sort(0, Qt::AscendingOrder);
-
-	QCompleter* co_compl = new QCompleter(filterlist, this);
-	co_compl->setCaseSensitivity(Qt::CaseInsensitive);
-	co_compl->setCompletionMode(QCompleter::PopupCompletion);
-	co_compl->setFilterMode(Qt::MatchContains);
-	combo_figlist->setCompleter(co_compl);
-
-	vbox_panel->addWidget(combo_figlist);
-
-	QFrame* line = new QFrame();
-	line->setFrameShape(QFrame::HLine);
-	line->setFrameShadow(QFrame::Sunken);
-	vbox_panel->addWidget(line);
-
-	QHBoxLayout* hbox_number = new QHBoxLayout();
-	QLabel* label_number = new QLabel(tr("Figure Number:"));
-	QLineEdit* edit_number = new QLineEdit(QString::number(first_entry));
-	QLabel* label_series = new QLabel(tr("Series:"));
-	QLineEdit* edit_series = new QLineEdit("1");
-	QRegularExpressionValidator* rxv = new QRegularExpressionValidator(QRegularExpression("\\d*"), this);
-	QIntValidator* valid_series = new QIntValidator(1, 3, this);
-	edit_number->setValidator(rxv);
-	edit_series->setValidator(valid_series);
-	hbox_number->addWidget(label_number);
-	hbox_number->addWidget(edit_number);
-	hbox_number->addWidget(label_series);
-	hbox_number->addWidget(edit_series);
-	vbox_panel->addLayout(hbox_number);
-
-	QHBoxLayout* hbox_buttons = new QHBoxLayout();
-	QPushButton* btn_create = new QPushButton(tr("Create"), this);
-	QPushButton* btn_cancel = new QPushButton(tr("Cancel"), this);
-	hbox_buttons->addStretch();
-	hbox_buttons->addWidget(btn_create);
-	hbox_buttons->addWidget(btn_cancel);
-	vbox_panel->addLayout(hbox_buttons);
-
-	setLayout(vbox_panel);
-
-	connect(combo_figlist, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index)
-		{
-			const u32 fig_info = combo_figlist->itemData(index).toUInt();
-			if (fig_info != 0xFFFFFFFF)
-			{
-				const u32 fig_num = fig_info >> 8;
-				const u8 series = fig_info & 0xFF;
-
-				edit_number->setText(QString::number(fig_num));
-				edit_series->setText(QString::number(series));
-			}
-		});
-
-	connect(btn_create, &QAbstractButton::clicked, this, [=, this]()
-		{
-			bool ok_num = false, ok_series = false;
-			const u32 fig_num = edit_number->text().toULong(&ok_num);
-			if (!ok_num)
-			{
-				QMessageBox::warning(this, tr("Error converting value"), tr("Figure number entered is invalid!"), QMessageBox::Ok);
-				return;
-			}
-			const u8 series = edit_series->text().toUShort(&ok_series);
-			if (!ok_series || series > 3 || series < 1)
-			{
-				QMessageBox::warning(this, tr("Error converting value"), tr("Series number entered is invalid!"), QMessageBox::Ok);
-				return;
-			}
-			const auto found_figure = list_figures.find(fig_num);
-			if (found_figure != list_figures.cend())
-			{
-				s_last_figure_path += QString::fromStdString(found_figure->second.second + ".bin");
-			}
-			else
-			{
-				s_last_figure_path += QString("Unknown(%1 %2).bin").arg(fig_num).arg(series);
-			}
-
-			m_file_path = QFileDialog::getSaveFileName(this, tr("Create Figure File"), s_last_figure_path, tr("Infinity Figure (*.bin);;"));
-			if (m_file_path.isEmpty())
-			{
-				return;
-			}
-			if (!create_blank_figure(fig_num, series))
-			{
-				QMessageBox::warning(this, tr("Failed to create figure file!"), tr("Failed to create figure file:\n%1").arg(m_file_path), QMessageBox::Ok);
-				return;
-			}
-
-			s_last_figure_path = QFileInfo(m_file_path).absolutePath() + "/";
-			accept();
-		});
-
-	connect(btn_cancel, &QAbstractButton::clicked, this, &QDialog::reject);
-
-	connect(co_compl, QOverload<const QString&>::of(&QCompleter::activated), [=](const QString& text)
-		{
-			combo_figlist->setCurrentIndex(combo_figlist->findText(text));
-		});
-}
-
-bool figure_creator_dialog::create_blank_figure(u32 character, u8 series)
-{
-	infinity_log.trace("File path: %s Character: %d Series: %d", m_file_path, character, series);
-	fs::file inf_file(m_file_path.toStdString(), fs::read + fs::write + fs::create);
-	if (!inf_file)
-	{
-		return false;
-	}
-	// Create a 320 byte file with standard NFC read/write permissions
-	std::array<u8, 0x14 * 0x10> file_data{};
-	u32 first_block = 0x17878E;
-	u32 other_blocks = 0x778788;
-	for (u8 i = 0; i < 3; i++)
-	{
-		file_data[0x36 + i] = u8((first_block >> (2 - i) * 8) & 0xFF);
-	}
-	for (u32 index = 1; index < 5; index++)
-	{
-		for (u8 i = 0; i < 3; i++)
-		{
-			file_data[((index * 0x40) + 0x36) + i] = u8((other_blocks >> (2 - i) * 8) & 0xFF);
-		}
-	}
-	// Create the vector to calculate the SHA1 hash with
-	std::vector<u8> sha1_calc = {SHA1_CONSTANT.begin(), SHA1_CONSTANT.end() - 1};
-	// Generate random UID, used for AES encrypt/decrypt
-	std::array<u8, 16> uid_data = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x44, 0x00, 0xC2};
-	for (u8 i = 0; i < 7; i++)
-	{
-		u8 random = rand() % 255;
-		sha1_calc.push_back(random);
-		uid_data[i] = random;
-	}
-
-	std::array<u8, 16> figure_data = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, series, 0xD1, 0x1F};
-
-	// Figure Number, input by end user
-	figure_data[1] = u8((character >> 16) & 0xFF);
-	figure_data[2] = u8((character >> 8) & 0xFF);
-	figure_data[3] = u8(character & 0xFF);
-
-	// Manufacture date, formatted as YY/MM/DD. Set to release date of figure's series
-	if (series == 1)
-	{
-		figure_data[4] = 0x0D;
-		figure_data[5] = 0x08;
-		figure_data[6] = 0x12;
-	}
-	else if (series == 2)
-	{
-		figure_data[4] = 0x0E;
-		figure_data[5] = 0x09;
-		figure_data[6] = 0x12;
-	}
-	else if (series == 3)
-	{
-		figure_data[4] = 0x0F;
-		figure_data[5] = 0x08;
-		figure_data[6] = 0x1C;
-	}
-
-	u32 checksum = infinity_crc32(0, figure_data.data(), 12);
-	for (s8 i = 0; i < 4; i++)
-	{
-		figure_data[12 + i] = u8((checksum >> (3 - i) * 8) & 0xFF);
-	}
-
-	if (figure_data[1] == 0)
-		return false;
-
-	sha1_context ctx;
-	u8 output[20];
-
-	sha1_starts(&ctx);
-	sha1_update(&ctx, sha1_calc.data(), sha1_calc.size());
-	sha1_finish(&ctx, output);
-
-	u8 key[0x10];
-	for (int i = 0; i < 4; i++)
-	{
-		for (int x = 0; x < 4; x++)
-		{
-			key[x + (i * 4)] = output[(3 - x) + (i * 4)];
-		}
-	}
-
-	// Create AES Encrypt context based on AES key, use this to encrypt the character data and 4 blank
-	// blocks
-	aes_context aes;
-	aes_setkey_enc(&aes, key, 128);
-	std::array<u8, 16> encrypted_block{};
-	std::array<u8, 16> encrypted_blank{};
-	aes_crypt_ecb(&aes, AES_ENCRYPT, figure_data.data(), encrypted_block.data());
-	aes_crypt_ecb(&aes, AES_ENCRYPT, BLANK_BLOCK.data(), encrypted_blank.data());
-
-	// Copy encrypted data and UID data to the Figure File
-	memcpy(&file_data[0], uid_data.data(), uid_data.size());
-	memcpy(&file_data[16], encrypted_block.data(), encrypted_block.size());
-	memcpy(&file_data[16 * 0x04], encrypted_blank.data(), encrypted_blank.size());
-	memcpy(&file_data[16 * 0x08], encrypted_blank.data(), encrypted_blank.size());
-	memcpy(&file_data[16 * 0x0C], encrypted_blank.data(), encrypted_blank.size());
-	memcpy(&file_data[16 * 0x0D], encrypted_blank.data(), encrypted_blank.size());
-
-	inf_file.write(file_data.data(), file_data.size());
-	inf_file.close();
-
-	return true;
-}
-
-QString figure_creator_dialog::get_file_path() const
-{
-	return m_file_path;
-}
-
-infinity_dialog::infinity_dialog(QWidget* parent)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("Infinity Manager"));
-	setObjectName("infinity_manager");
-	setAttribute(Qt::WA_DeleteOnClose);
-	setMinimumSize(QSize(700, 200));
-
-	QVBoxLayout* vbox_panel = new QVBoxLayout();
-
-	auto add_line = [](QVBoxLayout* vbox)
-	{
-		QFrame* line = new QFrame();
-		line->setFrameShape(QFrame::HLine);
-		line->setFrameShadow(QFrame::Sunken);
-		vbox->addWidget(line);
-	};
-
-	QGroupBox* group_figures = new QGroupBox(tr("Active Infinity Figures:"));
-	QVBoxLayout* vbox_group = new QVBoxLayout();
-
-	add_figure_slot(vbox_group, QString(tr("Play Set/Power Disc")), 0);
-	add_line(vbox_group);
-	add_figure_slot(vbox_group, QString(tr("Power Disc Two")), 1);
-	add_line(vbox_group);
-	add_figure_slot(vbox_group, QString(tr("Power Disc Three")), 2);
-	add_line(vbox_group);
-	add_figure_slot(vbox_group, QString(tr("Player One")), 3);
-	add_line(vbox_group);
-	add_figure_slot(vbox_group, QString(tr("Player One Ability One")), 4);
-	add_line(vbox_group);
-	add_figure_slot(vbox_group, QString(tr("Player One Ability Two")), 5);
-	add_line(vbox_group);
-	add_figure_slot(vbox_group, QString(tr("Player Two")), 6);
-	add_line(vbox_group);
-	add_figure_slot(vbox_group, QString(tr("Player Two Ability One")), 7);
-	add_line(vbox_group);
-	add_figure_slot(vbox_group, QString(tr("Player Two Ability Two")), 8);
-
-	group_figures->setLayout(vbox_group);
-	vbox_panel->addWidget(group_figures);
-	setLayout(vbox_panel);
-}
-
-infinity_dialog::~infinity_dialog()
-{
-	inst = nullptr;
-}
-
-infinity_dialog* infinity_dialog::get_dlg(QWidget* parent)
-{
-	if (inst == nullptr)
-		inst = new infinity_dialog(parent);
-
-	return inst;
-}
-
-void infinity_dialog::add_figure_slot(QVBoxLayout* vbox_group, QString name, u8 slot)
-{
-	ensure(slot < figure_slots.size());
-
-	QHBoxLayout* hbox_infinity = new QHBoxLayout();
-
-	QLabel* label_figname = new QLabel(name);
-
-	QPushButton* clear_btn = new QPushButton(tr("Clear"));
-	QPushButton* create_btn = new QPushButton(tr("Create"));
-	QPushButton* load_btn = new QPushButton(tr("Load"));
-
-	m_edit_figures[slot] = new QLineEdit();
-	m_edit_figures[slot]->setEnabled(false);
-	if (figure_slots[slot])
-	{
-		const auto found_figure = list_figures.find(figure_slots[slot].value());
-		if (found_figure != list_figures.cend())
-		{
-			m_edit_figures[slot]->setText(QString::fromStdString(found_figure->second.second));
-		}
-		else
-		{
-			m_edit_figures[slot]->setText(tr("Unknown Figure"));
-		}
-	}
-	else
-	{
-		m_edit_figures[slot]->setText(tr("None"));
-	}
-
-	connect(clear_btn, &QAbstractButton::clicked, this, [this, slot]
-		{
-			clear_figure(slot);
-		});
-	connect(create_btn, &QAbstractButton::clicked, this, [this, slot]
-		{
-			create_figure(slot);
-		});
-	connect(load_btn, &QAbstractButton::clicked, this, [this, slot]
-		{
-			load_figure(slot);
-		});
-
-	hbox_infinity->addWidget(label_figname);
-	hbox_infinity->addWidget(m_edit_figures[slot]);
-	hbox_infinity->addWidget(clear_btn);
-	hbox_infinity->addWidget(create_btn);
-	hbox_infinity->addWidget(load_btn);
-
-	vbox_group->addLayout(hbox_infinity);
-}
-
-void infinity_dialog::clear_figure(u8 slot)
-{
-	ensure(slot < figure_slots.size());
-
-	if (figure_slots[slot])
-	{
-		g_infinitybase.remove_figure(slot);
-		figure_slots[slot] = 0;
-		m_edit_figures[slot]->setText(tr("None"));
-	}
-}
-
-void infinity_dialog::create_figure(u8 slot)
-{
-	ensure(slot < figure_slots.size());
-	figure_creator_dialog create_dlg(this, slot);
-	if (create_dlg.exec() == Accepted)
-	{
-		load_figure_path(slot, create_dlg.get_file_path());
-	}
-}
-
-void infinity_dialog::load_figure(u8 slot)
-{
-	ensure(slot < figure_slots.size());
-	const QString file_path = QFileDialog::getOpenFileName(this, tr("Select Infinity File"), s_last_figure_path, tr("Infinity Figure (*.bin);;"));
-	if (file_path.isEmpty())
-	{
-		return;
-	}
-
-	s_last_figure_path = QFileInfo(file_path).absolutePath() + "/";
-
-	load_figure_path(slot, file_path);
-}
-
-void infinity_dialog::load_figure_path(u8 slot, const QString& path)
-{
-	fs::file inf_file(path.toStdString(), fs::read + fs::write + fs::lock);
-	if (!inf_file)
-	{
-		QMessageBox::warning(this, tr("Failed to open the figure file!"), tr("Failed to open the figure file(%1)!\nFile may already be in use on the base.").arg(path), QMessageBox::Ok);
-		return;
-	}
-
-	std::array<u8, 0x14 * 0x10> data;
-	if (inf_file.read(data.data(), data.size()) != data.size())
-	{
-		QMessageBox::warning(this, tr("Failed to read the figure file!"), tr("Failed to read the figure file(%1)!\nFile was too small.").arg(path), QMessageBox::Ok);
-		return;
-	}
-
-	clear_figure(slot);
-
-	const u32 fignum = g_infinitybase.load_figure(data, std::move(inf_file), slot);
-	const auto name = list_figures.find(fignum);
-	if (name != list_figures.cend())
-	{
-		m_edit_figures[slot]->setText(QString::fromStdString(name->second.second));
-	}
-	else
-	{
-		m_edit_figures[slot]->setText(tr("Unknown Figure"));
-	}
-	figure_slots[slot] = fignum;
-}
diff --git a/rpcs3/rpcs3qt/infinity_dialog.h b/rpcs3/rpcs3qt/infinity_dialog.h
deleted file mode 100644
index 0000e0eadc..0000000000
--- a/rpcs3/rpcs3qt/infinity_dialog.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include <optional>
-#include "util/types.hpp"
-
-#include <QDialog>
-#include <QLineEdit>
-#include <QVBoxLayout>
-
-class figure_creator_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit figure_creator_dialog(QWidget* parent, u8 slot);
-	QString get_file_path() const;
-
-protected:
-	QString m_file_path;
-
-private:
-	bool create_blank_figure(u32 character, u8 series);
-};
-
-class infinity_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit infinity_dialog(QWidget* parent);
-	~infinity_dialog();
-	static infinity_dialog* get_dlg(QWidget* parent);
-
-	infinity_dialog(infinity_dialog const&) = delete;
-	void operator=(infinity_dialog const&) = delete;
-
-protected:
-	void clear_figure(u8 slot);
-	void create_figure(u8 slot);
-	void load_figure(u8 slot);
-	void load_figure_path(u8 slot, const QString& path);
-
-protected:
-	std::array<QLineEdit*, 9> m_edit_figures{};
-	static std::array<std::optional<u32>, 9> figure_slots;
-
-private:
-	void add_figure_slot(QVBoxLayout* vbox_group, QString name, u8 slot);
-	static infinity_dialog* inst;
-};
diff --git a/rpcs3/rpcs3qt/input_dialog.cpp b/rpcs3/rpcs3qt/input_dialog.cpp
index 25008bc0fb..532c8ea3bb 100644
--- a/rpcs3/rpcs3qt/input_dialog.cpp
+++ b/rpcs3/rpcs3qt/input_dialog.cpp
@@ -8,6 +8,8 @@
 #include <QValidator>
 #include <QLabel>
 
+constexpr auto qstr = QString::fromStdString;
+
 input_dialog::input_dialog(int max_length, const QString& text, const QString& title, const QString& label, const QString& placeholder, QWidget *parent, Qt::WindowFlags f)
 	: QDialog(parent, f)
 {
@@ -48,7 +50,7 @@ void input_dialog::set_input_font(const QFont& font, bool fix_width, char sample
 {
 	if (const int max = m_input->maxLength(); max > 0 && fix_width && std::isprint(static_cast<uchar>(sample)))
 	{
-		const QString str = QString(max, sample);
+		const QString str = qstr(std::string(static_cast<usz>(max), sample));
 		m_input->setFixedWidth(gui::utils::get_label_width(str, &font));
 	}
 
diff --git a/rpcs3/rpcs3qt/instruction_editor_dialog.cpp b/rpcs3/rpcs3qt/instruction_editor_dialog.cpp
index 667fbe40db..241fc3a13e 100644
--- a/rpcs3/rpcs3qt/instruction_editor_dialog.cpp
+++ b/rpcs3/rpcs3qt/instruction_editor_dialog.cpp
@@ -1,26 +1,23 @@
 #include "instruction_editor_dialog.h"
-#include "hex_validator.h"
 
 #include "Emu/Cell/SPUThread.h"
 #include "Emu/CPU/CPUThread.h"
 #include "Emu/CPU/CPUDisAsm.h"
-#include "Emu/Cell/lv2/sys_spu.h"
 
 #include <QFontDatabase>
 #include <QVBoxLayout>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QCheckBox>
+
+constexpr auto qstr = QString::fromStdString;
 
 extern bool ppu_patch(u32 addr, u32 value);
 
-extern std::string format_spu_func_info(u32 addr, cpu_thread* spu);
-
 instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, CPUDisAsm* _disasm, std::function<cpu_thread*()> func)
 	: QDialog(parent)
 	, m_pc(_pc)
-	, m_disasm(_disasm->copy_type_erased())
-	, m_get_cpu(func ? std::move(func) : std::function<cpu_thread*()>(FN(nullptr)))
+	, m_disasm(_disasm)
+	, m_get_cpu(std::move(func))
 {
 	setWindowTitle(tr("Edit instruction"));
 	setAttribute(Qt::WA_DeleteOnClose);
@@ -28,7 +25,8 @@ instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, C
 
 	const auto cpu = m_get_cpu();
 
-	m_cpu_offset = cpu && cpu->get_class() == thread_class::spu ? static_cast<spu_thread&>(*cpu).ls : vm::g_sudo_addr;
+	m_cpu_offset = cpu && cpu->id_type() == 2 ? static_cast<spu_thread&>(*cpu).ls : vm::g_sudo_addr;
+	const QString instruction = qstr(fmt::format("%08x", *reinterpret_cast<be_t<u32>*>(m_cpu_offset + m_pc)));
 
 	QVBoxLayout* vbox_panel(new QVBoxLayout());
 	QHBoxLayout* hbox_panel(new QHBoxLayout());
@@ -43,44 +41,21 @@ instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, C
 
 	m_instr = new QLineEdit(this);
 	m_instr->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
-	m_instr->setValidator(new HexValidator(m_instr));
-	m_instr->setMaximumWidth(130);
+	m_instr->setPlaceholderText(instruction);
+	m_instr->setText(instruction);
+	m_instr->setMaxLength(8);
+	m_instr->setMaximumWidth(65);
 
-	m_disasm->change_mode(cpu_disasm_mode::normal);
-	m_disasm->disasm(m_pc);
-	m_preview = new QLabel(QString::fromStdString(m_disasm->last_opcode), this);
+	m_preview = new QLabel("", this);
 
 	// Layouts
 	vbox_left_panel->addWidget(new QLabel(tr("Address:     ")));
 	vbox_left_panel->addWidget(new QLabel(tr("Instruction: ")));
 	vbox_left_panel->addWidget(new QLabel(tr("Preview:     ")));
 
-	vbox_right_panel->addWidget(new QLabel(QString::fromStdString(fmt::format("%08x", m_pc))));
+	vbox_right_panel->addWidget(new QLabel(qstr(fmt::format("%08x", m_pc))));
 	vbox_right_panel->addWidget(m_instr);
 	vbox_right_panel->addWidget(m_preview);
-
-	if (cpu && cpu->get_class() == thread_class::spu)
-	{
-		// Print block information as if this instruction is its beginning
-		vbox_left_panel->addWidget(new QLabel(tr("Block Info:  ")));
-		m_func_info = new QLabel("", this);
-		vbox_right_panel->addWidget(m_func_info);
-
-		m_func_info->setText(QString::fromStdString(format_spu_func_info(m_pc, cpu)));
-	}
-
-	if (cpu && cpu->get_class() == thread_class::spu)
-	{
-		const auto& spu = static_cast<spu_thread&>(*cpu);
-
-		if (spu.group && spu.group->max_num > 1)
-		{
-			m_apply_for_spu_group = new QCheckBox(tr("For SPUs Group"));
-			vbox_left_panel->addWidget(m_apply_for_spu_group);
-			vbox_right_panel->addWidget(new QLabel("")); // For alignment
-		}
-	}
-
 	vbox_right_panel->setAlignment(Qt::AlignLeft);
 
 	hbox_b_panel->addWidget(button_ok);
@@ -108,16 +83,14 @@ instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, C
 		}
 
 		bool ok;
-		const ulong opcode = normalize_hex_qstring(m_instr->text()).toULong(&ok, 16);
+		const ulong opcode = m_instr->text().toULong(&ok, 16);
 		if (!ok || opcode > u32{umax})
 		{
 			QMessageBox::critical(this, tr("Error"), tr("Failed to parse PPU instruction."));
 			return;
 		}
 
-		const be_t<u32> swapped{static_cast<u32>(opcode)};
-
-		if (cpu->get_class() == thread_class::ppu)
+		if (cpu->id_type() == 1)
 		{
 			if (!ppu_patch(m_pc, static_cast<u32>(opcode)))
 			{
@@ -125,18 +98,9 @@ instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, C
 				return;
 			}
 		}
-		else if (m_apply_for_spu_group && m_apply_for_spu_group->isChecked())
-		{
-			for (auto& spu : static_cast<spu_thread&>(*cpu).group->threads)
-			{
-				if (spu)
-				{
-					std::memcpy(spu->ls + m_pc, &swapped, 4);
-				}
-			}
-		}
 		else
 		{
+			const be_t<u32> swapped{static_cast<u32>(opcode)};
 			std::memcpy(m_cpu_offset + m_pc, &swapped, 4);
 		}
 
@@ -151,12 +115,12 @@ instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, C
 void instruction_editor_dialog::updatePreview() const
 {
 	bool ok;
-	const be_t<u32> opcode{static_cast<u32>(normalize_hex_qstring(m_instr->text()).toULong(&ok, 16))};
-	m_disasm->change_ptr(reinterpret_cast<const u8*>(&opcode) - std::intptr_t{m_pc});
+	ulong opcode = m_instr->text().toULong(&ok, 16);
+	Q_UNUSED(opcode)
 
-	if (ok && m_disasm->disasm(m_pc))
+	if (ok)
 	{
-		m_preview->setText(QString::fromStdString(m_disasm->last_opcode));
+		m_preview->setText(tr("Preview disabled."));
 	}
 	else
 	{
diff --git a/rpcs3/rpcs3qt/instruction_editor_dialog.h b/rpcs3/rpcs3qt/instruction_editor_dialog.h
index 0b7854d04e..27c15ac066 100644
--- a/rpcs3/rpcs3qt/instruction_editor_dialog.h
+++ b/rpcs3/rpcs3qt/instruction_editor_dialog.h
@@ -8,7 +8,6 @@
 
 class CPUDisAsm;
 class cpu_thread;
-class QCheckBox;
 
 class instruction_editor_dialog : public QDialog
 {
@@ -17,11 +16,9 @@ class instruction_editor_dialog : public QDialog
 private:
 	u32 m_pc;
 	u8* m_cpu_offset;
-	std::shared_ptr<CPUDisAsm> m_disasm; // shared in order to allow an incomplete type
+	CPUDisAsm* m_disasm;
 	QLineEdit* m_instr;
 	QLabel* m_preview;
-	QLabel* m_func_info = nullptr;
-	QCheckBox* m_apply_for_spu_group = nullptr;
 
 	const std::function<cpu_thread*()> m_get_cpu;
 
diff --git a/rpcs3/rpcs3qt/ipc_settings_dialog.cpp b/rpcs3/rpcs3qt/ipc_settings_dialog.cpp
deleted file mode 100644
index 1ef19e5155..0000000000
--- a/rpcs3/rpcs3qt/ipc_settings_dialog.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <QMessageBox>
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QDialogButtonBox>
-#include <QGroupBox>
-#include <QCheckBox>
-#include <QLineEdit>
-#include <QIntValidator>
-
-#include "ipc_settings_dialog.h"
-#include "Emu/IPC_config.h"
-#include "Emu/IPC_socket.h"
-#include "Emu/IdManager.h"
-#include "Emu/System.h"
-
-ipc_settings_dialog::ipc_settings_dialog(QWidget* parent)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("IPC Settings"));
-	setObjectName("ipc_settings_dialog");
-	setMinimumSize(QSize(200, 100));
-
-	QVBoxLayout* vbox_global = new QVBoxLayout();
-
-	QCheckBox* checkbox_server_enabled = new QCheckBox(tr("Enable IPC Server"));
-
-	QGroupBox* group_server_port = new QGroupBox(tr("IPC Server Port"));
-	QHBoxLayout* hbox_group_port = new QHBoxLayout();
-	QLineEdit* line_edit_server_port = new QLineEdit();
-	line_edit_server_port->setValidator(new QIntValidator(1025, 65535, this));
-
-	QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Save);
-	buttons->button(QDialogButtonBox::Save)->setDefault(true);
-
-	hbox_group_port->addWidget(line_edit_server_port);
-	group_server_port->setLayout(hbox_group_port);
-
-	vbox_global->addWidget(checkbox_server_enabled);
-	vbox_global->addWidget(group_server_port);
-	vbox_global->addWidget(buttons);
-
-	setLayout(vbox_global);
-
-	connect(buttons, &QDialogButtonBox::accepted, this, [this, checkbox_server_enabled, line_edit_server_port]()
-		{
-			bool ok = true;
-			const bool server_enabled = checkbox_server_enabled->isChecked();
-			const int server_port = line_edit_server_port->text().toInt(&ok);
-
-			if (!ok || server_port < 1025 || server_port > 65535)
-			{
-				QMessageBox::critical(this, tr("Invalid port"), tr("The server port must be an integer in the range 1025 - 65535!"), QMessageBox::Ok);
-				return;
-			}
-
-			g_cfg_ipc.set_server_enabled(server_enabled);
-			g_cfg_ipc.set_port(server_port);
-			g_cfg_ipc.save();
-
-			if (auto manager = g_fxo->try_get<IPC_socket::IPC_server_manager>())
-			{
-				manager->set_server_enabled(server_enabled);
-			}
-			else if (server_enabled && Emu.IsRunning())
-			{
-				g_fxo->init<IPC_socket::IPC_server_manager>(true);
-			}
-
-			accept();
-		});
-
-	connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
-
-	g_cfg_ipc.load();
-
-	checkbox_server_enabled->setChecked(g_cfg_ipc.get_server_enabled());
-	line_edit_server_port->setText(QString::number(g_cfg_ipc.get_port()));
-}
diff --git a/rpcs3/rpcs3qt/ipc_settings_dialog.h b/rpcs3/rpcs3qt/ipc_settings_dialog.h
deleted file mode 100644
index 7e8981223c..0000000000
--- a/rpcs3/rpcs3qt/ipc_settings_dialog.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include <QDialog>
-
-class ipc_settings_dialog : public QDialog
-{
-	Q_OBJECT
-public:
-	ipc_settings_dialog(QWidget* parent = nullptr);
-};
diff --git a/rpcs3/rpcs3qt/kernel_explorer.cpp b/rpcs3/rpcs3qt/kernel_explorer.cpp
index 360c352100..d16ae720e4 100644
--- a/rpcs3/rpcs3qt/kernel_explorer.cpp
+++ b/rpcs3/rpcs3qt/kernel_explorer.cpp
@@ -7,7 +7,6 @@
 #include <QTreeWidgetItem>
 
 #include "Emu/IdManager.h"
-#include "Emu/System.h"
 #include "Emu/Cell/PPUThread.h"
 #include "Emu/Cell/SPUThread.h"
 #include "Emu/Cell/lv2/sys_lwmutex.h"
@@ -27,10 +26,8 @@
 #include "Emu/Cell/lv2/sys_rsx.h"
 #include "Emu/Cell/lv2/sys_vm.h"
 #include "Emu/Cell/lv2/sys_net.h"
-#include "Emu/Cell/lv2/sys_net/lv2_socket.h"
 #include "Emu/Cell/lv2/sys_fs.h"
 #include "Emu/Cell/lv2/sys_interrupt.h"
-#include "Emu/Cell/lv2/sys_rsxaudio.h"
 #include "Emu/Cell/Modules/cellSpurs.h"
 
 #include "Emu/RSX/RSXThread.h"
@@ -38,6 +35,8 @@
 #include "kernel_explorer.h"
 #include "qt_utils.h"
 
+constexpr auto qstr = QString::fromStdString;
+
 LOG_CHANNEL(sys_log, "SYS");
 
 enum kernel_item_role
@@ -128,7 +127,7 @@ static QTreeWidgetItem* find_node(QTreeWidgetItem* root, u32 id)
 		}
 	}
 
-	sys_log.fatal("find_node(root=%s, id=%d) failed", root ? root->text(0) : "?", id);
+	sys_log.fatal("find_node(root=%s, id=%d) failed", root ? root->text(0).toStdString() : "?", id);
 	return nullptr;
 }
 
@@ -145,7 +144,7 @@ static QTreeWidgetItem* add_volatile_node(QTreeWidgetItem* parent, const QString
 	}
 	else
 	{
-		sys_log.fatal("add_volatile_node(parent=%s, regexp=%s) failed", parent ? parent->text(0) : "?", base_text + ".*");
+		sys_log.fatal("add_volatile_node(parent=%s, regexp=%s) failed", parent ? parent->text(0).toStdString() : "?", base_text.toStdString() + ".*");
 	}
 	return node;
 }
@@ -171,7 +170,7 @@ static QTreeWidgetItem* add_solid_node(QTreeWidgetItem* parent, const QString& b
 kernel_explorer::kernel_explorer(QWidget* parent)
 	: QDialog(parent)
 {
-	setWindowTitle(tr("Kernel Explorer | %1").arg(QString::fromStdString(Emu.GetTitleAndTitleID())));
+	setWindowTitle(tr("Kernel Explorer | %1").arg(qstr(Emu.GetTitleAndTitleID())));
 	setObjectName("kernel_explorer");
 	setAttribute(Qt::WA_DeleteOnClose);
 	setMinimumSize(QSize(800, 600));
@@ -242,7 +241,6 @@ void kernel_explorer::update()
 		{ SYS_FS_FD_OBJECT               , tr("File Descriptors")},
 		{ SYS_LWCOND_OBJECT              , tr("Light Weight Condition Variables")},
 		{ SYS_EVENT_FLAG_OBJECT          , tr("Event Flags")},
-		{ SYS_RSXAUDIO_OBJECT            , tr("RSXAudio Objects")},
 
 		{ memory_containers              , tr("Memory Containers")},
 		{ ppu_threads                    , tr("PPU Threads")},
@@ -311,19 +309,19 @@ void kernel_explorer::update()
 
 	const u32 total_memory_usage = dct->used;
 
-	root->setText(0, QString::fromStdString(fmt::format("Process 0x%08x: Total Memory Usage: 0x%x/0x%x (%0.2f/%0.2f MB)", process_getpid(), total_memory_usage, dct->size, 1. * total_memory_usage / (1024 * 1024)
+	root->setText(0, qstr(fmt::format("Process 0x%08x: Total Memory Usage: 0x%x/0x%x (%0.2f/%0.2f MB)", process_getpid(), total_memory_usage, dct->size, 1. * total_memory_usage / (1024 * 1024)
 		, 1. * dct->size / (1024 * 1024))));
 
-	add_solid_node(find_node(root, additional_nodes::process_info), QString::fromStdString(fmt::format("Process Info, Sdk Version: 0x%08x, PPC SEG: %#x, SFO Category: %s (Fake: %s)", g_ps3_process_info.sdk_ver, g_ps3_process_info.ppc_seg, Emu.GetCat(), Emu.GetFakeCat())));
+	add_solid_node(find_node(root, additional_nodes::process_info), qstr(fmt::format("Process Info, Sdk Version: 0x%08x, PPC SEG: %#x, SFO Category: %s", g_ps3_process_info.sdk_ver, g_ps3_process_info.ppc_seg, Emu.GetCat())));
 
-	auto display_program_segments = [this](QTreeWidgetItem* tree, const ppu_module<lv2_obj>& m)
+	auto display_program_segments = [this](QTreeWidgetItem* tree, const ppu_module& m)
 	{
 		for (usz i = 0; i < m.segs.size(); i++)
 		{
 			const u32 addr = m.segs[i].addr;
 			const u32 size = m.segs[i].size;
 
-			add_leaf(tree, QString::fromStdString(fmt::format("Segment %u: (0x%08x...0x%08x), Flags: 0x%x"
+			add_leaf(tree, qstr(fmt::format("Segment %u: (0x%08x...0x%08x), Flags: 0x%x"
 				, i, addr, addr + std::max<u32>(size, 1) - 1, m.segs[i].flags)));
 		}
 	};
@@ -336,14 +334,6 @@ void kernel_explorer::update()
 			return;
 		}
 
-		auto show_waiters = [&](QTreeWidgetItem* tree, cpu_thread* cpu)
-		{
-			for (; cpu; cpu = cpu->get_next_cpu())
-			{
-				add_leaf(tree, QString::fromStdString(fmt::format("Waiter: ID: 0x%x", cpu->get_class() == thread_class::spu ? static_cast<spu_thread*>(cpu)->lv2_id : cpu->id)));
-			}
-		};
-
 		switch (id >> 24)
 		{
 		case SYS_MEM_OBJECT:
@@ -353,44 +343,32 @@ void kernel_explorer::update()
 
 			if (mem.pshared)
 			{
-				add_leaf(node, QString::fromStdString(fmt::format("Shared Mem 0x%08x: Size: 0x%x (%0.2f MB), Chunk: %s, Mappings: %u, Mem Container: %s, Key: %#llx", id, mem.size, size_mb, mem.align == 0x10000u ? "64K" : "1MB", +mem.counter, mem.ct->id, mem.key)));
+				add_leaf(node, qstr(fmt::format("Shared Mem 0x%08x: Size: 0x%x (%0.2f MB), Chunk: %s, Mappings: %u, Mem Container: %s, Key: %#llx", id, mem.size, size_mb, mem.align == 0x10000u ? "64K" : "1MB", +mem.counter, mem.ct->id, mem.key)));
 				break;
 			}
 
-			add_leaf(node, QString::fromStdString(fmt::format("Shared Mem 0x%08x: Size: 0x%x (%0.2f MB), Chunk: %s, Mem Container: %s, Mappings: %u", id, mem.size, size_mb, mem.align == 0x10000u ? "64K" : "1MB", mem.ct->id, +mem.counter)));
+			add_leaf(node, qstr(fmt::format("Shared Mem 0x%08x: Size: 0x%x (%0.2f MB), Chunk: %s, Mem Container: %s, Mappings: %u", id, mem.size, size_mb, mem.align == 0x10000u ? "64K" : "1MB", mem.ct->id, +mem.counter)));
 			break;
 		}
 		case SYS_MUTEX_OBJECT:
 		{
 			auto& mutex = static_cast<lv2_mutex&>(obj);
-			const auto control = mutex.control.load();
-			show_waiters(add_solid_node(node, QString::fromStdString(fmt::format(u8"Mutex 0x%08x: “%s”", id, lv2_obj::name64(mutex.name))), QString::fromStdString(fmt::format(u8"Mutex 0x%08x: “%s”, %s,%s Owner: %#x, Locks: %u, Key: %#llx, Conds: %u", id, lv2_obj::name64(mutex.name), mutex.protocol,
-				mutex.recursive == SYS_SYNC_RECURSIVE ? " Recursive," : "", control.owner, +mutex.lock_count, mutex.key, mutex.cond_count))), control.sq);
+			add_leaf(node, qstr(fmt::format(u8"Mutex 0x%08x: “%s”, %s,%s Owner: %#x, Locks: %u, Key: %#llx, Conds: %u, Wq: %zu", id, lv2_obj::name64(mutex.name), mutex.protocol,
+				mutex.recursive == SYS_SYNC_RECURSIVE ? " Recursive," : "", mutex.owner >> 1, +mutex.lock_count, mutex.key, mutex.cond_count, mutex.sq.size())));
 			break;
 		}
 		case SYS_COND_OBJECT:
 		{
 			auto& cond = static_cast<lv2_cond&>(obj);
-			show_waiters(add_solid_node(node, QString::fromStdString(fmt::format(u8"Cond 0x%08x: “%s”", id, lv2_obj::name64(cond.name))), QString::fromStdString(fmt::format(u8"Cond 0x%08x: “%s”, %s, Mutex: 0x%08x, Key: %#llx", id, lv2_obj::name64(cond.name), cond.mutex->protocol, cond.mtx_id, cond.key))), cond.sq);
+			add_leaf(node, qstr(fmt::format(u8"Cond 0x%08x: “%s”, %s, Mutex: 0x%08x, Key: %#llx, Wq: %u", id, lv2_obj::name64(cond.name), cond.mutex->protocol, cond.mtx_id, cond.key, +cond.waiters)));
 			break;
 		}
 		case SYS_RWLOCK_OBJECT:
 		{
 			auto& rw = static_cast<lv2_rwlock&>(obj);
 			const s64 val = rw.owner;
-			auto tree = add_solid_node(node, QString::fromStdString(fmt::format(u8"RW Lock 0x%08x: “%s”", id, lv2_obj::name64(rw.name))), QString::fromStdString(fmt::format(u8"RW Lock 0x%08x: “%s”, %s, Owner: %#x(%d), Key: %#llx", id, lv2_obj::name64(rw.name), rw.protocol,
-				std::max<s64>(0, val >> 1), -std::min<s64>(0, val >> 1), rw.key)));
-
-			if (auto rq = +rw.rq)
-			{
-				show_waiters(add_solid_node(tree, "Reader Waiters"), rq);
-			}
-
-			if (auto wq = +rw.wq)
-			{
-				show_waiters(add_solid_node(tree, "Writer Waiters"), wq);
-			}
-
+			add_leaf(node, qstr(fmt::format(u8"RW Lock 0x%08x: “%s”, %s, Owner: %#x(%d), Key: %#llx, Rq: %zu, Wq: %zu", id, lv2_obj::name64(rw.name), rw.protocol,
+				std::max<s64>(0, val >> 1), -std::min<s64>(0, val >> 1), rw.key, rw.rq.size(), rw.wq.size())));
 			break;
 		}
 		case SYS_INTR_TAG_OBJECT:
@@ -400,24 +378,24 @@ void kernel_explorer::update()
 
 			if (lv2_obj::check(handler))
 			{
-				add_leaf(node, QString::fromStdString(fmt::format("Intr Tag 0x%08x, Handler: 0x%08x", id, handler->id)));
+				add_leaf(node, qstr(fmt::format("Intr Tag 0x%08x, Handler: 0x%08x", id, handler->id)));
 				break;
 			}
 
-			add_leaf(node, QString::fromStdString(fmt::format("Intr Tag 0x%08x, Handler: Unbound", id)));
+			add_leaf(node, qstr(fmt::format("Intr Tag 0x%08x, Handler: Unbound", id)));
 			break;
 		}
 		case SYS_INTR_SERVICE_HANDLE_OBJECT:
 		{
 			auto& serv = static_cast<lv2_int_serv&>(obj);
-			add_leaf(node, QString::fromStdString(fmt::format("Intr Svc 0x%08x, PPU: 0x%07x, arg1: 0x%x, arg2: 0x%x", id, serv.thread->id, serv.arg1, serv.arg2)));
+			add_leaf(node, qstr(fmt::format("Intr Svc 0x%08x, PPU: 0x%07x, arg1: 0x%x, arg2: 0x%x", id, serv.thread->id, serv.arg1, serv.arg2)));
 			break;
 		}
 		case SYS_EVENT_QUEUE_OBJECT:
 		{
 			auto& eq = static_cast<lv2_event_queue&>(obj);
-			show_waiters(add_solid_node(node, QString::fromStdString(fmt::format(u8"Event Queue 0x%08x: “%s”", id, lv2_obj::name64(eq.name))), QString::fromStdString(fmt::format(u8"Event Queue 0x%08x: “%s”, %s, %s, Key: %#llx, Events: %zu/%d", id, lv2_obj::name64(eq.name), eq.protocol,
-				eq.type == SYS_SPU_QUEUE ? "SPU" : "PPU", eq.key, eq.events.size(), eq.size))), eq.type == SYS_SPU_QUEUE ? static_cast<cpu_thread*>(+eq.sq) : +eq.pq);
+			add_leaf(node, qstr(fmt::format(u8"Event Queue 0x%08x: “%s”, %s, %s, Key: %#llx, Events: %zu/%d, Wq: %zu", id, lv2_obj::name64(eq.name), eq.protocol,
+				eq.type == SYS_SPU_QUEUE ? "SPU" : "PPU", eq.key, eq.events.size(), eq.size, eq.sq.size())));
 			break;
 		}
 		case SYS_EVENT_PORT_OBJECT:
@@ -429,30 +407,30 @@ void kernel_explorer::update()
 			{
 				if (queue == idm::check_unlocked<lv2_obj, lv2_event_queue>(queue->id))
 				{
-					add_leaf(node, QString::fromStdString(fmt::format("Event Port 0x%08x: %s, Name: %#llx, Event Queue (ID): 0x%08x", id, type, ep.name, queue->id)));
+					add_leaf(node, qstr(fmt::format("Event Port 0x%08x: %s, Name: %#llx, Event Queue (ID): 0x%08x", id, type, ep.name, queue->id)));
 					break;
 				}
 
 				// This code is unused until multi-process is implemented
 				if (queue == lv2_event_queue::find(queue->key).get())
 				{
-					add_leaf(node, QString::fromStdString(fmt::format("Event Port 0x%08x: %s, Name: %#llx, Event Queue (IPC): %s", id, type, ep.name, queue->key)));
+					add_leaf(node, qstr(fmt::format("Event Port 0x%08x: %s, Name: %#llx, Event Queue (IPC): %s", id, type, ep.name, queue->key)));
 					break;
 				}
 			}
 
-			add_leaf(node, QString::fromStdString(fmt::format("Event Port 0x%08x: %s, Name: %#llx, Unbound", id, type, ep.name)));
+			add_leaf(node, qstr(fmt::format("Event Port 0x%08x: %s, Name: %#llx, Unbound", id, type, ep.name)));
 			break;
 		}
 		case SYS_TRACE_OBJECT:
 		{
-			add_leaf(node, QString::fromStdString(fmt::format("Trace 0x%08x", id)));
+			add_leaf(node, qstr(fmt::format("Trace 0x%08x", id)));
 			break;
 		}
 		case SYS_SPUIMAGE_OBJECT:
 		{
 			auto& spi = static_cast<lv2_spu_image&>(obj);
-			add_leaf(node, QString::fromStdString(fmt::format("SPU Image 0x%08x, Entry: 0x%x, Segs: *0x%x, Num Segs: %d", id, spi.e_entry, spi.segs, spi.nsegs)));
+			add_leaf(node, qstr(fmt::format("SPU Image 0x%08x, Entry: 0x%x, Segs: *0x%x, Num Segs: %d", id, spi.e_entry, spi.segs, spi.nsegs)));
 			break;
 		}
 		case SYS_PRX_OBJECT:
@@ -461,24 +439,24 @@ void kernel_explorer::update()
 
 			if (prx.segs.empty())
 			{
-				add_leaf(node, QString::fromStdString(fmt::format("PRX 0x%08x: '%s' (HLE)", id, prx.name)));
+				add_leaf(node, qstr(fmt::format("PRX 0x%08x: '%s' (HLE)", id, prx.name)));
 				break;
 			}
 
-			const QString text = QString::fromStdString(fmt::format("PRX 0x%08x: '%s', attr=0x%x, lib=%s", id, prx.name, prx.module_info_attributes, prx.module_info_name));
+			const QString text = qstr(fmt::format("PRX 0x%08x: '%s'", id, prx.name));
 			QTreeWidgetItem* prx_tree = add_solid_node(node, text, text);
 			display_program_segments(prx_tree, prx);
 			break;
 		}
 		case SYS_SPUPORT_OBJECT:
 		{
-			add_leaf(node, QString::fromStdString(fmt::format("SPU Port 0x%08x", id)));
+			add_leaf(node, qstr(fmt::format("SPU Port 0x%08x", id)));
 			break;
 		}
 		case SYS_OVERLAY_OBJECT:
 		{
 			auto& ovl = static_cast<lv2_overlay&>(obj);
-			const QString text = QString::fromStdString(fmt::format("OVL 0x%08x: '%s'", id, ovl.name));
+			const QString text = qstr(fmt::format("OVL 0x%08x: '%s'", id, ovl.name));
 			QTreeWidgetItem* ovl_tree = add_solid_node(node, text, text);
 			display_program_segments(ovl_tree, ovl);
 			break;
@@ -488,7 +466,6 @@ void kernel_explorer::update()
 			auto& lwm = static_cast<lv2_lwmutex&>(obj);
 			std::string owner_str = "unknown"; // Either invalid state or the lwmutex control data was moved from
 			sys_lwmutex_t lwm_data{};
-			auto lv2_control = lwm.lv2_control.load();
 
 			if (lwm.control.try_read(lwm_data) && lwm_data.sleep_queue == id)
 			{
@@ -514,88 +491,49 @@ void kernel_explorer::update()
 			}
 			else
 			{
-				show_waiters(add_solid_node(node, QString::fromStdString(fmt::format(u8"LWMutex 0x%08x: “%s”", id, lv2_obj::name64(lwm.name))), QString::fromStdString(fmt::format(u8"LWMutex 0x%08x: “%s”, %s, Signal: %#x (unmapped/invalid control data at *0x%x)", id, lv2_obj::name64(lwm.name), lwm.protocol, +lv2_control.signaled, lwm.control))), lv2_control.sq);
+				add_leaf(node, qstr(fmt::format(u8"LWMutex 0x%08x: “%s”, %s, Signal: %#x, Wq: %zu (unmapped/invalid control data at *0x%x)", id, lv2_obj::name64(lwm.name), lwm.protocol, +lwm.signaled, lwm.sq.size(), lwm.control)));
 				break;
 			}
 
-			show_waiters(add_solid_node(node, QString::fromStdString(fmt::format(u8"LWMutex 0x%08x: “%s”", id, lv2_obj::name64(lwm.name))), QString::fromStdString(fmt::format(u8"LWMutex 0x%08x: “%s”, %s,%s Owner: %s, Locks: %u, Signal: %#x, Control: *0x%x", id, lv2_obj::name64(lwm.name), lwm.protocol,
-					(lwm_data.attribute & SYS_SYNC_RECURSIVE) ? " Recursive," : "", owner_str, lwm_data.recursive_count, +lv2_control.signaled, lwm.control))), lv2_control.sq);
+			add_leaf(node, qstr(fmt::format(u8"LWMutex 0x%08x: “%s”, %s,%s Owner: %s, Locks: %u, Signal: %#x, Control: *0x%x, Wq: %zu", id, lv2_obj::name64(lwm.name), lwm.protocol,
+					(lwm_data.attribute & SYS_SYNC_RECURSIVE) ? " Recursive," : "", owner_str, lwm_data.recursive_count, +lwm.signaled, lwm.control, lwm.sq.size())));
 			break;
 		}
 		case SYS_TIMER_OBJECT:
 		{
 			auto& timer = static_cast<lv2_timer&>(obj);
 
-			u32 timer_state{SYS_TIMER_STATE_STOP};
-			shared_ptr<lv2_event_queue> port;
-			u64 source = 0;
-			u64 data1 = 0;
-			u64 data2 = 0;
+			sys_timer_information_t info;
+			timer.get_information(info);
 
-			u64 expire = 0; // Next expiration time
-			u64 period = 0; // Period (oneshot if 0)
-
-			if (reader_lock r_lock(timer.mutex); true)
-			{
-				timer_state = timer.state;
-
-				port = timer.port;
-				source = timer.source;
-				data1 = timer.data1;
-				data2 = timer.data2;
-
-				expire = timer.expire; // Next expiration time
-				period = timer.period; // Period (oneshot if 0)
-			}
-
-			add_leaf(node, QString::fromStdString(fmt::format("Timer 0x%08x: State: %s, Period: 0x%llx, Next Expire: 0x%llx, Queue ID: 0x%08x, Source: 0x%08x, Data1: 0x%08x, Data2: 0x%08x", id, timer_state ? "Running" : "Stopped"
-				, period, expire, port ? port->id : 0, source, data1, data2)));
+			add_leaf(node, qstr(fmt::format("Timer 0x%08x: State: %s, Period: 0x%llx, Next Expire: 0x%llx", id, info.timer_state ? "Running" : "Stopped"
+				, info.period, info.next_expire)));
 			break;
 		}
 		case SYS_SEMAPHORE_OBJECT:
 		{
 			auto& sema = static_cast<lv2_sema&>(obj);
 			const auto val = +sema.val;
-			show_waiters(add_solid_node(node, QString::fromStdString(fmt::format(u8"Sema 0x%08x: “%s”", id, lv2_obj::name64(sema.name))), QString::fromStdString(fmt::format(u8"Sema 0x%08x: “%s”, %s, Count: %d/%d, Key: %#llx", id, lv2_obj::name64(sema.name), sema.protocol,
-				std::max<s32>(val, 0), sema.max, sema.key, -std::min<s32>(val, 0)))), sema.sq);
+			add_leaf(node, qstr(fmt::format(u8"Sema 0x%08x: “%s”, %s, Count: %d/%d, Key: %#llx, Wq: %zu", id, lv2_obj::name64(sema.name), sema.protocol,
+				std::max<s32>(val, 0), sema.max, sema.key, -std::min<s32>(val, 0))));
 			break;
 		}
 		case SYS_LWCOND_OBJECT:
 		{
 			auto& lwc = static_cast<lv2_lwcond&>(obj);
-			show_waiters(add_solid_node(node, QString::fromStdString(fmt::format(u8"LWCond 0x%08x: “%s”", id, lv2_obj::name64(lwc.name))), QString::fromStdString(fmt::format(u8"LWCond 0x%08x: “%s”, %s, OG LWMutex: 0x%08x, Control: *0x%x", id, lv2_obj::name64(lwc.name), lwc.protocol, lwc.lwid, lwc.control))), lwc.sq);
+			add_leaf(node, qstr(fmt::format(u8"LWCond 0x%08x: “%s”, %s, OG LWMutex: 0x%08x, Control: *0x%x, Wq: %zu", id, lv2_obj::name64(lwc.name), lwc.protocol, lwc.lwid, lwc.control, +lwc.waiters)));
 			break;
 		}
 		case SYS_EVENT_FLAG_OBJECT:
 		{
 			auto& ef = static_cast<lv2_event_flag&>(obj);
-			show_waiters(add_solid_node(node, QString::fromStdString(fmt::format(u8"Event Flag 0x%08x: “%s”", id, lv2_obj::name64(ef.name))), QString::fromStdString(fmt::format(u8"Event Flag 0x%08x: “%s”, %s, Type: 0x%x, Key: %#llx, Pattern: 0x%llx", id, lv2_obj::name64(ef.name), ef.protocol,
-				ef.type, ef.key, ef.pattern.load()))), ef.sq);
-			break;
-		}
-		case SYS_RSXAUDIO_OBJECT:
-		{
-			auto& rao = static_cast<lv2_rsxaudio&>(obj);
-			std::lock_guard lock(rao.mutex);
-			if (!rao.init)
-			{
-				break;
-			}
-
-			QTreeWidgetItem* rao_obj = add_solid_node(node, QString::fromStdString(fmt::format(u8"RSXAudio 0x%08x: Shmem: 0x%08x", id, u32{rao.shmem})));
-			for (u64 q_idx = 0; q_idx < rao.event_queue.size(); q_idx++)
-			{
-				if (const auto& eq = rao.event_queue[q_idx])
-				{
-					add_leaf(rao_obj, QString::fromStdString(fmt::format(u8"Event Queue %u: ID: 0x%08x", q_idx, eq->id)));
-				}
-			}
-
+			add_leaf(node, qstr(fmt::format(u8"Event Flag 0x%08x: “%s”, %s, Type: 0x%x, Key: %#llx, Pattern: 0x%llx, Wq: %zu", id, lv2_obj::name64(ef.name), ef.protocol,
+				ef.type, ef.key, ef.pattern.load(), +ef.waiters)));
 			break;
 		}
 		default:
 		{
-			add_leaf(node, QString::fromStdString(fmt::format("Unknown object 0x%08x", id)));
+			add_leaf(node, qstr(fmt::format("Unknown object 0x%08x", id)));
 		}
 		}
 	});
@@ -603,71 +541,37 @@ void kernel_explorer::update()
 	idm::select<sys_vm_t>([&](u32 /*id*/, sys_vm_t& vmo)
 	{
 		const u32 psize = vmo.psize;
-		add_leaf(find_node(root, additional_nodes::virtual_memory), QString::fromStdString(fmt::format("Virtual Mem 0x%08x: Virtual Size: 0x%x (%0.2f MB), Physical Size: 0x%x (%0.2f MB), Mem Container: %s", vmo.addr
+		add_leaf(find_node(root, additional_nodes::virtual_memory), qstr(fmt::format("Virtual Mem 0x%08x: Virtual Size: 0x%x (%0.2f MB), Physical Size: 0x%x (%0.2f MB), Mem Container: %s", vmo.addr
 			, vmo.size, vmo.size * 1. / (1024 * 1024), psize, psize * 1. / (1024 * 1024), vmo.ct->id)));
 	});
 
 	idm::select<lv2_socket>([&](u32 id, lv2_socket& sock)
 	{
-		add_leaf(find_node(root, additional_nodes::sockets), QString::fromStdString(fmt::format("Socket %u: Type: %s, Family: %s, Wq: %zu", id, sock.get_type(), sock.get_family(), sock.get_queue_size())));
+		add_leaf(find_node(root, additional_nodes::sockets), qstr(fmt::format("Socket %u: Type: %s, Family: %s, Wq: %zu", id, sock.type, sock.family, sock.queue.size())));
 	});
 
 	idm::select<lv2_memory_container>([&](u32 id, lv2_memory_container& container)
 	{
 		const u32 used = container.used;
-		add_leaf(find_node(root, additional_nodes::memory_containers), QString::fromStdString(fmt::format("Memory Container 0x%08x: Used: 0x%x/0x%x (%0.2f/%0.2f MB)", id, used, container.size, used * 1. / (1024 * 1024), container.size * 1. / (1024 * 1024))));
+		add_leaf(find_node(root, additional_nodes::memory_containers), qstr(fmt::format("Memory Container 0x%08x: Used: 0x%x/0x%x (%0.2f/%0.2f MB)", id, used, container.size, used * 1. / (1024 * 1024), container.size * 1. / (1024 * 1024))));
 	});
 
-	std::optional<std::scoped_lock<shared_mutex, shared_mutex>> lock_idm_lv2(std::in_place, id_manager::g_mutex, lv2_obj::g_mutex);
-
-	// Postponed as much as possible for time accuracy
-	u64 current_time_storage = 0;
-
-	auto get_current_time = [&current_time_storage]()
-	{
-		if (!current_time_storage)
-		{
-			// Evaluate on the first use for better consistency (this function can be quite slow)
-			// Yet once it is evaluated, keep it on the same value for consistency.
-			current_time_storage = get_guest_system_time();
-		}
-
-		return current_time_storage;
-	};
-
-	auto get_wait_time_str = [&](u64 start_time) -> std::string
-	{
-		if (!start_time)
-		{
-			return {};
-		}
-
-		if (start_time > get_current_time() && start_time - get_current_time() > 1'000'000)
-		{
-			return " (time underflow)";
-		}
-
-		const f64 wait_time = (get_current_time() >= start_time ? get_current_time() - start_time : 0) / 1000000.;
-		return fmt::format(" (%.1fs)", wait_time);
-	};
+	std::unique_lock lock_lv2(lv2_obj::g_mutex);
 
 	idm::select<named_thread<ppu_thread>>([&](u32 id, ppu_thread& ppu)
 	{
 		const auto func = ppu.last_function;
-		const ppu_thread_status status = lv2_obj::ppu_state(&ppu, false, false).first;
+		const ppu_thread_status status = lv2_obj::ppu_state(&ppu, false, false);
 
-		add_leaf(find_node(root, additional_nodes::ppu_threads), QString::fromStdString(fmt::format(u8"PPU 0x%07x: “%s”, PRIO: %d, Joiner: %s, Status: %s, State: %s, %s func: “%s”%s", id, *ppu.ppu_tname.load(), ppu.prio.load().prio, ppu.joiner.load(), status, ppu.state.load()
-			, ppu.ack_suspend ? "After" : (ppu.current_function ? "In" : "Last"), func ? func : "", get_wait_time_str(ppu.start_time))));
-	}, idm::unlocked);
+		add_leaf(find_node(root, additional_nodes::ppu_threads), qstr(fmt::format(u8"PPU 0x%07x: “%s”, PRIO: %d, Joiner: %s, Status: %s, State: %s, %s func: “%s”", id, *ppu.ppu_tname.load(), +ppu.prio, ppu.joiner.load(), status, ppu.state.load()
+			, ppu.current_function ? "In" : "Last", func ? func : "")));
+	});
 
-	lock_idm_lv2.reset();
+	lock_lv2.unlock();
 
 	idm::select<named_thread<spu_thread>>([&](u32 /*id*/, spu_thread& spu)
 	{
-		const auto func = spu.current_func;
-		const u64 start_time = spu.start_time;
-
-		QTreeWidgetItem* spu_thread_tree = add_solid_node(find_node(root, additional_nodes::spu_threads), QString::fromStdString(fmt::format(u8"SPU 0x%07x: “%s”", spu.lv2_id, *spu.spu_tname.load())), QString::fromStdString(fmt::format(u8"SPU 0x%07x: “%s”, State: %s, Type: %s, Func: \"%s\"%s", spu.lv2_id, *spu.spu_tname.load(), spu.state.load(), spu.get_type(), start_time && func ? func : "", start_time ? get_wait_time_str(get_guest_system_time(start_time)) : "")));
+		QTreeWidgetItem* spu_thread_tree = add_solid_node(find_node(root, additional_nodes::spu_threads), qstr(fmt::format(u8"SPU 0x%07x: “%s”, State: %s, Type: %s", spu.lv2_id, *spu.spu_tname.load(), spu.state.load(), spu.get_type())));
 
 		if (spu.get_type() == spu_type::threaded)
 		{
@@ -691,21 +595,21 @@ void kernel_explorer::update()
 				{
 					if (lv2_obj::check(port))
 					{
-						add_leaf(spu_thread_tree, QString::fromStdString(fmt::format("SPU Port %u: Queue ID: 0x%08x", &port - spu.spup, port->id)));
+						add_leaf(spu_thread_tree, qstr(fmt::format("SPU Port %u: Queue ID: 0x%08x", &port - spu.spup, port->id)));
 					}
 				}
 			}
 			else if (has_connected_ports)
 			{
 				// Avoid duplication of information between threads which is common
-				add_leaf(spu_thread_tree, QString::fromStdString(fmt::format("SPU Ports: As SPU 0x%07x", first_spu->lv2_id)));
+				add_leaf(spu_thread_tree, qstr(fmt::format("SPU Ports: As SPU 0x%07x", first_spu->lv2_id)));
 			}
 
 			for (const auto& [key, queue] : spu.spuq)
 			{
 				if (lv2_obj::check(queue))
 				{
-					add_leaf(spu_thread_tree, QString::fromStdString(fmt::format("SPU Queue: Queue ID: 0x%08x, Key: 0x%x", queue->id, key)));
+					add_leaf(spu_thread_tree, qstr(fmt::format("SPU Queue: Queue ID: 0x%08x, Key: 0x%x", queue->id, key)));
 				}
 			}
 		}
@@ -715,7 +619,7 @@ void kernel_explorer::update()
 			{
 				if (lv2_obj::check(ctrl.tag))
 				{
-					add_leaf(spu_thread_tree, QString::fromStdString(fmt::format("Interrupt Tag %u: ID: 0x%x, Mask: 0x%x, Status: 0x%x", &ctrl - spu.int_ctrl.data(), ctrl.tag->id, +ctrl.mask, +ctrl.stat)));
+					add_leaf(spu_thread_tree, qstr(fmt::format("Interrupt Tag %u: ID: 0x%x, Mask: 0x%x, Status: 0x%x", &ctrl - spu.int_ctrl.data(), ctrl.tag->id, +ctrl.mask, +ctrl.stat)));
 				}
 			}
 		}
@@ -723,7 +627,7 @@ void kernel_explorer::update()
 
 	idm::select<lv2_spu_group>([&](u32 id, lv2_spu_group& tg)
 	{
-		QTreeWidgetItem* spu_tree = add_solid_node(find_node(root, additional_nodes::spu_thread_groups), QString::fromStdString(fmt::format(u8"SPU Group 0x%07x: “%s”, Type = 0x%x", id, tg.name, tg.type)), QString::fromStdString(fmt::format(u8"SPU Group 0x%07x: “%s”, Status = %s, Priority = %d, Type = 0x%x", id, tg.name, tg.run_state.load(), tg.prio.load().prio, tg.type)));
+		QTreeWidgetItem* spu_tree = add_solid_node(find_node(root, additional_nodes::spu_thread_groups), qstr(fmt::format(u8"SPU Group 0x%07x: “%s”, Status = %s, Priority = %d, Type = 0x%x", id, tg.name, tg.run_state.load(), +tg.prio, tg.type)));
 
 		if (tg.name.ends_with("CellSpursKernelGroup"sv))
 		{
@@ -761,7 +665,7 @@ void kernel_explorer::update()
 			{
 				const QString branch_name = tr("SPURS %1").arg(pspurs.addr());
 				const u32 wklEnabled = spurs.wklEnabled;
-				QTreeWidgetItem* spurs_tree = add_solid_node(spu_tree, branch_name, QString::fromStdString(fmt::format("SPURS, Instance: *0x%x, LWMutex: 0x%x, LWCond: 0x%x, wklEnabled: 0x%x"
+				QTreeWidgetItem* spurs_tree = add_solid_node(spu_tree, branch_name, qstr(fmt::format("SPURS, Instance: *0x%x, LWMutex: 0x%x, LWCond: 0x%x, wklEnabled: 0x%x"
 					, pspurs, spurs.mutex.sleep_queue, spurs.cond.lwcond_queue, wklEnabled)));
 
 				const u32 signal_mask = u32{spurs.wklSignal1} << 16 | spurs.wklSignal2;
@@ -786,7 +690,7 @@ void kernel_explorer::update()
 					const u8 status = spurs.wklStatus(wid);
 					const auto has_signal = (signal_mask & (0x80000000u >> wid)) ? "Signalled"sv : "No Signal"sv;
 
-					QTreeWidgetItem* wkl_tree = add_solid_node(spurs_tree, branch_name + QString::fromStdString(fmt::format(" Work.%u", wid)), QString::fromStdString(fmt::format("Work.%u, class: %s, %s, %s, Status: %#x, Event: %#x, %s, ReadyCnt: %u", wid, +name.nameClass, +name.nameInstance, state, status, evt, has_signal, ready_count)));
+					QTreeWidgetItem* wkl_tree = add_solid_node(spurs_tree, branch_name + qstr(fmt::format(" Work.%u", wid)), qstr(fmt::format("Work.%u, class: %s, %s, %s, Status: %#x, Event: %#x, %s, ReadyCnt: %u", wid, +name.nameClass, +name.nameInstance, state, status, evt, has_signal, ready_count)));
 
 					auto contention = [&](u8 v)
 					{
@@ -797,11 +701,11 @@ void kernel_explorer::update()
 					};
 
 					const auto& winfo = spurs.wklInfo(wid);
-					add_leaf(wkl_tree, QString::fromStdString(fmt::format("Contention: %u/%u (pending: %u), Image: *0x%x (size: 0x%x, arg: 0x%x), Priority (BE64): %016x", contention(spurs.wklCurrentContention[wid % 16])
+					add_leaf(wkl_tree, qstr(fmt::format("Contention: %u/%u (pending: %u), Image: *0x%x (size: 0x%x, arg: 0x%x), Priority (BE64): %016x", contention(spurs.wklCurrentContention[wid % 16])
 						, contention(spurs.wklMaxContention[wid % 16]), contention(spurs.wklPendingContention[wid % 16]), +winfo.addr, winfo.size, winfo.arg, std::bit_cast<be_t<u64>>(winfo.priority))));
 				}
 
-				add_leaf(spurs_tree, QString::fromStdString(fmt::format("Handler Info: PPU0: 0x%x, PPU1: 0x%x, DirtyState: %u, Waiting: %u, Exiting: %u", spurs.ppu0, spurs.ppu1
+				add_leaf(spurs_tree, qstr(fmt::format("Handler Info: PPU0: 0x%x, PPU1: 0x%x, DirtyState: %u, Waiting: %u, Exiting: %u", spurs.ppu0, spurs.ppu1
 					, +spurs.handlerDirty, +spurs.handlerWaiting, +spurs.handlerExiting)));
 			}
 			else
@@ -832,7 +736,7 @@ void kernel_explorer::update()
 
 		const QString branch_name = "RSX Context 0x55555555";
 		QTreeWidgetItem* rsx_tree = add_solid_node(rsx_context_node, branch_name,
-			branch_name + QString::fromStdString(fmt::format(u8", Local Size: %u MB, Base Addr: 0x%x, Device Addr: 0x%x, Handlers: 0x%x", rsx->local_mem_size >> 20, base, rsx->device_addr, +vm::_ref<RsxDriverInfo>(rsx->driver_info).handlers)));
+			branch_name + qstr(fmt::format(u8", Local Size: %u MB, Base Addr: 0x%x, Device Addr: 0x%x, Handlers: 0x%x", rsx->local_mem_size >> 20, base, rsx->device_addr, +vm::_ref<RsxDriverInfo>(rsx->driver_info).handlers)));
 
 		QTreeWidgetItem* io_tree = add_volatile_node(rsx_tree, tr("IO-EA Table"));
 		QTreeWidgetItem* zc_tree = add_volatile_node(rsx_tree, tr("Zcull Bindings"));
@@ -842,7 +746,7 @@ void kernel_explorer::update()
 		decltype(rsx->display_buffers) dbs;
 		decltype(rsx->zculls) zcs;
 		{
-			reader_lock lock(rsx->sys_rsx_mtx);
+			std::lock_guard lock(rsx->sys_rsx_mtx);
 			std::memcpy(&table, &rsx->iomap_table, sizeof(table));
 			std::memcpy(&dbs, rsx->display_buffers, sizeof(dbs));
 			std::memcpy(&zcs, &rsx->zculls, sizeof(zcs));
@@ -857,7 +761,7 @@ void kernel_explorer::update()
 				if (size_block)
 				{
 					// Print block
-					add_leaf(io_tree, QString::fromStdString(fmt::format("IO: %08x, EA: %08x, Size: %uMB", first_io, first_ea, size_block)));
+					add_leaf(io_tree, qstr(fmt::format("IO: %08x, EA: %08x, Size: %uMB", first_io, first_ea, size_block)));
 				}
 
 				if (i >= 512u)
@@ -883,7 +787,7 @@ void kernel_explorer::update()
 				else
 				{
 					// Print last block before we continue to a new one
-					add_leaf(io_tree, QString::fromStdString(fmt::format("IO: %08x, EA: %08x, Size: %uMB", first_io, first_ea, old_block_size)));
+					add_leaf(io_tree, qstr(fmt::format("IO: %08x, EA: %08x, Size: %uMB", first_io, first_ea, old_block_size)));
 					size_block = 1;
 					first_ea = addr;
 					first_io = (i - 1) << 20;
@@ -901,7 +805,7 @@ void kernel_explorer::update()
 		{
 			if (zc.bound)
 			{
-				add_leaf(zc_tree, QString::fromStdString(fmt::format("O: %07x, W: %u, H: %u, Zformat: 0x%x, AAformat: 0x%x, Dir: 0x%x, sFunc: 0x%x, sRef: %02x, sMask: %02x"
+				add_leaf(zc_tree, qstr(fmt::format("O: %07x, W: %u, H: %u, Zformat: 0x%x, AAformat: 0x%x, Dir: 0x%x, sFunc: 0x%x, sRef: %02x, sMask: %02x"
 					, zc.offset, zc.height, zc.width, zc.zFormat, zc.aaFormat, zc.zcullDir, zc.sFunc, zc.sRef, zc.sMask)));
 			}
 		}
@@ -910,7 +814,7 @@ void kernel_explorer::update()
 		{
 			if (db.valid())
 			{
-				add_leaf(db_tree, QString::fromStdString(fmt::format("Offset: %07x, Width: %u, Height: %u, Pitch: %u"
+				add_leaf(db_tree, qstr(fmt::format("Offset: %07x, Width: %u, Height: %u, Pitch: %u"
 					, db.offset, db.height, db.width, db.pitch)));
 			}
 		}
@@ -934,7 +838,7 @@ void kernel_explorer::update()
 			return "Unknown object!";
 		}());
 
-		add_leaf(find_node(root, additional_nodes::file_descriptors), QString::fromStdString(str));
+		add_leaf(find_node(root, additional_nodes::file_descriptors), qstr(str));
 	});
 
 	std::function<int(QTreeWidgetItem*)> final_touches;
@@ -967,7 +871,7 @@ void kernel_explorer::update()
 				if (count > 0)
 				{
 					// Append count
-					node->setText(0, node->text(0) + QString::fromStdString(fmt::format(" (%zu)", count)));
+					node->setText(0, node->text(0) + qstr(fmt::format(" (%zu)", count)));
 
 					// Expand if necessary
 					node->setExpanded(node->data(0, kernel_item_role::expanded_role).toBool());
@@ -1007,16 +911,16 @@ void kernel_explorer::log(u32 level, QTreeWidgetItem* item)
 			return;
 		}
 
-		m_log_buf = QString::fromStdString(fmt::format("Kernel Explorer: %s\n", Emu.GetTitleAndTitleID()));
+		m_log_buf = qstr(fmt::format("Kernel Explorer: %s\n", Emu.GetTitleAndTitleID()));
 		log(level + 1, item);
 
-		sys_log.success("%s", m_log_buf);
+		sys_log.success("%s", m_log_buf.toStdString());
 		return;
 	}
 
 	for (u32 j = 0; j < level; j++)
 	{
-		m_log_buf += QChar::Space;
+		m_log_buf += QChar::Nbsp;
 	}
 
 	m_log_buf.append(item->text(0));
diff --git a/rpcs3/rpcs3qt/localized.cpp b/rpcs3/rpcs3qt/localized.cpp
index 78e5577b00..2cd89a33ea 100644
--- a/rpcs3/rpcs3qt/localized.cpp
+++ b/rpcs3/rpcs3qt/localized.cpp
@@ -1,5 +1,4 @@
 #include "localized.h"
-#include "Loader/PSF.h"
 
 QString Localized::GetVerboseTimeByMs(quint64 elapsed_ms, bool show_days) const
 {
@@ -46,63 +45,3 @@ QString Localized::GetVerboseTimeByMs(quint64 elapsed_ms, bool show_days) const
 
 	return str_seconds;
 }
-
-std::string Localized::GetStringFromU32(const u32& key, const std::map<u32, QString>& map, bool combined)
-{
-	QStringList string;
-
-	if (combined)
-	{
-		for (const auto& item : map)
-		{
-			if (key & item.first)
-			{
-				string << item.second;
-			}
-		}
-	}
-	else
-	{
-		if (map.find(key) != map.end())
-		{
-			string << ::at32(map, key);
-		}
-	}
-
-	if (string.isEmpty())
-	{
-		string << tr("Unknown");
-	}
-
-	return string.join(", ").toStdString();
-}
-
-Localized::resolution::resolution()
-	: mode({
-		{ psf::resolution_flag::_480,      tr("480") },
-		{ psf::resolution_flag::_576,      tr("576") },
-		{ psf::resolution_flag::_720,      tr("720") },
-		{ psf::resolution_flag::_1080,     tr("1080") },
-		{ psf::resolution_flag::_480_16_9, tr("480 16:9") },
-		{ psf::resolution_flag::_576_16_9, tr("576 16:9") },
-	})
-{
-}
-
-Localized::sound::sound()
-	: format({
-		{ psf::sound_format_flag::lpcm_2,   tr("LPCM 2.0") },
-		{ psf::sound_format_flag::lpcm_5_1, tr("LPCM 5.1") },
-		{ psf::sound_format_flag::lpcm_7_1, tr("LPCM 7.1") },
-		{ psf::sound_format_flag::ac3,      tr("Dolby Digital 5.1") },
-		{ psf::sound_format_flag::dts,      tr("DTS 5.1") },
-	})
-{
-}
-
-Localized::title_t::title_t()
-	: titles({
-		{ "vsh/module/vsh.self", tr("The PS3 Interface (XMB, or VSH)") },
-	})
-{
-}
diff --git a/rpcs3/rpcs3qt/localized.h b/rpcs3/rpcs3qt/localized.h
index cfd3b9e437..543f0c2fd5 100644
--- a/rpcs3/rpcs3qt/localized.h
+++ b/rpcs3/rpcs3qt/localized.h
@@ -17,14 +17,12 @@ public:
 	Localized() {}
 
 	QString GetVerboseTimeByMs(quint64 elapsed_ms, bool show_days = false) const;
-	static std::string GetStringFromU32(const u32& key, const std::map<u32, QString>& map, bool combined = false);
 
 	const struct category // (see PARAM.SFO in psdevwiki.com) TODO: Disc Categories
 	{
 		// PS3 bootable
 		const QString app_music = tr("Music App");
 		const QString app_photo = tr("Photo App");
-		const QString app_store = tr("Store App");
 		const QString app_tv    = tr("TV App");
 		const QString app_video = tr("Video App");
 		const QString bc_video  = tr("Broadcast Video");
@@ -34,7 +32,6 @@ public:
 		const QString network   = tr("Network");
 		const QString store_fe  = tr("Store");
 		const QString web_tv    = tr("Web TV");
-		const QString os_app    = tr("Operating System");
 
 		// PS2 bootable
 		const QString ps2_game = tr("PS2 Classics");
@@ -65,7 +62,6 @@ public:
 		{
 			{ cat::cat_app_music, app_music }, // media
 			{ cat::cat_app_photo, app_photo }, // media
-			{ cat::cat_app_store, app_store }, // media
 			{ cat::cat_app_tv   , app_tv    }, // media
 			{ cat::cat_app_video, app_video }, // media
 			{ cat::cat_bc_video , bc_video  }, // media
@@ -81,7 +77,6 @@ public:
 			{ cat::cat_psp_game , psp_game  }, // psp_games
 			{ cat::cat_psp_mini , psp_mini  }, // psp_games
 			{ cat::cat_psp_rema , psp_rema  }, // psp_games
-			{ cat::cat_ps3_os   , os_app    }, // other
 		};
 
 		const localized_cat cat_data =
@@ -116,19 +111,27 @@ public:
 	const struct resolution
 	{
 		// there might be different values for other categories
-		resolution();
-		const std::map<u32, QString> mode;
+		const std::map<u32, QString> mode
+		{
+			{ 1 << 0, tr("480p") },
+			{ 1 << 1, tr("576p") },
+			{ 1 << 2, tr("720p") },
+			{ 1 << 3, tr("1080p") },
+			{ 1 << 4, tr("480p 16:9") },
+			{ 1 << 5, tr("576p 16:9") },
+		};
 	} resolution;
 
 	const struct sound
 	{
-		sound();
-		const std::map<u32, QString> format;
+		const std::map<u32, QString> format
+		{
+			{ 1 << 0, tr("LPCM 2.0") },
+			//{ 1 << 1, tr("LPCM ???") },
+			{ 1 << 2, tr("LPCM 5.1") },
+			{ 1 << 4, tr("LPCM 7.1") },
+			{ 1 << 8, tr("Dolby Digital 5.1") },
+			{ 1 << 9, tr("DTS 5.1") },
+		};
 	} sound;
-
-	const struct title_t
-	{
-		title_t();
-		const std::map<std::string, QString> titles;
-	} title;
 };
diff --git a/rpcs3/rpcs3qt/localized_emu.cpp b/rpcs3/rpcs3qt/localized_emu.cpp
deleted file mode 100644
index bfc0b52101..0000000000
--- a/rpcs3/rpcs3qt/localized_emu.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "stdafx.h"
-#include "localized_emu.h"
-#include "Emu/Io/MouseHandler.h"
-
-QString localized_emu::translated_pad_button(pad_button btn)
-{
-	switch (btn)
-	{
-	case pad_button::dpad_up: return tr("D-Pad Up");
-	case pad_button::dpad_down: return tr("D-Pad Down");
-	case pad_button::dpad_left: return tr("D-Pad Left");
-	case pad_button::dpad_right: return tr("D-Pad Right");
-	case pad_button::select: return tr("Select");
-	case pad_button::start: return tr("Start");
-	case pad_button::ps: return tr("PS");
-	case pad_button::triangle: return tr("Triangle");
-	case pad_button::circle: return tr("Circle");
-	case pad_button::square: return tr("Square");
-	case pad_button::cross: return tr("Cross");
-	case pad_button::L1: return tr("L1");
-	case pad_button::R1: return tr("R1");
-	case pad_button::L2: return tr("L2");
-	case pad_button::R2: return tr("R2");
-	case pad_button::L3: return tr("L3");
-	case pad_button::R3: return tr("R3");
-	case pad_button::ls_up: return tr("Left Stick Up");
-	case pad_button::ls_down: return tr("Left Stick Down");
-	case pad_button::ls_left: return tr("Left Stick Left");
-	case pad_button::ls_right: return tr("Left Stick Right");
-	case pad_button::ls_x: return tr("Left Stick X-Axis");
-	case pad_button::ls_y: return tr("Left Stick Y-Axis");
-	case pad_button::rs_up: return tr("Right Stick Up");
-	case pad_button::rs_down: return tr("Right Stick Down");
-	case pad_button::rs_left: return tr("Right Stick Left");
-	case pad_button::rs_right: return tr("Right Stick Right");
-	case pad_button::rs_x: return tr("Right Stick X-Axis");
-	case pad_button::rs_y: return tr("Right Stick Y-Axis");
-	case pad_button::pad_button_max_enum: return "";
-	case pad_button::mouse_button_1: return tr("Mouse 1");
-	case pad_button::mouse_button_2: return tr("Mouse 2");
-	case pad_button::mouse_button_3: return tr("Mouse 3");
-	case pad_button::mouse_button_4: return tr("Mouse 4");
-	case pad_button::mouse_button_5: return tr("Mouse 5");
-	case pad_button::mouse_button_6: return tr("Mouse 6");
-	case pad_button::mouse_button_7: return tr("Mouse 7");
-	case pad_button::mouse_button_8: return tr("Mouse 8");
-	}
-	return "";
-}
-
-QString localized_emu::translated_mouse_button(int btn)
-{
-	switch (btn)
-	{
-	case CELL_MOUSE_BUTTON_1: return tr("Button 1");
-	case CELL_MOUSE_BUTTON_2: return tr("Button 2");
-	case CELL_MOUSE_BUTTON_3: return tr("Button 3");
-	case CELL_MOUSE_BUTTON_4: return tr("Button 4");
-	case CELL_MOUSE_BUTTON_5: return tr("Button 5");
-	case CELL_MOUSE_BUTTON_6: return tr("Button 6");
-	case CELL_MOUSE_BUTTON_7: return tr("Button 7");
-	case CELL_MOUSE_BUTTON_8: return tr("Button 8");
-	}
-	return "";
-}
diff --git a/rpcs3/rpcs3qt/localized_emu.h b/rpcs3/rpcs3qt/localized_emu.h
index 1beab0f082..7c85293452 100644
--- a/rpcs3/rpcs3qt/localized_emu.h
+++ b/rpcs3/rpcs3qt/localized_emu.h
@@ -4,7 +4,6 @@
 #include <QObject>
 
 #include "Emu/localized_string_id.h"
-#include "Emu/Io/pad_types.h"
 
 /**
  * Localized emucore string collection class
@@ -17,9 +16,6 @@ class localized_emu : public QObject
 public:
 	localized_emu() = default;
 
-	static QString translated_pad_button(pad_button btn);
-	static QString translated_mouse_button(int btn);
-
 	template <typename... Args>
 	static std::string get_string(localized_string_id id, Args&&... args)
 	{
@@ -43,7 +39,6 @@ private:
 		case localized_string_id::RSX_OVERLAYS_TROPHY_GOLD: return tr("You have earned a gold trophy.\n%0", "Trophy text").arg(std::forward<Args>(args)...);
 		case localized_string_id::RSX_OVERLAYS_TROPHY_PLATINUM: return tr("You have earned a platinum trophy.\n%0", "Trophy text").arg(std::forward<Args>(args)...);
 		case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS: return tr("Compiling shaders");
-		case localized_string_id::RSX_OVERLAYS_COMPILING_PPU_MODULES: return tr("Compiling PPU Modules");
 		case localized_string_id::RSX_OVERLAYS_MSG_DIALOG_YES: return tr("Yes", "Message Dialog");
 		case localized_string_id::RSX_OVERLAYS_MSG_DIALOG_NO: return tr("No", "Message Dialog");
 		case localized_string_id::RSX_OVERLAYS_MSG_DIALOG_CANCEL: return tr("Back", "Message Dialog");
@@ -59,18 +54,8 @@ private:
 		case localized_string_id::RSX_OVERLAYS_OSK_DIALOG_SHIFT: return tr("Shift", "OSK Dialog");
 		case localized_string_id::RSX_OVERLAYS_OSK_DIALOG_ENTER_TEXT: return tr("[Enter Text]", "OSK Dialog");
 		case localized_string_id::RSX_OVERLAYS_OSK_DIALOG_ENTER_PASSWORD: return tr("[Enter Password]", "OSK Dialog");
-		case localized_string_id::RSX_OVERLAYS_MEDIA_DIALOG_TITLE: return tr("Select media", "Media dialog");
-		case localized_string_id::RSX_OVERLAYS_MEDIA_DIALOG_TITLE_PHOTO_IMPORT: return tr("Select photo to import", "Media dialog");
-		case localized_string_id::RSX_OVERLAYS_MEDIA_DIALOG_EMPTY: return tr("No media found.", "Media dialog");
 		case localized_string_id::RSX_OVERLAYS_LIST_SELECT: return tr("Enter", "Enter Dialog List");
 		case localized_string_id::RSX_OVERLAYS_LIST_CANCEL: return tr("Back", "Cancel Dialog List");
-		case localized_string_id::RSX_OVERLAYS_LIST_DENY: return tr("Deny", "Deny Dialog List");
-		case localized_string_id::RSX_OVERLAYS_PRESSURE_INTENSITY_TOGGLED_OFF: return tr("Pressure intensity mode of player %0 disabled", "Pressure intensity toggled off").arg(std::forward<Args>(args)...);
-		case localized_string_id::RSX_OVERLAYS_PRESSURE_INTENSITY_TOGGLED_ON: return tr("Pressure intensity mode of player %0 enabled", "Pressure intensity toggled on").arg(std::forward<Args>(args)...);
-		case localized_string_id::RSX_OVERLAYS_ANALOG_LIMITER_TOGGLED_OFF: return tr("Analog limiter of player %0 disabled", "Analog limiter toggled off").arg(std::forward<Args>(args)...);
-		case localized_string_id::RSX_OVERLAYS_ANALOG_LIMITER_TOGGLED_ON: return tr("Analog limiter of player %0 enabled", "Analog limiter toggled on").arg(std::forward<Args>(args)...);
-		case localized_string_id::RSX_OVERLAYS_MOUSE_AND_KEYBOARD_EMULATED: return tr("Mouse and keyboard are now used as emulated devices.", "Mouse and keyboard emulated");
-		case localized_string_id::RSX_OVERLAYS_MOUSE_AND_KEYBOARD_PAD: return tr("Mouse and keyboard are now used as pad.", "Mouse and keyboard pad");
 		case localized_string_id::CELL_GAME_ERROR_BROKEN_GAMEDATA: return tr("ERROR: Game data is corrupted. The application will continue.", "Game Error");
 		case localized_string_id::CELL_GAME_ERROR_BROKEN_HDDGAME: return tr("ERROR: HDD boot game is corrupted. The application will continue.", "Game Error");
 		case localized_string_id::CELL_GAME_ERROR_BROKEN_EXIT_GAMEDATA: return tr("ERROR: Game data is corrupted. The application will be terminated.", "Game Error");
@@ -94,7 +79,7 @@ private:
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_80010004: return tr("Memory allocation failed.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_80010005: return tr("The resource with the specified identifier does not exist.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_80010006: return tr("The file does not exist.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
-		case localized_string_id::CELL_MSG_DIALOG_ERROR_80010007: return tr("The file is in an unrecognized format / The file is not a valid ELF file.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
+		case localized_string_id::CELL_MSG_DIALOG_ERROR_80010007: return tr("The file is in unrecognized format / The file is not a valid ELF file.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_80010008: return tr("Resource deadlock is avoided.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_80010009: return tr("Operation not permitted.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_8001000A: return tr("The device or resource is busy.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
@@ -143,7 +128,7 @@ private:
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_80010036: return tr("Not empty.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_80010037: return tr("Not supported.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_80010038: return tr("File-system specific error.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
-		case localized_string_id::CELL_MSG_DIALOG_ERROR_80010039: return tr("Overflow occurred.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
+		case localized_string_id::CELL_MSG_DIALOG_ERROR_80010039: return tr("Overflow occured.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_8001003A: return tr("Filesystem not mounted.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_8001003B: return tr("Not SData.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_8001003C: return tr("Incorrect version in sys_load_param.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
@@ -151,7 +136,6 @@ private:
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_8001003E: return tr("Pointer is null.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_MSG_DIALOG_ERROR_DEFAULT: return tr("An error has occurred.\n(%0)", "Error code").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_OSK_DIALOG_TITLE: return tr("On Screen Keyboard", "OSK Dialog");
-		case localized_string_id::CELL_OSK_DIALOG_BUSY: return tr("The Home Menu can't be opened while the On Screen Keyboard is busy!", "OSK Dialog");
 		case localized_string_id::CELL_SAVEDATA_CB_BROKEN: return tr("Error - Save data corrupted", "Savedata Error");
 		case localized_string_id::CELL_SAVEDATA_CB_FAILURE: return tr("Error - Failed to save or load", "Savedata Error");
 		case localized_string_id::CELL_SAVEDATA_CB_NO_DATA: return tr("Error - Save data cannot be found", "Savedata Error");
@@ -165,174 +149,7 @@ private:
 		case localized_string_id::CELL_SAVEDATA_DELETE: return tr("Delete this data?\n\n%0", "Savedata entry info").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_SAVEDATA_LOAD: return tr("Load this data?\n\n%0", "Savedata entry info").arg(std::forward<Args>(args)...);
 		case localized_string_id::CELL_SAVEDATA_OVERWRITE: return tr("Do you want to overwrite the saved data?\n\n%0", "Savedata entry info").arg(std::forward<Args>(args)...);
-		case localized_string_id::CELL_SAVEDATA_AUTOSAVE: return tr("Saving...");
-		case localized_string_id::CELL_SAVEDATA_AUTOLOAD: return tr("Loading...");
-		case localized_string_id::CELL_CROSS_CONTROLLER_MSG: return tr("Start [%0] on the PS Vita system.\nIf you have not installed [%0], go to [Remote Play] on the PS Vita system and start [Cross-Controller] from the LiveArea™ screen.", "Cross-Controller message").arg(std::forward<Args>(args)...);
-		case localized_string_id::CELL_CROSS_CONTROLLER_FW_MSG: return tr("If your system software version on the PS Vita system is earlier than 1.80, you must update the system software to the latest version.", "Cross-Controller firmware message");
-		case localized_string_id::CELL_NP_RECVMESSAGE_DIALOG_TITLE: return tr("Select Message", "RECVMESSAGE_DIALOG");
-		case localized_string_id::CELL_NP_RECVMESSAGE_DIALOG_TITLE_INVITE: return tr("Select Invite", "RECVMESSAGE_DIALOG");
-		case localized_string_id::CELL_NP_RECVMESSAGE_DIALOG_TITLE_ADD_FRIEND: return tr("Add Friend", "RECVMESSAGE_DIALOG");
-		case localized_string_id::CELL_NP_RECVMESSAGE_DIALOG_FROM: return tr("From:", "RECVMESSAGE_DIALOG");
-		case localized_string_id::CELL_NP_RECVMESSAGE_DIALOG_SUBJECT: return tr("Subject:", "RECVMESSAGE_DIALOG");
-		case localized_string_id::CELL_NP_SENDMESSAGE_DIALOG_TITLE: return tr("Select Message To Send", "SENDMESSAGE_DIALOG");
-		case localized_string_id::CELL_NP_SENDMESSAGE_DIALOG_TITLE_INVITE: return tr("Send Invite", "SENDMESSAGE_DIALOG");
-		case localized_string_id::CELL_NP_SENDMESSAGE_DIALOG_TITLE_ADD_FRIEND: return tr("Add Friend", "SENDMESSAGE_DIALOG");
-		case localized_string_id::CELL_NP_SENDMESSAGE_DIALOG_CONFIRMATION: return tr("Send message to %0 ?\n\nSubject:", "SENDMESSAGE_DIALOG").arg(std::forward<Args>(args)...);
-		case localized_string_id::CELL_NP_SENDMESSAGE_DIALOG_CONFIRMATION_INVITE: return tr("Send invite to %0 ?\n\nSubject:", "SENDMESSAGE_DIALOG").arg(std::forward<Args>(args)...);
-		case localized_string_id::CELL_NP_SENDMESSAGE_DIALOG_CONFIRMATION_ADD_FRIEND: return tr("Send friend request to %0 ?\n\nSubject:", "SENDMESSAGE_DIALOG").arg(std::forward<Args>(args)...);
-		case localized_string_id::RECORDING_ABORTED: return tr("Recording aborted!");
-		case localized_string_id::RPCN_NO_ERROR: return tr("RPCN: No Error");
-		case localized_string_id::RPCN_ERROR_INVALID_INPUT: return tr("RPCN: Invalid Input (Wrong Host/Port)");
-		case localized_string_id::RPCN_ERROR_WOLFSSL: return tr("RPCN Connection Error: WolfSSL Error");
-		case localized_string_id::RPCN_ERROR_RESOLVE: return tr("RPCN Connection Error: Resolve Error");
-		case localized_string_id::RPCN_ERROR_BINDING: return tr("RPCN Connection Error: Failed to bind to given binding IP");
-		case localized_string_id::RPCN_ERROR_CONNECT: return tr("RPCN Connection Error");
-		case localized_string_id::RPCN_ERROR_LOGIN_ERROR: return tr("RPCN Login Error: Identification Error");
-		case localized_string_id::RPCN_ERROR_ALREADY_LOGGED: return tr("RPCN Login Error: User Already Logged In");
-		case localized_string_id::RPCN_ERROR_INVALID_LOGIN: return tr("RPCN Login Error: Invalid Username");
-		case localized_string_id::RPCN_ERROR_INVALID_PASSWORD: return tr("RPCN Login Error: Invalid Password");
-		case localized_string_id::RPCN_ERROR_INVALID_TOKEN: return tr("RPCN Login Error: Invalid Token");
-		case localized_string_id::RPCN_ERROR_INVALID_PROTOCOL_VERSION: return tr("RPCN Misc Error: Protocol Version Error (outdated RPCS3?)");
-		case localized_string_id::RPCN_ERROR_UNKNOWN: return tr("RPCN: Unknown Error");
-		case localized_string_id::RPCN_SUCCESS_LOGGED_ON: return tr("Successfully logged on RPCN!");
-		case localized_string_id::RPCN_FRIEND_REQUEST_RECEIVED: return tr("RPCN: Received friend request: %0", "RCPN Friends").arg(std::forward<Args>(args)...);
-		case localized_string_id::RPCN_FRIEND_ADDED: return tr("RPCN: Friend added: %0", "RCPN Friends").arg(std::forward<Args>(args)...);
-		case localized_string_id::RPCN_FRIEND_LOST: return tr("RPCN: Friend removed: %0", "RCPN Friends").arg(std::forward<Args>(args)...);
-		case localized_string_id::RPCN_FRIEND_LOGGED_IN: return tr("RPCN: %0 logged in", "RCPN Friends").arg(std::forward<Args>(args)...);
-		case localized_string_id::RPCN_FRIEND_LOGGED_OUT: return tr("RPCN: %0 logged out", "RCPN Friends").arg(std::forward<Args>(args)...);
-		case localized_string_id::HOME_MENU_TITLE: return tr("Home Menu");
-		case localized_string_id::HOME_MENU_EXIT_GAME: return tr("Exit Game");
-		case localized_string_id::HOME_MENU_RESUME: return tr("Resume Game");
-		case localized_string_id::HOME_MENU_FRIENDS: return tr("Friends");
-		case localized_string_id::HOME_MENU_FRIENDS_REQUESTS: return tr("Pending Friend Requests");
-		case localized_string_id::HOME_MENU_FRIENDS_BLOCKED: return tr("Blocked Users");
-		case localized_string_id::HOME_MENU_FRIENDS_STATUS_ONLINE: return tr("Online");
-		case localized_string_id::HOME_MENU_FRIENDS_STATUS_OFFLINE: return tr("Offline");
-		case localized_string_id::HOME_MENU_FRIENDS_STATUS_BLOCKED: return tr("Blocked");
-		case localized_string_id::HOME_MENU_FRIENDS_REQUEST_SENT: return tr("You sent a friend request");
-		case localized_string_id::HOME_MENU_FRIENDS_REQUEST_RECEIVED: return tr("Sent you a friend request");
-		case localized_string_id::HOME_MENU_FRIENDS_BLOCK_USER_MSG: return tr("Block this user?\n\n%0").arg(std::forward<Args>(args)...);
-		case localized_string_id::HOME_MENU_FRIENDS_UNBLOCK_USER_MSG: return tr("Unblock this user?\n\n%0").arg(std::forward<Args>(args)...);
-		case localized_string_id::HOME_MENU_FRIENDS_REMOVE_USER_MSG: return tr("Remove this user?\n\n%0").arg(std::forward<Args>(args)...);
-		case localized_string_id::HOME_MENU_FRIENDS_ACCEPT_REQUEST_MSG: return tr("Accept Request?\n\n%0").arg(std::forward<Args>(args)...);
-		case localized_string_id::HOME_MENU_FRIENDS_CANCEL_REQUEST_MSG: return tr("Cancel Request?\n\n%0").arg(std::forward<Args>(args)...);
-		case localized_string_id::HOME_MENU_FRIENDS_REJECT_REQUEST_MSG: return tr("Reject Request?\n\n%0").arg(std::forward<Args>(args)...);
-		case localized_string_id::HOME_MENU_FRIENDS_REJECT_REQUEST: return tr("Reject Request");
-		case localized_string_id::HOME_MENU_FRIENDS_NEXT_LIST: return tr("Next list");
-		case localized_string_id::HOME_MENU_RESTART: return tr("Restart Game");
-		case localized_string_id::HOME_MENU_SETTINGS: return tr("Settings");
-		case localized_string_id::HOME_MENU_SETTINGS_SAVE: return tr("Save custom configuration?");
-		case localized_string_id::HOME_MENU_SETTINGS_SAVE_BUTTON: return tr("Save");
-		case localized_string_id::HOME_MENU_SETTINGS_DISCARD: return tr("Discard the current settings' changes?");
-		case localized_string_id::HOME_MENU_SETTINGS_DISCARD_BUTTON: return tr("Discard");
-		case localized_string_id::HOME_MENU_SETTINGS_AUDIO: return tr("Audio");
-		case localized_string_id::HOME_MENU_SETTINGS_AUDIO_MASTER_VOLUME: return tr("Master Volume", "Audio");
-		case localized_string_id::HOME_MENU_SETTINGS_AUDIO_BACKEND: return tr("Audio Backend", "Audio");
-		case localized_string_id::HOME_MENU_SETTINGS_AUDIO_BUFFERING: return tr("Enable Buffering", "Audio");
-		case localized_string_id::HOME_MENU_SETTINGS_AUDIO_BUFFER_DURATION: return tr("Desired Audio Buffer Duration", "Audio");
-		case localized_string_id::HOME_MENU_SETTINGS_AUDIO_TIME_STRETCHING: return tr("Enable Time Stretching", "Audio");
-		case localized_string_id::HOME_MENU_SETTINGS_AUDIO_TIME_STRETCHING_THRESHOLD: return tr("Time Stretching Threshold", "Audio");
-		case localized_string_id::HOME_MENU_SETTINGS_VIDEO: return tr("Video");
-		case localized_string_id::HOME_MENU_SETTINGS_VIDEO_FRAME_LIMIT: return tr("Frame Limit", "Video");
-		case localized_string_id::HOME_MENU_SETTINGS_VIDEO_ANISOTROPIC_OVERRIDE: return tr("Anisotropic Filter Override", "Video");
-		case localized_string_id::HOME_MENU_SETTINGS_VIDEO_OUTPUT_SCALING: return tr("Output Scaling", "Video");
-		case localized_string_id::HOME_MENU_SETTINGS_VIDEO_RCAS_SHARPENING: return tr("FidelityFX CAS Sharpening Intensity", "Video");
-		case localized_string_id::HOME_MENU_SETTINGS_VIDEO_STRETCH_TO_DISPLAY: return tr("Stretch To Display Area", "Video");
-		case localized_string_id::HOME_MENU_SETTINGS_INPUT: return tr("Input");
-		case localized_string_id::HOME_MENU_SETTINGS_INPUT_BACKGROUND_INPUT: return tr("Background Input Enabled", "Input");
-		case localized_string_id::HOME_MENU_SETTINGS_INPUT_KEEP_PADS_CONNECTED: return tr("Keep Pads Connected", "Input");
-		case localized_string_id::HOME_MENU_SETTINGS_INPUT_SHOW_PS_MOVE_CURSOR: return tr("Show PS Move Cursor", "Input");
-		case localized_string_id::HOME_MENU_SETTINGS_INPUT_CAMERA_FLIP: return tr("Camera Flip", "Input");
-		case localized_string_id::HOME_MENU_SETTINGS_INPUT_PAD_MODE: return tr("Pad Handler Mode", "Input");
-		case localized_string_id::HOME_MENU_SETTINGS_INPUT_PAD_SLEEP: return tr("Pad Handler Sleep", "Input");
-		case localized_string_id::HOME_MENU_SETTINGS_INPUT_FAKE_MOVE_ROTATION_CONE_H: return tr("Fake PS Move Rotation Cone (Horizontal)", "Input");
-		case localized_string_id::HOME_MENU_SETTINGS_INPUT_FAKE_MOVE_ROTATION_CONE_V: return tr("Fake PS Move Rotation Cone (Vertical)", "Input");
-		case localized_string_id::HOME_MENU_SETTINGS_ADVANCED: return tr("Advanced");
-		case localized_string_id::HOME_MENU_SETTINGS_ADVANCED_PREFERRED_SPU_THREADS: return tr("Preferred SPU Threads", "Advanced");
-		case localized_string_id::HOME_MENU_SETTINGS_ADVANCED_MAX_CPU_PREEMPTIONS: return tr("Max Power Saving CPU-Preemptions", "Advanced");
-		case localized_string_id::HOME_MENU_SETTINGS_ADVANCED_ACCURATE_RSX_RESERVATION_ACCESS: return tr("Accurate RSX reservation access", "Advanced");
-		case localized_string_id::HOME_MENU_SETTINGS_ADVANCED_SLEEP_TIMERS_ACCURACY: return tr("Sleep Timers Accuracy", "Advanced");
-		case localized_string_id::HOME_MENU_SETTINGS_ADVANCED_MAX_SPURS_THREADS: return tr("Max SPURS Threads", "Advanced");
-		case localized_string_id::HOME_MENU_SETTINGS_ADVANCED_DRIVER_WAKE_UP_DELAY: return tr("Driver Wake-Up Delay", "Advanced");
-		case localized_string_id::HOME_MENU_SETTINGS_ADVANCED_VBLANK_FREQUENCY: return tr("VBlank Frequency", "Advanced");
-		case localized_string_id::HOME_MENU_SETTINGS_ADVANCED_VBLANK_NTSC: return tr("VBlank NTSC Fixup", "Advanced");
-		case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS: return tr("Overlays");
-		case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_TROPHY_POPUPS: return tr("Show Trophy Popups", "Overlays");
-		case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_RPCN_POPUPS: return tr("Show RPCN Popups", "Overlays");
-		case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_SHADER_COMPILATION_HINT: return tr("Show Shader Compilation Hint", "Overlays");
-		case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_PPU_COMPILATION_HINT: return tr("Show PPU Compilation Hint", "Overlays");
-		case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_AUTO_SAVE_LOAD_HINT: return tr("Show Autosave/Autoload Hint", "Overlays");
-		case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_PRESSURE_INTENSITY_TOGGLE_HINT: return tr("Show Pressure Intensity Toggle Hint", "Overlays");
-		case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_ANALOG_LIMITER_TOGGLE_HINT: return tr( "Show Analog Limiter Toggle Hint", "Overlays");
-		case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_MOUSE_AND_KB_TOGGLE_HINT: return tr("Show Mouse And Keyboard Toggle Hint", "Overlays");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY: return tr("Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE: return tr("Enable Performance Overlay", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE_FRAMERATE_GRAPH: return tr("Enable Framerate Graph", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE_FRAMETIME_GRAPH: return tr("Enable Frametime Graph", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_DETAIL_LEVEL: return tr("Detail level", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMERATE_DETAIL_LEVEL: return tr("Framerate Graph Detail Level", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMETIME_DETAIL_LEVEL: return tr("Frametime Graph Detail Level", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMERATE_DATAPOINT_COUNT: return tr("Framerate Datapoints", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMETIME_DATAPOINT_COUNT: return tr("Frametime Datapoints", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_UPDATE_INTERVAL: return tr("Metrics Update Interval", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_POSITION: return tr("Position", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_CENTER_X: return tr("Center Horizontally", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_CENTER_Y: return tr("Center Vertically", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_MARGIN_X: return tr("Horizontal Margin", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_MARGIN_Y: return tr("Vertical Margin", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FONT_SIZE: return tr("Font Size", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_OPACITY: return tr("Opacity", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_DEBUG: return tr("Debug");
-		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_OVERLAY: return tr("Debug Overlay", "Debug");
-		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY: return tr("Input Debug Overlay", "Debug");
-		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_DISABLE_VIDEO_OUTPUT: return tr("Disable Video Output", "Debug");
-		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_TEXTURE_LOD_BIAS: return tr("Texture LOD Bias Addend", "Debug");
-		case localized_string_id::HOME_MENU_SCREENSHOT: return tr("Take Screenshot");
-		case localized_string_id::HOME_MENU_SAVESTATE: return tr("SaveState");
-		case localized_string_id::HOME_MENU_SAVESTATE_SAVE: return tr("Save Emulation State");
-		case localized_string_id::HOME_MENU_SAVESTATE_AND_EXIT: return tr("Save Emulation State And Exit");
-		case localized_string_id::HOME_MENU_RELOAD_SAVESTATE: return tr("Reload Last Emulation State");
-		case localized_string_id::HOME_MENU_RECORDING: return tr("Start/Stop Recording");
-		case localized_string_id::HOME_MENU_TROPHIES: return tr("Trophies");
-		case localized_string_id::HOME_MENU_TROPHY_LIST_TITLE: return tr("Trophy Progress: %0").arg(std::forward<Args>(args)...);
-		case localized_string_id::HOME_MENU_TROPHY_LOCKED_TITLE: return tr("Locked trophy: %0").arg(std::forward<Args>(args)...);
-		case localized_string_id::HOME_MENU_TROPHY_HIDDEN_TITLE: return tr("Hidden trophy");
-		case localized_string_id::HOME_MENU_TROPHY_HIDDEN_DESCRIPTION: return tr("This trophy is hidden");
-		case localized_string_id::HOME_MENU_TROPHY_SHOW_HIDDEN_TROPHIES: return tr("Show hidden trophies");
-		case localized_string_id::HOME_MENU_TROPHY_HIDE_HIDDEN_TROPHIES: return tr("Hide hidden trophies");
-		case localized_string_id::HOME_MENU_TROPHY_PLATINUM_RELEVANT: return tr("Platinum relevant");
-		case localized_string_id::HOME_MENU_TROPHY_GRADE_BRONZE: return tr("Bronze", "Trophy type");
-		case localized_string_id::HOME_MENU_TROPHY_GRADE_SILVER: return tr("Silver", "Trophy type");
-		case localized_string_id::HOME_MENU_TROPHY_GRADE_GOLD: return tr("Gold", "Trophy type");
-		case localized_string_id::HOME_MENU_TROPHY_GRADE_PLATINUM: return tr("Platinum", "Trophy type");
-		case localized_string_id::AUDIO_MUTED: return tr("Audio muted", "Audio");
-		case localized_string_id::AUDIO_UNMUTED: return tr("Audio unmuted", "Audio");
-		case localized_string_id::AUDIO_CHANGED: return tr("Volume changed to %0", "Audio").arg(std::forward<Args>(args)...);
-		case localized_string_id::PROGRESS_DIALOG_PROGRESS: return tr("Progress:");
-		case localized_string_id::PROGRESS_DIALOG_PROGRESS_ANALYZING: return tr("Progress: analyzing...");
-		case localized_string_id::PROGRESS_DIALOG_REMAINING: return tr("remaining");
-		case localized_string_id::PROGRESS_DIALOG_DONE: return tr("done");
-		case localized_string_id::PROGRESS_DIALOG_FILE: return tr("file");
-		case localized_string_id::PROGRESS_DIALOG_MODULE: return tr("module");
-		case localized_string_id::PROGRESS_DIALOG_OF: return tr("of");
-		case localized_string_id::PROGRESS_DIALOG_PLEASE_WAIT: return tr("Please wait");
-		case localized_string_id::PROGRESS_DIALOG_STOPPING_PLEASE_WAIT: return tr("Stopping. Please wait...");
-		case localized_string_id::PROGRESS_DIALOG_SAVESTATE_PLEASE_WAIT: return tr("Creating savestate. Please wait...");
-		case localized_string_id::PROGRESS_DIALOG_SCANNING_PPU_EXECUTABLE: return tr("Scanning PPU Executable...");
-		case localized_string_id::PROGRESS_DIALOG_ANALYZING_PPU_EXECUTABLE: return tr("Analyzing PPU Executable...");
-		case localized_string_id::PROGRESS_DIALOG_SCANNING_PPU_MODULES: return tr("Scanning PPU Modules...");
-		case localized_string_id::PROGRESS_DIALOG_LOADING_PPU_MODULES: return tr("Loading PPU Modules...");
-		case localized_string_id::PROGRESS_DIALOG_COMPILING_PPU_MODULES: return tr("Compiling PPU Modules...");
-		case localized_string_id::PROGRESS_DIALOG_LINKING_PPU_MODULES: return tr("Linking PPU Modules...");
-		case localized_string_id::PROGRESS_DIALOG_APPLYING_PPU_CODE: return tr("Applying PPU Code...");
-		case localized_string_id::PROGRESS_DIALOG_BUILDING_SPU_CACHE: return tr("Building SPU Cache...");
-		case localized_string_id::EMULATION_PAUSED_RESUME_WITH_START: return tr("Press and hold the START button to resume");
-		case localized_string_id::EMULATION_RESUMING: return tr("Resuming...!");
-		case localized_string_id::EMULATION_FROZEN: return tr("The PS3 application has likely crashed, you can close it.");
-		case localized_string_id::SAVESTATE_FAILED_DUE_TO_SAVEDATA: return tr("SaveState failed: Game saving is in progress, wait until finished.");
-		case localized_string_id::SAVESTATE_FAILED_DUE_TO_VDEC: return tr("SaveState failed: VDEC-base video/cutscenes are in order, wait for them to end or enable libvdec.sprx.");
-		case localized_string_id::SAVESTATE_FAILED_DUE_TO_MISSING_SPU_SETTING: return tr("SaveState failed: Failed to lock SPU state, enabling SPU-Compatible mode may fix it.");
-		case localized_string_id::SAVESTATE_FAILED_DUE_TO_SPU: return tr("SaveState failed: Failed to lock SPU state, using SPU ASMJIT will fix it.");
+
 		case localized_string_id::INVALID: return tr("Invalid");
 		default: return tr("Unknown");
 		}
diff --git a/rpcs3/rpcs3qt/log_frame.cpp b/rpcs3/rpcs3qt/log_frame.cpp
index 4dd664a99e..8b6d3b9035 100644
--- a/rpcs3/rpcs3qt/log_frame.cpp
+++ b/rpcs3/rpcs3qt/log_frame.cpp
@@ -1,11 +1,10 @@
 #include "log_frame.h"
 #include "qt_utils.h"
 #include "gui_settings.h"
-#include "hex_validator.h"
-#include "memory_viewer_panel.h"
 
+#include "rpcs3_version.h"
+#include "Utilities/mutex.h"
 #include "Utilities/lockless.h"
-#include "util/asm.hpp"
 
 #include <QMenu>
 #include <QActionGroup>
@@ -14,6 +13,7 @@
 #include <QTimer>
 #include <QStringBuilder>
 
+#include <sstream>
 #include <deque>
 #include <mutex>
 
@@ -21,7 +21,8 @@ extern fs::file g_tty;
 extern atomic_t<s64> g_tty_size;
 extern std::array<std::deque<std::string>, 16> g_tty_input;
 extern std::mutex g_tty_mutex;
-extern bool g_log_all_errors;
+
+constexpr auto qstr = QString::fromStdString;
 
 struct gui_listener : logs::listener
 {
@@ -50,7 +51,7 @@ struct gui_listener : logs::listener
 	{
 	}
 
-	void log(u64 stamp, const logs::message& msg, std::string_view prefix, std::string_view text) override
+	void log(u64 stamp, const logs::message& msg, const std::string& prefix, const std::string& text) override
 	{
 		Q_UNUSED(stamp)
 
@@ -59,7 +60,7 @@ struct gui_listener : logs::listener
 			packet_t p,* _new = &p;
 			_new->sev = msg;
 
-			if ((msg == logs::level::fatal || show_prefix) && !prefix.empty())
+			if (show_prefix && !prefix.empty())
 			{
 				_new->msg += "{";
 				_new->msg += prefix;
@@ -77,8 +78,9 @@ struct gui_listener : logs::listener
 			}
 
 			_new->msg += text;
+			_new->msg += '\n';
 
-			queue.push<false>(std::move(p));
+			queue.push(std::move(p));
 		}
 	}
 
@@ -97,19 +99,13 @@ struct gui_listener : logs::listener
 		pending = queue.pop_all();
 		return pending.get();
 	}
-
-	void clear()
-	{
-		pending = lf_queue_slice<packet_t>();
-		queue.pop_all();
-	}
 };
 
 // GUI Listener instance
 static gui_listener s_gui_listener;
 
-log_frame::log_frame(std::shared_ptr<gui_settings> _gui_settings, QWidget* parent)
-	: custom_dock_widget(tr("Log"), parent), m_gui_settings(std::move(_gui_settings))
+log_frame::log_frame(std::shared_ptr<gui_settings> guiSettings, QWidget *parent)
+	: custom_dock_widget(tr("Log"), parent), m_gui_settings(std::move(guiSettings))
 {
 	const int max_block_count_log = m_gui_settings->GetValue(gui::l_limit).toInt();
 	const int max_block_count_tty = m_gui_settings->GetValue(gui::l_limit_tty).toInt();
@@ -139,7 +135,7 @@ log_frame::log_frame(std::shared_ptr<gui_settings> _gui_settings, QWidget* paren
 	}
 	else
 	{
-		m_tty_input->setPlaceholderText(tr("All user channels"));
+		m_tty_input->setPlaceholderText(tr("All User Channels"));
 	}
 
 	QVBoxLayout* tty_layout = new QVBoxLayout();
@@ -156,13 +152,14 @@ log_frame::log_frame(std::shared_ptr<gui_settings> _gui_settings, QWidget* paren
 	setWidget(m_tabWidget);
 
 	// Open or create TTY.log
-	m_tty_file.open(fs::get_log_dir() + "TTY.log", fs::read + fs::create);
+	m_tty_file.open(fs::get_cache_dir() + "TTY.log", fs::read + fs::create);
 
 	CreateAndConnectActions();
-	LoadSettings();
 
-	m_timer = new QTimer(this);
-	connect(m_timer, &QTimer::timeout, this, &log_frame::UpdateUI);
+	// Check for updates every ~10 ms
+	QTimer *timer = new QTimer(this);
+	connect(timer, &QTimer::timeout, this, &log_frame::UpdateUI);
+	timer->start(10);
 }
 
 void log_frame::SetLogLevel(logs::level lev) const
@@ -233,47 +230,17 @@ void log_frame::CreateAndConnectActions()
 	m_clear_act = new QAction(tr("Clear"), this);
 	connect(m_clear_act, &QAction::triggered, [this]()
 	{
-		m_old_log_text.clear();
+		m_old_log_text = "";
 		m_log->clear();
-		s_gui_listener.clear();
 	});
 
 	m_clear_tty_act = new QAction(tr("Clear"), this);
 	connect(m_clear_tty_act, &QAction::triggered, [this]()
 	{
-		m_old_tty_text.clear();
+		m_old_tty_text = "";
 		m_tty->clear();
 	});
 
-	m_perform_goto_on_debugger = new QAction(tr("Go-To On The Debugger"), this);
-	connect(m_perform_goto_on_debugger, &QAction::triggered, [this]()
-	{
-		QPlainTextEdit* pte = (m_tabWidget->currentIndex() == 1 ? m_tty : m_log);
-		Q_EMIT PerformGoToOnDebugger(pte->textCursor().selectedText(), true);
-	});
-
-	m_perform_show_in_mem_viewer = new QAction(tr("Show in Memory Viewer"), this);
-	connect(m_perform_show_in_mem_viewer, &QAction::triggered, this, [this]()
-	{
-		const QPlainTextEdit* pte = (m_tabWidget->currentIndex() == 1 ? m_tty : m_log);
-		const QString selected = pte->textCursor().selectedText();
-		u64 pc = 0;
-		if (!parse_hex_qstring(selected, &pc))
-		{
-			QMessageBox::critical(this, tr("Invalid Hex"), tr("“%0” is not a valid 32-bit hex value.").arg(selected));
-			return;
-		}
-
-		memory_viewer_panel::ShowAtPC(static_cast<u32>(pc));
-	});
-
-	m_perform_goto_thread_on_debugger = new QAction(tr("Show Thread On The Debugger"), this);
-	connect(m_perform_goto_thread_on_debugger, &QAction::triggered, [this]()
-	{
-		QPlainTextEdit* pte = (m_tabWidget->currentIndex() == 1 ? m_tty : m_log);
-		Q_EMIT PerformGoToOnDebugger(pte->textCursor().selectedText(), false);
-	});
-
 	m_stack_act_tty = new QAction(tr("Stack Mode (TTY)"), this);
 	m_stack_act_tty->setCheckable(true);
 	connect(m_stack_act_tty, &QAction::toggled, [this](bool checked)
@@ -282,14 +249,6 @@ void log_frame::CreateAndConnectActions()
 		m_stack_tty = checked;
 	});
 
-	m_ansi_act_tty = new QAction(tr("ANSI Code (TTY)"), this);
-	m_ansi_act_tty->setCheckable(true);
-	connect(m_ansi_act_tty, &QAction::toggled, [this](bool checked)
-	{
-		m_gui_settings->SetValue(gui::l_ansi_code, checked);
-		m_ansi_tty = checked;
-	});
-
 	m_tty_channel_acts = new QActionGroup(this);
 	// Special Channel: All
 	QAction* all_channels_act = new QAction(tr("All user channels"), m_tty_channel_acts);
@@ -333,14 +292,6 @@ void log_frame::CreateAndConnectActions()
 		m_stack_log = checked;
 	});
 
-	m_stack_act_err = new QAction(tr("Stack Cell Errors"), this);
-	m_stack_act_err->setCheckable(true);
-	connect(m_stack_act_err, &QAction::toggled, [this](bool checked)
-	{
-		m_gui_settings->SetValue(gui::l_stack_err, checked);
-		g_log_all_errors = !checked;
-	});
-
 	m_show_prefix_act = new QAction(tr("Show Thread Prefix"), this);
 	m_show_prefix_act->setCheckable(true);
 	connect(m_show_prefix_act, &QAction::toggled, [this](bool checked)
@@ -369,24 +320,10 @@ void log_frame::CreateAndConnectActions()
 	{
 		QMenu* menu = m_log->createStandardContextMenu();
 		menu->addAction(m_clear_act);
-		menu->addAction(m_perform_goto_on_debugger);
-		menu->addAction(m_perform_goto_thread_on_debugger);
-		menu->addAction(m_perform_show_in_mem_viewer);
-
-		std::shared_ptr<bool> goto_signal_accepted = std::make_shared<bool>(false);
-		Q_EMIT PerformGoToOnDebugger("", true, true, goto_signal_accepted);
-		m_perform_goto_on_debugger->setEnabled(m_log->textCursor().hasSelection() && *goto_signal_accepted);
-		m_perform_goto_thread_on_debugger->setEnabled(m_log->textCursor().hasSelection() && *goto_signal_accepted);
-		m_perform_show_in_mem_viewer->setEnabled(m_log->textCursor().hasSelection() && *goto_signal_accepted);
-		m_perform_goto_on_debugger->setToolTip(tr("Jump to the selected hexadecimal address from the log text on the debugger."));
-		m_perform_goto_thread_on_debugger->setToolTip(tr("Show the thread that corresponds to the thread ID from the log text on the debugger."));
-		m_perform_show_in_mem_viewer->setToolTip(tr("Jump to the selected hexadecimal address from the log text on the memory viewer."));
-
 		menu->addSeparator();
 		menu->addActions(m_log_level_acts->actions());
 		menu->addSeparator();
 		menu->addAction(m_stack_act_log);
-		menu->addAction(m_stack_act_err);
 		menu->addAction(m_show_prefix_act);
 		menu->exec(m_log->viewport()->mapToGlobal(pos));
 	});
@@ -395,20 +332,9 @@ void log_frame::CreateAndConnectActions()
 	{
 		QMenu* menu = m_tty->createStandardContextMenu();
 		menu->addAction(m_clear_tty_act);
-		menu->addAction(m_perform_goto_on_debugger);
-		menu->addAction(m_perform_show_in_mem_viewer);
-
-		std::shared_ptr<bool> goto_signal_accepted = std::make_shared<bool>(false);
-		Q_EMIT PerformGoToOnDebugger("", false, true, goto_signal_accepted);
-		m_perform_goto_on_debugger->setEnabled(m_tty->textCursor().hasSelection() && *goto_signal_accepted);
-		m_perform_show_in_mem_viewer->setEnabled(m_tty->textCursor().hasSelection() && *goto_signal_accepted);
-		m_perform_goto_on_debugger->setToolTip(tr("Jump to the selected hexadecimal address from the TTY text on the debugger."));
-		m_perform_show_in_mem_viewer->setToolTip(tr("Jump to the selected hexadecimal address from the TTY text on the memory viewer."));
-
 		menu->addSeparator();
 		menu->addAction(m_tty_act);
 		menu->addAction(m_stack_act_tty);
-		menu->addAction(m_ansi_act_tty);
 		menu->addSeparator();
 		menu->addActions(m_tty_channel_acts->actions());
 		menu->exec(m_tty->viewport()->mapToGlobal(pos));
@@ -459,6 +385,8 @@ void log_frame::CreateAndConnectActions()
 
 		m_tty_input->clear();
 	});
+
+	LoadSettings();
 }
 
 void log_frame::LoadSettings()
@@ -467,12 +395,8 @@ void log_frame::LoadSettings()
 	SetTTYLogging(m_gui_settings->GetValue(gui::l_tty).toBool());
 	m_stack_log = m_gui_settings->GetValue(gui::l_stack).toBool();
 	m_stack_tty = m_gui_settings->GetValue(gui::l_stack_tty).toBool();
-	m_ansi_tty = m_gui_settings->GetValue(gui::l_ansi_code).toBool();
-	g_log_all_errors = !m_gui_settings->GetValue(gui::l_stack_err).toBool();
 	m_stack_act_log->setChecked(m_stack_log);
 	m_stack_act_tty->setChecked(m_stack_tty);
-	m_ansi_act_tty->setChecked(m_ansi_tty);
-	m_stack_act_err->setChecked(!g_log_all_errors);
 
 	s_gui_listener.show_prefix = m_gui_settings->GetValue(gui::l_prefix).toBool();
 	m_show_prefix_act->setChecked(s_gui_listener.show_prefix);
@@ -486,36 +410,26 @@ void log_frame::LoadSettings()
 	{
 		m_tty->document()->setMaximumBlockCount(m_gui_settings->GetValue(gui::l_limit_tty).toInt());
 	}
-
-	// Note: There's an issue where the scrollbar value won't be set to max if we start the log frame too early,
-	//       so let's delay the timer until we load the settings from the main window for the first time.
-	if (m_timer && !m_timer->isActive())
-	{
-		// Check for updates every ~10 ms
-		m_timer->start(10);
-	}
 }
 
 void log_frame::RepaintTextColors()
 {
 	// Backup old colors
-	std::vector<QColor> old_colors = m_color;
+	QList<QColor> old_colors = m_color;
 	QColor old_stack_color = m_color_stack;
 
-	const QColor color = gui::utils::get_foreground_color();
-
 	// Get text color. Do this once to prevent possible slowdown
 	m_color.clear();
-	m_color.push_back(gui::utils::get_label_color("log_level_always", Qt::darkCyan, Qt::cyan));
-	m_color.push_back(gui::utils::get_label_color("log_level_fatal", Qt::darkMagenta, Qt::magenta));
-	m_color.push_back(gui::utils::get_label_color("log_level_error", Qt::red, Qt::red));
-	m_color.push_back(gui::utils::get_label_color("log_level_todo", Qt::darkYellow, Qt::darkYellow));
-	m_color.push_back(gui::utils::get_label_color("log_level_success", Qt::darkGreen, Qt::green));
-	m_color.push_back(gui::utils::get_label_color("log_level_warning", Qt::darkYellow, Qt::darkYellow));
-	m_color.push_back(gui::utils::get_label_color("log_level_notice", color, color));
-	m_color.push_back(gui::utils::get_label_color("log_level_trace", color, color));
+	m_color.append(gui::utils::get_label_color("log_level_always"));
+	m_color.append(gui::utils::get_label_color("log_level_fatal"));
+	m_color.append(gui::utils::get_label_color("log_level_error"));
+	m_color.append(gui::utils::get_label_color("log_level_todo"));
+	m_color.append(gui::utils::get_label_color("log_level_success"));
+	m_color.append(gui::utils::get_label_color("log_level_warning"));
+	m_color.append(gui::utils::get_label_color("log_level_notice"));
+	m_color.append(gui::utils::get_label_color("log_level_trace"));
 
-	m_color_stack = gui::utils::get_label_color("log_stack", color, color);
+	m_color_stack = gui::utils::get_label_color("log_stack");
 
 	// Use new colors if the old colors weren't set yet
 	if (old_colors.empty())
@@ -531,7 +445,7 @@ void log_frame::RepaintTextColors()
 	// Repaint TTY with new colors
 	QTextCursor tty_cursor = m_tty->textCursor();
 	QTextCharFormat text_format = tty_cursor.charFormat();
-	text_format.setForeground(gui::utils::get_label_color("tty_text", color, color));
+	text_format.setForeground(gui::utils::get_label_color("tty_text"));
 	tty_cursor.setCharFormat(text_format);
 	m_tty->setTextCursor(tty_cursor);
 
@@ -576,30 +490,25 @@ void log_frame::RepaintTextColors()
 
 void log_frame::UpdateUI()
 {
-	const std::chrono::time_point start = steady_clock::now();
-	const std::chrono::time_point tty_timeout = start + 4ms;
-	const std::chrono::time_point log_timeout = start + 7ms;
+	const auto start = steady_clock::now();
 
 	// Check TTY logs
-	if (u64 size = std::max<s64>(0, m_tty_file ? (g_tty_size.load() - m_tty_file.pos()) : 0))
+	while (const u64 size = std::max<s64>(0, g_tty_size.load() - (m_tty_file ? m_tty_file.pos() : 0)))
 	{
-		if (m_tty_act->isChecked())
+		std::string buf;
+		buf.resize(size);
+		buf.resize(m_tty_file.read(&buf.front(), buf.size()));
+
+		// Ignore control characters and greater/equal to 0x80
+		buf.erase(std::remove_if(buf.begin(), buf.end(), [](s8 c) { return c <= 0x8 || c == 0x7F || (c >= 0xE && c <= 0x1F); }), buf.end());
+
+		if (!buf.empty() && m_tty_act->isChecked())
 		{
-			m_tty_buf.resize(std::min<u64>(size, m_tty_limited_read ? m_tty_limited_read : usz{umax}));
-			m_tty_buf.resize(m_tty_file.read(&m_tty_buf.front(), m_tty_buf.size()));
-			m_tty_limited_read = 0;
-
-			usz str_index = 0;
+			std::stringstream buf_stream;
+			buf_stream.str(buf);
 			std::string buf_line;
-
-			while (str_index < m_tty_buf.size())
+			while (std::getline(buf_stream, buf_line))
 			{
-				buf_line.assign(std::string_view(m_tty_buf).substr(str_index, m_tty_buf.find_first_of('\n', str_index) - str_index));
-				str_index += buf_line.size() + 1;
-
-				// Ignore control characters and greater/equal to 0x80
-				buf_line.erase(std::remove_if(buf_line.begin(), buf_line.end(), [](s8 c) { return c <= 0x8 || c == 0x7F || (c >= 0xE && c <= 0x1F); }), buf_line.end());
-
 				// save old scroll bar state
 				QScrollBar* sb = m_tty->verticalScrollBar();
 				const int sb_pos = sb->value();
@@ -614,18 +523,7 @@ void log_frame::UpdateUI()
 				// clear selection or else it will get colorized as well
 				text_cursor.clearSelection();
 
-				QString tty_text;
-
-				if (m_ansi_tty)
-				{
-					tty_text = QString::fromStdString(buf_line);
-				}
-				else
-				{
-					// Strip ANSI color code
-					static const QRegularExpression ansi_color_code("\\[\\d+;\\d+(;\\d+)?m|\\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]");
-					tty_text = QString::fromStdString(buf_line).remove(ansi_color_code);
-				}
+				const QString tty_text = QString::fromStdString(buf_line);
 
 				// create counter suffix and remove recurring line if needed
 				if (m_stack_tty)
@@ -667,178 +565,20 @@ void log_frame::UpdateUI()
 
 				// set scrollbar to max means auto-scroll
 				sb->setValue(is_max ? sb->maximum() : sb_pos);
-
-				// Limit processing time
-				if (steady_clock::now() >= tty_timeout)
-				{
-					const s64 back = ::narrow<s64>(str_index) - ::narrow<s64>(m_tty_buf.size());
-					ensure(back <= 1);
-
-					if (back < 0)
-					{
-						// If more than two thirds of the buffer are unprocessed make the next fs::file::read read only that
-						// This is because reading is also costly on performance, and if we already know half of that takes more time than our limit..
-						const usz third_size = utils::aligned_div(m_tty_buf.size(), 3);
-
-						if (back <= -16384 && static_cast<usz>(0 - back) >= third_size * 2)
-						{
-							// This only really works if there is a newline somewhere
-							const usz known_term = std::string_view(m_tty_buf).substr(str_index, str_index * 2).find_last_of('\n', str_index * 2 - 4096);
-
-							if (known_term != umax)
-							{
-								m_tty_limited_read = known_term + 1 - str_index;
-							}
-						}
-
-						// Revert unprocessed reads
-						m_tty_file.seek(back, fs::seek_cur);
-					}
-
-					break;
-				}
 			}
 		}
-		else
-		{
-			// Advance in position without printing
-			m_tty_file.seek(size, fs::seek_cur);
-			m_tty_limited_read = 0;
-		}
+
+		// Limit processing time
+		if (steady_clock::now() >= start + 4ms || buf.empty()) break;
 	}
 
 	const auto font_start_tag = [](const QColor& color) -> const QString { return QStringLiteral("<font color = \"") % color.name() % QStringLiteral("\">"); };
 	const QString font_start_tag_stack = "<font color = \"" % m_color_stack.name() % "\">";
-	static const QString font_end_tag = QStringLiteral("</font>");
+	const QString font_end_tag = QStringLiteral("</font>");
 
-	static constexpr auto escaped = [](const QString& text, QString&& storage) -> const QString&
+	static constexpr auto escaped = [](QString& text)
 	{
-		const qsizetype nline = text.indexOf(QChar('\n'));
-		const qsizetype spaces = text.indexOf(QStringLiteral("  "));
-		const qsizetype html = std::max<qsizetype>({ text.indexOf(QChar('<')), text.indexOf(QChar('>')), text.indexOf(QChar('&')), text.indexOf(QChar('\"')) });
-
-		const qsizetype pos = std::max<qsizetype>({ html, nline, spaces });
-
-		if (pos < 0)
-		{
-			// Nothing to change, do not create copies of the string
-			return text;
-		}
-
-		// Allow to return reference of new string by using temporary storage provided by argument
-		storage = html < 0 ? text : text.toHtmlEscaped();
-
-		if (nline >= 0)
-		{
-			storage.replace(QChar('\n'), QStringLiteral("<br/>"));
-		}
-
-		if (spaces >= 0)
-		{
-			storage.replace(QChar::Space, QChar::Nbsp);
-		}
-
-		return storage;
-	};
-
-	// Preserve capacity
-	m_log_text.resize(0);
-
-	// Handle a common case in which we may need to override the previous repetition count
-	bool is_first_rep = m_stack_log;
-	usz first_rep_counter = m_log_counter;
-
-	// Batch output of multiple lines if possible (optimization)
-	auto flush = [&]()
-	{
-		if (m_log_text.isEmpty() && !is_first_rep)
-		{
-			return;
-		}
-
-		// save old log state
-		QScrollBar* sb = m_log->verticalScrollBar();
-		const bool is_max = sb->value() == sb->maximum();
-		const int sb_pos = sb->value();
-
-		QTextCursor text_cursor = m_log->textCursor();
-		const int sel_pos = text_cursor.position();
-		int sel_start = text_cursor.selectionStart();
-		int sel_end = text_cursor.selectionEnd();
-
-		// clear selection or else it will get colorized as well
-		text_cursor.clearSelection();
-
-		m_log->setTextCursor(text_cursor);
-
-		if (is_first_rep)
-		{
-			// Overwrite existing repetition counter in our text document.
-			ensure(first_rep_counter > m_log_counter); // Anything else is a bug
-
-			text_cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor);
-
-			if (m_log_counter > 1)
-			{
-				constexpr int size_of_x = 2; // " x"
-				const int size_of_number = static_cast<int>(QString::number(m_log_counter).size());
-
-				text_cursor.movePosition(QTextCursor::PreviousCharacter, QTextCursor::KeepAnchor, size_of_x + size_of_number);
-			}
-
-			text_cursor.insertHtml(font_start_tag_stack % QStringLiteral("&nbsp;x") % QString::number(first_rep_counter) % font_end_tag);
-		}
-		else
-		{
-			// Insert both messages and repetition prefix (append is more optimized than concatenation)
-			m_log_text += font_end_tag;
-
-			if (m_log_counter > 1)
-			{
-				m_log_text += font_start_tag_stack;
-				m_log_text += QStringLiteral(" x");
-				m_log_text += QString::number(m_log_counter);
-				m_log_text += font_end_tag;
-			}
-
-			m_log->appendHtml(m_log_text);
-		}
-
-		// if we mark text from right to left we need to swap sides (start is always smaller than end)
-		if (sel_pos < sel_end)
-		{
-			std::swap(sel_start, sel_end);
-		}
-
-		// reset old text cursor and selection
-		text_cursor.setPosition(sel_start);
-		text_cursor.setPosition(sel_end, QTextCursor::KeepAnchor);
-		m_log->setTextCursor(text_cursor);
-
-		// set scrollbar to max means auto-scroll
-		sb->setValue(is_max ? sb->maximum() : sb_pos);
-		m_log_text.clear();
-	};
-
-	const auto patch_first_stacked_message = [&]() -> bool
-	{
-		if (is_first_rep)
-		{
-			const bool needs_update = first_rep_counter > m_log_counter;
-
-			if (needs_update)
-			{
-				// Update the existing stack suffix.
-				flush();
-			}
-
-			is_first_rep = false;
-			m_log_counter = first_rep_counter;
-
-			return needs_update;
-		}
-
-		return false;
+		return text.toHtmlEscaped().replace(QStringLiteral("\n"), QStringLiteral("<br/>"));
 	};
 
 	// Check main logs
@@ -847,87 +587,83 @@ void log_frame::UpdateUI()
 		// Confirm log level
 		if (packet->sev <= s_gui_listener.enabled)
 		{
-			// Check if we can stack this log message.
-			if (m_stack_log && m_old_log_level == packet->sev && packet->msg == m_old_log_text)
-			{
-				if (is_first_rep)
-				{
-					// Keep tracking the old stack suffix count as long as the last known message keeps repeating.
-					first_rep_counter++;
-				}
-				else
-				{
-					m_log_counter++;
-				}
-
-				s_gui_listener.pop();
-
-				if (steady_clock::now() >= log_timeout)
-				{
-					// Must break eventually
-					break;
-				}
-
-				continue;
-			}
-
-			// Add/update counter suffix if needed. Try not to hold too much data at a time so the frame content will be updated frequently.
-			if (!patch_first_stacked_message() && (m_log_counter > 1 || m_log_text.size() > 0x1000))
-			{
-				flush();
-			}
-
-			if (m_log_text.isEmpty())
-			{
-				m_old_log_level = packet->sev;
-				m_log_text += font_start_tag(m_color[static_cast<int>(m_old_log_level)]);
-			}
-			else
-			{
-				if (packet->sev != m_old_log_level)
-				{
-					flush();
-					m_old_log_level = packet->sev;
-					m_log_text += font_start_tag(m_color[static_cast<int>(m_old_log_level)]);
-				}
-				else
-				{
-					m_log_text += QStringLiteral("<br/>");
-				}
-			}
-
+			QString text;
 			switch (packet->sev)
 			{
-			case logs::level::always: m_log_text += QStringLiteral("- "); break;
-			case logs::level::fatal: m_log_text += QStringLiteral("F "); break;
-			case logs::level::error: m_log_text += QStringLiteral("E "); break;
-			case logs::level::todo: m_log_text += QStringLiteral("U "); break;
-			case logs::level::success: m_log_text += QStringLiteral("S "); break;
-			case logs::level::warning: m_log_text += QStringLiteral("W "); break;
-			case logs::level::notice: m_log_text += QStringLiteral("! "); break;
-			case logs::level::trace: m_log_text += QStringLiteral("T "); break;
+			case logs::level::always: text = QStringLiteral("- "); break;
+			case logs::level::fatal: text = QStringLiteral("F "); break;
+			case logs::level::error: text = QStringLiteral("E "); break;
+			case logs::level::todo: text = QStringLiteral("U "); break;
+			case logs::level::success: text = QStringLiteral("S "); break;
+			case logs::level::warning: text = QStringLiteral("W "); break;
+			case logs::level::notice: text = QStringLiteral("! "); break;
+			case logs::level::trace: text = QStringLiteral("T "); break;
 			}
 
 			// Print UTF-8 text.
-			m_log_text += escaped(QString::fromStdString(packet->msg), QString{});
+			text += qstr(packet->msg);
 
+			// save old log state
+			QScrollBar* sb = m_log->verticalScrollBar();
+			const bool isMax = sb->value() == sb->maximum();
+			const int sb_pos = sb->value();
+
+			QTextCursor text_cursor = m_log->textCursor();
+			const int sel_pos = text_cursor.position();
+			int sel_start = text_cursor.selectionStart();
+			int sel_end = text_cursor.selectionEnd();
+
+			// clear selection or else it will get colorized as well
+			text_cursor.clearSelection();
+
+			// remove the new line because Qt's append adds a new line already.
+			text.chop(1);
+
+			// create counter suffix and remove recurring line if needed
 			if (m_stack_log)
 			{
-				m_log_counter = 1;
-				m_old_log_text = std::move(packet->msg);
+				// add counter suffix if needed
+				if (text == m_old_log_text)
+				{
+					text_cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor);
+					text_cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
+					text_cursor.insertHtml(font_start_tag(m_color[static_cast<int>(packet->sev)]) % escaped(text) % font_start_tag_stack % QStringLiteral(" x") % QString::number(++m_log_counter) % font_end_tag % font_end_tag);
+				}
+				else
+				{
+					m_log_counter = 1;
+					m_old_log_text = text;
+
+					m_log->setTextCursor(text_cursor);
+					m_log->appendHtml(font_start_tag(m_color[static_cast<int>(packet->sev)]) % escaped(text) % font_end_tag);
+				}
 			}
+			else
+			{
+				m_log->setTextCursor(text_cursor);
+				m_log->appendHtml(font_start_tag(m_color[static_cast<int>(packet->sev)]) % escaped(text) % font_end_tag);
+			}
+
+			// if we mark text from right to left we need to swap sides (start is always smaller than end)
+			if (sel_pos < sel_end)
+			{
+				std::swap(sel_start, sel_end);
+			}
+
+			// reset old text cursor and selection
+			text_cursor.setPosition(sel_start);
+			text_cursor.setPosition(sel_end, QTextCursor::KeepAnchor);
+			m_log->setTextCursor(text_cursor);
+
+			// set scrollbar to max means auto-scroll
+			sb->setValue(isMax ? sb->maximum() : sb_pos);
 		}
 
 		// Drop packet
 		s_gui_listener.pop();
 
 		// Limit processing time
-		if (steady_clock::now() >= log_timeout) break;
-	}
-
-	if (!patch_first_stacked_message())
-	{
-		flush();
+		if (steady_clock::now() >= start + 7ms) break;
 	}
 }
 
@@ -947,12 +683,12 @@ bool log_frame::eventFilter(QObject* object, QEvent* event)
 	if (event->type() == QEvent::KeyPress)
 	{
 		QKeyEvent* e = static_cast<QKeyEvent*>(event);
-		if (e && !e->isAutoRepeat() && e->modifiers() == Qt::ControlModifier && e->key() == Qt::Key_F)
+		if (e->modifiers() == Qt::ControlModifier && e->key() == Qt::Key_F)
 		{
 			if (m_find_dialog && m_find_dialog->isVisible())
 				m_find_dialog->close();
 
-			m_find_dialog.reset(new find_dialog(static_cast<QPlainTextEdit*>(object), this));
+			m_find_dialog.reset(new find_dialog(static_cast<QTextEdit*>(object), this));
 		}
 	}
 
diff --git a/rpcs3/rpcs3qt/log_frame.h b/rpcs3/rpcs3qt/log_frame.h
index 0de081863c..c51ff8e896 100644
--- a/rpcs3/rpcs3qt/log_frame.h
+++ b/rpcs3/rpcs3qt/log_frame.h
@@ -19,7 +19,7 @@ class log_frame : public custom_dock_widget
 	Q_OBJECT
 
 public:
-	explicit log_frame(std::shared_ptr<gui_settings> _gui_settings, QWidget* parent = nullptr);
+	explicit log_frame(std::shared_ptr<gui_settings> guiSettings, QWidget *parent = nullptr);
 
 	/** Repaint log colors after new stylesheet was applied */
 	void RepaintTextColors();
@@ -30,7 +30,6 @@ public Q_SLOTS:
 
 Q_SIGNALS:
 	void LogFrameClosed();
-	void PerformGoToOnDebugger(const QString& text_argument, bool is_address, bool test_only = false, std::shared_ptr<bool> signal_accepted = nullptr);
 protected:
 	/** Override inherited method from Qt to allow signalling when close happened.*/
 	void closeEvent(QCloseEvent* event) override;
@@ -47,22 +46,15 @@ private:
 
 	std::unique_ptr<find_dialog> m_find_dialog;
 
-	QTimer* m_timer = nullptr;
-
-	std::vector<QColor> m_color;
+	QList<QColor> m_color;
 	QColor m_color_stack;
 	QPlainTextEdit* m_log = nullptr;
-	std::string m_old_log_text;
+	QString m_old_log_text;
 	QString m_old_tty_text;
-	QString m_log_text;
-	std::string m_tty_buf;
-	usz m_tty_limited_read = 0;
-	usz m_log_counter{};
-	usz m_tty_counter{};
+	ullong m_log_counter{};
+	ullong m_tty_counter{};
 	bool m_stack_log{};
 	bool m_stack_tty{};
-	bool m_ansi_tty{};
-	logs::level m_old_log_level{};
 
 	fs::file m_tty_file;
 	QWidget* m_tty_container = nullptr;
@@ -72,9 +64,6 @@ private:
 
 	QAction* m_clear_act = nullptr;
 	QAction* m_clear_tty_act = nullptr;
-	QAction* m_perform_goto_on_debugger = nullptr;
-	QAction* m_perform_goto_thread_on_debugger = nullptr;
-	QAction* m_perform_show_in_mem_viewer = nullptr;
 
 	QActionGroup* m_log_level_acts = nullptr;
 	QAction* m_nothing_act = nullptr;
@@ -88,8 +77,6 @@ private:
 
 	QAction* m_stack_act_log = nullptr;
 	QAction* m_stack_act_tty = nullptr;
-	QAction* m_ansi_act_tty = nullptr;
-	QAction* m_stack_act_err = nullptr;
 
 	QAction* m_show_prefix_act = nullptr;
 
diff --git a/rpcs3/rpcs3qt/log_viewer.cpp b/rpcs3/rpcs3qt/log_viewer.cpp
index ef45025b58..fdb7a9ad26 100644
--- a/rpcs3/rpcs3qt/log_viewer.cpp
+++ b/rpcs3/rpcs3qt/log_viewer.cpp
@@ -3,28 +3,26 @@
 #include "log_viewer.h"
 #include "gui_settings.h"
 #include "syntax_highlighter.h"
-#include "config_checker.h"
-#include "Crypto/unzip.h"
+#include "find_dialog.h"
 
-#include <QActionGroup>
 #include <QApplication>
-#include <QClipboard>
 #include <QMenu>
 #include <QFile>
 #include <QFileDialog>
-#include <QInputDialog>
 #include <QTextStream>
 #include <QHBoxLayout>
 #include <QFontDatabase>
 #include <QMimeData>
-#include <QScrollBar>
-#include <QMessageBox>
-
-#include <deque>
-#include <map>
 
 LOG_CHANNEL(gui_log, "GUI");
 
+[[maybe_unused]] constexpr auto qstr = QString::fromStdString;
+
+inline std::string sstr(const QString& _in)
+{
+	return _in.toStdString();
+}
+
 log_viewer::log_viewer(std::shared_ptr<gui_settings> gui_settings)
     : m_gui_settings(std::move(gui_settings))
 {
@@ -37,9 +35,6 @@ log_viewer::log_viewer(std::shared_ptr<gui_settings> gui_settings)
 	resize(QSize(620, 395));
 
 	m_path_last = m_gui_settings->GetValue(gui::fd_log_viewer).toString();
-	m_show_timestamps = m_gui_settings->GetValue(gui::lv_show_timestamps).toBool();
-	m_show_threads = m_gui_settings->GetValue(gui::lv_show_threads).toBool();
-	m_log_levels = std::bitset<32>(m_gui_settings->GetValue(gui::lv_log_levels).toUInt());
 
 	m_log_text = new QPlainTextEdit(this);
 	m_log_text->setReadOnly(true);
@@ -62,160 +57,27 @@ log_viewer::log_viewer(std::shared_ptr<gui_settings> gui_settings)
 void log_viewer::show_context_menu(const QPoint& pos)
 {
 	QMenu menu;
-	QAction* clear  = new QAction(tr("&Clear"));
-	QAction* copy   = new QAction(tr("&Copy"));
-	QAction* open   = new QAction(tr("&Open log file"));
-	QAction* save   = new QAction(tr("&Save filtered log"));
-	QAction* filter = new QAction(tr("&Filter log"));
-	QAction* config = new QAction(tr("&Check config"));
+	QAction* clear = new QAction(tr("&Clear"));
+	QAction* open  = new QAction(tr("&Open log file"));
 
-	QAction* timestamps = new QAction(tr("&Show Timestamps"));
-	timestamps->setCheckable(true);
-	timestamps->setChecked(m_show_timestamps);
-
-	QAction* threads = new QAction(tr("&Show Threads"));
-	threads->setCheckable(true);
-	threads->setChecked(m_show_threads);
-
-	QAction* last_actions_only = new QAction(tr("&Last actions only"));
-	last_actions_only->setCheckable(true);
-	last_actions_only->setChecked(m_last_actions_only);
-
-	QActionGroup* log_level_acts = new QActionGroup(this);
-	QAction* fatal_act = new QAction(tr("Fatal"), log_level_acts);
-	QAction* error_act = new QAction(tr("Error"), log_level_acts);
-	QAction* todo_act = new QAction(tr("Todo"), log_level_acts);
-	QAction* success_act = new QAction(tr("Success"), log_level_acts);
-	QAction* warning_act = new QAction(tr("Warning"), log_level_acts);
-	QAction* notice_act = new QAction(tr("Notice"), log_level_acts);
-	QAction* trace_act = new QAction(tr("Trace"), log_level_acts);
-	log_level_acts->setExclusive(false);
-
-	auto init_action = [this](QAction* act, logs::level logLevel)
-	{
-		act->setCheckable(true);
-		act->setChecked(m_log_levels.test(static_cast<u32>(logLevel)));
-
-		// This sets the log level properly when the action is triggered.
-		connect(act, &QAction::triggered, this, [this, logLevel](bool checked)
-		{
-			m_log_levels.set(static_cast<u32>(logLevel), checked);
-			m_gui_settings->SetValue(gui::lv_log_levels, ::narrow<u32>(m_log_levels.to_ulong()));
-			filter_log();
-		});
-	};
-
-	init_action(fatal_act, logs::level::fatal);
-	init_action(error_act, logs::level::error);
-	init_action(todo_act, logs::level::todo);
-	init_action(success_act, logs::level::success);
-	init_action(warning_act, logs::level::warning);
-	init_action(notice_act, logs::level::notice);
-	init_action(trace_act, logs::level::trace);
-
-	menu.addAction(copy);
-	menu.addSeparator();
 	menu.addAction(open);
 	menu.addSeparator();
-	menu.addAction(save);
-	menu.addSeparator();
-	menu.addAction(config);
-	menu.addSeparator();
-	menu.addAction(filter);
-	menu.addSeparator();
-	menu.addAction(timestamps);
-	menu.addSeparator();
-	menu.addAction(threads);
-	menu.addSeparator();
-	menu.addAction(last_actions_only);
-	menu.addSeparator();
-	menu.addActions(log_level_acts->actions());
-	menu.addSeparator();
 	menu.addAction(clear);
 
-	connect(copy, &QAction::triggered, this, [this]()
-	{
-		m_log_text->copy();
-	});
-
-	connect(clear, &QAction::triggered, this, [this]()
+	connect(clear, &QAction::triggered, [this]()
 	{
 		m_log_text->clear();
-		m_full_log.clear();
 	});
 
-	connect(open, &QAction::triggered, this, [this]()
+	connect(open, &QAction::triggered, [this]()
 	{
-		const QString file_path = QFileDialog::getOpenFileName(this, tr("Select log file"), m_path_last, tr("Log files (*.log *.gz);;All files (*.*)"));
+		const QString file_path = QFileDialog::getOpenFileName(this, tr("Select log file"), m_path_last, tr("Log files (*.log);;"));
 		if (file_path.isEmpty())
 			return;
 		m_path_last = file_path;
 		show_log();
 	});
 
-	connect(save, &QAction::triggered, this, [this]()
-	{
-		const QString file_path = QFileDialog::getSaveFileName(this, tr("Save to file"), m_path_last, tr("Log files (*.log *.gz);;All files (*.*)"));
-		if (file_path.isEmpty())
-			return;
-
-		if (fs::file log_file; log_file.open(file_path.toStdString(), fs::rewrite))
-		{
-			const QByteArray bytes = m_log_text->toPlainText().toUtf8();
-
-			if (file_path.endsWith(".gz"))
-			{
-				if (!zip(bytes.constData(), bytes.size(), log_file))
-				{
-					gui_log.error("Failed to zip filtered log to file '%s'", file_path);
-					return;
-				}
-			}
-			else
-			{
-				log_file.write(bytes.constData(), bytes.size());
-			}
-
-			gui_log.success("Exported filtered log to file '%s'", file_path);
-		}
-		else
-		{
-			gui_log.error("Failed to export filtered log to file '%s'", file_path);
-		}
-	});
-
-	connect(config, &QAction::triggered, this, [this]()
-	{
-		config_checker* dlg = new config_checker(this, m_full_log, true);
-		dlg->open();
-	});
-
-	connect(filter, &QAction::triggered, this, [this]()
-	{
-		m_filter_term = QInputDialog::getText(this, tr("Filter log"), tr("Enter text"), QLineEdit::EchoMode::Normal, m_filter_term);
-		filter_log();
-	});
-
-	connect(threads, &QAction::toggled, this, [this](bool checked)
-	{
-		m_show_threads = checked;
-		m_gui_settings->SetValue(gui::lv_show_threads, m_show_threads);
-		filter_log();
-	});
-
-	connect(timestamps, &QAction::toggled, this, [this](bool checked)
-	{
-		m_show_timestamps = checked;
-		m_gui_settings->SetValue(gui::lv_show_timestamps, m_show_timestamps);
-		filter_log();
-	});
-
-	connect(last_actions_only, &QAction::toggled, this, [this](bool checked)
-	{
-		m_last_actions_only = checked;
-		filter_log();
-	});
-
 	const auto obj = qobject_cast<QPlainTextEdit*>(sender());
 
 	QPoint origin;
@@ -232,197 +94,31 @@ void log_viewer::show_context_menu(const QPoint& pos)
 	menu.exec(origin);
 }
 
-void log_viewer::show_log()
+void log_viewer::show_log() const
 {
 	if (m_path_last.isEmpty())
 	{
 		return;
 	}
 
-	m_full_log.clear();
 	m_log_text->clear();
 	m_log_text->setPlainText(tr("Loading file..."));
 	QApplication::processEvents();
 
-	bool failed = false;
-
-	if (m_path_last.endsWith(".gz"))
-	{
-		if (fs::file file{m_path_last.toStdString()})
-		{
-			const std::vector<u8> decompressed = unzip(file.to_vector<u8>());
-			m_full_log = QString::fromUtf8(reinterpret_cast<const char*>(decompressed.data()), decompressed.size());
-		}
-		else
-		{
-			failed = true;
-		}
-	}
-	else if (QFile file(m_path_last); file.exists() && file.open(QIODevice::ReadOnly | QIODevice::Text))
-	{
-		// TODO: Due to a bug in Qt 6.5.2 QTextStream::readAll is ridiculously slow to the point where it gets stuck on large files.
-		//       In Qt 5.15.2 this was much faster than QFile::readAll. Use QTextStream again once this bug is fixed upstream.
-		//QTextStream stream(&file);
-		//m_full_log = stream.readAll();
-		m_full_log = file.readAll();
-	}
-	else
-	{
-		failed = true;
-	}
-
-	if (failed)
-	{
-		gui_log.error("log_viewer: Failed to open %s", m_path_last);
-		m_log_text->setPlainText(tr("Failed to open '%0'").arg(m_path_last));
-	}
-	else
+	if (QFile file(m_path_last);
+		file.exists() && file.open(QIODevice::ReadOnly | QIODevice::Text))
 	{
 		m_gui_settings->SetValue(gui::fd_log_viewer, m_path_last);
-		m_full_log.replace('\0', '0');
+
+		QTextStream stream(&file);
+		m_log_text->setPlainText(stream.readAll());
+		file.close();
 	}
-
-	filter_log();
-}
-
-void log_viewer::set_text_and_keep_position(const QString& text)
-{
-	m_log_text->setPlainText(tr("Pasting..."));
-	QApplication::processEvents();
-
-	const int pos = m_log_text->verticalScrollBar()->value();
-	m_log_text->setPlainText(text);
-	m_log_text->verticalScrollBar()->setValue(pos);
-}
-
-void log_viewer::filter_log()
-{
-	if (m_full_log.isEmpty())
+	else
 	{
-		set_text_and_keep_position(m_full_log);
-		return;
+		gui_log.error("log_viewer: Failed to open %s", sstr(m_path_last));
+		m_log_text->setPlainText(tr("Failed to open '%0'").arg(m_path_last));
 	}
-
-	m_log_text->setPlainText(tr("Filtering..."));
-
-	std::vector<QString> excluded_log_levels;
-	if (!m_log_levels.test(static_cast<u32>(logs::level::fatal)))   excluded_log_levels.push_back("·F ");
-	if (!m_log_levels.test(static_cast<u32>(logs::level::error)))   excluded_log_levels.push_back("·E ");
-	if (!m_log_levels.test(static_cast<u32>(logs::level::todo)))    excluded_log_levels.push_back("·U ");
-	if (!m_log_levels.test(static_cast<u32>(logs::level::success))) excluded_log_levels.push_back("·S ");
-	if (!m_log_levels.test(static_cast<u32>(logs::level::warning))) excluded_log_levels.push_back("·W ");
-	if (!m_log_levels.test(static_cast<u32>(logs::level::notice)))  excluded_log_levels.push_back("·! ");
-	if (!m_log_levels.test(static_cast<u32>(logs::level::trace)))   excluded_log_levels.push_back("·T ");
-
-	if (m_filter_term.isEmpty() && excluded_log_levels.empty() && m_show_timestamps && m_show_threads && !m_last_actions_only)
-	{
-		set_text_and_keep_position(m_full_log);
-		return;
-	}
-
-	QString result;
-	QTextStream stream(&m_full_log);
-	const QRegularExpression thread_regexp("\\{.*\\} ");
-	const QRegularExpression timestamp_regexp("\\d?\\d:\\d\\d:\\d\\d\\.\\d\\d\\d\\d\\d\\d ");
-
-	const auto add_line = [this, &result, &excluded_log_levels, &timestamp_regexp, &thread_regexp](QString& line)
-	{
-		bool exclude_line = false;
-
-		for (const QString& log_level_prefix : excluded_log_levels)
-		{
-			if (line.startsWith(log_level_prefix))
-			{
-				exclude_line = true;
-				break;
-			}
-		}
-
-		if (exclude_line)
-		{
-			return;
-		}
-
-		if (m_filter_term.isEmpty() || line.contains(m_filter_term))
-		{
-			if (line.isEmpty())
-			{
-				result += "\n";
-				return;
-			}
-
-			if (!m_show_timestamps)
-			{
-				line.remove(timestamp_regexp);
-			}
-
-			if (!m_show_threads)
-			{
-				line.remove(thread_regexp);
-			}
-
-			if (!line.isEmpty())
-			{
-				result += line + "\n";
-			}
-		}
-	};
-
-	if (m_last_actions_only)
-	{
-		if (const int start_pos = m_full_log.lastIndexOf("LDR: Used configuration:"); start_pos >= 0)
-		{
-			if (!stream.seek(start_pos)) // TODO: is this correct ?
-			{
-				gui_log.error("Log viewer failed to seek to pos %d of log.", start_pos);
-			}
-
-			std::map<QString, std::deque<QString>> all_thread_actions;
-
-			for (QString line = stream.readLine(); !line.isNull(); line = stream.readLine())
-			{
-				if (const QRegularExpressionMatch match = thread_regexp.match(line); match.hasMatch())
-				{
-					if (const QString thread_name = match.captured(); !thread_name.isEmpty())
-					{
-						std::deque<QString>& actions = all_thread_actions[thread_name];
-						actions.push_back(line);
-
-						if (actions.size() > 10)
-						{
-							actions.pop_front();
-						}
-					}
-				}
-			}
-
-			for (auto& [thread_name, actions] : all_thread_actions)
-			{
-				for (QString& line : actions)
-				{
-					add_line(line);
-				}
-			}
-
-			set_text_and_keep_position(result);
-			return;
-		}
-
-		QMessageBox::information(this, tr("Ooops!"), tr("Cannot find any game boot!"));
-		// Pass through to regular log filter
-	}
-
-	if (!stream.seek(0))
-	{
-		gui_log.error("Log viewer failed to seek to beginning of log.");
-	}
-
-	for (QString line = stream.readLine(); !line.isNull(); line = stream.readLine())
-	{
-		add_line(line);
-	};
-
-	set_text_and_keep_position(result);
 }
 
 bool log_viewer::is_valid_file(const QMimeData& md, bool save)
@@ -436,7 +132,7 @@ bool log_viewer::is_valid_file(const QMimeData& md, bool save)
 
 	const QString suffix = QFileInfo(urls[0].fileName()).suffix().toLower();
 
-	if (suffix == "log" || suffix == "gz")
+	if (suffix == "log")
 	{
 		if (save)
 		{
@@ -486,12 +182,12 @@ bool log_viewer::eventFilter(QObject* object, QEvent* event)
 	if (event->type() == QEvent::KeyPress)
 	{
 		QKeyEvent* e = static_cast<QKeyEvent*>(event);
-		if (e && !e->isAutoRepeat() && e->modifiers() == Qt::ControlModifier && e->key() == Qt::Key_F)
+		if (e && e->modifiers() == Qt::ControlModifier && e->key() == Qt::Key_F)
 		{
 			if (m_find_dialog && m_find_dialog->isVisible())
 				m_find_dialog->close();
 
-			m_find_dialog.reset(new find_dialog(static_cast<QPlainTextEdit*>(object), this));
+			m_find_dialog.reset(new find_dialog(static_cast<QTextEdit*>(object), this));
 		}
 	}
 
diff --git a/rpcs3/rpcs3qt/log_viewer.h b/rpcs3/rpcs3qt/log_viewer.h
index 320b2b97c9..16cf768191 100644
--- a/rpcs3/rpcs3qt/log_viewer.h
+++ b/rpcs3/rpcs3qt/log_viewer.h
@@ -1,15 +1,13 @@
 #pragma once
 
-#include "find_dialog.h"
-
 #include <QPlainTextEdit>
 #include <QDropEvent>
 
-#include <bitset>
 #include <memory>
 
 class LogHighlighter;
 class gui_settings;
+class find_dialog;
 
 class log_viewer : public QWidget
 {
@@ -17,27 +15,19 @@ class log_viewer : public QWidget
 
 public:
 	explicit log_viewer(std::shared_ptr<gui_settings> gui_settings);
-	void show_log();
+	void show_log() const;
 
 private Q_SLOTS:
 	void show_context_menu(const QPoint& pos);
 
 private:
-	void set_text_and_keep_position(const QString& text);
-	void filter_log();
 	bool is_valid_file(const QMimeData& md, bool save = false);
 
 	std::shared_ptr<gui_settings> m_gui_settings;
 	QString m_path_last;
-	QString m_filter_term;
-	QString m_full_log;
 	QPlainTextEdit* m_log_text;
 	LogHighlighter* m_log_highlighter;
 	std::unique_ptr<find_dialog> m_find_dialog;
-	std::bitset<32> m_log_levels = std::bitset<32>(0b11111111u);
-	bool m_show_timestamps = true;
-	bool m_show_threads = true;
-	bool m_last_actions_only = false;
 
 protected:
 	void dropEvent(QDropEvent* ev) override;
diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp
index 547acd97d6..8a67c718aa 100644
--- a/rpcs3/rpcs3qt/main_window.cpp
+++ b/rpcs3/rpcs3qt/main_window.cpp
@@ -3,7 +3,6 @@
 #include "vfs_dialog.h"
 #include "save_manager_dialog.h"
 #include "trophy_manager_dialog.h"
-#include "savestate_manager_dialog.h"
 #include "user_manager_dialog.h"
 #include "screenshot_manager_dialog.h"
 #include "kernel_explorer.h"
@@ -15,37 +14,22 @@
 #include "auto_pause_settings_dialog.h"
 #include "cg_disasm_window.h"
 #include "log_viewer.h"
+#include "memory_string_searcher.h"
 #include "memory_viewer_panel.h"
 #include "rsx_debugger.h"
 #include "about_dialog.h"
 #include "pad_settings_dialog.h"
 #include "progress_dialog.h"
 #include "skylander_dialog.h"
-#include "infinity_dialog.h"
-#include "dimensions_dialog.h"
 #include "cheat_manager.h"
 #include "patch_manager_dialog.h"
-#include "patch_creator_dialog.h"
 #include "pkg_install_dialog.h"
 #include "category.h"
 #include "gui_settings.h"
 #include "input_dialog.h"
-#include "camera_settings_dialog.h"
-#include "ps_move_tracker_dialog.h"
-#include "ipc_settings_dialog.h"
-#include "shortcut_utils.h"
-#include "config_checker.h"
-#include "shortcut_dialog.h"
-#include "system_cmd_dialog.h"
-#include "emulated_pad_settings_dialog.h"
-#include "emulated_logitech_g27_settings_dialog.h"
-#include "basic_mouse_settings_dialog.h"
-#include "vfs_tool_dialog.h"
-#include "welcome_dialog.h"
-#include "music_player_dialog.h"
 
 #include <thread>
-#include <unordered_set>
+#include <charconv>
 
 #include <QScreen>
 #include <QDirIterator>
@@ -53,123 +37,39 @@
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QFontDatabase>
-#include <QBuffer>
-#include <QTemporaryFile>
-#include <QDesktopServices>
 
 #include "rpcs3_version.h"
+#include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/VFS.h"
-#include "Emu/vfs_config.h"
-#include "Emu/System.h"
-#include "Emu/system_utils.hpp"
 #include "Emu/system_config.h"
-#include "Emu/savestate_utils.hpp"
-#include "Emu/Cell/timers.hpp"
+#include "Emu/system_utils.hpp"
 
 #include "Crypto/unpkg.h"
 #include "Crypto/unself.h"
-#include "Crypto/unzip.h"
-#include "Crypto/decrypt_binaries.h"
+#include "Crypto/unedat.h"
 
 #include "Loader/PUP.h"
 #include "Loader/TAR.h"
-#include "Loader/PSF.h"
 #include "Loader/mself.hpp"
 
 #include "Utilities/Thread.h"
 #include "util/sysinfo.hpp"
-#include "util/serialization_ext.hpp"
-
-#include "Input/gui_pad_thread.h"
 
 #include "ui_main_window.h"
 
-#include <QEventLoop>
-#include <QTimer>
-
-#ifdef _WIN32
-#include "raw_mouse_settings_dialog.h"
-#endif
-
-#if defined(__linux__) || defined(__APPLE__) || (defined(_WIN32) && defined(ARCH_X64))
-#define RPCS3_UPDATE_SUPPORTED
-#endif
-
 LOG_CHANNEL(gui_log, "GUI");
 
 extern atomic_t<bool> g_user_asked_for_frame_capture;
 
-class CPUDisAsm;
-std::shared_ptr<CPUDisAsm> make_basic_ppu_disasm();
-
-extern void qt_events_aware_op(int repeat_duration_ms, std::function<bool()> wrapped_op)
-{
-	ensure(wrapped_op);
-
-	if (thread_ctrl::is_main())
-	{
-		// NOTE:
-		// I noticed that calling this from an Emu callback can cause the
-		// caller to get stuck for a while during newly opened Qt dialogs.
-		// Adding a timeout here doesn't seem to do anything in that case.
-		QEventLoop* event_loop = nullptr;
-
-		std::shared_ptr<std::function<void()>> check_iteration;
-		check_iteration = std::make_shared<std::function<void()>>([&]()
-		{
-			if (wrapped_op())
-			{
-				event_loop->exit(0);
-			}
-			else
-			{
-				QTimer::singleShot(repeat_duration_ms, *check_iteration);
-			}
-		});
-
-		while (!wrapped_op())
-		{
-			// Init event loop
-			event_loop = new QEventLoop();
-
-			// Queue event initially
-			QTimer::singleShot(0, *check_iteration);
-
-			// Event loop
-			event_loop->exec();
-
-			// Cleanup
-			event_loop->deleteLater();
-		}
-	}
-	else
-	{
-		while (!wrapped_op())
-		{
-			if (repeat_duration_ms == 0)
-			{
-				std::this_thread::yield();
-			}
-			else if (thread_ctrl::get_current())
-			{
-				thread_ctrl::wait_for(repeat_duration_ms * 1000);
-			}
-			else
-			{
-				std::this_thread::sleep_for(std::chrono::milliseconds(repeat_duration_ms));
-			}
-		}
-	}
-}
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
 
 main_window::main_window(std::shared_ptr<gui_settings> gui_settings, std::shared_ptr<emu_settings> emu_settings, std::shared_ptr<persistent_settings> persistent_settings, QWidget *parent)
 	: QMainWindow(parent)
 	, ui(new Ui::main_window)
-	, m_gui_settings(gui_settings)
+	, m_gui_settings(std::move(gui_settings))
 	, m_emu_settings(std::move(emu_settings))
 	, m_persistent_settings(std::move(persistent_settings))
-	, m_updater(nullptr, gui_settings)
 {
 	Q_INIT_RESOURCE(resources);
 
@@ -181,12 +81,14 @@ main_window::main_window(std::shared_ptr<gui_settings> gui_settings, std::shared
 
 main_window::~main_window()
 {
+	SaveWindowState();
+	delete ui;
 }
 
 /* An init method is used so that RPCS3App can create the necessary connects before calling init (specifically the stylesheet connect).
  * Simplifies logic a bit.
  */
-bool main_window::Init([[maybe_unused]] bool with_cli_boot)
+bool main_window::Init(bool with_cli_boot)
 {
 	setAcceptDrops(true);
 
@@ -201,24 +103,51 @@ bool main_window::Init([[maybe_unused]] bool with_cli_boot)
 	CreateConnects();
 
 	setMinimumSize(350, minimumSizeHint().height());    // seems fine on win 10
-	setWindowTitle(QString::fromStdString("RPCS3 " + rpcs3::get_verbose_version()));
+	setWindowTitle(QString::fromStdString("RPCS3 " + rpcs3::get_version().to_string()));
 
 	Q_EMIT RequestGlobalStylesheetChange();
 	ConfigureGuiFromSettings();
 
-	m_shortcut_handler = new shortcut_handler(gui::shortcuts::shortcut_handler_id::main_window, this, m_gui_settings);
-	connect(m_shortcut_handler, &shortcut_handler::shortcut_activated, this, &main_window::handle_shortcut);
+	if (const std::string_view branch_name = rpcs3::get_full_branch(); branch_name != "RPCS3/rpcs3/master" && branch_name != "local_build")
+	{
+		gui_log.warning("Experimental Build Warning! Build origin: %s", branch_name);
+
+		QMessageBox msg;
+		msg.setWindowTitle(tr("Experimental Build Warning"));
+		msg.setIcon(QMessageBox::Critical);
+		msg.setTextFormat(Qt::RichText);
+		msg.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+		msg.setDefaultButton(QMessageBox::No);
+		msg.setText(QString(tr(
+			R"(
+				<p style="white-space: nowrap;">
+					Please understand that this build is not an official RPCS3 release.<br>
+					This build contains changes that may break games, or even <b>damage</b> your data.<br>
+					We recommend to download and use the official build from the <a href='https://rpcs3.net/download'>RPCS3 website</a>.<br><br>
+					Build origin: %1<br>
+					Do you wish to use this build anyway?
+				</p>
+			)"
+		)).arg(Qt::convertFromPlainText(branch_name.data())));
+		msg.layout()->setSizeConstraint(QLayout::SetFixedSize);
+
+		if (msg.exec() == QMessageBox::No)
+		{
+			return false;
+		}
+	}
 
 	show(); // needs to be done before creating the thumbnail toolbar
 
 	// enable play options if a recent game exists
-	const bool enable_play_last = !m_recent_game.actions.isEmpty() && m_recent_game.actions.first();
+	const bool enable_play_last = !m_recent_game_acts.isEmpty() && m_recent_game_acts.first();
 
-	const QString start_tooltip = enable_play_last ? tr("Play %0").arg(m_recent_game.actions.first()->text()) : tr("Play");
+	const QString start_tooltip = enable_play_last ? tr("Play %0").arg(m_recent_game_acts.first()->text()) : tr("Play");
 
 	if (enable_play_last)
 	{
 		ui->sysPauseAct->setText(tr("&Play last played game"));
+		ui->sysPauseAct->setShortcut(QKeySequence("Ctrl+R"));
 		ui->sysPauseAct->setIcon(m_icon_play);
 		ui->toolbar_start->setToolTip(start_tooltip);
 	}
@@ -226,11 +155,45 @@ bool main_window::Init([[maybe_unused]] bool with_cli_boot)
 	ui->sysPauseAct->setEnabled(enable_play_last);
 	ui->toolbar_start->setEnabled(enable_play_last);
 
+	// create tool buttons for the taskbar thumbnail
+#ifdef _WIN32
+	m_thumb_bar = new QWinThumbnailToolBar(this);
+	m_thumb_bar->setWindow(windowHandle());
+
+	m_thumb_playPause = new QWinThumbnailToolButton(m_thumb_bar);
+	m_thumb_playPause->setToolTip(start_tooltip);
+	m_thumb_playPause->setIcon(m_icon_thumb_play);
+	m_thumb_playPause->setEnabled(enable_play_last);
+
+	m_thumb_stop = new QWinThumbnailToolButton(m_thumb_bar);
+	m_thumb_stop->setToolTip(tr("Stop"));
+	m_thumb_stop->setIcon(m_icon_thumb_stop);
+	m_thumb_stop->setEnabled(false);
+
+	m_thumb_restart = new QWinThumbnailToolButton(m_thumb_bar);
+	m_thumb_restart->setToolTip(tr("Restart"));
+	m_thumb_restart->setIcon(m_icon_thumb_restart);
+	m_thumb_restart->setEnabled(false);
+
+	m_thumb_bar->addButton(m_thumb_playPause);
+	m_thumb_bar->addButton(m_thumb_stop);
+	m_thumb_bar->addButton(m_thumb_restart);
+
+	RepaintThumbnailIcons();
+
+	connect(m_thumb_stop, &QWinThumbnailToolButton::clicked, this, []() { Emu.Stop(); });
+	connect(m_thumb_restart, &QWinThumbnailToolButton::clicked, this, []() { Emu.Restart(); });
+	connect(m_thumb_playPause, &QWinThumbnailToolButton::clicked, this, &main_window::OnPlayOrPause);
+#endif
+
+	// Fix possible hidden game list columns. The game list has to be visible already. Use this after show()
+	m_game_list_frame->FixNarrowColumns();
+
 	// RPCS3 Updater
 
 	QMenu* download_menu = new QMenu(tr("Update Available!"));
 
-	QAction* download_action = new QAction(tr("Download Update"), download_menu);
+	QAction *download_action = new QAction(tr("Download Update"), download_menu);
 	connect(download_action, &QAction::triggered, this, [this]
 	{
 		m_updater.update(false);
@@ -265,7 +228,7 @@ bool main_window::Init([[maybe_unused]] bool with_cli_boot)
 		}
 	});
 
-#ifdef RPCS3_UPDATE_SUPPORTED
+#if defined(_WIN32) || defined(__linux__)
 	if (const auto update_value = m_gui_settings->GetValue(gui::m_check_upd_start).toString(); update_value != gui::update_off)
 	{
 		const bool in_background = with_cli_boot || update_value == gui::update_bkg;
@@ -275,48 +238,19 @@ bool main_window::Init([[maybe_unused]] bool with_cli_boot)
 #endif
 
 	// Disable vsh if not present.
-	ui->bootVSHAct->setEnabled(fs::is_file(g_cfg_vfs.get_dev_flash() + "vsh/module/vsh.self"));
-
-	// Focus to search bar by default
-	ui->mw_searchbar->setFocus();
-
-	// Refresh gamelist last
-	m_game_list_frame->Refresh(true);
-
-	update_gui_pad_thread();
+	ui->bootVSHAct->setEnabled(fs::is_file(g_cfg.vfs.get_dev_flash() + "vsh/module/vsh.self"));
 
 	return true;
 }
 
-void main_window::update_gui_pad_thread()
-{
-	const bool enabled = m_gui_settings->GetValue(gui::nav_enabled).toBool();
-
-	if (enabled && Emu.IsStopped())
-	{
-#if defined(_WIN32) || defined(__linux__) || defined(__APPLE__)
-		if (!m_gui_pad_thread)
-		{
-			m_gui_pad_thread = std::make_unique<gui_pad_thread>();
-		}
-
-		m_gui_pad_thread->update_settings(m_gui_settings);
-#endif
-	}
-	else
-	{
-		m_gui_pad_thread.reset();
-	}
-}
-
 QString main_window::GetCurrentTitle()
 {
-	std::string title = Emu.GetTitleAndTitleID();
-	if (title.empty())
+	QString title = qstr(Emu.GetTitleAndTitleID());
+	if (title.isEmpty())
 	{
-		title = Emu.GetLastBoot();
+		title = qstr(Emu.GetBoot());
 	}
-	return QString::fromStdString(title);
+	return title;
 }
 
 // returns appIcon
@@ -325,23 +259,25 @@ QIcon main_window::GetAppIcon() const
 	return m_app_icon;
 }
 
-void main_window::OnMissingFw()
+bool main_window::OnMissingFw()
 {
 	const QString title = tr("Missing Firmware Detected!");
 	const QString message = tr("Commercial games require the firmware (PS3UPDAT.PUP file) to be installed."
-	                           "\n<br>For information about how to obtain the required firmware read the <a %0 href=\"https://rpcs3.net/quickstart\">quickstart guide</a>.").arg(gui::utils::get_link_style());
+				"\n<br>For information about how to obtain the required firmware read the <a href=\"https://rpcs3.net/quickstart\">quickstart guide</a>.");
 
 	QMessageBox* mb = new QMessageBox(QMessageBox::Question, title, message, QMessageBox::Ok | QMessageBox::Cancel, this, Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowStaysOnTopHint);
+	mb->deleteLater();
 	mb->setTextFormat(Qt::RichText);
 
 	mb->button(QMessageBox::Ok)->setText(tr("Locate PS3UPDAT.PUP"));
-	mb->setAttribute(Qt::WA_DeleteOnClose);
-	mb->open();
 
-	connect(mb, &QDialog::accepted, this, [this]()
+	if (mb->exec() == QMessageBox::Ok)
 	{
-		QTimer::singleShot(1, [this](){ InstallPup(); }); // singleShot to avoid a Qt bug that causes a deletion of the sender during long slots.
-	});
+		InstallPup();
+		return true;
+	}
+
+	return false;
 }
 
 void main_window::ResizeIcons(int index)
@@ -364,67 +300,8 @@ void main_window::ResizeIcons(int index)
 	m_game_list_frame->ResizeIcons(index);
 }
 
-void main_window::handle_shortcut(gui::shortcuts::shortcut shortcut_key, const QKeySequence& key_sequence)
-{
-	gui_log.notice("Main window registered shortcut: %s (%s)", shortcut_key, key_sequence.toString());
-
-	const system_state status = Emu.GetStatus();
-
-	switch (shortcut_key)
-	{
-	case gui::shortcuts::shortcut::mw_toggle_fullscreen:
-	{
-		ui->toolbar_fullscreen->trigger();
-		break;
-	}
-	case gui::shortcuts::shortcut::mw_exit_fullscreen:
-	{
-		if (isFullScreen())
-			ui->toolbar_fullscreen->trigger();
-		break;
-	}
-	case gui::shortcuts::shortcut::mw_refresh:
-	{
-		m_game_list_frame->Refresh(true);
-		break;
-	}
-	case gui::shortcuts::shortcut::mw_pause:
-	{
-		if (status == system_state::running)
-			Emu.Pause();
-		break;
-	}
-	case gui::shortcuts::shortcut::mw_start:
-	{
-		if (status == system_state::paused)
-			Emu.Resume();
-		else if (status == system_state::ready)
-			Emu.Run(true);
-		break;
-	}
-	case gui::shortcuts::shortcut::mw_restart:
-	{
-		if (!Emu.GetBoot().empty())
-			Emu.Restart();
-		break;
-	}
-	case gui::shortcuts::shortcut::mw_stop:
-	{
-		if (status != system_state::stopped)
-			Emu.GracefulShutdown(false, true);
-		break;
-	}
-	default:
-	{
-		break;
-	}
-	}
-}
-
 void main_window::OnPlayOrPause()
 {
-	gui_log.notice("User triggered OnPlayOrPause");
-
 	switch (Emu.GetStatus())
 	{
 	case system_state::ready: Emu.Run(true); return;
@@ -434,10 +311,9 @@ void main_window::OnPlayOrPause()
 	{
 		if (m_selected_game)
 		{
-			gui_log.notice("Booting from OnPlayOrPause...");
-			Boot(m_selected_game->info.path, m_selected_game->info.serial);
+			Boot(m_selected_game->info.path, m_selected_game->info.serial, false, false, false);
 		}
-		else if (const std::string path = Emu.GetLastBoot(); !path.empty())
+		else if (const auto path = Emu.GetBoot(); !path.empty())
 		{
 			if (const auto error = Emu.Load(); error != game_boot_result::no_errors)
 			{
@@ -445,14 +321,13 @@ void main_window::OnPlayOrPause()
 				show_boot_error(error);
 			}
 		}
-		else if (!m_recent_game.actions.isEmpty())
+		else if (!m_recent_game_acts.isEmpty())
 		{
-			BootRecentAction(m_recent_game.actions.first(), false);
+			BootRecentAction(m_recent_game_acts.first());
 		}
 
 		return;
 	}
-	case system_state::starting: break;
 	default: fmt::throw_exception("Unreachable");
 	}
 }
@@ -471,9 +346,6 @@ void main_window::show_boot_error(game_boot_result status)
 	case game_boot_result::invalid_file_or_folder:
 		message = tr("The selected file or folder is invalid or corrupted.");
 		break;
-	case game_boot_result::invalid_bdvd_folder:
-		message = tr("The virtual dev_bdvd folder does not exist or is not empty.");
-		break;
 	case game_boot_result::install_failed:
 		message = tr("Additional content could not be installed.");
 		break;
@@ -486,77 +358,51 @@ void main_window::show_boot_error(game_boot_result status)
 	case game_boot_result::unsupported_disc_type:
 		message = tr("This disc type is not supported yet.");
 		break;
-	case game_boot_result::savestate_corrupted:
-		message = tr("Savestate data is corrupted or it's not an RPCS3 savestate.");
-		break;
-	case game_boot_result::savestate_version_unsupported:
-		message = tr("Savestate versioning data differs from your RPCS3 build.");
-		break;
-	case game_boot_result::still_running:
-		message = tr("A game or PS3 application is still running or has yet to be fully stopped.");
-		break;
-	case game_boot_result::firmware_version:
-		message = tr("The game or PS3 application needs a more recent firmware version.");
-		break;
 	case game_boot_result::firmware_missing: // Handled elsewhere
-	case game_boot_result::already_added: // Handled elsewhere
-	case game_boot_result::currently_restricted:
 	case game_boot_result::no_errors:
 		return;
 	case game_boot_result::generic_error:
 		message = tr("Unknown error.");
 		break;
 	}
-	const QString link = tr("<br /><br />For information on setting up the emulator and dumping your PS3 games, read the <a %0 href=\"https://rpcs3.net/quickstart\">quickstart guide</a>.").arg(gui::utils::get_link_style());
+	const QString link = tr("<br /><br />For information on setting up the emulator and dumping your PS3 games, read the <a href=\"https://rpcs3.net/quickstart\">quickstart guide</a>.");
 
-	QMessageBox* msg = new QMessageBox(this);
-	msg->setWindowTitle(tr("Boot Failed"));
-	msg->setIcon(QMessageBox::Critical);
-	msg->setTextFormat(Qt::RichText);
-	msg->setStandardButtons(QMessageBox::Ok);
-	msg->setText(tr("Booting failed: %1 %2").arg(message).arg(link));
-	msg->setAttribute(Qt::WA_DeleteOnClose);
-	msg->open();
+	QMessageBox msg;
+	msg.setWindowTitle(tr("Boot Failed"));
+	msg.setIcon(QMessageBox::Critical);
+	msg.setTextFormat(Qt::RichText);
+	msg.setStandardButtons(QMessageBox::Ok);
+	msg.setText(tr("Booting failed: %1 %2").arg(message).arg(link));
+	msg.exec();
 }
 
-void main_window::Boot(const std::string& path, const std::string& title_id, bool direct, bool refresh_list, cfg_mode config_mode, const std::string& config_path)
+void main_window::Boot(const std::string& path, const std::string& title_id, bool direct, bool add_only, bool force_global_config)
 {
-	if (Emu.IsBootingRestricted())
-	{
-		return;
-	}
-
 	if (!m_gui_settings->GetBootConfirmation(this, gui::ib_confirm_boot))
 	{
 		return;
 	}
 
-	Emu.GracefulShutdown(false);
-
 	m_app_icon = gui::utils::get_app_icon_from_path(path, title_id);
 
-	if (const auto error = Emu.BootGame(path, title_id, direct, config_mode, config_path); error != game_boot_result::no_errors)
+	Emu.SetForceBoot(true);
+	Emu.Stop();
+
+	if (const auto error = Emu.BootGame(path, title_id, direct, add_only, force_global_config); error != game_boot_result::no_errors)
 	{
 		gui_log.error("Boot failed: reason: %s, path: %s", error, path);
 		show_boot_error(error);
-		return;
-	}
-
-	if (is_savestate_compatible(path))
-	{
-		gui_log.success("Boot of savestate successful.");
-		AddRecentAction(gui::Recent_Game(QString::fromStdString(path), QString::fromStdString(Emu.GetTitleAndTitleID())), true);
 	}
 	else
 	{
 		gui_log.success("Boot successful.");
-		AddRecentAction(gui::Recent_Game(QString::fromStdString(Emu.GetBoot()), QString::fromStdString(Emu.GetTitleAndTitleID())), false);
+		if (!add_only)
+		{
+			AddRecentAction(gui::Recent_Game(qstr(Emu.GetBoot()), qstr(Emu.GetTitleAndTitleID())));
+		}
 	}
 
-	if (refresh_list)
-	{
-		m_game_list_frame->Refresh(true);
-	}
+	m_game_list_frame->Refresh(true);
 }
 
 void main_window::BootElf()
@@ -576,7 +422,6 @@ void main_window::BootElf()
 		"SELF files (EBOOT.BIN *.self);;"
 		"BOOT files (*BOOT.BIN);;"
 		"BIN files (*.bin);;"
-		"All executable files (*.SAVESTAT.zst *.SAVESTAT.gz *.SAVESTAT *.sprx *.SPRX *.self *.SELF *.bin *.BIN *.prx *.PRX *.elf *.ELF *.o *.O);;"
 		"All files (*.*)"),
 		Q_NULLPTR, QFileDialog::DontResolveSymlinks);
 
@@ -593,79 +438,9 @@ void main_window::BootElf()
 	// game folder in case of having e.g. a Game Folder with collected links to elf files.
 	// Don't set last path earlier in case of cancelled dialog
 	m_gui_settings->SetValue(gui::fd_boot_elf, file_path);
-	const std::string path = QFileInfo(file_path).absoluteFilePath().toStdString();
+	const std::string path = sstr(QFileInfo(file_path).absoluteFilePath());
 
 	gui_log.notice("Booting from BootElf...");
-	Boot(path, "", true, true);
-}
-
-void main_window::BootTest()
-{
-	bool stopped = false;
-
-	if (Emu.IsRunning())
-	{
-		Emu.Pause();
-		stopped = true;
-	}
-
-#ifdef _WIN32
-	const QString path_tests = QString::fromStdString(fs::get_config_dir()) + "/test/";
-#elif defined(__linux__)
-	const QString path_tests = QCoreApplication::applicationDirPath() + "/../share/rpcs3/test/";
-#else
-	const QString path_tests = QCoreApplication::applicationDirPath() + "/../Resources/test/";
-#endif
-
-	const QString file_path = QFileDialog::getOpenFileName(this, tr("Select (S)ELF To Boot"), path_tests, tr(
-		"(S)ELF files (*.elf *.self);;"
-		"ELF files (*.elf);;"
-		"SELF files (*.self);;"
-		"All files (*.*)"),
-		Q_NULLPTR, QFileDialog::DontResolveSymlinks);
-
-	if (file_path.isEmpty())
-	{
-		if (stopped)
-		{
-			Emu.Resume();
-		}
-		return;
-	}
-
-	const std::string path = QFileInfo(file_path).absoluteFilePath().toStdString();
-
-	gui_log.notice("Booting from BootTest...");
-	Boot(path, "", true);
-}
-
-void main_window::BootSavestate()
-{
-	bool stopped = false;
-
-	if (Emu.IsRunning())
-	{
-		Emu.Pause();
-		stopped = true;
-	}
-
-	const QString file_path = QFileDialog::getOpenFileName(this, tr("Select Savestate To Boot"), QString::fromStdString(fs::get_config_dir() + "savestates/"), tr(
-		"Savestate files (*.SAVESTAT *.SAVESTAT.zst *.SAVESTAT.gz);;"
-		"All files (*.*)"),
-		Q_NULLPTR, QFileDialog::DontResolveSymlinks);
-
-	if (file_path.isEmpty())
-	{
-		if (stopped)
-		{
-			Emu.Resume();
-		}
-		return;
-	}
-
-	const std::string path = QFileInfo(file_path).absoluteFilePath().toStdString();
-
-	gui_log.notice("Booting from BootSavestate...");
 	Boot(path, "", true);
 }
 
@@ -694,13 +469,13 @@ void main_window::BootGame()
 	m_gui_settings->SetValue(gui::fd_boot_game, QFileInfo(dir_path).path());
 
 	gui_log.notice("Booting from BootGame...");
-	Boot(dir_path.toStdString(), "", false, true);
+	Boot(sstr(dir_path));
 }
 
 void main_window::BootVSH()
 {
 	gui_log.notice("Booting from BootVSH...");
-	Boot(g_cfg_vfs.get_dev_flash() + "/vsh/module/vsh.self");
+	Boot(g_cfg.vfs.get_dev_flash() + "/vsh/module/vsh.self");
 }
 
 void main_window::BootRsxCapture(std::string path)
@@ -715,7 +490,7 @@ void main_window::BootRsxCapture(std::string path)
 			is_stopped = true;
 		}
 
-		const QString file_path = QFileDialog::getOpenFileName(this, tr("Select RSX Capture"), QString::fromStdString(fs::get_config_dir() + "captures/"), tr("RRC files (*.rrc *.RRC *.rrc.gz *.RRC.GZ);;All files (*.*)"));
+		const QString file_path = QFileDialog::getOpenFileName(this, tr("Select RSX Capture"), qstr(fs::get_config_dir() + "captures/"), tr("RRC files (*.rrc *.RRC);;All files (*.*)"));
 
 		if (file_path.isEmpty())
 		{
@@ -725,7 +500,7 @@ void main_window::BootRsxCapture(std::string path)
 			}
 			return;
 		}
-		path = file_path.toStdString();
+		path = sstr(file_path);
 	}
 
 	if (!m_gui_settings->GetBootConfirmation(this))
@@ -733,7 +508,8 @@ void main_window::BootRsxCapture(std::string path)
 		return;
 	}
 
-	Emu.GracefulShutdown(false);
+	Emu.SetForceBoot(true);
+	Emu.Stop();
 
 	if (!Emu.BootRsxCapture(path))
 	{
@@ -745,17 +521,17 @@ void main_window::BootRsxCapture(std::string path)
 	}
 }
 
-bool main_window::InstallFileInExData(const std::string& extension, const QString& path, const std::string& filename)
+bool main_window::InstallRapFile(const QString& path, const std::string& filename)
 {
-	if (path.isEmpty() || filename.empty() || extension.empty())
+	if (path.isEmpty() || filename.empty())
 	{
 		return false;
 	}
 
 	// Copy file atomically with thread/process-safe error checking for file size
-	const std::string to_path = rpcs3::utils::get_hdd0_dir() + "/home/" + Emu.GetUsr() + "/exdata/" + filename.substr(0, filename.find_last_of('.'));
-	fs::pending_file to(to_path + "." + extension);
-	fs::file from(path.toStdString());
+
+	fs::pending_file to(rpcs3::utils::get_hdd0_dir() + "/home/" + Emu.GetUsr() + "/exdata/" + filename.substr(0, filename.find_last_of('.')) + ".rap");
+	const fs::file from(sstr(path));
 
 	if (!to.file || !from)
 	{
@@ -763,7 +539,6 @@ bool main_window::InstallFileInExData(const std::string& extension, const QStrin
 	}
 
 	to.file.write(from.to_vector<u8>());
-	from.close();
 
 	if (to.file.size() < 0x10)
 	{
@@ -771,34 +546,21 @@ bool main_window::InstallFileInExData(const std::string& extension, const QStrin
 		return false;
 	}
 
-#ifdef _WIN32
-	// In the case of an unexpected crash during the operation, the temporary file can be used as the deleted file
-	// See below
-	to.file.sync();
-
-	// In case we want to rename upper-case file to lower-case
-	// Windows will ignore such rename operation if the file exists
-	// So delete it
-	fs::remove_file(to_path + "." + fmt::to_upper(extension));
-#endif
-
 	return to.commit();
 }
 
-bool main_window::InstallPackages(QStringList file_paths, bool from_boot)
+void main_window::InstallPackages(QStringList file_paths)
 {
 	if (file_paths.isEmpty())
 	{
-		ensure(!from_boot);
-
 		// If this function was called without a path, ask the user for files to install.
 		const QString path_last_pkg = m_gui_settings->GetValue(gui::fd_install_pkg).toString();
 		const QStringList paths = QFileDialog::getOpenFileNames(this, tr("Select packages and/or rap files to install"),
-			path_last_pkg, tr("All relevant (*.pkg *.PKG *.rap *.RAP *.edat *.EDAT);;Package files (*.pkg *.PKG);;Rap files (*.rap *.RAP);;Edat files (*.edat *.EDAT);;All files (*.*)"));
+			path_last_pkg, tr("All relevant (*.pkg *.PKG *.rap *.RAP);;Package files (*.pkg *.PKG);;Rap files (*.rap *.RAP);;All files (*.*)"));
 
 		if (paths.isEmpty())
 		{
-			return true;
+			return;
 		}
 
 		file_paths.append(paths);
@@ -806,170 +568,95 @@ bool main_window::InstallPackages(QStringList file_paths, bool from_boot)
 		m_gui_settings->SetValue(gui::fd_install_pkg, file_info.path());
 	}
 
-	if (file_paths.count() == 1)
+	if (file_paths.count() == 1 && file_paths.front().endsWith(".pkg", Qt::CaseInsensitive))
 	{
 		const QString file_path = file_paths.front();
 		const QFileInfo file_info(file_path);
 
-		if (file_info.isDir())
+		compat::package_info info = game_compatibility::GetPkgInfo(file_path, m_game_list_frame ? m_game_list_frame->GetGameCompatibility() : nullptr);
+
+		if (!info.is_valid)
 		{
-			gui_log.notice("PKG: Trying to install packages from dir: '%s'", file_path);
-
-			const QDir dir(file_path);
-			const QStringList dir_file_paths = gui::utils::get_dir_entries(dir, {}, true);
-
-			if (dir_file_paths.empty())
-			{
-				gui_log.notice("PKG: Could not find any files in dir: '%s'", file_path);
-				return true;
-			}
-
-			return InstallPackages(dir_file_paths, from_boot);
+			QMessageBox::warning(this, QObject::tr("Invalid package!"), QObject::tr("The selected package is invalid!\n\nPath:\n%0").arg(file_path));
+			return;
 		}
 
-		if (file_info.suffix().compare("pkg", Qt::CaseInsensitive) == 0)
+		if (info.type != compat::package_type::other)
 		{
-			compat::package_info info = game_compatibility::GetPkgInfo(file_path, m_game_list_frame ? m_game_list_frame->GetGameCompatibility() : nullptr);
-
-			if (!info.is_valid)
+			if (info.type == compat::package_type::dlc)
 			{
-				QMessageBox::warning(this, tr("Invalid package!"), tr("The selected package is invalid!\n\nPath:\n%0").arg(file_path));
-				return false;
+				info.local_cat = tr("\nDLC", "Block for package type (DLC)");
 			}
-
-			if (info.type != compat::package_type::other)
+			else
 			{
-				if (info.type == compat::package_type::dlc)
-				{
-					info.local_cat = tr("\nDLC", "Block for package type (DLC)");
-				}
-				else
-				{
-					info.local_cat = tr("\nUpdate", "Block for package type (Update)");
-				}
-			}
-			else if (!info.local_cat.isEmpty())
-			{
-				info.local_cat = tr("\n%0", "Block for package type").arg(info.local_cat);
+				info.local_cat = tr("\nUpdate", "Block for package type (Update)");
 			}
+		}
+		else if (!info.local_cat.isEmpty())
+		{
+			info.local_cat = tr("\n%0", "Block for package type").arg(info.local_cat);
+		}
 
-			if (!info.title_id.isEmpty())
-			{
-				info.title_id = tr("\n%0", "Block for Title ID").arg(info.title_id);
-			}
+		if (!info.title_id.isEmpty())
+		{
+			info.title_id = tr("\n%0", "Block for Title ID").arg(info.title_id);
+		}
 
-			if (!info.version.isEmpty())
-			{
-				info.version = tr("\nVersion %0", "Block for Version").arg(info.version);
-			}
+		if (!info.version.isEmpty())
+		{
+			info.version = tr("\nVersion %0", "Block for Version").arg(info.version);
+		}
 
-			if (!info.changelog.isEmpty())
-			{
-				info.changelog = tr("Changelog:\n%0", "Block for Changelog").arg(info.changelog);
-			}
+		if (!info.changelog.isEmpty())
+		{
+			info.changelog = tr("\n\nChangelog:\n%0", "Block for Changelog").arg(info.changelog);
+		}
 
-			const QString info_string = QStringLiteral("%0\n\n%1%2%3%4").arg(file_info.fileName()).arg(info.title).arg(info.local_cat).arg(info.title_id).arg(info.version);
-			QString message = tr("Do you want to install this package?\n\n%0").arg(info_string);
+		const QString info_string = QStringLiteral("%0\n\n%1%2%3%4%5").arg(file_info.fileName()).arg(info.title).arg(info.local_cat)
+			.arg(info.title_id).arg(info.version).arg(info.changelog);
 
-			QMessageBox mb(QMessageBox::Icon::Question, tr("PKG Decrypter / Installer"), message, QMessageBox::Yes | QMessageBox::No, this);
-			mb.setDefaultButton(QMessageBox::No);
-
-			if (!info.changelog.isEmpty())
-			{
-				mb.setInformativeText(tr("To see the changelog, please click \"Show Details\"."));
-				mb.setDetailedText(info.changelog);
-
-				// Smartass hack to make the unresizeable message box wide enough for the changelog
-				const int log_width = QLabel(info.changelog).sizeHint().width();
-				while (QLabel(message).sizeHint().width() < log_width)
-				{
-					message += "          ";
-				}
-
-				mb.setText(message);
-			}
-
-			if (mb.exec() != QMessageBox::Yes)
-			{
-				gui_log.notice("PKG: Cancelled installation from drop.\n%s\n%s", info_string, info.changelog);
-				return true;
-			}
+		if (QMessageBox::question(this, tr("PKG Decrypter / Installer"), tr("Do you want to install this package?\n\n%0").arg(info_string), 
+			QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
+		{
+			gui_log.notice("PKG: Cancelled installation from drop.\n%s", sstr(info_string));
+			return;
 		}
 	}
 
 	// Install rap files if available
-	int installed_rap_and_edat_count = 0;
-
-	const auto install_filetype = [&installed_rap_and_edat_count, &file_paths](const std::string extension)
+	for (const auto& rap : file_paths.filter(QRegExp(".*\\.rap", Qt::CaseInsensitive)))
 	{
-		const QString pattern = QString(".*\\.%1").arg(QString::fromStdString(extension));
-		for (const QString& file : file_paths.filter(QRegularExpression(pattern, QRegularExpression::PatternOption::CaseInsensitiveOption)))
+		const QFileInfo file_info(rap);
+		const std::string rapname = sstr(file_info.fileName());
+
+		if (InstallRapFile(rap, rapname))
 		{
-			const QFileInfo file_info(file);
-			const std::string filename = file_info.fileName().toStdString();
-
-			if (InstallFileInExData(extension, file, filename))
-			{
-				gui_log.success("Successfully copied %s file: %s", extension, filename);
-				installed_rap_and_edat_count++;
-			}
-			else
-			{
-				gui_log.error("Could not copy %s file: %s", extension, filename);
-			}
+			gui_log.success("Successfully copied rap file: %s", rapname);
 		}
-	};
-
-	if (!from_boot)
-	{
-		if (!m_gui_settings->GetBootConfirmation(this))
+		else
 		{
-			// Last chance to cancel the operation
-			return true;
+			gui_log.error("Could not copy rap file: %s", rapname);
 		}
-
-		if (!Emu.IsStopped())
-		{
-			Emu.GracefulShutdown(false);
-		}
-
-		install_filetype("rap");
-		install_filetype("edat");
-	}
-
-	if (installed_rap_and_edat_count > 0)
-	{
-		// Refresh game list since we probably unlocked some games now.
-		m_game_list_frame->Refresh(true);
 	}
 
 	// Find remaining package files
-	file_paths = file_paths.filter(QRegularExpression(".*\\.pkg", QRegularExpression::PatternOption::CaseInsensitiveOption));
+	file_paths = file_paths.filter(QRegExp(".*\\.pkg", Qt::CaseInsensitive));
 
-	if (file_paths.isEmpty())
+	if (!file_paths.isEmpty())
 	{
-		return true;
+		// Handle further installations with a timeout. Otherwise the source explorer instance is not usable during the following file processing.
+		QTimer::singleShot(0, [this, paths = std::move(file_paths)]()
+		{
+			HandlePackageInstallation(paths);
+		});
 	}
-
-	if (from_boot)
-	{
-		return HandlePackageInstallation(file_paths, true);
-	}
-
-	// Handle further installations with a timeout. Otherwise the source explorer instance is not usable during the following file processing.
-	QTimer::singleShot(0, [this, paths = std::move(file_paths)]()
-	{
-		HandlePackageInstallation(paths, false);
-	});
-
-	return true;
 }
 
-bool main_window::HandlePackageInstallation(QStringList file_paths, bool from_boot)
+void main_window::HandlePackageInstallation(QStringList file_paths)
 {
 	if (file_paths.empty())
 	{
-		return false;
+		return;
 	}
 
 	std::vector<compat::package_info> packages;
@@ -993,34 +680,30 @@ bool main_window::HandlePackageInstallation(QStringList file_paths, bool from_bo
 
 	if (packages.empty())
 	{
-		return true;
+		return;
 	}
 
-	if (!from_boot)
+	if (!m_gui_settings->GetBootConfirmation(this))
 	{
-		if (!m_gui_settings->GetBootConfirmation(this))
-		{
-			return true;
-		}
-
-		Emu.GracefulShutdown(false);
+		return;
 	}
 
-	std::vector<std::string> path_vec;
-	for (const compat::package_info& pkg : packages)
-	{
-		path_vec.push_back(pkg.path.toStdString());
-	}
-	gui_log.notice("About to install packages:\n%s", fmt::merge(path_vec, "\n"));
-
 	progress_dialog pdlg(tr("RPCS3 Package Installer"), tr("Installing package, please wait..."), tr("Cancel"), 0, 1000, false, this);
 	pdlg.setAutoClose(false);
 	pdlg.show();
 
-	package_install_result result = {};
+	// Synchronization variable
+	atomic_t<double> progress(0.);
 
-	auto get_app_info = [](compat::package_info& package)
+	package_error error = package_error::no_error;
+
+	bool cancelled = false;
+
+	for (usz i = 0, count = packages.size(); i < count; i++)
 	{
+		progress = 0.;
+
+		const compat::package_info& package = packages.at(i);
 		QString app_info = package.title; // This should always be non-empty
 
 		if (!package.title_id.isEmpty() || !package.version.isEmpty())
@@ -1043,226 +726,97 @@ bool main_window::HandlePackageInstallation(QStringList file_paths, bool from_bo
 			}
 		}
 
-		return app_info;
-	};
+		pdlg.SetValue(0);
+		pdlg.setLabelText(tr("Installing package (%0/%1), please wait...\n\n%2").arg(i + 1).arg(count).arg(app_info));
+		pdlg.show();
 
-	bool cancelled = false;
+		Emu.SetForceBoot(true);
+		Emu.Stop();
 
-	std::deque<package_reader> readers;
+		const QFileInfo file_info(package.path);
+		const std::string path      = sstr(package.path);
+		const std::string file_name = sstr(file_info.fileName());
 
-	for (const compat::package_info& info : packages)
-	{
-		readers.emplace_back(info.path.toStdString());
-	}
-
-	std::deque<std::string> bootable_paths;
-
-	// Run PKG unpacking asynchronously
-	named_thread worker("PKG Installer", [&readers, &result, &bootable_paths]
-	{
-		result = package_reader::extract_data(readers, bootable_paths);
-		return result.error == package_install_result::error_type::no_error;
-	});
-
-	pdlg.show();
-
-	// Wait for the completion
-	int reader_it = 0;
-	int set_text = -1;
-
-	qt_events_aware_op(5, [&, readers_size = ::narrow<int>(readers.size())]()
-	{
-		if (reader_it == readers_size || result.error != package_install_result::error_type::no_error)
+		// Run PKG unpacking asynchronously
+		named_thread worker("PKG Installer", [path, &progress, &error]
 		{
-			// Exit loop
-			return true;
-		}
+			package_reader reader(path);
+			error = reader.check_target_app_version();
 
-		if (pdlg.wasCanceled())
-		{
-			cancelled = true;
-
-			for (package_reader& reader : readers)
+			if (error == package_error::no_error)
 			{
-				reader.abort_extract();
+				return reader.extract_data(progress);
 			}
 
-			// Exit loop
-			return true;
-		}
+			return false;
+		});
 
-		// Update progress window
-		const int progress = readers[reader_it].get_progress(pdlg.maximum());
-		pdlg.SetValue(progress);
-
-		if (set_text != reader_it)
+		// Wait for the completion
+		while (worker <= thread_state::aborting)
 		{
-			pdlg.setLabelText(tr("Installing package (%0/%1), please wait...\n\n%2").arg(reader_it + 1).arg(readers_size).arg(get_app_info(packages[reader_it])));
-			set_text = reader_it;
-		}
+			std::this_thread::sleep_for(5ms);
 
-		if (progress == pdlg.maximum())
-		{
-			reader_it++;
-		}
-
-		// Process events
-		return false;
-	});
-
-	const bool success = worker();
-
-	if (success)
-	{
-		pdlg.SetValue(pdlg.maximum());
-
-		const u64 start_time = get_system_time();
-
-		for (usz i = 0; i < packages.size(); i++)
-		{
-			const compat::package_info& package = ::at32(packages, i);
-			const package_reader& reader = ::at32(readers, i);
-
-			switch (reader.get_result())
+			if (pdlg.wasCanceled())
 			{
-			case package_reader::result::success:
-			{
-				gui_log.success("Successfully installed %s (title_id=%s, title=%s, version=%s).", package.path, package.title_id, package.title, package.version);
+				cancelled = true;
+				progress -= 1.;
 				break;
 			}
-			case package_reader::result::not_started:
-			case package_reader::result::started:
-			case package_reader::result::aborted:
-			{
-				gui_log.notice("Aborted installation of %s (title_id=%s, title=%s, version=%s).", package.path, package.title_id, package.title, package.version);
-				break;
-			}
-			case package_reader::result::error:
-			{
-				gui_log.error("Failed to install %s (title_id=%s, title=%s, version=%s).", package.path, package.title_id, package.title, package.version);
-				break;
-			}
-			case package_reader::result::aborted_dirty:
-			case package_reader::result::error_dirty:
-			{
-				gui_log.error("Partially installed %s (title_id=%s, title=%s, version=%s).", package.path, package.title_id, package.title, package.version);
-				break;
-			}
-			}
+
+			// Update progress window
+			double pval = progress;
+			if (pval < 0.) pval += 1.;
+			pdlg.SetValue(static_cast<int>(pval * pdlg.maximum()));
+			QCoreApplication::processEvents();
 		}
 
-		std::map<std::string, QString> bootable_paths_installed; // -> title id
-
-		for (usz index = 0; index < bootable_paths.size(); index++)
+		if (worker())
 		{
-			if (bootable_paths[index].empty())
+			pdlg.SetValue(pdlg.maximum());
+			std::this_thread::sleep_for(100ms);
+		}
+		else
+		{
+			pdlg.setHidden(true);
+			pdlg.SignalFailure();
+		}
+
+		if (worker())
+		{
+			m_game_list_frame->Refresh(true);
+			gui_log.success("Successfully installed %s (title_id=%s, title=%s, version=%s).", file_name, sstr(package.title_id), sstr(package.title), sstr(package.version));
+
+			if (i == (count - 1))
 			{
-				continue;
+				m_gui_settings->ShowInfoBox(tr("Success!"), tr("Successfully installed software from package(s)!"), gui::ib_pkg_success, this);
 			}
-
-			bootable_paths_installed[bootable_paths[index]] = packages[index].title_id;
 		}
-
-		// Need to test here due to potential std::move later
-		const bool installed_a_whole_package_without_new_software = bootable_paths_installed.empty() && !cancelled;
-
-		if (!bootable_paths_installed.empty())
+		else
 		{
-			m_game_list_frame->AddRefreshedSlot([this, paths = std::move(bootable_paths_installed)](std::set<std::string>& claimed_paths) mutable
+			if (!cancelled)
 			{
-				// Try to claim operaions on ID
-				for (auto it = paths.begin(); it != paths.end();)
+				if (error == package_error::app_version)
 				{
-					std::string resolved_path = Emu.GetCallbacks().resolve_path(it->first);
-
-					if (resolved_path.empty() || claimed_paths.count(resolved_path))
-					{
-						it = paths.erase(it);
-					}
-					else
-					{
-						claimed_paths.emplace(std::move(resolved_path));
-						it++;
-					}
-				}
-
-				ShowOptionalGamePreparations(tr("Success!"), tr("Successfully installed software from package(s)!"), std::move(paths));
-			});
-		}
-
-		m_game_list_frame->Refresh(true);
-
-		std::this_thread::sleep_for(std::chrono::microseconds(100'000 - std::min<usz>(100'000, get_system_time() - start_time)));
-		pdlg.hide();
-
-		if (installed_a_whole_package_without_new_software)
-		{
-			m_gui_settings->ShowInfoBox(tr("Success!"), tr("Successfully installed software from package(s)!"), gui::ib_pkg_success, this);
-		}
-	}
-	else
-	{
-		pdlg.hide();
-		pdlg.SignalFailure();
-
-		if (!cancelled)
-		{
-			const compat::package_info* package = nullptr;
-
-			for (usz i = 0; i < readers.size() && !package; i++)
-			{
-				// Figure out what package failed the installation
-				switch (readers[i].get_result())
-				{
-				case package_reader::result::success:
-				case package_reader::result::not_started:
-				case package_reader::result::started:
-				case package_reader::result::aborted:
-				case package_reader::result::aborted_dirty:
-					break;
-				case package_reader::result::error:
-				case package_reader::result::error_dirty:
-					package = &packages[i];
-					break;
-				}
-			}
-
-			ensure(package);
-
-			if (result.error == package_install_result::error_type::app_version)
-			{
-				gui_log.error("Cannot install %s.", package->path);
-				const bool has_expected = !result.version.expected.empty();
-				const bool has_found = !result.version.found.empty();
-				if (has_expected && has_found)
-				{
-					QMessageBox::warning(this, tr("Warning!"), tr("Package cannot be installed on top of the current data.\nUpdate is for version %1, but you have version %2.\n\nTried to install: %3")
-							.arg(QString::fromStdString(result.version.expected)).arg(QString::fromStdString(result.version.found)).arg(package->path));
-				}
-				else if (has_expected)
-				{
-					QMessageBox::warning(this, tr("Warning!"), tr("Package cannot be installed on top of the current data.\nUpdate is for version %1, but you don't have any data installed.\n\nTried to install: %2")
-							.arg(QString::fromStdString(result.version.expected)).arg(package->path));
+					gui_log.error("Cannot install %s.", file_name);
+					QMessageBox::warning(this, tr("Warning!"), tr("The following package cannot be installed on top of the current data:\n%1!").arg(package.path));
 				}
 				else
 				{
-					// probably unreachable
-					const QString found = has_found ? tr("version %1").arg(QString::fromStdString(result.version.found)) : tr("no data installed");
-					QMessageBox::warning(this, tr("Warning!"), tr("Package cannot be installed on top of the current data.\nUpdate is for unknown version, but you have version %1.\n\nTried to install: %2")
-							.arg(QString::fromStdString(result.version.expected)).arg(found).arg(package->path));
+					gui_log.error("Failed to install %s.", file_name);
+					QMessageBox::critical(this, tr("Failure!"), tr("Failed to install software from package:\n%1!"
+						"\nThis is very likely caused by external interference from a faulty anti-virus software."
+						"\nPlease add RPCS3 to your anti-virus\' whitelist or use better anti-virus software.").arg(package.path));
 				}
 			}
-			else
-			{
-				gui_log.error("Failed to install %s.", package->path);
-				QMessageBox::critical(this, tr("Failure!"), tr("Failed to install software from package:\n%1!"
-					"\nThis is very likely caused by external interference from a faulty anti-virus software."
-					"\nPlease add RPCS3 to your anti-virus\' whitelist or use better anti-virus software.").arg(package->path));
-			}
+			return;
+		}
+
+		// return if the thread was still running after cancel
+		if (cancelled)
+		{
+			return;
 		}
 	}
-
-	return success;
 }
 
 void main_window::ExtractMSELF()
@@ -1280,7 +834,7 @@ void main_window::ExtractMSELF()
 	if (!dir.isEmpty())
 	{
 		m_gui_settings->SetValue(gui::fd_ext_mself, QFileInfo(file_path).path());
-		extract_mself(file_path.toStdString(), dir.toStdString() + '/');
+		extract_mself(sstr(file_path), sstr(dir) + '/');
 	}
 }
 
@@ -1296,7 +850,7 @@ void main_window::InstallPup(QString file_path)
 		if (QMessageBox::question(this, tr("RPCS3 Firmware Installer"), tr("Install firmware: %1?").arg(file_path),
 			QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
 		{
-			gui_log.notice("Firmware: Cancelled installation from drop. File: %s", file_path);
+			gui_log.notice("Firmware: Cancelled installation from drop. File: %s", sstr(file_path));
 			return;
 		}
 	}
@@ -1336,7 +890,8 @@ void main_window::ExtractTar()
 		return;
 	}
 
-	Emu.GracefulShutdown(false);
+	Emu.SetForceBoot(true);
+	Emu.Stop();
 
 	const QString path_last_tar = m_gui_settings->GetValue(gui::fd_ext_tar).toString();
 	QStringList files = QFileDialog::getOpenFileNames(this, tr("Select TAR To extract"), path_last_tar, tr("All tar files (*.tar *.TAR *.tar.aa.* *.TAR.AA.*);;All files (*.*)"));
@@ -1360,21 +915,15 @@ void main_window::ExtractTar()
 
 	QString error;
 
-	auto files_it = files.begin();
-	int pdlg_progress = 0;
-
-	qt_events_aware_op(0, [&]()
+	for (const QString& file : files)
 	{
-		if (pdlg.wasCanceled() || files_it == files.end())
+		if (pdlg.wasCanceled())
 		{
-			// Exit loop
-			return true;
+			break;
 		}
 
-		const QString& file = *files_it;
-
 		// Do not abort on failure here, in case the user selected a wrong file in multi-selection while the rest are valid
-		if (!extract_tar(file.toStdString(), dir.toStdString() + '/'))
+		if (!extract_tar(sstr(file), sstr(dir) + '/'))
 		{
 			if (error.isEmpty())
 			{
@@ -1385,17 +934,14 @@ void main_window::ExtractTar()
 			error += file;
 		}
 
-		pdlg_progress++;
-		pdlg.SetValue(pdlg_progress);
-
-		files_it++;
-		return false;
-	});
+		pdlg.SetValue(pdlg.value() + 1);
+		QApplication::processEvents();
+	}
 
 	if (!error.isEmpty())
 	{
 		pdlg.hide();
-		QMessageBox::critical(this, tr("TAR extraction failed"), error);
+		QMessageBox::critical(this, tr("Tar extraction failed"), error);
 	}
 }
 
@@ -1403,10 +949,10 @@ void main_window::HandlePupInstallation(const QString& file_path, const QString&
 {
 	const auto critical = [this](QString str)
 	{
-		Emu.CallFromMainThread([this, str = std::move(str)]()
+		Emu.CallAfter([this, str = std::move(str)]()
 		{
 			QMessageBox::critical(this, tr("Firmware Installation Failed"), str);
-		}, nullptr, false);
+		}, false);
 	};
 
 	if (file_path.isEmpty())
@@ -1421,11 +967,12 @@ void main_window::HandlePupInstallation(const QString& file_path, const QString&
 		return;
 	}
 
-	Emu.GracefulShutdown(false);
+	Emu.SetForceBoot(true);
+	Emu.Stop();
 
 	m_gui_settings->SetValue(gui::fd_install_pup, QFileInfo(file_path).path());
 
-	const std::string path = file_path.toStdString();
+	const std::string path = sstr(file_path);
 
 	fs::file pup_f(path);
 	if (!pup_f)
@@ -1483,50 +1030,33 @@ void main_window::HandlePupInstallation(const QString& file_path, const QString&
 
 	fs::file update_files_f = pup.get_file(0x300);
 
-	const usz update_files_size = update_files_f ? update_files_f.size() : 0;
-
-	if (!update_files_size)
+	if (!update_files_f)
 	{
 		gui_log.error("Error while installing firmware: Couldn't find installation packages database.");
 		critical(tr("Firmware installation failed: The provided file's contents are corrupted."));
 		return;
 	}
 
-	fs::device_stat dev_stat{};
-	if (!fs::statfs(g_cfg_vfs.get_dev_flash(), dev_stat))
-	{
-		gui_log.error("Error while installing firmware: Couldn't retrieve available disk space. ('%s')", g_cfg_vfs.get_dev_flash());
-		critical(tr("Firmware installation failed: Couldn't retrieve available disk space."));
-		return;
-	}
-
-	if (dev_stat.avail_free < update_files_size)
-	{
-		gui_log.error("Error while installing firmware: Out of disk space. ('%s', needed: %d bytes)", g_cfg_vfs.get_dev_flash(), update_files_size - dev_stat.avail_free);
-		critical(tr("Firmware installation failed: Out of disk space."));
-		return;
-	}
-
 	tar_object update_files(update_files_f);
 
 	if (!dir_path.isEmpty())
 	{
 		// Extract only mode, extract direct TAR entries to a user directory
 
-		if (!vfs::mount("/pup_extract", dir_path.toStdString() + '/'))
+		if (!vfs::mount("/pup_extract", sstr(dir_path) + '/'))
 		{
-			gui_log.error("Error while extracting firmware: Failed to mount '%s'", dir_path);
+			gui_log.error("Error while extracting firmware: Failed to mount '%s'", sstr(dir_path));
 			critical(tr("Firmware extraction failed: VFS mounting failed."));
-			return;
+			return;	
 		}
 
-		if (!update_files.extract("/pup_extract", true))
+		if (!update_files.extract("/pup_extract"))
 		{
 			gui_log.error("Error while installing firmware: TAR contents are invalid.");
 			critical(tr("Firmware installation failed: Firmware contents could not be extracted."));
 		}
 
-		gui_log.success("Extracted PUP file to %s", dir_path);
+		gui_log.success("Extracted PUP file to %s", sstr(dir_path));
 		return;
 	}
 
@@ -1546,7 +1076,7 @@ void main_window::HandlePupInstallation(const QString& file_path, const QString&
 		return;
 	}
 
-	static constexpr std::string_view cur_version = "4.92";
+	static constexpr std::string_view cur_version = "4.88";
 
 	std::string version_string;
 
@@ -1568,17 +1098,17 @@ void main_window::HandlePupInstallation(const QString& file_path, const QString&
 	}
 
 	if (version_string < cur_version &&
-		QMessageBox::question(this, tr("RPCS3 Firmware Installer"), tr("Old firmware detected.\nThe newest firmware version is %1 and you are trying to install version %2\nContinue installation?").arg(QString::fromUtf8(cur_version.data(), ::size32(cur_version)), QString::fromStdString(version_string)),
+		QMessageBox::question(this, tr("RPCS3 Firmware Installer"), tr("Old firmware detected.\nThe newest firmware version is %1 and you are trying to install version %2\nContinue installation?").arg(QString::fromUtf8(cur_version.data(), ::size32(cur_version)), qstr(version_string)),
 			QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::No)
 	{
 		return;
 	}
 
-	if (const std::string installed = utils::get_firmware_version(); !installed.empty())
+	if (std::string installed = utils::get_firmware_version(); !installed.empty())
 	{
 		gui_log.warning("Reinstalling firmware: old=%s, new=%s", installed, version_string);
 
-		if (QMessageBox::question(this, tr("RPCS3 Firmware Installer"), tr("Firmware of version %1 has already been installed.\nOverwrite current installation with version %2?").arg(QString::fromStdString(installed), QString::fromStdString(version_string)),
+		if (QMessageBox::question(this, tr("RPCS3 Firmware Installer"), tr("Firmware of version %1 has already been installed.\nOverwrite current installation with version %2?").arg(qstr(installed), qstr(version_string)),
 			QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::No)
 		{
 			gui_log.warning("Reinstallation of firmware aborted.");
@@ -1589,11 +1119,11 @@ void main_window::HandlePupInstallation(const QString& file_path, const QString&
 	// Remove possibly PS3 fonts from database
 	QFontDatabase::removeAllApplicationFonts();
 
-	progress_dialog pdlg(tr("RPCS3 Firmware Installer"), tr("Installing firmware version %1\nPlease wait...").arg(QString::fromStdString(version_string)), tr("Cancel"), 0, static_cast<int>(update_filenames.size()), false, this);
+	progress_dialog pdlg(tr("RPCS3 Firmware Installer"), tr("Installing firmware version %1\nPlease wait...").arg(qstr(version_string)), tr("Cancel"), 0, static_cast<int>(update_filenames.size()), false, this);
 	pdlg.show();
 
 	// Used by tar_object::extract() as destination directory
-	vfs::mount("/dev_flash", g_cfg_vfs.get_dev_flash());
+	vfs::mount("/dev_flash", g_cfg.vfs.get_dev_flash());
 
 	// Synchronization variable
 	atomic_t<uint> progress(0);
@@ -1603,15 +1133,7 @@ void main_window::HandlePupInstallation(const QString& file_path, const QString&
 		{
 			for (const auto& update_filename : update_filenames)
 			{
-				auto update_file_stream = update_files.get_file(update_filename);
-
-				if (update_file_stream->m_file_handler)
-				{
-					// Forcefully read all the data
-					update_file_stream->m_file_handler->handle_file_op(*update_file_stream, 0, update_file_stream->get_size(umax), nullptr);
-				}
-
-				fs::file update_file = fs::make_stream(std::move(update_file_stream->data));
+				fs::file update_file = update_files.get_file(update_filename);
 
 				SCEDecrypter self_dec(update_file);
 				self_dec.LoadHeaders();
@@ -1648,25 +1170,18 @@ void main_window::HandlePupInstallation(const QString& file_path, const QString&
 		});
 
 		// Wait for the completion
-		qt_events_aware_op(5, [&]()
+		for (uint value = progress.load(); value < update_filenames.size(); std::this_thread::sleep_for(5ms), value = progress)
 		{
-			const uint value = progress.load();
-
-			if (value >= update_filenames.size())
-			{
-				return true;
-			}
-
 			if (pdlg.wasCanceled())
 			{
 				progress = -1;
-				return true;
+				break;
 			}
 
 			// Update progress window
 			pdlg.SetValue(static_cast<int>(value));
-			return false;
-		});
+			QCoreApplication::processEvents();
+		}
 
 		// Join thread
 		worker();
@@ -1688,7 +1203,7 @@ void main_window::HandlePupInstallation(const QString& file_path, const QString&
 
 	if (progress == update_filenames.size())
 	{
-		ui->bootVSHAct->setEnabled(fs::is_file(g_cfg_vfs.get_dev_flash() + "/vsh/module/vsh.self"));
+		ui->bootVSHAct->setEnabled(fs::is_file(g_cfg.vfs.get_dev_flash() + "/vsh/module/vsh.self"));
 
 		gui_log.success("Successfully installed PS3 firmware version %s.", version_string);
 		m_gui_settings->ShowInfoBox(tr("Success!"), tr("Successfully installed PS3 firmware and LLE Modules!"), gui::ib_pup_success, this);
@@ -1697,18 +1212,20 @@ void main_window::HandlePupInstallation(const QString& file_path, const QString&
 	}
 }
 
+// This is ugly, but PS3 headers shall not be included there.
+extern void sysutil_send_system_cmd(u64 status, u64 param);
+
 void main_window::DecryptSPRXLibraries()
 {
 	QString path_last_sprx = m_gui_settings->GetValue(gui::fd_decrypt_sprx).toString();
 
-	if (!fs::is_dir(path_last_sprx.toStdString()))
+	if (!fs::is_dir(sstr(path_last_sprx)))
 	{
 		// Default: redirect to userland firmware SPRX directory
-		path_last_sprx = QString::fromStdString(g_cfg_vfs.get_dev_flash() + "sys/external");
+		path_last_sprx = qstr(g_cfg.vfs.get_dev_flash() + "sys/external");
 	}
 
-	const QStringList modules = QFileDialog::getOpenFileNames(this, tr("Select binary files"), path_last_sprx, tr("All Binaries (*.bin *.BIN *.self *.SELF *.sprx *.SPRX *.sdat *.SDAT *.edat *.EDAT);;"
-		"BIN files (*.bin *.BIN);;SELF files (*.self *.SELF);;SPRX files (*.sprx *.SPRX);;SDAT/EDAT files (*.sdat *.SDAT *.edat *.EDAT);;All files (*.*)"));
+	const QStringList modules = QFileDialog::getOpenFileNames(this, tr("Select binary files"), path_last_sprx, tr("All Binaries (*.bin *.BIN *.self *.SELF *.sprx *.SPRX);;BIN files (*.bin *.BIN);;SELF files (*.self *.SELF);;SPRX files (*.sprx *.SPRX);;All files (*.*)"));
 
 	if (modules.isEmpty())
 	{
@@ -1717,70 +1234,136 @@ void main_window::DecryptSPRXLibraries()
 
 	m_gui_settings->SetValue(gui::fd_decrypt_sprx, QFileInfo(modules.first()).path());
 
-	std::vector<std::string> vec_modules;
-	for (const QString& mod : modules)
+	gui_log.notice("Decrypting binaries...");
+
+	// Always start with no KLIC
+	std::vector<u128> klics{u128{}};
+
+	if (const auto keys = g_fxo->try_get<loaded_npdrm_keys>())
 	{
-		vec_modules.push_back(mod.toStdString());
-	}
-
-	auto iterate = std::make_shared<std::function<void(usz, usz)>>();
-	const auto decrypter = std::make_shared<decrypt_binaries_t>(std::move(vec_modules));
-
-	*iterate = [this, iterate, decrypter](usz mod_index, usz repeat_count)
-	{
-		const std::string& path = (*decrypter)[mod_index];
-		const std::string filename = path.substr(path.find_last_of(fs::delim) + 1);
-
-		const QString hint = tr("Hint: KLIC (KLicense key) is a 16-byte long string. (32 hexadecimal characters, can be prefixed with \"KLIC=0x\" from the log message)"
-			"\nAnd is logged with some sceNpDrm* functions when the game/application which owns \"%0\" is running.").arg(QString::fromStdString(filename));
-
-		if (repeat_count >= 2)
+		// Second klic: get it from a running game
+		if (const u128 klic = keys->devKlic)
 		{
-			gui_log.error("Failed to decrypt %s with specified KLIC, retrying.\n%s", path, hint);
+			klics.emplace_back(klic);
 		}
-
-		input_dialog* dlg = new input_dialog(39, "", tr("Enter KLIC of %0").arg(QString::fromStdString(filename)),
-			repeat_count >= 2 ? tr("Decryption failed with provided KLIC.\n%0").arg(hint) : tr("Hexadecimal value."), "KLIC=0x00000000000000000000000000000000", this);
-
-		QFont mono = QFontDatabase::systemFont(QFontDatabase::FixedFont);
-		mono.setPointSize(8);
-		dlg->set_input_font(mono, true, '0');
-		dlg->set_clear_button_enabled(false);
-		dlg->set_button_enabled(QDialogButtonBox::StandardButton::Ok, false);
-		dlg->set_validator(new QRegularExpressionValidator(QRegularExpression("^((((((K?L)?I)?C)?=)?0)?x)?[a-fA-F0-9]{0,32}$"), this)); // HEX only (with additional KLIC=0x prefix for convenience)
-		dlg->setAttribute(Qt::WA_DeleteOnClose);
-
-		connect(dlg, &input_dialog::text_changed, dlg, [dlg](const QString& text)
-		{
-			dlg->set_button_enabled(QDialogButtonBox::StandardButton::Ok, text.size() - (text.indexOf('x') + 1) == 32);
-		});
-
-		connect(dlg, &QDialog::accepted, this, [this, iterate, dlg, mod_index, decrypter, repeat_count]()
-		{
-			std::string text = dlg->get_input_text().toStdString();
-
-			if (usz new_index = decrypter->decrypt(std::move(text)); !decrypter->done())
-			{
-				QTimer::singleShot(0, [iterate, mod_index, repeat_count, new_index]()
-				{
-					// Increase repeat count if "stuck" on the same file
-					(*iterate)(new_index, new_index == mod_index ? repeat_count + 1 : 0);
-				});
-			}
-		});
-
-		connect(dlg, &QDialog::rejected, this, []()
-		{
-			gui_log.notice("User has cancelled entering KLIC.");
-		});
-
-		dlg->show();
-	};
-
-	if (usz new_index = decrypter->decrypt(); !decrypter->done())
-	{
-		(*iterate)(new_index, new_index == 0 ? 1 : 0);
 	}
+
+	for (const QString& _module : modules)
+	{
+		const std::string old_path = sstr(_module);
+
+		fs::file elf_file;
+
+		bool tried = false;
+		bool invalid = false;
+		usz key_it = 0;
+
+		while (true)
+		{
+			for (; key_it < klics.size(); key_it++)
+			{
+				if (elf_file.open(old_path) && elf_file.size() >= 4 && elf_file.read<u32>() == "SCE\0"_u32)
+				{
+					// First KLIC is no KLIC
+					elf_file = decrypt_self(std::move(elf_file), key_it != 0 ? reinterpret_cast<u8*>(&klics[key_it]) : nullptr);
+
+					if (!elf_file)
+					{
+						// Try another key
+						continue;
+					}
+				}
+				else
+				{
+					elf_file = {};
+					invalid = true;
+				}
+
+				break;
+			}
+
+			if (elf_file)
+			{
+				const std::string bin_ext  = _module.toLower().endsWith(".sprx") ? ".prx" : ".elf";
+				const std::string new_path = old_path.substr(0, old_path.find_last_of('.')) + bin_ext;
+
+				if (fs::file new_file{new_path, fs::rewrite})
+				{
+					new_file.write(elf_file.to_string());
+					gui_log.success("Decrypted %s", old_path);
+				}
+				else
+				{
+					gui_log.error("Failed to create %s", new_path);
+				}
+
+				break;
+			}
+			else if (!invalid)
+			{
+				// Allow the user to manually type KLIC if decryption failed
+
+				const std::string filename = old_path.substr(old_path.find_last_of(fs::delim) + 1);
+
+				const QString hint = tr("Hint: KLIC (KLicense key) is a 16-byte long string. (32 hexadecimal characters)"
+							"\nAnd is logged with some sceNpDrm* functions when the game/application which owns \"%0\" is running.").arg(qstr(filename));
+
+				if (tried)
+				{
+					gui_log.error("Failed to decrypt %s with specfied KLIC, retrying.\n%s", old_path, sstr(hint));
+				}
+
+				input_dialog dlg(32, "", tr("Enter KLIC of %0").arg(qstr(filename)),
+					tried ? tr("Decryption failed with provided KLIC.\n%0").arg(hint) : tr("Hexadecimal only."), "00000000000000000000000000000000", this);
+
+				QFont mono = QFontDatabase::systemFont(QFontDatabase::FixedFont);
+				mono.setPointSize(8);
+				dlg.set_input_font(mono, true, '0');
+				dlg.set_clear_button_enabled(false);
+				dlg.set_button_enabled(QDialogButtonBox::StandardButton::Ok, false);
+				dlg.set_validator(new QRegExpValidator(QRegExp("^[a-fA-F0-9]*$"))); // HEX only
+
+				connect(&dlg, &input_dialog::text_changed, &dlg, [&dlg](const QString& text)
+				{
+					dlg.set_button_enabled(QDialogButtonBox::StandardButton::Ok, text.size() == 32);
+				});
+
+				if (dlg.exec() == QDialog::Accepted)
+				{
+					const std::string text = sstr(dlg.get_input_text());
+
+					auto& klic = (tried ? klics.back() : klics.emplace_back());
+
+					ensure(text.size() == 32);
+
+					// It must succeed (only hex characters are present)
+					u64 lo_ = 0;
+					u64 hi_ = 0;
+					std::from_chars(&text[0], &text[16], lo_, 16);
+					std::from_chars(&text[16], &text[32], hi_, 16);
+
+					be_t<u64> lo = std::bit_cast<be_t<u64>>(lo_);
+					be_t<u64> hi = std::bit_cast<be_t<u64>>(hi_);
+
+					klic = (u128{+hi} << 64) | +lo;
+
+					// Retry with specified KLIC
+					key_it -= +std::exchange(tried, true); // Rewind on second and above attempt
+					gui_log.notice("KLIC entered for %s: %s", filename, klic);
+					continue;
+				}
+				else
+				{
+					gui_log.notice("User has cancelled entering KLIC.");
+				}
+			}
+
+			gui_log.error("Failed to decrypt \"%s\".", old_path);
+			break;
+		}
+	}
+
+	gui_log.notice("Finished decrypting all binaries.");
 }
 
 /** Needed so that when a backup occurs of window state in gui_settings, the state is current.
@@ -1789,61 +1372,51 @@ void main_window::DecryptSPRXLibraries()
 void main_window::SaveWindowState() const
 {
 	// Save gui settings
-	m_gui_settings->SetValue(gui::mw_geometry, saveGeometry(), false);
-	m_gui_settings->SetValue(gui::mw_windowState, saveState(), false);
+	m_gui_settings->SetValue(gui::mw_geometry, saveGeometry());
+	m_gui_settings->SetValue(gui::mw_windowState, saveState());
+	m_gui_settings->SetValue(gui::mw_mwState, m_mw->saveState());
 
-	// NOTE:
-	//
-	// This method is also invoked in case the gui_application::Init() method failed ("false" was returned)
-	// to initialize some modules leaving other modules uninitialized (NULL pointed).
-	// So, the following checks on NULL pointer are provided before accessing the related module's object
-
-	if (m_mw)
-	{
-		m_gui_settings->SetValue(gui::mw_mwState, m_mw->saveState(), true);
-	}
-
-	if (m_game_list_frame)
-	{
-		// Save column settings
-		m_game_list_frame->SaveSettings();
-	}
-
-	if (m_debugger_frame)
-	{
-		// Save splitter state
-		m_debugger_frame->SaveSettings();
-	}
+	// Save column settings
+	m_game_list_frame->SaveSettings();
+	// Save splitter state
+	m_debugger_frame->SaveSettings();
 }
 
 void main_window::RepaintThumbnailIcons()
 {
-	const QColor color = gui::utils::get_foreground_color();
-	[[maybe_unused]] const QColor new_color = gui::utils::get_label_color("thumbnail_icon_color", color, color);
+	[[maybe_unused]] const QColor new_color = gui::utils::get_label_color("thumbnail_icon_color");
 
 	[[maybe_unused]] const auto icon = [&new_color](const QString& path)
 	{
 		return gui::utils::get_colorized_icon(QPixmap::fromImage(gui::utils::get_opaque_image_area(path)), Qt::black, new_color);
 	};
+
+#ifdef _WIN32
+	if (!m_thumb_bar) return;
+
+	m_icon_thumb_play = icon(":/Icons/play.png");
+	m_icon_thumb_pause = icon(":/Icons/pause.png");
+	m_icon_thumb_stop = icon(":/Icons/stop.png");
+	m_icon_thumb_restart = icon(":/Icons/restart.png");
+
+	m_thumb_playPause->setIcon(Emu.IsRunning() ? m_icon_thumb_pause : m_icon_thumb_play);
+	m_thumb_stop->setIcon(m_icon_thumb_stop);
+	m_thumb_restart->setIcon(m_icon_thumb_restart);
+#endif
 }
 
 void main_window::RepaintToolBarIcons()
 {
-	const QColor color = gui::utils::get_foreground_color();
+	const QColor new_color = gui::utils::get_label_color("toolbar_icon_color");
 
-	std::map<QIcon::Mode, QColor> new_colors{};
-	new_colors[QIcon::Normal] = gui::utils::get_label_color("toolbar_icon_color", color, color);
-	new_colors[QIcon::Disabled] = gui::utils::get_label_color("toolbar_icon_color_disabled", Qt::gray, Qt::lightGray);
-	new_colors[QIcon::Active] = gui::utils::get_label_color("toolbar_icon_color_active", color, color);
-	new_colors[QIcon::Selected] = gui::utils::get_label_color("toolbar_icon_color_selected", color, color);
-
-	const auto icon = [&new_colors](const QString& path)
+	const auto icon = [&new_color](const QString& path)
 	{
-		return gui::utils::get_colorized_icon(QIcon(path), Qt::black, new_colors);
+		return gui::utils::get_colorized_icon(QIcon(path), Qt::black, new_color);
 	};
 
 	m_icon_play           = icon(":/Icons/play.png");
 	m_icon_pause          = icon(":/Icons/pause.png");
+	m_icon_stop           = icon(":/Icons/stop.png");
 	m_icon_restart        = icon(":/Icons/restart.png");
 	m_icon_fullscreen_on  = icon(":/Icons/fullscreen.png");
 	m_icon_fullscreen_off = icon(":/Icons/exit_fullscreen.png");
@@ -1856,23 +1429,17 @@ void main_window::RepaintToolBarIcons()
 	ui->toolbar_refresh ->setIcon(icon(":/Icons/refresh.png"));
 	ui->toolbar_stop    ->setIcon(icon(":/Icons/stop.png"));
 
-	ui->sysStopAct->setIcon(icon(":/Icons/stop.png"));
-	ui->sysRebootAct->setIcon(m_icon_restart);
-
 	if (Emu.IsRunning())
 	{
 		ui->toolbar_start->setIcon(m_icon_pause);
-		ui->sysPauseAct->setIcon(m_icon_pause);
 	}
 	else if (Emu.IsStopped() && !Emu.GetBoot().empty())
 	{
 		ui->toolbar_start->setIcon(m_icon_restart);
-		ui->sysPauseAct->setIcon(m_icon_restart);
 	}
 	else
 	{
 		ui->toolbar_start->setIcon(m_icon_play);
-		ui->sysPauseAct->setIcon(m_icon_play);
 	}
 
 	if (isFullScreen())
@@ -1884,12 +1451,19 @@ void main_window::RepaintToolBarIcons()
 		ui->toolbar_fullscreen->setIcon(m_icon_fullscreen_on);
 	}
 
-	const QColor& new_color = new_colors[QIcon::Normal];
 	ui->sizeSlider->setStyleSheet(ui->sizeSlider->styleSheet().append("QSlider::handle:horizontal{ background: rgba(%1, %2, %3, %4); }")
 		.arg(new_color.red()).arg(new_color.green()).arg(new_color.blue()).arg(new_color.alpha()));
 
 	// resize toolbar elements
 
+	// for highdpi resize toolbar icons and height dynamically
+	// choose factors to mimic Gui-Design in main_window.ui
+	// TODO: delete this in case Qt::AA_EnableHighDpiScaling is enabled in main.cpp
+#ifdef _WIN32
+	const int tool_icon_height = menuBar()->sizeHint().height() * 1.5;
+	ui->toolBar->setIconSize(QSize(tool_icon_height, tool_icon_height));
+#endif
+
 	const int tool_bar_height = ui->toolBar->sizeHint().height();
 
 	for (const auto& act : ui->toolBar->actions())
@@ -1906,7 +1480,7 @@ void main_window::RepaintToolBarIcons()
 	ui->mw_searchbar->setFixedWidth(tool_bar_height * 5);
 }
 
-void main_window::OnEmuRun(bool /*start_playtime*/)
+void main_window::OnEmuRun(bool /*start_playtime*/) const
 {
 	const QString title = GetCurrentTitle();
 	const QString restart_tooltip = tr("Restart %0").arg(title);
@@ -1915,7 +1489,14 @@ void main_window::OnEmuRun(bool /*start_playtime*/)
 
 	m_debugger_frame->EnableButtons(true);
 
+#ifdef _WIN32
+	m_thumb_stop->setToolTip(stop_tooltip);
+	m_thumb_restart->setToolTip(restart_tooltip);
+	m_thumb_playPause->setToolTip(pause_tooltip);
+	m_thumb_playPause->setIcon(m_icon_thumb_pause);
+#endif
 	ui->sysPauseAct->setText(tr("&Pause"));
+	ui->sysPauseAct->setShortcut(QKeySequence("Ctrl+P"));
 	ui->sysPauseAct->setIcon(m_icon_pause);
 	ui->toolbar_start->setIcon(m_icon_pause);
 	ui->toolbar_start->setText(tr("Pause"));
@@ -1923,8 +1504,6 @@ void main_window::OnEmuRun(bool /*start_playtime*/)
 	ui->toolbar_stop->setToolTip(stop_tooltip);
 
 	EnableMenus(true);
-
-	update_gui_pad_thread();
 }
 
 void main_window::OnEmuResume() const
@@ -1934,7 +1513,14 @@ void main_window::OnEmuResume() const
 	const QString pause_tooltip = tr("Pause %0").arg(title);
 	const QString stop_tooltip = tr("Stop %0").arg(title);
 
+#ifdef _WIN32
+	m_thumb_stop->setToolTip(stop_tooltip);
+	m_thumb_restart->setToolTip(restart_tooltip);
+	m_thumb_playPause->setToolTip(pause_tooltip);
+	m_thumb_playPause->setIcon(m_icon_thumb_pause);
+#endif
 	ui->sysPauseAct->setText(tr("&Pause"));
+	ui->sysPauseAct->setShortcut(QKeySequence("Ctrl+P"));
 	ui->sysPauseAct->setIcon(m_icon_pause);
 	ui->toolbar_start->setIcon(m_icon_pause);
 	ui->toolbar_start->setText(tr("Pause"));
@@ -1947,7 +1533,12 @@ void main_window::OnEmuPause() const
 	const QString title = GetCurrentTitle();
 	const QString resume_tooltip = tr("Resume %0").arg(title);
 
+#ifdef _WIN32
+	m_thumb_playPause->setToolTip(resume_tooltip);
+	m_thumb_playPause->setIcon(m_icon_thumb_play);
+#endif
 	ui->sysPauseAct->setText(tr("&Resume"));
+	ui->sysPauseAct->setShortcut(QKeySequence("Ctrl+R"));
 	ui->sysPauseAct->setIcon(m_icon_play);
 	ui->toolbar_start->setIcon(m_icon_play);
 	ui->toolbar_start->setText(tr("Play"));
@@ -1963,10 +1554,17 @@ void main_window::OnEmuPause() const
 void main_window::OnEmuStop()
 {
 	const QString title = GetCurrentTitle();
-	const QString play_tooltip = tr("Play %0").arg(title);
+	const QString play_tooltip = Emu.IsReady() ? tr("Play %0").arg(title) : tr("Resume %0").arg(title);
 
-	ui->sysPauseAct->setText(tr("&Play"));
+	m_debugger_frame->UpdateUI();
+
+	ui->sysPauseAct->setText(Emu.IsReady() ? tr("&Play") : tr("&Resume"));
+	ui->sysPauseAct->setShortcut(QKeySequence("Ctrl+R"));
 	ui->sysPauseAct->setIcon(m_icon_play);
+#ifdef _WIN32
+	m_thumb_playPause->setToolTip(play_tooltip);
+	m_thumb_playPause->setIcon(m_icon_thumb_play);
+#endif
 
 	EnableMenus(false);
 
@@ -1985,22 +1583,20 @@ void main_window::OnEmuStop()
 		ui->toolbar_start->setText(tr("Restart"));
 		ui->toolbar_start->setToolTip(restart_tooltip);
 		ui->sysRebootAct->setEnabled(true);
+#ifdef _WIN32
+		m_thumb_restart->setToolTip(restart_tooltip);
+		m_thumb_restart->setEnabled(true);
+#endif
+	}
+	ui->actionManage_Users->setEnabled(true);
+
+	if (std::exchange(m_sys_menu_opened, false))
+	{
+		ui->sysSendOpenMenuAct->setText(tr("Send open system menu cmd"));
 	}
 
-	ui->batchRemoveShaderCachesAct->setEnabled(true);
-	ui->batchRemovePPUCachesAct->setEnabled(true);
-	ui->batchRemoveSPUCachesAct->setEnabled(true);
-	ui->removeHDD1CachesAct->setEnabled(true);
-	ui->removeAllCachesAct->setEnabled(true);
-	ui->removeSavestatesAct->setEnabled(true);
-	ui->cleanUpGameListAct->setEnabled(true);
-
-	ui->actionManage_Users->setEnabled(true);
-	ui->confCamerasAct->setEnabled(true);
-	ui->actionPS_Move_Tracker->setEnabled(true);
-
 	// Refresh game list in order to update time played
-	if (m_game_list_frame && m_is_list_mode)
+	if (m_game_list_frame)
 	{
 		m_game_list_frame->Refresh();
 	}
@@ -2010,24 +1606,20 @@ void main_window::OnEmuStop()
 	{
 		m_kernel_explorer->close();
 	}
-
-	// Close systen command dialog if running
-	if (m_system_cmd_dialog)
-	{
-		m_system_cmd_dialog->close();
-	}
-
-	update_gui_pad_thread();
 }
 
 void main_window::OnEmuReady() const
 {
 	const QString title = GetCurrentTitle();
-	const QString play_tooltip = tr("Play %0").arg(title);
+	const QString play_tooltip = Emu.IsReady() ? tr("Play %0").arg(title) : tr("Resume %0").arg(title);
 
 	m_debugger_frame->EnableButtons(true);
-
-	ui->sysPauseAct->setText(tr("&Play"));
+#ifdef _WIN32
+	m_thumb_playPause->setToolTip(play_tooltip);
+	m_thumb_playPause->setIcon(m_icon_thumb_play);
+#endif
+	ui->sysPauseAct->setText(Emu.IsReady() ? tr("&Play") : tr("&Resume"));
+	ui->sysPauseAct->setShortcut(QKeySequence("Ctrl+R"));
 	ui->sysPauseAct->setIcon(m_icon_play);
 	ui->toolbar_start->setIcon(m_icon_play);
 	ui->toolbar_start->setText(tr("Play"));
@@ -2036,20 +1628,17 @@ void main_window::OnEmuReady() const
 	EnableMenus(true);
 
 	ui->actionManage_Users->setEnabled(false);
-	ui->confCamerasAct->setEnabled(false);
-	ui->actionPS_Move_Tracker->setEnabled(false);
-
-	ui->batchRemoveShaderCachesAct->setEnabled(false);
-	ui->batchRemovePPUCachesAct->setEnabled(false);
-	ui->batchRemoveSPUCachesAct->setEnabled(false);
-	ui->removeHDD1CachesAct->setEnabled(false);
-	ui->removeAllCachesAct->setEnabled(false);
-	ui->removeSavestatesAct->setEnabled(false);
-	ui->cleanUpGameListAct->setEnabled(false);
 }
 
 void main_window::EnableMenus(bool enabled) const
 {
+	// Thumbnail Buttons
+#ifdef _WIN32
+	m_thumb_playPause->setEnabled(enabled);
+	m_thumb_stop->setEnabled(enabled);
+	m_thumb_restart->setEnabled(enabled);
+#endif
+
 	// Toolbar
 	ui->toolbar_start->setEnabled(enabled);
 	ui->toolbar_stop->setEnabled(enabled);
@@ -2059,86 +1648,67 @@ void main_window::EnableMenus(bool enabled) const
 	ui->sysStopAct->setEnabled(enabled);
 	ui->sysRebootAct->setEnabled(enabled);
 
+	// PS3 Commands
+	ui->sysSendOpenMenuAct->setEnabled(enabled);
+	ui->sysSendExitAct->setEnabled(enabled);
+
 	// Tools
 	ui->toolskernel_explorerAct->setEnabled(enabled);
 	ui->toolsmemory_viewerAct->setEnabled(enabled);
 	ui->toolsRsxDebuggerAct->setEnabled(enabled);
-	ui->toolsSystemCommandsAct->setEnabled(enabled);
+	ui->toolsStringSearchAct->setEnabled(enabled);
 	ui->actionCreate_RSX_Capture->setEnabled(enabled);
-	ui->actionCreate_Savestate->setEnabled(enabled);
 }
 
-void main_window::OnAddBreakpoint(u32 addr) const
-{
-	if (m_debugger_frame)
-	{
-		m_debugger_frame->PerformAddBreakpointRequest(addr);
-	}
-}
-
-void main_window::OnEnableDiscEject(bool enabled) const
-{
-	ui->ejectDiscAct->setEnabled(enabled);
-}
-
-void main_window::OnEnableDiscInsert(bool enabled) const
-{
-	ui->insertDiscAct->setEnabled(enabled);
-}
-
-void main_window::BootRecentAction(const QAction* act, bool is_savestate)
+void main_window::BootRecentAction(const QAction* act)
 {
 	if (Emu.IsRunning())
 	{
 		return;
 	}
 
-	recent_game_wrapper& rgw = is_savestate ? m_recent_save : m_recent_game;
-	QMenu* menu = is_savestate ? ui->bootRecentSavestatesMenu : ui->bootRecentMenu;
-
 	const QString pth = act->data().toString();
-	const std::string path = pth.toStdString();
+	const std::string path = sstr(pth);
 	QString name;
 	bool contains_path = false;
 
 	int idx = -1;
-	for (int i = 0; i < rgw.entries.count(); i++)
+	for (int i = 0; i < m_rg_entries.count(); i++)
 	{
-		const auto& entry = rgw.entries[i];
-		if (entry.first == pth)
+		if (m_rg_entries.at(i).first == pth)
 		{
 			idx = i;
 			contains_path = true;
-			name = entry.second;
+			name = m_rg_entries.at(idx).second;
 			break;
 		}
 	}
 
 	// path is invalid: remove action from list return
-	if ((contains_path && name.isEmpty()) || !fs::exists(path))
+	if ((contains_path && name.isEmpty()) || (!QFileInfo(pth).isDir() && !QFileInfo(pth).isFile()))
 	{
 		if (contains_path)
 		{
 			// clear menu of actions
-			for (QAction* action : rgw.actions)
+			for (auto action : m_recent_game_acts)
 			{
-				menu->removeAction(action);
+				ui->bootRecentMenu->removeAction(action);
 			}
 
 			// remove action from list
-			rgw.entries.removeAt(idx);
-			rgw.actions.removeAt(idx);
+			m_rg_entries.removeAt(idx);
+			m_recent_game_acts.removeAt(idx);
 
-			m_gui_settings->SetValue(is_savestate ? gui::rs_entries : gui::rg_entries, gui_settings::List2Var(rgw.entries));
+			m_gui_settings->SetValue(gui::rg_entries, m_gui_settings->List2Var(m_rg_entries));
 
 			gui_log.error("Recent Game not valid, removed from Boot Recent list: %s", path);
 
 			// refill menu with actions
-			for (int i = 0; i < rgw.actions.count(); i++)
+			for (int i = 0; i < m_recent_game_acts.count(); i++)
 			{
-				rgw.actions[i]->setShortcut(QString("%0+%1").arg(is_savestate ? "Alt" : "Ctrl").arg(i + 1));
-				rgw.actions[i]->setToolTip(::at32(rgw.entries, i).second + "\n" + ::at32(rgw.entries, i).first);
-				menu->addAction(rgw.actions[i]);
+				m_recent_game_acts[i]->setShortcut(tr("Ctrl+%1").arg(i + 1));
+				m_recent_game_acts[i]->setToolTip(m_rg_entries.at(i).second);
+				ui->bootRecentMenu->addAction(m_recent_game_acts[i]);
 			}
 
 			gui_log.warning("Boot Recent list refreshed");
@@ -2153,21 +1723,19 @@ void main_window::BootRecentAction(const QAction* act, bool is_savestate)
 	Boot(path, "", true);
 }
 
-QAction* main_window::CreateRecentAction(const q_string_pair& entry, u32 sc_idx, bool is_savestate)
+QAction* main_window::CreateRecentAction(const q_string_pair& entry, const uint& sc_idx)
 {
-	recent_game_wrapper& rgw = is_savestate ? m_recent_save : m_recent_game;
-
 	// if path is not valid remove from list
 	if (entry.second.isEmpty() || (!QFileInfo(entry.first).isDir() && !QFileInfo(entry.first).isFile()))
 	{
-		if (rgw.entries.contains(entry))
+		if (m_rg_entries.contains(entry))
 		{
-			gui_log.warning("Recent Game not valid, removing from Boot Recent list: %s", entry.first);
+			gui_log.warning("Recent Game not valid, removing from Boot Recent list: %s", sstr(entry.first));
 
-			const int idx = rgw.entries.indexOf(entry);
-			rgw.entries.removeAt(idx);
+			const int idx = m_rg_entries.indexOf(entry);
+			m_rg_entries.removeAt(idx);
 
-			m_gui_settings->SetValue(is_savestate ? gui::rs_entries : gui::rg_entries, gui_settings::List2Var(rgw.entries));
+			m_gui_settings->SetValue(gui::rg_entries, m_gui_settings->List2Var(m_rg_entries));
 		}
 		return nullptr;
 	}
@@ -2182,8 +1750,8 @@ QAction* main_window::CreateRecentAction(const q_string_pair& entry, u32 sc_idx,
 	// create new action
 	QAction* act = new QAction(shown_name, this);
 	act->setData(entry.first);
-	act->setToolTip(entry.second + "\n" + entry.first);
-	act->setShortcut(QString("%0+%1").arg(is_savestate ? "Alt" : "Ctrl").arg(sc_idx));
+	act->setToolTip(entry.second);
+	act->setShortcut(tr("Ctrl+%1").arg(sc_idx));
 
 	// truncate if too long
 	if (shown_name.length() > 60)
@@ -2192,74 +1760,69 @@ QAction* main_window::CreateRecentAction(const q_string_pair& entry, u32 sc_idx,
 	}
 
 	// connect boot
-	connect(act, &QAction::triggered, this, [this, act, is_savestate](){ BootRecentAction(act, is_savestate); });
+	connect(act, &QAction::triggered, this, [act, this]() {BootRecentAction(act); });
 
 	return act;
 }
 
-void main_window::AddRecentAction(const q_string_pair& entry, bool is_savestate)
+void main_window::AddRecentAction(const q_string_pair& entry)
 {
-	QAction* freezeAction = is_savestate ? ui->freezeRecentSavestatesAct : ui->freezeRecentAct;
-
 	// don't change list on freeze
-	if (freezeAction->isChecked())
+	if (ui->freezeRecentAct->isChecked())
 	{
 		return;
 	}
 
 	// create new action, return if not valid
-	QAction* act = CreateRecentAction(entry, 1, is_savestate);
+	QAction* act = CreateRecentAction(entry, 1);
 	if (!act)
 	{
 		return;
 	}
 
-	recent_game_wrapper& rgw = is_savestate ? m_recent_save : m_recent_game;
-	QMenu* menu = is_savestate ? ui->bootRecentSavestatesMenu : ui->bootRecentMenu;
-
 	// clear menu of actions
-	for (QAction* action : rgw.actions)
+	for (auto action : m_recent_game_acts)
 	{
-		menu->removeAction(action);
+		ui->bootRecentMenu->removeAction(action);
 	}
 
 	// If path already exists, remove it in order to get it to beginning. Also remove duplicates.
-	for (int i = rgw.entries.count() - 1; i >= 0; --i)
+	for (int i = m_rg_entries.count() - 1; i >= 0; --i)
 	{
-		if (rgw.entries[i].first == entry.first)
+		if (m_rg_entries[i].first == entry.first)
 		{
-			rgw.entries.removeAt(i);
-			rgw.actions.removeAt(i);
+			m_rg_entries.removeAt(i);
+			m_recent_game_acts.removeAt(i);
 		}
 	}
 
 	// remove oldest action at the end if needed
-	if (rgw.entries.count() == 9)
+	if (m_rg_entries.count() == 9)
 	{
-		rgw.entries.removeLast();
-		rgw.actions.removeLast();
+		m_rg_entries.removeLast();
+		m_recent_game_acts.removeLast();
 	}
-	else if (rgw.entries.count() > 9)
+	else if (m_rg_entries.count() > 9)
 	{
 		gui_log.error("Recent games entrylist too big");
 	}
 
-	if (rgw.entries.count() < 9)
+	if (m_rg_entries.count() < 9)
 	{
 		// add new action at the beginning
-		rgw.entries.prepend(entry);
-		rgw.actions.prepend(act);
+		m_rg_entries.prepend(entry);
+		m_recent_game_acts.prepend(act);
 	}
 
 	// refill menu with actions
-	for (int i = 0; i < rgw.actions.count(); i++)
+	for (int i = 0; i < m_recent_game_acts.count(); i++)
 	{
-		rgw.actions[i]->setShortcut(QString("%0+%1").arg(is_savestate ? "Alt" : "Ctrl").arg(i + 1));
-		rgw.actions[i]->setToolTip(::at32(rgw.entries, i).second + "\n" + ::at32(rgw.entries, i).first);
-		menu->addAction(rgw.actions[i]);
+		m_recent_game_acts[i]->setShortcut(tr("Ctrl+%1").arg(i + 1));
+		m_recent_game_acts[i]->setToolTip(m_rg_entries.at(i).second);
+		ui->bootRecentMenu->addAction(m_recent_game_acts[i]);
 	}
 
-	m_gui_settings->SetValue(is_savestate ? gui::rs_entries : gui::rg_entries, gui_settings::List2Var(rgw.entries));
+	m_gui_settings->SetValue(gui::rg_entries, m_gui_settings->List2Var(m_rg_entries));
 }
 
 void main_window::UpdateLanguageActions(const QStringList& language_codes, const QString& language_code)
@@ -2288,21 +1851,6 @@ void main_window::UpdateLanguageActions(const QStringList& language_codes, const
 	}
 }
 
-void main_window::UpdateFilterActions()
-{
-	ui->showCatHDDGameAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::HDD_Game, m_is_list_mode));
-	ui->showCatDiscGameAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::Disc_Game, m_is_list_mode));
-	ui->showCatPS1GamesAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::PS1_Game, m_is_list_mode));
-	ui->showCatPS2GamesAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::PS2_Game, m_is_list_mode));
-	ui->showCatPSPGamesAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::PSP_Game, m_is_list_mode));
-	ui->showCatHomeAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::Home, m_is_list_mode));
-	ui->showCatAudioVideoAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::Media, m_is_list_mode));
-	ui->showCatGameDataAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::Data, m_is_list_mode));
-	ui->showCatOSAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::OS, m_is_list_mode));
-	ui->showCatUnknownAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::Unknown_Cat, m_is_list_mode));
-	ui->showCatOtherAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::Others, m_is_list_mode));
-}
-
 void main_window::RepaintGui()
 {
 	if (m_game_list_frame)
@@ -2323,12 +1871,12 @@ void main_window::RepaintGui()
 	RepaintToolBarIcons();
 	RepaintThumbnailIcons();
 
-	Q_EMIT RequestDialogRepaint();
+	Q_EMIT RequestTrophyManagerRepaint();
 }
 
-void main_window::RetranslateUI(const QStringList& language_codes, const QString& language_code)
+void main_window::RetranslateUI(const QStringList& language_codes, const QString& language)
 {
-	UpdateLanguageActions(language_codes, language_code);
+	UpdateLanguageActions(language_codes, language);
 
 	ui->retranslateUi(this);
 
@@ -2345,118 +1893,6 @@ void main_window::ShowTitleBars(bool show) const
 	m_log_frame->SetTitleBarVisible(show);
 }
 
-void main_window::ShowOptionalGamePreparations(const QString& title, const QString& message, std::map<std::string, QString> bootable_paths)
-{
-	if (bootable_paths.empty())
-	{
-		m_gui_settings->ShowInfoBox(title, message, gui::ib_pkg_success, this);
-		return;
-	}
-
-	QDialog* dlg = new QDialog(this);
-	dlg->setObjectName("game_prepare_window");
-	dlg->setWindowTitle(title);
-
-	QVBoxLayout* vlayout = new QVBoxLayout(dlg);
-
-	QCheckBox* desk_check = new QCheckBox(tr("Add desktop shortcut(s)"));
-#ifdef _WIN32
-	QCheckBox* quick_check = new QCheckBox(tr("Add Start menu shortcut(s)"));
-#elif defined(__APPLE__)
-	QCheckBox* quick_check = new QCheckBox(tr("Add dock shortcut(s)"));
-#else
-	QCheckBox* quick_check = new QCheckBox(tr("Add launcher shortcut(s)"));
-#endif
-	QCheckBox* precompile_check = new QCheckBox(tr("Precompile caches"));
-	QLabel* label = new QLabel(tr("%1\nWould you like to install shortcuts to the installed software and precompile caches? (%2 new software detected)\n\n").arg(message).arg(bootable_paths.size()), dlg);
-
-	vlayout->addWidget(label);
-	vlayout->addStretch(10);
-	vlayout->addWidget(desk_check);
-	vlayout->addStretch(3);
-	vlayout->addWidget(quick_check);
-	vlayout->addStretch(3);
-	vlayout->addWidget(precompile_check);
-	vlayout->addStretch(3);
-
-	precompile_check->setToolTip(tr("Spend time building data needed for game boot now instead of at launch."));
-
-	QDialogButtonBox* btn_box = new QDialogButtonBox(QDialogButtonBox::Ok);
-
-	vlayout->addWidget(btn_box);
-	dlg->setLayout(vlayout);
-
-	connect(btn_box, &QDialogButtonBox::accepted, this, [=, this, paths = std::move(bootable_paths)]()
-	{
-		const bool create_desktop_shortcuts = desk_check->isChecked();
-		const bool create_app_shortcut = quick_check->isChecked();
-		const bool create_caches = precompile_check->isChecked();
-
-		dlg->hide();
-		dlg->accept();
-
-		std::set<gui::utils::shortcut_location> locations;
-
-#ifdef _WIN32
-		locations.insert(gui::utils::shortcut_location::rpcs3_shortcuts);
-#endif
-		if (create_desktop_shortcuts)
-		{
-			locations.insert(gui::utils::shortcut_location::desktop);
-		}
-
-		if (create_app_shortcut)
-		{
-			locations.insert(gui::utils::shortcut_location::applications);
-		}
-
-		if (locations.empty() && !create_caches)
-		{
-			return;
-		}
-
-		std::vector<game_info> game_data;
-		std::vector<game_info> game_data_shortcuts;
-
-		for (const auto& [boot_path, title_id] : paths)
-		{
-			for (const game_info& gameinfo : m_game_list_frame->GetGameInfo())
-			{
-				if (gameinfo && gameinfo->info.serial == title_id.toStdString())
-				{
-					if (Emu.IsPathInsideDir(boot_path, gameinfo->info.path))
-					{
-						if (!locations.empty())
-						{
-							game_data_shortcuts.push_back(gameinfo);
-						}
-
-						if (create_caches)
-						{
-							game_data.push_back(gameinfo);
-						}
-					}
-
-					break;
-				}
-			}
-		}
-		
-		if (!game_data_shortcuts.empty() && !locations.empty())
-		{
-			m_game_list_frame->CreateShortcuts(game_data_shortcuts, locations);
-		}
-
-		if (!game_data.empty())
-		{
-			m_game_list_frame->BatchCreateCPUCaches(game_data);
-		}
-	});
-
-	dlg->setAttribute(Qt::WA_DeleteOnClose);
-	dlg->open();
-}
-
 void main_window::CreateActions()
 {
 	ui->exitAct->setShortcuts(QKeySequence::Quit);
@@ -2473,7 +1909,6 @@ void main_window::CreateActions()
 	m_category_visible_act_group->addAction(ui->showCatHomeAct);
 	m_category_visible_act_group->addAction(ui->showCatAudioVideoAct);
 	m_category_visible_act_group->addAction(ui->showCatGameDataAct);
-	m_category_visible_act_group->addAction(ui->showCatOSAct);
 	m_category_visible_act_group->addAction(ui->showCatUnknownAct);
 	m_category_visible_act_group->addAction(ui->showCatOtherAct);
 	m_category_visible_act_group->setExclusive(false);
@@ -2492,7 +1927,6 @@ void main_window::CreateActions()
 void main_window::CreateConnects()
 {
 	connect(ui->bootElfAct, &QAction::triggered, this, &main_window::BootElf);
-	connect(ui->bootTestAct, &QAction::triggered, this, &main_window::BootTest);
 	connect(ui->bootGameAct, &QAction::triggered, this, &main_window::BootGame);
 	connect(ui->bootVSHAct, &QAction::triggered, this, &main_window::BootVSH);
 	connect(ui->actionopen_rsx_capture, &QAction::triggered, this, [this](){ BootRsxCapture(); });
@@ -2501,56 +1935,28 @@ void main_window::CreateConnects()
 		g_user_asked_for_frame_capture = true;
 	});
 
-	connect(ui->actionCreate_Savestate, &QAction::triggered, this, []()
-	{
-		gui_log.notice("User triggered savestate creation from utilities.");
-
-		if (!g_cfg.savestate.suspend_emu)
-		{
-			Emu.after_kill_callback = []()
-			{
-				Emu.Restart();
-			};
-
-			// Make sure we keep the game window opened
-			Emu.SetContinuousMode(true);
-		}
-
-		Emu.Kill(false, true);
-	});
-
-	connect(ui->actionCreate_Savestate_And_Exit, &QAction::triggered, this, []()
-	{
-		gui_log.notice("User triggered savestate creation and emulation stop from utilities.");
-		Emu.Kill(false, true);
-	});
-
-	connect(ui->bootSavestateAct, &QAction::triggered, this, &main_window::BootSavestate);
-
 	connect(ui->addGamesAct, &QAction::triggered, this, [this]()
 	{
-		if (!m_gui_settings->GetBootConfirmation(this))
-		{
-			return;
-		}
+		QStringList paths;
 
 		// Only select one folder for now
-		QString dir = QFileDialog::getExistingDirectory(this, tr("Select a folder containing one or more games"), QString::fromStdString(fs::get_config_dir()), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
-		if (dir.isEmpty())
-		{
-			return;
-		}
+		paths << QFileDialog::getExistingDirectory(this, tr("Select a folder containing one or more games"), qstr(fs::get_config_dir()), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
 
-		QStringList paths;
-		paths << dir;
-		AddGamesFromDirs(std::move(paths));
+		if (!paths.isEmpty())
+		{
+			for (const QString& path : paths)
+			{
+				AddGamesFromDir(path);
+			}
+			m_game_list_frame->Refresh(true);
+		}
 	});
 
 	connect(ui->bootRecentMenu, &QMenu::aboutToShow, this, [this]()
 	{
 		// Enable/Disable Recent Games List
 		const bool stopped = Emu.IsStopped();
-		for (QAction* act : ui->bootRecentMenu->actions())
+		for (auto act : ui->bootRecentMenu->actions())
 		{
 			if (act != ui->freezeRecentAct && act != ui->clearRecentAct)
 			{
@@ -2559,47 +1965,19 @@ void main_window::CreateConnects()
 		}
 	});
 
-	connect(ui->bootRecentSavestatesMenu, &QMenu::aboutToShow, this, [this]()
-	{
-		// Enable/Disable Recent Savestates List
-		const bool stopped = Emu.IsStopped();
-		for (QAction* act : ui->bootRecentSavestatesMenu->actions())
-		{
-			if (act != ui->freezeRecentSavestatesAct && act != ui->clearRecentSavestatesAct)
-			{
-				act->setEnabled(stopped);
-			}
-		}
-	});
-
 	connect(ui->clearRecentAct, &QAction::triggered, this, [this]()
 	{
 		if (ui->freezeRecentAct->isChecked())
 		{
 			return;
 		}
-		m_recent_game.entries.clear();
-		for (QAction* act : m_recent_game.actions)
+		m_rg_entries.clear();
+		for (auto act : m_recent_game_acts)
 		{
 			ui->bootRecentMenu->removeAction(act);
 		}
-		m_recent_game.actions.clear();
-		m_gui_settings->SetValue(gui::rg_entries, gui_settings::List2Var(q_pair_list()));
-	});
-
-	connect(ui->clearRecentSavestatesAct, &QAction::triggered, this, [this]()
-	{
-		if (ui->freezeRecentSavestatesAct->isChecked())
-		{
-			return;
-		}
-		m_recent_save.entries.clear();
-		for (QAction* act : m_recent_save.actions)
-		{
-			ui->bootRecentSavestatesMenu->removeAction(act);
-		}
-		m_recent_save.actions.clear();
-		m_gui_settings->SetValue(gui::rs_entries, gui_settings::List2Var(q_pair_list()));
+		m_recent_game_acts.clear();
+		m_gui_settings->SetValue(gui::rg_entries, m_gui_settings->List2Var(q_pair_list()));
 	});
 
 	connect(ui->freezeRecentAct, &QAction::triggered, this, [this](bool checked)
@@ -2607,210 +1985,50 @@ void main_window::CreateConnects()
 		m_gui_settings->SetValue(gui::rg_freeze, checked);
 	});
 
-	connect(ui->freezeRecentSavestatesAct, &QAction::triggered, this, [this](bool checked)
-	{
-		m_gui_settings->SetValue(gui::rs_freeze, checked);
-	});
-
 	connect(ui->bootInstallPkgAct, &QAction::triggered, this, [this] {InstallPackages(); });
 	connect(ui->bootInstallPupAct, &QAction::triggered, this, [this] {InstallPup(); });
-
-	connect(this, &main_window::NotifyWindowCloseEvent, this, [this](bool closed)
-	{
-		if (!closed)
-		{
-			// Cancel the request
-			m_requested_show_logs_on_exit = false;
-			return;
-		}
-
-		if (!m_requested_show_logs_on_exit)
-		{
-			// Not requested
-			return;
-		}
-
-		const std::string archived_path = fs::get_log_dir() + "RPCS3.log.gz";
-		const std::string raw_file_path = fs::get_log_dir() + "RPCS3.log";
-
-		fs::stat_t raw_stat{};
-		fs::stat_t archived_stat{};
-
-		if ((!fs::get_stat(raw_file_path, raw_stat) || raw_stat.is_directory) || (!fs::get_stat(archived_path, archived_stat) || archived_stat.is_directory) || (raw_stat.size == 0 && archived_stat.size == 0))
-		{
-			QMessageBox::warning(this, tr("Failed to locate log"), tr("Failed to locate log files.\nMake sure that RPCS3.log and RPCS3.log.gz are writable and can be created without permission issues."));
-			return;
-		}
-
-		// Get new filename from title and title ID but simplified
-		QString log_filename_q = QString::fromStdString(Emu.GetTitleID().empty() ? "RPCS3" : Emu.GetTitleAndTitleID());
-		ensure(!log_filename_q.isEmpty());
-
-		// Replace unfitting characters
-		std::replace_if(log_filename_q.begin(), log_filename_q.end(), [](QChar c){ return !c.isLetterOrNumber() && c != QChar::Space && c != '[' && c != ']'; }, QChar::Space);
-		log_filename_q = log_filename_q.simplified();
-
-		const std::string log_filename = log_filename_q.toStdString();
-
-		QString path_last_log = m_gui_settings->GetValue(gui::fd_save_log).toString();
-
-		auto move_log = [](const std::string& from, const std::string& to)
-		{
-			if (from == to)
-			{
-				return false;
-			}
-
-			// Test writablity here to avoid closing the log with no *chance* of success
-			if (fs::file test_writable{to, fs::write + fs::create}; !test_writable)
-			{
-				return false;
-			}
-
-			// Close and flush log file handle (!)
-			// Cannot rename the file due to file management design
-			logs::listener::close_all_prematurely();
-
-			// Try to move it
-			if (fs::rename(from, to, true))
-			{
-				return true;
-			}
-
-			// Try to copy it if fails
-			if (fs::copy_file(from, to, true))
-			{
-				if (fs::file sync_fd{to, fs::write})
-				{
-					// Prevent data loss (expensive)
-					sync_fd.sync();
-				}
-
-				fs::remove_file(from);
-				return true;
-			}
-
-			return false;
-		};
-
-		if (archived_stat.size)
-		{
-			const QString dir_path = QFileDialog::getExistingDirectory(this, tr("Select RPCS3's log saving location (saving %0)").arg(QString::fromStdString(log_filename + ".log.gz")), path_last_log, QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
-
-			if (dir_path.isEmpty())
-			{
-				// Aborted - view the current location
-				gui::utils::open_dir(archived_path);
-				return;
-			}
-
-			const std::string dest_archived_path = dir_path.toStdString() + "/" + log_filename + ".log.gz";
-
-			if (!Emu.GetTitleID().empty() && !dest_archived_path.empty() && move_log(archived_path, dest_archived_path))
-			{
-				m_gui_settings->SetValue(gui::fd_save_log, dir_path);
-				gui_log.success("Moved log file to '%s'!", dest_archived_path);
-				gui::utils::open_dir(dest_archived_path);
-				return;
-			}
-
-			gui::utils::open_dir(archived_path);
-			return;
-		}
-
-		const QString dir_path = QFileDialog::getExistingDirectory(this, tr("Select RPCS3's log saving location (saving %0)").arg(QString::fromStdString(log_filename + ".log")), path_last_log, QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
-
-		if (dir_path.isEmpty())
-		{
-			// Aborted - view the current location
-			gui::utils::open_dir(raw_file_path);
-			return;
-		}
-
-		const std::string dest_raw_file_path = dir_path.toStdString() + "/" + log_filename + ".log";
-
-		if (!Emu.GetTitleID().empty() && !dest_raw_file_path.empty() && move_log(raw_file_path, dest_raw_file_path))
-		{
-			m_gui_settings->SetValue(gui::fd_save_log, dir_path);
-			gui_log.success("Moved log file to '%s'!", dest_raw_file_path);
-			gui::utils::open_dir(dest_raw_file_path);
-			return;
-		}
-
-		gui::utils::open_dir(raw_file_path);
-	});
-
-	connect(ui->exitAndSaveLogAct, &QAction::triggered, this, [this]()
-	{
-		m_requested_show_logs_on_exit = true;
-		close();
-	});
 	connect(ui->exitAct, &QAction::triggered, this, &QWidget::close);
 
-	connect(ui->batchCreateCPUCachesAct, &QAction::triggered, m_game_list_frame, [list = m_game_list_frame]() { list->BatchCreateCPUCaches(); });
-	connect(ui->batchRemoveCustomConfigurationsAct, &QAction::triggered, m_game_list_frame, &game_list_frame::BatchRemoveCustomConfigurations);
-	connect(ui->batchRemoveCustomPadConfigurationsAct, &QAction::triggered, m_game_list_frame, &game_list_frame::BatchRemoveCustomPadConfigurations);
-	connect(ui->batchRemoveShaderCachesAct, &QAction::triggered, m_game_list_frame, &game_list_frame::BatchRemoveShaderCaches);
+	connect(ui->batchCreatePPUCachesAct, &QAction::triggered, m_game_list_frame, &game_list_frame::BatchCreatePPUCaches);
 	connect(ui->batchRemovePPUCachesAct, &QAction::triggered, m_game_list_frame, &game_list_frame::BatchRemovePPUCaches);
 	connect(ui->batchRemoveSPUCachesAct, &QAction::triggered, m_game_list_frame, &game_list_frame::BatchRemoveSPUCaches);
-	connect(ui->removeHDD1CachesAct, &QAction::triggered, this, &main_window::RemoveHDD1Caches);
-	connect(ui->removeAllCachesAct, &QAction::triggered, this, &main_window::RemoveAllCaches);
-	connect(ui->removeSavestatesAct, &QAction::triggered, this, &main_window::RemoveSavestates);
-	connect(ui->cleanUpGameListAct, &QAction::triggered, this, &main_window::CleanUpGameList);
+	connect(ui->batchRemoveShaderCachesAct, &QAction::triggered, m_game_list_frame, &game_list_frame::BatchRemoveShaderCaches);
+	connect(ui->batchRemoveCustomConfigurationsAct, &QAction::triggered, m_game_list_frame, &game_list_frame::BatchRemoveCustomConfigurations);
+	connect(ui->batchRemoveCustomPadConfigurationsAct, &QAction::triggered, m_game_list_frame, &game_list_frame::BatchRemoveCustomPadConfigurations);
+
+	connect(ui->removeDiskCacheAct, &QAction::triggered, this, &main_window::RemoveDiskCache);
 
 	connect(ui->removeFirmwareCacheAct, &QAction::triggered, this, &main_window::RemoveFirmwareCache);
 	connect(ui->createFirmwareCacheAct, &QAction::triggered, this, &main_window::CreateFirmwareCache);
 
 	connect(ui->sysPauseAct, &QAction::triggered, this, &main_window::OnPlayOrPause);
-	connect(ui->sysStopAct, &QAction::triggered, this, []()
+	connect(ui->sysStopAct, &QAction::triggered, this, []() { Emu.Stop(); });
+	connect(ui->sysRebootAct, &QAction::triggered, this, []() { Emu.Restart(); });
+
+	connect(ui->sysSendOpenMenuAct, &QAction::triggered, this, [this]()
 	{
-		gui_log.notice("User triggered stop action in menu bar");
-		Emu.GracefulShutdown(false, true);
-	});
-	connect(ui->sysRebootAct, &QAction::triggered, this, []()
-	{
-		gui_log.notice("User triggered restart action in menu bar");
-		Emu.Restart();
+		if (Emu.IsStopped()) return;
+
+		sysutil_send_system_cmd(m_sys_menu_opened ? 0x0132 /* CELL_SYSUTIL_SYSTEM_MENU_CLOSE */ : 0x0131 /* CELL_SYSUTIL_SYSTEM_MENU_OPEN */, 0);
+		m_sys_menu_opened ^= true;
+		ui->sysSendOpenMenuAct->setText(tr("Send &%0 system menu cmd").arg(m_sys_menu_opened ? tr("close") : tr("open")));
 	});
 
-	connect(ui->ejectDiscAct, &QAction::triggered, this, []()
+	connect(ui->sysSendExitAct, &QAction::triggered, this, []()
 	{
-		gui_log.notice("User triggered eject disc action in menu bar");
-		Emu.EjectDisc();
-	});
-	connect(ui->insertDiscAct, &QAction::triggered, this, [this]()
-	{
-		gui_log.notice("User triggered insert disc action in menu bar");
+		if (Emu.IsStopped()) return;
 
-		const QString path_last_game = m_gui_settings->GetValue(gui::fd_insert_disc).toString();
-		const QString dir_path = QFileDialog::getExistingDirectory(this, tr("Select Disc Game Folder"), path_last_game, QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
-
-		if (dir_path.isEmpty())
-		{
-			return;
-		}
-
-		const game_boot_result result = Emu.InsertDisc(dir_path.toStdString());
-
-		if (result != game_boot_result::no_errors)
-		{
-			QMessageBox::warning(this, tr("Failed to insert disc"), tr("Make sure that the emulation is running and that the selected path belongs to a valid disc game."));
-			return;
-		}
-
-		m_gui_settings->SetValue(gui::fd_insert_disc, QFileInfo(dir_path).path());
+		sysutil_send_system_cmd(0x0101 /* CELL_SYSUTIL_REQUEST_EXITGAME */, 0);
 	});
 
 	const auto open_settings = [this](int tabIndex)
 	{
-		settings_dialog* dlg = new settings_dialog(m_gui_settings, m_emu_settings, tabIndex, this);
-		connect(dlg, &settings_dialog::GuiStylesheetRequest, this, &main_window::RequestGlobalStylesheetChange);
-		connect(dlg, &settings_dialog::GuiRepaintRequest, this, &main_window::RepaintGui);
-		connect(dlg, &settings_dialog::EmuSettingsApplied, this, &main_window::NotifyEmuSettingsChange);
-		connect(dlg, &settings_dialog::EmuSettingsApplied, this, &main_window::update_gui_pad_thread);
-		connect(dlg, &settings_dialog::EmuSettingsApplied, m_log_frame, &log_frame::LoadSettings);
-		dlg->setAttribute(Qt::WA_DeleteOnClose);
-		dlg->open();
+		settings_dialog dlg(m_gui_settings, m_emu_settings, tabIndex, this);
+		connect(&dlg, &settings_dialog::GuiStylesheetRequest, this, &main_window::RequestGlobalStylesheetChange);
+		connect(&dlg, &settings_dialog::GuiRepaintRequest, this, &main_window::RepaintGui);
+		connect(&dlg, &settings_dialog::EmuSettingsApplied, this, &main_window::NotifyEmuSettingsChange);
+		connect(&dlg, &settings_dialog::EmuSettingsApplied, m_log_frame, &log_frame::LoadSettings);
+		dlg.exec();
 	};
 
 	connect(ui->confCPUAct,    &QAction::triggered, this, [open_settings]() { open_settings(0); });
@@ -2822,17 +2040,6 @@ void main_window::CreateConnects()
 	connect(ui->confEmuAct,    &QAction::triggered, this, [open_settings]() { open_settings(7); });
 	connect(ui->confGuiAct,    &QAction::triggered, this, [open_settings]() { open_settings(8); });
 
-	connect(ui->confShortcutsAct, &QAction::triggered, [this]()
-	{
-		shortcut_dialog dlg(m_gui_settings, this);
-		connect(&dlg, &shortcut_dialog::saved, this, [this]()
-		{
-			m_shortcut_handler->update();
-			NotifyShortcutHandlers();
-		});
-		dlg.exec();
-	});
-
 	const auto open_pad_settings = [this]
 	{
 		pad_settings_dialog dlg(m_gui_settings, this);
@@ -2841,110 +2048,12 @@ void main_window::CreateConnects()
 
 	connect(ui->confPadsAct, &QAction::triggered, this, open_pad_settings);
 
-	connect(ui->confBuzzAct, &QAction::triggered, this, [this]
-	{
-		emulated_pad_settings_dialog* dlg = new emulated_pad_settings_dialog(emulated_pad_settings_dialog::pad_type::buzz, this);
-		dlg->show();
-	});
-
-	connect(ui->confGHLtarAct, &QAction::triggered, this, [this]
-	{
-		emulated_pad_settings_dialog* dlg = new emulated_pad_settings_dialog(emulated_pad_settings_dialog::pad_type::ghltar, this);
-		dlg->show();
-	});
-
-	connect(ui->confTurntableAct, &QAction::triggered, this, [this]
-	{
-		emulated_pad_settings_dialog* dlg = new emulated_pad_settings_dialog(emulated_pad_settings_dialog::pad_type::turntable, this);
-		dlg->show();
-	});
-
-	connect(ui->confUSIOAct, &QAction::triggered, this, [this]
-	{
-		emulated_pad_settings_dialog* dlg = new emulated_pad_settings_dialog(emulated_pad_settings_dialog::pad_type::usio, this);
-		dlg->show();
-	});
-
-	connect(ui->confPSMoveMouseAct, &QAction::triggered, this, [this]
-	{
-		emulated_pad_settings_dialog* dlg = new emulated_pad_settings_dialog(emulated_pad_settings_dialog::pad_type::mousegem, this);
-		dlg->show();
-	});
-
-	connect(ui->confPSMoveDS3Act, &QAction::triggered, this, [this]
-	{
-		emulated_pad_settings_dialog* dlg = new emulated_pad_settings_dialog(emulated_pad_settings_dialog::pad_type::ds3gem, this);
-		dlg->show();
-	});
-
-	connect(ui->confPSMoveAct, &QAction::triggered, this, [this]
-	{
-		emulated_pad_settings_dialog* dlg = new emulated_pad_settings_dialog(emulated_pad_settings_dialog::pad_type::gem, this);
-		dlg->show();
-	});
-
-	connect(ui->confGunCon3Act, &QAction::triggered, this, [this]
-	{
-		emulated_pad_settings_dialog* dlg = new emulated_pad_settings_dialog(emulated_pad_settings_dialog::pad_type::guncon3, this);
-		dlg->show();
-	});
-
-	connect(ui->confTopShotEliteAct, &QAction::triggered, this, [this]
-	{
-		emulated_pad_settings_dialog* dlg = new emulated_pad_settings_dialog(emulated_pad_settings_dialog::pad_type::topshotelite, this);
-		dlg->show();
-	});
-
-	connect(ui->confTopShotFearmasterAct, &QAction::triggered, this, [this]
-	{
-		emulated_pad_settings_dialog* dlg = new emulated_pad_settings_dialog(emulated_pad_settings_dialog::pad_type::topshotfearmaster, this);
-		dlg->show();
-	});
-
-#ifndef HAVE_SDL3
-	ui->confLogitechG27Act->setVisible(false);
-#else
-	connect(ui->confLogitechG27Act, &QAction::triggered, this, [this]
-	{
-		emulated_logitech_g27_settings_dialog* dlg = new emulated_logitech_g27_settings_dialog(this);
-		dlg->show();
-	});
-#endif
-
-	connect(ui->actionBasic_Mouse, &QAction::triggered, this, [this]
-	{
-		basic_mouse_settings_dialog* dlg = new basic_mouse_settings_dialog(this);
-		dlg->show();
-	});
-
-#ifndef _WIN32
-	ui->actionRaw_Mouse->setVisible(false);
-#else
-	connect(ui->actionRaw_Mouse, &QAction::triggered, this, [this]
-	{
-		raw_mouse_settings_dialog* dlg = new raw_mouse_settings_dialog(this);
-		dlg->show();
-	});
-#endif
-
-	connect(ui->confCamerasAct, &QAction::triggered, this, [this]()
-	{
-		camera_settings_dialog dlg(this);
-		dlg.exec();
-	});
-
 	connect(ui->confRPCNAct, &QAction::triggered, this, [this]()
 	{
 		rpcn_settings_dialog dlg(this);
 		dlg.exec();
 	});
 
-	connect(ui->confIPCAct, &QAction::triggered, this, [this]()
-	{
-		ipc_settings_dialog dlg(this);
-		dlg.exec();
-	});
-
 	connect(ui->confAutopauseManagerAct, &QAction::triggered, this, [this]()
 	{
 		auto_pause_settings_dialog dlg(this);
@@ -2953,52 +2062,32 @@ void main_window::CreateConnects()
 
 	connect(ui->confVFSDialogAct, &QAction::triggered, this, [this]()
 	{
-		vfs_dialog dlg(m_gui_settings, this);
+		vfs_dialog dlg(m_gui_settings, m_emu_settings, this);
 		dlg.exec();
-		ui->bootVSHAct->setEnabled(fs::is_file(g_cfg_vfs.get_dev_flash() + "vsh/module/vsh.self")); // dev_flash may have changed. Disable vsh if not present.
+		ui->bootVSHAct->setEnabled(fs::is_file(g_cfg.vfs.get_dev_flash() + "vsh/module/vsh.self")); // dev_flash may have changed. Disable vsh if not present.
 		m_game_list_frame->Refresh(true); // dev_hdd0 may have changed. Refresh just in case.
 	});
 
 	connect(ui->confSavedataManagerAct, &QAction::triggered, this, [this]
 	{
 		save_manager_dialog* save_manager = new save_manager_dialog(m_gui_settings, m_persistent_settings);
-		connect(this, &main_window::RequestDialogRepaint, save_manager, &save_manager_dialog::HandleRepaintUiRequest);
+		connect(this, &main_window::RequestTrophyManagerRepaint, save_manager, &save_manager_dialog::HandleRepaintUiRequest);
 		save_manager->show();
 	});
 
 	connect(ui->actionManage_Trophy_Data, &QAction::triggered, this, [this]
 	{
 		trophy_manager_dialog* trop_manager = new trophy_manager_dialog(m_gui_settings);
-		connect(this, &main_window::RequestDialogRepaint, trop_manager, &trophy_manager_dialog::HandleRepaintUiRequest);
+		connect(this, &main_window::RequestTrophyManagerRepaint, trop_manager, &trophy_manager_dialog::HandleRepaintUiRequest);
 		trop_manager->show();
 	});
 
-	connect(ui->actionManage_Savestates, &QAction::triggered, this, [this]
-	{
-		savestate_manager_dialog* manager = new savestate_manager_dialog(m_gui_settings, m_game_list_frame->GetGameInfo());
-		connect(this, &main_window::RequestDialogRepaint, manager, &savestate_manager_dialog::HandleRepaintUiRequest);
-		connect(manager, &savestate_manager_dialog::RequestBoot, this, [this](const std::string& path) { Boot(path, "", true); });
-		manager->show();
-	});
-
 	connect(ui->actionManage_Skylanders_Portal, &QAction::triggered, this, [this]
 	{
 		skylander_dialog* sky_diag = skylander_dialog::get_dlg(this);
 		sky_diag->show();
 	});
 
-	connect(ui->actionManage_Infinity_Base, &QAction::triggered, this, [this]
-	{
-		infinity_dialog* inf_dlg = infinity_dialog::get_dlg(this);
-		inf_dlg->show();
-	});
-
-	connect(ui->actionManage_Dimensions_ToyPad, &QAction::triggered, this, [this]
-	{
-		dimensions_dialog* dim_dlg = dimensions_dialog::get_dlg(this);
-		dim_dlg->show();
-	});
-
 	connect(ui->actionManage_Cheats, &QAction::triggered, this, [this]
 	{
 		cheat_manager_dialog* cheat_manager = cheat_manager_dialog::get_dlg(this);
@@ -3007,16 +2096,21 @@ void main_window::CreateConnects()
 
 	connect(ui->actionManage_Game_Patches, &QAction::triggered, this, [this]
 	{
-		patch_manager_dialog patch_manager(m_gui_settings, m_game_list_frame ? m_game_list_frame->GetGameInfo() : std::vector<game_info>{}, "", "", this);
+		std::unordered_map<std::string, std::set<std::string>> games;
+		if (m_game_list_frame)
+		{
+			for (const auto& game : m_game_list_frame->GetGameInfo())
+			{
+				if (game)
+				{
+					games[game->info.serial].insert(game_list_frame::GetGameVersion(game));
+				}
+			}
+		}
+		patch_manager_dialog patch_manager(m_gui_settings, games, "", "", this);
 		patch_manager.exec();
  	});
 
-	connect(ui->patchCreatorAct, &QAction::triggered, this, [this]
-	{
-		patch_creator_dialog patch_creator(this);
-		patch_creator.exec();
-	});
-
 	connect(ui->actionManage_Users, &QAction::triggered, this, [this]
 	{
 		user_manager_dialog user_manager(m_gui_settings, m_persistent_settings, this);
@@ -3043,68 +2137,6 @@ void main_window::CreateConnects()
 		viewer->show_log();
 	});
 
-	connect(ui->actionPS_Move_Tracker, &QAction::triggered, this, [this]
-	{
-		ps_move_tracker_dialog* dlg = new ps_move_tracker_dialog(this);
-		dlg->open();
-	});
-
-	connect(ui->toolsCheckConfigAct, &QAction::triggered, this, [this]
-	{
-		const QString path_last_cfg = m_gui_settings->GetValue(gui::fd_cfg_check).toString();
-		const QString file_path = QFileDialog::getOpenFileName(this, tr("Select rpcs3.log or config.yml"), path_last_cfg, tr("Log or Config files (*.log *.gz *.txt *.yml);;Log files (*.log *.gz);;Config Files (*.yml);;Text Files (*.txt);;All files (*.*)"));
-		if (file_path.isEmpty())
-		{
-			// Aborted
-			return;
-		}
-
-		const QFileInfo file_info(file_path);
-
-		if (file_info.isExecutable() || !(file_path.endsWith(".log") || file_path.endsWith(".log.gz") || file_path.endsWith(".txt") || file_path.endsWith(".yml")))
-		{
-			if (QMessageBox::question(this, tr("Weird file!"), tr("This file seems to have an unexpected type:\n%0\n\nCheck anyway?").arg(file_path)) != QMessageBox::Yes)
-			{
-				return;
-			}
-		}
-
-		bool failed = false;
-		QString content;
-
-		if (file_path.endsWith(".gz"))
-		{
-			if (fs::file file{file_path.toStdString()})
-			{
-				const std::vector<u8> decompressed = unzip(file.to_vector<u8>());
-				content = QString::fromUtf8(reinterpret_cast<const char*>(decompressed.data()), decompressed.size());
-			}
-			else
-			{
-				failed = true;
-			}
-		}
-		else if (QFile file(file_path); file.exists() && file.open(QIODevice::ReadOnly))
-		{
-			content = file.readAll();
-		}
-		else
-		{
-			failed = true;
-		}
-
-		if (failed)
-		{
-			QMessageBox::warning(this, tr("Failed to open file"), tr("The file could not be opened:\n%0").arg(file_path));
-			return;
-		}
-
-		m_gui_settings->SetValue(gui::fd_cfg_check, file_info.path());
-
-		config_checker* dlg = new config_checker(this, content, file_path.endsWith(".log") || file_path.endsWith(".log.gz"));
-		dlg->open();
-	});
-
 	connect(ui->toolskernel_explorerAct, &QAction::triggered, this, [this]
 	{
 		if (!m_kernel_explorer)
@@ -3119,7 +2151,7 @@ void main_window::CreateConnects()
 	connect(ui->toolsmemory_viewerAct, &QAction::triggered, this, [this]
 	{
 		if (!Emu.IsStopped())
-			idm::make<memory_viewer_handle>(this, make_basic_ppu_disasm());
+			idm::make<memory_viewer_handle>(this);
 	});
 
 	connect(ui->toolsRsxDebuggerAct, &QAction::triggered, this, [this]
@@ -3128,15 +2160,10 @@ void main_window::CreateConnects()
 		rsx->show();
 	});
 
-	connect(ui->toolsSystemCommandsAct, &QAction::triggered, this, [this]
+	connect(ui->toolsStringSearchAct, &QAction::triggered, this, [this]
 	{
-		if (Emu.IsStopped()) return;
-		if (!m_system_cmd_dialog)
-		{
-			m_system_cmd_dialog = new system_cmd_dialog(this);
-			connect(m_system_cmd_dialog, &QDialog::finished, this, [this]() { m_system_cmd_dialog = nullptr; });
-		}
-		m_system_cmd_dialog->show();
+		memory_string_searcher* mss = new memory_string_searcher(this);
+		mss->show();
 	});
 
 	connect(ui->toolsDecryptSprxLibsAct, &QAction::triggered, this, &main_window::DecryptSPRXLibraries);
@@ -3147,18 +2174,6 @@ void main_window::CreateConnects()
 
 	connect(ui->toolsExtractTARAct, &QAction::triggered, this, &main_window::ExtractTar);
 
-	connect(ui->toolsVfsDialogAct, &QAction::triggered, this, [this]()
-	{
-		vfs_tool_dialog* dlg = new vfs_tool_dialog(this);
-		dlg->show();
-	});
-
-	connect(ui->actionMusic_Player, &QAction::triggered, this, [this]()
-	{
-		music_player_dialog* dlg = new music_player_dialog(this);
-		dlg->open();
-	});
-
 	connect(ui->showDebuggerAct, &QAction::triggered, this, [this](bool checked)
 	{
 		checked ? m_debugger_frame->show() : m_debugger_frame->hide();
@@ -3203,88 +2218,44 @@ void main_window::CreateConnects()
 		m_game_list_frame->Refresh(true);
 	});
 
-	const auto get_cats = [this](QAction* act, int& id) -> QStringList
+	connect(m_category_visible_act_group, &QActionGroup::triggered, this, [this](QAction* act)
 	{
 		QStringList categories;
-		if      (act == ui->showCatHDDGameAct)    { categories.append(cat::cat_hdd_game);  id = Category::HDD_Game;    }
-		else if (act == ui->showCatDiscGameAct)   { categories.append(cat::cat_disc_game); id = Category::Disc_Game;   }
-		else if (act == ui->showCatPS1GamesAct)   { categories.append(cat::cat_ps1_game);  id = Category::PS1_Game;    }
-		else if (act == ui->showCatPS2GamesAct)   { categories.append(cat::ps2_games);     id = Category::PS2_Game;    }
-		else if (act == ui->showCatPSPGamesAct)   { categories.append(cat::psp_games);     id = Category::PSP_Game;    }
-		else if (act == ui->showCatHomeAct)       { categories.append(cat::cat_home);      id = Category::Home;        }
-		else if (act == ui->showCatAudioVideoAct) { categories.append(cat::media);         id = Category::Media;       }
-		else if (act == ui->showCatGameDataAct)   { categories.append(cat::data);          id = Category::Data;        }
-		else if (act == ui->showCatOSAct)         { categories.append(cat::os);            id = Category::OS;          }
-		else if (act == ui->showCatUnknownAct)    { categories.append(cat::cat_unknown);   id = Category::Unknown_Cat; }
-		else if (act == ui->showCatOtherAct)      { categories.append(cat::others);        id = Category::Others;      }
-		else { gui_log.warning("categoryVisibleActGroup: category action not found"); }
-		return categories;
-	};
-
-	connect(m_category_visible_act_group, &QActionGroup::triggered, this, [this, get_cats](QAction* act)
-	{
 		int id = 0;
-		const QStringList categories = get_cats(act, id);
+		const bool checked = act->isChecked();
+
+		if      (act == ui->showCatHDDGameAct)    { categories += cat::cat_hdd_game;  id = Category::HDD_Game;    }
+		else if (act == ui->showCatDiscGameAct)   { categories += cat::cat_disc_game; id = Category::Disc_Game;   }
+		else if (act == ui->showCatPS1GamesAct)   { categories += cat::cat_ps1_game;  id = Category::PS1_Game;    }
+		else if (act == ui->showCatPS2GamesAct)   { categories += cat::ps2_games;     id = Category::PS2_Game;    }
+		else if (act == ui->showCatPSPGamesAct)   { categories += cat::psp_games;     id = Category::PSP_Game;    }
+		else if (act == ui->showCatHomeAct)       { categories += cat::cat_home;      id = Category::Home;        }
+		else if (act == ui->showCatAudioVideoAct) { categories += cat::media;         id = Category::Media;       }
+		else if (act == ui->showCatGameDataAct)   { categories += cat::data;          id = Category::Data;        }
+		else if (act == ui->showCatUnknownAct)    { categories += cat::cat_unknown;   id = Category::Unknown_Cat; }
+		else if (act == ui->showCatOtherAct)      { categories += cat::others;        id = Category::Others;      }
+		else gui_log.warning("categoryVisibleActGroup: category action not found");
 
 		if (!categories.isEmpty())
 		{
-			const bool checked = act->isChecked();
 			m_game_list_frame->ToggleCategoryFilter(categories, checked);
-			m_gui_settings->SetCategoryVisibility(id, checked, m_is_list_mode);
+			m_gui_settings->SetCategoryVisibility(id, checked);
 		}
 	});
 
-	connect(ui->menuGame_Categories, &QMenu::aboutToShow, ui->menuGame_Categories, [this, get_cats]()
-	{
-		const auto set_cat_count = [&](QAction* act, const QString& text)
-		{
-			int count = 0;
-			int id = 0; // Unused
-			const QStringList categories = get_cats(act, id);
-			for (const game_info& game : m_game_list_frame->GetGameInfo())
-			{
-				if (game && categories.contains(QString::fromStdString(game->info.category))) count++;
-			}
-			act->setText(QString("%0 (%1)").arg(text).arg(count));
-		};
-
-		set_cat_count(ui->showCatHDDGameAct, tr("HDD Games"));
-		set_cat_count(ui->showCatDiscGameAct, tr("Disc Games"));
-		set_cat_count(ui->showCatPS1GamesAct, tr("PS1 Games"));
-		set_cat_count(ui->showCatPS2GamesAct, tr("PS2 Games"));
-		set_cat_count(ui->showCatPSPGamesAct, tr("PSP Games"));
-		set_cat_count(ui->showCatHomeAct, tr("Home"));
-		set_cat_count(ui->showCatAudioVideoAct, tr("Audio/Video"));
-		set_cat_count(ui->showCatGameDataAct, tr("Game Data"));
-		set_cat_count(ui->showCatOSAct, tr("Operating System"));
-		set_cat_count(ui->showCatUnknownAct, tr("Unknown"));
-		set_cat_count(ui->showCatOtherAct, tr("Other"));
-	});
-
 	connect(ui->updateAct, &QAction::triggered, this, [this]()
 	{
-#ifdef RPCS3_UPDATE_SUPPORTED
-		m_updater.check_for_updates(false, false, false, this);
-#else
-		QMessageBox::warning(this, tr("Auto-updater"), tr("The auto-updater isn't available for your OS currently."));
+#if !defined(_WIN32) && !defined(__linux__)
+		QMessageBox::warning(this, tr("Auto-updater"), tr("The auto-updater currently isn't available for your os."));
+		return;
 #endif
-	});
-
-	connect(ui->welcomeAct, &QAction::triggered, this, [this]()
-	{
-		welcome_dialog* welcome = new welcome_dialog(m_gui_settings, true, this);
-		welcome->open();
-	});
-
-	connect(ui->supportAct, &QAction::triggered, this, [this]
-	{
-		QDesktopServices::openUrl(QUrl("https://rpcs3.net/patreon"));
+		m_updater.check_for_updates(false, false, false, this);
 	});
 
 	connect(ui->aboutAct, &QAction::triggered, this, [this]
 	{
-		about_dialog* dlg = new about_dialog(this);
-		dlg->open();
+		about_dialog dlg(this);
+		dlg.exec();
 	});
 
 	connect(ui->aboutQtAct, &QAction::triggered, qApp, &QApplication::aboutQt);
@@ -3309,7 +2280,6 @@ void main_window::CreateConnects()
 		ResizeIcons(index);
 	});
 
-	connect(ui->actionPreferGameDataIcons, &QAction::triggered, m_game_list_frame, &game_list_frame::SetPreferGameDataIcons);
 	connect(ui->showCustomIconsAct, &QAction::triggered, m_game_list_frame, &game_list_frame::SetShowCustomIcons);
 	connect(ui->playHoverGifsAct, &QAction::triggered, m_game_list_frame, &game_list_frame::SetPlayHoverGifs);
 
@@ -3333,17 +2303,12 @@ void main_window::CreateConnects()
 
 		m_is_list_mode = is_list_act;
 		m_game_list_frame->SetListMode(m_is_list_mode);
-
-		UpdateFilterActions();
+		m_category_visible_act_group->setEnabled(m_is_list_mode);
 	});
 
 	connect(ui->toolbar_open, &QAction::triggered, this, &main_window::BootGame);
 	connect(ui->toolbar_refresh, &QAction::triggered, this, [this]() { m_game_list_frame->Refresh(true); });
-	connect(ui->toolbar_stop, &QAction::triggered, this, []()
-	{
-		gui_log.notice("User triggered stop action in toolbar");
-		Emu.GracefulShutdown(false);
-	});
+	connect(ui->toolbar_stop, &QAction::triggered, this, []() { Emu.Stop(); });
 	connect(ui->toolbar_start, &QAction::triggered, this, &main_window::OnPlayOrPause);
 
 	connect(ui->toolbar_fullscreen, &QAction::triggered, this, [this]
@@ -3381,8 +2346,6 @@ void main_window::CreateConnects()
 	});
 
 	connect(ui->mw_searchbar, &QLineEdit::textChanged, m_game_list_frame, &game_list_frame::SetSearchText);
-	connect(ui->mw_searchbar, &QLineEdit::returnPressed, m_game_list_frame, &game_list_frame::FocusAndSelectFirstEntryIfNoneIs);
-	connect(m_game_list_frame, &game_list_frame::FocusToSearchBar, this, [this]() { ui->mw_searchbar->setFocus(); });
 }
 
 void main_window::CreateDockWindows()
@@ -3414,29 +2377,6 @@ void main_window::CreateDockWindows()
 		}
 	});
 
-	connect(m_log_frame, &log_frame::PerformGoToOnDebugger, this, [this](const QString& text_argument, bool is_address, bool test_only, std::shared_ptr<bool> signal_accepted)
-	{
-		if (m_debugger_frame && m_debugger_frame->isVisible())
-		{
-			if (signal_accepted)
-			{
-				*signal_accepted = true;
-			}
-
-			if (!test_only)
-			{
-				if (is_address)
-				{
-					m_debugger_frame->PerformGoToRequest(text_argument);
-				}
-				else
-				{
-					m_debugger_frame->PerformGoToThreadRequest(text_argument);
-				}
-			}
-		}
-	});
-
 	connect(m_debugger_frame, &debugger_frame::DebugFrameClosed, this, [this]()
 	{
 		if (ui->showDebuggerAct->isChecked())
@@ -3470,14 +2410,14 @@ void main_window::CreateDockWindows()
 
 				if (title_and_title_id == Emu.GetTitleAndTitleID()) // This should usually not cause trouble, but feel free to improve.
 				{
-					tooltip = tr("Restart %0").arg(QString::fromStdString(title_and_title_id));
+					tooltip = tr("Restart %0").arg(qstr(title_and_title_id));
 
 					ui->toolbar_start->setIcon(m_icon_restart);
 					ui->toolbar_start->setText(tr("Restart"));
 				}
 				else
 				{
-					tooltip = tr("Play %0").arg(QString::fromStdString(title_and_title_id));
+					tooltip = tr("Play %0").arg(qstr(title_and_title_id));
 
 					ui->toolbar_start->setIcon(m_icon_play);
 					ui->toolbar_start->setText(tr("Play"));
@@ -3491,16 +2431,16 @@ void main_window::CreateDockWindows()
 
 					ui->toolbar_start->setIcon(m_icon_play);
 				}
-				else if (const std::string& path = Emu.GetLastBoot(); !path.empty()) // Restartable games
+				else if (const auto& path = Emu.GetBoot(); !path.empty()) // Restartable games
 				{
 					tooltip = tr("Restart %0").arg(GetCurrentTitle());
 
 					ui->toolbar_start->setIcon(m_icon_restart);
 					ui->toolbar_start->setText(tr("Restart"));
 				}
-				else if (!m_recent_game.actions.isEmpty()) // Get last played game
+				else if (!m_recent_game_acts.isEmpty()) // Get last played game
 				{
-					tooltip = tr("Play %0").arg(m_recent_game.actions.first()->text());
+					tooltip = tr("Play %0").arg(m_recent_game_acts.first()->text());
 				}
 				else
 				{
@@ -3514,19 +2454,25 @@ void main_window::CreateDockWindows()
 
 			ui->toolbar_start->setEnabled(enable_play_buttons);
 			ui->sysPauseAct->setEnabled(enable_play_buttons);
+#ifdef _WIN32
+			m_thumb_playPause->setEnabled(enable_play_buttons);
+#endif
 
 			if (!tooltip.isEmpty())
 			{
 				ui->toolbar_start->setToolTip(tooltip);
+#ifdef _WIN32
+				m_thumb_playPause->setToolTip(tooltip);
+#endif
 			}
 		}
 
 		m_selected_game = game;
 	});
 
-	connect(m_game_list_frame, &game_list_frame::RequestBoot, this, [this](const game_info& game, cfg_mode config_mode, const std::string& config_path, const std::string& savestate)
+	connect(m_game_list_frame, &game_list_frame::RequestBoot, this, [this](const game_info& game, bool force_global_config)
 	{
-		Boot(savestate.empty() ? game->info.path : savestate, game->info.serial, false, false, config_mode, config_path);
+		Boot(game->info.path, game->info.serial, false, false, force_global_config);
 	});
 
 	connect(m_game_list_frame, &game_list_frame::NotifyEmuSettingsChange, this, &main_window::NotifyEmuSettingsChange);
@@ -3546,45 +2492,35 @@ void main_window::ConfigureGuiFromSettings()
 	m_mw->restoreState(m_gui_settings->GetValue(gui::mw_mwState).toByteArray());
 
 	ui->freezeRecentAct->setChecked(m_gui_settings->GetValue(gui::rg_freeze).toBool());
-	ui->freezeRecentSavestatesAct->setChecked(m_gui_settings->GetValue(gui::rs_freeze).toBool());
-	m_recent_game.entries = gui_settings::Var2List(m_gui_settings->GetValue(gui::rg_entries));
-	m_recent_save.entries = gui_settings::Var2List(m_gui_settings->GetValue(gui::rs_entries));
+	m_rg_entries = m_gui_settings->Var2List(m_gui_settings->GetValue(gui::rg_entries));
 
-	const auto update_recent_games_menu = [this](bool is_savestate)
+	// clear recent games menu of actions
+	for (auto act : m_recent_game_acts)
 	{
-		recent_game_wrapper& rgw = is_savestate ? m_recent_save : m_recent_game;
-		QMenu* menu = is_savestate ? ui->bootRecentSavestatesMenu : ui->bootRecentMenu;
+		ui->bootRecentMenu->removeAction(act);
+	}
+	m_recent_game_acts.clear();
 
-		// clear recent games menu of actions
-		for (QAction* act : rgw.actions)
+	// Fill the recent games menu
+	for (int i = 0; i < m_rg_entries.count(); i++)
+	{
+		// adjust old unformatted entries (avoid duplication)
+		m_rg_entries[i] = gui::Recent_Game(m_rg_entries[i].first, m_rg_entries[i].second);
+
+		// create new action
+		QAction* act = CreateRecentAction(m_rg_entries[i], i + 1);
+
+		// add action to menu
+		if (act)
 		{
-			menu->removeAction(act);
+			m_recent_game_acts.append(act);
+			ui->bootRecentMenu->addAction(act);
 		}
-		rgw.actions.clear();
-
-		// Fill the recent games menu
-		for (int i = 0; i < rgw.entries.count(); i++)
+		else
 		{
-			// adjust old unformatted entries (avoid duplication)
-			rgw.entries[i] = gui::Recent_Game(rgw.entries[i].first, rgw.entries[i].second);
-
-			// create new action
-			QAction* act = CreateRecentAction(rgw.entries[i], i + 1, is_savestate);
-
-			// add action to menu
-			if (act)
-			{
-				rgw.actions.append(act);
-				menu->addAction(act);
-			}
-			else
-			{
-				i--; // list count is now an entry shorter so we have to repeat the same index in order to load all other entries
-			}
+			i--; // list count is now an entry shorter so we have to repeat the same index in order to load all other entries
 		}
-	};
-	update_recent_games_menu(false);
-	update_recent_games_menu(true);
+	}
 
 	ui->showLogAct->setChecked(m_gui_settings->GetValue(gui::mw_logger).toBool());
 	ui->showGameListAct->setChecked(m_gui_settings->GetValue(gui::mw_gamelist).toBool());
@@ -3603,19 +2539,27 @@ void main_window::ConfigureGuiFromSettings()
 	m_game_list_frame->SetShowHidden(ui->showHiddenEntriesAct->isChecked()); // prevent GetValue in m_game_list_frame->LoadSettings
 
 	ui->showCompatibilityInGridAct->setChecked(m_gui_settings->GetValue(gui::gl_draw_compat).toBool());
-	ui->actionPreferGameDataIcons->setChecked(m_gui_settings->GetValue(gui::gl_pref_gd_icon).toBool());
 	ui->showCustomIconsAct->setChecked(m_gui_settings->GetValue(gui::gl_custom_icon).toBool());
 	ui->playHoverGifsAct->setChecked(m_gui_settings->GetValue(gui::gl_hover_gifs).toBool());
 
-	m_is_list_mode = m_gui_settings->GetValue(gui::gl_listMode).toBool();
-
-	UpdateFilterActions();
+	ui->showCatHDDGameAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::HDD_Game));
+	ui->showCatDiscGameAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::Disc_Game));
+	ui->showCatPS1GamesAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::PS1_Game));
+	ui->showCatPS2GamesAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::PS2_Game));
+	ui->showCatPSPGamesAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::PSP_Game));
+	ui->showCatHomeAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::Home));
+	ui->showCatAudioVideoAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::Media));
+	ui->showCatGameDataAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::Data));
+	ui->showCatUnknownAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::Unknown_Cat));
+	ui->showCatOtherAct->setChecked(m_gui_settings->GetCategoryVisibility(Category::Others));
 
 	// handle icon size options
+	m_is_list_mode = m_gui_settings->GetValue(gui::gl_listMode).toBool();
 	if (m_is_list_mode)
 		ui->setlistModeListAct->setChecked(true);
 	else
 		ui->setlistModeGridAct->setChecked(true);
+	m_category_visible_act_group->setEnabled(m_is_list_mode);
 
 	const int icon_size_index = m_gui_settings->GetValue(m_is_list_mode ? gui::gl_iconSize : gui::gl_iconSizeGrid).toInt();
 	m_other_slider_pos = m_gui_settings->GetValue(!m_is_list_mode ? gui::gl_iconSize : gui::gl_iconSizeGrid).toInt();
@@ -3645,102 +2589,20 @@ void main_window::SetIconSizeActions(int idx) const
 		ui->setIconSizeLargeAct->setChecked(true);
 }
 
-void main_window::RemoveHDD1Caches()
+void main_window::RemoveDiskCache()
 {
-	if (fs::remove_all(rpcs3::utils::get_hdd1_dir() + "caches", false))
+	const std::string cache_dir = rpcs3::utils::get_hdd1_dir() + "/caches";
+
+	if (fs::is_dir(cache_dir) && fs::remove_all(cache_dir, false))
 	{
-		QMessageBox::information(this, tr("HDD1 Caches Removed"), tr("HDD1 caches successfully removed"));
+		QMessageBox::information(this, tr("Cache Cleared"), tr("Disk cache was cleared successfully"));
 	}
 	else
 	{
-		QMessageBox::warning(this, tr("Error"), tr("Could not remove HDD1 caches"));
+		QMessageBox::warning(this, tr("Error"), tr("Could not remove disk cache"));
 	}
 }
 
-void main_window::RemoveAllCaches()
-{
-	if (QMessageBox::question(this, tr("Confirm Removal"), tr("Remove all caches?")) != QMessageBox::Yes)
-		return;
-
-	const std::string cache_base_dir = rpcs3::utils::get_cache_dir();
-	u64 caches_count = 0;
-	u64 caches_removed = 0;
-
-	for (const game_info& game : m_game_list_frame->GetGameInfo()) // Loop on detected games
-	{
-		if (game && QString::fromStdString(game->info.category) != cat::cat_ps3_os && fs::exists(cache_base_dir + game->info.serial)) // If not OS category and cache exists
-		{
-			caches_count++;
-
-			if (fs::remove_all(cache_base_dir + game->info.serial))
-			{
-				caches_removed++;
-			}
-		}
-	}
-
-	if (caches_count == caches_removed)
-	{
-		QMessageBox::information(this, tr("Caches Removed"), tr("%0 cache(s) successfully removed").arg(caches_removed));
-	}
-	else
-	{
-		QMessageBox::warning(this, tr("Error"), tr("Could not remove %0 of %1 cache(s)").arg(caches_count - caches_removed).arg(caches_count));
-	}
-
-	RemoveHDD1Caches();
-}
-
-void main_window::RemoveSavestates()
-{
-	if (QMessageBox::question(this, tr("Confirm Removal"), tr("Remove savestates?")) != QMessageBox::Yes)
-		return;
-
-	if (fs::remove_all(fs::get_config_dir() + "savestates", false))
-	{
-		QMessageBox::information(this, tr("Savestates Removed"), tr("Savestates successfully removed"));
-	}
-	else
-	{
-		QMessageBox::warning(this, tr("Error"), tr("Could not remove savestates"));
-	}
-}
-
-void main_window::CleanUpGameList()
-{
-	if (QMessageBox::question(this, tr("Confirm Removal"), tr("Remove invalid game paths from game list?\n"
-		"Undetectable games (zombies) as well as corrupted games will be removed from the game list file (games.yml)")) != QMessageBox::Yes)
-	{
-		return;
-	}
-
-	// List of serials (title id) to remove in "games.yml" file (if any)
-	std::vector<std::string> serials_to_remove_from_yml{};
-
-	for (const auto& [serial, path] : Emu.GetGamesConfig().get_games()) // Loop on game list file
-	{
-		bool found = false;
-
-		for (const game_info& game : m_game_list_frame->GetGameInfo()) // Loop on detected games
-		{
-			// If Disc Game and its serial is found in game list file
-			if (game && QString::fromStdString(game->info.category) == cat::cat_disc_game && game->info.serial == serial)
-			{
-				found = true;
-				break;
-			}
-		}
-
-		if (!found) // If serial not found, add it to the removal list
-		{
-			serials_to_remove_from_yml.push_back(serial);
-		}
-	}
-
-	// Remove the found serials (title id) in "games.yml" file (if any)
-	QMessageBox::information(this, tr("Summary"), tr("%0 game(s) removed from game list").arg(Emu.RemoveGames(serials_to_remove_from_yml)));
-}
-
 void main_window::RemoveFirmwareCache()
 {
 	const std::string cache_dir = rpcs3::utils::get_cache_dir();
@@ -3756,7 +2618,7 @@ void main_window::RemoveFirmwareCache()
 
 	const QStringList filter{ QStringLiteral("ppu-*-lib*.sprx")};
 
-	QDirIterator dir_iter(QString::fromStdString(cache_dir), filter, QDir::Dirs | QDir::NoDotAndDotDot);
+	QDirIterator dir_iter(qstr(cache_dir), filter, QDir::Dirs | QDir::NoDotAndDotDot);
 
 	while (dir_iter.hasNext())
 	{
@@ -3765,11 +2627,11 @@ void main_window::RemoveFirmwareCache()
 		if (QDir(path).removeRecursively())
 		{
 			++caches_removed;
-			gui_log.notice("Removed firmware cache: %s", path);
+			gui_log.notice("Removed firmware cache: %s", sstr(path));
 		}
 		else
 		{
-			gui_log.warning("Could not remove firmware cache: %s", path);
+			gui_log.warning("Could not remove firmware cache: %s", sstr(path));
 		}
 
 		++caches_total;
@@ -3787,26 +2649,33 @@ void main_window::RemoveFirmwareCache()
 
 void main_window::CreateFirmwareCache()
 {
-	if (Emu.IsBootingRestricted())
-	{
-		return;
-	}
-
 	if (!m_gui_settings->GetBootConfirmation(this))
 	{
 		return;
 	}
 
-	Emu.GracefulShutdown(false);
 	Emu.SetForceBoot(true);
 
-	if (const game_boot_result error = Emu.BootGame(g_cfg_vfs.get_dev_flash() + "sys", "", true);
+	if (const game_boot_result error = Emu.BootGame(g_cfg.vfs.get_dev_flash() + "sys", "", true);
 		error != game_boot_result::no_errors)
 	{
 		gui_log.error("Creating firmware cache failed: reason: %s", error);
 	}
 }
 
+void main_window::keyPressEvent(QKeyEvent *keyEvent)
+{
+	if (keyEvent->isAutoRepeat())
+	{
+		return;
+	}
+
+	if (((keyEvent->modifiers() & Qt::AltModifier) && keyEvent->key() == Qt::Key_Return) || (isFullScreen() && keyEvent->key() == Qt::Key_Escape))
+	{
+		ui->toolbar_fullscreen->trigger();
+	}
+}
+
 void main_window::mouseDoubleClickEvent(QMouseEvent *event)
 {
 	if (isFullScreen())
@@ -3825,7 +2694,6 @@ void main_window::closeEvent(QCloseEvent* closeEvent)
 {
 	if (!m_gui_settings->GetBootConfirmation(this, gui::ib_confirm_exit))
 	{
-		Q_EMIT NotifyWindowCloseEvent(false);
 		closeEvent->ignore();
 		return;
 	}
@@ -3833,100 +2701,39 @@ void main_window::closeEvent(QCloseEvent* closeEvent)
 	// Cleanly stop and quit the emulator.
 	if (!Emu.IsStopped())
 	{
-		Emu.GracefulShutdown(false);
+		Emu.Stop();
 	}
-
-	SaveWindowState();
-
-	// Flush logs here as well
-	logs::listener::sync_all();
-
-	Q_EMIT NotifyWindowCloseEvent(true);
-
 	Emu.Quit(true);
 }
 
 /**
 Add valid disc games to gamelist (games.yml)
-@param paths = dir paths to scan for game
+@param path = dir path to scan for game
 */
-void main_window::AddGamesFromDirs(QStringList&& paths)
+void main_window::AddGamesFromDir(const QString& path)
 {
-	if (paths.isEmpty())
-	{
+	if (!QFileInfo(path).isDir())
 		return;
+
+	const std::string s_path = sstr(path);
+
+	// search dropped path first or else the direct parent to an elf is wrongly skipped
+	if (const auto error = Emu.BootGame(s_path, "", false, true); error == game_boot_result::no_errors)
+	{
+		gui_log.notice("Returned from game addition by drag and drop: %s", s_path);
 	}
 
-	// Obtain list of previously existing entries under the specificied parent paths for comparison
-	std::unordered_set<std::string> existing;
-
-	for (const game_info& game : m_game_list_frame->GetGameInfo())
+	// search direct subdirectories, that way we can drop one folder containing all games
+	QDirIterator dir_iter(path, QDir::Dirs | QDir::NoDotAndDotDot);
+	while (dir_iter.hasNext())
 	{
-		if (game)
+		const std::string dir_path = sstr(dir_iter.next());
+
+		if (const auto error = Emu.BootGame(dir_path, "", false, true); error == game_boot_result::no_errors)
 		{
-			for (const auto& dir_path : paths)
-			{
-				if (dir_path.startsWith(game->info.path.c_str()) && fs::exists(game->info.path))
-				{
-					existing.insert(game->info.path);
-					break;
-				}
-			}
+			gui_log.notice("Returned from game addition by drag and drop: %s", dir_path);
 		}
 	}
-
-	u32 games_added = 0;
-
-	for (const QString& path : paths)
-	{
-		games_added += Emu.AddGamesFromDir(path.toStdString());
-	}
-
-	if (games_added)
-	{
-		gui_log.notice("AddGamesFromDirs added %d new entries", games_added);
-	}
-
-	m_game_list_frame->AddRefreshedSlot([this, paths = std::move(paths), existing = std::move(existing)](std::set<std::string>& claimed_paths)
-	{
-		// Execute followup operations only for newly added entries under the specified paths
-		std::map<std::string, QString> paths_added; // -> title id
-
-		for (const game_info& game : m_game_list_frame->GetGameInfo())
-		{
-			if (game && !existing.contains(game->info.path))
-			{
-				for (const auto& dir_path : paths)
-				{
-					if (Emu.IsPathInsideDir(game->info.path, dir_path.toStdString()))
-					{
-						// Try to claim operation on directory path
-
-						std::string resolved_path = Emu.GetCallbacks().resolve_path(game->info.path);
-
-						if (!resolved_path.empty() && !claimed_paths.count(resolved_path))
-						{
-							claimed_paths.emplace(game->info.path);
-							paths_added.emplace(game->info.path, QString::fromStdString(game->info.serial));
-						}
-
-						break;
-					}
-				}
-			}
-		}
-
-		if (paths_added.empty())
-		{
-			QMessageBox::information(this, tr("Nothing to add!"), tr("Could not find any new software."));
-		}
-		else
-		{
-			ShowOptionalGamePreparations(tr("Success!"), tr("Successfully added software to game list from path(s)!"), std::move(paths_added));
-		}
-	});
-
-	m_game_list_frame->Refresh(true);
 }
 
 /**
@@ -3937,119 +2744,67 @@ Check data for valid file types and cache their paths if necessary
 */
 main_window::drop_type main_window::IsValidFile(const QMimeData& md, QStringList* drop_paths)
 {
-	if (drop_paths)
-	{
-		drop_paths->clear();
-	}
+	auto drop_type = drop_type::drop_error;
 
-	drop_type type = drop_type::drop_error;
+	const QList<QUrl> list = md.urls(); // get list of all the dropped file urls
 
-	QList<QUrl> list = md.urls(); // get list of all the dropped file urls
-
-	// Try to cache the data for half a second
-	if (m_drop_file_timestamp != umax && m_drop_file_url_list == list && get_system_time() - m_drop_file_timestamp < 500'000)
-	{
-		if (drop_paths)
-		{
-			for (auto&& url : m_drop_file_url_list)
-			{
-				drop_paths->append(url.toLocalFile());
-			}
-		}
-
-		return m_drop_file_cached_drop_type;
-	}
-
-	m_drop_file_url_list = std::move(list);
-
-	auto set_result = [this](drop_type type)
-	{
-		m_drop_file_timestamp = get_system_time();
-		m_drop_file_cached_drop_type = type;
-		return type;
-	};
-
-	for (auto&& url : m_drop_file_url_list) // check each file in url list for valid type
+	for (auto&& url : list) // check each file in url list for valid type
 	{
 		const QString path = url.toLocalFile(); // convert url to filepath
-		const QFileInfo info(path);
 
-		const QString suffix_lo = info.suffix().toLower();
+		const QFileInfo info = path;
 
 		// check for directories first, only valid if all other paths led to directories until now.
 		if (info.isDir())
 		{
-			if (type != drop_type::drop_dir && type != drop_type::drop_error)
+			if (drop_type != drop_type::drop_dir && drop_type != drop_type::drop_error)
 			{
-				return set_result(drop_type::drop_error);
+				return drop_type::drop_error;
 			}
 
-			type = drop_type::drop_dir;
-		}
-		else if (!info.exists())
-		{
-			// If does not exist (anymore), ignore it
-			continue;
-		}
-		else if (info.size() < 0x4)
-		{
-			return set_result(drop_type::drop_error);
+			drop_type = drop_type::drop_dir;
 		}
 		else if (info.suffix() == "PUP")
 		{
-			if (m_drop_file_url_list.size() != 1)
+			if (list.size() != 1)
 			{
-				return set_result(drop_type::drop_error);
+				return drop_type::drop_error;
 			}
 
-			type = drop_type::drop_pup;
+			drop_type = drop_type::drop_pup;
 		}
-		else if (info.fileName().toLower() == "param.sfo")
+		else if (info.suffix().toLower() == "pkg")
 		{
-			if (type != drop_type::drop_psf && type != drop_type::drop_error)
+			if (drop_type != drop_type::drop_pkg && drop_type != drop_type::drop_error)
 			{
-				return set_result(drop_type::drop_error);
+				return drop_type::drop_error;
 			}
 
-			type = drop_type::drop_psf;
+			drop_type = drop_type::drop_pkg;
 		}
-		else if (suffix_lo == "pkg")
+		else if (info.suffix().toLower() == "rap")
 		{
-			if (type != drop_type::drop_rap_edat_pkg && type != drop_type::drop_error)
+			if (info.size() < 0x10 || (drop_type != drop_type::drop_rap && drop_type != drop_type::drop_error))
 			{
-				return set_result(drop_type::drop_error);
+				return drop_type::drop_error;
 			}
 
-			type = drop_type::drop_rap_edat_pkg;
+			drop_type = drop_type::drop_rap;
 		}
-		else if (suffix_lo == "rap" || suffix_lo == "edat")
+		else if (list.size() == 1)
 		{
-			if (info.size() < 0x10 || (type != drop_type::drop_rap_edat_pkg && type != drop_type::drop_error))
+			if (info.suffix() == "rrc")
 			{
-				return set_result(drop_type::drop_error);
-			}
-
-			type = drop_type::drop_rap_edat_pkg;
-		}
-		else if (m_drop_file_url_list.size() == 1)
-		{
-			if (suffix_lo == "rrc" || path.toLower().endsWith(".rrc.gz"))
-			{
-				type = drop_type::drop_rrc;
-			}
-			// The emulator allows to execute ANY filetype, just not from drag-and-drop because it is confusing to users
-			else if (path.toLower().endsWith(".savestat.gz") || path.toLower().endsWith(".savestat.zst") || suffix_lo == "savestat" || suffix_lo == "sprx" || suffix_lo == "self" || suffix_lo == "bin" || suffix_lo == "prx" || suffix_lo == "elf" || suffix_lo == "o")
-			{
-				type = drop_type::drop_game;
+				drop_type = drop_type::drop_rrc;
 			}
 			else
 			{
-				return set_result(drop_type::drop_error);
+				drop_type = drop_type::drop_game;
 			}
 		}
 		else
 		{
-			return set_result(drop_type::drop_error);
+			return drop_type::drop_error;
 		}
 
 		if (drop_paths) // we only need to know the paths on drop
@@ -4058,23 +2813,20 @@ main_window::drop_type main_window::IsValidFile(const QMimeData& md, QStringList
 		}
 	}
 
-	return set_result(type);
+	return drop_type;
 }
 
 void main_window::dropEvent(QDropEvent* event)
 {
-	event->accept();
-
 	QStringList drop_paths;
 
 	switch (IsValidFile(*event->mimeData(), &drop_paths)) // get valid file paths and drop type
 	{
 	case drop_type::drop_error:
 	{
-		event->ignore();
 		break;
 	}
-	case drop_type::drop_rap_edat_pkg: // install the packages
+	case drop_type::drop_pkg: // install the packages
 	{
 		InstallPackages(drop_paths);
 		break;
@@ -4084,68 +2836,66 @@ void main_window::dropEvent(QDropEvent* event)
 		InstallPup(drop_paths.first());
 		break;
 	}
-	case drop_type::drop_psf: // Display PARAM.SFO content
+	case drop_type::drop_rap: // import rap files to exdata dir
 	{
-		for (const auto& psf : drop_paths)
+		int installed_rap_count = 0;
+
+		for (const auto& rap : drop_paths)
 		{
-			const std::string psf_path = psf.toStdString();
-			std::string info = fmt::format("Dropped PARAM.SFO '%s':\n\n%s", psf_path, psf::load(psf_path).sfo);
+			const std::string rapname = sstr(QFileInfo(rap).fileName());
 
-			gui_log.success("%s", info);
-			info.erase(info.begin(), info.begin() + info.find_first_of('\''));
-
-			QMessageBox mb(QMessageBox::Information, tr("PARAM.SFO Information"), QString::fromStdString(info), QMessageBox::Ok, this);
-			mb.setTextInteractionFlags(Qt::TextSelectableByMouse);
-			mb.exec();
+			if (InstallRapFile(rap, rapname))
+			{
+				gui_log.success("Successfully copied rap file by drop: %s", rapname);
+				installed_rap_count++;
+			}
+			else
+			{
+				gui_log.error("Could not copy rap file by drop: %s", rapname);
+			}
 		}
 
+		if (installed_rap_count > 0)
+		{
+			// Refresh game list since we probably unlocked some games now.
+			m_game_list_frame->Refresh(true);
+		}
 		break;
 	}
 	case drop_type::drop_dir: // import valid games to gamelist (games.yaml)
 	{
-		AddGamesFromDirs(std::move(drop_paths));
-		break;
-	}
-	case drop_type::drop_game: // import valid games to gamelist (games.yaml)
-	{
-		if (Emu.IsBootingRestricted())
-		{
-			return;
-		}
-
 		if (!m_gui_settings->GetBootConfirmation(this))
 		{
 			return;
 		}
-
-		Emu.GracefulShutdown(false);
-
-		const std::string path = drop_paths.first().toStdString();
-
-		if (const auto error = Emu.BootGame(path, "", true); error != game_boot_result::no_errors)
+		for (const auto& path : drop_paths)
+		{
+			AddGamesFromDir(path);
+		}
+		m_game_list_frame->Refresh(true);
+		break;
+	}
+	case drop_type::drop_game: // import valid games to gamelist (games.yaml)
+	{
+		if (!m_gui_settings->GetBootConfirmation(this))
 		{
-			gui_log.error("Boot failed: reason: %s, path: %s", error, path);
-			show_boot_error(error);
 			return;
 		}
-
-		if (is_savestate_compatible(path))
+		if (const auto error = Emu.BootGame(sstr(drop_paths.first()), "", true); error != game_boot_result::no_errors)
 		{
-			gui_log.success("Savestate Boot from drag and drop done: %s", path);
-			AddRecentAction(gui::Recent_Game(QString::fromStdString(path), QString::fromStdString(Emu.GetTitleAndTitleID())), true);
+			gui_log.error("Boot failed: reason: %s, path: %s", error, sstr(drop_paths.first()));
+			show_boot_error(error);
 		}
 		else
 		{
-			gui_log.success("Elf Boot from drag and drop done: %s", path);
-			AddRecentAction(gui::Recent_Game(QString::fromStdString(Emu.GetBoot()), QString::fromStdString(Emu.GetTitleAndTitleID())), false);
+			gui_log.success("Elf Boot from drag and drop done: %s", sstr(drop_paths.first()));
+			m_game_list_frame->Refresh(true);
 		}
-
-		m_game_list_frame->Refresh(true);
 		break;
 	}
 	case drop_type::drop_rrc: // replay a rsx capture file
 	{
-		BootRsxCapture(drop_paths.first().toStdString());
+		BootRsxCapture(sstr(drop_paths.first()));
 		break;
 	}
 	}
@@ -4153,12 +2903,18 @@ void main_window::dropEvent(QDropEvent* event)
 
 void main_window::dragEnterEvent(QDragEnterEvent* event)
 {
-	event->setAccepted(IsValidFile(*event->mimeData()) != drop_type::drop_error);
+	if (IsValidFile(*event->mimeData()) != drop_type::drop_error)
+	{
+		event->accept();
+	}
 }
 
 void main_window::dragMoveEvent(QDragMoveEvent* event)
 {
-	event->setAccepted(IsValidFile(*event->mimeData()) != drop_type::drop_error);
+	if (IsValidFile(*event->mimeData()) != drop_type::drop_error)
+	{
+		event->accept();
+	}
 }
 
 void main_window::dragLeaveEvent(QDragLeaveEvent* event)
diff --git a/rpcs3/rpcs3qt/main_window.h b/rpcs3/rpcs3qt/main_window.h
index c712d01fd3..ff13e8ea26 100644
--- a/rpcs3/rpcs3qt/main_window.h
+++ b/rpcs3/rpcs3qt/main_window.h
@@ -1,16 +1,17 @@
 #pragma once
 
+#ifdef _WIN32
+#include <QWinTHumbnailToolbar>
+#include <QWinTHumbnailToolbutton>
+#endif
+
 #include <QActionGroup>
 #include <QMainWindow>
 #include <QIcon>
-#include <QList>
-#include <QUrl>
 #include <QMimeData>
 
 #include "update_manager.h"
 #include "settings.h"
-#include "shortcut_handler.h"
-#include "Emu/config_mode.h"
 
 #include <memory>
 
@@ -21,8 +22,6 @@ class gui_settings;
 class emu_settings;
 class persistent_settings;
 class kernel_explorer;
-class system_cmd_dialog;
-class gui_pad_thread;
 
 struct gui_game_info;
 
@@ -42,26 +41,39 @@ class main_window : public QMainWindow
 {
 	Q_OBJECT
 
-	std::unique_ptr<Ui::main_window> ui;
+	Ui::main_window *ui;
 
+	bool m_sys_menu_opened = false;
 	bool m_is_list_mode = true;
 	bool m_save_slider_pos = false;
-	bool m_requested_show_logs_on_exit = false;
 	int m_other_slider_pos = 0;
 
 	QIcon m_app_icon;
 	QIcon m_icon_play;
 	QIcon m_icon_pause;
+	QIcon m_icon_stop;
 	QIcon m_icon_restart;
 	QIcon m_icon_fullscreen_on;
 	QIcon m_icon_fullscreen_off;
 
+#ifdef _WIN32
+	QIcon m_icon_thumb_play;
+	QIcon m_icon_thumb_pause;
+	QIcon m_icon_thumb_stop;
+	QIcon m_icon_thumb_restart;
+	QWinThumbnailToolBar *m_thumb_bar = nullptr;
+	QWinThumbnailToolButton *m_thumb_playPause = nullptr;
+	QWinThumbnailToolButton *m_thumb_stop = nullptr;
+	QWinThumbnailToolButton *m_thumb_restart = nullptr;
+	QStringList m_vulkan_adapters;
+#endif
+
 	enum class drop_type
 	{
 		drop_error,
-		drop_rap_edat_pkg,
+		drop_pkg,
 		drop_pup,
-		drop_psf,
+		drop_rap,
 		drop_dir,
 		drop_game,
 		drop_rrc
@@ -72,60 +84,48 @@ public:
 	~main_window();
 	bool Init(bool with_cli_boot);
 	QIcon GetAppIcon() const;
-	void OnMissingFw();
-	bool InstallPackages(QStringList file_paths = {}, bool from_boot = false);
+	bool OnMissingFw();
+	void InstallPackages(QStringList file_paths = QStringList());
 	void InstallPup(QString file_path = "");
 
 Q_SIGNALS:
 	void RequestLanguageChange(const QString& language);
 	void RequestGlobalStylesheetChange();
-	void RequestDialogRepaint();
+	void RequestTrophyManagerRepaint();
 	void NotifyEmuSettingsChange();
-	void NotifyWindowCloseEvent(bool closed);
-	void NotifyShortcutHandlers();
 
 public Q_SLOTS:
 	void OnEmuStop();
-	void OnEmuRun(bool start_playtime);
+	void OnEmuRun(bool start_playtime) const;
 	void OnEmuResume() const;
 	void OnEmuPause() const;
 	void OnEmuReady() const;
-	void OnEnableDiscEject(bool enabled) const;
-	void OnEnableDiscInsert(bool enabled) const;
-	void OnAddBreakpoint(u32 addr) const;
 
 	void RepaintGui();
-	void RetranslateUI(const QStringList& language_codes, const QString& language_code);
+	void RetranslateUI(const QStringList& language_codes, const QString& language);
 
 private Q_SLOTS:
 	void OnPlayOrPause();
-	void Boot(const std::string& path, const std::string& title_id = "", bool direct = false, bool refresh_list = false, cfg_mode config_mode = cfg_mode::custom, const std::string& config_path = "");
+	void Boot(const std::string& path, const std::string& title_id = "", bool direct = false, bool add_only = false, bool force_global_config = false);
 	void BootElf();
-	void BootTest();
 	void BootGame();
 	void BootVSH();
-	void BootSavestate();
 	void BootRsxCapture(std::string path = "");
 	void DecryptSPRXLibraries();
-	void show_boot_error(game_boot_result status);
+	static void show_boot_error(game_boot_result status);
 
 	void SaveWindowState() const;
+	void ConfigureGuiFromSettings();
 	void SetIconSizeActions(int idx) const;
 	void ResizeIcons(int index);
 
-	void RemoveHDD1Caches();
-	void RemoveAllCaches();
-	void RemoveSavestates();
-	void CleanUpGameList();
-
+	void RemoveDiskCache();
 	void RemoveFirmwareCache();
 	void CreateFirmwareCache();
 
-	void handle_shortcut(gui::shortcuts::shortcut shortcut_key, const QKeySequence& key_sequence);
-	void update_gui_pad_thread();
-
 protected:
 	void closeEvent(QCloseEvent *event) override;
+	void keyPressEvent(QKeyEvent *keyEvent) override;
 	void mouseDoubleClickEvent(QMouseEvent *event) override;
 	void dropEvent(QDropEvent* event) override;
 	void dragEnterEvent(QDragEnterEvent* event) override;
@@ -133,7 +133,6 @@ protected:
 	void dragLeaveEvent(QDragLeaveEvent* event) override;
 
 private:
-	void ConfigureGuiFromSettings();
 	void RepaintToolBarIcons();
 	void RepaintThumbnailIcons();
 	void CreateActions();
@@ -141,11 +140,10 @@ private:
 	void CreateDockWindows();
 	void EnableMenus(bool enabled) const;
 	void ShowTitleBars(bool show) const;
-	void ShowOptionalGamePreparations(const QString& title, const QString& message, std::map<std::string, QString> game_path);
 
-	static bool InstallFileInExData(const std::string& extension, const QString& path, const std::string& filename);
+	static bool InstallRapFile(const QString& path, const std::string& filename);
 
-	bool HandlePackageInstallation(QStringList file_paths, bool from_boot);
+	void HandlePackageInstallation(QStringList file_paths);
 
 	void HandlePupInstallation(const QString& file_path, const QString& dir_path = "");
 	void ExtractPup();
@@ -153,28 +151,19 @@ private:
 	void ExtractTar();
 	void ExtractMSELF();
 
-	QList<QUrl> m_drop_file_url_list;
-	u64 m_drop_file_timestamp = umax;
-	drop_type m_drop_file_cached_drop_type = drop_type::drop_error;
-	drop_type IsValidFile(const QMimeData& md, QStringList* drop_paths = nullptr);
-	void AddGamesFromDirs(QStringList&& paths);
+	static drop_type IsValidFile(const QMimeData& md, QStringList* drop_paths = nullptr);
+	static void AddGamesFromDir(const QString& path);
 
-	QAction* CreateRecentAction(const q_string_pair& entry, u32 sc_idx, bool is_savestate);
-	void BootRecentAction(const QAction* act, bool is_savestate);
-	void AddRecentAction(const q_string_pair& entry, bool is_savestate);
+	QAction* CreateRecentAction(const q_string_pair& entry, const uint& sc_idx);
+	void BootRecentAction(const QAction* act);
+	void AddRecentAction(const q_string_pair& entry);
 
 	void UpdateLanguageActions(const QStringList& language_codes, const QString& language);
-	void UpdateFilterActions();
 
 	static QString GetCurrentTitle();
 
-	struct recent_game_wrapper
-	{
-		q_pair_list entries;
-		QList<QAction*> actions;
-	};
-	recent_game_wrapper m_recent_game {};
-	recent_game_wrapper m_recent_save {};
+	q_pair_list m_rg_entries;
+	QList<QAction*> m_recent_game_acts;
 
 	std::shared_ptr<gui_game_info> m_selected_game;
 
@@ -188,15 +177,10 @@ private:
 	debugger_frame* m_debugger_frame = nullptr;
 	game_list_frame* m_game_list_frame = nullptr;
 	kernel_explorer* m_kernel_explorer = nullptr;
-	system_cmd_dialog* m_system_cmd_dialog = nullptr;
 	std::shared_ptr<gui_settings> m_gui_settings;
 	std::shared_ptr<emu_settings> m_emu_settings;
 	std::shared_ptr<persistent_settings> m_persistent_settings;
 
 	update_manager m_updater;
 	QAction* m_download_menu_action = nullptr;
-
-	shortcut_handler* m_shortcut_handler = nullptr;
-
-	std::unique_ptr<gui_pad_thread> m_gui_pad_thread;
 };
diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui
index 91654cbb67..0593aa54d3 100644
--- a/rpcs3/rpcs3qt/main_window.ui
+++ b/rpcs3/rpcs3qt/main_window.ui
@@ -35,7 +35,7 @@
    <bool>true</bool>
   </property>
   <property name="dockOptions">
-   <set>QMainWindow::DockOption::AllowNestedDocks|QMainWindow::DockOption::AllowTabbedDocks|QMainWindow::DockOption::AnimatedDocks|QMainWindow::DockOption::GroupedDragging</set>
+   <set>QMainWindow::AllowNestedDocks|QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks|QMainWindow::GroupedDragging</set>
   </property>
   <widget class="QWidget" name="centralWidget">
    <property name="sizePolicy">
@@ -67,7 +67,7 @@
      </font>
     </property>
     <property name="focusPolicy">
-     <enum>Qt::FocusPolicy::ClickFocus</enum>
+     <enum>Qt::ClickFocus</enum>
     </property>
     <property name="frame">
      <bool>false</bool>
@@ -119,16 +119,16 @@
         </sizepolicy>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::FocusPolicy::ClickFocus</enum>
+        <enum>Qt::ClickFocus</enum>
        </property>
        <property name="autoFillBackground">
         <bool>false</bool>
        </property>
        <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
        <property name="tickPosition">
-        <enum>QSlider::TickPosition::NoTicks</enum>
+        <enum>QSlider::NoTicks</enum>
        </property>
       </widget>
      </item>
@@ -145,26 +145,16 @@
     </rect>
    </property>
    <property name="contextMenuPolicy">
-    <enum>Qt::ContextMenuPolicy::PreventContextMenu</enum>
+    <enum>Qt::PreventContextMenu</enum>
    </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>File</string>
     </property>
-    <widget class="QMenu" name="bootElfMenu">
+    <widget class="QMenu" name="bootRecentMenu">
      <property name="enabled">
       <bool>true</bool>
      </property>
-     <property name="title">
-      <string>Boot (S)Elf</string>
-     </property>
-     <property name="toolTipsVisible">
-      <bool>true</bool>
-     </property>
-     <addaction name="bootElfAct"/>
-     <addaction name="bootTestAct"/>
-    </widget>
-    <widget class="QMenu" name="bootRecentMenu">
      <property name="title">
       <string>Boot Recent</string>
      </property>
@@ -179,18 +169,15 @@
      <property name="title">
       <string>All Titles</string>
      </property>
-     <addaction name="batchCreateCPUCachesAct"/>
+     <addaction name="batchCreatePPUCachesAct"/>
      <addaction name="separator"/>
      <addaction name="batchRemoveCustomConfigurationsAct"/>
      <addaction name="batchRemoveCustomPadConfigurationsAct"/>
-     <addaction name="batchRemoveShaderCachesAct"/>
      <addaction name="batchRemovePPUCachesAct"/>
      <addaction name="batchRemoveSPUCachesAct"/>
-     <addaction name="removeHDD1CachesAct"/>
-     <addaction name="removeAllCachesAct"/>
-     <addaction name="removeSavestatesAct"/>
+     <addaction name="batchRemoveShaderCachesAct"/>
      <addaction name="separator"/>
-     <addaction name="cleanUpGameListAct"/>
+     <addaction name="removeDiskCacheAct"/>
     </widget>
     <widget class="QMenu" name="menuFirmware">
      <property name="title">
@@ -199,22 +186,9 @@
      <addaction name="createFirmwareCacheAct"/>
      <addaction name="removeFirmwareCacheAct"/>
     </widget>
-    <widget class="QMenu" name="bootRecentSavestatesMenu">
-     <property name="title">
-      <string>Boot Recent Savestate</string>
-     </property>
-     <property name="toolTipsVisible">
-      <bool>true</bool>
-     </property>
-     <addaction name="clearRecentSavestatesAct"/>
-     <addaction name="freezeRecentSavestatesAct"/>
-     <addaction name="separator"/>
-    </widget>
+    <addaction name="bootElfAct"/>
     <addaction name="bootGameAct"/>
     <addaction name="bootVSHAct"/>
-    <addaction name="bootElfMenu"/>
-    <addaction name="bootSavestateAct"/>
-    <addaction name="bootRecentSavestatesMenu"/>
     <addaction name="bootRecentMenu"/>
     <addaction name="separator"/>
     <addaction name="addGamesAct"/>
@@ -225,7 +199,6 @@
     <addaction name="menuBatch"/>
     <addaction name="menuFirmware"/>
     <addaction name="separator"/>
-    <addaction name="exitAndSaveLogAct"/>
     <addaction name="exitAct"/>
    </widget>
    <widget class="QMenu" name="menuEmulation">
@@ -236,44 +209,17 @@
     <addaction name="sysStopAct"/>
     <addaction name="sysRebootAct"/>
     <addaction name="separator"/>
-    <addaction name="insertDiscAct"/>
-    <addaction name="ejectDiscAct"/>
+    <addaction name="sysSendOpenMenuAct"/>
+    <addaction name="sysSendExitAct"/>
    </widget>
    <widget class="QMenu" name="menuConfiguration">
     <property name="title">
      <string>Configuration</string>
     </property>
-    <widget class="QMenu" name="menuEmulatedPads">
-     <property name="title">
-      <string>USB Devices</string>
-     </property>
-     <addaction name="confBuzzAct"/>
-     <addaction name="confGHLtarAct"/>
-     <addaction name="confTurntableAct"/>
-     <addaction name="confUSIOAct"/>
-     <addaction name="confPSMoveAct"/>
-     <addaction name="confPSMoveDS3Act"/>
-     <addaction name="confPSMoveMouseAct"/>
-     <addaction name="confGunCon3Act"/>
-     <addaction name="confTopShotEliteAct"/>
-     <addaction name="confTopShotFearmasterAct"/>
-     <addaction name="confLogitechG27Act"/>
-    </widget>
-    <widget class="QMenu" name="menuMice">
-     <property name="title">
-      <string>Mice</string>
-     </property>
-     <addaction name="actionBasic_Mouse"/>
-     <addaction name="actionRaw_Mouse"/>
-    </widget>
     <addaction name="confCPUAct"/>
     <addaction name="confGPUAct"/>
     <addaction name="separator"/>
     <addaction name="confPadsAct"/>
-    <addaction name="menuMice"/>
-    <addaction name="menuEmulatedPads"/>
-    <addaction name="confCamerasAct"/>
-    <addaction name="actionPS_Move_Tracker"/>
     <addaction name="confAudioAct"/>
     <addaction name="confIOAct"/>
     <addaction name="confSystemAct"/>
@@ -282,10 +228,6 @@
     <addaction name="confGuiAct"/>
     <addaction name="separator"/>
     <addaction name="confRPCNAct"/>
-    <addaction name="confIPCAct"/>
-    <addaction name="separator"/>
-    <addaction name="confShortcutsAct"/>
-    <addaction name="separator"/>
     <addaction name="confAutopauseManagerAct"/>
    </widget>
    <widget class="QMenu" name="menuManage">
@@ -298,10 +240,7 @@
     <addaction name="confSavedataManagerAct"/>
     <addaction name="actionManage_RAP_Licenses"/>
     <addaction name="actionManage_Trophy_Data"/>
-    <addaction name="actionManage_Savestates"/>
     <addaction name="actionManage_Skylanders_Portal"/>
-    <addaction name="actionManage_Infinity_Base"/>
-    <addaction name="actionManage_Dimensions_ToyPad"/>
     <addaction name="actionManage_Cheats"/>
     <addaction name="actionManage_Game_Patches"/>
     <addaction name="actionManage_Screenshots"/>
@@ -311,15 +250,11 @@
      <string>Utilities</string>
     </property>
     <addaction name="actionLog_Viewer"/>
-    <addaction name="toolsCheckConfigAct"/>
     <addaction name="toolsCgDisasmAct"/>
     <addaction name="toolskernel_explorerAct"/>
     <addaction name="toolsmemory_viewerAct"/>
     <addaction name="toolsRsxDebuggerAct"/>
-    <addaction name="toolsSystemCommandsAct"/>
-    <addaction name="patchCreatorAct"/>
-    <addaction name="toolsVfsDialogAct"/>
-    <addaction name="actionMusic_Player"/>
+    <addaction name="toolsStringSearchAct"/>
     <addaction name="separator"/>
     <addaction name="toolsDecryptSprxLibsAct"/>
     <addaction name="separator"/>
@@ -330,8 +265,6 @@
     <addaction name="actionopen_rsx_capture"/>
     <addaction name="separator"/>
     <addaction name="actionCreate_RSX_Capture"/>
-    <addaction name="actionCreate_Savestate"/>
-    <addaction name="actionCreate_Savestate_And_Exit"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
@@ -346,7 +279,6 @@
      <addaction name="setIconSizeMediumAct"/>
      <addaction name="setIconSizeLargeAct"/>
      <addaction name="separator"/>
-     <addaction name="actionPreferGameDataIcons"/>
      <addaction name="showCustomIconsAct"/>
      <addaction name="playHoverGifsAct"/>
     </widget>
@@ -369,7 +301,6 @@
      <addaction name="showCatHomeAct"/>
      <addaction name="showCatAudioVideoAct"/>
      <addaction name="showCatGameDataAct"/>
-     <addaction name="showCatOSAct"/>
      <addaction name="showCatUnknownAct"/>
      <addaction name="showCatOtherAct"/>
     </widget>
@@ -401,12 +332,9 @@
      <addaction name="languageAct0"/>
     </widget>
     <addaction name="updateAct"/>
-    <addaction name="welcomeAct"/>
     <addaction name="separator"/>
     <addaction name="languageMenu"/>
     <addaction name="separator"/>
-    <addaction name="supportAct"/>
-    <addaction name="separator"/>
     <addaction name="aboutAct"/>
     <addaction name="aboutQtAct"/>
    </widget>
@@ -426,7 +354,7 @@
     </sizepolicy>
    </property>
    <property name="contextMenuPolicy">
-    <enum>Qt::ContextMenuPolicy::PreventContextMenu</enum>
+    <enum>Qt::PreventContextMenu</enum>
    </property>
    <property name="windowTitle">
     <string>Show tool bar</string>
@@ -435,7 +363,7 @@
     <bool>false</bool>
    </property>
    <property name="allowedAreas">
-    <set>Qt::ToolBarArea::TopToolBarArea</set>
+    <set>Qt::TopToolBarArea</set>
    </property>
    <property name="iconSize">
     <size>
@@ -444,7 +372,7 @@
     </size>
    </property>
    <property name="toolButtonStyle">
-    <enum>Qt::ToolButtonStyle::ToolButtonTextUnderIcon</enum>
+    <enum>Qt::ToolButtonTextUnderIcon</enum>
    </property>
    <property name="floatable">
     <bool>false</bool>
@@ -470,24 +398,14 @@
     <string>Boot SELF/ELF</string>
    </property>
   </action>
-  <action name="bootTestAct">
-   <property name="text">
-    <string>Boot Test</string>
-   </property>
-  </action>
   <action name="bootGameAct">
    <property name="text">
     <string>Boot Game</string>
    </property>
   </action>
-  <action name="bootSavestateAct">
-   <property name="text">
-    <string>Boot Savestate</string>
-   </property>
-  </action>
   <action name="bootInstallPkgAct">
    <property name="text">
-    <string>Install Packages/Raps/Edats</string>
+    <string>Install Packages/Raps</string>
    </property>
    <property name="toolTip">
     <string>Install application from a .pkg file</string>
@@ -539,6 +457,14 @@
     <string>Send Open System Menu CMD</string>
    </property>
   </action>
+  <action name="sysSendExitAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Send Exit CMD</string>
+   </property>
+  </action>
   <action name="confCPUAct">
    <property name="text">
     <string>CPU</string>
@@ -625,17 +551,6 @@
     <string>Configure Auto Pause</string>
    </property>
   </action>
-  <action name="exitAndSaveLogAct">
-   <property name="text">
-    <string>Exit And Save Log</string>
-   </property>
-   <property name="toolTip">
-    <string>Exit RPCS3, move the log file to a custom location</string>
-   </property>
-   <property name="statusTip">
-    <string>Exit the application and save the log to a user-defined location</string>
-   </property>
-  </action>
   <action name="exitAct">
    <property name="text">
     <string>Exit</string>
@@ -706,6 +621,14 @@
     <string>RSX Debugger</string>
    </property>
   </action>
+  <action name="toolsStringSearchAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>String Search</string>
+   </property>
+  </action>
   <action name="toolsDecryptSprxLibsAct">
    <property name="text">
     <string>Decrypt PS3 Binaries</string>
@@ -745,14 +668,6 @@
     <string>Show Log/TTY</string>
    </property>
   </action>
-  <action name="supportAct">
-   <property name="text">
-    <string>Support Us</string>
-   </property>
-   <property name="toolTip">
-    <string>To ensure continued improvements of RPCS3, become a part of our Patreon group!</string>
-   </property>
-  </action>
   <action name="aboutAct">
    <property name="text">
     <string>About RPCS3</string>
@@ -805,11 +720,6 @@
     <string>Check for Updates</string>
    </property>
   </action>
-  <action name="welcomeAct">
-   <property name="text">
-    <string>View The Welcome Dialog</string>
-   </property>
-  </action>
   <action name="confVFSDialogAct">
    <property name="text">
     <string>Virtual File System</string>
@@ -898,6 +808,9 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>HDD Games</string>
    </property>
@@ -906,6 +819,9 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Disc Games</string>
    </property>
@@ -914,6 +830,9 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>PS1 Games</string>
    </property>
@@ -922,6 +841,9 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>PS2 Games</string>
    </property>
@@ -930,6 +852,9 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>PSP Games</string>
    </property>
@@ -938,6 +863,9 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Home</string>
    </property>
@@ -946,6 +874,9 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Audio/Video</string>
    </property>
@@ -954,6 +885,9 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Game Data</string>
    </property>
@@ -962,6 +896,9 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Unknown</string>
    </property>
@@ -1078,6 +1015,9 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Other</string>
    </property>
@@ -1108,9 +1048,9 @@
     <string>Show Title Bars</string>
    </property>
   </action>
-  <action name="batchCreateCPUCachesAct">
+  <action name="batchCreatePPUCachesAct">
    <property name="text">
-    <string>Create LLVM Caches</string>
+    <string>Create PPU Caches</string>
    </property>
   </action>
   <action name="batchRemoveCustomConfigurationsAct">
@@ -1118,16 +1058,6 @@
     <string>Remove Custom Configurations</string>
    </property>
   </action>
-  <action name="batchRemoveCustomPadConfigurationsAct">
-   <property name="text">
-    <string>Remove Custom Pad Configurations</string>
-   </property>
-  </action>
-  <action name="batchRemoveShaderCachesAct">
-   <property name="text">
-    <string>Remove Shader Caches</string>
-   </property>
-  </action>
   <action name="batchRemovePPUCachesAct">
    <property name="text">
     <string>Remove PPU Caches</string>
@@ -1138,24 +1068,19 @@
     <string>Remove SPU Caches</string>
    </property>
   </action>
-  <action name="removeHDD1CachesAct">
+  <action name="batchRemoveShaderCachesAct">
    <property name="text">
-    <string>Remove HDD1 Caches</string>
+    <string>Remove Shader Caches</string>
    </property>
   </action>
-  <action name="removeAllCachesAct">
+  <action name="batchRemoveCustomPadConfigurationsAct">
    <property name="text">
-    <string>Remove All Caches</string>
+    <string>Remove Custom Pad Configurations</string>
    </property>
   </action>
-  <action name="removeSavestatesAct">
+  <action name="removeDiskCacheAct">
    <property name="text">
-    <string>Remove Savestates</string>
-   </property>
-  </action>
-  <action name="cleanUpGameListAct">
-   <property name="text">
-    <string>Clean up Game List</string>
+    <string>Remove Disk Cache</string>
    </property>
   </action>
   <action name="actionManage_Skylanders_Portal">
@@ -1163,16 +1088,6 @@
     <string>Skylanders Portal</string>
    </property>
   </action>
-  <action name="actionManage_Infinity_Base">
-   <property name="text">
-    <string>Infinity Base</string>
-   </property>
-  </action>
-  <action name="actionManage_Dimensions_ToyPad">
-   <property name="text">
-    <string>Dimensions Toypad</string>
-   </property>
-  </action>
   <action name="actionManage_Cheats">
    <property name="text">
     <string>Cheats</string>
@@ -1209,22 +1124,6 @@
     <string>Create RSX Capture</string>
    </property>
   </action>
-  <action name="actionCreate_Savestate">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>Create Savestate</string>
-   </property>
-  </action>
-  <action name="actionCreate_Savestate_And_Exit">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>Stop And Create Savestate</string>
-   </property>
-  </action>
   <action name="actionManage_Game_Patches">
    <property name="text">
     <string>Game Patches</string>
@@ -1238,14 +1137,6 @@
     <string>Configure RPCN</string>
    </property>
   </action>
-  <action name="confIPCAct">
-   <property name="text">
-    <string>IPC</string>
-   </property>
-   <property name="toolTip">
-    <string>Configure IPC</string>
-   </property>
-  </action>
   <action name="actionLog_Viewer">
    <property name="text">
     <string>Log Viewer</string>
@@ -1278,168 +1169,11 @@
     <string>Boot VSH/XMB</string>
    </property>
   </action>
-  <action name="patchCreatorAct">
-   <property name="text">
-    <string>Patch Creator</string>
-   </property>
-  </action>
-  <action name="confCamerasAct">
-   <property name="text">
-    <string>Cameras</string>
-   </property>
-  </action>
-  <action name="ejectDiscAct">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>Eject Disc</string>
-   </property>
-  </action>
-  <action name="insertDiscAct">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>Insert Disc</string>
-   </property>
-  </action>
-  <action name="toolsCheckConfigAct">
-   <property name="text">
-    <string>Check Config</string>
-   </property>
-  </action>
-  <action name="confShortcutsAct">
-   <property name="text">
-    <string>Shortcuts</string>
-   </property>
-  </action>
-  <action name="toolsSystemCommandsAct">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>System Commands</string>
-   </property>
-  </action>
-  <action name="confBuzzAct">
-   <property name="text">
-    <string>Buzz</string>
-   </property>
-  </action>
-  <action name="confGHLtarAct">
-   <property name="text">
-    <string>GHLtar</string>
-   </property>
-  </action>
-  <action name="confTurntableAct">
-   <property name="text">
-    <string>Turntable</string>
-   </property>
-  </action>
-  <action name="confUSIOAct">
-   <property name="text">
-    <string>USIO</string>
-   </property>
-  </action>
-  <action name="confPSMoveDS3Act">
-   <property name="text">
-    <string>PS Move (Fake)</string>
-   </property>
-  </action>
-  <action name="confPSMoveMouseAct">
-   <property name="text">
-    <string>PS Move (Mouse)</string>
-   </property>
-  </action>
-  <action name="confGunCon3Act">
-   <property name="text">
-    <string>GunCon 3</string>
-   </property>
-  </action>
-  <action name="confTopShotEliteAct">
-   <property name="text">
-    <string>Top Shot Elite</string>
-   </property>
-  </action>
-  <action name="confTopShotFearmasterAct">
-   <property name="text">
-    <string>Top Shot Fearmaster</string>
-   </property>
-  </action>
-  <action name="confLogitechG27Act">
-   <property name="text">
-    <string>Logitech G27 Wheel</string>
-   </property>
-  </action>
-  <action name="actionBasic_Mouse">
-   <property name="text">
-    <string>Basic Mouse</string>
-   </property>
-  </action>
-  <action name="actionRaw_Mouse">
-   <property name="text">
-    <string>Raw Mouse</string>
-   </property>
-  </action>
-  <action name="toolsVfsDialogAct">
-   <property name="text">
-    <string>VFS Tool</string>
-   </property>
-  </action>
-  <action name="actionPS_Move_Tracker">
-   <property name="text">
-    <string>PS Move Tracker</string>
-   </property>
-  </action>
-  <action name="confPSMoveAct">
-   <property name="text">
-    <string>PS Move</string>
-   </property>
-  </action>
-  <action name="showCatOSAct">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Operating System</string>
-   </property>
-  </action>
-  <action name="clearRecentSavestatesAct">
-   <property name="text">
-    <string>List Clear</string>
-   </property>
-  </action>
-  <action name="freezeRecentSavestatesAct">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>List Freeze</string>
-   </property>
-  </action>
-  <action name="actionManage_Savestates">
-   <property name="text">
-    <string>Savestates</string>
-   </property>
-  </action>
-  <action name="actionPreferGameDataIcons">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Prefer Game Data Icons</string>
-   </property>
-  </action>
-  <action name="actionMusic_Player">
-   <property name="text">
-    <string>Music Player</string>
-   </property>
-  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
   <include location="../resources.qrc"/>
+  <include location="../resources.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/rpcs3/rpcs3qt/memory_string_searcher.cpp b/rpcs3/rpcs3qt/memory_string_searcher.cpp
index c55cb8144d..6e5deeb77f 100644
--- a/rpcs3/rpcs3qt/memory_string_searcher.cpp
+++ b/rpcs3/rpcs3qt/memory_string_searcher.cpp
@@ -1,17 +1,18 @@
-#include "memory_viewer_panel.h"
+#include "memory_string_searcher.h"
 #include "Emu/Memory/vm.h"
-
 #include "Emu/Memory/vm_reservation.h"
-#include "Emu/CPU/CPUDisAsm.h"
-#include "Emu/Cell/SPUDisAsm.h"
 
 #include "Utilities/Thread.h"
 #include "Utilities/StrUtil.h"
 
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QComboBox>
 #include <QCheckBox>
 
 #include <charconv>
-#include <regex>
 
 #include "util/logs.hpp"
 #include "util/sysinfo.hpp"
@@ -19,55 +20,69 @@
 
 LOG_CHANNEL(gui_log, "GUI");
 
-template <>
-void fmt_class_string<search_mode>::format(std::string& out, u64 arg)
+enum : int
 {
-	if (!arg)
-	{
-		out += "No search modes have been selected";
-	}
+	as_string,
+	as_hex,
+	as_f64,
+	as_f32,
+};
 
-	for (u32 modes = static_cast<u32>(arg); modes; modes &= modes - 1)
-	{
-		const u32 mode = modes & ~(modes - 1);
+memory_string_searcher::memory_string_searcher(QWidget* parent)
+	: QDialog(parent)
+{
+	setWindowTitle(tr("String Searcher"));
+	setObjectName("memory_string_searcher");
+	setAttribute(Qt::WA_DeleteOnClose);
 
-		auto mode_s = [&]() -> std::string_view
-		{
-			switch (mode)
-			{
-			case as_string: return "String";
-			case as_hex: return "HEX bytes/integer";
-			case as_f64: return "Double";
-			case as_f32: return "Float";
-			case as_inst: return "Instruction";
-			case as_regex_inst: return "Regex-Instruction";
-			case as_fake_spu_inst: return "SPU Instruction";
-			case as_regex_fake_spu_inst: return "SPU Regex-Instruction";
-			default: return "";
-			}
-		}();
+	m_addr_line = new QLineEdit(this);
+	m_addr_line->setFixedWidth(QLabel("This is the very length of the lineedit due to hidpi reasons.").sizeHint().width());
+	m_addr_line->setPlaceholderText(tr("Search..."));
+	m_addr_line->setMaxLength(4096);
 
-		if (mode_s.empty())
-		{
-			break;
-		}
+	QPushButton* button_search = new QPushButton(tr("&Search"), this);
 
-		if (modes != static_cast<u32>(arg))
-		{
-			out += ", ";
-		}
+	m_chkbox_case_insensitive = new QCheckBox(tr("Case Insensitive"), this);
+	m_chkbox_case_insensitive->setCheckable(true);
+	m_chkbox_case_insensitive->setToolTip(tr("When using string mode, the characters' case will not matter both in string and in memory."
+		"\nWarning: this may reduce performance of the search."));
 
-		out += mode_s;
-	}
+	m_cbox_input_mode = new QComboBox(this);
+	m_cbox_input_mode->addItem("String", QVariant::fromValue(+as_string));
+	m_cbox_input_mode->addItem("HEX bytes/integer", QVariant::fromValue(+as_hex));
+	m_cbox_input_mode->addItem("Double", QVariant::fromValue(+as_f64));
+	m_cbox_input_mode->addItem("Float", QVariant::fromValue(+as_f32));
+	m_cbox_input_mode->setToolTip(tr("String: search the memory for the specified string."
+		"\nHEX bytes/integer: search the memory for hexadecimal values. Spaces, commas, \"0x\", \"0X\", \"\\x\" ensure separation of bytes but they are not mandatory."
+		"\nDouble: reinterpret the string as 64-bit precision floating point value. Values are searched for exact representation, meaning -0 != 0."
+		"\nFloat: reinterpret the string as 32-bit precision floating point value. Values are searched for exact representation, meaning -0 != 0."));
+
+	QHBoxLayout* hbox_panel = new QHBoxLayout();
+	hbox_panel->addWidget(m_addr_line);
+	hbox_panel->addWidget(m_cbox_input_mode);
+	hbox_panel->addWidget(m_chkbox_case_insensitive);
+	hbox_panel->addWidget(button_search);
+
+	setLayout(hbox_panel);
+
+	connect(button_search, &QAbstractButton::clicked, this, &memory_string_searcher::OnSearch);
+
+	layout()->setSizeConstraint(QLayout::SetFixedSize);
 }
 
-u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode)
+void memory_string_searcher::OnSearch()
 {
-	if (m_rsx)
+	std::string wstr = m_addr_line->text().toStdString();
+
+	if (wstr.empty() || wstr.size() >= 4096u)
 	{
-		return 0;
+		gui_log.error("String is empty or too long (size=%u)", wstr.size());
+		return;
 	}
 
+	gui_log.notice("Searching for %s", wstr);
+
+	const int mode = std::max(m_cbox_input_mode->currentIndex(), 0);
 	bool case_insensitive = false;
 
 	// First characters for case insensitive search
@@ -82,11 +97,7 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode)
 
 	switch (mode)
 	{
-	case as_inst:
 	case as_string:
-	case as_regex_inst:
-	case as_fake_spu_inst:
-	case as_regex_fake_spu_inst:
 	{
 		case_insensitive = m_chkbox_case_insensitive->isChecked();
 
@@ -102,14 +113,14 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode)
 		constexpr std::string_view hex_chars = "0123456789ABCDEFabcdef";
 
 		// Split
-		std::vector<std::string> parts = fmt::split(wstr, {" ", ",", "0x", "0X", "\\x", "h", "H"});
+		std::vector<std::string> parts = fmt::split(wstr, {" ", ",", "0x", "0X", "\\x"});
 
 		// Pad zeroes
 		for (std::string& part : parts)
 		{
 			if (part.size() % 2)
 			{
-				gui_log.warning("Padding string part with '0' at front due to odd hexadecimal characters count.");
+				gui_log.warning("Padding string part with '0' at front due to odd hexadeciaml characters count.");
 				part.insert(part.begin(), '0');
 			}
 		}
@@ -123,8 +134,9 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode)
 
 		if (const usz pos = wstr.find_first_not_of(hex_chars); pos != umax)
 		{
-			gui_log.error("String '%s' cannot be interpreted as hexadecimal byte string due to unknown character '%c'.", m_search_line->text(), wstr[pos]);
-			return 0;
+			gui_log.error("String '%s' cannot be interpreted as hexadecimal byte string due to unknown character '%s'.",
+				m_addr_line->text().toStdString(), std::string_view{&wstr[pos], 1});
+			return;
 		}
 
 		std::string dst;
@@ -142,16 +154,13 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode)
 	}
 	case as_f64:
 	{
-		// Remove trailing 'f' letters
-		wstr = wstr.substr(0, wstr.find_last_not_of("Ff") + 1);
-
 		char* end{};
 		be_t<f64> value = std::strtod(wstr.data(), &end);
 
-		if (wstr.empty() || end != wstr.data() + wstr.size())
+		if (end != wstr.data() + wstr.size())
 		{
 			gui_log.error("String '%s' cannot be interpreted as double.", wstr);
-			return 0;
+			return;
 		}
 
 		wstr.resize(sizeof(value));
@@ -160,15 +169,13 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode)
 	}
 	case as_f32:
 	{
-		wstr = wstr.substr(0, wstr.find_last_not_of("Ff") + 1);
-
 		char* end{};
 		be_t<f32> value = std::strtof(wstr.data(), &end);
 
-		if (wstr.empty() || end != wstr.data() + wstr.size())
+		if (end != wstr.data() + wstr.size())
 		{
 			gui_log.error("String '%s' cannot be interpreted as float.", wstr);
-			return 0;
+			return;
 		}
 
 		wstr.resize(sizeof(value));
@@ -182,116 +189,27 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode)
 	atomic_t<u32> found = 0;
 	atomic_t<u32> avail_addr = 0;
 
-	// There's no need for so many threads (except for instructions searching)
-	const u32 max_threads = utils::aligned_div(utils::get_thread_count(), mode < as_inst ? 2 : 1);
+	// There's no need for so many threads
+	const u32 max_threads = utils::aligned_div(utils::get_thread_count(), 2);
 
 	static constexpr u32 block_size = 0x2000000;
 
-	vm::writer_lock rlock;
+	vm::reader_lock rlock;
 
-	const named_thread_group workers("Memory Searcher "sv, max_threads, [&]()
+	const named_thread_group workers("String Searcher "sv, max_threads, [&]()
 	{
-		if (mode == as_inst || mode == as_fake_spu_inst || mode == as_regex_inst || mode == as_regex_fake_spu_inst)
-		{
-			auto disasm = m_disasm->copy_type_erased();
-			disasm->change_mode(cpu_disasm_mode::normal);
-
-			SPUDisAsm spu_dis(cpu_disasm_mode::normal, static_cast<const u8*>(m_ptr));
-
-			const usz limit = std::min(m_size, m_ptr == vm::g_sudo_addr ? 0xFFFF'0000 : m_size);
-
-			while (true)
-			{
-				u32 addr;
-
-				const bool ok = avail_addr.fetch_op([&](u32& val)
-				{
-					if (val < limit && val != umax)
-					{
-						while (m_ptr == vm::g_sudo_addr && !vm::check_addr(val, mode == as_inst ? vm::page_executable : 0))
-						{
-							// Skip unmapped memory
-							val = utils::align(val + 1, 0x10000);
-
-							if (!val)
-							{
-								return false;
-							}
-						}
-
-						addr = val;
-
-						// Iterate 16k instructions at a time
-						val += 0x10000;
-
-						if (!val)
-						{
-							// Overflow detection
-							val = -1;
-						}
-
-						return true;
-					}
-
-					return false;
-				}).second;
-
-				if (!ok)
-				{
-					return;
-				}
-
-				u32 spu_base_pc = 0;
-
-				if (mode == as_fake_spu_inst)
-				{
-					// Check if we can extend the limits of SPU decoder so it can use the previous 64k block
-					// For SPU instruction patterns
-					spu_base_pc = (addr >= 0x10000 && (m_ptr != vm::g_sudo_addr || vm::check_addr(addr - 0x10000, 0))) ? 0x10000 : 0;
-
-					// Set base for SPU decoder
-					spu_dis.change_ptr(static_cast<const u8*>(m_ptr) + addr - spu_base_pc);
-				}
-
-				for (u32 i = 0; i < 0x10000; i += 4)
-				{
-					if (mode == as_fake_spu_inst ? spu_dis.disasm(spu_base_pc + i) : disasm->disasm(addr + i))
-					{
-						auto& last = mode == as_fake_spu_inst ? spu_dis.last_opcode : disasm->last_opcode;
-
-						if (case_insensitive)
-						{
-							std::transform(last.begin(), last.end(), last.begin(), ::tolower);
-						}
-
-						std::smatch sm;
-
-						if (mode & (as_regex_inst | as_regex_fake_spu_inst) ? std::regex_search(last, sm, std::regex(wstr)) : last.find(wstr) != umax)
-						{
-							gui_log.success("Found instruction at 0x%08x: '%s'", addr + i, last);
-							found++;
-						}
-					}
-				}
-			}
-
-			return;
-		}
-
 		u32 local_found = 0;
 
 		u32 addr = 0;
 		bool ok = false;
 
-		const u64 addr_limit = (m_size >= block_size ? m_size - block_size : 0);
-
 		while (true)
 		{
 			if (!(addr % block_size))
 			{
-				std::tie(addr, ok) = avail_addr.fetch_op([&](u32& val)
+				std::tie(addr, ok) = avail_addr.fetch_op([](u32& val)
 				{
-					if (val <= addr_limit)
+					if (val <= 0 - block_size)
 					{
 						// Iterate in 32MB blocks
 						val += block_size;
@@ -310,14 +228,8 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode)
 				break;
 			}
 
-			if (![&]()
+			if (![&addr = addr]()
 			{
-				if (m_ptr != vm::g_sudo_addr)
-				{
-					// Always valid
-					return true;
-				}
-
 				// Skip unmapped memory
 				for (const u32 end = utils::align(addr + 1, block_size) - 0x1000; !vm::check_addr(addr, 0); addr += 0x1000)
 				{
@@ -340,9 +252,9 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode)
 				continue;
 			}
 
-			const u64 end_mem = std::min<u64>(utils::align<u64>(addr + 1, block_size), m_size);
+			u64 addr_max = addr;
 
-			u64 addr_max = m_ptr == vm::g_sudo_addr ? addr : end_mem;
+			const u64 end_mem = std::min<u64>(utils::align<u64>(addr + 1, block_size) + 0x1000, u32{umax});
 
 			// Determine allocation size quickly
 			while (addr_max < end_mem && vm::check_addr(static_cast<u32>(addr_max), vm::page_1m_size))
@@ -360,53 +272,22 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode)
 				addr_max += 0x1000;
 			}
 
-			auto get_ptr = [&](u32 address)
-			{
-				return static_cast<const char*>(m_ptr) + address;
-			};
-
-			std::string_view section{get_ptr(addr), addr_max - addr};
+			std::string_view section{vm::get_super_ptr<const char>(addr), addr_max - addr};
 
 			usz first_char = 0;
 
-			auto log_occurance = [&](std::string_view& test_sv, bool always_log_str)
-			{
-				// Cut out a view which may or may not be suffixed by a single null character
-				// This view is a peek at the full string which resides in PS3 memory
-				test_sv = test_sv.substr(0, std::max<usz>(wstr.size(), 100));
-				const usz null_pos = test_sv.find_first_of("\n\0"sv, wstr.size());
-				test_sv = test_sv.substr(0, null_pos);
-
-				const usz start = test_sv.data() - get_ptr(0);
-
-				if (!always_log_str && test_sv.size() == wstr.size())
-				{
-					// Shorthand logging for identical strings
-					gui_log.success("Found at 0x%08x", start);
-				}
-				else if (null_pos != umax)
-				{
-					gui_log.success("Found at 0x%08x: '%s'", start, test_sv);
-				}
-				else
-				{
-					gui_log.success("Found at 0x%08x: '%s'..", start, test_sv);
-				}
-			};
-
 			if (case_insensitive)
 			{
 				while (first_char = section.find_first_of(insensitive_search, first_char), first_char != umax)
 				{
-					const u32 start = addr + ::narrow<u32>(first_char);
+					const u32 start = addr + first_char;
 
-					std::string_view test_sv{get_ptr(start), addr_max - start};
+					std::string_view test_sv{vm::get_super_ptr<const char>(start), addr_max - start};
 
 					// Do not use allocating functions such as fmt::to_lower
 					if (test_sv.size() >= wstr.size() && std::all_of(wstr.begin(), wstr.end(), [&](const char& c) { return c == ::tolower(test_sv[&c - wstr.data()]); }))
 					{
-						// Force full logging if any character differs in case
-						log_occurance(test_sv, !test_sv.starts_with(wstr));
+						gui_log.success("Found at 0x%08x", start);
 						local_found++;
 					}
 
@@ -418,21 +299,11 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode)
 			{
 				while (first_char = section.find_first_of(wstr[0], first_char), first_char != umax)
 				{
-					const u32 start = addr + ::narrow<u32>(first_char);
+					const u32 start = addr + first_char;
 
-					std::string_view test_sv{get_ptr(start), addr_max - start};
-
-					if (test_sv.starts_with(wstr))
+					if (std::string_view{vm::get_super_ptr<const char>(start), addr_max - start}.starts_with(wstr))
 					{
-						if (mode == as_string)
-						{
-							log_occurance(test_sv, false);
-						}
-						else
-						{
-							gui_log.success("Found at 0x%08x", start);
-						}
-
+						gui_log.success("Found at 0x%08x", start);
 						local_found++;
 					}
 
@@ -440,13 +311,10 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode)
 				}
 			}
 
-			// Check if at last page
-			if (addr_max >= m_size - 0x1000)
-			{
-				break;
-			}
+			addr = static_cast<u32>(std::min<u64>(end_mem - 0x1000, addr_max));
 
-			addr = addr_max;
+			// Check if at last page
+			if (addr_max >= 0u - 0x1000) break;
 		}
 
 		found += local_found;
@@ -454,5 +322,5 @@ u64 memory_viewer_panel::OnSearch(std::string wstr, u32 mode)
 
 	workers.join();
 
-	return found;
+	gui_log.success("Search completed (found %u matches)", +found);
 }
diff --git a/rpcs3/rpcs3qt/memory_string_searcher.h b/rpcs3/rpcs3qt/memory_string_searcher.h
new file mode 100644
index 0000000000..73c2876b49
--- /dev/null
+++ b/rpcs3/rpcs3qt/memory_string_searcher.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <QDialog>
+
+class QLineEdit;
+class QCheckBox;
+class QComboBox;
+
+class memory_string_searcher : public QDialog
+{
+	Q_OBJECT
+
+	QLineEdit* m_addr_line = nullptr;
+	QCheckBox* m_chkbox_case_insensitive = nullptr;
+	QComboBox* m_cbox_input_mode = nullptr;
+
+public:
+	explicit memory_string_searcher(QWidget* parent);
+
+private Q_SLOTS:
+	void OnSearch();
+};
diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.cpp b/rpcs3/rpcs3qt/memory_viewer_panel.cpp
index 533dccc4d2..5bbc09a08e 100644
--- a/rpcs3/rpcs3qt/memory_viewer_panel.cpp
+++ b/rpcs3/rpcs3qt/memory_viewer_panel.cpp
@@ -1,77 +1,60 @@
+#include "Utilities/mutex.h"
 #include "Emu/Memory/vm_locking.h"
 #include "Emu/Memory/vm.h"
 
 #include "memory_viewer_panel.h"
-#include "hex_validator.h"
 
 #include "Emu/Cell/SPUThread.h"
-#include "Emu/CPU/CPUDisAsm.h"
 #include "Emu/RSX/RSXThread.h"
 #include "Emu/RSX/rsx_utils.h"
 #include "Emu/IdManager.h"
-#include "Emu/System.h"
 #include <QVBoxLayout>
 #include <QPushButton>
 #include <QSpinBox>
 #include <QGroupBox>
 #include <QTextEdit>
 #include <QComboBox>
-#include <QCheckBox>
 #include <QWheelEvent>
-#include <QHoverEvent>
-#include <QMouseEvent>
-#include <QTimer>
-#include <QThread>
-#include <QKeyEvent>
+#include <shared_mutex>
 
-#include "util/logs.hpp"
 #include "util/asm.hpp"
-#include "debugger_frame.h"
+#include "util/vm.hpp"
 
-LOG_CHANNEL(gui_log, "GUI");
+constexpr auto qstr = QString::fromStdString;
 
-memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDisAsm> disasm, u32 addr, std::function<cpu_thread*()> func)
+memory_viewer_panel::memory_viewer_panel(QWidget* parent, u32 addr, std::function<cpu_thread*()> func)
 	: QDialog(parent)
 	, m_addr(addr)
-	, m_get_cpu(func ? std::move(func) : std::function<cpu_thread*()>(FN(nullptr)))
+	, m_get_cpu(std::move(func))
 	, m_type([&]()
 	{
 		const auto cpu = m_get_cpu();
-		if (!cpu) return thread_class::general;
 
-		thread_class type = cpu->get_class();
+		if (!cpu) return thread_type::none;
+		if (cpu->id_type() == 1) return thread_type::ppu;
+		if (cpu->id_type() == 0x55) return thread_type::rsx;
+		if (cpu->id_type() == 2) return thread_type::spu;
 
-		switch (type)
-		{
-		case thread_class::ppu:
-		case thread_class::spu:
-		case thread_class::rsx:
-			break;
-		default:
-			fmt::throw_exception("Unknown CPU type (0x%x)", cpu->id_type());
-		}
-
-		return type;
+		fmt::throw_exception("Unknown CPU type (0x%x)", cpu->id_type());
 	}())
-	, m_rsx(m_type == thread_class::rsx ? static_cast<rsx::thread*>(m_get_cpu()) : nullptr)
+	, m_rsx(m_type == thread_type::rsx ? static_cast<rsx::thread*>(m_get_cpu()) : nullptr)
 	, m_spu_shm([&]()
 	{
 		const auto cpu = m_get_cpu();
-		return cpu && m_type == thread_class::spu ? static_cast<spu_thread*>(cpu)->shm : nullptr;
+		return cpu && m_type == thread_type::spu ? static_cast<spu_thread*>(cpu)->shm : nullptr;
 	}())
-	, m_addr_mask(m_type == thread_class::spu ? SPU_LS_SIZE - 1 : ~0)
-	, m_disasm(std::move(disasm))
+	, m_addr_mask(m_type == thread_type::spu ? SPU_LS_SIZE - 1 : ~0)
 {
 	const auto cpu = m_get_cpu();
 
 	setWindowTitle(
-		cpu && m_type == thread_class::spu ? tr("Memory Viewer Of %0").arg(QString::fromStdString(cpu->get_name())) :
-		cpu && m_type == thread_class::rsx ? tr("Memory Viewer Of RSX[0x55555555]") :
+		cpu && m_type == thread_type::spu ? tr("Memory Viewer Of %0").arg(qstr(cpu->get_name())) :
+		cpu && m_type == thread_type::rsx ? tr("Memory Viewer Of RSX[0x55555555]") :
 		tr("Memory Viewer"));
 
 	setObjectName("memory_viewer");
 	m_colcount = 4;
-	m_rowcount = 1;
+	m_rowcount = 16;
 	const int pSize = 10;
 
 	// Font
@@ -80,30 +63,30 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
 	m_fontMetrics = new QFontMetrics(mono);
 
 	// Layout:
-	QVBoxLayout* vbox_panel = new QVBoxLayout(this);
+	QVBoxLayout* vbox_panel = new QVBoxLayout();
 
 	// Tools
-	QHBoxLayout* hbox_tools = new QHBoxLayout(this);
+	QHBoxLayout* hbox_tools = new QHBoxLayout();
 
 	// Tools: Memory Viewer Options
-	QGroupBox* tools_mem = new QGroupBox(tr("Memory Viewer Options"), this);
-	QHBoxLayout* hbox_tools_mem = new QHBoxLayout(this);
+	QGroupBox* tools_mem = new QGroupBox(tr("Memory Viewer Options"));
+	QHBoxLayout* hbox_tools_mem = new QHBoxLayout();
 
 	// Tools: Memory Viewer Options: Address
-	QGroupBox* tools_mem_addr = new QGroupBox(tr("Address"), this);
-	QHBoxLayout* hbox_tools_mem_addr = new QHBoxLayout(this);
+	QGroupBox* tools_mem_addr = new QGroupBox(tr("Address"));
+	QHBoxLayout* hbox_tools_mem_addr = new QHBoxLayout();
 	m_addr_line = new QLineEdit(this);
 	m_addr_line->setPlaceholderText("00000000");
 	m_addr_line->setFont(mono);
-	m_addr_line->setValidator(new HexValidator(m_addr_line));
-	m_addr_line->setFixedWidth(100);
+	m_addr_line->setMaxLength(18);
+	m_addr_line->setFixedWidth(75);
 	m_addr_line->setFocus();
-	m_addr_line->setAlignment(Qt::AlignCenter);
+	m_addr_line->setValidator(new QRegExpValidator(QRegExp(m_type == thread_type::spu ? "^(0[xX])?0*[a-fA-F0-9]{0,5}$" : "^(0[xX])?0*[a-fA-F0-9]{0,8}$")));
 	hbox_tools_mem_addr->addWidget(m_addr_line);
 	tools_mem_addr->setLayout(hbox_tools_mem_addr);
 
 	// Tools: Memory Viewer Options: Words
-	QGroupBox* tools_mem_words = new QGroupBox(tr("Words"), this);
+	QGroupBox* tools_mem_words = new QGroupBox(tr("Words"));
 	QHBoxLayout* hbox_tools_mem_words = new QHBoxLayout();
 
 	class words_spin_box : public QSpinBox
@@ -120,7 +103,7 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
 
 		QString textFromValue(int value) const override
 		{
-			return QString("%0").arg(1 << value);
+			return tr("%0").arg(1 << value);
 		}
 	};
 
@@ -132,7 +115,7 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
 
 	// Tools: Memory Viewer Options: Control
 	QGroupBox* tools_mem_buttons = new QGroupBox(tr("Control"));
-	QHBoxLayout* hbox_tools_mem_buttons = new QHBoxLayout(this);
+	QHBoxLayout* hbox_tools_mem_buttons = new QHBoxLayout();
 	QPushButton* b_fprev = new QPushButton("<<", this);
 	QPushButton* b_prev = new QPushButton("<", this);
 	QPushButton* b_next = new QPushButton(">", this);
@@ -151,33 +134,24 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
 	hbox_tools_mem_buttons->addWidget(b_fnext);
 	tools_mem_buttons->setLayout(hbox_tools_mem_buttons);
 
-	QGroupBox* tools_mem_refresh = new QGroupBox(tr("Refresh"));
-	QHBoxLayout* hbox_tools_mem_refresh = new QHBoxLayout(this);
-	QPushButton* button_auto_refresh = new QPushButton(QStringLiteral(" "), this);
-	button_auto_refresh->setFixedWidth(20);
-	button_auto_refresh->setAutoDefault(false);
-	hbox_tools_mem_refresh->addWidget(button_auto_refresh);
-	tools_mem_refresh->setLayout(hbox_tools_mem_refresh);
-
 	// Merge Tools: Memory Viewer
 	hbox_tools_mem->addWidget(tools_mem_addr);
 	hbox_tools_mem->addWidget(tools_mem_words);
 	hbox_tools_mem->addWidget(tools_mem_buttons);
-	hbox_tools_mem->addWidget(tools_mem_refresh);
 	tools_mem->setLayout(hbox_tools_mem);
 
 	// Tools: Raw Image Preview Options
-	QGroupBox* tools_img = new QGroupBox(tr("Raw Image Preview Options"), this);
-	QHBoxLayout* hbox_tools_img = new QHBoxLayout(this);
+	QGroupBox* tools_img = new QGroupBox(tr("Raw Image Preview Options"));
+	QHBoxLayout* hbox_tools_img = new QHBoxLayout();
 
 	// Tools: Raw Image Preview Options : Size
-	QGroupBox* tools_img_size = new QGroupBox(tr("Size"), this);
-	QHBoxLayout* hbox_tools_img_size = new QHBoxLayout(this);
+	QGroupBox* tools_img_size = new QGroupBox(tr("Size"));
+	QHBoxLayout* hbox_tools_img_size = new QHBoxLayout();
 	QLabel* l_x = new QLabel(" x ");
 	QSpinBox* sb_img_size_x = new QSpinBox(this);
 	QSpinBox* sb_img_size_y = new QSpinBox(this);
-	sb_img_size_x->setRange(1, m_type == thread_class::spu ? 256 : 4096);
-	sb_img_size_y->setRange(1, m_type == thread_class::spu ? 256 : 4096);
+	sb_img_size_x->setRange(1, m_type == thread_type::spu ? 256 : 4096);
+	sb_img_size_y->setRange(1, m_type == thread_type::spu ? 256 : 4096);
 	sb_img_size_x->setValue(256);
 	sb_img_size_y->setValue(256);
 	hbox_tools_img_size->addWidget(sb_img_size_x);
@@ -186,15 +160,13 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
 	tools_img_size->setLayout(hbox_tools_img_size);
 
 	// Tools: Raw Image Preview Options: Mode
-	QGroupBox* tools_img_mode = new QGroupBox(tr("Mode"), this);
-	QHBoxLayout* hbox_tools_img_mode = new QHBoxLayout(this);
+	QGroupBox* tools_img_mode = new QGroupBox(tr("Mode"));
+	QHBoxLayout* hbox_tools_img_mode = new QHBoxLayout();
 	QComboBox* cbox_img_mode = new QComboBox(this);
 	cbox_img_mode->addItem("RGB", QVariant::fromValue(color_format::RGB));
 	cbox_img_mode->addItem("ARGB", QVariant::fromValue(color_format::ARGB));
 	cbox_img_mode->addItem("RGBA", QVariant::fromValue(color_format::RGBA));
 	cbox_img_mode->addItem("ABGR", QVariant::fromValue(color_format::ABGR));
-	cbox_img_mode->addItem("G8", QVariant::fromValue(color_format::G8));
-	cbox_img_mode->addItem("G32MAX", QVariant::fromValue(color_format::G32MAX));
 	cbox_img_mode->setCurrentIndex(1); //ARGB
 	hbox_tools_img_mode->addWidget(cbox_img_mode);
 	tools_img_mode->setLayout(hbox_tools_img_mode);
@@ -205,7 +177,7 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
 	tools_img->setLayout(hbox_tools_img);
 
 	// Tools: Tool Buttons
-	QGroupBox* tools_buttons = new QGroupBox(tr("Tools"), this);
+	QGroupBox* tools_buttons = new QGroupBox(tr("Tools"));
 	QVBoxLayout* hbox_tools_buttons = new QVBoxLayout(this);
 	QPushButton* b_img = new QPushButton(tr("View\nimage"), this);
 	b_img->setAutoDefault(false);
@@ -213,22 +185,17 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
 	tools_buttons->setLayout(hbox_tools_buttons);
 
 	// Merge Tools = Memory Viewer Options + Raw Image Preview Options + Tool Buttons
-	hbox_tools->addSpacing(20);
+	hbox_tools->addSpacing(10);
 	hbox_tools->addWidget(tools_mem);
 	hbox_tools->addWidget(tools_img);
 	hbox_tools->addWidget(tools_buttons);
-	hbox_tools->addSpacing(20);
+	hbox_tools->addSpacing(10);
 
 	// Memory Panel:
-	m_hbox_mem_panel = new QHBoxLayout(this);
+	QHBoxLayout* hbox_mem_panel = new QHBoxLayout();
 
 	// Memory Panel: Address Panel
 	m_mem_addr = new QLabel("");
-
-	QSizePolicy sp_retain = m_mem_addr->sizePolicy();
-	sp_retain.setRetainSizeWhenHidden(false);
-
-	m_mem_addr->setSizePolicy(sp_retain);
 	m_mem_addr->setObjectName("memory_viewer_address_panel");
 	m_mem_addr->setFont(mono);
 	m_mem_addr->setAutoFillBackground(true);
@@ -237,7 +204,6 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
 
 	// Memory Panel: Hex Panel
 	m_mem_hex = new QLabel("");
-	m_mem_hex->setSizePolicy(sp_retain);
 	m_mem_hex->setObjectName("memory_viewer_hex_panel");
 	m_mem_hex->setFont(mono);
 	m_mem_hex->setAutoFillBackground(true);
@@ -246,7 +212,6 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
 
 	// Memory Panel: ASCII Panel
 	m_mem_ascii = new QLabel("");
-	m_mem_ascii->setSizePolicy(sp_retain);
 	m_mem_ascii->setObjectName("memory_viewer_ascii_panel");
 	m_mem_ascii->setFont(mono);
 	m_mem_ascii->setAutoFillBackground(true);
@@ -254,194 +219,61 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
 	m_mem_ascii->ensurePolished();
 
 	// Merge Memory Panel:
-	m_hbox_mem_panel->setAlignment(Qt::AlignTop | Qt::AlignHCenter);
-	m_hbox_mem_panel->addSpacing(20);
-	m_hbox_mem_panel->addWidget(m_mem_addr);
-	m_hbox_mem_panel->addSpacing(10);
-	m_hbox_mem_panel->addWidget(m_mem_hex);
-	m_hbox_mem_panel->addSpacing(10);
-	m_hbox_mem_panel->addWidget(m_mem_ascii);
-	m_hbox_mem_panel->addSpacing(20);
-
-	QHBoxLayout* hbox_memory_search = new QHBoxLayout(this);
+	hbox_mem_panel->setAlignment(Qt::AlignTop | Qt::AlignHCenter);
+	hbox_mem_panel->addSpacing(20);
+	hbox_mem_panel->addWidget(m_mem_addr);
+	hbox_mem_panel->addSpacing(10);
+	hbox_mem_panel->addWidget(m_mem_hex);
+	hbox_mem_panel->addSpacing(10);
+	hbox_mem_panel->addWidget(m_mem_ascii);
+	hbox_mem_panel->addSpacing(10);
 
 	// Set Margins to adjust WindowSize
 	vbox_panel->setContentsMargins(0, 0, 0, 0);
 	hbox_tools->setContentsMargins(0, 0, 0, 0);
-	tools_mem_addr->setContentsMargins(0, 5, 0, 0);
-	tools_mem_words->setContentsMargins(0, 5, 0, 0);
-	tools_mem_buttons->setContentsMargins(0, 5, 0, 0);
-	tools_img_mode->setContentsMargins(0, 5, 0, 0);
-	tools_img_size->setContentsMargins(0, 5, 0, 0);
-	tools_mem->setContentsMargins(0, 5, 0, 0);
-	tools_img->setContentsMargins(0, 5, 0, 0);
-	tools_buttons->setContentsMargins(0, 5, 0, 0);
-	m_hbox_mem_panel->setContentsMargins(0, 0, 0, 0);
-	hbox_memory_search->setContentsMargins(0, 0, 0, 0);
-
-	if (m_disasm)
-	{
-		// Extract memory view from the disassembler
-		std::tie(m_ptr, m_size) = m_disasm->get_memory_span();
-	}
-
-	QGroupBox* group_search = new QGroupBox(tr("Memory Search"), this);
-	QPushButton* button_collapse_viewer = new QPushButton(reinterpret_cast<const char*>(u8"Ʌ"), group_search);
-	button_collapse_viewer->setFixedWidth(QLabel(button_collapse_viewer->text()).sizeHint().width() * 3);
-	button_collapse_viewer->setAutoDefault(false);
-	
-	m_search_line = new QLineEdit(group_search);
-	m_search_line->setFixedWidth(QLabel(QString("This is the very length of the lineedit due to hidpi reasons.").chopped(4)).sizeHint().width());
-	m_search_line->setPlaceholderText(tr("Search..."));
-	m_search_line->setMaxLength(4096);
-
-	QPushButton* button_search = new QPushButton(tr("Search"), group_search);
-	button_search->setEnabled(false);
-
-	m_chkbox_case_insensitive = new QCheckBox(tr("Case Insensitive"), group_search);
-	m_chkbox_case_insensitive->setCheckable(true);
-	m_chkbox_case_insensitive->setToolTip(tr("When using string mode, the characters' case will not matter both in string and in memory."
-		"\nWarning: this may reduce performance of the search."));
-
-	m_cbox_input_mode = new QComboBox(group_search);
-	m_cbox_input_mode->addItem(tr("Select search mode(s).."), QVariant::fromValue(+no_mode));
-	m_cbox_input_mode->addItem(tr("Deselect All Modes"), QVariant::fromValue(+clear_modes));
-	m_cbox_input_mode->addItem(tr("String"), QVariant::fromValue(+as_string));
-	m_cbox_input_mode->addItem(tr("HEX bytes/integer"), QVariant::fromValue(+as_hex));
-	m_cbox_input_mode->addItem(tr("Double"), QVariant::fromValue(+as_f64));
-	m_cbox_input_mode->addItem(tr("Float"), QVariant::fromValue(+as_f32));
-	m_cbox_input_mode->addItem(tr("Instruction"), QVariant::fromValue(+as_inst));
-	m_cbox_input_mode->addItem(tr("RegEx Instruction"), QVariant::fromValue(+as_regex_inst));
-
-	QString tooltip = tr("String: search the memory for the specified string."
-		"\nHEX bytes/integer: search the memory for hexadecimal values. Spaces, commas, \"0x\", \"0X\", \"\\x\", \"h\", \"H\" ensure separation of bytes but they are not mandatory."
-		"\nDouble: reinterpret the string as 64-bit precision floating point value. Values are searched for exact representation, meaning -0 != 0."
-		"\nFloat: reinterpret the string as 32-bit precision floating point value. Values are searched for exact representation, meaning -0 != 0."
-		"\nInstruction: search an instruction contains the text of the string."
-		"\nRegEx: search an instruction containing text that matches the regular expression input.");
-
-	if (m_size != 0x40000/*SPU_LS_SIZE*/)
-	{
-		m_cbox_input_mode->addItem("SPU Instruction", QVariant::fromValue(+as_fake_spu_inst));
-		m_cbox_input_mode->addItem(tr("SPU RegEx-Instruction"), QVariant::fromValue(+as_regex_fake_spu_inst));
-		tooltip.append(tr("\nSPU Instruction: Search an SPU instruction contains the text of the string. For searching instructions within embedded SPU images.\nTip: SPU floats are commented along forming instructions."));
-	}
-
-	connect(m_cbox_input_mode, QOverload<int>::of(&QComboBox::currentIndexChanged), group_search, [this, button_search](int index)
-	{
-		if (index < 1 || m_rsx)
-		{
-			return;
-		}
-
-		if ((1u << index) == clear_modes)
-		{
-			m_modes = {};
-		}
-		else
-		{
-			m_modes = search_mode{m_modes | (1 << index)};
-		}
-
-		const s32 count = std::popcount(+m_modes);
-
-		if (count == 0)
-		{
-			button_search->setEnabled(false);
-			m_cbox_input_mode->setItemText(0, tr("Select search mode(s).."));
-		}
-		else
-		{
-			button_search->setEnabled(true);
-			m_cbox_input_mode->setItemText(0, tr("%0 mode(s) selected").arg(count));
-		}
-
-		for (u32 i = search_mode_last / 2; i > clear_modes; i /= 2)
-		{
-			if (i & m_modes && count > 1)
-			{
-				m_cbox_input_mode->setItemText(std::countr_zero<u32>(i), QString::fromStdString(fmt::format("* %s", search_mode{i})));
-			}
-			else
-			{
-				m_cbox_input_mode->setItemText(std::countr_zero<u32>(i), QString::fromStdString(fmt::format("%s", search_mode{i})));
-			}
-		}
-
-		if (count != 1)
-		{
-			m_cbox_input_mode->setCurrentIndex(0);
-		}
-	});
-
-	m_cbox_input_mode->setToolTip(tooltip);
-
-	QVBoxLayout* vbox_search_layout = new QVBoxLayout(group_search);
-
-	QHBoxLayout* hbox_search_panel = new QHBoxLayout(group_search);
-	QHBoxLayout* hbox_search_modes = new QHBoxLayout(group_search);
-
-	hbox_search_panel->addWidget(button_collapse_viewer);
-	hbox_search_panel->addWidget(m_search_line);
-	hbox_search_panel->addWidget(m_cbox_input_mode);
-	hbox_search_panel->addWidget(m_chkbox_case_insensitive);
-	hbox_search_panel->addWidget(button_search);
-
-	vbox_search_layout->addLayout(hbox_search_panel);
-	vbox_search_layout->addLayout(hbox_search_modes);
-	group_search->setLayout(vbox_search_layout);
-
-	hbox_memory_search->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
-	hbox_memory_search->addSpacing(20);
-	hbox_memory_search->addWidget(group_search);
-	hbox_memory_search->addSpacing(20);
+	tools_mem_addr->setContentsMargins(0, 10, 0, 0);
+	tools_mem_words->setContentsMargins(0, 10, 0, 0);
+	tools_mem_buttons->setContentsMargins(0, 10, 0, 0);
+	tools_img_mode->setContentsMargins(0, 10, 0, 0);
+	tools_img_size->setContentsMargins(0, 10, 0, 0);
+	tools_mem->setContentsMargins(0, 10, 0, 0);
+	tools_img->setContentsMargins(0, 10, 0, 0);
+	tools_buttons->setContentsMargins(0, 10, 0, 0);
+	hbox_mem_panel->setContentsMargins(0, 0, 0, 0);
 
 	// Merge and display everything
 	vbox_panel->addSpacing(10);
-
-	auto get_row = [row = 0]() mutable
-	{
-		return row++;
-	};
-
-	vbox_panel->addLayout(hbox_tools, get_row());
-	vbox_panel->addSpacing(5);
-	vbox_panel->addLayout(m_hbox_mem_panel, get_row());
-
-	// TODO: RSX memory searcher
-	if (!m_rsx)
-	{
-		vbox_panel->addLayout(hbox_memory_search, get_row());
-		vbox_panel->addSpacing(15);
-	}
-	else
-	{
-		group_search->deleteLater();
-	}
-
+	vbox_panel->addLayout(hbox_tools, 0);
+	vbox_panel->addSpacing(10);
+	vbox_panel->addLayout(hbox_mem_panel, 1);
+	vbox_panel->addSpacing(10);
 	vbox_panel->setSizeConstraint(QLayout::SetNoConstraint);
 	setLayout(vbox_panel);
 
+	// Fill the QTextEdits
+	scroll(0);
+
 	// Events
-	connect(m_addr_line, &QLineEdit::returnPressed, this, [this]()
+	connect(m_addr_line, &QLineEdit::returnPressed, [this]()
 	{
 		bool ok = false;
-		const u32 addr = normalize_hex_qstring(m_addr_line->text()).toULong(&ok, 16);
+		const QString text = m_addr_line->text();
+		const u32 addr = (text.startsWith("0x", Qt::CaseInsensitive) ? text.right(text.size() - 2) : text).toULong(&ok, 16);
 		if (ok) m_addr = addr;
 
 		scroll(0); // Refresh
 	});
-	connect(sb_words, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, [=, this]()
+	connect(sb_words, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), [=, this]()
 	{
 		m_colcount = 1 << sb_words->value();
 		ShowMemory();
 	});
 
-	connect(b_prev, &QAbstractButton::clicked, this, [this]() { scroll(-1); });
-	connect(b_next, &QAbstractButton::clicked, this, [this]() { scroll(1); });
-	connect(b_fprev, &QAbstractButton::clicked, this, [this]() { scroll(m_rowcount * -1); });
-	connect(b_fnext, &QAbstractButton::clicked, this, [this]() { scroll(m_rowcount); });
-	connect(b_img, &QAbstractButton::clicked, this, [=, this]()
+	connect(b_prev, &QAbstractButton::clicked, [this]() { scroll(-1); });
+	connect(b_next, &QAbstractButton::clicked, [this]() { scroll(1); });
+	connect(b_fprev, &QAbstractButton::clicked, [this]() { scroll(m_rowcount * -1); });
+	connect(b_fnext, &QAbstractButton::clicked, [this]() { scroll(m_rowcount); });
+	connect(b_img, &QAbstractButton::clicked, [=, this]()
 	{
 		const color_format format = cbox_img_mode->currentData().value<color_format>();
 		const int sizex = sb_img_size_x->value();
@@ -449,163 +281,15 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
 		ShowImage(this, m_addr, format, sizex, sizey, false);
 	});
 
-	QTimer* auto_refresh_timer = new QTimer(this);
-
-	connect(auto_refresh_timer, &QTimer::timeout, this, [this]()
-	{
-		ShowMemory();
-	});
-
-	connect(button_auto_refresh, &QAbstractButton::clicked, this, [=, this]()
-	{
-		const bool is_checked = button_auto_refresh->text() != " ";
-		if (auto_refresh_timer->isActive() != is_checked)
-		{
-			return;
-		}
-
-		if (is_checked)
-		{
-			button_auto_refresh->setText(QStringLiteral(" "));
-			auto_refresh_timer->stop();
-		}
-		else
-		{
-			button_auto_refresh->setText(reinterpret_cast<const char*>(u8"█"));
-			ShowMemory();
-			auto_refresh_timer->start(16);
-		}
-	});
-
-	if (!m_rsx)
-	{
-		connect(button_search, &QAbstractButton::clicked, this, [this]()
-		{
-			if (m_search_thread && m_search_thread->isRunning())
-			{
-				// Prevent spamming (search is costly on performance)
-				return;
-			}
-
-			if (m_search_thread)
-			{
-				m_search_thread->deleteLater();
-				m_search_thread = nullptr;
-			}
-
-			std::string wstr = m_search_line->text().toStdString();
-
-			if (wstr.empty() || wstr.size() >= 4096u)
-			{
-				gui_log.error("String is empty or too long (size=%u)", wstr.size());
-				return;
-			}
-
-			m_search_thread = QThread::create([this, wstr, m_modes = m_modes]()
-			{
-				gui_log.notice("Searching for %s (mode: %s)", wstr, m_modes);
-
-				u64 found = 0;
-
-				for (int modes = m_modes; modes; modes &= modes - 1)
-				{
-					found += OnSearch(wstr, modes & ~(modes - 1));
-				}
-
-				gui_log.success("Search completed (found %u matches)", +found);
-			});
-
-			m_search_thread->start();
-		});
-
-		connect(button_collapse_viewer, &QAbstractButton::clicked, this, [this, button_collapse_viewer, m_previous_row_count = -1]() mutable
-		{
-			const bool is_collapsing = button_collapse_viewer->text() == reinterpret_cast<const char*>(u8"Ʌ");
-			button_collapse_viewer->setText(is_collapsing ? "V" : reinterpret_cast<const char*>(u8"Ʌ"));
-
-			if (is_collapsing)
-			{
-				m_previous_row_count = std::exchange(m_rowcount, 0);
-				setMinimumHeight(0);
-			}
-			else
-			{
-				m_rowcount = std::exchange(m_previous_row_count, 0);
-				setMaximumHeight(16777215); // Default Qt value
-			}
-
-			ShowMemory();
-
-			QTimer::singleShot(0, this, [this, button_collapse_viewer]()
-			{
-				const bool is_collapsing = button_collapse_viewer->text() != reinterpret_cast<const char*>(u8"Ʌ");
-
-				// singleShot to evaluate properly after the event
-				const int height_hint = sizeHint().height();
-				resize(size().width(), height_hint);
-
-				if (is_collapsing)
-				{
-					setMinimumHeight(height_hint);
-					setMaximumHeight(height_hint + 1);
-				}
-				else
-				{
-					setMinimumHeight(m_min_height);
-				}
-			});
-		});
-	}
-
-	// Set the minimum height of one row
-	m_rowcount = 1;
-	ShowMemory();
-	m_min_height = sizeHint().height();
-	setMinimumHeight(m_min_height);
-
-	m_rowcount = 16;
-	ShowMemory();
-
 	setFixedWidth(sizeHint().width());
 
-	// Fill the QTextEdits
-	scroll(0);
-
 	// Show by default
 	show();
 
 	// Expected to be created by IDM, emulation stop will close it
-	const u32 id = idm::last_id();
-	auto handle_ptr = idm::get_unlocked<memory_viewer_handle>(id);
-
-	connect(this, &memory_viewer_panel::finished, this, [handle_ptr = std::move(handle_ptr), id, this](int)
+	connect(this, &memory_viewer_panel::finished, [id = idm::last_id()](int)
 	{
-		if (m_search_thread)
-		{
-			m_search_thread->wait();
-			m_search_thread->deleteLater();
-			m_search_thread = nullptr;
-		}
-
-		idm::remove_verify<memory_viewer_handle>(id, handle_ptr);
-	});
-
-	if (!g_fxo->try_get<memory_viewer_fxo>())
-	{
-		g_fxo->init<memory_viewer_fxo>();
-	}
-
-	auto& fxo = g_fxo->get<memory_viewer_fxo>();
-	fxo.last_opened[m_type] = this;
-
-	connect(this, &memory_viewer_panel::destroyed, this, [this]()
-	{
-		if (auto fxo = g_fxo->try_get<memory_viewer_fxo>())
-		{
-			auto it = fxo->last_opened.find(m_type);
-			if (it != fxo->last_opened.end() && it->second == this)
-				fxo->last_opened.erase(it);
-		}
+		idm::remove<memory_viewer_handle>(id);
 	});
 }
 
@@ -615,7 +299,7 @@ memory_viewer_panel::~memory_viewer_panel()
 
 void memory_viewer_panel::wheelEvent(QWheelEvent *event)
 {
-	// Set some scroll speed modifiers:
+	// Set some scrollspeed modifiers:
 	u32 step_size = 1;
 	if (event->modifiers().testFlag(Qt::ControlModifier))
 		step_size *= m_rowcount;
@@ -631,8 +315,7 @@ void memory_viewer_panel::scroll(s32 steps)
 	m_addr &= m_addr_mask; // Mask it
 	m_addr -= m_addr % (m_colcount * 4); // Align by amount of bytes in a row
 
-	m_addr_line->setText(QString::fromStdString(fmt::format("%08x", m_addr)));
-
+	m_addr_line->setText(qstr(fmt::format("%08x", m_addr)));
 	ShowMemory();
 }
 
@@ -644,43 +327,38 @@ void memory_viewer_panel::resizeEvent(QResizeEvent *event)
 	const QMargins margins = layout()->contentsMargins();
 
 	int free_height = event->size().height()
-		- (layout()->count() * (margins.top() + margins.bottom())) - c_pad_memory_labels;
+		- (layout()->count() * (margins.top() + margins.bottom()));
 
 	for (int i = 0; i < layout()->count(); i++)
 	{
-		const auto it = layout()->itemAt(i);
-		if (it != m_hbox_mem_panel) // Do not take our memory layout into account
-			free_height -= it->sizeHint().height();
+		if (i != 3) // Index of our memory layout
+			free_height -= layout()->itemAt(i)->sizeHint().height();
 	}
 
+	setMinimumHeight(event->size().height() - free_height + font_height);
 	const u32 new_row_count = std::max(0, free_height) / font_height;
 
 	if (m_rowcount != new_row_count)
 	{
 		m_rowcount = new_row_count;
-
-		QTimer::singleShot(0, [this]()
-		{
-			// Prevent recursion of events
-			ShowMemory();
-		});
+		ShowMemory();
 	}
 }
 
 std::string memory_viewer_panel::getHeaderAtAddr(u32 addr) const
 {
-	if (m_type == thread_class::spu) return {};
+	if (m_type == thread_type::spu) return {};
 
 	// Check if its an SPU Local Storage beginning
 	const u32 spu_boundary = utils::align<u32>(addr, SPU_LS_SIZE);
 
 	if (spu_boundary <= addr + m_colcount * 4 - 1)
 	{
-		shared_ptr<named_thread<spu_thread>> spu;
+		std::shared_ptr<named_thread<spu_thread>> spu;
 
 		if (const u32 raw_spu_index = (spu_boundary - RAW_SPU_BASE_ADDR) / SPU_LS_SIZE; raw_spu_index < 5)
 		{
-			spu = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu(raw_spu_index));
+			spu = idm::get<named_thread<spu_thread>>(spu_thread::find_raw_spu(raw_spu_index));
 
 			if (spu && spu->get_type() == spu_type::threaded)
 			{
@@ -689,7 +367,7 @@ std::string memory_viewer_panel::getHeaderAtAddr(u32 addr) const
 		}
 		else if (const u32 spu_index = (spu_boundary - SPU_FAKE_BASE_ADDR) / SPU_LS_SIZE; spu_index < spu_thread::id_count)
 		{
-			spu = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::id_base | spu_index);
+			spu = idm::get<named_thread<spu_thread>>(spu_thread::id_base | spu_index);
 
 			if (spu && spu->get_type() != spu_type::threaded)
 			{
@@ -708,7 +386,7 @@ std::string memory_viewer_panel::getHeaderAtAddr(u32 addr) const
 
 void* memory_viewer_panel::to_ptr(u32 addr, u32 size) const
 {
-	if (m_type >= thread_class::spu && !m_get_cpu())
+	if (m_type >= thread_type::spu && !m_get_cpu())
 	{
 		return nullptr;
 	}
@@ -720,8 +398,8 @@ void* memory_viewer_panel::to_ptr(u32 addr, u32 size) const
 
 	switch (m_type)
 	{
-	case thread_class::general:
-	case thread_class::ppu:
+	case thread_type::none:
+	case thread_type::ppu:
 	{
 		if (vm::check_addr(addr, 0, size))
 		{
@@ -730,7 +408,7 @@ void* memory_viewer_panel::to_ptr(u32 addr, u32 size) const
 
 		break;
 	}
-	case thread_class::spu:
+	case thread_type::spu:
 	{
 		if (size <= SPU_LS_SIZE && SPU_LS_SIZE - size >= (addr % SPU_LS_SIZE))
 		{
@@ -739,20 +417,18 @@ void* memory_viewer_panel::to_ptr(u32 addr, u32 size) const
 
 		break;
 	}
-	case thread_class::rsx:
+	case thread_type::rsx:
 	{
 		u32 final_addr = 0;
 
-		constexpr u32 local_mem = rsx::constants::local_mem_base;
-
-		if (size > 0x2000'0000 || local_mem + 0x1000'0000 - size < addr)
+		if (size > 0x2000'0000 || rsx::constants::local_mem_base + 0x1000'0000 - size < addr)
 		{
 			break;
 		}
 
 		for (u32 i = addr; i >> 20 <= (addr + size - 1) >> 20; i += 0x100000)
 		{
-			const u32 temp = rsx::get_address(i - (i >= local_mem ? local_mem : 0), i < local_mem ? CELL_GCM_LOCATION_MAIN : CELL_GCM_LOCATION_LOCAL, true);
+			const u32 temp = rsx::get_address(i, i < rsx::constants::local_mem_base ? CELL_GCM_LOCATION_MAIN : CELL_GCM_LOCATION_LOCAL, true);
 
 			if (!temp)
 			{
@@ -816,7 +492,7 @@ void memory_viewer_panel::ShowMemory()
 
 				for (u32 i = 0; i < 3; i++)
 				{
-					t_mem_addr_str += QString::fromStdString(fmt::format("%08x", addr));
+					t_mem_addr_str += qstr(fmt::format("%08x", addr));
 
 					std::string str(i == 1 ? header : "");
 
@@ -826,7 +502,7 @@ void memory_viewer_panel::ShowMemory()
 					str.resize(expected_str_size);
 					std::replace(str.begin(), str.end(), '\0', i == 1 ? ' ' : '=');
 
-					t_mem_hex_str += QString::fromStdString(str);
+					t_mem_hex_str += qstr(str);
 
 					spu_passed++;
 					row++;
@@ -848,7 +524,7 @@ void memory_viewer_panel::ShowMemory()
 				}
 			}
 
-			t_mem_addr_str += QString::fromStdString(fmt::format("%08x", (m_addr + (row - spu_passed) * m_colcount * 4) & m_addr_mask));
+			t_mem_addr_str += qstr(fmt::format("%08x", (m_addr + (row - spu_passed) * m_colcount * 4) & m_addr_mask));
 		}
 
 		for (u32 col = 0; col < m_colcount; col++)
@@ -862,8 +538,8 @@ void memory_viewer_panel::ShowMemory()
 
 			if (const auto ptr = this->to_ptr(addr))
 			{
-				const be_t<u32> rmem = read_from_ptr<be_t<u32>>(static_cast<const u8*>(ptr));
-				t_mem_hex_str += QString::fromStdString(fmt::format("%02x %02x %02x %02x",
+				const be_t<u32> rmem = *static_cast<be_t<u32>*>(ptr);
+				t_mem_hex_str += qstr(fmt::format("%02x %02x %02x %02x",
 					static_cast<u8>(rmem >> 24),
 					static_cast<u8>(rmem >> 16),
 					static_cast<u8>(rmem >> 8),
@@ -876,7 +552,7 @@ void memory_viewer_panel::ShowMemory()
 					if (!std::isprint(static_cast<u8>(ch))) ch = '.';
 				}
 
-				t_mem_ascii_str += QString::fromStdString(std::move(str));
+				t_mem_ascii_str += qstr(std::move(str));
 			}
 			else
 			{
@@ -886,33 +562,19 @@ void memory_viewer_panel::ShowMemory()
 		}
 	}
 
-	m_mem_addr->setVisible(m_rowcount != 0);
-	m_mem_hex->setVisible(m_rowcount != 0);
-	m_mem_ascii->setVisible(m_rowcount != 0);
-
-	if (t_mem_addr_str != m_mem_addr->text())
-		m_mem_addr->setText(t_mem_addr_str);
-
-	if (t_mem_hex_str != m_mem_hex->text())
-		m_mem_hex->setText(t_mem_hex_str);
-
-	if (t_mem_ascii_str != m_mem_ascii->text())
-		m_mem_ascii->setText(t_mem_ascii_str);
-
-	auto mask_height = [&](int height)
-	{
-		return m_rowcount != 0 ? height + c_pad_memory_labels : 0;
-	};
+	m_mem_addr->setText(t_mem_addr_str);
+	m_mem_hex->setText(t_mem_hex_str);
+	m_mem_ascii->setText(t_mem_ascii_str);
 
 	// Adjust Text Boxes (also helps with window resize)
 	QSize textSize = m_fontMetrics->size(0, m_mem_addr->text());
-	m_mem_addr->setFixedSize(textSize.width() + 10, mask_height(textSize.height()));
+	m_mem_addr->setFixedSize(textSize.width() + 10, textSize.height());
 
 	textSize = m_fontMetrics->size(0, m_mem_hex->text());
-	m_mem_hex->setFixedSize(textSize.width() + 10, mask_height(textSize.height()));
+	m_mem_hex->setFixedSize(textSize.width() + 10, textSize.height());
 
 	textSize = m_fontMetrics->size(0, m_mem_ascii->text());
-	m_mem_ascii->setFixedSize(textSize.width() + 10, mask_height(textSize.height()));
+	m_mem_ascii->setFixedSize(textSize.width() + 10, textSize.height());
 }
 
 void memory_viewer_panel::SetPC(const uint pc)
@@ -920,88 +582,23 @@ void memory_viewer_panel::SetPC(const uint pc)
 	m_addr = pc;
 }
 
-void memory_viewer_panel::keyPressEvent(QKeyEvent* event)
-{
-	if (!isActiveWindow())
-	{
-		QDialog::keyPressEvent(event);
-		return;
-	}
-
-	if (event->modifiers() == Qt::ControlModifier)
-	{
-		switch (const auto key = event->key())
-		{
-		case Qt::Key_PageUp:
-		case Qt::Key_PageDown:
-		{
-			scroll(key == Qt::Key_PageDown ? m_rowcount : 0u - m_rowcount);
-			break;
-		}
-		case Qt::Key_F5:
-		{
-			if (event->isAutoRepeat())
-			{
-				break;
-			}
-
-			// Single refresh
-			ShowMemory();
-			break;
-		}
-		case Qt::Key_F:
-		{
-			m_addr_line->setFocus();
-			break;
-		}
-		default: break;
-		}
-	}
-
-	QDialog::keyPressEvent(event);
-}
-
 void memory_viewer_panel::ShowImage(QWidget* parent, u32 addr, color_format format, u32 width, u32 height, bool flipv) const
 {
-	u32 texel_bytes = 4;
-
-	switch (format)
-	{
-	case color_format::RGB:
-	{
-		texel_bytes = 3;
-		break;
-	}
-	case color_format::G8:
-	{
-		texel_bytes = 1;
-		break;
-	}
-	default: break;
-	}
-
 	// If exceeds 32-bits it is invalid as well, UINT32_MAX always fails checks
-	const u32 memsize = utils::mul_saturate<u32>(utils::mul_saturate<u32>(texel_bytes, width), height);
+	const u32 memsize = static_cast<u32>(std::min<u64>(4ull * width * height, u32{umax}));
 	if (memsize == 0)
 	{
-		gui_log.error("Can not show image. memsize is 0 (texel_bytes=%d, width=%d, height=%d)", texel_bytes, width, height);
 		return;
 	}
 
+	std::shared_lock rlock(vm::g_mutex);
+
 	const auto originalBuffer  = static_cast<u8*>(this->to_ptr(addr, memsize));
+	const auto convertedBuffer = new (std::nothrow) u8[memsize];
 
-	if (!originalBuffer)
-	{
-		gui_log.error("Can not show image. originalBuffer is null (addr=%d, memsize=%d)", addr, memsize);
-		return;
-	}
-
-	const auto convertedBuffer = new (std::nothrow) u8[memsize / texel_bytes * u64{4}];
-
-	if (!convertedBuffer)
+	if (!originalBuffer || !convertedBuffer)
 	{
 		// OOM or invalid memory address, give up
-		gui_log.error("Can not show image. convertedBuffer is null (addr=%d, memsize=%d)", addr, memsize);
 		return;
 	}
 
@@ -1015,7 +612,7 @@ void memory_viewer_panel::ShowImage(QWidget* parent, u32 addr, color_format form
 		{
 			const u32 offset = y * pitch;
 			const u32 offset_new = y * pitch_new;
-			for (u32 x = 0, x_new = 0; x < pitch && x_new < pitch_new; x += 3, x_new += 4)
+			for (u32 x = 0, x_new = 0; x < pitch; x += 3, x_new += 4)
 			{
 				convertedBuffer[offset_new + x_new + 0] = originalBuffer[offset + x + 2];
 				convertedBuffer[offset_new + x_new + 1] = originalBuffer[offset + x + 1];
@@ -1073,236 +670,41 @@ void memory_viewer_panel::ShowImage(QWidget* parent, u32 addr, color_format form
 		}
 		break;
 	}
-	case color_format::G8:
-	{
-		const u32 pitch = width * 1;
-		const u32 pitch_new = width * 4;
-		for (u32 y = 0; y < height; y++)
-		{
-			const u32 offset = y * pitch;
-			const u32 offset_new = y * pitch_new;
-			for (u32 x = 0; x < pitch; x++)
-			{
-				const u8 color = originalBuffer[offset + x];
-				convertedBuffer[offset_new + x * 4 + 0] = color;
-				convertedBuffer[offset_new + x * 4 + 1] = color;
-				convertedBuffer[offset_new + x * 4 + 2] = color;
-				convertedBuffer[offset_new + x * 4 + 3] = 255;
-			}
-		}
-		break;
 	}
-	case color_format::G32MAX:
-	{
-		// Special: whitens as 4-byte groups tend to have a higher value, in order to perceive memory contents
-		// May be used to search for instructions or floats for example
 
-		const u32 pitch = width * 4;
-
-		for (u32 y = 0; y < height; y++)
-		{
-			const u32 offset = y * pitch;
-			for (u32 x = 0; x < pitch; x += 4)
-			{
-				const u8 color = std::max({originalBuffer[offset + x + 0], originalBuffer[offset + x + 1], originalBuffer[offset + x + 2], originalBuffer[offset + x + 3]});
-				convertedBuffer[offset + x + 0] = color;
-				convertedBuffer[offset + x + 1] = color;
-				convertedBuffer[offset + x + 2] = color;
-				convertedBuffer[offset + x + 3] = 255;
-			}
-		}
-
-		break;
-	}
-	}
+	rlock.unlock();
 
 	// Flip vertically
-	if (flipv && width > 0 && height > 1 && memsize > 1)
+	if (flipv && height > 1 && memsize > 1)
 	{
 		const u32 pitch = width * 4;
-		std::vector<u8> tmp_row(pitch);
-
 		for (u32 y = 0; y < height / 2; y++)
 		{
-			u8* row_top = &convertedBuffer[y * pitch];
-			u8* row_bottom = &convertedBuffer[(height - y - 1) * pitch];
-
-			// Swap rows
-			std::memcpy(tmp_row.data(), row_top, pitch);
-			std::memcpy(row_top, row_bottom, pitch);
-			std::memcpy(row_bottom, tmp_row.data(), pitch);
+			const u32 offset = y * pitch;
+			const u32 flip_offset = (height - y - 1) * pitch;
+			for (u32 x = 0; x < pitch; x++)
+			{
+				const u8 tmp = convertedBuffer[offset + x];
+				convertedBuffer[offset + x] = convertedBuffer[flip_offset + x];
+				convertedBuffer[flip_offset + x] = tmp;
+			}
 		}
 	}
 
-	std::unique_ptr<QImage> image = std::make_unique<QImage>(convertedBuffer, width, height, QImage::Format_ARGB32, [](void* buffer){ delete[] static_cast<u8*>(buffer); }, convertedBuffer);
-	if (image->isNull()) return;
+	const QImage image(convertedBuffer, width, height, QImage::Format_ARGB32, [](void* buffer){ delete[] static_cast<u8*>(buffer); }, convertedBuffer);
+	if (image.isNull()) return;
 
 	QLabel* canvas = new QLabel();
 	canvas->setFixedSize(width, height);
-	canvas->setAttribute(Qt::WA_Hover);
-	canvas->setPixmap(QPixmap::fromImage(*image));
+	canvas->setPixmap(QPixmap::fromImage(image.scaled(width, height, Qt::KeepAspectRatio, Qt::SmoothTransformation)));
 
-	QLabel* image_title = new QLabel();
-
-	QVBoxLayout* layout = new QVBoxLayout();
+	QHBoxLayout* layout = new QHBoxLayout();
 	layout->setContentsMargins(0, 0, 0, 0);
-	layout->addWidget(image_title);
 	layout->addWidget(canvas);
 
-	struct image_viewer : public QDialog
-	{
-		QLabel* const m_canvas;
-		QLabel* const m_image_title;
-		const std::unique_ptr<QImage> m_image;
-		const u32 m_addr;
-		const int m_addr_scale = 1;
-		const u32 m_pitch;
-		const u32 m_width;
-		const u32 m_height;
-		int m_canvas_scale = 1;
-
-		image_viewer(QWidget* parent, QLabel* canvas, QLabel* image_title, std::unique_ptr<QImage> image, u32 addr, u32 addr_scale, u32 pitch, u32 width, u32 height) noexcept
-			: QDialog(parent)
-			, m_canvas(canvas)
-			, m_image_title(image_title)
-			, m_image(std::move(image))
-			, m_addr(addr)
-			, m_addr_scale(addr_scale)
-			, m_pitch(pitch)
-			, m_width(width)
-			, m_height(height)
-		{
-		}
-
-		bool eventFilter(QObject* object, QEvent* event) override
-		{
-			if (object == m_canvas && (event->type() == QEvent::HoverMove || event->type() == QEvent::HoverEnter || event->type() == QEvent::HoverLeave))
-			{
-				const QPointF xy = static_cast<QHoverEvent*>(event)->position() / m_canvas_scale;
-				set_window_name_by_coordinates(xy.x(), xy.y());
-				return false;
-			}
-
-			if (object == m_canvas && event->type() == QEvent::MouseButtonDblClick && static_cast<QMouseEvent*>(event)->button() == Qt::LeftButton)
-			{
-				QLineEdit* addr_line = static_cast<memory_viewer_panel*>(parent())->m_addr_line;
-
-				const QPointF xy = static_cast<QMouseEvent*>(event)->position() / m_canvas_scale;
-				addr_line->setText(QString::fromStdString(fmt::format("%08x", get_pointed_addr(xy.x(), xy.y()))));
-				Q_EMIT addr_line->returnPressed();
-				close();
-				return false;
-			}
-
-			return QDialog::eventFilter(object, event);
-		}
-
-		u32 get_pointed_addr(u32 x, u32 y) const
-		{
-			return m_addr + m_addr_scale * (y * m_pitch + x) / m_canvas_scale;
-		}
-
-		void set_window_name_by_coordinates(int x, int y)
-		{
-			if (x < 0 || y < 0)
-			{
-				m_image_title->setText(QString::fromStdString(fmt::format("[-, -]: NA")));
-				return;
-			}
-
-			m_image_title->setText(QString::fromStdString(fmt::format("[x:%d, y:%d]: 0x%x", x, y, get_pointed_addr(x, y))));
-		}
-
-		void keyPressEvent(QKeyEvent* event) override
-		{
-			if (!isActiveWindow())
-			{
-				QDialog::keyPressEvent(event);
-				return;
-			}
-
-			if (event->modifiers() == Qt::ControlModifier)
-			{
-				switch (const auto key = event->key())
-				{
-				case Qt::Key_Equal: // Also plus
-				case Qt::Key_Plus:
-				case Qt::Key_Minus:
-				{
-					m_canvas_scale = std::clamp(m_canvas_scale + (key == Qt::Key_Minus ? -1 : 1), 1, 5);
-
-					const QSize fixed_size(m_width * m_canvas_scale, m_height * m_canvas_scale);
-
-					// Fast transformation makes it not blurry, does not use bilinear filtering
-					m_canvas->setPixmap(QPixmap::fromImage(m_image->scaled(fixed_size.width(), fixed_size.height(), Qt::KeepAspectRatio, Qt::FastTransformation)));
-
-					m_canvas->setFixedSize(fixed_size);
-
-					QTimer::singleShot(0, this, [this]()
-					{
-						// sizeHint() evaluates properly after events have been processed
-						setFixedSize(sizeHint());
-					});
-
-					break;
-				}
-				}
-			}
-
-			QDialog::keyPressEvent(event);
-		}
-	};
-
-	image_viewer* f_image_viewer = new image_viewer(parent, canvas, image_title, std::move(image), addr, texel_bytes, width, width, height);
-	canvas->installEventFilter(f_image_viewer);
-	f_image_viewer->setWindowTitle(QString::fromStdString(fmt::format("Raw Image @ 0x%x", addr)));
+	QDialog* f_image_viewer = new QDialog(parent);
+	f_image_viewer->setWindowTitle(qstr(fmt::format("Raw Image @ 0x%x", addr)));
+	f_image_viewer->setFixedSize(QSize(width, height));
 	f_image_viewer->setLayout(layout);
-	f_image_viewer->setAttribute(Qt::WA_DeleteOnClose);
 	f_image_viewer->show();
-
-	QTimer::singleShot(0, f_image_viewer, [f_image_viewer]()
-	{
-		// sizeHint() evaluates properly after events have been processed
-		f_image_viewer->setFixedSize(f_image_viewer->sizeHint());
-	});
-}
-
-void memory_viewer_panel::ShowAtPC(u32 pc, std::function<cpu_thread*()> func)
-{
-	if (Emu.IsStopped())
-		return;
-
-	cpu_thread* cpu = func ? func() : nullptr;
-	thread_class type = cpu ? cpu->get_class() : thread_class::ppu;
-
-	if (type == thread_class::spu)
-	{
-		idm::make<memory_viewer_handle>(nullptr, nullptr, pc, std::move(func));
-		return;
-	}
-
-	if (const auto* fxo = g_fxo->try_get<memory_viewer_fxo>())
-	{
-		auto it = fxo->last_opened.find(type);
-
-		if (it != fxo->last_opened.end())
-		{
-			memory_viewer_panel* panel = it->second;
-
-			if (panel)
-			{
-				panel->SetPC(pc);
-				panel->scroll(0);
-
-				if (!panel->isVisible())
-					panel->show();
-				
-				panel->raise();
-
-				return;
-			}
-		}
-	}
-
-	idm::make<memory_viewer_handle>(nullptr, nullptr, pc, std::move(func));
 }
diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.h b/rpcs3/rpcs3qt/memory_viewer_panel.h
index 756323be97..ca8fbf28ad 100644
--- a/rpcs3/rpcs3qt/memory_viewer_panel.h
+++ b/rpcs3/rpcs3qt/memory_viewer_panel.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "util/types.hpp"
-#include "Utilities/Thread.h"
 
 #include <QDialog>
 #include <QLineEdit>
@@ -10,18 +9,8 @@
 #include <QFontDatabase>
 
 #include <string>
-#include <map>
-
-class QLineEdit;
-class QCheckBox;
-class QComboBox;
-class QLabel;
-class QThread;
-class QHBoxLayout;
-class QKeyEvent;
 
 class cpu_thread;
-class CPUDisAsm;
 
 namespace utils
 {
@@ -33,39 +22,20 @@ namespace rsx
 	class thread;
 }
 
-enum search_mode : unsigned
-{
-	no_mode          = 1,
-	clear_modes      = 2,
-	as_string        = 4,
-	as_hex           = 8,
-	as_f64           = 16,
-	as_f32           = 32,
-	as_inst          = 64,
-	as_regex_inst    = 128,
-	as_fake_spu_inst = 256,
-	as_regex_fake_spu_inst = 512,
-	search_mode_last = 1024,
-};
-
-class memory_viewer_panel final : public QDialog
+class memory_viewer_panel : public QDialog
 {
 	Q_OBJECT
 
 public:
-	memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDisAsm> disasm, u32 addr = 0, std::function<cpu_thread*()> func = []() -> cpu_thread* { return {}; });
+	memory_viewer_panel(QWidget* parent, u32 addr = 0, std::function<cpu_thread*()> func = []() -> cpu_thread* { return {}; });
 	~memory_viewer_panel();
 
-	static void ShowAtPC(u32 pc, std::function<cpu_thread*()> func = nullptr);
-
 	enum class color_format : int
 	{
 		RGB,
 		ARGB,
 		RGBA,
-		ABGR,
-		G8,
-		G32MAX
+		ABGR
 	};
 	Q_ENUM(color_format)
 
@@ -74,51 +44,40 @@ protected:
 	void resizeEvent(QResizeEvent* event) override;
 
 private:
-	u32 m_addr = 0;
-	u32 m_colcount = 0;
-	u32 m_rowcount = 0;
-	u32 m_min_height = 0;
+	u32 m_addr;
+	u32 m_colcount;
+	u32 m_rowcount;
 
-	QLineEdit* m_addr_line = nullptr;
+	QLineEdit* m_addr_line;
 
-	QLabel* m_mem_addr = nullptr;
-	QLabel* m_mem_hex = nullptr;
-	QLabel* m_mem_ascii = nullptr;
+	QLabel* m_mem_addr;
+	QLabel* m_mem_hex;
+	QLabel* m_mem_ascii;
 
-	QFontMetrics* m_fontMetrics = nullptr;
+	QFontMetrics* m_fontMetrics;
 
-	static constexpr int c_pad_memory_labels = 15;
-
-	QLineEdit* m_search_line = nullptr;
-	QCheckBox* m_chkbox_case_insensitive = nullptr;
-	QComboBox* m_cbox_input_mode = nullptr;
-	QHBoxLayout* m_hbox_mem_panel = nullptr;
-	QThread* m_search_thread = nullptr;
+	enum class thread_type
+	{
+		none,
+		ppu,
+		spu,
+		rsx,
+	};
 
 	const std::function<cpu_thread*()> m_get_cpu;
-	const thread_class m_type;
+	const thread_type m_type;
 	const std::add_pointer_t<rsx::thread> m_rsx;
 	const std::shared_ptr<utils::shm> m_spu_shm;
 	const u32 m_addr_mask;
 
-	std::shared_ptr<CPUDisAsm> m_disasm;
-
-	const void* m_ptr = nullptr;
-	usz m_size = 0;
-
-	search_mode m_modes{};
-
 	std::string getHeaderAtAddr(u32 addr) const;
 	void scroll(s32 steps);
 	void* to_ptr(u32 addr, u32 size = 1) const;
 	void SetPC(const uint pc);
 
-	void ShowMemory();
+	virtual void ShowMemory();
 
 	void ShowImage(QWidget* parent, u32 addr, color_format format, u32 width, u32 height, bool flipv) const;
-	u64 OnSearch(std::string wstr, u32 mode);
-
-	void keyPressEvent(QKeyEvent* event) override;
 };
 
 // Lifetime management with IDM
@@ -127,9 +86,8 @@ struct memory_viewer_handle
 	static constexpr u32 id_base = 1;
 	static constexpr u32 id_step = 1;
 	static constexpr u32 id_count = 2048;
-	SAVESTATE_INIT_POS(33); // Of course not really used
 
-	template <typename... Args> requires (std::is_constructible_v<memory_viewer_panel, Args&&...>)
+	template <typename... Args>
 	memory_viewer_handle(Args&&... args)
 		: m_mvp(new memory_viewer_panel(std::forward<Args>(args)...))
 	{
@@ -140,12 +98,3 @@ struct memory_viewer_handle
 private:
 	const std::add_pointer_t<memory_viewer_panel> m_mvp;
 };
-
-struct memory_viewer_fxo
-{
-	std::map<thread_class, memory_viewer_panel*> last_opened;
-
-	memory_viewer_fxo() = default;
-	memory_viewer_fxo(const memory_viewer_fxo&) = delete;
-	memory_viewer_fxo& operator=(const memory_viewer_fxo&) = delete;
-};
diff --git a/rpcs3/rpcs3qt/microphone_creator.cpp b/rpcs3/rpcs3qt/microphone_creator.cpp
index 9ea04defde..1eea5130d2 100644
--- a/rpcs3/rpcs3qt/microphone_creator.cpp
+++ b/rpcs3/rpcs3qt/microphone_creator.cpp
@@ -1,16 +1,16 @@
-#include "stdafx.h"
 #include "microphone_creator.h"
 
+#include "Utilities/StrFmt.h"
 #include "Utilities/StrUtil.h"
 
-#include "3rdparty/OpenAL/openal-soft/include/AL/al.h"
-#include "3rdparty/OpenAL/openal-soft/include/AL/alc.h"
+#include "3rdparty/OpenAL/include/alext.h"
 
-LOG_CHANNEL(cfg_log, "CFG");
+constexpr auto qstr = QString::fromStdString;
 
 microphone_creator::microphone_creator()
 {
 	setObjectName("microphone_creator");
+	refresh_list();
 }
 
 // We need to recreate the localized string because the microphone creator is currently only created once.
@@ -26,12 +26,11 @@ void microphone_creator::refresh_list()
 
 	if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATION_EXT") == AL_TRUE)
 	{
-		if (const char* devices = alcGetString(nullptr, ALC_CAPTURE_DEVICE_SPECIFIER))
+		if (const char* devices = alcGetString(nullptr, ALC_CAPTURE_DEVICE_SPECIFIER); devices != nullptr)
 		{
-			while (devices && *devices != 0)
+			while (*devices != 0)
 			{
-				cfg_log.notice("Found microphone: '%s'", devices);
-				m_microphone_list.append(devices);
+				m_microphone_list.append(qstr(devices));
 				devices += strlen(devices) + 1;
 			}
 		}
@@ -39,12 +38,9 @@ void microphone_creator::refresh_list()
 	else
 	{
 		// Without enumeration we can only use one device
-		cfg_log.error("OpenAl extension ALC_ENUMERATION_EXT not supported. The microphone list will only contain the default microphone.");
-
-		if (const char* device = alcGetString(nullptr, ALC_DEFAULT_DEVICE_SPECIFIER))
+		if (const char* device = alcGetString(nullptr, ALC_DEFAULT_DEVICE_SPECIFIER); device != nullptr)
 		{
-			cfg_log.notice("Found default microphone: '%s'", device);
-			m_microphone_list.append(device);
+			m_microphone_list.append(qstr(device));
 		}
 	}
 }
@@ -61,22 +57,23 @@ std::array<std::string, 4> microphone_creator::get_selection_list() const
 
 std::string microphone_creator::set_device(u32 num, const QString& text)
 {
-	ensure(num < m_sel_list.size());
-
 	if (text == get_none())
-		m_sel_list[num].clear();
+		m_sel_list[num - 1] = "";
 	else
-		m_sel_list[num] = text.toStdString();
+		m_sel_list[num - 1] = text.toStdString();
 
 	return m_sel_list[0] + "@@@" + m_sel_list[1] + "@@@" + m_sel_list[2] + "@@@" + m_sel_list[3] + "@@@";
 }
 
 void microphone_creator::parse_devices(const std::string& list)
 {
-	m_sel_list = {};
+	for (u32 index = 0; index < 4; index++)
+	{
+		m_sel_list[index] = "";
+	}
 
-	const std::vector<std::string> devices_list = fmt::split(list, { "@@@" });
-	for (usz index = 0; index < std::min(m_sel_list.size(), devices_list.size()); index++)
+	const auto devices_list = fmt::split(list, { "@@@" });
+	for (u32 index = 0; index < std::min<u32>(4, ::size32(devices_list)); index++)
 	{
 		m_sel_list[index] = devices_list[index];
 	}
diff --git a/rpcs3/rpcs3qt/midi_creator.cpp b/rpcs3/rpcs3qt/midi_creator.cpp
deleted file mode 100644
index 57476af3d6..0000000000
--- a/rpcs3/rpcs3qt/midi_creator.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-#include "stdafx.h"
-#include "midi_creator.h"
-
-#include "Utilities/StrFmt.h"
-#include "Utilities/StrUtil.h"
-
-#include <rtmidi_c.h>
-
-LOG_CHANNEL(cfg_log, "CFG");
-
-midi_creator::midi_creator()
-{
-	setObjectName("midi_creator");
-}
-
-// We need to recreate the localized string because the midi creator is currently only created once.
-QString midi_creator::get_none()
-{
-	return tr("None", "MIDI device");
-}
-
-void midi_creator::refresh_list()
-{
-	m_midi_list.clear();
-	m_midi_list.append(get_none());
-
-	const auto deleter = [](RtMidiWrapper* ptr) { if (ptr) rtmidi_in_free(ptr); };
-	std::unique_ptr<RtMidiWrapper, decltype(deleter)> midi_in(rtmidi_in_create_default());
-	ensure(midi_in);
-
-	if (!midi_in->ok)
-	{
-		cfg_log.error("Could not get MIDI in ptr: %s", midi_in->msg);
-		return;
-	}
-
-	const RtMidiApi api = rtmidi_in_get_current_api(midi_in.get());
-
-	if (!midi_in->ok)
-	{
-		cfg_log.error("Could not get MIDI api: %s", midi_in->msg);
-		return;
-	}
-
-	if (const char* api_name = rtmidi_api_name(api))
-	{
-		cfg_log.notice("MIDI: Using %s api", api_name);
-	}
-	else
-	{
-		cfg_log.warning("Could not get MIDI api name");
-	}
-
-	const u32 port_count = rtmidi_get_port_count(midi_in.get());
-
-	if (!midi_in->ok || port_count == umax)
-	{
-		cfg_log.error("Could not get MIDI port count: %s", midi_in->msg);
-		return;
-	}
-
-	for (u32 port_number = 0; port_number < port_count; port_number++)
-	{
-		char buf[128]{};
-		s32 size = sizeof(buf);
-		if (rtmidi_get_port_name(midi_in.get(), port_number, buf, &size) == -1 || !midi_in->ok)
-		{
-			cfg_log.error("Error getting MIDI port name for port %d: %s", port_number, midi_in->msg);
-			continue;
-		}
-
-		cfg_log.notice("Found MIDI device with name: %s", buf);
-		m_midi_list.append(QString::fromUtf8(buf));
-	}
-}
-
-QStringList midi_creator::get_midi_list() const
-{
-	return m_midi_list;
-}
-
-std::array<midi_device, max_midi_devices> midi_creator::get_selection_list() const
-{
-	return m_sel_list;
-}
-
-std::string midi_creator::set_device(u32 num, const midi_device& device)
-{
-	midi_device& dev = ::at32(m_sel_list, num);
-	dev = device;
-
-	if (device.name == get_none().toStdString())
-	{
-		dev.name.clear();
-	}
-
-	std::string result;
-
-	for (const midi_device& device : m_sel_list)
-	{
-		fmt::append(result, "%s@@@", device);
-	}
-
-	return result;
-}
-
-void midi_creator::parse_devices(const std::string& list)
-{
-	m_sel_list = {};
-
-	const std::vector<std::string> devices_list = fmt::split(list, { "@@@" });
-	for (usz index = 0; index < std::min(m_sel_list.size(), devices_list.size()); index++)
-	{
-		m_sel_list[index] = midi_device::from_string(devices_list[index]);
-	}
-}
diff --git a/rpcs3/rpcs3qt/midi_creator.h b/rpcs3/rpcs3qt/midi_creator.h
deleted file mode 100644
index cfcbae3ebc..0000000000
--- a/rpcs3/rpcs3qt/midi_creator.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-#include "Emu/Io/midi_config_types.h"
-
-#include <QObject>
-#include <QStringList>
-
-class midi_creator : public QObject
-{
-	Q_OBJECT
-
-public:
-	midi_creator();
-	QString get_none();
-	std::string set_device(u32 num, const midi_device& device);
-	void parse_devices(const std::string& list);
-	void refresh_list();
-	QStringList get_midi_list() const;
-	std::array<midi_device, max_midi_devices> get_selection_list() const;
-
-private:
-	QStringList m_midi_list;
-	std::array<midi_device, max_midi_devices> m_sel_list;
-};
diff --git a/rpcs3/rpcs3qt/movie_item.cpp b/rpcs3/rpcs3qt/movie_item.cpp
deleted file mode 100644
index 3cfb269709..0000000000
--- a/rpcs3/rpcs3qt/movie_item.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "stdafx.h"
-#include "movie_item.h"
-
-movie_item::movie_item() : QTableWidgetItem(), movie_item_base()
-{
-}
-
-movie_item::movie_item(const QString& text, int type) : QTableWidgetItem(text, type), movie_item_base()
-{
-}
-
-movie_item::movie_item(const QIcon& icon, const QString& text, int type) : QTableWidgetItem(icon, text, type), movie_item_base()
-{
-}
diff --git a/rpcs3/rpcs3qt/movie_item.h b/rpcs3/rpcs3qt/movie_item.h
index 348867a63e..9a2f31f14c 100644
--- a/rpcs3/rpcs3qt/movie_item.h
+++ b/rpcs3/rpcs3qt/movie_item.h
@@ -1,13 +1,87 @@
 #pragma once
 
-#include "movie_item_base.h"
-
 #include <QTableWidgetItem>
+#include <QMovie>
+#include <QObject>
 
-class movie_item : public QTableWidgetItem, public movie_item_base
+#include <functional>
+
+using icon_callback_t = std::function<void(int)>;
+
+class movie_item : public QTableWidgetItem
 {
 public:
-	movie_item();
-	movie_item(const QString& text, int type = Type);
-	movie_item(const QIcon& icon, const QString& text, int type = Type);
+	movie_item() : QTableWidgetItem()
+	{
+	}
+	movie_item(const QString& text, int type = Type) : QTableWidgetItem(text, type)
+	{
+	}
+	movie_item(const QIcon& icon, const QString& text, int type = Type) : QTableWidgetItem(icon, text, type)
+	{
+	}
+
+	~movie_item()
+	{
+		if (m_movie)
+		{
+			m_movie->stop();
+			delete m_movie;
+		}
+	}
+
+	void set_active(bool active)
+	{
+		if (!std::exchange(m_active, active) && active && m_movie)
+		{
+			m_movie->jumpToFrame(1);
+			m_movie->start();
+		}
+	}
+
+	[[nodiscard]] bool get_active() const
+	{
+		return m_active;
+	}
+
+	[[nodiscard]] QMovie* movie() const
+	{
+		return m_movie;
+	}
+
+	void init_movie(const QString& path)
+	{
+		if (path.isEmpty() || !m_icon_callback) return;
+
+		if (QMovie* movie = new QMovie(path); movie && movie->isValid())
+		{
+			m_movie = movie;
+		}
+		else
+		{
+			delete movie;
+			return;
+		}
+
+		QObject::connect(m_movie, &QMovie::frameChanged, m_movie, m_icon_callback);
+	}
+
+	void call_icon_func() const
+	{
+		if (m_icon_callback)
+		{
+			m_icon_callback(0);
+		}
+	}
+
+	void set_icon_func(const icon_callback_t& func)
+	{
+		m_icon_callback = func;
+		call_icon_func();
+	}
+
+private:
+	QMovie* m_movie = nullptr;
+	bool m_active = false;
+	icon_callback_t m_icon_callback = nullptr;
 };
diff --git a/rpcs3/rpcs3qt/movie_item_base.cpp b/rpcs3/rpcs3qt/movie_item_base.cpp
deleted file mode 100644
index fdf820ae5f..0000000000
--- a/rpcs3/rpcs3qt/movie_item_base.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-#include "stdafx.h"
-#include "movie_item_base.h"
-
-movie_item_base::movie_item_base() : qt_video_source()
-{
-	init_pointers();
-}
-
-movie_item_base::~movie_item_base()
-{
-	stop_movie();
-
-	wait_for_icon_loading(true);
-	wait_for_size_on_disk_loading(true);
-}
-
-void movie_item_base::init_pointers()
-{
-	m_icon_loading_aborted.reset(new atomic_t<bool>(false));
-	m_size_on_disk_loading_aborted.reset(new atomic_t<bool>(false));
-}
-
-void movie_item_base::call_icon_load_func(int index)
-{
-	if (!m_icon_load_callback || m_icon_loading || m_icon_loading_aborted->load())
-	{
-		return;
-	}
-
-	wait_for_icon_loading(true);
-
-	*m_icon_loading_aborted = false;
-	m_icon_loading = true;
-	m_icon_load_thread.reset(QThread::create([this, index]()
-	{
-		if (m_icon_load_callback)
-		{
-			m_icon_load_callback(index);
-		}
-	}));
-	m_icon_load_thread->start();
-}
-
-void movie_item_base::set_icon_load_func(const icon_load_callback_t& func)
-{
-	wait_for_icon_loading(true);
-
-	m_icon_loading = false;
-	m_icon_load_callback = func;
-	*m_icon_loading_aborted = false;
-}
-
-void movie_item_base::call_size_calc_func()
-{
-	if (!m_size_calc_callback || m_size_on_disk_loading || m_size_on_disk_loading_aborted->load())
-	{
-		return;
-	}
-
-	wait_for_size_on_disk_loading(true);
-
-	*m_size_on_disk_loading_aborted = false;
-	m_size_on_disk_loading = true;
-	m_size_calc_thread.reset(QThread::create([this]()
-	{
-		if (m_size_calc_callback)
-		{
-			m_size_calc_callback();
-		}
-	}));
-	m_size_calc_thread->start();
-}
-
-void movie_item_base::set_size_calc_func(const size_calc_callback_t& func)
-{
-	m_size_on_disk_loading = false;
-	m_size_calc_callback = func;
-	*m_size_on_disk_loading_aborted = false;
-}
-
-void movie_item_base::wait_for_icon_loading(bool abort)
-{
-	*m_icon_loading_aborted = abort;
-
-	if (m_icon_load_thread && m_icon_load_thread->isRunning())
-	{
-		m_icon_load_thread->wait();
-		m_icon_load_thread.reset();
-	}
-}
-
-void movie_item_base::wait_for_size_on_disk_loading(bool abort)
-{
-	*m_size_on_disk_loading_aborted = abort;
-
-	if (m_size_calc_thread && m_size_calc_thread->isRunning())
-	{
-		m_size_calc_thread->wait();
-		m_size_calc_thread.reset();
-	}
-}
diff --git a/rpcs3/rpcs3qt/movie_item_base.h b/rpcs3/rpcs3qt/movie_item_base.h
deleted file mode 100644
index 3784de4e1f..0000000000
--- a/rpcs3/rpcs3qt/movie_item_base.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#pragma once
-
-#include "qt_video_source.h"
-
-#include <QThread>
-
-#include <memory>
-#include <functional>
-
-using icon_load_callback_t = std::function<void(int)>;
-using size_calc_callback_t = std::function<void()>;
-
-class movie_item_base : public qt_video_source
-{
-public:
-	movie_item_base();
-	virtual ~movie_item_base();
-
-	void init_pointers();
-
-	void call_icon_load_func(int index);
-	void set_icon_load_func(const icon_load_callback_t& func);
-
-	void call_size_calc_func();
-	void set_size_calc_func(const size_calc_callback_t& func);
-
-	void wait_for_icon_loading(bool abort);
-	void wait_for_size_on_disk_loading(bool abort);
-
-	bool icon_loading() const
-	{
-		return m_icon_loading;
-	}
-
-	bool size_on_disk_loading() const
-	{
-		return m_size_on_disk_loading;
-	}
-
-	[[nodiscard]] std::shared_ptr<atomic_t<bool>> icon_loading_aborted() const
-	{
-		return m_icon_loading_aborted;
-	}
-
-	[[nodiscard]] std::shared_ptr<atomic_t<bool>> size_on_disk_loading_aborted() const
-	{
-		return m_size_on_disk_loading_aborted;
-	}
-
-	shared_mutex pixmap_mutex;
-
-private:
-	std::unique_ptr<QThread> m_icon_load_thread;
-	std::unique_ptr<QThread> m_size_calc_thread;
-	atomic_t<bool> m_size_on_disk_loading = false;
-	atomic_t<bool> m_icon_loading = false;
-	size_calc_callback_t m_size_calc_callback = nullptr;
-	icon_load_callback_t m_icon_load_callback = nullptr;
-
-	std::shared_ptr<atomic_t<bool>> m_icon_loading_aborted;
-	std::shared_ptr<atomic_t<bool>> m_size_on_disk_loading_aborted;
-};
diff --git a/rpcs3/rpcs3qt/msg_dialog_frame.cpp b/rpcs3/rpcs3qt/msg_dialog_frame.cpp
index 59c3bd3491..84dbcd51d7 100644
--- a/rpcs3/rpcs3qt/msg_dialog_frame.cpp
+++ b/rpcs3/rpcs3qt/msg_dialog_frame.cpp
@@ -5,6 +5,15 @@
 #include <QPushButton>
 #include <QFormLayout>
 
+#ifdef _WIN32
+#include <QWinTHumbnailToolbutton>
+#elif HAVE_QTDBUS
+#include <QtDBus/QDBusMessage>
+#include <QtDBus/QDBusConnection>
+#endif
+
+constexpr auto qstr = QString::fromStdString;
+
 void msg_dialog_frame::Create(const std::string& msg, const std::string& title)
 {
 	state = MsgDialogState::Open;
@@ -14,10 +23,10 @@ void msg_dialog_frame::Create(const std::string& msg, const std::string& title)
 	Close(true);
 
 	m_dialog = new custom_dialog(type.disable_cancel);
-	m_dialog->setWindowTitle(title.empty() ? (type.se_normal ? tr("Normal dialog") : tr("Error dialog")) : QString::fromStdString(title));
+	m_dialog->setWindowTitle(title.empty() ? (type.se_normal ? "Normal dialog" : "Error dialog") : qstr(title));
 	m_dialog->setWindowOpacity(type.bg_invisible ? 1. : 0.75);
 
-	m_text = new QLabel(QString::fromStdString(msg));
+	m_text = new QLabel(qstr(msg));
 	m_text->setAlignment(Qt::AlignCenter);
 
 	// Layout
@@ -51,7 +60,15 @@ void msg_dialog_frame::Create(const std::string& msg, const std::string& title)
 	{
 		l_AddGauge(m_gauge1, m_text1);
 
-		m_progress_indicator = std::make_unique<progress_indicator>(0, 100);
+#ifdef _WIN32
+		m_tb_button = new QWinTaskbarButton();
+		m_tb_progress = m_tb_button->progress();
+		m_tb_progress->setRange(0, 100);
+		m_tb_progress->setVisible(true);
+#elif HAVE_QTDBUS
+		UpdateProgress(0);
+		m_progress_value = 0;
+#endif
 	}
 
 	if (type.progress_bar_count >= 2)
@@ -63,8 +80,8 @@ void msg_dialog_frame::Create(const std::string& msg, const std::string& title)
 	{
 		m_dialog->setModal(true);
 
-		QPushButton* m_button_yes = new QPushButton(tr("&Yes"), m_dialog);
-		QPushButton* m_button_no = new QPushButton(tr("&No"), m_dialog);
+		QPushButton* m_button_yes = new QPushButton("&Yes", m_dialog);
+		QPushButton* m_button_no = new QPushButton("&No", m_dialog);
 
 		QHBoxLayout* hBoxButtons = new QHBoxLayout;
 		hBoxButtons->setAlignment(Qt::AlignCenter);
@@ -83,12 +100,14 @@ void msg_dialog_frame::Create(const std::string& msg, const std::string& title)
 
 		connect(m_button_yes, &QAbstractButton::clicked, [this]()
 		{
+			g_last_user_response = CELL_MSGDIALOG_BUTTON_YES;
 			if (on_close) on_close(CELL_MSGDIALOG_BUTTON_YES);
 			m_dialog->accept();
 		});
 
 		connect(m_button_no, &QAbstractButton::clicked, [this]()
 		{
+			g_last_user_response = CELL_MSGDIALOG_BUTTON_NO;
 			if (on_close) on_close(CELL_MSGDIALOG_BUTTON_NO);
 			m_dialog->accept();
 		});
@@ -98,7 +117,7 @@ void msg_dialog_frame::Create(const std::string& msg, const std::string& title)
 	{
 		m_dialog->setModal(true);
 
-		QPushButton* m_button_ok = new QPushButton(tr("&OK"), m_dialog);
+		QPushButton* m_button_ok = new QPushButton("&OK", m_dialog);
 		m_button_ok->setFixedWidth(50);
 
 		QHBoxLayout* hBoxButtons = new QHBoxLayout;
@@ -113,6 +132,7 @@ void msg_dialog_frame::Create(const std::string& msg, const std::string& title)
 
 		connect(m_button_ok, &QAbstractButton::clicked, [this]()
 		{
+			g_last_user_response = CELL_MSGDIALOG_BUTTON_OK;
 			if (on_close) on_close(CELL_MSGDIALOG_BUTTON_OK);
 			m_dialog->accept();
 		});
@@ -124,6 +144,7 @@ void msg_dialog_frame::Create(const std::string& msg, const std::string& title)
 	{
 		if (!type.disable_cancel)
 		{
+			g_last_user_response = CELL_MSGDIALOG_BUTTON_ESCAPE;
 			if (on_close) on_close(CELL_MSGDIALOG_BUTTON_ESCAPE);
 		}
 	});
@@ -131,6 +152,11 @@ void msg_dialog_frame::Create(const std::string& msg, const std::string& title)
 	// Fix size
 	m_dialog->layout()->setSizeConstraint(QLayout::SetFixedSize);
 	m_dialog->show();
+
+#ifdef _WIN32
+	// if we do this before, the QWinTaskbarProgress won't show
+	if (m_tb_button) m_tb_button->setWindow(m_dialog->windowHandle());
+#endif
 }
 
 void msg_dialog_frame::Close(bool success)
@@ -144,6 +170,20 @@ void msg_dialog_frame::Close(bool success)
 
 msg_dialog_frame::~msg_dialog_frame()
 {
+#ifdef _WIN32
+	// QWinTaskbarProgress::hide() will crash if the application is already about to close, even if the object is not null.
+	if (m_tb_progress && !QCoreApplication::closingDown())
+	{
+		m_tb_progress->hide();
+	}
+	if (m_tb_button)
+	{
+		m_tb_button->deleteLater();
+	}
+#elif HAVE_QTDBUS
+	UpdateProgress(0, false);
+#endif
+
 	if (m_dialog)
 	{
 		m_dialog->deleteLater();
@@ -154,7 +194,7 @@ void msg_dialog_frame::SetMsg(const std::string& msg)
 {
 	if (m_dialog)
 	{
-		m_text->setText(QString::fromStdString(msg));
+		m_text->setText(qstr(msg));
 	}
 }
 
@@ -166,14 +206,14 @@ void msg_dialog_frame::ProgressBarSetMsg(u32 index, const std::string& msg)
 		{
 			if (m_text1)
 			{
-				m_text1->setText(QString::fromStdString(msg));
+				m_text1->setText(qstr(msg));
 			}
 		}
 		else if (index == 1)
 		{
 			if (m_text2)
 			{
-				m_text2->setText(QString::fromStdString(msg));
+				m_text2->setText(qstr(msg));
 			}
 		}
 	}
@@ -203,10 +243,14 @@ void msg_dialog_frame::ProgressBarReset(u32 index)
 
 	if (index == taskbar_index + 0u)
 	{
-		if (m_progress_indicator)
+#ifdef _WIN32
+		if (m_tb_progress)
 		{
-			m_progress_indicator->reset();
+			m_tb_progress->reset();
 		}
+#elif HAVE_QTDBUS
+		UpdateProgress(0);
+#endif
 	}
 }
 
@@ -234,10 +278,15 @@ void msg_dialog_frame::ProgressBarInc(u32 index, u32 delta)
 
 	if (index == taskbar_index + 0u || taskbar_index == -1)
 	{
-		if (m_progress_indicator)
+#ifdef _WIN32
+		if (m_tb_progress)
 		{
-			m_progress_indicator->set_value(m_progress_indicator->value() + static_cast<int>(delta));
+			m_tb_progress->setValue(std::min(m_tb_progress->value() + static_cast<int>(delta), m_tb_progress->maximum()));
 		}
+#elif HAVE_QTDBUS
+		m_progress_value = std::min(m_progress_value + static_cast<int>(delta), m_gauge_max);
+		UpdateProgress(m_progress_value);
+#endif
 	}
 }
 
@@ -265,10 +314,15 @@ void msg_dialog_frame::ProgressBarSetValue(u32 index, u32 value)
 
 	if (index == taskbar_index + 0u || taskbar_index == -1)
 	{
-		if (m_progress_indicator)
+#ifdef _WIN32
+		if (m_tb_progress)
 		{
-			m_progress_indicator->set_value(static_cast<int>(value));
+			m_tb_progress->setValue(std::min(static_cast<int>(value), m_tb_progress->maximum()));
 		}
+#elif HAVE_QTDBUS
+		m_progress_value = std::min(static_cast<int>(value), m_gauge_max);
+		UpdateProgress(m_progress_value);
+#endif
 	}
 }
 
@@ -307,8 +361,31 @@ void msg_dialog_frame::ProgressBarSetLimit(u32 index, u32 limit)
 		set_taskbar_limit = true;
 	}
 
-	if (set_taskbar_limit && m_progress_indicator)
+#ifdef _WIN32
+	if (set_taskbar_limit && m_tb_progress)
 	{
-		m_progress_indicator->set_range(0, m_gauge_max);
+		m_tb_progress->setMaximum(m_gauge_max);
 	}
+#endif
 }
+
+#ifdef HAVE_QTDBUS
+void msg_dialog_frame::UpdateProgress(int progress, bool disable)
+{
+	QDBusMessage message = QDBusMessage::createSignal
+	(
+		QStringLiteral("/"),
+		QStringLiteral("com.canonical.Unity.LauncherEntry"),
+		QStringLiteral("Update")
+	);
+	QVariantMap properties;
+	if (disable)
+		properties.insert(QStringLiteral("progress-visible"), false);
+	else
+		properties.insert(QStringLiteral("progress-visible"), true);
+	// Progress takes a value from 0.0 to 0.1
+	properties.insert(QStringLiteral("progress"), 1.* progress / m_gauge_max);
+	message << QStringLiteral("application://rpcs3.desktop") << properties;
+	QDBusConnection::sessionBus().send(message);
+}
+#endif
diff --git a/rpcs3/rpcs3qt/msg_dialog_frame.h b/rpcs3/rpcs3qt/msg_dialog_frame.h
index 67a7dc105d..c51cb07806 100644
--- a/rpcs3/rpcs3qt/msg_dialog_frame.h
+++ b/rpcs3/rpcs3qt/msg_dialog_frame.h
@@ -2,11 +2,15 @@
 
 #include "util/types.hpp"
 #include "Emu/Cell/Modules/cellMsgDialog.h"
-#include "progress_indicator.h"
 
 #include <QProgressBar>
 #include <QLabel>
 
+#ifdef _WIN32
+#include <QWinTaskbarProgress>
+#include <QWinTaskbarButton>
+#endif
+
 #include <string>
 
 class custom_dialog;
@@ -16,6 +20,12 @@ class msg_dialog_frame : public QObject, public MsgDialogBase
 	Q_OBJECT
 
 private:
+#ifdef _WIN32
+	QWinTaskbarButton* m_tb_button = nullptr;
+	QWinTaskbarProgress* m_tb_progress = nullptr;
+#elif HAVE_QTDBUS
+	int m_progress_value = 0;
+#endif
 	custom_dialog* m_dialog = nullptr;
 	QLabel* m_text = nullptr;
 	QLabel* m_text1 = nullptr;
@@ -24,7 +34,6 @@ private:
 	QProgressBar* m_gauge2 = nullptr;
 
 	int m_gauge_max = 0;
-	std::unique_ptr<progress_indicator> m_progress_indicator;
 
 public:
 	msg_dialog_frame() = default;
@@ -37,4 +46,8 @@ public:
 	void ProgressBarInc(u32 progressBarIndex, u32 delta) override;
 	void ProgressBarSetValue(u32 progressBarIndex, u32 value) override;
 	void ProgressBarSetLimit(u32 index, u32 limit) override;
+#ifdef HAVE_QTDBUS
+private:
+	void UpdateProgress(int progress, bool disable = false);
+#endif
 };
diff --git a/rpcs3/rpcs3qt/music_player_dialog.cpp b/rpcs3/rpcs3qt/music_player_dialog.cpp
deleted file mode 100644
index 89c262bb85..0000000000
--- a/rpcs3/rpcs3qt/music_player_dialog.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "music_player_dialog.h"
-#include "ui_music_player_dialog.h"
-#include "qt_music_handler.h"
-#include "Emu/System.h"
-#include "Emu/VFS.h"
-
-#include <QFileDialog>
-#include <QSlider>
-
-music_player_dialog::music_player_dialog(QWidget* parent)
-	: QDialog(parent), ui(new Ui::music_player_dialog)
-{
-	setAttribute(Qt::WA_DeleteOnClose);
-
-	ui->setupUi(this);
-
-	m_handler = std::make_unique<qt_music_handler>();
-
-	connect(ui->fileSelectButton, &QPushButton::clicked, this, [this](){ select_file(); });
-	connect(ui->playButton, &QPushButton::clicked, this, [this](){ m_handler->play(m_file_path); });
-	connect(ui->pauseButton, &QPushButton::clicked, this, [this](){ m_handler->pause(); });
-	connect(ui->stopButton, &QPushButton::clicked, this, [this](){ m_handler->stop(); });
-	connect(ui->forwardButton, &QPushButton::clicked, this, [this](){ m_handler->fast_forward(m_file_path); });
-	connect(ui->reverseButton, &QPushButton::clicked, this, [this](){ m_handler->fast_reverse(m_file_path); });
-	connect(ui->volumeSlider, &QSlider::valueChanged, this, [this](int value){ m_handler->set_volume(std::clamp(value / 100.0f, 0.0f, 1.0f)); });
-}
-
-music_player_dialog::~music_player_dialog()
-{
-}
-
-void music_player_dialog::select_file()
-{
-	// Initialize Emu if not yet initialized (e.g. Emu.Kill() was previously invoked) before using some of the following vfs:: functions (e.g. vfs::get())
-	if (Emu.IsStopped())
-	{
-		Emu.Init();
-	}
-
-	const std::string vfs_dir_path = vfs::get("/dev_hdd0/music");
-	const QString file_path = QFileDialog::getOpenFileName(this, tr("Select audio file"), QString::fromStdString(vfs_dir_path), tr("Audio files (*.mp3;*.wav;*.aac;*.ogg;*.flac;*.m4a;*.alac);;All files (*.*)"));
-
-	if (!file_path.isEmpty())
-	{
-		m_file_path = file_path.toStdString();
-	}
-}
diff --git a/rpcs3/rpcs3qt/music_player_dialog.h b/rpcs3/rpcs3qt/music_player_dialog.h
deleted file mode 100644
index a3fdc852ed..0000000000
--- a/rpcs3/rpcs3qt/music_player_dialog.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <QDialog>
-
-class music_handler_base;
-
-namespace Ui
-{
-	class music_player_dialog;
-}
-
-class music_player_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit music_player_dialog(QWidget* parent = nullptr);
-	~music_player_dialog();
-
-private:
-	void select_file();
-
-	std::unique_ptr<Ui::music_player_dialog> ui;
-	std::unique_ptr<music_handler_base> m_handler;
-	std::string m_file_path;
-};
diff --git a/rpcs3/rpcs3qt/music_player_dialog.ui b/rpcs3/rpcs3qt/music_player_dialog.ui
deleted file mode 100644
index 27728cebee..0000000000
--- a/rpcs3/rpcs3qt/music_player_dialog.ui
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>music_player_dialog</class>
- <widget class="QDialog" name="music_player_dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Music Player</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="topLayout">
-     <item>
-      <spacer name="topSpacerLeft">
-       <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="fileSelectButton">
-       <property name="text">
-        <string>Select file</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="topSpacerRight">
-       <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="bottomLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin" stdset="0">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="reverseButton">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset theme="QIcon::ThemeIcon::MediaSeekBackward"/>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="playButton">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset theme="QIcon::ThemeIcon::MediaPlaybackStart"/>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="forwardButton">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset theme="QIcon::ThemeIcon::MediaSeekForward"/>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pauseButton">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset theme="QIcon::ThemeIcon::MediaPlaybackPause"/>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="stopButton">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset theme="QIcon::ThemeIcon::MediaPlaybackStop"/>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="buttonSpacer">
-       <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="volumeLabel">
-       <property name="text">
-        <string>Vol:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="volumeSlider">
-       <property name="maximum">
-        <number>100</number>
-       </property>
-       <property name="value">
-        <number>50</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Orientation::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/rpcs3/rpcs3qt/osk_dialog_frame.cpp b/rpcs3/rpcs3qt/osk_dialog_frame.cpp
index 4e4c89318c..18615f1e47 100644
--- a/rpcs3/rpcs3qt/osk_dialog_frame.cpp
+++ b/rpcs3/rpcs3qt/osk_dialog_frame.cpp
@@ -1,7 +1,8 @@
 #include "osk_dialog_frame.h"
 #include "custom_dialog.h"
+#include "Emu/Cell/Modules/cellMsgDialog.h"
 
-#include "util/bless.hpp"
+#include "util/asm.hpp"
 
 #include <QDialogButtonBox>
 #include <QLabel>
@@ -9,7 +10,9 @@
 #include <QTextEdit>
 #include <QHBoxLayout>
 #include <QFormLayout>
-#include <QRegularExpressionValidator>
+#include <QRegExpValidator>
+
+constexpr auto qstr = QString::fromStdString;
 
 osk_dialog_frame::~osk_dialog_frame()
 {
@@ -19,7 +22,7 @@ osk_dialog_frame::~osk_dialog_frame()
 	}
 }
 
-void osk_dialog_frame::Create(const osk_params& params)
+void osk_dialog_frame::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*/)
 {
 	state = OskDialogState::Open;
 
@@ -35,14 +38,14 @@ void osk_dialog_frame::Create(const osk_params& params)
 	m_dialog->setModal(true);
 
 	// Title
-	m_dialog->setWindowTitle(QString::fromStdString(params.title));
+	m_dialog->setWindowTitle(qstr(title));
 
 	// Message
-	QLabel* message_label = new QLabel(QString::fromStdU16String(params.message));
+	QLabel* message_label = new QLabel(QString::fromStdU16String(message));
 
 	// Text Input Counter
-	const QString input_text = QString::fromStdU16String(std::u16string(params.init_text));
-	QLabel* input_count_label = new QLabel(QString("%1/%2").arg(input_text.length()).arg(params.charlimit));
+	const QString input_text = QString::fromStdU16String(std::u16string(init_text));
+	QLabel* input_count_label = new QLabel(QString("%1/%2").arg(input_text.length()).arg(charlimit));
 
 	// Button Layout
 	QDialogButtonBox* button_box = new QDialogButtonBox(QDialogButtonBox::Ok);
@@ -52,29 +55,29 @@ void osk_dialog_frame::Create(const osk_params& params)
 	inputLayout->setAlignment(Qt::AlignHCenter);
 
 	// Text Input
-	if (params.prohibit_flags & CELL_OSKDIALOG_NO_RETURN)
+	if (prohibit_flags & CELL_OSKDIALOG_NO_RETURN)
 	{
 		QLineEdit* input = new QLineEdit(m_dialog);
 		input->setFixedWidth(lineEditWidth());
-		input->setMaxLength(params.charlimit);
+		input->setMaxLength(charlimit);
 		input->setText(input_text);
 		input->setFocus();
 
-		if (params.panel_flag & CELL_OSKDIALOG_PANELMODE_PASSWORD)
+		if (panel_flag & CELL_OSKDIALOG_PANELMODE_PASSWORD)
 		{
 			input->setEchoMode(QLineEdit::Password); // Let's assume that games only use the password mode with single-line edit fields
 		}
 
-		if (params.prohibit_flags & CELL_OSKDIALOG_NO_SPACE)
+		if (prohibit_flags & CELL_OSKDIALOG_NO_SPACE)
 		{
-			input->setValidator(new QRegularExpressionValidator(QRegularExpression("^\\S*$"), this));
+			input->setValidator(new QRegExpValidator(QRegExp("^\\S*$"), this));
 		}
 
-		connect(input, &QLineEdit::textChanged, input_count_label, [input_count_label, charlimit = params.charlimit, this](const QString& text)
+		connect(input, &QLineEdit::textChanged, input_count_label, [input_count_label, charlimit, this](const QString& text)
 		{
 			input_count_label->setText(QString("%1/%2").arg(text.length()).arg(charlimit));
 			SetOskText(text);
-			// if (on_osk_key_input_entered) on_osk_key_input_entered({}); // Not applicable
+			on_osk_input_entered();
 		});
 		connect(input, &QLineEdit::returnPressed, m_dialog, &QDialog::accept);
 
@@ -103,7 +106,7 @@ void osk_dialog_frame::Create(const osk_params& params)
 			const int cursor_pos_old = cursor_pos_new + m_text_old.length() - text.length();
 
 			// Reset to old state if character limit was reached
-			if (m_text_old.length() >= static_cast<int>(params.charlimit) && text.length() > static_cast<int>(params.charlimit))
+			if (m_text_old.length() >= static_cast<int>(charlimit) && text.length() > static_cast<int>(charlimit))
 			{
 				input->blockSignals(true);
 				input->setPlainText(m_text_old);
@@ -116,16 +119,16 @@ void osk_dialog_frame::Create(const osk_params& params)
 			int cursor_pos = cursor.position();
 
 			// Clear text of spaces if necessary
-			if (params.prohibit_flags & CELL_OSKDIALOG_NO_SPACE)
+			if (prohibit_flags & CELL_OSKDIALOG_NO_SPACE)
 			{
 				int trim_len = text.length();
-				text.remove(QRegularExpression("\\s+"));
+				text.remove(QRegExp("\\s+"));
 				trim_len -= text.length();
 				cursor_pos -= trim_len;
 			}
 
 			// Crop if more than one character was pasted and the character limit was exceeded
-			text.chop(text.length() - params.charlimit);
+			text.chop(text.length() - charlimit);
 
 			// Set new text and block signals to prevent infinite loop
 			input->blockSignals(true);
@@ -136,9 +139,9 @@ void osk_dialog_frame::Create(const osk_params& params)
 
 			m_text_old = text;
 
-			input_count_label->setText(QString("%1/%2").arg(text.length()).arg(params.charlimit));
+			input_count_label->setText(QString("%1/%2").arg(text.length()).arg(charlimit));
 			SetOskText(text);
-			// if (on_osk_key_input_entered) on_osk_key_input_entered({}); // Not applicable
+			on_osk_input_entered();
 		});
 
 		inputLayout->addWidget(input);
@@ -156,20 +159,14 @@ void osk_dialog_frame::Create(const osk_params& params)
 	// Events
 	connect(button_box, &QDialogButtonBox::accepted, m_dialog, &QDialog::accept);
 
-	connect(m_dialog, &QDialog::finished, [this](int result)
+	connect(m_dialog, &QDialog::accepted, [this]()
 	{
-		switch (result)
-		{
-		case QDialog::Accepted:
-			on_osk_close(CELL_OSKDIALOG_CLOSE_CONFIRM);
-			break;
-		case QDialog::Rejected:
-			on_osk_close(CELL_OSKDIALOG_CLOSE_CANCEL);
-			break;
-		default:
-			on_osk_close(result);
-			break;
-		}
+		on_osk_close(CELL_MSGDIALOG_BUTTON_OK);
+	});
+
+	connect(m_dialog, &QDialog::rejected, [this]()
+	{
+		on_osk_close(CELL_MSGDIALOG_BUTTON_ESCAPE);
 	});
 
 	// Fix size
@@ -179,49 +176,13 @@ void osk_dialog_frame::Create(const osk_params& params)
 
 void osk_dialog_frame::SetOskText(const QString& text)
 {
-	std::memcpy(osk_text.data(), utils::bless<char16_t>(text.constData()), std::min<usz>(osk_text.size(), text.size() + usz{1}) * sizeof(char16_t));
+	std::memcpy(osk_text, utils::bless<char16_t>(text.constData()), (text.size() + 1u) * sizeof(char16_t));
 }
 
-void osk_dialog_frame::Close(s32 status)
+void osk_dialog_frame::Close(bool accepted)
 {
 	if (m_dialog)
 	{
-		switch (status)
-		{
-		case CELL_OSKDIALOG_CLOSE_CONFIRM:
-			m_dialog->done(QDialog::Accepted);
-			break;
-		case CELL_OSKDIALOG_CLOSE_CANCEL:
-			m_dialog->done(QDialog::Rejected);
-			break;
-		default:
-			m_dialog->done(status);
-			break;
-		}
-	}
-}
-
-void osk_dialog_frame::Clear(bool clear_all_data)
-{
-	if (m_dialog && clear_all_data)
-	{
-		SetOskText("");
-	}
-}
-
-void osk_dialog_frame::SetText(const std::u16string& text)
-{
-	if (m_dialog)
-	{
-		SetOskText(QString::fromStdU16String(text));
-	}
-}
-
-void osk_dialog_frame::Insert(const std::u16string& text)
-{
-	if (m_dialog)
-	{
-		// TODO: Correct position (will probably never get implemented because this dialog is just a fallback)
-		SetOskText(QString::fromStdU16String(text));
+		m_dialog->done(accepted ? QDialog::Accepted : QDialog::Rejected);
 	}
 }
diff --git a/rpcs3/rpcs3qt/osk_dialog_frame.h b/rpcs3/rpcs3qt/osk_dialog_frame.h
index a402332a72..0bde9bdde7 100644
--- a/rpcs3/rpcs3qt/osk_dialog_frame.h
+++ b/rpcs3/rpcs3qt/osk_dialog_frame.h
@@ -16,11 +16,8 @@ class osk_dialog_frame : public QObject, public OskDialogBase
 public:
 	osk_dialog_frame() = default;
 	~osk_dialog_frame();
-	void Create(const osk_params& params) override;
-	void Close(s32 status) override;
-	void Clear(bool clear_all_data) override;
-	void SetText(const std::u16string& text) override;
-	void Insert(const std::u16string& text) override;
+	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) override;
+	void Close(bool accepted) override;
 
 private:
 	void SetOskText(const QString& text);
diff --git a/rpcs3/rpcs3qt/pad_device_info.h b/rpcs3/rpcs3qt/pad_device_info.h
deleted file mode 100644
index 0bdb82cdd0..0000000000
--- a/rpcs3/rpcs3qt/pad_device_info.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <string>
-#include <QObject>
-
-struct pad_device_info
-{
-	std::string name;
-	QString localized_name;
-	bool is_connected{false};
-};
-
-Q_DECLARE_METATYPE(pad_device_info)
diff --git a/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp
index 8b64f6c6f1..1d42daaaf1 100644
--- a/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp
@@ -5,10 +5,10 @@
 #include <QPixmap>
 #include <QPainterPath>
 
-pad_led_settings_dialog::pad_led_settings_dialog(QDialog* parent, int colorR, int colorG, int colorB, bool has_rgb, bool has_player_led, bool player_led_enabled, bool has_battery, bool has_battery_led, bool led_low_battery_blink, bool led_battery_indicator, int led_battery_indicator_brightness)
+pad_led_settings_dialog::pad_led_settings_dialog(QDialog* parent, int colorR, int colorG, int colorB, bool has_rgb, bool has_battery, bool led_low_battery_blink, bool led_battery_indicator, int led_battery_indicator_brightness)
     : QDialog(parent)
     , ui(new Ui::pad_led_settings_dialog)
-    , m_initial{colorR, colorG, colorB, player_led_enabled, led_low_battery_blink, led_battery_indicator, led_battery_indicator_brightness}
+    , m_initial{colorR, colorG, colorB, led_low_battery_blink, led_battery_indicator, led_battery_indicator_brightness}
 {
 	ui->setupUi(this);
 	setModal(true);
@@ -17,14 +17,12 @@ pad_led_settings_dialog::pad_led_settings_dialog(QDialog* parent, int colorR, in
 	ui->hs_indicator_brightness->setValue(m_new.battery_indicator_brightness);
 	ui->cb_led_blink->setChecked(m_new.low_battery_blink);
 	ui->cb_led_indicate->setChecked(m_new.battery_indicator);
-	ui->cb_player_led->setChecked(m_new.player_led_enabled);
 
 	update_slider_label(m_new.battery_indicator_brightness);
 
-	ui->gb_player_led->setEnabled(has_player_led);
 	ui->gb_led_color->setEnabled(has_rgb);
-	ui->gb_battery_status->setEnabled(has_battery && has_battery_led);
-	ui->gb_indicator_brightness->setEnabled(has_battery && has_battery_led && has_rgb); // Let's restrict this to rgb capable devices for now
+	ui->gb_battery_status->setEnabled(has_battery);
+	ui->gb_indicator_brightness->setEnabled(has_battery && has_rgb); // Let's restrict this to rgb capable devices for now
 
 	connect(ui->bb_dialog_buttons, &QDialogButtonBox::clicked, [this](QAbstractButton* button)
 	{
@@ -42,37 +40,27 @@ pad_led_settings_dialog::pad_led_settings_dialog(QDialog* parent, int colorR, in
 		{
 			read_form_values();
 		}
-		Q_EMIT pass_led_settings(m_new);
+		Q_EMIT pass_led_settings(m_new.cR, m_new.cG, m_new.cB, m_new.low_battery_blink, m_new.battery_indicator, m_new.battery_indicator_brightness);
 	});
 
 	if (has_rgb)
 	{
 		connect(ui->b_colorpicker, &QPushButton::clicked, [this]()
 		{
-			const QColor led_color(m_new.color_r, m_new.color_g, m_new.color_b);
+			const QColor led_color(m_new.cR, m_new.cG, m_new.cB);
 			QColorDialog dlg(led_color, this);
 			dlg.setWindowTitle(tr("LED Color"));
 			if (dlg.exec() == QColorDialog::Accepted)
 			{
 				const QColor new_color = dlg.selectedColor();
-				m_new.color_r = new_color.red();
-				m_new.color_g = new_color.green();
-				m_new.color_b = new_color.blue();
+				m_new.cR = new_color.red();
+				m_new.cG = new_color.green();
+				m_new.cB = new_color.blue();
 				redraw_color_sample();
 			}
 		});
-
-		if (ui->gb_battery_status->isEnabled())
-		{
-			connect(ui->hs_indicator_brightness, &QAbstractSlider::valueChanged, this, &pad_led_settings_dialog::update_slider_label);
-		}
-
-		if (ui->cb_led_indicate->isEnabled())
-		{
-			connect(ui->cb_led_indicate, &QCheckBox::toggled, this, &pad_led_settings_dialog::battery_indicator_checked);
-		}
-
-		battery_indicator_checked(ui->cb_led_indicate->isChecked());
+		connect(ui->hs_indicator_brightness, &QAbstractSlider::valueChanged, this, &pad_led_settings_dialog::update_slider_label);
+		connect(ui->cb_led_indicate, &QCheckBox::toggled, this, &pad_led_settings_dialog::battery_indicator_checked);
 	}
 
 	// Draw color sample after showing the dialog, in order to have proper dimensions
@@ -83,6 +71,7 @@ pad_led_settings_dialog::pad_led_settings_dialog(QDialog* parent, int colorR, in
 
 pad_led_settings_dialog::~pad_led_settings_dialog()
 {
+	delete ui;
 }
 
 void pad_led_settings_dialog::redraw_color_sample() const
@@ -103,7 +92,7 @@ void pad_led_settings_dialog::redraw_color_sample() const
 	path.addRoundedRect(QRectF(padding, padding, w - padding * 2, h - padding * 2), radius, radius);
 
 	// Get new LED color
-	const QColor led_color(m_new.color_r, m_new.color_g, m_new.color_b);
+	const QColor led_color(m_new.cR, m_new.cG, m_new.cB);
 
 	// Paint the shape with a black border and fill it with the LED color
 	QPainter painter(&color_sample);
@@ -111,7 +100,6 @@ void pad_led_settings_dialog::redraw_color_sample() const
 	painter.setPen(QPen(Qt::black, 1));
 	painter.fillPath(path, led_color);
 	painter.drawPath(path);
-	painter.end();
 
 	// Update the color sample widget
 	ui->w_color_sample->setPixmap(color_sample.scaled(w * dpr, h * dpr, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation));
@@ -130,7 +118,6 @@ void pad_led_settings_dialog::battery_indicator_checked(bool checked) const
 
 void pad_led_settings_dialog::read_form_values()
 {
-	m_new.player_led_enabled = ui->cb_player_led->isChecked();
 	m_new.low_battery_blink = ui->cb_led_blink->isChecked();
 	m_new.battery_indicator = ui->cb_led_indicate->isChecked();
 	m_new.battery_indicator_brightness = ui->hs_indicator_brightness->value();
diff --git a/rpcs3/rpcs3qt/pad_led_settings_dialog.h b/rpcs3/rpcs3qt/pad_led_settings_dialog.h
index ca78cec01e..e9bf9ff4b2 100644
--- a/rpcs3/rpcs3qt/pad_led_settings_dialog.h
+++ b/rpcs3/rpcs3qt/pad_led_settings_dialog.h
@@ -14,22 +14,11 @@ class pad_led_settings_dialog : public QDialog
 	Q_OBJECT
 
 public:
-	explicit pad_led_settings_dialog(QDialog* parent, int colorR, int colorG, int colorB, bool has_rgb, bool has_player_led, bool player_led_enabled, bool has_battery, bool has_battery_led, bool led_low_battery_blink, bool led_battery_indicator, int led_battery_indicator_brightness);
+	explicit pad_led_settings_dialog(QDialog* parent, int colorR, int colorG, int colorB, bool has_rgb, bool has_battery, bool led_low_battery_blink, bool led_battery_indicator, int led_battery_indicator_brightness);
 	~pad_led_settings_dialog();
 
-	struct led_settings
-	{
-		int color_r = 255;
-		int color_g = 255;
-		int color_b = 255;
-		bool player_led_enabled = true;
-		bool low_battery_blink = true;
-		bool battery_indicator = false;
-		int battery_indicator_brightness = 50;
-	};
-
 Q_SIGNALS:
-	void pass_led_settings(const led_settings& settings);
+	void pass_led_settings(int m_cR, int m_cG, int m_cB, bool m_low_battery_blink, bool m_battery_indicator, int m_battery_indicator_brightness);
 
 private Q_SLOTS:
 	void update_slider_label(int val) const;
@@ -38,7 +27,16 @@ private Q_SLOTS:
 private:
 	void redraw_color_sample() const;
 	void read_form_values();
-	std::unique_ptr<Ui::pad_led_settings_dialog> ui;
+	Ui::pad_led_settings_dialog *ui;
+	struct led_settings
+	{
+		int cR = 255;
+		int cG = 255;
+		int cB = 255;
+		bool low_battery_blink = true;
+		bool battery_indicator = false;
+		int battery_indicator_brightness = 50;
+	};
 	led_settings m_initial;
 	led_settings m_new;
 };
diff --git a/rpcs3/rpcs3qt/pad_led_settings_dialog.ui b/rpcs3/rpcs3qt/pad_led_settings_dialog.ui
index e24cc9de87..ff35d95c63 100644
--- a/rpcs3/rpcs3qt/pad_led_settings_dialog.ui
+++ b/rpcs3/rpcs3qt/pad_led_settings_dialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>255</width>
-    <height>350</height>
+    <width>287</width>
+    <height>287</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -43,22 +43,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="gb_player_led">
-     <property name="title">
-      <string>Player LED</string>
-     </property>
-     <layout class="QVBoxLayout" name="gb_player_led_layout">
-      <item>
-       <widget class="QCheckBox" name="cb_player_led">
-        <property name="text">
-         <string>Enable player LED</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <widget class="QGroupBox" name="gb_battery_status">
      <property name="title">
@@ -121,19 +105,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <spacer name="main_verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item>
     <widget class="QDialogButtonBox" name="bb_dialog_buttons">
      <property name="standardButtons">
diff --git a/rpcs3/rpcs3qt/pad_motion_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_motion_settings_dialog.cpp
deleted file mode 100644
index 433f9adb5a..0000000000
--- a/rpcs3/rpcs3qt/pad_motion_settings_dialog.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-#include "stdafx.h"
-#include "pad_motion_settings_dialog.h"
-
-#include <QComboBox>
-#include <thread>
-
-LOG_CHANNEL(cfg_log, "CFG");
-
-pad_motion_settings_dialog::pad_motion_settings_dialog(QDialog* parent, std::shared_ptr<PadHandlerBase> handler, cfg_player* cfg)
-	: QDialog(parent)
-	, ui(new Ui::pad_motion_settings_dialog)
-	, m_handler(handler)
-	, m_cfg(cfg)
-{
-	ui->setupUi(this);
-	setModal(true);
-
-	ensure(m_handler);
-	ensure(m_cfg);
-
-	cfg_pad& pad = m_cfg->config;
-
-	m_preview_sliders = {{ ui->slider_x, ui->slider_y, ui->slider_z, ui->slider_g }};
-	m_preview_labels = {{ ui->label_x, ui->label_y, ui->label_z, ui->label_g }};
-	m_axis_names = {{ ui->combo_x, ui->combo_y, ui->combo_z, ui->combo_g }};
-	m_mirrors = {{ ui->mirror_x, ui->mirror_y, ui->mirror_z, ui->mirror_g }};
-	m_shifts = {{ ui->shift_x, ui->shift_y, ui->shift_z, ui->shift_g }};
-	m_config_entries = {{ &pad.motion_sensor_x, &pad.motion_sensor_y, &pad.motion_sensor_z, &pad.motion_sensor_g }};
-
-	for (usz i = 0; i < m_preview_sliders.size(); i++)
-	{
-		m_preview_sliders[i]->setRange(0, 1023);
-		m_preview_labels[i]->setText("0");
-	}
-
-#if HAVE_LIBEVDEV
-	const bool has_device_list = m_handler->m_type == pad_handler::evdev;
-#else
-	const bool has_device_list = false;
-#endif
-
-	if (has_device_list)
-	{
-		// Combobox: Motion Devices
-		m_device_name = m_cfg->buddy_device.to_string();
-
-		ui->cb_choose_device->addItem(tr("Disabled"), QVariant::fromValue(pad_device_info{}));
-
-		const std::vector<pad_list_entry> device_list = m_handler->list_devices();
-		for (const pad_list_entry& device : device_list)
-		{
-			if (device.is_buddy_only)
-			{
-				const QString device_name = QString::fromStdString(device.name);
-				const QVariant user_data = QVariant::fromValue(pad_device_info{ device.name, device_name, true });
-
-				ui->cb_choose_device->addItem(device_name, user_data);
-			}
-		}
-
-		for (int i = 0; i < ui->cb_choose_device->count(); i++)
-		{
-			const QVariant user_data = ui->cb_choose_device->itemData(i);
-			ensure(user_data.canConvert<pad_device_info>());
-
-			if (const pad_device_info info = user_data.value<pad_device_info>(); info.name == m_device_name)
-			{
-				ui->cb_choose_device->setCurrentIndex(i);
-				break;
-			}
-		}
-
-		connect(ui->cb_choose_device, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &pad_motion_settings_dialog::change_device);
-
-		// Combobox: Configure Axis
-		m_motion_axis_list = m_handler->get_motion_axis_list();
-
-		for (const auto& [code, axis] : m_motion_axis_list)
-		{
-			const QString q_axis = QString::fromStdString(axis);
-
-			for (usz i = 0; i < m_axis_names.size(); i++)
-			{
-				m_axis_names[i]->addItem(q_axis, code);
-
-				if (m_config_entries[i]->axis.to_string() == axis)
-				{
-					m_axis_names[i]->setCurrentIndex(m_axis_names[i]->findData(code));
-				}
-			}
-		}
-
-		for (usz i = 0; i < m_axis_names.size(); i++)
-		{
-			const cfg_sensor* config = m_config_entries[i];
-
-			m_mirrors[i]->setChecked(config->mirrored.get());
-
-			m_shifts[i]->setRange(config->shift.min, config->shift.max);
-			m_shifts[i]->setValue(config->shift.get());
-
-			connect(m_mirrors[i], &QCheckBox::checkStateChanged, this, [this, i](Qt::CheckState state)
-			{
-				std::lock_guard lock(m_config_mutex);
-				m_config_entries[i]->mirrored.set(state != Qt::Unchecked);
-			});
-
-			connect(m_shifts[i], QOverload<int>::of(&QSpinBox::valueChanged), this, [this, i](int value)
-			{
-				std::lock_guard lock(m_config_mutex);
-				m_config_entries[i]->shift.set(value);
-			});
-
-			connect(m_axis_names[i], QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this, i](int index)
-			{
-				std::lock_guard lock(m_config_mutex);
-				if (!m_config_entries[i]->axis.from_string(m_axis_names[i]->itemText(index).toStdString()))
-				{
-					cfg_log.error("Failed to convert motion axis string: %s", m_axis_names[i]->itemData(index).toString());
-				}
-			});
-		}
-	}
-	else
-	{
-		m_device_name = m_cfg->device.to_string();
-		ui->gb_device->setVisible(false);
-		ui->cancelButton->setVisible(false);
-		for (usz i = 0; i < m_axis_names.size(); i++)
-		{
-			m_axis_names[i]->setVisible(false);
-			m_mirrors[i]->setVisible(false);
-			m_shifts[i]->setVisible(false);
-		}
-	}
-
-	// Use timer to display button input
-	connect(&m_timer_input, &QTimer::timeout, this, [this]()
-	{
-		motion_callback_data data;
-		{
-			std::lock_guard lock(m_input_mutex);
-			data = m_motion_callback_data;
-			m_motion_callback_data.has_new_data = false;
-		}
-
-		if (data.has_new_data)
-		{
-			// Starting with 1 because the first entry is the Disabled entry.
-			for (int i = 1; i < ui->cb_choose_device->count(); i++)
-			{
-				const QVariant user_data = ui->cb_choose_device->itemData(i);
-				ensure(user_data.canConvert<pad_device_info>());
-
-				if (const pad_device_info info = user_data.value<pad_device_info>(); info.name == data.pad_name)
-				{
-					switch_buddy_pad_info(i, info, data.success);
-					break;
-				}
-			}
-
-			for (usz i = 0; i < data.preview_values.size(); i++)
-			{
-				m_preview_sliders[i]->setValue(data.preview_values[i]);
-				m_preview_labels[i]->setText(QString::number(data.preview_values[i]));
-			}
-		}
-	});
-	m_timer_input.start(10);
-
-	// Use thread to get button input
-	m_input_thread = std::make_unique<named_thread<std::function<void()>>>("UI Pad Motion Thread", [this]()
-	{
-		while (thread_ctrl::state() != thread_state::aborting)
-		{
-			thread_ctrl::wait_for(1000);
-
-			if (m_input_thread_state != input_thread_state::active)
-			{
-				if (m_input_thread_state == input_thread_state::pausing)
-				{
-					m_input_thread_state = input_thread_state::paused;
-				}
-
-				continue;
-			}
-
-			std::array<AnalogSensor, 4> sensors{};
-			{
-				std::lock_guard lock(m_config_mutex);
-				for (usz i = 0; i < sensors.size(); i++)
-				{
-					AnalogSensor& sensor = sensors[i];
-					const cfg_sensor* config = m_config_entries[i];
-					const std::string cfgname = config->axis.to_string();
-					for (const auto& [code, name] : m_motion_axis_list)
-					{
-						if (cfgname == name)
-						{
-							sensor.m_keyCode = code;
-							sensor.m_mirrored = config->mirrored.get();
-							sensor.m_shift = config->shift.get();
-							break;
-						}
-					}
-				}
-			}
-
-			m_handler->get_motion_sensors(m_device_name,
-				[this](std::string pad_name, motion_preview_values preview_values)
-				{
-					std::lock_guard lock(m_input_mutex);
-					m_motion_callback_data.pad_name = std::move(pad_name);
-					m_motion_callback_data.preview_values = std::move(preview_values);
-					m_motion_callback_data.has_new_data = true;
-					m_motion_callback_data.success = true;
-				},
-				[this](std::string pad_name, motion_preview_values preview_values)
-				{
-					std::lock_guard lock(m_input_mutex);
-					m_motion_callback_data.pad_name = std::move(pad_name);
-					m_motion_callback_data.preview_values = std::move(preview_values);
-					m_motion_callback_data.has_new_data = true;
-					m_motion_callback_data.success = false;
-				},
-				m_motion_callback_data.preview_values, sensors);
-		}
-	});
-	start_input_thread();
-}
-
-pad_motion_settings_dialog::~pad_motion_settings_dialog()
-{
-	// Join thread
-	m_input_thread_state = input_thread_state::pausing;
-	m_input_thread.reset();
-}
-
-void pad_motion_settings_dialog::change_device(int index)
-{
-	if (index < 0)
-		return;
-
-	const QVariant user_data = ui->cb_choose_device->itemData(index);
-	ensure(user_data.canConvert<pad_device_info>());
-
-	const pad_device_info info = user_data.value<pad_device_info>();
-
-	if (!m_cfg->buddy_device.from_string(info.name))
-	{
-		cfg_log.error("Failed to convert motion device string: %s", info.name);
-	}
-
-	m_device_name = m_cfg->buddy_device.to_string();
-}
-
-void pad_motion_settings_dialog::switch_buddy_pad_info(int index, pad_device_info info, bool is_connected)
-{
-	if (index >= 0 && info.is_connected != is_connected)
-	{
-		info.is_connected = is_connected;
-
-		ui->cb_choose_device->setItemData(index, QVariant::fromValue(info));
-		ui->cb_choose_device->setItemText(index, is_connected ? QString::fromStdString(info.name) : (QString::fromStdString(info.name) + Disconnected_suffix));
-	}
-}
-
-void pad_motion_settings_dialog::start_input_thread()
-{
-	m_input_thread_state = input_thread_state::active;
-}
-
-void pad_motion_settings_dialog::pause_input_thread()
-{
-	if (m_input_thread)
-	{
-		m_input_thread_state = input_thread_state::pausing;
-
-		while (m_input_thread_state != input_thread_state::paused)
-		{
-			std::this_thread::sleep_for(1ms);
-		}
-	}
-}
diff --git a/rpcs3/rpcs3qt/pad_motion_settings_dialog.h b/rpcs3/rpcs3qt/pad_motion_settings_dialog.h
deleted file mode 100644
index f2c7713c6f..0000000000
--- a/rpcs3/rpcs3qt/pad_motion_settings_dialog.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#pragma once
-
-#include "ui_pad_motion_settings_dialog.h"
-#include "pad_device_info.h"
-#include "Emu/Io/PadHandler.h"
-#include "Utilities/Thread.h"
-
-#include <QDialog>
-#include <QTimer>
-#include <QLabel>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QSpinBox>
-
-#include <unordered_map>
-#include <mutex>
-
-namespace Ui
-{
-	class pad_motion_settings_dialog;
-}
-
-class pad_motion_settings_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit pad_motion_settings_dialog(QDialog* parent, std::shared_ptr<PadHandlerBase> handler, cfg_player* cfg);
-	~pad_motion_settings_dialog();
-
-private Q_SLOTS:
-	void change_device(int index);
-
-private:
-	void switch_buddy_pad_info(int index, pad_device_info info, bool is_connected);
-	void start_input_thread();
-	void pause_input_thread();
-
-	std::unique_ptr<Ui::pad_motion_settings_dialog> ui;
-	std::shared_ptr<PadHandlerBase> m_handler;
-	std::string m_device_name;
-	cfg_player* m_cfg = nullptr;
-	std::mutex m_config_mutex;
-	std::unordered_map<u32, std::string> m_motion_axis_list;
-
-	// Input thread. Its Callback handles the input
-	std::unique_ptr<named_thread<std::function<void()>>> m_input_thread;
-	enum class input_thread_state { paused, pausing, active };
-	atomic_t<input_thread_state> m_input_thread_state{input_thread_state::paused};
-	struct motion_callback_data
-	{
-		bool success = false;
-		bool has_new_data = false;
-		std::string pad_name;
-		std::array<u16, 4> preview_values{{ DEFAULT_MOTION_X, DEFAULT_MOTION_Y, DEFAULT_MOTION_Z, DEFAULT_MOTION_G}};;
-	} m_motion_callback_data;
-	QTimer m_timer_input;
-	std::mutex m_input_mutex;
-
-	std::array<QSlider*, 4> m_preview_sliders;
-	std::array<QLabel*, 4> m_preview_labels;
-	std::array<QComboBox*, 4> m_axis_names;
-	std::array<QCheckBox*, 4> m_mirrors;
-	std::array<QSpinBox*, 4> m_shifts;
-	std::array<cfg_sensor*, 4> m_config_entries;
-
-	const QString Disconnected_suffix = tr(" (disconnected)");
-};
diff --git a/rpcs3/rpcs3qt/pad_motion_settings_dialog.ui b/rpcs3/rpcs3qt/pad_motion_settings_dialog.ui
deleted file mode 100644
index 7f021ef2f0..0000000000
--- a/rpcs3/rpcs3qt/pad_motion_settings_dialog.ui
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>pad_motion_settings_dialog</class>
- <widget class="QDialog" name="pad_motion_settings_dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>574</width>
-    <height>464</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Motion Controls</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_main">
-   <item>
-    <widget class="QGroupBox" name="gb_device">
-     <property name="title">
-      <string>Device</string>
-     </property>
-     <layout class="QHBoxLayout" name="gb_device_layout">
-      <item>
-       <widget class="QComboBox" name="cb_choose_device"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="gb_axis_x">
-     <property name="title">
-      <string>X</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_x" stretch="2,1,1,0,1">
-      <item>
-       <widget class="QSlider" name="slider_x">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_x">
-        <property name="text">
-         <string>0</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="combo_x"/>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="mirror_x">
-        <property name="text">
-         <string>Mirrored</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QSpinBox" name="shift_x">
-        <property name="prefix">
-         <string>Shift: </string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="gb_axis_y">
-     <property name="title">
-      <string>Y</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_y" stretch="2,1,1,0,1">
-      <item>
-       <widget class="QSlider" name="slider_y">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_y">
-        <property name="text">
-         <string>0</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="combo_y"/>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="mirror_y">
-        <property name="text">
-         <string>Mirrored</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QSpinBox" name="shift_y">
-        <property name="prefix">
-         <string>Shift: </string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="gb_axis_z">
-     <property name="title">
-      <string>Z</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_z" stretch="2,1,1,0,1">
-      <item>
-       <widget class="QSlider" name="slider_z">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_z">
-        <property name="text">
-         <string>0</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="combo_z"/>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="mirror_z">
-        <property name="text">
-         <string>Mirrored</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QSpinBox" name="shift_z">
-        <property name="prefix">
-         <string>Shift: </string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="gb_axis_g">
-     <property name="title">
-      <string>G</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_g" stretch="2,1,1,0,1">
-      <item>
-       <widget class="QSlider" name="slider_g">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_g">
-        <property name="text">
-         <string>0</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="combo_g"/>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="mirror_g">
-        <property name="text">
-         <string>Mirrored</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QSpinBox" name="shift_g">
-        <property name="prefix">
-         <string>Shift: </string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="main_vertical_spacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="button_box_layout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <spacer name="button_box_spacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>131</width>
-         <height>31</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okButton">
-       <property name="text">
-        <string>OK</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="cancelButton">
-       <property name="text">
-        <string>Cancel</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>okButton</sender>
-   <signal>clicked()</signal>
-   <receiver>pad_motion_settings_dialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>278</x>
-     <y>253</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>96</x>
-     <y>254</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>cancelButton</sender>
-   <signal>clicked()</signal>
-   <receiver>pad_motion_settings_dialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>369</x>
-     <y>253</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>179</x>
-     <y>282</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
index 09032c0926..3a840a711c 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
@@ -4,35 +4,45 @@
 #include <QPainterPath>
 #include <QInputDialog>
 #include <QMessageBox>
-#include <QSvgRenderer>
 
 #include "qt_utils.h"
 #include "pad_settings_dialog.h"
 #include "pad_led_settings_dialog.h"
-#include "pad_motion_settings_dialog.h"
 #include "ui_pad_settings_dialog.h"
 #include "tooltips.h"
 #include "gui_settings.h"
 
 #include "Emu/System.h"
 #include "Emu/system_utils.hpp"
+#include "Emu/Io/Null/NullPadHandler.h"
+#include "Utilities/File.h"
 
 #include "Input/pad_thread.h"
-#include "Input/gui_pad_thread.h"
 #include "Input/product_info.h"
 #include "Input/keyboard_pad_handler.h"
-
-#include <thread>
+#include "Input/ds3_pad_handler.h"
+#include "Input/ds4_pad_handler.h"
+#include "Input/dualsense_pad_handler.h"
+#ifdef _WIN32
+#include "Input/xinput_pad_handler.h"
+#include "Input/mm_joystick_handler.h"
+#endif
+#ifdef HAVE_LIBEVDEV
+#include "Input/evdev_joystick_handler.h"
+#endif
 
 LOG_CHANNEL(cfg_log, "CFG");
 
-cfg_input_configurations g_cfg_input_configs;
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
+constexpr auto qstr = QString::fromStdString;
+
+cfg_profile g_cfg_profile;
 
 inline bool CreateConfigFile(const QString& dir, const QString& name)
 {
 	if (!QDir().mkpath(dir))
 	{
-		cfg_log.fatal("Failed to create dir %s", dir);
+		cfg_log.fatal("Failed to create dir %s", sstr(dir));
 		return false;
 	}
 
@@ -41,7 +51,7 @@ inline bool CreateConfigFile(const QString& dir, const QString& name)
 
 	if (!new_file.open(QIODevice::WriteOnly))
 	{
-		cfg_log.fatal("Failed to create file %s", filename);
+		cfg_log.fatal("Failed to create file %s", sstr(filename));
 		return false;
 	}
 
@@ -49,20 +59,7 @@ inline bool CreateConfigFile(const QString& dir, const QString& name)
 	return true;
 }
 
-void pad_settings_dialog::pad_button::insert_key(const std::string& key, bool append_key)
-{
-	std::vector<std::string> buttons;
-	if (append_key)
-	{
-		buttons = cfg_pad::get_buttons(keys);
-	}
-	buttons.push_back(key);
-
-	keys = cfg_pad::get_buttons(std::move(buttons));
-	text = QString::fromStdString(keys).replace(",", ", ");
-}
-
-pad_settings_dialog::pad_settings_dialog(std::shared_ptr<gui_settings> gui_settings, QWidget* parent, const GameInfo* game)
+pad_settings_dialog::pad_settings_dialog(std::shared_ptr<gui_settings> gui_settings, QWidget *parent, const GameInfo *game)
 	: QDialog(parent)
 	, ui(new Ui::pad_settings_dialog)
 	, m_gui_settings(std::move(gui_settings))
@@ -74,45 +71,47 @@ pad_settings_dialog::pad_settings_dialog(std::shared_ptr<gui_settings> gui_setti
 	if (game)
 	{
 		m_title_id = game->serial;
-		setWindowTitle(tr("Gamepad Settings: [%0] %1").arg(QString::fromStdString(game->serial)).arg(QString::fromStdString(game->name).simplified()));
+		setWindowTitle(tr("Gamepad Settings: [%0] %1").arg(qstr(game->serial)).arg(qstr(game->name).simplified()));
 	}
 	else
 	{
 		setWindowTitle(tr("Gamepad Settings"));
 	}
 
-	// Load input configs
-	g_cfg_input_configs.load();
-
+	// Load profiles
 	if (m_title_id.empty())
 	{
-		const QString input_config_dir = QString::fromStdString(rpcs3::utils::get_input_config_dir(m_title_id));
-		QStringList config_files = gui::utils::get_dir_entries(QDir(input_config_dir), QStringList() << "*.yml");
-		QString active_config_file = QString::fromStdString(g_cfg_input_configs.active_configs.get_value(g_cfg_input_configs.global_key));
+		g_cfg_profile.load();
 
-		if (!config_files.contains(active_config_file))
+		const QString profile_dir = qstr(rpcs3::utils::get_input_config_dir(m_title_id));
+		QStringList profiles = gui::utils::get_dir_entries(QDir(profile_dir), QStringList() << "*.yml");
+		QString active_profile = qstr(g_cfg_profile.active_profiles.get_value(g_cfg_profile.global_key));
+
+		if (!profiles.contains(active_profile))
 		{
-			const QString default_config_file = QString::fromStdString(g_cfg_input_configs.default_config);
+			const QString default_profile = qstr(g_cfg_profile.default_profile);
 
-			if (!config_files.contains(default_config_file) && CreateConfigFile(input_config_dir, default_config_file))
+			if (!profiles.contains(default_profile) && CreateConfigFile(profile_dir, default_profile))
 			{
-				config_files.prepend(default_config_file);
+				profiles.prepend(default_profile);
 			}
 
-			active_config_file = default_config_file;
+			active_profile = default_profile;
 		}
 
-		for (const QString& profile : config_files)
+		for (const QString& profile : profiles)
 		{
-			ui->chooseConfig->addItem(profile);
+			ui->chooseProfile->addItem(profile);
 		}
 
-		ui->chooseConfig->setCurrentText(active_config_file);
+		ui->chooseProfile->setCurrentText(active_profile);
 	}
 	else
 	{
-		ui->chooseConfig->addItem(QString::fromStdString(m_title_id));
-		ui->gb_config_files->setEnabled(false);
+		g_cfg_profile.from_default();
+
+		ui->chooseProfile->addItem(qstr(m_title_id));
+		ui->gb_profiles->setEnabled(false);
 	}
 
 	// Create tab widget for 7 players
@@ -139,11 +138,11 @@ pad_settings_dialog::pad_settings_dialog(std::shared_ptr<gui_settings> gui_setti
 	// Combobox: Devices
 	connect(ui->chooseDevice, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &pad_settings_dialog::ChangeDevice);
 
-	// Combobox: Configs
-	connect(ui->chooseConfig, &QComboBox::currentTextChanged, this, &pad_settings_dialog::ChangeConfig);
+	// Combobox: Profiles
+	connect(ui->chooseProfile, &QComboBox::currentTextChanged, this, &pad_settings_dialog::ChangeProfile);
 
-	// Pushbutton: Add config file
-	connect(ui->b_addConfig, &QAbstractButton::clicked, this, &pad_settings_dialog::AddConfigFile);
+	// Pushbutton: Add Profile
+	connect(ui->b_addProfile, &QAbstractButton::clicked, this, &pad_settings_dialog::AddProfile);
 
 	ui->buttonBox->button(QDialogButtonBox::Reset)->setText(tr("Filter Noise"));
 
@@ -170,44 +169,25 @@ pad_settings_dialog::pad_settings_dialog(std::shared_ptr<gui_settings> gui_setti
 	// Refresh Button
 	connect(ui->b_refresh, &QPushButton::clicked, this, &pad_settings_dialog::RefreshHandlers);
 
-	ui->chooseClass->addItem(tr("Standard (Pad)"),     u32{CELL_PAD_PCLASS_TYPE_STANDARD});
-	ui->chooseClass->addItem(tr("Guitar"),             u32{CELL_PAD_PCLASS_TYPE_GUITAR});
-	ui->chooseClass->addItem(tr("Drum"),               u32{CELL_PAD_PCLASS_TYPE_DRUM});
-	ui->chooseClass->addItem(tr("DJ"),                 u32{CELL_PAD_PCLASS_TYPE_DJ});
-	ui->chooseClass->addItem(tr("Dance Mat"),          u32{CELL_PAD_PCLASS_TYPE_DANCEMAT});
-	ui->chooseClass->addItem(tr("PS Move Navigation"), u32{CELL_PAD_PCLASS_TYPE_NAVIGATION});
-	ui->chooseClass->addItem(tr("Skateboard"),         u32{CELL_PAD_PCLASS_TYPE_SKATEBOARD});
-	ui->chooseClass->addItem(tr("GunCon 3"),           u32{CELL_PAD_FAKE_TYPE_GUNCON3});
-	ui->chooseClass->addItem(tr("Top Shot Elite"),     u32{CELL_PAD_FAKE_TYPE_TOP_SHOT_ELITE});
-	ui->chooseClass->addItem(tr("Top Shot Fearmaster"),u32{CELL_PAD_FAKE_TYPE_TOP_SHOT_FEARMASTER});
-	ui->chooseClass->addItem(tr("uDraw GameTablet"),   u32{CELL_PAD_FAKE_TYPE_GAMETABLET});
-	ui->chooseClass->addItem(tr("Copilot for Player 1"), u32{CELL_PAD_FAKE_TYPE_COPILOT_1});
-	ui->chooseClass->addItem(tr("Copilot for Player 2"), u32{CELL_PAD_FAKE_TYPE_COPILOT_2});
-	ui->chooseClass->addItem(tr("Copilot for Player 3"), u32{CELL_PAD_FAKE_TYPE_COPILOT_3});
-	ui->chooseClass->addItem(tr("Copilot for Player 4"), u32{CELL_PAD_FAKE_TYPE_COPILOT_4});
-	ui->chooseClass->addItem(tr("Copilot for Player 5"), u32{CELL_PAD_FAKE_TYPE_COPILOT_5});
-	ui->chooseClass->addItem(tr("Copilot for Player 6"), u32{CELL_PAD_FAKE_TYPE_COPILOT_6});
-	ui->chooseClass->addItem(tr("Copilot for Player 7"), u32{CELL_PAD_FAKE_TYPE_COPILOT_7});
+	ui->chooseClass->addItem(tr("Standard (Pad)")); // CELL_PAD_PCLASS_TYPE_STANDARD   = 0x00,
+	ui->chooseClass->addItem(tr("Guitar"));         // CELL_PAD_PCLASS_TYPE_GUITAR     = 0x01,
+	ui->chooseClass->addItem(tr("Drum"));           // CELL_PAD_PCLASS_TYPE_DRUM       = 0x02,
+	ui->chooseClass->addItem(tr("DJ"));             // CELL_PAD_PCLASS_TYPE_DJ         = 0x03,
+	ui->chooseClass->addItem(tr("Dance Mat"));      // CELL_PAD_PCLASS_TYPE_DANCEMAT   = 0x04,
+	ui->chooseClass->addItem(tr("Navigation"));     // CELL_PAD_PCLASS_TYPE_NAVIGATION = 0x05,
 
-	connect(ui->chooseClass, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index)
-	{
-		if (index < 0) return;
-		HandleDeviceClassChange(ui->chooseClass->currentData().toUInt());
-	});
+	connect(ui->chooseClass, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &pad_settings_dialog::HandleDeviceClassChange);
 
 	ui->chb_show_emulated_values->setChecked(m_gui_settings->GetValue(gui::pads_show_emulated).toBool());
 
 	connect(ui->chb_show_emulated_values, &QCheckBox::clicked, [this](bool checked)
 	{
 		m_gui_settings->SetValue(gui::pads_show_emulated, checked);
-		const cfg_pad& cfg = GetPlayerConfig();
-		RepaintPreviewLabel(ui->preview_stick_left, ui->slider_stick_left->value(), ui->anti_deadzone_slider_stick_left->value(), ui->slider_stick_left->size().width(), m_lx, m_ly, cfg.lpadsquircling, cfg.lstickmultiplier / 100.0);
-		RepaintPreviewLabel(ui->preview_stick_right, ui->slider_stick_right->value(), ui->anti_deadzone_slider_stick_right->value(), ui->slider_stick_right->size().width(), m_rx, m_ry, cfg.rpadsquircling, cfg.rstickmultiplier / 100.0);
+		const auto& cfg = GetPlayerConfig();
+		RepaintPreviewLabel(ui->preview_stick_left, ui->slider_stick_left->value(), ui->slider_stick_left->size().width(), m_lx, m_ly, cfg.lpadsquircling, cfg.lstickmultiplier / 100.0);
+		RepaintPreviewLabel(ui->preview_stick_right, ui->slider_stick_right->value(), ui->slider_stick_right->size().width(), m_rx, m_ry, cfg.rpadsquircling, cfg.rstickmultiplier / 100.0);
 	});
 
-	ui->mouse_movement->addItem(tr("Relative"), static_cast<int>(mouse_movement_mode::relative));
-	ui->mouse_movement->addItem(tr("Absolute"), static_cast<int>(mouse_movement_mode::absolute));
-
 	// Initialize configurable buttons
 	InitButtons();
 
@@ -215,40 +195,31 @@ pad_settings_dialog::pad_settings_dialog(std::shared_ptr<gui_settings> gui_setti
 	SubscribeTooltips();
 
 	// Repaint controller image
-	QSvgRenderer renderer(QStringLiteral(":/Icons/DualShock_3.svg"));
-	QPixmap controller_pixmap(renderer.defaultSize() * 10);
-	controller_pixmap.fill(Qt::transparent);
-	QPainter painter(&controller_pixmap);
-	painter.setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
-	renderer.render(&painter, controller_pixmap.rect());
-	const QColor color = gui::utils::get_foreground_color();
-	ui->l_controller->setPixmap(gui::utils::get_colorized_pixmap(controller_pixmap, QColor(), gui::utils::get_label_color("l_controller", color, color), false, true));
+	ui->l_controller->setPixmap(gui::utils::get_colorized_pixmap(ui->l_controller->pixmap(Qt::ReturnByValue), QColor(), gui::utils::get_label_color("l_controller"), false, true));
 
 	// Show default widgets first in order to calculate the required size for the scroll area (see pad_settings_dialog::ResizeDialog)
 	ui->left_stack->setCurrentIndex(0);
 	ui->right_stack->setCurrentIndex(0);
 
+	RepaintPreviewLabel(ui->preview_stick_left, ui->slider_stick_left->value(), ui->slider_stick_left->size().width(), 0, 0, 0, 0);
+	RepaintPreviewLabel(ui->preview_stick_right, ui->slider_stick_right->value(), ui->slider_stick_right->size().width(), 0, 0, 0, 0);
+
+	show();
+
 	// Set up first tab
 	OnTabChanged(0);
-	ChangeConfig(ui->chooseConfig->currentText());
-}
+	ChangeProfile(ui->chooseProfile->currentText());
 
-void pad_settings_dialog::closeEvent(QCloseEvent* event)
-{
-	m_gui_settings->SetValue(gui::pads_geometry, saveGeometry());
+	// Resize in order to fit into our scroll area
+	ResizeDialog();
 
-	QDialog::closeEvent(event);
+	// Restrict out inner layout size. This is necessary because redrawing things will slow down the dialog otherwise.
+	ui->mainLayout->setSizeConstraint(QLayout::SizeConstraint::SetFixedSize);
 }
 
 pad_settings_dialog::~pad_settings_dialog()
 {
-	if (m_input_thread)
-	{
-		m_input_thread_state = input_thread_state::pausing;
-		*m_input_thread = thread_state::finished;
-	}
-
-	gui_pad_thread::reset();
+	delete ui;
 
 	if (!Emu.IsStopped())
 	{
@@ -258,20 +229,6 @@ pad_settings_dialog::~pad_settings_dialog()
 	pad::set_enabled(true);
 }
 
-void pad_settings_dialog::showEvent(QShowEvent* event)
-{
-	RepaintPreviewLabel(ui->preview_stick_left, ui->slider_stick_left->value(), ui->anti_deadzone_slider_stick_left->value(), ui->slider_stick_left->size().width(), 0, 0, 0, 0);
-	RepaintPreviewLabel(ui->preview_stick_right, ui->slider_stick_right->value(), ui->anti_deadzone_slider_stick_right->value(), ui->slider_stick_right->size().width(), 0, 0, 0, 0);
-
-	// Resize in order to fit into our scroll area
-	if (!restoreGeometry(m_gui_settings->GetValue(gui::pads_geometry).toByteArray()))
-	{
-		ResizeDialog();
-	}
-
-	QDialog::showEvent(event);
-}
-
 void pad_settings_dialog::InitButtons()
 {
 	m_pad_buttons = new QButtonGroup(this);
@@ -316,46 +273,49 @@ void pad_settings_dialog::InitButtons()
 	insert_button(button_ids::id_pad_rstick_up, ui->b_rstick_up);
 
 	insert_button(button_ids::id_pressure_intensity, ui->b_pressure_intensity);
-	insert_button(button_ids::id_analog_limiter, ui->b_analog_limiter);
-	insert_button(button_ids::id_orientation_reset, ui->b_orientation_reset);
 
 	m_pad_buttons->addButton(ui->b_refresh, button_ids::id_refresh);
-	m_pad_buttons->addButton(ui->b_addConfig, button_ids::id_add_config_file);
+	m_pad_buttons->addButton(ui->b_addProfile, button_ids::id_add_profile);
 
 	connect(m_pad_buttons, &QButtonGroup::idClicked, this, &pad_settings_dialog::OnPadButtonClicked);
 
-	connect(&m_remap_timer, &QTimer::timeout, this, [this]()
+	connect(&m_timer, &QTimer::timeout, this, [this]()
 	{
 		if (--m_seconds <= 0)
 		{
 			ReactivateButtons();
 			return;
 		}
-		if (auto button = m_pad_buttons->button(m_button_id))
-		{
-			button->setText(tr("[ Waiting %1 ]").arg(m_seconds));
-		}
+		m_pad_buttons->button(m_button_id)->setText(tr("[ Waiting %1 ]").arg(m_seconds));
 	});
 
-	connect(ui->sb_vibration_large, &QSpinBox::valueChanged, this, [this](int value)
+	connect(ui->chb_vibration_large, &QCheckBox::clicked, this, [this](bool checked)
 	{
-		const u8 force = static_cast<u8>(std::clamp(m_max_force * (value / 100.0f), 0.0f, 255.0f));
-		ui->chb_vibration_switch->isChecked() ? SetPadData(m_min_force, force)
-		                                      : SetPadData(force, m_min_force);
+		if (!checked)
+		{
+			return;
+		}
 
-		QTimer::singleShot(300, this, [this]()
+		ui->chb_vibration_switch->isChecked() ? SetPadData(m_min_force, m_max_force)
+		                                      : SetPadData(m_max_force, m_min_force);
+
+		QTimer::singleShot(300, [this]()
 		{
 			SetPadData(m_min_force, m_min_force);
 		});
 	});
 
-	connect(ui->sb_vibration_small, &QSpinBox::valueChanged, this, [this](int value)
+	connect(ui->chb_vibration_small, &QCheckBox::clicked, this, [this](bool checked)
 	{
-		const u8 force = static_cast<u8>(std::clamp(m_max_force * (value / 100.0f), 0.0f, 255.0f));
-		ui->chb_vibration_switch->isChecked() ? SetPadData(force, m_min_force)
-		                                      : SetPadData(m_min_force, force);
+		if (!checked)
+		{
+			return;
+		}
 
-		QTimer::singleShot(300, this, [this]()
+		ui->chb_vibration_switch->isChecked() ? SetPadData(m_max_force, m_min_force)
+		                                      : SetPadData(m_min_force, m_max_force);
+
+		QTimer::singleShot(300, [this]()
 		{
 			SetPadData(m_min_force, m_min_force);
 		});
@@ -366,12 +326,12 @@ void pad_settings_dialog::InitButtons()
 		checked ? SetPadData(m_min_force, m_max_force)
 		        : SetPadData(m_max_force, m_min_force);
 
-		QTimer::singleShot(200, this, [this, checked]()
+		QTimer::singleShot(200, [this, checked]()
 		{
 			checked ? SetPadData(m_max_force, m_min_force)
 			        : SetPadData(m_min_force, m_max_force);
 
-			QTimer::singleShot(200, this, [this]()
+			QTimer::singleShot(200, [this]()
 			{
 				SetPadData(m_min_force, m_min_force);
 			});
@@ -380,22 +340,12 @@ void pad_settings_dialog::InitButtons()
 
 	connect(ui->slider_stick_left, &QSlider::valueChanged, this, [&](int value)
 	{
-		RepaintPreviewLabel(ui->preview_stick_left, value, ui->anti_deadzone_slider_stick_left->value(), ui->slider_stick_left->size().width(), m_lx, m_ly, ui->squircle_left->value(), ui->stick_multi_left->value());
+		RepaintPreviewLabel(ui->preview_stick_left, value, ui->slider_stick_left->size().width(), m_lx, m_ly, ui->squircle_left->value(), ui->stick_multi_left->value());
 	});
 
 	connect(ui->slider_stick_right, &QSlider::valueChanged, this, [&](int value)
 	{
-		RepaintPreviewLabel(ui->preview_stick_right, value, ui->anti_deadzone_slider_stick_right->value(), ui->slider_stick_right->size().width(), m_rx, m_ry, ui->squircle_right->value(), ui->stick_multi_right->value());
-	});
-
-	connect(ui->anti_deadzone_slider_stick_left, &QSlider::valueChanged, this, [&](int value)
-	{
-		RepaintPreviewLabel(ui->preview_stick_left, ui->slider_stick_left->value(), value, ui->slider_stick_left->size().width(), m_lx, m_ly, ui->squircle_left->value(), ui->stick_multi_left->value());
-	});
-
-	connect(ui->anti_deadzone_slider_stick_right, &QSlider::valueChanged, this, [&](int value)
-	{
-		RepaintPreviewLabel(ui->preview_stick_right, ui->slider_stick_right->value(), value, ui->slider_stick_right->size().width(), m_rx, m_ry, ui->squircle_right->value(), ui->stick_multi_right->value());
+		RepaintPreviewLabel(ui->preview_stick_right, value, ui->slider_stick_right->size().width(), m_rx, m_ry, ui->squircle_right->value(), ui->stick_multi_right->value());
 	});
 
 	// Open LED settings
@@ -403,283 +353,161 @@ void pad_settings_dialog::InitButtons()
 	{
 		// Allow LED battery indication while the dialog is open
 		ensure(m_handler);
-		const cfg_pad& cfg = GetPlayerConfig();
+		const auto& cfg = GetPlayerConfig();
 		SetPadData(0, 0, cfg.led_battery_indicator.get());
-		pad_led_settings_dialog dialog(this, cfg.colorR, cfg.colorG, cfg.colorB, m_handler->has_rgb(), m_handler->has_player_led(), cfg.player_led_enabled.get(), m_handler->has_battery(), m_handler->has_battery_led(), cfg.led_low_battery_blink.get(), cfg.led_battery_indicator.get(), cfg.led_battery_indicator_brightness);
-		connect(&dialog, &pad_led_settings_dialog::pass_led_settings, this, [this](const pad_led_settings_dialog::led_settings& settings)
-		{
-			ensure(m_handler);
-			cfg_pad& cfg = GetPlayerConfig();
-			cfg.colorR.set(settings.color_r);
-			cfg.colorG.set(settings.color_g);
-			cfg.colorB.set(settings.color_b);
-			cfg.led_battery_indicator.set(settings.battery_indicator);
-			cfg.led_battery_indicator_brightness.set(settings.battery_indicator_brightness);
-			cfg.led_low_battery_blink.set(settings.low_battery_blink);
-			cfg.player_led_enabled.set(settings.player_led_enabled);
-			SetPadData(0, 0, settings.battery_indicator);
-		});
+		pad_led_settings_dialog dialog(this, cfg.colorR, cfg.colorG, cfg.colorB, m_handler->has_rgb(), m_handler->has_battery(), cfg.led_low_battery_blink.get(), cfg.led_battery_indicator.get(), cfg.led_battery_indicator_brightness);
+		connect(&dialog, &pad_led_settings_dialog::pass_led_settings, this, &pad_settings_dialog::apply_led_settings);
 		dialog.exec();
 		SetPadData(0, 0);
 	});
 
-	// Open Motion settings
-	connect(ui->b_motion_controls, &QPushButton::clicked, this, [this]()
+	// Enable Button Remapping
+	const auto& callback = [this](u16 val, std::string name, std::string pad_name, u32 battery_level, pad_preview_values preview_values)
 	{
-		if (m_timer_input.isActive())
-		{
-			m_timer_input.stop();
-		}
-		if (m_timer_pad_refresh.isActive())
-		{
-			m_timer_pad_refresh.stop();
-		}
-		pause_input_thread();
+		SwitchPadInfo(pad_name, true);
 
-		pad_motion_settings_dialog dialog(this, m_handler, g_cfg_input.player[GetPlayerIndex()]);
-		dialog.exec();
-
-		if (ui->chooseDevice->isEnabled() && ui->chooseDevice->currentIndex() >= 0)
+		if (!m_enable_buttons && !m_timer.isActive())
 		{
-			start_input_thread();
-			m_timer_input.start(10);
-			m_timer_pad_refresh.start(1000);
-		}
-	});
-
-	// Use timer to display button input
-	connect(&m_timer_input, &QTimer::timeout, this, [this]()
-	{
-		input_callback_data data;
-		{
-			std::lock_guard lock(m_input_mutex);
-			data = m_input_callback_data;
-			m_input_callback_data.values.clear();
-			m_input_callback_data.has_new_data = false;
+			SwitchButtons(true);
 		}
 
-		if (!data.has_new_data)
+		if (m_handler->has_deadzones())
+		{
+			ui->preview_trigger_left->setValue(preview_values[0]);
+			ui->preview_trigger_right->setValue(preview_values[1]);
+
+			if (m_lx != preview_values[2] || m_ly != preview_values[3])
+			{
+				m_lx = preview_values[2];
+				m_ly = preview_values[3];
+				RepaintPreviewLabel(ui->preview_stick_left, ui->slider_stick_left->value(), ui->slider_stick_left->size().width(), m_lx, m_ly, ui->squircle_left->value(), ui->stick_multi_left->value());
+			}
+			if (m_rx != preview_values[4] || m_ry != preview_values[5])
+			{
+				m_rx = preview_values[4];
+				m_ry = preview_values[5];
+				RepaintPreviewLabel(ui->preview_stick_right, ui->slider_stick_right->value(), ui->slider_stick_right->size().width(), m_rx, m_ry, ui->squircle_right->value(), ui->stick_multi_right->value());
+			}
+		}
+
+		ui->pb_battery->setValue(m_enable_battery ? battery_level : 0);
+
+		if (val <= 0)
 		{
 			return;
 		}
 
-		const auto update_preview = [this](const std::string& pad_name, bool is_connected, int battery_level, int trigger_left, int trigger_right, int lx, int ly, int rx, int ry)
+		cfg_log.notice("get_next_button_press: %s device %s button %s pressed with value %d", m_handler->m_type, pad_name, name, val);
+
+		if (m_button_id > button_ids::id_pad_begin && m_button_id < button_ids::id_pad_end)
 		{
-			SwitchPadInfo(pad_name, is_connected);
+			m_cfg_entries[m_button_id].key  = name;
+			m_cfg_entries[m_button_id].text = qstr(name);
+			ReactivateButtons();
+		}
+	};
 
-			if (is_connected != m_enable_buttons && (!is_connected || !m_remap_timer.isActive()))
+	// Disable Button Remapping
+	const auto& fail_callback = [this](const std::string& pad_name)
+	{
+		SwitchPadInfo(pad_name, false);
+
+		if (m_enable_buttons)
+		{
+			SwitchButtons(false);
+		}
+
+		ui->pb_battery->setValue(0);
+
+		if (m_handler->has_deadzones())
+		{
+			ui->preview_trigger_left->setValue(0);
+			ui->preview_trigger_right->setValue(0);
+
+			if (m_lx != 0 || m_ly != 0)
 			{
-				SwitchButtons(is_connected);
+				m_lx = 0;
+				m_ly = 0;
+				RepaintPreviewLabel(ui->preview_stick_left, ui->slider_stick_left->value(), ui->slider_stick_left->size().width(), m_lx, m_ly, ui->squircle_left->value(), ui->stick_multi_left->value());
 			}
-
-			ui->pb_battery->setValue(m_enable_battery ? battery_level : 0);
-
-			if (m_handler->has_deadzones())
+			if (m_rx != 0 || m_ry != 0)
 			{
-				ui->preview_trigger_left->setValue(trigger_left);
-				ui->preview_trigger_right->setValue(trigger_right);
-
-				if (m_lx != lx || m_ly != ly)
-				{
-					m_lx = lx;
-					m_ly = ly;
-					RepaintPreviewLabel(ui->preview_stick_left, ui->slider_stick_left->value(), ui->anti_deadzone_slider_stick_left->value(), ui->slider_stick_left->size().width(), m_lx, m_ly, ui->squircle_left->value(), ui->stick_multi_left->value());
-				}
-				if (m_rx != rx || m_ry != ry)
-				{
-					m_rx = rx;
-					m_ry = ry;
-					RepaintPreviewLabel(ui->preview_stick_right, ui->slider_stick_right->value(), ui->anti_deadzone_slider_stick_right->value(), ui->slider_stick_right->size().width(), m_rx, m_ry, ui->squircle_right->value(), ui->stick_multi_right->value());
-				}
+				m_rx = 0;
+				m_ry = 0;
+				RepaintPreviewLabel(ui->preview_stick_right, ui->slider_stick_right->value(), ui->slider_stick_right->size().width(), m_rx, m_ry, ui->squircle_right->value(), ui->stick_multi_right->value());
 			}
+		}
+	};
+
+	// Use timer to get button input
+	connect(&m_timer_input, &QTimer::timeout, this, [this, callback, fail_callback]()
+	{
+		const std::vector<std::string> buttons =
+		{
+			m_cfg_entries[button_ids::id_pad_l2].key, m_cfg_entries[button_ids::id_pad_r2].key, m_cfg_entries[button_ids::id_pad_lstick_left].key,
+			m_cfg_entries[button_ids::id_pad_lstick_right].key, m_cfg_entries[button_ids::id_pad_lstick_down].key, m_cfg_entries[button_ids::id_pad_lstick_up].key,
+			m_cfg_entries[button_ids::id_pad_rstick_left].key, m_cfg_entries[button_ids::id_pad_rstick_right].key, m_cfg_entries[button_ids::id_pad_rstick_down].key,
+			m_cfg_entries[button_ids::id_pad_rstick_up].key
 		};
-
-		if (data.status == PadHandlerBase::connection::disconnected)
-		{
-			// Disable Button Remapping
-			update_preview(data.pad_name, false, 0, 0, 0, 0, 0, 0, 0);
-			return;
-		}
-
-		// Enable Button Remapping
-		update_preview(data.pad_name, true, data.battery_level, data.preview_values[0], data.preview_values[1], data.preview_values[2], data.preview_values[3], data.preview_values[4], data.preview_values[5]);
-
-		// Handle Button Presses
-		for (const input_callback_data::input_values& values : data.values)
-		{
-			if (values.val <= 0) continue;
-
-			cfg_log.notice("get_next_button_press: %s device %s button %s pressed with value %d", m_handler->m_type, data.pad_name, values.button_name, values.val);
-
-			if (m_button_id > button_ids::id_pad_begin && m_button_id < button_ids::id_pad_end && m_button_id == values.button_id)
-			{
-				m_cfg_entries[m_button_id].insert_key(values.button_name, m_enable_multi_binding);
-				ReactivateButtons();
-			}
-		}
+		m_handler->get_next_button_press(m_device_name, callback, fail_callback, false, buttons);
 	});
 
 	// Use timer to refresh pad connection status
-	connect(&m_timer_pad_refresh, &QTimer::timeout, this, &pad_settings_dialog::RefreshPads);
-
-	// Use thread to get button input
-	m_input_thread = std::make_unique<named_thread<std::function<void()>>>("Pad Settings Thread", [this]()
+	connect(&m_timer_pad_refresh, &QTimer::timeout, this, [this]()
 	{
-		u32 button_id = button_ids::id_pad_begin; // Used to check if this is the first call during a remap
-
-		while (thread_ctrl::state() != thread_state::aborting)
+		for (int i = 0; i < ui->chooseDevice->count(); i++)
 		{
-			thread_ctrl::wait_for(1000);
-
-			if (m_input_thread_state != input_thread_state::active)
+			if (!ui->chooseDevice->itemData(i).canConvert<pad_device_info>())
 			{
-				if (m_input_thread_state == input_thread_state::pausing)
-				{
-					std::lock_guard lock(m_input_mutex);
-					m_input_callback_data = {};
-					m_input_thread_state = input_thread_state::paused;
-				}
-
+				cfg_log.fatal("Cannot convert itemData for index %d and itemText %s", i, sstr(ui->chooseDevice->itemText(i)));
 				continue;
 			}
-
-			std::lock_guard lock(m_handler_mutex);
-
-			const std::vector<std::string> buttons =
-			{
-				m_cfg_entries[button_ids::id_pad_l2].keys,
-				m_cfg_entries[button_ids::id_pad_r2].keys,
-				m_cfg_entries[button_ids::id_pad_lstick_left].keys,
-				m_cfg_entries[button_ids::id_pad_lstick_right].keys,
-				m_cfg_entries[button_ids::id_pad_lstick_down].keys,
-				m_cfg_entries[button_ids::id_pad_lstick_up].keys,
-				m_cfg_entries[button_ids::id_pad_rstick_left].keys,
-				m_cfg_entries[button_ids::id_pad_rstick_right].keys,
-				m_cfg_entries[button_ids::id_pad_rstick_down].keys,
-				m_cfg_entries[button_ids::id_pad_rstick_up].keys
-			};
-
-			// Check if this is the first call during a remap
-			const u32 new_button_id = m_button_id;
-			const bool is_mapping = new_button_id > button_ids::id_pad_begin && new_button_id < button_ids::id_pad_end;
-			const bool first_call = std::exchange(button_id, new_button_id) != button_id && is_mapping;
-			const PadHandlerBase::gui_call_type call_type = first_call ? PadHandlerBase::gui_call_type::reset_input : PadHandlerBase::gui_call_type::normal;
-
-			const PadHandlerBase::connection status = m_handler->get_next_button_press(m_device_name,
-				[this, button_id](u16 val, std::string button_name, std::string pad_name, u32 battery_level, pad_preview_values preview_values)
-				{
-					std::lock_guard lock(m_input_mutex);
-					if (m_input_callback_data.pad_name != pad_name)
-					{
-						m_input_callback_data = {};
-						m_input_callback_data.pad_name = std::move(pad_name);
-					}
-					m_input_callback_data.battery_level = battery_level;
-					m_input_callback_data.preview_values = std::move(preview_values);
-					m_input_callback_data.has_new_data = true;
-					m_input_callback_data.status = PadHandlerBase::connection::connected;
-					if (val > 0)
-					{
-						m_input_callback_data.values.push_back(input_callback_data::input_values
-						{
-							.button_name = std::move(button_name),
-							.button_id = button_id,
-							.val = val,
-						});
-					}
-				},
-				[this](std::string pad_name)
-				{
-					std::lock_guard lock(m_input_mutex);
-					m_input_callback_data = {};
-					m_input_callback_data.pad_name = std::move(pad_name);
-					m_input_callback_data.has_new_data = true;
-				},
-				call_type, buttons);
-
-			if (status == PadHandlerBase::connection::no_data)
-			{
-				std::lock_guard lock(m_input_mutex);
-				if (m_input_callback_data.pad_name != m_device_name)
-				{
-					m_input_callback_data = {};
-					m_input_callback_data.pad_name = m_device_name;
-				}
-				m_input_callback_data.has_new_data = true;
-				m_input_callback_data.status = status;
-			}
+			const pad_device_info info = ui->chooseDevice->itemData(i).value<pad_device_info>();
+			m_handler->get_next_button_press(info.name,
+				[this](u16, std::string, std::string pad_name, u32, pad_preview_values) { SwitchPadInfo(pad_name, true); },
+				[this](std::string pad_name) { SwitchPadInfo(pad_name, false); }, false);
 		}
 	});
 }
 
-void pad_settings_dialog::RefreshPads()
+void pad_settings_dialog::SetPadData(u32 large_motor, u32 small_motor, bool led_battery_indicator)
 {
-	for (int i = 0; i < ui->chooseDevice->count(); i++)
-	{
-		pad_device_info info = get_pad_info(ui->chooseDevice, i);
-
-		if (info.name.empty())
-		{
-			continue;
-		}
-
-		std::lock_guard lock(m_handler_mutex);
-		const PadHandlerBase::connection status = m_handler->get_next_button_press(info.name, nullptr, nullptr, PadHandlerBase::gui_call_type::get_connection, {});
-		switch_pad_info(i, info, status != PadHandlerBase::connection::disconnected);
-	}
-}
-
-void pad_settings_dialog::SetPadData(u8 large_motor, u8 small_motor, bool led_battery_indicator)
-{
-	const cfg_pad& cfg = GetPlayerConfig();
-
-	std::lock_guard lock(m_handler_mutex);
 	ensure(m_handler);
-	m_handler->SetPadData(m_device_name, GetPlayerIndex(), large_motor, small_motor, cfg.colorR, cfg.colorG, cfg.colorB, cfg.player_led_enabled.get(), led_battery_indicator, cfg.led_battery_indicator_brightness);
+	const auto& cfg = GetPlayerConfig();
+	m_handler->SetPadData(m_device_name, GetPlayerIndex(), large_motor, small_motor, cfg.colorR, cfg.colorG, cfg.colorB, led_battery_indicator, cfg.led_battery_indicator_brightness);
 }
 
-pad_device_info pad_settings_dialog::get_pad_info(QComboBox* combo, int index)
+// Slot to handle the data from a signal in the led settings dialog
+void pad_settings_dialog::apply_led_settings(int colorR, int colorG, int colorB, bool led_low_battery_blink, bool led_battery_indicator, int led_battery_indicator_brightness)
 {
-	if (!combo || index < 0)
-	{
-		cfg_log.fatal("get_pad_info: Invalid combo box or index (combo=%d, index=%d)", !!combo, index);
-		return {};
-	}
-
-	const QVariant user_data = combo->itemData(index);
-
-	if (!user_data.canConvert<pad_device_info>())
-	{
-		cfg_log.fatal("get_pad_info: Cannot convert itemData for index %d and itemText %s", index, combo->itemText(index));
-		return {};
-	}
-
-	return user_data.value<pad_device_info>();
-}
-
-void pad_settings_dialog::switch_pad_info(int index, pad_device_info info, bool is_connected)
-{
-	if (index >= 0 && info.is_connected != is_connected)
-	{
-		info.is_connected = is_connected;
-
-		ui->chooseDevice->setItemData(index, QVariant::fromValue(info));
-		ui->chooseDevice->setItemText(index, is_connected ? info.localized_name : (info.localized_name + Disconnected_suffix));
-	}
-
-	if (!is_connected && m_remap_timer.isActive() && ui->chooseDevice->currentIndex() == index)
-	{
-		ReactivateButtons();
-	}
+	ensure(m_handler);
+	auto& cfg = GetPlayerConfig();
+	cfg.colorR.set(colorR);
+	cfg.colorG.set(colorG);
+	cfg.colorB.set(colorB);
+	cfg.led_battery_indicator.set(led_battery_indicator);
+	cfg.led_battery_indicator_brightness.set(led_battery_indicator_brightness);
+	cfg.led_low_battery_blink.set(led_low_battery_blink);
+	SetPadData(0, 0, led_battery_indicator);
 }
 
 void pad_settings_dialog::SwitchPadInfo(const std::string& pad_name, bool is_connected)
 {
 	for (int i = 0; i < ui->chooseDevice->count(); i++)
 	{
-		if (pad_device_info info = get_pad_info(ui->chooseDevice, i); info.name == pad_name)
+		const pad_device_info info = ui->chooseDevice->itemData(i).value<pad_device_info>();
+		if (info.name == pad_name)
 		{
-			switch_pad_info(i, info, is_connected);
+			if (info.is_connected != is_connected)
+			{
+				ui->chooseDevice->setItemData(i, QVariant::fromValue(pad_device_info{ pad_name, is_connected }));
+				ui->chooseDevice->setItemText(i, is_connected ? qstr(pad_name) : (qstr(pad_name) + Disconnected_suffix));
+			}
+
+			if (!is_connected && m_timer.isActive() && ui->chooseDevice->currentIndex() == i)
+			{
+				ReactivateButtons();
+			}
 			break;
 		}
 	}
@@ -691,12 +519,12 @@ void pad_settings_dialog::ReloadButtons()
 
 	auto updateButton = [this](int id, QPushButton* button, cfg::string* cfg_text)
 	{
-		const QString text = QString::fromStdString(*cfg_text);
+		const QString text = qstr(*cfg_text);
 		m_cfg_entries.insert(std::make_pair(id, pad_button{cfg_text, *cfg_text, text}));
 		button->setText(text);
 	};
 
-	cfg_pad& cfg = GetPlayerConfig();
+	auto& cfg = GetPlayerConfig();
 
 	updateButton(button_ids::id_pad_lstick_left, ui->b_lstick_left, &cfg.ls_left);
 	updateButton(button_ids::id_pad_lstick_down, ui->b_lstick_down, &cfg.ls_down);
@@ -731,27 +559,36 @@ void pad_settings_dialog::ReloadButtons()
 	updateButton(button_ids::id_pad_rstick_up, ui->b_rstick_up, &cfg.rs_up);
 
 	updateButton(button_ids::id_pressure_intensity, ui->b_pressure_intensity, &cfg.pressure_intensity_button);
-	updateButton(button_ids::id_analog_limiter, ui->b_analog_limiter, &cfg.analog_limiter_button);
-	updateButton(button_ids::id_orientation_reset, ui->b_orientation_reset, &cfg.orientation_reset_button);
+
+	m_min_force = m_handler->vibration_min;
+	m_max_force = m_handler->vibration_max;
+
+	// Enable Vibration Checkboxes
+	m_enable_rumble = m_handler->has_rumble();
+
+	// Enable Deadzone Settings
+	m_enable_deadzones = m_handler->has_deadzones();
+
+	// Enable Pressure Sensitivity Settings
+	m_enable_pressure_intensity_button = m_handler->has_pressure_intensity_button();
 
 	UpdateLabels(true);
 }
 
 void pad_settings_dialog::ReactivateButtons()
 {
-	m_remap_timer.stop();
+	m_timer.stop();
 	m_seconds = MAX_SECONDS;
-	m_enable_multi_binding = false;
 
 	if (m_button_id == button_ids::id_pad_begin)
 	{
 		return;
 	}
 
-	if (auto button = m_pad_buttons->button(m_button_id))
+	if (m_pad_buttons->button(m_button_id))
 	{
-		button->setPalette(m_palette);
-		button->releaseMouse();
+		m_pad_buttons->button(m_button_id)->setPalette(m_palette);
+		m_pad_buttons->button(m_button_id)->releaseMouse();
 	}
 
 	m_button_id = button_ids::id_pad_begin;
@@ -771,35 +608,32 @@ void pad_settings_dialog::ReactivateButtons()
 	ui->tabWidget->setFocusPolicy(Qt::TabFocus);
 	ui->scrollArea->setFocusPolicy(Qt::StrongFocus);
 
-	ui->chooseConfig->setFocusPolicy(Qt::WheelFocus);
+	ui->chooseProfile->setFocusPolicy(Qt::WheelFocus);
 	ui->chooseHandler->setFocusPolicy(Qt::WheelFocus);
 	ui->chooseDevice->setFocusPolicy(Qt::WheelFocus);
 	ui->chooseClass->setFocusPolicy(Qt::WheelFocus);
 	ui->chooseProduct->setFocusPolicy(Qt::WheelFocus);
 }
 
-void pad_settings_dialog::RepaintPreviewLabel(QLabel* label, int deadzone, int anti_deadzone, int desired_width, int x, int y, int squircle, double multiplier) const
+void pad_settings_dialog::RepaintPreviewLabel(QLabel* l, int deadzone, int desired_width, int x, int y, int squircle, double multiplier) const
 {
-	desired_width = 100; // Let's keep a fixed size for these labels for now
-	const qreal deadzone_max = m_handler ? m_handler->thumb_max : 255; // 255 used as fallback. The deadzone circle shall be small.
+	const int deadzone_max = m_handler ? m_handler->thumb_max : 255; // 255 used as fallback. The deadzone circle shall be small.
 
 	constexpr qreal relative_size = 0.9;
 	const qreal device_pixel_ratio = devicePixelRatioF();
 	const qreal scaled_width = desired_width * device_pixel_ratio;
 	const qreal origin = desired_width / 2.0;
 	const qreal outer_circle_diameter = relative_size * desired_width;
-	const qreal deadzone_circle_diameter = outer_circle_diameter * deadzone / deadzone_max;
-	const qreal anti_deadzone_circle_diameter = outer_circle_diameter * anti_deadzone / deadzone_max;
+	const qreal inner_circle_diameter = outer_circle_diameter * deadzone / deadzone_max;
 	const qreal outer_circle_radius = outer_circle_diameter / 2.0;
-	const qreal deadzone_circle_radius = deadzone_circle_diameter / 2.0;
-	const qreal anti_deadzone_circle_radius = anti_deadzone_circle_diameter / 2.0;
+	const qreal inner_circle_radius = inner_circle_diameter / 2.0;
 	const qreal stick_x = std::clamp(outer_circle_radius * x * multiplier / deadzone_max, -outer_circle_radius, outer_circle_radius);
 	const qreal stick_y = std::clamp(outer_circle_radius * -y * multiplier / deadzone_max, -outer_circle_radius, outer_circle_radius);
 
 	const bool show_emulated_values = ui->chb_show_emulated_values->isChecked();
 
-	qreal ingame_x = 0.0;
-	qreal ingame_y = 0.0;
+	[[maybe_unused]] qreal ingame_x = 0.0;
+	[[maybe_unused]] qreal ingame_y = 0.0;
 
 	// Set up the canvas for our work of art
 	QPixmap pixmap(scaled_width, scaled_width);
@@ -825,7 +659,7 @@ void pad_settings_dialog::RepaintPreviewLabel(QLabel* label, int deadzone, int a
 			const u16 normal_y = m_handler->NormalizeStickInput(static_cast<u16>(std::abs(y)), deadzone, m_in, true);
 			const s32 x_in = x >= 0 ? normal_x : 0 - normal_x;
 			const s32 y_in = y >= 0 ? normal_y : 0 - normal_y;
-			m_handler->convert_stick_values(real_x, real_y, x_in, y_in, deadzone, anti_deadzone, squircle);
+			m_handler->convert_stick_values(real_x, real_y, x_in, y_in, deadzone, squircle);
 		}
 
 		constexpr qreal real_max = 126;
@@ -843,15 +677,9 @@ void pad_settings_dialog::RepaintPreviewLabel(QLabel* label, int deadzone, int a
 	painter.setPen(QPen(Qt::black, 1.0));
 	painter.drawEllipse(QRectF(-outer_circle_radius, -outer_circle_radius, outer_circle_diameter, outer_circle_diameter));
 
-	painter.setBrush(QBrush(Qt::transparent));
-
 	// Draw a red inner circle that represents the current deadzone
 	painter.setPen(QPen(Qt::red, 1.0));
-	painter.drawEllipse(QRectF(-deadzone_circle_radius, -deadzone_circle_radius, deadzone_circle_diameter, deadzone_circle_diameter));
-
-	// Draw a green inner circle that represents the current anti-deadzone
-	painter.setPen(QPen(Qt::green, 1.0));
-	painter.drawEllipse(QRectF(-anti_deadzone_circle_radius, -anti_deadzone_circle_radius, anti_deadzone_circle_diameter, anti_deadzone_circle_diameter));
+	painter.drawEllipse(QRectF(-inner_circle_radius, -inner_circle_radius, inner_circle_diameter, inner_circle_diameter));
 
 	// Draw a blue dot that represents the current stick orientation
 	painter.setPen(QPen(Qt::blue, 2.0));
@@ -864,9 +692,7 @@ void pad_settings_dialog::RepaintPreviewLabel(QLabel* label, int deadzone, int a
 		painter.drawEllipse(QRectF(ingame_x - 0.5, ingame_y - 0.5, 1.0, 1.0));
 	}
 
-	painter.end();
-
-	label->setPixmap(pixmap);
+	l->setPixmap(pixmap);
 }
 
 void pad_settings_dialog::keyPressEvent(QKeyEvent *keyEvent)
@@ -891,11 +717,12 @@ void pad_settings_dialog::keyPressEvent(QKeyEvent *keyEvent)
 
 	if (m_button_id <= button_ids::id_pad_begin || m_button_id >= button_ids::id_pad_end)
 	{
-		cfg_log.error("Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id.load());
+		cfg_log.error("Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id);
 	}
 	else
 	{
-		m_cfg_entries[m_button_id].insert_key(keyboard_pad_handler::GetKeyName(keyEvent, false), m_enable_multi_binding);
+		m_cfg_entries[m_button_id].key = keyboard_pad_handler::GetKeyName(keyEvent);
+		m_cfg_entries[m_button_id].text = qstr(m_cfg_entries[m_button_id].key);
 	}
 
 	ReactivateButtons();
@@ -918,11 +745,12 @@ void pad_settings_dialog::mouseReleaseEvent(QMouseEvent* event)
 
 	if (m_button_id <= button_ids::id_pad_begin || m_button_id >= button_ids::id_pad_end)
 	{
-		cfg_log.error("Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id.load());
+		cfg_log.error("Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id);
 	}
 	else
 	{
-		m_cfg_entries[m_button_id].insert_key((static_cast<keyboard_pad_handler*>(m_handler.get()))->GetMouseName(event), m_enable_multi_binding);
+		m_cfg_entries[m_button_id].key = (static_cast<keyboard_pad_handler*>(m_handler.get()))->GetMouseName(event);
+		m_cfg_entries[m_button_id].text = qstr(m_cfg_entries[m_button_id].key);
 	}
 
 	ReactivateButtons();
@@ -945,7 +773,7 @@ void pad_settings_dialog::wheelEvent(QWheelEvent *event)
 
 	if (m_button_id <= button_ids::id_pad_begin || m_button_id >= button_ids::id_pad_end)
 	{
-		cfg_log.error("Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id.load());
+		cfg_log.error("Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id);
 		return;
 	}
 
@@ -983,8 +811,8 @@ void pad_settings_dialog::wheelEvent(QWheelEvent *event)
 			key = mouse::wheel_down;
 		}
 	}
-
-	m_cfg_entries[m_button_id].insert_key((static_cast<keyboard_pad_handler*>(m_handler.get()))->GetMouseName(key), m_enable_multi_binding);
+	m_cfg_entries[m_button_id].key = (static_cast<keyboard_pad_handler*>(m_handler.get()))->GetMouseName(key);
+	m_cfg_entries[m_button_id].text = qstr(m_cfg_entries[m_button_id].key);
 	ReactivateButtons();
 }
 
@@ -1005,37 +833,37 @@ void pad_settings_dialog::mouseMoveEvent(QMouseEvent* event)
 
 	if (m_button_id <= button_ids::id_pad_begin || m_button_id >= button_ids::id_pad_end)
 	{
-		cfg_log.error("Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id.load());
+		cfg_log.error("Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id);
 	}
 	else
 	{
-		constexpr int delta_threshold = 20;
 		const QPoint mouse_pos = QCursor::pos();
 		const int delta_x = mouse_pos.x() - m_last_pos.x();
 		const int delta_y = mouse_pos.y() - m_last_pos.y();
 
 		u32 key = 0;
 
-		if (delta_x > delta_threshold)
+		if (delta_x > 100)
 		{
 			key = mouse::move_right;
 		}
-		else if (delta_x < -delta_threshold)
+		else if (delta_x < -100)
 		{
 			key = mouse::move_left;
 		}
-		else if (delta_y > delta_threshold)
+		else if (delta_y > 100)
 		{
 			key = mouse::move_down;
 		}
-		else if (delta_y < -delta_threshold)
+		else if (delta_y < -100)
 		{
 			key = mouse::move_up;
 		}
 
 		if (key != 0)
 		{
-			m_cfg_entries[m_button_id].insert_key((static_cast<keyboard_pad_handler*>(m_handler.get()))->GetMouseName(key), m_enable_multi_binding);
+			m_cfg_entries[m_button_id].key = (static_cast<keyboard_pad_handler*>(m_handler.get()))->GetMouseName(key);
+			m_cfg_entries[m_button_id].text = qstr(m_cfg_entries[m_button_id].key);
 			ReactivateButtons();
 		}
 	}
@@ -1047,24 +875,6 @@ bool pad_settings_dialog::eventFilter(QObject* object, QEvent* event)
 	{
 	case QEvent::MouseButtonRelease:
 	{
-		// On right click clear binding if we are not remapping pad button
-		if (m_button_id == button_ids::id_pad_begin)
-		{
-			QMouseEvent* mouse_event = static_cast<QMouseEvent*>(event);
-			if (const auto button = qobject_cast<QPushButton*>(object); button && button->isEnabled() && mouse_event->button() == Qt::RightButton)
-			{
-				if (const int button_id = m_pad_buttons->id(button); m_cfg_entries.contains(button_id))
-				{
-					pad_button& button = m_cfg_entries[button_id];
-					button.keys.clear();
-					button.text.clear();
-					UpdateLabels();
-
-					return true;
-				}
-			}
-		}
-
 		// Disabled buttons should not absorb mouseclicks
 		event->ignore();
 		break;
@@ -1107,14 +917,13 @@ void pad_settings_dialog::UpdateLabels(bool is_reset)
 {
 	if (is_reset)
 	{
-		const cfg_pad& cfg = GetPlayerConfig();
+		const auto& cfg = GetPlayerConfig();
 
 		// Update device class
-		const int index = ui->chooseClass->findData(cfg.device_class_type.get());
-		ui->chooseClass->setCurrentIndex(index);
+		ui->chooseClass->setCurrentIndex(cfg.device_class_type);
 
 		// Trigger the change manually in case that the class dropdown didn't fire an event
-		HandleDeviceClassChange(cfg.device_class_type);
+		HandleDeviceClassChange(ui->chooseClass->currentIndex());
 
 		const auto products = input::get_products_by_class(cfg.device_class_type);
 
@@ -1127,13 +936,9 @@ void pad_settings_dialog::UpdateLabels(bool is_reset)
 			}
 		}
 
-		ui->sb_vibration_large->setRange(cfg.multiplier_vibration_motor_large.min, cfg.multiplier_vibration_motor_large.max);
-		ui->sb_vibration_large->setValue(cfg.multiplier_vibration_motor_large.get());
-
-		ui->sb_vibration_small->setRange(cfg.multiplier_vibration_motor_small.min, cfg.multiplier_vibration_motor_small.max);
-		ui->sb_vibration_small->setValue(cfg.multiplier_vibration_motor_small.get());
-
-		ui->chb_vibration_switch->setChecked(cfg.switch_vibration_motors.get());
+		ui->chb_vibration_large->setChecked(static_cast<bool>(cfg.enable_vibration_motor_large));
+		ui->chb_vibration_small->setChecked(static_cast<bool>(cfg.enable_vibration_motor_small));
+		ui->chb_vibration_switch->setChecked(static_cast<bool>(cfg.switch_vibration_motors));
 
 		// Update Trigger Thresholds
 		ui->preview_trigger_left->setRange(0, m_handler->trigger_max);
@@ -1151,19 +956,8 @@ void pad_settings_dialog::UpdateLabels(bool is_reset)
 		ui->slider_stick_right->setRange(0, m_handler->thumb_max);
 		ui->slider_stick_right->setValue(cfg.rstickdeadzone);
 
-		ui->anti_deadzone_slider_stick_left->setRange(0, m_handler->thumb_max);
-		ui->anti_deadzone_slider_stick_left->setValue(cfg.lstick_anti_deadzone);
-
-		ui->anti_deadzone_slider_stick_right->setRange(0, m_handler->thumb_max);
-		ui->anti_deadzone_slider_stick_right->setValue(cfg.rstick_anti_deadzone);
-
 		std::vector<std::string> range;
 
-		// Update Mouse Movement Mode
-		const int mouse_movement_index = ui->mouse_movement->findData(static_cast<int>(cfg.mouse_move_mode.get()));
-		ensure(mouse_movement_index >= 0);
-		ui->mouse_movement->setCurrentIndex(mouse_movement_index);
-
 		// Update Mouse Deadzones
 		range = cfg.mouse_deadzone_x.to_list();
 		ui->mouse_dz_x->setRange(std::stoi(range.front()), std::stoi(range.back()));
@@ -1209,31 +1003,16 @@ void pad_settings_dialog::UpdateLabels(bool is_reset)
 		ui->squircle_right->setRange(std::stoi(range.front()), std::stoi(range.back()));
 		ui->squircle_right->setValue(cfg.rpadsquircling);
 
-		RepaintPreviewLabel(ui->preview_stick_left, ui->slider_stick_left->value(), ui->anti_deadzone_slider_stick_left->value(), ui->slider_stick_left->size().width(), m_lx, m_ly, cfg.lpadsquircling, cfg.lstickmultiplier / 100.0);
-		RepaintPreviewLabel(ui->preview_stick_right, ui->slider_stick_right->value(), ui->anti_deadzone_slider_stick_right->value(), ui->slider_stick_right->size().width(), m_rx, m_ry, cfg.rpadsquircling, cfg.rstickmultiplier / 100.0);
-
-		// Update orientation toggle
-		ui->cb_orientation_toggle->setChecked(cfg.orientation_enabled.get());
-
-		// Update analog limiter toggle mode
-		ui->cb_analog_limiter_toggle_mode->setChecked(cfg.analog_limiter_toggle_mode.get());
+		RepaintPreviewLabel(ui->preview_stick_left, ui->slider_stick_left->value(), ui->slider_stick_left->size().width(), m_lx, m_ly, cfg.lpadsquircling, cfg.lstickmultiplier / 100.0);
+		RepaintPreviewLabel(ui->preview_stick_right, ui->slider_stick_right->value(), ui->slider_stick_right->size().width(), m_rx, m_ry, cfg.rpadsquircling, cfg.rstickmultiplier / 100.0);
 
 		// Update pressure sensitivity factors
 		range = cfg.pressure_intensity.to_list();
 		ui->sb_pressure_intensity->setRange(std::stoi(range.front()), std::stoi(range.back()));
 		ui->sb_pressure_intensity->setValue(cfg.pressure_intensity);
 
-		// Update pressure sensitivity toggle mode
-		ui->cb_pressure_intensity_toggle_mode->setChecked(cfg.pressure_intensity_toggle_mode.get());
-
-		// Update pressure sensitivity deadzone
-		range = cfg.pressure_intensity_deadzone.to_list();
-		ui->pressure_intensity_deadzone->setRange(std::stoi(range.front()), std::stoi(range.back()));
-		ui->pressure_intensity_deadzone->setValue(cfg.pressure_intensity_deadzone.get());
-
 		// Apply stored/default LED settings to the device
 		m_enable_led = m_handler->has_led();
-		m_enable_battery_led = m_handler->has_battery_led();
 		SetPadData(0, 0);
 
 		// Enable battery and LED group box
@@ -1241,19 +1020,16 @@ void pad_settings_dialog::UpdateLabels(bool is_reset)
 		ui->gb_battery->setVisible(m_enable_battery || m_enable_led);
 	}
 
-	for (auto& [id, button] : m_cfg_entries)
+	for (auto& entry : m_cfg_entries)
 	{
 		if (is_reset)
 		{
-			button.keys = *button.cfg_text;
-			button.text = QString::fromStdString(button.keys);
+			entry.second.key = *entry.second.cfg_text;
+			entry.second.text = qstr(entry.second.key);
 		}
 
 		// The button has to contain at least one character, because it would be square'ish otherwise
-		if (auto btn = m_pad_buttons->button(id))
-		{
-			btn->setText(button.text.isEmpty() ? QStringLiteral("-") : button.text);
-		}
+		m_pad_buttons->button(entry.first)->setText(entry.second.text.isEmpty() ? QStringLiteral("-") : entry.second.text);
 	}
 }
 
@@ -1266,19 +1042,13 @@ void pad_settings_dialog::SwitchButtons(bool is_enabled)
 	ui->stick_multi_right->setEnabled(is_enabled);
 	ui->squircle_left->setEnabled(is_enabled);
 	ui->squircle_right->setEnabled(is_enabled);
-	ui->gb_pressure_intensity_deadzone->setEnabled(is_enabled);
 	ui->gb_pressure_intensity->setEnabled(is_enabled && m_enable_pressure_intensity_button);
-	ui->gb_analog_limiter->setEnabled(is_enabled && m_enable_analog_limiter_button);
-	ui->gb_orientation_reset->setEnabled(is_enabled && m_enable_orientation_reset_button);
 	ui->gb_vibration->setEnabled(is_enabled && m_enable_rumble);
-	ui->gb_motion_controls->setEnabled(is_enabled && m_enable_motion);
-	ui->gb_stick_deadzones->setEnabled(is_enabled && m_enable_deadzones);
-	ui->gb_stick_anti_deadzones->setEnabled(is_enabled && m_enable_deadzones);
+	ui->gb_sticks->setEnabled(is_enabled && m_enable_deadzones);
 	ui->gb_triggers->setEnabled(is_enabled && m_enable_deadzones);
 	ui->gb_battery->setEnabled(is_enabled && (m_enable_battery || m_enable_led));
 	ui->pb_battery->setEnabled(is_enabled && m_enable_battery);
 	ui->b_led_settings->setEnabled(is_enabled && m_enable_led);
-	ui->gb_mouse_movement->setEnabled(is_enabled && m_handler->m_type == pad_handler::keyboard);
 	ui->gb_mouse_accel->setEnabled(is_enabled && m_handler->m_type == pad_handler::keyboard);
 	ui->gb_mouse_dz->setEnabled(is_enabled && m_handler->m_type == pad_handler::keyboard);
 	ui->gb_stick_lerp->setEnabled(is_enabled && m_handler->m_type == pad_handler::keyboard);
@@ -1288,10 +1058,7 @@ void pad_settings_dialog::SwitchButtons(bool is_enabled)
 
 	for (int i = button_ids::id_pad_begin + 1; i < button_ids::id_pad_end; i++)
 	{
-		if (auto button = m_pad_buttons->button(i))
-		{
-			button->setEnabled(is_enabled);
-		}
+		m_pad_buttons->button(i)->setEnabled(is_enabled);
 	}
 }
 
@@ -1302,8 +1069,10 @@ void pad_settings_dialog::OnPadButtonClicked(int id)
 	case button_ids::id_led:
 	case button_ids::id_pad_begin:
 	case button_ids::id_pad_end:
-	case button_ids::id_add_config_file:
+	case button_ids::id_add_profile:
 	case button_ids::id_refresh:
+	case button_ids::id_ok:
+	case button_ids::id_cancel:
 		return;
 	case button_ids::id_reset_parameters:
 		ReactivateButtons();
@@ -1311,24 +1080,12 @@ void pad_settings_dialog::OnPadButtonClicked(int id)
 		UpdateLabels(true);
 		return;
 	case button_ids::id_blacklist:
-	{
-		std::lock_guard lock(m_handler_mutex);
-		[[maybe_unused]] const PadHandlerBase::connection status = m_handler->get_next_button_press(m_device_name, nullptr, nullptr, PadHandlerBase::gui_call_type::blacklist, {});
+		m_handler->get_next_button_press(m_device_name, nullptr, nullptr, true);
 		return;
-	}
 	default:
 		break;
 	}
 
-	// On shift+click or shift+space enable multi key binding
-	if (QApplication::keyboardModifiers() & Qt::KeyboardModifier::ShiftModifier)
-	{
-		m_enable_multi_binding = true;
-	}
-
-	// On alt+click or alt+space allow to handle triggers as the entire stick axis
-	m_handler->set_trigger_recognition_mode((QApplication::keyboardModifiers() & Qt::KeyboardModifier::AltModifier) ? PadHandlerBase::trigger_recognition_mode::two_directional : PadHandlerBase::trigger_recognition_mode::one_directional);
-
 	for (auto but : m_pad_buttons->buttons())
 	{
 		but->setFocusPolicy(Qt::ClickFocus);
@@ -1342,7 +1099,7 @@ void pad_settings_dialog::OnPadButtonClicked(int id)
 	ui->tabWidget->setFocusPolicy(Qt::ClickFocus);
 	ui->scrollArea->setFocusPolicy(Qt::ClickFocus);
 
-	ui->chooseConfig->setFocusPolicy(Qt::ClickFocus);
+	ui->chooseProfile->setFocusPolicy(Qt::ClickFocus);
 	ui->chooseHandler->setFocusPolicy(Qt::ClickFocus);
 	ui->chooseDevice->setFocusPolicy(Qt::ClickFocus);
 	ui->chooseClass->setFocusPolicy(Qt::ClickFocus);
@@ -1351,14 +1108,11 @@ void pad_settings_dialog::OnPadButtonClicked(int id)
 	m_last_pos = QCursor::pos();
 
 	m_button_id = id;
-	if (auto button = m_pad_buttons->button(m_button_id))
-	{
-		button->setText(tr("[ Waiting %1 ]").arg(MAX_SECONDS));
-		button->setPalette(QPalette(Qt::blue));
-		button->grabMouse();
-	}
+	m_pad_buttons->button(m_button_id)->setText(tr("[ Waiting %1 ]").arg(MAX_SECONDS));
+	m_pad_buttons->button(m_button_id)->setPalette(QPalette(Qt::blue));
+	m_pad_buttons->button(m_button_id)->grabMouse();
 	SwitchButtons(false); // disable all buttons, needed for using Space, Enter and other specific buttons
-	m_remap_timer.start(1000);
+	m_timer.start(1000);
 }
 
 void pad_settings_dialog::OnTabChanged(int index)
@@ -1375,17 +1129,12 @@ void pad_settings_dialog::OnTabChanged(int index)
 
 void pad_settings_dialog::ChangeHandler()
 {
-	// Pause input thread. This means we don't have to lock the handler mutex here.
-	pause_input_thread();
-
 	bool force_enable = false; // enable configs even with disconnected devices
 	const u32 player = GetPlayerIndex();
 	const bool is_ldd_pad = GetIsLddPad(player);
-	cfg_player* player_config = g_cfg_input.player[player];
 
 	std::string handler;
 	std::string device;
-	std::string buddy_device;
 
 	if (is_ldd_pad)
 	{
@@ -1393,15 +1142,14 @@ void pad_settings_dialog::ChangeHandler()
 	}
 	else
 	{
-		handler = ui->chooseHandler->currentData().toString().toStdString();
-		device = player_config->device.to_string();
-		buddy_device = player_config->buddy_device.to_string();
+		handler = sstr(ui->chooseHandler->currentData().toString());
+		device = g_cfg_input.player[player]->device.to_string();
 	}
-
-	cfg_pad& cfg = player_config->config;
+	
+	auto& cfg = g_cfg_input.player[player]->config;
 
 	// Change and get this player's current handler.
-	if (auto& cfg_handler = player_config->handler; handler != cfg_handler.to_string())
+	if (auto& cfg_handler = g_cfg_input.player[player]->handler; handler != cfg_handler.to_string())
 	{
 		if (!cfg_handler.from_string(handler))
 		{
@@ -1410,18 +1158,18 @@ void pad_settings_dialog::ChangeHandler()
 		}
 
 		// Initialize the new pad config's defaults
-		m_handler = pad_thread::GetHandler(player_config->handler);
+		m_handler = pad_thread::GetHandler(g_cfg_input.player[player]->handler);
 		pad_thread::InitPadConfig(cfg, cfg_handler, m_handler);
 	}
 	else
 	{
-		m_handler = pad_thread::GetHandler(player_config->handler);
+		m_handler = pad_thread::GetHandler(g_cfg_input.player[player]->handler);
 	}
 
 	ensure(m_handler);
 
 	// Get the handler's currently available devices.
-	const std::vector<pad_list_entry> device_list = m_handler->list_devices();
+	const auto device_list = m_handler->ListDevices();
 
 	// Localized tooltips
 	const Tooltips tooltips;
@@ -1430,69 +1178,50 @@ void pad_settings_dialog::ChangeHandler()
 	switch (m_handler->m_type)
 	{
 	case pad_handler::null:
-		GetPlayerConfig().from_default();
 		if (is_ldd_pad)
 			m_description = tooltips.gamepad_settings.ldd_pad;
 		else
 			m_description = tooltips.gamepad_settings.null;
 		break;
-	case pad_handler::keyboard: m_description = tooltips.gamepad_settings.keyboard; break;
-	case pad_handler::skateboard: m_description = tooltips.gamepad_settings.skateboard; break;
-	case pad_handler::move: m_description = tooltips.gamepad_settings.move; break;
+	case pad_handler::keyboard:
+		m_description = tooltips.gamepad_settings.keyboard; break;
 #ifdef _WIN32
-	case pad_handler::xinput: m_description = tooltips.gamepad_settings.xinput; break;
-	case pad_handler::mm: m_description = tooltips.gamepad_settings.mmjoy; break;
-	case pad_handler::ds3: m_description = tooltips.gamepad_settings.ds3_windows; break;
-	case pad_handler::ds4: m_description = tooltips.gamepad_settings.ds4_windows; break;
-	case pad_handler::dualsense: m_description = tooltips.gamepad_settings.dualsense_windows; break;
+	case pad_handler::xinput:
+		m_description = tooltips.gamepad_settings.xinput; break;
+	case pad_handler::mm:
+		m_description = tooltips.gamepad_settings.mmjoy; break;
+	case pad_handler::ds3:
+		m_description = tooltips.gamepad_settings.ds3_windows; break;
+	case pad_handler::ds4:
+		m_description = tooltips.gamepad_settings.ds4_windows; break;
+	case pad_handler::dualsense:
+		m_description = tooltips.gamepad_settings.dualsense_windows; break;
 #elif __linux__
-	case pad_handler::ds3: m_description = tooltips.gamepad_settings.ds3_linux; break;
-	case pad_handler::ds4: m_description = tooltips.gamepad_settings.ds4_linux; break;
-	case pad_handler::dualsense: m_description = tooltips.gamepad_settings.dualsense_linux; break;
+	case pad_handler::ds3:
+		m_description = tooltips.gamepad_settings.ds3_linux; break;
+	case pad_handler::ds4:
+		m_description = tooltips.gamepad_settings.ds4_linux; break;
+	case pad_handler::dualsense:
+		m_description = tooltips.gamepad_settings.dualsense_linux; break;
 #else
-	case pad_handler::ds3: m_description = tooltips.gamepad_settings.ds3_other; break;
-	case pad_handler::ds4: m_description = tooltips.gamepad_settings.ds4_other; break;
-	case pad_handler::dualsense: m_description = tooltips.gamepad_settings.dualsense_other; break;
-#endif
-#ifdef HAVE_SDL3
-	case pad_handler::sdl: m_description = tooltips.gamepad_settings.sdl; break;
+	case pad_handler::ds3:
+		m_description = tooltips.gamepad_settings.ds3_other; break;
+	case pad_handler::ds4:
+		m_description = tooltips.gamepad_settings.ds4_other; break;
+	case pad_handler::dualsense:
+		m_description = tooltips.gamepad_settings.dualsense_other; break;
 #endif
 #ifdef HAVE_LIBEVDEV
-	case pad_handler::evdev: m_description = tooltips.gamepad_settings.evdev; break;
+	case pad_handler::evdev:
+		m_description = tooltips.gamepad_settings.evdev; break;
 #endif
 	}
 	ui->l_description->setText(m_description);
 
-	// Reset parameters
-	m_lx = 0;
-	m_ly = 0;
-	m_rx = 0;
-	m_ry = 0;
-
-	// Enable Vibration Checkboxes
-	m_enable_rumble = m_handler->has_rumble();
-
-	// Enable Motion Settings
-	m_enable_motion = m_handler->has_motion();
-
-	// Enable Deadzone Settings
-	m_enable_deadzones = m_handler->has_deadzones();
-
-	// Enable Pressure Sensitivity Settings
-	m_enable_pressure_intensity_button = m_handler->has_pressure_intensity_button();
-
-	// Enable Analog Limiter Settings
-	m_enable_analog_limiter_button = m_handler->has_analog_limiter_button();
-
-	// Enable Orientation Reset Settings
-	m_enable_orientation_reset_button = m_handler->has_orientation();
-
 	// Change our contextual widgets
 	ui->left_stack->setCurrentIndex((m_handler->m_type == pad_handler::keyboard) ? 1 : 0);
 	ui->right_stack->setCurrentIndex((m_handler->m_type == pad_handler::keyboard) ? 1 : 0);
 	ui->gb_pressure_intensity->setVisible(m_handler->has_pressure_intensity_button());
-	ui->gb_analog_limiter->setVisible(m_handler->has_analog_limiter_button());
-	ui->gb_orientation_reset->setVisible(m_handler->has_orientation());
 
 	// Update device dropdown and block signals while doing so
 	ui->chooseDevice->blockSignals(true);
@@ -1503,20 +1232,16 @@ void pad_settings_dialog::ChangeHandler()
 	{
 #ifdef _WIN32
 	case pad_handler::xinput:
-	case pad_handler::mm:
 #endif
 	case pad_handler::ds3:
 	case pad_handler::ds4:
 	case pad_handler::dualsense:
-	case pad_handler::skateboard:
-	case pad_handler::move:
 	{
-		const QString name_string = QString::fromStdString(m_handler->name_string());
+		const QString name_string = qstr(m_handler->name_string());
 		for (usz i = 1; i <= m_handler->max_devices(); i++) // Controllers 1-n in GUI
 		{
 			const QString device_name = name_string + QString::number(i);
-			const QString device_name_localized = GetLocalizedPadName(m_handler->m_type, device_name, i);
-			ui->chooseDevice->addItem(device_name_localized, QVariant::fromValue(pad_device_info{ device_name.toStdString(), device_name_localized, true }));
+			ui->chooseDevice->addItem(device_name, QVariant::fromValue(pad_device_info{ sstr(device_name), true }));
 		}
 		force_enable = true;
 		break;
@@ -1532,17 +1257,9 @@ void pad_settings_dialog::ChangeHandler()
 	}
 	default:
 	{
-		for (usz i = 0; i < device_list.size(); i++)
+		for (const auto& device_name : device_list)
 		{
-			const pad_list_entry& device = ::at32(device_list, i);
-
-			if (!device.is_buddy_only)
-			{
-				const QString device_name_localized = GetLocalizedPadName(m_handler->m_type, QString::fromStdString(device.name), i);
-				const QVariant user_data = QVariant::fromValue(pad_device_info{ device.name, device_name_localized, true });
-
-				ui->chooseDevice->addItem(device_name_localized, user_data);
-			}
+			ui->chooseDevice->addItem(qstr(device_name), QVariant::fromValue(pad_device_info{ device_name, true }));
 		}
 		break;
 	}
@@ -1552,26 +1269,28 @@ void pad_settings_dialog::ChangeHandler()
 	ui->chooseDevice->blockSignals(false);
 
 	// Handle empty device list
-	const bool config_enabled = force_enable || (m_handler->m_type != pad_handler::null && ui->chooseDevice->count() > 0);
+	bool config_enabled = force_enable || (m_handler->m_type != pad_handler::null && ui->chooseDevice->count() > 0);
 
 	if (config_enabled)
 	{
-		RefreshPads();
-
 		for (int i = 0; i < ui->chooseDevice->count(); i++)
 		{
-			if (pad_device_info info = get_pad_info(ui->chooseDevice, i); info.name == device)
+			if (!ui->chooseDevice->itemData(i).canConvert<pad_device_info>())
+			{
+				cfg_log.fatal("Cannot convert itemData for index %d and itemText %s", i, sstr(ui->chooseDevice->itemText(i)));
+				continue;
+			}
+			const pad_device_info info = ui->chooseDevice->itemData(i).value<pad_device_info>();
+			m_handler->get_next_button_press(info.name,
+				[this](u16, std::string, std::string pad_name, u32, pad_preview_values) { SwitchPadInfo(pad_name, true); },
+				[this](std::string pad_name) { SwitchPadInfo(pad_name, false); }, false);
+
+			if (info.name == device)
 			{
 				ui->chooseDevice->setCurrentIndex(i);
-				break;
 			}
 		}
 
-		if (ui->chooseDevice->currentIndex() < 0 && ui->chooseDevice->count() > 0)
-		{
-			ui->chooseDevice->setCurrentIndex(0);
-		}
-
 		// Force Refresh
 		ChangeDevice(ui->chooseDevice->currentIndex());
 	}
@@ -1581,13 +1300,10 @@ void pad_settings_dialog::ChangeHandler()
 		{
 			ui->chooseDevice->setPlaceholderText(tr("No Device Detected"));
 		}
-
-		// Keep the configured device name
-		m_device_name = GetDeviceName();
 	}
 
 	// Handle running timers
-	if (m_remap_timer.isActive())
+	if (m_timer.isActive())
 	{
 		ReactivateButtons();
 	}
@@ -1613,21 +1329,20 @@ void pad_settings_dialog::ChangeHandler()
 	// Re-enable input timer
 	if (ui->chooseDevice->isEnabled() && ui->chooseDevice->currentIndex() >= 0)
 	{
-		start_input_thread();
-		m_timer_input.start(10);
+		m_timer_input.start(1);
 		m_timer_pad_refresh.start(1000);
 	}
 }
 
-void pad_settings_dialog::ChangeConfig(const QString& config_file)
+void pad_settings_dialog::ChangeProfile(const QString& profile)
 {
-	if (config_file.isEmpty())
+	if (profile.isEmpty())
 		return;
 
-	m_config_file = config_file.toStdString();
+	m_profile = sstr(profile);
 
 	// Load in order to get the pad handlers
-	if (!g_cfg_input.load(m_title_id, m_config_file, true))
+	if (!g_cfg_input.load(m_title_id, m_profile, true))
 	{
 		cfg_log.notice("Loaded empty pad config");
 	}
@@ -1640,21 +1355,21 @@ void pad_settings_dialog::ChangeConfig(const QString& config_file)
 	}
 
 	// Reload with proper defaults
-	if (!g_cfg_input.load(m_title_id, m_config_file, true))
+	if (!g_cfg_input.load(m_title_id, m_profile, true))
 	{
 		cfg_log.notice("Reloaded empty pad config");
 	}
 
 	const u32 player_id = GetPlayerIndex();
-	const QString q_handler = QString::fromStdString(g_cfg_input.player[player_id]->handler.to_string());
+	const std::string handler = fmt::format("%s", g_cfg_input.player[player_id]->handler.get());
 
-	if (const int index = ui->chooseHandler->findData(q_handler); index >= 0)
+	if (const QString q_handler = qstr(handler); ui->chooseHandler->findText(q_handler) >= 0)
 	{
-		ui->chooseHandler->setCurrentIndex(index);
+		ui->chooseHandler->setCurrentText(q_handler);
 	}
 	else
 	{
-		cfg_log.error("Handler '%s' not found in handler dropdown.", q_handler);
+		cfg_log.fatal("Handler '%s' not found in handler dropdown.", handler);
 	}
 
 	// Force Refresh
@@ -1666,23 +1381,25 @@ void pad_settings_dialog::ChangeDevice(int index)
 	if (index < 0)
 		return;
 
-	const QVariant user_data = ui->chooseDevice->itemData(index);
-
-	if (!user_data.canConvert<pad_device_info>())
+	const pad_device_info info = ui->chooseDevice->itemData(index).value<pad_device_info>();
+	m_device_name = info.name;
+	if (!g_cfg_input.player[GetPlayerIndex()]->device.from_string(m_device_name))
+	{
+		// Something went wrong
+		cfg_log.error("Failed to convert device string: %s", m_device_name);
+	}
+}
+
+void pad_settings_dialog::HandleDeviceClassChange(int index) const
+{
+	if (index < 0)
 	{
-		cfg_log.fatal("ChangeDevice: Cannot convert itemData for index %d and itemText %s", index, ui->chooseDevice->itemText(index));
 		return;
 	}
 
-	const pad_device_info info = user_data.value<pad_device_info>();
-	SetDeviceName(info.name);
-}
-
-void pad_settings_dialog::HandleDeviceClassChange(u32 class_id) const
-{
 	ui->chooseProduct->clear();
 
-	for (const input::product_info& product : input::get_products_by_class(class_id))
+	for (const auto& product : input::get_products_by_class(index))
 	{
 		switch (product.type)
 		{
@@ -1731,70 +1448,40 @@ void pad_settings_dialog::HandleDeviceClassChange(u32 class_id) const
 			ui->chooseProduct->addItem(tr("Rock Revolution", "Rock Revolution Drum Controller"), static_cast<int>(product.type));
 			break;
 		}
-		case input::product_type::ps_move_navigation:
-		{
-			ui->chooseProduct->addItem(tr("PS Move Navigation", "PS Move Navigation Controller"), static_cast<int>(product.type));
-			break;
-		}
-		case input::product_type::ride_skateboard:
-		{
-			ui->chooseProduct->addItem(tr("RIDE Skateboard", "Tony Hawk RIDE Skateboard Controller"), static_cast<int>(product.type));
-			break;
-		}
-		case input::product_type::guncon_3:
-		{
-			ui->chooseProduct->addItem(tr("GunCon 3", "GunCon 3 Controller"), static_cast<int>(product.type));
-			break;
-		}
-		case input::product_type::top_shot_elite:
-		{
-			ui->chooseProduct->addItem(tr("Top Shot Elite", "Top Shot Elite Controller"), static_cast<int>(product.type));
-			break;
-		}
-		case input::product_type::top_shot_fearmaster:
-		{
-			ui->chooseProduct->addItem(tr("Top Shot Fearmaster", "Top Shot Fearmaster Controller"), static_cast<int>(product.type));
-			break;
-		}
-		case input::product_type::udraw_gametablet:
-		{
-			ui->chooseProduct->addItem(tr("uDraw GameTablet", "uDraw GameTablet Controller"), static_cast<int>(product.type));
-			break;
-		}
 		}
 	}
 }
 
-void pad_settings_dialog::AddConfigFile()
+void pad_settings_dialog::AddProfile()
 {
 	QInputDialog* dialog = new QInputDialog(this);
 	dialog->setWindowTitle(tr("Choose a unique name"));
-	dialog->setLabelText(tr("Configuration Name: "));
+	dialog->setLabelText(tr("Profile Name: "));
 	dialog->setFixedSize(500, 100);
 
 	while (dialog->exec() != QDialog::Rejected)
 	{
-		const QString config_name = dialog->textValue();
+		const QString profile_name = dialog->textValue();
 
-		if (config_name.isEmpty())
+		if (profile_name.isEmpty())
 		{
 			QMessageBox::warning(this, tr("Error"), tr("Name cannot be empty"));
 			continue;
 		}
-		if (config_name.contains("."))
+		if (profile_name.contains("."))
 		{
 			QMessageBox::warning(this, tr("Error"), tr("Must choose a name without '.'"));
 			continue;
 		}
-		if (ui->chooseConfig->findText(config_name) != -1)
+		if (ui->chooseProfile->findText(profile_name) != -1)
 		{
 			QMessageBox::warning(this, tr("Error"), tr("Please choose a non-existing name"));
 			continue;
 		}
-		if (CreateConfigFile(QString::fromStdString(rpcs3::utils::get_input_config_dir(m_title_id)), config_name))
+		if (CreateConfigFile(qstr(rpcs3::utils::get_input_config_dir(m_title_id)), profile_name))
 		{
-			ui->chooseConfig->addItem(config_name);
-			ui->chooseConfig->setCurrentText(config_name);
+			ui->chooseProfile->addItem(profile_name);
+			ui->chooseProfile->setCurrentText(profile_name);
 		}
 		break;
 	}
@@ -1817,12 +1504,12 @@ void pad_settings_dialog::RefreshHandlers()
 		const std::vector<std::string> str_inputs = g_cfg_input.player[0]->handler.to_list();
 		for (usz i = 0; i < str_inputs.size(); i++)
 		{
-			const QString item_data = QString::fromStdString(str_inputs[i]);
+			const QString item_data = qstr(str_inputs[i]);
 			ui->chooseHandler->addItem(GetLocalizedPadHandler(item_data, static_cast<pad_handler>(i)), QVariant(item_data));
 		}
 
-		const QString item_data = QString::fromStdString(g_cfg_input.player[player_id]->handler.to_string());
-		ui->chooseHandler->setCurrentIndex(ui->chooseHandler->findData(QVariant(item_data)));
+		const auto& handler = g_cfg_input.player[player_id]->handler;
+		ui->chooseHandler->setCurrentText(GetLocalizedPadHandler(qstr(handler.to_string()), handler));
 	}
 
 	ui->chooseHandler->blockSignals(false);
@@ -1833,36 +1520,41 @@ void pad_settings_dialog::RefreshHandlers()
 
 void pad_settings_dialog::ApplyCurrentPlayerConfig(int new_player_id)
 {
-	if (!m_handler || new_player_id < 0 || static_cast<u32>(new_player_id) >= g_cfg_input.player.size())
+	if (!m_handler || new_player_id < 0)
 	{
 		return;
 	}
 
-	m_duplicate_buttons[m_last_player_id].clear();
+	m_duplicate_buttons[m_last_player_id] = "";
 
 	auto& player = g_cfg_input.player[m_last_player_id];
 	m_last_player_id = new_player_id;
 
+	// Check for invalid selection
+	if (!ui->chooseDevice->isEnabled() || ui->chooseDevice->currentIndex() < 0)
+	{
+		const u32 played_id = GetPlayerIndex();
+		g_cfg_input.player[played_id]->handler.from_default();
+		g_cfg_input.player[played_id]->device.from_default();
+		g_cfg_input.player[played_id]->config.from_default();
+
+		return;
+	}
+
 	// Check for duplicate button choices
 	if (m_handler->m_type != pad_handler::null)
 	{
 		std::set<std::string> unique_keys;
-		for (const auto& [id, button] : m_cfg_entries)
+		for (const auto& entry : m_cfg_entries)
 		{
 			// Let's ignore special keys, unless we're using a keyboard
-			if (m_handler->m_type != pad_handler::keyboard &&
-				(id == button_ids::id_pressure_intensity || id == button_ids::id_analog_limiter || id == button_ids::id_orientation_reset))
-			{
+			if (entry.first == button_ids::id_pressure_intensity && m_handler->m_type != pad_handler::keyboard)
 				continue;
-			}
 
-			for (const std::string& key : cfg_pad::get_buttons(button.keys))
+			if (const auto& [it, ok] = unique_keys.insert(entry.second.key); !ok)
 			{
-				if (const auto& [it, ok] = unique_keys.insert(key); !ok)
-				{
-					m_duplicate_buttons[m_last_player_id] = key;
-					break;
-				}
+				m_duplicate_buttons[m_last_player_id] = entry.second.key;
+				break;
 			}
 		}
 	}
@@ -1870,7 +1562,7 @@ void pad_settings_dialog::ApplyCurrentPlayerConfig(int new_player_id)
 	// Apply buttons
 	for (const auto& entry : m_cfg_entries)
 	{
-		entry.second.cfg_text->from_string(entry.second.keys);
+		entry.second.cfg_text->from_string(entry.second.key);
 	}
 
 	// Apply rest of config
@@ -1878,14 +1570,13 @@ void pad_settings_dialog::ApplyCurrentPlayerConfig(int new_player_id)
 
 	cfg.lstickmultiplier.set(ui->stick_multi_left->value() * 100);
 	cfg.rstickmultiplier.set(ui->stick_multi_right->value() * 100);
-
 	cfg.lpadsquircling.set(ui->squircle_left->value());
 	cfg.rpadsquircling.set(ui->squircle_right->value());
 
 	if (m_handler->has_rumble())
 	{
-		cfg.multiplier_vibration_motor_large.set(ui->sb_vibration_large->value());
-		cfg.multiplier_vibration_motor_small.set(ui->sb_vibration_small->value());
+		cfg.enable_vibration_motor_large.set(ui->chb_vibration_large->isChecked());
+		cfg.enable_vibration_motor_small.set(ui->chb_vibration_small->isChecked());
 		cfg.switch_vibration_motors.set(ui->chb_vibration_switch->isChecked());
 	}
 
@@ -1895,33 +1586,15 @@ void pad_settings_dialog::ApplyCurrentPlayerConfig(int new_player_id)
 		cfg.rtriggerthreshold.set(ui->slider_trigger_right->value());
 		cfg.lstickdeadzone.set(ui->slider_stick_left->value());
 		cfg.rstickdeadzone.set(ui->slider_stick_right->value());
-		cfg.lstick_anti_deadzone.set(ui->anti_deadzone_slider_stick_left->value());
-		cfg.rstick_anti_deadzone.set(ui->anti_deadzone_slider_stick_right->value());
-	}
-
-	if (m_handler->has_analog_limiter_button())
-	{
-		cfg.analog_limiter_toggle_mode.set(ui->cb_analog_limiter_toggle_mode->isChecked());
 	}
 
 	if (m_handler->has_pressure_intensity_button())
 	{
 		cfg.pressure_intensity.set(ui->sb_pressure_intensity->value());
-		cfg.pressure_intensity_toggle_mode.set(ui->cb_pressure_intensity_toggle_mode->isChecked());
 	}
 
-	if (m_handler->has_orientation())
-	{
-		cfg.orientation_enabled.set(ui->cb_orientation_toggle->isChecked());
-	}
-
-	cfg.pressure_intensity_deadzone.set(ui->pressure_intensity_deadzone->value());
-
 	if (m_handler->m_type == pad_handler::keyboard)
 	{
-		const int mouse_move_mode = ui->mouse_movement->currentData().toInt();
-		ensure(mouse_move_mode >= 0 && mouse_move_mode <= 1);
-		cfg.mouse_move_mode.set(static_cast<mouse_movement_mode>(mouse_move_mode));
 		cfg.mouse_acceleration_x.set(ui->mouse_accel_x->value() * 100);
 		cfg.mouse_acceleration_y.set(ui->mouse_accel_y->value() * 100);
 		cfg.mouse_deadzone_x.set(ui->mouse_dz_x->value());
@@ -1930,7 +1603,7 @@ void pad_settings_dialog::ApplyCurrentPlayerConfig(int new_player_id)
 		cfg.r_stick_lerp_factor.set(ui->right_stick_lerp->value() * 100);
 	}
 
-	cfg.device_class_type.set(ui->chooseClass->currentData().toUInt());
+	cfg.device_class_type.set(ui->chooseClass->currentIndex());
 
 	const auto info = input::get_product_info(static_cast<input::product_type>(ui->chooseProduct->currentData().toInt()));
 
@@ -1950,9 +1623,7 @@ void pad_settings_dialog::SaveExit()
 			m_gui_settings->ShowConfirmationBox(
 				tr("Warning!"),
 				tr("The %0 button <b>%1</b> of <b>Player %2</b> was assigned at least twice.<br>Please consider adjusting the configuration.<br><br>Continue anyway?<br>")
-					.arg(QString::fromStdString(g_cfg_input.player[player_id]->handler.to_string()))
-					.arg(QString::fromStdString(key))
-					.arg(player_id + 1),
+					.arg(qstr(g_cfg_input.player[player_id]->handler.to_string())).arg(qstr(key)).arg(player_id + 1),
 				gui::ib_same_buttons, &result, this);
 
 			if (result == QMessageBox::No)
@@ -1962,12 +1633,17 @@ void pad_settings_dialog::SaveExit()
 		}
 	}
 
-	const std::string config_file_key = m_title_id.empty() ? g_cfg_input_configs.global_key : m_title_id;
+	if (m_title_id.empty())
+	{
+		g_cfg_profile.active_profiles.set_value(g_cfg_profile.global_key, m_profile);
+		g_cfg_profile.save();
 
-	g_cfg_input_configs.active_configs.set_value(config_file_key, m_config_file);
-	g_cfg_input_configs.save();
-
-	g_cfg_input.save(m_title_id, m_config_file);
+		g_cfg_input.save(m_title_id, m_profile);
+	}
+	else
+	{
+		g_cfg_input.save(m_title_id);
+	}
 
 	QDialog::accept();
 }
@@ -1975,7 +1651,7 @@ void pad_settings_dialog::SaveExit()
 void pad_settings_dialog::CancelExit()
 {
 	// Reloads configs from file or defaults
-	g_cfg_input_configs.load();
+	g_cfg_profile.load();
 	g_cfg_input.from_default();
 
 	QDialog::reject();
@@ -1990,15 +1666,10 @@ QString pad_settings_dialog::GetLocalizedPadHandler(const QString& original, pad
 		case pad_handler::ds3: return tr("DualShock 3");
 		case pad_handler::ds4: return tr("DualShock 4");
 		case pad_handler::dualsense: return tr("DualSense");
-		case pad_handler::skateboard: return tr("Skateboard");
-		case pad_handler::move: return tr("PS Move");
 #ifdef _WIN32
 		case pad_handler::xinput: return tr("XInput");
 		case pad_handler::mm: return tr("MMJoystick");
 #endif
-#ifdef HAVE_SDL3
-		case pad_handler::sdl: return tr("SDL");
-#endif
 #ifdef HAVE_LIBEVDEV
 		case pad_handler::evdev: return tr("Evdev");
 #endif
@@ -2006,31 +1677,6 @@ QString pad_settings_dialog::GetLocalizedPadHandler(const QString& original, pad
 	return original;
 }
 
-QString pad_settings_dialog::GetLocalizedPadName(pad_handler handler, const QString& original, usz index)
-{
-	switch (handler)
-	{
-		case pad_handler::null: return tr("Default Null Device");
-		case pad_handler::keyboard: return tr("Keyboard");
-		case pad_handler::ds3: return tr("DS3 Pad #%0").arg(index);
-		case pad_handler::ds4: return tr("DS4 Pad #%0").arg(index);
-		case pad_handler::dualsense: return tr("DualSense Pad #%0").arg(index);
-		case pad_handler::skateboard: return tr("Skateboard #%0").arg(index);
-		case pad_handler::move: return tr("PS Move #%0").arg(index);
-#ifdef _WIN32
-		case pad_handler::xinput: return tr("XInput Pad #%0").arg(index);
-		case pad_handler::mm: return tr("Joystick #%0").arg(index);
-#endif
-#ifdef HAVE_SDL3
-		case pad_handler::sdl: break; // Localization not feasible. Names differ for each device.
-#endif
-#ifdef HAVE_LIBEVDEV
-		case pad_handler::evdev: break; // Localization not feasible. Names differ for each device.
-#endif
-	}
-	return original;
-}
-
 bool pad_settings_dialog::GetIsLddPad(u32 index) const
 {
 	// We only check for ldd pads if the current dialog may affect the running application.
@@ -2038,14 +1684,9 @@ bool pad_settings_dialog::GetIsLddPad(u32 index) const
 	if (!Emu.IsStopped() && (m_title_id.empty() || m_title_id == Emu.GetTitleID()))
 	{
 		std::lock_guard lock(pad::g_pad_mutex);
-		if (const auto handler = pad::get_pad_thread(true))
+		if (const auto handler = pad::get_current_handler(true))
 		{
-			ensure(index < handler->GetPads().size());
-
-			if (const std::shared_ptr<Pad> pad = ::at32(handler->GetPads(), index))
-			{
-				return pad->ldd;
-			}
+			return handler->GetPads().at(index)->ldd;
 		}
 	}
 
@@ -2064,21 +1705,6 @@ cfg_pad& pad_settings_dialog::GetPlayerConfig() const
 	return g_cfg_input.player[GetPlayerIndex()]->config;
 }
 
-std::string pad_settings_dialog::GetDeviceName() const
-{
-	return g_cfg_input.player[GetPlayerIndex()]->device.to_string();
-}
-
-void pad_settings_dialog::SetDeviceName(const std::string& name)
-{
-	m_device_name = name;
-
-	if (!g_cfg_input.player[GetPlayerIndex()]->device.from_string(m_device_name))
-	{
-		cfg_log.error("Failed to convert device string: %s", m_device_name);
-	}
-}
-
 void pad_settings_dialog::ResizeDialog()
 {
 	// Widgets
@@ -2094,11 +1720,11 @@ void pad_settings_dialog::ResizeDialog()
 	const QSize margin_size(margins.left() + margins.right(), margins.top() + margins.bottom());
 
 	resize(tabwidget_size + buttons_size + margin_size + spacing_size);
+	setMaximumSize(size());
 }
 
 void pad_settings_dialog::SubscribeTooltip(QObject* object, const QString& tooltip)
 {
-	ensure(!!object);
 	m_descriptions[object] = tooltip;
 	object->installEventFilter(this);
 }
@@ -2108,43 +1734,14 @@ void pad_settings_dialog::SubscribeTooltips()
 	// Localized tooltips
 	const Tooltips tooltips;
 
-	SubscribeTooltip(ui->gb_orientation_reset, tooltips.gamepad_settings.orientation_reset);
-	SubscribeTooltip(ui->gb_analog_limiter, tooltips.gamepad_settings.analog_limiter);
 	SubscribeTooltip(ui->gb_pressure_intensity, tooltips.gamepad_settings.pressure_intensity);
-	SubscribeTooltip(ui->gb_pressure_intensity_deadzone, tooltips.gamepad_settings.pressure_deadzone);
 	SubscribeTooltip(ui->gb_squircle, tooltips.gamepad_settings.squircle_factor);
 	SubscribeTooltip(ui->gb_stick_multi, tooltips.gamepad_settings.stick_multiplier);
 	SubscribeTooltip(ui->gb_vibration, tooltips.gamepad_settings.vibration);
-	SubscribeTooltip(ui->gb_motion_controls, tooltips.gamepad_settings.motion_controls);
-	SubscribeTooltip(ui->gb_stick_deadzones, tooltips.gamepad_settings.stick_deadzones);
-	SubscribeTooltip(ui->gb_stick_anti_deadzones, tooltips.gamepad_settings.stick_deadzones);
+	SubscribeTooltip(ui->gb_sticks, tooltips.gamepad_settings.stick_deadzones);
 	SubscribeTooltip(ui->gb_stick_preview, tooltips.gamepad_settings.emulated_preview);
 	SubscribeTooltip(ui->gb_triggers, tooltips.gamepad_settings.trigger_deadzones);
 	SubscribeTooltip(ui->gb_stick_lerp, tooltips.gamepad_settings.stick_lerp);
 	SubscribeTooltip(ui->gb_mouse_accel, tooltips.gamepad_settings.mouse_acceleration);
 	SubscribeTooltip(ui->gb_mouse_dz, tooltips.gamepad_settings.mouse_deadzones);
-	SubscribeTooltip(ui->gb_mouse_movement, tooltips.gamepad_settings.mouse_movement);
-	
-	for (int i = button_ids::id_pad_begin + 1; i < button_ids::id_pad_end; i++)
-	{
-		SubscribeTooltip(m_pad_buttons->button(i), tooltips.gamepad_settings.button_assignment);
-	}
-}
-
-void pad_settings_dialog::start_input_thread()
-{
-	m_input_thread_state = input_thread_state::active;
-}
-
-void pad_settings_dialog::pause_input_thread()
-{
-	if (m_input_thread)
-	{
-		m_input_thread_state = input_thread_state::pausing;
-
-		while (m_input_thread_state != input_thread_state::paused)
-		{
-			std::this_thread::sleep_for(1ms);
-		}
-	}
 }
diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.h b/rpcs3/rpcs3qt/pad_settings_dialog.h
index 817373b4c1..14e8d41872 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.h
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.h
@@ -4,15 +4,9 @@
 #include <QDialog>
 #include <QLabel>
 #include <QTimer>
-#include <QComboBox>
 
-#include <mutex>
-
-#include "Emu/Io/PadHandler.h"
 #include "Emu/Io/pad_config.h"
 #include "Emu/GameInfo.h"
-#include "Utilities/Thread.h"
-#include "pad_device_info.h"
 
 class gui_settings;
 class PadHandlerBase;
@@ -22,6 +16,14 @@ namespace Ui
 	class pad_settings_dialog;
 }
 
+struct pad_device_info
+{
+	std::string name;
+	bool is_connected{false};
+};
+
+Q_DECLARE_METATYPE(pad_device_info)
+
 class pad_settings_dialog : public QDialog
 {
 	Q_OBJECT
@@ -65,8 +67,6 @@ class pad_settings_dialog : public QDialog
 		id_pad_rstick_up,
 
 		id_pressure_intensity, // Special button for pressure intensity
-		id_analog_limiter, // Special button for analog limiter
-		id_orientation_reset, // Special button for orientation reset
 
 		id_pad_end, // end
 
@@ -74,39 +74,41 @@ class pad_settings_dialog : public QDialog
 		id_reset_parameters,
 		id_blacklist,
 		id_refresh,
-		id_add_config_file
+		id_add_profile,
+		id_ok,
+		id_cancel
 	};
 
 	struct pad_button
 	{
 		cfg::string* cfg_text = nullptr;
-		std::string keys;
+		std::string key;
 		QString text;
-
-		void insert_key(const std::string& key, bool append_key);
 	};
 
 	const QString Disconnected_suffix = tr(" (disconnected)");
 
 public:
-	explicit pad_settings_dialog(std::shared_ptr<gui_settings> gui_settings, QWidget* parent = nullptr, const GameInfo* game = nullptr);
+	explicit pad_settings_dialog(std::shared_ptr<gui_settings> gui_settings, QWidget *parent = nullptr, const GameInfo *game = nullptr);
 	~pad_settings_dialog();
 
+public Q_SLOTS:
+	void apply_led_settings(int colorR, int colorG, int colorB, bool led_low_battery_blink, bool led_battery_indicator, int led_battery_indicator_brightness);
+
 private Q_SLOTS:
 	void OnPadButtonClicked(int id);
 	void OnTabChanged(int index);
 	void RefreshHandlers();
 	void ChangeHandler();
-	void ChangeConfig(const QString& config_file);
+	void ChangeProfile(const QString& profile);
 	void ChangeDevice(int index);
-	void HandleDeviceClassChange(u32 class_id) const;
-	void AddConfigFile();
+	void HandleDeviceClassChange(int index) const;
+	void AddProfile();
 	/** Update the current player config with the GUI values. */
 	void ApplyCurrentPlayerConfig(int new_player_id);
-	void RefreshPads();
 
 private:
-	std::unique_ptr<Ui::pad_settings_dialog> ui;
+	Ui::pad_settings_dialog *ui;
 	std::string m_title_id;
 	std::shared_ptr<gui_settings> m_gui_settings;
 
@@ -120,15 +122,11 @@ private:
 	bool m_enable_deadzones{ false };
 	bool m_enable_led{ false };
 	bool m_enable_battery{ false };
-	bool m_enable_battery_led{ false };
-	bool m_enable_motion{ false };
 	bool m_enable_pressure_intensity_button{ true };
-	bool m_enable_analog_limiter_button{ true };
-	bool m_enable_orientation_reset_button{ true };
 
 	// Button Mapping
 	QButtonGroup* m_pad_buttons = nullptr;
-	atomic_t<u32> m_button_id = button_ids::id_pad_begin;
+	u32 m_button_id = id_pad_begin;
 	std::map<int /*id*/, pad_button /*info*/> m_cfg_entries;
 	std::map<int /*id*/, std::string> m_duplicate_buttons;
 
@@ -139,69 +137,38 @@ private:
 	int m_ry = 0;
 
 	// Rumble
-	static constexpr u8 m_min_force = 0;
-	static constexpr u8 m_max_force = 255;
+	s32 m_min_force = 0;
+	s32 m_max_force = 0;
 
 	// Backup for standard button palette
 	QPalette m_palette;
 
 	// Pad Handlers
 	std::shared_ptr<PadHandlerBase> m_handler;
-	std::mutex m_handler_mutex;
 	std::string m_device_name;
-	std::string m_buddy_device_name;
-	std::string m_config_file;
+	std::string m_profile;
 	QTimer m_timer_pad_refresh;
 	int m_last_player_id = 0;
 
 	// Remap Timer
-	static constexpr int MAX_SECONDS = 5;
+	const int MAX_SECONDS = 5;
 	int m_seconds = MAX_SECONDS;
-	QTimer m_remap_timer;
-	bool m_enable_multi_binding = false;
+	QTimer m_timer;
 
 	// Mouse Move
 	QPoint m_last_pos;
 
-	// Input timer. Updates the GUI with input values
+	// Input timer. Its Callback handles the input
 	QTimer m_timer_input;
-	std::mutex m_input_mutex;
-	struct input_callback_data
-	{
-		PadHandlerBase::connection status = PadHandlerBase::connection::disconnected;
-		bool has_new_data = false;
-		std::string pad_name;
-		u32 battery_level = 0;
-		std::array<int, 6> preview_values{};
-
-		struct input_values
-		{
-			std::string button_name;
-			u32 button_id = button_ids::id_pad_begin;
-			u16 val = 0;
-		};
-		std::vector<input_values> values;
-	} m_input_callback_data;
-
-	// Input thread. Its Callback handles the input
-	std::unique_ptr<named_thread<std::function<void()>>> m_input_thread;
-	enum class input_thread_state { paused, pausing, active };
-	atomic_t<input_thread_state> m_input_thread_state{input_thread_state::paused};
-
-	void start_input_thread();
-	void pause_input_thread();
 
 	void SaveExit();
 	void CancelExit();
 
 	// Set vibrate data while keeping the current color
-	void SetPadData(u8 large_motor, u8 small_motor, bool led_battery_indicator = false);
+	void SetPadData(u32 large_motor, u32 small_motor, bool led_battery_indicator = false);
 
 	/** Update all the Button Labels with current button mapping */
 	void UpdateLabels(bool is_reset = false);
-
-	pad_device_info get_pad_info(QComboBox* combo, int index);
-	void switch_pad_info(int index, pad_device_info info, bool is_connected);
 	void SwitchPadInfo(const std::string& name, bool is_connected);
 
 	/** Enable/Disable Buttons while trying to remap an other */
@@ -214,10 +181,9 @@ private:
 	void ReloadButtons();
 
 	/** Repaints a stick deadzone preview label */
-	void RepaintPreviewLabel(QLabel* label, int deadzone, int anti_deadzone, int desired_width, int x, int y, int squircle, double multiplier) const;
+	void RepaintPreviewLabel(QLabel* l, int deadzone, int desired_width, int x, int y, int squircle, double multiplier) const;
 
 	QString GetLocalizedPadHandler(const QString& original, pad_handler handler);
-	QString GetLocalizedPadName(pad_handler handler, const QString& original, usz index);
 
 	/** Checks if the port at the given index is already reserved by the application as custom controller (ldd pad) */
 	bool GetIsLddPad(u32 index) const;
@@ -228,12 +194,6 @@ private:
 	/** Returns the current player config */
 	cfg_pad& GetPlayerConfig() const;
 
-	/** Sets the device name (member and config) */
-	void SetDeviceName(const std::string& name);
-
-	/** Gets the device name from config */
-	std::string GetDeviceName() const;
-
 	/** Resizes the dialog. We need to do this because the main scroll area can't determine the size on its own. */
 	void ResizeDialog();
 
@@ -244,13 +204,10 @@ private:
 	void SubscribeTooltips();
 
 protected:
-	void showEvent(QShowEvent* event) override;
-
 	/** Handle keyboard handler input */
 	void keyPressEvent(QKeyEvent *keyEvent) override;
 	void mouseReleaseEvent(QMouseEvent *event) override;
 	void mouseMoveEvent(QMouseEvent *event) override;
 	void wheelEvent(QWheelEvent *event) override;
 	bool eventFilter(QObject* object, QEvent* event) override;
-	void closeEvent(QCloseEvent* event) override;
 };
diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.ui b/rpcs3/rpcs3qt/pad_settings_dialog.ui
index 0ff621c6a2..18e6b4cfec 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.ui
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.ui
@@ -3,14 +3,14 @@
  <class>pad_settings_dialog</class>
  <widget class="QDialog" name="pad_settings_dialog">
   <property name="windowModality">
-   <enum>Qt::WindowModality::WindowModal</enum>
+   <enum>Qt::WindowModal</enum>
   </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1322</width>
-    <height>884</height>
+    <width>866</width>
+    <height>715</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -24,7 +24,7 @@
    <item>
     <widget class="QScrollArea" name="scrollArea">
      <property name="frameShape">
-      <enum>QFrame::Shape::NoFrame</enum>
+      <enum>QFrame::NoFrame</enum>
      </property>
      <property name="lineWidth">
       <number>0</number>
@@ -37,8 +37,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>1292</width>
-        <height>902</height>
+        <width>848</width>
+        <height>668</height>
        </rect>
       </property>
       <widget class="QWidget" name="tab">
@@ -59,7 +59,7 @@
          <number>5</number>
         </property>
         <item>
-         <layout class="QHBoxLayout" name="topLayout" stretch="1,1,0,1">
+         <layout class="QHBoxLayout" name="topLayout">
           <item>
            <widget class="QGroupBox" name="gb_handlers">
             <property name="title">
@@ -119,11 +119,11 @@
            </widget>
           </item>
           <item>
-           <widget class="QGroupBox" name="gb_motion_controls">
+           <widget class="QGroupBox" name="gb_profiles">
             <property name="title">
-             <string>Motion Controls</string>
+             <string>Profiles</string>
             </property>
-            <layout class="QHBoxLayout" name="gb_buddy_device_layout">
+            <layout class="QHBoxLayout" name="gb_profiles_layout">
              <property name="leftMargin">
               <number>5</number>
              </property>
@@ -137,40 +137,12 @@
               <number>5</number>
              </property>
              <item>
-              <widget class="QPushButton" name="b_motion_controls">
-               <property name="text">
-                <string>Configure</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <widget class="QGroupBox" name="gb_config_files">
-            <property name="title">
-             <string>Configuration Files</string>
-            </property>
-            <layout class="QHBoxLayout" name="gb_config_files_layout">
-             <property name="leftMargin">
-              <number>5</number>
-             </property>
-             <property name="topMargin">
-              <number>5</number>
-             </property>
-             <property name="rightMargin">
-              <number>5</number>
-             </property>
-             <property name="bottomMargin">
-              <number>5</number>
-             </property>
-             <item>
-              <widget class="QComboBox" name="chooseConfig"/>
+              <widget class="QComboBox" name="chooseProfile"/>
              </item>
              <item>
-              <widget class="QPushButton" name="b_addConfig">
+              <widget class="QPushButton" name="b_addProfile">
                <property name="text">
-                <string>Add Configuration</string>
+                <string>Add Profile</string>
                </property>
                <property name="autoDefault">
                 <bool>false</bool>
@@ -231,7 +203,7 @@
                   <item>
                    <spacer name="dpad_up_spacer_left">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -275,7 +247,7 @@
                   <item>
                    <spacer name="dpad_up_spacer_right">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -372,7 +344,7 @@
                   <item>
                    <spacer name="dpad_down_spacer_left">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -416,7 +388,7 @@
                   <item>
                    <spacer name="dpad_down_spacer_right">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -468,7 +440,7 @@
                   <item>
                    <spacer name="left_stick_up_spacer_left">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -512,7 +484,7 @@
                   <item>
                    <spacer name="left_stick_up_spacer_right">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -609,7 +581,7 @@
                   <item>
                    <spacer name="left_stick_down_spacer_left">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -653,7 +625,7 @@
                   <item>
                    <spacer name="left_stick_down_spacer_right">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -669,114 +641,12 @@
               </layout>
              </widget>
             </item>
-            <item>
-             <widget class="QGroupBox" name="gb_orientation_reset">
-              <property name="title">
-               <string>Orientation Reset</string>
-              </property>
-              <layout class="QHBoxLayout" name="orientation_reset_layout" stretch="2,1,1">
-               <property name="leftMargin">
-                <number>5</number>
-               </property>
-               <property name="topMargin">
-                <number>5</number>
-               </property>
-               <property name="rightMargin">
-                <number>5</number>
-               </property>
-               <property name="bottomMargin">
-                <number>5</number>
-               </property>
-               <item>
-                <widget class="QPushButton" name="b_orientation_reset">
-                 <property name="text">
-                  <string>-</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <spacer name="spacer_orientation_reset">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                 <property name="sizeType">
-                  <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="cb_orientation_toggle">
-                 <property name="text">
-                  <string>Orientation</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_analog_limiter">
-              <property name="title">
-               <string>Analog Limiter</string>
-              </property>
-              <layout class="QHBoxLayout" name="analog_limiter_layout" stretch="2,1,1">
-               <property name="leftMargin">
-                <number>5</number>
-               </property>
-               <property name="topMargin">
-                <number>5</number>
-               </property>
-               <property name="rightMargin">
-                <number>5</number>
-               </property>
-               <property name="bottomMargin">
-                <number>5</number>
-               </property>
-               <item>
-                <widget class="QPushButton" name="b_analog_limiter">
-                 <property name="text">
-                  <string>-</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <spacer name="spacer_analog_limiter">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                 <property name="sizeType">
-                  <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="cb_analog_limiter_toggle_mode">
-                 <property name="text">
-                  <string>Toggle</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
             <item>
              <widget class="QGroupBox" name="gb_pressure_intensity">
               <property name="title">
                <string>Pressure Sensitivity Mode</string>
               </property>
-              <layout class="QHBoxLayout" name="pressure_intensity_layout" stretch="2,1,1">
+              <layout class="QHBoxLayout" name="pressure_intensity_layout">
                <property name="leftMargin">
                 <number>5</number>
                </property>
@@ -809,41 +679,6 @@
                  </property>
                 </widget>
                </item>
-               <item>
-                <widget class="QCheckBox" name="cb_pressure_intensity_toggle_mode">
-                 <property name="text">
-                  <string>Toggle</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_pressure_intensity_deadzone">
-              <property name="title">
-               <string>Pressure Sensitivity Deadzone</string>
-              </property>
-              <layout class="QHBoxLayout" name="layout_gb_pressure_intensity_deadzone">
-               <property name="leftMargin">
-                <number>5</number>
-               </property>
-               <property name="topMargin">
-                <number>5</number>
-               </property>
-               <property name="rightMargin">
-                <number>5</number>
-               </property>
-               <property name="bottomMargin">
-                <number>5</number>
-               </property>
-               <item>
-                <widget class="QSlider" name="pressure_intensity_deadzone">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                </widget>
-               </item>
               </layout>
              </widget>
             </item>
@@ -898,14 +733,14 @@
                      <item>
                       <widget class="QSlider" name="slider_trigger_left">
                        <property name="orientation">
-                        <enum>Qt::Orientation::Horizontal</enum>
+                        <enum>Qt::Horizontal</enum>
                        </property>
                       </widget>
                      </item>
                      <item>
                       <widget class="QSlider" name="preview_trigger_left">
                        <property name="orientation">
-                        <enum>Qt::Orientation::Horizontal</enum>
+                        <enum>Qt::Horizontal</enum>
                        </property>
                       </widget>
                      </item>
@@ -916,14 +751,14 @@
                      <item>
                       <widget class="QSlider" name="slider_trigger_right">
                        <property name="orientation">
-                        <enum>Qt::Orientation::Horizontal</enum>
+                        <enum>Qt::Horizontal</enum>
                        </property>
                       </widget>
                      </item>
                      <item>
                       <widget class="QSlider" name="preview_trigger_right">
                        <property name="orientation">
-                        <enum>Qt::Orientation::Horizontal</enum>
+                        <enum>Qt::Horizontal</enum>
                        </property>
                       </widget>
                      </item>
@@ -937,7 +772,7 @@
                   <property name="title">
                    <string>Enable Vibration</string>
                   </property>
-                  <layout class="QHBoxLayout" name="gb_vibration_layout" stretch="1,1,1">
+                  <layout class="QHBoxLayout" name="gb_vibration_layout">
                    <property name="leftMargin">
                     <number>5</number>
                    </property>
@@ -951,22 +786,22 @@
                     <number>5</number>
                    </property>
                    <item>
-                    <widget class="QSpinBox" name="sb_vibration_large">
-                     <property name="suffix">
-                      <string>%</string>
+                    <widget class="QCheckBox" name="chb_vibration_large">
+                     <property name="text">
+                      <string>Large</string>
                      </property>
-                     <property name="prefix">
-                      <string>Large </string>
+                     <property name="checked">
+                      <bool>true</bool>
                      </property>
                     </widget>
                    </item>
                    <item>
-                    <widget class="QSpinBox" name="sb_vibration_small">
-                     <property name="suffix">
-                      <string>%</string>
+                    <widget class="QCheckBox" name="chb_vibration_small">
+                     <property name="text">
+                      <string>Small</string>
                      </property>
-                     <property name="prefix">
-                      <string>Small </string>
+                     <property name="checked">
+                      <bool>true</bool>
                      </property>
                     </widget>
                    </item>
@@ -980,10 +815,38 @@
                   </layout>
                  </widget>
                 </item>
+                <item>
+                 <widget class="QGroupBox" name="gb_stick_preview">
+                  <property name="title">
+                   <string>Stick Preview</string>
+                  </property>
+                  <layout class="QVBoxLayout" name="gb_stick_preview_layout">
+                   <property name="leftMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="topMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="rightMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="bottomMargin">
+                    <number>5</number>
+                   </property>
+                   <item>
+                    <widget class="QCheckBox" name="chb_show_emulated_values">
+                     <property name="text">
+                      <string>Show Emulated Values</string>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
                 <item>
                  <spacer name="pad_page_spacer">
                   <property name="orientation">
-                   <enum>Qt::Orientation::Vertical</enum>
+                   <enum>Qt::Vertical</enum>
                   </property>
                   <property name="sizeHint" stdset="0">
                    <size>
@@ -1044,10 +907,10 @@
                    <item>
                     <spacer name="mouse_accel_x_spacer">
                      <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
+                      <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeType">
-                      <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+                      <enum>QSizePolicy::MinimumExpanding</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
@@ -1074,10 +937,10 @@
                    <item>
                     <spacer name="mouse_accel_y_spacer">
                      <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
+                      <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeType">
-                      <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+                      <enum>QSizePolicy::MinimumExpanding</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
@@ -1121,10 +984,10 @@
                    <item>
                     <spacer name="mouse_dz_x_spacer">
                      <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
+                      <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeType">
-                      <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+                      <enum>QSizePolicy::MinimumExpanding</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
@@ -1147,10 +1010,10 @@
                    <item>
                     <spacer name="mouse_dz_y_spacer">
                      <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
+                      <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeType">
-                      <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+                      <enum>QSizePolicy::MinimumExpanding</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
@@ -1163,37 +1026,13 @@
                   </layout>
                  </widget>
                 </item>
-                <item>
-                 <widget class="QGroupBox" name="gb_mouse_movement">
-                  <property name="title">
-                   <string>Mouse Movement Mode</string>
-                  </property>
-                  <layout class="QVBoxLayout" name="gb_mouse_movement_layout">
-                   <property name="leftMargin">
-                    <number>5</number>
-                   </property>
-                   <property name="topMargin">
-                    <number>5</number>
-                   </property>
-                   <property name="rightMargin">
-                    <number>5</number>
-                   </property>
-                   <property name="bottomMargin">
-                    <number>5</number>
-                   </property>
-                   <item>
-                    <widget class="QComboBox" name="mouse_movement"/>
-                   </item>
-                  </layout>
-                 </widget>
-                </item>
                 <item>
                  <spacer name="mouse_page_spacer">
                   <property name="orientation">
-                   <enum>Qt::Orientation::Vertical</enum>
+                   <enum>Qt::Vertical</enum>
                   </property>
                   <property name="sizeType">
-                   <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+                   <enum>QSizePolicy::MinimumExpanding</enum>
                   </property>
                   <property name="sizeHint" stdset="0">
                    <size>
@@ -1210,10 +1049,10 @@
             <item>
              <spacer name="verticalSpacer_left">
               <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
+               <enum>Qt::Vertical</enum>
               </property>
               <property name="sizeType">
-               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+               <enum>QSizePolicy::MinimumExpanding</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -1311,7 +1150,7 @@
                   <item>
                    <spacer name="spacer_select_start_left">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -1386,7 +1225,7 @@
                   <item>
                    <spacer name="spacer_select_start_right">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -1419,7 +1258,7 @@
                    <item>
                     <spacer name="spacer_ps_button_left">
                      <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
+                      <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
@@ -1463,7 +1302,7 @@
                    <item>
                     <spacer name="spacer_ps_button_right">
                      <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
+                      <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
@@ -1575,14 +1414,20 @@
                    <height>256</height>
                   </size>
                  </property>
+                 <property name="text">
+                  <string/>
+                 </property>
+                 <property name="textFormat">
+                  <enum>Qt::AutoText</enum>
+                 </property>
                  <property name="pixmap">
-                  <pixmap resource="../resources.qrc">:/Icons/DualShock_3.svg</pixmap>
+                  <pixmap resource="../resources.qrc">:/Icons/controller.png</pixmap>
                  </property>
                  <property name="scaledContents">
                   <bool>true</bool>
                  </property>
                  <property name="alignment">
-                  <set>Qt::AlignmentFlag::AlignBottom|Qt::AlignmentFlag::AlignHCenter</set>
+                  <set>Qt::AlignBottom|Qt::AlignHCenter</set>
                  </property>
                 </widget>
                </item>
@@ -1597,7 +1442,7 @@
               <item>
                <spacer name="spacer_middle_bottom_left">
                 <property name="orientation">
-                 <enum>Qt::Orientation::Horizontal</enum>
+                 <enum>Qt::Horizontal</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
@@ -1672,7 +1517,7 @@
               <item>
                <spacer name="spacer_middle_bottom_right">
                 <property name="orientation">
-                 <enum>Qt::Orientation::Horizontal</enum>
+                 <enum>Qt::Horizontal</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
@@ -1777,10 +1622,10 @@
             <item>
              <spacer name="verticalSpacer_middle">
               <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
+               <enum>Qt::Vertical</enum>
               </property>
               <property name="sizeType">
-               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+               <enum>QSizePolicy::MinimumExpanding</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -1802,10 +1647,10 @@
                   <string notr="true">This text should be replaced by an actual description.&lt;br/&gt;&lt;br/&gt;</string>
                  </property>
                  <property name="textFormat">
-                  <enum>Qt::TextFormat::RichText</enum>
+                  <enum>Qt::RichText</enum>
                  </property>
                  <property name="alignment">
-                  <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+                  <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
                  </property>
                  <property name="wordWrap">
                   <bool>true</bool>
@@ -1861,7 +1706,7 @@
                   <item>
                    <spacer name="spacer_triangle_left">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -1905,7 +1750,7 @@
                   <item>
                    <spacer name="spacer_triangle_right">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -2002,7 +1847,7 @@
                   <item>
                    <spacer name="spacer_cross_left">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -2046,7 +1891,7 @@
                   <item>
                    <spacer name="spacer_cross_right">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -2098,7 +1943,7 @@
                   <item>
                    <spacer name="spacer_right_stick_up_left">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -2142,7 +1987,7 @@
                   <item>
                    <spacer name="spacer_right_stick_up_right">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -2239,7 +2084,7 @@
                   <item>
                    <spacer name="spacer_right_stick_down_left">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -2283,7 +2128,7 @@
                   <item>
                    <spacer name="spacer_right_stick_down_right">
                     <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
+                     <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeHint" stdset="0">
                      <size>
@@ -2299,166 +2144,10 @@
               </layout>
              </widget>
             </item>
-            <item>
-             <widget class="QGroupBox" name="gb_squircle">
-              <property name="title">
-               <string>Squircle Values</string>
-              </property>
-              <layout class="QHBoxLayout" name="layout_squircle">
-               <property name="leftMargin">
-                <number>5</number>
-               </property>
-               <property name="topMargin">
-                <number>5</number>
-               </property>
-               <property name="rightMargin">
-                <number>5</number>
-               </property>
-               <property name="bottomMargin">
-                <number>5</number>
-               </property>
-               <item>
-                <widget class="QLabel" name="label_squircle_left">
-                 <property name="text">
-                  <string>Left</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QSpinBox" name="squircle_left">
-                 <property name="maximum">
-                  <number>1000000</number>
-                 </property>
-                 <property name="singleStep">
-                  <number>1000</number>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <spacer name="spacer_squircle_left">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item>
-                <widget class="QLabel" name="label_squircle_right">
-                 <property name="text">
-                  <string>Right</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QSpinBox" name="squircle_right">
-                 <property name="maximum">
-                  <number>1000000</number>
-                 </property>
-                 <property name="singleStep">
-                  <number>1000</number>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <spacer name="spacer_squircle_right">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_stick_multi">
-              <property name="title">
-               <string>Stick Multipliers</string>
-              </property>
-              <layout class="QHBoxLayout" name="gb_stick_multi_layout">
-               <property name="leftMargin">
-                <number>5</number>
-               </property>
-               <property name="topMargin">
-                <number>5</number>
-               </property>
-               <property name="rightMargin">
-                <number>5</number>
-               </property>
-               <property name="bottomMargin">
-                <number>5</number>
-               </property>
-               <item>
-                <widget class="QLabel" name="label_stick_multi_left">
-                 <property name="text">
-                  <string>Left</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QDoubleSpinBox" name="stick_multi_left">
-                 <property name="singleStep">
-                  <double>0.100000000000000</double>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <spacer name="spacer_stick_multi_left">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item>
-                <widget class="QLabel" name="label_stick_multi_right">
-                 <property name="text">
-                  <string>Right</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QDoubleSpinBox" name="stick_multi_right">
-                 <property name="singleStep">
-                  <double>0.100000000000000</double>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <spacer name="spacer_stick_multi_right">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-              </layout>
-             </widget>
-            </item>
             <item>
              <widget class="QStackedWidget" name="right_stack">
               <property name="currentIndex">
-               <number>1</number>
+               <number>0</number>
               </property>
               <widget class="QWidget" name="stick_page">
                <layout class="QVBoxLayout" name="stick_page_layout">
@@ -2475,11 +2164,164 @@
                  <number>0</number>
                 </property>
                 <item>
-                 <widget class="QGroupBox" name="gb_stick_deadzones">
+                 <widget class="QGroupBox" name="gb_stick_multi">
+                  <property name="title">
+                   <string>Stick Multipliers</string>
+                  </property>
+                  <layout class="QHBoxLayout" name="gb_stick_multi_layout">
+                   <property name="leftMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="topMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="rightMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="bottomMargin">
+                    <number>5</number>
+                   </property>
+                   <item>
+                    <widget class="QLabel" name="label_stick_multi_left">
+                     <property name="text">
+                      <string>Left</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QDoubleSpinBox" name="stick_multi_left">
+                     <property name="singleStep">
+                      <double>0.100000000000000</double>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <spacer name="spacer_stick_multi_left">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>0</width>
+                       <height>0</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                   <item>
+                    <widget class="QLabel" name="label_stick_multi_right">
+                     <property name="text">
+                      <string>Right</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QDoubleSpinBox" name="stick_multi_right">
+                     <property name="singleStep">
+                      <double>0.100000000000000</double>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <spacer name="spacer_stick_multi_right">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>0</width>
+                       <height>0</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QGroupBox" name="gb_squircle">
+                  <property name="title">
+                   <string>Squircle Values</string>
+                  </property>
+                  <layout class="QHBoxLayout" name="layout_squircle">
+                   <property name="leftMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="topMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="rightMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="bottomMargin">
+                    <number>5</number>
+                   </property>
+                   <item>
+                    <widget class="QLabel" name="label_squircle_left">
+                     <property name="text">
+                      <string>Left</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QSpinBox" name="squircle_left">
+                     <property name="maximum">
+                      <number>1000000</number>
+                     </property>
+                     <property name="singleStep">
+                      <number>1000</number>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <spacer name="spacer_squircle_left">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>0</width>
+                       <height>0</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                   <item>
+                    <widget class="QLabel" name="label_squircle_right">
+                     <property name="text">
+                      <string>Right</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QSpinBox" name="squircle_right">
+                     <property name="maximum">
+                      <number>1000000</number>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <spacer name="spacer_squircle_right">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>0</width>
+                       <height>0</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QGroupBox" name="gb_sticks">
                   <property name="title">
                    <string>Analog Stick Deadzones</string>
                   </property>
-                  <layout class="QHBoxLayout" name="gb_stick_deadzones_layout">
+                  <layout class="QHBoxLayout" name="gb_sticks_layout">
                    <property name="leftMargin">
                     <number>5</number>
                    </property>
@@ -2493,103 +2335,29 @@
                     <number>5</number>
                    </property>
                    <item>
-                    <widget class="QSlider" name="slider_stick_left">
-                     <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QSlider" name="slider_stick_right">
-                     <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QGroupBox" name="gb_stick_anti_deadzones">
-                  <property name="title">
-                   <string>Analog Stick Anti-Deadzones</string>
-                  </property>
-                  <layout class="QHBoxLayout" name="gb_stick_anti_deadzones_layout">
-                   <property name="leftMargin">
-                    <number>5</number>
-                   </property>
-                   <property name="topMargin">
-                    <number>5</number>
-                   </property>
-                   <property name="rightMargin">
-                    <number>5</number>
-                   </property>
-                   <property name="bottomMargin">
-                    <number>5</number>
-                   </property>
-                   <item>
-                    <widget class="QSlider" name="anti_deadzone_slider_stick_left">
-                     <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QSlider" name="anti_deadzone_slider_stick_right">
-                     <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QGroupBox" name="gb_stick_preview">
-                  <property name="title">
-                   <string>Stick Preview</string>
-                  </property>
-                  <layout class="QVBoxLayout" name="gb_stick_preview_layout">
-                   <property name="leftMargin">
-                    <number>5</number>
-                   </property>
-                   <property name="topMargin">
-                    <number>5</number>
-                   </property>
-                   <property name="rightMargin">
-                    <number>5</number>
-                   </property>
-                   <property name="bottomMargin">
-                    <number>5</number>
-                   </property>
-                   <item>
-                    <widget class="QCheckBox" name="chb_show_emulated_values">
-                     <property name="text">
-                      <string>Show Emulated Values</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <layout class="QHBoxLayout" name="gb_stick_previews_layout">
-                     <property name="leftMargin">
-                      <number>5</number>
-                     </property>
-                     <property name="topMargin">
-                      <number>5</number>
-                     </property>
-                     <property name="rightMargin">
-                      <number>5</number>
-                     </property>
-                     <property name="bottomMargin">
-                      <number>5</number>
-                     </property>
+                    <layout class="QVBoxLayout" name="gb_stick_left">
+                     <item>
+                      <widget class="QSlider" name="slider_stick_left">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                      </widget>
+                     </item>
                      <item>
                       <widget class="QLabel" name="preview_stick_left">
                        <property name="text">
                         <string/>
                        </property>
-                       <property name="alignment">
-                        <set>Qt::AlignmentFlag::AlignCenter</set>
+                      </widget>
+                     </item>
+                    </layout>
+                   </item>
+                   <item>
+                    <layout class="QVBoxLayout" name="gb_stick_right">
+                     <item>
+                      <widget class="QSlider" name="slider_stick_right">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
                        </property>
                       </widget>
                      </item>
@@ -2598,9 +2366,6 @@
                        <property name="text">
                         <string/>
                        </property>
-                       <property name="alignment">
-                        <set>Qt::AlignmentFlag::AlignCenter</set>
-                       </property>
                       </widget>
                      </item>
                     </layout>
@@ -2610,8 +2375,8 @@
                 </item>
                </layout>
               </widget>
-              <widget class="QWidget" name="keyboard_page">
-               <layout class="QVBoxLayout" name="keyboard_page_layout">
+              <widget class="QWidget" name="smooth_page">
+               <layout class="QVBoxLayout" name="smooth_page_layout">
                 <property name="leftMargin">
                  <number>0</number>
                 </property>
@@ -2659,10 +2424,10 @@
                    <item>
                     <spacer name="horizontalSpacer_27">
                      <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
+                      <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeType">
-                      <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+                      <enum>QSizePolicy::MinimumExpanding</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
@@ -2689,10 +2454,10 @@
                    <item>
                     <spacer name="horizontalSpacer_28">
                      <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
+                      <enum>Qt::Horizontal</enum>
                      </property>
                      <property name="sizeType">
-                      <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+                      <enum>QSizePolicy::MinimumExpanding</enum>
                      </property>
                      <property name="sizeHint" stdset="0">
                       <size>
@@ -2706,12 +2471,12 @@
                  </widget>
                 </item>
                 <item>
-                 <spacer name="keyboard_page_spacer">
+                 <spacer name="smooth_page_spacer">
                   <property name="orientation">
-                   <enum>Qt::Orientation::Vertical</enum>
+                   <enum>Qt::Vertical</enum>
                   </property>
                   <property name="sizeType">
-                   <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+                   <enum>QSizePolicy::MinimumExpanding</enum>
                   </property>
                   <property name="sizeHint" stdset="0">
                    <size>
@@ -2728,10 +2493,10 @@
             <item>
              <spacer name="verticalSpacer_right">
               <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
+               <enum>Qt::Vertical</enum>
               </property>
               <property name="sizeType">
-               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+               <enum>QSizePolicy::MinimumExpanding</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -2753,7 +2518,7 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Reset|QDialogButtonBox::StandardButton::RestoreDefaults|QDialogButtonBox::StandardButton::Save</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Reset|QDialogButtonBox::RestoreDefaults|QDialogButtonBox::Save</set>
      </property>
      <property name="centerButtons">
       <bool>false</bool>
diff --git a/rpcs3/rpcs3qt/patch_creator_dialog.cpp b/rpcs3/rpcs3qt/patch_creator_dialog.cpp
deleted file mode 100644
index b94fd65421..0000000000
--- a/rpcs3/rpcs3qt/patch_creator_dialog.cpp
+++ /dev/null
@@ -1,599 +0,0 @@
-#include "ui_patch_creator_dialog.h"
-#include "patch_creator_dialog.h"
-#include "table_item_delegate.h"
-#include "qt_utils.h"
-#include "Utilities/Config.h"
-
-#include <QCompleter>
-#include <QFontDatabase>
-#include <QMenu>
-#include <QMessageBox>
-#include <QFileDialog>
-#include <QMenuBar>
-#include <QStringBuilder>
-
-#include <regex>
-
-LOG_CHANNEL(patch_log, "PAT");
-
-Q_DECLARE_METATYPE(patch_type)
-
-enum patch_column : int
-{
-	type = 0,
-	offset,
-	value,
-	comment
-};
-
-patch_creator_dialog::patch_creator_dialog(QWidget* parent)
-	: QDialog(parent)
-	, ui(new Ui::patch_creator_dialog)
-	, mMonoFont(QFontDatabase::systemFont(QFontDatabase::FixedFont))
-	, mValidColor(gui::utils::get_label_color("log_level_success", Qt::darkGreen, Qt::green))
-	, mInvalidColor(gui::utils::get_label_color("log_level_error", Qt::red, Qt::red))
-	, m_offset_validator(new QRegularExpressionValidator(QRegularExpression("^(0[xX])?[a-fA-F0-9]{0,8}$"), this))
-{
-	ui->setupUi(this);
-	ui->patchEdit->setFont(mMonoFont);
-	ui->patchEdit->setAcceptRichText(true);
-	ui->addPatchOffsetEdit->setFont(mMonoFont);
-	ui->addPatchOffsetEdit->setClearButtonEnabled(true);
-	ui->addPatchValueEdit->setFont(mMonoFont);
-	ui->addPatchValueEdit->setClearButtonEnabled(true);
-	ui->addPatchCommentEdit->setClearButtonEnabled(true);
-	ui->instructionTable->setFont(mMonoFont);
-	ui->instructionTable->setItemDelegate(new table_item_delegate(this, false));
-	ui->instructionTable->verticalHeader()->setSectionResizeMode(QHeaderView::ResizeMode::Fixed);
-	ui->instructionTable->installEventFilter(this);
-	ui->versionMinorSpinBox->setValue(0);
-	ui->versionMajorSpinBox->setValue(0);
-
-	QMenuBar* menu_bar = new QMenuBar(this);
-	QMenu* file_menu = menu_bar->addMenu(tr("File"));
-	QAction* export_act = file_menu->addAction(tr("&Export Patch"));
-	export_act->setShortcut(QKeySequence("Ctrl+E"));
-	export_act->installEventFilter(this);
-	layout()->setMenuBar(menu_bar);
-
-	connect(export_act, &QAction::triggered, this, &patch_creator_dialog::export_patch);
-	connect(ui->hashEdit, &QLineEdit::textChanged, this, &patch_creator_dialog::generate_yml);
-	connect(ui->authorEdit, &QLineEdit::textChanged, this, &patch_creator_dialog::generate_yml);
-	connect(ui->patchNameEdit, &QLineEdit::textChanged, this, &patch_creator_dialog::generate_yml);
-	connect(ui->gameEdit, &QLineEdit::textChanged, this, &patch_creator_dialog::generate_yml);
-	connect(ui->gameVersionEdit, &QLineEdit::textChanged, this, &patch_creator_dialog::generate_yml);
-	connect(ui->serialEdit, &QLineEdit::textChanged, this, &patch_creator_dialog::generate_yml);
-	connect(ui->notesEdit, &QLineEdit::textChanged, this, &patch_creator_dialog::generate_yml);
-	connect(ui->groupEdit, &QLineEdit::textChanged, this, &patch_creator_dialog::generate_yml);
-	connect(ui->versionMinorSpinBox, &QSpinBox::textChanged, this, &patch_creator_dialog::generate_yml);
-	connect(ui->versionMajorSpinBox, &QSpinBox::textChanged, this, &patch_creator_dialog::generate_yml);
-	connect(ui->instructionTable, &QTableWidget::itemChanged, this, [this](QTableWidgetItem*){ generate_yml(); });
-	connect(ui->instructionTable, &QTableWidget::customContextMenuRequested, this, &patch_creator_dialog::show_table_menu);
-	connect(ui->addPatchButton, &QAbstractButton::clicked, this, [this]() { add_instruction(ui->instructionTable->rowCount()); });
-
-	init_patch_type_bombo_box(ui->addPatchTypeComboBox, patch_type::be32, false);
-	connect(ui->addPatchTypeComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index){ update_validator(index, ui->addPatchTypeComboBox, ui->addPatchOffsetEdit); });
-	update_validator(ui->addPatchTypeComboBox->currentIndex(), ui->addPatchTypeComboBox, ui->addPatchOffsetEdit);
-
-	generate_yml();
-}
-
-patch_creator_dialog::~patch_creator_dialog()
-{
-}
-
-void patch_creator_dialog::init_patch_type_bombo_box(QComboBox* combo_box, patch_type set_type, bool searchable)
-{
-	if (!combo_box) return;
-
-	combo_box->clear();
-
-	QStringList types;
-
-	for (const std::string& type : cfg::try_to_enum_list(&fmt_class_string<patch_type>::format))
-	{
-		if (const patch_type t = patch_engine::get_patch_type(type); t != patch_type::invalid)
-		{
-			types << QString::fromStdString(type);
-
-			combo_box->addItem(types.last(), QVariant::fromValue<patch_type>(t));
-
-			if (t == set_type)
-			{
-				combo_box->setCurrentText(types.last());
-			}
-		}
-	}
-
-	if (searchable)
-	{
-		QCompleter* completer = new QCompleter(types, combo_box);
-		completer->setCaseSensitivity(Qt::CaseInsensitive);
-		completer->setCompletionMode(QCompleter::PopupCompletion);
-		completer->setFilterMode(Qt::MatchContains);
-
-		combo_box->setCompleter(completer);
-		combo_box->setEditable(true);
-		combo_box->setInsertPolicy(QComboBox::NoInsert);
-	}
-}
-
-QComboBox* patch_creator_dialog::create_patch_type_bombo_box(patch_type set_type) const
-{
-	QComboBox* combo_box = new QComboBox;
-	init_patch_type_bombo_box(combo_box, set_type, true);
-	connect(combo_box, &QComboBox::currentTextChanged, this, &patch_creator_dialog::generate_yml);
-	return combo_box;
-}
-
-void patch_creator_dialog::show_table_menu(const QPoint& pos)
-{
-	QMenu menu;
-
-	QModelIndexList selection = ui->instructionTable->selectionModel()->selectedRows();
-
-	if (selection.isEmpty())
-	{
-		QAction* act_add_instruction = menu.addAction(tr("&Add Instruction"));
-		connect(act_add_instruction, &QAction::triggered, [this]()
-		{
-			add_instruction(ui->instructionTable->rowCount());
-		});
-	}
-	else
-	{
-		if (selection.count() == 1)
-		{
-			QAction* act_add_instruction_above = menu.addAction(tr("&Add Instruction Above"));
-			connect(act_add_instruction_above, &QAction::triggered, [this, row = selection.first().row()]()
-			{
-				add_instruction(row);
-			});
-
-			QAction* act_add_instruction_below = menu.addAction(tr("&Add Instruction Below"));
-			connect(act_add_instruction_below, &QAction::triggered, [this, row = selection.first().row()]()
-			{
-				add_instruction(row + 1);
-			});
-		}
-
-		const bool can_move_up = can_move_instructions(selection, move_direction::up);
-		const bool can_move_down = can_move_instructions(selection, move_direction::down);
-
-		if (can_move_up)
-		{
-			menu.addSeparator();
-
-			QAction* act_move_instruction_up = menu.addAction(tr("&Move Instruction(s) Up"));
-			connect(act_move_instruction_up, &QAction::triggered, [this, &selection]()
-			{
-				move_instructions(selection.first().row(), selection.count(), 1, move_direction::up);
-			});
-		}
-
-		if (can_move_down)
-		{
-			if (!can_move_up)
-				menu.addSeparator();
-
-			QAction* act_move_instruction_down = menu.addAction(tr("&Move Instruction(s) Down"));
-			connect(act_move_instruction_down, &QAction::triggered, [this, &selection]()
-			{
-				move_instructions(selection.first().row(), selection.count(), 1, move_direction::down);
-			});
-		}
-
-		menu.addSeparator();
-
-		QAction* act_remove_instruction = menu.addAction(tr("&Remove Instruction(s)"));
-		connect(act_remove_instruction, &QAction::triggered, [this]()
-		{
-			remove_instructions();
-		});
-	}
-
-	menu.addSeparator();
-
-	QAction* act_clear_table = menu.addAction(tr("&Clear Table"));
-	connect(act_clear_table, &QAction::triggered, [this]()
-	{
-		patch_log.notice("Patch Creator: Clearing instruction table...");
-		ui->instructionTable->clearContents();
-		ui->instructionTable->setRowCount(0);
-		generate_yml();
-	});
-
-	menu.exec(ui->instructionTable->viewport()->mapToGlobal(pos));
-}
-
-void patch_creator_dialog::update_validator(int index, QComboBox* combo_box, QLineEdit* line_edit) const
-{
-	if (index < 0 || !combo_box || !line_edit || !combo_box->itemData(index).canConvert<patch_type>())
-	{
-		return;
-	}
-
-	switch (combo_box->itemData(index).value<patch_type>())
-	{
-	case patch_type::move_file:
-	case patch_type::hide_file:
-		line_edit->setValidator(nullptr);
-		break;
-	default:
-		line_edit->setValidator(m_offset_validator);
-		break;
-	}
-}
-
-void patch_creator_dialog::add_instruction(int row)
-{
-	const QString type    = ui->addPatchTypeComboBox->currentText();
-	const QString offset  = ui->addPatchOffsetEdit->text();
-	const QString value   = ui->addPatchValueEdit->text();
-	const QString comment = ui->addPatchCommentEdit->text();
-
-	const patch_type t = patch_engine::get_patch_type(type.toStdString());
-
-	switch (t)
-	{
-	case patch_type::move_file:
-	case patch_type::hide_file:
-		break;
-	default:
-	{
-		int pos = 0;
-		QString text_to_validate = offset;
-		if (m_offset_validator->validate(text_to_validate, pos) == QValidator::Invalid)
-		{
-			QMessageBox::information(this, tr("Offset invalid!"), tr("The patch offset is invalid.\nThe offset has to be a hexadecimal number with 8 digits at most."));
-			return;
-		}
-		break;
-	}
-	}
-
-	QComboBox* combo_box = create_patch_type_bombo_box(t);
-
-	ui->instructionTable->insertRow(std::max(0, std::min(row, ui->instructionTable->rowCount())));
-	ui->instructionTable->setCellWidget(row, patch_column::type, combo_box);
-	ui->instructionTable->setItem(row, patch_column::offset, new QTableWidgetItem(offset));
-	ui->instructionTable->setItem(row, patch_column::value, new QTableWidgetItem(value));
-	ui->instructionTable->setItem(row, patch_column::comment, new QTableWidgetItem(comment));
-
-	patch_log.notice("Patch Creator: Inserted instruction [ %s, %s, %s ] at row %d", combo_box->currentText(), offset, value, row);
-	generate_yml();
-}
-
-void patch_creator_dialog::remove_instructions()
-{
-	QModelIndexList selection(ui->instructionTable->selectionModel()->selectedRows());
-	if (selection.empty())
-		return;
-
-	std::sort(selection.rbegin(), selection.rend());
-	for (const QModelIndex& index : selection)
-	{
-		patch_log.notice("Patch Creator: Removing instruction in row %d...", index.row());
-		ui->instructionTable->removeRow(index.row());
-	}
-
-	generate_yml();
-}
-
-void patch_creator_dialog::move_instructions(int src_row, int rows_to_move, int distance, move_direction dir)
-{
-	patch_log.notice("Patch Creator: Moving %d instruction(s) from row %d %s by %d...", rows_to_move, src_row, dir == move_direction::up ? "up" : "down", distance);
-
-	if (src_row < 0 || src_row >= ui->instructionTable->rowCount() || distance < 1)
-		return;
-
-	rows_to_move = std::max(0, std::min(rows_to_move, ui->instructionTable->rowCount() - src_row));
-	if (rows_to_move < 1)
-		return;
-
-	const int dst_row = std::max(0, std::min(ui->instructionTable->rowCount() - rows_to_move, dir == move_direction::up ? src_row - distance : src_row + distance));
-	if (dir == move_direction::up ? dst_row >= src_row : dst_row <= src_row)
-		return;
-
-	const int friends_to_relocate = std::abs(dst_row - src_row);
-	const int friends_src_row = dir == move_direction::up ? dst_row : src_row + rows_to_move;
-	const int friends_dst_row = dir == move_direction::up ? dst_row + rows_to_move : src_row;
-
-	std::vector<patch_type> moving_types(rows_to_move);
-	std::vector<std::vector<QTableWidgetItem*>> moving_rows(rows_to_move);
-
-	std::vector<patch_type> friend_types(friends_to_relocate);
-	std::vector<std::vector<QTableWidgetItem*>> friend_rows(friends_to_relocate);
-
-	const auto get_row_type = [this](int i) -> patch_type
-	{
-		if (const QComboBox* type_item = qobject_cast<QComboBox*>(ui->instructionTable->cellWidget(i, patch_column::type)))
-			return type_item->currentData().value<patch_type>();
-		return patch_type::invalid;
-	};
-
-	for (int i = 0; i < rows_to_move; i++)
-	{
-		moving_types[i] = get_row_type(src_row + i);
-		moving_rows[i].push_back(ui->instructionTable->takeItem(src_row + i, patch_column::type));
-		moving_rows[i].push_back(ui->instructionTable->takeItem(src_row + i, patch_column::offset));
-		moving_rows[i].push_back(ui->instructionTable->takeItem(src_row + i, patch_column::value));
-		moving_rows[i].push_back(ui->instructionTable->takeItem(src_row + i, patch_column::comment));
-	}
-
-	for (int i = 0; i < friends_to_relocate; i++)
-	{
-		friend_types[i] = get_row_type(friends_src_row + i);
-		friend_rows[i].push_back(ui->instructionTable->takeItem(friends_src_row + i, patch_column::type));
-		friend_rows[i].push_back(ui->instructionTable->takeItem(friends_src_row + i, patch_column::offset));
-		friend_rows[i].push_back(ui->instructionTable->takeItem(friends_src_row + i, patch_column::value));
-		friend_rows[i].push_back(ui->instructionTable->takeItem(friends_src_row + i, patch_column::comment));
-	}
-
-	for (int i = 0; i < rows_to_move; i++)
-	{
-		int item_index = 0;
-		ui->instructionTable->setCellWidget(dst_row + i, patch_column::type, create_patch_type_bombo_box(moving_types[i]));
-		ui->instructionTable->setItem(dst_row + i, patch_column::type, moving_rows[i][item_index++]);
-		ui->instructionTable->setItem(dst_row + i, patch_column::offset, moving_rows[i][item_index++]);
-		ui->instructionTable->setItem(dst_row + i, patch_column::value, moving_rows[i][item_index++]);
-		ui->instructionTable->setItem(dst_row + i, patch_column::comment, moving_rows[i][item_index++]);
-	}
-
-	for (int i = 0; i < friends_to_relocate; i++)
-	{
-		int item_index = 0;
-		ui->instructionTable->setCellWidget(friends_dst_row + i, patch_column::type, create_patch_type_bombo_box(friend_types[i]));
-		ui->instructionTable->setItem(friends_dst_row + i, patch_column::type, friend_rows[i][item_index++]);
-		ui->instructionTable->setItem(friends_dst_row + i, patch_column::offset, friend_rows[i][item_index++]);
-		ui->instructionTable->setItem(friends_dst_row + i, patch_column::value, friend_rows[i][item_index++]);
-		ui->instructionTable->setItem(friends_dst_row + i, patch_column::comment, friend_rows[i][item_index++]);
-	}
-
-	ui->instructionTable->clearSelection();
-	ui->instructionTable->setRangeSelected(QTableWidgetSelectionRange(dst_row, 0, dst_row + rows_to_move - 1, ui->instructionTable->columnCount() - 1), true);
-
-	generate_yml();
-}
-
-bool patch_creator_dialog::can_move_instructions(QModelIndexList& selection, move_direction dir)
-{
-	if (selection.isEmpty())
-		return false;
-
-	std::sort(selection.begin(), selection.end());
-
-	// Check if there are any gaps in the selection
-	for (int i = 1, row = selection.first().row(); i < selection.count(); i++)
-	{
-		if (++row != selection[i].row())
-			return false;
-	}
-
-	if (dir == move_direction::up)
-		return selection.first().row() > 0;
-
-	return selection.last().row() < ui->instructionTable->rowCount() - 1;
-}
-
-void patch_creator_dialog::validate(const QString& patch)
-{
-	patch_engine::patch_map patches;
-	const std::string content = patch.toStdString();
-	std::stringstream messages;
-	const bool is_valid = patch_engine::load(patches, "From Patch Creator", content, true, &messages);
-
-	if (is_valid != m_valid)
-	{
-		QPalette palette = ui->validLabel->palette();
-
-		if (is_valid)
-		{
-			ui->validLabel->setText(tr("Valid Patch"));
-			palette.setColor(ui->validLabel->foregroundRole(), mValidColor);
-			patch_log.success("Patch Creator: Validation successful!");
-		}
-		else
-		{
-			ui->validLabel->setText(tr("Validation Failed"));
-			palette.setColor(ui->validLabel->foregroundRole(), mInvalidColor);
-			patch_log.error("Patch Creator: Validation failed!");
-		}
-
-		ui->validLabel->setPalette(palette);
-		m_valid = is_valid;
-	}
-
-	if (is_valid)
-	{
-		ui->patchEdit->setText(patch);
-		return;
-	}
-
-	// Search for erronous yml node locations in log message
-	static const std::regex r("(line )(\\d+)(, column )(\\d+)");
-	std::smatch sm;
-	std::set<int> faulty_lines;
-
-	for (std::string err = messages.str(); !err.empty() && std::regex_search(err, sm, r) && sm.size() == 5; err = sm.suffix())
-	{
-		if (s64 row{}; try_to_int64(&row, sm[2].str(), 0, u32{umax}))
-		{
-			faulty_lines.insert(row);
-		}
-	}
-
-	// Create html and colorize offending lines
-	const QString font_start_tag = QStringLiteral("<font color = \"") % mInvalidColor.name() % QStringLiteral("\">");;
-	static const QString font_end_tag = QStringLiteral("</font>");
-	static const QString line_break_tag = QStringLiteral("<br/>");
-
-	QStringList lines = patch.split("\n");
-	QString new_text;
-
-	for (int i = 0; i < lines.size(); i++)
-	{
-		// Escape each line and replace raw whitespace
-		const QString line = lines[i].toHtmlEscaped().replace(" ", "&nbsp;");
-
-		if (faulty_lines.empty() || faulty_lines.contains(i))
-		{
-			new_text += font_start_tag + line + font_end_tag + line_break_tag;
-		}
-		else
-		{
-			new_text += line + line_break_tag;
-		}
-	}
-
-	ui->patchEdit->setHtml(new_text);
-}
-
-void patch_creator_dialog::export_patch()
-{
-	if (!m_valid)
-	{
-		QMessageBox::information(this, tr("Patch invalid!"), tr("The patch validation failed.\nThe export of invalid patches is not allowed."));
-		return;
-	}
-
-	const QString file_path = QFileDialog::getSaveFileName(this, tr("Select Patch File"), QString::fromStdString(patch_engine::get_patches_path()), tr("patch.yml files (*.yml);;All files (*.*)"));
-	if (file_path.isEmpty())
-	{
-		return;
-	}
-
-	if (QFile patch_file(file_path); patch_file.open(QIODevice::WriteOnly | QIODevice::Truncate))
-	{
-		patch_file.write(ui->patchEdit->toPlainText().toUtf8());
-		patch_file.close();
-		patch_log.success("Exported patch to file '%s'", file_path);
-	}
-	else
-	{
-		patch_log.fatal("Failed to export patch to file '%s'", file_path);
-	}
-}
-
-void patch_creator_dialog::generate_yml(const QString& /*text*/)
-{
-	YAML::Emitter out;
-	out << YAML::BeginMap;
-	out << patch_key::version << patch_engine_version;
-	out << YAML::Newline;
-	out << ui->hashEdit->text().toStdString();
-	{
-		out << YAML::BeginMap;
-		out << YAML::DoubleQuoted << ui->patchNameEdit->text().toStdString();
-		{
-			out << YAML::BeginMap;
-			out << patch_key::games;
-			{
-				out << YAML::BeginMap;
-				out << YAML::DoubleQuoted << ui->gameEdit->text().toStdString();
-				{
-					out << YAML::BeginMap;
-					out << ui->serialEdit->text().simplified().toStdString();
-					{
-						out << YAML::Flow << fmt::split(ui->gameVersionEdit->text().toStdString(), { ",", " " });
-					}
-					out << YAML::EndMap;
-				}
-				out << YAML::EndMap;
-			}
-			out << patch_key::author << YAML::DoubleQuoted << ui->authorEdit->text().toStdString();
-			out << patch_key::patch_version << fmt::format("%s.%s", ui->versionMajorSpinBox->text(), ui->versionMinorSpinBox->text());
-			out << patch_key::group << YAML::DoubleQuoted << ui->groupEdit->text().toStdString();
-			out << patch_key::notes << YAML::DoubleQuoted << ui->notesEdit->text().toStdString();
-			out << patch_key::patch;
-			{
-				out << YAML::BeginSeq;
-				for (int i = 0; i < ui->instructionTable->rowCount(); i++)
-				{
-					const QComboBox* type_item           = qobject_cast<QComboBox*>(ui->instructionTable->cellWidget(i, patch_column::type));
-					const QTableWidgetItem* offset_item  = ui->instructionTable->item(i, patch_column::offset);
-					const QTableWidgetItem* value_item   = ui->instructionTable->item(i, patch_column::value);
-					const QTableWidgetItem* comment_item = ui->instructionTable->item(i, patch_column::comment);
-
-					const std::string type    = type_item ? type_item->currentText().toStdString() : "";
-					const std::string offset  = offset_item ? offset_item->text().toStdString() : "";
-					const std::string value   = value_item ? value_item->text().toStdString() : "";
-					const std::string comment = comment_item ? comment_item->text().toStdString() : "";
-
-					if (patch_engine::get_patch_type(type) == patch_type::invalid)
-					{
-						ui->patchEdit->setText(tr("Instruction %0: Type '%1' is invalid!").arg(i + 1).arg(type_item ? type_item->currentText() : ""));
-						return;
-					}
-
-					out << YAML::Flow << YAML::BeginSeq << type << offset << value << YAML::EndSeq;
-
-					if (!comment.empty())
-					{
-						out << YAML::Comment(comment);
-					}
-				}
-				out << YAML::EndSeq;
-			}
-			out << YAML::EndMap;
-		}
-		out << YAML::EndMap;
-	}
-	out << YAML::EndMap;
-
-	const QString patch = QString::fromUtf8(out.c_str(), out.size());
-
-	validate(patch);
-}
-
-bool patch_creator_dialog::eventFilter(QObject* object, QEvent* event)
-{
-	if (object != ui->instructionTable)
-	{
-		return QDialog::eventFilter(object, event);
-	}
-
-	if (event->type() == QEvent::KeyPress)
-	{
-		if (QKeyEvent* key_event = static_cast<QKeyEvent*>(event))
-		{
-			if (key_event->modifiers() == Qt::AltModifier)
-			{
-				switch (key_event->key())
-				{
-				case Qt::Key_Up:
-				{
-					QModelIndexList selection = ui->instructionTable->selectionModel()->selectedRows();
-					if (can_move_instructions(selection, move_direction::up))
-						move_instructions(selection.first().row(), selection.count(), 1, move_direction::up);
-					return true;
-				}
-				case Qt::Key_Down:
-				{
-					QModelIndexList selection = ui->instructionTable->selectionModel()->selectedRows();
-					if (can_move_instructions(selection, move_direction::down))
-						move_instructions(selection.first().row(), selection.count(), 1, move_direction::down);
-					return true;
-				}
-				default:
-					break;
-				}
-			}
-			else if (!key_event->isAutoRepeat())
-			{
-				switch (key_event->key())
-				{
-				case Qt::Key_Delete:
-				{
-					remove_instructions();
-					return true;
-				}
-				default:
-					break;
-				}
-			}
-		}
-	}
-
-	return QDialog::eventFilter(object, event);
-}
diff --git a/rpcs3/rpcs3qt/patch_creator_dialog.h b/rpcs3/rpcs3qt/patch_creator_dialog.h
deleted file mode 100644
index 112d827e51..0000000000
--- a/rpcs3/rpcs3qt/patch_creator_dialog.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include "Utilities/bin_patch.h"
-
-#include <QDialog>
-#include <QComboBox>
-#include <QKeyEvent>
-
-namespace Ui
-{
-	class patch_creator_dialog;
-}
-
-class patch_creator_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit patch_creator_dialog(QWidget* parent = nullptr);
-	~patch_creator_dialog();
-
-private:
-	std::unique_ptr<Ui::patch_creator_dialog> ui;
-	QFont mMonoFont;
-	QColor mValidColor;
-	QColor mInvalidColor;
-	bool m_valid = true; // Will be invalidated immediately
-	QRegularExpressionValidator* m_offset_validator = nullptr;
-
-	enum class move_direction
-	{
-		up,
-		down
-	};
-
-	void add_instruction(int row);
-	void remove_instructions();
-	void move_instructions(int src_row, int rows_to_move, int distance, move_direction dir);
-	bool can_move_instructions(QModelIndexList& selection, move_direction dir);
-
-	static void init_patch_type_bombo_box(QComboBox* combo_box, patch_type set_type, bool searchable);
-	QComboBox* create_patch_type_bombo_box(patch_type set_type) const;
-
-	void update_validator(int index, QComboBox* combo_box, QLineEdit* line_edit) const;
-
-private Q_SLOTS:
-	void show_table_menu(const QPoint& pos);
-	void validate(const QString& patch);
-	void generate_yml(const QString& text = {});
-	void export_patch();
-
-protected:
-	bool eventFilter(QObject* object, QEvent* event) override;
-};
diff --git a/rpcs3/rpcs3qt/patch_creator_dialog.ui b/rpcs3/rpcs3qt/patch_creator_dialog.ui
deleted file mode 100644
index 0554c04b18..0000000000
--- a/rpcs3/rpcs3qt/patch_creator_dialog.ui
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>patch_creator_dialog</class>
- <widget class="QDialog" name="patch_creator_dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1005</width>
-    <height>804</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Patch Creator</string>
-  </property>
-  <layout class="QVBoxLayout" name="dialogLayout">
-   <item>
-    <widget class="QSplitter" name="splitter">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <widget class="QWidget" name="verticalLayoutWidget">
-      <layout class="QVBoxLayout" name="leftLayout">
-       <item>
-        <widget class="QTableWidget" name="instructionTable">
-         <property name="contextMenuPolicy">
-          <enum>Qt::CustomContextMenu</enum>
-         </property>
-         <property name="selectionBehavior">
-          <enum>QAbstractItemView::SelectRows</enum>
-         </property>
-         <attribute name="horizontalHeaderStretchLastSection">
-          <bool>true</bool>
-         </attribute>
-         <column>
-          <property name="text">
-           <string>Type</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Offset</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Value</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Comment</string>
-          </property>
-         </column>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="addPatchLayout" stretch="1,1,1,1,0">
-         <item>
-          <widget class="QComboBox" name="addPatchTypeComboBox"/>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="addPatchOffsetEdit">
-           <property name="placeholderText">
-            <string>Offset</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="addPatchValueEdit">
-           <property name="placeholderText">
-            <string>Value</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="addPatchCommentEdit">
-           <property name="placeholderText">
-            <string>Comment</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="addPatchButton">
-           <property name="text">
-            <string>Add</string>
-           </property>
-           <property name="autoDefault">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="verticalLayoutWidget_2">
-      <layout class="QVBoxLayout" name="rightLayout">
-       <item>
-        <layout class="QGridLayout" name="gridLayout">
-         <item row="0" column="0">
-          <widget class="QLineEdit" name="hashEdit">
-           <property name="placeholderText">
-            <string>Hash</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="1">
-          <layout class="QHBoxLayout" name="versionLayout">
-           <item>
-            <widget class="QLabel" name="label">
-             <property name="text">
-              <string>Patch Version</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QSpinBox" name="versionMajorSpinBox"/>
-           </item>
-           <item>
-            <widget class="QSpinBox" name="versionMinorSpinBox"/>
-           </item>
-          </layout>
-         </item>
-         <item row="4" column="1">
-          <widget class="QLineEdit" name="notesEdit">
-           <property name="text">
-            <string/>
-           </property>
-           <property name="placeholderText">
-            <string>Notes</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1">
-          <widget class="QLineEdit" name="authorEdit">
-           <property name="placeholderText">
-            <string>Author</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QLineEdit" name="groupEdit">
-           <property name="placeholderText">
-            <string>Group</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QLineEdit" name="patchNameEdit">
-           <property name="placeholderText">
-            <string>Patch Name</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLineEdit" name="gameEdit">
-           <property name="placeholderText">
-            <string>Game</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0">
-          <widget class="QLineEdit" name="serialEdit">
-           <property name="placeholderText">
-            <string>Title ID</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="0">
-          <widget class="QLineEdit" name="gameVersionEdit">
-           <property name="placeholderText">
-            <string>Game Versions</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="0">
-          <widget class="QLabel" name="validLabel">
-           <property name="text">
-            <string>Valid Patch</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QTextEdit" name="patchEdit">
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.cpp b/rpcs3/rpcs3qt/patch_manager_dialog.cpp
index d823ee647d..34ac3d47a8 100644
--- a/rpcs3/rpcs3qt/patch_manager_dialog.cpp
+++ b/rpcs3/rpcs3qt/patch_manager_dialog.cpp
@@ -10,16 +10,15 @@
 #include <QTimer>
 #include <QJsonObject>
 #include <QJsonDocument>
-#include <QDoubleSpinBox>
 
 #include "ui_patch_manager_dialog.h"
 #include "patch_manager_dialog.h"
+#include "table_item_delegate.h"
 #include "gui_settings.h"
 #include "downloader.h"
 #include "qt_utils.h"
 #include "Utilities/File.h"
 #include "util/logs.hpp"
-#include "Crypto/utils.h"
 
 LOG_CHANNEL(patch_log, "PAT");
 
@@ -43,9 +42,7 @@ enum patch_role : int
 	description_role,
 	patch_group_role,
 	persistance_role,
-	node_level_role,
-	config_values_role,
-	config_key_role,
+	node_level_role
 };
 
 enum node_level : int
@@ -55,30 +52,23 @@ enum node_level : int
 	patch_level
 };
 
-Q_DECLARE_METATYPE(patch_engine::patch_config_value);
-
-patch_manager_dialog::patch_manager_dialog(std::shared_ptr<gui_settings> gui_settings, const std::vector<game_info>& games, const std::string& title_id, const std::string& version, QWidget* parent)
+patch_manager_dialog::patch_manager_dialog(std::shared_ptr<gui_settings> gui_settings, std::unordered_map<std::string, std::set<std::string>> games, const std::string& title_id, const std::string& version, QWidget* parent)
 	: QDialog(parent)
 	, m_gui_settings(std::move(gui_settings))
 	, m_expand_current_match(!title_id.empty() && !version.empty()) // Expand first search results
 	, m_search_version(QString::fromStdString(version))
+	, m_owned_games(std::move(games))
 	, ui(new Ui::patch_manager_dialog)
 {
 	ui->setupUi(this);
 	setModal(true);
 
+	// Load config for special settings
+	patch_engine::load_config();
+
 	// Load gui settings
 	m_show_owned_games_only = m_gui_settings->GetValue(gui::pm_show_owned).toBool();
 
-	// Get owned games
-	for (const auto& game : games)
-	{
-		if (game && game->info.bootable)
-		{
-			m_owned_games[game->info.serial].insert(game->GetGameVersion());
-		}
-	}
-
 	// Initialize gui controls
 	ui->patch_filter->setText(QString::fromStdString(title_id));
 	ui->cb_owned_games_only->setChecked(m_show_owned_games_only);
@@ -87,38 +77,12 @@ patch_manager_dialog::patch_manager_dialog(std::shared_ptr<gui_settings> gui_set
 
 	m_downloader = new downloader(this);
 
-	ui->configurable_selector->setEnabled(false);
-	ui->configurable_combo_box->setEnabled(false);
-	ui->configurable_combo_box->setVisible(false);
-	ui->configurable_spin_box->setEnabled(false);
-	ui->configurable_spin_box->setVisible(false);
-	ui->configurable_double_spin_box->setEnabled(false);
-	ui->configurable_double_spin_box->setVisible(false);
-
 	// Create connects
 	connect(ui->patch_filter, &QLineEdit::textChanged, this, &patch_manager_dialog::filter_patches);
 	connect(ui->patch_tree, &QTreeWidget::currentItemChanged, this, &patch_manager_dialog::handle_item_selected);
 	connect(ui->patch_tree, &QTreeWidget::itemChanged, this, &patch_manager_dialog::handle_item_changed);
 	connect(ui->patch_tree, &QTreeWidget::customContextMenuRequested, this, &patch_manager_dialog::handle_custom_context_menu_requested);
-	connect(ui->cb_owned_games_only, &QCheckBox::checkStateChanged, this, &patch_manager_dialog::handle_show_owned_games_only);
-	connect(ui->configurable_selector, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index)
-	{
-		if (index >= 0)
-		{
-			QList<QTreeWidgetItem*> list = ui->patch_tree->selectedItems();
-			QTreeWidgetItem* item = list.size() == 1 ? list.first() : nullptr;
-			handle_item_selected(item, item);
-		}
-	});
-	connect(ui->configurable_combo_box, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index)
-	{
-		if (index >= 0)
-		{
-			handle_config_value_changed(ui->configurable_combo_box->itemData(index).toDouble());
-		}
-	});
-	connect(ui->configurable_spin_box, QOverload<int>::of(&QSpinBox::valueChanged), this, &patch_manager_dialog::handle_config_value_changed);
-	connect(ui->configurable_double_spin_box, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &patch_manager_dialog::handle_config_value_changed);
+	connect(ui->cb_owned_games_only, &QCheckBox::stateChanged, this, &patch_manager_dialog::handle_show_owned_games_only);
 	connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QWidget::close);
 	connect(ui->buttonBox, &QDialogButtonBox::clicked, [this](QAbstractButton* button)
 	{
@@ -133,13 +97,12 @@ patch_manager_dialog::patch_manager_dialog(std::shared_ptr<gui_settings> gui_set
 		}
 		else if (button == ui->buttonBox->button(QDialogButtonBox::RestoreDefaults))
 		{
-			download_update(false, true);
+			download_update();
 		}
 	});
 	connect(m_downloader, &downloader::signal_download_error, this, [this](const QString& /*error*/)
 	{
 		QMessageBox::warning(this, tr("Patch downloader"), tr("An error occurred during the download process.\nCheck the log for more information."));
-		ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(true);
 	});
 	connect(m_downloader, &downloader::signal_download_finished, this, [this](const QByteArray& data)
 	{
@@ -147,28 +110,18 @@ patch_manager_dialog::patch_manager_dialog(std::shared_ptr<gui_settings> gui_set
 
 		if (!result_json)
 		{
-			if (!m_download_automatic)
-			{
-				QMessageBox::warning(this, tr("Patch downloader"), tr("An error occurred during the download process.\nCheck the log for more information."));
-			}
+			QMessageBox::warning(this, tr("Patch downloader"), tr("An error occurred during the download process.\nCheck the log for more information."));
 		}
-		ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(true);
 	});
-
-	download_update(true, false);
-}
-
-void patch_manager_dialog::closeEvent(QCloseEvent* event)
-{
-	// Save gui settings
-	m_gui_settings->SetValue(gui::pm_geometry, saveGeometry(), false);
-	m_gui_settings->SetValue(gui::pm_splitter_state, ui->splitter->saveState(), true);
-
-	QDialog::closeEvent(event);
 }
 
 patch_manager_dialog::~patch_manager_dialog()
 {
+	// Save gui settings
+	m_gui_settings->SetValue(gui::pm_geometry, saveGeometry());
+	m_gui_settings->SetValue(gui::pm_splitter_state, ui->splitter->saveState());
+
+	delete ui;
 }
 
 int patch_manager_dialog::exec()
@@ -217,12 +170,11 @@ void patch_manager_dialog::load_patches(bool show_error)
 
 	bool has_errors = false;
 
-	for (const QString& path : path_list)
+	for (const auto& path : path_list)
 	{
 		if (!patch_engine::load(m_map, patches_path + path.toStdString()))
 		{
 			has_errors = true;
-			patch_log.error("Errors in patch file '%s'", path);
 		}
 	}
 
@@ -301,7 +253,7 @@ void patch_manager_dialog::populate_tree()
 					const QString q_serial = QString::fromStdString(serial);
 					const QString visible_serial = serial == patch_key::all ? tr_all_serials : q_serial;
 
-					for (const auto& [app_version, config_values] : app_versions)
+					for (const auto& [app_version, enabled] : app_versions)
 					{
 						const QString q_app_version = QString::fromStdString(app_version);
 						const QString q_version_suffix = app_version == patch_key::all ? (QStringLiteral(" - ") + tr_all_versions) : (QStringLiteral(" v.") + q_app_version);
@@ -330,45 +282,24 @@ void patch_manager_dialog::populate_tree()
 						const QString q_description = QString::fromStdString(description);
 						QString visible_description = q_description;
 
-						const std::vector<std::pair<int, QVariant>> match_criteria =
-						{
-							std::pair<int, QVariant>(description_role, q_description),
-							std::pair<int, QVariant>(persistance_role, true)
-						};
+						const auto match_criteria = QList<QPair<int, QVariant>>() << QPair(description_role, q_description) << QPair(persistance_role, true);
 
 						// Add counter to leafs if the name already exists due to different hashes of the same game (PPU, SPU, PRX, OVL)
-						std::vector<QTreeWidgetItem*> matches;
-						gui::utils::find_children_by_data(serial_level_item, matches, match_criteria, false);
-
-						if (!matches.empty())
+						if (const auto matches = gui::utils::find_children_by_data(serial_level_item, match_criteria, false); matches.count() > 0)
 						{
-							if (auto only_match = matches.size() == 1 ? matches[0] : nullptr)
+							if (auto only_match = matches.count() == 1 ? matches[0] : nullptr)
 							{
 								only_match->setText(0, q_description + QStringLiteral(" (01)"));
 							}
-							const usz counter = matches.size() + 1;
+							const int counter = matches.count() + 1;
 							visible_description += QStringLiteral(" (");
 							if (counter < 10) visible_description += '0';
 							visible_description += QString::number(counter) + ')';
 						}
 
-						QVariantMap q_config_values;
-
-						for (const auto& [key, default_config_value] : patch.default_config_values)
-						{
-							patch_engine::patch_config_value config_value = default_config_value;
-
-							if (config_values.config_values.contains(key))
-							{
-								config_value.set_and_check_value(config_values.config_values.at(key).value, key);
-							}
-
-							q_config_values[QString::fromStdString(key)] = QVariant::fromValue(config_value);
-						}
-
 						QTreeWidgetItem* patch_level_item = new QTreeWidgetItem();
 						patch_level_item->setText(0, visible_description);
-						patch_level_item->setCheckState(0, config_values.enabled ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
+						patch_level_item->setCheckState(0, enabled ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
 						patch_level_item->setData(0, hash_role, q_hash);
 						patch_level_item->setData(0, title_role, q_title);
 						patch_level_item->setData(0, serial_role, q_serial);
@@ -377,8 +308,6 @@ void patch_manager_dialog::populate_tree()
 						patch_level_item->setData(0, patch_group_role, q_patch_group);
 						patch_level_item->setData(0, node_level_role, node_level::patch_level);
 						patch_level_item->setData(0, persistance_role, true);
-						patch_level_item->setData(0, config_values_role, q_config_values);
-						patch_level_item->setData(0, config_key_role, QString()); // Start with empty key. We will use this to keep track of the current config value during editing.
 
 						serial_level_item->addChild(patch_level_item);
 					}
@@ -387,10 +316,7 @@ void patch_manager_dialog::populate_tree()
 		}
 	}
 
-	const std::vector<std::pair<int, QVariant>> match_criteria =
-	{
-		std::pair<int, QVariant>(persistance_role, true)
-	};
+	const auto match_criteria = QList<QPair<int, QVariant>>() << QPair(persistance_role, true);
 
 	for (int i = ui->patch_tree->topLevelItemCount() - 1; i >= 0; i--)
 	{
@@ -416,7 +342,7 @@ void patch_manager_dialog::populate_tree()
 		const auto item = all_title_items[0];
 		ensure(item && all_title_items.size() == 1);
 
-		if (const int index = ui->patch_tree->indexOfTopLevelItem(item); item && index >= 0)
+		if (const int index = ui->patch_tree->indexOfTopLevelItem(item); index >= 0)
 		{
 			const bool all_titles_expanded = item->isExpanded();
 			const auto all_serials_item = item->child(0);
@@ -460,7 +386,7 @@ void patch_manager_dialog::filter_patches(const QString& term)
 				const std::string app_version = item->data(0, app_version_role).toString().toStdString();
 
 				if (serial != patch_key::all &&
-					(!m_owned_games.contains(serial) || (app_version != patch_key::all && !::at32(m_owned_games, serial).contains(app_version))))
+					(m_owned_games.find(serial) == m_owned_games.end() || (app_version != patch_key::all && !m_owned_games.at(serial).contains(app_version))))
 				{
 					item->setHidden(true);
 					return 0;
@@ -559,84 +485,9 @@ void patch_manager_dialog::update_patch_info(const patch_manager_dialog::gui_pat
 	ui->label_serial->setText(info.serial);
 	ui->label_title->setText(info.title);
 	ui->label_app_version->setText(info.app_version);
-
-	const QString key = ui->configurable_selector->currentIndex() < 0 ? "" : ui->configurable_selector->currentData().toString();
-
-	if (info.config_values.empty() || key.isEmpty())
-	{
-		ui->configurable_combo_box->setEnabled(false);
-		ui->configurable_combo_box->setVisible(false);
-		ui->configurable_spin_box->setEnabled(false);
-		ui->configurable_spin_box->setVisible(false);
-		ui->configurable_double_spin_box->setEnabled(false);
-		ui->configurable_double_spin_box->setVisible(false);
-		ui->configurable_selector->blockSignals(true);
-		ui->configurable_selector->clear();
-		ui->configurable_selector->blockSignals(false);
-		ui->configurable_selector->setEnabled(false);
-		return;
-	}
-
-	if (key == info.config_value_key)
-	{
-		// Don't update widget if the config key did not change
-		return;
-	}
-
-	// Disable all config widgets first
-	ui->configurable_combo_box->setEnabled(false);
-	ui->configurable_combo_box->setVisible(false);
-	ui->configurable_spin_box->setEnabled(false);
-	ui->configurable_spin_box->setVisible(false);
-	ui->configurable_double_spin_box->setEnabled(false);
-	ui->configurable_double_spin_box->setVisible(false);
-
-	// Fetch the config values of this item
-	const QVariant& variant = ::at32(info.config_values, key);
-	ensure(variant.canConvert<patch_engine::patch_config_value>());
-
-	const patch_engine::patch_config_value config_value = variant.value<patch_engine::patch_config_value>();
-
-	// Setup the proper config widget
-	switch (config_value.type)
-	{
-	case patch_configurable_type::double_range:
-		ui->configurable_double_spin_box->blockSignals(true);
-		ui->configurable_double_spin_box->setRange(config_value.min, config_value.max);
-		ui->configurable_double_spin_box->setValue(config_value.value);
-		ui->configurable_double_spin_box->setEnabled(true);
-		ui->configurable_double_spin_box->setVisible(true);
-		ui->configurable_double_spin_box->blockSignals(false);
-		break;
-	case patch_configurable_type::long_range:
-		ui->configurable_spin_box->blockSignals(true);
-		ui->configurable_spin_box->setRange(config_value.min, config_value.max);
-		ui->configurable_spin_box->setValue(config_value.value);
-		ui->configurable_spin_box->setEnabled(true);
-		ui->configurable_spin_box->setVisible(true);
-		ui->configurable_spin_box->blockSignals(false);
-		break;
-	case patch_configurable_type::double_enum:
-	case patch_configurable_type::long_enum:
-		ui->configurable_combo_box->blockSignals(true);
-		ui->configurable_combo_box->clear();
-		for (const patch_engine::patch_allowed_value& allowed_value : config_value.allowed_values)
-		{
-			ui->configurable_combo_box->addItem(QString::fromStdString(allowed_value.label), allowed_value.value);
-
-			if (allowed_value.value == config_value.value)
-			{
-				ui->configurable_combo_box->setCurrentIndex(ui->configurable_combo_box->findData(allowed_value.value));
-			}
-		}
-		ui->configurable_combo_box->setEnabled(true);
-		ui->configurable_combo_box->setVisible(true);
-		ui->configurable_combo_box->blockSignals(false);
-		break;
-	}
 }
 
-void patch_manager_dialog::handle_item_selected(QTreeWidgetItem* current, QTreeWidgetItem* previous)
+void patch_manager_dialog::handle_item_selected(QTreeWidgetItem *current, QTreeWidgetItem * /*previous*/)
 {
 	if (!current)
 	{
@@ -645,12 +496,6 @@ void patch_manager_dialog::handle_item_selected(QTreeWidgetItem* current, QTreeW
 		return;
 	}
 
-	// Clear key of previous patch level item
-	if (previous && current != previous && static_cast<node_level>(previous->data(0, node_level_role).toInt()) == node_level::patch_level)
-	{
-		previous->setData(0, config_key_role, QString());
-	}
-
 	const node_level level = static_cast<node_level>(current->data(0, node_level_role).toInt());
 
 	patch_manager_dialog::gui_patch_info info{};
@@ -665,37 +510,17 @@ void patch_manager_dialog::handle_item_selected(QTreeWidgetItem* current, QTreeW
 		const std::string description = current->data(0, description_role).toString().toStdString();
 
 		// Find the patch for this item and get its metadata
-		if (m_map.contains(hash))
+		if (m_map.find(hash) != m_map.end())
 		{
-			const auto& container = ::at32(m_map, hash);
+			const auto& container = m_map.at(hash);
 
-			if (container.patch_info_map.contains(description))
+			if (container.patch_info_map.find(description) != container.patch_info_map.end())
 			{
-				const auto& found_info = ::at32(container.patch_info_map, description);
+				const auto& found_info = container.patch_info_map.at(description);
 				info.author = QString::fromStdString(found_info.author);
 				info.notes = QString::fromStdString(found_info.notes);
 				info.description = QString::fromStdString(found_info.description);
 				info.patch_version = QString::fromStdString(found_info.patch_version);
-				info.config_values = current->data(0, config_values_role).toMap().toStdMap();
-				info.config_value_key = current->data(0, config_key_role).toString();
-
-				if (current != previous)
-				{
-					// Update the config value combo box with the new config keys
-					ui->configurable_selector->blockSignals(true);
-					ui->configurable_selector->clear();
-					for (const auto& [key, variant] : info.config_values)
-					{
-						ensure(variant.canConvert<patch_engine::patch_config_value>());
-						ui->configurable_selector->addItem(key, key);
-					}
-					if (ui->configurable_selector->count() > 0)
-					{
-						ui->configurable_selector->setCurrentIndex(0);
-					}
-					ui->configurable_selector->blockSignals(false);
-					ui->configurable_selector->setEnabled(ui->configurable_selector->count() > 0);
-				}
 			}
 		}
 		[[fallthrough]];
@@ -720,12 +545,9 @@ void patch_manager_dialog::handle_item_selected(QTreeWidgetItem* current, QTreeW
 	}
 
 	update_patch_info(info);
-
-	const QString key = ui->configurable_selector->currentIndex() < 0 ? "" : ui->configurable_selector->currentData().toString();
-	current->setData(0, config_key_role, key);
 }
 
-void patch_manager_dialog::handle_item_changed(QTreeWidgetItem* item, int /*column*/)
+void patch_manager_dialog::handle_item_changed(QTreeWidgetItem *item, int /*column*/)
 {
 	if (!item)
 	{
@@ -762,80 +584,15 @@ void patch_manager_dialog::handle_item_changed(QTreeWidgetItem* item, int /*colu
 	}
 
 	// Enable/disable the patch for this item and show its metadata
-	if (m_map.contains(hash))
+	if (m_map.find(hash) != m_map.end())
 	{
-		auto& info = m_map[hash].patch_info_map;
+		auto& container = m_map[hash];
 
-		if (info.contains(description))
+		if (container.patch_info_map.find(description) != container.patch_info_map.end())
 		{
-			info[description].titles[title][serial][app_version].enabled = enabled;
-			handle_item_selected(item, item);
-		}
-	}
-}
-
-void patch_manager_dialog::handle_config_value_changed(double value)
-{
-	QList<QTreeWidgetItem*> list = ui->patch_tree->selectedItems();
-	QTreeWidgetItem* item = list.size() == 1 ? list.first() : nullptr;
-
-	if (!item)
-	{
-		return;
-	}
-
-	const node_level level = static_cast<node_level>(item->data(0, node_level_role).toInt());
-
-	if (level != node_level::patch_level)
-	{
-		return;
-	}
-
-	// Fetch the config values of this item
-	const QString key = ui->configurable_selector->currentText();
-	const QVariant data = item->data(0, config_values_role);
-	QVariantMap q_config_values = data.canConvert<QVariantMap>() ? data.toMap() : QVariantMap{};
-
-	if (q_config_values.isEmpty() || !q_config_values.contains(key))
-	{
-		return;
-	}
-
-	// Fetch the config value for the current key
-	QVariant& variant = q_config_values[key];
-	ensure(variant.canConvert<patch_engine::patch_config_value>());
-
-	patch_engine::patch_config_value config_value = variant.value<patch_engine::patch_config_value>();
-	config_value.value = value;
-	variant = QVariant::fromValue(config_value);
-
-	// Set the key first. setData will trigger the itemChanged signal and we don't want to re-create the config widgets each time we set the config values.
-	item->setData(0, config_key_role, key);
-	item->setData(0, config_values_role, q_config_values);
-
-	// Update the configurable value of the patch for this item
-	const std::string hash = item->data(0, hash_role).toString().toStdString();
-	const std::string title = item->data(0, title_role).toString().toStdString();
-	const std::string serial = item->data(0, serial_role).toString().toStdString();
-	const std::string app_version = item->data(0, app_version_role).toString().toStdString();
-	const std::string description = item->data(0, description_role).toString().toStdString();
-
-	if (m_map.contains(hash))
-	{
-		auto& info = m_map[hash].patch_info_map;
-
-		if (info.contains(description))
-		{
-			auto& patch = info[description];
-			auto& config_values = patch.titles[title][serial][app_version].config_values;
-
-			for (const QString& q_key : q_config_values.keys())
-			{
-				if (const std::string s_key = q_key.toStdString(); key == q_key && patch.default_config_values.contains(s_key))
-				{
-					config_values[s_key].value = value;
-				}
-			}
+			m_map[hash].patch_info_map[description].titles[title][serial][app_version] = enabled;
+			handle_item_selected(item, nullptr);
+			return;
 		}
 	}
 }
@@ -859,13 +616,13 @@ void patch_manager_dialog::handle_custom_context_menu_requested(const QPoint &po
 		const std::string hash = item->data(0, hash_role).toString().toStdString();
 		const std::string description = item->data(0, description_role).toString().toStdString();
 
-		if (m_map.contains(hash))
+		if (m_map.find(hash) != m_map.end())
 		{
-			const auto& container = ::at32(m_map, hash);
+			const auto& container = m_map.at(hash);
 
-			if (container.patch_info_map.contains(description))
+			if (container.patch_info_map.find(description) != container.patch_info_map.end())
 			{
-				const auto& info = ::at32(container.patch_info_map, description);
+				const auto& info = container.patch_info_map.at(description);
 
 				QAction* open_filepath = new QAction(tr("Show Patch File"));
 				menu->addAction(open_filepath);
@@ -981,8 +738,8 @@ bool patch_manager_dialog::is_valid_file(const QMimeData& md, QStringList* drop_
 
 	for (auto&& url : list) // Check each file in url list for valid type
 	{
-		const QString path = url.toLocalFile(); // Convert url to filepath
-		const QFileInfo info(path);
+		const QString path   = url.toLocalFile(); // Convert url to filepath
+		const QFileInfo info = path;
 
 		if (!info.fileName().endsWith("patch.yml"))
 		{
@@ -1071,35 +828,12 @@ void patch_manager_dialog::dropEvent(QDropEvent* event)
 		else
 		{
 			patch_log.error("Errors found in patch file %s", path);
-			QString summary = QString::fromStdString(log_message.str());
-
-			if (summary.count(QLatin1Char('\n')) < 5)
-			{
-				QMessageBox::critical(this, tr("Validation failed"), tr("Errors were found in the patch file.\n\nLog:\n%0").arg(summary));
-			}
-			else
-			{
-				QString message = tr("Errors were found in the patch file.");
-				QMessageBox* mb = new QMessageBox(QMessageBox::Icon::Critical, tr("Validation failed"), message, QMessageBox::Ok, this);
-				mb->setInformativeText(tr("To see the error log, please click \"Show Details\"."));
-				mb->setDetailedText(summary);
-				mb->setAttribute(Qt::WA_DeleteOnClose);
-
-				// Smartass hack to make the unresizeable message box wide enough for the changelog
-				const int log_width = QLabel(summary).sizeHint().width();
-				while (QLabel(message).sizeHint().width() < log_width)
-				{
-					message += "          ";
-				}
-
-				mb->setText(message);
-				mb->show();
-			}
+			QMessageBox::critical(this, tr("Validation failed"), tr("Errors were found in the patch file.\n\nLog:\n%0").arg(QString::fromStdString(log_message.str())));
 		}
 	}
 }
 
-void patch_manager_dialog::handle_show_owned_games_only(Qt::CheckState state)
+void patch_manager_dialog::handle_show_owned_games_only(int state)
 {
 	m_show_owned_games_only = state == Qt::CheckState::Checked;
 	m_gui_settings->SetValue(gui::pm_show_owned, m_show_owned_games_only);
@@ -1127,14 +861,9 @@ void patch_manager_dialog::dragLeaveEvent(QDragLeaveEvent* event)
 	event->accept();
 }
 
-void patch_manager_dialog::download_update(bool automatic, bool auto_accept)
+void patch_manager_dialog::download_update() const
 {
-	patch_log.notice("Patch download triggered (automatic=%d, auto_accept=%d)", automatic, auto_accept);
-
-	ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(false);
-
-	m_download_automatic = automatic;
-	m_download_auto_accept = auto_accept;
+	patch_log.notice("Patch download triggered");
 
 	const std::string path = patch_engine::get_patches_path() + "patch.yml";
 	std::string url        = "https://rpcs3.net/compatibility?patch&api=v1&v=" + patch_engine_version;
@@ -1143,7 +872,7 @@ void patch_manager_dialog::download_update(bool automatic, bool auto_accept)
 	{
 		if (const fs::file patch_file{path})
 		{
-			const std::string hash = sha256_get_hash(patch_file.to_string().c_str(), patch_file.size(), true);
+			const std::string hash = downloader::get_hash(patch_file.to_string().c_str(), patch_file.size(), true);
 			url += "&sha256=" + hash;
 		}
 		else
@@ -1153,7 +882,7 @@ void patch_manager_dialog::download_update(bool automatic, bool auto_accept)
 		}
 	}
 
-	m_downloader->start(url, true, !m_download_automatic, tr("Downloading latest patches"));
+	m_downloader->start(url, true, true, tr("Downloading latest patches"));
 }
 
 bool patch_manager_dialog::handle_json(const QByteArray& data)
@@ -1184,12 +913,7 @@ bool patch_manager_dialog::handle_json(const QByteArray& data)
 	if (return_code == 1)
 	{
 		patch_log.notice("Patch download: No newer patches found");
-
-		if (!m_download_automatic)
-		{
-			QMessageBox::information(this, tr("Download successful"), tr("Your patch file is already up to date."));
-		}
-
+		QMessageBox::information(this, tr("Download successful"), tr("Your patch file is already up to date."));
 		return true;
 	}
 
@@ -1199,16 +923,6 @@ bool patch_manager_dialog::handle_json(const QByteArray& data)
 		return false;
 	}
 
-	// TODO: check for updates first instead of loading the whole file immediately
-	if (!m_download_auto_accept)
-	{
-		const QMessageBox::StandardButton answer = QMessageBox::question(this, tr("Update patches?"), tr("New patches are available.\n\nDo you want to update?"));
-		if (answer != QMessageBox::StandardButton::Yes)
-		{
-			return true;
-		}
-	}
-
 	const QJsonValue& version_obj = json_data["version"];
 
 	if (!version_obj.isString())
@@ -1245,7 +959,7 @@ bool patch_manager_dialog::handle_json(const QByteArray& data)
 
 	const std::string content = patch.toString().toStdString();
 
-	if (hash_obj.toString().toStdString() != sha256_get_hash(content.c_str(), content.size(), true))
+	if (hash_obj.toString().toStdString() != downloader::get_hash(content.c_str(), content.size(), true))
 	{
 		patch_log.error("JSON content does not match the provided checksum");
 		return false;
@@ -1254,16 +968,7 @@ bool patch_manager_dialog::handle_json(const QByteArray& data)
 	if (patch_engine::load(patches, "From Download", content, true, &log_message))
 	{
 		patch_log.notice("Successfully validated downloaded patch file");
-
-		const std::string patches_path = patch_engine::get_patches_path();
-
-		if (!fs::create_path(patches_path))
-		{
-			patch_log.fatal("Failed to create path: %s (%s)", patches_path, fs::g_tls_error);
-			return false;
-		}
-
-		const std::string path = patches_path + "patch.yml";
+		const std::string path = patch_engine::get_patches_path() + "patch.yml";
 
 		// Back up current patch file if possible
 		if (fs::is_file(path))
@@ -1277,11 +982,13 @@ bool patch_manager_dialog::handle_json(const QByteArray& data)
 		}
 
 		// Overwrite current patch file
-		fs::pending_file patch_file(path);
-
-		if (!patch_file.file || !patch_file.file.write(content) || !patch_file.commit())
+		if (fs::file patch_file = fs::file(path, fs::rewrite))
 		{
-			patch_log.error("Could not save new patches to %s (error=%s)", path, fs::g_tls_error);
+			patch_file.write(content);
+		}
+		else
+		{
+			patch_log.error("Could not save new patches to %s (%s)", path, fs::g_tls_error);
 			return false;
 		}
 
@@ -1293,30 +1000,7 @@ bool patch_manager_dialog::handle_json(const QByteArray& data)
 	else
 	{
 		patch_log.error("Errors found in downloaded patch file");
-		QString summary = QString::fromStdString(log_message.str());
-
-		if (summary.count(QLatin1Char('\n')) < 5)
-		{
-			QMessageBox::critical(this, tr("Validation failed"), tr("Errors were found in the downloaded patch file.\n\nLog:\n%0").arg(summary));
-		}
-		else
-		{
-			QString message = tr("Errors were found in the downloaded patch file.");
-			QMessageBox* mb = new QMessageBox(QMessageBox::Icon::Critical, tr("Validation failed"), message, QMessageBox::Ok, this);
-			mb->setInformativeText(tr("To see the error log, please click \"Show Details\"."));
-			mb->setDetailedText(summary);
-			mb->setAttribute(Qt::WA_DeleteOnClose);
-
-			// Smartass hack to make the unresizeable message box wide enough for the changelog
-			const int log_width = QLabel(message).sizeHint().width();
-			while (QLabel(message).sizeHint().width() < log_width)
-			{
-				message += "          ";
-			}
-
-			mb->setText(message);
-			mb->show();
-		}
+		QMessageBox::critical(this, tr("Validation failed"), tr("Errors were found in the downloaded patch file.\n\nLog:\n%0").arg(QString::fromStdString(log_message.str())));
 	}
 
 	return true;
diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.h b/rpcs3/rpcs3qt/patch_manager_dialog.h
index 4639afd454..17dee70720 100644
--- a/rpcs3/rpcs3qt/patch_manager_dialog.h
+++ b/rpcs3/rpcs3qt/patch_manager_dialog.h
@@ -5,7 +5,6 @@
 #include <QDragMoveEvent>
 #include <QMimeData>
 
-#include "gui_game_info.h"
 #include "Utilities/bin_patch.h"
 #include <unordered_map>
 
@@ -31,8 +30,6 @@ class patch_manager_dialog : public QDialog
 		QString notes;
 		QString description;
 		QString patch_version;
-		QString config_value_key;
-		std::map<QString, QVariant> config_values;
 	};
 
 	const QString tr_all_titles   = tr("All titles - Warning: These patches apply to all games!");
@@ -40,18 +37,17 @@ class patch_manager_dialog : public QDialog
 	const QString tr_all_versions = tr("All versions");
 
 public:
-	explicit patch_manager_dialog(std::shared_ptr<gui_settings> gui_settings, const std::vector<game_info>& games, const std::string& title_id, const std::string& version, QWidget* parent = nullptr);
+	explicit patch_manager_dialog(std::shared_ptr<gui_settings> gui_settings, std::unordered_map<std::string, std::set<std::string>> games, const std::string& title_id, const std::string& version, QWidget* parent = nullptr);
 	~patch_manager_dialog();
 
 	int exec() override;
 
 private Q_SLOTS:
 	void filter_patches(const QString& term);
-	void handle_item_selected(QTreeWidgetItem* current, QTreeWidgetItem* previous);
-	void handle_item_changed(QTreeWidgetItem* item, int column);
-	void handle_config_value_changed(double value);
+	void handle_item_selected(QTreeWidgetItem *current, QTreeWidgetItem *previous);
+	void handle_item_changed(QTreeWidgetItem *item, int column);
 	void handle_custom_context_menu_requested(const QPoint& pos);
-	void handle_show_owned_games_only(Qt::CheckState state);
+	void handle_show_owned_games_only(int state);
 
 private:
 	void refresh(bool restore_layout = false);
@@ -60,7 +56,7 @@ private:
 	void save_config() const;
 	void update_patch_info(const gui_patch_info& info) const;
 	static bool is_valid_file(const QMimeData& md, QStringList* drop_paths = nullptr);
-	void download_update(bool automatic, bool auto_accept);
+	void download_update() const;
 	bool handle_json(const QByteArray& data);
 
 	std::shared_ptr<gui_settings> m_gui_settings;
@@ -74,15 +70,12 @@ private:
 	patch_engine::patch_map m_map;
 
 	downloader* m_downloader = nullptr;
-	bool m_download_automatic = false;
-	bool m_download_auto_accept = false;
 
-	std::unique_ptr<Ui::patch_manager_dialog> ui;
+	Ui::patch_manager_dialog *ui;
 
 protected:
 	void dropEvent(QDropEvent* event) override;
 	void dragEnterEvent(QDragEnterEvent* event) override;
 	void dragMoveEvent(QDragMoveEvent* event) override;
 	void dragLeaveEvent(QDragLeaveEvent* event) override;
-	void closeEvent(QCloseEvent* event) override;
 };
diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.ui b/rpcs3/rpcs3qt/patch_manager_dialog.ui
index 6daeea160c..1eb8b75790 100644
--- a/rpcs3/rpcs3qt/patch_manager_dialog.ui
+++ b/rpcs3/rpcs3qt/patch_manager_dialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>855</width>
-    <height>644</height>
+    <width>837</width>
+    <height>659</height>
    </rect>
   </property>
   <property name="acceptDrops">
@@ -68,280 +68,226 @@
        </item>
       </layout>
      </widget>
-     <widget class="QScrollArea" name="scrollArea">
-      <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
-      </property>
-      <property name="sizeAdjustPolicy">
-       <enum>QAbstractScrollArea::AdjustToContents</enum>
-      </property>
-      <property name="widgetResizable">
-       <bool>true</bool>
-      </property>
-      <widget class="QWidget" name="scrollAreaWidgetContents">
-       <property name="geometry">
-        <rect>
-         <x>0</x>
-         <y>0</y>
-         <width>247</width>
-         <height>637</height>
-        </rect>
-       </property>
-       <layout class="QVBoxLayout" name="scrollAreaWidgetContentsLayout">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QGroupBox" name="gb_patch_info">
-          <property name="title">
-           <string>Patch Information</string>
-          </property>
-          <layout class="QVBoxLayout" name="patch_info_gb_layout" stretch="0,0,0,0,0,0,0,1,0,0">
-           <item>
-            <widget class="QGroupBox" name="gb_title">
-             <property name="title">
-              <string>Game Title</string>
-             </property>
-             <layout class="QVBoxLayout" name="title_layout">
-              <item>
-               <widget class="QLabel" name="label_title">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="wordWrap">
-                 <bool>true</bool>
-                </property>
-                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+     <widget class="QWidget" name="verticalLayoutWidget_2">
+      <layout class="QVBoxLayout" name="patch_info_layout">
+       <item>
+        <widget class="QGroupBox" name="gb_patch_info">
+         <property name="title">
+          <string>Patch Information</string>
+         </property>
+         <layout class="QVBoxLayout" name="patch_info_gb_layout" stretch="0,0,0,0,0,0,0,1,0">
+          <item>
+           <widget class="QGroupBox" name="gb_title">
+            <property name="title">
+             <string>Game Title</string>
+            </property>
+            <layout class="QVBoxLayout" name="title_layout">
+             <item>
+              <widget class="QLabel" name="label_title">
+               <property name="text">
+                <string/>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="QGroupBox" name="gb_serial">
+            <property name="title">
+             <string>Serial</string>
+            </property>
+            <layout class="QVBoxLayout" name="serial_layout">
+             <item>
+              <widget class="QLabel" name="label_serial">
+               <property name="text">
+                <string/>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="QGroupBox" name="gb_app_version">
+            <property name="title">
+             <string>Game Version</string>
+            </property>
+            <layout class="QVBoxLayout" name="layout_app_version">
+             <item>
+              <widget class="QLabel" name="label_app_version">
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="QGroupBox" name="gb_hash">
+            <property name="title">
+             <string>Hash</string>
+            </property>
+            <layout class="QVBoxLayout" name="hash_layout">
+             <item>
+              <widget class="QLabel" name="label_hash">
+               <property name="text">
+                <string/>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="QGroupBox" name="gb_description">
+            <property name="title">
+             <string>Description</string>
+            </property>
+            <layout class="QVBoxLayout" name="description_layout">
+             <item>
+              <widget class="QLabel" name="label_description">
+               <property name="text">
+                <string/>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="QGroupBox" name="gb_patch_version">
+            <property name="title">
+             <string>Patch Version</string>
+            </property>
+            <layout class="QVBoxLayout" name="patch_version_layout">
+             <item>
+              <widget class="QLabel" name="label_patch_version">
+               <property name="text">
+                <string/>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="QGroupBox" name="gb_author">
+            <property name="title">
+             <string>Author</string>
+            </property>
+            <layout class="QVBoxLayout" name="author_layout">
+             <item>
+              <widget class="QLabel" name="label_author">
+               <property name="text">
+                <string/>
+               </property>
+               <property name="wordWrap">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="QGroupBox" name="gb_notes">
+            <property name="title">
+             <string>Notes</string>
+            </property>
+            <layout class="QVBoxLayout" name="notes_layout">
+             <item>
+              <widget class="QScrollArea" name="scrollArea_notes">
+               <property name="frameShape">
+                <enum>QFrame::NoFrame</enum>
+               </property>
+               <property name="lineWidth">
+                <number>0</number>
+               </property>
+               <property name="widgetResizable">
+                <bool>true</bool>
+               </property>
+               <widget class="QWidget" name="scrollAreaWidgetContents_notes">
+                <property name="geometry">
+                 <rect>
+                  <x>0</x>
+                  <y>0</y>
+                  <width>127</width>
+                  <height>85</height>
+                 </rect>
                 </property>
+                <layout class="QVBoxLayout" name="scrollAreaWidgetContents_notes_layout">
+                 <property name="spacing">
+                  <number>0</number>
+                 </property>
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label_notes">
+                   <property name="text">
+                    <string/>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+                   </property>
+                   <property name="wordWrap">
+                    <bool>true</bool>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
                </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="gb_serial">
-             <property name="title">
-              <string>Serial</string>
-             </property>
-             <layout class="QVBoxLayout" name="serial_layout">
-              <item>
-               <widget class="QLabel" name="label_serial">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="wordWrap">
-                 <bool>true</bool>
-                </property>
-                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="gb_app_version">
-             <property name="title">
-              <string>Game Version</string>
-             </property>
-             <layout class="QVBoxLayout" name="layout_app_version">
-              <item>
-               <widget class="QLabel" name="label_app_version">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="gb_hash">
-             <property name="title">
-              <string>Hash</string>
-             </property>
-             <layout class="QVBoxLayout" name="hash_layout">
-              <item>
-               <widget class="QLabel" name="label_hash">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="wordWrap">
-                 <bool>true</bool>
-                </property>
-                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="gb_description">
-             <property name="title">
-              <string>Description</string>
-             </property>
-             <layout class="QVBoxLayout" name="description_layout">
-              <item>
-               <widget class="QLabel" name="label_description">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="wordWrap">
-                 <bool>true</bool>
-                </property>
-                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="gb_patch_version">
-             <property name="title">
-              <string>Patch Version</string>
-             </property>
-             <layout class="QVBoxLayout" name="patch_version_layout">
-              <item>
-               <widget class="QLabel" name="label_patch_version">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="wordWrap">
-                 <bool>true</bool>
-                </property>
-                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="gb_author">
-             <property name="title">
-              <string>Author</string>
-             </property>
-             <layout class="QVBoxLayout" name="author_layout">
-              <item>
-               <widget class="QLabel" name="label_author">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="wordWrap">
-                 <bool>true</bool>
-                </property>
-                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="gb_notes">
-             <property name="title">
-              <string>Notes</string>
-             </property>
-             <layout class="QVBoxLayout" name="notes_layout">
-              <item>
-               <widget class="QLabel" name="label_notes">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-                </property>
-                <property name="wordWrap">
-                 <bool>true</bool>
-                </property>
-                <property name="textInteractionFlags">
-                 <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="gb_values">
-             <property name="title">
-              <string>Configurable Values</string>
-             </property>
-             <layout class="QHBoxLayout" name="horizontalLayout">
-              <item>
-               <widget class="QComboBox" name="configurable_selector">
-                <property name="placeholderText">
-                 <string>N/A</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QComboBox" name="configurable_combo_box">
-                <property name="placeholderText">
-                 <string>N/A</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QSpinBox" name="configurable_spin_box"/>
-              </item>
-              <item>
-               <widget class="QDoubleSpinBox" name="configurable_double_spin_box">
-                <property name="decimals">
-                 <number>10</number>
-                </property>
-                <property name="minimum">
-                 <double>-1000000.000000000000000</double>
-                </property>
-                <property name="maximum">
-                 <double>1000000.000000000000000</double>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <spacer name="verticalSpacerPatchInfo">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::MinimumExpanding</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacerPatchInfo">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::MinimumExpanding</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
      </widget>
     </widget>
    </item>
diff --git a/rpcs3/rpcs3qt/permissions.cpp b/rpcs3/rpcs3qt/permissions.cpp
deleted file mode 100644
index 03043792ff..0000000000
--- a/rpcs3/rpcs3qt/permissions.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "stdafx.h"
-#include "permissions.h"
-
-#include <qglobal.h>
-
-#if QT_CONFIG(permissions)
-#include <QApplication>
-#include <QPermissions>
-#endif
-
-LOG_CHANNEL(gui_log, "GUI");
-LOG_CHANNEL(camera_log, "Camera");
-
-namespace gui
-{
-	namespace utils
-	{
-		void check_microphone_permission()
-		{
-#if QT_CONFIG(permissions)
-			const QMicrophonePermission permission;
-			switch (qApp->checkPermission(permission))
-			{
-			case Qt::PermissionStatus::Undetermined:
-				gui_log.notice("Requesting microphone permission");
-				qApp->requestPermission(permission, []()
-				{
-					check_microphone_permission();
-				});
-				break;
-			case Qt::PermissionStatus::Denied:
-				gui_log.error("RPCS3 has no permissions to access microphones on this device.");
-				break;
-			case Qt::PermissionStatus::Granted:
-				gui_log.notice("Microphone permission granted");
-				break;
-			}
-#endif
-		}
-
-		bool check_camera_permission(void* obj, std::function<void()> repeat_callback, std::function<void()> denied_callback)
-		{
-#if QT_CONFIG(permissions)
-			const QCameraPermission permission;
-			switch (qApp->checkPermission(permission))
-			{
-			case Qt::PermissionStatus::Undetermined:
-				camera_log.notice("Requesting camera permission");
-				qApp->requestPermission(permission, static_cast<QObject*>(obj), [repeat_callback]()
-				{
-					if (repeat_callback) repeat_callback();
-				});
-				return false;
-			case Qt::PermissionStatus::Denied:
-				camera_log.error("RPCS3 has no permissions to access cameras on this device.");
-				if (denied_callback) denied_callback();
-				return false;
-			case Qt::PermissionStatus::Granted:
-				camera_log.notice("Camera permission granted");
-				break;
-			}
-#endif
-			return true;
-		}
-	}
-}
diff --git a/rpcs3/rpcs3qt/permissions.h b/rpcs3/rpcs3qt/permissions.h
deleted file mode 100644
index 4f7f6b2610..0000000000
--- a/rpcs3/rpcs3qt/permissions.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-namespace gui
-{
-	namespace utils
-	{
-		void check_microphone_permission();
-		bool check_camera_permission(void* obj, std::function<void()> repeat_callback, std::function<void()> denied_callback);
-	}
-}
diff --git a/rpcs3/rpcs3qt/persistent_settings.cpp b/rpcs3/rpcs3qt/persistent_settings.cpp
index c18f8a1a1d..aa173c1878 100644
--- a/rpcs3/rpcs3qt/persistent_settings.cpp
+++ b/rpcs3/rpcs3qt/persistent_settings.cpp
@@ -8,19 +8,19 @@ LOG_CHANNEL(cfg_log, "CFG");
 persistent_settings::persistent_settings(QObject* parent) : settings(parent)
 {
 	// Don't use the .ini file ending for now, as it will be confused for a regular gui_settings file.
-	m_settings = std::make_unique<QSettings>(ComputeSettingsDir() + gui::persistent::persistent_file_name + ".dat", QSettings::Format::IniFormat, parent);
+	m_settings.reset(new QSettings(ComputeSettingsDir() + gui::persistent::persistent_file_name + ".dat", QSettings::Format::IniFormat, parent));
 }
 
-void persistent_settings::SetPlaytime(const QString& serial, quint64 playtime, bool sync)
+void persistent_settings::SetPlaytime(const QString& serial, quint64 playtime)
 {
 	m_playtime[serial] = playtime;
-	SetValue(gui::persistent::playtime, serial, playtime, sync);
+	SetValue(gui::persistent::playtime, serial, playtime);
 }
 
-void persistent_settings::AddPlaytime(const QString& serial, quint64 elapsed, bool sync)
+void persistent_settings::AddPlaytime(const QString& serial, quint64 elapsed)
 {
 	const quint64 playtime = GetValue(gui::persistent::playtime, serial, 0).toULongLong();
-	SetPlaytime(serial, playtime + elapsed, sync);
+	SetPlaytime(serial, playtime + elapsed);
 }
 
 quint64 persistent_settings::GetPlaytime(const QString& serial)
@@ -28,10 +28,10 @@ quint64 persistent_settings::GetPlaytime(const QString& serial)
 	return m_playtime[serial];
 }
 
-void persistent_settings::SetLastPlayed(const QString& serial, const QString& date, bool sync)
+void persistent_settings::SetLastPlayed(const QString& serial, const QString& date)
 {
 	m_last_played[serial] = date;
-	SetValue(gui::persistent::last_played, serial, date, sync);
+	SetValue(gui::persistent::last_played, serial, date);
 }
 
 QString persistent_settings::GetLastPlayed(const QString& serial)
@@ -54,6 +54,6 @@ QString persistent_settings::GetCurrentUser(const QString& fallback) const
 		return user;
 	}
 
-	cfg_log.fatal("Could not parse user setting: '%s'.", user);
+	cfg_log.fatal("Could not parse user setting: '%s'.", user.toStdString());
 	return QString();
 }
diff --git a/rpcs3/rpcs3qt/persistent_settings.h b/rpcs3/rpcs3qt/persistent_settings.h
index aece75c538..c016e99003 100644
--- a/rpcs3/rpcs3qt/persistent_settings.h
+++ b/rpcs3/rpcs3qt/persistent_settings.h
@@ -16,10 +16,9 @@ namespace gui
 		const QString titles      = "Titles";
 
 		// Date format
-		const QString last_played_date_format_old                  = "MMMM d yyyy";
-		const QString last_played_date_format_new                  = "MMMM d, yyyy";
-		const QString last_played_date_with_time_of_day_format     = "MMMM d, yyyy HH:mm";
-		const Qt::DateFormat last_played_date_format               = Qt::DateFormat::ISODate;
+		const QString last_played_date_format_old    = "MMMM d yyyy";
+		const QString last_played_date_format_new    = "MMMM d, yyyy";
+		const Qt::DateFormat last_played_date_format = Qt::DateFormat::ISODate;
 
 		// GUI Saves
 		const gui_save save_notes  = gui_save(savedata, "notes",       QVariantMap());
@@ -38,13 +37,13 @@ public:
 	QString GetCurrentUser(const QString& fallback) const;
 
 public Q_SLOTS:
-	void SetPlaytime(const QString& serial, quint64 playtime, bool sync);
-	void AddPlaytime(const QString& serial, quint64 elapsed, bool sync);
+	void SetPlaytime(const QString& serial, quint64 playtime);
+	void AddPlaytime(const QString& serial, quint64 elapsed);
 	quint64 GetPlaytime(const QString& serial);
 
-	void SetLastPlayed(const QString& serial, const QString& date, bool sync);
+	void SetLastPlayed(const QString& serial, const QString& date);
 	QString GetLastPlayed(const QString& serial);
 private:
-	std::map<QString, quint64> m_playtime;
-	std::map<QString, QString> m_last_played;
+	QMap<QString, quint64> m_playtime;
+	QMap<QString, QString> m_last_played;
 };
diff --git a/rpcs3/rpcs3qt/pkg_install_dialog.cpp b/rpcs3/rpcs3qt/pkg_install_dialog.cpp
index 11431b2ad4..185bf4d6fc 100644
--- a/rpcs3/rpcs3qt/pkg_install_dialog.cpp
+++ b/rpcs3/rpcs3qt/pkg_install_dialog.cpp
@@ -68,7 +68,7 @@ pkg_install_dialog::pkg_install_dialog(const QStringList& paths, game_compatibil
 		else if (!info.local_cat.isEmpty())
 		{
 			append_comma();
-			accumulated_info += info.local_cat;
+			accumulated_info += tr("%0", "Package type info").arg(info.local_cat);
 		}
 
 		if (!info.version.isEmpty())
diff --git a/rpcs3/rpcs3qt/progress_dialog.cpp b/rpcs3/rpcs3qt/progress_dialog.cpp
index b5b89dd3b9..1003b221de 100644
--- a/rpcs3/rpcs3qt/progress_dialog.cpp
+++ b/rpcs3/rpcs3qt/progress_dialog.cpp
@@ -1,9 +1,16 @@
 #include "progress_dialog.h"
 
-#include <QApplication>
+#include <QCoreApplication>
 #include <QLabel>
 
-progress_dialog::progress_dialog(const QString& windowTitle, const QString& labelText, const QString& cancelButtonText, int minimum, int maximum, bool delete_on_close, QWidget* parent, Qt::WindowFlags flags)
+#ifdef _WIN32
+#include <QWinTHumbnailToolbutton>
+#elif HAVE_QTDBUS
+#include <QtDBus/QDBusMessage>
+#include <QtDBus/QDBusConnection>
+#endif
+
+progress_dialog::progress_dialog(const QString &windowTitle, const QString &labelText, const QString &cancelButtonText, int minimum, int maximum, bool delete_on_close, QWidget *parent, Qt::WindowFlags flags)
 	: QProgressDialog(labelText, cancelButtonText, minimum, maximum, parent, flags)
 {
 	setWindowTitle(windowTitle);
@@ -13,41 +20,69 @@ progress_dialog::progress_dialog(const QString& windowTitle, const QString& labe
 
 	if (delete_on_close)
 	{
-		SetDeleteOnClose();
+		connect(this, &QProgressDialog::canceled, this, &QProgressDialog::deleteLater);
 	}
 
-	m_progress_indicator = std::make_unique<progress_indicator>(minimum, maximum);
+#ifdef _WIN32
+	m_tb_button = std::make_unique<QWinTaskbarButton>();
+	m_tb_button->setWindow(parent ? parent->windowHandle() : windowHandle());
+	m_tb_progress = m_tb_button->progress();
+	m_tb_progress->setRange(minimum, maximum);
+	m_tb_progress->setVisible(true);
+#elif HAVE_QTDBUS
+	UpdateProgress(0);
+#endif
 }
 
 progress_dialog::~progress_dialog()
 {
-}
-
-void progress_dialog::SetRange(int min, int max)
-{
-	m_progress_indicator->set_range(min, max);
-
-	setRange(min, max);
+#ifdef _WIN32
+	// QWinTaskbarProgress::hide() will crash if the application is already about to close, even if the object is not null.
+	if (!QCoreApplication::closingDown())
+	{
+		m_tb_progress->hide();
+	}
+#elif HAVE_QTDBUS
+	UpdateProgress(0);
+#endif
 }
 
 void progress_dialog::SetValue(int progress)
 {
 	const int value = std::clamp(progress, minimum(), maximum());
 
-	m_progress_indicator->set_value(value);
+#ifdef _WIN32
+	m_tb_progress->setValue(value);
+#elif HAVE_QTDBUS
+	UpdateProgress(value);
+#endif
 
-	setValue(value);
-}
-
-void progress_dialog::SetDeleteOnClose()
-{
-	setAttribute(Qt::WA_DeleteOnClose);
-	connect(this, &QProgressDialog::canceled, this, &QProgressDialog::close, Qt::UniqueConnection);
+	QProgressDialog::setValue(value);
 }
 
 void progress_dialog::SignalFailure() const
 {
-	m_progress_indicator->signal_failure();
-
-	QApplication::beep();
+#ifdef _WIN32
+	m_tb_progress->stop();
+#endif
+	// TODO: Implement an equivalent for Linux, if possible
 }
+
+#ifdef HAVE_QTDBUS
+void progress_dialog::UpdateProgress(int progress, bool disable)
+{
+	QDBusMessage message = QDBusMessage::createSignal(
+		QStringLiteral("/"),
+		QStringLiteral("com.canonical.Unity.LauncherEntry"),
+		QStringLiteral("Update"));
+	QVariantMap properties;
+	if (disable)
+		properties.insert(QStringLiteral("progress-visible"), false);
+	else
+		properties.insert(QStringLiteral("progress-visible"), true);
+	//Progress takes a value from 0.0 to 0.1
+	properties.insert(QStringLiteral("progress"), 1. * progress / maximum());
+	message << QStringLiteral("application://rpcs3.desktop") << properties;
+	QDBusConnection::sessionBus().send(message);
+}
+#endif
diff --git a/rpcs3/rpcs3qt/progress_dialog.h b/rpcs3/rpcs3qt/progress_dialog.h
index 930ce2cb07..549373dad7 100644
--- a/rpcs3/rpcs3qt/progress_dialog.h
+++ b/rpcs3/rpcs3qt/progress_dialog.h
@@ -1,19 +1,25 @@
 #pragma once
 
-#include "progress_indicator.h"
-
 #include <QProgressDialog>
 
+#ifdef _WIN32
+#include <QWinTaskbarProgress>
+#include <QWinTaskbarButton>
+#endif
+
 class progress_dialog : public QProgressDialog
 {
 public:
-	progress_dialog(const QString& windowTitle, const QString& labelText, const QString& cancelButtonText, int minimum, int maximum, bool delete_on_close, QWidget* parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags());
+	progress_dialog(const QString &windowTitle, const QString &labelText, const QString &cancelButtonText, int minimum, int maximum, bool delete_on_close, QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags());
 	~progress_dialog();
-	void SetRange(int min, int max);
 	void SetValue(int progress);
-	void SetDeleteOnClose();
 	void SignalFailure() const;
 
 private:
-	std::unique_ptr<progress_indicator> m_progress_indicator;
+#ifdef _WIN32
+	std::unique_ptr<QWinTaskbarButton> m_tb_button = nullptr;
+	QWinTaskbarProgress* m_tb_progress = nullptr;
+#elif HAVE_QTDBUS
+	void UpdateProgress(int progress, bool disable = false);
+#endif
 };
diff --git a/rpcs3/rpcs3qt/progress_indicator.cpp b/rpcs3/rpcs3qt/progress_indicator.cpp
deleted file mode 100644
index 148b304ad9..0000000000
--- a/rpcs3/rpcs3qt/progress_indicator.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "stdafx.h"
-#include "progress_indicator.h"
-
-#if HAVE_QTDBUS
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusConnection>
-#endif
-
-progress_indicator::progress_indicator(int minimum, int maximum)
-{
-	m_minimum = minimum;
-	m_maximum = maximum;
-#if HAVE_QTDBUS
-	update_progress(0, true, false);
-#endif
-}
-
-progress_indicator::~progress_indicator()
-{
-#if HAVE_QTDBUS
-	update_progress(0, false, false);
-#endif
-}
-
-int progress_indicator::value() const
-{
-	return m_value;
-}
-
-void progress_indicator::set_value(int value)
-{
-	m_value = std::clamp(value, m_minimum, m_maximum);
-#if HAVE_QTDBUS
-	update_progress(m_value, true, false);
-#endif
-}
-
-void progress_indicator::set_range(int minimum, int maximum)
-{
-	m_minimum = minimum;
-	m_maximum = maximum;
-}
-
-void progress_indicator::reset()
-{
-	m_value = m_minimum;
-#if HAVE_QTDBUS
-	update_progress(m_value, false, false);
-#endif
-}
-
-void progress_indicator::signal_failure()
-{
-#if HAVE_QTDBUS
-	update_progress(0, false, true);
-#endif
-}
-
-#if HAVE_QTDBUS
-void progress_indicator::update_progress(int progress, bool progress_visible, bool urgent)
-{
-	QVariantMap properties;
-	properties.insert(QStringLiteral("urgent"), urgent);
-
-	if (!urgent)
-	{
-		// Progress takes a value from 0.0 to 0.1
-		properties.insert(QStringLiteral("progress"), 1. * progress / m_maximum);
-		properties.insert(QStringLiteral("progress-visible"), progress_visible);
-	}
-
-	QDBusMessage message = QDBusMessage::createSignal(
-		QStringLiteral("/"),
-		QStringLiteral("com.canonical.Unity.LauncherEntry"),
-		QStringLiteral("Update"));
-
-	message << QStringLiteral("application://rpcs3.desktop") << properties;
-
-	QDBusConnection::sessionBus().send(message);
-}
-#endif
diff --git a/rpcs3/rpcs3qt/progress_indicator.h b/rpcs3/rpcs3qt/progress_indicator.h
deleted file mode 100644
index 224388801f..0000000000
--- a/rpcs3/rpcs3qt/progress_indicator.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-class progress_indicator
-{
-public:
-	progress_indicator(int minimum, int maximum);
-	~progress_indicator();
-
-	int value() const;
-
-	void set_value(int value);
-	void set_range(int minimum, int maximum);
-	void reset();
-	void signal_failure();
-
-private:
-	int m_value = 0;
-	int m_minimum = 0;
-	int m_maximum = 100;
-#if HAVE_QTDBUS
-	void update_progress(int progress, bool progress_visible, bool urgent);
-#endif
-};
diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp
deleted file mode 100644
index f00d66245a..0000000000
--- a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp
+++ /dev/null
@@ -1,600 +0,0 @@
-#include "stdafx.h"
-#include "ps_move_tracker_dialog.h"
-#include "ui_ps_move_tracker_dialog.h"
-#include "Emu/Cell/Modules/cellCamera.h"
-#include "qt_camera_handler.h"
-#include "Input/ps_move_handler.h"
-#include "Input/ps_move_config.h"
-#include "Input/ps_move_tracker.h"
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QImage>
-#include <QPainter>
-#include <QPushButton>
-#include <QSlider>
-#include <QMessageBox>
-
-LOG_CHANNEL(ps_move);
-
-extern u32 get_buffer_size_by_format(s32, s32, s32);
-
-static constexpr bool tie_hue_to_color = true;
-static constexpr int radius_range = 1000;
-static const constexpr f64 min_radius_conversion = radius_range / g_cfg_move.min_radius.max;
-static const constexpr f64 max_radius_conversion = radius_range / g_cfg_move.max_radius.max;
-
-extern void qt_events_aware_op(int repeat_duration_ms, std::function<bool()> wrapped_op);
-
-ps_move_tracker_dialog::ps_move_tracker_dialog(QWidget* parent)
-	: QDialog(parent)
-	, ui(new Ui::ps_move_tracker_dialog)
-{
-	ui->setupUi(this);
-
-	if (!g_cfg_move.load())
-	{
-		ps_move.notice("Could not load PS Move config. Using defaults.");
-	}
-
-	setAttribute(Qt::WA_DeleteOnClose);
-
-	connect(ui->buttonBox, &QDialogButtonBox::clicked, this, [this](QAbstractButton* button)
-	{
-		if (button == ui->buttonBox->button(QDialogButtonBox::Save))
-		{
-			g_cfg_move.save();
-		}
-		else if (button == ui->buttonBox->button(QDialogButtonBox::Apply))
-		{
-			g_cfg_move.save();
-		}
-		else if (button == ui->buttonBox->button(QDialogButtonBox::Close))
-		{
-			if (!g_cfg_move.load())
-			{
-				ps_move.notice("Could not load PS Move config. Using defaults.");
-			}
-		}
-	});
-
-	m_format = CELL_CAMERA_RGBA;
-	ui->inputFormatCombo->addItem(tr("RGBA"), static_cast<int>(CELL_CAMERA_RGBA));
-	ui->inputFormatCombo->addItem(tr("RAW8"), static_cast<int>(CELL_CAMERA_RAW8));
-	ui->inputFormatCombo->setCurrentIndex(ui->inputFormatCombo->findData(m_format));
-
-	connect(ui->inputFormatCombo, &QComboBox::currentIndexChanged, this, [this](int index)
-	{
-		if (index < 0) return;
-		if (const auto qvar = ui->inputFormatCombo->currentData(); qvar.canConvert<int>())
-		{
-			m_format = qvar.toInt();
-			reset_camera();
-		}
-	});
-
-	ui->viewCombo->addItem(tr("Image"), static_cast<int>(view_mode::image));
-	ui->viewCombo->addItem(tr("Grayscale"), static_cast<int>(view_mode::grayscale));
-	ui->viewCombo->addItem(tr("HSV Hue"), static_cast<int>(view_mode::hsv_hue));
-	ui->viewCombo->addItem(tr("HSV Saturation"), static_cast<int>(view_mode::hsv_saturation));
-	ui->viewCombo->addItem(tr("HSV Value"), static_cast<int>(view_mode::hsv_value));
-	ui->viewCombo->addItem(tr("Binary"), static_cast<int>(view_mode::binary));
-	ui->viewCombo->addItem(tr("Contours"), static_cast<int>(view_mode::contours));
-	ui->viewCombo->setCurrentIndex(ui->viewCombo->findData(static_cast<int>(m_view_mode)));
-
-	connect(ui->viewCombo, &QComboBox::currentIndexChanged, this, [this](int index)
-	{
-		if (index < 0) return;
-		if (const auto qvar = ui->viewCombo->currentData(); qvar.canConvert<int>())
-		{
-			m_view_mode = static_cast<view_mode>(qvar.toInt());
-		}
-	});
-
-	ui->histoCombo->addItem(tr("Hues"), static_cast<int>(histo_mode::unfiltered_hues));
-	ui->histoCombo->setCurrentIndex(ui->viewCombo->findData(static_cast<int>(m_histo_mode)));
-
-	connect(ui->histoCombo, &QComboBox::currentIndexChanged, this, [this](int index)
-	{
-		if (index < 0) return;
-		if (const auto qvar = ui->histoCombo->currentData(); qvar.canConvert<int>())
-		{
-			m_histo_mode = static_cast<histo_mode>(qvar.toInt());
-		}
-	});
-
-	connect(ui->hueSlider, &QSlider::valueChanged, this, [this](int value)
-	{
-		cfg_ps_move* config = ::at32(g_cfg_move.move, m_index);
-		const u16 hue = std::clamp<u16>(value, config->hue.min, config->hue.max);
-		config->hue.set(hue);
-		update_hue();
-	});
-	ui->hueSlider->setRange(g_cfg_move.move1.hue.min, g_cfg_move.move1.hue.max);
-
-	connect(ui->hueThresholdSlider, &QSlider::valueChanged, this, [this](int value)
-	{
-		cfg_ps_move* config = ::at32(g_cfg_move.move, m_index);
-		const u16 hue_threshold = std::clamp<u16>(value, config->hue_threshold.min, config->hue_threshold.max);
-		config->hue_threshold.set(hue_threshold);
-		update_hue_threshold();
-	});
-	ui->hueThresholdSlider->setRange(g_cfg_move.move1.hue_threshold.min, g_cfg_move.move1.hue_threshold.max);
-
-	connect(ui->saturationThresholdSlider, &QSlider::valueChanged, this, [this](int value)
-	{
-		cfg_ps_move* config = ::at32(g_cfg_move.move, m_index);
-		const u16 saturation_threshold = std::clamp<u16>(value, config->saturation_threshold.min, config->saturation_threshold.max);
-		config->saturation_threshold.set(saturation_threshold);
-		update_saturation_threshold();
-	});
-	ui->saturationThresholdSlider->setRange(g_cfg_move.move1.saturation_threshold.min, g_cfg_move.move1.saturation_threshold.max);
-
-	connect(ui->minRadiusSlider, &QSlider::valueChanged, this, [this](int value)
-	{
-		const f32 min_radius = std::clamp(value / min_radius_conversion, g_cfg_move.min_radius.min, g_cfg_move.min_radius.max);
-		g_cfg_move.min_radius.set(min_radius);
-		update_min_radius();
-	});
-	ui->minRadiusSlider->setRange(0, radius_range);
-
-	connect(ui->maxRadiusSlider, &QSlider::valueChanged, this, [this](int value)
-	{
-		const f32 max_radius = std::clamp(value / max_radius_conversion, g_cfg_move.max_radius.min, g_cfg_move.max_radius.max);
-		g_cfg_move.max_radius.set(max_radius);
-		update_max_radius();
-	});
-	ui->maxRadiusSlider->setRange(0, radius_range);
-
-	connect(ui->colorSliderR, &QSlider::valueChanged, this, [this](int value)
-	{
-		cfg_ps_move* config = ::at32(g_cfg_move.move, m_index);
-		config->r.set(std::clamp<u8>(value, config->r.min, config->r.max));
-		update_color();
-	});
-	connect(ui->colorSliderG, &QSlider::valueChanged, this, [this](int value)
-	{
-		cfg_ps_move* config = ::at32(g_cfg_move.move, m_index);
-		config->g.set(std::clamp<u8>(value, config->g.min, config->g.max));
-		update_color();
-	});
-	connect(ui->colorSliderB, &QSlider::valueChanged, this, [this](int value)
-	{
-		cfg_ps_move* config = ::at32(g_cfg_move.move, m_index);
-		config->b.set(std::clamp<u8>(value, config->b.min, config->b.max));
-		update_color();
-	});
-	ui->colorSliderR->setRange(g_cfg_move.move1.r.min, g_cfg_move.move1.r.max);
-	ui->colorSliderG->setRange(g_cfg_move.move1.g.min, g_cfg_move.move1.g.max);
-	ui->colorSliderB->setRange(g_cfg_move.move1.b.min, g_cfg_move.move1.b.max);
-
-	connect(ui->filterSmallContoursBox, &QCheckBox::toggled, [this](bool checked)
-	{
-		m_filter_small_contours = checked;
-	});
-	ui->filterSmallContoursBox->setChecked(m_filter_small_contours);
-
-	connect(ui->freezeFrameBox, &QCheckBox::toggled, [this](bool checked)
-	{
-		m_freeze_frame = checked;
-	});
-	ui->freezeFrameBox->setChecked(m_freeze_frame);
-
-	connect(ui->showAllContoursBox, &QCheckBox::toggled, [this](bool checked)
-	{
-		m_show_all_contours = checked;
-	});
-	ui->showAllContoursBox->setChecked(m_show_all_contours);
-
-	connect(ui->drawContoursBox, &QCheckBox::toggled, [this](bool checked)
-	{
-		m_draw_contours = checked;
-	});
-	ui->drawContoursBox->setChecked(m_draw_contours);
-
-	connect(ui->drawOverlaysBox, &QCheckBox::toggled, [this](bool checked)
-	{
-		m_draw_overlays = checked;
-	});
-	ui->drawOverlaysBox->setChecked(m_draw_overlays);
-
-	for (u32 index = 0; index < CELL_GEM_MAX_NUM; index++)
-	{
-		ui->comboSelectDevice->addItem(tr("PS Move #%0").arg(index + 1), index);
-	}
-	ui->comboSelectDevice->setCurrentIndex(ui->comboSelectDevice->findData(m_index));
-
-	connect(ui->comboSelectDevice, &QComboBox::currentIndexChanged, this, [this](int index)
-	{
-		if (index < 0) return;
-		if (const auto qvar = ui->comboSelectDevice->currentData(); qvar.canConvert<int>())
-		{
-			m_index = qvar.toInt();
-			update_color(true);
-			update_hue(true);
-			update_hue_threshold(true);
-			update_saturation_threshold(true);
-		}
-	});
-
-	m_ps_move_tracker = std::make_unique<ps_move_tracker<true>>();
-
-	m_update_timer = new QTimer(this);
-	connect(m_update_timer, &QTimer::timeout, this, [this]()
-	{
-		std::lock_guard lock(m_image_mutex);
-
-		if (m_image.isNull() || m_histogram.isNull())
-			return;
-
-		ui->imageLabel->setPixmap(m_image);
-		ui->histogramLabel->setPixmap(m_histogram);
-	});
-
-	reset_camera();
-
-	m_input_thread = std::make_unique<named_thread<pad_thread>>(thread(), window(), "");
-	qt_events_aware_op(0, [](){ return !!pad::g_started; });
-
-	adjustSize();
-
-	update_color(true);
-	update_hue(true);
-	update_hue_threshold(true);
-	update_saturation_threshold(true);
-	update_min_radius(true);
-	update_max_radius(true);
-
-	if constexpr (!g_ps_move_tracking_supported)
-	{
-		QTimer::singleShot(1000, this, [this]()
-		{
-			QMessageBox::warning(this, QObject::tr("Tracking not supported!"), QObject::tr("The PS Move tracking is not yet supported on this operating system."));
-		});
-	}
-}
-
-ps_move_tracker_dialog::~ps_move_tracker_dialog()
-{
-	m_update_timer->stop();
-
-	if (m_tracker_thread)
-	{
-		m_stop_threads = 1;
-		m_tracker_thread->wait();
-	}
-
-	if (m_camera_handler)
-	{
-		m_camera_handler->close_camera();
-	}
-
-	// Join thread
-	m_input_thread.reset();
-}
-
-void ps_move_tracker_dialog::update_color(bool update_sliders)
-{
-	cfg_ps_move* config = ::at32(g_cfg_move.move, m_index);
-
-	ui->colorGb->setTitle(tr("Color: R=%0, G=%1, B=%2").arg(config->r.get()).arg(config->g.get()).arg(config->b.get()));
-
-	if (update_sliders)
-	{
-		ui->colorSliderR->setValue(config->r.get());
-		ui->colorSliderG->setValue(config->g.get());
-		ui->colorSliderB->setValue(config->b.get());
-	}
-	else if (tie_hue_to_color)
-	{
-		const auto [hue, saturation, value] = ps_move_tracker<true>::rgb_to_hsv(config->r.get() / 255.0f, config->g.get() / 255.0f, config->b.get() / 255.0f);
-		config->hue.set(std::clamp<u32>(hue, config->hue.min, config->hue.max));
-		update_hue(true);
-	}
-
-	if (!m_input_thread)
-	{
-		return;
-	}
-
-	std::lock_guard lock(pad::g_pad_mutex);
-	auto& handlers = m_input_thread->get_handlers();
-	if (auto it = handlers.find(pad_handler::move); it != handlers.end())
-	{
-		for (auto& binding : it->second->bindings())
-		{
-			if (binding.device)
-			{
-				binding.device->color_override_active = true;
-				binding.device->color_override.r = config->r.get();
-				binding.device->color_override.g = config->g.get();
-				binding.device->color_override.b = config->b.get();
-			}
-		}
-	}
-}
-
-void ps_move_tracker_dialog::update_hue(bool update_slider)
-{
-	const u32 hue = ::at32(g_cfg_move.move, m_index)->hue.get();
-	ui->hueGb->setTitle(tr("Hue: %0").arg(hue));
-
-	if (update_slider)
-	{
-		ui->hueSlider->setValue(hue);
-	}
-	else if (tie_hue_to_color)
-	{
-		cfg_ps_move* config = ::at32(g_cfg_move.move, m_index);
-		const auto [r, g, b] = ps_move_tracker<true>::hsv_to_rgb(hue, 1.0f, 1.0f);
-		config->r.set(r / 100);
-		config->g.set(g / 100);
-		config->b.set(b / 100);
-		update_color(true);
-	}
-}
-
-void ps_move_tracker_dialog::update_hue_threshold(bool update_slider)
-{
-	const u32 hue_threshold = ::at32(g_cfg_move.move, m_index)->hue_threshold.get();
-	ui->hueThresholdGb->setTitle(tr("Hue Threshold: %0").arg(hue_threshold));
-
-	if (update_slider)
-	{
-		ui->hueThresholdSlider->setValue(hue_threshold);
-	}
-}
-
-void ps_move_tracker_dialog::update_saturation_threshold(bool update_slider)
-{
-	const u32 saturation_threshold = ::at32(g_cfg_move.move, m_index)->saturation_threshold.get();
-	ui->saturationThresholdGb->setTitle(tr("Saturation Threshold: %0").arg(saturation_threshold));
-
-	if (update_slider)
-	{
-		ui->saturationThresholdSlider->setValue(saturation_threshold);
-	}
-}
-
-void ps_move_tracker_dialog::update_min_radius(bool update_slider)
-{
-	ui->minRadiusGb->setTitle(tr("Min Radius: %0 %").arg(g_cfg_move.min_radius.get()));
-
-	if (update_slider)
-	{
-		ui->minRadiusSlider->setValue(g_cfg_move.min_radius * min_radius_conversion);
-	}
-}
-
-void ps_move_tracker_dialog::update_max_radius(bool update_slider)
-{
-	ui->maxRadiusGb->setTitle(tr("Max Radius: %0 %").arg(g_cfg_move.max_radius.get()));
-
-	if (update_slider)
-	{
-		ui->maxRadiusSlider->setValue(g_cfg_move.max_radius * max_radius_conversion);
-	}
-}
-
-void ps_move_tracker_dialog::reset_camera()
-{
-	m_update_timer->stop();
-
-	if (m_tracker_thread)
-	{
-		m_stop_threads = 1;
-		m_tracker_thread->wait();
-		m_stop_threads = 0;
-	}
-
-	std::lock_guard camera_lock(m_camera_handler_mutex);
-
-	const u64 size = get_buffer_size_by_format(m_format, width, height);
-	m_image_data_frozen.resize(size);
-	m_image_data.resize(size);
-	m_frame_number = 0;
-
-	m_camera_handler = std::make_unique<qt_camera_handler>();
-	m_camera_handler->set_resolution(width, height);
-	m_camera_handler->set_format(m_format, size);
-	m_camera_handler->set_mirrored(true);
-	m_camera_handler->open_camera();
-	m_camera_handler->start_camera();
-
-	m_update_timer->start(1000 / 60);
-
-	m_tracker_thread.reset(QThread::create([this]()
-	{
-		while (!m_stop_threads)
-		{
-			process_camera_frame();
-		}
-	}));
-	m_tracker_thread->start();
-}
-
-void ps_move_tracker_dialog::process_camera_frame()
-{
-	std::lock_guard camera_lock(m_camera_handler_mutex);
-
-	if (!m_camera_handler || m_camera_handler->get_state() == qt_camera_handler::camera_handler_state::closed)
-	{
-		// Wait some time
-		std::this_thread::sleep_for(100us);
-		return;
-	}
-
-	u32 width = 0;
-	u32 height = 0;
-	u64 frame_number = 0;
-	u64 bytes_read = 0;
-
-	const camera_handler_base::camera_handler_state state = m_camera_handler->get_image(m_image_data.data(), m_image_data.size(), width, height, frame_number, bytes_read);
-
-	if (state != camera_handler_base::camera_handler_state::running || frame_number <= m_frame_number)
-	{
-		// Wait some time
-		std::this_thread::sleep_for(100us);
-		return;
-	}
-
-	m_frame_number = frame_number;
-
-	if (m_frame_frozen != m_freeze_frame)
-	{
-		m_frame_frozen = m_freeze_frame;
-
-		if (m_frame_frozen)
-		{
-			std::memcpy(m_image_data_frozen.data(), m_image_data.data(), m_image_data.size());
-		}
-	}
-
-	for (u32 index = 0; index < CELL_GEM_MAX_NUM; index++)
-	{
-		const cfg_ps_move* config = g_cfg_move.move[index];
-
-		m_ps_move_tracker->set_active(index, m_index == index);
-		m_ps_move_tracker->set_hue(index, config->hue);
-		m_ps_move_tracker->set_hue_threshold(index, config->hue_threshold);
-		m_ps_move_tracker->set_saturation_threshold(index, config->saturation_threshold);
-	}
-
-	m_ps_move_tracker->set_image_data(m_frame_frozen ? m_image_data_frozen.data() : m_image_data.data(), m_image_data.size(), width, height, m_camera_handler->format());
-	m_ps_move_tracker->set_min_radius(static_cast<f32>(g_cfg_move.min_radius) / 100.0f);
-	m_ps_move_tracker->set_max_radius(static_cast<f32>(g_cfg_move.max_radius) / 100.0f);
-	m_ps_move_tracker->set_filter_small_contours(m_filter_small_contours);
-	m_ps_move_tracker->set_show_all_contours(m_show_all_contours);
-	m_ps_move_tracker->set_draw_contours(m_draw_contours);
-	m_ps_move_tracker->set_draw_overlays(m_draw_overlays);
-	m_ps_move_tracker->process_image();
-
-	const std::vector<u8>* result = nullptr;
-	QImage::Format format = QImage::Format::Format_Invalid;
-	qsizetype bytes_per_line = 0;
-
-	switch (m_view_mode)
-	{
-	case view_mode::image:
-	{
-		result = &m_ps_move_tracker->rgba();
-		format = QImage::Format::Format_RGBA8888;
-		bytes_per_line = width * 4;
-		break;
-	}
-	case view_mode::grayscale:
-	{
-		result = &m_ps_move_tracker->gray();
-		format = QImage::Format::Format_Grayscale8;
-		bytes_per_line = width;
-		break;
-	}
-	case view_mode::hsv_hue:
-	case view_mode::hsv_saturation:
-	case view_mode::hsv_value:
-	{
-		const int index = static_cast<int>(m_view_mode) - static_cast<int>(view_mode::hsv_hue);
-		const std::vector<u8>& hsv = m_ps_move_tracker->hsv();
-		static std::vector<u8> hsv_single;
-		hsv_single.resize(hsv.size() / 3);
-		for (int i = 0; i < static_cast<int>(hsv_single.size()); i++)
-		{
-			hsv_single[i] = hsv[i * 3 + index];
-		}
-		result = &hsv_single;
-		format = QImage::Format::Format_Grayscale8;
-		bytes_per_line = width;
-		break;
-	}
-	case view_mode::binary:
-	{
-		result = &m_ps_move_tracker->binary(m_index);
-		format = QImage::Format::Format_Grayscale8;
-		bytes_per_line = width;
-		break;
-	}
-	case view_mode::contours:
-	{
-		result = &m_ps_move_tracker->rgba_contours();
-		format = QImage::Format::Format_RGBA8888;
-		bytes_per_line = width * 4;
-		break;
-	}
-	}
-
-	QPixmap histogram;
-
-	switch (m_histo_mode)
-	{
-	case histo_mode::unfiltered_hues:
-	{
-		histogram = get_histogram(m_ps_move_tracker->hues(), false);
-		break;
-	}
-	}
-
-	const QImage image(result->data(), width, height, bytes_per_line, format, nullptr, nullptr);
-
-	std::lock_guard lock(m_image_mutex);
-	m_image = QPixmap::fromImage(image);
-	m_histogram = std::move(histogram);
-}
-
-QPixmap ps_move_tracker_dialog::get_histogram(const std::array<u32, 360>& hues, bool ignore_zero) const
-{
-	// Create image
-	const int height = ui->histogramLabel->height();
-	static QPixmap background = [&]()
-	{
-		// Paint background
-		QPixmap pxmap(static_cast<int>(hues.size()), height);
-		pxmap.fill(Qt::white);
-		return pxmap;
-	}();
-
-	QPixmap histo = background;
-	QPainter painter(&histo);
-
-	const cfg_ps_move* config = ::at32(g_cfg_move.move, m_index);
-	const u16 hue = config->hue;
-	const u16 hue_threshold = config->hue_threshold;
-	const int min_hue = hue - hue_threshold;
-	const int max_hue = hue + hue_threshold;
-
-	// Paint hue threshold
-	painter.fillRect(min_hue, 0, hue_threshold * 2 + 1, histo.height(), Qt::lightGray);
-
-	if (min_hue < 0)
-	{
-		painter.fillRect(min_hue + 360, 0, hue_threshold * 2 + 1, histo.height(), Qt::lightGray);
-	}
-	else if (max_hue >= 360)
-	{
-		painter.fillRect(0, 0, max_hue - 360, histo.height(), Qt::lightGray);
-	}
-
-	// Paint target hue
-	const auto [r, g, b] = ps_move_tracker<true>::hsv_to_rgb(hue, 1.0f, 1.0f);
-	painter.setPen(QColor(r, g, b));
-	painter.drawLine(hue, 0, hue, histo.height() - 1);
-
-	// Paint histogram
-	painter.setPen(Qt::black);
-
-	const u32 zero_offset = (ignore_zero ? 1 : 0);
-
-	const auto max_elem = std::max_element(hues.begin() + zero_offset, hues.end());
-	const u32 max_value = max_elem != hues.end() ? *max_elem : 0u;
-
-	if (!max_value)
-		return histo;
-
-	for (int i = zero_offset; i < static_cast<int>(hues.size()); i++)
-	{
-		const int bar_height = (hues[i] / static_cast<float>(max_value)) * height;
-		if (bar_height <= 0) continue;
-		painter.drawLine(i, height - 1, i, height - bar_height);
-	}
-
-	return histo;
-}
diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.h b/rpcs3/rpcs3qt/ps_move_tracker_dialog.h
deleted file mode 100644
index fe3b043b26..0000000000
--- a/rpcs3/rpcs3qt/ps_move_tracker_dialog.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#pragma once
-
-#include "Utilities/Thread.h"
-#include "Input/pad_thread.h"
-
-#include <QDialog>
-#include <QPixmap>
-#include <QTimer>
-#include <QThread>
-
-class qt_camera_handler;
-class pad_thread;
-template <bool> class ps_move_tracker;
-
-namespace Ui
-{
-	class ps_move_tracker_dialog;
-}
-
-class ps_move_tracker_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	ps_move_tracker_dialog(QWidget* parent = nullptr);
-	virtual ~ps_move_tracker_dialog();
-
-private:
-	void update_color(bool update_sliders = false);
-	void update_hue(bool update_slider = false);
-	void update_hue_threshold(bool update_slider = false);
-	void update_saturation_threshold(bool update_slider = false);
-	void update_min_radius(bool update_slider = false);
-	void update_max_radius(bool update_slider = false);
-
-	void reset_camera();
-	void process_camera_frame();
-
-	QPixmap get_histogram(const std::array<u32, 360>& hues, bool ignore_zero) const;
-
-	enum class view_mode
-	{
-		image,
-		grayscale,
-		hsv_hue,
-		hsv_saturation,
-		hsv_value,
-		binary,
-		contours
-	};
-	view_mode m_view_mode = view_mode::contours;
-
-	enum class histo_mode
-	{
-		unfiltered_hues
-	};
-	histo_mode m_histo_mode = histo_mode::unfiltered_hues;
-
-	std::unique_ptr<Ui::ps_move_tracker_dialog> ui;
-	std::unique_ptr<qt_camera_handler> m_camera_handler;
-	std::unique_ptr<ps_move_tracker<true>> m_ps_move_tracker;
-	std::vector<u8> m_image_data_frozen;
-	std::vector<u8> m_image_data;
-	std::array<u32, 360> m_hues{};
-	static constexpr s32 width = 640;
-	static constexpr s32 height = 480;
-	s32 m_format = 0;
-	u64 m_frame_number = 0;
-	u32 m_index = 0;
-	bool m_filter_small_contours = true;
-	bool m_freeze_frame = false;
-	bool m_frame_frozen = false;
-	bool m_show_all_contours = false;
-	bool m_draw_contours = true;
-	bool m_draw_overlays = true;
-
-	QPixmap m_image;
-	QPixmap m_histogram;
-
-	// Thread control
-	QTimer* m_update_timer = nullptr;
-	std::unique_ptr<QThread> m_tracker_thread;
-	atomic_t<u32> m_stop_threads = 0;
-	std::mutex m_camera_handler_mutex;
-	std::mutex m_image_mutex;
-	std::shared_ptr<named_thread<pad_thread>> m_input_thread;
-};
diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.ui b/rpcs3/rpcs3qt/ps_move_tracker_dialog.ui
deleted file mode 100644
index 2272c989dc..0000000000
--- a/rpcs3/rpcs3qt/ps_move_tracker_dialog.ui
+++ /dev/null
@@ -1,393 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ps_move_tracker_dialog</class>
- <widget class="QDialog" name="ps_move_tracker_dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>988</width>
-    <height>710</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QVBoxLayout" name="main_layout" stretch="0,0">
-   <item>
-    <layout class="QHBoxLayout" name="mainLayout">
-     <item>
-      <layout class="QVBoxLayout" name="previewLayout">
-       <item>
-        <widget class="QGroupBox" name="gbPreview">
-         <property name="title">
-          <string>Preview</string>
-         </property>
-         <layout class="QVBoxLayout" name="gb_view_layout">
-          <item>
-           <widget class="QLabel" name="imageLabel">
-            <property name="minimumSize">
-             <size>
-              <width>640</width>
-              <height>480</height>
-             </size>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QGroupBox" name="gistoGb">
-            <property name="title">
-             <string>Histogram</string>
-            </property>
-            <layout class="QVBoxLayout" name="gistoGbLayout">
-             <item>
-              <widget class="QLabel" name="histogramLabel">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>100</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <spacer name="verticalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::MinimumExpanding</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>0</width>
-              <height>0</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="rightLayout">
-       <item>
-        <widget class="QGroupBox" name="settingsGb">
-         <property name="minimumSize">
-          <size>
-           <width>300</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="title">
-          <string>Settings</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_2">
-          <item>
-           <widget class="QGroupBox" name="minRadiusGb">
-            <property name="title">
-             <string>Min Radius</string>
-            </property>
-            <layout class="QVBoxLayout" name="minRadiusGbLayout">
-             <item>
-              <widget class="QSlider" name="minRadiusSlider">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <widget class="QGroupBox" name="maxRadiusGb">
-            <property name="title">
-             <string>Max Radius</string>
-            </property>
-            <layout class="QVBoxLayout" name="maxRadiusGbLayout">
-             <item>
-              <widget class="QSlider" name="maxRadiusSlider">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <widget class="QGroupBox" name="psMoveGb">
-            <property name="title">
-             <string>PS Move</string>
-            </property>
-            <layout class="QVBoxLayout" name="psMoveGbLayout">
-             <item>
-              <widget class="QComboBox" name="comboSelectDevice"/>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="colorGb">
-               <property name="title">
-                <string>Color</string>
-               </property>
-               <layout class="QVBoxLayout" name="colorGbLayout">
-                <item>
-                 <widget class="QSlider" name="colorSliderR">
-                  <property name="maximum">
-                   <number>255</number>
-                  </property>
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QSlider" name="colorSliderG">
-                  <property name="maximum">
-                   <number>255</number>
-                  </property>
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QSlider" name="colorSliderB">
-                  <property name="maximum">
-                   <number>255</number>
-                  </property>
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="hueGb">
-               <property name="title">
-                <string>Hue</string>
-               </property>
-               <layout class="QVBoxLayout" name="hueGbLayout">
-                <item>
-                 <widget class="QSlider" name="hueSlider">
-                  <property name="maximum">
-                   <number>359</number>
-                  </property>
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="hueThresholdGb">
-               <property name="title">
-                <string>Hue Threshold</string>
-               </property>
-               <layout class="QVBoxLayout" name="hueThresholdLayout">
-                <item>
-                 <widget class="QSlider" name="hueThresholdSlider">
-                  <property name="maximum">
-                   <number>359</number>
-                  </property>
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="saturationThresholdGb">
-               <property name="title">
-                <string>Saturation Threshold</string>
-               </property>
-               <layout class="QVBoxLayout" name="saturationThresholdGbLayout">
-                <item>
-                 <widget class="QSlider" name="saturationThresholdSlider">
-                  <property name="maximum">
-                   <number>255</number>
-                  </property>
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="inputFormatGb">
-         <property name="title">
-          <string>Input Format</string>
-         </property>
-         <layout class="QVBoxLayout" name="input_format_layout">
-          <item>
-           <widget class="QComboBox" name="inputFormatCombo"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="viewGb">
-         <property name="title">
-          <string>View</string>
-         </property>
-         <layout class="QVBoxLayout" name="view_layout">
-          <item>
-           <widget class="QComboBox" name="viewCombo"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="histoSettingsGb">
-         <property name="title">
-          <string>Histogram</string>
-         </property>
-         <layout class="QVBoxLayout" name="histoSettingsGbLayout">
-          <item>
-           <widget class="QComboBox" name="histoCombo"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="displayGb">
-         <property name="title">
-          <string>Display</string>
-         </property>
-         <layout class="QVBoxLayout" name="filterGbLayout">
-          <item>
-           <widget class="QCheckBox" name="filterSmallContoursBox">
-            <property name="text">
-             <string>Filter Small Contours</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="freezeFrameBox">
-            <property name="text">
-             <string>Freeze Frame</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="showAllContoursBox">
-            <property name="text">
-             <string>Show All Contours</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="drawContoursBox">
-            <property name="text">
-             <string>Draw Contours</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="drawOverlaysBox">
-            <property name="text">
-             <string>Draw Overlays</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::MinimumExpanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Close|QDialogButtonBox::Save</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>ps_move_tracker_dialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>ps_move_tracker_dialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/rpcs3/rpcs3qt/qt_camera_handler.cpp b/rpcs3/rpcs3qt/qt_camera_handler.cpp
deleted file mode 100644
index 5b0caeb642..0000000000
--- a/rpcs3/rpcs3qt/qt_camera_handler.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-#include "stdafx.h"
-#include "qt_camera_handler.h"
-#include "permissions.h"
-#include "Emu/system_config.h"
-#include "Emu/System.h"
-#include "Emu/Io/camera_config.h"
-
-#include <QMediaDevices>
-
-LOG_CHANNEL(camera_log, "Camera");
-
-qt_camera_handler::qt_camera_handler() : camera_handler_base()
-{
-	// List available cameras
-	for (const QCameraDevice& camera_device : QMediaDevices::videoInputs())
-	{
-		camera_log.success("Found camera: id=%s, description=%s", camera_device.id().toStdString(), camera_device.description());
-	}
-
-	if (!g_cfg_camera.load())
-	{
-		camera_log.notice("Could not load camera config. Using defaults.");
-	}
-}
-
-qt_camera_handler::~qt_camera_handler()
-{
-	Emu.BlockingCallFromMainThread([&]()
-	{
-		close_camera();
-		reset();
-	});
-}
-
-void qt_camera_handler::reset()
-{
-	m_camera.reset();
-	m_video_sink.reset();
-	m_media_capture_session.reset();
-}
-
-void qt_camera_handler::set_camera(const QCameraDevice& camera_info)
-{
-	if (camera_info.isNull())
-	{
-		set_expected_state(camera_handler_state::closed);
-		reset();
-		return;
-	}
-
-	// Determine if the camera is front facing, in which case we will need to flip the image horizontally.
-	const bool front_facing = camera_info.position() == QCameraDevice::Position::FrontFace;
-
-	camera_log.success("Using camera: id=\"%s\", description=\"%s\", front_facing=%d", camera_info.id().toStdString(), camera_info.description(), front_facing);
-
-	// Create camera and video surface
-	m_media_capture_session = std::make_unique<QMediaCaptureSession>(nullptr);
-	m_video_sink = std::make_unique<qt_camera_video_sink>(front_facing, nullptr);
-	m_camera = std::make_unique<QCamera>(camera_info);
-
-	connect(m_camera.get(), &QCamera::activeChanged, this, &qt_camera_handler::handle_camera_active);
-	connect(m_camera.get(), &QCamera::errorOccurred, this, &qt_camera_handler::handle_camera_error);
-
-	// Setup video sink
-	m_media_capture_session->setCamera(m_camera.get());
-	m_media_capture_session->setVideoSink(m_video_sink.get());
-
-	// Update the settings
-	update_camera_settings();
-}
-
-void qt_camera_handler::handle_camera_active(bool is_active)
-{
-	camera_log.notice("Camera active status changed to %d", is_active);
-
-	// Check if the camera does what it's supposed to do.
-	const camera_handler_state expected_state = get_expected_state();
-
-	switch (expected_state)
-	{
-	case camera_handler_state::closed:
-	case camera_handler_state::open:
-	{
-		if (is_active)
-		{
-			// This is not supposed to happen and indicates an unexpected QCamera issue
-			camera_log.error("Camera started unexpectedly");
-			set_state(camera_handler_state::running);
-			return;
-		}
-		break;
-	}
-	case camera_handler_state::running:
-	{
-		if (!is_active)
-		{
-			// This is not supposed to happen and indicates an unexpected QCamera issue
-			camera_log.error("Camera stopped unexpectedly");
-			set_state(camera_handler_state::open);
-			return;
-		}
-		break;
-	}
-	}
-
-	set_state(expected_state);
-}
-
-void qt_camera_handler::handle_camera_error(QCamera::Error error, const QString& errorString)
-{
-	camera_log.error("Error event: \"%s\" (error=%d)", errorString, static_cast<int>(error));
-	set_state(camera_handler_state::closed);
-}
-
-void qt_camera_handler::open_camera()
-{
-	camera_log.notice("Loading camera");
-
-	if (const std::string camera_id = g_cfg.io.camera_id.to_string();
-		m_camera_id != camera_id)
-	{
-		camera_log.notice("Switching camera from %s to %s", m_camera_id, camera_id);
-		camera_log.notice("Stopping old camera...");
-		if (m_camera)
-		{
-			set_expected_state(camera_handler_state::open);
-			m_camera->stop();
-		}
-		m_camera_id = camera_id;
-	}
-
-	QCameraDevice selected_camera{};
-
-	if (m_camera_id == g_cfg.io.camera_id.def)
-	{
-		selected_camera = QMediaDevices::defaultVideoInput();
-	}
-	else if (!m_camera_id.empty())
-	{
-		const QString camera_id = QString::fromStdString(m_camera_id);
-		for (const QCameraDevice& camera_device : QMediaDevices::videoInputs())
-		{
-			if (camera_id == camera_device.id())
-			{
-				selected_camera = camera_device;
-				break;
-			}
-		}
-	}
-
-	set_camera(selected_camera);
-
-	if (!m_camera)
-	{
-		if (m_camera_id.empty()) camera_log.notice("Camera disabled");
-		else camera_log.error("No camera found");
-		set_state(camera_handler_state::closed);
-		return;
-	}
-
-	if (m_camera->isActive())
-	{
-		camera_log.notice("Camera already active");
-		return;
-	}
-
-	// List all supported formats for debugging
-	for (const QCameraFormat& format : m_camera->cameraDevice().videoFormats())
-	{
-		camera_log.notice("Supported format: pixelformat=%s, resolution=%dx%d framerate=%f-%f", format.pixelFormat(), format.resolution().width(), format.resolution().height(), format.minFrameRate(), format.maxFrameRate());
-	}
-
-	// Update camera and view finder settings
-	update_camera_settings();
-
-	set_state(camera_handler_state::open);
-}
-
-void qt_camera_handler::close_camera()
-{
-	camera_log.notice("Unloading camera");
-
-	if (!m_camera)
-	{
-		if (m_camera_id.empty()) camera_log.notice("Camera disabled");
-		else camera_log.error("No camera found");
-		set_state(camera_handler_state::closed);
-		return;
-	}
-
-	// Unload/close camera
-	set_expected_state(camera_handler_state::closed);
-	m_camera->stop();
-}
-
-void qt_camera_handler::start_camera()
-{
-	camera_log.notice("Starting camera");
-
-	if (!m_camera)
-	{
-		if (m_camera_id.empty()) camera_log.notice("Camera disabled");
-		else camera_log.error("No camera found");
-		set_state(camera_handler_state::closed);
-		return;
-	}
-
-	if (m_camera->isActive())
-	{
-		camera_log.notice("Camera already started");
-		return;
-	}
-
-	if (!gui::utils::check_camera_permission(this, [this](){ start_camera(); }, nullptr))
-	{
-		return;
-	}
-
-	// Start camera. We will start receiving frames now.
-	set_expected_state(camera_handler_state::running);
-	m_camera->start();
-}
-
-void qt_camera_handler::stop_camera()
-{
-	camera_log.notice("Stopping camera");
-
-	if (!m_camera)
-	{
-		if (m_camera_id.empty()) camera_log.notice("Camera disabled");
-		else camera_log.error("No camera found");
-		set_state(camera_handler_state::closed);
-		return;
-	}
-
-	if (!m_camera->isActive())
-	{
-		camera_log.notice("Camera already stopped");
-		return;
-	}
-
-	// Stop camera. The camera will still be drawing power.
-	set_expected_state(camera_handler_state::open);
-	m_camera->stop();
-}
-
-void qt_camera_handler::set_format(s32 format, u32 bytesize)
-{
-	m_format = format;
-	m_bytesize = bytesize;
-
-	if (m_video_sink)
-	{
-		m_video_sink->set_format(m_format, m_bytesize);
-	}
-}
-
-void qt_camera_handler::set_frame_rate(u32 frame_rate)
-{
-	m_frame_rate = frame_rate;
-}
-
-void qt_camera_handler::set_resolution(u32 width, u32 height)
-{
-	m_width = width;
-	m_height = height;
-
-	if (m_video_sink)
-	{
-		m_video_sink->set_resolution(m_width, m_height);
-	}
-}
-
-void qt_camera_handler::set_mirrored(bool mirrored)
-{
-	m_mirrored = mirrored;
-
-	if (m_video_sink)
-	{
-		m_video_sink->set_mirrored(m_mirrored);
-	}
-}
-
-u64 qt_camera_handler::frame_number() const
-{
-	return m_video_sink ? m_video_sink->frame_number() : 0;
-}
-
-camera_handler_base::camera_handler_state qt_camera_handler::get_image(u8* buf, u64 size, u32& width, u32& height, u64& frame_number, u64& bytes_read)
-{
-	width = 0;
-	height = 0;
-	frame_number = 0;
-	bytes_read = 0;
-
-	if (const std::string camera_id = g_cfg.io.camera_id.to_string();
-		m_camera_id != camera_id)
-	{
-		camera_log.notice("Switching cameras");
-		set_state(camera_handler_state::closed);
-		return camera_handler_state::closed;
-	}
-
-	if (m_camera_id.empty())
-	{
-		camera_log.notice("Camera disabled");
-		set_state(camera_handler_state::closed);
-		return camera_handler_state::closed;
-	}
-
-	if (!m_camera || !m_video_sink)
-	{
-		camera_log.fatal("Error: camera invalid");
-		set_state(camera_handler_state::closed);
-		return camera_handler_state::closed;
-	}
-
-	// Backup current state. State may change through events.
-	const camera_handler_state current_state = get_state();
-
-	if (current_state == camera_handler_state::running)
-	{
-		// Copy latest image into out buffer.
-		m_video_sink->get_image(buf, size, width, height, frame_number, bytes_read);
-	}
-	else
-	{
-		camera_log.error("Camera not running (m_state=%d)", static_cast<int>(current_state));
-	}
-
-	return current_state;
-}
-
-void qt_camera_handler::update_camera_settings()
-{
-	// Update camera if possible. We can only do this if it is already loaded.
-	if (m_camera && m_camera->isAvailable())
-	{
-		// Get camera id. Use camera id of Qt default if the "Default" camera is selected.
-		const std::string camera_id = (m_camera_id == g_cfg.io.camera_id.def) ? QMediaDevices::defaultVideoInput().id().toStdString() : m_camera_id;
-
-		// Load selected settings from config file
-		bool success = false;
-		cfg_camera::camera_setting cfg_setting = g_cfg_camera.get_camera_setting(camera_id, success);
-
-		if (success)
-		{
-			camera_log.notice("Found config entry for camera \"%s\" (m_camera_id='%s')", camera_id, m_camera_id);
-
-			// List all available settings and choose the proper value if possible.
-			const double epsilon = 0.001;
-			success = false;
-			for (const QCameraFormat& supported_setting : m_camera->cameraDevice().videoFormats())
-			{
-				if (supported_setting.resolution().width() == cfg_setting.width &&
-					supported_setting.resolution().height() == cfg_setting.height &&
-					supported_setting.minFrameRate() >= (cfg_setting.min_fps - epsilon) &&
-					supported_setting.minFrameRate() <= (cfg_setting.min_fps + epsilon) &&
-					supported_setting.maxFrameRate() >= (cfg_setting.max_fps - epsilon) &&
-					supported_setting.maxFrameRate() <= (cfg_setting.max_fps + epsilon) &&
-					supported_setting.pixelFormat() == static_cast<QVideoFrameFormat::PixelFormat>(cfg_setting.format))
-				{
-					// Apply settings.
-					camera_log.notice("Setting view finder settings: frame_rate=%f, width=%d, height=%d, pixel_format=%s",
-						supported_setting.maxFrameRate(), supported_setting.resolution().width(), supported_setting.resolution().height(), supported_setting.pixelFormat());
-					m_camera->setCameraFormat(supported_setting);
-					success = true;
-					break;
-				}
-			}
-
-			if (!success)
-			{
-				camera_log.warning("No matching camera setting available for the camera config: max_fps=%f, width=%d, height=%d, format=%d",
-					cfg_setting.max_fps, cfg_setting.width, cfg_setting.height, cfg_setting.format);
-			}
-		}
-
-		if (!success)
-		{
-			camera_log.notice("Using default view finder settings");
-		}
-	}
-
-	// Update video surface if possible
-	if (m_video_sink)
-	{
-		m_video_sink->set_resolution(m_width, m_height);
-		m_video_sink->set_format(m_format, m_bytesize);
-		m_video_sink->set_mirrored(m_mirrored);
-	}
-}
diff --git a/rpcs3/rpcs3qt/qt_camera_handler.h b/rpcs3/rpcs3qt/qt_camera_handler.h
deleted file mode 100644
index 0759d739c6..0000000000
--- a/rpcs3/rpcs3qt/qt_camera_handler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include "Emu/Io/camera_handler_base.h"
-#include "qt_camera_video_sink.h"
-#include "util/types.hpp"
-
-#include <QCamera>
-#include <QMediaCaptureSession>
-#include <QObject>
-#include <QVideoSink>
-
-class qt_camera_handler final : public QObject, public camera_handler_base
-{
-	Q_OBJECT
-
-public:
-	qt_camera_handler();
-	virtual ~qt_camera_handler();
-
-	void open_camera() override;
-	void close_camera() override;
-	void start_camera() override;
-	void stop_camera() override;
-	void set_format(s32 format, u32 bytesize) override;
-	void set_frame_rate(u32 frame_rate) override;
-	void set_resolution(u32 width, u32 height) override;
-	void set_mirrored(bool mirrored) override;
-	u64 frame_number() const override;
-	camera_handler_state get_image(u8* buf, u64 size, u32& width, u32& height, u64& frame_number, u64& bytes_read) override;
-
-private:
-	void set_camera(const QCameraDevice& camera_info);
-	void reset();
-	void update_camera_settings();
-
-	std::string m_camera_id;
-	std::unique_ptr<QCamera> m_camera;
-	std::unique_ptr<QMediaCaptureSession> m_media_capture_session;
-	std::unique_ptr<qt_camera_video_sink> m_video_sink;
-
-private Q_SLOTS:
-	void handle_camera_active(bool is_active);
-	void handle_camera_error(QCamera::Error error, const QString& errorString);
-};
diff --git a/rpcs3/rpcs3qt/qt_camera_video_sink.cpp b/rpcs3/rpcs3qt/qt_camera_video_sink.cpp
deleted file mode 100644
index bcfd573afe..0000000000
--- a/rpcs3/rpcs3qt/qt_camera_video_sink.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-#include "stdafx.h"
-#include "qt_camera_video_sink.h"
-
-#include "Emu/Cell/Modules/cellCamera.h"
-#include "Emu/system_config.h"
-
-#include <QtConcurrent>
-
-LOG_CHANNEL(camera_log, "Camera");
-
-qt_camera_video_sink::qt_camera_video_sink(bool front_facing, QObject *parent)
-	: QVideoSink(parent), m_front_facing(front_facing)
-{
-	connect(this, &QVideoSink::videoFrameChanged, this, &qt_camera_video_sink::present);
-}
-
-qt_camera_video_sink::~qt_camera_video_sink()
-{
-}
-
-bool qt_camera_video_sink::present(const QVideoFrame& frame)
-{
-	if (!frame.isValid())
-	{
-		camera_log.error("Received invalid video frame");
-		return false;
-	}
-
-	// Get video image. Map frame for faster read operations.
-	QVideoFrame tmp(frame);
-	if (!tmp.map(QVideoFrame::ReadOnly))
-	{
-		camera_log.error("Failed to map video frame");
-		return false;
-	}
-
-	// Get image. This usually also converts the image to ARGB32.
-	QImage image = frame.toImage();
-
-	if (image.isNull())
-	{
-		camera_log.warning("Image is invalid: pixel_format=%s, format=%d", tmp.pixelFormat(), static_cast<int>(QVideoFrameFormat::imageFormatFromPixelFormat(tmp.pixelFormat())));
-	}
-	else
-	{
-		// Scale image if necessary
-		if (m_width > 0 && m_height > 0 && m_width != static_cast<u32>(image.width()) && m_height != static_cast<u32>(image.height()))
-		{
-			image = image.scaled(m_width, m_height, Qt::AspectRatioMode::IgnoreAspectRatio, Qt::SmoothTransformation);
-		}
-
-		// Determine image flip
-		const camera_flip flip_setting = g_cfg.io.camera_flip_option;
-
-		bool flip_horizontally = m_front_facing; // Front facing cameras are flipped already
-		if (flip_setting == camera_flip::horizontal || flip_setting == camera_flip::both)
-		{
-			flip_horizontally = !flip_horizontally;
-		}
-		if (m_mirrored) // Set by the game
-		{
-			flip_horizontally = !flip_horizontally;
-		}
-
-		bool flip_vertically = false;
-		if (flip_setting == camera_flip::vertical || flip_setting == camera_flip::both)
-		{
-			flip_vertically = !flip_vertically;
-		}
-
-		// Flip image if necessary
-		if (flip_horizontally || flip_vertically)
-		{
-			image.mirror(flip_horizontally, flip_vertically);
-		}
-
-		if (image.format() != QImage::Format_RGBA8888)
-		{
-			image.convertTo(QImage::Format_RGBA8888);
-		}
-	}
-
-	const u64 new_size = m_bytesize;
-	image_buffer& image_buffer = m_image_buffer[m_write_index];
-
-	// Reset buffer if necessary
-	if (image_buffer.data.size() != new_size)
-	{
-		image_buffer.data.clear();
-	}
-
-	// Create buffer if necessary
-	if (image_buffer.data.empty() && new_size > 0)
-	{
-		image_buffer.data.resize(new_size);
-		image_buffer.width = m_width;
-		image_buffer.height = m_height;
-	}
-
-	if (!image_buffer.data.empty() && !image.isNull())
-	{
-		// Convert image to proper layout
-		// TODO: check if pixel format and bytes per pixel match and convert if necessary
-		// TODO: implement or improve more conversions
-
-		const u32 width = std::min<u32>(image_buffer.width, image.width());
-		const u32 height = std::min<u32>(image_buffer.height, image.height());
-
-		switch (m_format)
-		{
-		case CELL_CAMERA_RAW8: // The game seems to expect BGGR
-		{
-			// Let's use a very simple algorithm to convert the image to raw BGGR
-			const auto convert_to_bggr = [&image_buffer, &image, width, height](u32 y_begin, u32 y_end)
-			{
-				u8* dst = &image_buffer.data[image_buffer.width * y_begin];
-
-				for (u32 y = y_begin; y < height && y < y_end; y++)
-				{
-					const u8* src = image.constScanLine(y);
-					const bool is_top_pixel = (y % 2) == 0;
-
-					// Split loops (roughly twice the performance by removing one condition)
-					if (is_top_pixel)
-					{
-						for (u32 x = 0; x < width; x++, dst++, src += 4)
-						{
-							const bool is_left_pixel = (x % 2) == 0;
-
-							if (is_left_pixel)
-							{
-								*dst = src[2]; // Blue
-							}
-							else
-							{
-								*dst = src[1]; // Green
-							}
-						}
-					}
-					else
-					{
-						for (u32 x = 0; x < width; x++, dst++, src += 4)
-						{
-							const bool is_left_pixel = (x % 2) == 0;
-
-							if (is_left_pixel)
-							{
-								*dst = src[1]; // Green
-							}
-							else
-							{
-								*dst = src[0]; // Red
-							}
-						}
-					}
-				}
-			};
-
-			// Use a multithreaded workload. The faster we get this done, the better.
-			constexpr u32 thread_count = 4;
-			const u32 lines_per_thread = std::ceil(image_buffer.height / static_cast<double>(thread_count));
-			u32 y_begin = 0;
-			u32 y_end = lines_per_thread;
-
-			QFutureSynchronizer<void> synchronizer;
-			for (u32 i = 0; i < thread_count; i++)
-			{
-				synchronizer.addFuture(QtConcurrent::run(convert_to_bggr, y_begin, y_end));
-				y_begin = y_end;
-				y_end += lines_per_thread;
-			}
-			synchronizer.waitForFinished();
-			break;
-		}
-		//case CELL_CAMERA_YUV422:
-		case CELL_CAMERA_Y0_U_Y1_V:
-		case CELL_CAMERA_V_Y1_U_Y0:
-		{
-			// Simple RGB to Y0_U_Y1_V conversion from stackoverflow.
-			const auto convert_to_yuv422 = [&image_buffer, &image, width, height, format = m_format](u32 y_begin, u32 y_end)
-			{
-				constexpr int yuv_bytes_per_pixel = 2;
-				const int yuv_pitch = image_buffer.width * yuv_bytes_per_pixel;
-
-				const int y0_offset = (format == CELL_CAMERA_Y0_U_Y1_V) ? 0 : 3;
-				const int u_offset  = (format == CELL_CAMERA_Y0_U_Y1_V) ? 1 : 2;
-				const int y1_offset = (format == CELL_CAMERA_Y0_U_Y1_V) ? 2 : 1;
-				const int v_offset  = (format == CELL_CAMERA_Y0_U_Y1_V) ? 3 : 0;
-
-				for (u32 y = y_begin; y < height && y < y_end; y++)
-				{
-					const u8* src = image.constScanLine(y);
-					u8* yuv_row_ptr = &image_buffer.data[y * yuv_pitch];
-
-					for (u32 x = 0; x < width - 1; x += 2, src += 8)
-					{
-						const float r1 = src[0];
-						const float g1 = src[1];
-						const float b1 = src[2];
-						const float r2 = src[4];
-						const float g2 = src[5];
-						const float b2 = src[6];
-
-						const int y0 =  (0.257f * r1) + (0.504f * g1) + (0.098f * b1) +  16.0f;
-						const int u  = -(0.148f * r1) - (0.291f * g1) + (0.439f * b1) + 128.0f;
-						const int v  =  (0.439f * r1) - (0.368f * g1) - (0.071f * b1) + 128.0f;
-						const int y1 =  (0.257f * r2) + (0.504f * g2) + (0.098f * b2) +  16.0f;
-
-						const int yuv_index = x * yuv_bytes_per_pixel;
-						yuv_row_ptr[yuv_index + y0_offset] = static_cast<u8>(std::clamp(y0, 0, 255));
-						yuv_row_ptr[yuv_index + u_offset]  = static_cast<u8>(std::clamp( u, 0, 255));
-						yuv_row_ptr[yuv_index + y1_offset] = static_cast<u8>(std::clamp(y1, 0, 255));
-						yuv_row_ptr[yuv_index + v_offset]  = static_cast<u8>(std::clamp( v, 0, 255));
-					}
-				}
-			};
-
-			// Use a multithreaded workload. The faster we get this done, the better.
-			constexpr u32 thread_count = 4;
-			const u32 lines_per_thread = std::ceil(image_buffer.height / static_cast<double>(thread_count));
-			u32 y_begin = 0;
-			u32 y_end = lines_per_thread;
-
-			QFutureSynchronizer<void> synchronizer;
-			for (u32 i = 0; i < thread_count; i++)
-			{
-				synchronizer.addFuture(QtConcurrent::run(convert_to_yuv422, y_begin, y_end));
-				y_begin = y_end;
-				y_end += lines_per_thread;
-			}
-			synchronizer.waitForFinished();
-			break;
-		}
-		case CELL_CAMERA_JPG:
-		case CELL_CAMERA_RGBA:
-		case CELL_CAMERA_RAW10:
-		case CELL_CAMERA_YUV420:
-		case CELL_CAMERA_FORMAT_UNKNOWN:
-		default:
-			std::memcpy(image_buffer.data.data(), image.constBits(), std::min<usz>(image_buffer.data.size(), image.height() * image.bytesPerLine()));
-			break;
-		}
-	}
-
-	// Unmap frame memory
-	tmp.unmap();
-
-	camera_log.trace("Wrote image to video surface. index=%d, m_frame_number=%d, width=%d, height=%d, bytesize=%d",
-		m_write_index, m_frame_number.load(), m_width, m_height, m_bytesize);
-
-	// Toggle write/read index
-	std::lock_guard lock(m_mutex);
-	image_buffer.frame_number = m_frame_number++;
-	m_write_index = read_index();
-
-	return true;
-}
-
-void qt_camera_video_sink::set_format(s32 format, u32 bytesize)
-{
-	camera_log.notice("Setting format: format=%d, bytesize=%d", format, bytesize);
-
-	m_format = format;
-	m_bytesize = bytesize;
-}
-
-void qt_camera_video_sink::set_resolution(u32 width, u32 height)
-{
-	camera_log.notice("Setting resolution: width=%d, height=%d", width, height);
-
-	m_width = width;
-	m_height = height;
-}
-
-void qt_camera_video_sink::set_mirrored(bool mirrored)
-{
-	camera_log.notice("Setting mirrored: mirrored=%d", mirrored);
-
-	m_mirrored = mirrored;
-}
-
-u64 qt_camera_video_sink::frame_number() const
-{
-	return m_frame_number.load();
-}
-
-void qt_camera_video_sink::get_image(u8* buf, u64 size, u32& width, u32& height, u64& frame_number, u64& bytes_read)
-{
-	// Lock read buffer
-	std::lock_guard lock(m_mutex);
-	const image_buffer& image_buffer = m_image_buffer[read_index()];
-
-	width = image_buffer.width;
-	height = image_buffer.height;
-	frame_number = image_buffer.frame_number;
-
-	// Copy to out buffer
-	if (buf && !image_buffer.data.empty())
-	{
-		bytes_read = std::min<u64>(image_buffer.data.size(), size);
-		std::memcpy(buf, image_buffer.data.data(), bytes_read);
-
-		if (image_buffer.data.size() != size)
-		{
-			camera_log.error("Buffer size mismatch: in=%d, out=%d. Cropping to incoming size. Please contact a developer.", size, image_buffer.data.size());
-		}
-	}
-	else
-	{
-		bytes_read = 0;
-	}
-}
-
-u32 qt_camera_video_sink::read_index() const
-{
-	// The read buffer index cannot be the same as the write index
-	return (m_write_index + 1u) % ::narrow<u32>(m_image_buffer.size());
-}
diff --git a/rpcs3/rpcs3qt/qt_camera_video_sink.h b/rpcs3/rpcs3qt/qt_camera_video_sink.h
deleted file mode 100644
index e3f405b55c..0000000000
--- a/rpcs3/rpcs3qt/qt_camera_video_sink.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include "util/atomic.hpp"
-#include "util/types.hpp"
-#include <QVideoFrame>
-#include <QVideoSink>
-#include <QImage>
-
-#include <array>
-#include <mutex>
-
-class qt_camera_video_sink final : public QVideoSink
-{
-public:
-	qt_camera_video_sink(bool front_facing, QObject *parent = nullptr);
-	virtual ~qt_camera_video_sink();
-
-	bool present(const QVideoFrame& frame);
-
-	void set_format(s32 format, u32 bytesize);
-	void set_resolution(u32 width, u32 height);
-	void set_mirrored(bool mirrored);
-
-	u64 frame_number() const;
-
-	void get_image(u8* buf, u64 size, u32& width, u32& height, u64& frame_number, u64& bytes_read);
-
-private:
-	u32 read_index() const;
-
-	bool m_front_facing = false;
-	bool m_mirrored = false; // Set by cellCamera
-	s32 m_format = 2; // CELL_CAMERA_RAW8, set by cellCamera
-	u32 m_bytesize = 0;
-	u32 m_width = 640;
-	u32 m_height = 480;
-
-	std::mutex m_mutex;
-	atomic_t<u64> m_frame_number{0};
-	u32 m_write_index{0};
-
-	struct image_buffer
-	{
-		u64 frame_number = 0;
-		u32 width = 0;
-		u32 height = 0;
-		std::vector<u8> data;
-	};
-	std::array<image_buffer, 2> m_image_buffer;
-};
diff --git a/rpcs3/rpcs3qt/qt_music_handler.cpp b/rpcs3/rpcs3qt/qt_music_handler.cpp
deleted file mode 100644
index e2a3b79df8..0000000000
--- a/rpcs3/rpcs3qt/qt_music_handler.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-#include "qt_music_handler.h"
-#include "Emu/Cell/Modules/cellMusic.h"
-#include "Emu/System.h"
-#include "util/logs.hpp"
-#include "Utilities/File.h"
-
-#include <QAudioOutput>
-#include <QUrl>
-
-LOG_CHANNEL(music_log, "Music");
-
-template <>
-void fmt_class_string<QMediaPlayer::Error>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](QMediaPlayer::Error value)
-	{
-		switch (value)
-		{
-		case QMediaPlayer::Error::NoError: return "NoError";
-		case QMediaPlayer::Error::ResourceError: return "ResourceError";
-		case QMediaPlayer::Error::FormatError: return "FormatError";
-		case QMediaPlayer::Error::NetworkError: return "NetworkError";
-		case QMediaPlayer::Error::AccessDeniedError: return "AccessDeniedError";
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<QMediaPlayer::MediaStatus>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](QMediaPlayer::MediaStatus value)
-	{
-		switch (value)
-		{
-		case QMediaPlayer::MediaStatus::NoMedia: return "NoMedia";
-		case QMediaPlayer::MediaStatus::LoadingMedia: return "LoadingMedia";
-		case QMediaPlayer::MediaStatus::LoadedMedia: return "LoadedMedia";
-		case QMediaPlayer::MediaStatus::StalledMedia: return "StalledMedia";
-		case QMediaPlayer::MediaStatus::BufferingMedia: return "BufferingMedia";
-		case QMediaPlayer::MediaStatus::BufferedMedia: return "BufferedMedia";
-		case QMediaPlayer::MediaStatus::EndOfMedia: return "EndOfMedia";
-		case QMediaPlayer::MediaStatus::InvalidMedia: return "InvalidMedia";
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<QMediaPlayer::PlaybackState>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](QMediaPlayer::PlaybackState value)
-	{
-		switch (value)
-		{
-		case QMediaPlayer::PlaybackState::StoppedState: return "StoppedState";
-		case QMediaPlayer::PlaybackState::PlayingState: return "PlayingState";
-		case QMediaPlayer::PlaybackState::PausedState: return "PausedState";
-		}
-
-		return unknown;
-	});
-}
-
-qt_music_handler::qt_music_handler()
-{
-	music_log.notice("Constructing Qt music handler...");
-
-	m_media_player = std::make_unique<QMediaPlayer>();
-	m_media_player->setAudioOutput(new QAudioOutput(m_media_player.get()));
-
-	connect(m_media_player.get(), &QMediaPlayer::mediaStatusChanged, this, &qt_music_handler::handle_media_status);
-	connect(m_media_player.get(), &QMediaPlayer::playbackStateChanged, this, &qt_music_handler::handle_music_state);
-	connect(m_media_player.get(), &QMediaPlayer::errorOccurred, this, &qt_music_handler::handle_music_error);
-	connect(m_media_player->audioOutput(), &QAudioOutput::volumeChanged, this, &qt_music_handler::handle_volume_change);
-}
-
-qt_music_handler::~qt_music_handler()
-{
-	Emu.BlockingCallFromMainThread([this]()
-	{
-		music_log.notice("Destroying Qt music handler...");
-		m_media_player->stop();
-		m_media_player.reset();
-	});
-}
-
-void qt_music_handler::stop()
-{
-	std::lock_guard lock(m_mutex);
-
-	Emu.BlockingCallFromMainThread([this]()
-	{
-		music_log.notice("Stopping music...");
-		m_media_player->stop();
-	});
-
-	m_state = CELL_MUSIC_PB_STATUS_STOP;
-}
-
-void qt_music_handler::pause()
-{
-	std::lock_guard lock(m_mutex);
-
-	Emu.BlockingCallFromMainThread([this]()
-	{
-		music_log.notice("Pausing music...");
-		m_media_player->pause();
-	});
-
-	m_state = CELL_MUSIC_PB_STATUS_PAUSE;
-}
-
-void qt_music_handler::play(const std::string& path)
-{
-	std::lock_guard lock(m_mutex);
-
-	Emu.BlockingCallFromMainThread([&path, this]()
-	{
-		if (!fs::is_file(path))
-		{
-			music_log.error("play: File does not exist: '%s'", path);
-		}
-
-		if (m_path != path)
-		{
-			m_path = path;
-			m_media_player->setSource(QUrl::fromLocalFile(QString::fromStdString(path)));
-		}
-
-		music_log.notice("Playing music: '%s'", path);
-		m_media_player->setPlaybackRate(1.0);
-		m_media_player->play();
-	});
-
-	m_state = CELL_MUSIC_PB_STATUS_PLAY;
-}
-
-void qt_music_handler::fast_forward(const std::string& path)
-{
-	std::lock_guard lock(m_mutex);
-
-	Emu.BlockingCallFromMainThread([&path, this]()
-	{
-		if (!fs::is_file(path))
-		{
-			music_log.error("fast_forward: File does not exist: '%s'", path);
-		}
-
-		if (m_path != path)
-		{
-			m_path = path;
-			m_media_player->setSource(QUrl::fromLocalFile(QString::fromStdString(path)));
-		}
-
-		music_log.notice("Fast-forwarding music: '%s'", path);
-		m_media_player->setPlaybackRate(2.0);
-		m_media_player->play();
-	});
-
-	m_state = CELL_MUSIC_PB_STATUS_FASTFORWARD;
-}
-
-void qt_music_handler::fast_reverse(const std::string& path)
-{
-	std::lock_guard lock(m_mutex);
-
-	Emu.BlockingCallFromMainThread([&path, this]()
-	{
-		if (!fs::is_file(path))
-		{
-			music_log.error("fast_reverse: File does not exist: '%s'", path);
-		}
-
-		if (m_path != path)
-		{
-			m_path = path;
-			m_media_player->setSource(QUrl::fromLocalFile(QString::fromStdString(path)));
-		}
-
-		music_log.notice("Fast-reversing music: '%s'", path);
-		m_media_player->setPlaybackRate(-2.0); // NOTE: This doesn't work on the current Qt version
-		m_media_player->play();
-	});
-
-	m_state = CELL_MUSIC_PB_STATUS_FASTREVERSE;
-}
-
-void qt_music_handler::set_volume(f32 volume)
-{
-	std::lock_guard lock(m_mutex);
-
-	Emu.BlockingCallFromMainThread([&volume, this]()
-	{
-		const f32 new_volume = std::clamp(volume, 0.0f, 1.0f);
-		music_log.notice("Setting volume to %f", new_volume);
-		m_media_player->audioOutput()->setVolume(new_volume);
-	});
-}
-
-f32 qt_music_handler::get_volume() const
-{
-	std::lock_guard lock(m_mutex);
-	f32 volume = 0.0f;
-
-	Emu.BlockingCallFromMainThread([&volume, this]()
-	{
-		volume = std::clamp(m_media_player->audioOutput()->volume(), 0.0f, 1.0f);
-		music_log.notice("Getting volume: %f", volume);
-	});
-
-	return volume;
-}
-
-void qt_music_handler::handle_media_status(QMediaPlayer::MediaStatus status)
-{
-	music_log.notice("New media status: %s (status=%d)", status, static_cast<int>(status));
-
-	if (!m_status_callback)
-	{
-		return;
-	}
-
-	switch (status)
-	{
-	case QMediaPlayer::MediaStatus::NoMedia:
-	case QMediaPlayer::MediaStatus::LoadingMedia:
-	case QMediaPlayer::MediaStatus::LoadedMedia:
-	case QMediaPlayer::MediaStatus::StalledMedia:
-	case QMediaPlayer::MediaStatus::BufferingMedia:
-	case QMediaPlayer::MediaStatus::BufferedMedia:
-	case QMediaPlayer::MediaStatus::InvalidMedia:
-		break;
-	case QMediaPlayer::MediaStatus::EndOfMedia:
-		m_status_callback(player_status::end_of_media);
-		break;
-	default:
-		music_log.error("Ignoring unknown status %d", static_cast<int>(status));
-		break;
-	}
-}
-
-void qt_music_handler::handle_music_state(QMediaPlayer::PlaybackState state)
-{
-	music_log.notice("New playback state: %s (state=%d)", state, static_cast<int>(state));
-}
-
-void qt_music_handler::handle_music_error(QMediaPlayer::Error error, const QString& errorString)
-{
-	music_log.error("Error event: \"%s\" (error=%s)", errorString, error);
-}
-
-void qt_music_handler::handle_volume_change(float volume) const
-{
-	music_log.notice("Volume changed: %f", volume);
-}
diff --git a/rpcs3/rpcs3qt/qt_music_handler.h b/rpcs3/rpcs3qt/qt_music_handler.h
deleted file mode 100644
index 559995a4cb..0000000000
--- a/rpcs3/rpcs3qt/qt_music_handler.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "Emu/Io/music_handler_base.h"
-
-#include <QMediaPlayer>
-#include <QObject>
-#include <mutex>
-
-class qt_music_handler final : public QObject, public music_handler_base
-{
-	Q_OBJECT
-
-public:
-	qt_music_handler();
-	virtual ~qt_music_handler();
-
-	void stop() override;
-	void pause() override;
-	void play(const std::string& path) override;
-	void fast_forward(const std::string& path) override;
-	void fast_reverse(const std::string& path) override;
-	void set_volume(f32 volume) override;
-	f32 get_volume() const override;
-
-private Q_SLOTS:
-	void handle_media_status(QMediaPlayer::MediaStatus status);
-	void handle_music_state(QMediaPlayer::PlaybackState state);
-	void handle_music_error(QMediaPlayer::Error error, const QString& errorString);
-	void handle_volume_change(float volume) const;
-
-private:
-	mutable std::mutex m_mutex;
-	std::unique_ptr<QMediaPlayer> m_media_player;
-	std::string m_path;
-};
diff --git a/rpcs3/rpcs3qt/qt_utils.cpp b/rpcs3/rpcs3qt/qt_utils.cpp
index c4e8c5a571..ae0c817a97 100644
--- a/rpcs3/rpcs3qt/qt_utils.cpp
+++ b/rpcs3/rpcs3qt/qt_utils.cpp
@@ -1,6 +1,4 @@
-#include "stdafx.h"
 #include "qt_utils.h"
-#include "gui_settings.h"
 #include <QApplication>
 #include <QBitmap>
 #include <QDesktopServices>
@@ -12,9 +10,9 @@
 
 #include "Emu/system_utils.hpp"
 #include "Utilities/File.h"
-#include <cmath>
 
-LOG_CHANNEL(gui_log, "GUI");
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
+constexpr auto qstr = QString::fromStdString;
 
 namespace gui
 {
@@ -42,60 +40,6 @@ namespace gui
 			return QRect(frame_x, frame_y, target_width, target_height);
 		}
 
-		bool create_square_pixmap(QPixmap& pixmap, int target_size)
-		{
-			if (pixmap.isNull())
-				return false;
-
-			QSize canvas_size(target_size, target_size);
-			QSize pixmap_size(pixmap.size());
-			QPoint target_pos;
-
-			// Let's upscale the original pixmap to at least fit into the outer rect.
-			if (pixmap_size.width() < target_size || pixmap_size.height() < target_size)
-			{
-				pixmap_size.scale(target_size, target_size, Qt::KeepAspectRatio);
-			}
-
-			canvas_size = pixmap_size;
-
-			// Calculate the centered size and position of the icon on our canvas.
-			if (pixmap_size.width() != target_size || pixmap_size.height() != target_size)
-			{
-				ensure(pixmap_size.height() > 0);
-				constexpr double target_ratio = 1.0; // square icon
-
-				if ((pixmap_size.width() / static_cast<double>(pixmap_size.height())) > target_ratio)
-				{
-					canvas_size.setHeight(std::ceil(pixmap_size.width() / target_ratio));
-				}
-				else
-				{
-					canvas_size.setWidth(std::ceil(pixmap_size.height() * target_ratio));
-				}
-
-				target_pos.setX(std::max<int>(0, (canvas_size.width() - pixmap_size.width()) / 2.0));
-				target_pos.setY(std::max<int>(0, (canvas_size.height() - pixmap_size.height()) / 2.0));
-			}
-
-			// Create a canvas large enough to fit our entire scaled icon
-			QPixmap canvas(canvas_size);
-			canvas.fill(Qt::transparent);
-
-			// Create a painter for our canvas
-			QPainter painter(&canvas);
-			painter.setRenderHint(QPainter::SmoothPixmapTransform);
-
-			// Draw the icon onto our canvas
-			painter.drawPixmap(target_pos.x(), target_pos.y(), pixmap_size.width(), pixmap_size.height(), pixmap);
-
-			// Finish the painting
-			painter.end();
-
-			pixmap = canvas;
-			return true;
-		}
-
 		QPixmap get_colorized_pixmap(const QPixmap& old_pixmap, const QColor& old_color, const QColor& new_color, bool use_special_masks, bool colorize_all)
 		{
 			QPixmap pixmap = old_pixmap;
@@ -148,52 +92,22 @@ namespace gui
 
 		QIcon get_colorized_icon(const QIcon& old_icon, const QColor& old_color, const QColor& new_color, bool use_special_masks, bool colorize_all)
 		{
-			return QIcon(get_colorized_pixmap(old_icon.pixmap(::at32(old_icon.availableSizes(), 0)), old_color, new_color, use_special_masks, colorize_all));
+			return QIcon(get_colorized_pixmap(old_icon.pixmap(old_icon.availableSizes().at(0)), old_color, new_color, use_special_masks, colorize_all));
 		}
 
-		QIcon get_colorized_icon(const QIcon& old_icon, const QColor& old_color, const std::map<QIcon::Mode, QColor>& new_colors, bool use_special_masks, bool colorize_all)
-		{
-			QIcon icon{};
-			const QPixmap old_pixmap = old_icon.pixmap(::at32(old_icon.availableSizes(), 0));
-			for (const auto& [mode, color] : new_colors)
-			{
-				icon.addPixmap(get_colorized_pixmap(old_pixmap, old_color, color, use_special_masks, colorize_all), mode);
-			}
-			return icon;
-		}
-
-		QStringList get_dir_entries(const QDir& dir, const QStringList& name_filters, bool full_path)
+		QStringList get_dir_entries(const QDir& dir, const QStringList& name_filters)
 		{
 			QFileInfoList entries = dir.entryInfoList(name_filters, QDir::Files);
 			QStringList res;
-			for (const QFileInfo& entry : entries)
+			for (const QFileInfo &entry : entries)
 			{
-				res.append(full_path ? entry.absoluteFilePath() : entry.baseName());
+				res.append(entry.baseName());
 			}
 			return res;
 		}
-		
-		QColor get_foreground_color()
-		{
-			QLabel dummy_color;
-			dummy_color.ensurePolished();
-			return dummy_color.palette().color(QPalette::ColorRole::WindowText);
-		}
 
-		QColor get_background_color()
+		QColor get_label_color(const QString& object_name, QPalette::ColorRole color_role)
 		{
-			QLabel dummy_color;
-			dummy_color.ensurePolished();
-			return dummy_color.palette().color(QPalette::ColorRole::Window);
-		}
-
-		QColor get_label_color(const QString& object_name, const QColor& fallback_light, const QColor& fallback_dark, QPalette::ColorRole color_role)
-		{
-			if (!gui::custom_stylesheet_active || !gui::stylesheet.contains(object_name))
-			{
-				return dark_mode_active() ? fallback_dark : fallback_light;
-			}
-
 			QLabel dummy_color;
 			dummy_color.setObjectName(object_name);
 			dummy_color.ensurePolished();
@@ -215,66 +129,6 @@ namespace gui
 			return l.sizeHint().width();
 		}
 
-		QColor get_link_color(const QString& name)
-		{
-			return gui::utils::get_label_color(name, QColor(0, 116, 231), QColor(135, 206, 250));
-		}
-
-		QString get_link_color_string(const QString& name)
-		{
-			return get_link_color(name).name();
-		}
-
-		QString get_link_style(const QString& name)
-		{
-			return QString("style=\"color: %0;\"").arg(get_link_color_string(name));
-		}
-
-		QString make_link(const QString& text, const QString& url)
-		{
-			return QString("<a %0 href=\"%1\">%2</a>").arg(get_link_style()).arg(url).arg(text);
-		}
-
-		QString make_bold(const QString& text)
-		{
-			return QString("<span style=\"font-weight:600;\">%0</span>").arg(text);
-		}
-
-		QString make_paragraph(QString text, const QString& white_space_style)
-		{
-			return QString(R"(<p%0>%1</p>)")
-				.arg(white_space_style.isEmpty() ? "" : "style=\"white-space: nowrap;\"")
-				.arg(text.replace("\n", "<br>"));
-		}
-
-		QPixmap get_centered_pixmap(QPixmap pixmap, const QSize& icon_size, int offset_x, int offset_y, qreal device_pixel_ratio, Qt::TransformationMode mode)
-		{
-			// Create empty canvas for expanded image
-			QPixmap exp_img(icon_size);
-			exp_img.setDevicePixelRatio(device_pixel_ratio);
-			exp_img.fill(Qt::transparent);
-
-			// Load scaled pixmap
-			pixmap = pixmap.scaled(icon_size, Qt::KeepAspectRatio, mode);
-
-			// Define offset for raw image placement
-			QPoint offset(offset_x + icon_size.width() / 2 - pixmap.width() / 2,
-			              offset_y + icon_size.height() / 2 - pixmap.height() / 2);
-
-			// Place raw image inside expanded image
-			QPainter painter(&exp_img);
-			painter.setRenderHint(QPainter::SmoothPixmapTransform);
-			painter.drawPixmap(offset, pixmap);
-			painter.end();
-
-			return exp_img;
-		}
-
-		QPixmap get_centered_pixmap(const QString& path, const QSize& icon_size, int offset_x, int offset_y, qreal device_pixel_ratio, Qt::TransformationMode mode)
-		{
-			return get_centered_pixmap(QPixmap(path), icon_size, offset_x, offset_y, device_pixel_ratio, mode);
-		}
-
 		QImage get_opaque_image_area(const QString& path)
 		{
 			QImage image = QImage(path);
@@ -286,7 +140,7 @@ namespace gui
 
 			for (int y = 0; y < image.height(); ++y)
 			{
-				const QRgb* row = reinterpret_cast<const QRgb*>(image.constScanLine(y));
+				QRgb* row = reinterpret_cast<QRgb*>(image.scanLine(y));
 				bool row_filled = false;
 
 				for (int x = 0; x < image.width(); ++x)
@@ -395,9 +249,9 @@ namespace gui
 			if (!found_file)
 			{
 				// Get Icon for the gs_frame from path. this handles presumably all possible use cases
-				const QString qpath = QString::fromStdString(path);
-				const std::string path_list[] = { path, qpath.section("/", 0, -2, QString::SectionIncludeTrailingSep).toStdString(),
-					                              qpath.section("/", 0, -3, QString::SectionIncludeTrailingSep).toStdString() };
+				const QString qpath = qstr(path);
+				const std::string path_list[] = { path, sstr(qpath.section("/", 0, -2, QString::SectionIncludeTrailingSep)),
+					                              sstr(qpath.section("/", 0, -3, QString::SectionIncludeTrailingSep)) };
 
 				for (const std::string& pth : path_list)
 				{
@@ -420,7 +274,7 @@ namespace gui
 			if (found_file)
 			{
 				// load the image from path. It will most likely be a rectangle
-				const QImage source = QImage(QString::fromStdString(icon_path));
+				const QImage source = QImage(qstr(icon_path));
 				const int edge_max = std::max(source.width(), source.height());
 
 				// create a new transparent image with square size and same format as source (maybe handle other formats than RGB32 as well?)
@@ -446,59 +300,31 @@ namespace gui
 
 		void open_dir(const std::string& spath)
 		{
-			QString path = QString::fromStdString(spath);
+			fs::create_dir(spath);
+			const QString path = qstr(spath);
 
 			if (fs::is_file(spath))
 			{
 				// open directory and select file
 				// https://stackoverflow.com/questions/3490336/how-to-reveal-in-finder-or-show-in-explorer-with-qt
 #ifdef _WIN32
-				// Remove double slashes and convert to native separators. Double slashes don't seem to work with the explorer call.
-				path.replace(QRegularExpression("[\\\\|/]+"), QDir::separator());
-				gui_log.notice("gui::utils::open_dir: About to open file path '%s' (original: '%s')", path, spath);
-
-				if (!QProcess::startDetached("explorer.exe", {"/select,", path}))
-				{
-					gui_log.error("gui::utils::open_dir: Failed to start explorer process");
-				}
+				QProcess::startDetached("explorer.exe", { "/select,", QDir::toNativeSeparators(path) });
 #elif defined(__APPLE__)
-				gui_log.notice("gui::utils::open_dir: About to open file path '%s'", spath);
-
 				QProcess::execute("/usr/bin/osascript", { "-e", "tell application \"Finder\" to reveal POSIX file \"" + path + "\"" });
 				QProcess::execute("/usr/bin/osascript", { "-e", "tell application \"Finder\" to activate" });
 #else
 				// open parent directory
-				const QUrl url = QUrl::fromLocalFile(QString::fromStdString(fs::get_parent_dir(spath)));
-				const std::string url_path = url.toString().toStdString();
-				gui_log.notice("gui::utils::open_dir: About to open parent dir url '%s' for path '%s'", url_path, spath);
-
-				if (!QDesktopServices::openUrl(url))
-				{
-					gui_log.error("gui::utils::open_dir: Failed to open parent dir url '%s' for path '%s'", url_path, spath);
-				}
+				QDesktopServices::openUrl(QUrl::fromLocalFile(qstr(fs::get_parent_dir(spath))));
 #endif
 				return;
 			}
 
-			if (!fs::is_dir(spath) && !fs::create_path(spath))
-			{
-				gui_log.error("gui::utils::open_dir: Failed to create path '%s' (%s)", spath, fs::g_tls_error);
-				return;
-			}
-
-			const QUrl url = QUrl::fromLocalFile(path);
-			const std::string url_path = url.toString().toStdString();
-			gui_log.notice("gui::utils::open_dir: About to open dir url '%s' for path '%s'", url_path, spath);
-
-			if (!QDesktopServices::openUrl(url))
-			{
-				gui_log.error("gui::utils::open_dir: Failed to open dir url '%s' for path '%s'", url_path, spath);
-			}
+			QDesktopServices::openUrl(QUrl::fromLocalFile(path));
 		}
 
 		void open_dir(const QString& path)
 		{
-			open_dir(path.toStdString());
+			open_dir(sstr(path));
 		}
 
 		QTreeWidgetItem* find_child(QTreeWidgetItem* parent, const QString& text)
@@ -516,8 +342,10 @@ namespace gui
 			return nullptr;
 		}
 
-		void find_children_by_data(QTreeWidgetItem* parent, std::vector<QTreeWidgetItem*>& children, const std::vector<std::pair<int /*role*/, QVariant /*data*/>>& criteria, bool recursive)
+		QList<QTreeWidgetItem*> find_children_by_data(QTreeWidgetItem* parent, const QList<QPair<int /*role*/, QVariant /*data*/>>& criteria, bool recursive)
 		{
+			QList<QTreeWidgetItem*> list;
+
 			if (parent)
 			{
 				for (int i = 0; i < parent->childCount(); i++)
@@ -537,16 +365,18 @@ namespace gui
 
 						if (match)
 						{
-							children.push_back(item);
+							list << item;
 						}
 
 						if (recursive)
 						{
-							find_children_by_data(item, children, criteria, recursive);
+							list << find_children_by_data(item, criteria, recursive);
 						}
 					}
 				}
 			}
+
+			return list;
 		}
 
 		QTreeWidgetItem* add_child(QTreeWidgetItem *parent, const QString& text, int column)
@@ -572,7 +402,7 @@ namespace gui
 			}
 		}
 
-		void remove_children(QTreeWidgetItem* parent, const std::vector<std::pair<int /*role*/, QVariant /*data*/>>& criteria, bool recursive)
+		void remove_children(QTreeWidgetItem* parent, const QList<QPair<int /*role*/, QVariant /*data*/>>& criteria, bool recursive)
 		{
 			if (parent)
 			{
@@ -635,26 +465,5 @@ namespace gui
 				}
 			}
 		}
-
-		QString format_byte_size(usz size)
-		{
-			usz byte_unit = 0;
-			usz divisor = 1;
-#if defined(__APPLE__)
-			constexpr usz multiplier = 1000; 
-			static const QString s_units[]{"B", "kB", "MB", "GB", "TB", "PB"};
-#else
-			constexpr usz multiplier = 1024;
-			static const QString s_units[]{"B", "KiB", "MiB", "GiB", "TiB", "PiB"};
-#endif
-
-			while (byte_unit < std::size(s_units) - 1 && size / divisor >= multiplier)
-			{
-				byte_unit++;
-				divisor *= multiplier;
-			}
-
-			return QStringLiteral("%0 %1").arg(QString::number((size + 0.) / divisor, 'f', 2)).arg(s_units[byte_unit]);
-		}
 	} // utils
 } // gui
diff --git a/rpcs3/rpcs3qt/qt_utils.h b/rpcs3/rpcs3qt/qt_utils.h
index 10427a9d8a..8efc3da535 100644
--- a/rpcs3/rpcs3qt/qt_utils.h
+++ b/rpcs3/rpcs3qt/qt_utils.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "util/types.hpp"
-#include "util/atomic.hpp"
 
 #include <QDir>
 #include <QComboBox>
@@ -11,36 +10,13 @@
 #include <QTableWidget>
 #include <QHeaderView>
 #include <QTreeWidgetItem>
-#include <QPainter>
-#include <QFutureWatcher>
-#include <QGuiApplication>
-#include <QStyleHints>
 
 #include <string>
-#include <map>
 
 namespace gui
 {
 	namespace utils
 	{
-		class circle_pixmap : public QPixmap
-		{
-		public:
-			circle_pixmap(const QColor& color, qreal pixel_ratio)
-			    : QPixmap(pixel_ratio * 16, pixel_ratio * 16)
-			{
-				fill(Qt::transparent);
-
-				QPainter painter(this);
-				setDevicePixelRatio(pixel_ratio);
-				painter.setRenderHint(QPainter::Antialiasing);
-				painter.setPen(Qt::NoPen);
-				painter.setBrush(color);
-				painter.drawEllipse(0, 0, width(), height());
-				painter.end();
-			}
-		};
-
 		template<typename T>
 		static QSet<T> list_to_set(const QList<T>& list)
 		{
@@ -51,9 +27,6 @@ namespace gui
 		// while still considering screen boundaries.
 		QRect create_centered_window_geometry(const QScreen* screen, const QRect& base, s32 target_width, s32 target_height);
 
-		// Creates a square pixmap while keeping the original aspect ratio of the image.
-		bool create_square_pixmap(QPixmap& pixmap, int target_size);
-
 		// Returns a custom colored QPixmap based on another QPixmap.
 		// use colorize_all to repaint every opaque pixel with the chosen color
 		// use_special_masks is only used for pixmaps with multiple predefined colors
@@ -63,19 +36,12 @@ namespace gui
 		// use colorize_all to repaint every opaque pixel with the chosen color
 		// use_special_masks is only used for icons with multiple predefined colors
 		QIcon get_colorized_icon(const QIcon& old_icon, const QColor& old_color, const QColor& new_color, bool use_special_masks = false, bool colorize_all = false);
-		QIcon get_colorized_icon(const QIcon& old_icon, const QColor& old_color, const std::map<QIcon::Mode, QColor>& new_colors, bool use_special_masks = false, bool colorize_all = false);
 
 		// Returns a list of all base names of files in dir whose complete file names contain one of the given name_filters
-		QStringList get_dir_entries(const QDir& dir, const QStringList& name_filters, bool full_path = false);
-
-		// Returns the foreground color of QLabel with respect to the current light/dark mode.
-		QColor get_foreground_color();
-
-		// Returns the background color of QLabel with respect to the current light/dark mode.
-		QColor get_background_color();
+		QStringList get_dir_entries(const QDir& dir, const QStringList& name_filters);
 
 		// Returns the color specified by its color_role for the QLabels with object_name
-		QColor get_label_color(const QString& object_name, const QColor& fallback_light, const QColor& fallback_dark, QPalette::ColorRole color_role = QPalette::WindowText);
+		QColor get_label_color(const QString& object_name, QPalette::ColorRole color_role = QPalette::WindowText);
 
 		// Returns the font of the QLabels with object_name
 		QFont get_label_font(const QString& object_name);
@@ -83,24 +49,6 @@ namespace gui
 		// Returns the width of the text
 		int get_label_width(const QString& text, const QFont* font = nullptr);
 
-		// Returns the color for richtext <a> links.
-		QColor get_link_color(const QString& name = "richtext_link_color");
-
-		// Returns the color string for richtext <a> links.
-		QString get_link_color_string(const QString& name = "richtext_link_color");
-
-		// Returns the style for richtext <a> links. e.g. style="color: #123456;"
-		QString get_link_style(const QString& name = "richtext_link_color");
-
-		// Returns a richtext link
-		QString make_link(const QString& text, const QString& url);
-
-		// Returns a bold richtext string
-		QString make_bold(const QString& text);
-
-		// Returns a richtext paragraph with white-space: nowrap;
-		QString make_paragraph(QString text, const QString& white_space_style = "nowrap");
-
 		template <typename T>
 		void set_font_size(T& qobj, int size)
 		{
@@ -109,12 +57,6 @@ namespace gui
 			qobj.setFont(font);
 		}
 
-		// Returns a scaled, centered QPixmap
-		QPixmap get_centered_pixmap(QPixmap pixmap, const QSize& icon_size, int offset_x, int offset_y, qreal device_pixel_ratio, Qt::TransformationMode mode);
-
-		// Returns a scaled, centered QPixmap
-		QPixmap get_centered_pixmap(const QString& path, const QSize& icon_size, int offset_x, int offset_y, qreal device_pixel_ratio, Qt::TransformationMode mode);
-
 		// Returns the part of the image loaded from path that is inside the bounding box of its opaque areas
 		QImage get_opaque_image_area(const QString& path);
 
@@ -140,7 +82,7 @@ namespace gui
 		QTreeWidgetItem* find_child(QTreeWidgetItem* parent, const QString& text);
 
 		// Finds all children of a QTreeWidgetItem that match the given criteria
-		void find_children_by_data(QTreeWidgetItem* parent, std::vector<QTreeWidgetItem*>& children, const std::vector<std::pair<int /*role*/, QVariant /*data*/>>& criteria, bool recursive);
+		QList<QTreeWidgetItem*> find_children_by_data(QTreeWidgetItem* parent, const QList<QPair<int /*role*/, QVariant /*data*/>>& criteria, bool recursive);
 
 		// Constructs and adds a child to a QTreeWidgetItem
 		QTreeWidgetItem* add_child(QTreeWidgetItem* parent, const QString& text, int column = 0);
@@ -149,45 +91,9 @@ namespace gui
 		void remove_children(QTreeWidgetItem* parent);
 
 		// Removes all children of a QTreeWidgetItem that don't match the given criteria
-		void remove_children(QTreeWidgetItem* parent, const std::vector<std::pair<int /*role*/, QVariant /*data*/>>& criteria, bool recursive);
+		void remove_children(QTreeWidgetItem* parent, const QList<QPair<int /*role*/, QVariant /*data*/>>& criteria, bool recursive);
 
 		// Sort a QTreeWidget (currently only column 0)
 		void sort_tree(QTreeWidget* tree, Qt::SortOrder sort_order, bool recursive);
-
-		// Convert an arbitrary count of bytes to a readable format using global units (KB, MB...)
-		QString format_byte_size(usz size);
-
-		static inline Qt::ColorScheme color_scheme()
-		{
-			// use the QGuiApplication's properties to report the default GUI color scheme
-			return QGuiApplication::styleHints()->colorScheme();
-		}
-
-		static inline bool dark_mode_active()
-		{
-			// "true" if the default GUI color scheme is dark. "false" otherwise
-			return color_scheme() == Qt::ColorScheme::Dark;
-		}
-
-		template <typename T>
-		void stop_future_watcher(QFutureWatcher<T>& watcher, bool cancel, std::shared_ptr<atomic_t<bool>> cancel_flag = nullptr)
-		{
-			if (watcher.isSuspended() || watcher.isRunning())
-			{
-				watcher.resume();
-
-				if (cancel)
-				{
-					watcher.cancel();
-
-					// We use an optional cancel flag since the QFutureWatcher::canceled signal seems to be very unreliable
-					if (cancel_flag)
-					{
-						*cancel_flag = true;
-					}
-				}
-				watcher.waitForFinished();
-			}
-		}
 	} // utils
 } // gui
diff --git a/rpcs3/rpcs3qt/qt_video_source.cpp b/rpcs3/rpcs3qt/qt_video_source.cpp
deleted file mode 100644
index 107e5ef850..0000000000
--- a/rpcs3/rpcs3qt/qt_video_source.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-#include "stdafx.h"
-#include "Emu/System.h"
-#include "qt_video_source.h"
-
-#include <QFile>
-
-qt_video_source::qt_video_source()
-	: video_source()
-{
-}
-
-qt_video_source::~qt_video_source()
-{
-	stop_movie();
-}
-
-void qt_video_source::set_video_path(const std::string& video_path)
-{
-	m_video_path = QString::fromStdString(video_path);
-}
-
-void qt_video_source::set_active(bool active)
-{
-	if (m_active.exchange(active) == active) return;
-
-	if (active)
-	{
-		start_movie();
-	}
-	else
-	{
-		stop_movie();
-		image_change_callback();
-	}
-}
-
-void qt_video_source::image_change_callback(const QVideoFrame& frame) const
-{
-	if (m_image_change_callback)
-	{
-		m_image_change_callback(frame);
-	}
-}
-
-void qt_video_source::set_image_change_callback(const std::function<void(const QVideoFrame&)>& func)
-{
-	m_image_change_callback = func;
-}
-
-void qt_video_source::init_movie()
-{
-	if (m_movie || m_media_player)
-	{
-		// Already initialized
-		return;
-	}
-
-	if (!m_image_change_callback || m_video_path.isEmpty() || !QFile::exists(m_video_path))
-	{
-		m_video_path.clear();
-		return;
-	}
-
-	const QString lower = m_video_path.toLower();
-
-	if (lower.endsWith(".gif"))
-	{
-		m_movie = std::make_unique<QMovie>(m_video_path);
-		m_video_path.clear();
-
-		if (!m_movie->isValid())
-		{
-			m_movie.reset();
-			return;
-		}
-
-		QObject::connect(m_movie.get(), &QMovie::frameChanged, m_movie.get(), [this](int)
-		{
-			image_change_callback();
-			m_has_new = true;
-		});
-		return;
-	}
-
-	if (lower.endsWith(".pam"))
-	{
-		// We can't set PAM files as source of the video player, so we have to feed them as raw data.
-		QFile file(m_video_path);
-		if (!file.open(QFile::OpenModeFlag::ReadOnly))
-		{
-			return;
-		}
-
-		// TODO: Decode the pam properly before pushing it to the player
-		m_video_data = file.readAll();
-		if (m_video_data.isEmpty())
-		{
-			return;
-		}
-
-		m_video_buffer = std::make_unique<QBuffer>(&m_video_data);
-		m_video_buffer->open(QIODevice::ReadOnly);
-	}
-
-	m_video_sink = std::make_unique<QVideoSink>();
-	QObject::connect(m_video_sink.get(), &QVideoSink::videoFrameChanged, m_video_sink.get(), [this](const QVideoFrame& frame)
-	{
-		image_change_callback(frame);
-		m_has_new = true;
-	});
-
-	m_media_player = std::make_unique<QMediaPlayer>();
-	m_media_player->setVideoSink(m_video_sink.get());
-	m_media_player->setLoops(QMediaPlayer::Infinite);
-
-	if (m_video_buffer)
-	{
-		m_media_player->setSourceDevice(m_video_buffer.get());
-	}
-	else
-	{
-		m_media_player->setSource(m_video_path);
-	}
-}
-
-void qt_video_source::start_movie()
-{
-	init_movie();
-
-	if (m_movie)
-	{
-		m_movie->jumpToFrame(1);
-		m_movie->start();
-	}
-
-	if (m_media_player)
-	{
-		m_media_player->play();
-	}
-
-	m_active = true;
-}
-
-void qt_video_source::stop_movie()
-{
-	m_active = false;
-
-	if (m_movie)
-	{
-		m_movie->stop();
-	}
-
-	m_video_sink.reset();
-	m_media_player.reset();
-	m_video_buffer.reset();
-	m_video_data.clear();
-}
-
-QPixmap qt_video_source::get_movie_image(const QVideoFrame& frame) const
-{
-	if (!m_active)
-	{
-		return {};
-	}
-
-	if (m_movie)
-	{
-		return m_movie->currentPixmap();
-	}
-
-	if (!frame.isValid())
-	{
-		return {};
-	}
-
-	// Get image. This usually also converts the image to ARGB32.
-	return QPixmap::fromImage(frame.toImage());
-}
-
-void qt_video_source::get_image(std::vector<u8>& data, int& w, int& h, int& ch, int& bpp)
-{
-	if (!m_has_new.exchange(false))
-	{
-		return;
-	}
-
-	std::lock_guard lock(m_image_mutex);
-
-	if (m_image.isNull())
-	{
-		w = h = ch = bpp = 0;
-		data.clear();
-		return;
-	}
-
-	w = m_image.width();
-	h = m_image.height();
-	ch = m_image.colorCount();
-	bpp = m_image.depth();
-
-	data.resize(m_image.height() * m_image.bytesPerLine());
-	std::memcpy(data.data(), m_image.constBits(), data.size());
-}
-
-qt_video_source_wrapper::~qt_video_source_wrapper()
-{
-	Emu.BlockingCallFromMainThread([this]()
-	{
-		m_qt_video_source.reset();
-	});
-}
-
-void qt_video_source_wrapper::set_video_path(const std::string& video_path)
-{
-	Emu.CallFromMainThread([this, path = video_path]()
-	{
-		m_qt_video_source = std::make_unique<qt_video_source>();
-		m_qt_video_source->m_image_change_callback = [this](const QVideoFrame& frame)
-		{
-			std::unique_lock lock(m_qt_video_source->m_image_mutex);
-
-			if (m_qt_video_source->m_movie)
-			{
-				m_qt_video_source->m_image = m_qt_video_source->m_movie->currentImage();
-			}
-			else if (frame.isValid())
-			{
-				// Get image. This usually also converts the image to ARGB32.
-				m_qt_video_source->m_image = frame.toImage();
-			}
-			else
-			{
-				return;
-			}
-
-			if (m_qt_video_source->m_image.format() != QImage::Format_RGBA8888)
-			{
-				m_qt_video_source->m_image.convertTo(QImage::Format_RGBA8888);
-			}
-
-			lock.unlock();
-
-			notify_update();
-		};
-		m_qt_video_source->set_video_path(path);
-	});
-}
-
-void qt_video_source_wrapper::set_active(bool active)
-{
-	Emu.CallFromMainThread([this, active]()
-	{
-		m_qt_video_source->set_active(true);
-	});
-}
-
-bool qt_video_source_wrapper::get_active() const
-{
-	ensure(m_qt_video_source);
-
-	return m_qt_video_source->get_active();
-}
-
-void qt_video_source_wrapper::get_image(std::vector<u8>& data, int& w, int& h, int& ch, int& bpp)
-{
-	ensure(m_qt_video_source);
-
-	m_qt_video_source->get_image(data, w, h, ch, bpp);
-}
diff --git a/rpcs3/rpcs3qt/qt_video_source.h b/rpcs3/rpcs3qt/qt_video_source.h
deleted file mode 100644
index a2710eea33..0000000000
--- a/rpcs3/rpcs3qt/qt_video_source.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#pragma once
-
-#include "util/video_source.h"
-#include "util/atomic.hpp"
-#include "Utilities/mutex.h"
-
-#include <QMovie>
-#include <QBuffer>
-#include <QMediaPlayer>
-#include <QVideoSink>
-#include <QVideoFrame>
-#include <QPixmap>
-
-class qt_video_source : public video_source
-{
-public:
-	qt_video_source();
-	virtual ~qt_video_source();
-
-	void set_video_path(const std::string& video_path) override;
-	const QString& video_path() const { return m_video_path; }
-
-	void get_image(std::vector<u8>& data, int& w, int& h, int& ch, int& bpp) override;
-	bool has_new() const override { return m_has_new; }
-
-	void set_active(bool active) override;
-	bool get_active() const override { return m_active; }
-
-	void start_movie();
-	void stop_movie();
-
-	QPixmap get_movie_image(const QVideoFrame& frame) const;
-
-	void image_change_callback(const QVideoFrame& frame = {}) const;
-	void set_image_change_callback(const std::function<void(const QVideoFrame&)>& func);
-
-protected:
-	void init_movie();
-
-	shared_mutex m_image_mutex;
-
-	atomic_t<bool> m_active = false;
-	atomic_t<bool> m_has_new = false;
-
-	QString m_video_path;
-	QByteArray m_video_data{};
-	QImage m_image{};
-	std::vector<u8> m_image_path;
-
-	std::unique_ptr<QBuffer> m_video_buffer;
-	std::unique_ptr<QMediaPlayer> m_media_player;
-	std::unique_ptr<QVideoSink> m_video_sink;
-	std::unique_ptr<QMovie> m_movie;
-
-	std::function<void(const QVideoFrame&)> m_image_change_callback = nullptr;
-
-	friend class qt_video_source_wrapper;
-};
-
-// Wrapper for emulator usage
-class qt_video_source_wrapper : public video_source
-{
-public:
-	qt_video_source_wrapper() : video_source() {}
-	virtual ~qt_video_source_wrapper();
-
-	void set_video_path(const std::string& video_path) override;
-	void set_active(bool active) override;
-	bool get_active() const override;
-	bool has_new() const override { return m_qt_video_source && m_qt_video_source->has_new(); }
-	void get_image(std::vector<u8>& data, int& w, int& h, int& ch, int& bpp) override;
-
-private:
-	std::unique_ptr<qt_video_source> m_qt_video_source;
-};
diff --git a/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp b/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp
deleted file mode 100644
index eaacc9c524..0000000000
--- a/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp
+++ /dev/null
@@ -1,580 +0,0 @@
-#include "stdafx.h"
-#include "raw_mouse_settings_dialog.h"
-#include "localized_emu.h"
-#include "gui_application.h"
-#include "Input/raw_mouse_config.h"
-#include "Input/raw_mouse_handler.h"
-#include "util/asm.hpp"
-
-#include <QAbstractItemView>
-#include <QGroupBox>
-#include <QMessageBox>
-#include <QVBoxLayout>
-
-LOG_CHANNEL(cfg_log, "CFG");
-
-constexpr u32 button_count = 8;
-
-raw_mouse_settings_dialog::raw_mouse_settings_dialog(QWidget* parent)
-	: QDialog(parent)
-{
-	setObjectName("raw_mouse_settings_dialog");
-	setWindowTitle(tr("Configure Raw Mouse Handler"));
-	setAttribute(Qt::WA_DeleteOnClose);
-	setAttribute(Qt::WA_StyledBackground);
-	setModal(true);
-
-	QVBoxLayout* v_layout = new QVBoxLayout(this);
-
-	m_tab_widget = new QTabWidget();
-	m_tab_widget->setUsesScrollButtons(false);
-
-	m_button_box = new QDialogButtonBox(this);
-	m_button_box->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::Save | QDialogButtonBox::RestoreDefaults);
-
-	connect(m_button_box, &QDialogButtonBox::clicked, this, [this](QAbstractButton* button)
-	{
-		if (button == m_button_box->button(QDialogButtonBox::Apply))
-		{
-			g_cfg_raw_mouse.save();
-		}
-		else if (button == m_button_box->button(QDialogButtonBox::Save))
-		{
-			g_cfg_raw_mouse.save();
-			accept();
-		}
-		else if (button == m_button_box->button(QDialogButtonBox::RestoreDefaults))
-		{
-			if (QMessageBox::question(this, tr("Confirm Reset"), tr("Reset settings of all players?")) != QMessageBox::Yes)
-				return;
-			reset_config();
-		}
-		else if (button == m_button_box->button(QDialogButtonBox::Cancel))
-		{
-			// Restore config
-			if (!g_cfg_raw_mouse.load())
-			{
-				cfg_log.notice("Could not restore raw mouse config. Using defaults.");
-			}
-			reject();
-		}
-	});
-
-	if (!g_cfg_raw_mouse.load())
-	{
-		cfg_log.notice("Could not load raw mouse config. Using defaults.");
-	}
-
-	constexpr u32 max_devices = 16;
-
-	g_raw_mouse_handler = std::make_unique<raw_mouse_handler>();
-	g_raw_mouse_handler->set_is_for_gui(true);
-	g_raw_mouse_handler->Init(std::max(max_devices, ::size32(g_cfg_raw_mouse.players)));
-	g_raw_mouse_handler->set_mouse_press_callback([this](const std::string& device_name, s32 button_code, bool pressed)
-	{
-		mouse_press(device_name, button_code, pressed);
-	});
-	g_raw_mouse_handler->set_key_press_callback([this](const std::string& device_name, s32 scan_code, bool pressed)
-	{
-		key_press(device_name, scan_code, pressed);
-	});
-
-	m_buttons = new QButtonGroup(this);
-	connect(m_buttons, &QButtonGroup::idClicked, this, &raw_mouse_settings_dialog::on_button_click);
-
-	connect(&m_update_timer, &QTimer::timeout, this, &raw_mouse_settings_dialog::on_enumeration);
-
-	connect(&m_remap_timer, &QTimer::timeout, this, [this]()
-	{
-		auto button = m_buttons->button(m_button_id);
-
-		if (--m_seconds <= 0)
-		{
-			if (button)
-			{
-				if (const int button_id = m_buttons->id(button); button_id >= 0)
-				{
-					auto& config = ::at32(g_cfg_raw_mouse.players, m_tab_widget->currentIndex());
-					const std::string name = raw_mouse_config::get_button_name(config->get_button_by_index(button_id % button_count).to_string());
-					button->setText(name.empty() ? QStringLiteral("-") : QString::fromStdString(name));
-				}
-			}
-			reactivate_buttons();
-			return;
-		}
-		if (button)
-		{
-			button->setText(tr("[ Waiting %1 ]").arg(m_seconds));
-		}
-	});
-
-	connect(&m_mouse_release_timer, &QTimer::timeout, this, [this]()
-	{
-		m_mouse_release_timer.stop();
-		m_disable_mouse_release_event = false;
-	});
-
-	add_tabs(m_tab_widget);
-
-	v_layout->addWidget(m_tab_widget);
-	v_layout->addWidget(m_button_box);
-	setLayout(v_layout);
-
-	m_palette = m_push_buttons[0][CELL_MOUSE_BUTTON_1]->palette(); // save normal palette
-
-	connect(m_tab_widget, &QTabWidget::currentChanged, this, [this](int index)
-	{
-		handle_device_change(get_current_device_name(index));
-	});
-
-	on_enumeration();
-
-	handle_device_change(get_current_device_name(0));
-
-	m_update_timer.start(1000ms);
-}
-
-raw_mouse_settings_dialog::~raw_mouse_settings_dialog()
-{
-	g_raw_mouse_handler.reset();
-}
-
-void raw_mouse_settings_dialog::update_combo_box(usz player)
-{
-	auto& config = ::at32(g_cfg_raw_mouse.players, player);
-	const std::string device_name = config->device.to_string();
-	const QString current_device = QString::fromStdString(device_name);
-	bool found_device = false;
-
-	QComboBox* combo = ::at32(m_device_combos, player);
-
-	combo->blockSignals(true);
-	combo->clear();
-	combo->addItem(tr("Disabled"), QString());
-
-	{
-		std::lock_guard lock(g_raw_mouse_handler->m_raw_mutex);
-
-		const auto& mice = g_raw_mouse_handler->get_mice();
-
-		for (const auto& [handle, mouse] : mice)
-		{
-			const QString name = QString::fromStdString(mouse.device_name());
-			const QString& pretty_name = name; // Same ugly device path for now
-			combo->addItem(pretty_name, name);
-
-			if (current_device == name)
-			{
-				found_device = true;
-			}
-		}
-	}
-
-	// Keep configured device in list even if it is not connected
-	if (!found_device && !current_device.isEmpty())
-	{
-		const QString& pretty_name = current_device; // Same ugly device path for now
-		combo->addItem(pretty_name, current_device);
-	}
-
-	// Select index
-	combo->setCurrentIndex(std::max(0, combo->findData(current_device)));
-	combo->blockSignals(false);
-
-	if (static_cast<int>(player) == m_tab_widget->currentIndex())
-	{
-		handle_device_change(device_name);
-	}
-}
-
-void raw_mouse_settings_dialog::add_tabs(QTabWidget* tabs)
-{
-	ensure(!!tabs);
-
-	constexpr u32 max_items_per_column = 6;
-	int rows = button_count;
-
-	for (u32 cols = 1; utils::aligned_div(button_count, cols) > max_items_per_column;)
-	{
-		rows = utils::aligned_div(button_count, ++cols);
-	}
-
-	constexpr usz players = g_cfg_raw_mouse.players.size();
-
-	m_push_buttons.resize(players);
-
-	ensure(g_raw_mouse_handler);
-
-	const auto insert_button = [this](int id, QPushButton* button)
-	{
-		m_buttons->addButton(button, id);
-		button->installEventFilter(this);
-	};
-
-	for (usz player = 0; player < players; player++)
-	{
-		QWidget* widget = new QWidget(this);
-		QGridLayout* grid_layout = new QGridLayout(this);
-
-		auto& config = ::at32(g_cfg_raw_mouse.players, player);
-
-		QHBoxLayout* h_layout = new QHBoxLayout(this);
-		QGroupBox* gb = new QGroupBox(tr("Device"), this);
-		QComboBox* combo = new QComboBox(this);
-		m_device_combos.push_back(combo);
-
-		update_combo_box(player);
-
-		connect(combo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this, player, combo](int index)
-		{
-			if (index < 0 || !combo)
-				return;
-
-			const QVariant data = combo->itemData(index);
-			if (!data.isValid() || !data.canConvert<QString>())
-				return;
-
-			const std::string device_name = data.toString().toStdString();
-
-			auto& config = ::at32(g_cfg_raw_mouse.players, player)->device;
-			config.from_string(device_name);
-
-			handle_device_change(device_name);
-		});
-
-		h_layout->addWidget(combo);
-		gb->setLayout(h_layout);
-		grid_layout->addWidget(gb, 0, 0, 1, 2);
-
-		const int first_row = grid_layout->rowCount();
-
-		for (int i = 0, row = first_row, col = 0; i < static_cast<int>(button_count); i++, row++)
-		{
-			const int cell_code = get_mouse_button_code(i);
-			const QString translated_cell_button = localized_emu::translated_mouse_button(cell_code);
-
-			QHBoxLayout* h_layout = new QHBoxLayout(this);
-			QGroupBox* gb = new QGroupBox(translated_cell_button, this);
-			QPushButton* pb = new QPushButton;
-
-			insert_button(static_cast<int>(player * button_count + i), pb);
-
-			const std::string saved_btn = raw_mouse_config::get_button_name(config->get_button(cell_code).to_string());
-
-			pb->setText(saved_btn.empty() ? QStringLiteral("-") : QString::fromStdString(saved_btn));
-
-			if (row >= rows + first_row)
-			{
-				row = first_row;
-				col++;
-			}
-
-			m_push_buttons[player][cell_code] = pb;
-			h_layout->addWidget(pb);
-			gb->setLayout(h_layout);
-			grid_layout->addWidget(gb, row, col);
-		}
-
-		h_layout = new QHBoxLayout(this);
-		gb = new QGroupBox(tr("Mouse Acceleration"), this);
-		QDoubleSpinBox* mouse_acceleration_spin_box = new QDoubleSpinBox(this);
-		m_accel_spin_boxes.push_back(mouse_acceleration_spin_box);
-		mouse_acceleration_spin_box->setRange(0.1, 10.0);
-		mouse_acceleration_spin_box->setValue(config->mouse_acceleration.get() / 100.0);
-		connect(mouse_acceleration_spin_box, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, [player](double value)
-		{
-			auto& config = ::at32(g_cfg_raw_mouse.players, player)->mouse_acceleration;
-			config.set(std::clamp(value * 100.0, config.min, config.max));
-		});
-
-		h_layout->addWidget(mouse_acceleration_spin_box);
-		gb->setLayout(h_layout);
-		grid_layout->addWidget(gb, grid_layout->rowCount(), 0);
-
-		widget->setLayout(grid_layout);
-		tabs->addTab(widget, tr("Player %0").arg(player + 1));
-	}
-}
-
-void raw_mouse_settings_dialog::on_enumeration()
-{
-	if (!g_raw_mouse_handler)
-	{
-		return;
-	}
-
-	const int player = m_tab_widget->currentIndex();
-	QComboBox* combo = ::at32(m_device_combos, player);
-
-	// Don't enumerate while the current dropdown is open
-	if (combo && combo->view()->isVisible())
-	{
-		return;
-	}
-
-	g_raw_mouse_handler->update_devices();
-
-	// Update all dropdowns
-	for (usz player = 0; player < g_cfg_raw_mouse.players.size(); player++)
-	{
-		update_combo_box(player);
-	}
-}
-
-void raw_mouse_settings_dialog::reset_config()
-{
-	g_cfg_raw_mouse.from_default();
-
-	for (usz player = 0; player < m_push_buttons.size(); player++)
-	{
-		auto& config = ::at32(g_cfg_raw_mouse.players, player);
-
-		for (auto& [cell_code, pb] : m_push_buttons[player])
-		{
-			if (!pb)
-				continue;
-
-			const std::string text = raw_mouse_config::get_button_name(config->get_button(cell_code).def);
-			pb->setText(text.empty() ? QStringLiteral("-") : QString::fromStdString(text));
-		}
-
-		if (QComboBox* combo = ::at32(m_device_combos, player))
-		{
-			combo->setCurrentIndex(combo->findData(QString::fromStdString(config->device.to_string())));
-		}
-
-		if (QDoubleSpinBox* sb = ::at32(m_accel_spin_boxes, player))
-		{
-			sb->setValue(config->mouse_acceleration.get() / 100.0);
-		}
-	}
-}
-
-void raw_mouse_settings_dialog::mouse_press(const std::string& device_name, s32 button_code, bool pressed)
-{
-	if (m_button_id < 0 || pressed) // Let's only react to mouse releases
-	{
-		return;
-	}
-
-	const int player = m_tab_widget->currentIndex();
-	const std::string current_device_name = get_current_device_name(player);
-
-	if (device_name != current_device_name)
-	{
-		return;
-	}
-
-	const std::string button_name = raw_mouse_config::get_button_name(button_code);
-
-	auto& config = ::at32(g_cfg_raw_mouse.players, player);
-	config->get_button_by_index(m_button_id % button_count).from_string(button_name);
-
-	if (auto button = m_buttons->button(m_button_id))
-	{
-		button->setText(QString::fromStdString(button_name));
-	}
-
-	reactivate_buttons();
-}
-
-void raw_mouse_settings_dialog::key_press(const std::string& device_name, s32 scan_code, bool pressed)
-{
-	if (m_button_id < 0 || !pressed) // Let's only react to key presses
-	{
-		return;
-	}
-
-	const int player = m_tab_widget->currentIndex();
-	const std::string current_device_name = get_current_device_name(player);
-
-	if (device_name != current_device_name)
-	{
-		return;
-	}
-
-	auto& config = ::at32(g_cfg_raw_mouse.players, player);
-	config->get_button_by_index(m_button_id % button_count).from_string(fmt::format("%s%d", raw_mouse_config::key_prefix, scan_code));
-
-	if (auto button = m_buttons->button(m_button_id))
-	{
-		button->setText(QString::fromStdString(raw_mouse_config::get_key_name(scan_code)));
-	}
-
-	reactivate_buttons();
-}
-
-void raw_mouse_settings_dialog::handle_device_change(const std::string& device_name)
-{
-	if (is_device_active(device_name))
-	{
-		reactivate_buttons();
-	}
-	else
-	{
-		for (auto but : m_buttons->buttons())
-		{
-			but->setEnabled(false);
-		}
-	}
-}
-
-bool raw_mouse_settings_dialog::is_device_active(const std::string& device_name)
-{
-	if (!g_raw_mouse_handler || device_name.empty())
-	{
-		return false;
-	}
-
-	std::lock_guard lock(g_raw_mouse_handler->m_raw_mutex);
-
-	const auto& mice = g_raw_mouse_handler->get_mice();
-
-	return std::any_of(mice.cbegin(), mice.cend(), [&device_name](const auto& entry){ return entry.second.device_name() == device_name; });
-}
-
-std::string raw_mouse_settings_dialog::get_current_device_name(int player)
-{
-	if (player < 0)
-		return {};
-
-	const QVariant data = ::at32(m_device_combos, player)->currentData();
-
-	if (!data.canConvert<QString>())
-		return {};
-
-	return data.toString().toStdString();
-}
-
-bool raw_mouse_settings_dialog::eventFilter(QObject* object, QEvent* event)
-{
-	switch (event->type())
-	{
-	case QEvent::MouseButtonRelease:
-	{
-		// On right click clear binding if we are not remapping pad button
-		if (m_button_id < 0 && !m_disable_mouse_release_event)
-		{
-			QMouseEvent* mouse_event = static_cast<QMouseEvent*>(event);
-			if (const auto button = qobject_cast<QPushButton*>(object); button && button->isEnabled() && mouse_event->button() == Qt::RightButton)
-			{
-				if (const int button_id = m_buttons->id(button); button_id >= 0)
-				{
-					button->setText(QStringLiteral("-"));
-					auto& config = ::at32(g_cfg_raw_mouse.players, m_tab_widget->currentIndex());
-					config->get_button_by_index(button_id % button_count).from_string("");
-					return true;
-				}
-			}
-		}
-
-		// Disabled buttons should not absorb mouseclicks
-		event->ignore();
-		break;
-	}
-	default:
-	{
-		break;
-	}
-	}
-
-	return QDialog::eventFilter(object, event);
-}
-
-void raw_mouse_settings_dialog::on_button_click(int id)
-{
-	if (id < 0)
-	{
-		return;
-	}
-
-	m_update_timer.stop();
-
-	for (auto sb : m_accel_spin_boxes)
-	{
-		sb->setEnabled(false);
-		sb->setFocusPolicy(Qt::ClickFocus);
-	}
-
-	for (auto cb : m_device_combos)
-	{
-		cb->setEnabled(false);
-		cb->setFocusPolicy(Qt::ClickFocus);
-	}
-
-	for (auto but : m_buttons->buttons())
-	{
-		but->setEnabled(false);
-		but->setFocusPolicy(Qt::ClickFocus);
-	}
-
-	m_button_box->setEnabled(false);
-	for (auto but : m_button_box->buttons())
-	{
-		but->setFocusPolicy(Qt::ClickFocus);
-	}
-
-	m_button_id = id;
-	if (auto button = m_buttons->button(m_button_id))
-	{
-		button->setText(tr("[ Waiting %1 ]").arg(MAX_SECONDS));
-		button->setPalette(QPalette(Qt::blue));
-		button->grabMouse();
-	}
-
-	m_tab_widget->setEnabled(false);
-
-	m_remap_timer.start(1000);
-
-	// We need to disable the mouse release event filter or we will clear the button if the raw mouse does a right click
-	m_mouse_release_timer.stop();
-	m_disable_mouse_release_event = true;
-}
-
-void raw_mouse_settings_dialog::reactivate_buttons()
-{
-	m_remap_timer.stop();
-	m_seconds = MAX_SECONDS;
-
-	if (m_button_id >= 0)
-	{
-		if (auto button = m_buttons->button(m_button_id))
-		{
-			button->setPalette(m_palette);
-			button->releaseMouse();
-		}
-
-		m_button_id = -1;
-	}
-
-	// Enable all buttons
-	m_button_box->setEnabled(true);
-
-	for (auto but : m_button_box->buttons())
-	{
-		but->setFocusPolicy(Qt::StrongFocus);
-	}
-
-	for (auto sb : m_accel_spin_boxes)
-	{
-		sb->setEnabled(true);
-		sb->setFocusPolicy(Qt::StrongFocus);
-	}
-
-	for (auto cb : m_device_combos)
-	{
-		cb->setEnabled(true);
-		cb->setFocusPolicy(Qt::StrongFocus);
-	}
-
-	for (auto but : m_buttons->buttons())
-	{
-		but->setEnabled(true);
-		but->setFocusPolicy(Qt::StrongFocus);
-	}
-
-	m_tab_widget->setEnabled(true);
-
-	m_mouse_release_timer.start(100ms);
-	m_update_timer.start(1000ms);
-}
diff --git a/rpcs3/rpcs3qt/raw_mouse_settings_dialog.h b/rpcs3/rpcs3qt/raw_mouse_settings_dialog.h
deleted file mode 100644
index 16aced5a77..0000000000
--- a/rpcs3/rpcs3qt/raw_mouse_settings_dialog.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-
-#include <QButtonGroup>
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QDialog>
-#include <QDoubleSpinBox>
-#include <QMouseEvent>
-#include <QPalette>
-#include <QPushButton>
-#include <QTabWidget>
-#include <QTimer>
-
-#include <vector>
-#include <unordered_map>
-
-class raw_mouse_settings_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	raw_mouse_settings_dialog(QWidget* parent = nullptr);
-	virtual ~raw_mouse_settings_dialog();
-
-private:
-	void update_combo_box(usz player);
-	void add_tabs(QTabWidget* tabs);
-	void on_enumeration();
-	void reset_config();
-	void on_button_click(int id);
-	void mouse_press(const std::string& device_name, s32 button_code, bool pressed);
-	void key_press(const std::string& device_name, s32 scan_code, bool pressed);
-	void handle_device_change(const std::string& device_name);
-	bool is_device_active(const std::string& device_name);
-	std::string get_current_device_name(int player);
-	void reactivate_buttons();
-
-	QTabWidget* m_tab_widget = nullptr;
-	std::vector<QComboBox*> m_device_combos;
-	std::vector<QDoubleSpinBox*> m_accel_spin_boxes;
-
-	// Buttons
-	QDialogButtonBox* m_button_box = nullptr;
-	QButtonGroup* m_buttons = nullptr;
-	std::vector<std::unordered_map<int, QPushButton*>> m_push_buttons;
-	int m_button_id = -1;
-
-	// Backup for standard button palette
-	QPalette m_palette;
-
-	// Remap Timer
-	static constexpr int MAX_SECONDS = 5;
-	int m_seconds = MAX_SECONDS;
-	QTimer m_remap_timer;
-	QTimer m_mouse_release_timer;
-	bool m_disable_mouse_release_event = false;
-
-	// Update Timer
-	QTimer m_update_timer;
-
-protected:
-	bool eventFilter(QObject* object, QEvent* event) override;
-};
diff --git a/rpcs3/rpcs3qt/recvmessage_dialog_frame.cpp b/rpcs3/rpcs3qt/recvmessage_dialog_frame.cpp
deleted file mode 100644
index eb61516ea0..0000000000
--- a/rpcs3/rpcs3qt/recvmessage_dialog_frame.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QMessageBox>
-#include <QTimer>
-
-#include "recvmessage_dialog_frame.h"
-#include "Emu/IdManager.h"
-#include "Emu/System.h"
-#include "Emu/NP/rpcn_client.h"
-
-#include "util/logs.hpp"
-
-LOG_CHANNEL(recvmessage_dlg_log, "recvmessage dlg");
-
-void recvmessage_callback(void* param, shared_ptr<std::pair<std::string, message_data>> new_msg, u64 msg_id)
-{
-	auto* dlg = static_cast<recvmessage_dialog_frame*>(param);
-	dlg->callback_handler(std::move(new_msg), msg_id);
-}
-
-recvmessage_dialog_frame::~recvmessage_dialog_frame()
-{
-	if (m_dialog)
-	{
-		m_dialog->deleteLater();
-	}
-}
-
-error_code recvmessage_dialog_frame::Exec(SceNpBasicMessageMainType type, SceNpBasicMessageRecvOptions options, SceNpBasicMessageRecvAction& recv_result, u64& chosen_msg_id)
-{
-	qRegisterMetaType<recvmessage_signal_struct>();
-
-	if (m_dialog)
-	{
-		m_dialog->close();
-		delete m_dialog;
-	}
-
-	m_dialog = new custom_dialog(false);
-	m_dialog->setModal(true);
-
-	m_dialog->setWindowTitle(tr("Choose message:"));
-
-	m_rpcn = rpcn::rpcn_client::get_instance(0, true);
-
-	QVBoxLayout* vbox_global = new QVBoxLayout();
-
-	m_lst_messages = new QListWidget();
-	vbox_global->addWidget(m_lst_messages);
-
-	QHBoxLayout* hbox_btns = new QHBoxLayout();
-	hbox_btns->addStretch();
-	QPushButton* btn_accept = new QPushButton(tr("Accept"));
-	QPushButton* btn_deny   = new QPushButton(tr("Deny"));
-	QPushButton* btn_cancel = new QPushButton(tr("Cancel"));
-	hbox_btns->addWidget(btn_accept);
-	hbox_btns->addWidget(btn_deny);
-	hbox_btns->addWidget(btn_cancel);
-	vbox_global->addLayout(hbox_btns);
-
-	m_dialog->setLayout(vbox_global);
-
-	error_code result           = CELL_CANCEL;
-	const bool preserve         = options & SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_PRESERVE;
-	const bool include_bootable = options & SCE_NP_BASIC_RECV_MESSAGE_OPTIONS_INCLUDE_BOOTABLE;
-
-	auto accept_or_deny = [preserve, this, &result, &recv_result, &chosen_msg_id](SceNpBasicMessageRecvAction result_from_action)
-	{
-		auto selected = m_lst_messages->selectedItems();
-		if (selected.empty())
-		{
-			QMessageBox::critical(m_dialog, tr("Error receiving a message!"), tr("You must select a message!"), QMessageBox::Ok);
-			return;
-		}
-
-		chosen_msg_id = selected[0]->data(Qt::UserRole).toULongLong();
-		recv_result   = result_from_action;
-		result        = CELL_OK;
-
-		if (!preserve)
-		{
-			m_rpcn->mark_message_used(chosen_msg_id);
-		}
-
-		m_dialog->close();
-	};
-
-	connect(btn_accept, &QAbstractButton::clicked, this, [&accept_or_deny]()
-		{ accept_or_deny(SCE_NP_BASIC_MESSAGE_ACTION_ACCEPT); });
-	connect(btn_deny, &QAbstractButton::clicked, this, [&accept_or_deny]()
-		{ accept_or_deny(SCE_NP_BASIC_MESSAGE_ACTION_DENY); });
-	connect(btn_cancel, &QAbstractButton::clicked, this, [this]()
-		{ m_dialog->close(); });
-	connect(this, &recvmessage_dialog_frame::signal_new_message, this, &recvmessage_dialog_frame::slot_new_message);
-
-	// Get list of messages
-	const auto messages = m_rpcn->get_messages_and_register_cb(type, include_bootable, recvmessage_callback, this);
-	for (const auto& [id, message] : messages)
-	{
-		add_message(message, id);
-	}
-
-	auto& nps = g_fxo->get<np_state>();
-
-	QTimer timer;
-	connect(&timer, &QTimer::timeout, this, [this, &nps, &timer]()
-	{
-		bool abort = Emu.IsStopped();
-
-		if (!abort && nps.abort_gui_flag.exchange(false))
-		{
-			recvmessage_dlg_log.warning("Aborted by sceNp!");
-			abort = true;
-		}
-
-		if (abort)
-		{
-			if (m_dialog)
-			{
-				m_dialog->close();
-			}
-
-			timer.stop();
-		}
-	});
-	timer.start(10ms);
-
-	m_dialog->exec();
-
-	m_rpcn->remove_message_cb(recvmessage_callback, this);
-
-	return result;
-}
-
-void recvmessage_dialog_frame::add_message(const shared_ptr<std::pair<std::string, message_data>>& msg, u64 msg_id)
-{
-	ensure(msg);
-	auto new_item = new QListWidgetItem(QString::fromStdString(msg->first));
-	new_item->setData(Qt::UserRole, static_cast<qulonglong>(msg_id));
-	m_lst_messages->addItem(new_item);
-}
-
-void recvmessage_dialog_frame::slot_new_message(recvmessage_signal_struct msg_and_id)
-{
-	add_message(msg_and_id.msg, msg_and_id.msg_id);
-}
-
-void recvmessage_dialog_frame::callback_handler(shared_ptr<std::pair<std::string, message_data>> new_msg, u64 msg_id)
-{
-	recvmessage_signal_struct signal_struct = {
-		.msg    = new_msg,
-		.msg_id = msg_id,
-	};
-
-	Q_EMIT signal_new_message(signal_struct);
-}
diff --git a/rpcs3/rpcs3qt/recvmessage_dialog_frame.h b/rpcs3/rpcs3qt/recvmessage_dialog_frame.h
deleted file mode 100644
index 16303daa46..0000000000
--- a/rpcs3/rpcs3qt/recvmessage_dialog_frame.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-#include <QObject>
-#include <QListWidget>
-
-#include "util/types.hpp"
-#include "util/shared_ptr.hpp"
-#include "custom_dialog.h"
-#include "Emu/Cell/Modules/sceNp.h"
-
-struct recvmessage_signal_struct
-{
-	shared_ptr<std::pair<std::string, message_data>> msg;
-	u64 msg_id = 0;
-};
-
-Q_DECLARE_METATYPE(recvmessage_signal_struct);
-
-class recvmessage_dialog_frame : public QObject, public RecvMessageDialogBase
-{
-	Q_OBJECT
-
-public:
-	recvmessage_dialog_frame() = default;
-	~recvmessage_dialog_frame();
-	error_code Exec(SceNpBasicMessageMainType type, SceNpBasicMessageRecvOptions options, SceNpBasicMessageRecvAction& recv_result, u64& chosen_msg_id) override;
-	void callback_handler(const shared_ptr<std::pair<std::string, message_data>> new_msg, u64 msg_id) override;
-
-private:
-	void add_message(const shared_ptr<std::pair<std::string, message_data>>& msg, u64 msg_id);
-
-Q_SIGNALS:
-	void signal_new_message(const recvmessage_signal_struct msg_and_id);
-
-private Q_SLOTS:
-	void slot_new_message(const recvmessage_signal_struct msg_and_id);
-
-private:
-	custom_dialog* m_dialog = nullptr;
-	QListWidget* m_lst_messages = nullptr;
-};
diff --git a/rpcs3/rpcs3qt/register_editor_dialog.cpp b/rpcs3/rpcs3qt/register_editor_dialog.cpp
index 639fb7db35..14073c587d 100644
--- a/rpcs3/rpcs3qt/register_editor_dialog.cpp
+++ b/rpcs3/rpcs3qt/register_editor_dialog.cpp
@@ -12,12 +12,15 @@
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QMessageBox>
-#include <QCompleter>
 #include <charconv>
 
 #include "util/v128.hpp"
 #include "util/asm.hpp"
 
+constexpr auto qstr = QString::fromStdString;
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
+inline std::string sstr(const QVariant& _in) { return sstr(_in.toString()); }
+
 enum registers : int
 {
 	ppu_r0,
@@ -58,7 +61,7 @@ enum registers : int
 register_editor_dialog::register_editor_dialog(QWidget *parent, CPUDisAsm* _disasm, std::function<cpu_thread*()> func)
 	: QDialog(parent)
 	, m_disasm(_disasm)
-	, m_get_cpu(func ? std::move(func) : std::function<cpu_thread*()>(FN(nullptr)))
+	, m_get_cpu(std::move(func))
 {
 	setWindowTitle(tr("Edit registers"));
 	setAttribute(Qt::WA_DeleteOnClose);
@@ -78,14 +81,6 @@ register_editor_dialog::register_editor_dialog(QWidget *parent, CPUDisAsm* _disa
 	button_cancel->setFixedWidth(80);
 
 	m_register_combo = new QComboBox(this);
-	m_register_combo->setMaxVisibleItems(20);
-	m_register_combo->setEditable(true);
-	m_register_combo->setInsertPolicy(QComboBox::NoInsert);
-	m_register_combo->lineEdit()->setPlaceholderText(tr("Search a register"));
-	m_register_combo->completer()->setCompletionMode(QCompleter::PopupCompletion);
-	m_register_combo->completer()->setMaxVisibleItems(20);
-	m_register_combo->completer()->setFilterMode(Qt::MatchContains);
-
 	m_value_line = new QLineEdit(this);
 	m_value_line->setFixedWidth(200);
 
@@ -102,12 +97,12 @@ register_editor_dialog::register_editor_dialog(QWidget *parent, CPUDisAsm* _disa
 
 	if (const auto cpu = m_get_cpu())
 	{
-		if (cpu->get_class() == thread_class::ppu)
+		if (cpu->id_type() == 1)
 		{
-			for (int i = ppu_r0; i <= ppu_r31; i++) m_register_combo->addItem(QString::fromStdString(fmt::format("r%d", i % 32)), i);
-			for (int i = ppu_f0; i <= ppu_f31; i++) m_register_combo->addItem(QString::fromStdString(fmt::format("f%d", i % 32)), i);
-			for (int i = ppu_ff0; i <= ppu_ff31; i++) m_register_combo->addItem(QString::fromStdString(fmt::format("ff%d", i % 32)), i);
-			for (int i = ppu_v0; i <= ppu_v31; i++) m_register_combo->addItem(QString::fromStdString(fmt::format("v%d", i % 32)), i);
+			for (int i = ppu_r0; i <= ppu_r31; i++) m_register_combo->addItem(qstr(fmt::format("r%d", i % 32)), i);
+			for (int i = ppu_f0; i <= ppu_f31; i++) m_register_combo->addItem(qstr(fmt::format("f%d", i % 32)), i);
+			for (int i = ppu_ff0; i <= ppu_ff31; i++) m_register_combo->addItem(qstr(fmt::format("ff%d", i % 32)), i);
+			for (int i = ppu_v0; i <= ppu_v31; i++) m_register_combo->addItem(qstr(fmt::format("v%d", i % 32)), i);
 			m_register_combo->addItem("CR", +PPU_CR);
 			m_register_combo->addItem("LR", +PPU_LR);
 			m_register_combo->addItem("CTR", PPU_CTR);
@@ -118,9 +113,9 @@ register_editor_dialog::register_editor_dialog(QWidget *parent, CPUDisAsm* _disa
 			m_register_combo->addItem("Priority", +PPU_PRIO);
 			//m_register_combo->addItem("Priority 2", +PPU_PRIO2);
 		}
-		else if (cpu->get_class() == thread_class::spu)
+		else if (cpu->id_type() == 2)
 		{
-			for (int i = spu_r0; i <= spu_r127; i++) m_register_combo->addItem(QString::fromStdString(fmt::format("r%d", i % 128)), i);
+			for (int i = spu_r0; i <= spu_r127; i++) m_register_combo->addItem(qstr(fmt::format("r%d", i % 128)), i);
 			m_register_combo->addItem("MFC Pending Events", +MFC_PEVENTS);
 			m_register_combo->addItem("MFC Events Mask", +MFC_EVENTS_MASK);
 			m_register_combo->addItem("MFC Events Count", +MFC_EVENTS_COUNT);
@@ -152,7 +147,7 @@ register_editor_dialog::register_editor_dialog(QWidget *parent, CPUDisAsm* _disa
 	connect(button_cancel, &QAbstractButton::clicked, this, &register_editor_dialog::reject);
 	connect(m_register_combo, &QComboBox::currentTextChanged, this, [this](const QString&)
 	{
-		if (const auto qvar = m_register_combo->currentData(); qvar.canConvert<int>())
+		if (const auto qvar = m_register_combo->currentData(); qvar.canConvert(QMetaType::Int))
 		{
 			updateRegister(qvar.toInt());
 		}
@@ -163,14 +158,14 @@ register_editor_dialog::register_editor_dialog(QWidget *parent, CPUDisAsm* _disa
 
 void register_editor_dialog::updateRegister(int reg) const
 {
-	std::string str = tr("Error parsing register value!").toStdString();
+	std::string str = sstr(tr("Error parsing register value!"));
 
 	const auto cpu = m_get_cpu();
 
 	if (!cpu)
 	{
 	}
-	else if (cpu->get_class() == thread_class::ppu)
+	else if (cpu->id_type() == 1)
 	{
 		const auto& ppu = *static_cast<const ppu_thread*>(cpu);
 
@@ -191,11 +186,11 @@ void register_editor_dialog::updateRegister(int reg) const
 		else if (reg == PPU_LR)  str = fmt::format("%016llx", ppu.lr);
 		else if (reg == PPU_CTR) str = fmt::format("%016llx", ppu.ctr);
 		else if (reg == PPU_VRSAVE) str = fmt::format("%08x", ppu.vrsave);
-		else if (reg == PPU_PRIO) str = fmt::format("%08x", ppu.prio.load().prio);
-		else if (reg == RESERVATION_LOST) str = ppu.raddr ? tr("Lose reservation on OK").toStdString() : tr("Reservation is inactive").toStdString();
+		else if (reg == PPU_PRIO) str = fmt::format("%08x", +ppu.prio);
+		else if (reg == RESERVATION_LOST) str = sstr(ppu.raddr ? tr("Lose reservation on OK") : tr("Reservation is inactive"));
 		else if (reg == PC) str = fmt::format("%08x", ppu.cia);
 	}
-	else if (cpu->get_class() == thread_class::spu)
+	else if (cpu->id_type() == 2)
 	{
 		const auto& spu = *static_cast<const spu_thread*>(cpu);
 
@@ -214,17 +209,17 @@ void register_editor_dialog::updateRegister(int reg) const
 		else if (reg == SPU_SNR2) str = fmt::format("%s", spu.ch_snr2);
 		else if (reg == SPU_OUT_MBOX) str = fmt::format("%s", spu.ch_out_mbox);
 		else if (reg == SPU_OUT_INTR_MBOX) str = fmt::format("%s", spu.ch_out_intr_mbox);
-		else if (reg == RESERVATION_LOST) str = spu.raddr ? tr("Lose reservation on OK").toStdString() : tr("Reservation is inactive").toStdString();
+		else if (reg == RESERVATION_LOST) str = sstr(spu.raddr ? tr("Lose reservation on OK") : tr("Reservation is inactive"));
 		else if (reg == PC) str = fmt::format("%08x", spu.pc);
 	}
 
-	m_value_line->setText(QString::fromStdString(str));
+	m_value_line->setText(qstr(str));
 }
 
 void register_editor_dialog::OnOkay()
 {
 	const int reg = m_register_combo->currentData().toInt();
-	std::string value = m_value_line->text().toStdString();
+	std::string value = sstr(m_value_line->text());
 
 	auto check_res = [](std::from_chars_result res, const char* end)
 	{
@@ -259,7 +254,7 @@ void register_editor_dialog::OnOkay()
 			close();
 		}
 	}
-	else if (cpu->get_class() == thread_class::ppu)
+	else if (cpu->id_type() == 1)
 	{
 		auto& ppu = *static_cast<ppu_thread*>(cpu);
 
@@ -346,7 +341,7 @@ void register_editor_dialog::OnOkay()
 			return;
 		}
 	}
-	else if (cpu->get_class() == thread_class::spu)
+	else if (cpu->id_type() == 2)
 	{
 		auto& spu = *static_cast<spu_thread*>(cpu);
 
diff --git a/rpcs3/rpcs3qt/register_editor_dialog.h b/rpcs3/rpcs3qt/register_editor_dialog.h
index c5ac750d8d..814d64cf39 100644
--- a/rpcs3/rpcs3qt/register_editor_dialog.h
+++ b/rpcs3/rpcs3qt/register_editor_dialog.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "util/types.hpp"
+
 #include <QDialog>
 #include <QComboBox>
 #include <QLineEdit>
diff --git a/rpcs3/rpcs3qt/render_creator.cpp b/rpcs3/rpcs3qt/render_creator.cpp
index 57cd71ecbf..d03e94a929 100644
--- a/rpcs3/rpcs3qt/render_creator.cpp
+++ b/rpcs3/rpcs3qt/render_creator.cpp
@@ -4,20 +4,23 @@
 
 #include "Utilities/Thread.h"
 
-#if defined(HAVE_VULKAN)
-#include "Emu/RSX/VK/vkutils/instance.h"
+#if defined(_WIN32) || defined(HAVE_VULKAN)
+#include "Emu/RSX/VK/vkutils/instance.hpp"
 #endif
 
 #include <chrono>
 #include <condition_variable>
 #include <mutex>
+#include <thread>
 #include <util/logs.hpp>
 
 LOG_CHANNEL(cfg_log, "CFG");
 
+constexpr auto qstr = QString::fromStdString;
+
 render_creator::render_creator(QObject *parent) : QObject(parent)
 {
-#if defined(HAVE_VULKAN)
+#if defined(WIN32) || defined(HAVE_VULKAN)
 	// Some drivers can get stuck when checking for vulkan-compatible gpus, f.ex. if they're waiting for one to get
 	// plugged in. This whole contraption is for showing an error message in case that happens, so that user has
 	// some idea about why the emulator window isn't showing up.
@@ -41,15 +44,15 @@ render_creator::render_creator(QObject *parent) : QObject(parent)
 		if (device_enum_context.create("RPCS3", true))
 		{
 			device_enum_context.bind();
-			const std::vector<vk::physical_device>& gpus = device_enum_context.enumerate_devices();
+			std::vector<vk::physical_device>& gpus = device_enum_context.enumerate_devices();
 
 			lock.lock();
 
 			if (!work_done) // The spawning thread gave up, do not attempt to modify vulkan_adapters
 			{
-				for (const auto& gpu : gpus)
+				for (auto& gpu : gpus)
 				{
-					adapters->append(QString::fromStdString(gpu.get_name()));
+					adapters->append(qstr(gpu.get_name()));
 				}
 			}
 		}
@@ -97,22 +100,10 @@ render_creator::render_creator(QObject *parent) : QObject(parent)
 #endif
 
 	// Graphics Adapter
-	Vulkan = render_info(vulkan_adapters, supports_vulkan, emu_settings_type::VulkanAdapter);
+	Vulkan = render_info(vulkan_adapters, supports_vulkan, emu_settings_type::VulkanAdapter, true);
 	OpenGL = render_info();
 	NullRender = render_info();
 
-#ifdef __APPLE__
-	OpenGL.supported = false;
-
-	if (!Vulkan.supported)
-	{
-		QMessageBox::warning(nullptr,
-							 tr("Warning"),
-							 tr("Vulkan is not supported on this Mac.\n"
-								"No graphics will be rendered."));
-	}
-#endif
-
 	renderers = { &Vulkan, &OpenGL, &NullRender };
 }
 
diff --git a/rpcs3/rpcs3qt/render_creator.h b/rpcs3/rpcs3qt/render_creator.h
index c433c77353..8203f09bb8 100644
--- a/rpcs3/rpcs3qt/render_creator.h
+++ b/rpcs3/rpcs3qt/render_creator.h
@@ -23,14 +23,16 @@ public:
 		emu_settings_type type = emu_settings_type::VulkanAdapter;
 		bool supported = true;
 		bool has_adapters = true;
+		bool has_msaa = false;
 
 		render_info()
 			: has_adapters(false) {}
 
-		render_info(QStringList adapters, bool supported, emu_settings_type type)
+		render_info(QStringList adapters, bool supported, emu_settings_type type, bool has_msaa)
 			: adapters(std::move(adapters))
 			, type(type)
-			, supported(supported) {}
+			, supported(supported)
+			, has_msaa(has_msaa) {}
 	};
 
 	bool abort_requested = false;
diff --git a/rpcs3/rpcs3qt/richtext_item_delegate.h b/rpcs3/rpcs3qt/richtext_item_delegate.h
index 06686df6c6..523c728aa0 100644
--- a/rpcs3/rpcs3qt/richtext_item_delegate.h
+++ b/rpcs3/rpcs3qt/richtext_item_delegate.h
@@ -4,7 +4,6 @@
 #include <QApplication>
 #include <QStyledItemDelegate>
 #include <QTextDocument>
-#include <QPainter>
 
 class richtext_item_delegate : public QStyledItemDelegate
 {
@@ -38,9 +37,7 @@ public:
 
 		// Adjust our painter parameters with some magic that looks good.
 		// This is necessary so that we don't draw on top of the optional widget.
-		static constexpr int margin_adjustement = 4;
-
-		const int margin = (option.rect.height() - opt.fontMetrics.height() - margin_adjustement);
+		const int margin = (option.rect.height() - opt.fontMetrics.height() - 4);
 		QRect text_rect  = style->subElementRect(QStyle::SE_ItemViewItemText, &opt, nullptr);
 
 		if (index.column() != 0)
@@ -54,14 +51,16 @@ public:
 		painter->setClipRect(text_rect.translated(-text_rect.topLeft()));
 
 		// Create a context for our painter
-		QAbstractTextDocumentLayout::PaintContext context;
+		const QAbstractTextDocumentLayout::PaintContext context;
 
-		// Apply the styled palette
-		context.palette = opt.palette;
+		// We can change the text color based on state (Unused because it didn't look good)
+		//context.palette.setColor(QPalette::Text, option.palette.color(QPalette::Active, (option.state & QStyle::State_Selected) ? QPalette::HighlightedText : QPalette::Text));
 
 		// Draw the text
 		m_document->documentLayout()->draw(painter, context);
 
 		painter->restore();
+
+		//QStyledItemDelegate::paint(painter, opt, index); // Unused
 	}
 };
diff --git a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp
index 7cc819521a..9ea5f26afa 100644
--- a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp
@@ -2,666 +2,22 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPushButton>
-#include <QRegularExpressionValidator>
+#include <QRegExpValidator>
 #include <QInputDialog>
-#include <QGroupBox>
-#include <QMenu>
-#include <QDialogButtonBox>
-#include <QCheckBox>
-
-#include "qt_utils.h"
+#include <thread>
 
 #include "rpcn_settings_dialog.h"
-#include "Emu/System.h"
 #include "Emu/NP/rpcn_config.h"
-#include "Emu/NP/ip_address.h"
+#include "Emu/NP/rpcn_client.h"
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#pragma clang diagnostic ignored "-Wextern-c-compat"
-#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
-#endif
 #include <wolfssl/ssl.h>
 #include <wolfssl/openssl/evp.h>
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-LOG_CHANNEL(rpcn_settings_log, "rpcn settings dlg");
-
-bool validate_rpcn_username(std::string_view username)
-{
-	if (username.length() < 3 || username.length() > 16)
-		return false;
-
-	return std::all_of(username.cbegin(), username.cend(), [](const char c)
-		{
-			return std::isalnum(static_cast<unsigned char>(c)) || c == '-' || c == '_';
-		});
-}
-
-bool validate_email(std::string_view email)
-{
-	const QRegularExpressionValidator simple_email_validator(QRegularExpression("^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$"));
-	QString qstr_email = QString::fromStdString(std::string(email));
-	int pos            = 0;
-
-	if (qstr_email.isEmpty() || qstr_email.contains(' ') || qstr_email.contains('\t') || simple_email_validator.validate(qstr_email, pos) != QValidator::Acceptable)
-		return false;
-
-	return true;
-}
-
-bool validate_token(std::string_view token)
-{
-	return token.size() == 16 && std::all_of(token.cbegin(), token.cend(), [](const char c) { return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z'); });
-}
-
-std::string derive_password(std::string_view user_password)
-{
-	std::string_view salt_str = "No matter where you go, everybody's connected.";
-
-	u8 derived_password_digest[SHA3_256_DIGEST_LENGTH];
-	ensure(!wc_PBKDF2(derived_password_digest, reinterpret_cast<const u8*>(user_password.data()), ::narrow<s32>(user_password.size()), reinterpret_cast<const u8*>(salt_str.data()), ::narrow<s32>(salt_str.size()), 200'000, SHA3_256_DIGEST_LENGTH, WC_SHA3_256));
-
-	std::string derived_password("0000000000000000000000000000000000000000000000000000000000000000");
-	for (u32 i = 0; i < SHA3_256_DIGEST_LENGTH; i++)
-	{
-		constexpr auto pal            = "0123456789ABCDEF";
-		derived_password[i * 2]       = pal[derived_password_digest[i] >> 4];
-		derived_password[(i * 2) + 1] = pal[derived_password_digest[i] & 15];
-	}
-
-	return derived_password;
-}
 
 rpcn_settings_dialog::rpcn_settings_dialog(QWidget* parent)
-	: QDialog(parent)
+    : QDialog(parent)
 {
-	g_cfg_rpcn.load();
-
-	const auto set_title = [this]()
-	{
-		if (const std::string npid = g_cfg_rpcn.get_npid(); !npid.empty())
-		{
-			setWindowTitle(tr("RPCN - %0").arg(QString::fromStdString(npid)));
-			return;
-		}
-
-		setWindowTitle(tr("RPCN"));
-	};
-
-	set_title();
+	setWindowTitle(tr("RPCN Configuration"));
 	setObjectName("rpcn_settings_dialog");
-	setMinimumSize(QSize(400, 100));
-
-	QVBoxLayout* vbox_global = new QVBoxLayout();
-
-	QGroupBox* group_btns   = new QGroupBox(tr("RPCN"));
-	QHBoxLayout* hbox_group = new QHBoxLayout();
-
-	QPushButton* btn_account = new QPushButton(tr("Account"));
-	QPushButton* btn_friends = new QPushButton(tr("Friends"));
-
-	hbox_group->addWidget(btn_account);
-	hbox_group->addWidget(btn_friends);
-
-	group_btns->setLayout(hbox_group);
-	vbox_global->addWidget(group_btns);
-	setLayout(vbox_global);
-
-	connect(btn_account, &QPushButton::clicked, this, [this, set_title]()
-		{
-			if (!Emu.IsStopped())
-			{
-				QMessageBox::critical(this, tr("Error: Emulation Running"), tr("You need to stop the emulator before editing RPCN account information!"), QMessageBox::Ok);
-				return;
-			}
-			rpcn_account_dialog dlg(this);
-			dlg.exec();
-			set_title();
-		});
-
-	connect(btn_friends, &QPushButton::clicked, this, [this]()
-		{
-			rpcn_friends_dialog dlg(this);
-			if (dlg.is_ok())
-				dlg.exec();
-		});
-}
-
-rpcn_account_dialog::rpcn_account_dialog(QWidget* parent)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("RPCN: Account"));
-	setObjectName("rpcn_account_dialog");
-
-	QVBoxLayout* vbox_global = new QVBoxLayout();
-
-	QGroupBox* grp_server    = new QGroupBox(tr("Server:"));
-	QVBoxLayout* vbox_server = new QVBoxLayout();
-
-	QHBoxLayout* hbox_lbl_combo = new QHBoxLayout();
-	QLabel* lbl_server          = new QLabel(tr("Server:"));
-	cbx_servers                 = new QComboBox();
-
-	refresh_combobox();
-
-	hbox_lbl_combo->addWidget(lbl_server);
-	hbox_lbl_combo->addWidget(cbx_servers);
-
-	QHBoxLayout* hbox_buttons   = new QHBoxLayout();
-	QPushButton* btn_add_server = new QPushButton(tr("Add"));
-	QPushButton* btn_del_server = new QPushButton(tr("Del"));
-	hbox_buttons->addStretch();
-	hbox_buttons->addWidget(btn_add_server);
-	hbox_buttons->addWidget(btn_del_server);
-
-	vbox_server->addLayout(hbox_lbl_combo);
-	vbox_server->addLayout(hbox_buttons);
-
-	grp_server->setLayout(vbox_server);
-	vbox_global->addWidget(grp_server);
-
-	QGroupBox* grp_buttons    = new QGroupBox(tr("Account:"));
-	QVBoxLayout* vbox_buttons = new QVBoxLayout();
-	QPushButton* btn_create   = new QPushButton(tr("Create Account"));
-	QPushButton* btn_edit     = new QPushButton(tr("Edit Account"));
-	QPushButton* btn_test     = new QPushButton(tr("Test Account"));
-	QLabel* label_npid        = new QLabel();
-
-	QCheckBox* checkbox_disable_ipv6 = new QCheckBox(tr("Disable IPv6"));
-	checkbox_disable_ipv6->setCheckState(g_cfg_rpcn.get_ipv6_support() ? Qt::Unchecked : Qt::Checked);
-
-	const auto update_npid_label = [label_npid]()
-	{
-		const std::string npid = g_cfg_rpcn.get_npid();
-		label_npid->setText(tr("Current ID: %0").arg(npid.empty() ? "-" : QString::fromStdString(npid)));
-	};
-	update_npid_label();
-
-	vbox_buttons->addWidget(label_npid);
-	vbox_buttons->addSpacing(10);
-	vbox_buttons->addWidget(btn_create);
-	vbox_buttons->addSpacing(10);
-	vbox_buttons->addWidget(btn_edit);
-	vbox_buttons->addSpacing(10);
-	vbox_buttons->addWidget(btn_test);
-	vbox_buttons->addSpacing(10);
-	grp_buttons->setLayout(vbox_buttons);
-
-	vbox_global->addWidget(grp_buttons);
-	vbox_global->addWidget(checkbox_disable_ipv6);
-
-	setLayout(vbox_global);
-
-	connect(cbx_servers, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index)
-		{
-			if (index < 0)
-				return;
-
-			QVariant host = cbx_servers->itemData(index);
-
-			if (!host.isValid() || !host.canConvert<QString>())
-				return;
-
-			g_cfg_rpcn.set_host(host.toString().toStdString());
-			g_cfg_rpcn.save();
-
-			// Resets the ipv6 support as it depends on availability of the feature on the server
-			np::is_ipv6_supported(np::IPV6_SUPPORT::IPV6_UNKNOWN);
-		});
-
-	connect(btn_add_server, &QAbstractButton::clicked, this, [this]()
-		{
-			rpcn_add_server_dialog dlg(this);
-			dlg.exec();
-			const auto& new_server = dlg.get_new_server();
-			if (new_server)
-			{
-				if (!g_cfg_rpcn.add_host(new_server->first, new_server->second))
-				{
-					QMessageBox::critical(this, tr("Existing Server"), tr("You already have a server with this description & hostname in the list."), QMessageBox::Ok);
-					return;
-				}
-
-				g_cfg_rpcn.save();
-				refresh_combobox();
-			}
-		});
-
-	connect(btn_del_server, &QAbstractButton::clicked, this, [this]()
-		{
-			const int index = cbx_servers->currentIndex();
-
-			if (index < 0)
-				return;
-
-			const std::string desc = cbx_servers->itemText(index).toStdString();
-			const std::string host = cbx_servers->itemData(index).toString().toStdString();
-
-			ensure(g_cfg_rpcn.del_host(desc, host));
-			g_cfg_rpcn.save();
-			refresh_combobox();
-		});
-
-	connect(btn_create, &QAbstractButton::clicked, this, [this, update_npid_label]()
-		{
-			rpcn_ask_username_dialog dlg_username(this, tr("Please enter your username.\n\n"
-			                                               "Note that these restrictions apply:\n"
-			                                               "- Username must be between 3 and 16 characters\n"
-			                                               "- Username can only contain a-z A-Z 0-9 '-' '_'\n"
-			                                               "- Username is case sensitive\n"));
-			dlg_username.exec();
-			const auto& username = dlg_username.get_username();
-
-			if (!username)
-				return;
-
-			rpcn_ask_password_dialog dlg_password(this, tr("Please choose your password:\n\n"));
-			dlg_password.exec();
-			const auto& password = dlg_password.get_password();
-
-			if (!password)
-				return;
-
-			rpcn_ask_email_dialog dlg_email(this, tr("An email address is required, please note:\n"
-			                                         "- A valid email is needed to receive the token that validates your account.\n"
-			                                         "- Your email won't be used for anything beyond sending you this token or the password reset token.\n\n"));
-			dlg_email.exec();
-			const auto& email = dlg_email.get_email();
-
-			if (!email)
-				return;
-
-			if (QMessageBox::question(this, tr("RPCN: Account Creation"), tr("You are about to create an account with:\n-Username:%0\n-Email:%1\n\nIs this correct?").arg(QString::fromStdString(*username)).arg(QString::fromStdString(*email))) != QMessageBox::Yes)
-				return;
-
-			{
-				const auto rpcn = rpcn::rpcn_client::get_instance(0);
-				const auto avatar_url = "https://rpcs3.net/cdn/netplay/DefaultAvatar.png";
-
-				if (auto result = rpcn->wait_for_connection(); result != rpcn::rpcn_state::failure_no_failure)
-				{
-					const QString error_message = tr("Failed to connect to RPCN server:\n%0").arg(QString::fromStdString(rpcn::rpcn_state_to_string(result)));
-					QMessageBox::critical(this, tr("Error Connecting"), error_message, QMessageBox::Ok);
-					return;
-				}
-
-				if (auto error = rpcn->create_user(*username, *password, *username, avatar_url, *email); error != rpcn::ErrorType::NoError)
-				{
-					QString error_message;
-					switch (error)
-					{
-					case rpcn::ErrorType::CreationExistingUsername: error_message = tr("An account with that username already exists!"); break;
-					case rpcn::ErrorType::CreationBannedEmailProvider: error_message = tr("This email provider is banned!"); break;
-					case rpcn::ErrorType::CreationExistingEmail: error_message = tr("An account with that email already exists!"); break;
-					case rpcn::ErrorType::CreationError: error_message = tr("Unknown creation error!"); break;
-					default: error_message = tr("Unknown error"); break;
-					}
-					QMessageBox::critical(this, tr("Error Creating Account!"), tr("Failed to create the account:\n%0").arg(error_message), QMessageBox::Ok);
-					return;
-				}
-			}
-
-			g_cfg_rpcn.set_npid(*username);
-			g_cfg_rpcn.set_password(*password);
-			g_cfg_rpcn.save();
-
-			rpcn_ask_token_dialog token_dlg(this, tr("Your account has been created successfully!\n"
-			                                         "Your account authentification was saved.\n"
-			                                         "Now all you need is to enter the token that was sent to your email.\n"
-			                                         "You can skip this step by leaving it empty and entering it later in the Edit Account section too.\n"));
-			token_dlg.exec();
-			const auto& token = token_dlg.get_token();
-
-			if (!token)
-				return;
-
-			g_cfg_rpcn.set_token(*token);
-			g_cfg_rpcn.save();
-
-			update_npid_label();
-		});
-
-	connect(btn_edit, &QAbstractButton::clicked, this, [this, update_npid_label]()
-		{
-			rpcn_account_edit_dialog dlg_edit(this);
-			dlg_edit.exec();
-			update_npid_label();
-		});
-
-	connect(btn_test, &QAbstractButton::clicked, this, [this]()
-		{
-			auto rpcn = rpcn::rpcn_client::get_instance(0);
-
-			if (auto res = rpcn->wait_for_connection(); res != rpcn::rpcn_state::failure_no_failure)
-			{
-				const QString error_msg = tr("Failed to connect to RPCN:\n%0").arg(QString::fromStdString(rpcn::rpcn_state_to_string(res)));
-				QMessageBox::warning(this, tr("Error connecting to RPCN!"), error_msg, QMessageBox::Ok);
-				return;
-			}
-			if (auto res = rpcn->wait_for_authentified(); res != rpcn::rpcn_state::failure_no_failure)
-			{
-				const QString error_msg = tr("Failed to authentify to RPCN:\n%0").arg(QString::fromStdString(rpcn::rpcn_state_to_string(res)));
-				QMessageBox::warning(this, tr("Error authentifying to RPCN!"), error_msg, QMessageBox::Ok);
-				return;
-			}
-
-			QMessageBox::information(this, tr("RPCN Account Valid!"), tr("Your account is valid!"), QMessageBox::Ok);
-		});
-
-	connect(checkbox_disable_ipv6, &QCheckBox::checkStateChanged, this, [this](Qt::CheckState state)
-	{
-		g_cfg_rpcn.set_ipv6_support(state == Qt::Unchecked);
-		g_cfg_rpcn.save();
-	});
-}
-
-void rpcn_account_dialog::refresh_combobox()
-{
-	g_cfg_rpcn.load();
-	const auto vec_hosts = g_cfg_rpcn.get_hosts();
-	const auto cur_host  = g_cfg_rpcn.get_host();
-	int i = 0, index = 0;
-
-	cbx_servers->clear();
-
-	for (const auto& [desc, host] : vec_hosts)
-	{
-		cbx_servers->addItem(QString::fromStdString(desc), QString::fromStdString(host));
-		if (cur_host == host)
-			index = i;
-
-		i++;
-	}
-
-	cbx_servers->setCurrentIndex(index);
-}
-
-rpcn_add_server_dialog::rpcn_add_server_dialog(QWidget* parent)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("RPCN: Add Server"));
-	setObjectName("rpcn_add_server_dialog");
-	setMinimumSize(QSize(400, 200));
-
-	QVBoxLayout* vbox_global = new QVBoxLayout();
-
-	QLabel* lbl_description    = new QLabel(tr("Description:"));
-	QLineEdit* edt_description = new QLineEdit();
-	QLabel* lbl_host           = new QLabel(tr("Host:"));
-	QLineEdit* edt_host        = new QLineEdit();
-	QDialogButtonBox* btn_box  = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-
-	vbox_global->addWidget(lbl_description);
-	vbox_global->addWidget(edt_description);
-	vbox_global->addWidget(lbl_host);
-	vbox_global->addWidget(edt_host);
-	vbox_global->addWidget(btn_box);
-
-	setLayout(vbox_global);
-
-	connect(btn_box, &QDialogButtonBox::accepted, this, [this, edt_description, edt_host]()
-		{
-			const QString description = edt_description->text();
-			const QString host        = edt_host->text();
-
-			if (description.isEmpty())
-			{
-				QMessageBox::critical(this, tr("Missing Description!"), tr("You must enter a description!"), QMessageBox::Ok);
-				return;
-			}
-			if (host.isEmpty())
-			{
-				QMessageBox::critical(this, tr("Missing Hostname!"), tr("You must enter a hostname for the server!"), QMessageBox::Ok);
-				return;
-			}
-
-			m_new_server = std::make_pair(description.toStdString(), host.toStdString());
-			QDialog::accept();
-		});
-	connect(btn_box, &QDialogButtonBox::rejected, this, &QDialog::reject);
-}
-
-const std::optional<std::pair<std::string, std::string>>& rpcn_add_server_dialog::get_new_server() const
-{
-	return m_new_server;
-}
-
-rpcn_ask_username_dialog::rpcn_ask_username_dialog(QWidget* parent, const QString& description)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("RPCN: Username"));
-	setObjectName("rpcn_ask_username_dialog");
-
-	QVBoxLayout* vbox_global = new QVBoxLayout();
-
-	QLabel* lbl_username = new QLabel(description);
-
-	QGroupBox* grp_username        = new QGroupBox(tr("Username:"));
-	QHBoxLayout* hbox_grp_username = new QHBoxLayout();
-	QLineEdit* edt_username        = new QLineEdit(QString::fromStdString(g_cfg_rpcn.get_npid()));
-	edt_username->setMaxLength(16);
-	edt_username->setValidator(new QRegularExpressionValidator(QRegularExpression("^[a-zA-Z0-9_\\-]*$"), this));
-	hbox_grp_username->addWidget(edt_username);
-	grp_username->setLayout(hbox_grp_username);
-
-	QDialogButtonBox* btn_box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-
-	vbox_global->addWidget(lbl_username);
-	vbox_global->addWidget(grp_username);
-	vbox_global->addWidget(btn_box);
-
-	setLayout(vbox_global);
-
-	connect(btn_box, &QDialogButtonBox::accepted, this, [this, edt_username]()
-		{
-			const auto username = edt_username->text().toStdString();
-
-			if (username.empty())
-			{
-				QMessageBox::critical(this, tr("Missing Username!"), tr("You must enter a username!"), QMessageBox::Ok);
-				return;
-			}
-			if (!validate_rpcn_username(username))
-			{
-				QMessageBox::critical(this, tr("Invalid Username!"), tr("Please enter a valid username!"), QMessageBox::Ok);
-			}
-
-			m_username = username;
-			QDialog::accept();
-		});
-	connect(btn_box, &QDialogButtonBox::rejected, this, &QDialog::reject);
-}
-
-const std::optional<std::string>& rpcn_ask_username_dialog::get_username() const
-{
-	return m_username;
-}
-
-rpcn_ask_password_dialog::rpcn_ask_password_dialog(QWidget* parent, const QString& description)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("RPCN: Password"));
-	setObjectName("rpcn_ask_password_dialog");
-
-	QVBoxLayout* vbox_global = new QVBoxLayout();
-
-	QLabel* lbl_description = new QLabel(description);
-
-	QGroupBox* gbox_password = new QGroupBox();
-	QVBoxLayout* vbox_gbox   = new QVBoxLayout();
-
-	QLabel* lbl_pass1       = new QLabel(tr("Enter your password:"));
-	QLineEdit* m_edit_pass1 = new QLineEdit();
-	m_edit_pass1->setEchoMode(QLineEdit::Password);
-	QLabel* lbl_pass2       = new QLabel(tr("Enter your password a second time:"));
-	QLineEdit* m_edit_pass2 = new QLineEdit();
-	m_edit_pass2->setEchoMode(QLineEdit::Password);
-
-	vbox_gbox->addWidget(lbl_pass1);
-	vbox_gbox->addWidget(m_edit_pass1);
-	vbox_gbox->addWidget(lbl_pass2);
-	vbox_gbox->addWidget(m_edit_pass2);
-	gbox_password->setLayout(vbox_gbox);
-
-	QDialogButtonBox* btn_box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-
-	vbox_global->addWidget(lbl_description);
-	vbox_global->addWidget(gbox_password);
-	vbox_global->addWidget(btn_box);
-
-	setLayout(vbox_global);
-
-	connect(btn_box, &QDialogButtonBox::accepted, this, [this, m_edit_pass1, m_edit_pass2]()
-		{
-			if (m_edit_pass1->text() != m_edit_pass2->text())
-			{
-				QMessageBox::critical(this, tr("Wrong Input"), tr("The two passwords you entered don't match!"), QMessageBox::Ok);
-				return;
-			}
-
-			if (m_edit_pass1->text().isEmpty())
-			{
-				QMessageBox::critical(this, tr("Missing Password"), tr("You need to enter a password!"), QMessageBox::Ok);
-				return;
-			}
-
-			m_password = derive_password(m_edit_pass1->text().toStdString());
-			QDialog::accept();
-		});
-	connect(btn_box, &QDialogButtonBox::rejected, this, &QDialog::reject);
-}
-
-const std::optional<std::string>& rpcn_ask_password_dialog::get_password() const
-{
-	return m_password;
-}
-
-rpcn_ask_email_dialog::rpcn_ask_email_dialog(QWidget* parent, const QString& description)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("RPCN: Email"));
-	setObjectName("rpcn_ask_email_dialog");
-
-	QVBoxLayout* vbox_global = new QVBoxLayout();
-
-	QLabel* lbl_emailinfo = new QLabel(description);
-
-	QGroupBox* gbox_password = new QGroupBox();
-	QVBoxLayout* vbox_gbox   = new QVBoxLayout();
-
-	QLabel* lbl_pass1       = new QLabel(tr("Enter your email:"));
-	QLineEdit* m_edit_pass1 = new QLineEdit();
-	QLabel* lbl_pass2       = new QLabel(tr("Enter your email a second time:"));
-	QLineEdit* m_edit_pass2 = new QLineEdit();
-
-	vbox_gbox->addWidget(lbl_pass1);
-	vbox_gbox->addWidget(m_edit_pass1);
-	vbox_gbox->addWidget(lbl_pass2);
-	vbox_gbox->addWidget(m_edit_pass2);
-	gbox_password->setLayout(vbox_gbox);
-
-	QDialogButtonBox* btn_box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-
-	vbox_global->addWidget(lbl_emailinfo);
-	vbox_global->addWidget(gbox_password);
-	vbox_global->addWidget(btn_box);
-
-	setLayout(vbox_global);
-
-	connect(btn_box, &QDialogButtonBox::accepted, this, [this, m_edit_pass1, m_edit_pass2]()
-		{
-			if (m_edit_pass1->text() != m_edit_pass2->text())
-			{
-				QMessageBox::critical(this, tr("Wrong Input"), tr("The two emails you entered don't match!"), QMessageBox::Ok);
-				return;
-			}
-
-			if (m_edit_pass1->text().isEmpty())
-			{
-				QMessageBox::critical(this, tr("Missing Email"), tr("You need to enter an email!"), QMessageBox::Ok);
-				return;
-			}
-
-			std::string email = m_edit_pass1->text().toStdString();
-			if (!validate_email(email))
-			{
-				QMessageBox::critical(this, tr("Invalid Email"), tr("You need to enter a valid email!"), QMessageBox::Ok);
-				return;
-			}
-
-			m_email = std::move(email);
-			QDialog::accept();
-		});
-	connect(btn_box, &QDialogButtonBox::rejected, this, &QDialog::reject);
-}
-
-const std::optional<std::string>& rpcn_ask_email_dialog::get_email() const
-{
-	return m_email;
-}
-
-rpcn_ask_token_dialog::rpcn_ask_token_dialog(QWidget* parent, const QString& description)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("RPCN: Username"));
-	setObjectName("rpcn_ask_token_dialog");
-
-	QVBoxLayout* vbox_global = new QVBoxLayout();
-
-	QLabel* lbl_token = new QLabel(description);
-
-	QGroupBox* grp_token        = new QGroupBox(tr("Token:"));
-	QHBoxLayout* hbox_grp_token = new QHBoxLayout();
-	QLineEdit* edt_token        = new QLineEdit();
-	edt_token->setMaxLength(16);
-	hbox_grp_token->addWidget(edt_token);
-	grp_token->setLayout(hbox_grp_token);
-
-	QDialogButtonBox* btn_box = new QDialogButtonBox(QDialogButtonBox::Ok);
-
-	vbox_global->addWidget(lbl_token);
-	vbox_global->addWidget(grp_token);
-	vbox_global->addWidget(btn_box);
-
-	setLayout(vbox_global);
-
-	connect(btn_box, &QDialogButtonBox::accepted, this, [this, edt_token]()
-		{
-			std::string token = edt_token->text().toStdString();
-
-			if (!token.empty())
-			{
-				if (!validate_token(token))
-				{
-					QMessageBox::critical(this, tr("Invalid Token"), tr("The token appears to be invalid:\n"
-					                                                    "-Token should be 16 characters long\n"
-					                                                    "-Token should only contain 0-9 and A-F"),
-						QMessageBox::Ok);
-					return;
-				}
-
-				m_token = std::move(token);
-			}
-
-			QDialog::accept();
-			return;
-		});
-}
-
-const std::optional<std::string>& rpcn_ask_token_dialog::get_token() const
-{
-	return m_token;
-}
-
-rpcn_account_edit_dialog::rpcn_account_edit_dialog(QWidget* parent)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("RPCN: Edit Account"));
-	setObjectName("rpcn_account_edit_dialog");
 	setMinimumSize(QSize(400, 200));
 
 	QVBoxLayout* vbox_global           = new QVBoxLayout();
@@ -670,30 +26,32 @@ rpcn_account_edit_dialog::rpcn_account_edit_dialog(QWidget* parent)
 	QVBoxLayout* vbox_edits            = new QVBoxLayout();
 	QHBoxLayout* hbox_buttons          = new QHBoxLayout();
 
-	QLabel* lbl_username = new QLabel(tr("Username:"));
-	m_edit_username      = new QLineEdit();
-	m_edit_username->setMaxLength(16);
-	m_edit_username->setValidator(new QRegularExpressionValidator(QRegularExpression("^[a-zA-Z0-9_\\-]*$"), this));
-	QLabel* lbl_pass          = new QLabel(tr("Password:"));
+	QLabel* label_host = new QLabel(tr("Host:"));
+	m_edit_host        = new QLineEdit();
+	QLabel* label_npid = new QLabel(tr("NPID (username):"));
+	m_edit_npid        = new QLineEdit();
+	m_edit_npid->setMaxLength(16);
+	m_edit_npid->setValidator(new QRegExpValidator(QRegExp("^[a-zA-Z0-9_\\-]*$"), this));
+	QLabel* label_pass        = new QLabel(tr("Password:"));
 	QPushButton* btn_chg_pass = new QPushButton(tr("Set Password"));
-	QLabel* lbl_token         = new QLabel(tr("Token:"));
+	QLabel *label_token       = new QLabel(tr("Token:"));
 	m_edit_token              = new QLineEdit();
 	m_edit_token->setMaxLength(16);
 
-	QPushButton* btn_resendtoken     = new QPushButton(tr("Resend Token"), this);
-	QPushButton* btn_change_password = new QPushButton(tr("Change Password"), this);
-	QPushButton* btn_save            = new QPushButton(tr("Save"), this);
+	QPushButton* btn_create = new QPushButton(tr("Create Account"), this);
+	QPushButton* btn_save     = new QPushButton(tr("Save"), this);
 
-	vbox_labels->addWidget(lbl_username);
-	vbox_labels->addWidget(lbl_pass);
-	vbox_labels->addWidget(lbl_token);
+	vbox_labels->addWidget(label_host);
+	vbox_labels->addWidget(label_npid);
+	vbox_labels->addWidget(label_pass);
+	vbox_labels->addWidget(label_token);
 
-	vbox_edits->addWidget(m_edit_username);
+	vbox_edits->addWidget(m_edit_host);
+	vbox_edits->addWidget(m_edit_npid);
 	vbox_edits->addWidget(btn_chg_pass);
 	vbox_edits->addWidget(m_edit_token);
 
-	hbox_buttons->addWidget(btn_resendtoken);
-	hbox_buttons->addWidget(btn_change_password);
+	hbox_buttons->addWidget(btn_create);
 	hbox_buttons->addStretch();
 	hbox_buttons->addWidget(btn_save);
 
@@ -705,59 +63,100 @@ rpcn_account_edit_dialog::rpcn_account_edit_dialog(QWidget* parent)
 
 	setLayout(vbox_global);
 
-	connect(btn_chg_pass, &QAbstractButton::clicked, this, [this]()
-		{
-			rpcn_ask_password_dialog ask_pass(this, tr("Please enter your password:"));
-			ask_pass.exec();
+	connect(btn_chg_pass, &QAbstractButton::clicked, [this]()
+	{
+		QString password;
 
-			const auto& password = ask_pass.get_password();
-			if (!password)
+		while (true)
+		{
+			bool clicked_ok = false;
+			password = QInputDialog::getText(this, "Set/Change Password", "Set your password", QLineEdit::Password, "", &clicked_ok);
+			if (!clicked_ok)
 				return;
 
-			g_cfg_rpcn.set_password(*password);
-			g_cfg_rpcn.save();
+			if (password.isEmpty())
+			{
+				QMessageBox::critical(this, tr("Wrong input"), tr("You need to enter a password!"), QMessageBox::Ok);
+			}
+			else
+			{
+				break;
+			}
+		}
 
-			QMessageBox::information(this, tr("RPCN Password Saved"), tr("Your password was saved successfully!"), QMessageBox::Ok);
-		});
+		const std::string pass_str = password.toStdString();
+		const std::string salt_str = "No matter where you go, everybody's connected.";
 
-	connect(btn_save, &QAbstractButton::clicked, this, [this]()
+		u8 salted_pass[SHA_DIGEST_SIZE];
+
+		wolfSSL_PKCS5_PBKDF2_HMAC_SHA1(pass_str.c_str(), pass_str.size(), reinterpret_cast<const u8*>(salt_str.c_str()), salt_str.size(), 1000, SHA_DIGEST_SIZE, salted_pass);
+
+		std::string hash("0000000000000000000000000000000000000000");
+		for (u32 i = 0; i < 20; i++)
 		{
-			if (save_config())
-				close();
-		});
-	connect(btn_resendtoken, &QAbstractButton::clicked, this, &rpcn_account_edit_dialog::resend_token);
-	connect(btn_change_password, &QAbstractButton::clicked, this, &rpcn_account_edit_dialog::change_password);
+			constexpr auto pal = "0123456789abcdef";
+			hash[i * 2] = pal[salted_pass[i] >> 4];
+			hash[1 + i * 2] = pal[salted_pass[i] & 15];
+		}
+
+		g_cfg_rpcn.set_password(hash);
+		g_cfg_rpcn.save();
+	});
+
+	connect(btn_save, &QAbstractButton::clicked, [this]()
+	{
+		if (this->save_config())
+			this->close();
+	});
+	connect(btn_create, &QAbstractButton::clicked, [this]() { this->create_account(); });
 
 	g_cfg_rpcn.load();
 
-	m_edit_username->setText(QString::fromStdString(g_cfg_rpcn.get_npid()));
+	m_edit_host->setText(QString::fromStdString(g_cfg_rpcn.get_host()));
+	m_edit_npid->setText(QString::fromStdString(g_cfg_rpcn.get_npid()));
 	m_edit_token->setText(QString::fromStdString(g_cfg_rpcn.get_token()));
 }
 
-bool rpcn_account_edit_dialog::save_config()
+bool rpcn_settings_dialog::save_config()
 {
-	const std::string username = m_edit_username->text().toStdString();
-	const std::string token    = m_edit_token->text().toStdString();
+	const auto host  = m_edit_host->text().toStdString();
+	const auto npid  = m_edit_npid->text().toStdString();
+	const auto token = m_edit_token->text().toStdString();
 
-	if (username.empty() || g_cfg_rpcn.get_password().empty())
+	auto validate = [](const std::string& input) -> bool
 	{
-		QMessageBox::critical(this, tr("Missing Input"), tr("You need to enter a username and a password!"), QMessageBox::Ok);
+		if (input.length() < 3 || input.length() > 16)
+			return false;
+
+		return std::all_of(input.cbegin(), input.cend(), [](const char c) { return std::isalnum(c) || c == '-' || c == '_'; });
+	};
+
+	if (host.empty())
+	{
+		QMessageBox::critical(this, tr("Missing host"), tr("You need to enter a host for rpcn!"), QMessageBox::Ok);
 		return false;
 	}
 
-	if (!validate_rpcn_username(username))
+	if (npid.empty() || g_cfg_rpcn.get_password().empty())
 	{
-		QMessageBox::critical(this, tr("Invalid Username"), tr("Username must be between 3 and 16 characters and can only contain '-', '_' or alphanumeric characters."), QMessageBox::Ok);
+		QMessageBox::critical(this, tr("Wrong input"), tr("You need to enter a username and a password!"), QMessageBox::Ok);
 		return false;
 	}
 
-	if (!token.empty() && !validate_token(token))
+	if (!validate(npid))
 	{
-		QMessageBox::critical(this, tr("Invalid Token"), tr("The token you have received should be 16 characters long and contain only 0-9 A-F."), QMessageBox::Ok);
+		QMessageBox::critical(this, tr("Invalid character"), tr("NPID must be between 3 and 16 characters and can only contain '-', '_' or alphanumeric characters."), QMessageBox::Ok);
 		return false;
 	}
 
-	g_cfg_rpcn.set_npid(username);
+	if (!token.empty() && token.size() != 16)
+	{
+		QMessageBox::critical(this, tr("Invalid token"), tr("The token you have received should be 16 characters long."), QMessageBox::Ok);
+		return false;
+	}
+
+	g_cfg_rpcn.set_host(host);
+	g_cfg_rpcn.set_npid(npid);
 	g_cfg_rpcn.set_token(token);
 
 	g_cfg_rpcn.save();
@@ -765,613 +164,67 @@ bool rpcn_account_edit_dialog::save_config()
 	return true;
 }
 
-void rpcn_account_edit_dialog::resend_token()
+bool rpcn_settings_dialog::create_account()
 {
+	// Validate and save
 	if (!save_config())
-		return;
+		return false;
 
-	const auto rpcn = rpcn::rpcn_client::get_instance(0);
+	QString email;
+	const QRegExpValidator simple_email_validator(QRegExp("^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$"));
 
-	const std::string npid     = g_cfg_rpcn.get_npid();
-	const std::string password = g_cfg_rpcn.get_password();
-
-	if (auto result = rpcn->wait_for_connection(); result != rpcn::rpcn_state::failure_no_failure)
+	while (true)
 	{
-		const QString error_message = tr("Failed to connect to RPCN server:\n%0").arg(QString::fromStdString(rpcn::rpcn_state_to_string(result)));
-		QMessageBox::critical(this, tr("Error Connecting!"), error_message, QMessageBox::Ok);
-		return;
-	}
+		bool clicked_ok = false;
+		email = QInputDialog::getText(this, "Email address", "An email address is required, please note:\n*A valid email is needed to validate your account.\n*Your email won't be used for anything beyond sending you the token.\n*Upon successful creation a token will be sent to your email which you'll need to login.\n\n", QLineEdit::Normal, "", &clicked_ok);
+		if (!clicked_ok)
+			return false;
 
-	if (auto error = rpcn->resend_token(npid, password); error != rpcn::ErrorType::NoError)
-	{
-		QString error_message;
-		switch (error)
+		int pos = 0;
+		if (email.isEmpty() || simple_email_validator.validate(email, pos) != QValidator::Acceptable)
 		{
-		case rpcn::ErrorType::Invalid: error_message = tr("The server has no email verification and doesn't need a token!"); break;
-		case rpcn::ErrorType::DbFail: error_message = tr("A database related error happened on the server!"); break;
-		case rpcn::ErrorType::TooSoon: error_message = tr("You can only ask for a token mail once every 24 hours!"); break;
-		case rpcn::ErrorType::EmailFail: error_message = tr("The mail couldn't be sent successfully!"); break;
-		case rpcn::ErrorType::LoginError: error_message = tr("The username/password pair is invalid!"); break;
-		default: error_message = tr("Unknown error"); break;
+			QMessageBox::critical(this, tr("Wrong input"), tr("You need to enter a valid email!"), QMessageBox::Ok);
 		}
-		QMessageBox::critical(this, tr("Error Sending Token!"), tr("Failed to send the token:\n%0").arg(error_message), QMessageBox::Ok);
-		return;
-	}
-
-	QMessageBox::information(this, tr("Token Sent!"), tr("Your token was successfully resent to the email associated with your account!"), QMessageBox::Ok);
-}
-
-void rpcn_account_edit_dialog::change_password()
-{
-	rpcn_ask_username_dialog dlg_username(this, tr("Please confirm your username:"));
-	dlg_username.exec();
-	const auto& username = dlg_username.get_username();
-
-	if (!username)
-		return;
-
-	switch (QMessageBox::question(this, tr("RPCN: Change Password"), tr("Do you already have a reset password token?\n"
-	                                                                    "Note that the reset password token is different from the email verification token.")))
-	{
-	case QMessageBox::No:
-	{
-		rpcn_ask_email_dialog dlg_email(this, tr("Please enter the email you used to create the account:"));
-		dlg_email.exec();
-		const auto& email = dlg_email.get_email();
-
-		if (!email)
-			return;
-
+		else
 		{
-			const auto rpcn = rpcn::rpcn_client::get_instance(0);
-			if (auto result = rpcn->wait_for_connection(); result != rpcn::rpcn_state::failure_no_failure)
-			{
-				const QString error_message = tr("Failed to connect to RPCN server:\n%0").arg(QString::fromStdString(rpcn::rpcn_state_to_string(result)));
-				QMessageBox::critical(this, tr("Error Connecting!"), error_message, QMessageBox::Ok);
-				return;
-			}
-
-			if (auto error = rpcn->send_reset_token(*username, *email); error != rpcn::ErrorType::NoError)
-			{
-				QString error_message;
-				switch (error)
-				{
-				case rpcn::ErrorType::Invalid: error_message = tr("The server has no email verification and doesn't support password changes!"); break;
-				case rpcn::ErrorType::DbFail: error_message = tr("A database related error happened on the server!"); break;
-				case rpcn::ErrorType::TooSoon: error_message = tr("You can only ask for a reset password token once every 24 hours!"); break;
-				case rpcn::ErrorType::EmailFail: error_message = tr("The mail couldn't be sent successfully!"); break;
-				case rpcn::ErrorType::LoginError: error_message = tr("The username/email pair is invalid!"); break;
-				default: error_message = tr("Unknown error!"); break;
-				}
-				QMessageBox::critical(this, tr("Error Sending Password Reset Token!"), tr("Failed to send the password reset token:\n%0").arg(error_message), QMessageBox::Ok);
-				return;
-			}
-
-			QMessageBox::information(this, tr("Password Reset Token Sent!"), tr("The reset password token has successfully been sent!"), QMessageBox::Ok);
+			break;
 		}
-		[[fallthrough]];
 	}
-	case QMessageBox::Yes:
-	{
-		rpcn_ask_token_dialog dlg_token(this, tr("Please enter the password reset token you received:"));
-		dlg_token.exec();
-		const auto& token = dlg_token.get_token();
 
-		if (!token)
-			return;
+	const auto rpcn = std::make_shared<rpcn_client>(true);
 
-		rpcn_ask_password_dialog dlg_password(this, tr("Please enter your new password:"));
-		dlg_password.exec();
-		const auto& password = dlg_password.get_password();
-
-		if (!password)
-			return;
+	const auto host        = g_cfg_rpcn.get_host();
+	const auto npid        = g_cfg_rpcn.get_npid();
+	const auto online_name = npid;
+	const auto avatar_url  = "https://rpcs3.net/cdn/netplay/DefaultAvatar.png";
+	const auto password    = g_cfg_rpcn.get_password();
 
+	std::thread(
+		[](const std::shared_ptr<rpcn_client> rpcn)
 		{
-			const auto rpcn = rpcn::rpcn_client::get_instance(0);
-			if (auto result = rpcn->wait_for_connection(); result != rpcn::rpcn_state::failure_no_failure)
-			{
-				const QString error_message = tr("Failed to connect to RPCN server:\n%0").arg(QString::fromStdString(rpcn::rpcn_state_to_string(result)));
-				QMessageBox::critical(this, tr("Error Connecting!"), error_message, QMessageBox::Ok);
-				return;
-			}
+			while (rpcn.use_count() != 1)
+				rpcn->manage_connection();
 
-			if (auto error = rpcn->reset_password(*username, *token, *password); error != rpcn::ErrorType::NoError)
-			{
-				QString error_message;
-				switch (error)
-				{
-				case rpcn::ErrorType::Invalid: error_message = tr("The server has no email verification and doesn't support password changes!"); break;
-				case rpcn::ErrorType::DbFail: error_message = tr("A database related error happened on the server!"); break;
-				case rpcn::ErrorType::TooSoon: error_message = tr("You can only ask for a reset password token once every 24 hours!"); break;
-				case rpcn::ErrorType::EmailFail: error_message = tr("The mail couldn't be sent successfully!"); break;
-				case rpcn::ErrorType::LoginError: error_message = tr("The username/token pair is invalid!"); break;
-				default: error_message = tr("Unknown error"); break;
-				}
-				QMessageBox::critical(this, tr("Error Sending Password Reset Token"), tr("Failed to change the password:\n%0").arg(error_message), QMessageBox::Ok);
-				return;
-			}
+			rpcn->disconnect();
+		},
+		rpcn)
+		.detach();
 
-			g_cfg_rpcn.set_password(*password);
-			g_cfg_rpcn.save();
-			QMessageBox::information(this, tr("Password Successfully Changed!"), tr("Your password has been successfully changed!"), QMessageBox::Ok);
-		}
-		break;
-	}
-	default:
-		return;
-	}
-}
-
-void friend_callback(void* param, rpcn::NotificationType ntype, const std::string& username, bool status)
-{
-	auto* dlg = static_cast<rpcn_friends_dialog*>(param);
-	dlg->callback_handler(ntype, username, status);
-}
-
-// Avoid including np_handler.h
-namespace np
-{
-	struct player_history
-	{
-		u64 timestamp{};
-		std::set<std::string> communication_ids;
-		std::string description;
-	};
-
-	std::map<std::string, player_history> load_players_history();
-}
-
-rpcn_friends_dialog::rpcn_friends_dialog(QWidget* parent)
-	: QDialog(parent)
-{
-	const qreal pixel_ratio = devicePixelRatioF();
-
-	// Create colored circle pixmaps
-	gui::utils::circle_pixmap online_pixmap(QColorConstants::Svg::green, pixel_ratio * 2);
-	gui::utils::circle_pixmap offline_pixmap(QColorConstants::Svg::red, pixel_ratio * 2);
-	gui::utils::circle_pixmap blocked_pixmap(QColorConstants::Svg::red, pixel_ratio * 2);
-	gui::utils::circle_pixmap req_rcvd_pixmap(QColorConstants::Svg::yellow, pixel_ratio * 2);
-	gui::utils::circle_pixmap req_sent_pixmap(QColorConstants::Svg::orange, pixel_ratio * 2);
-
-	// Reset device pixel ratios for further painting
-	online_pixmap.setDevicePixelRatio(1.0);
-	offline_pixmap.setDevicePixelRatio(1.0);
-	blocked_pixmap.setDevicePixelRatio(1.0);
-	req_rcvd_pixmap.setDevicePixelRatio(1.0);
-	req_sent_pixmap.setDevicePixelRatio(1.0);
-
-	// The width and height are identical for all pixmaps
-	const int w = online_pixmap.width();
-	const int h = online_pixmap.height();
-
-	const QPen pen1(QBrush(Qt::black), w * 0.1, Qt::SolidLine, Qt::RoundCap, Qt::MiterJoin);
-	const QPen pen2(QBrush(Qt::black), w * 0.15, Qt::SolidLine, Qt::RoundCap, Qt::MiterJoin);
-
-	QPainter painter;
-	painter.setRenderHint(QPainter::Antialiasing);
-
-	// Render a bar into the offline pixmap
-	{
-		painter.begin(&offline_pixmap);
-		painter.setPen(pen2);
-		painter.drawLine(QPointF(w * 0.25, h * 0.5), QPointF(w * 0.75, h * 0.5));
-		painter.end();
-	}
-
-	// Render a cross into the blocked pixmap
-	{
-		painter.begin(&blocked_pixmap);
-		painter.setPen(pen1);
-		painter.drawLine(QPointF(w * 0.25, h * 0.25), QPointF(w * 0.75, h * 0.75));
-		painter.drawLine(QPointF(w * 0.25, h * 0.75), QPointF(w * 0.75, h * 0.25));
-		painter.end();
-	}
-
-	// Render a downward arrow into the request received pixmap
-	{
-		painter.begin(&req_rcvd_pixmap);
-		painter.setPen(pen1);
-		painter.drawLine(QPointF(w * 0.5, h * 0.25), QPointF(w * 0.5, h * 0.75));
-		painter.drawLines({ QLineF(w * 0.5, h * 0.75, w * 0.25, h * 0.5), QLineF(w * 0.5, h * 0.75, w * 0.75, h * 0.5) });
-		painter.end();
-	}
-
-	// Render an upward arrow into the request sent pixmap
-	{
-		painter.begin(&req_sent_pixmap);
-		painter.setPen(pen1);
-		painter.drawLine(QPointF(w * 0.5, h * 0.25), QPointF(w * 0.5, h * 0.75));
-		painter.drawLines({ QLineF(w * 0.5, h * 0.25, w * 0.25, h * 0.5), QLineF(w * 0.5, h * 0.25, w * 0.75, h * 0.5) });
-		painter.end();
-	}
-
-	m_icon_online = online_pixmap;
-	m_icon_offline = offline_pixmap;
-	m_icon_blocked = blocked_pixmap;
-	m_icon_request_received = req_rcvd_pixmap;
-	m_icon_request_sent = req_sent_pixmap;
-
-	const auto set_title = [this]()
-	{
-		if (const std::string npid = g_cfg_rpcn.get_npid(); !npid.empty())
-		{
-			if (m_rpcn && m_rpcn->is_connected() && m_rpcn->is_authentified())
-			{
-				setWindowTitle(tr("RPCN: Friends - Logged in as %0").arg(QString::fromStdString(npid)));
-				return;
-			}
-
-			setWindowTitle(tr("RPCN: Friends - %0 (Not logged in)").arg(QString::fromStdString(npid)));
-			return;
-		}
-
-		setWindowTitle(tr("RPCN: Friends"));
-	};
-
-	set_title();
-	setObjectName("rpcn_friends_dialog");
-	setMinimumSize(QSize(400, 100));
-
-	QVBoxLayout* vbox_global = new QVBoxLayout();
-
-	QHBoxLayout* hbox_groupboxes = new QHBoxLayout();
-
-	QGroupBox* grp_list_friends   = new QGroupBox(tr("Friends"));
-	QVBoxLayout* vbox_lst_friends = new QVBoxLayout();
-	m_lst_friends                 = new QListWidget(this);
-	m_lst_friends->setContextMenuPolicy(Qt::CustomContextMenu);
-	vbox_lst_friends->addWidget(m_lst_friends);
-	QPushButton* btn_addfriend = new QPushButton(tr("Add Friend"));
-	vbox_lst_friends->addWidget(btn_addfriend);
-	grp_list_friends->setLayout(vbox_lst_friends);
-	hbox_groupboxes->addWidget(grp_list_friends);
-
-	QGroupBox* grp_list_requests   = new QGroupBox(tr("Friend Requests"));
-	QVBoxLayout* vbox_lst_requests = new QVBoxLayout();
-	m_lst_requests                 = new QListWidget(this);
-	m_lst_requests->setContextMenuPolicy(Qt::CustomContextMenu);
-	vbox_lst_requests->addWidget(m_lst_requests);
-	QHBoxLayout* hbox_request_btns = new QHBoxLayout();
-	vbox_lst_requests->addLayout(hbox_request_btns);
-	grp_list_requests->setLayout(vbox_lst_requests);
-	hbox_groupboxes->addWidget(grp_list_requests);
-
-	QGroupBox* grp_list_blocks   = new QGroupBox(tr("Blocked Users"));
-	QVBoxLayout* vbox_lst_blocks = new QVBoxLayout();
-	m_lst_blocks                 = new QListWidget(this);
-	vbox_lst_blocks->addWidget(m_lst_blocks);
-	grp_list_blocks->setLayout(vbox_lst_blocks);
-	hbox_groupboxes->addWidget(grp_list_blocks);
-
-	QGroupBox* grp_list_history   = new QGroupBox(tr("Recent Players"));
-	QVBoxLayout* vbox_lst_history = new QVBoxLayout();
-	m_lst_history                 = new QListWidget(this);
-	m_lst_history->setContextMenuPolicy(Qt::CustomContextMenu);
-	vbox_lst_history->addWidget(m_lst_history);
-	grp_list_history->setLayout(vbox_lst_history);
-	hbox_groupboxes->addWidget(grp_list_history);
-
-	vbox_global->addLayout(hbox_groupboxes);
-
-	setLayout(vbox_global);
-
-	// Tries to connect to RPCN
-	m_rpcn = rpcn::rpcn_client::get_instance(0);
-
-	if (auto res = m_rpcn->wait_for_connection(); res != rpcn::rpcn_state::failure_no_failure)
-	{
-		const QString error_msg = tr("Failed to connect to RPCN:\n%0").arg(QString::fromStdString(rpcn::rpcn_state_to_string(res)));
-		QMessageBox::warning(parent, tr("Error connecting to RPCN!"), error_msg, QMessageBox::Ok);
-		return;
-	}
-	if (auto res = m_rpcn->wait_for_authentified(); res != rpcn::rpcn_state::failure_no_failure)
-	{
-		const QString error_msg = tr("Failed to authentify to RPCN:\n%0").arg(QString::fromStdString(rpcn::rpcn_state_to_string(res)));
-		QMessageBox::warning(parent, tr("Error authentifying to RPCN!"), error_msg, QMessageBox::Ok);
-		return;
-	}
-
-	set_title();
-
-	// Get friends, setup callback and setup comboboxes
-	rpcn::friend_data data;
-	m_rpcn->get_friends_and_register_cb(data, friend_callback, this);
-
-	for (const auto& [username, data] : data.friends)
-	{
-		add_update_list(m_lst_friends, QString::fromStdString(username), data.online ? m_icon_online : m_icon_offline, data.online);
-	}
-
-	for (const auto& fr_req : data.requests_sent)
-	{
-		add_update_list(m_lst_requests, QString::fromStdString(fr_req), m_icon_request_sent, QVariant(false));
-	}
-
-	for (const auto& fr_req : data.requests_received)
-	{
-		add_update_list(m_lst_requests, QString::fromStdString(fr_req), m_icon_request_received, QVariant(true));
-	}
-
-	for (const auto& blck : data.blocked)
-	{
-		add_update_list(m_lst_blocks, QString::fromStdString(blck), m_icon_blocked, QVariant(false));
-	}
-
-	auto history = np::load_players_history();
-	std::map<u64, std::pair<std::string, std::string>, std::greater<u64>> sorted_history;
-
-	for (auto& [username, user_info] : history)
-	{
-		if (!data.friends.contains(username) && !data.requests_sent.contains(username) && !data.requests_received.contains(username))
-			sorted_history.insert(std::make_pair(user_info.timestamp, std::make_pair(username, std::move(user_info.description))));
-	}
-
-	for (const auto& [_, username_and_description] : sorted_history)
-	{
-		const auto& [username, description] = username_and_description;
-		QListWidgetItem* item = new QListWidgetItem(QString::fromStdString(username));
-
-		if (!description.empty())
-			item->setToolTip(QString::fromStdString(description));
-
-		m_lst_history->addItem(item);
-	}
-
-	connect(this, &rpcn_friends_dialog::signal_add_update_friend, this, &rpcn_friends_dialog::add_update_friend);
-	connect(this, &rpcn_friends_dialog::signal_remove_friend, this, &rpcn_friends_dialog::remove_friend);
-	connect(this, &rpcn_friends_dialog::signal_add_query, this, &rpcn_friends_dialog::add_query);
-
-	connect(m_lst_friends, &QListWidget::customContextMenuRequested, this, [this](const QPoint& pos)
-		{
-			if (!m_lst_friends->itemAt(pos) || m_lst_friends->selectedItems().count() != 1)
-			{
-				return;
-			}
-
-			QListWidgetItem* selected_item = m_lst_friends->selectedItems().first();
-			std::string str_sel_friend     = selected_item->text().toStdString();
-
-			QMenu* context_menu           = new QMenu();
-			QAction* remove_friend_action = context_menu->addAction(tr("&Remove Friend"));
-
-			connect(remove_friend_action, &QAction::triggered, this, [this, str_sel_friend]()
-				{
-					if (!m_rpcn->remove_friend(str_sel_friend))
-					{
-						QMessageBox::critical(this, tr("Error removing a friend!"), tr("An error occurred while trying to remove a friend!"), QMessageBox::Ok);
-					}
-					else
-					{
-						QMessageBox::information(this, tr("Friend removed!"), tr("You've successfully removed a friend!"), QMessageBox::Ok);
-					}
-				});
-
-			context_menu->exec(m_lst_friends->viewport()->mapToGlobal(pos));
-			context_menu->deleteLater();
-		});
-
-	connect(m_lst_requests, &QListWidget::customContextMenuRequested, this, [this](const QPoint& pos)
-		{
-			if (!m_lst_requests->itemAt(pos) || m_lst_requests->selectedItems().count() != 1)
-			{
-				return;
-			}
-
-			QListWidgetItem* selected_item = m_lst_requests->selectedItems().first();
-			std::string str_sel_friend = selected_item->text().toStdString();
-
-			QMenu* context_menu = new QMenu();
-
-			// Presents different context based on role
-			if (selected_item->data(Qt::UserRole) == false)
-			{
-				QAction* cancel_friend_request = context_menu->addAction(tr("&Cancel Request"));
-
-				connect(cancel_friend_request, &QAction::triggered, this, [this, str_sel_friend]()
-					{
-						if (!m_rpcn->remove_friend(str_sel_friend))
-						{
-							QMessageBox::critical(this, tr("Error cancelling friend request!"), tr("An error occurred while trying to cancel friend request!"), QMessageBox::Ok);
-						}
-						else
-						{
-							QMessageBox::information(this, tr("Friend request cancelled!"), tr("You've successfully cancelled the friend request!"), QMessageBox::Ok);
-						}
-					});
-
-				context_menu->exec(m_lst_requests->viewport()->mapToGlobal(pos));
-				context_menu->deleteLater();
-
-				return;
-			}
-
-
-			QAction* accept_request_action = context_menu->addAction(tr("&Accept Request"));
-			QAction* reject_friend_request = context_menu->addAction(tr("&Reject Request"));
-
-			connect(accept_request_action, &QAction::triggered, this, [this, str_sel_friend]()
-				{
-					if (!m_rpcn->add_friend(str_sel_friend))
-					{
-						QMessageBox::critical(this, tr("Error adding a friend!"), tr("An error occurred while trying to add a friend!"), QMessageBox::Ok);
-					}
-					else
-					{
-						QMessageBox::information(this, tr("Friend added!"), tr("You've successfully added a friend!"), QMessageBox::Ok);
-					}
-				});
-
-			connect(reject_friend_request, &QAction::triggered, this, [this, str_sel_friend]()
-			{
-				if (!m_rpcn->remove_friend(str_sel_friend))
-				{
-					QMessageBox::critical(this, tr("Error rejecting friend request!"), tr("An error occurred while trying to reject the friend request!"), QMessageBox::Ok);
-				}
-				else
-				{
-					QMessageBox::information(this, tr("Friend request cancelled!"), tr("You've successfully rejected the friend request!"), QMessageBox::Ok);
-				}
-			});
-
-			context_menu->exec(m_lst_requests->viewport()->mapToGlobal(pos));
-			context_menu->deleteLater();
-		});
-
-	connect(m_lst_history, &QListWidget::customContextMenuRequested, this, [this](const QPoint& pos)
-		{
-			if (!m_lst_history->itemAt(pos) || m_lst_history->selectedItems().count() != 1)
-			{
-				return;
-			}
-
-			QListWidgetItem* selected_item = m_lst_history->selectedItems().first();
-
-			std::string str_sel_friend = selected_item->text().toStdString();
-
-			QMenu* context_menu = new QMenu();
-			QAction* send_friend_request_action = context_menu->addAction(tr("&Send Friend Request"));
-
-			connect(send_friend_request_action, &QAction::triggered, this, [this, str_sel_friend]()
-				{
-					if (!m_rpcn->add_friend(str_sel_friend))
-					{
-						QMessageBox::critical(this, tr("Error sending a friend request!"), tr("An error occurred while trying to send a friend request!"), QMessageBox::Ok);
-						return;
-					}
-
-					QString qstr_friend = QString::fromStdString(str_sel_friend);
-					add_update_list(m_lst_requests, qstr_friend, m_icon_request_sent, QVariant(false));
-					remove_list(m_lst_history, qstr_friend);
-				});
-
-			context_menu->exec(m_lst_history->viewport()->mapToGlobal(pos));
-			context_menu->deleteLater();
-		});
-
-	connect(btn_addfriend, &QAbstractButton::clicked, this, [this]()
-		{
-			std::string str_friend_username;
-			while (true)
-			{
-				bool ok                 = false;
-				QString friend_username = QInputDialog::getText(this, tr("Add a friend"), tr("Friend's username:"), QLineEdit::Normal, "", &ok);
-				if (!ok)
-				{
-					return;
-				}
-
-				str_friend_username = friend_username.toStdString();
-
-				if (validate_rpcn_username(str_friend_username))
-				{
-					break;
-				}
-
-				QMessageBox::critical(this, tr("Error validating username!"), tr("The username you entered is invalid!"), QMessageBox::Ok);
-			}
-
-			if (!m_rpcn->add_friend(str_friend_username))
-			{
-				QMessageBox::critical(this, tr("Error adding friend!"), tr("An error occurred while adding a friend!"), QMessageBox::Ok);
-			}
-			else
-			{
-				add_update_list(m_lst_requests, QString::fromStdString(str_friend_username), m_icon_request_sent, QVariant(false));
-				QMessageBox::information(this, tr("Friend added!"), tr("Friend was successfully added!"), QMessageBox::Ok);
-			}
-		});
-
-	m_rpcn_ok = true;
-}
-
-rpcn_friends_dialog::~rpcn_friends_dialog()
-{
-	m_rpcn->remove_friend_cb(friend_callback, this);
-}
-
-bool rpcn_friends_dialog::is_ok() const
-{
-	return m_rpcn_ok;
-}
-
-void rpcn_friends_dialog::add_update_list(QListWidget* list, const QString& name, const QIcon& icon, const QVariant& data)
-{
-	QListWidgetItem* item = nullptr;
-	if (auto found = list->findItems(name, Qt::MatchExactly); !found.empty())
-	{
-		item = found[0];
-		item->setData(Qt::UserRole, data);
-		item->setIcon(icon);
-	}
-	else
-	{
-		item = new QListWidgetItem(name);
-		item->setIcon(icon);
-		item->setData(Qt::UserRole, data);
-		list->addItem(item);
-	}
-}
-
-void rpcn_friends_dialog::remove_list(QListWidget* list, const QString& name)
-{
-	if (auto found = list->findItems(name, Qt::MatchExactly); !found.empty())
-	{
-		delete list->takeItem(list->row(found[0]));
-	}
-}
-
-void rpcn_friends_dialog::add_update_friend(const QString& name, bool status)
-{
-	add_update_list(m_lst_friends, name, status ? m_icon_online : m_icon_offline, status);
-	remove_list(m_lst_requests, name);
-}
-
-void rpcn_friends_dialog::remove_friend(const QString& name)
-{
-	remove_list(m_lst_friends, name);
-	remove_list(m_lst_requests, name);
-}
-
-void rpcn_friends_dialog::add_query(const QString& name)
-{
-	add_update_list(m_lst_requests, name, m_icon_request_received, QVariant(true));
-	remove_list(m_lst_history, name);
-}
-
-void rpcn_friends_dialog::callback_handler(rpcn::NotificationType ntype, const std::string& username, bool status)
-{
-	const QString qtr_username = QString::fromStdString(username);
-	switch (ntype)
-	{
-	case rpcn::NotificationType::FriendQuery: // Other user sent a friend request
-	{
-		Q_EMIT signal_add_query(qtr_username);
-		break;
-	}
-	case rpcn::NotificationType::FriendNew: // Add a friend to the friendlist(either accepted a friend request or friend accepted it)
-	{
-		Q_EMIT signal_add_update_friend(qtr_username, status);
-		break;
-	}
-	case rpcn::NotificationType::FriendLost: // Remove friend from the friendlist(user removed friend or friend removed friend)
-	{
-		Q_EMIT signal_remove_friend(qtr_username);
-		break;
-	}
-	case rpcn::NotificationType::FriendStatus: // Set status of friend to Offline or Online
-	{
-		Q_EMIT signal_add_update_friend(qtr_username, status);
-		break;
-	}
-	case rpcn::NotificationType::FriendPresenceChanged:
-	{
-		break;
-	}
-	default:
-	{
-		rpcn_settings_log.fatal("An unhandled notification type was received by the RPCN friends dialog callback!");
-		break;
+	if (!rpcn->connect(host))
+	{
+		QMessageBox::critical(this, tr("Error Connecting"), tr("Failed to connect to RPCN server"), QMessageBox::Ok);
+		rpcn->abort();
+		return false;
 	}
+
+	if (!rpcn->create_user(npid, password, online_name, avatar_url, email.toStdString()))
+	{
+		QMessageBox::critical(this, tr("Error Creating Account"), tr("Failed to create the account"), QMessageBox::Ok);
+		rpcn->abort();
+		return false;
 	}
+
+	QMessageBox::information(this, tr("Account created!"), tr("Your account has been created successfully!\nCheck your email for your token!"), QMessageBox::Ok);
+	rpcn->abort();
+	return true;
 }
diff --git a/rpcs3/rpcs3qt/rpcn_settings_dialog.h b/rpcs3/rpcs3qt/rpcn_settings_dialog.h
index 3db92bbc7c..e3298ca3c5 100644
--- a/rpcs3/rpcs3qt/rpcn_settings_dialog.h
+++ b/rpcs3/rpcs3qt/rpcn_settings_dialog.h
@@ -1,144 +1,18 @@
 #pragma once
 
-#include <optional>
-
 #include <QDialog>
 #include <QLineEdit>
-#include <QListWidget>
-
-#include "Emu/NP/rpcn_client.h"
 
 class rpcn_settings_dialog : public QDialog
 {
 	Q_OBJECT
+
 public:
 	rpcn_settings_dialog(QWidget* parent = nullptr);
-};
 
-class rpcn_account_dialog : public QDialog
-{
-	Q_OBJECT
-public:
-	rpcn_account_dialog(QWidget* parent = nullptr);
-
-private:
-	void refresh_combobox();
-
-private:
-	QComboBox* cbx_servers = nullptr;
-};
-
-class rpcn_add_server_dialog : public QDialog
-{
-	Q_OBJECT
-public:
-	rpcn_add_server_dialog(QWidget* parent = nullptr);
-	const std::optional<std::pair<std::string, std::string>>& get_new_server() const;
-
-private:
-	std::optional<std::pair<std::string, std::string>> m_new_server;
-};
-
-class rpcn_ask_username_dialog : public QDialog
-{
-	Q_OBJECT
-public:
-	rpcn_ask_username_dialog(QWidget* parent, const QString& description);
-	const std::optional<std::string>& get_username() const;
-
-private:
-	std::optional<std::string> m_username;
-};
-
-class rpcn_ask_password_dialog : public QDialog
-{
-	Q_OBJECT
-public:
-	rpcn_ask_password_dialog(QWidget* parent, const QString& description);
-	const std::optional<std::string>& get_password() const;
-
-private:
-	std::optional<std::string> m_password;
-};
-
-class rpcn_ask_email_dialog : public QDialog
-{
-	Q_OBJECT
-public:
-	rpcn_ask_email_dialog(QWidget* parent, const QString& description);
-	const std::optional<std::string>& get_email() const;
-
-private:
-	std::optional<std::string> m_email;
-};
-
-class rpcn_ask_token_dialog : public QDialog
-{
-	Q_OBJECT
-public:
-	rpcn_ask_token_dialog(QWidget* parent, const QString& description);
-	const std::optional<std::string>& get_token() const;
-
-private:
-	std::optional<std::string> m_token;
-};
-
-class rpcn_account_edit_dialog : public QDialog
-{
-	Q_OBJECT
-public:
-	rpcn_account_edit_dialog(QWidget* parent = nullptr);
-
-private:
 	bool save_config();
-
-private Q_SLOTS:
-	void resend_token();
-	void change_password();
+	bool create_account();
 
 protected:
-	QLineEdit *m_edit_username, *m_edit_token;
-};
-
-class rpcn_friends_dialog : public QDialog
-{
-	Q_OBJECT
-public:
-	rpcn_friends_dialog(QWidget* parent = nullptr);
-	~rpcn_friends_dialog();
-	void callback_handler(rpcn::NotificationType ntype, const std::string& username, bool status);
-	bool is_ok() const;
-
-private:
-	void add_update_list(QListWidget* list, const QString& name, const QIcon& icon, const QVariant& data);
-	void remove_list(QListWidget* list, const QString& name);
-
-private Q_SLOTS:
-	void add_update_friend(const QString& name, bool status);
-	void remove_friend(const QString& name);
-	void add_query(const QString& name);
-
-Q_SIGNALS:
-	void signal_add_update_friend(const QString& name, bool status);
-	void signal_remove_friend(const QString& name);
-	void signal_add_query(const QString& name);
-
-private:
-	QIcon m_icon_online;
-	QIcon m_icon_offline;
-	QIcon m_icon_blocked;
-	QIcon m_icon_request_received;
-	QIcon m_icon_request_sent;
-
-	// list of friends
-	QListWidget* m_lst_friends = nullptr;
-	// list of friend requests sent by/to the current user
-	QListWidget* m_lst_requests = nullptr;
-	// list of people blocked by the user
-	QListWidget* m_lst_blocks = nullptr;
-	// list of players in history
-	QListWidget* m_lst_history = nullptr;
-
-	std::shared_ptr<rpcn::rpcn_client> m_rpcn;
-	bool m_rpcn_ok = false;
+	QLineEdit *m_edit_host, *m_edit_npid, *m_edit_token;
 };
diff --git a/rpcs3/rpcs3qt/rsx_debugger.cpp b/rpcs3/rpcs3qt/rsx_debugger.cpp
index 234adbd8e2..f946171f90 100644
--- a/rpcs3/rpcs3qt/rsx_debugger.cpp
+++ b/rpcs3/rpcs3qt/rsx_debugger.cpp
@@ -4,9 +4,7 @@
 #include "table_item_delegate.h"
 #include "Emu/RSX/RSXThread.h"
 #include "Emu/RSX/gcm_printing.h"
-#include "Emu/RSX/Common/BufferUtils.h"
-#include "Emu/RSX/Program/CgBinaryProgram.h"
-#include "Utilities/File.h"
+#include "util/asm.hpp"
 
 #include <QHBoxLayout>
 #include <QHeaderView>
@@ -14,11 +12,7 @@
 #include <QFontDatabase>
 #include <QPixmap>
 #include <QPushButton>
-#include <QFileDialog>
 #include <QKeyEvent>
-#include <QTimer>
-#include <QMenu>
-#include <QBuffer>
 
 #include <span>
 
@@ -28,7 +22,7 @@ enum GCMEnumTypes
 	CELL_GCM_PRIMITIVE_ENUM,
 };
 
-LOG_CHANNEL(rsx_debugger, "RSX Debugger");
+constexpr auto qstr = QString::fromStdString;
 
 namespace utils
 {
@@ -45,7 +39,6 @@ rsx_debugger::rsx_debugger(std::shared_ptr<gui_settings> gui_settings, QWidget*
 {
 	setWindowTitle(tr("RSX Debugger"));
 	setObjectName("rsx_debugger");
-	setAttribute(Qt::WA_DeleteOnClose);
 	setWindowFlags(Qt::Window);
 
 	// Fonts and Colors
@@ -113,16 +106,27 @@ rsx_debugger::rsx_debugger(std::shared_ptr<gui_settings> gui_settings, QWidget*
 	m_list_captured_draw_calls = add_rsx_tab(tr("Captured Draw Calls"), 1);
 
 	m_list_captured_frame->setHorizontalHeaderLabels(QStringList() << tr("Column"));
-	m_list_captured_frame->setColumnWidth(0, 540);
+	m_list_captured_frame->setColumnWidth(0, 720);
 
 	m_list_captured_draw_calls->setHorizontalHeaderLabels(QStringList() << tr("Draw calls"));
-	m_list_captured_draw_calls->setColumnWidth(0, 540);
+	m_list_captured_draw_calls->setColumnWidth(0, 720);
 
 	// Tools: Tools = Controls + Notebook Tabs
 	QVBoxLayout* vbox_tools = new QVBoxLayout();
 	vbox_tools->addLayout(hbox_controls);
 	vbox_tools->addWidget(m_tw_rsx);
 
+	// State explorer
+	m_text_transform_program = new QLabel();
+	m_text_transform_program->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
+	m_text_transform_program->setFont(mono);
+	m_text_transform_program->setText("");
+
+	m_text_shader_program = new QLabel();
+	m_text_shader_program->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
+	m_text_shader_program->setFont(mono);
+	m_text_shader_program->setText("");
+
 	m_list_index_buffer = new QListWidget();
 	m_list_index_buffer->setFont(mono);
 
@@ -135,45 +139,6 @@ rsx_debugger::rsx_debugger(std::shared_ptr<gui_settings> gui_settings, QWidget*
 	m_buffer_stencil = new Buffer(false, 4, tr("Stencil Buffer"), this);
 	m_buffer_tex     = new Buffer(true, 4, tr("Texture"), this);
 
-	for (Buffer* buf :
-	{
-		m_buffer_colorA, m_buffer_colorB, m_buffer_colorC, m_buffer_colorD
-		, m_buffer_depth, m_buffer_stencil, m_buffer_tex
-	})
-	{
-		buf->setContextMenuPolicy(Qt::CustomContextMenu);
-
-		connect(buf, &QWidget::customContextMenuRequested, buf, &Buffer::ShowContextMenu);
-	}
-
-	QGroupBox* tex_idx_group = new QGroupBox(tr("Texture Index or Address / Format Override"));
-	QVBoxLayout* vlayout_tex_idx = new QVBoxLayout(this);
-	QHBoxLayout* hbox_idx_line = new QHBoxLayout(this);
-	QLineEdit* tex_idx_line = new QLineEdit(this);
-	tex_idx_line->setPlaceholderText("00000000");
-	tex_idx_line->setFont(mono);
-	tex_idx_line->setMaxLength(18);
-	tex_idx_line->setFixedWidth(75);
-	tex_idx_line->setFocus();
-	tex_idx_line->setValidator(new QRegularExpressionValidator(QRegularExpression("^(0[xX])?0*[a-fA-F0-9]{0,8}$"), this));
-
-	QLineEdit* tex_fmt_override_line = new QLineEdit(this);
-	tex_fmt_override_line->setPlaceholderText("00");
-	tex_fmt_override_line->setFont(mono);
-	tex_fmt_override_line->setMaxLength(18);
-	tex_fmt_override_line->setFixedWidth(75);
-	tex_fmt_override_line->setFocus();
-	tex_fmt_override_line->setValidator(new QRegularExpressionValidator(QRegularExpression("^(0[xX])?0*[a-fA-F0-9]{0,2}$"), this));
-
-	hbox_idx_line->addWidget(tex_idx_line);
-	hbox_idx_line->addWidget(tex_fmt_override_line);
-	vlayout_tex_idx->addLayout(hbox_idx_line);
-
-	m_enabled_textures_label = new QLabel(enabled_textures_text, this);
-
-	vlayout_tex_idx->addWidget(m_enabled_textures_label);
-	tex_idx_group->setLayout(vlayout_tex_idx);
-
 	// Merge and display everything
 	QVBoxLayout* vbox_buffers1 = new QVBoxLayout();
 	vbox_buffers1->addWidget(m_buffer_colorA);
@@ -186,7 +151,6 @@ rsx_debugger::rsx_debugger(std::shared_ptr<gui_settings> gui_settings, QWidget*
 	vbox_buffers2->addWidget(m_buffer_colorB);
 	vbox_buffers2->addWidget(m_buffer_colorD);
 	vbox_buffers2->addWidget(m_buffer_stencil);
-	vbox_buffers2->addWidget(tex_idx_group);
 	vbox_buffers2->addStretch();
 
 	QHBoxLayout* buffer_layout = new QHBoxLayout();
@@ -197,31 +161,11 @@ rsx_debugger::rsx_debugger(std::shared_ptr<gui_settings> gui_settings, QWidget*
 	QWidget* buffers = new QWidget();
 	buffers->setLayout(buffer_layout);
 
-	auto xp_layout = new QHBoxLayout();
-	m_transform_disasm = new QTextEdit(this);
-	m_transform_disasm->setReadOnly(true);
-	m_transform_disasm->setWordWrapMode(QTextOption::NoWrap);
-	m_transform_disasm->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
-	xp_layout->addWidget(m_transform_disasm);
-
-	auto xp_tab = new QWidget();
-	xp_tab->setLayout(xp_layout);
-
-	auto fp_layout = new QHBoxLayout();
-	m_fragment_disasm = new QTextEdit(this);
-	m_fragment_disasm->setReadOnly(true);
-	m_fragment_disasm->setWordWrapMode(QTextOption::NoWrap);
-	m_fragment_disasm->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
-	fp_layout->addWidget(m_fragment_disasm);
-
-	auto fp_tab = new QWidget();
-	fp_tab->setLayout(fp_layout);
-
 	QTabWidget* state_rsx = new QTabWidget();
 	state_rsx->addTab(buffers, tr("RTTs and DS"));
-	state_rsx->addTab(xp_tab, tr("Vertex Program"));
-	state_rsx->addTab(fp_tab, tr("Fragment Program"));
-	state_rsx->addTab(m_list_index_buffer, tr("Index Buffer"));
+	state_rsx->addTab(m_text_transform_program, tr("Transform program"));
+	state_rsx->addTab(m_text_shader_program, tr("Shader program"));
+	state_rsx->addTab(m_list_index_buffer, tr("Index buffer"));
 
 	QHBoxLayout* main_layout = new QHBoxLayout();
 	main_layout->addLayout(vbox_tools, 1);
@@ -230,26 +174,6 @@ rsx_debugger::rsx_debugger(std::shared_ptr<gui_settings> gui_settings, QWidget*
 
 	connect(m_list_captured_draw_calls, &QTableWidget::itemClicked, this, &rsx_debugger::OnClickDrawCalls);
 
-	connect(tex_idx_line, &QLineEdit::textChanged, [this](const QString& text)
-	{
-		bool ok = false;
-		const u32 addr = (text.startsWith("0x", Qt::CaseInsensitive) ? text.right(text.size() - 2) : text).toULong(&ok, 16);
-		if (ok)
-		{
-			m_cur_texture = addr;
-		}
-	});
-
-	connect(tex_fmt_override_line, &QLineEdit::textChanged, [this](const QString& text)
-	{
-		bool ok = false;
-		const u32 fmt = (text.startsWith("0x", Qt::CaseInsensitive) ? text.right(text.size() - 2) : text).toULong(&ok, 16);
-		if (ok)
-		{
-			m_texture_format_override = fmt;
-		}
-	});
-
 	// Restore header states
 	QVariantMap states = m_gui_settings->GetValue(gui::rsx_states).toMap();
 	for (int i = 0; i < m_tw_rsx->count(); i++)
@@ -259,12 +183,8 @@ rsx_debugger::rsx_debugger(std::shared_ptr<gui_settings> gui_settings, QWidget*
 	for (u32 i = 0; i < frame_debug.command_queue.size(); i++)
 		m_list_captured_frame->insertRow(i);
 
-	restoreGeometry(m_gui_settings->GetValue(gui::rsx_geometry).toByteArray());
-
-	// Check for updates every ~100 ms
-	QTimer *timer = new QTimer(this);
-	connect(timer, &QTimer::timeout, this, &rsx_debugger::UpdateInformation);
-	timer->start(100);
+	if (!restoreGeometry(m_gui_settings->GetValue(gui::rsx_geometry).toByteArray()))
+		UpdateInformation();
 }
 
 void rsx_debugger::closeEvent(QCloseEvent* event)
@@ -274,8 +194,8 @@ void rsx_debugger::closeEvent(QCloseEvent* event)
 	for (int i = 0; i < m_tw_rsx->count(); i++)
 		states[QString::number(i)] = (static_cast<QTableWidget*>(m_tw_rsx->widget(i)))->horizontalHeader()->saveState();
 
-	m_gui_settings->SetValue(gui::rsx_states, states, false);
-	m_gui_settings->SetValue(gui::rsx_geometry, saveGeometry(), true);
+	m_gui_settings->SetValue(gui::rsx_states, states);
+	m_gui_settings->SetValue(gui::rsx_geometry, saveGeometry());
 
 	QDialog::closeEvent(event);
 }
@@ -332,15 +252,12 @@ Buffer::Buffer(bool isTex, u32 id, const QString& name, QWidget* parent)
 }
 
 // Draws a formatted and buffered <image> inside the Buffer Widget
-void Buffer::showImage(QImage&& image)
+void Buffer::showImage(const QImage& image)
 {
 	if (image.isNull())
-	{
-		m_canvas->clear();
 		return;
-	}
 
-	m_image = std::move(image);
+	m_image = image;
 	const QImage scaled = m_image.scaled(m_image_size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 	m_canvas->setPixmap(QPixmap::fromImage(scaled));
 
@@ -351,10 +268,10 @@ void Buffer::showImage(QImage&& image)
 	setLayout(new_layout);
 }
 
-void Buffer::ShowWindowed()
+void Buffer::ShowWindowed() const
 {
 	//const auto render = rsx::get_current_renderer();
-	if (m_image.isNull())
+	if (!g_fxo->is_init<rsx::thread>())
 		return;
 
 	// TODO: Is there any better way to choose the color buffers
@@ -367,7 +284,7 @@ void Buffer::ShowWindowed()
 	//	return;
 	//}
 
-	gui::utils::show_windowed_image(m_image.copy(), QString("%1 #%2").arg(title()).arg(m_window_counter++));
+	gui::utils::show_windowed_image(m_image, title());
 
 	//if (m_isTex)
 	//{
@@ -381,38 +298,6 @@ void Buffer::ShowWindowed()
 	//}
 }
 
-void Buffer::ShowContextMenu(const QPoint& pos)
-{
-	if (m_image.isNull())
-		return;
-
-	QMenu context_menu(this);
-
-	QAction action(tr("Save Image At"), this);
-	connect(&action, &QAction::triggered, this, [&]()
-	{
-		if (m_image.isNull())
-			return;
-
-		const QString path = QFileDialog::getSaveFileName(this, tr("Save Image"), "", "Image (*.png)");
-
-		if (path.isEmpty())
-			return;
-
-		if (m_image.save(path, "PNG", 100))
-		{
-			rsx_debugger.success("Saved image to '%s'", path);
-		}
-		else
-		{
-			rsx_debugger.error("Failure to save image to '%s'", path);
-		}
-	});
-
-	context_menu.addAction(&action);
-	context_menu.exec(mapToGlobal(pos));
-}
-
 namespace
 {
 	f32 f16_to_f32(f16 val)
@@ -434,12 +319,12 @@ namespace
 		{
 		case rsx::surface_color_format::b8:
 		{
-			const u8 value = read_from_ptr<u8>(orig_buffer, idx);
+			const u8 value = utils::bless<const u8>(orig_buffer)[idx];
 			return{ value, value, value };
 		}
 		case rsx::surface_color_format::x32:
 		{
-			const be_t<u32> stored_val = read_from_ptr<be_t<u32>>(orig_buffer, idx);
+			const be_t<u32> stored_val = utils::bless<const be_t<u32>>(orig_buffer)[idx];
 			const u32 swapped_val = stored_val;
 			const f32 float_val = std::bit_cast<f32>(swapped_val);
 			const u8 val = float_val * 255.f;
@@ -449,14 +334,14 @@ namespace
 		case rsx::surface_color_format::x8b8g8r8_o8b8g8r8:
 		case rsx::surface_color_format::x8b8g8r8_z8b8g8r8:
 		{
-			const auto ptr = reinterpret_cast<const u8*>(orig_buffer.data());
+			const auto ptr = utils::bless<const u8>(orig_buffer);
 			return{ ptr[1 + idx * 4], ptr[2 + idx * 4], ptr[3 + idx * 4] };
 		}
 		case rsx::surface_color_format::a8r8g8b8:
 		case rsx::surface_color_format::x8r8g8b8_o8r8g8b8:
 		case rsx::surface_color_format::x8r8g8b8_z8r8g8b8:
 		{
-			const auto ptr = reinterpret_cast<const u8*>(orig_buffer.data());
+			const auto ptr = utils::bless<const u8>(orig_buffer);
 			return{ ptr[3 + idx * 4], ptr[2 + idx * 4], ptr[1 + idx * 4] };
 		}
 		case rsx::surface_color_format::w16z16y16x16:
@@ -485,17 +370,15 @@ namespace
 	}
 
 	/**
-	 * Fill a buffer that can be passed to QImage.
+	 * Return a new buffer that can be passed to QImage.
 	 */
-	void convert_to_QImage_buffer(rsx::surface_color_format format, std::span<const std::byte> orig_buffer, std::vector<u8>& buffer, usz width, usz height) noexcept
+	u8* convert_to_QImage_buffer(rsx::surface_color_format format, std::span<const std::byte> orig_buffer, usz width, usz height) noexcept
 	{
-		buffer.resize(width * height * 4);
-
-		if (buffer.empty())
+		u8* buffer = static_cast<u8*>(std::malloc(width * height * 4));
+		if (!buffer || width == 0 || height == 0)
 		{
-			return;
+			return nullptr;
 		}
-
 		for (u32 i = 0; i < width * height; i++)
 		{
 			// depending on original buffer, the colors may need to be reversed
@@ -505,6 +388,7 @@ namespace
 			buffer[2 + i * 4] = colors[2];
 			buffer[3 + i * 4] = 255;
 		}
+		return buffer;
 	}
 }
 
@@ -529,9 +413,8 @@ void rsx_debugger::OnClickDrawCalls()
 	{
 		if (width && height && !draw_call.color_buffer[i].empty())
 		{
-			std::vector<u8>& buffer = buffers[i]->cache;
-			convert_to_QImage_buffer(draw_call.state.surface_color(), draw_call.color_buffer[i], buffer, width, height);
-			buffers[i]->showImage(QImage(buffer.data(), static_cast<int>(width), static_cast<int>(height), QImage::Format_RGB32));
+			unsigned char* buffer = convert_to_QImage_buffer(draw_call.state.surface_color(), draw_call.color_buffer[i], width, height);
+			buffers[i]->showImage(QImage(buffer, static_cast<int>(width), static_cast<int>(height), QImage::Format_RGB32, [](void* buffer){ std::free(buffer); }, buffer));
 		}
 	}
 
@@ -540,8 +423,7 @@ void rsx_debugger::OnClickDrawCalls()
 		if (width && height && !draw_call.depth_stencil[0].empty())
 		{
 			const std::span<const std::byte> orig_buffer = draw_call.depth_stencil[0];
-			m_buffer_depth->cache.resize(4ULL * width * height);
-			const auto buffer = m_buffer_depth->cache.data();
+			u8* buffer = static_cast<u8*>(std::malloc(4ULL * width * height));
 
 			if (draw_call.state.surface_depth_fmt() == rsx::surface_depth_format::z24s8)
 			{
@@ -573,7 +455,7 @@ void rsx_debugger::OnClickDrawCalls()
 					}
 				}
 			}
-			m_buffer_depth->showImage(QImage(buffer, static_cast<int>(width), static_cast<int>(height), QImage::Format_RGB32));
+			m_buffer_depth->showImage(QImage(buffer, static_cast<int>(width), static_cast<int>(height), QImage::Format_RGB32, [](void* buffer){ std::free(buffer); }, buffer));
 		}
 	}
 
@@ -582,46 +464,45 @@ void rsx_debugger::OnClickDrawCalls()
 		if (width && height && !draw_call.depth_stencil[1].empty())
 		{
 			const std::span<const std::byte> orig_buffer = draw_call.depth_stencil[1];
-			std::vector<u8>& buffer = m_buffer_stencil->cache;
-			buffer.resize(4ULL * width * height);
+			u8* buffer = static_cast<u8*>(std::malloc(4ULL * width * height));
 
 			for (u32 row = 0; row < height; row++)
 			{
 				for (u32 col = 0; col < width; col++)
 				{
-					const u8 stencil_val = reinterpret_cast<const u8*>(orig_buffer.data())[row * width + col];
+					const u8 stencil_val = utils::bless<const u8>(orig_buffer)[row * width + col];
 					buffer[4 * col + 0 + width * row * 4] = stencil_val;
 					buffer[4 * col + 1 + width * row * 4] = stencil_val;
 					buffer[4 * col + 2 + width * row * 4] = stencil_val;
 					buffer[4 * col + 3 + width * row * 4] = 255;
 				}
 			}
-			m_buffer_stencil->showImage(QImage(buffer.data(), static_cast<int>(width), static_cast<int>(height), QImage::Format_RGB32));
+			m_buffer_stencil->showImage(QImage(buffer, static_cast<int>(width), static_cast<int>(height), QImage::Format_RGB32));
 		}
 	}
 
 	// Programs
-	m_transform_disasm->clear();
-	m_transform_disasm->setText(QString::fromStdString(frame_debug.draw_calls[draw_id].programs.first));
-	m_fragment_disasm->clear();
-	m_fragment_disasm->setText(QString::fromStdString(frame_debug.draw_calls[draw_id].programs.second));
+	m_text_transform_program->clear();
+	m_text_transform_program->setText(qstr(frame_debug.draw_calls[draw_id].programs.first));
+	m_text_shader_program->clear();
+	m_text_shader_program->setText(qstr(frame_debug.draw_calls[draw_id].programs.second));
 
 	m_list_index_buffer->clear();
 	//m_list_index_buffer->insertColumn(0, "Index", 0, 700);
 	if (frame_debug.draw_calls[draw_id].state.index_type() == rsx::index_array_type::u16)
 	{
-		auto index_buffer = ref_ptr<u16[]>(frame_debug.draw_calls[draw_id].index);
+		u16 *index_buffer = reinterpret_cast<u16*>(frame_debug.draw_calls[draw_id].index.data());
 		for (u32 i = 0; i < frame_debug.draw_calls[draw_id].vertex_count; ++i)
 		{
-			m_list_index_buffer->insertItem(i, QString::fromStdString(std::to_string(index_buffer[i])));
+			m_list_index_buffer->insertItem(i, qstr(std::to_string(index_buffer[i])));
 		}
 	}
 	if (frame_debug.draw_calls[draw_id].state.index_type() == rsx::index_array_type::u32)
 	{
-		auto index_buffer = ref_ptr<u32[]>(frame_debug.draw_calls[draw_id].index);
+		u32 *index_buffer = reinterpret_cast<u32*>(frame_debug.draw_calls[draw_id].index.data());
 		for (u32 i = 0; i < frame_debug.draw_calls[draw_id].vertex_count; ++i)
 		{
-			m_list_index_buffer->insertItem(i, QString::fromStdString(std::to_string(index_buffer[i])));
+			m_list_index_buffer->insertItem(i, qstr(std::to_string(index_buffer[i])));
 		}
 	}
 }
@@ -630,8 +511,6 @@ void rsx_debugger::UpdateInformation() const
 {
 	GetMemory();
 	GetBuffers();
-	GetVertexProgram();
-	GetFragmentProgram();
 }
 
 void rsx_debugger::GetMemory() const
@@ -639,685 +518,98 @@ void rsx_debugger::GetMemory() const
 	std::string dump;
 	u32 cmd_i = 0;
 
-	std::string str;
-
 	for (const auto& command : frame_debug.command_queue)
 	{
-		str.clear();
-		rsx::get_pretty_printing_function(command.first)(str, command.first, command.second);
-		m_list_captured_frame->setItem(cmd_i++, 0, new QTableWidgetItem(QString::fromStdString(str)));
+		const std::string str = rsx::get_pretty_printing_function(command.first)(command.first, command.second);
+		m_list_captured_frame->setItem(cmd_i++, 0, new QTableWidgetItem(qstr(str)));
 
 		dump += str;
 		dump += '\n';
 	}
 
-	if (!dump.empty())
+	if (fs::file file = fs::file(fs::get_cache_dir() + "command_dump.log", fs::rewrite))
 	{
-		fs::write_file(fs::get_cache_dir() + "command_dump.log", fs::rewrite, dump);
+		file.write(dump);
 	}
 
-	for (u32 i = 0; i < frame_debug.draw_calls.size(); i++)
-		m_list_captured_draw_calls->setItem(i, 0, new QTableWidgetItem(QString::fromStdString(frame_debug.draw_calls[i].name)));
+	for (u32 i = 0;i < frame_debug.draw_calls.size(); i++)
+		m_list_captured_draw_calls->setItem(i, 0, new QTableWidgetItem(qstr(frame_debug.draw_calls[i].name)));
 }
 
 void rsx_debugger::GetBuffers() const
 {
 	const auto render = rsx::get_current_renderer();
-	if (!render || !render->is_initialized || !render->local_mem_size || !render->is_paused())
+	if (!render)
 	{
 		return;
 	}
 
-	const auto addrs = render->get_color_surface_addresses();
-
-	// Color buffers
-	for (u32 buffer_it = 0; buffer_it < addrs.size(); buffer_it++)
+	// Draw Buffers
+	// TODO: Currently it only supports color buffers
+	for (u32 bufferId=0; bufferId < render->display_buffers_count; bufferId++)
 	{
-		const u32 rsx_buffer_addr = addrs[buffer_it];
-		const u32 width = rsx::method_registers.surface_clip_width();
-		const u32 pitch = rsx::method_registers.surface_pitch(buffer_it);
-		const u32 height = rsx::method_registers.surface_clip_height();
+		const auto buffers = render->display_buffers;
+		const u32 rsx_buffer_addr = rsx::constants::local_mem_base + buffers[bufferId].offset;
 
-		Buffer* panel{};
-		switch (buffer_it)
-		{
-		case 0:  panel = m_buffer_colorA; break;
-		case 1:  panel = m_buffer_colorB; break;
-		case 2:  panel = m_buffer_colorC; break;
-		default: panel = m_buffer_colorD; break;
-		}
+		const u32 width  = buffers[bufferId].width;
+		const u32 height = buffers[bufferId].height;
 
-		if (!height || !pitch)
-		{
-			panel->showImage(QImage());
+		if (!vm::check_addr(rsx_buffer_addr, vm::page_readable, width * height * 4))
 			continue;
-		}
-
-		u32 bpp = 4;
-		QImage::Format format = QImage::Format_RGB32;
-		const auto fmt = rsx::method_registers.surface_color();
-		bool bswap = true;
-		u32 dst_bpp = 0;
-
-		switch (fmt)
-		{
-		//case rsx::surface_color_format::x1r5g5b5_z1r5g5b5:
-		//case rsx::surface_color_format::x1r5g5b5_o1r5g5b5:
-		case rsx::surface_color_format::r5g6b5:
-		{
-			format = QImage::Format_RGB16;
-			bpp = 2;
-			break;
-		}
-		//case rsx::surface_color_format::x8r8g8b8_z8r8g8b8:
-		//case rsx::surface_color_format::x8r8g8b8_o8r8g8b8:
-		case rsx::surface_color_format::a8r8g8b8:
-		{
-			// For now ignore alpha channel because it has a tendency of being 0
-			//format = QImage::Format_ARGB32;
-			break;
-		}
-		case rsx::surface_color_format::b8:
-		{
-			format = QImage::Format_Grayscale8;
-			bpp = 1;
-			break;
-		}
-		case rsx::surface_color_format::g8b8:
-		{
-			bpp = 2;
-			dst_bpp = 4;
-			format = QImage::Format_RGBA8888;
-			bswap = false;
-			break;
-		}
-		//case rsx::surface_color_format::w16z16y16x16,
-		//case rsx::surface_color_format::w32z32y32x32,
-		//case rsx::surface_color_format::x32,
-		//case rsx::surface_color_format::x8b8g8r8_z8b8g8r8,
-		//case rsx::surface_color_format::x8b8g8r8_o8b8g8r8,
-		case rsx::surface_color_format::a8b8g8r8:
-		{
-			format = QImage::Format_RGBA8888;
-			break;
-		}
-		default:
-		{
-			break;
-		}
-		}
-
-		// PS3 buffer size (for memory validation)
-		const u32 src_mem_size = pitch * (height - 1) + width * bpp;
-
-		if ((height > 1 && pitch < width * bpp) || !src_mem_size || !vm::check_addr(rsx_buffer_addr, vm::page_readable, src_mem_size))
-		{
-			panel->showImage(QImage());
-			continue;
-		}
-
-		// Touch RSX memory to potentially flush GPU memory (must occur in named_thread)
-		[[maybe_unused]] auto buffer_touch_1 = named_thread("RSX Buffer Touch"sv, [&]()
-		{
-			for (u32 page_start = rsx_buffer_addr & -4096; page_start < rsx_buffer_addr + src_mem_size; page_start += 4096)
-			{
-				static_cast<void>(vm::_ref<atomic_t<u8>>(page_start).load());
-			}
-		});
-
-		bswap ^= std::endian::native == std::endian::big;
-
-		if (!dst_bpp)
-		{
-			dst_bpp = bpp;
-		}
 
 		const auto rsx_buffer = vm::get_super_ptr<const u8>(rsx_buffer_addr);
-		panel->cache.resize(std::max<usz>(panel->cache.size(), width * height * 16));
-		const auto buffer = panel->cache.data();
 
-		if (dst_bpp == bpp && pitch == width * bpp)
-		{
-			std::memcpy(buffer, rsx_buffer, src_mem_size);
-		}
-		else
-		{
-			for (u32 y = 0; y < height; y++)
-			{
-				const usz line_start = y * pitch;
-				std::memcpy(buffer + y * width * dst_bpp, rsx_buffer + line_start, width * bpp);
-			}
-		}
+		u8* buffer = static_cast<u8*>(std::malloc(4ULL * width * height));
 
-		switch (fmt)
-		{
-		case rsx::surface_color_format::g8b8:
-		{
-			for (u32 y = 0; y < height; y++)
-			{
-				for (u32 x = 0; x < std::max(pitch, 1u) - 1; x += 2)
-				{
-					const usz line_start = y * pitch;
-
-					std::memcpy(buffer + line_start * 2 + x * 2 + 1, buffer + line_start * 2 + x, 2);
-					buffer[line_start * 2 + x * 2 + 0] = 0;
-					buffer[line_start * 2 + x * 2 + 3] = 0xff;
-				}
-			}
-
-			break;
-		}
-		case rsx::surface_color_format::a8b8g8r8:
-		{
-			format = QImage::Format_RGBA8888;
-			bswap = true;
-			break;
-		}
-		case rsx::surface_color_format::a8r8g8b8:
-		{
-			break;
-		}
-		default:
-		{
-			break;
-		}
-		}
-
-		if (bswap && bpp != 1)
-		{
-			if (bpp == 2)
-			{
-				for (u32 i = 0; i < panel->cache.size(); i += 2)
-				{
-					u16 res{};
-					std::memcpy(&res, buffer + i, 2);
-					res = stx::se_storage<u16>::swap(res);
-					std::memcpy(buffer + i, &res, 2);
-				}
-			}
-			else if (ensure(bpp == 4))
-			{
-				for (u32 i = 0; i < panel->cache.size(); i += 4)
-				{
-					u32 res{};
-					std::memcpy(&res, buffer + i, 4);
-					res = stx::se_storage<u32>::swap(res);
-					std::memcpy(buffer + i, &res, 4);
-				}
-			}
-		}
-
-		panel->showImage(QImage(panel->cache.data(), width, height, format));
-	}
-
-	// One iteration for depth, second for stencil
-	for (u32 buffer_it = 0; buffer_it < 2; buffer_it++)
-	{
-		const u32 rsx_buffer_addr = render->get_zeta_surface_address();
-
-		const u32 width  = rsx::method_registers.surface_clip_width();
-		const u32 height = rsx::method_registers.surface_clip_height();
-		const u32 pitch = rsx::method_registers.surface_z_pitch();
-
-		u32 bpp = 4;
-		QImage::Format format = QImage::Format_Grayscale16;
-		const auto fmt = rsx::method_registers.surface_depth_fmt();
-		bool has_stencil = false;
-		bool is_stencil = buffer_it == 1;
-		bool is_float = false;
-
-		switch (fmt)
-		{
-		case rsx::surface_depth_format2::z16_float:
-		{
-			is_float = true;
-			[[fallthrough]];
-		}
-		case rsx::surface_depth_format2::z16_uint:
-		{
-			if (is_stencil)
-			{
-				continue;
-			}
-
-			bpp = 2;
-			break;
-		}
-		case rsx::surface_depth_format2::z24s8_float:
-		{
-			is_float = true;
-			[[fallthrough]];
-		}
-		case rsx::surface_depth_format2::z24s8_uint:
-		{
-			format = QImage::Format_RGB16;
-			has_stencil = true;
-			break;
-		}
-		default:
-		{
-			fmt::throw_exception("Unreachable!");
-			break;
-		}
-		}
-
-		// PS3 buffer size (for memory validation)
-		const u32 src_mem_size = pitch * (height - 1) + width * bpp;
-
-		Buffer* panel{};
-		switch (buffer_it)
-		{
-		case 0:  panel = m_buffer_depth; break;
-		default: panel = m_buffer_stencil; break;
-		}
-
-		if ((height > 1 && pitch < width * bpp) || !height || !src_mem_size || !vm::check_addr(rsx_buffer_addr, vm::page_readable, src_mem_size))
-		{
-			panel->showImage(QImage());
-			continue;
-		}
-
-		// Touch RSX memory to potentially flush GPU memory (must occur in named_thread)
-		[[maybe_unused]] auto buffer_touch_2 = named_thread("RSX Buffer Touch"sv, [&]()
-		{
-			for (u32 page_start = rsx_buffer_addr & -4096; page_start < rsx_buffer_addr + src_mem_size; page_start += 4096)
-			{
-				static_cast<void>(vm::_ref<atomic_t<u8>>(page_start).load());
-			}
-		});
-
-		const auto rsx_buffer = vm::get_super_ptr<const u8>(rsx_buffer_addr);
-		panel->cache.resize(std::max<usz>(panel->cache.size(), width * height * 4));
-		const auto buffer = panel->cache.data();
-
-		if (is_stencil)
-		{
-			format = QImage::Format_Grayscale8;
-
-			for (u32 y = 0; y < height; y++)
-			{
-				for (u32 x = 0; x < width; x++)
-				{
-					const usz line_start = y * pitch;
-					std::memcpy(buffer + y * width + x, rsx_buffer + line_start + x * 4 + 3, 1);
-				}
-			}
-		}
-		else if (has_stencil)
-		{
-			format = QImage::Format_Grayscale16;
-
-			if (false && is_float)
-			{
-				// TODO
-			}
-			else
-			{
-				for (u32 y = 0; y < height; y++)
-				{
-					for (u32 x = 0; x < width; x++)
-					{
-						const usz line_start = y * pitch;
-
-						be_t<u32> data{};
-						std::memcpy(&data, rsx_buffer + line_start + x * 4, 4);
-						const u16 res = static_cast<u16>(u64{data / 256} * 0xFFFF / 0xFFFFFF);
-						std::memcpy(buffer + y * width * 2 + x * 2, &res, 2);
-					}
-				}
-			}
-		}
-		else
-		{
-			format = QImage::Format_Grayscale16;
-
-			for (u32 y = 0; y < height; y++)
-			{
-				for (u32 x = 0; x < width; x++)
-				{
-					be_t<u16> data{};
-					std::memcpy(&data, rsx_buffer + pitch * y + x * 2, 2);
-					const u16 res = is_float ? static_cast<u16>(f16_to_f32(static_cast<f16>(+data))) : +data;
-					std::memcpy(buffer + y * width * 2 + x * 2, &res, 2);
-				}
-			}
-		}
-
-		panel->showImage(QImage(panel->cache.data(), width, height, format));
-	}
-
-	auto& textures = rsx::method_registers.fragment_textures;
-
-	u32 texture_addr = m_cur_texture;
-	u32 tex_fmt_raw = 0;
-	u32 tex_fmt = 0;
-
-	u32 width = 1280;
-	u32 height = 720;
-	u32 pitch = 0;
-
-	if (texture_addr < 16)
-	{
-		if (textures[texture_addr].enabled())
-		{
-			width = textures[texture_addr].width();
-			height = textures[texture_addr].height();
-			pitch = textures[texture_addr].pitch();
-			tex_fmt_raw = textures[texture_addr].format();
-			tex_fmt = tex_fmt_raw & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN); // TOOD: Support these flags
-			texture_addr = rsx::get_address(textures[texture_addr].offset(), textures[texture_addr].location(), 1);
-		}
-	}
-
-	QString text;
-
-	for (u32 i = 0; i < textures.size(); i++)
-	{
-		// Technically it can also check if used by shader but idk
-		if (textures[i].enabled() && textures[i].width())
-		{
-			if (!text.isEmpty())
-			{
-				text += QStringLiteral(", ");
-			}
-
-			text += QStringLiteral("%0").arg(i);
-		}
-	}
-
-	m_enabled_textures_label->setText(enabled_textures_text + text);
-
-	if (m_texture_format_override)
-	{
-		tex_fmt = m_texture_format_override;
-	}
-
-	u32 bytes_per_block = 4;
-	u32 pixels_per_block = 1;
-	bool bswap = true;
-
-	// Naturally only a handful of common formats are implemented at the moment
-
-	switch (tex_fmt)
-	{
-	case CELL_GCM_TEXTURE_B8:
-	{
-		bytes_per_block = 1;
-		break;
-	}
-	case CELL_GCM_TEXTURE_COMPRESSED_DXT1:
-	{
-		bytes_per_block = 8;
-		pixels_per_block = 16;
-		break;
-	}
-	default:
-	{
-		break;
-	}
-	}
-
-	const u32 line_bytes_count = width * bytes_per_block / pixels_per_block;
-
-	if (!pitch)
-	{
-		pitch = line_bytes_count;
-	}
-
-	// PS3 buffer size (for memory validation)
-	const u32 src_mem_size = pitch * (height - 1) + line_bytes_count;
-
-	if (!src_mem_size || !height || !vm::check_addr(texture_addr, vm::page_readable, src_mem_size))
-	{
-		m_buffer_tex->showImage(QImage());
-		return;
-	}
-
-	[[maybe_unused]] auto buffer_touch_3 = named_thread("RSX Buffer Touch"sv, [&]()
-	{
-		// Must touch every page
-		for (u32 i = texture_addr & -4096; i < texture_addr + src_mem_size; i += 4096)
-		{
-			static_cast<void>(vm::_ref<atomic_t<u8>>(i).load());
-		}
-	});
-
-	const auto rsx_buffer = vm::get_super_ptr<const u8>(texture_addr);
-	m_buffer_tex->cache.resize(std::max<usz>(m_buffer_tex->cache.size(), width * height * 16 + pitch));
-
-	const auto buffer = m_buffer_tex->cache.data();
-	if (pixels_per_block != 1 || pitch == line_bytes_count)
-	{
-		std::memcpy(buffer, rsx_buffer, src_mem_size);
-	}
-	else
-	{
+		// ABGR to ARGB and flip vertically
 		for (u32 y = 0; y < height; y++)
 		{
-			std::memcpy(buffer + y * line_bytes_count, rsx_buffer + y * pitch, line_bytes_count);
-		}
-	}
-
-	switch (tex_fmt)
-	{
-	case CELL_GCM_TEXTURE_COMPRESSED_DXT1:
-	{
-		bswap = false;
-
-		// Compressed texture to RGB
-		for (usz i = 0; i < width * height / 16; i++)
-		{
-			le_t<u16> color0{}, color1{};
-			std::memcpy(&color0, rsx_buffer + i * 8, 2);
-			std::memcpy(&color1, rsx_buffer + i * 8 + 2, 2);
-
-			be_t<u32> control{};
-			std::memcpy(&control, rsx_buffer + i * 8 + 4, 4);
-
-			for (u32 sub = 0; sub < 16; sub++)
+			for (u32 i = 0, j = 0; j < width * 4; i += 4, j += 4)
 			{
-				const u32 code = (+control >> (sub * 2)) & 3;
-
-				auto convert_to_rgb888 = [](u32 input) -> std::tuple<u32, u32, u32>
-				{
-					u32 r = ((input >> 11) % 32) * 255 / 32;
-					u32 g = ((input >> 5) % 64) * 255 / 64;
-					u32 b = (input % 32) * 255 / 32;
-					return std::make_tuple(r, g, b);
-				};
-
-				const auto [r0, g0, b0] = convert_to_rgb888(color0);
-				const auto [r1, g1, b1] = convert_to_rgb888(color1);
-
-				auto compute_color = [&](u32 a0, u32 a1, u8 shift) -> u32
-				{
-					u32 a0_portion = 1;
-					u32 a1_portion = 1;
-
-					switch (code)
-					{
-					case 0:
-					{
-						return a0; // Color0 only
-					}
-					case 1:
-					{
-						return a1; // Color1 only
-					}
-					case 2:
-					case 3:
-					{
-						if (a0 > a1)
-						{
-							if (code == 3)
-							{
-								a1_portion = 2;
-							}
-							else
-							{
-								a0_portion = 2;
-							}
-						}
-						else if (code == 3)
-						{
-							return 0;
-						} // otherwise is the default values
-
-						break;
-					}
-					default:
-					{
-						fmt::throw_exception("Unreachable!");
-						break;
-					}
-					}
-
-					return ((a1 * a1_portion + a0 * a0_portion) / (a0_portion + a1_portion)) << shift;
-				};
-
-				const le_t<u32> dest_color = compute_color(r0, r1, 0) + compute_color(g0, g1, 8) + compute_color(b0, b1, 16) + (255 << 24);
-				std::memcpy(buffer + ((i % (width / 4) * 4 + sub % 4) + ((i / (width / 4) * 4 + sub / 4) * width)) * sizeof(u32), &dest_color, 4);
+				buffer[i + 0 + y * width * 4] = rsx_buffer[j + 1 + (height - y - 1) * width * 4]; // B
+				buffer[i + 1 + y * width * 4] = rsx_buffer[j + 2 + (height - y - 1) * width * 4]; // G
+				buffer[i + 2 + y * width * 4] = rsx_buffer[j + 3 + (height - y - 1) * width * 4]; // R
+				buffer[i + 3 + y * width * 4] = rsx_buffer[j + 0 + (height - y - 1) * width * 4]; // A
 			}
 		}
-		break;
-	}
-	default:
-	{
-		break;
-	}
-	}
 
-	if (bswap && bytes_per_block != 1 && pixels_per_block == 1)
-	{
-		if (bytes_per_block == 2)
+		// TODO: Is there any better way to clasify the color buffers? How can we include the depth and stencil buffers?
+		Buffer* pnl;
+		switch(bufferId)
 		{
-			for (u32 i = 0; i < m_buffer_tex->cache.size(); i += 2)
-			{
-				u16 res{};
-				std::memcpy(&res, buffer + i, 2);
-				res = stx::se_storage<u16>::swap(res);
-				std::memcpy(buffer + i, &res, 2);
-			}
-		}
-		else if (ensure(bytes_per_block == 4))
-		{
-			for (u32 i = 0; i < m_buffer_tex->cache.size(); i += 4)
-			{
-				u32 res{};
-				std::memcpy(&res, buffer + i, 4);
-				res = stx::se_storage<u32>::swap(res);
-				std::memcpy(buffer + i, &res, 4);
-			}
+		case 0:  pnl = m_buffer_colorA; break;
+		case 1:  pnl = m_buffer_colorB; break;
+		case 2:  pnl = m_buffer_colorC; break;
+		default: pnl = m_buffer_colorD; break;
 		}
+		pnl->showImage(QImage(buffer, width, height, QImage::Format_RGB32, [](void* buffer){ std::free(buffer); }, buffer));
 	}
 
-	m_buffer_tex->showImage(QImage(m_buffer_tex->cache.data(), width, height, QImage::Format_RGB32));
-}
-
-void rsx_debugger::GetVertexProgram() const
-{
-	const auto render = rsx::get_current_renderer();
-	if (!render || !render->is_initialized || !render->local_mem_size || !render->is_paused())
-	{
-		return;
-	}
-
-	RSXVertexProgram vp;
-	vp.data.reserve(512 * 4);
-
-	const u32 vp_entry = rsx::method_registers.transform_program_start();
-	program_hash_util::vertex_program_utils::analyse_vertex_program
-	(
-		rsx::method_registers.transform_program.data(),  // Input raw block
-		vp_entry,                                       // Address of entry point
-		vp                                          // [out] Program object
-	);
-
-	const u32 ucode_len = static_cast<u32>(vp.data.size() * sizeof(u32));
-	std::vector<u32> vp_blob = {
-		7003u,             // Type
-		6u,                // Revision
-		56u + ucode_len,   // Total size
-		0,                 // paramCount
-		0,                 // paramArray
-		32u,               // Program header offset
-		ucode_len,         // Ucode length
-		56u,               // Ucode start
-
-		::size32(vp.data) / 4, // Instruction count
-		0,                     // Slot
-		16u,                   // Registers used
-		rsx::method_registers.vertex_attrib_input_mask(),
-		rsx::method_registers.vertex_attrib_output_mask(),
-		rsx::method_registers.clip_planes_mask()
-	};
-
-	vp_blob.resize(vp_blob.size() + vp.data.size());
-	std::copy(vp.data.begin(), vp.data.end(), vp_blob.begin() + 14);
-
-	std::span<u32> vp_binary(vp_blob);
-	CgBinaryDisasm vp_disasm(vp_binary);
-	vp_disasm.BuildShaderBody(false);
-
-	m_transform_disasm->clear();
-	m_transform_disasm->setText(QString::fromStdString(vp_disasm.GetArbShader()));
-}
-
-void rsx_debugger::GetFragmentProgram() const
-{
-	const auto render = rsx::get_current_renderer();
-	if (!render || !render->is_initialized || !render->local_mem_size || !render->is_paused())
-	{
-		return;
-	}
-
-	const auto [program_offset, program_location] = rsx::method_registers.shader_program_address();
-	const auto address = rsx::get_address(program_offset, program_location, 4);
-	if (!address)
-	{
-		m_fragment_disasm->clear();
-		return;
-	}
-
-	// NOTE: Reading through super ptr while crash-safe means we're probably reading incorrect bytes, but should be fine in 99% of cases
-	auto data_ptr = vm::get_super_ptr(address);
-	const auto fp_metadata = program_hash_util::fragment_program_utils::analyse_fragment_program(data_ptr);
-
-	const bool output_h0 = rsx::method_registers.shader_control() & CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS ? false : true;
-	const bool depth_replace = rsx::method_registers.shader_control() & CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT ? true : false;
-	const u32 flags = 16u /* Reg count */ | ((output_h0 /* 16-bit exports? */ ? 1u : 0u) << 8u) | ((depth_replace /* Export depth? */ ? 1u : 0u) << 16u) | (0u /* Uses KILL? */ << 24u);
-	const auto ucode_len = fp_metadata.program_ucode_length;
-
-	std::vector<u32> blob = {
-		7004u,             // Type
-		6u,                // Revision
-		56u + ucode_len,   // Total size
-		0,                 // paramCount
-		0,                 // paramArray
-		32u,               // Program header offset
-		ucode_len,         // Ucode length
-		56u,               // Ucode start
-
-		ucode_len / 16,                                               // Instruction count
-		rsx::method_registers.vertex_attrib_output_mask(),            // Slot
-		0u,                                                           // Partial load
-		0u | (rsx::method_registers.texcoord_control_mask() << 16u),  // Texcoord input mask | tex2d control
-		0u | (flags << 16u),                                          // Centroid inputs (xor tex2d control) | flags (regs, 16-bit, fragDepth, KILL)
-
-		0u,                                                           // Padding
-	};
-
-	// Copy in the program bytes, swapped
-	const u32 start_offset_in_words = fp_metadata.program_start_offset / 4;
-	const u32 ucode_length_in_words = fp_metadata.program_ucode_length / 4;
-	blob.resize(blob.size() + ucode_length_in_words);
-	copy_data_swap_u32(blob.data() + 14, utils::bless<u32>(data_ptr) + start_offset_in_words, ucode_length_in_words);
-	//std::memcpy(blob.data() + 14, utils::bless<char>(data_ptr) + fp_metadata.program_start_offset, fp_metadata.program_ucode_length);
-
-	std::span<u32> fp_binary(blob);
-	CgBinaryDisasm fp_disasm(fp_binary);
-	fp_disasm.BuildShaderBody(false);
-
-	m_fragment_disasm->clear();
-	m_fragment_disasm->setText(QString::fromStdString(fp_disasm.GetArbShader()));
+	// Draw Texture
+	//if (!render->textures[m_cur_texture].enabled())
+	//	return;
+
+	//u32 offset = render->textures[m_cur_texture].offset();
+
+	//if(!offset)
+	//	return;
+
+	//u8 location = render->textures[m_cur_texture].location();
+
+	//if(location > 1)
+	//	return;
+
+	//u32 TexBuffer_addr = rsx::get_address(offset, location);
+
+	//if(!vm::check_addr(TexBuffer_addr))
+	//	return;
+
+	//unsigned char* TexBuffer = vm::get_super_ptr<u8>(TexBuffer_addr);
+
+	//const u32 width  = render->textures[m_cur_texture].width();
+	//const u32 height = render->textures[m_cur_texture].height();
+	//unsigned char* buffer = (unsigned char*)malloc(width * height * 3);
+	//std::memcpy(buffer, vm::base(TexBuffer_addr), width * height * 3);
+
+	//m_buffer_tex->showImage(QImage(buffer, m_text_width, m_text_height, QImage::Format_RGB32));
 }
diff --git a/rpcs3/rpcs3qt/rsx_debugger.h b/rpcs3/rpcs3qt/rsx_debugger.h
index 2c189c3e8a..eb47bc7c14 100644
--- a/rpcs3/rpcs3qt/rsx_debugger.h
+++ b/rpcs3/rpcs3qt/rsx_debugger.h
@@ -11,35 +11,28 @@
 #include <QListWidget>
 #include <QTableWidget>
 #include <QTabWidget>
-#include <QTextEdit>
 
 #include <memory>
 
 class gui_settings;
-class QPoint;
 
 class Buffer : public QGroupBox
 {
 	Q_OBJECT
 
-	const QSize Panel_Size = QSize(320, 180);
-	const QSize Texture_Size = QSize(320, 180);
+	const QSize Panel_Size = QSize(108, 108);
+	const QSize Texture_Size = QSize(108, 108);
 
 	u32 m_id;
 	bool m_isTex;
 	QImage m_image;
 	QLabel* m_canvas;
 	QSize m_image_size;
-	u32 m_window_counter = 1;
 
 public:
-	std::vector<u8> cache;
-
 	Buffer(bool isTex, u32 id, const QString& name, QWidget* parent = nullptr);
-	void showImage(QImage&& image);
-	void ShowWindowed();
-
-	void ShowContextMenu(const QPoint& pos);
+	void showImage(const QImage& image = QImage());
+	void ShowWindowed() const;
 };
 
 class rsx_debugger : public QDialog
@@ -51,8 +44,6 @@ class rsx_debugger : public QDialog
 	QListWidget* m_list_index_buffer;
 	QTabWidget* m_tw_rsx;
 
-	const QString enabled_textures_text = tr(" Enabled Textures Indices: ");
-
 	Buffer* m_buffer_colorA;
 	Buffer* m_buffer_colorB;
 	Buffer* m_buffer_colorC;
@@ -60,13 +51,11 @@ class rsx_debugger : public QDialog
 	Buffer* m_buffer_depth;
 	Buffer* m_buffer_stencil;
 	Buffer* m_buffer_tex;
-	QLabel* m_enabled_textures_label;
 
-	QTextEdit* m_transform_disasm;
-	QTextEdit* m_fragment_disasm;
+	QLabel* m_text_transform_program;
+	QLabel* m_text_shader_program;
 
-	u32 m_cur_texture = 0;
-	u32 m_texture_format_override = 0;
+	uint m_cur_texture = 0;
 
 	std::shared_ptr<gui_settings> m_gui_settings;
 
@@ -88,7 +77,4 @@ protected:
 
 private:
 	void PerformJump(u32 address);
-
-	void GetVertexProgram() const;
-	void GetFragmentProgram() const;
 };
diff --git a/rpcs3/rpcs3qt/save_data_dialog.cpp b/rpcs3/rpcs3qt/save_data_dialog.cpp
index f98f615e54..6bc67de2f6 100644
--- a/rpcs3/rpcs3qt/save_data_dialog.cpp
+++ b/rpcs3/rpcs3qt/save_data_dialog.cpp
@@ -4,65 +4,46 @@
 #include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/Io/interception.h"
-#include "../Emu/RSX/Overlays/overlay_manager.h"
 #include "Emu/RSX/Overlays/overlay_save_dialog.h"
-#include "Emu/Cell/Modules/cellSysutil.h"
 
-#include "util/logs.hpp"
+#include "Utilities/Thread.h"
 
-LOG_CHANNEL(cellSaveData);
-
-s32 save_data_dialog::ShowSaveDataList(const std::string& base_dir, std::vector<SaveDataEntry>& save_entries, s32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet, bool enable_overlay)
+s32 save_data_dialog::ShowSaveDataList(std::vector<SaveDataEntry>& save_entries, s32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet, bool enable_overlay)
 {
-	cellSaveData.notice("ShowSaveDataList(save_entries=%d, focused=%d, op=0x%x, listSet=*0x%x, enable_overlay=%d)", save_entries.size(), focused, op, listSet, enable_overlay);
-
-	// TODO: Implement proper error checking in savedata_op?
-	const bool use_end = sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_BEGIN, 0) >= 0;
-
-	if (!use_end)
-	{
-		cellSaveData.error("ShowSaveDataList(): Not able to notify DRAWING_BEGIN callback because one has already been sent!");
-	}
-
 	// TODO: Install native shell as an Emu callback
 	if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
 	{
-		cellSaveData.notice("ShowSaveDataList: Showing native UI dialog");
-
-		const s32 result = manager->create<rsx::overlays::save_dialog>()->show(base_dir, save_entries, focused, op, listSet, enable_overlay);
+		const s32 result = manager->create<rsx::overlays::save_dialog>()->show(save_entries, focused, op, listSet, enable_overlay);
 		if (result != rsx::overlays::user_interface::selection_code::error)
-		{
-			cellSaveData.notice("ShowSaveDataList: Native UI dialog returned with selection %d", result);
-			if (use_end) sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_END, 0);
 			return result;
-		}
-
-		cellSaveData.error("ShowSaveDataList: Native UI dialog returned error");
 	}
 
 	if (!Emu.HasGui())
 	{
-		cellSaveData.notice("ShowSaveDataList(): Aborting: Emulation has no GUI attached");
-		if (use_end) sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_END, 0);
 		return -2;
 	}
 
 	// Fall back to front-end GUI
-	cellSaveData.notice("ShowSaveDataList(): Using fallback GUI");
+	atomic_t<bool> dlg_result(false);
 	atomic_t<s32> selection = 0;
 
 	input::SetIntercepted(true);
 
-	Emu.BlockingCallFromMainThread([&]()
+	Emu.CallAfter([&]()
 	{
 		save_data_list_dialog sdid(save_entries, focused, op, listSet);
 		sdid.exec();
 		selection = sdid.GetSelection();
+		dlg_result = true;
+		dlg_result.notify_one();
 	});
 
+	while (!dlg_result && !Emu.IsStopped())
+	{
+		thread_ctrl::wait_on(dlg_result, false);
+	}
+
 	input::SetIntercepted(false);
 
-	if (use_end) sysutil_send_system_cmd(CELL_SYSUTIL_DRAWING_END, 0);
-
 	return selection.load();
 }
diff --git a/rpcs3/rpcs3qt/save_data_dialog.h b/rpcs3/rpcs3qt/save_data_dialog.h
index e98ee8e4ac..fa31b1533b 100644
--- a/rpcs3/rpcs3qt/save_data_dialog.h
+++ b/rpcs3/rpcs3qt/save_data_dialog.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include "util/types.hpp"
+#include "Emu/Memory/vm.h"
 #include "Emu/Cell/Modules/cellSaveData.h"
 
 class save_data_dialog : public SaveDialogBase
 {
 public:
-	s32 ShowSaveDataList(const std::string& base_dir, std::vector<SaveDataEntry>& save_entries, s32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet, bool enable_overlay) override;
+	s32 ShowSaveDataList(std::vector<SaveDataEntry>& save_entries, s32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet, bool enable_overlay) override;
 };
diff --git a/rpcs3/rpcs3qt/save_data_info_dialog.cpp b/rpcs3/rpcs3qt/save_data_info_dialog.cpp
index 45a566ef30..50f7a8e2ea 100644
--- a/rpcs3/rpcs3qt/save_data_info_dialog.cpp
+++ b/rpcs3/rpcs3qt/save_data_info_dialog.cpp
@@ -5,6 +5,8 @@
 #include <QHeaderView>
 #include "Emu/System.h"
 
+constexpr auto qstr = QString::fromStdString;
+
 save_data_info_dialog::save_data_info_dialog(SaveDataEntry save, QWidget* parent)
 	: QDialog(parent)
 	, m_entry(std::move(save))
@@ -60,16 +62,16 @@ void save_data_info_dialog::UpdateData()
 
 	//Maybe there should be more details of save data.
 	m_list->setItem(0, 0, new QTableWidgetItem(tr("User ID")));
-	m_list->setItem(0, 1, new QTableWidgetItem(QString::fromStdString(Emu.GetUsr())));
+	m_list->setItem(0, 1, new QTableWidgetItem(qstr(Emu.GetUsr())));
 
 	m_list->setItem(1, 0, new QTableWidgetItem(tr("Title")));
-	m_list->setItem(1, 1, new QTableWidgetItem(QString::fromStdString(m_entry.title)));
+	m_list->setItem(1, 1, new QTableWidgetItem(qstr(m_entry.title)));
 
 	m_list->setItem(2, 0, new QTableWidgetItem(tr("Subtitle")));
-	m_list->setItem(2, 1, new QTableWidgetItem(QString::fromStdString(m_entry.subtitle)));
+	m_list->setItem(2, 1, new QTableWidgetItem(qstr(m_entry.subtitle)));
 
 	m_list->setItem(3, 0, new QTableWidgetItem(tr("Detail")));
-	m_list->setItem(3, 1, new QTableWidgetItem(QString::fromStdString(m_entry.details)));
+	m_list->setItem(3, 1, new QTableWidgetItem(qstr(m_entry.details)));
 
 	QImage img;
 	if (!m_entry.iconBuf.empty() && img.loadFromData(m_entry.iconBuf.data(), static_cast<int>(m_entry.iconBuf.size()), "PNG"))
diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.cpp b/rpcs3/rpcs3qt/save_data_list_dialog.cpp
index f10760ce4a..da679fdcd7 100644
--- a/rpcs3/rpcs3qt/save_data_list_dialog.cpp
+++ b/rpcs3/rpcs3qt/save_data_list_dialog.cpp
@@ -8,9 +8,8 @@
 #include <QHeaderView>
 #include <QGuiApplication>
 #include <QScreen>
-#include <QMouseEvent>
 
-LOG_CHANNEL(cellSaveData);
+constexpr auto qstr = QString::fromStdString;
 
 //Show up the savedata list, either to choose one to save/load or to manage saves.
 //I suggest to use function callbacks to give save data list or get save data entry. (Not implemented or stubbed)
@@ -18,8 +17,6 @@ save_data_list_dialog::save_data_list_dialog(const std::vector<SaveDataEntry>& e
 	: QDialog(parent)
 	, m_save_entries(entries)
 {
-	cellSaveData.notice("Creating Qt save_data_list_dialog (entries=%d, focusedEntry=%d, op=0x%x, listSet=*0x%x)", entries.size(), focusedEntry, op, listSet);
-
 	if (op >= 8)
 	{
 		setWindowTitle(tr("Save Data Interface (Delete)"));
@@ -68,7 +65,7 @@ save_data_list_dialog::save_data_list_dialog(const std::vector<SaveDataEntry>& e
 		QPushButton *saveNewEntry = new QPushButton(tr("Save New Entry"), this);
 		connect(saveNewEntry, &QAbstractButton::clicked, this, [&]()
 		{
-			m_entry = rsx::overlays::user_interface::selection_code::new_save;
+			m_entry = selection_code::new_save;
 			accept();
 		});
 		hbox_action->addWidget(saveNewEntry);
@@ -109,7 +106,7 @@ save_data_list_dialog::save_data_list_dialog(const std::vector<SaveDataEntry>& e
 	{
 		const int original_index = m_list->item(row, 0)->data(Qt::UserRole).toInt();
 		const SaveDataEntry original_entry = m_save_entries[original_index];
-		const QString original_dir_name = QString::fromStdString(original_entry.dirName);
+		const QString original_dir_name = qstr(original_entry.dirName);
 		QVariantMap notes = m_persistent_settings->GetValue(gui::persistent::save_notes).toMap();
 		notes[original_dir_name] = m_list->item(row, col)->text();
 		m_persistent_settings->SetValue(gui::persistent::save_notes, notes);
@@ -129,7 +126,7 @@ void save_data_list_dialog::UpdateSelectionLabel()
 		else
 		{
 			const int entry = m_list->item(m_list->currentRow(), 0)->data(Qt::UserRole).toInt();
-			m_entry_label->setText(tr("Currently Selected: ") + QString::fromStdString(m_save_entries[entry].dirName));
+			m_entry_label->setText(tr("Currently Selected: ") + qstr(m_save_entries[entry].dirName));
 		}
 	}
 }
@@ -138,15 +135,15 @@ s32 save_data_list_dialog::GetSelection() const
 {
 	if (result() == QDialog::Accepted)
 	{
-		if (m_entry == rsx::overlays::user_interface::selection_code::new_save)
+		if (m_entry == selection_code::new_save)
 		{ // Save new entry
-			return rsx::overlays::user_interface::selection_code::new_save;
+			return selection_code::new_save;
 		}
 		return m_list->item(m_entry, 0)->data(Qt::UserRole).toInt();
 	}
 
 	// Cancel is pressed. May figure out proper cellsavedata code to use later.
-	return rsx::overlays::user_interface::selection_code::canceled;
+	return selection_code::canceled;
 }
 
 void save_data_list_dialog::OnSort(int logicalIndex)
@@ -188,9 +185,9 @@ void save_data_list_dialog::UpdateList()
 	int row = 0;
 	for (const SaveDataEntry& entry: m_save_entries)
 	{
-		const QString title = QString::fromStdString(entry.title);
-		const QString subtitle = QString::fromStdString(entry.subtitle);
-		const QString dirName = QString::fromStdString(entry.dirName);
+		QString title = qstr(entry.title);
+		QString subtitle = qstr(entry.subtitle);
+		QString dirName = qstr(entry.dirName);
 
 		QTableWidgetItem* titleItem = new QTableWidgetItem(title);
 		titleItem->setData(Qt::UserRole, row); // For sorting to work properly
@@ -232,18 +229,3 @@ void save_data_list_dialog::UpdateList()
 
 	resize(preferred_size.boundedTo(max_size));
 }
-
-void save_data_list_dialog::mouseDoubleClickEvent(QMouseEvent* ev)
-{
-	if (!ev) return;
-
-	// Qt's itemDoubleClicked signal doesn't distinguish between mouse buttons and there is no simple way to get the pressed button.
-	// So we have to ignore this event when another button is pressed.
-	if (ev->button() != Qt::LeftButton)
-	{
-		ev->ignore();
-		return;
-	}
-
-	QDialog::mouseDoubleClickEvent(ev);
-}
diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.h b/rpcs3/rpcs3qt/save_data_list_dialog.h
index 13052ebbcb..ddc0388683 100644
--- a/rpcs3/rpcs3qt/save_data_list_dialog.h
+++ b/rpcs3/rpcs3qt/save_data_list_dialog.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "util/types.hpp"
+#include "Emu/Memory/vm.h"
 #include "Emu/Cell/Modules/cellSaveData.h"
-#include "Emu/RSX/Overlays/overlays.h"
 
 #include <QTableWidget>
 #include <QDialog>
@@ -20,23 +20,24 @@ class save_data_list_dialog : public QDialog
 {
 	Q_OBJECT
 
+	enum selection_code
+	{
+		new_save = -1,
+		canceled = -2
+	};
+
 public:
 	explicit save_data_list_dialog(const std::vector<SaveDataEntry>& entries, s32 focusedEntry, u32 op, vm::ptr<CellSaveDataListSet>, QWidget* parent = nullptr);
 
 	s32 GetSelection() const;
-
-protected:
-	void mouseDoubleClickEvent(QMouseEvent* ev) override;
-
 private Q_SLOTS:
 	void OnEntryInfo();
 	void OnSort(int logicalIndex);
-
 private:
 	void UpdateSelectionLabel();
 	void UpdateList();
 
-	s32 m_entry = rsx::overlays::user_interface::selection_code::new_save;
+	s32 m_entry = selection_code::new_save;
 	QLabel* m_entry_label = nullptr;
 
 	QTableWidget* m_list = nullptr;
diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp
index ba52bed9ff..1d55263b24 100644
--- a/rpcs3/rpcs3qt/save_manager_dialog.cpp
+++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp
@@ -2,13 +2,8 @@
 
 #include "custom_table_widget_item.h"
 #include "qt_utils.h"
-#include "qt_video_source.h"
-#include "gui_application.h"
 #include "gui_settings.h"
 #include "persistent_settings.h"
-#include "game_list_delegate.h"
-#include "progress_dialog.h"
-#include "video_label.h"
 
 #include "Emu/System.h"
 #include "Emu/system_utils.hpp"
@@ -18,52 +13,91 @@
 #include <QDateTime>
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <QLineEdit>
 #include <QMenu>
 #include <QMessageBox>
 #include <QGuiApplication>
+#include <QUrl>
 #include <QDesktopServices>
 #include <QPainter>
 #include <QScreen>
 #include <QScrollBar>
 
 #include "Utilities/File.h"
-#include "Utilities/mutex.h"
 
 LOG_CHANNEL(gui_log, "GUI");
 
 namespace
 {
 	// Helper converters
-	QString FormatTimestamp(s64 time)
+	constexpr auto qstr = QString::fromStdString;
+
+	[[maybe_unused]] inline std::string sstr(const QString& _in) { return _in.toStdString(); }
+
+	QString FormatTimestamp(u64 time)
 	{
 		QDateTime dateTime;
-		dateTime.setSecsSinceEpoch(time);
+		dateTime.setTime_t(time);
 		return dateTime.toString("yyyy-MM-dd HH:mm:ss");
 	}
+
+	/**
+	* This certainly isn't ideal for this code, as it essentially copies cellSaveData.  But, I have no other choice without adding public methods to cellSaveData.
+	*/
+	std::vector<SaveDataEntry> GetSaveEntries(const std::string& base_dir)
+	{
+		std::vector<SaveDataEntry> save_entries;
+
+		// get the saves matching the supplied prefix
+		for (const auto& entry : fs::dir(base_dir))
+		{
+			if (!entry.is_directory || entry.name == "." || entry.name == "..")
+			{
+				continue;
+			}
+
+			// PSF parameters
+			const auto [psf, errc] = psf::load(base_dir + entry.name + "/PARAM.SFO");
+
+			if (psf.empty())
+			{
+				gui_log.error("Failed to load savedata: %s (%s)", base_dir + "/" + entry.name, errc);
+				continue;
+			}
+
+			SaveDataEntry save_entry2;
+			save_entry2.dirName = psf.at("SAVEDATA_DIRECTORY").as_string();
+			save_entry2.listParam = psf.at("SAVEDATA_LIST_PARAM").as_string();
+			save_entry2.title = psf.at("TITLE").as_string();
+			save_entry2.subtitle = psf.at("SUB_TITLE").as_string();
+			save_entry2.details = psf.at("DETAIL").as_string();
+
+			save_entry2.size = 0;
+
+			for (const auto& entry2 : fs::dir(base_dir + entry.name))
+			{
+				save_entry2.size += entry2.size;
+			}
+
+			save_entry2.atime = entry.atime;
+			save_entry2.mtime = entry.mtime;
+			save_entry2.ctime = entry.ctime;
+			if (fs::is_file(base_dir + entry.name + "/ICON0.PNG"))
+			{
+				fs::file icon = fs::file(base_dir + entry.name + "/ICON0.PNG");
+				std::vector<uchar> iconData;
+				icon.read(iconData, icon.size());
+				save_entry2.iconBuf = iconData;
+			}
+			save_entry2.isNew = false;
+			save_entries.emplace_back(save_entry2);
+		}
+		return save_entries;
+	}
 }
 
-enum SaveColumns
-{
-	Icon = 0,
-	Name = 1,
-	Time = 2,
-	Dir = 3,
-	Note = 4,
-
-	Count
-};
-
-enum SaveUserRole
-{
-	Pixmap = Qt::UserRole,
-	PixmapScaled,
-	PixmapLoaded
-};
-
 save_manager_dialog::save_manager_dialog(std::shared_ptr<gui_settings> gui_settings, std::shared_ptr<persistent_settings> persistent_settings, std::string dir, QWidget* parent)
 	: QDialog(parent)
-	, m_dir(std::move(dir))
+	, m_dir(dir)
 	, m_gui_settings(std::move(gui_settings))
 	, m_persistent_settings(std::move(persistent_settings))
 {
@@ -80,12 +114,13 @@ save_manager_dialog::save_manager_dialog(std::shared_ptr<gui_settings> gui_setti
 void save_manager_dialog::Init()
 {
 	// Table
-	m_list = new game_list();
-	m_list->setItemDelegate(new game_list_delegate(m_list));
+	m_list = new QTableWidget(this);
+
+	//m_list->setItemDelegate(new table_item_delegate(this)); // to get rid of cell selection rectangles include "table_item_delegate.h"
 	m_list->setSelectionMode(QAbstractItemView::SelectionMode::ExtendedSelection);
 	m_list->setSelectionBehavior(QAbstractItemView::SelectRows);
 	m_list->setContextMenuPolicy(Qt::CustomContextMenu);
-	m_list->setColumnCount(SaveColumns::Count);
+	m_list->setColumnCount(5);
 	m_list->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
 	m_list->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
 	m_list->verticalScrollBar()->setSingleStep(20);
@@ -93,23 +128,20 @@ void save_manager_dialog::Init()
 	m_list->setHorizontalHeaderLabels(QStringList() << tr("Icon") << tr("Title & Subtitle") << tr("Last Modified") << tr("Save ID") << tr("Notes"));
 	m_list->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed);
 	m_list->horizontalHeader()->setStretchLastSection(true);
-	m_list->setMouseTracking(true);
 
 	// Bottom bar
 	const int icon_size = m_gui_settings->GetValue(gui::sd_icon_size).toInt();
-	m_icon_size = QSize(icon_size, icon_size * 176 / 320);
+	m_icon_size = QSize(icon_size, icon_size);
 	QLabel* label_icon_size = new QLabel(tr("Icon size:"), this);
 	QSlider* slider_icon_size = new QSlider(Qt::Horizontal, this);
 	slider_icon_size->setMinimum(60);
 	slider_icon_size->setMaximum(225);
-	slider_icon_size->setValue(icon_size);
-	QLabel* label_search_bar = new QLabel(tr("Search:"), this);
-	QLineEdit* search_bar = new QLineEdit(this);
+	slider_icon_size->setValue(m_icon_size.height());
 	QPushButton* push_close = new QPushButton(tr("&Close"), this);
 	push_close->setAutoDefault(true);
 
 	// Details
-	m_details_icon = new video_label(this);
+	m_details_icon = new QLabel(this);
 	m_details_icon->setMinimumSize(320, 176);
 	m_details_title = new QLabel(tr("Select an item to view details"), this);
 	m_details_title->setWordWrap(true);
@@ -147,8 +179,6 @@ void save_manager_dialog::Init()
 
 	// Items below list
 	QHBoxLayout* hbox_buttons = new QHBoxLayout();
-	hbox_buttons->addWidget(label_search_bar);
-	hbox_buttons->addWidget(search_bar);
 	hbox_buttons->addWidget(label_icon_size);
 	hbox_buttons->addWidget(slider_icon_size);
 	hbox_buttons->addStretch();
@@ -173,133 +203,38 @@ void save_manager_dialog::Init()
 	connect(m_button_folder, &QAbstractButton::clicked, [this]()
 	{
 		const int idx = m_list->currentRow();
-		QTableWidgetItem* item = m_list->item(idx, SaveColumns::Name);
+		QTableWidgetItem* item = m_list->item(idx, 1);
 		if (!item)
 		{
 			return;
 		}
 		const int idx_real = item->data(Qt::UserRole).toInt();
-		const QString path = QString::fromStdString(m_dir + ::at32(m_save_entries, idx_real).dirName + "/");
-		gui::utils::open_dir(path);
+		const QString path = qstr(m_dir + m_save_entries[idx_real].dirName + "/");
+		QDesktopServices::openUrl(QUrl::fromLocalFile(path));
 	});
 	connect(slider_icon_size, &QAbstractSlider::valueChanged, this, &save_manager_dialog::SetIconSize);
 	connect(m_list->horizontalHeader(), &QHeaderView::sectionClicked, this, &save_manager_dialog::OnSort);
 	connect(m_list, &QTableWidget::customContextMenuRequested, this, &save_manager_dialog::ShowContextMenu);
 	connect(m_list, &QTableWidget::cellChanged, [&](int row, int col)
 	{
-		if (col != SaveColumns::Note)
-		{
-			return;
-		}
-		QTableWidgetItem* user_item = m_list->item(row, SaveColumns::Name);
-		QTableWidgetItem* text_item = m_list->item(row, SaveColumns::Note);
+		QTableWidgetItem* user_item = m_list->item(row, 1);
+		QTableWidgetItem* text_item = m_list->item(row, col);
 		if (!user_item || !text_item)
 		{
 			return;
 		}
 		const int original_index = user_item->data(Qt::UserRole).toInt();
-		const SaveDataEntry originalEntry = ::at32(m_save_entries, original_index);
-		const QString original_dir_name = QString::fromStdString(originalEntry.dirName);
+		const SaveDataEntry originalEntry = m_save_entries[original_index];
+		const QString original_dir_name = qstr(originalEntry.dirName);
 		QVariantMap notes = m_persistent_settings->GetValue(gui::persistent::save_notes).toMap();
 		notes[original_dir_name] = text_item->text();
 		m_persistent_settings->SetValue(gui::persistent::save_notes, notes);
 	});
 	connect(m_list, &QTableWidget::itemSelectionChanged, this, &save_manager_dialog::UpdateDetails);
-	connect(this, &save_manager_dialog::IconReady, this, [this](int index, const QPixmap& pixmap)
-	{
-		if (movie_item* item = static_cast<movie_item*>(m_list->item(index, SaveColumns::Icon)))
-		{
-			item->setData(SaveUserRole::PixmapScaled, pixmap);
-			item->image_change_callback();
-		}
-	});
-	connect(search_bar, &QLineEdit::textChanged, this, &save_manager_dialog::text_changed);
-}
-
-/**
-* This certainly isn't ideal for this code, as it essentially copies cellSaveData.  But, I have no other choice without adding public methods to cellSaveData.
-*/
-std::vector<SaveDataEntry> save_manager_dialog::GetSaveEntries(const std::string& base_dir)
-{
-	std::vector<SaveDataEntry> save_entries;
-	std::vector<fs::dir_entry> dir_list;
-
-	qRegisterMetaType<QVector<int>>("QVector<int>");
-	QList<int> indices;
-
-	for (const auto& entry : fs::dir(base_dir))
-	{
-		if (!entry.is_directory || entry.name == "." || entry.name == "..")
-		{
-			continue;
-		}
-		indices.append(static_cast<int>(dir_list.size()));
-		dir_list.emplace_back(entry);
-	}
-
-	if (dir_list.empty())
-	{
-		return save_entries;
-	}
-
-	QFutureWatcher<void> future_watcher;
-
-	progress_dialog progress_dialog(tr("Loading save data"), tr("Loading save data, please wait..."), tr("Cancel"), 0, 1, false, this, Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
-
-	connect(&future_watcher, &QFutureWatcher<void>::progressRangeChanged, &progress_dialog, &QProgressDialog::setRange);
-	connect(&future_watcher, &QFutureWatcher<void>::progressValueChanged, &progress_dialog, &QProgressDialog::setValue);
-	connect(&progress_dialog, &QProgressDialog::canceled, this, [this, &future_watcher]()
-	{
-		future_watcher.cancel();
-		close(); // It's pointless to show an empty window
-	});
-
-	shared_mutex mutex;
-
-	future_watcher.setFuture(QtConcurrent::map(indices, [&](int index)
-	{
-		const fs::dir_entry& entry = ::at32(dir_list, index);
-		gui_log.trace("Loading trophy dir: %s", entry.name);
-
-		// PSF parameters
-		const auto [psf, errc] = psf::load(base_dir + entry.name + "/PARAM.SFO");
-
-		if (psf.empty())
-		{
-			gui_log.error("Failed to load savedata: %s (%s)", base_dir + "/" + entry.name, errc);
-			return;
-		}
-
-		SaveDataEntry save_entry2 {};
-		save_entry2.dirName = psf::get_string(psf, "SAVEDATA_DIRECTORY");
-		save_entry2.listParam = psf::get_string(psf, "SAVEDATA_LIST_PARAM");
-		save_entry2.title = psf::get_string(psf, "TITLE");
-		save_entry2.subtitle = psf::get_string(psf, "SUB_TITLE");
-		save_entry2.details = psf::get_string(psf, "DETAIL");
-
-		for (const auto& entry2 : fs::dir(base_dir + entry.name))
-		{
-			save_entry2.size += entry2.size;
-		}
-
-		save_entry2.atime = entry.atime;
-		save_entry2.mtime = entry.mtime;
-		save_entry2.ctime = entry.ctime;
-		save_entry2.isNew = false;
-
-		std::scoped_lock lock(mutex);
-		save_entries.emplace_back(save_entry2);
-	}));
-
-	progress_dialog.exec();
-	future_watcher.waitForFinished();
-	return save_entries;
 }
 
 void save_manager_dialog::UpdateList()
 {
-	WaitForRepaintThreads(true);
-
 	if (m_dir.empty())
 	{
 		m_dir = rpcs3::utils::get_hdd0_dir() + "home/" + Emu.GetUsr() + "/savedata/";
@@ -307,7 +242,6 @@ void save_manager_dialog::UpdateList()
 
 	m_save_entries = GetSaveEntries(m_dir);
 
-	m_list->setSortingEnabled(false); // Disable sorting before using setItem calls
 	m_list->clearContents();
 	m_list->setRowCount(static_cast<int>(m_save_entries.size()));
 
@@ -319,81 +253,64 @@ void save_manager_dialog::UpdateList()
 	}
 	else
 	{
-		m_icon_color = gui::utils::get_label_color("save_manager_icon_background_color", Qt::transparent, Qt::transparent);
+		m_icon_color = gui::utils::get_label_color("save_manager_icon_background_color");
 	}
 
-	QPixmap placeholder(320, 176);
-	placeholder.fill(Qt::transparent);
+	QList<int> indices;
+	for (usz i = 0; i < m_save_entries.size(); ++i)
+		indices.append(static_cast<int>(i));
 
-	const s32 language_index = gui_application::get_language_id();
-	const std::string localized_movie = fmt::format("ICON1_%02d.PAM", language_index);
-
-	for (int i = 0; i < static_cast<int>(m_save_entries.size()); ++i)
+	const std::function<QPixmap(const int&)> get_icon = [this](const int& row)
 	{
-		const SaveDataEntry& entry = ::at32(m_save_entries, i);
-
-		const QString title = QString::fromStdString(entry.title) + QStringLiteral("\n") + QString::fromStdString(entry.subtitle);
-		const QString dir_name = QString::fromStdString(entry.dirName);
-		const std::string dir_path = m_dir + entry.dirName + "/";
-
-		custom_table_widget_item* icon_item = new custom_table_widget_item;
-		icon_item->setData(Qt::DecorationRole, placeholder);
-		icon_item->setData(SaveUserRole::Pixmap, placeholder);
-		icon_item->setData(SaveUserRole::PixmapScaled, placeholder);
-		icon_item->setData(SaveUserRole::PixmapLoaded, false);
-		icon_item->setFlags(icon_item->flags() & ~Qt::ItemIsEditable);
-
-		if (const std::string movie_path = dir_path + localized_movie; fs::is_file(movie_path))
+		const auto& entry = m_save_entries[row];
+		QPixmap icon = QPixmap(320, 176);
+		if (!icon.loadFromData(entry.iconBuf.data(), static_cast<uint>(entry.iconBuf.size())))
 		{
-			icon_item->set_video_path(movie_path);
-		}
-		else if (const std::string movie_path = dir_path + "ICON1.PAM"; fs::is_file(movie_path))
-		{
-			icon_item->set_video_path(movie_path);
+			gui_log.warning("Loading icon for save %s failed", entry.dirName);
+			icon = QPixmap(320, 176);
+			icon.fill(m_icon_color);
 		}
+		return icon;
+	};
 
-		icon_item->set_image_change_callback([this, icon_item](const QVideoFrame& frame)
-		{
-			if (!icon_item)
-			{
-				return;
-			}
+	// NOTE: Due to a Qt bug in Qt 5.15.2, QtConcurrent::blockingMapped has a high risk of deadlocking. So let's just use QtConcurrent::mapped.
+	const QList<QPixmap> icons = QtConcurrent::mapped(indices, get_icon).results();
 
-			if (const QPixmap pixmap = icon_item->get_movie_image(frame); icon_item->get_active() && !pixmap.isNull())
-			{
-				icon_item->setData(Qt::DecorationRole, pixmap.scaled(m_icon_size, Qt::KeepAspectRatio));
-			}
-			else
-			{
-				icon_item->setData(Qt::DecorationRole, icon_item->data(SaveUserRole::PixmapScaled).value<QPixmap>());
-				icon_item->stop_movie();
-			}
-		});
-		m_list->setItem(i, SaveColumns::Icon, icon_item);
+	for (int i = 0; i < icons.count(); ++i)
+	{
+		const auto& entry = m_save_entries[i];
 
-		custom_table_widget_item* titleItem = new custom_table_widget_item(title);
+		QString title = qstr(entry.title) + QStringLiteral("\n") + qstr(entry.subtitle);
+		QString dir_name = qstr(entry.dirName);
+
+		custom_table_widget_item* iconItem = new custom_table_widget_item;
+		iconItem->setData(Qt::UserRole, icons[i]);
+		iconItem->setFlags(iconItem->flags() & ~Qt::ItemIsEditable);
+		m_list->setItem(i, 0, iconItem);
+
+		QTableWidgetItem* titleItem = new QTableWidgetItem(title);
 		titleItem->setData(Qt::UserRole, i); // For sorting to work properly
 		titleItem->setFlags(titleItem->flags() & ~Qt::ItemIsEditable);
-		m_list->setItem(i, SaveColumns::Name, titleItem);
+		m_list->setItem(i, 1, titleItem);
 
-		custom_table_widget_item* timeItem = new custom_table_widget_item(FormatTimestamp(entry.mtime));
+		QTableWidgetItem* timeItem = new QTableWidgetItem(FormatTimestamp(entry.mtime));
 		timeItem->setFlags(timeItem->flags() & ~Qt::ItemIsEditable);
-		m_list->setItem(i, SaveColumns::Time, timeItem);
+		m_list->setItem(i, 2, timeItem);
 
-		custom_table_widget_item* dirNameItem = new custom_table_widget_item(dir_name);
+		QTableWidgetItem* dirNameItem = new QTableWidgetItem(dir_name);
 		dirNameItem->setFlags(dirNameItem->flags() & ~Qt::ItemIsEditable);
-		m_list->setItem(i, SaveColumns::Dir, dirNameItem);
+		m_list->setItem(i, 3, dirNameItem);
 
-		custom_table_widget_item* noteItem = new custom_table_widget_item();
+		QTableWidgetItem* noteItem = new QTableWidgetItem();
 		noteItem->setFlags(noteItem->flags() | Qt::ItemIsEditable);
 		if (notes.contains(dir_name))
 		{
 			noteItem->setText(notes[dir_name].toString());
 		}
-		m_list->setItem(i, SaveColumns::Note, noteItem);
+		m_list->setItem(i, 4, noteItem);
 	}
 
-	m_list->setSortingEnabled(true); // Enable sorting only after using setItem calls
+	UpdateIcons();
 
 	m_list->horizontalHeader()->resizeSections(QHeaderView::ResizeToContents);
 	m_list->verticalHeader()->resizeSections(QHeaderView::ResizeToContents);
@@ -407,8 +324,6 @@ void save_manager_dialog::UpdateList()
 	const QSize maxSize(preferredSize.width(), static_cast<int>(QGuiApplication::primaryScreen()->geometry().height() * 0.6));
 
 	resize(preferredSize.boundedTo(maxSize));
-
-	UpdateIcons();
 }
 
 void save_manager_dialog::HandleRepaintUiRequest()
@@ -422,101 +337,51 @@ void save_manager_dialog::HandleRepaintUiRequest()
 	resize(window_size);
 }
 
+QPixmap save_manager_dialog::GetResizedIcon(int i) const
+{
+	const qreal dpr = devicePixelRatioF();
+	const int width = m_icon_size.width() * dpr;
+	const int height = m_icon_size.height() * dpr * 176 / 320;
+
+	QTableWidgetItem* item = m_list->item(i, 0);
+	if (!item)
+	{
+		return QPixmap();
+	}
+	const QPixmap data = item->data(Qt::UserRole).value<QPixmap>();
+
+	QPixmap icon = QPixmap(data.size() * dpr);
+	icon.setDevicePixelRatio(dpr);
+	icon.fill(m_icon_color);
+
+	QPainter painter(&icon);
+	painter.setRenderHint(QPainter::SmoothPixmapTransform);
+	painter.drawPixmap(0, 0, data);
+	return icon.scaled(width, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+}
+
 void save_manager_dialog::UpdateIcons()
 {
-	WaitForRepaintThreads(true);
-
-	const qreal dpr = devicePixelRatioF();
-
-	QPixmap placeholder(m_icon_size);
-	placeholder.fill(Qt::transparent);
-
+	QList<int> indices;
 	for (int i = 0; i < m_list->rowCount(); ++i)
+		indices.append(i);
+
+	const std::function<QPixmap(const int&)> get_scaled = [this](const int& i)
 	{
-		if (movie_item* icon_item = static_cast<movie_item*>(m_list->item(i, SaveColumns::Icon)))
-		{
-			icon_item->setData(SaveUserRole::PixmapScaled, placeholder);
-			icon_item->setData(Qt::DecorationRole, placeholder);
-		}
+		return GetResizedIcon(i);
+	};
+
+	// NOTE: Due to a Qt bug in Qt 5.15.2, QtConcurrent::blockingMapped has a high risk of deadlocking. So let's just use QtConcurrent::mapped.
+	const QList<QPixmap> scaled = QtConcurrent::mapped(indices, get_scaled).results();
+
+	for (int i = 0; i < m_list->rowCount() && i < scaled.count(); ++i)
+	{
+		if (QTableWidgetItem* icon_item = m_list->item(i, 0))
+			icon_item->setData(Qt::DecorationRole, scaled[i]);
 	}
 
 	m_list->resizeRowsToContents();
-	m_list->resizeColumnToContents(SaveColumns::Icon);
-
-	const s32 language_index = gui_application::get_language_id();
-	const std::string localized_icon = fmt::format("ICON0_%02d.PNG", language_index);
-
-	for (int i = 0; i < m_list->rowCount(); ++i)
-	{
-		if (movie_item* icon_item = static_cast<movie_item*>(m_list->item(i, SaveColumns::Icon)))
-		{
-			icon_item->set_icon_load_func([this, cancel = icon_item->icon_loading_aborted(), dpr, localized_icon](int index)
-			{
-				if (cancel && cancel->load())
-				{
-					return;
-				}
-
-				QPixmap icon;
-
-				if (movie_item* item = static_cast<movie_item*>(m_list->item(index, SaveColumns::Icon)))
-				{
-					if (!item->data(SaveUserRole::PixmapLoaded).toBool())
-					{
-						// Load game icon
-						if (QTableWidgetItem* user_item = m_list->item(index, SaveColumns::Name))
-						{
-							const int idx_real = user_item->data(Qt::UserRole).toInt();
-							const SaveDataEntry& entry = ::at32(m_save_entries, idx_real);
-
-							if (!icon.load(QString::fromStdString(m_dir + entry.dirName + "/" + localized_icon)) &&
-								!icon.load(QString::fromStdString(m_dir + entry.dirName + "/ICON0.PNG")))
-							{
-								gui_log.warning("Loading icon for save %s failed", entry.dirName);
-								icon = QPixmap(320, 176);
-								icon.fill(m_icon_color);
-							}
-
-							item->setData(SaveUserRole::PixmapLoaded, true);
-							item->setData(SaveUserRole::Pixmap, icon);
-						}
-						else
-						{
-							gui_log.error("Loading icon for save failed (table item is null)");
-						}
-					}
-					else
-					{
-						icon = item->data(SaveUserRole::Pixmap).value<QPixmap>();
-					}
-				}
-
-				if (cancel && cancel->load())
-				{
-					return;
-				}
-
-				QPixmap new_icon(icon.size() * dpr);
-				new_icon.setDevicePixelRatio(dpr);
-				new_icon.fill(m_icon_color);
-
-				if (!icon.isNull())
-				{
-					QPainter painter(&new_icon);
-					painter.setRenderHint(QPainter::SmoothPixmapTransform);
-					painter.drawPixmap(QPoint(0, 0), icon);
-					painter.end();
-				}
-
-				new_icon = new_icon.scaled(m_icon_size * dpr, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation);
-
-				if (!cancel || !cancel->load())
-				{
-					Q_EMIT IconReady(index, new_icon);
-				}
-			});
-		}
-	}
+	m_list->resizeColumnToContents(0);
 }
 
 /**
@@ -526,8 +391,6 @@ void save_manager_dialog::OnSort(int logicalIndex)
 {
 	if (logicalIndex >= 0)
 	{
-		WaitForRepaintThreads(false);
-
 		if (logicalIndex == m_sort_column)
 		{
 			m_sort_ascending ^= true;
@@ -543,17 +406,21 @@ void save_manager_dialog::OnSort(int logicalIndex)
 }
 
 // Remove a save file, need to be confirmed.
-void save_manager_dialog::OnEntryRemove(int row, bool user_interaction)
+void save_manager_dialog::OnEntryRemove()
 {
-	if (QTableWidgetItem* item = m_list->item(row, SaveColumns::Name))
+	const int idx = m_list->currentRow();
+	if (idx != -1)
 	{
-		const int idx_real = item->data(Qt::UserRole).toInt();
-		const SaveDataEntry& entry = ::at32(m_save_entries, idx_real);
-
-		if (!user_interaction || QMessageBox::question(this, tr("Delete Confirmation"), tr("Are you sure you want to delete:\n%1?").arg(QString::fromStdString(entry.title)), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
+		QTableWidgetItem* item = m_list->item(idx, 1);
+		if (!item)
 		{
-			fs::remove_all(m_dir + entry.dirName + "/");
-			m_list->removeRow(row);
+			return;
+		}
+		const int idx_real = item->data(Qt::UserRole).toInt();
+		if (QMessageBox::question(this, tr("Delete Confirmation"), tr("Are you sure you want to delete:\n%1?").arg(qstr(m_save_entries[idx_real].title)), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
+		{
+			fs::remove_all(m_dir + m_save_entries[idx_real].dirName + "/");
+			m_list->removeRow(idx);
 		}
 	}
 }
@@ -566,26 +433,31 @@ void save_manager_dialog::OnEntriesRemove()
 		return;
 	}
 
-	WaitForRepaintThreads(false);
-
 	if (selection.size() == 1)
 	{
-		OnEntryRemove(selection.first().row(), true);
+		OnEntryRemove();
 		return;
 	}
 
 	if (QMessageBox::question(this, tr("Delete Confirmation"), tr("Are you sure you want to delete these %n items?", "", selection.size()), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
 	{
 		std::sort(selection.rbegin(), selection.rend());
-		for (const QModelIndex& index : selection)
+		for (QModelIndex index : selection)
 		{
-			OnEntryRemove(index.row(), false);
+			QTableWidgetItem* item = m_list->item(index.row(), 1);
+			if (!item)
+			{
+				continue;
+			}
+			const int idx_real = item->data(Qt::UserRole).toInt();
+			fs::remove_all(m_dir + m_save_entries[idx_real].dirName + "/");
+			m_list->removeRow(index.row());
 		}
 	}
 }
 
 // Pop-up a small context-menu, being a replacement for save_data_manage_dialog
-void save_manager_dialog::ShowContextMenu(const QPoint& pos)
+void save_manager_dialog::ShowContextMenu(const QPoint &pos)
 {
 	const int idx = m_list->currentRow();
 	if (idx == -1)
@@ -593,8 +465,6 @@ void save_manager_dialog::ShowContextMenu(const QPoint& pos)
 		return;
 	}
 
-	WaitForRepaintThreads(false);
-
 	const bool selectedItems = m_list->selectionModel()->selectedRows().size() > 1;
 
 	QAction* removeAct = new QAction(tr("&Remove"), this);
@@ -605,19 +475,20 @@ void save_manager_dialog::ShowContextMenu(const QPoint& pos)
 	menu->addAction(showDirAct);
 
 	showDirAct->setEnabled(!selectedItems);
+	removeAct->setEnabled(idx != -1);
 
 	// Events
 	connect(removeAct, &QAction::triggered, this, &save_manager_dialog::OnEntriesRemove); // entriesremove handles case of one as well
-	connect(showDirAct, &QAction::triggered, [this, idx]()
+	connect(showDirAct, &QAction::triggered, [=, this]()
 	{
-		QTableWidgetItem* item = m_list->item(idx, SaveColumns::Name);
+		QTableWidgetItem* item = m_list->item(idx, 1);
 		if (!item)
 		{
 			return;
 		}
 		const int idx_real = item->data(Qt::UserRole).toInt();
-		const QString path = QString::fromStdString(m_dir + ::at32(m_save_entries, idx_real).dirName + "/");
-		gui::utils::open_dir(path);
+		const QString path = qstr(m_dir + m_save_entries[idx_real].dirName + "/");
+		QDesktopServices::openUrl(QUrl::fromLocalFile(path));
 	});
 
 	menu->exec(m_list->viewport()->mapToGlobal(pos));
@@ -625,9 +496,9 @@ void save_manager_dialog::ShowContextMenu(const QPoint& pos)
 
 void save_manager_dialog::SetIconSize(int size)
 {
-	m_icon_size = QSize(size, size * 176 / 320);
+	m_icon_size = QSize(size, size);
 	UpdateIcons();
-	m_gui_settings->SetValue(gui::sd_icon_size, size, false); // Don't sync while sliding
+	m_gui_settings->SetValue(gui::sd_icon_size, size);
 }
 
 void save_manager_dialog::closeEvent(QCloseEvent *event)
@@ -641,9 +512,7 @@ void save_manager_dialog::UpdateDetails()
 {
 	if (const int selected = m_list->selectionModel()->selectedRows().size(); selected != 1)
 	{
-		m_details_icon->set_thumbnail({});
-		m_details_icon->set_active(false);
-
+		m_details_icon->setPixmap(QPixmap());
 		m_details_subtitle->setText("");
 		m_details_modified->setText("");
 		m_details_details->setText("");
@@ -663,11 +532,9 @@ void save_manager_dialog::UpdateDetails()
 	}
 	else
 	{
-		WaitForRepaintThreads(false);
-
 		const int row = m_list->currentRow();
-		QTableWidgetItem* item = m_list->item(row, SaveColumns::Name);
-		movie_item* icon_item = static_cast<movie_item*>(m_list->item(row, SaveColumns::Icon));
+		QTableWidgetItem* item = m_list->item(row, 1);
+		QTableWidgetItem* icon_item = m_list->item(row, 0);
 
 		if (!item || !icon_item)
 		{
@@ -675,22 +542,18 @@ void save_manager_dialog::UpdateDetails()
 		}
 
 		const int idx = item->data(Qt::UserRole).toInt();
-		const SaveDataEntry& save = ::at32(m_save_entries, idx);
+		const SaveDataEntry& save = m_save_entries[idx];
 
-		m_details_icon->set_video_path(icon_item->video_path().toStdString());
-		m_details_icon->set_thumbnail(icon_item->data(SaveUserRole::Pixmap).value<QPixmap>());
-		m_details_icon->set_active(false);
-
-		m_details_title->setText(QString::fromStdString(save.title));
-		m_details_subtitle->setText(QString::fromStdString(save.subtitle));
+		m_details_icon->setPixmap(icon_item->data(Qt::UserRole).value<QPixmap>());
+		m_details_title->setText(qstr(save.title));
+		m_details_subtitle->setText(qstr(save.subtitle));
 		m_details_modified->setText(tr("Last modified: %1").arg(FormatTimestamp(save.mtime)));
-		m_details_details->setText(tr("Details:\n").append(QString::fromStdString(save.details)));
+		m_details_details->setText(tr("Details:\n").append(qstr(save.details)));
 		QString note = tr("Note:\n");
-		const QString dir_name = QString::fromStdString(save.dirName);
 		if (const QVariantMap map = m_persistent_settings->GetValue(gui::persistent::save_notes).toMap();
-			map.contains(dir_name))
+			map.contains(qstr(save.dirName)))
 		{
-			note.append(map[dir_name].toString());
+			note.append(map[qstr(save.dirName)].toString());
 		}
 		m_details_note->setText(note);
 
@@ -698,53 +561,3 @@ void save_manager_dialog::UpdateDetails()
 		m_button_folder->setDisabled(false);
 	}
 }
-
-void save_manager_dialog::WaitForRepaintThreads(bool abort)
-{
-	for (int i = 0; i < m_list->rowCount(); i++)
-	{
-		if (movie_item* item = static_cast<movie_item*>(m_list->item(i, SaveColumns::Icon)))
-		{
-			item->wait_for_icon_loading(abort);
-		}
-	}
-}
-
-void save_manager_dialog::text_changed(const QString& text)
-{
-	const auto check_text = [&](int row)
-	{
-		if (text.isEmpty())
-			return true;
-
-		for (int col = SaveColumns::Name; col < SaveColumns::Count; col++)
-		{
-			const QTableWidgetItem* item = m_list->item(row, col);
-
-			if (item && item->text().contains(text, Qt::CaseInsensitive))
-				return true;
-		}
-
-		return false;
-	};
-
-	bool new_row_visible = false;
-
-	for (int i = 0; i < m_list->rowCount(); i++)
-	{
-		// only show items filtered for search text
-		const bool is_hidden = m_list->isRowHidden(i);
-		const bool hide = !check_text(i);
-
-		if (is_hidden != hide)
-		{
-			m_list->setRowHidden(i, hide);
-			new_row_visible = !hide;
-		}
-	}
-
-	if (new_row_visible)
-	{
-		UpdateIcons();
-	}
-}
diff --git a/rpcs3/rpcs3qt/save_manager_dialog.h b/rpcs3/rpcs3qt/save_manager_dialog.h
index 791ee9a814..2ad734158e 100644
--- a/rpcs3/rpcs3qt/save_manager_dialog.h
+++ b/rpcs3/rpcs3qt/save_manager_dialog.h
@@ -1,18 +1,14 @@
 #pragma once
 
-#include "game_list.h"
-
 #include "Emu/Cell/Modules/cellSaveData.h"
 
 #include <QDialog>
 #include <QLabel>
 #include <QPushButton>
 #include <QTableWidget>
-#include <QPixmap>
 
 class gui_settings;
 class persistent_settings;
-class video_label;
 
 class save_manager_dialog : public QDialog
 {
@@ -28,28 +24,21 @@ public:
 public Q_SLOTS:
 	void HandleRepaintUiRequest();
 private Q_SLOTS:
-	void OnEntryRemove(int row, bool user_interaction);
+	void OnEntryRemove();
 	void OnEntriesRemove();
 	void OnSort(int logicalIndex);
 	void SetIconSize(int size);
 	void UpdateDetails();
-	void text_changed(const QString& text);
-
-Q_SIGNALS:
-	void IconReady(int index, const QPixmap& new_icon);
-
 private:
 	void Init();
 	void UpdateList();
+	QPixmap GetResizedIcon(int i) const;
 	void UpdateIcons();
-	void ShowContextMenu(const QPoint& pos);
-	void WaitForRepaintThreads(bool abort);
+	void ShowContextMenu(const QPoint &pos);
 
 	void closeEvent(QCloseEvent* event) override;
 
-	std::vector<SaveDataEntry> GetSaveEntries(const std::string& base_dir);
-
-	game_list* m_list = nullptr;
+	QTableWidget* m_list = nullptr;
 	std::string m_dir;
 	std::vector<SaveDataEntry> m_save_entries;
 
@@ -61,7 +50,7 @@ private:
 	QSize m_icon_size;
 	QColor m_icon_color;
 
-	video_label* m_details_icon = nullptr;
+	QLabel* m_details_icon = nullptr;
 	QLabel* m_details_title = nullptr;
 	QLabel* m_details_subtitle = nullptr;
 	QLabel* m_details_modified = nullptr;
diff --git a/rpcs3/rpcs3qt/savestate_manager_dialog.cpp b/rpcs3/rpcs3qt/savestate_manager_dialog.cpp
deleted file mode 100644
index d6ac40785c..0000000000
--- a/rpcs3/rpcs3qt/savestate_manager_dialog.cpp
+++ /dev/null
@@ -1,792 +0,0 @@
-#include "stdafx.h"
-#include "savestate_manager_dialog.h"
-#include "custom_table_widget_item.h"
-#include "game_list_delegate.h"
-#include "qt_utils.h"
-#include "game_list.h"
-#include "gui_settings.h"
-#include "progress_dialog.h"
-
-#include <QApplication>
-#include <QClipboard>
-#include <QScrollBar>
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QMenu>
-#include <QtConcurrent>
-
-LOG_CHANNEL(gui_log, "GUI");
-
-enum GameUserRole
-{
-	GameIndex = Qt::UserRole,
-	GamePixmapLoaded,
-	GamePixmap
-};
-
-savestate_manager_dialog::savestate_manager_dialog(std::shared_ptr<gui_settings> gui_settings, const std::vector<game_info>& games)
-	: QWidget()
-	, m_gui_settings(std::move(gui_settings))
-	, m_game_info(games)
-{
-	// Nonspecific widget settings
-	setWindowTitle(tr("Savestate Manager"));
-	setObjectName("savestate_manager");
-	setAttribute(Qt::WA_DeleteOnClose);
-	setAttribute(Qt::WA_StyledBackground);
-
-	m_game_icon_size_index = m_gui_settings->GetValue(gui::ss_game_icon_size).toInt();
-
-	// Game chooser combo box
-	m_game_combo = new QComboBox();
-	m_game_combo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
-
-	// Games Table
-	m_game_table = new game_list();
-	m_game_table->setObjectName("savestate_manager_game_table");
-	m_game_table->setShowGrid(false);
-	m_game_table->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
-	m_game_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
-	m_game_table->verticalScrollBar()->installEventFilter(this);
-	m_game_table->verticalScrollBar()->setSingleStep(20);
-	m_game_table->horizontalScrollBar()->setSingleStep(20);
-	m_game_table->setItemDelegate(new game_list_delegate(m_game_table));
-	m_game_table->setSelectionBehavior(QAbstractItemView::SelectRows);
-	m_game_table->setSelectionMode(QAbstractItemView::SingleSelection);
-	m_game_table->setEditTriggers(QAbstractItemView::NoEditTriggers);
-	m_game_table->setColumnCount(static_cast<int>(gui::savestate_game_list_columns::count));
-	m_game_table->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
-	m_game_table->horizontalHeader()->setStretchLastSection(true);
-	m_game_table->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
-	m_game_table->setContextMenuPolicy(Qt::CustomContextMenu);
-	m_game_table->verticalHeader()->setVisible(false);
-	m_game_table->setAlternatingRowColors(true);
-	m_game_table->installEventFilter(this);
-
-	auto add_game_column = [this](gui::savestate_game_list_columns col, const QString& header_text, const QString& action_text)
-	{
-		m_game_table->setHorizontalHeaderItem(static_cast<int>(col), new QTableWidgetItem(header_text));
-		m_game_column_acts.append(new QAction(action_text, this));
-	};
-
-	add_game_column(gui::savestate_game_list_columns::icon,       tr("Icon"),       tr("Show Icons"));
-	add_game_column(gui::savestate_game_list_columns::name,       tr("Game"),       tr("Show Games"));
-	add_game_column(gui::savestate_game_list_columns::savestates, tr("Savestates"), tr("Show Savestates"));
-
-	// Savestate Table
-	m_savestate_table = new game_list();
-	m_savestate_table->setObjectName("savestate_manager_savestate_table");
-	m_savestate_table->setShowGrid(false);
-	m_savestate_table->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
-	m_savestate_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
-	m_savestate_table->verticalScrollBar()->installEventFilter(this);
-	m_savestate_table->verticalScrollBar()->setSingleStep(20);
-	m_savestate_table->horizontalScrollBar()->setSingleStep(20);
-	m_savestate_table->setItemDelegate(new game_list_delegate(m_savestate_table));
-	m_savestate_table->setSelectionBehavior(QAbstractItemView::SelectRows);
-	m_savestate_table->setEditTriggers(QAbstractItemView::NoEditTriggers);
-	m_savestate_table->setColumnCount(static_cast<int>(gui::savestate_list_columns::count));
-	m_savestate_table->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
-	m_savestate_table->horizontalHeader()->setStretchLastSection(true);
-	m_savestate_table->verticalHeader()->setVisible(false);
-	m_savestate_table->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
-	m_savestate_table->setContextMenuPolicy(Qt::CustomContextMenu);
-	m_savestate_table->setAlternatingRowColors(true);
-	m_savestate_table->installEventFilter(this);
-
-	auto add_savestate_column = [this](gui::savestate_list_columns col, const QString& header_text, const QString& action_text)
-	{
-		m_savestate_table->setHorizontalHeaderItem(static_cast<int>(col), new QTableWidgetItem(header_text));
-		m_savestate_column_acts.append(new QAction(action_text, this));
-	};
-
-	add_savestate_column(gui::savestate_list_columns::name, tr("Name"), tr("Show Names"));
-	add_savestate_column(gui::savestate_list_columns::compatible, tr("Compatible"), tr("Show Compatible"));
-	add_savestate_column(gui::savestate_list_columns::date, tr("Created"), tr("Show Created"));
-	add_savestate_column(gui::savestate_list_columns::path, tr("Path"), tr("Show Paths"));
-
-	m_splitter = new QSplitter();
-	m_splitter->addWidget(m_game_table);
-	m_splitter->addWidget(m_savestate_table);
-
-	m_game_icon_size = gui_settings::SizeFromSlider(m_game_icon_size_index);
-
-	QLabel* game_slider_label = new QLabel();
-	game_slider_label->setText(tr("Game Icon Size: %0x%1").arg(m_game_icon_size.width()).arg(m_game_icon_size.height()));
-
-	m_game_icon_slider = new QSlider(Qt::Horizontal);
-	m_game_icon_slider->setRange(0, gui::gl_max_slider_pos);
-	m_game_icon_slider->setValue(m_game_icon_size_index);
-
-	// LAYOUTS
-	QGroupBox* choose_game = new QGroupBox(tr("Choose Game"));
-	QVBoxLayout* choose_layout = new QVBoxLayout();
-	choose_layout->addWidget(m_game_combo);
-	choose_game->setLayout(choose_layout);
-
-	QGroupBox* icon_settings = new QGroupBox(tr("Icon Options"));
-	QVBoxLayout* slider_layout = new QVBoxLayout();
-	slider_layout->addWidget(game_slider_label);
-	slider_layout->addWidget(m_game_icon_slider);
-	icon_settings->setLayout(slider_layout);
-
-	QVBoxLayout* options_layout = new QVBoxLayout();
-	options_layout->addWidget(choose_game);
-	options_layout->addWidget(icon_settings);
-	options_layout->addStretch();
-
-	QHBoxLayout* all_layout = new QHBoxLayout(this);
-	all_layout->addLayout(options_layout);
-	all_layout->addWidget(m_splitter);
-	all_layout->setStretch(1, 1);
-	setLayout(all_layout);
-
-	// Make connects
-	connect(m_game_icon_slider, &QSlider::valueChanged, this, [this, game_slider_label](int val)
-	{
-		m_game_icon_size_index = val;
-		m_game_icon_size = gui_settings::SizeFromSlider(val);
-		if (game_slider_label)
-		{
-			game_slider_label->setText(tr("Game Icon Size: %0x%1").arg(m_game_icon_size.width()).arg(m_game_icon_size.height()));
-		}
-		ResizeGameIcons();
-		if (m_save_game_icon_size)
-		{
-			m_save_game_icon_size = false;
-			m_gui_settings->SetValue(gui::ss_game_icon_size, val);
-		}
-	});
-
-	connect(m_game_icon_slider, &QSlider::sliderReleased, this, [this]()
-	{
-		m_gui_settings->SetValue(gui::ss_game_icon_size, m_game_icon_slider->value());
-	});
-
-	connect(m_game_icon_slider, &QSlider::actionTriggered, this, [this](int action)
-	{
-		if (action != QAbstractSlider::SliderNoAction && action != QAbstractSlider::SliderMove)
-		{	// we only want to save on mouseclicks or slider release (the other connect handles this)
-			m_save_game_icon_size = true; // actionTriggered happens before the value was changed
-		}
-	});
-
-	connect(m_savestate_table, &QTableWidget::customContextMenuRequested, this, &savestate_manager_dialog::ShowSavestateTableContextMenu);
-
-	connect(m_game_combo, &QComboBox::currentTextChanged, this, [this]
-	{
-		PopulateSavestateTable();
-	});
-
-	connect(m_game_table, &QTableWidget::customContextMenuRequested, this, &savestate_manager_dialog::ShowGameTableContextMenu);
-
-	connect(m_game_table, &QTableWidget::itemSelectionChanged, this, [this]
-	{
-		if (m_game_table->selectedItems().isEmpty())
-		{
-			return;
-		}
-		QTableWidgetItem* item = m_game_table->item(m_game_table->selectedItems().first()->row(), static_cast<int>(gui::savestate_game_list_columns::name));
-		if (!item)
-		{
-			return;
-		}
-		m_game_combo->setCurrentText(item->text());
-	});
-
-	connect(this, &savestate_manager_dialog::GameIconReady, this, [this](int index, const QPixmap& pixmap)
-	{
-		if (QTableWidgetItem* icon_item = m_game_table->item(index, static_cast<int>(gui::savestate_game_list_columns::icon)))
-		{
-			icon_item->setData(Qt::DecorationRole, pixmap);
-		}
-	});
-
-	m_savestate_table->create_header_actions(m_savestate_column_acts,
-		[this](int col) { return m_gui_settings->GetSavestateListColVisibility(static_cast<gui::savestate_list_columns>(col)); },
-		[this](int col, bool visible) { m_gui_settings->SetSavestateListColVisibility(static_cast<gui::savestate_list_columns>(col), visible); });
-	
-	m_game_table->create_header_actions(m_game_column_acts,
-		[this](int col) { return m_gui_settings->GetSavestateGamelistColVisibility(static_cast<gui::savestate_game_list_columns>(col)); },
-		[this](int col, bool visible) { m_gui_settings->SetSavestateGamelistColVisibility(static_cast<gui::savestate_game_list_columns>(col), visible); });
-
-	RepaintUI(true);
-
-	StartSavestateLoadThreads();
-}
-
-savestate_manager_dialog::~savestate_manager_dialog()
-{
-	WaitAndAbortGameRepaintThreads();
-}
-
-bool savestate_manager_dialog::LoadSavestateFolderToDB(std::unique_ptr<game_savestates_data>&& game_savestates)
-{
-	ensure(!!game_savestates);
-
-	if (game_savestates->title_id.empty())
-	{
-		gui_log.error("Failed to load savestates. Path empty!");
-		return false;
-	}
-
-	const std::string dir_path = fs::get_config_dir() + "savestates/" + game_savestates->title_id + "/";
-
-	const QDir savestate_dir(QString::fromStdString(dir_path));
-	const QFileInfoList file_list = savestate_dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot);
-
-	if (file_list.isEmpty())
-	{
-		return false;
-	}
-
-	// Populate game_savestates_data
-	game_savestates->savestates.resize(file_list.size());
-	game_savestates->dir_path = dir_path;
-
-	extern bool is_savestate_compatible(const std::string& filepath);
-
-	for (usz id = 0; id < game_savestates->savestates.size(); ++id)
-	{
-		game_savestates->savestates[id].name = file_list[id].baseName();
-		game_savestates->savestates[id].path = file_list[id].absoluteFilePath();
-		game_savestates->savestates[id].date = file_list[id].birthTime();
-		game_savestates->savestates[id].is_compatible = is_savestate_compatible(game_savestates->savestates[id].path.toStdString());
-	}
-
-	{
-		std::scoped_lock lock(m_savestate_db_mtx);
-		m_savestate_db.push_back(std::move(game_savestates));
-	}
-
-	return true;
-}
-
-void savestate_manager_dialog::RepaintUI(bool restore_layout)
-{
-	if (m_gui_settings->GetValue(gui::m_enableUIColors).toBool())
-	{
-		m_game_icon_color = m_gui_settings->GetValue(gui::ss_icon_color).value<QColor>();
-	}
-	else
-	{
-		m_game_icon_color = gui::utils::get_label_color("savestate_manager_icon_background_color", Qt::transparent, Qt::transparent);
-	}
-
-	PopulateGameTable();
-
-	if (restore_layout && !restoreGeometry(m_gui_settings->GetValue(gui::ss_geometry).toByteArray()))
-	{
-		resize(QGuiApplication::primaryScreen()->availableSize() * 0.7);
-	}
-
-	if (restore_layout && !m_splitter->restoreState(m_gui_settings->GetValue(gui::ss_splitterState).toByteArray()))
-	{
-		const int width_left = m_splitter->width() * 0.4;
-		const int width_right = m_splitter->width() - width_left;
-		m_splitter->setSizes({ width_left, width_right });
-	}
-
-	PopulateSavestateTable();
-
-	const QByteArray game_table_state = m_gui_settings->GetValue(gui::ss_games_state).toByteArray();
-	if (restore_layout && !m_game_table->horizontalHeader()->restoreState(game_table_state) && m_game_table->rowCount())
-	{
-		// If no settings exist, resize to contents. (disabled)
-		//m_game_table->horizontalHeader()->resizeSections(QHeaderView::ResizeMode::ResizeToContents);
-	}
-
-	const QByteArray savestate_table_state = m_gui_settings->GetValue(gui::ss_savestate_state).toByteArray();
-	if (restore_layout && !m_savestate_table->horizontalHeader()->restoreState(savestate_table_state) && m_savestate_table->rowCount())
-	{
-		// If no settings exist, resize to contents. (disabled)
-		//m_savestate_table->horizontalHeader()->resizeSections(QHeaderView::ResizeMode::ResizeToContents);
-	}
-
-	if (restore_layout)
-	{
-		// Make sure the actions and the headers are synced
-		m_game_table->sync_header_actions(m_game_column_acts, [this](int col) { return m_gui_settings->GetSavestateGamelistColVisibility(static_cast<gui::savestate_game_list_columns>(col)); });
-		m_savestate_table->sync_header_actions(m_savestate_column_acts, [this](int col) { return m_gui_settings->GetSavestateListColVisibility(static_cast<gui::savestate_list_columns>(col)); });
-	}
-
-	// Show dialog and then paint gui in order to adjust headers correctly
-	show();
-	ReadjustGameTable();
-	ReadjustSavestateTable();
-}
-
-void savestate_manager_dialog::HandleRepaintUiRequest()
-{
-	const QSize window_size = size();
-	const QByteArray splitter_state = m_splitter->saveState();
-	const QByteArray game_table_state = m_game_table->horizontalHeader()->saveState();
-	const QByteArray savestate_table_state = m_savestate_table->horizontalHeader()->saveState();
-
-	RepaintUI(false);
-
-	m_splitter->restoreState(splitter_state);
-	m_game_table->horizontalHeader()->restoreState(game_table_state);
-	m_savestate_table->horizontalHeader()->restoreState(savestate_table_state);
-
-	// Make sure the actions and the headers are synced
-	m_game_table->sync_header_actions(m_game_column_acts, [this](int col) { return m_gui_settings->GetSavestateGamelistColVisibility(static_cast<gui::savestate_game_list_columns>(col)); });
-	m_savestate_table->sync_header_actions(m_savestate_column_acts, [this](int col) { return m_gui_settings->GetSavestateListColVisibility(static_cast<gui::savestate_list_columns>(col)); });
-
-	resize(window_size);
-}
-
-void savestate_manager_dialog::ResizeGameIcons()
-{
-	if (m_game_combo->count() <= 0)
-		return;
-
-	WaitAndAbortGameRepaintThreads();
-
-	QPixmap placeholder(m_game_icon_size);
-	placeholder.fill(Qt::transparent);
-
-	qRegisterMetaType<QVector<int>>("QVector<int>");
-	for (int i = 0; i < m_game_table->rowCount(); ++i)
-	{
-		if (QTableWidgetItem* icon_item = m_game_table->item(i, static_cast<int>(gui::savestate_game_list_columns::icon)))
-		{
-			icon_item->setData(Qt::DecorationRole, placeholder);
-		}
-	}
-
-	ReadjustGameTable();
-
-	for (int i = 0; i < m_game_table->rowCount(); ++i)
-	{
-		if (movie_item* item = static_cast<movie_item*>(m_game_table->item(i, static_cast<int>(gui::savestate_game_list_columns::icon))))
-		{
-			const qreal dpr = devicePixelRatioF();
-			const int savestate_index = item->data(GameUserRole::GameIndex).toInt();
-			const std::string icon_path = m_savestate_db[savestate_index]->game_icon_path;
-
-			item->set_icon_load_func([this, icon_path, savestate_index, cancel = item->icon_loading_aborted(), dpr](int index)
-			{
-				if (cancel && cancel->load())
-				{
-					return;
-				}
-
-				QPixmap icon;
-
-				if (movie_item* item = static_cast<movie_item*>(m_game_table->item(index, static_cast<int>(gui::savestate_game_list_columns::icon))))
-				{
-					if (!item->data(GameUserRole::GamePixmapLoaded).toBool())
-					{
-						// Load game icon
-						if (!icon.load(QString::fromStdString(icon_path)))
-						{
-							gui_log.warning("Could not load savestate game icon from path %s", icon_path);
-						}
-						item->setData(GameUserRole::GamePixmapLoaded, true);
-						item->setData(GameUserRole::GamePixmap, icon);
-					}
-					else
-					{
-						icon = item->data(GameUserRole::GamePixmap).value<QPixmap>();
-					}
-				}
-
-				if (cancel && cancel->load())
-				{
-					return;
-				}
-
-				QPixmap new_icon(icon.size() * dpr);
-				new_icon.setDevicePixelRatio(dpr);
-				new_icon.fill(m_game_icon_color);
-
-				if (!icon.isNull())
-				{
-					QPainter painter(&new_icon);
-					painter.setRenderHint(QPainter::SmoothPixmapTransform);
-					painter.drawPixmap(QPoint(0, 0), icon);
-					painter.end();
-				}
-
-				new_icon = new_icon.scaled(m_game_icon_size * dpr, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation);
-
-				if (!cancel || !cancel->load())
-				{
-					Q_EMIT GameIconReady(index, new_icon);
-				}
-			});
-		}
-	}
-}
-
-void savestate_manager_dialog::ShowSavestateTableContextMenu(const QPoint& pos)
-{
-	const int row = m_savestate_table->currentRow();
-	const QTableWidgetItem* path_item = m_savestate_table->item(row, static_cast<int>(gui::savestate_list_columns::path));
-
-	if (!path_item)
-	{
-		return;
-	}
-
-	QMenu* menu = new QMenu();
-	QAction* show_savestate_dir = new QAction(tr("&Open Savestate Directory"), menu);
-	QAction* boot_savestate = new QAction(tr("&Boot Savestate"), menu);
-	QAction* delete_savestate = new QAction(tr("&Delete Savestate"), menu);
-
-	if (const QTableWidgetItem* comp_item = m_savestate_table->item(row, static_cast<int>(gui::savestate_list_columns::compatible)))
-	{
-		boot_savestate->setEnabled(comp_item->data(Qt::UserRole).toBool());
-	}
-
-	const int db_ind = m_game_combo->currentData().toInt();
-	const std::string path = path_item->text().toStdString();
-
-	connect(show_savestate_dir, &QAction::triggered, this, [this, db_ind]()
-	{
-		gui::utils::open_dir(QString::fromStdString(m_savestate_db[db_ind]->dir_path));
-	});
-
-	connect(boot_savestate, &QAction::triggered, this, [this, path]()
-	{
-		gui_log.notice("Booting savestate from savestate manager...");
-		Q_EMIT RequestBoot(path);
-	});
-
-	connect(delete_savestate, &QAction::triggered, this, [this, path]()
-	{
-		gui_log.notice("Removing savestate '%s' from savestate manager...", path);
-
-		if (QMessageBox::question(this, tr("Confirm Deletion"), tr("Delete savestate '%0'?").arg(QString::fromStdString(path))) != QMessageBox::Yes)
-			return;
-
-		if (fs::remove_file(path))
-		{
-			gui_log.success("Removed savestate '%s'", path);
-			StartSavestateLoadThreads(); // Reload the savestate list
-		}
-		else
-		{
-			gui_log.error("Failed to remove file '%s' (%s)", path, fs::g_tls_error);
-			QMessageBox::warning(this, tr("Deletion Failed!"), tr("Failed to delete savestate '%0'!").arg(QString::fromStdString(path)));
-		}
-	});
-
-	menu->addAction(boot_savestate);
-	menu->addAction(show_savestate_dir);
-	menu->addSeparator();
-	menu->addAction(delete_savestate);
-
-	menu->exec(m_savestate_table->viewport()->mapToGlobal(pos));
-}
-
-void savestate_manager_dialog::ShowGameTableContextMenu(const QPoint& pos)
-{
-	const int row = m_game_table->currentRow();
-
-	if (!m_game_table->item(row, static_cast<int>(gui::savestate_game_list_columns::icon)))
-	{
-		return;
-	}
-
-	QMenu* menu = new QMenu();
-	QAction* remove_savestate_dir = new QAction(tr("&Remove All Savestates"), this);
-	QAction* show_savestate_dir = new QAction(tr("&Open Savestate Directory"), menu);
-
-	const int db_ind = m_game_combo->currentData().toInt();
-
-	const QTableWidgetItem* name_item = m_game_table->item(row, static_cast<int>(gui::savestate_game_list_columns::name));
-	const QString name = name_item ? name_item->text() : "";
-
-	connect(remove_savestate_dir, &QAction::triggered, this, [this, name, db_ind]()
-	{
-		if (QMessageBox::question(this, tr("Delete Confirmation"), tr("Are you sure you want to delete the savestates for:\n%0?").arg(name), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
-		{
-			const std::string path = m_savestate_db[db_ind]->dir_path;
-			ensure(path != (fs::get_config_dir() + "savestates/")); // Make sure we aren't deleting the root path by accident
-			fs::remove_all(path); // Remove the game's savestate folder
-			StartSavestateLoadThreads(); // Reload the savestate list
-		}
-	});
-	connect(show_savestate_dir, &QAction::triggered, this, [this, db_ind]()
-	{
-		gui::utils::open_dir(QString::fromStdString(m_savestate_db[db_ind]->dir_path));
-	});
-
-	menu->addAction(show_savestate_dir);
-
-	if (!name.isEmpty())
-	{
-		QAction* copy_name = new QAction(tr("&Copy Name"), menu);
-		connect(copy_name, &QAction::triggered, this, [this, name]()
-		{
-			QApplication::clipboard()->setText(name);
-		});
-		menu->addAction(copy_name);
-	}
-
-	menu->addSeparator();
-	menu->addAction(remove_savestate_dir);
-
-	menu->exec(m_game_table->viewport()->mapToGlobal(pos));
-}
-
-void savestate_manager_dialog::StartSavestateLoadThreads()
-{
-	WaitAndAbortGameRepaintThreads();
-
-	m_savestate_db.clear();
-
-	const QString savestate_path = QString::fromStdString(fs::get_config_dir() + "savestates/");
-	const QDir savestate_dir(savestate_path);
-	const QStringList folder_list = savestate_dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-	const int count = folder_list.count();
-
-	if (count <= 0)
-	{
-		RepaintUI(true);
-		return;
-	}
-
-	std::vector<std::unique_ptr<game_savestates_data>> game_data(count);
-
-	qRegisterMetaType<QVector<int>>("QVector<int>");
-	QList<int> indices;
-	for (int i = 0; i < count; ++i)
-	{
-		indices.append(i);
-
-		game_data[i] = std::make_unique<game_savestates_data>();
-		game_data[i]->title_id = folder_list[i].toStdString();
-
-		for (const game_info& gameinfo : m_game_info)
-		{
-			if (gameinfo && gameinfo->info.serial == game_data[i]->title_id)
-			{
-				game_data[i]->game_name = gameinfo->info.name;
-				game_data[i]->game_icon_path = gameinfo->info.icon_path;
-				break;
-			}
-		}
-
-		if (game_data[i]->game_name.empty())
-		{
-			game_data[i]->game_name = game_data[i]->title_id;
-		}
-	}
-
-	QFutureWatcher<void> future_watcher;
-
-	progress_dialog progress_dialog(tr("Loading savestates"), tr("Loading savestates, please wait..."), tr("Cancel"), 0, 1, false, this, Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
-
-	connect(&future_watcher, &QFutureWatcher<void>::progressRangeChanged, &progress_dialog, &QProgressDialog::setRange);
-	connect(&future_watcher, &QFutureWatcher<void>::progressValueChanged, &progress_dialog, &QProgressDialog::setValue);
-	connect(&future_watcher, &QFutureWatcher<void>::finished, this, [this]() { RepaintUI(true); });
-	connect(&progress_dialog, &QProgressDialog::canceled, this, [this, &future_watcher]()
-	{
-		future_watcher.cancel();
-		close(); // It's pointless to show an empty window
-	});
-
-	atomic_t<usz> error_count{};
-	future_watcher.setFuture(QtConcurrent::map(indices, [this, &error_count, &game_data](const int& i)
-	{
-		gui_log.trace("Loading savestate dir: %s", game_data[i]->title_id);
-
-		if (!LoadSavestateFolderToDB(std::move(game_data[i])))
-		{
-			// TODO: add a way of showing the number of corrupted/invalid savestates in UI somewhere.
-			gui_log.error("Error occurred while parsing folder %s for savestates.", game_data[i]->title_id);
-			error_count++;
-		}
-	}));
-
-	progress_dialog.exec();
-
-	future_watcher.waitForFinished();
-
-	if (error_count != 0)
-	{
-		gui_log.error("Failed to load %d of %d savestates!", error_count.load(), count);
-	}
-}
-
-void savestate_manager_dialog::PopulateGameTable()
-{
-	WaitAndAbortGameRepaintThreads();
-
-	m_game_table->setSortingEnabled(false); // Disable sorting before using setItem calls
-	m_game_table->clearContents();
-	m_game_table->setRowCount(static_cast<int>(m_savestate_db.size()));
-
-	m_game_combo->clear();
-	m_game_combo->blockSignals(true);
-
-	qRegisterMetaType<QVector<int>>("QVector<int>");
-	QList<int> indices;
-	for (usz i = 0; i < m_savestate_db.size(); ++i)
-		indices.append(static_cast<int>(i));
-
-	QPixmap placeholder(m_game_icon_size);
-	placeholder.fill(Qt::transparent);
-
-	for (int i = 0; i < indices.count(); ++i)
-	{
-		const QString name = QString::fromStdString(m_savestate_db[i]->game_name).simplified();
-		const quint64 savestate_count = m_savestate_db[i]->savestates.size();
-
-		custom_table_widget_item* icon_item = new custom_table_widget_item;
-		icon_item->setData(Qt::DecorationRole, placeholder);
-		icon_item->setData(GameUserRole::GameIndex, i);
-		icon_item->setData(GameUserRole::GamePixmapLoaded, false);
-		icon_item->setData(GameUserRole::GamePixmap, QPixmap());
-
-		m_game_table->setItem(i, static_cast<int>(gui::savestate_game_list_columns::icon), icon_item);
-		m_game_table->setItem(i, static_cast<int>(gui::savestate_game_list_columns::name), new custom_table_widget_item(name));
-		m_game_table->setItem(i, static_cast<int>(gui::savestate_game_list_columns::savestates), new custom_table_widget_item(QString::number(savestate_count), Qt::UserRole, savestate_count));
-
-		m_game_combo->addItem(name, i);
-	}
-
-	m_game_combo->model()->sort(0, Qt::AscendingOrder);
-	m_game_combo->blockSignals(false);
-	m_game_combo->setCurrentIndex(0);
-
-	m_game_table->setSortingEnabled(true); // Enable sorting only after using setItem calls
-
-	ResizeGameIcons();
-
-	gui::utils::resize_combo_box_view(m_game_combo);
-}
-
-void savestate_manager_dialog::PopulateSavestateTable()
-{
-	if (m_game_combo->count() <= 0)
-		return;
-
-	const auto& data = m_savestate_db[m_game_combo->currentData().toInt()];
-	ensure(!!data);
-
-	gui_log.trace("Populating Savestate Manager UI with %s %s", data->game_name, data->dir_path);
-
-	const std::vector<savestate_data>& savestates = data->savestates;
-
-	m_savestate_table->clear_list();
-	m_savestate_table->setRowCount(static_cast<int>(savestates.size()));
-	m_savestate_table->setSortingEnabled(false); // Disable sorting before using setItem calls
-
-	const QLocale locale{};
-
-	for (int i = 0; i < static_cast<int>(savestates.size()); i++)
-	{
-		const savestate_data& savestate = savestates[i];
-		m_savestate_table->setItem(i, static_cast<int>(gui::savestate_list_columns::name), new custom_table_widget_item(savestate.name));
-		m_savestate_table->setItem(i, static_cast<int>(gui::savestate_list_columns::compatible), new custom_table_widget_item(savestate.is_compatible ? tr("Compatible") : tr("Not compatible"), Qt::UserRole, savestate.is_compatible));
-		m_savestate_table->setItem(i, static_cast<int>(gui::savestate_list_columns::date), new custom_table_widget_item(savestate.date.toString(), Qt::UserRole, savestate.date));
-		m_savestate_table->setItem(i, static_cast<int>(gui::savestate_list_columns::path), new custom_table_widget_item(savestate.path));
-	}
-
-	m_savestate_table->setSortingEnabled(true); // Re-enable sorting after using setItem calls
-}
-
-void savestate_manager_dialog::ReadjustGameTable() const
-{
-	// Fixate vertical header and row height
-	m_game_table->verticalHeader()->setDefaultSectionSize(m_game_icon_size.height());
-	m_game_table->verticalHeader()->setMinimumSectionSize(m_game_icon_size.height());
-	m_game_table->verticalHeader()->setMaximumSectionSize(m_game_icon_size.height());
-
-	// Resize and fixate icon column
-	m_game_table->resizeColumnToContents(static_cast<int>(gui::savestate_game_list_columns::icon));
-	m_game_table->horizontalHeader()->setSectionResizeMode(static_cast<int>(gui::savestate_game_list_columns::icon), QHeaderView::Fixed);
-
-	// Shorten the last section to remove horizontal scrollbar if possible
-	m_game_table->resizeColumnToContents(static_cast<int>(gui::savestate_game_list_columns::count) - 1);
-}
-
-void savestate_manager_dialog::ReadjustSavestateTable() const
-{
-	// Fixate vertical header and row height
-	m_savestate_table->resizeRowsToContents();
-
-	// Shorten the last section to remove horizontal scrollbar if possible
-	m_savestate_table->resizeColumnToContents(static_cast<int>(gui::savestate_list_columns::count) - 1);
-}
-
-bool savestate_manager_dialog::eventFilter(QObject *object, QEvent *event)
-{
-	const bool is_savestate_scroll = object == m_savestate_table->verticalScrollBar();
-	const bool is_savestate_table  = object == m_savestate_table;
-	const bool is_game_scroll      = object == m_game_table->verticalScrollBar();
-	const bool is_game_table       = object == m_game_table;
-	int zoom_val = 0;
-
-	switch (event->type())
-	{
-	case QEvent::Wheel:
-	{
-		QWheelEvent *wheelEvent = static_cast<QWheelEvent *>(event);
-
-		if (wheelEvent->modifiers() & Qt::ControlModifier && (is_savestate_scroll || is_game_scroll))
-		{
-			const QPoint numSteps = wheelEvent->angleDelta() / 8 / 15; // http://doc.qt.io/qt-5/qwheelevent.html#pixelDelta
-			zoom_val = numSteps.y();
-		}
-		break;
-	}
-	case QEvent::KeyPress:
-	{
-		QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
-
-		if (keyEvent && keyEvent->modifiers() == Qt::ControlModifier && (is_savestate_table || is_game_table))
-		{
-			if (keyEvent->key() == Qt::Key_Plus)
-			{
-				zoom_val = 1;
-			}
-			else if (keyEvent->key() == Qt::Key_Minus)
-			{
-				zoom_val = -1;
-			}
-		}
-		break;
-	}
-	default:
-		break;
-	}
-
-	if (zoom_val != 0)
-	{
-		if (m_game_icon_slider && (is_game_table || is_game_scroll))
-		{
-			m_save_game_icon_size = true;
-			m_game_icon_slider->setSliderPosition(zoom_val + m_game_icon_slider->value());
-		}
-		return true;
-	}
-
-	return QWidget::eventFilter(object, event);
-}
-
-void savestate_manager_dialog::closeEvent(QCloseEvent *event)
-{
-	// Save gui settings
-	m_gui_settings->SetValue(gui::ss_geometry, saveGeometry(), false);
-	m_gui_settings->SetValue(gui::ss_splitterState, m_splitter->saveState(), false);
-	m_gui_settings->SetValue(gui::ss_games_state, m_game_table->horizontalHeader()->saveState(), false);
-	m_gui_settings->SetValue(gui::ss_savestate_state, m_savestate_table->horizontalHeader()->saveState(), true);
-
-	QWidget::closeEvent(event);
-}
-
-void savestate_manager_dialog::WaitAndAbortGameRepaintThreads()
-{
-	for (int i = 0; i < m_game_table->rowCount(); i++)
-	{
-		if (movie_item* item = static_cast<movie_item*>(m_game_table->item(i, static_cast<int>(gui::savestate_game_list_columns::icon))))
-		{
-			item->wait_for_icon_loading(true);
-		}
-	}
-}
diff --git a/rpcs3/rpcs3qt/savestate_manager_dialog.h b/rpcs3/rpcs3qt/savestate_manager_dialog.h
deleted file mode 100644
index 950fede559..0000000000
--- a/rpcs3/rpcs3qt/savestate_manager_dialog.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#pragma once
-
-#include "gui_game_info.h"
-
-#include <QWidget>
-#include <QComboBox>
-#include <QSplitter>
-
-#include <mutex>
-
-class game_list;
-class gui_settings;
-
-class savestate_manager_dialog : public QWidget
-{
-	Q_OBJECT
-
-public:
-	explicit savestate_manager_dialog(std::shared_ptr<gui_settings> gui_settings, const std::vector<game_info>& games);
-	~savestate_manager_dialog() override;
-	void RepaintUI(bool restore_layout = true);
-
-public Q_SLOTS:
-	void HandleRepaintUiRequest();
-
-private Q_SLOTS:
-	void ResizeGameIcons();
-	void ShowSavestateTableContextMenu(const QPoint& pos);
-	void ShowGameTableContextMenu(const QPoint& pos);
-
-Q_SIGNALS:
-	void GameIconReady(int index, const QPixmap& pixmap);
-	void RequestBoot(const std::string& path);
-
-private:
-	struct savestate_data
-	{
-		QString name;
-		QString path;
-		QDateTime date;
-		bool is_compatible = false;
-	};
-
-	struct game_savestates_data
-	{
-		std::vector<savestate_data> savestates;
-		std::string title_id;
-		std::string game_name;
-		std::string game_icon_path;
-		std::string dir_path;
-	};
-
-	bool LoadSavestateFolderToDB(std::unique_ptr<game_savestates_data>&& game_savestates);
-	void StartSavestateLoadThreads();
-
-	void PopulateGameTable();
-	void PopulateSavestateTable();
-
-	void ReadjustGameTable() const;
-	void ReadjustSavestateTable() const;
-
-	void WaitAndAbortGameRepaintThreads();
-
-	void closeEvent(QCloseEvent *event) override;
-	bool eventFilter(QObject *object, QEvent *event) override;
-
-	std::shared_ptr<gui_settings> m_gui_settings;
-
-	std::vector<game_info> m_game_info;
-	std::vector<std::unique_ptr<game_savestates_data>> m_savestate_db; //! Holds all the savestate information.
-	std::mutex m_savestate_db_mtx;
-	QComboBox* m_game_combo; //! Lets you choose a game
-	QSplitter* m_splitter; //! Contains the game and savestate tables
-	game_list* m_savestate_table; //! UI element to display savestate stuff.
-	game_list* m_game_table; //! UI element to display games.
-
-	QList<QAction*> m_savestate_column_acts;
-	QList<QAction*> m_game_column_acts;
-
-	int m_game_icon_size_index = 25;
-	QSize m_game_icon_size = QSize(m_game_icon_size_index, m_game_icon_size_index);
-	bool m_save_game_icon_size = false;
-	QSlider* m_game_icon_slider = nullptr;
-	QColor m_game_icon_color;
-};
diff --git a/rpcs3/rpcs3qt/screenshot_item.cpp b/rpcs3/rpcs3qt/screenshot_item.cpp
deleted file mode 100644
index d0916f7114..0000000000
--- a/rpcs3/rpcs3qt/screenshot_item.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "screenshot_item.h"
-#include "qt_utils.h"
-
-#include <QVBoxLayout>
-
-screenshot_item::screenshot_item(QWidget* parent)
-	: flow_widget_item(parent)
-{
-	cb_on_first_visibility = [this]()
-	{
-		m_thread.reset(QThread::create([this]()
-		{
-			const QPixmap pixmap = gui::utils::get_centered_pixmap(icon_path, icon_size, 0, 0, 1.0, Qt::SmoothTransformation);
-			Q_EMIT signal_icon_update(pixmap);
-		}));
-		m_thread->start();
-	};
-
-	label = new QLabel(this);
-	QVBoxLayout* layout = new QVBoxLayout(this);
-	layout->setContentsMargins(0, 0, 0, 0);
-	layout->addWidget(label);
-	setLayout(layout);
-}
-
-screenshot_item::~screenshot_item()
-{
-	if (m_thread && m_thread->isRunning())
-	{
-		m_thread->wait();
-	}
-}
diff --git a/rpcs3/rpcs3qt/screenshot_item.h b/rpcs3/rpcs3qt/screenshot_item.h
deleted file mode 100644
index 36f0232b1f..0000000000
--- a/rpcs3/rpcs3qt/screenshot_item.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "flow_widget_item.h"
-#include <QLabel>
-#include <QThread>
-
-class screenshot_item : public flow_widget_item
-{
-	Q_OBJECT
-
-public:
-	screenshot_item(QWidget* parent);
-	virtual ~screenshot_item();
-
-	QString icon_path;
-	QSize icon_size;
-	QLabel* label{};
-
-private:
-	std::unique_ptr<QThread> m_thread;
-
-Q_SIGNALS:
-	void signal_icon_update(const QPixmap& pixmap);
-};
diff --git a/rpcs3/rpcs3qt/screenshot_manager_dialog.cpp b/rpcs3/rpcs3qt/screenshot_manager_dialog.cpp
index 3825dfd747..94ea7ec571 100644
--- a/rpcs3/rpcs3qt/screenshot_manager_dialog.cpp
+++ b/rpcs3/rpcs3qt/screenshot_manager_dialog.cpp
@@ -1,39 +1,71 @@
-#include "stdafx.h"
 #include "screenshot_manager_dialog.h"
 #include "screenshot_preview.h"
-#include "screenshot_item.h"
-#include "flow_widget.h"
 #include "qt_utils.h"
 #include "Utilities/File.h"
+#include "Emu/VFS.h"
 #include "Emu/system_utils.hpp"
 
 #include <QApplication>
 #include <QDir>
 #include <QDirIterator>
+#include <QListWidget>
 #include <QScreen>
+#include <QScrollBar>
 #include <QVBoxLayout>
 #include <QtConcurrent>
 
-LOG_CHANNEL(gui_log, "GUI");
-
 screenshot_manager_dialog::screenshot_manager_dialog(QWidget* parent) : QDialog(parent)
 {
 	setWindowTitle(tr("Screenshots"));
 	setAttribute(Qt::WA_DeleteOnClose);
 
 	m_icon_size = QSize(160, 90);
-	m_flow_widget = new flow_widget(this);
-	m_flow_widget->setObjectName("flow_widget");
 
-	m_placeholder = QPixmap(m_icon_size);
-	m_placeholder.fill(Qt::gray);
+	m_grid = new QListWidget(this);
+	m_grid->setViewMode(QListWidget::IconMode);
+	m_grid->setMovement(QListWidget::Static);
+	m_grid->setResizeMode(QListWidget::Adjust);
+	m_grid->setIconSize(m_icon_size);
+	m_grid->setGridSize(m_icon_size + QSize(10, 10));
 
-	connect(this, &screenshot_manager_dialog::signal_icon_preview, this, &screenshot_manager_dialog::show_preview);
-	connect(this, &screenshot_manager_dialog::signal_entry_parsed, this, &screenshot_manager_dialog::add_entry);
+	// HACK: dev_hdd0 must be mounted for vfs to work for loading trophies.
+	vfs::mount("/dev_hdd0", rpcs3::utils::get_hdd0_dir());
+
+	const std::string screenshot_path_qt   = fs::get_config_dir() + "screenshots/";
+	const std::string screenshot_path_cell = vfs::get("/dev_hdd0/photo/");
+	const QStringList filter{ QStringLiteral("*.png") };
+
+	QPixmap placeholder(m_icon_size);
+	placeholder.fill(Qt::gray);
+	m_placeholder = QIcon(placeholder);
+
+	for (const std::string& path : { screenshot_path_qt, screenshot_path_cell })
+	{
+		QDirIterator dir_iter(QString::fromStdString(path), filter, QDir::Files | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+
+		while (dir_iter.hasNext())
+		{
+			const QString filepath = dir_iter.next();
+
+			QListWidgetItem* item = new QListWidgetItem;
+			item->setData(item_role::source, filepath);
+			item->setData(item_role::loaded, false);
+			item->setIcon(m_placeholder);
+			item->setToolTip(filepath);
+
+			m_grid->addItem(item);
+		}
+	}
+
+	m_icon_loader = new QFutureWatcher<thumbnail>(this);
+	connect(m_icon_loader, &QFutureWatcher<QIcon>::resultReadyAt, this, &screenshot_manager_dialog::update_icon);
+
+	connect(m_grid, &QListWidget::itemDoubleClicked, this, &screenshot_manager_dialog::show_preview);
+	connect(m_grid->verticalScrollBar(), &QScrollBar::valueChanged, this, &screenshot_manager_dialog::update_icons);
 
 	QVBoxLayout* layout = new QVBoxLayout;
 	layout->setContentsMargins(0, 0, 0, 0);
-	layout->addWidget(m_flow_widget);
+	layout->addWidget(m_grid);
 	setLayout(layout);
 
 	resize(QGuiApplication::primaryScreen()->availableSize() * 3 / 5);
@@ -41,99 +73,86 @@ screenshot_manager_dialog::screenshot_manager_dialog(QWidget* parent) : QDialog(
 
 screenshot_manager_dialog::~screenshot_manager_dialog()
 {
-	m_abort_parsing = true;
-	gui::utils::stop_future_watcher(m_parsing_watcher, true);
+	m_icon_loader->cancel();
+	m_icon_loader->waitForFinished();
 }
 
-void screenshot_manager_dialog::add_entry(const QString& path)
+void screenshot_manager_dialog::show_preview(QListWidgetItem* item)
 {
-	screenshot_item* item = new screenshot_item(m_flow_widget);
-	ensure(item->label);
-	item->setToolTip(path);
-	item->installEventFilter(this);
-	item->label->setPixmap(m_placeholder);
-	item->icon_path = path;
-	item->icon_size = m_icon_size;
-	connect(item, &screenshot_item::signal_icon_update, this, &screenshot_manager_dialog::update_icon);
+	if (!item)
+	{
+		return;
+	}
 
-	m_flow_widget->add_widget(item);
-}
+	const QString filepath = item->data(Qt::UserRole).toString();
 
-void screenshot_manager_dialog::show_preview(const QString& path)
-{
-	screenshot_preview* preview = new screenshot_preview(path);
+	screenshot_preview* preview = new screenshot_preview(filepath);
 	preview->show();
 }
 
-void screenshot_manager_dialog::update_icon(const QPixmap& pixmap)
+void screenshot_manager_dialog::update_icon(int index) const
 {
-	if (screenshot_item* item = static_cast<screenshot_item*>(QObject::sender()))
+	const thumbnail tn = m_icon_loader->resultAt(index);
+
+	if (QListWidgetItem* item = m_grid->item(tn.index))
 	{
-		if (item->label)
-		{
-			item->label->setPixmap(pixmap);
-		}
+		item->setIcon(tn.icon);
+		item->setData(item_role::loaded, true);
 	}
 }
 
-void screenshot_manager_dialog::reload()
+void screenshot_manager_dialog::update_icons(int value)
 {
-	m_abort_parsing = true;
-	gui::utils::stop_future_watcher(m_parsing_watcher, true);
+	const QRect visible_rect = rect();
 
-	const std::string screenshot_path_qt   = fs::get_config_dir() + "screenshots/";
-	const std::string screenshot_path_cell = rpcs3::utils::get_hdd0_dir() + "/photo/";
+	QList<thumbnail> thumbnails_to_load;
 
-	m_flow_widget->clear();
-	m_abort_parsing = false;
-	m_parsing_watcher.setFuture(QtConcurrent::map(m_parsing_threads, [this, screenshot_path_qt, screenshot_path_cell](int index)
+	const bool forward = value >= m_scrollbar_value;
+	m_scrollbar_value  = value;
+
+	const int first = forward ? 0 : (m_grid->count() - 1);
+	const int last  = forward ? (m_grid->count() - 1) : 0;
+
+	for (int i = first; forward ? i <= last : i >= last; forward ? ++i : --i)
 	{
-		if (index != 0)
+		if (QListWidgetItem* item = m_grid->item(i))
 		{
-			return;
-		}
+			const bool is_loaded  = item->data(item_role::loaded).toBool();
+			const bool is_visible = visible_rect.intersects(m_grid->visualItemRect(item));
 
-		const QStringList filter{ QStringLiteral("*.png") };
-
-		for (const std::string& path : { screenshot_path_qt, screenshot_path_cell })
-		{
-			if (m_abort_parsing)
+			if (is_visible)
 			{
-				return;
+				if (!is_loaded)
+				{
+					thumbnails_to_load.push_back({ QIcon(), item->data(item_role::source).toString() , i });
+				}
 			}
-
-			if (path.empty())
+			else if (is_loaded)
 			{
-				gui_log.error("Screenshot manager: Trying to load screenshots from empty path!");
-				continue;
+				item->setIcon(m_placeholder);
+				item->setData(item_role::loaded, false);
 			}
-
-			QDirIterator dir_iter(QString::fromStdString(path), filter, QDir::Files | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
-
-			while (dir_iter.hasNext() && !m_abort_parsing)
-			{
-				Q_EMIT signal_entry_parsed(dir_iter.next());
-			}
-		}
-	}));
-}
-
-void screenshot_manager_dialog::showEvent(QShowEvent* event)
-{
-	QDialog::showEvent(event);
-	reload();
-}
-
-bool screenshot_manager_dialog::eventFilter(QObject* watched, QEvent* event)
-{
-	if (event && event->type() == QEvent::MouseButtonDblClick && static_cast<QMouseEvent*>(event)->button() == Qt::LeftButton)
-	{
-		if (screenshot_item* item = static_cast<screenshot_item*>(watched))
-		{
-			Q_EMIT signal_icon_preview(item->icon_path);
-			return true;
 		}
 	}
 
-	return false;
+	if (m_icon_loader->isRunning())
+	{
+		m_icon_loader->cancel();
+		m_icon_loader->waitForFinished();
+	}
+
+	const std::function<thumbnail(thumbnail)> load = [icon_size = m_icon_size](thumbnail tn) -> thumbnail
+	{
+		const QPixmap pixmap(tn.path);
+		tn.icon = QIcon(pixmap.scaled(icon_size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+		return tn;
+	};
+
+	m_icon_loader->setFuture(QtConcurrent::mapped(thumbnails_to_load, load));
+}
+
+void screenshot_manager_dialog::resizeEvent(QResizeEvent* event)
+{
+	QDialog::resizeEvent(event);
+	update_icons(m_scrollbar_value);
 }
diff --git a/rpcs3/rpcs3qt/screenshot_manager_dialog.h b/rpcs3/rpcs3qt/screenshot_manager_dialog.h
index ab4d7c13a8..842095f725 100644
--- a/rpcs3/rpcs3qt/screenshot_manager_dialog.h
+++ b/rpcs3/rpcs3qt/screenshot_manager_dialog.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include "flow_widget.h"
-
 #include <QDialog>
 #include <QFutureWatcher>
-#include <QPixmap>
+#include <QIcon>
 #include <QSize>
-#include <QEvent>
-#include <array>
+
+class QListWidget;
+class QListWidgetItem;
 
 class screenshot_manager_dialog : public QDialog
 {
@@ -17,30 +16,38 @@ public:
 	screenshot_manager_dialog(QWidget* parent = nullptr);
 	~screenshot_manager_dialog();
 
-	bool eventFilter(QObject* watched, QEvent* event) override;
-
-Q_SIGNALS:
-	void signal_entry_parsed(const QString& path);
-	void signal_icon_preview(const QString& path);
-
-public Q_SLOTS:
-	void update_icon(const QPixmap& pixmap);
+protected:
+	void resizeEvent(QResizeEvent* event) override;
 
 private Q_SLOTS:
-	void add_entry(const QString& path);
-	void show_preview(const QString& path);
+	void update_icon(int index) const;
 
-protected:
-	void showEvent(QShowEvent* event) override;
+Q_SIGNALS:
+	void signal_icon_change(int index, const QString& path);
 
 private:
-	void reload();
+	static void show_preview(QListWidgetItem* item);
+	void update_icons(int value);
 
-	bool m_abort_parsing = false;
-	const std::array<int, 1> m_parsing_threads{0};
-	QFutureWatcher<void> m_parsing_watcher;
-	flow_widget* m_flow_widget = nullptr;
+	enum item_role
+	{
+		source = Qt::UserRole,
+		loaded = Qt::UserRole + 1,
+	};
+
+	struct thumbnail
+	{
+		QIcon icon;
+		QString path;
+		int index = 0;
+	};
+
+	QListWidget* m_grid = nullptr;
+
+	QFutureWatcher<thumbnail>* m_icon_loader;
 
 	QSize m_icon_size;
-	QPixmap m_placeholder;
+	QIcon m_placeholder;
+
+	int m_scrollbar_value = 0;
 };
diff --git a/rpcs3/rpcs3qt/screenshot_preview.cpp b/rpcs3/rpcs3qt/screenshot_preview.cpp
index 1c1c89b306..fa239efb19 100644
--- a/rpcs3/rpcs3qt/screenshot_preview.cpp
+++ b/rpcs3/rpcs3qt/screenshot_preview.cpp
@@ -21,7 +21,6 @@ screenshot_preview::screenshot_preview(const QString& filepath, QWidget* parent)
 	setWindowTitle(tr("Screenshot Viewer"));
 	setObjectName("screenshot_preview");
 	setContextMenuPolicy(Qt::CustomContextMenu);
-	setAttribute(Qt::WA_DeleteOnClose);
 	setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 	setPixmap(QPixmap::fromImage(m_image));
 	setMinimumSize(160, 90);
@@ -29,7 +28,7 @@ screenshot_preview::screenshot_preview(const QString& filepath, QWidget* parent)
 	connect(this, &screenshot_preview::customContextMenuRequested, this, &screenshot_preview::show_context_menu);
 }
 
-void screenshot_preview::show_context_menu(const QPoint& pos)
+void screenshot_preview::show_context_menu(const QPoint & pos)
 {
 	QMenu* menu = new QMenu();
 	menu->addAction(tr("&Copy"), [this]() { QGuiApplication::clipboard()->setImage(m_image); });
diff --git a/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp b/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp
deleted file mode 100644
index 75477b3fbb..0000000000
--- a/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QMessageBox>
-#include <QTimer>
-
-#include "sendmessage_dialog_frame.h"
-#include "Emu/IdManager.h"
-#include "Emu/NP/rpcn_client.h"
-#include "Emu/System.h"
-
-#include "util/logs.hpp"
-
-LOG_CHANNEL(sendmessage_dlg_log, "sendmessage dlg");
-
-void sendmessage_friend_callback(void* param, rpcn::NotificationType ntype, const std::string& username, bool status)
-{
-	auto* dlg = static_cast<sendmessage_dialog_frame*>(param);
-	dlg->callback_handler(ntype, username, status);
-}
-
-sendmessage_dialog_frame::~sendmessage_dialog_frame()
-{
-	if (m_dialog)
-	{
-		m_dialog->deleteLater();
-	}
-}
-
-error_code sendmessage_dialog_frame::Exec(message_data& msg_data, std::set<std::string>& npids)
-{
-	if (m_dialog)
-	{
-		m_dialog->close();
-		delete m_dialog;
-	}
-
-	m_dialog = new custom_dialog(false);
-	m_dialog->setModal(true);
-
-	m_dialog->setWindowTitle(tr("Choose friend to message:"));
-
-	m_rpcn = rpcn::rpcn_client::get_instance(0, true);
-
-	QVBoxLayout* vbox_global = new QVBoxLayout();
-
-	m_lst_friends = new QListWidget();
-	vbox_global->addWidget(m_lst_friends);
-
-	QHBoxLayout* hbox_btns = new QHBoxLayout();
-	hbox_btns->addStretch();
-	QPushButton* btn_ok     = new QPushButton(tr("Ok"));
-	QPushButton* btn_cancel = new QPushButton(tr("Cancel"));
-	hbox_btns->addWidget(btn_ok);
-	hbox_btns->addWidget(btn_cancel);
-	vbox_global->addLayout(hbox_btns);
-
-	m_dialog->setLayout(vbox_global);
-
-	connect(this, &sendmessage_dialog_frame::signal_add_friend, this, &sendmessage_dialog_frame::slot_add_friend);
-	connect(this, &sendmessage_dialog_frame::signal_remove_friend, this, &sendmessage_dialog_frame::slot_remove_friend);
-
-	error_code result = CELL_CANCEL;
-
-	connect(btn_ok, &QAbstractButton::clicked, this, [this, &msg_data, &npids, &result]()
-		{
-			// Check one target is selected
-			auto selected = m_lst_friends->selectedItems();
-			if (selected.empty())
-			{
-				QMessageBox::critical(m_dialog, tr("Error sending a message!"), tr("You must select a friend!"), QMessageBox::Ok);
-				return;
-			}
-
-			npids.insert(selected[0]->text().toStdString());
-
-			// Send the message
-			if (m_rpcn->send_message(msg_data, npids))
-			{
-				result = CELL_OK;
-			}
-			m_dialog->close();
-		});
-
-	connect(btn_cancel, &QAbstractButton::clicked, m_dialog, &custom_dialog::close);
-
-	rpcn::friend_data data;
-	m_rpcn->get_friends_and_register_cb(data, sendmessage_friend_callback, this);
-
-	for (const auto& fr : data.friends)
-	{
-		// Only add online friends to the list
-		if (fr.second.online)
-		{
-			add_friend(m_lst_friends, QString::fromStdString(fr.first));
-		}
-	}
-
-	auto& nps = g_fxo->get<np_state>();
-
-	QTimer timer;
-	connect(&timer, &QTimer::timeout, this, [this, &nps, &timer]()
-	{
-		bool abort = Emu.IsStopped();
-
-		if (!abort && nps.abort_gui_flag.exchange(false))
-		{
-			sendmessage_dlg_log.warning("Aborted by sceNp!");
-			abort = true;
-		}
-
-		if (abort)
-		{
-			if (m_dialog)
-			{
-				m_dialog->close();
-			}
-
-			timer.stop();
-		}
-	});
-	timer.start(10ms);
-
-	m_dialog->exec();
-
-	m_rpcn->remove_friend_cb(sendmessage_friend_callback, this);
-
-	return result;
-}
-
-void sendmessage_dialog_frame::add_friend(QListWidget* list, const QString& name)
-{
-	if (auto found = list->findItems(name, Qt::MatchExactly); !found.empty())
-	{
-		return;
-	}
-
-	list->addItem(new QListWidgetItem(name));
-}
-
-void sendmessage_dialog_frame::remove_friend(QListWidget* list, const QString& name)
-{
-	if (auto found = list->findItems(name, Qt::MatchExactly); !found.empty())
-	{
-		delete list->takeItem(list->row(found[0]));
-	}
-}
-
-void sendmessage_dialog_frame::slot_add_friend(QString name)
-{
-	add_friend(m_lst_friends, name);
-}
-
-void sendmessage_dialog_frame::slot_remove_friend(QString name)
-{
-	remove_friend(m_lst_friends, name);
-}
-
-void sendmessage_dialog_frame::callback_handler(rpcn::NotificationType ntype, const std::string& username, bool status)
-{
-	QString qtr_username = QString::fromStdString(username);
-	switch (ntype)
-	{
-	case rpcn::NotificationType::FriendQuery: // Other user sent a friend request
-	case rpcn::NotificationType::FriendPresenceChanged:
-		break;
-	case rpcn::NotificationType::FriendNew: // Add a friend to the friendlist(either accepted a friend request or friend accepted it)
-	{
-		if (status)
-		{
-			Q_EMIT signal_add_friend(qtr_username);
-		}
-		break;
-	}
-	case rpcn::NotificationType::FriendLost: // Remove friend from the friendlist(user removed friend or friend removed friend)
-	{
-		Q_EMIT signal_remove_friend(qtr_username);
-		break;
-	}
-	case rpcn::NotificationType::FriendStatus: // Set status of friend to Offline or Online
-	{
-		if (status)
-		{
-			Q_EMIT signal_add_friend(qtr_username);
-		}
-		else
-		{
-			Q_EMIT signal_remove_friend(qtr_username);
-		}
-		break;
-	}
-	default:
-	{
-		sendmessage_dlg_log.fatal("An unhandled notification type was received by the sendmessage dialog callback!");
-		break;
-	}
-	}
-}
diff --git a/rpcs3/rpcs3qt/sendmessage_dialog_frame.h b/rpcs3/rpcs3qt/sendmessage_dialog_frame.h
deleted file mode 100644
index d4aad5cd5d..0000000000
--- a/rpcs3/rpcs3qt/sendmessage_dialog_frame.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include <QObject>
-#include <QListWidget>
-
-#include "util/types.hpp"
-#include "custom_dialog.h"
-
-#include "Emu/Cell/Modules/sceNp.h"
-
-class sendmessage_dialog_frame : public QObject, public SendMessageDialogBase
-{
-	Q_OBJECT
-
-public:
-	sendmessage_dialog_frame() = default;
-	~sendmessage_dialog_frame();
-	error_code Exec(message_data& msg_data, std::set<std::string>& npids) override;
-	void callback_handler(rpcn::NotificationType ntype, const std::string& username, bool status) override;
-
-private:
-	void add_friend(QListWidget* list, const QString& name);
-	void remove_friend(QListWidget* list, const QString& name);
-
-private:
-	custom_dialog* m_dialog = nullptr;
-	QListWidget* m_lst_friends = nullptr;
-
-Q_SIGNALS:
-	void signal_add_friend(QString name);
-	void signal_remove_friend(QString name);
-
-private Q_SLOTS:
-	void slot_add_friend(QString name);
-	void slot_remove_friend(QString name);
-};
diff --git a/rpcs3/rpcs3qt/settings.cpp b/rpcs3/rpcs3qt/settings.cpp
index c87918d468..c10b76dabf 100644
--- a/rpcs3/rpcs3qt/settings.cpp
+++ b/rpcs3/rpcs3qt/settings.cpp
@@ -1,18 +1,17 @@
 #include "settings.h"
 
+#include "qt_utils.h"
+
 #include "Utilities/File.h"
 
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
+
 settings::settings(QObject* parent) : QObject(parent),
 	m_settings_dir(ComputeSettingsDir())
 {
 }
 
 settings::~settings()
-{
-	sync();
-}
-
-void settings::sync()
 {
 	if (m_settings)
 	{
@@ -30,24 +29,19 @@ QString settings::ComputeSettingsDir()
 	return QString::fromStdString(fs::get_config_dir()) + "/GuiConfigs/";
 }
 
-void settings::RemoveValue(const QString& key, const QString& name, bool sync) const
+void settings::RemoveValue(const QString& key, const QString& name) const
 {
 	if (m_settings)
 	{
 		m_settings->beginGroup(key);
 		m_settings->remove(name);
 		m_settings->endGroup();
-
-		if (sync)
-		{
-			m_settings->sync();
-		}
 	}
 }
 
-void settings::RemoveValue(const gui_save& entry, bool sync) const
+void settings::RemoveValue(const gui_save& entry) const
 {
-	RemoveValue(entry.key, entry.name, sync);
+	RemoveValue(entry.key, entry.name);
 }
 
 QVariant settings::GetValue(const QString& key, const QString& name, const QVariant& def) const
@@ -77,35 +71,30 @@ q_pair_list settings::Var2List(const QVariant& var)
 	return list;
 }
 
-void settings::SetValue(const gui_save& entry, const QVariant& value, bool sync) const
+void settings::SetValue(const gui_save& entry, const QVariant& value) const
 {
-	SetValue(entry.key, entry.name, value, sync);
+	if (m_settings)
+	{
+		m_settings->beginGroup(entry.key);
+		m_settings->setValue(entry.name, value);
+		m_settings->endGroup();
+	}
 }
 
-void settings::SetValue(const QString& key, const QVariant& value, bool sync) const
+void settings::SetValue(const QString& key, const QVariant& value) const
 {
 	if (m_settings)
 	{
 		m_settings->setValue(key, value);
-
-		if (sync)
-		{
-			m_settings->sync();
-		}
 	}
 }
 
-void settings::SetValue(const QString& key, const QString& name, const QVariant& value, bool sync) const
+void settings::SetValue(const QString& key, const QString& name, const QVariant& value) const
 {
 	if (m_settings)
 	{
 		m_settings->beginGroup(key);
 		m_settings->setValue(name, value);
 		m_settings->endGroup();
-
-		if (sync)
-		{
-			m_settings->sync();
-		}
 	}
 }
diff --git a/rpcs3/rpcs3qt/settings.h b/rpcs3/rpcs3qt/settings.h
index 8a7069d884..54083ee614 100644
--- a/rpcs3/rpcs3qt/settings.h
+++ b/rpcs3/rpcs3qt/settings.h
@@ -29,10 +29,8 @@ public:
 	explicit settings(QObject* parent = nullptr);
 	~settings();
 
-	void sync();
-
 	QString GetSettingsDir() const;
-
+	
 	QVariant GetValue(const QString& key, const QString& name, const QVariant& def) const;
 	QVariant GetValue(const gui_save& entry) const;
 	static QVariant List2Var(const q_pair_list& list);
@@ -40,13 +38,13 @@ public:
 
 public Q_SLOTS:
 	/** Remove entry */
-	void RemoveValue(const QString& key, const QString& name, bool sync = true) const;
-	void RemoveValue(const gui_save& entry, bool sync = true) const;
+	void RemoveValue(const QString& key, const QString& name) const;
+	void RemoveValue(const gui_save& entry) const;
 
 	/** Write value to entry */
-	void SetValue(const gui_save& entry, const QVariant& value, bool sync = true) const;
-	void SetValue(const QString& key, const QVariant& value, bool sync = true) const;
-	void SetValue(const QString& key, const QString& name, const QVariant& value, bool sync = true) const;
+	void SetValue(const gui_save& entry, const QVariant& value) const;
+	void SetValue(const QString& key, const QVariant& value) const;
+	void SetValue(const QString& key, const QString& name, const QVariant& value) const;
 
 protected:
 	static QString ComputeSettingsDir();
diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp
index 7ad9023f4e..6fca2baa0c 100644
--- a/rpcs3/rpcs3qt/settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/settings_dialog.cpp
@@ -1,6 +1,4 @@
 #include <QButtonGroup>
-#include <QCameraDevice>
-#include <QMediaDevices>
 #include <QDialogButtonBox>
 #include <QFontMetrics>
 #include <QPushButton>
@@ -11,11 +9,11 @@
 #include <QSpinBox>
 #include <QTimer>
 #include <QScreen>
-#include <QStyleFactory>
+#include <QUrl>
 
 #include "gui_settings.h"
+#include "display_sleep_control.h"
 #include "qt_utils.h"
-#include "uuid.h"
 #include "settings_dialog.h"
 #include "ui_settings_dialog.h"
 #include "tooltips.h"
@@ -23,18 +21,15 @@
 #include "emu_settings_type.h"
 #include "render_creator.h"
 #include "microphone_creator.h"
-#include "Emu/NP/rpcn_countries.h"
 
 #include "Emu/GameInfo.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"
 #include "Emu/title.h"
 
-#include "Emu/Audio/audio_device_enumerator.h"
-
-#include "Loader/PSF.h"
-
 #include <set>
+#include <unordered_set>
+#include <thread>
 
 #include "util/sysinfo.hpp"
 #include "util/asm.hpp"
@@ -45,49 +40,13 @@
 
 LOG_CHANNEL(cfg_log, "CFG");
 
-std::pair<QString, int> get_data(const QComboBox* box, int index)
-{
-	if (!box) return {};
-
-	const QVariantList var_list = box->itemData(index).toList();
-	ensure(var_list.size() == 2);
-	ensure(var_list[0].canConvert<QString>());
-	ensure(var_list[1].canConvert<int>());
-
-	return { var_list[0].toString(), var_list[1].toInt() };
-}
-
-int find_item(const QComboBox* box, int value)
-{
-	for (int i = 0; box && i < box->count(); i++)
-	{
-		if (get_data(box, i).second == value)
-		{
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-void remove_item(QComboBox* box, int data_value, int def_value)
-{
-	if (!box) return;
-
-	const int index = find_item(box, data_value);
-	const bool was_selected = index == box->currentIndex();
-
-	box->removeItem(index);
-
-	if (was_selected)
-	{
-		box->setCurrentIndex(find_item(box, def_value));
-	}
-}
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
+inline std::string sstr(const QVariant& _in) { return sstr(_in.toString()); }
+inline QString qsv(std::string_view sv) { return QString(sv.data()); }
 
 extern const std::map<std::string_view, int> g_prx_list;
 
-settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std::shared_ptr<emu_settings> emu_settings, int tab_index, QWidget* parent, const GameInfo* game, bool create_cfg_from_global_cfg)
+settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std::shared_ptr<emu_settings> emu_settings, const int& tab_index, QWidget *parent, const GameInfo* game)
 	: QDialog(parent)
 	, m_tab_index(tab_index)
 	, ui(new Ui::settings_dialog)
@@ -102,8 +61,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	if (!m_gui_settings->GetValue(gui::m_showDebugTab).toBool())
 	{
 		ui->tab_widget_settings->removeTab(9);
-		ui->audioDump->setVisible(false);
-		ui->audioDump->setChecked(false);
 		m_gui_settings->SetValue(gui::m_showDebugTab, false);
 	}
 	if (game)
@@ -132,8 +89,8 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 	if (game)
 	{
-		m_emu_settings->LoadSettings(game->serial, create_cfg_from_global_cfg);
-		setWindowTitle(tr("Settings: [%0] %1", "Settings dialog").arg(QString::fromStdString(game->serial)).arg(QString::fromStdString(game->name)));
+		m_emu_settings->LoadSettings(game->serial);
+		setWindowTitle(tr("Settings: [%0] %1", "Settings dialog").arg(qstr(game->serial)).arg(qstr(game->name)));
 	}
 	else
 	{
@@ -149,17 +106,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 	const auto apply_configs = [this, use_discord_old = m_use_discord, discord_state_old = m_discord_state, game](bool do_exit)
 	{
-		u32 selected_audio_formats = 0;
-		for (int i = 0; i < ui->list_audio_formats->count(); ++i)
-		{
-			const auto& item = ui->list_audio_formats->item(i);
-			if (item->checkState() != Qt::CheckState::Unchecked)
-			{
-				selected_audio_formats |= item->data(Qt::UserRole).toUInt();
-			}
-		}
-		m_emu_settings->SetSetting(emu_settings_type::AudioFormats, std::to_string(selected_audio_formats));
-
 		std::set<std::string> selected;
 		for (int i = 0; i < ui->lleList->count(); ++i)
 		{
@@ -167,7 +113,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 			if (item->checkState() != Qt::CheckState::Unchecked)
 			{
 				// suffix indicates forced HLE mode
-				selected.emplace(item->text().toStdString() + ":hle");
+				selected.emplace(sstr(item->text()) + ":hle");
 			}
 		}
 
@@ -177,7 +123,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 			if (item->checkState() != Qt::CheckState::Unchecked)
 			{
 				// suffix indicates forced LLE mode
-				selected.emplace(item->text().toStdString() + ":lle");
+				selected.emplace(sstr(item->text()) + ":lle");
 			}
 		}
 
@@ -193,8 +139,8 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		Q_EMIT EmuSettingsApplied();
 
 		// Discord Settings can be saved regardless of WITH_DISCORD_RPC
-		m_gui_settings->SetValue(gui::m_richPresence, m_use_discord, false);
-		m_gui_settings->SetValue(gui::m_discordState, m_discord_state, true);
+		m_gui_settings->SetValue(gui::m_richPresence, m_use_discord);
+		m_gui_settings->SetValue(gui::m_discordState, m_discord_state);
 
 #ifdef WITH_DISCORD_RPC
 		if (m_use_discord != use_discord_old)
@@ -202,7 +148,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 			if (m_use_discord)
 			{
 				discord::initialize();
-				discord::update_presence(m_discord_state.toStdString());
+				discord::update_presence(sstr(m_discord_state));
 			}
 			else
 			{
@@ -211,7 +157,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		}
 		else if (m_discord_state != discord_state_old && Emu.IsStopped())
 		{
-			discord::update_presence(m_discord_state.toStdString(), "Idle", false);
+			discord::update_presence(sstr(m_discord_state), "Idle", false);
 		}
 #endif
 
@@ -221,7 +167,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		}
 	};
 
-	connect(ui->buttonBox, &QDialogButtonBox::clicked, this, [apply_configs, this](QAbstractButton* button)
+	connect(ui->buttonBox, &QDialogButtonBox::clicked, [apply_configs, this](QAbstractButton* button)
 	{
 		if (button == ui->buttonBox->button(QDialogButtonBox::Save))
 		{
@@ -231,18 +177,11 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		{
 			apply_configs(false);
 		}
-		else if (button == ui->buttonBox->button(QDialogButtonBox::RestoreDefaults))
-		{
-			m_emu_settings->RestoreDefaults();
-
-			// Handle special restrictions after the settings were restored
-			Q_EMIT signal_restore_dependant_defaults();
-		}
 	});
 
 	connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QWidget::close);
 
-	connect(ui->tab_widget_settings, &QTabWidget::currentChanged, this, [this]()
+	connect(ui->tab_widget_settings, &QTabWidget::currentChanged, [this]()
 	{
 		ui->buttonBox->button(QDialogButtonBox::StandardButton::Close)->setFocus();
 	});
@@ -256,13 +195,23 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 	// Checkboxes
 
+	m_emu_settings->EnhanceCheckBox(ui->spuCache, emu_settings_type::SPUCache);
+	SubscribeTooltip(ui->spuCache, tooltips.settings.spu_cache);
+
+	m_emu_settings->EnhanceCheckBox(ui->lowerSPUThrPrio, emu_settings_type::LowerSPUThreadPrio);
+	SubscribeTooltip(ui->lowerSPUThrPrio, tooltips.settings.lower_spu_thread_priority);
+
 	m_emu_settings->EnhanceCheckBox(ui->spuLoopDetection, emu_settings_type::SPULoopDetection);
 	SubscribeTooltip(ui->spuLoopDetection, tooltips.settings.spu_loop_detection);
 
+	m_emu_settings->EnhanceCheckBox(ui->accurateXFloat, emu_settings_type::AccurateXFloat);
+	SubscribeTooltip(ui->accurateXFloat, tooltips.settings.accurate_xfloat);
+
+	m_emu_settings->EnhanceCheckBox(ui->fullWidthAVX512, emu_settings_type::FullWidthAVX512);
+	SubscribeTooltip(ui->fullWidthAVX512, tooltips.settings.full_width_avx512);
+	ui->fullWidthAVX512->setEnabled(utils::has_avx512());
+
 	// Comboboxes
-	m_emu_settings->EnhanceComboBox(ui->xfloatAccuracy, emu_settings_type::XFloatAccuracy);
-	SubscribeTooltip(ui->gb_xfloat_accuracy, tooltips.settings.xfloat);
-	remove_item(ui->xfloatAccuracy, static_cast<int>(xfloat_accuracy::inaccurate), static_cast<int>(g_cfg.core.spu_xfloat_accuracy.def));
 
 	m_emu_settings->EnhanceComboBox(ui->spuBlockSize, emu_settings_type::SPUBlockSize);
 	SubscribeTooltip(ui->gb_spuBlockSize, tooltips.settings.spu_block_size);
@@ -280,9 +229,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 			).arg(min_thread_count));
 	}
 	else
-	{
 		SubscribeTooltip(ui->gb_threadsched, tooltips.settings.enable_thread_scheduler);
-	}
 
 	m_emu_settings->EnhanceComboBox(ui->preferredSPUThreads, emu_settings_type::PreferredSPUThreads, true);
 	SubscribeTooltip(ui->gb_spu_threads, tooltips.settings.preferred_spu_threads);
@@ -293,48 +240,26 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		m_emu_settings->EnhanceComboBox(ui->enableTSX, emu_settings_type::EnableTSX);
 		SubscribeTooltip(ui->gb_tsx, tooltips.settings.enable_tsx);
 
-		if (!utils::has_mpx() || utils::has_tsx_force_abort())
-		{
-			remove_item(ui->enableTSX, static_cast<int>(tsx_usage::enabled), static_cast<int>(g_cfg.core.enable_TSX.def));
-		}
+		static const QString tsx_forced = qstr(fmt::format("%s", tsx_usage::forced));
+		static const QString tsx_default = qstr(m_emu_settings->GetSettingDefault(emu_settings_type::EnableTSX));
 
-		connect(ui->enableTSX, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index)
+		// connect the toogled signal so that the stateChanged signal in EnhanceCheckBox can be prevented
+		connect(ui->enableTSX, &QComboBox::currentTextChanged, [this](const QString& text)
 		{
-			if (index < 0) return;
-			if (const auto [text, value] = get_data(ui->enableTSX, index); value == static_cast<int>(tsx_usage::forced) &&
-				(!utils::has_mpx() || utils::has_tsx_force_abort()))
+			if (text == tsx_forced && !utils::has_mpx() && QMessageBox::No == QMessageBox::critical(this, tr("Haswell/Broadwell TSX Warning"), tr(
+				R"(
+					<p style="white-space: nowrap;">
+						RPCS3 has detected you are using TSX functions on a Haswell or Broadwell CPU.<br>
+						Intel has deactivated these functions in newer Microcode revisions, since they can lead to unpredicted behaviour.<br>
+						That means using TSX may break games or even <font color="red"><b>damage</b></font> your data.<br>
+						We recommend to disable this feature and update your computer BIOS.<br><br>
+						Do you wish to use TSX anyway?
+					</p>
+				)"
+			), QMessageBox::Yes, QMessageBox::No))
 			{
-				QString title;
-				QString message;
-				if (!utils::has_mpx())
-				{
-					title = tr("Haswell/Broadwell TSX Warning");
-					message = gui::utils::make_paragraph(tr(
-						"RPCS3 has detected that you are using TSX functions on a Haswell or Broadwell CPU.\n"
-						"Intel has deactivated these functions in newer Microcode revisions, since they can lead to unpredicted behaviour.\n"
-						"That means using TSX may break games or even <font color=\"red\"><b>damage</b></font> your data.\n"
-						"We recommend to disable this feature and update your computer BIOS.\n"
-						"\n"
-						"Do you wish to use TSX anyway?"
-					));
-				}
-				else
-				{
-					title = tr("TSX-FA Warning");
-					message = gui::utils::make_paragraph(tr(
-						"RPCS3 has detected your CPU only supports TSX-FA.\n"
-						"That means using TSX may break games or even <font color=\"red\"><b>damage</b></font> your data.\n"
-						"We recommend to disable this feature.\n"
-						"\n"
-						"Do you wish to use TSX anyway?"
-					));
-				}
-
-				if (QMessageBox::No == QMessageBox::critical(this, title, message, QMessageBox::Yes, QMessageBox::No))
-				{
-					// Reset if the messagebox was answered with no. This prevents the currentIndexChanged signal in EnhanceComboBox
-					ui->enableTSX->setCurrentIndex(find_item(ui->enableTSX, static_cast<int>(g_cfg.core.enable_TSX.def)));
-				}
+				// Reset if the messagebox was answered with no. This prevents the currentIndexChanged signal in EnhanceComboBox
+				ui->enableTSX->setCurrentText(tsx_default);
 			}
 		});
 	}
@@ -342,87 +267,52 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	{
 		ui->enableTSX->setEnabled(false);
 		ui->enableTSX->setPlaceholderText(tr("Not supported", "Enable TSX"));
-		SubscribeTooltip(ui->enableTSX, tr("Unfortunately, your CPU model does not support this instruction set.", "Enable TSX"));
+		SubscribeTooltip(ui->enableTSX, tr("Unfortunately your CPU model does not support this instruction set.", "Enable TSX"));
 
 		m_emu_settings->SetSetting(emu_settings_type::EnableTSX, fmt::format("%s", tsx_usage::disabled));
-		connect(this, &settings_dialog::signal_restore_dependant_defaults, [this]()
-		{
-			m_emu_settings->SetSetting(emu_settings_type::EnableTSX, fmt::format("%s", tsx_usage::disabled));
-		});
 	}
 
 	// PPU tool tips
-	SubscribeTooltip(ui->ppu__static, tooltips.settings.ppu__static);
+	SubscribeTooltip(ui->ppu_precise, tooltips.settings.ppu_precise);
+	SubscribeTooltip(ui->ppu_fast,    tooltips.settings.ppu_fast);
 	SubscribeTooltip(ui->ppu_llvm,    tooltips.settings.ppu_llvm);
 
 	QButtonGroup *ppu_bg = new QButtonGroup(this);
-	ppu_bg->addButton(ui->ppu__static, static_cast<int>(ppu_decoder_type::_static));
+	ppu_bg->addButton(ui->ppu_precise, static_cast<int>(ppu_decoder_type::precise));
+	ppu_bg->addButton(ui->ppu_fast,    static_cast<int>(ppu_decoder_type::fast));
 	ppu_bg->addButton(ui->ppu_llvm,    static_cast<int>(ppu_decoder_type::llvm));
 
-	connect(ppu_bg, &QButtonGroup::idToggled, [this](int id, bool checked)
-	{
-		if (!checked) return;
-
-		switch (id)
-		{
-		case static_cast<int>(ppu_decoder_type::_static):
-			ui->accuratePPUFPCC->setEnabled(true);
-			ui->accuratePPUNJ->setEnabled(true);
-			ui->accuratePPUVNAN->setEnabled(true);
-			break;
-		case static_cast<int>(ppu_decoder_type::llvm):
-			ui->accuratePPUFPCC->setEnabled(false);
-			ui->accuratePPUNJ->setEnabled(false);
-			ui->accuratePPUVNAN->setEnabled(false);
-			break;
-		default:
-			break;
-		}
-	});
-
 	m_emu_settings->EnhanceRadioButton(ppu_bg, emu_settings_type::PPUDecoder);
 
 	// SPU tool tips
-	SubscribeTooltip(ui->spu__static, tooltips.settings.spu__static);
-	SubscribeTooltip(ui->spu_dynamic, tooltips.settings.spu_dynamic);
+	SubscribeTooltip(ui->spu_precise, tooltips.settings.spu_precise);
+	SubscribeTooltip(ui->spu_fast,    tooltips.settings.spu_fast);
 	SubscribeTooltip(ui->spu_asmjit,  tooltips.settings.spu_asmjit);
 	SubscribeTooltip(ui->spu_llvm,    tooltips.settings.spu_llvm);
 
-	QButtonGroup* spu_bg = new QButtonGroup(this);
-	spu_bg->addButton(ui->spu__static, static_cast<int>(spu_decoder_type::_static));
-	spu_bg->addButton(ui->spu_dynamic, static_cast<int>(spu_decoder_type::dynamic));
+	QButtonGroup *spu_bg = new QButtonGroup(this);
+	spu_bg->addButton(ui->spu_precise, static_cast<int>(spu_decoder_type::precise));
+	spu_bg->addButton(ui->spu_fast,    static_cast<int>(spu_decoder_type::fast));
 	spu_bg->addButton(ui->spu_asmjit,  static_cast<int>(spu_decoder_type::asmjit));
 	spu_bg->addButton(ui->spu_llvm,    static_cast<int>(spu_decoder_type::llvm));
 
-#ifndef ARCH_X64
-	ui->spu_asmjit->setEnabled(false);
-#endif
+	m_emu_settings->EnhanceRadioButton(spu_bg, emu_settings_type::SPUDecoder);
 
-	connect(spu_bg, &QButtonGroup::idToggled, [this](int id, bool checked)
+	connect(ui->spu_llvm, &QAbstractButton::toggled, [this](bool checked)
 	{
-		if (!checked) return;
-
-		switch (id)
-		{
-		case static_cast<int>(spu_decoder_type::_static):
-		case static_cast<int>(spu_decoder_type::dynamic):
-		case static_cast<int>(spu_decoder_type::llvm):
-			ui->xfloatAccuracy->setEnabled(true);
-			break;
-		case static_cast<int>(spu_decoder_type::asmjit):
-			ui->xfloatAccuracy->setEnabled(false);
-			break;
-		default:
-			break;
-		}
+		ui->accurateXFloat->setEnabled(checked);
 	});
 
-	m_emu_settings->EnhanceRadioButton(spu_bg, emu_settings_type::SPUDecoder);
+	connect(ui->spu_fast, &QAbstractButton::toggled, [this](bool checked)
+	{
+		ui->accurateXFloat->setEnabled(checked);
+	});
+
+	ui->accurateXFloat->setEnabled(ui->spu_llvm->isChecked() || ui->spu_fast->isChecked());
 
 #ifndef LLVM_AVAILABLE
 	ui->ppu_llvm->setEnabled(false);
 	ui->spu_llvm->setEnabled(false);
-	ui->spu_dynamic->setEnabled(false);
 #endif
 
 	//     _____ _____  _    _   _______    _
@@ -441,9 +331,9 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 	r_creator->update_names(
 	{
-		m_emu_settings->GetLocalizedSetting(QString("Vulkan"), emu_settings_type::Renderer, static_cast<int>(video_renderer::vulkan), true),
-		m_emu_settings->GetLocalizedSetting(QString("OpenGl"), emu_settings_type::Renderer, static_cast<int>(video_renderer::opengl), true),
-		m_emu_settings->GetLocalizedSetting(QString("Null"), emu_settings_type::Renderer, static_cast<int>(video_renderer::null), true)
+		m_emu_settings->GetLocalizedSetting("Vulkan", emu_settings_type::Renderer, static_cast<int>(video_renderer::vulkan)),
+		m_emu_settings->GetLocalizedSetting("OpenGl", emu_settings_type::Renderer, static_cast<int>(video_renderer::opengl)),
+		m_emu_settings->GetLocalizedSetting("Null", emu_settings_type::Renderer, static_cast<int>(video_renderer::null))
 	});
 
 	// Comboboxes
@@ -451,77 +341,53 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	SubscribeTooltip(ui->gb_renderer, tooltips.settings.renderer);
 	SubscribeTooltip(ui->gb_graphicsAdapter, tooltips.settings.graphics_adapter);
 
-	m_emu_settings->EnhanceComboBox(ui->resBox, emu_settings_type::Resolution, false, false, 0, false, false);
+	m_emu_settings->EnhanceComboBox(ui->resBox, emu_settings_type::Resolution);
 	SubscribeTooltip(ui->gb_default_resolution, tooltips.settings.resolution);
 	// remove unsupported resolutions from the dropdown
+	const int saved_index = ui->resBox->currentIndex();
 	bool saved_index_removed = false;
-	//if (game && game->resolution > 0) // Add this line when interlaced resolutions are implemented
+	if (game && game->resolution > 0)
 	{
-		const std::map<video_resolution, u32> resolutions
+		const std::map<u32, std::string> resolutions
 		{
-			{ video_resolution::_480p,       psf::resolution_flag::_480 | psf::resolution_flag::_480_16_9 },
-			{ video_resolution::_480i,       psf::resolution_flag::_480 | psf::resolution_flag::_480_16_9 },
-			{ video_resolution::_576p,       psf::resolution_flag::_576 | psf::resolution_flag::_576_16_9 },
-			{ video_resolution::_576i,       psf::resolution_flag::_576 | psf::resolution_flag::_576_16_9 },
-			{ video_resolution::_720p,       psf::resolution_flag::_720  },
-			{ video_resolution::_1080p,      psf::resolution_flag::_1080 },
-			{ video_resolution::_1080i,      psf::resolution_flag::_1080 },
-			{ video_resolution::_1600x1080p, psf::resolution_flag::_1080 },
-			{ video_resolution::_1440x1080p, psf::resolution_flag::_1080 },
-			{ video_resolution::_1280x1080p, psf::resolution_flag::_1080 },
-			{ video_resolution::_960x1080p,  psf::resolution_flag::_1080 },
+			{ 1 << 0, fmt::format("%s", video_resolution::_480) },
+			{ 1 << 1, fmt::format("%s", video_resolution::_576) },
+			{ 1 << 2, fmt::format("%s", video_resolution::_720) },
+			{ 1 << 3, fmt::format("%s", video_resolution::_1080) },
+			// { 1 << 4, fmt::format("%s", video_resolution::_480p_16:9) },
+			// { 1 << 5, fmt::format("%s", video_resolution::_576p_16:9) },
 		};
 
-		const int saved_index = ui->resBox->currentIndex();
-		bool remove_720p = false;
-
 		for (int i = ui->resBox->count() - 1; i >= 0; i--)
 		{
-			const auto [text, value] = get_data(ui->resBox, i);
-			const video_resolution resolution = static_cast<video_resolution>(value);
-
-			// Remove interlaced resolutions until they are properly implemented
-			const bool is_interlaced = (resolution == video_resolution::_1080i ||
-			                            resolution == video_resolution::_480i ||
-			                            resolution == video_resolution::_576i);
-			const bool supported_by_game = !game || !game->resolution || (resolutions.contains(resolution) && (game->resolution & resolutions.at(resolution)));
-
-			if (!supported_by_game || is_interlaced)
+			bool has_resolution = false;
+			for (const auto& res : resolutions)
 			{
-				// Don't remove 720p yet. We may need it as fallback if no other resolution is supported.
-				if (resolution == video_resolution::_720p)
+				if ((game->resolution & res.first) && res.second == sstr(ui->resBox->itemText(i)))
 				{
-					remove_720p = true;
-					continue;
+					has_resolution = true;
+					break;
 				}
-
+			}
+			if (!has_resolution)
+			{
 				ui->resBox->removeItem(i);
-
 				if (i == saved_index)
 				{
 					saved_index_removed = true;
 				}
 			}
 		}
-
-		// Remove 720p if unsupported unless it's the only option
-		if (remove_720p && ui->resBox->count() > 1)
-		{
-			if (const int index = find_item(ui->resBox, static_cast<int>(video_resolution::_720p)); index >= 0)
-			{
-				ui->resBox->removeItem(index);
-			}
-		}
 	}
-
 	for (int i = 0; i < ui->resBox->count(); i++)
 	{
-		const auto [text, value] = get_data(ui->resBox, i);
+		const QVariantList var_list = ui->resBox->itemData(i).toList();
+		ensure(var_list.size() == 2 && var_list[0].canConvert<QString>());
 
-		if (static_cast<video_resolution>(value) == video_resolution::_720p)
+		if (var_list[0].toString() == "1280x720")
 		{
 			// Rename the default resolution for users
-			ui->resBox->setItemText(i, tr("720p (Recommended)", "Resolution"));
+			ui->resBox->setItemText(i, tr("1280x720 (Recommended)", "Resolution"));
 
 			// Set the current selection to the default if the original setting wasn't valid
 			if (saved_index_removed)
@@ -532,39 +398,12 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		}
 	}
 
-	m_emu_settings->EnhanceComboBox(ui->aspectBox, emu_settings_type::AspectRatio, false, false, 0, false, false);
+	m_emu_settings->EnhanceComboBox(ui->aspectBox, emu_settings_type::AspectRatio);
 	SubscribeTooltip(ui->gb_aspectRatio, tooltips.settings.aspect_ratio);
 
 	m_emu_settings->EnhanceComboBox(ui->frameLimitBox, emu_settings_type::FrameLimit);
 	SubscribeTooltip(ui->gb_frameLimit, tooltips.settings.frame_limit);
 
-	{
-		const QList<QScreen*> screens = QGuiApplication::screens();
-
-		f64 rate = 20.; // Minimum rate
-
-		for (int i = 0; i < screens.count(); i++)
-		{
-			rate = std::fmax(rate, ::at32(screens, i)->refreshRate());
-		}
-
-		for (int i = 0; i < ui->frameLimitBox->count(); i++)
-		{
-			const QVariantList var_list = ui->frameLimitBox->itemData(i).toList();
-
-			if (var_list.size() != 2 || !var_list[1].canConvert<int>())
-			{
-				fmt::throw_exception("Invalid data found in combobox entry %d (text='%s', listsize=%d, itemcount=%d)", i, ui->frameLimitBox->itemText(i), var_list.size(), ui->frameLimitBox->count());
-			}
-
-			if (static_cast<int>(frame_limit_type::display_rate) == var_list[1].toInt())
-			{
-				ui->frameLimitBox->setItemText(i, tr("Display (%1)", "Frame Limit").arg(std::round(rate)));
-				break;
-			}
-		}
-	}
-
 	m_emu_settings->EnhanceComboBox(ui->antiAliasing, emu_settings_type::MSAA);
 	SubscribeTooltip(ui->gb_antiAliasing, tooltips.settings.anti_aliasing);
 
@@ -590,72 +429,10 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		}
 	}
 
-	m_emu_settings->EnhanceComboBox(ui->shaderPrecision, emu_settings_type::ShaderPrecisionQuality);
-	SubscribeTooltip(ui->gbShaderPrecision, tooltips.settings.shader_precision);
-
-	// Custom control that simplifies operation of two independent variables. Can probably be done better but this works.
-	ui->zcullPrecisionMode->addItem(tr("Precise (Slowest)"), static_cast<int>(zcull_precision_level::precise));
-	ui->zcullPrecisionMode->addItem(tr("Approximate (Fast)"), static_cast<int>(zcull_precision_level::approximate));
-	ui->zcullPrecisionMode->addItem(tr("Relaxed (Fastest)"), static_cast<int>(zcull_precision_level::relaxed));
-
-	const auto reset_zcull_options = [this]()
-	{
-		if (m_emu_settings->GetSetting(emu_settings_type::RelaxedZCULL) == "true")
-		{
-			ui->zcullPrecisionMode->setCurrentIndex(ui->zcullPrecisionMode->findData(static_cast<int>(zcull_precision_level::relaxed)));
-		}
-		else if (m_emu_settings->GetSetting(emu_settings_type::PreciseZCULL) == "true")
-		{
-			ui->zcullPrecisionMode->setCurrentIndex(ui->zcullPrecisionMode->findData(static_cast<int>(zcull_precision_level::precise)));
-		}
-		else
-		{
-			ui->zcullPrecisionMode->setCurrentIndex(ui->zcullPrecisionMode->findData(static_cast<int>(zcull_precision_level::approximate)));
-		}
-	};
-	reset_zcull_options();
-	connect(this, &settings_dialog::signal_restore_dependant_defaults, this, reset_zcull_options);
-
-	connect(ui->zcullPrecisionMode, QOverload<int>::of(&QComboBox::currentIndexChanged), [this](int index)
-	{
-		if (index < 0) return;
-
-		bool relaxed = false, precise = false;
-
-		switch (static_cast<zcull_precision_level>(ui->zcullPrecisionMode->itemData(index).toInt()))
-		{
-		case zcull_precision_level::precise: precise = true; break;
-		case zcull_precision_level::approximate: break;
-		case zcull_precision_level::relaxed: relaxed = true; break;
-		default: fmt::throw_exception("Unexpected selection");
-		}
-
-		m_emu_settings->SetSetting(emu_settings_type::RelaxedZCULL, relaxed ? "true" : "false");
-		m_emu_settings->SetSetting(emu_settings_type::PreciseZCULL, precise ? "true" : "false");
-	});
-	SubscribeTooltip(ui->gbZCULL, tooltips.settings.zcull_operation_mode);
-
-	m_emu_settings->EnhanceComboBox(ui->outputScalingMode, emu_settings_type::OutputScalingMode);
-	SubscribeTooltip(ui->outputScalingMode, tooltips.settings.output_scaling_mode);
-
-	// 3D
-	m_emu_settings->EnhanceComboBox(ui->stereoRenderMode, emu_settings_type::StereoRenderMode);
-	SubscribeTooltip(ui->gb_stereo, tooltips.settings.stereo_render_mode);
-	if (game)
-	{
-		const auto on_resolution = [this](int index)
-		{
-			const auto [text, value] = get_data(ui->resBox, index);
-			ui->stereoRenderMode->setEnabled(value == static_cast<int>(video_resolution::_720p));
-		};
-		connect(ui->resBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, on_resolution);
-		on_resolution(ui->resBox->currentIndex());
-	}
-	else
-	{
-		ui->stereoRenderMode->setCurrentIndex(find_item(ui->stereoRenderMode, static_cast<int>(g_cfg.video.stereo_render_mode.def)));
-		ui->stereoRenderMode->setEnabled(false);
-	}
+	// Comboboxes
+	m_emu_settings->EnhanceComboBox(ui->shaderCompilerThreads, emu_settings_type::ShaderCompilerNumThreads, true);
+	SubscribeTooltip(ui->gb_shader_compiler_threads, tooltips.settings.shader_compiler_threads);
+	ui->shaderCompilerThreads->setItemText(ui->shaderCompilerThreads->findData(0), tr("Auto", "Number of Shader Compiler Threads"));
 
 	// Checkboxes: main options
 	m_emu_settings->EnhanceCheckBox(ui->dumpColor, emu_settings_type::WriteColorBuffers);
@@ -667,23 +444,34 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	m_emu_settings->EnhanceCheckBox(ui->stretchToDisplayArea, emu_settings_type::StretchToDisplayArea);
 	SubscribeTooltip(ui->stretchToDisplayArea, tooltips.settings.stretch_to_display_area);
 
+	m_emu_settings->EnhanceCheckBox(ui->disableVertexCache, emu_settings_type::DisableVertexCache);
+	SubscribeTooltip(ui->disableVertexCache, tooltips.settings.disable_vertex_cache);
+
 	m_emu_settings->EnhanceCheckBox(ui->multithreadedRSX, emu_settings_type::MultithreadedRSX);
 	SubscribeTooltip(ui->multithreadedRSX, tooltips.settings.multithreaded_rsx);
+	connect(ui->multithreadedRSX, &QCheckBox::clicked, [this](bool checked)
+	{
+		ui->disableVertexCache->setEnabled(!checked);
+	});
+	ui->disableVertexCache->setEnabled(!ui->multithreadedRSX->isChecked());
 
 	m_emu_settings->EnhanceCheckBox(ui->strictModeRendering, emu_settings_type::StrictRenderingMode);
 	SubscribeTooltip(ui->strictModeRendering, tooltips.settings.strict_rendering_mode);
-	const auto on_strict_rendering_mode = [this](bool checked)
+	const auto onStrictRenderingMode = [this](bool checked)
 	{
 		ui->gb_resolutionScale->setEnabled(!checked);
 		ui->gb_minimumScalableDimension->setEnabled(!checked);
 		ui->gb_anisotropicFilter->setEnabled(!checked);
 		ui->vulkansched->setEnabled(!checked);
 	};
-	connect(ui->strictModeRendering, &QCheckBox::toggled, this, on_strict_rendering_mode);
+	connect(ui->strictModeRendering, &QCheckBox::clicked, this, onStrictRenderingMode);
 
 	m_emu_settings->EnhanceCheckBox(ui->asyncTextureStreaming, emu_settings_type::VulkanAsyncTextureUploads);
 	SubscribeTooltip(ui->asyncTextureStreaming, tooltips.settings.async_texture_streaming);
 
+	m_emu_settings->EnhanceCheckBox(ui->fsrUpscalingEnable, emu_settings_type::FsrUpscalingEnable);
+	SubscribeTooltip(ui->fsrUpscalingEnable, tooltips.settings.fsr_upscaling);
+
 	// Radio buttons
 
 	SubscribeTooltip(ui->rb_legacy_recompiler, tooltips.settings.legacy_shader_recompiler);
@@ -699,23 +487,17 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 	m_emu_settings->EnhanceRadioButton(shader_mode_bg, emu_settings_type::ShaderMode);
 
-	// Hide interpreter_only unless it is selected or the debug mode is active
-	if (!ui->rb_shader_interpreter_only->isChecked() && !m_gui_settings->GetValue(gui::m_showDebugTab).toBool())
-	{
-		ui->rb_shader_interpreter_only->setVisible(false);
-	}
-
 	// Sliders
 
 	m_emu_settings->EnhanceSlider(ui->resolutionScale, emu_settings_type::ResolutionScale);
 	SubscribeTooltip(ui->gb_resolutionScale, tooltips.settings.resolution_scale);
 	// rename label texts to fit current state of Resolution Scale
 	const int resolution_scale_def = stoi(m_emu_settings->GetSettingDefault(emu_settings_type::ResolutionScale));
-	const auto scaled_resolution = [resolution_scale_def](int percentage)
+	auto scaled_resolution = [resolution_scale_def](int percentage)
 	{
 		if (percentage == resolution_scale_def)
 		{
-			return tr("100% (1280x720) (Default)", "Resolution scale");
+			return tr("100% (Default)", "Resolution scale");
 		}
 		return tr("%1% (%2x%3)", "Resolution scale").arg(percentage).arg(1280 * percentage / 100).arg(720 * percentage / 100);
 	};
@@ -739,7 +521,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	SubscribeTooltip(ui->gb_minimumScalableDimension, tooltips.settings.minimum_scalable_dimension);
 	// rename label texts to fit current state of Minimum Scalable Dimension
 	const int minimum_scalable_dimension_def = stoi(m_emu_settings->GetSettingDefault(emu_settings_type::MinimumScalableDimension));
-	const auto min_scalable_dimension = [minimum_scalable_dimension_def](int dim)
+	auto min_scalable_dimension = [minimum_scalable_dimension_def](int dim)
 	{
 		if (dim == minimum_scalable_dimension_def)
 		{
@@ -763,7 +545,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	});
 
 	const int fsr_sharpening_strength_def = stoi(m_emu_settings->GetSettingDefault(emu_settings_type::FsrSharpeningStrength));
-	const auto fmt_fsr_sharpening_strength = [fsr_sharpening_strength_def](int value)
+	auto fmt_fsr_sharpening_strength = [fsr_sharpening_strength_def](int value)
 	{
 		if (value == fsr_sharpening_strength_def)
 		{
@@ -772,7 +554,9 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		return tr("%1%").arg(value);
 	};
 	m_emu_settings->EnhanceSlider(ui->fsrSharpeningStrength, emu_settings_type::FsrSharpeningStrength);
-	SubscribeTooltip(ui->fsrSharpeningStrengthWidget, tooltips.settings.fsr_rcas_strength);
+	SubscribeTooltip(ui->fsrSharpeningStrength, tooltips.settings.fsr_rcas_strength);
+	SubscribeTooltip(ui->fsrSharpeningStrengthVal, tooltips.settings.fsr_rcas_strength);
+	SubscribeTooltip(ui->fsrSharpeningStrengthReset, tooltips.settings.fsr_rcas_strength);
 	ui->fsrSharpeningStrengthVal->setText(fmt_fsr_sharpening_strength(ui->fsrSharpeningStrength->value()));
 	connect(ui->fsrSharpeningStrength, &QSlider::valueChanged, [fmt_fsr_sharpening_strength, this](int value)
 	{
@@ -783,14 +567,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		ui->fsrSharpeningStrength->setValue(fsr_sharpening_strength_def);
 	});
 
-	// DoubleSpinBoxes
-	m_emu_settings->EnhanceDoubleSpinBox(ui->TextureLODBias, emu_settings_type::TextureLodBias);
-	SubscribeTooltip(ui->gb_Level_of_Detail, tooltips.settings.texture_lod_bias);
-	connect(ui->TextureLODBiasReset, &QAbstractButton::clicked, [this]()
-	{
-		ui->TextureLODBias->setValue(stod(m_emu_settings->GetSettingDefault(emu_settings_type::TextureLodBias)));
-	});
-
 	// Remove renderers from the renderer Combobox if not supported
 	for (const auto& renderer : r_creator->renderers)
 	{
@@ -798,7 +574,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		{
 			if (renderer->has_adapters)
 			{
-				renderer->old_adapter = QString::fromStdString(m_emu_settings->GetSetting(renderer->type));
+				renderer->old_adapter = qstr(m_emu_settings->GetSetting(renderer->type));
 			}
 			continue;
 		}
@@ -829,10 +605,16 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 			{
 				if (renderer.name != render->name && render->has_adapters && render->supported)
 				{
-					m_emu_settings->SetSetting(render->type, render->old_adapter.toStdString());
+					m_emu_settings->SetSetting(render->type, sstr(render->old_adapter));
 				}
 			}
 
+			// Enable/disable MSAA depending on renderer
+			ui->antiAliasing->setEnabled(renderer.has_msaa);
+			ui->antiAliasing->blockSignals(true);
+			ui->antiAliasing->setCurrentText(renderer.has_msaa ? qstr(m_emu_settings->GetSetting(emu_settings_type::MSAA)) : tr("Disabled", "MSAA"));
+			ui->antiAliasing->blockSignals(false);
+
 			ui->graphicsAdapterBox->clear();
 
 			// Fill combobox with placeholder if no adapters needed
@@ -854,15 +636,15 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 				idx = 0;
 				if (renderer.old_adapter.isEmpty())
 				{
-					rsx_log.warning("%s adapter config empty: setting to default!", renderer.name);
+					rsx_log.warning("%s adapter config empty: setting to default!", sstr(renderer.name));
 				}
 				else
 				{
-					rsx_log.warning("Last used %s adapter not found: setting to default!", renderer.name);
+					rsx_log.warning("Last used %s adapter not found: setting to default!", sstr(renderer.name));
 				}
 			}
 			ui->graphicsAdapterBox->setCurrentIndex(idx);
-			m_emu_settings->SetSetting(renderer.type, ui->graphicsAdapterBox->currentText().toStdString());
+			m_emu_settings->SetSetting(renderer.type, sstr(ui->graphicsAdapterBox->currentText()));
 		};
 
 		for (const auto& renderer : r_creator->renderers)
@@ -893,7 +675,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		{
 			if (render->name == new_renderer && render->has_adapters && render->adapters.contains(text))
 			{
-				m_emu_settings->SetSetting(render->type, text.toStdString());
+				m_emu_settings->SetSetting(render->type, sstr(text));
 				break;
 			}
 		}
@@ -907,29 +689,21 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	connect(ui->graphicsAdapterBox, &QComboBox::currentTextChanged, set_adapter);
 	connect(ui->renderBox, &QComboBox::currentTextChanged, set_renderer);
 
-	const auto apply_renderer_specific_options = [r_creator, this](const QString& text)
+	auto apply_renderer_specific_options = [=, this](const QString& text)
 	{
 		// Vulkan-only
 		const bool is_vulkan = (text == r_creator->Vulkan.name);
 		ui->asyncTextureStreaming->setEnabled(is_vulkan);
 		ui->vulkansched->setEnabled(is_vulkan);
-	};
-
-	const auto apply_fsr_specific_options = [r_creator, this]()
-	{
-		const auto [text, value] = get_data(ui->outputScalingMode, ui->outputScalingMode->currentIndex());
-		const bool fsr_selected = static_cast<output_scaling_mode>(value) == output_scaling_mode::fsr;
-		ui->fsrSharpeningStrength->setEnabled(fsr_selected);
-		ui->fsrSharpeningStrengthReset->setEnabled(fsr_selected);
+		ui->fsrUpscalingEnable->setEnabled(is_vulkan);
+		ui->fsrSharpeningStrength->setEnabled(is_vulkan);
+		ui->fsrSharpeningStrengthReset->setEnabled(is_vulkan);
 	};
 
 	// Handle connects to disable specific checkboxes that depend on GUI state.
-	on_strict_rendering_mode(ui->strictModeRendering->isChecked());
+	onStrictRenderingMode(ui->strictModeRendering->isChecked());
 	apply_renderer_specific_options(ui->renderBox->currentText()); // Init
-	apply_fsr_specific_options();
 	connect(ui->renderBox, &QComboBox::currentTextChanged, apply_renderer_specific_options);
-	connect(ui->renderBox, &QComboBox::currentTextChanged, this, apply_fsr_specific_options);
-	connect(ui->outputScalingMode, QOverload<int>::of(&QComboBox::currentIndexChanged), this, apply_fsr_specific_options);
 
 	//                      _ _         _______    _
 	//       /\            | (_)       |__   __|  | |
@@ -938,16 +712,42 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	//    / ____ \ |_| | (_| | | (_) |    | | (_| | |_) |
 	//   /_/    \_\__,_|\__,_|_|\___/     |_|\__,_|_.__/
 
+	auto enable_time_stretching_options = [this](bool enabled)
+	{
+		ui->timeStretchingThresholdLabel->setEnabled(enabled);
+		ui->timeStretchingThreshold->setEnabled(enabled);
+	};
+
+	auto enable_buffering_options = [this, enable_time_stretching_options](bool enabled)
+	{
+		ui->audioBufferDuration->setEnabled(enabled);
+		ui->audioBufferDurationLabel->setEnabled(enabled);
+		ui->enableTimeStretching->setEnabled(enabled);
+		enable_time_stretching_options(enabled && ui->enableTimeStretching->isChecked());
+	};
+
+	auto enable_buffering = [this, enable_buffering_options](int index)
+	{
+		const QVariantList var_list = ui->audioOutBox->itemData(index).toList();
+		ensure(var_list.size() == 2 && var_list[0].canConvert<QString>());
+		const QString text = var_list[0].toString();
+		const bool enabled = text == "XAudio2" || text == "OpenAL" || text == "FAudio";
+		ui->enableBuffering->setEnabled(enabled);
+		enable_buffering_options(enabled && ui->enableBuffering->isChecked());
+	};
+
 	const QString mic_none = m_emu_settings->m_microphone_creator.get_none();
 
-	const auto change_microphone_type = [mic_none, this](int index)
+	auto change_microphone_type = [mic_none, this](int index)
 	{
 		if (index < 0)
 		{
 			return;
 		}
 
-		const auto [text, handler_id] = get_data(ui->microphoneBox, index);
+		const QVariantList var_list = ui->microphoneBox->itemData(index).toList();
+		ensure(var_list.size() == 2 && var_list[1].canConvert<int>());
+		const int handler_id = var_list[1].toInt();
 		int max = 0;
 
 		switch (static_cast<microphone_handler>(handler_id))
@@ -972,13 +772,13 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		ui->microphone4Box->setEnabled(ui->microphone3Box->isEnabled() && ui->microphone3Box->currentText() != mic_none);
 	};
 
-	const auto propagate_used_devices = [mic_none, change_microphone_type, this]()
+	auto propagate_used_devices = [mic_none, change_microphone_type, this]()
 	{
-		for (u32 index = 0; index < m_mics_combo.size(); index++)
+		for (u32 index = 0; index < 4; index++)
 		{
 			const QString cur_item = m_mics_combo[index]->currentText();
 			QStringList cur_list = m_emu_settings->m_microphone_creator.get_microphone_list();
-			for (u32 subindex = 0; subindex < m_mics_combo.size(); subindex++)
+			for (u32 subindex = 0; subindex < 4; subindex++)
 			{
 				if (subindex != index && m_mics_combo[subindex]->currentText() != mic_none)
 					cur_list.removeOne(m_mics_combo[subindex]->currentText());
@@ -992,60 +792,14 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		change_microphone_type(ui->microphoneBox->currentIndex());
 	};
 
-	const auto change_microphone_device = [mic_none, propagate_used_devices, this](u32 index, const QString& text)
+	const auto change_microphone_device = [mic_none, propagate_used_devices, this](u32 next_index, const QString& text)
 	{
-		m_emu_settings->SetSetting(emu_settings_type::MicrophoneDevices, m_emu_settings->m_microphone_creator.set_device(index, text));
-		if (const u32 next_index = index + 1; next_index < m_mics_combo.size() && text == mic_none)
+		m_emu_settings->SetSetting(emu_settings_type::MicrophoneDevices, m_emu_settings->m_microphone_creator.set_device(next_index, text));
+		if (next_index < 4 && text == mic_none)
 			m_mics_combo[next_index]->setCurrentText(mic_none);
 		propagate_used_devices();
 	};
 
-	const auto get_audio_output_devices = [this](bool keep_old = true)
-	{
-		const auto [text, value] = get_data(ui->audioOutBox, ui->audioOutBox->currentIndex());
-		auto dev_enum = Emu.GetCallbacks().get_audio_enumerator(value);
-		std::vector<audio_device_enumerator::audio_device> dev_array = dev_enum->get_output_devices();
-
-		ui->audioDeviceBox->clear();
-		ui->audioDeviceBox->blockSignals(true);
-		ui->audioDeviceBox->addItem(tr("Default"), QString(audio_device_enumerator::DEFAULT_DEV_ID.data()));
-
-		const std::string selected_device = m_emu_settings->GetSetting(emu_settings_type::AudioDevice);
-		int device_index = 0;
-
-		for (const audio_device_enumerator::audio_device& dev : dev_array)
-		{
-			const QString cur_item = QString::fromStdString(dev.id);
-			ui->audioDeviceBox->addItem(QString::fromStdString(dev.name), cur_item);
-			if (selected_device == dev.id)
-			{
-				device_index = ui->audioDeviceBox->findData(cur_item);
-			}
-		}
-
-		if (device_index == 0 && keep_old && selected_device != audio_device_enumerator::DEFAULT_DEV_ID)
-		{
-			cfg_log.error("The selected audio device (%s) was not found", selected_device);
-			ui->audioDeviceBox->addItem(tr("Unknown device"), QString::fromStdString(selected_device));
-			device_index = ui->audioDeviceBox->count() - 1;
-		}
-
-		ui->audioDeviceBox->blockSignals(false);
-		ui->audioDeviceBox->setCurrentIndex(std::max(device_index, 0));
-	};
-
-	const auto change_audio_output_device = [this](int index)
-	{
-		if (index < 0)
-		{
-			return;
-		}
-
-		const QVariant item_data = ui->audioDeviceBox->itemData(index);
-		m_emu_settings->SetSetting(emu_settings_type::AudioDevice, item_data.toString().toStdString());
-		ui->audioDeviceBox->setCurrentIndex(index);
-	};
-
 	// Comboboxes
 
 	m_emu_settings->EnhanceComboBox(ui->audioOutBox, emu_settings_type::AudioRenderer);
@@ -1054,111 +808,38 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 #else
 	SubscribeTooltip(ui->gb_audio_out, tooltips.settings.audio_out_linux);
 #endif
-	connect(ui->audioOutBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [change_audio_output_device, get_audio_output_devices](int)
-	{
-		get_audio_output_devices(false);
-		change_audio_output_device(0); // Set device to 'Default'
-	});
+	connect(ui->audioOutBox, QOverload<int>::of(&QComboBox::currentIndexChanged), enable_buffering);
 
-	m_emu_settings->EnhanceComboBox(ui->combo_audio_channel_layout, emu_settings_type::AudioChannelLayout);
-	SubscribeTooltip(ui->gb_audio_channel_layout, tooltips.settings.audio_channel_layout);
-
-	connect(ui->combo_audio_format, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index)
-	{
-		const auto [text, value] = get_data(ui->combo_audio_format, index);
-		ui->list_audio_formats->setEnabled(static_cast<audio_format>(value) == audio_format::manual);
-	});
-	m_emu_settings->EnhanceComboBox(ui->combo_audio_format, emu_settings_type::AudioFormat);
-	SubscribeTooltip(ui->gb_audio_format, tooltips.settings.audio_format);
-
-	// Manual audio format selection
-	const std::string audio_formats_str = m_emu_settings->GetSetting(emu_settings_type::AudioFormats);
-	u64 selected_audio_formats = 0;
-	if (!try_to_uint64(&selected_audio_formats, audio_formats_str, 0, 0xFFFFFFFF))
-	{
-		cfg_log.error("Can not interpret AudioFormats value '%s' as number", audio_formats_str);
-	}
-	const std::array<audio_format_flag, 5> audio_formats = {
-		audio_format_flag::lpcm_2_48khz,
-		audio_format_flag::lpcm_5_1_48khz,
-		audio_format_flag::lpcm_7_1_48khz,
-		audio_format_flag::ac3,
-		audio_format_flag::dts,
-	};
-	for (const audio_format_flag& audio_fmt : audio_formats)
-	{
-		const QString audio_format_name = m_emu_settings->GetLocalizedSetting(QString(), emu_settings_type::AudioFormats, static_cast<int>(audio_fmt), true);
-		QListWidgetItem* item = new QListWidgetItem(audio_format_name, ui->list_audio_formats);
-		item->setData(Qt::UserRole, static_cast<u32>(audio_fmt));
-		if (audio_fmt == audio_format_flag::lpcm_2_48khz)
-		{
-			item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
-			item->setCheckState(Qt::Checked);
-		}
-		else
-		{
-			item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
-			item->setCheckState(!!(selected_audio_formats & static_cast<u32>(audio_fmt)) ? Qt::Checked : Qt::Unchecked);
-		}
-		ui->list_audio_formats->addItem(item);
-	}
-	connect(this, &settings_dialog::signal_restore_dependant_defaults, this, [this]()
-	{
-		const u32 default_audio_formats = std::stoi(m_emu_settings->GetSettingDefault(emu_settings_type::AudioFormats));
-		for (int i = 0; i < ui->list_audio_formats->count(); ++i)
-		{
-			const auto& item = ui->list_audio_formats->item(i);
-			const u32 audio_fmt = item->data(Qt::UserRole).toUInt();
-			if (audio_fmt == static_cast<u32>(audio_format_flag::lpcm_2_48khz))
-			{
-				item->setCheckState(Qt::Checked);
-			}
-			else
-			{
-				item->setCheckState(!!(default_audio_formats & audio_fmt) ? Qt::Checked : Qt::Unchecked);
-			}
-		}
-	});
-
-	m_emu_settings->EnhanceComboBox(ui->audioProviderBox, emu_settings_type::AudioProvider);
-	SubscribeTooltip(ui->gb_audio_provider, tooltips.settings.audio_provider);
-	ui->gb_audio_provider->setVisible(false); // Hidden for now. This option is forced on boot.
-
-	m_emu_settings->EnhanceComboBox(ui->audioAvportBox, emu_settings_type::AudioAvport);
-	SubscribeTooltip(ui->gb_audio_avport, tooltips.settings.audio_avport);
-
-	SubscribeTooltip(ui->gb_audio_device, tooltips.settings.audio_device);
-	connect(ui->audioDeviceBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, change_audio_output_device);
-	connect(this, &settings_dialog::signal_restore_dependant_defaults, this, [change_audio_output_device]() { change_audio_output_device(0); }); // Set device to 'Default'
-	get_audio_output_devices();
+	m_emu_settings->EnhanceComboBox(ui->combo_audio_downmix, emu_settings_type::AudioChannels);
+	SubscribeTooltip(ui->gb_audio_downmix, tooltips.settings.downmix);
+	// TODO: enable this setting once cellAudioOutConfigure can change downmix on the fly
+	ui->combo_audio_downmix->removeItem(static_cast<int>(audio_downmix::use_application_settings));
 
 	// Microphone Comboboxes
 	m_mics_combo[0] = ui->microphone1Box;
 	m_mics_combo[1] = ui->microphone2Box;
 	m_mics_combo[2] = ui->microphone3Box;
 	m_mics_combo[3] = ui->microphone4Box;
-
-	for (u32 i = 0; i < m_mics_combo.size(); i++)
-	{
-		connect(m_mics_combo[i], &QComboBox::currentTextChanged, this, [change_microphone_device, i](const QString& text) { change_microphone_device(i, text); });
-		connect(this, &settings_dialog::signal_restore_dependant_defaults, this, [change_microphone_device, i, mic_none]() { change_microphone_device(i, mic_none); });
-	}
-
+	connect(m_mics_combo[0], &QComboBox::currentTextChanged, [=, this](const QString& text) { change_microphone_device(1, text); });
+	connect(m_mics_combo[1], &QComboBox::currentTextChanged, [=, this](const QString& text) { change_microphone_device(2, text); });
+	connect(m_mics_combo[2], &QComboBox::currentTextChanged, [=, this](const QString& text) { change_microphone_device(3, text); });
+	connect(m_mics_combo[3], &QComboBox::currentTextChanged, [=, this](const QString& text) { change_microphone_device(4, text); });
 	m_emu_settings->m_microphone_creator.refresh_list();
 	propagate_used_devices(); // Fills comboboxes list
 
 	m_emu_settings->m_microphone_creator.parse_devices(m_emu_settings->GetSetting(emu_settings_type::MicrophoneDevices));
 
-	const std::array<std::string, 4> mic_sel_list = m_emu_settings->m_microphone_creator.get_selection_list();
+	const auto mic_sel_list = m_emu_settings->m_microphone_creator.get_selection_list();
 
-	for (s32 index = static_cast<int>(mic_sel_list.size()) - 1; index >= 0; index--)
+	for (s32 index = 3; index >= 0; index--)
 	{
-		const QString qmic = QString::fromStdString(mic_sel_list[index]);
+		const auto mic = mic_sel_list[index];
+		const auto qmic = qstr(mic);
 
-		if (qmic.isEmpty() || m_mics_combo[index]->findText(qmic) == -1)
+		if (mic.empty() || m_mics_combo[index]->findText(qmic) == -1)
 		{
 			m_mics_combo[index]->setCurrentText(mic_none);
-			change_microphone_device(index, mic_none); // Ensures the value is set in config
+			change_microphone_device(index+1, mic_none); // Ensures the value is set in config
 		}
 		else
 		{
@@ -1181,9 +862,13 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 	m_emu_settings->EnhanceCheckBox(ui->enableBuffering, emu_settings_type::EnableBuffering);
 	SubscribeTooltip(ui->enableBuffering, tooltips.settings.enable_buffering);
+	connect(ui->enableBuffering, &QCheckBox::clicked, enable_buffering_options);
 
 	m_emu_settings->EnhanceCheckBox(ui->enableTimeStretching, emu_settings_type::EnableTimeStretching);
 	SubscribeTooltip(ui->enableTimeStretching, tooltips.settings.enable_time_stretching);
+	connect(ui->enableTimeStretching, &QCheckBox::clicked, enable_time_stretching_options);
+
+	enable_buffering(ui->audioOutBox->currentIndex());
 
 	// Sliders
 
@@ -1217,181 +902,12 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	m_emu_settings->EnhanceComboBox(ui->cameraBox, emu_settings_type::Camera);
 	SubscribeTooltip(ui->gb_camera_setting, tooltips.settings.camera);
 
-	m_emu_settings->EnhanceComboBox(ui->cameraFlipBox, emu_settings_type::CameraFlip);
-	SubscribeTooltip(ui->gb_camera_flip, tooltips.settings.camera_flip);
-
-	{
-		const std::string default_camera = m_emu_settings->GetSettingDefault(emu_settings_type::CameraID);
-		const std::string selected_camera = m_emu_settings->GetSetting(emu_settings_type::CameraID);
-		ui->cameraIdBox->addItem(tr("None", "Camera Device"), "");
-		ui->cameraIdBox->addItem(tr("Default", "Camera Device"), QString::fromStdString(default_camera));
-		for (const QCameraDevice& camera_info : QMediaDevices::videoInputs())
-		{
-			if (!camera_info.isNull())
-			{
-				ui->cameraIdBox->addItem(camera_info.description(), QString(camera_info.id()));
-			}
-		}
-		if (const int index = ui->cameraIdBox->findData(QString::fromStdString(selected_camera)); index >= 0)
-		{
-			ui->cameraIdBox->setCurrentIndex(index);
-		}
-		else
-		{
-			cfg_log.error("The selected camera was not found. Selecting default camera as fallback.");
-			ui->cameraIdBox->setCurrentIndex(ui->cameraIdBox->findData(QString::fromStdString(default_camera)));
-		}
-		connect(ui->cameraIdBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index)
-		{
-			if (index >= 0) m_emu_settings->SetSetting(emu_settings_type::CameraID, ui->cameraIdBox->itemData(index).toString().toStdString());
-		});
-		connect(this, &settings_dialog::signal_restore_dependant_defaults, this, [this, default_camera]()
-		{
-			m_emu_settings->SetSetting(emu_settings_type::CameraID, default_camera);
-			ui->cameraIdBox->setCurrentIndex(ui->cameraIdBox->findData(QString::fromStdString(default_camera)));
-		});
-		SubscribeTooltip(ui->gb_camera_id, tooltips.settings.camera_id);
-	}
-
-	m_emu_settings->EnhanceComboBox(ui->musicHandlerBox, emu_settings_type::MusicHandler);
-	SubscribeTooltip(ui->gb_music_handler, tooltips.settings.music_handler);
-
-	m_emu_settings->EnhanceComboBox(ui->padModeBox, emu_settings_type::PadHandlerMode);
-	SubscribeTooltip(ui->gb_pad_mode, tooltips.settings.pad_mode);
-
 	m_emu_settings->EnhanceComboBox(ui->moveBox, emu_settings_type::Move);
 	SubscribeTooltip(ui->gb_move_handler, tooltips.settings.move);
 
 	m_emu_settings->EnhanceComboBox(ui->buzzBox, emu_settings_type::Buzz);
 	SubscribeTooltip(ui->gb_buzz_emulated, tooltips.settings.buzz);
 
-	m_emu_settings->EnhanceComboBox(ui->turntableBox, emu_settings_type::Turntable);
-	SubscribeTooltip(ui->gb_turntable_emulated, tooltips.settings.turntable);
-
-	m_emu_settings->EnhanceComboBox(ui->ghltarBox, emu_settings_type::GHLtar);
-	SubscribeTooltip(ui->gb_ghltar_emulated, tooltips.settings.ghltar);
-
-	m_emu_settings->EnhanceCheckBox(ui->backgroundInputBox, emu_settings_type::BackgroundInput);
-	SubscribeTooltip(ui->backgroundInputBox, tooltips.settings.background_input);
-
-	m_emu_settings->EnhanceCheckBox(ui->padConnectionBox, emu_settings_type::PadConnection);
-	SubscribeTooltip(ui->padConnectionBox, tooltips.settings.pad_connection);
-
-	m_emu_settings->EnhanceCheckBox(ui->showMoveCursorBox, emu_settings_type::ShowMoveCursor);
-	SubscribeTooltip(ui->showMoveCursorBox, tooltips.settings.show_move_cursor);
-
-	m_emu_settings->EnhanceCheckBox(ui->lockOverlayInputToPlayerOne, emu_settings_type::LockOvlIptToP1);
-	SubscribeTooltip(ui->lockOverlayInputToPlayerOne, tooltips.settings.lock_overlay_input_to_player_one);
-
-#if HAVE_SDL3
-	m_emu_settings->EnhanceCheckBox(ui->loadSdlMappings, emu_settings_type::SDLMappings);
-	SubscribeTooltip(ui->loadSdlMappings, tooltips.settings.sdl_mappings);
-#else
-	ui->loadSdlMappings->setVisible(false);
-#endif
-
-#ifndef _WIN32
-	// Remove raw mouse handler
-	remove_item(ui->mouseHandlerBox, static_cast<int>(mouse_handler::raw), static_cast<int>(g_cfg.io.mouse.def));
-	remove_item(ui->moveBox, static_cast<int>(move_handler::raw_mouse), static_cast<int>(g_cfg.io.move.def));
-#endif
-
-	// Midi
-	const QString midi_none = m_emu_settings->m_midi_creator.get_none();
-	const midi_device def_midi_device{ .type = midi_device_type::keyboard, .name = midi_none.toStdString() };
-	const std::vector<std::string> midi_device_types = cfg::try_to_enum_list(&fmt_class_string<midi_device_type>::format);
-
-	m_midi_type_combo[0] = ui->midiTypeBox1;
-	m_midi_type_combo[1] = ui->midiTypeBox2;
-	m_midi_type_combo[2] = ui->midiTypeBox3;
-	m_midi_device_combo[0] = ui->midiDeviceBox1;
-	m_midi_device_combo[1] = ui->midiDeviceBox2;
-	m_midi_device_combo[2] = ui->midiDeviceBox3;
-
-	SubscribeTooltip(ui->gb_midi_1, tooltips.settings.midi_devices);
-	SubscribeTooltip(ui->gb_midi_2, tooltips.settings.midi_devices);
-	SubscribeTooltip(ui->gb_midi_3, tooltips.settings.midi_devices);
-
-	const auto propagate_midi_devices = [midi_none, this]()
-	{
-		for (u32 index = 0; index < m_midi_device_combo.size(); index++)
-		{
-			const QString cur_item = m_midi_device_combo[index]->currentText();
-			QStringList cur_list = m_emu_settings->m_midi_creator.get_midi_list();
-			for (u32 subindex = 0; subindex < m_midi_device_combo.size(); subindex++)
-			{
-				if (subindex != index && m_midi_device_combo[subindex]->currentText() != midi_none)
-					cur_list.removeOne(m_midi_device_combo[subindex]->currentText());
-			}
-			m_midi_device_combo[index]->blockSignals(true);
-			m_midi_device_combo[index]->clear();
-			m_midi_device_combo[index]->addItems(cur_list);
-			m_midi_device_combo[index]->setCurrentText(cur_item);
-			m_midi_device_combo[index]->blockSignals(false);
-		}
-	};
-
-	const auto change_midi_device = [propagate_midi_devices, this](u32 index, const midi_device& device)
-	{
-		m_emu_settings->SetSetting(emu_settings_type::MidiDevices, m_emu_settings->m_midi_creator.set_device(index, device));
-		propagate_midi_devices();
-	};
-
-	for (u32 i = 0; i < m_midi_type_combo.size(); i++)
-	{
-		m_midi_type_combo[i]->blockSignals(true);
-		for (const std::string& type_str : midi_device_types)
-		{
-			midi_device_type type{};
-			if (u64 result; cfg::try_to_enum_value(&result, &fmt_class_string<midi_device_type>::format, type_str))
-			{
-				type = static_cast<midi_device_type>(static_cast<std::underlying_type_t<midi_device_type>>(result));
-			}
-			const QString type_name = m_emu_settings->GetLocalizedSetting(QString::fromStdString(fmt::format("%s", type)), emu_settings_type::MidiDevices, static_cast<int>(type), false);
-			m_midi_type_combo[i]->addItem(type_name, static_cast<int>(type));
-		}
-		m_midi_type_combo[i]->blockSignals(false);
-
-		connect(m_midi_type_combo[i], &QComboBox::currentTextChanged, this, [this, change_midi_device, i](const QString& /*text*/)
-		{
-			const midi_device device{ .type = static_cast<midi_device_type>(m_midi_type_combo[i]->currentData().toInt()), .name = m_midi_device_combo[i]->currentText().toStdString() };
-			change_midi_device(i, device);
-		});
-		connect(m_midi_device_combo[i], &QComboBox::currentTextChanged, this, [this, change_midi_device, i](const QString& text)
-		{
-			const midi_device device{ .type = static_cast<midi_device_type>(m_midi_type_combo[i]->currentData().toInt()), .name = text.toStdString() };
-			change_midi_device(i, device);
-		});
-		connect(this, &settings_dialog::signal_restore_dependant_defaults, this, [change_midi_device, i, def_midi_device]() { change_midi_device(i, def_midi_device); });
-	}
-
-	m_emu_settings->m_midi_creator.refresh_list();
-	propagate_midi_devices(); // Fills comboboxes list
-
-	m_emu_settings->m_midi_creator.parse_devices(m_emu_settings->GetSetting(emu_settings_type::MidiDevices));
-
-	const std::array<midi_device, max_midi_devices> midi_sel_list = m_emu_settings->m_midi_creator.get_selection_list();
-
-	for (s32 index = static_cast<int>(midi_sel_list.size()) - 1; index >= 0; index--)
-	{
-		const midi_device& device = midi_sel_list[index];
-		const QString qmidi = QString::fromStdString(device.name);
-
-		m_midi_type_combo[index]->setCurrentIndex(m_midi_type_combo[index]->findData(static_cast<int>(device.type)));
-
-		if (qmidi.isEmpty() || m_midi_device_combo[index]->findText(qmidi) == -1)
-		{
-			m_midi_device_combo[index]->setCurrentText(midi_none);
-			change_midi_device(index, def_midi_device); // Ensures the value is set in config
-		}
-		else
-		{
-			m_midi_device_combo[index]->setCurrentText(qmidi);
-		}
-	}
-
-	propagate_midi_devices(); // Enables/Disables comboboxes and checks values from config for sanity
-
 	//     _____           _                   _______    _
 	//    / ____|         | |                 |__   __|  | |
 	//   | (___  _   _ ___| |_ ___ _ __ ___      | | __ _| |__
@@ -1417,15 +933,12 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	m_emu_settings->EnhanceCheckBox(ui->enableHostRoot, emu_settings_type::EnableHostRoot);
 	SubscribeTooltip(ui->enableHostRoot, tooltips.settings.enable_host_root);
 
-	m_emu_settings->EnhanceCheckBox(ui->emptyHdd0Tmp, emu_settings_type::EmptyHdd0Tmp);
-	SubscribeTooltip(ui->emptyHdd0Tmp, tooltips.settings.empty_hdd0_tmp);
-
 	m_emu_settings->EnhanceCheckBox(ui->enableCacheClearing, emu_settings_type::LimitCacheSize);
 	SubscribeTooltip(ui->gb_DiskCacheClearing, tooltips.settings.limit_cache_size);
 	if (game)
 		ui->gb_DiskCacheClearing->setDisabled(true);
 	else
-		connect(ui->enableCacheClearing, &QCheckBox::checkStateChanged, ui->maximumCacheSize, &QSlider::setEnabled);
+		connect(ui->enableCacheClearing, &QCheckBox::stateChanged, ui->maximumCacheSize, &QSlider::setEnabled);
 
 	// Date Time Edit Box
 	m_emu_settings->EnhanceDateTimeEdit(ui->console_time_edit, emu_settings_type::ConsoleTimeOffset, tr("dd MMM yyyy HH:mm"), true, true, 15000);
@@ -1462,63 +975,23 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	m_emu_settings->EnhanceLineEdit(ui->edit_dns, emu_settings_type::DNSAddress);
 	SubscribeTooltip(ui->gb_edit_dns, tooltips.settings.dns);
 
-	m_emu_settings->EnhanceLineEdit(ui->edit_bind, emu_settings_type::BindAddress);
-	SubscribeTooltip(ui->gb_edit_bind, tooltips.settings.bind);
-	ui->gb_edit_bind->setEnabled(!!game);
-
 	m_emu_settings->EnhanceLineEdit(ui->edit_swaps, emu_settings_type::IpSwapList);
 	SubscribeTooltip(ui->gb_edit_swaps, tooltips.settings.dns_swap);
-	ui->gb_edit_swaps->setEnabled(!!game);
-
-	m_emu_settings->EnhanceCheckBox(ui->enable_upnp, emu_settings_type::EnableUpnp);
-	SubscribeTooltip(ui->enable_upnp, tooltips.settings.enable_upnp);
 
 	// Comboboxes
 
-	connect(ui->netStatusBox, QOverload<int>::of(&QComboBox::currentIndexChanged), [this](int index)
-	{
-		if (index < 0) return;
-		const auto [text, value] = get_data(ui->netStatusBox, index);
-		ui->gb_edit_dns->setEnabled(static_cast<np_internet_status>(value) != np_internet_status::disabled);
-		ui->enable_upnp->setEnabled(static_cast<np_internet_status>(value) != np_internet_status::disabled);
-
-		if (static_cast<np_internet_status>(value) == np_internet_status::disabled)
-		{
-			ui->psnStatusBox->setCurrentIndex(find_item(ui->psnStatusBox, static_cast<int>(g_cfg.net.psn_status.def)));
-			ui->psnStatusBox->setEnabled(false);
-		}
-		else
-		{
-			ui->psnStatusBox->setEnabled(true);
-		}
-	});
 	m_emu_settings->EnhanceComboBox(ui->netStatusBox, emu_settings_type::InternetStatus);
 	SubscribeTooltip(ui->gb_netStatusBox, tooltips.settings.net_status);
 
+	connect(ui->netStatusBox, QOverload<int>::of(&QComboBox::currentIndexChanged), [this](int index)
+	{
+		ui->edit_dns->setEnabled(index > 0);
+	});
+	ui->edit_dns->setEnabled(ui->netStatusBox->currentIndex() > 0);
+
 	m_emu_settings->EnhanceComboBox(ui->psnStatusBox, emu_settings_type::PSNStatus);
 	SubscribeTooltip(ui->gb_psnStatusBox, tooltips.settings.psn_status);
 
-	settings_dialog::refresh_countrybox();
-	connect(ui->psnCountryBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index)
-	{
-		if (index < 0)
-			return;
-
-		const QVariant country_code = ui->psnCountryBox->itemData(index);
-
-		if (!country_code.isValid() || !country_code.canConvert<QString>())
-			return;
-
-		m_emu_settings->SetSetting(emu_settings_type::PSNCountry, country_code.toString().toStdString());
-	});
-
-	SubscribeTooltip(ui->gb_psnCountryBox, tooltips.settings.psn_country);
-
-	if (!game)
-	{
-		remove_item(ui->psnStatusBox, static_cast<int>(np_psn_status::psn_fake), static_cast<int>(g_cfg.net.psn_status.def));
-	}
-
 	//                _                               _   _______    _
 	//       /\      | |                             | | |__   __|  | |
 	//      /  \   __| |_   ____ _ _ __   ___ ___  __| |    | | __ _| |__
@@ -1532,33 +1005,12 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	m_emu_settings->EnhanceCheckBox(ui->debugConsoleMode, emu_settings_type::DebugConsoleMode);
 	SubscribeTooltip(ui->debugConsoleMode, tooltips.settings.debug_console_mode);
 
-	m_emu_settings->EnhanceCheckBox(ui->accurateDFMA, emu_settings_type::AccurateDFMA);
-	SubscribeTooltip(ui->accurateDFMA, tooltips.settings.accurate_dfma);
-	ui->accurateDFMA->setDisabled(utils::has_fma3() || utils::has_fma4());
+	m_emu_settings->EnhanceCheckBox(ui->accurateLLVMdfma, emu_settings_type::AccurateLLVMdfma);
+	SubscribeTooltip(ui->accurateLLVMdfma, tooltips.settings.accurate_llvm_dfma);
+	ui->accurateLLVMdfma->setDisabled(utils::has_fma3() || utils::has_fma4());
 
-	m_emu_settings->EnhanceCheckBox(ui->accurateRSXAccess, emu_settings_type::AccurateRSXAccess);
-	SubscribeTooltip(ui->accurateRSXAccess, tooltips.settings.accurate_rsx_access);
-
-	m_emu_settings->EnhanceCheckBox(ui->accurateSpuDMA, emu_settings_type::AccurateSpuDMA);
-	SubscribeTooltip(ui->accurateSpuDMA, tooltips.settings.accurate_spu_dma);
-
-	m_emu_settings->EnhanceCheckBox(ui->ppuNJFixup, emu_settings_type::PPUNJFixup);
-	SubscribeTooltip(ui->ppuNJFixup, tooltips.settings.fixup_ppunj);
-
-	m_emu_settings->EnhanceCheckBox(ui->fixupPPUVNAN, emu_settings_type::FixupPPUVNAN);
-	SubscribeTooltip(ui->fixupPPUVNAN, tooltips.settings.fixup_ppuvnan);
-
-	m_emu_settings->EnhanceCheckBox(ui->llvmPrecompilation, emu_settings_type::LLVMPrecompilation);
-	SubscribeTooltip(ui->llvmPrecompilation, tooltips.settings.llvm_precompilation);
-
-	m_emu_settings->EnhanceCheckBox(ui->antiCheatSavestates, emu_settings_type::SuspendEmulationSavestateMode);
-	SubscribeTooltip(ui->antiCheatSavestates, tooltips.settings.anti_cheat_savestates);
-
-	m_emu_settings->EnhanceCheckBox(ui->compatibleSavestates, emu_settings_type::CompatibleEmulationSavestateMode);
-	SubscribeTooltip(ui->compatibleSavestates, tooltips.settings.compatible_savestates);
-
-	m_emu_settings->EnhanceCheckBox(ui->spuProfiler, emu_settings_type::SPUProfiler);
-	SubscribeTooltip(ui->spuProfiler, tooltips.settings.spu_profiler);
+	m_emu_settings->EnhanceCheckBox(ui->AccurateVectorNaN, emu_settings_type::AccurateVectorNaN);
+	SubscribeTooltip(ui->AccurateVectorNaN, tooltips.settings.accurate_vector_nan);
 
 	m_emu_settings->EnhanceCheckBox(ui->silenceAllLogs, emu_settings_type::SilenceAllLogs);
 	SubscribeTooltip(ui->silenceAllLogs, tooltips.settings.silence_all_logs);
@@ -1572,34 +1024,11 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	m_emu_settings->EnhanceCheckBox(ui->dumpDepth, emu_settings_type::WriteDepthBuffer);
 	SubscribeTooltip(ui->dumpDepth, tooltips.settings.dump_depth);
 
-	m_emu_settings->EnhanceCheckBox(ui->handleTiledMemory, emu_settings_type::HandleRSXTiledMemory);
-	SubscribeTooltip(ui->handleTiledMemory, tooltips.settings.handle_tiled_memory);
+	m_emu_settings->EnhanceCheckBox(ui->disableOnDiskShaderCache, emu_settings_type::DisableOnDiskShaderCache);
+	SubscribeTooltip(ui->disableOnDiskShaderCache, tooltips.settings.disable_on_disk_shader_cache);
 
-	m_emu_settings->EnhanceCheckBox(ui->vblankNTSCFixup, emu_settings_type::VBlankNTSCFixup);
-
-	ui->mfcDelayCommand->setChecked(m_emu_settings->GetSetting(emu_settings_type::MFCCommandsShuffling) == "1");
-	SubscribeTooltip(ui->mfcDelayCommand, tooltips.settings.mfc_delay_command);
-	connect(ui->mfcDelayCommand, &QCheckBox::checkStateChanged, [&](Qt::CheckState val)
-	{
-		const std::string str = val != Qt::Unchecked ? "1" : "0";
-		m_emu_settings->SetSetting(emu_settings_type::MFCCommandsShuffling, str);
-	});
-
-	m_emu_settings->EnhanceCheckBox(ui->disableMslFastMath, emu_settings_type::DisableMSLFastMath);
-#ifdef __APPLE__
-	SubscribeTooltip(ui->disableMslFastMath, tooltips.settings.disable_msl_fast_math);
-#else
-	ui->disableMslFastMath->setVisible(false);
-#endif
-
-	m_emu_settings->EnhanceCheckBox(ui->disableAsyncHostMM, emu_settings_type::DisableAsyncHostMM);
-	SubscribeTooltip(ui->disableAsyncHostMM, tooltips.settings.disable_async_host_mm);
-
-	m_emu_settings->EnhanceCheckBox(ui->disableSpinOptimization, emu_settings_type::DisableSpinOptimization);
-	SubscribeTooltip(ui->disableSpinOptimization, tooltips.settings.disable_spin_optimization);
-
-	m_emu_settings->EnhanceCheckBox(ui->enableSpuEventsBusyLoop, emu_settings_type::EnabledSPUEventsBusyLoop);
-	SubscribeTooltip(ui->enableSpuEventsBusyLoop, tooltips.settings.enable_spu_events_busy_loop);
+	m_emu_settings->EnhanceCheckBox(ui->relaxedZCULL, emu_settings_type::RelaxedZCULL);
+	SubscribeTooltip(ui->relaxedZCULL, tooltips.settings.relaxed_zcull);
 
 	// Comboboxes
 
@@ -1607,24 +1036,18 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	ui->maxSPURSThreads->setItemText(ui->maxSPURSThreads->findData(6), tr("Unlimited (Default)", "Max SPURS threads"));
 	SubscribeTooltip(ui->gb_max_spurs_threads, tooltips.settings.max_spurs_threads);
 
-	m_emu_settings->EnhanceComboBox(ui->exclusiveFullscreenMode, emu_settings_type::ExclusiveFullscreenMode);
-	SubscribeTooltip(ui->gb_exclusiveFullscreen, tooltips.settings.exclusive_fullscreen_mode);
-
 	m_emu_settings->EnhanceComboBox(ui->sleepTimersAccuracy, emu_settings_type::SleepTimersAccuracy);
 	SubscribeTooltip(ui->gb_sleep_timers_accuracy, tooltips.settings.sleep_timers_accuracy);
 
-	m_emu_settings->EnhanceComboBox(ui->FIFOAccuracy, emu_settings_type::FIFOAccuracy);
-	SubscribeTooltip(ui->gb_rsx_fifo_accuracy, tooltips.settings.rsx_fifo_accuracy);
-
-	// Hide a developers' setting
-	remove_item(ui->FIFOAccuracy, static_cast<int>(rsx_fifo_mode::as_ps3), static_cast<int>(g_cfg.core.rsx_fifo_accuracy.def));
+	m_emu_settings->EnhanceComboBox(ui->vulkansched, emu_settings_type::VulkanAsyncSchedulerDriver);
+	SubscribeTooltip(ui->gb_vulkansched, tooltips.settings.vulkan_async_scheduler);
 
 	// Sliders
 
 	EnhanceSlider(emu_settings_type::DriverWakeUpDelay, ui->wakeupDelay, ui->wakeupText, tr(reinterpret_cast<const char*>(u8"%0 µs"), "Driver wake up delay"));
-	SnapSlider(ui->wakeupDelay, 20);
-	ui->wakeupDelay->setMaximum(800); // Very large values must be entered with config.yml changes
-	ui->wakeupDelay->setPageStep(20);
+	SnapSlider(ui->wakeupDelay, 200);
+	ui->wakeupDelay->setMaximum(7000); // Very large values must be entered with config.yml changes
+	ui->wakeupDelay->setPageStep(200);
 	const int wakeup_def = stoi(m_emu_settings->GetSettingDefault(emu_settings_type::DriverWakeUpDelay));
 	connect(ui->wakeupReset, &QAbstractButton::clicked, [wakeup_def, this]()
 	{
@@ -1644,41 +1067,25 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	SnapSlider(ui->clockScale, 10);
 	ui->clockScale->setPageStep(50);
 	const int clocks_scale_def = stoi(m_emu_settings->GetSettingDefault(emu_settings_type::ClocksScale));
-	connect(ui->clockScaleReset, &QAbstractButton::clicked, [clocks_scale_def, this]()
+	connect(ui->clockScaleReset, &QAbstractButton::clicked, [=, this]()
 	{
 		ui->clockScale->setValue(clocks_scale_def);
 	});
 
-	EnhanceSlider(emu_settings_type::MaxPreemptCount, ui->maxPreemptCount, ui->preemptText, tr(reinterpret_cast<const char*>(u8"%0"), "Max CPU preempt count"));
-	SubscribeTooltip(ui->gb_max_preempt_count, tooltips.settings.max_cpu_preempt);
-
-#ifdef _WIN32
-	// Windows' thread execution slice is much larger than on other platforms
-	SnapSlider(ui->maxPreemptCount, 5);
-	ui->maxPreemptCount->setPageStep(20);
-#else
-	SnapSlider(ui->maxPreemptCount, 10);
-	ui->maxPreemptCount->setPageStep(50);
-#endif
-
-	const int preempt_def = stoi(m_emu_settings->GetSettingDefault(emu_settings_type::MaxPreemptCount));
-	connect(ui->preemptReset, &QAbstractButton::clicked, [preempt_def, this]()
-	{
-		ui->maxPreemptCount->setValue(preempt_def);
-	});
-
 	if (!game) // Prevent users from doing dumb things
 	{
-		ui->gb_vblank->setDisabled(true);
+		ui->vblank->setDisabled(true);
+		ui->vblankReset->setDisabled(true);
 		SubscribeTooltip(ui->gb_vblank, tooltips.settings.disabled_from_global);
-		ui->gb_clockScale->setDisabled(true);
+		ui->clockScale->setDisabled(true);
+		ui->clockScaleReset->setDisabled(true);
 		SubscribeTooltip(ui->gb_clockScale, tooltips.settings.disabled_from_global);
-		ui->gb_wakeupDelay->setDisabled(true);
+		ui->wakeupDelay->setDisabled(true);
+		ui->wakeupReset->setDisabled(true);
 		SubscribeTooltip(ui->gb_wakeupDelay, tooltips.settings.disabled_from_global);
 	}
 	else
 	{
-		SubscribeTooltip(ui->vblankNTSCFixup, tooltips.settings.vblank_ntsc_fixup);
 		SubscribeTooltip(ui->gb_vblank, tooltips.settings.vblank_rate);
 		SubscribeTooltip(ui->gb_clockScale, tooltips.settings.clocks_scale);
 		SubscribeTooltip(ui->gb_wakeupDelay, tooltips.settings.wake_up_delay);
@@ -1697,7 +1104,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 		const auto list = (lib.second ? ui->hleList : ui->lleList);
 
-		QListWidgetItem* item = new QListWidgetItem(QString(lib.first.data()), list);
+		QListWidgetItem* item = new QListWidgetItem(qsv(lib.first), list);
 		item->setFlags(item->flags() | Qt::ItemIsUserCheckable); // set checkable flag
 
 		// If no override selected (res=0), checkbox is unchecked
@@ -1756,7 +1163,12 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		}
 	};
 
-	const auto reset_library_lists = [this, on_lib_state_changed]()
+	// Sort libs
+	on_lib_state_changed({});
+
+	// Events
+	connect(ui->searchBox, &QLineEdit::textChanged, on_lib_state_changed);
+	connect(ui->resetLleList, &QAbstractButton::clicked, [this, on_lib_state_changed]()
 	{
 		for (int i = 0; i < ui->lleList->count(); i++)
 		{
@@ -1769,14 +1181,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		}
 
 		on_lib_state_changed(ui->searchBox->text());
-	};
-
-	// Sort libs
-	on_lib_state_changed({});
-
-	// Events
-	connect(ui->searchBox, &QLineEdit::textChanged, on_lib_state_changed);
-	connect(ui->resetLleList, &QAbstractButton::clicked, reset_library_lists);
+	});
 
 	// enable multiselection (there must be a better way)
 	connect(ui->lleList, &QListWidget::itemChanged, [this](QListWidgetItem* item)
@@ -1795,8 +1200,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		}
 	});
 
-	connect(this, &settings_dialog::signal_restore_dependant_defaults, this, reset_library_lists);
-
 	//    ______                 _       _               _______    _
 	//   |  ____|               | |     | |             |__   __|  | |
 	//   | |__   _ __ ___  _   _| | __ _| |_ ___  _ __     | | __ _| |__
@@ -1808,11 +1211,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 	m_emu_settings->EnhanceComboBox(ui->maxLLVMThreads, emu_settings_type::MaxLLVMThreads, true, true, utils::get_thread_count());
 	SubscribeTooltip(ui->gb_max_llvm, tooltips.settings.max_llvm_threads);
-	ui->maxLLVMThreads->setItemText(ui->maxLLVMThreads->findData(0), tr("All (%1)", "Max LLVM Compile Threads").arg(utils::get_thread_count()));
-
-	m_emu_settings->EnhanceComboBox(ui->shaderCompilerThreads, emu_settings_type::ShaderCompilerNumThreads, true);
-	SubscribeTooltip(ui->gb_shader_compiler_threads, tooltips.settings.shader_compiler_threads);
-	ui->shaderCompilerThreads->setItemText(ui->shaderCompilerThreads->findData(0), tr("Auto", "Max Shader Compile Threads"));
+	ui->maxLLVMThreads->setItemText(ui->maxLLVMThreads->findData(0), tr("All (%1)", "Max LLVM threads").arg(utils::get_thread_count()));
 
 	m_emu_settings->EnhanceComboBox(ui->perfOverlayDetailLevel, emu_settings_type::PerfOverlayDetailLevel);
 	SubscribeTooltip(ui->perf_overlay_detail_level, tooltips.settings.perf_overlay_detail_level);
@@ -1825,52 +1224,28 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	m_emu_settings->EnhanceCheckBox(ui->exitOnStop, emu_settings_type::ExitRPCS3OnFinish);
 	SubscribeTooltip(ui->exitOnStop, tooltips.settings.exit_on_stop);
 
-	m_emu_settings->EnhanceCheckBox(ui->pauseOnFocusLoss, emu_settings_type::PauseOnFocusLoss);
-	SubscribeTooltip(ui->pauseOnFocusLoss, tooltips.settings.pause_on_focus_loss);
+	m_emu_settings->EnhanceCheckBox(ui->alwaysStart, emu_settings_type::StartOnBoot);
+	SubscribeTooltip(ui->alwaysStart, tooltips.settings.start_on_boot);
 
 	m_emu_settings->EnhanceCheckBox(ui->startGameFullscreen, emu_settings_type::StartGameFullscreen);
 	SubscribeTooltip(ui->startGameFullscreen, tooltips.settings.start_game_fullscreen);
 
 	m_emu_settings->EnhanceCheckBox(ui->preventDisplaySleep, emu_settings_type::PreventDisplaySleep);
 	SubscribeTooltip(ui->preventDisplaySleep, tooltips.settings.prevent_display_sleep);
-	ui->preventDisplaySleep->setEnabled(Emu.GetCallbacks().display_sleep_control_supported());
+	ui->preventDisplaySleep->setEnabled(display_sleep_control_supported());
 
 	m_emu_settings->EnhanceCheckBox(ui->showTrophyPopups, emu_settings_type::ShowTrophyPopups);
 	SubscribeTooltip(ui->showTrophyPopups, tooltips.settings.show_trophy_popups);
 
-	m_emu_settings->EnhanceCheckBox(ui->showRpcnPopups, emu_settings_type::ShowRpcnPopups);
-	SubscribeTooltip(ui->showRpcnPopups, tooltips.settings.show_rpcn_popups);
-
 	m_emu_settings->EnhanceCheckBox(ui->useNativeInterface, emu_settings_type::UseNativeInterface);
 	SubscribeTooltip(ui->useNativeInterface, tooltips.settings.use_native_interface);
 
 	m_emu_settings->EnhanceCheckBox(ui->showShaderCompilationHint, emu_settings_type::ShowShaderCompilationHint);
 	SubscribeTooltip(ui->showShaderCompilationHint, tooltips.settings.show_shader_compilation_hint);
 
-	m_emu_settings->EnhanceCheckBox(ui->showPPUCompilationHint, emu_settings_type::ShowPPUCompilationHint);
-	SubscribeTooltip(ui->showPPUCompilationHint, tooltips.settings.show_ppu_compilation_hint);
-
-	m_emu_settings->EnhanceCheckBox(ui->showAutosaveAutoloadHint, emu_settings_type::ShowAutosaveAutoloadHint);
-	SubscribeTooltip(ui->showAutosaveAutoloadHint, tooltips.settings.show_autosave_autoload_hint);
-
-	m_emu_settings->EnhanceCheckBox(ui->showPressureIntensityToggleHint, emu_settings_type::ShowPressureIntensityToggleHint);
-	SubscribeTooltip(ui->showPressureIntensityToggleHint, tooltips.settings.show_pressure_intensity_toggle_hint);
-
-	m_emu_settings->EnhanceCheckBox(ui->showAnalogLimiterToggleHint, emu_settings_type::ShowAnalogLimiterToggleHint);
-	SubscribeTooltip(ui->showAnalogLimiterToggleHint, tooltips.settings.show_analog_limiter_toggle_hint);
-
-	m_emu_settings->EnhanceCheckBox(ui->showMouseAndKeyboardToggleHint, emu_settings_type::ShowMouseAndKeyboardToggleHint);
-	SubscribeTooltip(ui->showMouseAndKeyboardToggleHint, tooltips.settings.show_mouse_and_keyboard_toggle_hint);
-
-	m_emu_settings->EnhanceCheckBox(ui->pauseDuringHomeMenu, emu_settings_type::PauseDuringHomeMenu);
-	SubscribeTooltip(ui->pauseDuringHomeMenu, tooltips.settings.pause_during_home_menu);
-
-	m_emu_settings->EnhanceCheckBox(ui->pausedSavestates, emu_settings_type::StartSavestatePaused);
-	SubscribeTooltip(ui->pausedSavestates, tooltips.settings.paused_savestates);
-
 	m_emu_settings->EnhanceCheckBox(ui->perfOverlayCenterX, emu_settings_type::PerfOverlayCenterX);
 	SubscribeTooltip(ui->perfOverlayCenterX, tooltips.settings.perf_overlay_center_x);
-	connect(ui->perfOverlayCenterX, &QCheckBox::toggled, [this](bool checked)
+	connect(ui->perfOverlayCenterX, &QCheckBox::clicked, [this](bool checked)
 	{
 		ui->perfOverlayMarginX->setEnabled(!checked);
 	});
@@ -1878,7 +1253,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 	m_emu_settings->EnhanceCheckBox(ui->perfOverlayCenterY, emu_settings_type::PerfOverlayCenterY);
 	SubscribeTooltip(ui->perfOverlayCenterY, tooltips.settings.perf_overlay_center_y);
-	connect(ui->perfOverlayCenterY, &QCheckBox::toggled, [this](bool checked)
+	connect(ui->perfOverlayCenterY, &QCheckBox::clicked, [this](bool checked)
 	{
 		ui->perfOverlayMarginY->setEnabled(!checked);
 	});
@@ -1892,7 +1267,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 	m_emu_settings->EnhanceCheckBox(ui->perfOverlayEnabled, emu_settings_type::PerfOverlayEnabled);
 	SubscribeTooltip(ui->perfOverlayEnabled, tooltips.settings.perf_overlay_enabled);
-	const auto enable_perf_overlay_options = [this](bool enabled)
+	auto enable_perf_overlay_options = [this](bool enabled)
 	{
 		ui->label_detail_level->setEnabled(enabled);
 		ui->label_update_interval->setEnabled(enabled);
@@ -1916,11 +1291,11 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		ui->perf_overlay_frametime_datapoints->setEnabled(enabled);
 	};
 	enable_perf_overlay_options(ui->perfOverlayEnabled->isChecked());
-	connect(ui->perfOverlayEnabled, &QCheckBox::toggled, enable_perf_overlay_options);
+	connect(ui->perfOverlayEnabled, &QCheckBox::clicked, enable_perf_overlay_options);
 
 	m_emu_settings->EnhanceCheckBox(ui->shaderLoadBgEnabled, emu_settings_type::ShaderLoadBgEnabled);
 	SubscribeTooltip(ui->shaderLoadBgEnabled, tooltips.settings.shader_load_bg_enabled);
-	const auto enable_shader_loader_options = [this](bool enabled)
+	auto enable_shader_loader_options = [this](bool enabled)
 	{
 		ui->label_shaderLoadBgDarkening->setEnabled(enabled);
 		ui->label_shaderLoadBgBlur->setEnabled(enabled);
@@ -1928,7 +1303,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		ui->shaderLoadBgBlur->setEnabled(enabled);
 	};
 	enable_shader_loader_options(ui->shaderLoadBgEnabled->isChecked());
-	connect(ui->shaderLoadBgEnabled, &QCheckBox::toggled, enable_shader_loader_options);
+	connect(ui->shaderLoadBgEnabled, &QCheckBox::clicked, enable_shader_loader_options);
 
 	// Sliders
 
@@ -1972,31 +1347,31 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		SubscribeTooltip(ui->gs_hideMouseOnIdle_widget, tooltips.settings.hide_mouse_on_idle);
 
 		ui->gs_disableMouse->setChecked(m_gui_settings->GetValue(gui::gs_disableMouse).toBool());
-		connect(ui->gs_disableMouse, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->gs_disableMouse, &QCheckBox::clicked, [this](bool val)
 		{
-			m_gui_settings->SetValue(gui::gs_disableMouse, checked);
+			m_gui_settings->SetValue(gui::gs_disableMouse, val);
 		});
 
 		ui->gs_disableKbHotkeys->setChecked(m_gui_settings->GetValue(gui::gs_disableKbHotkeys).toBool());
-		connect(ui->gs_disableKbHotkeys, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->gs_disableKbHotkeys, &QCheckBox::clicked, [this](bool val)
 		{
-			m_gui_settings->SetValue(gui::gs_disableKbHotkeys, checked);
+			m_gui_settings->SetValue(gui::gs_disableKbHotkeys, val);
 		});
 
 		ui->gs_showMouseInFullscreen->setChecked(m_gui_settings->GetValue(gui::gs_showMouseFs).toBool());
-		connect(ui->gs_showMouseInFullscreen, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->gs_showMouseInFullscreen, &QCheckBox::clicked, [this](bool val)
 		{
-			m_gui_settings->SetValue(gui::gs_showMouseFs, checked);
+			m_gui_settings->SetValue(gui::gs_showMouseFs, val);
 		});
 
 		ui->gs_lockMouseInFullscreen->setChecked(m_gui_settings->GetValue(gui::gs_lockMouseFs).toBool());
-		connect(ui->gs_lockMouseInFullscreen, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->gs_lockMouseInFullscreen, &QCheckBox::clicked, [this](bool val)
 		{
-			m_gui_settings->SetValue(gui::gs_lockMouseFs, checked);
+			m_gui_settings->SetValue(gui::gs_lockMouseFs, val);
 		});
 
 		ui->gs_hideMouseOnIdle->setChecked(m_gui_settings->GetValue(gui::gs_hideMouseIdle).toBool());
-		connect(ui->gs_hideMouseOnIdle, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->gs_hideMouseOnIdle, &QCheckBox::clicked, [this](bool checked)
 		{
 			m_gui_settings->SetValue(gui::gs_hideMouseIdle, checked);
 			ui->gs_hideMouseOnIdleTime->setEnabled(checked);
@@ -2009,12 +1384,9 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		});
 
 		const bool enable_buttons = m_gui_settings->GetValue(gui::gs_resize).toBool();
-		const bool use_manual_resize = m_gui_settings->GetValue(gui::gs_resize_manual).toBool();
 		ui->gs_resizeOnBoot->setChecked(enable_buttons);
-		ui->gs_resizeOnBootManual->setChecked(use_manual_resize);
-		ui->gs_resizeOnBootManual->setEnabled(enable_buttons);
-		ui->gs_width->setEnabled(enable_buttons && use_manual_resize);
-		ui->gs_height->setEnabled(enable_buttons && use_manual_resize);
+		ui->gs_width->setEnabled(enable_buttons);
+		ui->gs_height->setEnabled(enable_buttons);
 
 		const QRect screen = QGuiApplication::primaryScreen()->geometry();
 		const int width = m_gui_settings->GetValue(gui::gs_width).toInt();
@@ -2022,27 +1394,18 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		ui->gs_width->setValue(std::min(width, screen.width()));
 		ui->gs_height->setValue(std::min(height, screen.height()));
 
-		connect(ui->gs_resizeOnBoot, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->gs_resizeOnBoot, &QCheckBox::clicked, [=, this](bool val)
 		{
-			const bool enabled = checked && ui->gs_resizeOnBootManual->isChecked();
-			m_gui_settings->SetValue(gui::gs_resize, checked);
-			ui->gs_resizeOnBootManual->setEnabled(checked);
-			ui->gs_width->setEnabled(enabled);
-			ui->gs_height->setEnabled(enabled);
+			m_gui_settings->SetValue(gui::gs_resize, val);
+			ui->gs_width->setEnabled(val);
+			ui->gs_height->setEnabled(val);
 		});
-		connect(ui->gs_resizeOnBootManual, &QCheckBox::toggled, [this](bool checked)
-		{
-			const bool enabled = checked && ui->gs_resizeOnBoot->isChecked();
-			m_gui_settings->SetValue(gui::gs_resize_manual, checked);
-			ui->gs_width->setEnabled(enabled);
-			ui->gs_height->setEnabled(enabled);
-		});
-		connect(ui->gs_width, &QSpinBox::editingFinished, [this]()
+		connect(ui->gs_width, &QSpinBox::editingFinished, [=, this]()
 		{
 			ui->gs_width->setValue(std::min(ui->gs_width->value(), QGuiApplication::primaryScreen()->size().width()));
 			m_gui_settings->SetValue(gui::gs_width, ui->gs_width->value());
 		});
-		connect(ui->gs_height, &QSpinBox::editingFinished, [this]()
+		connect(ui->gs_height, &QSpinBox::editingFinished, [=, this]()
 		{
 			ui->gs_height->setValue(std::min(ui->gs_height->value(), QGuiApplication::primaryScreen()->size().height()));
 			m_gui_settings->SetValue(gui::gs_height, ui->gs_height->value());
@@ -2059,7 +1422,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	const auto get_game_window_title = [this, game](const QString& format)
 	{
 		rpcs3::title_format_data title_data;
-		title_data.format = format.toStdString();
+		title_data.format = sstr(format);
 		title_data.renderer = m_emu_settings->GetSetting(emu_settings_type::Renderer);
 		title_data.vulkan_adapter = m_emu_settings->GetSetting(emu_settings_type::VulkanAdapter);
 		title_data.fps = 60.;
@@ -2071,7 +1434,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		}
 		else
 		{
-			title_data.title = tr("My Game", "Game window title").toStdString();
+			title_data.title = sstr(tr("My Game", "Game window title"));
 			title_data.title_id = "ABCD12345";
 		}
 
@@ -2082,17 +1445,17 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 			return QStringLiteral("RPCS3");
 		}
 
-		return QString::fromStdString(game_window_title);
+		return qstr(game_window_title);
 	};
 
 	const auto set_game_window_title = [get_game_window_title, this](const std::string& format)
 	{
-		const QString game_window_title_format = QString::fromStdString(format);
-		const QString game_window_title = get_game_window_title(game_window_title_format);
-		const int width = ui->label_game_window_title_format->sizeHint().width();
-		const QFontMetrics metrics = ui->label_game_window_title_format->fontMetrics();
-		const QString elided_text = metrics.elidedText(game_window_title_format, Qt::ElideRight, width);
-		const QString tooltip = game_window_title_format + QStringLiteral("\n\n") + game_window_title;
+		const auto game_window_title_format = qstr(format);
+		const auto game_window_title = get_game_window_title(game_window_title_format);
+		const auto width = ui->label_game_window_title_format->sizeHint().width();
+		const auto metrics = ui->label_game_window_title_format->fontMetrics();
+		const auto elided_text = metrics.elidedText(game_window_title_format, Qt::ElideRight, width);
+		const auto tooltip = game_window_title_format + QStringLiteral("\n\n") + game_window_title;
 
 		ui->label_game_window_title_format->setText(elided_text);
 		ui->label_game_window_title_format->setToolTip(tooltip);
@@ -2129,7 +1492,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 		const std::string game_title_format = m_emu_settings->GetSetting(emu_settings_type::WindowTitleFormat);
 
-		QString edited_format = QString::fromStdString(game_title_format);
+		QString edited_format = qstr(game_title_format);
 
 		input_dialog dlg(-1, edited_format, tr("Game Window Title Format", "Game window title"), get_game_window_title_label(edited_format), "", this);
 		dlg.resize(width() * .75, dlg.height());
@@ -2142,19 +1505,17 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 		if (dlg.exec() == QDialog::Accepted)
 		{
-			m_emu_settings->SetSetting(emu_settings_type::WindowTitleFormat, edited_format.toStdString());
+			m_emu_settings->SetSetting(emu_settings_type::WindowTitleFormat, sstr(edited_format));
 			set_game_window_title(m_emu_settings->GetSetting(emu_settings_type::WindowTitleFormat));
 		}
 	});
 
-	const auto reset_game_window_title_format = [set_game_window_title, this]()
+	connect(ui->reset_button_game_window_title_format, &QAbstractButton::clicked, [set_game_window_title, this]()
 	{
 		const std::string default_game_title_format = m_emu_settings->GetSettingDefault(emu_settings_type::WindowTitleFormat);
 		m_emu_settings->SetSetting(emu_settings_type::WindowTitleFormat, default_game_title_format);
 		set_game_window_title(default_game_title_format);
-	};
-	connect(ui->reset_button_game_window_title_format, &QAbstractButton::clicked, this, reset_game_window_title_format);
-	connect(this, &settings_dialog::signal_restore_dependant_defaults, this, reset_game_window_title_format);
+	});
 
 	// Load and apply the configured game window title format
 	set_game_window_title(m_emu_settings->GetSetting(emu_settings_type::WindowTitleFormat));
@@ -2179,27 +1540,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		SubscribeTooltip(ui->cb_show_pup_install, tooltips.settings.show_pup_install);
 		SubscribeTooltip(ui->cb_show_obsolete_cfg_dialog, tooltips.settings.show_obsolete_cfg);
 		SubscribeTooltip(ui->cb_show_same_buttons_dialog, tooltips.settings.show_same_buttons);
-		SubscribeTooltip(ui->cb_show_restart_hint, tooltips.settings.show_restart_hint);
 		SubscribeTooltip(ui->gb_updates, tooltips.settings.check_update_start);
-		SubscribeTooltip(ui->gb_uuid, tooltips.settings.uuid);
-
-		// Pad navigation
-		SubscribeTooltip(ui->cb_pad_navigation, tooltips.settings.pad_navigation);
-		SubscribeTooltip(ui->cb_global_pad_navigation, tooltips.settings.global_navigation);
-		ui->cb_pad_navigation->setChecked(m_gui_settings->GetValue(gui::nav_enabled).toBool());
-		ui->cb_global_pad_navigation->setChecked(m_gui_settings->GetValue(gui::nav_global).toBool());
-#if defined(_WIN32) || defined(__linux__) || defined(__APPLE__)
-		connect(ui->cb_pad_navigation, &QCheckBox::toggled, [this](bool checked)
-		{
-			m_gui_settings->SetValue(gui::nav_enabled, checked);
-		});
-		connect(ui->cb_global_pad_navigation, &QCheckBox::toggled, [this](bool checked)
-		{
-			m_gui_settings->SetValue(gui::nav_global, checked);
-		});
-#else
-		ui->gb_gui_pad_input->setEnabled(false);
-#endif
 
 		// Discord:
 		SubscribeTooltip(ui->useRichPresence, tooltips.settings.use_rich_presence);
@@ -2209,7 +1550,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		ui->discordState->setEnabled(m_use_discord);
 		ui->discordState->setText(m_discord_state);
 
-		connect(ui->useRichPresence, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->useRichPresence, &QCheckBox::clicked, [this](bool checked)
 		{
 			ui->discordState->setEnabled(checked);
 			ui->label_discordState->setEnabled(checked);
@@ -2221,20 +1562,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 			m_discord_state = ui->discordState->text();
 		});
 
-		connect(ui->pb_uuid, &QAbstractButton::clicked, [this]()
-		{
-			std::string uuid;
-			if (!gui::utils::create_new_uuid(uuid))
-			{
-				QMessageBox::critical(this, tr("Error"), tr("Failed to create new installation ID!"), QMessageBox::Ok);
-				return;
-			}
-
-			ui->label_uuid->setText(QString::fromStdString(uuid));
-			gui::utils::log_uuid();
-		});
-		ui->label_uuid->setText(QString::fromStdString(gui::utils::load_uuid()));
-
 		// Log and TTY:
 		SubscribeTooltip(ui->log_limit, tooltips.settings.log_limit);
 		SubscribeTooltip(ui->tty_limit, tooltips.settings.tty_limit);
@@ -2287,7 +1614,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		ui->cb_show_pup_install->setChecked(m_gui_settings->GetValue(gui::ib_pup_success).toBool());
 		ui->cb_show_obsolete_cfg_dialog->setChecked(m_gui_settings->GetValue(gui::ib_obsolete_cfg).toBool());
 		ui->cb_show_same_buttons_dialog->setChecked(m_gui_settings->GetValue(gui::ib_same_buttons).toBool());
-		ui->cb_show_restart_hint->setChecked(m_gui_settings->GetValue(gui::ib_restart_hint).toBool());
 
 		ui->combo_updates->addItem(tr("Yes", "Updates"), gui::update_on);
 		ui->combo_updates->addItem(tr("Background", "Updates"), gui::update_bkg);
@@ -2296,7 +1622,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 		ui->combo_updates->setCurrentIndex(ui->combo_updates->findData(m_gui_settings->GetValue(gui::m_check_upd_start).toString()));
 		connect(ui->combo_updates, QOverload<int>::of(&QComboBox::currentIndexChanged), [this](int index)
 		{
-			if (index >= 0) m_gui_settings->SetValue(gui::m_check_upd_start, ui->combo_updates->itemData(index));
+			m_gui_settings->SetValue(gui::m_check_upd_start, ui->combo_updates->itemData(index));
 		});
 
 		const bool enable_ui_colors = m_gui_settings->GetValue(gui::m_enableUIColors).toBool();
@@ -2307,49 +1633,44 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 
 		connect(ui->pb_apply_stylesheet, &QAbstractButton::clicked, this, [this]() { ApplyStylesheet(false); });
 
-		connect(ui->cb_show_welcome, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->cb_show_welcome, &QCheckBox::clicked, [this](bool val)
 		{
-			m_gui_settings->SetValue(gui::ib_show_welcome, checked);
+			m_gui_settings->SetValue(gui::ib_show_welcome, val);
 		});
-		connect(ui->cb_show_exit_game, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->cb_show_exit_game, &QCheckBox::clicked, [this](bool val)
 		{
-			m_gui_settings->SetValue(gui::ib_confirm_exit, checked);
+			m_gui_settings->SetValue(gui::ib_confirm_exit, val);
 		});
-		connect(ui->cb_show_boot_game, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->cb_show_boot_game, &QCheckBox::clicked, [this](bool val)
 		{
-			m_gui_settings->SetValue(gui::ib_confirm_boot, checked);
+			m_gui_settings->SetValue(gui::ib_confirm_boot, val);
 		});
-		connect(ui->cb_show_pkg_install, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->cb_show_pkg_install, &QCheckBox::clicked, [this](bool val)
 		{
-			m_gui_settings->SetValue(gui::ib_pkg_success, checked);
+			m_gui_settings->SetValue(gui::ib_pkg_success, val);
 		});
-		connect(ui->cb_show_pup_install, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->cb_show_pup_install, &QCheckBox::clicked, [this](bool val)
 		{
-			m_gui_settings->SetValue(gui::ib_pup_success, checked);
+			m_gui_settings->SetValue(gui::ib_pup_success, val);
 		});
-		connect(ui->cb_show_obsolete_cfg_dialog, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->cb_show_obsolete_cfg_dialog, &QCheckBox::clicked, [this](bool val)
 		{
-			m_gui_settings->SetValue(gui::ib_obsolete_cfg, checked);
+			m_gui_settings->SetValue(gui::ib_obsolete_cfg, val);
 		});
-		connect(ui->cb_show_same_buttons_dialog, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->cb_show_same_buttons_dialog, &QCheckBox::clicked, [this](bool val)
 		{
-			m_gui_settings->SetValue(gui::ib_same_buttons, checked);
-		});
-		connect(ui->cb_show_restart_hint, &QCheckBox::toggled, [this](bool checked)
-		{
-			m_gui_settings->SetValue(gui::ib_restart_hint, checked);
+			m_gui_settings->SetValue(gui::ib_same_buttons, val);
 		});
 
-		connect(ui->cb_custom_colors, &QCheckBox::toggled, [this](bool checked)
+		connect(ui->cb_custom_colors, &QCheckBox::clicked, [this](bool val)
 		{
-			m_gui_settings->SetValue(gui::m_enableUIColors, checked);
-			ui->pb_gl_icon_color->setEnabled(checked);
-			ui->pb_sd_icon_color->setEnabled(checked);
-			ui->pb_tr_icon_color->setEnabled(checked);
+			m_gui_settings->SetValue(gui::m_enableUIColors, val);
+			ui->pb_gl_icon_color->setEnabled(val);
+			ui->pb_sd_icon_color->setEnabled(val);
+			ui->pb_tr_icon_color->setEnabled(val);
 			Q_EMIT GuiRepaintRequest();
 		});
-
-		const auto color_dialog = [&](const gui_save& color, const QString& title, QPushButton *button)
+		auto color_dialog = [&](const gui_save& color, const QString& title, QPushButton *button)
 		{
 			const QColor old_color = m_gui_settings->GetValue(color).value<QColor>();
 			QColorDialog dlg(old_color, this);
@@ -2371,15 +1692,15 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 			}
 		};
 
-		connect(ui->pb_gl_icon_color, &QAbstractButton::clicked, [color_dialog, this]()
+		connect(ui->pb_gl_icon_color, &QAbstractButton::clicked, [=, this]()
 		{
 			color_dialog(gui::gl_iconColor, tr("Choose gamelist icon color", "Settings: color dialog"), ui->pb_gl_icon_color);
 		});
-		connect(ui->pb_sd_icon_color, &QAbstractButton::clicked, [color_dialog, this]()
+		connect(ui->pb_sd_icon_color, &QAbstractButton::clicked, [=, this]()
 		{
 			color_dialog(gui::sd_icon_color, tr("Choose save manager icon color", "Settings: color dialog"), ui->pb_sd_icon_color);
 		});
-		connect(ui->pb_tr_icon_color, &QAbstractButton::clicked, [color_dialog, this]()
+		connect(ui->pb_tr_icon_color, &QAbstractButton::clicked, [=, this]()
 		{
 			color_dialog(gui::tr_icon_color, tr("Choose trophy manager icon color", "Settings: color dialog"), ui->pb_tr_icon_color);
 		});
@@ -2415,9 +1736,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	m_emu_settings->EnhanceCheckBox(ui->disableHwOcclusionQueries, emu_settings_type::DisableOcclusionQueries);
 	SubscribeTooltip(ui->disableHwOcclusionQueries, tooltips.settings.disable_occlusion_queries);
 
-	m_emu_settings->EnhanceCheckBox(ui->disableVideoOutput, emu_settings_type::DisableVideoOutput);
-	SubscribeTooltip(ui->disableVideoOutput, tooltips.settings.disable_video_output);
-
 	m_emu_settings->EnhanceCheckBox(ui->forceCpuBlitEmulation, emu_settings_type::ForceCPUBlitEmulation);
 	SubscribeTooltip(ui->forceCpuBlitEmulation, tooltips.settings.force_cpu_blit_emulation);
 
@@ -2430,25 +1748,16 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	m_emu_settings->EnhanceCheckBox(ui->strictTextureFlushing, emu_settings_type::StrictTextureFlushing);
 	SubscribeTooltip(ui->strictTextureFlushing, tooltips.settings.strict_texture_flushing);
 
+	m_emu_settings->EnhanceCheckBox(ui->DisableNativefp16, emu_settings_type::DisableNativefloat16);
+	SubscribeTooltip(ui->DisableNativefp16, tooltips.settings.disable_native_fp16);
+
+	m_emu_settings->EnhanceCheckBox(ui->Enable3D, emu_settings_type::Enable3D);
+	SubscribeTooltip(ui->Enable3D, tooltips.settings.enable_3d);
+
 	m_emu_settings->EnhanceCheckBox(ui->gpuTextureScaling, emu_settings_type::GPUTextureScaling);
 	SubscribeTooltip(ui->gpuTextureScaling, tooltips.settings.gpu_texture_scaling);
 
-	m_emu_settings->EnhanceCheckBox(ui->allowHostGPULabels, emu_settings_type::AllowHostGPULabels);
-	SubscribeTooltip(ui->allowHostGPULabels, tooltips.settings.allow_host_labels);
-
-	m_emu_settings->EnhanceCheckBox(ui->disableVertexCache, emu_settings_type::DisableVertexCache);
-	SubscribeTooltip(ui->disableVertexCache, tooltips.settings.disable_vertex_cache);
-
-	m_emu_settings->EnhanceCheckBox(ui->forceHwMSAAResolve, emu_settings_type::ForceHwMSAAResolve);
-	SubscribeTooltip(ui->forceHwMSAAResolve, tooltips.settings.force_hw_MSAA);
-
-	m_emu_settings->EnhanceCheckBox(ui->disableOnDiskShaderCache, emu_settings_type::DisableOnDiskShaderCache);
-	SubscribeTooltip(ui->disableOnDiskShaderCache, tooltips.settings.disable_on_disk_shader_cache);
-
 	// Checkboxes: core debug options
-	m_emu_settings->EnhanceCheckBox(ui->alwaysStart, emu_settings_type::StartOnBoot);
-	SubscribeTooltip(ui->alwaysStart, tooltips.settings.start_on_boot);
-
 	m_emu_settings->EnhanceCheckBox(ui->ppuDebug, emu_settings_type::PPUDebug);
 	SubscribeTooltip(ui->ppuDebug, tooltips.settings.ppu_debug);
 
@@ -2461,31 +1770,30 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	m_emu_settings->EnhanceCheckBox(ui->setDAZandFTZ, emu_settings_type::SetDAZandFTZ);
 	SubscribeTooltip(ui->setDAZandFTZ, tooltips.settings.set_daz_and_ftz);
 
-	m_emu_settings->EnhanceCheckBox(ui->accuratePPUSAT, emu_settings_type::AccuratePPUSAT);
-	SubscribeTooltip(ui->accuratePPUSAT, tooltips.settings.accurate_ppusat);
+	m_emu_settings->EnhanceCheckBox(ui->accurateGETLLAR, emu_settings_type::AccurateGETLLAR);
+	SubscribeTooltip(ui->accurateGETLLAR, tooltips.settings.accurate_getllar);
 
-	m_emu_settings->EnhanceCheckBox(ui->accuratePPUNJ, emu_settings_type::AccuratePPUNJ);
-	SubscribeTooltip(ui->accuratePPUNJ, tooltips.settings.accurate_ppunj);
-
-	m_emu_settings->EnhanceCheckBox(ui->accuratePPUVNAN, emu_settings_type::AccuratePPUVNAN);
-	SubscribeTooltip(ui->accuratePPUVNAN, tooltips.settings.accurate_ppuvnan);
-
-	m_emu_settings->EnhanceCheckBox(ui->accuratePPUFPCC, emu_settings_type::AccuratePPUFPCC);
-	SubscribeTooltip(ui->accuratePPUFPCC, tooltips.settings.accurate_ppufpcc);
+	m_emu_settings->EnhanceCheckBox(ui->accurateSpuDMA, emu_settings_type::AccurateSpuDMA);
+	SubscribeTooltip(ui->accurateSpuDMA, tooltips.settings.accurate_spu_dma);
 
 	m_emu_settings->EnhanceCheckBox(ui->accurateClineStores, emu_settings_type::AccurateClineStores);
 	SubscribeTooltip(ui->accurateClineStores, tooltips.settings.accurate_cache_line_stores);
 
+	m_emu_settings->EnhanceCheckBox(ui->accurateRSXAccess, emu_settings_type::AccurateRSXAccess);
+	SubscribeTooltip(ui->accurateRSXAccess, tooltips.settings.accurate_rsx_access);
+
+	m_emu_settings->EnhanceCheckBox(ui->ppuLlvmJavaModeHandling, emu_settings_type::PPULLVMJavaModeHandling);
+	SubscribeTooltip(ui->ppuLlvmJavaModeHandling, tooltips.settings.ppu_llvm_java_mode_handling);
+
+	m_emu_settings->EnhanceCheckBox(ui->ppuPrecompilation, emu_settings_type::PPULLVMPrecompilation);
+	SubscribeTooltip(ui->ppuPrecompilation, tooltips.settings.ppu_precompilation);
+
 	m_emu_settings->EnhanceCheckBox(ui->hookStFunc, emu_settings_type::HookStaticFuncs);
 	SubscribeTooltip(ui->hookStFunc, tooltips.settings.hook_static_functions);
 
 	m_emu_settings->EnhanceCheckBox(ui->perfReport, emu_settings_type::PerformanceReport);
 	SubscribeTooltip(ui->perfReport, tooltips.settings.enable_performance_report);
 
-	// Checkboxes: IO debug options
-	m_emu_settings->EnhanceCheckBox(ui->debugOverlayIO, emu_settings_type::IoDebugOverlay);
-	SubscribeTooltip(ui->debugOverlayIO, tooltips.settings.debug_overlay_io);
-
 	// Comboboxes
 
 	m_emu_settings->EnhanceComboBox(ui->combo_accurate_ppu_128, emu_settings_type::AccuratePPU128Loop, true);
@@ -2496,37 +1804,13 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	m_emu_settings->EnhanceComboBox(ui->combo_num_ppu_threads, emu_settings_type::NumPPUThreads, true);
 	SubscribeTooltip(ui->gb_num_ppu_threads, tooltips.settings.num_ppu_threads);
 
-	m_emu_settings->EnhanceComboBox(ui->vulkansched, emu_settings_type::VulkanAsyncSchedulerDriver);
-	SubscribeTooltip(ui->gb_vulkansched, tooltips.settings.vulkan_async_scheduler);
-
-	if (!restoreGeometry(m_gui_settings->GetValue(gui::cfg_geometry).toByteArray()))
-	{
-		// Ignore. This will most likely only fail if the setting doesn't contain any values
-	}
-}
-
-void settings_dialog::refresh_countrybox()
-{
-	const auto& vec_countries = countries::g_countries;
-	const std::string cur_country = m_emu_settings->GetSetting(emu_settings_type::PSNCountry);
-
-	ui->psnCountryBox->clear();
-
-	for (const auto& [cnty, code] : vec_countries)
-	{
-		ui->psnCountryBox->addItem(QString::fromUtf8(cnty.data(), static_cast<int>(cnty.size())), QString::fromUtf8(code.data(), static_cast<int>(code.size())));
-	}
-	ui->psnCountryBox->setCurrentIndex(ui->psnCountryBox->findData(QString::fromStdString(cur_country)));
-	ui->psnCountryBox->model()->sort(0, Qt::AscendingOrder);
-}
-
-void settings_dialog::closeEvent([[maybe_unused]] QCloseEvent* event)
-{
-	m_gui_settings->SetValue(gui::cfg_geometry, saveGeometry());
+	// Layout fix for High Dpi
+	layout()->setSizeConstraint(QLayout::SetFixedSize);
 }
 
 settings_dialog::~settings_dialog()
 {
+	delete ui;
 }
 
 void settings_dialog::EnhanceSlider(emu_settings_type settings_type, QSlider* slider, QLabel* label, const QString& label_text) const
@@ -2545,25 +1829,24 @@ void settings_dialog::EnhanceSlider(emu_settings_type settings_type, QSlider* sl
 
 void settings_dialog::SnapSlider(QSlider *slider, int interval)
 {
-	if (!slider)
+	connect(slider, &QSlider::sliderPressed, [this, slider]()
 	{
-		return;
-	}
+		m_current_slider = slider;
+	});
+
+	connect(slider, &QSlider::sliderReleased, [this]()
+	{
+		m_current_slider = nullptr;
+	});
 
-	// Snap the slider to the next best interval position if the slider is currently modified with the mouse.
 	connect(slider, &QSlider::valueChanged, [this, slider, interval](int value)
 	{
-		if (!slider || slider != m_current_slider)
+		if (slider != m_current_slider)
 		{
 			return;
 		}
 		slider->setValue(utils::rounded_div(value, interval) * interval);
 	});
-
-	// Register the slider for the event filter which updates m_current_slider if a QSlider was pressed or released with the mouse.
-	// We can't just use sliderPressed and sliderReleased signals to update m_current_slider because those only trigger if the handle was clicked.
-	slider->installEventFilter(this);
-	m_snap_sliders.insert(slider);
 }
 
 void settings_dialog::AddStylesheets()
@@ -2571,13 +1854,6 @@ void settings_dialog::AddStylesheets()
 	ui->combo_stylesheets->clear();
 
 	ui->combo_stylesheets->addItem(tr("None", "Stylesheets"), gui::NoStylesheet);
-
-	for (const QString& key : QStyleFactory::keys())
-	{
-		// Variant value: "native (<style>)"
-		ui->combo_stylesheets->addItem(tr("Native (%0)", "Stylesheets").arg(key), QString("%0 (%1)").arg(gui::NativeStylesheet, key));
-	}
-
 	ui->combo_stylesheets->addItem(tr("Default (Bright)", "Stylesheets"), gui::DefaultStylesheet);
 
 	for (const QString& entry : m_gui_settings->GetStylesheetEntries())
@@ -2597,7 +1873,7 @@ void settings_dialog::AddStylesheets()
 	}
 	else
 	{
-		cfg_log.warning("Trying to set an invalid stylesheets index: %d (%s)", index, m_current_stylesheet);
+		cfg_log.warning("Trying to set an invalid stylesheets index: %d (%s)", index, sstr(m_current_stylesheet));
 	}
 }
 
@@ -2619,11 +1895,14 @@ void settings_dialog::ApplyStylesheet(bool reset)
 	}
 }
 
-void settings_dialog::open()
+int settings_dialog::exec()
 {
-	QDialog::open();
-
-	ui->tab_widget_settings->setCurrentIndex(m_tab_index);
+	// singleShot Hack to fix following bug:
+	// If we use setCurrentIndex now we will miraculously see a resize of the dialog as soon as we
+	// switch to the cpu tab after conjuring the settings_dialog with another tab opened first.
+	// Weirdly enough this won't happen if we change the tab order so that anything else is at index 0.
+	ui->tab_widget_settings->setCurrentIndex(0);
+	QTimer::singleShot(0, [this]{ ui->tab_widget_settings->setCurrentIndex(m_tab_index); });
 
 	// Open a dialog if your config file contained invalid entries
 	QTimer::singleShot(10, [this]
@@ -2649,12 +1928,14 @@ void settings_dialog::open()
 			}
 		}
 	});
+
+	return QDialog::exec();
 }
 
 void settings_dialog::SubscribeDescription(QLabel* description)
 {
 	description->setFixedHeight(description->sizeHint().height());
-	m_description_labels.push_back(std::pair<QLabel*, QString>(description, description->text()));
+	m_description_labels.append(QPair<QLabel*, QString>(description, description->text()));
 }
 
 void settings_dialog::SubscribeTooltip(QObject* object, const QString& tooltip)
@@ -2666,18 +1947,6 @@ void settings_dialog::SubscribeTooltip(QObject* object, const QString& tooltip)
 // Thanks Dolphin
 bool settings_dialog::eventFilter(QObject* object, QEvent* event)
 {
-	if (m_snap_sliders.contains(object))
-	{
-		if (event->type() == QEvent::MouseButtonPress)
-		{
-			m_current_slider = static_cast<QSlider*>(object);
-		}
-		else if (event->type() == QEvent::MouseButtonRelease)
-		{
-			m_current_slider = nullptr;
-		}
-	}
-
 	if (!m_descriptions.contains(object))
 	{
 		return QDialog::eventFilter(object, event);
@@ -2687,9 +1956,11 @@ bool settings_dialog::eventFilter(QObject* object, QEvent* event)
 	{
 		const int i = ui->tab_widget_settings->currentIndex();
 
-		if (i >= 0 && static_cast<usz>(i) < m_description_labels.size())
+		if (i < m_description_labels.size())
 		{
-			if (QLabel* label = m_description_labels[i].first)
+			QLabel* label = m_description_labels[i].first;
+
+			if (label)
 			{
 				if (event->type() == QEvent::Enter)
 				{
@@ -2697,7 +1968,8 @@ bool settings_dialog::eventFilter(QObject* object, QEvent* event)
 				}
 				else if (event->type() == QEvent::Leave)
 				{
-					label->setText(m_description_labels[i].second);
+					const QString description = m_description_labels[i].second;
+					label->setText(description);
 				}
 			}
 		}
diff --git a/rpcs3/rpcs3qt/settings_dialog.h b/rpcs3/rpcs3qt/settings_dialog.h
index 0513227e80..1fa74ab82a 100644
--- a/rpcs3/rpcs3qt/settings_dialog.h
+++ b/rpcs3/rpcs3qt/settings_dialog.h
@@ -21,54 +21,42 @@ class settings_dialog : public QDialog
 	Q_OBJECT
 
 public:
-	explicit settings_dialog(std::shared_ptr<gui_settings> gui_settings, std::shared_ptr<emu_settings> emu_settings, int tab_index = 0, QWidget* parent = nullptr, const GameInfo* game = nullptr, bool create_cfg_from_global_cfg = true);
+	explicit settings_dialog(std::shared_ptr<gui_settings> gui_settings, std::shared_ptr<emu_settings> emu_settings, const int& tab_index = 0, QWidget *parent = nullptr, const GameInfo *game = nullptr);
 	~settings_dialog();
-	void open() override;
+	int exec() override;
 Q_SIGNALS:
 	void GuiStylesheetRequest();
 	void GuiRepaintRequest();
 	void EmuSettingsApplied();
-	void signal_restore_dependant_defaults();
 private:
 	void EnhanceSlider(emu_settings_type settings_type, QSlider* slider, QLabel* label, const QString& label_text) const;
 
 	// Snapping of sliders when moved with mouse
 	void SnapSlider(QSlider* slider, int interval);
 	QSlider* m_current_slider = nullptr;
-	std::set<QObject*> m_snap_sliders;
 
 	// Gui tab
 	void AddStylesheets();
 	void ApplyStylesheet(bool reset);
 	QString m_current_stylesheet;
-
 	// Gpu tab
 	QString m_old_renderer;
-
 	// Audio tab
-	std::array<QComboBox*, 4> m_mics_combo{};
+	QComboBox *m_mics_combo[4];
 
-	// IO tab
-	std::array<QComboBox*, 3> m_midi_type_combo{};
-	std::array<QComboBox*, 3> m_midi_device_combo{};
-
-	int m_tab_index = 0;
-	std::unique_ptr<Ui::settings_dialog> ui;
+	int m_tab_index;
+	Ui::settings_dialog *ui;
 	std::shared_ptr<gui_settings> m_gui_settings;
 	std::shared_ptr<emu_settings> m_emu_settings;
 
 	// Discord
-	bool m_use_discord = false;
+	bool m_use_discord;
 	QString m_discord_state;
 
 	// Descriptions
-	std::vector<std::pair<QLabel*, QString>> m_description_labels;
+	QList<QPair<QLabel*, QString>> m_description_labels;
 	QHash<QObject*, QString> m_descriptions;
 	void SubscribeDescription(QLabel* description);
 	void SubscribeTooltip(QObject* object, const QString& tooltip);
 	bool eventFilter(QObject* object, QEvent* event) override;
-	void closeEvent(QCloseEvent* event) override;
-
-	// Countries
-	void refresh_countrybox();
 };
diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui
index 7a3d4951a8..34f275c8b9 100644
--- a/rpcs3/rpcs3qt/settings_dialog.ui
+++ b/rpcs3/rpcs3qt/settings_dialog.ui
@@ -3,14 +3,14 @@
  <class>settings_dialog</class>
  <widget class="QDialog" name="settings_dialog">
   <property name="windowModality">
-   <enum>Qt::WindowModality::WindowModal</enum>
+   <enum>Qt::WindowModal</enum>
   </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>856</width>
-    <height>688</height>
+    <width>785</width>
+    <height>730</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -28,4440 +28,539 @@
   </property>
   <layout class="QVBoxLayout" name="settings_dialog_layout">
    <item>
-    <widget class="QScrollArea" name="scrollArea">
-     <property name="frameShape">
-      <enum>QFrame::Shape::NoFrame</enum>
-     </property>
-     <property name="widgetResizable">
+    <widget class="QTabWidget" name="tab_widget_settings">
+     <property name="enabled">
       <bool>true</bool>
      </property>
-     <widget class="QTabWidget" name="tab_widget_settings">
-      <property name="enabled">
-       <bool>true</bool>
-      </property>
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>821</width>
-        <height>716</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="currentIndex">
-       <number>0</number>
-      </property>
-      <widget class="QWidget" name="coreTab">
-       <attribute name="title">
-        <string>CPU</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="coreTabLayout" stretch="0,1,0">
-        <item>
-         <layout class="QHBoxLayout" name="coreTabItemLayout">
-          <item>
-           <layout class="QVBoxLayout" name="coreTabLeftLayout">
-            <item>
-             <widget class="QGroupBox" name="gb_ppu">
-              <property name="title">
-               <string>PPU Decoder</string>
-              </property>
-              <layout class="QVBoxLayout" name="ppu_layout">
-               <item>
-                <widget class="QRadioButton" name="ppu__static">
-                 <property name="text">
-                  <string notr="true">Interpreter (static)</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QRadioButton" name="ppu_llvm">
-                 <property name="text">
-                  <string notr="true">LLVM Recompiler (fastest)</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_spu">
-              <property name="title">
-               <string>SPU Decoder</string>
-              </property>
-              <layout class="QVBoxLayout" name="spu_layout">
-               <item>
-                <widget class="QRadioButton" name="spu__static">
-                 <property name="text">
-                  <string notr="true">Interpreter (static)</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QRadioButton" name="spu_dynamic">
-                 <property name="text">
-                  <string notr="true">Interpreter (dynamic)</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QRadioButton" name="spu_asmjit">
-                 <property name="text">
-                  <string notr="true">ASMJIT Recompiler (faster)</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QRadioButton" name="spu_llvm">
-                 <property name="text">
-                  <string notr="true">LLVM Recompiler (fastest)</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer name="coreTabLeftLayoutSpacer">
-              <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="coreTabMiddleLayout">
-            <item>
-             <widget class="QGroupBox" name="gb_xfloat_accuracy">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>SPU XFloat Accuracy</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_xfloat_accuracy_layout">
-               <item>
-                <widget class="QComboBox" name="xfloatAccuracy"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_spuBlockSize">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>SPU Block Size</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_spuBlockSize_layout">
-               <item>
-                <widget class="QComboBox" name="spuBlockSize"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="checkboxes">
-              <property name="title">
-               <string>Additional Settings</string>
-              </property>
-              <layout class="QVBoxLayout" name="checkboxes_layout">
-               <item>
-                <widget class="QCheckBox" name="spuLoopDetection">
-                 <property name="text">
-                  <string>Enable SPU loop detection</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_max_preempt_count">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>Max Power Saving CPU-preemptions</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_max_preempt_layout">
-               <item>
-                <widget class="QSlider" name="maxPreemptCount">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="maxPreemptLayout" stretch="0,0">
-                 <item>
-                  <widget class="QLabel" name="preemptText">
-                   <property name="text">
-                    <string>0</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="preemptReset">
-                   <property name="text">
-                    <string>Reset</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer name="coreTabMiddleLayoutSpacer">
-              <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="coreTabRightLayout" stretch="0,0,0,0">
-            <item>
-             <widget class="QGroupBox" name="gb_tsx">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>TSX Instructions</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_tsx_layout">
-               <item>
-                <widget class="QComboBox" name="enableTSX"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_spu_threads">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>Preferred SPU Threads</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_spu_threads_layout">
-               <item>
-                <widget class="QComboBox" name="preferredSPUThreads"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_threadsched">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>Thread Scheduler</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_threadsched_layout">
-               <item>
-                <widget class="QComboBox" name="threadsched"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer name="coreTabRightLayoutSpacer">
-              <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="coreTabSpacer">
-          <property name="orientation">
-           <enum>Qt::Orientation::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="gb_description_cpu">
-          <property name="title">
-           <string>Description</string>
-          </property>
-          <layout class="QVBoxLayout" name="gb_description_cpu_layout">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="coreTab">
+      <attribute name="title">
+       <string>CPU</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="coreTabLayout" stretch="0,1,0">
+       <item>
+        <layout class="QHBoxLayout" name="coreTabItemLayout" stretch="1,1,1">
+         <item>
+          <layout class="QVBoxLayout" name="coreTabLeftLayout">
            <item>
-            <widget class="QLabel" name="description_cpu">
-             <property name="text">
-              <string>Point your mouse at an option to display a description in here.
+            <widget class="QGroupBox" name="gb_ppu">
+             <property name="title">
+              <string>PPU Decoder</string>
+             </property>
+             <layout class="QVBoxLayout" name="ppu_layout">
+              <item>
+               <widget class="QRadioButton" name="ppu_precise">
+                <property name="text">
+                 <string notr="true">Interpreter (precise)</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="ppu_fast">
+                <property name="text">
+                 <string notr="true">Interpreter (fast)</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="ppu_llvm">
+                <property name="text">
+                 <string notr="true">LLVM Recompiler (fastest)</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_spu">
+             <property name="title">
+              <string>SPU Decoder</string>
+             </property>
+             <layout class="QVBoxLayout" name="spu_layout">
+              <item>
+               <widget class="QRadioButton" name="spu_precise">
+                <property name="text">
+                 <string notr="true">Interpreter (precise)</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="spu_fast">
+                <property name="text">
+                 <string notr="true">Interpreter (fast)</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="spu_asmjit">
+                <property name="text">
+                 <string notr="true">ASMJIT Recompiler (faster)</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="spu_llvm">
+                <property name="text">
+                 <string notr="true">LLVM Recompiler (fastest)</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer name="coreTabLeftLayoutSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::MinimumExpanding</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="coreTabMiddleLayout">
+           <item>
+            <widget class="QGroupBox" name="checkboxes">
+             <property name="title">
+              <string>Additional Settings</string>
+             </property>
+             <layout class="QVBoxLayout" name="checkboxes_layout">
+              <item>
+               <widget class="QCheckBox" name="lowerSPUThrPrio">
+                <property name="text">
+                 <string>Lower SPU thread priority</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="spuLoopDetection">
+                <property name="text">
+                 <string>Enable SPU loop detection</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="spuCache">
+                <property name="text">
+                 <string>SPU Cache</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="accurateXFloat">
+                <property name="text">
+                 <string>Accurate xfloat</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="fullWidthAVX512">
+                <property name="text">
+                 <string>Full Width AVX-512</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer name="coreTabMiddleLayoutSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::MinimumExpanding</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="coreTabRightLayout" stretch="0,0,0,0,0">
+           <item>
+            <widget class="QGroupBox" name="gb_tsx">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>TSX Instructions</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_tsx_layout">
+              <item>
+               <widget class="QComboBox" name="enableTSX"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_spuBlockSize">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>SPU Block Size</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_spuBlockSize_layout">
+              <item>
+               <widget class="QComboBox" name="spuBlockSize"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_spu_threads">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Preferred SPU Threads</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_spu_threads_layout">
+              <item>
+               <widget class="QComboBox" name="preferredSPUThreads"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_threadsched">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Thread Scheduler</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_threadsched_layout">
+              <item>
+               <widget class="QComboBox" name="threadsched"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer name="coreTabRightLayoutSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::MinimumExpanding</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="coreTabSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::MinimumExpanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="gb_description_cpu">
+         <property name="title">
+          <string>Description</string>
+         </property>
+         <layout class="QVBoxLayout" name="gb_description_cpu_layout">
+          <item>
+           <widget class="QLabel" name="description_cpu">
+            <property name="text">
+             <string>Point your mouse at an option to display a description in here.
 
 
 </string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::PlainText</enum>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="gpuTab">
+      <attribute name="title">
+       <string>GPU</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="gpuTab_layout" stretch="0,1,0">
+       <item>
+        <layout class="QHBoxLayout" name="gpuTabLayout" stretch="1,1,1">
+         <item>
+          <layout class="QVBoxLayout" name="gpuTabLayoutLeft">
+           <item>
+            <widget class="QGroupBox" name="gb_renderer">
+             <property name="title">
+              <string>Renderer</string>
              </property>
-             <property name="textFormat">
-              <enum>Qt::TextFormat::PlainText</enum>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
+             <layout class="QVBoxLayout" name="gb_renderer_layout">
+              <item>
+               <widget class="QComboBox" name="renderBox"/>
+              </item>
+             </layout>
             </widget>
            </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="gpuTab">
-       <attribute name="title">
-        <string>GPU</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="gpuTab_layout" stretch="0,1,0">
-        <item>
-         <layout class="QHBoxLayout" name="gpuTabLayout" stretch="1,1,1">
-          <item>
-           <layout class="QVBoxLayout" name="gpuTabLayoutLeft">
-            <item>
-             <widget class="QGroupBox" name="gb_renderer">
-              <property name="title">
-               <string>Renderer</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_renderer_layout">
-               <item>
-                <widget class="QComboBox" name="renderBox"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_graphicsAdapter">
-              <property name="title">
-               <string>Graphics Device</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_graphicsAdapter_layout">
-               <item>
-                <widget class="QComboBox" name="graphicsAdapterBox"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QWidget" name="widget_gpu_top" native="true">
-              <layout class="QHBoxLayout" name="widget_gpu_top_layout" stretch="1,1">
-               <property name="leftMargin">
-                <number>0</number>
-               </property>
-               <property name="topMargin">
-                <number>0</number>
-               </property>
-               <property name="rightMargin">
-                <number>0</number>
-               </property>
-               <property name="bottomMargin">
-                <number>0</number>
-               </property>
-               <item>
-                <widget class="QGroupBox" name="gb_aspectRatio">
-                 <property name="title">
-                  <string>Aspect Ratio</string>
-                 </property>
-                 <layout class="QVBoxLayout" name="gb_aspectRatio_layout">
-                  <item>
-                   <widget class="QComboBox" name="aspectBox"/>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QGroupBox" name="gb_frameLimit">
-                 <property name="title">
-                  <string>Framelimit</string>
-                 </property>
-                 <layout class="QVBoxLayout" name="gb_frameLimit_layout">
-                  <item>
-                   <widget class="QComboBox" name="frameLimitBox"/>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QWidget" name="widget_gpu_bottom" native="true">
-              <layout class="QHBoxLayout" name="widget_gpu_bottom_layout" stretch="1,1">
-               <property name="leftMargin">
-                <number>0</number>
-               </property>
-               <property name="topMargin">
-                <number>0</number>
-               </property>
-               <property name="rightMargin">
-                <number>0</number>
-               </property>
-               <property name="bottomMargin">
-                <number>0</number>
-               </property>
-               <item>
-                <widget class="QGroupBox" name="gb_anisotropicFilter">
-                 <property name="title">
-                  <string>Anisotropic Filter</string>
-                 </property>
-                 <layout class="QVBoxLayout" name="gb_anisotropicFilter_layout">
-                  <item>
-                   <widget class="QComboBox" name="anisotropicFilterOverride"/>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QGroupBox" name="gb_antiAliasing">
-                 <property name="title">
-                  <string>Anti-Aliasing</string>
-                 </property>
-                 <layout class="QVBoxLayout" name="gb_antiAliasing_layout">
-                  <item>
-                   <widget class="QComboBox" name="antiAliasing"/>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QWidget" name="widget_gpu_3" native="true">
-              <layout class="QHBoxLayout" name="widget_gpu_3_layout" stretch="1,1">
-               <property name="leftMargin">
-                <number>0</number>
-               </property>
-               <property name="topMargin">
-                <number>0</number>
-               </property>
-               <property name="rightMargin">
-                <number>0</number>
-               </property>
-               <property name="bottomMargin">
-                <number>0</number>
-               </property>
-               <item>
-                <widget class="QGroupBox" name="gbZCULL">
-                 <property name="title">
-                  <string>ZCULL Accuracy</string>
-                 </property>
-                 <layout class="QVBoxLayout" name="gbZCULL_layout">
-                  <item>
-                   <widget class="QComboBox" name="zcullPrecisionMode"/>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QGroupBox" name="gbShaderPrecision">
-                 <property name="title">
-                  <string>Shader Quality</string>
-                 </property>
-                 <layout class="QVBoxLayout" name="gbShaderPrecision_layout">
-                  <item>
-                   <widget class="QComboBox" name="shaderPrecision"/>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_stereo">
-              <property name="title">
-               <string>3D</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_stereo_layout">
-               <item>
-                <widget class="QComboBox" name="stereoRenderMode"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer name="gpu_tab_layout_right_spacer">
-              <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="gpuTabLayoutMiddle">
-            <item>
-             <widget class="QGroupBox" name="gb_default_resolution">
-              <property name="title">
-               <string>Default Resolution</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_default_resolution_layout">
-               <item>
-                <widget class="QComboBox" name="resBox"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <layout class="QVBoxLayout" name="layout_resolution_scale">
-              <property name="spacing">
-               <number>6</number>
-              </property>
+           <item>
+            <widget class="QGroupBox" name="gb_graphicsAdapter">
+             <property name="title">
+              <string>Graphics Device</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_graphicsAdapter_layout">
+              <item>
+               <widget class="QComboBox" name="graphicsAdapterBox"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QWidget" name="widget_gpu_top" native="true">
+             <layout class="QHBoxLayout" name="widget_gpu_top_layout" stretch="1,1">
               <property name="leftMargin">
                <number>0</number>
               </property>
+              <property name="topMargin">
+               <number>0</number>
+              </property>
+              <property name="rightMargin">
+               <number>0</number>
+              </property>
+              <property name="bottomMargin">
+               <number>0</number>
+              </property>
               <item>
-               <widget class="QGroupBox" name="gb_resolutionScale">
+               <widget class="QGroupBox" name="gb_aspectRatio">
                 <property name="title">
-                 <string>Resolution Scale (Disable Strict Mode)</string>
+                 <string>Aspect Ratio</string>
                 </property>
-                <layout class="QVBoxLayout" name="gb_resolutionScale_layout">
+                <layout class="QVBoxLayout" name="gb_aspectRatio_layout">
                  <item>
-                  <widget class="QWidget" name="resolutionScaleLayoutTop" native="true">
-                   <layout class="QHBoxLayout" name="horizontalLayout_23" stretch="0,1,0">
-                    <property name="spacing">
-                     <number>12</number>
-                    </property>
-                    <property name="leftMargin">
-                     <number>0</number>
-                    </property>
-                    <property name="topMargin">
-                     <number>0</number>
-                    </property>
-                    <property name="rightMargin">
-                     <number>0</number>
-                    </property>
-                    <property name="bottomMargin">
-                     <number>0</number>
-                    </property>
-                    <item>
-                     <widget class="QLabel" name="resolutionScaleMin">
-                      <property name="text">
-                       <string>25</string>
-                      </property>
-                      <property name="alignment">
-                       <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QSlider" name="resolutionScale">
-                      <property name="orientation">
-                       <enum>Qt::Orientation::Horizontal</enum>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QLabel" name="resolutionScaleMax">
-                      <property name="text">
-                       <string>800</string>
-                      </property>
-                     </widget>
-                    </item>
-                   </layout>
-                  </widget>
-                 </item>
-                 <item>
-                  <layout class="QHBoxLayout" name="resolutionScaleLayoutBottom" stretch="1,0">
-                   <item>
-                    <widget class="QLabel" name="resolutionScaleVal">
-                     <property name="text">
-                      <string>0</string>
-                     </property>
-                     <property name="alignment">
-                      <set>Qt::AlignmentFlag::AlignCenter</set>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QPushButton" name="resolutionScaleReset">
-                     <property name="text">
-                      <string>Reset</string>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
+                  <widget class="QComboBox" name="aspectBox"/>
                  </item>
                 </layout>
                </widget>
               </item>
               <item>
-               <widget class="QGroupBox" name="gb_minimumScalableDimension">
+               <widget class="QGroupBox" name="gb_frameLimit">
                 <property name="title">
-                 <string>Resolution Scale Threshold</string>
+                 <string>Framelimit</string>
                 </property>
-                <layout class="QVBoxLayout" name="gb_minimumScalableDimension_layout">
+                <layout class="QVBoxLayout" name="gb_frameLimit_layout">
                  <item>
-                  <layout class="QHBoxLayout" name="minimumScalableDimensionLayoutTop" stretch="0,1,0">
-                   <property name="spacing">
-                    <number>12</number>
-                   </property>
-                   <item>
-                    <widget class="QLabel" name="minimumScalableDimensionMin">
-                     <property name="text">
-                      <string>1</string>
-                     </property>
-                     <property name="alignment">
-                      <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QSlider" name="minimumScalableDimension">
-                     <property name="orientation">
-                      <enum>Qt::Orientation::Horizontal</enum>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QLabel" name="minimumScalableDimensionMax">
-                     <property name="text">
-                      <string>1024</string>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
-                 </item>
-                 <item>
-                  <layout class="QHBoxLayout" name="minimumScalableDimensionLayoutBottom" stretch="1,0">
-                   <item>
-                    <widget class="QLabel" name="minimumScalableDimensionVal">
-                     <property name="text">
-                      <string>1x1</string>
-                     </property>
-                     <property name="alignment">
-                      <set>Qt::AlignmentFlag::AlignCenter</set>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QPushButton" name="minimumScalableDimensionReset">
-                     <property name="text">
-                      <string>Reset</string>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
+                  <widget class="QComboBox" name="frameLimitBox"/>
                  </item>
                 </layout>
                </widget>
               </item>
              </layout>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_outputScaling">
-              <property name="title">
-               <string>Output Scaling</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_Upscaling_layout">
-               <item>
-                <widget class="QComboBox" name="outputScalingMode"/>
-               </item>
-               <item>
-                <widget class="Line" name="line">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="fsrSharpeningStrengthWidget" native="true">
-                 <layout class="QVBoxLayout" name="fsrSharpeningWidgetLayout">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QLabel" name="fsrSharpeningStrengthLabel">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>RCAS Sharpening Strength</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignmentFlag::AlignBottom|Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft</set>
-                    </property>
-                    <property name="margin">
-                     <number>1</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="fsrSharpeningLayoutTop">
-                    <item>
-                     <widget class="QLabel" name="minSharpeningVal">
-                      <property name="text">
-                       <string>0</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QSlider" name="fsrSharpeningStrength">
-                      <property name="orientation">
-                       <enum>Qt::Orientation::Horizontal</enum>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QLabel" name="maxSharpeningVal">
-                      <property name="sizePolicy">
-                       <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                       </sizepolicy>
-                      </property>
-                      <property name="text">
-                       <string>100</string>
-                      </property>
-                     </widget>
-                    </item>
-                   </layout>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="fsrSharpeningLayoutBottom" stretch="1,0">
-                    <item>
-                     <widget class="QLabel" name="fsrSharpeningStrengthVal">
-                      <property name="text">
-                       <string>0</string>
-                      </property>
-                      <property name="alignment">
-                       <set>Qt::AlignmentFlag::AlignCenter</set>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QPushButton" name="fsrSharpeningStrengthReset">
-                      <property name="text">
-                       <string>Reset</string>
-                      </property>
-                     </widget>
-                    </item>
-                   </layout>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer name="gpu_tab_layout_middle_spacer">
-              <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="gpuTabLayoutRight">
-            <property name="rightMargin">
-             <number>12</number>
-            </property>
-            <property name="bottomMargin">
-             <number>12</number>
-            </property>
-            <item>
-             <widget class="QGroupBox" name="gb_shader_mode">
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>123</height>
-               </size>
-              </property>
-              <property name="title">
-               <string>Shader Mode</string>
-              </property>
-              <layout class="QVBoxLayout" name="verticalLayout">
-               <item>
-                <widget class="QRadioButton" name="rb_legacy_recompiler">
-                 <property name="text">
-                  <string notr="true">Legacy (single threaded)</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QRadioButton" name="rb_async_recompiler">
-                 <property name="text">
-                  <string notr="true">Async (multi threaded)</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QRadioButton" name="rb_async_with_shader_interpreter">
-                 <property name="text">
-                  <string notr="true">Async with Shader Interpreter</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QRadioButton" name="rb_shader_interpreter_only">
-                 <property name="text">
-                  <string notr="true">Shader Interpreter only</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_additional_settings">
-              <property name="title">
-               <string>Additional Settings</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
-              </property>
-              <layout class="QVBoxLayout" name="gb_additional_settings_layout">
-               <item>
-                <widget class="QCheckBox" name="dumpColor">
-                 <property name="text">
-                  <string>Write Color Buffers</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="strictModeRendering">
-                 <property name="text">
-                  <string>Strict Rendering Mode</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="vsync">
-                 <property name="text">
-                  <string>VSync</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="stretchToDisplayArea">
-                 <property name="text">
-                  <string>Stretch To Display Area</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="multithreadedRSX">
-                 <property name="text">
-                  <string>Multithreaded RSX</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="asyncTextureStreaming">
-                 <property name="text">
-                  <string>Asynchronous Texture Streaming</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <spacer name="additional_settings_spacer">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Vertical</enum>
-                 </property>
-                 <property name="sizeType">
-                  <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-              </layout>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="gpuTabSpacer">
-          <property name="orientation">
-           <enum>Qt::Orientation::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="gb_description_gpu">
-          <property name="title">
-           <string>Description</string>
-          </property>
-          <layout class="QHBoxLayout" name="gb_description_gpu_layout">
-           <item>
-            <widget class="QLabel" name="description_gpu">
-             <property name="text">
-              <string>Point your mouse at an option to display a description in here.
-
-
-</string>
-             </property>
-             <property name="textFormat">
-              <enum>Qt::TextFormat::PlainText</enum>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
             </widget>
            </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="audioTab">
-       <attribute name="title">
-        <string>Audio</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="audioTab_layout" stretch="0,0,1,0">
-        <item>
-         <layout class="QHBoxLayout" name="audioTabLayoutTop" stretch="1,1,1">
-          <item>
-           <layout class="QVBoxLayout" name="audioTabLayoutTopLeft">
-            <item>
-             <widget class="QGroupBox" name="gb_audio_out">
-              <property name="title">
-               <string>Audio Out</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_audio_out_layout">
-               <item>
-                <widget class="QComboBox" name="audioOutBox"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_audio_format">
-              <property name="title">
-               <string>Audio Format</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_audio_format_layout">
-               <item>
-                <widget class="QComboBox" name="combo_audio_format"/>
-               </item>
-               <item>
-                <widget class="QListWidget" name="list_audio_formats">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="selectionMode">
-                  <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_audio_settings">
-              <property name="title">
-               <string>Audio Settings</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_audio_settings_layout">
-               <item>
-                <widget class="QCheckBox" name="convert">
-                 <property name="text">
-                  <string>Convert to 16-bit</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="audioDump">
-                 <property name="text">
-                  <string>Dump to File</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <spacer name="spacer_audio_settings">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Vertical</enum>
-                 </property>
-                 <property name="sizeType">
-                  <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer name="verticalSpacerAudioLeft">
-              <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="audioTabLayoutTopMiddle">
-            <item>
-             <widget class="QGroupBox" name="gb_audio_device">
-              <property name="title">
-               <string>Audio Device</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_audio_device_layout">
-               <item>
-                <widget class="QComboBox" name="audioDeviceBox"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_audio_channel_layout">
-              <property name="title">
-               <string>Audio Output Format</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_audio_channel_layout_layout">
-               <item>
-                <widget class="QComboBox" name="combo_audio_channel_layout"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_audio_provider">
-              <property name="title">
-               <string>Audio Provider</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_audio_provider_layout">
-               <item>
-                <widget class="QComboBox" name="audioProviderBox"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_audio_avport">
-              <property name="title">
-               <string>RSXAudio Avport</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_audio_avport_layout">
-               <item>
-                <widget class="QComboBox" name="audioAvportBox"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_music_handler">
-              <property name="title">
-               <string>Music Handler</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_music_handler_layout">
-               <item>
-                <widget class="QComboBox" name="musicHandlerBox"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_audio_volume">
-              <property name="title">
-               <string>Volume</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_audio_volume_layout">
-               <item>
-                <widget class="QWidget" name="master_volume" native="true">
-                 <layout class="QVBoxLayout" name="layout_master_volume">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QLabel" name="masterVolumeLabel">
-                    <property name="text">
-                     <string>Master: 0%</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSlider" name="masterVolume">
-                    <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
-                    </property>
-                    <property name="tickPosition">
-                     <enum>QSlider::TickPosition::TicksBelow</enum>
-                    </property>
-                    <property name="tickInterval">
-                     <number>50</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <spacer name="spacer_audio_volume">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Vertical</enum>
-                 </property>
-                 <property name="sizeType">
-                  <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-              </layout>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="audioTabLayoutTopRight">
-            <item>
-             <widget class="QGroupBox" name="gb_audio_buffering">
-              <property name="title">
-               <string>Buffering</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_audio_buffering_layout">
-               <item>
-                <widget class="QCheckBox" name="enableBuffering">
-                 <property name="text">
-                  <string>Enable Buffering</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="audio_buffer_duration" native="true">
-                 <layout class="QVBoxLayout" name="layout_audio_buffer_duration">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QLabel" name="audioBufferDurationLabel">
-                    <property name="text">
-                     <string>Audio Buffer Duration: 0ms</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSlider" name="audioBufferDuration">
-                    <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
-                    </property>
-                    <property name="tickPosition">
-                     <enum>QSlider::TickPosition::TicksBelow</enum>
-                    </property>
-                    <property name="tickInterval">
-                     <number>10</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="enableTimeStretching">
-                 <property name="text">
-                  <string>Enable Time Stretching</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="time_stretching_threshold" native="true">
-                 <layout class="QVBoxLayout" name="layout_time_stretching_threshold">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QLabel" name="timeStretchingThresholdLabel">
-                    <property name="text">
-                     <string>Time Stretching Threshold: 0%</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSlider" name="timeStretchingThreshold">
-                    <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
-                    </property>
-                    <property name="tickPosition">
-                     <enum>QSlider::TickPosition::TicksBelow</enum>
-                    </property>
-                    <property name="tickInterval">
-                     <number>10</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <spacer name="verticalSpacerAudioRight">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Vertical</enum>
-                 </property>
-                 <property name="sizeType">
-                  <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-              </layout>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="gb_microphone_settings">
-          <property name="title">
-           <string>Microphone Settings</string>
-          </property>
-          <layout class="QVBoxLayout" name="gb_microphone_settings_layout">
            <item>
-            <layout class="QHBoxLayout" name="microphoneLayoutTop">
-             <item>
-              <widget class="QLabel" name="microphoneLabel">
-               <property name="text">
-                <string>Microphone Type:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="microphoneBox"/>
-             </item>
-             <item>
-              <spacer name="microphoneSpacer">
-               <property name="orientation">
-                <enum>Qt::Orientation::Horizontal</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="microphoneLayoutBottom">
-             <item>
-              <layout class="QVBoxLayout" name="microphoneLayoutLabel1and3">
-               <item>
-                <widget class="QLabel" name="microphone1Label">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text">
-                  <string>Mic1:</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="microphone3Label">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text">
-                  <string>Mic3:</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QVBoxLayout" name="microphoneLayoutBox1and3">
-               <item>
-                <widget class="QComboBox" name="microphone1Box">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QComboBox" name="microphone3Box">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QVBoxLayout" name="microphoneLayoutLabel2and4">
-               <item>
-                <widget class="QLabel" name="microphone2Label">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text">
-                  <string>Mic2:</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="microphone4Label">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text">
-                  <string>Mic4:</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QVBoxLayout" name="microphoneLayoutBox2and4">
-               <item>
-                <widget class="QComboBox" name="microphone2Box">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QComboBox" name="microphone4Box">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <spacer name="audioTabSpacer">
-          <property name="orientation">
-           <enum>Qt::Orientation::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="gb_description_audio">
-          <property name="title">
-           <string>Description</string>
-          </property>
-          <layout class="QVBoxLayout" name="gb_description_audio_layout">
-           <item>
-            <widget class="QLabel" name="description_audio">
-             <property name="text">
-              <string>Point your mouse at an option to display a description in here.
-
-
-</string>
-             </property>
-             <property name="textFormat">
-              <enum>Qt::TextFormat::PlainText</enum>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
+            <widget class="QWidget" name="widget_gpu_bottom" native="true">
+             <layout class="QHBoxLayout" name="widget_gpu_bottom_layout" stretch="1,1">
+              <property name="leftMargin">
+               <number>0</number>
+              </property>
+              <property name="topMargin">
+               <number>0</number>
+              </property>
+              <property name="rightMargin">
+               <number>0</number>
+              </property>
+              <property name="bottomMargin">
+               <number>0</number>
+              </property>
+              <item>
+               <widget class="QGroupBox" name="gb_anisotropicFilter">
+                <property name="title">
+                 <string>Anisotropic Filter</string>
+                </property>
+                <layout class="QVBoxLayout" name="gb_anisotropicFilter_layout">
+                 <item>
+                  <widget class="QComboBox" name="anisotropicFilterOverride"/>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QGroupBox" name="gb_antiAliasing">
+                <property name="title">
+                 <string>Anti-Aliasing</string>
+                </property>
+                <layout class="QVBoxLayout" name="gb_antiAliasing_layout">
+                 <item>
+                  <widget class="QComboBox" name="antiAliasing"/>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+             </layout>
             </widget>
            </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="inputTab">
-       <attribute name="title">
-        <string>I/O</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="inputTab_layout">
-        <item>
-         <layout class="QGridLayout" name="ioGridLayout" columnstretch="1,1,1">
-          <item row="2" column="2">
-           <widget class="QGroupBox" name="gb_ghltar_emulated">
-            <property name="title">
-             <string>Guitar Hero Live Emulated Guitar</string>
-            </property>
-            <layout class="QVBoxLayout" name="gb_ghltar_emulated_layout">
-             <item>
-              <widget class="QComboBox" name="ghltarBox"/>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QGroupBox" name="gb_move_handler">
-            <property name="title">
-             <string>Move Handler</string>
-            </property>
-            <layout class="QVBoxLayout" name="gb_move_handler_layout">
-             <item>
-              <widget class="QComboBox" name="moveBox"/>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QGroupBox" name="gb_turntable_emulated">
-            <property name="title">
-             <string>DJ Hero Emulated Turntable</string>
-            </property>
-            <layout class="QVBoxLayout" name="gb_turntable_emulated_layout">
-             <item>
-              <widget class="QComboBox" name="turntableBox"/>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QGroupBox" name="gb_mouse_handler">
-            <property name="title">
-             <string>Mouse Handler</string>
-            </property>
-            <layout class="QVBoxLayout" name="gb_mouse_handler_layout">
-             <item>
-              <widget class="QComboBox" name="mouseHandlerBox"/>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <widget class="QGroupBox" name="gb_buzz_emulated">
-            <property name="title">
-             <string>Buzz! Emulated Controller</string>
-            </property>
-            <layout class="QVBoxLayout" name="gb_buzz_emulated_layout">
-             <item>
-              <widget class="QComboBox" name="buzzBox"/>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QGroupBox" name="gb_keyboard_handler">
-            <property name="title">
-             <string>Keyboard Handler</string>
-            </property>
-            <layout class="QVBoxLayout" name="gb_keyboard_handler_layout">
-             <item>
-              <widget class="QComboBox" name="keyboardHandlerBox"/>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QGroupBox" name="gb_pad_mode">
-            <property name="title">
-             <string>Pad Handler Mode</string>
-            </property>
-            <layout class="QVBoxLayout" name="gb_pad_mode_layout">
-             <item>
-              <widget class="QComboBox" name="padModeBox"/>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QGroupBox" name="gb_camera_type">
-            <property name="title">
-             <string>Camera Input</string>
-            </property>
-            <layout class="QVBoxLayout" name="gb_camera_type_layout">
-             <item>
-              <widget class="QComboBox" name="cameraTypeBox"/>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QGroupBox" name="gb_camera_flip">
-            <property name="title">
-             <string>Camera Flip</string>
-            </property>
-            <layout class="QVBoxLayout" name="gb_camera_flip_layout">
-             <item>
-              <widget class="QComboBox" name="cameraFlipBox"/>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QGroupBox" name="gb_camera_id">
-            <property name="title">
-             <string>Camera</string>
-            </property>
-            <layout class="QVBoxLayout" name="camera_id_layout">
-             <item>
-              <widget class="QComboBox" name="cameraIdBox"/>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QGroupBox" name="gb_camera_setting">
-            <property name="title">
-             <string>Camera Handler</string>
-            </property>
-            <layout class="QVBoxLayout" name="gb_camera_setting_layout">
-             <item>
-              <widget class="QComboBox" name="cameraBox"/>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="3" column="2">
-           <widget class="QGroupBox" name="gb_midi_1">
-            <property name="title">
-             <string>Emulated MIDI Device 1</string>
-            </property>
-            <layout class="QVBoxLayout" name="midLayout1">
-             <item>
-              <layout class="QHBoxLayout" name="midiHLayout1" stretch="1,2">
-               <item>
-                <widget class="QComboBox" name="midiTypeBox1"/>
-               </item>
-               <item>
-                <widget class="QComboBox" name="midiDeviceBox1"/>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="5" column="2">
-           <widget class="QGroupBox" name="gb_midi_3">
-            <property name="title">
-             <string>Emulated MIDI Device 3</string>
-            </property>
-            <layout class="QVBoxLayout" name="midLayout3">
-             <item>
-              <layout class="QHBoxLayout" name="midiHLayout3" stretch="1,2">
-               <item>
-                <widget class="QComboBox" name="midiTypeBox3"/>
-               </item>
-               <item>
-                <widget class="QComboBox" name="midiDeviceBox3"/>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="4" column="2">
-           <widget class="QGroupBox" name="gb_midi_2">
-            <property name="title">
-             <string>Emulated MIDI Device 2</string>
-            </property>
-            <layout class="QVBoxLayout" name="midLayout2">
-             <item>
-              <layout class="QHBoxLayout" name="midiHLayout2" stretch="1,2">
-               <item>
-                <widget class="QComboBox" name="midiTypeBox2"/>
-               </item>
-               <item>
-                <widget class="QComboBox" name="midiDeviceBox2"/>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="4" column="0" rowspan="2">
-           <widget class="QGroupBox" name="gb_additional_io_settings">
-            <property name="title">
-             <string>Additional Settings</string>
-            </property>
-            <layout class="QVBoxLayout" name="layout_gb_additional_io_settings">
-             <item>
-              <widget class="QCheckBox" name="backgroundInputBox">
-               <property name="text">
-                <string>Enable Background Input</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="padConnectionBox">
-               <property name="text">
-                <string>Keep Pads Connected</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="showMoveCursorBox">
-               <property name="text">
-                <string>Show PS Move Cursor</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="lockOverlayInputToPlayerOne">
-               <property name="text">
-                <string>Lock Overlay Input To Player One</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="loadSdlMappings">
-               <property name="text">
-                <string>Use SDL GameController Database</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="verticalSpacerIoAdditionalSettings">
-               <property name="orientation">
-                <enum>Qt::Orientation::Vertical</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="inputTabSpacer">
-          <property name="orientation">
-           <enum>Qt::Orientation::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="gb_description_io">
-          <property name="title">
-           <string>Description</string>
-          </property>
-          <layout class="QVBoxLayout" name="gb_description_io_layout">
            <item>
-            <widget class="QLabel" name="description_io">
-             <property name="text">
-              <string>Point your mouse at an option to display a description in here.
-
-
-</string>
+            <spacer name="gpu_tab_layout_right_spacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
              </property>
-             <property name="textFormat">
-              <enum>Qt::TextFormat::PlainText</enum>
+             <property name="sizeType">
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
-             <property name="alignment">
-              <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
              </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-            </widget>
+            </spacer>
            </item>
           </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="systemTab">
-       <attribute name="title">
-        <string>System</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="systemTab_layout" stretch="0,1,0">
-        <item>
-         <layout class="QHBoxLayout" name="systemTabHorizontalLayout" stretch="1,1,1">
-          <item>
-           <layout class="QVBoxLayout" name="systemTabLeftLayout">
-            <item>
-             <widget class="QGroupBox" name="gb_sysLang">
-              <property name="title">
-               <string>Console Language</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_sysLang_layout">
-               <item>
-                <widget class="QComboBox" name="sysLangBox"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_console_region">
-              <property name="title">
-               <string>Console Region</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_console_region_layout">
-               <item>
-                <widget class="QComboBox" name="console_region"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_enterButtonAssignment">
-              <property name="title">
-               <string>Enter Button Assignment</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_enterButtonAssignment_layout">
-               <item>
-                <widget class="QRadioButton" name="enterButtonAssignCircle">
-                 <property name="text">
-                  <string notr="true">Enter with the Circle button</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QRadioButton" name="enterButtonAssignCross">
-                 <property name="text">
-                  <string notr="true">Enter with the Cross button</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_DiskCacheClearing">
-              <property name="title">
-               <string>Disk Cache</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_DiskCacheClearing_layout">
-               <item>
-                <widget class="QCheckBox" name="enableCacheClearing">
-                 <property name="text">
-                  <string>Clear cache automatically</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="maximumCacheSizeLabel">
-                 <property name="text">
-                  <string>Cache size: 3072 MB</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QSlider" name="maximumCacheSize">
-                 <property name="pageStep">
-                  <number>512</number>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TickPosition::TicksBelow</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>1024</number>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer name="systemTabLeftVerticalSpacer">
-              <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="systemTabMiddleLayout">
-            <item>
-             <widget class="QGroupBox" name="gb_keyboardType">
-              <property name="title">
-               <string>Keyboard Type</string>
-              </property>
-              <layout class="QVBoxLayout" name="verticalLayout_keyboardType">
-               <item>
-                <widget class="QComboBox" name="keyboardType"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_console_time">
-              <property name="title">
-               <string>Console Time</string>
-              </property>
-              <layout class="QVBoxLayout" name="verticalLayout_2">
-               <item>
-                <layout class="QHBoxLayout" name="horizontalLayout">
-                 <item>
-                  <widget class="QDateTimeEdit" name="console_time_edit">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                     <horstretch>10</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="layoutDirection">
-                    <enum>Qt::LayoutDirection::LeftToRight</enum>
-                   </property>
-                   <property name="wrapping">
-                    <bool>false</bool>
-                   </property>
-                   <property name="frame">
-                    <bool>true</bool>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                   </property>
-                   <property name="readOnly">
-                    <bool>false</bool>
-                   </property>
-                   <property name="buttonSymbols">
-                    <enum>QAbstractSpinBox::ButtonSymbols::UpDownArrows</enum>
-                   </property>
-                   <property name="accelerated">
-                    <bool>true</bool>
-                   </property>
-                   <property name="showGroupSeparator" stdset="0">
-                    <bool>false</bool>
-                   </property>
-                   <property name="calendarPopup">
-                    <bool>true</bool>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="console_time_reset">
-                   <property name="text">
-                    <string>Set to Now</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer name="systemTabMiddleVerticalSpacer">
-              <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="systemTabRightLayout">
-            <item>
-             <widget class="QGroupBox" name="gb_homebrew">
-              <property name="title">
-               <string>Homebrew</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_homebrew_layout">
-               <item>
-                <widget class="QCheckBox" name="enableHostRoot">
-                 <property name="text">
-                  <string>Enable /host_root/</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="emptyHdd0Tmp">
-                 <property name="text">
-                  <string>Empty /dev_hdd0/tmp/</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer name="systemTabRightVerticalSpacer">
-              <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="systemTabSpacer">
-          <property name="orientation">
-           <enum>Qt::Orientation::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="gb_description_system">
-          <property name="title">
-           <string>Description</string>
-          </property>
-          <layout class="QHBoxLayout" name="gb_description_system_layout">
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="gpuTabLayoutMiddle">
            <item>
-            <widget class="QLabel" name="description_system">
-             <property name="text">
-              <string>Point your mouse at an option to display a description in here.
-
-
-</string>
-             </property>
-             <property name="textFormat">
-              <enum>Qt::TextFormat::PlainText</enum>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
+            <widget class="QGroupBox" name="gb_default_resolution">
+             <property name="title">
+              <string>Default Resolution</string>
              </property>
+             <layout class="QVBoxLayout" name="gb_default_resolution_layout">
+              <item>
+               <widget class="QComboBox" name="resBox"/>
+              </item>
+             </layout>
             </widget>
            </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="networkTab">
-       <attribute name="title">
-        <string>Network</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="networkTab_layout" stretch="0,1,0">
-        <item>
-         <layout class="QHBoxLayout" name="networkTabLayout" stretch="0,0">
-          <item>
-           <widget class="QGroupBox" name="gb_network_status">
-            <property name="title">
-             <string>Network Configuration</string>
-            </property>
-            <layout class="QVBoxLayout" name="gb_network_status_layout" stretch="0,0,0,0,0,0">
-             <item>
-              <widget class="QGroupBox" name="gb_netStatusBox">
-               <property name="title">
-                <string>Network Status</string>
-               </property>
-               <layout class="QVBoxLayout" name="gb_netStatusBox_layout">
-                <item>
-                 <widget class="QComboBox" name="netStatusBox"/>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="gb_edit_dns">
-               <property name="title">
-                <string>DNS</string>
-               </property>
-               <layout class="QVBoxLayout" name="gb_edit_dns_layout">
-                <item>
-                 <widget class="QLineEdit" name="edit_dns">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="gb_edit_swaps">
-               <property name="title">
-                <string>IP/Hosts switches</string>
-               </property>
-               <layout class="QVBoxLayout" name="gb_edit_swaps_layout">
-                <item>
-                 <widget class="QLineEdit" name="edit_swaps">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="gb_edit_bind">
-               <property name="title">
-                <string>Bind address</string>
-               </property>
-               <layout class="QVBoxLayout" name="gb_edit_bind_layout">
-                <item>
-                 <widget class="QLineEdit" name="edit_bind">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="enable_upnp">
-               <property name="text">
-                <string>Enable UPNP</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="networkTabSpacerLeft">
-               <property name="orientation">
-                <enum>Qt::Orientation::Vertical</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <widget class="QGroupBox" name="gb_psn_config">
-            <property name="title">
-             <string>PSN Configuration</string>
-            </property>
-            <layout class="QVBoxLayout" name="gb_psn_config_layout">
-             <item>
-              <widget class="QGroupBox" name="gb_psnStatusBox">
-               <property name="title">
-                <string>PSN Status</string>
-               </property>
-               <layout class="QVBoxLayout" name="gb_psnStatusBox_layout">
-                <item>
-                 <widget class="QComboBox" name="psnStatusBox"/>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="gb_psnCountryBox">
-               <property name="title">
-                <string>Country</string>
-               </property>
-               <layout class="QVBoxLayout" name="gb_psnCountryBox_layout">
-                <item>
-                 <widget class="QComboBox" name="psnCountryBox"/>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <spacer name="networkTabSpacerRight">
-               <property name="orientation">
-                <enum>Qt::Orientation::Vertical</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="networkTabSpacer">
-          <property name="orientation">
-           <enum>Qt::Orientation::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="gb_description_network">
-          <property name="title">
-           <string>Description</string>
-          </property>
-          <layout class="QVBoxLayout" name="gb_description_network_layout">
            <item>
-            <widget class="QLabel" name="description_network">
-             <property name="text">
-              <string>Point your mouse at an option to display a description in here.
-
-
-</string>
+            <layout class="QVBoxLayout" name="layout_resolution_scale">
+             <property name="spacing">
+              <number>6</number>
              </property>
-             <property name="textFormat">
-              <enum>Qt::TextFormat::PlainText</enum>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="advancedTab">
-       <attribute name="title">
-        <string>Advanced</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="advancedTab_layout" stretch="1,0,0">
-        <item>
-         <layout class="QHBoxLayout" name="advancedTabLayout" stretch="1,1,1">
-          <item>
-           <layout class="QVBoxLayout" name="advancedTabLayoutLeft">
-            <item>
-             <widget class="QGroupBox" name="gb_advanced_core">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>Core</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_advanced_core_layout">
-               <item>
-                <widget class="QCheckBox" name="debugConsoleMode">
-                 <property name="text">
-                  <string>Debug Console Mode</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="accurateDFMA">
-                 <property name="text">
-                  <string>Accurate DFMA</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="accurateRSXAccess">
-                 <property name="text">
-                  <string>Accurate RSX reservation access</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="accurateSpuDMA">
-                 <property name="text">
-                  <string>Accurate SPU DMA</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="disableSpinOptimization">
-                 <property name="text">
-                  <string>Disable SPU GETLLAR Spin Optimization</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="enableSpuEventsBusyLoop">
-                 <property name="text">
-                  <string>Enable SPU Events Busy Loop</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="ppuNJFixup">
-                 <property name="text">
-                  <string>PPU Non-Java Mode Fixup</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="llvmPrecompilation">
-                 <property name="text">
-                  <string>PPU/SPU LLVM Precompilation</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="mfcDelayCommand">
-                 <property name="text">
-                  <string>Delay each odd MFC Command</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="antiCheatSavestates">
-                 <property name="text">
-                  <string>Anti-Cheat Savestates Mode</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="compatibleSavestates">
-                 <property name="text">
-                  <string>SPU-Compatible Savestates Mode</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="silenceAllLogs">
-                 <property name="text">
-                  <string>Silence All Logs</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_sleep_timers_accuracy">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>Sleep Timers Accuracy</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_sleep_timers_accuracy_layout">
-               <item>
-                <widget class="QComboBox" name="sleepTimersAccuracy"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_max_spurs_threads">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>Maximum Number of SPURS Threads</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_max_spurs_threads_layout">
-               <item>
-                <widget class="QComboBox" name="maxSPURSThreads"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_clockScale">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>Clocks Scale</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_clockScale_layout">
-               <item>
-                <widget class="QSlider" name="clockScale">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="clockScaleLayout" stretch="1,0">
-                 <item>
-                  <widget class="QLabel" name="clockScaleText">
-                   <property name="text">
-                    <string>100%</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="clockScaleReset">
-                   <property name="text">
-                    <string>Reset</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer name="advancedTabSpacerLeft">
-              <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="advancedTabLayoutMiddle">
-            <item>
-             <widget class="QGroupBox" name="gb_libs">
-              <property name="title">
-               <string>Firmware Libraries</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_libs_layout">
-               <item>
-                <widget class="QListWidget" name="hleList">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="selectionMode">
-                  <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QListWidget" name="lleList">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="selectionMode">
-                  <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="gb_lleLibs_layout" stretch="1,0">
-                 <property name="spacing">
-                  <number>6</number>
-                 </property>
-                 <property name="sizeConstraint">
-                  <enum>QLayout::SizeConstraint::SetNoConstraint</enum>
-                 </property>
-                 <item>
-                  <widget class="QLineEdit" name="searchBox"/>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="resetLleList">
-                   <property name="text">
-                    <string>Reset</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="advancedTabLayoutRight">
-            <item>
-             <widget class="QGroupBox" name="gb_advanced_gpu">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>GPU</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_advanced_gpu_layout">
-               <item>
-                <widget class="QCheckBox" name="readDepth">
-                 <property name="text">
-                  <string>Read Depth Buffers</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="dumpDepth">
-                 <property name="text">
-                  <string>Write Depth Buffers</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="readColor">
-                 <property name="text">
-                  <string>Read Color Buffers</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="handleTiledMemory">
-                 <property name="text">
-                  <string>Handle RSX memory tiling</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="disableVertexCache">
-                 <property name="text">
-                  <string>Disable Vertex Cache</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="allowHostGPULabels">
-                 <property name="text">
-                  <string>Allow Host GPU Labels (Experimental)</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="forceHwMSAAResolve">
-                 <property name="text">
-                  <string>Force Hardware MSAA Resolve</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="disableMslFastMath">
-                 <property name="text">
-                  <string>Disable MSL Fast Math</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_rsx_fifo_accuracy">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>RSX FIFO Accuracy</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_rsx_fifo_accuracy_layout">
-               <item>
-                <widget class="QComboBox" name="FIFOAccuracy"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_exclusiveFullscreen">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>Exclusive Fullscreen Mode</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_exclusiveFullscreen_layout">
-               <item>
-                <widget class="QComboBox" name="exclusiveFullscreenMode"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_wakeupDelay">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>Driver Wake-Up Delay</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_wakeupDelay_layout">
-               <item>
-                <widget class="QSlider" name="wakeupDelay">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="wakeupDelayLayout" stretch="1,0">
-                 <item>
-                  <widget class="QLabel" name="wakeupText">
-                   <property name="text">
-                    <string>1 µs</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="wakeupReset">
-                   <property name="text">
-                    <string>Reset</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_vblank">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="title">
-               <string>VBlank Frequency</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_vblank_layout">
-               <item>
-                <widget class="QSlider" name="vblank">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="vBlankLayout" stretch="1,0">
-                 <item>
-                  <widget class="QLabel" name="vblankText">
-                   <property name="text">
-                    <string>60 Hz</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="vblankReset">
-                   <property name="text">
-                    <string>Reset</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="vblankNTSCFixup">
-                 <property name="text">
-                  <string>VBlank NTSC Fixup</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer name="advancedTabSpacerRight">
-              <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>13</width>
-                <height>13</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="advancedTabSpacer">
-          <property name="orientation">
-           <enum>Qt::Orientation::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="gb_description_advanced">
-          <property name="title">
-           <string>Description</string>
-          </property>
-          <layout class="QVBoxLayout" name="gb_description_advanced_layout">
-           <item>
-            <widget class="QLabel" name="description_advanced">
-             <property name="text">
-              <string>Point your mouse at an option to display a description in here.
-
-
-</string>
-             </property>
-             <property name="textFormat">
-              <enum>Qt::TextFormat::PlainText</enum>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="emulatorTab">
-       <attribute name="title">
-        <string>Emulator</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="emulatorTab_layout" stretch="0,1,0">
-        <item>
-         <layout class="QHBoxLayout" name="emulatorTabLayout" stretch="1,1,1">
-          <item>
-           <layout class="QVBoxLayout" name="emulatorTabLayoutLeft">
-            <item>
-             <widget class="QGroupBox" name="gb_emu_settings">
-              <property name="title">
-               <string>Emulator Settings</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_emu_settings_layout">
-               <item>
-                <widget class="QCheckBox" name="exitOnStop">
-                 <property name="text">
-                  <string>Exit RPCS3 when process finishes</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="pauseOnFocusLoss">
-                 <property name="text">
-                  <string>Pause emulation on RPCS3 focus loss</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="pausedSavestates">
-                 <property name="text">
-                  <string>Pause emulation after loading savestates</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="pauseDuringHomeMenu">
-                 <property name="text">
-                  <string>Pause emulation during home menu</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="preventDisplaySleep">
-                 <property name="text">
-                  <string>Prevent display sleep while running games</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="showTrophyPopups">
-                 <property name="text">
-                  <string>Show trophy popups</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="showRpcnPopups">
-                 <property name="text">
-                  <string>Show RPCN popups</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="showShaderCompilationHint">
-                 <property name="text">
-                  <string>Show shader compilation hint</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="showPPUCompilationHint">
-                 <property name="text">
-                  <string>Show PPU compilation hint</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="showAutosaveAutoloadHint">
-                 <property name="text">
-                  <string>Show autosave/autoload hint</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="showAnalogLimiterToggleHint">
-                 <property name="text">
-                  <string>Show analog limiter toggle hint</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="showPressureIntensityToggleHint">
-                 <property name="text">
-                  <string>Show pressure intensity toggle hint</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="showMouseAndKeyboardToggleHint">
-                 <property name="text">
-                  <string>Show mouse and keyboard toggle hint</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="startGameFullscreen">
-                 <property name="text">
-                  <string>Start games in fullscreen mode</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="useNativeInterface">
-                 <property name="text">
-                  <string>Use native user interface</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <spacer name="emulatorTabSpacerLeft">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Vertical</enum>
-                 </property>
-                 <property name="sizeType">
-                  <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_max_llvm">
-              <property name="title">
-               <string>Max LLVM Compile Threads</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_max_llvm_layout">
-               <item>
-                <widget class="QComboBox" name="maxLLVMThreads"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_shader_compiler_threads">
-              <property name="title">
-               <string>Max Shader Compile Threads</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_shader_compiler_threads_layout">
-               <item>
-                <widget class="QComboBox" name="shaderCompilerThreads"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="emulatorTabLayoutMiddle">
-            <item>
-             <widget class="QGroupBox" name="gb_viewport">
-              <property name="title">
-               <string>Viewport</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_viewport_layout">
-               <item>
-                <widget class="QCheckBox" name="gs_disableMouse">
-                 <property name="text">
-                  <string>Ignore doubleclicks for Fullscreen</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="gs_disableKbHotkeys">
-                 <property name="text">
-                  <string>Ignore keyboard hotkeys</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="gs_showMouseInFullscreen">
-                 <property name="text">
-                  <string>Show mouse cursor in Fullscreen</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="gs_lockMouseInFullscreen">
-                 <property name="text">
-                  <string>Lock mouse cursor in Fullscreen</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="gs_hideMouseOnIdle_widget" native="true">
-                 <layout class="QHBoxLayout" name="gs_hideMouseOnIdle_layout" stretch="0,0">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QCheckBox" name="gs_hideMouseOnIdle">
-                    <property name="text">
-                     <string>Hide mouse cursor if idle</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSpinBox" name="gs_hideMouseOnIdleTime">
-                    <property name="accelerated">
-                     <bool>true</bool>
-                    </property>
-                    <property name="correctionMode">
-                     <enum>QAbstractSpinBox::CorrectionMode::CorrectToNearestValue</enum>
-                    </property>
-                    <property name="keyboardTracking">
-                     <bool>false</bool>
-                    </property>
-                    <property name="suffix">
-                     <string>ms</string>
-                    </property>
-                    <property name="minimum">
-                     <number>200</number>
-                    </property>
-                    <property name="maximum">
-                     <number>99999</number>
-                    </property>
-                    <property name="stepType">
-                     <enum>QAbstractSpinBox::StepType::DefaultStepType</enum>
-                    </property>
-                    <property name="value">
-                     <number>2000</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="gs_resizeOnBoot_widget" native="true">
-                 <layout class="QVBoxLayout" name="gs_resizeOnBoot_layout">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QCheckBox" name="gs_resizeOnBoot">
-                    <property name="text">
-                     <string>Resize game window on boot</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QCheckBox" name="gs_resizeOnBootManual">
-                    <property name="text">
-                     <string>Resize manually</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="gs_resolution_layout">
-                    <item>
-                     <widget class="QGroupBox" name="gb_gs_width">
-                      <property name="title">
-                       <string>Width</string>
-                      </property>
-                      <layout class="QVBoxLayout" name="gb_gs_width_layout">
-                       <item>
-                        <widget class="QSpinBox" name="gs_width">
-                         <property name="accelerated">
-                          <bool>true</bool>
-                         </property>
-                         <property name="correctionMode">
-                          <enum>QAbstractSpinBox::CorrectionMode::CorrectToNearestValue</enum>
-                         </property>
-                         <property name="keyboardTracking">
-                          <bool>false</bool>
-                         </property>
-                         <property name="minimum">
-                          <number>0</number>
-                         </property>
-                         <property name="maximum">
-                          <number>9999</number>
-                         </property>
-                         <property name="value">
-                          <number>0</number>
-                         </property>
-                        </widget>
-                       </item>
-                      </layout>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QGroupBox" name="gb_gs_height">
-                      <property name="title">
-                       <string>Height</string>
-                      </property>
-                      <layout class="QVBoxLayout" name="gb_gs_height_layout">
-                       <item>
-                        <widget class="QSpinBox" name="gs_height">
-                         <property name="frame">
-                          <bool>true</bool>
-                         </property>
-                         <property name="accelerated">
-                          <bool>true</bool>
-                         </property>
-                         <property name="correctionMode">
-                          <enum>QAbstractSpinBox::CorrectionMode::CorrectToNearestValue</enum>
-                         </property>
-                         <property name="keyboardTracking">
-                          <bool>false</bool>
-                         </property>
-                         <property name="minimum">
-                          <number>0</number>
-                         </property>
-                         <property name="maximum">
-                          <number>9999</number>
-                         </property>
-                         <property name="value">
-                          <number>0</number>
-                         </property>
-                        </widget>
-                       </item>
-                      </layout>
-                     </widget>
-                    </item>
-                   </layout>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_shader_load">
-              <property name="title">
-               <string>Shader Loading Screen</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_shader_load_layout">
-               <item>
-                <widget class="QCheckBox" name="shaderLoadBgEnabled">
-                 <property name="text">
-                  <string>Allow custom background</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="label_shaderLoadBgDarkening">
-                 <property name="text">
-                  <string>Background darkening:</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QSlider" name="shaderLoadBgDarkening">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="label_shaderLoadBgBlur">
-                 <property name="text">
-                  <string>Background blur:</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QSlider" name="shaderLoadBgBlur">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <spacer name="spacer_shader_load">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Vertical</enum>
-                 </property>
-                 <property name="sizeType">
-                  <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_game_window_title">
-              <property name="title">
-               <string>Game Window Title</string>
-              </property>
-              <layout class="QVBoxLayout" name="layout_gb_game_window_title">
-               <item>
-                <widget class="QLabel" name="label_game_window_title_format">
-                 <property name="text">
-                  <string notr="true">FPS: 60 | Renderer | Version | Game [ID]</string>
-                 </property>
-                 <property name="alignment">
-                  <set>Qt::AlignmentFlag::AlignCenter</set>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="layout_buttons_game_window_title">
-                 <item>
-                  <widget class="QPushButton" name="reset_button_game_window_title_format">
-                   <property name="toolTip">
-                    <string>Reset the game window title to default</string>
-                   </property>
-                   <property name="text">
-                    <string>Reset</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="edit_button_game_window_title_format">
-                   <property name="toolTip">
-                    <string>Edit the game window title</string>
-                   </property>
-                   <property name="text">
-                    <string>Edit</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="emulatorTabLayoutRight">
-            <item>
-             <widget class="QGroupBox" name="gb_performance_overlay">
-              <property name="title">
-               <string>Performance Overlay</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_performance_overlay_layout">
-               <item>
-                <widget class="QCheckBox" name="perfOverlayEnabled">
-                 <property name="text">
-                  <string>Enable performance overlay</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="perfOverlayFramerateGraphEnabled">
-                 <property name="text">
-                  <string>Show framerate graph</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="perfOverlayFrametimeGraphEnabled">
-                 <property name="text">
-                  <string>Show frametime graph</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="perf_overlay_detail_level" native="true">
-                 <layout class="QVBoxLayout" name="layout_perf_overlay_detail_level">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QLabel" name="label_detail_level">
-                    <property name="text">
-                     <string>Detail Level:</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QComboBox" name="perfOverlayDetailLevel"/>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="perf_overlay_position" native="true">
-                 <layout class="QVBoxLayout" name="layout_perf_overlay_position">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QLabel" name="label_position">
-                    <property name="text">
-                     <string>Position:</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QComboBox" name="perfOverlayPosition"/>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="label_margin_x">
-                 <property name="text">
-                  <string>Horizontal Margin:</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="layout_margin_x" stretch="0,0">
-                 <item>
-                  <widget class="QCheckBox" name="perfOverlayCenterX">
-                   <property name="text">
-                    <string>Centered</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QSpinBox" name="perfOverlayMarginX"/>
-                 </item>
-                </layout>
-               </item>
-               <item>
-                <widget class="QLabel" name="label_margin_y">
-                 <property name="text">
-                  <string>Vertical Margin:</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="layout_margin_y" stretch="0,0">
-                 <item>
-                  <widget class="QCheckBox" name="perfOverlayCenterY">
-                   <property name="text">
-                    <string>Centered</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QSpinBox" name="perfOverlayMarginY"/>
-                 </item>
-                </layout>
-               </item>
-               <item>
-                <widget class="QWidget" name="perf_overlay_update_interval" native="true">
-                 <layout class="QVBoxLayout" name="layout_perf_overlay_update_interval">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QLabel" name="label_update_interval">
-                    <property name="text">
-                     <string>Update Interval:</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSlider" name="perfOverlayUpdateInterval">
-                    <property name="singleStep">
-                     <number>10</number>
-                    </property>
-                    <property name="pageStep">
-                     <number>100</number>
-                    </property>
-                    <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="perf_overlay_font_size" native="true">
-                 <layout class="QVBoxLayout" name="layout_perf_overlay_font_size">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QLabel" name="label_font_size">
-                    <property name="text">
-                     <string>Font Size: </string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSlider" name="perfOverlayFontSize">
-                    <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="perf_overlay_opacity" native="true">
-                 <layout class="QVBoxLayout" name="layout_perf_overlay_opacity">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QLabel" name="label_opacity">
-                    <property name="text">
-                     <string>Opacity:</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSlider" name="perfOverlayOpacity">
-                    <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="perf_overlay_framerate_datapoints" native="true">
-                 <layout class="QVBoxLayout" name="layout_perf_overlay_framerate_datapoints">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QLabel" name="label_framerate_datapoints">
-                    <property name="text">
-                     <string>Framerate datapoints:</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSlider" name="slider_framerate_datapoints">
-                    <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="perf_overlay_frametime_datapoints" native="true">
-                 <layout class="QVBoxLayout" name="layout_perf_overlay_frametime_datapoints">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QLabel" name="label_frametime_datapoints">
-                    <property name="text">
-                     <string>Frametime datapoints:</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSlider" name="slider_frametime_datapoints">
-                    <property name="orientation">
-                     <enum>Qt::Orientation::Horizontal</enum>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <spacer name="emulatorTabSpacerRight">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Vertical</enum>
-                 </property>
-                 <property name="sizeType">
-                  <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-              </layout>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="emulatorTabSpacer">
-          <property name="orientation">
-           <enum>Qt::Orientation::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="gb_description_emulator">
-          <property name="title">
-           <string>Description</string>
-          </property>
-          <layout class="QVBoxLayout" name="gb_description_emulator_layout">
-           <item>
-            <widget class="QLabel" name="description_emulator">
-             <property name="text">
-              <string>Point your mouse at an option to display a description in here.
-
-
-</string>
-             </property>
-             <property name="textFormat">
-              <enum>Qt::TextFormat::PlainText</enum>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="guiTab">
-       <attribute name="title">
-        <string>GUI</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="guiTab_layout" stretch="0,1,0">
-        <item>
-         <layout class="QHBoxLayout" name="guiTabLayout" stretch="1,1,1">
-          <item>
-           <layout class="QVBoxLayout" name="guiTabLayoutLeft">
-            <item>
-             <widget class="QGroupBox" name="gb_stylesheets">
-              <property name="title">
-               <string>UI Stylesheets</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_stylesheets_layout">
-               <item>
-                <widget class="QComboBox" name="combo_stylesheets"/>
-               </item>
-               <item>
-                <widget class="QPushButton" name="pb_apply_stylesheet">
-                 <property name="text">
-                  <string>Apply</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_colors">
-              <property name="title">
-               <string>UI Colors</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_colors_layout">
-               <property name="leftMargin">
-                <number>9</number>
-               </property>
-               <property name="topMargin">
-                <number>9</number>
-               </property>
-               <property name="rightMargin">
-                <number>9</number>
-               </property>
-               <property name="bottomMargin">
-                <number>9</number>
-               </property>
-               <item>
-                <widget class="QCheckBox" name="cb_custom_colors">
-                 <property name="text">
-                  <string>Use custom UI Colors</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QPushButton" name="pb_gl_icon_color">
-                 <property name="text">
-                  <string>Gamelist icons</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QPushButton" name="pb_sd_icon_color">
-                 <property name="text">
-                  <string>Save manager icons</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QPushButton" name="pb_tr_icon_color">
-                 <property name="text">
-                  <string>Trophy manager icons</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer name="guiTabSpacerLeft">
-              <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="guiTabLayoutMiddle">
-            <item>
-             <widget class="QGroupBox" name="gb_log">
-              <property name="title">
-               <string>Log</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_log_layout">
-               <item>
-                <widget class="QWidget" name="log_limit" native="true">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <layout class="QVBoxLayout" name="layout_log_limit">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QLabel" name="label_log_limit">
-                    <property name="text">
-                     <string>Maximum log blocks (0 = no limit)</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSpinBox" name="spinbox_log_limit">
-                    <property name="minimum">
-                     <number>0</number>
-                    </property>
-                    <property name="maximum">
-                     <number>999999999</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="tty_limit" native="true">
-                 <layout class="QVBoxLayout" name="layout_tty_limit">
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QLabel" name="label_tty_limit">
-                    <property name="text">
-                     <string>Maximum TTY blocks (0 = no limit)</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSpinBox" name="spinbox_tty_limit">
-                    <property name="maximum">
-                     <number>999999999</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_gui_pad_input">
-              <property name="title">
-               <string>Pad Input</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_gui_pad_input_layout">
-               <item>
-                <widget class="QCheckBox" name="cb_pad_navigation">
-                 <property name="text">
-                  <string>Enable Pad Navigation</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="cb_global_pad_navigation">
-                 <property name="text">
-                  <string>Allow Global Pad Navigation</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer name="guiTabSpacerMiddle">
-              <property name="orientation">
-               <enum>Qt::Orientation::Vertical</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="guiTabLayoutRight">
-            <item>
-             <widget class="QGroupBox" name="gb_gui_options">
-              <property name="title">
-               <string>UI Options</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_gui_options_layout">
-               <item>
-                <widget class="QCheckBox" name="cb_show_welcome">
-                 <property name="text">
-                  <string>Show Welcome Screen</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="cb_show_exit_game">
-                 <property name="text">
-                  <string>Show Exit Game Dialog</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="cb_show_boot_game">
-                 <property name="text">
-                  <string>Show Boot Game Dialog</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="cb_show_pkg_install">
-                 <property name="text">
-                  <string>Show PKG Installation Dialog</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="cb_show_pup_install">
-                 <property name="text">
-                  <string>Show PUP Installation Dialog</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="cb_show_obsolete_cfg_dialog">
-                 <property name="text">
-                  <string>Show Obsolete Settings Dialog</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="cb_show_same_buttons_dialog">
-                 <property name="text">
-                  <string>Show Duplicate Buttons Dialog</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="cb_show_restart_hint">
-                 <property name="text">
-                  <string>Show Restart Dialog</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <spacer name="guiTabSpacerRight">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Vertical</enum>
-                 </property>
-                 <property name="sizeType">
-                  <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_updates">
-              <property name="title">
-               <string>Check for updates on startup</string>
-              </property>
-              <layout class="QVBoxLayout" name="layout_gb_updates">
-               <item>
-                <widget class="QComboBox" name="combo_updates"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_discord">
-              <property name="title">
-               <string>Discord</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_discord_layout">
-               <item>
-                <widget class="QCheckBox" name="useRichPresence">
-                 <property name="text">
-                  <string>Use Discord Rich Presence</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="label_discordState">
-                 <property name="text">
-                  <string>Discord Status:</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLineEdit" name="discordState">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="maxLength">
-                  <number>128</number>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="gb_uuid">
-              <property name="title">
-               <string>Installation ID</string>
-              </property>
-              <layout class="QVBoxLayout" name="gb_uuid_layout">
-               <item>
-                <widget class="QLabel" name="label_uuid">
-                 <property name="text">
-                  <string>UUID-placeholder</string>
-                 </property>
-                 <property name="alignment">
-                  <set>Qt::AlignmentFlag::AlignCenter</set>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QPushButton" name="pb_uuid">
-                 <property name="text">
-                  <string>Create new ID</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="guiTabSpacer">
-          <property name="orientation">
-           <enum>Qt::Orientation::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="gb_description_gui">
-          <property name="title">
-           <string>Description</string>
-          </property>
-          <layout class="QVBoxLayout" name="gb_description_gui_layout">
-           <item>
-            <widget class="QLabel" name="description_gui">
-             <property name="text">
-              <string>Point your mouse at an option to display a description in here.
-
-
-</string>
-             </property>
-             <property name="textFormat">
-              <enum>Qt::TextFormat::PlainText</enum>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="debugTab">
-       <attribute name="title">
-        <string>Debug</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="debugTab_layout" stretch="0,1,0">
-        <item>
-         <layout class="QHBoxLayout" name="debugTabLayout" stretch="1,1,1">
-          <item>
-           <widget class="QGroupBox" name="gb_debug_gpu">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="title">
-             <string>GPU</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-            </property>
-            <layout class="QVBoxLayout" name="gb_debug_gpu_layout">
-             <item alignment="Qt::AlignmentFlag::AlignTop">
-              <widget class="QCheckBox" name="debugOutput">
-               <property name="text">
-                <string>Debug Output</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="debugOverlay">
-               <property name="text">
-                <string>Debug Overlay</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="disableFIFOReordering">
-               <property name="text">
-                <string>Disable FIFO Reordering</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="disableVideoOutput">
-               <property name="text">
-                <string>Disable Video Output</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="disableVulkanMemAllocator">
-               <property name="text">
-                <string>Disable Vulkan Memory Allocator</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="disableHwOcclusionQueries">
-               <property name="text">
-                <string>Disable ZCull Occlusion Queries</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="forceCpuBlitEmulation">
-               <property name="text">
-                <string>Force CPU Blit Emulation</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="gpuTextureScaling">
-               <property name="text">
-                <string>Force GPU Texture Scaling</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="logProg">
-               <property name="text">
-                <string>Log Shader Programs</string>
-               </property>
-              </widget>
-             </item>
-             <item alignment="Qt::AlignmentFlag::AlignTop">
-              <widget class="QCheckBox" name="renderdocCompatibility">
-               <property name="enabled">
-                <bool>true</bool>
-               </property>
-               <property name="text">
-                <string>Renderdoc Compatibility Mode</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="strictTextureFlushing">
-               <property name="text">
-                <string>Strict Texture Flushing</string>
-               </property>
-              </widget>
-             </item>
-             <item alignment="Qt::AlignmentFlag::AlignTop">
-              <widget class="QCheckBox" name="forceHighpZ">
-               <property name="text">
-                <string>Use High Precision Z-Buffer</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="disableAsyncHostMM">
-               <property name="text">
-                <string>Disable Asynchronous Memory Manager</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="disableOnDiskShaderCache">
-               <property name="text">
-                <string>Disable On-Disk Shader Cache</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="verticalSpacerDebugGPU">
-               <property name="orientation">
-                <enum>Qt::Orientation::Vertical</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <widget class="QGroupBox" name="gb_debug_core">
-            <property name="title">
-             <string>Core</string>
-            </property>
-            <layout class="QVBoxLayout" name="gb_debug_core_layout">
-             <item>
-              <widget class="QCheckBox" name="alwaysStart">
-               <property name="text">
-                <string>Automatically start games after boot</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="perfReport">
-               <property name="text">
-                <string>Enable performance report</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="hookStFunc">
-               <property name="text">
-                <string>Hook static functions</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="ppuDebug">
-               <property name="text">
-                <string>PPU Debug</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="spuDebug">
-               <property name="text">
-                <string>SPU Debug</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="mfcDebug">
-               <property name="text">
-                <string>MFC Debug</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="setDAZandFTZ">
-               <property name="text">
-                <string>Set DAZ and FTZ</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="accuratePPUSAT">
-               <property name="text">
-                <string>Accurate PPU Saturation Bit</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="accuratePPUNJ">
-               <property name="text">
-                <string>Accurate PPU Non-Java Mode</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="accuratePPUVNAN">
-               <property name="text">
-                <string>Accurate PPU Vector NaN Handling</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="accuratePPUFPCC">
-               <property name="text">
-                <string>Accurate PPU Float Condition Control</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="accurateClineStores">
-               <property name="text">
-                <string>Accurate Cache Line Stores</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="fixupPPUVNAN">
-               <property name="text">
-                <string>PPU Vector NaN Fixup</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="spuProfiler">
-               <property name="text">
-                <string>SPU Profiler</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="verticalSpacerDebugCore">
-               <property name="orientation">
-                <enum>Qt::Orientation::Vertical</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <widget class="QWidget" name="debug_more_stuff" native="true">
-            <layout class="QVBoxLayout" name="debug_more_stuff_layout" stretch="0,0,0,0,0,1">
              <property name="leftMargin">
               <number>0</number>
              </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
              <item>
-              <widget class="QGroupBox" name="gb_accurate_ppu_128">
+              <widget class="QGroupBox" name="gb_resolutionScale">
                <property name="title">
-                <string>Accurate PPU 128 Reservations</string>
+                <string>Resolution Scale (Disable Strict Mode)</string>
                </property>
-               <layout class="QVBoxLayout" name="gb_accurate_ppu_128_layout">
+               <layout class="QVBoxLayout" name="gb_resolutionScale_layout">
                 <item>
-                 <widget class="QComboBox" name="combo_accurate_ppu_128"/>
+                 <widget class="QWidget" name="resolutionScaleLayoutTop" native="true">
+                  <layout class="QHBoxLayout" name="horizontalLayout_23" stretch="0,1,0">
+                   <property name="spacing">
+                    <number>12</number>
+                   </property>
+                   <property name="leftMargin">
+                    <number>0</number>
+                   </property>
+                   <property name="topMargin">
+                    <number>0</number>
+                   </property>
+                   <property name="rightMargin">
+                    <number>0</number>
+                   </property>
+                   <property name="bottomMargin">
+                    <number>0</number>
+                   </property>
+                   <item>
+                    <widget class="QLabel" name="resolutionScaleMin">
+                     <property name="text">
+                      <string>50</string>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QSlider" name="resolutionScale">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QLabel" name="resolutionScaleMax">
+                     <property name="text">
+                      <string>800</string>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </widget>
                 </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="gb_num_ppu_threads">
-               <property name="title">
-                <string>PPU Thread Count</string>
-               </property>
-               <layout class="QVBoxLayout" name="vbl_num_ppu_threads">
                 <item>
-                 <widget class="QComboBox" name="combo_num_ppu_threads"/>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="gb_Level_of_Detail">
-               <property name="title">
-                <string>LOD Bias Offset</string>
-               </property>
-               <layout class="QVBoxLayout" name="gb_Level_of_Detail_Layout">
-                <item>
-                 <layout class="QHBoxLayout" name="TextureLODBiasLayout">
+                 <layout class="QHBoxLayout" name="resolutionScaleLayoutBottom" stretch="1,0">
                   <item>
-                   <widget class="QDoubleSpinBox" name="TextureLODBias"/>
+                   <widget class="QLabel" name="resolutionScaleVal">
+                    <property name="text">
+                     <string>0</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignCenter</set>
+                    </property>
+                   </widget>
                   </item>
                   <item>
-                   <widget class="QPushButton" name="TextureLODBiasReset">
+                   <widget class="QPushButton" name="resolutionScaleReset">
                     <property name="text">
                      <string>Reset</string>
                     </property>
@@ -4473,129 +572,3271 @@
               </widget>
              </item>
              <item>
-              <widget class="QGroupBox" name="gb_vulkansched">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
+              <widget class="QGroupBox" name="gb_minimumScalableDimension">
                <property name="title">
-                <string>Vulkan Queue Scheduler</string>
+                <string>Resolution Scale Threshold</string>
                </property>
-               <layout class="QVBoxLayout" name="gb_vksched_layout">
+               <layout class="QVBoxLayout" name="gb_minimumScalableDimension_layout">
                 <item>
-                 <widget class="QComboBox" name="vulkansched"/>
+                 <layout class="QHBoxLayout" name="minimumScalableDimensionLayoutTop" stretch="0,1,0">
+                  <property name="spacing">
+                   <number>12</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="minimumScalableDimensionMin">
+                    <property name="text">
+                     <string>1</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QSlider" name="minimumScalableDimension">
+                    <property name="orientation">
+                     <enum>Qt::Horizontal</enum>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLabel" name="minimumScalableDimensionMax">
+                    <property name="text">
+                     <string>1024</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <layout class="QHBoxLayout" name="minimumScalableDimensionLayoutBottom" stretch="1,0">
+                  <item>
+                   <widget class="QLabel" name="minimumScalableDimensionVal">
+                    <property name="text">
+                     <string>1x1</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QPushButton" name="minimumScalableDimensionReset">
+                    <property name="text">
+                     <string>Reset</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
                 </item>
                </layout>
               </widget>
              </item>
-             <item>
-              <widget class="QGroupBox" name="gb_debug_io">
-               <property name="title">
-                <string>I/O</string>
-               </property>
-               <layout class="QVBoxLayout" name="gb_debug_io_layout">
+            </layout>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_Upscaling">
+             <property name="title">
+              <string>Upscaling</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_Upscaling_layout">
+              <item>
+               <widget class="QCheckBox" name="fsrUpscalingEnable">
+                <property name="text">
+                 <string>Enable FSR Upscaling</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="Line" name="line">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="fsrSharpeningStrengthLabel">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>RCAS Sharpening Strength</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+                </property>
+                <property name="margin">
+                 <number>1</number>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="fsrSharpeningLayoutTop">
                 <item>
-                 <widget class="QCheckBox" name="debugOverlayIO">
+                 <widget class="QLabel" name="minSharpeningVal">
                   <property name="text">
-                   <string>Debug Overlay For Pad Input</string>
+                   <string>0</string>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <spacer name="verticalSpacer">
+                 <widget class="QSlider" name="fsrSharpeningStrength">
                   <property name="orientation">
-                   <enum>Qt::Orientation::Vertical</enum>
+                   <enum>Qt::Horizontal</enum>
                   </property>
-                  <property name="sizeType">
-                   <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="maxSharpeningVal">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
                   </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>0</width>
-                    <height>0</height>
-                   </size>
+                  <property name="text">
+                   <string>100</string>
                   </property>
-                 </spacer>
+                 </widget>
                 </item>
                </layout>
-              </widget>
-             </item>
-             <item>
-              <spacer name="verticalSpacerDebugMore">
-               <property name="orientation">
-                <enum>Qt::Orientation::Vertical</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="debugTabSpacer">
-          <property name="orientation">
-           <enum>Qt::Orientation::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="gb_description_debug">
-          <property name="title">
-           <string>Description</string>
-          </property>
-          <layout class="QVBoxLayout" name="gb_description_debug_layout">
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="fsrSharpeningLayoutBottom" stretch="1,0">
+                <item>
+                 <widget class="QLabel" name="fsrSharpeningStrengthVal">
+                  <property name="text">
+                   <string>0</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="fsrSharpeningStrengthReset">
+                  <property name="text">
+                   <string>Reset</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
            <item>
-            <widget class="QLabel" name="description_debug">
-             <property name="text">
-              <string>Point your mouse at an option to display a description in here.
-
-
-</string>
+            <spacer name="gpu_tab_layout_middle_spacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
              </property>
-             <property name="textFormat">
-              <enum>Qt::TextFormat::PlainText</enum>
+             <property name="sizeType">
+              <enum>QSizePolicy::MinimumExpanding</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="gpuTabLayoutRight">
+           <property name="rightMargin">
+            <number>12</number>
+           </property>
+           <property name="bottomMargin">
+            <number>12</number>
+           </property>
+           <item>
+            <widget class="QGroupBox" name="gb_shader_mode">
+             <property name="minimumSize">
+              <size>
+               <width>0</width>
+               <height>123</height>
+              </size>
+             </property>
+             <property name="title">
+              <string>Shader Mode</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout">
+              <item>
+               <widget class="QRadioButton" name="rb_legacy_recompiler">
+                <property name="text">
+                 <string notr="true">Legacy (single threaded)</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="rb_async_recompiler">
+                <property name="text">
+                 <string notr="true">Async (multi threaded)</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="rb_async_with_shader_interpreter">
+                <property name="text">
+                 <string notr="true">Async with Shader Interpreter</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="rb_shader_interpreter_only">
+                <property name="text">
+                 <string notr="true">Shader Interpreter only</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_shader_compiler_threads">
+             <property name="title">
+              <string>Number of Shader Compiler Threads</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_shader_compiler_threads_layout">
+              <item>
+               <widget class="QComboBox" name="shaderCompilerThreads"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_additional_settings">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Additional Settings</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
              </property>
+             <layout class="QVBoxLayout" name="gb_additional_settings_layout">
+              <item>
+               <widget class="QCheckBox" name="dumpColor">
+                <property name="text">
+                 <string>Write Color Buffers</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="strictModeRendering">
+                <property name="text">
+                 <string>Strict Rendering Mode</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="vsync">
+                <property name="text">
+                 <string>VSync</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="stretchToDisplayArea">
+                <property name="text">
+                 <string>Stretch To Display Area</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="Enable3D">
+                <property name="text">
+                 <string>Enable 3D</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="disableVertexCache">
+                <property name="text">
+                 <string>Disable Vertex Cache</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="multithreadedRSX">
+                <property name="text">
+                 <string>Multithreaded RSX</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="asyncTextureStreaming">
+                <property name="text">
+                 <string>Asynchronous Texture Streaming</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="additional_settings_spacer">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeType">
+                 <enum>QSizePolicy::MinimumExpanding</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
             </widget>
            </item>
           </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="gpuTabSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::MinimumExpanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="gb_description_gpu">
+         <property name="title">
+          <string>Description</string>
+         </property>
+         <layout class="QHBoxLayout" name="gb_description_gpu_layout">
+          <item>
+           <widget class="QLabel" name="description_gpu">
+            <property name="text">
+             <string>Point your mouse at an option to display a description in here.
+
+
+</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::PlainText</enum>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="audioTab">
+      <attribute name="title">
+       <string>Audio</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="audioTab_layout" stretch="0,0,1,0">
+       <item>
+        <layout class="QHBoxLayout" name="audioTabLayoutTop" stretch="1,1,1">
+         <item>
+          <layout class="QVBoxLayout" name="audioTabLayoutTopLeft">
+           <item>
+            <widget class="QGroupBox" name="gb_audio_out">
+             <property name="title">
+              <string>Audio Out</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_audio_out_layout">
+              <item>
+               <widget class="QComboBox" name="audioOutBox"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_audio_downmix">
+             <property name="title">
+              <string>Audio Channels</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_audio_channels_layout">
+              <item>
+               <widget class="QComboBox" name="combo_audio_downmix"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_audio_settings">
+             <property name="title">
+              <string>Audio Settings</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_audio_settings_layout">
+              <item>
+               <widget class="QCheckBox" name="audioDump">
+                <property name="text">
+                 <string>Dump to File</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="convert">
+                <property name="text">
+                 <string>Convert to 16-bit</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="spacer_audio_settings">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeType">
+                 <enum>QSizePolicy::MinimumExpanding</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="audioTabLayoutTopMiddle">
+           <item>
+            <widget class="QGroupBox" name="gb_audio_volume">
+             <property name="title">
+              <string>Volume</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_audio_volume_layout">
+              <item>
+               <widget class="QWidget" name="master_volume" native="true">
+                <layout class="QVBoxLayout" name="layout_master_volume">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="masterVolumeLabel">
+                   <property name="text">
+                    <string>Master: 0%</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSlider" name="masterVolume">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="tickPosition">
+                    <enum>QSlider::TicksBelow</enum>
+                   </property>
+                   <property name="tickInterval">
+                    <number>50</number>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <spacer name="spacer_audio_volume">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeType">
+                 <enum>QSizePolicy::MinimumExpanding</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="audioTabLayoutTopRight">
+           <item>
+            <widget class="QGroupBox" name="gb_audio_buffering">
+             <property name="title">
+              <string>Buffering</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_audio_buffering_layout">
+              <item>
+               <widget class="QCheckBox" name="enableBuffering">
+                <property name="text">
+                 <string>Enable Buffering</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="audio_buffer_duration" native="true">
+                <layout class="QVBoxLayout" name="layout_audio_buffer_duration">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="audioBufferDurationLabel">
+                   <property name="text">
+                    <string>Audio Buffer Duration: 0ms</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSlider" name="audioBufferDuration">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="tickPosition">
+                    <enum>QSlider::TicksBelow</enum>
+                   </property>
+                   <property name="tickInterval">
+                    <number>10</number>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="enableTimeStretching">
+                <property name="text">
+                 <string>Enable Time Stretching</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="time_stretching_threshold" native="true">
+                <layout class="QVBoxLayout" name="layout_time_stretching_threshold">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="timeStretchingThresholdLabel">
+                   <property name="text">
+                    <string>Time Stretching Threshold: 0%</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSlider" name="timeStretchingThreshold">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="tickPosition">
+                    <enum>QSlider::TicksBelow</enum>
+                   </property>
+                   <property name="tickInterval">
+                    <number>10</number>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="gb_microphone_settings">
+         <property name="title">
+          <string>Microphone Settings</string>
+         </property>
+         <layout class="QVBoxLayout" name="gb_microphone_settings_layout">
+          <item>
+           <layout class="QHBoxLayout" name="microphoneLayoutTop">
+            <item>
+             <widget class="QLabel" name="microphoneLabel">
+              <property name="text">
+               <string>Microphone Type:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="microphoneBox"/>
+            </item>
+            <item>
+             <spacer name="microphoneSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::MinimumExpanding</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="microphoneLayoutBottom">
+            <item>
+             <layout class="QVBoxLayout" name="microphoneLayoutLabel1and3">
+              <item>
+               <widget class="QLabel" name="microphone1Label">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Mic1:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="microphone3Label">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Mic3:</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="microphoneLayoutBox1and3">
+              <item>
+               <widget class="QComboBox" name="microphone1Box">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QComboBox" name="microphone3Box">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="microphoneLayoutLabel2and4">
+              <item>
+               <widget class="QLabel" name="microphone2Label">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Mic2:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="microphone4Label">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Mic4:</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="microphoneLayoutBox2and4">
+              <item>
+               <widget class="QComboBox" name="microphone2Box">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QComboBox" name="microphone4Box">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="audioTabSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::MinimumExpanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="gb_description_audio">
+         <property name="title">
+          <string>Description</string>
+         </property>
+         <layout class="QVBoxLayout" name="gb_description_audio_layout">
+          <item>
+           <widget class="QLabel" name="description_audio">
+            <property name="text">
+             <string>Point your mouse at an option to display a description in here.
+
+
+</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::PlainText</enum>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="inputTab">
+      <attribute name="title">
+       <string>I/O</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="inputTab_layout" stretch="0,0,1,0">
+       <item>
+        <layout class="QHBoxLayout" name="inputTabLayoutTop" stretch="1,1,1">
+         <item>
+          <widget class="QGroupBox" name="gb_keyboard_handler">
+           <property name="title">
+            <string>Keyboard Handler</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_keyboard_handler_layout">
+            <item>
+             <widget class="QComboBox" name="keyboardHandlerBox"/>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="gb_camera_type">
+           <property name="title">
+            <string>Camera Input</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_camera_type_layout">
+            <item>
+             <widget class="QComboBox" name="cameraTypeBox"/>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="gb_move_handler">
+           <property name="title">
+            <string>Move Handler</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_move_handler_layout">
+            <item>
+             <widget class="QComboBox" name="moveBox"/>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="inputTabLayoutBottom" stretch="1,1,1">
+         <item>
+          <widget class="QGroupBox" name="gb_mouse_handler">
+           <property name="title">
+            <string>Mouse Handler</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_mouse_handler_layout">
+            <item>
+             <widget class="QComboBox" name="mouseHandlerBox"/>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="gb_camera_setting">
+           <property name="title">
+            <string>Camera Settings</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_camera_setting_layout">
+            <item>
+             <widget class="QComboBox" name="cameraBox"/>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="gb_buzz_emulated">
+           <property name="title">
+            <string>Buzz! emulated controller</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_buzz_emulated_layout">
+            <item>
+             <widget class="QComboBox" name="buzzBox"/>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="inputTabSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::MinimumExpanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="gb_description_io">
+         <property name="title">
+          <string>Description</string>
+         </property>
+         <layout class="QVBoxLayout" name="gb_description_io_layout">
+          <item>
+           <widget class="QLabel" name="description_io">
+            <property name="text">
+             <string>Point your mouse at an option to display a description in here.
+
+
+</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::PlainText</enum>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="systemTab">
+      <attribute name="title">
+       <string>System</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="systemTab_layout" stretch="0,0,0,0,1,0">
+       <item>
+        <layout class="QHBoxLayout" name="systemTabLayout1" stretch="1,1,1">
+         <item>
+          <widget class="QGroupBox" name="gb_sysLang">
+           <property name="title">
+            <string>Console Language</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_sysLang_layout">
+            <item>
+             <widget class="QComboBox" name="sysLangBox"/>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="gb_keyboardType">
+           <property name="title">
+            <string>Keyboard Type</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_keyboardType">
+            <item>
+             <widget class="QComboBox" name="keyboardType"/>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="gb_homebrew">
+           <property name="title">
+            <string>Homebrew</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_homebrew_layout">
+            <item>
+             <widget class="QCheckBox" name="enableHostRoot">
+              <property name="text">
+               <string>Enable /host_root/</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="systemTabLayout2" stretch="1,1,1">
+         <item>
+          <widget class="QGroupBox" name="gb_console_region">
+           <property name="title">
+            <string>Console Region</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_console_region_layout">
+            <item>
+             <widget class="QComboBox" name="console_region"/>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="gb_console_time">
+           <property name="title">
+            <string>Console Time</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_2">
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout">
+              <item>
+               <widget class="QDateTimeEdit" name="console_time_edit">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                  <horstretch>10</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="layoutDirection">
+                 <enum>Qt::LeftToRight</enum>
+                </property>
+                <property name="wrapping">
+                 <bool>false</bool>
+                </property>
+                <property name="frame">
+                 <bool>true</bool>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
+                <property name="readOnly">
+                 <bool>false</bool>
+                </property>
+                <property name="buttonSymbols">
+                 <enum>QAbstractSpinBox::UpDownArrows</enum>
+                </property>
+                <property name="accelerated">
+                 <bool>true</bool>
+                </property>
+                <property name="showGroupSeparator" stdset="0">
+                 <bool>false</bool>
+                </property>
+                <property name="calendarPopup">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="console_time_reset">
+                <property name="text">
+                 <string>Set to Now</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QWidget" name="systemTabSpacerWidget2" native="true"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="systemTabLayout3" stretch="1,1,1">
+         <item>
+          <widget class="QGroupBox" name="gb_enterButtonAssignment">
+           <property name="title">
+            <string>Enter Button Assignment</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_enterButtonAssignment_layout">
+            <item>
+             <widget class="QRadioButton" name="enterButtonAssignCircle">
+              <property name="text">
+               <string notr="true">Enter with the Circle button</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QRadioButton" name="enterButtonAssignCross">
+              <property name="text">
+               <string notr="true">Enter with the Cross button</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QWidget" name="systemTabSpacerWidget3" native="true"/>
+         </item>
+         <item>
+          <widget class="QWidget" name="systemTabSpacerWidget4" native="true"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="systemTabLayout4" stretch="1,1,1">
+         <item>
+          <widget class="QGroupBox" name="gb_DiskCacheClearing">
+           <property name="title">
+            <string>Disk cache</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_DiskCacheClearing_layout">
+            <item>
+             <widget class="QCheckBox" name="enableCacheClearing">
+              <property name="text">
+               <string>Clear cache automatically</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="maximumCacheSizeLabel">
+              <property name="text">
+               <string>Cache size: 3072 MB</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSlider" name="maximumCacheSize">
+              <property name="pageStep">
+               <number>512</number>
+              </property>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="tickPosition">
+               <enum>QSlider::TicksBelow</enum>
+              </property>
+              <property name="tickInterval">
+               <number>1024</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QWidget" name="systemTabSpacerWidget5" native="true"/>
+         </item>
+         <item>
+          <widget class="QWidget" name="systemTabSpacerWidget6" native="true"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="systemTabSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::MinimumExpanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="gb_description_system">
+         <property name="title">
+          <string>Description</string>
+         </property>
+         <layout class="QHBoxLayout" name="gb_description_system_layout">
+          <item>
+           <widget class="QLabel" name="description_system">
+            <property name="text">
+             <string>Point your mouse at an option to display a description in here.
+
+
+</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::PlainText</enum>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="networkTab">
+      <attribute name="title">
+       <string>Network</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="networkTab_layout" stretch="0,1,0">
+       <item>
+        <layout class="QHBoxLayout" name="networkTabLayout" stretch="0,0">
+         <item>
+          <widget class="QGroupBox" name="gb_network_status">
+           <property name="title">
+            <string>Network Configuration</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_network_status_layout" stretch="0,0,0,0">
+            <item>
+             <widget class="QGroupBox" name="gb_netStatusBox">
+              <property name="title">
+               <string>Network Status</string>
+              </property>
+              <layout class="QVBoxLayout" name="gb_netStatusBox_layout">
+               <item>
+                <widget class="QComboBox" name="netStatusBox"/>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="gb_edit_dns">
+              <property name="title">
+               <string>DNS</string>
+              </property>
+              <layout class="QVBoxLayout" name="gb_edit_dns_layout">
+               <item>
+                <widget class="QLineEdit" name="edit_dns">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="gb_edit_swaps">
+              <property name="title">
+               <string>IP/Hosts switches</string>
+              </property>
+              <layout class="QVBoxLayout" name="gb_edit_swaps_layout">
+               <item>
+                <widget class="QLineEdit" name="edit_swaps">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="networkTabSpacerLeft">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::MinimumExpanding</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="gb_psn_config">
+           <property name="title">
+            <string>PSN Configuration</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_psn_config_layout">
+            <item>
+             <widget class="QGroupBox" name="gb_psnStatusBox">
+              <property name="title">
+               <string>PSN Status</string>
+              </property>
+              <layout class="QVBoxLayout" name="gb_psnStatusBox_layout">
+               <item>
+                <widget class="QComboBox" name="psnStatusBox"/>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="networkTabSpacerRight">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::MinimumExpanding</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="networkTabSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::MinimumExpanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="gb_description_network">
+         <property name="title">
+          <string>Description</string>
+         </property>
+         <layout class="QVBoxLayout" name="gb_description_network_layout">
+          <item>
+           <widget class="QLabel" name="description_network">
+            <property name="text">
+             <string>Point your mouse at an option to display a description in here.
+
+
+</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::PlainText</enum>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="advancedTab">
+      <attribute name="title">
+       <string>Advanced</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="advancedTab_layout" stretch="1,0,0">
+       <item>
+        <layout class="QHBoxLayout" name="advancedTabLayout" stretch="1,1,1">
+         <item>
+          <layout class="QVBoxLayout" name="advancedTabLayoutLeft">
+           <item>
+            <widget class="QGroupBox" name="gb_advanced_core">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Core</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_advanced_core_layout">
+              <item>
+               <widget class="QCheckBox" name="debugConsoleMode">
+                <property name="text">
+                 <string>Debug Console Mode</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="accurateLLVMdfma">
+                <property name="text">
+                 <string>Accurate LLVM DFMA</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="accurateRSXAccess">
+                <property name="text">
+                 <string>Accurate RSX reservation access</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="AccurateVectorNaN">
+                <property name="text">
+                 <string>PPU LLVM Accurate Vector NaNs</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="ppuLlvmJavaModeHandling">
+                <property name="text">
+                 <string>PPU LLVM Java Mode Handling</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="ppuPrecompilation">
+                <property name="text">
+                 <string>PPU LLVM Precompilation</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="silenceAllLogs">
+                <property name="text">
+                 <string>Silence All Logs</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_sleep_timers_accuracy">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Sleep Timers Accuracy</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_sleep_timers_accuracy_layout">
+              <item>
+               <widget class="QComboBox" name="sleepTimersAccuracy"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_max_spurs_threads">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Maximum Number of SPURS Threads</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_max_spurs_threads_layout">
+              <item>
+               <widget class="QComboBox" name="maxSPURSThreads"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer name="advancedTabSpacerLeft">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::MinimumExpanding</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="advancedTabLayoutMiddle">
+           <item>
+            <widget class="QGroupBox" name="gb_libs">
+             <property name="title">
+              <string>Firmware Libraries</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_libs_layout">
+              <item>
+               <widget class="QListWidget" name="hleList">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="selectionMode">
+                 <enum>QAbstractItemView::ExtendedSelection</enum>
+                </property>
+                <property name="viewMode">
+                 <enum>QListView::ListMode</enum>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QListWidget" name="lleList">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="selectionMode">
+                 <enum>QAbstractItemView::ExtendedSelection</enum>
+                </property>
+                <property name="viewMode">
+                 <enum>QListView::ListMode</enum>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="gb_lleLibs_layout" stretch="1,0">
+                <property name="spacing">
+                 <number>6</number>
+                </property>
+                <property name="sizeConstraint">
+                 <enum>QLayout::SetNoConstraint</enum>
+                </property>
+                <item>
+                 <widget class="QLineEdit" name="searchBox"/>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="resetLleList">
+                  <property name="text">
+                   <string>Reset</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="advancedTabLayoutRight">
+           <item>
+            <widget class="QGroupBox" name="gb_advanced_gpu">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>GPU</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_advanced_gpu_layout">
+              <item>
+               <widget class="QCheckBox" name="readDepth">
+                <property name="text">
+                 <string>Read Depth Buffers</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="dumpDepth">
+                <property name="text">
+                 <string>Write Depth Buffers</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="readColor">
+                <property name="text">
+                 <string>Read Color Buffers</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="disableOnDiskShaderCache">
+                <property name="text">
+                 <string>Disable On-Disk Shader Cache</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="DisableNativefp16">
+                <property name="text">
+                 <string>Disable native float16 support</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="relaxedZCULL">
+                <property name="text">
+                 <string>Relaxed ZCULL Sync</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_vulkansched">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Vulkan Queue Scheduler</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_vksched_layout">
+              <item>
+               <widget class="QComboBox" name="vulkansched"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_wakeupDelay">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Driver Wake-Up Delay</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_wakeupDelay_layout">
+              <item>
+               <widget class="QSlider" name="wakeupDelay">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="wakeupDelayLayout" stretch="1,0">
+                <item>
+                 <widget class="QLabel" name="wakeupText">
+                  <property name="text">
+                   <string>1 µs</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="wakeupReset">
+                  <property name="text">
+                   <string>Reset</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_vblank">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>VBlank Frequency</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_vblank_layout">
+              <item>
+               <widget class="QSlider" name="vblank">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="vBlankLayout" stretch="1,0">
+                <item>
+                 <widget class="QLabel" name="vblankText">
+                  <property name="text">
+                   <string>60 Hz</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="vblankReset">
+                  <property name="text">
+                   <string>Reset</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_clockScale">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Clocks Scale</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_clockScale_layout">
+              <item>
+               <widget class="QSlider" name="clockScale">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="clockScaleLayout" stretch="1,0">
+                <item>
+                 <widget class="QLabel" name="clockScaleText">
+                  <property name="text">
+                   <string>100%</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="clockScaleReset">
+                  <property name="text">
+                   <string>Reset</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer name="advancedTabSpacerRight">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::MinimumExpanding</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>13</width>
+               <height>13</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="advancedTabSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="gb_description_advanced">
+         <property name="title">
+          <string>Description</string>
+         </property>
+         <layout class="QVBoxLayout" name="gb_description_advanced_layout">
+          <item>
+           <widget class="QLabel" name="description_advanced">
+            <property name="text">
+             <string>Point your mouse at an option to display a description in here.
+
+
+</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::PlainText</enum>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="emulatorTab">
+      <attribute name="title">
+       <string>Emulator</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="emulatorTab_layout" stretch="0,1,0">
+       <item>
+        <layout class="QHBoxLayout" name="emulatorTabLayout" stretch="1,1,1">
+         <item>
+          <layout class="QVBoxLayout" name="emulatorTabLayoutLeft">
+           <item>
+            <widget class="QGroupBox" name="gb_emu_settings">
+             <property name="title">
+              <string>Emulator Settings</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_emu_settings_layout">
+              <item>
+               <widget class="QCheckBox" name="exitOnStop">
+                <property name="text">
+                 <string>Exit RPCS3 when process finishes</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="alwaysStart">
+                <property name="text">
+                 <string>Automatically start games after boot</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="startGameFullscreen">
+                <property name="text">
+                 <string>Start games in Fullscreen mode</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="preventDisplaySleep">
+                <property name="text">
+                 <string>Prevent display sleep while running games</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="showTrophyPopups">
+                <property name="text">
+                 <string>Show trophy popups</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="useNativeInterface">
+                <property name="text">
+                 <string>Use native user interface</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="showShaderCompilationHint">
+                <property name="text">
+                 <string>Show shader compilation hint</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="emulatorTabSpacerLeft">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeType">
+                 <enum>QSizePolicy::MinimumExpanding</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_max_llvm">
+             <property name="title">
+              <string>Max LLVM Compile Threads</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_max_llvm_layout">
+              <item>
+               <widget class="QComboBox" name="maxLLVMThreads"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="emulatorTabLayoutMiddle">
+           <item>
+            <widget class="QGroupBox" name="gb_viewport">
+             <property name="title">
+              <string>Viewport</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_viewport_layout">
+              <item>
+               <widget class="QCheckBox" name="gs_disableMouse">
+                <property name="text">
+                 <string>Ignore doubleclicks for Fullscreen</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="gs_disableKbHotkeys">
+                <property name="text">
+                 <string>Ignore keyboard hotkeys</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="gs_showMouseInFullscreen">
+                <property name="text">
+                 <string>Show mouse cursor in Fullscreen</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="gs_lockMouseInFullscreen">
+                <property name="text">
+                 <string>Lock mouse cursor in Fullscreen</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="gs_hideMouseOnIdle_widget" native="true">
+                <layout class="QHBoxLayout" name="gs_hideMouseOnIdle_layout" stretch="0,0">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QCheckBox" name="gs_hideMouseOnIdle">
+                   <property name="text">
+                    <string>Hide mouse cursor if idle</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSpinBox" name="gs_hideMouseOnIdleTime">
+                   <property name="accelerated">
+                    <bool>true</bool>
+                   </property>
+                   <property name="correctionMode">
+                    <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
+                   </property>
+                   <property name="keyboardTracking">
+                    <bool>false</bool>
+                   </property>
+                   <property name="suffix">
+                    <string>ms</string>
+                   </property>
+                   <property name="minimum">
+                    <number>200</number>
+                   </property>
+                   <property name="maximum">
+                    <number>99999</number>
+                   </property>
+                   <property name="stepType">
+                    <enum>QAbstractSpinBox::DefaultStepType</enum>
+                   </property>
+                   <property name="value">
+                    <number>2000</number>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="gs_resizeOnBoot_widget" native="true">
+                <layout class="QVBoxLayout" name="gs_resizeOnBoot_layout">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QCheckBox" name="gs_resizeOnBoot">
+                   <property name="text">
+                    <string>Resize game window on boot</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <layout class="QHBoxLayout" name="gs_resolution_layout">
+                   <item>
+                    <widget class="QGroupBox" name="gb_gs_width">
+                     <property name="title">
+                      <string>Width</string>
+                     </property>
+                     <layout class="QVBoxLayout" name="gb_gs_width_layout">
+                      <item>
+                       <widget class="QSpinBox" name="gs_width">
+                        <property name="accelerated">
+                         <bool>true</bool>
+                        </property>
+                        <property name="correctionMode">
+                         <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
+                        </property>
+                        <property name="keyboardTracking">
+                         <bool>false</bool>
+                        </property>
+                        <property name="minimum">
+                         <number>0</number>
+                        </property>
+                        <property name="maximum">
+                         <number>9999</number>
+                        </property>
+                        <property name="value">
+                         <number>0</number>
+                        </property>
+                       </widget>
+                      </item>
+                     </layout>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QGroupBox" name="gb_gs_height">
+                     <property name="title">
+                      <string>Height</string>
+                     </property>
+                     <layout class="QVBoxLayout" name="gb_gs_height_layout">
+                      <item>
+                       <widget class="QSpinBox" name="gs_height">
+                        <property name="frame">
+                         <bool>true</bool>
+                        </property>
+                        <property name="accelerated">
+                         <bool>true</bool>
+                        </property>
+                        <property name="correctionMode">
+                         <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
+                        </property>
+                        <property name="keyboardTracking">
+                         <bool>false</bool>
+                        </property>
+                        <property name="minimum">
+                         <number>0</number>
+                        </property>
+                        <property name="maximum">
+                         <number>9999</number>
+                        </property>
+                        <property name="value">
+                         <number>0</number>
+                        </property>
+                       </widget>
+                      </item>
+                     </layout>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_shader_load">
+             <property name="title">
+              <string>Shader Loading Screen</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_shader_load_layout">
+              <item>
+               <widget class="QCheckBox" name="shaderLoadBgEnabled">
+                <property name="text">
+                 <string>Allow custom background</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_shaderLoadBgDarkening">
+                <property name="text">
+                 <string>Background darkening:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QSlider" name="shaderLoadBgDarkening">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_shaderLoadBgBlur">
+                <property name="text">
+                 <string>Background blur:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QSlider" name="shaderLoadBgBlur">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="spacer_shader_load">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeType">
+                 <enum>QSizePolicy::MinimumExpanding</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_game_window_title">
+             <property name="title">
+              <string>Game Window Title</string>
+             </property>
+             <layout class="QVBoxLayout" name="layout_gb_game_window_title">
+              <item>
+               <widget class="QLabel" name="label_game_window_title_format">
+                <property name="text">
+                 <string notr="true">FPS: 60 | Renderer | Version | Game [ID]</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="layout_buttons_game_window_title">
+                <item>
+                 <widget class="QPushButton" name="reset_button_game_window_title_format">
+                  <property name="toolTip">
+                   <string>Reset the game window title to default</string>
+                  </property>
+                  <property name="text">
+                   <string>Reset</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="edit_button_game_window_title_format">
+                  <property name="toolTip">
+                   <string>Edit the game window title</string>
+                  </property>
+                  <property name="text">
+                   <string>Edit</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="emulatorTabLayoutRight">
+           <item>
+            <widget class="QGroupBox" name="gb_performance_overlay">
+             <property name="title">
+              <string>Performance Overlay</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_performance_overlay_layout">
+              <item>
+               <widget class="QCheckBox" name="perfOverlayEnabled">
+                <property name="text">
+                 <string>Enable performance overlay</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="perfOverlayFramerateGraphEnabled">
+                <property name="text">
+                 <string>Show framerate graph</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="perfOverlayFrametimeGraphEnabled">
+                <property name="text">
+                 <string>Show frametime graph</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="perf_overlay_detail_level" native="true">
+                <layout class="QVBoxLayout" name="layout_perf_overlay_detail_level">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label_detail_level">
+                   <property name="text">
+                    <string>Detail Level:</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QComboBox" name="perfOverlayDetailLevel"/>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="perf_overlay_position" native="true">
+                <layout class="QVBoxLayout" name="layout_perf_overlay_position">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label_position">
+                   <property name="text">
+                    <string>Position:</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QComboBox" name="perfOverlayPosition"/>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_margin_x">
+                <property name="text">
+                 <string>Horizontal Margin:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="layout_margin_x" stretch="0,0">
+                <item>
+                 <widget class="QCheckBox" name="perfOverlayCenterX">
+                  <property name="text">
+                   <string>Centered</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QSpinBox" name="perfOverlayMarginX"/>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_margin_y">
+                <property name="text">
+                 <string>Vertical Margin:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="layout_margin_y" stretch="0,0">
+                <item>
+                 <widget class="QCheckBox" name="perfOverlayCenterY">
+                  <property name="text">
+                   <string>Centered</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QSpinBox" name="perfOverlayMarginY"/>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <widget class="QWidget" name="perf_overlay_update_interval" native="true">
+                <layout class="QVBoxLayout" name="layout_perf_overlay_update_interval">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label_update_interval">
+                   <property name="text">
+                    <string>Update Interval:</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSlider" name="perfOverlayUpdateInterval">
+                   <property name="singleStep">
+                    <number>10</number>
+                   </property>
+                   <property name="pageStep">
+                    <number>100</number>
+                   </property>
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="perf_overlay_font_size" native="true">
+                <layout class="QVBoxLayout" name="layout_perf_overlay_font_size">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label_font_size">
+                   <property name="text">
+                    <string>Font Size: </string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSlider" name="perfOverlayFontSize">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="perf_overlay_opacity" native="true">
+                <layout class="QVBoxLayout" name="layout_perf_overlay_opacity">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label_opacity">
+                   <property name="text">
+                    <string>Opacity:</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSlider" name="perfOverlayOpacity">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="perf_overlay_framerate_datapoints" native="true">
+                <layout class="QVBoxLayout" name="layout_perf_overlay_framerate_datapoints">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label_framerate_datapoints">
+                   <property name="text">
+                    <string>Framerate datapoints:</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSlider" name="slider_framerate_datapoints">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="perf_overlay_frametime_datapoints" native="true">
+                <layout class="QVBoxLayout" name="layout_perf_overlay_frametime_datapoints">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label_frametime_datapoints">
+                   <property name="text">
+                    <string>Frametime datapoints:</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSlider" name="slider_frametime_datapoints">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <spacer name="emulatorTabSpacerRight">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeType">
+                 <enum>QSizePolicy::MinimumExpanding</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="emulatorTabSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::MinimumExpanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="gb_description_emulator">
+         <property name="title">
+          <string>Description</string>
+         </property>
+         <layout class="QVBoxLayout" name="gb_description_emulator_layout">
+          <item>
+           <widget class="QLabel" name="description_emulator">
+            <property name="text">
+             <string>Point your mouse at an option to display a description in here.
+
+
+</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::PlainText</enum>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="guiTab">
+      <attribute name="title">
+       <string>GUI</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="guiTab_layout" stretch="0,1,0">
+       <item>
+        <layout class="QHBoxLayout" name="guiTabLayout" stretch="1,1,1">
+         <item>
+          <layout class="QVBoxLayout" name="guiTabLayoutLeft">
+           <item>
+            <widget class="QGroupBox" name="gb_stylesheets">
+             <property name="title">
+              <string>UI Stylesheets</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_stylesheets_layout">
+              <item>
+               <widget class="QComboBox" name="combo_stylesheets"/>
+              </item>
+              <item>
+               <widget class="QPushButton" name="pb_apply_stylesheet">
+                <property name="text">
+                 <string>Apply</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_colors">
+             <property name="title">
+              <string>UI Colors</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_colors_layout">
+              <property name="leftMargin">
+               <number>9</number>
+              </property>
+              <property name="topMargin">
+               <number>9</number>
+              </property>
+              <property name="rightMargin">
+               <number>9</number>
+              </property>
+              <property name="bottomMargin">
+               <number>9</number>
+              </property>
+              <item>
+               <widget class="QCheckBox" name="cb_custom_colors">
+                <property name="text">
+                 <string>Use custom UI Colors</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="pb_gl_icon_color">
+                <property name="text">
+                 <string>Gamelist icons</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="pb_sd_icon_color">
+                <property name="text">
+                 <string>Save manager icons</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="pb_tr_icon_color">
+                <property name="text">
+                 <string>Trophy manager icons</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer name="guiTabSpacerLeft">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::MinimumExpanding</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="guiTabLayoutMiddle">
+           <item>
+            <widget class="QGroupBox" name="gb_log">
+             <property name="title">
+              <string>Log</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_log_layout">
+              <item>
+               <widget class="QWidget" name="log_limit" native="true">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <layout class="QVBoxLayout" name="layout_log_limit">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label_log_limit">
+                   <property name="text">
+                    <string>Maximum log blocks</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSpinBox" name="spinbox_log_limit">
+                   <property name="minimum">
+                    <number>0</number>
+                   </property>
+                   <property name="maximum">
+                    <number>999999999</number>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="tty_limit" native="true">
+                <layout class="QVBoxLayout" name="layout_tty_limit">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label_tty_limit">
+                   <property name="text">
+                    <string>Maximum TTY blocks</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSpinBox" name="spinbox_tty_limit">
+                   <property name="maximum">
+                    <number>999999999</number>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer name="guiTabSpacerMiddle">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::MinimumExpanding</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="guiTabLayoutRight">
+           <item>
+            <widget class="QGroupBox" name="gb_gui_options">
+             <property name="title">
+              <string>UI Options</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_gui_options_layout">
+              <item>
+               <widget class="QCheckBox" name="cb_show_welcome">
+                <property name="text">
+                 <string>Show Welcome Screen</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="cb_show_exit_game">
+                <property name="text">
+                 <string>Show Exit Game Dialog</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="cb_show_boot_game">
+                <property name="text">
+                 <string>Show Boot Game Dialog</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="cb_show_pkg_install">
+                <property name="text">
+                 <string>Show PKG Installation Dialog</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="cb_show_pup_install">
+                <property name="text">
+                 <string>Show PUP Installation Dialog</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="cb_show_obsolete_cfg_dialog">
+                <property name="text">
+                 <string>Show Obsolete Settings Dialog</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="cb_show_same_buttons_dialog">
+                <property name="text">
+                 <string>Show Duplicate Buttons Dialog</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="guiTabSpacerRight">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeType">
+                 <enum>QSizePolicy::MinimumExpanding</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_updates">
+             <property name="title">
+              <string>Check for updates on startup</string>
+             </property>
+             <layout class="QVBoxLayout" name="layout_gb_updates">
+              <item>
+               <widget class="QComboBox" name="combo_updates"/>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="gb_discord">
+             <property name="title">
+              <string>Discord</string>
+             </property>
+             <layout class="QVBoxLayout" name="gb_discord_layout">
+              <item>
+               <widget class="QCheckBox" name="useRichPresence">
+                <property name="text">
+                 <string>Use Discord Rich Presence</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_discordState">
+                <property name="text">
+                 <string>Discord Status:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLineEdit" name="discordState">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="maxLength">
+                 <number>128</number>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="guiTabSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::MinimumExpanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="gb_description_gui">
+         <property name="title">
+          <string>Description</string>
+         </property>
+         <layout class="QVBoxLayout" name="gb_description_gui_layout">
+          <item>
+           <widget class="QLabel" name="description_gui">
+            <property name="text">
+             <string>Point your mouse at an option to display a description in here.
+
+
+</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::PlainText</enum>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="debugTab">
+      <attribute name="title">
+       <string>Debug</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="debugTab_layout" stretch="0,1,0">
+       <item>
+        <layout class="QHBoxLayout" name="debugTabLayout" stretch="1,1,1">
+         <item>
+          <widget class="QGroupBox" name="gb_debug_gpu">
+           <property name="enabled">
+            <bool>true</bool>
+           </property>
+           <property name="title">
+            <string>GPU</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+           </property>
+           <layout class="QVBoxLayout" name="gb_debug_gpu_layout">
+            <item alignment="Qt::AlignTop">
+             <widget class="QCheckBox" name="renderdocCompatibility">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="text">
+               <string>Renderdoc Compatibility Mode</string>
+              </property>
+             </widget>
+            </item>
+            <item alignment="Qt::AlignTop">
+             <widget class="QCheckBox" name="debugOutput">
+              <property name="text">
+               <string>Debug Output</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="debugOverlay">
+              <property name="text">
+               <string>Debug Overlay</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="logProg">
+              <property name="text">
+               <string>Log Shader Programs</string>
+              </property>
+             </widget>
+            </item>
+            <item alignment="Qt::AlignTop">
+             <widget class="QCheckBox" name="forceHighpZ">
+              <property name="text">
+               <string>Use High Precision Z-buffer</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="disableHwOcclusionQueries">
+              <property name="text">
+               <string>Disable ZCull Occlusion Queries</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="forceCpuBlitEmulation">
+              <property name="text">
+               <string>Force CPU blit emulation</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="disableVulkanMemAllocator">
+              <property name="text">
+               <string>Disable Vulkan Memory Allocator</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="disableFIFOReordering">
+              <property name="text">
+               <string>Disable FIFO Reordering</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="strictTextureFlushing">
+              <property name="text">
+               <string>Strict Texture Flushing</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="gpuTextureScaling">
+              <property name="text">
+               <string>Use GPU Texture Scaling</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacerDebugGPU">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::MinimumExpanding</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="gb_debug_core">
+           <property name="title">
+            <string>Core</string>
+           </property>
+           <layout class="QVBoxLayout" name="gb_debug_core_layout">
+            <item>
+             <widget class="QCheckBox" name="ppuDebug">
+              <property name="text">
+               <string>PPU Debug</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="spuDebug">
+              <property name="text">
+               <string>SPU Debug</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="mfcDebug">
+              <property name="text">
+               <string>MFC Debug</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="setDAZandFTZ">
+              <property name="text">
+               <string>Set DAZ and FTZ</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="accurateGETLLAR">
+              <property name="text">
+               <string>Accurate GETLLAR</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="accurateSpuDMA">
+              <property name="text">
+               <string>Accurate SPU DMA</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="accurateClineStores">
+              <property name="text">
+               <string>Accurate Cache Line Stores</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="hookStFunc">
+              <property name="text">
+               <string>Hook static functions</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="perfReport">
+              <property name="text">
+               <string>Enable Performance Report</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacerDebugCore">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::MinimumExpanding</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QWidget" name="debug_more_stuff" native="true">
+           <layout class="QVBoxLayout" name="debug_more_stuff_layout">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QGroupBox" name="gb_accurate_ppu_128">
+              <property name="title">
+               <string>Accurate PPU 128 Reservations</string>
+              </property>
+              <layout class="QVBoxLayout" name="gb_accurate_ppu_128_layout">
+               <item>
+                <widget class="QComboBox" name="combo_accurate_ppu_128"/>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="gb_num_ppu_threads">
+              <property name="title">
+               <string>PPU Thread Count</string>
+              </property>
+              <layout class="QVBoxLayout" name="vbl_num_ppu_threads">
+               <item>
+                <widget class="QComboBox" name="combo_num_ppu_threads"/>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacerDebugMore">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::MinimumExpanding</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="debugTabSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::MinimumExpanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="gb_description_debug">
+         <property name="title">
+          <string>Description</string>
+         </property>
+         <layout class="QVBoxLayout" name="gb_description_debug_layout">
+          <item>
+           <widget class="QLabel" name="description_debug">
+            <property name="text">
+             <string>Point your mouse at an option to display a description in here.
+
+
+</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::PlainText</enum>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
      </widget>
     </widget>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::StandardButton::Apply|QDialogButtonBox::StandardButton::Close|QDialogButtonBox::StandardButton::RestoreDefaults|QDialogButtonBox::StandardButton::Save</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Close|QDialogButtonBox::Save</set>
      </property>
     </widget>
    </item>
diff --git a/rpcs3/rpcs3qt/shortcut_dialog.cpp b/rpcs3/rpcs3qt/shortcut_dialog.cpp
deleted file mode 100644
index f7acaa2ef0..0000000000
--- a/rpcs3/rpcs3qt/shortcut_dialog.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-#include "shortcut_dialog.h"
-#include "ui_shortcut_dialog.h"
-#include "shortcut_settings.h"
-
-#include <QDialogButtonBox>
-#include <QPushButton>
-#include <QKeySequenceEdit>
-#include <QLabel>
-#include <QHBoxLayout>
-
-shortcut_dialog::shortcut_dialog(const std::shared_ptr<gui_settings> gui_settings, QWidget* parent)
-	: QDialog(parent), ui(new Ui::shortcut_dialog), m_gui_settings(gui_settings)
-{
-	ui->setupUi(this);
-
-	connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &shortcut_dialog::reject);
-	connect(ui->buttonBox, &QDialogButtonBox::clicked, [this](QAbstractButton* button)
-	{
-		if (button == ui->buttonBox->button(QDialogButtonBox::Save))
-		{
-			save();
-			accept();
-		}
-		else if (button == ui->buttonBox->button(QDialogButtonBox::Apply))
-		{
-			save();
-		}
-	});
-
-	shortcut_settings sc_settings{};
-
-	for (const auto& [shortcut_key, shortcut] : sc_settings.shortcut_map)
-	{
-		const QKeySequence key_sequence = sc_settings.get_key_sequence(shortcut, gui_settings);
-
-		QLabel* label = new QLabel(shortcut.localized_name);
-
-		QKeySequenceEdit* key_sequence_edit = new QKeySequenceEdit;
-		key_sequence_edit->setObjectName(shortcut.name);
-		key_sequence_edit->setMinimumWidth(label->sizeHint().width());
-		key_sequence_edit->setKeySequence(key_sequence);
-
-		m_values[shortcut.name] = key_sequence.toString();
-
-		connect(key_sequence_edit, &QKeySequenceEdit::keySequenceChanged, this, &shortcut_dialog::handle_change);
-
-		QHBoxLayout* shortcut_layout = new QHBoxLayout;
-		shortcut_layout->addWidget(label);
-		shortcut_layout->addWidget(key_sequence_edit);
-		shortcut_layout->setStretch(0, 1);
-		shortcut_layout->setStretch(1, 1);
-
-		const auto add_layout = [](QVBoxLayout* layout, QHBoxLayout* shortcut_layout)
-		{
-			layout->insertLayout(layout->count() - 1, shortcut_layout); // count() - 1 to ignore the vertical spacer
-		};
-
-		switch (shortcut.handler_id)
-		{
-		case gui::shortcuts::shortcut_handler_id::game_window:
-		{
-			add_layout(ui->game_window_layout, shortcut_layout);
-			break;
-		}
-		case gui::shortcuts::shortcut_handler_id::main_window:
-		{
-			add_layout(ui->main_window_layout, shortcut_layout);
-			break;
-		}
-		}
-	}
-
-	const int min_width = std::max(
-	{
-		ui->main_window_group_box->sizeHint().width(),
-		ui->game_window_group_box->sizeHint().width(),
-	});
-
-	ui->main_window_group_box->setMinimumWidth(min_width);
-	ui->game_window_group_box->setMinimumWidth(min_width);
-}
-
-shortcut_dialog::~shortcut_dialog()
-{
-	delete ui;
-}
-
-void shortcut_dialog::save()
-{
-	shortcut_settings sc_settings{};
-
-	for (const auto& entry : m_values)
-	{
-		m_gui_settings->SetValue(sc_settings.get_shortcut_gui_save(entry.first), entry.second, false);
-	}
-	m_gui_settings->sync();
-
-	Q_EMIT saved();
-}
-
-void shortcut_dialog::handle_change(const QKeySequence& keySequence)
-{
-	m_values[sender()->objectName()] = keySequence.toString();
-}
diff --git a/rpcs3/rpcs3qt/shortcut_dialog.h b/rpcs3/rpcs3qt/shortcut_dialog.h
deleted file mode 100644
index b13ddb94ff..0000000000
--- a/rpcs3/rpcs3qt/shortcut_dialog.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "gui_settings.h"
-
-#include <QDialog>
-
-namespace Ui
-{
-	class shortcut_dialog;
-}
-
-class shortcut_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit shortcut_dialog(const std::shared_ptr<gui_settings> gui_settings, QWidget* parent = nullptr);
-	~shortcut_dialog();
-
-Q_SIGNALS:
-	void saved();
-
-private:
-	void save();
-
-	Ui::shortcut_dialog* ui;
-	std::shared_ptr<gui_settings> m_gui_settings;
-	std::map<QString, QString> m_values;
-
-private Q_SLOTS:
-	void handle_change(const QKeySequence& keySequence);
-};
diff --git a/rpcs3/rpcs3qt/shortcut_dialog.ui b/rpcs3/rpcs3qt/shortcut_dialog.ui
deleted file mode 100644
index efafa998a2..0000000000
--- a/rpcs3/rpcs3qt/shortcut_dialog.ui
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>shortcut_dialog</class>
- <widget class="QDialog" name="shortcut_dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>822</width>
-    <height>364</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Shortcuts</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1">
-     <item>
-      <widget class="QGroupBox" name="main_window_group_box">
-       <property name="title">
-        <string>Main Window Shortcuts</string>
-       </property>
-       <layout class="QVBoxLayout" name="main_window_layout">
-        <item>
-         <spacer name="verticalSpacer_main_window">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QGroupBox" name="game_window_group_box">
-       <property name="title">
-        <string>Game Window Shortcuts</string>
-       </property>
-       <layout class="QVBoxLayout" name="game_window_layout">
-        <item>
-         <spacer name="verticalSpacer_game_window">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::MinimumExpanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/rpcs3/rpcs3qt/shortcut_handler.cpp b/rpcs3/rpcs3qt/shortcut_handler.cpp
deleted file mode 100644
index 9eb8fa3ea4..0000000000
--- a/rpcs3/rpcs3qt/shortcut_handler.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-#include "stdafx.h"
-#include "shortcut_handler.h"
-
-LOG_CHANNEL(shortcut_log, "Shortcuts");
-
-shortcut_handler::shortcut_handler(gui::shortcuts::shortcut_handler_id handler_id, QObject* parent, const std::shared_ptr<gui_settings>& gui_settings)
-	: QObject(parent), m_handler_id(handler_id), m_gui_settings(gui_settings)
-{
-	// Initialize shortcuts
-	shortcut_settings sc_settings{};
-
-	for (const auto& [shortcut_key, info] : sc_settings.shortcut_map)
-	{
-		// Skip shortcuts that weren't meant for this handler
-		if (handler_id != info.handler_id)
-		{
-			continue;
-		}
-
-		const QKeySequence key_sequence = sc_settings.get_key_sequence(info, gui_settings);
-		QShortcut* shortcut = new QShortcut(key_sequence, parent);
-		shortcut->setAutoRepeat(info.allow_auto_repeat);
-
-		shortcut_key_info key_info{};
-		key_info.shortcut = shortcut;
-		key_info.info = info;
-		key_info.key_sequence = key_sequence;
-
-		m_shortcuts[shortcut_key] = key_info;
-
-		connect(shortcut, &QShortcut::activated, this, [this, key = shortcut_key]()
-		{
-			handle_shortcut(key, m_shortcuts[key].key_sequence);
-		});
-		connect(shortcut, &QShortcut::activatedAmbiguously, this, [this, key = shortcut_key]()
-		{
-			// TODO: do not allow same shortcuts and remove this connect
-			// activatedAmbiguously will trigger if you have the same key sequence for several shortcuts
-			const QKeySequence& key_sequence = m_shortcuts[key].key_sequence;
-			shortcut_log.error("%s: Shortcut activated ambiguously: %s (%s)", m_handler_id, key, key_sequence.toString());
-			handle_shortcut(key, key_sequence);
-		});
-	}
-}
-
-void shortcut_handler::update()
-{
-	shortcut_log.notice("%s: Updating shortcuts", m_handler_id);
-
-	shortcut_settings sc_settings{};
-
-	for (const auto& [shortcut_key, info] : sc_settings.shortcut_map)
-	{
-		// Skip shortcuts that weren't meant for this handler
-		if (m_handler_id != info.handler_id || !m_shortcuts.contains(shortcut_key))
-		{
-			continue;
-		}
-
-		const QKeySequence key_sequence = sc_settings.get_key_sequence(info, m_gui_settings);
-
-		shortcut_key_info& key_info = m_shortcuts[shortcut_key];
-		key_info.key_sequence = key_sequence;
-		if (key_info.shortcut)
-		{
-			key_info.shortcut->setKey(key_sequence);
-		}
-	}
-}
-
-void shortcut_handler::handle_shortcut(gui::shortcuts::shortcut shortcut_key, const QKeySequence& key_sequence)
-{
-	shortcut_log.notice("%s: Shortcut pressed: %s (%s)", m_handler_id, shortcut_key, key_sequence.toString());
-
-	Q_EMIT shortcut_activated(shortcut_key, key_sequence);
-}
diff --git a/rpcs3/rpcs3qt/shortcut_handler.h b/rpcs3/rpcs3qt/shortcut_handler.h
deleted file mode 100644
index 3f667a832d..0000000000
--- a/rpcs3/rpcs3qt/shortcut_handler.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include "gui_settings.h"
-#include "shortcut_settings.h"
-
-#include <QShortcut>
-#include <QWidget>
-
-#include <map>
-
-class shortcut_handler : public QObject
-{
-	Q_OBJECT
-
-public:
-	shortcut_handler(gui::shortcuts::shortcut_handler_id handler_id, QObject* parent, const std::shared_ptr<gui_settings>& gui_settings);
-
-Q_SIGNALS:
-	void shortcut_activated(gui::shortcuts::shortcut shortcut_key, const QKeySequence& key_sequence);
-
-public Q_SLOTS:
-	void update();
-
-private:
-	void handle_shortcut(gui::shortcuts::shortcut shortcut_key, const QKeySequence& key_sequence);
-
-	gui::shortcuts::shortcut_handler_id m_handler_id;
-	std::shared_ptr<gui_settings> m_gui_settings;
-
-	struct shortcut_key_info
-	{
-		QShortcut* shortcut = nullptr;
-		QKeySequence key_sequence{};
-		shortcut_info info{};
-	};
-	std::map<gui::shortcuts::shortcut, shortcut_key_info> m_shortcuts;
-};
diff --git a/rpcs3/rpcs3qt/shortcut_settings.cpp b/rpcs3/rpcs3qt/shortcut_settings.cpp
deleted file mode 100644
index fad59342a1..0000000000
--- a/rpcs3/rpcs3qt/shortcut_settings.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-#include "shortcut_settings.h"
-
-using namespace gui::shortcuts;
-
-template <>
-void fmt_class_string<shortcut>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](shortcut value)
-	{
-		switch (value)
-		{
-		case shortcut::mw_start: return "mw_start";
-		case shortcut::mw_stop: return "mw_stop";
-		case shortcut::mw_pause: return "mw_pause";
-		case shortcut::mw_restart: return "mw_restart";
-		case shortcut::mw_toggle_fullscreen: return "mw_toggle_fullscreen";
-		case shortcut::mw_exit_fullscreen: return "mw_exit_fullscreen";
-		case shortcut::mw_refresh: return "mw_refresh";
-		case shortcut::gw_toggle_fullscreen: return "gw_toggle_fullscreen";
-		case shortcut::gw_exit_fullscreen: return "gw_exit_fullscreen";
-		case shortcut::gw_log_mark: return "gw_log_mark";
-		case shortcut::gw_mouse_lock: return "gw_mouse_lock";
-		case shortcut::gw_screenshot: return "gw_screenshot";
-		case shortcut::gw_toggle_recording: return "gw_toggle_recording";
-		case shortcut::gw_pause_play: return "gw_pause_play";
-		case shortcut::gw_savestate: return "gw_savestate";
-		case shortcut::gw_restart: return "gw_restart";
-		case shortcut::gw_rsx_capture: return "gw_rsx_capture";
-		case shortcut::gw_frame_limit: return "gw_frame_limit";
-		case shortcut::gw_toggle_mouse_and_keyboard: return "gw_toggle_mouse_and_keyboard";
-		case shortcut::gw_home_menu: return "gw_home_menu";
-		case shortcut::gw_mute_unmute: return "gw_mute_unmute";
-		case shortcut::gw_volume_up: return "gw_volume_up";
-		case shortcut::gw_volume_down: return "gw_volume_down";
-		case shortcut::count: return "count";
-		}
-
-		return unknown;
-	});
-}
-
-template <>
-void fmt_class_string<shortcut_handler_id>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](gui::shortcuts::shortcut_handler_id value)
-	{
-		switch (value)
-		{
-			case shortcut_handler_id::main_window: return "main_window";
-			case shortcut_handler_id::game_window: return "game_window";
-		}
-
-		return unknown;
-	});
-}
-
-shortcut_settings::shortcut_settings()
-	: shortcut_map({
-		{ shortcut::mw_start, shortcut_info{ "main_window_start", tr("Start"), "Ctrl+E", shortcut_handler_id::main_window, false } },
-		{ shortcut::mw_stop, shortcut_info{ "main_window_stop", tr("Stop"), "Ctrl+S", shortcut_handler_id::main_window, false } },
-		{ shortcut::mw_pause, shortcut_info{ "main_window_pause", tr("Pause"), "Ctrl+P", shortcut_handler_id::main_window, false } },
-		{ shortcut::mw_restart, shortcut_info{ "main_window_restart", tr("Restart"), "Ctrl+R", shortcut_handler_id::main_window, false } },
-		{ shortcut::mw_toggle_fullscreen, shortcut_info{ "main_window_toggle_fullscreen", tr("Toggle Fullscreen"), "Alt+Return", shortcut_handler_id::main_window, false } },
-		{ shortcut::mw_exit_fullscreen, shortcut_info{ "main_window_exit_fullscreen", tr("Exit Fullscreen"), "Esc", shortcut_handler_id::main_window, false } },
-		{ shortcut::mw_refresh, shortcut_info{ "main_window_refresh", tr("Refresh"), "Ctrl+F5", shortcut_handler_id::main_window, false } },
-		{ shortcut::gw_toggle_fullscreen, shortcut_info{ "game_window_toggle_fullscreen", tr("Toggle Fullscreen"), "Alt+Return", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_exit_fullscreen, shortcut_info{ "game_window_exit_fullscreen", tr("Exit Fullscreen"), "Esc", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_log_mark, shortcut_info{ "game_window_log_mark", tr("Add Log Mark"), "Alt+L", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_mouse_lock, shortcut_info{ "game_window_mouse_lock", tr("Mouse lock"), "Ctrl+L", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_toggle_recording, shortcut_info{ "game_window_toggle_recording", tr("Start/Stop Recording"), "F11", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_screenshot, shortcut_info{ "game_window_screenshot", tr("Screenshot"), "F12", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_pause_play, shortcut_info{ "game_window_pause_play", tr("Pause/Play"), "Ctrl+P", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_savestate, shortcut_info{ "game_window_savestate", tr("Savestate"), "Ctrl+S", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_restart, shortcut_info{ "game_window_restart", tr("Restart"), "Ctrl+R", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_rsx_capture, shortcut_info{ "game_window_rsx_capture", tr("RSX Capture"), "Alt+C", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_frame_limit, shortcut_info{ "game_window_frame_limit", tr("Toggle Framelimit"), "Ctrl+F10", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_toggle_mouse_and_keyboard, shortcut_info{ "game_window_toggle_mouse_and_keyboard", tr("Toggle Keyboard"), "Ctrl+F11", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_home_menu, shortcut_info{ "gw_home_menu", tr("Open Home Menu"), "Shift+F10", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_mute_unmute, shortcut_info{ "gw_mute_unmute", tr("Mute/Unmute Audio"), "Ctrl+Shift+M", shortcut_handler_id::game_window, false } },
-		{ shortcut::gw_volume_up, shortcut_info{ "gw_volume_up", tr("Volume Up"), "Ctrl+Shift++", shortcut_handler_id::game_window, true } },
-		{ shortcut::gw_volume_down, shortcut_info{ "gw_volume_down", tr("Volume Down"), "Ctrl+Shift+-", shortcut_handler_id::game_window, true } },
-	})
-{
-}
-
-shortcut_settings::~shortcut_settings()
-{
-}
-
-gui_save shortcut_settings::get_shortcut_gui_save(const QString& shortcut_name)
-{
-	const auto it = std::find_if(shortcut_map.begin(), shortcut_map.end(), [&](const auto& entry) { return entry.second.name == shortcut_name; });
-
-	if (it != shortcut_map.cend())
-	{
-		return gui_save(gui::sc, it->second.name, it->second.key_sequence);
-	}
-
-	return gui_save();
-}
-
-QKeySequence shortcut_settings::get_key_sequence(const shortcut_info& entry, const std::shared_ptr<gui_settings>& gui_settings)
-{
-	if (!gui_settings)
-		return {};
-
-	const QString saved_value = gui_settings->GetValue(get_shortcut_gui_save(entry.name)).toString();
-
-	QKeySequence key_sequence = QKeySequence::fromString(saved_value);
-
-	if (key_sequence.isEmpty())
-	{
-		// Use the default shortcut if no shortcut was configured
-		key_sequence = QKeySequence::fromString(entry.key_sequence);
-	}
-
-	return key_sequence;
-}
diff --git a/rpcs3/rpcs3qt/shortcut_settings.h b/rpcs3/rpcs3qt/shortcut_settings.h
deleted file mode 100644
index 4e119c4f21..0000000000
--- a/rpcs3/rpcs3qt/shortcut_settings.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#pragma once
-
-#include "gui_settings.h"
-
-#include <QKeySequence>
-
-namespace gui
-{
-	namespace shortcuts
-	{
-		enum class shortcut_handler_id : int
-		{
-			main_window,
-			game_window,
-		};
-
-		enum class shortcut : int
-		{
-			mw_start,
-			mw_stop,
-			mw_pause,
-			mw_restart,
-			mw_toggle_fullscreen,
-			mw_exit_fullscreen,
-			mw_refresh,
-
-			gw_toggle_fullscreen,
-			gw_exit_fullscreen,
-			gw_log_mark,
-			gw_mouse_lock,
-			gw_screenshot,
-			gw_toggle_recording,
-			gw_pause_play,
-			gw_savestate,
-			gw_restart,
-			gw_rsx_capture,
-			gw_frame_limit,
-			gw_toggle_mouse_and_keyboard,
-			gw_home_menu,
-			gw_mute_unmute,
-			gw_volume_up,
-			gw_volume_down,
-
-			count
-		};
-	}
-}
-
-struct shortcut_info
-{
-	QString name;
-	QString localized_name;
-	QString key_sequence;
-	gui::shortcuts::shortcut_handler_id handler_id{};
-	bool allow_auto_repeat = false;
-};
-
-class shortcut_settings : public QObject
-{
-	Q_OBJECT
-
-public:
-	shortcut_settings();
-	~shortcut_settings();
-
-	const std::map<const gui::shortcuts::shortcut, const shortcut_info> shortcut_map;
-
-	gui_save get_shortcut_gui_save(const QString& shortcut_name);
-
-	QKeySequence get_key_sequence(const shortcut_info& entry, const std::shared_ptr<gui_settings>& gui_settings);
-};
diff --git a/rpcs3/rpcs3qt/shortcut_utils.cpp b/rpcs3/rpcs3qt/shortcut_utils.cpp
deleted file mode 100644
index 98f72d2872..0000000000
--- a/rpcs3/rpcs3qt/shortcut_utils.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-#include "stdafx.h"
-#include "shortcut_utils.h"
-#include "qt_utils.h"
-#include "Emu/VFS.h"
-#include "Utilities/File.h"
-#include "Utilities/StrUtil.h"
-
-#ifdef _WIN32
-#include <Windows.h>
-#include <shlobj.h>
-#include <winnls.h>
-#include <shobjidl.h>
-#include <objbase.h>
-#include <objidl.h>
-#include <shlguid.h>
-#include <comdef.h>
-
-#include "Emu/system_utils.hpp"
-#include <wrl/client.h>
-#else
-#include <sys/stat.h>
-#include <errno.h>
-#endif
-
-#include <QFile>
-#include <QImageWriter>
-#include <QPixmap>
-#include <QStandardPaths>
-
-LOG_CHANNEL(sys_log, "SYS");
-
-namespace gui::utils
-{
-	bool create_square_shortcut_icon_file(const std::string& src_icon_path, const std::string& target_icon_dir, std::string& target_icon_path, const std::string& extension, int size)
-	{
-		if (src_icon_path.empty() || target_icon_dir.empty() || extension.empty())
-		{
-			sys_log.error("Failed to create shortcut. Icon parameters empty.");
-			return false;
-		}
-
-		QPixmap icon(QString::fromStdString(src_icon_path));
-		if (!gui::utils::create_square_pixmap(icon, size))
-		{
-			sys_log.error("Failed to create shortcut. Icon empty.");
-			return false;
-		}
-
-		target_icon_path = target_icon_dir + "shortcut." + fmt::to_lower(extension);
-
-		QFile icon_file(QString::fromStdString(target_icon_path));
-		if (!icon_file.open(QFile::OpenModeFlag::ReadWrite | QFile::OpenModeFlag::Truncate))
-		{
-			sys_log.error("Failed to create icon file '%s': %s", target_icon_path, icon_file.errorString());
-			return false;
-		}
-
-		// Use QImageWriter instead of QPixmap::save in order to be able to log errors
-		if (QImageWriter writer(&icon_file, fmt::to_upper(extension).c_str()); !writer.write(icon.toImage()))
-		{
-			sys_log.error("Failed to write icon file '%s': %s", target_icon_path, writer.errorString());
-			return false;
-		}
-
-		icon_file.close();
-		return true;
-	}
-
-	bool create_shortcut(const std::string& name,
-	    [[maybe_unused]] const std::string& serial,
-	    [[maybe_unused]] const std::string& target_cli_args,
-	    [[maybe_unused]] const std::string& description,
-	    [[maybe_unused]] const std::string& src_icon_path,
-	    [[maybe_unused]] const std::string& target_icon_dir,
-	    shortcut_location location)
-	{
-		if (name.empty())
-		{
-			sys_log.error("Cannot create shortcuts without a name");
-			return false;
-		}
-
-		// Remove illegal characters from filename
-		const std::string simple_name = QString::fromStdString(vfs::escape(name, true)).simplified().toStdString();
-		if (simple_name.empty() || simple_name == "." || simple_name == "..")
-		{
-			sys_log.error("Failed to create shortcut: Cleaned file name empty or not allowed");
-			return false;
-		}
-
-		std::string link_path;
-
-		if (location == shortcut_location::desktop)
-		{
-			link_path = QStandardPaths::writableLocation(QStandardPaths::StandardLocation::DesktopLocation).toStdString();
-		}
-		else if (location == shortcut_location::applications)
-		{
-			link_path = QStandardPaths::writableLocation(QStandardPaths::StandardLocation::ApplicationsLocation).toStdString();
-		}
-#ifdef _WIN32
-		else if (location == shortcut_location::rpcs3_shortcuts)
-		{
-			link_path = rpcs3::utils::get_games_dir() + "/shortcuts/";
-			fs::create_dir(link_path);
-		}
-#endif
-
-		if (!fs::is_dir(link_path) && !fs::create_dir(link_path))
-		{
-			sys_log.error("Failed to create shortcut. Folder does not exist: %s", link_path);
-			return false;
-		}
-
-		if (location == shortcut_location::applications)
-		{
-			link_path += "/RPCS3";
-
-			if (!fs::create_path(link_path))
-			{
-				sys_log.error("Failed to create shortcut. Could not create path: %s (%s)", link_path, fs::g_tls_error);
-				return false;
-			}
-		}
-
-#ifdef _WIN32
-		const auto str_error = [](HRESULT hr) -> std::string
-		{
-			_com_error err(hr);
-			const TCHAR* errMsg = err.ErrorMessage();
-			return fmt::format("%s [%d]", wchar_to_utf8(errMsg), hr);
-		};
-
-		fmt::append(link_path, "/%s.lnk", simple_name);
-
-		sys_log.notice("Creating shortcut '%s' with arguments '%s' and .ico dir '%s'", link_path, target_cli_args, target_icon_dir);
-
-		// https://stackoverflow.com/questions/3906974/how-to-programmatically-create-a-shortcut-using-win32
-		HRESULT res = CoInitialize(NULL);
-		if (FAILED(res))
-		{
-			sys_log.error("Failed to create shortcut: CoInitialize failed (%s)", str_error(res));
-			return false;
-		}
-
-		Microsoft::WRL::ComPtr<IShellLink> pShellLink;
-		Microsoft::WRL::ComPtr<IPersistFile> pPersistFile;
-
-		const auto cleanup = [&](bool return_value, const std::string& fail_reason) -> bool
-		{
-			if (!return_value) sys_log.error("Failed to create shortcut: %s", fail_reason);
-			CoUninitialize();
-			return return_value;
-		};
-
-		res = CoCreateInstance(__uuidof(ShellLink), NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pShellLink));
-		if (FAILED(res))
-			return cleanup(false, "CoCreateInstance failed");
-
-		const std::string working_dir{ fs::get_executable_dir() };
-		const std::string rpcs3_path{ working_dir + "rpcs3.exe" };
-
-		const std::wstring w_target_file = utf8_to_wchar(rpcs3_path);
-		res = pShellLink->SetPath(w_target_file.c_str());
-		if (FAILED(res))
-			return cleanup(false, fmt::format("SetPath failed (%s)", str_error(res)));
-
-		const std::wstring w_working_dir = utf8_to_wchar(working_dir);
-		res = pShellLink->SetWorkingDirectory(w_working_dir.c_str());
-		if (FAILED(res))
-			return cleanup(false, fmt::format("SetWorkingDirectory failed (%s)", str_error(res)));
-
-		if (!target_cli_args.empty())
-		{
-			const std::wstring w_target_cli_args = utf8_to_wchar(target_cli_args);
-			res = pShellLink->SetArguments(w_target_cli_args.c_str());
-			if (FAILED(res))
-				return cleanup(false, fmt::format("SetArguments failed (%s)", str_error(res)));
-		}
-
-		if (!description.empty())
-		{
-			const std::wstring w_descpription = utf8_to_wchar(description);
-			res = pShellLink->SetDescription(w_descpription.c_str());
-			if (FAILED(res))
-				return cleanup(false, fmt::format("SetDescription failed (%s)", str_error(res)));
-		}
-
-		if (!src_icon_path.empty() && !target_icon_dir.empty())
-		{
-			std::string target_icon_path;
-			if (!create_square_shortcut_icon_file(src_icon_path, target_icon_dir, target_icon_path, "ico", 512))
-				return cleanup(false, ".ico creation failed");
-
-			const std::wstring w_icon_path = utf8_to_wchar(target_icon_path);
-			res = pShellLink->SetIconLocation(w_icon_path.c_str(), 0);
-			if (FAILED(res))
-				return cleanup(false, fmt::format("SetIconLocation failed (%s)", str_error(res)));
-		}
-
-		// Use the IPersistFile object to save the shell link
-		res = pShellLink.As(&pPersistFile);
-		if (FAILED(res))
-			return cleanup(false, fmt::format("QueryInterface failed (%s)", str_error(res)));
-
-		// Save shortcut
-		const std::wstring w_link_file = utf8_to_wchar(link_path);
-		res = pPersistFile->Save(w_link_file.c_str(), TRUE);
-		if (FAILED(res))
-		{
-			if (location == shortcut_location::desktop)
-			{
-				return cleanup(false, fmt::format("Saving file to desktop failed (%s)", str_error(res)));
-			}
-			else
-			{
-				return cleanup(false, fmt::format("Saving file to start menu failed (%s)", str_error(res)));
-			}
-		}
-
-		return cleanup(true, {});
-
-#elif defined(__APPLE__)
-		fmt::append(link_path, "/%s.app", simple_name);
-
-		const std::string contents_dir = link_path + "/Contents/";
-		const std::string macos_dir = contents_dir + "MacOS/";
-		const std::string resources_dir = contents_dir + "Resources/";
-
-		if (!fs::create_path(contents_dir) || !fs::create_path(macos_dir) || !fs::create_path(resources_dir))
-		{
-			sys_log.error("Failed to create shortcut. Could not create app bundle structure. (%s)", fs::g_tls_error);
-			return false;
-		}
-
-		const std::string plist_path = contents_dir + "Info.plist";
-		const std::string launcher_path = macos_dir + "launcher";
-
-		std::string launcher_content;
-		fmt::append(launcher_content, "#!/bin/bash\nopen -b net.rpcs3.rpcs3 --args %s", target_cli_args);
-
-		fs::file launcher_file(launcher_path, fs::read + fs::rewrite);
-		if (!launcher_file)
-		{
-			sys_log.error("Failed to create launcher file: %s (%s)", launcher_path, fs::g_tls_error);
-			return false;
-		}
-		if (launcher_file.write(launcher_content.data(), launcher_content.size()) != launcher_content.size())
-		{
-			sys_log.error("Failed to write launcher file: %s", launcher_path);
-			return false;
-		}
-		launcher_file.close();
-
-		if (chmod(launcher_path.c_str(), S_IRWXU) != 0)
-		{
-			sys_log.error("Failed to change file permissions for launcher file: %s (%d)", strerror(errno), errno);
-			return false;
-		}
-
-		const std::string plist_content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-										  "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
-										  "<plist version=\"1.0\">\n"
-										  "<dict>\n"
-										  "\t<key>CFBundleExecutable</key>\n"
-										  "\t<string>launcher</string>\n"
-										  "\t<key>CFBundleIconFile</key>\n"
-										  "\t<string>shortcut.icns</string>\n"
-										  "\t<key>CFBundleInfoDictionaryVersion</key>\n"
-										  "\t<string>1.0</string>\n"
-										  "\t<key>CFBundlePackageType</key>\n"
-										  "\t<string>APPL</string>\n"
-										  "\t<key>CFBundleSignature</key>\n"
-										  "\t<string>\?\?\?\?</string>\n"
-#if defined(ARCH_ARM64)
-										  "\t<key>CFBundleIdentifier</key>\n"
-										  "\t<string>net.rpcs3" + (serial.empty() ? "" : ("." + serial)) + "</string>\n"
-										  "\t<key>LSArchitecturePriority</key>\n"
-										  "\t<array>\n"
-										  "\t\t<string>arm64</string>\n"
-										  "\t</array>\n"
-										  "\t<key>LSRequiresNativeExecution</key>\n"
-										  "\t<true/>\n"
-#endif
-										  "</dict>\n"
-										  "</plist>\n";
-
-		fs::file plist_file(plist_path, fs::read + fs::rewrite);
-		if (!plist_file)
-		{
-			sys_log.error("Failed to create plist file: %s (%s)", plist_path, fs::g_tls_error);
-			return false;
-		}
-		if (plist_file.write(plist_content.data(), plist_content.size()) != plist_content.size())
-		{
-			sys_log.error("Failed to write plist file: %s", plist_path);
-			return false;
-		}
-		plist_file.close();
-
-		if (!src_icon_path.empty())
-		{
-			std::string target_icon_path = resources_dir;
-			if (!create_square_shortcut_icon_file(src_icon_path, resources_dir, target_icon_path, "icns", 512))
-			{
-				// Error is logged in create_square_shortcut_icon_file
-				return false;
-			}
-		}
-
-		return true;
-
-#else
-
-		const std::string exe_path = fs::get_executable_path();
-		if (exe_path.empty())
-		{
-			sys_log.error("Failed to create shortcut. Executable path empty.");
-			return false;
-		}
-
-		fmt::append(link_path, "/%s.desktop", simple_name);
-
-		std::string file_content;
-		fmt::append(file_content, "[Desktop Entry]\n");
-		fmt::append(file_content, "Encoding=UTF-8\n");
-		fmt::append(file_content, "Version=1.0\n");
-		fmt::append(file_content, "Type=Application\n");
-		fmt::append(file_content, "Terminal=false\n");
-		fmt::append(file_content, "Exec=\"%s\" %s\n", exe_path, target_cli_args);
-		fmt::append(file_content, "Name=%s\n", name);
-		fmt::append(file_content, "Categories=Application;Game\n");
-
-		if (!description.empty())
-		{
-			fmt::append(file_content, "Comment=%s\n", QString::fromStdString(description).simplified());
-		}
-
-		if (!src_icon_path.empty() && !target_icon_dir.empty())
-		{
-			std::string target_icon_path;
-			if (!create_square_shortcut_icon_file(src_icon_path, target_icon_dir, target_icon_path, "png", 512))
-			{
-				// Error is logged in create_square_shortcut_icon_file
-				return false;
-			}
-
-			fmt::append(file_content, "Icon=%s\n", target_icon_path);
-		}
-
-		fs::file shortcut_file(link_path, fs::read + fs::rewrite);
-		if (!shortcut_file)
-		{
-			sys_log.error("Failed to create .desktop file: %s (%s)", link_path, fs::g_tls_error);
-			return false;
-		}
-		if (shortcut_file.write(file_content.data(), file_content.size()) != file_content.size())
-		{
-			sys_log.error("Failed to write .desktop file: %s", link_path);
-			return false;
-		}
-		shortcut_file.close();
-
-		if (location == shortcut_location::desktop)
-		{
-			if (chmod(link_path.c_str(), S_IRWXU) != 0) // enables user to execute file
-			{
-				// Simply log failure. At least we have the file.
-				sys_log.error("Failed to change file permissions for .desktop file: %s (%d)", strerror(errno), errno);
-			}
-		}
-
-		return true;
-#endif
-	}
-}
diff --git a/rpcs3/rpcs3qt/shortcut_utils.h b/rpcs3/rpcs3qt/shortcut_utils.h
deleted file mode 100644
index 1b47182cbb..0000000000
--- a/rpcs3/rpcs3qt/shortcut_utils.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-namespace gui::utils
-{
-	enum shortcut_location
-	{
-		desktop,
-		applications,
-#ifdef _WIN32
-		rpcs3_shortcuts,
-#endif
-	};
-
-	bool create_shortcut(const std::string& name,
-	                     const std::string& serial,
-	                     const std::string& target_cli_args,
-	                     const std::string& description,
-	                     const std::string& src_icon_path,
-	                     const std::string& target_icon_dir,
-	                     shortcut_location shortcut_location);
-}
diff --git a/rpcs3/rpcs3qt/skylander_dialog.cpp b/rpcs3/rpcs3qt/skylander_dialog.cpp
index 94d9025a17..a13f1a960a 100644
--- a/rpcs3/rpcs3qt/skylander_dialog.cpp
+++ b/rpcs3/rpcs3qt/skylander_dialog.cpp
@@ -1,8 +1,12 @@
 #include "stdafx.h"
 #include "Utilities/File.h"
+#include "Crypto/md5.h"
+#include "Crypto/aes.h"
 #include "skylander_dialog.h"
 #include "Emu/Io/Skylander.h"
 
+#include "util/asm.hpp"
+
 #include <QLabel>
 #include <QGroupBox>
 #include <QFileDialog>
@@ -17,7 +21,7 @@ skylander_dialog* skylander_dialog::inst = nullptr;
 std::optional<std::tuple<u8, u16, u16>> skylander_dialog::sky_slots[UI_SKY_NUM];
 QString last_skylander_path;
 
-static const std::map<const std::pair<const u16, const u16>, const std::string> list_skylanders = {
+const std::map<const std::pair<const u16, const u16>, const std::string> list_skylanders = {
     {{0, 0x0000}, "Whirlwind"},
     {{0, 0x1801}, "Series 2 Whirlwind"},
     {{0, 0x1C02}, "Polar Whirlwind"},
@@ -84,8 +88,8 @@ static const std::map<const std::pair<const u16, const u16>, const std::string>
     {{20, 0x0000}, "Drobot"},
     {{20, 0x1801}, "Series 2 Drobot"},
     {{20, 0x1206}, "LightCore Drobot"},
-    {{21, 0x0000}, "Drill Sergeant"},
-    {{21, 0x1801}, "Series 2 Drill Sergeant"},
+    {{21, 0x0000}, "Drill Seargeant"},
+    {{21, 0x1801}, "Series 2 Drill Seargeant"},
     {{22, 0x0000}, "Boomer"},
     {{22, 0x4810}, "Eon's Elite Boomer"},
     {{23, 0x0000}, "Wrecking Ball"},
@@ -502,8 +506,7 @@ static const std::map<const std::pair<const u16, const u16>, const std::string>
 
 u16 skylander_crc16(u16 init_value, const u8* buffer, u32 size)
 {
-	constexpr unsigned short CRC_CCITT_TABLE[256] = {
-	    0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7, 0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF, 0x1231, 0x0210, 0x3273,
+	const unsigned short CRC_CCITT_TABLE[256] = {0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7, 0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF, 0x1231, 0x0210, 0x3273,
 	    0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6, 0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE, 0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485, 0xA56A, 0xB54B, 0x8528,
 	    0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D, 0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4, 0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC, 0x48C4, 0x58E5, 0x6886,
 	    0x78A7, 0x0840, 0x1861, 0x2802, 0x3823, 0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B, 0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12, 0xDBFD, 0xCBDC, 0xFBBF,
@@ -537,17 +540,15 @@ skylander_creator_dialog::skylander_creator_dialog(QWidget* parent)
 
 	QComboBox* combo_skylist = new QComboBox();
 	QStringList filterlist;
-	for (const auto& [entry, figure_name] : list_skylanders)
+	for (const auto& entry : list_skylanders)
 	{
-		const uint qvar = (entry.first << 16) | entry.second;
-		QString name = QString::fromStdString(figure_name);
-		combo_skylist->addItem(name, QVariant(qvar));
-		filterlist << std::move(name);
+		const uint qvar = (entry.first.first << 16) | entry.first.second;
+		combo_skylist->addItem(QString::fromStdString(entry.second), QVariant(qvar));
+		filterlist << entry.second.c_str();
 	}
 	combo_skylist->addItem(tr("--Unknown--"), QVariant(0xFFFFFFFF));
 	combo_skylist->setEditable(true);
 	combo_skylist->setInsertPolicy(QComboBox::NoInsert);
-	combo_skylist->model()->sort(0, Qt::AscendingOrder);
 
 	QCompleter* co_compl = new QCompleter(filterlist, this);
 	co_compl->setCaseSensitivity(Qt::CaseInsensitive);
@@ -562,12 +563,12 @@ skylander_creator_dialog::skylander_creator_dialog(QWidget* parent)
 	line->setFrameShadow(QFrame::Sunken);
 	vbox_panel->addWidget(line);
 
-	QHBoxLayout* hbox_idvar          = new QHBoxLayout();
-	QLabel* label_id                 = new QLabel(tr("ID:"));
-	QLabel* label_var                = new QLabel(tr("Variant:"));
-	QLineEdit* edit_id               = new QLineEdit("0");
-	QLineEdit* edit_var              = new QLineEdit("0");
-	QRegularExpressionValidator* rxv = new QRegularExpressionValidator(QRegularExpression("\\d*"), this);
+	QHBoxLayout* hbox_idvar = new QHBoxLayout();
+	QLabel* label_id        = new QLabel(tr("ID:"));
+	QLabel* label_var       = new QLabel(tr("Variant:"));
+	QLineEdit* edit_id      = new QLineEdit("0");
+	QLineEdit* edit_var     = new QLineEdit("0");
+	QRegExpValidator* rxv   = new QRegExpValidator(QRegExp("\\d*"), this);
 	edit_id->setValidator(rxv);
 	edit_var->setValidator(rxv);
 	hbox_idvar->addWidget(label_id);
@@ -617,7 +618,7 @@ skylander_creator_dialog::skylander_creator_dialog(QWidget* parent)
 
 		QString predef_name = last_skylander_path;
 		const auto found_sky = list_skylanders.find(std::make_pair(sky_id, sky_var));
-		if (found_sky != list_skylanders.cend())
+		if (found_sky != list_skylanders.end())
 		{
 			predef_name += QString::fromStdString(found_sky->second + ".sky");
 		}
@@ -626,7 +627,7 @@ skylander_creator_dialog::skylander_creator_dialog(QWidget* parent)
 			predef_name += QString("Unknown(%1 %2).sky").arg(sky_id).arg(sky_var);
 		}
 
-		file_path = QFileDialog::getSaveFileName(this, tr("Create Skylander File"), predef_name, tr("Skylander Object (*.sky);;All Files (*)"));
+		file_path = QFileDialog::getSaveFileName(this, tr("Create Skylander File"), predef_name, tr("Skylander Object (*.sky);;"));
 		if (file_path.isEmpty())
 		{
 			return;
@@ -642,17 +643,17 @@ skylander_creator_dialog::skylander_creator_dialog(QWidget* parent)
 		std::array<u8, 0x40 * 0x10> buf{};
 		const auto data = buf.data();
 		// Set the block permissions
-		write_to_ptr<le_t<u32>>(data, 0x36, 0x690F0F0F);
+		*utils::bless<le_t<u32>>(&data[0x36]) = 0x690F0F0F;
 		for (u32 index = 1; index < 0x10; index++)
 		{
-			write_to_ptr<le_t<u32>>(data, (index * 0x40) + 0x36, 0x69080F7F);
+			*utils::bless<le_t<u32>>(&data[(index * 0x40) + 0x36]) = 0x69080F7F;
 		}
 		// Set the skylander infos
-		write_to_ptr<le_t<u16>>(data, (sky_id | sky_var) + 1);
-		write_to_ptr<le_t<u16>>(data, 0x10, sky_id);
-		write_to_ptr<le_t<u16>>(data, 0x1C, sky_var);
+		*utils::bless<le_t<u16>>(&data[0])    = (sky_id | sky_var) + 1;
+		*utils::bless<le_t<u16>>(&data[0x10]) = sky_id;
+		*utils::bless<le_t<u16>>(&data[0x1C]) = sky_var;
 		// Set checksum
-		write_to_ptr<le_t<u16>>(data, 0x1E, skylander_crc16(0xFFFF, data, 0x1E));
+		*utils::bless<le_t<u16>>(&data[0x1E]) = skylander_crc16(0xFFFF, data, 0x1E);
 
 		sky_file.write(buf.data(), buf.size());
 		sky_file.close();
@@ -747,9 +748,9 @@ skylander_dialog* skylander_dialog::get_dlg(QWidget* parent)
 
 void skylander_dialog::clear_skylander(u8 slot)
 {
-	if (const auto& slot_infos = sky_slots[slot])
+	if (auto slot_infos = sky_slots[slot])
 	{
-		const auto& [cur_slot, id, var] = slot_infos.value();
+		auto [cur_slot, id, var] = slot_infos.value();
 		g_skyportal.remove_skylander(cur_slot);
 		sky_slots[slot] = {};
 		update_edits();
@@ -767,7 +768,7 @@ void skylander_dialog::create_skylander(u8 slot)
 
 void skylander_dialog::load_skylander(u8 slot)
 {
-	const QString file_path = QFileDialog::getOpenFileName(this, tr("Select Skylander File"), last_skylander_path, tr("Skylander (*.sky *.bin *.dmp *.dump);;All Files (*)"));
+	const QString file_path = QFileDialog::getOpenFileName(this, tr("Select Skylander File"), last_skylander_path, tr("Skylander (*.sky);;"));
 	if (file_path.isEmpty())
 	{
 		return;
@@ -810,22 +811,22 @@ void skylander_dialog::update_edits()
 	for (auto i = 0; i < UI_SKY_NUM; i++)
 	{
 		QString display_string;
-		if (const auto& sd = sky_slots[i])
+		if (auto sd = sky_slots[i])
 		{
-			const auto& [portal_slot, sky_id, sky_var] = sd.value();
-			const auto found_sky = list_skylanders.find(std::make_pair(sky_id, sky_var));
-			if (found_sky != list_skylanders.cend())
+			auto [portal_slot, sky_id, sky_var] = sd.value();
+			auto found_sky                      = list_skylanders.find(std::make_pair(sky_id, sky_var));
+			if (found_sky != list_skylanders.end())
 			{
 				display_string = QString::fromStdString(found_sky->second);
 			}
 			else
 			{
-				display_string = QString(tr("Unknown (Id:%1 Var:%2)")).arg(sky_id).arg(sky_var);
+				display_string = QString("Unknown (Id:%1 Var:%2)").arg(sky_id).arg(sky_var);
 			}
 		}
 		else
 		{
-			display_string = tr("None");
+			display_string = "None";
 		}
 
 		edit_skylanders[i]->setText(display_string);
diff --git a/rpcs3/rpcs3qt/skylander_dialog.h b/rpcs3/rpcs3qt/skylander_dialog.h
index bd4224d91b..7733233d91 100644
--- a/rpcs3/rpcs3qt/skylander_dialog.h
+++ b/rpcs3/rpcs3qt/skylander_dialog.h
@@ -6,7 +6,7 @@
 #include <QDialog>
 #include <QLineEdit>
 
-constexpr auto UI_SKY_NUM = 8;
+constexpr auto UI_SKY_NUM = 4;
 
 class skylander_creator_dialog : public QDialog
 {
diff --git a/rpcs3/rpcs3qt/stylesheets.h b/rpcs3/rpcs3qt/stylesheets.h
index 52367de7db..9121d03609 100644
--- a/rpcs3/rpcs3qt/stylesheets.h
+++ b/rpcs3/rpcs3qt/stylesheets.h
@@ -19,7 +19,6 @@ namespace gui
 			// main window toolbar
 			"QToolBar#mw_toolbar { background-color: #F0F0F0; border: none; }"
 			"QToolBar#mw_toolbar::separator { background-color: rgba(207, 207, 207, 235); width: 0.125em; margin-top: 0.250em; margin-bottom: 0.250em; }"
-			"QToolButton:disabled { color: #787878; }"
 
 			// main window toolbar icon color
 			"QLabel#toolbar_icon_color { color: #5b5b5b; }"
@@ -30,20 +29,6 @@ namespace gui
 			// game list icon color
 			"QLabel#gamelist_icon_background_color { color: rgba(240, 240, 240, 255); }"
 
-			// game grid
-			"#game_list_grid #flow_widget_content { background: #fff; }"
-			"#game_list_grid_item { background: #fff; }"
-			"#game_list_grid_item[selected=\"true\"] { background: #148aff; }"
-			"#game_list_grid_item:focus { background: #148aff; }"
-			"#game_list_grid_item:hover { background: #94c9ff; }"
-			"#game_list_grid_item:hover:focus { background: #007fff; }"
-			"#game_list_grid_item #game_list_grid_item_title_label { color: rgba(51, 51, 51, 255); font-weight: 600; font-size: 8pt; font-family: Lucida Grande; border: 0em solid white; }"
-
-			// game grid hover and focus: we need to handle properties differently when using descendants
-			"#game_list_grid_item[selected=\"true\"] #game_list_grid_item_title_label { color: #fff; }"
-			"#game_list_grid_item[hover=\"true\"] #game_list_grid_item_title_label { color: #fff; }"
-			"#game_list_grid_item[focus=\"true\"] #game_list_grid_item_title_label { color: #fff; }"
-
 			// save manager icon color
 			"QLabel#save_manager_icon_background_color { color: rgba(240, 240, 240, 255); }"
 
@@ -52,8 +37,11 @@ namespace gui
 
 			// tables
 			"QTableWidget { alternate-background-color: #f2f2f2; background-color: #fff; border: none; }"
+			"QTableWidget#game_grid { alternate-background-color: #f2f2f2; background-color: #fff; font-weight: 600; font-size: 8pt; font-family: Lucida Grande; color: rgba(51, 51, 51, 255); border: 0em solid white; }"
 			"QTableView::item { border-left: 0.063em solid white; border-right: 0.063em solid white; padding-left:0.313em; }"
 			"QTableView::item:selected { background-color: #148aff; color: #fff; }"
+			"QTableView#game_grid::item:hover:!selected { background-color: #94c9ff; color: #fff; }"
+			"QTableView#game_grid::item:hover:selected { background-color: #007fff; color: #fff; }"
 
 			// table headers
 			"QHeaderView::section { padding-left: .5em; padding-right: .5em; padding-top: .4em; padding-bottom: -.1em; border: 0.063em solid #ffffff; }"
@@ -66,11 +54,11 @@ namespace gui
 			"QDockWidget::close-button, QDockWidget::float-button{ background-color: #e3e3e3; }"
 
 			// log frame tty
-			"QPlainTextEdit#tty_frame { background-color: #ffffff; }"
+			"QTextEdit#tty_frame { background-color: #ffffff; }"
 			"QLabel#tty_text { color: #000000; }"
 
 			// log frame log
-			"QPlainTextEdit#log_frame { background-color: #ffffff; }"
+			"QTextEdit#log_frame { background-color: #ffffff; }"
 			"QLabel#log_level_always { color: #107896; }"
 			"QLabel#log_level_fatal { color: #ff00ff; }"
 			"QLabel#log_level_error { color: #C02F1D; }"
@@ -102,11 +90,6 @@ namespace gui
 
 			// pad settings
 			"QLabel#l_controller { color: #434343; }"
-
-			// Top menu bar (Workaround for transparent menus in Qt 6.7.3)
-			"QMenu { color: #000; background-color: #F0F0F0; alternate-background-color: #f2f2f2; }"
-			"QMenu::item:selected { background: #90C8F6; }"
-			"QMenu::item:disabled { color: #787878; }"
 		);
 	}
 }
diff --git a/rpcs3/rpcs3qt/syntax_highlighter.cpp b/rpcs3/rpcs3qt/syntax_highlighter.cpp
index 412271eb6a..38ba412c13 100644
--- a/rpcs3/rpcs3qt/syntax_highlighter.cpp
+++ b/rpcs3/rpcs3qt/syntax_highlighter.cpp
@@ -15,7 +15,7 @@ void Highlighter::addRule(const QString &pattern, const QBrush &brush)
 
 void Highlighter::highlightBlock(const QString &text)
 {
-	for (const HighlightingRule& rule : highlightingRules)
+	for (const HighlightingRule &rule : highlightingRules)
 	{
 		QRegularExpressionMatchIterator matchIterator = rule.pattern.globalMatch(text);
 		while (matchIterator.hasNext())
@@ -55,21 +55,19 @@ void Highlighter::highlightBlock(const QString &text)
 
 LogHighlighter::LogHighlighter(QTextDocument* parent) : Highlighter(parent)
 {
-	const QColor color = gui::utils::get_foreground_color();
-
-	//addRule("^[^·].*$", gui::utils::get_label_color("log_level_always", Qt::darkCyan, Qt::cyan)); // unused for now
-	addRule("^·F.*$", gui::utils::get_label_color("log_level_fatal", Qt::darkMagenta, Qt::magenta));
-	addRule("^·E.*$", gui::utils::get_label_color("log_level_error", Qt::red, Qt::red));
-	addRule("^·U.*$", gui::utils::get_label_color("log_level_todo", Qt::darkYellow, Qt::darkYellow));
-	addRule("^·S.*$", gui::utils::get_label_color("log_level_success", Qt::darkGreen, Qt::green));
-	addRule("^·W.*$", gui::utils::get_label_color("log_level_warning", Qt::darkYellow, Qt::darkYellow));
-	addRule("^·!.*$", gui::utils::get_label_color("log_level_notice", color, color));
-	addRule("^·T.*$", gui::utils::get_label_color("log_level_trace", color, color));
+	//addRule("^[^·].*$", gui::utils::get_label_color("log_level_always")); // unused for now
+	addRule("^·F.*$", gui::utils::get_label_color("log_level_fatal"));
+	addRule("^·E.*$", gui::utils::get_label_color("log_level_error"));
+	addRule("^·U.*$", gui::utils::get_label_color("log_level_todo"));
+	addRule("^·S.*$", gui::utils::get_label_color("log_level_success"));
+	addRule("^·W.*$", gui::utils::get_label_color("log_level_warning"));
+	addRule("^·!.*$", gui::utils::get_label_color("log_level_notice"));
+	addRule("^·T.*$", gui::utils::get_label_color("log_level_trace"));
 }
 
 AsmHighlighter::AsmHighlighter(QTextDocument *parent) : Highlighter(parent)
 {
-	addRule("^\\b[A-Z0-9]+\\b",       Qt::darkBlue);    // Instructions
+	addRule("^[A-Z0-9]+",             Qt::darkBlue);    // Instructions
 	addRule("-?R\\d[^,;\\s]*",        Qt::darkRed);     // -R0.*
 	addRule("-?H\\d[^,;\\s]*",        Qt::red);         // -H1.*
 	addRule("-?v\\[\\d\\]*[^,;\\s]*", Qt::darkCyan);    // -v[xyz].*
@@ -170,7 +168,7 @@ GlslHighlighter::GlslHighlighter(QTextDocument *parent) : Highlighter(parent)
 		<< "r16_snorm"      << "r32ui"
 		<< "r8_snorm"       << "r16ui";
 
-	for (const QString& pattern : keywordPatterns)
+	for (const QString &pattern : keywordPatterns)
 		addRule("\\b" + pattern + "\\b",   Qt::darkBlue);    // normal words like: soka, nani, or gomen
 
 	addRule("\\bGL_(?:[A-Z]|_)+\\b",       Qt::darkMagenta); // constants like: GL_OMAE_WA_MOU_SHINDEIRU
diff --git a/rpcs3/rpcs3qt/system_cmd_dialog.cpp b/rpcs3/rpcs3qt/system_cmd_dialog.cpp
deleted file mode 100644
index fb2b19a838..0000000000
--- a/rpcs3/rpcs3qt/system_cmd_dialog.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-#include "stdafx.h"
-#include "system_cmd_dialog.h"
-
-#include "Emu/System.h"
-#include "Emu/Cell/Modules/cellSysutil.h"
-#include "Emu/Cell/Modules/cellNetCtl.h"
-#include "Emu/Cell/Modules/cellOskDialog.h"
-
-#include <QPushButton>
-#include <QFontDatabase>
-#include <QRegularExpressionValidator>
-#include <QGroupBox>
-#include <QMessageBox>
-#include <QVBoxLayout>
-
-LOG_CHANNEL(gui_log, "GUI");
-
-system_cmd_dialog::system_cmd_dialog(QWidget* parent)
-	: QDialog(parent)
-{
-	setWindowTitle(tr("System Commands | %1").arg(QString::fromStdString(Emu.GetTitleAndTitleID())));
-	setObjectName("system_cmd_dialog");
-	setAttribute(Qt::WA_DeleteOnClose);
-
-	QPushButton* button_send = new QPushButton(tr("Send Command"), this);
-	connect(button_send, &QAbstractButton::clicked, this, &system_cmd_dialog::send_command);
-
-	QPushButton* button_send_custom = new QPushButton(tr("Send Custom Command"), this);
-	connect(button_send_custom, &QAbstractButton::clicked, this, &system_cmd_dialog::send_custom_command);
-
-	const QFont mono = QFontDatabase::systemFont(QFontDatabase::FixedFont);
-
-	m_value_input = new QLineEdit();
-	m_value_input->setFont(mono);
-	m_value_input->setMaxLength(18);
-	m_value_input->setValidator(new QRegularExpressionValidator(QRegularExpression("^(0[xX])?0*[a-fA-F0-9]{0,8}$"), this));
-	m_value_input->setPlaceholderText(QString("0x%1").arg(0, 16, 16, QChar('0')));
-
-	m_custom_command_input = new QLineEdit();
-	m_custom_command_input->setFont(mono);
-	m_custom_command_input->setMaxLength(18);
-	m_custom_command_input->setValidator(new QRegularExpressionValidator(QRegularExpression("^(0[xX])?0*[a-fA-F0-9]{0,8}$"), this));
-	m_custom_command_input->setPlaceholderText(QString("0x%1").arg(0, 16, 16, QChar('0')));
-
-	m_command_box = new QComboBox();
-
-	const std::map<u64, QString> commands
-	{
-		{ CELL_SYSUTIL_REQUEST_EXITGAME, "CELL_SYSUTIL_REQUEST_EXITGAME " },
-		{ CELL_SYSUTIL_DRAWING_BEGIN, "CELL_SYSUTIL_DRAWING_BEGIN" },
-		{ CELL_SYSUTIL_DRAWING_END, "CELL_SYSUTIL_DRAWING_END" },
-		{ CELL_SYSUTIL_SYSTEM_MENU_OPEN, "CELL_SYSUTIL_SYSTEM_MENU_OPEN" },
-		{ CELL_SYSUTIL_SYSTEM_MENU_CLOSE, "CELL_SYSUTIL_SYSTEM_MENU_CLOSE" },
-		{ CELL_SYSUTIL_BGMPLAYBACK_PLAY, "CELL_SYSUTIL_BGMPLAYBACK_PLAY" },
-		{ CELL_SYSUTIL_BGMPLAYBACK_STOP, "CELL_SYSUTIL_BGMPLAYBACK_STOP" },
-		{ CELL_SYSUTIL_NP_INVITATION_SELECTED, "CELL_SYSUTIL_NP_INVITATION_SELECTED" },
-		{ CELL_SYSUTIL_NP_DATA_MESSAGE_SELECTED, "CELL_SYSUTIL_NP_DATA_MESSAGE_SELECTED" },
-		{ CELL_SYSUTIL_SYSCHAT_START, "CELL_SYSUTIL_SYSCHAT_START" },
-		{ CELL_SYSUTIL_SYSCHAT_STOP, "CELL_SYSUTIL_SYSCHAT_STOP" },
-		{ CELL_SYSUTIL_SYSCHAT_VOICE_STREAMING_RESUMED, "CELL_SYSUTIL_SYSCHAT_VOICE_STREAMING_RESUMED" },
-		{ CELL_SYSUTIL_SYSCHAT_VOICE_STREAMING_PAUSED, "CELL_SYSUTIL_SYSCHAT_VOICE_STREAMING_PAUSED" },
-		{ CELL_SYSUTIL_NET_CTL_NETSTART_LOADED, "CELL_SYSUTIL_NET_CTL_NETSTART_LOADED" },
-		{ CELL_SYSUTIL_NET_CTL_NETSTART_FINISHED, "CELL_SYSUTIL_NET_CTL_NETSTART_FINISHED" },
-		{ CELL_SYSUTIL_NET_CTL_NETSTART_UNLOADED, "CELL_SYSUTIL_NET_CTL_NETSTART_UNLOADED" },
-		{ CELL_SYSUTIL_OSKDIALOG_LOADED, "CELL_SYSUTIL_OSKDIALOG_LOADED" },
-		{ CELL_SYSUTIL_OSKDIALOG_FINISHED, "CELL_SYSUTIL_OSKDIALOG_FINISHED" },
-		{ CELL_SYSUTIL_OSKDIALOG_UNLOADED, "CELL_SYSUTIL_OSKDIALOG_UNLOADED" },
-		{ CELL_SYSUTIL_OSKDIALOG_INPUT_ENTERED, "CELL_SYSUTIL_OSKDIALOG_INPUT_ENTERED" },
-		{ CELL_SYSUTIL_OSKDIALOG_INPUT_CANCELED, "CELL_SYSUTIL_OSKDIALOG_INPUT_CANCELED" },
-		{ CELL_SYSUTIL_OSKDIALOG_INPUT_DEVICE_CHANGED, "CELL_SYSUTIL_OSKDIALOG_INPUT_DEVICE_CHANGED" },
-		{ CELL_SYSUTIL_OSKDIALOG_DISPLAY_CHANGED, "CELL_SYSUTIL_OSKDIALOG_DISPLAY_CHANGED" },
-	};
-
-	for (const auto& [status, text] : commands)
-	{
-		m_command_box->addItem(text, static_cast<qulonglong>(status));
-	}
-
-	QGroupBox* commands_group = new QGroupBox(tr("Select Command"));
-	QHBoxLayout* hbox_commands = new QHBoxLayout();
-	hbox_commands->addWidget(m_command_box);
-	commands_group->setLayout(hbox_commands);
-
-	QGroupBox* custom_commands_group = new QGroupBox(tr("Select Custom Command"));
-	QHBoxLayout* hbox_custom_commands = new QHBoxLayout();
-	hbox_custom_commands->addWidget(m_custom_command_input);
-	custom_commands_group->setLayout(hbox_custom_commands);
-
-	QGroupBox* value_group = new QGroupBox(tr("Select Value"));
-	QHBoxLayout* hbox_value = new QHBoxLayout();
-	hbox_value->addWidget(m_value_input);
-	value_group->setLayout(hbox_value);
-
-	QHBoxLayout* hbox_buttons = new QHBoxLayout();
-	hbox_buttons->addWidget(button_send);
-	hbox_buttons->addWidget(button_send_custom);
-
-	QVBoxLayout* vbox_panel = new QVBoxLayout();
-	vbox_panel->addWidget(commands_group);
-	vbox_panel->addWidget(custom_commands_group);
-	vbox_panel->addWidget(value_group);
-	vbox_panel->addLayout(hbox_buttons);
-	setLayout(vbox_panel);
-}
-
-system_cmd_dialog::~system_cmd_dialog()
-{
-}
-
-void system_cmd_dialog::send_command()
-{
-	bool ok = false;
-
-	const qulonglong status = m_command_box->currentData().toULongLong(&ok);
-	if (!ok)
-	{
-		gui_log.error("system_cmd_dialog::send_command: command can not be converted to qulonglong: %s", m_command_box->currentText());
-		QMessageBox::warning(this, tr("Listen!"), tr("The selected command is bugged.\nPlease contact a developer."));
-		return;
-	}
-
-	const qulonglong param = hex_value(m_value_input->text(), ok);
-	if (!ok)
-	{
-		gui_log.error("system_cmd_dialog::send_command: value can not be converted to qulonglong: %s", m_value_input->text());
-		QMessageBox::information(this, tr("Listen!"), tr("Please select a proper value first."));
-		return;
-	}
-
-	send_cmd(status, param);
-}
-
-void system_cmd_dialog::send_custom_command()
-{
-	bool ok = false;
-
-	const qulonglong status = hex_value(m_custom_command_input->text(), ok);
-	if (!ok)
-	{
-		gui_log.error("system_cmd_dialog::send_custom_command: command can not be converted to qulonglong: %s", m_custom_command_input->text());
-		QMessageBox::information(this, tr("Listen!"), tr("Please select a proper custom command first."));
-		return;
-	}
-
-	const qulonglong param = hex_value(m_value_input->text(), ok);
-	if (!ok)
-	{
-		gui_log.error("system_cmd_dialog::send_custom_command: value can not be converted to qulonglong: %s", m_value_input->text());
-		QMessageBox::information(this, tr("Listen!"), tr("Please select a proper value first."));
-		return;
-	}
-
-	send_cmd(status, param);
-}
-
-void system_cmd_dialog::send_cmd(qulonglong status, qulonglong param) const
-{
-	if (Emu.IsStopped())
-	{
-		return;
-	}
-
-	gui_log.warning("User triggered sysutil_send_system_cmd(status=0x%x, param=0x%x) in system_cmd_dialog", status, param);
-
-	if (s32 ret = sysutil_send_system_cmd(status, param); ret < 0)
-	{
-		gui_log.error("sysutil_send_system_cmd(status=0x%x, param=0x%x) failed with 0x%x", status, param, ret);
-	}
-}
-
-qulonglong system_cmd_dialog::hex_value(QString text, bool& ok) const
-{
-	if (!text.startsWith("0x")) text.prepend("0x");
-	return text.toULongLong(&ok, 16);
-}
diff --git a/rpcs3/rpcs3qt/system_cmd_dialog.h b/rpcs3/rpcs3qt/system_cmd_dialog.h
deleted file mode 100644
index c661421902..0000000000
--- a/rpcs3/rpcs3qt/system_cmd_dialog.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <QDialog>
-#include <QComboBox>
-#include <QLineEdit>
-
-class system_cmd_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	system_cmd_dialog(QWidget* parent = nullptr);
-	~system_cmd_dialog();
-
-private Q_SLOTS:
-	void send_command();
-	void send_custom_command();
-
-private:
-	void send_cmd(qulonglong status, qulonglong param) const;
-	qulonglong hex_value(QString text, bool& ok) const;
-
-	QLineEdit* m_value_input = nullptr;
-	QLineEdit* m_custom_command_input = nullptr;
-	QComboBox* m_command_box = nullptr;
-};
diff --git a/rpcs3/rpcs3qt/table_item_delegate.cpp b/rpcs3/rpcs3qt/table_item_delegate.cpp
deleted file mode 100644
index eadebe3909..0000000000
--- a/rpcs3/rpcs3qt/table_item_delegate.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "table_item_delegate.h"
-#include "gui_settings.h"
-
-table_item_delegate::table_item_delegate(QObject* parent, bool has_icons)
-	: QStyledItemDelegate(parent), m_has_icons(has_icons)
-{
-}
-
-void table_item_delegate::initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const
-{
-	// Remove the focus frame around selected items
-	option->state &= ~QStyle::State_HasFocus;
-
-	if (m_has_icons && index.column() == 0)
-	{
-		// Don't highlight icons
-		option->state &= ~QStyle::State_Selected;
-
-		// Center icons
-		option->decorationAlignment = Qt::AlignCenter;
-		option->decorationPosition = QStyleOptionViewItem::Top;
-	}
-
-	QStyledItemDelegate::initStyleOption(option, index);
-}
-
-void table_item_delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
-{
-	if (m_has_icons && index.column() == static_cast<int>(gui::game_list_columns::icon) && option.state & QStyle::State_Selected)
-	{
-		// Add background highlight color to icons
-		painter->fillRect(option.rect, option.palette.color(QPalette::Highlight));
-	}
-
-	QStyledItemDelegate::paint(painter, option, index);
-}
diff --git a/rpcs3/rpcs3qt/table_item_delegate.h b/rpcs3/rpcs3qt/table_item_delegate.h
index 0d500c45e3..88ecdff73b 100644
--- a/rpcs3/rpcs3qt/table_item_delegate.h
+++ b/rpcs3/rpcs3qt/table_item_delegate.h
@@ -6,13 +6,38 @@
 /** This class is used to get rid of somewhat ugly item focus rectangles. You could change the rectangle instead of omiting it if you wanted */
 class table_item_delegate : public QStyledItemDelegate
 {
+private:
+	bool m_has_icons;
+
 public:
-	explicit table_item_delegate(QObject *parent = nullptr, bool has_icons = false);
+	explicit table_item_delegate(QObject *parent = nullptr, bool has_icons = false) : QStyledItemDelegate(parent), m_has_icons(has_icons) {}
 
-	void initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const override;
+	void initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const override
+	{
+		// Remove the focus frame around selected items
+		option->state &= ~QStyle::State_HasFocus;
 
-	void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+		if (m_has_icons && index.column() == 0)
+		{
+			// Don't highlight icons
+			option->state &= ~QStyle::State_Selected;
 
-protected:
-	bool m_has_icons{};
+			// Center icons
+			option->decorationAlignment = Qt::AlignCenter;
+			option->decorationPosition = QStyleOptionViewItem::Top;
+		}
+
+		QStyledItemDelegate::initStyleOption(option, index);
+	}
+
+	void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override
+	{
+		if (index.column() == 0 && option.state & QStyle::State_Selected)
+		{
+			// Add background highlight color to icons
+			painter->fillRect(option.rect, option.palette.color(QPalette::Highlight));
+		}
+
+		QStyledItemDelegate::paint(painter, option, index);
+	}
 };
diff --git a/rpcs3/rpcs3qt/tooltips.h b/rpcs3/rpcs3qt/tooltips.h
index 41cfc1e6d8..dc8b5a2787 100644
--- a/rpcs3/rpcs3qt/tooltips.h
+++ b/rpcs3/rpcs3qt/tooltips.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "qt_utils.h"
 #include <QString>
 #include <QObject>
 
@@ -20,58 +19,35 @@ public:
 	{
 		// advanced
 
-		const QString lle_list                     = tr("These libraries are LLE'd by default (lower list), selection will switch to HLE.\nLLE - \"Low Level Emulated\", function code inside the selected SPRX file will be used for exported firmware functions.\nHLE - \"High Level Emulated\", alternative emulator code will be used instead for exported firmware functions.\nIf chosen wrongly, games will not work! If unsure, leave both lists empty. HLEing all SPRX allows to boot without firmware installed. (experimental)");
-		const QString hle_list                     = tr("These libraries are HLE'd by default (upper list), selection will switch to LLE.\nLLE - \"Low Level Emulated\", function code inside the selected SPRX file will be used for exported firmware functions.\nHLE - \"High Level Emulated\", alternative emulator code will be used instead for exported firmware functions.\nIf chosen wrongly, games will not work! If unsure, leave both lists empty. HLEing all SPRX allows to boot without firmware installed. (experimental)");
+		const QString lle_list                     = tr("These libraries are LLE'd by default (lower list), selection will switch to HLE.\nLLE - \"Low Level Emulated\", function code inside the selected SPRX file will be used for exported firmware functions.\nHLE - \"High Level Emulated\", alternative emulator code will be used instead for exported firmware functions.\nIf choosen wrongly, games will not work! If unsure, leave both lists empty. HLEing all SPRX allows to boot without firmware installed. (experimental)");
+		const QString hle_list                     = tr("These libraries are HLE'd by default (upper list), selection will switch to LLE.\nLLE - \"Low Level Emulated\", function code inside the selected SPRX file will be used for exported firmware functions.\nHLE - \"High Level Emulated\", alternative emulator code will be used instead for exported firmware functions.\nIf choosen wrongly, games will not work! If unsure, leave both lists empty. HLEing all SPRX allows to boot without firmware installed. (experimental)");
 		const QString lib_default_hle              = tr("Select to LLE. (HLE by default)");
 		const QString lib_default_lle              = tr("Select to HLE. (LLE by default)");
 
 		const QString debug_console_mode           = tr("Increases the amount of usable system memory to match a DECR console and more.\nCauses some software to behave differently than on retail hardware.");
-		const QString accurate_rsx_access          = tr("Forces RSX pauses on SPU MFC_GETLLAR and SPU MFC_PUTLLUC operations.");
-		const QString accurate_spu_dma             = tr("Accurately processes SPU DMA operations.");
-		const QString fixup_ppunj                  = tr("Legacy option. Fixup result vector values in Non-Java Mode in PPU LLVM.\nIf unsure, do not modify this setting.");
-		const QString accurate_dfma                = tr("Use accurate double-precision FMA instructions in PPU and SPU backends.\nWhile disabling it might give a decent performance boost if your CPU doesn't support FMA, it may also introduce subtle bugs that otherwise do not occur.\nYou shouldn't disable it if your CPU supports FMA.");
-		const QString fixup_ppuvnan                = tr("Fixup NaN results in vector instructions in PPU backends.\nIf unsure, do not modify this setting.");
 		const QString silence_all_logs             = tr("Stop writing any logs after game startup. Don't use unless you believe it's necessary.");
 		const QString read_color                   = tr("Initializes render target memory using vm memory.");
 		const QString read_depth                   = tr("Initializes render target memory using vm memory.");
 		const QString dump_depth                   = tr("Writes depth buffer values to vm memory.");
-		const QString handle_tiled_memory          = tr("Obey RSX memory tiling configuration when writing GPU data to vm memory.\nThis can fix graphics corruption observed when Read Color or Read Depth options are enabled.");
 		const QString disable_on_disk_shader_cache = tr("Disables the loading and saving of shaders from and to the shader cache in the data directory.");
-		const QString allow_host_labels            = tr("Allows the host GPU to synchronize with CELL directly. This incurs a performance penalty, but exposes the true state of GPU objects to the guest CPU. Can help eliminate visual noise and glitching at the cost of performance. Use with caution.");
-		const QString force_hw_MSAA                = tr("Forces MSAA to use the host GPU's resolve capabilities for all sampling operations.\nThis option incurs a performance penalty as well as the risk of visual artifacts but can yield crisper visuals when MSAA is enabled.");
-		const QString disable_vertex_cache         = tr("Disables the vertex cache.\nMight resolve missing or flickering graphics output.\nMay degrade performance.");
-		const QString disable_async_host_mm        = tr("Force host memory management calls to be inlined instead of handled asynchronously.\nThis can cause severe performance degradation and stuttering in some games.\nThis option is only needed by developers to debug problems with texture cache memory protection.");
-		const QString disable_spin_optimization    = tr("Disable SPU GETLLAR spin optimization.\nThis can cause severe performance degradation and stuttering in many games.\nThis option is only needed for a select number of games.");
-		const QString enable_spu_events_busy_loop  = tr("Enable SPU RdEventStat spin.\nThis increases CPU usage, this setting is beneficial for high-threaded CPUs (12+) with select number of games.");
-		const QString zcull_operation_mode         = tr("Changes ZCULL report synchronization behaviour. Experiment to find the best option for your game. Approximate mode is recommended for most games.\n· Precise is the most accurate to PS3 behaviour. Required for accurate visuals in some titles such as Demon's Souls and The Darkness.\n· Approximate is a much faster way to generate occlusion data which may not always match what the PS3 would generate. Works well with most PS3 games.\n· Relaxed changes the synchronization method completely and can greatly improve performance in some games or completely break others.");
-		const QString max_spurs_threads            = tr("Limits the maximum number of SPURS threads in each thread group.\nMay improve performance in some cases, especially on systems with limited number of hardware threads.\nLimiting the number of threads is likely to cause crashes; it's recommended to keep this at the default value.");
+		const QString relaxed_zcull                = tr("Changes ZCULL report synchronization behaviour to be more forgiving to PC architecture.\nCan improve performance in some games but can also cause stability issues or drastically reduced performance in others.\nUse with caution and if performance or stability is compromised, keep this disabled.");
+		const QString max_spurs_threads            = tr("Limits the maximum number of SPURS threads in each thread group.\nMay improve performance in some cases, especially on systems with limited number of hardware threads.\nLimiting the number of threads is likely to cause crashes; it's recommended to keep this at default value.");
 		const QString sleep_timers_accuracy        = tr("Changes the sleep period accuracy.\n'As Host' uses default accuracy of the underlying operating system, while 'All Timers' attempts to improve it.\n'Usleep Only' limits the adjustments to usleep syscall only.\nCan affect performance in unexpected ways.");
-		const QString rsx_fifo_accuracy            = tr("\"Fast\" is the least accurate setting, RSX does not emulate atomic FIFO buffer.\n\"Atomic\" benefits stability greatly in many games with little performance penalty.\n\"Atomic & Ordered\" is the most accurate but it is the slowest and without much stability benefit in games.");
 		const QString vblank_rate                  = tr("Adjusts the frequency of vertical blanking signals that the emulator sends.\nAffects timing of events which rely on these signals.");
-		const QString vblank_ntsc_fixup            = tr("Multiplies the rate of VBLANK by 1000/1001 for values like 59.94Hz.\nKnown to fix the rhythm game Space Channel 5 Part 2");
 		const QString clocks_scale                 = tr("Changes the scale of emulated system time.\nAffects software which uses system time to calculate things such as dynamic timesteps.");
-		const QString wake_up_delay                = tr("Controls how much time it takes for RSX to start processing after waking up by the Cell processor.\nIncreasing wakeup delay improves stability, but very high values can lower RSX/GPU performance.\nIt is recommend to adjust this at 20µs to 40µs increments until the best value for optimal stability is reached.");
-		const QString disabled_from_global         = tr("Do not change this setting globally.\nRight-click a game in the game list and choose \"Configure\" instead.");
-		const QString vulkan_async_scheduler       = tr("Determines how to schedule GPU async compute jobs when using asynchronous streaming.\nUse 'Safe' mode for more spec compliant behavior at the cost of some CPU overhead. This setting works with all devices.\nUse 'Fast' to use a faster but hacky version. This option is internally disabled for NVIDIA GPUs due to causing GPU hangs.");
-		const QString disable_msl_fast_math        = tr("Disables Fast Math for MSL shaders, which may violate the IEEE 754 standard.\nDisabling it may fix some artifacts, especially on Apple GPUs, at the cost of performance.");
-		const QString anti_cheat_savestates        = tr("When this mode is on, emulation exits when saving and the savestate file is concealed after its load, preventing reuse by RPCS3.\nThis mode is like hibernation of emulation: if you don't want to be able to cheat using savestates when playing the game, consider using this mode.\nDo note that the savestate file is not gone completely, just ignored by RPCS3. You can manually relaunch it if needed.");
-		const QString compatible_savestates        = tr("When this mode is on, SPU emulation prioritizes savestate compatibility, however, it may reduce performance slightly.\nWhen this mode is off, some games may not allow making a savestate and show an SPU pause error in the log.");
-		const QString paused_savestates            = tr("When this mode is on, savestates are loaded and paused on the first frame.\nThis allows players to prepare for gameplay without being thrown into the action immediately.");
-		const QString spu_profiler                 = tr("When enabled, SPU performance is measured at runtime.\nEnable only at a developer's request because when enabled it reduces performance a bit by itself.");
+		const QString wake_up_delay                = tr("Try fiddling with this setting when encountering unstable games. The higher value, the better stability it may provide.\nIncrements/Decrements for each test should be around 100μs to 200μs until finding the best value for optimal stability.\nValues above 1000μs may cause noticeable performance penalties, use with caution.");
+		const QString disabled_from_global         = tr("Do not change this setting globally.\nRight-click the game in game list and choose \"Configure\" instead.");
+		const QString vulkan_async_scheduler       = tr("Determines how to schedule GPU async compute jobs when using asynchronous streaming.\nUse 'Host' mode for more spec compliant behavior at the cost of CPU overhead.\nUse 'Device' to let your driver handle this. Beware that 'device' mode technically violates official spec but is the superior option.");
 
 		// audio
 
-		const QString audio_out                 = tr("Cubeb uses a cross-platform approach and supports audio buffering, so it is the recommended option.\nXAudio2 uses native Windows sounds system and is the next best alternative.");
-		const QString audio_out_linux           = tr("Cubeb uses a cross-platform approach and supports audio buffering, so it is the recommended option.\nIf it's not available, FAudio could be used instead.");
-		const QString audio_provider            = tr("Controls which PS3 audio API is used.\nGames use CellAudio, while VSH requires RSXAudio.");
-		const QString audio_avport              = tr("Controls which avport is used to sample audio data from.");
-		const QString audio_device              = tr("Controls which device is used by audio backend.");
+		const QString audio_out                 = tr("XAudio2 is the recommended option and should be used whenever possible.\nOpenAL uses a cross-platform approach and is the next best alternative.");
+		const QString audio_out_linux           = tr("OpenAL uses a cross-platform approach and supports audio buffering, so it is the recommended option.\nPulseAudio uses the native Linux sound system, and is the next best alternative. If neither are available, ALSA can be used instead.");
 		const QString audio_dump                = tr("Saves all audio as a raw wave file. If unsure, leave this unchecked.");
 		const QString convert                   = tr("Uses 16-bit audio samples instead of default 32-bit floating point.\nUse with buggy audio drivers if you have no sound or completely broken sound.");
-		const QString audio_format              = tr("Determines the sound format of the emulation.\nConfigure this setting if you want to switch between stereo and surround sound.\nChanging these values requires a restart of the game.\nThe manual setting will use your selected formats while the automatic setting will let the game choose from all available formats.");
-		const QString audio_channel_layout      = tr("Determines the sound format of RPCS3.\nUse 'Auto' to let RPCS3 decide the best format based on the audio device and the emulated audio format.");
+		const QString downmix                   = tr("Uses chosen audio output instead of default 7.1 surround sound.\nUse downmix to stereo with stereo audio devices. Use 5.1 or higher only if you are using a surround sound audio system.");
 		const QString master_volume             = tr("Controls the overall volume of the emulation.\nValues above 100% might reduce the audio quality.");
-		const QString enable_buffering          = tr("Enables audio buffering, which reduces crackle/stutter but increases audio latency.");
+		const QString enable_buffering          = tr("Enables audio buffering, which reduces crackle/stutter but increases audio latency (requires XAudio2 or OpenAL).");
 		const QString audio_buffer_duration     = tr("Target buffer duration in milliseconds.\nHigher values make the buffering algorithm's job easier, but may introduce noticeable audio latency.");
 		const QString enable_time_stretching    = tr("Enables time stretching - requires buffering to be enabled.\nReduces crackle/stutter further, but may cause a very noticeable reduction in audio quality on slower CPUs.");
 		const QString time_stretching_threshold = tr("Buffer fill level (in percentage) below which time stretching will start.");
@@ -79,78 +55,72 @@ public:
 
 		// cpu
 
-		const QString ppu__static               = tr("Interpreter (slow). Try this if PPU Recompiler (LLVM) doesn't work.");
-		const QString ppu_dynamic               = tr("Alternative interpreter (slow). May be faster than static interpreter. Try this if PPU Recompiler (LLVM) doesn't work.");
+		const QString ppu_precise               = tr("Interprets PPU code with absolute accuracy.\nThis is the most accurate Interpreter, but very slow to play games with.\nYou may try this as a last resort if you encounter odd bugs or crashes.\nIf unsure, use PPU Interpreter Fast or PPU Recompiler (LLVM).");
+		const QString ppu_fast                  = tr("Interprets PPU code with sacrificed accuracy in order to achieve better performance.\nThis is the fastest interpreter.\nIt very rarely breaks games even in comparison to the Precise option.\nTry this if PPU Recompiler (LLVM) fails.");
 		const QString ppu_llvm                  = tr("Recompiles and caches the game's PPU code using the LLVM Recompiler once before running it for the first time.\nThis is by far the fastest option and should always be used.\nShould you face compatibility issues, fall back to one of the Interpreters and retry.\nIf unsure, use this option.");
-		const QString llvm_precompilation       = tr("Searches the game's directory and precompiles extra PPU and SPU modules during boot.\nIf disabled, these modules will only be compiled when needed. Depending on the game, this might interrupt the gameplay unexpectedly and possibly frequently.\nOnly disable this if you want to get ingame more quickly.");
-		const QString spu__static               = tr("Interpreter (slow). Try this if SPU Recompiler (LLVM) doesn't work.");
-		const QString spu_dynamic               = tr("Alternative interpreter (slow). May be faster than static interpreter. Try this if SPU Recompiler (LLVM) doesn't work.");
+		const QString ppu_precompilation        = tr("Searches the game's directory and precompiles extra PPU modules during boot.\nIf disabled, these modules will only be compiled when needed. Depending on the game, this might interrupt the gameplay unexpectedly and possibly frequently.\nOnly disable this if you want to get ingame more quickly.");
+		const QString spu_precise               = tr("Interprets SPU code with absolute accuracy.\nThis is extremely slow but may fix broken graphics in some games.");
+		const QString spu_fast                  = tr("Interprets SPU code with sacrificed accuracy in order to achieve better performance.\nThis is slower than the SPU Recompiler but significantly faster than the precise interpreter.\nGames rarely need this however.");
 		const QString spu_asmjit                = tr("Recompiles the game's SPU code using the ASMJIT Recompiler.\nThis is the fast option with very good compatibility.\nIf unsure, use this option.");
 		const QString spu_llvm                  = tr("Recompiles and caches the game's SPU code using the LLVM Recompiler before running which adds extra start-up time.\nThis is the fastest option with very good compatibility.\nIf you experience issues, use the ASMJIT Recompiler.");
-		const QString xfloat                    = tr("Control accuracy to SPU float vectors processing.\nFixes bugs in various games at the cost of performance.\nThis setting is only applied when SPU Decoder is set to Dynamic or LLVM.");
-		const QString enable_thread_scheduler   = tr("Control how RPCS3 utilizes the threads of your system.\nEach option heavily depends on the game and on your CPU. It's recommended to try each option to find out which performs the best.\nChanging the thread scheduler is not supported on CPUs with less than 12 threads.");
+		const QString accurate_xfloat           = tr("Adds extra accuracy to SPU float vectors processing.\nFixes bugs in various games at the cost of performance.\nThis setting is only applied when SPU Decoder is set to Fast or LLVM.");
+		const QString spu_cache                 = tr("Caches compiled SPU modules on disc.\nShould normally stay enabled.\nDisable this if the cache becomes too large.\nDisabling it does not remove the existing cache.");
+		const QString enable_thread_scheduler   = tr("Control how RPCS3 utilizes the threads of your system.\nEach option heavily depends on the game and on your CPU, it's recommended to try each option to find out which performs the best.\nChanging the thread scheduler is not supported on CPUs with less than 12 threads.");
+		const QString lower_spu_thread_priority = tr("Runs SPU threads with lower priority than PPU threads.\nUsually faster on an i3 or i5, possibly slower or no difference on an i7 or Ryzen.");
 		const QString spu_loop_detection        = tr("Try to detect loop conditions in SPU kernels and use them as scheduling hints.\nImproves performance and reduces CPU usage.\nMay cause severe audio stuttering in rare cases.");
-		const QString enable_tsx                = tr("Enable usage of TSX instructions.\nNeeds to be forced on some Haswell or Broadwell CPUs or CPUs with the TSX-FA instruction set.\nForcing TSX in these cases may lead to system and performance instability, use it with caution.");
+		const QString enable_tsx                = tr("Enable usage of TSX instructions.\nNeeds to be forced on some Haswell or Broadwell CPUs.\nForcing this on older Hardware can lead to system instability, use it with caution.");
 		const QString spu_block_size            = tr("This option controls the SPU analyser, particularly the size of compiled units. The Mega and Giga modes may improve performance by tying smaller units together, decreasing the number of compiled units but increasing their size.\nUse the Safe mode for maximum compatibility.");
 		const QString preferred_spu_threads     = tr("Some SPU stages are sensitive to race conditions and allowing a limited number at a time helps alleviate performance stalls.\nSetting this to a smaller value might improve performance and reduce stuttering in some games.\nLeave this on auto if performance is negatively affected when setting a small value.");
-		const QString max_cpu_preempt           = tr("Reduces CPU usage and power consumption, improving battery life on mobile devices. (0 means disabled)\nHigher values cause a more pronounced effect, but may cause audio or performance issues. A value of 50 or less is recommended.\nThis option forces an FPS limit because it's active when framerate is stable.\nThe lighter the game is on the hardware, the more power is saved by it. (until the preemption count barrier is reached)");
+		const QString full_width_avx512         = tr("Enables the use of code with full width AVX-512.\nThis code can be executed much faster, but may cause a loss in performance if your CPU model experiences downclocking on wide AVX-512 loads.\nNote that AVX-512 instructions will be used regardless of this option, just at 128 and 256 bit width.");
 
 		// debug
 
-		const QString start_on_boot                = tr("Leave this enabled unless you are a developer.");
 		const QString ppu_debug                    = tr("Creates PPU logs.\nOnly useful to developers.\nNever use this.");
 		const QString spu_debug                    = tr("Creates SPU logs.\nOnly useful to developers.\nNever use this.");
 		const QString mfc_debug                    = tr("Creates MFC logs.\nOnly useful to developers.\nNever use this.");
 		const QString set_daz_and_ftz              = tr("Sets special MXCSR flags to debug errors in SSE operations.\nOnly used in PPU thread when it's not precise.\nOnly useful to developers.\nNever use this.");
-		const QString accurate_ppusat              = tr("Accurately set Saturation Bit values in PPU backends.\nIf unsure, do not modify this setting.");
-		const QString accurate_ppunj               = tr("Respect Non-Java Mode Bit values for vector ops in PPU backends.\nIf unsure, do not modify this setting.");
-		const QString accurate_ppuvnan             = tr("Accurately set NaN results in vector instructions in PPU backends.\nIf unsure, do not modify this setting.");
-		const QString accurate_ppufpcc             = tr("Accurately set FPCC Bits in PPU backends.\nIf unsure, do not modify this setting.");
+		const QString accurate_getllar             = tr("Accurately processes SPU MFC_GETLLAR operation.");
+		const QString accurate_spu_dma             = tr("Accurately processes SPU DMA operations.");
 		const QString accurate_cache_line_stores   = tr("Accurately processes PPU DCBZ instruction.\nIn addition, when combined with Accurate SPU DMA, SPU PUT cache line accesses will be processed atomically.");
-		const QString mfc_delay_command            = tr("Forces delaying any odd MFC command, waits for at least 2 pending commands to execute them in a random order.\nMust be used with either SPU interpreters currently.\nSeverely degrades performance! If unsure, don't use this option.");
+		const QString accurate_llvm_dfma           = tr("Provides extra accuracy on FMA instructions at the cost of performance.\nWhile disabling it might give a decent performance boost if your CPU doesn't support FMA, it may also introduce subtle bugs that otherwise do not occur.\nYou can't disable it if your CPU supports FMA.");
+		const QString accurate_vector_nan          = tr("Forces the floating point NaN (Not A Number) values outputted from PPU vector instructions to be accurate to the real hardware. (0x7FC00000)");
+		const QString accurate_rsx_access          = tr("Forces RSX pauses on SPU MFC_GETLLAR and SPU MFC_PUTLLUC operations.");
 		const QString hook_static_functions        = tr("Allows to hook some functions like 'memcpy' replacing them with high-level implementations. May do nothing or break things. Experimental.");
-		const QString renderdoc_compatibility      = tr("Enables use of classic OpenGL buffers which allows capturing tools to work with RPCS3 e.g RenderDoc.\nAlso allows Vulkan to use debug markers for nicer Renderdoc captures.\nIf unsure, don't use this option.");
+		const QString renderdoc_compatibility      = tr("Enables use of classic OpenGL buffers which allows capturing tools to work with RPCS3 e.g RenderDoc.\nAlso allows vulkan to use debug markers for nicer Renderdoc captures.\nIf unsure, don't use this option.");
 		const QString force_high_pz                = tr("Only useful when debugging differences in GPU hardware.\nNot necessary for average users.\nIf unsure, don't use this option.");
 		const QString debug_output                 = tr("Enables the selected API's inbuilt debugging functionality.\nWill cause severe performance degradation especially with Vulkan.\nOnly useful to developers.\nIf unsure, don't use this option.");
 		const QString debug_overlay                = tr("Provides a graphical overlay of various debugging information.\nIf unsure, don't use this option.");
-		const QString debug_overlay_io             = tr("Provides a graphical overlay with pad input values for player 1.\nThis is only shown if the other debug overlay is disabled.\nIf unsure, don't use this option.");
 		const QString log_shader_programs          = tr("Dump game shaders to file. Only useful to developers.\nIf unsure, don't use this option.");
 		const QString disable_occlusion_queries    = tr("Disables running occlusion queries. Minor to moderate performance boost.\nMight introduce issues with broken occlusion e.g missing geometry and extreme pop-in.");
-		const QString disable_video_output         = tr("Disables all video output and PS3 graphical rendering.\nIts only use case is to evaluate performance on CELL for development.");
 		const QString force_cpu_blit_emulation     = tr("Forces emulation of all blit and image manipulation operations on the CPU.\nRequires 'Write Color Buffers' option to also be enabled in most cases to avoid missing graphics.\nSignificantly degrades performance but is more accurate in some cases.\nThis setting overrides the 'GPU texture scaling' option.");
 		const QString disable_vulkan_mem_allocator = tr("Disables the custom Vulkan memory allocator and reverts to direct calls to VkAllocateMemory/VkFreeMemory.");
 		const QString disable_fifo_reordering      = tr("Disables RSX FIFO optimizations completely. Draws are processed as they are received by the DMA puller.");
 		const QString gpu_texture_scaling          = tr("Force all texture transfer, scaling and conversion operations on the GPU.\nMay cause texture corruption in some cases.");
 		const QString strict_texture_flushing      = tr("Forces texture flushing even in situations where it is not necessary/correct. Known to cause visual artifacts, but useful for debugging certain texture cache issues.");
-		const QString stereo_render_mode           = tr("Sets the 3D stereo rendering mode (only available in custom configurations with a default resolution of 720p).\nAnaglyph uses different colors for each eye, which can then be filtered with certain glasses.\nSide-by-Side is more commonly supported by VR viewer apps.\nOver-Under is closer to the native stereo output, but less commonly supported.");
+		const QString disable_native_fp16          = tr("Disables hardware half-float support which is known to cause problems in some rare cases on some GPUs.");
+		const QString enable_3d                    = tr("Enables 3D stereo rendering.\nNote that only anaglyph viewing is supported at the moment.");
 		const QString accurate_ppu_128_loop        = tr("When enabled, PPU atomic operations will operate on entire cache line data, as opposed to a single 64bit block of memory when disabled.\nNumerical values control whether or not to enable the accurate version based on the atomic operation's length.");
 		const QString enable_performance_report    = tr("Measure certain events and print a chart after the emulator is stopped. Don't enable if not asked to.");
 		const QString num_ppu_threads              = tr("Affects maximum amount of PPU threads running concurrently, the value of 1 has very low compatibility with games.\n2 is the default, if unsure do not modify this setting.");
+		const QString ppu_llvm_java_mode_handling  = tr("Respect current Java Mode for alti-vec ops by PPU LLVM.\nIf unsure do not modify this setting.");
 
 		// emulator
 
 		const QString exit_on_stop                 = tr("Automatically close RPCS3 when closing a game, or when a game closes itself.");
-		const QString pause_on_focus_loss          = tr("Automatically pause emulation when RPCS3 loses its focus or the application is inactive in order to save power and reduce CPU usage.\nDo note that emulation pausing in general is not perfect and may not be compatible with all games.\nAlthough it currently also pauses gameplay, it is not recommended to rely on it as this behavior may be changed in the future and it is not the purpose of this setting.");
-		const QString start_game_fullscreen        = tr("Automatically puts the game window in fullscreen.\nDouble click on the game window or press Alt+Enter to toggle fullscreen and windowed mode.");
+		const QString start_on_boot                = tr("Leave this enabled unless you are a developer.");
+		const QString start_game_fullscreen        = tr("Automatically puts the game window in fullscreen.\nDouble click on the game window or press alt+enter to toggle fullscreen and windowed mode.");
 		const QString prevent_display_sleep        = tr("Prevent the display from sleeping while a game is running.\nThis requires the org.freedesktop.ScreenSaver D-Bus service on Linux.\nThis option will be disabled if the current platform does not support display sleep control.");
 		const QString game_window_title_format     = tr("Configure the game window title.\nChanging this and/or adding the framerate may cause buggy or outdated recording software to not notice RPCS3.");
 		const QString resize_on_boot               = tr("Automatically resizes the game window on boot.\nThis does not change the internal game resolution.");
 		const QString show_trophy_popups           = tr("Show trophy pop-ups when a trophy is unlocked.");
-		const QString show_rpcn_popups             = tr("Show RPCN friend list pop-ups.");
 		const QString disable_mouse                = tr("Disables the activation of fullscreen mode per double-click while the game screen is active.\nCheck this if you want to play with mouse and keyboard (for example with UCR).");
-		const QString disable_kb_hotkeys           = tr("Disables keyboard hotkeys such as Ctrl+S, Ctrl+E, Ctrl+R, Ctrl+P while the game screen is active.\nThis does not include Ctrl+L (hide and lock mouse) and Alt+Enter (toggle fullscreen).\nCheck this if you want to play with mouse and keyboard.");
+		const QString disable_kb_hotkeys           = tr("Disables keyboard hotkeys such as Ctrl-S, Ctrl-E, Ctrl-R, Ctrl-P while the game screen is active.\nThis does not include Ctrl-L (hide and lock mouse) and Alt-Enter (toggle fullscreen).\nCheck this if you want to play with mouse and keyboard.");
 		const QString max_llvm_threads             = tr("Limits the maximum number of threads used for the initial PPU and SPU module compilation.\nLower this in order to increase performance of other open applications.\nThe default uses all available threads.");
 		const QString show_mouse_in_fullscreen     = tr("Shows the mouse cursor when the fullscreen mode is active.\nCurrently this may not work every time.");
-		const QString lock_mouse_in_fullscreen     = tr("Locks the mouse cursor to the center when the fullscreen mode is active.");
+		const QString lock_mouse_in_fullscreen     = tr("Locks the mouse cursor at center when the fullscreen mode is active.");
 		const QString hide_mouse_on_idle           = tr("Hides the mouse cursor if no mouse movement is detected for the configured time.");
 		const QString show_shader_compilation_hint = tr("Shows 'Compiling shaders' hint using the native overlay.");
-		const QString show_ppu_compilation_hint    = tr("Shows 'Compiling PPU modules' hint using the native overlay.");
-		const QString show_autosave_autoload_hint  = tr("Shows autosave/autoload hint using the native overlay.");
-		const QString show_pressure_intensity_toggle_hint = tr("Shows pressure intensity toggle hint using the native overlay.");
-		const QString show_analog_limiter_toggle_hint = tr("Shows analog limiter toggle hint using the native overlay.");
-		const QString show_mouse_and_keyboard_toggle_hint = tr("Shows mouse and keyboard toggle hint using the native overlay.");
 		const QString use_native_interface         = tr("Enables use of native HUD within the game window that can interact with game controllers.\nWhen disabled, regular Qt dialogs are used instead.\nCurrently, the on-screen keyboard only supports the English key layout.");
-		const QString pause_during_home_menu       = tr("When enabled, opening the home menu will also pause emulation.\nWhile most games pause themselves while the home menu is shown, some do not.\nIn that case it can be helpful to pause the emulation whenever the home menu is open.");
 
 		const QString perf_overlay_enabled                 = tr("Enables or disables the performance overlay.");
 		const QString perf_overlay_framerate_graph_enabled = tr("Enables or disables the framerate graph.");
@@ -167,46 +137,43 @@ public:
 		const QString perf_overlay_center_x                = tr("Centers the performance overlay horizontally and overrides the horizontal margin.");
 		const QString perf_overlay_center_y                = tr("Centers the performance overlay vertically and overrides the vertical margin.");
 
-		const QString shader_load_bg_enabled   = tr("Shows a background image during the native shader loading dialog/loading screen.\nBy default the used image will be <gamedir>/PS3_GAME/PIC1.PNG.");
+		const QString shader_load_bg_enabled   = tr("Shows a background image during the native shader loading dialog/loading screen.\nBy default the used image will be <gamedir>/PS3_GAME/PIC1.PNG or <gamedir>/PS3_GAME/PIC0.PNG.");
 		const QString shader_load_bg_darkening = tr("Changes the background image darkening effect strength of the native shader loading dialog.\nThis may be used to improve readability and/or aesthetics.");
 		const QString shader_load_bg_blur      = tr("Changes the background image blur effect strength of the native shader loading dialog.\nThis may be used to improve readability and/or aesthetics.");
 
 		// gpu
 
 		const QString renderer                   = tr("Vulkan is the fastest renderer. OpenGL is the most accurate renderer.\nIf unsure, use Vulkan. Should you have any compatibility issues, fall back to OpenGL.");
-		const QString resolution                 = tr("This setting will be ignored if the Resolution Scale is set to anything other than 100%!\nLeave this on 1280x720. Every PS3 game is compatible with this resolution.\nOnly use 1920x1080 if the game supports it.\nRarely due to emulation bugs some games will only render at low resolutions like 480p.");
+		const QString resolution                 = tr("This setting will be ignored if the Resolution Scale is set to anything other than 100%!\nLeave this on 1280x720, every PS3 game is compatible with this resolution.\nOnly use 1920x1080 if the game supports it.\nRarely due to emulation bugs some games will only render at low resolutions like 480p.");
 		const QString graphics_adapter           = tr("On multi GPU systems select which GPU to use in RPCS3 when using Vulkan.\nThis is not needed when using OpenGL.");
 		const QString aspect_ratio               = tr("Leave this on 16:9 unless you have a 4:3 monitor.");
-		const QString frame_limit                = tr("Off is the fastest option.\nUsing the frame limiter will add extra overhead and slow down the game. However, some games will crash if the framerate is too high.\nPS3 native should only be used if Auto is not working correctly as it can introduce frame-pacing issues.\nInfinite adds a positive feedback loop which adds another vblank signal per frame allowing more games to be fps limitless.\nExperienced users with need of other frame limits should use the setting \"Second Frame Limit\" in the configuration file.");
+		const QString frame_limit                = tr("Off is the best option as it performs faster.\nUsing the frame limiter will add extra overhead and slow down the game.\nHowever, some games will crash if the frame rate is too high.\nIf that happens, set value to anything other than Off.");
 		const QString anti_aliasing              = tr("Emulate PS3 multisampling layout.\nCan fix some otherwise difficult to solve graphics glitches.\nLow to moderate performance hit depending on your GPU hardware.");
-		const QString anisotropic_filter         = tr("Higher values increase sharpness of textures on sloped surfaces at the cost of GPU resources.\nModern GPUs can handle this setting just fine, even at 16x.\nKeep this on Automatic if you want to use the original setting used by a real PS3.");
-		const QString resolution_scale           = tr("Scales the game's resolution by the given percentage.\nThe base resolution is always 1280x720.\nSet this value to 100% if you want to use the normal Resolution options.\nValues below 100% will usually not improve performance.");
+		const QString anisotropic_filter         = tr("Higher values increase sharpness of textures on sloped surfaces at the cost of GPU resources.\nModern GPUs can handle this setting just fine even at 16x.\nKeep this on Automatic if you want to use the original setting used by a real PS3.");
+		const QString resolution_scale           = tr("Scales the game's resolution by the given percentage.\nThe base resolution is always 1280x720.\nSet this value to 100% if you want to use the normal Resolution options.");
 		const QString minimum_scalable_dimension = tr("Only framebuffers greater than this size will be upscaled.\nIncreasing this value might fix problems with missing graphics when upscaling, especially when Write Color Buffers is enabled.\nIf unsure, don't change this option.");
 		const QString dump_color                 = tr("Enable this option if you get missing graphics or broken lighting ingame.\nMight degrade performance and introduce stuttering in some cases.\nRequired for Demon's Souls.");
-		const QString vsync                      = tr("By having this off you might obtain a higher framerate at the cost of tearing artifacts in the game.");
+		const QString vsync                      = tr("By having this off you might obtain a higher frame rate at the cost of tearing artifacts in the game.");
 		const QString strict_rendering_mode      = tr("Enforces strict compliance to the API specification.\nMight result in degraded performance in some games.\nCan resolve rare cases of missing graphics and flickering.\nIf unsure, don't use this option.");
+		const QString disable_vertex_cache       = tr("Disables the vertex cache.\nMight resolve missing or flickering graphics output.\nMay degrade performance.");
 		const QString stretch_to_display_area    = tr("Overrides the aspect ratio and stretches the image to the full display area.");
-		const QString multithreaded_rsx          = tr("Offloads some RSX operations to a secondary thread.\nImproves performance for high-core processors.\nMay cause slowdown in weaker CPUs due to the extra worker thread load.");
+		const QString multithreaded_rsx          = tr("Offloads some RSX operations to a secondary thread.\nMay improve performance for some high-core processors.\nMay cause slowdown in some situations due to the extra worker thread load.");
 
 		const QString legacy_shader_recompiler        = tr("Disables asynchronous shader compilation.\nFixes missing graphics while shaders are compiling but introduces severe stuttering or lag.\nUse this if you do not want to deal with graphics pop-in, or for testing before filing any bug reports.");
 		const QString async_shader_recompiler         = tr("This is the recommended option.\nIf a shader is not found in the cache, nothing will be rendered for this shader until it has compiled.\nYou may experience graphics pop-in.");
 		const QString async_with_shader_interpreter   = tr("Hybrid rendering mode.\nIf a shader is not found in the cache, the interpreter will be used to render approximated graphics for this shader until it has compiled.");
 		const QString shader_interpreter_only         = tr("All rendering is handled by the interpreter with no attempt to compile native shaders.\nThis mode is very slow and experimental.");
 		const QString shader_compiler_threads         = tr("Number of threads to use for the shader compiler backend.\nOnly has an impact when shader mode is set to one of the asynchronous modes.");
-		const QString shader_precision                = tr("Controls the precision level of generated shaders. Low precision generates much faster code depending on the hardware, but can sometimes generate minor visual glitches or flicker.");
 
-		const QString async_texture_streaming   = tr("Stream textures to GPU in parallel with 3D rendering using asynchronous compute.\nCan improve performance on more powerful GPUs that have spare headroom.\nOnly works with Vulkan renderer and greatly benefits from having MTRSX enabled if you have a capable CPU.");
-		const QString exclusive_fullscreen_mode = tr("Controls which fullscreen mode RPCS3 requests from drivers when using Vulkan renderer.\nAutomatic will let the driver choose an appropriate mode, while the other options will hint the drivers on whether they should use exclusive or borderless fullscreen.\nUsing Prefer borderless fullscreen option can help if you have issues with streaming RPCS3 gameplay or if your system incorrectly enables HDR mode when using fullscreen.");
+		const QString async_texture_streaming         = tr("Stream textures to GPU in parallel with 3D rendering.\nCan improve performance on more powerful GPUs that have spare headroom.\nOnly works with Vulkan renderer.");
 
-		const QString output_scaling_mode = tr("Final image filtering. Nearest applies no filtering, Bilinear smooths the image, and FidelityFX Super Resolution enhances upscaled images.\nIf the game is rendering at an internal resolution lower than your window resolution, FidelityFX will handle the upscale.\nFidelityFX can cause visual artifacts.\nFidelityFX does not work with stereo 3D output for now.");
-		const QString fsr_rcas_strength   = tr("Control the sharpening strength applied by FidelityFX Super Resolution. Higher values will give sharper output but may introduce artifacts.");
-
-		const QString texture_lod_bias = tr("Changes Texture sampling accuracy. (Small changes have a big effect.)\nAvoid using values outside the range of -12 to +12 if you're unsure.\n-3 to +3 is plenty for most usecases");
+		const QString fsr_upscaling     = tr("Enable FidelityFX Super Resolution upscaling filter to improve the look of upscaled images.\nIf the game is rendering at an internal resolution lower than your window resolution, FidelityFX will handle the upscale.\nCan cause visual artifacts.\nDoes not work with stereo 3D output for now");
+		const QString fsr_rcas_strength = tr("Control the sharpening strength applied by FidelityFX Super Resolution. Higher values will give sharper output but may introduce artifacts.");
 
 		// gui
 
 		const QString log_limit          = tr("Sets the maximum amount of blocks that the log can display.\nThis usually equals the number of lines.\nSet 0 in order to remove the limit.");
-		const QString tty_limit          = tr("Sets the maximum amount of blocks that the TTY can display.\nThis usually equals the number of lines.\nSet 0 in order to remove the limit.");
+		const QString tty_limit          = tr("Sets the maximum amount of blocks that the tty can display.\nThis usually equals the number of lines.\nSet 0 in order to remove the limit.");
 		const QString stylesheets        = tr("Changes the overall look of RPCS3.\nChoose a stylesheet and click Apply to change between styles.");
 		const QString show_welcome       = tr("Shows the initial welcome screen upon starting RPCS3.");
 		const QString show_exit_game     = tr("Shows a confirmation dialog when the game window is being closed.");
@@ -215,46 +182,28 @@ public:
 		const QString show_pup_install   = tr("Shows a dialog when firmware was installed successfully.");
 		const QString show_obsolete_cfg  = tr("Shows a dialog when obsolete settings were found.");
 		const QString show_same_buttons  = tr("Shows a dialog in the game pad configuration when the same button was assigned twice.");
-		const QString show_restart_hint  = tr("Shows a dialog when RPCS3 is ready to restart after an update.");
 		const QString check_update_start = tr("Checks if an update is available on startup and asks if you want to update.\nIf \"Automatic\" is selected, the update will run automatically without user confirmation.\nIf \"Background\" is selected, the check is done silently in the background and a new download option is shown in the top right corner of the menu if a new version was found.");
 		const QString use_rich_presence  = tr("Enables use of Discord Rich Presence to show what game you are playing on Discord.\nRequires a restart of RPCS3 to completely close the connection.");
 		const QString discord_state      = tr("Tell your friends what you are doing.");
 		const QString custom_colors      = tr("Prioritize custom user interface colors over properties set in stylesheet.");
-		const QString uuid               = tr("This is the ID used for hardware statistics.\nIt should only be reset if you change your hardware configuration or if you copied RPCS3 to another PC.");
-		const QString pad_navigation     = tr("Use the game pad that is configured for player 1 to navigate in the GUI.");
-		const QString global_navigation  = tr("Keep control over pad navigation if RPCS3 is not the active window.");
 
 		// input
 
-		const QString pad_mode          = tr("Single-threaded: All pad handlers run on the same thread sequentially.\nMulti-threaded: Each pad handler has its own thread.\nOnly use multi-threaded if you can spare the extra threads.");
-		const QString pad_connection    = tr("Shows all configured pads as always connected ingame even if they are physically disconnected.");
+		const QString pad_handler       = tr("If you want to use the keyboard to control, select the Keyboard option.\nIf you have a DualShock 4, select DualShock 4.\nIf you have an Xbox controller, or another compatible device, use XInput.\nOlder controllers such as PS2 controllers with an adapter usually work fine with MMJoystick.\nCheck button mappings in the Windows control panel.");
+		const QString pad_handler_linux = tr("If you want to use the keyboard to control, select the Keyboard option.\nIf you have a DualShock 4, select DualShock 4.");
 		const QString keyboard_handler  = tr("Some games support native keyboard input.\nBasic will work in these cases.");
-		const QString mouse_handler     = tr("Some games support native mouse input.\nBasic or Raw will work in these cases.");
-		const QString music_handler     = tr("Currently only used for cellMusic emulation.\nSelect Qt to use the default output device of your operating system.\nThis may not be able to play all audio formats.");
-		const QString camera            = tr("Select Qt Camera to use the default camera device of your operating system.");
-		const QString camera_type       = tr("Depending on the game, you may need to select a specific camera type.");
-		const QString camera_flip       = tr("Flips the camera image either horizontally, vertically, or on both axes.");
-		const QString camera_id         = tr("Select the camera that you want to use during gameplay.");
-		const QString move              = tr("PlayStation Move support.\nFake: Experimental! This maps Move controls to DS3 controller mappings.\nMouse: Emulate PSMove with Mouse handler.\nRaw Mouse: Emulate PSMove with Raw Mouse handler.");
+		const QString mouse_handler     = tr("Some games support native mouse input.\nBasic will work in these cases.");
+		const QString camera            = tr("Camera support is not implemented, leave this on null.");
+		const QString camera_type       = tr("Camera support is not implemented, leave this on unknown.");
+		const QString move              = tr("PlayStation Move support.\nFake: Experimental! This maps Move controls to DS3 controller mappings.\nMouse: Emulate PSMove with Mouse handler.");
 		const QString buzz              = tr("Buzz! support.\nSelect 1 or 2 controllers if the game requires Buzz! controllers and you don't have real controllers.\nSelect Null if the game has support for DualShock or if you have real Buzz! controllers.");
-		const QString turntable         = tr("DJ Hero Turntable controller support.\nSelect 1 or 2 controllers if the game requires DJ Hero Turntable controllers and you don't have real turntable controllers.\nSelect Null if the game has support for DualShock or if you have real turntable controllers.\nA real turntable controller can be used at the same time as an emulated turntable controller.");
-		const QString ghltar            = tr("Guitar Hero Live (GHL) Guitar controller support.\nSelect 1 or 2 controllers if the game requires GHL Guitar controllers and you don't have real guitar controllers.\nSelect Null if the game has support for DualShock or if you have real guitar controllers.\nA real guitar controller can be used at the same time as an emulated guitar controller.");
-		const QString background_input  = tr("Allows pad and keyboard input while the game window is unfocused.");
-		const QString show_move_cursor  = tr("Shows the raw position of the PS Move input.\nThis can be very helpful during calibration screens.");
-		const QString midi_devices      = tr("Select up to 3 emulated MIDI devices and their types.");
-		const QString sdl_mappings      = tr("Loads the SDL GameController database for improved gamepad compatibility. Only used in the SDL pad handler.");
-
-		const QString lock_overlay_input_to_player_one  = tr("Locks the native overlay input to the first player.");
 
 		// network
 
 		const QString net_status    = tr("If set to Connected, RPCS3 will allow programs to use your internet connection.");
-		const QString psn_status    = tr("If set to RPCN, RPCS3 will use the RPCN server as PSN connection if the game is supported.\nIf set to Simulated, RPCS3 will try to fake the PSN connection, but any actual attempt at using the PSN functionality may result in errors or crashes.\nSimulated is only available in custom configurations.");
+		const QString psn_status    = tr("If set to Simulated, RPCS3 will fake PSN connection as best as it can.");
 		const QString dns           = tr("DNS used to resolve hostnames by applications.");
-		const QString dns_swap      = tr("DNS Swap List.\nOnly available in custom configurations.");
-		const QString bind          = tr("Interface IP Address to bind to.\nOnly available in custom configurations.");
-		const QString enable_upnp   = tr("Enable UPNP.\nThis will automatically forward ports bound on 0.0.0.0 if your router has UPNP enabled.");
-		const QString psn_country   = tr("Changes the RPCN country.");
+		const QString dns_swap      = tr("DNS Swap List.");
 
 		// system
 
@@ -262,10 +211,9 @@ public:
 		const QString system_language         = tr("Some games may fail to boot if the system language is not available in the game itself.\nOther games will switch language automatically to what is selected here.\nIt is recommended leaving this on a language supported by the game.");
 		const QString keyboard_type           = tr("Sets the used keyboard layout.\nCurrently only US, Japanese and German layouts are fully supported at this moment.");
 		const QString enter_button_assignment = tr("The button used for enter/accept/confirm in system dialogs.\nChange this to use the Circle button instead, which is the default configuration on Japanese systems and in many Japanese games.\nIn these cases having the cross button assigned can often lead to confusion.");
-		const QString enable_host_root        = tr("Required for some Homebrew.\nIf unsure, do not use this option.");
-		const QString empty_hdd0_tmp          = tr("Required for some Homebrew or Game Mods.\nIf unsure, do not use this option");
+		const QString enable_host_root        = tr("Required for some Homebrew.\nIf unsure, don't use this option.");
 		const QString limit_cache_size        = tr("Automatically removes older files from disk cache on boot if it grows larger than the specified value.\nGames can use the cache folder to temporarily store data outside of system memory. It is not used for long-term storage.\n\nThis setting is only available in the global configuration.");
-		const QString console_time_offset     = tr("Sets the time to be used within the console. This will be applied as an offset that tracks wall clock time.\nCan be reset to current wall clock time by clicking \"Set to Now\".");
+		const QString console_time_offset     = tr("Sets the time to be used within the console. This will be applied as an offset that tracks wall clock time.\nCan be reset to current wallclock time by clicking \"Set to Now\".");
 	} settings;
 
 	const struct gamepad_settings
@@ -273,38 +221,29 @@ public:
 		const QString null        = tr("This controller is disabled and will appear as disconnected to software. Choose another handler to enable it.");
 		const QString ldd_pad     = tr("This port is currently assigned to a custom controller by the application and can't be changed.");
 		const QString keyboard    = tr("While it is possible to use a keyboard as a pad in RPCS3, the use of an actual controller is strongly recommended.<br>To bind mouse movement to a button or joystick, click on the desired button to activate it, then click and hold while dragging the mouse to a direction.");
-		const QString ds3_windows = tr("In order to use the DualShock 3 handler, you need to install the official DualShock 3 driver first.<br>See the <a %0 href=\"https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration\">RPCS3 Wiki</a> for instructions.").arg(gui::utils::get_link_style());
-		const QString ds3_linux   = tr("In order to use the DualShock 3 handler, you might need to add udev rules to let RPCS3 access the controller.<br>See the <a %0 href=\"https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration\">RPCS3 Wiki</a> for instructions.").arg(gui::utils::get_link_style());
+		const QString ds3_windows = tr("In order to use the DualShock 3 handler, you need to install the official DualShock 3 driver first.<br>See the <a href=\"https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration\">RPCS3 Wiki</a> for instructions.");
+		const QString ds3_linux   = tr("In order to use the DualShock 3 handler, you might need to add udev rules to let RPCS3 access the controller.<br>See the <a href=\"https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration\">RPCS3 Wiki</a> for instructions.");
 		const QString ds3_other   = tr("The DualShock 3 handler is recommended for official DualShock 3 controllers.");
 		const QString ds4_windows = tr("If you have any issues with the DualShock 4 handler, it might be caused by third-party tools such as DS4Windows. It's recommended that you disable them while using this handler.");
-		const QString ds4_linux   = tr("In order to use the DualShock 4 handler, you might need to add udev rules to let RPCS3 access the controller.<br>See the <a %0 href=\"https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration\">RPCS3 Wiki</a> for instructions.").arg(gui::utils::get_link_style());
+		const QString ds4_linux   = tr("In order to use the DualShock 4 handler, you might need to add udev rules to let RPCS3 access the controller.<br>See the <a href=\"https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration\">RPCS3 Wiki</a> for instructions.");
 		const QString ds4_other   = tr("The DualShock 4 handler is recommended for official DualShock 4 controllers.");
 		const QString dualsense_windows = tr("The DualSense handler is recommended for official DualSense controllers.");
 		const QString dualsense_linux   = tr("The DualSense handler is recommended for official DualSense controllers.");
 		const QString dualsense_other   = tr("The DualSense handler is recommended for official DualSense controllers.");
-		const QString skateboard  = tr("The Skateboard handler is recommended for official RIDE skateboard controllers.");
-		const QString move        = tr("The PS Move handler is recommended for official PS Move controllers.");
-		const QString xinput      = tr("The XInput handler will work with Xbox controllers and many third-party PC-compatible controllers. Pressure sensitive buttons from SCP are supported when SCP's XInput1_3.dll is placed in the main RPCS3 directory. For more details, see the <a %0 href=\"https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration\">RPCS3 Wiki</a>.").arg(gui::utils::get_link_style());
-		const QString evdev       = tr("The evdev handler should work with any controller that has Linux support.<br>If your joystick is not being centered properly, read the <a %0 href=\"https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration\">RPCS3 Wiki</a> for instructions.").arg(gui::utils::get_link_style());
+		const QString xinput      = tr("The XInput handler will work with Xbox controllers and many third-party PC-compatible controllers. Pressure sensitive buttons from SCP are supported when SCP's XInput1_3.dll is placed in the main RPCS3 directory. For more details, see the <a href=\"https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration\">RPCS3 Wiki</a>.");
+		const QString evdev       = tr("The evdev handler should work with any controller that has linux support.<br>If your joystick is not being centered properly, read the <a href=\"https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration\">RPCS3 Wiki</a> for instructions.");
 		const QString mmjoy       = tr("The MMJoystick handler should work with almost any controller recognized by Windows. However, it is recommended that you use the more specific handlers if you have a controller that supports them.");
-		const QString sdl         = tr("The SDL handler supports a variety of controllers across different platforms.");
 
-		const QString orientation_reset  = tr("Resets the sensor orientation when pressed.<br>Toggle the checkbox to enable or disable the orientation feature.<br>Currently only used for PS Move interactions.");
-		const QString analog_limiter     = tr("Applies the stick multipliers while this special button is pressed.<br>Enable \"Toggle\" if you want to toggle the analog limiter on button press instead.");
-		const QString pressure_intensity = tr("Controls the intensity of pressure sensitive buttons while this special button is pressed.<br>Enable \"Toggle\" if you want to toggle the intensity on button press instead.<br>Use the percentage to change how hard you want to press a button.");
-		const QString pressure_deadzone  = tr("Controls the deadzone of pressure sensitive buttons. It determines how far the button has to be pressed until it is recognized by the game. The resulting range will be projected onto the full button sensitivity range.");
+		const QString pressure_intensity = tr("Controls the intensity of pressure sensitive buttons while this special button is pressed.<br>Use the percentage to change how hard you want to press a button.");
 		const QString squircle_factor    = tr("The actual DualShock 3's stick range is not circular but formed like a rounded square (or squircle) which represents the maximum range of the emulated sticks. You can use the squircle values to modify the stick input if your sticks can't reach the corners of that range. A value of 0 does not apply any so called squircling. A value of 8000 is usually recommended.");
 		const QString stick_multiplier   = tr("The stick multipliers can be used to change the sensitivity of your stick movements.<br>The default setting is 1 and represents normal input.");
-		const QString stick_deadzones    = tr("A stick's deadzone determines how far the stick has to be moved until it is fully recognized by the game. The resulting range will be projected onto the full input range in order to give you a smooth experience. Movement inside the deadzone is simulated using the anti-deadzone slider (default is 13%), so don't worry if there is still movement shown in the emulated stick preview.");
+		const QString stick_deadzones    = tr("A stick's deadzone determines how far the stick has to be moved until it is fully recognized by the game. The resulting range will be projected onto the full input range in order to give you a smooth experience. Movement inside the deadzone is actually simulated as a real DualShock 3's deadzone of ~13%, so don't worry if there is still movement shown in the emulated stick preview.");
 		const QString vibration          = tr("The PS3 activates two motors (large and small) to handle controller vibrations.<br>You can enable, disable or even switch these signals for the currently selected pad here.");
-		const QString motion_controls    = tr("Use this to configure the gamepad motion controls.");
 		const QString emulated_preview   = tr("The emulated stick values (red dots) in the stick preview represent the actual stick positions as they will be visible to the game. The actual DualShock 3's stick range is not circular but formed like a rounded square (or squircle) which represents the maximum range of the emulated sticks. The blue regular dots represent the raw stick values (including stick multipliers) before they are converted for ingame usage.");
 		const QString trigger_deadzones  = tr("A trigger's deadzone determines how far the trigger has to be moved until it is recognized by the game. The resulting range will be projected onto the full input range in order to give you a smooth experience.");
-		const QString stick_lerp         = tr("With keyboards, you are inevitably restricted to 8 stick directions (4 straight + 4 diagonal). Furthermore, the stick will jump to the maximum value of the chosen direction immediately when a key is pressed. The stick interpolation can be used to work-around both of these issues by smoothening out these directional changes. The lower the value, the longer you have to press or release a key until the maximum amplitude is reached.");
-		const QString mouse_deadzones    = tr("The mouse deadzones represent the games' own deadzones on the x and y axes. Games usually enforce their own deadzones to filter out small unwanted stick movements. In consequence, mouse input feels unintuitive since it relies on immediate responsiveness. You can change these values temporarily during gameplay in order to find out the optimal values for your game (Alt+T and Alt+Y for x, Alt+U and Alt+I for y).");
+		const QString stick_lerp         = tr("With keyboards you are inevitably restricted to 8 stick directions (4 straight + 4 diagonal). Furthermore when a key is pressed the stick will jump to the maximum value of the chosen direction immediately. The stick interpolation can be used to work-around both of these issues by smoothening out these directional changes. The lower the value, the longer you have to press or release a key until the maximum amplitude is reached.");
+		const QString mouse_deadzones    = tr("The mouse deadzones represent the games' own deadzones on the x and y axes. Games usually enforce their own deadzones to filter out small unwanted stick movements. In consequence mouse input feels unintuitive since it relies on immediate responsiveness. You can change these values temporarily during gameplay in order to find out the optimal values for your game (Alt+T and Alt+Y for x, Alt+U and Alt+I for y).");
 		const QString mouse_acceleration = tr("The mouse acceleration can be used to amplify your mouse movements on the x and y axes. Increase these values if your mouse movements feel too slow while playing a game. You can change these values temporarily during gameplay in order to find out the optimal values (Alt+G and Alt+H for x, Alt+J and Alt+K for y). Keep in mind that modern mice usually provide different modes and settings that can be used to change mouse movement speeds as well.");
-		const QString mouse_movement     = tr("The mouse movement mode determines how the mouse movement is translated to pad input.<br>Use the relative mode for traditional mouse movement.<br>Use the absolute mode to use the mouse's distance to the center of the screen as input value.");
-		const QString button_assignment  = tr("Left-click: remap this button.<br>Shift + Left-click: add an additional button mapping.<br>Alt + Left-click: differentiate between trigger press and release (only XInput for now).<br>Right-click: clear this button mapping.");
 
 	} gamepad_settings;
 };
diff --git a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp
index 709875a22b..1db004cea8 100644
--- a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp
+++ b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp
@@ -1,13 +1,9 @@
-#include "stdafx.h"
 #include "trophy_manager_dialog.h"
 #include "custom_table_widget_item.h"
-#include "game_list_delegate.h"
+#include "table_item_delegate.h"
 #include "qt_utils.h"
 #include "game_list.h"
-#include "gui_application.h"
 #include "gui_settings.h"
-#include "progress_dialog.h"
-#include "persistent_settings.h"
 
 #include "util/logs.hpp"
 #include "Utilities/StrUtil.h"
@@ -16,10 +12,9 @@
 #include "Emu/System.h"
 #include "Emu/system_utils.hpp"
 #include "Emu/Cell/Modules/sceNpTrophy.h"
-#include "Emu/Cell/Modules/cellRtc.h"
 
-#include <QApplication>
-#include <QClipboard>
+#include "Loader/TROPUSR.h"
+
 #include <QtConcurrent>
 #include <QFutureWatcher>
 #include <QHeaderView>
@@ -30,20 +25,20 @@
 #include <QDir>
 #include <QMenu>
 #include <QDesktopServices>
+#include <QUrl>
 #include <QScrollBar>
 #include <QWheelEvent>
+#include <QProgressDialog>
 #include <QGuiApplication>
 #include <QScreen>
-#include <QTimeZone>
 
 LOG_CHANNEL(gui_log, "GUI");
 
-enum GameUserRole
+namespace
 {
-	GameIndex = Qt::UserRole,
-	GamePixmapLoaded,
-	GamePixmap
-};
+	constexpr auto qstr = QString::fromStdString;
+	inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); }
+}
 
 trophy_manager_dialog::trophy_manager_dialog(std::shared_ptr<gui_settings> gui_settings)
 	: QWidget()
@@ -65,7 +60,7 @@ trophy_manager_dialog::trophy_manager_dialog(std::shared_ptr<gui_settings> gui_s
 	m_show_gold_trophies     = m_gui_settings->GetValue(gui::tr_show_gold).toBool();
 	m_show_platinum_trophies = m_gui_settings->GetValue(gui::tr_show_platinum).toBool();
 
-	// Make sure the directory is mounted
+	// HACK: dev_hdd0 must be mounted for vfs to work for loading trophies.
 	vfs::mount("/dev_hdd0", rpcs3::utils::get_hdd0_dir());
 
 	// Get the currently selected user's trophy path.
@@ -87,30 +82,19 @@ trophy_manager_dialog::trophy_manager_dialog(std::shared_ptr<gui_settings> gui_s
 	m_game_table->verticalScrollBar()->installEventFilter(this);
 	m_game_table->verticalScrollBar()->setSingleStep(20);
 	m_game_table->horizontalScrollBar()->setSingleStep(20);
-	m_game_table->setItemDelegate(new game_list_delegate(m_game_table));
+	m_game_table->setItemDelegate(new table_item_delegate(this, true));
 	m_game_table->setSelectionBehavior(QAbstractItemView::SelectRows);
 	m_game_table->setSelectionMode(QAbstractItemView::SingleSelection);
 	m_game_table->setEditTriggers(QAbstractItemView::NoEditTriggers);
-	m_game_table->setColumnCount(static_cast<int>(gui::trophy_game_list_columns::count));
+	m_game_table->setColumnCount(GameColumns::GameColumnsCount);
+	m_game_table->setHorizontalHeaderLabels(QStringList{ tr("Icon"), tr("Game"), tr("Progress") });
 	m_game_table->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
 	m_game_table->horizontalHeader()->setStretchLastSection(true);
 	m_game_table->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
-	m_game_table->setContextMenuPolicy(Qt::CustomContextMenu);
 	m_game_table->verticalHeader()->setVisible(false);
 	m_game_table->setAlternatingRowColors(true);
 	m_game_table->installEventFilter(this);
 
-	auto add_game_column = [this](gui::trophy_game_list_columns col, const QString& header_text, const QString& action_text)
-	{
-		m_game_table->setHorizontalHeaderItem(static_cast<int>(col), new QTableWidgetItem(header_text));
-		m_game_column_acts.append(new QAction(action_text, this));
-	};
-
-	add_game_column(gui::trophy_game_list_columns::icon,     tr("Icon"),     tr("Show Icons"));
-	add_game_column(gui::trophy_game_list_columns::name,     tr("Game"),     tr("Show Games"));
-	add_game_column(gui::trophy_game_list_columns::progress, tr("Progress"), tr("Show Progress"));
-	add_game_column(gui::trophy_game_list_columns::trophies, tr("Trophies"), tr("Show Trophies"));
-
 	// Trophy Table
 	m_trophy_table = new game_list();
 	m_trophy_table->setObjectName("trophy_manager_trophy_table");
@@ -120,34 +104,19 @@ trophy_manager_dialog::trophy_manager_dialog(std::shared_ptr<gui_settings> gui_s
 	m_trophy_table->verticalScrollBar()->installEventFilter(this);
 	m_trophy_table->verticalScrollBar()->setSingleStep(20);
 	m_trophy_table->horizontalScrollBar()->setSingleStep(20);
-	m_trophy_table->setItemDelegate(new game_list_delegate(m_trophy_table));
+	m_trophy_table->setItemDelegate(new table_item_delegate(this, true));
 	m_trophy_table->setSelectionBehavior(QAbstractItemView::SelectRows);
 	m_trophy_table->setEditTriggers(QAbstractItemView::NoEditTriggers);
-	m_trophy_table->setColumnCount(static_cast<int>(gui::trophy_list_columns::count));
+	m_trophy_table->setColumnCount(TrophyColumns::Count);
+	m_trophy_table->setHorizontalHeaderLabels(QStringList{ tr("Icon"), tr("Name"), tr("Description"), tr("Type"), tr("Status"), tr("ID"), tr("Platinum Relevant") });
 	m_trophy_table->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
 	m_trophy_table->horizontalHeader()->setStretchLastSection(true);
-	m_trophy_table->horizontalHeader()->setSectionResizeMode(static_cast<int>(gui::trophy_list_columns::icon), QHeaderView::Fixed);
 	m_trophy_table->verticalHeader()->setVisible(false);
 	m_trophy_table->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
 	m_trophy_table->setContextMenuPolicy(Qt::CustomContextMenu);
 	m_trophy_table->setAlternatingRowColors(true);
 	m_trophy_table->installEventFilter(this);
 
-	auto add_trophy_column = [this](gui::trophy_list_columns col, const QString& header_text, const QString& action_text)
-	{
-		m_trophy_table->setHorizontalHeaderItem(static_cast<int>(col), new QTableWidgetItem(header_text));
-		m_trophy_column_acts.append(new QAction(action_text, this));
-	};
-
-	add_trophy_column(gui::trophy_list_columns::icon,          tr("Icon"),              tr("Show Icons"));
-	add_trophy_column(gui::trophy_list_columns::name,          tr("Name"),              tr("Show Names"));
-	add_trophy_column(gui::trophy_list_columns::description,   tr("Description"),       tr("Show Descriptions"));
-	add_trophy_column(gui::trophy_list_columns::type,          tr("Type"),              tr("Show Types"));
-	add_trophy_column(gui::trophy_list_columns::is_unlocked,   tr("Status"),            tr("Show Status"));
-	add_trophy_column(gui::trophy_list_columns::id,            tr("ID"),                tr("Show IDs"));
-	add_trophy_column(gui::trophy_list_columns::platinum_link, tr("Platinum Relevant"), tr("Show Platinum Relevant"));
-	add_trophy_column(gui::trophy_list_columns::time_unlocked, tr("Time Unlocked"),     tr("Show Time Unlocked"));
-
 	m_splitter = new QSplitter();
 	m_splitter->addWidget(m_game_table);
 	m_splitter->addWidget(m_trophy_table);
@@ -347,7 +316,7 @@ trophy_manager_dialog::trophy_manager_dialog(std::shared_ptr<gui_settings> gui_s
 		m_gui_settings->SetValue(gui::tr_show_platinum, checked);
 	});
 
-	connect(m_trophy_table, &QTableWidget::customContextMenuRequested, this, &trophy_manager_dialog::ShowTrophyTableContextMenu);
+	connect(m_trophy_table, &QTableWidget::customContextMenuRequested, this, &trophy_manager_dialog::ShowContextMenu);
 
 	connect(m_game_combo, &QComboBox::currentTextChanged, this, [this]
 	{
@@ -355,15 +324,13 @@ trophy_manager_dialog::trophy_manager_dialog(std::shared_ptr<gui_settings> gui_s
 		ApplyFilter();
 	});
 
-	connect(m_game_table, &QTableWidget::customContextMenuRequested, this, &trophy_manager_dialog::ShowGameTableContextMenu);
-
 	connect(m_game_table, &QTableWidget::itemSelectionChanged, this, [this]
 	{
 		if (m_game_table->selectedItems().isEmpty())
 		{
 			return;
 		}
-		QTableWidgetItem* item = m_game_table->item(m_game_table->selectedItems().first()->row(), static_cast<int>(gui::trophy_game_list_columns::name));
+		QTableWidgetItem* item = m_game_table->item(m_game_table->selectedItems().first()->row(), GameColumns::GameName);
 		if (!item)
 		{
 			return;
@@ -371,30 +338,6 @@ trophy_manager_dialog::trophy_manager_dialog(std::shared_ptr<gui_settings> gui_s
 		m_game_combo->setCurrentText(item->text());
 	});
 
-	connect(this, &trophy_manager_dialog::TrophyIconReady, this, [this](int index, const QPixmap& pixmap)
-	{
-		if (QTableWidgetItem* icon_item = m_trophy_table->item(index, static_cast<int>(gui::trophy_list_columns::icon)))
-		{
-			icon_item->setData(Qt::DecorationRole, pixmap);
-		}
-	});
-
-	connect(this, &trophy_manager_dialog::GameIconReady, this, [this](int index, const QPixmap& pixmap)
-	{
-		if (QTableWidgetItem* icon_item = m_game_table->item(index, static_cast<int>(gui::trophy_game_list_columns::icon)))
-		{
-			icon_item->setData(Qt::DecorationRole, pixmap);
-		}
-	});
-
-	m_trophy_table->create_header_actions(m_trophy_column_acts,
-		[this](int col) { return m_gui_settings->GetTrophylistColVisibility(static_cast<gui::trophy_list_columns>(col)); },
-		[this](int col, bool visible) { m_gui_settings->SetTrophylistColVisibility(static_cast<gui::trophy_list_columns>(col), visible); });
-	
-	m_game_table->create_header_actions(m_game_column_acts,
-		[this](int col) { return m_gui_settings->GetTrophyGamelistColVisibility(static_cast<gui::trophy_game_list_columns>(col)); },
-		[this](int col, bool visible) { m_gui_settings->SetTrophyGamelistColVisibility(static_cast<gui::trophy_game_list_columns>(col), visible); });
-
 	RepaintUI(true);
 
 	StartTrophyLoadThreads();
@@ -402,28 +345,19 @@ trophy_manager_dialog::trophy_manager_dialog(std::shared_ptr<gui_settings> gui_s
 
 trophy_manager_dialog::~trophy_manager_dialog()
 {
-	WaitAndAbortGameRepaintThreads();
-	WaitAndAbortTrophyRepaintThreads();
 }
 
 bool trophy_manager_dialog::LoadTrophyFolderToDB(const std::string& trop_name)
 {
-	const std::string trophy_path = m_trophy_dir + trop_name;
-	const std::string vfs_path = vfs::get(trophy_path + "/");
-
-	if (vfs_path.empty())
-	{
-		gui_log.error("Failed to load trophy database for %s. Path empty!", trop_name);
-		return false;
-	}
+	const std::string trophyPath = m_trophy_dir + trop_name;
 
 	// Populate GameTrophiesData
 	std::unique_ptr<GameTrophiesData> game_trophy_data = std::make_unique<GameTrophiesData>();
 
-	game_trophy_data->path = vfs_path;
-	game_trophy_data->trop_usr = std::make_unique<TROPUSRLoader>();
-	const std::string tropusr_path = trophy_path + "/TROPUSR.DAT";
-	const std::string tropconf_path = trophy_path + "/TROPCONF.SFM";
+	game_trophy_data->path = vfs::get(trophyPath + "/");
+	game_trophy_data->trop_usr.reset(new TROPUSRLoader());
+	const std::string tropusr_path = trophyPath + "/TROPUSR.DAT";
+	const std::string tropconf_path = trophyPath + "/TROPCONF.SFM";
 	const bool success = game_trophy_data->trop_usr->Load(tropusr_path, tropconf_path).success;
 
 	fs::file config(vfs::get(tropconf_path));
@@ -445,24 +379,16 @@ bool trophy_manager_dialog::LoadTrophyFolderToDB(const std::string& trop_name)
 	for (u32 trophy_id = 0; trophy_id < trophy_count; ++trophy_id)
 	{
 		// A trophy icon has 3 digits from 000 to 999, for example TROP001.PNG
-		game_trophy_data->trophy_image_paths[trophy_id] = QString::fromStdString(fmt::format("%sTROP%03d.PNG", game_trophy_data->path, trophy_id));
+		game_trophy_data->trophy_image_paths[trophy_id] = qstr(fmt::format("%sTROP%03d.PNG", game_trophy_data->path, trophy_id));
 	}
 
 	// Get game name
-	pugi::xml_parse_result res = game_trophy_data->trop_config.Read(config.to_string());
-	if (!res)
-	{
-		gui_log.error("Failed to read trophy xml: %s", tropconf_path);
-		return false;
-	}
-
+	game_trophy_data->trop_config.Read(config.to_string());
 	std::shared_ptr<rXmlNode> trophy_base = game_trophy_data->trop_config.GetRoot();
-	if (!trophy_base)
+	if (trophy_base->GetChildren()->GetName() == "trophyconf")
 	{
-		gui_log.error("Failed to read trophy xml (root is null): %s", tropconf_path);
-		return false;
+		trophy_base = trophy_base->GetChildren();
 	}
-
 	for (std::shared_ptr<rXmlNode> n = trophy_base->GetChildren(); n; n = n->GetNext())
 	{
 		if (n->GetName() == "title-name")
@@ -489,7 +415,7 @@ void trophy_manager_dialog::RepaintUI(bool restore_layout)
 	}
 	else
 	{
-		m_game_icon_color = gui::utils::get_label_color("trophy_manager_icon_background_color", Qt::transparent, Qt::transparent);
+		m_game_icon_color = gui::utils::get_label_color("trophy_manager_icon_background_color");
 	}
 
 	PopulateGameTable();
@@ -512,6 +438,7 @@ void trophy_manager_dialog::RepaintUI(bool restore_layout)
 	if (restore_layout && !m_game_table->horizontalHeader()->restoreState(game_table_state) && m_game_table->rowCount())
 	{
 		// If no settings exist, resize to contents. (disabled)
+		//m_game_table->verticalHeader()->resizeSections(QHeaderView::ResizeMode::ResizeToContents);
 		//m_game_table->horizontalHeader()->resizeSections(QHeaderView::ResizeMode::ResizeToContents);
 	}
 
@@ -519,16 +446,10 @@ void trophy_manager_dialog::RepaintUI(bool restore_layout)
 	if (restore_layout && !m_trophy_table->horizontalHeader()->restoreState(trophy_table_state) && m_trophy_table->rowCount())
 	{
 		// If no settings exist, resize to contents. (disabled)
+		//m_trophy_table->verticalHeader()->resizeSections(QHeaderView::ResizeMode::ResizeToContents);
 		//m_trophy_table->horizontalHeader()->resizeSections(QHeaderView::ResizeMode::ResizeToContents);
 	}
 
-	if (restore_layout)
-	{
-		// Make sure the actions and the headers are synced
-		m_game_table->sync_header_actions(m_game_column_acts, [this](int col) { return m_gui_settings->GetTrophyGamelistColVisibility(static_cast<gui::trophy_game_list_columns>(col)); });
-		m_trophy_table->sync_header_actions(m_trophy_column_acts, [this](int col) { return m_gui_settings->GetTrophylistColVisibility(static_cast<gui::trophy_list_columns>(col)); });
-	}
-
 	ApplyFilter();
 
 	// Show dialog and then paint gui in order to adjust headers correctly
@@ -550,99 +471,59 @@ void trophy_manager_dialog::HandleRepaintUiRequest()
 	m_game_table->horizontalHeader()->restoreState(game_table_state);
 	m_trophy_table->horizontalHeader()->restoreState(trophy_table_state);
 
-	// Make sure the actions and the headers are synced
-	m_game_table->sync_header_actions(m_game_column_acts, [this](int col) { return m_gui_settings->GetTrophyGamelistColVisibility(static_cast<gui::trophy_game_list_columns>(col)); });
-	m_trophy_table->sync_header_actions(m_trophy_column_acts, [this](int col) { return m_gui_settings->GetTrophylistColVisibility(static_cast<gui::trophy_list_columns>(col)); });
-
 	resize(window_size);
 }
 
+QPixmap trophy_manager_dialog::GetResizedGameIcon(int index) const
+{
+	QTableWidgetItem* item = m_game_table->item(index, GameColumns::GameIcon);
+	if (!item)
+	{
+		return QPixmap();
+	}
+	const QPixmap icon = item->data(Qt::UserRole).value<QPixmap>();
+	const qreal dpr = devicePixelRatioF();
+
+	QPixmap new_icon = QPixmap(icon.size() * dpr);
+	new_icon.setDevicePixelRatio(dpr);
+	new_icon.fill(m_game_icon_color);
+
+	if (!icon.isNull())
+	{
+		QPainter painter(&new_icon);
+		painter.setRenderHint(QPainter::SmoothPixmapTransform);
+		painter.drawPixmap(QPoint(0, 0), icon);
+		painter.end();
+	}
+
+	return new_icon.scaled(m_game_icon_size * dpr, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation);
+}
+
 void trophy_manager_dialog::ResizeGameIcons()
 {
 	if (m_game_combo->count() <= 0)
 		return;
 
-	WaitAndAbortGameRepaintThreads();
-
-	QPixmap placeholder(m_game_icon_size);
-	placeholder.fill(Qt::transparent);
-
-	qRegisterMetaType<QVector<int>>("QVector<int>");
+	QList<int> indices;
 	for (int i = 0; i < m_game_table->rowCount(); ++i)
+		indices.append(i);
+
+	const std::function<QPixmap(const int&)> get_scaled = [this](const int& i)
 	{
-		if (QTableWidgetItem* icon_item = m_game_table->item(i, static_cast<int>(gui::trophy_game_list_columns::icon)))
-		{
-			icon_item->setData(Qt::DecorationRole, placeholder);
-		}
+		return GetResizedGameIcon(i);
+	};
+
+	// NOTE: Due to a Qt bug in Qt 5.15.2, QtConcurrent::blockingMapped has a high risk of deadlocking. So let's just use QtConcurrent::mapped.
+	const QList<QPixmap> scaled = QtConcurrent::mapped(indices, get_scaled).results();
+
+	for (int i = 0; i < m_game_table->rowCount() && i < scaled.count(); ++i)
+	{
+		QTableWidgetItem* icon_item = m_game_table->item(i, TrophyColumns::Icon);
+		if (icon_item)
+			icon_item->setData(Qt::DecorationRole, scaled[i]);
 	}
 
 	ReadjustGameTable();
-
-	const s32 language_index = gui_application::get_language_id();
-	const QString localized_icon = QString::fromStdString(fmt::format("ICON0_%02d.PNG", language_index));
-
-	for (int i = 0; i < m_game_table->rowCount(); ++i)
-	{
-		if (movie_item* item = static_cast<movie_item*>(m_game_table->item(i, static_cast<int>(gui::trophy_game_list_columns::icon))))
-		{
-			const qreal dpr = devicePixelRatioF();
-			const int trophy_index = item->data(GameUserRole::GameIndex).toInt();
-			const QString icon_path = QString::fromStdString(m_trophies_db[trophy_index]->path);
-
-			item->set_icon_load_func([this, icon_path, localized_icon, trophy_index, cancel = item->icon_loading_aborted(), dpr](int index)
-			{
-				if (cancel && cancel->load())
-				{
-					return;
-				}
-
-				QPixmap icon;
-
-				if (movie_item* item = static_cast<movie_item*>(m_game_table->item(index, static_cast<int>(gui::trophy_game_list_columns::icon))))
-				{
-					if (!item->data(GameUserRole::GamePixmapLoaded).toBool())
-					{
-						// Load game icon
-						if (!icon.load(icon_path + localized_icon) &&
-							!icon.load(icon_path + "ICON0.PNG"))
-						{
-							gui_log.warning("Could not load trophy game icon from path %s", icon_path);
-						}
-						item->setData(GameUserRole::GamePixmapLoaded, true);
-						item->setData(GameUserRole::GamePixmap, icon);
-					}
-					else
-					{
-						icon = item->data(GameUserRole::GamePixmap).value<QPixmap>();
-					}
-				}
-
-				if (cancel && cancel->load())
-				{
-					return;
-				}
-
-				QPixmap new_icon(icon.size() * dpr);
-				new_icon.setDevicePixelRatio(dpr);
-				new_icon.fill(m_game_icon_color);
-
-				if (!icon.isNull())
-				{
-					QPainter painter(&new_icon);
-					painter.setRenderHint(QPainter::SmoothPixmapTransform);
-					painter.drawPixmap(QPoint(0, 0), icon);
-					painter.end();
-				}
-
-				new_icon = new_icon.scaled(m_game_icon_size * dpr, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation);
-
-				if (!cancel || !cancel->load())
-				{
-					Q_EMIT GameIconReady(index, new_icon);
-				}
-			});
-		}
-	}
 }
 
 void trophy_manager_dialog::ResizeTrophyIcons()
@@ -650,99 +531,65 @@ void trophy_manager_dialog::ResizeTrophyIcons()
 	if (m_game_combo->count() <= 0)
 		return;
 
-	WaitAndAbortTrophyRepaintThreads();
-
 	const int db_pos = m_game_combo->currentData().toInt();
 	const qreal dpr = devicePixelRatioF();
 	const int new_height = m_icon_height * dpr;
 
-	QPixmap placeholder(m_icon_height, m_icon_height);
-	placeholder.fill(Qt::transparent);
-
+	QList<int> trophy_ids;
 	for (int i = 0; i < m_trophy_table->rowCount(); ++i)
 	{
-		if (QTableWidgetItem* icon_item = m_trophy_table->item(i, static_cast<int>(gui::trophy_list_columns::icon)))
+		if (QTableWidgetItem* item = m_trophy_table->item(i, TrophyColumns::Id))
 		{
-			icon_item->setData(Qt::DecorationRole, placeholder);
+			trophy_ids.append(item->text().toInt());
 		}
 	}
 
+	const std::function<QPixmap(const int&)> get_scaled = [this, data = m_trophies_db.at(db_pos).get(), dpr, new_height](const int& trophy_id)
+	{
+		QPixmap icon;
+		{
+			std::scoped_lock lock(m_trophies_db_mtx);
+			if (data->trophy_images.contains(trophy_id))
+			{
+				icon = data->trophy_images[trophy_id];
+			}
+			else if (const QString& path = data->trophy_image_paths[trophy_id]; !icon.load(path))
+			{
+				gui_log.error("Failed to load trophy icon for trophy %d (icon='%s')", trophy_id, sstr(path));
+			}
+			else
+			{
+				data->trophy_images[trophy_id] = icon;
+			}
+		}
+
+		QPixmap new_icon = QPixmap(icon.size() * dpr);
+		new_icon.setDevicePixelRatio(dpr);
+		new_icon.fill(m_game_icon_color);
+
+		if (!icon.isNull())
+		{
+			QPainter painter(&new_icon);
+			painter.setRenderHint(QPainter::SmoothPixmapTransform);
+			painter.drawPixmap(QPoint(0, 0), icon);
+			painter.end();
+		}
+
+		return new_icon.scaledToHeight(new_height, Qt::SmoothTransformation);
+	};
+
+
+	// NOTE: Due to a Qt bug in Qt 5.15.2, QtConcurrent::blockingMapped has a high risk of deadlocking. So let's just use QtConcurrent::mapped.
+	const QList<QPixmap> scaled = QtConcurrent::mapped(trophy_ids, get_scaled).results();
+
+	for (int i = 0; i < m_trophy_table->rowCount() && i < scaled.count(); ++i)
+	{
+		QTableWidgetItem* icon_item = m_trophy_table->item(i, TrophyColumns::Icon);
+		if (icon_item)
+			icon_item->setData(Qt::DecorationRole, scaled.at(i));
+	}
+
 	ReadjustTrophyTable();
-
-	for (int i = 0; i < m_trophy_table->rowCount(); ++i)
-	{
-		if (QTableWidgetItem* id_item = m_trophy_table->item(i, static_cast<int>(gui::trophy_list_columns::id)))
-		{
-			if (movie_item* item = static_cast<movie_item*>(m_trophy_table->item(i, static_cast<int>(gui::trophy_list_columns::icon))))
-			{
-				item->set_icon_load_func([this, data = ::at32(m_trophies_db, db_pos).get(), trophy_id = id_item->text().toInt(), cancel = item->icon_loading_aborted(), dpr, new_height](int index)
-				{
-					if (cancel && cancel->load())
-					{
-						return;
-					}
-
-					QPixmap icon;
-
-					if (data)
-					{
-						bool found_icon{};
-						QString path;
-						{
-							std::scoped_lock lock(m_trophies_db_mtx);
-							found_icon = data->trophy_images.contains(trophy_id);
-
-							if (found_icon)
-							{
-								icon = data->trophy_images[trophy_id];
-							}
-							else
-							{
-								path = data->trophy_image_paths[trophy_id];
-							}
-						}
-
-						if (!found_icon)
-						{
-							if (icon.load(path))
-							{
-								std::scoped_lock lock(m_trophies_db_mtx);
-								data->trophy_images[trophy_id] = icon;
-							}
-							else
-							{
-								gui_log.error("Failed to load trophy icon for trophy %d (icon='%s')", trophy_id, path);
-							}
-						}
-					}
-
-					if (cancel && cancel->load())
-					{
-						return;
-					}
-
-					QPixmap new_icon(icon.size() * dpr);
-					new_icon.setDevicePixelRatio(dpr);
-					new_icon.fill(m_game_icon_color);
-
-					if (!icon.isNull())
-					{
-						QPainter painter(&new_icon);
-						painter.setRenderHint(QPainter::SmoothPixmapTransform);
-						painter.drawPixmap(QPoint(0, 0), icon);
-						painter.end();
-					}
-
-					new_icon = new_icon.scaledToHeight(new_height, Qt::SmoothTransformation);
-
-					if (!cancel || !cancel->load())
-					{
-						Q_EMIT TrophyIconReady(index, new_icon);
-					}
-				});
-			}
-		}
-	}
 }
 
 void trophy_manager_dialog::ApplyFilter()
@@ -751,18 +598,18 @@ void trophy_manager_dialog::ApplyFilter()
 		return;
 
 	const int db_pos = m_game_combo->currentData().toInt();
-	if (db_pos < 0 || static_cast<usz>(db_pos) >= m_trophies_db.size() || !m_trophies_db[db_pos])
+	if (db_pos + 0u >= m_trophies_db.size() || !m_trophies_db[db_pos])
 		return;
 
-	const TROPUSRLoader* trop_usr = m_trophies_db[db_pos]->trop_usr.get();
+	const auto trop_usr = m_trophies_db[db_pos]->trop_usr.get();
 	if (!trop_usr)
 		return;
 
 	for (int i = 0; i < m_trophy_table->rowCount(); ++i)
 	{
-		QTableWidgetItem* item = m_trophy_table->item(i, static_cast<int>(gui::trophy_list_columns::id));
-		QTableWidgetItem* type_item = m_trophy_table->item(i, static_cast<int>(gui::trophy_list_columns::type));
-		QTableWidgetItem* icon_item = m_trophy_table->item(i, static_cast<int>(gui::trophy_list_columns::icon));
+		QTableWidgetItem* item = m_trophy_table->item(i, TrophyColumns::Id);
+		QTableWidgetItem* type_item = m_trophy_table->item(i, TrophyColumns::Type);
+		QTableWidgetItem* icon_item = m_trophy_table->item(i, TrophyColumns::Icon);
 
 		if (!item || !type_item || !icon_item)
 		{
@@ -800,210 +647,35 @@ void trophy_manager_dialog::ApplyFilter()
 	ReadjustTrophyTable();
 }
 
-void trophy_manager_dialog::ShowTrophyTableContextMenu(const QPoint& pos)
+void trophy_manager_dialog::ShowContextMenu(const QPoint& pos)
 {
-	const int row = m_trophy_table->currentRow();
-
-	if (!m_trophy_table->item(row, static_cast<int>(gui::trophy_list_columns::icon)))
+	QTableWidgetItem* item = m_trophy_table->item(m_trophy_table->currentRow(), TrophyColumns::Icon);
+	if (!item)
 	{
 		return;
 	}
 
 	QMenu* menu = new QMenu();
-	QAction* show_trophy_dir = new QAction(tr("&Open Trophy Directory"), menu);
+	QAction* show_trophy_dir = new QAction(tr("Open Trophy Directory"), menu);
 
 	const int db_ind = m_game_combo->currentData().toInt();
 
 	connect(show_trophy_dir, &QAction::triggered, this, [this, db_ind]()
 	{
-		const QString path = QString::fromStdString(m_trophies_db[db_ind]->path);
-		gui::utils::open_dir(path);
+		const QString path = qstr(m_trophies_db[db_ind]->path);
+		QDesktopServices::openUrl(QUrl::fromLocalFile(path));
 	});
 
 	menu->addAction(show_trophy_dir);
-
-	const QTableWidgetItem* name_item = m_trophy_table->item(row, static_cast<int>(gui::trophy_list_columns::name));
-	const QTableWidgetItem* desc_item = m_trophy_table->item(row, static_cast<int>(gui::trophy_list_columns::description));
-
-	const QString name = name_item ? name_item->text() : "";
-	const QString desc = desc_item ? desc_item->text() : "";
-
-	if (!name.isEmpty() || !desc.isEmpty())
-	{
-		QMenu* copy_menu = new QMenu(tr("&Copy Info"), menu);
-
-		if (!name.isEmpty() && !desc.isEmpty())
-		{
-			QAction* copy_both = new QAction(tr("&Copy Name + Description"), copy_menu);
-			connect(copy_both, &QAction::triggered, this, [this, name, desc]()
-			{
-				QApplication::clipboard()->setText(name % QStringLiteral("\n\n") % desc);
-			});
-			copy_menu->addAction(copy_both);
-		}
-
-		if (!name.isEmpty())
-		{
-			QAction* copy_name = new QAction(tr("&Copy Name"), copy_menu);
-			connect(copy_name, &QAction::triggered, this, [this, name]()
-			{
-				QApplication::clipboard()->setText(name);
-			});
-			copy_menu->addAction(copy_name);
-		}
-
-		if (!desc.isEmpty())
-		{
-			QAction* copy_desc = new QAction(tr("&Copy Description"), copy_menu);
-			connect(copy_desc, &QAction::triggered, this, [this, desc]()
-			{
-				QApplication::clipboard()->setText(desc);
-			});
-			copy_menu->addAction(copy_desc);
-		}
-
-		menu->addMenu(copy_menu);
-	}
-
-	const QTableWidgetItem* id_item = m_trophy_table->item(row, static_cast<int>(gui::trophy_list_columns::id));
-	const QTableWidgetItem* type_item = m_trophy_table->item(row, static_cast<int>(gui::trophy_list_columns::type));
-	if (id_item && type_item && !Emu.IsRunning())
-	{
-		const int type = type_item->data(Qt::UserRole).toInt();
-		const int trophy_id = id_item->text().toInt();
-		const bool is_unlocked = m_trophies_db[db_ind]->trop_usr->GetTrophyUnlockState(trophy_id);
-
-		QAction* lock_unlock_trophy = new QAction(is_unlocked ? tr("&Lock Trophy") : tr("&Unlock Trophy"), menu);
-		connect(lock_unlock_trophy, &QAction::triggered, this, [this, db_ind, trophy_id, is_unlocked, row, type]()
-		{
-			if (type == SCE_NP_TROPHY_GRADE_PLATINUM && !is_unlocked)
-			{
-				QMessageBox::information(this, tr("Action not permitted."), tr("Platinum trophies can only be unlocked ingame."), QMessageBox::Ok);
-				return;
-			}
-
-			auto& db = m_trophies_db[db_ind];
-			const std::string path = vfs::retrieve(db->path);
-			const std::string tropusr_path = path + "/TROPUSR.DAT";
-			const std::string tropconf_path = path + "/TROPCONF.SFM";
-
-			// Reload trophy file just make sure it hasn't changed
-			if (!db->trop_usr->Load(tropusr_path, tropconf_path).success)
-			{
-				gui_log.error("Failed to load trophy file");
-				return;
-			}
-
-			u64 tick = 0;
-
-			if (is_unlocked)
-			{
-				if (!db->trop_usr->LockTrophy(trophy_id))
-				{
-					gui_log.error("Failed to lock trophy %d", trophy_id);
-					return;
-				}
-			}
-			else
-			{
-				tick = DateTimeToTick(QDateTime::currentDateTime());
-
-				if (!db->trop_usr->UnlockTrophy(trophy_id, tick, tick))
-				{
-					gui_log.error("Failed to unlock trophy %d", trophy_id);
-					return;
-				}
-			}
-			if (!db->trop_usr->Save(tropusr_path))
-			{
-				gui_log.error("Failed to save '%s': error=%s", path, fs::g_tls_error);
-				return;
-			}
-			if (QTableWidgetItem* lock_item = m_trophy_table->item(row, static_cast<int>(gui::trophy_list_columns::is_unlocked)))
-			{
-				lock_item->setText(db->trop_usr->GetTrophyUnlockState(trophy_id) ? tr("Earned") : tr("Not Earned"));
-			}
-			if (QTableWidgetItem* date_item = m_trophy_table->item(row, static_cast<int>(gui::trophy_list_columns::time_unlocked)))
-			{
-				date_item->setText(tick ? QLocale().toString(TickToDateTime(tick), gui::persistent::last_played_date_with_time_of_day_format) : tr("Unknown"));
-				date_item->setData(Qt::UserRole, QVariant::fromValue<qulonglong>(tick));
-			}
-		});
-		menu->addSeparator();
-		menu->addAction(lock_unlock_trophy);
-	}
-
 	menu->exec(m_trophy_table->viewport()->mapToGlobal(pos));
 }
 
-void trophy_manager_dialog::ShowGameTableContextMenu(const QPoint& pos)
-{
-	const int row = m_game_table->currentRow();
-
-	if (!m_game_table->item(row, static_cast<int>(gui::trophy_game_list_columns::icon)))
-	{
-		return;
-	}
-
-	QMenu* menu = new QMenu();
-	QAction* remove_trophy_dir = new QAction(tr("&Remove"), this);
-	QAction* show_trophy_dir = new QAction(tr("&Open Trophy Directory"), menu);
-
-	const int db_ind = m_game_combo->currentData().toInt();
-
-	const QTableWidgetItem* name_item = m_game_table->item(row, static_cast<int>(gui::trophy_game_list_columns::name));
-	const QString name = name_item ? name_item->text() : "";
-
-	connect(remove_trophy_dir, &QAction::triggered, this, [this, name, db_ind]()
-	{
-		if (QMessageBox::question(this, tr("Delete Confirmation"), tr("Are you sure you want to delete the trophies for:\n%1?").arg(name), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
-		{
-			const std::string path = m_trophies_db[db_ind]->path;
-			ensure(path != vfs::get(m_trophy_dir)); // Make sure we aren't deleting the root path by accident
-			fs::remove_all(path + "/"); // Remove the game's trophy folder
-			StartTrophyLoadThreads(); // Reload the trophy list
-		}
-	});
-	connect(show_trophy_dir, &QAction::triggered, this, [this, db_ind]()
-	{
-		const QString path = QString::fromStdString(m_trophies_db[db_ind]->path);
-		gui::utils::open_dir(path);
-	});
-
-	menu->addAction(remove_trophy_dir);
-	menu->addAction(show_trophy_dir);
-
-	if (!name.isEmpty())
-	{
-		QAction* copy_name = new QAction(tr("&Copy Name"), menu);
-		connect(copy_name, &QAction::triggered, this, [this, name]()
-		{
-			QApplication::clipboard()->setText(name);
-		});
-		menu->addAction(copy_name);
-	}
-
-	menu->exec(m_game_table->viewport()->mapToGlobal(pos));
-}
-
 void trophy_manager_dialog::StartTrophyLoadThreads()
 {
-	WaitAndAbortGameRepaintThreads();
-	WaitAndAbortTrophyRepaintThreads();
-
 	m_trophies_db.clear();
 
-	const QString trophy_path = QString::fromStdString(vfs::get(m_trophy_dir));
-
-	if (trophy_path.isEmpty())
-	{
-		gui_log.error("Cannot load trophy dir. Path empty!");
-		RepaintUI(true);
-		return;
-	}
-
-	const QDir trophy_dir(trophy_path);
-	const QStringList folder_list = trophy_dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+	const QDir trophy_dir(qstr(vfs::get(m_trophy_dir)));
+	const auto folder_list = trophy_dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
 	const int count = folder_list.count();
 
 	if (count <= 0)
@@ -1012,14 +684,14 @@ void trophy_manager_dialog::StartTrophyLoadThreads()
 		return;
 	}
 
-	qRegisterMetaType<QVector<int>>("QVector<int>");
 	QList<int> indices;
 	for (int i = 0; i < count; ++i)
 		indices.append(i);
 
 	QFutureWatcher<void> futureWatcher;
 
-	progress_dialog progressDialog(tr("Loading trophies"), tr("Loading trophy data, please wait..."), tr("Cancel"), 0, 1, false, this, Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
+	QProgressDialog progressDialog(tr("Loading trophy data, please wait..."), tr("Cancel"), 0, 1, this, Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
+	progressDialog.setWindowTitle(tr("Loading trophies"));
 
 	connect(&futureWatcher, &QFutureWatcher<void>::progressRangeChanged, &progressDialog, &QProgressDialog::setRange);
 	connect(&futureWatcher, &QFutureWatcher<void>::progressValueChanged, &progressDialog, &QProgressDialog::setValue);
@@ -1030,48 +702,51 @@ void trophy_manager_dialog::StartTrophyLoadThreads()
 		close(); // It's pointless to show an empty window
 	});
 
-	atomic_t<usz> error_count{};
-	futureWatcher.setFuture(QtConcurrent::map(indices, [this, &error_count, &folder_list](const int& i)
+	futureWatcher.setFuture(QtConcurrent::map(indices, [this, folder_list](const int& i)
 	{
-		const std::string dir_name = folder_list.value(i).toStdString();
+		const std::string dir_name = sstr(folder_list.value(i));
 		gui_log.trace("Loading trophy dir: %s", dir_name);
 
 		if (!LoadTrophyFolderToDB(dir_name))
 		{
-			// TODO: add a way of showing the number of corrupted/invalid folders in UI somewhere.
+			// TODO: Add error checks & throws to LoadTrophyFolderToDB so that they can be caught here.
+			// Also add a way of showing the number of corrupted/invalid folders in UI somewhere.
 			gui_log.error("Error occurred while parsing folder %s for trophies.", dir_name);
-			error_count++;
 		}
 	}));
 
 	progressDialog.exec();
 
 	futureWatcher.waitForFinished();
-
-	if (error_count != 0)
-	{
-		gui_log.error("Failed to load %d of %d trophy folders!", error_count.load(), count);
-	}
 }
 
 void trophy_manager_dialog::PopulateGameTable()
 {
-	WaitAndAbortGameRepaintThreads();
-
 	m_game_table->setSortingEnabled(false); // Disable sorting before using setItem calls
+
 	m_game_table->clearContents();
 	m_game_table->setRowCount(static_cast<int>(m_trophies_db.size()));
 
 	m_game_combo->clear();
-	m_game_combo->blockSignals(true);
 
-	qRegisterMetaType<QVector<int>>("QVector<int>");
 	QList<int> indices;
 	for (usz i = 0; i < m_trophies_db.size(); ++i)
 		indices.append(static_cast<int>(i));
 
-	QPixmap placeholder(m_game_icon_size);
-	placeholder.fill(Qt::transparent);
+	const std::function<QPixmap(const int&)> get_icon = [this](const int& i)
+	{
+		// Load game icon
+		QPixmap icon;
+		const std::string icon_path = m_trophies_db[i]->path + "ICON0.PNG";
+		if (!icon.load(qstr(icon_path)))
+		{
+			gui_log.warning("Could not load trophy game icon from path %s", icon_path);
+		}
+		return icon;
+	};
+
+	// NOTE: Due to a Qt bug in Qt 5.15.2, QtConcurrent::blockingMapped has a high risk of deadlocking. So let's just use QtConcurrent::mapped.
+	const QList<QPixmap> icons = QtConcurrent::mapped(indices, get_icon).results();
 
 	for (int i = 0; i < indices.count(); ++i)
 	{
@@ -1079,30 +754,25 @@ void trophy_manager_dialog::PopulateGameTable()
 		const int unlocked_trophies = m_trophies_db[i]->trop_usr->GetUnlockedTrophiesCount();
 		const int percentage = 100 * unlocked_trophies / all_trophies;
 		const QString progress = tr("%0% (%1/%2)").arg(percentage).arg(unlocked_trophies).arg(all_trophies);
-		const QString name = QString::fromStdString(m_trophies_db[i]->game_name).simplified();
+		const QString name = qstr(m_trophies_db[i]->game_name).simplified();
 
 		custom_table_widget_item* icon_item = new custom_table_widget_item;
-		icon_item->setData(Qt::DecorationRole, placeholder);
-		icon_item->setData(GameUserRole::GameIndex, i);
-		icon_item->setData(GameUserRole::GamePixmapLoaded, false);
-		icon_item->setData(GameUserRole::GamePixmap, QPixmap());
+		if (icons.count() > i)
+			icon_item->setData(Qt::UserRole, icons[i]);
 
-		m_game_table->setItem(i, static_cast<int>(gui::trophy_game_list_columns::icon), icon_item);
-		m_game_table->setItem(i, static_cast<int>(gui::trophy_game_list_columns::name), new custom_table_widget_item(name));
-		m_game_table->setItem(i, static_cast<int>(gui::trophy_game_list_columns::progress), new custom_table_widget_item(progress, Qt::UserRole, percentage));
-		m_game_table->setItem(i, static_cast<int>(gui::trophy_game_list_columns::trophies), new custom_table_widget_item(QString::number(all_trophies), Qt::UserRole, all_trophies));
+		m_game_table->setItem(i, GameColumns::GameIcon, icon_item);
+		m_game_table->setItem(i, GameColumns::GameName, new custom_table_widget_item(name));
+		m_game_table->setItem(i, GameColumns::GameProgress, new custom_table_widget_item(progress, Qt::UserRole, percentage));
 
 		m_game_combo->addItem(name, i);
 	}
 
 	m_game_combo->model()->sort(0, Qt::AscendingOrder);
-	m_game_combo->blockSignals(false);
-	m_game_combo->setCurrentIndex(0);
-
-	m_game_table->setSortingEnabled(true); // Enable sorting only after using setItem calls
 
 	ResizeGameIcons();
 
+	m_game_table->setSortingEnabled(true); // Enable sorting only after using setItem calls
+
 	gui::utils::resize_combo_box_view(m_game_combo);
 }
 
@@ -1112,13 +782,11 @@ void trophy_manager_dialog::PopulateTrophyTable()
 		return;
 
 	auto& data = m_trophies_db[m_game_combo->currentData().toInt()];
-	ensure(!!data);
-
 	gui_log.trace("Populating Trophy Manager UI with %s %s", data->game_name, data->path);
 
 	const int all_trophies = data->trop_usr->GetTrophiesCount();
 	const int unlocked_trophies = data->trop_usr->GetUnlockedTrophiesCount();
-	const int percentage = (all_trophies > 0) ? (100 * unlocked_trophies / all_trophies) : 0;
+	const int percentage = 100 * unlocked_trophies / all_trophies;
 
 	m_game_progress->setText(tr("Progress: %1% (%2/%3)").arg(percentage).arg(unlocked_trophies).arg(all_trophies));
 
@@ -1126,19 +794,19 @@ void trophy_manager_dialog::PopulateTrophyTable()
 	m_trophy_table->setRowCount(all_trophies);
 	m_trophy_table->setSortingEnabled(false); // Disable sorting before using setItem calls
 
-	QPixmap placeholder(m_icon_height, m_icon_height);
-	placeholder.fill(Qt::transparent);
-
-	const QLocale locale{};
-
 	std::shared_ptr<rXmlNode> trophy_base = data->trop_config.GetRoot();
-	if (!trophy_base)
+	if (trophy_base->GetChildren()->GetName() == "trophyconf")
 	{
-		gui_log.error("Populating Trophy Manager UI failed (root is null): %s %s", data->game_name, data->path);
+		trophy_base = trophy_base->GetChildren();
+	}
+	else
+	{
+		gui_log.error("Root name does not match trophyconf in trophy. Name received: %s", trophy_base->GetChildren()->GetName());
+		return;
 	}
 
 	int i = 0;
-	for (std::shared_ptr<rXmlNode> n = trophy_base ? trophy_base->GetChildren() : nullptr; n; n = n->GetNext())
+	for (std::shared_ptr<rXmlNode> n = trophy_base->GetChildren(); n; n = n->GetNext())
 	{
 		// Only show trophies.
 		if (n->GetName() != "trophy")
@@ -1147,7 +815,7 @@ void trophy_manager_dialog::PopulateTrophyTable()
 		}
 
 		// Get data (stolen graciously from sceNpTrophy.cpp)
-		SceNpTrophyDetails details{};
+		SceNpTrophyDetails details;
 
 		// Get trophy id
 		const s32 trophy_id = atoi(n->GetAttribute("id").c_str());
@@ -1176,38 +844,33 @@ void trophy_manager_dialog::PopulateTrophyTable()
 		// Get name and detail
 		for (std::shared_ptr<rXmlNode> n2 = n->GetChildren(); n2; n2 = n2->GetNext())
 		{
-			const std::string name = n2->GetName();
-			if (name == "name")
+			if (n2->GetName() == "name")
 			{
-				strcpy_trunc(details.name, n2->GetNodeContent());
+				std::string name = n2->GetNodeContent();
+				strcpy_trunc(details.name, name);
 			}
-			else if (name == "detail")
+			if (n2->GetName() == "detail")
 			{
-				strcpy_trunc(details.description, n2->GetNodeContent());
+				std::string detail = n2->GetNodeContent();
+				strcpy_trunc(details.description, detail);
 			}
 		}
 
-		// Get timestamp
-		const u64 tick = data->trop_usr->GetTrophyTimestamp(trophy_id);
-		const QString datetime = tick ? locale.toString(TickToDateTime(tick), gui::persistent::last_played_date_with_time_of_day_format) : tr("Unknown");
-
 		const QString unlockstate = data->trop_usr->GetTrophyUnlockState(trophy_id) ? tr("Earned") : tr("Not Earned");
 
 		custom_table_widget_item* icon_item = new custom_table_widget_item();
 		icon_item->setData(Qt::UserRole, hidden, true);
-		icon_item->setData(Qt::DecorationRole, placeholder);
 
 		custom_table_widget_item* type_item = new custom_table_widget_item(trophy_type);
 		type_item->setData(Qt::UserRole, static_cast<uint>(details.trophyGrade), true);
 
-		m_trophy_table->setItem(i, static_cast<int>(gui::trophy_list_columns::icon), icon_item);
-		m_trophy_table->setItem(i, static_cast<int>(gui::trophy_list_columns::name), new custom_table_widget_item(QString::fromStdString(details.name)));
-		m_trophy_table->setItem(i, static_cast<int>(gui::trophy_list_columns::description), new custom_table_widget_item(QString::fromStdString(details.description)));
-		m_trophy_table->setItem(i, static_cast<int>(gui::trophy_list_columns::type), type_item);
-		m_trophy_table->setItem(i, static_cast<int>(gui::trophy_list_columns::is_unlocked), new custom_table_widget_item(unlockstate));
-		m_trophy_table->setItem(i, static_cast<int>(gui::trophy_list_columns::id), new custom_table_widget_item(QString::number(trophy_id), Qt::UserRole, trophy_id));
-		m_trophy_table->setItem(i, static_cast<int>(gui::trophy_list_columns::platinum_link), new custom_table_widget_item(platinum_relevant, Qt::UserRole, platinum_link_id));
-		m_trophy_table->setItem(i, static_cast<int>(gui::trophy_list_columns::time_unlocked), new custom_table_widget_item(datetime, Qt::UserRole, QVariant::fromValue<qulonglong>(tick)));
+		m_trophy_table->setItem(i, TrophyColumns::Icon, icon_item);
+		m_trophy_table->setItem(i, TrophyColumns::Name, new custom_table_widget_item(qstr(details.name)));
+		m_trophy_table->setItem(i, TrophyColumns::Description, new custom_table_widget_item(qstr(details.description)));
+		m_trophy_table->setItem(i, TrophyColumns::Type, type_item);
+		m_trophy_table->setItem(i, TrophyColumns::IsUnlocked, new custom_table_widget_item(unlockstate));
+		m_trophy_table->setItem(i, TrophyColumns::Id, new custom_table_widget_item(QString::number(trophy_id), Qt::UserRole, trophy_id));
+		m_trophy_table->setItem(i, TrophyColumns::PlatinumLink, new custom_table_widget_item(platinum_relevant, Qt::UserRole, platinum_link_id));
 
 		++i;
 	}
@@ -1220,30 +883,31 @@ void trophy_manager_dialog::PopulateTrophyTable()
 void trophy_manager_dialog::ReadjustGameTable() const
 {
 	// Fixate vertical header and row height
-	m_game_table->verticalHeader()->setDefaultSectionSize(m_game_icon_size.height());
 	m_game_table->verticalHeader()->setMinimumSectionSize(m_game_icon_size.height());
 	m_game_table->verticalHeader()->setMaximumSectionSize(m_game_icon_size.height());
+	m_game_table->resizeRowsToContents();
 
 	// Resize and fixate icon column
-	m_game_table->resizeColumnToContents(static_cast<int>(gui::trophy_game_list_columns::icon));
-	m_game_table->horizontalHeader()->setSectionResizeMode(static_cast<int>(gui::trophy_game_list_columns::icon), QHeaderView::Fixed);
+	m_game_table->resizeColumnToContents(GameColumns::GameIcon);
+	m_game_table->horizontalHeader()->setSectionResizeMode(GameColumns::GameIcon, QHeaderView::Fixed);
 
 	// Shorten the last section to remove horizontal scrollbar if possible
-	m_game_table->resizeColumnToContents(static_cast<int>(gui::trophy_game_list_columns::count) - 1);
+	m_game_table->resizeColumnToContents(GameColumns::GameColumnsCount - 1);
 }
 
 void trophy_manager_dialog::ReadjustTrophyTable() const
 {
 	// Fixate vertical header and row height
-	m_trophy_table->verticalHeader()->setDefaultSectionSize(m_icon_height);
 	m_trophy_table->verticalHeader()->setMinimumSectionSize(m_icon_height);
 	m_trophy_table->verticalHeader()->setMaximumSectionSize(m_icon_height);
+	m_trophy_table->resizeRowsToContents();
 
 	// Resize and fixate icon column
-	m_trophy_table->resizeColumnToContents(static_cast<int>(gui::trophy_list_columns::icon));
+	m_trophy_table->resizeColumnToContents(TrophyColumns::Icon);
+	m_trophy_table->horizontalHeader()->setSectionResizeMode(TrophyColumns::Icon, QHeaderView::Fixed);
 
 	// Shorten the last section to remove horizontal scrollbar if possible
-	m_trophy_table->resizeColumnToContents(static_cast<int>(gui::trophy_list_columns::count) - 1);
+	m_trophy_table->resizeColumnToContents(TrophyColumns::Count - 1);
 }
 
 bool trophy_manager_dialog::eventFilter(QObject *object, QEvent *event)
@@ -1271,7 +935,7 @@ bool trophy_manager_dialog::eventFilter(QObject *object, QEvent *event)
 	{
 		QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
 
-		if (keyEvent && keyEvent->modifiers() == Qt::ControlModifier && (is_trophy_table || is_game_table))
+		if (keyEvent->modifiers() & Qt::ControlModifier && (is_trophy_table || is_game_table))
 		{
 			if (keyEvent->key() == Qt::Key_Plus)
 			{
@@ -1309,59 +973,10 @@ bool trophy_manager_dialog::eventFilter(QObject *object, QEvent *event)
 void trophy_manager_dialog::closeEvent(QCloseEvent *event)
 {
 	// Save gui settings
-	m_gui_settings->SetValue(gui::tr_geometry, saveGeometry(), false);
-	m_gui_settings->SetValue(gui::tr_splitterState, m_splitter->saveState(), false);
-	m_gui_settings->SetValue(gui::tr_games_state,  m_game_table->horizontalHeader()->saveState(), false);
-	m_gui_settings->SetValue(gui::tr_trophy_state, m_trophy_table->horizontalHeader()->saveState(), true);
+	m_gui_settings->SetValue(gui::tr_geometry, saveGeometry());
+	m_gui_settings->SetValue(gui::tr_splitterState, m_splitter->saveState());
+	m_gui_settings->SetValue(gui::tr_games_state,  m_game_table->horizontalHeader()->saveState());
+	m_gui_settings->SetValue(gui::tr_trophy_state, m_trophy_table->horizontalHeader()->saveState());
 
 	QWidget::closeEvent(event);
 }
-
-void trophy_manager_dialog::WaitAndAbortGameRepaintThreads()
-{
-	for (int i = 0; i < m_game_table->rowCount(); i++)
-	{
-		if (movie_item* item = static_cast<movie_item*>(m_game_table->item(i, static_cast<int>(gui::trophy_game_list_columns::icon))))
-		{
-			item->wait_for_icon_loading(true);
-		}
-	}
-}
-
-void trophy_manager_dialog::WaitAndAbortTrophyRepaintThreads()
-{
-	for (int i = 0; i < m_trophy_table->rowCount(); i++)
-	{
-		if (movie_item* item = static_cast<movie_item*>(m_trophy_table->item(i, static_cast<int>(gui::trophy_list_columns::icon))))
-		{
-			item->wait_for_icon_loading(true);
-		}
-	}
-}
-
-QDateTime trophy_manager_dialog::TickToDateTime(u64 tick)
-{
-	const CellRtcDateTime rtc_date = tick_to_date_time(tick);
-	const QDateTime datetime(
-		QDate(rtc_date.year, rtc_date.month, rtc_date.day),
-		QTime(rtc_date.hour, rtc_date.minute, rtc_date.second, rtc_date.microsecond / 1000),
-		QTimeZone::UTC);
-	return datetime.toLocalTime();
-}
-
-u64 trophy_manager_dialog::DateTimeToTick(QDateTime date_time)
-{
-	const QDateTime utc = date_time.toUTC();
-	const QDate date = utc.date();
-	const QTime time = utc.time();
-	const CellRtcDateTime rtc_date = {
-		.year = static_cast<u16>(date.year()),
-		.month = static_cast<u16>(date.month()),
-		.day = static_cast<u16>(date.day()),
-		.hour = static_cast<u16>(time.hour()),
-		.minute = static_cast<u16>(time.minute()),
-		.second = static_cast<u16>(time.second()),
-		.microsecond = static_cast<u32>(time.msec() * 1000),
-	};
-	return date_time_to_tick(rtc_date);
-}
diff --git a/rpcs3/rpcs3qt/trophy_manager_dialog.h b/rpcs3/rpcs3qt/trophy_manager_dialog.h
index ead945114b..4fc0189656 100644
--- a/rpcs3/rpcs3qt/trophy_manager_dialog.h
+++ b/rpcs3/rpcs3qt/trophy_manager_dialog.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include "Loader/TROPUSR.h"
+#include "Utilities/rXml.h"
 
 #include <QWidget>
 #include <QComboBox>
-#include <QFutureWatcher>
 #include <QLabel>
 #include <QPixmap>
 #include <QTableWidget>
@@ -22,13 +21,35 @@ class TROPUSRLoader;
 struct GameTrophiesData
 {
 	std::unique_ptr<TROPUSRLoader> trop_usr;
-	trophy_xml_document trop_config; // I'd like to use unique but the protocol inside of the function passes around shared pointers..
+	rXmlDocument trop_config; // I'd like to use unique but the protocol inside of the function passes around shared pointers..
 	std::unordered_map<int, QPixmap> trophy_images; // Cache trophy images to avoid loading from disk as much as possible.
 	std::unordered_map<int, QString> trophy_image_paths;
 	std::string game_name;
 	std::string path;
 };
 
+enum TrophyColumns
+{
+	Icon = 0,
+	Name = 1,
+	Description = 2,
+	Type = 3,
+	IsUnlocked = 4,
+	Id = 5,
+	PlatinumLink = 6,
+
+	Count
+};
+
+enum GameColumns
+{
+	GameIcon = 0,
+	GameName = 1,
+	GameProgress = 2,
+
+	GameColumnsCount
+};
+
 class trophy_manager_dialog : public QWidget
 {
 	Q_OBJECT
@@ -42,18 +63,14 @@ public Q_SLOTS:
 	void HandleRepaintUiRequest();
 
 private Q_SLOTS:
+	QPixmap GetResizedGameIcon(int index) const;
 	void ResizeGameIcons();
 	void ResizeTrophyIcons();
 	void ApplyFilter();
-	void ShowTrophyTableContextMenu(const QPoint& pos);
-	void ShowGameTableContextMenu(const QPoint& pos);
-
-Q_SIGNALS:
-	void GameIconReady(int index, const QPixmap& pixmap);
-	void TrophyIconReady(int index, const QPixmap& pixmap);
+	void ShowContextMenu(const QPoint& pos);
 
 private:
-	/** Loads a trophy folder.
+	/** Loads a trophy folder. 
 	Returns true if successful.  Does not attempt to install if failure occurs, like sceNpTrophy.
 	*/
 	bool LoadTrophyFolderToDB(const std::string& trop_name);
@@ -74,15 +91,9 @@ private:
 	void ReadjustGameTable() const;
 	void ReadjustTrophyTable() const;
 
-	void WaitAndAbortGameRepaintThreads();
-	void WaitAndAbortTrophyRepaintThreads();
-
 	void closeEvent(QCloseEvent *event) override;
 	bool eventFilter(QObject *object, QEvent *event) override;
 
-	static QDateTime TickToDateTime(u64 tick);
-	static u64 DateTimeToTick(QDateTime date_time);
-
 	std::shared_ptr<gui_settings> m_gui_settings;
 
 	std::vector<std::unique_ptr<GameTrophiesData>> m_trophies_db; //! Holds all the trophy information.
@@ -91,10 +102,7 @@ private:
 	QLabel* m_game_progress; //! Shows you the current game's progress
 	QSplitter* m_splitter; //! Contains the game and trophy tables
 	game_list* m_trophy_table; //! UI element to display trophy stuff.
-	game_list* m_game_table; //! UI element to display games.
-
-	QList<QAction*> m_trophy_column_acts;
-	QList<QAction*> m_game_column_acts;
+	QTableWidget* m_game_table; //! UI element to display games.
 
 	bool m_show_hidden_trophies = false;
 	bool m_show_unlocked_trophies = true;
diff --git a/rpcs3/rpcs3qt/trophy_notification_helper.cpp b/rpcs3/rpcs3qt/trophy_notification_helper.cpp
index 910b16ffcc..7eaa431e80 100644
--- a/rpcs3/rpcs3qt/trophy_notification_helper.cpp
+++ b/rpcs3/rpcs3qt/trophy_notification_helper.cpp
@@ -3,12 +3,8 @@
 
 #include "../Emu/IdManager.h"
 #include "../Emu/System.h"
-
-#include "../Emu/RSX/Overlays/overlay_manager.h"
 #include "../Emu/RSX/Overlays/overlay_trophy_notification.h"
 
-#include "Utilities/File.h"
-
 s32 trophy_notification_helper::ShowTrophyNotification(const SceNpTrophyDetails& trophy, const std::vector<uchar>& trophy_icon_buffer)
 {
 	if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
@@ -23,15 +19,13 @@ s32 trophy_notification_helper::ShowTrophyNotification(const SceNpTrophyDetails&
 		return 0;
 	}
 
-	Emu.CallFromMainThread([=, this]
+	Emu.CallAfter([=, this]
 	{
 		trophy_notification_frame* trophy_notification = new trophy_notification_frame(trophy_icon_buffer, trophy, m_game_window->frameGeometry().height() / 10);
 
 		// Move notification to upper lefthand corner
 		trophy_notification->move(m_game_window->mapToGlobal(QPoint(0, 0)));
 		trophy_notification->show();
-
-		Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_trophy.wav");
 	});
 
 	return 0;
diff --git a/rpcs3/rpcs3qt/update_manager.cpp b/rpcs3/rpcs3qt/update_manager.cpp
index 8b07693e34..69c5bcc7e1 100644
--- a/rpcs3/rpcs3qt/update_manager.cpp
+++ b/rpcs3/rpcs3qt/update_manager.cpp
@@ -3,43 +3,32 @@
 #include "localized.h"
 #include "rpcs3_version.h"
 #include "downloader.h"
-#include "gui_settings.h"
+#include "Utilities/StrUtil.h"
 #include "Utilities/File.h"
 #include "Emu/System.h"
-#include "Crypto/utils.h"
+#include "Emu/system_utils.hpp"
 #include "util/logs.hpp"
-#include "util/types.hpp"
-#include "util/sysinfo.hpp"
 
 #include <QApplication>
-#include <QCheckBox>
 #include <QDateTime>
 #include <QMessageBox>
-#include <QLabel>
-#include <QJsonArray>
 #include <QJsonObject>
 #include <QJsonDocument>
 #include <QThread>
 
-#if defined(_WIN32) || defined(__APPLE__)
-#include <7z.h>
-#include <7zAlloc.h>
-#include <7zCrc.h>
-#include <7zFile.h>
-#endif
-
 #if defined(_WIN32)
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
 #include <windows.h>
 #include <CpuArch.h>
+#include <7z.h>
+#include <7zAlloc.h>
+#include <7zCrc.h>
+#include <7zFile.h>
 
-#ifndef PATH_MAX
 #define PATH_MAX MAX_PATH
-#endif
 
-#include "Utilities/StrUtil.h"
 #else
 #include <unistd.h>
 #include <sys/stat.h>
@@ -47,35 +36,17 @@
 
 LOG_CHANNEL(update_log, "UPDATER");
 
-update_manager::update_manager(QObject* parent, std::shared_ptr<gui_settings> gui_settings)
-	: QObject(parent), m_gui_settings(std::move(gui_settings))
-{
-}
-
 void update_manager::check_for_updates(bool automatic, bool check_only, bool auto_accept, QWidget* parent)
 {
-	update_log.notice("Checking for updates: automatic=%d, check_only=%d, auto_accept=%d", automatic, check_only, auto_accept);
-
 	m_update_message.clear();
-	m_changelog.clear();
 
-	if (automatic)
-	{
-		// Don't check for updates on local builds
-		if (rpcs3::is_local_build())
-		{
-			update_log.notice("Skipped automatic update check: this is a local build");
-			return;
-		}
 #ifdef __linux__
+	if (automatic && !::getenv("APPIMAGE"))
+	{
 		// Don't check for updates on startup if RPCS3 is not running from an AppImage.
-		if (!::getenv("APPIMAGE"))
-		{
-			update_log.notice("Skipped automatic update check: this is not an AppImage");
-			return;
-		}
-#endif
+		return;
 	}
+#endif
 
 	m_parent     = parent;
 	m_downloader = new downloader(parent);
@@ -106,18 +77,12 @@ void update_manager::check_for_updates(bool automatic, bool check_only, bool aut
 		Q_EMIT signal_update_available(result_json && !m_update_message.isEmpty());
 	});
 
-	const utils::OS_version os = utils::get_OS_version();
-
-	const std::string url = fmt::format("https://update.rpcs3.net/?api=v3&c=%s&os_type=%s&os_arch=%s&os_version=%i.%i.%i",
-		rpcs3::get_commit_and_hash().second, os.type, os.arch, os.version_major, os.version_minor, os.version_patch);
-
+	const std::string url = "https://update.rpcs3.net/?api=v1&c=" + rpcs3::get_commit_and_hash().second;
 	m_downloader->start(url, true, !automatic, tr("Checking For Updates"), true);
 }
 
 bool update_manager::handle_json(bool automatic, bool check_only, bool auto_accept, const QByteArray& data)
 {
-	update_log.notice("Download of update info finished. automatic=%d, check_only=%d, auto_accept=%d", automatic, check_only, auto_accept);
-
 	const QJsonObject json_data = QJsonDocument::fromJson(data).object();
 	const int return_code       = json_data["return_code"].toInt(-255);
 
@@ -166,33 +131,17 @@ bool update_manager::handle_json(bool automatic, bool check_only, bool auto_acce
 	os = "windows";
 #elif defined(__linux__)
 	os = "linux";
-#elif defined(__APPLE__)
-	os = "mac";
 #else
 	update_log.error("Your OS isn't currently supported by the auto-updater");
 	return false;
 #endif
 
 	// Check that every bit of info we need is there
-	const auto check_json = [](bool cond, std::string_view msg) -> bool
-	{
-		if (cond) return true;
-		update_log.error("%s", msg);
-		return false;
-	};
-	if (!(check_json(latest[os].isObject(), fmt::format("Node 'latest_build: %s' not found", os)) &&
-	      check_json(latest[os]["download"].isString(), fmt::format("Node 'latest_build: %s: download' not found or not a string", os)) &&
-	      check_json(latest[os]["size"].isDouble(), fmt::format("Node 'latest_build: %s: size' not found or not a double", os)) &&
-	      check_json(latest[os]["checksum"].isString(), fmt::format("Node 'latest_build: %s: checksum' not found or not a string", os)) &&
-	      check_json(latest["version"].isString(), "Node 'latest_build: version' not found or not a string") &&
-	      check_json(latest["datetime"].isString(), "Node 'latest_build: datetime' not found or not a string")
-	     ) ||
-	     (hash_found && !(
-	      check_json(current.isObject(), "JSON doesn't contain current_build section") &&
-	      check_json(current["version"].isString(), "Node 'current_build: datetime' not found or not a string") &&
-	      check_json(current["datetime"].isString(), "Node 'current_build: version' not found or not a string")
-	     )))
+	if (!latest[os].isObject() || !latest[os]["download"].isString() || !latest[os]["size"].isDouble() || !latest[os]["checksum"].isString() || !latest["version"].isString() ||
+	    !latest["datetime"].isString() ||
+	    (hash_found && (!current.isObject() || !current["version"].isString() || !current["datetime"].isString())))
 	{
+		update_log.error("Some information seems unavailable");
 		return false;
 	}
 
@@ -218,49 +167,37 @@ bool update_manager::handle_json(bool automatic, bool check_only, bool auto_acce
 
 	const qint64 diff_msec = cur_date.msecsTo(lts_date);
 
-	update_log.notice("Current: %s, latest: %s, difference: %lld ms", cur_str, lts_str, diff_msec);
+	update_log.notice("Current: %s, latest: %s, difference: %lld ms", cur_str.toStdString(), lts_str.toStdString(), diff_msec);
 
 	const Localized localized;
 
-	const QString new_version = latest["version"].toString();
-	m_new_version = new_version.toStdString();
-	const QString support_message = tr("<br>You can empower our project at <a href=\"https://rpcs3.net/patreon\">RPCS3 Patreon</a>.<br>");
-
 	if (hash_found)
 	{
-		const QString old_version = current["version"].toString();
-		m_old_version = old_version.toStdString();
-
 		if (diff_msec < 0)
 		{
 			// This usually means that the current version was marked as broken and won't be shipped anymore, so we need to downgrade to avoid certain bugs.
-			m_update_message = tr("A better version of RPCS3 is available!<br><br>Current version: %0 (%1)<br>Better version: %2 (%3)<br>%4<br>Do you want to update?")
-				.arg(old_version)
+			m_update_message = tr("A better version of RPCS3 is available!\n\nCurrent version: %0 (%1)\nBetter version: %2 (%3)\n\nDo you want to update?")
+				.arg(current["version"].toString())
 				.arg(cur_str)
-				.arg(new_version)
-				.arg(lts_str)
-				.arg(support_message);
+				.arg(latest["version"].toString())
+				.arg(lts_str);
 		}
 		else
 		{
-			m_update_message = tr("A new version of RPCS3 is available!<br><br>Current version: %0 (%1)<br>Latest version: %2 (%3)<br>Your version is %4 behind.<br>%5<br>Do you want to update?")
-				.arg(old_version)
+			m_update_message = tr("A new version of RPCS3 is available!\n\nCurrent version: %0 (%1)\nLatest version: %2 (%3)\nYour version is %4 old.\n\nDo you want to update?")
+				.arg(current["version"].toString())
 				.arg(cur_str)
-				.arg(new_version)
+				.arg(latest["version"].toString())
 				.arg(lts_str)
-				.arg(localized.GetVerboseTimeByMs(diff_msec, true))
-				.arg(support_message);
+				.arg(localized.GetVerboseTimeByMs(diff_msec, true));
 		}
 	}
 	else
 	{
-		m_old_version = fmt::format("%s-%s-%s", rpcs3::get_full_branch(), rpcs3::get_branch(), rpcs3::get_version().to_string());
-
-		m_update_message = tr("You're currently using a custom or PR build.<br><br>Latest version: %0 (%1)<br>The latest version is %2 old.<br>%3<br>Do you want to update to the latest official RPCS3 version?")
-			.arg(new_version)
+		m_update_message = tr("You're currently using a custom or PR build.\n\nLatest version: %0 (%1)\nThe latest version is %2 old.\n\nDo you want to update to the latest official RPCS3 version?")
+			.arg(latest["version"].toString())
 			.arg(lts_str)
-			.arg(localized.GetVerboseTimeByMs(std::abs(diff_msec), true))
-			.arg(support_message);
+			.arg(localized.GetVerboseTimeByMs(std::abs(diff_msec), true));
 	}
 
 	m_request_url   = latest[os]["download"].toString().toStdString();
@@ -275,66 +212,8 @@ bool update_manager::handle_json(bool automatic, bool check_only, bool auto_acce
 
 	update_log.notice("Update found: %s", m_request_url);
 
-	if (!auto_accept)
-	{
-		if (automatic && m_gui_settings->GetValue(gui::ib_skip_version).toString() == new_version)
-		{
-			update_log.notice("Skipping automatic update notification for version '%s' due to user preference", new_version);
-			m_downloader->close_progress_dialog();
-			return true;
-		}
-
-		const auto& changelog = json_data["changelog"];
-
-		if (changelog.isArray())
-		{
-			for (const QJsonValue& changelog_entry : changelog.toArray())
-			{
-				if (changelog_entry.isObject())
-				{
-					changelog_data entry;
-
-					if (QJsonValue version = changelog_entry["version"]; version.isString())
-					{
-						entry.version = version.toString();
-					}
-					else
-					{
-						entry.version = tr("N/A");
-						update_log.notice("JSON changelog entry does not contain a version string.");
-					}
-
-					if (QJsonValue title = changelog_entry["title"]; title.isString())
-					{
-						entry.title = title.toString();
-					}
-					else
-					{
-						entry.title = tr("N/A");
-						update_log.notice("JSON changelog entry does not contain a title string.");
-					}
-
-					m_changelog.push_back(entry);
-				}
-				else
-				{
-					update_log.error("JSON changelog entry is not an object.");
-				}
-			}
-		}
-		else if (changelog.isObject())
-		{
-			update_log.error("JSON changelog is not an array.");
-		}
-		else
-		{
-			update_log.notice("JSON does not contain a changelog section.");
-		}
-	}
-
 	if (check_only)
 	{
-		update_log.notice("Update postponed. Check only is active");
 		m_downloader->close_progress_dialog();
 		return true;
 	}
@@ -345,73 +224,17 @@ bool update_manager::handle_json(bool automatic, bool check_only, bool auto_acce
 
 void update_manager::update(bool auto_accept)
 {
-	update_log.notice("Updating with auto_accept=%d", auto_accept);
-
 	ensure(m_downloader);
 
-	if (!auto_accept)
+	if (!auto_accept && (m_update_message.isEmpty() ||
+		QMessageBox::question(m_downloader->get_progress_dialog() ? m_downloader->get_progress_dialog() : m_parent, tr("Update Available"), m_update_message, QMessageBox::Yes | QMessageBox::No) == QMessageBox::No))
 	{
-		if (m_update_message.isEmpty())
-		{
-			// This can happen if we abort the check_for_updates download. Just check again in this case.
-			update_log.notice("Aborting update: Update message is empty. Trying again...");
-			m_downloader->close_progress_dialog();
-			check_for_updates(false, false, false, m_parent);
-			return;
-		}
-
-		QString changelog_content;
-
-		for (const changelog_data& entry : m_changelog)
-		{
-			if (!changelog_content.isEmpty())
-				changelog_content.append('\n');
-			changelog_content.append(tr("• %0: %1").arg(entry.version, entry.title));
-		}
-
-		QMessageBox mb(QMessageBox::Icon::Question, tr("Update Available"), m_update_message, QMessageBox::Yes | QMessageBox::No, m_downloader->get_progress_dialog() ? m_downloader->get_progress_dialog() : m_parent);
-		mb.setTextFormat(Qt::RichText);
-		mb.setCheckBox(new QCheckBox(tr("Don't show again for this version")));
-
-		if (!changelog_content.isEmpty())
-		{
-			mb.setInformativeText(tr("To see the changelog, please click \"Show Details\"."));
-			mb.setDetailedText(tr("Changelog:\n\n%0").arg(changelog_content));
-
-			// Smartass hack to make the unresizeable message box wide enough for the changelog
-			const int changelog_width = QLabel(changelog_content).sizeHint().width();
-			if (QLabel(m_update_message).sizeHint().width() < changelog_width)
-			{
-				m_update_message += " &nbsp;";
-				while (QLabel(m_update_message).sizeHint().width() < changelog_width)
-				{
-					m_update_message += "&nbsp;";
-				}
-			}
-
-			mb.setText(m_update_message);
-		}
-
-		update_log.notice("Asking user for permission to update...");
-
-		if (mb.exec() == QMessageBox::No)
-		{
-			update_log.notice("Aborting update: User declined update");
-
-			if (mb.checkBox()->isChecked())
-			{
-				update_log.notice("User requested to skip further automatic update notifications for version '%s'", m_new_version);
-				m_gui_settings->SetValue(gui::ib_skip_version, QString::fromStdString(m_new_version));
-			}
-
-			m_downloader->close_progress_dialog();
-			return;
-		}
+		m_downloader->close_progress_dialog();
+		return;
 	}
 
 	if (!Emu.IsStopped())
 	{
-		update_log.notice("Aborting update: Emulation is running...");
 		m_downloader->close_progress_dialog();
 		QMessageBox::warning(m_parent, tr("Auto-updater"), tr("Please stop the emulation before trying to update."));
 		return;
@@ -439,14 +262,11 @@ void update_manager::update(bool auto_accept)
 		Q_EMIT signal_update_available(false);
 	});
 
-	update_log.notice("Downloading update...");
 	m_downloader->start(m_request_url, true, true, tr("Downloading Update"), true, m_expected_size);
 }
 
 bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept)
 {
-	update_log.notice("Download of update file finished. Updating rpcs3 with auto_accept=%d", auto_accept);
-
 	m_downloader->update_progress_dialog(tr("Updating RPCS3"));
 
 	if (m_expected_size != static_cast<u64>(data.size()))
@@ -455,26 +275,30 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept)
 		return false;
 	}
 
-	if (const std::string res_hash_string = sha256_get_hash(data.data(), data.size(), false);
+	if (const std::string res_hash_string = downloader::get_hash(data.data(), data.size(), false);
 		m_expected_hash != res_hash_string)
 	{
 		update_log.error("Hash mismatch: %s expected: %s", res_hash_string, m_expected_hash);
 		return false;
 	}
 
-#if defined(_WIN32) || defined(__APPLE__)
+#ifdef _WIN32
 
 	// Get executable path
-	const std::string exe_dir = fs::get_executable_dir();
-	const std::string orig_path = fs::get_executable_path();
-#ifdef _WIN32
-	const std::wstring wchar_orig_path = utf8_to_wchar(orig_path);
-	const std::string tmpfile_path = fs::get_temp_dir() + "\\rpcs3_update.7z";
-#else
-	const std::string tmpfile_path = fs::get_temp_dir() + "rpcs3_update.7z";
-#endif
+	const std::string orig_path = rpcs3::utils::get_exe_dir() + "rpcs3.exe";
 
-	update_log.notice("Writing temporary update file: %s", tmpfile_path);
+	std::wstring wchar_orig_path;
+	const auto tmp_size = MultiByteToWideChar(CP_UTF8, 0, orig_path.c_str(), -1, nullptr, 0);
+	wchar_orig_path.resize(tmp_size);
+	MultiByteToWideChar(CP_UTF8, 0, orig_path.c_str(), -1, wchar_orig_path.data(), tmp_size);
+
+	char temp_path[PATH_MAX];
+
+	GetTempPathA(sizeof(temp_path) - 1, temp_path);
+	temp_path[PATH_MAX - 1] = 0;
+
+	std::string tmpfile_path = temp_path;
+	tmpfile_path += "\\rpcs3_update.7z";
 
 	fs::file tmpfile(tmpfile_path, fs::read + fs::write + fs::create + fs::trunc);
 	if (!tmpfile)
@@ -489,72 +313,64 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept)
 	}
 	tmpfile.close();
 
-	update_log.notice("Unpacking update file: %s", tmpfile_path);
-
 	// 7z stuff (most of this stuff is from 7z Util sample and has been reworked to be more stl friendly)
 
-	CFileInStream archiveStream{};
-	CLookToRead2 lookStream{};
+	ISzAlloc allocImp;
+	ISzAlloc allocTempImp;
+
+	CFileInStream archiveStream;
+	CLookToRead2 lookStream;
 	CSzArEx db;
+	SRes res;
 	UInt16 temp_u16[PATH_MAX];
 	u8 temp_u8[PATH_MAX];
 	const usz kInputBufSize = static_cast<usz>(1u << 18u);
-	const ISzAlloc g_Alloc = {SzAlloc, SzFree};
+	const ISzAlloc g_Alloc     = {SzAlloc, SzFree};
 
-	ISzAlloc allocImp     = g_Alloc;
-	ISzAlloc allocTempImp = g_Alloc;
+	allocImp     = g_Alloc;
+	allocTempImp = g_Alloc;
 
-	const auto WRes_to_string = [](WRes res)
+	if (InFile_Open(&archiveStream.file, tmpfile_path.c_str()))
 	{
-#ifdef _WIN32
-		return fmt::format("0x%x='%s'", res, std::system_category().message(HRESULT_FROM_WIN32(res)));
-#else
-		return fmt::format("0x%x='%s'", res, strerror(res));
-#endif
-	};
-
-#ifdef _WIN32
-	const std::wstring tmpfile_path_w = utf8_to_wchar(tmpfile_path);
-	if (const WRes res = InFile_OpenW(&archiveStream.file, tmpfile_path_w.c_str()))
-	{
-		update_log.error("Failed to open temporary storage file: '%s' (error=%s)", tmpfile_path_w.c_str(), WRes_to_string(res));
+		update_log.error("Failed to open temporary storage file: %s", tmpfile_path);
 		return false;
 	}
-#else
-	if (const WRes res = InFile_Open(&archiveStream.file, tmpfile_path.c_str()))
-	{
-		update_log.error("Failed to open temporary storage file: '%s' (error=%s)", tmpfile_path, WRes_to_string(res));
-		return false;
-	}
-#endif
 
 	FileInStream_CreateVTable(&archiveStream);
 	LookToRead2_CreateVTable(&lookStream, False);
+	lookStream.buf = nullptr;
 
-	SRes res = SZ_OK;
-
-	lookStream.buf = static_cast<Byte*>(ISzAlloc_Alloc(&allocImp, kInputBufSize));
-	if (!lookStream.buf)
+	res = SZ_OK;
 	{
-		res = SZ_ERROR_MEM;
-	}
-	else
-	{
-		lookStream.bufSize    = kInputBufSize;
-		lookStream.realStream = &archiveStream.vt;
+		lookStream.buf = static_cast<Byte*>(ISzAlloc_Alloc(&allocImp, kInputBufSize));
+		if (!lookStream.buf)
+			res = SZ_ERROR_MEM;
+		else
+		{
+			lookStream.bufSize    = kInputBufSize;
+			lookStream.realStream = &archiveStream.vt;
+			LookToRead2_Init(&lookStream)
+		}
 	}
 
 	CrcGenerateTable();
 	SzArEx_Init(&db);
 
-	const auto error_free7z = [&]()
+	auto error_free7z = [&]()
 	{
 		SzArEx_Free(&db, &allocImp);
 		ISzAlloc_Free(&allocImp, lookStream.buf);
 
-		const WRes res2 = File_Close(&archiveStream.file);
-		if (res2) update_log.warning("7z failed to close file (error=%s)", WRes_to_string(res2));
-		if (res) update_log.error("7z decoder error: %s", WRes_to_string(res));
+		File_Close(&archiveStream.file);
+
+		switch (res)
+		{
+		case SZ_OK: break;
+		case SZ_ERROR_UNSUPPORTED: update_log.error("7z decoder doesn't support this archive"); break;
+		case SZ_ERROR_MEM: update_log.error("7z decoder failed to allocate memory"); break;
+		case SZ_ERROR_CRC: update_log.error("7z decoder CRC error"); break;
+		default: update_log.error("7z decoder error: %d", static_cast<u64>(res)); break;
+		}
 	};
 
 	if (res != SZ_OK)
@@ -570,35 +386,21 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept)
 		return false;
 	}
 
-	UInt32 blockIndex = 0xFFFFFFFF;
-	Byte* outBuffer   = nullptr;
+	UInt32 blockIndex    = 0xFFFFFFFF;
+	Byte* outBuffer      = nullptr;
 	usz outBufferSize = 0;
 
-#ifdef _WIN32
-	// Create temp folder for moving active files
-	const std::string tmp_folder = exe_dir + "rpcs3_old/";
-#else
-	// Create temp folder for extracting the new app
-	const std::string tmp_folder = fs::get_temp_dir() + "rpcs3_new/";
-#endif
+	// Creates temp folder for moving active files
+	const std::string tmp_folder = rpcs3::utils::get_emu_dir() + "rpcs3_old/";
 	fs::create_dir(tmp_folder);
 
 	for (UInt32 i = 0; i < db.NumFiles; i++)
 	{
 		usz offset           = 0;
 		usz outSizeProcessed = 0;
-		const bool isDir     = SzArEx_IsDir(&db, i);
-		[[maybe_unused]] const DWORD attribs = SzBitWithVals_Check(&db.Attribs, i) ? db.Attribs.Vals[i] : 0;
-#ifdef _WIN32
-		// This is commented out for now as we shouldn't need it and symlinks
-		// aren't well supported on Windows. Left in case it is needed in the future.
-		// const bool is_symlink = (attribs & FILE_ATTRIBUTE_REPARSE_POINT) != 0;
-		const bool is_symlink = false;
-#else
-		const DWORD permissions = (attribs >> 16) & (S_IRWXU | S_IRWXG | S_IRWXO);
-		const bool is_symlink = (attribs & FILE_ATTRIBUTE_UNIX_EXTENSION) != 0 && S_ISLNK(attribs >> 16);
-#endif
-		const usz len = SzArEx_GetFileNameUtf16(&db, i, nullptr);
+		usz len;
+		unsigned isDir = SzArEx_IsDir(&db, i);
+		len            = SzArEx_GetFileNameUtf16(&db, i, nullptr);
 
 		if (len >= PATH_MAX)
 		{
@@ -608,7 +410,7 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept)
 		}
 
 		SzArEx_GetFileNameUtf16(&db, i, temp_u16);
-		std::memset(temp_u8, 0, sizeof(temp_u8));
+		memset(temp_u8, 0, sizeof(temp_u8));
 		// Simplistic conversion to UTF-8
 		for (usz index = 0; index < len; index++)
 		{
@@ -622,12 +424,7 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept)
 			temp_u8[index] = static_cast<u8>(temp_u16[index]);
 		}
 		temp_u8[len] = 0;
-		const std::string archived_name = std::string(reinterpret_cast<char*>(temp_u8));
-#ifdef __APPLE__
-		const std::string name = tmp_folder + archived_name;
-#else
-		const std::string name = exe_dir + archived_name;
-#endif
+		const std::string name = rpcs3::utils::get_emu_dir() + std::string(reinterpret_cast<char*>(temp_u8));
 
 		if (!isDir)
 		{
@@ -636,7 +433,7 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept)
 				break;
 		}
 
-		if (const usz pos = name.find_last_of(fs::delim); pos != umax)
+		if (const usz pos = name.find_last_of('/'); pos != umax)
 		{
 			update_log.trace("Creating path: %s", name.substr(0, pos));
 			fs::create_path(name.substr(0, pos));
@@ -649,19 +446,11 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept)
 			continue;
 		}
 
-		if (is_symlink)
-		{
-			const std::string link_target(reinterpret_cast<const char*>(outBuffer + offset), outSizeProcessed);
-			update_log.trace("Creating symbolic link: %s -> %s", name, link_target);
-			fs::create_symlink(name, link_target);
-			continue;
-		}
-
 		fs::file outfile(name, fs::read + fs::write + fs::create + fs::trunc);
 		if (!outfile)
 		{
 			// File failed to open, probably because in use, rename existing file and try again
-			const auto pos = name.find_last_of(fs::delim);
+			const auto pos = name.find_last_of('/');
 			std::string filename;
 			if (pos == umax)
 				filename = name;
@@ -695,48 +484,57 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept)
 			break;
 		}
 		outfile.close();
-
-#ifndef _WIN32
-		// Apply correct file permissions.
-		chmod(name.c_str(), permissions);
-#endif
 	}
 
 	error_free7z();
 	if (res)
 		return false;
 
-	update_log.success("Update successful!");
-
 #else
 
-	std::string replace_path = fs::get_executable_path();
-	if (replace_path.empty())
+	std::string replace_path;
+
+	const char* appimage_path = ::getenv("APPIMAGE");
+	if (appimage_path != nullptr)
 	{
-		return false;
+		replace_path = appimage_path;
+		update_log.notice("Found AppImage path: %s", appimage_path);
+	}
+	else
+	{
+		update_log.warning("Failed to find AppImage path");
+		char exe_path[PATH_MAX];
+		ssize_t len = ::readlink("/proc/self/exe", exe_path, sizeof(exe_path) - 1);
+
+		if (len == -1)
+		{
+			update_log.error("Failed to find executable path");
+			return false;
+		}
+
+		exe_path[len] = '\0';
+		update_log.trace("Found exec path: %s", exe_path);
+
+		replace_path = exe_path;
 	}
 
 	// Move the appimage/exe and replace with new appimage
 	const std::string move_dest = replace_path + "_old";
-	if (!fs::rename(replace_path, move_dest, true))
-	{
-		// Simply log error for now
-		update_log.error("Failed to move old AppImage file: %s (%s)", replace_path, fs::g_tls_error);
-	}
+	fs::rename(replace_path, move_dest, true);
 	fs::file new_appimage(replace_path, fs::read + fs::write + fs::create + fs::trunc);
 	if (!new_appimage)
 	{
-		update_log.error("Failed to create new AppImage file: %s (%s)", replace_path, fs::g_tls_error);
+		update_log.error("Failed to create new AppImage file: %s", replace_path);
 		return false;
 	}
-	if (new_appimage.write(data.data(), data.size()) != data.size() + 0ull)
+	if (new_appimage.write(data.data(), data.size()) != data.size() + 0u)
 	{
 		update_log.error("Failed to write new AppImage file: %s", replace_path);
 		return false;
 	}
 	if (fchmod(new_appimage.get_handle(), S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == -1)
 	{
-		update_log.error("Failed to chmod rwxrxrx %s (%s)", replace_path, strerror(errno));
+		update_log.error("Failed to chmod rwxrxrx %s", replace_path);
 		return false;
 	}
 	new_appimage.close();
@@ -747,42 +545,19 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept)
 
 	m_downloader->close_progress_dialog();
 
-	// Add new version to log file
-	if (fs::file update_file{fs::get_config_dir() + "update_history.log", fs::create + fs::write + fs::append})
-	{
-		const std::string update_time = QDateTime::currentDateTime().toString("yyyy/MM/dd hh:mm:ss").toStdString();
-		const std::string entry = fmt::format("%s: Updated from \"%s\" to \"%s\"", update_time, m_old_version, m_new_version);
-		update_file.write(fmt::format("%s\n", entry));
-		update_log.notice("Added entry '%s' to update_history.log", entry);
-	}
-	else
-	{
-		update_log.error("Failed to append version to update_history.log");
-	}
-
 	if (!auto_accept)
 	{
-		m_gui_settings->ShowInfoBox(tr("Auto-updater"), tr("Update successful!<br>RPCS3 will now restart.<br>"), gui::ib_restart_hint, m_parent);
-		m_gui_settings->sync(); // Make sure to sync before terminating RPCS3
+		QMessageBox::information(m_parent, tr("Auto-updater"), tr("Update successful!\nRPCS3 will now restart."));
 	}
 
-	Emu.GracefulShutdown(false);
+	Emu.SetForceBoot(true);
+	Emu.Stop();
 	Emu.CleanUp();
 
 #ifdef _WIN32
-	update_log.notice("Relaunching %s with _wexecl", wchar_to_utf8(wchar_orig_path));
-	const int ret = _wexecl(wchar_orig_path.data(), wchar_orig_path.data(), L"--updating", nullptr);
-#elif defined(__APPLE__)
-	// Execute helper script to replace the app and relaunch
-	const std::string helper_script = fmt::format("%s/Contents/Resources/update_helper.sh", orig_path);
-	const std::string extracted_app = fmt::format("%s/RPCS3.app", tmp_folder);
-	update_log.notice("Executing update helper script: '%s %s %s'", helper_script, extracted_app, orig_path);
-	const int ret = execl(helper_script.c_str(), helper_script.c_str(), extracted_app.c_str(), orig_path.c_str(), nullptr);
+	const int ret = _wexecl(wchar_orig_path.data(), L"--updating", nullptr);
 #else
-	// execv is used for compatibility with checkrt
-	update_log.notice("Relaunching %s with execv", replace_path);
-	const char * const params[3] = { replace_path.c_str(), "--updating", nullptr };
-	const int ret = execv(replace_path.c_str(), const_cast<char * const *>(&params[0]));
+	const int ret = execl(replace_path.c_str(), "--updating", nullptr);
 #endif
 	if (ret == -1)
 	{
diff --git a/rpcs3/rpcs3qt/update_manager.h b/rpcs3/rpcs3qt/update_manager.h
index f6a534b0b2..146c470d20 100644
--- a/rpcs3/rpcs3qt/update_manager.h
+++ b/rpcs3/rpcs3qt/update_manager.h
@@ -7,7 +7,6 @@
 #include <string>
 
 class downloader;
-class gui_settings;
 
 class update_manager final :  public QObject
 {
@@ -17,29 +16,18 @@ private:
 	downloader* m_downloader = nullptr;
 	QWidget* m_parent        = nullptr;
 
-	std::shared_ptr<gui_settings> m_gui_settings;
-
 	// This message is empty if there is no download available
 	QString m_update_message;
 
-	struct changelog_data
-	{
-		QString version;
-		QString title;
-	};
-	std::vector<changelog_data> m_changelog;
-
 	std::string m_request_url;
 	std::string m_expected_hash;
-	std::string m_old_version;
-	std::string m_new_version;
 	u64 m_expected_size = 0;
 
 	bool handle_json(bool automatic, bool check_only, bool auto_accept, const QByteArray& data);
 	bool handle_rpcs3(const QByteArray& data, bool auto_accept);
 
 public:
-	update_manager(QObject* parent, std::shared_ptr<gui_settings> gui_settings);
+	update_manager() = default;
 	void check_for_updates(bool automatic, bool check_only, bool auto_accept, QWidget* parent = nullptr);
 	void update(bool auto_accept);
 
diff --git a/rpcs3/rpcs3qt/user_account.h b/rpcs3/rpcs3qt/user_account.h
index dd2e1a3d3c..3740fd233b 100644
--- a/rpcs3/rpcs3qt/user_account.h
+++ b/rpcs3/rpcs3qt/user_account.h
@@ -5,7 +5,7 @@
 #include <map>
 #include <string>
 
-// Do not confuse this with the "user" in Emu/System.h.
+// Do not confuse this with the "user" in Emu/System.h. 
 // That user is read from config.yml, and it only represents the currently "logged in" user.
 // The user_account class will represent all users in the home directory for the User Manager dialog.
 // Selecting a user account in this dialog and saving writes it to config.yml.
@@ -14,9 +14,9 @@ class user_account
 public:
 	explicit user_account(const std::string& user_id = "00000001");
 
-	const std::string& GetUserId() const { return m_user_id; }
-	const std::string& GetUserDir() const { return m_user_dir; }
-	const std::string& GetUsername() const { return m_username; }
+	std::string GetUserId() const { return m_user_id; }
+	std::string GetUserDir() const { return m_user_dir; }
+	std::string GetUsername() const { return m_username; }
 
 	static std::map<u32, user_account> GetUserAccounts(const std::string& base_dir);
 
diff --git a/rpcs3/rpcs3qt/user_manager_dialog.cpp b/rpcs3/rpcs3qt/user_manager_dialog.cpp
index 48e017ea8f..f91de76396 100644
--- a/rpcs3/rpcs3qt/user_manager_dialog.cpp
+++ b/rpcs3/rpcs3qt/user_manager_dialog.cpp
@@ -1,7 +1,6 @@
-#include <QRegularExpressionValidator>
+#include <QRegExpValidator>
 #include <QInputDialog>
 #include <QKeyEvent>
-#include <QMouseEvent>
 #include <QEvent>
 #include <QScreen>
 #include <QHeaderView>
@@ -11,20 +10,23 @@
 #include <QDesktopServices>
 #include <QMessageBox>
 #include <QGuiApplication>
+#include <QUrl>
 
 #include "user_manager_dialog.h"
 #include "table_item_delegate.h"
 #include "main_application.h"
 #include "gui_settings.h"
 #include "persistent_settings.h"
-#include "qt_utils.h"
 
 #include "Emu/System.h"
 #include "Emu/system_utils.hpp"
 
+#include "Utilities/StrUtil.h"
 #include "Utilities/File.h"
 #include "util/logs.hpp"
 
+constexpr auto qstr = QString::fromStdString;
+
 LOG_CHANNEL(gui_log, "GUI");
 
 user_manager_dialog::user_manager_dialog(std::shared_ptr<gui_settings> gui_settings, std::shared_ptr<persistent_settings> persistent_settings, QWidget* parent)
@@ -142,7 +144,7 @@ void user_manager_dialog::UpdateTable(bool mark_only)
 
 	if (mark_only)
 	{
-		const QString active_user = QString::fromStdString(m_active_user);
+		const QString active_user = qstr(m_active_user);
 
 		for (int i = 0; i < m_table->rowCount(); i++)
 		{
@@ -174,12 +176,12 @@ void user_manager_dialog::UpdateTable(bool mark_only)
 	int row = 0;
 	for (auto& [id, account] : m_user_list)
 	{
-		QTableWidgetItem* user_id_item = new QTableWidgetItem(QString::fromStdString(account.GetUserId()));
+		QTableWidgetItem* user_id_item = new QTableWidgetItem(qstr(account.GetUserId()));
 		user_id_item->setData(Qt::UserRole, id); // For sorting to work properly
 		user_id_item->setFlags(user_id_item->flags() & ~Qt::ItemIsEditable);
 		m_table->setItem(row, 0, user_id_item);
 
-		QTableWidgetItem* username_item = new QTableWidgetItem(QString::fromStdString(account.GetUsername()));
+		QTableWidgetItem* username_item = new QTableWidgetItem(qstr(account.GetUsername()));
 		username_item->setData(Qt::UserRole, id); // For sorting to work properly
 		username_item->setFlags(username_item->flags() & ~Qt::ItemIsEditable);
 		m_table->setItem(row, 1, username_item);
@@ -216,12 +218,12 @@ void user_manager_dialog::OnUserRemove()
 		return;
 	}
 
-	const QString username = QString::fromStdString(m_user_list[key].GetUsername());
-	const QString user_id = QString::fromStdString(m_user_list[key].GetUserId());
+	const QString username = qstr(m_user_list[key].GetUsername());
+	const QString user_id = qstr(m_user_list[key].GetUserId());
 	const std::string user_dir = m_user_list[key].GetUserDir();
 
 	if (QMessageBox::question(this, tr("Delete Confirmation"), tr("Are you sure you want to delete the following user?\n\nUser ID: %0\nUsername: %1\n\n"
-		"This will remove all files in:\n%2").arg(user_id).arg(username).arg(QString::fromStdString(user_dir)), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
+		"This will remove all files in:\n%2").arg(user_id).arg(username).arg(qstr(user_dir)), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
 	{
 		gui_log.warning("Deleting user: %s", user_dir);
 		fs::remove_all(user_dir);
@@ -248,7 +250,7 @@ bool user_manager_dialog::ValidateUsername(const QString& text_to_validate)
 {
 	// "Entire string (^...$) must be between 3 and 16 characters
 	// and only consist of letters, numbers, underscores, and hyphens."
-	const QRegularExpressionValidator validator(QRegularExpression("^[A-Za-z0-9_-]{3,16}$"));
+	const QRegExpValidator validator(QRegExp("^[A-Za-z0-9_-]{3,16}$"));
 
 	int pos = 0;
 	QString text = text_to_validate;
@@ -265,11 +267,11 @@ void user_manager_dialog::OnUserRename()
 
 	const std::string user_id = m_user_list[key].GetUserId();
 	const std::string username = m_user_list[key].GetUsername();
-	const QString q_username = QString::fromStdString(username);
+	const QString q_username = qstr(username);
 
 	QInputDialog* dialog = new QInputDialog(this);
 	dialog->setWindowTitle(tr("Rename User"));
-	dialog->setLabelText(tr("User Id: %0\nOld Username: %1\n\nNew Username: ").arg(QString::fromStdString(user_id)).arg(q_username));
+	dialog->setLabelText(tr("User Id: %0\nOld Username: %1\n\nNew Username: ").arg(qstr(user_id)).arg(q_username));
 	dialog->setTextValue(q_username);
 	dialog->resize(200, 100);
 
@@ -327,7 +329,7 @@ void user_manager_dialog::OnUserCreate()
 
 	QInputDialog* dialog = new QInputDialog(this);
 	dialog->setWindowTitle(tr("New User"));
-	dialog->setLabelText(tr("New User ID: %0\n\nNew Username: ").arg(QString::fromStdString(next_user_id)));
+	dialog->setLabelText(tr("New User ID: %0\n\nNew Username: ").arg(qstr(next_user_id)));
 	dialog->resize(200, 100);
 
 	while (dialog->exec() != QDialog::Rejected)
@@ -349,26 +351,22 @@ void user_manager_dialog::OnUserCreate()
 
 void user_manager_dialog::OnUserLogin()
 {
-	if (!Emu.IsStopped())
+	if (!Emu.IsStopped() && QMessageBox::question(this, tr("Stop emulator?"),
+		tr("In order to change the user you have to stop the emulator first.\n\nStop the emulator now?"),
+		QMessageBox::Yes | QMessageBox::Abort) != QMessageBox::Yes)
 	{
-		if (QMessageBox::question(this, tr("Stop emulator?"),
-			tr("In order to change the user you have to stop the emulator first.\n\nStop the emulator now?"),
-			QMessageBox::Yes | QMessageBox::Abort) != QMessageBox::Yes)
-		{
-			return;
-		}
-
-		gui_log.notice("Stopping current emulation in order to change the current user.");
-		Emu.GracefulShutdown(false);
+		return;
 	}
 
+	Emu.Stop();
+
 	const u32 key = GetUserKey();
 	const std::string new_user = m_user_list[key].GetUserId();
 
 	main_application::InitializeEmulator(new_user, Emu.HasGui());
 
 	m_active_user = new_user;
-	m_persistent_settings->SetValue(gui::persistent::active_user, QString::fromStdString(m_active_user));
+	m_persistent_settings->SetValue(gui::persistent::active_user, qstr(m_active_user));
 	UpdateTable(true);
 	Q_EMIT OnUserLoginSuccess();
 }
@@ -423,8 +421,8 @@ void user_manager_dialog::ShowContextMenu(const QPoint &pos)
 	connect(login_act, &QAction::triggered, this, &user_manager_dialog::OnUserLogin);
 	connect(show_dir_act, &QAction::triggered, this, [this, key]()
 	{
-		const QString path = QString::fromStdString(m_user_list[key].GetUserDir());
-		gui::utils::open_dir(path);
+		const QString path = qstr(m_user_list[key].GetUserDir());
+		QDesktopServices::openUrl(QUrl::fromLocalFile(path));
 	});
 
 	connect(user_id_act, &QAction::triggered, this, [this] {OnSort(0); });
@@ -494,18 +492,3 @@ bool user_manager_dialog::eventFilter(QObject *object, QEvent *event)
 
 	return QDialog::eventFilter(object, event);
 }
-
-void user_manager_dialog::mouseDoubleClickEvent(QMouseEvent* ev)
-{
-	if (!ev) return;
-
-	// Qt's itemDoubleClicked signal doesn't distinguish between mouse buttons and there is no simple way to get the pressed button.
-	// So we have to ignore this event when another button is pressed.
-	if (ev->button() != Qt::LeftButton)
-	{
-		ev->ignore();
-		return;
-	}
-
-	QDialog::mouseDoubleClickEvent(ev);
-}
diff --git a/rpcs3/rpcs3qt/user_manager_dialog.h b/rpcs3/rpcs3qt/user_manager_dialog.h
index 75d0ba23e1..93fbc3245c 100644
--- a/rpcs3/rpcs3qt/user_manager_dialog.h
+++ b/rpcs3/rpcs3qt/user_manager_dialog.h
@@ -15,23 +15,16 @@ class persistent_settings;
 class user_manager_dialog : public QDialog
 {
 	Q_OBJECT
-
 public:
 	explicit user_manager_dialog(std::shared_ptr<gui_settings> gui_settings, std::shared_ptr<persistent_settings> persistent_settings, QWidget* parent = nullptr);
-
 Q_SIGNALS:
 	void OnUserLoginSuccess();
-
 private Q_SLOTS:
 	void OnUserLogin();
 	void OnUserCreate();
 	void OnUserRemove();
 	void OnUserRename();
 	void OnSort(int logicalIndex);
-
-protected:
-	void mouseDoubleClickEvent(QMouseEvent* ev) override;
-
 private:
 	void Init();
 	void UpdateTable(bool mark_only = false);
diff --git a/rpcs3/rpcs3qt/uuid.cpp b/rpcs3/rpcs3qt/uuid.cpp
deleted file mode 100644
index d3f3f58b77..0000000000
--- a/rpcs3/rpcs3qt/uuid.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "stdafx.h"
-#include "uuid.h"
-#include "Utilities/StrUtil.h"
-
-#include <QUuid>
-#include <QRegularExpressionValidator>
-
-LOG_CHANNEL(uuid_log, "UUID");
-
-namespace gui
-{
-	namespace utils
-	{
-		std::string get_uuid_path()
-		{
-			const std::string config_dir = fs::get_config_dir(true);
-			const std::string uuid_path = config_dir + "uuid";
-#ifdef _WIN32
-			if (!fs::create_path(config_dir))
-			{
-				uuid_log.error("Could not create path: %s (%s)", uuid_path, fs::g_tls_error);
-			}
-#endif
-			return uuid_path;
-		}
-
-		std::string make_uuid()
-		{
-			return QUuid::createUuid().toString().toStdString();
-		}
-
-		std::string load_uuid()
-		{
-			const std::string uuid_path = get_uuid_path();
-
-			if (!fs::is_file(uuid_path))
-			{
-				uuid_log.notice("File does not exist: %s (%s)", uuid_path, fs::g_tls_error);
-				return {};
-			}
-
-			if (fs::file uuid_file = fs::file(uuid_path); uuid_file)
-			{
-				const std::string uuid = fmt::trim(uuid_file.to_string());
-
-				if (!validate_uuid(uuid))
-				{
-					uuid_log.error("Invalid uuid '%s' found in file: %s", uuid, uuid_path);
-					return {};
-				}
-
-				return uuid;
-			}
-
-			uuid_log.error("Could not open file: %s (%s)", uuid_path, fs::g_tls_error);
-			return {};
-		}
-
-		bool validate_uuid(const std::string& uuid)
-		{
-			const QRegularExpressionValidator validator(QRegularExpression("^[a-fA-F0-9{}-]*$"));
-			QString test_string = QString::fromStdString(uuid);
-			int pos = 0;
-
-			if (uuid.empty() || !uuid.starts_with("{") || !uuid.ends_with("}") || validator.validate(test_string, pos) == QValidator::State::Invalid)
-			{
-				return false;
-			}
-
-			return true;
-		}
-
-		bool save_uuid(const std::string& uuid)
-		{
-			if (!validate_uuid(uuid))
-			{
-				uuid_log.error("Can not save invalid uuid '%s'", uuid);
-				return false;
-			}
-
-			const std::string uuid_path = get_uuid_path();
-
-			if (fs::file uuid_file(uuid_path, fs::rewrite); !uuid_file || !uuid_file.write(uuid))
-			{
-				uuid_log.error("Could not write file: %s (%s)", uuid_path, fs::g_tls_error);
-				return false;
-			}
-
-			uuid_log.notice("Wrote to file: %s", uuid_path);
-			return true;
-		}
-
-		bool create_new_uuid(std::string& uuid)
-		{
-			uuid = make_uuid();
-
-			if (uuid.empty())
-			{
-				uuid_log.error("Empty uuid");
-				return false;
-			}
-
-			if (!save_uuid(uuid))
-			{
-				uuid_log.error("Failed to save uuid");
-				return false;
-			}
-
-			return true;
-		}
-
-		void log_uuid()
-		{
-			std::string uuid = load_uuid();
-
-			if (uuid.empty())
-			{
-				if (!create_new_uuid(uuid))
-				{
-					return;
-				}
-			}
-
-			uuid_log.notice("Installation ID: %s", uuid);
-		}
-	}
-}
diff --git a/rpcs3/rpcs3qt/uuid.h b/rpcs3/rpcs3qt/uuid.h
deleted file mode 100644
index b12b605943..0000000000
--- a/rpcs3/rpcs3qt/uuid.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-namespace gui
-{
-	namespace utils
-	{
-		std::string get_uuid_path();
-		std::string make_uuid();
-		std::string load_uuid();
-
-		bool validate_uuid(const std::string& uuid);
-		bool save_uuid(const std::string& uuid);
-		bool create_new_uuid(std::string& uuid);
-
-		void log_uuid();
-	}
-}
diff --git a/rpcs3/rpcs3qt/vfs_dialog.cpp b/rpcs3/rpcs3qt/vfs_dialog.cpp
index 9a22017437..4e0b60be8f 100644
--- a/rpcs3/rpcs3qt/vfs_dialog.cpp
+++ b/rpcs3/rpcs3qt/vfs_dialog.cpp
@@ -1,7 +1,7 @@
 #include "vfs_dialog.h"
 #include "vfs_dialog_tab.h"
-#include "vfs_dialog_usb_tab.h"
 #include "gui_settings.h"
+#include "emu_settings_type.h"
 
 #include <QTabWidget>
 #include <QDialogButtonBox>
@@ -10,30 +10,39 @@
 #include <QVBoxLayout>
 
 #include "Emu/System.h"
-#include "Emu/system_utils.hpp"
-#include "Emu/vfs_config.h"
+#include "Emu/system_config.h"
 
-vfs_dialog::vfs_dialog(std::shared_ptr<gui_settings> _gui_settings, QWidget* parent)
-	: QDialog(parent), m_gui_settings(std::move(_gui_settings))
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
+
+vfs_dialog::vfs_dialog(std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, QWidget* parent)
+	: QDialog(parent), m_gui_settings(std::move(guiSettings)), m_emu_settings(std::move(emuSettings))
 {
-	setWindowTitle(tr("Virtual File System"));
-	setObjectName("vfs_dialog");
-
 	QTabWidget* tabs = new QTabWidget();
 	tabs->setUsesScrollButtons(false);
 
-	g_cfg_vfs.load();
+	m_emu_settings->LoadSettings();
 
 	// Create tabs
-	vfs_dialog_tab* emulator_tab = new vfs_dialog_tab("$(EmulatorDir)", gui::fs_emulator_dir_list, &g_cfg_vfs.emulator_dir, m_gui_settings, this);
-	vfs_dialog_tab* dev_hdd0_tab = new vfs_dialog_tab("dev_hdd0", gui::fs_dev_hdd0_list, &g_cfg_vfs.dev_hdd0, m_gui_settings, this);
-	vfs_dialog_tab* dev_hdd1_tab = new vfs_dialog_tab("dev_hdd1", gui::fs_dev_hdd1_list, &g_cfg_vfs.dev_hdd1, m_gui_settings, this);
-	vfs_dialog_tab* dev_flash_tab = new vfs_dialog_tab("dev_flash", gui::fs_dev_flash_list, &g_cfg_vfs.dev_flash, m_gui_settings, this);
-	vfs_dialog_tab* dev_flash2_tab = new vfs_dialog_tab("dev_flash2", gui::fs_dev_flash2_list, &g_cfg_vfs.dev_flash2, m_gui_settings, this);
-	vfs_dialog_tab* dev_flash3_tab = new vfs_dialog_tab("dev_flash3", gui::fs_dev_flash3_list, &g_cfg_vfs.dev_flash3, m_gui_settings, this);
-	vfs_dialog_tab* dev_bdvd_tab = new vfs_dialog_tab("dev_bdvd", gui::fs_dev_bdvd_list, &g_cfg_vfs.dev_bdvd, m_gui_settings, this);
-	vfs_dialog_usb_tab* dev_usb_tab = new vfs_dialog_usb_tab(&g_cfg_vfs.dev_usb, m_gui_settings, this);
-	vfs_dialog_tab* games_tab = new vfs_dialog_tab("games", gui::fs_games_list, &g_cfg_vfs.games_dir, m_gui_settings, this);
+	vfs_dialog_tab* emulator_tab = new vfs_dialog_tab({ "$(EmulatorDir)", emu_settings_type::emulatorLocation, gui::fs_emulator_dir_list, &g_cfg.vfs.emulator_dir },
+		m_gui_settings, m_emu_settings, this);
+
+	vfs_dialog_tab* dev_hdd0_tab = new vfs_dialog_tab({ "dev_hdd0", emu_settings_type::dev_hdd0Location, gui::fs_dev_hdd0_list, &g_cfg.vfs.dev_hdd0 },
+		m_gui_settings, m_emu_settings, this);
+
+	vfs_dialog_tab* dev_hdd1_tab = new vfs_dialog_tab({ "dev_hdd1", emu_settings_type::dev_hdd1Location, gui::fs_dev_hdd1_list, &g_cfg.vfs.dev_hdd1 },
+		m_gui_settings, m_emu_settings, this);
+
+	vfs_dialog_tab* dev_flash_tab = new vfs_dialog_tab({ "dev_flash", emu_settings_type::dev_flashLocation, gui::fs_dev_flash_list, &g_cfg.vfs.dev_flash },
+		m_gui_settings, m_emu_settings, this);
+
+	vfs_dialog_tab* dev_flash2_tab = new vfs_dialog_tab({ "dev_flash2", emu_settings_type::dev_flash2Location, gui::fs_dev_flash2_list, &g_cfg.vfs.dev_flash2 },
+		m_gui_settings, m_emu_settings, this);
+
+	vfs_dialog_tab* dev_flash3_tab = new vfs_dialog_tab({ "dev_flash3", emu_settings_type::dev_flash3Location, gui::fs_dev_flash3_list, &g_cfg.vfs.dev_flash3 },
+		m_gui_settings, m_emu_settings, this);
+
+	vfs_dialog_tab* dev_usb000_tab = new vfs_dialog_tab({ "dev_usb000", emu_settings_type::dev_usb000Location, gui::fs_dev_usb000_list, &g_cfg.vfs.dev_usb000 },
+		m_gui_settings, m_emu_settings, this);
 
 	tabs->addTab(emulator_tab, "$(EmulatorDir)");
 	tabs->addTab(dev_hdd0_tab, "dev_hdd0");
@@ -41,16 +50,14 @@ vfs_dialog::vfs_dialog(std::shared_ptr<gui_settings> _gui_settings, QWidget* par
 	tabs->addTab(dev_flash_tab, "dev_flash");
 	tabs->addTab(dev_flash2_tab, "dev_flash2");
 	tabs->addTab(dev_flash3_tab, "dev_flash3");
-	tabs->addTab(dev_bdvd_tab, "dev_bdvd");
-	tabs->addTab(dev_usb_tab, "dev_usb");
-	tabs->addTab(games_tab, "games");
+	tabs->addTab(dev_usb000_tab, "dev_usb000");
 
 	// Create buttons
 	QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Close | QDialogButtonBox::Save | QDialogButtonBox::RestoreDefaults);
 	buttons->button(QDialogButtonBox::RestoreDefaults)->setText(tr("Reset Directories"));
 	buttons->button(QDialogButtonBox::Save)->setDefault(true);
 
-	connect(buttons, &QDialogButtonBox::clicked, this, [this, buttons, tabs](QAbstractButton* button)
+	connect(buttons, &QDialogButtonBox::clicked, [=, this](QAbstractButton* button)
 	{
 		if (button == buttons->button(QDialogButtonBox::RestoreDefaults))
 		{
@@ -59,42 +66,16 @@ vfs_dialog::vfs_dialog(std::shared_ptr<gui_settings> _gui_settings, QWidget* par
 
 			for (int i = 0; i < tabs->count(); ++i)
 			{
-				if (tabs->tabText(i) == "dev_usb")
-				{
-					static_cast<vfs_dialog_usb_tab*>(tabs->widget(i))->reset();
-				}
-				else
-				{
-					static_cast<vfs_dialog_tab*>(tabs->widget(i))->reset();
-				}
+				static_cast<vfs_dialog_tab*>(tabs->widget(i))->Reset();
 			}
 		}
 		else if (button == buttons->button(QDialogButtonBox::Save))
 		{
 			for (int i = 0; i < tabs->count(); ++i)
 			{
-				if (tabs->tabText(i) == "dev_usb")
-				{
-					static_cast<vfs_dialog_usb_tab*>(tabs->widget(i))->set_settings();
-				}
-				else if (tabs->tabText(i) == "games")
-				{
-					// Check if the games folder changed. If changed, reconciliate the game list for the old folder before setting the new one
-					if (const std::string games_dir = rpcs3::utils::get_games_dir(); games_dir != static_cast<vfs_dialog_tab*>(tabs->widget(i))->get_selected_path())
-					{
-						// Remove the detected serials (title id) belonging to old folder from the game list in memory and also in "games.yml" file
-						Emu.RemoveGamesFromDir(games_dir);
-					}
-
-					static_cast<vfs_dialog_tab*>(tabs->widget(i))->set_settings(); // set new folder
-				}
-				else
-				{
-					static_cast<vfs_dialog_tab*>(tabs->widget(i))->set_settings();
-				}
+				static_cast<vfs_dialog_tab*>(tabs->widget(i))->SetSettings();
 			}
-
-			g_cfg_vfs.save();
+			m_emu_settings->SaveSettings();
 
 			// Recreate folder structure for new VFS paths
 			if (Emu.IsStopped())
@@ -115,6 +96,8 @@ vfs_dialog::vfs_dialog(std::shared_ptr<gui_settings> _gui_settings, QWidget* par
 	vbox->addWidget(buttons);
 
 	setLayout(vbox);
+	setWindowTitle(tr("Virtual File System"));
+	setObjectName("vfs_dialog");
 
 	buttons->button(QDialogButtonBox::Save)->setFocus();
 }
diff --git a/rpcs3/rpcs3qt/vfs_dialog.h b/rpcs3/rpcs3qt/vfs_dialog.h
index 18adf2c115..89d59922bf 100644
--- a/rpcs3/rpcs3qt/vfs_dialog.h
+++ b/rpcs3/rpcs3qt/vfs_dialog.h
@@ -3,13 +3,15 @@
 #include <QDialog>
 
 class gui_settings;
+class emu_settings;
 
 class vfs_dialog : public QDialog
 {
 	Q_OBJECT
 
 public:
-	explicit vfs_dialog(std::shared_ptr<gui_settings> _gui_settings, QWidget* parent = nullptr);
+	explicit vfs_dialog(std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, QWidget* parent = nullptr);
 private:
 	std::shared_ptr<gui_settings> m_gui_settings;
+	std::shared_ptr<emu_settings> m_emu_settings;
 };
diff --git a/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp b/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp
deleted file mode 100644
index a540278133..0000000000
--- a/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-#include "vfs_dialog_path_widget.h"
-
-#include <QFileDialog>
-#include <QCoreApplication>
-#include <QHBoxLayout>
-#include <QPushButton>
-
-vfs_dialog_path_widget::vfs_dialog_path_widget(const QString& name, const QString& current_path, QString default_path, gui_save list_location, std::shared_ptr<gui_settings> _gui_settings, QWidget* parent)
-	: QWidget(parent), m_default_path(std::move(default_path)), m_list_location(std::move(list_location)), m_gui_settings(std::move(_gui_settings))
-{
-	m_dir_list = new QListWidget(this);
-
-	const QStringList all_dirs = m_gui_settings->GetValue(m_list_location).toStringList();
-
-	QListWidgetItem* selected_item = nullptr;
-
-	for (const QString& dir : all_dirs)
-	{
-		QListWidgetItem* item = add_directory(dir);
-
-		if (dir == current_path)
-			selected_item = item;
-	}
-
-	// We must show the currently selected config.
-	if (!selected_item)
-		selected_item = add_directory(current_path);
-
-	selected_item->setSelected(true);
-
-	m_dir_list->setMinimumWidth(m_dir_list->sizeHintForColumn(0));
-
-	QPushButton* add_directory_button = new QPushButton(QStringLiteral("+"));
-	add_directory_button->setToolTip(tr("Add new directory"));
-	add_directory_button->setFixedWidth(add_directory_button->sizeHint().height()); // Make button square
-	connect(add_directory_button, &QAbstractButton::clicked, this, &vfs_dialog_path_widget::add_new_directory);
-
-	QPushButton* button_remove_dir = new QPushButton(QStringLiteral("-"));
-	button_remove_dir->setToolTip(tr("Remove directory"));
-	button_remove_dir->setFixedWidth(button_remove_dir->sizeHint().height()); // Make button square
-	button_remove_dir->setEnabled(false);
-	connect(button_remove_dir, &QAbstractButton::clicked, this, &vfs_dialog_path_widget::remove_directory);
-
-	QHBoxLayout* selected_config_layout = new QHBoxLayout;
-	m_selected_config_label = new QLabel(current_path.isEmpty() ? EmptyPath : current_path);
-	selected_config_layout->addWidget(new QLabel(tr("Used %0 directory:").arg(name)));
-	selected_config_layout->addWidget(m_selected_config_label);
-	selected_config_layout->addStretch();
-	selected_config_layout->addWidget(add_directory_button);
-	selected_config_layout->addWidget(button_remove_dir);
-
-	QVBoxLayout* vbox = new QVBoxLayout;
-	vbox->addWidget(m_dir_list);
-	vbox->addLayout(selected_config_layout);
-
-	setLayout(vbox);
-
-	update_selection();
-
-	connect(m_dir_list->model(), &QAbstractItemModel::dataChanged, this, [this](const QModelIndex&, const QModelIndex&, const QList<int>& roles)
-	{
-		if (m_is_changing_data || (!roles.empty() && !roles.contains(Qt::ItemDataRole::CheckStateRole)))
-		{
-			return;
-		}
-
-		// Check if an item was selected
-		const QString selected_path = m_selected_config_label->text() == EmptyPath ? "" : m_selected_config_label->text();
-		QAbstractItemModel* model = m_dir_list->model();
-
-		for (int i = 0; i < model->rowCount(); ++i)
-		{
-			if (model->index(i, 0).data(Qt::ItemDataRole::CheckStateRole).toInt() != Qt::Checked) continue;
-
-			const QString path = model->index(i, 0).data(Qt::ItemDataRole::DisplayRole).toString();
-			if (path == selected_path) continue;
-
-			// Select new path
-			m_selected_config_label->setText(path.isEmpty() ? EmptyPath : path);
-			update_selection();
-			break;
-		}
-	});
-
-	connect(m_dir_list, &QListWidget::currentRowChanged, this, [this, button_remove_dir](int row)
-	{
-		button_remove_dir->setEnabled(m_dir_list->item(row) && row > 0);
-	});
-}
-
-void vfs_dialog_path_widget::reset()
-{
-	m_dir_list->clear();
-	m_dir_list->setCurrentItem(add_directory(m_default_path));
-	update_selection();
-}
-
-QListWidgetItem* vfs_dialog_path_widget::add_directory(const QString& path)
-{
-	// Make sure to only add a path once
-	for (int i = 0; i < m_dir_list->count(); ++i)
-	{
-		if (m_dir_list->item(i)->text() == path)
-		{
-			return nullptr;
-		}
-	}
-
-	QListWidgetItem* item = new QListWidgetItem(path, m_dir_list);
-	item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
-
-	return item;
-}
-
-void vfs_dialog_path_widget::add_new_directory()
-{
-	QString dir = QFileDialog::getExistingDirectory(nullptr, tr("Choose a directory"), QCoreApplication::applicationDirPath(), QFileDialog::DontResolveSymlinks);
-
-	if (dir.isEmpty())
-		return;
-
-	if (!dir.endsWith("/"))
-		dir += '/';
-
-	m_dir_list->setCurrentItem(add_directory(dir));
-	update_selection();
-}
-
-void vfs_dialog_path_widget::remove_directory()
-{
-	if (const int row = m_dir_list->currentRow(); row > 0)
-	{
-		QListWidgetItem* item = m_dir_list->takeItem(row);
-		delete item;
-
-		update_selection();
-	}
-}
-
-void vfs_dialog_path_widget::update_selection()
-{
-	const int count = m_dir_list->count();
-	if (count <= 0) return;
-
-	const QString selected_path = m_selected_config_label->text();
-	bool found_path = false;
-
-	m_is_changing_data = true;
-
-	for (int i = 0; i < count; i++)
-	{
-		if (QListWidgetItem* item = m_dir_list->item(i))
-		{
-			const bool is_selected = item->text() == selected_path;
-			item->setCheckState(is_selected ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
-
-			if (is_selected)
-			{
-				m_dir_list->setCurrentItem(item);
-				found_path = true;
-			}
-		}
-	}
-
-	if (!found_path)
-	{
-		QListWidgetItem* item = m_dir_list->item(0);
-		m_selected_config_label->setText(item->text().isEmpty() ? EmptyPath : item->text());
-		item->setCheckState(Qt::CheckState::Checked);
-		m_dir_list->setCurrentItem(item);
-	}
-
-	m_is_changing_data = false;
-}
-
-QStringList vfs_dialog_path_widget::get_dir_list() const
-{
-	QStringList all_dirs;
-	for (int i = 0; i < m_dir_list->count(); ++i)
-	{
-		all_dirs += m_dir_list->item(i)->text();
-	}
-	return all_dirs;
-}
-
-std::string vfs_dialog_path_widget::get_selected_path() const
-{
-	return m_selected_config_label->text() == EmptyPath ? "" : m_selected_config_label->text().toStdString();
-}
diff --git a/rpcs3/rpcs3qt/vfs_dialog_path_widget.h b/rpcs3/rpcs3qt/vfs_dialog_path_widget.h
deleted file mode 100644
index 698d090509..0000000000
--- a/rpcs3/rpcs3qt/vfs_dialog_path_widget.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include "gui_settings.h"
-
-#include <QListWidget>
-#include <QLabel>
-
-#include <memory>
-
-namespace cfg
-{
-	class string;
-}
-
-class vfs_dialog_path_widget : public QWidget
-{
-	Q_OBJECT
-
-public:
-	explicit vfs_dialog_path_widget(const QString& name, const QString& current_path, QString default_path, gui_save list_location, std::shared_ptr<gui_settings> _gui_settings, QWidget* parent = nullptr);
-	QStringList get_dir_list() const;
-	std::string get_selected_path() const;
-
-	// Reset this widget without saving the settings yet
-	void reset();
-
-protected:
-	QListWidgetItem* add_directory(const QString& path);
-	void add_new_directory();
-	void remove_directory();
-
-	void update_selection();
-
-	const QString EmptyPath = tr("Empty Path");
-
-	QString m_default_path;
-	gui_save m_list_location;
-	std::shared_ptr<gui_settings> m_gui_settings;
-
-	// UI variables needed in higher scope
-	QListWidget* m_dir_list = nullptr;
-	QLabel* m_selected_config_label = nullptr;
-	bool m_is_changing_data = false;
-};
diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.cpp b/rpcs3/rpcs3qt/vfs_dialog_tab.cpp
index 93c640b84c..9fb66d511d 100644
--- a/rpcs3/rpcs3qt/vfs_dialog_tab.cpp
+++ b/rpcs3/rpcs3qt/vfs_dialog_tab.cpp
@@ -1,14 +1,110 @@
 #include "vfs_dialog_tab.h"
 #include "Utilities/Config.h"
 
-vfs_dialog_tab::vfs_dialog_tab(const QString& name, gui_save list_location, cfg::string* cfg_node, std::shared_ptr<gui_settings> _gui_settings, QWidget* parent)
-	: vfs_dialog_path_widget(name, QString::fromStdString(cfg_node->to_string()), QString::fromStdString(cfg_node->def), std::move(list_location), std::move(_gui_settings), parent)
-	, m_cfg_node(cfg_node)
+#include <QFileDialog>
+#include <QCoreApplication>
+#include <QHBoxLayout>
+#include <QPushButton>
+
+inline std::string sstr(const QString& _in) { return _in.toStdString(); }
+
+vfs_dialog_tab::vfs_dialog_tab(vfs_settings_info settingsInfo, std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, QWidget* parent)
+	: QWidget(parent), m_info(std::move(settingsInfo)), m_gui_settings(std::move(guiSettings)), m_emu_settings(std::move(emuSettings))
 {
+	m_dir_dist = new QListWidget(this);
+
+	QStringList alldirs = m_gui_settings->GetValue(m_info.listLocation).toStringList();
+	const QString current_dir = qstr(m_info.cfg_node->to_string());
+
+	QListWidgetItem* selected_item = nullptr;
+
+	for (const QString& dir : alldirs)
+	{
+		QListWidgetItem* item = new QListWidgetItem(dir, m_dir_dist);
+		if (dir == current_dir)
+			selected_item = item;
+	}
+
+	// We must show the currently selected config.
+	if (!selected_item)
+		selected_item = new QListWidgetItem(current_dir, m_dir_dist);
+
+	selected_item->setSelected(true);
+
+	m_dir_dist->setMinimumWidth(m_dir_dist->sizeHintForColumn(0));
+
+	QPushButton* addDir = new QPushButton(QStringLiteral("+"));
+	addDir->setToolTip(tr("Add new directory"));
+	addDir->setFixedWidth(addDir->sizeHint().height()); // Make button square
+	connect(addDir, &QAbstractButton::clicked, this, &vfs_dialog_tab::AddNewDirectory);
+
+	QPushButton* button_remove_dir = new QPushButton(QStringLiteral("-"));
+	button_remove_dir->setToolTip(tr("Remove directory"));
+	button_remove_dir->setFixedWidth(button_remove_dir->sizeHint().height()); // Make button square
+	button_remove_dir->setEnabled(false);
+	connect(button_remove_dir, &QAbstractButton::clicked, this, &vfs_dialog_tab::RemoveDirectory);
+
+	QHBoxLayout* selected_config_layout = new QHBoxLayout;
+	m_selected_config_label = new QLabel(current_dir.isEmpty() ? EmptyPath : current_dir);
+	selected_config_layout->addWidget(new QLabel(tr("%0 directory:").arg(m_info.name)));
+	selected_config_layout->addWidget(m_selected_config_label);
+	selected_config_layout->addStretch();
+	selected_config_layout->addWidget(addDir);
+	selected_config_layout->addWidget(button_remove_dir);
+
+	QVBoxLayout* vbox = new QVBoxLayout;
+	vbox->addWidget(m_dir_dist);
+	vbox->addLayout(selected_config_layout);
+
+	setLayout(vbox);
+
+	connect(m_dir_dist, &QListWidget::currentRowChanged, button_remove_dir, [this, button_remove_dir](int row)
+	{
+		QListWidgetItem* item = m_dir_dist->item(row);
+		m_selected_config_label->setText((item && !item->text().isEmpty()) ? item->text() : EmptyPath);
+		button_remove_dir->setEnabled(item && row > 0);
+	});
 }
 
-void vfs_dialog_tab::set_settings() const
+void vfs_dialog_tab::SetSettings() const
 {
-	m_gui_settings->SetValue(m_list_location, get_dir_list());
-	m_cfg_node->from_string(get_selected_path());
+	QStringList allDirs;
+	for (int i = 0; i < m_dir_dist->count(); ++i)
+	{
+		allDirs += m_dir_dist->item(i)->text();
+	}
+	m_gui_settings->SetValue(m_info.listLocation, allDirs);
+
+	const std::string new_dir = m_selected_config_label->text() == EmptyPath ? "" : sstr(m_selected_config_label->text());
+	m_info.cfg_node->from_string(new_dir);
+	m_emu_settings->SetSetting(m_info.settingLoc, new_dir);
+}
+
+void vfs_dialog_tab::Reset() const
+{
+	m_dir_dist->clear();
+	m_dir_dist->setCurrentItem(new QListWidgetItem(qstr(m_info.cfg_node->def), m_dir_dist));
+}
+
+void vfs_dialog_tab::AddNewDirectory() const
+{
+	QString dir = QFileDialog::getExistingDirectory(nullptr, tr("Choose a directory"), QCoreApplication::applicationDirPath(), QFileDialog::DontResolveSymlinks);
+
+	if (dir.isEmpty())
+		return;
+
+	if (!dir.endsWith("/"))
+		dir += '/';
+
+	m_dir_dist->setCurrentItem(new QListWidgetItem(dir, m_dir_dist));
+}
+
+void vfs_dialog_tab::RemoveDirectory() const
+{
+	const int row = m_dir_dist->currentRow();
+	if (row > 0)
+	{
+		QListWidgetItem* item = m_dir_dist->item(row);
+		delete item;
+	}
 }
diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.h b/rpcs3/rpcs3qt/vfs_dialog_tab.h
index 213e115917..836e5e498c 100644
--- a/rpcs3/rpcs3qt/vfs_dialog_tab.h
+++ b/rpcs3/rpcs3qt/vfs_dialog_tab.h
@@ -1,6 +1,13 @@
 #pragma once
 
-#include "vfs_dialog_path_widget.h"
+#include "util/types.hpp"
+
+#include "gui_settings.h"
+#include "emu_settings.h"
+#include "emu_settings_type.h"
+
+#include <QListWidget>
+#include <QLabel>
 
 #include <memory>
 
@@ -9,17 +16,37 @@ namespace cfg
 	class string;
 }
 
-class gui_settings;
+struct vfs_settings_info
+{
+	QString name; // name of tab
+	emu_settings_type settingLoc; // Where the setting is saved in emu_settings
+	gui_save listLocation; // Where the list of dir options are saved
+	cfg::string* cfg_node; // Needed since emu_settings overrides settings file and doesn't touch g_cfg currently.
+};
 
-class vfs_dialog_tab : public vfs_dialog_path_widget
+class vfs_dialog_tab : public QWidget
 {
 	Q_OBJECT
 
 public:
-	explicit vfs_dialog_tab(const QString& name, gui_save list_location, cfg::string* cfg_node, std::shared_ptr<gui_settings> _gui_settings, QWidget* parent = nullptr);
+	explicit vfs_dialog_tab(vfs_settings_info info, std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, QWidget* parent = nullptr);
 
-	void set_settings() const;
+	void SetSettings() const;
+
+	// Reset this tab without saving the settings yet
+	void Reset() const;
 
 private:
-	cfg::string* m_cfg_node;
+	void AddNewDirectory() const;
+	void RemoveDirectory() const;
+
+	const QString EmptyPath = tr("Empty Path");
+
+	vfs_settings_info m_info;
+	std::shared_ptr<gui_settings> m_gui_settings;
+	std::shared_ptr<emu_settings> m_emu_settings;
+
+	// UI variables needed in higher scope
+	QListWidget* m_dir_dist;
+	QLabel* m_selected_config_label;
 };
diff --git a/rpcs3/rpcs3qt/vfs_dialog_usb_input.cpp b/rpcs3/rpcs3qt/vfs_dialog_usb_input.cpp
deleted file mode 100644
index 0f4970ee90..0000000000
--- a/rpcs3/rpcs3qt/vfs_dialog_usb_input.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "vfs_dialog_usb_input.h"
-#include "gui_settings.h"
-
-#include <QDialogButtonBox>
-#include <QPushButton>
-#include <QVBoxLayout>
-
-#include "Emu/vfs_config.h"
-
-vfs_dialog_usb_input::vfs_dialog_usb_input(const QString& name, const cfg::device_info& default_info, cfg::device_info* info, std::shared_ptr<gui_settings> _gui_settings, QWidget* parent)
-	: QDialog(parent), m_gui_settings(std::move(_gui_settings)), m_gui_save(gui::fs_dev_usb_list)
-{
-	ensure(!!info);
-	ensure(!name.isEmpty());
-	ensure(name.back() >= '0' && name.back() <= '7');
-
-	setWindowTitle(tr("Edit %0").arg(name));
-	setObjectName("vfs_dialog_usb_input");
-
-	m_gui_save.name.replace('X', name.back());
-
-	// Create path widget
-	m_path_widget = new vfs_dialog_path_widget(name, QString::fromStdString(info->path), QString::fromStdString(default_info.path), m_gui_save, m_gui_settings);
-	m_path_widget->layout()->setContentsMargins(0, 0, 0, 0);
-
-	// Create buttons
-	QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Apply | QDialogButtonBox::RestoreDefaults);
-	buttons->button(QDialogButtonBox::RestoreDefaults)->setText(tr("Reset All"));
-	buttons->button(QDialogButtonBox::Apply)->setDefault(true);
-
-	connect(buttons, &QDialogButtonBox::clicked, this, [this, buttons, info](QAbstractButton* button)
-	{
-		if (button == buttons->button(QDialogButtonBox::Apply))
-		{
-			m_gui_settings->SetValue(m_gui_save, m_path_widget->get_dir_list());
-
-			info->path   = m_path_widget->get_selected_path();
-			info->vid    = m_vid_edit->text().toStdString();
-			info->pid    = m_pid_edit->text().toStdString();
-			info->serial = m_serial_edit->text().toStdString();
-
-			accept();
-		}
-		else if (button == buttons->button(QDialogButtonBox::RestoreDefaults))
-		{
-			if (QMessageBox::question(this, tr("Confirm Reset"), tr("Reset all entries and file system directories?")) != QMessageBox::Yes)
-				return;
-
-			m_path_widget->reset();
-			m_vid_edit->setText("");
-			m_pid_edit->setText("");
-			m_serial_edit->setText("");
-		}
-		else if (button == buttons->button(QDialogButtonBox::Cancel))
-		{
-			reject();
-		}
-	});
-
-	m_vid_edit = new QLineEdit;
-	m_vid_edit->setMaxLength(4);
-	m_vid_edit->setValidator(new QRegularExpressionValidator(QRegularExpression("^[a-fA-F0-9]*$"), this)); // HEX only
-	m_vid_edit->setText(QString::fromStdString(info->vid));
-
-	m_pid_edit = new QLineEdit;
-	m_pid_edit->setMaxLength(4);
-	m_pid_edit->setValidator(new QRegularExpressionValidator(QRegularExpression("^[a-fA-F0-9]*$"), this)); // HEX only
-	m_pid_edit->setText(QString::fromStdString(info->pid));
-
-	m_serial_edit = new QLineEdit;
-	m_serial_edit->setMaxLength(64); // Max length defined in sys_fs
-	m_serial_edit->setText(QString::fromStdString(info->serial));
-
-	QVBoxLayout* vbox_left = new QVBoxLayout;
-	vbox_left->addWidget(new QLabel(tr("Vendor ID:")));
-	vbox_left->addWidget(new QLabel(tr("Product ID:")));
-	vbox_left->addWidget(new QLabel(tr("Serial:")));
-
-	QVBoxLayout* vbox_right = new QVBoxLayout;
-	vbox_right->addWidget(m_vid_edit);
-	vbox_right->addWidget(m_pid_edit);
-	vbox_right->addWidget(m_serial_edit);
-
-	QHBoxLayout* hbox = new QHBoxLayout;
-	hbox->addLayout(vbox_left);
-	hbox->addLayout(vbox_right);
-
-	QVBoxLayout* vbox = new QVBoxLayout;
-	vbox->addWidget(m_path_widget);
-	vbox->addLayout(hbox);
-	vbox->addWidget(buttons);
-
-	setLayout(vbox);
-
-	buttons->button(QDialogButtonBox::Apply)->setFocus();
-}
diff --git a/rpcs3/rpcs3qt/vfs_dialog_usb_input.h b/rpcs3/rpcs3qt/vfs_dialog_usb_input.h
deleted file mode 100644
index bcabae64aa..0000000000
--- a/rpcs3/rpcs3qt/vfs_dialog_usb_input.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include "vfs_dialog_path_widget.h"
-
-#include <QDialog>
-#include <QLineEdit>
-
-namespace cfg
-{
-	struct device_info;
-}
-
-class gui_settings;
-
-class vfs_dialog_usb_input : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit vfs_dialog_usb_input(const QString& name, const cfg::device_info& default_info, cfg::device_info* info, std::shared_ptr<gui_settings> _gui_settings, QWidget* parent = nullptr);
-
-private:
-	std::shared_ptr<gui_settings> m_gui_settings;
-	gui_save m_gui_save;
-	vfs_dialog_path_widget* m_path_widget;
-	QLineEdit* m_vid_edit = nullptr;
-	QLineEdit* m_pid_edit = nullptr;
-	QLineEdit* m_serial_edit = nullptr;
-};
diff --git a/rpcs3/rpcs3qt/vfs_dialog_usb_tab.cpp b/rpcs3/rpcs3qt/vfs_dialog_usb_tab.cpp
deleted file mode 100644
index 93fadf8ece..0000000000
--- a/rpcs3/rpcs3qt/vfs_dialog_usb_tab.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-#include "vfs_dialog_usb_tab.h"
-#include "vfs_dialog_usb_input.h"
-#include "table_item_delegate.h"
-#include "Utilities/Config.h"
-
-#include <QVBoxLayout>
-#include <QHeaderView>
-#include <QScrollBar>
-#include <QMenu>
-#include <QMouseEvent>
-
-constexpr int max_usb_devices = 8;
-
-const auto get_device_info = [](const QString& device_name, const cfg::map_of_type<cfg::device_info>& device_map) -> cfg::device_info
-{
-	if (auto it = device_map.find(device_name.toStdString()); it != device_map.cend())
-	{
-		return it->second;
-	}
-
-	return {};
-};
-
-const auto get_device_name = [](int i) -> QString
-{
-	return QString("/dev_usb00%0").arg(i);
-};
-
-enum usb_column : int
-{
-	usb_name   = 0,
-	usb_path   = 1,
-	usb_vid    = 2,
-	usb_pid    = 3,
-	usb_serial = 4
-};
-
-vfs_dialog_usb_tab::vfs_dialog_usb_tab(cfg::device_entry* cfg_node, std::shared_ptr<gui_settings> _gui_settings, QWidget* parent)
-	: QWidget(parent), m_cfg_node(cfg_node), m_gui_settings(std::move(_gui_settings))
-{
-	m_usb_table = new QTableWidget(this);
-	m_usb_table->setItemDelegate(new table_item_delegate(this, false));
-	m_usb_table->setShowGrid(false);
-	m_usb_table->setSelectionBehavior(QAbstractItemView::SelectRows);
-	m_usb_table->setEditTriggers(QAbstractItemView::NoEditTriggers);
-	m_usb_table->setContextMenuPolicy(Qt::CustomContextMenu);
-	m_usb_table->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
-	m_usb_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
-	m_usb_table->verticalScrollBar()->setSingleStep(20);
-	m_usb_table->horizontalScrollBar()->setSingleStep(10);
-	m_usb_table->setColumnCount(5);
-	m_usb_table->setHorizontalHeaderLabels(QStringList() << tr("Device") << tr("Path") << tr("Vendor ID") << tr("Product ID") << tr("Serial"));
-	m_usb_table->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed);
-	m_usb_table->horizontalHeader()->setStretchLastSection(true);
-	m_usb_table->setRowCount(max_usb_devices);
-
-	for (int i = 0; i < max_usb_devices; i++)
-	{
-		const QString device_name = get_device_name(i);
-		const cfg::device_info info = get_device_info(device_name, m_cfg_node->get_map());
-
-		m_usb_table->setItem(i, usb_column::usb_name, new QTableWidgetItem(device_name));
-		m_usb_table->setItem(i, usb_column::usb_path, new QTableWidgetItem(QString::fromStdString(info.path)));
-		m_usb_table->setItem(i, usb_column::usb_vid, new QTableWidgetItem(QString::fromStdString(info.vid)));
-		m_usb_table->setItem(i, usb_column::usb_pid, new QTableWidgetItem(QString::fromStdString(info.pid)));
-		m_usb_table->setItem(i, usb_column::usb_serial, new QTableWidgetItem(QString::fromStdString(info.serial)));
-	}
-
-	m_usb_table->resizeColumnsToContents();
-
-	connect(m_usb_table, &QTableWidget::customContextMenuRequested, this, &vfs_dialog_usb_tab::show_context_menu);
-	connect(m_usb_table, &QTableWidget::itemDoubleClicked, this, &vfs_dialog_usb_tab::double_clicked_slot);
-
-	QVBoxLayout* vbox = new QVBoxLayout;
-	vbox->addWidget(m_usb_table);
-
-	setLayout(vbox);
-}
-
-void vfs_dialog_usb_tab::set_settings() const
-{
-	cfg::map_of_type<cfg::device_info> device_map{};
-
-	for (int i = 0; i < max_usb_devices; i++)
-	{
-		cfg::device_info info{};
-
-		info.path   = m_usb_table->item(i, usb_column::usb_path)->text().toStdString();
-		info.vid    = m_usb_table->item(i, usb_column::usb_vid)->text().toStdString();
-		info.pid    = m_usb_table->item(i, usb_column::usb_pid)->text().toStdString();
-		info.serial = m_usb_table->item(i, usb_column::usb_serial)->text().toStdString();
-
-		device_map.emplace(get_device_name(i).toStdString(), std::move(info));
-	}
-
-	m_cfg_node->set_map(std::move(device_map));
-}
-
-void vfs_dialog_usb_tab::reset() const
-{
-	for (int i = 0; i < max_usb_devices; i++)
-	{
-		const QString device_name = get_device_name(i);
-		const cfg::device_info info = get_device_info(device_name, m_cfg_node->get_default());
-
-		m_usb_table->item(i, usb_column::usb_path)->setText(QString::fromStdString(info.path));
-		m_usb_table->item(i, usb_column::usb_vid)->setText(QString::fromStdString(info.vid));
-		m_usb_table->item(i, usb_column::usb_pid)->setText(QString::fromStdString(info.pid));
-		m_usb_table->item(i, usb_column::usb_serial)->setText(QString::fromStdString(info.serial));
-	}
-}
-
-void vfs_dialog_usb_tab::show_usb_input_dialog(int index)
-{
-	if (index < 0 || index >= max_usb_devices)
-	{
-		return;
-	}
-
-	const QString device_name = get_device_name(index);
-	const cfg::device_info default_info = get_device_info(device_name, m_cfg_node->get_default());
-	cfg::device_info info{};
-
-	info.path   = m_usb_table->item(index, usb_column::usb_path)->text().toStdString();
-	info.vid    = m_usb_table->item(index, usb_column::usb_vid)->text().toStdString();
-	info.pid    = m_usb_table->item(index, usb_column::usb_pid)->text().toStdString();
-	info.serial = m_usb_table->item(index, usb_column::usb_serial)->text().toStdString();
-
-	vfs_dialog_usb_input* input_dialog = new vfs_dialog_usb_input(device_name, default_info, &info, m_gui_settings, this);
-	if (input_dialog->exec() == QDialog::Accepted)
-	{
-		m_usb_table->item(index, usb_column::usb_path)->setText(QString::fromStdString(info.path));
-		m_usb_table->item(index, usb_column::usb_vid)->setText(QString::fromStdString(info.vid));
-		m_usb_table->item(index, usb_column::usb_pid)->setText(QString::fromStdString(info.pid));
-		m_usb_table->item(index, usb_column::usb_serial)->setText(QString::fromStdString(info.serial));
-	}
-	input_dialog->deleteLater();
-}
-
-void vfs_dialog_usb_tab::show_context_menu(const QPoint& pos)
-{
-	const int row = m_usb_table->indexAt(pos).row();
-
-	if (row < 0 || row >= max_usb_devices)
-	{
-		return;
-	}
-
-	QMenu menu{};
-	QAction* edit = menu.addAction(tr("&Edit"));
-
-	connect(edit, &QAction::triggered, this, [this, row]()
-	{
-		show_usb_input_dialog(row);
-	});
-
-	menu.exec(m_usb_table->viewport()->mapToGlobal(pos));
-}
-
-void vfs_dialog_usb_tab::double_clicked_slot(QTableWidgetItem* item)
-{
-	if (!item)
-	{
-		return;
-	}
-
-	show_usb_input_dialog(item->row());
-}
-
-void vfs_dialog_usb_tab::mouseDoubleClickEvent(QMouseEvent* ev)
-{
-	if (!ev) return;
-
-	// Qt's itemDoubleClicked signal doesn't distinguish between mouse buttons and there is no simple way to get the pressed button.
-	// So we have to ignore this event when another button is pressed.
-	if (ev->button() != Qt::LeftButton)
-	{
-		ev->ignore();
-		return;
-	}
-
-	QWidget::mouseDoubleClickEvent(ev);
-}
diff --git a/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h b/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h
deleted file mode 100644
index 02d7a25c83..0000000000
--- a/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include "gui_settings.h"
-
-#include <QTableWidget>
-#include <QLabel>
-
-#include <memory>
-
-namespace cfg
-{
-	class device_entry;
-}
-
-class vfs_dialog_usb_tab : public QWidget
-{
-	Q_OBJECT
-
-public:
-	explicit vfs_dialog_usb_tab(cfg::device_entry* cfg_node, std::shared_ptr<gui_settings> _gui_settings, QWidget* parent = nullptr);
-
-	void set_settings() const;
-
-	// Reset this tab without saving the settings yet
-	void reset() const;
-
-protected:
-	void mouseDoubleClickEvent(QMouseEvent* ev) override;
-
-private:
-	void show_usb_input_dialog(int index);
-	void show_context_menu(const QPoint& pos);
-	void double_clicked_slot(QTableWidgetItem* item);
-
-	cfg::device_entry* m_cfg_node;
-	std::shared_ptr<gui_settings> m_gui_settings;
-	QTableWidget* m_usb_table;
-};
diff --git a/rpcs3/rpcs3qt/vfs_tool_dialog.cpp b/rpcs3/rpcs3qt/vfs_tool_dialog.cpp
deleted file mode 100644
index 71cc0a3374..0000000000
--- a/rpcs3/rpcs3qt/vfs_tool_dialog.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "stdafx.h"
-#include "vfs_tool_dialog.h"
-#include "ui_vfs_tool_dialog.h"
-#include "Emu/VFS.h"
-#include "Emu/System.h"
-
-vfs_tool_dialog::vfs_tool_dialog(QWidget *parent)
-	: QDialog(parent)
-	, ui(new Ui::vfs_tool_dialog)
-{
-	setAttribute(Qt::WA_DeleteOnClose);
-
-	ui->setupUi(this);
-
-	connect(ui->pathEdit, &QLineEdit::textChanged, this, &vfs_tool_dialog::handle_vfs_path);
-
-	handle_vfs_path("");
-}
-
-vfs_tool_dialog::~vfs_tool_dialog()
-{
-}
-
-void vfs_tool_dialog::handle_vfs_path(const QString& path)
-{
-	// Initialize Emu if not yet initialized (e.g. Emu.Kill() was previously invoked) before using some of the following vfs:: functions (e.g. vfs::get())
-	if (Emu.IsStopped())
-	{
-		Emu.Init();
-	}
-
-	const std::string spath = path.toStdString();
-	const std::string vfs_get_path = vfs::get(spath);
-	const std::string vfs_retrieve_path = vfs::retrieve(spath);
-	const std::string vfs_escape_path = vfs::escape(spath);
-	const std::string vfs_unescape_path = vfs::unescape(spath);
-	const std::string result = fmt::format(
-		"Path:\n'%s'\n\n"
-		"vfs::get:\n'%s'\n\n"
-		"vfs::retrieve:\n'%s'\n\n"
-		"vfs::escape:\n'%s'\n\n"
-		"vfs::unescape:\n'%s'",
-		spath,
-		vfs_get_path,
-		vfs_retrieve_path,
-		vfs_escape_path,
-		vfs_unescape_path
-	);
-
-	ui->resultEdit->setPlainText(QString::fromStdString(result));
-}
diff --git a/rpcs3/rpcs3qt/vfs_tool_dialog.h b/rpcs3/rpcs3qt/vfs_tool_dialog.h
deleted file mode 100644
index 3fd9667fe5..0000000000
--- a/rpcs3/rpcs3qt/vfs_tool_dialog.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <QDialog>
-
-namespace Ui
-{
-	class vfs_tool_dialog;
-}
-
-class vfs_tool_dialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	vfs_tool_dialog(QWidget *parent);
-	virtual ~vfs_tool_dialog();
-
-private:
-	std::unique_ptr<Ui::vfs_tool_dialog> ui;
-
-private Q_SLOTS:
-	void handle_vfs_path(const QString& path);
-};
diff --git a/rpcs3/rpcs3qt/vfs_tool_dialog.ui b/rpcs3/rpcs3qt/vfs_tool_dialog.ui
deleted file mode 100644
index d0b6d4902b..0000000000
--- a/rpcs3/rpcs3qt/vfs_tool_dialog.ui
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>vfs_tool_dialog</class>
- <widget class="QDialog" name="vfs_tool_dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>500</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>VFS Tool</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Path</string>
-     </property>
-     <layout class="QVBoxLayout" name="pathLayout">
-      <item>
-       <widget class="QLineEdit" name="pathEdit">
-        <property name="clearButtonEnabled">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Result</string>
-     </property>
-     <layout class="QVBoxLayout" name="resultLayout">
-      <item>
-       <widget class="QTextEdit" name="resultEdit">
-        <property name="acceptDrops">
-         <bool>false</bool>
-        </property>
-        <property name="undoRedoEnabled">
-         <bool>false</bool>
-        </property>
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="buttonBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin" stdset="0">
-      <number>0</number>
-     </property>
-     <item>
-      <spacer name="spacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>131</width>
-         <height>31</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/rpcs3/rpcs3qt/video_label.cpp b/rpcs3/rpcs3qt/video_label.cpp
deleted file mode 100644
index bdf36a0e46..0000000000
--- a/rpcs3/rpcs3qt/video_label.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "stdafx.h"
-#include "video_label.h"
-
-video_label::video_label(QWidget* parent)
-	: QLabel(parent), qt_video_source()
-{
-}
-
-video_label::~video_label()
-{
-}
-
-void video_label::set_thumbnail(const QPixmap& pxmap)
-{
-	m_current_pixmap = pxmap;
-}
-
-void video_label::set_active(bool active)
-{
-	if (active)
-	{
-		set_image_change_callback([this](const QVideoFrame& frame)
-		{
-			if (const QPixmap pixmap = get_movie_image(frame); get_active() && !pixmap.isNull())
-			{
-				setPixmap(pixmap);
-			}
-		});
-		start_movie();
-	}
-	else
-	{
-		set_image_change_callback({});
-		stop_movie();
-		setPixmap(m_current_pixmap);
-	}
-}
-
-void video_label::enterEvent(QEnterEvent* event)
-{
-	set_active(true);
-
-	QLabel::enterEvent(event);
-}
-
-void video_label::leaveEvent(QEvent* event)
-{
-	set_active(false);
-
-	QLabel::leaveEvent(event);
-}
diff --git a/rpcs3/rpcs3qt/video_label.h b/rpcs3/rpcs3qt/video_label.h
deleted file mode 100644
index 58f0bf8d21..0000000000
--- a/rpcs3/rpcs3qt/video_label.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "qt_video_source.h"
-#include <QLabel>
-#include <QEnterEvent>
-#include <QPixmap>
-
-class video_label : public QLabel, public qt_video_source
-{
-public:
-	video_label(QWidget* parent = nullptr);
-	virtual ~video_label();
-
-	void set_thumbnail(const QPixmap& pxmap);
-	void set_active(bool active) override;
-
-	void enterEvent(QEnterEvent* event) override;
-	void leaveEvent(QEvent* event) override;
-
-private:
-	QPixmap m_current_pixmap;
-};
diff --git a/rpcs3/rpcs3qt/welcome_dialog.cpp b/rpcs3/rpcs3qt/welcome_dialog.cpp
index cbe2433bfd..02bc5f8bd8 100644
--- a/rpcs3/rpcs3qt/welcome_dialog.cpp
+++ b/rpcs3/rpcs3qt/welcome_dialog.cpp
@@ -2,108 +2,36 @@
 #include "ui_welcome_dialog.h"
 
 #include "gui_settings.h"
-#include "shortcut_utils.h"
-#include "qt_utils.h"
-
-#include "Utilities/File.h"
 
 #include <QPushButton>
 #include <QCheckBox>
-#include <QSvgWidget>
 
-welcome_dialog::welcome_dialog(std::shared_ptr<gui_settings> gui_settings, bool is_manual_show, QWidget* parent)
-	: QDialog(parent)
-	, ui(new Ui::welcome_dialog)
-	, m_gui_settings(std::move(gui_settings))
+welcome_dialog::welcome_dialog(QWidget* parent) : QDialog(parent), ui(new Ui::welcome_dialog)
 {
 	ui->setupUi(this);
 
-	setAttribute(Qt::WA_DeleteOnClose);
-	setWindowFlag(Qt::WindowCloseButtonHint, false); // disable the close button shown on the dialog's top right corner
+	setWindowFlags(windowFlags() & Qt::WindowTitleHint);
+
+	gui_settings* settings = new gui_settings(this);
+
+	ui->okay->setEnabled(false);
+
+	connect(ui->i_have_read, &QCheckBox::clicked, [=, this](bool checked)
+	{
+		ui->okay->setEnabled(checked);
+	});
+
+	connect(ui->do_not_show, &QCheckBox::clicked, [=, this](bool checked)
+	{
+		settings->SetValue(gui::ib_show_welcome, QVariant(!checked));
+	});
+
+	connect(ui->okay, &QPushButton::clicked, this, &QDialog::accept);
+
 	layout()->setSizeConstraint(QLayout::SetFixedSize);
-
-	ui->icon_label->load(QStringLiteral(":/rpcs3.svg"));
-
-	ui->label_desc->setText(gui::utils::make_paragraph(tr(
-		"RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.\n"
-		"It is written in C++ for Windows, Linux, FreeBSD and MacOS funded with %0.\n"
-		"Our developers and contributors are always working hard to ensure this project is the best that it can be.\n"
-		"There are still plenty of implementations to make and optimizations to do.")
-		.arg(gui::utils::make_link(tr("Patreon"), "https://rpcs3.net/patreon"))));
-
-	ui->label_info->setText(gui::utils::make_paragraph(tr(
-		"To get started, you must first install the %0.\n"
-		"Please refer to the %1 guide found on the official website for further information.\n"
-		"If you have any further questions, please refer to the %2.\n"
-		"Otherwise, further discussion and support can be found on the %3 or on our %4 server.")
-		.arg(gui::utils::make_bold(tr("PlayStation 3 firmware")))
-		.arg(gui::utils::make_link(tr("Quickstart"), "https://rpcs3.net/quickstart"))
-		.arg(gui::utils::make_link(tr("FAQ"), "https://rpcs3.net/faq"))
-		.arg(gui::utils::make_link(tr("Forums"), "https://forums.rpcs3.net"))
-		.arg(gui::utils::make_link(tr("Discord"), "https://discord.gg/rpcs3"))));
-
-#ifdef __APPLE__
-	ui->create_applications_menu_shortcut->setText(tr("&Create Launchpad shortcut"));
-	ui->use_dark_theme->setVisible(false);
-	ui->use_dark_theme->setEnabled(false);
-#else
-#ifndef _WIN32
-	ui->create_applications_menu_shortcut->setText(tr("&Create Application Menu shortcut"));
-#endif
-
-	ui->use_dark_theme->setVisible(!is_manual_show);
-	ui->use_dark_theme->setEnabled(!is_manual_show);
-	ui->use_dark_theme->setChecked(gui::utils::dark_mode_active());
-#endif
-
-	ui->accept->setEnabled(is_manual_show);
-	ui->reject->setVisible(!is_manual_show);
-	ui->i_have_read->setVisible(!is_manual_show);
-	ui->i_have_read->setChecked(is_manual_show);
-	ui->show_at_startup->setChecked(m_gui_settings->GetValue(gui::ib_show_welcome).toBool());
-
-	if (!is_manual_show)
-	{
-		connect(ui->i_have_read, &QCheckBox::clicked, this, [this](bool checked)
-		{
-			ui->accept->setEnabled(checked);
-			ui->reject->setEnabled(!checked);
-		});
-	}
-
-	connect(ui->show_at_startup, &QCheckBox::clicked, this, [this](bool checked)
-	{
-		m_gui_settings->SetValue(gui::ib_show_welcome, QVariant(checked));
-	});
-
-	connect(ui->accept, &QPushButton::clicked, this, &QDialog::accept); // trigger "accept" signal (setting also dialog's result code to QDialog::Accepted)
-	connect(ui->reject, &QPushButton::clicked, this, &QDialog::reject); // trigger "reject" signal (setting also dialog's result code to QDialog::Rejected)
-
-	connect(this, &QDialog::accepted, this, [this]() // "accept" signal's event handler
-	{
-		if (ui->create_desktop_shortcut->isChecked())
-		{
-			gui::utils::create_shortcut("RPCS3", "", "", "RPCS3", ":/rpcs3.svg", fs::get_temp_dir(), gui::utils::shortcut_location::desktop);
-		}
-
-		if (ui->create_applications_menu_shortcut->isChecked())
-		{
-			gui::utils::create_shortcut("RPCS3", "", "", "RPCS3", ":/rpcs3.svg", fs::get_temp_dir(), gui::utils::shortcut_location::applications);
-		}
-
-		if (ui->use_dark_theme->isChecked() && ui->use_dark_theme->isEnabled()) // if checked and also on initial welcome dialog
-		{
-			m_gui_settings->SetValue(gui::m_currentStylesheet, gui::DarkStylesheet);
-		}
-	});
-
-	connect(this, &QDialog::rejected, this, [this]() // "reject" signal's event handler
-	{
-		// if the agreement on RPCS3's usage conditions was not accepted by the user, always display the initial welcome dialog at next startup
-		m_gui_settings->SetValue(gui::ib_show_welcome, QVariant(true));
-	});
 }
 
 welcome_dialog::~welcome_dialog()
 {
+	delete ui;
 }
diff --git a/rpcs3/rpcs3qt/welcome_dialog.h b/rpcs3/rpcs3qt/welcome_dialog.h
index 3f04cfdb9f..1521347ece 100644
--- a/rpcs3/rpcs3qt/welcome_dialog.h
+++ b/rpcs3/rpcs3qt/welcome_dialog.h
@@ -7,17 +7,14 @@ namespace Ui
 	class welcome_dialog;
 }
 
-class gui_settings;
-
 class welcome_dialog : public QDialog
 {
 	Q_OBJECT
 
 public:
-	explicit welcome_dialog(std::shared_ptr<gui_settings> gui_settings, bool is_manual_show, QWidget* parent = nullptr);
+	explicit welcome_dialog(QWidget* parent = nullptr);
 	~welcome_dialog();
 
 private:
-	std::unique_ptr<Ui::welcome_dialog> ui;
-	std::shared_ptr<gui_settings> m_gui_settings;
+	Ui::welcome_dialog *ui;
 };
diff --git a/rpcs3/rpcs3qt/welcome_dialog.ui b/rpcs3/rpcs3qt/welcome_dialog.ui
index 5562af0ed7..e22cc0fa91 100644
--- a/rpcs3/rpcs3qt/welcome_dialog.ui
+++ b/rpcs3/rpcs3qt/welcome_dialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>611</width>
-    <height>319</height>
+    <height>272</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -57,13 +57,33 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QSvgWidget" name="icon_label" native="true">
+            <widget class="QLabel" name="icon_label">
              <property name="maximumSize">
               <size>
                <width>50</width>
                <height>50</height>
               </size>
              </property>
+             <property name="font">
+              <font>
+               <pointsize>8</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string/>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../resources.qrc">:/Icons/insignia.png</pixmap>
+             </property>
+             <property name="scaledContents">
+              <bool>true</bool>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+             </property>
+             <property name="margin">
+              <number>0</number>
+             </property>
             </widget>
            </item>
            <item>
@@ -103,13 +123,16 @@
            </widget>
           </item>
           <item>
-           <widget class="QLabel" name="label_desc">
+           <widget class="QLabel" name="label_3">
             <property name="font">
              <font>
               <family>Arial</family>
               <kerning>true</kerning>
              </font>
             </property>
+            <property name="text">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.&lt;br/&gt;It is written in C++ for Windows and Linux and funded with &lt;a href=&quot;https://www.patreon.com/Nekotekina&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Patreon&lt;/span&gt;&lt;/a&gt;.&lt;br/&gt;Our developers and contributors are always working hard to ensure this project can be the best that it can be.&lt;br/&gt;There are still plenty of implementations to be made and optimizations to be done.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
             <property name="textFormat">
              <enum>Qt::RichText</enum>
             </property>
@@ -152,6 +175,9 @@
          <kerning>true</kerning>
         </font>
        </property>
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To get started, you must first install the &lt;span style=&quot; font-weight:600;&quot;&gt;PlayStation 3 firmware&lt;/span&gt;.&lt;br/&gt;Please refer to the &lt;a href=&quot;https://rpcs3.net/quickstart&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Quickstart&lt;/span&gt;&lt;/a&gt; guide found on the official website for further information.&lt;br/&gt;If you have any further questions, please refer to the &lt;a href=&quot;https://rpcs3.net/faq&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;FAQ&lt;/span&gt;&lt;/a&gt;.&lt;br/&gt;Otherwise, further discussion and support can be found on the &lt;a href=&quot;https://forums.rpcs3.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Forums&lt;/span&gt;&lt;/a&gt; or on our &lt;a href=&quot;https://discord.me/RPCS3&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Discord&lt;/span&gt;&lt;/a&gt; server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
        <property name="textFormat">
         <enum>Qt::RichText</enum>
        </property>
@@ -184,40 +210,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QCheckBox" name="create_desktop_shortcut">
-       <property name="text">
-        <string>Create desktop shortcut</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="create_applications_menu_shortcut">
-       <property name="text">
-        <string>Create Start Menu shortcut</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="use_dark_theme">
-       <property name="text">
-        <string>Use Dark Theme (can be configured later)</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="verticalSpacer">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>10</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <layout class="QHBoxLayout" name="button_layout">
        <property name="leftMargin">
@@ -233,7 +225,7 @@
         <number>0</number>
        </property>
        <item alignment="Qt::AlignLeft">
-        <widget class="QPushButton" name="accept">
+        <widget class="QPushButton" name="okay">
          <property name="text">
           <string>Continue</string>
          </property>
@@ -242,16 +234,6 @@
          </property>
         </widget>
        </item>
-       <item alignment="Qt::AlignLeft">
-        <widget class="QPushButton" name="reject">
-         <property name="text">
-          <string>Exit</string>
-         </property>
-         <property name="autoDefault">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
        <item>
         <spacer name="button_layout_left">
          <property name="orientation">
@@ -286,9 +268,9 @@
         </spacer>
        </item>
        <item alignment="Qt::AlignLeft">
-        <widget class="QCheckBox" name="show_at_startup">
+        <widget class="QCheckBox" name="do_not_show">
          <property name="text">
-          <string>Show at startup</string>
+          <string>Do not show again</string>
          </property>
         </widget>
        </item>
@@ -298,14 +280,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QSvgWidget</class>
-   <extends>QWidget</extends>
-   <header>qsvgwidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources>
   <include location="../resources.qrc"/>
  </resources>
diff --git a/rpcs3/Emu/stb_image.cpp b/rpcs3/stb_image.cpp
similarity index 94%
rename from rpcs3/Emu/stb_image.cpp
rename to rpcs3/stb_image.cpp
index d9e32e229a..d4f9674fff 100644
--- a/rpcs3/Emu/stb_image.cpp
+++ b/rpcs3/stb_image.cpp
@@ -18,7 +18,6 @@
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #pragma GCC diagnostic ignored "-Wcast-qual"
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #pragma GCC diagnostic ignored "-Wduplicated-branches"
diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h
index b1e768dc52..bd232a2863 100644
--- a/rpcs3/stdafx.h
+++ b/rpcs3/stdafx.h
@@ -1,24 +1,23 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
-#include "util/types.hpp"         // IWYU pragma: export
-#include "util/atomic.hpp"        // IWYU pragma: export
-#include "util/endian.hpp"        // IWYU pragma: export
-#include "Utilities/Config.h"     // IWYU pragma: export
-#include "Utilities/StrFmt.h"     // IWYU pragma: export
-#include "Utilities/File.h"       // IWYU pragma: export
-#include "util/logs.hpp"          // IWYU pragma: export
-#include "util/shared_ptr.hpp"    // IWYU pragma: export
-#include "util/typeindices.hpp"   // IWYU pragma: export
-#include "util/fixed_typemap.hpp" // IWYU pragma: export
-#include "util/auto_typemap.hpp"  // IWYU pragma: export
+#include "util/types.hpp"
+#include "util/atomic.hpp"
+#include "util/endian.hpp"
+#include "Utilities/StrFmt.h"
+#include "Utilities/File.h"
+#include "util/logs.hpp"
+#include "util/shared_ptr.hpp"
+#include "util/typeindices.hpp"
+#include "util/fixed_typemap.hpp"
+#include "util/auto_typemap.hpp"
 
-#include <cstdlib>       // IWYU pragma: export
-#include <cstring>       // IWYU pragma: export
-#include <string>        // IWYU pragma: export
-#include <memory>        // IWYU pragma: export
-#include <vector>        // IWYU pragma: export
-#include <array>         // IWYU pragma: export
-#include <functional>    // IWYU pragma: export
-#include <unordered_map> // IWYU pragma: export
-#include <algorithm>     // IWYU pragma: export
-#include <string_view>   // IWYU pragma: export
+#include <cstdlib>
+#include <cstring>
+#include <string>
+#include <memory>
+#include <vector>
+#include <array>
+#include <functional>
+#include <unordered_map>
+#include <algorithm>
+#include <string_view>
diff --git a/rpcs3/tests/packages.config b/rpcs3/tests/packages.config
deleted file mode 100644
index a71561e644..0000000000
--- a/rpcs3/tests/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.1.7" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/rpcs3/tests/rpcs3_test.vcxproj b/rpcs3/tests/rpcs3_test.vcxproj
deleted file mode 100644
index 5e2ba06644..0000000000
--- a/rpcs3/tests/rpcs3_test.vcxproj
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="Current" 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>
-    <BuildInSolution Condition="'$(GTestInstalled)' != 'true'">false</BuildInSolution>
-  </PropertyGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{d1cbf84e-07f8-4acb-9cd2-bd205fdeee1e}</ProjectGuid>
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
-    <IncludePath>.\;$(SolutionDir);$(SolutionDir)rpcs3;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);</IncludePath>
-    <LibraryPath>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>rpcs3.lib;opencv_world4110.lib;DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;imm32.lib;ksuser.lib;version.lib;OpenAL32.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslang.lib;OSDependent.lib;SPIRV.lib;MachineIndependent.lib;GenericCodeGen.lib;Advapi32.lib;user32.lib;zlib.lib;zstd.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Core.lib;Qt6Gui.lib;Qt6Widgets.lib;Qt6Concurrent.lib;Qt6Multimedia.lib;Qt6MultimediaWidgets.lib;Qt6Svg.lib;Qt6SvgWidgets.lib;7zip.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;SDL.lib;fusion.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\opencv\opencv\opencv411\build\x64\lib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\glslang;$(SolutionDir)build\lib_ext\$(CONFIGURATION)-$(PLATFORM);$(QTDIR)\lib;$(VULKAN_SDK)\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-        $(QTDIR)\bin\windeployqt6 --no-compiler-runtime --no-opengl-sw --no-patchqt --no-translations --no-quick --no-system-d3d-compiler --no-system-dxc-compiler --no-ffmpeg --no-quick-import --plugindir "$(TargetDir)qt6\plugins" --release "$(TargetPath)"
-        xcopy /y /d "$(SolutionDir)3rdparty\opencv\opencv\opencv411\build\x64\bin\opencv_world4110.dll" "$(OutDir)"
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>rpcs3d.lib;opencv_world4110.lib;DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;imm32.lib;ksuser.lib;version.lib;OpenAL32.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslangd.lib;OSDependentd.lib;SPIRVd.lib;MachineIndependentd.lib;GenericCodeGend.lib;Advapi32.lib;user32.lib;zlib.lib;zstd.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Cored.lib;Qt6Guid.lib;Qt6Widgetsd.lib;Qt6Concurrentd.lib;Qt6Multimediad.lib;Qt6MultimediaWidgetsd.lib;Qt6Svgd.lib;Qt6SvgWidgetsd.lib;7zip.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;SDL.lib;fusion.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\opencv\opencv\opencv411\build\x64\lib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\glslang;$(SolutionDir)build\lib\$(CONFIGURATION)-$(PLATFORM);$(QTDIR)\lib;$(VULKAN_SDK)\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-        $(QTDIR)\bin\windeployqt6 --no-compiler-runtime --no-opengl-sw --no-patchqt --no-translations --no-quick --no-system-d3d-compiler --no-system-dxc-compiler --no-ffmpeg --no-quick-import --plugindir "$(TargetDir)qt6\plugins" --release "$(TargetPath)"
-        xcopy /y /d "$(SolutionDir)3rdparty\opencv\opencv\opencv411\build\x64\bin\opencv_world4110.dll" "$(OutDir)"
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="test.cpp" />
-    <ClCompile Include="test_fmt.cpp" />
-    <ClCompile Include="test_simple_array.cpp" />
-    <ClCompile Include="test_address_range.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" Condition="'$(GTestInstalled)' == 'true'">
-    <!-- Use path instead of GTestPath variable to fix property pages -->
-    <Import Project="$(SolutionDir)packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Warning Condition="!Exists('$(GTestPath)')" Text="$([System.String]::Format('$(ErrorText)', '$(GTestPath)'))" />
-  </Target>
-</Project>
diff --git a/rpcs3/tests/test.cpp b/rpcs3/tests/test.cpp
deleted file mode 100644
index 818b1066fc..0000000000
--- a/rpcs3/tests/test.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <gtest/gtest.h>
-
-int main(int argc, char** argv)
-{
-	::testing::InitGoogleTest(&argc, argv);
-
-	return RUN_ALL_TESTS();
-}
diff --git a/rpcs3/tests/test_address_range.cpp b/rpcs3/tests/test_address_range.cpp
deleted file mode 100644
index 5a7e8b2faf..0000000000
--- a/rpcs3/tests/test_address_range.cpp
+++ /dev/null
@@ -1,497 +0,0 @@
-#include <gtest/gtest.h>
-
-#define private public
-#include "Utilities/address_range.h"
-#undef private
-
-using namespace utils;
-
-namespace utils
-{
-	TEST(AddressRange, Constructors)
-	{
-		// Default constructor
-		address_range32 empty;
-		EXPECT_FALSE(empty.valid());
-		EXPECT_EQ(empty.start, umax);
-		EXPECT_EQ(empty.end, 0);
-
-		// Static factory methods
-		address_range32 r1 = address_range32::start_length(0x1000, 0x1000);
-		EXPECT_EQ(r1.start, 0x1000);
-		EXPECT_EQ(r1.end, 0x1FFF);
-		EXPECT_EQ(r1.length(), 0x1000);
-		EXPECT_TRUE(r1.valid());
-
-		address_range32 r2 = address_range32::start_end(0x2000, 0x2FFF);
-		EXPECT_EQ(r2.start, 0x2000);
-		EXPECT_EQ(r2.end, 0x2FFF);
-		EXPECT_EQ(r2.length(), 0x1000);
-		EXPECT_TRUE(r2.valid());
-
-		// Edge cases
-		address_range32 zero_length = address_range32::start_length(0x1000, 0);
-		EXPECT_FALSE(zero_length.valid());
-
-		address_range32 single_byte = address_range32::start_length(0x1000, 1);
-		EXPECT_TRUE(single_byte.valid());
-		EXPECT_EQ(single_byte.start, 0x1000);
-		EXPECT_EQ(single_byte.end, 0x1000);
-		EXPECT_EQ(single_byte.length(), 1);
-	}
-
-	TEST(AddressRange, LengthAndBoundaries)
-	{
-		address_range32 r = address_range32::start_length(0x1000, 0x1000);
-
-		// Test length
-		EXPECT_EQ(r.length(), 0x1000);
-
-		// Test set_length
-		r.set_length(0x2000);
-		EXPECT_EQ(r.start, 0x1000);
-		EXPECT_EQ(r.end, 0x2FFF);
-		EXPECT_EQ(r.length(), 0x2000);
-
-		// Test next_address and prev_address
-		EXPECT_EQ(r.next_address(), 0x3000);
-		EXPECT_EQ(r.prev_address(), 0xFFF);
-	}
-
-	TEST(AddressRange, Overlapping)
-	{
-		address_range32 r1 = address_range32::start_length(0x1000, 0x1000); // 0x1000-0x1FFF
-
-		// Complete overlap
-		address_range32 r2 = address_range32::start_length(0x1000, 0x1000); // 0x1000-0x1FFF
-		EXPECT_TRUE(r1.overlaps(r2));
-		EXPECT_TRUE(r2.overlaps(r1));
-
-		// Partial overlap at start
-		address_range32 r3 = address_range32::start_length(0x800, 0x1000); // 0x800-0x17FF
-		EXPECT_TRUE(r1.overlaps(r3));
-		EXPECT_TRUE(r3.overlaps(r1));
-
-		// Partial overlap at end
-		address_range32 r4 = address_range32::start_length(0x1800, 0x1000); // 0x1800-0x27FF
-		EXPECT_TRUE(r1.overlaps(r4));
-		EXPECT_TRUE(r4.overlaps(r1));
-
-		// No overlap, before
-		address_range32 r5 = address_range32::start_length(0x0, 0x1000); // 0x0-0xFFF
-		EXPECT_FALSE(r1.overlaps(r5));
-		EXPECT_FALSE(r5.overlaps(r1));
-
-		// No overlap, after
-		address_range32 r6 = address_range32::start_length(0x2000, 0x1000); // 0x2000-0x2FFF
-		EXPECT_FALSE(r1.overlaps(r6));
-		EXPECT_FALSE(r6.overlaps(r1));
-
-		// Single address overlap at start
-		address_range32 r7 = address_range32::start_length(0x800, 0x801); // 0x800-0x1000
-		EXPECT_TRUE(r1.overlaps(r7));
-		EXPECT_TRUE(r7.overlaps(r1));
-
-		// Single address overlap at end
-		address_range32 r8 = address_range32::start_length(0x1FFF, 0x1000); // 0x1FFF-0x2FFE
-		EXPECT_TRUE(r1.overlaps(r8));
-		EXPECT_TRUE(r8.overlaps(r1));
-
-		// Address overlap test
-		EXPECT_TRUE(r1.overlaps(0x1000));  // Start boundary
-		EXPECT_TRUE(r1.overlaps(0x1FFF));  // End boundary
-		EXPECT_TRUE(r1.overlaps(0x1800));  // Middle
-		EXPECT_FALSE(r1.overlaps(0xFFF));  // Just before
-		EXPECT_FALSE(r1.overlaps(0x2000)); // Just after
-	}
-
-	TEST(AddressRange, Inside)
-	{
-		address_range32 r1 = address_range32::start_length(0x1000, 0x1000); // 0x1000-0x1FFF
-
-		// Same range
-		address_range32 r2 = address_range32::start_length(0x1000, 0x1000); // 0x1000-0x1FFF
-		EXPECT_TRUE(r1.inside(r2));
-		EXPECT_TRUE(r2.inside(r1));
-
-		// Smaller range inside
-		address_range32 r3 = address_range32::start_length(0x1200, 0x800); // 0x1200-0x19FF
-		EXPECT_TRUE(r3.inside(r1));
-		EXPECT_FALSE(r1.inside(r3));
-
-		// Larger range outside
-		address_range32 r4 = address_range32::start_length(0x800, 0x2000); // 0x800-0x27FF
-		EXPECT_TRUE(r1.inside(r4));
-		EXPECT_FALSE(r4.inside(r1));
-
-		// Partially overlapping
-		address_range32 r5 = address_range32::start_length(0x1800, 0x1000); // 0x1800-0x27FF
-		EXPECT_FALSE(r1.inside(r5));
-		EXPECT_FALSE(r5.inside(r1));
-
-		// No overlap
-		address_range32 r6 = address_range32::start_length(0x3000, 0x1000); // 0x3000-0x3FFF
-		EXPECT_FALSE(r1.inside(r6));
-		EXPECT_FALSE(r6.inside(r1));
-	}
-
-	TEST(AddressRange, Touches)
-	{
-		address_range32 r1 = address_range32::start_length(0x1000, 0x1000); // 0x1000-0x1FFF
-
-		// Same range (overlaps)
-		address_range32 r2 = address_range32::start_length(0x1000, 0x1000); // 0x1000-0x1FFF
-		EXPECT_TRUE(r1.touches(r2));
-
-		// Overlapping ranges
-		address_range32 r3 = address_range32::start_length(0x1800, 0x1000); // 0x1800-0x27FF
-		EXPECT_TRUE(r1.touches(r3));
-
-		// Adjacent at end of r1
-		address_range32 r4 = address_range32::start_length(0x2000, 0x1000); // 0x2000-0x2FFF
-		EXPECT_TRUE(r1.touches(r4));
-		EXPECT_TRUE(r4.touches(r1));
-
-		// Adjacent at start of r1
-		address_range32 r5 = address_range32::start_length(0x0, 0x1000); // 0x0-0xFFF
-		EXPECT_TRUE(r1.touches(r5));
-		EXPECT_TRUE(r5.touches(r1));
-
-		// Not touching
-		address_range32 r6 = address_range32::start_length(0x3000, 0x1000); // 0x3000-0x3FFF
-		EXPECT_FALSE(r1.touches(r6));
-		EXPECT_FALSE(r6.touches(r1));
-	}
-
-	TEST(AddressRange, Distance)
-	{
-		address_range32 r1 = address_range32::start_length(0x1000, 0x1000); // 0x1000-0x1FFF
-
-		// Touching ranges
-		address_range32 r2 = address_range32::start_length(0x2000, 0x1000); // 0x2000-0x2FFF
-		EXPECT_EQ(r1.distance(r2), 0);
-		EXPECT_EQ(r2.distance(r1), 0);
-		EXPECT_EQ(r1.signed_distance(r2), 0);
-		EXPECT_EQ(r2.signed_distance(r1), 0);
-
-		// Gap of 0x1000 (r3 after r1)
-		address_range32 r3 = address_range32::start_length(0x3000, 0x1000); // 0x3000-0x3FFF
-		EXPECT_EQ(r1.distance(r3), 0x1000);
-		EXPECT_EQ(r3.distance(r1), 0x1000);
-		EXPECT_EQ(r1.signed_distance(r3), 0x1000);
-		EXPECT_EQ(r3.signed_distance(r1), -0x1000);
-
-		// Gap of 0x1000 (r4 before r1)
-		address_range32 r4 = address_range32::start_end(0, 0xEFF); // 0x0-0xEFF
-		EXPECT_EQ(r1.distance(r4), 0x100);
-		EXPECT_EQ(r4.distance(r1), 0x100);
-		EXPECT_EQ(r1.signed_distance(r4), -0x100);
-		EXPECT_EQ(r4.signed_distance(r1), 0x100);
-
-		// Overlapping ranges
-		address_range32 r5 = address_range32::start_length(0x1800, 0x1000); // 0x1800-0x27FF
-		EXPECT_EQ(r1.distance(r5), 0);
-		EXPECT_EQ(r5.distance(r1), 0);
-		EXPECT_EQ(r1.signed_distance(r5), 0);
-		EXPECT_EQ(r5.signed_distance(r1), 0);
-	}
-
-	TEST(AddressRange, MinMax)
-	{
-		address_range32 r1 = address_range32::start_length(0x1000, 0x1000); // 0x1000-0x1FFF
-		address_range32 r2 = address_range32::start_length(0x1800, 0x1000); // 0x1800-0x27FF
-
-		// Get min-max
-		address_range32 min_max = r1.get_min_max(r2);
-		EXPECT_EQ(min_max.start, 0x1000);
-		EXPECT_EQ(min_max.end, 0x27FF);
-
-		// Set min-max
-		address_range32 r3 = address_range32::start_length(0x2000, 0x1000); // 0x2000-0x2FFF
-		r3.set_min_max(r1);
-		EXPECT_EQ(r3.start, 0x1000);
-		EXPECT_EQ(r3.end, 0x2FFF);
-
-		// Test with invalid ranges
-		address_range32 empty;
-		address_range32 min_max2 = r1.get_min_max(empty);
-		EXPECT_EQ(min_max2.start, r1.start);
-		EXPECT_EQ(min_max2.end, r1.end);
-
-		address_range32 min_max3 = empty.get_min_max(r1);
-		EXPECT_EQ(min_max3.start, r1.start);
-		EXPECT_EQ(min_max3.end, r1.end);
-
-		address_range32 min_max4 = empty.get_min_max(empty);
-		EXPECT_EQ(min_max4.start, umax);
-		EXPECT_EQ(min_max4.end, 0);
-	}
-
-	TEST(AddressRange, Intersect)
-	{
-		address_range32 r1 = address_range32::start_length(0x1000, 0x2000); // 0x1000-0x2FFF
-
-		// Complete overlap
-		address_range32 r2 = address_range32::start_length(0x0, 0x4000); // 0x0-0x3FFF
-		address_range32 i1 = r1.get_intersect(r2);
-		EXPECT_EQ(i1.start, 0x1000);
-		EXPECT_EQ(i1.end, 0x2FFF);
-
-		// Partial overlap at start
-		address_range32 r3 = address_range32::start_length(0x0, 0x2000); // 0x0-0x1FFF
-		address_range32 i2 = r1.get_intersect(r3);
-		EXPECT_EQ(i2.start, 0x1000);
-		EXPECT_EQ(i2.end, 0x1FFF);
-
-		// Partial overlap at end
-		address_range32 r4 = address_range32::start_length(0x2000, 0x2000); // 0x2000-0x3FFF
-		address_range32 i3 = r1.get_intersect(r4);
-		EXPECT_EQ(i3.start, 0x2000);
-		EXPECT_EQ(i3.end, 0x2FFF);
-
-		// No overlap
-		address_range32 r5 = address_range32::start_length(0x4000, 0x1000); // 0x4000-0x4FFF
-		address_range32 i4 = r1.get_intersect(r5);
-		EXPECT_FALSE(i4.valid());
-
-		// Test intersect method
-		address_range32 r6 = address_range32::start_length(0x1000, 0x2000); // 0x1000-0x2FFF
-		r6.intersect(r3);
-		EXPECT_EQ(r6.start, 0x1000);
-		EXPECT_EQ(r6.end, 0x1FFF);
-	}
-
-	TEST(AddressRange, Validity)
-	{
-		// Valid range
-		address_range32 r1 = address_range32::start_length(0x1000, 0x1000);
-		EXPECT_TRUE(r1.valid());
-
-		// Invalid range (default constructor)
-		address_range32 r2;
-		EXPECT_FALSE(r2.valid());
-
-		// Invalid range (start > end)
-		address_range32 r3 = address_range32::start_end(0x2000, 0x1000);
-		EXPECT_FALSE(r3.valid());
-
-		// Invalidate
-		r1.invalidate();
-		EXPECT_FALSE(r1.valid());
-		EXPECT_EQ(r1.start, umax);
-		EXPECT_EQ(r1.end, 0);
-	}
-
-	TEST(AddressRange, Comparison)
-	{
-		address_range32 r1 = address_range32::start_length(0x1000, 0x1000);
-		address_range32 r2 = address_range32::start_length(0x1000, 0x1000);
-		address_range32 r3 = address_range32::start_length(0x2000, 0x1000);
-
-		EXPECT_TRUE(r1 == r2);
-		EXPECT_FALSE(r1 == r3);
-	}
-
-	TEST(AddressRange, StringRepresentation)
-	{
-		address_range32 r1 = address_range32::start_length(0x1000, 0x1000);
-		std::string str = r1.str();
-
-		// The exact format may vary, but it should contain the start and end addresses
-		EXPECT_NE(str.find("1000"), std::string::npos);
-		EXPECT_NE(str.find("1fff"), std::string::npos);
-	}
-
-	// Tests for address_range_vector32
-	TEST(AddressRangeVector, BasicOperations)
-	{
-		address_range_vector32 vec;
-		EXPECT_TRUE(vec.empty());
-		EXPECT_EQ(vec.size(), 0);
-
-		// Add a range
-		vec.merge(address_range32::start_length(0x1000, 0x1000));
-		EXPECT_FALSE(vec.empty());
-		EXPECT_EQ(vec.size(), 1);
-
-		// Clear
-		vec.clear();
-		EXPECT_TRUE(vec.empty());
-		EXPECT_EQ(vec.size(), 0);
-	}
-
-	TEST(AddressRangeVector, MergeOperations)
-	{
-		address_range_vector32 vec;
-
-		// Add non-touching ranges
-		vec.merge(address_range32::start_length(0x1000, 0x1000)); // 0x1000-0x1FFF
-		vec.merge(address_range32::start_length(0x3000, 0x1000)); // 0x3000-0x3FFF
-		EXPECT_EQ(vec.valid_count(), 2);
-
-		// Add a range that touches the first range
-		vec.merge(address_range32::start_length(0x2000, 0x1000)); // 0x2000-0x2FFF
-		// Should merge all three ranges
-		EXPECT_EQ(vec.valid_count(), 1);
-		EXPECT_TRUE(vec.contains(address_range32::start_end(0x1000, 0x3FFF)));
-
-		// Add a non-touching range
-		vec.merge(address_range32::start_length(0x5000, 0x1000)); // 0x5000-0x5FFF
-		EXPECT_EQ(vec.valid_count(), 2);
-
-		// Add an overlapping range
-		vec.merge(address_range32::start_length(0x4000, 0x2000)); // 0x4000-0x5FFF
-		EXPECT_EQ(vec.valid_count(), 1);
-		EXPECT_TRUE(vec.contains(address_range32::start_end(0x1000, 0x5FFF)));
-	}
-
-	TEST(AddressRangeVector, ExcludeOperations)
-	{
-		address_range_vector32 vec;
-		vec.merge(address_range32::start_length(0x1000, 0x4000)); // 0x1000-0x4FFF
-
-		// Exclude from the middle
-		vec.exclude(address_range32::start_length(0x2000, 0x1000)); // 0x2000-0x2FFF
-		EXPECT_EQ(vec.valid_count(), 2);
-
-		auto it = vec.begin();
-		EXPECT_EQ(it->start, 0x1000);
-		EXPECT_EQ(it->end, 0x1FFF);
-		++it;
-		EXPECT_EQ(it->start, 0x3000);
-		EXPECT_EQ(it->end, 0x4FFF);
-
-		// Exclude from the start
-		vec.exclude(address_range32::start_length(0x1000, 0x1000)); // 0x1000-0x1FFF
-		EXPECT_EQ(vec.valid_count(), 1);
-		EXPECT_TRUE(vec.contains(address_range32::start_end(0x3000, 0x4FFF)));
-
-		// Exclude from the end
-		vec.exclude(address_range32::start_length(0x4000, 0x1000)); // 0x4000-0x4FFF
-		EXPECT_EQ(vec.valid_count(), 1);
-		EXPECT_TRUE(vec.contains(address_range32::start_end(0x3000, 0x3FFF)));
-
-		// Exclude entire range
-		vec.exclude(address_range32::start_length(0x3000, 0x1000)); // 0x3000-0x3FFF
-		EXPECT_EQ(vec.valid_count(), 0);
-
-		// Test excluding with another vector
-		vec.merge(address_range32::start_length(0x1000, 0x4000)); // 0x1000-0x4FFF
-
-		address_range_vector32 vec2;
-		vec2.merge(address_range32::start_length(0x2000, 0x1000)); // 0x2000-0x2FFF
-		vec2.merge(address_range32::start_length(0x4000, 0x1000)); // 0x4000-0x4FFF
-
-		vec.exclude(vec2);
-		EXPECT_EQ(vec.valid_count(), 2);
-
-		EXPECT_TRUE(vec.contains(address_range32::start_end(0x1000, 0x1FFF)));
-		EXPECT_TRUE(vec.contains(address_range32::start_end(0x3000, 0x3FFF)));
-	}
-
-	TEST(AddressRangeVector, ConsistencyCheck)
-	{
-		address_range_vector32 vec;
-		vec.merge(address_range32::start_length(0x1000, 0x1000)); // 0x1000-0x1FFF
-		vec.merge(address_range32::start_length(0x3000, 0x1000)); // 0x3000-0x3FFF
-
-		EXPECT_TRUE(vec.check_consistency());
-
-		// This would cause inconsistency, but merge should handle it
-		vec.merge(address_range32::start_length(0x2000, 0x1000)); // 0x2000-0x2FFF
-		EXPECT_TRUE(vec.check_consistency());
-		EXPECT_EQ(vec.valid_count(), 1);
-	}
-
-	TEST(AddressRangeVector, OverlapsAndContains)
-	{
-		address_range_vector32 vec;
-		vec.merge(address_range32::start_length(0x1000, 0x1000)); // 0x1000-0x1FFF
-		vec.merge(address_range32::start_length(0x3000, 0x1000)); // 0x3000-0x3FFF
-
-		// Test overlaps with range
-		EXPECT_TRUE(vec.overlaps(address_range32::start_length(0x1500, 0x1000))); // 0x1500-0x24FF
-		EXPECT_TRUE(vec.overlaps(address_range32::start_length(0x3500, 0x1000))); // 0x3500-0x44FF
-		EXPECT_FALSE(vec.overlaps(address_range32::start_length(0x2000, 0x1000))); // 0x2000-0x2FFF
-
-		// Test contains
-		EXPECT_TRUE(vec.contains(address_range32::start_length(0x1000, 0x1000))); // 0x1000-0x1FFF
-		EXPECT_TRUE(vec.contains(address_range32::start_length(0x3000, 0x1000))); // 0x3000-0x3FFF
-		EXPECT_FALSE(vec.contains(address_range32::start_length(0x1500, 0x1000))); // 0x1500-0x24FF
-
-		// Test overlaps with another vector
-		address_range_vector32 vec2;
-		vec2.merge(address_range32::start_length(0x1500, 0x1000)); // 0x1500-0x24FF
-		EXPECT_TRUE(vec.overlaps(vec2));
-
-		address_range_vector32 vec3;
-		vec3.merge(address_range32::start_length(0x2000, 0x1000)); // 0x2000-0x2FFF
-		EXPECT_FALSE(vec.overlaps(vec3));
-
-		// Test inside
-		address_range32 big_range = address_range32::start_length(0x0, 0x5000); // 0x0-0x4FFF
-		EXPECT_TRUE(vec.inside(big_range));
-
-		address_range32 small_range = address_range32::start_length(0x1000, 0x1000); // 0x1000-0x1FFF
-		EXPECT_FALSE(vec.inside(small_range));
-	}
-
-	// Test the std::hash implementation for address_range32
-	TEST(AddressRange, Hash)
-	{
-		address_range32 r1 = address_range32::start_length(0x1000, 0x1000);
-		address_range32 r2 = address_range32::start_length(0x1000, 0x1000);
-		address_range32 r3 = address_range32::start_length(0x2000, 0x1000);
-
-		std::hash<address_range32> hasher;
-		EXPECT_EQ(hasher(r1), hasher(r2));
-		EXPECT_NE(hasher(r1), hasher(r3));
-	}
-
-	// Test invalidation rules around umax
-	TEST(AddressRange, Invalidate32)
-	{
-		address_range32 r1 = address_range32::start_length(0x0, 0x1000);
-		r1.invalidate();
-
-		EXPECT_FALSE(r1.valid());
-		EXPECT_EQ(r1.start, 0xffff'ffffu);
-		EXPECT_EQ(r1.end, 0u);
-	}
-
-	TEST(AddressRange, Invalidate64)
-	{
-		address_range64 r1 = address_range64::start_length(0x0, 0x1000);
-		r1.invalidate();
-
-		EXPECT_FALSE(r1.valid());
-		EXPECT_EQ(r1.start, 0xffff'ffff'ffff'ffffull);
-		EXPECT_EQ(r1.end, 0ull);
-	}
-
-	TEST(AddressRange, Invalidate16)
-	{
-		const u16 start = 0x1000, length = 0x1000;
-		address_range16 r1 = address_range16::start_length(start, length);
-		r1.invalidate();
-
-		EXPECT_FALSE(r1.valid());
-		EXPECT_EQ(r1.start, 0xffff);
-		EXPECT_EQ(r1.end, 0);
-	}
-
-	TEST(AddressRange, InvalidConstruction)
-	{
-		address_range32 r1 = address_range32::start_length(umax, u32{umax} / 2);
-		EXPECT_FALSE(r1.valid());
-	}
-
-	TEST(AddressRange, LargeValues64)
-	{
-		const u32 start = umax, length = u32{umax} / 2;
-		address_range64 r1 = address_range64::start_length(start, length);
-
-		EXPECT_EQ(r1.start, 0xffff'ffffull);
-		EXPECT_EQ(r1.end, 0x1'7fff'fffd);
-	}
-}
diff --git a/rpcs3/tests/test_fmt.cpp b/rpcs3/tests/test_fmt.cpp
deleted file mode 100644
index e44b4adab0..0000000000
--- a/rpcs3/tests/test_fmt.cpp
+++ /dev/null
@@ -1,462 +0,0 @@
-#include <gtest/gtest.h>
-#include "Utilities/StrUtil.h"
-
-using namespace std::literals::string_literals;
-
-namespace fmt
-{
-	TEST(StrUtil, Trim)
-	{
-		EXPECT_EQ(""s, fmt::trim("", ""));
-		EXPECT_EQ(""s, fmt::trim("", " "));
-		EXPECT_EQ(""s, fmt::trim("", "a "));
-		EXPECT_EQ(" "s, fmt::trim(" ", ""));
-		EXPECT_EQ(""s, fmt::trim(" ", " "));
-		EXPECT_EQ("a"s, fmt::trim("a ", " "));
-		EXPECT_EQ("a"s, fmt::trim(" a", " "));
-		EXPECT_EQ("a a"s, fmt::trim("a a", " "));
-		EXPECT_EQ("a a"s, fmt::trim("a a ", " "));
-		EXPECT_EQ("a a"s, fmt::trim(" a a", " "));
-		EXPECT_EQ("a a"s, fmt::trim(" a a ", " "));
-		EXPECT_EQ("a a"s, fmt::trim("a a    ", " "));
-		EXPECT_EQ("a a"s, fmt::trim("    a a    ", " "));
-		EXPECT_EQ("a a"s, fmt::trim("    a a", " "));
-		EXPECT_EQ(""s, fmt::trim("    a a    ", " a"));
-		EXPECT_EQ("b"s, fmt::trim("    aba    ", " a"));
-	}
-
-	TEST(StrUtil, TrimFront)
-	{
-		EXPECT_EQ(""s, fmt::trim_front("", ""));
-		EXPECT_EQ(""s, fmt::trim_front("", " "));
-		EXPECT_EQ(""s, fmt::trim_front("", "a "));
-		EXPECT_EQ(" "s, fmt::trim_front(" ", ""));
-		EXPECT_EQ(""s, fmt::trim_front(" ", " "));
-		EXPECT_EQ("a "s, fmt::trim_front("a ", " "));
-		EXPECT_EQ("a"s, fmt::trim_front(" a", " "));
-		EXPECT_EQ("a a"s, fmt::trim_front("a a", " "));
-		EXPECT_EQ("a a "s, fmt::trim_front("a a ", " "));
-		EXPECT_EQ("a a"s, fmt::trim_front(" a a", " "));
-		EXPECT_EQ("a a "s, fmt::trim_front(" a a ", " "));
-		EXPECT_EQ("a a    "s, fmt::trim_front("a a    ", " "));
-		EXPECT_EQ("a a    "s, fmt::trim_front("    a a    ", " "));
-		EXPECT_EQ("a a"s, fmt::trim_front("    a a", " "));
-		EXPECT_EQ(""s, fmt::trim_front("    a a    ", " a"));
-		EXPECT_EQ("ba    "s, fmt::trim_front("    aba    ", " a"));
-	}
-
-	TEST(StrUtil, TrimBack)
-	{
-		std::string str;
-		fmt::trim_back(str, "");
-		EXPECT_EQ(""s, str);
-
-		str = {};
-		fmt::trim_back(str, " ");
-		EXPECT_EQ(""s, str);
-
-		str = {};
-		fmt::trim_back(str, "a ");
-		EXPECT_EQ(""s, str);
-
-		str = " ";
-		fmt::trim_back(str, "");
-		EXPECT_EQ(" "s, str);
-
-		str = " ";
-		fmt::trim_back(str, " ");
-		EXPECT_EQ(""s, str);
-
-		str = "a ";
-		fmt::trim_back(str, " ");
-		EXPECT_EQ("a"s, str);
-
-		str = " a";
-		fmt::trim_back(str, " ");
-		EXPECT_EQ(" a"s, str);
-
-		str = "a a";
-		fmt::trim_back(str, " ");
-		EXPECT_EQ("a a"s, str);
-
-		str = "a a ";
-		fmt::trim_back(str, " ");
-		EXPECT_EQ("a a"s, str);
-
-		str = " a a";
-		fmt::trim_back(str, " ");
-		EXPECT_EQ(" a a"s, str);
-
-		str = " a a ";
-		fmt::trim_back(str, " ");
-		EXPECT_EQ(" a a"s, str);
-
-		str = "a a    ";
-		fmt::trim_back(str, " ");
-		EXPECT_EQ("a a"s, str);
-
-		str = "    a a    ";
-		fmt::trim_back(str, " ");
-		EXPECT_EQ("    a a"s, str);
-
-		str = "    a a";
-		fmt::trim_back(str, " ");
-		EXPECT_EQ("    a a"s, str);
-
-		str = "    a a    ";
-		fmt::trim_back(str, " a");
-		EXPECT_EQ(""s, str);
-
-		str = "    aba    ";
-		fmt::trim_back(str, " a");
-		EXPECT_EQ("    ab"s, str);
-	}
-
-	TEST(StrUtil, ToUpperToLower)
-	{
-		const std::string lowercase = "abcdefghijklmnopqrstuvwxyzäüöß0123456789 .,-<#+";
-		const std::string uppercase = "ABCDEFGHIJKLMNOPQRSTUVWXYZäüöß0123456789 .,-<#+";
-		const std::string to_lower_res = fmt::to_lower(uppercase);
-		const std::string to_upper_res = fmt::to_upper(lowercase);
-
-		EXPECT_EQ(""s, fmt::to_lower(""));
-		EXPECT_EQ(lowercase, fmt::to_lower(lowercase));
-		EXPECT_EQ(lowercase, to_lower_res);
-
-		EXPECT_EQ(""s, fmt::to_upper(""));
-		EXPECT_EQ(uppercase, fmt::to_upper(uppercase));
-		EXPECT_EQ(uppercase, to_upper_res);
-	}
-
-	TEST(StrUtil, Truncate)
-	{
-		const std::string str = "abcdefghijklmnopqrstuvwxyzäüöß0123456789 .,-<#+";
-
-		EXPECT_EQ(""s, fmt::truncate("", -1));
-		EXPECT_EQ(""s, fmt::truncate("", 0));
-		EXPECT_EQ(""s, fmt::truncate("", 1));
-
-		EXPECT_EQ(""s, fmt::truncate(str, 0));
-		EXPECT_EQ("a"s, fmt::truncate(str, 1));
-		EXPECT_EQ("abcdefghijklmnopqrstuvwxyzäüöß0123456789 .,-<#"s, fmt::truncate(str, str.size() - 1));
-
-		EXPECT_EQ(str, fmt::truncate(str, -1));
-		EXPECT_EQ(str, fmt::truncate(str, str.size()));
-		EXPECT_EQ(str, fmt::truncate(str, str.size() + 1));
-	}
-
-	TEST(StrUtil, ReplaceAll)
-	{
-		EXPECT_EQ(""s, fmt::replace_all("", "", ""));
-		EXPECT_EQ(""s, fmt::replace_all("", "", " "));
-		EXPECT_EQ(""s, fmt::replace_all("", "", "word"));
-		EXPECT_EQ(""s, fmt::replace_all("", " ", ""));
-		EXPECT_EQ(""s, fmt::replace_all("", "word", ""));
-		EXPECT_EQ(""s, fmt::replace_all("", "word", "drow"));
-
-		EXPECT_EQ("  "s, fmt::replace_all("  ", "", ""));
-		EXPECT_EQ("  "s, fmt::replace_all("  ", "", " "));
-		EXPECT_EQ("  "s, fmt::replace_all("  ", "", "word"));
-		EXPECT_EQ(""s, fmt::replace_all("  ", " ", ""));
-		EXPECT_EQ("  "s, fmt::replace_all("  ", "word", ""));
-		EXPECT_EQ("  "s, fmt::replace_all("  ", "word", "drow"));
-
-		EXPECT_EQ("word"s, fmt::replace_all("word", "", ""));
-		EXPECT_EQ("word"s, fmt::replace_all("word", "", " "));
-		EXPECT_EQ("word"s, fmt::replace_all("word", "", "word"));
-		EXPECT_EQ("word"s, fmt::replace_all("word", " ", ""));
-		EXPECT_EQ(""s, fmt::replace_all("word", "word", ""));
-		EXPECT_EQ("drow"s, fmt::replace_all("word", "word", "drow"));
-
-		EXPECT_EQ(" word "s, fmt::replace_all(" word ", "", ""));
-		EXPECT_EQ(" word "s, fmt::replace_all(" word ", "", " "));
-		EXPECT_EQ(" word "s, fmt::replace_all(" word ", "", "word"));
-		EXPECT_EQ("word"s, fmt::replace_all(" word ", " ", ""));
-		EXPECT_EQ("  "s, fmt::replace_all(" word ", "word", ""));
-		EXPECT_EQ(" drow "s, fmt::replace_all(" word ", "word", "drow"));
-
-		EXPECT_EQ("word word"s, fmt::replace_all("word word", "", ""));
-		EXPECT_EQ("word word"s, fmt::replace_all("word word", "", " "));
-		EXPECT_EQ("word word"s, fmt::replace_all("word word", "", "word"));
-		EXPECT_EQ("wordword"s, fmt::replace_all("word word", " ", ""));
-		EXPECT_EQ(" "s, fmt::replace_all("word word", "word", ""));
-		EXPECT_EQ("drow drow"s, fmt::replace_all("word word", "word", "drow"));
-
-		// Test count
-		EXPECT_EQ("word word word"s, fmt::replace_all("word word word", "word", "drow", 0));
-		EXPECT_EQ("drow word word"s, fmt::replace_all("word word word", "word", "drow", 1));
-		EXPECT_EQ("drow drow word"s, fmt::replace_all("word word word", "word", "drow", 2));
-		EXPECT_EQ("drow drow drow"s, fmt::replace_all("word word word", "word", "drow", 3));
-		EXPECT_EQ("drow drow drow"s, fmt::replace_all("word word word", "word", "drow", umax));
-		EXPECT_EQ("drow drow drow"s, fmt::replace_all("word word word", "word", "drow", -1));
-	}
-
-	TEST(StrUtil, Split)
-	{
-		using vec = std::vector<std::string>;
-
-		EXPECT_EQ(vec{""}, fmt::split("", {}, false));
-		EXPECT_EQ(vec{""}, fmt::split("", {""}, false));
-		EXPECT_EQ(vec{""}, fmt::split("", {" "}, false));
-		EXPECT_EQ(vec{""}, fmt::split("", {"a"}, false));
-		EXPECT_EQ(vec{""}, fmt::split("", {"a "}, false));
-		EXPECT_EQ(vec{""}, fmt::split("", {"a b"}, false));
-		EXPECT_EQ(vec{""}, fmt::split("", {"a", " "}, false));
-		EXPECT_EQ(vec{""}, fmt::split("", {"a", " ", "b"}, false));
-
-		EXPECT_EQ(vec{" "}, fmt::split(" ", {}, false));
-		EXPECT_EQ(vec{" "}, fmt::split(" ", {""}, false));
-		EXPECT_EQ(vec{""}, fmt::split(" ", {" "}, false));
-		EXPECT_EQ(vec{" "}, fmt::split(" ", {"a"}, false));
-		EXPECT_EQ(vec{" "}, fmt::split(" ", {"a "}, false));
-		EXPECT_EQ(vec{" "}, fmt::split(" ", {"a b"}, false));
-		EXPECT_EQ(vec{""}, fmt::split(" ", {"a", " "}, false));
-		EXPECT_EQ(vec{""}, fmt::split(" ", {"a", " ", "b"}, false));
-
-		EXPECT_EQ(vec{"  "}, fmt::split("  ", {}, false));
-		EXPECT_EQ(vec{"  "}, fmt::split("  ", {""}, false));
-		EXPECT_EQ(vec({"", ""}), fmt::split("  ", {" "}, false));
-		EXPECT_EQ(vec{"  "}, fmt::split("  ", {"a"}, false));
-		EXPECT_EQ(vec{"  "}, fmt::split("  ", {"a "}, false));
-		EXPECT_EQ(vec{"  "}, fmt::split("  ", {"a b"}, false));
-		EXPECT_EQ(vec({"", ""}), fmt::split("  ", {"a", " "}, false));
-		EXPECT_EQ(vec({"", ""}), fmt::split("  ", {"a", " ", "b"}, false));
-
-		EXPECT_EQ(vec{"a"}, fmt::split("a", {}, false));
-		EXPECT_EQ(vec{"a"}, fmt::split("a", {""}, false));
-		EXPECT_EQ(vec{"a"}, fmt::split("a", {" "}, false));
-		EXPECT_EQ(vec{""}, fmt::split("a", {"a"}, false));
-		EXPECT_EQ(vec{"a"}, fmt::split("a", {"a "}, false));
-		EXPECT_EQ(vec{"a"}, fmt::split("a", {"a b"}, false));
-		EXPECT_EQ(vec{""}, fmt::split("a", {"a", " "}, false));
-		EXPECT_EQ(vec{""}, fmt::split("a", {"a", " ", "b"}, false));
-
-		EXPECT_EQ(vec{"aa"}, fmt::split("aa", {}, false));
-		EXPECT_EQ(vec{"aa"}, fmt::split("aa", {""}, false));
-		EXPECT_EQ(vec{"aa"}, fmt::split("aa", {" "}, false));
-		EXPECT_EQ(vec({"", ""}), fmt::split("aa", {"a"}, false));
-		EXPECT_EQ(vec{"aa"}, fmt::split("aa", {"a "}, false));
-		EXPECT_EQ(vec{"aa"}, fmt::split("aa", {"a b"}, false));
-		EXPECT_EQ(vec({"", ""}), fmt::split("aa", {"a", " "}, false));
-		EXPECT_EQ(vec({"", ""}), fmt::split("aa", {"a", " ", "b"}, false));
-
-		EXPECT_EQ(vec{"a b"}, fmt::split("a b", {}, false));
-		EXPECT_EQ(vec{"a b"}, fmt::split("a b", {""}, false));
-		EXPECT_EQ(vec({"a", "b"}), fmt::split("a b", {" "}, false));
-		EXPECT_EQ(vec({"", " b"}), fmt::split("a b", {"a"}, false));
-		EXPECT_EQ(vec({"", "b"}), fmt::split("a b", {"a "}, false));
-		EXPECT_EQ(vec{""}, fmt::split("a b", {"a b"}, false));
-		EXPECT_EQ(vec({"", "", "b"}), fmt::split("a b", {"a", " "}, false));
-		EXPECT_EQ(vec({"", "", ""}), fmt::split("a b", {"a", " ", "b"}, false));
-
-		EXPECT_EQ(vec{"a b c c b a"}, fmt::split("a b c c b a", {}, false));
-		EXPECT_EQ(vec{"a b c c b a"}, fmt::split("a b c c b a", {""}, false));
-		EXPECT_EQ(vec({"a", "b", "c", "c", "b", "a"}), fmt::split("a b c c b a", {" "}, false));
-		EXPECT_EQ(vec({"", " b c c b "}), fmt::split("a b c c b a", {"a"}, false));
-		EXPECT_EQ(vec({"", "b c c b a"}), fmt::split("a b c c b a", {"a "}, false));
-		EXPECT_EQ(vec({"", " c c b a"}), fmt::split("a b c c b a", {"a b"}, false));
-		EXPECT_EQ(vec({"", "", "b", "c", "c", "b", ""}), fmt::split("a b c c b a", {"a", " "}, false));
-		EXPECT_EQ(vec({"", "", "", "", "c", "c", "", "", ""}), fmt::split("a b c c b a", {"a", " ", "b"}, false));
-
-		EXPECT_EQ(vec{" This is a test! "}, fmt::split(" This is a test! ", {}, false));
-		EXPECT_EQ(vec{" This is a test! "}, fmt::split(" This is a test! ", {""}, false));
-		EXPECT_EQ(vec({"", "This", "is", "a", "test!"}), fmt::split(" This is a test! ", {" "}, false));
-		EXPECT_EQ(vec({" This is ", " test! "}), fmt::split(" This is a test! ", {"a"}, false));
-		EXPECT_EQ(vec({" This is ", "test! "}), fmt::split(" This is a test! ", {"a "}, false));
-		EXPECT_EQ(vec{" This is a test! "}, fmt::split(" This is a test! ", {"a b"}, false));
-		EXPECT_EQ(vec({"", "This", "is", "", "", "test!"}), fmt::split(" This is a test! ", {"a", " "}, false));
-		EXPECT_EQ(vec({"", "This", "is", "", "", "test!"}), fmt::split(" This is a test! ", {"a", " ", "b"}, false));
-
-		EXPECT_EQ(vec{}, fmt::split("", {}, true));
-		EXPECT_EQ(vec{}, fmt::split("", {""}, true));
-		EXPECT_EQ(vec{}, fmt::split("", {" "}, true));
-		EXPECT_EQ(vec{}, fmt::split("", {"a"}, true));
-		EXPECT_EQ(vec{}, fmt::split("", {"a "}, true));
-		EXPECT_EQ(vec{}, fmt::split("", {"a b"}, true));
-		EXPECT_EQ(vec{}, fmt::split("", {"a", " "}, true));
-		EXPECT_EQ(vec{}, fmt::split("", {"a", " ", "b"}, true));
-
-		EXPECT_EQ(vec{" "}, fmt::split(" ", {}, true));
-		EXPECT_EQ(vec{" "}, fmt::split(" ", {""}, true));
-		EXPECT_EQ(vec{}, fmt::split(" ", {" "}, true));
-		EXPECT_EQ(vec{" "}, fmt::split(" ", {"a"}, true));
-		EXPECT_EQ(vec{" "}, fmt::split(" ", {"a "}, true));
-		EXPECT_EQ(vec{" "}, fmt::split(" ", {"a b"}, true));
-		EXPECT_EQ(vec{}, fmt::split(" ", {"a", " "}, true));
-		EXPECT_EQ(vec{}, fmt::split(" ", {"a", " ", "b"}, true));
-
-		EXPECT_EQ(vec{"  "}, fmt::split("  ", {}, true));
-		EXPECT_EQ(vec{"  "}, fmt::split("  ", {""}, true));
-		EXPECT_EQ(vec{}, fmt::split("  ", {" "}, true));
-		EXPECT_EQ(vec{"  "}, fmt::split("  ", {"a"}, true));
-		EXPECT_EQ(vec{"  "}, fmt::split("  ", {"a "}, true));
-		EXPECT_EQ(vec{"  "}, fmt::split("  ", {"a b"}, true));
-		EXPECT_EQ(vec{}, fmt::split("  ", {"a", " "}, true));
-		EXPECT_EQ(vec{}, fmt::split("  ", {"a", " ", "b"}, true));
-
-		EXPECT_EQ(vec{"a"}, fmt::split("a", {}, true));
-		EXPECT_EQ(vec{"a"}, fmt::split("a", {""}, true));
-		EXPECT_EQ(vec{"a"}, fmt::split("a", {" "}, true));
-		EXPECT_EQ(vec{}, fmt::split("a", {"a"}, true));
-		EXPECT_EQ(vec{"a"}, fmt::split("a", {"a "}, true));
-		EXPECT_EQ(vec{"a"}, fmt::split("a", {"a b"}, true));
-		EXPECT_EQ(vec{}, fmt::split("a", {"a", " "}, true));
-		EXPECT_EQ(vec{}, fmt::split("a", {"a", " ", "b"}, true));
-
-		EXPECT_EQ(vec{"aa"}, fmt::split("aa", {}, true));
-		EXPECT_EQ(vec{"aa"}, fmt::split("aa", {""}, true));
-		EXPECT_EQ(vec{"aa"}, fmt::split("aa", {" "}, true));
-		EXPECT_EQ(vec{}, fmt::split("aa", {"a"}, true));
-		EXPECT_EQ(vec{"aa"}, fmt::split("aa", {"a "}, true));
-		EXPECT_EQ(vec{"aa"}, fmt::split("aa", {"a b"}, true));
-		EXPECT_EQ(vec{}, fmt::split("aa", {"a", " "}, true));
-		EXPECT_EQ(vec{}, fmt::split("aa", {"a", " ", "b"}, true));
-
-		EXPECT_EQ(vec{"a b"}, fmt::split("a b", {}, true));
-		EXPECT_EQ(vec{"a b"}, fmt::split("a b", {""}, true));
-		EXPECT_EQ(vec({"a", "b"}), fmt::split("a b", {" "}, true));
-		EXPECT_EQ(vec{" b"}, fmt::split("a b", {"a"}, true));
-		EXPECT_EQ(vec{"b"}, fmt::split("a b", {"a "}, true));
-		EXPECT_EQ(vec{}, fmt::split("a b", {"a b"}, true));
-		EXPECT_EQ(vec{"b"}, fmt::split("a b", {"a", " "}, true));
-		EXPECT_EQ(vec{}, fmt::split("a b", {"a", " ", "b"}, true));
-
-		EXPECT_EQ(vec{"a b c c b a"}, fmt::split("a b c c b a", {}, true));
-		EXPECT_EQ(vec{"a b c c b a"}, fmt::split("a b c c b a", {""}, true));
-		EXPECT_EQ(vec({"a", "b", "c", "c", "b", "a"}), fmt::split("a b c c b a", {" "}, true));
-		EXPECT_EQ(vec{" b c c b "}, fmt::split("a b c c b a", {"a"}, true));
-		EXPECT_EQ(vec{"b c c b a"}, fmt::split("a b c c b a", {"a "}, true));
-		EXPECT_EQ(vec{" c c b a"}, fmt::split("a b c c b a", {"a b"}, true));
-		EXPECT_EQ(vec({"b", "c", "c", "b"}), fmt::split("a b c c b a", {"a", " "}, true));
-		EXPECT_EQ(vec({"c", "c"}), fmt::split("a b c c b a", {"a", " ", "b"}, true));
-
-		EXPECT_EQ(vec{" This is a test! "}, fmt::split(" This is a test! ", {}, true));
-		EXPECT_EQ(vec{" This is a test! "}, fmt::split(" This is a test! ", {""}, true));
-		EXPECT_EQ(vec({"This", "is", "a", "test!"}), fmt::split(" This is a test! ", {" "}, true));
-		EXPECT_EQ(vec({" This is ", " test! "}), fmt::split(" This is a test! ", {"a"}, true));
-		EXPECT_EQ(vec({" This is ", "test! "}), fmt::split(" This is a test! ", {"a "}, true));
-		EXPECT_EQ(vec{" This is a test! "}, fmt::split(" This is a test! ", {"a b"}, true));
-		EXPECT_EQ(vec({"This", "is", "test!"}), fmt::split(" This is a test! ", {"a", " "}, true));
-		EXPECT_EQ(vec({"This", "is", "test!"}), fmt::split(" This is a test! ", {"a", " ", "b"}, true));
-	}
-
-	TEST(StrUtil, Merge)
-	{
-		using vec = std::vector<std::string>;
-		using lst = std::initializer_list<std::vector<std::string>>;
-
-		// Vector of strings
-		EXPECT_EQ(""s, fmt::merge(vec{}, ""));
-		EXPECT_EQ(""s, fmt::merge(vec{}, " "));
-		EXPECT_EQ(""s, fmt::merge(vec{}, "-"));
-		EXPECT_EQ(""s, fmt::merge(vec{}, " *-* "));
-
-		EXPECT_EQ(""s, fmt::merge(vec{""}, ""));
-		EXPECT_EQ(""s, fmt::merge(vec{""}, " "));
-		EXPECT_EQ(""s, fmt::merge(vec{""}, "-"));
-		EXPECT_EQ(""s, fmt::merge(vec{""}, " *-* "));
-
-		EXPECT_EQ("a"s, fmt::merge(vec{"a"}, ""));
-		EXPECT_EQ("a"s, fmt::merge(vec{"a"}, " "));
-		EXPECT_EQ("a"s, fmt::merge(vec{"a"}, "-"));
-		EXPECT_EQ("a"s, fmt::merge(vec{"a"}, " *-* "));
-
-		EXPECT_EQ("ab"s, fmt::merge(vec{"a", "b"}, ""));
-		EXPECT_EQ("a b"s, fmt::merge(vec{"a", "b"}, " "));
-		EXPECT_EQ("a-b"s, fmt::merge(vec{"a", "b"}, "-"));
-		EXPECT_EQ("a *-* b"s, fmt::merge(vec{"a", "b"}, " *-* "));
-
-		EXPECT_EQ("abc"s, fmt::merge(vec{"a", "b", "c"}, ""));
-		EXPECT_EQ("a b c"s, fmt::merge(vec{"a", "b", "c"}, " "));
-		EXPECT_EQ("a-b-c"s, fmt::merge(vec{"a", "b", "c"}, "-"));
-		EXPECT_EQ("a *-* b *-* c"s, fmt::merge(vec{"a", "b", "c"}, " *-* "));
-
-		// Initializer list of vector of strings
-		EXPECT_EQ(""s, fmt::merge(lst{}, ""));
-		EXPECT_EQ(""s, fmt::merge(lst{}, " "));
-		EXPECT_EQ(""s, fmt::merge(lst{}, "-"));
-		EXPECT_EQ(""s, fmt::merge(lst{}, " *-* "));
-
-		EXPECT_EQ(""s, fmt::merge(lst{vec{}}, ""));
-		EXPECT_EQ(""s, fmt::merge(lst{vec{}}, " "));
-		EXPECT_EQ(""s, fmt::merge(lst{vec{}}, "-"));
-		EXPECT_EQ(""s, fmt::merge(lst{vec{}}, " *-* "));
-
-		EXPECT_EQ("a"s, fmt::merge(lst{vec{"a"}}, ""));
-		EXPECT_EQ("a"s, fmt::merge(lst{vec{"a"}}, " "));
-		EXPECT_EQ("a"s, fmt::merge(lst{vec{"a"}}, "-"));
-		EXPECT_EQ("a"s, fmt::merge(lst{vec{"a"}}, " *-* "));
-
-		EXPECT_EQ("ab"s, fmt::merge(lst{vec{"a", "b"}}, ""));
-		EXPECT_EQ("a b"s, fmt::merge(lst{vec{"a", "b"}}, " "));
-		EXPECT_EQ("a-b"s, fmt::merge(lst{vec{"a", "b"}}, "-"));
-		EXPECT_EQ("a *-* b"s, fmt::merge(lst{vec{"a", "b"}}, " *-* "));
-
-		EXPECT_EQ("abc"s, fmt::merge(lst{vec{"a", "b", "c"}}, ""));
-		EXPECT_EQ("a b c"s, fmt::merge(lst{vec{"a", "b", "c"}}, " "));
-		EXPECT_EQ("a-b-c"s, fmt::merge(lst{vec{"a", "b", "c"}}, "-"));
-		EXPECT_EQ("a *-* b *-* c"s, fmt::merge(lst{vec{"a", "b", "c"}}, " *-* "));
-
-		EXPECT_EQ("ab"s, fmt::merge(lst{vec{"a"}, vec{"b"}}, ""));
-		EXPECT_EQ("a b"s, fmt::merge(lst{vec{"a"}, vec{"b"}}, " "));
-		EXPECT_EQ("a-b"s, fmt::merge(lst{vec{"a"}, vec{"b"}}, "-"));
-		EXPECT_EQ("a *-* b"s, fmt::merge(lst{vec{"a"}, vec{"b"}}, " *-* "));
-
-		EXPECT_EQ("abc"s, fmt::merge(lst{vec{"a"}, vec{"b"}, vec{"c"}}, ""));
-		EXPECT_EQ("a b c"s, fmt::merge(lst{vec{"a"}, vec{"b"}, vec{"c"}}, " "));
-		EXPECT_EQ("a-b-c"s, fmt::merge(lst{vec{"a"}, vec{"b"}, vec{"c"}}, "-"));
-		EXPECT_EQ("a *-* b *-* c"s, fmt::merge(lst{vec{"a"}, vec{"b"}, vec{"c"}}, " *-* "));
-
-		EXPECT_EQ("a1b2"s, fmt::merge(lst{vec{"a", "1"}, vec{"b", "2"}}, ""));
-		EXPECT_EQ("a 1 b 2"s, fmt::merge(lst{vec{"a", "1"}, vec{"b", "2"}}, " "));
-		EXPECT_EQ("a-1-b-2"s, fmt::merge(lst{vec{"a", "1"}, vec{"b", "2"}}, "-"));
-		EXPECT_EQ("a *-* 1 *-* b *-* 2"s, fmt::merge(lst{vec{"a", "1"}, vec{"b", "2"}}, " *-* "));
-	}
-
-	TEST(StrUtil, GetFileExtension)
-	{
-		EXPECT_EQ(""s, get_file_extension(""));
-		EXPECT_EQ(""s, get_file_extension("."));
-		EXPECT_EQ(""s, get_file_extension(".."));
-		EXPECT_EQ(""s, get_file_extension("a."));
-		EXPECT_EQ(""s, get_file_extension("a.."));
-		EXPECT_EQ(""s, get_file_extension(".a."));
-		EXPECT_EQ("a"s, get_file_extension(".a"));
-		EXPECT_EQ("a"s, get_file_extension("..a"));
-		EXPECT_EQ(""s, get_file_extension("abc"));
-		EXPECT_EQ(""s, get_file_extension("abc."));
-		EXPECT_EQ(""s, get_file_extension("abc.."));
-		EXPECT_EQ(""s, get_file_extension(".abc."));
-		EXPECT_EQ("abc"s, get_file_extension(".abc"));
-		EXPECT_EQ("abc"s, get_file_extension("qwe.abc"));
-		EXPECT_EQ("abc"s, get_file_extension("qwe..abc"));
-		EXPECT_EQ(""s, get_file_extension("qwe..abc.."));
-		EXPECT_EQ("txt"s, get_file_extension("qwe..abc..txt"));
-		EXPECT_EQ(""s, get_file_extension("my_file/asd"));
-		EXPECT_EQ("txt"s, get_file_extension("my_file/asd.txt"));
-	}
-
-	TEST(StrUtil, StrcpyTrunc)
-	{
-		char dst[13];
-		std::memset(dst, 'A', sizeof(dst));
-		strcpy_trunc(dst, "");
-		EXPECT_TRUE(std::all_of(dst, dst + sizeof(dst), [](char c){ return c == '\0'; }));
-
-		std::memset(dst, 'A', sizeof(dst));
-		strcpy_trunc(dst, "Hello");
-		EXPECT_EQ('\0', dst[5]);
-		EXPECT_EQ(std::string(dst), "Hello");
-		EXPECT_TRUE(std::all_of(dst + 5, dst + sizeof(dst), [](char c){ return c == '\0'; }));
-
-		std::memset(dst, 'A', sizeof(dst));
-		strcpy_trunc(dst, "Hello World!");
-		EXPECT_EQ('\0', dst[12]);
-		EXPECT_EQ(std::string(dst), "Hello World!");
-
-		std::memset(dst, 'A', sizeof(dst));
-		strcpy_trunc(dst, "Hello World! Here I am!");
-		EXPECT_EQ('\0', dst[12]);
-		EXPECT_EQ(std::string(dst), "Hello World!");
-	}
-}
diff --git a/rpcs3/tests/test_simple_array.cpp b/rpcs3/tests/test_simple_array.cpp
deleted file mode 100644
index 916284a6cd..0000000000
--- a/rpcs3/tests/test_simple_array.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-#include <gtest/gtest.h>
-
-#define private public
-#include "Emu/RSX/Common/simple_array.hpp"
-#undef private
-
-namespace rsx
-{
-	TEST(SimpleArray, DefaultConstructor)
-	{
-		rsx::simple_array<int> arr;
-
-		EXPECT_TRUE(arr.empty());
-		EXPECT_EQ(arr.size(), 0);
-		EXPECT_GE(arr.capacity(), 1u);
-	}
-
-	TEST(SimpleArray, InitialSizeConstructor)
-	{
-		rsx::simple_array<int> arr(5);
-
-		EXPECT_FALSE(arr.empty());
-		EXPECT_EQ(arr.size(), 5);
-		EXPECT_GE(arr.capacity(), 5u);
-	}
-
-	TEST(SimpleArray, InitialSizeValueConstructor)
-	{
-		rsx::simple_array<int> arr(3, 42);
-
-		EXPECT_EQ(arr.size(), 3);
-		for (int i = 0; i < 3; ++i)
-		{
-			EXPECT_EQ(arr[i], 42);
-		}
-	}
-
-	TEST(SimpleArray, InitializerListConstructor)
-	{
-		rsx::simple_array<int> arr{ 1, 2, 3, 4, 5 };
-
-		EXPECT_EQ(arr.size(), 5);
-		for (int i = 0; i < 5; ++i)
-		{
-			EXPECT_EQ(arr[i], i + 1);
-		}
-	}
-
-	TEST(SimpleArray, CopyConstructor)
-	{
-		rsx::simple_array<int> arr1{ 1, 2, 3 };
-		rsx::simple_array<int> arr2(arr1);
-
-		EXPECT_EQ(arr1.size(), arr2.size());
-		for (u32 i = 0; i < arr1.size(); ++i)
-		{
-			EXPECT_EQ(arr1[i], arr2[i]);
-		}
-	}
-
-	TEST(SimpleArray, MoveConstructor)
-	{
-		rsx::simple_array<int> arr1{ 1, 2, 3 };
-		u32 original_size = arr1.size();
-		rsx::simple_array<int> arr2(std::move(arr1));
-
-		EXPECT_EQ(arr2.size(), original_size);
-		EXPECT_TRUE(arr1.empty());
-	}
-
-	TEST(SimpleArray, PushBackAndAccess)
-	{
-		rsx::simple_array<int> arr;
-		arr.push_back(1);
-		arr.push_back(2);
-		arr.push_back(3);
-
-		EXPECT_EQ(arr.size(), 3);
-		EXPECT_EQ(arr[0], 1);
-		EXPECT_EQ(arr[1], 2);
-		EXPECT_EQ(arr[2], 3);
-		EXPECT_EQ(arr.front(), 1);
-		EXPECT_EQ(arr.back(), 3);
-	}
-
-	TEST(SimpleArray, PopBack)
-	{
-		rsx::simple_array<int> arr{ 1, 2, 3 };
-
-		EXPECT_EQ(arr.pop_back(), 3);
-		EXPECT_EQ(arr.size(), 2);
-		EXPECT_EQ(arr.back(), 2);
-	}
-
-	TEST(SimpleArray, Insert)
-	{
-		rsx::simple_array<int> arr{ 1, 3, 4 };
-		auto it = arr.insert(arr.begin() + 1, 2);
-
-		EXPECT_EQ(*it, 2);
-		EXPECT_EQ(arr.size(), 4);
-
-		for (int i = 0; i < 4; ++i)
-		{
-			EXPECT_EQ(arr[i], i + 1);
-		}
-	}
-
-	TEST(SimpleArray, Clear)
-	{
-		rsx::simple_array<int> arr{ 1, 2, 3 };
-		arr.clear();
-
-		EXPECT_TRUE(arr.empty());
-		EXPECT_EQ(arr.size(), 0);
-	}
-
-	TEST(SimpleArray, SmallBufferOptimization)
-	{
-		// Test with a small type that should use stack storage
-		rsx::simple_array<char> small_arr(3, 'a');
-		EXPECT_TRUE(small_arr.is_local_storage());
-
-		// Test with a larger type or more elements that should use heap storage
-		struct LargeType { char data[128]; };
-		rsx::simple_array<LargeType> large_arr(10);
-		EXPECT_FALSE(large_arr.is_local_storage());
-	}
-
-	TEST(SimpleArray, Iterator)
-	{
-		rsx::simple_array<int> arr{ 1, 2, 3, 4, 5 };
-		int sum = 0;
-		for (const auto& val : arr)
-		{
-			sum += val;
-		}
-
-		EXPECT_EQ(sum, 15);
-	}
-
-	TEST(SimpleArray, EraseIf)
-	{
-		rsx::simple_array<int> arr{ 1, 2, 3, 4, 5 };
-		bool modified = arr.erase_if([](const int& val) { return val % 2 == 0; });
-		arr.sort(FN(x < y));
-
-		EXPECT_TRUE(modified);
-		EXPECT_EQ(arr.size(), 3);
-		EXPECT_EQ(arr[0], 1);
-		EXPECT_EQ(arr[1], 3);
-		EXPECT_EQ(arr[2], 5);
-	}
-
-	TEST(SimpleArray, Map)
-	{
-		rsx::simple_array<int> arr{ 1, 2, 3 };
-		auto result = arr.map([](const int& val) { return val * 2; });
-
-		EXPECT_EQ(result.size(), 3);
-		EXPECT_EQ(result[0], 2);
-		EXPECT_EQ(result[1], 4);
-		EXPECT_EQ(result[2], 6);
-	}
-
-	TEST(SimpleArray, Reduce)
-	{
-		rsx::simple_array<int> arr{ 1, 2, 3, 4, 5 };
-		int sum = arr.reduce(0, [](const int& acc, const int& val) { return acc + val; });
-
-		EXPECT_EQ(sum, 15);
-	}
-
-	TEST(SimpleArray, Any)
-	{
-		rsx::simple_array<int> arr{ 1, 2, 3, 4, 5 };
-
-		EXPECT_TRUE(arr.any([](const int& val) { return val > 3; }));
-		EXPECT_FALSE(arr.any([](const int& val) { return val > 5; }));
-	}
-
-	TEST(SimpleArray, Sort)
-	{
-		rsx::simple_array<int> arr{ 5, 3, 1, 4, 2 };
-		arr.sort([](const int& a, const int& b) { return a < b; });
-
-		for (u32 i = 0; i < arr.size(); ++i)
-		{
-			EXPECT_EQ(arr[i], i + 1);
-		}
-	}
-
-	TEST(SimpleArray, Merge)
-	{
-		rsx::simple_array<int> arr{ 1 };
-		rsx::simple_array<int> arr2{ 2, 3, 4, 5, 6, 7, 8, 9 };
-		rsx::simple_array<int> arr3{ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 };
-
-		// Check small vector optimization
-		EXPECT_TRUE(arr.is_local_storage());
-
-		// Small vector optimization holds after append
-		arr += arr2;
-		EXPECT_TRUE(arr.is_local_storage());
-
-		// Exceed the boundary and we move into dynamic alloc
-		arr += arr3;
-		EXPECT_FALSE(arr.is_local_storage());
-
-		// Verify contents
-		EXPECT_EQ(arr.size(), 30);
-		for (int i = 0; i < 30; ++i)
-		{
-			EXPECT_EQ(arr[i], i + 1);
-		}
-	}
-}
diff --git a/rpcs3/update_helper.sh b/rpcs3/update_helper.sh
deleted file mode 100755
index bc51edebe6..0000000000
--- a/rpcs3/update_helper.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# This script copies the new app over the old app and launches it.
-# This is required since invalidating the code signing of an app by
-# replacing it while it is running can result in the app being killed.
-
-if [ "$#" -ne 2 ]; then
-    echo "Usage: update_helper.sh <new_app> <old_app>"
-    exit 1
-fi
-new_app="$1/"
-old_app="$2/"
-
-cp -Rf -p "$new_app" "$old_app"
-open -n -a "$2" --args --updating
diff --git a/rpcs3/util/asm.hpp b/rpcs3/util/asm.hpp
index 14eaa1409d..5757e06233 100644
--- a/rpcs3/util/asm.hpp
+++ b/rpcs3/util/asm.hpp
@@ -1,17 +1,15 @@
 #pragma once
 
 #include "util/types.hpp"
-#include "util/tsc.hpp"
-#include "util/atomic.hpp"
 #include <functional>
 
 extern bool g_use_rtm;
 extern u64 g_rtm_tx_limit1;
 
-#ifdef _M_X64
 #ifdef _MSC_VER
 extern "C"
 {
+	u64 __rdtsc();
 	u32 _xbegin();
 	void _xend();
 	void _mm_pause();
@@ -20,6 +18,8 @@ extern "C"
 
 	uchar _rotl8(uchar, uchar);
 	ushort _rotl16(ushort, uchar);
+	uint _rotl(uint, int);
+	u64 _rotl64(u64, int);
 	u64 __popcnt64(u64);
 
 	s64 __mulh(s64, s64);
@@ -27,21 +27,24 @@ extern "C"
 
 	s64 _div128(s64, s64, s64, s64*);
 	u64 _udiv128(u64, u64, u64, u64*);
-	void __debugbreak();
 }
-#include <intrin.h>
-#else
-#include <immintrin.h>
-#endif
 #endif
 
 namespace utils
 {
+	inline u64 get_tsc()
+	{
+#ifdef _MSC_VER
+		return __rdtsc();
+#else
+		return __builtin_ia32_rdtsc();
+#endif
+	}
+
 	// Transaction helper (result = pair of success and op result, or just bool)
 	template <typename F, typename R = std::invoke_result_t<F>>
 	inline auto tx_start(F op)
 	{
-#if defined(ARCH_X64)
 		uint status = -1;
 
 		for (auto stamp0 = get_tsc(), stamp1 = stamp0; g_use_rtm && stamp1 - stamp0 <= g_rtm_tx_limit1; stamp1 = get_tsc())
@@ -51,7 +54,7 @@ namespace utils
 #else
 			status = _xbegin();
 
-			if (status != _XBEGIN_STARTED) [[unlikely]]
+			if (status != umax) [[unlikely]]
 			{
 				goto retry;
 			}
@@ -87,9 +90,6 @@ namespace utils
 				break;
 			}
 		}
-#else
-		static_cast<void>(op);
-#endif
 
 		if constexpr (std::is_void_v<R>)
 		{
@@ -113,8 +113,8 @@ namespace utils
 		const u64 value = reinterpret_cast<u64>(func);
 		const void* ptr = reinterpret_cast<const void*>(value);
 
-#ifdef _M_X64
-		return _mm_prefetch(static_cast<const char*>(ptr), _MM_HINT_T1);
+#ifdef _MSC_VER
+		return _mm_prefetch(static_cast<const char*>(ptr), 2);
 #else
 		return __builtin_prefetch(ptr, 0, 2);
 #endif
@@ -128,21 +128,21 @@ namespace utils
 			return;
 		}
 
-#ifdef _M_X64
-		return _mm_prefetch(static_cast<const char*>(ptr), _MM_HINT_T0);
+#ifdef _MSC_VER
+		return _mm_prefetch(static_cast<const char*>(ptr), 3);
 #else
 		return __builtin_prefetch(ptr, 0, 3);
 #endif
 	}
 
-	constexpr void prefetch_write(const void* ptr)
+	constexpr void prefetch_write(void* ptr)
 	{
 		if (std::is_constant_evaluated())
 		{
 			return;
 		}
 
-#if defined(_M_X64) && !defined(__clang__)
+#ifdef _MSC_VER
 		return _m_prefetchw(ptr);
 #else
 		return __builtin_prefetch(ptr, 1, 0);
@@ -160,10 +160,8 @@ namespace utils
 		return _rotl8(x, n);
 #elif defined(__clang__)
 		return __builtin_rotateleft8(x, n);
-#elif defined(ARCH_X64)
-		return __builtin_ia32_rolqi(x, n);
 #else
-		return (x << (n & 7)) | (x >> ((-n & 7)));
+		return __builtin_ia32_rolqi(x, n);
 #endif
 	}
 
@@ -178,10 +176,8 @@ namespace utils
 		return _rotl16(x, static_cast<uchar>(n));
 #elif defined(__clang__)
 		return __builtin_rotateleft16(x, n);
-#elif defined(ARCH_X64)
-		return __builtin_ia32_rolhi(x, n);
 #else
-		return (x << (n & 15)) | (x >> ((-n & 15)));
+		return __builtin_ia32_rolhi(x, n);
 #endif
 	}
 
@@ -197,7 +193,7 @@ namespace utils
 #elif defined(__clang__)
 		return __builtin_rotateleft32(x, n);
 #else
-		return (x << (n & 31)) | (x >> (((0 - n) & 31)));
+		return (x << n) | (x >> (32 - n));
 #endif
 	}
 
@@ -213,7 +209,7 @@ namespace utils
 #elif defined(__clang__)
 		return __builtin_rotateleft64(x, n);
 #else
-		return (x << (n & 63)) | (x >> (((0 - n) & 63)));
+		return (x << n) | (x >> (64 - n));
 #endif
 	}
 
@@ -316,14 +312,6 @@ namespace utils
 		return r;
 	}
 
-#ifdef _MSC_VER
-	inline u128 operator/(u128 lhs, u64 rhs)
-	{
-		u64 rem = 0;
-		return _udiv128(lhs.hi, lhs.lo, rhs, &rem);
-	}
-#endif
-
 	constexpr u32 ctz128(u128 arg)
 	{
 #ifdef _MSC_VER
@@ -356,44 +344,37 @@ namespace utils
 
 	inline void pause()
 	{
-#if defined(ARCH_ARM64)
-		__asm__ volatile("yield");
-#elif defined(_M_X64)
+#ifdef _MSC_VER
 		_mm_pause();
-#elif defined(ARCH_X64)
-		__builtin_ia32_pause();
 #else
-#error "Missing utils::pause() implementation"
+		__builtin_ia32_pause();
 #endif
 	}
 
 	// Synchronization helper (cache-friendly busy waiting)
 	inline void busy_wait(usz cycles = 3000)
 	{
-		const u64 stop = get_tsc() + cycles;
+		const u64 start = get_tsc();
 		do pause();
-		while (get_tsc() < stop);
+		while (get_tsc() - start < cycles);
 	}
 
 	// Align to power of 2
-	template <typename T, typename U>
-		requires std::is_unsigned_v<T>
-	constexpr std::make_unsigned_t<std::common_type_t<T, U>> align(T value, U align)
+	template <typename T, typename = std::enable_if_t<std::is_unsigned_v<T>>>
+	constexpr T align(T value, std::type_identity_t<T> align)
 	{
-		return static_cast<std::make_unsigned_t<std::common_type_t<T, U>>>((value + (align - 1)) & (T{0} - align));
+		return static_cast<T>((value + (align - 1)) & (T{0} - align));
 	}
 
 	// General purpose aligned division, the result is rounded up not truncated
-	template <typename T>
-		requires std::is_unsigned_v<T>
+	template <typename T, typename = std::enable_if_t<std::is_unsigned_v<T>>>
 	constexpr T aligned_div(T value, std::type_identity_t<T> align)
 	{
 		return static_cast<T>(value / align + T{!!(value % align)});
 	}
 
 	// General purpose aligned division, the result is rounded to nearest
-	template <typename T>
-		requires std::is_integral_v<T>
+	template <typename T, typename = std::enable_if_t<std::is_integral_v<T>>>
 	constexpr T rounded_div(T value, std::type_identity_t<T> align)
 	{
 		if constexpr (std::is_unsigned_v<T>)
@@ -404,72 +385,18 @@ namespace utils
 		return static_cast<T>(value / align + (value > 0 ? T{(value % align) > (align / 2)} : 0 - T{(value % align) < (align / 2)}));
 	}
 
-	// Multiplying by ratio, semi-resistant to overflows
-	template <UnsignedInt T>
-	constexpr T rational_mul(T value, std::type_identity_t<T> numerator, std::type_identity_t<T> denominator)
+	// Hack. Pointer cast util to workaround UB. Use with extreme care.
+	template <typename T, typename U>
+	[[nodiscard]] T* bless(U* ptr)
 	{
-		if constexpr (sizeof(T) <= sizeof(u64) / 2)
-		{
-			return static_cast<T>(value * u64{numerator} / u64{denominator});
-		}
-
-#if is_u128_emulated
-		if constexpr (sizeof(T) <= sizeof(u128) / 2)
-		{
-			return static_cast<T>(u128_from_mul(value, numerator) / u64{denominator});
-		}
-#endif
-
-		return static_cast<T>(value / denominator * numerator + (value % denominator) * numerator / denominator);
-	}
-
-	template <UnsignedInt T>
-	constexpr T add_saturate(T addend1, T addend2)
-	{
-		return static_cast<T>(~addend1) < addend2 ? T{umax} : static_cast<T>(addend1 + addend2);
-	}
-
-	template <UnsignedInt T>
-	constexpr T sub_saturate(T minuend, T subtrahend)
-	{
-		return minuend < subtrahend ? T{0} : static_cast<T>(minuend - subtrahend);
-	}
-
-	template <UnsignedInt T>
-	constexpr T mul_saturate(T factor1, T factor2)
-	{
-		return factor1 > 0 && T{umax} / factor1 < factor2 ? T{umax} : static_cast<T>(factor1 * factor2);
-	}
-
-	inline void trigger_write_page_fault(void* ptr)
-	{
-#if defined(ARCH_X64) && !defined(_MSC_VER)
-		__asm__ volatile("lock orl $0, 0(%0)" :: "r" (ptr));
-#elif defined(ARCH_ARM64)
-		u32 value = 0;
-		u32* u32_ptr = static_cast<u32*>(ptr);
-		__asm__ volatile("ldset %w0, %w0, %1" : "+r"(value), "=Q"(*u32_ptr) : "r"(value));
+#ifdef _MSC_VER
+		return (T*)ptr;
 #else
-		*static_cast<atomic_t<u32> *>(ptr) += 0;
-#endif
-	}
-
-	inline void trap()
-	{
-#ifdef _M_X64
-		__debugbreak();
-#elif defined(ARCH_X64)
-		__asm__ volatile("int3");
-#elif defined(ARCH_ARM64)
-		__asm__ volatile("brk 0x42");
-#else
-#error "Missing utils::trap() implementation"
+		T* result;
+		__asm__("movq %1, %0;" : "=r" (result) : "r" (ptr) : "memory");
+		return result;
 #endif
 	}
 } // namespace utils
 
 using utils::busy_wait;
-
-#ifdef _MSC_VER
-using utils::operator/;
-#endif
diff --git a/rpcs3/util/atomic.cpp b/rpcs3/util/atomic.cpp
index 67f48f8dc7..54c921adb8 100644
--- a/rpcs3/util/atomic.cpp
+++ b/rpcs3/util/atomic.cpp
@@ -15,12 +15,12 @@ namespace utils
 {
 	u128 __vectorcall atomic_load16(const void* ptr)
 	{
-		return std::bit_cast<u128>(_mm_load_si128(static_cast<const __m128i*>(ptr)));
+		return std::bit_cast<u128>(_mm_load_si128((__m128i*)ptr));
 	}
 
 	void __vectorcall atomic_store16(void* ptr, u128 value)
 	{
-		_mm_store_si128(static_cast<__m128i*>(ptr), std::bit_cast<__m128i>(value));
+		_mm_store_si128((__m128i*)ptr, std::bit_cast<__m128i>(value));
 	}
 }
 #endif
@@ -28,23 +28,6 @@ namespace utils
 #include "Utilities/sync.h"
 #include "Utilities/StrFmt.h"
 
-#ifdef __linux__
-static bool has_waitv()
-{
-	static const bool s_has_waitv = []
-	{
-#ifndef ANDROID
-		// FIXME: it produces SIGSYS signal
-		syscall(SYS_futex_waitv, 0, 0, 0, 0, 0);
-		return errno != ENOSYS;
-#endif
-		return false;
-	}();
-
-	return s_has_waitv;
-}
-#endif
-
 #include <utility>
 #include <cstdint>
 #include <array>
@@ -52,13 +35,12 @@ static bool has_waitv()
 
 #include "asm.hpp"
 #include "endian.hpp"
-#include "tsc.hpp"
 
 // Total number of entries.
 static constexpr usz s_hashtable_size = 1u << 17;
 
-// Reference counter mask
-static constexpr uptr s_ref_mask = 0xffff'ffff;
+// Reference counter combined with shifted pointer (which is assumed to be 47 bit)
+static constexpr uptr s_ref_mask = (1u << 17) - 1;
 
 // Fix for silly on-first-use initializer
 static bool s_null_wait_cb(const void*, u64, u64){ return true; };
@@ -66,20 +48,166 @@ static bool s_null_wait_cb(const void*, u64, u64){ return true; };
 // Callback for wait() function, returns false if wait should return
 static thread_local bool(*s_tls_wait_cb)(const void* data, u64 attempts, u64 stamp0) = s_null_wait_cb;
 
-// Callback for wait() function for a second custon condition, commonly passed with timeout
-static thread_local bool(*s_tls_one_time_wait_cb)(u64 attempts) = nullptr;
+// Callback for notification functions for optimizations
+static thread_local void(*s_tls_notify_cb)(const void* data, u64 progress) = nullptr;
+
+static inline bool operator &(atomic_wait::op lhs, atomic_wait::op_flag rhs)
+{
+	return !!(static_cast<u8>(lhs) & static_cast<u8>(rhs));
+}
 
 // Compare data in memory with old value, and return true if they are equal
-static NEVER_INLINE bool ptr_cmp(const void* data, u32 old, atomic_wait::info* ext = nullptr)
+static NEVER_INLINE bool ptr_cmp(const void* data, u32 _size, u128 old128, u128 mask128, atomic_wait::info* ext = nullptr)
 {
+	using atomic_wait::op;
+	using atomic_wait::op_flag;
+
+	const u8 size = static_cast<u8>(_size);
+	const op flag{static_cast<u8>(_size >> 8)};
+
+	bool result = false;
+
+	if (size <= 8)
+	{
+		u64 new_value = 0;
+		u64 old_value = static_cast<u64>(old128);
+		u64 mask = static_cast<u64>(mask128) & (u64{umax} >> ((64 - size * 8) & 63));
+
+		// Don't load memory on empty mask
+		switch (mask ? size : 0)
+		{
+		case 0: break;
+		case 1: new_value = reinterpret_cast<const atomic_t<u8>*>(data)->load(); break;
+		case 2: new_value = reinterpret_cast<const atomic_t<u16>*>(data)->load(); break;
+		case 4: new_value = reinterpret_cast<const atomic_t<u32>*>(data)->load(); break;
+		case 8: new_value = reinterpret_cast<const atomic_t<u64>*>(data)->load(); break;
+		default:
+		{
+			fmt::throw_exception("Bad size (arg=0x%x)", _size);
+		}
+		}
+
+		if (flag & op_flag::bit_not)
+		{
+			new_value = ~new_value;
+		}
+
+		if (!mask) [[unlikely]]
+		{
+			new_value = 0;
+			old_value = 0;
+		}
+		else
+		{
+			if (flag & op_flag::byteswap)
+			{
+				switch (size)
+				{
+				case 2:
+				{
+					new_value = stx::se_storage<u16>::swap(static_cast<u16>(new_value));
+					old_value = stx::se_storage<u16>::swap(static_cast<u16>(old_value));
+					mask = stx::se_storage<u16>::swap(static_cast<u16>(mask));
+					break;
+				}
+				case 4:
+				{
+					new_value = stx::se_storage<u32>::swap(static_cast<u32>(new_value));
+					old_value = stx::se_storage<u32>::swap(static_cast<u32>(old_value));
+					mask = stx::se_storage<u32>::swap(static_cast<u32>(mask));
+					break;
+				}
+				case 8:
+				{
+					new_value = stx::se_storage<u64>::swap(new_value);
+					old_value = stx::se_storage<u64>::swap(old_value);
+					mask = stx::se_storage<u64>::swap(mask);
+					break;
+				}
+				default:
+				{
+					break;
+				}
+				}
+			}
+
+			// Make most significant bit sign bit
+			const auto shv = std::countl_zero(mask);
+			new_value &= mask;
+			old_value &= mask;
+			new_value <<= shv;
+			old_value <<= shv;
+		}
+
+		s64 news = new_value;
+		s64 olds = old_value;
+
+		u64 newa = news < 0 ? (0ull - new_value) : new_value;
+		u64 olda = olds < 0 ? (0ull - old_value) : old_value;
+
+		switch (op{static_cast<u8>(static_cast<u8>(flag) & 0xf)})
+		{
+		case op::eq: result = old_value == new_value; break;
+		case op::slt: result = olds < news; break;
+		case op::sgt: result = olds > news; break;
+		case op::ult: result = old_value < new_value; break;
+		case op::ugt: result = old_value > new_value; break;
+		case op::alt: result = olda < newa; break;
+		case op::agt: result = olda > newa; break;
+		case op::pop:
+		{
+			// Count is taken from least significant byte and ignores some flags
+			const u64 count = static_cast<u64>(old128) & 0xff;
+
+			result = count < utils::popcnt64(new_value);
+			break;
+		}
+		default:
+		{
+			fmt::throw_exception("ptr_cmp(): unrecognized atomic wait operation.");
+		}
+		}
+	}
+	else if (size == 16 && (flag == op::eq || flag == (op::eq | op_flag::inverse)))
+	{
+		u128 new_value = 0;
+		u128 old_value = old128;
+		u128 mask = mask128;
+
+		// Don't load memory on empty mask
+		if (mask) [[likely]]
+		{
+			new_value = atomic_storage<u128>::load(*reinterpret_cast<const u128*>(data));
+		}
+
+		// TODO
+		result = !((old_value ^ new_value) & mask);
+	}
+	else if (size > 16 && !~mask128 && (flag == op::eq || flag == (op::eq | op_flag::inverse)))
+	{
+		// Interpret old128 as a pointer to the old value
+		ensure(!(old128 >> (64 + 17)));
+
+		result = std::memcmp(data, reinterpret_cast<const void*>(static_cast<uptr>(old128)), size) == 0;
+	}
+	else
+	{
+		fmt::throw_exception("ptr_cmp(): no alternative operations are supported for non-standard atomic wait yet.");
+	}
+
+	if (flag & op_flag::inverse)
+	{
+		result = !result;
+	}
+
 	// Check other wait variables if provided
-	if (reinterpret_cast<const atomic_t<u32>*>(data)->load() == old)
+	if (result)
 	{
 		if (ext) [[unlikely]]
 		{
 			for (auto e = ext; e->data; e++)
 			{
-				if (!ptr_cmp(e->data, e->old))
+				if (!ptr_cmp(e->data, e->size, e->old, e->mask))
 				{
 					return false;
 				}
@@ -151,23 +279,18 @@ namespace
 #endif
 
 	// Essentially a fat semaphore
-	struct alignas(64) cond_handle
+	struct cond_handle
 	{
-		struct fat_ptr
-		{
-			u64 ptr{};
-			u32 reserved{};
-			u32 ref_ctr{};
-
-			auto operator<=>(const fat_ptr& other) const = default;
-		};
-
-		atomic_t<fat_ptr> ptr_ref;
+		// Combined pointer (most significant 47 bits) and ref counter (17 least significant bits)
+		atomic_t<u64> ptr_ref;
 		u64 tid;
-		u32 oldv;
+		u128 mask;
+		u128 oldv;
 
 		u64 tsc0;
 		u16 link;
+		u8 size;
+		u8 flag;
 		atomic_t<u32> sync;
 
 #ifdef USE_STD
@@ -180,8 +303,6 @@ namespace
 		{
 #ifdef _WIN32
 			tid = GetCurrentThreadId();
-#elif defined(ANDROID)
-			tid = pthread_self();
 #else
 			tid = reinterpret_cast<u64>(pthread_self());
 #endif
@@ -191,7 +312,7 @@ namespace
 			mtx.init(mtx);
 #endif
 
-			ensure(ptr_ref.exchange(fat_ptr{iptr, 0, 1}) == fat_ptr{});
+			ensure(!ptr_ref.exchange((iptr << 17) | 1));
 		}
 
 		void destroy()
@@ -199,7 +320,10 @@ namespace
 			tid = 0;
 			tsc0 = 0;
 			link = 0;
+			size = 0;
+			flag = 0;
 			sync.release(0);
+			mask = 0;
 			oldv = 0;
 
 #ifdef USE_STD
@@ -378,7 +502,7 @@ namespace
 				if (cond_id)
 				{
 					// Set fake refctr
-					s_cond_list[cond_id].ptr_ref.release(cond_handle::fat_ptr{0, 0, 1});
+					s_cond_list[cond_id].ptr_ref.release(1);
 					cond_free(cond_id, -1);
 				}
 			}
@@ -389,7 +513,7 @@ namespace
 // TLS storage for few allocaded "semaphores" to allow skipping initialization
 static thread_local tls_cond_handler s_tls_conds{};
 
-static u32 cond_alloc(uptr iptr, u32 tls_slot = -1)
+static u32 cond_alloc(uptr iptr, u128 mask, u32 tls_slot = -1)
 {
 	// Try to get cond from tls slot instead
 	u16* ptls = tls_slot >= std::size(s_tls_conds.cond) ? nullptr : s_tls_conds.cond + tls_slot;
@@ -398,7 +522,8 @@ static u32 cond_alloc(uptr iptr, u32 tls_slot = -1)
 	{
 		// Fast reinitialize
 		const u32 id = std::exchange(*ptls, 0);
-		s_cond_list[id].ptr_ref.release(cond_handle::fat_ptr{iptr, 0, 1});
+		s_cond_list[id].mask = mask;
+		s_cond_list[id].ptr_ref.release((iptr << 17) | 1);
 		return id;
 	}
 
@@ -445,13 +570,17 @@ static u32 cond_alloc(uptr iptr, u32 tls_slot = -1)
 			return pos / 7;
 		});
 
-		// Set lowest clear bit
-		const u64 bits = s_cond_bits[level3].fetch_op(AOFN(x |= x + 1, void()));
+		const u64 bits = s_cond_bits[level3].fetch_op([](u64& bits)
+		{
+			// Set lowest clear bit
+			bits |= bits + 1;
+		});
 
 		// Find lowest clear bit (before it was set in fetch_op)
 		const u32 id = level3 * 64 + std::countr_one(bits);
 
 		// Initialize new "semaphore"
+		s_cond_list[id].mask = mask;
 		s_cond_list[id].init(iptr);
 		return id;
 	}
@@ -469,15 +598,15 @@ static void cond_free(u32 cond_id, u32 tls_slot = -1)
 	const auto cond = s_cond_list + cond_id;
 
 	// Dereference, destroy on last ref
-	const bool last = cond->ptr_ref.atomic_op([](cond_handle::fat_ptr& val)
+	const bool last = cond->ptr_ref.atomic_op([](u64& val)
 	{
-		ensure(val.ref_ctr);
+		ensure(val & s_ref_mask);
 
-		val.ref_ctr--;
+		val--;
 
-		if (val.ref_ctr == 0)
+		if ((val & s_ref_mask) == 0)
 		{
-			val = cond_handle::fat_ptr{};
+			val = 0;
 			return true;
 		}
 
@@ -495,6 +624,8 @@ static void cond_free(u32 cond_id, u32 tls_slot = -1)
 	{
 		// Fast finalization
 		cond->sync.release(0);
+		cond->size = 0;
+		cond->mask = 0;
 		*ptls = static_cast<u16>(cond_id);
 		return;
 	}
@@ -515,33 +646,37 @@ static void cond_free(u32 cond_id, u32 tls_slot = -1)
 	// Release the semaphore tree in the reverse order
 	s_cond_bits[cond_id / 64] &= ~(1ull << (cond_id % 64));
 
-	s_cond_sem3[level2].atomic_op(AOFN(x -= u128{1} << (level3 * 7)));
-	s_cond_sem2[level1].atomic_op(AOFN(x -= u128{1} << (level2 * 11)));
-	s_cond_sem1.atomic_op(AOFN(x -= u128{1} << (level1 * 14)));
+	s_cond_sem3[level2].atomic_op([&](u128& val)
+	{
+		val -= u128{1} << (level3 * 7);
+	});
+
+	s_cond_sem2[level1].atomic_op([&](u128& val)
+	{
+		val -= u128{1} << (level2 * 11);
+	});
+
+	s_cond_sem1.atomic_op([&](u128& val)
+	{
+		val -= u128{1} << (level1 * 14);
+	});
 }
 
-static cond_handle* cond_id_lock(u32 cond_id, uptr iptr = 0)
+static cond_handle* cond_id_lock(u32 cond_id, u128 mask, uptr iptr = 0)
 {
-	bool did_ref = false;
-
-	if (cond_id - 1 >= u16{umax})
+	if (cond_id - 1 < u16{umax})
 	{
-		return nullptr;
-	}
+		const auto cond = s_cond_list + cond_id;
 
-	const auto cond = s_cond_list + cond_id;
-
-	while (true)
-	{
-		const auto [old, ok] = cond->ptr_ref.fetch_op([&](cond_handle::fat_ptr& val)
+		const auto [old, ok] = cond->ptr_ref.fetch_op([&](u64& val)
 		{
-			if (val == cond_handle::fat_ptr{} || val.ref_ctr == s_ref_mask)
+			if (!val || (val & s_ref_mask) == s_ref_mask)
 			{
 				// Don't reference already deallocated semaphore
 				return false;
 			}
 
-			if (iptr && val.ptr != iptr)
+			if (iptr && (val >> 17) != iptr)
 			{
 				// Pointer mismatch
 				return false;
@@ -554,37 +689,24 @@ static cond_handle* cond_id_lock(u32 cond_id, uptr iptr = 0)
 				return false;
 			}
 
-			if (!did_ref)
+			if (!(mask & cond->mask) && cond->size)
 			{
-				val.ref_ctr++;
+				return false;
 			}
 
+			val++;
 			return true;
 		});
 
 		if (ok)
 		{
-			// Check other fields again
-			if (const u32 sync_val = cond->sync; sync_val == 0 || sync_val == 3)
-			{
-				did_ref = true;
-				continue;
-			}
-
 			return cond;
 		}
 
-		if (old.ref_ctr == s_ref_mask)
+		if ((old & s_ref_mask) == s_ref_mask)
 		{
-			fmt::throw_exception("Reference count limit (%u) reached in an atomic notifier.", s_ref_mask);
+			fmt::throw_exception("Reference count limit (131071) reached in an atomic notifier.");
 		}
-
-		break;
-	}
-
-	if (did_ref)
-	{
-		cond_free(cond_id, -1);
 	}
 
 	return nullptr;
@@ -597,14 +719,12 @@ namespace
 		u64 maxc: 5; // Collision counter
 		u64 maxd: 11; // Distance counter
 		u64 bits: 24; // Allocated bits
-		u64 prio: 8; // Reserved
+		u64 prio: 24; // Reserved
 
-		u64 ref : 16; // Ref counter
-		u64 iptr: 64; // First pointer to use slot (to count used slots)
+		u64 ref : 17; // Ref counter
+		u64 iptr: 47; // First pointer to use slot (to count used slots)
 	};
 
-	static_assert(sizeof(slot_allocator) == 16);
-
 	// Need to spare 16 bits for ref counter
 	static constexpr u64 max_threads = 24;
 
@@ -625,7 +745,7 @@ namespace
 		static void slot_free(uptr ptr, atomic_t<u16>* slot, u32 tls_slot) noexcept;
 
 		template <typename F>
-		static auto slot_search(uptr iptr, F func) noexcept;
+		static auto slot_search(uptr iptr, u128 mask, F func) noexcept;
 	};
 
 	static_assert(sizeof(root_info) == 64);
@@ -684,32 +804,31 @@ namespace
 	};
 }
 
+#ifdef _MSC_VER
+extern "C" u64 __rdtsc();
+#endif
+
 u64 utils::get_unique_tsc()
 {
-	const u64 stamp0 = utils::get_tsc();
+#ifdef _MSC_VER
+	const u64 stamp0 = __rdtsc();
+#else
+    const u64 stamp0 = __builtin_ia32_rdtsc();
+#endif
 
-	if (!s_min_tsc.fetch_op([=](u64& tsc)
+	return s_min_tsc.atomic_op([&](u64& tsc)
 	{
-		if (stamp0 <= tsc)
+		if (stamp0 <= s_min_tsc)
 		{
 			// Add 1 if new stamp is too old
-			return false;
+			return ++tsc;
 		}
 		else
 		{
 			// Update last tsc with new stamp otherwise
-			tsc = stamp0;
-			return true;
+			return ((tsc = stamp0));
 		}
-	}).second)
-	{
-		// Add 1 if new stamp is too old
-		// Avoid doing it in the atomic operaion because, if it gets here it means there is already much cntention
-		// So break the race (at least on x86)
-		return s_min_tsc.add_fetch(1);
-	}
-
-	return stamp0;
+	});
 }
 
 atomic_t<u16>* root_info::slot_alloc(uptr ptr) noexcept
@@ -818,10 +937,10 @@ void root_info::slot_free(uptr iptr, atomic_t<u16>* slot, u32 tls_slot) noexcept
 }
 
 template <typename F>
-FORCE_INLINE auto root_info::slot_search(uptr iptr, F func) noexcept
+FORCE_INLINE auto root_info::slot_search(uptr iptr, u128 mask, F func) noexcept
 {
 	u32 index = 0;
-	[[maybe_unused]] u32 total = 0;
+	u32 total = 0;
 
 	for (hash_engine _this(iptr);; _this.advance())
 	{
@@ -848,7 +967,7 @@ FORCE_INLINE auto root_info::slot_search(uptr iptr, F func) noexcept
 
 		for (u32 i = 0; i < cond_count; i++)
 		{
-			if (cond_id_lock(cond_ids[i], iptr))
+			if (cond_id_lock(cond_ids[i], mask, iptr))
 			{
 				if (func(cond_ids[i]))
 				{
@@ -868,84 +987,18 @@ FORCE_INLINE auto root_info::slot_search(uptr iptr, F func) noexcept
 	}
 }
 
-SAFE_BUFFERS(void)
-atomic_wait_engine::wait(const void* data, u32 old_value, u64 timeout, atomic_wait::info* ext)
+SAFE_BUFFERS(void) atomic_wait_engine::wait(const void* data, u32 size, u128 old_value, u64 timeout, u128 mask, atomic_wait::info* ext)
 {
-	uint ext_size = 0;
-
-#ifdef __linux__
-	::timespec ts{};
-	if (timeout + 1)
-	{
-		if (ext && ext->data) [[unlikely]]
-		{
-			// futex_waitv uses absolute timeout
-			::clock_gettime(CLOCK_MONOTONIC, &ts);
-		}
-
-		ts.tv_sec += timeout / 1'000'000'000;
-		ts.tv_nsec += timeout % 1'000'000'000;
-		if (ts.tv_nsec >= 1'000'000'000)
-		{
-			ts.tv_sec++;
-			ts.tv_nsec -= 1'000'000'000;
-		}
-	}
-
-	futex_waitv vec[atomic_wait::max_list]{};
-	vec[0].flags = FUTEX_32 | FUTEX_PRIVATE_FLAG;
-	vec[0].uaddr = reinterpret_cast<__u64>(data);
-	vec[0].val = old_value;
-
-	if (ext) [[unlikely]]
-	{
-		for (auto e = ext; e->data; e++)
-		{
-			ext_size++;
-			vec[ext_size].flags = FUTEX_32 | FUTEX_PRIVATE_FLAG;
-			vec[ext_size].uaddr = reinterpret_cast<__u64>(e->data);
-			vec[ext_size].val = e->old;
-		}
-	}
-
-	if (ext_size && has_waitv()) [[unlikely]]
-	{
-		if (syscall(SYS_futex_waitv, +vec, ext_size + 1, 0, timeout + 1 ? &ts : nullptr, CLOCK_MONOTONIC) == -1)
-		{
-			if (errno == ENOSYS)
-			{
-				fmt::throw_exception("futex_waitv is not supported (Linux kernel is too old)");
-			}
-			if (errno == EINVAL)
-			{
-				fmt::throw_exception("futex_waitv: bad param");
-			}
-		}
-		return;
-	}
-	else if (has_waitv())
-	{
-		if (futex(const_cast<void*>(data), FUTEX_WAIT_PRIVATE, old_value, timeout + 1 ? &ts : nullptr) == -1)
-		{
-			if (errno == EINVAL)
-			{
-				fmt::throw_exception("futex: bad param");
-			}
-		}
-		return;
-	}
-
-	ext_size = 0;
-#endif
-
-	if (!s_tls_wait_cb(data, 0, 0))
-	{
-		return;
-	}
-
 	const auto stamp0 = utils::get_unique_tsc();
 
-	const uptr iptr = reinterpret_cast<uptr>(data);
+	if (!s_tls_wait_cb(data, 0, stamp0))
+	{
+		return;
+	}
+
+	const uptr iptr = reinterpret_cast<uptr>(data) & (~s_ref_mask >> 17);
+
+	uint ext_size = 0;
 
 	uptr iptr_ext[atomic_wait::max_list - 1]{};
 
@@ -966,18 +1019,18 @@ atomic_wait_engine::wait(const void* data, u32 old_value, u64 timeout, atomic_wa
 				}
 			}
 
-			iptr_ext[ext_size] = reinterpret_cast<uptr>(e->data);
+			iptr_ext[ext_size] = reinterpret_cast<uptr>(e->data) & (~s_ref_mask >> 17);
 			ext_size++;
 		}
 	}
 
-	const u32 cond_id = cond_alloc(iptr, 0);
+	const u32 cond_id = cond_alloc(iptr, mask, 0);
 
 	u32 cond_id_ext[atomic_wait::max_list - 1]{};
 
 	for (u32 i = 0; i < ext_size; i++)
 	{
-		cond_id_ext[i] = cond_alloc(iptr_ext[i], i + 1);
+		cond_id_ext[i] = cond_alloc(iptr_ext[i], ext[i].mask, i + 1);
 	}
 
 	const auto slot = root_info::slot_alloc(iptr);
@@ -1000,6 +1053,8 @@ atomic_wait_engine::wait(const void* data, u32 old_value, u64 timeout, atomic_wa
 
 	// Store some info for notifiers (some may be unused)
 	cond->link = 0;
+	cond->size = static_cast<u8>(size);
+	cond->flag = static_cast<u8>(size >> 8);
 	cond->oldv = old_value;
 	cond->tsc0 = stamp0;
 
@@ -1009,6 +1064,8 @@ atomic_wait_engine::wait(const void* data, u32 old_value, u64 timeout, atomic_wa
 	{
 		// Extensions point to original cond_id, copy remaining info
 		cond_ext[i]->link = cond_id;
+		cond_ext[i]->size = static_cast<u8>(ext[i].size);
+		cond_ext[i]->flag = static_cast<u8>(ext[i].size >> 8);
 		cond_ext[i]->oldv = ext[i].old;
 		cond_ext[i]->tsc0 = stamp0;
 
@@ -1041,16 +1098,8 @@ atomic_wait_engine::wait(const void* data, u32 old_value, u64 timeout, atomic_wa
 
 	u64 attempts = 0;
 
-	while (ptr_cmp(data, old_value, ext))
+	while (ptr_cmp(data, size, old_value, mask, ext))
 	{
-		if (s_tls_one_time_wait_cb)
-		{
-			if (!s_tls_one_time_wait_cb(attempts))
-			{
-				break;
-			}
-		}
-
 #ifdef USE_FUTEX
 		struct timespec ts;
 		ts.tv_sec  = timeout / 1'000'000'000;
@@ -1130,22 +1179,17 @@ atomic_wait_engine::wait(const void* data, u32 old_value, u64 timeout, atomic_wa
 			}
 		}
 #endif
-		if (!s_tls_wait_cb(data, ++attempts, stamp0))
-		{
-			break;
-		}
 
 		if (timeout + 1)
 		{
-			if (s_tls_one_time_wait_cb)
-			{
-				// The condition of the callback overrides timeout escape because it makes little sense to do so when a custom condition is passed
-				continue;
-			}
-
 			// TODO: reduce timeout instead
 			break;
 		}
+
+		if (!s_tls_wait_cb(data, ++attempts, stamp0))
+		{
+			break;
+		}
 	}
 
 	while (!fallback)
@@ -1195,11 +1239,10 @@ atomic_wait_engine::wait(const void* data, u32 old_value, u64 timeout, atomic_wa
 	root_info::slot_free(iptr, slot, 0);
 
 	s_tls_wait_cb(data, -1, stamp0);
-	s_tls_one_time_wait_cb = nullptr;
 }
 
 template <bool NoAlert = false>
-static u32 alert_sema(u32 cond_id, u32 size)
+static u32 alert_sema(u32 cond_id, u32 size, u128 mask)
 {
 	ensure(cond_id);
 
@@ -1207,11 +1250,11 @@ static u32 alert_sema(u32 cond_id, u32 size)
 
 	u32 ok = 0;
 
-	if (true)
+	if (!cond->size || mask & cond->mask)
 	{
 		// Redirect if necessary
 		const auto _old = cond;
-		const auto _new = _old->link ? cond_id_lock(_old->link) : _old;
+		const auto _new = _old->link ? cond_id_lock(_old->link, u128(-1)) : _old;
 
 		if (_new && _new->tsc0 == _old->tsc0)
 		{
@@ -1262,63 +1305,56 @@ void atomic_wait_engine::set_wait_callback(bool(*cb)(const void*, u64, u64))
 	}
 }
 
-void atomic_wait_engine::set_one_time_use_wait_callback(bool(*cb)(u64 progress))
+void atomic_wait_engine::set_notify_callback(void(*cb)(const void*, u64))
 {
-	s_tls_one_time_wait_cb = cb;
+	s_tls_notify_cb = cb;
 }
 
-void atomic_wait_engine::notify_one(const void* data)
+void atomic_wait_engine::notify_one(const void* data, u32 size, u128 mask)
 {
-#ifdef __linux__
-	if (has_waitv())
-	{
-		futex(const_cast<void*>(data), FUTEX_WAKE_PRIVATE, 1);
-		return;
-	}
-#endif
-	const uptr iptr = reinterpret_cast<uptr>(data);
+	const uptr iptr = reinterpret_cast<uptr>(data) & (~s_ref_mask >> 17);
 
-	root_info::slot_search(iptr, [&](u32 cond_id)
+	if (s_tls_notify_cb)
+		s_tls_notify_cb(data, 0);
+
+	u64 progress = 0;
+
+	root_info::slot_search(iptr, mask, [&](u32 cond_id)
 	{
-		if (alert_sema(cond_id, 4))
+		if (alert_sema(cond_id, size, mask))
 		{
+			if (s_tls_notify_cb)
+				s_tls_notify_cb(data, ++progress);
 			return true;
 		}
 
 		return false;
 	});
+
+	if (s_tls_notify_cb)
+		s_tls_notify_cb(data, -1);
 }
 
-SAFE_BUFFERS(void)
-atomic_wait_engine::notify_all(const void* data)
+SAFE_BUFFERS(void) atomic_wait_engine::notify_all(const void* data, u32 size, u128 mask)
 {
-#ifdef __linux__
-	if (has_waitv())
-	{
-		futex(const_cast<void*>(data), FUTEX_WAKE_PRIVATE, INT_MAX);
-		return;
-	}
-#endif
-	const uptr iptr = reinterpret_cast<uptr>(data);
+	const uptr iptr = reinterpret_cast<uptr>(data) & (~s_ref_mask >> 17);
+
+	if (s_tls_notify_cb)
+		s_tls_notify_cb(data, 0);
+
+	u64 progress = 0;
 
 	// Array count for batch notification
 	u32 count = 0;
 
 	// Array itself.
-	u32 cond_ids[128];
+	u32 cond_ids[max_threads * max_distance + 128];
 
-	root_info::slot_search(iptr, [&](u32 cond_id)
+	root_info::slot_search(iptr, mask, [&](u32 cond_id)
 	{
-		if (count >= 128)
-		{
-			// Unusual big amount of sema: fallback to notify_one alg
-			alert_sema(cond_id, 4);
-			return false;
-		}
+		u32 res = alert_sema<true>(cond_id, size, mask);
 
-		u32 res = alert_sema<true>(cond_id, 4);
-
-		if (~res <= u16{umax})
+		if (res && ~res <= u16{umax})
 		{
 			// Add to the end of the "stack"
 			*(std::end(cond_ids) - ++count) = ~res;
@@ -1332,7 +1368,7 @@ atomic_wait_engine::notify_all(const void* data)
 	{
 		const u32 cond_id = *(std::end(cond_ids) - i - 1);
 
-		if (!s_cond_list[cond_id].wakeup(1))
+		if (!s_cond_list[cond_id].wakeup(size ? 1 : 2))
 		{
 			*(std::end(cond_ids) - i - 1) = ~cond_id;
 		}
@@ -1349,6 +1385,8 @@ atomic_wait_engine::notify_all(const void* data)
 			{
 				if (s_cond_list[cond_id].try_alert_native())
 				{
+					if (s_tls_notify_cb)
+						s_tls_notify_cb(data, ++progress);
 					*(std::end(cond_ids) - i - 1) = ~cond_id;
 				}
 			}
@@ -1363,6 +1401,8 @@ atomic_wait_engine::notify_all(const void* data)
 		if (cond_id <= u16{umax})
 		{
 			s_cond_list[cond_id].alert_native();
+			if (s_tls_notify_cb)
+				s_tls_notify_cb(data, ++progress);
 			*(std::end(cond_ids) - i - 1) = ~cond_id;
 		}
 	}
@@ -1371,6 +1411,9 @@ atomic_wait_engine::notify_all(const void* data)
 	{
 		cond_free(~*(std::end(cond_ids) - i - 1));
 	}
+
+	if (s_tls_notify_cb)
+		s_tls_notify_cb(data, -1);
 }
 
 namespace atomic_wait
diff --git a/rpcs3/util/atomic.hpp b/rpcs3/util/atomic.hpp
index 4503eaac61..0f60a549d6 100644
--- a/rpcs3/util/atomic.hpp
+++ b/rpcs3/util/atomic.hpp
@@ -2,11 +2,7 @@
 
 #include "util/types.hpp"
 #include <functional>
-
-#ifndef _MSC_VER
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
+#include <mutex>
 
 #ifdef _MSC_VER
 #pragma warning(push)
@@ -71,7 +67,7 @@ namespace utils
 
 FORCE_INLINE void atomic_fence_consume()
 {
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 	_ReadWriteBarrier();
 #else
 	__atomic_thread_fence(__ATOMIC_CONSUME);
@@ -80,7 +76,7 @@ FORCE_INLINE void atomic_fence_consume()
 
 FORCE_INLINE void atomic_fence_acquire()
 {
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 	_ReadWriteBarrier();
 #else
 	__atomic_thread_fence(__ATOMIC_ACQUIRE);
@@ -89,7 +85,7 @@ FORCE_INLINE void atomic_fence_acquire()
 
 FORCE_INLINE void atomic_fence_release()
 {
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 	_ReadWriteBarrier();
 #else
 	__atomic_thread_fence(__ATOMIC_RELEASE);
@@ -98,7 +94,7 @@ FORCE_INLINE void atomic_fence_release()
 
 FORCE_INLINE void atomic_fence_acq_rel()
 {
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 	_ReadWriteBarrier();
 #else
 	__atomic_thread_fence(__ATOMIC_ACQ_REL);
@@ -107,18 +103,16 @@ FORCE_INLINE void atomic_fence_acq_rel()
 
 FORCE_INLINE void atomic_fence_seq_cst()
 {
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 	_ReadWriteBarrier();
 	_InterlockedOr(static_cast<long*>(_AddressOfReturnAddress()), 0);
 	_ReadWriteBarrier();
-#elif defined(ARCH_X64)
-	__asm__ volatile ("lock orl $0, 0(%%rsp);" ::: "cc", "memory");
 #else
-	__atomic_thread_fence(__ATOMIC_SEQ_CST);
+	__asm__ volatile ("lock orl $0, 0(%%rsp);" ::: "cc", "memory");
 #endif
 }
 
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
@@ -128,21 +122,54 @@ enum class atomic_wait_timeout : u64
 	inf = 0xffffffffffffffff,
 };
 
-template <typename T>
-class lf_queue;
-
-namespace stx
-{
-	template <typename T>
-	class atomic_ptr;
-}
-
 // Various extensions for atomic_t::wait
 namespace atomic_wait
 {
 	// Max number of simultaneous atomic variables to wait on (can be extended if really necessary)
 	constexpr uint max_list = 8;
 
+	enum class op : u8
+	{
+		eq, // Wait while value is bitwise equal to
+		slt, // Wait while signed value is less than
+		sgt, // Wait while signed value is greater than
+		ult, // Wait while unsigned value is less than
+		ugt, // Wait while unsigned value is greater than
+		alt, // Wait while absolute value is less than
+		agt, // Wait while absolute value is greater than
+		pop, // Wait while set bit count of the value is less than
+		__max
+	};
+
+	static_assert(static_cast<u8>(op::__max) == 8);
+
+	enum class op_flag : u8
+	{
+		inverse = 1 << 4, // Perform inverse operation (negate the result)
+		bit_not = 1 << 5, // Perform bitwise NOT on loaded value before operation
+		byteswap = 1 << 6, // Perform byteswap on both arguments and masks when applicable
+	};
+
+	constexpr op_flag op_be = std::endian::native == std::endian::little ? op_flag::byteswap : op_flag{0};
+	constexpr op_flag op_le = std::endian::native == std::endian::little ? op_flag{0} : op_flag::byteswap;
+
+	constexpr op operator |(op_flag lhs, op_flag rhs)
+	{
+		return op{static_cast<u8>(static_cast<u8>(lhs) | static_cast<u8>(rhs))};
+	}
+
+	constexpr op operator |(op_flag lhs, op rhs)
+	{
+		return op{static_cast<u8>(static_cast<u8>(lhs) | static_cast<u8>(rhs))};
+	}
+
+	constexpr op operator |(op lhs, op_flag rhs)
+	{
+		return op{static_cast<u8>(static_cast<u8>(lhs) | static_cast<u8>(rhs))};
+	}
+
+	constexpr op op_ne = op::eq | op_flag::inverse;
+
 	constexpr struct any_value_t
 	{
 		template <typename T>
@@ -152,10 +179,43 @@ namespace atomic_wait
 		}
 	} any_value;
 
+	template <typename X, typename T = decltype(std::declval<X>().observe())>
+	constexpr u128 default_mask = sizeof(T) <= 8 ? u128{u64{umax} >> ((64 - sizeof(T) * 8) & 63)} : u128(-1);
+
+	template <typename X, typename T = decltype(std::declval<X>().observe())>
+	constexpr u128 get_value(X&, T value = T{}, ...)
+	{
+		static_assert((sizeof(T) & (sizeof(T) - 1)) == 0);
+		static_assert(sizeof(T) <= 16);
+		return std::bit_cast<get_uint_t<sizeof(T)>, T>(value);
+	}
+
 	struct info
 	{
 		const void* data;
-		u32 old;
+		u32 size;
+		u128 old;
+		u128 mask;
+
+		template <typename X, typename T = decltype(std::declval<X>().observe())>
+		constexpr void set_value(X& a, T value = T{})
+		{
+			old = get_value(a, value);
+		}
+
+		template <typename X, typename T = decltype(std::declval<X>().observe())>
+		constexpr void set_mask(T value)
+		{
+			static_assert((sizeof(T) & (sizeof(T) - 1)) == 0);
+			static_assert(sizeof(T) <= 16);
+			mask = std::bit_cast<get_uint_t<sizeof(T)>, T>(value);
+		}
+
+		template <typename X, typename T = decltype(std::declval<X>().observe())>
+		constexpr void set_mask()
+		{
+			mask = default_mask<X>;
+		}
 	};
 
 	template <uint Max, typename... T>
@@ -173,10 +233,9 @@ namespace atomic_wait
 
 		constexpr list& operator=(const list&) noexcept = default;
 
-		template <typename... U>
-			requires(requires(U& u) { u.wait(any_value); } && ...)
+		template <typename... U, typename = std::void_t<decltype(std::declval<U>().template wait<op::eq>(any_value))...>>
 		constexpr list(U&... vars)
-			: m_info{{&vars, 0}...}
+			: m_info{{&vars, sizeof(vars.observe()), get_value(vars), default_mask<U>}...}
 		{
 			static_assert(sizeof...(U) == Max, "Inconsistent amount of atomics.");
 		}
@@ -187,38 +246,40 @@ namespace atomic_wait
 			static_assert(sizeof...(U) == Max, "Inconsistent amount of values.");
 
 			auto* ptr = m_info;
-			(((ptr->old = std::bit_cast<u32>(values)), ptr++), ...);
+			((ptr->template set_value<T>(*static_cast<T*>(ptr->data), values), ptr++), ...);
 			return *this;
 		}
 
-		template <uint Index, typename T2, typename U>
-			requires(requires(T2& t2) { t2.wait(any_value); })
+		template <typename... U>
+		constexpr list& masks(U... masks)
+		{
+			static_assert(sizeof...(U) <= Max, "Too many masks.");
+
+			auto* ptr = m_info;
+			((ptr++)->template set_mask<T>(masks), ...);
+			return *this;
+		}
+
+		template <uint Index, op Flags = op::eq, typename T2, typename U, typename = std::void_t<decltype(std::declval<T2>().template wait<op::eq>(any_value))>>
 		constexpr void set(T2& var, U value)
 		{
 			static_assert(Index < Max);
 
 			m_info[Index].data = &var;
-			m_info[Index].old = std::bit_cast<u32>(value);
+			m_info[Index].size = sizeof(var.observe()) | (static_cast<u8>(Flags) << 8);
+			m_info[Index].template set_value<T2>(var, value);
+			m_info[Index].template set_mask<T2>();
 		}
 
-		template <uint Index, typename T2>
-		constexpr void set(lf_queue<T2>& var, std::nullptr_t = nullptr)
+		template <uint Index, op Flags = op::eq, typename T2, typename U, typename V, typename = std::void_t<decltype(std::declval<T2>().template wait<op::eq>(any_value))>>
+		constexpr void set(T2& var, U value, V mask)
 		{
 			static_assert(Index < Max);
-			static_assert(sizeof(var) == sizeof(uptr) * 2);
 
-			m_info[Index].data = std::bit_cast<char*>(&var.get_wait_atomic().raw());
-			m_info[Index].old = 0;
-		}
-
-		template <uint Index, typename T2>
-		constexpr void set(stx::atomic_ptr<T2>& var, std::nullptr_t = nullptr)
-		{
-			static_assert(Index < Max);
-			static_assert(sizeof(var) == sizeof(uptr) * 2);
-
-			m_info[Index].data = std::bit_cast<char*>(&var.get_wait_atomic().raw());
-			m_info[Index].old = 0;
+			m_info[Index].data = &var;
+			m_info[Index].size = sizeof(var.observe()) | (static_cast<u8>(Flags) << 8);
+			m_info[Index].template set_value<T2>(var, value);
+			m_info[Index].template set_mask<T2>(mask);
 		}
 
 		// Timeout is discouraged
@@ -231,8 +292,7 @@ namespace atomic_wait
 		}
 	};
 
-	template <typename... T>
-		requires(requires(T& t) { t.wait(any_value); } && ...)
+	template <typename... T, typename = std::void_t<decltype(std::declval<T>().template wait<op::eq>(any_value))...>>
 	list(T&... vars) -> list<sizeof...(T), T...>;
 }
 
@@ -252,22 +312,26 @@ private:
 	template <uint Max, typename... T>
 	friend class atomic_wait::list;
 
-	static void wait(const void* data, u32 old_value, u64 timeout, atomic_wait::info* ext = nullptr);
+	static void wait(const void* data, u32 size, u128 old_value, u64 timeout, u128 mask, atomic_wait::info* ext = nullptr);
+	static void notify_one(const void* data, u32 size, u128 mask128);
+	static void notify_all(const void* data, u32 size, u128 mask128);
 
 public:
-	static void notify_one(const void* data);
-	static void notify_all(const void* data);
-
 	static void set_wait_callback(bool(*cb)(const void* data, u64 attempts, u64 stamp0));
-	static void set_one_time_use_wait_callback(bool (*cb)(u64 progress));
+	static void set_notify_callback(void(*cb)(const void* data, u64 progress));
+
+	static void notify_all(const void* data)
+	{
+		notify_all(data, 0, u128(-1));
+	}
 };
 
 template <uint Max, typename... T>
 void atomic_wait::list<Max, T...>::wait(atomic_wait_timeout timeout)
 {
-	static_assert(!!Max, "Cannot initiate atomic wait with empty list.");
+	static_assert(Max, "Cannot initiate atomic wait with empty list.");
 
-	atomic_wait_engine::wait(m_info[0].data, m_info[0].old, static_cast<u64>(timeout), m_info + 1);
+	atomic_wait_engine::wait(m_info[0].data, m_info[0].size, m_info[0].old, static_cast<u64>(timeout), m_info[0].mask, m_info + 1);
 }
 
 // Helper class, provides access to compiler-specific atomic intrinsics
@@ -278,7 +342,7 @@ struct atomic_storage
 
 	using type = get_uint_t<sizeof(T)>;
 
-#if !defined(_MSC_VER) || !defined(_M_X64)
+#ifndef _MSC_VER
 
 #if defined(__ATOMIC_HLE_ACQUIRE) && defined(__ATOMIC_HLE_RELEASE)
 	static constexpr int s_hle_ack = __ATOMIC_SEQ_CST | __ATOMIC_HLE_ACQUIRE;
@@ -408,7 +472,7 @@ struct atomic_storage
 
 	/* Second part: MSVC-specific */
 
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 	static inline T add_fetch(T& dest, T value)
 	{
 		return atomic_storage<T>::fetch_add(dest, value) + value;
@@ -465,7 +529,6 @@ struct atomic_storage
 
 	static inline bool bts(T& dest, uint bit)
 	{
-#if defined(ARCH_X64)
 		uchar* dst = reinterpret_cast<uchar*>(&dest);
 
 		if constexpr (sizeof(T) < 4)
@@ -476,23 +539,18 @@ struct atomic_storage
 			bit = bit + (ptr & 3) * 8;
 			dst = reinterpret_cast<T*>(ptr & -4);
 		}
-#endif
 
-#if defined(_M_X64) && defined(_MSC_VER)
-		return _interlockedbittestandset(reinterpret_cast<long*>(dst), bit) != 0;
-#elif defined(ARCH_X64)
+#ifdef _MSC_VER
+		return _interlockedbittestandset((long*)dst, bit) != 0;
+#else
 		bool result;
 		__asm__ volatile ("lock btsl %2, 0(%1)\n" : "=@ccc" (result) : "r" (dst), "Ir" (bit) : "cc", "memory");
 		return result;
-#else
-		const T value = static_cast<T>(1) << bit;
-		return (__atomic_fetch_or(&dest, value, __ATOMIC_SEQ_CST) & value) != 0;
 #endif
 	}
 
 	static inline bool btr(T& dest, uint bit)
 	{
-#if defined(ARCH_X64)
 		uchar* dst = reinterpret_cast<uchar*>(&dest);
 
 		if constexpr (sizeof(T) < 4)
@@ -503,23 +561,18 @@ struct atomic_storage
 			bit = bit + (ptr & 3) * 8;
 			dst = reinterpret_cast<T*>(ptr & -4);
 		}
-#endif
 
-#if defined(_M_X64) && defined(_MSC_VER)
-		return _interlockedbittestandreset(reinterpret_cast<long*>(dst), bit) != 0;
-#elif defined(ARCH_X64)
+#ifdef _MSC_VER
+		return _interlockedbittestandreset((long*)dst, bit) != 0;
+#else
 		bool result;
 		__asm__ volatile ("lock btrl %2, 0(%1)\n" : "=@ccc" (result) : "r" (dst), "Ir" (bit) : "cc", "memory");
 		return result;
-#else
-		const T value = static_cast<T>(1) << bit;
-		return (__atomic_fetch_and(&dest, ~value, __ATOMIC_SEQ_CST) & value) != 0;
 #endif
 	}
 
 	static inline bool btc(T& dest, uint bit)
 	{
-#if defined(ARCH_X64)
 		uchar* dst = reinterpret_cast<uchar*>(&dest);
 
 		if constexpr (sizeof(T) < 4)
@@ -530,24 +583,20 @@ struct atomic_storage
 			bit = bit + (ptr & 3) * 8;
 			dst = reinterpret_cast<T*>(ptr & -4);
 		}
-#endif
 
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 		while (true)
 		{
 			// Keep trying until we actually invert desired bit
-			if (!_bittest(reinterpret_cast<const long*>(dst), bit) && !_interlockedbittestandset(reinterpret_cast<long*>(dst), bit))
+			if (!_bittest((long*)dst, bit) && !_interlockedbittestandset((long*)dst, bit))
 				return false;
-			if (_interlockedbittestandreset(reinterpret_cast<long*>(dst), bit))
+			if (_interlockedbittestandreset((long*)dst, bit))
 				return true;
 		}
-#elif defined(ARCH_X64)
+#else
 		bool result;
 		__asm__ volatile ("lock btcl %2, 0(%1)\n" : "=@ccc" (result) : "r" (dst), "Ir" (bit) : "cc", "memory");
 		return result;
-#else
-		const T value = static_cast<T>(1) << bit;
-		return (__atomic_fetch_xor(&dest, value, __ATOMIC_SEQ_CST) & value) != 0;
 #endif
 	}
 };
@@ -557,7 +606,7 @@ struct atomic_storage
 template <typename T>
 struct atomic_storage<T, 1> : atomic_storage<T, 0>
 {
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 	static inline bool compare_exchange(T& dest, T& comp, T exch)
 	{
 		const char v = std::bit_cast<char>(comp);
@@ -627,7 +676,7 @@ struct atomic_storage<T, 1> : atomic_storage<T, 0>
 template <typename T>
 struct atomic_storage<T, 2> : atomic_storage<T, 0>
 {
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 	static inline bool compare_exchange(T& dest, T& comp, T exch)
 	{
 		const short v = std::bit_cast<short>(comp);
@@ -709,7 +758,7 @@ struct atomic_storage<T, 2> : atomic_storage<T, 0>
 template <typename T>
 struct atomic_storage<T, 4> : atomic_storage<T, 0>
 {
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 	static inline bool compare_exchange(T& dest, T& comp, T exch)
 	{
 		const long v = std::bit_cast<long>(comp);
@@ -805,7 +854,7 @@ struct atomic_storage<T, 4> : atomic_storage<T, 0>
 template <typename T>
 struct atomic_storage<T, 8> : atomic_storage<T, 0>
 {
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 	static inline bool compare_exchange(T& dest, T& comp, T exch)
 	{
 		const llong v = std::bit_cast<llong>(comp);
@@ -901,7 +950,7 @@ struct atomic_storage<T, 8> : atomic_storage<T, 0>
 template <typename T>
 struct atomic_storage<T, 16> : atomic_storage<T, 0>
 {
-#if defined(_M_X64) && defined(_MSC_VER)
+#ifdef _MSC_VER
 	static inline T load(const T& dest)
 	{
 		atomic_fence_acquire();
@@ -946,7 +995,7 @@ struct atomic_storage<T, 16> : atomic_storage<T, 0>
 		utils::atomic_store16(&dest, std::bit_cast<u128>(value));
 		atomic_fence_release();
 	}
-#elif defined(ARCH_X64)
+#else
 	static inline T load(const T& dest)
 	{
 		alignas(16) T r;
@@ -1029,130 +1078,6 @@ struct atomic_storage<T, 16> : atomic_storage<T, 0>
 		__asm__ volatile("movdqa %0, %1;" :: "x" (val), "m" (dest) : "memory");
 #endif
 	}
-#elif defined(ARCH_ARM64)
-
-	static inline T load(const T& dest)
-	{
-#if defined(ARM_FEATURE_LSE2)
-		u64 data[2];
-		__asm__ volatile("1:\n"
-			"ldp %x[data0], %x[data1], %[dest]\n"
-			"dmb ish\n"
-			: [data0] "=r"(data[0]), [data1] "=r"(data[1])
-			: [dest] "Q"(dest)
-			: "memory");
-		T result;
-		std::memcpy(&result, data, 16);
-		return result;
-#else
-		u32 tmp;
-		u64 data[2];
-		__asm__ volatile("1:\n"
-			"ldaxp %x[data0], %x[data1], %[dest]\n"
-			"stlxp %w[tmp], %x[data0], %x[data1], %[dest]\n"
-			"cbnz %w[tmp], 1b\n"
-			: [tmp] "=&r" (tmp), [data0] "=&r" (data[0]), [data1] "=&r" (data[1])
-			: [dest] "Q" (dest)
-			: "memory"
-		);
-		T result;
-		std::memcpy(&result, data, 16);
-		return result;
-#endif
-	}
-
-	static inline T observe(const T& dest)
-	{
-		// TODO
-		return load(dest);
-	}
-
-	static inline bool compare_exchange(T& dest, T& comp, T exch)
-	{
-		bool result;
-		u64 cmp[2];
-		std::memcpy(cmp, &comp, 16);
-		u64 data[2];
-		std::memcpy(data, &exch, 16);
-		u64 prev[2];
-		__asm__ volatile("1:\n"
-			"ldaxp %x[prev0], %x[prev1], %[storage]\n"
-			"cmp %x[prev0], %x[cmp0]\n"
-			"ccmp %x[prev1], %x[cmp1], #0, eq\n"
-			"b.ne 2f\n"
-			"stlxp %w[result], %x[data0], %x[data1], %[storage]\n"
-			"cbnz %w[result], 1b\n"
-			"2:\n"
-			"cset %w[result], eq\n"
-			: [result] "=&r" (result), [storage] "+Q" (dest), [prev0] "=&r" (prev[0]), [prev1] "=&r" (prev[1])
-			: [data0] "r" (data[0]), [data1] "r" (data[1]), [cmp0] "r" (cmp[0]), [cmp1] "r" (cmp[1])
-			: "cc", "memory"
-		);
-
-		if (result)
-		{
-			return true;
-		}
-
-		std::memcpy(&comp, prev, 16);
-		return false;
-	}
-
-	static inline T exchange(T& dest, T value)
-	{
-		u32 tmp;
-		u64 src[2];
-		u64 data[2];
-		std::memcpy(src, &value, 16);
-		__asm__ volatile("1:\n"
-			"ldaxp %x[data0], %x[data1], %[dest]\n"
-			"stlxp %w[tmp], %x[src0], %x[src1], %[dest]\n"
-			"cbnz %w[tmp], 1b\n"
-			: [tmp] "=&r" (tmp), [dest] "+Q" (dest), [data0] "=&r" (data[0]), [data1] "=&r" (data[1])
-			: [src0] "r" (src[0]), [src1] "r" (src[1])
-			: "memory"
-		);
-		T result;
-		std::memcpy(&result, data, 16);
-		return result;
-	}
-
-	static inline void store(T& dest, T value)
-	{
-		// TODO
-#if defined(ARM_FEATURE_LSE2)
-		u64 src[2];
-		std::memcpy(src, &value, 16);
-		__asm__ volatile("1:\n"
-			"dmb ish\n"
-			"stp %x[data0], %x[data1], %[dest]\n"
-			"dmb ish\n"
-			: [dest] "=Q" (dest)
-			: [data0] "r" (src[0]), [data1] "r" (src[1])
-			: "memory"
-		);
-#else
-		exchange(dest, value);
-#endif
-	}
-
-	static inline void release(T& dest, T value)
-	{
-#if defined(ARM_FEATURE_LSE2)
-		u64 src[2];
-		std::memcpy(src, &value, 16);
-		__asm__ volatile("1:\n"
-			 "dmb ish\n"
-			 "stp %x[data0], %x[data1], %[dest]\n"
-			 : [dest] "=Q" (dest)
-			 : [data0] "r" (src[0]), [data1] "r" (src[1])
-			 : "memory"
-		);
-#else
-		// TODO
-		exchange(dest, value);
-#endif
-	}
 #endif
 
 	// TODO
@@ -1168,7 +1093,7 @@ template <typename T, usz Align = sizeof(T)>
 class atomic_t
 {
 protected:
-	using type = std::remove_cv_t<T>;
+	using type = typename std::remove_cv<T>::type;
 
 	using ptr_rt = std::conditional_t<std::is_pointer_v<type>, ullong, type>;
 
@@ -1187,7 +1112,7 @@ protected:
 
 public:
 	static constexpr usz align = Align;
-	ENABLE_BITWISE_SERIALIZATION;
+	using enable_bitcopy = std::true_type;
 
 	atomic_t() noexcept = default;
 
@@ -1235,7 +1160,6 @@ public:
 
 	// Atomic operation; returns old value, or pair of old value and return value (cancel op if evaluates to false)
 	template <typename F, typename RT = std::invoke_result_t<F, T&>>
-		requires (!std::is_invocable_v<F, const T> && !std::is_invocable_v<F, volatile T>)
 	std::conditional_t<std::is_void_v<RT>, type, std::pair<type, RT>> fetch_op(F func)
 	{
 		type _new, old = atomic_storage<type>::load(m_data);
@@ -1267,7 +1191,6 @@ public:
 
 	// Atomic operation; returns function result value, function is the lambda
 	template <typename F, typename RT = std::invoke_result_t<F, T&>>
-		requires (!std::is_invocable_v<F, const T> && !std::is_invocable_v<F, volatile T>)
 	RT atomic_op(F func)
 	{
 		type _new, old = atomic_storage<type>::load(m_data);
@@ -1341,7 +1264,7 @@ public:
 
 	auto fetch_add(const ptr_rt& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::fetch_add(m_data, rhs);
 		}
@@ -1354,7 +1277,7 @@ public:
 
 	auto add_fetch(const ptr_rt& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::add_fetch(m_data, rhs);
 		}
@@ -1368,7 +1291,7 @@ public:
 
 	auto operator +=(const ptr_rt& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::add_fetch(m_data, rhs);
 		}
@@ -1381,7 +1304,7 @@ public:
 
 	auto fetch_sub(const ptr_rt& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::fetch_sub(m_data, rhs);
 		}
@@ -1394,7 +1317,7 @@ public:
 
 	auto sub_fetch(const ptr_rt& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::sub_fetch(m_data, rhs);
 		}
@@ -1408,7 +1331,7 @@ public:
 
 	auto operator -=(const ptr_rt& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::sub_fetch(m_data, rhs);
 		}
@@ -1421,7 +1344,7 @@ public:
 
 	auto fetch_and(const type& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::fetch_and(m_data, rhs);
 		}
@@ -1434,7 +1357,7 @@ public:
 
 	auto and_fetch(const type& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::and_fetch(m_data, rhs);
 		}
@@ -1448,7 +1371,7 @@ public:
 
 	auto operator &=(const type& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::and_fetch(m_data, rhs);
 		}
@@ -1461,7 +1384,7 @@ public:
 
 	auto fetch_or(const type& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::fetch_or(m_data, rhs);
 		}
@@ -1474,7 +1397,7 @@ public:
 
 	auto or_fetch(const type& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::or_fetch(m_data, rhs);
 		}
@@ -1488,7 +1411,7 @@ public:
 
 	auto operator |=(const type& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::or_fetch(m_data, rhs);
 		}
@@ -1501,7 +1424,7 @@ public:
 
 	auto fetch_xor(const type& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::fetch_xor(m_data, rhs);
 		}
@@ -1514,7 +1437,7 @@ public:
 
 	auto xor_fetch(const type& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::xor_fetch(m_data, rhs);
 		}
@@ -1528,7 +1451,7 @@ public:
 
 	auto operator ^=(const type& rhs)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::xor_fetch(m_data, rhs);
 		}
@@ -1541,7 +1464,7 @@ public:
 
 	auto operator ++()
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::inc_fetch(m_data);
 		}
@@ -1554,7 +1477,7 @@ public:
 
 	auto operator --()
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::dec_fetch(m_data);
 		}
@@ -1567,7 +1490,7 @@ public:
 
 	auto operator ++(int)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::fetch_inc(m_data);
 		}
@@ -1580,7 +1503,7 @@ public:
 
 	auto operator --(int)
 	{
-		if constexpr(std::is_integral_v<type>)
+		if constexpr(std::is_integral<type>::value)
 		{
 			return atomic_storage<type>::fetch_dec(m_data);
 		}
@@ -1639,77 +1562,59 @@ public:
 
 	bool bit_test_set(uint bit)
 	{
-		if constexpr (std::is_integral_v<type>)
-		{
-			return atomic_storage<type>::bts(m_data, bit & (sizeof(T) * 8 - 1));
-		}
-
-		return atomic_op([](type& v)
-		{
-			const auto old = v;
-			const auto bit = type(1) << (sizeof(T) * 8 - 1);
-			v |= bit;
-			return !!(old & bit);
-		});
+		return atomic_storage<type>::bts(m_data, bit & (sizeof(T) * 8 - 1));
 	}
 
 	bool bit_test_reset(uint bit)
 	{
-		if constexpr (std::is_integral_v<type>)
-		{
-			return atomic_storage<type>::btr(m_data, bit & (sizeof(T) * 8 - 1));
-		}
-
-		return atomic_op([](type& v)
-		{
-			const auto old = v;
-			const auto bit = type(1) << (sizeof(T) * 8 - 1);
-			v &= ~bit;
-			return !!(old & bit);
-		});
+		return atomic_storage<type>::btr(m_data, bit & (sizeof(T) * 8 - 1));
 	}
 
 	bool bit_test_invert(uint bit)
 	{
-		if constexpr (std::is_integral_v<type>)
-		{
-			return atomic_storage<type>::btc(m_data, bit & (sizeof(T) * 8 - 1));
-		}
-
-		return atomic_op([](type& v)
-		{
-			const auto old = v;
-			const auto bit = type(1) << (sizeof(T) * 8 - 1);
-			v ^= bit;
-			return !!(old & bit);
-		});
+		return atomic_storage<type>::btc(m_data, bit & (sizeof(T) * 8 - 1));
 	}
 
-	void wait(type old_value, atomic_wait_timeout timeout = atomic_wait_timeout::inf) const
-		requires(sizeof(type) == 4)
+	// Timeout is discouraged
+	template <atomic_wait::op Flags = atomic_wait::op::eq>
+	void wait(type old_value, atomic_wait_timeout timeout = atomic_wait_timeout::inf) const noexcept
 	{
-		atomic_wait_engine::wait(&m_data, std::bit_cast<u32>(old_value), static_cast<u64>(timeout));
+		const u128 old = std::bit_cast<get_uint_t<sizeof(T)>>(old_value);
+		const u128 mask = atomic_wait::default_mask<atomic_t>;
+		atomic_wait_engine::wait(&m_data, sizeof(T) | (static_cast<u8>(Flags) << 8), old, static_cast<u64>(timeout), mask);
 	}
 
-	[[deprecated]] void wait(type old_value, atomic_wait_timeout timeout = atomic_wait_timeout::inf) const
-		requires(sizeof(type) == 8)
+	// Overload with mask (only selected bits are checked), timeout is discouraged
+	template <atomic_wait::op Flags = atomic_wait::op::eq>
+	void wait(type old_value, type mask_value, atomic_wait_timeout timeout = atomic_wait_timeout::inf) const noexcept
 	{
-		atomic_wait::info ext[2]{};
-		ext[0].data = reinterpret_cast<const char*>(&m_data) + 4;
-		ext[0].old = std::bit_cast<u64>(old_value) >> 32;
-		atomic_wait_engine::wait(&m_data, static_cast<u32>(std::bit_cast<u64>(old_value)), static_cast<u64>(timeout), ext);
+		const u128 old = std::bit_cast<get_uint_t<sizeof(T)>>(old_value);
+		const u128 mask = std::bit_cast<get_uint_t<sizeof(T)>>(mask_value);
+		atomic_wait_engine::wait(&m_data, sizeof(T) | (static_cast<u8>(Flags) << 8), old, static_cast<u64>(timeout), mask);
 	}
 
-	void notify_one()
-		requires(sizeof(type) == 4 || sizeof(type) == 8)
+	void notify_one() noexcept
 	{
-		atomic_wait_engine::notify_one(&m_data);
+		atomic_wait_engine::notify_one(&m_data, sizeof(T), atomic_wait::default_mask<atomic_t>);
 	}
 
-	void notify_all()
-		requires(sizeof(type) == 4 || sizeof(type) == 8)
+	// Notify with mask, allowing to not wake up thread which doesn't wait on this mask
+	void notify_one(type mask_value) noexcept
 	{
-		atomic_wait_engine::notify_all(&m_data);
+		const u128 mask = std::bit_cast<get_uint_t<sizeof(T)>>(mask_value);
+		atomic_wait_engine::notify_one(&m_data, sizeof(T), mask);
+	}
+
+	void notify_all() noexcept
+	{
+		atomic_wait_engine::notify_all(&m_data, sizeof(T), atomic_wait::default_mask<atomic_t>);
+	}
+
+	// Notify all threads with mask, allowing to not wake up threads which don't wait on them
+	void notify_all(type mask_value) noexcept
+	{
+		const u128 mask = std::bit_cast<get_uint_t<sizeof(T)>>(mask_value);
+		atomic_wait_engine::notify_all(&m_data, sizeof(T), mask);
 	}
 };
 
@@ -1785,6 +1690,23 @@ public:
 	{
 		return base::fetch_xor(1) != 0;
 	}
+
+	// Timeout is discouraged
+	template <atomic_wait::op Flags = atomic_wait::op::eq>
+	void wait(bool old_value, atomic_wait_timeout timeout = atomic_wait_timeout::inf) const noexcept
+	{
+		base::template wait<Flags>(old_value, 1, timeout);
+	}
+
+	void notify_one() noexcept
+	{
+		base::notify_one(1);
+	}
+
+	void notify_all() noexcept
+	{
+		base::notify_all(1);
+	}
 };
 
 // Specializations
@@ -1798,35 +1720,12 @@ struct std::common_type<atomic_t<T, Align>, T2> : std::common_type<T, std::commo
 template <typename T, typename T2, usz Align2>
 struct std::common_type<T, atomic_t<T2, Align2>> : std::common_type<std::common_type_t<T>, T2> {};
 
-#ifndef _MSC_VER
-#pragma GCC diagnostic pop
-#pragma GCC diagnostic pop
-#endif
-
-namespace utils
+namespace atomic_wait
 {
-	template <typename F>
-	struct aofn_helper
-	{
-		F f;
-
-		aofn_helper(F&& f) noexcept
-			: f(std::forward<F>(f))
-		{
-		}
-
-		template <typename Arg> requires (std::is_same_v<std::remove_reference_t<Arg>, std::remove_cvref_t<Arg>> && !std::is_rvalue_reference_v<Arg>)
-		auto operator()(Arg& arg) const noexcept
-		{
-			return f(std::forward<Arg&>(arg));
-		}
-	};
-
-	template <typename F>
-	aofn_helper(F&& f) -> aofn_helper<F>;
+	template <usz Align>
+	constexpr u128 default_mask<atomic_t<bool, Align>> = 1;
 }
 
-// Shorter lambda for non-cv qualified L-values
-// For use with atomic operations
-#define AOFN(...) \
-	::utils::aofn_helper([&](auto& x) { return (__VA_ARGS__); })
+#ifndef _MSC_VER
+#pragma GCC diagnostic pop
+#endif
diff --git a/rpcs3/util/auto_typemap.hpp b/rpcs3/util/auto_typemap.hpp
index fb25e7b8ef..fba32e74a7 100644
--- a/rpcs3/util/auto_typemap.hpp
+++ b/rpcs3/util/auto_typemap.hpp
@@ -44,7 +44,6 @@ namespace stx
 			static void call_dtor(void* ptr) noexcept
 			{
 				std::launder(static_cast<T*>(ptr))->~T();
-				std::memset(ptr, 0xCC, sizeof(T)); // Set to trap values
 			}
 
 			template <typename T>
@@ -94,11 +93,9 @@ namespace stx
 			{
 				ensure(Size >= stx::typelist<typeinfo>().size());
 				ensure(Align >= stx::typelist<typeinfo>().align());
+				m_data[0] = 0;
 			}
 
-			// Set to trap values
-			std::memset(Size == 0 ? m_list : m_data, 0xCC, stx::typelist<typeinfo>().size());
-
 			for (const auto& type : stx::typelist<typeinfo>())
 			{
 				const u32 id = type.index();
@@ -135,12 +132,7 @@ namespace stx
 			// Destroy objects in reverse order
 			for (; _max; _max--)
 			{
-				auto* info = *--m_info;
-				const u32 type_index = static_cast<const type_info<typeinfo>*>(info)->index();
-				info->destroy(*--m_order);
-
-				// Set init to false. We don't want other fxo to use this fxo in their destructor.
-				m_init[type_index] = false;
+				(*--m_info)->destroy(*--m_order);
 			}
 
 			// Pointers should be restored to their positions
diff --git a/rpcs3/util/bless.hpp b/rpcs3/util/bless.hpp
deleted file mode 100644
index af2f8d32f3..0000000000
--- a/rpcs3/util/bless.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-namespace utils
-{
-	// Hack. Pointer cast util to workaround UB. Use with extreme care.
-	template <typename T, typename U>
-	[[nodiscard]] T* bless(U* ptr)
-	{
-#ifdef _MSC_VER
-		return (T*)ptr;
-#elif defined(ARCH_X64)
-		T* result;
-		__asm__("movq %1, %0;" : "=r" (result) : "r" (ptr) : "memory");
-		return result;
-#elif defined(ARCH_ARM64)
-		T* result;
-		__asm__("mov %0, %1" : "=r" (result) : "r" (ptr) : "memory");
-		return result;
-#else
-#error "Missing utils::bless() implementation"
-#endif
-	}
-}
diff --git a/rpcs3/util/console.cpp b/rpcs3/util/console.cpp
deleted file mode 100644
index e007c15c09..0000000000
--- a/rpcs3/util/console.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "console.h"
-
-#ifdef _WIN32
-#include "Windows.h"
-#include <stdio.h>
-#endif
-
-#include <iostream>
-
-namespace utils
-{
-	void attach_console([[maybe_unused]] int stream, [[maybe_unused]] bool open_console)
-	{
-#ifdef _WIN32
-		if (!stream)
-		{
-			return;
-		}
-
-		if (!(AttachConsole(ATTACH_PARENT_PROCESS) || (open_console && AllocConsole())))
-		{
-			return;
-		}
-
-		if (stream & console_stream::std_out)
-		{
-			[[maybe_unused]] const auto con_out = freopen("CONOUT$", "w", stdout);
-		}
-
-		if (stream & console_stream::std_err)
-		{
-			[[maybe_unused]] const auto con_err = freopen("CONOUT$", "w", stderr);
-		}
-
-		if (stream & console_stream::std_in)
-		{
-			[[maybe_unused]] const auto con_in = freopen("CONIN$", "r", stdin);
-		}
-#endif
-	}
-
-	void output_stderr(std::string_view str, bool with_endline)
-	{
-		if (with_endline)
-		{
-#ifdef _WIN32
-			std::clog << str;
-#else
-			std::cerr << str;
-#endif
-			str = "\n";
-		}
-
-#ifdef _WIN32
-		// Flush seems broken on Windows (deadlocks)
-		std::clog << str;
-#else
-		std::cerr << str;
-#endif
-	}
-}
diff --git a/rpcs3/util/console.h b/rpcs3/util/console.h
deleted file mode 100644
index 717c85e811..0000000000
--- a/rpcs3/util/console.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <string_view>
-
-namespace utils
-{
-	enum console_stream
-	{
-		std_out = 0x01,
-		std_err = 0x02,
-		std_in  = 0x04,
-	};
-
-	void attach_console(int stream, bool open_console);
-
-	void output_stderr(std::string_view str, bool with_endline = false);
-}
diff --git a/rpcs3/util/coro.hpp b/rpcs3/util/coro.hpp
deleted file mode 100644
index 34072396ca..0000000000
--- a/rpcs3/util/coro.hpp
+++ /dev/null
@@ -1,375 +0,0 @@
-#pragma once
-
-#if __has_include(<coroutine>)
-#if defined(__clang__) && !defined(__cpp_impl_coroutine)
-#define __cpp_impl_coroutine 123
-#endif
-
-#include <coroutine>
-
-#if defined(__clang__) && (__cpp_impl_coroutine == 123)
-namespace std::experimental
-{
-	using ::std::coroutine_traits;
-	using ::std::coroutine_handle;
-}
-#endif
-#elif __has_include(<experimental/coroutine>)
-#include <experimental/coroutine>
-
-namespace std
-{
-	using experimental::coroutine_traits;
-	using experimental::coroutine_handle;
-	using experimental::noop_coroutine_handle;
-	using experimental::suspend_always;
-	using experimental::suspend_never;
-}
-#endif
-
-#include <iterator>
-
-namespace stx
-{
-	template <typename T>
-	struct lazy;
-
-	template <typename T>
-	struct generator;
-
-	namespace detail
-	{
-		struct lazy_promise_base
-		{
-			struct final_suspend_t
-			{
-				constexpr bool await_ready() const noexcept { return false; }
-
-				template <typename P>
-				std::coroutine_handle<> await_suspend(std::coroutine_handle<P> h) noexcept
-				{
-					return h.promise().m_handle;
-				}
-
-				void await_resume() noexcept {}
-			};
-
-			constexpr lazy_promise_base() noexcept = default;
-			lazy_promise_base(const lazy_promise_base&) = delete;
-			lazy_promise_base& operator=(const lazy_promise_base&) = delete;
-			std::suspend_always initial_suspend() { return {}; }
-			final_suspend_t final_suspend() noexcept { return {}; }
-			void unhandled_exception() {}
-
-		protected:
-			std::coroutine_handle<> m_handle{};
-		};
-
-		template <typename T>
-		struct lazy_promise final : lazy_promise_base
-		{
-			constexpr lazy_promise() noexcept = default;
-
-			lazy<T> get_return_object() noexcept;
-
-			template <typename U>
-			void return_value(U&& value)
-			{
-				m_value = std::forward<U>(value);
-			}
-
-			T& result() &
-			{
-				return m_value;
-			}
-
-			T&& result() &&
-			{
-				return m_value;
-			}
-
-		private:
-			T m_value{};
-		};
-
-		template <typename T>
-		struct lazy_promise<T&> final : lazy_promise_base
-		{
-			constexpr lazy_promise() noexcept = default;
-
-			lazy<T&> get_return_object() noexcept;
-
-			void return_value(T& value) noexcept
-			{
-				m_value = std::addressof(value);
-			}
-
-			T& result()
-			{
-				return *m_value;
-			}
-
-		private:
-			T* m_value{};
-		};
-
-		template <>
-		struct lazy_promise<void> final : lazy_promise_base
-		{
-			constexpr lazy_promise() noexcept = default;
-			lazy<void> get_return_object() noexcept;
-			void return_void() noexcept {}
-			void result() {}
-		};
-	}
-
-	template <typename T = void>
-	struct [[nodiscard]] lazy
-	{
-		using promise_type = detail::lazy_promise<T>;
-		using value_type = T;
-
-		struct awaitable_base
-		{
-			std::coroutine_handle<promise_type> coro;
-
-			bool await_ready() const noexcept
-			{
-				return !coro || coro.done();
-			}
-
-			std::coroutine_handle<> await_suspend(std::coroutine_handle<> h) noexcept
-			{
-				coro.promise().m_handle = h;
-				return coro;
-			}
-		};
-
-		lazy(const lazy&) = delete;
-
-		lazy(lazy&& rhs) noexcept
-			: m_handle(rhs.m_handle)
-		{
-			rhs.m_handle = nullptr;
-		}
-
-		lazy& operator=(const lazy&) = delete;
-
-		~lazy()
-		{
-			if (m_handle)
-			{
-				m_handle.destroy();
-			}
-		}
-
-		bool is_ready() const noexcept
-		{
-			return !m_handle || m_handle.done();
-		}
-
-		auto operator co_await() const & noexcept
-		{
-			struct awaitable : awaitable_base
-			{
-				using awaitable_base::awaitable_base;
-
-				decltype(auto) await_resume()
-				{
-					return this->m_handle.promise().result();
-				}
-			};
-
-			return awaitable{m_handle};
-		}
-
-		auto operator co_await() const && noexcept
-		{
-			struct awaitable : awaitable_base
-			{
-				using awaitable_base::awaitable_base;
-
-				decltype(auto) await_resume()
-				{
-					return std::move(this->m_handle.promise()).result();
-				}
-			};
-
-			return awaitable{m_handle};
-		}
-
-	private:
-		friend promise_type;
-
-		explicit constexpr lazy(std::coroutine_handle<promise_type> h) noexcept
-			: m_handle(h)
-		{
-		}
-
-		std::coroutine_handle<promise_type> m_handle;
-	};
-
-	template <typename T>
-	inline lazy<T> detail::lazy_promise<T>::get_return_object() noexcept
-	{
-		return lazy<T>{std::coroutine_handle<lazy_promise>::from_promise(*this)};
-	}
-
-	template <typename T>
-	inline lazy<T&> detail::lazy_promise<T&>::get_return_object() noexcept
-	{
-		return lazy<T&>{std::coroutine_handle<lazy_promise>::from_promise(*this)};
-	}
-
-	inline lazy<void> detail::lazy_promise<void>::get_return_object() noexcept
-	{
-		return lazy<void>{std::coroutine_handle<lazy_promise>::from_promise(*this)};
-	}
-
-	namespace detail
-	{
-		template <typename T>
-		struct generator_promise
-		{
-			using value_type = std::remove_reference_t<T>;
-			using reference_type = std::conditional_t<std::is_reference_v<T>, T, T&>;
-
-			generator_promise() = default;
-
-			generator<T> get_return_object() noexcept;
-
-			constexpr std::suspend_always initial_suspend() const noexcept { return {}; }
-			constexpr std::suspend_always final_suspend() const noexcept { return {}; }
-			void unhandled_exception() {}
-
-			std::suspend_always yield_value(std::remove_reference_t<T>& value) noexcept
-			{
-				m_ptr = std::addressof(value);
-				return {};
-			}
-
-			std::suspend_always yield_value(std::remove_reference_t<T>&& value) noexcept
-			{
-				m_ptr = std::addressof(value);
-				return {};
-			}
-
-			void return_void() {}
-
-			reference_type value() const noexcept
-			{
-				return static_cast<reference_type>(*m_ptr);
-			}
-
-			template <typename U>
-			std::suspend_never await_transform(U&& value) = delete;
-
-		private:
-			value_type* m_ptr;
-		};
-
-		struct generator_end
-		{
-		};
-
-		template<typename T>
-		struct generator_iterator
-		{
-			using iterator_category = std::input_iterator_tag;
-			using value_type = typename generator_promise<T>::value_type;
-			using reference = typename generator_promise<T>::reference_type;
-
-			constexpr generator_iterator() noexcept = default;
-
-			explicit constexpr generator_iterator(std::coroutine_handle<generator_promise<T>> coro) noexcept
-				: m_coro(coro)
-			{
-			}
-
-			bool operator==(generator_end) const noexcept
-			{
-				return !m_coro || m_coro.done();
-			}
-
-			generator_iterator& operator++()
-			{
-				m_coro.resume();
-				return *this;
-			}
-
-			void operator++(int)
-			{
-				m_coro.resume();
-			}
-
-			reference operator*() const noexcept
-			{
-				return m_coro.promise().value();
-			}
-
-			value_type* operator->() const noexcept
-			{
-				return std::addressof(operator*());
-			}
-
-		private:
-			std::coroutine_handle<generator_promise<T>> m_coro;
-		};
-	}
-
-	template<typename T>
-	struct [[nodiscard]] generator
-	{
-		using promise_type = detail::generator_promise<T>;
-		using iterator = detail::generator_iterator<T>;
-
-		generator(const generator&) = delete;
-
-		generator(generator&& rhs) noexcept
-			: m_handle(rhs.m_handle)
-		{
-			rhs.m_handle = nullptr;
-		}
-
-		generator& operator=(const generator&) = delete;
-
-		~generator()
-		{
-			if (m_handle)
-			{
-				m_handle.destroy();
-			}
-		}
-
-		iterator begin()
-		{
-			if (m_handle)
-			{
-				m_handle.resume();
-			}
-
-			return iterator{m_handle};
-		}
-
-		detail::generator_end end() noexcept
-		{
-			return detail::generator_end{};
-		}
-
-	private:
-		friend promise_type;
-
-		explicit constexpr generator(std::coroutine_handle<promise_type> h) noexcept
-			: m_handle(h)
-		{
-		}
-
-		std::coroutine_handle<promise_type> m_handle;
-	};
-
-	template <typename T>
-	generator<T> detail::generator_promise<T>::get_return_object() noexcept
-	{
-		return generator<T>{std::coroutine_handle<generator_promise<T>>::from_promise(*this)};
-	}
-}
diff --git a/rpcs3/util/cpu_stats.cpp b/rpcs3/util/cpu_stats.cpp
index 8203d1977b..fdfb8f999f 100644
--- a/rpcs3/util/cpu_stats.cpp
+++ b/rpcs3/util/cpu_stats.cpp
@@ -1,23 +1,16 @@
 #include "util/types.hpp"
 #include "util/cpu_stats.hpp"
 #include "util/sysinfo.hpp"
-#include "util/logs.hpp"
-#include "Utilities/StrUtil.h"
-
 #include <algorithm>
 
 #ifdef _WIN32
-#include "util/asm.hpp"
 #include "windows.h"
 #include "tlhelp32.h"
-#ifdef _MSC_VER
-#pragma comment(lib, "pdh.lib")
-#endif
 #else
-#include "fstream"
-#include "sstream"
 #include "stdlib.h"
 #include "sys/times.h"
+#include "sys/types.h"
+#include "unistd.h"
 #endif
 
 #ifdef __APPLE__
@@ -32,7 +25,6 @@
 
 #if 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
@@ -52,17 +44,8 @@
 # endif
 #endif
 
-LOG_CHANNEL(perf_log, "PERF");
-
 namespace utils
 {
-#ifdef _WIN32
-	fmt::win_error pdh_error(PDH_STATUS status)
-	{
-		return fmt::win_error{static_cast<unsigned long>(status), LoadLibrary(L"pdh.dll")};
-	}
-#endif
-
 	cpu_stats::cpu_stats()
 	{
 #ifdef _WIN32
@@ -83,218 +66,6 @@ namespace utils
 #endif
 	}
 
-	cpu_stats::~cpu_stats()
-	{
-#ifdef _WIN32
-		if (m_cpu_query)
-		{
-			PDH_STATUS status = PdhCloseQuery(m_cpu_query);
-			if (ERROR_SUCCESS != status)
-			{
-				perf_log.error("Failed to close cpu query of per core cpu usage: %s", pdh_error(status));
-			}
-		}
-#endif
-	}
-
-	void cpu_stats::init_cpu_query()
-	{
-#ifdef _WIN32
-		PDH_STATUS status = PdhOpenQuery(NULL, 0, &m_cpu_query);
-		if (ERROR_SUCCESS != status)
-		{
-			perf_log.error("Failed to open cpu query for per core cpu usage: %s", pdh_error(status));
-			return;
-		}
-		status = PdhAddEnglishCounter(m_cpu_query, L"\\Processor(*)\\% Processor Time", 0, &m_cpu_cores);
-		if (ERROR_SUCCESS != status)
-		{
-			perf_log.error("Failed to add processor time counter for per core cpu usage: %s", pdh_error(status));
-			return;
-		}
-		status = PdhCollectQueryData(m_cpu_query);
-		if (ERROR_SUCCESS != status)
-		{
-			perf_log.error("Failed to collect per core cpu usage: %s", pdh_error(status));
-			return;
-		}
-#endif
-	}
-
-	void cpu_stats::get_per_core_usage(std::vector<double>& per_core_usage, double& total_usage)
-	{
-		total_usage = 0.0;
-
-		per_core_usage.resize(utils::get_thread_count());
-		std::fill(per_core_usage.begin(), per_core_usage.end(), 0.0);
-
-#ifdef _WIN32
-		if (!m_cpu_cores || !m_cpu_query)
-		{
-			perf_log.warning("Can not collect per core cpu usage: The required API is not initialized.");
-			return;
-		}
-
-		PDH_STATUS status = PdhCollectQueryData(m_cpu_query);
-		if (ERROR_SUCCESS != status)
-		{
-			perf_log.error("Failed to collect per core cpu usage: %s", pdh_error(status));
-			return;
-		}
-
-		DWORD dwBufferSize = 0; // Size of the items buffer
-		DWORD dwItemCount = 0;  // Number of items in the items buffer
-
-		status = PdhGetFormattedCounterArray(m_cpu_cores, PDH_FMT_DOUBLE, &dwBufferSize, &dwItemCount, nullptr);
-		if (static_cast<PDH_STATUS>(PDH_MORE_DATA) == status)
-		{
-			std::vector<PDH_FMT_COUNTERVALUE_ITEM> items(utils::aligned_div(dwBufferSize, sizeof(PDH_FMT_COUNTERVALUE_ITEM)));
-			if (items.size() >= dwItemCount)
-			{
-				status = PdhGetFormattedCounterArray(m_cpu_cores, PDH_FMT_DOUBLE, &dwBufferSize, &dwItemCount, items.data());
-				if (ERROR_SUCCESS == status)
-				{
-					ensure(dwItemCount == per_core_usage.size() + 1); // Plus one for _Total
-
-					// Loop through the array and get the instance name and percentage.
-					for (usz i = 0; i < dwItemCount; i++)
-					{
-						const PDH_FMT_COUNTERVALUE_ITEM& item = items[i];
-						const std::string token = wchar_to_utf8(item.szName);
-
-						if (const std::string lower = fmt::to_lower(token); lower.find("total") != umax)
-						{
-							total_usage = item.FmtValue.doubleValue;
-							continue;
-						}
-
-						if (const auto [success, cpu_index] = string_to_number(token); success && cpu_index < dwItemCount)
-						{
-							per_core_usage[cpu_index] = item.FmtValue.doubleValue;
-						}
-						else if (!success)
-						{
-							perf_log.error("Can not convert string to cpu index for per core cpu usage. (token='%s')", token);
-						}
-						else
-						{
-							perf_log.error("Invalid cpu index for per core cpu usage. (token='%s', cpu_index=%d, cores=%d)", token, cpu_index, dwItemCount);
-						}
-					}
-				}
-				else if (static_cast<PDH_STATUS>(PDH_CALC_NEGATIVE_DENOMINATOR) == status) // Apparently this is a common uncritical error
-				{
-					perf_log.notice("Failed to get per core cpu usage: %s", pdh_error(status));
-				}
-				else
-				{
-					perf_log.error("Failed to get per core cpu usage: %s", pdh_error(status));
-				}
-			}
-			else
-			{
-				perf_log.error("Failed to allocate buffer for per core cpu usage. (size=%d, dwItemCount=%d)", items.size(), dwItemCount);
-			}
-		}
-
-#elif __linux__
-#ifndef ANDROID
-		m_previous_idle_times_per_cpu.resize(utils::get_thread_count(), 0.0);
-		m_previous_total_times_per_cpu.resize(utils::get_thread_count(), 0.0);
-
-		if (std::ifstream proc_stat("/proc/stat"); proc_stat.good())
-		{
-			std::stringstream content;
-			content << proc_stat.rdbuf();
-			proc_stat.close();
-
-			const std::vector<std::string> lines = fmt::split(content.str(), {"\n"});
-			if (lines.empty())
-			{
-				perf_log.error("/proc/stat is empty");
-				return;
-			}
-
-			for (const std::string& line : lines)
-			{
-				const std::vector<std::string> tokens = fmt::split(line, {" "});
-				if (tokens.size() < 5)
-				{
-					return;
-				}
-
-				const std::string& token = tokens[0];
-				if (!token.starts_with("cpu"))
-				{
-					return;
-				}
-
-				// Get CPU index
-				int cpu_index = -1; // -1 for total
-
-				constexpr size_t size_of_cpu = 3;
-				if (token.size() > size_of_cpu)
-				{
-					if (const auto [success, val] = string_to_number(token.substr(size_of_cpu)); success && val < per_core_usage.size())
-					{
-						cpu_index = val;
-					}
-					else if (!success)
-					{
-						perf_log.error("Can not convert string to cpu index for per core cpu usage. (token='%s', line='%s')", token, line);
-						continue;
-					}
-					else
-					{
-						perf_log.error("Invalid cpu index for per core cpu usage. (cpu_index=%d, cores=%d, token='%s', line='%s')", cpu_index, per_core_usage.size(), token, line);
-						continue;
-					}
-				}
-
-				size_t idle_time = 0;
-				size_t total_time = 0;
-
-				for (size_t i = 1; i < tokens.size(); i++)
-				{
-					if (const auto [success, val] = string_to_number(tokens[i]); success)
-					{
-						if (i == 4)
-						{
-							idle_time = val;
-						}
-
-						total_time += val;
-					}
-					else
-					{
-						perf_log.error("Can not convert string to time for per core cpu usage. (i=%d, token='%s', line='%s')", i, tokens[i], line);
-					}
-				}
-
-				if (cpu_index < 0)
-				{
-					const double idle_time_delta = idle_time - std::exchange(m_previous_idle_time_total, idle_time);
-					const double total_time_delta = total_time - std::exchange(m_previous_total_time_total, total_time);
-					total_usage = 100.0 * (1.0 - idle_time_delta / total_time_delta);
-				}
-				else
-				{
-					const double idle_time_delta = idle_time - std::exchange(m_previous_idle_times_per_cpu[cpu_index], idle_time);
-					const double total_time_delta = total_time - std::exchange(m_previous_total_times_per_cpu[cpu_index], total_time);
-					per_core_usage[cpu_index] = 100.0 * (1.0 - idle_time_delta / total_time_delta);
-				}
-			}
-		}
-		else
-		{
-			perf_log.error("Failed to open /proc/stat (%s)", strerror(errno));
-		}
-#endif
-#else
-		total_usage = get_usage();
-#endif
-	}
-
 	double cpu_stats::get_usage()
 	{
 #ifdef _WIN32
@@ -316,7 +87,7 @@ namespace utils
 		}
 		else
 		{
-			percent = static_cast<double>((sys.QuadPart - m_sys_cpu) + (usr.QuadPart - m_usr_cpu));
+			percent = (sys.QuadPart - m_sys_cpu) + (usr.QuadPart - m_usr_cpu);
 			percent /= (now.QuadPart - m_last_cpu);
 			percent /= utils::get_thread_count(); // Let's assume this is at least 1
 			percent *= 100;
@@ -352,7 +123,7 @@ namespace utils
 #endif
 	}
 
-	u32 cpu_stats::get_current_thread_count() // static
+	u32 cpu_stats::get_thread_count() // static
 	{
 #ifdef _WIN32
 		// first determine the id of the current process
@@ -366,7 +137,8 @@ namespace utils
 		entry.dwSize         = sizeof(entry);
 
 		// get the first process info.
-		BOOL ret = Process32First(snapshot, &entry);
+		BOOL ret = true;
+		ret      = Process32First(snapshot, &entry);
 		while (ret && entry.th32ProcessID != id)
 		{
 			ret = Process32Next(snapshot, &entry);
@@ -444,7 +216,7 @@ namespace utils
 		if (proc_dir)
 		{
 			// proc available, iterate through tasks and count them
-			const struct dirent* entry;
+			struct dirent* entry;
 			while ((entry = readdir(proc_dir)) != NULL)
 			{
 				if (entry->d_name[0] == '.')
diff --git a/rpcs3/util/cpu_stats.hpp b/rpcs3/util/cpu_stats.hpp
index a873bdb420..fea3330974 100644
--- a/rpcs3/util/cpu_stats.hpp
+++ b/rpcs3/util/cpu_stats.hpp
@@ -1,40 +1,18 @@
 #pragma once
 
 #include "util/types.hpp"
-#include <vector>
-
-#ifdef _WIN32
-#include <pdh.h>
-#include <pdhmsg.h>
-#endif
 
 namespace utils
 {
 	class cpu_stats
 	{
-		u64 m_last_cpu = 0;
-		u64 m_sys_cpu = 0;
-		u64 m_usr_cpu = 0;
-
-#ifdef _WIN32
-		PDH_HQUERY m_cpu_query = nullptr;
-		PDH_HCOUNTER m_cpu_cores = nullptr;
-#elif __linux__
-		size_t m_previous_idle_time_total = 0;
-		size_t m_previous_total_time_total = 0;
-		std::vector<size_t> m_previous_idle_times_per_cpu;
-		std::vector<size_t> m_previous_total_times_per_cpu;
-#endif
+		u64 m_last_cpu = 0, m_sys_cpu = 0, m_usr_cpu = 0;
 
 	public:
 		cpu_stats();
-		~cpu_stats();
 
 		double get_usage();
 
-		void init_cpu_query();
-		void get_per_core_usage(std::vector<double>& per_core_usage, double& total_usage);
-
-		static u32 get_current_thread_count();
+		static u32 get_thread_count();
 	};
 }
diff --git a/rpcs3/util/dyn_lib.cpp b/rpcs3/util/dyn_lib.cpp
index 1177aff229..d739a28c09 100644
--- a/rpcs3/util/dyn_lib.cpp
+++ b/rpcs3/util/dyn_lib.cpp
@@ -29,14 +29,6 @@ namespace utils
 		return loaded();
 	}
 
-#ifdef _WIN32
-	bool dynamic_library::load(const std::wstring& path)
-	{
-		m_handle = LoadLibraryW(path.c_str());
-		return loaded();
-	}
-#endif
-
 	void dynamic_library::close()
 	{
 #ifdef _WIN32
@@ -47,12 +39,12 @@ namespace utils
 		m_handle = nullptr;
 	}
 
-	void* dynamic_library::get_impl(const char* name) const
+	void* dynamic_library::get_impl(const std::string& name) const
 	{
 #ifdef _WIN32
-		return reinterpret_cast<void*>(GetProcAddress(reinterpret_cast<HMODULE>(m_handle), name));
+		return reinterpret_cast<void*>(GetProcAddress(reinterpret_cast<HMODULE>(m_handle), name.c_str()));
 #else
-		return dlsym(m_handle, name);
+		return dlsym(m_handle, name.c_str());
 #endif
 	}
 
diff --git a/rpcs3/util/dyn_lib.hpp b/rpcs3/util/dyn_lib.hpp
index 2968f8daed..75c676ad21 100644
--- a/rpcs3/util/dyn_lib.hpp
+++ b/rpcs3/util/dyn_lib.hpp
@@ -14,7 +14,7 @@ namespace utils
 
 		dynamic_library(const dynamic_library&) = delete;
 
-		dynamic_library(dynamic_library&& other) noexcept
+		dynamic_library(dynamic_library&& other)
 			: m_handle(other.m_handle)
 		{
 			other.m_handle = nullptr;
@@ -22,7 +22,7 @@ namespace utils
 
 		dynamic_library& operator=(const dynamic_library&) = delete;
 
-		dynamic_library& operator=(dynamic_library&& other) noexcept
+		dynamic_library& operator=(dynamic_library&& other)
 		{
 			std::swap(m_handle, other.m_handle);
 			return *this;
@@ -31,19 +31,26 @@ namespace utils
 		~dynamic_library();
 
 		bool load(const std::string& path);
-#ifdef _WIN32
-		bool load(const std::wstring& path);
-#endif
 		void close();
 
 	private:
-		void* get_impl(const char* name) const;
+		void* get_impl(const std::string& name) const;
 
 	public:
 		template <typename Type = void>
-		Type get(const char* name) const
+		Type* get(const std::string& name) const
 		{
-			return reinterpret_cast<Type>(get_impl(name));
+			Type* result;
+			*reinterpret_cast<void**>(&result) = get_impl(name);
+			return result;
+		}
+
+		template <typename Type>
+		bool get(Type*& function, const std::string& name) const
+		{
+			*reinterpret_cast<void**>(&function) = get_impl(name);
+
+			return function != nullptr;
 		}
 
 		bool loaded() const;
@@ -102,5 +109,4 @@ namespace utils
 	};
 }
 
-#define DYNAMIC_IMPORT(lib, name, ...) inline constinit utils::dynamic_import<__VA_ARGS__> name(lib, #name);
-#define DYNAMIC_IMPORT_RENAME(lib, declare_name, lib_func_name, ...) inline constinit utils::dynamic_import<__VA_ARGS__> declare_name(lib, lib_func_name);
+#define DYNAMIC_IMPORT(lib, name, ...) inline utils::dynamic_import<__VA_ARGS__> name(lib, #name);
diff --git a/rpcs3/util/emu_utils.cpp b/rpcs3/util/emu_utils.cpp
deleted file mode 100644
index 02d4f9865e..0000000000
--- a/rpcs3/util/emu_utils.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "stdafx.h"
-
-#include "Emu/IdManager.h"
-#include "Emu/system_config.h"
-#include "Emu/Cell/PPUDisAsm.h"
-#include "Emu/Cell/SPUDisAsm.h"
-#include "Emu/Cell/SPUThread.h"
-#include "Emu/Cell/PPUThread.h"
-#include "Emu/RSX/RSXDisAsm.h"
-#include "Emu/Memory/vm.h"
-#include "Utilities/Thread.h"
-
-bool is_using_interpreter(thread_class t_class)
-{
-	switch (t_class)
-	{
-	case thread_class::ppu: return g_cfg.core.ppu_decoder != ppu_decoder_type::llvm;
-	case thread_class::spu: return g_cfg.core.spu_decoder != spu_decoder_type::asmjit && g_cfg.core.spu_decoder != spu_decoder_type::llvm;
-	default: return true;
-	}
-}
-
-std::shared_ptr<CPUDisAsm> make_disasm(const cpu_thread* cpu, shared_ptr<cpu_thread> handle)
-{
-	if (!handle)
-	{
-		switch (cpu->get_class())
-		{
-		case thread_class::ppu: handle = idm::get_unlocked<named_thread<ppu_thread>>(cpu->id); break;
-		case thread_class::spu: handle = idm::get_unlocked<named_thread<spu_thread>>(cpu->id); break;
-		default: break;
-		}
-	}
-
-	std::shared_ptr<CPUDisAsm> result;
-
-	switch (cpu->get_class())
-	{
-	case thread_class::ppu: result = std::make_shared<PPUDisAsm>(cpu_disasm_mode::interpreter, vm::g_sudo_addr); break;
-	case thread_class::spu: result = std::make_shared<SPUDisAsm>(cpu_disasm_mode::interpreter, static_cast<const spu_thread*>(cpu)->ls); break;
-	case thread_class::rsx: result = std::make_shared<RSXDisAsm>(cpu_disasm_mode::interpreter, vm::g_sudo_addr, 0, cpu); break;
-	default: return result;
-	}
-
-	result->set_cpu_handle(std::move(handle));
-	return result;
-}
diff --git a/rpcs3/util/endian.hpp b/rpcs3/util/endian.hpp
index 169eeffbad..fab5fdc78a 100644
--- a/rpcs3/util/endian.hpp
+++ b/rpcs3/util/endian.hpp
@@ -35,9 +35,7 @@ namespace stx
 
 		static constexpr u16 swap(u16 src) noexcept
 		{
-#if __cpp_lib_byteswap >= 202110L
-			return std::byteswap(src);
-#elif defined(__GNUG__)
+#if defined(__GNUG__)
 			return __builtin_bswap16(src);
 #else
 			if (std::is_constant_evaluated())
@@ -57,9 +55,7 @@ namespace stx
 
 		static constexpr u32 swap(u32 src) noexcept
 		{
-#if __cpp_lib_byteswap >= 202110L
-			return std::byteswap(src);
-#elif defined(__GNUG__)
+#if defined(__GNUG__)
 			return __builtin_bswap32(src);
 #else
 			if (std::is_constant_evaluated())
@@ -80,9 +76,7 @@ namespace stx
 
 		static constexpr u64 swap(u64 src) noexcept
 		{
-#if __cpp_lib_byteswap >= 202110L
-			return std::byteswap(src);
-#elif defined(__GNUG__)
+#if defined(__GNUG__)
 			return __builtin_bswap64(src);
 #else
 			if (std::is_constant_evaluated())
@@ -148,15 +142,15 @@ namespace stx
 	template <typename T, bool Swap, usz Align = alignof(T)>
 	class alignas(Align) se_t
 	{
-		using type = std::remove_cv_t<T>;
+		using type = typename std::remove_cv<T>::type;
 		using stype = typename se_storage<type, Align>::type;
 		using storage = se_storage<type, Align>;
 
 		stype m_data;
 
-		static_assert(!std::is_pointer_v<type>, "se_t<> error: invalid type (pointer)");
-		static_assert(!std::is_reference_v<type>, "se_t<> error: invalid type (reference)");
-		static_assert(!std::is_array_v<type>, "se_t<> error: invalid type (array)");
+		static_assert(!std::is_pointer<type>::value, "se_t<> error: invalid type (pointer)");
+		static_assert(!std::is_reference<type>::value, "se_t<> error: invalid type (reference)");
+		static_assert(!std::is_array<type>::value, "se_t<> error: invalid type (array)");
 		static_assert(sizeof(type) == alignof(type), "se_t<> error: unexpected alignment");
 
 		static constexpr stype to_data(type value) noexcept
@@ -186,7 +180,7 @@ namespace stx
 		using under = decltype(int_or_enum());
 
 	public:
-		ENABLE_BITWISE_SERIALIZATION;
+		using enable_bitcopy = std::true_type;
 
 		se_t() noexcept = default;
 
@@ -267,9 +261,8 @@ private:
 			}
 		}
 
-	public:
-		template <typename T2>
-			requires requires(const T2& t2) { +t2; }
+public:
+		template <typename T2, typename = decltype(+std::declval<const T2&>())>
 		constexpr bool operator==(const T2& rhs) const noexcept
 		{
 			using R = std::common_type_t<T2>;
diff --git a/rpcs3/util/fence.hpp b/rpcs3/util/fence.hpp
deleted file mode 100644
index af2ca84c8c..0000000000
--- a/rpcs3/util/fence.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-
-#ifdef _M_X64
-#ifdef _MSC_VER
-extern "C" void _mm_lfence();
-#else
-#include <immintrin.h>
-#endif
-#endif
-
-namespace utils
-{
-	inline void lfence()
-	{
-#ifdef _M_X64
-		_mm_lfence();
-#elif defined(ARCH_X64)
-		__builtin_ia32_lfence();
-#elif defined(ARCH_ARM64)
-		// TODO
-		__asm__ volatile("isb");
-#else
-#error "Missing lfence() implementation"
-#endif
-	}
-}
diff --git a/rpcs3/util/fifo_mutex.hpp b/rpcs3/util/fifo_mutex.hpp
index cddb7b11cf..cf2d9b0d0e 100644
--- a/rpcs3/util/fifo_mutex.hpp
+++ b/rpcs3/util/fifo_mutex.hpp
@@ -6,35 +6,33 @@
 // Mutex that tries to maintain the order of acquisition
 class fifo_mutex
 {
-	// Low 16 bits are incremented on acquisition, high 16 bits are incremented on release
-	atomic_t<u32> m_value{0};
+	// Low 8 bits are incremented on acquisition, high 8 bits are incremented on release
+	atomic_t<u16> m_value{0};
 
 public:
 	constexpr fifo_mutex() noexcept = default;
 
 	void lock() noexcept
 	{
-		// clang-format off
-		const u32 val = m_value.fetch_op([](u32& val)
+		const u16 val = m_value.fetch_op([](u16& val)
 		{
-			val = (val & 0xffff0000) | ((val + 1) & 0xffff);
+			val = (val & 0xff00) | ((val + 1) & 0xff);
 		});
-		// clang-format on
 
-		if (val >> 16 != (val & 0xffff)) [[unlikely]]
+		if (val >> 8 != (val & 0xff)) [[unlikely]]
 		{
 			// TODO: implement busy waiting along with moving to cpp file
-			m_value.wait((val & 0xffff0000) | ((val + 1) & 0xffff));
+			m_value.wait<atomic_wait::op_ne>(((val + 1) & 0xff) << 8, 0xff00);
 		}
 	}
 
 	bool try_lock() noexcept
 	{
-		const u32 val = m_value.load();
+		const u16 val = m_value.load();
 
-		if (val >> 16 == (val & 0xffff))
+		if (val >> 8 == (val & 0xff))
 		{
-			if (m_value.compare_and_swap(val, ((val + 1) & 0xffff) | (val & 0xffff0000)))
+			if (m_value.compare_and_swap(val, ((val + 1) & 0xff) | (val & 0xff00)))
 			{
 				return true;
 			}
@@ -45,9 +43,9 @@ public:
 
 	void unlock() noexcept
 	{
-		const u32 val = m_value.add_fetch(0x10000);
+		const u16 val = m_value.add_fetch(0x100);
 
-		if (val >> 16 != (val & 0xffff))
+		if (val >> 8 != (val & 0xff))
 		{
 			m_value.notify_one();
 		}
@@ -55,9 +53,9 @@ public:
 
 	bool is_free() const noexcept
 	{
-		const u32 val = m_value.load();
+		const u16 val = m_value.load();
 
-		return (val >> 16) == (val & 0xffff);
+		return (val >> 8) == (val & 0xff);
 	}
 
 	void lock_unlock() noexcept
diff --git a/rpcs3/util/fixed_typemap.hpp b/rpcs3/util/fixed_typemap.hpp
index bcb5f36baa..850868f134 100644
--- a/rpcs3/util/fixed_typemap.hpp
+++ b/rpcs3/util/fixed_typemap.hpp
@@ -7,23 +7,11 @@
 
 #include <utility>
 #include <type_traits>
-#include <algorithm>
 
 enum class thread_state : u32;
 
-extern thread_local std::string_view g_tls_serialize_name;
-
-namespace utils
-{
-	struct serial;
-}
-
 namespace stx
 {
-	struct launch_retainer{};
-
-	extern u16 serial_breathe_and_tag(utils::serial& ar, std::string_view name, bool tag_bit);
-
 	// Simplified typemap with exactly one object of each used type, non-moveable. Initialized on init(). Destroyed on clear().
 	template <typename Tag /*Tag should be unique*/, u32 Size = 0, u32 Align = (Size ? 64 : __STDCPP_DEFAULT_NEW_ALIGNMENT__)>
 	class alignas(Align) manual_typemap
@@ -70,51 +58,18 @@ namespace stx
 		// Save default constructor and destructor and optional joining operation
 		struct typeinfo
 		{
-			bool(*create)(uchar* ptr, manual_typemap&, utils::serial*, std::string_view) noexcept = nullptr;
-			void(*thread_op)(void* ptr, thread_state) noexcept = nullptr;
-			void(*save)(void* ptr, utils::serial&) noexcept = nullptr;
-			bool(*saveable)(bool) noexcept = nullptr;
+			bool(*create)(uchar* ptr, manual_typemap&) noexcept = nullptr;
+			void(*stop)(void* ptr, thread_state) noexcept = nullptr;
 			void(*destroy)(void* ptr) noexcept = nullptr;
-			bool is_trivial_and_nonsavable = false;
-			std::string_view name;
+			std::string_view name{};
 
 			template <typename T>
-			static bool call_ctor(uchar* ptr, manual_typemap& _this, utils::serial* ar, std::string_view name) noexcept
+			static bool call_ctor(uchar* ptr, manual_typemap& _this) noexcept
 			{
-				if (ar)
-				{
-					if constexpr (std::is_constructible_v<T, exact_t<manual_typemap&>, exact_t<utils::serial&>>)
-					{
-						g_tls_serialize_name = name;
-						new (ptr) T(exact_t<manual_typemap&>(_this), exact_t<utils::serial&>(*ar));
-						return true;
-					}
-
-					if constexpr (std::is_constructible_v<T, exact_t<const launch_retainer&>, exact_t<utils::serial&>>)
-					{
-						g_tls_serialize_name = name;
-						new (ptr) T(exact_t<const launch_retainer&>(launch_retainer{}), exact_t<utils::serial&>(*ar));
-						return true;
-					}
-
-					if constexpr (std::is_constructible_v<T, exact_t<utils::serial&>>)
-					{
-						g_tls_serialize_name = name;
-						new (ptr) T(exact_t<utils::serial&>(*ar));
-						return true;
-					}
-				}
-
 				// Allow passing reference to "this"
-				if constexpr (std::is_constructible_v<T, exact_t<manual_typemap&>>)
+				if constexpr (std::is_constructible_v<T, manual_typemap&>)
 				{
-					new (ptr) T(exact_t<manual_typemap&>(_this));
-					return true;
-				}
-
-				if constexpr (std::is_constructible_v<T, exact_t<const launch_retainer&>>)
-				{
-					new (ptr) T(exact_t<const launch_retainer&>(launch_retainer{}));
+					new (ptr) T(_this);
 					return true;
 				}
 
@@ -131,57 +86,30 @@ namespace stx
 			template <typename T>
 			static void call_dtor(void* ptr) noexcept
 			{
-				auto* obj = std::launder(static_cast<T*>(ptr));
-				obj->~T();
-				std::memset(ptr, 0xCC, sizeof(T)); // Set to trap values
+				std::launder(static_cast<T*>(ptr))->~T();
 			}
 
 			template <typename T>
-			static void call_thread_op(void* ptr, thread_state state) noexcept
+			static void call_stop(void* ptr, thread_state state) noexcept
 			{
 				// Abort and/or join (expected thread_state::aborting or thread_state::finished)
 				*std::launder(static_cast<T*>(ptr)) = state;
 			}
 
-			template <typename T>
-				requires requires(T& a, utils::serial& ar) { a.save(stx::exact_t<utils::serial&>(ar)); }
-			static void call_save(void* ptr, utils::serial& ar) noexcept
-			{
-				std::launder(static_cast<T*>(ptr))->save(stx::exact_t<utils::serial&>(ar));
-			}
-
-			template <typename T> requires requires (const T&) { T::saveable(true); }
-			static bool call_saveable(bool is_writing) noexcept
-			{
-				return T::saveable(is_writing);
-			}
-
 			template <typename T>
 			static typeinfo make_typeinfo()
 			{
 				static_assert(!std::is_copy_assignable_v<T> && !std::is_copy_constructible_v<T>, "Please make sure the object cannot be accidentally copied.");
 
-				typeinfo r{};
+				typeinfo r;
 				r.create = &call_ctor<T>;
 				r.destroy = &call_dtor<T>;
 
 				if constexpr (std::is_assignable_v<T&, thread_state>)
 				{
-					r.thread_op = &call_thread_op<T>;
+					r.stop = &call_stop<T>;
 				}
 
-				if constexpr (!!(requires(T& a, utils::serial& ar) { a.save(stx::exact_t<utils::serial&>(ar)); }))
-				{
-					r.save = &call_save<T>;
-				}
-
-				if constexpr (!!(requires (const T&) { T::saveable(true); }))
-				{
-					r.saveable = &call_saveable<T>;
-				}
-
-				r.is_trivial_and_nonsavable = std::is_trivially_default_constructible_v<T> && !r.save;
-
 #ifdef _MSC_VER
 				constexpr std::string_view name = parse_type(__FUNCSIG__);
 #else
@@ -199,15 +127,15 @@ namespace stx
 			mutable uchar m_data[Size ? Size : 1];
 		};
 
-		// Indicates whether object is created at given index
-		std::array<bool, (Size ? Size / Align : 65536)> m_init{};
-
 		// Creation order for each object (used to reverse destruction order)
 		void** m_order = nullptr;
 
 		// Helper for destroying in reverse order
 		const typeinfo** m_info = nullptr;
 
+		// Indicates whether object is created at given index
+		bool* m_init = nullptr;
+
 	public:
 		manual_typemap() noexcept = default;
 
@@ -217,19 +145,19 @@ namespace stx
 
 		~manual_typemap()
 		{
-			ensure(!m_info);
+			ensure(!m_init);
 		}
 
 		void reset()
 		{
-			if (is_init())
+			if (m_init)
 			{
 				clear();
 			}
 
 			m_order = new void*[stx::typelist<typeinfo>().count() + 1];
 			m_info = new const typeinfo*[stx::typelist<typeinfo>().count() + 1];
-			ensure(m_init.size() > stx::typelist<typeinfo>().count());
+			m_init = new bool[stx::typelist<typeinfo>().count()]{};
 
 			if constexpr (Size == 0)
 			{
@@ -246,48 +174,22 @@ namespace stx
 			{
 				ensure(Size >= stx::typelist<typeinfo>().size());
 				ensure(Align >= stx::typelist<typeinfo>().align());
+				m_data[0] = 0;
 			}
 
-			// Set to trap values
-			std::memset(Size == 0 ? m_list : m_data, 0xCC, stx::typelist<typeinfo>().size());
-
 			*m_order++ = nullptr;
 			*m_info++ = nullptr;
 		}
 
-		void init(bool reset = true, utils::serial* ar = nullptr, std::function<void()> func = {})
+		void init(bool reset = true)
 		{
 			if (reset)
 			{
 				this->reset();
 			}
 
-			// Use unique_ptr to reduce header dependencies in this commonly used header
-			const usz type_count = stx::typelist<typeinfo>().count();
-			const auto order = std::make_unique<std::pair<double, const type_info<typeinfo>*>[]>(type_count);
-
-			usz pos = 0;
 			for (const auto& type : stx::typelist<typeinfo>())
 			{
-				order[pos++] = {type.init_pos(), std::addressof(type)};
-			}
-
-			std::stable_sort(order.get(), order.get() + type_count, [](const auto& a, const auto& b)
-			{
-				if (a.second->is_trivial_and_nonsavable && !b.second->is_trivial_and_nonsavable)
-				{
-					return true;
-				}
-
-				return a.first < b.first;
-			});
-
-			const auto info_before = m_info;
-
-			for (pos = 0; pos < type_count; pos++)
-			{
-				const auto& type = *order[pos].second;
-
 				const u32 id = type.index();
 				uchar* data = (Size ? +m_data : m_list) + type.pos();
 
@@ -297,41 +199,18 @@ namespace stx
 					continue;
 				}
 
-				const bool saveable = !type.saveable || type.saveable(false);
-
-				if (type.create(data, *this, saveable ? ar : nullptr, type.name))
+				if (type.create(data, *this))
 				{
 					*m_order++ = data;
 					*m_info++ = &type;
 					m_init[id] = true;
-
-					if (ar && saveable && type.save)
-					{
-						serial_breathe_and_tag(*ar, type.name, false);
-					}
 				}
 			}
-
-			if (func)
-			{
-				func();
-			}
-
-			// Launch threads
-			for (auto it = m_info; it != info_before; it--)
-			{
-				if (auto op = (*std::prev(it))->thread_op)
-				{
-					op(*std::prev(m_order, m_info - it + 1), thread_state{});
-				}
-			}
-
-			g_tls_serialize_name = {};
 		}
 
 		void clear()
 		{
-			if (!is_init())
+			if (!m_init)
 			{
 				return;
 			}
@@ -348,33 +227,16 @@ namespace stx
 				}
 			}
 
-			// Order semi-destructors before the actual destructors
-			// This allows to safely access data that may be deallocated or destroyed from other members of FXO regardless of their intialization time
-			for (u32 i = 0; i < _max; i++)
-			{
-				const auto info = (*std::prev(m_info, i + 1));
-
-				if (auto op = info->thread_op)
-				{
-					constexpr thread_state destroying_context{7};
-					op(*std::prev(m_order, i + 1), destroying_context);
-				}
-			}
-
 			// Destroy objects in reverse order
 			for (; _max; _max--)
 			{
-				auto* info = *--m_info;
-				const u32 type_index = static_cast<const type_info<typeinfo>*>(info)->index();
-				info->destroy(*--m_order);
-
-				// Set init to false. We don't want other fxo to use this fxo in their destructor.
-				m_init[type_index] = false;
+				(*--m_info)->destroy(*--m_order);
 			}
 
 			// Pointers should be restored to their positions
 			m_info--;
 			m_order--;
+			delete[] m_init;
 			delete[] m_info;
 			delete[] m_order;
 
@@ -390,7 +252,7 @@ namespace stx
 				}
 			}
 
-			m_init.fill(false);
+			m_init = nullptr;
 			m_info = nullptr;
 			m_order = nullptr;
 
@@ -400,49 +262,15 @@ namespace stx
 			}
 		}
 
-		template <typename T> requires (std::is_same_v<T&, utils::serial&>)
-		void save(T& ar)
-		{
-			if (!is_init())
-			{
-				return;
-			}
-
-			// Get actual number of created objects
-			u32 _max = 0;
-
-			for (const auto& type : stx::typelist<typeinfo>())
-			{
-				if (m_init[type.index()])
-				{
-					// Skip object if not created
-					_max++;
-				}
-			}
-
-			// Save data in forward order
-			for (u32 i = _max; i; i--)
-			{
-				const auto info = (*std::prev(m_info, i));
-
-				if (auto save = info->save)
-				{
-					save(*std::prev(m_order, i), ar);
-
-					serial_breathe_and_tag(ar, info->name, false);
-				}
-			}
-		}
-
 		// Check if object is not initialized but shall be initialized first (to use in initializing other objects)
-		template <typename T> requires (!std::is_constructible_v<T, exact_t<utils::serial&>> && (std::is_constructible_v<T, exact_t<manual_typemap&>> || std::is_default_constructible_v<T>))
+		template <typename T>
 		void need() noexcept
 		{
 			if (!m_init[stx::typeindex<typeinfo, std::decay_t<T>>()])
 			{
-				if constexpr (std::is_constructible_v<T, exact_t<manual_typemap&>>)
+				if constexpr (std::is_constructible_v<T, manual_typemap&>)
 				{
-					init<T>(exact_t<manual_typemap&>(*this));
+					init<T>(*this);
 					return;
 				}
 
@@ -455,23 +283,17 @@ namespace stx
 		}
 
 		// Explicitly initialize object of type T possibly with dynamic type As and arguments
-		template <typename T, typename As = T, typename... Args> requires (std::is_constructible_v<std::decay_t<As>, Args&&...>)
+		template <typename T, typename As = T, typename... Args>
 		As* init(Args&&... args) noexcept
 		{
-			if (m_init[stx::typeindex<typeinfo, std::decay_t<T>, std::decay_t<As>>()])
+			if (std::exchange(m_init[stx::typeindex<typeinfo, std::decay_t<T>, std::decay_t<As>>()], true))
 			{
 				// Already exists, recreation is not supported (may be added later)
 				return nullptr;
 			}
 
-			m_init[stx::typeindex<typeinfo, std::decay_t<T>, std::decay_t<As>>()] = true;
-
 			As* obj = nullptr;
 
-			const auto type_info = &stx::typedata<typeinfo, std::decay_t<T>, std::decay_t<As>>();
-
-			g_tls_serialize_name = get_name<T, As>();
-
 			if constexpr (Size != 0)
 			{
 				obj = new (m_data + stx::typeoffset<typeinfo, std::decay_t<T>>()) std::decay_t<As>(std::forward<Args>(args)...);
@@ -481,29 +303,8 @@ namespace stx
 				obj = new (m_list + stx::typeoffset<typeinfo, std::decay_t<T>>()) std::decay_t<As>(std::forward<Args>(args)...);
 			}
 
-			if constexpr ((std::is_same_v<std::remove_cvref_t<Args>, utils::serial> || ...))
-			{
-				ensure(type_info->save);
-
-				serial_breathe_and_tag(std::get<0>(std::tie(args...)), get_name<T, As>(), false);
-			}
-
-			if constexpr ((std::is_same_v<std::remove_cvref_t<Args>, utils::serial*> || ...))
-			{
-				ensure(type_info->save);
-
-				utils::serial* ar = std::get<0>(std::tie(args...));
-
-				if (ar)
-				{
-					serial_breathe_and_tag(*ar, get_name<T, As>(), false);
-				}
-			}
-
-			g_tls_serialize_name = {};
-
 			*m_order++ = obj;
-			*m_info++ = type_info;
+			*m_info++ = &stx::typedata<typeinfo, std::decay_t<T>, std::decay_t<As>>();
 			return obj;
 		}
 
@@ -522,11 +323,6 @@ namespace stx
 			return m_init[stx::typeindex<typeinfo, std::decay_t<T>>()];
 		}
 
-		bool is_init() const noexcept
-		{
-			return m_info != nullptr;
-		}
-
 		// Obtain object pointer (may be uninitialized memory)
 		template <typename T>
 		T& get() const noexcept
@@ -541,19 +337,13 @@ namespace stx
 			}
 		}
 
-		template <typename T, typename As = T>
-		static std::string_view get_name() noexcept
-		{
-			return stx::typedata<typeinfo, std::decay_t<T>, std::decay_t<As>>().name;
-		}
-
 		// Obtain object pointer if initialized
 		template <typename T>
 		T* try_get() const noexcept
 		{
 			if (is_init<T>())
 			{
-				[[likely]] return std::addressof(get<T>());
+				[[likely]] return &get<T>();
 			}
 
 			[[unlikely]] return nullptr;
diff --git a/rpcs3/util/fnv_hash.hpp b/rpcs3/util/fnv_hash.hpp
index 1da02d02a5..d7ebfe74da 100644
--- a/rpcs3/util/fnv_hash.hpp
+++ b/rpcs3/util/fnv_hash.hpp
@@ -14,8 +14,7 @@ namespace rpcs3
 		return static_cast<usz>(value);
 	}
 
-	template <typename T>
-		requires std::is_integral_v<T>
+	template <typename T, typename = std::enable_if_t<std::is_integral<T>::value>>
 	static inline usz hash64(usz hash_value, T data)
 	{
 		hash_value ^= data;
@@ -62,29 +61,4 @@ namespace rpcs3
 
 		return hash_struct_base<T, u8>(value);
 	}
-
-	template <typename T, size_t N>
-		requires std::is_integral_v<T>
-	static inline usz hash_array(const T(&arr)[N])
-	{
-		usz hash = fnv_seed;
-		for (size_t i = 0; i < N; ++i)
-		{
-			hash = hash64(hash, arr[i]);
-		}
-		return hash;
-	}
-
-	template <typename T, size_t N>
-		requires std::is_class_v<T>
-	static inline usz hash_array(const T(&arr)[N])
-	{
-		usz hash = fnv_seed;
-		for (size_t i = 0; i < N; ++i)
-		{
-			const u64 item_hash = hash_struct(arr[i]);
-			hash = hash64(hash, item_hash);
-		}
-		return hash;
-	}
 }
diff --git a/rpcs3/util/init_mutex.hpp b/rpcs3/util/init_mutex.hpp
index 748554b627..e4da7d0ca7 100644
--- a/rpcs3/util/init_mutex.hpp
+++ b/rpcs3/util/init_mutex.hpp
@@ -8,7 +8,7 @@ namespace stx
 	class init_mutex
 	{
 		// Set after initialization and removed before finalization
-		static constexpr u32 c_init_bit = 0x8000'0000;
+		static const u32 c_init_bit = 0x8000'0000;
 
 		// Contains "reader" count and init bit
 		atomic_t<u32> m_state = 0;
@@ -20,19 +20,11 @@ namespace stx
 		{
 			init_mutex* _this;
 
-			template <typename Func, typename... Args>
-			void invoke_callback(int invoke_count, Func&& func, Args&&... args) const
-			{
-				std::invoke(func, invoke_count, *this, std::forward<Args>(args)...);
-			}
-
 		public:
-			template <typename Forced, typename... FAndArgs>
-			explicit init_lock(init_mutex& mtx, Forced&&, FAndArgs&&... args) noexcept
+			template <typename... FAndArgs>
+			explicit init_lock(init_mutex& mtx, FAndArgs&&... args) noexcept
 				: _this(&mtx)
 			{
-				bool invoked_func = false;
-
 				while (true)
 				{
 					auto [val, ok] = _this->m_state.fetch_op([](u32& value)
@@ -43,7 +35,7 @@ namespace stx
 							return true;
 						}
 
-						if constexpr (Forced()())
+						if constexpr (sizeof...(FAndArgs))
 						{
 							if (value & c_init_bit)
 							{
@@ -63,26 +55,21 @@ namespace stx
 
 					if (val & c_init_bit)
 					{
-						if constexpr (Forced()())
+						if constexpr (sizeof...(FAndArgs))
 						{
 							// Forced reset
 							val -= c_init_bit - 1;
 
 							while (val != 1)
 							{
-								if constexpr (sizeof...(FAndArgs))
-								{
-									if (!invoked_func)
-									{
-										invoke_callback(0, std::forward<FAndArgs>(args)...);
-										invoked_func = true;
-									}
-								}
-
 								// Wait for other users to finish their work
 								_this->m_state.wait(val);
 								val = _this->m_state;
 							}
+
+							// Call specified reset function
+							std::invoke(std::forward<FAndArgs>(args)...);
+							break;
 						}
 
 						// Failure
@@ -90,35 +77,12 @@ namespace stx
 						break;
 					}
 
-					if constexpr (sizeof...(FAndArgs))
-					{
-						if (!invoked_func)
-						{
-							invoke_callback(0, std::forward<FAndArgs>(args)...);
-							invoked_func = true;
-						}
-					}
-
 					_this->m_state.wait(val);
 				}
-
-				// Finalization of wait callback
-				if constexpr (sizeof...(FAndArgs))
-				{
-					if (invoked_func)
-					{
-						invoke_callback(1, std::forward<FAndArgs>(args)...);
-					}
-				}
 			}
 
 			init_lock(const init_lock&) = delete;
 
-			init_lock(init_lock&& lock) noexcept
-				: _this(std::exchange(lock._this, nullptr))
-			{
-			}
-
 			init_lock& operator=(const init_lock&) = delete;
 
 			~init_lock()
@@ -138,11 +102,6 @@ namespace stx
 
 			explicit operator bool() && = delete;
 
-			void force_lock(init_mutex* mtx)
-			{
-				_this = mtx;
-			}
-
 			void cancel() & noexcept
 			{
 				if (_this)
@@ -153,43 +112,54 @@ namespace stx
 					_this = nullptr;
 				}
 			}
-
-			init_mutex* get_mutex()
-			{
-				return _this;
-			}
 		};
 
 		// Obtain exclusive lock to initialize protected resource. Waits for ongoing initialization or finalization. Fails if already initialized.
-		template <typename... FAndArgs>
-		[[nodiscard]] init_lock init(FAndArgs&&... args) noexcept
+		[[nodiscard]] init_lock init() noexcept
 		{
-			return init_lock(*this, std::false_type{}, std::forward<FAndArgs>(args)...);
+			return init_lock(*this);
 		}
 
 		// Same as init, but never fails, and executes provided `on_reset` function if already initialized.
 		template <typename F, typename... Args>
 		[[nodiscard]] init_lock init_always(F on_reset, Args&&... args) noexcept
 		{
-			init_lock lock(*this, std::true_type{});
-
-			if (!lock)
-			{
-				lock.force_lock(this);
-				std::invoke(std::forward<F>(on_reset), std::forward<Args>(args)...);
-			}
-
-			return lock;
+			return init_lock(*this, std::move(on_reset), std::forward<Args>(args)...);
 		}
 
 		class reset_lock final
 		{
-			init_lock _lock;
+			init_mutex* _this;
 
 		public:
-			explicit reset_lock(init_lock&& lock) noexcept
-				: _lock(std::move(lock))
+			explicit reset_lock(init_mutex& mtx) noexcept
+				: _this(&mtx)
 			{
+				auto [val, ok] = _this->m_state.fetch_op([](u32& value)
+				{
+					if (value & c_init_bit)
+					{
+						// Remove initialized state and add "init lock"
+						value -= c_init_bit - 1;
+						return true;
+					}
+
+					return false;
+				});
+
+				if (!ok)
+				{
+					// Failure: not initialized
+					_this = nullptr;
+					return;
+				}
+
+				while (val != 1)
+				{
+					// Wait for other users to finish their work
+					_this->m_state.wait(val);
+					val = _this->m_state;
+				}
 			}
 
 			reset_lock(const reset_lock&) = delete;
@@ -198,63 +168,36 @@ namespace stx
 
 			~reset_lock()
 			{
-				if (_lock)
+				if (_this)
 				{
 					// Set uninitialized state and remove "init lock"
-					_lock.cancel();
+					_this->m_state -= 1;
+					_this->m_state.notify_all();
 				}
 			}
 
 			explicit operator bool() const& noexcept
 			{
-				return !!_lock;
+				return _this != nullptr;
 			}
 
 			explicit operator bool() && = delete;
 
 			void set_init() & noexcept
 			{
-				if (_lock)
+				if (_this)
 				{
 					// Set initialized state (TODO?)
-					_lock.get_mutex()->m_state |= c_init_bit;
-					_lock.get_mutex()->m_state.notify_all();
+					_this->m_state |= c_init_bit;
+					_this->m_state.notify_all();
 				}
 			}
 		};
 
 		// Obtain exclusive lock to finalize protected resource. Waits for ongoing use. Fails if not initialized.
-		template <typename F, typename... Args>
-		[[nodiscard]] reset_lock reset(F on_reset, Args&&... args) noexcept
-		{
-			init_lock lock(*this, std::true_type{}, std::forward<F>(on_reset), std::forward<Args>(args)...);
-
-			if (!lock)
-			{
-				lock.force_lock(this);
-			}
-			else
-			{
-				lock.cancel();
-			}
-
-			return reset_lock(std::move(lock));
-		}
-
 		[[nodiscard]] reset_lock reset() noexcept
 		{
-			init_lock lock(*this, std::true_type{});
-
-			if (!lock)
-			{
-				lock.force_lock(this);
-			}
-			else
-			{
-				lock.cancel();
-			}
-
-			return reset_lock(std::move(lock));
+			return reset_lock(*this);
 		}
 
 		class access_lock final
@@ -333,8 +276,4 @@ namespace stx
 			m_state.wait(state);
 		}
 	};
-
-	using init_lock = init_mutex::init_lock;
-	using reset_lock = init_mutex::reset_lock;
-	using access_lock = init_mutex::access_lock;
 }
diff --git a/rpcs3/util/logs.cpp b/rpcs3/util/logs.cpp
index d48a22c0aa..4ed46e7a2b 100644
--- a/rpcs3/util/logs.cpp
+++ b/rpcs3/util/logs.cpp
@@ -11,7 +11,6 @@
 #include <chrono>
 #include <cstring>
 #include <cerrno>
-#include <regex>
 
 using namespace std::literals::chrono_literals;
 
@@ -34,7 +33,7 @@ static std::string default_string()
 		return {};
 	}
 
-	return fmt::format("TID: %u", thread_ctrl::get_tid());
+	return fmt::format("TID: %s", std::this_thread::get_id());
 }
 
 // Thread-specific log prefix provider
@@ -76,7 +75,6 @@ namespace logs
 
 	// Memory-mapped buffer size
 	constexpr u64 s_log_size = 32 * 1024 * 1024;
-	static_assert(s_log_size * s_log_size > s_log_size && (s_log_size & (s_log_size - 1)) == 0); // Assert on an overflowing value
 
 	class file_writer
 	{
@@ -89,8 +87,8 @@ namespace logs
 		z_stream m_zs{};
 		shared_mutex m_m{};
 
-		atomic_t<u64, 64> m_buf{0}; // MSB (39 bits): push begin, LSB (25 bis): push size
-		atomic_t<u64, 64> m_out{0}; // Amount of bytes written to file
+		alignas(128) atomic_t<u64> m_buf{0}; // MSB (40 bit): push begin, LSB (24 bis): push size
+		alignas(128) atomic_t<u64> m_out{0}; // Amount of bytes written to file
 
 		uchar m_zout[65536]{};
 
@@ -104,12 +102,6 @@ namespace logs
 
 		// Append raw data
 		void log(const char* text, usz size);
-
-		// Ensure written to disk
-		void sync();
-
-		// Close file handle after flushing to disk
-		void close_prematurely();
 	};
 
 	struct file_listener final : file_writer, public listener
@@ -118,17 +110,7 @@ namespace logs
 
 		~file_listener() override = default;
 
-		void log(u64 stamp, const message& msg, std::string_view prefix, std::string_view text) override;
-
-		void sync() override
-		{
-			file_writer::sync();
-		}
-
-		void close_prematurely() override
-		{
-			file_writer::close_prematurely();
-		}
+		void log(u64 stamp, const message& msg, const std::string& prefix, const std::string& text) override;
 	};
 
 	struct root_listener final : public listener
@@ -138,7 +120,7 @@ namespace logs
 		~root_listener() override = default;
 
 		// Encode level, current thread name, channel name and write log message
-		void log(u64, const message&, std::string_view, std::string_view) override
+		void log(u64, const message&, const std::string&, const std::string&) override
 		{
 			// Do nothing
 		}
@@ -220,24 +202,6 @@ namespace logs
 	{
 		std::lock_guard lock(g_mutex);
 
-		if (ch_name.find_first_of(".+*?^$()[]{}|\\") != umax)
-		{
-			const std::regex ex(ch_name);
-
-			// RegEx pattern
-			for (auto& channel_pair : get_logger()->channels)
-			{
-				std::smatch sm;
-
-				if (std::regex_match(channel_pair.first, sm, ex))
-				{
-					channel_pair.second->enabled.release(value);
-				}
-			}
-
-			return;
-		}
-
 		auto found = get_logger()->channels.equal_range(ch_name);
 
 		while (found.first != found.second)
@@ -251,7 +215,7 @@ namespace logs
 	{
 		std::lock_guard lock(g_mutex);
 
-		const auto found = get_logger()->channels.equal_range(ch_name);
+		auto found = get_logger()->channels.equal_range(ch_name);
 
 		if (found.first != found.second)
 		{
@@ -263,7 +227,7 @@ namespace logs
 		}
 	}
 
-	void set_channel_levels(const std::map<std::string, logs::level, std::less<>>& map)
+	void set_channel_levels(const std::map<std::string, logs::level>& map)
 	{
 		for (auto&& pair : map)
 		{
@@ -357,30 +321,6 @@ void logs::listener::broadcast(const logs::stored_message& msg) const
 	}
 }
 
-void logs::listener::sync()
-{
-}
-
-void logs::listener::close_prematurely()
-{
-}
-
-void logs::listener::sync_all()
-{
-	for (listener* lis = get_logger(); lis; lis = lis->m_next)
-	{
-		lis->sync();
-	}
-}
-
-void logs::listener::close_all_prematurely()
-{
-	for (listener* lis = get_logger(); lis; lis = lis->m_next)
-	{
-		lis->close_prematurely();
-	}
-}
-
 logs::registerer::registerer(channel& _ch)
 {
 	std::lock_guard lock(g_mutex);
@@ -397,8 +337,8 @@ void logs::message::broadcast(const char* fmt, const fmt_type_info* sup, ...) co
 	g_tls_log_control(fmt, 0);
 
 	// Get text, extract va_args
-	thread_local std::string text;
-	thread_local std::vector<u64> args;
+	/*constinit thread_local*/ std::string text;
+	/*constinit thread_local*/ std::basic_string<u64> args;
 
 	static constexpr fmt_type_info empty_sup{};
 
@@ -406,7 +346,7 @@ void logs::message::broadcast(const char* fmt, const fmt_type_info* sup, ...) co
 	for (auto v = sup; v && v->fmt_string; v++)
 		args_count++;
 
-	text.clear();
+	text.reserve(50000);
 	args.resize(args_count);
 
 	va_list c_args;
@@ -451,59 +391,57 @@ void logs::message::broadcast(const char* fmt, const fmt_type_info* sup, ...) co
 logs::file_writer::file_writer(const std::string& name, u64 max_size)
 	: m_max_size(max_size)
 {
-	if (name.empty() || !max_size)
+	if (!name.empty() && max_size)
 	{
-		return;
-	}
+		// Initialize ringbuffer
+		m_fptr = std::make_unique<uchar[]>(s_log_size);
 
-	// Initialize ringbuffer
-	m_fptr = std::make_unique<uchar[]>(s_log_size);
+		// Actual log file (allowed to fail)
+		if (!m_fout.open(name, fs::rewrite))
+		{
+			fprintf(stderr, "Log file open failed: %s (error %d)\n", name.c_str(), errno);
+		}
 
-	// Actual log file (allowed to fail)
-	if (!m_fout.open(name, fs::rewrite))
-	{
-		fprintf(stderr, "Log file open failed: %s (error %d)\n", name.c_str(), errno);
-	}
-
-	// Compressed log, make it inaccessible (foolproof)
-	if (m_fout2.open(name + ".gz", fs::rewrite + fs::unread))
-	{
+		// Compressed log, make it inaccessible (foolproof)
+		if (m_fout2.open(name + ".gz", fs::rewrite + fs::unread))
+		{
 #ifndef _MSC_VER
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
-		if (deflateInit2(&m_zs, 9, Z_DEFLATED, 16 + 15, 9, Z_DEFAULT_STRATEGY) != Z_OK)
+			if (deflateInit2(&m_zs, 9, Z_DEFLATED, 16 + 15, 9, Z_DEFAULT_STRATEGY) != Z_OK)
 #ifndef _MSC_VER
 #pragma GCC diagnostic pop
 #endif
-		{
-			m_fout2.close();
+				m_fout2.close();
 		}
-	}
 
-	if (!m_fout2)
-	{
-		fprintf(stderr, "Log file open failed: %s.gz (error %d)\n", name.c_str(), errno);
-	}
+		if (!m_fout2)
+		{
+			fprintf(stderr, "Log file open failed: %s.gz (error %d)\n", name.c_str(), errno);
+		}
 
 #ifdef _WIN32
-	// Autodelete compressed log file
-	FILE_DISPOSITION_INFO disp{};
-	disp.DeleteFileW = true;
-	SetFileInformationByHandle(m_fout2.get_handle(), FileDispositionInfo, &disp, sizeof(disp));
+		// Autodelete compressed log file
+		FILE_DISPOSITION_INFO disp;
+		disp.DeleteFileW = true;
+		SetFileInformationByHandle(m_fout2.get_handle(), FileDispositionInfo, &disp, sizeof(disp));
 #endif
+	}
+	else
+	{
+		return;
+	}
 
 	m_writer = std::thread([this]()
 	{
-		thread_base::set_name("Log Writer");
-
 		thread_ctrl::scoped_priority low_prio(-1);
 
 		while (true)
 		{
 			const u64 bufv = m_buf;
 
-			if (bufv % s_log_size)
+			if (bufv & 0xffffff)
 			{
 				// Wait if threads are writing logs
 				std::this_thread::yield();
@@ -531,7 +469,10 @@ logs::file_writer::~file_writer()
 	}
 
 	// Stop writer thread
-	file_writer::sync();
+	while (m_out << 24 < m_buf)
+	{
+		std::this_thread::yield();
+	}
 
 	m_out = -1;
 	m_writer.join();
@@ -557,7 +498,7 @@ logs::file_writer::~file_writer()
 	}
 
 #ifdef _WIN32
-	// Cancel compressed log file auto-deletion
+	// Cancel compressed log file autodeletion
 	FILE_DISPOSITION_INFO disp;
 	disp.DeleteFileW = false;
 	SetFileInformationByHandle(m_fout2.get_handle(), FileDispositionInfo, &disp, sizeof(disp));
@@ -571,27 +512,25 @@ bool logs::file_writer::flush(u64 bufv)
 {
 	std::lock_guard lock(m_m);
 
-	const u64 read_pos = m_out;
-	const u64 out_index = read_pos % s_log_size;
-	const u64 pushed = (bufv / s_log_size) % s_log_size;
-	const u64 end = std::min<u64>(out_index <= pushed ? read_pos - out_index + pushed : ((read_pos + s_log_size) & ~(s_log_size - 1)), m_max_size);
+	const u64 st  = +m_out;
+	const u64 end = std::min<u64>((st + s_log_size) & ~(s_log_size - 1), bufv >> 24);
 
-	if (end > read_pos)
+	if (end > st)
 	{
 		// Avoid writing too big fragments
-		const u64 size = std::min<u64>(end - read_pos, sizeof(m_zout) / 2);
+		const u64 size = std::min<u64>(end - st, sizeof(m_zout) / 2);
 
 		// Write uncompressed
-		if (m_fout && m_fout.write(m_fptr.get() + out_index, size) != size)
+		if (m_fout && st < m_max_size && m_fout.write(m_fptr.get() + st % s_log_size, size) != size)
 		{
 			m_fout.close();
 		}
 
 		// Write compressed
-		if (m_fout2)
+		if (m_fout2 && st < m_max_size)
 		{
 			m_zs.avail_in = static_cast<uInt>(size);
-			m_zs.next_in  = m_fptr.get() + out_index;
+			m_zs.next_in  = m_fptr.get() + st % s_log_size;
 
 			do
 			{
@@ -623,16 +562,18 @@ void logs::file_writer::log(const char* text, usz size)
 	}
 
 	// TODO: write bigger fragment directly in blocking manner
-	while (size && size < s_log_size)
+	while (size && size <= 0xffffff)
 	{
-		const auto [bufv, pos] = m_buf.fetch_op([&](u64& v) -> uchar*
-		{
-			const u64 out = m_out % s_log_size;
-			const u64 v1 = (v / s_log_size) % s_log_size;
-			const u64 v2 = v % s_log_size;
+		u64 bufv = 0;
 
-			if (v1 + v2 + size >= (out <= v1 ? out + s_log_size : out)) [[unlikely]]
+		const auto pos = m_buf.atomic_op([&](u64& v) -> uchar*
+		{
+			const u64 v1 = v >> 24;
+			const u64 v2 = v & 0xffffff;
+
+			if (v2 + size > 0xffffff || v1 + v2 + size >= m_out + s_log_size) [[unlikely]]
 			{
+				bufv = v;
 				return nullptr;
 			}
 
@@ -642,34 +583,22 @@ void logs::file_writer::log(const char* text, usz size)
 
 		if (!pos) [[unlikely]]
 		{
-			if (m_out >= m_max_size || (!m_fout && !m_fout2))
-			{
-				// Logging is inactive
-				return;
-			}
-
-			if ((bufv % s_log_size) + size >= s_log_size || bufv % s_log_size)
+			if ((bufv & 0xffffff) + size > 0xffffff || bufv & 0xffffff)
 			{
 				// Concurrency limit reached
 				std::this_thread::yield();
 			}
-			else if (!m_m.is_free())
-			{
-				// Wait for another flush call to complete
-				m_m.lock_unlock();
-			}
 			else
 			{
 				// Queue is full, need to write out
 				flush(bufv);
 			}
-
 			continue;
 		}
 
-		if (pos - m_fptr.get() + size > s_log_size)
+		if (pos + size > m_fptr.get() + s_log_size)
 		{
-			const auto frag = s_log_size - (pos - m_fptr.get());
+			const auto frag = m_fptr.get() + s_log_size - pos;
 			std::memcpy(pos, text, frag);
 			std::memcpy(m_fptr.get(), text + frag, size - frag);
 		}
@@ -678,96 +607,11 @@ void logs::file_writer::log(const char* text, usz size)
 			std::memcpy(pos, text, size);
 		}
 
-		m_buf += (size * s_log_size) - size;
+		m_buf += (u64{size} << 24) - size;
 		break;
 	}
 }
 
-void logs::file_writer::sync()
-{
-	if (!m_fptr)
-	{
-		return;
-	}
-
-	// Wait for the writer thread
-	while ((m_out % s_log_size) * s_log_size != m_buf % (s_log_size * s_log_size))
-	{
-		if (m_out >= m_max_size)
-		{
-			break;
-		}
-
-		std::this_thread::yield();
-	}
-
-	if (thread_ctrl::get_current())
-	{
-		return;
-	}
-
-	// Ensure written to disk
-	if (m_fout)
-	{
-		m_fout.sync();
-	}
-
-	if (m_fout2)
-	{
-		m_fout2.sync();
-	}
-}
-
-void logs::file_writer::close_prematurely()
-{
-	if (!m_fptr)
-	{
-		return;
-	}
-
-	// Ensure written to disk
-	sync();
-
-	std::lock_guard lock(m_m);
-
-	if (m_fout2)
-	{
-		m_zs.avail_in = 0;
-		m_zs.next_in  = nullptr;
-
-		do
-		{
-			m_zs.avail_out = sizeof(m_zout);
-			m_zs.next_out  = m_zout;
-
-			if (deflate(&m_zs, Z_FINISH) == Z_STREAM_ERROR || m_fout2.write(m_zout, sizeof(m_zout) - m_zs.avail_out) != sizeof(m_zout) - m_zs.avail_out)
-			{
-				break;
-			}
-		}
-		while (m_zs.avail_out == 0);
-
-		deflateEnd(&m_zs);
-
-#ifdef _WIN32
-		// Cancel compressed log file auto-deletion
-		FILE_DISPOSITION_INFO disp;
-		disp.DeleteFileW = false;
-		SetFileInformationByHandle(m_fout2.get_handle(), FileDispositionInfo, &disp, sizeof(disp));
-#else
-		// Restore compressed log file permissions
-		::fchmod(m_fout2.get_handle(), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-#endif
-
-		m_fout2.close();
-	}
-
-	if (m_fout)
-	{
-		m_fout.close();
-	}
-}
-
 logs::file_listener::file_listener(const std::string& path, u64 max_size)
 	: file_writer(path, max_size)
 	, listener()
@@ -776,7 +620,7 @@ logs::file_listener::file_listener(const std::string& path, u64 max_size)
 	file_writer::log("\xEF\xBB\xBF", 3);
 }
 
-void logs::file_listener::log(u64 stamp, const logs::message& msg, std::string_view prefix, std::string_view _text)
+void logs::file_listener::log(u64 stamp, const logs::message& msg, const std::string& prefix, const std::string& _text)
 {
 	/*constinit thread_local*/ std::string text;
 	text.reserve(50000);
@@ -794,7 +638,7 @@ void logs::file_listener::log(u64 stamp, const logs::message& msg, std::string_v
 	case level::trace:   text = reinterpret_cast<const char*>(u8"·T "); break;
 	}
 
-	// Print microsecond timestamp
+	// Print µs timestamp
 	const u64 hours = stamp / 3600'000'000;
 	const u64 mins = (stamp % 3600'000'000) / 60'000'000;
 	const u64 secs = (stamp % 60'000'000) / 1'000'000;
diff --git a/rpcs3/util/logs.hpp b/rpcs3/util/logs.hpp
index 52d163ed43..39ba189816 100644
--- a/rpcs3/util/logs.hpp
+++ b/rpcs3/util/logs.hpp
@@ -49,8 +49,6 @@ namespace logs
 			return reinterpret_cast<const channel*>(reinterpret_cast<uptr>(this) & -16);
 		}
 
-		inline explicit operator bool() const;
-
 	private:
 		// Send log message to global logger instance
 		void broadcast(const char*, const fmt_type_info*, ...) const;
@@ -79,25 +77,13 @@ namespace logs
 		virtual ~listener();
 
 		// Process log message
-		virtual void log(u64 stamp, const message& msg, std::string_view prefix, std::string_view text) = 0;
-
-		// Flush contents (file writer)
-		virtual void sync();
-
-		// Close file handle after flushing to disk (hazardous)
-		virtual void close_prematurely();
+		virtual void log(u64 stamp, const message& msg, const std::string& prefix, const std::string& text) = 0;
 
 		// Add new listener
 		static void add(listener*);
 
 		// Special purpose
 		void broadcast(const stored_message&) const;
-
-		// Flush log to disk
-		static void sync_all();
-
-		// Close file handle after flushing to disk (hazardous)
-		static void close_all_prematurely();
 	};
 
 	struct alignas(16) channel : private message
@@ -136,16 +122,10 @@ namespace logs
 #undef GEN_LOG_METHOD
 	};
 
-	inline logs::message::operator bool() const
-	{
-		// Test if enabled
-		return *this <= (*this)->enabled.observe();
-	}
-
 	template <typename... Args>
 	FORCE_INLINE SAFE_BUFFERS(void) message::operator()(const const_str& fmt, const Args&... args) const
 	{
-		if (operator bool()) [[unlikely]]
+		if (*this <= (*this)->enabled.observe()) [[unlikely]]
 		{
 			if constexpr (sizeof...(Args) > 0)
 			{
@@ -176,7 +156,7 @@ namespace logs
 	level get_level(const std::string&);
 
 	// Log level control: set specific channels to level::fatal
-	void set_channel_levels(const std::map<std::string, logs::level, std::less<>>& map);
+	void set_channel_levels(const std::map<std::string, logs::level>& map);
 
 	// Get all registered log channels
 	std::vector<std::string> get_channels();
@@ -194,7 +174,13 @@ namespace logs
 	void set_init(std::initializer_list<stored_message>);
 }
 
-#define LOG_CHANNEL(ch, ...) inline constinit ::logs::channel ch(::logs::make_channel_name(#ch, ##__VA_ARGS__)); \
+#if __cpp_constinit >= 201907
+#define LOG_CONSTINIT constinit
+#else
+#define LOG_CONSTINIT
+#endif
+
+#define LOG_CHANNEL(ch, ...) LOG_CONSTINIT inline ::logs::channel ch(::logs::make_channel_name(#ch, ##__VA_ARGS__)); \
 	namespace logs { inline ::logs::registerer reg_##ch{ch}; }
 
 LOG_CHANNEL(rsx_log, "RSX");
diff --git a/rpcs3/util/media_utils.cpp b/rpcs3/util/media_utils.cpp
index d4f450ab69..558c46d925 100644
--- a/rpcs3/util/media_utils.cpp
+++ b/rpcs3/util/media_utils.cpp
@@ -1,29 +1,18 @@
 #include "stdafx.h"
 #include "media_utils.h"
-#include "Emu/System.h"
-
-#include <random>
-#include <thread>
+#include "logs.hpp"
+#include "Utilities/StrUtil.h"
 
 #ifdef _MSC_VER
 #pragma warning(push, 0)
 #else
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
 extern "C" {
-#include "libavcodec/avcodec.h"
 #include "libavformat/avformat.h"
 #include "libavutil/dict.h"
-#include "libavutil/opt.h"
-#include "libavutil/imgutils.h"
-#include "libswscale/swscale.h"
-#include "libswresample/swresample.h"
 }
-constexpr int averror_eof = AVERROR_EOF; // workaround for old-style-cast error
-constexpr int averror_invalid_data = AVERROR_INVALIDDATA; // workaround for old-style-cast error
 #ifdef _MSC_VER
 #pragma warning(pop)
 #else
@@ -34,71 +23,12 @@ LOG_CHANNEL(media_log, "Media");
 
 namespace utils
 {
-	template <typename T>
-	static inline void write_byteswapped(const void* src, void* dst)
-	{
-		*reinterpret_cast<T*>(dst) = *reinterpret_cast<const be_t<T>*>(src);
-	}
-
-	template <typename T>
-	static inline void copy_samples(const u8* src, u8* dst, usz sample_count, bool swap_endianness)
-	{
-		if (swap_endianness)
-		{
-			for (usz i = 0; i < sample_count; i++)
-			{
-				write_byteswapped<T>(src + i * sizeof(T), dst + i * sizeof(T));
-			}
-		}
-		else
-		{
-			std::memcpy(dst, src, sample_count * sizeof(T));
-		}
-	}
-
-	const auto free_packet = [](AVPacket* p)
-	{
-		if (p)
-		{
-			av_packet_unref(p);
-			av_packet_free(&p);
-		}
-	};
-
-	const auto av_log_callback = [](void* avcl, int level, const char* fmt, va_list vl) -> void
-	{
-		if (level > av_log_get_level())
-		{
-			return;
-		}
-
-		constexpr int line_size = 1024;
-		char line[line_size]{};
-		int print_prefix = 1;
-
-		if (int err = av_log_format_line2(avcl, level, fmt, vl, line, line_size, &print_prefix); err < 0)
-		{
-			media_log.error("av_log: av_log_format_line2 failed. Error: %d='%s'", err, av_error_to_string(err));
-			return;
-		}
-
-		std::string msg = line;
-		fmt::trim_back(msg, "\n\r\t ");
-
-		if (level <= AV_LOG_ERROR)
-			media_log.error("av_log: %s", msg);
-		else if (level <= AV_LOG_WARNING)
-			media_log.warning("av_log: %s", msg);
-		else
-			media_log.notice("av_log: %s", msg);
-	};
-
 	template <>
 	std::string media_info::get_metadata(const std::string& key, const std::string& def) const
 	{
 		if (metadata.contains(key))
 		{
-			return ::at32(metadata, key);
+			return metadata.at(key);
 		}
 
 		return def;
@@ -110,7 +40,7 @@ namespace utils
 		if (metadata.contains(key))
 		{
 			s64 result{};
-			if (try_to_int64(&result, ::at32(metadata, key), smin, smax))
+			if (try_to_int64(&result, metadata.at(key), smin, smax))
 			{
 				return result;
 			}
@@ -119,62 +49,24 @@ namespace utils
 		return def;
 	}
 
-	std::string av_error_to_string(int error)
+	std::string error_to_string(int error)
 	{
-		char av_error[AV_ERROR_MAX_STRING_SIZE]{};
+		char av_error[AV_ERROR_MAX_STRING_SIZE];
 		av_make_error_string(av_error, AV_ERROR_MAX_STRING_SIZE, error);
 		return av_error;
 	}
 
-	std::vector<ffmpeg_codec> list_ffmpeg_codecs(bool list_decoders)
-	{
-		std::vector<ffmpeg_codec> codecs;
-		void* opaque = nullptr;
-		for (const AVCodec* codec = av_codec_iterate(&opaque); !!codec; codec = av_codec_iterate(&opaque))
-		{
-			if (list_decoders ? av_codec_is_decoder(codec) : av_codec_is_encoder(codec))
-			{
-				codecs.emplace_back(ffmpeg_codec{
-					.codec_id = static_cast<int>(codec->id),
-					.name = codec->name ? codec->name : "unknown",
-					.long_name = codec->long_name ? codec->long_name : "unknown"
-				});
-			}
-		}
-		std::sort(codecs.begin(), codecs.end(), [](const ffmpeg_codec& l, const ffmpeg_codec& r){ return l.name < r.name; });
-		return codecs;
-	}
-
-	std::vector<ffmpeg_codec> list_ffmpeg_decoders()
-	{
-		return list_ffmpeg_codecs(true);
-	}
-
-	std::vector<ffmpeg_codec> list_ffmpeg_encoders()
-	{
-		return list_ffmpeg_codecs(false);
-	}
-
 	std::pair<bool, media_info> get_media_info(const std::string& path, s32 av_media_type)
 	{
-		media_info info{};
-		info.path = path;
-
-		if (av_media_type == AVMEDIA_TYPE_UNKNOWN) // Let's use this for image info
-		{
-			const bool success = Emu.GetCallbacks().get_image_info(path, info.sub_type, info.width, info.height, info.orientation);
-			if (!success) media_log.error("get_media_info: failed to get image info for '%s'", path);
-			return { success, std::move(info) };
-		}
+		media_info info;
 
 		// Only print FFMPEG errors, fatals and panics
-		av_log_set_callback(av_log_callback);
 		av_log_set_level(AV_LOG_ERROR);
 
 		AVDictionary* av_dict_opts = nullptr;
 		if (int err = av_dict_set(&av_dict_opts, "probesize", "96", 0); err < 0)
 		{
-			media_log.error("get_media_info: av_dict_set: returned with error=%d='%s'", err, av_error_to_string(err));
+			media_log.error("av_dict_set: returned with error=%d='%s'", err, error_to_string(err));
 			return { false, std::move(info) };
 		}
 
@@ -186,7 +78,7 @@ namespace utils
 			// Failed to open file
 			av_dict_free(&av_dict_opts);
 			avformat_free_context(av_format_ctx);
-			media_log.notice("get_media_info: avformat_open_input: could not open file. error=%d='%s' file='%s'", err, av_error_to_string(err), path);
+			media_log.notice("avformat_open_input: could not open file. error=%d='%s' file='%s'", err, error_to_string(err), path);
 			return { false, std::move(info) };
 		}
 		av_dict_free(&av_dict_opts);
@@ -196,7 +88,8 @@ namespace utils
 		{
 			// Failed to load stream information
 			avformat_close_input(&av_format_ctx);
-			media_log.notice("get_media_info: avformat_find_stream_info: could not load stream information. error=%d='%s' file='%s'", err, av_error_to_string(err), path);
+			avformat_free_context(av_format_ctx);
+			media_log.notice("avformat_find_stream_info: could not load stream information. error=%d='%s' file='%s'", err, error_to_string(err), path);
 			return { false, std::move(info) };
 		}
 
@@ -227,7 +120,8 @@ namespace utils
 		{
 			// Failed to find a stream
 			avformat_close_input(&av_format_ctx);
-			media_log.notice("get_media_info: Failed to match stream of type %d in file='%s'", av_media_type, path);
+			avformat_free_context(av_format_ctx);
+			media_log.notice("Failed to match stream of type %d in file='%s'", av_media_type, path);
 			return { false, std::move(info) };
 		}
 
@@ -236,7 +130,7 @@ namespace utils
 		{
 			const AVStream* stream = av_format_ctx->streams[video_stream_index];
 			info.video_av_codec_id = stream->codecpar->codec_id;
-			info.video_bitrate_bps = static_cast<s32>(stream->codecpar->bit_rate);
+			info.video_bitrate_bps = stream->codecpar->bit_rate;
 		}
 
 		// Get audio info if available
@@ -244,7 +138,7 @@ namespace utils
 		{
 			const AVStream* stream = av_format_ctx->streams[audio_stream_index];
 			info.audio_av_codec_id = stream->codecpar->codec_id;
-			info.audio_bitrate_bps = static_cast<s32>(stream->codecpar->bit_rate);
+			info.audio_bitrate_bps = stream->codecpar->bit_rate;
 			info.sample_rate = stream->codecpar->sample_rate;
 		}
 
@@ -257,1382 +151,8 @@ namespace utils
 		}
 
 		avformat_close_input(&av_format_ctx);
+		avformat_free_context(av_format_ctx);
 
 		return { true, std::move(info) };
 	}
-
-	struct scoped_av
-	{
-		struct ctx
-		{
-			const AVCodec* codec = nullptr;
-			AVCodecContext* context = nullptr;
-			AVStream* stream = nullptr;
-			AVPacket* packet = nullptr;
-			AVFrame* frame = nullptr;
-		};
-
-		ctx audio{};
-		ctx video{};
-
-		AVFormatContext* format_context = nullptr;
-		SwrContext* swr = nullptr;
-		SwsContext* sws = nullptr;
-		std::function<void()> kill_callback = nullptr;
-
-		~scoped_av()
-		{
-			// Clean up
-			if (audio.frame)
-			{
-				av_frame_unref(audio.frame);
-				av_frame_free(&audio.frame);
-			}
-			if (video.frame)
-			{
-				av_frame_unref(video.frame);
-				av_frame_free(&video.frame);
-			}
-			free_packet(audio.packet);
-			free_packet(video.packet);
-			if (swr)
-				swr_free(&swr);
-			if (sws)
-				sws_freeContext(sws);
-			if (audio.context)
-				avcodec_free_context(&audio.context);
-			if (video.context)
-				avcodec_free_context(&video.context);
-			// AVCodec is managed by libavformat, no need to free it
-			// see: https://stackoverflow.com/a/18047320
-			if (format_context)
-				avformat_close_input(&format_context);
-			//if (stream)
-			//	av_free(stream);
-			if (kill_callback)
-				kill_callback();
-		}
-	};
-
-	static std::string channel_layout_name(const AVChannelLayout& ch_layout)
-	{
-		std::vector<char> ch_layout_buf(64);
-		int len = av_channel_layout_describe(&ch_layout, ch_layout_buf.data(), ch_layout_buf.size());
-		if (len < 0)
-		{
-			media_log.error("av_channel_layout_describe failed. Error: %d='%s'", len, av_error_to_string(len));
-			return {};
-		}
-
-		if (len > static_cast<int>(ch_layout_buf.size()))
-		{
-			// Try again with a bigger buffer
-			media_log.notice("av_channel_layout_describe needs a bigger buffer: len=%d", len);
-			ch_layout_buf.clear();
-			ch_layout_buf.resize(len);
-
-			len = av_channel_layout_describe(&ch_layout, ch_layout_buf.data(), ch_layout_buf.size());
-			if (len < 0)
-			{
-				media_log.error("av_channel_layout_describe failed. Error: %d='%s'", len, av_error_to_string(len));
-				return {};
-			}
-		}
-
-		return ch_layout_buf.data();
-	}
-
-	// check that a given sample format is supported by the encoder
-	static bool check_sample_fmt(const AVCodec* codec, enum AVSampleFormat sample_fmt)
-	{
-		if (!codec) return false;
-
-		for (const AVSampleFormat* p = codec->sample_fmts; p && *p != AV_SAMPLE_FMT_NONE; p++)
-		{
-			if (*p == sample_fmt)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	// just pick the highest supported samplerate
-	static int select_sample_rate(const AVCodec* codec)
-	{
-		if (!codec || !codec->supported_samplerates)
-			return 48000;
-
-		int best_samplerate = 0;
-		for (const int* samplerate = codec->supported_samplerates; samplerate && *samplerate != 0; samplerate++)
-		{
-			if (!best_samplerate || abs(48000 - *samplerate) < abs(48000 - best_samplerate))
-			{
-				best_samplerate = *samplerate;
-			}
-		}
-		return best_samplerate;
-	}
-
-	AVChannelLayout get_preferred_channel_layout(int channels)
-	{
-		switch (channels)
-		{
-		case 2:
-			return AV_CHANNEL_LAYOUT_STEREO;
-		case 6:
-			return AV_CHANNEL_LAYOUT_5POINT1;
-		case 8:
-			return AV_CHANNEL_LAYOUT_7POINT1;
-		default:
-			break;
-		}
-		return {};
-	}
-
-	static constexpr AVChannelLayout empty_ch_layout = {};
-
-	// select layout with the exact channel count
-	static const AVChannelLayout* select_channel_layout(const AVCodec* codec, int channels)
-	{
-		if (!codec) return nullptr;
-
-		const AVChannelLayout preferred_ch_layout = get_preferred_channel_layout(channels);
-		const AVChannelLayout* found_ch_layout = nullptr;
-
-		for (const AVChannelLayout* ch_layout = codec->ch_layouts;
-			 ch_layout && memcmp(ch_layout, &empty_ch_layout, sizeof(AVChannelLayout)) != 0;
-			 ch_layout++)
-		{
-			media_log.notice("select_channel_layout: listing channel layout '%s' with %d channels", channel_layout_name(*ch_layout), ch_layout->nb_channels);
-
-			if (ch_layout->nb_channels == channels && memcmp(ch_layout, &preferred_ch_layout, sizeof(AVChannelLayout)) == 0)
-			{
-				found_ch_layout = ch_layout;
-			}
-		}
-
-		return found_ch_layout;
-	}
-
-	audio_decoder::audio_decoder()
-	{
-	}
-
-	audio_decoder::~audio_decoder()
-	{
-		stop();
-	}
-
-	void audio_decoder::set_context(music_selection_context context)
-	{
-		m_context = std::move(context);
-	}
-
-	void audio_decoder::set_swap_endianness(bool swapped)
-	{
-		m_swap_endianness = swapped;
-	}
-
-	void audio_decoder::clear()
-	{
-		track_fully_decoded = 0;
-		track_fully_consumed = 0;
-		has_error = false;
-		m_size = 0;
-		timestamps_ms.clear();
-		data.clear();
-	}
-
-	void audio_decoder::stop()
-	{
-		if (m_thread)
-		{
-			auto& thread = *m_thread;
-			thread = thread_state::aborting;
-			track_fully_consumed = 1;
-			track_fully_consumed.notify_one();
-			thread();
-			m_thread.reset();
-		}
-
-		clear();
-	}
-
-	void audio_decoder::decode()
-	{
-		stop();
-
-		media_log.notice("audio_decoder: %d entries in playlist. Start decoding...", m_context.playlist.size());
-
-		const auto decode_track = [this](const std::string& path)
-		{
-			media_log.notice("audio_decoder: decoding %s", path);
-
-			// Only print FFMPEG errors, fatals and panics
-			av_log_set_callback(av_log_callback);
-			av_log_set_level(AV_LOG_ERROR);
-
-			scoped_av av;
-
-			// Get format from audio file
-			av.format_context = avformat_alloc_context();
-			if (int err = avformat_open_input(&av.format_context, path.c_str(), nullptr, nullptr); err < 0)
-			{
-				media_log.error("audio_decoder: Could not open file '%s'. Error: %d='%s'", path, err, av_error_to_string(err));
-				has_error = true;
-				return;
-			}
-			if (int err = avformat_find_stream_info(av.format_context, nullptr); err < 0)
-			{
-				media_log.error("audio_decoder: Could not retrieve stream info from file '%s'. Error: %d='%s'", path, err, av_error_to_string(err));
-				has_error = true;
-				return;
-			}
-
-			// Find the first audio stream
-			AVStream* stream = nullptr;
-			unsigned int stream_index;
-			for (stream_index = 0; stream_index < av.format_context->nb_streams; stream_index++)
-			{
-				if (av.format_context->streams[stream_index]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
-				{
-					stream = av.format_context->streams[stream_index];
-					break;
-				}
-			}
-			if (!stream)
-			{
-				media_log.error("audio_decoder: Could not retrieve audio stream from file '%s'", path);
-				has_error = true;
-				return;
-			}
-
-			// Find decoder
-			av.audio.codec = avcodec_find_decoder(stream->codecpar->codec_id);
-			if (!av.audio.codec)
-			{
-				media_log.error("audio_decoder: Failed to find decoder for stream #%u in file '%s'", stream_index, path);
-				has_error = true;
-				return;
-			}
-
-			// Allocate context
-			av.audio.context = avcodec_alloc_context3(av.audio.codec);
-			if (!av.audio.context)
-			{
-				media_log.error("audio_decoder: Failed to allocate context for stream #%u in file '%s'", stream_index, path);
-				has_error = true;
-				return;
-			}
-
-			// Open decoder
-			if (int err = avcodec_open2(av.audio.context, av.audio.codec, nullptr); err < 0)
-			{
-				media_log.error("audio_decoder: Failed to open decoder for stream #%u in file '%s'. Error: %d='%s'", stream_index, path, err, av_error_to_string(err));
-				has_error = true;
-				return;
-			}
-
-			// Prepare resampler
-			av.swr = swr_alloc();
-			if (!av.swr)
-			{
-				media_log.error("audio_decoder: Failed to allocate resampler for stream #%u in file '%s'", stream_index, path);
-				has_error = true;
-				return;
-			}
-
-			const int dst_channels = 2;
-			const AVChannelLayout dst_channel_layout = AV_CHANNEL_LAYOUT_STEREO;
-			const AVSampleFormat dst_format = AV_SAMPLE_FMT_FLT;
-
-			int set_err = 0;
-			if ((set_err = av_opt_set_int(av.swr, "in_channel_count", stream->codecpar->ch_layout.nb_channels, 0)) ||
-				(set_err = av_opt_set_int(av.swr, "out_channel_count", dst_channels, 0)) ||
-				(set_err = av_opt_set_chlayout(av.swr, "in_channel_layout", &stream->codecpar->ch_layout, 0)) ||
-				(set_err = av_opt_set_chlayout(av.swr, "out_channel_layout", &dst_channel_layout, 0)) ||
-				(set_err = av_opt_set_int(av.swr, "in_sample_rate", stream->codecpar->sample_rate, 0)) ||
-				(set_err = av_opt_set_int(av.swr, "out_sample_rate", sample_rate, 0)) ||
-				(set_err = av_opt_set_sample_fmt(av.swr, "in_sample_fmt", static_cast<AVSampleFormat>(stream->codecpar->format), 0)) ||
-				(set_err = av_opt_set_sample_fmt(av.swr, "out_sample_fmt", dst_format, 0)))
-			{
-				media_log.error("audio_decoder: Failed to set resampler options: Error: %d='%s'", set_err, av_error_to_string(set_err));
-				has_error = true;
-				return;
-			}
-
-			if (int err = swr_init(av.swr); err < 0 || !swr_is_initialized(av.swr))
-			{
-				media_log.error("audio_decoder: Resampler has not been properly initialized: %d='%s'", err, av_error_to_string(err));
-				has_error = true;
-				return;
-			}
-
-			// Prepare to read data
-			av.audio.frame = av_frame_alloc();
-			if (!av.audio.frame)
-			{
-				media_log.error("audio_decoder: Error allocating the frame");
-				has_error = true;
-				return;
-			}
-
-			AVPacket* packet = av_packet_alloc();
-			if (!packet)
-			{
-				media_log.error("audio_decoder: Error allocating the packet");
-				has_error = true;
-				return;
-			}
-
-			std::unique_ptr<AVPacket, decltype(free_packet)> packet_(packet);
-			bool is_first_error = true;
-
-			// Iterate through frames
-			while (thread_ctrl::state() != thread_state::aborting && av_read_frame(av.format_context, packet) >= 0)
-			{
-				if (int err = avcodec_send_packet(av.audio.context, packet); err < 0)
-				{
-					if (is_first_error)
-					{
-						is_first_error = false;
-
-						if (err == averror_invalid_data)
-						{
-							// Some mp3s contain some invalid data at the beginning of the stream. They work fine if we just ignore them.
-							// So let's skip the first invalid data error. Maybe there is a better way, but let's just roll with it for now.
-							media_log.warning("audio_decoder: Ignoring first error: %d='%s'", err, av_error_to_string(err));
-							continue;
-						}
-					}
-					media_log.error("audio_decoder: Queuing error: %d='%s'", err, av_error_to_string(err));
-					has_error = true;
-					return;
-				}
-
-				while (thread_ctrl::state() != thread_state::aborting)
-				{
-					if (int err = avcodec_receive_frame(av.audio.context, av.audio.frame); err < 0)
-					{
-						if (err == AVERROR(EAGAIN) || err == averror_eof)
-							break;
-
-						media_log.error("audio_decoder: Decoding error: %d='%s'", err, av_error_to_string(err));
-						has_error = true;
-						return;
-					}
-
-					// Resample frames
-					u8* buffer = nullptr;
-					const int align = 1;
-					const int buffer_size = av_samples_alloc(&buffer, nullptr, dst_channels, av.audio.frame->nb_samples, dst_format, align);
-					if (buffer_size < 0)
-					{
-						media_log.error("audio_decoder: Error allocating buffer: %d='%s'", buffer_size, av_error_to_string(buffer_size));
-						has_error = true;
-						return;
-					}
-
-					const int frame_count = swr_convert(av.swr, &buffer, av.audio.frame->nb_samples, const_cast<const uint8_t**>(av.audio.frame->data), av.audio.frame->nb_samples);
-					if (frame_count < 0)
-					{
-						media_log.error("audio_decoder: Error converting frame: %d='%s'", frame_count, av_error_to_string(frame_count));
-						has_error = true;
-						if (buffer)
-							av_freep(&buffer);
-						return;
-					}
-
-					// Append resampled frames to data
-					{
-						std::scoped_lock lock(m_mtx);
-						data.resize(m_size + buffer_size);
-
-						// The format is float 32bit per channel.
-						copy_samples<f32>(buffer, &data[m_size], buffer_size / sizeof(f32), m_swap_endianness);
-
-						const s64 timestamp_ms = stream->time_base.den ? (1000 * av.audio.frame->best_effort_timestamp * stream->time_base.num) / stream->time_base.den : 0;
-						timestamps_ms.push_back({m_size, timestamp_ms});
-						m_size += buffer_size;
-					}
-
-					if (buffer)
-						av_freep(&buffer);
-
-					media_log.notice("audio_decoder: decoded frame_count=%d buffer_size=%d timestamp_us=%d", frame_count, buffer_size, av.audio.frame->best_effort_timestamp);
-				}
-			}
-		};
-
-		m_thread = std::make_unique<named_thread<std::function<void()>>>("Music Decode Thread", [this, decode_track]()
-		{
-			for (const std::string& track : m_context.playlist)
-			{
-				media_log.notice("audio_decoder: playlist entry: %s", track);
-			}
-
-			if (m_context.playlist.empty())
-			{
-				media_log.error("audio_decoder: Can not play empty playlist");
-				has_error = true;
-				return;
-			}
-
-			m_context.current_track = m_context.first_track;
-
-			if (m_context.context_option == CELL_SEARCH_CONTEXTOPTION_SHUFFLE && m_context.playlist.size() > 1)
-			{
-				// Shuffle once if necessary
-				media_log.notice("audio_decoder: shuffling initial playlist...");
-				auto engine = std::default_random_engine{};
-				std::shuffle(std::begin(m_context.playlist), std::end(m_context.playlist), engine);
-			}
-
-			while (thread_ctrl::state() != thread_state::aborting)
-			{
-				media_log.notice("audio_decoder: about to decode: %s (index=%d)", ::at32(m_context.playlist, m_context.current_track), m_context.current_track);
-
-				decode_track(::at32(m_context.playlist, m_context.current_track));
-				track_fully_decoded = 1;
-
-				if (has_error)
-				{
-					media_log.notice("audio_decoder: stopping with error...");
-					break;
-				}
-
-				// Let's only decode one track at a time. Wait for the consumer to finish reading the track.
-				media_log.notice("audio_decoder: waiting until track is consumed...");
-				thread_ctrl::wait_on(track_fully_consumed, 0);
-				track_fully_consumed = false;
-			}
-
-			media_log.notice("audio_decoder: finished playlist");
-		});
-	}
-
-	u32 audio_decoder::set_next_index(bool next)
-	{
-		return m_context.step_track(next);
-	}
-
-	video_encoder::video_encoder()
-		: utils::video_sink()
-	{
-	}
-
-	video_encoder::~video_encoder()
-	{
-		stop();
-	}
-
-	std::string video_encoder::path() const
-	{
-		return m_path;
-	}
-
-	s64 video_encoder::last_video_pts() const
-	{
-		return m_last_video_pts;
-	}
-
-	void video_encoder::set_path(const std::string& path)
-	{
-		m_path = path;
-	}
-
-	void video_encoder::set_framerate(u32 framerate)
-	{
-		m_framerate = framerate;
-	}
-
-	void video_encoder::set_video_bitrate(u32 bitrate)
-	{
-		m_video_bitrate_bps = bitrate;
-	}
-
-	void video_encoder::set_output_format(video_encoder::frame_format format)
-	{
-		m_out_format = std::move(format);
-	}
-
-	void video_encoder::set_video_codec(s32 codec_id)
-	{
-		m_video_codec_id = codec_id;
-	}
-
-	void video_encoder::set_max_b_frames(s32 max_b_frames)
-	{
-		m_max_b_frames = max_b_frames;
-	}
-
-	void video_encoder::set_gop_size(s32 gop_size)
-	{
-		m_gop_size = gop_size;
-	}
-
-	void video_encoder::set_sample_rate(u32 sample_rate)
-	{
-		m_sample_rate = sample_rate;
-	}
-
-	void video_encoder::set_audio_channels(u32 channels)
-	{
-		m_channels = channels;
-	}
-
-	void video_encoder::set_audio_bitrate(u32 bitrate)
-	{
-		m_audio_bitrate_bps = bitrate;
-	}
-
-	void video_encoder::set_audio_codec(s32 codec_id)
-	{
-		m_audio_codec_id = codec_id;
-	}
-
-	void video_encoder::pause(bool flush)
-	{
-		if (m_thread)
-		{
-			m_paused = true;
-			m_flush = flush;
-
-			if (flush)
-			{
-				// Let's assume this will finish in a timely manner
-				while (m_flush && m_running)
-				{
-					std::this_thread::sleep_for(1us);
-				}
-			}
-		}
-	}
-
-	void video_encoder::stop(bool flush)
-	{
-		media_log.notice("video_encoder: Stopping video encoder. flush=%d", flush);
-
-		if (m_thread)
-		{
-			m_flush = flush;
-
-			if (flush)
-			{
-				// Let's assume this will finish in a timely manner
-				while (m_flush && m_running)
-				{
-					std::this_thread::sleep_for(1ms);
-				}
-			}
-
-			// Join thread
-			m_thread.reset();
-		}
-
-		std::scoped_lock lock(m_video_mtx, m_audio_mtx);
-		m_frames_to_encode.clear();
-		m_samples_to_encode.clear();
-		has_error = false;
-		m_flush = false;
-		m_paused = false;
-		m_running = false;
-	}
-
-	void video_encoder::resume()
-	{
-		media_log.notice("video_encoder: Resuming video encoder");
-
-		m_flush = false;
-		m_paused = false;
-	}
-
-	void video_encoder::encode()
-	{
-		if (m_running)
-		{
-			// Resume
-			resume();
-			media_log.success("video_encoder: resuming recording of '%s'", m_path);
-			return;
-		}
-
-		m_last_audio_pts = 0;
-		m_last_video_pts = 0;
-
-		stop();
-
-		if (const std::string dir = fs::get_parent_dir(m_path); !fs::is_dir(dir))
-		{
-			media_log.error("video_encoder: Could not find directory: '%s' for file '%s'", dir, m_path);
-			has_error = true;
-			return;
-		}
-
-		media_log.success("video_encoder: Starting recording of '%s'", m_path);
-
-		m_thread = std::make_unique<named_thread<std::function<void()>>>("Video Encode Thread", [this, path = m_path]()
-		{
-			m_running = true;
-
-			// Only print FFMPEG errors, fatals and panics
-			av_log_set_callback(av_log_callback);
-			av_log_set_level(AV_LOG_ERROR);
-
-			// Reset variables at all costs
-			scoped_av av;
-			av.kill_callback = [this]()
-			{
-				m_flush = false;
-				m_running = false;
-			};
-
-			// Let's list the encoders first
-			std::vector<const AVCodec*> audio_codecs;
-			std::vector<const AVCodec*> video_codecs;
-			void* opaque = nullptr;
-			while (const AVCodec* codec = av_codec_iterate(&opaque))
-			{
-				if (codec->type == AVMediaType::AVMEDIA_TYPE_AUDIO)
-				{
-					media_log.notice("video_encoder: Found audio codec %d = %s", static_cast<int>(codec->id), codec->name);
-					audio_codecs.push_back(codec);
-				}
-				else if (codec->type == AVMediaType::AVMEDIA_TYPE_VIDEO)
-				{
-					media_log.notice("video_encoder: Found video codec %d = %s", static_cast<int>(codec->id), codec->name);
-					video_codecs.push_back(codec);
-				}
-			}
-
-			const AVPixelFormat out_pix_format = static_cast<AVPixelFormat>(m_out_format.av_pixel_format);
-
-			const auto find_format = [&](AVCodecID video_codec, AVCodecID audio_codec) -> const AVOutputFormat*
-			{
-				// Try to find a preferable output format
-				std::vector<const AVOutputFormat*> oformats;
-
-				void* opaque = nullptr;
-				for (const AVOutputFormat* oformat = av_muxer_iterate(&opaque); !!oformat; oformat = av_muxer_iterate(&opaque))
-				{
-					media_log.notice("video_encoder: Listing output format '%s' (video_codec=%d, audio_codec=%d)", oformat->name, static_cast<int>(oformat->video_codec), static_cast<int>(oformat->audio_codec));
-					if (avformat_query_codec(oformat, video_codec, FF_COMPLIANCE_NORMAL) == 1 &&
-						avformat_query_codec(oformat, audio_codec, FF_COMPLIANCE_NORMAL) == 1)
-					{
-						oformats.push_back(oformat);
-					}
-				}
-
-				for (const AVOutputFormat* oformat : oformats)
-				{
-					if (!oformat) continue;
-					media_log.notice("video_encoder: Found compatible output format '%s' (video_codec=%d, audio_codec=%d)", oformat->name, static_cast<int>(oformat->video_codec), static_cast<int>(oformat->audio_codec));
-				}
-
-				// Select best match
-				for (const AVOutputFormat* oformat : oformats)
-				{
-					if (oformat && oformat->video_codec == video_codec && oformat->audio_codec == audio_codec)
-					{
-						media_log.notice("video_encoder: Using matching output format '%s' (video_codec=%d, audio_codec=%d)", oformat->name, static_cast<int>(oformat->video_codec), static_cast<int>(oformat->audio_codec));
-						return oformat;
-					}
-				}
-
-				// Fallback to first found format
-				if (const AVOutputFormat* oformat = oformats.empty() ? nullptr : oformats.front())
-				{
-					media_log.notice("video_encoder: Using suboptimal output format '%s' (video_codec=%d, audio_codec=%d)", oformat->name, static_cast<int>(oformat->video_codec), static_cast<int>(oformat->audio_codec));
-					return oformat;
-				}
-
-				return nullptr;
-			};
-
-			const AVCodecID video_codec = static_cast<AVCodecID>(m_video_codec_id);
-			const AVCodecID audio_codec = static_cast<AVCodecID>(m_audio_codec_id);
-			const AVOutputFormat* out_format = find_format(video_codec, audio_codec);
-
-			if (out_format)
-			{
-				media_log.success("video_encoder: Found requested output format '%s'", out_format->name);
-			}
-			else
-			{
-				media_log.error("video_encoder: Could not find a format for the requested video_codec %d and audio_codec %d", m_video_codec_id, m_audio_codec_id);
-
-				// Fallback to some other codec
-				for (const AVCodec* video_codec : video_codecs)
-				{
-					for (const AVCodec* audio_codec : audio_codecs)
-					{
-						out_format = find_format(video_codec->id, audio_codec->id);
-
-						if (out_format)
-						{
-							media_log.success("video_encoder: Found fallback output format '%s'", out_format->name);
-							break;
-						}
-					}
-
-					if (out_format)
-					{
-						break;
-					}
-				}
-			}
-
-			if (!out_format)
-			{
-				media_log.error("video_encoder: Could not find any output format");
-				has_error = true;
-				return;
-			}
-
-			if (int err = avformat_alloc_output_context2(&av.format_context, out_format, nullptr, nullptr); err < 0)
-			{
-				media_log.error("video_encoder: avformat_alloc_output_context2 for '%s' failed. Error: %d='%s'", out_format->name, err, av_error_to_string(err));
-				has_error = true;
-				return;
-			}
-
-			if (!av.format_context)
-			{
-				media_log.error("video_encoder: avformat_alloc_output_context2 failed");
-				has_error = true;
-				return;
-			}
-
-			const auto create_context = [this, &av](bool is_video) -> bool
-			{
-				const std::string type = is_video ? "video" : "audio";
-				scoped_av::ctx& ctx = is_video ? av.video : av.audio;
-
-				if (is_video)
-				{
-					if (!(ctx.codec = avcodec_find_encoder(av.format_context->oformat->video_codec)))
-					{
-						media_log.error("video_encoder: avcodec_find_encoder for video failed. video_codec=%d", static_cast<int>(av.format_context->oformat->video_codec));
-						return false;
-					}
-				}
-				else
-				{
-					if (!(ctx.codec = avcodec_find_encoder(av.format_context->oformat->audio_codec)))
-					{
-						media_log.error("video_encoder: avcodec_find_encoder for audio failed. audio_codec=%d", static_cast<int>(av.format_context->oformat->audio_codec));
-						return false;
-					}
-				}
-
-				if (!(ctx.stream = avformat_new_stream(av.format_context, nullptr)))
-				{
-					media_log.error("video_encoder: avformat_new_stream for %s failed", type);
-					return false;
-				}
-
-				ctx.stream->id = is_video ? 0 : 1;
-
-				if (!(ctx.context = avcodec_alloc_context3(ctx.codec)))
-				{
-					media_log.error("video_encoder: avcodec_alloc_context3 for %s failed", type);
-					return false;
-				}
-
-				if (av.format_context->oformat->flags & AVFMT_GLOBALHEADER)
-				{
-					ctx.context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-				}
-
-				return true;
-			};
-
-			if (!create_context(true))
-			{
-				has_error = true;
-				return;
-			}
-
-			if (!create_context(false))
-			{
-				has_error = true;
-				return;
-			}
-
-			media_log.notice("video_encoder: using audio_codec = %d", static_cast<int>(av.format_context->oformat->audio_codec));
-			media_log.notice("video_encoder: using sample_rate = %d", m_sample_rate);
-			media_log.notice("video_encoder: using audio_bitrate = %d", m_audio_bitrate_bps);
-			media_log.notice("video_encoder: using audio channels = %d", m_channels);
-			media_log.notice("video_encoder: using video_codec = %d", static_cast<int>(av.format_context->oformat->video_codec));
-			media_log.notice("video_encoder: using video_bitrate = %d", m_video_bitrate_bps);
-			media_log.notice("video_encoder: using out width = %d", m_out_format.width);
-			media_log.notice("video_encoder: using out height = %d", m_out_format.height);
-			media_log.notice("video_encoder: using framerate = %d", m_framerate);
-			media_log.notice("video_encoder: using gop_size = %d", m_gop_size);
-			media_log.notice("video_encoder: using max_b_frames = %d", m_max_b_frames);
-
-			// select audio parameters supported by the encoder
-			if (av.audio.context)
-			{
-				if (const AVChannelLayout* ch_layout = select_channel_layout(av.audio.codec, m_channels))
-				{
-					media_log.notice("video_encoder: found channel layout '%s' with %d channels", channel_layout_name(*ch_layout), ch_layout->nb_channels);
-
-					if (int err = av_channel_layout_copy(&av.audio.context->ch_layout, ch_layout); err != 0)
-					{
-						media_log.error("video_encoder: av_channel_layout_copy failed. Error: %d='%s'", err, av_error_to_string(err));
-						has_error = true;
-						return;
-					}
-				}
-				else
-				{
-					media_log.notice("video_encoder: select_channel_layout returned nullptr, trying with own layout...");
-
-					const AVChannelLayout new_ch_layout = get_preferred_channel_layout(m_channels);
-
-					if (memcmp(&new_ch_layout, &empty_ch_layout, sizeof(AVChannelLayout)) == 0)
-					{
-						media_log.error("video_encoder: unsupported audio channel count: %d", m_channels);
-						has_error = true;
-						return;
-					}
-
-					if (int err = av_channel_layout_copy(&av.audio.context->ch_layout, &new_ch_layout); err != 0)
-					{
-						media_log.error("video_encoder: av_channel_layout_copy failed. Error: %d='%s'", err, av_error_to_string(err));
-						has_error = true;
-						return;
-					}
-				}
-
-				m_sample_rate = select_sample_rate(av.audio.codec);
-
-				av.audio.context->codec_id = av.format_context->oformat->audio_codec;
-				av.audio.context->codec_type = AVMEDIA_TYPE_AUDIO;
-				av.audio.context->bit_rate = m_audio_bitrate_bps;
-				av.audio.context->sample_rate = m_sample_rate;
-				av.audio.context->time_base = {.num = 1, .den = av.audio.context->sample_rate};
-				av.audio.context->sample_fmt = AV_SAMPLE_FMT_FLTP; // AV_SAMPLE_FMT_FLT is not supported in regular AC3
-				av.audio.stream->time_base = av.audio.context->time_base;
-
-				// check that the encoder supports the format
-				if (!check_sample_fmt(av.audio.codec, av.audio.context->sample_fmt))
-				{
-					media_log.error("video_encoder: Audio encoder does not support sample format %s", av_get_sample_fmt_name(av.audio.context->sample_fmt));
-					has_error = true;
-					return;
-				}
-
-				if (int err = avcodec_open2(av.audio.context, av.audio.codec, nullptr); err != 0)
-				{
-					media_log.error("video_encoder: avcodec_open2 for audio failed. Error: %d='%s'", err, av_error_to_string(err));
-					has_error = true;
-					return;
-				}
-
-				if (!(av.audio.packet = av_packet_alloc()))
-				{
-					media_log.error("video_encoder: av_packet_alloc for audio packet failed");
-					has_error = true;
-					return;
-				}
-
-				if (!(av.audio.frame = av_frame_alloc()))
-				{
-					media_log.error("video_encoder: av_frame_alloc for audio frame failed");
-					has_error = true;
-					return;
-				}
-
-				av.audio.frame->format = AV_SAMPLE_FMT_FLTP;
-				av.audio.frame->nb_samples = av.audio.context->frame_size;
-
-				if (int err = av_channel_layout_copy(&av.audio.frame->ch_layout, &av.audio.context->ch_layout); err < 0)
-				{
-					media_log.error("video_encoder: av_channel_layout_copy for audio frame failed. Error: %d='%s'", err, av_error_to_string(err));
-					has_error = true;
-					return;
-				}
-
-				if (int err = av_frame_get_buffer(av.audio.frame, 0); err < 0)
-				{
-					media_log.error("video_encoder: av_frame_get_buffer for audio frame failed. Error: %d='%s'", err, av_error_to_string(err));
-					has_error = true;
-					return;
-				}
-
-				if (int err = avcodec_parameters_from_context(av.audio.stream->codecpar, av.audio.context); err < 0)
-				{
-					media_log.error("video_encoder: avcodec_parameters_from_context for audio failed. Error: %d='%s'", err, av_error_to_string(err));
-					has_error = true;
-					return;
-				}
-
-				// Log channel layout
-				media_log.notice("video_encoder: av_channel_layout='%s'", channel_layout_name(av.audio.frame->ch_layout));
-			}
-
-			// select video parameters supported by the encoder
-			if (av.video.context)
-			{
-				av.video.context->codec_id = av.format_context->oformat->video_codec;
-				av.video.context->codec_type = AVMEDIA_TYPE_VIDEO;
-				av.video.context->bit_rate = m_video_bitrate_bps;
-				av.video.context->width = static_cast<int>(m_out_format.width);
-				av.video.context->height = static_cast<int>(m_out_format.height);
-				av.video.context->time_base = {.num = 1, .den = static_cast<int>(m_framerate)};
-				av.video.context->framerate = {.num = static_cast<int>(m_framerate), .den = 1};
-				av.video.context->pix_fmt = out_pix_format;
-				av.video.context->gop_size = m_gop_size;
-				av.video.context->max_b_frames = m_max_b_frames;
-				av.video.stream->time_base = av.video.context->time_base;
-
-				if (int err = avcodec_open2(av.video.context, av.video.codec, nullptr); err != 0)
-				{
-					media_log.error("video_encoder: avcodec_open2 for video failed. Error: %d='%s'", err, av_error_to_string(err));
-					has_error = true;
-					return;
-				}
-
-				if (!(av.video.packet = av_packet_alloc()))
-				{
-					media_log.error("video_encoder: av_packet_alloc for video packet failed");
-					has_error = true;
-					return;
-				}
-
-				if (!(av.video.frame = av_frame_alloc()))
-				{
-					media_log.error("video_encoder: av_frame_alloc for video frame failed");
-					has_error = true;
-					return;
-				}
-
-				av.video.frame->format = av.video.context->pix_fmt;
-				av.video.frame->width = av.video.context->width;
-				av.video.frame->height = av.video.context->height;
-
-				if (int err = av_frame_get_buffer(av.video.frame, 0); err < 0)
-				{
-					media_log.error("video_encoder: av_frame_get_buffer for video frame failed. Error: %d='%s'", err, av_error_to_string(err));
-					has_error = true;
-					return;
-				}
-
-				if (int err = avcodec_parameters_from_context(av.video.stream->codecpar, av.video.context); err < 0)
-				{
-					media_log.error("video_encoder: avcodec_parameters_from_context for video failed. Error: %d='%s'", err, av_error_to_string(err));
-					has_error = true;
-					return;
-				}
-			}
-
-			media_log.notice("video_encoder: av_dump_format");
-			for (u32 i = 0; i < av.format_context->nb_streams; i++)
-			{
-				av_dump_format(av.format_context, i, path.c_str(), 1);
-			}
-
-			// open the output file, if needed
-			if (!(av.format_context->flags & AVFMT_NOFILE))
-			{
-				if (int err = avio_open(&av.format_context->pb, path.c_str(), AVIO_FLAG_WRITE); err != 0)
-				{
-					media_log.error("video_encoder: avio_open failed. Error: %d='%s'", err, av_error_to_string(err));
-					has_error = true;
-					return;
-				}
-			}
-
-			if (int err = avformat_write_header(av.format_context, nullptr); err < 0)
-			{
-				media_log.error("video_encoder: avformat_write_header failed. Error: %d='%s'", err, av_error_to_string(err));
-
-				if (int err = avio_closep(&av.format_context->pb); err != 0)
-				{
-					media_log.error("video_encoder: avio_closep failed. Error: %d='%s'", err, av_error_to_string(err));
-				}
-
-				has_error = true;
-				return;
-			}
-
-			const auto flush = [&](scoped_av::ctx& ctx)
-			{
-				while ((thread_ctrl::state() != thread_state::aborting || m_flush) && !has_error && ctx.context)
-				{
-					if (int err = avcodec_receive_packet(ctx.context, ctx.packet); err < 0)
-					{
-						if (err == AVERROR(EAGAIN) || err == averror_eof)
-							break;
-
-						media_log.error("video_encoder: avcodec_receive_packet failed. Error: %d='%s'", err, av_error_to_string(err));
-						has_error = true;
-						return;
-					}
-
-					av_packet_rescale_ts(ctx.packet, ctx.context->time_base, ctx.stream->time_base);
-					ctx.packet->stream_index = ctx.stream->index;
-
-					if (int err = av_interleaved_write_frame(av.format_context, ctx.packet); err < 0)
-					{
-						media_log.error("video_encoder: av_write_frame failed. Error: %d='%s'", err, av_error_to_string(err));
-						has_error = true;
-						return;
-					}
-				}
-			};
-
-			u32 audio_sample_remainder = 0;
-			s64 last_audio_pts = -1;
-			s64 last_audio_frame_pts = 0;
-			s64 last_video_pts = -1;
-
-			// Allocate audio buffer for our audio frame
-			std::vector<u8> audio_frame;
-			u32 audio_frame_sample_count = 0;
-			const bool sample_fmt_is_planar = av.audio.context && av_sample_fmt_is_planar(av.audio.context->sample_fmt) != 0;
-			const int sample_fmt_bytes = av.audio.context ? av_get_bytes_per_sample(av.audio.context->sample_fmt) : 0;
-			ensure(sample_fmt_bytes == sizeof(f32)); // We only support FLT or FLTP for now
-
-			if (av.audio.frame)
-			{
-				audio_frame.resize(av.audio.frame->nb_samples * av.audio.frame->ch_layout.nb_channels * sizeof(f32));
-				last_audio_frame_pts -= av.audio.frame->nb_samples;
-			}
-
-			encoder_sample last_samples;
-			u32 leftover_sample_count = 0;
-
-			while ((thread_ctrl::state() != thread_state::aborting || m_flush) && !has_error)
-			{
-				// Fetch video frame
-				encoder_frame frame_data;
-				bool got_frame = false;
-				{
-					m_video_mtx.lock();
-
-					if (m_frames_to_encode.empty())
-					{
-						m_video_mtx.unlock();
-					}
-					else
-					{
-						frame_data = std::move(m_frames_to_encode.front());
-						m_frames_to_encode.pop_front();
-						m_video_mtx.unlock();
-
-						got_frame = true;
-
-						// Calculate presentation timestamp.
-						const s64 pts = get_pts(frame_data.timestamp_ms);
-
-						// We need to skip this frame if it has the same timestamp.
-						if (pts <= last_video_pts)
-						{
-							media_log.trace("video_encoder: skipping frame. last_pts=%d, pts=%d, timestamp_ms=%d", last_video_pts, pts, frame_data.timestamp_ms);
-						}
-						else if (av.video.context)
-						{
-							media_log.trace("video_encoder: adding new frame. timestamp_ms=%d", frame_data.timestamp_ms);
-
-							if (int err = av_frame_make_writable(av.video.frame); err < 0)
-							{
-								media_log.error("video_encoder: av_frame_make_writable failed. Error: %d='%s'", err, av_error_to_string(err));
-								has_error = true;
-								break;
-							}
-
-							u8* in_data[4]{};
-							int in_line[4]{};
-
-							const AVPixelFormat in_format = static_cast<AVPixelFormat>(frame_data.av_pixel_format);
-
-							if (int ret = av_image_fill_linesizes(in_line, in_format, frame_data.width); ret < 0)
-							{
-								fmt::throw_exception("video_encoder: av_image_fill_linesizes failed (ret=0x%x): %s", ret, utils::av_error_to_string(ret));
-							}
-
-							if (int ret = av_image_fill_pointers(in_data, in_format, frame_data.height, frame_data.data.data(), in_line); ret < 0)
-							{
-								fmt::throw_exception("video_encoder: av_image_fill_pointers failed (ret=0x%x): %s", ret, utils::av_error_to_string(ret));
-							}
-
-							// Update the context in case the frame format has changed
-							av.sws = sws_getCachedContext(av.sws, frame_data.width, frame_data.height, in_format,
-							                              av.video.context->width, av.video.context->height, out_pix_format, SWS_BICUBIC, nullptr, nullptr, nullptr);
-							if (!av.sws)
-							{
-								media_log.error("video_encoder: sws_getCachedContext failed");
-								has_error = true;
-								break;
-							}
-
-							if (int err = sws_scale(av.sws, in_data, in_line, 0, frame_data.height, av.video.frame->data, av.video.frame->linesize); err < 0)
-							{
-								media_log.error("video_encoder: sws_scale failed. Error: %d='%s'", err, av_error_to_string(err));
-								has_error = true;
-								break;
-							}
-
-							av.video.frame->pts = pts;
-
-							if (int err = avcodec_send_frame(av.video.context, av.video.frame); err < 0)
-							{
-								media_log.error("video_encoder: avcodec_send_frame for video failed. Error: %d='%s'", err, av_error_to_string(err));
-								has_error = true;
-								break;
-							}
-
-							flush(av.video);
-
-							last_video_pts = av.video.frame->pts;
-							m_last_video_pts = last_video_pts;
-						}
-					}
-				}
-
-				// Fetch audio sample
-				encoder_sample sample_data;
-				bool got_sample = false;
-				{
-					m_audio_mtx.lock();
-
-					if (m_samples_to_encode.empty())
-					{
-						m_audio_mtx.unlock();
-					}
-					else
-					{
-						sample_data = std::move(m_samples_to_encode.front());
-						m_samples_to_encode.pop_front();
-						m_audio_mtx.unlock();
-
-						got_sample = true;
-
-						if (sample_data.channels != av.audio.frame->ch_layout.nb_channels)
-						{
-							fmt::throw_exception("video_encoder: Audio sample channel count %d does not match frame channel count %d", sample_data.channels, av.audio.frame->ch_layout.nb_channels);
-						}
-
-						// Calculate presentation timestamp.
-						const s64 pts = get_audio_pts(sample_data.timestamp_us);
-
-						// We need to skip this frame if it has the same timestamp.
-						if (pts <= last_audio_pts)
-						{
-							media_log.trace("video_encoder: skipping sample. last_pts=%d, pts=%d, timestamp_us=%d", last_audio_pts, pts, sample_data.timestamp_us);
-						}
-						else if (av.audio.context)
-						{
-							media_log.trace("video_encoder: adding new sample. timestamp_us=%d", sample_data.timestamp_us);
-
-							static constexpr bool swap_endianness = false;
-
-							const auto send_frame = [&]()
-							{
-								if (audio_frame_sample_count < static_cast<u32>(av.audio.frame->nb_samples))
-								{
-									return;
-								}
-
-								audio_frame_sample_count = 0;
-
-								if (int err = av_frame_make_writable(av.audio.frame); err < 0)
-								{
-									media_log.error("video_encoder: av_frame_make_writable failed. Error: %d='%s'", err, av_error_to_string(err));
-									has_error = true;
-									return;
-								}
-
-								// NOTE: The ffmpeg channel layout should match our downmix channel layout
-								if (sample_fmt_is_planar)
-								{
-									const int channels = av.audio.frame->ch_layout.nb_channels;
-									const int samples = av.audio.frame->nb_samples;
-
-									for (int ch = 0; ch < channels; ch++)
-									{
-										f32* dst = reinterpret_cast<f32*>(av.audio.frame->data[ch]);
-
-										for (int sample = 0; sample < samples; sample++)
-										{
-											dst[sample] = *reinterpret_cast<f32*>(&audio_frame[(sample * channels + ch) * sizeof(f32)]);
-										}
-									}
-								}
-								else
-								{
-									std::memcpy(av.audio.frame->data[0], audio_frame.data(), audio_frame.size());
-								}
-
-								av.audio.frame->pts = last_audio_frame_pts + av.audio.frame->nb_samples;
-
-								if (int err = avcodec_send_frame(av.audio.context, av.audio.frame); err < 0)
-								{
-									media_log.error("video_encoder: avcodec_send_frame failed: %d='%s'", err, av_error_to_string(err));
-									has_error = true;
-									return;
-								}
-
-								flush(av.audio);
-
-								last_audio_frame_pts = av.audio.frame->pts;
-							};
-
-							const auto add_encoder_sample = [&](bool add_new_sample, u32 silence_to_add = 0)
-							{
-								const auto update_last_pts = [&](u32 samples_to_add)
-								{
-									const u32 sample_count = audio_sample_remainder + samples_to_add;
-									const u32 pts_to_add = sample_count / m_samples_per_block;
-									audio_sample_remainder = sample_count % m_samples_per_block;
-									last_audio_pts += pts_to_add;
-								};
-
-								// Copy as many old samples to our audio frame as possible
-								if (leftover_sample_count > 0)
-								{
-									const u32 samples_to_add = std::min(leftover_sample_count, av.audio.frame->nb_samples - audio_frame_sample_count);
-
-									if (samples_to_add > 0)
-									{
-										const u8* src = &last_samples.data[(last_samples.sample_count - leftover_sample_count) * last_samples.channels * sizeof(f32)];
-										u8* dst = &audio_frame[audio_frame_sample_count * last_samples.channels * sizeof(f32)];
-										copy_samples<f32>(src, dst, samples_to_add * last_samples.channels, swap_endianness);
-										audio_frame_sample_count += samples_to_add;
-										leftover_sample_count -= samples_to_add;
-										update_last_pts(samples_to_add);
-									}
-
-									if (samples_to_add < leftover_sample_count)
-									{
-										media_log.error("video_encoder: audio frame buffer is already filled entirely by last sample package...");
-									}
-								}
-								else if (silence_to_add > 0)
-								{
-									const u32 samples_to_add = std::min<s32>(silence_to_add, av.audio.frame->nb_samples - audio_frame_sample_count);
-
-									if (samples_to_add > 0)
-									{
-										u8* dst = &audio_frame[audio_frame_sample_count * av.audio.frame->ch_layout.nb_channels * sizeof(f32)];
-										std::memset(dst, 0, samples_to_add * sample_data.channels * sizeof(f32));
-										audio_frame_sample_count += samples_to_add;
-										update_last_pts(samples_to_add);
-									}
-								}
-								else if (add_new_sample)
-								{
-									// Copy as many new samples to our audio frame as possible
-									const u32 samples_to_add = std::min<s32>(sample_data.sample_count, av.audio.frame->nb_samples - audio_frame_sample_count);
-
-									if (samples_to_add > 0)
-									{
-										const u8* src = sample_data.data.data();
-										u8* dst = &audio_frame[audio_frame_sample_count * sample_data.channels * sizeof(f32)];
-										copy_samples<f32>(src, dst, samples_to_add * sample_data.channels, swap_endianness);
-										audio_frame_sample_count += samples_to_add;
-										update_last_pts(samples_to_add);
-									}
-
-									if (samples_to_add < sample_data.sample_count)
-									{
-										// Save this sample package for the next loop if it wasn't fully used.
-										leftover_sample_count = sample_data.sample_count - samples_to_add;
-									}
-									else
-									{
-										// Mark this sample package as fully used.
-										leftover_sample_count = 0;
-									}
-
-									last_samples = std::move(sample_data);
-								}
-
-								send_frame();
-							};
-
-							for (u32 sample = 0; !has_error;)
-							{
-								if (leftover_sample_count > 0)
-								{
-									// Add leftover samples
-									add_encoder_sample(false);
-								}
-								else if (pts > (last_audio_pts + 1))
-								{
-									// Add silence to fill the gap
-									const u32 silence_to_add = static_cast<u32>(pts - (last_audio_pts + 1));
-									add_encoder_sample(false, silence_to_add);
-								}
-								else if (sample == 0)
-								{
-									// Add new samples
-									add_encoder_sample(true);
-									sample++;
-								}
-								else
-								{
-									break;
-								}
-							}
-
-							m_last_audio_pts = last_audio_pts;
-						}
-					}
-				}
-
-				if (!got_frame && !got_sample)
-				{
-					if (m_flush)
-					{
-						m_flush = false;
-
-						if (!m_paused)
-						{
-							// We only stop the thread after a flush if we are not paused
-							break;
-						}
-					}
-
-					// We only actually pause after we process all frames
-					const u64 sleeptime_us = m_paused ? 10000 : 1;
-					thread_ctrl::wait_for(sleeptime_us);
-					continue;
-				}
-			}
-
-			if (av.video.context)
-			{
-				if (int err = avcodec_send_frame(av.video.context, nullptr); err != 0)
-				{
-					media_log.error("video_encoder: final avcodec_send_frame failed. Error: %d='%s'", err, av_error_to_string(err));
-				}
-			}
-
-			if (av.audio.context)
-			{
-				if (int err = avcodec_send_frame(av.audio.context, nullptr); err != 0)
-				{
-					media_log.error("video_encoder: final avcodec_send_frame failed. Error: %d='%s'", err, av_error_to_string(err));
-				}
-			}
-
-			flush(av.video);
-			flush(av.audio);
-
-			if (int err = av_write_trailer(av.format_context); err != 0)
-			{
-				media_log.error("video_encoder: av_write_trailer failed. Error: %d='%s'", err, av_error_to_string(err));
-			}
-
-			if (int err = avio_closep(&av.format_context->pb); err != 0)
-			{
-				media_log.error("video_encoder: avio_closep failed. Error: %d='%s'", err, av_error_to_string(err));
-			}
-		});
-	}
 }
diff --git a/rpcs3/util/media_utils.h b/rpcs3/util/media_utils.h
index 471bda63ae..2e95397398 100644
--- a/rpcs3/util/media_utils.h
+++ b/rpcs3/util/media_utils.h
@@ -1,41 +1,17 @@
 #pragma once
 
-#include "Utilities/StrUtil.h"
-#include "Utilities/Thread.h"
-#include "util/video_sink.h"
-#include "Emu/Cell/Modules/cellMusic.h"
-
 #include <unordered_map>
-#include <deque>
 
 namespace utils
 {
-	std::string av_error_to_string(int error);
-
-	struct ffmpeg_codec
-	{
-		int codec_id{};
-		std::string name;
-		std::string long_name;
-	};
-
-	std::vector<ffmpeg_codec> list_ffmpeg_decoders();
-	std::vector<ffmpeg_codec> list_ffmpeg_encoders();
-
 	struct media_info
 	{
-		std::string path;
-		std::string sub_type; // The sub type if available (png, jpg...)
-
 		s32 audio_av_codec_id = 0; // 0 = AV_CODEC_ID_NONE
 		s32 video_av_codec_id = 0; // 0 = AV_CODEC_ID_NONE
 		s32 audio_bitrate_bps = 0; // Bit rate in bit/s
 		s32 video_bitrate_bps = 0; // Bit rate in bit/s
 		s32 sample_rate = 0; // Samples per second
 		s64 duration_us = 0; // in AV_TIME_BASE fractional seconds (= microseconds)
-		s32 width = 0;  // Width if available
-		s32 height = 0; // Height if available
-		s32 orientation = 0; // Orientation if available (= CellSearchOrientation)
 
 		std::unordered_map<std::string, std::string> metadata;
 
@@ -45,103 +21,4 @@ namespace utils
 	};
 
 	std::pair<bool, media_info> get_media_info(const std::string& path, s32 av_media_type);
-
-	template <typename D>
-	void parse_metadata(D& dst, const utils::media_info& mi, const std::string& key, const std::string& def, usz max_length)
-	{
-		std::string value = mi.get_metadata<std::string>(key, def);
-		if (value.size() > max_length)
-		{
-			value.resize(max_length);
-		}
-		strcpy_trunc(dst, value);
-	};
-
-	class audio_decoder
-	{
-	public:
-		audio_decoder();
-		~audio_decoder();
-
-		void set_context(music_selection_context context);
-		void set_swap_endianness(bool swapped);
-		void clear();
-		void stop();
-		void decode();
-		u32 set_next_index(bool next);
-
-		shared_mutex m_mtx;
-		static constexpr s32 sample_rate = 48000;
-		std::vector<u8> data;
-		atomic_t<u64> m_size = 0;
-		atomic_t<u32> track_fully_decoded{0};
-		atomic_t<u32> track_fully_consumed{0};
-		atomic_t<bool> has_error{false};
-		std::deque<std::pair<u64, u64>> timestamps_ms;
-
-	private:
-		bool m_swap_endianness = false;
-		music_selection_context m_context{};
-		std::unique_ptr<named_thread<std::function<void()>>> m_thread;
-	};
-
-	class video_encoder : public utils::video_sink
-	{
-	public:
-		video_encoder();
-		~video_encoder();
-
-		struct frame_format
-		{
-			s32 av_pixel_format = 0; // NOTE: Make sure this is a valid AVPixelFormat
-			u32 width = 0;
-			u32 height = 0;
-			u32 pitch = 0;
-
-			std::string to_string() const
-			{
-				return fmt::format("{ av_pixel_format=%d, width=%d, height=%d, pitch=%d }", av_pixel_format, width, height, pitch);
-			}
-		};
-
-		std::string path() const;
-		s64 last_video_pts() const;
-
-		void set_path(const std::string& path);
-		void set_framerate(u32 framerate);
-		void set_video_bitrate(u32 bitrate);
-		void set_output_format(frame_format format);
-		void set_video_codec(s32 codec_id);
-		void set_max_b_frames(s32 max_b_frames);
-		void set_gop_size(s32 gop_size);
-		void set_sample_rate(u32 sample_rate);
-		void set_audio_channels(u32 channels);
-		void set_audio_bitrate(u32 bitrate);
-		void set_audio_codec(s32 codec_id);
-		void pause(bool flush = true) override;
-		void stop(bool flush = true) override;
-		void resume() override;
-		void encode();
-
-	private:
-		std::string m_path;
-		s64 m_last_audio_pts = 0;
-		s64 m_last_video_pts = 0;
-
-		// Thread control
-		std::unique_ptr<named_thread<std::function<void()>>> m_thread;
-		atomic_t<bool> m_running = false;
-
-		// Video parameters
-		u32 m_video_bitrate_bps = 0;
-		s32 m_video_codec_id = 12; // AV_CODEC_ID_MPEG4
-		s32 m_max_b_frames = 2;
-		s32 m_gop_size = 12;
-		frame_format m_out_format{};
-
-		// Audio parameters
-		u32 m_channels = 2;
-		u32 m_audio_bitrate_bps = 320000;
-		s32 m_audio_codec_id = 86018; // AV_CODEC_ID_AAC
-	};
 }
diff --git a/rpcs3/util/serialization.hpp b/rpcs3/util/serialization.hpp
index 41f6e560af..9feec519a6 100644
--- a/rpcs3/util/serialization.hpp
+++ b/rpcs3/util/serialization.hpp
@@ -3,189 +3,83 @@
 #include "util/types.hpp"
 #include <vector>
 
+namespace stx
+{
+	template <typename T>
+	struct exact_t
+	{
+		T obj;
+
+		exact_t(T&& _obj) : obj(std::forward<T>(_obj)) {}
+
+		// TODO: More conversions
+		template <typename U> requires (std::is_same_v<U&, T>)
+		operator U&() const { return obj; };
+	};
+}
+
 namespace utils
 {
 	template <typename T>
-	concept FastRandomAccess = requires (const T& obj)
+	concept FastRandomAccess = requires (T& obj)
 	{
-		std::data(obj)[std::size(obj)];
+		std::data(obj)[0];
 	};
 
 	template <typename T>
 	concept Reservable = requires (T& obj)
 	{
-		obj.reserve(std::size(obj));
+		obj.reserve(0);
 	};
 
 	template <typename T>
-	concept Bitcopy = (std::is_arithmetic_v<T>) || (std::is_enum_v<T>) || Integral<T> || typename T::enable_bitcopy()();
-
-	template <typename T>
-	concept TupleAlike = (!FastRandomAccess<T>) && requires ()
+	concept Bitcopy = (std::is_arithmetic_v<T>) || (std::is_enum_v<T>) || Integral<T> || requires ()
 	{
-		std::tuple_size<std::remove_cvref_t<T>>::value;
+		std::enable_if_t<std::conjunction_v<typename T::enable_bitcopy>>();
 	};
 
 	template <typename T>
-
-	concept ListAlike = requires(std::remove_cvref_t<T>& obj, T::value_type item) { obj.insert(obj.end(), std::move(item)); };
-	struct serial;
-
-	struct serialization_file_handler
+	concept TupleAlike = requires ()
 	{
-		serialization_file_handler() = default;
-		virtual ~serialization_file_handler() = default;
-
-		// Handle read/write operations
-		virtual bool handle_file_op(serial& ar, usz pos, usz size, const void* data = nullptr) = 0;
-
-		// Obtain data size (targets to be only higher than 'recommended' and thus may not be accurate)
-		virtual usz get_size(const utils::serial& /*ar*/, usz /*recommended*/) const
-		{
-			return 0;
-		}
-
-		// Skip reading some (compressed) data
-		virtual void skip_until(utils::serial& /*ar*/)
-		{
-		}
-
-		// Detect empty stream (TODO: Clean this, instead perhaps use a magic static representing empty stream)
-		virtual bool is_null() const
-		{
-			return false;
-		}
-
-		virtual void finalize_block(utils::serial& /*ar*/)
-		{
-		}
-
-		virtual bool is_valid() const
-		{
-			return true;
-		}
-
-		virtual void finalize(utils::serial&) = 0;
+		std::tuple_size<std::remove_cv_t<T>>::value;
 	};
 
+	template <typename T>
+	concept ListAlike = requires (T& obj) { obj.insert(obj.end(), std::declval<typename T::value_type>()); };
+
 	struct serial
 	{
-private:
-		bool m_is_writing = true;
-		bool m_expect_little_data = false;
-public:
 		std::vector<u8> data;
-		usz data_offset = 0;
-		usz pos = 0;
-		usz m_max_data = umax;
-		std::unique_ptr<serialization_file_handler> m_file_handler;
+		usz pos = umax;
 
-		serial() noexcept = default;
-		serial(const serial&) = delete;
-		serial& operator=(const serial&) = delete;
-		explicit serial(serial&&) noexcept = default;
-		serial& operator=(serial&&) noexcept = default;
-		~serial() noexcept = default;
-
-		// Checks if this instance is currently used for serialization
+		// Checks if this strcuture is currently used for serialization
 		bool is_writing() const
 		{
-			return m_is_writing;
-		}
-
-		void add_padding(usz padding)
-		{
-			if (m_is_writing) return;
-			pos += padding;
-		}
-
-		// Add padding needed between two members
-		template <typename T, typename T2, typename T3>
-		void add_padding(T T2::*const first, T3 T2::*const second)
-		{
-			if (m_is_writing) return;
-
-			const u32 offset1 = ::offset32(first) + sizeof(T);
-			const u32 offset2 = ::offset32(second);
-
-			AUDIT(::offset32(first) <= ::offset32(second));
-
-			if (offset2 > offset1)
-			{
-				pos += offset2 - offset1;
-			}
-		}
-
-		void set_expect_little_data(bool value)
-		{
-			m_expect_little_data = value;
-		}
-
-		// Return true if small amounts of both input and output memory are expected (performance hint)
-		bool expect_little_data() const
-		{
-			return m_expect_little_data;
+			return pos == umax;
 		}
 
 		// Reserve memory for serialization
 		void reserve(usz size)
 		{
-			data.reserve(data.size() + size);
-		}
-
-		template <typename Func> requires (std::is_convertible_v<std::invoke_result_t<Func>, const void*>)
-		bool raw_serialize(Func&& memory_provider, usz size)
-		{
-			if (!size)
-			{
-				return true;
-			}
-
-			if (m_file_handler && m_file_handler->is_null())
-			{
-				// Instead of doing nothing at all, increase pos so it would be possible to estimate memory requirements
-				pos += size;
-				return true;
-			}
-
-			// Overflow check
-			ensure(~pos >= size - 1);
-
+			// Is a NO-OP for deserialization in order to allow usage from serialization specializations regardless
 			if (is_writing())
 			{
-				ensure(pos <= data_offset + data.size());
-
-				const auto ptr = reinterpret_cast<const u8*>(memory_provider());
-
-				if (pos != data_offset + data.size())
-				{
-					data.insert(data.begin() + pos - data_offset, ptr, ptr + size);
-					pos += size;
-					return true;
-				}
-
-				// Seems to be much faster than data.begin() + pos on MSVC
-				data.insert(data.end(), ptr, ptr + size);
-				pos += size;
-				return true;
+				data.reserve(data.size() + size);
 			}
-
-			if (data.empty() || pos < data_offset || pos + (size - 1) > (data.size() - 1) + data_offset)
-			{
-				// Load from file
-				ensure(m_file_handler);
-				ensure(m_file_handler->handle_file_op(*this, pos, size, nullptr));
-				ensure(!data.empty() && pos >= data_offset && pos + (size - 1) <= (data.size() - 1) + data_offset);
-			}
-
-			std::memcpy(const_cast<void*>(static_cast<const void*>(memory_provider())), data.data() + (pos - data_offset), size);
-			pos += size;
-			return true;
 		}
 
 		bool raw_serialize(const void* ptr, usz size)
 		{
-			return raw_serialize(FN(ptr), size);
+			if (is_writing())
+			{
+				data.insert(data.end(), static_cast<const u8*>(ptr), static_cast<const u8*>(ptr) + size);
+				return true;
+			}
+
+			ensure(data.size() - pos >= size);
+			std::memcpy(const_cast<void*>(ptr), data.data() + pos, size);
+			pos += size;
+			return true;
 		}
 
 		template <typename T> requires Integral<T>
@@ -239,25 +133,15 @@ public:
 			return ::serialize(*this, obj);
 		}
 
-		// Enabled for fundamental types, enumerations and if specified explicitly that type can be saved in pure bitwise manner
+		// Enabled for fundamental types, enumerations and if specfied explicitly that type can be saved in pure bitwise manner
 		template <typename T> requires Bitcopy<T>
 		bool serialize(T& obj)
 		{
 			return raw_serialize(std::addressof(obj), sizeof(obj));
 		}
 
-		template <typename T>
-		static constexpr usz c_tup_size = std::tuple_size_v<std::conditional_t<TupleAlike<T>, std::remove_cvref_t<T>, std::tuple<>>>;
-
-		template <typename T>
-		static std::remove_cvref_t<T>& as_nonconst(T&& arg) noexcept
-		{
-			return const_cast<std::remove_cvref_t<T>&>(static_cast<const T&>(arg));
-		}
-
 		// std::vector, std::basic_string
-		// Discourage using std::pair/tuple with vectors because it eliminates the possibility of bitwise optimization
-		template <typename T> requires FastRandomAccess<T> && ListAlike<T> && (!TupleAlike<typename T::value_type>)
+		template <typename T> requires FastRandomAccess<T> && ListAlike<T>
 		bool serialize(T& obj)
 		{
 			if (is_writing())
@@ -284,20 +168,17 @@ public:
 
 			obj.clear();
 
-			if (m_file_handler && m_file_handler->is_null())
-			{
-				return true;
-			}
-
 			usz size = 0;
 			if (!deserialize_vle(size))
 			{
 				return false;
 			}
 
+			obj.resize(size);
+
 			if constexpr (Bitcopy<typename T::value_type>)
 			{
-				if (!raw_serialize([&](){ obj.resize(size); return obj.data(); }, sizeof(obj[0]) * size))
+				if (!raw_serialize(obj.data(), sizeof(obj[0]) * size))
 				{
 					obj.clear();
 					return false;
@@ -305,9 +186,6 @@ public:
 			}
 			else
 			{
-				// TODO: Postpone resizing to after file bounds checks
-				obj.resize(size);
-
 				for (auto&& value : obj)
 				{
 					if (!serialize(value))
@@ -333,24 +211,9 @@ public:
 			{
 				for (auto&& value : obj)
 				{
-					if constexpr (c_tup_size<decltype(*std::data(obj))> == 2)
+					if (!serialize(value))
 					{
-						if (!serialize(as_nonconst(std::get<0>(value))))
-						{
-							return false;
-						}
-
-						if (!serialize(as_nonconst(std::get<1>(value))))
-						{
-							return false;
-						}
-					}
-					else
-					{
-						if (!serialize(value))
-						{
-							return false;
-						}
+						return false;
 					}
 				}
 
@@ -368,24 +231,9 @@ public:
 
 				for (auto&& value : obj)
 				{
-					if constexpr (c_tup_size<decltype(value)> == 2)
+					if (!serialize(value))
 					{
-						if (!serialize(as_nonconst(std::get<0>(value))))
-						{
-							return false;
-						}
-
-						if (!serialize(as_nonconst(std::get<1>(value))))
-						{
-							return false;
-						}
-					}
-					else
-					{
-						if (!serialize(value))
-						{
-							return false;
-						}
+						return false;
 					}
 				}
 
@@ -394,11 +242,6 @@ public:
 
 			obj.clear();
 
-			if (m_file_handler && m_file_handler->is_null())
-			{
-				return true;
-			}
-
 			usz size = 0;
 			if (!deserialize_vle(size))
 			{
@@ -424,14 +267,6 @@ public:
 			return true;
 		}
 
-		template <typename T>
-			requires requires(T& obj, utils::serial& ar) { (obj.*(&T::operator()))(stx::exact_t<utils::serial&>(ar)); }
-		bool serialize(T& obj)
-		{
-			obj(*this);
-			return is_valid();
-		}
-
 		template <usz i = 0, typename T>
 		bool serialize_tuple(T& obj)
 		{
@@ -449,249 +284,68 @@ public:
 		}
 
 		// std::pair, std::tuple
-		template <typename T> requires TupleAlike<T>
+		template <typename T> requires TupleAlike<T> && (!FastRandomAccess<T>)
 		bool serialize(T& obj)
 		{
 			return serialize_tuple(obj);
 		}
 
 		// Wrapper for serialize(T&), allows to pass multiple objects at once
-		template <typename... Args> requires (sizeof...(Args) != 0)
-		bool operator()(Args&&... args) noexcept
+		template <typename... Args>
+		bool operator()(Args&&... args)
 		{
 			return ((AUDIT(!std::is_const_v<std::remove_reference_t<Args>> || is_writing())
-				, serialize(as_nonconst(args))), ...);
+				, serialize(const_cast<std::remove_cvref_t<Args>&>(static_cast<const Args&>(args)))), ...);
 		}
 
-		// Code style utility, for when utils::serial is a pointer for example
-		template <typename... Args> requires (sizeof...(Args) > 1 || !(std::is_convertible_v<Args&&, Args&> && ...))
-		bool serialize(Args&&... args)
-		{
-			return this->operator()(std::forward<Args>(args)...);
-		}
-
-		// Convert serialization manager to deserializion manager
-		// If no arg is provided reuse saved buffer
-		void set_reading_state(std::vector<u8>&& _data = std::vector<u8>{}, bool expect_little_data = false)
+		// Convert serialization manager to deserializion manager (can't go the other way)
+		// If no arg provided reuse saved buffer
+		void set_reading_state(std::vector<u8>&& _data = std::vector<u8>{})
 		{
 			if (!_data.empty())
 			{
 				data = std::move(_data);
 			}
 
-			m_is_writing = false;
-			m_expect_little_data = expect_little_data;
-			m_max_data = umax;
 			pos = 0;
-			data_offset = 0;
-		}
-
-		// Reset to empty serialization manager
-		void clear()
-		{
-			data.clear();
-			m_is_writing = true;
-			pos = 0;
-			data_offset = 0;
-			m_file_handler.reset();
-		}
-
-		usz seek_end()
-		{
-			pos = data.size() + data_offset;
-			return pos;
-		}
-
-		usz trunc(usz count)
-		{
-			data.resize(data.size() - count);
-			seek_end();
-			return pos;
-		}
-
-		usz seek_pos(usz val, bool cleanup = false)
-		{
-			const usz old_pos = std::exchange(pos, val);
-
-			if (cleanup || data.empty())
-			{
-				// Relocate future data
-				if (m_file_handler)
-				{
-					m_file_handler->skip_until(*this);
-				}
-
-				breathe();
-			}
-
-			return old_pos;
-		}
-
-		usz pad_from_end(usz forwards)
-		{
-			ensure(is_writing());
-			pos = data.size() + data_offset;
-			data.resize(data.size() + forwards);
-			return pos;
-		}
-
-		// Allow for memory saving operations: if writing, flush to file if too large. If reading, discard memory (not implemented).
-		// Execute only if past memory is known to not going be reused
-		void breathe(bool forced = false)
-		{
-			if (!forced && (!m_file_handler || (data.size() < 0x100'0000 && pos >= data_offset)))
-			{
-				// Let's not do anything if less than 16MB
-				return;
-			}
-
-			ensure(m_file_handler);
-			ensure(m_file_handler->handle_file_op(*this, 0, umax, nullptr));
 		}
 
 		template <typename T> requires (std::is_copy_constructible_v<std::remove_const_t<T>>) && (std::is_constructible_v<std::remove_const_t<T>> || Bitcopy<std::remove_const_t<T>> ||
 			std::is_constructible_v<std::remove_const_t<T>, stx::exact_t<serial&>> || TupleAlike<std::remove_const_t<T>>)
-		operator T() noexcept
+		operator T()
 		{
 			AUDIT(!is_writing());
 
 			using type = std::remove_const_t<T>;
-			using not_tuple_t = std::conditional_t<TupleAlike<T>, char, type>;
 
 			if constexpr (Bitcopy<T>)
 			{
-				u8 buf[sizeof(not_tuple_t)]{};
+				u8 buf[sizeof(type)]{};
 				ensure(raw_serialize(buf, sizeof(buf)));
-				return std::bit_cast<not_tuple_t>(buf);
-			}
-			else if constexpr (TupleAlike<T>)
-			{
-				constexpr int tup_size = c_tup_size<type>;
-
-				static_assert(tup_size == 2 || tup_size == 4, "Unimplemented tuple serialization!");
-
-				using first_t  = typename std::tuple_element<std::min(0, tup_size - 1), type>::type;
-				using second_t = typename std::tuple_element<std::min(1, tup_size - 1), type>::type;
-				using third_t  = typename std::tuple_element<std::min(2, tup_size - 1), type>::type;
-				using fourth_t = typename std::tuple_element<std::min(3, tup_size - 1), type>::type;
-
-				first_t first = this->operator first_t();
-
-				if constexpr (tup_size == 4)
-				{
-					second_t second = this->operator second_t();
-					third_t third = this->operator third_t();
-
-					return type{ std::move(first), std::move(second), std::move(third), this->operator fourth_t() };
-				}
-				else
-				{
-					return type{ std::move(first), this->operator second_t() };
-				}
+				return std::bit_cast<type>(buf);
 			}
 			else if constexpr (std::is_constructible_v<type, stx::exact_t<serial&>>)
 			{
-				return not_tuple_t(stx::exact_t<serial&>(*this));
+				return type(stx::exact_t<serial&>(*this));
 			}
 			else if constexpr (std::is_constructible_v<type>)
 			{
-				not_tuple_t value{};
+				type value{};
 				ensure(serialize(value));
 				return value;
 			}
-		}
-
-		// Code style utility wrapper for operator T()
-		template <typename T>
-		T pop()
-		{
-			return this->operator T();
-		}
-
-		void swap_handler(serial& ar)
-		{
-			std::swap(ar.m_file_handler, this->m_file_handler);
-		}
-
-		usz get_size(usz recommended = umax) const
-		{
-			recommended = std::min<usz>(recommended, m_max_data);
-			return std::min<usz>(m_max_data, m_file_handler ? m_file_handler->get_size(*this, recommended) : (data.empty() ? 0 : data_offset + data.size()));
-		}
-
-		template <typename T> requires (Bitcopy<T>)
-		usz predict_object_size(const T&)
-		{
-			return sizeof(T);
-		}
-
-		template <typename T> requires FastRandomAccess<T> && (!ListAlike<T>) && (!Bitcopy<T>)
-		usz predict_object_size(const T& obj)
-		{
-			return std::size(obj) * sizeof(obj[0]);
-		}
-
-		template <typename T> requires (std::is_copy_constructible_v<std::remove_reference_t<T>> && std::is_constructible_v<std::remove_reference_t<T>>)
-		usz try_read(T&& obj)
-		{
-			if (is_writing())
+			else if constexpr (TupleAlike<T>)
 			{
-				return 0;
+				static_assert(std::tuple_size_v<type> == 2, "Unimplemented tuple serialization!");
+				return type{ operator std::remove_cvref_t<decltype(std::get<0>(std::declval<type&>()))>
+					, operator std::remove_cvref_t<decltype(std::get<1>(std::declval<type&>()))> };
 			}
-
-			const usz end_pos = pos + predict_object_size(std::forward<T>(obj));
-			const usz size = get_size(end_pos);
-
-			if (size >= end_pos)
-			{
-				serialize(std::forward<T>(obj));
-				return 0;
-			}
-
-			return end_pos - size;
 		}
 
-		template <typename T> requires (std::is_copy_constructible_v<T> && std::is_constructible_v<T> && Bitcopy<T>)
-		std::pair<bool, T> try_read()
-		{
-			if (is_writing())
-			{
-				return {};
-			}
-
-			const usz end_pos = pos + sizeof(T);
-			const usz size = get_size(end_pos);
-			using type = std::remove_const_t<T>;
-
-			if (size >= end_pos)
-			{
-				return {true, this->operator type()};
-			}
-
-			return {};
-		}
-
-		void patch_raw_data(usz pos, const void* data, usz size)
-		{
-			if (m_file_handler && m_file_handler->is_null())
-			{
-				return;
-			}
-
-			if (!size)
-			{
-				return;
-			}
-
-			std::memcpy(&::at32(this->data, pos - data_offset + size - 1) - (size - 1), data, size);
-		}
-
-		// Returns true if valid, can be invalidated by setting pos to umax
-		// Used when an invalid state is encountered somewhere in a place we can't check success code such as constructor)
+		// Returns true if writable or readable and valid
 		bool is_valid() const
 		{
-			// TODO
-			return true;
+			return is_writing() || pos < data.size();
 		}
 	};
 }
diff --git a/rpcs3/util/serialization_ext.cpp b/rpcs3/util/serialization_ext.cpp
deleted file mode 100644
index 508cd79168..0000000000
--- a/rpcs3/util/serialization_ext.cpp
+++ /dev/null
@@ -1,1330 +0,0 @@
-#include "util/types.hpp"
-#include "util/logs.hpp"
-#include "util/asm.hpp"
-#include "util/sysinfo.hpp"
-#include "util/endian.hpp"
-#include "Utilities/lockless.h"
-#include "Utilities/File.h"
-#include "Utilities/StrFmt.h"
-#include "serialization_ext.hpp"
-
-#include <zlib.h>
-#include <zstd.h>
-
-LOG_CHANNEL(sys_log, "SYS");
-
-template <>
-void fmt_class_string<utils::serial>::format(std::string& out, u64 arg)
-{
-	const utils::serial& ar = get_object(arg);
-
-	be_t<u64> sample64 = 0;
-	const usz read_size = std::min<usz>(ar.data.size(), sizeof(sample64));
-	std::memcpy(&sample64, ar.data.data() + ar.data.size() - read_size, read_size);
-
-	fmt::append(out, "{ %s, 0x%x/0x%x, memory=0x%x, sample64=0x%016x }", ar.is_writing() ? "writing" : "reading", ar.pos, ar.data_offset + ar.data.size(), ar.data.size(), sample64);
-}
-
-static constexpr uInt adjust_for_uint(usz size)
-{
-	return static_cast<uInt>(std::min<usz>(uInt{umax}, size));
-}
-
-bool uncompressed_serialization_file_handler::handle_file_op(utils::serial& ar, usz pos, usz size, const void* data)
-{
-	if (ar.is_writing())
-	{
-		if (data)
-		{
-			m_file->seek(pos);
-			m_file->write(data, size);
-			return true;
-		}
-
-		m_file->seek(ar.data_offset);
-		m_file->write(ar.data);
-
-		if (pos == umax && size == umax)
-		{
-			// Request to flush the file to disk
-			m_file->sync();
-		}
-
-		ar.seek_end();
-		ar.data_offset = ar.pos;
-		ar.data.clear();
-		return true;
-	}
-
-	if (!size)
-	{
-		return true;
-	}
-
-	if (pos == 0 && size == umax)
-	{
-		// Discard loaded data until pos if profitable
-		const usz limit = ar.data_offset + ar.data.size();
-
-		if (ar.pos > ar.data_offset && ar.pos < limit)
-		{
-			const usz may_discard_bytes = ar.pos - ar.data_offset;
-			const usz moved_byte_count_on_discard = limit - ar.pos;
-
-			// Cheeck profitability (check recycled memory and std::memmove costs)
-			if (may_discard_bytes >= 0x50'0000 || (may_discard_bytes >= 0x20'0000 && moved_byte_count_on_discard / may_discard_bytes < 3))
-			{
-				ar.data_offset += may_discard_bytes;
-				ar.data.erase(ar.data.begin(), ar.data.begin() + may_discard_bytes);
-
-				if (ar.data.capacity() >= 0x200'0000)
-				{
-					// Discard memory
-					ar.data.shrink_to_fit();
-				}
-			}
-
-			return true;
-		}
-
-		// Discard all loaded data
-		ar.data_offset = ar.pos;
-		ar.data.clear();
-
-		if (ar.data.capacity() >= 0x200'0000)
-		{
-			// Discard memory
-			ar.data.shrink_to_fit();
-		}
-
-		return true;
-	}
-
-	if (~pos < size - 1)
-	{
-		// Overflow
-		return false;
-	}
-
-	if (ar.data.empty())
-	{
-		// Relocate instead of over-fetch
-		ar.data_offset = pos;
-	}
-
-	const usz read_pre_buffer = ar.data.empty() ? 0 : utils::sub_saturate<usz>(ar.data_offset, pos);
-
-	if (read_pre_buffer)
-	{
-		// Read past data
-		// Harsh operation on performance, luckily rare and not typically needed
-		// Also this may would be disallowed when moving to compressed files
-		// This may be a result of wrong usage of breathe() function
-		ar.data.resize(ar.data.size() + read_pre_buffer);
-		std::memmove(ar.data.data() + read_pre_buffer, ar.data.data(), ar.data.size() - read_pre_buffer);
-		ensure(m_file->read_at(pos, ar.data.data(), read_pre_buffer) == read_pre_buffer);
-		ar.data_offset -= read_pre_buffer;
-	}
-
-	// Adjustment to prevent overflow
-	const usz subtrahend = ar.data.empty() ? 0 : 1;
-	const usz read_past_buffer = utils::sub_saturate<usz>(pos + (size - subtrahend), ar.data_offset + (ar.data.size() - subtrahend));
-	const usz read_limit = utils::sub_saturate<usz>(ar.m_max_data, ar.data_offset); 
-
-	if (read_past_buffer)
-	{
-		// Read proceeding data
-		// More lightweight operation, this is the common operation
-		// Allowed to fail, if memory is truly needed an assert would take place later
-		const usz old_size = ar.data.size();
-
-		// Try to prefetch data by reading more than requested
-		ar.data.resize(std::min<usz>(read_limit, std::max<usz>({ ar.data.capacity(), ar.data.size() + read_past_buffer * 3 / 2, ar.expect_little_data() ? usz{4096} : usz{0x10'0000} })));
-		ar.data.resize(m_file->read_at(old_size + ar.data_offset, data ? const_cast<void*>(data) : ar.data.data() + old_size, ar.data.size() - old_size) + old_size);
-	}
-
-	return true;
-}
-
-usz uncompressed_serialization_file_handler::get_size(const utils::serial& ar, usz recommended) const
-{
-	if (ar.is_writing())
-	{
-		return *m_file ? m_file->size() : 0;
-	}
-
-	const usz memory_available = ar.data_offset + ar.data.size();
-
-	if (memory_available >= recommended || !*m_file)
-	{
-		// Avoid calling size() if possible
-		return memory_available;
-	}
-
-	return std::max<usz>(m_file->size(), memory_available);
-}
-
-void uncompressed_serialization_file_handler::finalize(utils::serial& ar)
-{
-	ar.seek_end();
-	handle_file_op(ar, 0, umax, nullptr);
-	ar.data = {}; // Deallocate and clear
-}
-
-enum : u64
-{
-	pending_compress_bytes_bound = 0x400'0000,
-	pending_data_wait_bit = 1ull << 63,
-};
-
-struct compressed_stream_data
-{
-	z_stream m_zs{};
-	lf_queue<std::vector<u8>> m_queued_data_to_process;
-	lf_queue<std::vector<u8>> m_queued_data_to_write;
-};
-
-void compressed_serialization_file_handler::initialize(utils::serial& ar)
-{
-	if (!m_stream)
-	{
-		m_stream = std::make_shared<compressed_stream_data>();
-	}
-
-	if (ar.is_writing())
-	{
-		if (m_write_inited)
-		{
-			return;
-		}
-
-		z_stream& m_zs = m_stream->m_zs;
-#ifndef _MSC_VER
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-		if (m_read_inited)
-		{
-			finalize(ar);
-		}
-
-		m_zs = {};
-		ensure(deflateInit2(&m_zs, ar.expect_little_data() ? 9 : 8, Z_DEFLATED, 16 + 15, 9, Z_DEFAULT_STRATEGY) == Z_OK);
-#ifndef _MSC_VER
-#pragma GCC diagnostic pop
-#endif
-		m_write_inited = true;
-		m_errored = false;
-
-		if (!ar.expect_little_data())
-		{
-			m_stream_data_prepare_thread = std::make_unique<named_thread<std::function<void()>>>("CompressedPrepare Thread"sv, [this]() { this->stream_data_prepare_thread_op(); });
-			m_file_writer_thread = std::make_unique<named_thread<std::function<void()>>>("CompressedWriter Thread"sv, [this]() { this->file_writer_thread_op(); });
-		}
-	}
-	else
-	{
-		if (m_read_inited)
-		{
-			return;
-		}
-
-		if (m_write_inited)
-		{
-			finalize(ar);
-		}
-
-		z_stream& m_zs = m_stream->m_zs;
-
-		m_zs.avail_in = 0;
-		m_zs.avail_out = 0;
-		m_zs.next_in = nullptr;
-		m_zs.next_out = nullptr;
-	#ifndef _MSC_VER
-	#pragma GCC diagnostic push
-	#pragma GCC diagnostic ignored "-Wold-style-cast"
-	#endif
-		ensure(inflateInit2(&m_zs, 16 + 15) == Z_OK);
-		m_read_inited = true;
-		m_errored = false;
-	}
-}
-
-bool compressed_serialization_file_handler::handle_file_op(utils::serial& ar, usz pos, usz size, const void* data)
-{
-	if (ar.is_writing())
-	{
-		initialize(ar);
-
-		if (m_errored)
-		{
-			return false;
-		}
-
-		auto& manager = *m_stream;
-		auto& stream_data = manager.m_queued_data_to_process;
-
-		if (data)
-		{
-			ensure(false);
-		}
-
-		// Writing not at the end is forbidden
-		ensure(ar.pos == ar.data_offset + ar.data.size());
-
-		if (ar.data.empty())
-		{
-			if (pos == umax && size == umax && *m_file)
-			{
-				// Request to flush the file to disk
-				m_file->sync();
-			}
-
-			return true;
-		}
-
-		ar.seek_end();
-
-		if (!m_file_writer_thread)
-		{
-			// Avoid multi-threading for small files
-			blocked_compressed_write(ar.data);
-		}
-		else
-		{
-			while (true)
-			{
-				// Avoid flooding RAM, wait if there is too much pending memory
-				const usz new_value = m_pending_bytes.atomic_op([&](usz& v)
-				{
-					v &= ~pending_data_wait_bit;
-
-					if (v >= pending_compress_bytes_bound)
-					{
-						v |= pending_data_wait_bit;
-					}
-					else
-					{
-						// Overflow detector
-						ensure(~v - pending_data_wait_bit > ar.data.size());
-
-						v += ar.data.size();
-					}
-
-					return v;
-				});
-
-				if (new_value & pending_data_wait_bit)
-				{
-					m_pending_bytes.wait(new_value);
-				}
-				else
-				{
-					break;
-				}
-			}
-
-			stream_data.push(std::move(ar.data));
-		}
-
-		ar.data_offset = ar.pos;
-		ar.data.clear();
-
-		if (pos == umax && size == umax && *m_file)
-		{
-			// Request to flush the file to disk
-			m_file->sync();
-		}
-
-		return true;
-	}
-
-	initialize(ar);
-
-	if (m_errored)
-	{
-		return false;
-	}
-
-	if (!size)
-	{
-		return true;
-	}
-
-	if (pos == 0 && size == umax)
-	{
-		// Discard loaded data until pos if profitable
-		const usz limit = ar.data_offset + ar.data.size();
-
-		if (ar.pos > ar.data_offset && ar.pos < limit)
-		{
-			const usz may_discard_bytes = ar.pos - ar.data_offset;
-			const usz moved_byte_count_on_discard = limit - ar.pos;
-
-			// Cheeck profitability (check recycled memory and std::memmove costs)
-			if (may_discard_bytes >= 0x50'0000 || (may_discard_bytes >= 0x20'0000 && moved_byte_count_on_discard / may_discard_bytes < 3))
-			{
-				ar.data_offset += may_discard_bytes;
-				ar.data.erase(ar.data.begin(), ar.data.begin() + may_discard_bytes);
-
-				if (ar.data.capacity() >= 0x200'0000)
-				{
-					// Discard memory
-					ar.data.shrink_to_fit();
-				}
-			}
-
-			return true;
-		}
-
-		// Discard all loaded data
-		ar.data_offset += ar.data.size();
-		ensure(ar.pos >= ar.data_offset);
-		ar.data.clear();
-
-		if (ar.data.capacity() >= 0x200'0000)
-		{
-			// Discard memory
-			ar.data.shrink_to_fit();
-		}
-
-		return true;
-	}
-
-	if (~pos < size - 1)
-	{
-		// Overflow
-		return false;
-	}
-
-	// TODO: Investigate if this optimization is worth an implementation for compressed stream
-	// if (ar.data.empty() && pos != ar.pos)
-	// {
-	// 	// Relocate instead of over-fetch
-	// 	ar.seek_pos(pos);
-	// }
-
-	const usz read_pre_buffer = utils::sub_saturate<usz>(ar.data_offset, pos);
-
-	if (read_pre_buffer)
-	{
-		// Not allowed with compressed data for now
-		// Unless someone implements mechanism for it
-		ensure(false);
-	}
-
-	// Adjustment to prevent overflow
-	const usz subtrahend = ar.data.empty() ? 0 : 1;
-	const usz read_past_buffer = utils::sub_saturate<usz>(pos + (size - subtrahend), ar.data_offset + (ar.data.size() - subtrahend));
-	const usz read_limit = utils::sub_saturate<usz>(ar.m_max_data, ar.data_offset); 
-
-	if (read_past_buffer)
-	{
-		// Read proceeding data
-		// More lightweight operation, this is the common operation
-		// Allowed to fail, if memory is truly needed an assert would take place later
-		const usz old_size = ar.data.size();
-
-		// Try to prefetch data by reading more than requested
-		const usz new_size = std::min<usz>(read_limit, std::max<usz>({ ar.data.capacity(), ar.data.size() + read_past_buffer * 3 / 2, ar.expect_little_data() ? usz{4096} : usz{0x10'0000} }));
-
-		if (new_size < old_size)
-		{
-			// Read limit forbids further reads at this point
-			return true;
-		}
-
-		ar.data.resize(new_size);
-		ar.data.resize(this->read_at(ar, old_size + ar.data_offset, data ? const_cast<void*>(data) : ar.data.data() + old_size, ar.data.size() - old_size) + old_size);
-	}
-
-	return true;
-}
-
-usz compressed_serialization_file_handler::read_at(utils::serial& ar, usz read_pos, void* data, usz size)
-{
-	ensure(read_pos == ar.data.size() + ar.data_offset - size);
-
-	if (!size || m_errored)
-	{
-		return 0;
-	}
-
-	initialize(ar);
-
-	z_stream& m_zs = m_stream->m_zs;
-
-	const usz total_to_read = size;
-	usz read_size = 0;
-	u8* out_data = static_cast<u8*>(data);
-
-	for (; read_size < total_to_read;)
-	{
-		// Drain extracted memory stash (also before first file read)
-		out_data = static_cast<u8*>(data) + read_size;
-		m_zs.avail_in = adjust_for_uint(m_stream_data.size() - m_stream_data_index);
-		m_zs.next_in = reinterpret_cast<const u8*>(m_stream_data.data() + m_stream_data_index);
-		m_zs.next_out = out_data;
-		m_zs.avail_out = adjust_for_uint(size - read_size);
-
-		while (read_size < total_to_read && m_zs.avail_in)
-		{
-			const int res = inflate(&m_zs, Z_BLOCK);
-
-			bool need_more_file_memory = false;
-
-			switch (res)
-			{
-			case Z_OK:
-			case Z_STREAM_END:
-				break;
-			case Z_BUF_ERROR:
-			{
-				if (m_zs.avail_in)
-				{
-					need_more_file_memory = true;
-					break;
-				}
-
-				[[fallthrough]];
-			}
-			default:
-				m_errored = true;
-				inflateEnd(&m_zs);
-				m_read_inited = false;
-				sys_log.error("Failure of compressed data reading. (res=%d, read_size=0x%x, avail_in=0x%x, avail_out=0x%x, ar=%s)", res, read_size, m_zs.avail_in, m_zs.avail_out, ar);
-				return read_size;
-			}
-
-			read_size = m_zs.next_out - static_cast<u8*>(data);
-			m_stream_data_index = m_zs.avail_in ? m_zs.next_in - m_stream_data.data() : m_stream_data.size();
-
-			// Adjust again in case the values simply did not fit into uInt
-			m_zs.avail_out = adjust_for_uint(utils::sub_saturate<usz>(total_to_read, read_size));
-			m_zs.avail_in = adjust_for_uint(m_stream_data.size() - m_stream_data_index);
-
-			if (need_more_file_memory)
-			{
-				break;
-			}
-		}
-
-		if (read_size >= total_to_read)
-		{
-			break;
-		}
-
-		const usz add_size = ar.expect_little_data() ? 0x1'0000 : 0x10'0000;
-		const usz old_file_buf_size = m_stream_data.size();
-
-		m_stream_data.resize(old_file_buf_size + add_size);
-		m_stream_data.resize(old_file_buf_size + m_file->read_at(m_file_read_index, m_stream_data.data() + old_file_buf_size, add_size));
-
-		if (m_stream_data.size() == old_file_buf_size)
-		{
-			// EOF
-			break;
-		}
-
-		m_file_read_index += m_stream_data.size() - old_file_buf_size;
-	}
-
-	if (m_stream_data.size() - m_stream_data_index <= m_stream_data_index / 5)
-	{
-		// Shrink to required memory size
-		m_stream_data.erase(m_stream_data.begin(), m_stream_data.begin() + m_stream_data_index);
-
-		if (m_stream_data.capacity() >= 0x200'0000)
-		{
-			// Discard memory
-			m_stream_data.shrink_to_fit();
-		}
-
-		m_stream_data_index = 0;
-	}
-
-	return read_size;
-}
-
-void compressed_serialization_file_handler::skip_until(utils::serial& ar)
-{
-	ensure(!ar.is_writing() && ar.pos >= ar.data_offset);
-
-	if (ar.pos > ar.data_offset)
-	{
-		handle_file_op(ar, ar.data_offset, ar.pos - ar.data_offset, nullptr);
-	}
-}
-
-void compressed_serialization_file_handler::finalize(utils::serial& ar)
-{
-	handle_file_op(ar, 0, umax, nullptr);
-
-	if (!m_stream)
-	{
-		return;
-	}
-
-	auto& stream = *m_stream;
-	z_stream& m_zs = m_stream->m_zs;
-
-	if (m_read_inited)
-	{
-		ensure(inflateEnd(&m_zs) == Z_OK);
-		m_read_inited = false;
-		return;
-	}
-
-	stream.m_queued_data_to_process.push(std::vector<u8>());
-
-	if (m_file_writer_thread)
-	{
-		// Join here to avoid log messages in the destructor
-		(*m_file_writer_thread)();
-	}
-
-	m_stream_data_prepare_thread.reset();
-	m_file_writer_thread.reset();
-
-	m_zs.avail_in = 0;
-	m_zs.next_in  = nullptr;
-
-	m_stream_data.resize(0x10'0000);
-
-	do
-	{
-		m_zs.avail_out = static_cast<uInt>(m_stream_data.size());
-		m_zs.next_out  = m_stream_data.data();
-
-		if (deflate(&m_zs, Z_FINISH) == Z_STREAM_ERROR)
-		{
-			break;
-		}
-
-		m_file->write(m_stream_data.data(), m_stream_data.size() - m_zs.avail_out);
-	}
-	while (m_zs.avail_out == 0);
-
-	m_stream_data = {};
-	ensure(deflateEnd(&m_zs) == Z_OK);
-
-	m_write_inited = false;
-	ar.data = {}; // Deallocate and clear
-
-	m_file->sync();
-}
-
-void compressed_serialization_file_handler::stream_data_prepare_thread_op()
-{
-	compressed_stream_data& stream = *m_stream;
-	z_stream& m_zs = stream.m_zs;
-
-	while (true)
-	{
-		stream.m_queued_data_to_process.wait();
-
-		for (auto&& data : stream.m_queued_data_to_process.pop_all())
-		{
-			if (data.empty())
-			{
-				// Abort is requested, flush data and exit
-				stream.m_queued_data_to_write.push(std::vector<u8>());
-				return;
-			}
-
-			m_zs.avail_in = adjust_for_uint(data.size());
-			m_zs.next_in  = data.data();
-
-			usz buffer_offset = 0;
-			m_stream_data.resize(::compressBound(m_zs.avail_in));
-
-			do
-			{
-				m_zs.avail_out = adjust_for_uint(m_stream_data.size() - buffer_offset);
-				m_zs.next_out  = m_stream_data.data() + buffer_offset;
-
-				if (deflate(&m_zs, Z_NO_FLUSH) == Z_STREAM_ERROR)
-				{
-					m_errored = true;
-					deflateEnd(&m_zs);
-
-					// Abort
-					stream.m_queued_data_to_write.push(std::vector<u8>());
-					break;
-				}
-
-				buffer_offset = m_zs.next_out - m_stream_data.data();
-
-				m_zs.avail_in = adjust_for_uint(data.size() - (m_zs.next_in - data.data()));
-
-				if (m_zs.avail_out == 0)
-				{
-					m_stream_data.resize(m_stream_data.size() + (m_zs.avail_in / 4) + (m_stream_data.size() / 16) + 1);
-				}
-			}
-			while (m_zs.avail_out == 0 || m_zs.avail_in != 0);
-
-			if (m_errored)
-			{
-				return;
-			}
-
-			// Forward for file write
-			const usz queued_size = data.size();
-
-			const usz size_diff = buffer_offset - queued_size;
-			const usz new_val = m_pending_bytes.add_fetch(size_diff);
-			const usz left = new_val & ~pending_data_wait_bit;
-
-			if (new_val & pending_data_wait_bit && left < pending_compress_bytes_bound && left - size_diff >= pending_compress_bytes_bound && !m_pending_signal)
-			{
-				// Notification is postponed until data write and memory release
-				m_pending_signal = true;
-			}
-
-			// Ensure wait bit state has not changed by the update
-			ensure(~((new_val - size_diff) ^ new_val) & pending_data_wait_bit);
-
-			if (!buffer_offset)
-			{
-				if (m_pending_signal)
-				{
-					m_pending_bytes.notify_all();
-				}
-
-				continue;
-			}
-
-			m_stream_data.resize(buffer_offset);
-			stream.m_queued_data_to_write.push(std::move(m_stream_data));
-		}
-	}
-}
-
-void compressed_serialization_file_handler::file_writer_thread_op()
-{
-	compressed_stream_data& stream = *m_stream;
-
-	while (true)
-	{
-		stream.m_queued_data_to_write.wait();
-
-		for (auto&& data : stream.m_queued_data_to_write.pop_all())
-		{
-			if (data.empty())
-			{
-				return;
-			}
-
-			const usz last_size = data.size();
-			m_file->write(data);
-			data = {}; // Deallocate before notification
-
-			const usz new_val = m_pending_bytes.sub_fetch(last_size);
-			const usz left = new_val & ~pending_data_wait_bit;
-			const bool pending_sig = m_pending_signal && m_pending_signal.exchange(false);
-
-			if (pending_sig || (new_val & pending_data_wait_bit && left < pending_compress_bytes_bound && left + last_size >= pending_compress_bytes_bound))
-			{
-				m_pending_bytes.notify_all();
-			}
-
-			// Ensure wait bit state has not changed by the update
-			ensure(~((new_val + last_size) ^ new_val) & pending_data_wait_bit);
-		}
-	}
-}
-
-void compressed_serialization_file_handler::blocked_compressed_write(const std::vector<u8>& data)
-{
-	z_stream& m_zs = m_stream->m_zs;
-
-	m_zs.avail_in = adjust_for_uint(data.size());
-	m_zs.next_in = data.data();
-
-	m_stream_data.resize(::compressBound(m_zs.avail_in));
-
-	do
-	{
-		m_zs.avail_out = adjust_for_uint(m_stream_data.size());
-		m_zs.next_out = m_stream_data.data();
-
-		if (deflate(&m_zs, Z_NO_FLUSH) == Z_STREAM_ERROR || m_file->write(m_stream_data.data(), m_stream_data.size() - m_zs.avail_out) != m_stream_data.size() - m_zs.avail_out)
-		{
-			m_errored = true;
-			deflateEnd(&m_zs);
-			break;
-		}
-
-		m_zs.avail_in = adjust_for_uint(data.size() - (m_zs.next_in - data.data()));
-	}
-	while (m_zs.avail_out == 0);
-}
-
-usz compressed_serialization_file_handler::get_size(const utils::serial& ar, usz recommended) const
-{
-	if (ar.is_writing())
-	{
-		return *m_file ? m_file->size() : 0;
-	}
-
-	const usz memory_available = ar.data_offset + ar.data.size();
-
-	if (memory_available >= recommended || !*m_file)
-	{
-		// Avoid calling size() if possible
-		return memory_available;
-	}
-
-	return std::max<usz>(utils::mul_saturate<usz>(m_file->size(), 6), memory_available);
-}
-
-struct compressed_zstd_stream_data
-{
-	ZSTD_DCtx* m_zd{};
-	ZSTD_DStream* m_zs{};
-	lf_queue<std::vector<u8>> m_queued_data_to_process;
-	lf_queue<std::vector<u8>> m_queued_data_to_write;
-};
-
-void compressed_zstd_serialization_file_handler::initialize(utils::serial& ar)
-{
-	if (!m_stream)
-	{
-		m_stream = std::make_shared<compressed_zstd_stream_data>();
-	}
-
-	if (ar.is_writing())
-	{
-		if (m_write_inited)
-		{
-			return;
-		}
-
-		if (m_read_inited && m_stream->m_zd)
-		{
-			finalize(ar);
-		}
-
-		m_write_inited = true;
-		m_errored = false;
-
-		m_compression_threads.clear();
-		m_file_writer_thread.reset();
-
-		// Make sure at least one thread is free
-		// Limit thread count in order to make sure memory limits are under control (TODO: scale with RAM size)
-		const usz thread_count = std::min<u32>(std::max<u32>(utils::get_thread_count(), 2) - 1, 16);
-
-		for (usz i = 0; i < thread_count; i++)
-		{
-			m_compression_threads.emplace_back().m_thread = std::make_unique<named_thread<std::function<void()>>>(fmt::format("CompressedPrepare Thread %d", i + 1), [this]() { this->stream_data_prepare_thread_op(); });
-		}
-
-		m_file_writer_thread = std::make_unique<named_thread<std::function<void()>>>("CompressedWriter Thread"sv, [this]() { this->file_writer_thread_op(); });
-	}
-	else
-	{
-		if (m_read_inited)
-		{
-			return;
-		}
-
-		if (m_write_inited)
-		{
-			finalize(ar);
-		}
-
-		auto& m_zd = m_stream->m_zd;
-		m_zd = ZSTD_createDCtx();
-		m_stream->m_zs = ZSTD_createDStream();
-		m_read_inited = true;
-		m_errored = false;
-	}
-}
-
-bool compressed_zstd_serialization_file_handler::handle_file_op(utils::serial& ar, usz pos, usz size, const void* data)
-{
-	if (ar.is_writing())
-	{
-		initialize(ar);
-
-		if (m_errored)
-		{
-			return false;
-		}
-
-		if (data)
-		{
-			ensure(false);
-		}
-
-		// Writing not at the end is forbidden
-		ensure(ar.pos == ar.data_offset + ar.data.size());
-
-		if (ar.data.empty())
-		{
-			if (pos == umax && size == umax && *m_file)
-			{
-				// Request to flush the file to disk
-				m_file->sync();
-			}
-
-			return true;
-		}
-
-		ar.seek_end();
-
-		const usz buffer_idx = m_input_buffer_index++ % m_compression_threads.size();
-		auto& input = m_compression_threads[buffer_idx].m_input;
-
-		while (input)
-		{
-			// No waiting support on non-null pointer
-			thread_ctrl::wait_for(2'000);
-		}
-
-		input.store(stx::make_single_value(std::move(ar.data)));
-		input.notify_all();
-
-		ar.data_offset = ar.pos;
-		ar.data.clear();
-
-		if (pos == umax && size == umax && *m_file)
-		{
-			// Request to flush the file to disk
-			m_file->sync();
-		}
-
-		return true;
-	}
-
-	initialize(ar);
-
-	if (m_errored)
-	{
-		return false;
-	}
-
-	if (!size)
-	{
-		return true;
-	}
-
-	if (pos == 0 && size == umax)
-	{
-		// Discard loaded data until pos if profitable
-		const usz limit = ar.data_offset + ar.data.size();
-
-		if (ar.pos > ar.data_offset && ar.pos < limit)
-		{
-			const usz may_discard_bytes = ar.pos - ar.data_offset;
-			const usz moved_byte_count_on_discard = limit - ar.pos;
-
-			// Cheeck profitability (check recycled memory and std::memmove costs)
-			if (may_discard_bytes >= 0x50'0000 || (may_discard_bytes >= 0x20'0000 && moved_byte_count_on_discard / may_discard_bytes < 3))
-			{
-				ar.data_offset += may_discard_bytes;
-				ar.data.erase(ar.data.begin(), ar.data.begin() + may_discard_bytes);
-
-				if (ar.data.capacity() >= 0x200'0000)
-				{
-					// Discard memory
-					ar.data.shrink_to_fit();
-				}
-			}
-
-			return true;
-		}
-
-		// Discard all loaded data
-		ar.data_offset += ar.data.size();
-		ensure(ar.pos >= ar.data_offset);
-		ar.data.clear();
-
-		if (ar.data.capacity() >= 0x200'0000)
-		{
-			// Discard memory
-			ar.data.shrink_to_fit();
-		}
-
-		return true;
-	}
-
-	if (~pos < size - 1)
-	{
-		// Overflow
-		return false;
-	}
-
-	// TODO: Investigate if this optimization is worth an implementation for compressed stream
-	// if (ar.data.empty() && pos != ar.pos)
-	// {
-	// 	// Relocate instead of over-fetch
-	// 	ar.seek_pos(pos);
-	// }
-
-	const usz read_pre_buffer = utils::sub_saturate<usz>(ar.data_offset, pos);
-
-	if (read_pre_buffer)
-	{
-		// Not allowed with compressed data for now
-		// Unless someone implements mechanism for it
-		ensure(false);
-	}
-
-	// Adjustment to prevent overflow
-	const usz subtrahend = ar.data.empty() ? 0 : 1;
-	const usz read_past_buffer = utils::sub_saturate<usz>(pos + (size - subtrahend), ar.data_offset + (ar.data.size() - subtrahend));
-	const usz read_limit = utils::sub_saturate<usz>(ar.m_max_data, ar.data_offset); 
-
-	if (read_past_buffer)
-	{
-		// Read proceeding data
-		// More lightweight operation, this is the common operation
-		// Allowed to fail, if memory is truly needed an assert would take place later
-		const usz old_size = ar.data.size();
-
-		// Try to prefetch data by reading more than requested
-		const usz new_size = std::min<usz>(read_limit, std::max<usz>({ ar.data.capacity(), ar.data.size() + read_past_buffer * 3 / 2, ar.expect_little_data() ? usz{4096} : usz{0x10'0000} }));
-
-		if (new_size < old_size)
-		{
-			// Read limit forbids further reads at this point
-			return true;
-		}
-
-		ar.data.resize(new_size);
-		ar.data.resize(this->read_at(ar, old_size + ar.data_offset, data ? const_cast<void*>(data) : ar.data.data() + old_size, ar.data.size() - old_size) + old_size);
-	}
-
-	return true;
-}
-
-usz compressed_zstd_serialization_file_handler::read_at(utils::serial& ar, usz read_pos, void* data, usz size)
-{
-	ensure(read_pos == ar.data.size() + ar.data_offset - size);
-
-	if (!size || m_errored)
-	{
-		return 0;
-	}
-
-	initialize(ar);
-
-	auto& m_zd = m_stream->m_zd;
-
-	const usz total_to_read = size;
-	usz read_size = 0;
-	u8* out_data = static_cast<u8*>(data);
-
-	for (; read_size < total_to_read;)
-	{
-		// Drain extracted memory stash (also before first file read)
-		out_data = static_cast<u8*>(data) + read_size;
-
-		auto avail_in = m_stream_data.size() - m_stream_data_index;
-		auto next_in = reinterpret_cast<const u8*>(m_stream_data.data() + m_stream_data_index);
-		auto next_out = out_data;
-		auto avail_out = size - read_size;
-
-		for (bool is_first = true; read_size < total_to_read && avail_in; is_first = false)
-		{
-			bool need_more_file_memory = false;
-
-			ZSTD_outBuffer outs{next_out, avail_out, 0};
-
-			// Try to extract previously held data first
-			ZSTD_inBuffer ins{next_in, is_first ? 0 : avail_in, 0};
-
-			const usz res = ZSTD_decompressStream(m_zd, &outs, &ins);
-
-			if (ZSTD_isError(res))
-			{
-				need_more_file_memory = true;
-				// finalize(ar);
-				// m_errored = true;
-				// sys_log.error("Failure of compressed data reading. (res=%d, read_size=0x%x, avail_in=0x%x, avail_out=0x%x, ar=%s)", res, read_size, avail_in, avail_out, ar);
-				// return read_size;
-			}
-
-			read_size += outs.pos;
-			next_out += outs.pos;
-			avail_out -= outs.pos;
-			next_in += ins.pos;
-			avail_in -= ins.pos;
-
-			m_stream_data_index = next_in - m_stream_data.data();
-
-			if (need_more_file_memory)
-			{
-				break;
-			}
-		}
-
-		if (read_size >= total_to_read)
-		{
-			break;
-		}
-
-		const usz add_size = ar.expect_little_data() ? 0x1'0000 : 0x10'0000;
-		const usz old_file_buf_size = m_stream_data.size();
-
-		m_stream_data.resize(old_file_buf_size + add_size);
-		m_stream_data.resize(old_file_buf_size + m_file->read_at(m_file_read_index, m_stream_data.data() + old_file_buf_size, add_size));
-
-		if (m_stream_data.size() == old_file_buf_size)
-		{
-			// EOF
-			//ensure(read_size == total_to_read);
-			break;
-		}
-
-		m_file_read_index += m_stream_data.size() - old_file_buf_size;
-	}
-
-	if (m_stream_data.size() - m_stream_data_index <= m_stream_data_index / 5)
-	{
-		// Shrink to required memory size
-		m_stream_data.erase(m_stream_data.begin(), m_stream_data.begin() + m_stream_data_index);
-
-		if (m_stream_data.capacity() >= 0x200'0000)
-		{
-			// Discard memory
-			m_stream_data.shrink_to_fit();
-		}
-
-		m_stream_data_index = 0;
-	}
-
-	return read_size;
-}
-
-void compressed_zstd_serialization_file_handler::skip_until(utils::serial& ar)
-{
-	ensure(!ar.is_writing() && ar.pos >= ar.data_offset);
-
-	if (ar.pos > ar.data_offset)
-	{
-		handle_file_op(ar, ar.data_offset, ar.pos - ar.data_offset, nullptr);
-	}
-}
-
-void compressed_zstd_serialization_file_handler::finalize(utils::serial& ar)
-{
-	handle_file_op(ar, 0, umax, nullptr);
-
-	if (!m_stream)
-	{
-		return;
-	}
-
-	auto& m_zd = m_stream->m_zd;
-
-	if (m_read_inited)
-	{
-		//ZSTD_decompressEnd(m_stream->m_zd);
-		ensure(ZSTD_freeDCtx(m_zd));
-		m_read_inited = false;
-		return;
-	}
-
-	const stx::shared_ptr<std::vector<u8>> empty_data = stx::make_single<std::vector<u8>>();
-	const stx::shared_ptr<std::vector<u8>> null_ptr = stx::null_ptr;
-
-	for (auto& context : m_compression_threads)
-	{
-		// Try to notify all on the first iteration
-		if (context.m_input.compare_and_swap_test(null_ptr, empty_data))
-		{
-			context.notified = true;
-			context.m_input.notify_one();
-		}
-	}
-
-	for (auto& context : m_compression_threads)
-	{
-		// Notify to abort
-		while (!context.notified)
-		{
-			const auto data = context.m_input.compare_and_swap(null_ptr, empty_data);
-
-			if (!data)
-			{
-				context.notified = true;
-				context.m_input.notify_one();
-				break;
-			}
-
-			// Wait until valid input is processed
-			thread_ctrl::wait_for(1000);
-		}
-	}
-
-	for (auto& context : m_compression_threads)
-	{
-		// Wait for notification to be consumed
-		while (context.m_input)
-		{
-			thread_ctrl::wait_for(1000);
-		}
-	}
-
-	for (auto& context : m_compression_threads)
-	{
-		// Wait for data to be writen to be read by the thread
-		while (context.m_output)
-		{
-			thread_ctrl::wait_for(1000);
-		}
-	}
-
-	for (usz idx = m_output_buffer_index;;)
-	{
-		auto& out_cur = m_compression_threads[idx % m_compression_threads.size()].m_output;
-		auto& out_next = m_compression_threads[(idx + 1) % m_compression_threads.size()].m_output;
-
-		out_cur.compare_and_swap_test(null_ptr, empty_data);
-		out_next.compare_and_swap_test(null_ptr, empty_data);
-
-		if (usz new_val = m_output_buffer_index; idx != new_val)
-		{
-			// Index was changed inbetween, retry on the next index
-			idx = new_val;
-			continue;
-		}
-
-		// Must be waiting on either of the two
-		out_cur.notify_all();
-
-		// Check for single thread
-		if (&out_next != &out_cur)
-		{
-			out_next.notify_all();
-		}
-
-		break;
-	}
-
-	if (m_file_writer_thread)
-	{
-		// Join here to avoid log messages in the destructor
-		(*m_file_writer_thread)();
-	}
-
-	m_compression_threads.clear();
-	m_file_writer_thread.reset();
-
-	m_stream_data = {};
-	m_write_inited = false;
-	ar.data = {}; // Deallocate and clear
-
-	m_file->sync();
-}
-
-void compressed_zstd_serialization_file_handler::stream_data_prepare_thread_op()
-{
-	ZSTD_CCtx* m_zc = ZSTD_createCCtx();
-
-	std::vector<u8> stream_data;
-
-	const stx::shared_ptr<std::vector<u8>> null_ptr = stx::null_ptr;
-	const usz thread_index = m_thread_buffer_index++;
-
-	while (true)
-	{
-		auto& input = m_compression_threads[thread_index].m_input;
-		auto& output = m_compression_threads[thread_index].m_output;
-
-		while (!input)
-		{
-			input.wait(nullptr);
-		}
-
-		auto data = input.exchange(stx::null_ptr);
-		input.notify_all();
-
-		if (data->empty())
-		{
-			// Abort is requested, flush data and exit
-			break;
-		}
-
-		stream_data.resize(::ZSTD_compressBound(data->size()));
-		const usz out_size = ZSTD_compressCCtx(m_zc, stream_data.data(), stream_data.size(), data->data(), data->size(), ZSTD_btultra);
-
-		ensure(!ZSTD_isError(out_size) && out_size);
-
-		if (m_errored)
-		{
-			break;
-		}
-
-		stream_data.resize(out_size);
-
-		const stx::shared_ptr<std::vector<u8>> data_ptr = make_single<std::vector<u8>>(std::move(stream_data));
-
-		while (output || !output.compare_and_swap_test(null_ptr, data_ptr))
-		{
-			thread_ctrl::wait_for(1000);
-		}
-
-		//if (m_output_buffer_index % m_compression_threads.size() == thread_index)
-		{
-			output.notify_all();
-		}
-	}
-
-	ZSTD_freeCCtx(m_zc);
-}
-
-void compressed_zstd_serialization_file_handler::file_writer_thread_op()
-{
-	for (m_output_buffer_index = 0;; m_output_buffer_index++)
-	{
-		auto& output = m_compression_threads[m_output_buffer_index % m_compression_threads.size()].m_output;
-
-		while (!output)
-		{
-			output.wait(nullptr);
-		}
-
-		auto data = output.exchange(stx::null_ptr);
-		output.notify_all();
-
-		if (data->empty())
-		{
-			break;
-		}
-
-		m_file->write(*data);
-	}
-}
-
-usz compressed_zstd_serialization_file_handler::get_size(const utils::serial& ar, usz recommended) const
-{
-	if (ar.is_writing())
-	{
-		return *m_file ? m_file->size() : 0;
-	}
-
-	const usz memory_available = ar.data_offset + ar.data.size();
-
-	if (memory_available >= recommended || !*m_file)
-	{
-		// Avoid calling size() if possible
-		return memory_available;
-	}
-
-	return recommended;
-	//return std::max<usz>(utils::mul_saturate<usz>(ZSTD_decompressBound(m_file->size()), 2), memory_available);
-}
-
-bool null_serialization_file_handler::handle_file_op(utils::serial&, usz, usz, const void*)
-{
-	return true;
-}
-
-void null_serialization_file_handler::finalize(utils::serial&)
-{
-}
diff --git a/rpcs3/util/serialization_ext.hpp b/rpcs3/util/serialization_ext.hpp
deleted file mode 100644
index 51071e7188..0000000000
--- a/rpcs3/util/serialization_ext.hpp
+++ /dev/null
@@ -1,220 +0,0 @@
-#pragma once
-
-#include "util/serialization.hpp"
-#include "util/shared_ptr.hpp"
-
-#include "Utilities/Thread.h"
-
-#include <deque>
-
-namespace fs
-{
-	class file;
-}
-
-// Uncompressed file serialization handler
-struct uncompressed_serialization_file_handler : utils::serialization_file_handler
-{
-	const std::unique_ptr<fs::file> m_file_storage;
-	const std::add_pointer_t<const fs::file> m_file;
-
-	explicit uncompressed_serialization_file_handler(fs::file&& file) noexcept
-		: utils::serialization_file_handler()
-		, m_file_storage(std::make_unique<fs::file>(std::move(file)))
-		, m_file(m_file_storage.get())
-	{
-	}
-
-	explicit uncompressed_serialization_file_handler(const fs::file& file) noexcept
-		: utils::serialization_file_handler()
-		, m_file_storage(nullptr)
-		, m_file(std::addressof(file))
-	{
-	}
-
-	uncompressed_serialization_file_handler(const uncompressed_serialization_file_handler&) = delete;
-	uncompressed_serialization_file_handler& operator=(const uncompressed_serialization_file_handler&) = delete;
-
-	// Handle file read and write requests
-	bool handle_file_op(utils::serial& ar, usz pos, usz size, const void* data) override;
-
-	// Get available memory or file size
-	// Preferably memory size if is already greater/equal to recommended to avoid additional file ops
-	usz get_size(const utils::serial& ar, usz recommended) const override;
-
-	void finalize(utils::serial& ar) override;
-};
-
-template <typename File> requires (std::is_same_v<std::remove_cvref_t<File>, fs::file>)
-inline std::unique_ptr<uncompressed_serialization_file_handler> make_uncompressed_serialization_file_handler(File&& file)
-{
-	ensure(file);
-	return std::make_unique<uncompressed_serialization_file_handler>(std::forward<File>(file));
-}
-
-struct compressed_stream_data;
-
-// Compressed file serialization handler
-struct compressed_serialization_file_handler : utils::serialization_file_handler
-{
-	explicit compressed_serialization_file_handler(fs::file&& file) noexcept
-		: utils::serialization_file_handler()
-		, m_file_storage(std::make_unique<fs::file>(std::move(file)))
-		, m_file(m_file_storage.get())
-	{
-	}
-
-	explicit compressed_serialization_file_handler(const fs::file& file) noexcept
-		: utils::serialization_file_handler()
-		, m_file_storage(nullptr)
-		, m_file(std::addressof(file))
-	{
-	}
-
-	compressed_serialization_file_handler(const compressed_serialization_file_handler&) = delete;
-	compressed_serialization_file_handler& operator=(const compressed_serialization_file_handler&) = delete;
-
-	// Handle file read and write requests
-	bool handle_file_op(utils::serial& ar, usz pos, usz size, const void* data) override;
-
-	// Get available memory or file size
-	// Preferably memory size if is already greater/equal to recommended to avoid additional file ops
-	usz get_size(const utils::serial& ar, usz recommended) const override;
-	void skip_until(utils::serial& ar) override;
-
-	bool is_valid() const override
-	{
-		return !m_errored;
-	}
-
-	void finalize(utils::serial& ar) override;
-
-private:
-	const std::unique_ptr<fs::file> m_file_storage;
-	const std::add_pointer_t<const fs::file> m_file;
-	std::vector<u8> m_stream_data;
-	usz m_stream_data_index = 0;
-	usz m_file_read_index = 0;
-	atomic_t<usz> m_pending_bytes = 0;
-	atomic_t<bool> m_pending_signal = false;
-	bool m_write_inited = false;
-	bool m_read_inited = false;
-	bool m_errored = false;
-	std::shared_ptr<compressed_stream_data> m_stream;
-	std::unique_ptr<named_thread<std::function<void()>>> m_stream_data_prepare_thread;
-	std::unique_ptr<named_thread<std::function<void()>>> m_file_writer_thread;
-
-	usz read_at(utils::serial& ar, usz read_pos, void* data, usz size);
-	void initialize(utils::serial& ar);
-	void stream_data_prepare_thread_op();
-	void file_writer_thread_op();
-	void blocked_compressed_write(const std::vector<u8>& data);
-};
-
-template <typename File> requires (std::is_same_v<std::remove_cvref_t<File>, fs::file>)
-inline std::unique_ptr<compressed_serialization_file_handler> make_compressed_serialization_file_handler(File&& file)
-{
-	ensure(file);
-	return std::make_unique<compressed_serialization_file_handler>(std::forward<File>(file));
-}
-
-struct compressed_zstd_stream_data;
-
-// Compressed file serialization handler
-struct compressed_zstd_serialization_file_handler : utils::serialization_file_handler
-{
-	explicit compressed_zstd_serialization_file_handler(fs::file&& file) noexcept
-		: utils::serialization_file_handler()
-		, m_file_storage(std::make_unique<fs::file>(std::move(file)))
-		, m_file(m_file_storage.get())
-	{
-	}
-
-	explicit compressed_zstd_serialization_file_handler(const fs::file& file) noexcept
-		: utils::serialization_file_handler()
-		, m_file_storage(nullptr)
-		, m_file(std::addressof(file))
-	{
-	}
-
-	compressed_zstd_serialization_file_handler(const compressed_zstd_serialization_file_handler&) = delete;
-	compressed_zstd_serialization_file_handler& operator=(const compressed_zstd_serialization_file_handler&) = delete;
-
-	// Handle file read and write requests
-	bool handle_file_op(utils::serial& ar, usz pos, usz size, const void* data) override;
-
-	// Get available memory or file size
-	// Preferably memory size if is already greater/equal to recommended to avoid additional file ops
-	usz get_size(const utils::serial& ar, usz recommended) const override;
-	void skip_until(utils::serial& ar) override;
-
-	bool is_valid() const override
-	{
-		return !m_errored;
-	}
-
-	void finalize(utils::serial& ar) override;
-
-private:
-	const std::unique_ptr<fs::file> m_file_storage;
-	const std::add_pointer_t<const fs::file> m_file;
-	std::vector<u8> m_stream_data;
-	usz m_stream_data_index = 0;
-	usz m_file_read_index = 0;
-	atomic_t<usz> m_pending_bytes = 0;
-	atomic_t<bool> m_pending_signal = false;
-	bool m_write_inited = false;
-	bool m_read_inited = false;
-	atomic_t<bool> m_errored = false;
-
-	usz m_input_buffer_index = 0;
-	atomic_t<usz> m_output_buffer_index = 0;
-	atomic_t<usz> m_thread_buffer_index = 0;
-
-	struct compression_thread_context_t
-	{
-		atomic_ptr<std::vector<u8>> m_input;
-		atomic_ptr<std::vector<u8>> m_output;
-		bool notified = false;
-		std::unique_ptr<named_thread<std::function<void()>>> m_thread;
-	};
-
-	std::deque<compression_thread_context_t> m_compression_threads;
-	std::shared_ptr<compressed_zstd_stream_data> m_stream;
-	std::unique_ptr<named_thread<std::function<void()>>> m_file_writer_thread;
-
-	usz read_at(utils::serial& ar, usz read_pos, void* data, usz size);
-	void initialize(utils::serial& ar);
-	void stream_data_prepare_thread_op();
-	void file_writer_thread_op();
-};
-
-template <typename File> requires (std::is_same_v<std::remove_cvref_t<File>, fs::file>)
-inline std::unique_ptr<compressed_zstd_serialization_file_handler> make_compressed_zstd_serialization_file_handler(File&& file)
-{
-	ensure(file);
-	return std::make_unique<compressed_zstd_serialization_file_handler>(std::forward<File>(file));
-}
-
-// Null file serialization handler
-struct null_serialization_file_handler : utils::serialization_file_handler
-{
-	explicit null_serialization_file_handler() noexcept
-	{
-	}
-
-	// Handle file read and write requests
-	bool handle_file_op(utils::serial& ar, usz pos, usz size, const void* data) override;
-
-	void finalize(utils::serial& ar) override;
-
-	bool is_null() const override
-	{
-		return true;
-	}
-};
-
-inline std::unique_ptr<null_serialization_file_handler> make_null_serialization_file_handler()
-{
-	return std::make_unique<null_serialization_file_handler>();
-}
diff --git a/rpcs3/util/shared_ptr.hpp b/rpcs3/util/shared_ptr.hpp
index d66e6d6aa2..1f6bdf26f4 100644
--- a/rpcs3/util/shared_ptr.hpp
+++ b/rpcs3/util/shared_ptr.hpp
@@ -1,14 +1,13 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
+#include <cstdint>
 #include <memory>
-#include <utility>
 #include "atomic.hpp"
-#include "bless.hpp"
 
 namespace stx
 {
 	template <typename To, typename From>
-	constexpr bool same_ptr_implicit_v = std::is_convertible_v<const volatile From*, const volatile To*> ? PtrSame<From, To> : false;
+	constexpr bool same_ptr_implicit_v = std::is_convertible_v<const volatile From*, const volatile To*> ? is_same_ptr<From, To>() : false;
 
 	template <typename T>
 	class single_ptr;
@@ -19,8 +18,14 @@ namespace stx
 	template <typename T>
 	class atomic_ptr;
 
-	// Use 16 bits as atomic_ptr internal counter of borrowed refs
-	constexpr uint c_ref_mask = 0xffff;
+	// Basic assumption of userspace pointer size
+	constexpr uint c_ptr_size = 47;
+
+	// Use lower 17 bits as atomic_ptr internal counter of borrowed refs (pointer itself is shifted)
+	constexpr uint c_ref_mask = 0x1ffff, c_ref_size = 17;
+
+	// Remaining pointer bits
+	constexpr uptr c_ptr_mask = static_cast<uptr>(-1) << c_ref_size;
 
 	struct shared_counter
 	{
@@ -44,7 +49,7 @@ namespace stx
 
 	// Control block with data and reference counter
 	template <typename T>
-	class shared_data final : align_filler<sizeof(shared_counter), alignof(T)>
+	class alignas(T) shared_data final : align_filler<sizeof(shared_counter), alignof(T)>
 	{
 	public:
 		shared_counter m_ctr{};
@@ -59,7 +64,7 @@ namespace stx
 	};
 
 	template <typename T>
-	class shared_data<T[]> final : align_filler<sizeof(shared_counter) + sizeof(usz), alignof(T)>
+	class alignas(T) shared_data<T[]> final : align_filler<sizeof(shared_counter) + sizeof(usz), alignof(T)>
 	{
 	public:
 		usz m_count{};
@@ -69,8 +74,6 @@ namespace stx
 		constexpr shared_data() noexcept = default;
 	};
 
-	struct null_ptr_t;
-
 	// Simplified unique pointer. In some cases, std::unique_ptr is preferred.
 	// This one is shared_ptr counterpart, it has a control block with refs and deleter.
 	// It's trivially convertible to shared_ptr, and back if refs == 1.
@@ -95,6 +98,8 @@ namespace stx
 		friend class atomic_ptr;
 
 	public:
+		using pointer = T*;
+
 		using element_type = std::remove_extent_t<T>;
 
 		constexpr single_ptr() noexcept = default;
@@ -104,7 +109,7 @@ namespace stx
 		// Default constructor or null_ptr should be used instead
 		[[deprecated("Use null_ptr")]] single_ptr(std::nullptr_t) = delete;
 
-		explicit single_ptr(shared_data<T>&, element_type* ptr) noexcept
+		explicit single_ptr(shared_data<T>&, pointer ptr) noexcept
 			: m_ptr(ptr)
 		{
 		}
@@ -122,7 +127,7 @@ namespace stx
 			r.m_ptr = nullptr;
 		}
 
-		~single_ptr() noexcept
+		~single_ptr()
 		{
 			reset();
 		}
@@ -149,7 +154,6 @@ namespace stx
 			if (m_ptr) [[likely]]
 			{
 				const auto o = d();
-				ensure(o->refs == 1);
 				o->destroy.load()(o);
 				m_ptr = nullptr;
 			}
@@ -165,7 +169,7 @@ namespace stx
 			return m_ptr;
 		}
 
-		element_type& operator*() const noexcept requires (!std::is_void_v<element_type>)
+		decltype(auto) operator*() const noexcept requires (!std::is_void_v<element_type>)
 		{
 			return *m_ptr;
 		}
@@ -175,9 +179,16 @@ namespace stx
 			return m_ptr;
 		}
 
-		element_type& operator[](std::ptrdiff_t idx) const noexcept requires (!std::is_void_v<element_type> && std::is_array_v<T>)
+		decltype(auto) operator[](std::ptrdiff_t idx) const noexcept requires (!std::is_void_v<element_type>)
 		{
-			return m_ptr[idx];
+			if constexpr (std::is_array_v<T>)
+			{
+				return m_ptr[idx];
+			}
+			else
+			{
+				return *m_ptr;
+			}
 		}
 
 		template <typename... Args> requires (std::is_invocable_v<T, Args&&...>)
@@ -186,6 +197,11 @@ namespace stx
 			return std::invoke(*m_ptr, std::forward<Args>(args)...);
 		}
 
+		operator element_type*() const noexcept
+		{
+			return m_ptr;
+		}
+
 		explicit constexpr operator bool() const noexcept
 		{
 			return m_ptr != nullptr;
@@ -199,25 +215,15 @@ namespace stx
 			r.m_ptr = static_cast<decltype(r.m_ptr)>(std::exchange(m_ptr, nullptr));
 			return r;
 		}
-
-		template <typename U> requires same_ptr_implicit_v<T, U>
-		bool operator==(const single_ptr<U>& r) const noexcept
-		{
-			return get() == r.get();
-		}
 	};
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Winvalid-offsetof"
-#elif !defined(_MSC_VER)
+#ifndef _MSC_VER
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Winvalid-offsetof"
 #endif
 
 	template <typename T, bool Init = true, typename... Args>
-		requires(!std::is_unbounded_array_v<T> && (Init || std::is_array_v<T>) && (Init || !sizeof...(Args)))
-	static single_ptr<T> make_single(Args&&... args) noexcept
+	static std::enable_if_t<!(std::is_unbounded_array_v<T>) && (Init || !sizeof...(Args)), single_ptr<T>> make_single(Args&&... args) noexcept
 	{
 		static_assert(offsetof(shared_data<T>, m_data) - offsetof(shared_data<T>, m_ctr) == sizeof(shared_counter));
 
@@ -225,7 +231,7 @@ namespace stx
 
 		shared_data<T>* ptr = nullptr;
 
-		if constexpr (!std::is_array_v<T>)
+		if constexpr (Init && !std::is_array_v<T>)
 		{
 			ptr = new shared_data<T>(std::forward<Args>(args)...);
 		}
@@ -252,9 +258,8 @@ namespace stx
 		return single_ptr<T>(*ptr, &ptr->m_data);
 	}
 
-	template <typename T, bool Init = true, usz Align = alignof(std::remove_extent_t<T>)>
-		requires (std::is_unbounded_array_v<T> && std::is_default_constructible_v<std::remove_extent_t<T>>)
-	static single_ptr<T> make_single(usz count) noexcept
+	template <typename T, bool Init = true>
+	static std::enable_if_t<std::is_unbounded_array_v<T>, single_ptr<T>> make_single(usz count) noexcept
 	{
 		static_assert(sizeof(shared_data<T>) - offsetof(shared_data<T>, m_ctr) == sizeof(shared_counter));
 
@@ -264,9 +269,9 @@ namespace stx
 
 		std::byte* bytes = nullptr;
 
-		if constexpr (Align > (__STDCPP_DEFAULT_NEW_ALIGNMENT__))
+		if constexpr (alignof(etype) > (__STDCPP_DEFAULT_NEW_ALIGNMENT__))
 		{
-			bytes = static_cast<std::byte*>(::operator new(size, std::align_val_t{Align}));
+			bytes = static_cast<std::byte*>(::operator new(size, std::align_val_t{alignof(etype)}));
 		}
 		else
 		{
@@ -300,9 +305,9 @@ namespace stx
 
 			ptr->~shared_data<T>();
 
-			if constexpr (Align > (__STDCPP_DEFAULT_NEW_ALIGNMENT__))
+			if constexpr (alignof(etype) > (__STDCPP_DEFAULT_NEW_ALIGNMENT__))
 			{
-				::operator delete[](bytes, std::align_val_t{Align});
+				::operator delete[](bytes, std::align_val_t{alignof(etype)});
 			}
 			else
 			{
@@ -319,9 +324,7 @@ namespace stx
 		return make_single<std::remove_reference_t<T>>(std::forward<T>(value));
 	}
 
-#ifdef __clang__
-#pragma clang diagnostic pop
-#elif !defined(_MSC_VER)
+#ifndef _MSC_VER
 #pragma GCC diagnostic pop
 #endif
 
@@ -344,6 +347,8 @@ namespace stx
 		friend class atomic_ptr;
 
 	public:
+		using pointer = T*;
+
 		using element_type = std::remove_extent_t<T>;
 
 		constexpr shared_ptr() noexcept = default;
@@ -359,8 +364,13 @@ namespace stx
 		[[deprecated("Use null_ptr")]] shared_ptr(std::nullptr_t) = delete;
 
 		// Not-so-aliasing constructor: emulates std::enable_shared_from_this without its overhead
-		template <typename Type>
-		friend shared_ptr<Type> make_shared_from_this(const Type* _this) noexcept;
+		explicit shared_ptr(T* _this) noexcept
+			: m_ptr(_this)
+		{
+			// Random checks which may fail on invalid pointer
+			ensure((reinterpret_cast<u64>(d()->destroy) - 0x10000) >> 47 == 0);
+			ensure((d()->refs++ - 1) >> 58 == 0);
+		}
 
 		template <typename U> requires same_ptr_implicit_v<T, U>
 		shared_ptr(const shared_ptr<U>& r) noexcept
@@ -390,7 +400,7 @@ namespace stx
 			r.m_ptr = nullptr;
 		}
 
-		~shared_ptr() noexcept
+		~shared_ptr()
 		{
 			reset();
 		}
@@ -433,31 +443,32 @@ namespace stx
 		// Set to null
 		void reset() noexcept
 		{
-			if (m_ptr) [[unlikely]]
+			const auto o = d();
+
+			if (m_ptr && !--o->refs) [[unlikely]]
 			{
-				const auto o = d();
-
-				if (!--o->refs)
-				{
-					o->destroy(o);
-				}
-
+				o->destroy(o);
 				m_ptr = nullptr;
 			}
 		}
 
-		// Converts to unique (single) ptr if reference is 1. Nullifies self on success.
+		// Converts to unique (single) ptr if reference is 1, otherwise returns null. Nullifies self.
 		template <typename U> requires PtrSame<T, U>
-		single_ptr<U> try_convert_to_single_ptr() noexcept
+		explicit operator single_ptr<U>() && noexcept
 		{
-			if (const auto o = m_ptr ? d() : nullptr; o && o->refs == 1u)
+			const auto o = d();
+
+			if (m_ptr && !--o->refs)
 			{
 				// Convert last reference to single_ptr instance.
-				single_ptr<U> r;
+				o->refs.release(1);
+				single_ptr<T> r;
 				r.m_ptr = static_cast<decltype(r.m_ptr)>(std::exchange(m_ptr, nullptr));
 				return r;
 			}
 
+			// Otherwise, both pointers are gone. Didn't seem right to do it in the constructor.
+			m_ptr = nullptr;
 			return {};
 		}
 
@@ -471,7 +482,7 @@ namespace stx
 			return m_ptr;
 		}
 
-		element_type& operator*() const noexcept requires (!std::is_void_v<element_type>)
+		decltype(auto) operator*() const noexcept requires (!std::is_void_v<element_type>)
 		{
 			return *m_ptr;
 		}
@@ -481,9 +492,16 @@ namespace stx
 			return m_ptr;
 		}
 
-		element_type& operator[](std::ptrdiff_t idx) const noexcept requires (!std::is_void_v<element_type> && std::is_array_v<T>)
+		decltype(auto) operator[](std::ptrdiff_t idx) const noexcept requires (!std::is_void_v<element_type>)
 		{
-			return m_ptr[idx];
+			if constexpr (std::is_array_v<T>)
+			{
+				return m_ptr[idx];
+			}
+			else
+			{
+				return *m_ptr;
+			}
 		}
 
 		template <typename... Args> requires (std::is_invocable_v<T, Args&&...>)
@@ -504,6 +522,11 @@ namespace stx
 			}
 		}
 
+		operator element_type*() const noexcept
+		{
+			return m_ptr;
+		}
+
 		explicit constexpr operator bool() const noexcept
 		{
 			return m_ptr != nullptr;
@@ -531,69 +554,35 @@ namespace stx
 			r.m_ptr = static_cast<decltype(r.m_ptr)>(std::exchange(m_ptr, nullptr));
 			return r;
 		}
-
-		template <typename U> requires same_ptr_implicit_v<T, U>
-		bool operator==(const shared_ptr<U>& r) const noexcept
-		{
-			return get() == r.get();
-		}
 	};
 
-	template <typename T, typename... Args>
-		requires(!std::is_unbounded_array_v<T> && std::is_constructible_v<std::remove_extent_t<T>, Args&& ...>)
-	static shared_ptr<T> make_shared(Args&&... args) noexcept
+	template <typename T, bool Init = true, typename... Args>
+	static std::enable_if_t<!std::is_unbounded_array_v<T> && (!Init || !sizeof...(Args)), shared_ptr<T>> make_shared(Args&&... args) noexcept
 	{
-		return make_single<T>(std::forward<Args>(args)...);
+		return make_single<T, Init>(std::forward<Args>(args)...);
 	}
 
 	template <typename T, bool Init = true>
-		requires (std::is_unbounded_array_v<T> && std::is_default_constructible_v<std::remove_extent_t<T>>)
-	static shared_ptr<T> make_shared(usz count) noexcept
+	static std::enable_if_t<std::is_unbounded_array_v<T>, shared_ptr<T>> make_shared(usz count) noexcept
 	{
 		return make_single<T, Init>(count);
 	}
 
 	template <typename T>
-		requires (std::is_constructible_v<std::remove_reference_t<T>, T&&>)
-	static shared_ptr<std::remove_reference_t<T>> make_shared_value(T&& value) noexcept
+	static shared_ptr<std::remove_reference_t<T>> make_shared_value(T&& value)
 	{
 		return make_single_value(std::forward<T>(value));
 	}
 
-	// Not-so-aliasing constructor: emulates std::enable_shared_from_this without its overhead
-	template <typename T>
-	static shared_ptr<T> make_shared_from_this(const T* _this) noexcept
-	{
-		shared_ptr<T> r;
-		r.m_ptr = const_cast<T*>(_this);
-
-		if (!_this) [[unlikely]]
-		{
-			return r;
-		}
-
-		// Random checks which may fail on invalid pointer
-		ensure((r.d()->refs++ - 1) >> 58 == 0);
-		return r;
-	}
-
 	// Atomic simplified shared pointer
 	template <typename T>
 	class atomic_ptr
 	{
-	private:
-		struct fat_ptr
-		{
-			uptr ptr{};
-			u32 is_non_null{};
-			u32 ref_ctr{};
-		};
+		mutable atomic_t<uptr> m_val{0};
 
-		mutable atomic_t<fat_ptr> m_val{fat_ptr{}};
-
-		static shared_counter* d(fat_ptr val) noexcept
+		static shared_counter* d(uptr val)
 		{
-			return std::launder(reinterpret_cast<shared_counter*>(val.ptr - sizeof(shared_counter)));
+			return std::launder(reinterpret_cast<shared_counter*>((val >> c_ref_size) - sizeof(shared_counter)));
 		}
 
 		shared_counter* d() const noexcept
@@ -601,39 +590,12 @@ namespace stx
 			return d(m_val);
 		}
 
-		static fat_ptr to_val(const volatile std::remove_extent_t<T>* ptr) noexcept
-		{
-			return fat_ptr{reinterpret_cast<uptr>(ptr), ptr != nullptr, 0};
-		}
-
-		static fat_ptr to_val(uptr ptr) noexcept
-		{
-			return fat_ptr{ptr, ptr != 0, 0};
-		}
-
-		static std::remove_extent_t<T>* ptr_to(fat_ptr val) noexcept
-		{
-			return reinterpret_cast<std::remove_extent_t<T>*>(val.ptr);
-		}
-
 		template <typename U>
 		friend class atomic_ptr;
 
-		// Helper struct to check if a type is an instance of a template
-		template <typename T1, template <typename> class Template>
-		struct is_instance_of : std::false_type {};
-
-		template <typename T1, template <typename> class Template>
-		struct is_instance_of<Template<T1>, Template> : std::true_type {};
-
-		template <typename T1>
-		static constexpr bool is_stx_pointer = false
-			|| is_instance_of<std::remove_cvref_t<T1>, shared_ptr>::value
-			|| is_instance_of<std::remove_cvref_t<T1>, single_ptr>::value
-			|| is_instance_of<std::remove_cvref_t<T1>, atomic_ptr>::value
-			|| std::is_same_v<std::remove_cvref_t<T1>, null_ptr_t>;
-
 	public:
+		using pointer = T*;
+
 		using element_type = std::remove_extent_t<T>;
 
 		using shared_type = shared_ptr<T>;
@@ -641,14 +603,11 @@ namespace stx
 		constexpr atomic_ptr() noexcept = default;
 
 		// Optimized value construct
-		template <typename... Args> requires (true
-			&& sizeof...(Args) != 0
-			&& !(sizeof...(Args) == 1 && (is_stx_pointer<Args> || ...))
-			&& std::is_constructible_v<element_type, Args&&...>)
+		template <typename... Args, typename = std::enable_if_t<std::is_constructible_v<T, Args...>>>
 		explicit atomic_ptr(Args&&... args) noexcept
 		{
 			shared_type r = make_single<T>(std::forward<Args>(args)...);
-			m_val.raw() = to_val(std::exchange(r.m_ptr, nullptr));
+			m_val = reinterpret_cast<uptr>(std::exchange(r.m_ptr, nullptr)) << c_ref_size;
 			d()->refs.raw() += c_ref_mask;
 		}
 
@@ -656,60 +615,50 @@ namespace stx
 		atomic_ptr(const shared_ptr<U>& r) noexcept
 		{
 			// Obtain a ref + as many refs as an atomic_ptr can additionally reference
-			if (fat_ptr rval = to_val(r.m_ptr); rval.ptr != 0)
-			{
-				m_val.raw() = rval;
-				d(rval)->refs += c_ref_mask + 1;
-			}
+			m_val = reinterpret_cast<uptr>(r.m_ptr) << c_ref_size;
+			if (m_val)
+				d()->refs += c_ref_mask + 1;
 		}
 
 		template <typename U> requires same_ptr_implicit_v<T, U>
 		atomic_ptr(shared_ptr<U>&& r) noexcept
 		{
-			if (fat_ptr rval = to_val(r.m_ptr); rval.ptr != 0)
-			{
-				m_val.raw() = rval;
-				d(rval)->refs += c_ref_mask;
-			}
-
+			m_val = reinterpret_cast<uptr>(r.m_ptr) << c_ref_size;
 			r.m_ptr = nullptr;
+
+			if (m_val)
+				d()->refs += c_ref_mask;
 		}
 
 		template <typename U> requires same_ptr_implicit_v<T, U>
 		atomic_ptr(single_ptr<U>&& r) noexcept
 		{
-			if (fat_ptr rval = to_val(r.m_ptr); rval.ptr != 0)
-			{
-				m_val.raw() = rval;
-				d(rval)->refs += c_ref_mask;
-			}
-
+			m_val = reinterpret_cast<uptr>(r.m_ptr) << c_ref_size;
 			r.m_ptr = nullptr;
+
+			if (m_val)
+				d()->refs += c_ref_mask;
 		}
 
-		~atomic_ptr() noexcept
+		~atomic_ptr()
 		{
-			const fat_ptr v = m_val.raw();
+			const uptr v = m_val.raw();
+			const auto o = d(v);
 
-			if (v.ptr)
+			if (v >> c_ref_size && !o->refs.sub_fetch(c_ref_mask + 1 - (v & c_ref_mask)))
 			{
-				const auto o = d(v);
-
-				if (!o->refs.sub_fetch(c_ref_mask + 1 - (v.ref_ctr & c_ref_mask)))
-				{
-					o->destroy.load()(o);
-				}
+				o->destroy.load()(o);
 			}
 		}
 
 		// Optimized value assignment
-		atomic_ptr& operator=(std::remove_cv_t<T> value) noexcept requires (!is_stx_pointer<T>)
+		atomic_ptr& operator=(std::remove_cv_t<T> value) noexcept
 		{
 			shared_type r = make_single<T>(std::move(value));
 			r.d()->refs.raw() += c_ref_mask;
 
 			atomic_ptr old;
-			old.m_val.raw() = m_val.exchange(to_val(std::exchange(r.m_ptr, nullptr)));
+			old.m_val.raw() = m_val.exchange(reinterpret_cast<uptr>(std::exchange(r.m_ptr, nullptr)) << c_ref_size);
 			return *this;
 		}
 
@@ -744,11 +693,11 @@ namespace stx
 			shared_type r;
 
 			// Add reference
-			const auto [prev, did_ref] = m_val.fetch_op([](fat_ptr& val)
+			const auto [prev, did_ref] = m_val.fetch_op([](uptr& val)
 			{
-				if (val.ptr)
+				if (val >> c_ref_size)
 				{
-					val.ref_ctr++;
+					val++;
 					return true;
 				}
 
@@ -762,15 +711,15 @@ namespace stx
 			}
 
 			// Set referenced pointer
-			r.m_ptr = std::launder(ptr_to(prev));
+			r.m_ptr = std::launder(reinterpret_cast<element_type*>(prev >> c_ref_size));
 			r.d()->refs++;
 
 			// Dereference if still the same pointer
-			const auto [_, did_deref] = m_val.fetch_op([prev = prev](fat_ptr& val)
+			const auto [_, did_deref] = m_val.fetch_op([prev = prev](uptr& val)
 			{
-				if (val.ptr == prev.ptr)
+				if (val >> c_ref_size == prev >> c_ref_size)
 				{
-					val.ref_ctr--;
+					val--;
 					return true;
 				}
 
@@ -793,11 +742,11 @@ namespace stx
 			shared_type r;
 
 			// Add reference
-			const auto [prev, did_ref] = m_val.fetch_op([](fat_ptr& val)
+			const auto [prev, did_ref] = m_val.fetch_op([](uptr& val)
 			{
-				if (val.ptr)
+				if (val >> c_ref_size)
 				{
-					val.ref_ctr++;
+					val++;
 					return true;
 				}
 
@@ -807,7 +756,7 @@ namespace stx
 			// Set fake unreferenced pointer
 			if (did_ref)
 			{
-				r.m_ptr = std::launder(ptr_to(prev));
+				r.m_ptr = std::launder(reinterpret_cast<element_type*>(prev >> c_ref_size));
 			}
 
 			// Result temp storage
@@ -834,11 +783,11 @@ namespace stx
 			}
 
 			// Dereference if still the same pointer
-			const auto [_, did_deref] = m_val.fetch_op([prev = prev](fat_ptr& val)
+			const auto [_, did_deref] = m_val.fetch_op([prev = prev](uptr& val)
 			{
-				if (val.ptr == prev.ptr)
+				if (val >> c_ref_size == prev >> c_ref_size)
 				{
-					val.ref_ctr--;
+					val--;
 					return true;
 				}
 
@@ -861,19 +810,14 @@ namespace stx
 			}
 		}
 
-		// Create an object from variadic args
-		// If a type needs shared_type to be constructed, std::reference_wrapper can be used
-		template <typename... Args> requires (true
-			&& sizeof...(Args) != 0
-			&& !(sizeof...(Args) == 1 && (is_stx_pointer<Args> || ...))
-			&& std::is_constructible_v<element_type, Args&&...>)
+		template <typename... Args, typename = std::enable_if_t<std::is_constructible_v<T, Args...>>>
 		void store(Args&&... args) noexcept
 		{
 			shared_type r = make_single<T>(std::forward<Args>(args)...);
 			r.d()->refs.raw() += c_ref_mask;
 
 			atomic_ptr old;
-			old.m_val.raw() = m_val.exchange(to_val(std::exchange(r.m_ptr, nullptr)));
+			old.m_val.raw() = m_val.exchange(reinterpret_cast<uptr>(std::exchange(r.m_ptr, nullptr)) << c_ref_size);
 		}
 
 		void store(shared_type value) noexcept
@@ -885,23 +829,20 @@ namespace stx
 			}
 
 			atomic_ptr old;
-			old.m_val.raw() = m_val.exchange(to_val(std::exchange(value.m_ptr, nullptr)));
+			old.m_val.raw() = m_val.exchange(reinterpret_cast<uptr>(std::exchange(value.m_ptr, nullptr)) << c_ref_size);
 		}
 
-		template <typename... Args> requires (true
-			&& sizeof...(Args) != 0
-			&& !(sizeof...(Args) == 1 && (is_stx_pointer<Args> || ...))
-			&& std::is_constructible_v<element_type, Args&...>)
+		template <typename... Args, typename = std::enable_if_t<std::is_constructible_v<T, Args...>>>
 		[[nodiscard]] shared_type exchange(Args&&... args) noexcept
 		{
 			shared_type r = make_single<T>(std::forward<Args>(args)...);
 			r.d()->refs.raw() += c_ref_mask;
 
 			atomic_ptr old;
-			old.m_val.raw() = m_val.exchange(to_val(r.m_ptr));
-			old.m_val.raw().ref_ctr += 1;
+			old.m_val.raw() += m_val.exchange(reinterpret_cast<uptr>(r.m_ptr) << c_ref_size);
+			old.m_val.raw() += 1;
 
-			r.m_ptr = std::launder(ptr_to(old.m_val));
+			r.m_ptr = std::launder(reinterpret_cast<element_type*>(old.m_val >> c_ref_size));
 			return r;
 		}
 
@@ -914,10 +855,10 @@ namespace stx
 			}
 
 			atomic_ptr old;
-			old.m_val.raw() = m_val.exchange(to_val(value.m_ptr));
-			old.m_val.raw().ref_ctr += 1;
+			old.m_val.raw() += m_val.exchange(reinterpret_cast<uptr>(value.m_ptr) << c_ref_size);
+			old.m_val.raw() += 1;
 
-			value.m_ptr = std::launder(ptr_to(old.m_val));
+			value.m_ptr = std::launder(reinterpret_cast<element_type*>(old.m_val >> c_ref_size));
 			return value;
 		}
 
@@ -929,26 +870,26 @@ namespace stx
 
 			if (exch.m_ptr)
 			{
-				exch.d()->refs += c_ref_mask;
+				exch.d().refs += c_ref_mask;
 			}
 
 			atomic_ptr old;
 
-			const fat_ptr _val = m_val.fetch_op([&](fat_ptr& val)
+			const uptr _val = m_val.fetch_op([&](uptr& val)
 			{
-				if (val.ptr == _old)
+				if (val >> c_ref_size == _old)
 				{
 					// Set new value
-					val = to_val(_new);
+					val = _new << c_ref_size;
 				}
-				else if (val.ptr != 0)
+				else if (val)
 				{
 					// Reference previous value
-					val.ref_ctr++;
+					val++;
 				}
 			});
 
-			if (_val.ptr == _old)
+			if (_val >> c_ref_size == _old)
 			{
 				// Success (exch is consumed, cmp_and_old is unchanged)
 				if (exch.m_ptr)
@@ -962,27 +903,26 @@ namespace stx
 			}
 
 			atomic_ptr old_exch;
-			old_exch.m_val.raw() = to_val(std::exchange(exch.m_ptr, nullptr));
+			old_exch.m_val.raw() = reinterpret_cast<uptr>(std::exchange(exch.m_ptr, nullptr)) << c_ref_size;
 
 			// Set to reset old cmp_and_old value
-			old.m_val.raw() = to_val(cmp_and_old.m_ptr);
-			old.m_val.raw().ref_ctr |= c_ref_mask;
+			old.m_val.raw() = (cmp_and_old.m_ptr << c_ref_size) | c_ref_mask;
 
-			if (!_val.ptr)
+			if (!_val)
 			{
 				return false;
 			}
 
 			// Set referenced pointer
-			cmp_and_old.m_ptr = std::launder(ptr_to(_val));
+			cmp_and_old.m_ptr = std::launder(reinterpret_cast<element_type*>(_val >> c_ref_size));
 			cmp_and_old.d()->refs++;
 
 			// Dereference if still the same pointer
-			const auto [_, did_deref] = m_val.fetch_op([_val](fat_ptr& val)
+			const auto [_, did_deref] = m_val.fetch_op([_val](uptr& val)
 			{
-				if (val.ptr == _val.ptr)
+				if (val >> c_ref_size == _val >> c_ref_size)
 				{
-					val.ref_ctr--;
+					val--;
 					return true;
 				}
 
@@ -1016,17 +956,17 @@ namespace stx
 
 			if (exch.m_ptr)
 			{
-				exch.d()->refs += c_ref_mask;
+				exch.d().refs += c_ref_mask;
 			}
 
 			atomic_ptr old;
 
-			const auto [_val, ok] = m_val.fetch_op([&](fat_ptr& val)
+			const auto [_val, ok] = m_val.fetch_op([&](uptr& val)
 			{
-				if (val.ptr == _old)
+				if (val >> c_ref_size == _old)
 				{
 					// Set new value
-					val = to_val(_new);
+					val = _new << c_ref_size;
 					return true;
 				}
 
@@ -1042,7 +982,7 @@ namespace stx
 			}
 
 			// Failure (return references)
-			old.m_val.raw() = to_val(std::exchange(exch.m_ptr, nullptr));
+			old.m_val.raw() = reinterpret_cast<uptr>(std::exchange(exch.m_ptr, nullptr)) << c_ref_size;
 			return false;
 		}
 
@@ -1083,9 +1023,9 @@ namespace stx
 			do
 			{
 				// Update old head with current value
-				next.m_ptr = std::launder(ptr_to(old.m_val.raw()));
+				next.m_ptr = reinterpret_cast<T*>(old.m_val.raw() >> c_ref_size);
 
-			} while (!m_val.compare_exchange(old.m_val.raw(), to_val(exch.m_ptr)));
+			} while (!m_val.compare_exchange(old.m_val.raw(), reinterpret_cast<uptr>(exch.m_ptr) << c_ref_size));
 
 			// This argument is consumed (moved from)
 			exch.m_ptr = nullptr;
@@ -1093,51 +1033,47 @@ namespace stx
 			if (next.m_ptr)
 			{
 				// Compensation for `next` assignment
-				old.m_val.raw().ref_ctr += 1;
+				old.m_val.raw() += 1;
 			}
 		}
 
 		// Simple atomic load is much more effective than load(), but it's a non-owning reference
-		T* observe() const noexcept
+		const volatile void* observe() const noexcept
 		{
-			return std::launder(ptr_to(m_val));
+			return reinterpret_cast<const volatile void*>(m_val >> c_ref_size);
 		}
 
 		explicit constexpr operator bool() const noexcept
 		{
-			return observe() != nullptr;
+			return m_val != 0;
 		}
 
 		template <typename U> requires same_ptr_implicit_v<T, U>
 		bool is_equal(const shared_ptr<U>& r) const noexcept
 		{
-			return static_cast<volatile const void*>(observe()) == r.get();
+			return observe() == r.get();
 		}
 
 		template <typename U> requires same_ptr_implicit_v<T, U>
 		bool is_equal(const single_ptr<U>& r) const noexcept
 		{
-			return static_cast<volatile const void*>(observe()) == r.get();
+			return observe() == r.get();
 		}
 
-		atomic_t<u32> &get_wait_atomic()
+		template <atomic_wait::op Flags = atomic_wait::op::eq>
+		void wait(const volatile void* value, atomic_wait_timeout timeout = atomic_wait_timeout::inf)
 		{
-			return *utils::bless<atomic_t<u32>>(&m_val.raw().is_non_null);
-		}
-
-		void wait(std::nullptr_t, atomic_wait_timeout timeout = atomic_wait_timeout::inf)
-		{
-			get_wait_atomic().wait(0, timeout);
+			m_val.wait<Flags>(reinterpret_cast<uptr>(value) << c_ref_size, c_ptr_mask, timeout);
 		}
 
 		void notify_one()
 		{
-			get_wait_atomic().notify_one();
+			m_val.notify_one(c_ptr_mask);
 		}
 
 		void notify_all()
 		{
-			get_wait_atomic().notify_all();
+			m_val.notify_all(c_ptr_mask);
 		}
 	};
 
@@ -1167,32 +1103,50 @@ namespace stx
 			return false;
 		}
 
+		constexpr operator std::nullptr_t() const noexcept
+		{
+			return nullptr;
+		}
+
+		constexpr std::nullptr_t get() const noexcept
+		{
+			return nullptr;
+		}
+
 	} null_ptr;
 }
 
-template <typename T>
-struct std::hash<stx::single_ptr<T>>
+namespace atomic_wait
 {
-	usz operator()(const stx::single_ptr<T>& x) const noexcept
-	{
-		return std::hash<T*>()(x.get());
-	}
-};
+	template <typename T>
+	constexpr u128 default_mask<stx::atomic_ptr<T>> = stx::c_ptr_mask;
 
-template <typename T>
-struct std::hash<stx::shared_ptr<T>>
-{
-	usz operator()(const stx::shared_ptr<T>& x) const noexcept
+	template <typename T>
+	constexpr u128 get_value(stx::atomic_ptr<T>&, const volatile void* value = nullptr)
 	{
-		return std::hash<T*>()(x.get());
+		return reinterpret_cast<uptr>(value) << stx::c_ref_size;
 	}
-};
+}
+
+namespace std
+{
+	template <typename T>
+	void swap(stx::single_ptr<T>& lhs, stx::single_ptr<T>& rhs) noexcept
+	{
+		lhs.swap(rhs);
+	}
+
+	template <typename T>
+	void swap(stx::shared_ptr<T>& lhs, stx::shared_ptr<T>& rhs) noexcept
+	{
+		lhs.swap(rhs);
+	}
+}
 
 using stx::null_ptr;
 using stx::single_ptr;
 using stx::shared_ptr;
 using stx::atomic_ptr;
 using stx::make_single;
-using stx::make_shared;
 using stx::make_single_value;
 using stx::make_shared_value;
diff --git a/rpcs3/util/simd.hpp b/rpcs3/util/simd.hpp
deleted file mode 100644
index ff4e0eed78..0000000000
--- a/rpcs3/util/simd.hpp
+++ /dev/null
@@ -1,3274 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-#include "util/v128.hpp"
-#include "util/sysinfo.hpp"
-#include "util/asm.hpp"
-#include "Utilities/JIT.h"
-
-#if defined(ARCH_X64)
-#ifdef _MSC_VER
-#include <intrin.h>
-#else
-#include <x86intrin.h>
-#endif
-
-#include <immintrin.h>
-#include <emmintrin.h>
-#endif
-
-#if defined(ARCH_ARM64)
-#include <arm_neon.h>
-#endif
-
-#include <algorithm>
-#include <cmath>
-#include <math.h>
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#endif
-
-namespace asmjit
-{
-	struct vec_builder;
-}
-
-inline thread_local asmjit::vec_builder* g_vc = nullptr;
-
-namespace asmjit
-{
-#if defined(ARCH_X64)
-	using gpr_type = x86::Gp;
-	using vec_type = x86::Xmm;
-	using mem_type = x86::Mem;
-#else
-	struct gpr_type : Operand
-	{
-		gpr_type() = default;
-		gpr_type(u32)
-		{
-		}
-	};
-
-	struct vec_type : Operand
-	{
-		vec_type() = default;
-		vec_type(u32)
-		{
-		}
-	};
-
-	struct mem_type : Operand
-	{
-	};
-#endif
-
-	struct mem_lazy : Operand
-	{
-		const Operand& eval(bool is_lv);
-	};
-
-	enum class arg_class : u32
-	{
-		reg_lv, // const auto x = gv_...(y, z);
-		reg_rv, // r = gv_...(y, z);
-		imm_lv,
-		imm_rv,
-		mem_lv,
-		mem_rv,
-	};
-
-	constexpr arg_class operator+(arg_class _base, u32 off)
-	{
-		return arg_class(u32(_base) + off);
-	}
-
-	template <typename... Args>
-	constexpr bool any_operand_v = (std::is_base_of_v<Operand, std::decay_t<Args>> || ...);
-
-	template <typename T, typename D = std::decay_t<T>>
-	constexpr arg_class arg_classify =
-		std::is_same_v<v128, D> ? arg_class::imm_lv + !std::is_reference_v<T> :
-		std::is_base_of_v<mem_type, D> ? arg_class::mem_lv :
-		std::is_base_of_v<mem_lazy, D> ? arg_class::mem_lv + !std::is_reference_v<T> :
-		std::is_reference_v<T> ? arg_class::reg_lv : arg_class::reg_rv;
-
-	struct vec_builder : native_asm
-	{
-		using base = native_asm;
-
-		bool fail_flag = false;
-
-		vec_builder(CodeHolder* ch)
-			: native_asm(ch)
-		{
-			if (!g_vc)
-			{
-				g_vc = this;
-			}
-		}
-
-		~vec_builder()
-		{
-			if (g_vc == this)
-			{
-				g_vc = nullptr;
-			}
-		}
-
-		u32 vec_allocated = 0xffffffff << 6;
-
-		vec_type vec_alloc()
-		{
-			if (!~vec_allocated)
-			{
-				fail_flag = true;
-				return vec_type{0};
-			}
-
-			const u32 idx = std::countr_one(vec_allocated);
-			vec_allocated |= vec_allocated + 1;
-			return vec_type{idx};
-		}
-
-		template <u32 Size>
-		std::array<vec_type, Size> vec_alloc()
-		{
-			std::array<vec_type, Size> r;
-			for (auto& x : r)
-			{
-				x = vec_alloc();
-			}
-			return r;
-		}
-
-		void vec_dealloc(vec_type vec)
-		{
-			vec_allocated &= ~(1u << vec.id());
-		}
-
-		void emit_consts()
-		{
-			//  (TODO: sort in use order)
-			for (u32 sz = 1; sz <= 16; sz++)
-			{
-				for (auto& [key, _label] : consts[sz - 1])
-				{
-					base::align(AlignMode::kData, 1u << std::countr_zero<u32>(sz));
-					base::bind(_label);
-					base::embed(&key, sz);
-				}
-			}
-		}
-
-		std::unordered_map<v128, Label> consts[16]{};
-
-#if defined(ARCH_X64)
-		std::unordered_map<v128, vec_type> const_allocs{};
-
-		template <typename T, u32 Size = sizeof(T)>
-		x86::Mem get_const(const T& data, u32 esize = Size)
-		{
-			static_assert(Size <= 16);
-
-			// Find existing const
-			v128 key{};
-			std::memcpy(&key, &data, Size);
-
-			if (Size == 16 && esize == 4 && key._u64[0] == key._u64[1] && key._u32[0] == key._u32[1])
-			{
-				x86::Mem r = get_const<u32>(key._u32[0]);
-				r.setBroadcast(x86::Mem::Broadcast::k1To4);
-				return r;
-			}
-
-			if (Size == 16 && esize == 8 && key._u64[0] == key._u64[1])
-			{
-				x86::Mem r = get_const<u64>(key._u64[0]);
-				r.setBroadcast(x86::Mem::Broadcast::k1To2);
-				return r;
-			}
-
-			auto& _label = consts[Size - 1][key];
-
-			if (!_label.isValid())
-				_label = base::newLabel();
-
-			return x86::Mem(_label, 0, Size);
-		}
-#endif
-	};
-
-	struct free_on_exit
-	{
-		Operand x{};
-
-		free_on_exit() = default;
-		free_on_exit(const free_on_exit&) = delete;
-		free_on_exit& operator=(const free_on_exit&) = delete;
-
-		~free_on_exit()
-		{
-			if (x.isReg())
-			{
-				vec_type v;
-				v.copyFrom(x);
-				g_vc->vec_dealloc(v);
-			}
-		}
-	};
-
-#if defined(ARCH_X64)
-	inline Operand arg_eval(v128& _c, u32 esize)
-	{
-		const auto found = g_vc->const_allocs.find(_c);
-
-		if (found != g_vc->const_allocs.end())
-		{
-			return found->second;
-		}
-
-		vec_type reg = g_vc->vec_alloc();
-
-		// TODO: PSHUFD style broadcast? Needs known const layout
-		if (utils::has_avx() && _c._u64[0] == _c._u64[1])
-		{
-			if (_c._u32[0] == _c._u32[1])
-			{
-				if (utils::has_avx2() && _c._u16[0] == _c._u16[1])
-				{
-					if (_c._u8[0] == _c._u8[1])
-					{
-						ensure(!g_vc->vpbroadcastb(reg, g_vc->get_const(_c._u8[0])));
-					}
-					else
-					{
-						ensure(!g_vc->vpbroadcastw(reg, g_vc->get_const(_c._u16[0])));
-					}
-				}
-				else
-				{
-					ensure(!g_vc->vbroadcastss(reg, g_vc->get_const(_c._u32[0])));
-				}
-			}
-			else
-			{
-				ensure(!g_vc->vbroadcastsd(reg, g_vc->get_const(_c._u32[0])));
-			}
-		}
-		else if (!_c._u)
-		{
-			ensure(!g_vc->pxor(reg, reg));
-		}
-		else if (!~_c._u)
-		{
-			ensure(!g_vc->pcmpeqd(reg, reg));
-		}
-		else
-		{
-			ensure(!g_vc->movaps(reg, g_vc->get_const(_c, esize)));
-		}
-
-		g_vc->const_allocs.emplace(_c, reg);
-		return reg;
-	}
-
-	inline Operand arg_eval(v128&& _c, u32 esize)
-	{
-		const auto found = g_vc->const_allocs.find(_c);
-
-		if (found != g_vc->const_allocs.end())
-		{
-			vec_type r = found->second;
-			g_vc->const_allocs.erase(found);
-			g_vc->vec_dealloc(r);
-			return r;
-		}
-
-		// Hack: assume can use mem op (TODO)
-		return g_vc->get_const(_c, esize);
-	}
-
-	template <typename T> requires(std::is_base_of_v<mem_lazy, std::decay_t<T>>)
-	inline decltype(auto) arg_eval(T&& mem, u32)
-	{
-		return mem.eval(std::is_reference_v<T>);
-	}
-
-	inline decltype(auto) arg_eval(const Operand& mem, u32)
-	{
-		return mem;
-	}
-
-	inline decltype(auto) arg_eval(Operand& mem, u32)
-	{
-		return mem;
-	}
-
-	inline decltype(auto) arg_eval(Operand&& mem, u32)
-	{
-		return std::move(mem);
-	}
-
-	inline void arg_free(const v128&)
-	{
-	}
-
-	inline void arg_free(const Operand& op)
-	{
-		if (op.isReg())
-		{
-			g_vc->vec_dealloc(vec_type{op.id()});
-		}
-	}
-
-	template <typename T>
-	inline bool arg_use_evex(const auto& op)
-	{
-		constexpr auto _class = arg_classify<T>;
-		if constexpr (_class == arg_class::imm_rv)
-			return g_vc->const_allocs.count(op) == 0;
-		else if constexpr (_class == arg_class::imm_lv)
-			return false;
-		else if (op.isMem())
-		{
-			// Check if broadcast is set, or if the offset immediate can use disp8*N encoding
-			mem_type mem{};
-			mem.copyFrom(op);
-			if (mem.hasBaseLabel())
-				return false;
-			if (mem.hasBroadcast())
-				return true;
-			if (!mem.hasOffset() || mem.offset() % mem.size() || u64(mem.offset() + 128) < 256 || u64(mem.offset() / mem.size() + 128) >= 256)
-				return false;
-			return true;
-		}
-
-		return false;
-	}
-
-	template <typename A, typename... Args>
-	vec_type unary_op(x86::Inst::Id op, x86::Inst::Id op2, A&& a, Args&&... args)
-	{
-		if constexpr (arg_classify<A> == arg_class::reg_rv)
-		{
-			if (op)
-			{
-				ensure(!g_vc->emit(op, a, std::forward<Args>(args)...));
-			}
-			else
-			{
-				ensure(!g_vc->emit(op2, a, a, std::forward<Args>(args)...));
-			}
-
-			return a;
-		}
-		else
-		{
-			vec_type r = g_vc->vec_alloc();
-
-			if (op)
-			{
-				if (op2 && utils::has_avx())
-				{
-					// Assume op2 is AVX (but could be PSHUFD as well for example)
-					ensure(!g_vc->emit(op2, r, arg_eval(std::forward<A>(a), 16), std::forward<Args>(args)...));
-				}
-				else
-				{
-					// TODO
-					ensure(!g_vc->emit(x86::Inst::Id::kIdMovaps, r, arg_eval(std::forward<A>(a), 16)));
-					ensure(!g_vc->emit(op, r, std::forward<Args>(args)...));
-				}
-			}
-			else
-			{
-				ensure(!g_vc->emit(op2, r, arg_eval(std::forward<A>(a), 16), std::forward<Args>(args)...));
-			}
-
-			return r;
-		}
-	}
-
-	template <typename D, typename S>
-	void store_op(x86::Inst::Id op, x86::Inst::Id evex_op, D&& d, S&& s)
-	{
-		static_assert(arg_classify<D> == arg_class::mem_lv);
-
-		mem_type dst;
-		dst.copyFrom(arg_eval(std::forward<D>(d), 16));
-
-		if (utils::has_avx512() && evex_op)
-		{
-			if (!dst.hasBaseLabel() && dst.hasOffset() && dst.offset() % dst.size() == 0 && u64(dst.offset() + 128) >= 256 && u64(dst.offset() / dst.size() + 128) < 256)
-			{
-				ensure(!g_vc->evex().emit(evex_op, dst, arg_eval(std::forward<S>(s), 16)));
-				return;
-			}
-		}
-
-		ensure(!g_vc->emit(op, dst, arg_eval(std::forward<S>(s), 16)));
-	}
-
-	template <typename A, typename B, typename... Args>
-	vec_type binary_op(u32 esize, x86::Inst::Id mov_op, x86::Inst::Id sse_op, x86::Inst::Id avx_op, x86::Inst::Id evex_op, A&& a, B&& b, Args&&... args)
-	{
-		free_on_exit e;
-		Operand src1{};
-
-		if constexpr (arg_classify<A> == arg_class::reg_rv)
-		{
-			// Use src1 as a destination
-			src1 = arg_eval(std::forward<A>(a), 16);
-
-			if (utils::has_avx512() && evex_op && arg_use_evex<B>(b))
-			{
-				ensure(!g_vc->evex().emit(evex_op, src1, src1, arg_eval(std::forward<B>(b), esize), std::forward<Args>(args)...));
-				return vec_type{src1.id()};
-			}
-
-			if constexpr (arg_classify<B> == arg_class::reg_rv)
-			{
-				e.x = b;
-			}
-		}
-		else if (utils::has_avx() && avx_op && (arg_classify<A> == arg_class::reg_lv || arg_classify<A> == arg_class::mem_lv))
-		{
-			Operand srca = arg_eval(std::forward<A>(a), 16);
-
-			if constexpr (arg_classify<A> == arg_class::reg_lv)
-			{
-				if constexpr (arg_classify<B> == arg_class::reg_rv)
-				{
-					// Use src2 as a destination
-					src1 = arg_eval(std::forward<B>(b), 16);
-				}
-				else
-				{
-					// Use new reg as a destination
-					src1 = g_vc->vec_alloc();
-				}
-			}
-			else
-			{
-				src1 = g_vc->vec_alloc();
-
-				if constexpr (arg_classify<B> == arg_class::reg_rv)
-				{
-					e.x = b;
-				}
-			}
-
-			if (utils::has_avx512() && evex_op && arg_use_evex<B>(b))
-			{
-				ensure(!g_vc->evex().emit(evex_op, src1, srca, arg_eval(std::forward<B>(b), esize), std::forward<Args>(args)...));
-				return vec_type{src1.id()};
-			}
-
-			ensure(!g_vc->emit(avx_op, src1, srca, arg_eval(std::forward<B>(b), 16), std::forward<Args>(args)...));
-			return vec_type{src1.id()};
-		}
-		else do
-		{
-			if constexpr (arg_classify<A> == arg_class::mem_rv)
-			{
-				if (a.isReg())
-				{
-					src1 = vec_type(a.id());
-
-					if constexpr (arg_classify<B> == arg_class::reg_rv)
-					{
-						e.x = b;
-					}
-					break;
-				}
-			}
-
-			if constexpr (arg_classify<A> == arg_class::imm_rv)
-			{
-				if (auto found = g_vc->const_allocs.find(a); found != g_vc->const_allocs.end())
-				{
-					src1 = found->second;
-					g_vc->const_allocs.erase(found);
-
-					if constexpr (arg_classify<B> == arg_class::reg_rv)
-					{
-						e.x = b;
-					}
-					break;
-				}
-			}
-
-			src1 = g_vc->vec_alloc();
-
-			if constexpr (arg_classify<B> == arg_class::reg_rv)
-			{
-				e.x = b;
-			}
-
-			if constexpr (arg_classify<A> == arg_class::imm_rv)
-			{
-				if (!a._u)
-				{
-					// All zeros
-					ensure(!g_vc->emit(x86::Inst::kIdPxor, src1, src1));
-					break;
-				}
-				else if (!~a._u)
-				{
-					// All ones
-					ensure(!g_vc->emit(x86::Inst::kIdPcmpeqd, src1, src1));
-					break;
-				}
-			}
-
-			// Fallback to arg copy
-			ensure(!g_vc->emit(mov_op, src1, arg_eval(std::forward<A>(a), 16)));
-		}
-		while (0);
-
-		if (utils::has_avx512() && evex_op && arg_use_evex<B>(b))
-		{
-			ensure(!g_vc->evex().emit(evex_op, src1, src1, arg_eval(std::forward<B>(b), esize), std::forward<Args>(args)...));
-		}
-		else if (sse_op)
-		{
-			ensure(!g_vc->emit(sse_op, src1, arg_eval(std::forward<B>(b), 16), std::forward<Args>(args)...));
-		}
-		else
-		{
-			ensure(!g_vc->emit(avx_op, src1, src1, arg_eval(std::forward<B>(b), 16), std::forward<Args>(args)...));
-		}
-
-		return vec_type{src1.id()};
-	}
-#define FOR_X64(f, ...) do { using enum asmjit::x86::Inst::Id; return asmjit::f(__VA_ARGS__); } while (0)
-#elif defined(ARCH_ARM64)
-#define FOR_X64(...) do { fmt::throw_exception("Unimplemented for this architecture!"); } while (0)
-#endif
-}
-
-inline v128 gv_select8(const v128& _cmp, const v128& _true, const v128& _false);
-inline v128 gv_signselect8(const v128& bits, const v128& _true, const v128& _false);
-inline v128 gv_select16(const v128& _cmp, const v128& _true, const v128& _false);
-inline v128 gv_select32(const v128& _cmp, const v128& _true, const v128& _false);
-inline v128 gv_selectfs(const v128& _cmp, const v128& _true, const v128& _false);
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline asmjit::vec_type gv_gts32(A&&, B&&);
-
-inline void gv_set_zeroing_denormals()
-{
-#if defined(ARCH_X64)
-	u32 cr = _mm_getcsr();
-	cr = (cr & ~_MM_FLUSH_ZERO_MASK) | _MM_FLUSH_ZERO_ON;
-	cr = (cr & ~_MM_DENORMALS_ZERO_MASK) | _MM_DENORMALS_ZERO_ON;
-	cr = (cr | _MM_MASK_INVALID);
-	_mm_setcsr(cr);
-#elif defined(ARCH_ARM64)
-	u64 cr;
-	__asm__ volatile("mrs %0, FPCR" : "=r"(cr));
-	cr |= 0x1000000ull;
-	__asm__ volatile("msr FPCR, %0" :: "r"(cr));
-#else
-#error "Not implemented"
-#endif
-}
-
-inline void gv_unset_zeroing_denormals()
-{
-#if defined(ARCH_X64)
-	u32 cr = _mm_getcsr();
-	cr = (cr & ~_MM_FLUSH_ZERO_MASK) | _MM_FLUSH_ZERO_OFF;
-	cr = (cr & ~_MM_DENORMALS_ZERO_MASK) | _MM_DENORMALS_ZERO_OFF;
-	cr = (cr | _MM_MASK_INVALID);
-	_mm_setcsr(cr);
-#elif defined(ARCH_ARM64)
-	u64 cr;
-	__asm__ volatile("mrs %0, FPCR" : "=r"(cr));
-	cr &= ~0x1000000ull;
-	__asm__ volatile("msr FPCR, %0" :: "r"(cr));
-#else
-#error "Not implemented"
-#endif
-}
-
-inline bool g_use_avx = utils::has_avx();
-
-inline void gv_zeroupper()
-{
-#if defined(ARCH_X64)
-	if (!g_use_avx)
-		return;
-#if defined(_M_X64) && defined(_MSC_VER)
-	_mm256_zeroupper();
-#else
-	__asm__ volatile("vzeroupper;");
-#endif
-#endif
-}
-
-inline v128 gv_bcst8(u8 value)
-{
-#if defined(ARCH_X64)
-	return _mm_set1_epi8(value);
-#elif defined(ARCH_ARM64)
-	return vdupq_n_s8(value);
-#endif
-}
-
-inline v128 gv_bcst16(u16 value)
-{
-#if defined(ARCH_X64)
-	return _mm_set1_epi16(value);
-#elif defined(ARCH_ARM64)
-	return vdupq_n_s16(value);
-#endif
-}
-
-// Optimized broadcast using constant offset assumption
-inline v128 gv_bcst16(const u16& value, auto mptr, auto... args)
-{
-#if defined(ARCH_X64)
-	const u32 offset = ::offset32(mptr, args...);
-	[[maybe_unused]] const __m128i* ptr = reinterpret_cast<__m128i*>(uptr(&value) - offset % 16);
-#if !defined(__AVX2__)
-	if (offset % 16 == 0)
-		return _mm_shuffle_epi32(_mm_shufflelo_epi16(*ptr, 0), 0);
-	if (offset % 16 == 2)
-		return _mm_shuffle_epi32(_mm_shufflelo_epi16(*ptr, 0b01010101), 0);
-	if (offset % 16 == 4)
-		return _mm_shuffle_epi32(_mm_shufflelo_epi16(*ptr, 0b10101010), 0);
-	if (offset % 16 == 6)
-		return _mm_shuffle_epi32(_mm_shufflelo_epi16(*ptr, 0xff), 0);
-	if (offset % 16 == 8)
-		return _mm_shuffle_epi32(_mm_shufflehi_epi16(*ptr, 0), 0xff);
-	if (offset % 16 == 10)
-		return _mm_shuffle_epi32(_mm_shufflehi_epi16(*ptr, 0b01010101), 0xff);
-	if (offset % 16 == 12)
-		return _mm_shuffle_epi32(_mm_shufflehi_epi16(*ptr, 0b10101010), 0xff);
-	if (offset % 16 == 14)
-		return _mm_shuffle_epi32(_mm_shufflehi_epi16(*ptr, 0xff), 0xff);
-#endif
-	return _mm_set1_epi16(value);
-#else
-	static_cast<void>(mptr);
-	return gv_bcst16(value);
-#endif
-}
-
-inline v128 gv_bcst32(u32 value)
-{
-#if defined(ARCH_X64)
-	return _mm_set1_epi32(value);
-#elif defined(ARCH_ARM64)
-	return vdupq_n_s32(value);
-#endif
-}
-
-// Optimized broadcast using constant offset assumption
-inline v128 gv_bcst32(const u32& value, auto mptr, auto... args)
-{
-#if defined(ARCH_X64)
-	const u32 offset = ::offset32(mptr, args...);
-	[[maybe_unused]] const __m128i* ptr = reinterpret_cast<__m128i*>(uptr(&value) - offset % 16);
-#if !defined(__AVX__)
-	if (offset % 16 == 0)
-		return _mm_shuffle_epi32(*ptr, 0);
-	if (offset % 16 == 4)
-		return _mm_shuffle_epi32(*ptr, 0b01010101);
-	if (offset % 16 == 8)
-		return _mm_shuffle_epi32(*ptr, 0b10101010);
-	if (offset % 16 == 12)
-		return _mm_shuffle_epi32(*ptr, 0xff);
-#endif
-	return _mm_set1_epi32(value);
-#else
-	static_cast<void>(mptr);
-	return gv_bcst32(value);
-#endif
-}
-
-inline v128 gv_bcst64(u64 value)
-{
-#if defined(ARCH_X64)
-	return _mm_set1_epi64x(value);
-#elif defined(ARCH_ARM64)
-	return vdupq_n_s64(value);
-#endif
-}
-
-// Optimized broadcast using constant offset assumption
-inline v128 gv_bcst64(const u64& value, auto mptr, auto... args)
-{
-#if defined(ARCH_X64)
-	const u32 offset = ::offset32(mptr, args...);
-	[[maybe_unused]] const __m128i* ptr = reinterpret_cast<__m128i*>(uptr(&value) - offset % 16);
-#if !defined(__AVX__)
-	if (offset % 16 == 0)
-		return _mm_shuffle_epi32(*ptr, 0b00010001);
-	if (offset % 16 == 8)
-		return _mm_shuffle_epi32(*ptr, 0b10111011);
-#endif
-	return _mm_set1_epi64x(value);
-#else
-	static_cast<void>(mptr);
-	return gv_bcst64(value);
-#endif
-}
-
-inline v128 gv_bcstfs(f32 value)
-{
-#if defined(ARCH_X64)
-	return _mm_set1_ps(value);
-#elif defined(ARCH_ARM64)
-	return vdupq_n_f32(value);
-#endif
-}
-
-inline v128 gv_and32(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_and_si128(a, b);
-#elif defined(ARCH_ARM64)
-	return vandq_s32(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_and32(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 4, kIdMovdqa, kIdPand, kIdVpand, kIdVpandd, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_andfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_and_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return vandq_s32(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_andfs(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 4, kIdMovaps, kIdAndps, kIdVandps, kIdVandps, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_andn32(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_andnot_si128(a, b);
-#elif defined(ARCH_ARM64)
-	return vbicq_s32(b, a);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_andn32(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 4, kIdMovdqa, kIdPandn, kIdVpandn, kIdVpandnd, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_andnfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_andnot_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return vbicq_s32(b, a);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_andnfs(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 4, kIdMovaps, kIdAndnps, kIdVandnps, kIdVandnps, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_or32(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_or_si128(a, b);
-#elif defined(ARCH_ARM64)
-	return vorrq_s32(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_or32(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 4, kIdMovdqa, kIdPor, kIdVpor, kIdVpord, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_orfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_or_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return vorrq_s32(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_orfs(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 4, kIdMovaps, kIdOrps, kIdVorps, kIdVorps, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_xor32(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_xor_si128(a, b);
-#elif defined(ARCH_ARM64)
-	return veorq_s32(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_xor32(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 4, kIdMovdqa, kIdPxor, kIdVpxor, kIdVpxord, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_xorfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_xor_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return veorq_s32(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_xorfs(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 4, kIdMovaps, kIdXorps, kIdVxorps, kIdVxorps, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_not32(const v128& a)
-{
-#if defined(ARCH_X64)
-	return _mm_xor_si128(a, _mm_set1_epi32(-1));
-#elif defined(ARCH_ARM64)
-	return vmvnq_u32(a);
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_not32(A&& a)
-{
-#if defined(ARCH_X64)
-	asmjit::vec_type ones = g_vc->vec_alloc();
-	g_vc->pcmpeqd(ones, ones);
-	FOR_X64(binary_op, 4, kIdMovdqa, kIdPxor, kIdVpxor, kIdVpxord, std::move(ones), std::forward<A>(a));
-#endif
-}
-
-inline v128 gv_notfs(const v128& a)
-{
-#if defined(ARCH_X64)
-	return _mm_xor_ps(a, _mm_castsi128_ps(_mm_set1_epi32(-1)));
-#elif defined(ARCH_ARM64)
-	return vmvnq_u32(a);
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_notfs(A&& a)
-{
-#if defined(ARCH_X64)
-	asmjit::vec_type ones = g_vc->vec_alloc();
-	g_vc->pcmpeqd(ones, ones);
-	FOR_X64(binary_op, 4, kIdMovaps, kIdXorps, kIdVxorps, kIdVxorps, std::move(ones), std::forward<A>(a));
-#endif
-}
-
-inline v128 gv_shl16(const v128& a, u32 count)
-{
-	if (count >= 16)
-		return v128{};
-#if defined(ARCH_X64)
-	return _mm_slli_epi16(a, count);
-#elif defined(ARCH_ARM64)
-	return vshlq_s16(a, vdupq_n_s16(count));
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_shl16(A&& a, u32 count)
-{
-	FOR_X64(unary_op, kIdPsllw, kIdVpsllw, std::forward<A>(a), count);
-}
-
-inline v128 gv_shl32(const v128& a, u32 count)
-{
-	if (count >= 32)
-		return v128{};
-#if defined(ARCH_X64)
-	return _mm_slli_epi32(a, count);
-#elif defined(ARCH_ARM64)
-	return vshlq_s32(a, vdupq_n_s32(count));
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_shl32(A&& a, u32 count)
-{
-	FOR_X64(unary_op, kIdPslld, kIdVpslld, std::forward<A>(a), count);
-}
-
-inline v128 gv_shl64(const v128& a, u32 count)
-{
-	if (count >= 64)
-		return v128{};
-#if defined(ARCH_X64)
-	return _mm_slli_epi64(a, count);
-#elif defined(ARCH_ARM64)
-	return vshlq_s64(a, vdupq_n_s64(count));
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_shl64(A&& a, u32 count)
-{
-	FOR_X64(unary_op, kIdPsllq, kIdVpsllq, std::forward<A>(a), count);
-}
-
-inline v128 gv_shr16(const v128& a, u32 count)
-{
-	if (count >= 16)
-		return v128{};
-#if defined(ARCH_X64)
-	return _mm_srli_epi16(a, count);
-#elif defined(ARCH_ARM64)
-	return vshlq_u16(a, vdupq_n_s16(0 - count));
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_shr16(A&& a, u32 count)
-{
-	FOR_X64(unary_op, kIdPsrlw, kIdVpsrlw, std::forward<A>(a), count);
-}
-
-inline v128 gv_shr32(const v128& a, u32 count)
-{
-	if (count >= 32)
-		return v128{};
-#if defined(ARCH_X64)
-	return _mm_srli_epi32(a, count);
-#elif defined(ARCH_ARM64)
-	return vshlq_u32(a, vdupq_n_s32(0 - count));
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_shr32(A&& a, u32 count)
-{
-	FOR_X64(unary_op, kIdPsrld, kIdVpsrld, std::forward<A>(a), count);
-}
-
-inline v128 gv_shr64(const v128& a, u32 count)
-{
-	if (count >= 64)
-		return v128{};
-#if defined(ARCH_X64)
-	return _mm_srli_epi64(a, count);
-#elif defined(ARCH_ARM64)
-	return vshlq_u64(a, vdupq_n_s64(0 - count));
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_shr64(A&& a, u32 count)
-{
-	FOR_X64(unary_op, kIdPsrlq, kIdVpsrlq, std::forward<A>(a), count);
-}
-
-inline v128 gv_sar16(const v128& a, u32 count)
-{
-	if (count >= 16)
-		count = 15;
-#if defined(ARCH_X64)
-	return _mm_srai_epi16(a, count);
-#elif defined(ARCH_ARM64)
-	return vshlq_s16(a, vdupq_n_s16(0 - count));
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_sar16(A&& a, u32 count)
-{
-	FOR_X64(unary_op, kIdPsraw, kIdVpsraw, std::forward<A>(a), count);
-}
-
-inline v128 gv_sar32(const v128& a, u32 count)
-{
-	if (count >= 32)
-		count = 31;
-#if defined(ARCH_X64)
-	return _mm_srai_epi32(a, count);
-#elif defined(ARCH_ARM64)
-	return vshlq_s32(a, vdupq_n_s32(0 - count));
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_sar32(A&& a, u32 count)
-{
-	FOR_X64(unary_op, kIdPsrad, kIdVpsrad, std::forward<A>(a), count);
-}
-
-inline v128 gv_sar64(const v128& a, u32 count)
-{
-	if (count >= 64)
-		count = 63;
-#if defined(__AVX512VL__)
-	return _mm_srai_epi64(a, count);
-#elif defined(__SSE2__) && !defined(_M_X64)
-	return static_cast<__v2di>(a) >> count;
-#elif defined(ARCH_ARM64)
-	return vshlq_s64(a, vdupq_n_s64(0 - count));
-#else
-	v128 r;
-	r._s64[0] = a._s64[0] >> count;
-	r._s64[1] = a._s64[1] >> count;
-	return r;
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_sar64(A&& a, u32 count)
-{
-	if (count >= 64)
-		count = 63;
-#if defined(ARCH_X64)
-	using enum asmjit::x86::Inst::Id;
-	if (utils::has_avx512())
-		return asmjit::unary_op(kIdNone, kIdVpsraq, std::forward<A>(a), count);
-	g_vc->fail_flag = true;
-	return std::forward<A>(a);
-#endif
-}
-
-inline v128 gv_add8(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_add_epi8(a, b);
-#elif defined(ARCH_ARM64)
-	return vaddq_s8(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_add8(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 1, kIdMovdqa, kIdPaddb, kIdVpaddb, kIdNone, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_add16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_add_epi16(a, b);
-#elif defined(ARCH_ARM64)
-	return vaddq_s16(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_add16(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 2, kIdMovdqa, kIdPaddw, kIdVpaddw, kIdNone, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_add32(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_add_epi32(a, b);
-#elif defined(ARCH_ARM64)
-	return vaddq_s32(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_add32(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 4, kIdMovdqa, kIdPaddd, kIdVpaddd, kIdVpaddd, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_add64(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_add_epi64(a, b);
-#elif defined(ARCH_ARM64)
-	return vaddq_s64(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_add64(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 8, kIdMovdqa, kIdPaddq, kIdVpaddq, kIdVpaddq, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_adds_s8(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_adds_epi8(a, b);
-#elif defined(ARCH_ARM64)
-	return vqaddq_s8(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_adds_s8(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 1, kIdMovdqa, kIdPaddsb, kIdVpaddsb, kIdNone, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_adds_s16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_adds_epi16(a, b);
-#elif defined(ARCH_ARM64)
-	return vqaddq_s16(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_adds_s16(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 2, kIdMovdqa, kIdPaddsw, kIdVpaddsw, kIdNone, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_adds_s32(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	const v128 s = _mm_add_epi32(a, b);
-	const v128 m = (a ^ s) & (b ^ s); // overflow bit
-	const v128 x = _mm_srai_epi32(m, 31); // saturation mask
-	const v128 y = _mm_srai_epi32(_mm_and_si128(s, m), 31); // positive saturation mask
-	return _mm_xor_si128(_mm_xor_si128(_mm_srli_epi32(x, 1), y), _mm_or_si128(s, x));
-#elif defined(ARCH_ARM64)
-	return vqaddq_s32(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_adds_s32(A&& a, B&& b)
-{
-#if defined(ARCH_X64)
-	auto s = gv_add32(a, b);
-	auto m = gv_and32(gv_xor32(std::forward<A>(a), s), gv_xor32(std::forward<B>(b), s));
-	auto x = gv_sar32(m, 31);
-	auto y = gv_sar32(gv_and32(s, std::move(m)), 31);
-	auto z = gv_xor32(gv_shr32(x, 1), std::move(y));
-	return gv_xor32(std::move(z), gv_or32(std::move(s), std::move(x)));
-#endif
-}
-
-inline v128 gv_addus_u8(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_adds_epu8(a, b);
-#elif defined(ARCH_ARM64)
-	return vqaddq_u8(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_addus_u8(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 1, kIdMovdqa, kIdPaddusb, kIdVpaddusb, kIdNone, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_addus_u16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_adds_epu16(a, b);
-#elif defined(ARCH_ARM64)
-	return vqaddq_u16(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_addus_u16(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 2, kIdMovdqa, kIdPaddusw, kIdVpaddusw, kIdNone, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_addus_u32(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__)
-	return _mm_add_epi32(a, _mm_min_epu32(~a, b));
-#elif defined(ARCH_X64)
-	const v128 s = _mm_add_epi32(a, b);
-	return _mm_or_si128(s, _mm_cmpgt_epi32(_mm_xor_si128(b, _mm_set1_epi32(smin)), _mm_xor_si128(a, _mm_set1_epi32(smax))));
-#elif defined(ARCH_ARM64)
-	return vqaddq_u32(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline asmjit::vec_type gv_addus_u32(A&& a, B&& b)
-{
-#if defined(ARCH_X64)
-	if (utils::has_sse41())
-		return gv_add32(gv_minu32(std::forward<B>(b), gv_not32(a)), std::forward<A>(a));
-	auto s = gv_add32(a, b);
-	auto x = gv_xor32(std::forward<B>(b), gv_bcst32(0x80000000));
-	auto y = gv_xor32(std::forward<A>(a), gv_bcst32(0x7fffffff));
-	return gv_or32(std::move(s), gv_gts32(std::move(x), std::move(y)));
-#endif
-	return {};
-}
-
-inline v128 gv_addfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_add_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return vaddq_f32(a, b);
-#endif
-}
-
-inline v128 gv_addfd(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_add_pd(a, b);
-#elif defined(ARCH_ARM64)
-	return vaddq_f64(a, b);
-#endif
-}
-
-inline v128 gv_sub8(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_sub_epi8(a, b);
-#elif defined(ARCH_ARM64)
-	return vsubq_s8(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline auto gv_sub8(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 1, kIdMovdqa, kIdPsubb, kIdVpsubb, kIdNone, std::forward<A>(a), std::forward<B>(b));
-}
-
-inline v128 gv_sub16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_sub_epi16(a, b);
-#elif defined(ARCH_ARM64)
-	return vsubq_s16(a, b);
-#endif
-}
-
-inline v128 gv_sub32(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_sub_epi32(a, b);
-#elif defined(ARCH_ARM64)
-	return vsubq_s32(a, b);
-#endif
-}
-
-inline v128 gv_sub64(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_sub_epi64(a, b);
-#elif defined(ARCH_ARM64)
-	return vsubq_s64(a, b);
-#endif
-}
-
-inline v128 gv_subs_s8(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_subs_epi8(a, b);
-#elif defined(ARCH_ARM64)
-	return vqsubq_s8(a, b);
-#endif
-}
-
-inline v128 gv_subs_s16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_subs_epi16(a, b);
-#elif defined(ARCH_ARM64)
-	return vqsubq_s16(a, b);
-#endif
-}
-
-inline v128 gv_subs_s32(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	const v128 d = _mm_sub_epi32(a, b);
-	const v128 m = (a ^ b) & (a ^ d); // overflow bit
-	const v128 x = _mm_srai_epi32(m, 31);
-	return _mm_or_si128(_mm_andnot_si128(x, d), _mm_and_si128(x, _mm_xor_si128(_mm_srli_epi32(x, 1), _mm_srai_epi32(a, 31))));
-#elif defined(ARCH_ARM64)
-	return vqsubq_s32(a, b);
-#endif
-}
-
-inline v128 gv_subus_u8(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_subs_epu8(a, b);
-#elif defined(ARCH_ARM64)
-	return vqsubq_u8(a, b);
-#endif
-}
-
-inline v128 gv_subus_u16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_subs_epu16(a, b);
-#elif defined(ARCH_ARM64)
-	return vqsubq_u16(a, b);
-#endif
-}
-
-inline v128 gv_subus_u32(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__)
-	return _mm_sub_epi32(a, _mm_min_epu32(a, b));
-#elif defined(ARCH_X64)
-	const auto sign = _mm_set1_epi32(smin);
-	return _mm_andnot_si128(_mm_cmpgt_epi32(_mm_xor_si128(b, sign), _mm_xor_si128(a, sign)), _mm_sub_epi32(a, b));
-#elif defined(ARCH_ARM64)
-	return vqsubq_u32(a, b);
-#endif
-}
-
-inline v128 gv_subfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_sub_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return vsubq_f32(a, b);
-#endif
-}
-
-inline v128 gv_subfd(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_sub_pd(a, b);
-#elif defined(ARCH_ARM64)
-	return vsubq_f64(a, b);
-#endif
-}
-
-inline v128 gv_maxu8(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_max_epu8(a, b);
-#elif defined(ARCH_ARM64)
-	return vmaxq_u8(a, b);
-#endif
-}
-
-inline v128 gv_maxu16(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__)
-	return _mm_max_epu16(a, b);
-#elif defined(ARCH_X64)
-	return _mm_add_epi16(_mm_subs_epu16(a, b), b);
-#elif defined(ARCH_ARM64)
-	return vmaxq_u16(a, b);
-#endif
-}
-
-inline v128 gv_maxu32(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__)
-	return _mm_max_epu32(a, b);
-#elif defined(ARCH_X64)
-	const __m128i s = _mm_set1_epi32(smin);
-	const __m128i m = _mm_cmpgt_epi32(_mm_xor_si128(a, s), _mm_xor_si128(b, s));
-	return _mm_or_si128(_mm_and_si128(m, a), _mm_andnot_si128(m, b));
-#elif defined(ARCH_ARM64)
-	return vmaxq_u32(a, b);
-#endif
-}
-
-inline v128 gv_maxs8(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__)
-	return _mm_max_epi8(a, b);
-#elif defined(ARCH_X64)
-	const __m128i m = _mm_cmpgt_epi8(a, b);
-	return _mm_or_si128(_mm_and_si128(m, a), _mm_andnot_si128(m, b));
-#elif defined(ARCH_ARM64)
-	return vmaxq_s8(a, b);
-#endif
-}
-
-inline v128 gv_maxs16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_max_epi16(a, b);
-#elif defined(ARCH_ARM64)
-	return vmaxq_s16(a, b);
-#endif
-}
-
-inline v128 gv_maxs32(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__)
-	return _mm_max_epi32(a, b);
-#elif defined(ARCH_X64)
-	const __m128i m = _mm_cmpgt_epi32(a, b);
-	return _mm_or_si128(_mm_and_si128(m, a), _mm_andnot_si128(m, b));
-#elif defined(ARCH_ARM64)
-	return vmaxq_s32(a, b);
-#endif
-}
-
-inline v128 gv_maxfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_and_ps(_mm_max_ps(a, b), _mm_max_ps(b, a));
-#elif defined(ARCH_ARM64)
-	return vmaxq_f32(a, b);
-#endif
-}
-
-inline v128 gv_minu8(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_min_epu8(a, b);
-#elif defined(ARCH_ARM64)
-	return vminq_u8(a, b);
-#endif
-}
-
-inline v128 gv_minu16(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__)
-	return _mm_min_epu16(a, b);
-#elif defined(ARCH_X64)
-	return _mm_sub_epi16(a, _mm_subs_epu16(a, b));
-#elif defined(ARCH_ARM64)
-	return vminq_u16(a, b);
-#endif
-}
-
-inline v128 gv_minu32(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__)
-	return _mm_min_epu32(a, b);
-#elif defined(ARCH_X64)
-	const __m128i s = _mm_set1_epi32(smin);
-	const __m128i m = _mm_cmpgt_epi32(_mm_xor_si128(a, s), _mm_xor_si128(b, s));
-	return _mm_or_si128(_mm_andnot_si128(m, a), _mm_and_si128(m, b));
-#elif defined(ARCH_ARM64)
-	return vminq_u32(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline asmjit::vec_type gv_minu32(A&& a, B&& b)
-{
-#if defined(ARCH_X64)
-	if (utils::has_sse41())
-		FOR_X64(binary_op, 4, kIdMovdqa, kIdPminud, kIdVpminud, kIdVpminud, std::forward<A>(a), std::forward<B>(b));
-	auto s = gv_bcst32(0x80000000);
-	auto x = gv_xor32(a, s);
-	auto m = gv_gts32(std::move(x), gv_xor32(std::move(s), b));
-	auto z = gv_and32(m, std::move(b));
-	return gv_or32(std::move(z), gv_andn32(std::move(m), std::move(a)));
-#endif
-	return {};
-}
-
-inline v128 gv_mins8(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__)
-	return _mm_min_epi8(a, b);
-#elif defined(ARCH_X64)
-	const __m128i m = _mm_cmpgt_epi8(a, b);
-	return _mm_or_si128(_mm_andnot_si128(m, a), _mm_and_si128(m, b));
-#elif defined(ARCH_ARM64)
-	return vminq_s8(a, b);
-#endif
-}
-
-inline v128 gv_mins16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_min_epi16(a, b);
-#elif defined(ARCH_ARM64)
-	return vminq_s16(a, b);
-#endif
-}
-
-inline v128 gv_mins32(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__)
-	return _mm_min_epi32(a, b);
-#elif defined(ARCH_X64)
-	const __m128i m = _mm_cmpgt_epi32(a, b);
-	return _mm_or_si128(_mm_andnot_si128(m, a), _mm_and_si128(m, b));
-#elif defined(ARCH_ARM64)
-	return vminq_s32(a, b);
-#endif
-}
-
-inline v128 gv_minfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_or_ps(_mm_min_ps(a, b), _mm_min_ps(b, a));
-#elif defined(ARCH_ARM64)
-	return vminq_f32(a, b);
-#endif
-}
-
-inline v128 gv_eq8(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpeq_epi8(a, b);
-#elif defined(ARCH_ARM64)
-	return vceqq_s8(a, b);
-#endif
-}
-
-inline v128 gv_eq16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpeq_epi16(a, b);
-#elif defined(ARCH_ARM64)
-	return vceqq_s16(a, b);
-#endif
-}
-
-inline v128 gv_eq32(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpeq_epi32(a, b);
-#elif defined(ARCH_ARM64)
-	return vceqq_s32(a, b);
-#endif
-}
-
-// Ordered and equal
-inline v128 gv_eqfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpeq_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return vceqq_f32(a, b);
-#endif
-}
-
-// Unordered or not equal
-inline v128 gv_neqfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpneq_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return ~vceqq_f32(a, b);
-#endif
-}
-
-inline v128 gv_gtu8(const v128& a, const v128& b)
-{
-#if defined(__AVX512VL__) && defined(__AVX512BW__)
-	return _mm_movm_epi8(_mm_cmpgt_epu8_mask(a, b));
-#elif defined(ARCH_X64)
-	return _mm_cmpeq_epi8(_mm_cmpeq_epi8(a, _mm_min_epu8(a, b)), _mm_setzero_si128());
-#elif defined(ARCH_ARM64)
-	return vcgtq_u8(a, b);
-#endif
-}
-
-inline v128 gv_gtu16(const v128& a, const v128& b)
-{
-#if defined(__AVX512VL__) && defined(__AVX512BW__)
-	return _mm_movm_epi16(_mm_cmpgt_epu16_mask(a, b));
-#elif defined(__SSE4_1__)
-	return _mm_cmpeq_epi16(_mm_cmpeq_epi16(a, _mm_min_epu16(a, b)), _mm_setzero_si128());
-#elif defined(ARCH_X64)
-	return _mm_cmpeq_epi16(_mm_cmpeq_epi16(_mm_subs_epu16(a, b), _mm_setzero_si128()), _mm_setzero_si128());
-#elif defined(ARCH_ARM64)
-	return vcgtq_u16(a, b);
-#endif
-}
-
-inline v128 gv_gtu32(const v128& a, const v128& b)
-{
-#if defined(__AVX512VL__) && defined(__AVX512DQ__)
-	return _mm_movm_epi32(_mm_cmpgt_epu32_mask(a, b));
-#elif defined(__SSE4_1__)
-	return _mm_cmpeq_epi32(_mm_cmpeq_epi32(a, _mm_min_epu32(a, b)), _mm_setzero_si128());
-#elif defined(ARCH_X64)
-	const auto sign = _mm_set1_epi32(smin);
-	return _mm_cmpgt_epi32(_mm_xor_si128(a, sign), _mm_xor_si128(b, sign));
-#elif defined(ARCH_ARM64)
-	return vcgtq_u32(a, b);
-#endif
-}
-
-// Ordered and greater than
-inline v128 gv_gtfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpgt_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return vcgtq_f32(a, b);
-#endif
-}
-
-// Ordered and less than
-inline v128 gv_ltfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmplt_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return vcltq_f32(a, b);
-#endif
-}
-
-// Unordered or less or equal
-inline v128 gv_ngtfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpngt_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return ~vcgtq_f32(a, b);
-#endif
-}
-
-// Unordered or greater or equal
-inline v128 gv_nlefs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpnle_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return ~vcleq_f32(a, b);
-#endif
-}
-
-inline v128 gv_geu8(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpeq_epi8(b, _mm_min_epu8(a, b));
-#elif defined(ARCH_ARM64)
-	return vcgeq_u8(a, b);
-#endif
-}
-
-inline v128 gv_geu16(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__)
-	return _mm_cmpeq_epi16(b, _mm_min_epu16(a, b));
-#elif defined(ARCH_X64)
-	return _mm_cmpeq_epi16(_mm_subs_epu16(b, a), _mm_setzero_si128());
-#elif defined(ARCH_ARM64)
-	return vcgeq_u16(a, b);
-#endif
-}
-
-inline v128 gv_geu32(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__)
-	return _mm_cmpeq_epi32(b, _mm_min_epu32(a, b));
-#elif defined(ARCH_X64)
-	const auto sign = _mm_set1_epi32(smin);
-	return _mm_cmpeq_epi32(_mm_cmpgt_epi32(_mm_xor_si128(b, sign), _mm_xor_si128(a, sign)), _mm_setzero_si128());
-#elif defined(ARCH_ARM64)
-	return vcgeq_u32(a, b);
-#endif
-}
-
-// Ordered and not less than
-inline v128 gv_gefs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpge_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return vcgeq_f32(a, b);
-#endif
-}
-
-// Unordered or less than
-inline v128 gv_ngefs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpnge_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return ~vcgeq_f32(a, b);
-#endif
-}
-
-inline v128 gv_gts8(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpgt_epi8(a, b);
-#elif defined(ARCH_ARM64)
-	return vcgtq_s8(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline asmjit::vec_type gv_gts8(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 1, kIdMovdqa, kIdPcmpgtb, kIdVpcmpgtb, kIdNone, std::forward<A>(a), std::forward<B>(b));
-	return {};
-}
-
-inline v128 gv_gts16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpgt_epi16(a, b);
-#elif defined(ARCH_ARM64)
-	return vcgtq_s16(a, b);
-#endif
-}
-
-inline v128 gv_gts32(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_cmpgt_epi32(a, b);
-#elif defined(ARCH_ARM64)
-	return vcgtq_s32(a, b);
-#endif
-}
-
-template <typename A, typename B> requires (asmjit::any_operand_v<A, B>)
-inline asmjit::vec_type gv_gts32(A&& a, B&& b)
-{
-	FOR_X64(binary_op, 4, kIdMovdqa, kIdPcmpgtd, kIdVpcmpgtd, kIdNone, std::forward<A>(a), std::forward<B>(b));
-	return {};
-}
-
-inline v128 gv_avgu8(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_avg_epu8(a, b);
-#elif defined(ARCH_ARM64)
-	return vrhaddq_u8(a, b);
-#endif
-}
-
-inline v128 gv_avgu16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_avg_epu16(a, b);
-#elif defined(ARCH_ARM64)
-	return vrhaddq_u16(a, b);
-#endif
-}
-
-inline v128 gv_avgu32(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	const auto ones = _mm_set1_epi32(-1);
-	const auto summ = gv_sub32(gv_add32(a, b), ones);
-	const auto carry = _mm_slli_epi32(gv_geu32(a, summ), 31);
-	return _mm_or_si128(carry, _mm_srli_epi32(summ, 1));
-#elif defined(ARCH_ARM64)
-	return vrhaddq_u32(a, b);
-#endif
-}
-
-inline v128 gv_avgs8(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	const v128 sign = _mm_set1_epi8(smin);
-	return gv_avgu8(a ^ sign, b ^ sign) ^ sign;
-#elif defined(ARCH_ARM64)
-	return vrhaddq_s8(a, b);
-#endif
-}
-
-inline v128 gv_avgs16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	const v128 sign = _mm_set1_epi16(smin);
-	return gv_avgu16(a ^ sign, b ^ sign) ^ sign;
-#elif defined(ARCH_ARM64)
-	return vrhaddq_s16(a, b);
-#endif
-}
-
-inline v128 gv_avgs32(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	const v128 sign = _mm_set1_epi32(smin);
-	return gv_avgu32(a ^ sign, b ^ sign) ^ sign;
-#elif defined(ARCH_ARM64)
-	return vrhaddq_s32(a, b);
-#endif
-}
-
-inline v128 gv_divfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_div_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return vdivq_f32(a, b);
-#endif
-}
-
-inline v128 gv_sqrtfs(const v128& a)
-{
-#if defined(ARCH_X64)
-	return _mm_sqrt_ps(a);
-#elif defined(ARCH_ARM64)
-	return vsqrtq_f32(a);
-#endif
-}
-
-inline v128 gv_fmafs(const v128& a, const v128& b, const v128& c)
-{
-#if defined(ARCH_X64) && defined(__FMA__)
-	return _mm_fmadd_ps(a, b, c);
-#elif defined(__FMA4__)
-	return _mm_macc_ps(a, b, c);
-#elif defined(ARCH_X64)
-	// This is inaccurate implementation
-#ifdef __AVX__
-	const __m128 r = _mm256_cvtpd_ps(_mm256_add_pd(_mm256_mul_pd(_mm256_cvtps_pd(a), _mm256_cvtps_pd(b)), _mm256_cvtps_pd(c)));
-#else
-	const __m128d a0 = _mm_cvtps_pd(a);
-	const __m128d a1 = _mm_cvtps_pd(_mm_movehl_ps(a, a));
-	const __m128d b0 = _mm_cvtps_pd(b);
-	const __m128d b1 = _mm_cvtps_pd(_mm_movehl_ps(b, b));
-	const __m128d c0 = _mm_cvtps_pd(c);
-	const __m128d c1 = _mm_cvtps_pd(_mm_movehl_ps(c, c));
-	const __m128d m0 = _mm_mul_pd(a0, b0);
-	const __m128d m1 = _mm_mul_pd(a1, b1);
-	const __m128d r0 = _mm_add_pd(m0, c0);
-	const __m128d r1 = _mm_add_pd(m1, c1);
-	const __m128 r = _mm_movelh_ps(_mm_cvtpd_ps(r0), _mm_cvtpd_ps(r1));
-#endif
-	return r;
-#elif defined(ARCH_ARM64)
-	return vfmaq_f32(c, a, b);
-#else
-	v128 r;
-	for (int i = 0; i < 4; i++)
-	{
-		r._f[i] = std::fmaf(a._f[i], b._f[i], c._f[i]);
-	}
-	return r;
-#endif
-}
-
-inline v128 gv_muladdfs(const v128& a, const v128& b, const v128& c)
-{
-#if defined(ARCH_X64) && defined(__FMA__)
-	return _mm_fmadd_ps(a, b, c);
-#elif defined(__FMA4__)
-	return _mm_macc_ps(a, b, c);
-#elif defined(ARCH_ARM64)
-	return vfmaq_f32(c, a, b);
-#elif defined(ARCH_X64)
-	return _mm_add_ps(_mm_mul_ps(a, b), c);
-#endif
-}
-
-// -> ssat((a * b * 2 + (c << 16) + 0x8000) >> 16)
-inline v128 gv_rmuladds_hds16(const v128& a, const v128& b, const v128& c)
-{
-#if defined(ARCH_ARM64)
-	return vqrdmlahq_s16(c, a, b);
-#elif defined(ARCH_X64)
-	const auto x80 = _mm_set1_epi16(0x80); // 0x80 * 0x80 = 0x4000, add this to the product
-	const auto al = _mm_unpacklo_epi16(a, x80);
-	const auto ah = _mm_unpackhi_epi16(a, x80);
-	const auto bl = _mm_unpacklo_epi16(b, x80);
-	const auto bh = _mm_unpackhi_epi16(b, x80);
-	const auto ml = _mm_srai_epi32(_mm_madd_epi16(al, bl), 15);
-	const auto mh = _mm_srai_epi32(_mm_madd_epi16(ah, bh), 15);
-	const auto cl = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), c), 16);
-	const auto ch = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), c), 16);
-	const auto sl = _mm_add_epi32(ml, cl);
-	const auto sh = _mm_add_epi32(mh, ch);
-	return _mm_packs_epi32(sl, sh);
-#endif
-}
-
-// -> ssat((a * b * 2 + 0x8000) >> 16)
-inline v128 gv_rmuls_hds16(const v128& a, const v128& b)
-{
-#if defined(ARCH_ARM64)
-	return vqrdmulhq_s16(a, b);
-#elif defined(ARCH_X64)
-	const auto x80 = _mm_set1_epi16(0x80); // 0x80 * 0x80 = 0x4000, add this to the product
-	const auto al = _mm_unpacklo_epi16(a, x80);
-	const auto ah = _mm_unpackhi_epi16(a, x80);
-	const auto bl = _mm_unpacklo_epi16(b, x80);
-	const auto bh = _mm_unpackhi_epi16(b, x80);
-	const auto ml = _mm_srai_epi32(_mm_madd_epi16(al, bl), 15);
-	const auto mh = _mm_srai_epi32(_mm_madd_epi16(ah, bh), 15);
-	return _mm_packs_epi32(ml, mh);
-#endif
-}
-
-// -> ssat((a * b * 2) >> 16)
-inline v128 gv_muls_hds16(const v128& a, const v128& b)
-{
-#if defined(ARCH_ARM64)
-	return vqdmulhq_s16(a, b);
-#elif defined(ARCH_X64)
-	const auto m = _mm_or_si128(_mm_srli_epi16(_mm_mullo_epi16(a, b), 15), _mm_slli_epi16(_mm_mulhi_epi16(a, b), 1));
-	const auto s = _mm_cmpeq_epi16(m, _mm_set1_epi16(-0x8000)); // detect special case (positive 0x8000)
-	return _mm_xor_si128(m, s);
-#endif
-}
-
-inline v128 gv_muladd16(const v128& a, const v128& b, const v128& c)
-{
-#if defined(ARCH_X64)
-	return _mm_add_epi16(_mm_mullo_epi16(a, b), c);
-#elif defined(ARCH_ARM64)
-	return vmlaq_s16(c, a, b);
-#endif
-}
-
-inline v128 gv_mul16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_mullo_epi16(a, b);
-#elif defined(ARCH_ARM64)
-	return vmulq_s16(a, b);
-#endif
-}
-
-inline v128 gv_mul32(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__)
-	return _mm_mullo_epi32(a, b);
-#elif defined(ARCH_X64)
-	const __m128i lows = _mm_shuffle_epi32(_mm_mul_epu32(a, b), 8);
-	const __m128i highs = _mm_shuffle_epi32(_mm_mul_epu32(_mm_srli_epi64(a, 32), _mm_srli_epi64(b, 32)), 8);
-	return _mm_unpacklo_epi32(lows, highs);
-#elif defined(ARCH_ARM64)
-	return vmulq_s32(a, b);
-#endif
-}
-
-inline v128 gv_mulfs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_mul_ps(a, b);
-#elif defined(ARCH_ARM64)
-	return vmulq_f32(a, b);
-#endif
-}
-
-inline v128 gv_mulfs(const v128& a, f32 b)
-{
-#if defined(ARCH_X64)
-	return _mm_mul_ps(a, _mm_set_ps1(b));
-#elif defined(ARCH_ARM64)
-	return vmulq_n_f32(a, b);
-#endif
-}
-
-inline v128 gv_hadds8x2(const v128& a)
-{
-#if defined(__SSSE3__)
-	return _mm_maddubs_epi16(_mm_set1_epi8(1), a);
-#elif defined(ARCH_X64)
-	return _mm_add_epi16(_mm_srai_epi16(a, 8), _mm_srai_epi16(_mm_slli_epi16(a, 8), 8));
-#elif defined(ARCH_ARM64)
-	return vpaddlq_s8(a);
-#endif
-}
-
-inline v128 gv_hadds8x4(const v128& a, const v128& c)
-{
-#if (defined(__AVX512VL__) && defined(__AVX512VNNI__)) || defined(__AVXVNNI__)
-	return _mm_dpbusd_epi32(c, _mm_set1_epi8(1), a);
-#elif defined(__SSSE3__)
-	return _mm_add_epi32(_mm_madd_epi16(_mm_maddubs_epi16(_mm_set1_epi8(1), a), _mm_set1_epi16(1)), c);
-#elif defined(ARCH_X64)
-	return _mm_add_epi32(_mm_madd_epi16(_mm_add_epi16(_mm_srai_epi16(a, 8), _mm_srai_epi16(_mm_slli_epi16(a, 8), 8)), _mm_set1_epi16(1)), c);
-#elif defined(ARCH_ARM64)
-	return vaddq_s32(vpaddlq_s16(vpaddlq_s8(a)), c);
-#endif
-}
-
-inline v128 gv_haddu8x2(const v128& a)
-{
-#if defined(__SSSE3__)
-	return _mm_maddubs_epi16(a, _mm_set1_epi8(1));
-#elif defined(ARCH_X64)
-	return _mm_add_epi16(_mm_srli_epi16(a, 8), _mm_and_si128(a, _mm_set1_epi16(0x00ff)));
-#elif defined(ARCH_ARM64)
-	return vpaddlq_u8(a);
-#endif
-}
-
-inline v128 gv_haddu8x4(const v128& a)
-{
-#if (defined(__AVX512VL__) && defined(__AVX512VNNI__)) || defined(__AVXVNNI__)
-	return _mm_dpbusd_epi32(_mm_setzero_si128(), a, _mm_set1_epi8(1));
-#elif defined(__SSSE3__)
-	return _mm_madd_epi16(_mm_maddubs_epi16(a, _mm_set1_epi8(1)), _mm_set1_epi16(1));
-#elif defined(ARCH_X64)
-	return _mm_madd_epi16(_mm_add_epi16(_mm_srli_epi16(a, 8), _mm_and_si128(a, _mm_set1_epi16(0x00ff))), _mm_set1_epi16(1));
-#elif defined(ARCH_ARM64)
-	return vpaddlq_u16(vpaddlq_u8(a));
-#endif
-}
-
-inline v128 gv_hadds16x2(const v128& a, const v128& c)
-{
-#if (defined(__AVX512VL__) && defined(__AVX512VNNI__)) || defined(__AVXVNNI__)
-	return _mm_dpwssd_epi32(c, a, _mm_set1_epi8(1));
-#elif defined(ARCH_X64)
-	return _mm_add_epi32(_mm_madd_epi16(a, _mm_set1_epi16(1)), c);
-#elif defined(ARCH_ARM64)
-	return vaddq_s32(vpaddlq_s16(a), c);
-#endif
-}
-
-// Unsigned bytes from a, signed bytes from b, 32-bit accumulator c
-inline v128 gv_dotu8s8x4(const v128& a, const v128& b, const v128& c)
-{
-#if (defined(__AVX512VL__) && defined(__AVX512VNNI__)) || defined(__AVXVNNI__)
-	return _mm_dpbusd_epi32(c, a, b);
-#elif defined(ARCH_X64)
-	const __m128i ah = _mm_srli_epi16(a, 8);
-	const __m128i al = _mm_and_si128(a, _mm_set1_epi16(0x00ff));
-	const __m128i bh = _mm_srai_epi16(b, 8);
-	const __m128i bl = _mm_srai_epi16(_mm_slli_epi16(b, 8), 8);
-	const __m128i mh = _mm_madd_epi16(ah, bh);
-	const __m128i ml = _mm_madd_epi16(al, bl);
-	const __m128i x = _mm_add_epi32(mh, ml);
-	return _mm_add_epi32(c, x);
-#elif defined(__ARM_FEATURE_MATMUL_INT8)
-	return vusdotq_s32(c, a, b);
-#elif defined(ARCH_ARM64)
-    const auto l = vpaddlq_s16(vmulq_s16(vreinterpretq_s16_u16(vmovl_u8(vget_low_u8(a))), vmovl_s8(vget_low_s8(b))));
-	const auto h = vpaddlq_s16(vmulq_s16(vreinterpretq_s16_u16(vmovl_u8(vget_high_u8(a))), vmovl_s8(vget_high_s8(b))));
-    return vaddq_s32(c, vaddq_s32(vuzp1q_s32(l, h), vuzp2q_s32(l, h)));
-#endif
-}
-
-inline v128 gv_dotu8x4(const v128& a, const v128& b, const v128& c)
-{
-#if defined(ARCH_X64)
-	const __m128i ah = _mm_srli_epi16(a, 8);
-	const __m128i al = _mm_and_si128(a, _mm_set1_epi16(0x00ff));
-	const __m128i bh = _mm_srli_epi16(b, 8);
-	const __m128i bl = _mm_and_si128(b, _mm_set1_epi16(0x00ff));
-	const __m128i mh = _mm_madd_epi16(ah, bh);
-	const __m128i ml = _mm_madd_epi16(al, bl);
-	const __m128i x = _mm_add_epi32(mh, ml);
-	return _mm_add_epi32(c, x);
-#elif defined(__ARM_FEATURE_DOTPROD)
-	return vdotq_u32(c, a, b);
-#elif defined(ARCH_ARM64)
-    const auto l = vpaddlq_u16(vmulq_u16(vmovl_u8(vget_low_u8(a)), vmovl_u8(vget_low_u8(b))));
-	const auto h = vpaddlq_u16(vmulq_u16(vmovl_u8(vget_high_u8(a)), vmovl_u8(vget_high_u8(b))));
-    return vaddq_u32(c, vaddq_u32(vuzp1q_u32(l, h), vuzp2q_u32(l, h)));
-#endif
-}
-
-inline v128 gv_dots16x2(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_madd_epi16(a, b);
-#elif defined(ARCH_ARM64)
-	const auto ml = vmull_s16(vget_low_s16(a), vget_low_s16(b));
-	const auto mh = vmull_s16(vget_high_s16(a), vget_high_s16(b));
-	const auto sl = vpadd_s32(vget_low_s32(ml), vget_high_s32(ml));
-	const auto sh = vpadd_s32(vget_low_s32(mh), vget_high_s32(mh));
-	return vcombine_s32(sl, sh);
-#endif
-}
-
-// Signed s16 from a and b, 32-bit accumulator c
-inline v128 gv_dots16x2(const v128& a, const v128& b, const v128& c)
-{
-#if (defined(__AVX512VL__) && defined(__AVX512VNNI__)) || defined(__AVXVNNI__)
-	return _mm_dpwssd_epi32(c, a, b);
-#else
-	return gv_add32(c, gv_dots16x2(a, b));
-#endif
-}
-
-inline v128 gv_dotu16x2(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	const auto ml = _mm_mullo_epi16(a, b); // low results
-	const auto mh = _mm_mulhi_epu16(a, b); // high results
-	const auto ls = _mm_add_epi32(_mm_srli_epi32(ml, 16), _mm_and_si128(ml, _mm_set1_epi32(0x0000ffff)));
-	const auto hs = _mm_add_epi32(_mm_slli_epi32(mh, 16), _mm_and_si128(mh, _mm_set1_epi32(0xffff0000)));
-	return _mm_add_epi32(ls, hs);
-#elif defined(ARCH_ARM64)
-	const auto ml = vmull_u16(vget_low_u16(a), vget_low_u16(b));
-	const auto mh = vmull_u16(vget_high_u16(a), vget_high_u16(b));
-	const auto sl = vpadd_u32(vget_low_u32(ml), vget_high_u32(ml));
-	const auto sh = vpadd_u32(vget_low_u32(mh), vget_high_u32(mh));
-	return vcombine_u32(sl, sh);
-#endif
-}
-
-// Unsigned bytes from a, signed bytes from b, 32-bit accumulator c
-inline v128 gv_dots_u8s8x4(const v128& a, const v128& b, const v128& c)
-{
-#if (defined(__AVX512VL__) && defined(__AVX512VNNI__)) || defined(__AVXVNNI__)
-	return _mm_dpbusds_epi32(c, a, b);
-#elif defined(ARCH_X64)
-	const __m128i ah = _mm_srli_epi16(a, 8);
-	const __m128i al = _mm_and_si128(a, _mm_set1_epi16(0x00ff));
-	const __m128i bh = _mm_srai_epi16(b, 8);
-	const __m128i bl = _mm_srai_epi16(_mm_slli_epi16(b, 8), 8);
-	const __m128i mh = _mm_madd_epi16(ah, bh);
-	const __m128i ml = _mm_madd_epi16(al, bl);
-	return gv_adds_s32(c, _mm_add_epi32(mh, ml));
-#elif defined(ARCH_ARM64)
-    const auto l = vpaddlq_s16(vmulq_s16(vreinterpretq_s16_u16(vmovl_u8(vget_low_u8(a))), vmovl_s8(vget_low_s8(b))));
-	const auto h = vpaddlq_s16(vmulq_s16(vreinterpretq_s16_u16(vmovl_u8(vget_high_u8(a))), vmovl_s8(vget_high_s8(b))));
-    return vqaddq_s32(c, vaddq_s32(vuzp1q_s32(l, h), vuzp2q_s32(l, h)));
-#endif
-}
-
-// Signed s16 from a and b, 32-bit accumulator c; signed saturation
-inline v128 gv_dots_s16x2(const v128& a, const v128& b, const v128& c)
-{
-#if (defined(__AVX512VL__) && defined(__AVX512VNNI__)) || defined(__AVXVNNI__)
-	return _mm_dpwssds_epi32(c, a, b);
-#else
-	const auto ab = gv_dots16x2(a, b);
-	const auto s0 = gv_adds_s32(ab, c);
-	const auto s1 = gv_eq32(ab, gv_bcst32(0x80000000)); // +0x80000000, negative c -> c^0x80000000; otherwise 0x7fffffff
-	const auto s2 = gv_select32(gv_gts32(gv_bcst32(0), c), gv_xor32(c, gv_bcst32(0x80000000)), gv_bcst32(0x7fffffff));
-	return gv_select32(s1, s2, s0);
-#endif
-}
-
-// Multiply s16 elements 0, 2, 4, 6 to produce s32 results in corresponding lanes
-inline v128 gv_mul_even_s16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	const auto c = _mm_set1_epi32(0x0000ffff);
-	return _mm_madd_epi16(_mm_and_si128(a, c), _mm_and_si128(b, c));
-#else
-	// TODO
-	return gv_mul32(gv_sar32(gv_shl32(a, 16), 16), gv_sar32(gv_shl32(b, 16), 16));
-#endif
-}
-
-// Multiply u16 elements 0, 2, 4, 6 to produce u32 results in corresponding lanes
-inline v128 gv_mul_even_u16(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__) || defined(ARCH_ARM64)
-	const auto c = gv_bcst32(0x0000ffff);
-	return gv_mul32(a & c, b & c);
-#elif defined(ARCH_X64)
-	const auto ml = _mm_mullo_epi16(a, b);
-	const auto mh = _mm_mulhi_epu16(a, b);
-	return _mm_or_si128(_mm_and_si128(ml, _mm_set1_epi32(0x0000ffff)), _mm_slli_epi32(mh, 16));
-#endif
-}
-
-// Multiply s16 elements 1, 3, 5, 7 to produce s32 results in corresponding lanes
-inline v128 gv_mul_odds_s16(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_madd_epi16(_mm_srli_epi32(a, 16), _mm_srli_epi32(b, 16));
-#else
-	return gv_mul32(gv_sar32(a, 16), gv_sar32(b, 16));
-#endif
-}
-
-// Multiply u16 elements 1, 3, 5, 7 to produce u32 results in corresponding lanes
-inline v128 gv_mul_odds_u16(const v128& a, const v128& b)
-{
-#if defined(__SSE4_1__) || defined(ARCH_ARM64)
-	return gv_mul32(gv_shr32(a, 16), gv_shr32(b, 16));
-#elif defined(ARCH_X64)
-	const auto ml = _mm_mullo_epi16(a, b);
-	const auto mh = _mm_mulhi_epu16(a, b);
-	return _mm_or_si128(_mm_and_si128(mh, _mm_set1_epi32(0xffff0000)), _mm_srli_epi32(ml, 16));
-#endif
-}
-
-inline v128 gv_cvts32_tofs(const v128& src)
-{
-#if defined(ARCH_X64)
-	return _mm_cvtepi32_ps(src);
-#elif defined(ARCH_ARM64)
-	return vcvtq_f32_s32(src);
-#endif
-}
-
-inline v128 gv_cvtu32_tofs(const v128& src)
-{
-#if defined(__AVX512VL__)
-	return _mm_cvtepu32_ps(src);
-#elif defined(ARCH_X64)
-	const auto fix = _mm_and_ps(_mm_castsi128_ps(_mm_srai_epi32(src, 31)), _mm_set1_ps(0x80000000));
-	return _mm_add_ps(_mm_cvtepi32_ps(_mm_and_si128(src, _mm_set1_epi32(0x7fffffff))), fix);
-#elif defined(ARCH_ARM64)
-	return vcvtq_f32_u32(src);
-#endif
-}
-
-inline v128 gv_cvtfs_tos32(const v128& src)
-{
-#if defined(ARCH_X64)
-	return _mm_cvttps_epi32(src);
-#elif defined(ARCH_ARM64)
-	return vcvtq_s32_f32(src);
-#endif
-}
-
-inline v128 gv_cvtfs_tou32(const v128& src)
-{
-#if defined(__AVX512VL__)
-	return _mm_cvttps_epu32(src);
-#elif defined(ARCH_X64)
-	const auto c1 = _mm_cvttps_epi32(src);
-	const auto s1 = _mm_srai_epi32(c1, 31);
-	const auto c2 = _mm_cvttps_epi32(_mm_sub_ps(src, _mm_set1_ps(2147483648.)));
-	return _mm_or_si128(c1, _mm_and_si128(c2, s1));
-#elif defined(ARCH_ARM64)
-	return vcvtq_u32_f32(src);
-#endif
-}
-
-namespace utils
-{
-	inline f32 roundevenf32(f32 arg)
-	{
-		u32 val = std::bit_cast<u32>(arg);
-		u32 exp = (val >> 23) & 0xff;
-		u32 abs = val & 0x7fffffff;
-
-		if (exp >= 127 + 23)
-		{
-			// Big enough, NaN or INF
-			return arg;
-		}
-		else if (exp >= 127)
-		{
-			u32 int_pos = (127 + 23) - exp;
-			u32 half_pos = int_pos - 1;
-			u32 half_bit = 1u << half_pos;
-			u32 int_bit = 1u << int_pos;
-			if (val & (int_bit | (half_bit - 1)))
-				val += half_bit;
-			val &= ~(int_bit - 1);
-		}
-		else if (exp == 126 && abs > 0x3f000000)
-		{
-			val &= 0x80000000;
-			val |= 0x3f800000;
-		}
-		else
-		{
-			val &= 0x80000000;
-		}
-
-		return std::bit_cast<f32>(val);
-	}
-}
-
-#if defined(ARCH_X64)
-template <uint Mode>
-const auto sse41_roundf = build_function_asm<__m128(*)(__m128)>("sse41_roundf", [](native_asm& c, native_args&)
-{
-	static_assert(Mode < 4);
-	using namespace asmjit;
-	if (utils::has_avx())
-		c.vroundps(x86::xmm0, x86::xmm0, 8 + Mode);
-	else if (utils::has_sse41())
-		c.roundps(x86::xmm0, x86::xmm0, 8 + Mode);
-	else
-		c.jmp(+[](__m128 a) -> __m128
-		{
-			v128 r = a;
-			for (u32 i = 0; i < 4; i++)
-				if constexpr (Mode == 0)
-					r._f[i] = utils::roundevenf32(r._f[i]);
-				else if constexpr (Mode == 1)
-					r._f[i] = ::floorf(r._f[i]);
-				else if constexpr (Mode == 2)
-					r._f[i] = ::ceilf(r._f[i]);
-				else if constexpr (Mode == 3)
-					r._f[i] = ::truncf(r._f[i]);
-			return r;
-		});
-	c.ret();
-});
-#endif
-
-inline v128 gv_roundfs_even(const v128& a)
-{
-#if defined(__SSE4_1__)
-	return _mm_round_ps(a, 8 + 0);
-#elif defined(ARCH_ARM64)
-	return vrndnq_f32(a);
-#elif defined(ARCH_X64)
-	return sse41_roundf<0>(a);
-#else
-	v128 r;
-	for (u32 i = 0; i < 4; i++)
-		r._f[i] = utils::roundevenf32(a._f[i]);
-	return r;
-#endif
-}
-
-inline v128 gv_roundfs_ceil(const v128& a)
-{
-#if defined(__SSE4_1__)
-	return _mm_round_ps(a, 8 + 2);
-#elif defined(ARCH_ARM64)
-	return vrndpq_f32(a);
-#elif defined(ARCH_X64)
-	return sse41_roundf<2>(a);
-#else
-	v128 r;
-	for (u32 i = 0; i < 4; i++)
-		r._f[i] = ::ceilf(a._f[i]);
-	return r;
-#endif
-}
-
-inline v128 gv_roundfs_floor(const v128& a)
-{
-#if defined(__SSE4_1__)
-	return _mm_round_ps(a, 8 + 1);
-#elif defined(ARCH_ARM64)
-	return vrndmq_f32(a);
-#elif defined(ARCH_X64)
-	return sse41_roundf<1>(a);
-#else
-	v128 r;
-	for (u32 i = 0; i < 4; i++)
-		r._f[i] = ::floorf(a._f[i]);
-	return r;
-#endif
-}
-
-inline v128 gv_roundfs_trunc(const v128& a)
-{
-#if defined(__SSE4_1__)
-	return _mm_round_ps(a, 8 + 3);
-#elif defined(ARCH_ARM64)
-	return vrndq_f32(a);
-#elif defined(ARCH_X64)
-	return sse41_roundf<3>(a);
-#else
-	v128 r;
-	for (u32 i = 0; i < 4; i++)
-		r._f[i] = ::truncf(a._f[i]);
-	return r;
-#endif
-}
-
-inline bool gv_testz(const v128& a)
-{
-#if defined(__SSE4_1__)
-	return !!_mm_testz_si128(a, a);
-#elif defined(ARCH_X64)
-	return _mm_cvtsi128_si64(_mm_packs_epi32(a, a)) == 0;
-#elif defined(ARCH_ARM64)
-	return std::bit_cast<s64>(vqmovn_s32(a)) == 0;
-#else
-	return !(a._u64[0] | a._u64[1]);
-#endif
-}
-
-// Same as gv_testz but tuned for pairing with gv_testall1
-inline bool gv_testall0(const v128& a)
-{
-#if defined(__SSE4_1__)
-	return !!_mm_testz_si128(a, _mm_set1_epi32(-1));
-#elif defined(ARCH_X64)
-	return _mm_cvtsi128_si64(_mm_packs_epi32(a, a)) == 0;
-#elif defined(ARCH_ARM64)
-	return std::bit_cast<s64>(vqmovn_s32(a)) == 0;
-#else
-	return !(a._u64[0] | a._u64[1]);
-#endif
-}
-
-inline bool gv_testall1(const v128& a)
-{
-#if defined(__SSE4_1__)
-	return !!_mm_test_all_ones(a);
-#elif defined(ARCH_X64)
-	return _mm_cvtsi128_si64(_mm_packs_epi32(a, a)) == -1;
-#elif defined(ARCH_ARM64)
-	return std::bit_cast<s64>(vqmovn_s32(a)) == -1;
-#else
-	return (a._u64[0] & a._u64[1]) == UINT64_MAX;
-#endif
-}
-
-// result = (~a) & (b)
-inline v128 gv_andn(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_andnot_si128(a, b);
-#elif defined(ARCH_ARM64)
-	return vbicq_s32(b, a);
-#endif
-}
-
-// Select elements; _cmp must be result of SIMD comparison; undefined otherwise
-FORCE_INLINE v128 gv_select8(const v128& _cmp, const v128& _true, const v128& _false)
-{
-#if defined(__SSE4_1__)
-	return _mm_blendv_epi8(_false, _true, _cmp);
-#elif defined(ARCH_ARM64)
-	return vbslq_u8(_cmp, _true, _false);
-#else
-	return (_cmp & _true) | gv_andn(_cmp, _false);
-#endif
-}
-
-// Select elements using sign bit only
-FORCE_INLINE v128 gv_signselect8(const v128& bits, const v128& _true, const v128& _false)
-{
-#if defined(__SSE4_1__)
-	return _mm_blendv_epi8(_false, _true, bits);
-#else
-	return gv_select8(gv_gts8(gv_bcst8(0), bits), _true, _false);
-#endif
-}
-
-template <typename A, typename B, typename C> requires (asmjit::any_operand_v<A, B, C>)
-inline asmjit::vec_type gv_signselect8(A&& bits, B&& _true, C&& _false)
-{
-	using namespace asmjit;
-#if defined(ARCH_X64)
-	if (utils::has_avx())
-	{
-		Operand arg0{};
-		Operand arg1 = arg_eval(std::forward<A>(bits), 16);
-		Operand arg2 = arg_eval(std::forward<B>(_true), 16);
-		Operand arg3 = arg_eval(std::forward<C>(_false), 16);
-		if constexpr (!std::is_reference_v<A>)
-			arg0.isReg() ? arg_free(bits) : arg0.copyFrom(arg1);
-		if constexpr (!std::is_reference_v<B>)
-			arg0.isReg() ? arg_free(_true) : arg0.copyFrom(arg2);
-		if constexpr (!std::is_reference_v<C>)
-			arg0.isReg() ? arg_free(_false) : arg0.copyFrom(arg3);
-		if (arg0.isNone())
-			arg0 = g_vc->vec_alloc();
-		g_vc->emit(x86::Inst::kIdVpblendvb, arg0, arg3, arg2, arg1);
-		vec_type r;
-		r.copyFrom(arg0);
-		return r;
-	}
-#endif
-	g_vc->fail_flag = true;
-	return vec_type{0};
-}
-
-// Select elements; _cmp must be result of SIMD comparison; undefined otherwise
-inline v128 gv_select16(const v128& _cmp, const v128& _true, const v128& _false)
-{
-#if defined(__SSE4_1__)
-	return _mm_blendv_epi8(_false, _true, _cmp);
-#elif defined(ARCH_ARM64)
-	return vbslq_u16(_cmp, _true, _false);
-#else
-	return (_cmp & _true) | gv_andn(_cmp, _false);
-#endif
-}
-
-// Select elements; _cmp must be result of SIMD comparison; undefined otherwise
-inline v128 gv_select32(const v128& _cmp, const v128& _true, const v128& _false)
-{
-#if defined(__SSE4_1__)
-	return _mm_blendv_epi8(_false, _true, _cmp);
-#elif defined(ARCH_ARM64)
-	return vbslq_u32(_cmp, _true, _false);
-#else
-	return (_cmp & _true) | gv_andn(_cmp, _false);
-#endif
-}
-
-// Select elements; _cmp must be result of SIMD comparison; undefined otherwise
-inline v128 gv_selectfs(const v128& _cmp, const v128& _true, const v128& _false)
-{
-#if defined(__SSE4_1__)
-	return _mm_blendv_ps(_false, _true, _cmp);
-#elif defined(ARCH_ARM64)
-	return vbslq_f32(_cmp, _true, _false);
-#else
-	return _mm_or_ps(_mm_and_ps(_cmp, _true), _mm_andnot_ps(_cmp, _false));
-#endif
-}
-
-inline v128 gv_packss_s16(const v128& low, const v128& high)
-{
-#if defined(ARCH_X64)
-	return _mm_packs_epi16(low, high);
-#elif defined(ARCH_ARM64)
-	return vcombine_s8(vqmovn_s16(low), vqmovn_s16(high));
-#endif
-}
-
-inline v128 gv_packus_s16(const v128& low, const v128& high)
-{
-#if defined(ARCH_X64)
-	return _mm_packus_epi16(low, high);
-#elif defined(ARCH_ARM64)
-	return vcombine_u8(vqmovun_s16(low), vqmovun_s16(high));
-#endif
-}
-
-inline v128 gv_packus_u16(const v128& low, const v128& high)
-{
-#if defined(__SSE4_1__)
-	return _mm_packus_epi16(_mm_min_epu16(low, _mm_set1_epi16(0xff)), _mm_min_epu16(high, _mm_set1_epi16(0xff)));
-#elif defined(ARCH_X64)
-	return _mm_packus_epi16(_mm_sub_epi16(low, _mm_subs_epu16(low, _mm_set1_epi16(0xff))), _mm_sub_epi16(high, _mm_subs_epu16(high, _mm_set1_epi16(0xff))));
-#elif defined(ARCH_ARM64)
-	return vcombine_u8(vqmovn_u16(low), vqmovn_u16(high));
-#endif
-}
-
-inline v128 gv_packtu16(const v128& low, const v128& high)
-{
-#if defined(ARCH_X64)
-	return _mm_packus_epi16(low & _mm_set1_epi16(0xff), high & _mm_set1_epi16(0xff));
-#elif defined(ARCH_ARM64)
-	return vuzp1q_s8(low, high);
-#endif
-}
-
-inline v128 gv_packss_s32(const v128& low, const v128& high)
-{
-#if defined(ARCH_X64)
-	return _mm_packs_epi32(low, high);
-#elif defined(ARCH_ARM64)
-	return vcombine_s16(vqmovn_s32(low), vqmovn_s32(high));
-#endif
-}
-
-inline v128 gv_packus_s32(const v128& low, const v128& high)
-{
-#if defined(__SSE4_1__)
-	return _mm_packus_epi32(low, high);
-#elif defined(ARCH_X64)
-	const auto s = _mm_srai_epi16(_mm_packs_epi32(low, high), 15);
-	const auto r = gv_add16(_mm_packs_epi32(gv_sub32(low, gv_bcst32(0x8000)), gv_sub32(high, gv_bcst32(0x8000))), gv_bcst16(0x8000));
-	return gv_andn(s, r);
-#elif defined(ARCH_ARM64)
-	return vcombine_u16(vqmovun_s32(low), vqmovun_s32(high));
-#endif
-}
-
-inline v128 gv_packus_u32(const v128& low, const v128& high)
-{
-#if defined(__SSE4_1__)
-	return _mm_packus_epi32(_mm_min_epu32(low, _mm_set1_epi32(0xffff)), _mm_min_epu32(high, _mm_set1_epi32(0xffff)));
-#elif defined(ARCH_X64)
-	const v128 s = _mm_cmpgt_epi16(_mm_packs_epi32(_mm_srli_epi32(low, 16), _mm_srli_epi32(high, 16)), _mm_setzero_si128());
-	const v128 r = _mm_packs_epi32(_mm_srai_epi32(_mm_slli_epi32(low, 16), 16), _mm_srai_epi32(_mm_slli_epi32(high, 16), 16));
-	return _mm_or_si128(r, s);
-#elif defined(ARCH_ARM64)
-	return vcombine_u16(vqmovn_u32(low), vqmovn_u32(high));
-#endif
-}
-
-inline v128 gv_packtu32(const v128& low, const v128& high)
-{
-#if defined(__SSE4_1__)
-	return _mm_packus_epi32(low & _mm_set1_epi32(0xffff), high & _mm_set1_epi32(0xffff));
-#elif defined(ARCH_X64)
-	return _mm_packs_epi32(_mm_srai_epi32(_mm_slli_epi32(low, 16), 16), _mm_srai_epi32(_mm_slli_epi32(high, 16), 16));
-#elif defined(ARCH_ARM64)
-	return vuzp1q_s16(low, high);
-#endif
-}
-
-inline v128 gv_unpacklo8(const v128& lows, const v128& highs)
-{
-#if defined(ARCH_X64)
-	return _mm_unpacklo_epi8(lows, highs);
-#elif defined(ARCH_ARM64)
-	return vzip1q_s8(lows, highs);
-#endif
-}
-
-inline v128 gv_extend_lo_s8(const v128& vec)
-{
-#if defined(__SSE4_1__)
-	return _mm_cvtepi8_epi16(vec);
-#elif defined(ARCH_X64)
-	return _mm_srai_epi16(_mm_unpacklo_epi8(vec, vec), 8);
-#elif defined(ARCH_ARM64)
-	return int16x8_t(vmovl_s8(vget_low_s8(vec)));
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_extend_lo_s8(A&& a)
-{
-#if defined(ARCH_X64)
-	using enum asmjit::x86::Inst::Id;
-	if (utils::has_sse41())
-		return asmjit::unary_op(kIdNone, kIdPmovsxbw, std::forward<A>(a));
-	return asmjit::unary_op(kIdPsraw, kIdVpsraw, asmjit::unary_op(kIdNone, kIdPunpcklbw, std::forward<A>(a)), 8);
-#endif
-}
-
-inline v128 gv_extend_hi_s8(const v128& vec)
-{
-#if defined(__SSE4_1__)
-	return _mm_cvtepi8_epi16(_mm_loadu_si64(vec._bytes + 8));
-#elif defined(ARCH_X64)
-	return _mm_srai_epi16(_mm_unpackhi_epi8(vec, vec), 8);
-#elif defined(ARCH_ARM64)
-	return int16x8_t(vmovl_s8(vget_high_s8(vec)));
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_extend_hi_s8(A&& a)
-{
-#if defined(ARCH_X64)
-	using enum asmjit::x86::Inst::Id;
-	return asmjit::unary_op(kIdPsraw, kIdVpsraw, asmjit::unary_op(kIdNone, kIdPunpckhbw, std::forward<A>(a)), 8);
-#endif
-}
-
-inline v128 gv_unpacklo16(const v128& lows, const v128& highs)
-{
-#if defined(ARCH_X64)
-	return _mm_unpacklo_epi16(lows, highs);
-#elif defined(ARCH_ARM64)
-	return vzip1q_s16(lows, highs);
-#endif
-}
-
-inline v128 gv_extend_lo_s16(const v128& vec)
-{
-#if defined(__SSE4_1__)
-	return _mm_cvtepi16_epi32(vec);
-#elif defined(ARCH_X64)
-	return _mm_srai_epi32(_mm_unpacklo_epi16(vec, vec), 16);
-#elif defined(ARCH_ARM64)
-	return int32x4_t(vmovl_s16(vget_low_s16(vec)));
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_extend_lo_s16(A&& a)
-{
-#if defined(ARCH_X64)
-	using enum asmjit::x86::Inst::Id;
-	if (utils::has_sse41())
-		return asmjit::unary_op(kIdNone, kIdPmovsxwd, std::forward<A>(a));
-	return asmjit::unary_op(kIdPsrad, kIdVpsrad, asmjit::unary_op(kIdNone, kIdPunpcklwd, std::forward<A>(a)), 16);
-#endif
-}
-
-inline v128 gv_extend_hi_s16(const v128& vec)
-{
-#if defined(__SSE4_1__)
-	return _mm_cvtepi16_epi32(_mm_loadu_si64(vec._bytes + 8));
-#elif defined(ARCH_X64)
-	return _mm_srai_epi32(_mm_unpackhi_epi16(vec, vec), 16);
-#elif defined(ARCH_ARM64)
-	return int32x4_t(vmovl_s16(vget_high_s16(vec)));
-#endif
-}
-
-template <typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_extend_hi_s16(A&& a)
-{
-#if defined(ARCH_X64)
-	using enum asmjit::x86::Inst::Id;
-	return asmjit::unary_op(kIdPsrad, kIdVpsrad, asmjit::unary_op(kIdNone, kIdPunpckhwd, std::forward<A>(a)), 16);
-#endif
-}
-
-inline v128 gv_unpacklo32(const v128& lows, const v128& highs)
-{
-#if defined(ARCH_X64)
-	return _mm_unpacklo_epi32(lows, highs);
-#elif defined(ARCH_ARM64)
-	return vzip1q_s32(lows, highs);
-#endif
-}
-
-inline v128 gv_unpackhi8(const v128& lows, const v128& highs)
-{
-#if defined(ARCH_X64)
-	return _mm_unpackhi_epi8(lows, highs);
-#elif defined(ARCH_ARM64)
-	return vzip2q_s8(lows, highs);
-#endif
-}
-
-inline v128 gv_unpackhi16(const v128& lows, const v128& highs)
-{
-#if defined(ARCH_X64)
-	return _mm_unpackhi_epi16(lows, highs);
-#elif defined(ARCH_ARM64)
-	return vzip2q_s16(lows, highs);
-#endif
-}
-
-inline v128 gv_unpackhi32(const v128& lows, const v128& highs)
-{
-#if defined(ARCH_X64)
-	return _mm_unpackhi_epi32(lows, highs);
-#elif defined(ARCH_ARM64)
-	return vzip2q_s32(lows, highs);
-#endif
-}
-
-inline bool v128::operator==(const v128& b) const
-{
-#if defined(ARCH_X64)
-	return gv_testz(_mm_xor_si128(*this, b));
-#else
-	return gv_testz(*this ^ b);
-#endif
-}
-
-inline v128 v128::operator|(const v128& rhs) const
-{
-#if defined(ARCH_X64)
-	return _mm_or_si128(*this, rhs);
-#elif defined(ARCH_ARM64)
-	return vorrq_s32(*this, rhs);
-#endif
-}
-
-inline v128 v128::operator&(const v128& rhs) const
-{
-#if defined(ARCH_X64)
-	return _mm_and_si128(*this, rhs);
-#elif defined(ARCH_ARM64)
-	return vandq_s32(*this, rhs);
-#endif
-}
-
-inline v128 v128::operator^(const v128& rhs) const
-{
-#if defined(ARCH_X64)
-	return _mm_xor_si128(*this, rhs);
-#elif defined(ARCH_ARM64)
-	return veorq_s32(*this, rhs);
-#endif
-}
-
-inline v128 v128::operator~() const
-{
-#if defined(ARCH_X64)
-	return _mm_xor_si128(*this, _mm_set1_epi32(-1));
-#elif defined(ARCH_ARM64)
-	return vmvnq_u32(*this);
-#endif
-}
-
-inline v128 gv_exp2_approxfs(const v128& a)
-{
-	// TODO
-#if 0
-	const auto x0 = _mm_max_ps(_mm_min_ps(a, _mm_set1_ps(127.4999961f)), _mm_set1_ps(-127.4999961f));
-	const auto x1 = _mm_add_ps(x0, _mm_set1_ps(0.5f));
-	const auto x2 = _mm_sub_epi32(_mm_cvtps_epi32(x1), _mm_and_si128(_mm_castps_si128(_mm_cmpnlt_ps(_mm_setzero_ps(), x1)), _mm_set1_epi32(1)));
-	const auto x3 = _mm_sub_ps(x0, _mm_cvtepi32_ps(x2));
-	const auto x4 = _mm_mul_ps(x3, x3);
-	const auto x5 = _mm_mul_ps(x3, _mm_add_ps(_mm_mul_ps(_mm_add_ps(_mm_mul_ps(x4, _mm_set1_ps(0.023093347705f)), _mm_set1_ps(20.20206567f)), x4), _mm_set1_ps(1513.906801f)));
-	const auto x6 = _mm_mul_ps(x5, _mm_rcp_ps(_mm_sub_ps(_mm_add_ps(_mm_mul_ps(_mm_set1_ps(233.1842117f), x4), _mm_set1_ps(4368.211667f)), x5)));
-	return _mm_mul_ps(_mm_add_ps(_mm_add_ps(x6, x6), _mm_set1_ps(1.0f)), _mm_castsi128_ps(_mm_slli_epi32(_mm_add_epi32(x2, _mm_set1_epi32(127)), 23)));
-#else
-	v128 r;
-	for (u32 i = 0; i < 4; i++)
-		r._f[i] = std::exp2f(a._f[i]);
-	return r;
-#endif
-}
-
-inline v128 gv_log2_approxfs(const v128& a)
-{
-	// TODO
-#if 0
-	const auto _1 = _mm_set1_ps(1.0f);
-	const auto _c = _mm_set1_ps(1.442695040f);
-	const auto x0 = _mm_max_ps(a, _mm_castsi128_ps(_mm_set1_epi32(0x00800000)));
-	const auto x1 = _mm_or_ps(_mm_and_ps(x0, _mm_castsi128_ps(_mm_set1_epi32(0x807fffff))), _1);
-	const auto x2 = _mm_rcp_ps(_mm_add_ps(x1, _1));
-	const auto x3 = _mm_mul_ps(_mm_sub_ps(x1, _1), x2);
-	const auto x4 = _mm_add_ps(x3, x3);
-	const auto x5 = _mm_mul_ps(x4, x4);
-	const auto x6 = _mm_add_ps(_mm_mul_ps(_mm_add_ps(_mm_mul_ps(_mm_set1_ps(-0.7895802789f), x5), _mm_set1_ps(16.38666457f)), x5), _mm_set1_ps(-64.1409953f));
-	const auto x7 = _mm_rcp_ps(_mm_add_ps(_mm_mul_ps(_mm_add_ps(_mm_mul_ps(_mm_set1_ps(-35.67227983f), x5), _mm_set1_ps(312.0937664f)), x5), _mm_set1_ps(-769.6919436f)));
-	const auto x8 = _mm_cvtepi32_ps(_mm_sub_epi32(_mm_srli_epi32(_mm_castps_si128(x0), 23), _mm_set1_epi32(127)));
-	return _mm_add_ps(_mm_mul_ps(_mm_mul_ps(_mm_mul_ps(_mm_mul_ps(x5, x6), x7), x4), _c), _mm_add_ps(_mm_mul_ps(x4, _c), x8));
-#else
-	v128 r;
-	for (u32 i = 0; i < 4; i++)
-		r._f[i] = std::log2f(a._f[i]);
-	return r;
-#endif
-}
-
-// For each 8-bit element, r = a << (b & 7)
-inline v128 gv_shl8(const v128& a, const v128& b)
-{
-#if defined(ARCH_ARM64)
-	return vshlq_u8(a, vandq_s8(b, gv_bcst8(7)));
-#else
-	const v128 x1 = gv_add8(a, a); // shift left by 1
-	const v128 r1 = gv_signselect8(gv_shl64(b, 7), x1, a);
-	const v128 x2 = gv_and32(gv_shl64(r1, 2), gv_bcst8(0xfc)); // shift by 2
-	const v128 r2 = gv_signselect8(gv_shl64(b, 6), x2, r1);
-	const v128 x3 = gv_and32(gv_shl64(r2, 4), gv_bcst8(0xf0)); // shift by 4
-	return gv_signselect8(gv_shl64(b, 5), x3, r2);
-#endif
-}
-
-// For each 16-bit element, r = a << (b & 15)
-inline v128 gv_shl16(const v128& a, const v128& b)
-{
-#if defined(__AVX512VL__) && defined(__AVX512BW__)
-	return _mm_sllv_epi16(a, _mm_and_si128(b, _mm_set1_epi16(15)));
-#elif defined(ARCH_ARM64)
-	return vshlq_u16(a, vandq_s16(b, gv_bcst8(15)));
-#else
-	v128 r;
-	for (u32 i = 0; i < 8; i++)
-		r._u16[i] = a._u16[i] << (b._u16[i] & 15);
-	return r;
-#endif
-}
-
-// For each 32-bit element, r = a << (b & 31)
-inline v128 gv_shl32(const v128& a, const v128& b)
-{
-#if defined(__AVX2__)
-	return _mm_sllv_epi32(a, _mm_and_si128(b, _mm_set1_epi32(31)));
-#elif defined(ARCH_ARM64)
-	return vshlq_u32(a, vandq_s32(b, gv_bcst8(31)));
-#else
-	v128 r;
-	for (u32 i = 0; i < 4; i++)
-		r._u32[i] = a._u32[i] << (b._u32[i] & 31);
-	return r;
-#endif
-}
-
-// For each unsigned 8-bit element, r = a >> (b & 7)
-inline v128 gv_shr8(const v128& a, const v128& b)
-{
-#if defined(ARCH_ARM64)
-	return vshlq_u8(a, vnegq_s8(vandq_s8(b, gv_bcst8(7))));
-#else
-	const v128 x1 = gv_and32(gv_shr64(a, 1), gv_bcst8(0x7f)); // shift right by 1
-	const v128 r1 = gv_signselect8(gv_shl64(b, 7), x1, a);
-	const v128 x2 = gv_and32(gv_shr64(r1, 2), gv_bcst8(0x3f)); // shift by 2
-	const v128 r2 = gv_signselect8(gv_shl64(b, 6), x2, r1);
-	const v128 x3 = gv_and32(gv_shr64(r2, 4), gv_bcst8(0x0f)); // shift by 4
-	return gv_signselect8(gv_shl64(b, 5), x3, r2);
-#endif
-}
-
-// For each unsigned 16-bit element, r = a >> (b & 15)
-inline v128 gv_shr16(const v128& a, const v128& b)
-{
-#if defined(__AVX512VL__) && defined(__AVX512BW__)
-	return _mm_srlv_epi16(a, _mm_and_si128(b, _mm_set1_epi16(15)));
-#elif defined(ARCH_ARM64)
-	return vshlq_u16(a, vnegq_s16(vandq_s16(b, gv_bcst8(15))));
-#else
-	v128 r;
-	for (u32 i = 0; i < 8; i++)
-		r._u16[i] = a._u16[i] >> (b._u16[i] & 15);
-	return r;
-#endif
-}
-
-// For each unsigned 32-bit element, r = a >> (b & 31)
-inline v128 gv_shr32(const v128& a, const v128& b)
-{
-#if defined(__AVX2__)
-	return _mm_srlv_epi32(a, _mm_and_si128(b, _mm_set1_epi32(31)));
-#elif defined(ARCH_ARM64)
-	return vshlq_u32(a, vnegq_s32(vandq_s32(b, gv_bcst8(31))));
-#else
-	v128 r;
-	for (u32 i = 0; i < 4; i++)
-		r._u32[i] = a._u32[i] >> (b._u32[i] & 31);
-	return r;
-#endif
-}
-
-// For each signed 8-bit element, r = a >> (b & 7)
-inline v128 gv_sar8(const v128& a, const v128& b)
-{
-#if defined(ARCH_ARM64)
-	return vshlq_s8(a, vnegq_s8(vandq_s8(b, gv_bcst8(7))));
-#else
-	v128 r;
-	for (u32 i = 0; i < 16; i++)
-		r._s8[i] = a._s8[i] >> (b._s8[i] & 7);
-	return r;
-#endif
-}
-
-// For each signed 16-bit element, r = a >> (b & 15)
-inline v128 gv_sar16(const v128& a, const v128& b)
-{
-#if defined(__AVX512VL__) && defined(__AVX512BW__)
-	return _mm_srav_epi16(a, _mm_and_si128(b, _mm_set1_epi16(15)));
-#elif defined(ARCH_ARM64)
-	return vshlq_s16(a, vnegq_s16(vandq_s16(b, gv_bcst8(15))));
-#else
-	v128 r;
-	for (u32 i = 0; i < 8; i++)
-		r._s16[i] = a._s16[i] >> (b._s16[i] & 15);
-	return r;
-#endif
-}
-
-// For each signed 32-bit element, r = a >> (b & 31)
-inline v128 gv_sar32(const v128& a, const v128& b)
-{
-#if defined(__AVX2__)
-	return _mm_srav_epi32(a, _mm_and_si128(b, _mm_set1_epi32(31)));
-#elif defined(ARCH_ARM64)
-	return vshlq_s32(a, vnegq_s32(vandq_s32(b, gv_bcst8(31))));
-#else
-	v128 r;
-	for (u32 i = 0; i < 4; i++)
-		r._s32[i] = a._s32[i] >> (b._s32[i] & 31);
-	return r;
-#endif
-}
-
-// For each 8-bit element, r = rotate a by b
-inline v128 gv_rol8(const v128& a, const v128& b)
-{
-#if defined(ARCH_ARM64)
-	const auto amt1 = vandq_s8(b, gv_bcst8(7));
-	const auto amt2 = vsubq_s8(amt1, gv_bcst8(8));
-	return vorrq_u8(vshlq_u8(a, amt1), vshlq_u8(a, amt2));
-#else
-	const v128 x1 = gv_sub8(gv_add8(a, a), gv_gts8(gv_bcst8(0), a)); // rotate left by 1
-	const v128 r1 = gv_signselect8(gv_shl64(b, 7), x1, a);
-	const v128 c2 = gv_bcst8(0x3);
-	const v128 x2 = gv_or32(gv_and32(gv_shr64(r1, 6), c2), gv_andn32(c2, gv_shl64(r1, 2))); // rotate by 2
-	const v128 r2 = gv_signselect8(gv_shl64(b, 6), x2, r1);
-	const v128 c3 = gv_bcst8(0xf);
-	const v128 x3 = gv_or32(gv_and32(gv_shr64(r2, 4), c3), gv_andn32(c3, gv_shl64(r2, 4))); // rotate by 4
-	return gv_signselect8(gv_shl64(b, 5), x3, r2);
-#endif
-}
-
-// For each 16-bit element, r = rotate a by b
-inline v128 gv_rol16(const v128& a, const v128& b)
-{
-#if defined(ARCH_ARM64)
-	const auto amt1 = vandq_s16(b, gv_bcst16(15));
-	const auto amt2 = vsubq_s16(amt1, gv_bcst16(16));
-	return vorrq_u16(vshlq_u16(a, amt1), vshlq_u16(a, amt2));
-#else
-	v128 r;
-	for (u32 i = 0; i < 8; i++)
-		r._u16[i] = utils::rol16(a._u16[i], b._u16[i]);
-	return r;
-#endif
-}
-
-// For each 16-bit element, r = rotate a by count
-template <u8 Count>
-inline v128 gv_rol16(const v128& a)
-{
-	constexpr u8 count = Count & 0xf;
-#if defined(ARCH_X64)
-	return _mm_or_si128(_mm_srli_epi16(a, 16 - count), _mm_slli_epi16(a, count));
-#elif defined(ARCH_ARM64)
-	return vorrq_u16(vshrq_n_u16(a, 16 - count), vshlq_n_u16(a, count));
-#else
-	v128 r;
-	for (u32 i = 0; i < 8; i++)
-		r._u16[i] = std::rotl(a._u16[i], count);
-	return r;
-#endif
-}
-
-// For each 32-bit element, r = rotate a by b
-inline v128 gv_rol32(const v128& a, const v128& b)
-{
-#if defined(__AVX512VL__)
-	return _mm_rolv_epi32(a, b);
-#elif defined(ARCH_ARM64)
-	const auto amt1 = vandq_s32(b, gv_bcst32(31));
-	const auto amt2 = vsubq_s32(amt1, gv_bcst32(32));
-	return vorrq_u32(vshlq_u32(a, amt1), vshlq_u32(a, amt2));
-#else
-	v128 r;
-	for (u32 i = 0; i < 4; i++)
-		r._u32[i] = utils::rol32(a._u32[i], b._u32[i]);
-	return r;
-#endif
-}
-
-// For each 32-bit element, r = rotate a by count
-template <u8 Count>
-inline v128 gv_rol32(const v128& a)
-{
-	constexpr u8 count = Count & 0x1f;
-#if defined(__AVX512VL__)
-	return _mm_rol_epi32(a, count);
-#elif defined(ARCH_X64)
-	return _mm_or_si128(_mm_srli_epi32(a, 32 - count), _mm_slli_epi32(a, count));
-#elif defined(ARCH_ARM64)
-	return vorrq_u32(vshrq_n_u32(a, 32 - count), vshlq_n_u32(a, count));
-#else
-	v128 r;
-	for (u32 i = 0; i < 4; i++)
-		r._u32[i] = utils::rol32(a._u32[i], count);
-	return r;
-#endif
-}
-
-// For each 8-bit element, r = (a << (c & 7)) | (b >> (~c & 7) >> 1)
-template <typename A, typename B, typename C>
-inline auto gv_fshl8(A&& a, B&& b, C&& c)
-{
-#if defined(ARCH_ARM64)
-	const auto amt1 = vandq_s8(c, gv_bcst8(7));
-	const auto amt2 = vsubq_s8(amt1, gv_bcst8(8));
-	return v128(vorrq_u8(vshlq_u8(a, amt1), vshlq_u8(b, amt2)));
-#else
-	auto x1 = gv_sub8(gv_add8(a, a), gv_gts8(gv_bcst8(0), b));
-	auto s1 = gv_shl64(c, 7);
-	auto r1 = gv_signselect8(s1, std::move(x1), std::forward<A>(a));
-	auto b1 = gv_signselect8(std::move(s1), gv_shl64(b, 1), std::forward<B>(b));
-	auto c2 = gv_bcst8(0x3);
-	auto x2 = gv_and32(gv_shr64(b1, 6), c2); x2 = gv_or32(std::move(x2), gv_andn32(std::move(c2), gv_shl64(r1, 2)));
-	auto s2 = gv_shl64(c, 6);
-	auto r2 = gv_signselect8(s2, std::move(x2), std::move(r1));
-	auto b2 = gv_signselect8(std::move(s2), gv_shl64(b1, 2), std::move(b1));
-	auto c3 = gv_bcst8(0xf);
-	auto x3 = gv_and32(gv_shr64(std::move(b2), 4), c3); x3 = gv_or32(std::move(x3), gv_andn32(std::move(c3), gv_shl64(r2, 4)));
-	return gv_signselect8(gv_shl64(std::move(c), 5), std::move(x3), std::move(r2));
-#endif
-}
-
-// For each 8-bit element, r = (b >> (c & 7)) | (a << (~c & 7) << 1)
-template <typename A, typename B, typename C>
-inline auto gv_fshr8(A&& a, B&& b, C&& c)
-{
-#if defined(ARCH_ARM64)
-	const auto amt1 = vandq_s8(c, gv_bcst8(7));
-	const auto amt2 = vsubq_s8(gv_bcst8(8), amt1);
-	return vorrq_u8(vshlq_u8(b, vnegq_s8(amt1)), vshlq_u8(a, amt2));
-#else
-	auto c1 = gv_bcst8(0x7f);
-	auto x1 = gv_and32(gv_shr64(b, 1), c1); x1 = gv_or32(std::move(x1), gv_andn32(std::move(c1), gv_shl64(a, 7)));
-	auto s1 = gv_shl64(c, 7);
-	auto r1 = gv_signselect8(s1, std::move(x1), std::move(b));
-	auto a1 = gv_signselect8(std::move(s1), gv_shr64(a, 1), std::move(a));
-	auto c2 = gv_bcst8(0x3f);
-	auto x2 = gv_and32(gv_shr64(r1, 2), c2); x2 = gv_or32(std::move(x2), gv_andn32(std::move(c2), gv_shl64(a1, 6)));
-	auto s2 = gv_shl64(c, 6);
-	auto r2 = gv_signselect8(s2, std::move(x2), std::move(r1));
-	auto a2 = gv_signselect8(std::move(s2), gv_shr64(a1, 2), std::move(a1));
-	auto c3 = gv_bcst8(0x0f);
-	auto x3 = gv_and32(gv_shr64(r2, 4), c3); x3 = gv_or32(std::move(x3), gv_andn32(std::move(c3), gv_shl64(std::move(a2), 4)));
-	return gv_signselect8(gv_shl64(std::move(c), 5), std::move(x3), std::move(r2));
-#endif
-}
-
-// Shift left by byte amount
-template <u32 Count>
-inline v128 gv_shuffle_left(const v128& a)
-{
-	if (Count > 15)
-		return {};
-#if defined(ARCH_X64)
-	return _mm_slli_si128(a, Count);
-#elif defined(ARCH_ARM64)
-	v128 idx;
-	for (u32 i = 0; i < 16; i++)
-		idx._u8[i] = u8(i - Count);
-	return vqtbl1q_u8(a, idx);
-#endif
-}
-
-template <u32 Count, typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_shuffle_left(A&& a)
-{
-	FOR_X64(unary_op, kIdPslldq, kIdVpslldq, std::forward<A>(a), Count);
-}
-
-// Shift right by byte amount
-template <u32 Count>
-inline v128 gv_shuffle_right(const v128& a)
-{
-	if (Count > 15)
-		return {};
-#if defined(ARCH_X64)
-	return _mm_srli_si128(a, Count);
-#elif defined(ARCH_ARM64)
-	v128 idx;
-	for (u32 i = 0; i < 16; i++)
-		idx._u8[i] = u8(i + Count);
-	return vqtbl1q_u8(a, idx);
-#endif
-}
-
-template <u32 Count, typename A> requires (asmjit::any_operand_v<A>)
-inline auto gv_shuffle_right(A&& a)
-{
-	FOR_X64(unary_op, kIdPsrldq, kIdVpsrldq, std::forward<A>(a), Count);
-}
-
-// Load 32-bit integer into the first element of a new vector, set other elements to zero
-inline v128 gv_loadu32(const void* ptr)
-{
-#if defined(ARCH_X64)
-	return _mm_loadu_si32(ptr);
-#elif defined(ARCH_ARM64)
-	return vld1q_lane_u32(static_cast<const u32*>(ptr), vdupq_n_u32(0), 0);
-#endif
-}
-
-// Load 16-bit integer into an existing vector at the position specified by Index
-template <u8 Index>
-inline v128 gv_insert16(const v128& vec, u16 value)
-{
-#if defined(ARCH_X64)
-	return _mm_insert_epi16(vec, value, Index);
-#elif defined(ARCH_ARM64)
-	return vsetq_lane_u16(value, vec, Index & 0x7);
-#endif
-}
-
-// For each 8-bit element,
-// if ctrl >= 0 && ctrl < 16 then r = vec[ctrl],
-// else if ctrl < 0 then r = 0
-inline v128 gv_shuffle8(const v128& vec, const v128& ctrl)
-{
-	AUDIT(std::ranges::none_of(ctrl._chars, [](s8 i){ return i >= static_cast<s8>(sizeof(v128)); }), "All indices must be in the range [0, 15] or negative, since PSHUFB and TBL behave differently otherwise");
-#if defined(__SSSE3__)
-	return _mm_shuffle_epi8(vec, ctrl);
-#elif defined(ARCH_ARM64)
-	return vqtbl1q_s8(vec, ctrl);
-#else
-	v128 r;
-	for (s32 i = 0; i < 16; i++)
-		r._s8[i] = ctrl._s8[i] < 0 ? 0 : vec._s8[ctrl._s8[i] & 0xf];
-	return r;
-#endif
-}
-
-// For each 2-bit index in Control, r = vec[index]
-template <u8 Control>
-inline v128 gv_shuffle32(const v128& vec)
-{
-#if defined(ARCH_X64)
-	return _mm_shuffle_epi32(vec, Control);
-#elif defined(ARCH_ARM64)
-	constexpr u8 idx0 = (Control & 3) * sizeof(s32);
-	constexpr u8 idx1 = (Control >> 2 & 3) * sizeof(s32);
-	constexpr u8 idx2 = (Control >> 4 & 3) * sizeof(s32);
-	constexpr u8 idx3 = (Control >> 6 & 3) * sizeof(s32);
-
-	constexpr uint8x16_t idx_vec = { idx0, idx0 + 1, idx0 + 2, idx0 + 3, idx1, idx1 + 1, idx1 + 2, idx1 + 3, idx2, idx2 + 1, idx2 + 2, idx2 + 3, idx3, idx3 + 1, idx3 + 2, idx3 + 3 };
-
-	return vqtbl1q_s8(vec, idx_vec);
-#endif
-}
-
-// For each index, r = vec[index & 3]
-template <u8 Index0, u8 Index1, u8 Index2, u8 Index3>
-inline v128 gv_shuffle32(const v128& vec)
-{
-#if defined(ARCH_X64)
-	return _mm_shuffle_epi32(vec, (Index0 & 3) | (Index1 & 3) << 2 | (Index2 & 3) << 4 | (Index3 & 3) << 6);
-#elif defined(ARCH_ARM64)
-	constexpr u8 idx0 = (Index0 & 3) * sizeof(s32);
-	constexpr u8 idx1 = (Index1 & 3) * sizeof(s32);
-	constexpr u8 idx2 = (Index2 & 3) * sizeof(s32);
-	constexpr u8 idx3 = (Index3 & 3) * sizeof(s32);
-
-	constexpr uint8x16_t idx_vec = { idx0, idx0 + 1, idx0 + 2, idx0 + 3, idx1, idx1 + 1, idx1 + 2, idx1 + 3, idx2, idx2 + 1, idx2 + 2, idx2 + 3, idx3, idx3 + 1, idx3 + 2, idx3 + 3 };
-
-	return vqtbl1q_s8(vec, idx_vec);
-#endif
-}
-
-// For the first two 2-bit indices in Control, r = a[index],
-// for the last two indices, r = b[index]
-template <u8 Control>
-inline v128 gv_shufflefs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_shuffle_ps(a, b, Control);
-#elif defined(ARCH_ARM64)
-	constexpr u8 idx0 = (Control & 3) * sizeof(s32);
-	constexpr u8 idx1 = (Control >> 2 & 3) * sizeof(s32);
-	constexpr u8 idx2 = (Control >> 4 & 3) * sizeof(s32) + sizeof(v128);
-	constexpr u8 idx3 = (Control >> 6 & 3) * sizeof(s32) + sizeof(v128);
-
-	constexpr uint8x16_t idx_vec = { idx0, idx0 + 1, idx0 + 2, idx0 + 3, idx1, idx1 + 1, idx1 + 2, idx1 + 3, idx2, idx2 + 1, idx2 + 2, idx2 + 3, idx3, idx3 + 1, idx3 + 2, idx3 + 3 };
-
-	return vqtbl2q_s8({ a, b }, idx_vec);
-#endif
-}
-
-// For the first two indices, r = a[index & 3],
-// for the last two indices, r = b[index & 3]
-template <u8 Index0, u8 Index1, u8 Index2, u8 Index3>
-inline v128 gv_shufflefs(const v128& a, const v128& b)
-{
-#if defined(ARCH_X64)
-	return _mm_shuffle_ps(a, b, (Index0 & 3) | (Index1 & 3) << 2 | (Index2 & 3) << 4 | (Index3 & 3) << 6);
-#elif defined(ARCH_ARM64)
-	constexpr u8 idx0 = (Index0 & 3) * sizeof(s32);
-	constexpr u8 idx1 = (Index1 & 3) * sizeof(s32);
-	constexpr u8 idx2 = (Index2 & 3) * sizeof(s32) + sizeof(v128);
-	constexpr u8 idx3 = (Index3 & 3) * sizeof(s32) + sizeof(v128);
-
-	constexpr uint8x16_t idx_vec = { idx0, idx0 + 1, idx0 + 2, idx0 + 3, idx1, idx1 + 1, idx1 + 2, idx1 + 3, idx2, idx2 + 1, idx2 + 2, idx2 + 3, idx3, idx3 + 1, idx3 + 2, idx3 + 3 };
-
-	return vqtbl2q_s8({ a, b }, idx_vec);
-#endif
-}
-
-// For each 32-bit element, reverse byte order
-inline v128 gv_rev32(const v128& vec)
-{
-#if defined(__SSSE3__)
-	return _mm_shuffle_epi8(vec, _mm_setr_epi8(3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12));
-#elif defined(ARCH_ARM64)
-	return vrev32q_u8(vec);
-#else
-	return gv_rol32<16>(gv_rol16<8>(vec));
-#endif
-}
-
-// For each 32-bit element, convert between big-endian and native-endian
-inline v128 gv_to_be32(const v128& vec)
-{
-	if constexpr (std::endian::native == std::endian::little)
-		return gv_rev32(vec);
-	return vec;
-}
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
diff --git a/rpcs3/util/sysinfo.cpp b/rpcs3/util/sysinfo.cpp
index 52bb6f27b0..6bda0f3513 100755
--- a/rpcs3/util/sysinfo.cpp
+++ b/rpcs3/util/sysinfo.cpp
@@ -1,13 +1,9 @@
 #include "util/sysinfo.hpp"
 #include "Utilities/StrFmt.h"
 #include "Utilities/File.h"
-#include "Emu/vfs_config.h"
+#include "Emu/system_config.h"
 #include "Utilities/Thread.h"
 
-#if defined(ARCH_ARM64)
-#include "Emu/CPU/Backends/AArch64/AArch64Common.h"
-#endif
-
 #ifdef _WIN32
 #include "windows.h"
 #include "sysinfoapi.h"
@@ -15,25 +11,20 @@
 #include "stringapiset.h"
 #else
 #include <unistd.h>
-#include <sys/resource.h>
-#ifndef __APPLE__
 #include <sys/utsname.h>
 #include <errno.h>
 #endif
-#endif
-
-#include <thread>
-#include <fstream>
 
 #include "util/asm.hpp"
-#include "util/fence.hpp"
 
-#if defined(_M_X64) && defined(_MSC_VER)
-extern "C" u64 _xgetbv(u32);
+#ifdef _MSC_VER
+extern "C"
+{
+	u64 _xgetbv(u32);
+}
 #endif
 
-#if defined(ARCH_X64)
-static inline std::array<u32, 4> get_cpuid(u32 func, u32 subfunc)
+inline std::array<u32, 4> utils::get_cpuid(u32 func, u32 subfunc)
 {
 	int regs[4];
 #ifdef _MSC_VER
@@ -44,7 +35,7 @@ static inline std::array<u32, 4> get_cpuid(u32 func, u32 subfunc)
 	return {0u+regs[0], 0u+regs[1], 0u+regs[2], 0u+regs[3]};
 }
 
-static inline u64 get_xgetbv(u32 xcr)
+inline u64 utils::get_xgetbv(u32 xcr)
 {
 #ifdef _MSC_VER
 	return _xgetbv(xcr);
@@ -54,400 +45,97 @@ static inline u64 get_xgetbv(u32 xcr)
 	return eax | (u64(edx) << 32);
 #endif
 }
-#endif
-
-#ifdef __APPLE__
-// sysinfo_darwin.mm
-namespace Darwin_Version
-{
-	extern int getNSmajorVersion();
-	extern int getNSminorVersion();
-	extern int getNSpatchVersion();
-}
-
-namespace Darwin_ProcessInfo
-{
-	extern bool getLowPowerModeEnabled();
-}
-#endif
-
-namespace utils
-{
-#ifdef _WIN32
-	// Some helpers for sanity
-	const auto read_reg_dword = [](HKEY hKey, std::string_view value_name) -> std::pair<bool, DWORD>
-	{
-		DWORD val = 0;
-		DWORD len = sizeof(val);
-		if (ERROR_SUCCESS != RegQueryValueExA(hKey, value_name.data(), nullptr, nullptr, reinterpret_cast<LPBYTE>(&val), &len))
-		{
-			return { false, 0 };
-		}
-		return { true, val };
-	};
-
-	const auto read_reg_sz = [](HKEY hKey, std::string_view value_name) -> std::pair<bool, std::string>
-	{
-		constexpr usz MAX_SZ_LEN = 255;
-		char sz[MAX_SZ_LEN + 1] {};
-		DWORD sz_len = MAX_SZ_LEN;
-
-		// Safety; null terminate
-		sz[0] = 0;
-		sz[MAX_SZ_LEN] = 0;
-
-		// Read string
-		if (ERROR_SUCCESS != RegQueryValueExA(hKey, value_name.data(), nullptr, nullptr, reinterpret_cast<LPBYTE>(sz), &sz_len))
-		{
-			return { false, "" };
-		}
-
-		// Safety, force null terminator
-		if (sz_len < MAX_SZ_LEN)
-		{
-			sz[sz_len] = 0;
-		}
-		return { true, sz };
-	};
-
-#if !defined(ARCH_X64)
-	// Alternative way to read OS version using the registry.
-	static std::string get_fallback_windows_version()
-	{
-		HKEY hKey;
-		if (ERROR_SUCCESS != RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hKey))
-		{
-			return "Unknown Windows";
-		}
-
-		// ProductName (SZ) - Actual windows install name e.g Windows 10 Pro)
-		// CurrentMajorVersionNumber (DWORD) - e.g 10 for windows 10, 11 for windows 11
-		// CurrentMinorVersionNumber (DWORD) - usually 0 for newer windows, pairs with major version
-		// CurrentBuildNumber (SZ) - Windows build number, e.g 19045, used to identify different releases like 23H2, 24H2, etc
-		// CurrentVersion (SZ) - NT kernel version, e.g 6.3 for Windows 10
-		const auto [product_valid, product_name] = read_reg_sz(hKey, "ProductName");
-		if (!product_valid)
-		{
-			RegCloseKey(hKey);
-			return "Unknown Windows";
-		}
-
-		const auto [check_major, version_major] = read_reg_dword(hKey, "CurrentMajorVersionNumber");
-		const auto [check_minor, version_minor] = read_reg_dword(hKey, "CurrentMinorVersionNumber");
-		const auto [check_build_no, build_no] = read_reg_sz(hKey, "CurrentBuildNumber");
-		const auto [check_nt_ver, nt_ver] = read_reg_sz(hKey, "CurrentVersion");
-
-		// Close the registry key
-		RegCloseKey(hKey);
-
-		std::string version_id = "Unknown";
-		if (check_major && check_minor && check_build_no)
-		{
-			version_id = fmt::format("%u.%u.%s", version_major, version_minor, build_no);
-			if (check_nt_ver)
-			{
-				version_id += " NT" + nt_ver;
-			}
-		}
-
-		return fmt::format("Operating system: %s, Version %s", product_name, version_id);
-	}
-#endif
-#endif
-}
 
 bool utils::has_ssse3()
 {
-#if defined(ARCH_X64)
 	static const bool g_value = get_cpuid(0, 0)[0] >= 0x1 && get_cpuid(1, 0)[2] & 0x200;
 	return g_value;
-#else
-	return false;
-#endif
 }
 
 bool utils::has_sse41()
 {
-#if defined(ARCH_X64)
 	static const bool g_value = get_cpuid(0, 0)[0] >= 0x1 && get_cpuid(1, 0)[2] & 0x80000;
 	return g_value;
-#else
-	return false;
-#endif
 }
 
 bool utils::has_avx()
 {
-#if defined(ARCH_X64)
 	static const bool g_value = get_cpuid(0, 0)[0] >= 0x1 && get_cpuid(1, 0)[2] & 0x10000000 && (get_cpuid(1, 0)[2] & 0x0C000000) == 0x0C000000 && (get_xgetbv(0) & 0x6) == 0x6;
 	return g_value;
-#else
-	return false;
-#endif
 }
 
 bool utils::has_avx2()
 {
-#if defined(ARCH_X64)
 	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && get_cpuid(7, 0)[1] & 0x20 && (get_cpuid(1, 0)[2] & 0x0C000000) == 0x0C000000 && (get_xgetbv(0) & 0x6) == 0x6;
 	return g_value;
-#else
-	return false;
-#endif
 }
 
 bool utils::has_rtm()
 {
-#if defined(ARCH_X64)
 	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[1] & 0x800) == 0x800;
 	return g_value;
-#elif defined(ARCH_ARM64)
-	return false;
-#endif
 }
 
 bool utils::has_tsx_force_abort()
 {
-#if defined(ARCH_X64)
 	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[3] & 0x2000) == 0x2000;
 	return g_value;
-#else
-	return false;
-#endif
-}
-
-bool utils::has_rtm_always_abort()
-{
-#if defined(ARCH_X64)
-	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[3] & 0x800) == 0x800;
-	return g_value;
-#else
-	return false;
-#endif
 }
 
 bool utils::has_mpx()
 {
-#if defined(ARCH_X64)
 	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[1] & 0x4000) == 0x4000;
 	return g_value;
-#else
-	return false;
-#endif
 }
 
 bool utils::has_avx512()
 {
-#if defined(ARCH_X64)
 	// 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;
 	return g_value;
-#else
-	return false;
-#endif
 }
 
 bool utils::has_avx512_icl()
 {
-#if defined(ARCH_X64)
 	// Check AVX512IFMA, AVX512VBMI, AVX512VBMI2, AVX512VPOPCNTDQ, AVX512BITALG, AVX512VNNI, AVX512VPCLMULQDQ, AVX512GFNI, AVX512VAES (Icelake-client level support)
 	static const bool g_value = has_avx512() && (get_cpuid(7, 0)[1] & 0x00200000) == 0x00200000 && (get_cpuid(7, 0)[2] & 0x00005f42) == 0x00005f42;
 	return g_value;
-#else
-	return false;
-#endif
-}
-
-bool utils::has_avx512_vnni()
-{
-#if defined(ARCH_X64)
-	// Check AVX512VNNI
-	static const bool g_value = has_avx512() && get_cpuid(7, 0)[2] & 0x00000800;
-	return g_value;
-#else
-	return false;
-#endif
-}
-
-bool utils::has_avx10()
-{
-#if defined(ARCH_X64)
-	// Implies support for most AVX-512 instructions
-	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && get_cpuid(7, 1)[3] & 0x80000;
-	return g_value;
-#else
-	return false;
-#endif
-}
-
-u32 utils::avx10_isa_version()
-{
-#if defined(ARCH_X64)
-	// 8bit value
-	static const u32 g_value = []()
-	{
-		u32 isa_version = 0;
-		if (has_avx10())
-		{
-			isa_version = get_cpuid(24, 0)[2] & 0x000ff;
-		}
-
-		return isa_version;
-	}();
-
-	return g_value;
-#else
-	return 0;
-#endif
 }
 
 bool utils::has_xop()
 {
-#if defined(ARCH_X64)
 	static const bool g_value = has_avx() && get_cpuid(0x80000001, 0)[2] & 0x800;
 	return g_value;
-#else
-	return false;
-#endif
 }
 
 bool utils::has_clwb()
 {
-#if defined(ARCH_X64)
 	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[1] & 0x1000000) == 0x1000000;
 	return g_value;
-#else
-	return false;
-#endif
 }
 
 bool utils::has_invariant_tsc()
 {
-#if defined(ARCH_X64)
 	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(0x80000007, 0)[3] & 0x100) == 0x100;
 	return g_value;
-#elif defined(ARCH_ARM64)
-	return true;
-#endif
 }
 
 bool utils::has_fma3()
 {
-#if defined(ARCH_X64)
 	static const bool g_value = get_cpuid(0, 0)[0] >= 0x1 && get_cpuid(1, 0)[2] & 0x1000;
 	return g_value;
-#elif defined(ARCH_ARM64)
-	return true;
-#endif
 }
 
 bool utils::has_fma4()
 {
-#if defined(ARCH_X64)
 	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(0x80000001, 0)[2] & 0x10000) == 0x10000;
-	return g_value;
-#else
-	return false;
-#endif
-}
-
-// The Zen4 based CPUs support VPERMI2B/VPERMT2B in a single uop.
-// Current Intel cpus (as of 2022) need 3 uops to execute these instructions.
-// Check for SSE4A (which intel doesn't doesn't support) as well as VBMI.
-bool utils::has_fast_vperm2b()
-{
-#if defined(ARCH_X64)
-	static const bool g_value = has_avx512() && (get_cpuid(7, 0)[2] & 0x2) == 0x2 && get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(0x80000001, 0)[2] & 0x40) == 0x40;
-	return g_value;
-#else
-	return false;
-#endif
-}
-
-bool utils::has_erms()
-{
-#if defined(ARCH_X64)
-	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[1] & 0x200) == 0x200;
-	return g_value;
-#else
-	return false;
-#endif
-}
-
-bool utils::has_fsrm()
-{
-#if defined(ARCH_X64)
-	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[3] & 0x10) == 0x10;
-	return g_value;
-#else
-	return false;
-#endif
-}
-
-bool utils::has_waitx()
-{
-#if defined(ARCH_X64)
-	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(0x80000001, 0)[2] & 0x20000000) == 0x20000000;
-	return g_value;
-#else
-	return false;
-#endif
-}
-
-bool utils::has_waitpkg()
-{
-#if defined(ARCH_X64)
-	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[2] & 0x20) == 0x20;
-	return g_value;
-#else
-	return false;
-#endif
-}
-
-// User mode waits may be unfriendly to low thread CPUs
-// Filter out systems with less than 8 threads for linux and less than 12 threads for other platforms
-bool utils::has_appropriate_um_wait()
-{
-#ifdef __linux__
-	static const bool g_value = (has_waitx() || has_waitpkg()) && (get_thread_count() >= 8) && get_tsc_freq();
-	return g_value;
-#else
-	static const bool g_value = (has_waitx() || has_waitpkg()) && (get_thread_count() >= 12) && get_tsc_freq();
-	return g_value;
-#endif
-}
-
-// Similar to the above function but allow execution if alternatives such as yield are not wanted
-bool utils::has_um_wait()
-{
-	static const bool g_value = (has_waitx() || has_waitpkg()) && get_tsc_freq();
-	return g_value;
-}
-
-u32 utils::get_rep_movsb_threshold()
-{
-	static const u32 g_value = []()
-	{
-		u32 thresh_value = umax;
-		if (has_fsrm())
-		{
-			thresh_value = 2047;
-		}
-		else if (has_erms())
-		{
-			thresh_value = 4095;
-		}
-
-		return thresh_value;
-	}();
-
 	return g_value;
 }
 
 std::string utils::get_cpu_brand()
 {
-#if defined(ARCH_X64)
 	std::string brand;
+
 	if (get_cpuid(0x80000000, 0)[0] >= 0x80000004)
 	{
 		for (u32 i = 0; i < 3; i++)
@@ -470,12 +158,6 @@ std::string utils::get_cpu_brand()
 	}
 
 	return brand;
-#elif defined(ARCH_ARM64)
-	static const auto g_cpu_brand = aarch64::get_cpu_brand();
-	return g_cpu_brand;
-#else
-	return "Unidentified CPU";
-#endif
 }
 
 std::string utils::get_system_info()
@@ -494,19 +176,14 @@ std::string utils::get_system_info()
 	}
 	else
 	{
-		fmt::append(result, " | TSC: Disabled");
+		fmt::append(result, " | TSC: Bad");
 	}
 
 	if (has_avx())
 	{
 		result += " | AVX";
 
-		if (has_avx10())
-		{
-			const u32 avx10_version = avx10_isa_version();
-			fmt::append(result, "10.%d", avx10_version);
-		}
-		else if (has_avx512())
+		if (has_avx512())
 		{
 			result += "-512";
 
@@ -553,22 +230,18 @@ std::string utils::get_system_info()
 			result += "-FA";
 		}
 
-		if (!has_mpx() || has_tsx_force_abort())
+		if (!has_mpx())
 		{
 			result += " disabled by default";
 		}
 	}
-	else if (has_rtm_always_abort())
-	{
-		result += " | TSX disabled via microcode";
-	}
 
 	return result;
 }
 
 std::string utils::get_firmware_version()
 {
-	const std::string file_path = g_cfg_vfs.get_dev_flash() + "vsh/etc/version.txt";
+	const std::string file_path = g_cfg.vfs.get_dev_flash() + "vsh/etc/version.txt";
 	if (fs::file version_file{file_path})
 	{
 		const std::string version_str = version_file.to_string();
@@ -585,125 +258,31 @@ std::string utils::get_firmware_version()
 
 		version = version.substr(start, end - start);
 
-		// Trim version (e.g. '04.8900' becomes '4.89')
-		usz trim_start = version.find_first_not_of('0');
+		// Trim version
+		const usz trim_start = version.find_first_not_of('0');
+		const usz trim_end = version.find_last_not_of('0');
 
 		if (trim_start == umax)
 		{
 			return {};
 		}
 
-		// Keep at least one preceding 0 (e.g. '00.3100' becomes '0.31' instead of '.31')
-		if (version[trim_start] == '.')
-		{
-			if (trim_start == 0)
-			{
-				// Version starts with '.' for some reason
-				return {};
-			}
-
-			trim_start--;
-		}
-
-		const usz dot_pos = version.find_first_of('.', trim_start);
-
-		if (dot_pos == umax)
-		{
-			return {};
-		}
-
-		// Try to keep the second 0 in the minor version (e.g. '04.9000' becomes '4.90' instead of '4.9')
-		const usz trim_end = std::max(version.find_last_not_of('0', dot_pos + 1), std::min(dot_pos + 2, version.size()));
-
 		return std::string(version.substr(trim_start, trim_end));
 	}
 
 	return {};
 }
 
-utils::OS_version utils::get_OS_version()
-{
-	OS_version res {};
-
-#if _WIN32
-	res.type = "windows";
-#elif __linux__
-	res.type = "linux";
-#elif __APPLE__
-	res.type = "macos";
-#elif __FreeBSD__
-	res.type = "freebsd";
-#else
-	res.type = "unknown";
-#endif
-
-#if defined(ARCH_X64)
-	res.arch = "x64";
-#elif defined(ARCH_ARM64)
-	res.arch = "arm64";
-#else
-	res.arch = "unknown";
-#endif
-
-#ifdef _WIN32
-	// GetVersionEx is deprecated, RtlGetVersion is kernel-mode only and AnalyticsInfo is UWP only.
-	// So we're forced to read PEB instead to get Windows version info. It's ugly but works.
-#if defined(ARCH_X64)
-	constexpr DWORD peb_offset = 0x60;
-	const INT_PTR peb = __readgsqword(peb_offset);
-	res.version_major = *reinterpret_cast<const DWORD*>(peb + 0x118);
-	res.version_minor = *reinterpret_cast<const DWORD*>(peb + 0x11c);
-	res.version_patch = *reinterpret_cast<const WORD*>(peb + 0x120);
-#else
-	HKEY hKey;
-	if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hKey) == ERROR_SUCCESS)
-	{
-		const auto [check_major, version_major] = read_reg_dword(hKey, "CurrentMajorVersionNumber");
-		const auto [check_minor, version_minor] = read_reg_dword(hKey, "CurrentMinorVersionNumber");
-		const auto [check_build, version_patch] = read_reg_sz(hKey, "CurrentBuildNumber");
-
-		if (check_major) res.version_major = version_major;
-		if (check_minor) res.version_minor = version_minor;
-		if (check_build) res.version_patch = stoi(version_patch);
-
-		RegCloseKey(hKey);
-	}
-#endif
-#elif defined (__APPLE__)
-	res.version_major = Darwin_Version::getNSmajorVersion();
-	res.version_minor = Darwin_Version::getNSminorVersion();
-	res.version_patch = Darwin_Version::getNSpatchVersion();
-#else
-	if (struct utsname details = {}; !uname(&details))
-	{
-		const std::vector<std::string> version_list = fmt::split(details.release, { "." });
-		const auto get_version_part = [&version_list](usz i) -> usz
-		{
-			if (version_list.size() <= i) return 0;
-			if (const auto [success, version_part] = string_to_number(version_list[i]); success)
-			{
-				return version_part;
-			}
-			return 0;
-		};
-		res.version_major = get_version_part(0);
-		res.version_minor = get_version_part(1);
-		res.version_patch = get_version_part(2);
-	}
-#endif
-
-	return res;
-}
-
-std::string utils::get_OS_version_string()
+std::string utils::get_OS_version()
 {
 	std::string output;
 #ifdef _WIN32
 	// GetVersionEx is deprecated, RtlGetVersion is kernel-mode only and AnalyticsInfo is UWP only.
 	// So we're forced to read PEB instead to get Windows version info. It's ugly but works.
-#if defined(ARCH_X64)
-	constexpr DWORD peb_offset = 0x60;
+
+	const DWORD peb_offset = 0x60;
 	const INT_PTR peb = __readgsqword(peb_offset);
+
 	const DWORD version_major = *reinterpret_cast<const DWORD*>(peb + 0x118);
 	const DWORD version_minor = *reinterpret_cast<const DWORD*>(peb + 0x11c);
 	const WORD build = *reinterpret_cast<const WORD*>(peb + 0x120);
@@ -714,25 +293,13 @@ std::string utils::get_OS_version_string()
 	std::vector<char> holder(service_pack.Length + 1, '\0');
 	if (has_sp)
 	{
-		WideCharToMultiByte(CP_UTF8, 0, service_pack.Buffer, service_pack.Length,
-			static_cast<LPSTR>(holder.data()), static_cast<int>(holder.size()), nullptr, nullptr);
+		WideCharToMultiByte(CP_UTF8, NULL, service_pack.Buffer, service_pack.Length,
+			(LPSTR) holder.data(), static_cast<int>(holder.size()), nullptr, nullptr);
 	}
 
 	fmt::append(output,
 		"Operating system: Windows, Major: %lu, Minor: %lu, Build: %u, Service Pack: %s, Compatibility mode: %llu",
 		version_major, version_minor, build, has_sp ? holder.data() : "none", compatibility_mode);
-#else
-	// PEB cannot be easily accessed on ARM64, fall back to registry
-	static const auto s_windows_version = utils::get_fallback_windows_version();
-	return s_windows_version;
-#endif
-#elif defined (__APPLE__)
-	const int major_version = Darwin_Version::getNSmajorVersion();
-	const int minor_version = Darwin_Version::getNSminorVersion();
-	const int patch_version = Darwin_Version::getNSpatchVersion();
-
-	fmt::append(output, "Operating system: macOS, Version: %d.%d.%d",
-		major_version, minor_version, patch_version);
 #else
 	struct utsname details = {};
 
@@ -749,225 +316,95 @@ std::string utils::get_OS_version_string()
 	return output;
 }
 
-int utils::get_maxfiles()
+static constexpr ullong round_tsc(ullong val)
 {
-#ifdef _WIN32
-	// Virtually unlimited on Windows
-	return INT_MAX;
-#else
-	struct rlimit limits;
-	ensure(getrlimit(RLIMIT_NOFILE, &limits) == 0);
+	return utils::rounded_div(val, 1'000'000) * 1'000'000;
+}
 
-	return limits.rlim_cur;
+#ifdef _MSC_VER
+extern "C" void _mm_lfence();
+#endif
+
+static inline void lfence()
+{
+#ifdef _MSC_VER
+	_mm_lfence();
+#else
+	__builtin_ia32_lfence();
 #endif
 }
 
-bool utils::get_low_power_mode()
-{
-#ifdef __APPLE__
-	return Darwin_ProcessInfo::getLowPowerModeEnabled();
-#else
-	return false;
-#endif
-}
-
-static constexpr ullong round_tsc(ullong val, ullong known_error)
-{
-	if (known_error >= 500'000)
-	{
-		// Do not accept large errors
-		return 0;
-	}
-
-	ullong by = 1000;
-	known_error /= 1000;
-
-	while (known_error && by < 100'000)
-	{
-		by *= 10;
-		known_error /= 10;
-	}
-
-	return utils::rounded_div(val, by) * by;
-}
-
-namespace utils
-{
-	u64 s_tsc_freq = 0;
-}
-
-static const bool s_tsc_freq_evaluated = []() -> bool
+ullong utils::get_tsc_freq()
 {
 	static const ullong cal_tsc = []() -> ullong
 	{
-#ifdef ARCH_ARM64
-		u64 r = 0;
-		__asm__ volatile("mrs %0, cntfrq_el0" : "=r" (r));
-		return r;
-#endif
-
-		if (!utils::has_invariant_tsc())
-		{
+		if (!has_invariant_tsc())
 			return 0;
-		}
 
 #ifdef _WIN32
 		LARGE_INTEGER freq;
 		if (!QueryPerformanceFrequency(&freq))
-		{
 			return 0;
-		}
 
 		if (freq.QuadPart <= 9'999'999)
-		{
-			return 0;
-		}
+			return round_tsc(freq.QuadPart * 1024);
 
 		const ullong timer_freq = freq.QuadPart;
 #else
-
-#ifdef __linux__
-		// Check if system clocksource is TSC. If the kernel trusts the TSC, we should too.
-		// Some Ryzen laptops have broken firmware when running linux (requires a kernel patch). This is also a problem on some older intel CPUs.
-		const char* clocksource_file = "/sys/devices/system/clocksource/clocksource0/available_clocksource";
-		if (!fs::is_file(clocksource_file))
-		{
-			// OS doesn't support sysfs?
-			printf("[TSC calibration] Could not determine available clock sources. Disabling TSC.\n");
-			return 0;
-		}
-
-		std::string clock_sources;
-		std::ifstream file(clocksource_file);
-		std::getline(file, clock_sources);
-
-		if (file.fail())
-		{
-			printf("[TSC calibration] Could not read the available clock sources on this system. Disabling TSC.\n");
-			return 0;
-		}
-
-		printf("[TSC calibration] Available clock sources: '%s'\n", clock_sources.c_str());
-
-		// Check if the Kernel has blacklisted the TSC
-		const auto available_clocks = fmt::split(clock_sources, { " " });
-		const bool tsc_reliable = std::find(available_clocks.begin(), available_clocks.end(), "tsc") != available_clocks.end();
-
-		if (!tsc_reliable)
-		{
-			printf("[TSC calibration] TSC is not a supported clock source on this system.\n");
-			return 0;
-		}
-
-		printf("[TSC calibration] Kernel reports the TSC is reliable.\n");
-#else
-		if (utils::get_cpu_brand().find("Ryzen") != umax)
-		{
-			// MacOS is arm-native these days and I don't know much about BSD to fix this if it's an issue. (kd-11)
-			// Having this check only for Ryzen is broken behavior - other CPUs can also have this problem.
-			return 0;
-		}
+		const ullong timer_freq = 1'000'000'000;
 #endif
 
-		constexpr ullong timer_freq = 1'000'000'000;
-#endif
+		// Calibrate TSC
+		constexpr int samples = 40;
+		ullong rdtsc_data[samples];
+		ullong timer_data[samples];
+		[[maybe_unused]] ullong error_data[samples];
 
-		constexpr u64 retry_count = 1024;
+		// 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));
 
-		// First is entry is for the onset measurements, last is for the end measurements
-		constexpr usz sample_count = 2;
-		std::array<u64, sample_count> rdtsc_data{};
-		std::array<u64, sample_count> rdtsc_diff{};
-		std::array<u64, sample_count> timer_data{};
-
-#ifdef _WIN32
-		LARGE_INTEGER ctr0;
-		QueryPerformanceCounter(&ctr0);
-		const ullong time_base = ctr0.QuadPart;
-#else
+#ifndef _WIN32
 		struct timespec ts0;
 		clock_gettime(CLOCK_MONOTONIC, &ts0);
-		const ullong sec_base = ts0.tv_sec;
+		ullong sec_base = ts0.tv_sec;
 #endif
 
-		constexpr usz sleep_time_ms = 40;
-
-		for (usz sample = 0; sample < sample_count; sample++)
+		for (int i = 0; i < samples; i++)
 		{
-			for (usz i = 0; i < retry_count; i++)
-			{
-				const u64 rdtsc_read = (utils::lfence(), utils::get_tsc());
 #ifdef _WIN32
-				LARGE_INTEGER ctr;
-				QueryPerformanceCounter(&ctr);
+			Sleep(1);
+			error_data[i] = (lfence(), utils::get_tsc());
+			LARGE_INTEGER ctr;
+			QueryPerformanceCounter(&ctr);
+			rdtsc_data[i] = (lfence(), utils::get_tsc());
+			timer_data[i] = ctr.QuadPart;
 #else
-				struct timespec ts;
-				clock_gettime(CLOCK_MONOTONIC, &ts);
+			usleep(200);
+			error_data[i] = (lfence(), utils::get_tsc());
+			struct timespec ts;
+			clock_gettime(CLOCK_MONOTONIC, &ts);
+			rdtsc_data[i] = (lfence(), utils::get_tsc());
+			timer_data[i] = ts.tv_nsec + (ts.tv_sec - sec_base) * 1'000'000'000;
 #endif
-				const u64 rdtsc_read2 = (utils::lfence(), utils::get_tsc());
-
-#ifdef _WIN32
-				const u64 timer_read = ctr.QuadPart - time_base;
-#else
-				const u64 timer_read = ts.tv_nsec + (ts.tv_sec - sec_base) * 1'000'000'000;
-#endif
-
-				if (i == 0 || (rdtsc_read2 >= rdtsc_read && rdtsc_read2 - rdtsc_read < rdtsc_diff[sample]))
-				{
-					rdtsc_data[sample] = rdtsc_read; // Note: rdtsc_read2 can also be written here because of the assumption of accuracy
-					timer_data[sample] = timer_read;
-					rdtsc_diff[sample] = rdtsc_read2 >= rdtsc_read ? rdtsc_read2 - rdtsc_read : u64{umax};
-				}
-
-				// 80 results in an error range of 4000 hertz (0.00025% of 4GHz CPU, quite acceptable)
-				// Error of 2.5 seconds per month
-				if (rdtsc_read2 - rdtsc_read < 80 && rdtsc_read2 >= rdtsc_read)
-				{
-					break;
-				}
-
-				// 8 yields seems to reduce significantly thread contention, improving accuracy
-				// Even 3 seem to do the job though, but just in case
-				if (i % 128 == 64)
-				{
-					std::this_thread::yield();
-				}
-
-				// Take 50% more yields with the last sample because it helps accuracy additionally the more time that passes
-				if (sample == sample_count - 1 && i % 256 == 128)
-				{
-					std::this_thread::yield();
-				}
-			}
-
-			if (sample < sample_count - 1)
-			{
-				// Sleep between first and last sample
-#ifdef _WIN32
-				Sleep(sleep_time_ms);
-#else
-				usleep(sleep_time_ms * 1000);
-#endif
-			}
 		}
 
-		if (timer_data[1] == timer_data[0])
+		// 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++)
 		{
-			// Division by zero
-			return 0;
+			acc += (rdtsc_data[i + 1] - rdtsc_data[i]) * timer_freq / (timer_data[i + 1] - timer_data[i]);
 		}
 
-		const u128 data = u128_from_mul(rdtsc_data[1] - rdtsc_data[0], timer_freq);
-
-		const u64 res = utils::udiv128(static_cast<u64>(data >> 64), static_cast<u64>(data), (timer_data[1] - timer_data[0]));
-
 		// Rounding
-		return round_tsc(res, utils::mul_saturate<u64>(utils::add_saturate<u64>(rdtsc_diff[0], rdtsc_diff[1]), utils::aligned_div(timer_freq, timer_data[1] - timer_data[0])));
+		return round_tsc(acc / (samples - 1));
 	}();
 
-	atomic_storage<u64>::store(utils::s_tsc_freq, cal_tsc);
-	return true;
-}();
+	return cal_tsc;
+}
 
 u64 utils::get_total_memory()
 {
@@ -999,7 +436,6 @@ u32 utils::get_thread_count()
 
 u32 utils::get_cpu_family()
 {
-#if defined(ARCH_X64)
 	static const u32 g_value = []()
 	{
 		const u32 reg_value = get_cpuid(0x00000001, 0)[0]; // Processor feature info
@@ -1017,14 +453,10 @@ u32 utils::get_cpu_family()
 	}();
 
 	return g_value;
-#elif defined(ARCH_ARM64)
-	return 0;
-#endif
 }
 
 u32 utils::get_cpu_model()
 {
-#if defined(ARCH_X64)
 	static const u32 g_value = []()
 	{
 		const u32 reg_value = get_cpuid(0x00000001, 0)[0]; // Processor feature info
@@ -1043,25 +475,16 @@ u32 utils::get_cpu_model()
 	}();
 
 	return g_value;
-#elif defined(ARCH_ARM64)
-	return 0;
-#endif
 }
 
-u64 utils::_get_main_tid()
+namespace utils
 {
-	return thread_ctrl::get_tid();
-}
-
-std::pair<bool, usz> utils::string_to_number(std::string_view str)
-{
-	std::add_pointer_t<char> eval;
-	const usz number = std::strtol(str.data(), &eval, 10);
-
-	if (str.data() + str.size() == eval)
+	extern const u64 main_tid = []() -> u64
 	{
-		return { true, number };
-	}
-
-	return { false, 0 };
+	#ifdef _WIN32
+		return GetCurrentThreadId();
+	#else
+		return reinterpret_cast<u64>(pthread_self());
+	#endif
+	}();
 }
diff --git a/rpcs3/util/sysinfo.hpp b/rpcs3/util/sysinfo.hpp
index fd7e810f67..9fd3d2c962 100755
--- a/rpcs3/util/sysinfo.hpp
+++ b/rpcs3/util/sysinfo.hpp
@@ -1,10 +1,14 @@
-#pragma once
+#pragma once
 
 #include "util/types.hpp"
 #include <string>
 
 namespace utils
 {
+	std::array<u32, 4> get_cpuid(u32 func, u32 subfunc);
+
+	u64 get_xgetbv(u32 xcr);
+
 	bool has_ssse3();
 
 	bool has_sse41();
@@ -17,20 +21,12 @@ namespace utils
 
 	bool has_tsx_force_abort();
 
-	bool has_rtm_always_abort();
-
 	bool has_mpx();
 
 	bool has_avx512();
 
 	bool has_avx512_icl();
 
-	bool has_avx512_vnni();
-
-	bool has_avx10();
-
-	u32 avx10_isa_version();
-
 	bool has_xop();
 
 	bool has_clwb();
@@ -41,41 +37,15 @@ namespace utils
 
 	bool has_fma4();
 
-	bool has_fast_vperm2b();
-
-	bool has_erms();
-
-	bool has_fsrm();
-
-	bool has_waitx();
-
-	bool has_waitpkg();
-
-	bool has_appropriate_um_wait();
-
-	bool has_um_wait();
-
 	std::string get_cpu_brand();
 
 	std::string get_system_info();
 
 	std::string get_firmware_version();
 
-	struct OS_version
-	{
-		std::string type;
-		std::string arch;
-		int version_major = 0;
-		int version_minor = 0;
-		int version_patch = 0;
-	};
-	OS_version get_OS_version();
+	std::string get_OS_version();
 
-	std::string get_OS_version_string();
-
-	int get_maxfiles();
-
-	bool get_low_power_mode();
+	ullong get_tsc_freq();
 
 	u64 get_total_memory();
 
@@ -85,19 +55,5 @@ namespace utils
 
 	u32 get_cpu_model();
 
-	// A threshold of 0xFFFFFFFF means that the rep movsb is expected to be slow on this platform
-	u32 get_rep_movsb_threshold();
-
-	u64 _get_main_tid();
-
-	inline const u64 main_tid = _get_main_tid();
-
-	extern u64 s_tsc_freq;
-
-	inline ullong get_tsc_freq()
-	{
-		return s_tsc_freq;
-	}
-
-	std::pair<bool, usz> string_to_number(std::string_view str);
+	extern const u64 main_tid;
 }
diff --git a/rpcs3/util/to_endian.hpp b/rpcs3/util/to_endian.hpp
index f4ec045d91..710c755a30 100644
--- a/rpcs3/util/to_endian.hpp
+++ b/rpcs3/util/to_endian.hpp
@@ -6,18 +6,17 @@
 union v128;
 
 // Type converter: converts native endianness arithmetic/enum types to appropriate se_t<> type
-template <typename T, bool Se>
+template <typename T, bool Se, typename = void>
 struct to_se
 {
-	template <typename T2>
+	template <typename T2, typename = void>
 	struct to_se_
 	{
 		using type = T2;
 	};
 
 	template <typename T2>
-		requires std::is_arithmetic_v<T2> || std::is_enum_v<T2>
-	struct to_se_<T2>
+	struct to_se_<T2, std::enable_if_t<std::is_arithmetic<T2>::value || std::is_enum<T2>::value>>
 	{
 		using type = std::conditional_t<(sizeof(T2) > 1), se_t<T2, Se>, T2>;
 	};
@@ -45,16 +44,14 @@ struct to_se<s128, Se>
 };
 
 template <typename T, bool Se>
-	requires(!std::is_array_v<T>)
-struct to_se<const T, Se>
+struct to_se<const T, Se, std::enable_if_t<!std::is_array<T>::value>>
 {
 	// Move const qualifier
 	using type = const typename to_se<T, Se>::type;
 };
 
 template <typename T, bool Se>
-	requires(!std::is_array_v<T> && !std::is_const_v<T>)
-struct to_se<volatile T, Se>
+struct to_se<volatile T, Se, std::enable_if_t<!std::is_array<T>::value && !std::is_const<T>::value>>
 {
 	// Move volatile qualifier
 	using type = volatile typename to_se<T, Se>::type;
diff --git a/rpcs3/util/tsc.hpp b/rpcs3/util/tsc.hpp
deleted file mode 100644
index 8f65299b9b..0000000000
--- a/rpcs3/util/tsc.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-
-#ifdef _M_X64
-#ifdef _MSC_VER
-extern "C" u64 __rdtsc();
-#else
-#include <immintrin.h>
-#endif
-#endif
-
-namespace utils
-{
-	inline u64 get_tsc()
-	{
-#if defined(ARCH_ARM64)
-		u64 r = 0;
-		__asm__ volatile("mrs %0, cntvct_el0" : "=r" (r));
-		return r;
-#elif defined(_M_X64)
-		return __rdtsc();
-#elif defined(ARCH_X64)
-		return __builtin_ia32_rdtsc();
-#else
-#error "Missing utils::get_tsc() implementation"
-#endif
-	}
-}
diff --git a/rpcs3/util/typeindices.hpp b/rpcs3/util/typeindices.hpp
index c6f6190ba7..7dcac5950b 100644
--- a/rpcs3/util/typeindices.hpp
+++ b/rpcs3/util/typeindices.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "util/types.hpp"
+#include "util/shared_ptr.hpp"
 
 #ifndef _MSC_VER
 #define ATTR_PURE __attribute__((pure))
@@ -23,7 +24,6 @@ namespace stx
 		u32 size = 1;
 		u32 align = 1;
 		u32 begin = 0;
-		double order{};
 
 		// Next typeinfo in linked list
 		type_info* next = nullptr;
@@ -31,7 +31,7 @@ namespace stx
 		// Auxiliary pointer to base type
 		const type_info* base = nullptr;
 
-		type_info(Info info, u32 size, u32 align, double order, const type_info* base = nullptr) noexcept;
+		type_info(Info info, u32 size, u32 align, const type_info* base = nullptr) noexcept;
 
 		friend type_counter<Info>;
 
@@ -55,11 +55,6 @@ namespace stx
 		{
 			return begin + size;
 		}
-
-		ATTR_PURE double init_pos() const
-		{
-			return order;
-		}
 	};
 
 	// Class for automatic type registration for given Info type
@@ -182,25 +177,14 @@ namespace stx
 		return typelist_v;
 	}
 
-	template <typename T> requires requires () { T::savestate_init_pos + 0.; }
-	constexpr double get_savestate_init_pos()
-	{
-		return T::savestate_init_pos;
-	}
-	template <typename T> requires (!(requires () { T::savestate_init_pos + 0.; }))
-	constexpr double get_savestate_init_pos()
-	{
-		return {};
-	}
-
 	template <typename Info> template <typename T>
-	const type_info<Info> type_counter<Info>::type{Info::template make_typeinfo<T>(), sizeof(T), alignof(T), get_savestate_init_pos<T>()};
+	const type_info<Info> type_counter<Info>::type{Info::template make_typeinfo<T>(), sizeof(T), alignof(T)};
 
 	template <typename Info> template <typename T, typename As>
-	const type_info<Info> type_counter<Info>::dyn_type{Info::template make_typeinfo<As>(), sizeof(As), alignof(As), get_savestate_init_pos<T>(), &type_counter<Info>::template type<T>};
+	const type_info<Info> type_counter<Info>::dyn_type{Info::template make_typeinfo<As>(), sizeof(As), alignof(As), &type_counter<Info>::template type<T>};
 
 	template <typename Info>
-	type_info<Info>::type_info(Info info, u32 _size, u32 _align, double order, const type_info<Info>* cbase) noexcept
+	type_info<Info>::type_info(Info info, u32 _size, u32 _align, const type_info<Info>* cbase) noexcept
 		: Info(info)
 	{
 		auto& tl = typelist<Info>();
@@ -209,7 +193,6 @@ namespace stx
 		this->size = _size > this->size ? _size : this->size;
 		this->align = _align > this->align ? _align : this->align;
 		this->base = cbase;
-		this->order = order;
 
 		// Update global max alignment
 		tl.first.align = _align > tl.first.align ? _align : tl.first.align;
diff --git a/rpcs3/util/types.hpp b/rpcs3/util/types.hpp
index 690f51c0e7..f2600fe465 100644
--- a/rpcs3/util/types.hpp
+++ b/rpcs3/util/types.hpp
@@ -11,21 +11,6 @@
 #include <compare>
 #include <memory>
 #include <bit>
-#include <string>
-#include <source_location>
-
-#if defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__) || defined(__amd64__)
-#define ARCH_X64 1
-#elif defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64)
-#define ARCH_ARM64 1
-// v8.4a+ gives us atomic 16 byte ld/st
-// See Arm C Language Extensions Documentation
-// Currently there is no feature macro for LSE2 specifically so we define it ourself
-// Unfortunately the __ARM_ARCH integer macro isn't universally defined so we use this hack instead
-#if defined(__ARM_ARCH_8_4__) || defined(__ARM_ARCH_8_5__) || defined(__ARM_ARCH_8_6__) || defined(__ARM_ARCH_9__)
-#define ARM_FEATURE_LSE2 1
-#endif
-#endif
 
 using std::chrono::steady_clock;
 
@@ -61,51 +46,9 @@ using namespace std::literals;
 #if defined(_DEBUG) || defined(_AUDIT)
 #define AUDIT(...) (static_cast<void>(ensure(__VA_ARGS__)))
 #else
-#define AUDIT(...) (static_cast<std::void_t<decltype((__VA_ARGS__))>>(0))
+#define AUDIT(...) (static_cast<void>(0))
 #endif
 
-namespace utils
-{
-	template <typename F>
-	struct fn_helper
-	{
-		F f;
-
-		fn_helper(F&& f)
-			: f(std::forward<F>(f))
-		{
-		}
-
-		template <typename... Args>
-		auto operator()(Args&&... args) const
-		{
-			if constexpr (sizeof...(Args) == 0)
-				return f(0, 0, 0, 0);
-			else if constexpr (sizeof...(Args) == 1)
-				return f(std::forward<Args>(args)..., 0, 0, 0);
-			else if constexpr (sizeof...(Args) == 2)
-				return f(std::forward<Args>(args)..., 0, 0);
-			else if constexpr (sizeof...(Args) == 3)
-				return f(std::forward<Args>(args)..., 0);
-			else if constexpr (sizeof...(Args) == 4)
-				return f(std::forward<Args>(args)...);
-			else
-				static_assert(sizeof...(Args) <= 4);
-		}
-	};
-
-	template <typename F>
-	fn_helper(F&& f) -> fn_helper<F>;
-}
-
-// Shorter lambda.
-#define FN(...) \
-	::utils::fn_helper([&]( \
-		[[maybe_unused]] auto&& x, \
-		[[maybe_unused]] auto&& y, \
-		[[maybe_unused]] auto&& z, \
-		[[maybe_unused]] auto&& w){ return (__VA_ARGS__); })
-
 #if __cpp_lib_bit_cast < 201806L
 namespace std
 {
@@ -117,9 +60,8 @@ namespace std
 }
 #endif
 
-#if defined(__INTELLISENSE__) || (defined (__clang__) && (__clang_major__ <= 16))
+#if defined(__INTELLISENSE__)
 #define consteval constexpr
-#define constinit
 #endif
 
 using schar  = signed char;
@@ -142,7 +84,6 @@ using s8  = std::int8_t;
 using s16 = std::int16_t;
 using s32 = std::int32_t;
 using s64 = std::int64_t;
-using ssz = std::make_signed_t<std::size_t>;
 
 // Get integral type from type size
 template <usz N>
@@ -190,12 +131,6 @@ namespace stx
 {
 	template <typename T, bool Se, usz Align>
 	class se_t;
-
-	template <typename T>
-	struct lazy;
-
-	template <typename T>
-	struct generator;
 }
 
 using stx::se_t;
@@ -214,14 +149,6 @@ using atomic_be_t = atomic_t<be_t<T>, Align>;
 template <typename T, usz Align = alignof(T)>
 using atomic_le_t = atomic_t<le_t<T>, Align>;
 
-// Removes be_t<> wrapper from type be_<T> with nop fallback for unwrapped T
-template<typename T>
-struct remove_be { using type = T; };
-template<typename T>
-struct remove_be<be_t<T>> { using type = T; };
-template<typename T>
-using remove_be_t = typename remove_be<T>::type;
-
 // Bool type equivalent
 class b8
 {
@@ -230,8 +157,6 @@ class b8
 public:
 	b8() = default;
 
-	using enable_bitcopy = std::true_type;
-
 	constexpr b8(bool value) noexcept
 		: m_value(value)
 	{
@@ -249,15 +174,15 @@ public:
 	}
 };
 
-#if defined(ARCH_X64) && !defined(_MSC_VER)
+#ifndef _MSC_VER
+
+using u128 = __uint128_t;
+using s128 = __int128_t;
+
 using __m128i = long long __attribute__((vector_size(16)));
 using __m128d = double __attribute__((vector_size(16)));
 using __m128 = float __attribute__((vector_size(16)));
-#endif
 
-#ifndef _MSC_VER
-using u128 = __uint128_t;
-using s128 = __int128_t;
 #else
 
 extern "C"
@@ -280,16 +205,14 @@ struct alignas(16) u128
 
 	u128() noexcept = default;
 
-	template <typename T>
-		requires std::is_unsigned_v<T>
+	template <typename T, std::enable_if_t<std::is_unsigned_v<T>, u64> = 0>
 	constexpr u128(T arg) noexcept
 		: lo(arg)
 		, hi(0)
 	{
 	}
 
-	template <typename T>
-		requires std::is_signed_v<T>
+	template <typename T, std::enable_if_t<std::is_signed_v<T>, s64> = 0>
 	constexpr u128(T arg) noexcept
 		: lo(s64{arg})
 		, hi(s64{arg} >> 63)
@@ -576,22 +499,6 @@ struct s128 : u128
 };
 #endif
 
-// Optimization for u64*u64=u128
-constexpr u128 u128_from_mul(u64 a, u64 b)
-{
-#ifdef _MSC_VER
-	if (!std::is_constant_evaluated())
-	{
-		u64 hi;
-		u128 result = _umul128(a, b, &hi);
-		result.hi = hi;
-		return result;
-	}
-#endif
-
-	return u128{a} * b;
-}
-
 template <>
 struct get_int_impl<16>
 {
@@ -781,7 +688,7 @@ inline u32 offset32(T T2::*const mptr)
 template <typename T>
 struct offset32_array
 {
-	static_assert(std::is_array_v<T>, "Invalid pointer-to-member type (array expected)");
+	static_assert(std::is_array<T>::value, "Invalid pointer-to-member type (array expected)");
 
 	template <typename Arg>
 	static inline u32 index32(const Arg& arg)
@@ -892,13 +799,13 @@ struct const_str_t<umax>
 {
 	const usz size;
 
-	union
+	const union
 	{
 		const char8_t* chars;
 		const char* chars2;
 	};
 
-	constexpr const_str_t()
+	const_str_t()
 		: size(0)
 		, chars(nullptr)
 	{
@@ -918,7 +825,7 @@ struct const_str_t<umax>
 	{
 	}
 
-	constexpr operator const char*() const
+	operator const char*() const
 	{
 		return std::launder(chars2);
 	}
@@ -937,129 +844,139 @@ const_str_t(const char8_t(&a)[Size]) -> const_str_t<Size - 1>;
 
 using const_str = const_str_t<>;
 
+struct src_loc
+{
+	u32 line;
+	u32 col;
+	const char* file;
+	const char* func;
+};
+
 namespace fmt
 {
-	[[noreturn]] void raw_verify_error(std::source_location loc, const char8_t* msg, usz object);
-	[[noreturn]] void raw_range_error(std::source_location loc, std::string_view index, usz container_size);
-	[[noreturn]] void raw_range_error(std::source_location loc, usz index, usz container_size);
-}
-
-// No full implementation to ease on header weight
-template <typename T>
-std::conditional_t<std::is_integral_v<std::remove_cvref_t<T>>, usz, std::string_view> format_object_simplified(const T& obj)
-{
-	using type = std::remove_cvref_t<T>;
-
-	if constexpr (std::is_integral_v<type> || std::is_same_v<std::string, type> || std::is_same_v<std::string_view, type>)
-	{
-		return obj;
-	}
-	else if constexpr (std::is_array_v<type> && std::is_constructible_v<std::string_view, type>)
-	{
-		return { obj, std::size(obj) - 1 };
-	}
-	else
-	{
-		return std::string_view{};
-	}
+	[[noreturn]] void raw_verify_error(const src_loc& loc, const char8_t* msg);
 }
 
 template <typename T>
-constexpr decltype(auto) ensure(T&& arg, const_str msg = const_str(), std::source_location src_loc = std::source_location::current()) noexcept
+constexpr decltype(auto) ensure(T&& arg, const_str msg = const_str(),
+	u32 line = __builtin_LINE(),
+	u32 col = __builtin_COLUMN(),
+	const char* file = __builtin_FILE(),
+	const char* func = __builtin_FUNCTION()) noexcept
 {
 	if (std::forward<T>(arg)) [[likely]]
 	{
 		return std::forward<T>(arg);
 	}
 
-	fmt::raw_verify_error(src_loc, msg, 0);
+	fmt::raw_verify_error({line, col, file, func}, msg);
 }
 
-template <typename T, typename F> requires (std::is_invocable_v<F, T&&>)
-constexpr decltype(auto) ensure(T&& arg, F&& pred, const_str msg = const_str(), std::source_location src_loc = std::source_location::current()) noexcept
+// narrow() function details
+template <typename From, typename To = void, typename = void>
+struct narrow_impl
 {
-	if (std::forward<F>(pred)(std::forward<T>(arg))) [[likely]]
+	// Temporarily (diagnostic)
+	static_assert(std::is_void<To>::value, "narrow_impl<> specialization not found");
+
+	// Returns true if value cannot be represented in type To
+	static constexpr bool test(const From&)
 	{
-		return std::forward<T>(arg);
+		// Unspecialized cases (including cast to void) always considered narrowing
+		return true;
 	}
+};
 
-	fmt::raw_verify_error(src_loc, msg, 0);
-}
+// Unsigned to unsigned narrowing
+template <typename From, typename To>
+struct narrow_impl<From, To, std::enable_if_t<std::is_unsigned<From>::value && std::is_unsigned<To>::value>>
+{
+	static constexpr bool test(const From& value)
+	{
+		return sizeof(To) < sizeof(From) && static_cast<To>(value) != value;
+	}
+};
 
-template <typename To, typename From> requires (std::is_integral_v<decltype(std::declval<To>() + std::declval<From>())>)
-[[nodiscard]] constexpr To narrow(const From& value, std::source_location src_loc = std::source_location::current())
+// Signed to signed narrowing
+template <typename From, typename To>
+struct narrow_impl<From, To, std::enable_if_t<std::is_signed<From>::value && std::is_signed<To>::value>>
+{
+	static constexpr bool test(const From& value)
+	{
+		return sizeof(To) < sizeof(From) && static_cast<To>(value) != value;
+	}
+};
+
+// Unsigned to signed narrowing
+template <typename From, typename To>
+struct narrow_impl<From, To, std::enable_if_t<std::is_unsigned<From>::value && std::is_signed<To>::value>>
+{
+	static constexpr bool test(const From& value)
+	{
+		return sizeof(To) <= sizeof(From) && value > (static_cast<std::make_unsigned_t<To>>(-1) >> 1);
+	}
+};
+
+// Signed to unsigned narrowing (I)
+template <typename From, typename To>
+struct narrow_impl<From, To, std::enable_if_t<std::is_signed<From>::value && std::is_unsigned<To>::value && sizeof(To) >= sizeof(From)>>
+{
+	static constexpr bool test(const From& value)
+	{
+		return value < static_cast<From>(0);
+	}
+};
+
+// Signed to unsigned narrowing (II)
+template <typename From, typename To>
+struct narrow_impl<From, To, std::enable_if_t<std::is_signed<From>::value && std::is_unsigned<To>::value && sizeof(To) < sizeof(From)>>
+{
+	static constexpr bool test(const From& value)
+	{
+		return static_cast<std::make_unsigned_t<From>>(value) > static_cast<To>(-1);
+	}
+};
+
+// Simple type enabled (TODO: allow for To as well)
+template <typename From, typename To>
+struct narrow_impl<From, To, std::enable_if_t<!std::is_same_v<std::common_type_t<From>, From>>>
+	: narrow_impl<std::common_type_t<From>, To>
+{
+};
+
+template <typename To = void, typename From, typename = decltype(static_cast<To>(std::declval<From>()))>
+[[nodiscard]] constexpr To narrow(const From& value,
+	u32 line = __builtin_LINE(),
+	u32 col = __builtin_COLUMN(),
+	const char* file = __builtin_FILE(),
+	const char* func = __builtin_FUNCTION())
 {
 	// Narrow check
-	using CommonFrom = std::common_type_t<From>;
-	using CommonTo = std::common_type_t<To>;
-
-	using UnFrom = std::make_unsigned_t<CommonFrom>;
-	using UnTo = std::make_unsigned_t<CommonTo>;
-
-	constexpr bool is_from_signed = std::is_signed_v<CommonFrom>;
-	constexpr bool is_to_signed = std::is_signed_v<CommonTo>;
-
-	constexpr auto from_mask = (is_from_signed && !is_to_signed) ? UnFrom{umax} >> 1 : UnFrom{umax};
-	constexpr auto to_mask = (is_to_signed && !is_from_signed) ? UnTo{umax} >> 1 : UnTo{umax};
-
-	constexpr auto mask = ~(from_mask & to_mask);
-
-	// Signed to unsigned always require test
-	// Otherwise, this is bit-wise narrowing or conversion between types of different signedness of the same size
-	if constexpr ((is_from_signed && !is_to_signed) || to_mask < from_mask)
+	if (narrow_impl<From, To>::test(value)) [[unlikely]]
 	{
-		// Try to optimize test if both are of the same signedness
-		if (is_from_signed != is_to_signed ? !!(value & mask) : static_cast<CommonTo>(value) != value) [[unlikely]]
-		{
-			fmt::raw_verify_error(src_loc, u8"Narrowing error", +value);
-		}
+		fmt::raw_verify_error({line, col, file, func}, u8"Narrowing error");
 	}
 
 	return static_cast<To>(value);
 }
 
 // Returns u32 size() for container
-template <typename CT> requires requires (const CT& x) { std::size(x); }
-[[nodiscard]] constexpr u32 size32(const CT& container, std::source_location src_loc = std::source_location::current())
+template <typename CT, typename = decltype(static_cast<u32>(std::declval<CT>().size()))>
+[[nodiscard]] constexpr u32 size32(const CT& container,
+	u32 line = __builtin_LINE(),
+	u32 col = __builtin_COLUMN(),
+	const char* file = __builtin_FILE(),
+	const char* func = __builtin_FUNCTION())
 {
-	// TODO: Support std::array
-	constexpr bool is_const = std::is_array_v<std::remove_cvref_t<CT>>;
-
-	if constexpr (is_const)
-	{
-		constexpr usz Size = sizeof(container) / sizeof(container[0]);
-		return std::conditional_t<is_const, u32, usz>{Size};
-	}
-	else
-	{
-		return narrow<u32>(container.size(), src_loc);
-	}
+	return narrow<u32>(container.size(), line, col, file, func);
 }
 
-template <typename CT, typename T> requires requires (CT&& x) { std::size(x); std::data(x); } || requires (CT&& x) { std::size(x); x.front(); }
-[[nodiscard]] constexpr auto& at32(CT&& container, T&& index, std::source_location src_loc = std::source_location::current())
+// Returns u32 size for an array
+template <typename T, usz Size>
+[[nodiscard]] constexpr u32 size32(const T (&)[Size])
 {
-	// Make sure the index is within u32 range
-	const std::make_unsigned_t<std::common_type_t<T>> idx = index;
-	const u32 csz = ::size32(container, src_loc);
-	if (csz <= idx) [[unlikely]]
-		fmt::raw_range_error(src_loc, format_object_simplified(index), csz);
-	auto it = std::begin(std::forward<CT>(container));
-	std::advance(it, idx);
-	return *it;
-}
-
-template <typename CT, typename T> requires requires (CT&& x, T&& y) { x.count(y); x.find(y); }
-[[nodiscard]] constexpr auto& at32(CT&& container, T&& index, std::source_location src_loc = std::source_location::current())
-{
-	// Associative container
-	const auto found = container.find(std::forward<T>(index));
-	usz csv = umax;
-	if constexpr ((requires () { container.size(); }))
-		csv = container.size();
-	if (found == container.end()) [[unlikely]]
-		fmt::raw_range_error(src_loc, format_object_simplified(index), csv);
-	return found->second;
+	static_assert(Size < u32{umax}, "Array is too big for 32-bit");
+	return static_cast<u32>(Size);
 }
 
 // Simplified hash algorithm. May be used in std::unordered_(map|set).
@@ -1110,7 +1027,7 @@ concept PtrCastable = requires(const volatile X* x, const volatile Y* y)
 };
 
 template <typename X, typename Y> requires PtrCastable<X, Y>
-consteval bool is_same_ptr()
+constexpr bool is_same_ptr()
 {
 	if constexpr (std::is_void_v<X> || std::is_void_v<Y> || std::is_same_v<std::remove_cv_t<X>, std::remove_cv_t<Y>>)
 	{
@@ -1122,24 +1039,33 @@ consteval bool is_same_ptr()
 	}
 	else
 	{
-		bool result = false;
-
-		if constexpr (sizeof(X) < sizeof(Y))
+		if (std::is_constant_evaluated())
 		{
-			std::allocator<Y> a{};
-			Y* ptr = a.allocate(1);
-			result = static_cast<X*>(ptr) == static_cast<void*>(ptr);
-			a.deallocate(ptr, 1);
+			bool result = false;
+
+			if constexpr (sizeof(X) < sizeof(Y))
+			{
+				std::allocator<Y> a{};
+				Y* ptr = a.allocate(1);
+				result = static_cast<X*>(ptr) == static_cast<void*>(ptr);
+				a.deallocate(ptr, 1);
+			}
+			else
+			{
+				std::allocator<X> a{};
+				X* ptr = a.allocate(1);
+				result = static_cast<Y*>(ptr) == static_cast<void*>(ptr);
+				a.deallocate(ptr, 1);
+			}
+
+			return result;
 		}
 		else
 		{
-			std::allocator<X> a{};
-			X* ptr = a.allocate(1);
-			result = static_cast<Y*>(ptr) == static_cast<void*>(ptr);
-			a.deallocate(ptr, 1);
+			std::aligned_union_t<0, X, Y> s;
+			Y* ptr = reinterpret_cast<Y*>(&s);
+			return static_cast<X*>(ptr) == static_cast<void*>(ptr);
 		}
-
-		return result;
 	}
 }
 
@@ -1152,176 +1078,6 @@ constexpr bool is_same_ptr(const volatile Y* ptr)
 template <typename X, typename Y>
 concept PtrSame = (is_same_ptr<X, Y>());
 
-namespace stx
-{
-	template <typename T>
-	struct exact_t
-	{
-		static_assert(std::is_reference_v<T> || std::is_convertible_v<T, const T&>);
-
-		T obj;
-
-		explicit exact_t(T&& _obj) : obj(std::forward<T>(_obj)) {}
-		exact_t& operator=(const exact_t&) = delete;
-
-		template <typename U> requires (std::is_same_v<U&, T>)
-		operator U&() const noexcept { return obj; };
-
-		template <typename U> requires (std::is_same_v<const U&, T>)
-		operator const U&() const noexcept { return obj; };
-
-		template <typename U> requires (std::is_same_v<U, T> && std::is_copy_constructible_v<T>)
-		operator U() const noexcept { return obj; };
-	};
-
-	template <typename T>
-	stx::exact_t<T&> make_exact(T&& obj) noexcept
-	{
-		return stx::exact_t<T&>(static_cast<T&>(obj));
-	}
-}
-
-// Read object of type T from raw pointer, array, string, vector, or any contiguous container
-template <typename T, typename U>
-constexpr T read_from_ptr(U&& array, usz pos = 0)
-{
-	// TODO: ensure array element types are trivial
-	static_assert(sizeof(T) % sizeof(array[0]) == 0);
-	std::decay_t<decltype(array[0])> buf[sizeof(T) / sizeof(array[0])];
-	if (!std::is_constant_evaluated())
-		std::memcpy(+buf, &array[pos], sizeof(buf));
-	else
-		for (usz i = 0; i < pos; buf[i] = array[pos + i], i++);
-	return std::bit_cast<T>(buf);
-}
-
-template <typename T, typename U>
-constexpr void write_to_ptr(U&& array, usz pos, const T& value)
-{
-	static_assert(sizeof(T) % sizeof(array[0]) == 0);
-	if (!std::is_constant_evaluated())
-		std::memcpy(static_cast<void*>(&array[pos]), &value, sizeof(value));
-	else
-		ensure(!"Unimplemented");
-}
-
-template <typename T, typename U>
-constexpr void write_to_ptr(U&& array, const T& value)
-{
-	static_assert(sizeof(T) % sizeof(array[0]) == 0);
-	if (!std::is_constant_evaluated())
-		std::memcpy(static_cast<void*>(&array[0]), &value, sizeof(value));
-	else
-		ensure(!"Unimplemented");
-}
-
-constexpr struct aref_tag_t{} aref_tag{};
-
-template <typename T, typename U>
-class aref final
-{
-	U* m_ptr;
-
-	static_assert(sizeof(std::decay_t<T>) % sizeof(U) == 0);
-
-public:
-	aref() = delete;
-
-	constexpr aref(const aref&) = default;
-
-	explicit constexpr aref(aref_tag_t, U* ptr)
-		: m_ptr(ptr)
-	{
-	}
-
-	constexpr T value() const
-	{
-		return read_from_ptr<T>(m_ptr);
-	}
-
-	constexpr operator T() const
-	{
-		return read_from_ptr<T>(m_ptr);
-	}
-
-	aref& operator=(const aref&) = delete;
-
-	constexpr aref& operator=(const T& value) const
-	{
-		write_to_ptr<T>(m_ptr, value);
-		return *this;
-	}
-
-	template <typename MT, typename T2> requires (std::is_convertible_v<const volatile T*, const volatile T2*>) && PtrSame<T, T2>
-	aref<MT, U> ref(MT T2::*const mptr) const
-	{
-		return aref<MT, U>(aref_tag, m_ptr + offset32(mptr) / sizeof(U));
-	}
-
-	template <typename MT, typename T2, typename ET = std::remove_extent_t<MT>> requires (std::is_convertible_v<const volatile T*, const volatile T2*>) && PtrSame<T, T2>
-	aref<ET, U> ref(MT T2::*const mptr, usz index) const
-	{
-		return aref<ET, U>(aref_tag, m_ptr + offset32(mptr) / sizeof(U) + sizeof(ET) / sizeof(U) * index);
-	}
-};
-
-template <typename T, typename U>
-class aref<T[], U>
-{
-	U* m_ptr;
-
-	static_assert(sizeof(std::decay_t<T>) % sizeof(U) == 0);
-
-public:
-	aref() = delete;
-
-	constexpr aref(const aref&) = default;
-
-	explicit constexpr aref(aref_tag_t, U* ptr)
-		: m_ptr(ptr)
-	{
-	}
-
-	aref& operator=(const aref&) = delete;
-
-	constexpr aref<T, U> operator[](usz index) const
-	{
-		return aref<T, U>(aref_tag, m_ptr + index * (sizeof(T) / sizeof(U)));
-	}
-};
-
-template <typename T, typename U, std::size_t N>
-class aref<T[N], U>
-{
-	U* m_ptr;
-
-	static_assert(sizeof(std::decay_t<T>) % sizeof(U) == 0);
-
-public:
-	aref() = delete;
-
-	constexpr aref(const aref&) = default;
-
-	explicit constexpr aref(aref_tag_t, U* ptr)
-		: m_ptr(ptr)
-	{
-	}
-
-	aref& operator=(const aref&) = delete;
-
-	constexpr aref<T, U> operator[](usz index) const
-	{
-		return aref<T, U>(aref_tag, m_ptr + index * (sizeof(T) / sizeof(U)));
-	}
-};
-
-// Reference object of type T, see read_from_ptr
-template <typename T, typename U>
-constexpr auto ref_ptr(U&& array, usz pos = 0) -> aref<T, std::decay_t<decltype(array[0])>>
-{
-	return aref<T, std::decay_t<decltype(array[0])>>(aref_tag, &array[pos]);
-}
-
 namespace utils
 {
 	struct serial;
@@ -1329,27 +1085,3 @@ namespace utils
 
 template <typename T>
 extern bool serialize(utils::serial& ar, T& obj);
-
-#define USING_SERIALIZATION_VERSION(name) []()\
-{\
-	extern void using_##name##_serialization();\
-	using_##name##_serialization();\
-}()
-
-#define GET_OR_USE_SERIALIZATION_VERSION(cond, name) [&]()\
-{\
-	extern void using_##name##_serialization();\
-	extern s32 get_##name##_serialization_version();\
-	return (static_cast<bool>(cond) ? (using_##name##_serialization(), 0) : get_##name##_serialization_version());\
-}()
-
-#define GET_SERIALIZATION_VERSION(name) []()\
-{\
-	extern s32 get_##name##_serialization_version();\
-	return get_##name##_serialization_version();\
-}()
-
-#define ENABLE_BITWISE_SERIALIZATION using enable_bitcopy = std::true_type;
-#define SAVESTATE_INIT_POS(...) static constexpr double savestate_init_pos = (__VA_ARGS__)
-
-#define UNUSED(expr) do { (void)(expr); } while (0)
diff --git a/rpcs3/util/v128.hpp b/rpcs3/util/v128.hpp
index 0a5061dcdd..4273d8f3d2 100644
--- a/rpcs3/util/v128.hpp
+++ b/rpcs3/util/v128.hpp
@@ -2,9 +2,6 @@
 
 #include "util/types.hpp"
 
-template <typename T>
-concept Vector128 = (sizeof(T) == 16) && (std::is_trivial_v<T>);
-
 // 128-bit vector type
 union alignas(16) v128
 {
@@ -61,25 +58,41 @@ union alignas(16) v128
 	u128 _u;
 	s128 _s;
 
-	v128() = default;
-
-	constexpr v128(const v128&) noexcept = default;
-
-	template <Vector128 T>
-	constexpr v128(const T& rhs) noexcept
-		: v128(std::bit_cast<v128>(rhs))
+#ifdef _MSC_VER
+	template <typename T>
+	struct opaque_wrapper
 	{
-	}
+		u128 m_data;
 
-	constexpr v128& operator=(const v128&) noexcept = default;
+		opaque_wrapper() = default;
 
-	template <Vector128 T>
-	constexpr operator T() const noexcept
-	{
-		return std::bit_cast<T>(*this);
-	}
+		opaque_wrapper(const T& value)
+			: m_data(std::bit_cast<u128>(value))
+		{
+		}
 
-	ENABLE_BITWISE_SERIALIZATION;
+		opaque_wrapper& operator=(const T& value)
+		{
+			m_data = std::bit_cast<u128>(value);
+			return *this;
+		}
+
+		operator T() const
+		{
+			return std::bit_cast<T>(m_data);
+		}
+	};
+
+	opaque_wrapper<__m128> vf;
+	opaque_wrapper<__m128i> vi;
+	opaque_wrapper<__m128d> vd;
+#else
+	__m128 vf;
+	__m128i vi;
+	__m128d vd;
+#endif
+
+	using enable_bitcopy = std::true_type;
 
 	static v128 from64(u64 _0, u64 _1 = 0)
 	{
@@ -94,14 +107,6 @@ union alignas(16) v128
 		return from64(_0, _1);
 	}
 
-	static v128 from64p(u64 value)
-	{
-		v128 ret;
-		ret._u64[0] = value;
-		ret._u64[1] = value;
-		return ret;
-	}
-
 	static v128 from32(u32 _0, u32 _1 = 0, u32 _2 = 0, u32 _3 = 0)
 	{
 		v128 ret;
@@ -127,16 +132,6 @@ union alignas(16) v128
 		return ret;
 	}
 
-	static v128 fromf32p(f32 value)
-	{
-		v128 ret;
-		ret._f[0] = value;
-		ret._f[1] = value;
-		ret._f[2] = value;
-		ret._f[3] = value;
-		return ret;
-	}
-
 	static v128 from16p(u16 value)
 	{
 		v128 ret;
@@ -158,23 +153,11 @@ union alignas(16) v128
 		return ret;
 	}
 
-	static v128 undef()
-	{
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wuninitialized"
-#elif _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 6001)
-#endif
-		v128 ret;
-		return ret;
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#elif _MSC_VER
-#pragma warning(pop)
-#endif
-	}
+	static inline v128 fromV(const __m128i& value);
+
+	static inline v128 fromF(const __m128& value);
+
+	static inline v128 fromD(const __m128d& value);
 
 	// Unaligned load with optional index offset
 	static v128 loadu(const void* ptr, usz index = 0)
@@ -190,13 +173,45 @@ union alignas(16) v128
 		std::memcpy(static_cast<u8*>(ptr) + index * sizeof(v128), &value, sizeof(v128));
 	}
 
-	v128 operator|(const v128&) const;
-	v128 operator&(const v128&) const;
-	v128 operator^(const v128&) const;
-	v128 operator~() const;
+	static inline v128 add8(const v128& left, const v128& right);
+
+	static inline v128 add16(const v128& left, const v128& right);
+
+	static inline v128 add32(const v128& left, const v128& right);
+
+	static inline v128 addfs(const v128& left, const v128& right);
+
+	static inline v128 addfd(const v128& left, const v128& right);
+
+	static inline v128 sub8(const v128& left, const v128& right);
+
+	static inline v128 sub16(const v128& left, const v128& right);
+
+	static inline v128 sub32(const v128& left, const v128& right);
+
+	static inline v128 subfs(const v128& left, const v128& right);
+
+	static inline v128 subfd(const v128& left, const v128& right);
+
+	static inline v128 maxu8(const v128& left, const v128& right);
+
+	static inline v128 minu8(const v128& left, const v128& right);
+
+	static inline v128 eq8(const v128& left, const v128& right);
+
+	static inline v128 eq16(const v128& left, const v128& right);
+
+	static inline v128 eq32(const v128& left, const v128& right);
+
+	static inline v128 eq32f(const v128& left, const v128& right);
+
+	static inline v128 fma32f(v128 a, const v128& b, const v128& c);
 
 	bool operator==(const v128& right) const;
 
+	// result = (~left) & (right)
+	static inline v128 andnot(const v128& left, const v128& right);
+
 	void clear()
 	{
 		*this = {};
@@ -212,12 +227,3 @@ struct offset32_array<v128::masked_array_t<T, N, M>>
 		return u32{sizeof(T)} * (static_cast<u32>(arg) ^ static_cast<u32>(M));
 	}
 };
-
-template <>
-struct std::hash<v128>
-{
-	usz operator()(const v128& key) const
-	{
-		return key._u64[0] + key._u64[1];
-	}
-};
diff --git a/rpcs3/util/v128sse.hpp b/rpcs3/util/v128sse.hpp
new file mode 100644
index 0000000000..006dbf6f57
--- /dev/null
+++ b/rpcs3/util/v128sse.hpp
@@ -0,0 +1,178 @@
+#pragma once
+
+#include "util/types.hpp"
+#include "util/v128.hpp"
+#include "util/sysinfo.hpp"
+
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
+#include <x86intrin.h>
+#endif
+
+#include <immintrin.h>
+#include <emmintrin.h>
+
+#include <cmath>
+
+inline bool v128_use_fma = utils::has_fma3();
+
+inline v128 v128::fromV(const __m128i& value)
+{
+	v128 ret;
+	ret.vi = value;
+	return ret;
+}
+
+inline v128 v128::fromF(const __m128& value)
+{
+	v128 ret;
+	ret.vf = value;
+	return ret;
+}
+
+inline v128 v128::fromD(const __m128d& value)
+{
+	v128 ret;
+	ret.vd = value;
+	return ret;
+}
+
+inline v128 v128::add8(const v128& left, const v128& right)
+{
+	return fromV(_mm_add_epi8(left.vi, right.vi));
+}
+
+inline v128 v128::add16(const v128& left, const v128& right)
+{
+	return fromV(_mm_add_epi16(left.vi, right.vi));
+}
+
+inline v128 v128::add32(const v128& left, const v128& right)
+{
+	return fromV(_mm_add_epi32(left.vi, right.vi));
+}
+
+inline v128 v128::addfs(const v128& left, const v128& right)
+{
+	return fromF(_mm_add_ps(left.vf, right.vf));
+}
+
+inline v128 v128::addfd(const v128& left, const v128& right)
+{
+	return fromD(_mm_add_pd(left.vd, right.vd));
+}
+
+inline v128 v128::sub8(const v128& left, const v128& right)
+{
+	return fromV(_mm_sub_epi8(left.vi, right.vi));
+}
+
+inline v128 v128::sub16(const v128& left, const v128& right)
+{
+	return fromV(_mm_sub_epi16(left.vi, right.vi));
+}
+
+inline v128 v128::sub32(const v128& left, const v128& right)
+{
+	return fromV(_mm_sub_epi32(left.vi, right.vi));
+}
+
+inline v128 v128::subfs(const v128& left, const v128& right)
+{
+	return fromF(_mm_sub_ps(left.vf, right.vf));
+}
+
+inline v128 v128::subfd(const v128& left, const v128& right)
+{
+	return fromD(_mm_sub_pd(left.vd, right.vd));
+}
+
+inline v128 v128::maxu8(const v128& left, const v128& right)
+{
+	return fromV(_mm_max_epu8(left.vi, right.vi));
+}
+
+inline v128 v128::minu8(const v128& left, const v128& right)
+{
+	return fromV(_mm_min_epu8(left.vi, right.vi));
+}
+
+inline v128 v128::eq8(const v128& left, const v128& right)
+{
+	return fromV(_mm_cmpeq_epi8(left.vi, right.vi));
+}
+
+inline v128 v128::eq16(const v128& left, const v128& right)
+{
+	return fromV(_mm_cmpeq_epi16(left.vi, right.vi));
+}
+
+inline v128 v128::eq32(const v128& left, const v128& right)
+{
+	return fromV(_mm_cmpeq_epi32(left.vi, right.vi));
+}
+
+inline v128 v128::eq32f(const v128& left, const v128& right)
+{
+	return fromF(_mm_cmpeq_ps(left.vf, right.vf));
+}
+
+inline v128 v128::fma32f(v128 a, const v128& b, const v128& c)
+{
+#ifndef __FMA__
+	if (v128_use_fma) [[likely]]
+	{
+#ifdef _MSC_VER
+		a.vf = _mm_fmadd_ps(a.vf, b.vf, c.vf);
+		return a;
+#else
+		__asm__("vfmadd213ps %[c], %[b], %[a]"
+			: [a] "+x" (a.vf)
+			: [b] "x" (b.vf)
+			, [c] "x" (c.vf));
+		return a;
+#endif
+	}
+
+	for (int i = 0; i < 4; i++)
+	{
+		a._f[i] = std::fmaf(a._f[i], b._f[i], c._f[i]);
+	}
+	return a;
+#else
+	a.vf = _mm_fmadd_ps(a.vf, b.vf, c.vf);
+	return a;
+#endif
+}
+
+inline bool v128::operator==(const v128& right) const
+{
+	return _mm_movemask_epi8(v128::eq32(*this, right).vi) == 0xffff;
+}
+
+// result = (~left) & (right)
+inline v128 v128::andnot(const v128& left, const v128& right)
+{
+	return fromV(_mm_andnot_si128(left.vi, right.vi));
+}
+
+inline v128 operator|(const v128& left, const v128& right)
+{
+	return v128::fromV(_mm_or_si128(left.vi, right.vi));
+}
+
+inline v128 operator&(const v128& left, const v128& right)
+{
+	return v128::fromV(_mm_and_si128(left.vi, right.vi));
+}
+
+inline v128 operator^(const v128& left, const v128& right)
+{
+	return v128::fromV(_mm_xor_si128(left.vi, right.vi));
+}
+
+inline v128 operator~(const v128& other)
+{
+	return other ^ v128::from32p(umax); // XOR with ones
+}
diff --git a/rpcs3/util/video_provider.cpp b/rpcs3/util/video_provider.cpp
deleted file mode 100644
index 82f133b91e..0000000000
--- a/rpcs3/util/video_provider.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-#include "stdafx.h"
-#include "video_provider.h"
-#include "Emu/RSX/Overlays/overlay_message.h"
-#include "Emu/Cell/timers.hpp"
-
-extern "C"
-{
-#include <libavutil/pixfmt.h>
-}
-
-LOG_CHANNEL(media_log, "Media");
-
-atomic_t<recording_mode> g_recording_mode = recording_mode::stopped;
-
-template <>
-void fmt_class_string<recording_mode>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](recording_mode value)
-	{
-		switch (value)
-		{
-		case recording_mode::stopped: return "stopped";
-		case recording_mode::rpcs3: return "rpcs3";
-		case recording_mode::cell: return "cell";
-		}
-
-		return unknown;
-	});
-}
-
-namespace utils
-{
-	video_provider::~video_provider()
-	{
-		g_recording_mode = recording_mode::stopped;
-	}
-
-	bool video_provider::set_video_sink(std::shared_ptr<video_sink> sink, recording_mode type)
-	{
-		media_log.notice("video_provider: setting new video sink. sink=%d, type=%s", !!sink, type);
-
-		if (type == recording_mode::stopped)
-		{
-			// Prevent misuse. type is supposed to be a valid state.
-			media_log.error("video_provider: cannot set video sink with type %s", type);
-			return false;
-		}
-
-		std::scoped_lock lock(m_video_mutex, m_audio_mutex);
-
-		if (m_video_sink)
-		{
-			// cell has preference
-			if (m_type == recording_mode::cell && m_type != type)
-			{
-				media_log.warning("video_provider: cannot set video sink with type %s if type %s is active", type, m_type);
-				return false;
-			}
-
-			if (m_type != type || m_video_sink != sink)
-			{
-				media_log.warning("video_provider: stopping current video sink of type %s", m_type);
-				m_video_sink->stop();
-			}
-		}
-
-		m_type = sink ? type : recording_mode::stopped;
-		m_video_sink = sink;
-		m_active = (m_type != recording_mode::stopped);
-
-		if (!m_active)
-		{
-			m_last_video_pts_incoming = -1;
-			m_last_audio_pts_incoming = -1;
-			m_start_time_us.store(umax);
-		}
-
-		return true;
-	}
-
-	void video_provider::set_pause_time_us(usz pause_time_us)
-	{
-		std::scoped_lock lock(m_video_mutex, m_audio_mutex);
-		m_pause_time_us = pause_time_us;
-	}
-
-	recording_mode video_provider::check_mode()
-	{
-		if (!m_video_sink || m_video_sink->has_error)
-		{
-			g_recording_mode = recording_mode::stopped;
-			rsx::overlays::queue_message(localized_string_id::RECORDING_ABORTED);
-		}
-
-		if (g_recording_mode == recording_mode::stopped)
-		{
-			m_active = false;
-		}
-
-		return g_recording_mode;
-	}
-
-	bool video_provider::can_consume_frame()
-	{
-		if (!m_active)
-		{
-			return false;
-		}
-
-		std::lock_guard lock_video(m_video_mutex);
-
-		if (!m_video_sink || !m_video_sink->use_internal_video)
-		{
-			return false;
-		}
-
-		const usz elapsed_us = get_system_time() - m_start_time_us;
-		ensure(elapsed_us >= m_pause_time_us);
-
-		const usz timestamp_ms = (elapsed_us - m_pause_time_us) / 1000;
-		const s64 pts = m_video_sink->get_pts(timestamp_ms);
-		return pts > m_last_video_pts_incoming;
-	}
-
-	void video_provider::present_frame(std::vector<u8>& data, u32 pitch, u32 width, u32 height, bool is_bgra)
-	{
-		if (!m_active)
-		{
-			return;
-		}
-
-		std::lock_guard lock_video(m_video_mutex);
-
-		if (check_mode() == recording_mode::stopped)
-		{
-			return;
-		}
-
-		const u64 current_time_us = get_system_time();
-
-		if (m_start_time_us.compare_and_swap_test(umax, current_time_us))
-		{
-			media_log.notice("video_provider: start time = %d", current_time_us);
-		}
-
-		// Calculate presentation timestamp.
-		const usz elapsed_us = current_time_us - m_start_time_us;
-		ensure(elapsed_us >= m_pause_time_us);
-
-		const usz timestamp_ms = (elapsed_us - m_pause_time_us) / 1000;
-		const s64 pts = m_video_sink->get_pts(timestamp_ms);
-
-		// We can just skip this frame if it has the same timestamp.
-		if (pts <= m_last_video_pts_incoming)
-		{
-			return;
-		}
-
-		if (m_video_sink->add_frame(data, pitch, width, height, is_bgra ? AVPixelFormat::AV_PIX_FMT_BGRA : AVPixelFormat::AV_PIX_FMT_RGBA, timestamp_ms))
-		{
-			m_last_video_pts_incoming = pts;
-		}
-	}
-
-	void video_provider::present_samples(const u8* buf, u32 sample_count, u16 channels)
-	{
-		if (!buf || !sample_count || !channels || !m_active)
-		{
-			return;
-		}
-
-		std::lock_guard lock_audio(m_audio_mutex);
-
-		if (!m_video_sink || !m_video_sink->use_internal_audio)
-		{
-			return;
-		}
-
-		if (check_mode() == recording_mode::stopped)
-		{
-			return;
-		}
-
-		const u64 current_time_us = get_system_time();
-
-		if (m_start_time_us.compare_and_swap_test(umax, current_time_us))
-		{
-			media_log.notice("video_provider: start time = %d", current_time_us);
-		}
-
-		// Calculate presentation timestamp.
-		const usz elapsed_us = current_time_us - m_start_time_us;
-		ensure(elapsed_us >= m_pause_time_us);
-
-		const usz timestamp_us = elapsed_us - m_pause_time_us;
-		const s64 pts = m_video_sink->get_audio_pts(timestamp_us);
-
-		// We can just skip this sample if it has the same timestamp.
-		if (pts <= m_last_audio_pts_incoming)
-		{
-			return;
-		}
-
-		if (m_video_sink->add_audio_samples(buf, sample_count, channels, timestamp_us))
-		{
-			m_last_audio_pts_incoming = pts;
-		}
-	}
-}
diff --git a/rpcs3/util/video_provider.h b/rpcs3/util/video_provider.h
deleted file mode 100644
index e21b5185ee..0000000000
--- a/rpcs3/util/video_provider.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include "video_sink.h"
-
-enum class recording_mode
-{
-	stopped = 0,
-	rpcs3,
-	cell
-};
-
-namespace utils
-{
-	class video_provider
-	{
-	public:
-		video_provider() = default;
-		~video_provider();
-
-		bool set_video_sink(std::shared_ptr<video_sink> sink, recording_mode type);
-		void set_pause_time_us(usz pause_time_us);
-
-		bool can_consume_frame();
-		void present_frame(std::vector<u8>& data, u32 pitch, u32 width, u32 height, bool is_bgra);
-
-		void present_samples(const u8* buf, u32 sample_count, u16 channels);
-
-	private:
-		recording_mode check_mode();
-
-		recording_mode m_type = recording_mode::stopped;
-		std::shared_ptr<video_sink> m_video_sink;
-		shared_mutex m_video_mutex{};
-		shared_mutex m_audio_mutex{};
-		atomic_t<bool> m_active{false};
-		atomic_t<usz> m_start_time_us{umax};
-		s64 m_last_video_pts_incoming = -1;
-		s64 m_last_audio_pts_incoming = -1;
-		usz m_pause_time_us = 0;
-	};
-
-} // namespace utils
diff --git a/rpcs3/util/video_sink.h b/rpcs3/util/video_sink.h
deleted file mode 100644
index fa0e735787..0000000000
--- a/rpcs3/util/video_sink.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#pragma once
-
-#include "util/types.hpp"
-#include "util/atomic.hpp"
-#include "Utilities/mutex.h"
-
-#include <deque>
-#include <cmath>
-
-namespace utils
-{
-	class video_sink
-	{
-	public:
-		video_sink() = default;
-		virtual ~video_sink() = default;
-
-		virtual void stop(bool flush = true) = 0;
-		virtual void pause(bool flush = true) = 0;
-		virtual void resume() = 0;
-
-		bool add_frame(std::vector<u8>& frame, u32 pitch, u32 width, u32 height, s32 pixel_format, usz timestamp_ms)
-		{
-			// Do not allow new frames while flushing or paused
-			if (m_flush || m_paused)
-				return false;
-
-			std::lock_guard lock(m_video_mtx);
-			m_frames_to_encode.emplace_back(timestamp_ms, pitch, width, height, pixel_format, std::move(frame));
-			return true;
-		}
-
-		bool add_audio_samples(const u8* buf, u32 sample_count, u16 channels, usz timestamp_us)
-		{
-			// Do not allow new samples while flushing or paused
-			if (m_flush || m_paused || !buf || !sample_count || !channels)
-				return false;
-
-			std::vector<u8> sample(buf, buf + sample_count * channels * sizeof(f32));
-			std::lock_guard lock(m_audio_mtx);
-			m_samples_to_encode.emplace_back(timestamp_us, sample_count, channels, std::move(sample));
-			return true;
-		}
-
-		s64 get_pts(usz timestamp_ms) const
-		{
-			return static_cast<s64>(std::round((timestamp_ms * m_framerate) / 1000.0));
-		}
-
-		s64 get_audio_pts(usz timestamp_us) const
-		{
-			static constexpr f64 us_per_sec = 1000000.0;
-			const f64 us_per_block = us_per_sec / (m_sample_rate / static_cast<f64>(m_samples_per_block));
-			return static_cast<s64>(std::round(timestamp_us / us_per_block));
-		}
-
-		usz get_timestamp_ms(s64 pts) const
-		{
-			return static_cast<usz>(std::round((pts * 1000) / static_cast<f64>(m_framerate)));
-		}
-
-		usz get_audio_timestamp_us(s64 pts) const
-		{
-			static constexpr f64 us_per_sec = 1000000.0;
-			const f64 us_per_block = us_per_sec / (m_sample_rate / static_cast<f64>(m_samples_per_block));
-			return static_cast<usz>(pts * us_per_block);
-		}
-
-		atomic_t<bool> has_error{false};
-
-		struct encoder_frame
-		{
-			encoder_frame() = default;
-			encoder_frame(usz timestamp_ms, u32 pitch, u32 width, u32 height, s32 av_pixel_format, std::vector<u8>&& data)
-				: timestamp_ms(timestamp_ms), pitch(pitch), width(width), height(height), av_pixel_format(av_pixel_format), data(std::move(data))
-			{}
-
-			s64 pts = -1; // Optional
-			usz timestamp_ms = 0;
-			u32 pitch = 0;
-			u32 width = 0;
-			u32 height = 0;
-			s32 av_pixel_format = 0; // NOTE: Make sure this is a valid AVPixelFormat
-			std::vector<u8> data;
-		};
-
-		struct encoder_sample
-		{
-			encoder_sample() = default;
-			encoder_sample(usz timestamp_us, u32 sample_count, u16 channels, std::vector<u8>&& data)
-				: timestamp_us(timestamp_us), sample_count(sample_count), channels(channels), data(std::move(data))
-			{
-			}
-
-			usz timestamp_us = 0;
-			u32 sample_count = 0;
-			u16 channels = 0;
-			std::vector<u8> data;
-		};
-
-		// These two variables should only be set once before we start encoding, so we don't need mutexes or atomics.
-		bool use_internal_audio = false; // True if we want to fetch samples from cellAudio
-		bool use_internal_video = false; // True if we want to fetch frames from rsx
-
-	protected:
-		shared_mutex m_video_mtx;
-		std::deque<encoder_frame> m_frames_to_encode;
-		shared_mutex m_audio_mtx;
-		std::deque<encoder_sample> m_samples_to_encode;
-		atomic_t<bool> m_paused = false;
-		atomic_t<bool> m_flush = false;
-		u32 m_framerate = 30;
-		u32 m_sample_rate = 48000;
-		static constexpr u32 m_samples_per_block = 256;
-	};
-}
diff --git a/rpcs3/util/video_source.h b/rpcs3/util/video_source.h
deleted file mode 100644
index 9449ed238e..0000000000
--- a/rpcs3/util/video_source.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "types.hpp"
-#include <functional>
-
-class video_source
-{
-public:
-	video_source() {};
-	virtual ~video_source() {};
-	virtual void set_video_path(const std::string& video_path) = 0;
-	virtual void set_active(bool active) = 0;
-	virtual bool get_active() const = 0;
-	virtual bool has_new() const = 0;
-	virtual void get_image(std::vector<u8>& data, int& w, int& h, int& ch, int& bpp) = 0;
-
-	void set_update_callback(std::function<void()> callback)
-	{
-		m_update_callback = callback;
-	}
-
-protected:
-	void notify_update()
-	{
-		if (m_update_callback)
-		{
-			m_update_callback();
-		}
-	}
-
-private:
-	std::function<void()> m_update_callback;
-};
diff --git a/rpcs3/util/vm.hpp b/rpcs3/util/vm.hpp
index a7892b86d6..f6b563096d 100644
--- a/rpcs3/util/vm.hpp
+++ b/rpcs3/util/vm.hpp
@@ -3,19 +3,8 @@
 #include "util/types.hpp"
 #include "util/atomic.hpp"
 
-#include <string>
-
 namespace utils
 {
-#ifdef _WIN32
-	using native_handle = void*;
-#else
-	using native_handle = int;
-#endif
-
-	// Obtain system page size
-	long get_page_size();
-
 	// Memory protection type
 	enum class protection
 	{
@@ -28,9 +17,9 @@ namespace utils
 
 	/**
 	* Reserve `size` bytes of virtual memory and returns it.
-	* The memory should be committed before usage.
+	* The memory should be commited before usage.
 	*/
-	void* memory_reserve(usz size, void* use_addr = nullptr, bool is_memory_mapping = false);
+	void* memory_reserve(usz size, void* use_addr = nullptr);
 
 	/**
 	* Commit `size` bytes of virtual memory starting at pointer.
@@ -54,9 +43,6 @@ namespace utils
 	// Lock pages in memory
 	bool memory_lock(void* pointer, usz size);
 
-	// Map file descriptor
-	void* memory_map_fd(native_handle fd, usz size, protection prot);
-
 	// Shared memory handle
 	class shm
 	{
@@ -68,10 +54,9 @@ namespace utils
 		u32 m_flags{};
 		u64 m_size{};
 		atomic_t<void*> m_ptr{nullptr};
-		std::string m_storage;
 
 	public:
-		explicit shm(u64 size, u32 flags = 0);
+		explicit shm(u32 size, u32 flags = 0);
 
 		// Construct with specified path as sparse file storage
 		shm(u64 size, const std::string& storage);
@@ -89,7 +74,7 @@ namespace utils
 		u8* try_map(void* ptr, protection prot = protection::rw, bool cow = false) const;
 
 		// Map shared memory over reserved memory region, which is unsafe (non-atomic) under Win32
-		std::pair<u8*, std::string> map_critical(void* ptr, protection prot = protection::rw, bool cow = false);
+		u8* map_critical(void* ptr, protection prot = protection::rw, bool cow = false);
 
 		// Map shared memory into its own storage (not mapped by default)
 		u8* map_self(protection prot = protection::rw);
diff --git a/rpcs3/util/vm_native.cpp b/rpcs3/util/vm_native.cpp
index 156af86548..e67c28c7c5 100644
--- a/rpcs3/util/vm_native.cpp
+++ b/rpcs3/util/vm_native.cpp
@@ -1,12 +1,11 @@
 #include "stdafx.h"
+#include "util/logs.hpp"
 #include "util/vm.hpp"
 #include "util/asm.hpp"
 #ifdef _WIN32
 #include "Utilities/File.h"
 #include "util/dyn_lib.hpp"
-#include "Utilities/lockless.h"
 #include <Windows.h>
-#include <span>
 #else
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ -16,9 +15,8 @@
 #include <sys/types.h>
 #endif
 
-#if defined(__FreeBSD__)
+#if !defined(__linux__) && !defined(_WIN32)
 #include <sys/sysctl.h>
-#include <vm/vm_param.h>
 #endif
 
 #ifdef __linux__
@@ -28,7 +26,7 @@
 #ifdef __NR_memfd_create
 #elif __x86_64__
 #define __NR_memfd_create 319
-#elif ARCH_ARM64
+#elif __aarch64__
 #define __NR_memfd_create 279
 #endif
 
@@ -51,7 +49,7 @@ namespace utils
 #ifdef MAP_NORESERVE
 	constexpr int c_map_noreserve = MAP_NORESERVE;
 #else
-	[[maybe_unused]] constexpr int c_map_noreserve = 0;
+	constexpr int c_map_noreserve = 0;
 #endif
 
 #ifdef MADV_FREE
@@ -65,7 +63,7 @@ namespace utils
 #ifdef MADV_HUGEPAGE
 	constexpr int c_madv_hugepage = MADV_HUGEPAGE;
 #else
-	[[maybe_unused]] constexpr int c_madv_hugepage = 0;
+	constexpr int c_madv_hugepage = 0;
 #endif
 
 #if defined(MADV_DONTDUMP) && defined(MADV_DODUMP)
@@ -75,125 +73,21 @@ namespace utils
 	constexpr int c_madv_no_dump = MADV_NOCORE;
 	constexpr int c_madv_dump = MADV_CORE;
 #else
-	[[maybe_unused]] constexpr int c_madv_no_dump = 0;
-	[[maybe_unused]] constexpr int c_madv_dump = 0;
+	constexpr int c_madv_no_dump = 0;
+	constexpr int c_madv_dump = 0;
 #endif
 
 #if defined(MFD_HUGETLB) && defined(MFD_HUGE_2MB)
 	constexpr int c_mfd_huge_2mb = MFD_HUGETLB | MFD_HUGE_2MB;
-#elif defined(__linux__) || defined(__FreeBSD__)
+#else
 	constexpr int c_mfd_huge_2mb = 0;
 #endif
 
 #ifdef _WIN32
 	DYNAMIC_IMPORT("KernelBase.dll", VirtualAlloc2, PVOID(HANDLE Process, PVOID Base, SIZE_T Size, ULONG AllocType, ULONG Prot, MEM_EXTENDED_PARAMETER*, ULONG));
 	DYNAMIC_IMPORT("KernelBase.dll", MapViewOfFile3, PVOID(HANDLE Handle, HANDLE Process, PVOID Base, ULONG64 Off, SIZE_T ViewSize, ULONG AllocType, ULONG Prot, MEM_EXTENDED_PARAMETER*, ULONG));
-	DYNAMIC_IMPORT("KernelBase.dll", UnmapViewOfFile2, BOOL(HANDLE Process, PVOID BaseAddress, ULONG UnmapFlags));
-
-	bool has_win10_memory_mapping_api()
-	{
-		return VirtualAlloc2 && MapViewOfFile3 && UnmapViewOfFile2;
-	}
-
-	struct map_info_t
-	{
-		u64 addr = 0;
-		u64 size = 0;
-		atomic_t<u8> state{};
-	};
-
-	lf_array<map_info_t, 32> s_is_mapping{};
-
-	bool is_memory_mappping_memory(u64 addr)
-	{
-		if (!addr)
-		{
-			return false;
-		}
-
-		return s_is_mapping.for_each([addr](const map_info_t& info)
-		{
-			if (info.state == 1)
-			{
-				if (addr >= info.addr && addr < info.addr + info.size)
-				{
-					return true;
-				}
-			}
-
-			return false;
-		}).second;
-	}
-
-	u64 unmap_mappping_memory(u64 addr, u64 size)
-	{
-		if (!addr || !size)
-		{
-			return 0;
-		}
-
-		return s_is_mapping.for_each([addr, size](map_info_t& info) -> u64
-		{
-			if (info.state == 1)
-			{
-				if (addr == info.addr && size == info.size)
-				{
-					if (info.state.compare_and_swap_test(1, 0))
-					{
-						return info.size;
-					}
-				}
-			}
-
-			return 0;
-		}).second;
-	}
-
-	bool map_mappping_memory(u64 addr, u64 size)
-	{
-		if (!addr || !size)
-		{
-			return false;
-		}
-
-		ensure(s_is_mapping.for_each([addr, size](map_info_t& info)
-		{
-			if (!info.addr && info.state.compare_and_swap_test(0, 2))
-			{
-				info.addr = addr;
-				info.size = size;
-				info.state = 1;
-				return true;
-			}
-
-			return false;
-		}, false).second);
-
-		return true;
-	}
-
-	bool is_memory_mappping_memory(const void* addr)
-	{
-		return is_memory_mappping_memory(reinterpret_cast<u64>(addr));
-	}
 #endif
 
-	long get_page_size()
-	{
-		static const long r = []() -> long
-		{
-#ifdef _WIN32
-			SYSTEM_INFO info;
-			::GetSystemInfo(&info);
-			return info.dwPageSize;
-#else
-			return ::sysconf(_SC_PAGESIZE);
-#endif
-		}();
-
-		return ensure(r, FN(((x & (x - 1)) == 0 && x > 0 && x <= 0x10000)));
-	}
-
 	// Convert memory protection (internal)
 	static auto operator +(protection prot)
 	{
@@ -222,20 +116,9 @@ namespace utils
 		return _prot;
 	}
 
-	void* memory_reserve(usz size, void* use_addr, [[maybe_unused]] bool is_memory_mapping)
+	void* memory_reserve(usz size, void* use_addr)
 	{
 #ifdef _WIN32
-		if (is_memory_mapping && has_win10_memory_mapping_api())
-		{
-			if (auto ptr = VirtualAlloc2(nullptr, use_addr, size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS, nullptr, 0))
-			{
-				map_mappping_memory(reinterpret_cast<u64>(ptr), size);
-				return ptr;
-			}
-
-			return nullptr;
-		}
-
 		return ::VirtualAlloc(use_addr, size, MEM_RESERVE, PAGE_NOACCESS);
 #else
 		if (use_addr && reinterpret_cast<uptr>(use_addr) % 0x10000)
@@ -251,15 +134,7 @@ namespace utils
 			size += 0x10000;
 		}
 
-#ifdef __APPLE__
-#ifdef ARCH_ARM64
-		auto ptr = ::mmap(use_addr, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE | MAP_JIT | c_map_noreserve, -1, 0);
-#else
-		auto ptr = ::mmap(use_addr, size, PROT_NONE, MAP_ANON | MAP_PRIVATE | MAP_JIT | c_map_noreserve, -1, 0);
-#endif
-#else
 		auto ptr = ::mmap(use_addr, size, PROT_NONE, MAP_ANON | MAP_PRIVATE | c_map_noreserve, -1, 0);
-#endif
 
 		if (ptr == reinterpret_cast<void*>(uptr{umax}))
 		{
@@ -309,108 +184,73 @@ namespace utils
 
 	void memory_commit(void* pointer, usz size, protection prot)
 	{
-		if (!size)
-		{
-			return;
-		}
-
 #ifdef _WIN32
 		ensure(::VirtualAlloc(pointer, size, MEM_COMMIT, +prot));
 #else
 		const u64 ptr64 = reinterpret_cast<u64>(pointer);
-		ensure(::mprotect(reinterpret_cast<void*>(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), +prot) != -1);
+		ensure(::mprotect(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), +prot) != -1);
 
 		if constexpr (c_madv_dump != 0)
 		{
-			ensure(::madvise(reinterpret_cast<void*>(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), c_madv_dump) != -1);
+			ensure(::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), c_madv_dump) != -1);
 		}
 		else
 		{
-			ensure(::madvise(reinterpret_cast<void*>(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), MADV_WILLNEED) != -1);
+			ensure(::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), MADV_WILLNEED) != -1);
 		}
 #endif
 	}
 
 	void memory_decommit(void* pointer, usz size)
 	{
-		if (!size)
-		{
-			return;
-		}
-
 #ifdef _WIN32
 		ensure(::VirtualFree(pointer, size, MEM_DECOMMIT));
 #else
 		const u64 ptr64 = reinterpret_cast<u64>(pointer);
-#if defined(__APPLE__) && defined(ARCH_ARM64)
-		// Hack: on macOS, Apple explicitly fails mmap if you combine MAP_FIXED and MAP_JIT.
-		// So we unmap the space and just hope it maps to the same address we got before instead.
-		// The Xcode manpage says the pointer is a hint and the OS will try to map at the hint location
-		// so this isn't completely undefined behavior.
-		ensure(::munmap(pointer, size) != -1);
-		ensure(::mmap(pointer, size, PROT_NONE,  MAP_ANON | MAP_PRIVATE | MAP_JIT, -1, 0) == pointer);
-#else
 		ensure(::mmap(pointer, size, PROT_NONE, MAP_FIXED | MAP_ANON | MAP_PRIVATE | c_map_noreserve, -1, 0) != reinterpret_cast<void*>(uptr{umax}));
-#endif
 
 		if constexpr (c_madv_no_dump != 0)
 		{
-			ensure(::madvise(reinterpret_cast<void*>(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), c_madv_no_dump) != -1);
+			ensure(::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), c_madv_no_dump) != -1);
 		}
 		else
 		{
-			ensure(::madvise(reinterpret_cast<void*>(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), c_madv_free) != -1);
+			ensure(::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), c_madv_free) != -1);
 		}
 #endif
 	}
 
 	void memory_reset(void* pointer, usz size, protection prot)
 	{
-		if (!size)
-		{
-			return;
-		}
-
 #ifdef _WIN32
 		memory_decommit(pointer, size);
 		memory_commit(pointer, size, prot);
 #else
 		const u64 ptr64 = reinterpret_cast<u64>(pointer);
-#if defined(__APPLE__) && defined(ARCH_ARM64)
-		ensure(::munmap(pointer, size) != -1);
-		ensure(::mmap(pointer, size, +prot,  MAP_ANON | MAP_PRIVATE | MAP_JIT, -1, 0) == pointer);
-#else
 		ensure(::mmap(pointer, size, +prot, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0) != reinterpret_cast<void*>(uptr{umax}));
-#endif
 
 		if constexpr (c_madv_hugepage != 0)
 		{
 			if (size % 0x200000 == 0)
 			{
-				::madvise(reinterpret_cast<void*>(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), c_madv_hugepage);
+				::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), c_madv_hugepage);
 			}
 		}
 
 		if constexpr (c_madv_dump != 0)
 		{
-			ensure(::madvise(reinterpret_cast<void*>(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), c_madv_dump) != -1);
+			ensure(::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), c_madv_dump) != -1);
 		}
 		else
 		{
-			ensure(::madvise(reinterpret_cast<void*>(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), MADV_WILLNEED) != -1);
+			ensure(::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), MADV_WILLNEED) != -1);
 		}
 #endif
 	}
 
 	void memory_release(void* pointer, usz size)
 	{
-		if (!size)
-		{
-			return;
-		}
-
 #ifdef _WIN32
-		unmap_mappping_memory(reinterpret_cast<u64>(pointer), size);
 		ensure(::VirtualFree(pointer, 0, MEM_RELEASE));
 #else
 		ensure(::munmap(pointer, size) != -1);
@@ -419,11 +259,6 @@ namespace utils
 
 	void memory_protect(void* pointer, usz size, protection prot)
 	{
-		if (!size)
-		{
-			return;
-		}
-
 #ifdef _WIN32
 
 		DWORD old;
@@ -439,7 +274,7 @@ namespace utils
 
 			if (!::VirtualProtect(reinterpret_cast<LPVOID>(addr), block_size, +prot, &old))
 			{
-				fmt::throw_exception("VirtualProtect failed (%p, 0x%x, addr=0x%x, error=%s)", pointer, size, addr, fmt::win_error{GetLastError(), nullptr});
+				fmt::throw_exception("VirtualProtect failed (%p, 0x%x, addr=0x%x, error=%#x)", pointer, size, addr, GetLastError());
 			}
 
 			// Next region
@@ -447,17 +282,12 @@ namespace utils
 		}
 #else
 		const u64 ptr64 = reinterpret_cast<u64>(pointer);
-		ensure(::mprotect(reinterpret_cast<void*>(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), +prot) != -1);
+		ensure(::mprotect(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), +prot) != -1);
 #endif
 	}
 
 	bool memory_lock(void* pointer, usz size)
 	{
-		if (!size)
-		{
-			return true;
-		}
-
 #ifdef _WIN32
 		return ::VirtualLock(pointer, size);
 #else
@@ -465,30 +295,12 @@ namespace utils
 #endif
 	}
 
-	void* memory_map_fd([[maybe_unused]] native_handle fd, [[maybe_unused]] usz size, [[maybe_unused]] protection prot)
-	{
-#ifdef _WIN32
-		// TODO
-		return nullptr;
-#else
-		const auto result = ::mmap(nullptr, size, +prot, MAP_SHARED, fd, 0);
-
-		if (result == reinterpret_cast<void*>(uptr{umax}))
-		{
-			[[unlikely]] return nullptr;
-		}
-
-		return result;
-#endif
-	}
-
-	shm::shm(u64 size, u32 flags)
+	shm::shm(u32 size, u32 flags)
 		: m_flags(flags)
 		, m_size(utils::align(size, 0x10000))
 	{
 #ifdef _WIN32
-		const ULARGE_INTEGER max_size{ .QuadPart = m_size };
-		m_handle = ensure(::CreateFileMappingW(INVALID_HANDLE_VALUE, nullptr, PAGE_EXECUTE_READWRITE, max_size.HighPart, max_size.LowPart, nullptr));
+		m_handle = ensure(::CreateFileMappingW(INVALID_HANDLE_VALUE, nullptr, PAGE_EXECUTE_READWRITE, 0, m_size, nullptr));
 #elif defined(__linux__) || defined(__FreeBSD__)
 		m_file = -1;
 
@@ -532,90 +344,40 @@ namespace utils
 #ifdef _WIN32
 		fs::file f;
 
-		auto open_with_cleanup = [](fs::file& f, const std::string& path)
+		// Get system version
+		[[maybe_unused]] static const DWORD version_major = *reinterpret_cast<const DWORD*>(__readgsqword(0x60) + 0x118);
+
+		auto set_sparse = [](HANDLE h, usz m_size) -> bool
 		{
-			f.close();
-
-			for (u32 try_count = 3, i = 0; !f && i < try_count; i++)
-			{
-				// Bug workaround: removing old file may be safer than rewriting it
-				if (!fs::remove_file(path) && fs::g_tls_error != fs::error::noent)
-				{
-					return false;
-				}
-
-				if (!f.open(path, fs::read + fs::write + fs::create + fs::excl) && fs::g_tls_error != fs::error::exist)
-				{
-					return false;
-				}
-			}
-
-			return f.operator bool();
-		};
-
-		std::string storage1 = fs::get_temp_dir();
-		std::string storage2 = fs::get_cache_dir();
-
-		if (storage.empty())
-		{
-			storage1 += "rpcs3_vm_sparse.tmp";
-			storage2 += "rpcs3_vm_sparse.tmp";
-		}
-		else
-		{
-			storage1 += storage;
-			storage2 += storage;
-		}
-
-		std::function<bool(const std::string&, HANDLE, usz)> set_sparse_and_map = [&](const std::string& storagex, HANDLE h, usz m_size) -> bool
-		{
-			// In case failed, revert changes and forward failure
-			auto clean = [&](bool result)
-			{
-				if (!result)
-				{
-					const fs::error last_fs_error = fs::g_tls_error;
-					const DWORD last_win_error = ::GetLastError();
-
-					fs::remove_file(storagex);
-
-					fs::g_tls_error = last_fs_error;
-					::SetLastError(last_win_error);
-				}
-
-				return result;
-			};
-
 			FILE_SET_SPARSE_BUFFER arg{.SetSparse = true};
 			FILE_BASIC_INFO info0{};
-			ensure(clean(GetFileInformationByHandleEx(h, FileBasicInfo, &info0, sizeof(info0))));
+			ensure(GetFileInformationByHandleEx(h, FileBasicInfo, &info0, sizeof(info0)));
 
 			if ((info0.FileAttributes & FILE_ATTRIBUTE_ARCHIVE) || (~info0.FileAttributes & FILE_ATTRIBUTE_TEMPORARY))
 			{
 				info0.FileAttributes &= ~FILE_ATTRIBUTE_ARCHIVE;
 				info0.FileAttributes |= FILE_ATTRIBUTE_TEMPORARY;
-				ensure(clean(SetFileInformationByHandle(h, FileBasicInfo, &info0, sizeof(info0))));
+				ensure(SetFileInformationByHandle(h, FileBasicInfo, &info0, sizeof(info0)));
 			}
 
-			if (DWORD bytesReturned{}; (info0.FileAttributes & FILE_ATTRIBUTE_SPARSE_FILE) || DeviceIoControl(h, FSCTL_SET_SPARSE, &arg, sizeof(arg), nullptr, 0, &bytesReturned, nullptr))
+			if ((info0.FileAttributes & FILE_ATTRIBUTE_SPARSE_FILE) == 0 && version_major <= 7)
 			{
-				if ((info0.FileAttributes & FILE_ATTRIBUTE_SPARSE_FILE) == 0 && !storagex.empty())
-				{
-					// Retry once (bug workaround)
-					if (!open_with_cleanup(f, storagex))
-					{
-						return false;
-					}
+				MessageBoxW(0, L"RPCS3 needs to be restarted to create sparse file rpcs3_vm.", L"RPCS3", MB_ICONEXCLAMATION);
+			}
 
-					return set_sparse_and_map("", f.get_handle(), m_size);
+			if ((info0.FileAttributes & FILE_ATTRIBUTE_SPARSE_FILE) || DeviceIoControl(h, FSCTL_SET_SPARSE, &arg, sizeof(arg), nullptr, 0, nullptr, nullptr))
+			{
+				if ((info0.FileAttributes & FILE_ATTRIBUTE_SPARSE_FILE) == 0 && version_major <= 7)
+				{
+					std::abort();
 				}
 
 				FILE_STANDARD_INFO info;
 				FILE_END_OF_FILE_INFO _eof{};
-				ensure(clean(GetFileInformationByHandleEx(h, FileStandardInfo, &info, sizeof(info))));
-				ensure(clean(GetFileSizeEx(h, &_eof.EndOfFile)));
+				ensure(GetFileInformationByHandleEx(h, FileStandardInfo, &info, sizeof(info)));
+				ensure(GetFileSizeEx(h, &_eof.EndOfFile));
 
-				if (info.AllocationSize.QuadPart && _eof.EndOfFile.QuadPart == static_cast<LONGLONG>(m_size))
+				if (info.AllocationSize.QuadPart && _eof.EndOfFile.QuadPart == m_size)
 				{
 					// Truncate file since it may be dirty (fool-proof)
 					DWORD ret = 0;
@@ -628,30 +390,11 @@ namespace utils
 					}
 				}
 
-				if (_eof.EndOfFile.QuadPart != static_cast<LONGLONG>(m_size))
+				if (_eof.EndOfFile.QuadPart != m_size)
 				{
 					// Reset file size to 0 if it doesn't match
 					_eof.EndOfFile.QuadPart = 0;
-					ensure(clean(SetFileInformationByHandle(h, FileEndOfFileInfo, &_eof, sizeof(_eof))));
-				}
-
-				// It seems impossible to automatically delete file on exit when file mapping is used
-				if (f.size() != m_size)
-				{
-					// Resize the file gradually (bug workaround)
-					for (usz i = 0; i < m_size / (1024 * 1024 * 256); i++)
-					{
-						ensure(clean(f.trunc((i + 1) * (1024 * 1024 * 256))));
-					}
-
-					ensure(clean(f.trunc(m_size)));
-				}
-
-				m_handle = ::CreateFileMappingW(f.get_handle(), nullptr, PAGE_READWRITE, 0, 0, nullptr);
-				if (clean(!m_handle))
-				{
-					ensure(storagex == storage1);
-					return false;
+					ensure(SetFileInformationByHandle(h, FileEndOfFileInfo, &_eof, sizeof(_eof)));
 				}
 
 				return true;
@@ -660,40 +403,50 @@ namespace utils
 			return false;
 		};
 
-		// Attempt to remove from secondary storage in case this succeeds
-		fs::remove_file(storage2);
+		const std::string storage2 = fs::get_temp_dir() + "rpcs3_vm_sparse.tmp";
+		const std::string storage3 = fs::get_cache_dir() + "rpcs3_vm_sparse.tmp";
 
-		if (!open_with_cleanup(f, storage1) || !set_sparse_and_map(storage1, f.get_handle(), m_size))
+		if (!storage.empty())
+		{
+			// Explicitly specified storage
+			ensure(f.open(storage, fs::read + fs::write + fs::create));
+		}
+		else if (!f.open(storage2, fs::read + fs::write + fs::create) || !set_sparse(f.get_handle(), m_size))
 		{
-			// Attempt to remove from main storage in case this succeeds
-			f.close();
-			fs::remove_file(storage1);
-
 			// Fallback storage
-			ensure(open_with_cleanup(f, storage2));
-
-			if (!set_sparse_and_map(storage2, f.get_handle(), m_size))
-			{
-				MessageBoxW(0, L"Failed to initialize sparse file.\nCan't find a filesystem with sparse file support (NTFS).", L"RPCS3", MB_ICONERROR);
-			}
-
-			m_storage = std::move(storage2);
+			ensure(f.open(storage3, fs::read + fs::write + fs::create));
 		}
 		else
 		{
-			m_storage = std::move(storage1);
+			goto check;
 		}
+
+		if (!set_sparse(f.get_handle(), m_size))
+		{
+			MessageBoxW(0, L"Failed to initialize sparse file.\nCan't find a filesystem with sparse file support (NTFS).", L"RPCS3", MB_ICONERROR);
+		}
+
+	check:
+		if (f.size() != m_size)
+		{
+			// Resize the file gradually (bug workaround)
+			for (usz i = 0; i < m_size / (1024 * 1024 * 256); i++)
+			{
+				ensure(f.trunc((i + 1) * (1024 * 1024 * 256)));
+			}
+
+			ensure(f.trunc(m_size));
+		}
+
+		m_handle = ensure(::CreateFileMappingW(f.get_handle(), nullptr, PAGE_READWRITE, 0, 0, nullptr));
 #else
 
 #ifdef __linux__
-#ifdef ANDROID
-		if constexpr (constexpr char c = '?')
-#else
 		if (const char c = fs::file("/proc/sys/vm/overcommit_memory").read<char>(); c == '0' || c == '1')
-#endif
 		{
 			// Simply use memfd for overcommit memory
-			m_file = ensure(::memfd_create_("", 0), FN(x >= 0));
+			m_file = ::memfd_create_("", 0);
+			ensure(m_file >= 0);
 			ensure(::ftruncate(m_file, m_size) >= 0);
 			return;
 		}
@@ -703,23 +456,26 @@ namespace utils
 		}
 #else
 		int vm_overcommit = 0;
+		auto vm_sz = sizeof(int);
 
 #if defined(__NetBSD__) || defined(__APPLE__)
 		// Always ON
 		vm_overcommit = 0;
-#elif defined(__FreeBSD__)
-		auto vm_sz = sizeof(int);
+#elif defined(__FreeBSD__) && defined(VM_OVERCOMMIT)
 		int mib[2]{CTL_VM, VM_OVERCOMMIT};
 		if (::sysctl(mib, 2, &vm_overcommit, &vm_sz, NULL, 0) != 0)
 			vm_overcommit = -1;
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
+		if (::sysctlbyname("vm.overcommit", &vm_overcommit, &vm_sz, NULL, 0) != 0)
+			vm_overcommit = -1;
 #else
 		vm_overcommit = -1;
 #endif
 
 		if ((vm_overcommit & 3) == 0)
 		{
-#if defined(__FreeBSD__)
-			m_file = ensure(::memfd_create_("", 0), FN(x >= 0));
+#ifdef SHM_ANON
+			ensure(::shm_open(SHM_ANON, O_RDWR, S_IWUSR | S_IRUSR) == 0);
 #else
 			const std::string name = "/rpcs3-mem2-" + std::to_string(reinterpret_cast<u64>(this));
 
@@ -743,13 +499,10 @@ namespace utils
 		if (!storage.empty())
 		{
 			m_file = ::open(storage.c_str(), O_RDWR | O_CREAT, S_IWUSR | S_IRUSR);
-			::unlink(storage.c_str());
 		}
 		else
 		{
-			std::string storage = fs::get_cache_dir() + "rpcs3_vm_sparse.tmp";
-			m_file = ::open(storage.c_str(), O_RDWR | O_CREAT, S_IWUSR | S_IRUSR);
-			::unlink(storage.c_str());
+			m_file = ::open((fs::get_cache_dir() + "rpcs3_vm_sparse.tmp").c_str(), O_RDWR | O_CREAT, S_IWUSR | S_IRUSR);
 		}
 
 		ensure(m_file >= 0);
@@ -794,9 +547,6 @@ namespace utils
 #else
 		::close(m_file);
 #endif
-
-		if (!m_storage.empty())
-			fs::remove_file(m_storage);
 	}
 
 	u8* shm::map(void* ptr, protection prot, bool cow) const
@@ -887,106 +637,52 @@ namespace utils
 #endif
 	}
 
-	std::pair<u8*, std::string> shm::map_critical(void* ptr, protection prot, bool cow)
+	u8* shm::map_critical(void* ptr, protection prot, bool cow)
 	{
 		const auto target = reinterpret_cast<u8*>(reinterpret_cast<u64>(ptr) & -0x10000);
 
 #ifdef _WIN32
-		::MEMORY_BASIC_INFORMATION mem{};
-		if (!::VirtualQuery(target, &mem, sizeof(mem)) || mem.State != MEM_RESERVE)
+		::MEMORY_BASIC_INFORMATION mem;
+		if (!::VirtualQuery(target, &mem, sizeof(mem)) || mem.State != MEM_RESERVE || !::VirtualFree(mem.AllocationBase, 0, MEM_RELEASE))
 		{
-			return {nullptr, fmt::format("VirtualQuery() Unexpceted memory info: state=0x%x, %s", mem.State, std::as_bytes(std::span(&mem, 1)))};
+			return nullptr;
 		}
 
-		const auto base = static_cast<u8*>(mem.AllocationBase);
+		const auto base = (u8*)mem.AllocationBase;
 		const auto size = mem.RegionSize + (target - base);
 
-		if (is_memory_mappping_memory(ptr))
-		{
-			if (base < target && !::VirtualFree(base, target - base, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER))
-			{
-				return {nullptr, "Failed to split allocation base"};
-			}
-
-			if (target + m_size < base + size && !::VirtualFree(target, m_size, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER))
-			{
-				return {nullptr, "Failed to split allocation end"};
-			}
-
-			DWORD access = 0;
-
-			switch (prot)
-			{
-			case protection::rw:
-			case protection::ro:
-			case protection::no:
-				access = cow ? PAGE_WRITECOPY : PAGE_READWRITE;
-				break;
-			case protection::wx:
-			case protection::rx:
-				access = cow ? PAGE_EXECUTE_WRITECOPY : PAGE_EXECUTE_READWRITE;
-				break;
-			}
-
-			if (MapViewOfFile3(m_handle, GetCurrentProcess(), target, 0, m_size, MEM_REPLACE_PLACEHOLDER, access, nullptr, 0))
-			{
-				if (prot != protection::rw && prot != protection::wx)
-				{
-					DWORD old;
-					if (!::VirtualProtect(target, m_size, +prot, &old))
-					{
-						UnmapViewOfFile2(GetCurrentProcess(), target, MEM_PRESERVE_PLACEHOLDER);
-						return {nullptr, "Failed to protect"};
-					}
-				}
-
-				return {target, {}};
-			}
-
-			return {nullptr, "Failed to map3"};
-		}
-
-		if (!::VirtualFree(mem.AllocationBase, 0, MEM_RELEASE))
-		{
-			return {nullptr, "VirtualFree() failed on allocation base"};
-		}
-
 		if (base < target && !::VirtualAlloc(base, target - base, MEM_RESERVE, PAGE_NOACCESS))
 		{
-			return {nullptr, "VirtualAlloc() failed to reserve allocation base"};
+			return nullptr;
 		}
 
 		if (target + m_size < base + size && !::VirtualAlloc(target + m_size, base + size - target - m_size, MEM_RESERVE, PAGE_NOACCESS))
 		{
-			return {nullptr, "VirtualAlloc() failed to reserve allocation end"};
+			return nullptr;
 		}
 #endif
 
-		return {this->map(target, prot, cow), "Failed to map"};
+		return this->map(target, prot, cow);
 	}
 
 	u8* shm::map_self(protection prot)
 	{
 		void* ptr = m_ptr;
 
-		for (void* mapped = nullptr; !ptr;)
+		if (!ptr)
 		{
-			if (!mapped)
-			{
-				mapped = this->map(nullptr, prot);
-			}
+			const auto mapped = this->map(nullptr, prot);
 
 			// Install mapped memory
-			if (m_ptr.compare_exchange(ptr, mapped))
-			{
-				ptr = mapped;
-			}
-			else if (ptr)
+			if (!m_ptr.compare_exchange(ptr, mapped))
 			{
 				// Mapped already, nothing to do.
-				ensure(ptr != mapped);
 				this->unmap(mapped);
 			}
+			else
+			{
+				ptr = mapped;
+			}
 		}
 
 		return static_cast<u8*>(ptr);
@@ -1006,25 +702,6 @@ namespace utils
 		const auto target = reinterpret_cast<u8*>(reinterpret_cast<u64>(ptr) & -0x10000);
 
 #ifdef _WIN32
-		if (is_memory_mappping_memory(ptr))
-		{
-			ensure(UnmapViewOfFile2(GetCurrentProcess(), target, MEM_PRESERVE_PLACEHOLDER));
-
-			::MEMORY_BASIC_INFORMATION mem{}, mem2{};
-			ensure(::VirtualQuery(target - 1, &mem, sizeof(mem)) && ::VirtualQuery(target + m_size, &mem2, sizeof(mem2)));
-
-			const auto size1 = mem.State == MEM_RESERVE ? target - static_cast<u8*>(mem.AllocationBase) : 0;
-			const auto size2 =  mem2.State == MEM_RESERVE ? mem2.RegionSize : 0;
-
-			if (!size1 && !size2)
-			{
-				return;
-			}
-
-			ensure(::VirtualFree(size1 ? mem.AllocationBase : target, m_size + size1 + size2, MEM_RELEASE | MEM_COALESCE_PLACEHOLDERS));
-			return;
-		}
-
 		this->unmap(target);
 
 		::MEMORY_BASIC_INFORMATION mem, mem2;
@@ -1043,7 +720,7 @@ namespace utils
 			return;
 		}
 
-		const auto size1 = mem.State == MEM_RESERVE ? target - static_cast<u8*>(mem.AllocationBase) : 0;
+		const auto size1 = mem.State == MEM_RESERVE ? target - (u8*)mem.AllocationBase : 0;
 		const auto size2 = mem2.State == MEM_RESERVE ? mem2.RegionSize : 0;
 
 		if (!::VirtualAlloc(mem.State == MEM_RESERVE ? mem.AllocationBase : target, m_size + size1 + size2, MEM_RESERVE, PAGE_NOACCESS))
@@ -1063,4 +740,4 @@ namespace utils
 			this->unmap(ptr);
 		}
 	}
-} // namespace utils
+}
diff --git a/rpcs3/util/yaml.cpp b/rpcs3/util/yaml.cpp
index 3ea104973a..d3886c16ef 100644
--- a/rpcs3/util/yaml.cpp
+++ b/rpcs3/util/yaml.cpp
@@ -45,7 +45,7 @@ std::pair<YAML::Node, std::string> yaml_load(const std::string& from)
 }
 
 template <typename T>
-T get_yaml_node_value(const YAML::Node& node, std::string& error_message)
+T get_yaml_node_value(YAML::Node node, std::string& error_message)
 {
 	try
 	{
@@ -59,37 +59,7 @@ T get_yaml_node_value(const YAML::Node& node, std::string& error_message)
 	return {};
 }
 
-std::string get_yaml_node_location(const YAML::Node& node)
-{
-	try
-	{
-		const auto mark = node.Mark();
-
-		if (mark.is_null())
-			return "unknown";
-
-		return fmt::format("line %d, column %d", mark.line, mark.column); // Don't need the pos. It's not really useful.
-	}
-	catch (const std::exception& e)
-	{
-		return e.what();
-	}
-}
-
-std::string get_yaml_node_location(const YAML::detail::iterator_value& it)
-{
-	return get_yaml_node_location(it.first);
-}
-
-template u8 get_yaml_node_value<u8>(const YAML::Node&, std::string&);
-template s8 get_yaml_node_value<s8>(const YAML::Node&, std::string&);
-template u16 get_yaml_node_value<u16>(const YAML::Node&, std::string&);
-template s16 get_yaml_node_value<s16>(const YAML::Node&, std::string&);
-template u32 get_yaml_node_value<u32>(const YAML::Node&, std::string&);
-template s32 get_yaml_node_value<s32>(const YAML::Node&, std::string&);
-template u64 get_yaml_node_value<u64>(const YAML::Node&, std::string&);
-template s64 get_yaml_node_value<s64>(const YAML::Node&, std::string&);
-template f32 get_yaml_node_value<f32>(const YAML::Node&, std::string&);
-template f64 get_yaml_node_value<f64>(const YAML::Node&, std::string&);
-template std::string get_yaml_node_value<std::string>(const YAML::Node&, std::string&);
-template cheat_info get_yaml_node_value<cheat_info>(const YAML::Node&, std::string&);
+template u32 get_yaml_node_value<u32>(YAML::Node, std::string&);
+template u64 get_yaml_node_value<u64>(YAML::Node, std::string&);
+template f64 get_yaml_node_value<f64>(YAML::Node, std::string&);
+template cheat_info get_yaml_node_value<cheat_info>(YAML::Node, std::string&);
diff --git a/rpcs3/util/yaml.hpp b/rpcs3/util/yaml.hpp
index 85768acb3c..8ac66357d9 100644
--- a/rpcs3/util/yaml.hpp
+++ b/rpcs3/util/yaml.hpp
@@ -24,8 +24,4 @@ std::pair<YAML::Node, std::string> yaml_load(const std::string& from);
 
 // Use try/catch in YAML::Node::as<T>() instead of YAML::Node::as<T>(fallback) in order to get an error message
 template <typename T>
-T get_yaml_node_value(const YAML::Node& node, std::string& error_message);
-
-// Get the location of the node in the document
-std::string get_yaml_node_location(const YAML::Node& node);
-std::string get_yaml_node_location(const YAML::detail::iterator_value& it);
+T get_yaml_node_value(YAML::Node node, std::string& error_message);